diff --git a/installer/Gopkg.lock b/installer/Gopkg.lock
index 6c41b3f4bc..6e16f83456 100644
--- a/installer/Gopkg.lock
+++ b/installer/Gopkg.lock
@@ -2,9 +2,13 @@
 
 
 [[projects]]
-  branch = "master"
   name = "github.com/GoASTScanner/gas"
-  packages = [".","core","output","rules"]
+  packages = [
+    ".",
+    "core",
+    "output",
+    "rules"
+  ]
   revision = "6de76c92610b387855cdfdd53c99b149928916f7"
 
 [[projects]]
@@ -23,8 +27,8 @@
 [[projects]]
   name = "github.com/Sirupsen/logrus"
   packages = ["."]
-  revision = "d26492970760ca5d33129d2d799e34be5c4782eb"
-  version = "v0.11.0"
+  revision = "c155da19408a8799da419ed3eeb0cb5db0ad5dbc"
+  version = "v1.0.5"
 
 [[projects]]
   branch = "master"
@@ -38,10 +42,17 @@
   revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
   version = "v1.3.1"
 
+[[projects]]
+  name = "github.com/cenkalti/backoff"
+  packages = ["."]
+  revision = "2ea60e5f094469f9e65adb9cd103795b73ae743e"
+  version = "v2.0.0"
+
 [[projects]]
   name = "github.com/coreos/go-systemd"
   packages = ["daemon"]
-  revision = "24036eb3df68550d24a2736c5d013f4e83366866"
+  revision = "39ca1b05acc7ad1220e09f133283b8859a8b71ab"
+  version = "v17"
 
 [[projects]]
   name = "github.com/davecgh/go-spew"
@@ -57,49 +68,63 @@
 
 [[projects]]
   name = "github.com/docker/docker"
-  packages = ["pkg/ioutils","pkg/longpath","pkg/progress"]
+  packages = [
+    "pkg/ioutils",
+    "pkg/longpath",
+    "pkg/progress",
+    "pkg/pubsub"
+  ]
   revision = "092cba3727bb9b4a2f0e922cd6c0f93ea270e363"
   version = "v1.13.1"
 
 [[projects]]
   name = "github.com/docker/go-units"
   packages = ["."]
-  revision = "0dadbb0345b35ec7ef35e228dabb8de89a65bf52"
-  version = "v0.3.2"
+  revision = "47565b4f722fb6ceae66b95f853feed578a4a51c"
+  version = "v0.3.3"
 
 [[projects]]
+  branch = "master"
   name = "github.com/dustin/go-humanize"
   packages = ["."]
-  revision = "259d2a102b871d17f30e3cd9881a642961a1e486"
+  revision = "02af3965c54e8cacf948b97fef38925c4120652c"
 
 [[projects]]
   name = "github.com/gizak/termui"
   packages = ["."]
-  revision = "798ffb9cbbe4073ef1f88e6069ca4a2c6aa6676b"
+  revision = "24acd523c756fd9728824cdfac66aad9d8982fb7"
+  version = "v2.2.0"
 
 [[projects]]
-  branch = "v2"
   name = "github.com/go-yaml/yaml"
   packages = ["."]
-  revision = "eb3733d160e74a9c7e442f435eb3bea458e1d19f"
+  revision = "5420a8b6744d3b0345ab293f6fcba19c978f1183"
+  version = "v2.2.1"
 
 [[projects]]
   name = "github.com/golang/dep"
-  packages = [".","internal/fs","internal/gps","internal/gps/internal/pb","internal/gps/paths","internal/gps/pkgtree"]
+  packages = [
+    ".",
+    "internal/fs",
+    "internal/gps",
+    "internal/gps/internal/pb",
+    "internal/gps/paths",
+    "internal/gps/pkgtree"
+  ]
   revision = "8ddfc8afb2d520d41997ebddd921b52152706c01"
   version = "v0.3.2"
 
 [[projects]]
   branch = "master"
   name = "github.com/golang/lint"
-  packages = [".","golint"]
-  revision = "6aaf7c34af0f4c36a57e0c429bace4d706d8e931"
+  packages = ["golint"]
+  revision = "470b6b0bb3005eda157f0275e2e4895055396a81"
 
 [[projects]]
   branch = "master"
   name = "github.com/golang/protobuf"
   packages = ["proto"]
-  revision = "1643683e1b54a9e88ad26d98f81400c8c9d9f4f9"
+  revision = "927b65914520a8b7d44f5c9057611cfec6b2e2d0"
 
 [[projects]]
   name = "github.com/google/uuid"
@@ -114,26 +139,28 @@
   version = "v0.2.0"
 
 [[projects]]
-  branch = "master"
   name = "github.com/kr/pretty"
   packages = ["."]
-  revision = "cfb55aafdaf3ec08f0db22699ab822c50091b1c4"
+  revision = "73f6ac0b30a98e433b289500d779f50c1a6f0712"
+  version = "v0.1.0"
 
 [[projects]]
-  branch = "master"
   name = "github.com/kr/text"
   packages = ["."]
-  revision = "7cafcd837844e784b526369c9bce262804aebc60"
+  revision = "e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f"
+  version = "v0.1.0"
 
 [[projects]]
   name = "github.com/maruel/panicparse"
   packages = ["stack"]
-  revision = "25bcac0d793cf4109483505a0d66e066a3a90a80"
+  revision = "785840568bdc7faa0dfb1cd6c643207f03271f64"
+  version = "v1.1.1"
 
 [[projects]]
   name = "github.com/mattn/go-runewidth"
   packages = ["."]
-  revision = "14207d285c6c197daabb5c9793d63e7af9ab2d50"
+  revision = "9e777a8366cce605130a531d2cd6363d07ad7317"
+  version = "v0.0.2"
 
 [[projects]]
   branch = "master"
@@ -143,7 +170,17 @@
 
 [[projects]]
   name = "github.com/nbutton23/zxcvbn-go"
-  packages = [".","adjacency","data","entropy","frequency","match","matching","scoring","utils/math"]
+  packages = [
+    ".",
+    "adjacency",
+    "data",
+    "entropy",
+    "frequency",
+    "match",
+    "matching",
+    "scoring",
+    "utils/math"
+  ]
   revision = "eafdab6b0663b4b528c35975c8b0e78be6e25261"
   version = "v0.1"
 
@@ -154,15 +191,16 @@
   revision = "6a197d5ea61168f2ac821de2b7f011b250904900"
 
 [[projects]]
+  branch = "master"
   name = "github.com/nsf/termbox-go"
   packages = ["."]
-  revision = "91bae1bb5fa9ee504905ecbe7043fa30e92feaa3"
+  revision = "21a4d435a86280a2927985fd6296de56cbce453e"
 
 [[projects]]
   branch = "master"
   name = "github.com/pelletier/go-toml"
   packages = ["."]
-  revision = "4e9e0ee19b60b13eb79915933f44d8ed5f268bdd"
+  revision = "66540cf1fcd2c3aee6f6787dfa32a6ae9a870f12"
 
 [[projects]]
   name = "github.com/pkg/errors"
@@ -191,75 +229,174 @@
 [[projects]]
   name = "github.com/spf13/pflag"
   packages = ["."]
-  revision = "e57e3eeb33f795204c1ca35f56c44f83227c6e66"
-  version = "v1.0.0"
+  revision = "583c0c0531f06d5278b7d917446061adc344b5cd"
+  version = "v1.0.1"
 
 [[projects]]
   name = "github.com/stretchr/testify"
-  packages = ["assert"]
-  revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
-  version = "v1.1.4"
+  packages = [
+    "assert",
+    "require"
+  ]
+  revision = "12b6f73e6084dad08a7c6e575284b177ecafbc71"
+  version = "v1.2.1"
 
 [[projects]]
-  branch = "master"
   name = "github.com/vmware/govmomi"
-  packages = [".","find","govc/cli","govc/flags","govc/host/esxcli","internal","license","list","nfc","object","ovf","property","session","task","toolbox","toolbox/hgfs","toolbox/vix","vim25","vim25/debug","vim25/methods","vim25/mo","vim25/progress","vim25/soap","vim25/types","vim25/xml"]
-  revision = "3619c1d9adde46bd8f0c0ac02de1316caec90cdb"
+  packages = [
+    ".",
+    "find",
+    "govc/cli",
+    "govc/flags",
+    "govc/host/esxcli",
+    "internal",
+    "license",
+    "list",
+    "nfc",
+    "object",
+    "ovf",
+    "performance",
+    "property",
+    "session",
+    "task",
+    "toolbox",
+    "toolbox/hgfs",
+    "toolbox/vix",
+    "view",
+    "vim25",
+    "vim25/debug",
+    "vim25/methods",
+    "vim25/mo",
+    "vim25/progress",
+    "vim25/soap",
+    "vim25/types",
+    "vim25/xml"
+  ]
+  revision = "123ed177021588bac57b5c87c1a84270ddf2eca8"
+  version = "v0.17.1"
 
 [[projects]]
-  branch = "master"
   name = "github.com/vmware/vic"
-  packages = ["cmd/vic-machine/common","lib/config","lib/config/dynamic","lib/config/executor","lib/constants","lib/guest","lib/install/data","lib/install/validate","lib/migration/feature","lib/spec","pkg/certificate","pkg/errors","pkg/fetcher","pkg/flags","pkg/ip","pkg/log","pkg/log/syslog","pkg/registry","pkg/trace","pkg/version","pkg/vsphere/datastore","pkg/vsphere/extraconfig","pkg/vsphere/extraconfig/vmomi","pkg/vsphere/optmanager","pkg/vsphere/session","pkg/vsphere/sys","pkg/vsphere/tags","pkg/vsphere/tasks","pkg/vsphere/test/env","pkg/vsphere/vm"]
-  revision = "a3d7a5ff74a3c34695daf848a189ea0994ca68df"
+  packages = [
+    "cmd/vic-machine/common",
+    "lib/config",
+    "lib/config/dynamic",
+    "lib/config/executor",
+    "lib/constants",
+    "lib/guest",
+    "lib/install/data",
+    "lib/install/opsuser",
+    "lib/install/validate",
+    "lib/migration/feature",
+    "lib/spec",
+    "pkg/certificate",
+    "pkg/errors",
+    "pkg/fetcher",
+    "pkg/flags",
+    "pkg/ip",
+    "pkg/log",
+    "pkg/log/syslog",
+    "pkg/registry",
+    "pkg/retry",
+    "pkg/trace",
+    "pkg/version",
+    "pkg/vsphere/compute",
+    "pkg/vsphere/compute/placement",
+    "pkg/vsphere/datastore",
+    "pkg/vsphere/extraconfig",
+    "pkg/vsphere/extraconfig/vmomi",
+    "pkg/vsphere/optmanager",
+    "pkg/vsphere/performance",
+    "pkg/vsphere/rbac",
+    "pkg/vsphere/session",
+    "pkg/vsphere/sys",
+    "pkg/vsphere/tags",
+    "pkg/vsphere/tasks",
+    "pkg/vsphere/test/env",
+    "pkg/vsphere/vm"
+  ]
+  revision = "6c385b0f31264c3b18f4d773f0fe799b2396b860"
+  version = "v1.4.0"
 
 [[projects]]
+  branch = "master"
   name = "github.com/vmware/vmw-guestinfo"
-  packages = ["bdoor","message","rpcout","rpcvmx","vmcheck"]
-  revision = "0b8dbcdd226303bf776dcac49c2d5f3b8a8190fd"
+  packages = [
+    "bdoor",
+    "message",
+    "rpcout",
+    "rpcvmx",
+    "vmcheck"
+  ]
+  revision = "25eff159a728be87e103a0b8045e08273f4dbec4"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/crypto"
-  packages = ["nacl/secretbox","poly1305","salsa20/salsa","ssh/terminal"]
-  revision = "bd6f299fb381e4c3393d1c4b1f0b94f5e77650c8"
+  packages = [
+    "nacl/secretbox",
+    "poly1305",
+    "salsa20/salsa",
+    "ssh/terminal"
+  ]
+  revision = "1a580b3eff7814fc9b40602fd35256c63b50f491"
 
 [[projects]]
+  branch = "master"
+  name = "golang.org/x/lint"
+  packages = ["."]
+  revision = "470b6b0bb3005eda157f0275e2e4895055396a81"
+
+[[projects]]
+  branch = "master"
   name = "golang.org/x/net"
-  packages = ["context","context/ctxhttp"]
-  revision = "a6577fac2d73be281a500b310739095313165611"
+  packages = [
+    "context",
+    "context/ctxhttp"
+  ]
+  revision = "2491c5de3490fced2f6cff376127c667efeed857"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/sync"
   packages = ["errgroup"]
-  revision = "fd80eb99c8f653c847d294a001bdf2a3a6f768f5"
+  revision = "1d60e4601c6fd243af51cc01ddf169918a5407ca"
 
 [[projects]]
+  branch = "master"
   name = "golang.org/x/sys"
-  packages = ["unix","windows"]
-  revision = "99f16d856c9836c42d24e7ab64ea72916925fa97"
+  packages = [
+    "unix",
+    "windows"
+  ]
+  revision = "7c87d13f8e835d2fb3a70a2912c811ed0c1d241b"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/time"
   packages = ["rate"]
-  revision = "6dc17368e09b0e8634d71cac8168d853e869a0c7"
+  revision = "fbb02b2291d28baffd63558aa44b4b56f178d650"
 
 [[projects]]
   branch = "master"
   name = "golang.org/x/tools"
-  packages = ["go/gcexportdata","go/gcimporter15","go/types/typeutil"]
-  revision = "c84da9fa1c1dbcae4557e8c8509abeb814ed9632"
+  packages = [
+    "go/ast/astutil",
+    "go/gcexportdata",
+    "go/internal/gcimporter",
+    "go/types/typeutil"
+  ]
+  revision = "48418e5732e1b1e2a10207c8007a5f959e422f20"
 
 [[projects]]
   name = "gopkg.in/urfave/cli.v1"
   packages = ["."]
-  revision = "0bdeddeeb0f650497d603c4ad7b20cfe685682f6"
-  version = "v1.19.1"
+  revision = "cfb38830724cc34fedffe9a2a29fb54fa9169cd1"
+  version = "v1.20.0"
 
 [solve-meta]
   analyzer-name = "dep"
   analyzer-version = 1
-  inputs-digest = "3c09d851e1b0d042e18b46ec5a8f504bf5662bb3e9b81f8c150c22df95b18c5d"
+  inputs-digest = "3d2c42f997954ab87dcb4e1d9e0e53bcafabec022e52b26883118ec410ce2488"
   solver-name = "gps-cdcl"
   solver-version = 1
diff --git a/installer/Gopkg.toml b/installer/Gopkg.toml
index 9f5dd71259..6902b45da6 100644
--- a/installer/Gopkg.toml
+++ b/installer/Gopkg.toml
@@ -22,41 +22,23 @@
 
 required = ["github.com/golang/dep", "github.com/GoASTScanner/gas", "github.com/go-yaml/yaml", "github.com/golang/lint/golint"]
 
-[[constraint]]
-  name = "github.com/Sirupsen/logrus"
-  version = "0.11.0"
-
-[[constraint]]
-  name = "github.com/coreos/go-systemd"
-
-[[constraint]]
-  name = "github.com/dustin/go-humanize"
-
-[[constraint]]
-  name = "github.com/gizak/termui"
-
-[[constraint]]
-  name = "github.com/gorilla/websocket"
-
-[[constraint]]
-  name = "github.com/spf13/pflag"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/vmware/govmomi"
-
 [[constraint]]
   name = "github.com/vmware/vic"
-  branch = "master"  
+  version = "v1.4.0"  
 
 [[constraint]]
-  name = "github.com/vmware/vmw-guestinfo"
-
-[[constraint]]
-  name = "gopkg.in/urfave/cli.v1"
-  version = "1.19.1"
+  name = "github.com/vmware/govmomi"
+  version = "v0.17.1"
 
 [[constraint]]
   name = "github.com/golang/dep"
   version = "0.3.2"
 
+[[constraint]]
+  name = "github.com/GoASTScanner/gas"
+  revision = "6de76c92610b387855cdfdd53c99b149928916f7"
+
+[prune]
+  non-go = true
+  go-tests = true
+  unused-packages = true 
diff --git a/installer/Makefile b/installer/Makefile
index b595525200..fcc19c605d 100644
--- a/installer/Makefile
+++ b/installer/Makefile
@@ -54,7 +54,7 @@ vendor: $(DEP)
 
 gas: $(GAS)
 	@echo running go AST tool
-	@$(GAS) -quiet fileserver/... landing_server/... lib/... ovatools/... pkg/... tagvm/... toolbox/... 2> /dev/null
+	@$(GAS) -quiet fileserver/... landing_server/... lib/... ovatools/... pkg/... toolbox/... 2> /dev/null
 
 golint: $(GOLINT)
 	@echo checking go lint...
@@ -97,8 +97,6 @@ golintf = $(GOLINT) $(1) | sh -c "! grep -v 'lib/apiservers/portlayer/restapi/op
 
 $(ovfenv): $(call godeps,ovatools/ovfenv/*.go)
 	@echo building ovfenv linux...
-	@echo build $(dir $<)
-	@echo output $@
 	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
 
 $(vic-ova-ui): $(call godeps,ovatools/vic-ova-ui/*.go)
diff --git a/installer/build/bootable/build-base.sh b/installer/build/bootable/build-base.sh
index 2acc7ab5bf..8643fe17cc 100755
--- a/installer/build/bootable/build-base.sh
+++ b/installer/build/bootable/build-base.sh
@@ -57,7 +57,7 @@ function set_base() {
     pkgconfig dbus cpio\
     photon-release tdnf \
     openssh linux-esx sed \
-    gzip tar xz bzip2 \
+    gzip zip tar xz bzip2 \
     glibc iana-etc \
     ca-certificates \
     curl which initramfs \
diff --git a/installer/build/bootable/build-main.sh b/installer/build/bootable/build-main.sh
index 4bec6f086e..293381b3c1 100755
--- a/installer/build/bootable/build-main.sh
+++ b/installer/build/bootable/build-main.sh
@@ -86,6 +86,11 @@ function build_app {
                 SOURCE=$(jq '.['$LINE_NUM'] | .source' "${MANIFEST}" | tr -d '"')
                 DESTINATION=$(echo "${ROOT}/$(cat "${MANIFEST}" | jq '.['$LINE_NUM'] | .destination')" | tr -d '"' )
                 mkdir -p "$(dirname "$DESTINATION")" && cp -R $SOURCE "$DESTINATION"
+                if [[ "$DESTINATION" == *"fileserver/html"* ]]; then
+                    pushd $DESTINATION
+                    rm -fr .gitignore karma* package* js/fixtures js/specs
+                    popd
+                fi
             fi
                 LINE_NUM=$((LINE_NUM+1))
         done
@@ -104,6 +109,7 @@ function build_app {
     TERM="$TERM" \
     DEBUG="$DEBUG" \
     BUILD_VICENGINE_FILE="${BUILD_VICENGINE_FILE}" \
+    BUILD_VICUI_FILE="${BUILD_VICUI_FILE}" \
     BUILD_HARBOR_FILE="${BUILD_HARBOR_FILE}" \
     BUILD_ADMIRAL_REVISION="${BUILD_ADMIRAL_REVISION}" \
     BUILD_OVA_REVISION="${BUILD_OVA_REVISION}" \
diff --git a/installer/build/build-cache.sh b/installer/build/build-cache.sh
index f290a154fe..adb8248bbb 100755
--- a/installer/build/build-cache.sh
+++ b/installer/build/build-cache.sh
@@ -36,6 +36,7 @@ images=(
 downloads=(
   ${BUILD_HARBOR_URL}
   ${BUILD_VICENGINE_URL}
+  ${BUILD_VICUI_URL}
 )
 
 function timecho {
@@ -84,7 +85,7 @@ function cacheOther() {
     else
       timecho "${yarrow} downloading and saving ${brprpl}${filename}${reset}"
       set +e
-      basefile=$(ls "$(dirname "$archive")/$(echo "${filename}" | cut -f1 -d"-" | cut -f1 -d"_" | cut -f1 -d".")"* 2>/dev/null)
+      basefile=$(ls "$(dirname "$archive")/$(echo "${filename}" | grep -v vic | cut -f1 -d"-" | cut -f1 -d"_" | cut -f1 -d".")"* 2>/dev/null)
       [ $? -eq 0 ] && [ -f "$basefile" ] && rm "$basefile"*
       set -e
       add "${download}" "$archive"
diff --git a/installer/build/build-ova.sh b/installer/build/build-ova.sh
index 336e799979..fd13928116 100755
--- a/installer/build/build-ova.sh
+++ b/installer/build/build-ova.sh
@@ -57,6 +57,10 @@ do
       VICENGINE="$2"
       shift 2 # past argument
       ;;
+    --vicui)
+      VICUI="$2"
+      shift 2 # past argument
+      ;;
     --vicmachineserver)
       VIC_MACHINE_SERVER="$2"
       shift 2 # past argument
@@ -84,6 +88,12 @@ if [ -z "${VICENGINE}" ]; then
 fi
 setenv VICENGINE "$url"
 
+url=""
+if [ -z "${VICUI}" ]; then
+    url=$(gsutil ls -l "gs://vic-ui-builds" | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' PIPE; head -1) | xargs | cut -d " " -f 3 | sed 's/gs:\/\//https:\/\/storage.googleapis.com\//')
+fi
+setenv VICUI "$url"
+
 #set Harbor
 url=""
 if [ -z "${HARBOR}" ]; then
@@ -104,6 +114,8 @@ export BUILD_HARBOR_FILE=${BUILD_HARBOR_FILE:-}
 export BUILD_HARBOR_URL=${BUILD_HARBOR_URL:-}
 export BUILD_VICENGINE_FILE=${BUILD_VICENGINE_FILE:-}
 export BUILD_VICENGINE_URL=${BUILD_VICENGINE_URL:-}
+export BUILD_VICUI_FILE=${BUILD_VICUI_FILE:-}
+export BUILD_VICUI_URL=${BUILD_VICUI_URL:-}
 export BUILD_VIC_MACHINE_SERVER_REVISION=${BUILD_VIC_MACHINE_SERVER_REVISION:-}
 export BUILD_ADMIRAL_REVISION=${BUILD_ADMIRAL_REVISION:-}
 export BUILD_OVA_REVISION=${BUILD_OVA_REVISION:-}
@@ -134,6 +146,7 @@ drone deploy --param VICENGINE=${BUILD_VICENGINE_URL:-} \\
              --param VIC_MACHINE_SERVER=${BUILD_VIC_MACHINE_SERVER_REVISION:-} \\
              --param ADMIRAL=${BUILD_ADMIRAL_REVISION:-} \\
              --param HARBOR=${BUILD_HARBOR_URL:-} \\
+             --param VICUI=${BUILD_VICUI_URL:-} \\
              vmware/vic-product ${DRONE_BUILD_NUMBER:-} staging
 EOF
 elif [ "deployment" == "${DRONE_BUILD_EVENT}" -a "staging" == "${DRONE_DEPLOY_TO}" ]; then
@@ -144,6 +157,7 @@ drone deploy --param VICENGINE=${BUILD_VICENGINE_URL:-} \\
              --param VIC_MACHINE_SERVER=${BUILD_VIC_MACHINE_SERVER_REVISION:-} \\
              --param ADMIRAL=${BUILD_ADMIRAL_REVISION:-} \\
              --param HARBOR=${BUILD_HARBOR_URL:-} \\
+             --param VICUI=${BUILD_VICUI_URL:-} \\
              vmware/vic-product ${DRONE_BUILD_NUMBER:-} release
 EOF
 fi
diff --git a/installer/build/build.sh b/installer/build/build.sh
index b5215d62df..1903c75a66 100755
--- a/installer/build/build.sh
+++ b/installer/build/build.sh
@@ -39,8 +39,8 @@ function usage() {
     echo -e "Usage:
       <ova-dev|ova-ci>
       [--admiral|--vicmachineserver] <given a revision, ie. 'dev', 'latest'>
-      [--vicengine|--harbor] <given a url, eg. 'https://storage.googleapis.com/vic-engine-builds/vic_13806.tar.gz'>
-      [--vicengine|--harbor] <given a file in cwd, eg. 'vic_13806.tar.gz'>
+      [--vicengine|--harbor|--vicui] <given a url, eg. 'https://storage.googleapis.com/vic-engine-builds/vic_13806.tar.gz'>
+      [--vicengine|--harbor|--vicui] <given a file in cwd, eg. 'vic_13806.tar.gz'>
       [passthrough args for ./bootable/build-main.sh, eg. '-b bin/.vic-appliance-base.tar.gz']
     ie: $0 ova-dev --harbor v1.2.0-38-ge79334a --vicengine https://storage.googleapis.com/vic-engine-builds/vic_13806.tar.gz --admiral v1.2" >&2
     exit 1
diff --git a/installer/build/ova-manifest.json b/installer/build/ova-manifest.json
index a3df3c4331..1871ec2a31 100644
--- a/installer/build/ova-manifest.json
+++ b/installer/build/ova-manifest.json
@@ -173,11 +173,6 @@
     "source": "../fileserver/files/open_source_license.txt",
     "destination": "/opt/vmware/fileserver/files/open_source_license.txt"
   },
-  {
-    "type": "file",
-    "source": "../fileserver/files/error_index.html",
-    "destination": "/opt/vmware/fileserver/index.html"
-  },
   {
     "type": "file",
     "source": "../landing_server/html",
diff --git a/installer/build/scripts/fileserver/configure_fileserver.sh b/installer/build/scripts/fileserver/configure_fileserver.sh
index e40385b129..315e8ad7fa 100755
--- a/installer/build/scripts/fileserver/configure_fileserver.sh
+++ b/installer/build/scripts/fileserver/configure_fileserver.sh
@@ -14,59 +14,6 @@
 # limitations under the License.
 set -uf -o pipefail
 
-umask 077
-data_dir="/opt/vmware/fileserver"
-files_dir="${data_dir}/files"
-cert="/storage/data/certs/server.crt"
-error_index_file="index.html"
-
-ca_download_dir="${data_dir}/ca_download"
-mkdir -p ${ca_download_dir}
-
-function updateConfigFiles {
-  set -e
-  # cove cli has package in form of vic-adm_*.tar.gz, so use 'vic_*.tar.gz' here
-  # to avoid including cove cli
-  tar_gz=$(find "${data_dir}" -maxdepth 1 -name "vic_*.tar.gz")
-
-  # untar vic package to tmp dir
-  tar -zxf "${tar_gz}" -C /tmp
-
-  # get certificate thumbprint
-  tp=$(openssl x509 -fingerprint -noout -in "${cert}" | awk -F= '{print $2}')
-
-  # replace configs files
-  lconfig=/tmp/vic/ui/VCSA/configs
-  wconfig=/tmp/vic/ui/vCenterForWindows/configs
-
-  cur_tp_l=$(awk '/VIC_UI_HOST_THUMBPRINT=/{print $NF}' $lconfig)
-  sed -i -e s/${cur_tp_l}/VIC_UI_HOST_THUMBPRINT=\"${tp}\"/g $lconfig
-
-  cur_tp_w=$(awk '/vic_ui_host_thumbprint=/{print $NF}' $wconfig)
-  sed -i -e s/${cur_tp_w}/vic_ui_host_thumbprint=${tp}/g $wconfig
-
-  file_server="https://${HOSTNAME}:${FILESERVER_PORT}"
-  cur_file_server_l=$(awk '/VIC_UI_HOST_URL=/{print $NF}' $lconfig)
-  sed -i -e s%${cur_file_server_l}%VIC_UI_HOST_URL=\"${file_server}\"%g $lconfig
-
-  cur_file_server_w=$(awk '/vic_ui_host_url=/{print $NF}' $wconfig)
-  sed -i -e s%${cur_file_server_w}%vic_ui_host_url=${file_server}%g $wconfig
-
-  # tar all files again
-  tar zcf "$files_dir/$(basename $tar_gz)" -C /tmp vic
-  rm -rf /tmp/vic
-}
+mkdir -p "/opt/vmware/fileserver/ca_download"
 
 iptables -w -A INPUT -j ACCEPT -p tcp --dport "${FILESERVER_PORT}"
-
-# Update configurations, run in subshell to preserve +e
-( updateConfigFiles )
-if [ $? -eq 0 ]; then
-  echo "Fileserver configuration complete."
-  if [ -f "${error_index_file}" ]; then
-    rm "${files_dir}/${error_index_file}"
-  fi
-else
-  echo "Fileserver configuration failed."
-  cp "${data_dir}/${error_index_file}" "${files_dir}/${error_index_file}"
-fi
diff --git a/installer/build/scripts/provisioners/provision_fileserver.sh b/installer/build/scripts/provisioners/provision_fileserver.sh
index 07dcad543a..3bda2c7eba 100644
--- a/installer/build/scripts/provisioners/provision_fileserver.sh
+++ b/installer/build/scripts/provisioners/provision_fileserver.sh
@@ -1,5 +1,5 @@
 #!/usr/bin/bash
-# Copyright 2017 VMware, Inc. All Rights Reserved.
+# Copyright 2018 VMware, Inc. All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -19,17 +19,52 @@ FILES_DIR="${DATA_DIR}/files"
 
 mkdir -p /etc/vmware/fileserver # Fileserver config scripts
 mkdir -p ${FILES_DIR}           # Files to serve
-mkdir -p ${DATA_DIR}            # Backup of the original vic tar
-
-cd /var/tmp
 
 echo "Provisioning VIC Engine ${BUILD_VICENGINE_FILE}"
-cp /etc/cache/${BUILD_VICENGINE_FILE} .
+cp "/etc/cache/${BUILD_VICENGINE_FILE}" ${FILES_DIR}
+
+echo "Provisioning VIC UI ${BUILD_VICUI_FILE}"
+
+TMP_FOLDER=/tmp/vic-ui
+mkdir -p ${TMP_FOLDER}
+cd ${TMP_FOLDER}
+tar -xzf /etc/cache/${BUILD_VICUI_FILE} -C "${TMP_FOLDER}" # creates ${TMP_FOLDER}/bin/ui/....
+
+# get version strings
+VIC_BIN_ROOT="${TMP_FOLDER}/bin/"
+FULL_VER_STRING=$(echo "${BUILD_OVA_REVISION}" | sed -e 's/\-rc[[:digit:]]//g')
+MAJOR_MINOR_PATCH=$(echo $FULL_VER_STRING | awk -F- '{print $1}' | cut -c 2-)
+BUILD_NUMBER=$(echo $FULL_VER_STRING | awk -F- '{print $2}')
+VIC_ENGINE_VER_STRING=${MAJOR_MINOR_PATCH}.${BUILD_NUMBER}
+VIC_UI_VER_STRING=$(ls -l ${VIC_BIN_ROOT}ui/plugin-packages | grep '^d' | head -1 | awk '{print $9}' | awk -F- '{print $2}')
+
+# update plugin-package.xml for H5 Client plugin
+echo "Updating description for H5 Client plugin to \"vSphere Client Plugin for vSphere Integrated Containers Engine (v${VIC_ENGINE_VER_STRING})"\"
+cd ${VIC_BIN_ROOT}ui/plugin-packages/com.vmware.vic-${VIC_UI_VER_STRING}
+sed -i "s/H5 Client Plugin for vSphere Integrated Containers Engine/vSphere Client Plugin for vSphere Integrated Containers Engine \(v${VIC_ENGINE_VER_STRING}\)/" plugin-package.xml
+zip -9 -r ${VIC_BIN_ROOT}ui/plugin-packages/com.vmware.vic-${VIC_UI_VER_STRING}.zip ./*
+cd ${TMP_FOLDER}
+
+# update plugin-package.xml for Flex Client plugin
+echo "Updating description for Flex Client plugin to \"vSphere Client Plugin for vSphere Integrated Containers Engine (v${VIC_ENGINE_VER_STRING})\""
+cd ${VIC_BIN_ROOT}ui/vsphere-client-serenity/com.vmware.vic.ui-${VIC_UI_VER_STRING}
+sed -i "s/Flex Client Plugin for vSphere Integrated Containers Engine/vSphere Client Plugin for vSphere Integrated Containers Engine \(v${VIC_ENGINE_VER_STRING}\)/" plugin-package.xml 
+zip -9 -r ${VIC_BIN_ROOT}ui/vsphere-client-serenity/com.vmware.vic.ui-${VIC_UI_VER_STRING}.zip ./*
+cd ${TMP_FOLDER}
+
+# update plugin-manifest
+sed -i "s/summary=.*/summary=\"vSphere Client Plugin for vSphere Integrated Containers Engine (v${VIC_ENGINE_VER_STRING})\"/" ${VIC_BIN_ROOT}ui/plugin-manifest 
+
+echo "version from the vic-ui repo is:  ${VIC_UI_VER_STRING}"
+echo "version from vic-engine is:    ${VIC_ENGINE_VER_STRING}"
+
+tar -czf ${FILES_DIR}/${BUILD_VICUI_FILE} -C ${TMP_FOLDER} .
+find . -iname "*.zip" -exec cp {} ${FILES_DIR} \;
 
-# Copy UI plugin zip files to fileserver directory
-tar tf "${BUILD_VICENGINE_FILE}" | grep "vic/ui" | grep ".zip" | xargs  -I '{}' tar xzf "${BUILD_VICENGINE_FILE}" -C ${FILES_DIR} '{}' --strip-components=3
+# clean up scratch folders
+rm -rf ${TMP_FOLDER}
 
-mv "${BUILD_VICENGINE_FILE}" ${DATA_DIR}
+ls -l ${FILES_DIR}
 
 # Write version files
 echo "engine=${BUILD_VICENGINE_FILE}" >> /data/version
diff --git a/installer/build/scripts/upgrade/upgrade.sh b/installer/build/scripts/upgrade/upgrade.sh
index 94a0393aa2..0ca18f3f71 100755
--- a/installer/build/scripts/upgrade/upgrade.sh
+++ b/installer/build/scripts/upgrade/upgrade.sh
@@ -46,6 +46,7 @@ DESTROY_ENABLED=""
 MANUAL_DISK_MOVE=""
 EMBEDDED_PSC=""
 INSECURE_SKIP_VERIFY=""
+UPGRADE_UI_PLUGIN=""
 
 TIMESTAMP=$(date +"%Y-%m-%d %H:%M:%S %z %Z")
 export REDIRECT_ENABLED=0
@@ -86,22 +87,82 @@ function usage {
 
       [--embedded-psc]:                Using embedded PSC. Do not prompt for external PSC options.
       [--ssh-insecure-skip-verify]:    Skip host key checking when SSHing to the old appliance.
+      [--upgrade-ui-plugin]:           Upgrade ui plugin.
     "
 }
 
+# A plugin upgrade is a forced plugin install
+function callPluginUpgradeEndpoint {
+  local preset=$1
+  local vc='{"target":"'"${VCENTER_TARGET}"'","user":"'"${VCENTER_USERNAME}"'","password":"'"${VCENTER_PASSWORD}"'","thumbprint":"'"${VCENTER_FINGERPRINT}"'"}'
+  local vc_info='{"target":"'"${VCENTER_TARGET}"'","user":"'"${VCENTER_USERNAME}"'","thumbprint":"'"${VCENTER_FINGERPRINT}"'"}'
+  local plugin='{"preset":"'"${preset}"'","force":true}'
+  local payload='{"vc":"${vc}","plugin":"${plugin}"}'
+  local payload_info='{"vc":"${vc_info}","plugin":"${plugin}"}'
+  echo "register payload - ${payload_info}" >> $upgrade_log_file 2>&1
+  /usr/bin/curl \
+    -k \
+    -s \
+    -o /dev/null \
+    --write-out "%{http_code}\\n" \
+    --header "Content-Type: application/json" \
+    -X POST \
+    --data "${payload}" \
+    https://localhost:9443/plugin/upgrade
+}
+
+function upgradeAppliancePlugin {
+  # Upgrade the flex client...
+  tab_retries=0
+  max_tab_retries=30 # 5 minutes
+
+  ret=$(callPluginUpgradeEndpoint FLEX)
+  while [[ "$ret" != *"204"* && "$ret" != *"5"* && ${tab_retries} -lt ${max_tab_retries} ]]; do
+    log "Waiting for upgrade appliance flex plugin..."
+    sleep 10
+    let "tab_retries+=1"
+    ret=$(callPluginUpgradeEndpoint FLEX)
+  done
+
+  if [[ ${tab_retries} -eq ${max_tab_retries} || "$ret" == *"5"* ]]; then
+    log "WARNING: Plugin upgrade failed for the FLEX client. This is expected on vCenter versions 6.7 or higher."
+    log "WARNING: If you expected this to pass on older versions of vSphere, please check your credentials and try again, or contact VMware Support."
+  fi
+
+  # Upgrade the H5 client...
+  tab_retries=0
+  ret=$(callPluginUpgradeEndpoint H5)
+  while [[ "$ret" != *"204"* && "$ret" != *"5"* && ${tab_retries} -lt ${max_tab_retries} ]]; do
+    log "Waiting for upgrade appliance h5 plugin..."
+    sleep 10
+    let "tab_retries+=1"
+    ret=$(callPluginUpgradeEndpoint H5)
+  done
+
+  if [[ ${tab_retries} -eq ${max_tab_retries} || "$ret" == *"5"* ]]; then
+    log "Failed to upgrade appliance h5 plugin. Check vCenter target settings, or contact VMware support."
+    exit 1
+  fi
+}
+
 function callRegisterEndpoint {
+  local payload='{"target":"'"${VCENTER_TARGET}"'","user":"'"${VCENTER_USERNAME}"'","password":"'"${VCENTER_PASSWORD}"'","thumbprint":"'"${VCENTER_FINGERPRINT}"'","externalpsc":"'"${EXTERNAL_PSC}"'","pscdomain":"'"${PSC_DOMAIN}"'"}'
+  local payload_info='{"target":"'"${VCENTER_TARGET}"'","user":"'"${VCENTER_USERNAME}"'","thumbprint":"'"${VCENTER_FINGERPRINT}"'","externalpsc":"'"${EXTERNAL_PSC}"'","pscdomain":"'"${PSC_DOMAIN}"'"}'
+  echo "register payload - ${payload_info}" >> $upgrade_log_file 2>&1
   /usr/bin/curl \
     -k \
-    --write-out '%{http_code}' \
+    -s \
+    -o /dev/null \
+    --write-out "%{http_code}\\n" \
     --header "Content-Type: application/json" \
     -X POST \
-    --data '{"target":"'"${VCENTER_TARGET}"'","user":"'"${VCENTER_USERNAME}"'","password":"'"${VCENTER_PASSWORD}"'","externalpsc":"'"${EXTERNAL_PSC}"'","pscdomain":"'"${PSC_DOMAIN}"'"}' \
+    --data "${payload}" \
     https://localhost:9443/register
 }
 
 # Register appliance for content trust
 function registerAppliance {
-
+  log "Registering the appliance in PSC"
   tab_retries=0
   max_tab_retries=30 # 5 minutes
   while [[ "$(callRegisterEndpoint)" != *"200"* && ${tab_retries} -lt ${max_tab_retries} ]]; do
@@ -114,7 +175,6 @@ function registerAppliance {
     log "Failed to register appliance. Check vCenter target and credentials and provided PSC settings."
     exit 1
   fi
-
 }
 
 # Get PSC tokens for SSO integration
@@ -489,6 +549,9 @@ function main {
       --ssh-insecure-skip-verify)
         INSECURE_SKIP_VERIFY="1"
         ;;
+      --upgrade-ui-plugin)
+        UPGRADE_UI_PLUGIN="y"
+        ;;
       -h|--help|*)
         usage
         exit 0
@@ -522,6 +585,7 @@ function main {
       echo "TLS connection is not secure, unable to proceed with upgrade. Please contact VMware support. Exiting..."
       exit 1
     fi
+    export VCENTER_FINGERPRINT="$(echo "${fingerprint}" | awk '{print $2}')"
     echo "${fingerprint}" > $GOVC_TLS_KNOWN_HOSTS
   else
     log "Using provided vCenter fingerprint from --fingerprint ${VCENTER_FINGERPRINT}"
@@ -532,10 +596,11 @@ function main {
   export GOVC_DATACENTER="$VCENTER_DATACENTER"
   [ -z "${APPLIANCE_TARGET}" ] && read -p "Enter old VIC appliance IP: " APPLIANCE_TARGET
   [ -z "${APPLIANCE_USERNAME}" ] && read -p "Enter old VIC appliance username: " APPLIANCE_USERNAME
+  [ -z "${UPGRADE_UI_PLUGIN}" ] && read -p "Upgrade VIC UI Plugin? (y/n): " UPGRADE_UI_PLUGIN
 
   if [ -n "${DESTROY_ENABLED}" ] ; then
     local resp=""
-    read -p "Destroy option enabled. This will delete the old VIC appliance after upgrade. Are you sure? (y/n):" resp
+    read -p "Destroy option enabled. This will delete the old VIC appliance after upgrade. Are you sure? (y/n): " resp
     if [ "$resp" != "y" ]; then
       echo "Exiting..."
       exit 1
@@ -576,6 +641,11 @@ function main {
   ### -------------------- ###
   ###  Component Upgrades  ###
   ### -------------------- ###
+  if [ "$UPGRADE_UI_PLUGIN" == "y" ]; then
+    log "\n-------------------------\nStarting VIC UI Plugin Upgrade ${TIMESTAMP}\n"
+    upgradeAppliancePlugin
+  fi
+
   log "\n-------------------------\nStarting Admiral Upgrade ${TIMESTAMP}\n"
   upgradeAdmiral
   log "\n-------------------------\nStarting Harbor Upgrade ${TIMESTAMP}\n"
@@ -605,7 +675,11 @@ function finish() {
   if [ "$rc" -eq 0 ]; then
     log ""
     log "-------------------------"
-    log "Upgrade completed successfully. Exiting."
+    if [ "$UPGRADE_UI_PLUGIN" == "y" ]; then
+      log "Upgrade completed successfully. Exiting. All vSphere Client users must log out and log back in again twice to see the vSphere Integrated Containers plug-in."
+    else
+      log "Upgrade completed successfully. Exiting."
+    fi
     log "-------------------------"
     log ""
   else
diff --git a/installer/fileserver/files/error_index.html b/installer/fileserver/files/error_index.html
deleted file mode 100644
index 63fda84ed5..0000000000
--- a/installer/fileserver/files/error_index.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<html>
-  <h1>Error starting VIC Appliance Fileserver.</h1>
-  <p>The VIC Appliance Fileserver failed to configure the VIC archive.</p>
-  <p>It may contain incorrect values required to install the VIC UI plugin.</p>
-  <p>
-    In order to correct this error, you must do one of the following:
-    <ul>
-      <li>Restart the guest OS.</li>
-      <li>SSH to the VIC appliance and execute <pre>systemctl restart fileserver</pre></li>
-    </ul>
-  </p>
-</html>
\ No newline at end of file
diff --git a/installer/fileserver/html/.gitignore b/installer/fileserver/html/.gitignore
new file mode 100644
index 0000000000..73c33901e7
--- /dev/null
+++ b/installer/fileserver/html/.gitignore
@@ -0,0 +1,41 @@
+# Created by https://www.gitignore.io/api/node
+
+### Node ###
+# Logs
+logs
+*.log
+npm-debug.log*
+
+# Runtime data
+pids
+*.pid
+*.seed
+*.pid.lock
+
+# Directory for instrumented libs generated by jscoverage/JSCover
+lib-cov
+
+# Coverage directory used by tools like istanbul
+coverage
+
+# nyc test coverage
+.nyc_output
+
+# Compiled binary addons (http://nodejs.org/api/addons.html)
+build/Release
+
+# Dependency directories
+node_modules/
+jspm_packages/
+
+# Optional npm cache directory
+.npm
+
+# Optional eslint cache
+.eslintcache
+
+# Output of 'npm pack'
+*.tgz
+
+# dotenv environment variables file
+.env
\ No newline at end of file
diff --git a/installer/fileserver/html/index.html b/installer/fileserver/html/index.html
index 9b9866a08c..39d48fea3f 100644
--- a/installer/fileserver/html/index.html
+++ b/installer/fileserver/html/index.html
@@ -18,7 +18,6 @@
     <link rel="stylesheet" href="css/clarity-icons.min.css">
     <link rel="stylesheet" href="css/fontello.css">
     <link rel="stylesheet" href="css/style.css">
-
 </head>
 
 <body id="body">
@@ -30,35 +29,34 @@
             </div>
         </header>
         <main class="content-container">
-            <div class="content-area">
-                <div id="getting-started-items-container">
-                    {{if .InitErrorFeedback }}
-                    <div id="feedback-alert" class="alert alert-danger">
-                        <div class="alert-item">
-                            <span class="alert-text">{{ .InitErrorFeedback }}</span>
-                            <div class="alert-actions">
-                                <a href="/?login=true" title="Login" class="alert-action">Re-initialize</a>
+            <div class="content-area" id="contentArea">
+                <div id="getting-started-items-container" class="mt-0">
+                        {{if .InitErrorFeedback }}
+                        <div id="feedback-alert" class="alert alert-danger">
+                            <div class="alert-item">
+                                <span class="alert-text">{{ .InitErrorFeedback}}</span>
+                                <div class="alert-actions">
+                                    <a href="/?login=true" title="Login" class="alert-action">Re-initialize</a>
+                                </div>
                             </div>
                         </div>
-                    </div>
-                    {{ end }}
-                    {{if .InitSuccessFeedback }}
-                    <div id="feedback-alert" class="alert alert-success">
-                        <div class="alert-item">
-                            <span class="alert-text">{{ .InitSuccessFeedback }}</span>
+                        {{ end }} 
+                        {{if .InitSuccessFeedback }}
+                        <div id="feedback-alert" class="alert alert-success">
+                            <div class="alert-item">
+                                <span class="alert-text">{{ .InitSuccessFeedback }}</span>
+                            </div>
                         </div>
-                    </div>
-                    {{ end }}
-                    <div class="row flex-items-xs-middle my-1 mx-0">
-                        <div class="col-xs"></div>
-                        <div class="col-xs">
-                            <h1 class="text-center my-0">Getting Started</h1>
+                        {{ end }}
+                    <div class="row flex-items-xs-middle my-1 mx-0 pl-3">
+                        <div class="col-xs text-left">
+                            <h1 class="mx-0 mb-2 pl-0">vSphere Integrated
+                            Containers Appliance</h1>
                         </div>
                         <div class="col-xs text-right">
-                            <a href="https://vmware.github.io/vic-product/assets/files/html/1.4/" target="_blank" title="Documentation" class="btn btn-outline mx-0">Documentation</a>
-                        </div>
+                            <a href="https://vmware.github.io/vic-product/assets/files/html/1.4/" target="_blank" title="Documentation" class="btn btn-primary mx-1">Documentation</a>
+                        </div>                      
                     </div>
-
                     <div class="row flex-items-xs-center mx-0">
                         <div class="col-xs-10">
                             <div class="row">
@@ -141,13 +139,49 @@ <h4>Infrastructure Deployment Tools</h4>
                                 </div>
                             </div>
                         </div>
-                        <a href="/?login=true" id="feedback-link" class="btn btn-link px-0 my-2">
+                        <div><a href="/?login=true" id="feedback-link"
+                        class="btn btn-link px-0 mt-1 mb-0">
                             Re-initialize the vSphere Integrated Container Appliance
-                        </a>
+                        </a></div>
                     </div>
                 </div>
                 {{if .NeedLogin}}
-                <div class="modal">
+                <div class="modal" id="plugin-modal" style="display: none">
+                            <div class="modal-dialog" role="dialog"aria-hidden="false">
+                                <div class="modal-content">
+                                    <div class="modal-header">
+                                        <h3 class="modal-title">Complete VIC appliance installation</h3>
+                                    </div>
+                                    <div id="plugin-spinner" style="display: none;text-align: center">
+                                        <div class="spinner"></div>
+                                    </div>
+                                    <div class="modal-body">
+                                        <form id="plugin-form" method="post"  class="pt-0">
+                                            <div id="plugin-body">
+                                                
+                                                <p class="mt-0 mb-1">
+                                                    Certificate thumbprint for
+                                                    vCenter Server <label id="vcenter"></label>
+                                                </p>
+                                                <input id="thumbprint-show" type="text" style="width: 85%;" value="" onkeyup="checkThumbrintInput()"></input>
+                                                <p class="mt-1 mb-1">
+                                                        Click Continue to validate
+                                                        this certificate or cancel
+                                                        if the thumbprint is not valid
+                                                </p>
+                                                <a href="https://vmware.github.io/vic-product/assets/files/html/1.4/vic_vsphere_admin/obtain_thumbprint.html" class="btn btn-link" >Read more...</a>
+                                            </div>
+                                            <div class="modal-footer">
+                                                <button class="btn btn-outline" type="button" onclick="window.location.href='/?login=true'">Cancel</button>
+                                                <button id="plugin-submit" class="btn btn-primary" type="submit">Continue</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                        <div class="modal-backdrop" id="areaBackdrop" aria-hidden="true"></div>
+                <div class="modal" id="login-modal">
                     <div class="modal-dialog" role="dialog" aria-hidden="true">
                         <div class="modal-content">
                             <div class="modal-header">
@@ -168,18 +202,24 @@ <h3 class="modal-title">Complete VIC appliance installation</h3>
                                             </div>
                                         </div>
                                         {{ end }}
+                                        <div class="alert alert-danger mt-0 mb-2" style="display: none" id="thumbprint-alert-div">
+                                                <div class="alert-item">
+                                                    <span id="thumbprint-alert-span" class="alert-text">
+                                                    </span>
+                                                </div>
+                                            </div>
                                         <p class="mt-0 mb-1">
                                             Please enter your vCenter credentials to complete the vSphere Integrated
                                             Containers Appliance installation and PSC settings if using an external instance.
                                         </p>
                                         <div class="form-group">
                                             <label for="target" class="required">vCenter Server</label>
-                                            <input id="target" type="text" name="target" placeholder="FQDN or IP">
+                                            <input id="target" type="text" name="target" placeholder="FQDN or IP" onkeyup="checkRegistryForm()" value="">
                                         </div>
                                         <div class="form-group">
                                             <label for="user" class="required">vCenter Server credentials</label>
-                                            <input id="user" type="text" name="user" placeholder="username@domain.local">
-                                            <input type="password" name="password" placeholder="Password" />
+                                            <input id="user" type="text" name="user" placeholder="username@domain.local" onkeyup="checkRegistryForm()" value="">
+                                            <input id="password" type="password" name="password" placeholder="Password" onkeyup="checkRegistryForm()" value="">
                                         </div>
                                         <div class="form-group">
                                             <label for="psc">External PSC Instance</label>
@@ -189,9 +229,11 @@ <h3 class="modal-title">Complete VIC appliance installation</h3>
                                             <label for="pscDomain">External PSC Admin Domain</label>
                                             <input id="pscDomain" type="text" name="pscDomain" placeholder="vsphere.local">
                                         </div>
+                                        Install UI Plugin <input id="needuiplugin" type="checkbox" name="needuiplugin" value="true" checked>
+                                        <input id="thumbprint" type="hidden" name="thumbprint" placeholder="">
                                     </div>
                                     <div class="text-sm-right">
-                                        <button id="login-submit" type="submit" class="btn btn-primary">Continue</button>
+                                        <button id="login-submit" onclick="submitRegistration()" disabled class="btn btn-primary">Continue</button>
                                     </div>
                                 </form>
                             </div>
@@ -203,31 +245,6 @@ <h3 class="modal-title">Complete VIC appliance installation</h3>
             </div>
         </main>
     </div>
-
-    <script>
-
-        (function() {
-
-            $form = document.getElementById('login-form');
-            $spinner = document.getElementById('login-spinner');
-            $body = document.getElementById('login-body');
-            $submit = document.getElementById('login-submit');
-
-            if ($form) {
-                $form.addEventListener('submit', function(event) {
-                    event.preventDefault();
-                    $submit.setAttribute('disabled', 'disabled');
-                    $body.style.display = 'none';
-                    $spinner.style.display = '';
-                    setTimeout(function() {
-                        $form.submit();
-                    });
-                })
-            }
-
-        })();
-
-    </script>
+    <script src="js/index-handler.js"></script>
 </body>
-
 </html>
diff --git a/installer/fileserver/html/js/fixtures/index.html b/installer/fileserver/html/js/fixtures/index.html
new file mode 100755
index 0000000000..e1934c69c2
--- /dev/null
+++ b/installer/fileserver/html/js/fixtures/index.html
@@ -0,0 +1,96 @@
+<div id="main-container">
+    <div class="modal" id="login-modal">
+        <div class="modal-dialog" role="dialog" aria-hidden="true">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3 class="modal-title">Complete VIC appliance installation</h3>
+                </div>
+                <div id="login-spinner" style="display: none">
+                    <div class="spinner"></div>
+                </div>
+                <div class="modal-body">
+                    <form id="login-form" method="post" class="pt-0">
+                        <div id="login-body">
+                            {{if .ValidationError }}
+                            <div class="alert alert-danger mt-0 mb-2">
+                                <div class="alert-item">
+                                    <span class="alert-text">
+                                        Validation failed: {{ .ValidationError }}
+                                    </span>
+                                </div>
+                            </div>
+                            {{ end }}
+                            <div class="alert alert-danger mt-0
+                            mb-2" style="display: none" id="thumbprint-alert-div">
+                                    <div class="alert-item">
+                                        <span id="thumbprint-alert-span" class="alert-text">
+                                        </span>
+                                    </div>
+                                </div>
+                            <p class="mt-0 mb-1">
+                                Please enter your vCenter credentials to complete the vSphere Integrated
+                                Containers Appliance installation and PSC settings if using an external instance.
+                            </p>
+                            <div class="form-group">
+                                <label for="target" class="required">vCenter Server</label>
+                                <input id="target" type="text" name="target" placeholder="FQDN or IP" onkeyup="checkRegistryForm()" value="">
+                            </div>
+                            <div class="form-group">
+                                <label for="user" class="required">vCenter Server credentials</label>
+                                <input id="user" type="text" name="user" placeholder="username@domain.local" onkeyup="checkRegistryForm()" value="">
+                                <input id="password" type="password" name="password" placeholder="Password" onkeyup="checkRegistryForm()" value="">
+                            </div>
+                            <div class="form-group">
+                                <label for="psc">External PSC Instance</label>
+                                <input id="psc" type="text" name="psc" placeholder="FQDN">
+                            </div>
+                            <div class="form-group">
+                                <label for="pscDomain">External PSC Admin Domain</label>
+                                <input id="pscDomain" type="text" name="pscDomain" placeholder="vsphere.local">
+                            </div>
+                            <input id="thumbprint" type="hidden" name="thumbprint" placeholder="">
+                        </div>
+                        <div class="text-sm-right">
+                            <button id="login-submit" onclick="submitRegistration()" disabled class="btn btn-primary">Continue</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+
+    <div class="modal" id="plugin-modal" style="display: none">
+        <div class="modal-dialog" role="dialog"aria-hidden="false">
+            <div class="modal-content">
+                <div class="modal-header">
+                    <h3 class="modal-title">Complete VIC plugin installation</h3>
+                </div>
+                <div id="plugin-spinner" style="display: none;text-align: center">
+                    <div class="spinner"></div>
+                </div>
+                <div class="modal-body">
+                    <form id="plugin-form" method="post" class="pt-0">
+                        <div id="plugin-body">
+                            
+                            <p class="mt-0 mb-1">
+                                Certificate thumbprint for
+                                vCenter Server <label id="vcenter"></label>
+                            </p>
+                            <input id="thumbprint-show" type="text" style="width: 85%;" value="" onkeyup="checkThumbrintInput()"></input>
+                            <p class="mt-1 mb-1">
+                                    Click Continue to validate
+                                    this certificate or cancel
+                                    if the thumbprint is not valid
+                            </p>
+                            <a href="https://vmware.github.io/vic-product/assets/files/html/1.4/vic_vsphere_admin/obtain_thumbprint.html" class="btn btn-link" >Read more...</a>
+                        </div>
+                        <div class="modal-footer">
+                            <button class="btn btn-outline" type="button" onclick="window.location.href='/?login=true'">Cancel</button>
+                            <button id="plugin-submit" class="btn btn-primary" type="submit">Continue</button>
+                        </div>
+                    </form>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/installer/fileserver/html/js/index-handler.js b/installer/fileserver/html/js/index-handler.js
new file mode 100644
index 0000000000..29cbd9c2bd
--- /dev/null
+++ b/installer/fileserver/html/js/index-handler.js
@@ -0,0 +1,82 @@
+function getThumbprint(target,callback) {
+    var xhr = new XMLHttpRequest();
+    var  thumbprint;
+    xhr.open('POST', '/thumbprint?target=' + target);
+    xhr.onreadystatechange = function() {
+        callback(xhr.response,xhr.status);
+    };
+    xhr.send();             
+}
+
+function checkRegistryForm() {
+    var cansubmit = true;
+
+    if (document.getElementById('target').value.length == 0 || document.getElementById('user').value.length == 0 || document.getElementById('password').value.length == 0){
+        cansubmit = false;
+    }
+    
+    document.getElementById('login-submit').disabled = !cansubmit;
+}
+function checkThumbrintInput() {
+    var cansubmit = true;
+
+    if (document.getElementById('thumbprint-show').value.length == 0){
+        cansubmit = false;
+    }
+    
+    document.getElementById('plugin-submit').disabled = !cansubmit;
+}
+  
+function submitRegistration() {
+//login elements
+
+$loginForm = document.getElementById('login-form');
+$loginSpinner = document.getElementById('login-spinner');
+$loginBody = document.getElementById('login-body');
+$loginSubmit = document.getElementById('login-submit');
+$loginModal = document.getElementById('login-modal');
+//plugin installations elements
+
+$pluginForm = document.getElementById('plugin-form');
+$pluginSpinner = document.getElementById('plugin-spinner');
+$pluginBody = document.getElementById('plugin-body');
+$pluginSubmit = document.getElementById('plugin-submit');
+$pluginModal = document.getElementById('plugin-modal');
+
+    if ($loginForm) {
+        event.preventDefault();
+        $loginSubmit.setAttribute('disabled', 'disabled');
+        $loginBody.style.display = 'none';
+        $loginSpinner.style.display = '';
+        $vc = document.getElementById('target').value;
+        getThumbprint($vc,function (thumbprint,status) {       
+                if (status === 200){
+                    $loginModal.style.display = 'none';
+                    $pluginModal.style.display = '';
+                    checkThumbrintInput();
+                    document.getElementById('thumbprint').value = thumbprint;
+                    document.getElementById('thumbprint-show').value = thumbprint;    
+                }
+                else{
+                    $loginBody.style.display = '';
+                    $loginSpinner.style.display = 'none';
+                    $loginSubmit.removeAttribute("disabled");
+                    document.getElementById('thumbprint-alert-span').textContent = 'code: '+status+' '+thumbprint+', '+'check VC IP/FQDN';
+                    document.getElementById('thumbprint-alert-div').style.display='';
+                }
+            })
+        
+    }
+
+    if ($pluginForm) {
+        $pluginForm.addEventListener('submit', function(event) {
+            event.preventDefault();
+            $pluginSubmit.setAttribute('disabled', 'disabled');
+            $pluginBody.style.display = 'none';
+            $pluginSpinner.style.display = '';
+            setTimeout(function() {              
+                $loginForm.submit();
+            },2000);
+        })
+    }
+}
diff --git a/installer/fileserver/html/js/specs/index-handler-spec.js b/installer/fileserver/html/js/specs/index-handler-spec.js
new file mode 100755
index 0000000000..27513223e2
--- /dev/null
+++ b/installer/fileserver/html/js/specs/index-handler-spec.js
@@ -0,0 +1,126 @@
+
+describe("login/registration modal behavior", function() {
+  //responses for getThumbprint
+  
+  var responses = {
+    success: {
+      status: 200,
+      response: "69:A1:56:73:A4:B2:78:42:56:69:A1:56:73:A4:B2:78:42:56:69:A1:56:73:A4:B2:78:42:56",
+    },
+    failure: {
+      status: 500,
+      response: "Invalid host",
+    }
+  };
+
+  //vc credentials
+  var credentials = {
+    target: "1.2.3.4",
+    user: "admin",
+    password: "adminuser",
+    thumbprint: ""
+  }
+
+  var request;
+  
+  //defining fixtures path
+    beforeAll(function(){
+      var path = '';
+      if (typeof window.__karma__ !== 'undefined') {
+        path += 'base/'
+      } 
+      jasmine.getFixtures().fixturesPath = path + 'js/fixtures';
+      preloadFixtures('index.html');
+      
+    });
+
+    beforeEach(function() {
+        loadFixtures( 'index.html');
+        jasmine.Ajax.install();
+    });
+          
+    afterEach(function() {
+      jasmine.Ajax.uninstall();
+    });
+
+    it ("should be present only the registration modal with their elements", function() {      
+      
+      //Registration modal is still present
+      expect(jQuery('#login-modal')).toBeVisible();
+      
+      //Registration form and their elements are present
+      expect(jQuery('#login-form')).toBeVisible();
+      expect(jQuery('#target')).toBeVisible();
+      expect(jQuery('#user')).toBeVisible();
+      expect(jQuery('input[name=password]')).toBeVisible();
+      expect(jQuery('#login-submit')).toBeVisible();
+    });    
+
+    it ("Should has disabled the continue button when the fields were empty", function(){
+      
+      jQuery('#target').val(credentials.target);
+      checkRegistryForm();
+      expect(jQuery('#login-submit').prop("disabled")).toBe(true);
+
+      jQuery('#user').val(credentials.user);
+      checkRegistryForm();
+      expect(jQuery('#login-submit').prop("disabled")).toBe(true);
+      
+      jQuery('#password').val(credentials.password);
+      checkRegistryForm();
+      expect(jQuery('#login-submit').prop("disabled")).toBe(false);
+    });
+
+    it ("should has disabled the continue button when thumbprint input is empty", function(done) {
+      
+      jQuery('#login-modal').css('display', 'none');
+      jQuery('#plugin-modal').css('display', '');
+      
+      jQuery('#thumbprint-show').val("");
+      checkThumbrintInput();
+      expect(jQuery('#plugin-submit').prop("disabled")).toBe(true);
+
+      jQuery('#thumbprint-show').val(responses.success.response);
+      checkThumbrintInput();
+      expect(jQuery('#plugin-submit').prop("disabled")).toBe(false);
+      done();
+    });
+
+    it ("should retrieve thumbprint when click submit button and hide registration modal", function(done) {
+      var spyEvent = spyOnEvent('#login-submit', 'click');
+      jQuery('#target').val(credentials.target);
+      jQuery('#password').val(credentials.password);
+
+      //Sending thumbprint request
+      jQuery('#login-submit').click(submitRegistration());
+      jQuery('#login-submit').click();
+      request = jasmine.Ajax.requests.mostRecent();
+      request.respondWith(responses.success);
+      
+      //The url of the request must have the target
+      expect(request.url).toBe('/thumbprint?target='+credentials.target);
+      //Thumbprint retrieve
+      expect(jQuery('#thumbprint-show')).toHaveValue(responses.success.response);
+      //Registration modal hide
+      expect(jQuery('#login-modal')).toBeHidden();
+      done();
+    });
+
+    it ("should remains registration modal when click submit button and thumbrint retrieval fails.", function(done) {
+      var spyEvent = spyOnEvent('#login-submit', 'click');
+      jQuery('#login-submit').click(submitRegistration());
+      jQuery('#login-submit').click();
+
+      request = jasmine.Ajax.requests.mostRecent();
+      request.respondWith(responses.failure);  
+
+      //Registration modal is still present
+      expect(jQuery('#login-modal')).toBeVisible();
+      //Plugin modal is still hidden
+      expect(jQuery('#plugin-modal')).toBeHidden();
+      //Show thumbprint retrieve failed
+      expect(jQuery('#thumbprint-alert-div')).toBeVisible();
+      done();
+    });
+  });
+  
\ No newline at end of file
diff --git a/installer/fileserver/html/karma.conf.js b/installer/fileserver/html/karma.conf.js
new file mode 100644
index 0000000000..18a3f020c5
--- /dev/null
+++ b/installer/fileserver/html/karma.conf.js
@@ -0,0 +1,77 @@
+module.exports = function(config) {
+  config.set({
+
+    // base path that will be used to resolve all patterns (eg. files, exclude)
+    basePath: '',
+
+
+    // frameworks to use
+    // available frameworks: https://npmjs.org/browse/keyword/karma-adapter
+    frameworks: ['jasmine-ajax','jasmine-jquery','jasmine'],
+
+
+    // list of files / patterns to load in the browser
+    files: [
+      {pattern: 'js/fixtures/*.html', watched: true, included: false, served: true},
+      // code i want to test
+      'js/index-handler.js',
+      // specs
+      'js/specs/index-handler-spec.js'
+    ],
+
+
+    // list of files / patterns to exclude
+    exclude: [
+    ],
+
+
+    // preprocess matching files before serving them to the browser
+    // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
+    preprocessors: {
+    },
+
+
+    // test results reporter to use
+    // possible values: 'dots', 'progress'
+    // available reporters: https://npmjs.org/browse/keyword/karma-reporter
+    reporters: ['progress'],
+
+
+    // web server port
+    port: 9876,
+
+
+    // enable / disable colors in the output (reporters and logs)
+    colors: true,
+
+
+    // level of logging
+    // possible values: config.LOG_DISABLE || config.LOG_ERROR || config.LOG_WARN || config.LOG_INFO || config.LOG_DEBUG
+    logLevel: config.LOG_DEBUG,
+
+
+    // enable / disable watching file and executing tests whenever any file changes
+    autoWatch: true,
+
+
+    // start these browsers
+    // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
+    browsers: ['PhantomJS'],
+
+    plugins: [
+            'karma-phantomjs-launcher',
+            'karma-jasmine',
+            'karma-jasmine-jquery',
+            'karma-jasmine-ajax'
+            ],
+
+
+    // Continuous Integration mode
+    // if true, Karma captures browsers, runs the tests and exits
+    singleRun: true,
+
+    // Concurrency level
+    // how many browser should be started simultaneous
+    concurrency: Infinity
+  })
+}
diff --git a/installer/fileserver/html/package-lock.json b/installer/fileserver/html/package-lock.json
new file mode 100644
index 0000000000..059143663d
--- /dev/null
+++ b/installer/fileserver/html/package-lock.json
@@ -0,0 +1,5900 @@
+{
+  "name": "vic-uis-auto-installer",
+  "version": "1.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "abbrev": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.0.9.tgz",
+      "integrity": "sha1-kbR5JYinc4wl813W9jdSovh3YTU=",
+      "dev": true
+    },
+    "accepts": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.5.tgz",
+      "integrity": "sha1-63d99gEXI6OxTopywIBcjoZ0a9I=",
+      "dev": true,
+      "requires": {
+        "mime-types": "2.1.18",
+        "negotiator": "0.6.1"
+      }
+    },
+    "addressparser": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/addressparser/-/addressparser-1.0.1.tgz",
+      "integrity": "sha1-R6++GiqSYhkdtoOOT9HTm0CCF0Y=",
+      "dev": true,
+      "optional": true
+    },
+    "after": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/after/-/after-0.8.2.tgz",
+      "integrity": "sha1-/ts5T58OAqqXaOcCvaI7UF+ufh8=",
+      "dev": true
+    },
+    "agent-base": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-4.2.0.tgz",
+      "integrity": "sha512-c+R/U5X+2zz2+UCrCFv6odQzJdoqI+YecuhnAJLa1zYaMc13zPfwMwZrr91Pd1DYNo/yPRbiM4WVf9whgwFsIg==",
+      "dev": true,
+      "requires": {
+        "es6-promisify": "5.0.0"
+      }
+    },
+    "ajv": {
+      "version": "5.5.2",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz",
+      "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=",
+      "dev": true,
+      "requires": {
+        "co": "4.6.0",
+        "fast-deep-equal": "1.1.0",
+        "fast-json-stable-stringify": "2.0.0",
+        "json-schema-traverse": "0.3.1"
+      }
+    },
+    "amdefine": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz",
+      "integrity": "sha1-SlKCrBZHKek2Gbz9OtFR+BfOkfU=",
+      "dev": true,
+      "optional": true
+    },
+    "amqplib": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/amqplib/-/amqplib-0.5.2.tgz",
+      "integrity": "sha512-l9mCs6LbydtHqRniRwYkKdqxVa6XMz3Vw1fh+2gJaaVgTM6Jk3o8RccAKWKtlhT1US5sWrFh+KKxsVUALURSIA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "bitsyntax": "0.0.4",
+        "bluebird": "3.5.1",
+        "buffer-more-ints": "0.0.2",
+        "readable-stream": "1.1.14",
+        "safe-buffer": "5.1.2"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "ansi-regex": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz",
+      "integrity": "sha1-w7M6te42DYbg5ijwRorn7yfWVN8=",
+      "dev": true
+    },
+    "ansi-styles": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-2.2.1.tgz",
+      "integrity": "sha1-tDLdM1i2NM914eRmQ2gkBTPB3b4=",
+      "dev": true,
+      "optional": true
+    },
+    "anymatch": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-1.3.2.tgz",
+      "integrity": "sha512-0XNayC8lTHQ2OI8aljNCN3sSx6hsr/1+rlcDAotXJR7C1oZZHCNsfpbKwMjRA3Uqb5tF1Rae2oloTr4xpq+WjA==",
+      "dev": true,
+      "requires": {
+        "micromatch": "2.3.11",
+        "normalize-path": "2.1.1"
+      }
+    },
+    "archy": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/archy/-/archy-0.0.2.tgz",
+      "integrity": "sha1-kQ9Dv2YUH8M1VkWXq8GJ30Sz014=",
+      "dev": true
+    },
+    "argparse": {
+      "version": "1.0.10",
+      "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz",
+      "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==",
+      "dev": true,
+      "requires": {
+        "sprintf-js": "1.0.3"
+      }
+    },
+    "arr-diff": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-2.0.0.tgz",
+      "integrity": "sha1-jzuCf5Vai9ZpaX5KQlasPOrjVs8=",
+      "dev": true,
+      "requires": {
+        "arr-flatten": "1.1.0"
+      }
+    },
+    "arr-flatten": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz",
+      "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==",
+      "dev": true
+    },
+    "array-filter": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/array-filter/-/array-filter-0.0.1.tgz",
+      "integrity": "sha1-fajPLiZijtcygDWB/SH2fKzS7uw=",
+      "dev": true
+    },
+    "array-map": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-map/-/array-map-0.0.0.tgz",
+      "integrity": "sha1-iKK6tz0c97zVwbEYoAP2b2ZfpmI=",
+      "dev": true
+    },
+    "array-reduce": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/array-reduce/-/array-reduce-0.0.0.tgz",
+      "integrity": "sha1-FziZ0//Rx9k4PkR5Ul2+J4yrXys=",
+      "dev": true
+    },
+    "array-slice": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/array-slice/-/array-slice-0.2.3.tgz",
+      "integrity": "sha1-3Tz7gO15c6dRF82sabC5nshhhvU=",
+      "dev": true
+    },
+    "array-unique": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.2.1.tgz",
+      "integrity": "sha1-odl8yvy8JiXMcPrc6zalDFiwGlM=",
+      "dev": true
+    },
+    "arraybuffer.slice": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/arraybuffer.slice/-/arraybuffer.slice-0.0.7.tgz",
+      "integrity": "sha512-wGUIVQXuehL5TCqQun8OW81jGzAWycqzFF8lFp+GOM5BXLYj3bKNsYC4daB7n6XjCqxQA/qgTJ+8ANR3acjrog==",
+      "dev": true
+    },
+    "asn1": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz",
+      "integrity": "sha1-2sh4dxPJlmhJ/IGAd36+nB3fO4Y=",
+      "dev": true
+    },
+    "assert-plus": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz",
+      "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=",
+      "dev": true
+    },
+    "ast-types": {
+      "version": "0.11.5",
+      "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.11.5.tgz",
+      "integrity": "sha512-oJjo+5e7/vEc2FBK8gUalV0pba4L3VdBIs2EKhOLHLcOd2FgQIVQN9xb0eZ9IjEWyAL7vq6fGJxOvVvdCHNyMw==",
+      "dev": true,
+      "optional": true
+    },
+    "async": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz",
+      "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "async-each": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/async-each/-/async-each-1.0.1.tgz",
+      "integrity": "sha1-GdOGodntxufByF04iu28xW0zYC0=",
+      "dev": true
+    },
+    "async-limiter": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
+      "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg==",
+      "dev": true
+    },
+    "asynckit": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
+      "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=",
+      "dev": true
+    },
+    "aws-sign2": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz",
+      "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=",
+      "dev": true
+    },
+    "aws4": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.7.0.tgz",
+      "integrity": "sha512-32NDda82rhwD9/JBCCkB+MRYDp0oSvlo2IL6rQWA10PQi7tDUM3eqMSltXmY+Oyl/7N3P3qNtAlv7X0d9bI28w==",
+      "dev": true
+    },
+    "axios": {
+      "version": "0.15.3",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-0.15.3.tgz",
+      "integrity": "sha1-LJ1jiy4ZGgjqHWzJiOrda6W9wFM=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "follow-redirects": "1.0.0"
+      },
+      "dependencies": {
+        "follow-redirects": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.0.0.tgz",
+          "integrity": "sha1-jjQpjL0uF28lTv/sdaHHjMhJ/Tc=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9"
+          }
+        }
+      }
+    },
+    "backo2": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/backo2/-/backo2-1.0.2.tgz",
+      "integrity": "sha1-MasayLEpNjRj41s+u2n038+6eUc=",
+      "dev": true
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=",
+      "dev": true
+    },
+    "base64-arraybuffer": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/base64-arraybuffer/-/base64-arraybuffer-0.1.5.tgz",
+      "integrity": "sha1-c5JncZI7Whl0etZmqlzUv5xunOg=",
+      "dev": true
+    },
+    "base64id": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/base64id/-/base64id-1.0.0.tgz",
+      "integrity": "sha1-R2iMuZu2gE8OBtPnY7HDLlfY5rY=",
+      "dev": true
+    },
+    "bcrypt-pbkdf": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz",
+      "integrity": "sha1-Y7xdy2EzG5K8Bf1SiVPDNGKgb40=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "better-assert": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/better-assert/-/better-assert-1.0.2.tgz",
+      "integrity": "sha1-QIZrnhueC1W0gYlDEeaPr/rrxSI=",
+      "dev": true,
+      "requires": {
+        "callsite": "1.0.0"
+      }
+    },
+    "binary": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/binary/-/binary-0.3.0.tgz",
+      "integrity": "sha1-n2BVO8XOjDOG87VTz/R0Yq3sqnk=",
+      "dev": true,
+      "requires": {
+        "buffers": "0.1.1",
+        "chainsaw": "0.1.0"
+      }
+    },
+    "binary-extensions": {
+      "version": "1.11.0",
+      "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-1.11.0.tgz",
+      "integrity": "sha1-RqoXUftqL5PuXmibsQh9SxTGwgU=",
+      "dev": true
+    },
+    "bitsyntax": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/bitsyntax/-/bitsyntax-0.0.4.tgz",
+      "integrity": "sha1-6xDMb4K4xJDj6FaY8H6D1G4MuoI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buffer-more-ints": "0.0.2"
+      }
+    },
+    "bl": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-1.1.2.tgz",
+      "integrity": "sha1-/cqHGplxOqANGeO7ukHER4emU5g=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "readable-stream": "2.0.6"
+      },
+      "dependencies": {
+        "process-nextick-args": {
+          "version": "1.0.7",
+          "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz",
+          "integrity": "sha1-FQ4gt1ZZCtP5EJPyWk8q2L/zC6M=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz",
+          "integrity": "sha1-j5A0HmilPMySh4jaz80Rs265t44=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "1.0.7",
+            "string_decoder": "0.10.31",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "blob": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/blob/-/blob-0.0.4.tgz",
+      "integrity": "sha1-vPEwUspURj8w+fx+lbmkdjCpSSE=",
+      "dev": true
+    },
+    "bluebird": {
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.5.1.tgz",
+      "integrity": "sha512-MKiLiV+I1AA596t9w1sQJ8jkiSr5+ZKi0WKrYGUn6d1Fx+Ij4tIj+m2WMQSGczs5jZVxV339chE8iwk6F64wjA==",
+      "dev": true
+    },
+    "body-parser": {
+      "version": "1.18.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.18.3.tgz",
+      "integrity": "sha1-WykhmP/dVTs6DyDe0FkrlWlVyLQ=",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "content-type": "1.0.4",
+        "debug": "2.6.9",
+        "depd": "1.1.2",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "on-finished": "2.3.0",
+        "qs": "6.5.2",
+        "raw-body": "2.3.3",
+        "type-is": "1.6.16"
+      }
+    },
+    "boom": {
+      "version": "2.10.1",
+      "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz",
+      "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=",
+      "dev": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "bower": {
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/bower/-/bower-1.8.4.tgz",
+      "integrity": "sha1-54dqB23rgTf30GUl3F6MZtuC8oo=",
+      "dev": true
+    },
+    "bower-config": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/bower-config/-/bower-config-0.5.3.tgz",
+      "integrity": "sha1-mPxbQah4cO+cu5KXY1z4H1UF/bE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "2.0.3",
+        "mout": "0.9.1",
+        "optimist": "0.6.1",
+        "osenv": "0.0.3"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+          "dev": true
+        },
+        "osenv": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.0.3.tgz",
+          "integrity": "sha1-zWrY3bKQkVrZ4idlV2Al1BHynLY=",
+          "dev": true
+        }
+      }
+    },
+    "bower-endpoint-parser": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/bower-endpoint-parser/-/bower-endpoint-parser-0.2.2.tgz",
+      "integrity": "sha1-ALVlrb+rby01rd3pd+l5Yqy8s/Y=",
+      "dev": true
+    },
+    "bower-json": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/bower-json/-/bower-json-0.4.0.tgz",
+      "integrity": "sha1-qZw8z0Fu8FkO0N7SUsdg8cbZN2Y=",
+      "dev": true,
+      "requires": {
+        "deep-extend": "0.2.11",
+        "graceful-fs": "2.0.3",
+        "intersect": "0.0.3"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+          "dev": true
+        }
+      }
+    },
+    "bower-logger": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/bower-logger/-/bower-logger-0.2.2.tgz",
+      "integrity": "sha1-Ob4H6Xmy/I4DqUY0IF7ZQiNz04E=",
+      "dev": true
+    },
+    "bower-registry-client": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/bower-registry-client/-/bower-registry-client-0.2.4.tgz",
+      "integrity": "sha1-Jp/H6Ji2J/uTnRFEpZMlTX+77rw=",
+      "dev": true,
+      "requires": {
+        "async": "0.2.10",
+        "bower-config": "0.5.3",
+        "graceful-fs": "2.0.3",
+        "lru-cache": "2.3.1",
+        "mkdirp": "0.3.5",
+        "request": "2.51.0",
+        "request-replay": "0.2.0",
+        "rimraf": "2.2.8"
+      },
+      "dependencies": {
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+          "dev": true
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+          "dev": true
+        },
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+          "dev": true
+        },
+        "bl": {
+          "version": "0.9.5",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34"
+          }
+        },
+        "boom": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+          "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
+          "dev": true,
+          "requires": {
+            "hoek": "0.9.1"
+          }
+        },
+        "caseless": {
+          "version": "0.8.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.8.0.tgz",
+          "integrity": "sha1-W8oogdQUN/VLJAfr40iIx7mtT30=",
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+          "dev": true,
+          "requires": {
+            "delayed-stream": "0.0.5"
+          }
+        },
+        "cryptiles": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+          "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
+          "dev": true,
+          "requires": {
+            "boom": "0.4.2"
+          }
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+          "dev": true
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz",
+          "integrity": "sha1-Jvi8JtpkQOKZy9z7aQNcT3em5GY=",
+          "dev": true,
+          "requires": {
+            "async": "0.9.2",
+            "combined-stream": "0.0.7",
+            "mime-types": "2.0.14"
+          },
+          "dependencies": {
+            "async": {
+              "version": "0.9.2",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+              "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+              "dev": true
+            },
+            "mime-types": {
+              "version": "2.0.14",
+              "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.0.14.tgz",
+              "integrity": "sha1-MQ4VnbI+B3+Lsit0jav6SVcUCqY=",
+              "dev": true,
+              "requires": {
+                "mime-db": "1.12.0"
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-2.0.3.tgz",
+          "integrity": "sha1-fNLNsiiko/Nule+mzBQt59GhNtA=",
+          "dev": true
+        },
+        "hawk": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
+          "dev": true,
+          "requires": {
+            "boom": "0.4.2",
+            "cryptiles": "0.2.2",
+            "hoek": "0.9.1",
+            "sntp": "0.2.4"
+          }
+        },
+        "hoek": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+          "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+          "dev": true,
+          "requires": {
+            "asn1": "0.1.11",
+            "assert-plus": "0.1.5",
+            "ctype": "0.5.3"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "2.3.1",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.3.1.tgz",
+          "integrity": "sha1-s632s9hW6VTiw5DmzvIggSRaU9Y=",
+          "dev": true
+        },
+        "mime-db": {
+          "version": "1.12.0",
+          "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.12.0.tgz",
+          "integrity": "sha1-PQxjGA9FjrENMlqqN9fFiuMS6dc=",
+          "dev": true
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4=",
+          "dev": true
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "dev": true
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.5.0.tgz",
+          "integrity": "sha1-12f1FpMlYg6rLgh+8MRy53PbZGE=",
+          "dev": true
+        },
+        "qs": {
+          "version": "2.3.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-2.3.3.tgz",
+          "integrity": "sha1-6eha2+ddoLvkyOBHaghikPhjtAQ=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "request": {
+          "version": "2.51.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.51.0.tgz",
+          "integrity": "sha1-NdALvswBLlX5B7G9ng29V3v+8m4=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.5.0",
+            "bl": "0.9.5",
+            "caseless": "0.8.0",
+            "combined-stream": "0.0.7",
+            "forever-agent": "0.5.2",
+            "form-data": "0.2.0",
+            "hawk": "1.1.1",
+            "http-signature": "0.10.1",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "1.0.2",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.5.0",
+            "qs": "2.3.3",
+            "stringstream": "0.0.6",
+            "tough-cookie": "2.3.4",
+            "tunnel-agent": "0.4.3"
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
+          "dev": true
+        },
+        "sntp": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+          "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
+          "dev": true,
+          "requires": {
+            "hoek": "0.9.1"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        }
+      }
+    },
+    "brace-expansion": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
+      "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
+      "dev": true,
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "braces": {
+      "version": "1.8.5",
+      "resolved": "https://registry.npmjs.org/braces/-/braces-1.8.5.tgz",
+      "integrity": "sha1-uneWLhLf+WnWt2cR6RS3N4V79qc=",
+      "dev": true,
+      "requires": {
+        "expand-range": "1.8.2",
+        "preserve": "0.2.0",
+        "repeat-element": "1.1.2"
+      }
+    },
+    "buffer-from": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz",
+      "integrity": "sha512-c5mRlguI/Pe2dSZmpER62rSCu0ryKmWddzRYsuXc50U2/g8jMOulc31VZMa4mYx31U5xsmSOpDCgH88Vl9cDGQ==",
+      "dev": true
+    },
+    "buffer-more-ints": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/buffer-more-ints/-/buffer-more-ints-0.0.2.tgz",
+      "integrity": "sha1-JrOIXRD6E9t/wBquOquHAZngEkw=",
+      "dev": true
+    },
+    "buffers": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/buffers/-/buffers-0.1.1.tgz",
+      "integrity": "sha1-skV5w77U1tOWru5tmorn9Ugqt7s=",
+      "dev": true
+    },
+    "buildmail": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/buildmail/-/buildmail-4.0.1.tgz",
+      "integrity": "sha1-h393OLeHKYccmhBeO4N9K+EaenI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "addressparser": "1.0.1",
+        "libbase64": "0.1.0",
+        "libmime": "3.0.0",
+        "libqp": "1.1.0",
+        "nodemailer-fetch": "1.6.0",
+        "nodemailer-shared": "1.1.0",
+        "punycode": "1.4.1"
+      }
+    },
+    "bytes": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz",
+      "integrity": "sha1-0ygVQE1olpn4Wk6k+odV3ROpYEg=",
+      "dev": true
+    },
+    "callsite": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz",
+      "integrity": "sha1-KAOY5dZkvXQDi28JBRU+borxvCA=",
+      "dev": true
+    },
+    "cardinal": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-0.4.0.tgz",
+      "integrity": "sha1-fRCq+yCDe94EPEXkOgyMKM2q5F4=",
+      "dev": true,
+      "requires": {
+        "redeyed": "0.4.4"
+      }
+    },
+    "caseless": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
+      "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=",
+      "dev": true
+    },
+    "chainsaw": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz",
+      "integrity": "sha1-XqtQsor+WAdNDVgpE4iCi15fvJg=",
+      "dev": true,
+      "requires": {
+        "traverse": "0.3.9"
+      }
+    },
+    "chalk": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz",
+      "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ansi-styles": "2.2.1",
+        "escape-string-regexp": "1.0.5",
+        "has-ansi": "2.0.0",
+        "strip-ansi": "3.0.1",
+        "supports-color": "2.0.0"
+      }
+    },
+    "chmodr": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/chmodr/-/chmodr-0.1.0.tgz",
+      "integrity": "sha1-4JIVodUVQtsqJXaWl2W89hJVg+s=",
+      "dev": true
+    },
+    "chokidar": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-1.7.0.tgz",
+      "integrity": "sha1-eY5ol3gVHIB2tLNg5e3SjNortGg=",
+      "dev": true,
+      "requires": {
+        "anymatch": "1.3.2",
+        "async-each": "1.0.1",
+        "fsevents": "1.2.4",
+        "glob-parent": "2.0.0",
+        "inherits": "2.0.3",
+        "is-binary-path": "1.0.1",
+        "is-glob": "2.0.1",
+        "path-is-absolute": "1.0.1",
+        "readdirp": "2.1.0"
+      }
+    },
+    "circular-json": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/circular-json/-/circular-json-0.5.4.tgz",
+      "integrity": "sha512-vnJA8KS0BfOihugYEUkLRcnmq21FbuivbxgzDLXNs3zIk4KllV4Mx4UuTzBXht9F00C7QfD1YqMXg1zP6EXpig==",
+      "dev": true
+    },
+    "cli-color": {
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/cli-color/-/cli-color-0.3.3.tgz",
+      "integrity": "sha1-EtW90Vj/igsNtAEZiRPAPfBp9vU=",
+      "dev": true,
+      "requires": {
+        "d": "0.1.1",
+        "es5-ext": "0.10.44",
+        "memoizee": "0.3.10",
+        "timers-ext": "0.1.5"
+      }
+    },
+    "co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=",
+      "dev": true
+    },
+    "colors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/colors/-/colors-1.3.0.tgz",
+      "integrity": "sha512-EDpX3a7wHMWFA7PUHWPHNWqOxIIRSJetuwl0AS5Oi/5FMV8kWm69RTlgm00GKjBO1xFHMtBbL49yRtMMdticBw==",
+      "dev": true
+    },
+    "combine-lists": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/combine-lists/-/combine-lists-1.0.1.tgz",
+      "integrity": "sha1-RYwH4J4NkA/Ci3Cj/sLazR0st/Y=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10"
+      }
+    },
+    "combined-stream": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.6.tgz",
+      "integrity": "sha1-cj599ugBrFYTETp+RFqbactjKBg=",
+      "dev": true,
+      "requires": {
+        "delayed-stream": "1.0.0"
+      }
+    },
+    "commander": {
+      "version": "2.15.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz",
+      "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==",
+      "dev": true,
+      "optional": true
+    },
+    "component-bind": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/component-bind/-/component-bind-1.0.0.tgz",
+      "integrity": "sha1-AMYIq33Nk4l8AAllGx06jh5zu9E=",
+      "dev": true
+    },
+    "component-emitter": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz",
+      "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=",
+      "dev": true
+    },
+    "component-inherit": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/component-inherit/-/component-inherit-0.0.3.tgz",
+      "integrity": "sha1-ZF/ErfWLcrZJ1crmUTVhnbJv8UM=",
+      "dev": true
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=",
+      "dev": true
+    },
+    "concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "dev": true,
+      "requires": {
+        "buffer-from": "1.1.0",
+        "inherits": "2.0.3",
+        "readable-stream": "2.3.6",
+        "typedarray": "0.0.6"
+      }
+    },
+    "config-chain": {
+      "version": "1.1.11",
+      "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.11.tgz",
+      "integrity": "sha1-q6CXR9++TD5w52am5BWG4YWfxvI=",
+      "dev": true,
+      "requires": {
+        "ini": "1.3.5",
+        "proto-list": "1.2.4"
+      }
+    },
+    "configstore": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/configstore/-/configstore-0.3.2.tgz",
+      "integrity": "sha1-JeTBbDdoq/dcWmW8YXYfSVBVtFk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "3.0.11",
+        "js-yaml": "3.11.0",
+        "mkdirp": "0.5.1",
+        "object-assign": "2.1.1",
+        "osenv": "0.1.0",
+        "user-home": "1.1.1",
+        "uuid": "2.0.3",
+        "xdg-basedir": "1.0.1"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.4"
+          }
+        },
+        "object-assign": {
+          "version": "2.1.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-2.1.1.tgz",
+          "integrity": "sha1-Q8NuXVaf+OSBbE76i+AtJpZ8GKo=",
+          "dev": true
+        },
+        "uuid": {
+          "version": "2.0.3",
+          "resolved": "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz",
+          "integrity": "sha1-Z+LoY3lyFVMN/zGOW/nc6/1Hsho=",
+          "dev": true
+        }
+      }
+    },
+    "connect": {
+      "version": "3.6.6",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.6.6.tgz",
+      "integrity": "sha1-Ce/2xVr3I24TcTWnJXSFi2eG9SQ=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.0",
+        "parseurl": "1.3.2",
+        "utils-merge": "1.0.1"
+      }
+    },
+    "content-type": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz",
+      "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==",
+      "dev": true
+    },
+    "cookie": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz",
+      "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=",
+      "dev": true
+    },
+    "core-js": {
+      "version": "2.5.7",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz",
+      "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==",
+      "dev": true
+    },
+    "core-util-is": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
+      "dev": true
+    },
+    "cryptiles": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz",
+      "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1"
+      }
+    },
+    "ctype": {
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/ctype/-/ctype-0.5.3.tgz",
+      "integrity": "sha1-gsGMJGH3QRTvFsE1IkrQuRRMoS8=",
+      "dev": true
+    },
+    "custom-event": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/custom-event/-/custom-event-1.0.1.tgz",
+      "integrity": "sha1-XQKkaFCt8bSjF5RqOSj8y1v9BCU=",
+      "dev": true
+    },
+    "d": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/d/-/d-0.1.1.tgz",
+      "integrity": "sha1-2hhMU10Y2O57oqoim5FACfrhEwk=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.44"
+      }
+    },
+    "dashdash": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz",
+      "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "data-uri-to-buffer": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-1.2.0.tgz",
+      "integrity": "sha512-vKQ9DTQPN1FLYiiEEOQ6IBGFqvjCa5rSK3cWMy/Nespm5d/x3dGFT9UBZnkLxCwua/IXBi2TYnwTEpsOvhC4UQ==",
+      "dev": true,
+      "optional": true
+    },
+    "date-format": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/date-format/-/date-format-1.2.0.tgz",
+      "integrity": "sha1-YV6CjiM90aubua4JUODOzPpuytg=",
+      "dev": true
+    },
+    "debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dev": true,
+      "requires": {
+        "ms": "2.0.0"
+      }
+    },
+    "decompress-zip": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/decompress-zip/-/decompress-zip-0.0.8.tgz",
+      "integrity": "sha1-SiZbIseyCdeyT6ZvKy37ztWQRPM=",
+      "dev": true,
+      "requires": {
+        "binary": "0.3.0",
+        "graceful-fs": "3.0.11",
+        "mkpath": "0.1.0",
+        "nopt": "2.2.1",
+        "q": "1.0.1",
+        "readable-stream": "1.1.14",
+        "touch": "0.0.2"
+      },
+      "dependencies": {
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.4"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "nopt": {
+          "version": "2.2.1",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.2.1.tgz",
+          "integrity": "sha1-KqCbfRdoSHs7ianFqlIzW/8Lrqc=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.0.9"
+          }
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "deep-extend": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.2.11.tgz",
+      "integrity": "sha1-eha6aXKRMjQFBhcElLyD9wdv4I8=",
+      "dev": true
+    },
+    "deep-is": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
+      "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
+      "dev": true,
+      "optional": true
+    },
+    "degenerator": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/degenerator/-/degenerator-1.0.4.tgz",
+      "integrity": "sha1-/PSQo37OJmRk2cxDGrmMWBnO0JU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ast-types": "0.11.5",
+        "escodegen": "1.9.1",
+        "esprima": "3.1.3"
+      }
+    },
+    "delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha1-3zrhmayt+31ECqrgsp4icrJOxhk=",
+      "dev": true
+    },
+    "depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "dev": true
+    },
+    "di": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/di/-/di-0.0.1.tgz",
+      "integrity": "sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=",
+      "dev": true
+    },
+    "dom-serialize": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/dom-serialize/-/dom-serialize-2.2.1.tgz",
+      "integrity": "sha1-ViromZ9Evl6jB29UGdzVnrQ6yVs=",
+      "dev": true,
+      "requires": {
+        "custom-event": "1.0.1",
+        "ent": "2.2.0",
+        "extend": "3.0.1",
+        "void-elements": "2.0.1"
+      }
+    },
+    "double-ended-queue": {
+      "version": "2.1.0-0",
+      "resolved": "https://registry.npmjs.org/double-ended-queue/-/double-ended-queue-2.1.0-0.tgz",
+      "integrity": "sha1-ED01J/0xUo9AGIEwyEHv3XgmTlw=",
+      "dev": true,
+      "optional": true
+    },
+    "ecc-jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz",
+      "integrity": "sha1-D8c6ntXw1Tw4GTOYUj735UN3dQU=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "jsbn": "0.1.1"
+      }
+    },
+    "ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha1-WQxhFWsK4vTwJVcyoViyZrxWsh0=",
+      "dev": true
+    },
+    "encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha1-rT/0yG7C0CkyL1oCw6mmBslbP1k=",
+      "dev": true
+    },
+    "end-of-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.0.0.tgz",
+      "integrity": "sha1-1FlucCc0qT5A6a+GQxnqvZn/Lw4=",
+      "dev": true,
+      "requires": {
+        "once": "1.3.3"
+      },
+      "dependencies": {
+        "once": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        }
+      }
+    },
+    "engine.io": {
+      "version": "3.1.5",
+      "resolved": "https://registry.npmjs.org/engine.io/-/engine.io-3.1.5.tgz",
+      "integrity": "sha512-D06ivJkYxyRrcEe0bTpNnBQNgP9d3xog+qZlLbui8EsMr/DouQpf5o9FzJnWYHEYE0YsFHllUv2R1dkgYZXHcA==",
+      "dev": true,
+      "requires": {
+        "accepts": "1.3.5",
+        "base64id": "1.0.0",
+        "cookie": "0.3.1",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.2",
+        "uws": "9.14.0",
+        "ws": "3.3.3"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-client": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-3.1.6.tgz",
+      "integrity": "sha512-hnuHsFluXnsKOndS4Hv6SvUrgdYx1pk2NqfaDMW+GWdgfU3+/V25Cj7I8a0x92idSpa5PIhJRKxPvp9mnoLsfg==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "component-inherit": "0.0.3",
+        "debug": "3.1.0",
+        "engine.io-parser": "2.1.2",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "ws": "3.3.3",
+        "xmlhttprequest-ssl": "1.5.5",
+        "yeast": "0.1.2"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "engine.io-parser": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-2.1.2.tgz",
+      "integrity": "sha512-dInLFzr80RijZ1rGpx1+56/uFoH7/7InhH3kZt+Ms6hT8tNx3NGW/WNSA/f8As1WkOfkuyb3tnRyuXGxusclMw==",
+      "dev": true,
+      "requires": {
+        "after": "0.8.2",
+        "arraybuffer.slice": "0.0.7",
+        "base64-arraybuffer": "0.1.5",
+        "blob": "0.0.4",
+        "has-binary2": "1.0.3"
+      }
+    },
+    "ent": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ent/-/ent-2.2.0.tgz",
+      "integrity": "sha1-6WQhkyWiHQX0RGai9obtbOX13R0=",
+      "dev": true
+    },
+    "es5-ext": {
+      "version": "0.10.44",
+      "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.44.tgz",
+      "integrity": "sha512-TO4Vt9IhW3FzDKLDOpoA8VS9BCV4b9WTf6BqvMOgfoa8wX73F3Kh3y2J7yTstTaXlQ0k1vq4DH2vw6RSs42z+g==",
+      "dev": true,
+      "requires": {
+        "es6-iterator": "2.0.3",
+        "es6-symbol": "3.1.1",
+        "next-tick": "1.0.0"
+      }
+    },
+    "es6-iterator": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-2.0.3.tgz",
+      "integrity": "sha1-p96IkUGgWpSwhUQDstCg+/qY87c=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.44",
+        "es6-symbol": "3.1.1"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.44"
+          }
+        }
+      }
+    },
+    "es6-promise": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/es6-promise/-/es6-promise-4.2.4.tgz",
+      "integrity": "sha512-/NdNZVJg+uZgtm9eS3O6lrOLYmQag2DjdEXuPaHlZ6RuVqgqaVZfgYCepEIKsLqwdQArOPtC3XzRLqGGfT8KQQ==",
+      "dev": true
+    },
+    "es6-promisify": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/es6-promisify/-/es6-promisify-5.0.0.tgz",
+      "integrity": "sha1-UQnWLz5W6pZ8S2NQWu8IKRyKUgM=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "4.2.4"
+      }
+    },
+    "es6-symbol": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-3.1.1.tgz",
+      "integrity": "sha1-vwDvT9q2uhtG7Le2KbTH7VcVzHc=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.44"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.44"
+          }
+        }
+      }
+    },
+    "es6-weak-map": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/es6-weak-map/-/es6-weak-map-0.1.4.tgz",
+      "integrity": "sha1-cGzvnpmqI2undmwjnIueKG6n0ig=",
+      "dev": true,
+      "requires": {
+        "d": "0.1.1",
+        "es5-ext": "0.10.44",
+        "es6-iterator": "0.1.3",
+        "es6-symbol": "2.0.1"
+      },
+      "dependencies": {
+        "es6-iterator": {
+          "version": "0.1.3",
+          "resolved": "https://registry.npmjs.org/es6-iterator/-/es6-iterator-0.1.3.tgz",
+          "integrity": "sha1-1vWLjE/EE8JJtLqhl2j45NfIlE4=",
+          "dev": true,
+          "requires": {
+            "d": "0.1.1",
+            "es5-ext": "0.10.44",
+            "es6-symbol": "2.0.1"
+          }
+        },
+        "es6-symbol": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/es6-symbol/-/es6-symbol-2.0.1.tgz",
+          "integrity": "sha1-dhtcZ8/U8dGK+yNPaR1nhoLLO/M=",
+          "dev": true,
+          "requires": {
+            "d": "0.1.1",
+            "es5-ext": "0.10.44"
+          }
+        }
+      }
+    },
+    "escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha1-Aljq5NPQwJdN4cFpGI7wBR0dGYg=",
+      "dev": true
+    },
+    "escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=",
+      "dev": true
+    },
+    "escodegen": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.9.1.tgz",
+      "integrity": "sha512-6hTjO1NAWkHnDk3OqQ4YrCuwwmGHL9S3nPlzBOUG/R44rda3wLNrfvQ5fkSGjyhHFKM7ALPKcKGrwvCLe0lC7Q==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "esprima": "3.1.3",
+        "estraverse": "4.2.0",
+        "esutils": "2.0.2",
+        "optionator": "0.8.2",
+        "source-map": "0.6.1"
+      }
+    },
+    "esprima": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz",
+      "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=",
+      "dev": true
+    },
+    "estraverse": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz",
+      "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=",
+      "dev": true,
+      "optional": true
+    },
+    "esutils": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz",
+      "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=",
+      "dev": true,
+      "optional": true
+    },
+    "event-emitter": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/event-emitter/-/event-emitter-0.3.5.tgz",
+      "integrity": "sha1-34xp7vFkeSPHFXuc6DhAYQsCzDk=",
+      "dev": true,
+      "requires": {
+        "d": "1.0.0",
+        "es5-ext": "0.10.44"
+      },
+      "dependencies": {
+        "d": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/d/-/d-1.0.0.tgz",
+          "integrity": "sha1-dUu1v+VUUdpppYuU1F9MWwRi1Y8=",
+          "dev": true,
+          "requires": {
+            "es5-ext": "0.10.44"
+          }
+        }
+      }
+    },
+    "eventemitter3": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-3.1.0.tgz",
+      "integrity": "sha512-ivIvhpq/Y0uSjcHDcOIccjmYjGLcP09MFGE7ysAwkAvkXfpZlC985pH2/ui64DKazbTW/4kN3yqozUxlXzI6cA==",
+      "dev": true
+    },
+    "expand-braces": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/expand-braces/-/expand-braces-0.1.2.tgz",
+      "integrity": "sha1-SIsdHSRRyz06axks/AMPRMWFX+o=",
+      "dev": true,
+      "requires": {
+        "array-slice": "0.2.3",
+        "array-unique": "0.2.1",
+        "braces": "0.1.5"
+      },
+      "dependencies": {
+        "braces": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/braces/-/braces-0.1.5.tgz",
+          "integrity": "sha1-wIVxEIUpHYt1/ddOqw+FlygHEeY=",
+          "dev": true,
+          "requires": {
+            "expand-range": "0.1.1"
+          }
+        },
+        "expand-range": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-0.1.1.tgz",
+          "integrity": "sha1-TLjtoJk8pW+k9B/ELzy7TMrf8EQ=",
+          "dev": true,
+          "requires": {
+            "is-number": "0.1.1",
+            "repeat-string": "0.2.2"
+          }
+        },
+        "is-number": {
+          "version": "0.1.1",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-0.1.1.tgz",
+          "integrity": "sha1-aaevEWlj1HIG7JvZtIoUIW8eOAY=",
+          "dev": true
+        },
+        "repeat-string": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-0.2.2.tgz",
+          "integrity": "sha1-x6jTI2BoNiBZp+RlH8aITosftK4=",
+          "dev": true
+        }
+      }
+    },
+    "expand-brackets": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-0.1.5.tgz",
+      "integrity": "sha1-3wcoTjQqgHzXM6xa9yQR5YHRF3s=",
+      "dev": true,
+      "requires": {
+        "is-posix-bracket": "0.1.1"
+      }
+    },
+    "expand-range": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/expand-range/-/expand-range-1.8.2.tgz",
+      "integrity": "sha1-opnv/TNf4nIeuujiV+x5ZE/IUzc=",
+      "dev": true,
+      "requires": {
+        "fill-range": "2.2.4"
+      }
+    },
+    "extend": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.1.tgz",
+      "integrity": "sha1-p1Xqe8Gt/MWjHOfnYtuq3F5jZEQ=",
+      "dev": true
+    },
+    "extglob": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/extglob/-/extglob-0.3.2.tgz",
+      "integrity": "sha1-Lhj/PS9JqydlzskCPwEdqo2DSaE=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "extract-zip": {
+      "version": "1.6.7",
+      "resolved": "https://registry.npmjs.org/extract-zip/-/extract-zip-1.6.7.tgz",
+      "integrity": "sha1-qEC0uK9kAyZMjbV/Txp0Mz74H+k=",
+      "dev": true,
+      "requires": {
+        "concat-stream": "1.6.2",
+        "debug": "2.6.9",
+        "mkdirp": "0.5.1",
+        "yauzl": "2.4.1"
+      }
+    },
+    "extsprintf": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz",
+      "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=",
+      "dev": true
+    },
+    "fast-deep-equal": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz",
+      "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=",
+      "dev": true
+    },
+    "fast-json-stable-stringify": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz",
+      "integrity": "sha1-1RQsDK7msRifh9OnYREGT4bIu/I=",
+      "dev": true
+    },
+    "fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=",
+      "dev": true,
+      "optional": true
+    },
+    "fd-slicer": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz",
+      "integrity": "sha1-i1vL2ewyfFBBv5qwI/1nUPEXfmU=",
+      "dev": true,
+      "requires": {
+        "pend": "1.2.0"
+      }
+    },
+    "figures": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/figures/-/figures-1.7.0.tgz",
+      "integrity": "sha1-y+Hjr/zxzUS4DK3+0o3Hk6lwHS4=",
+      "dev": true,
+      "requires": {
+        "escape-string-regexp": "1.0.5",
+        "object-assign": "4.1.1"
+      }
+    },
+    "file-uri-to-path": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz",
+      "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==",
+      "dev": true,
+      "optional": true
+    },
+    "filename-regex": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/filename-regex/-/filename-regex-2.0.1.tgz",
+      "integrity": "sha1-wcS5vuPglyXdsQa3XB4wH+LxiyY=",
+      "dev": true
+    },
+    "fill-range": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-2.2.4.tgz",
+      "integrity": "sha512-cnrcCbj01+j2gTG921VZPnHbjmdAf8oQV/iGeV2kZxGSyfYjjTyY79ErsK1WJWMpw6DaApEX72binqJE+/d+5Q==",
+      "dev": true,
+      "requires": {
+        "is-number": "2.1.0",
+        "isobject": "2.1.0",
+        "randomatic": "3.0.0",
+        "repeat-element": "1.1.2",
+        "repeat-string": "1.6.1"
+      }
+    },
+    "finalhandler": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.0.tgz",
+      "integrity": "sha1-zgtoVbRYU+eRsvzGgARtiCU91/U=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "encodeurl": "1.0.2",
+        "escape-html": "1.0.3",
+        "on-finished": "2.3.0",
+        "parseurl": "1.3.2",
+        "statuses": "1.3.1",
+        "unpipe": "1.0.0"
+      },
+      "dependencies": {
+        "statuses": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz",
+          "integrity": "sha1-+vUbnrdKrvOzrPStX2Gr8ky3uT4=",
+          "dev": true
+        }
+      }
+    },
+    "follow-redirects": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.0.tgz",
+      "integrity": "sha512-fdrt472/9qQ6Kgjvb935ig6vJCuofpBUD14f9Vb+SLlm7xIe4Qva5gey8EKtv8lp7ahE1wilg3xL1znpVGtZIA==",
+      "dev": true,
+      "requires": {
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "for-in": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz",
+      "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=",
+      "dev": true
+    },
+    "for-own": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/for-own/-/for-own-0.1.5.tgz",
+      "integrity": "sha1-UmXGgaTylNq78XyVCbZ2OqhFEM4=",
+      "dev": true,
+      "requires": {
+        "for-in": "1.0.2"
+      }
+    },
+    "forever-agent": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
+      "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=",
+      "dev": true
+    },
+    "form-data": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz",
+      "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=",
+      "dev": true,
+      "requires": {
+        "asynckit": "0.4.0",
+        "combined-stream": "1.0.6",
+        "mime-types": "2.1.18"
+      }
+    },
+    "fs-extra": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-1.0.0.tgz",
+      "integrity": "sha1-zTzl9+fLYUWIP8rjGR6Yd/hYeVA=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "jsonfile": "2.4.0",
+        "klaw": "1.3.1"
+      }
+    },
+    "fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=",
+      "dev": true
+    },
+    "fsevents": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz",
+      "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nan": "2.10.0",
+        "node-pre-gyp": "0.10.0"
+      },
+      "dependencies": {
+        "abbrev": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "ansi-regex": {
+          "version": "2.1.1",
+          "bundled": true
+        },
+        "aproba": {
+          "version": "1.2.0",
+          "bundled": true,
+          "optional": true
+        },
+        "are-we-there-yet": {
+          "version": "1.1.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "delegates": "1.0.0",
+            "readable-stream": "2.3.6"
+          }
+        },
+        "balanced-match": {
+          "version": "1.0.0",
+          "bundled": true
+        },
+        "brace-expansion": {
+          "version": "1.1.11",
+          "bundled": true,
+          "requires": {
+            "balanced-match": "1.0.0",
+            "concat-map": "0.0.1"
+          }
+        },
+        "chownr": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "code-point-at": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "concat-map": {
+          "version": "0.0.1",
+          "bundled": true
+        },
+        "console-control-strings": {
+          "version": "1.1.0",
+          "bundled": true
+        },
+        "core-util-is": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "debug": {
+          "version": "2.6.9",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "deep-extend": {
+          "version": "0.5.1",
+          "bundled": true,
+          "optional": true
+        },
+        "delegates": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "detect-libc": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "fs-minipass": {
+          "version": "1.2.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "fs.realpath": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "gauge": {
+          "version": "2.7.4",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "aproba": "1.2.0",
+            "console-control-strings": "1.1.0",
+            "has-unicode": "2.0.1",
+            "object-assign": "4.1.1",
+            "signal-exit": "3.0.2",
+            "string-width": "1.0.2",
+            "strip-ansi": "3.0.1",
+            "wide-align": "1.1.2"
+          }
+        },
+        "glob": {
+          "version": "7.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "fs.realpath": "1.0.0",
+            "inflight": "1.0.6",
+            "inherits": "2.0.3",
+            "minimatch": "3.0.4",
+            "once": "1.4.0",
+            "path-is-absolute": "1.0.1"
+          }
+        },
+        "has-unicode": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "iconv-lite": {
+          "version": "0.4.21",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safer-buffer": "2.1.2"
+          }
+        },
+        "ignore-walk": {
+          "version": "3.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minimatch": "3.0.4"
+          }
+        },
+        "inflight": {
+          "version": "1.0.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "once": "1.4.0",
+            "wrappy": "1.0.2"
+          }
+        },
+        "inherits": {
+          "version": "2.0.3",
+          "bundled": true
+        },
+        "ini": {
+          "version": "1.3.5",
+          "bundled": true,
+          "optional": true
+        },
+        "is-fullwidth-code-point": {
+          "version": "1.0.0",
+          "bundled": true,
+          "requires": {
+            "number-is-nan": "1.0.1"
+          }
+        },
+        "isarray": {
+          "version": "1.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "minimatch": {
+          "version": "3.0.4",
+          "bundled": true,
+          "requires": {
+            "brace-expansion": "1.1.11"
+          }
+        },
+        "minimist": {
+          "version": "0.0.8",
+          "bundled": true
+        },
+        "minipass": {
+          "version": "2.2.4",
+          "bundled": true,
+          "requires": {
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "minizlib": {
+          "version": "1.1.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "minipass": "2.2.4"
+          }
+        },
+        "mkdirp": {
+          "version": "0.5.1",
+          "bundled": true,
+          "requires": {
+            "minimist": "0.0.8"
+          }
+        },
+        "ms": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "needle": {
+          "version": "2.2.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "debug": "2.6.9",
+            "iconv-lite": "0.4.21",
+            "sax": "1.2.4"
+          }
+        },
+        "node-pre-gyp": {
+          "version": "0.10.0",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "detect-libc": "1.0.3",
+            "mkdirp": "0.5.1",
+            "needle": "2.2.0",
+            "nopt": "4.0.1",
+            "npm-packlist": "1.1.10",
+            "npmlog": "4.1.2",
+            "rc": "1.2.7",
+            "rimraf": "2.6.2",
+            "semver": "5.5.0",
+            "tar": "4.4.1"
+          }
+        },
+        "nopt": {
+          "version": "4.0.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "abbrev": "1.1.1",
+            "osenv": "0.1.5"
+          }
+        },
+        "npm-bundled": {
+          "version": "1.0.3",
+          "bundled": true,
+          "optional": true
+        },
+        "npm-packlist": {
+          "version": "1.1.10",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "ignore-walk": "3.0.1",
+            "npm-bundled": "1.0.3"
+          }
+        },
+        "npmlog": {
+          "version": "4.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "are-we-there-yet": "1.1.4",
+            "console-control-strings": "1.1.0",
+            "gauge": "2.7.4",
+            "set-blocking": "2.0.0"
+          }
+        },
+        "number-is-nan": {
+          "version": "1.0.1",
+          "bundled": true
+        },
+        "object-assign": {
+          "version": "4.1.1",
+          "bundled": true,
+          "optional": true
+        },
+        "once": {
+          "version": "1.4.0",
+          "bundled": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "os-homedir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "os-tmpdir": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "osenv": {
+          "version": "0.1.5",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "os-homedir": "1.0.2",
+            "os-tmpdir": "1.0.2"
+          }
+        },
+        "path-is-absolute": {
+          "version": "1.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "process-nextick-args": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "rc": {
+          "version": "1.2.7",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "deep-extend": "0.5.1",
+            "ini": "1.3.5",
+            "minimist": "1.2.0",
+            "strip-json-comments": "2.0.1"
+          },
+          "dependencies": {
+            "minimist": {
+              "version": "1.2.0",
+              "bundled": true,
+              "optional": true
+            }
+          }
+        },
+        "readable-stream": {
+          "version": "2.3.6",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "1.0.0",
+            "process-nextick-args": "2.0.0",
+            "safe-buffer": "5.1.1",
+            "string_decoder": "1.1.1",
+            "util-deprecate": "1.0.2"
+          }
+        },
+        "rimraf": {
+          "version": "2.6.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "glob": "7.1.2"
+          }
+        },
+        "safe-buffer": {
+          "version": "5.1.1",
+          "bundled": true
+        },
+        "safer-buffer": {
+          "version": "2.1.2",
+          "bundled": true,
+          "optional": true
+        },
+        "sax": {
+          "version": "1.2.4",
+          "bundled": true,
+          "optional": true
+        },
+        "semver": {
+          "version": "5.5.0",
+          "bundled": true,
+          "optional": true
+        },
+        "set-blocking": {
+          "version": "2.0.0",
+          "bundled": true,
+          "optional": true
+        },
+        "signal-exit": {
+          "version": "3.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "string-width": {
+          "version": "1.0.2",
+          "bundled": true,
+          "requires": {
+            "code-point-at": "1.1.0",
+            "is-fullwidth-code-point": "1.0.0",
+            "strip-ansi": "3.0.1"
+          }
+        },
+        "string_decoder": {
+          "version": "1.1.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "safe-buffer": "5.1.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "3.0.1",
+          "bundled": true,
+          "requires": {
+            "ansi-regex": "2.1.1"
+          }
+        },
+        "strip-json-comments": {
+          "version": "2.0.1",
+          "bundled": true,
+          "optional": true
+        },
+        "tar": {
+          "version": "4.4.1",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "chownr": "1.0.1",
+            "fs-minipass": "1.2.5",
+            "minipass": "2.2.4",
+            "minizlib": "1.1.0",
+            "mkdirp": "0.5.1",
+            "safe-buffer": "5.1.1",
+            "yallist": "3.0.2"
+          }
+        },
+        "util-deprecate": {
+          "version": "1.0.2",
+          "bundled": true,
+          "optional": true
+        },
+        "wide-align": {
+          "version": "1.1.2",
+          "bundled": true,
+          "optional": true,
+          "requires": {
+            "string-width": "1.0.2"
+          }
+        },
+        "wrappy": {
+          "version": "1.0.2",
+          "bundled": true
+        },
+        "yallist": {
+          "version": "3.0.2",
+          "bundled": true
+        }
+      }
+    },
+    "fstream": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz",
+      "integrity": "sha1-XB+x8RdHcRTwYyoOtLcbPLD9MXE=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "inherits": "2.0.3",
+        "mkdirp": "0.5.1",
+        "rimraf": "2.6.2"
+      }
+    },
+    "fstream-ignore": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.5.tgz",
+      "integrity": "sha1-nDHa40dnAY/h0kmyTa2mfQktoQU=",
+      "dev": true,
+      "requires": {
+        "fstream": "1.0.11",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4"
+      }
+    },
+    "ftp": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/ftp/-/ftp-0.3.10.tgz",
+      "integrity": "sha1-kZfYYa2BQvPmPVqDv+TFn3MwiF0=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "readable-stream": "1.1.14",
+        "xregexp": "2.0.0"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true,
+          "optional": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "generate-function": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz",
+      "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=",
+      "dev": true,
+      "optional": true
+    },
+    "generate-object-property": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz",
+      "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "is-property": "1.0.2"
+      }
+    },
+    "get-uri": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/get-uri/-/get-uri-2.0.2.tgz",
+      "integrity": "sha512-ZD325dMZOgerGqF/rF6vZXyFGTAay62svjQIT+X/oU2PtxYpFxvSkbsdi+oxIrsNxlZVd4y8wUDqkaExWTI/Cw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "data-uri-to-buffer": "1.2.0",
+        "debug": "2.6.9",
+        "extend": "3.0.1",
+        "file-uri-to-path": "1.0.0",
+        "ftp": "0.3.10",
+        "readable-stream": "2.3.6"
+      }
+    },
+    "getpass": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
+      "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0"
+      }
+    },
+    "glob": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.2.tgz",
+      "integrity": "sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==",
+      "dev": true,
+      "requires": {
+        "fs.realpath": "1.0.0",
+        "inflight": "1.0.6",
+        "inherits": "2.0.3",
+        "minimatch": "3.0.4",
+        "once": "1.4.0",
+        "path-is-absolute": "1.0.1"
+      }
+    },
+    "glob-base": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/glob-base/-/glob-base-0.3.0.tgz",
+      "integrity": "sha1-27Fk9iIbHAscz4Kuoyi0l98Oo8Q=",
+      "dev": true,
+      "requires": {
+        "glob-parent": "2.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "glob-parent": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-2.0.0.tgz",
+      "integrity": "sha1-gTg9ctsFT8zPUzbaqQLxgvbtuyg=",
+      "dev": true,
+      "requires": {
+        "is-glob": "2.0.1"
+      }
+    },
+    "got": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-0.3.0.tgz",
+      "integrity": "sha1-iI7GbKS8c1qwidvpWUltD3lIVJM=",
+      "dev": true,
+      "requires": {
+        "object-assign": "0.3.1"
+      },
+      "dependencies": {
+        "object-assign": {
+          "version": "0.3.1",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-0.3.1.tgz",
+          "integrity": "sha1-Bg4qKifXwNd+x3t48Rqkf9iACNI=",
+          "dev": true
+        }
+      }
+    },
+    "graceful-fs": {
+      "version": "4.1.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz",
+      "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=",
+      "dev": true
+    },
+    "handlebars": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-2.0.0.tgz",
+      "integrity": "sha1-bp1/hRSjRn+l6fgswVjs/B1ax28=",
+      "dev": true,
+      "requires": {
+        "optimist": "0.3.7",
+        "uglify-js": "2.3.6"
+      },
+      "dependencies": {
+        "optimist": {
+          "version": "0.3.7",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+          "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+          "dev": true,
+          "requires": {
+            "wordwrap": "0.0.3"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "har-schema": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz",
+      "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=",
+      "dev": true
+    },
+    "har-validator": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz",
+      "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=",
+      "dev": true,
+      "requires": {
+        "ajv": "5.5.2",
+        "har-schema": "2.0.0"
+      }
+    },
+    "has-ansi": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz",
+      "integrity": "sha1-NPUEnOHs3ysGSa8+8k5F7TVBbZE=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "has-binary2": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/has-binary2/-/has-binary2-1.0.3.tgz",
+      "integrity": "sha512-G1LWKhDSvhGeAQ8mPVQlqNcOB2sJdwATtZKl2pDKKHfpf/rYj24lkinxf69blJbnsvtqqNU+L3SL50vzZhXOnw==",
+      "dev": true,
+      "requires": {
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "has-cors": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-cors/-/has-cors-1.1.0.tgz",
+      "integrity": "sha1-XkdHk/fqmEPRu5nCPu9J/xJv/zk=",
+      "dev": true
+    },
+    "hasha": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hasha/-/hasha-2.2.0.tgz",
+      "integrity": "sha1-eNfL/B5tZjA/55g3NlmEUXsvbuE=",
+      "dev": true,
+      "requires": {
+        "is-stream": "1.1.0",
+        "pinkie-promise": "2.0.1"
+      }
+    },
+    "hawk": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz",
+      "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "boom": "2.10.1",
+        "cryptiles": "2.0.5",
+        "hoek": "2.16.3",
+        "sntp": "1.0.9"
+      }
+    },
+    "hipchat-notifier": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hipchat-notifier/-/hipchat-notifier-1.1.0.tgz",
+      "integrity": "sha1-ttJJdVQ3wZEII2d5nTupoPI7Ix4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "lodash": "4.17.10",
+        "request": "2.87.0"
+      }
+    },
+    "hoek": {
+      "version": "2.16.3",
+      "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz",
+      "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=",
+      "dev": true
+    },
+    "http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha1-i1VoC7S+KDoLW/TqLjhYC+HZMg0=",
+      "dev": true,
+      "requires": {
+        "depd": "1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": "1.5.0"
+      }
+    },
+    "http-proxy": {
+      "version": "1.17.0",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.17.0.tgz",
+      "integrity": "sha512-Taqn+3nNvYRfJ3bGvKfBSRwy1v6eePlm3oc/aWVxZp57DQr5Eq3xhKJi7Z4hZpS8PC3H4qI+Yly5EmFacGuA/g==",
+      "dev": true,
+      "requires": {
+        "eventemitter3": "3.1.0",
+        "follow-redirects": "1.5.0",
+        "requires-port": "1.0.0"
+      }
+    },
+    "http-proxy-agent": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-2.1.0.tgz",
+      "integrity": "sha512-qwHbBLV7WviBl0rQsOzH6o5lwyOIvwp/BdFnvVxXORldu5TmjFfjzBcWUWS5kWAZhmv+JtiDhSuQCp4sBfbIgg==",
+      "dev": true,
+      "requires": {
+        "agent-base": "4.2.0",
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "http-signature": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz",
+      "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "jsprim": "1.4.1",
+        "sshpk": "1.14.1"
+      }
+    },
+    "httpntlm": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/httpntlm/-/httpntlm-1.6.1.tgz",
+      "integrity": "sha1-rQFScUOi6Hc8+uapb1hla7UqNLI=",
+      "dev": true,
+      "requires": {
+        "httpreq": "0.4.24",
+        "underscore": "1.7.0"
+      }
+    },
+    "httpreq": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/httpreq/-/httpreq-0.4.24.tgz",
+      "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=",
+      "dev": true
+    },
+    "https-proxy-agent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-2.2.1.tgz",
+      "integrity": "sha512-HPCTS1LW51bcyMYbxUIOO4HEOlQ1/1qRaFWcyxvwaqUS9TY88aoEuHUY33kuAh1YhVVaDQhLZsnPd+XNARWZlQ==",
+      "dev": true,
+      "requires": {
+        "agent-base": "4.2.0",
+        "debug": "3.1.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "iconv-lite": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz",
+      "integrity": "sha512-neyTUVFtahjf0mB3dZT77u+8O0QB89jFdnBkd5P1JgYPbPaia3gXXOVL2fq8VyU2gMMD7SaN7QukTB/pmXYvDA==",
+      "dev": true,
+      "requires": {
+        "safer-buffer": "2.1.2"
+      }
+    },
+    "indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha1-gtwzbSMrkGIXnQWrMpOmYFn9Q10=",
+      "dev": true
+    },
+    "inflection": {
+      "version": "1.12.0",
+      "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.12.0.tgz",
+      "integrity": "sha1-ogCTVlbW9fa8TcdQLhrstwMihBY=",
+      "dev": true,
+      "optional": true
+    },
+    "inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=",
+      "dev": true,
+      "requires": {
+        "once": "1.4.0",
+        "wrappy": "1.0.2"
+      }
+    },
+    "inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha1-Yzwsg+PaQqUC9SRmAiSA9CCCYd4=",
+      "dev": true
+    },
+    "ini": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.5.tgz",
+      "integrity": "sha512-RZY5huIKCMRWDUqZlEi72f/lmXKMvuszcMBduliQ3nnWbx9X/ZBQO7DijMEYS9EhHBb2qacRUMtC7svLwe0lcw==",
+      "dev": true
+    },
+    "inquirer": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.7.1.tgz",
+      "integrity": "sha1-uKzxQBZb1YGGLtEZj7bSZDAJH6w=",
+      "dev": true,
+      "requires": {
+        "chalk": "0.5.1",
+        "cli-color": "0.3.3",
+        "figures": "1.7.0",
+        "lodash": "2.4.2",
+        "mute-stream": "0.0.4",
+        "readline2": "0.1.1",
+        "rx": "2.5.3",
+        "through": "2.3.8"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "1.1.0",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "0.1.0",
+            "strip-ansi": "0.3.0",
+            "supports-color": "0.2.0"
+          }
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        }
+      }
+    },
+    "insight": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/insight/-/insight-0.4.3.tgz",
+      "integrity": "sha1-dtZTxcDYBIsDzbpjhaaUj3RhSvA=",
+      "dev": true,
+      "requires": {
+        "async": "0.9.2",
+        "chalk": "0.5.1",
+        "configstore": "0.3.2",
+        "inquirer": "0.6.0",
+        "lodash.debounce": "2.4.1",
+        "object-assign": "1.0.0",
+        "os-name": "1.0.3",
+        "request": "2.87.0",
+        "tough-cookie": "0.12.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "async": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+          "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "1.1.0",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "0.1.0",
+            "strip-ansi": "0.3.0",
+            "supports-color": "0.2.0"
+          }
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "inquirer": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-0.6.0.tgz",
+          "integrity": "sha1-YU17s+SPnmqAKOlKDDjyPvKYI9M=",
+          "dev": true,
+          "requires": {
+            "chalk": "0.5.1",
+            "cli-color": "0.3.3",
+            "lodash": "2.4.2",
+            "mute-stream": "0.0.4",
+            "readline2": "0.1.1",
+            "rx": "2.5.3",
+            "through": "2.3.8"
+          }
+        },
+        "lodash": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-2.4.2.tgz",
+          "integrity": "sha1-+t2DS5aDBz2hebPq5tnA0VBT9z4=",
+          "dev": true
+        },
+        "object-assign": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-1.0.0.tgz",
+          "integrity": "sha1-5l3Idm07R7S4MHRlyDEdoDCwcKY=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        },
+        "tough-cookie": {
+          "version": "0.12.1",
+          "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-0.12.1.tgz",
+          "integrity": "sha1-giDH4hq9WxPZaAQlS9WoHr8sfWI=",
+          "dev": true,
+          "requires": {
+            "punycode": "1.4.1"
+          }
+        }
+      }
+    },
+    "intersect": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/intersect/-/intersect-0.0.3.tgz",
+      "integrity": "sha1-waSl5erG7eSvdQTMB+Ctp7yfSSA=",
+      "dev": true
+    },
+    "ip": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/ip/-/ip-1.1.5.tgz",
+      "integrity": "sha1-vd7XARQpCCjAoDnnLvJfWq7ENUo=",
+      "dev": true
+    },
+    "is-binary-path": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz",
+      "integrity": "sha1-dfFmQrSA8YenEcgUFh/TpKdlWJg=",
+      "dev": true,
+      "requires": {
+        "binary-extensions": "1.11.0"
+      }
+    },
+    "is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
+      "dev": true
+    },
+    "is-dotfile": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/is-dotfile/-/is-dotfile-1.0.3.tgz",
+      "integrity": "sha1-pqLzL/0t+wT1yiXs0Pa4PPeYoeE=",
+      "dev": true
+    },
+    "is-equal-shallow": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/is-equal-shallow/-/is-equal-shallow-0.1.3.tgz",
+      "integrity": "sha1-IjgJj8Ih3gvPpdnqxMRdY4qhxTQ=",
+      "dev": true,
+      "requires": {
+        "is-primitive": "2.0.0"
+      }
+    },
+    "is-extendable": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz",
+      "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=",
+      "dev": true
+    },
+    "is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha1-rEaBd8SUNAWgkvyPKXYMb/xiBsA=",
+      "dev": true
+    },
+    "is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha1-0Jb5JqPe1WAPP9/ZEZjLCIjC2GM=",
+      "dev": true,
+      "requires": {
+        "is-extglob": "1.0.0"
+      }
+    },
+    "is-my-ip-valid": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz",
+      "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==",
+      "dev": true,
+      "optional": true
+    },
+    "is-my-json-valid": {
+      "version": "2.17.2",
+      "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz",
+      "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "generate-function": "2.0.0",
+        "generate-object-property": "1.2.0",
+        "is-my-ip-valid": "1.0.0",
+        "jsonpointer": "4.0.1",
+        "xtend": "4.0.1"
+      }
+    },
+    "is-number": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-2.1.0.tgz",
+      "integrity": "sha1-Afy7s5NGOlSPL0ZszhbezknbkI8=",
+      "dev": true,
+      "requires": {
+        "kind-of": "3.2.2"
+      }
+    },
+    "is-posix-bracket": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-posix-bracket/-/is-posix-bracket-0.1.1.tgz",
+      "integrity": "sha1-MzTceXdDaOkvAW5vvAqI9c1ua8Q=",
+      "dev": true
+    },
+    "is-primitive": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/is-primitive/-/is-primitive-2.0.0.tgz",
+      "integrity": "sha1-IHurkWOEmcB7Kt8kCkGochADRXU=",
+      "dev": true
+    },
+    "is-property": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz",
+      "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=",
+      "dev": true,
+      "optional": true
+    },
+    "is-root": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-1.0.0.tgz",
+      "integrity": "sha1-B7bCM7w5TNnQK6FclmvWZg1jQtU=",
+      "dev": true
+    },
+    "is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
+      "dev": true
+    },
+    "is-typedarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
+      "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=",
+      "dev": true
+    },
+    "isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
+      "dev": true
+    },
+    "isbinaryfile": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/isbinaryfile/-/isbinaryfile-3.0.2.tgz",
+      "integrity": "sha1-Sj6XTsDLqQBNP8bN5yCeppNopiE=",
+      "dev": true
+    },
+    "isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=",
+      "dev": true
+    },
+    "isobject": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz",
+      "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=",
+      "dev": true,
+      "requires": {
+        "isarray": "1.0.0"
+      }
+    },
+    "isstream": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz",
+      "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=",
+      "dev": true
+    },
+    "jasmine": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine/-/jasmine-3.1.0.tgz",
+      "integrity": "sha1-K9Wf1+xuwOistk4J9Fpo7SrRlSo=",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2",
+        "jasmine-core": "3.1.0"
+      }
+    },
+    "jasmine-ajax": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/jasmine-ajax/-/jasmine-ajax-3.4.0.tgz",
+      "integrity": "sha512-LIVNVCmx5ou+IG6wgX7j73YYzvE2e3aqFWMjOhvAHWTnLICOYSobIH+PG/gOwtP20X0u2SkD3NXT/j5X8rMGOA==",
+      "dev": true
+    },
+    "jasmine-core": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jasmine-core/-/jasmine-core-3.1.0.tgz",
+      "integrity": "sha1-pHheE11d9lAk38kiSVPfWFvSdmw=",
+      "dev": true
+    },
+    "jasmine-jquery": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/jasmine-jquery/-/jasmine-jquery-2.1.1.tgz",
+      "integrity": "sha1-1AleZGlEomdjI1dpqwGNnzDw1Hs=",
+      "dev": true
+    },
+    "jasmine-spec-reporter": {
+      "version": "4.2.1",
+      "resolved": "https://registry.npmjs.org/jasmine-spec-reporter/-/jasmine-spec-reporter-4.2.1.tgz",
+      "integrity": "sha512-FZBoZu7VE5nR7Nilzy+Np8KuVIOxF4oXDPDknehCYBDE080EnlPu0afdZNmpGDBRCUBv3mj5qgqCRmk6W/K8vg==",
+      "dev": true,
+      "requires": {
+        "colors": "1.1.2"
+      },
+      "dependencies": {
+        "colors": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz",
+          "integrity": "sha1-FopHAXVran9RoSzgyXv6KMCE7WM=",
+          "dev": true
+        }
+      }
+    },
+    "jquery": {
+      "version": "3.3.1",
+      "resolved": "https://registry.npmjs.org/jquery/-/jquery-3.3.1.tgz",
+      "integrity": "sha512-Ubldcmxp5np52/ENotGxlLe6aGMvmF4R8S6tZjsP6Knsaxd/xp3Zrh50cG93lR6nPXyUFwzN3ZSOQI0wRJNdGg==",
+      "dev": true
+    },
+    "js-yaml": {
+      "version": "3.11.0",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz",
+      "integrity": "sha512-saJstZWv7oNeOyBh3+Dx1qWzhW0+e6/8eDzo7p5rDFqxntSztloLtuKu+Ejhtq82jsilwOIZYsCz+lIjthg1Hw==",
+      "dev": true,
+      "requires": {
+        "argparse": "1.0.10",
+        "esprima": "4.0.0"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.0.tgz",
+          "integrity": "sha512-oftTcaMu/EGrEIu904mWteKIv8vMuOgGYo7EhVJJN00R/EED9DCua/xxHRdYnKtcECzVg7xOWhflvJMnqcFZjw==",
+          "dev": true
+        }
+      }
+    },
+    "jsbn": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz",
+      "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=",
+      "dev": true,
+      "optional": true
+    },
+    "json-schema": {
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz",
+      "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=",
+      "dev": true
+    },
+    "json-schema-traverse": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz",
+      "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=",
+      "dev": true
+    },
+    "json-stringify-safe": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz",
+      "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=",
+      "dev": true
+    },
+    "jsonfile": {
+      "version": "2.4.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz",
+      "integrity": "sha1-NzaitCi4e72gzIO1P6PWM6NcKug=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "jsonify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz",
+      "integrity": "sha1-LHS27kHZPKUbe1qu6PUDYx0lKnM=",
+      "dev": true
+    },
+    "jsonpointer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz",
+      "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=",
+      "dev": true,
+      "optional": true
+    },
+    "jsprim": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz",
+      "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "extsprintf": "1.3.0",
+        "json-schema": "0.2.3",
+        "verror": "1.10.0"
+      }
+    },
+    "junk": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/junk/-/junk-1.0.3.tgz",
+      "integrity": "sha1-h75jSIZJy9ym9Tqzm+yczSNH9ZI=",
+      "dev": true
+    },
+    "karma": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/karma/-/karma-2.0.2.tgz",
+      "integrity": "sha1-TS25QChQpmVR+nhLAWT7CCTtjEs=",
+      "dev": true,
+      "requires": {
+        "bluebird": "3.5.1",
+        "body-parser": "1.18.3",
+        "chokidar": "1.7.0",
+        "colors": "1.3.0",
+        "combine-lists": "1.0.1",
+        "connect": "3.6.6",
+        "core-js": "2.5.7",
+        "di": "0.0.1",
+        "dom-serialize": "2.2.1",
+        "expand-braces": "0.1.2",
+        "glob": "7.1.2",
+        "graceful-fs": "4.1.11",
+        "http-proxy": "1.17.0",
+        "isbinaryfile": "3.0.2",
+        "lodash": "4.17.10",
+        "log4js": "2.7.0",
+        "mime": "1.6.0",
+        "minimatch": "3.0.4",
+        "optimist": "0.6.1",
+        "qjobs": "1.2.0",
+        "range-parser": "1.2.0",
+        "rimraf": "2.6.2",
+        "safe-buffer": "5.1.2",
+        "socket.io": "2.0.4",
+        "source-map": "0.6.1",
+        "tmp": "0.0.33",
+        "useragent": "2.2.1"
+      }
+    },
+    "karma-jasmine": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-1.1.2.tgz",
+      "integrity": "sha1-OU8rJf+0pkS5rabyLUQ+L9CIhsM=",
+      "dev": true
+    },
+    "karma-jasmine-ajax": {
+      "version": "0.1.13",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-ajax/-/karma-jasmine-ajax-0.1.13.tgz",
+      "integrity": "sha1-eLuS2Jb+MqJaGACYxHci4dlgW/w=",
+      "dev": true,
+      "requires": {
+        "jasmine-ajax": "3.4.0"
+      }
+    },
+    "karma-jasmine-jquery": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/karma-jasmine-jquery/-/karma-jasmine-jquery-0.1.1.tgz",
+      "integrity": "sha1-icG3VP6kElsfiTghOSwRuc5ddFY=",
+      "dev": true,
+      "requires": {
+        "bower": "1.8.4",
+        "bower-installer": "git://github.com/bessdsv/bower-installer.git#7f9cece1e6fada50f44dc0851e1d85815cd1b4a7"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "asn1": {
+          "version": "0.1.11",
+          "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.1.11.tgz",
+          "integrity": "sha1-VZvhg3bQik7E2+gId9J4GGObLfc=",
+          "dev": true,
+          "optional": true
+        },
+        "assert-plus": {
+          "version": "0.1.5",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.1.5.tgz",
+          "integrity": "sha1-7nQAlBMALYTOxyGcasgRgS5yMWA=",
+          "dev": true,
+          "optional": true
+        },
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true
+        },
+        "aws-sign2": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.5.0.tgz",
+          "integrity": "sha1-xXED96F/wDfwLXwuZLYC6iI/fWM=",
+          "dev": true,
+          "optional": true
+        },
+        "bl": {
+          "version": "0.9.5",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34"
+          }
+        },
+        "boom": {
+          "version": "0.4.2",
+          "resolved": "https://registry.npmjs.org/boom/-/boom-0.4.2.tgz",
+          "integrity": "sha1-emNune1O/O+xnO9JR6PGffrukRs=",
+          "dev": true,
+          "requires": {
+            "hoek": "0.9.1"
+          }
+        },
+        "bower-installer": {
+          "version": "git://github.com/bessdsv/bower-installer.git#7f9cece1e6fada50f44dc0851e1d85815cd1b4a7",
+          "dev": true,
+          "requires": {
+            "async": "0.2.10",
+            "bower": "1.3.12",
+            "colors": "0.6.2",
+            "glob": "3.2.11",
+            "lodash": "0.9.2",
+            "mkdirp": "0.3.5",
+            "node-fs": "0.1.7",
+            "nopt": "2.1.2"
+          },
+          "dependencies": {
+            "bower": {
+              "version": "1.3.12",
+              "resolved": "https://registry.npmjs.org/bower/-/bower-1.3.12.tgz",
+              "integrity": "sha1-N94O2zkEuvkK7hM4Sho3mgXuIUw=",
+              "dev": true,
+              "requires": {
+                "abbrev": "1.0.9",
+                "archy": "0.0.2",
+                "bower-config": "0.5.3",
+                "bower-endpoint-parser": "0.2.2",
+                "bower-json": "0.4.0",
+                "bower-logger": "0.2.2",
+                "bower-registry-client": "0.2.4",
+                "cardinal": "0.4.0",
+                "chalk": "0.5.0",
+                "chmodr": "0.1.0",
+                "decompress-zip": "0.0.8",
+                "fstream": "1.0.11",
+                "fstream-ignore": "1.0.5",
+                "glob": "4.0.6",
+                "graceful-fs": "3.0.11",
+                "handlebars": "2.0.0",
+                "inquirer": "0.7.1",
+                "insight": "0.4.3",
+                "is-root": "1.0.0",
+                "junk": "1.0.3",
+                "lockfile": "1.0.4",
+                "lru-cache": "2.5.2",
+                "mkdirp": "0.5.0",
+                "mout": "0.9.1",
+                "nopt": "3.0.6",
+                "opn": "1.0.2",
+                "osenv": "0.1.0",
+                "p-throttler": "0.1.0",
+                "promptly": "0.2.0",
+                "q": "1.0.1",
+                "request": "2.42.0",
+                "request-progress": "0.3.0",
+                "retry": "0.6.0",
+                "rimraf": "2.2.8",
+                "semver": "2.3.2",
+                "shell-quote": "1.4.3",
+                "stringify-object": "1.0.1",
+                "tar-fs": "0.5.2",
+                "tmp": "0.0.23",
+                "update-notifier": "0.2.0",
+                "which": "1.0.9"
+              },
+              "dependencies": {
+                "glob": {
+                  "version": "4.0.6",
+                  "resolved": "https://registry.npmjs.org/glob/-/glob-4.0.6.tgz",
+                  "integrity": "sha1-aVxQvdTi+1xdNwsJHziNNwfikac=",
+                  "dev": true,
+                  "requires": {
+                    "graceful-fs": "3.0.11",
+                    "inherits": "2.0.3",
+                    "minimatch": "1.0.0",
+                    "once": "1.4.0"
+                  }
+                },
+                "mkdirp": {
+                  "version": "0.5.0",
+                  "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.0.tgz",
+                  "integrity": "sha1-HXMHam35hs2TROFecfzAWkyavxI=",
+                  "dev": true,
+                  "requires": {
+                    "minimist": "0.0.8"
+                  }
+                },
+                "nopt": {
+                  "version": "3.0.6",
+                  "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+                  "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+                  "dev": true,
+                  "requires": {
+                    "abbrev": "1.0.9"
+                  }
+                }
+              }
+            }
+          }
+        },
+        "caseless": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.6.0.tgz",
+          "integrity": "sha1-gWfBq4OX+1u5X5bSjlqBxQ8kesQ=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.0.tgz",
+          "integrity": "sha1-N138y8IcCmCothvFt489wqVcIS8=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "1.1.0",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "0.1.0",
+            "strip-ansi": "0.3.0",
+            "supports-color": "0.2.0"
+          }
+        },
+        "colors": {
+          "version": "0.6.2",
+          "resolved": "https://registry.npmjs.org/colors/-/colors-0.6.2.tgz",
+          "integrity": "sha1-JCP+ZnisDF2uiFLl0OW+CMmXq8w=",
+          "dev": true
+        },
+        "combined-stream": {
+          "version": "0.0.7",
+          "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-0.0.7.tgz",
+          "integrity": "sha1-ATfmV7qlp1QcV6w3rF/AfXO03B8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "delayed-stream": "0.0.5"
+          }
+        },
+        "cryptiles": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-0.2.2.tgz",
+          "integrity": "sha1-7ZH/HxetE9N0gohZT4pIoNJvMlw=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "0.4.2"
+          }
+        },
+        "delayed-stream": {
+          "version": "0.0.5",
+          "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-0.0.5.tgz",
+          "integrity": "sha1-1LH0OpPoKW3+AmlPRoC8N6MTxz8=",
+          "dev": true,
+          "optional": true
+        },
+        "forever-agent": {
+          "version": "0.5.2",
+          "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.5.2.tgz",
+          "integrity": "sha1-bQ4JxJIflKJ/Y9O0nF/v8epMUTA=",
+          "dev": true
+        },
+        "form-data": {
+          "version": "0.1.4",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-0.1.4.tgz",
+          "integrity": "sha1-kavXiKupcCsaq/qLwBAxoqyeOxI=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "async": "0.9.2",
+            "combined-stream": "0.0.7",
+            "mime": "1.2.11"
+          },
+          "dependencies": {
+            "async": {
+              "version": "0.9.2",
+              "resolved": "https://registry.npmjs.org/async/-/async-0.9.2.tgz",
+              "integrity": "sha1-rqdNXmHB+JlhO/ZL2mbUx48v0X0=",
+              "dev": true,
+              "optional": true
+            }
+          }
+        },
+        "glob": {
+          "version": "3.2.11",
+          "resolved": "https://registry.npmjs.org/glob/-/glob-3.2.11.tgz",
+          "integrity": "sha1-Spc/Y1uRkPcV0QmH1cAP0oFevj0=",
+          "dev": true,
+          "requires": {
+            "inherits": "2.0.3",
+            "minimatch": "0.3.0"
+          },
+          "dependencies": {
+            "minimatch": {
+              "version": "0.3.0",
+              "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-0.3.0.tgz",
+              "integrity": "sha1-J12O2qxPG7MyZHIInnlJyDlGmd0=",
+              "dev": true,
+              "requires": {
+                "lru-cache": "2.5.2",
+                "sigmund": "1.0.1"
+              }
+            }
+          }
+        },
+        "graceful-fs": {
+          "version": "3.0.11",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-3.0.11.tgz",
+          "integrity": "sha1-dhPHeKGv6mLyXGMKCG1/Osu92Bg=",
+          "dev": true,
+          "requires": {
+            "natives": "1.1.4"
+          }
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "hawk": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/hawk/-/hawk-1.1.1.tgz",
+          "integrity": "sha1-h81JH5tG5OKurKM1QWdmiF0tHtk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "boom": "0.4.2",
+            "cryptiles": "0.2.2",
+            "hoek": "0.9.1",
+            "sntp": "0.2.4"
+          }
+        },
+        "hoek": {
+          "version": "0.9.1",
+          "resolved": "https://registry.npmjs.org/hoek/-/hoek-0.9.1.tgz",
+          "integrity": "sha1-PTIkYrrfB3Fup+uFuviAec3c5QU=",
+          "dev": true
+        },
+        "http-signature": {
+          "version": "0.10.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-0.10.1.tgz",
+          "integrity": "sha1-T72sEyVZqoMjEh5UB3nAoBKyfmY=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asn1": "0.1.11",
+            "assert-plus": "0.1.5",
+            "ctype": "0.5.3"
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "lodash": {
+          "version": "0.9.2",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-0.9.2.tgz",
+          "integrity": "sha1-jzSZxSRdNG1oLlsNO0B2fgnxqSw=",
+          "dev": true
+        },
+        "lru-cache": {
+          "version": "2.5.2",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.5.2.tgz",
+          "integrity": "sha1-H92tk4quEmPOE4aAvhs/WRwKtBw=",
+          "dev": true
+        },
+        "mime": {
+          "version": "1.2.11",
+          "resolved": "https://registry.npmjs.org/mime/-/mime-1.2.11.tgz",
+          "integrity": "sha1-WCA+7Ybjpe8XrtK32evUfwpg3RA=",
+          "dev": true,
+          "optional": true
+        },
+        "mime-types": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-1.0.2.tgz",
+          "integrity": "sha1-mVrhOSq4r/y/yyZB3QVOlDwNXc4=",
+          "dev": true
+        },
+        "minimatch": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-1.0.0.tgz",
+          "integrity": "sha1-4N0hILSeG3JM6NcUxSCCKpQ4V20=",
+          "dev": true,
+          "requires": {
+            "lru-cache": "2.5.2",
+            "sigmund": "1.0.1"
+          }
+        },
+        "mkdirp": {
+          "version": "0.3.5",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.3.5.tgz",
+          "integrity": "sha1-3j5fiWHIjHh+4TaN+EmsRBPsqNc=",
+          "dev": true
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true
+        },
+        "oauth-sign": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.4.0.tgz",
+          "integrity": "sha1-8ilW8x6nFRqCHl8vsywRPK2Ln2k=",
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "1.2.2",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-1.2.2.tgz",
+          "integrity": "sha1-GbV/8k3CqZzh+L32r82ln472H4g=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.0.34",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+          "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "request": {
+          "version": "2.42.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.42.0.tgz",
+          "integrity": "sha1-VyvQFIk4VkBArHqxSLlkI6BjMEo=",
+          "dev": true,
+          "requires": {
+            "aws-sign2": "0.5.0",
+            "bl": "0.9.5",
+            "caseless": "0.6.0",
+            "forever-agent": "0.5.2",
+            "form-data": "0.1.4",
+            "hawk": "1.1.1",
+            "http-signature": "0.10.1",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "1.0.2",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.4.0",
+            "qs": "1.2.2",
+            "stringstream": "0.0.6",
+            "tough-cookie": "2.3.4",
+            "tunnel-agent": "0.4.3"
+          }
+        },
+        "rimraf": {
+          "version": "2.2.8",
+          "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.2.8.tgz",
+          "integrity": "sha1-5Dm+Kq7jJzIZUnMPmaiSnk/FBYI=",
+          "dev": true
+        },
+        "semver": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+          "integrity": "sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=",
+          "dev": true
+        },
+        "sntp": {
+          "version": "0.2.4",
+          "resolved": "https://registry.npmjs.org/sntp/-/sntp-0.2.4.tgz",
+          "integrity": "sha1-+4hfGLDzqtGJ+CSGJTa87ux1CQA=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "hoek": "0.9.1"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        },
+        "tmp": {
+          "version": "0.0.23",
+          "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.23.tgz",
+          "integrity": "sha1-3odKpel0qF8KMs39vXRmPLO9nHQ=",
+          "dev": true
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true
+        }
+      }
+    },
+    "karma-phantomjs-launcher": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/karma-phantomjs-launcher/-/karma-phantomjs-launcher-1.0.4.tgz",
+      "integrity": "sha1-0jyjSAG9qYY60xjju0vUBisTrNI=",
+      "dev": true,
+      "requires": {
+        "lodash": "4.17.10",
+        "phantomjs-prebuilt": "2.1.16"
+      }
+    },
+    "kew": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/kew/-/kew-0.7.0.tgz",
+      "integrity": "sha1-edk9LTM2PW/dKXCzNdkUGtWR15s=",
+      "dev": true
+    },
+    "kind-of": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz",
+      "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=",
+      "dev": true,
+      "requires": {
+        "is-buffer": "1.1.6"
+      }
+    },
+    "klaw": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/klaw/-/klaw-1.3.1.tgz",
+      "integrity": "sha1-QIhDO0azsbolnXh4XY6W9zugJDk=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11"
+      }
+    },
+    "latest-version": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-0.2.0.tgz",
+      "integrity": "sha1-ra+JjV8iOA0/nEU4bv3/ChtbdQE=",
+      "dev": true,
+      "requires": {
+        "package-json": "0.2.0"
+      }
+    },
+    "levn": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz",
+      "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2"
+      }
+    },
+    "libbase64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/libbase64/-/libbase64-0.1.0.tgz",
+      "integrity": "sha1-YjUag5VjrF/1vSbxL2Dpgwu3UeY=",
+      "dev": true
+    },
+    "libmime": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/libmime/-/libmime-3.0.0.tgz",
+      "integrity": "sha1-UaGp50SOy9Ms2lRCFnW7IbwJPaY=",
+      "dev": true,
+      "requires": {
+        "iconv-lite": "0.4.15",
+        "libbase64": "0.1.0",
+        "libqp": "1.1.0"
+      },
+      "dependencies": {
+        "iconv-lite": {
+          "version": "0.4.15",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz",
+          "integrity": "sha1-/iZaIYrGpXz+hUkn6dBMGYJe3es=",
+          "dev": true
+        }
+      }
+    },
+    "libqp": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/libqp/-/libqp-1.1.0.tgz",
+      "integrity": "sha1-9ebgatdLeU+1tbZpiL9yjvHe2+g=",
+      "dev": true
+    },
+    "lockfile": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz",
+      "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==",
+      "dev": true,
+      "requires": {
+        "signal-exit": "3.0.2"
+      }
+    },
+    "lodash": {
+      "version": "4.17.10",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.10.tgz",
+      "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==",
+      "dev": true
+    },
+    "lodash._isnative": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._isnative/-/lodash._isnative-2.4.1.tgz",
+      "integrity": "sha1-PqZAS3hKe+g2x7V1gOHN95sUgyw=",
+      "dev": true
+    },
+    "lodash._objecttypes": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash._objecttypes/-/lodash._objecttypes-2.4.1.tgz",
+      "integrity": "sha1-fAt/admKH3ZSn4kLDNsbTf7BHBE=",
+      "dev": true
+    },
+    "lodash.debounce": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-2.4.1.tgz",
+      "integrity": "sha1-2M6tJG7EuSbouFZ4/Dlr/rqMxvw=",
+      "dev": true,
+      "requires": {
+        "lodash.isfunction": "2.4.1",
+        "lodash.isobject": "2.4.1",
+        "lodash.now": "2.4.1"
+      }
+    },
+    "lodash.isfunction": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isfunction/-/lodash.isfunction-2.4.1.tgz",
+      "integrity": "sha1-LP1XXHPkmKtX4xm3f6Aq3vE6lNE=",
+      "dev": true
+    },
+    "lodash.isobject": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.isobject/-/lodash.isobject-2.4.1.tgz",
+      "integrity": "sha1-Wi5H/mmVPx7mMafrof5k0tBlWPU=",
+      "dev": true,
+      "requires": {
+        "lodash._objecttypes": "2.4.1"
+      }
+    },
+    "lodash.now": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/lodash.now/-/lodash.now-2.4.1.tgz",
+      "integrity": "sha1-aHIVZQBSUYX6+WeFu3/n/hW1YsY=",
+      "dev": true,
+      "requires": {
+        "lodash._isnative": "2.4.1"
+      }
+    },
+    "log4js": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/log4js/-/log4js-2.7.0.tgz",
+      "integrity": "sha512-FyTwaPJfbfiK2AHc9ct/oFHNN4bJj0IQeqdO/LaDHhfjeBi8fnZU5rPcHOZhkYV0Aes31Ow+St1YTCluPtzs5g==",
+      "dev": true,
+      "requires": {
+        "amqplib": "0.5.2",
+        "axios": "0.15.3",
+        "circular-json": "0.5.4",
+        "date-format": "1.2.0",
+        "debug": "3.1.0",
+        "hipchat-notifier": "1.1.0",
+        "loggly": "1.1.1",
+        "mailgun-js": "0.18.0",
+        "nodemailer": "2.7.2",
+        "redis": "2.8.0",
+        "semver": "5.5.0",
+        "slack-node": "0.2.0",
+        "streamroller": "0.7.0"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "loggly": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/loggly/-/loggly-1.1.1.tgz",
+      "integrity": "sha1-Cg/B0/o6XsRP3HuJe+uipGlc6+4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "json-stringify-safe": "5.0.1",
+        "request": "2.75.0",
+        "timespan": "2.3.0"
+      },
+      "dependencies": {
+        "assert-plus": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz",
+          "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=",
+          "dev": true,
+          "optional": true
+        },
+        "aws-sign2": {
+          "version": "0.6.0",
+          "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz",
+          "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=",
+          "dev": true,
+          "optional": true
+        },
+        "caseless": {
+          "version": "0.11.0",
+          "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz",
+          "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=",
+          "dev": true,
+          "optional": true
+        },
+        "form-data": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.0.0.tgz",
+          "integrity": "sha1-bwrrrcxdoWwT4ezBETfYX5uIOyU=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "asynckit": "0.4.0",
+            "combined-stream": "1.0.6",
+            "mime-types": "2.1.18"
+          }
+        },
+        "har-validator": {
+          "version": "2.0.6",
+          "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz",
+          "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "chalk": "1.1.3",
+            "commander": "2.15.1",
+            "is-my-json-valid": "2.17.2",
+            "pinkie-promise": "2.0.1"
+          }
+        },
+        "http-signature": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz",
+          "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "assert-plus": "0.2.0",
+            "jsprim": "1.4.1",
+            "sshpk": "1.14.1"
+          }
+        },
+        "node-uuid": {
+          "version": "1.4.8",
+          "resolved": "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz",
+          "integrity": "sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=",
+          "dev": true,
+          "optional": true
+        },
+        "qs": {
+          "version": "6.2.3",
+          "resolved": "https://registry.npmjs.org/qs/-/qs-6.2.3.tgz",
+          "integrity": "sha1-HPyyXBCpsrSDBT/zn138kjOQjP4=",
+          "dev": true,
+          "optional": true
+        },
+        "request": {
+          "version": "2.75.0",
+          "resolved": "https://registry.npmjs.org/request/-/request-2.75.0.tgz",
+          "integrity": "sha1-0rgmiihtoT6qXQGt9dGMyQ9lfZM=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "aws-sign2": "0.6.0",
+            "aws4": "1.7.0",
+            "bl": "1.1.2",
+            "caseless": "0.11.0",
+            "combined-stream": "1.0.6",
+            "extend": "3.0.1",
+            "forever-agent": "0.6.1",
+            "form-data": "2.0.0",
+            "har-validator": "2.0.6",
+            "hawk": "3.1.3",
+            "http-signature": "1.1.1",
+            "is-typedarray": "1.0.0",
+            "isstream": "0.1.2",
+            "json-stringify-safe": "5.0.1",
+            "mime-types": "2.1.18",
+            "node-uuid": "1.4.8",
+            "oauth-sign": "0.8.2",
+            "qs": "6.2.3",
+            "stringstream": "0.0.6",
+            "tough-cookie": "2.3.4",
+            "tunnel-agent": "0.4.3"
+          }
+        },
+        "tunnel-agent": {
+          "version": "0.4.3",
+          "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz",
+          "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "lru-cache": {
+      "version": "4.1.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz",
+      "integrity": "sha512-fFEhvcgzuIoJVUF8fYr5KR0YqxD238zgObTps31YdADwPPAp82a4M8TrckkWyx7ekNlf9aBcVn81cFwwXngrJA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "pseudomap": "1.0.2",
+        "yallist": "2.1.2"
+      }
+    },
+    "lru-queue": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/lru-queue/-/lru-queue-0.1.0.tgz",
+      "integrity": "sha1-Jzi9nw089PhEkMVzbEhpmsYyzaM=",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.44"
+      }
+    },
+    "mailcomposer": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/mailcomposer/-/mailcomposer-4.0.1.tgz",
+      "integrity": "sha1-DhxEsqB890DuF9wUm6AJ8Zyt/rQ=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "buildmail": "4.0.1",
+        "libmime": "3.0.0"
+      }
+    },
+    "mailgun-js": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/mailgun-js/-/mailgun-js-0.18.0.tgz",
+      "integrity": "sha512-o0P6jjZlx5CQj12tvVgDTbgjTqVN0+5h6/6P1+3c6xmozVKBwniQ6Qt3MkCSF0+ueVTbobAfWyGpWRZMJu8t1g==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "2.6.1",
+        "debug": "3.1.0",
+        "form-data": "2.3.2",
+        "inflection": "1.12.0",
+        "is-stream": "1.1.0",
+        "path-proxy": "1.0.0",
+        "promisify-call": "2.0.4",
+        "proxy-agent": "3.0.0",
+        "tsscmp": "1.0.5"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "math-random": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/math-random/-/math-random-1.0.1.tgz",
+      "integrity": "sha1-izqsWIuKZuSXXjzepn97sylgH6w=",
+      "dev": true
+    },
+    "media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=",
+      "dev": true
+    },
+    "memoizee": {
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/memoizee/-/memoizee-0.3.10.tgz",
+      "integrity": "sha1-TsoNiu057J0Bf0xcLy9kMvQuXI8=",
+      "dev": true,
+      "requires": {
+        "d": "0.1.1",
+        "es5-ext": "0.10.44",
+        "es6-weak-map": "0.1.4",
+        "event-emitter": "0.3.5",
+        "lru-queue": "0.1.0",
+        "next-tick": "0.2.2",
+        "timers-ext": "0.1.5"
+      },
+      "dependencies": {
+        "next-tick": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-0.2.2.tgz",
+          "integrity": "sha1-ddpKkn7liH45BliABltzNkE7MQ0=",
+          "dev": true
+        }
+      }
+    },
+    "micromatch": {
+      "version": "2.3.11",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-2.3.11.tgz",
+      "integrity": "sha1-hmd8l9FyCzY0MdBNDRUpO9OMFWU=",
+      "dev": true,
+      "requires": {
+        "arr-diff": "2.0.0",
+        "array-unique": "0.2.1",
+        "braces": "1.8.5",
+        "expand-brackets": "0.1.5",
+        "extglob": "0.3.2",
+        "filename-regex": "2.0.1",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1",
+        "kind-of": "3.2.2",
+        "normalize-path": "2.1.1",
+        "object.omit": "2.0.1",
+        "parse-glob": "3.0.4",
+        "regex-cache": "0.4.4"
+      }
+    },
+    "mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "dev": true
+    },
+    "mime-db": {
+      "version": "1.33.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz",
+      "integrity": "sha512-BHJ/EKruNIqJf/QahvxwQZXKygOQ256myeN/Ew+THcAa5q+PjyTTMMeNQC4DZw5AwfvelsUrA6B67NKMqXDbzQ==",
+      "dev": true
+    },
+    "mime-types": {
+      "version": "2.1.18",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.18.tgz",
+      "integrity": "sha512-lc/aahn+t4/SWV/qcmumYjymLsWfN3ELhpmVuUFjgsORruuZPVSwAQryq+HHGvO/SI2KVX26bx+En+zhM8g8hQ==",
+      "dev": true,
+      "requires": {
+        "mime-db": "1.33.0"
+      }
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "dev": true,
+      "requires": {
+        "brace-expansion": "1.1.11"
+      }
+    },
+    "minimist": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
+      "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
+      "dev": true
+    },
+    "mkdirp": {
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
+      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8"
+      }
+    },
+    "mkpath": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/mkpath/-/mkpath-0.1.0.tgz",
+      "integrity": "sha1-dVSm+Nhxg0zJe1RisSLEwSTW3pE=",
+      "dev": true
+    },
+    "mout": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/mout/-/mout-0.9.1.tgz",
+      "integrity": "sha1-hPDz/WrMcxf2PeKv/cwM7gCbBHc=",
+      "dev": true
+    },
+    "ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=",
+      "dev": true
+    },
+    "mute-stream": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.4.tgz",
+      "integrity": "sha1-qSGZYKbV1dBGWXruUSUsZlX3F34=",
+      "dev": true
+    },
+    "nan": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/nan/-/nan-2.10.0.tgz",
+      "integrity": "sha512-bAdJv7fBLhWC+/Bls0Oza+mvTaNQtP+1RyhhhvD95pgUJz6XM5IzgmxOkItJ9tkoCiplvAnXI1tNmmUD/eScyA==",
+      "dev": true,
+      "optional": true
+    },
+    "natives": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/natives/-/natives-1.1.4.tgz",
+      "integrity": "sha512-Q29yeg9aFKwhLVdkTAejM/HvYG0Y1Am1+HUkFQGn5k2j8GS+v60TVmZh6nujpEAj/qql+wGUrlryO8bF+b1jEg==",
+      "dev": true
+    },
+    "negotiator": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz",
+      "integrity": "sha1-KzJxhOiZIQEXeyhWP7XnECrNDKk=",
+      "dev": true
+    },
+    "netmask": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/netmask/-/netmask-1.0.6.tgz",
+      "integrity": "sha1-ICl+idhvb2QA8lDZ9Pa0wZRfzTU=",
+      "dev": true,
+      "optional": true
+    },
+    "next-tick": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/next-tick/-/next-tick-1.0.0.tgz",
+      "integrity": "sha1-yobR/ogoFpsBICCOPchCS524NCw=",
+      "dev": true
+    },
+    "node-fs": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/node-fs/-/node-fs-0.1.7.tgz",
+      "integrity": "sha1-MjI8zLRsn78PwRgS1FAhzDHTJbs=",
+      "dev": true
+    },
+    "nodemailer": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/nodemailer/-/nodemailer-2.7.2.tgz",
+      "integrity": "sha1-8kLmSa7q45tsftdA73sGHEBNMPk=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "libmime": "3.0.0",
+        "mailcomposer": "4.0.1",
+        "nodemailer-direct-transport": "3.3.2",
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-smtp-pool": "2.8.2",
+        "nodemailer-smtp-transport": "2.7.2",
+        "socks": "1.1.9"
+      },
+      "dependencies": {
+        "socks": {
+          "version": "1.1.9",
+          "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.9.tgz",
+          "integrity": "sha1-Yo1+TQSRJDVEWsC25Fk3bLPm1pE=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ip": "1.1.5",
+            "smart-buffer": "1.1.15"
+          }
+        }
+      }
+    },
+    "nodemailer-direct-transport": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-direct-transport/-/nodemailer-direct-transport-3.3.2.tgz",
+      "integrity": "sha1-6W+vuQNYVglH5WkBfZfmBzilCoY=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-fetch": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-fetch/-/nodemailer-fetch-1.6.0.tgz",
+      "integrity": "sha1-ecSQihwPXzdbc/6IjamCj23JY6Q=",
+      "dev": true
+    },
+    "nodemailer-shared": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/nodemailer-shared/-/nodemailer-shared-1.1.0.tgz",
+      "integrity": "sha1-z1mU4v0mjQD1zw+nZ6CBae2wfsA=",
+      "dev": true,
+      "requires": {
+        "nodemailer-fetch": "1.6.0"
+      }
+    },
+    "nodemailer-smtp-pool": {
+      "version": "2.8.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-smtp-pool/-/nodemailer-smtp-pool-2.8.2.tgz",
+      "integrity": "sha1-LrlNbPhXgLG0clzoU7nL1ejajHI=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-wellknown": "0.1.10",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-smtp-transport": {
+      "version": "2.7.2",
+      "resolved": "https://registry.npmjs.org/nodemailer-smtp-transport/-/nodemailer-smtp-transport-2.7.2.tgz",
+      "integrity": "sha1-A9ccdjFPFKx9vHvwM6am0W1n+3c=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "nodemailer-shared": "1.1.0",
+        "nodemailer-wellknown": "0.1.10",
+        "smtp-connection": "2.12.0"
+      }
+    },
+    "nodemailer-wellknown": {
+      "version": "0.1.10",
+      "resolved": "https://registry.npmjs.org/nodemailer-wellknown/-/nodemailer-wellknown-0.1.10.tgz",
+      "integrity": "sha1-WG24EB2zDLRDjrVGc3pBqtDPE9U=",
+      "dev": true
+    },
+    "nopt": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/nopt/-/nopt-2.1.2.tgz",
+      "integrity": "sha1-bMzZd7gBMqB3MdbozljCyDA8+a8=",
+      "dev": true,
+      "requires": {
+        "abbrev": "1.0.9"
+      }
+    },
+    "normalize-path": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz",
+      "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=",
+      "dev": true,
+      "requires": {
+        "remove-trailing-separator": "1.1.0"
+      }
+    },
+    "npmconf": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/npmconf/-/npmconf-2.1.3.tgz",
+      "integrity": "sha512-iTK+HI68GceCoGOHAQiJ/ik1iDfI7S+cgyG8A+PP18IU3X83kRhQIRhAUNj4Bp2JMx6Zrt5kCiozYa9uGWTjhA==",
+      "dev": true,
+      "requires": {
+        "config-chain": "1.1.11",
+        "inherits": "2.0.3",
+        "ini": "1.3.5",
+        "mkdirp": "0.5.1",
+        "nopt": "3.0.6",
+        "once": "1.3.3",
+        "osenv": "0.1.0",
+        "safe-buffer": "5.1.2",
+        "semver": "4.3.6",
+        "uid-number": "0.0.5"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "3.0.6",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-3.0.6.tgz",
+          "integrity": "sha1-xkZdvwirzU2zWTF/eaxopkayj/k=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.0.9"
+          }
+        },
+        "once": {
+          "version": "1.3.3",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.3.3.tgz",
+          "integrity": "sha1-suJhVXzkwxTsgwTz+oJmPkKXyiA=",
+          "dev": true,
+          "requires": {
+            "wrappy": "1.0.2"
+          }
+        },
+        "semver": {
+          "version": "4.3.6",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-4.3.6.tgz",
+          "integrity": "sha1-MAvG4OhjdPe6YQaLWx7NV/xlMto=",
+          "dev": true
+        }
+      }
+    },
+    "oauth-sign": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz",
+      "integrity": "sha1-Rqarfwrq2N6unsBWV4C31O/rnUM=",
+      "dev": true
+    },
+    "object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=",
+      "dev": true
+    },
+    "object-component": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/object-component/-/object-component-0.0.3.tgz",
+      "integrity": "sha1-8MaapQ78lbhmwYb0AKM3acsvEpE=",
+      "dev": true
+    },
+    "object.omit": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/object.omit/-/object.omit-2.0.1.tgz",
+      "integrity": "sha1-Gpx0SCnznbuFjHbKNXmuKlTr0fo=",
+      "dev": true,
+      "requires": {
+        "for-own": "0.1.5",
+        "is-extendable": "0.1.1"
+      }
+    },
+    "on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha1-IPEzZIGwg811M3mSoWlxqi2QaUc=",
+      "dev": true,
+      "requires": {
+        "ee-first": "1.1.1"
+      }
+    },
+    "once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
+      "dev": true,
+      "requires": {
+        "wrappy": "1.0.2"
+      }
+    },
+    "opn": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/opn/-/opn-1.0.2.tgz",
+      "integrity": "sha1-uQlkM0bQChq8l3qLlvPOPFPVz18=",
+      "dev": true
+    },
+    "optimist": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz",
+      "integrity": "sha1-2j6nRob6IaGaERwybpDrFaAZZoY=",
+      "dev": true,
+      "requires": {
+        "minimist": "0.0.8",
+        "wordwrap": "0.0.3"
+      },
+      "dependencies": {
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true
+        }
+      }
+    },
+    "optionator": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz",
+      "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "deep-is": "0.1.3",
+        "fast-levenshtein": "2.0.6",
+        "levn": "0.3.0",
+        "prelude-ls": "1.1.2",
+        "type-check": "0.3.2",
+        "wordwrap": "1.0.0"
+      }
+    },
+    "os-name": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/os-name/-/os-name-1.0.3.tgz",
+      "integrity": "sha1-GzefZINa98Wn9JizV8uVIVwVnt8=",
+      "dev": true,
+      "requires": {
+        "osx-release": "1.1.0",
+        "win-release": "1.1.1"
+      }
+    },
+    "os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=",
+      "dev": true
+    },
+    "osenv": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.0.tgz",
+      "integrity": "sha1-YWaBIe7FhJVQMLn0cLHSMJUEv8s=",
+      "dev": true
+    },
+    "osx-release": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/osx-release/-/osx-release-1.1.0.tgz",
+      "integrity": "sha1-8heRGigTaUmvG/kwiyQeJzfTzWw=",
+      "dev": true,
+      "requires": {
+        "minimist": "1.2.0"
+      },
+      "dependencies": {
+        "minimist": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz",
+          "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=",
+          "dev": true
+        }
+      }
+    },
+    "p-throttler": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/p-throttler/-/p-throttler-0.1.0.tgz",
+      "integrity": "sha1-GxaQeULDM+bx3eq8s0eSBLjEF8Q=",
+      "dev": true,
+      "requires": {
+        "q": "0.9.7"
+      },
+      "dependencies": {
+        "q": {
+          "version": "0.9.7",
+          "resolved": "https://registry.npmjs.org/q/-/q-0.9.7.tgz",
+          "integrity": "sha1-TeLmyzspCIyeTLwDv51C+5bOL3U=",
+          "dev": true
+        }
+      }
+    },
+    "pac-proxy-agent": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/pac-proxy-agent/-/pac-proxy-agent-2.0.2.tgz",
+      "integrity": "sha512-cDNAN1Ehjbf5EHkNY5qnRhGPUCp6SnpyVof5fRzN800QV1Y2OkzbH9rmjZkbBRa8igof903yOnjIl6z0SlAhxA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "agent-base": "4.2.0",
+        "debug": "3.1.0",
+        "get-uri": "2.0.2",
+        "http-proxy-agent": "2.1.0",
+        "https-proxy-agent": "2.2.1",
+        "pac-resolver": "3.0.0",
+        "raw-body": "2.3.3",
+        "socks-proxy-agent": "3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "pac-resolver": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pac-resolver/-/pac-resolver-3.0.0.tgz",
+      "integrity": "sha512-tcc38bsjuE3XZ5+4vP96OfhOugrX+JcnpUbhfuc4LuXBLQhoTthOstZeoQJBDnQUDYzYmdImKsbz0xSl1/9qeA==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "co": "4.6.0",
+        "degenerator": "1.0.4",
+        "ip": "1.1.5",
+        "netmask": "1.0.6",
+        "thunkify": "2.1.2"
+      }
+    },
+    "package-json": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/package-json/-/package-json-0.2.0.tgz",
+      "integrity": "sha1-Axbhd7jrFJmF009wa0pVQ7J0vsU=",
+      "dev": true,
+      "requires": {
+        "got": "0.3.0",
+        "registry-url": "0.1.1"
+      }
+    },
+    "parse-glob": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/parse-glob/-/parse-glob-3.0.4.tgz",
+      "integrity": "sha1-ssN2z7EfNVE7rdFz7wu246OIORw=",
+      "dev": true,
+      "requires": {
+        "glob-base": "0.3.0",
+        "is-dotfile": "1.0.3",
+        "is-extglob": "1.0.0",
+        "is-glob": "2.0.1"
+      }
+    },
+    "parseqs": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseqs/-/parseqs-0.0.5.tgz",
+      "integrity": "sha1-1SCKNzjkZ2bikbouoXNoSSGouJ0=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseuri": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/parseuri/-/parseuri-0.0.5.tgz",
+      "integrity": "sha1-gCBKUNTbt3m/3G6+J3jZDkvOMgo=",
+      "dev": true,
+      "requires": {
+        "better-assert": "1.0.2"
+      }
+    },
+    "parseurl": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.2.tgz",
+      "integrity": "sha1-/CidTtiZMRlGDBViUyYs3I3mW/M=",
+      "dev": true
+    },
+    "path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=",
+      "dev": true
+    },
+    "path-proxy": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/path-proxy/-/path-proxy-1.0.0.tgz",
+      "integrity": "sha1-GOijaFn8nS8aU7SN7hOFQ8Ag3l4=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "inflection": "1.3.8"
+      },
+      "dependencies": {
+        "inflection": {
+          "version": "1.3.8",
+          "resolved": "https://registry.npmjs.org/inflection/-/inflection-1.3.8.tgz",
+          "integrity": "sha1-y9Fg2p91sUw8xjV41POWeEvzAU4=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "pend": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz",
+      "integrity": "sha1-elfrVQpng/kRUzH89GY9XI4AelA=",
+      "dev": true
+    },
+    "performance-now": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz",
+      "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=",
+      "dev": true
+    },
+    "phantomjs-prebuilt": {
+      "version": "2.1.16",
+      "resolved": "https://registry.npmjs.org/phantomjs-prebuilt/-/phantomjs-prebuilt-2.1.16.tgz",
+      "integrity": "sha1-79ISpKOWbTZHaE6ouniFSb4q7+8=",
+      "dev": true,
+      "requires": {
+        "es6-promise": "4.2.4",
+        "extract-zip": "1.6.7",
+        "fs-extra": "1.0.0",
+        "hasha": "2.2.0",
+        "kew": "0.7.0",
+        "progress": "1.1.8",
+        "request": "2.87.0",
+        "request-progress": "2.0.1",
+        "which": "1.3.1"
+      },
+      "dependencies": {
+        "request-progress": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-2.0.1.tgz",
+          "integrity": "sha1-XTa7V5YcZzqlt4jbyBQf3yO0Tgg=",
+          "dev": true,
+          "requires": {
+            "throttleit": "1.0.0"
+          }
+        },
+        "throttleit": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-1.0.0.tgz",
+          "integrity": "sha1-nnhYNtr0Z0MUWlmEtiaNgoUorGw=",
+          "dev": true
+        },
+        "which": {
+          "version": "1.3.1",
+          "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+          "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+          "dev": true,
+          "requires": {
+            "isexe": "2.0.0"
+          }
+        }
+      }
+    },
+    "pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha1-clVrgM+g1IqXToDnckjoDtT3+HA=",
+      "dev": true
+    },
+    "pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha1-ITXW36ejWMBprJsXh3YogihFD/o=",
+      "dev": true,
+      "requires": {
+        "pinkie": "2.0.4"
+      }
+    },
+    "prelude-ls": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz",
+      "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=",
+      "dev": true
+    },
+    "preserve": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/preserve/-/preserve-0.2.0.tgz",
+      "integrity": "sha1-gV7R9uvGWSb4ZbMQwHE7yzMVzks=",
+      "dev": true
+    },
+    "process-nextick-args": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.0.tgz",
+      "integrity": "sha512-MtEC1TqN0EU5nephaJ4rAtThHtC86dNN9qCuEhtshvpVBkAW5ZO7BASN9REnF9eoXGcRub+pFuKEpOHE+HbEMw==",
+      "dev": true
+    },
+    "progress": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/progress/-/progress-1.1.8.tgz",
+      "integrity": "sha1-4mDHj2Fhzdmw5WzD4Khd4Xx6V74=",
+      "dev": true
+    },
+    "promisify-call": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/promisify-call/-/promisify-call-2.0.4.tgz",
+      "integrity": "sha1-1IwtRWUszM1SgB3ey9UzptS9X7o=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "with-callback": "1.0.2"
+      }
+    },
+    "promptly": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/promptly/-/promptly-0.2.0.tgz",
+      "integrity": "sha1-c+8gD6gynV06jfQXmJULhkbKRtk=",
+      "dev": true,
+      "requires": {
+        "read": "1.0.7"
+      }
+    },
+    "proto-list": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz",
+      "integrity": "sha1-IS1b/hMYMGpCD2QCuOJv85ZHqEk=",
+      "dev": true
+    },
+    "proxy-agent": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-agent/-/proxy-agent-3.0.0.tgz",
+      "integrity": "sha512-g6n6vnk8fRf705ShN+FEXFG/SDJaW++lSs0d9KaJh4uBWW/wi7en4Cpo5VYQW3SZzAE121lhB/KLQrbURoubZw==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "agent-base": "4.2.0",
+        "debug": "3.1.0",
+        "http-proxy-agent": "2.1.0",
+        "https-proxy-agent": "2.2.1",
+        "lru-cache": "4.1.3",
+        "pac-proxy-agent": "2.0.2",
+        "proxy-from-env": "1.0.0",
+        "socks-proxy-agent": "3.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "proxy-from-env": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.0.0.tgz",
+      "integrity": "sha1-M8UDmPcOp+uW0h97gXYwpVeRx+4=",
+      "dev": true,
+      "optional": true
+    },
+    "pseudomap": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz",
+      "integrity": "sha1-8FKijacOYYkX7wqKw0wa5aaChrM=",
+      "dev": true,
+      "optional": true
+    },
+    "pump": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/pump/-/pump-0.3.5.tgz",
+      "integrity": "sha1-rl/4wfk+2HrcZTCpdWWxJvWFRUs=",
+      "dev": true,
+      "requires": {
+        "end-of-stream": "1.0.0",
+        "once": "1.2.0"
+      },
+      "dependencies": {
+        "once": {
+          "version": "1.2.0",
+          "resolved": "https://registry.npmjs.org/once/-/once-1.2.0.tgz",
+          "integrity": "sha1-3hkFxjavh0qPuoYtmqvd0fkgRhw=",
+          "dev": true
+        }
+      }
+    },
+    "punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha1-wNWmOycYgArY4esPpSachN1BhF4=",
+      "dev": true
+    },
+    "q": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/q/-/q-1.0.1.tgz",
+      "integrity": "sha1-EYcq7t7okmgRCxCnGESP+xARKhQ=",
+      "dev": true
+    },
+    "qjobs": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/qjobs/-/qjobs-1.2.0.tgz",
+      "integrity": "sha512-8YOJEHtxpySA3fFDyCRxA+UUV+fA+rTWnuWvylOK/NCjhY+b4ocCtmu8TtsWb+mYeU+GCHf/S66KZF/AsteKHg==",
+      "dev": true
+    },
+    "qs": {
+      "version": "6.5.2",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz",
+      "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==",
+      "dev": true
+    },
+    "randomatic": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/randomatic/-/randomatic-3.0.0.tgz",
+      "integrity": "sha512-VdxFOIEY3mNO5PtSRkkle/hPJDHvQhK21oa73K4yAc9qmp6N429gAyF1gZMOTMeS0/AYzaV/2Trcef+NaIonSA==",
+      "dev": true,
+      "requires": {
+        "is-number": "4.0.0",
+        "kind-of": "6.0.2",
+        "math-random": "1.0.1"
+      },
+      "dependencies": {
+        "is-number": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/is-number/-/is-number-4.0.0.tgz",
+          "integrity": "sha512-rSklcAIlf1OmFdyAqbnWTLVelsQ58uvZ66S/ZyawjWqIviTWCjg2PzVGw8WUA+nNuPTqb4wgA+NszrJ+08LlgQ==",
+          "dev": true
+        },
+        "kind-of": {
+          "version": "6.0.2",
+          "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.2.tgz",
+          "integrity": "sha512-s5kLOcnH0XqDO+FvuaLX8DDjZ18CGFk7VygH40QoKPUQhW4e2rvM0rwUq0t8IQDOwYSeLK01U90OjzBTme2QqA==",
+          "dev": true
+        }
+      }
+    },
+    "range-parser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.0.tgz",
+      "integrity": "sha1-9JvmtIeJTdxA3MlKMi9hEJLgDV4=",
+      "dev": true
+    },
+    "raw-body": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.3.3.tgz",
+      "integrity": "sha512-9esiElv1BrZoI3rCDuOuKCBRbuApGGaDPQfjSflGxdy4oyzqghxu6klEkkVIvBje+FF0BX9coEv8KqW6X/7njw==",
+      "dev": true,
+      "requires": {
+        "bytes": "3.0.0",
+        "http-errors": "1.6.3",
+        "iconv-lite": "0.4.23",
+        "unpipe": "1.0.0"
+      }
+    },
+    "read": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/read/-/read-1.0.7.tgz",
+      "integrity": "sha1-s9oZvQUkMal2cdRKQmNK33ELQMQ=",
+      "dev": true,
+      "requires": {
+        "mute-stream": "0.0.4"
+      }
+    },
+    "readable-stream": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.6.tgz",
+      "integrity": "sha512-tQtKA9WIAhBF3+VLAseyMqZeBjW0AHJoxOtYqSUZNJxauErmLbVm2FW1y+J/YA9dUrAC39ITejlZWhVIwawkKw==",
+      "dev": true,
+      "requires": {
+        "core-util-is": "1.0.2",
+        "inherits": "2.0.3",
+        "isarray": "1.0.0",
+        "process-nextick-args": "2.0.0",
+        "safe-buffer": "5.1.2",
+        "string_decoder": "1.1.1",
+        "util-deprecate": "1.0.2"
+      }
+    },
+    "readdirp": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-2.1.0.tgz",
+      "integrity": "sha1-TtCtBg3zBzMAxIRANz9y0cxkLXg=",
+      "dev": true,
+      "requires": {
+        "graceful-fs": "4.1.11",
+        "minimatch": "3.0.4",
+        "readable-stream": "2.3.6",
+        "set-immediate-shim": "1.0.1"
+      }
+    },
+    "readline2": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/readline2/-/readline2-0.1.1.tgz",
+      "integrity": "sha1-mUQ7pug7gw7zBRv9fcJBqCco1Wg=",
+      "dev": true,
+      "requires": {
+        "mute-stream": "0.0.4",
+        "strip-ansi": "2.0.1"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "1.1.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.1.tgz",
+          "integrity": "sha1-QchHGUZGN15qGl0Qw8oFTvn8mA0=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.1.tgz",
+          "integrity": "sha1-32LBqpTtLxFOHQ8h/R1QSCt5pg4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "1.1.1"
+          }
+        }
+      }
+    },
+    "redeyed": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/redeyed/-/redeyed-0.4.4.tgz",
+      "integrity": "sha1-N+mQpvKyGyoRwuakj9QTVpjLqX8=",
+      "dev": true,
+      "requires": {
+        "esprima": "1.0.4"
+      },
+      "dependencies": {
+        "esprima": {
+          "version": "1.0.4",
+          "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz",
+          "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=",
+          "dev": true
+        }
+      }
+    },
+    "redis": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/redis/-/redis-2.8.0.tgz",
+      "integrity": "sha512-M1OkonEQwtRmZv4tEWF2VgpG0JWJ8Fv1PhlgT5+B+uNq2cA3Rt1Yt/ryoR+vQNOQcIEgdCdfH0jr3bDpihAw1A==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "double-ended-queue": "2.1.0-0",
+        "redis-commands": "1.3.5",
+        "redis-parser": "2.6.0"
+      }
+    },
+    "redis-commands": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/redis-commands/-/redis-commands-1.3.5.tgz",
+      "integrity": "sha512-foGF8u6MXGFF++1TZVC6icGXuMYPftKXt1FBT2vrfU9ZATNtZJ8duRC5d1lEfE8hyVe3jhelHGB91oB7I6qLsA==",
+      "dev": true,
+      "optional": true
+    },
+    "redis-parser": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/redis-parser/-/redis-parser-2.6.0.tgz",
+      "integrity": "sha1-Uu0J2srBCPGmMcB+m2mUHnoZUEs=",
+      "dev": true,
+      "optional": true
+    },
+    "regex-cache": {
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/regex-cache/-/regex-cache-0.4.4.tgz",
+      "integrity": "sha512-nVIZwtCjkC9YgvWkpM55B5rBhBYRZhAaJbgcFYXXsHnbZ9UZI9nnVWYZpBlCqv9ho2eZryPnWrZGsOdPwVWXWQ==",
+      "dev": true,
+      "requires": {
+        "is-equal-shallow": "0.1.3"
+      }
+    },
+    "registry-url": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-0.1.1.tgz",
+      "integrity": "sha1-FzlCe4GxELMCSCocfNcn/8yC1b4=",
+      "dev": true,
+      "requires": {
+        "npmconf": "2.1.3"
+      }
+    },
+    "remove-trailing-separator": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz",
+      "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=",
+      "dev": true
+    },
+    "repeat-element": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.2.tgz",
+      "integrity": "sha1-7wiaF40Ug7quTZPrmLT55OEdmQo=",
+      "dev": true
+    },
+    "repeat-string": {
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz",
+      "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
+      "dev": true
+    },
+    "request": {
+      "version": "2.87.0",
+      "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz",
+      "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==",
+      "dev": true,
+      "requires": {
+        "aws-sign2": "0.7.0",
+        "aws4": "1.7.0",
+        "caseless": "0.12.0",
+        "combined-stream": "1.0.6",
+        "extend": "3.0.1",
+        "forever-agent": "0.6.1",
+        "form-data": "2.3.2",
+        "har-validator": "5.0.3",
+        "http-signature": "1.2.0",
+        "is-typedarray": "1.0.0",
+        "isstream": "0.1.2",
+        "json-stringify-safe": "5.0.1",
+        "mime-types": "2.1.18",
+        "oauth-sign": "0.8.2",
+        "performance-now": "2.1.0",
+        "qs": "6.5.2",
+        "safe-buffer": "5.1.2",
+        "tough-cookie": "2.3.4",
+        "tunnel-agent": "0.6.0",
+        "uuid": "3.2.1"
+      }
+    },
+    "request-progress": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/request-progress/-/request-progress-0.3.0.tgz",
+      "integrity": "sha1-vfIGK/wZfF1JJQDUTLOv94ZbSS4=",
+      "dev": true,
+      "requires": {
+        "throttleit": "0.0.2"
+      }
+    },
+    "request-replay": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/request-replay/-/request-replay-0.2.0.tgz",
+      "integrity": "sha1-m2k6XRGLOfXFlurV7ZGiZEQFf2A=",
+      "dev": true,
+      "requires": {
+        "retry": "0.6.0"
+      }
+    },
+    "requestretry": {
+      "version": "1.13.0",
+      "resolved": "https://registry.npmjs.org/requestretry/-/requestretry-1.13.0.tgz",
+      "integrity": "sha512-Lmh9qMvnQXADGAQxsXHP4rbgO6pffCfuR8XUBdP9aitJcLQJxhp7YZK4xAVYXnPJ5E52mwrfiKQtKonPL8xsmg==",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "extend": "3.0.1",
+        "lodash": "4.17.10",
+        "request": "2.87.0",
+        "when": "3.7.8"
+      }
+    },
+    "requires-port": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz",
+      "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8=",
+      "dev": true
+    },
+    "retry": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.6.0.tgz",
+      "integrity": "sha1-HAEHEyeab9Ho3vKK8MP/GHHKpTc=",
+      "dev": true
+    },
+    "rimraf": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.2.tgz",
+      "integrity": "sha512-lreewLK/BlghmxtfH36YYVg1i8IAce4TI7oao75I1g245+6BctqTVQiBP3YUJ9C6DQOXJmkYR9X9fCLtCOJc5w==",
+      "dev": true,
+      "requires": {
+        "glob": "7.1.2"
+      }
+    },
+    "rx": {
+      "version": "2.5.3",
+      "resolved": "https://registry.npmjs.org/rx/-/rx-2.5.3.tgz",
+      "integrity": "sha1-Ia3H2A8CACr1Da6X/Z2/JIdV9WY=",
+      "dev": true
+    },
+    "safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
+      "dev": true
+    },
+    "safer-buffer": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz",
+      "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==",
+      "dev": true
+    },
+    "semver": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.5.0.tgz",
+      "integrity": "sha512-4SJ3dm0WAwWy/NVeioZh5AntkdJoWKxHxcmyP622fOkgHa4z3R0TdBJICINyaSDE6uNwVc8gZr+ZinwZAH4xIA==",
+      "dev": true
+    },
+    "semver-diff": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/semver-diff/-/semver-diff-0.1.0.tgz",
+      "integrity": "sha1-T2BXyj66I8xIS1H2Sq+IsTGjhV0=",
+      "dev": true,
+      "requires": {
+        "semver": "2.3.2"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "2.3.2",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+          "integrity": "sha1-uYSPJdbPNjMwc+ye+IVtQvEjPlI=",
+          "dev": true
+        }
+      }
+    },
+    "set-immediate-shim": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz",
+      "integrity": "sha1-SysbJ+uAip+NzEgaWOXlb1mfP2E=",
+      "dev": true
+    },
+    "setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==",
+      "dev": true
+    },
+    "shell-quote": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/shell-quote/-/shell-quote-1.4.3.tgz",
+      "integrity": "sha1-lSxE4LHtkBPvU5WBecxkPod3Rms=",
+      "dev": true,
+      "requires": {
+        "array-filter": "0.0.1",
+        "array-map": "0.0.0",
+        "array-reduce": "0.0.0",
+        "jsonify": "0.0.0"
+      }
+    },
+    "sigmund": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/sigmund/-/sigmund-1.0.1.tgz",
+      "integrity": "sha1-P/IfGYytIXX587eBhT/ZTQ0ZtZA=",
+      "dev": true
+    },
+    "signal-exit": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
+      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "dev": true
+    },
+    "slack-node": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/slack-node/-/slack-node-0.2.0.tgz",
+      "integrity": "sha1-3kuN3aqLeT9h29KTgQT9q/N9+jA=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "requestretry": "1.13.0"
+      }
+    },
+    "smart-buffer": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-1.1.15.tgz",
+      "integrity": "sha1-fxFLW2X6s+KjWqd1uxLw0cZJvxY=",
+      "dev": true
+    },
+    "smtp-connection": {
+      "version": "2.12.0",
+      "resolved": "https://registry.npmjs.org/smtp-connection/-/smtp-connection-2.12.0.tgz",
+      "integrity": "sha1-1275EnyyPCJZ7bHoNJwujV4tdME=",
+      "dev": true,
+      "requires": {
+        "httpntlm": "1.6.1",
+        "nodemailer-shared": "1.1.0"
+      }
+    },
+    "sntp": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz",
+      "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "hoek": "2.16.3"
+      }
+    },
+    "socket.io": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.0.4.tgz",
+      "integrity": "sha1-waRZDO/4fs8TxyZS8Eb3FrKeYBQ=",
+      "dev": true,
+      "requires": {
+        "debug": "2.6.9",
+        "engine.io": "3.1.5",
+        "socket.io-adapter": "1.1.1",
+        "socket.io-client": "2.0.4",
+        "socket.io-parser": "3.1.3"
+      }
+    },
+    "socket.io-adapter": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/socket.io-adapter/-/socket.io-adapter-1.1.1.tgz",
+      "integrity": "sha1-KoBeihTWNyEk3ZFZrUUC+MsH8Gs=",
+      "dev": true
+    },
+    "socket.io-client": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-2.0.4.tgz",
+      "integrity": "sha1-CRilUkBtxeVAs4Dc2Xr8SmQzL44=",
+      "dev": true,
+      "requires": {
+        "backo2": "1.0.2",
+        "base64-arraybuffer": "0.1.5",
+        "component-bind": "1.0.0",
+        "component-emitter": "1.2.1",
+        "debug": "2.6.9",
+        "engine.io-client": "3.1.6",
+        "has-cors": "1.1.0",
+        "indexof": "0.0.1",
+        "object-component": "0.0.3",
+        "parseqs": "0.0.5",
+        "parseuri": "0.0.5",
+        "socket.io-parser": "3.1.3",
+        "to-array": "0.1.4"
+      }
+    },
+    "socket.io-parser": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-3.1.3.tgz",
+      "integrity": "sha512-g0a2HPqLguqAczs3dMECuA1RgoGFPyvDqcbaDEdCWY9g59kdUAz3YRmaJBNKXflrHNwB7Q12Gkf/0CZXfdHR7g==",
+      "dev": true,
+      "requires": {
+        "component-emitter": "1.2.1",
+        "debug": "3.1.0",
+        "has-binary2": "1.0.3",
+        "isarray": "2.0.1"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        },
+        "isarray": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.1.tgz",
+          "integrity": "sha1-o32U7ZzaLVmGXJ92/llu4fM4dB4=",
+          "dev": true
+        }
+      }
+    },
+    "socks": {
+      "version": "1.1.10",
+      "resolved": "https://registry.npmjs.org/socks/-/socks-1.1.10.tgz",
+      "integrity": "sha1-W4t/x8jzQcU+0FbpKbe/Tei6e1o=",
+      "dev": true,
+      "requires": {
+        "ip": "1.1.5",
+        "smart-buffer": "1.1.15"
+      }
+    },
+    "socks-proxy-agent": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-3.0.1.tgz",
+      "integrity": "sha512-ZwEDymm204mTzvdqyUqOdovVr2YRd2NYskrYrF2LXyZ9qDiMAoFESGK8CRphiO7rtbo2Y757k2Nia3x2hGtalA==",
+      "dev": true,
+      "requires": {
+        "agent-base": "4.2.0",
+        "socks": "1.1.10"
+      }
+    },
+    "source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "dev": true
+    },
+    "sprintf-js": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz",
+      "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=",
+      "dev": true
+    },
+    "sshpk": {
+      "version": "1.14.1",
+      "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.14.1.tgz",
+      "integrity": "sha1-Ew9Zde3a2WPx1W+SuaxsUfqfg+s=",
+      "dev": true,
+      "requires": {
+        "asn1": "0.2.3",
+        "assert-plus": "1.0.0",
+        "bcrypt-pbkdf": "1.0.1",
+        "dashdash": "1.14.1",
+        "ecc-jsbn": "0.1.1",
+        "getpass": "0.1.7",
+        "jsbn": "0.1.1",
+        "tweetnacl": "0.14.5"
+      }
+    },
+    "statuses": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz",
+      "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=",
+      "dev": true
+    },
+    "streamroller": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/streamroller/-/streamroller-0.7.0.tgz",
+      "integrity": "sha512-WREzfy0r0zUqp3lGO096wRuUp7ho1X6uo/7DJfTlEi0Iv/4gT7YHqXDjKC2ioVGBZtE8QzsQD9nx1nIuoZ57jQ==",
+      "dev": true,
+      "requires": {
+        "date-format": "1.2.0",
+        "debug": "3.1.0",
+        "mkdirp": "0.5.1",
+        "readable-stream": "2.3.6"
+      },
+      "dependencies": {
+        "debug": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+          "dev": true,
+          "requires": {
+            "ms": "2.0.0"
+          }
+        }
+      }
+    },
+    "string-length": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-0.1.2.tgz",
+      "integrity": "sha1-qwS7M4Z+50vu1/uJu38InTkngPI=",
+      "dev": true,
+      "requires": {
+        "strip-ansi": "0.2.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.1.0.tgz",
+          "integrity": "sha1-Vcpg22kAhXxCOukpeYACb5Qe2QM=",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "0.2.2",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.2.2.tgz",
+          "integrity": "sha1-hU0pDJgVJfyMOXqRCwJa4tVP/Ag=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.1.0"
+          }
+        }
+      }
+    },
+    "string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "stringify-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/stringify-object/-/stringify-object-1.0.1.tgz",
+      "integrity": "sha1-htNefb+86apFY31+zdeEfhWduKI=",
+      "dev": true
+    },
+    "stringstream": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz",
+      "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==",
+      "dev": true
+    },
+    "strip-ansi": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz",
+      "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "ansi-regex": "2.1.1"
+      }
+    },
+    "supports-color": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz",
+      "integrity": "sha1-U10EXOa2Nj+kARcIRimZXp3zJMc=",
+      "dev": true,
+      "optional": true
+    },
+    "tar-fs": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-0.5.2.tgz",
+      "integrity": "sha1-D1lCS+fu7kUjIxbjAvZtP26m2z4=",
+      "dev": true,
+      "requires": {
+        "mkdirp": "0.5.1",
+        "pump": "0.3.5",
+        "tar-stream": "0.4.7"
+      }
+    },
+    "tar-stream": {
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-0.4.7.tgz",
+      "integrity": "sha1-Hx0s6evHtCdlJDyg6PG3v9oKrc0=",
+      "dev": true,
+      "requires": {
+        "bl": "0.9.5",
+        "end-of-stream": "1.0.0",
+        "readable-stream": "1.1.14",
+        "xtend": "4.0.1"
+      },
+      "dependencies": {
+        "bl": {
+          "version": "0.9.5",
+          "resolved": "https://registry.npmjs.org/bl/-/bl-0.9.5.tgz",
+          "integrity": "sha1-wGt5evCF6gC8Unr8jvzxHeIjIFQ=",
+          "dev": true,
+          "requires": {
+            "readable-stream": "1.0.34"
+          },
+          "dependencies": {
+            "readable-stream": {
+              "version": "1.0.34",
+              "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+              "integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
+              "dev": true,
+              "requires": {
+                "core-util-is": "1.0.2",
+                "inherits": "2.0.3",
+                "isarray": "0.0.1",
+                "string_decoder": "0.10.31"
+              }
+            }
+          }
+        },
+        "isarray": {
+          "version": "0.0.1",
+          "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+          "integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=",
+          "dev": true
+        },
+        "readable-stream": {
+          "version": "1.1.14",
+          "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+          "integrity": "sha1-fPTFTvZI44EwhMY23SB54WbAgdk=",
+          "dev": true,
+          "requires": {
+            "core-util-is": "1.0.2",
+            "inherits": "2.0.3",
+            "isarray": "0.0.1",
+            "string_decoder": "0.10.31"
+          }
+        },
+        "string_decoder": {
+          "version": "0.10.31",
+          "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+          "integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ=",
+          "dev": true
+        }
+      }
+    },
+    "throttleit": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/throttleit/-/throttleit-0.0.2.tgz",
+      "integrity": "sha1-z+34jmDADdlpe2H90qg0OptoDq8=",
+      "dev": true
+    },
+    "through": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
+      "integrity": "sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=",
+      "dev": true
+    },
+    "thunkify": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/thunkify/-/thunkify-2.1.2.tgz",
+      "integrity": "sha1-+qDp0jDFGsyVyhOjYawFyn4EVT0=",
+      "dev": true,
+      "optional": true
+    },
+    "timers-ext": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/timers-ext/-/timers-ext-0.1.5.tgz",
+      "integrity": "sha512-tsEStd7kmACHENhsUPaxb8Jf8/+GZZxyNFQbZD07HQOyooOa6At1rQqjffgvg7n+dxscQa9cjjMdWhJtsP2sxg==",
+      "dev": true,
+      "requires": {
+        "es5-ext": "0.10.44",
+        "next-tick": "1.0.0"
+      }
+    },
+    "timespan": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/timespan/-/timespan-2.3.0.tgz",
+      "integrity": "sha1-SQLOBAvRPYRcj1myfp1ZutbzmSk=",
+      "dev": true,
+      "optional": true
+    },
+    "tmp": {
+      "version": "0.0.33",
+      "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz",
+      "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==",
+      "dev": true,
+      "requires": {
+        "os-tmpdir": "1.0.2"
+      }
+    },
+    "to-array": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/to-array/-/to-array-0.1.4.tgz",
+      "integrity": "sha1-F+bBH3PdTz10zaek/zI46a2b+JA=",
+      "dev": true
+    },
+    "touch": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/touch/-/touch-0.0.2.tgz",
+      "integrity": "sha1-plp3d5Xly74SmUmb3EIoH/shtfQ=",
+      "dev": true,
+      "requires": {
+        "nopt": "1.0.10"
+      },
+      "dependencies": {
+        "nopt": {
+          "version": "1.0.10",
+          "resolved": "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz",
+          "integrity": "sha1-bd0hvSoxQXuScn3Vhfim83YI6+4=",
+          "dev": true,
+          "requires": {
+            "abbrev": "1.0.9"
+          }
+        }
+      }
+    },
+    "tough-cookie": {
+      "version": "2.3.4",
+      "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz",
+      "integrity": "sha512-TZ6TTfI5NtZnuyy/Kecv+CnoROnyXn2DN97LontgQpCwsX2XyLYCC0ENhYkehSOwAp8rTQKc/NUIF7BkQ5rKLA==",
+      "dev": true,
+      "requires": {
+        "punycode": "1.4.1"
+      }
+    },
+    "traverse": {
+      "version": "0.3.9",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz",
+      "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk=",
+      "dev": true
+    },
+    "tsscmp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz",
+      "integrity": "sha1-fcSjOvcVgatDN9qR2FylQn69mpc=",
+      "dev": true,
+      "optional": true
+    },
+    "tunnel-agent": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz",
+      "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=",
+      "dev": true,
+      "requires": {
+        "safe-buffer": "5.1.2"
+      }
+    },
+    "tweetnacl": {
+      "version": "0.14.5",
+      "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz",
+      "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=",
+      "dev": true,
+      "optional": true
+    },
+    "type-check": {
+      "version": "0.3.2",
+      "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
+      "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=",
+      "dev": true,
+      "requires": {
+        "prelude-ls": "1.1.2"
+      }
+    },
+    "type-is": {
+      "version": "1.6.16",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.16.tgz",
+      "integrity": "sha512-HRkVv/5qY2G6I8iab9cI7v1bOIdhm94dVjQCPFElW9W+3GeDOSHmy2EBYe4VTApuzolPcmgFTN3ftVJRKR2J9Q==",
+      "dev": true,
+      "requires": {
+        "media-typer": "0.3.0",
+        "mime-types": "2.1.18"
+      }
+    },
+    "typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=",
+      "dev": true
+    },
+    "uglify-js": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-2.3.6.tgz",
+      "integrity": "sha1-+gmEdwtCi3qbKoBY9GNV0U/vIRo=",
+      "dev": true,
+      "optional": true,
+      "requires": {
+        "async": "0.2.10",
+        "optimist": "0.3.7",
+        "source-map": "0.1.43"
+      },
+      "dependencies": {
+        "async": {
+          "version": "0.2.10",
+          "resolved": "https://registry.npmjs.org/async/-/async-0.2.10.tgz",
+          "integrity": "sha1-trvgsGdLnXGXCMo43owjfLUmw9E=",
+          "dev": true,
+          "optional": true
+        },
+        "optimist": {
+          "version": "0.3.7",
+          "resolved": "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz",
+          "integrity": "sha1-yQlBrVnkJzMokjB00s8ufLxuwNk=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "wordwrap": "0.0.3"
+          }
+        },
+        "source-map": {
+          "version": "0.1.43",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz",
+          "integrity": "sha1-wkvBRspRfBRx9drL4lcbK3+eM0Y=",
+          "dev": true,
+          "optional": true,
+          "requires": {
+            "amdefine": "1.0.1"
+          }
+        },
+        "wordwrap": {
+          "version": "0.0.3",
+          "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz",
+          "integrity": "sha1-o9XabNXAvAAI03I0u68b7WMFkQc=",
+          "dev": true,
+          "optional": true
+        }
+      }
+    },
+    "uid-number": {
+      "version": "0.0.5",
+      "resolved": "https://registry.npmjs.org/uid-number/-/uid-number-0.0.5.tgz",
+      "integrity": "sha1-Wj2yPvXb1VuB/ODsmirG/M3ruB4=",
+      "dev": true
+    },
+    "ultron": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ultron/-/ultron-1.1.1.tgz",
+      "integrity": "sha512-UIEXBNeYmKptWH6z8ZnqTeS8fV74zG0/eRU9VGkpzz+LIJNs8W/zM/L+7ctCkRrgbNnnR0xxw4bKOr0cW0N0Og==",
+      "dev": true
+    },
+    "underscore": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.7.0.tgz",
+      "integrity": "sha1-a7rwh3UA02vjTsqlhODbn+8DUgk=",
+      "dev": true
+    },
+    "unpipe": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz",
+      "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=",
+      "dev": true
+    },
+    "update-notifier": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-0.2.0.tgz",
+      "integrity": "sha1-oBDJKK3PAgkLjgzn/vb7Cnysw0o=",
+      "dev": true,
+      "requires": {
+        "chalk": "0.5.1",
+        "configstore": "0.3.2",
+        "latest-version": "0.2.0",
+        "semver-diff": "0.1.0",
+        "string-length": "0.1.2"
+      },
+      "dependencies": {
+        "ansi-regex": {
+          "version": "0.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-0.2.1.tgz",
+          "integrity": "sha1-DY6UaWej2BQ/k+JOKYUl/BsiNfk=",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-1.1.0.tgz",
+          "integrity": "sha1-6uy/Zs1waIJ2Cy9GkVgrj1XXp94=",
+          "dev": true
+        },
+        "chalk": {
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-0.5.1.tgz",
+          "integrity": "sha1-Zjs6ZItotV0EaQ1JFnqoN4WPIXQ=",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "1.1.0",
+            "escape-string-regexp": "1.0.5",
+            "has-ansi": "0.1.0",
+            "strip-ansi": "0.3.0",
+            "supports-color": "0.2.0"
+          }
+        },
+        "has-ansi": {
+          "version": "0.1.0",
+          "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-0.1.0.tgz",
+          "integrity": "sha1-hPJlqujA5qiKEtcCKJS3VoiUxi4=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "strip-ansi": {
+          "version": "0.3.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-0.3.0.tgz",
+          "integrity": "sha1-JfSOoiynkYfzF0pNuHWTR7sSYiA=",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "0.2.1"
+          }
+        },
+        "supports-color": {
+          "version": "0.2.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-0.2.0.tgz",
+          "integrity": "sha1-2S3iaU6z9nMjlz1649i1W0wiGQo=",
+          "dev": true
+        }
+      }
+    },
+    "user-home": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/user-home/-/user-home-1.1.1.tgz",
+      "integrity": "sha1-K1viOjK2Onyd640PKNSFcko98ZA=",
+      "dev": true
+    },
+    "useragent": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/useragent/-/useragent-2.2.1.tgz",
+      "integrity": "sha1-z1k+9PLRdYdei7ZY6pLhik/QbY4=",
+      "dev": true,
+      "requires": {
+        "lru-cache": "2.2.4",
+        "tmp": "0.0.33"
+      },
+      "dependencies": {
+        "lru-cache": {
+          "version": "2.2.4",
+          "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-2.2.4.tgz",
+          "integrity": "sha1-bGWGGb7PFAMdDQtZSxYELOTcBj0=",
+          "dev": true
+        }
+      }
+    },
+    "util-deprecate": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
+      "dev": true
+    },
+    "utils-merge": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
+      "integrity": "sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=",
+      "dev": true
+    },
+    "uuid": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.2.1.tgz",
+      "integrity": "sha512-jZnMwlb9Iku/O3smGWvZhauCf6cvvpKi4BKRiliS3cxnI+Gz9j5MEpTz2UFuXiKPJocb7gnsLHwiS05ige5BEA==",
+      "dev": true
+    },
+    "uws": {
+      "version": "9.14.0",
+      "resolved": "https://registry.npmjs.org/uws/-/uws-9.14.0.tgz",
+      "integrity": "sha512-HNMztPP5A1sKuVFmdZ6BPVpBQd5bUjNC8EFMFiICK+oho/OQsAJy5hnIx4btMHiOk8j04f/DbIlqnEZ9d72dqg==",
+      "dev": true,
+      "optional": true
+    },
+    "verror": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz",
+      "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=",
+      "dev": true,
+      "requires": {
+        "assert-plus": "1.0.0",
+        "core-util-is": "1.0.2",
+        "extsprintf": "1.3.0"
+      }
+    },
+    "void-elements": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz",
+      "integrity": "sha1-wGavtYK7HLQSjWDqkjkulNXp2+w=",
+      "dev": true
+    },
+    "when": {
+      "version": "3.7.8",
+      "resolved": "https://registry.npmjs.org/when/-/when-3.7.8.tgz",
+      "integrity": "sha1-xxMLan6gRpPoQs3J56Hyqjmjn4I=",
+      "dev": true,
+      "optional": true
+    },
+    "which": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.0.9.tgz",
+      "integrity": "sha1-RgwdoPgQED0DIam2M6+eV15kSG8=",
+      "dev": true
+    },
+    "win-release": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/win-release/-/win-release-1.1.1.tgz",
+      "integrity": "sha1-X6VeAr58qTTt/BJmVjLoSbcuUgk=",
+      "dev": true,
+      "requires": {
+        "semver": "5.5.0"
+      }
+    },
+    "with-callback": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/with-callback/-/with-callback-1.0.2.tgz",
+      "integrity": "sha1-oJYpuakgAo1yFAT7Q1vc/1yRvCE=",
+      "dev": true,
+      "optional": true
+    },
+    "wordwrap": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz",
+      "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=",
+      "dev": true,
+      "optional": true
+    },
+    "wrappy": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
+      "dev": true
+    },
+    "ws": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-3.3.3.tgz",
+      "integrity": "sha512-nnWLa/NwZSt4KQJu51MYlCcSQ5g7INpOrOMt4XV8j4dqTXdmlUmSHQ8/oLC069ckre0fRsgfvsKwbTdtKLCDkA==",
+      "dev": true,
+      "requires": {
+        "async-limiter": "1.0.0",
+        "safe-buffer": "5.1.2",
+        "ultron": "1.1.1"
+      }
+    },
+    "xdg-basedir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.1.tgz",
+      "integrity": "sha1-FP+PY6T9vLBdW27qIrNvMDO58E4=",
+      "dev": true,
+      "requires": {
+        "user-home": "1.1.1"
+      }
+    },
+    "xmlhttprequest-ssl": {
+      "version": "1.5.5",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-1.5.5.tgz",
+      "integrity": "sha1-wodrBhaKrcQOV9l+gRkayPQ5iz4=",
+      "dev": true
+    },
+    "xregexp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/xregexp/-/xregexp-2.0.0.tgz",
+      "integrity": "sha1-UqY+VsoLhKfzpfPWGHLxJq16WUM=",
+      "dev": true,
+      "optional": true
+    },
+    "xtend": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz",
+      "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=",
+      "dev": true
+    },
+    "yallist": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz",
+      "integrity": "sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI=",
+      "dev": true,
+      "optional": true
+    },
+    "yauzl": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-2.4.1.tgz",
+      "integrity": "sha1-lSj0QtqxsihOWLQ3m7GU4i4MQAU=",
+      "dev": true,
+      "requires": {
+        "fd-slicer": "1.0.1"
+      }
+    },
+    "yeast": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/yeast/-/yeast-0.1.2.tgz",
+      "integrity": "sha1-AI4G2AlDIMNy28L47XagymyKxBk=",
+      "dev": true
+    }
+  }
+}
diff --git a/installer/fileserver/html/package.json b/installer/fileserver/html/package.json
new file mode 100644
index 0000000000..d2663ff510
--- /dev/null
+++ b/installer/fileserver/html/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "vic-uis-auto-installer",
+  "version": "1.0.0",
+  "description": "",
+  "main": "index.js",
+  "scripts": {
+    "test": "karma start"
+  },
+  "author": "",
+  "license": "ISC",
+  "devDependencies": {
+    "jasmine": "^3.1.0",
+    "jasmine-jquery": "^2.1.1",
+    "jasmine-spec-reporter": "^4.2.1",
+    "jquery": "^3.3.1",
+    "karma": "^2.0.2",
+    "karma-jasmine": "^1.1.2",
+    "karma-jasmine-ajax": "^0.1.13",
+    "karma-jasmine-jquery": "^0.1.1",
+    "karma-phantomjs-launcher": "^1.0.4"
+  }
+}
diff --git a/installer/fileserver/main.go b/installer/fileserver/main.go
new file mode 100644
index 0000000000..76e1114b5d
--- /dev/null
+++ b/installer/fileserver/main.go
@@ -0,0 +1,233 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package main
+
+import (
+	"context"
+	"crypto/tls"
+	"flag"
+	"fmt"
+	"net/http"
+	"os"
+	"os/signal"
+	"path/filepath"
+	"strings"
+	"syscall"
+
+	log "github.com/Sirupsen/logrus"
+
+	"github.com/vmware/vic-product/installer/fileserver/routes"
+	"github.com/vmware/vic-product/installer/fileserver/tasks"
+	"github.com/vmware/vic-product/installer/lib"
+	"github.com/vmware/vic-product/installer/pkg/ip"
+	"github.com/vmware/vic/pkg/certificate"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+type serverConfig struct {
+	addr           string
+	certPath       string
+	keyPath        string
+	cert           tls.Certificate
+	serveDir       string
+	serverHostname string
+	admiralPort    string
+	installerPort  string
+	vicTarName     string
+	logLevel       string
+}
+
+type serverRoute struct {
+	route   string
+	handler http.Handler
+}
+
+func parseServerConfig(op trace.Operation, conf *serverConfig) {
+	ud := syscall.Getuid()
+	gd := syscall.Getgid()
+	op.Info(fmt.Sprintf("Current UID/GID = %d/%d", ud, gd))
+	/* TODO FIXME
+	if ud == 0 {
+		log.Error("Error: must not run as root.")
+		os.Exit(1)
+	}
+	*/
+
+	flag.StringVar(&conf.addr, "addr", ":9443", "Listen address - must include host and port (addr:port)")
+	flag.StringVar(&conf.certPath, "cert", "", "Path to server certificate in PEM format")
+	flag.StringVar(&conf.keyPath, "key", "", "Path to server certificate key in PEM format")
+	flag.StringVar(&conf.serveDir, "dir", "/opt/vmware/fileserver", "Directory to serve and contain html data")
+	flag.StringVar(&conf.logLevel, "level", "debug", "Set's the log level to [info|debug|warning]; defaults to debug")
+	flag.Parse()
+
+	routes.SetRenderPath(conf.serveDir)
+
+	switch conf.logLevel {
+	case "warning":
+		trace.Logger.Level = log.WarnLevel
+	case "info":
+		trace.Logger.Level = log.InfoLevel
+	default:
+		trace.Logger.Level = log.DebugLevel
+	}
+
+	if (conf.certPath == "" && conf.keyPath != "") || (conf.certPath != "" && conf.keyPath == "") {
+		op.Errorf("Both certificate and key must be specified")
+	}
+
+	var err error
+	if conf.certPath != "" {
+		op.Infof("Loading certificate %s and key %s", conf.certPath, conf.keyPath)
+		conf.cert, err = tls.LoadX509KeyPair(conf.certPath, conf.keyPath)
+		if err != nil {
+			op.Fatalf("Failed to load certificate %s and key %s: %s", conf.certPath, conf.keyPath, err)
+		}
+	} else {
+		op.Info("Generating self signed certificate")
+		c, k, err := certificate.CreateSelfSigned(conf.addr, []string{"VMware, Inc."}, 2048)
+		if err != nil {
+			op.Errorf("Failed to generate a self-signed certificate: %s. Exiting.", err.Error())
+			os.Exit(1)
+		}
+		conf.cert, err = tls.X509KeyPair(c.Bytes(), k.Bytes())
+		if err != nil {
+			op.Errorf("Failed to load generated self-signed certificate: %s. Exiting.", err.Error())
+			os.Exit(1)
+		}
+	}
+	op.Infof("Loaded certificate")
+
+	ovf, err := lib.UnmarshaledOvfEnv()
+	if err != nil {
+		switch err.(type) {
+		case lib.EnvFetchError:
+			op.Fatalf("impossible to fetch ovf environment, exiting")
+			os.Exit(1)
+		case lib.UnmarshalError:
+			op.Errorf("error: %s", err.Error())
+		}
+	}
+
+	if ip, err := ip.FirstIPv4(ip.Eth0Interface); err == nil {
+		conf.serverHostname = tasks.GetHostname(ovf, ip)
+		if port, ok := ovf.Properties["management_portal.management_portal_port"]; ok {
+			conf.admiralPort = port
+		}
+	}
+
+	// get the fileserver vic tar location
+	filepath.Walk("/opt/vmware/fileserver/files/", func(path string, f os.FileInfo, err error) error {
+		if strings.HasSuffix(path, ".tar.gz") {
+			conf.vicTarName = f.Name()
+			return fmt.Errorf("stop") // returning an error stops the file walk
+		}
+		return nil // vic tar not found, continue walking
+	})
+}
+
+// cspMiddleware sets the Content-Security-Policy header to prevent clickjacking
+// https://www.owasp.org/index.php/Content_Security_Policy_Cheat_Sheet#Preventing_Clickjacking
+func cspMiddleware() func(next http.Handler) http.Handler {
+	header := "Content-Security-Policy"
+	value := "frame-ancestors 'none';"
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			w.Header().Add(header, value)
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
+func main() {
+	op := trace.NewOperation(context.Background(), "Main")
+	var c serverConfig
+	parseServerConfig(op, &c)
+
+	mux := http.NewServeMux()
+
+	// attach static asset routes
+	staticAssets := []string{"css", "js", "images", "fonts"}
+	for _, asset := range staticAssets {
+		httpPath := fmt.Sprintf("/%s/", asset)
+		dirPath := filepath.Join(c.serveDir, "/html/", asset)
+		mux.Handle(httpPath, http.StripPrefix(httpPath, http.FileServer(http.Dir(dirPath))))
+	}
+
+	indexRenderer := &routes.IndexHTMLRenderer{
+		ServerHostname: c.serverHostname,
+		ServerAddress:  c.addr,
+		AdmiralPort:    c.admiralPort,
+		VicTarName:     c.vicTarName,
+	}
+	// attach fileserver route
+	routes := []*serverRoute{
+		{"/plugin/install", http.HandlerFunc(routes.InstallPluginHandler)},
+		{"/plugin/remove", http.HandlerFunc(routes.RemovePluginHandler)},
+		{"/plugin/upgrade", http.HandlerFunc(routes.UpgradePluginHandler)},
+		{"/register", http.HandlerFunc(routes.RegisterHandler)},
+		{"/thumbprint", http.HandlerFunc(routes.ThumbprintHandler)},
+		{"/files/", http.StripPrefix("/files/", http.FileServer(http.Dir(filepath.Join(c.serveDir, "files"))))},
+		{"/", http.HandlerFunc(indexRenderer.IndexHandler)},
+	}
+
+	for _, route := range routes {
+		mux.Handle(route.route, route.handler)
+	}
+
+	// start the web server
+	fileserver := &http.Server{
+		Addr:      c.addr,
+		Handler:   cspMiddleware()(mux),
+		TLSConfig: lib.GetTLSServerConfig(c.cert),
+	}
+
+	redirectServer := &http.Server{
+		Addr: ":80",
+		Handler: http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
+			target := "https://" + req.Host + c.addr + req.URL.Path
+			http.Redirect(w, req, target, http.StatusMovedPermanently)
+		}),
+	}
+	// collect signals and errors to stop the fileserver
+	signals := make(chan os.Signal, 1)
+	errors := make(chan error, 1)
+
+	go func() {
+		// redirect port 80 to 9443 to improve ux on ova
+		op.Infof("Starting redirect server on %s", redirectServer.Addr)
+		if err := redirectServer.ListenAndServe(); err != nil {
+			errors <- err
+		}
+	}()
+	go func() {
+		op.Infof("Starting fileserver server on %s", fileserver.Addr)
+		if err := fileserver.ListenAndServeTLS("", ""); err != nil {
+			errors <- err
+		}
+	}()
+
+	signal.Notify(signals, syscall.SIGINT, syscall.SIGTERM)
+
+	select {
+	case sig := <-signals:
+		op.Fatalf("signal %s received", sig)
+	case err := <-errors:
+		op.Fatalf("error %s received", err)
+	}
+	fileserver.Close()
+	redirectServer.Close()
+	close(signals)
+	close(errors)
+}
diff --git a/installer/fileserver/register.go b/installer/fileserver/register.go
deleted file mode 100644
index d9df51f137..0000000000
--- a/installer/fileserver/register.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"time"
-
-	"github.com/vmware/vic-product/installer/tagvm"
-)
-
-type registerPayload struct {
-	Target      string `json:"target"`
-	User        string `json:"user"`
-	Password    string `json:"password"`
-	ExternalPSC string `json:"externalpsc"`
-	PSCDomain   string `json:"pscdomain"`
-}
-
-func registerHandler(resp http.ResponseWriter, req *http.Request) {
-	switch req.Method {
-	case http.MethodPost:
-
-		if req.Body == nil {
-			http.Error(resp, "Please send a request body", http.StatusBadRequest)
-			return
-		}
-
-		var r registerPayload
-		err := json.NewDecoder(req.Body).Decode(&r)
-		if err != nil {
-			http.Error(resp, err.Error(), http.StatusBadRequest)
-			return
-		}
-
-		defer req.Body.Close()
-		admin.Target = r.Target
-		admin.User = r.User
-		admin.Password = r.Password
-		cancel, err := admin.VerifyLogin()
-		defer cancel()
-		if err != nil {
-			http.Error(resp, err.Error(), http.StatusUnauthorized)
-			return
-		}
-
-		ctx := context.TODO()
-		if err := tagvm.Run(ctx, admin.Validator.Session); err != nil {
-			http.Error(resp, err.Error(), http.StatusServiceUnavailable)
-			return
-		}
-
-		pscInstance = r.ExternalPSC
-		pscDomain = r.PSCDomain
-		if err := registerWithPSC(ctx); err != nil {
-			http.Error(resp, err.Error(), http.StatusServiceUnavailable)
-			return
-		}
-
-		if err := ioutil.WriteFile(initServicesTimestamp, []byte(time.Now().String()), 0644); err != nil {
-			errMsg := fmt.Sprintf("Failed to write to timestamp file: %s", err.Error())
-			http.Error(resp, errMsg, http.StatusServiceUnavailable)
-			return
-		}
-
-		http.Error(resp, "operation complete", http.StatusOK)
-	default:
-		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
-	}
-	return
-}
diff --git a/installer/fileserver/routes/index.go b/installer/fileserver/routes/index.go
new file mode 100644
index 0000000000..1ff3112b91
--- /dev/null
+++ b/installer/fileserver/routes/index.go
@@ -0,0 +1,137 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package routes
+
+import (
+	"context"
+	"fmt"
+	"net/http"
+	"os"
+
+	"github.com/vmware/vic-product/installer/fileserver/tasks"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+// IndexHTMLOptions contains fields for html templating in index.html
+type IndexHTMLOptions struct {
+	InitErrorFeedback   string
+	InitSuccessFeedback string
+	NeedLogin           bool
+	AdmiralAddr         string
+	FileserverAddr      string
+	ValidationError     string
+}
+
+// IndexHTMLRenderer must be populated before the IndexHandler can render correctly
+type IndexHTMLRenderer struct {
+	ServerHostname string
+	ServerAddress  string
+	AdmiralPort    string
+	VicTarName     string
+}
+
+// IndexHandler is an http.Handler for rendering the fileserver Getting Started Page
+func (i *IndexHTMLRenderer) IndexHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+	op := trace.NewOperation(context.Background(), "IndexHandler")
+	if rejectRestrictedRequest(op, resp, req) {
+		return
+	}
+	html := &IndexHTMLOptions{
+		NeedLogin:           needInitializationServices(req),
+		InitErrorFeedback:   "",
+		InitSuccessFeedback: "",
+		ValidationError:     "",
+	}
+
+	if req.Method == http.MethodPost {
+		if err := indexFormHandler(op, req, html); err != nil {
+			op.Errorf("Install failed: %s", err.Error())
+			html.InitErrorFeedback = fmt.Sprintf("Installation failed: %s", err.Error())
+		} else if req.FormValue("needuiplugin") == "true" {
+			html.InitSuccessFeedback = "Installation successful. Refer to the Post-install and Deployment tasks below. All vSphere Client users must log out and log back in again twice to see the vSphere Integrated Containers plug-in."
+		} else {
+			html.InitSuccessFeedback = "Installation successful. Refer to the Post-install and Deployment tasks below."
+		}
+	}
+
+	html.AdmiralAddr = fmt.Sprintf("https://%s:%s", i.ServerHostname, i.AdmiralPort)
+	html.FileserverAddr = fmt.Sprintf("https://%s%s/files/%s", i.ServerHostname, i.ServerAddress, i.VicTarName)
+
+	RenderTemplate(op, resp, "html/index.html", html)
+}
+
+// indexFormHandler registers the appliance using post form values
+func indexFormHandler(op trace.Operation, req *http.Request, html *IndexHTMLOptions) error {
+	// verify login
+	PSCConfig := tasks.NewPSCRegistrationConfig()
+	PSCConfig.Admin.Target = req.FormValue("target")
+	PSCConfig.Admin.User = req.FormValue("user")
+	PSCConfig.Admin.Password = req.FormValue("password")
+	PSCConfig.Admin.Thumbprint = req.FormValue("thumbprint")
+	PSCConfig.PscInstance = req.FormValue("psc")
+	PSCConfig.PscDomain = req.FormValue("pscDomain")
+
+	// VerifyLogin populates Admin.Validator
+	cancel, err := PSCConfig.Admin.VerifyLogin(op)
+	defer cancel()
+	if err != nil {
+		op.Infof("Validation failed: %s", err.Error())
+		html.ValidationError = err.Error()
+		return err
+	}
+	defer PSCConfig.Admin.Session.Logout(op)
+
+	op.Infof("Validation succeeded")
+	html.NeedLogin = false
+
+	if err := PSCConfig.RegisterAppliance(op); err != nil {
+		return err
+	}
+
+	if req.FormValue("needuiplugin") == "true" {
+		h5 := tasks.NewH5UIPlugin(PSCConfig.Admin)
+		h5.Force = true
+		if err := h5.Install(op); err != nil {
+			return err
+		}
+
+		flex := tasks.NewFlexUIPlugin(PSCConfig.Admin)
+		flex.Force = true
+		if err := flex.Install(op); err != nil {
+			return err
+		}
+	}
+
+	return nil
+}
+
+func needInitializationServices(req *http.Request) bool {
+	_, err := os.Stat(tasks.InitServicesTimestamp)
+	return os.IsNotExist(err) || req.URL.Query().Get("login") == "true"
+}
+
+func rejectRestrictedRequest(op trace.Operation, resp http.ResponseWriter, req *http.Request) bool {
+	paths := map[string]struct{}{
+		"/":           {},
+		"/index.html": {},
+	}
+	if _, ok := paths[req.URL.Path]; !ok {
+		op.Errorf("Request path %s not found in %-v", req.URL.Path, paths)
+		http.NotFound(resp, req)
+		return true
+	}
+	return false
+}
diff --git a/installer/fileserver/routes/plugin.go b/installer/fileserver/routes/plugin.go
new file mode 100644
index 0000000000..bb4c24fde4
--- /dev/null
+++ b/installer/fileserver/routes/plugin.go
@@ -0,0 +1,305 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package routes
+
+import (
+	"context"
+	"encoding/json"
+	"errors"
+	"fmt"
+	"net/http"
+
+	"github.com/vmware/vic-product/installer/fileserver/tasks"
+	"github.com/vmware/vic-product/installer/lib"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+type pluginPayload struct {
+	Vc        *targetParameters    `json:"vc"`
+	Plugin    *pluginParameters    `json:"plugin"`
+	Appliance *applianceParameters `json:"appliance"`
+}
+
+type targetParameters struct {
+	Target     string `json:"target,omitempty"`
+	User       string `json:"user,omitempty"`
+	Password   string `json:"password,omitempty"`
+	Thumbprint string `json:"thumbprint,omitempty"`
+}
+
+type pluginParameters struct {
+	// If given, uses the H5 or Flex plugin presets
+	Preset string `json:"preset,omitempty"`
+
+	// Optional Parameters
+	Force    bool `json:"force,omitempty"`
+	Insecure bool `json:"insecure,omitempty"`
+
+	// Mandatory Parameters
+	Configure             bool   `json:"configure,omitempty"`
+	Company               string `json:"company,omitempty"`
+	HideInSolutionManager bool   `json:"hide,omitempty"`
+	Key                   string `json:"key,omitempty"`
+	Name                  string `json:"name,omitempty"`
+	Summary               string `json:"summary,omitempty"`
+	Version               string `json:"version,omitempty"`
+	EntityType            string `json:"entityType,omitempty"`
+}
+
+type applianceParameters struct {
+	Host             string `json:"host,omitempty"`
+	URL              string `json:"url,omitempty"`
+	ServerThumbprint string `json:"thumbprint,omitempty"`
+}
+
+type httpError struct {
+	ErrorType string `json:"type"`
+	Title     string `json:"title"`
+	code      int
+}
+
+// InstallPluginHandler unwraps a json body as a tasks.Plugin and preforms
+// the InstallPlugin task
+func InstallPluginHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+
+	switch req.Method {
+	case http.MethodPost:
+		op := trace.NewOperation(context.Background(), "InstallPluginHandler")
+		if req.Body == nil {
+			(&httpError{
+				Title: "Request body not found.",
+				code:  http.StatusBadRequest,
+			}).Error(op, resp)
+			return
+		}
+
+		plugin, err := decodePluginPayload(op, req)
+		if err != nil {
+			op.Errorf("Could not decode plugin payload: %s", err.Error())
+			(&httpError{
+				Title: "Could not decode body.",
+				code:  http.StatusUnprocessableEntity,
+			}).Error(op, resp)
+			return
+		}
+
+		cancel, err := plugin.Target.VerifyLogin(op)
+		defer cancel()
+		if err != nil {
+			op.Errorf("Could not login to vc: %s", err.Error())
+			(&httpError{
+				Title: "Error authenticating with vc.",
+				code:  http.StatusUnauthorized,
+			}).Error(op, resp)
+			return
+		}
+		defer plugin.Target.Session.Logout(op)
+
+		if err := plugin.Install(op); err != nil {
+			op.Errorf("Could not install plugin: %s", err.Error())
+			(&httpError{
+				Title: "Error installing plugin.",
+				code:  http.StatusInternalServerError,
+			}).Error(op, resp)
+			return
+		}
+
+		resp.WriteHeader(http.StatusNoContent)
+	default:
+		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
+	}
+}
+
+// RemovePluginHandler unwraps a json body as a tasks.Plugin and preforms
+// the RemovePlugin task
+func RemovePluginHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+
+	switch req.Method {
+	case http.MethodPost:
+		op := trace.NewOperation(context.Background(), "RemovePluginHandler")
+		if req.Body == nil {
+			(&httpError{
+				Title: "Request body not found.",
+				code:  http.StatusBadRequest,
+			}).Error(op, resp)
+			return
+		}
+
+		plugin, err := decodePluginPayload(op, req)
+		if err != nil {
+			op.Errorf("Could not decode plugin payload: %s", err.Error())
+			(&httpError{
+				Title: "Could not decode body.",
+				code:  http.StatusUnprocessableEntity,
+			}).Error(op, resp)
+			return
+		}
+
+		cancel, err := plugin.Target.VerifyLogin(op)
+		defer cancel()
+		if err != nil {
+			op.Errorf("Could not login to vc: %s", err.Error())
+			(&httpError{
+				Title: "Error authenticating with vc.",
+				code:  http.StatusUnauthorized,
+			}).Error(op, resp)
+			return
+		}
+		defer plugin.Target.Session.Logout(op)
+
+		if err := plugin.Remove(op); err != nil {
+			op.Errorf("Could not remove plugin: %s", err.Error())
+			(&httpError{
+				Title: "Error removing plugin.",
+				code:  http.StatusInternalServerError,
+			}).Error(op, resp)
+			return
+		}
+
+		resp.WriteHeader(http.StatusNoContent)
+	default:
+		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
+	}
+}
+
+// UpgradePluginHandler unwraps a json body as a tasks.Plugin and preforms
+// the force InstallPlugin task
+func UpgradePluginHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+
+	switch req.Method {
+	case http.MethodPost:
+		op := trace.NewOperation(context.Background(), "UpgradePluginHandler")
+		if req.Body == nil {
+			(&httpError{
+				Title: "Request body not found.",
+				code:  http.StatusBadRequest,
+			}).Error(op, resp)
+			return
+		}
+
+		plugin, err := decodePluginPayload(op, req)
+		if err != nil {
+			op.Errorf("Could not decode plugin payload: %s", err.Error())
+			(&httpError{
+				Title: "Could not decode body.",
+				code:  http.StatusUnprocessableEntity,
+			}).Error(op, resp)
+			return
+		}
+
+		cancel, err := plugin.Target.VerifyLogin(op)
+		defer cancel()
+		if err != nil {
+			op.Errorf("Could not login to vc: %s", err.Error())
+			(&httpError{
+				Title: "Error authenticating with vc.",
+				code:  http.StatusUnauthorized,
+			}).Error(op, resp)
+			return
+		}
+		defer plugin.Target.Session.Logout(op)
+
+		plugin.Force = true
+
+		if err := plugin.Install(op); err != nil {
+			op.Errorf("Could not upgrade plugin: %s", err.Error())
+			(&httpError{
+				Title: "Error upgrading plugin.",
+				code:  http.StatusInternalServerError,
+			}).Error(op, resp)
+			return
+		}
+
+		resp.WriteHeader(http.StatusNoContent)
+	default:
+		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
+	}
+}
+
+func decodePluginPayload(op trace.Operation, req *http.Request) (*tasks.Plugin, error) {
+	defer trace.End(trace.Begin(""))
+
+	var p pluginPayload
+	err := json.NewDecoder(req.Body).Decode(&p)
+	if err != nil {
+		return nil, err
+	}
+	defer req.Body.Close()
+
+	if p.Vc == nil {
+		return nil, errors.New("Please supply a vCenter target object")
+	}
+
+	if p.Plugin == nil {
+		return nil, errors.New("Please supply a Plugin object")
+	}
+
+	if p.Appliance == nil {
+		p.Appliance = &applianceParameters{}
+	}
+
+	loginInfo := &lib.LoginInfo{
+		Target:     p.Vc.Target,
+		User:       p.Vc.User,
+		Password:   p.Vc.Password,
+		Thumbprint: p.Vc.Thumbprint,
+	}
+
+	var plugin *tasks.Plugin
+	switch p.Plugin.Preset {
+	case "H5":
+		plugin = tasks.NewH5UIPlugin(loginInfo)
+	case "FLEX":
+		plugin = tasks.NewFlexUIPlugin(loginInfo)
+	default:
+		plugin = tasks.NewUIPlugin(loginInfo)
+		plugin.Configure = p.Plugin.Configure
+		plugin.Company = p.Plugin.Company
+		plugin.HideInSolutionManager = p.Plugin.HideInSolutionManager
+		plugin.Key = p.Plugin.Key
+		plugin.Name = p.Plugin.Name
+		plugin.Summary = p.Plugin.Summary
+		plugin.Version = p.Plugin.Version
+		plugin.EntityType = p.Plugin.EntityType
+	}
+
+	plugin.Force = p.Plugin.Force
+	plugin.Insecure = p.Plugin.Insecure
+
+	plugin.ApplianceHost = p.Appliance.Host
+	plugin.ApplianceServerThumbprint = p.Appliance.ServerThumbprint
+	plugin.ApplianceURL = p.Appliance.URL
+
+	op.Debugf("Decoded plugin: %#v", plugin)
+	return plugin, nil
+}
+
+func (e *httpError) Error(op trace.Operation, resp http.ResponseWriter) {
+	if e.code == 0 {
+		e.code = http.StatusBadRequest
+	}
+	if e.ErrorType == "" {
+		e.ErrorType = "about:blank"
+	}
+	resp.WriteHeader(e.code)
+	err := json.NewEncoder(resp).Encode(e)
+	if err != nil {
+		op.Errorf("Cannot send http error response: %s", err)
+		fmt.Fprintln(resp, "Error serving json.")
+	}
+}
diff --git a/installer/fileserver/routes/register.go b/installer/fileserver/routes/register.go
new file mode 100644
index 0000000000..a359e6dbec
--- /dev/null
+++ b/installer/fileserver/routes/register.go
@@ -0,0 +1,84 @@
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package routes
+
+import (
+	"context"
+	"encoding/json"
+	"fmt"
+	"net/http"
+
+	"github.com/vmware/vic-product/installer/fileserver/tasks"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+type registerPayload struct {
+	Target      string `json:"target"`
+	User        string `json:"user"`
+	Password    string `json:"password"`
+	Thumbprint  string `json:"thumbprint,omitempty"`
+	ExternalPSC string `json:"externalpsc"`
+	PSCDomain   string `json:"pscdomain"`
+}
+
+// RegisterHandler unwraps a json body as a PSCRegistrationConfig and preforms
+// the RegisterWithPSC task
+func RegisterHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+
+	switch req.Method {
+	case http.MethodPost:
+		op := trace.NewOperation(context.Background(), "RegisterHandler")
+		if req.Body == nil {
+			http.Error(resp, "Please send a request body", http.StatusBadRequest)
+			return
+		}
+
+		var r registerPayload
+		err := json.NewDecoder(req.Body).Decode(&r)
+		if err != nil {
+			http.Error(resp, err.Error(), http.StatusBadRequest)
+			return
+		}
+		defer req.Body.Close()
+
+		PSCConfig := tasks.NewPSCRegistrationConfig()
+		PSCConfig.Admin.Target = r.Target
+		PSCConfig.Admin.User = r.User
+		PSCConfig.Admin.Password = r.Password
+		PSCConfig.Admin.Thumbprint = r.Thumbprint
+		cancel, err := PSCConfig.Admin.VerifyLogin(op)
+		defer cancel()
+		if err != nil {
+			op.Infof("Validation failed")
+			http.Error(resp, err.Error(), http.StatusUnauthorized)
+			return
+		}
+		defer PSCConfig.Admin.Session.Logout(op)
+
+		op.Infof("Validation succeeded")
+		if err := PSCConfig.RegisterAppliance(op); err != nil {
+			errMsg := fmt.Sprintf("Failed to write to register appliance: %s", err.Error())
+			http.Error(resp, errMsg, http.StatusInternalServerError)
+			return
+		}
+
+		resp.WriteHeader(http.StatusOK)
+		resp.Write([]byte("operation complete"))
+	default:
+		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
+	}
+	return
+}
diff --git a/installer/fileserver/routes/renderer.go b/installer/fileserver/routes/renderer.go
new file mode 100644
index 0000000000..94bd8e18b8
--- /dev/null
+++ b/installer/fileserver/routes/renderer.go
@@ -0,0 +1,58 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package routes
+
+import (
+	"fmt"
+	"html/template"
+	"net/http"
+
+	"github.com/vmware/vic/pkg/trace"
+)
+
+var (
+	// Share the renderer between the whole package. Set the rootPath before use if needed.
+	renderer *templateRenderer
+)
+
+type templateRenderer struct {
+	rootPath string
+}
+
+func init() {
+	renderer = &templateRenderer{}
+}
+
+// SetRenderPath sets the render path of the global renderer var
+func SetRenderPath(path string) {
+	renderer.rootPath = path
+}
+
+// RenderTemplate writes a golang html template to an http response
+func RenderTemplate(op trace.Operation, resp http.ResponseWriter, filename string, data interface{}) {
+	defer trace.End(trace.Begin(""))
+
+	op.Infof("render: %s", filename)
+	filename = fmt.Sprintf("%s/%s", renderer.rootPath, filename)
+	tmpl, err := template.ParseFiles(filename)
+	if err != nil {
+		http.Error(resp, err.Error(), http.StatusInternalServerError)
+		return
+	}
+	if err := tmpl.Execute(resp, data); err != nil {
+		http.Error(resp, err.Error(), http.StatusInternalServerError)
+		return
+	}
+}
diff --git a/installer/fileserver/routes/thumbprint.go b/installer/fileserver/routes/thumbprint.go
new file mode 100644
index 0000000000..2cff89fd95
--- /dev/null
+++ b/installer/fileserver/routes/thumbprint.go
@@ -0,0 +1,60 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package routes
+
+import (
+	"context"
+	"crypto/tls"
+	"net/http"
+	"net/url"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+const (
+	targetKey = "target"
+)
+
+// ThumbprintHandler returns the thumbprint of the ip/fqdn given by the get parameter targetKey
+func ThumbprintHandler(resp http.ResponseWriter, req *http.Request) {
+	defer trace.End(trace.Begin(""))
+
+	switch req.Method {
+	case http.MethodPost:
+		op := trace.NewOperation(context.Background(), "ThumbprintHandler")
+		target := req.FormValue(targetKey)
+		if target == "" {
+			op.Infof("Target not supplied")
+			http.Error(resp, "Please supply a target", http.StatusUnprocessableEntity)
+			return
+		}
+
+		// see https://github.com/vmware/govmomi/blob/master/govc/flags/host_connect.go#L70-L85
+		var cert object.HostCertificateInfo
+		if err := cert.FromURL(&url.URL{Host: target}, &tls.Config{}); err != nil {
+			op.Errorf("Error getting thumbprint for %s: %s", target, err.Error())
+			http.Error(resp, "Error getting thumbprint", http.StatusInternalServerError)
+			return
+		}
+
+		op.Infof("Thumbprint found")
+		resp.WriteHeader(http.StatusOK)
+		resp.Write([]byte(cert.ThumbprintSHA1))
+	default:
+		http.Error(resp, "only accepts POST", http.StatusMethodNotAllowed)
+	}
+	return
+}
diff --git a/installer/fileserver/server.go b/installer/fileserver/server.go
deleted file mode 100644
index 3c965441a2..0000000000
--- a/installer/fileserver/server.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"html/template"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic-product/installer/lib"
-	"github.com/vmware/vic-product/installer/pkg/ip"
-	"github.com/vmware/vic-product/installer/tagvm"
-	"github.com/vmware/vic/pkg/certificate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type config struct {
-	addr           string
-	certPath       string
-	keyPath        string
-	cert           tls.Certificate
-	serveDir       string
-	serverHostname string
-	admiralPort    string
-	installerPort  string
-	vicTarName     string
-	logLevel       string
-}
-
-// IndexHTMLOptions contains fields for html templating in index.html
-type IndexHTMLOptions struct {
-	InitErrorFeedback   string
-	InitSuccessFeedback string
-	NeedLogin           bool
-	AdmiralAddr         string
-	DemoVCHAddr         string
-	FileserverAddr      string
-	ValidationError     string
-}
-
-var (
-	admin = &lib.LoginInfo{}
-	c     config
-
-	// pscInstance holds the form input for the PSC field
-	pscInstance string
-
-	// pscDomain holds the form input for the PSC Admin Domain field
-	pscDomain string
-)
-
-const initServicesTimestamp = "./registration-timestamps.txt"
-
-func Init(conf *config) {
-	ud := syscall.Getuid()
-	gd := syscall.Getgid()
-	log.Info(fmt.Sprintf("Current UID/GID = %d/%d", ud, gd))
-	/* TODO FIXME
-	if ud == 0 {
-		log.Error("Error: must not run as root.")
-		os.Exit(1)
-	}
-	*/
-
-	flag.StringVar(&conf.addr, "addr", ":9443", "Listen address - must include host and port (addr:port)")
-	flag.StringVar(&conf.certPath, "cert", "", "Path to server certificate in PEM format")
-	flag.StringVar(&conf.keyPath, "key", "", "Path to server certificate key in PEM format")
-	flag.StringVar(&conf.serveDir, "dir", "/opt/vmware/fileserver", "Directory to serve and contain html data")
-	flag.StringVar(&conf.logLevel, "level", "debug", "Set's the log level to [info|debug|warning]; defaults to debug")
-
-	flag.Parse()
-
-	switch conf.logLevel {
-	case "warning":
-		log.SetLevel(log.WarnLevel)
-	case "info":
-		log.SetLevel(log.InfoLevel)
-	default:
-		log.SetLevel(log.DebugLevel)
-	}
-
-	if (conf.certPath == "" && conf.keyPath != "") || (conf.certPath != "" && conf.keyPath == "") {
-		log.Errorf("Both certificate and key must be specified")
-	}
-
-	var err error
-	if conf.certPath != "" {
-		log.Infof("Loading certificate %s and key %s", conf.certPath, conf.keyPath)
-		conf.cert, err = tls.LoadX509KeyPair(conf.certPath, conf.keyPath)
-		if err != nil {
-			log.Fatalf("Failed to load certificate %s and key %s: %s", conf.certPath, conf.keyPath, err)
-		}
-	} else {
-		log.Info("Generating self signed certificate")
-		c, k, err := certificate.CreateSelfSigned(conf.addr, []string{"VMware, Inc."}, 2048)
-		if err != nil {
-			log.Errorf("Failed to generate a self-signed certificate: %s. Exiting.", err.Error())
-			os.Exit(1)
-		}
-		conf.cert, err = tls.X509KeyPair(c.Bytes(), k.Bytes())
-		if err != nil {
-			log.Errorf("Failed to load generated self-signed certificate: %s. Exiting.", err.Error())
-			os.Exit(1)
-		}
-	}
-	log.Infof("Loaded certificate")
-
-	ovf, err := lib.UnmarshaledOvfEnv()
-	if err != nil {
-		switch err.(type) {
-		case lib.EnvFetchError:
-			log.Fatalf("impossible to fetch ovf environment, exiting")
-			os.Exit(1)
-		case lib.UnmarshalError:
-			log.Errorf("error: %s", err.Error())
-		}
-	}
-
-	if ip, err := ip.FirstIPv4(ip.Eth0Interface); err == nil {
-		conf.serverHostname = getHostname(ovf, ip)
-		if port, ok := ovf.Properties["management_portal.management_portal_port"]; ok {
-			conf.admiralPort = port
-		}
-	}
-
-	// get the fileserver vic tar location
-	filepath.Walk("/opt/vmware/fileserver/files/", func(path string, f os.FileInfo, err error) error {
-		if strings.HasSuffix(path, ".tar.gz") {
-			c.vicTarName = f.Name()
-			return fmt.Errorf("stop") // returning an error stops the file walk
-		}
-		return nil // vic tar not found, continue walking
-	})
-}
-
-// cspMiddleware sets the Content-Security-Policy header to prevent clickjacking
-// https://www.owasp.org/index.php/Content_Security_Policy_Cheat_Sheet#Preventing_Clickjacking
-func cspMiddleware() func(next http.Handler) http.Handler {
-	header := "Content-Security-Policy"
-	value := "frame-ancestors 'none';"
-	return func(next http.Handler) http.Handler {
-		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Add(header, value)
-			next.ServeHTTP(w, r)
-		})
-	}
-}
-
-func main() {
-
-	Init(&c)
-
-	mux := http.NewServeMux()
-
-	// attach static asset routes
-	routes := []string{"css", "js", "images", "fonts"}
-	for _, route := range routes {
-		httpPath := fmt.Sprintf("/%s/", route)
-		dirPath := filepath.Join(c.serveDir, "/html/", route)
-		mux.Handle(httpPath, http.StripPrefix(httpPath, http.FileServer(http.Dir(dirPath))))
-	}
-
-	// attach fileserver route
-	dirPath := filepath.Join(c.serveDir, "files")
-	mux.Handle("/files/", http.StripPrefix("/files/", http.FileServer(http.Dir(dirPath))))
-
-	// attach register route, for registration automation
-	mux.Handle("/register", http.HandlerFunc(registerHandler))
-
-	// attach root index route
-	mux.Handle("/", http.HandlerFunc(indexHandler))
-
-	// start the web server
-	s := lib.GetTLSServer(c.addr, cspMiddleware()(mux), c.cert)
-
-	log.Infof("Starting fileserver server on %s", s.Addr)
-	// redirect port 80 to 9443 to improve ux on ova
-	go http.ListenAndServe(":80", http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		target := "https://" + req.Host + c.addr + req.URL.Path
-		http.Redirect(w, req, target, http.StatusMovedPermanently)
-	}))
-	log.Fatal(s.ListenAndServeTLS("", ""))
-}
-
-func indexHandler(resp http.ResponseWriter, req *http.Request) {
-	defer trace.End(trace.Begin(""))
-
-	html := &IndexHTMLOptions{
-		NeedLogin:           needInitializationServices(req),
-		InitErrorFeedback:   "",
-		InitSuccessFeedback: "",
-		ValidationError:     "",
-	}
-
-	if req.Method == http.MethodPost {
-		// verify login
-		admin.Target = req.FormValue("target")
-		admin.User = req.FormValue("user")
-		admin.Password = req.FormValue("password")
-		pscInstance = req.FormValue("psc")
-		pscDomain = req.FormValue("pscDomain")
-		cancel, err := admin.VerifyLogin()
-		defer cancel()
-		if err != nil {
-			log.Infof("Validation failed: %s", err.Error())
-			html.ValidationError = err.Error()
-		} else {
-			log.Infof("Validation succeeded")
-			html.InitErrorFeedback = startInitializationServices()
-			// Display success message upon init success.
-			if html.InitErrorFeedback == "" {
-				html.InitSuccessFeedback = "Installation successful. Refer to the Post-install and Deployment tasks below."
-			}
-
-			html.NeedLogin = false
-		}
-	}
-
-	html.AdmiralAddr = fmt.Sprintf("https://%s:%s", c.serverHostname, c.admiralPort)
-	html.DemoVCHAddr = fmt.Sprintf("https://%s:%s", c.serverHostname, c.installerPort)
-	html.FileserverAddr = fmt.Sprintf("https://%s%s/files/%s", c.serverHostname, c.addr, c.vicTarName)
-
-	renderTemplate(resp, "html/index.html", html)
-}
-
-func renderTemplate(resp http.ResponseWriter, filename string, data interface{}) {
-	defer trace.End(trace.Begin(""))
-
-	log.Infof("render: %s", filename)
-	filename = fmt.Sprintf("%s/%s", c.serveDir, filename)
-	log.Infof("render: %s", filename)
-	tmpl, err := template.ParseFiles(filename)
-	if err != nil {
-		http.Error(resp, err.Error(), http.StatusInternalServerError)
-	}
-	if err := tmpl.Execute(resp, data); err != nil {
-		http.Error(resp, err.Error(), http.StatusInternalServerError)
-	}
-}
-
-// startInitializationServices performs some OVA init tasks - tagging the OVA VM
-// registering Admiral with PSC. Errors, if any, are concatenated and returned.
-func startInitializationServices() string {
-	var errorMsg []string
-
-	ctx := context.TODO()
-	if err := tagvm.Run(ctx, admin.Validator.Session); err != nil {
-		log.Debug(errors.ErrorStack(err))
-		errorMsg = append(errorMsg, "Failed to locate VIC Appliance. Please check the vCenter Server provided and try again")
-	}
-
-	if err := registerWithPSC(ctx); err != nil {
-		log.Debug(errors.ErrorStack(err))
-		errorMsg = append(errorMsg, "Failed to register with PSC. Please check the PSC settings provided and try again")
-	}
-
-	if len(errorMsg) == 0 {
-		err := ioutil.WriteFile(initServicesTimestamp, []byte(time.Now().String()), 0644)
-		if err != nil {
-			log.Debug(errors.ErrorStack(err))
-			errorMsg = append(errorMsg, "Failed to write to timestamp file: %s", err.Error())
-		}
-	}
-	return strings.Join(errorMsg, "<br />")
-}
-
-func needInitializationServices(req *http.Request) bool {
-	_, err := os.Stat(initServicesTimestamp)
-	return os.IsNotExist(err) || req.URL.Query().Get("login") == "true"
-}
diff --git a/installer/fileserver/tasks.go b/installer/fileserver/tasks.go
deleted file mode 100644
index 3a2a715a27..0000000000
--- a/installer/fileserver/tasks.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"os/exec"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic-product/installer/lib"
-	"github.com/vmware/vic-product/installer/pkg/ip"
-	"github.com/vmware/vic/pkg/vsphere/optmanager"
-)
-
-const (
-	pscBinaryPath    = "/etc/vmware/admiral/admiral-auth-psc-1.3.2-SNAPSHOT-command.jar"
-	vcHostnameOption = "config.vpxd.hostnameUrl"
-	pscConfDir       = "/etc/vmware/psc"
-	pscConfFileName  = "psc-config.properties"
-)
-
-// registerWithPSC runs the PSC register command to register VIC services with
-// the platforms services controller. The command generates config files and
-// keystore files to use while getting and renewing tokens.
-func registerWithPSC(ctx context.Context) error {
-	var err error
-
-	// Obtain the admin user's domain
-	domain := "vsphere.local"
-	userFields := strings.SplitN(admin.User, "@", 2)
-	if len(userFields) == 2 {
-		domain = userFields[1]
-	}
-
-	if pscInstance == "" {
-		// Obtain the hostname of the vCenter host to use as PSC instance
-		pscInstance, err = optmanager.QueryOptionValue(ctx, admin.Validator.Session, vcHostnameOption)
-		if err != nil {
-			return err
-		}
-	}
-	if pscDomain != "" {
-		log.Infof("User domain: %s PSC domain: %s. Using %s", domain, pscDomain, pscDomain)
-		domain = pscDomain
-	}
-	log.Infof("vCenter user: %s", admin.User)
-	log.Infof("PSC instance: %s", pscInstance)
-	log.Infof("PSC domain: %s", domain)
-
-	// Obtain the OVA VM's IP
-	vmIP, err := ip.FirstIPv4(ip.Eth0Interface)
-	if err != nil {
-		return err
-	}
-
-	// Fetch the OVF env to get the Admiral port
-	ovf, err := lib.UnmarshaledOvfEnv()
-	if err != nil {
-		return err
-	}
-	admiralPort := ovf.Properties["management_portal.management_portal_port"]
-
-	// Out of the box users
-	defCreateUsers, foundCreateUsers := ovf.Properties["default_users.create_def_users"]
-	defPrefix, foundPrefix := ovf.Properties["default_users.def_user_prefix"]
-	defPassword, foundPassword := ovf.Properties["default_users.def_user_password"]
-
-	log.Infof("PSC Out of the box users. CreateUsers: %s, FoundCreateUsers: %v, Prefix: %s",
-		defCreateUsers, foundCreateUsers, defPrefix)
-
-	// Register all VIC components with PSC
-	cmdName := "/usr/bin/java"
-	for _, client := range []string{"harbor", "engine", "admiral"} {
-
-		cmdArgs := []string{
-			"-jar",
-			pscBinaryPath,
-			"--command=register",
-			"--clientName=" + client,
-			// NOTE(anchal): version set to 6.0 to use SAML for both versions 6.0 and 6.5
-			"--version=6.0",
-			"--tenant=" + domain,
-			"--domainController=" + pscInstance,
-			"--username=" + admin.User,
-			"--password=" + admin.Password,
-			"--admiralUrl=" + fmt.Sprintf("https://%s:%s", getHostname(ovf, vmIP), admiralPort),
-			"--configDir=" + pscConfDir,
-		}
-
-		if client == "admiral" && foundCreateUsers && strings.ToLower(defCreateUsers) == "true" {
-			if foundPrefix && defPrefix != "" {
-				arg := "--defaultUserPrefix=" + defPrefix
-				cmdArgs = append(cmdArgs, arg)
-			}
-
-			if foundPassword && defPrefix != "" && defPassword != "" {
-				arg := "--defaultUserPassword=" + defPassword
-				cmdArgs = append(cmdArgs, arg)
-			}
-		}
-
-		// #nosec: Subprocess launching with variable.
-		// This runs the PSC tool's register command.
-		cmd := exec.Command(cmdName, cmdArgs...)
-		if output, err := cmd.CombinedOutput(); err != nil {
-			log.Infof("Error running PSC register command for %s: %s", client, string(output))
-			return err
-		}
-		log.Infof("Successfully registered %s with PSC", client)
-	}
-
-	return nil
-}
-
-func getHostname(ovf lib.Environment, vmIP net.IP) string {
-
-	// Until we gix transient hostnames, use the static hostname reported by hostnamectl.
-	// os.Hostname() returns the kernel hostname, with no regard to transient or static classifications.
-	// fqdn, err := os.Hostname()
-	// var url string
-	// if err == nil && fqdn != "" {
-	// 	return fqdn
-	// } else {
-	// 	return vmIP.String()
-	// }
-
-	command := "hostnamectl status --static"
-	// #nosec: Subprocess launching with variable.
-	out, err := exec.Command("/bin/bash", "-c", command).Output()
-	if err != nil {
-		log.Errorf(err.Error())
-		return vmIP.String()
-	}
-	outString := strings.TrimSpace(string(out))
-	if outString == "" {
-		return vmIP.String()
-	}
-	return outString
-}
diff --git a/installer/fileserver/tasks/ova/configure.go b/installer/fileserver/tasks/ova/configure.go
new file mode 100644
index 0000000000..fc98900d70
--- /dev/null
+++ b/installer/fileserver/tasks/ova/configure.go
@@ -0,0 +1,135 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ova
+
+import (
+	"context"
+	"net"
+	"net/url"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/session"
+	"github.com/vmware/vic/pkg/vsphere/tasks"
+	"github.com/vmware/vic/pkg/vsphere/vm"
+)
+
+const (
+	// ManagedByKey defines the extension key to use in the ManagedByInfo of the OVA
+	ManagedByKey = "com.vmware.vic"
+	// ManagedByType defines the type to use in the ManagedByInfo of the OVA
+	ManagedByType = "VicApplianceVM"
+)
+
+// ConfigureManagedByInfo sets the ManagedBy field for the VM specified by ovaURL
+func ConfigureManagedByInfo(op trace.Operation, sess *session.Session, ovaURL string) error {
+	op.Infof("Attempting to create the appliance vm ref")
+	v, err := getOvaVM(op, sess, ovaURL)
+	if err != nil {
+		return err
+	}
+
+	op.Infof("Attempting to configure ManagedByInfo")
+	err = configureManagedByInfo(op, sess, v)
+	if err != nil {
+		return err
+	}
+
+	op.Infof("Successfully configured ManagedByInfo")
+	return nil
+}
+
+func configureManagedByInfo(op trace.Operation, sess *session.Session, v *vm.VirtualMachine) error {
+	spec := types.VirtualMachineConfigSpec{
+		ManagedBy: &types.ManagedByInfo{
+			ExtensionKey: ManagedByKey,
+			Type:         ManagedByType,
+		},
+	}
+
+	info, err := v.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
+		return v.Reconfigure(ctx, spec)
+	})
+
+	if err != nil {
+		op.Errorf("Error while setting ManagedByInfo: %s", err)
+		return err
+	}
+
+	if info.State != types.TaskInfoStateSuccess {
+		op.Errorf("Setting ManagedByInfo reported: %s", info.Error.LocalizedMessage)
+		return err
+	}
+
+	return nil
+}
+
+func getOvaVM(op trace.Operation, sess *session.Session, u string) (*vm.VirtualMachine, error) {
+	ovaURL, err := url.Parse(u)
+	if err != nil {
+		return nil, err
+	}
+
+	host := ovaURL.Hostname()
+
+	op.Debugf("Looking up host %s", host)
+	ips, err := net.LookupIP(host)
+	if err != nil {
+		return nil, errors.Errorf("IP lookup failed: %s", err)
+	}
+
+	op.Debugf("found %d IP(s) from hostname lookup on %s:", len(ips), host)
+	var ip string
+	for _, i := range ips {
+		op.Debugf(i.String())
+		if i.To4() != nil {
+			ip = i.String()
+		}
+	}
+
+	if ip == "" {
+		return nil, errors.Errorf("IPV6 support not yet implemented")
+	}
+
+	// Create a vm reference using the appliance ip
+	ref, err := object.NewSearchIndex(sess.Vim25()).FindByIp(op, nil, ip, true)
+	if err != nil {
+		return nil, errors.Errorf("failed to search for vms: %s", err.Error())
+	}
+
+	v, ok := ref.(*object.VirtualMachine)
+	if !ok {
+		return nil, errors.Errorf("failed to find vm with ip: %s", ip)
+	}
+
+	op.Debugf("Checking IP for %s", v.Reference().Value)
+	vmIP, err := v.WaitForIP(op)
+	if err != nil {
+		return nil, errors.Errorf("Cannot get appliance vm ip: %s", err.Error())
+	}
+
+	// verify the tagged vm has the IP we expect
+	if vmIP != ip {
+		return nil, errors.Errorf("vm ip %s does not match guest.ip %s", vmIP, ip)
+	}
+
+	op.Debugf("Found OVA with matching IP: %s", ip)
+	return &vm.VirtualMachine{
+		VirtualMachine: v,
+		Session:        sess,
+	}, nil
+}
diff --git a/installer/fileserver/tasks/ova/configure_test.go b/installer/fileserver/tasks/ova/configure_test.go
new file mode 100644
index 0000000000..cd5a56f0ce
--- /dev/null
+++ b/installer/fileserver/tasks/ova/configure_test.go
@@ -0,0 +1,105 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package ova
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"net/url"
+	"os"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/session"
+)
+
+func TestGetOvaVMWithBadURL(t *testing.T) {
+	bogusURL := "foo/bar.url://what-is-this"
+	op := trace.NewOperation(context.Background(), "TestGetOvaVMWithBadURL")
+	vm, err := getOvaVM(op, nil, bogusURL)
+	assert.Nil(t, vm)
+	assert.Error(t, err)
+}
+
+func TestGetOvaVM(t *testing.T) {
+	username := os.Getenv("TEST_VC_USERNAME")
+	password := os.Getenv("TEST_VC_PASSWORD")
+	vcURL := os.Getenv("TEST_VC_URL")
+	ovaURL := os.Getenv("TEST_OVA_URL")
+	op := trace.NewOperation(context.Background(), "TestGetOvaVM")
+
+	if vcURL == "" || ovaURL == "" {
+		op.Infof("Skipping TestGetOvaVM")
+		t.Skipf("This test should only run against a VC with a deployed OVA")
+	}
+
+	vc, err := url.Parse(vcURL)
+	if err != nil {
+		fmt.Printf("Failed to parse VC url: %s", err)
+		t.FailNow()
+	}
+
+	vc.User = url.UserPassword(username, password)
+
+	var cert object.HostCertificateInfo
+	if err = cert.FromURL(vc, new(tls.Config)); err != nil {
+		op.Error(err)
+		t.FailNow()
+	}
+
+	if cert.Err != nil {
+		op.Errorf("Failed to verify certificate for target=%s (thumbprint=%s)", vc.Host, cert.ThumbprintSHA1)
+		op.Error(cert.Err.Error())
+	}
+
+	tp := cert.ThumbprintSHA1
+	op.Infof("Accepting host %q thumbprint %s", vc.Host, tp)
+
+	sessionConfig := &session.Config{
+		Thumbprint:     tp,
+		Service:        vc.String(),
+		DatacenterPath: "/ha-datacenter",
+		DatastorePath:  "datastore1",
+		User:           vc.User,
+		Insecure:       true,
+	}
+
+	s := session.NewSession(sessionConfig)
+	sess, err := s.Connect(op)
+	if err != nil {
+		op.Errorf("Error connecting: %s", err.Error())
+	}
+	defer sess.Logout(op)
+
+	sess, err = sess.Populate(op)
+	if err != nil {
+		op.Errorf("Error populating: %s", err.Error())
+	}
+
+	vm, err := getOvaVM(op, sess, ovaURL)
+	if err != nil {
+		op.Errorf("Error getting OVA: %s", err.Error())
+	}
+	if vm == nil {
+		op.Errorf("No VM found")
+		t.FailNow()
+	}
+
+	op.Infof("%s", vm.String())
+}
diff --git a/installer/fileserver/tasks/plugin.go b/installer/fileserver/tasks/plugin.go
new file mode 100644
index 0000000000..0811561f31
--- /dev/null
+++ b/installer/fileserver/tasks/plugin.go
@@ -0,0 +1,447 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tasks
+
+import (
+	"context"
+	"crypto/tls"
+	"fmt"
+	"net/url"
+	"os"
+	"path/filepath"
+	"regexp"
+	"strings"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic-product/installer/fileserver/tasks/ova"
+	"github.com/vmware/vic-product/installer/fileserver/tasks/plugin"
+	"github.com/vmware/vic-product/installer/lib"
+	"github.com/vmware/vic-product/installer/pkg/ip"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+const (
+	h5ClientPluginName      = "vSphere Integrated Containers-H5Client"
+	h5ClientPluginSummary   = "Plugin for vSphere Integrated Containers-H5Client"
+	h5ClientPluginKey       = "com.vmware.vic"
+	flexClientPluginName    = "vSphere Integrated Containers-FlexClient"
+	flexClientPluginSummary = "Plugin for vSphere Integrated Containers-FlexClient"
+	flexClientPluginKey     = "com.vmware.vic.ui"
+	pluginCompany           = "VMware"
+	pluginEntityType        = "VicApplianceVM"
+	fileserverPluginsPath   = "/opt/vmware/fileserver/files/"
+)
+
+var (
+	pluginVersion string
+)
+
+func init() {
+	op := trace.NewOperation(context.Background(), "Init")
+	// Match the com.vmware.vic-vX.X.X.X.zip file
+	re := regexp.MustCompile(`com\.vmware\.vic-v(\d+\.\d+\.\d+\.\d+)\.zip`)
+	filepath.Walk(fileserverPluginsPath, func(path string, f os.FileInfo, err error) error {
+		// First match from FindStringSubmatch is always the full match
+		if f == nil || f.IsDir() {
+			return nil
+		}
+		match := re.FindStringSubmatch(f.Name())
+		if len(match) > 1 {
+			pluginVersion = match[1]
+			op.Debugf("found plugin '%s' with version '%s'", f.Name(), match[1])
+			return fmt.Errorf("stop") // returning an error stops the file walk
+		}
+		return nil
+	})
+}
+
+// Plugin has all input parameters for vic-ui ui command
+type Plugin struct {
+	Target *lib.LoginInfo
+
+	Force    bool
+	Insecure bool
+
+	Company               string
+	HideInSolutionManager bool
+	Configure             bool
+	Key                   string
+	Name                  string
+	Summary               string
+	Version               string
+	EntityType            string
+
+	ApplianceHost             string
+	ApplianceURL              string
+	ApplianceServerThumbprint string
+}
+
+// NewUIPlugin Returns a UI Plugin struct with the given target
+func NewUIPlugin(target *lib.LoginInfo) *Plugin {
+	if target == nil {
+		return &Plugin{Target: &lib.LoginInfo{}}
+	}
+	return &Plugin{Target: target}
+}
+
+// NewH5UIPlugin Returns a UI Plugin struct populated defaults for an H5 Client install
+func NewH5UIPlugin(target *lib.LoginInfo) *Plugin {
+	p := NewUIPlugin(target)
+	p.Version = pluginVersion
+	p.EntityType = pluginEntityType
+	p.Company = pluginCompany
+	p.Key = h5ClientPluginKey
+	p.Name = h5ClientPluginName
+	p.Summary = h5ClientPluginSummary
+	p.Configure = true
+	p.Insecure = true
+
+	return p
+}
+
+// NewFlexUIPlugin Returns a UI Plugin struct populated defaults for an Flex Client install
+func NewFlexUIPlugin(target *lib.LoginInfo) *Plugin {
+	p := NewUIPlugin(target)
+	p.Version = pluginVersion
+	p.EntityType = pluginEntityType
+	p.Company = pluginCompany
+	p.Key = flexClientPluginKey
+	p.Name = flexClientPluginName
+	p.Summary = flexClientPluginSummary
+	p.Configure = true
+	p.Insecure = true
+
+	return p
+}
+
+func (p *Plugin) Install(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	var err error
+	if err = p.processInstallParams(op); err != nil {
+		op.Error(err)
+		return err
+	}
+	vCenterVersion := p.Target.Session.Client.ServiceContent.About.Version
+	if p.denyInstall(op, vCenterVersion) {
+		op.Warnf("Refusing to install Flex plugin on vSphere %s", vCenterVersion)
+		return nil
+	}
+
+	op.Infof("### Installing UI Plugin against vSphere %s ####", vCenterVersion)
+	op.Infof("%+v", p.Target.URL)
+	pInfo := &plugin.Info{
+		Company:               p.Company,
+		Key:                   p.Key,
+		Name:                  p.Name,
+		ServerThumbprint:      p.ApplianceServerThumbprint,
+		ShowInSolutionManager: !p.HideInSolutionManager,
+		Summary:               p.Summary,
+		Type:                  "vsphere-client-serenity",
+		URL:                   p.ApplianceURL,
+		Version:               p.Version,
+	}
+
+	if p.EntityType != "" {
+		pInfo.ManagedEntityInfo = &plugin.ManagedEntityInfo{
+			Description: p.Summary,
+			EntityType:  p.EntityType,
+		}
+	}
+
+	pl, err := plugin.NewPluginator(op, p.Target.Session, pInfo)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+
+	reg, err := pl.IsRegistered(pInfo.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	if reg {
+		if p.Force {
+			op.Info("Removing existing plugin to force install")
+			err = pl.Unregister(pInfo.Key)
+			if err != nil {
+				op.Error(err)
+				return err
+			}
+			op.Info("Removed existing plugin")
+		} else {
+			msg := fmt.Sprintf("plugin (%s) is already registered", pInfo.Key)
+			op.Errorf("Install failed: %s", msg)
+			return errors.New(msg)
+		}
+	}
+
+	op.Info("Installing plugin")
+	err = pl.Register()
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+
+	reg, err = pl.IsRegistered(pInfo.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	if !reg {
+		msg := fmt.Sprintf("post-install check failed to find %s registered", pInfo.Key)
+		op.Errorf("Install failed: %s", msg)
+		return errors.New(msg)
+	}
+
+	op.Info("Installed UI plugin")
+
+	if p.Configure {
+		// Configure the OVA vm to be managed by this plugin
+		if err = ova.ConfigureManagedByInfo(op, p.Target.Session, pInfo.URL); err != nil {
+			op.Error(err)
+			return err
+		}
+	}
+
+	return nil
+}
+
+func (p *Plugin) Remove(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	var err error
+	if err = p.processRemoveParams(op); err != nil {
+		op.Error(err)
+		return err
+	}
+
+	if p.Force {
+		op.Info("Ignoring --force")
+	}
+
+	op.Infof("### Removing UI Plugin ####")
+
+	pInfo := &plugin.Info{
+		Key: p.Key,
+	}
+
+	pl, err := plugin.NewPluginator(op, p.Target.Session, pInfo)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	reg, err := pl.IsRegistered(pInfo.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	if reg {
+		op.Infof("Found target plugin: %s", pInfo.Key)
+	} else {
+		msg := fmt.Sprintf("failed to find target plugin (%s)", pInfo.Key)
+		op.Errorf("Remove failed: %s", msg)
+		return errors.New(msg)
+	}
+
+	op.Info("Removing plugin")
+	err = pl.Unregister(pInfo.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+
+	reg, err = pl.IsRegistered(pInfo.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	if reg {
+		msg := fmt.Sprintf("post-remove check found %s still registered", pInfo.Key)
+		op.Errorf("Remove failed: %s", msg)
+		return errors.New(msg)
+	}
+
+	op.Info("Removed UI plugin")
+	return nil
+}
+
+func (p *Plugin) Info(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	var err error
+	if err = p.processInfoParams(op); err != nil {
+		op.Error(err)
+		return err
+	}
+
+	pInfo := &plugin.Info{
+		Key: p.Key,
+	}
+
+	pl, err := plugin.NewPluginator(op, p.Target.Session, pInfo)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+
+	reg, err := pl.GetPlugin(p.Key)
+	if err != nil {
+		op.Error(err)
+		return err
+	}
+	if reg == nil {
+		return errors.Errorf("%s is not registered", p.Key)
+	}
+
+	op.Infof("%s is registered", p.Key)
+	op.Info("")
+	op.Infof("Key: %s", reg.Key)
+	op.Infof("Name: %s", reg.Description.GetDescription().Label)
+	op.Infof("Summary: %s", reg.Description.GetDescription().Summary)
+	op.Infof("Company: %s", reg.Company)
+	op.Infof("Version: %s", reg.Version)
+	return nil
+}
+
+func (p *Plugin) processInstallParams(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	if p.Target.Session == nil {
+		cancel, err := p.Target.VerifyLogin(op)
+		defer cancel()
+
+		if err != nil {
+			op.Error(err)
+			return err
+		}
+	}
+
+	if p.Company == "" {
+		return errors.New("company must be specified")
+	}
+
+	if p.Key == "" {
+		return errors.New("key must be specified")
+	}
+
+	if p.Name == "" {
+		return errors.New("name must be specified")
+	}
+
+	if p.Summary == "" {
+		return errors.New("summary must be specified")
+	}
+
+	if p.Version == "" {
+		return errors.New("version must be specified")
+	}
+
+	if p.ApplianceHost == "" {
+		// Obtain the OVA VM's IP
+		vmIP, err := ip.FirstIPv4(ip.Eth0Interface)
+		if err != nil {
+			op.Error(err)
+			return errors.Errorf("Cannot generate appliance ip: %s", errors.ErrorStack(err))
+		}
+		// Fetch the OVF env to get the fileserver port
+		ovf, err := lib.UnmarshaledOvfEnv()
+		if err != nil {
+			op.Error(err)
+			return errors.Errorf("Cannot get appliance ovfenv: %s", errors.ErrorStack(err))
+		}
+		p.ApplianceHost = fmt.Sprintf("%s:%s", GetHostname(ovf, vmIP), ovf.Properties["appliance.config_port"])
+		op.Debugf("appliance host not specified. generated host: %s", p.ApplianceHost)
+
+	}
+	if p.ApplianceURL == "" {
+		p.ApplianceURL = fmt.Sprintf("https://%s/files/%s-v%s.zip", p.ApplianceHost, p.Key, p.Version)
+		op.Debugf("https plugin url not specified. generated plugin url: %s", p.ApplianceURL)
+	}
+	if p.ApplianceServerThumbprint == "" {
+		var cert object.HostCertificateInfo
+		if err := cert.FromURL(&url.URL{Host: p.ApplianceHost}, &tls.Config{}); err != nil {
+			op.Error(err)
+			return errors.Errorf("Error getting thumbprint for %s: %s", p.ApplianceHost, errors.ErrorStack(err))
+		}
+		p.ApplianceServerThumbprint = cert.ThumbprintSHA1
+		op.Debugf("server-thumbprint not specified with HTTPS plugin URL. generated thumbprint: %s", p.ApplianceServerThumbprint)
+	}
+
+	return nil
+}
+
+func (p *Plugin) processRemoveParams(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	if p.Target.Session == nil {
+		cancel, err := p.Target.VerifyLogin(op)
+		defer cancel()
+
+		if err != nil {
+			op.Error(err)
+			return err
+		}
+	}
+
+	if p.Key == "" {
+		return errors.New("key must be specified")
+	}
+
+	return nil
+}
+
+func (p *Plugin) processInfoParams(op trace.Operation) error {
+	defer trace.End(trace.Begin("", op))
+
+	if p.Target.Session == nil {
+		cancel, err := p.Target.VerifyLogin(op)
+		defer cancel()
+
+		if err != nil {
+			op.Error(err)
+			return err
+		}
+	}
+
+	if p.Key == "" {
+		return errors.New("key must be specified")
+	}
+	return nil
+}
+
+func (p *Plugin) denyInstall(op trace.Operation, version string) bool {
+	vCenterVersion := strings.Split(version, ".")
+
+	if len(vCenterVersion) < 2 {
+		op.Debugf("Cannot filter vSphere version (%s) because it is not a semantic version", strings.Join(vCenterVersion, "."))
+		return false
+	}
+	semver := map[string]string{
+		"major": vCenterVersion[0],
+		"minor": vCenterVersion[1],
+	}
+	// Deny install if:
+	// Plugin is the flex plugin AND
+	// -- major version us 6 AND
+	// -- -- minor version is greater than Or equal to 7 OR
+	// -- major version is greater than or equal to 7
+	return p.Key == flexClientPluginKey &&
+		((semver["major"] == "6" && semver["minor"] == "7") ||
+			(semver["major"] == "6" && strings.Compare(semver["minor"], "7") == 1) ||
+			(strings.Compare(semver["major"], "6") == 1))
+
+}
diff --git a/installer/fileserver/tasks/plugin/register.go b/installer/fileserver/tasks/plugin/register.go
new file mode 100644
index 0000000000..176625fe82
--- /dev/null
+++ b/installer/fileserver/tasks/plugin/register.go
@@ -0,0 +1,197 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package plugin
+
+import (
+	"context"
+	"fmt"
+	"strings"
+	"time"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/session"
+)
+
+type Info struct {
+	*ManagedEntityInfo
+
+	Company               string
+	Key                   string
+	Name                  string
+	ServerThumbprint      string
+	ShowInSolutionManager bool
+	Summary               string
+	Type                  string
+	URL                   string
+	Version               string
+}
+
+type ManagedEntityInfo struct {
+	Description  string
+	IconURL      string
+	SmallIconURL string
+	EntityType   string
+}
+
+type Pluginator struct {
+	Session          *session.Session
+	ExtensionManager *object.ExtensionManager
+	Context          context.Context
+
+	info *Info
+	op   trace.Operation
+}
+
+func NewPluginator(op trace.Operation, sess *session.Session, i *Info) (*Pluginator, error) {
+	defer trace.End(trace.Begin(""))
+
+	p := &Pluginator{
+		Session: sess,
+		info:    i,
+		op:      op,
+	}
+	p.Context = op
+
+	err := p.connect()
+	if err != nil {
+		return nil, err
+	}
+
+	return p, nil
+}
+
+func (p *Pluginator) connect() error {
+	defer trace.End(trace.Begin(""))
+
+	em, err := object.GetExtensionManager(p.Session.Client.Client)
+	if err != nil {
+		return fmt.Errorf("failed to get extension manager: %s", err)
+	}
+	p.ExtensionManager = em
+
+	return nil
+}
+
+// Register installs an extension to the target
+func (p *Pluginator) Register() error {
+	defer trace.End(trace.Begin(""))
+	var err error
+
+	desc := types.Description{
+		Label:   p.info.Name,
+		Summary: p.info.Summary,
+	}
+
+	e := types.Extension{
+		Key:         p.info.Key,
+		Version:     p.info.Version,
+		Company:     p.info.Company,
+		Description: &desc,
+	}
+
+	if p.info.ManagedEntityInfo != nil {
+		e.Type = p.info.EntityType
+	}
+
+	eci := types.ExtensionClientInfo{
+		Version:     p.info.Version,
+		Company:     p.info.Company,
+		Description: &desc,
+		Type:        p.info.Type,
+		Url:         p.info.URL,
+	}
+	e.Client = append(e.Client, eci)
+
+	d := types.KeyValue{
+		Key:   "name",
+		Value: p.info.Name,
+	}
+
+	eri := types.ExtensionResourceInfo{
+		Locale: "en_US",
+		Module: "name",
+	}
+
+	if p.info.ManagedEntityInfo != nil {
+		mei := types.ExtManagedEntityInfo{
+			Description: p.info.ManagedEntityInfo.Description,
+			Type:        p.info.ManagedEntityInfo.EntityType,
+		}
+		e.ManagedEntityInfo = append(e.ManagedEntityInfo, mei)
+	}
+
+	eri.Data = append(eri.Data, d)
+
+	e.ResourceList = append(e.ResourceList, eri)
+
+	// HTTPS requires extension server info
+	if strings.HasPrefix(strings.ToLower(p.info.URL), "https://") {
+		esi := types.ExtensionServerInfo{
+			Url:              p.info.URL,
+			Description:      &desc,
+			Company:          p.info.Company,
+			Type:             "HTTPS",
+			AdminEmail:       []string{"noreply@vmware.com"},
+			ServerThumbprint: p.info.ServerThumbprint,
+		}
+		e.Server = append(e.Server, esi)
+	}
+
+	e.ShownInSolutionManager = &p.info.ShowInSolutionManager
+
+	e.LastHeartbeatTime = time.Now().UTC()
+
+	err = p.ExtensionManager.Register(p.Context, e)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
+
+// Unregister removes an extension from the target
+func (p *Pluginator) Unregister(key string) error {
+	defer trace.End(trace.Begin(""))
+
+	if err := p.ExtensionManager.Unregister(p.Context, key); err != nil {
+		return err
+	}
+	return nil
+}
+
+// IsRegistered checks for presence of an extension on the target
+func (p *Pluginator) IsRegistered(key string) (bool, error) {
+	defer trace.End(trace.Begin(""))
+
+	e, err := p.ExtensionManager.Find(p.Context, key)
+	if err != nil {
+		return false, err
+	}
+	if e != nil {
+		p.op.Debugf("%q is registered", key)
+		return true, nil
+	}
+	p.op.Debugf("%q is not registered", key)
+	return false, nil
+}
+
+// IsRegistered checks for presence of an extension on the target
+func (p *Pluginator) GetPlugin(key string) (*types.Extension, error) {
+	defer trace.End(trace.Begin(""))
+
+	return p.ExtensionManager.Find(p.Context, key)
+}
diff --git a/installer/fileserver/tasks/plugin_test.go b/installer/fileserver/tasks/plugin_test.go
new file mode 100644
index 0000000000..e4423fbec9
--- /dev/null
+++ b/installer/fileserver/tasks/plugin_test.go
@@ -0,0 +1,72 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tasks
+
+import (
+	"context"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/vmware/vic/pkg/trace"
+)
+
+func TestFlexInstallWithBadVersions(t *testing.T) {
+	op := trace.NewOperation(context.Background(), "TestFlexInstallWithBadVersions")
+	tests := map[string]bool{
+		"6.0":   false,
+		"6.0.0": false,
+		"6.0.1": false,
+		"6.5":   false,
+		"6.5.0": false,
+		"6.5.1": false,
+		"6.7":   true,
+		"6.7.0": true,
+		"6.7.1": true,
+		"7.0":   true,
+		"7.0.0": true,
+		"7.0.1": true,
+	}
+
+	p := NewUIPlugin(nil)
+	p.Key = flexClientPluginKey
+	for k, v := range tests {
+		assert.Equal(t, p.denyInstall(op, k), v, "Plugin version %s", k)
+	}
+}
+
+func TestH5InstallWithAnyVersion(t *testing.T) {
+	op := trace.NewOperation(context.Background(), "TestH5InstallWithAnyVersion")
+	tests := map[string]bool{
+		"6.0":   false,
+		"6.0.0": false,
+		"6.0.1": false,
+		"6.5":   false,
+		"6.5.0": false,
+		"6.5.1": false,
+		"6.7":   false,
+		"6.7.0": false,
+		"6.7.1": false,
+		"7.0":   false,
+		"7.0.0": false,
+		"7.0.1": false,
+	}
+
+	p := NewUIPlugin(nil)
+	p.Key = h5ClientPluginKey
+	for k, v := range tests {
+		assert.Equal(t, p.denyInstall(op, k), v, "Plugin version %s", k)
+	}
+}
diff --git a/installer/fileserver/tasks/register.go b/installer/fileserver/tasks/register.go
new file mode 100644
index 0000000000..028971fa21
--- /dev/null
+++ b/installer/fileserver/tasks/register.go
@@ -0,0 +1,198 @@
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tasks
+
+import (
+	"fmt"
+	"io/ioutil"
+	"net"
+	"os/exec"
+	"strings"
+	"time"
+
+	log "github.com/Sirupsen/logrus"
+
+	"github.com/vmware/vic-product/installer/fileserver/tasks/tagvm"
+	"github.com/vmware/vic-product/installer/lib"
+	"github.com/vmware/vic-product/installer/pkg/ip"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/optmanager"
+)
+
+const (
+	// InitServicesTimestamp exists on the local fs when registration first succeeds
+	InitServicesTimestamp = "./registration-timestamps.txt"
+	pscBinaryPath         = "/etc/vmware/admiral/admiral-auth-psc-1.3.2-SNAPSHOT-command.jar"
+	vcHostnameOption      = "config.vpxd.hostnameUrl"
+	pscConfDir            = "/etc/vmware/psc"
+	pscConfFileName       = "psc-config.properties"
+)
+
+// PSCRegistrationConfig holds the required data for a psc registration
+type PSCRegistrationConfig struct {
+	Admin       *lib.LoginInfo
+	PscInstance string
+	PscDomain   string
+}
+
+// NewPSCRegistrationConfig returns a PSCRegistrationConfig with a initialized Admin LoginInfo type
+func NewPSCRegistrationConfig() *PSCRegistrationConfig {
+	return &PSCRegistrationConfig{
+		Admin: &lib.LoginInfo{},
+	}
+}
+
+// RegisterAppliance runs the three processes required to register the appliance:
+// TagVM, RegisterWithPSC, and SaveInitializationState
+func (conf *PSCRegistrationConfig) RegisterAppliance(op trace.Operation) error {
+	if err := tagvm.Run(op, conf.Admin.Session); err != nil {
+		op.Debug(errors.ErrorStack(err))
+		return errors.New("Failed to locate VIC Appliance. Please check the vCenter Server provided and try again")
+	}
+
+	if err := conf.RegisterWithPSC(op); err != nil {
+		op.Debug(errors.ErrorStack(err))
+		return errors.New("Failed to register with PSC. Please check the PSC settings provided and try again")
+	}
+
+	if err := ioutil.WriteFile(InitServicesTimestamp, []byte(time.Now().String()), 0644); err != nil {
+		op.Debug(errors.ErrorStack(err))
+		return errors.New("Failed to write to timestamp file")
+	}
+
+	return nil
+}
+
+// RegisterWithPSC runs the PSC register command to register VIC services with
+// the platforms services controller. The command generates config files and
+// keystore files to use while getting and renewing tokens.
+func (conf *PSCRegistrationConfig) RegisterWithPSC(op trace.Operation) error {
+	var err error
+
+	// Use vSphere as the psc instance if external psc was not supplied
+	if conf.PscInstance == "" {
+		// Obtain the hostname of the vCenter host to use as PSC instance
+		conf.PscInstance, err = optmanager.QueryOptionValue(op.Context, conf.Admin.Session, vcHostnameOption)
+		if err != nil {
+			return err
+		}
+	}
+
+	// Use vSphere or user's domain as the psc domain if external psc was not supplied
+	if conf.PscDomain == "" {
+		// Obtain the Admin user's domain
+		conf.PscDomain = "vsphere.local"
+		userFields := strings.SplitN(conf.Admin.User, "@", 2)
+		if len(userFields) == 2 {
+			conf.PscDomain = userFields[1]
+		}
+	}
+
+	op.Infof("vCenter user: %s", conf.Admin.User)
+	op.Infof("PSC instance: %s", conf.PscInstance)
+	op.Infof("PSC domain: %s", conf.PscDomain)
+
+	// Obtain the OVA VM's IP
+	vmIP, err := ip.FirstIPv4(ip.Eth0Interface)
+	if err != nil {
+		return err
+	}
+
+	// Fetch the OVF env to get the Admiral port
+	ovf, err := lib.UnmarshaledOvfEnv()
+	if err != nil {
+		return err
+	}
+	admiralPort := ovf.Properties["management_portal.management_portal_port"]
+
+	// Out of the box users
+	defCreateUsers, foundCreateUsers := ovf.Properties["default_users.create_def_users"]
+	defPrefix, foundPrefix := ovf.Properties["default_users.def_user_prefix"]
+	defPassword, foundPassword := ovf.Properties["default_users.def_user_password"]
+
+	op.Infof("PSC Out of the box users. CreateUsers: %s, FoundCreateUsers: %v, Prefix: %s",
+		defCreateUsers, foundCreateUsers, defPrefix)
+
+	// Register all VIC components with PSC
+	cmdName := "/usr/bin/java"
+	for _, client := range []string{"harbor", "engine", "admiral"} {
+
+		cmdArgs := []string{
+			"-jar",
+			pscBinaryPath,
+			"--command=register",
+			"--clientName=" + client,
+			// NOTE(anchal): version set to 6.0 to use SAML for both versions 6.0 and 6.5
+			"--version=6.0",
+			"--tenant=" + conf.PscDomain,
+			"--domainController=" + conf.PscInstance,
+			"--username=" + conf.Admin.User,
+			"--password=" + conf.Admin.Password,
+			"--admiralUrl=" + fmt.Sprintf("https://%s:%s", GetHostname(ovf, vmIP), admiralPort),
+			"--configDir=" + pscConfDir,
+		}
+
+		if client == "admiral" && foundCreateUsers && strings.ToLower(defCreateUsers) == "true" {
+			if foundPrefix && defPrefix != "" {
+				arg := "--defaultUserPrefix=" + defPrefix
+				cmdArgs = append(cmdArgs, arg)
+			}
+
+			if foundPassword && defPrefix != "" && defPassword != "" {
+				arg := "--defaultUserPassword=" + defPassword
+				cmdArgs = append(cmdArgs, arg)
+			}
+		}
+
+		// #nosec: Subprocess launching with variable.
+		// This runs the PSC tool's register command.
+		cmd := exec.Command(cmdName, cmdArgs...)
+		if output, err := cmd.CombinedOutput(); err != nil {
+			op.Infof("Error running PSC register command for %s: %s", client, string(output))
+			return err
+		}
+		op.Infof("Successfully registered %s with PSC", client)
+	}
+
+	return nil
+}
+
+// GetHostname returns the non-transient hostname of the Appliance
+func GetHostname(ovf lib.Environment, vmIP net.IP) string {
+
+	// Until we gix transient hostnames, use the static hostname reported by hostnamectl.
+	// os.Hostname() returns the kernel hostname, with no regard to transient or static classifications.
+	// fqdn, err := os.Hostname()
+	// var url string
+	// if err == nil && fqdn != "" {
+	// 	return fqdn
+	// } else {
+	// 	return vmIP.String()
+	// }
+
+	command := "hostnamectl status --static"
+	// #nosec: Subprocess launching with variable.
+	out, err := exec.Command("/bin/bash", "-c", command).Output()
+	if err != nil {
+		log.Errorf(err.Error())
+		return vmIP.String()
+	}
+	outString := strings.TrimSpace(string(out))
+	if outString == "" {
+		return vmIP.String()
+	}
+	return outString
+}
diff --git a/installer/fileserver/tasks/tagvm/tagvm.go b/installer/fileserver/tasks/tagvm/tagvm.go
new file mode 100644
index 0000000000..5fd2d2e935
--- /dev/null
+++ b/installer/fileserver/tasks/tagvm/tagvm.go
@@ -0,0 +1,100 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package tagvm
+
+import (
+	"net/url"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/lib/guest"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/session"
+	"github.com/vmware/vic/pkg/vsphere/tags"
+)
+
+const (
+	VicProductCategory    = "VsphereIntegratedContainers"
+	VicProductDescription = "VIC product"
+	VicProductType        = "VirtualMachine"
+	ProductVMTag          = "ProductVM"
+	ProductVMDescription  = "Product VM"
+)
+
+func setupClient(op trace.Operation, sess *session.Session) (*tags.RestClient, error) {
+	endpoint, err := url.Parse(sess.Service)
+	client := tags.NewClient(endpoint, sess.Insecure, sess.Thumbprint)
+	err = client.Login(op)
+	if err != nil {
+		op.Errorf("failed to connect rest API for %s", errors.ErrorStack(err))
+		return client, errors.Errorf("Rest is not accessible")
+	}
+
+	return client, nil
+}
+
+func createProductVMtag(op trace.Operation, client *tags.RestClient) (string, error) {
+	// create category first, then create tag
+	categoryID, err := client.CreateCategoryIfNotExist(op, VicProductCategory, VicProductDescription, VicProductType, false)
+	if err != nil {
+		return "", errors.Errorf("failed to create vic product category: %s", errors.ErrorStack(err))
+	}
+
+	tagID, err := client.CreateTagIfNotExist(op, ProductVMTag, ProductVMDescription, *categoryID)
+	if err != nil {
+		return "", errors.Errorf("failed to create product vm tag: %s", errors.ErrorStack(err))
+	}
+
+	return *tagID, nil
+}
+
+func attachTag(op trace.Operation, client *tags.RestClient, sess *session.Session, tagID string, vm *object.VirtualMachine) error {
+	if tagID == "" || sess == nil {
+		return errors.Errorf("failed to attach product vm tag")
+	}
+
+	err := client.AttachTagToObject(op, tagID, vm.Reference().Value, vm.Reference().Type)
+	if err != nil {
+		return errors.Errorf("failed to apply the tag on product vm : %s", errors.ErrorStack(err))
+	}
+
+	op.Debugf("successfully attached the product tag")
+	return nil
+}
+
+// Run takes in a url and session and tag the ova vm.
+func Run(op trace.Operation, sess *session.Session) error {
+	client, err := setupClient(op, sess)
+	if err != nil {
+		return err
+	}
+
+	tagID, err := createProductVMtag(op, client)
+	if err != nil {
+		return err
+	}
+
+	vm, err := guest.GetSelf(op, sess)
+	if err != nil {
+		return errors.Errorf("failed to get product vm : %s", errors.ErrorStack(err))
+	}
+
+	err = attachTag(op, client, sess, tagID, vm)
+	if err != nil {
+		return err
+	}
+
+	return nil
+}
diff --git a/installer/lib/login.go b/installer/lib/login.go
index de38ca8754..5029db2da5 100644
--- a/installer/lib/login.go
+++ b/installer/lib/login.go
@@ -1,4 +1,4 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -20,61 +20,74 @@ import (
 	"net/url"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/validate"
+	"github.com/vmware/vic-product/installer/pkg/version"
+	"github.com/vmware/vic/pkg/errors"
 	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/session"
 )
 
 const loginTimeout = 15 * time.Second
 
+// LoginInfo represents credentials needed to access vSphere
 type LoginInfo struct {
-	Target    string `json:"target"`
-	User      string `json:"user"`
-	Password  string `json:"password"`
-	Validator *validate.Validator
+	Target     string `json:"target"`
+	User       string `json:"user"`
+	Password   string `json:"password"`
+	Thumbprint string `json:"thumbprint"`
+	URL        *url.URL
+	Session    *session.Session
 }
 
-// Verify login based on info given, return non nil error if validation fails.
-func (info *LoginInfo) VerifyLogin() (context.CancelFunc, error) {
+// VerifyLogin based on info given, return non nil error if validation fails.
+func (info *LoginInfo) VerifyLogin(op trace.Operation) (context.CancelFunc, error) {
 	defer trace.End(trace.Begin(""))
 
-	var u url.URL
-	u.User = url.UserPassword(info.User, info.Password)
-	u.Host = info.Target
-	u.Path = ""
-	log.Infof("server URL: %v\n", u.Host)
-
-	input := data.NewData()
-
-	username := u.User.Username()
-	input.OpsCredentials.OpsUser = &username
-	passwd, _ := u.User.Password()
-	input.OpsCredentials.OpsPassword = &passwd
-	input.URL = &u
-	input.Force = true
+	info.URL = &url.URL{
+		Scheme: "https",
+		Host:   info.Target,
+		User:   url.UserPassword(info.User, info.Password),
+		Path:   "",
+	}
 
-	input.User = username
-	input.Password = &passwd
+	op.Infof("server URL: %v\n", info.URL.Host)
 
 	ctx, cancel := context.WithTimeout(context.Background(), loginTimeout)
 	loginResponse := make(chan error, 1)
-	var v *validate.Validator
 	var err error
 
 	go func() {
-		v, err = validate.NewValidator(ctx, input)
-		info.Validator = v
+		if info.Thumbprint == "" {
+			err = errors.New("Thumbprint is empty")
+			op.Errorf("%s", err)
+			loginResponse <- err
+			return
+		}
+
+		sessionconfig := &session.Config{
+			Thumbprint: info.Thumbprint,
+			UserAgent:  version.UserAgent("vic-appliance"),
+			Service:    info.URL.String(),
+		}
+
+		info.Session = session.NewSession(sessionconfig)
+		info.Session, err = info.Session.Connect(op)
+		if err != nil {
+			op.Errorf("failed to connect: %s", err)
+			loginResponse <- err
+			return
+		}
+
+		// #nosec: Errors unhandled.
+		info.Session.Populate(op)
 		loginResponse <- err
 	}()
 
 	select {
 	case <-ctx.Done():
-		loginResponse <- fmt.Errorf("login failed; validator context exceeded")
+		loginResponse <- fmt.Errorf("login failed; session context deadline exceeded")
 	case err := <-loginResponse:
 		if err != nil {
-			log.Infof("validator: %s", err)
+			op.Infof("session: %s", err)
 			loginResponse <- err
 		} else {
 			loginResponse <- nil
diff --git a/installer/lib/tls.go b/installer/lib/tls.go
index ea581f8216..29ab444a19 100644
--- a/installer/lib/tls.go
+++ b/installer/lib/tls.go
@@ -1,4 +1,4 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -16,32 +16,27 @@ package lib
 
 import (
 	"crypto/tls"
-	"net/http"
 )
 
-func GetTLSServer(addr string, handler http.Handler, cert tls.Certificate) *http.Server {
+func GetTLSServerConfig(cert tls.Certificate) *tls.Config {
 	// forcing tls 1.1, cipher from https://github.com/denji/golang-tls#perfect-ssl-labs-score-with-go
 	// and https://wiki.mozilla.org/Security/TLS_Configurations#Go
-	return &http.Server{
-		Addr:    addr,
-		Handler: handler,
-		TLSConfig: &tls.Config{
-			MinVersion:               tls.VersionTLS11,
-			CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
-			PreferServerCipherSuites: true,
-			CipherSuites: []uint16{
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-				tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-				tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-				tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-			},
-			Certificates: []tls.Certificate{cert},
+	return &tls.Config{
+		MinVersion:               tls.VersionTLS11,
+		CurvePreferences:         []tls.CurveID{tls.CurveP521, tls.CurveP384, tls.CurveP256},
+		PreferServerCipherSuites: true,
+		CipherSuites: []uint16{
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
+			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
+			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
 		},
+		Certificates: []tls.Certificate{cert},
 	}
 }
diff --git a/installer/scripts/ci-build.sh b/installer/scripts/ci-build.sh
index 5943e0a787..0851c2d60d 100755
--- a/installer/scripts/ci-build.sh
+++ b/installer/scripts/ci-build.sh
@@ -32,6 +32,9 @@ fi
 if [ -n "${VICENGINE}" ]; then
   OPTIONS="$OPTIONS --vicengine $VICENGINE"
 fi
+if [ -n "${VICUI}" ]; then
+  OPTIONS="$OPTIONS --vicui $VICUI"
+fi
 if [ -n "${VIC_MACHINE_SERVER}" ]; then
   OPTIONS="$OPTIONS --vicmachineserver $VIC_MACHINE_SERVER"
 fi
@@ -57,6 +60,15 @@ if [[ ( "$DRONE_BUILD_EVENT" == "tag" && "$DRONE_TAG" != *"dev"* ) || "$DRONE_BR
     vicengine_release=$(gsutil ls -l "$bucket" | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' PIPE; head -1) | xargs | cut -d ' ' -f 3 | sed 's/gs:\/\//https:\/\/storage.googleapis.com\//')
     OPTIONS="$OPTIONS --vicengine ${vicengine_release:?Unable to find an appropriate VIC Engine build. Is '"'$DRONE_BRANCH'"' a valid vmware/vic branch?}"
   fi
+  if [ -z "${VICUI}" ]; then
+    if [[ "$DRONE_BUILD_EVENT" != "tag" || "$DRONE_TAG" == *"dev"* ]]; then
+      bucket="gs://vic-ui-builds/$DRONE_BRANCH"
+    else
+      bucket="gs://vic-ui-releases"
+    fi
+    vicui_release=$(gsutil ls -l "$bucket" | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap '' PIPE; head -1) | xargs | cut -d " " -f 3 | sed 's/gs:\/\//https:\/\/storage.googleapis.com\//')
+    OPTIONS="$OPTIONS --vicui ${vicui_release:?Unable to find an appropriate VIC UI build. Is '"'$DRONE_BRANCH'"' a valid vmware/vic-ui branch?}"
+  fi
   if [ -z "${VIC_MACHINE_SERVER}" ]; then
     # Listing container tags requires permissions
     if [ -z "$(gcloud auth list --filter=status:ACTIVE --format='value(account)')" ]; then
diff --git a/installer/tagvm/tagvm.go b/installer/tagvm/tagvm.go
deleted file mode 100644
index a19966185a..0000000000
--- a/installer/tagvm/tagvm.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tagvm
-
-import (
-	"context"
-	"net/url"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tags"
-)
-
-const (
-	VicProductCategory    = "VsphereIntegratedContainers"
-	VicProductDescription = "VIC product"
-	VicProductType        = "VirtualMachine"
-	ProductVMTag          = "ProductVM"
-	ProductVMDescription  = "Product VM"
-)
-
-func setupClient(ctx context.Context, sess *session.Session) (*tags.RestClient, error) {
-	endpoint, err := url.Parse(sess.Service)
-	client := tags.NewClient(endpoint, sess.Insecure, sess.Thumbprint)
-	err = client.Login(ctx)
-	if err != nil {
-		log.Errorf("failed to connect rest API for %s", errors.ErrorStack(err))
-		return client, errors.Errorf("Rest is not accessible")
-	}
-
-	return client, nil
-}
-
-func createProductVMtag(ctx context.Context, client *tags.RestClient) (string, error) {
-	// create category first, then create tag
-	categoryID, err := client.CreateCategoryIfNotExist(ctx, VicProductCategory, VicProductDescription, VicProductType, false)
-	if err != nil {
-		return "", errors.Errorf("failed to create vic product category: %s", errors.ErrorStack(err))
-	}
-
-	tagID, err := client.CreateTagIfNotExist(ctx, ProductVMTag, ProductVMDescription, *categoryID)
-	if err != nil {
-		return "", errors.Errorf("failed to create product vm tag: %s", errors.ErrorStack(err))
-	}
-
-	return *tagID, nil
-}
-
-func attachTag(ctx context.Context, client *tags.RestClient, sess *session.Session, tagID string, vm *object.VirtualMachine) error {
-	if tagID == "" || sess == nil {
-		return errors.Errorf("failed to attach product vm tag")
-	}
-
-	err := client.AttachTagToObject(ctx, tagID, vm.Reference().Value, vm.Reference().Type)
-	if err != nil {
-		return errors.Errorf("failed to apply the tag on product vm : %s", errors.ErrorStack(err))
-	}
-
-	log.Debugf("successfully attached the product tag")
-	return nil
-}
-
-// Run takes in a url and session and tag the ova vm.
-func Run(ctx context.Context, sess *session.Session) error {
-	client, err := setupClient(ctx, sess)
-	if err != nil {
-		return err
-	}
-
-	tagID, err := createProductVMtag(ctx, client)
-	if err != nil {
-		return err
-	}
-
-	vm, err := guest.GetSelf(ctx, sess)
-	if err != nil {
-		return errors.Errorf("failed to get product vm : %s", errors.ErrorStack(err))
-	}
-
-	err = attachTag(ctx, client, sess, tagID, vm)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/.gitignore b/installer/vendor/github.com/GoASTScanner/gas/.gitignore
deleted file mode 100644
index b0326bdbf8..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/.gitignore
+++ /dev/null
@@ -1,30 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-*.swp
-gas
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-
-.DS_Store
-
-.vscode
diff --git a/installer/vendor/github.com/GoASTScanner/gas/.travis.yml b/installer/vendor/github.com/GoASTScanner/gas/.travis.yml
deleted file mode 100644
index 2c253a756e..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: go
-before_script:
-  - go vet $(go list ./... | grep -v /vendor/)
-go:
-  - 1.5
-  - tip
diff --git a/installer/vendor/github.com/GoASTScanner/gas/Dockerfile b/installer/vendor/github.com/GoASTScanner/gas/Dockerfile
deleted file mode 100644
index 7fea92ca2f..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-# Docker version must be 17.05 or higher to allow multistage build
-# See build and run instructions in README.md
-
-# Builds Gas for utilization
-FROM golang:1.8.1-alpine as builder
-ENV workspace /go/src/github.com/GoASTScanner/gas
-ENV GOPATH /go
-COPY . $workspace
-WORKDIR $workspace
-
-RUN go vet $(go list ./... | grep -v /vendor/)
-RUN CGO_ENABLED=0 go build -o gas .
-
-########################################################
-
-# Runs Gas on all Go files in the current directory when 
-# 'docker run' command in README is given
-FROM alpine:3.6
-
-COPY --from=builder /go/src/github.com/GoASTScanner/gas/gas /
-
-# Mounted directory should be placed into the workdir
-CMD /gas $(find . -path ./vendor -prune -o -type f -name "*.go")
diff --git a/installer/vendor/github.com/GoASTScanner/gas/README.md b/installer/vendor/github.com/GoASTScanner/gas/README.md
deleted file mode 100644
index 81c2ed5e3f..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
-## GAS - Go AST Scanner
-
-Inspects source code for security problems by scanning the Go AST.
-
-### License
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License [here](http://www.apache.org/licenses/LICENSE-2.0).
-
-### Project status
-
-[![Build Status](https://travis-ci.org/GoASTScanner/gas.svg?branch=master)](https://travis-ci.org/GoASTScanner/gas)
-[![GoDoc](https://godoc.org/github.com/GoASTScanner/gas?status.svg)](https://godoc.org/github.com/GoASTScanner/gas)
-
-Gas is still in alpha and accepting feedback from early adopters. We do
-not consider it production ready at this time.
-
-### Usage
-
-Gas can be configured to only run a subset of rules, to exclude certain file
-paths, and produce reports in different formats. By default all rules will be
-run against the supplied input files. To recursively scan from the current
-directory you can supply './...' as the input argument.
-
-#### Selecting rules
-
-By default Gas will run all rules against the supplied file paths. It is however possible to select a subset of rules to run via the '-include=' flag,
-or to specify a set of rules to explicitly exclude using the '-exclude=' flag.
-
-##### Available rules
-
-  - G101: Look for hardcoded credentials
-  - G102: Bind to all interfaces
-  - G103: Audit the use of unsafe block
-  - G104: Audit errors not checked
-  - G105: Audit the use of math/big.Int.Exp
-  - G201: SQL query construction using format string
-  - G202: SQL query construction using string concatenation
-  - G203: Use of unescaped data in HTML templates
-  - G204: Audit use of command execution
-  - G301: Poor file permissions used when creating a directory
-  - G302: Poor file permisions used with chmod
-  - G303: Creating tempfile using a predictable path
-  - G401: Detect the usage of DES, RC4, or MD5
-  - G402: Look for bad TLS connection settings
-  - G403: Ensure minimum RSA key length of 2048 bits
-  - G404: Insecure random number source (rand)
-  - G501: Import blacklist: crypto/md5
-  - G502: Import blacklist: crypto/des
-  - G503: Import blacklist: crypto/rc4
-  - G504: Import blacklist: net/http/cgi
-
-
-```
-# Run a specific set of rules
-$ gas -include=G101,G203,G401 ./...
-
-# Run everything except for rule G303
-$ gas -exclude=G303 ./...
-```
-
-#### Excluding files:
-
-Gas can be told to \ignore paths that match a supplied pattern using the 'skip' command line option. This is
-accomplished via [go-glob](github.com/ryanuber/go-glob). Multiple patterns can be specified as follows:
-
-```
-$ gas -skip=tests* -skip=*_example.go ./...
-```
-
-#### Annotating code
-
-As with all automated detection tools there will be cases of false positives. In cases where Gas reports a failure that has been manually verified as being safe it is possible to annotate the code with a '#nosec' comment.
-
-The annotation causes Gas to stop processing any further nodes within the
-AST so can apply to a whole block or more granularly to a single expression.
-
-```go
-
-import "md5" // #nosec
-
-
-func main(){
-
-    /* #nosec */
-    if x > y {
-        h := md5.New() // this will also be ignored
-    }
-
-}
-
-```
-
-In some cases you may also want to revisit places where #nosec annotations
-have been used. To run the scanner and ignore any #nosec annotations you
-can do the following:
-
-```
-$ gas -nosec=true ./...
-```
-
-### Output formats
-
-Gas currently supports text, json and csv output formats. By default
-results will be reported to stdout, but can also be written to an output
-file. The output format is controlled by the '-fmt' flag, and the output file is controlled by the '-out' flag as follows:
-
-```
-# Write output in json format to results.json
-$ gas -fmt=json -out=results.json *.go
-```
-
-### Docker container
-
-A Dockerfile is included with the Gas source code to provide a container that 
-allows users to easily run Gas on their code. It builds Gas, then runs it on 
-all Go files in your current directory. Use the following commands to build 
-and run locally:
-
-To build: (run command in cloned Gas source code directory)
-          docker build --build-arg http_proxy --build-arg https_proxy
-          --build-arg no_proxy -t goastscanner/gas:latest .
-
-To run:  (run command in desired directory with Go files)
-          docker run -v $PWD:$PWD --workdir $PWD goastscanner/gas:latest
-
-Note: Docker version 17.05 or later is required (to permit multistage build).
-```
diff --git a/installer/vendor/github.com/GoASTScanner/gas/core/call_list_test.go b/installer/vendor/github.com/GoASTScanner/gas/core/call_list_test.go
deleted file mode 100644
index ef582937bd..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/core/call_list_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package core
-
-import (
-	"go/ast"
-	"testing"
-)
-
-type callListRule struct {
-	MetaData
-	callList CallList
-	matched  int
-}
-
-func (r *callListRule) Match(n ast.Node, c *Context) (gi *Issue, err error) {
-	if r.callList.ContainsCallExpr(n, c) {
-		r.matched += 1
-	}
-	return nil, nil
-}
-
-func TestCallListContainsCallExpr(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := NewAnalyzer(config, nil)
-	calls := NewCallList()
-	calls.AddAll("bytes.Buffer", "Write", "WriteTo")
-	rule := &callListRule{
-		MetaData: MetaData{
-			Severity:   Low,
-			Confidence: Low,
-			What:       "A dummy rule",
-		},
-		callList: calls,
-		matched:  0,
-	}
-	analyzer.AddRule(rule, []ast.Node{(*ast.CallExpr)(nil)})
-	source := `
-	package main
-	import (
-		"bytes"
-		"fmt"
-	)
-	func main() {
-		var b bytes.Buffer
-		b.Write([]byte("Hello "))
-		fmt.Fprintf(&b, "world!")
-	}`
-
-	analyzer.ProcessSource("dummy.go", source)
-	if rule.matched != 1 {
-		t.Errorf("Expected to match a bytes.Buffer.Write call")
-	}
-}
-
-func TestCallListContains(t *testing.T) {
-	callList := NewCallList()
-	callList.Add("fmt", "Printf")
-	if !callList.Contains("fmt", "Printf") {
-		t.Errorf("Expected call list to contain fmt.Printf")
-	}
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/core/helpers_test.go b/installer/vendor/github.com/GoASTScanner/gas/core/helpers_test.go
deleted file mode 100644
index 1a7bcdad28..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/core/helpers_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package core
-
-import (
-	"go/ast"
-	"testing"
-)
-
-type dummyCallback func(ast.Node, *Context, string, ...string) (*ast.CallExpr, bool)
-
-type dummyRule struct {
-	MetaData
-	pkgOrType      string
-	funcsOrMethods []string
-	callback       dummyCallback
-	callExpr       []ast.Node
-	matched        int
-}
-
-func (r *dummyRule) Match(n ast.Node, c *Context) (gi *Issue, err error) {
-	if callexpr, matched := r.callback(n, c, r.pkgOrType, r.funcsOrMethods...); matched {
-		r.matched += 1
-		r.callExpr = append(r.callExpr, callexpr)
-	}
-	return nil, nil
-}
-
-func TestMatchCallByType(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := NewAnalyzer(config, nil)
-	rule := &dummyRule{
-		MetaData: MetaData{
-			Severity:   Low,
-			Confidence: Low,
-			What:       "A dummy rule",
-		},
-		pkgOrType:      "bytes.Buffer",
-		funcsOrMethods: []string{"Write"},
-		callback:       MatchCallByType,
-		callExpr:       []ast.Node{},
-		matched:        0,
-	}
-	analyzer.AddRule(rule, []ast.Node{(*ast.CallExpr)(nil)})
-	source := `
-	package main
-	import (
-		"bytes"
-		"fmt"
-	)
-	func main() {
-		var b bytes.Buffer
-		b.Write([]byte("Hello "))
-		fmt.Fprintf(&b, "world!")
-	}`
-
-	analyzer.ProcessSource("dummy.go", source)
-	if rule.matched != 1 || len(rule.callExpr) != 1 {
-		t.Errorf("Expected to match a bytes.Buffer.Write call")
-	}
-
-	typeName, callName, err := GetCallInfo(rule.callExpr[0], analyzer.context)
-	if err != nil {
-		t.Errorf("Unable to resolve call info: %v\n", err)
-	}
-	if typeName != "bytes.Buffer" {
-		t.Errorf("Expected: %s, Got: %s\n", "bytes.Buffer", typeName)
-	}
-	if callName != "Write" {
-		t.Errorf("Expected: %s, Got: %s\n", "Write", callName)
-	}
-
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/filelist_test.go b/installer/vendor/github.com/GoASTScanner/gas/filelist_test.go
deleted file mode 100644
index eaa3cd63cb..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/filelist_test.go
+++ /dev/null
@@ -1,251 +0,0 @@
-package main
-
-import (
-	"reflect"
-	"testing"
-)
-
-func Test_newFileList(t *testing.T) {
-	type args struct {
-		paths []string
-	}
-	tests := []struct {
-		name string
-		args args
-		want *fileList
-	}{
-		{
-			name: "nil paths",
-			args: args{paths: nil},
-			want: &fileList{patterns: map[string]struct{}{}},
-		},
-		{
-			name: "empty paths",
-			args: args{paths: []string{}},
-			want: &fileList{patterns: map[string]struct{}{}},
-		},
-		{
-			name: "have paths",
-			args: args{paths: []string{"*_test.go"}},
-			want: &fileList{patterns: map[string]struct{}{
-				"*_test.go": struct{}{},
-			}},
-		},
-	}
-	for _, tt := range tests {
-		if got := newFileList(tt.args.paths...); !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%q. newFileList() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}
-
-func Test_fileList_String(t *testing.T) {
-	type fields struct {
-		patterns []string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   string
-	}{
-		{
-			name:   "nil patterns",
-			fields: fields{patterns: nil},
-			want:   "",
-		},
-		{
-			name:   "empty patterns",
-			fields: fields{patterns: []string{}},
-			want:   "",
-		},
-		{
-			name:   "one pattern",
-			fields: fields{patterns: []string{"foo"}},
-			want:   "foo",
-		},
-		{
-			name:   "two patterns",
-			fields: fields{patterns: []string{"bar", "foo"}},
-			want:   "bar, foo",
-		},
-	}
-	for _, tt := range tests {
-		f := newFileList(tt.fields.patterns...)
-		if got := f.String(); got != tt.want {
-			t.Errorf("%q. fileList.String() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}
-
-func Test_fileList_Set(t *testing.T) {
-	type fields struct {
-		patterns []string
-	}
-	type args struct {
-		path string
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		args    args
-		want    map[string]struct{}
-		wantErr bool
-	}{
-		{
-			name:    "add empty path",
-			fields:  fields{patterns: nil},
-			args:    args{path: ""},
-			want:    map[string]struct{}{},
-			wantErr: false,
-		},
-		{
-			name:   "add path to nil patterns",
-			fields: fields{patterns: nil},
-			args:   args{path: "foo"},
-			want: map[string]struct{}{
-				"foo": struct{}{},
-			},
-			wantErr: false,
-		},
-		{
-			name:   "add path to empty patterns",
-			fields: fields{patterns: []string{}},
-			args:   args{path: "foo"},
-			want: map[string]struct{}{
-				"foo": struct{}{},
-			},
-			wantErr: false,
-		},
-		{
-			name:   "add path to populated patterns",
-			fields: fields{patterns: []string{"foo"}},
-			args:   args{path: "bar"},
-			want: map[string]struct{}{
-				"foo": struct{}{},
-				"bar": struct{}{},
-			},
-			wantErr: false,
-		},
-	}
-	for _, tt := range tests {
-		f := newFileList(tt.fields.patterns...)
-		if err := f.Set(tt.args.path); (err != nil) != tt.wantErr {
-			t.Errorf("%q. fileList.Set() error = %v, wantErr %v", tt.name, err, tt.wantErr)
-		}
-		if !reflect.DeepEqual(f.patterns, tt.want) {
-			t.Errorf("%q. got state fileList.patterns = %v, want state %v", tt.name, f.patterns, tt.want)
-		}
-	}
-}
-
-func Test_fileList_Contains(t *testing.T) {
-	type fields struct {
-		patterns []string
-	}
-	type args struct {
-		path string
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		args   args
-		want   bool
-	}{
-		{
-			name:   "nil patterns",
-			fields: fields{patterns: nil},
-			args:   args{path: "foo"},
-			want:   false,
-		},
-		{
-			name:   "empty patterns",
-			fields: fields{patterns: nil},
-			args:   args{path: "foo"},
-			want:   false,
-		},
-		{
-			name:   "one pattern, no wildcard, no match",
-			fields: fields{patterns: []string{"foo"}},
-			args:   args{path: "bar"},
-			want:   false,
-		},
-		{
-			name:   "one pattern, no wildcard, match",
-			fields: fields{patterns: []string{"foo"}},
-			args:   args{path: "foo"},
-			want:   true,
-		},
-		{
-			name:   "one pattern, wildcard prefix, match",
-			fields: fields{patterns: []string{"*foo"}},
-			args:   args{path: "foo"},
-			want:   true,
-		},
-		{
-			name:   "one pattern, wildcard suffix, match",
-			fields: fields{patterns: []string{"foo*"}},
-			args:   args{path: "foo"},
-			want:   true,
-		},
-		{
-			name:   "one pattern, wildcard both ends, match",
-			fields: fields{patterns: []string{"*foo*"}},
-			args:   args{path: "foo"},
-			want:   true,
-		},
-		{
-			name:   "default test match 1",
-			fields: fields{patterns: []string{"*_test.go"}},
-			args:   args{path: "foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "default test match 2",
-			fields: fields{patterns: []string{"*_test.go"}},
-			args:   args{path: "bar/foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "default test match 3",
-			fields: fields{patterns: []string{"*_test.go"}},
-			args:   args{path: "/bar/foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "default test match 4",
-			fields: fields{patterns: []string{"*_test.go"}},
-			args:   args{path: "baz/bar/foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "default test match 5",
-			fields: fields{patterns: []string{"*_test.go"}},
-			args:   args{path: "/baz/bar/foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "many patterns, no match",
-			fields: fields{patterns: []string{"*_one.go", "*_two.go"}},
-			args:   args{path: "/baz/bar/foo_test.go"},
-			want:   false,
-		},
-		{
-			name:   "many patterns, match",
-			fields: fields{patterns: []string{"*_one.go", "*_two.go", "*_test.go"}},
-			args:   args{path: "/baz/bar/foo_test.go"},
-			want:   true,
-		},
-		{
-			name:   "sub-folder, match",
-			fields: fields{patterns: []string{"vendor"}},
-			args:   args{path: "/baz/vendor/bar/foo_test.go"},
-			want:   true,
-		},
-	}
-	for _, tt := range tests {
-		f := newFileList(tt.fields.patterns...)
-		if got := f.Contains(tt.args.path); got != tt.want {
-			t.Errorf("%q. fileList.Contains() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/main_test.go b/installer/vendor/github.com/GoASTScanner/gas/main_test.go
deleted file mode 100644
index b47a4b5183..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/main_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package main
-
-import "testing"
-
-func Test_shouldInclude(t *testing.T) {
-	type args struct {
-		path     string
-		excluded *fileList
-	}
-	tests := []struct {
-		name string
-		args args
-		want bool
-	}{
-		{
-			name: "non .go file",
-			args: args{
-				path:     "thing.txt",
-				excluded: newFileList(),
-			},
-			want: false,
-		},
-		{
-			name: ".go file, not excluded",
-			args: args{
-				path:     "thing.go",
-				excluded: newFileList(),
-			},
-			want: true,
-		},
-		{
-			name: ".go file, excluded",
-			args: args{
-				path:     "thing.go",
-				excluded: newFileList("thing.go"),
-			},
-			want: false,
-		},
-	}
-	for _, tt := range tests {
-		if got := shouldInclude(tt.args.path, tt.args.excluded); got != tt.want {
-			t.Errorf("%q. shouldInclude() = %v, want %v", tt.name, got, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/big_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/big_test.go
deleted file mode 100644
index b533e66bba..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/big_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestBigExp(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewUsingBigExp(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"math/big"
-        )
-
-        func main() {
-            z := new(big.Int)
-            x := new(big.Int)
-            x = x.SetUint64(2)
-            y := new(big.Int)
-            y = y.SetUint64(4)
-            m := new(big.Int)
-            m = m.SetUint64(0)
-
-            z = z.Exp(x, y, m)
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "Use of math/big.Int.Exp function")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/bind_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/bind_test.go
deleted file mode 100644
index 16bc389900..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/bind_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestBind0000(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBindsToAllNetworkInterfaces(config))
-
-	issues := gasTestRunner(`
-		package main
-	        import (
-                	"log"
-                	"net"
-        	)
-		func main() {
-			l, err := net.Listen("tcp", "0.0.0.0:2000")
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer l.Close()
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Binds to all network interfaces")
-}
-
-func TestBindEmptyHost(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBindsToAllNetworkInterfaces(config))
-
-	issues := gasTestRunner(`
-		package main
-	        import (
-                	"log"
-                	"net"
-        	)
-		func main() {
-                	l, err := net.Listen("tcp", ":2000")
-			if err != nil {
-				log.Fatal(err)
-			}
-			defer l.Close()
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Binds to all network interfaces")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/blacklist_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/blacklist_test.go
deleted file mode 100644
index 110afd4a10..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/blacklist_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	gas "github.com/GoASTScanner/gas/core"
-	"testing"
-)
-
-const initOnlyImportSrc = `
-package main
-import (
-	_ "crypto/md5"
-	"fmt"
-	"os"
-)
-func main() {
-	for _, arg := range os.Args {
-		fmt.Println(arg)
-	}
-}`
-
-func TestInitOnlyImport(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBlacklist_crypto_md5(config))
-	issues := gasTestRunner(initOnlyImportSrc, analyzer)
-	checkTestResults(t, issues, 0, "")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/errors_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/errors_test.go
deleted file mode 100644
index a0d82c9617..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/errors_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//		 http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestErrorsMulti(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewNoErrorCheck(config))
-
-	issues := gasTestRunner(
-		`package main
-
-		import (
-			"fmt"
-		)
-
-		func test() (int,error) {
-			return 0, nil
-		}
-
-		func main() {
-			v, _ := test()
-			fmt.Println(v)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Errors unhandled")
-}
-
-func TestErrorsSingle(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewNoErrorCheck(config))
-
-	issues := gasTestRunner(
-		`package main
-
-		import (
-			"fmt"
-		)
-
-		func a() error {
-			return fmt.Errorf("This is an error")
-		}
-
-		func b() {
-			fmt.Println("b")
-		}
-
-		func c() string {
-			return fmt.Sprintf("This isn't anything")
-		}
-
-		func main() {
-			_ = a()
-			a()
-			b()
-			_ = c()
-			c()
-		}`, analyzer)
-	checkTestResults(t, issues, 2, "Errors unhandled")
-}
-
-func TestErrorsGood(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewNoErrorCheck(config))
-
-	issues := gasTestRunner(
-		`package main
-
-		import (
-			"fmt"
-		)
-
-		func test() err error {
-			return 0, nil
-		}
-
-		func main() {
-			e := test()
-		}`, analyzer)
-
-	checkTestResults(t, issues, 0, "")
-}
-
-func TestErrorsWhitelisted(t *testing.T) {
-	config := map[string]interface{}{
-		"ignoreNosec": false,
-		"G104": map[string][]string{
-			"compress/zlib": []string{"NewReader"},
-			"io":            []string{"Copy"},
-		},
-	}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewNoErrorCheck(config))
-	source := `package main
-		import (
-			"io"
-			"os"
-			"fmt"
-			"bytes"
-			"compress/zlib"
-		)
-
-		func a() error {
-			return fmt.Errorf("This is an error ok")
-		}
-
-		func main() {
-			// Expect at least one failure
-			_ = a()
-
-			var b bytes.Buffer
-			// Default whitelist
-			nbytes, _ := b.Write([]byte("Hello "))
-			if nbytes <= 0 {
-				os.Exit(1)
-			}
-
-			// Whitelisted via configuration
-			r, _ := zlib.NewReader(&b)
-			io.Copy(os.Stdout, r)
-		}`
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "Errors unhandled")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/fileperms_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/fileperms_test.go
deleted file mode 100644
index 278c29e2b0..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/fileperms_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestChmod(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewFilePerms(config))
-
-	issues := gasTestRunner(`
-		package main
-		import "os"
-		func main() {
-			os.Chmod("/tmp/somefile", 0777)
-			os.Chmod("/tmp/someotherfile", 0600)
-			os.OpenFile("/tmp/thing", os.O_CREATE|os.O_WRONLY, 0666)
-			os.OpenFile("/tmp/thing", os.O_CREATE|os.O_WRONLY, 0600)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 2, "Expect file permissions")
-}
-
-func TestMkdir(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewMkdirPerms(config))
-
-	issues := gasTestRunner(`
-		package main
-		import "os"
-		func main() {
-			os.Mkdir("/tmp/mydir", 0777)
-			os.Mkdir("/tmp/mydir", 0600)
-			os.MkdirAll("/tmp/mydir/mysubidr", 0775)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 2, "Expect directory permissions")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/hardcoded_credentials_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/hardcoded_credentials_test.go
deleted file mode 100644
index 63f3db1378..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/hardcoded_credentials_test.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestHardcoded(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(
-		`
-		package samples
-
-		import "fmt"
-
-		func main() {
-			username := "admin"
-			password := "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardcodedWithEntropy(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(
-		`
-		package samples
-
-		import "fmt"
-
-		func main() {
-			username := "admin"
-			password := "secret"
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 0, "Potential hardcoded credentials")
-}
-
-func TestHardcodedIgnoreEntropy(t *testing.T) {
-	config := map[string]interface{}{
-		"ignoreNosec": false,
-		"G101": map[string]string{
-			"ignore_entropy": "true",
-		},
-	}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(
-		`
-		package samples
-
-		import "fmt"
-
-		func main() {
-			username := "admin"
-			password := "admin"
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardcodedGlobalVar(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(`
-		package samples
-
-		import "fmt"
-
-		var password = "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-
-		func main() {
-			username := "admin"
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardcodedConstant(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(`
-		package samples
-
-		import "fmt"
-
-		const password = "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-
-		func main() {
-			username := "admin"
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardcodedConstantMulti(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-
-	issues := gasTestRunner(`
-		package samples
-
-		import "fmt"
-
-		const (
-			username = "user"
-			password = "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-		)
-
-		func main() {
-			fmt.Println("Doing something with: ", username, password)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardecodedVarsNotAssigned(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-	issues := gasTestRunner(`
-		package main
-		var password string
-		func init() {
-			password = "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-		}`, analyzer)
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
-
-func TestHardcodedConstInteger(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-	issues := gasTestRunner(`
-		package main
-
-		const (
-			ATNStateSomethingElse = 1
-			ATNStateTokenStart = 42
-		)
-		func main() {
-			println(ATNStateTokenStart)
-		}`, analyzer)
-	checkTestResults(t, issues, 0, "Potential hardcoded credentials")
-}
-
-func TestHardcodedConstString(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewHardcodedCredentials(config))
-	issues := gasTestRunner(`
-		package main
-
-		const (
-			ATNStateTokenStart = "f62e5bcda4fae4f82370da0c6f20697b8f8447ef"
-		)
-		func main() {
-			println(ATNStateTokenStart)
-		}`, analyzer)
-	checkTestResults(t, issues, 1, "Potential hardcoded credentials")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/httpoxy_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/httpoxy_test.go
deleted file mode 100644
index b666fdfeb8..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/httpoxy_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestHttpoxy(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBlacklist_net_http_cgi(config))
-
-	issues := gasTestRunner(`
-		package main
-    import (
-        "net/http/cgi"
-				"net/http"
-  	)
-		func main() {
-			cgi.Serve(http.FileServer(http.Dir("/usr/share/doc")))
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Go versions < 1.6.3 are vulnerable to Httpoxy")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/nosec_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/nosec_test.go
deleted file mode 100644
index dbbc107272..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/nosec_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestNosec(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(
-		`package main
-		import (
-			"os"
-			"os/exec"
-		)
-
-	func main() {
-		cmd := exec.Command("sh", "-c", os.Getenv("BLAH")) // #nosec
-		cmd.Run()
-	}`, analyzer)
-
-	checkTestResults(t, issues, 0, "None")
-}
-
-func TestNosecBlock(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(
-		`package main
-		import (
-		"os" 
-		"os/exec"
-	)
-
-	func main() {
-			// #nosec
-			if true {
-				cmd := exec.Command("sh", "-c", os.Getenv("BLAH"))
-				cmd.Run()
-			}
-	}`, analyzer)
-
-	checkTestResults(t, issues, 0, "None")
-}
-
-func TestNosecIgnore(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": true}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(
-		`package main
-
-		import (
-			"os"
-			"os/exec"
-		)
-
-		func main() {
-			cmd := exec.Command("sh", "-c", os.Args[1]) // #nosec
-			cmd.Run()
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Subprocess launching with variable.")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/rand_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/rand_test.go
deleted file mode 100644
index d6de104408..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/rand_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestRandOk(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewWeakRandCheck(config))
-
-	issues := gasTestRunner(
-		`
-		package main 
-
-		import "crypto/rand"
-
-		func main() {
-			good, _ := rand.Read(nil)
-			println(good)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
-
-func TestRandBad(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewWeakRandCheck(config))
-
-	issues := gasTestRunner(
-		`
-		package main
-
-		import "math/rand"
-
-		func main() {
-			bad := rand.Int()
-			println(bad)
-
-		}`, analyzer)
-
-	checkTestResults(t, issues, 1, "Use of weak random number generator (math/rand instead of crypto/rand)")
-}
-
-func TestRandRenamed(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewWeakRandCheck(config))
-
-	issues := gasTestRunner(
-		`
-		package main 
-
-		import (
-			"crypto/rand"
-			mrand "math/rand"
-		)
-
-
-		func main() {
-			good, _ := rand.Read(nil)
-			println(good)
-			i := mrand.Int31()
-			println(i)
-		}`, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/rsa_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/rsa_test.go
deleted file mode 100644
index 9b0b47b6ca..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/rsa_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestRSAKeys(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewWeakKeyStrength(config))
-
-	issues := gasTestRunner(
-		`package main
-
-    import (
-    	"crypto/rand"
-    	"crypto/rsa"
-    	"fmt"
-    )
-
-    func main() {
-
-    	//Generate Private Key
-    	pvk, err := rsa.GenerateKey(rand.Reader, 1024)
-
-    	if err != nil {
-    		fmt.Println(err)
-    	}
-    	fmt.Println(pvk)
-
-    }`, analyzer)
-
-	checkTestResults(t, issues, 1, "RSA keys should")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/sql_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/sql_test.go
deleted file mode 100644
index 8919f7ab2a..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/sql_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestSQLInjectionViaConcatenation(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrConcat(config))
-
-	source := `
-        package main
-        import (
-                "database/sql"
-                //_ "github.com/mattn/go-sqlite3"
-                "os"
-        )
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                rows, err := db.Query("SELECT * FROM foo WHERE name = " + os.Args[1])
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-        `
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "SQL string concatenation")
-}
-
-func TestSQLInjectionViaIntepolation(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrFormat(config))
-
-	source := `
-        package main
-        import (
-                "database/sql"
-                "fmt"
-                "os"
-                //_ "github.com/mattn/go-sqlite3"
-        )
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                q := fmt.Sprintf("SELECT * FROM foo where name = '%s'", os.Args[1])
-                rows, err := db.Query(q)
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-        `
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "SQL string formatting")
-}
-
-func TestSQLInjectionFalsePositiveA(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrConcat(config))
-	analyzer.AddRule(NewSqlStrFormat(config))
-
-	source := `
-
-        package main
-        import (
-                "database/sql"
-                //_ "github.com/mattn/go-sqlite3"
-        )
-
-        var staticQuery = "SELECT * FROM foo WHERE age < 32"
-
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                rows, err := db.Query(staticQuery)
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-
-        `
-	issues := gasTestRunner(source, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
-
-func TestSQLInjectionFalsePositiveB(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrConcat(config))
-	analyzer.AddRule(NewSqlStrFormat(config))
-
-	source := `
-
-        package main
-        import (
-                "database/sql"
-                //_ "github.com/mattn/go-sqlite3"
-        )
-
-        var staticQuery = "SELECT * FROM foo WHERE age < 32"
-
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                rows, err := db.Query(staticQuery)
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-
-        `
-	issues := gasTestRunner(source, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
-
-func TestSQLInjectionFalsePositiveC(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrConcat(config))
-	analyzer.AddRule(NewSqlStrFormat(config))
-
-	source := `
-
-        package main
-        import (
-                "database/sql"
-                //_ "github.com/mattn/go-sqlite3"
-        )
-
-        var staticQuery = "SELECT * FROM foo WHERE age < "
-
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                rows, err := db.Query(staticQuery + "32")
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-
-        `
-	issues := gasTestRunner(source, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
-
-func TestSQLInjectionFalsePositiveD(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSqlStrConcat(config))
-	analyzer.AddRule(NewSqlStrFormat(config))
-
-	source := `
-
-        package main
-        import (
-                "database/sql"
-                //_ "github.com/mattn/go-sqlite3"
-        )
-
-				const age = "32"
-        var staticQuery = "SELECT * FROM foo WHERE age < "
-
-        func main(){
-                db, err := sql.Open("sqlite3", ":memory:")
-                if err != nil {
-                        panic(err)
-                }
-                rows, err := db.Query(staticQuery + age)
-                if err != nil {
-                        panic(err)
-                }
-                defer rows.Close()
-        }
-
-        `
-	issues := gasTestRunner(source, analyzer)
-
-	checkTestResults(t, issues, 0, "Not expected to match")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/subproc_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/subproc_test.go
deleted file mode 100644
index 13c79df454..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/subproc_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestSubprocess(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(`
-    package main
-
-    import (
-    	"log"
-    	"os/exec"
-    )
-
-    func main() {
-			val := "/bin/" + "sleep"
-    	cmd := exec.Command(val, "5")
-    	err := cmd.Start()
-    	if err != nil {
-    		log.Fatal(err)
-    	}
-    	log.Printf("Waiting for command to finish...")
-    	err = cmd.Wait()
-    	log.Printf("Command finished with error: %v", err)
-    }`, analyzer)
-
-	checkTestResults(t, issues, 1, "Subprocess launching should be audited.")
-}
-
-func TestSubprocessVar(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(`
-    package main
-
-    import (
-    	"log"
-			"os"
-    	"os/exec"
-    )
-
-    func main() {
-      run := "sleep" + os.Getenv("SOMETHING")
-    	cmd := exec.Command(run, "5")
-    	err := cmd.Start()
-    	if err != nil {
-    		log.Fatal(err)
-    	}
-    	log.Printf("Waiting for command to finish...")
-    	err = cmd.Wait()
-    	log.Printf("Command finished with error: %v", err)
-    }`, analyzer)
-
-	checkTestResults(t, issues, 1, "Subprocess launching with variable.")
-}
-
-func TestSubprocessPath(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(`
-    package main
-
-    import (
-    	"log"
-    	"os/exec"
-    )
-
-    func main() {
-    	cmd := exec.Command("sleep", "5")
-    	err := cmd.Start()
-    	if err != nil {
-    		log.Fatal(err)
-    	}
-    	log.Printf("Waiting for command to finish...")
-    	err = cmd.Wait()
-    	log.Printf("Command finished with error: %v", err)
-    }`, analyzer)
-
-	checkTestResults(t, issues, 1, "Subprocess launching with partial path.")
-}
-
-func TestSubprocessSyscall(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewSubproc(config))
-
-	issues := gasTestRunner(`
-    package main
-
-    import (
-       "syscall"
-    )
-
-    func main() {
-    	syscall.Exec("/bin/cat", []string{ "/etc/passwd" }, nil)
-    }`, analyzer)
-
-	checkTestResults(t, issues, 1, "Subprocess launching should be audited.")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/tempfiles_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/tempfiles_test.go
deleted file mode 100644
index 51709e8fbb..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/tempfiles_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestTempfiles(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBadTempFile(config))
-
-	source := `
-        package samples
-
-        import (
-        	"io/ioutil"
-        	"os"
-        )
-
-        func main() {
-
-        	file1, _ := os.Create("/tmp/demo1")
-        	defer file1.Close()
-
-        	ioutil.WriteFile("/tmp/demo2", []byte("This is some data"), 0644)
-        }
-        `
-
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 2, "shared tmp directory")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/templates_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/templates_test.go
deleted file mode 100644
index 83dccf1f38..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/templates_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestTemplateCheckSafe(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewTemplateCheck(config))
-
-	source := `
-  package samples
-
-  import (
-    "html/template"
-    "os"
-  )
-
-  const tmpl = ""
-
-  func main() {
-    t := template.Must(template.New("ex").Parse(tmpl))
-    v := map[string]interface{}{
-      "Title":    "Test <b>World</b>",
-      "Body":     template.HTML("<script>alert(1)</script>"),
-    }
-    t.Execute(os.Stdout, v)
-  }`
-
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 0, "this method will not auto-escape HTML. Verify data is well formed")
-}
-
-func TestTemplateCheckBadHTML(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewTemplateCheck(config))
-
-	source := `
-  package samples
-
-  import (
-    "html/template"
-    "os"
-  )
-
-  const tmpl = ""
-
-  func main() {
-    a := "something from another place"
-    t := template.Must(template.New("ex").Parse(tmpl))
-    v := map[string]interface{}{
-      "Title":    "Test <b>World</b>",
-      "Body":     template.HTML(a),
-    }
-    t.Execute(os.Stdout, v)
-  }`
-
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "this method will not auto-escape HTML. Verify data is well formed")
-}
-
-func TestTemplateCheckBadJS(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewTemplateCheck(config))
-
-	source := `
-  package samples
-
-  import (
-    "html/template"
-    "os"
-  )
-
-  const tmpl = ""
-
-  func main() {
-    a := "something from another place"
-    t := template.Must(template.New("ex").Parse(tmpl))
-    v := map[string]interface{}{
-      "Title":    "Test <b>World</b>",
-      "Body":     template.JS(a),
-    }
-    t.Execute(os.Stdout, v)
-  }`
-
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "this method will not auto-escape HTML. Verify data is well formed")
-}
-
-func TestTemplateCheckBadURL(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewTemplateCheck(config))
-
-	source := `
-  package samples
-
-  import (
-    "html/template"
-    "os"
-  )
-
-  const tmpl = ""
-
-  func main() {
-    a := "something from another place"
-    t := template.Must(template.New("ex").Parse(tmpl))
-    v := map[string]interface{}{
-      "Title":    "Test <b>World</b>",
-      "Body":     template.URL(a),
-    }
-    t.Execute(os.Stdout, v)
-  }`
-
-	issues := gasTestRunner(source, analyzer)
-	checkTestResults(t, issues, 1, "this method will not auto-escape HTML. Verify data is well formed")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/tls_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/tls_test.go
deleted file mode 100644
index 9b215a3cef..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/tls_test.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestInsecureSkipVerify(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewModernTlsCheck(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"crypto/tls"
-        	"fmt"
-        	"net/http"
-        )
-
-        func main() {
-        	tr := &http.Transport{
-        		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-        	}
-        	client := &http.Client{Transport: tr}
-        	_, err := client.Get("https://golang.org/")
-        	if err != nil {
-        		fmt.Println(err)
-        	}
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "TLS InsecureSkipVerify set true")
-}
-
-func TestInsecureMinVersion(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewModernTlsCheck(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"crypto/tls"
-        	"fmt"
-        	"net/http"
-        )
-
-        func main() {
-        	tr := &http.Transport{
-        		TLSClientConfig: &tls.Config{MinVersion: 0},
-        	}
-        	client := &http.Client{Transport: tr}
-        	_, err := client.Get("https://golang.org/")
-        	if err != nil {
-        		fmt.Println(err)
-        	}
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "TLS MinVersion too low")
-}
-
-func TestInsecureMaxVersion(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewModernTlsCheck(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"crypto/tls"
-        	"fmt"
-        	"net/http"
-        )
-
-        func main() {
-        	tr := &http.Transport{
-        		TLSClientConfig: &tls.Config{MaxVersion: 0},
-        	}
-        	client := &http.Client{Transport: tr}
-        	_, err := client.Get("https://golang.org/")
-        	if err != nil {
-        		fmt.Println(err)
-        	}
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "TLS MaxVersion too low")
-}
-
-func TestInsecureCipherSuite(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewModernTlsCheck(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"crypto/tls"
-        	"fmt"
-        	"net/http"
-        )
-
-        func main() {
-        	tr := &http.Transport{
-        		TLSClientConfig: &tls.Config{CipherSuites: []uint16{
-                                tls.TLS_RSA_WITH_RC4_128_SHA,
-                                tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,
-                                },},
-        	}
-        	client := &http.Client{Transport: tr}
-        	_, err := client.Get("https://golang.org/")
-        	if err != nil {
-        		fmt.Println(err)
-        	}
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "TLS Bad Cipher Suite: TLS_RSA_WITH_RC4_128_SHA")
-}
-
-func TestPreferServerCipherSuites(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewModernTlsCheck(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"crypto/tls"
-        	"fmt"
-        	"net/http"
-        )
-
-        func main() {
-        	tr := &http.Transport{
-        		TLSClientConfig: &tls.Config{PreferServerCipherSuites: false},
-        	}
-        	client := &http.Client{Transport: tr}
-        	_, err := client.Get("https://golang.org/")
-        	if err != nil {
-        		fmt.Println(err)
-        	}
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 1, "TLS PreferServerCipherSuites set false")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/unsafe_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/unsafe_test.go
deleted file mode 100644
index f8d7787833..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/unsafe_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestUnsafe(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewUsingUnsafe(config))
-
-	issues := gasTestRunner(`
-        package main
-
-        import (
-        	"fmt"
-        	"unsafe"
-        )
-
-        type Fake struct{}
-
-        func (Fake) Good() {}
-
-        func main() {
-        	unsafeM := Fake{}
-        	unsafeM.Good()
-        	intArray := [...]int{1, 2}
-        	fmt.Printf("\nintArray: %v\n", intArray)
-        	intPtr := &intArray[0]
-        	fmt.Printf("\nintPtr=%p, *intPtr=%d.\n", intPtr, *intPtr)
-        	addressHolder := uintptr(unsafe.Pointer(intPtr)) + unsafe.Sizeof(intArray[0])
-        	intPtr = (*int)(unsafe.Pointer(addressHolder))
-        	fmt.Printf("\nintPtr=%p, *intPtr=%d.\n\n", intPtr, *intPtr)
-        }
-        `, analyzer)
-
-	checkTestResults(t, issues, 3, "Use of unsafe calls")
-
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/utils_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/utils_test.go
deleted file mode 100644
index 48fa36f425..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/utils_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"strings"
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func gasTestRunner(source string, analyzer gas.Analyzer) []*gas.Issue {
-	analyzer.ProcessSource("dummy.go", source)
-	return analyzer.Issues
-}
-
-func checkTestResults(t *testing.T, issues []*gas.Issue, expected int, msg string) {
-	found := len(issues)
-	if found != expected {
-		t.Errorf("Found %d issues, expected %d", found, expected)
-	}
-
-	for _, issue := range issues {
-		if !strings.Contains(issue.What, msg) {
-			t.Errorf("Unexpected issue identified: %s", issue.What)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/rules/weakcrypto_test.go b/installer/vendor/github.com/GoASTScanner/gas/rules/weakcrypto_test.go
deleted file mode 100644
index 1305c33c68..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/rules/weakcrypto_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// (c) Copyright 2016 Hewlett Packard Enterprise Development LP
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package rules
-
-import (
-	"testing"
-
-	gas "github.com/GoASTScanner/gas/core"
-)
-
-func TestMD5(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBlacklist_crypto_md5(config))
-	analyzer.AddRule(NewUsesWeakCryptography(config))
-
-	issues := gasTestRunner(`
-                package main
-                import (
-                	"crypto/md5"
-                	"fmt"
-                	"os"
-                )
-                func main() {
-                	for _, arg := range os.Args {
-                		fmt.Printf("%x - %s\n", md5.Sum([]byte(arg)), arg)
-                	}
-                }
-                `, analyzer)
-	checkTestResults(t, issues, 2, "weak cryptographic")
-}
-
-func TestDES(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBlacklist_crypto_des(config))
-	analyzer.AddRule(NewUsesWeakCryptography(config))
-
-	issues := gasTestRunner(`
-                package main
-
-                import (
-                	"crypto/cipher"
-                	"crypto/des"
-                	"crypto/rand"
-                	"encoding/hex"
-                	"fmt"
-                	"io"
-                )
-
-                func main() {
-                	block, err := des.NewCipher([]byte("sekritz"))
-                	if err != nil {
-                		panic(err)
-                	}
-
-                	plaintext := []byte("I CAN HAZ SEKRIT MSG PLZ")
-                	ciphertext := make([]byte, des.BlockSize+len(plaintext))
-                	iv := ciphertext[:des.BlockSize]
-                	if _, err := io.ReadFull(rand.Reader, iv); err != nil {
-                		panic(err)
-                	}
-
-                	stream := cipher.NewCFBEncrypter(block, iv)
-                	stream.XORKeyStream(ciphertext[des.BlockSize:], plaintext)
-                	fmt.Println("Secret message is: %s", hex.EncodeToString(ciphertext))
-                }
-                `, analyzer)
-
-	checkTestResults(t, issues, 2, "weak cryptographic")
-}
-
-func TestRC4(t *testing.T) {
-	config := map[string]interface{}{"ignoreNosec": false}
-	analyzer := gas.NewAnalyzer(config, nil)
-	analyzer.AddRule(NewBlacklist_crypto_rc4(config))
-	analyzer.AddRule(NewUsesWeakCryptography(config))
-
-	issues := gasTestRunner(`
-                package main
-
-                import (
-                	"crypto/rc4"
-                	"encoding/hex"
-                	"fmt"
-                )
-
-                func main() {
-                	cipher, err := rc4.NewCipher([]byte("sekritz"))
-                	if err != nil {
-                		panic(err)
-                	}
-
-                	plaintext := []byte("I CAN HAZ SEKRIT MSG PLZ")
-                	ciphertext := make([]byte, len(plaintext))
-                	cipher.XORKeyStream(ciphertext, plaintext)
-                	fmt.Println("Secret message is: %s", hex.EncodeToString(ciphertext))
-                }
-                `, analyzer)
-
-	checkTestResults(t, issues, 2, "weak cryptographic")
-}
diff --git a/installer/vendor/github.com/GoASTScanner/gas/vendor.conf b/installer/vendor/github.com/GoASTScanner/gas/vendor.conf
deleted file mode 100644
index 5f5b814f43..0000000000
--- a/installer/vendor/github.com/GoASTScanner/gas/vendor.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-# package
-github.com/GoAstScanner/gas
-
-# import
-github.com/GoASTScanner/gas	cc52ef5
-github.com/nbutton23/zxcvbn-go	a22cb81
-github.com/ryanuber/go-glob	v0.1
diff --git a/installer/vendor/github.com/Masterminds/semver/.travis.yml b/installer/vendor/github.com/Masterminds/semver/.travis.yml
deleted file mode 100644
index fa92a5a326..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/.travis.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-language: go
-
-go:
-  - 1.6
-  - 1.7
-  - tip
-
-# Setting sudo access to false will let Travis CI use containers rather than
-# VMs to run the tests. For more details see:
-# - http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-# - http://docs.travis-ci.com/user/workers/standard-infrastructure/
-sudo: false
-
-script:
-  - make setup
-  - make test
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/06e3328629952dabe3e0
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
diff --git a/installer/vendor/github.com/Masterminds/semver/CHANGELOG.md b/installer/vendor/github.com/Masterminds/semver/CHANGELOG.md
deleted file mode 100644
index 25550675e9..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/CHANGELOG.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Release 1.x.x (xxxx-xx-xx)
-
-- Issue #9: Speed up version comparison performance (thanks @sdboyer)
-- Issue #8: Added benchmarks (thanks @sdboyer)
-
-# Release 1.1.0 (2015-03-11)
-
-- Issue #2: Implemented validation to provide reasons a versions failed a
-  constraint.
-
-# Release 1.0.1 (2015-12-31)
-
-- Fixed #1: * constraint failing on valid versions.
-
-# Release 1.0.0 (2015-10-20)
-
-- Initial release
diff --git a/installer/vendor/github.com/Masterminds/semver/Makefile b/installer/vendor/github.com/Masterminds/semver/Makefile
deleted file mode 100644
index a7a1b4e36d..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-.PHONY: setup
-setup:
-	go get -u gopkg.in/alecthomas/gometalinter.v1
-	gometalinter.v1 --install
-
-.PHONY: test
-test: validate lint
-	@echo "==> Running tests"
-	go test -v
-
-.PHONY: validate
-validate:
-	@echo "==> Running static validations"
-	@gometalinter.v1 \
-	  --disable-all \
-	  --enable deadcode \
-	  --severity deadcode:error \
-	  --enable gofmt \
-	  --enable gosimple \
-	  --enable ineffassign \
-	  --enable misspell \
-	  --enable vet \
-	  --tests \
-	  --vendor \
-	  --deadline 60s \
-	  ./... || exit_code=1
-
-.PHONY: lint
-lint:
-	@echo "==> Running linters"
-	@gometalinter.v1 \
-	  --disable-all \
-	  --enable golint \
-	  --vendor \
-	  --deadline 60s \
-	  ./... || :
diff --git a/installer/vendor/github.com/Masterminds/semver/README.md b/installer/vendor/github.com/Masterminds/semver/README.md
deleted file mode 100644
index aa133eac57..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/README.md
+++ /dev/null
@@ -1,146 +0,0 @@
-# SemVer
-
-The `semver` package provides the ability to work with [Semantic Versions](http://semver.org) in Go. Specifically it provides the ability to:
-
-* Parse semantic versions
-* Sort semantic versions
-* Check if a semantic version fits within a set of constraints
-* Optionally work with a `v` prefix
-
-[![Build Status](https://travis-ci.org/Masterminds/semver.svg)](https://travis-ci.org/Masterminds/semver) [![Build status](https://ci.appveyor.com/api/projects/status/jfk66lib7hb985k8/branch/master?svg=true&passingText=windows%20build%20passing&failingText=windows%20build%20failing)](https://ci.appveyor.com/project/mattfarina/semver/branch/master) [![GoDoc](https://godoc.org/github.com/Masterminds/semver?status.png)](https://godoc.org/github.com/Masterminds/semver) [![Go Report Card](http://goreportcard.com/badge/Masterminds/semver)](http://goreportcard.com/report/Masterminds/semver)
-
-## Parsing Semantic Versions
-
-To parse a semantic version use the `NewVersion` function. For example,
-
-    v, err := semver.NewVersion("1.2.3-beta.1+build345")
-
-If there is an error the version wasn't parseable. The version object has methods
-to get the parts of the version, compare it to other versions, convert the
-version back into a string, and get the original string. For more details
-please see the [documentation](https://godoc.org/github.com/Masterminds/semver).
-
-## Sorting Semantic Versions
-
-A set of versions can be sorted using the [`sort`](https://golang.org/pkg/sort/)
-package from the standard library. For example,
-
-    raw := []string{"1.2.3", "1.0", "1.3", "2", "0.4.2",}
-    vs := make([]*semver.Version, len(raw))
-	for i, r := range raw {
-		v, err := semver.NewVersion(r)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		vs[i] = v
-	}
-
-	sort.Sort(semver.Collection(vs))
-
-## Checking Version Constraints
-
-Checking a version against version constraints is one of the most featureful
-parts of the package.
-
-    c, err := semver.NewConstraint(">= 1.2.3")
-    if err != nil {
-        // Handle constraint not being parseable.
-    }
-
-    v, _ := semver.NewVersion("1.3")
-    if err != nil {
-        // Handle version not being parseable.
-    }
-    // Check if the version meets the constraints. The a variable will be true.
-    a := c.Check(v)
-
-## Basic Comparisons
-
-There are two elements to the comparisons. First, a comparison string is a list
-of comma separated and comparisons. These are then separated by || separated or
-comparisons. For example, `">= 1.2, < 3.0.0 || >= 4.2.3"` is looking for a
-comparison that's greater than or equal to 1.2 and less than 3.0.0 or is
-greater than or equal to 4.2.3.
-
-The basic comparisons are:
-
-* `=`: equal (aliased to no operator)
-* `!=`: not equal
-* `>`: greater than
-* `<`: less than
-* `>=`: greater than or equal to
-* `<=`: less than or equal to
-
-## Hyphen Range Comparisons
-
-There are multiple methods to handle ranges and the first is hyphens ranges.
-These look like:
-
-* `1.2 - 1.4.5` which is equivalent to `>= 1.2, <= 1.4.5`
-* `2.3.4 - 4.5` which is equivalent to `>= 2.3.4, <= 4.5`
-
-## Wildcards In Comparisons
-
-The `x`, `X`, and `*` characters can be used as a wildcard character. This works
-for all comparison operators. When used on the `=` operator it falls
-back to the pack level comparison (see tilde below). For example,
-
-* `1.2.x` is equivalent to `>= 1.2.0, < 1.3.0`
-* `>= 1.2.x` is equivalent to `>= 1.2.0`
-* `<= 2.x` is equivalent to `<= 3`
-* `*` is equivalent to `>= 0.0.0`
-
-## Tilde Range Comparisons (Patch)
-
-The tilde (`~`) comparison operator is for patch level ranges when a minor
-version is specified and major level changes when the minor number is missing.
-For example,
-
-* `~1.2.3` is equivalent to `>= 1.2.3, < 1.3.0`
-* `~1` is equivalent to `>= 1, < 2`
-* `~2.3` is equivalent to `>= 2.3, < 2.4`
-* `~1.2.x` is equivalent to `>= 1.2.0, < 1.3.0`
-* `~1.x` is equivalent to `>= 1, < 2`
-
-## Caret Range Comparisons (Major)
-
-The caret (`^`) comparison operator is for major level changes. This is useful
-when comparisons of API versions as a major change is API breaking. For example,
-
-* `^1.2.3` is equivalent to `>= 1.2.3, < 2.0.0`
-* `^1.2.x` is equivalent to `>= 1.2.0, < 2.0.0`
-* `^2.3` is equivalent to `>= 2.3, < 3`
-* `^2.x` is equivalent to `>= 2.0.0, < 3`
-
-# Validation
-
-In addition to testing a version against a constraint, a version can be validated
-against a constraint. When validation fails a slice of errors containing why a
-version didn't meet the constraint is returned. For example,
-
-    c, err := semver.NewConstraint("<= 1.2.3, >= 1.4")
-    if err != nil {
-        // Handle constraint not being parseable.
-    }
-
-    v, _ := semver.NewVersion("1.3")
-    if err != nil {
-        // Handle version not being parseable.
-    }
-
-    // Validate a version against a constraint.
-    a, msgs := c.Validate(v)
-    // a is false
-    for _, m := range msgs {
-        fmt.Println(m)
-
-        // Loops over the errors which would read
-        // "1.3 is greater than 1.2.3"
-        // "1.3 is less than 1.4"
-    }
-
-# Contribute
-
-If you find an issue or want to contribute please file an [issue](https://github.com/Masterminds/semver/issues)
-or [create a pull request](https://github.com/Masterminds/semver/pulls).
diff --git a/installer/vendor/github.com/Masterminds/semver/appveyor.yml b/installer/vendor/github.com/Masterminds/semver/appveyor.yml
deleted file mode 100644
index 08d6070875..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/appveyor.yml
+++ /dev/null
@@ -1,44 +0,0 @@
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\Masterminds\semver
-shallow_clone: true
-
-environment:
-  GOPATH: C:\gopath
-
-platform:
-  - x64
-
-install:
-  - go version
-  - go env
-  - go get -u gopkg.in/alecthomas/gometalinter.v1
-  - set PATH=%PATH%;%GOPATH%\bin
-  - gometalinter.v1.exe --install
-
-build_script:
-  - go install -v ./...
-
-test_script:
-  - "gometalinter.v1 \
-    --disable-all \
-    --enable deadcode \
-    --severity deadcode:error \
-    --enable gofmt \
-    --enable gosimple \
-    --enable ineffassign \
-    --enable misspell \
-    --enable vet \
-    --tests \
-    --vendor \
-    --deadline 60s \
-    ./... || cmd /C EXIT 0"
-  - "gometalinter.v1 \
-    --disable-all \
-    --enable golint \
-    --vendor \
-    --deadline 60s \
-    ./... || cmd /C EXIT 0"
-  - go test -v
-
-deploy: off
diff --git a/installer/vendor/github.com/Masterminds/semver/benchmark_test.go b/installer/vendor/github.com/Masterminds/semver/benchmark_test.go
deleted file mode 100644
index 5a76f6a934..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/benchmark_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package semver
-
-import "testing"
-
-func init() {
-	// disable constraint and version creation caching
-	CacheConstraints = false
-	CacheVersions = false
-}
-
-var (
-	rc1 = rangeConstraint{
-		min:        newV(1, 5, 0),
-		max:        newV(2, 0, 0),
-		includeMax: true,
-	}
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-	rc3 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc4 = rangeConstraint{
-		min: newV(1, 7, 0),
-		max: newV(4, 0, 0),
-	}
-	rc5 = rangeConstraint{
-		min: newV(2, 7, 0),
-		max: newV(3, 0, 0),
-	}
-	rc6 = rangeConstraint{
-		min: newV(3, 0, 1),
-		max: newV(3, 0, 4),
-	}
-	rc7 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(1, 2, 0),
-	}
-	// Two fully non-overlapping unions
-	u1 = rc1.Union(rc7)
-	u2 = rc5.Union(rc6)
-)
-
-/* Constraint creation benchmarks */
-
-func benchNewConstraint(c string, b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		NewConstraint(c)
-	}
-}
-
-func BenchmarkNewConstraintUnary(b *testing.B) {
-	benchNewConstraint("=2.0", b)
-}
-
-func BenchmarkNewConstraintTilde(b *testing.B) {
-	benchNewConstraint("~2.0.0", b)
-}
-
-func BenchmarkNewConstraintCaret(b *testing.B) {
-	benchNewConstraint("^2.0.0", b)
-}
-
-func BenchmarkNewConstraintWildcard(b *testing.B) {
-	benchNewConstraint("1.x", b)
-}
-
-func BenchmarkNewConstraintRange(b *testing.B) {
-	benchNewConstraint(">=2.1.x, <3.1.0", b)
-}
-
-func BenchmarkNewConstraintUnion(b *testing.B) {
-	benchNewConstraint("~2.0.0 || =3.1.0", b)
-}
-
-/* Validate benchmarks, including fails */
-
-func benchValidateVersion(c, v string, b *testing.B) {
-	version, _ := NewVersion(v)
-	constraint, _ := NewConstraint(c)
-
-	for i := 0; i < b.N; i++ {
-		constraint.Matches(version)
-	}
-}
-
-func BenchmarkValidateVersionUnary(b *testing.B) {
-	benchValidateVersion("=2.0", "2.0.0", b)
-}
-
-func BenchmarkValidateVersionUnaryFail(b *testing.B) {
-	benchValidateVersion("=2.0", "2.0.1", b)
-}
-
-func BenchmarkValidateVersionTilde(b *testing.B) {
-	benchValidateVersion("~2.0.0", "2.0.5", b)
-}
-
-func BenchmarkValidateVersionTildeFail(b *testing.B) {
-	benchValidateVersion("~2.0.0", "1.0.5", b)
-}
-
-func BenchmarkValidateVersionCaret(b *testing.B) {
-	benchValidateVersion("^2.0.0", "2.1.0", b)
-}
-
-func BenchmarkValidateVersionCaretFail(b *testing.B) {
-	benchValidateVersion("^2.0.0", "4.1.0", b)
-}
-
-func BenchmarkValidateVersionWildcard(b *testing.B) {
-	benchValidateVersion("1.x", "1.4.0", b)
-}
-
-func BenchmarkValidateVersionWildcardFail(b *testing.B) {
-	benchValidateVersion("1.x", "2.4.0", b)
-}
-
-func BenchmarkValidateVersionRange(b *testing.B) {
-	benchValidateVersion(">=2.1.x, <3.1.0", "2.4.5", b)
-}
-
-func BenchmarkValidateVersionRangeFail(b *testing.B) {
-	benchValidateVersion(">=2.1.x, <3.1.0", "1.4.5", b)
-}
-
-func BenchmarkValidateVersionUnion(b *testing.B) {
-	benchValidateVersion("~2.0.0 || =3.1.0", "3.1.0", b)
-}
-
-func BenchmarkValidateVersionUnionFail(b *testing.B) {
-	benchValidateVersion("~2.0.0 || =3.1.0", "3.1.1", b)
-}
-
-/* Version creation benchmarks */
-
-func benchNewVersion(v string, b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		NewVersion(v)
-	}
-}
-
-func BenchmarkNewVersionSimple(b *testing.B) {
-	benchNewVersion("1.0.0", b)
-}
-
-func BenchmarkNewVersionPre(b *testing.B) {
-	benchNewVersion("1.0.0-alpha", b)
-}
-
-func BenchmarkNewVersionMeta(b *testing.B) {
-	benchNewVersion("1.0.0+metadata", b)
-}
-
-func BenchmarkNewVersionMetaDash(b *testing.B) {
-	benchNewVersion("1.0.0+metadata-dash", b)
-}
-
-/* Union benchmarks */
-
-func BenchmarkAdjacentRangeUnion(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Union(rc1, rc2)
-	}
-}
-
-func BenchmarkAdjacentRangeUnionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc1.Union(rc2)
-	}
-}
-
-func BenchmarkDisjointRangeUnion(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Union(rc2, rc3)
-	}
-}
-
-func BenchmarkDisjointRangeUnionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc2.Union(rc3)
-	}
-}
-
-func BenchmarkOverlappingRangeUnion(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Union(rc1, rc4)
-	}
-}
-
-func BenchmarkOverlappingRangeUnionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc1.Union(rc4)
-	}
-}
-
-func BenchmarkUnionUnion(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Union(u1, u2)
-	}
-}
-
-func BenchmarkUnionUnionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		u1.Union(u2)
-	}
-}
-
-/* Intersection benchmarks */
-
-func BenchmarkSubsetRangeIntersection(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Intersection(rc2, rc4)
-	}
-}
-
-func BenchmarkSubsetRangeIntersectionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc2.Intersect(rc4)
-	}
-}
-
-func BenchmarkDisjointRangeIntersection(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Intersection(rc2, rc3)
-	}
-}
-
-func BenchmarkDisjointRangeIntersectionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc2.Intersect(rc3)
-	}
-}
-
-func BenchmarkOverlappingRangeIntersection(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Intersection(rc1, rc4)
-	}
-}
-
-func BenchmarkOverlappingRangeIntersectionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		rc1.Intersect(rc4)
-	}
-}
-
-func BenchmarkUnionIntersection(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Intersection(u1, u2)
-	}
-}
-
-func BenchmarkUnionIntersectionMethod(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		u1.Intersect(u2)
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/semver/collection_test.go b/installer/vendor/github.com/Masterminds/semver/collection_test.go
deleted file mode 100644
index a1d745f476..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/collection_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package semver
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-)
-
-func TestCollection(t *testing.T) {
-	raw := []string{
-		"1.2.3",
-		"1.0",
-		"1.3",
-		"2",
-		"0.4.2",
-	}
-
-	vs := make([]Version, len(raw))
-	for i, r := range raw {
-		v, err := NewVersion(r)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		vs[i] = v
-	}
-
-	sort.Sort(Collection(vs))
-
-	e := []string{
-		"0.4.2",
-		"1.0.0",
-		"1.2.3",
-		"1.3.0",
-		"2.0.0",
-	}
-
-	a := make([]string, len(vs))
-	for i, v := range vs {
-		a[i] = v.String()
-	}
-
-	if !reflect.DeepEqual(a, e) {
-		t.Error("Sorting Collection failed")
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/semver/constraints_test.go b/installer/vendor/github.com/Masterminds/semver/constraints_test.go
deleted file mode 100644
index cb77c89d61..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/constraints_test.go
+++ /dev/null
@@ -1,712 +0,0 @@
-package semver
-
-import "testing"
-
-func TestParseConstraint(t *testing.T) {
-	tests := []struct {
-		in  string
-		c   Constraint
-		err bool
-	}{
-		{"*", Any(), false},
-		{">= 1.2", rangeConstraint{
-			min:        newV(1, 2, 0),
-			max:        Version{special: infiniteVersion},
-			includeMin: true,
-		}, false},
-		{"1.0", newV(1, 0, 0), false},
-		{"foo", nil, true},
-		{"<= 1.2", rangeConstraint{
-			min:        Version{special: zeroVersion},
-			max:        newV(1, 2, 0),
-			includeMax: true,
-		}, false},
-		{"=< 1.2", rangeConstraint{
-			min:        Version{special: zeroVersion},
-			max:        newV(1, 2, 0),
-			includeMax: true,
-		}, false},
-		{"=> 1.2", rangeConstraint{
-			min:        newV(1, 2, 0),
-			max:        Version{special: infiniteVersion},
-			includeMin: true,
-		}, false},
-		{"v1.2", newV(1, 2, 0), false},
-		{"=1.5", newV(1, 5, 0), false},
-		{"> 1.3", rangeConstraint{
-			min: newV(1, 3, 0),
-			max: Version{special: infiniteVersion},
-		}, false},
-		{"< 1.4.1", rangeConstraint{
-			min: Version{special: zeroVersion},
-			max: newV(1, 4, 1),
-		}, false},
-		{"~1.1.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(1, 2, 0),
-			includeMin: true,
-			includeMax: false,
-		}, false},
-		{"^1.1.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-			includeMax: false,
-		}, false},
-		{"^1.1.0-12-abc123", rangeConstraint{
-			min:        Version{major: 1, minor: 1, patch: 0, pre: "12-abc123"},
-			max:        newV(2, 0, 0),
-			includeMin: true,
-			includeMax: false,
-		}, false},
-	}
-
-	for _, tc := range tests {
-		c, err := parseConstraint(tc.in, false)
-		if tc.err && err == nil {
-			t.Errorf("Expected error for %s didn't occur", tc.in)
-		} else if !tc.err && err != nil {
-			t.Errorf("Unexpected error %q for %s", err, tc.in)
-		}
-
-		// If an error was expected continue the loop and don't try the other
-		// tests as they will cause errors.
-		if tc.err {
-			continue
-		}
-
-		if !constraintEq(tc.c, c) {
-			t.Errorf("%q produced constraint %q, but expected %q", tc.in, c, tc.c)
-		}
-	}
-}
-
-func constraintEq(c1, c2 Constraint) bool {
-	switch tc1 := c1.(type) {
-	case any:
-		if _, ok := c2.(any); !ok {
-			return false
-		}
-		return true
-	case none:
-		if _, ok := c2.(none); !ok {
-			return false
-		}
-		return true
-	case Version:
-		if tc2, ok := c2.(Version); ok {
-			return tc1.Equal(tc2)
-		}
-		return false
-	case rangeConstraint:
-		if tc2, ok := c2.(rangeConstraint); ok {
-			if len(tc1.excl) != len(tc2.excl) {
-				return false
-			}
-
-			if !tc1.minIsZero() {
-				if !(tc1.includeMin == tc2.includeMin && tc1.min.Equal(tc2.min)) {
-					return false
-				}
-			} else if !tc2.minIsZero() {
-				return false
-			}
-
-			if !tc1.maxIsInf() {
-				if !(tc1.includeMax == tc2.includeMax && tc1.max.Equal(tc2.max)) {
-					return false
-				}
-			} else if !tc2.maxIsInf() {
-				return false
-			}
-
-			for k, e := range tc1.excl {
-				if !e.Equal(tc2.excl[k]) {
-					return false
-				}
-			}
-			return true
-		}
-		return false
-	case unionConstraint:
-		if tc2, ok := c2.(unionConstraint); ok {
-			if len(tc1) != len(tc2) {
-				return false
-			}
-
-			for k, c := range tc1 {
-				if !constraintEq(c, tc2[k]) {
-					return false
-				}
-			}
-			return true
-		}
-		return false
-	}
-
-	panic("unknown type")
-}
-
-// newV is a helper to create a new Version object.
-func newV(major, minor, patch uint64) Version {
-	return Version{
-		major: major,
-		minor: minor,
-		patch: patch,
-	}
-}
-
-func TestConstraintCheck(t *testing.T) {
-	tests := []struct {
-		constraint string
-		version    string
-		check      bool
-	}{
-		{"= 2.0", "1.2.3", false},
-		{"= 2.0", "2.0.0", true},
-		{"4.1", "4.1.0", true},
-		{"!=4.1", "4.1.0", false},
-		{"!=4.1", "5.1.0", true},
-		{">1.1", "4.1.0", true},
-		{">1.1", "1.1.0", false},
-		{"<1.1", "0.1.0", true},
-		{"<1.1", "1.1.0", false},
-		{"<1.1", "1.1.1", false},
-		{">=1.1", "4.1.0", true},
-		{">=1.1", "1.1.0", true},
-		{">=1.1", "0.0.9", false},
-		{"<=1.1", "0.1.0", true},
-		{"<=1.1", "1.1.0", true},
-		{"<=1.1", "1.1.1", false},
-		{"<=1.1-alpha1", "1.1", false},
-		{"<=2.x", "3.0.0", false},
-		{"<=2.x", "2.9.9", true},
-		{"<2.x", "2.0.0", false},
-		{"<2.x", "1.9.9", true},
-		{">=2.x", "3.0.0", true},
-		{">=2.x", "2.9.9", true},
-		{">=2.x", "1.9.9", false},
-		{">2.x", "3.0.0", true},
-		{">2.x", "2.9.9", false},
-		{">2.x", "1.9.9", false},
-		{"<=2.x-alpha2", "3.0.0-alpha3", false},
-		{"<=2.0.0", "2.0.0-alpha1", false},
-		{">2.x-beta1", "3.0.0-alpha2", false},
-		{"^2.0.0", "3.0.0-alpha2", false},
-		{"^2.0.0", "2.0.0-alpha1", false},
-		{"^2.1.0-alpha1", "2.1.0-alpha2", true},  // allow prerelease match within same major/minor/patch
-		{"^2.1.0-alpha1", "2.1.1-alpha2", false}, // but ONLY within same major/minor/patch
-		{"^2.1.0-alpha3", "2.1.0-alpha2", false}, // still respect prerelease ordering
-		{"^2.0.0", "2.0.0-alpha2", false},        // and only if the min has a prerelease
-	}
-
-	for _, tc := range tests {
-		if testing.Verbose() {
-			t.Logf("Testing if %q allows %q", tc.constraint, tc.version)
-		}
-		c, err := parseConstraint(tc.constraint, false)
-		if err != nil {
-			t.Errorf("err: %s", err)
-			continue
-		}
-
-		v, err := NewVersion(tc.version)
-		if err != nil {
-			t.Errorf("err: %s", err)
-			continue
-		}
-
-		a := c.Matches(v) == nil
-		if a != tc.check {
-			if tc.check {
-				t.Errorf("%q should have matched %q", tc.constraint, tc.version)
-			} else {
-				t.Errorf("%q should not have matched %q", tc.constraint, tc.version)
-			}
-		}
-	}
-}
-
-func TestNewConstraint(t *testing.T) {
-	tests := []struct {
-		input string
-		c     Constraint
-		err   bool
-	}{
-		{">= 1.1", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        Version{special: infiniteVersion},
-			includeMin: true,
-		}, false},
-		{"2.0", newV(2, 0, 0), false},
-		{">= bar", nil, true},
-		{"^1.1.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-		}, false},
-		{">= 1.2.3, < 2.0 || => 3.0, < 4", unionConstraint{
-			rangeConstraint{
-				min:        newV(1, 2, 3),
-				max:        newV(2, 0, 0),
-				includeMin: true,
-			},
-			rangeConstraint{
-				min:        newV(3, 0, 0),
-				max:        newV(4, 0, 0),
-				includeMin: true,
-			},
-		}, false},
-		{"3-4 || => 1.0, < 2", Union(
-			rangeConstraint{
-				min:        newV(3, 0, 0),
-				max:        newV(4, 0, 0),
-				includeMin: true,
-				includeMax: true,
-			},
-			rangeConstraint{
-				min:        newV(1, 0, 0),
-				max:        newV(2, 0, 0),
-				includeMin: true,
-			},
-		), false},
-		// demonstrates union compression
-		{"3-4 || => 3.0, < 4", rangeConstraint{
-			min:        newV(3, 0, 0),
-			max:        newV(4, 0, 0),
-			includeMin: true,
-			includeMax: true,
-		}, false},
-		{">=1.1.0, <2.0.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-			includeMax: false,
-		}, false},
-		{"!=1.4.0", rangeConstraint{
-			min: Version{special: zeroVersion},
-			max: Version{special: infiniteVersion},
-			excl: []Version{
-				newV(1, 4, 0),
-			},
-		}, false},
-		{">=1.1.0, !=1.4.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        Version{special: infiniteVersion},
-			includeMin: true,
-			excl: []Version{
-				newV(1, 4, 0),
-			},
-		}, false},
-	}
-
-	for _, tc := range tests {
-		c, err := NewConstraint(tc.input)
-		if tc.err && err == nil {
-			t.Errorf("expected but did not get error for: %s", tc.input)
-			continue
-		} else if !tc.err && err != nil {
-			t.Errorf("unexpectederror for input %s: %s", tc.input, err)
-			continue
-		}
-		if tc.err {
-			continue
-		}
-
-		if !constraintEq(tc.c, c) {
-			t.Errorf("%q produced constraint %q, but expected %q", tc.input, c, tc.c)
-		}
-	}
-}
-
-func TestNewConstraintIC(t *testing.T) {
-	tests := []struct {
-		input string
-		c     Constraint
-		err   bool
-	}{
-		{"=2.0", newV(2, 0, 0), false},
-		{"= 2.0", newV(2, 0, 0), false},
-		{"1.1.0", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-		}, false},
-		{"1.1", rangeConstraint{
-			min:        newV(1, 1, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-		}, false},
-		{"v1.1.0-12-abc123", rangeConstraint{
-			min:        Version{major: 1, minor: 1, patch: 0, pre: "12-abc123"},
-			max:        newV(2, 0, 0),
-			includeMin: true,
-			includeMax: false,
-		}, false},
-	}
-
-	for _, tc := range tests {
-		c, err := NewConstraintIC(tc.input)
-		if tc.err && err == nil {
-			t.Errorf("expected but did not get error for: %s", tc.input)
-			continue
-		} else if !tc.err && err != nil {
-			t.Errorf("unexpectederror for input %s: %s", tc.input, err)
-			continue
-		}
-		if tc.err {
-			continue
-		}
-
-		if !constraintEq(tc.c, c) {
-			t.Errorf("%q produced constraint %q, but expected %q", tc.input, c, tc.c)
-		}
-	}
-}
-
-func TestConstraintsCheck(t *testing.T) {
-	tests := []struct {
-		constraint string
-		version    string
-		check      bool
-	}{
-		{"*", "1.2.3", true},
-		{"~0.0.0", "1.2.3", false},
-		{"0.x.x", "1.2.3", false},
-		{"0.0.x", "1.2.3", false},
-		{"~0.0.0", "0.1.9", false},
-		{"~0.0.0", "0.0.9", true},
-		{"^0.0.0", "0.0.9", true},
-		{"^0.0.0", "0.1.9", false}, // caret behaves like tilde below 1.0.0
-		{"= 2.0", "1.2.3", false},
-		{"= 2.0", "2.0.0", true},
-		{"4.1", "4.1.0", true},
-		{"4.1.x", "4.1.3", true},
-		{"1.x", "1.4", true},
-		{"!=4.1", "4.1.0", false},
-		{"!=4.1", "5.1.0", true},
-		{"!=4.x", "5.1.0", true},
-		{"!=4.x", "4.1.0", false},
-		{"!=4.1.x", "4.2.0", true},
-		{"!=4.2.x", "4.2.3", false},
-		{">1.1", "4.1.0", true},
-		{">1.1", "1.1.0", false},
-		{"<1.1", "0.1.0", true},
-		{"<1.1", "1.1.0", false},
-		{"<1.1", "1.1.1", false},
-		{"<1.x", "1.1.1", false},
-		{"<1.x", "0.9.1", true},
-		{"<1.x", "2.1.1", false},
-		{"<1.1.x", "1.2.1", false},
-		{"<1.1.x", "1.1.500", false},
-		{"<1.1.x", "1.0.500", true},
-		{"<1.2.x", "1.1.1", true},
-		{">=1.1", "4.1.0", true},
-		{">=1.1", "1.1.0", true},
-		{">=1.1", "0.0.9", false},
-		{"<=1.1", "0.1.0", true},
-		{"<=1.1", "1.1.0", true},
-		{"<=1.x", "1.1.0", true},
-		{"<=2.x", "3.1.0", false},
-		{"<=1.1", "1.1.1", false},
-		{"<=1.1.x", "1.2.500", false},
-		{">1.1, <2", "1.1.1", true},
-		{">1.1, <3", "4.3.2", false},
-		{">=1.1, <2, !=1.2.3", "1.2.3", false},
-		{">=1.1, <2, !=1.2.3 || > 3", "3.1.2", true},
-		{">=1.1, <2, !=1.2.3 || >= 3", "3.0.0", true},
-		{">=1.1, <2, !=1.2.3 || > 3", "3.0.0", false},
-		{">=1.1, <2, !=1.2.3 || > 3", "1.2.3", false},
-		{"1.1 - 2", "1.1.1", true},
-		{"1.1-3", "4.3.2", false},
-		{"^1.1", "1.1.1", true},
-		{"^1.1", "4.3.2", false},
-		{"^1.x", "1.1.1", true},
-		{"^2.x", "1.1.1", false},
-		{"^1.x", "2.1.1", false},
-		{"~*", "2.1.1", true},
-		{"~1.x", "2.1.1", false},
-		{"~1.x", "1.3.5", true},
-		{"~1.x", "1.4", true},
-		{"~1.1", "1.1.1", true},
-		{"~1.2.3", "1.2.5", true},
-		{"~1.2.3", "1.2.2", false},
-		{"~1.2.3", "1.3.2", false},
-		{"~1.1", "1.2.3", false},
-		{"~1.3", "2.4.5", false},
-	}
-
-	for _, tc := range tests {
-		c, err := NewConstraint(tc.constraint)
-		if err != nil {
-			t.Errorf("err: %s", err)
-			continue
-		}
-
-		v, err := NewVersion(tc.version)
-		if err != nil {
-			t.Errorf("err: %s", err)
-			continue
-		}
-
-		a := c.Matches(v) == nil
-		if a != tc.check {
-			if a {
-				t.Errorf("Input %q produced constraint %q; should not have admitted %q, but did", tc.constraint, c, tc.version)
-			} else {
-				t.Errorf("Input %q produced constraint %q; should have admitted %q, but did not", tc.constraint, c, tc.version)
-			}
-		}
-	}
-}
-
-func TestBidirectionalSerialization(t *testing.T) {
-	tests := []struct {
-		io string
-		eq bool
-	}{
-		{"*", true},         // any
-		{"~0.0.0", false},   // tildes expand into ranges
-		{"=2.0", false},     // abbreviated versions print as full
-		{"4.1.x", false},    // wildcards expand into ranges
-		{">= 1.1.0", false}, // does not produce spaces on ranges
-		{"4.1.0", true},
-		{"!=4.1.0", true},
-		{">=1.1.0", true},
-		{">1.0.0, <=1.1.0", true},
-		{"<=1.1.0", true},
-		{">=1.1.7, <1.3.0", true},  // tilde width
-		{">=1.1.0, <=2.0.0", true}, // no unary op on lte max
-		{">1.1.3, <2.0.0", true},   // no unary op on gt min
-		{">1.1.0, <=2.0.0", true},  // no unary op on gt min and lte max
-		{">=1.1.0, <=1.2.0", true}, // no unary op on lte max
-		{">1.1.1, <1.2.0", true},   // no unary op on gt min
-		{">1.1.7, <=2.0.0", true},  // no unary op on gt min and lte max
-		{">1.1.7, <=2.0.0", true},  // no unary op on gt min and lte max
-		{">=0.1.7, <1.0.0", true},  // caret shifting below 1.0.0
-		{">=0.1.7, <0.3.0", true},  // caret shifting width below 1.0.0
-	}
-
-	for _, fix := range tests {
-		c, err := NewConstraint(fix.io)
-		if err != nil {
-			t.Errorf("Valid constraint string produced unexpected error: %s", err)
-		}
-
-		eq := fix.io == c.String()
-		if eq != fix.eq {
-			if eq {
-				t.Errorf("Constraint %q should not have reproduced input string %q, but did", c, fix.io)
-			} else {
-				t.Errorf("Constraint should have reproduced input string %q, but instead produced %q", fix.io, c)
-			}
-		}
-	}
-}
-
-func TestBidirectionalSerializationIC(t *testing.T) {
-	tests := []struct {
-		io string
-		eq bool
-	}{
-		{"*", true},      // any
-		{"=2.0.0", true}, // versions retain leading =
-		{"2.0.0", true},  // (no) caret in, (no) caret out
-	}
-
-	for _, fix := range tests {
-		c, err := NewConstraintIC(fix.io)
-		if err != nil {
-			t.Errorf("Valid constraint string produced unexpected error: %s", err)
-		}
-
-		eq := fix.io == c.ImpliedCaretString()
-		if eq != fix.eq {
-			if eq {
-				t.Errorf("Constraint %q should not have reproduced input string %q, but did", c, fix.io)
-			} else {
-				t.Errorf("Constraint should have reproduced input string %q, but instead produced %q", fix.io, c)
-			}
-		}
-	}
-}
-
-func TestPreferUnaryOpForm(t *testing.T) {
-	tests := []struct {
-		in, out string
-	}{
-		{">=0.1.7, <0.2.0", "^0.1.7"}, // caret shifting below 1.0.0
-		{">=1.1.0, <2.0.0", "^1.1.0"},
-		{">=1.1.0, <2.0.0, !=1.2.3", "^1.1.0, !=1.2.3"},
-	}
-
-	for _, fix := range tests {
-		c, err := NewConstraint(fix.in)
-		if err != nil {
-			t.Errorf("Valid constraint string produced unexpected error: %s", err)
-		}
-
-		if fix.out != c.String() {
-			t.Errorf("Constraint %q was not transformed into expected output string %q", fix.in, fix.out)
-		}
-	}
-}
-
-func TestRewriteRange(t *testing.T) {
-	tests := []struct {
-		c  string
-		nc string
-	}{
-		{"2-3", ">= 2, <= 3"},
-		{"2-3, 2-3", ">= 2, <= 3,>= 2, <= 3"},
-		{"2-3, 4.0.0-5.1", ">= 2, <= 3,>= 4.0.0, <= 5.1"},
-		{"v2-3, 2-3", "v2-3,>= 2, <= 3"},
-	}
-
-	for _, tc := range tests {
-		o := rewriteRange(tc.c)
-
-		if o != tc.nc {
-			t.Errorf("Range %s rewritten incorrectly as '%s'", tc.c, o)
-		}
-	}
-}
-
-func TestIsX(t *testing.T) {
-	tests := []struct {
-		t string
-		c bool
-	}{
-		{"A", false},
-		{"%", false},
-		{"X", true},
-		{"x", true},
-		{"*", true},
-	}
-
-	for _, tc := range tests {
-		a := isX(tc.t)
-		if a != tc.c {
-			t.Errorf("Function isX error on %s", tc.t)
-		}
-	}
-}
-
-func TestUnionErr(t *testing.T) {
-	u1 := Union(
-		rangeConstraint{
-			min:        newV(3, 0, 0),
-			max:        newV(4, 0, 0),
-			includeMin: true,
-			includeMax: true,
-		},
-		rangeConstraint{
-			min:        newV(1, 0, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-		},
-	)
-	fail := u1.Matches(newV(2, 5, 0))
-	failstr := `2.5.0 is greater than or equal to the maximum of ^1.0.0
-2.5.0 is less than the minimum of >=3.0.0, <=4.0.0`
-	if fail.Error() != failstr {
-		t.Errorf("Did not get expected failure message from union, got %q", fail)
-	}
-}
-
-func TestIsSuperset(t *testing.T) {
-	rc := []rangeConstraint{
-		{
-			min:        newV(1, 2, 0),
-			max:        newV(2, 0, 0),
-			includeMin: true,
-		},
-		{
-			min: newV(1, 2, 0),
-			max: newV(2, 1, 0),
-		},
-		{
-			min: Version{special: zeroVersion},
-			max: newV(1, 10, 0),
-		},
-		{
-			min: newV(2, 0, 0),
-			max: Version{special: infiniteVersion},
-		},
-		{
-			min:        newV(1, 2, 0),
-			max:        newV(2, 0, 0),
-			includeMax: true,
-		},
-	}
-
-	for _, c := range rc {
-
-		// Superset comparison is not strict, so a range should always be a superset
-		// of itself.
-		if !c.isSupersetOf(c) {
-			t.Errorf("Ranges should be supersets of themselves; %s indicated it was not", c)
-		}
-	}
-
-	pairs := []struct{ l, r rangeConstraint }{
-		{
-			// ensures lte is handled correctly (min side)
-			l: rc[0],
-			r: rc[1],
-		},
-		{
-			// ensures nil on min side works well
-			l: rc[0],
-			r: rc[2],
-		},
-		{
-			// ensures nil on max side works well
-			l: rc[0],
-			r: rc[3],
-		},
-		{
-			// ensures nils on both sides work well
-			l: rc[2],
-			r: rc[3],
-		},
-		{
-			// ensures gte is handled correctly (max side)
-			l: rc[2],
-			r: rc[4],
-		},
-	}
-
-	for _, p := range pairs {
-		if p.l.isSupersetOf(p.r) {
-			t.Errorf("%s is not a superset of %s", p.l, p.r)
-		}
-		if p.r.isSupersetOf(p.l) {
-			t.Errorf("%s is not a superset of %s", p.r, p.l)
-		}
-	}
-
-	rc[1].max.minor = 0
-
-	if !rc[0].isSupersetOf(rc[1]) {
-		t.Errorf("%s is a superset of %s", rc[0], rc[1])
-	}
-	rc[1].includeMax = true
-	if rc[1].isSupersetOf(rc[0]) {
-		t.Errorf("%s is not a superset of %s", rc[1], rc[0])
-	}
-	rc[0].includeMin = false
-	if !rc[1].isSupersetOf(rc[0]) {
-		t.Errorf("%s is a superset of %s", rc[1], rc[0])
-	}
-
-	// isSupersetOf ignores excludes, so even though this would make rc[1] not a
-	// superset of rc[0] anymore, it should still say it is.
-	rc[1].excl = []Version{
-		newV(1, 5, 0),
-	}
-
-	if !rc[1].isSupersetOf(rc[0]) {
-		t.Errorf("%s is still a superset of %s, because isSupersetOf is supposed to ignore excluded versions", rc[1], rc[0])
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/semver/set_ops_test.go b/installer/vendor/github.com/Masterminds/semver/set_ops_test.go
deleted file mode 100644
index c08f27618d..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/set_ops_test.go
+++ /dev/null
@@ -1,932 +0,0 @@
-package semver
-
-import "testing"
-
-func TestIntersection(t *testing.T) {
-	var actual Constraint
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = Intersection(); !IsNone(actual) {
-		t.Errorf("Intersection of nothing should always produce None; got %q", actual)
-	}
-
-	if actual = Intersection(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Intersection of one item should always return that item; got %q", actual)
-	}
-
-	if actual = Intersection(rc1, None()); !IsNone(actual) {
-		t.Errorf("Intersection of anything with None should always produce None; got %q", actual)
-	}
-
-	if actual = Intersection(rc1, Any()); !constraintEq(actual, rc1) {
-		t.Errorf("Intersection of anything with Any should return self; got %q", actual)
-	}
-
-	v1 := newV(1, 5, 0)
-	if actual = Intersection(rc1, v1); !constraintEq(actual, v1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, v1)
-	}
-
-	rc2 := rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 2, 0),
-	}
-	result := rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = Intersection(rc1, rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	u1 := unionConstraint{
-		rangeConstraint{
-			min: newV(1, 2, 0),
-			max: newV(3, 0, 0),
-		},
-		newV(3, 1, 0),
-	}
-
-	if actual = Intersection(u1, rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = Intersection(rc1, newV(2, 0, 5), u1); !IsNone(actual) {
-		t.Errorf("First two are disjoint, should have gotten None but got %q", actual)
-	}
-}
-
-func TestRangeIntersection(t *testing.T) {
-	var actual Constraint
-	// Test magic cases
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	if actual = rc1.Intersect(Any()); !constraintEq(actual, rc1) {
-		t.Errorf("Intersection of anything with Any should return self; got %q", actual)
-	}
-	if actual = rc1.Intersect(None()); !IsNone(actual) {
-		t.Errorf("Intersection of anything with None should always produce None; got %q", actual)
-	}
-
-	// Test single version cases
-
-	// single v, in range
-	v1 := newV(1, 5, 0)
-
-	if actual = rc1.Intersect(v1); !constraintEq(actual, v1) {
-		t.Errorf("Intersection of version with matching range should return the version; got %q", actual)
-	}
-
-	// now exclude just that version
-	rc1.excl = []Version{v1}
-	if actual = rc1.Intersect(v1); !IsNone(actual) {
-		t.Errorf("Intersection of version with range having specific exclude for that version should produce None; got %q", actual)
-	}
-
-	// and, of course, none if the version is out of range
-	v2 := newV(0, 5, 0)
-	if actual = rc1.Intersect(v2); !IsNone(actual) {
-		t.Errorf("Intersection of version with non-matching range should produce None; got %q", actual)
-	}
-
-	// Test basic overlap case
-	rc1 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 := rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 2, 0),
-	}
-	result := rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// And with includes
-	rc1.includeMin = true
-	rc1.includeMax = true
-	rc2.includeMin = true
-	rc2.includeMax = true
-	result.includeMin = true
-	result.includeMax = true
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Overlaps with nils
-	rc1 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: Version{special: infiniteVersion},
-	}
-	rc2 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: newV(2, 2, 0),
-	}
-	result = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 2, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// And with includes
-	rc1.includeMin = true
-	rc2.includeMax = true
-	result.includeMin = true
-	result.includeMax = true
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Test superset overlap case
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-	}
-	result = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Make sure irrelevant includes don't leak in
-	rc2.includeMin = true
-	rc2.includeMax = true
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// But relevant includes get used
-	rc1.includeMin = true
-	rc1.includeMax = true
-	result.includeMin = true
-	result.includeMax = true
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Test disjoint case
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(1, 6, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, None()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, None())
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, None()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, None())
-	}
-
-	// Test disjoint at gt/lt boundary (non-adjacent)
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, None()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, None())
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, None()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, None())
-	}
-
-	// Now, just have them touch at a single version
-	rc1.includeMax = true
-	rc2.includeMin = true
-
-	vresult := newV(2, 0, 0)
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, vresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, vresult)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, vresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, vresult)
-	}
-
-	// Test excludes in intersection range
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-		excl: []Version{
-			newV(1, 6, 0),
-		},
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-
-	// Test excludes not in intersection range
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-		excl: []Version{
-			newV(1, 1, 0),
-		},
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-
-	// Test min, and greater min
-	rc1 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: Version{special: infiniteVersion},
-	}
-	rc2 = rangeConstraint{
-		min:        newV(1, 5, 0),
-		max:        Version{special: infiniteVersion},
-		includeMin: true,
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Test max, and lesser max
-	rc1 = rangeConstraint{
-		max: newV(1, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		max: newV(1, 5, 0),
-	}
-	result = rangeConstraint{
-		max: newV(1, 0, 0),
-	}
-
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Intersect(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Ensure pure excludes come through as they should
-	rc1 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: Version{special: infiniteVersion},
-		excl: []Version{
-			newV(1, 6, 0),
-		},
-	}
-
-	rc2 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: Version{special: infiniteVersion},
-		excl: []Version{
-			newV(1, 6, 0),
-			newV(1, 7, 0),
-		},
-	}
-
-	if actual = Any().Intersect(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc1.Intersect(Any()); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc1.Intersect(rc2); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-
-	// TODO test the pre-release special range stuff
-}
-
-func TestRangeUnion(t *testing.T) {
-	var actual Constraint
-	// Test magic cases
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	if actual = rc1.Union(Any()); !IsAny(actual) {
-		t.Errorf("Union of anything with Any should always produce Any; got %q", actual)
-	}
-	if actual = rc1.Union(None()); !constraintEq(actual, rc1) {
-		t.Errorf("Union of anything with None should return self; got %q", actual)
-	}
-
-	// Test single version cases
-
-	// single v, in range
-	v1 := newV(1, 5, 0)
-
-	if actual = rc1.Union(v1); !constraintEq(actual, rc1) {
-		t.Errorf("Union of version with matching range should return the range; got %q", actual)
-	}
-
-	// now exclude just that version
-	rc2 := rc1.dup()
-	rc2.excl = []Version{v1}
-	if actual = rc2.Union(v1); !constraintEq(actual, rc1) {
-		t.Errorf("Union of version with range having specific exclude for that version should produce the range without that exclude; got %q", actual)
-	}
-
-	// and a union if the version is not within the range
-	v2 := newV(0, 5, 0)
-	uresult := unionConstraint{v2, rc1}
-	if actual = rc1.Union(v2); !constraintEq(actual, uresult) {
-		t.Errorf("Union of version with non-matching range should produce a unionConstraint with those two; got %q", actual)
-	}
-
-	// union with version at the min should ensure "oreq"
-	v2 = newV(1, 0, 0)
-	rc3 := rc1
-	rc3.includeMin = true
-
-	if actual = rc1.Union(v2); !constraintEq(actual, rc3) {
-		t.Errorf("Union of range with version at min end should add includeMin (%q), but got %q", rc3, actual)
-	}
-	if actual = v2.Union(rc1); !constraintEq(actual, rc3) {
-		t.Errorf("Union of range with version at min end should add includeMin (%q), but got %q", rc3, actual)
-	}
-
-	// same at max end
-	v2 = newV(2, 0, 0)
-	rc3.includeMin = false
-	rc3.includeMax = true
-
-	if actual = rc1.Union(v2); !constraintEq(actual, rc3) {
-		t.Errorf("Union of range with version at max end should add includeMax (%q), but got %q", rc3, actual)
-	}
-	if actual = v2.Union(rc1); !constraintEq(actual, rc3) {
-		t.Errorf("Union of range with version at max end should add includeMax (%q), but got %q", rc3, actual)
-	}
-
-	// Test basic overlap case
-	rc1 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 2, 0),
-	}
-	result := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 2, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// And with includes
-	rc1.includeMin = true
-	rc1.includeMax = true
-	rc2.includeMin = true
-	rc2.includeMax = true
-	result.includeMin = true
-	result.includeMax = true
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Overlaps with nils
-	rc1 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: Version{special: infiniteVersion},
-	}
-	rc2 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: newV(2, 2, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, Any()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, Any())
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, Any()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, Any())
-	}
-
-	// Just one nil in overlap
-	rc1.max = newV(2, 0, 0)
-	result = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: newV(2, 2, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	rc1.max = Version{special: infiniteVersion}
-	rc2.min = newV(1, 5, 0)
-	result = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: Version{special: infiniteVersion},
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Test superset overlap case
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-
-	// Test disjoint case
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(1, 6, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-	uresult = unionConstraint{rc1, rc2}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, uresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, uresult)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, uresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, uresult)
-	}
-
-	// Test disjoint at gt/lt boundary (non-adjacent)
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-	uresult = unionConstraint{rc1, rc2}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, uresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, uresult)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, uresult) {
-		t.Errorf("Got constraint %q, but expected %q", actual, uresult)
-	}
-
-	// Now, just have them touch at a single version
-	rc1.includeMax = true
-	rc2.includeMin = true
-	result = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// And top-adjacent at that version
-	rc2.includeMin = false
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	// And bottom-adjacent at that version
-	rc1.includeMax = false
-	rc2.includeMin = true
-	if actual = rc1.Union(rc2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-
-	// Test excludes in overlapping range
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-		excl: []Version{
-			newV(1, 6, 0),
-		},
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-
-	// Test excludes not in non-overlapping range
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(3, 0, 0),
-		excl: []Version{
-			newV(1, 1, 0),
-		},
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, rc2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc2)
-	}
-
-	// Ensure pure excludes come through as they should
-	rc1 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: Version{special: infiniteVersion},
-		excl: []Version{
-			newV(1, 6, 0),
-		},
-	}
-
-	rc2 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: Version{special: infiniteVersion},
-		excl: []Version{
-			newV(1, 6, 0),
-			newV(1, 7, 0),
-		},
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-
-	rc1 = rangeConstraint{
-		min: Version{special: zeroVersion},
-		max: Version{special: infiniteVersion},
-		excl: []Version{
-			newV(1, 5, 0),
-		},
-	}
-
-	if actual = rc1.Union(rc2); !constraintEq(actual, Any()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, Any())
-	}
-	if actual = rc2.Union(rc1); !constraintEq(actual, Any()) {
-		t.Errorf("Got constraint %q, but expected %q", actual, Any())
-	}
-
-	// TODO test the pre-release special range stuff
-}
-
-func TestUnionIntersection(t *testing.T) {
-	var actual Constraint
-	// magic first
-	u1 := unionConstraint{
-		newV(1, 1, 0),
-		newV(1, 2, 0),
-		newV(1, 3, 0),
-	}
-	if actual = u1.Intersect(Any()); !constraintEq(actual, u1) {
-		t.Errorf("Intersection of anything with Any should return self; got %s", actual)
-	}
-	if actual = u1.Intersect(None()); !IsNone(actual) {
-		t.Errorf("Intersection of anything with None should always produce None; got %s", actual)
-	}
-	if u1.MatchesAny(None()) {
-		t.Errorf("Can't match any when intersected with None")
-	}
-
-	// intersect of unions with single versions
-	v1 := newV(1, 1, 0)
-	if actual = u1.Intersect(v1); !constraintEq(actual, v1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, v1)
-	}
-	if actual = v1.Intersect(u1); !constraintEq(actual, v1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, v1)
-	}
-
-	// intersect of range with union of versions
-	u1 = unionConstraint{
-		newV(1, 1, 0),
-		newV(1, 2, 0),
-		newV(1, 3, 0),
-	}
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = u1.Intersect(rc1); !constraintEq(actual, u1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, u1)
-	}
-	if actual = rc1.Intersect(u1); !constraintEq(actual, u1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, u1)
-	}
-
-	u2 := unionConstraint{
-		newV(1, 1, 0),
-		newV(1, 2, 0),
-	}
-
-	if actual = u1.Intersect(u2); !constraintEq(actual, u2) {
-		t.Errorf("Got constraint %q, but expected %q", actual, u2)
-	}
-
-	// Overlapping sub/supersets
-	rc1 = rangeConstraint{
-		min: newV(1, 5, 0),
-		max: newV(1, 6, 0),
-	}
-	rc2 := rangeConstraint{
-		min: newV(2, 0, 0),
-		max: newV(3, 0, 0),
-	}
-	rc3 = rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	rc4 := rangeConstraint{
-		min: newV(2, 5, 0),
-		max: newV(2, 6, 0),
-	}
-	u1 = unionConstraint{rc1, rc2}
-	u2 = unionConstraint{rc3, rc4}
-	ur := unionConstraint{rc1, rc4}
-
-	if actual = u1.Intersect(u2); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-	if actual = u2.Intersect(u1); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-
-	// Ensure excludes carry as they should
-	rc1.excl = []Version{newV(1, 5, 5)}
-	u1 = unionConstraint{rc1, rc2}
-	ur = unionConstraint{rc1, rc4}
-
-	if actual = u1.Intersect(u2); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-	if actual = u2.Intersect(u1); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-}
-
-func TestUnionUnion(t *testing.T) {
-	var actual Constraint
-	// magic first
-	u1 := unionConstraint{
-		newV(1, 1, 0),
-		newV(1, 2, 0),
-		newV(1, 3, 0),
-	}
-	if actual = u1.Union(Any()); !IsAny(actual) {
-		t.Errorf("Union of anything with Any should always return Any; got %s", actual)
-	}
-	if actual = u1.Union(None()); !constraintEq(actual, u1) {
-		t.Errorf("Union of anything with None should always return self; got %s", actual)
-	}
-
-	// union of uc with single versions
-	// already present
-	v1 := newV(1, 2, 0)
-	if actual = u1.Union(v1); !constraintEq(actual, u1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, u1)
-	}
-	if actual = v1.Union(u1); !constraintEq(actual, u1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, u1)
-	}
-
-	// not present
-	v2 := newV(1, 4, 0)
-	ur := append(u1, v2)
-	if actual = u1.Union(v2); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-	if actual = v2.Union(u1); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-
-	// union of uc with uc, all versions
-	u2 := unionConstraint{
-		newV(1, 3, 0),
-		newV(1, 4, 0),
-		newV(1, 5, 0),
-	}
-	ur = unionConstraint{
-		newV(1, 1, 0),
-		newV(1, 2, 0),
-		newV(1, 3, 0),
-		newV(1, 4, 0),
-		newV(1, 5, 0),
-	}
-
-	if actual = u1.Union(u2); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-	if actual = u2.Union(u1); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-
-	// union that should compress versions into range
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-
-	if actual = u1.Union(rc1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-	if actual = rc1.Union(u1); !constraintEq(actual, rc1) {
-		t.Errorf("Got constraint %q, but expected %q", actual, rc1)
-	}
-
-	rc1.max = newV(1, 4, 5)
-	u3 := append(u2, newV(1, 7, 0))
-	ur = unionConstraint{
-		rc1,
-		newV(1, 5, 0),
-		newV(1, 7, 0),
-	}
-
-	if actual = u3.Union(rc1); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-	if actual = rc1.Union(u3); !constraintEq(actual, ur) {
-		t.Errorf("Got constraint %q, but expected %q", actual, ur)
-	}
-}
-
-// Most version stuff got tested by range and/or union b/c most tests were
-// repeated bidirectionally (set operations are commutative; testing in pairs
-// helps us catch any situation where we fail to maintain that invariant)
-func TestVersionSetOps(t *testing.T) {
-	var actual Constraint
-
-	v1 := newV(1, 0, 0)
-
-	if actual = v1.Intersect(v1); !constraintEq(actual, v1) {
-		t.Errorf("Version intersected with itself should be itself, got %q", actual)
-	}
-	if !v1.MatchesAny(v1) {
-		t.Errorf("MatchesAny should work with a version against itself")
-	}
-
-	v2 := newV(2, 0, 0)
-	if actual = v1.Intersect(v2); !IsNone(actual) {
-		t.Errorf("Versions should only intersect with themselves, got %q", actual)
-	}
-	if v1.MatchesAny(v2) {
-		t.Errorf("MatchesAny should not work when combined with anything other than itself")
-	}
-
-	result := unionConstraint{v1, v2}
-
-	if actual = v1.Union(v1); !constraintEq(actual, v1) {
-		t.Errorf("Version union with itself should return self, got %q", actual)
-	}
-
-	if actual = v1.Union(v2); !constraintEq(actual, result) {
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-	if actual = v1.Union(v2); !constraintEq(actual, result) {
-		// Duplicate just to make sure ordering works right
-		t.Errorf("Got constraint %q, but expected %q", actual, result)
-	}
-}
-
-func TestAreAdjacent(t *testing.T) {
-	rc1 := rangeConstraint{
-		min: newV(1, 0, 0),
-		max: newV(2, 0, 0),
-	}
-	rc2 := rangeConstraint{
-		min: newV(1, 2, 0),
-		max: newV(2, 2, 0),
-	}
-
-	if areAdjacent(rc1, rc2) {
-		t.Errorf("Ranges overlap, should not indicate as adjacent")
-	}
-
-	rc2 = rangeConstraint{
-		min: newV(2, 0, 0),
-	}
-
-	if areAdjacent(rc1, rc2) {
-		t.Errorf("Ranges are non-overlapping and non-adjacent, but reported as adjacent")
-	}
-
-	rc2.includeMin = true
-
-	if !areAdjacent(rc1, rc2) {
-		t.Errorf("Ranges are non-overlapping and adjacent, but reported as non-adjacent")
-	}
-
-	rc1.includeMax = true
-
-	if areAdjacent(rc1, rc2) {
-		t.Errorf("Ranges are overlapping at a single version, but reported as adjacent")
-	}
-
-	rc2.includeMin = false
-	if !areAdjacent(rc1, rc2) {
-		t.Errorf("Ranges are non-overlapping and adjacent, but reported as non-adjacent")
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/semver/version_test.go b/installer/vendor/github.com/Masterminds/semver/version_test.go
deleted file mode 100644
index 1fae87f526..0000000000
--- a/installer/vendor/github.com/Masterminds/semver/version_test.go
+++ /dev/null
@@ -1,310 +0,0 @@
-package semver
-
-import (
-	"testing"
-)
-
-func TestNewVersion(t *testing.T) {
-	tests := []struct {
-		version string
-		err     bool
-	}{
-		{"1.2.3", false},
-		{"v1.2.3", false},
-		{"1.0", false},
-		{"v1.0", false},
-		{"1", false},
-		{"v1", false},
-		{"1.2.beta", true},
-		{"v1.2.beta", true},
-		{"foo", true},
-		{"1.2-5", false},
-		{"v1.2-5", false},
-		{"1.2-beta.5", false},
-		{"v1.2-beta.5", false},
-		{"\n1.2", true},
-		{"\nv1.2", true},
-		{"1.2.0-x.Y.0+metadata", false},
-		{"v1.2.0-x.Y.0+metadata", false},
-		{"1.2.0-x.Y.0+metadata-width-hypen", false},
-		{"v1.2.0-x.Y.0+metadata-width-hypen", false},
-		{"1.2.3-rc1-with-hypen", false},
-		{"v1.2.3-rc1-with-hypen", false},
-		{"1.2.3.4", true},
-		{"v1.2.3.4", true},
-	}
-
-	for _, tc := range tests {
-		_, err := NewVersion(tc.version)
-		if tc.err && err == nil {
-			t.Fatalf("expected error for version: %s", tc.version)
-		} else if !tc.err && err != nil {
-			t.Fatalf("error for version %s: %s", tc.version, err)
-		}
-	}
-}
-
-func TestOriginal(t *testing.T) {
-	tests := []string{
-		"1.2.3",
-		"v1.2.3",
-		"1.0",
-		"v1.0",
-		"1",
-		"v1",
-		"1.2-5",
-		"v1.2-5",
-		"1.2-beta.5",
-		"v1.2-beta.5",
-		"1.2.0-x.Y.0+metadata",
-		"v1.2.0-x.Y.0+metadata",
-		"1.2.0-x.Y.0+metadata-width-hypen",
-		"v1.2.0-x.Y.0+metadata-width-hypen",
-		"1.2.3-rc1-with-hypen",
-		"v1.2.3-rc1-with-hypen",
-	}
-
-	for _, tc := range tests {
-		v, err := NewVersion(tc)
-		if err != nil {
-			t.Errorf("Error parsing version %s", tc)
-		}
-
-		o := v.Original()
-		if o != tc {
-			t.Errorf("Error retrieving originl. Expected '%s' but got '%s'", tc, v)
-		}
-	}
-}
-
-func TestParts(t *testing.T) {
-	v, err := NewVersion("1.2.3-beta.1+build.123")
-	if err != nil {
-		t.Error("Error parsing version 1.2.3-beta.1+build.123")
-	}
-
-	if v.Major() != 1 {
-		t.Error("Major() returning wrong value")
-	}
-	if v.Minor() != 2 {
-		t.Error("Minor() returning wrong value")
-	}
-	if v.Patch() != 3 {
-		t.Error("Patch() returning wrong value")
-	}
-	if v.Prerelease() != "beta.1" {
-		t.Error("Prerelease() returning wrong value")
-	}
-	if v.Metadata() != "build.123" {
-		t.Error("Metadata() returning wrong value")
-	}
-}
-
-func TestString(t *testing.T) {
-	tests := []struct {
-		version  string
-		expected string
-	}{
-		{"1.2.3", "1.2.3"},
-		{"v1.2.3", "1.2.3"},
-		{"1.0", "1.0.0"},
-		{"v1.0", "1.0.0"},
-		{"1", "1.0.0"},
-		{"v1", "1.0.0"},
-		{"1.2-5", "1.2.0-5"},
-		{"v1.2-5", "1.2.0-5"},
-		{"1.2-beta.5", "1.2.0-beta.5"},
-		{"v1.2-beta.5", "1.2.0-beta.5"},
-		{"1.2.0-x.Y.0+metadata", "1.2.0-x.Y.0+metadata"},
-		{"v1.2.0-x.Y.0+metadata", "1.2.0-x.Y.0+metadata"},
-		{"1.2.0-x.Y.0+metadata-width-hypen", "1.2.0-x.Y.0+metadata-width-hypen"},
-		{"v1.2.0-x.Y.0+metadata-width-hypen", "1.2.0-x.Y.0+metadata-width-hypen"},
-		{"1.2.3-rc1-with-hypen", "1.2.3-rc1-with-hypen"},
-		{"v1.2.3-rc1-with-hypen", "1.2.3-rc1-with-hypen"},
-	}
-
-	for _, tc := range tests {
-		v, err := NewVersion(tc.version)
-		if err != nil {
-			t.Errorf("Error parsing version %s", tc)
-		}
-
-		s := v.String()
-		if s != tc.expected {
-			t.Errorf("Error generating string. Expected '%s' but got '%s'", tc.expected, s)
-		}
-	}
-}
-
-func TestCompare(t *testing.T) {
-	tests := []struct {
-		v1       string
-		v2       string
-		expected int
-	}{
-		{"1.2.3", "1.5.1", -1},
-		{"2.2.3", "1.5.1", 1},
-		{"2.2.3", "2.2.2", 1},
-		{"3.2-beta", "3.2-beta", 0},
-		{"1.3", "1.1.4", 1},
-		{"4.2", "4.2-beta", 1},
-		{"4.2-beta", "4.2", -1},
-		{"4.2-alpha", "4.2-beta", -1},
-		{"4.2-alpha", "4.2-alpha", 0},
-		{"4.2-beta.2", "4.2-beta.1", 1},
-		{"4.2-beta2", "4.2-beta1", 1},
-		{"4.2-beta", "4.2-beta.2", -1},
-		{"4.2-beta", "4.2-beta.foo", 1},
-		{"4.2-beta.2", "4.2-beta", 1},
-		{"4.2-beta.foo", "4.2-beta", -1},
-		{"1.2+bar", "1.2+baz", 0},
-	}
-
-	for _, tc := range tests {
-		v1, err := NewVersion(tc.v1)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		v2, err := NewVersion(tc.v2)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		a := v1.Compare(v2)
-		e := tc.expected
-		if a != e {
-			t.Errorf(
-				"Comparison of '%s' and '%s' failed. Expected '%d', got '%d'",
-				tc.v1, tc.v2, e, a,
-			)
-		}
-	}
-
-	// One-off tests for special version comparisons
-	zero := Version{special: zeroVersion}
-	inf := Version{special: infiniteVersion}
-
-	if zero.Compare(inf) != -1 {
-		t.Error("Zero version should always be less than infinite version")
-	}
-	if zero.Compare(zero) != 0 {
-		t.Error("Zero version should equal itself")
-	}
-	if inf.Compare(zero) != 1 {
-		t.Error("Infinite version should always be greater than zero version")
-	}
-	if inf.Compare(inf) != 0 {
-		t.Error("Infinite version should equal itself")
-	}
-
-	// Need to work vs. a normal version, too.
-	v := Version{}
-
-	if zero.Compare(v) != -1 {
-		t.Error("Zero version should always be less than any normal version")
-	}
-	if inf.Compare(v) != 1 {
-		t.Error("Infinite version should always be greater than any normal version")
-	}
-}
-
-func TestLessThan(t *testing.T) {
-	tests := []struct {
-		v1       string
-		v2       string
-		expected bool
-	}{
-		{"1.2.3", "1.5.1", true},
-		{"2.2.3", "1.5.1", false},
-		{"3.2-beta", "3.2-beta", false},
-	}
-
-	for _, tc := range tests {
-		v1, err := NewVersion(tc.v1)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		v2, err := NewVersion(tc.v2)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		a := v1.LessThan(v2)
-		e := tc.expected
-		if a != e {
-			t.Errorf(
-				"Comparison of '%s' and '%s' failed. Expected '%t', got '%t'",
-				tc.v1, tc.v2, e, a,
-			)
-		}
-	}
-}
-
-func TestGreaterThan(t *testing.T) {
-	tests := []struct {
-		v1       string
-		v2       string
-		expected bool
-	}{
-		{"1.2.3", "1.5.1", false},
-		{"2.2.3", "1.5.1", true},
-		{"3.2-beta", "3.2-beta", false},
-	}
-
-	for _, tc := range tests {
-		v1, err := NewVersion(tc.v1)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		v2, err := NewVersion(tc.v2)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		a := v1.GreaterThan(v2)
-		e := tc.expected
-		if a != e {
-			t.Errorf(
-				"Comparison of '%s' and '%s' failed. Expected '%t', got '%t'",
-				tc.v1, tc.v2, e, a,
-			)
-		}
-	}
-}
-
-func TestEqual(t *testing.T) {
-	tests := []struct {
-		v1       string
-		v2       string
-		expected bool
-	}{
-		{"1.2.3", "1.5.1", false},
-		{"2.2.3", "1.5.1", false},
-		{"3.2-beta", "3.2-beta", true},
-		{"3.2-beta+foo", "3.2-beta+bar", true},
-	}
-
-	for _, tc := range tests {
-		v1, err := NewVersion(tc.v1)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		v2, err := NewVersion(tc.v2)
-		if err != nil {
-			t.Errorf("Error parsing version: %s", err)
-		}
-
-		a := v1.Equal(v2)
-		e := tc.expected
-		if a != e {
-			t.Errorf(
-				"Comparison of '%s' and '%s' failed. Expected '%t', got '%t'",
-				tc.v1, tc.v2, e, a,
-			)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/.gitignore b/installer/vendor/github.com/Masterminds/vcs/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/installer/vendor/github.com/Masterminds/vcs/.travis.yml b/installer/vendor/github.com/Masterminds/vcs/.travis.yml
deleted file mode 100644
index f54b68d6c6..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/.travis.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-language: go
-
-go:
-  - 1.6.x
-  - 1.7.x
-  - 1.8.x
-  - 1.9.x
-  - master
-
-before_script:
-  - git version
-  - svn --version
-
-# Setting sudo access to false will let Travis CI use containers rather than
-# VMs to run the tests. For more details see:
-# - http://docs.travis-ci.com/user/workers/container-based-infrastructure/
-# - http://docs.travis-ci.com/user/workers/standard-infrastructure/
-sudo: false
-
-script:
-  - make setup
-  - make test
-
-notifications:
-  webhooks:
-    urls:
-      - https://webhooks.gitter.im/e/06e3328629952dabe3e0
-    on_success: change  # options: [always|never|change] default: always
-    on_failure: always  # options: [always|never|change] default: always
-    on_start: never     # options: [always|never|change] default: always
diff --git a/installer/vendor/github.com/Masterminds/vcs/CHANGELOG.md b/installer/vendor/github.com/Masterminds/vcs/CHANGELOG.md
deleted file mode 100644
index ff0f8280b4..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/CHANGELOG.md
+++ /dev/null
@@ -1,170 +0,0 @@
-# Changelog
-
-## 1.12.0 (2017-09-11)
-
-### Changed
-
-- #79: Include the error context in the error string (thanks @guywithnose)
-- #80: Bump the Go versions for Travis CI testing (thanks @AlekSi)
-
-## 1.11.1 (2017-04-28)
-
-### Fixed
-
-- #76: Fix submodule handling for Windows (thanks @m0j0hn)
-
-## 1.11.0 (2017-03-23)
-
-### Added
-
-- #65: Exposed CmdFromDir function (thanks @erizocosmico)
-
-### Changed
-
-- #69: Updated testing for Go 1.8
-
-### Fixed
-
-- #64: Testing fatal error if bzr not installed (thanks @kevinburke)
-
-## 1.10.2 (2017-01-24)
-
-### Fixed
-
-- #63: Remove extra quotes in submodule export (thanks @dt)
-
-## 1.10.1 (2017-01-18)
-
-### Fixed
-
-- #62: Added windows testing via appveyor and fixed issues under windows.
-
-## 1.10.0 (2017-01-09)
-
-### Added
-
-- #60: Handle Git submodules (thanks @sdboyer)
-- #61: Add gometalinter to testing
-
-## 1.9.0 (2016-11-18)
-
-### Added
-
-- #50: Auto-detect remotes with file:// prefix.
-- #59: Testing against Go 1.7
-
-### Changed
-
-- Removed auto-detection for Google Code as the service is deprecated
-- Added auto-detection of git.openstack.org
-
-### Fixed
-
-- #53: Git not fetching tags off branch
-
-## 1.8.0 (2016-06-29)
-
-### Added
-
-- #43: Detect when tool (e.g., git, svn, etc) not installed
-- #49: Detect access denied and not found situations
-
-### Changed
-
-- #48: Updated Go Report Gard url to new format
-- Refactored SVN handling to detect when not in a top level directory
-- Updating tagging to v[SemVer] structure for compatibility with other tools.
-
-### Fixed
-
-- #45: Fixed hg's update method so that it pulls from remote before updates
-
-## 1.7.0 (2016-05-05)
-
-- Adds a glide.yaml file with some limited information.
-- Implements #37: Ability to export source as a directory.
-- Implements #36: Get current version-ish with Current method. This returns
-  a branch (if on tip) or equivalent tip, a tag if on a tag, or a revision if
-  on an individual revision. Note, the tip of branch is VCS specific so usage
-  may require detecting VCS type.
-
-## 1.6.1 (2016-04-27)
-
-- Fixed #30: tags from commit should not have ^{} appended (seen in git)
-- Fixed #29: isDetachedHead fails with non-english locales (git)
-- Fixed #33: Access denied and not found http errors causing xml parsing errors
-
-## 1.6.0 (2016-04-18)
-
-- Issue #26: Added Init method to initialize a repo at the local location
-  (thanks tony).
-- Issue #19: Added method to retrieve tags for a commit.
-- Issue #24: Reworked errors returned from common methods. Now differing
-  VCS implementations return the same errors. The original VCS specific error
-  is available on the error. See the docs for more details.
-- Issue #25: Export the function RunFromDir which runs VCS commands from the
-  root of the local directory. This is useful for those that want to build and
-  extend on top of the vcs package (thanks tony).
-- Issue #22: Added Ping command to test if remote location is present and
-  accessible.
-
-## 1.5.1 (2016-03-23)
-
-- Fixing bug parsing some Git commit dates.
-
-## 1.5.0 (2016-03-22)
-
-- Add Travis CI testing for Go 1.6.
-- Issue #17: Add CommitInfo method allowing for a common way to get commit
-  metadata from all VCS.
-- Autodetect types that have git@ or hg@ users.
-- Autodetect git+ssh, bzr+ssh, git, and svn+ssh scheme urls.
-- On Bitbucket for ssh style URLs retrieve the type from the URL. This allows
-  for private repo type detection.
-- Issue #14: Autodetect ssh/scp style urls (thanks chonthu).
-
-## 1.4.1 (2016-03-07)
-
-- Fixes #16: some windows situations are unable to create parent directory.
-
-## 1.4.0 (2016-02-15)
-
-- Adding support for IBM JazzHub.
-
-## 1.3.1 (2016-01-27)
-
-- Issue #12: Failed to checkout Bzr repo when parent directory didn't
-  exist (thanks cyrilleverrier).
-
-## 1.3.0 (2015-11-09)
-
-- Issue #9: Added Date method to get the date/time of latest commit (thanks kamilchm).
-
-## 1.2.0 (2015-10-29)
-
-- Adding IsDirty method to detect a checkout with uncommitted changes.
-
-## 1.1.4 (2015-10-28)
-
-- Fixed #8: Git IsReference not detecting branches that have not been checked
-  out yet.
-
-## 1.1.3 (2015-10-21)
-
-- Fixing issue where there are multiple go-import statements for go redirects
-
-## 1.1.2 (2015-10-20)
-
-- Fixes #7: hg not checking out code when Get is called
-
-## 1.1.1 (2015-10-20)
-
-- Issue #6: Allow VCS commands to be run concurrently.
-
-## 1.1.0 (2015-10-19)
-
-- #5: Added output of failed command to returned errors.
-
-## 1.0.0 (2015-10-06)
-
-- Initial release.
diff --git a/installer/vendor/github.com/Masterminds/vcs/Makefile b/installer/vendor/github.com/Masterminds/vcs/Makefile
deleted file mode 100644
index 5d722c2f4b..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-.PHONY: setup
-setup:
-	go get -u gopkg.in/alecthomas/gometalinter.v1
-	gometalinter.v1 --install
-
-.PHONY: test
-test: validate lint
-	@echo "==> Running tests"
-	go test -v
-
-.PHONY: validate
-validate:
-# misspell finds the work adresář (used in bzr.go) as a mispelling of
-# address. It finds adres. An issue has been filed at
-# https://github.com/client9/misspell/issues/99. In the meantime adding
-# adres to the ignore list.
-	@echo "==> Running static validations"
-	@gometalinter.v1 \
-	  --disable-all \
-	  --linter "misspell:misspell -i adres -j 1 {path}/*.go:PATH:LINE:COL:MESSAGE" \
-	  --enable deadcode \
-	  --severity deadcode:error \
-	  --enable gofmt \
-	  --enable gosimple \
-	  --enable ineffassign \
-	  --enable misspell \
-	  --enable vet \
-	  --tests \
-	  --vendor \
-	  --deadline 60s \
-	  ./... || exit_code=1
-
-.PHONY: lint
-lint:
-	@echo "==> Running linters"
-	@gometalinter.v1 \
-	  --disable-all \
-	  --enable golint \
-	  --vendor \
-	  --deadline 60s \
-	  ./... || :
diff --git a/installer/vendor/github.com/Masterminds/vcs/README.md b/installer/vendor/github.com/Masterminds/vcs/README.md
deleted file mode 100644
index a11268513b..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-# VCS Repository Management for Go
-
-Manage repos in varying version control systems with ease through a common
-interface.
-
-[![Build Status](https://travis-ci.org/Masterminds/vcs.svg)](https://travis-ci.org/Masterminds/vcs) [![GoDoc](https://godoc.org/github.com/Masterminds/vcs?status.png)](https://godoc.org/github.com/Masterminds/vcs) [![Go Report Card](https://goreportcard.com/badge/github.com/Masterminds/vcs)](https://goreportcard.com/report/github.com/Masterminds/vcs)
-[![Build status](https://ci.appveyor.com/api/projects/status/vg3cjc561q2trobm?svg=true&passingText=windows%20build%20passing&failingText=windows%20build%20failing)](https://ci.appveyor.com/project/mattfarina/vcs)
-
-
-## Quick Usage
-
-Quick usage:
-
-	remote := "https://github.com/Masterminds/vcs"
-    local, _ := ioutil.TempDir("", "go-vcs")
-    repo, err := NewRepo(remote, local)
-
-In this case `NewRepo` will detect the VCS is Git and return a `GitRepo`. All of
-the repos implement the `Repo` interface with a common set of features between
-them.
-
-## Supported VCS
-
-Git, SVN, Bazaar (Bzr), and Mercurial (Hg) are currently supported. They each
-have their own type (e.g., `GitRepo`) that follow a simple naming pattern. Each
-type implements the `Repo` interface and has a constructor (e.g., `NewGitRepo`).
-The constructors have the same signature as `NewRepo`.
-
-## Features
-
-- Clone or checkout a repository depending on the version control system.
-- Pull updates to a repository.
-- Get the currently checked out commit id.
-- Checkout a commit id, branch, or tag (depending on the availability in the VCS).
-- Get a list of tags and branches in the VCS.
-- Check if a string value is a valid reference within the VCS.
-- More...
-
-For more details see [the documentation](https://godoc.org/github.com/Masterminds/vcs).
-
-## Motivation
-
-The package `golang.org/x/tools/go/vcs` provides some valuable functionality
-for working with packages in repositories in varying source control management
-systems. That package, while useful and well tested, is designed with a specific
-purpose in mind. Our uses went beyond the scope of that package. To implement
-our scope we built a package that went beyond the functionality and scope
-of `golang.org/x/tools/go/vcs`.
diff --git a/installer/vendor/github.com/Masterminds/vcs/appveyor.yml b/installer/vendor/github.com/Masterminds/vcs/appveyor.yml
deleted file mode 100644
index c0c9170fa7..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/appveyor.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\Masterminds\vcs
-shallow_clone: true
-
-environment:
-  GOPATH: C:\gopath
-
-platform:
-  - x64
-
-install:
-  - go version
-  - go env
-  - choco install -y bzr
-  - set PATH=C:\Program Files (x86)\Bazaar;%PATH%
-  - bzr --version
-
-build_script:
-  - go install -v ./...
-
-test_script:
-  - go test -v
-
-deploy: off
diff --git a/installer/vendor/github.com/Masterminds/vcs/bzr_test.go b/installer/vendor/github.com/Masterminds/vcs/bzr_test.go
deleted file mode 100644
index 4b2e50ec60..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/bzr_test.go
+++ /dev/null
@@ -1,328 +0,0 @@
-package vcs
-
-import (
-	"io/ioutil"
-	"path/filepath"
-	"time"
-	//"log"
-	"os"
-	"testing"
-)
-
-// Canary test to ensure BzrRepo implements the Repo interface.
-var _ Repo = &BzrRepo{}
-
-// To verify bzr is working we perform integration testing
-// with a known bzr service. Due to the long time of repeatedly checking out
-// repos these tests are structured to work together.
-
-func TestBzr(t *testing.T) {
-
-	tempDir, err := ioutil.TempDir("", "go-vcs-bzr-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewBzrRepo("https://launchpad.net/govcstestbzrrepo", tempDir+"/govcstestbzrrepo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if repo.Vcs() != Bzr {
-		t.Error("Bzr is detecting the wrong type")
-	}
-
-	// Check the basic getters.
-	if repo.Remote() != "https://launchpad.net/govcstestbzrrepo" {
-		t.Error("Remote not set properly")
-	}
-	if repo.LocalPath() != tempDir+"/govcstestbzrrepo" {
-		t.Error("Local disk location not set properly")
-	}
-
-	//Logger = log.New(os.Stdout, "", log.LstdFlags)
-
-	// Do an initial clone.
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to clone Bzr repo. Err was %s", err)
-	}
-
-	// Verify Bzr repo is a Bzr repo
-	if !repo.CheckLocal() {
-		t.Error("Problem checking out repo or Bzr CheckLocal is not working")
-	}
-
-	// Test internal lookup mechanism used outside of Bzr specific functionality.
-	ltype, err := DetectVcsFromFS(tempDir + "/govcstestbzrrepo")
-	if err != nil {
-		t.Error("detectVcsFromFS unable to Bzr repo")
-	}
-	if ltype != Bzr {
-		t.Errorf("detectVcsFromFS detected %s instead of Bzr type", ltype)
-	}
-
-	// Test NewRepo on existing checkout. This should simply provide a working
-	// instance without error based on looking at the local directory.
-	nrepo, nrerr := NewRepo("https://launchpad.net/govcstestbzrrepo", tempDir+"/govcstestbzrrepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-	// Verify the right oject is returned. It will check the local repo type.
-	if !nrepo.CheckLocal() {
-		t.Error("Wrong version returned from NewRepo")
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Bzr Current: %s", err)
-	}
-	if v != "-1" {
-		t.Errorf("Current failed to detect Bzr on tip of branch. Got version: %s", v)
-	}
-
-	err = repo.UpdateVersion("2")
-	if err != nil {
-		t.Errorf("Unable to update Bzr repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if v != "2" {
-		t.Error("Error checking checked out Bzr version")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Bzr Current: %s", err)
-	}
-	if v != "2" {
-		t.Errorf("Current failed to detect Bzr on rev 2 of branch. Got version: %s", v)
-	}
-
-	// Use Date to verify we are on the right commit.
-	d, err := repo.Date()
-	if d.Format(longForm) != "2015-07-31 09:50:42 -0400" {
-		t.Error("Error checking checked out Bzr commit date")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Perform an update.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Version()
-	if v != "3" {
-		t.Error("Error checking checked out Bzr version")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	tags, err := repo.Tags()
-	if err != nil {
-		t.Error(err)
-	}
-	if tags[0] != "1.0.0" {
-		t.Error("Bzr tags is not reporting the correct version")
-	}
-
-	tags, err = repo.TagsFromCommit("2")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 0 {
-		t.Error("Bzr is incorrectly returning tags for a commit")
-	}
-
-	tags, err = repo.TagsFromCommit("3")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 1 || tags[0] != "1.0.0" {
-		t.Error("Bzr is incorrectly returning tags for a commit")
-	}
-
-	branches, err := repo.Branches()
-	if err != nil {
-		t.Error(err)
-	}
-	if len(branches) != 0 {
-		t.Error("Bzr is incorrectly returning branches")
-	}
-
-	if !repo.IsReference("1.0.0") {
-		t.Error("Bzr is reporting a reference is not one")
-	}
-
-	if repo.IsReference("foo") {
-		t.Error("Bzr is reporting a non-existent reference is one")
-	}
-
-	if repo.IsDirty() {
-		t.Error("Bzr incorrectly reporting dirty")
-	}
-
-	ci, err := repo.CommitInfo("3")
-	if err != nil {
-		t.Error(err)
-	}
-	if ci.Commit != "3" {
-		t.Error("Bzr.CommitInfo wrong commit id")
-	}
-	if ci.Author != "Matt Farina <matt@mattfarina.com>" {
-		t.Error("Bzr.CommitInfo wrong author")
-	}
-	if ci.Message != "Updated Readme with pointer." {
-		t.Error("Bzr.CommitInfo wrong message")
-	}
-	ti, err := time.Parse(time.RFC1123Z, "Fri, 31 Jul 2015 09:51:37 -0400")
-	if err != nil {
-		t.Error(err)
-	}
-	if !ti.Equal(ci.Date) {
-		t.Error("Bzr.CommitInfo wrong date")
-	}
-
-	_, err = repo.CommitInfo("asdfasdfasdf")
-	if err != ErrRevisionUnavailable {
-		t.Error("Bzr didn't return expected ErrRevisionUnavailable")
-	}
-
-	tempDir2, err := ioutil.TempDir("", "go-vcs-bzr-tests-export")
-	if err != nil {
-		t.Fatalf("Error creating temp directory: %s", err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir2)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	exportDir := filepath.Join(tempDir2, "src")
-
-	err = repo.ExportDir(exportDir)
-	if err != nil {
-		t.Errorf("Unable to export Bzr repo. Err was %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, "Readme.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Bzr: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, string(repo.Vcs())))
-	if err != nil {
-		if found := os.IsNotExist(err); !found {
-			t.Errorf("Error checking exported metadata in Bzr: %s", err)
-		}
-	} else {
-		t.Error("Error checking Bzr metadata. It exists.")
-	}
-}
-
-func TestBzrCheckLocal(t *testing.T) {
-	// Verify repo.CheckLocal fails for non-Bzr directories.
-	// TestBzr is already checking on a valid repo
-	tempDir, err := ioutil.TempDir("", "go-vcs-bzr-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, _ := NewBzrRepo("", tempDir)
-	if repo.CheckLocal() {
-		t.Error("Bzr CheckLocal does not identify non-Bzr location")
-	}
-
-	// Test NewRepo when there's no local. This should simply provide a working
-	// instance without error based on looking at the remote localtion.
-	_, nrerr := NewRepo("https://launchpad.net/govcstestbzrrepo", tempDir+"/govcstestbzrrepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-}
-
-func TestBzrPing(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-bzr-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewBzrRepo("https://launchpad.net/govcstestbzrrepo", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping := repo.Ping()
-	if !ping {
-		t.Error("Bzr unable to ping working repo")
-	}
-
-	repo, err = NewBzrRepo("https://launchpad.net/ihopethisneverexistsbecauseitshouldnt", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping = repo.Ping()
-	if ping {
-		t.Error("Bzr got a ping response from when it should not have")
-	}
-}
-
-func TestBzrInit(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-bzr-tests")
-	repoDir := tempDir + "/repo"
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewBzrRepo(repoDir, repoDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = repo.Init()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err := repo.Version()
-	if err != nil {
-		t.Error(err)
-	}
-	if v != "0" {
-		t.Errorf("Bzr Init returns wrong version: %s", v)
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/errors_test.go b/installer/vendor/github.com/Masterminds/vcs/errors_test.go
deleted file mode 100644
index 2effd7ccab..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/errors_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package vcs
-
-import (
-	"errors"
-	"testing"
-)
-
-func TestNewRemoteError(t *testing.T) {
-	base := errors.New("Foo error")
-	out := "This is a test"
-	msg := "remote error msg"
-
-	e := NewRemoteError(msg, base, out)
-
-	switch e.(type) {
-	case *RemoteError:
-		// This is the right error type
-	default:
-		t.Error("Wrong error type returned from NewRemoteError")
-	}
-}
-
-func TestNewLocalError(t *testing.T) {
-	base := errors.New("Foo error")
-	out := "This is a test"
-	msg := "local error msg"
-
-	e := NewLocalError(msg, base, out)
-
-	switch e.(type) {
-	case *LocalError:
-		// This is the right error type
-	default:
-		t.Error("Wrong error type returned from NewLocalError")
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/git_test.go b/installer/vendor/github.com/Masterminds/vcs/git_test.go
deleted file mode 100644
index b58c2c2efd..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/git_test.go
+++ /dev/null
@@ -1,599 +0,0 @@
-package vcs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"time"
-	//"log"
-	"os"
-	"testing"
-)
-
-// Canary test to ensure GitRepo implements the Repo interface.
-var _ Repo = &GitRepo{}
-
-// To verify git is working we perform integration testing
-// with a known git service.
-
-func TestGit(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewGitRepo("https://github.com/Masterminds/VCSTestRepo", tempDir+"/VCSTestRepo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if repo.Vcs() != Git {
-		t.Error("Git is detecting the wrong type")
-	}
-
-	// Check the basic getters.
-	if repo.Remote() != "https://github.com/Masterminds/VCSTestRepo" {
-		t.Error("Remote not set properly")
-	}
-	if repo.LocalPath() != tempDir+"/VCSTestRepo" {
-		t.Error("Local disk location not set properly")
-	}
-
-	//Logger = log.New(os.Stdout, "", log.LstdFlags)
-
-	// Do an initial clone.
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to clone Git repo. Err was %s", err)
-	}
-
-	// Verify Git repo is a Git repo
-	if !repo.CheckLocal() {
-		t.Error("Problem checking out repo or Git CheckLocal is not working")
-	}
-
-	// Test internal lookup mechanism used outside of Git specific functionality.
-	ltype, err := DetectVcsFromFS(tempDir + "/VCSTestRepo")
-	if err != nil {
-		t.Error("detectVcsFromFS unable to Git repo")
-	}
-	if ltype != Git {
-		t.Errorf("detectVcsFromFS detected %s instead of Git type", ltype)
-	}
-
-	// Test NewRepo on existing checkout. This should simply provide a working
-	// instance without error based on looking at the local directory.
-	nrepo, nrerr := NewRepo("https://github.com/Masterminds/VCSTestRepo", tempDir+"/VCSTestRepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-	// Verify the right oject is returned. It will check the local repo type.
-	if !nrepo.CheckLocal() {
-		t.Error("Wrong version returned from NewRepo")
-	}
-
-	// Perform an update.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Git Current: %s", err)
-	}
-	if v != "master" {
-		t.Errorf("Current failed to detect Git on tip of master. Got version: %s", v)
-	}
-
-	// Set the version using the short hash.
-	err = repo.UpdateVersion("806b07b")
-	if err != nil {
-		t.Errorf("Unable to update Git repo version. Err was %s", err)
-	}
-
-	// Once a ref has been checked out the repo is in a detached head state.
-	// Trying to pull in an update in this state will cause an error. Update
-	// should cleanly handle this. Pulling on a branch (tested elsewhere) and
-	// skipping that here.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if v != "806b07b08faa21cfbdae93027904f80174679402" {
-		t.Error("Error checking checked out Git version")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Git Current for ref: %s", err)
-	}
-	if v != "806b07b08faa21cfbdae93027904f80174679402" {
-		t.Errorf("Current failed to detect Git on ref of branch. Got version: %s", v)
-	}
-
-	// Use Date to verify we are on the right commit.
-	d, err := repo.Date()
-	if d.Format(longForm) != "2015-07-29 09:46:39 -0400" {
-		t.Error("Error checking checked out Git commit date")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Verify that we can set the version something other than short hash
-	err = repo.UpdateVersion("master")
-	if err != nil {
-		t.Errorf("Unable to update Git repo version. Err was %s", err)
-	}
-	err = repo.UpdateVersion("806b07b08faa21cfbdae93027904f80174679402")
-	if err != nil {
-		t.Errorf("Unable to update Git repo version. Err was %s", err)
-	}
-	v, err = repo.Version()
-	if v != "806b07b08faa21cfbdae93027904f80174679402" {
-		t.Error("Error checking checked out Git version")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	tags, err := repo.Tags()
-	if err != nil {
-		t.Error(err)
-	}
-
-	var hasRelTag bool
-	var hasOffMasterTag bool
-
-	for _, tv := range tags {
-		if tv == "1.0.0" {
-			hasRelTag = true
-		} else if tv == "off-master-tag" {
-			hasOffMasterTag = true
-		}
-	}
-
-	if !hasRelTag {
-		t.Error("Git tags unable to find release tag on master")
-	}
-	if !hasOffMasterTag {
-		t.Error("Git tags did not fetch tags not on master")
-	}
-
-	tags, err = repo.TagsFromCommit("74dd547545b7df4aa285bcec1b54e2b76f726395")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 0 {
-		t.Error("Git is incorrectly returning tags for a commit")
-	}
-
-	tags, err = repo.TagsFromCommit("30605f6ac35fcb075ad0bfa9296f90a7d891523e")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 1 || tags[0] != "1.0.0" {
-		t.Error("Git is incorrectly returning tags for a commit")
-	}
-
-	branches, err := repo.Branches()
-	if err != nil {
-		t.Error(err)
-	}
-	// The branches should be HEAD, master, other, and test.
-	if branches[3] != "test" {
-		t.Error("Git is incorrectly returning branches")
-	}
-
-	if !repo.IsReference("1.0.0") {
-		t.Error("Git is reporting a reference is not one")
-	}
-
-	if repo.IsReference("foo") {
-		t.Error("Git is reporting a non-existent reference is one")
-	}
-
-	if repo.IsDirty() {
-		t.Error("Git incorrectly reporting dirty")
-	}
-
-	ci, err := repo.CommitInfo("806b07b08faa21cfbdae93027904f80174679402")
-	if err != nil {
-		t.Error(err)
-	}
-	if ci.Commit != "806b07b08faa21cfbdae93027904f80174679402" {
-		t.Error("Git.CommitInfo wrong commit id")
-	}
-	if ci.Author != "Matt Farina <matt@mattfarina.com>" {
-		t.Error("Git.CommitInfo wrong author")
-	}
-	if ci.Message != "Update README.md" {
-		t.Error("Git.CommitInfo wrong message")
-	}
-	ti, err := time.Parse(time.RFC1123Z, "Wed, 29 Jul 2015 09:46:39 -0400")
-	if err != nil {
-		t.Error(err)
-	}
-	if !ti.Equal(ci.Date) {
-		t.Error("Git.CommitInfo wrong date")
-	}
-
-	_, err = repo.CommitInfo("asdfasdfasdf")
-	if err != ErrRevisionUnavailable {
-		t.Error("Git didn't return expected ErrRevisionUnavailable")
-	}
-
-	tempDir2, err := ioutil.TempDir("", "go-vcs-git-tests-export")
-	if err != nil {
-		t.Fatalf("Error creating temp directory: %s", err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir2)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	exportDir := filepath.Join(tempDir2, "src")
-
-	err = repo.ExportDir(exportDir)
-	if err != nil {
-		t.Errorf("Unable to export Git repo. Err was %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, "README.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Git: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, string(repo.Vcs())))
-	if err != nil {
-		if found := os.IsNotExist(err); !found {
-			t.Errorf("Error checking exported metadata in Git: %s", err)
-		}
-	} else {
-		t.Error("Error checking Git metadata. It exists.")
-	}
-}
-
-func TestGitCheckLocal(t *testing.T) {
-	// Verify repo.CheckLocal fails for non-Git directories.
-	// TestGit is already checking on a valid repo
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, _ := NewGitRepo("", tempDir)
-	if repo.CheckLocal() {
-		t.Error("Git CheckLocal does not identify non-Git location")
-	}
-
-	// Test NewRepo when there's no local. This should simply provide a working
-	// instance without error based on looking at the remote localtion.
-	_, nrerr := NewRepo("https://github.com/Masterminds/VCSTestRepo", tempDir+"/VCSTestRepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-}
-
-func TestGitPing(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewGitRepo("https://github.com/Masterminds/VCSTestRepo", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping := repo.Ping()
-	if !ping {
-		t.Error("Git unable to ping working repo")
-	}
-
-	repo, err = NewGitRepo("https://github.com/Masterminds/ihopethisneverexistsbecauseitshouldnt", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping = repo.Ping()
-	if ping {
-		t.Error("Git got a ping response from when it should not have")
-	}
-}
-
-func TestGitInit(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-tests")
-	repoDir := tempDir + "/repo"
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewGitRepo(repoDir, repoDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = repo.Init()
-	if err != nil {
-		t.Error(err)
-	}
-
-	_, err = repo.RunFromDir("git", "status")
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestGitSubmoduleHandling(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-submodule-tests")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	dumplocal := func(err error) string {
-		if terr, ok := err.(*LocalError); ok {
-			return fmt.Sprintf("msg: %s\norig: %s\nout: %s", terr.Error(), terr.Original(), terr.Out())
-		}
-		return err.Error()
-	}
-
-	subdirExists := func(dir ...string) bool {
-		_, err := os.Stat(filepath.Join(append([]string{tempDir}, dir...)...))
-		return err == nil
-	}
-
-	// Initial clone should get version with two submodules, each of which have
-	// their own submodule
-	repo, err := NewGitRepo("https://github.com/sdboyer/subm", tempDir)
-	if err != nil {
-		t.Fatal(dumplocal(err))
-	}
-	err = repo.Get()
-	if err != nil {
-		t.Fatalf("unable to clone Git repo. Err was %s", dumplocal(err))
-	}
-
-	// Verify we are on the right version.
-	v, err := repo.Version()
-	if v != "18e3a5f6fc7f6d577e732e7a5ab2caf990efbf8f" {
-		t.Fatalf("did not start from expected rev, tests could fail - bailing out (got %s)", v)
-	}
-	if err != nil {
-		t.Fatal(dumplocal(err))
-	}
-
-	if !subdirExists("subm1", ".git") {
-		t.Fatal("subm1 submodule does not exist on initial clone/checkout")
-	}
-	if !subdirExists("subm1", "dep-test", ".git") {
-		t.Fatal("dep-test submodule nested under subm1 does not exist on initial clone/checkout")
-	}
-
-	if !subdirExists("subm-again", ".git") {
-		t.Fatal("subm-again submodule does not exist on initial clone/checkout")
-	}
-	if !subdirExists("subm-again", "dep-test", ".git") {
-		t.Fatal("dep-test submodule nested under subm-again does not exist on initial clone/checkout")
-	}
-
-	// Now switch to version with no submodules, make sure they all go away
-	err = repo.UpdateVersion("e677f82015f72ac1c8fafa66b5463163b3597af2")
-	if err != nil {
-		t.Fatalf("checking out needed version failed with err: %s", dumplocal(err))
-	}
-
-	if subdirExists("subm1") {
-		t.Fatal("checking out version without submodule did not clean up immediate submodules")
-	}
-	if subdirExists("subm1", "dep-test") {
-		t.Fatal("checking out version without submodule did not clean up nested submodules")
-	}
-	if subdirExists("subm-again") {
-		t.Fatal("checking out version without submodule did not clean up immediate submodules")
-	}
-	if subdirExists("subm-again", "dep-test") {
-		t.Fatal("checking out version without submodule did not clean up nested submodules")
-	}
-
-	err = repo.UpdateVersion("aaf7aa1bc4c3c682cc530eca8f80417088ee8540")
-	if err != nil {
-		t.Fatalf("checking out needed version failed with err: %s", dumplocal(err))
-	}
-
-	if !subdirExists("subm1", ".git") {
-		t.Fatal("checking out version with immediate submodule did not set up git subrepo")
-	}
-
-	err = repo.UpdateVersion("6cc4669af468f3b4f16e7e96275ad01ade5b522f")
-	if err != nil {
-		t.Fatalf("checking out needed version failed with err: %s", dumplocal(err))
-	}
-
-	if !subdirExists("subm1", "dep-test", ".git") {
-		t.Fatal("checking out version with nested submodule did not set up nested git subrepo")
-	}
-
-	err = repo.UpdateVersion("aaf7aa1bc4c3c682cc530eca8f80417088ee8540")
-	if err != nil {
-		t.Fatalf("checking out needed version failed with err: %s", dumplocal(err))
-	}
-
-	if subdirExists("subm1", "dep-test") {
-		t.Fatal("rolling back to version without nested submodule did not clean up the nested submodule")
-	}
-
-	err = repo.UpdateVersion("18e3a5f6fc7f6d577e732e7a5ab2caf990efbf8f")
-	if err != nil {
-		t.Fatalf("checking out needed version failed with err: %s", dumplocal(err))
-	}
-
-	if !subdirExists("subm1", ".git") {
-		t.Fatal("subm1 submodule does not exist after switch from other commit")
-	}
-	if !subdirExists("subm1", "dep-test", ".git") {
-		t.Fatal("dep-test submodule nested under subm1 does not exist after switch from other commit")
-	}
-
-	if !subdirExists("subm-again", ".git") {
-		t.Fatal("subm-again submodule does not exist after switch from other commit")
-	}
-	if !subdirExists("subm-again", "dep-test", ".git") {
-		t.Fatal("dep-test submodule nested under subm-again does not exist after switch from other commit")
-	}
-
-}
-
-func TestGitSubmoduleHandling2(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-submodule-tests2")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewGitRepo("https://github.com/cloudfoundry/sonde-go", tempDir+"/VCSTestRepo2")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if repo.Vcs() != Git {
-		t.Error("Git is detecting the wrong type")
-	}
-
-	// Check the basic getters.
-	if repo.Remote() != "https://github.com/cloudfoundry/sonde-go" {
-		t.Error("Remote not set properly")
-	}
-	if repo.LocalPath() != tempDir+"/VCSTestRepo2" {
-		t.Error("Local disk location not set properly")
-	}
-
-	//Logger = log.New(os.Stdout, "", log.LstdFlags)
-
-	// Do an initial clone.
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to clone Git repo. Err was %s", err)
-	}
-
-	// Verify Git repo is a Git repo
-	if !repo.CheckLocal() {
-		t.Error("Problem checking out repo or Git CheckLocal is not working")
-	}
-
-	// Test internal lookup mechanism used outside of Git specific functionality.
-	ltype, err := DetectVcsFromFS(tempDir + "/VCSTestRepo2")
-	if err != nil {
-		t.Error("detectVcsFromFS unable to Git repo")
-	}
-	if ltype != Git {
-		t.Errorf("detectVcsFromFS detected %s instead of Git type", ltype)
-	}
-
-	// Test NewRepo on existing checkout. This should simply provide a working
-	// instance without error based on looking at the local directory.
-	nrepo, nrerr := NewRepo("https://github.com/cloudfoundry/sonde-go", tempDir+"/VCSTestRepo2")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-	// Verify the right oject is returned. It will check the local repo type.
-	if !nrepo.CheckLocal() {
-		t.Error("Wrong version returned from NewRepo")
-	}
-
-	// Perform an update.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Git Current: %s", err)
-	}
-	if v != "master" {
-		t.Errorf("Current failed to detect Git on tip of master. Got version: %s", v)
-	}
-
-
-	tempDir2, err := ioutil.TempDir("", "go-vcs-git-tests-export")
-	if err != nil {
-		t.Fatalf("Error creating temp directory: %s", err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir2)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	exportDir := filepath.Join(tempDir2, "src")
-
-	err = repo.ExportDir(exportDir)
-	if err != nil {
-		t.Errorf("Unable to export Git repo. Err was %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, "README.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Git: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join( filepath.Join(exportDir, "definitions"), "README.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Git: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, string(repo.Vcs())))
-	if err != nil {
-		if found := os.IsNotExist(err); !found {
-			t.Errorf("Error checking exported metadata in Git: %s", err)
-		}
-	} else {
-		t.Error("Error checking Git metadata. It exists.")
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/glide.yaml b/installer/vendor/github.com/Masterminds/vcs/glide.yaml
deleted file mode 100644
index b96e0bd3e7..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/glide.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
-package: github.com/Masterminds/vcs
-homepage: https://github.com/Masterminds/vcs
-license: MIT
-owners:
-- name: Matt Farina
-  email: matt@mattfarina.com
-  homepage: https://www.mattfarina.com/
-import: []
diff --git a/installer/vendor/github.com/Masterminds/vcs/hg_test.go b/installer/vendor/github.com/Masterminds/vcs/hg_test.go
deleted file mode 100644
index 6b19f72809..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/hg_test.go
+++ /dev/null
@@ -1,332 +0,0 @@
-package vcs
-
-import (
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-	"time"
-	//"log"
-	"os"
-	"testing"
-)
-
-// Canary test to ensure HgRepo implements the Repo interface.
-var _ Repo = &HgRepo{}
-
-// To verify hg is working we perform integration testing
-// with a known hg service.
-
-func TestHg(t *testing.T) {
-
-	tempDir, err := ioutil.TempDir("", "go-vcs-hg-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewHgRepo("https://bitbucket.org/mattfarina/testhgrepo", tempDir+"/testhgrepo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if repo.Vcs() != Hg {
-		t.Error("Hg is detecting the wrong type")
-	}
-
-	// Check the basic getters.
-	if repo.Remote() != "https://bitbucket.org/mattfarina/testhgrepo" {
-		t.Error("Remote not set properly")
-	}
-	if repo.LocalPath() != tempDir+"/testhgrepo" {
-		t.Error("Local disk location not set properly")
-	}
-
-	//Logger = log.New(os.Stdout, "", log.LstdFlags)
-
-	// Do an initial clone.
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to clone Hg repo. Err was %s", err)
-	}
-
-	// Verify Hg repo is a Hg repo
-	if !repo.CheckLocal() {
-		t.Error("Problem checking out repo or Hg CheckLocal is not working")
-	}
-
-	// Test internal lookup mechanism used outside of Hg specific functionality.
-	ltype, err := DetectVcsFromFS(tempDir + "/testhgrepo")
-	if err != nil {
-		t.Error("detectVcsFromFS unable to Hg repo")
-	}
-	if ltype != Hg {
-		t.Errorf("detectVcsFromFS detected %s instead of Hg type", ltype)
-	}
-
-	// Test NewRepo on existing checkout. This should simply provide a working
-	// instance without error based on looking at the local directory.
-	nrepo, nrerr := NewRepo("https://bitbucket.org/mattfarina/testhgrepo", tempDir+"/testhgrepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-	// Verify the right oject is returned. It will check the local repo type.
-	if !nrepo.CheckLocal() {
-		t.Error("Wrong version returned from NewRepo")
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Hg Current: %s", err)
-	}
-	if v != "default" {
-		t.Errorf("Current failed to detect Hg on tip of default. Got version: %s", v)
-	}
-
-	// Set the version using the short hash.
-	err = repo.UpdateVersion("a5494ba2177f")
-	if err != nil {
-		t.Errorf("Unable to update Hg repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if v != "a5494ba2177ff9ef26feb3c155dfecc350b1a8ef" {
-		t.Errorf("Error checking checked out Hg version: %s", v)
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Hg Current for ref: %s", err)
-	}
-	if v != "a5494ba2177ff9ef26feb3c155dfecc350b1a8ef" {
-		t.Errorf("Current failed to detect Hg on ref of branch. Got version: %s", v)
-	}
-
-	// Use Date to verify we are on the right commit.
-	d, err := repo.Date()
-	if err != nil {
-		t.Error(err)
-	}
-	if d.Format(longForm) != "2015-07-30 16:14:08 -0400" {
-		t.Error("Error checking checked out Hg commit date. Got wrong date:", d)
-	}
-
-	// Perform an update.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Version()
-	if v != "9c6ccbca73e8a1351c834f33f57f1f7a0329ad35" {
-		t.Errorf("Error checking checked out Hg version: %s", v)
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	tags, err := repo.Tags()
-	if err != nil {
-		t.Error(err)
-	}
-	if tags[1] != "1.0.0" {
-		t.Error("Hg tags is not reporting the correct version")
-	}
-
-	tags, err = repo.TagsFromCommit("a5494ba2177f")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 0 {
-		t.Error("Hg is incorrectly returning tags for a commit")
-	}
-
-	tags, err = repo.TagsFromCommit("d680e82228d2")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 1 || tags[0] != "1.0.0" {
-		t.Error("Hg is incorrectly returning tags for a commit")
-	}
-
-	branches, err := repo.Branches()
-	if err != nil {
-		t.Error(err)
-	}
-	// The branches should be HEAD, master, and test.
-	if branches[0] != "test" {
-		t.Error("Hg is incorrectly returning branches")
-	}
-
-	if !repo.IsReference("1.0.0") {
-		t.Error("Hg is reporting a reference is not one")
-	}
-
-	if !repo.IsReference("test") {
-		t.Error("Hg is reporting a reference is not one")
-	}
-
-	if repo.IsReference("foo") {
-		t.Error("Hg is reporting a non-existent reference is one")
-	}
-
-	if repo.IsDirty() {
-		t.Error("Hg incorrectly reporting dirty")
-	}
-
-	ci, err := repo.CommitInfo("a5494ba2177f")
-	if err != nil {
-		t.Error(err)
-	}
-	if ci.Commit != "a5494ba2177ff9ef26feb3c155dfecc350b1a8ef" {
-		t.Error("Hg.CommitInfo wrong commit id")
-	}
-	if ci.Author != "Matt Farina <matt@mattfarina.com>" {
-		t.Error("Hg.CommitInfo wrong author")
-	}
-	if ci.Message != "A commit" {
-		t.Error("Hg.CommitInfo wrong message")
-	}
-
-	ti := time.Unix(1438287248, 0)
-	if !ti.Equal(ci.Date) {
-		t.Error("Hg.CommitInfo wrong date")
-	}
-
-	_, err = repo.CommitInfo("asdfasdfasdf")
-	if err != ErrRevisionUnavailable {
-		t.Error("Hg didn't return expected ErrRevisionUnavailable")
-	}
-
-	tempDir2, err := ioutil.TempDir("", "go-vcs-hg-tests-export")
-	if err != nil {
-		t.Fatalf("Error creating temp directory: %s", err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir2)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	exportDir := filepath.Join(tempDir2, "src")
-
-	err = repo.ExportDir(exportDir)
-	if err != nil {
-		t.Errorf("Unable to export Hg repo. Err was %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, "Readme.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Hg: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, string(repo.Vcs())))
-	if err != nil {
-		if found := os.IsNotExist(err); !found {
-			t.Errorf("Error checking exported metadata in Hg: %s", err)
-		}
-	} else {
-		t.Error("Error checking Hg metadata. It exists.")
-	}
-}
-
-func TestHgCheckLocal(t *testing.T) {
-	// Verify repo.CheckLocal fails for non-Hg directories.
-	// TestHg is already checking on a valid repo
-	tempDir, err := ioutil.TempDir("", "go-vcs-hg-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, _ := NewHgRepo("", tempDir)
-	if repo.CheckLocal() {
-		t.Error("Hg CheckLocal does not identify non-Hg location")
-	}
-
-	// Test NewRepo when there's no local. This should simply provide a working
-	// instance without error based on looking at the remote localtion.
-	_, nrerr := NewRepo("https://bitbucket.org/mattfarina/testhgrepo", tempDir+"/testhgrepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-}
-
-func TestHgPing(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-hg-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewHgRepo("https://bitbucket.org/mattfarina/testhgrepo", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping := repo.Ping()
-	if !ping {
-		t.Error("Hg unable to ping working repo")
-	}
-
-	repo, err = NewHgRepo("https://bitbucket.org/mattfarina/ihopethisneverexistsbecauseitshouldnt", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping = repo.Ping()
-	if ping {
-		t.Error("Hg got a ping response from when it should not have")
-	}
-}
-
-func TestHgInit(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-hg-tests")
-	repoDir := tempDir + "/repo"
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewHgRepo(repoDir, repoDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = repo.Init()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err := repo.Version()
-	if err != nil {
-		t.Error(err)
-	}
-	if !strings.HasPrefix(v, "000000") {
-		t.Errorf("Hg Init reporting wrong initial version: %s", v)
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/repo_test.go b/installer/vendor/github.com/Masterminds/vcs/repo_test.go
deleted file mode 100644
index 8c083b3fc4..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/repo_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package vcs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-func ExampleNewRepo() {
-	remote := "https://github.com/Masterminds/vcs"
-	local, _ := ioutil.TempDir("", "go-vcs")
-	repo, _ := NewRepo(remote, local)
-	// Returns: instance of GitRepo
-
-	repo.Vcs()
-	// Returns Git as this is a Git repo
-
-	err := repo.Get()
-	// Pulls down a repo, or a checkout in the case of SVN, and returns an
-	// error if that didn't happen successfully.
-	if err != nil {
-		fmt.Println(err)
-	}
-
-	err = repo.UpdateVersion("master")
-	// Checkouts out a specific version. In most cases this can be a commit id,
-	// branch, or tag.
-	if err != nil {
-		fmt.Println(err)
-	}
-}
-
-func TestTypeSwitch(t *testing.T) {
-
-	// To test repo type switching we checkout as SVN and then try to get it as
-	// a git repo afterwards.
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewSvnRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir+string(os.PathSeparator)+"VCSTestRepo")
-	if err != nil {
-		t.Error(err)
-	}
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to checkout SVN repo for repo switching tests. Err was %s", err)
-	}
-
-	_, err = NewRepo("https://github.com/Masterminds/VCSTestRepo", tempDir+string(os.PathSeparator)+"VCSTestRepo")
-	if err != ErrWrongVCS {
-		t.Errorf("Not detecting repo switch from SVN to Git")
-	}
-}
-
-func TestDepInstalled(t *testing.T) {
-	i := depInstalled("git")
-	if !i {
-		t.Error("depInstalled not finding installed dep.")
-	}
-
-	i = depInstalled("thisreallyisntinstalled")
-	if i {
-		t.Error("depInstalled finding not installed dep.")
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/svn_test.go b/installer/vendor/github.com/Masterminds/vcs/svn_test.go
deleted file mode 100644
index 93fc139ab9..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/svn_test.go
+++ /dev/null
@@ -1,337 +0,0 @@
-package vcs
-
-import (
-	"io/ioutil"
-	"path/filepath"
-	"time"
-	//"log"
-	"os"
-	"testing"
-)
-
-// To verify svn is working we perform integration testing
-// with a known svn service.
-
-// Canary test to ensure SvnRepo implements the Repo interface.
-var _ Repo = &SvnRepo{}
-
-func TestSvn(t *testing.T) {
-
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewSvnRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir+string(os.PathSeparator)+"VCSTestRepo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if repo.Vcs() != Svn {
-		t.Error("Svn is detecting the wrong type")
-	}
-
-	// Check the basic getters.
-	if repo.Remote() != "https://github.com/Masterminds/VCSTestRepo/trunk" {
-		t.Error("Remote not set properly")
-	}
-	if repo.LocalPath() != tempDir+string(os.PathSeparator)+"VCSTestRepo" {
-		t.Error("Local disk location not set properly")
-	}
-
-	//Logger = log.New(os.Stdout, "", log.LstdFlags)
-
-	// Do an initial checkout.
-	err = repo.Get()
-	if err != nil {
-		t.Errorf("Unable to checkout SVN repo. Err was %s", err)
-	}
-
-	// Verify SVN repo is a SVN repo
-	if !repo.CheckLocal() {
-		t.Error("Problem checking out repo or SVN CheckLocal is not working")
-	}
-
-	// Verify an incorrect remote is caught when NewSvnRepo is used on an existing location
-	_, nrerr := NewSvnRepo("https://github.com/Masterminds/VCSTestRepo/unknownbranch", tempDir+"/VCSTestRepo")
-	if nrerr != ErrWrongRemote {
-		t.Error("ErrWrongRemote was not triggered for SVN")
-	}
-
-	// Test internal lookup mechanism used outside of Hg specific functionality.
-	ltype, err := DetectVcsFromFS(tempDir + "/VCSTestRepo")
-	if err != nil {
-		t.Error("detectVcsFromFS unable to Svn repo")
-	}
-	if ltype != Svn {
-		t.Errorf("detectVcsFromFS detected %s instead of Svn type", ltype)
-	}
-
-	// Commenting out auto-detection tests for SVN. NewRepo automatically detects
-	// GitHub to be a Git repo and that's an issue for this test. Need an
-	// SVN host that can autodetect from before using this test again.
-	//
-	// Test NewRepo on existing checkout. This should simply provide a working
-	// instance without error based on looking at the local directory.
-	// nrepo, nrerr := NewRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir+"/VCSTestRepo")
-	// if nrerr != nil {
-	// 	t.Error(nrerr)
-	// }
-	// // Verify the right oject is returned. It will check the local repo type.
-	// if nrepo.CheckLocal() == false {
-	// 	t.Error("Wrong version returned from NewRepo")
-	// }
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Svn Current: %s", err)
-	}
-	if v != "HEAD" {
-		t.Errorf("Current failed to detect Svn on HEAD. Got version: %s", v)
-	}
-
-	// Update the version to a previous version.
-	err = repo.UpdateVersion("r2")
-	if err != nil {
-		t.Errorf("Unable to update SVN repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if v != "2" {
-		t.Error("Error checking checked SVN out version")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err = repo.Current()
-	if err != nil {
-		t.Errorf("Error trying Svn Current for ref: %s", err)
-	}
-	if v != "2" {
-		t.Errorf("Current failed to detect Svn on HEAD. Got version: %s", v)
-	}
-
-	// Perform an update which should take up back to the latest version.
-	err = repo.Update()
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Make sure we are on a newer version because of the update.
-	v, err = repo.Version()
-	if v == "2" {
-		t.Error("Error with version. Still on old version. Update failed")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Use Date to verify we are on the right commit.
-	d, err := repo.Date()
-	if d.Format(longForm) != "2015-07-29 13:47:03 +0000" {
-		t.Error("Error checking checked out Svn commit date")
-	}
-	if err != nil {
-		t.Error(err)
-	}
-
-	tags, err := repo.Tags()
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 0 {
-		t.Error("Svn is incorrectly returning tags")
-	}
-
-	tags, err = repo.TagsFromCommit("2")
-	if err != nil {
-		t.Error(err)
-	}
-	if len(tags) != 0 {
-		t.Error("Svn is incorrectly returning tags for a commit")
-	}
-
-	branches, err := repo.Branches()
-	if err != nil {
-		t.Error(err)
-	}
-	if len(branches) != 0 {
-		t.Error("Svn is incorrectly returning branches")
-	}
-
-	if !repo.IsReference("r4") {
-		t.Error("Svn is reporting a reference is not one")
-	}
-
-	if repo.IsReference("55") {
-		t.Error("Svn is reporting a non-existent reference is one")
-	}
-
-	if repo.IsDirty() {
-		t.Error("Svn incorrectly reporting dirty")
-	}
-
-	ci, err := repo.CommitInfo("2")
-	if err != nil {
-		t.Error(err)
-	}
-	if ci.Commit != "2" {
-		t.Error("Svn.CommitInfo wrong commit id")
-	}
-	if ci.Author != "matt.farina" {
-		t.Error("Svn.CommitInfo wrong author")
-	}
-	if ci.Message != "Update README.md" {
-		t.Error("Svn.CommitInfo wrong message")
-	}
-	ti, err := time.Parse(time.RFC3339Nano, "2015-07-29T13:46:20.000000Z")
-	if err != nil {
-		t.Error(err)
-	}
-	if !ti.Equal(ci.Date) {
-		t.Error("Svn.CommitInfo wrong date")
-	}
-
-	_, err = repo.CommitInfo("555555555")
-	if err != ErrRevisionUnavailable {
-		t.Error("Svn didn't return expected ErrRevisionUnavailable")
-	}
-
-	tempDir2, err := ioutil.TempDir("", "go-vcs-svn-tests-export")
-	if err != nil {
-		t.Fatalf("Error creating temp directory: %s", err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir2)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	exportDir := filepath.Join(tempDir2, "src")
-
-	err = repo.ExportDir(exportDir)
-	if err != nil {
-		t.Errorf("Unable to export Svn repo. Err was %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, "README.md"))
-	if err != nil {
-		t.Errorf("Error checking exported file in Svn: %s", err)
-	}
-
-	_, err = os.Stat(filepath.Join(exportDir, string(repo.Vcs())))
-	if err != nil {
-		if found := os.IsNotExist(err); !found {
-			t.Errorf("Error checking exported metadata in Svn: %s", err)
-		}
-	} else {
-		t.Error("Error checking Svn metadata. It exists.")
-	}
-}
-
-func TestSvnCheckLocal(t *testing.T) {
-	// Verify repo.CheckLocal fails for non-SVN directories.
-	// TestSvn is already checking on a valid repo
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, _ := NewSvnRepo("", tempDir)
-	if repo.CheckLocal() {
-		t.Error("SVN CheckLocal does not identify non-SVN location")
-	}
-
-	// Test NewRepo when there's no local. This should simply provide a working
-	// instance without error based on looking at the remote localtion.
-	_, nrerr := NewRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir+"/VCSTestRepo")
-	if nrerr != nil {
-		t.Error(nrerr)
-	}
-}
-
-func TestSvnPing(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewSvnRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping := repo.Ping()
-	if !ping {
-		t.Error("Svn unable to ping working repo")
-	}
-
-	repo, err = NewSvnRepo("https://github.com/Masterminds/ihopethisneverexistsbecauseitshouldnt", tempDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	ping = repo.Ping()
-	if ping {
-		t.Error("Svn got a ping response from when it should not have")
-	}
-}
-
-func TestSvnInit(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	remoteDir := tempDir + string(os.PathSeparator) + "remoteDir"
-	localDir := tempDir + string(os.PathSeparator) + "localDir"
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	repo, err := NewSvnRepo(remoteDir, localDir)
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = repo.Init()
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = repo.Get()
-	if err != nil {
-		t.Error(err)
-	}
-
-	v, err := repo.Version()
-	if err != nil {
-		t.Error(err)
-	}
-	if v != "0" {
-		t.Errorf("Svn Init returns wrong version: %s", v)
-	}
-}
diff --git a/installer/vendor/github.com/Masterminds/vcs/vcs_remote_lookup_test.go b/installer/vendor/github.com/Masterminds/vcs/vcs_remote_lookup_test.go
deleted file mode 100644
index 938cb0ebc5..0000000000
--- a/installer/vendor/github.com/Masterminds/vcs/vcs_remote_lookup_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package vcs
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestVCSLookup(t *testing.T) {
-	// TODO: Expand to make sure it detected the right vcs.
-	urlList := map[string]struct {
-		work bool
-		t    Type
-	}{
-		"https://github.com/masterminds":                                   {work: false, t: Git},
-		"https://github.com/Masterminds/VCSTestRepo":                       {work: true, t: Git},
-		"https://bitbucket.org/mattfarina/testhgrepo":                      {work: true, t: Hg},
-		"https://bitbucket.org/mattfarina/repo-does-not-exist":             {work: false, t: Hg},
-		"https://bitbucket.org/mattfarina/private-repo-for-vcs-testing":    {work: false, t: Hg},
-		"https://launchpad.net/govcstestbzrrepo/trunk":                     {work: true, t: Bzr},
-		"https://launchpad.net/~mattfarina/+junk/mygovcstestbzrrepo":       {work: true, t: Bzr},
-		"https://launchpad.net/~mattfarina/+junk/mygovcstestbzrrepo/trunk": {work: true, t: Bzr},
-		"https://git.launchpad.net/govcstestgitrepo":                       {work: true, t: Git},
-		"https://git.launchpad.net/~mattfarina/+git/mygovcstestgitrepo":    {work: true, t: Git},
-		"https://hub.jazz.net/git/user1/pkgname":                           {work: true, t: Git},
-		"https://hub.jazz.net/git/user1/pkgname/subpkg/subpkg/subpkg":      {work: true, t: Git},
-		"https://hubs.jazz.net/git/user1/pkgname":                          {work: false, t: Git},
-		"https://example.com/foo/bar.git":                                  {work: true, t: Git},
-		"https://example.com/foo/bar.svn":                                  {work: true, t: Svn},
-		"https://example.com/foo/bar/baz.bzr":                              {work: true, t: Bzr},
-		"https://example.com/foo/bar/baz.hg":                               {work: true, t: Hg},
-		"https://gopkg.in/tomb.v1":                                         {work: true, t: Git},
-		"https://golang.org/x/net":                                         {work: true, t: Git},
-		"https://speter.net/go/exp/math/dec/inf":                           {work: true, t: Git},
-		"https://git.openstack.org/foo/bar":                                {work: true, t: Git},
-		"git@github.com:Masterminds/vcs.git":                               {work: true, t: Git},
-		"git@example.com:foo.git":                                          {work: true, t: Git},
-		"ssh://hg@bitbucket.org/mattfarina/testhgrepo":                     {work: true, t: Hg},
-		"git@bitbucket.org:mattfarina/glide-bitbucket-example.git":         {work: true, t: Git},
-		"git+ssh://example.com/foo/bar":                                    {work: true, t: Git},
-		"git://example.com/foo/bar":                                        {work: true, t: Git},
-		"bzr+ssh://example.com/foo/bar":                                    {work: true, t: Bzr},
-		"svn+ssh://example.com/foo/bar":                                    {work: true, t: Svn},
-		"git@example.com:foo/bar":                                          {work: true, t: Git},
-		"hg@example.com:foo/bar":                                           {work: true, t: Hg},
-	}
-
-	for u, c := range urlList {
-		ty, _, err := detectVcsFromRemote(u)
-		if err == nil && !c.work {
-			t.Errorf("Error detecting VCS from URL(%s)", u)
-		}
-
-		if err == ErrCannotDetectVCS && c.work {
-			t.Errorf("Error detecting VCS from URL(%s)", u)
-		}
-
-		if err != nil && c.work {
-			t.Errorf("Error detecting VCS from URL(%s): %s", u, err)
-		}
-
-		if err != nil &&
-			err != ErrCannotDetectVCS &&
-			!strings.HasSuffix(err.Error(), "Not Found") &&
-			!strings.HasSuffix(err.Error(), "Access Denied") &&
-			!c.work {
-			t.Errorf("Unexpected error returned (%s): %s", u, err)
-		}
-
-		if c.work && ty != c.t {
-			t.Errorf("Incorrect VCS type returned(%s)", u)
-		}
-	}
-}
-
-func TestVCSFileLookup(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "go-vcs-file-lookup-tests")
-	if err != nil {
-		t.Error(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	_, err = exec.Command("git", "init", tempDir).CombinedOutput()
-	if err != nil {
-		t.Error(err)
-	}
-
-	// On Windows it should be file:// followed by /C:\for\bar. That / before
-	// the drive needs to be included in testing.
-	var pth string
-	if runtime.GOOS == "windows" {
-		pth = "file:///" + tempDir
-	} else {
-		pth = "file://" + tempDir
-	}
-	ty, _, err := detectVcsFromRemote(pth)
-
-	if err != nil {
-		t.Errorf("Unable to detect file:// path: %s", err)
-	}
-
-	if ty != Git {
-		t.Errorf("Detected wrong type from file:// path. Found type %v", ty)
-	}
-}
-
-func TestNotFound(t *testing.T) {
-	_, _, err := detectVcsFromRemote("https://mattfarina.com/notfound")
-	if err == nil || !strings.HasSuffix(err.Error(), " Not Found") {
-		t.Errorf("Failed to find not found repo")
-	}
-
-	_, err = NewRepo("https://mattfarina.com/notfound", "")
-	if err == nil || !strings.HasSuffix(err.Error(), " Not Found") {
-		t.Errorf("Failed to find not found repo")
-	}
-}
-
-func TestAccessDenied(t *testing.T) {
-	_, _, err := detectVcsFromRemote("https://bitbucket.org/mattfarina/private-repo-for-vcs-testing")
-	if err == nil || err.Error() != "Access Denied" {
-		t.Errorf("Failed to detect access denied")
-	}
-
-	_, err = NewRepo("https://bitbucket.org/mattfarina/private-repo-for-vcs-testing", "")
-	if err == nil || err.Error() != "Access Denied" {
-		t.Errorf("Failed to detect access denied")
-	}
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/.gitignore b/installer/vendor/github.com/Sirupsen/logrus/.gitignore
deleted file mode 100644
index 66be63a005..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-logrus
diff --git a/installer/vendor/github.com/Sirupsen/logrus/.travis.yml b/installer/vendor/github.com/Sirupsen/logrus/.travis.yml
deleted file mode 100644
index dee4eb2cc7..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-go:
-  - 1.3
-  - 1.4
-  - 1.5
-  - 1.6
-  - tip
-install:
-  - go get -t ./...
-script: GOMAXPROCS=4 GORACE="halt_on_error=1" go test -race -v ./...
diff --git a/installer/vendor/github.com/Sirupsen/logrus/CHANGELOG.md b/installer/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
deleted file mode 100644
index f2c2bc2111..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/CHANGELOG.md
+++ /dev/null
@@ -1,66 +0,0 @@
-# 0.10.0
-
-* feature: Add a test hook (#180)
-* feature: `ParseLevel` is now case-insensitive (#326)
-* feature: `FieldLogger` interface that generalizes `Logger` and `Entry` (#308)
-* performance: avoid re-allocations on `WithFields` (#335)
-
-# 0.9.0
-
-* logrus/text_formatter: don't emit empty msg
-* logrus/hooks/airbrake: move out of main repository
-* logrus/hooks/sentry: move out of main repository
-* logrus/hooks/papertrail: move out of main repository
-* logrus/hooks/bugsnag: move out of main repository
-* logrus/core: run tests with `-race`
-* logrus/core: detect TTY based on `stderr`
-* logrus/core: support `WithError` on logger
-* logrus/core: Solaris support
-
-# 0.8.7
-
-* logrus/core: fix possible race (#216)
-* logrus/doc: small typo fixes and doc improvements
-
-
-# 0.8.6
-
-* hooks/raven: allow passing an initialized client
-
-# 0.8.5
-
-* logrus/core: revert #208
-
-# 0.8.4
-
-* formatter/text: fix data race (#218)
-
-# 0.8.3
-
-* logrus/core: fix entry log level (#208)
-* logrus/core: improve performance of text formatter by 40%
-* logrus/core: expose `LevelHooks` type
-* logrus/core: add support for DragonflyBSD and NetBSD
-* formatter/text: print structs more verbosely
-
-# 0.8.2
-
-* logrus: fix more Fatal family functions
-
-# 0.8.1
-
-* logrus: fix not exiting on `Fatalf` and `Fatalln`
-
-# 0.8.0
-
-* logrus: defaults to stderr instead of stdout
-* hooks/sentry: add special field for `*http.Request`
-* formatter/text: ignore Windows for colors
-
-# 0.7.3
-
-* formatter/\*: allow configuration of timestamp layout
-
-# 0.7.2
-
-* formatter/text: Add configuration option for time format (#158)
diff --git a/installer/vendor/github.com/Sirupsen/logrus/README.md b/installer/vendor/github.com/Sirupsen/logrus/README.md
deleted file mode 100644
index 126cd1fc2b..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/README.md
+++ /dev/null
@@ -1,425 +0,0 @@
-# Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>&nbsp;[![Build Status](https://travis-ci.org/Sirupsen/logrus.svg?branch=master)](https://travis-ci.org/Sirupsen/logrus)&nbsp;[![GoDoc](https://godoc.org/github.com/Sirupsen/logrus?status.svg)](https://godoc.org/github.com/Sirupsen/logrus)
-
-Logrus is a structured logger for Go (golang), completely API compatible with
-the standard library logger. [Godoc][godoc]. **Please note the Logrus API is not
-yet stable (pre 1.0). Logrus itself is completely stable and has been used in
-many large deployments. The core API is unlikely to change much but please
-version control your Logrus to make sure you aren't fetching latest `master` on
-every build.**
-
-Nicely color-coded in development (when a TTY is attached, otherwise just
-plain text):
-
-![Colored](http://i.imgur.com/PY7qMwd.png)
-
-With `log.SetFormatter(&log.JSONFormatter{})`, for easy parsing by logstash
-or Splunk:
-
-```json
-{"animal":"walrus","level":"info","msg":"A group of walrus emerges from the
-ocean","size":10,"time":"2014-03-10 19:57:38.562264131 -0400 EDT"}
-
-{"level":"warning","msg":"The group's number increased tremendously!",
-"number":122,"omg":true,"time":"2014-03-10 19:57:38.562471297 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"A giant walrus appears!",
-"size":10,"time":"2014-03-10 19:57:38.562500591 -0400 EDT"}
-
-{"animal":"walrus","level":"info","msg":"Tremendously sized cow enters the ocean.",
-"size":9,"time":"2014-03-10 19:57:38.562527896 -0400 EDT"}
-
-{"level":"fatal","msg":"The ice breaks!","number":100,"omg":true,
-"time":"2014-03-10 19:57:38.562543128 -0400 EDT"}
-```
-
-With the default `log.SetFormatter(&log.TextFormatter{})` when a TTY is not
-attached, the output is compatible with the
-[logfmt](http://godoc.org/github.com/kr/logfmt) format:
-
-```text
-time="2015-03-26T01:27:38-04:00" level=debug msg="Started observing beach" animal=walrus number=8
-time="2015-03-26T01:27:38-04:00" level=info msg="A group of walrus emerges from the ocean" animal=walrus size=10
-time="2015-03-26T01:27:38-04:00" level=warning msg="The group's number increased tremendously!" number=122 omg=true
-time="2015-03-26T01:27:38-04:00" level=debug msg="Temperature changes" temperature=-4
-time="2015-03-26T01:27:38-04:00" level=panic msg="It's over 9000!" animal=orca size=9009
-time="2015-03-26T01:27:38-04:00" level=fatal msg="The ice breaks!" err=&{0x2082280c0 map[animal:orca size:9009] 2015-03-26 01:27:38.441574009 -0400 EDT panic It's over 9000!} number=100 omg=true
-exit status 1
-```
-
-#### Example
-
-The simplest way to use Logrus is simply the package-level exported logger:
-
-```go
-package main
-
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-  }).Info("A walrus appears")
-}
-```
-
-Note that it's completely api-compatible with the stdlib logger, so you can
-replace your `log` imports everywhere with `log "github.com/Sirupsen/logrus"`
-and you'll now have the flexibility of Logrus. You can customize it all you
-want:
-
-```go
-package main
-
-import (
-  "os"
-  log "github.com/Sirupsen/logrus"
-)
-
-func init() {
-  // Log as JSON instead of the default ASCII formatter.
-  log.SetFormatter(&log.JSONFormatter{})
-
-  // Output to stderr instead of stdout, could also be a file.
-  log.SetOutput(os.Stderr)
-
-  // Only log the warning severity or above.
-  log.SetLevel(log.WarnLevel)
-}
-
-func main() {
-  log.WithFields(log.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 122,
-  }).Warn("The group's number increased tremendously!")
-
-  log.WithFields(log.Fields{
-    "omg":    true,
-    "number": 100,
-  }).Fatal("The ice breaks!")
-
-  // A common pattern is to re-use fields between logging statements by re-using
-  // the logrus.Entry returned from WithFields()
-  contextLogger := log.WithFields(log.Fields{
-    "common": "this is a common field",
-    "other": "I also should be logged always",
-  })
-
-  contextLogger.Info("I'll be logged with common and other field")
-  contextLogger.Info("Me too")
-}
-```
-
-For more advanced usage such as logging to multiple locations from the same
-application, you can also create an instance of the `logrus` Logger:
-
-```go
-package main
-
-import (
-  "github.com/Sirupsen/logrus"
-)
-
-// Create a new instance of the logger. You can have any number of instances.
-var log = logrus.New()
-
-func main() {
-  // The API for setting attributes is a little different than the package level
-  // exported logger. See Godoc.
-  log.Out = os.Stderr
-
-  log.WithFields(logrus.Fields{
-    "animal": "walrus",
-    "size":   10,
-  }).Info("A group of walrus emerges from the ocean")
-}
-```
-
-#### Fields
-
-Logrus encourages careful, structured logging though logging fields instead of
-long, unparseable error messages. For example, instead of: `log.Fatalf("Failed
-to send event %s to topic %s with key %d")`, you should log the much more
-discoverable:
-
-```go
-log.WithFields(log.Fields{
-  "event": event,
-  "topic": topic,
-  "key": key,
-}).Fatal("Failed to send event")
-```
-
-We've found this API forces you to think about logging in a way that produces
-much more useful logging messages. We've been in countless situations where just
-a single added field to a log statement that was already there would've saved us
-hours. The `WithFields` call is optional.
-
-In general, with Logrus using any of the `printf`-family functions should be
-seen as a hint you should add a field, however, you can still use the
-`printf`-family functions with Logrus.
-
-#### Hooks
-
-You can add hooks for logging levels. For example to send errors to an exception
-tracking service on `Error`, `Fatal` and `Panic`, info to StatsD or log to
-multiple places simultaneously, e.g. syslog.
-
-Logrus comes with [built-in hooks](hooks/). Add those, or your custom hook, in
-`init`:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-  "gopkg.in/gemnasium/logrus-airbrake-hook.v2" // the package is named "aibrake"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-  "log/syslog"
-)
-
-func init() {
-
-  // Use the Airbrake hook to report errors that have Error severity or above to
-  // an exception tracker. You can create custom hooks, see the Hooks section.
-  log.AddHook(airbrake.NewHook(123, "xyz", "production"))
-
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-  if err != nil {
-    log.Error("Unable to connect to local syslog daemon")
-  } else {
-    log.AddHook(hook)
-  }
-}
-```
-Note: Syslog hook also support connecting to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). For the detail, please check the [syslog hook README](hooks/syslog/README.md).
-
-| Hook  | Description |
-| ----- | ----------- |
-| [Airbrake](https://github.com/gemnasium/logrus-airbrake-hook) | Send errors to the Airbrake API V3. Uses the official [`gobrake`](https://github.com/airbrake/gobrake) behind the scenes. |
-| [Airbrake "legacy"](https://github.com/gemnasium/logrus-airbrake-legacy-hook) | Send errors to an exception tracking service compatible with the Airbrake API V2. Uses [`airbrake-go`](https://github.com/tobi/airbrake-go) behind the scenes. |
-| [Papertrail](https://github.com/polds/logrus-papertrail-hook) | Send errors to the [Papertrail](https://papertrailapp.com) hosted logging service via UDP. |
-| [Syslog](https://github.com/Sirupsen/logrus/blob/master/hooks/syslog/syslog.go) | Send errors to remote syslog server. Uses standard library `log/syslog` behind the scenes. |
-| [Bugsnag](https://github.com/Shopify/logrus-bugsnag/blob/master/bugsnag.go) | Send errors to the Bugsnag exception tracking service. |
-| [Sentry](https://github.com/evalphobia/logrus_sentry) | Send errors to the Sentry error logging and aggregation service. |
-| [Hiprus](https://github.com/nubo/hiprus) | Send errors to a channel in hipchat. |
-| [Logrusly](https://github.com/sebest/logrusly) | Send logs to [Loggly](https://www.loggly.com/) |
-| [Slackrus](https://github.com/johntdyer/slackrus) | Hook for Slack chat. |
-| [Journalhook](https://github.com/wercker/journalhook) | Hook for logging to `systemd-journald` |
-| [Graylog](https://github.com/gemnasium/logrus-graylog-hook) | Hook for logging to [Graylog](http://graylog2.org/) |
-| [Raygun](https://github.com/squirkle/logrus-raygun-hook) | Hook for logging to [Raygun.io](http://raygun.io/) |
-| [LFShook](https://github.com/rifflock/lfshook) | Hook for logging to the local filesystem |
-| [Honeybadger](https://github.com/agonzalezro/logrus_honeybadger) | Hook for sending exceptions to Honeybadger |
-| [Mail](https://github.com/zbindenren/logrus_mail) | Hook for sending exceptions via mail |
-| [Rollrus](https://github.com/heroku/rollrus) | Hook for sending errors to rollbar |
-| [Fluentd](https://github.com/evalphobia/logrus_fluent) | Hook for logging to fluentd |
-| [Mongodb](https://github.com/weekface/mgorus) | Hook for logging to mongodb |
-| [Influxus] (http://github.com/vlad-doru/influxus) | Hook for concurrently logging to [InfluxDB] (http://influxdata.com/) |
-| [InfluxDB](https://github.com/Abramovic/logrus_influxdb) | Hook for logging to influxdb |
-| [Octokit](https://github.com/dorajistyle/logrus-octokit-hook) | Hook for logging to github via octokit |
-| [DeferPanic](https://github.com/deferpanic/dp-logrus) | Hook for logging to DeferPanic |
-| [Redis-Hook](https://github.com/rogierlommers/logrus-redis-hook) | Hook for logging to a ELK stack (through Redis) |
-| [Amqp-Hook](https://github.com/vladoatanasov/logrus_amqp) | Hook for logging to Amqp broker (Like RabbitMQ) |
-| [KafkaLogrus](https://github.com/goibibo/KafkaLogrus) | Hook for logging to kafka |
-| [Typetalk](https://github.com/dragon3/logrus-typetalk-hook) | Hook for logging to [Typetalk](https://www.typetalk.in/) |
-| [ElasticSearch](https://github.com/sohlich/elogrus) | Hook for logging to ElasticSearch|
-| [Sumorus](https://github.com/doublefree/sumorus) | Hook for logging to [SumoLogic](https://www.sumologic.com/)|
-| [Scribe](https://github.com/sagar8192/logrus-scribe-hook) | Hook for logging to [Scribe](https://github.com/facebookarchive/scribe)|
-| [Logstash](https://github.com/bshuster-repo/logrus-logstash-hook) | Hook for logging to [Logstash](https://www.elastic.co/products/logstash) |
-| [logz.io](https://github.com/ripcurld00d/logrus-logzio-hook) | Hook for logging to [logz.io](https://logz.io), a Log as a Service using Logstash |
-| [Logmatic.io](https://github.com/logmatic/logmatic-go) | Hook for logging to [Logmatic.io](http://logmatic.io/) |
-| [Pushover](https://github.com/toorop/logrus_pushover) | Send error via [Pushover](https://pushover.net) |
-
-
-#### Level logging
-
-Logrus has six logging levels: Debug, Info, Warning, Error, Fatal and Panic.
-
-```go
-log.Debug("Useful debugging information.")
-log.Info("Something noteworthy happened!")
-log.Warn("You should probably take a look at this.")
-log.Error("Something failed but I'm not quitting.")
-// Calls os.Exit(1) after logging
-log.Fatal("Bye.")
-// Calls panic() after logging
-log.Panic("I'm bailing.")
-```
-
-You can set the logging level on a `Logger`, then it will only log entries with
-that severity or anything above it:
-
-```go
-// Will log anything that is info or above (warn, error, fatal, panic). Default.
-log.SetLevel(log.InfoLevel)
-```
-
-It may be useful to set `log.Level = logrus.DebugLevel` in a debug or verbose
-environment if your application has that.
-
-#### Entries
-
-Besides the fields added with `WithField` or `WithFields` some fields are
-automatically added to all logging events:
-
-1. `time`. The timestamp when the entry was created.
-2. `msg`. The logging message passed to `{Info,Warn,Error,Fatal,Panic}` after
-   the `AddFields` call. E.g. `Failed to send event.`
-3. `level`. The logging level. E.g. `info`.
-
-#### Environments
-
-Logrus has no notion of environment.
-
-If you wish for hooks and formatters to only be used in specific environments,
-you should handle that yourself. For example, if your application has a global
-variable `Environment`, which is a string representation of the environment you
-could do:
-
-```go
-import (
-  log "github.com/Sirupsen/logrus"
-)
-
-init() {
-  // do something here to set environment depending on an environment variable
-  // or command-line flag
-  if Environment == "production" {
-    log.SetFormatter(&log.JSONFormatter{})
-  } else {
-    // The TextFormatter is default, you don't actually have to do this.
-    log.SetFormatter(&log.TextFormatter{})
-  }
-}
-```
-
-This configuration is how `logrus` was intended to be used, but JSON in
-production is mostly only useful if you do log aggregation with tools like
-Splunk or Logstash.
-
-#### Formatters
-
-The built-in logging formatters are:
-
-* `logrus.TextFormatter`. Logs the event in colors if stdout is a tty, otherwise
-  without colors.
-  * *Note:* to force colored output when there is no TTY, set the `ForceColors`
-    field to `true`.  To force no colored output even if there is a TTY  set the
-    `DisableColors` field to `true`
-* `logrus.JSONFormatter`. Logs fields as JSON.
-
-Third party logging formatters:
-
-* [`logstash`](https://github.com/bshuster-repo/logrus-logstash-hook). Logs fields as [Logstash](http://logstash.net) Events.
-* [`prefixed`](https://github.com/x-cray/logrus-prefixed-formatter). Displays log entry source along with alternative layout.
-* [`zalgo`](https://github.com/aybabtme/logzalgo). Invoking the P͉̫o̳̼̊w̖͈̰͎e̬͔̭͂r͚̼̹̲ ̫͓͉̳͈ō̠͕͖̚f̝͍̠ ͕̲̞͖͑Z̖̫̤̫ͪa͉̬͈̗l͖͎g̳̥o̰̥̅!̣͔̲̻͊̄ ̙̘̦̹̦.
-
-You can define your formatter by implementing the `Formatter` interface,
-requiring a `Format` method. `Format` takes an `*Entry`. `entry.Data` is a
-`Fields` type (`map[string]interface{}`) with all your fields as well as the
-default ones (see Entries section above):
-
-```go
-type MyJSONFormatter struct {
-}
-
-log.SetFormatter(new(MyJSONFormatter))
-
-func (f *MyJSONFormatter) Format(entry *Entry) ([]byte, error) {
-  // Note this doesn't include Time, Level and Message which are available on
-  // the Entry. Consult `godoc` on information about those fields or read the
-  // source of the official loggers.
-  serialized, err := json.Marshal(entry.Data)
-    if err != nil {
-      return nil, fmt.Errorf("Failed to marshal fields to JSON, %v", err)
-    }
-  return append(serialized, '\n'), nil
-}
-```
-
-#### Logger as an `io.Writer`
-
-Logrus can be transformed into an `io.Writer`. That writer is the end of an `io.Pipe` and it is your responsibility to close it.
-
-```go
-w := logger.Writer()
-defer w.Close()
-
-srv := http.Server{
-    // create a stdlib log.Logger that writes to
-    // logrus.Logger.
-    ErrorLog: log.New(w, "", 0),
-}
-```
-
-Each line written to that writer will be printed the usual way, using formatters
-and hooks. The level for those entries is `info`.
-
-#### Rotation
-
-Log rotation is not provided with Logrus. Log rotation should be done by an
-external program (like `logrotate(8)`) that can compress and delete old log
-entries. It should not be a feature of the application-level logger.
-
-#### Tools
-
-| Tool | Description |
-| ---- | ----------- |
-|[Logrus Mate](https://github.com/gogap/logrus_mate)|Logrus mate is a tool for Logrus to manage loggers, you can initial logger's level, hook and formatter by config file, the logger will generated with different config at different environment.|
-|[Logrus Viper Helper](https://github.com/heirko/go-contrib/tree/master/logrusHelper)|An Helper arround Logrus to wrap with spf13/Viper to load configuration with fangs! And to simplify Logrus configuration use some behavior of [Logrus Mate](https://github.com/gogap/logrus_mate). [sample](https://github.com/heirko/iris-contrib/blob/master/middleware/logrus-logger/example) |
-
-#### Testing
-
-Logrus has a built in facility for asserting the presence of log messages. This is implemented through the `test` hook and provides:
-
-* decorators for existing logger (`test.NewLocal` and `test.NewGlobal`) which basically just add the `test` hook
-* a test logger (`test.NewNullLogger`) that just records log messages (and does not output any):
-
-```go
-logger, hook := NewNullLogger()
-logger.Error("Hello error")
-
-assert.Equal(1, len(hook.Entries))
-assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
-assert.Equal("Hello error", hook.LastEntry().Message)
-
-hook.Reset()
-assert.Nil(hook.LastEntry())
-```
-
-#### Fatal handlers
-
-Logrus can register one or more functions that will be called when any `fatal`
-level message is logged. The registered handlers will be executed before
-logrus performs a `os.Exit(1)`. This behavior may be helpful if callers need
-to gracefully shutdown. Unlike a `panic("Something went wrong...")` call which can be intercepted with a deferred `recover` a call to `os.Exit(1)` can not be intercepted.
-
-```
-...
-handler := func() {
-  // gracefully shutdown something...
-}
-logrus.RegisterExitHandler(handler)
-...
-```
-
-#### Thread safty
-
-By default Logger is protected by mutex for concurrent writes, this mutex is invoked when calling hooks and writing logs.
-If you are sure such locking is not needed, you can call logger.SetNoLock() to disable the locking.
-
-Situation when locking is not needed includes:
-
-* You have no hooks registered, or hooks calling is already thread-safe.
-
-* Writing to logger.Out is already thread-safe, for example:
-
-  1) logger.Out is protected by locks.
-
-  2) logger.Out is a os.File handler opened with `O_APPEND` flag, and every write is smaller than 4k. (This allow multi-thread/multi-process writing)
-
-     (Refer to http://www.notthewizard.com/2014/06/17/are-files-appends-really-atomic/)
diff --git a/installer/vendor/github.com/Sirupsen/logrus/alt_exit.go b/installer/vendor/github.com/Sirupsen/logrus/alt_exit.go
index b4c9e84754..8af90637a9 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/alt_exit.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/alt_exit.go
@@ -1,7 +1,7 @@
 package logrus
 
 // The following code was sourced and modified from the
-// https://bitbucket.org/tebeka/atexit package governed by the following license:
+// https://github.com/tebeka/atexit package governed by the following license:
 //
 // Copyright (c) 2012 Miki Tebeka <miki.tebeka@gmail.com>.
 //
diff --git a/installer/vendor/github.com/Sirupsen/logrus/alt_exit_test.go b/installer/vendor/github.com/Sirupsen/logrus/alt_exit_test.go
deleted file mode 100644
index 022b778303..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/alt_exit_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package logrus
-
-import (
-	"io/ioutil"
-	"os/exec"
-	"testing"
-	"time"
-)
-
-func TestRegister(t *testing.T) {
-	current := len(handlers)
-	RegisterExitHandler(func() {})
-	if len(handlers) != current+1 {
-		t.Fatalf("can't add handler")
-	}
-}
-
-func TestHandler(t *testing.T) {
-	gofile := "/tmp/testprog.go"
-	if err := ioutil.WriteFile(gofile, testprog, 0666); err != nil {
-		t.Fatalf("can't create go file")
-	}
-
-	outfile := "/tmp/testprog.out"
-	arg := time.Now().UTC().String()
-	err := exec.Command("go", "run", gofile, outfile, arg).Run()
-	if err == nil {
-		t.Fatalf("completed normally, should have failed")
-	}
-
-	data, err := ioutil.ReadFile(outfile)
-	if err != nil {
-		t.Fatalf("can't read output file %s", outfile)
-	}
-
-	if string(data) != arg {
-		t.Fatalf("bad data")
-	}
-}
-
-var testprog = []byte(`
-// Test program for atexit, gets output file and data as arguments and writes
-// data to output file in atexit handler.
-package main
-
-import (
-	"github.com/Sirupsen/logrus"
-	"flag"
-	"fmt"
-	"io/ioutil"
-)
-
-var outfile = ""
-var data = ""
-
-func handler() {
-	ioutil.WriteFile(outfile, []byte(data), 0666)
-}
-
-func badHandler() {
-	n := 0
-	fmt.Println(1/n)
-}
-
-func main() {
-	flag.Parse()
-	outfile = flag.Arg(0)
-	data = flag.Arg(1)
-
-	logrus.RegisterExitHandler(handler)
-	logrus.RegisterExitHandler(badHandler)
-	logrus.Fatal("Bye bye")
-}
-`)
diff --git a/installer/vendor/github.com/Sirupsen/logrus/doc.go b/installer/vendor/github.com/Sirupsen/logrus/doc.go
index dddd5f877b..da67aba06d 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/doc.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/doc.go
@@ -7,7 +7,7 @@ The simplest way to use Logrus is simply the package-level exported logger:
   package main
 
   import (
-    log "github.com/Sirupsen/logrus"
+    log "github.com/sirupsen/logrus"
   )
 
   func main() {
@@ -21,6 +21,6 @@ The simplest way to use Logrus is simply the package-level exported logger:
 Output:
   time="2015-09-07T08:48:33Z" level=info msg="A walrus appears" animal=walrus number=1 size=10
 
-For a full guide visit https://github.com/Sirupsen/logrus
+For a full guide visit https://github.com/sirupsen/logrus
 */
 package logrus
diff --git a/installer/vendor/github.com/Sirupsen/logrus/entry.go b/installer/vendor/github.com/Sirupsen/logrus/entry.go
index 4edbe7a2de..778f4c9f0d 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/entry.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/entry.go
@@ -35,6 +35,7 @@ type Entry struct {
 	Time time.Time
 
 	// Level the log entry was logged at: Debug, Info, Warn, Error, Fatal or Panic
+	// This field will be set on entry firing and the value will be equal to the one in Logger struct field.
 	Level Level
 
 	// Message passed to Debug, Info, Warn, Error, Fatal or Panic
@@ -93,40 +94,52 @@ func (entry Entry) log(level Level, msg string) {
 	entry.Level = level
 	entry.Message = msg
 
-	if err := entry.Logger.Hooks.Fire(level, &entry); err != nil {
-		entry.Logger.mu.Lock()
-		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
-		entry.Logger.mu.Unlock()
-	}
+	entry.fireHooks()
+
 	buffer = bufferPool.Get().(*bytes.Buffer)
 	buffer.Reset()
 	defer bufferPool.Put(buffer)
 	entry.Buffer = buffer
-	serialized, err := entry.Logger.Formatter.Format(&entry)
+
+	entry.write()
+
 	entry.Buffer = nil
+
+	// To avoid Entry#log() returning a value that only would make sense for
+	// panic() to use in Entry#Panic(), we avoid the allocation by checking
+	// directly here.
+	if level <= PanicLevel {
+		panic(&entry)
+	}
+}
+
+// This function is not declared with a pointer value because otherwise
+// race conditions will occur when using multiple goroutines
+func (entry Entry) fireHooks() {
+	entry.Logger.mu.Lock()
+	defer entry.Logger.mu.Unlock()
+	err := entry.Logger.Hooks.Fire(entry.Level, &entry)
+	if err != nil {
+		fmt.Fprintf(os.Stderr, "Failed to fire hook: %v\n", err)
+	}
+}
+
+func (entry *Entry) write() {
+	serialized, err := entry.Logger.Formatter.Format(entry)
+	entry.Logger.mu.Lock()
+	defer entry.Logger.mu.Unlock()
 	if err != nil {
-		entry.Logger.mu.Lock()
 		fmt.Fprintf(os.Stderr, "Failed to obtain reader, %v\n", err)
-		entry.Logger.mu.Unlock()
 	} else {
-		entry.Logger.mu.Lock()
 		_, err = entry.Logger.Out.Write(serialized)
 		if err != nil {
 			fmt.Fprintf(os.Stderr, "Failed to write to log, %v\n", err)
 		}
-		entry.Logger.mu.Unlock()
-	}
-
-	// To avoid Entry#log() returning a value that only would make sense for
-	// panic() to use in Entry#Panic(), we avoid the allocation by checking
-	// directly here.
-	if level <= PanicLevel {
-		panic(&entry)
 	}
 }
 
 func (entry *Entry) Debug(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
+	if entry.Logger.level() >= DebugLevel {
 		entry.log(DebugLevel, fmt.Sprint(args...))
 	}
 }
@@ -136,13 +149,13 @@ func (entry *Entry) Print(args ...interface{}) {
 }
 
 func (entry *Entry) Info(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
+	if entry.Logger.level() >= InfoLevel {
 		entry.log(InfoLevel, fmt.Sprint(args...))
 	}
 }
 
 func (entry *Entry) Warn(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
+	if entry.Logger.level() >= WarnLevel {
 		entry.log(WarnLevel, fmt.Sprint(args...))
 	}
 }
@@ -152,20 +165,20 @@ func (entry *Entry) Warning(args ...interface{}) {
 }
 
 func (entry *Entry) Error(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
+	if entry.Logger.level() >= ErrorLevel {
 		entry.log(ErrorLevel, fmt.Sprint(args...))
 	}
 }
 
 func (entry *Entry) Fatal(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
+	if entry.Logger.level() >= FatalLevel {
 		entry.log(FatalLevel, fmt.Sprint(args...))
 	}
 	Exit(1)
 }
 
 func (entry *Entry) Panic(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
+	if entry.Logger.level() >= PanicLevel {
 		entry.log(PanicLevel, fmt.Sprint(args...))
 	}
 	panic(fmt.Sprint(args...))
@@ -174,13 +187,13 @@ func (entry *Entry) Panic(args ...interface{}) {
 // Entry Printf family functions
 
 func (entry *Entry) Debugf(format string, args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
+	if entry.Logger.level() >= DebugLevel {
 		entry.Debug(fmt.Sprintf(format, args...))
 	}
 }
 
 func (entry *Entry) Infof(format string, args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
+	if entry.Logger.level() >= InfoLevel {
 		entry.Info(fmt.Sprintf(format, args...))
 	}
 }
@@ -190,7 +203,7 @@ func (entry *Entry) Printf(format string, args ...interface{}) {
 }
 
 func (entry *Entry) Warnf(format string, args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
+	if entry.Logger.level() >= WarnLevel {
 		entry.Warn(fmt.Sprintf(format, args...))
 	}
 }
@@ -200,20 +213,20 @@ func (entry *Entry) Warningf(format string, args ...interface{}) {
 }
 
 func (entry *Entry) Errorf(format string, args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
+	if entry.Logger.level() >= ErrorLevel {
 		entry.Error(fmt.Sprintf(format, args...))
 	}
 }
 
 func (entry *Entry) Fatalf(format string, args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
+	if entry.Logger.level() >= FatalLevel {
 		entry.Fatal(fmt.Sprintf(format, args...))
 	}
 	Exit(1)
 }
 
 func (entry *Entry) Panicf(format string, args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
+	if entry.Logger.level() >= PanicLevel {
 		entry.Panic(fmt.Sprintf(format, args...))
 	}
 }
@@ -221,13 +234,13 @@ func (entry *Entry) Panicf(format string, args ...interface{}) {
 // Entry Println family functions
 
 func (entry *Entry) Debugln(args ...interface{}) {
-	if entry.Logger.Level >= DebugLevel {
+	if entry.Logger.level() >= DebugLevel {
 		entry.Debug(entry.sprintlnn(args...))
 	}
 }
 
 func (entry *Entry) Infoln(args ...interface{}) {
-	if entry.Logger.Level >= InfoLevel {
+	if entry.Logger.level() >= InfoLevel {
 		entry.Info(entry.sprintlnn(args...))
 	}
 }
@@ -237,7 +250,7 @@ func (entry *Entry) Println(args ...interface{}) {
 }
 
 func (entry *Entry) Warnln(args ...interface{}) {
-	if entry.Logger.Level >= WarnLevel {
+	if entry.Logger.level() >= WarnLevel {
 		entry.Warn(entry.sprintlnn(args...))
 	}
 }
@@ -247,20 +260,20 @@ func (entry *Entry) Warningln(args ...interface{}) {
 }
 
 func (entry *Entry) Errorln(args ...interface{}) {
-	if entry.Logger.Level >= ErrorLevel {
+	if entry.Logger.level() >= ErrorLevel {
 		entry.Error(entry.sprintlnn(args...))
 	}
 }
 
 func (entry *Entry) Fatalln(args ...interface{}) {
-	if entry.Logger.Level >= FatalLevel {
+	if entry.Logger.level() >= FatalLevel {
 		entry.Fatal(entry.sprintlnn(args...))
 	}
 	Exit(1)
 }
 
 func (entry *Entry) Panicln(args ...interface{}) {
-	if entry.Logger.Level >= PanicLevel {
+	if entry.Logger.level() >= PanicLevel {
 		entry.Panic(entry.sprintlnn(args...))
 	}
 }
diff --git a/installer/vendor/github.com/Sirupsen/logrus/entry_test.go b/installer/vendor/github.com/Sirupsen/logrus/entry_test.go
deleted file mode 100644
index 99c3b41d5f..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/entry_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEntryWithError(t *testing.T) {
-
-	assert := assert.New(t)
-
-	defer func() {
-		ErrorKey = "error"
-	}()
-
-	err := fmt.Errorf("kaboom at layer %d", 4711)
-
-	assert.Equal(err, WithError(err).Data["error"])
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-
-	assert.Equal(err, entry.WithError(err).Data["error"])
-
-	ErrorKey = "err"
-
-	assert.Equal(err, entry.WithError(err).Data["err"])
-
-}
-
-func TestEntryPanicln(t *testing.T) {
-	errBoom := fmt.Errorf("boom time")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicln("kaboom")
-}
-
-func TestEntryPanicf(t *testing.T) {
-	errBoom := fmt.Errorf("boom again")
-
-	defer func() {
-		p := recover()
-		assert.NotNil(t, p)
-
-		switch pVal := p.(type) {
-		case *Entry:
-			assert.Equal(t, "kaboom true", pVal.Message)
-			assert.Equal(t, errBoom, pVal.Data["err"])
-		default:
-			t.Fatalf("want type *Entry, got %T: %#v", pVal, pVal)
-		}
-	}()
-
-	logger := New()
-	logger.Out = &bytes.Buffer{}
-	entry := NewEntry(logger)
-	entry.WithField("err", errBoom).Panicf("kaboom %v", true)
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go b/installer/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
deleted file mode 100644
index a1623ec003..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/examples/basic/basic.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package main
-
-import (
-	"github.com/Sirupsen/logrus"
-)
-
-var log = logrus.New()
-
-func init() {
-	log.Formatter = new(logrus.JSONFormatter)
-	log.Formatter = new(logrus.TextFormatter) // default
-	log.Level = logrus.DebugLevel
-}
-
-func main() {
-	defer func() {
-		err := recover()
-		if err != nil {
-			log.WithFields(logrus.Fields{
-				"omg":    true,
-				"err":    err,
-				"number": 100,
-			}).Fatal("The ice breaks!")
-		}
-	}()
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"number": 8,
-	}).Debug("Started observing beach")
-
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"temperature": -4,
-	}).Debug("Temperature changes")
-
-	log.WithFields(logrus.Fields{
-		"animal": "orca",
-		"size":   9009,
-	}).Panic("It's over 9000!")
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go b/installer/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
deleted file mode 100644
index 3187f6d3e1..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/examples/hook/hook.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package main
-
-import (
-	"github.com/Sirupsen/logrus"
-	"gopkg.in/gemnasium/logrus-airbrake-hook.v2"
-)
-
-var log = logrus.New()
-
-func init() {
-	log.Formatter = new(logrus.TextFormatter) // default
-	log.Hooks.Add(airbrake.NewHook(123, "xyz", "development"))
-}
-
-func main() {
-	log.WithFields(logrus.Fields{
-		"animal": "walrus",
-		"size":   10,
-	}).Info("A group of walrus emerges from the ocean")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 122,
-	}).Warn("The group's number increased tremendously!")
-
-	log.WithFields(logrus.Fields{
-		"omg":    true,
-		"number": 100,
-	}).Fatal("The ice breaks!")
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/exported.go b/installer/vendor/github.com/Sirupsen/logrus/exported.go
index 9a0120ac1d..013183edab 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/exported.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/exported.go
@@ -31,14 +31,14 @@ func SetFormatter(formatter Formatter) {
 func SetLevel(level Level) {
 	std.mu.Lock()
 	defer std.mu.Unlock()
-	std.Level = level
+	std.SetLevel(level)
 }
 
 // GetLevel returns the standard logger level.
 func GetLevel() Level {
 	std.mu.Lock()
 	defer std.mu.Unlock()
-	return std.Level
+	return std.level()
 }
 
 // AddHook adds a hook to the standard logger hooks.
diff --git a/installer/vendor/github.com/Sirupsen/logrus/formatter.go b/installer/vendor/github.com/Sirupsen/logrus/formatter.go
index b5fbe934d1..b183ff5b1d 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/formatter.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/formatter.go
@@ -2,7 +2,7 @@ package logrus
 
 import "time"
 
-const DefaultTimestampFormat = time.RFC3339
+const defaultTimestampFormat = time.RFC3339
 
 // The Formatter interface is used to implement a custom Formatter. It takes an
 // `Entry`. It exposes all the fields, including the default ones:
diff --git a/installer/vendor/github.com/Sirupsen/logrus/formatter_bench_test.go b/installer/vendor/github.com/Sirupsen/logrus/formatter_bench_test.go
deleted file mode 100644
index c6d290c77f..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/formatter_bench_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package logrus
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-// smallFields is a small size data set for benchmarking
-var smallFields = Fields{
-	"foo":   "bar",
-	"baz":   "qux",
-	"one":   "two",
-	"three": "four",
-}
-
-// largeFields is a large size data set for benchmarking
-var largeFields = Fields{
-	"foo":       "bar",
-	"baz":       "qux",
-	"one":       "two",
-	"three":     "four",
-	"five":      "six",
-	"seven":     "eight",
-	"nine":      "ten",
-	"eleven":    "twelve",
-	"thirteen":  "fourteen",
-	"fifteen":   "sixteen",
-	"seventeen": "eighteen",
-	"nineteen":  "twenty",
-	"a":         "b",
-	"c":         "d",
-	"e":         "f",
-	"g":         "h",
-	"i":         "j",
-	"k":         "l",
-	"m":         "n",
-	"o":         "p",
-	"q":         "r",
-	"s":         "t",
-	"u":         "v",
-	"w":         "x",
-	"y":         "z",
-	"this":      "will",
-	"make":      "thirty",
-	"entries":   "yeah",
-}
-
-var errorFields = Fields{
-	"foo": fmt.Errorf("bar"),
-	"baz": fmt.Errorf("qux"),
-}
-
-func BenchmarkErrorTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, errorFields)
-}
-
-func BenchmarkSmallTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkLargeTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{DisableColors: true}, largeFields)
-}
-
-func BenchmarkSmallColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, smallFields)
-}
-
-func BenchmarkLargeColoredTextFormatter(b *testing.B) {
-	doBenchmark(b, &TextFormatter{ForceColors: true}, largeFields)
-}
-
-func BenchmarkSmallJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, smallFields)
-}
-
-func BenchmarkLargeJSONFormatter(b *testing.B) {
-	doBenchmark(b, &JSONFormatter{}, largeFields)
-}
-
-func doBenchmark(b *testing.B, formatter Formatter, fields Fields) {
-	entry := &Entry{
-		Time:    time.Time{},
-		Level:   InfoLevel,
-		Message: "message",
-		Data:    fields,
-	}
-	var d []byte
-	var err error
-	for i := 0; i < b.N; i++ {
-		d, err = formatter.Format(entry)
-		if err != nil {
-			b.Fatal(err)
-		}
-		b.SetBytes(int64(len(d)))
-	}
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hook_test.go b/installer/vendor/github.com/Sirupsen/logrus/hook_test.go
deleted file mode 100644
index 13f34cb6f8..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hook_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package logrus
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type TestHook struct {
-	Fired bool
-}
-
-func (hook *TestHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *TestHook) Levels() []Level {
-	return []Level{
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookFires(t *testing.T) {
-	hook := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		assert.Equal(t, hook.Fired, false)
-
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
-
-type ModifyHook struct {
-}
-
-func (hook *ModifyHook) Fire(entry *Entry) error {
-	entry.Data["wow"] = "whale"
-	return nil
-}
-
-func (hook *ModifyHook) Levels() []Level {
-	return []Level{
-		DebugLevel,
-		InfoLevel,
-		WarnLevel,
-		ErrorLevel,
-		FatalLevel,
-		PanicLevel,
-	}
-}
-
-func TestHookCanModifyEntry(t *testing.T) {
-	hook := new(ModifyHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-	})
-}
-
-func TestCanFireMultipleHooks(t *testing.T) {
-	hook1 := new(ModifyHook)
-	hook2 := new(TestHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook1)
-		log.Hooks.Add(hook2)
-
-		log.WithField("wow", "elephant").Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["wow"], "whale")
-		assert.Equal(t, hook2.Fired, true)
-	})
-}
-
-type ErrorHook struct {
-	Fired bool
-}
-
-func (hook *ErrorHook) Fire(entry *Entry) error {
-	hook.Fired = true
-	return nil
-}
-
-func (hook *ErrorHook) Levels() []Level {
-	return []Level{
-		ErrorLevel,
-	}
-}
-
-func TestErrorHookShouldntFireOnInfo(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, false)
-	})
-}
-
-func TestErrorHookShouldFireOnError(t *testing.T) {
-	hook := new(ErrorHook)
-
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Hooks.Add(hook)
-		log.Error("test")
-	}, func(fields Fields) {
-		assert.Equal(t, hook.Fired, true)
-	})
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md b/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
deleted file mode 100644
index 066704b370..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Syslog Hooks for Logrus <img src="http://i.imgur.com/hTeVwmJ.png" width="40" height="40" alt=":walrus:" class="emoji" title=":walrus:"/>
-
-## Usage
-
-```go
-import (
-  "log/syslog"
-  "github.com/Sirupsen/logrus"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := logrus_syslog.NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
-
-If you want to connect to local syslog (Ex. "/dev/log" or "/var/run/syslog" or "/var/run/log"). Just assign empty string to the first two parameters of `NewSyslogHook`. It should look like the following.
-
-```go
-import (
-  "log/syslog"
-  "github.com/Sirupsen/logrus"
-  logrus_syslog "github.com/Sirupsen/logrus/hooks/syslog"
-)
-
-func main() {
-  log       := logrus.New()
-  hook, err := logrus_syslog.NewSyslogHook("", "", syslog.LOG_INFO, "")
-
-  if err == nil {
-    log.Hooks.Add(hook)
-  }
-}
-```
\ No newline at end of file
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go b/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
deleted file mode 100644
index a36e20032e..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// +build !windows,!nacl,!plan9
-
-package logrus_syslog
-
-import (
-	"fmt"
-	"github.com/Sirupsen/logrus"
-	"log/syslog"
-	"os"
-)
-
-// SyslogHook to send logs via syslog.
-type SyslogHook struct {
-	Writer        *syslog.Writer
-	SyslogNetwork string
-	SyslogRaddr   string
-}
-
-// Creates a hook to be added to an instance of logger. This is called with
-// `hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_DEBUG, "")`
-// `if err == nil { log.Hooks.Add(hook) }`
-func NewSyslogHook(network, raddr string, priority syslog.Priority, tag string) (*SyslogHook, error) {
-	w, err := syslog.Dial(network, raddr, priority, tag)
-	return &SyslogHook{w, network, raddr}, err
-}
-
-func (hook *SyslogHook) Fire(entry *logrus.Entry) error {
-	line, err := entry.String()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Unable to read entry, %v", err)
-		return err
-	}
-
-	switch entry.Level {
-	case logrus.PanicLevel:
-		return hook.Writer.Crit(line)
-	case logrus.FatalLevel:
-		return hook.Writer.Crit(line)
-	case logrus.ErrorLevel:
-		return hook.Writer.Err(line)
-	case logrus.WarnLevel:
-		return hook.Writer.Warning(line)
-	case logrus.InfoLevel:
-		return hook.Writer.Info(line)
-	case logrus.DebugLevel:
-		return hook.Writer.Debug(line)
-	default:
-		return nil
-	}
-}
-
-func (hook *SyslogHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go b/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
deleted file mode 100644
index 42762dc10d..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hooks/syslog/syslog_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logrus_syslog
-
-import (
-	"github.com/Sirupsen/logrus"
-	"log/syslog"
-	"testing"
-)
-
-func TestLocalhostAddAndPrint(t *testing.T) {
-	log := logrus.New()
-	hook, err := NewSyslogHook("udp", "localhost:514", syslog.LOG_INFO, "")
-
-	if err != nil {
-		t.Errorf("Unable to connect to local syslog.")
-	}
-
-	log.Hooks.Add(hook)
-
-	for _, level := range hook.Levels() {
-		if len(log.Hooks[level]) != 1 {
-			t.Errorf("SyslogHook was not added. The length of log.Hooks[%v]: %v", level, len(log.Hooks[level]))
-		}
-	}
-
-	log.Info("Congratulations!")
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test.go b/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test.go
deleted file mode 100644
index 068812535d..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package test
-
-import (
-	"io/ioutil"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// test.Hook is a hook designed for dealing with logs in test scenarios.
-type Hook struct {
-	Entries []*logrus.Entry
-}
-
-// Installs a test hook for the global logger.
-func NewGlobal() *Hook {
-
-	hook := new(Hook)
-	logrus.AddHook(hook)
-
-	return hook
-
-}
-
-// Installs a test hook for a given local logger.
-func NewLocal(logger *logrus.Logger) *Hook {
-
-	hook := new(Hook)
-	logger.Hooks.Add(hook)
-
-	return hook
-
-}
-
-// Creates a discarding logger and installs the test hook.
-func NewNullLogger() (*logrus.Logger, *Hook) {
-
-	logger := logrus.New()
-	logger.Out = ioutil.Discard
-
-	return logger, NewLocal(logger)
-
-}
-
-func (t *Hook) Fire(e *logrus.Entry) error {
-	t.Entries = append(t.Entries, e)
-	return nil
-}
-
-func (t *Hook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-// LastEntry returns the last entry that was logged or nil.
-func (t *Hook) LastEntry() (l *logrus.Entry) {
-
-	if i := len(t.Entries) - 1; i < 0 {
-		return nil
-	} else {
-		return t.Entries[i]
-	}
-
-}
-
-// Reset removes all Entries from this test hook.
-func (t *Hook) Reset() {
-	t.Entries = make([]*logrus.Entry, 0)
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test_test.go b/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test_test.go
deleted file mode 100644
index d69455ba04..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/hooks/test/test_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package test
-
-import (
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAllHooks(t *testing.T) {
-
-	assert := assert.New(t)
-
-	logger, hook := NewNullLogger()
-	assert.Nil(hook.LastEntry())
-	assert.Equal(0, len(hook.Entries))
-
-	logger.Error("Hello error")
-	assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
-	assert.Equal("Hello error", hook.LastEntry().Message)
-	assert.Equal(1, len(hook.Entries))
-
-	logger.Warn("Hello warning")
-	assert.Equal(logrus.WarnLevel, hook.LastEntry().Level)
-	assert.Equal("Hello warning", hook.LastEntry().Message)
-	assert.Equal(2, len(hook.Entries))
-
-	hook.Reset()
-	assert.Nil(hook.LastEntry())
-	assert.Equal(0, len(hook.Entries))
-
-	hook = NewGlobal()
-
-	logrus.Error("Hello error")
-	assert.Equal(logrus.ErrorLevel, hook.LastEntry().Level)
-	assert.Equal("Hello error", hook.LastEntry().Message)
-	assert.Equal(1, len(hook.Entries))
-
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/json_formatter.go b/installer/vendor/github.com/Sirupsen/logrus/json_formatter.go
index 2ad6dc5cf4..fb01c1b104 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/json_formatter.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/json_formatter.go
@@ -5,18 +5,54 @@ import (
 	"fmt"
 )
 
+type fieldKey string
+
+// FieldMap allows customization of the key names for default fields.
+type FieldMap map[fieldKey]string
+
+// Default key names for the default fields
+const (
+	FieldKeyMsg   = "msg"
+	FieldKeyLevel = "level"
+	FieldKeyTime  = "time"
+)
+
+func (f FieldMap) resolve(key fieldKey) string {
+	if k, ok := f[key]; ok {
+		return k
+	}
+
+	return string(key)
+}
+
+// JSONFormatter formats logs into parsable json
 type JSONFormatter struct {
 	// TimestampFormat sets the format used for marshaling timestamps.
 	TimestampFormat string
+
+	// DisableTimestamp allows disabling automatic timestamps in output
+	DisableTimestamp bool
+
+	// FieldMap allows users to customize the names of keys for default fields.
+	// As an example:
+	// formatter := &JSONFormatter{
+	//   	FieldMap: FieldMap{
+	// 		 FieldKeyTime: "@timestamp",
+	// 		 FieldKeyLevel: "@level",
+	// 		 FieldKeyMsg: "@message",
+	//    },
+	// }
+	FieldMap FieldMap
 }
 
+// Format renders a single log entry
 func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 	data := make(Fields, len(entry.Data)+3)
 	for k, v := range entry.Data {
 		switch v := v.(type) {
 		case error:
 			// Otherwise errors are ignored by `encoding/json`
-			// https://github.com/Sirupsen/logrus/issues/137
+			// https://github.com/sirupsen/logrus/issues/137
 			data[k] = v.Error()
 		default:
 			data[k] = v
@@ -26,12 +62,14 @@ func (f *JSONFormatter) Format(entry *Entry) ([]byte, error) {
 
 	timestampFormat := f.TimestampFormat
 	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
+		timestampFormat = defaultTimestampFormat
 	}
 
-	data["time"] = entry.Time.Format(timestampFormat)
-	data["msg"] = entry.Message
-	data["level"] = entry.Level.String()
+	if !f.DisableTimestamp {
+		data[f.FieldMap.resolve(FieldKeyTime)] = entry.Time.Format(timestampFormat)
+	}
+	data[f.FieldMap.resolve(FieldKeyMsg)] = entry.Message
+	data[f.FieldMap.resolve(FieldKeyLevel)] = entry.Level.String()
 
 	serialized, err := json.Marshal(data)
 	if err != nil {
diff --git a/installer/vendor/github.com/Sirupsen/logrus/json_formatter_test.go b/installer/vendor/github.com/Sirupsen/logrus/json_formatter_test.go
deleted file mode 100644
index 1d70873254..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/json_formatter_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package logrus
-
-import (
-	"encoding/json"
-	"errors"
-
-	"testing"
-)
-
-func TestErrorNotLost(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("error", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["error"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestErrorNotLostOnFieldNotNamedError(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("omg", errors.New("wild walrus")))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["omg"] != "wild walrus" {
-		t.Fatal("Error field not set")
-	}
-}
-
-func TestFieldClashWithTime(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("time", "right now!"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.time"] != "right now!" {
-		t.Fatal("fields.time not set to original time field")
-	}
-
-	if entry["time"] != "0001-01-01T00:00:00Z" {
-		t.Fatal("time field not set to current time, was: ", entry["time"])
-	}
-}
-
-func TestFieldClashWithMsg(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("msg", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.msg"] != "something" {
-		t.Fatal("fields.msg not set to original msg field")
-	}
-}
-
-func TestFieldClashWithLevel(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	entry := make(map[string]interface{})
-	err = json.Unmarshal(b, &entry)
-	if err != nil {
-		t.Fatal("Unable to unmarshal formatted entry: ", err)
-	}
-
-	if entry["fields.level"] != "something" {
-		t.Fatal("fields.level not set to original level field")
-	}
-}
-
-func TestJSONEntryEndsWithNewline(t *testing.T) {
-	formatter := &JSONFormatter{}
-
-	b, err := formatter.Format(WithField("level", "something"))
-	if err != nil {
-		t.Fatal("Unable to format entry: ", err)
-	}
-
-	if b[len(b)-1] != '\n' {
-		t.Fatal("Expected JSON log entry to end with a newline")
-	}
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/logger.go b/installer/vendor/github.com/Sirupsen/logrus/logger.go
index b769f3d352..fdaf8a6534 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/logger.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/logger.go
@@ -4,6 +4,7 @@ import (
 	"io"
 	"os"
 	"sync"
+	"sync/atomic"
 )
 
 type Logger struct {
@@ -24,7 +25,7 @@ type Logger struct {
 	Formatter Formatter
 	// The logging level the logger should log at. This is typically (and defaults
 	// to) `logrus.Info`, which allows Info(), Warn(), Error() and Fatal() to be
-	// logged. `logrus.Debug` is useful in
+	// logged.
 	Level Level
 	// Used to sync writing to the log. Locking is enabled by Default
 	mu MutexWrap
@@ -112,7 +113,7 @@ func (logger *Logger) WithError(err error) *Entry {
 }
 
 func (logger *Logger) Debugf(format string, args ...interface{}) {
-	if logger.Level >= DebugLevel {
+	if logger.level() >= DebugLevel {
 		entry := logger.newEntry()
 		entry.Debugf(format, args...)
 		logger.releaseEntry(entry)
@@ -120,7 +121,7 @@ func (logger *Logger) Debugf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Infof(format string, args ...interface{}) {
-	if logger.Level >= InfoLevel {
+	if logger.level() >= InfoLevel {
 		entry := logger.newEntry()
 		entry.Infof(format, args...)
 		logger.releaseEntry(entry)
@@ -134,7 +135,7 @@ func (logger *Logger) Printf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Warnf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warnf(format, args...)
 		logger.releaseEntry(entry)
@@ -142,7 +143,7 @@ func (logger *Logger) Warnf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Warningf(format string, args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warnf(format, args...)
 		logger.releaseEntry(entry)
@@ -150,7 +151,7 @@ func (logger *Logger) Warningf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Errorf(format string, args ...interface{}) {
-	if logger.Level >= ErrorLevel {
+	if logger.level() >= ErrorLevel {
 		entry := logger.newEntry()
 		entry.Errorf(format, args...)
 		logger.releaseEntry(entry)
@@ -158,7 +159,7 @@ func (logger *Logger) Errorf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Fatalf(format string, args ...interface{}) {
-	if logger.Level >= FatalLevel {
+	if logger.level() >= FatalLevel {
 		entry := logger.newEntry()
 		entry.Fatalf(format, args...)
 		logger.releaseEntry(entry)
@@ -167,7 +168,7 @@ func (logger *Logger) Fatalf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Panicf(format string, args ...interface{}) {
-	if logger.Level >= PanicLevel {
+	if logger.level() >= PanicLevel {
 		entry := logger.newEntry()
 		entry.Panicf(format, args...)
 		logger.releaseEntry(entry)
@@ -175,7 +176,7 @@ func (logger *Logger) Panicf(format string, args ...interface{}) {
 }
 
 func (logger *Logger) Debug(args ...interface{}) {
-	if logger.Level >= DebugLevel {
+	if logger.level() >= DebugLevel {
 		entry := logger.newEntry()
 		entry.Debug(args...)
 		logger.releaseEntry(entry)
@@ -183,7 +184,7 @@ func (logger *Logger) Debug(args ...interface{}) {
 }
 
 func (logger *Logger) Info(args ...interface{}) {
-	if logger.Level >= InfoLevel {
+	if logger.level() >= InfoLevel {
 		entry := logger.newEntry()
 		entry.Info(args...)
 		logger.releaseEntry(entry)
@@ -197,7 +198,7 @@ func (logger *Logger) Print(args ...interface{}) {
 }
 
 func (logger *Logger) Warn(args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warn(args...)
 		logger.releaseEntry(entry)
@@ -205,7 +206,7 @@ func (logger *Logger) Warn(args ...interface{}) {
 }
 
 func (logger *Logger) Warning(args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warn(args...)
 		logger.releaseEntry(entry)
@@ -213,7 +214,7 @@ func (logger *Logger) Warning(args ...interface{}) {
 }
 
 func (logger *Logger) Error(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
+	if logger.level() >= ErrorLevel {
 		entry := logger.newEntry()
 		entry.Error(args...)
 		logger.releaseEntry(entry)
@@ -221,7 +222,7 @@ func (logger *Logger) Error(args ...interface{}) {
 }
 
 func (logger *Logger) Fatal(args ...interface{}) {
-	if logger.Level >= FatalLevel {
+	if logger.level() >= FatalLevel {
 		entry := logger.newEntry()
 		entry.Fatal(args...)
 		logger.releaseEntry(entry)
@@ -230,7 +231,7 @@ func (logger *Logger) Fatal(args ...interface{}) {
 }
 
 func (logger *Logger) Panic(args ...interface{}) {
-	if logger.Level >= PanicLevel {
+	if logger.level() >= PanicLevel {
 		entry := logger.newEntry()
 		entry.Panic(args...)
 		logger.releaseEntry(entry)
@@ -238,7 +239,7 @@ func (logger *Logger) Panic(args ...interface{}) {
 }
 
 func (logger *Logger) Debugln(args ...interface{}) {
-	if logger.Level >= DebugLevel {
+	if logger.level() >= DebugLevel {
 		entry := logger.newEntry()
 		entry.Debugln(args...)
 		logger.releaseEntry(entry)
@@ -246,7 +247,7 @@ func (logger *Logger) Debugln(args ...interface{}) {
 }
 
 func (logger *Logger) Infoln(args ...interface{}) {
-	if logger.Level >= InfoLevel {
+	if logger.level() >= InfoLevel {
 		entry := logger.newEntry()
 		entry.Infoln(args...)
 		logger.releaseEntry(entry)
@@ -260,7 +261,7 @@ func (logger *Logger) Println(args ...interface{}) {
 }
 
 func (logger *Logger) Warnln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warnln(args...)
 		logger.releaseEntry(entry)
@@ -268,7 +269,7 @@ func (logger *Logger) Warnln(args ...interface{}) {
 }
 
 func (logger *Logger) Warningln(args ...interface{}) {
-	if logger.Level >= WarnLevel {
+	if logger.level() >= WarnLevel {
 		entry := logger.newEntry()
 		entry.Warnln(args...)
 		logger.releaseEntry(entry)
@@ -276,7 +277,7 @@ func (logger *Logger) Warningln(args ...interface{}) {
 }
 
 func (logger *Logger) Errorln(args ...interface{}) {
-	if logger.Level >= ErrorLevel {
+	if logger.level() >= ErrorLevel {
 		entry := logger.newEntry()
 		entry.Errorln(args...)
 		logger.releaseEntry(entry)
@@ -284,7 +285,7 @@ func (logger *Logger) Errorln(args ...interface{}) {
 }
 
 func (logger *Logger) Fatalln(args ...interface{}) {
-	if logger.Level >= FatalLevel {
+	if logger.level() >= FatalLevel {
 		entry := logger.newEntry()
 		entry.Fatalln(args...)
 		logger.releaseEntry(entry)
@@ -293,7 +294,7 @@ func (logger *Logger) Fatalln(args ...interface{}) {
 }
 
 func (logger *Logger) Panicln(args ...interface{}) {
-	if logger.Level >= PanicLevel {
+	if logger.level() >= PanicLevel {
 		entry := logger.newEntry()
 		entry.Panicln(args...)
 		logger.releaseEntry(entry)
@@ -306,3 +307,17 @@ func (logger *Logger) Panicln(args ...interface{}) {
 func (logger *Logger) SetNoLock() {
 	logger.mu.Disable()
 }
+
+func (logger *Logger) level() Level {
+	return Level(atomic.LoadUint32((*uint32)(&logger.Level)))
+}
+
+func (logger *Logger) SetLevel(level Level) {
+	atomic.StoreUint32((*uint32)(&logger.Level), uint32(level))
+}
+
+func (logger *Logger) AddHook(hook Hook) {
+	logger.mu.Lock()
+	defer logger.mu.Unlock()
+	logger.Hooks.Add(hook)
+}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/logger_bench_test.go b/installer/vendor/github.com/Sirupsen/logrus/logger_bench_test.go
deleted file mode 100644
index dd23a3535e..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/logger_bench_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package logrus
-
-import (
-	"os"
-	"testing"
-)
-
-// smallFields is a small size data set for benchmarking
-var loggerFields = Fields{
-	"foo":   "bar",
-	"baz":   "qux",
-	"one":   "two",
-	"three": "four",
-}
-
-func BenchmarkDummyLogger(b *testing.B) {
-	nullf, err := os.OpenFile("/dev/null", os.O_WRONLY, 0666)
-	if err != nil {
-		b.Fatalf("%v", err)
-	}
-	defer nullf.Close()
-	doLoggerBenchmark(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func BenchmarkDummyLoggerNoLock(b *testing.B) {
-	nullf, err := os.OpenFile("/dev/null", os.O_WRONLY|os.O_APPEND, 0666)
-	if err != nil {
-		b.Fatalf("%v", err)
-	}
-	defer nullf.Close()
-	doLoggerBenchmarkNoLock(b, nullf, &TextFormatter{DisableColors: true}, smallFields)
-}
-
-func doLoggerBenchmark(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
-	logger := Logger{
-		Out:       out,
-		Level:     InfoLevel,
-		Formatter: formatter,
-	}
-	entry := logger.WithFields(fields)
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			entry.Info("aaa")
-		}
-	})
-}
-
-func doLoggerBenchmarkNoLock(b *testing.B, out *os.File, formatter Formatter, fields Fields) {
-	logger := Logger{
-		Out:       out,
-		Level:     InfoLevel,
-		Formatter: formatter,
-	}
-	logger.SetNoLock()
-	entry := logger.WithFields(fields)
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			entry.Info("aaa")
-		}
-	})
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/logrus.go b/installer/vendor/github.com/Sirupsen/logrus/logrus.go
index e596691116..dd38999741 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/logrus.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/logrus.go
@@ -10,7 +10,7 @@ import (
 type Fields map[string]interface{}
 
 // Level type
-type Level uint8
+type Level uint32
 
 // Convert the Level to a string. E.g. PanicLevel becomes "panic".
 func (level Level) String() string {
diff --git a/installer/vendor/github.com/Sirupsen/logrus/logrus_test.go b/installer/vendor/github.com/Sirupsen/logrus/logrus_test.go
deleted file mode 100644
index bfc478055e..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/logrus_test.go
+++ /dev/null
@@ -1,361 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"encoding/json"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func LogAndAssertJSON(t *testing.T, log func(*Logger), assertions func(fields Fields)) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	log(logger)
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	assertions(fields)
-}
-
-func LogAndAssertText(t *testing.T, log func(*Logger), assertions func(fields map[string]string)) {
-	var buffer bytes.Buffer
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = &TextFormatter{
-		DisableColors: true,
-	}
-
-	log(logger)
-
-	fields := make(map[string]string)
-	for _, kv := range strings.Split(buffer.String(), " ") {
-		if !strings.Contains(kv, "=") {
-			continue
-		}
-		kvArr := strings.Split(kv, "=")
-		key := strings.TrimSpace(kvArr[0])
-		val := kvArr[1]
-		if kvArr[1][0] == '"' {
-			var err error
-			val, err = strconv.Unquote(val)
-			assert.NoError(t, err)
-		}
-		fields[key] = val
-	}
-	assertions(fields)
-}
-
-func TestPrint(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Print("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "info")
-	})
-}
-
-func TestInfo(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "info")
-	})
-}
-
-func TestWarn(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Warn("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["level"], "warning")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test test")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test 10")
-	})
-}
-
-func TestInfolnShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "10 10")
-	})
-}
-
-func TestInfoShouldAddSpacesBetweenTwoNonStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Infoln(10, 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "10 10")
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStringAndNonstring(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", 10)
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test10")
-	})
-}
-
-func TestInfoShouldNotAddSpacesBetweenStrings(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.Info("test", "test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "testtest")
-	})
-}
-
-func TestWithFieldsShouldAllowAssignments(t *testing.T) {
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	localLog := logger.WithFields(Fields{
-		"key1": "value1",
-	})
-
-	localLog.WithField("key2", "value2").Info("test")
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	assert.Equal(t, "value2", fields["key2"])
-	assert.Equal(t, "value1", fields["key1"])
-
-	buffer = bytes.Buffer{}
-	fields = Fields{}
-	localLog.Info("test")
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.Nil(t, err)
-
-	_, ok := fields["key2"]
-	assert.Equal(t, false, ok)
-	assert.Equal(t, "value1", fields["key1"])
-}
-
-func TestUserSuppliedFieldDoesNotOverwriteDefaults(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-	})
-}
-
-func TestUserSuppliedMsgFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("msg", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["msg"], "test")
-		assert.Equal(t, fields["fields.msg"], "hello")
-	})
-}
-
-func TestUserSuppliedTimeFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("time", "hello").Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["fields.time"], "hello")
-	})
-}
-
-func TestUserSuppliedLevelFieldHasPrefix(t *testing.T) {
-	LogAndAssertJSON(t, func(log *Logger) {
-		log.WithField("level", 1).Info("test")
-	}, func(fields Fields) {
-		assert.Equal(t, fields["level"], "info")
-		assert.Equal(t, fields["fields.level"], 1.0) // JSON has floats only
-	})
-}
-
-func TestDefaultFieldsAreNotPrefixed(t *testing.T) {
-	LogAndAssertText(t, func(log *Logger) {
-		ll := log.WithField("herp", "derp")
-		ll.Info("hello")
-		ll.Info("bye")
-	}, func(fields map[string]string) {
-		for _, fieldName := range []string{"fields.level", "fields.time", "fields.msg"} {
-			if _, ok := fields[fieldName]; ok {
-				t.Fatalf("should not have prefixed %q: %v", fieldName, fields)
-			}
-		}
-	})
-}
-
-func TestDoubleLoggingDoesntPrefixPreviousFields(t *testing.T) {
-
-	var buffer bytes.Buffer
-	var fields Fields
-
-	logger := New()
-	logger.Out = &buffer
-	logger.Formatter = new(JSONFormatter)
-
-	llog := logger.WithField("context", "eating raw fish")
-
-	llog.Info("looks delicious")
-
-	err := json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded first message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, fields["msg"], "looks delicious")
-	assert.Equal(t, fields["context"], "eating raw fish")
-
-	buffer.Reset()
-
-	llog.Warn("omg it is!")
-
-	err = json.Unmarshal(buffer.Bytes(), &fields)
-	assert.NoError(t, err, "should have decoded second message")
-	assert.Equal(t, len(fields), 4, "should only have msg/time/level/context fields")
-	assert.Equal(t, fields["msg"], "omg it is!")
-	assert.Equal(t, fields["context"], "eating raw fish")
-	assert.Nil(t, fields["fields.msg"], "should not have prefixed previous `msg` entry")
-
-}
-
-func TestConvertLevelToString(t *testing.T) {
-	assert.Equal(t, "debug", DebugLevel.String())
-	assert.Equal(t, "info", InfoLevel.String())
-	assert.Equal(t, "warning", WarnLevel.String())
-	assert.Equal(t, "error", ErrorLevel.String())
-	assert.Equal(t, "fatal", FatalLevel.String())
-	assert.Equal(t, "panic", PanicLevel.String())
-}
-
-func TestParseLevel(t *testing.T) {
-	l, err := ParseLevel("panic")
-	assert.Nil(t, err)
-	assert.Equal(t, PanicLevel, l)
-
-	l, err = ParseLevel("PANIC")
-	assert.Nil(t, err)
-	assert.Equal(t, PanicLevel, l)
-
-	l, err = ParseLevel("fatal")
-	assert.Nil(t, err)
-	assert.Equal(t, FatalLevel, l)
-
-	l, err = ParseLevel("FATAL")
-	assert.Nil(t, err)
-	assert.Equal(t, FatalLevel, l)
-
-	l, err = ParseLevel("error")
-	assert.Nil(t, err)
-	assert.Equal(t, ErrorLevel, l)
-
-	l, err = ParseLevel("ERROR")
-	assert.Nil(t, err)
-	assert.Equal(t, ErrorLevel, l)
-
-	l, err = ParseLevel("warn")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("WARN")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("warning")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("WARNING")
-	assert.Nil(t, err)
-	assert.Equal(t, WarnLevel, l)
-
-	l, err = ParseLevel("info")
-	assert.Nil(t, err)
-	assert.Equal(t, InfoLevel, l)
-
-	l, err = ParseLevel("INFO")
-	assert.Nil(t, err)
-	assert.Equal(t, InfoLevel, l)
-
-	l, err = ParseLevel("debug")
-	assert.Nil(t, err)
-	assert.Equal(t, DebugLevel, l)
-
-	l, err = ParseLevel("DEBUG")
-	assert.Nil(t, err)
-	assert.Equal(t, DebugLevel, l)
-
-	l, err = ParseLevel("invalid")
-	assert.Equal(t, "not a valid logrus Level: \"invalid\"", err.Error())
-}
-
-func TestGetSetLevelRace(t *testing.T) {
-	wg := sync.WaitGroup{}
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			if i%2 == 0 {
-				SetLevel(InfoLevel)
-			} else {
-				GetLevel()
-			}
-		}(i)
-
-	}
-	wg.Wait()
-}
-
-func TestLoggingRace(t *testing.T) {
-	logger := New()
-
-	var wg sync.WaitGroup
-	wg.Add(100)
-
-	for i := 0; i < 100; i++ {
-		go func() {
-			logger.Info("info")
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
-
-// Compile test
-func TestLogrusInterface(t *testing.T) {
-	var buffer bytes.Buffer
-	fn := func(l FieldLogger) {
-		b := l.WithField("key", "value")
-		b.Debug("Test")
-	}
-	// test logger
-	logger := New()
-	logger.Out = &buffer
-	fn(logger)
-
-	// test Entry
-	e := logger.WithField("another", "value")
-	fn(e)
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_appengine.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
deleted file mode 100644
index 1960169ef2..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_appengine.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build appengine
-
-package logrus
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal() bool {
-	return true
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_bsd.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
index 5f6be4d3c0..4880d13d26 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/terminal_bsd.go
@@ -1,10 +1,10 @@
 // +build darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
+// +build !appengine,!gopherjs
 
 package logrus
 
-import "syscall"
+import "golang.org/x/sys/unix"
 
-const ioctlReadTermios = syscall.TIOCGETA
+const ioctlReadTermios = unix.TIOCGETA
 
-type Termios syscall.Termios
+type Termios unix.Termios
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_check_appengine.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_check_appengine.go
new file mode 100644
index 0000000000..3de08e802f
--- /dev/null
+++ b/installer/vendor/github.com/Sirupsen/logrus/terminal_check_appengine.go
@@ -0,0 +1,11 @@
+// +build appengine gopherjs
+
+package logrus
+
+import (
+	"io"
+)
+
+func checkIfTerminal(w io.Writer) bool {
+	return true
+}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_check_notappengine.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_check_notappengine.go
new file mode 100644
index 0000000000..067047a123
--- /dev/null
+++ b/installer/vendor/github.com/Sirupsen/logrus/terminal_check_notappengine.go
@@ -0,0 +1,19 @@
+// +build !appengine,!gopherjs
+
+package logrus
+
+import (
+	"io"
+	"os"
+
+	"golang.org/x/crypto/ssh/terminal"
+)
+
+func checkIfTerminal(w io.Writer) bool {
+	switch v := w.(type) {
+	case *os.File:
+		return terminal.IsTerminal(int(v.Fd()))
+	default:
+		return false
+	}
+}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_linux.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_linux.go
index 308160ca80..f29a0097c8 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_linux.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/terminal_linux.go
@@ -3,12 +3,12 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !appengine
+// +build !appengine,!gopherjs
 
 package logrus
 
-import "syscall"
+import "golang.org/x/sys/unix"
 
-const ioctlReadTermios = syscall.TCGETS
+const ioctlReadTermios = unix.TCGETS
 
-type Termios syscall.Termios
+type Termios unix.Termios
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
deleted file mode 100644
index 329038f6ca..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_notwindows.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Based on ssh/terminal:
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin freebsd openbsd netbsd dragonfly
-// +build !appengine
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stderr
-	var termios Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_solaris.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
deleted file mode 100644
index a3c6f6e7df..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_solaris.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build solaris,!appengine
-
-package logrus
-
-import (
-	"os"
-
-	"golang.org/x/sys/unix"
-)
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal() bool {
-	_, err := unix.IoctlGetTermios(int(os.Stdout.Fd()), unix.TCGETA)
-	return err == nil
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/terminal_windows.go b/installer/vendor/github.com/Sirupsen/logrus/terminal_windows.go
deleted file mode 100644
index 3727e8adfb..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/terminal_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Based on ssh/terminal:
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows,!appengine
-
-package logrus
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var kernel32 = syscall.NewLazyDLL("kernel32.dll")
-
-var (
-	procGetConsoleMode = kernel32.NewProc("GetConsoleMode")
-)
-
-// IsTerminal returns true if stderr's file descriptor is a terminal.
-func IsTerminal() bool {
-	fd := syscall.Stderr
-	var st uint32
-	r, _, e := syscall.Syscall(procGetConsoleMode.Addr(), 2, uintptr(fd), uintptr(unsafe.Pointer(&st)), 0)
-	return r != 0 && e == 0
-}
diff --git a/installer/vendor/github.com/Sirupsen/logrus/text_formatter.go b/installer/vendor/github.com/Sirupsen/logrus/text_formatter.go
index 9114b3ca47..61b21caea4 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/text_formatter.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/text_formatter.go
@@ -3,9 +3,9 @@ package logrus
 import (
 	"bytes"
 	"fmt"
-	"runtime"
 	"sort"
 	"strings"
+	"sync"
 	"time"
 )
 
@@ -14,24 +14,19 @@ const (
 	red     = 31
 	green   = 32
 	yellow  = 33
-	blue    = 34
+	blue    = 36
 	gray    = 37
 )
 
 var (
 	baseTimestamp time.Time
-	isTerminal    bool
 )
 
 func init() {
 	baseTimestamp = time.Now()
-	isTerminal = IsTerminal()
-}
-
-func miniTS() int {
-	return int(time.Since(baseTimestamp) / time.Second)
 }
 
+// TextFormatter formats logs into text
 type TextFormatter struct {
 	// Set to true to bypass checking for a TTY before outputting colors.
 	ForceColors bool
@@ -54,11 +49,26 @@ type TextFormatter struct {
 	// that log extremely frequently and don't use the JSON formatter this may not
 	// be desired.
 	DisableSorting bool
+
+	// QuoteEmptyFields will wrap empty fields in quotes if true
+	QuoteEmptyFields bool
+
+	// Whether the logger's out is to a terminal
+	isTerminal bool
+
+	sync.Once
 }
 
+func (f *TextFormatter) init(entry *Entry) {
+	if entry.Logger != nil {
+		f.isTerminal = checkIfTerminal(entry.Logger.Out)
+	}
+}
+
+// Format renders a single log entry
 func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 	var b *bytes.Buffer
-	var keys []string = make([]string, 0, len(entry.Data))
+	keys := make([]string, 0, len(entry.Data))
 	for k := range entry.Data {
 		keys = append(keys, k)
 	}
@@ -74,12 +84,13 @@ func (f *TextFormatter) Format(entry *Entry) ([]byte, error) {
 
 	prefixFieldClashes(entry.Data)
 
-	isColorTerminal := isTerminal && (runtime.GOOS != "windows")
-	isColored := (f.ForceColors || isColorTerminal) && !f.DisableColors
+	f.Do(func() { f.init(entry) })
+
+	isColored := (f.ForceColors || f.isTerminal) && !f.DisableColors
 
 	timestampFormat := f.TimestampFormat
 	if timestampFormat == "" {
-		timestampFormat = DefaultTimestampFormat
+		timestampFormat = defaultTimestampFormat
 	}
 	if isColored {
 		f.printColored(b, entry, keys, timestampFormat)
@@ -115,8 +126,10 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin
 
 	levelText := strings.ToUpper(entry.Level.String())[0:4]
 
-	if !f.FullTimestamp {
-		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, miniTS(), entry.Message)
+	if f.DisableTimestamp {
+		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m %-44s ", levelColor, levelText, entry.Message)
+	} else if !f.FullTimestamp {
+		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%04d] %-44s ", levelColor, levelText, int(entry.Time.Sub(baseTimestamp)/time.Second), entry.Message)
 	} else {
 		fmt.Fprintf(b, "\x1b[%dm%s\x1b[0m[%s] %-44s ", levelColor, levelText, entry.Time.Format(timestampFormat), entry.Message)
 	}
@@ -127,12 +140,15 @@ func (f *TextFormatter) printColored(b *bytes.Buffer, entry *Entry, keys []strin
 	}
 }
 
-func needsQuoting(text string) bool {
+func (f *TextFormatter) needsQuoting(text string) bool {
+	if f.QuoteEmptyFields && len(text) == 0 {
+		return true
+	}
 	for _, ch := range text {
 		if !((ch >= 'a' && ch <= 'z') ||
 			(ch >= 'A' && ch <= 'Z') ||
 			(ch >= '0' && ch <= '9') ||
-			ch == '-' || ch == '.') {
+			ch == '-' || ch == '.' || ch == '_' || ch == '/' || ch == '@' || ch == '^' || ch == '+') {
 			return true
 		}
 	}
@@ -140,29 +156,23 @@ func needsQuoting(text string) bool {
 }
 
 func (f *TextFormatter) appendKeyValue(b *bytes.Buffer, key string, value interface{}) {
-
+	if b.Len() > 0 {
+		b.WriteByte(' ')
+	}
 	b.WriteString(key)
 	b.WriteByte('=')
 	f.appendValue(b, value)
-	b.WriteByte(' ')
 }
 
 func (f *TextFormatter) appendValue(b *bytes.Buffer, value interface{}) {
-	switch value := value.(type) {
-	case string:
-		if !needsQuoting(value) {
-			b.WriteString(value)
-		} else {
-			fmt.Fprintf(b, "%q", value)
-		}
-	case error:
-		errmsg := value.Error()
-		if !needsQuoting(errmsg) {
-			b.WriteString(errmsg)
-		} else {
-			fmt.Fprintf(b, "%q", errmsg)
-		}
-	default:
-		fmt.Fprint(b, value)
+	stringVal, ok := value.(string)
+	if !ok {
+		stringVal = fmt.Sprint(value)
+	}
+
+	if !f.needsQuoting(stringVal) {
+		b.WriteString(stringVal)
+	} else {
+		b.WriteString(fmt.Sprintf("%q", stringVal))
 	}
 }
diff --git a/installer/vendor/github.com/Sirupsen/logrus/text_formatter_test.go b/installer/vendor/github.com/Sirupsen/logrus/text_formatter_test.go
deleted file mode 100644
index e25a44f67b..0000000000
--- a/installer/vendor/github.com/Sirupsen/logrus/text_formatter_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package logrus
-
-import (
-	"bytes"
-	"errors"
-	"testing"
-	"time"
-)
-
-func TestQuoting(t *testing.T) {
-	tf := &TextFormatter{DisableColors: true}
-
-	checkQuoting := func(q bool, value interface{}) {
-		b, _ := tf.Format(WithField("test", value))
-		idx := bytes.Index(b, ([]byte)("test="))
-		cont := bytes.Contains(b[idx+5:], []byte{'"'})
-		if cont != q {
-			if q {
-				t.Errorf("quoting expected for: %#v", value)
-			} else {
-				t.Errorf("quoting not expected for: %#v", value)
-			}
-		}
-	}
-
-	checkQuoting(false, "abcd")
-	checkQuoting(false, "v1.0")
-	checkQuoting(false, "1234567890")
-	checkQuoting(true, "/foobar")
-	checkQuoting(true, "x y")
-	checkQuoting(true, "x,y")
-	checkQuoting(false, errors.New("invalid"))
-	checkQuoting(true, errors.New("invalid argument"))
-}
-
-func TestTimestampFormat(t *testing.T) {
-	checkTimeStr := func(format string) {
-		customFormatter := &TextFormatter{DisableColors: true, TimestampFormat: format}
-		customStr, _ := customFormatter.Format(WithField("test", "test"))
-		timeStart := bytes.Index(customStr, ([]byte)("time="))
-		timeEnd := bytes.Index(customStr, ([]byte)("level="))
-		timeStr := customStr[timeStart+5 : timeEnd-1]
-		if timeStr[0] == '"' && timeStr[len(timeStr)-1] == '"' {
-			timeStr = timeStr[1 : len(timeStr)-1]
-		}
-		if format == "" {
-			format = time.RFC3339
-		}
-		_, e := time.Parse(format, (string)(timeStr))
-		if e != nil {
-			t.Errorf("time string \"%s\" did not match provided time format \"%s\": %s", timeStr, format, e)
-		}
-	}
-
-	checkTimeStr("2006-01-02T15:04:05.000000000Z07:00")
-	checkTimeStr("Mon Jan _2 15:04:05 2006")
-	checkTimeStr("")
-}
-
-// TODO add tests for sorting etc., this requires a parser for the text
-// formatter output.
diff --git a/installer/vendor/github.com/Sirupsen/logrus/writer.go b/installer/vendor/github.com/Sirupsen/logrus/writer.go
index f74d2aa5fc..7bdebedc60 100644
--- a/installer/vendor/github.com/Sirupsen/logrus/writer.go
+++ b/installer/vendor/github.com/Sirupsen/logrus/writer.go
@@ -11,39 +11,48 @@ func (logger *Logger) Writer() *io.PipeWriter {
 }
 
 func (logger *Logger) WriterLevel(level Level) *io.PipeWriter {
+	return NewEntry(logger).WriterLevel(level)
+}
+
+func (entry *Entry) Writer() *io.PipeWriter {
+	return entry.WriterLevel(InfoLevel)
+}
+
+func (entry *Entry) WriterLevel(level Level) *io.PipeWriter {
 	reader, writer := io.Pipe()
 
 	var printFunc func(args ...interface{})
+
 	switch level {
 	case DebugLevel:
-		printFunc = logger.Debug
+		printFunc = entry.Debug
 	case InfoLevel:
-		printFunc = logger.Info
+		printFunc = entry.Info
 	case WarnLevel:
-		printFunc = logger.Warn
+		printFunc = entry.Warn
 	case ErrorLevel:
-		printFunc = logger.Error
+		printFunc = entry.Error
 	case FatalLevel:
-		printFunc = logger.Fatal
+		printFunc = entry.Fatal
 	case PanicLevel:
-		printFunc = logger.Panic
+		printFunc = entry.Panic
 	default:
-		printFunc = logger.Print
+		printFunc = entry.Print
 	}
 
-	go logger.writerScanner(reader, printFunc)
+	go entry.writerScanner(reader, printFunc)
 	runtime.SetFinalizer(writer, writerFinalizer)
 
 	return writer
 }
 
-func (logger *Logger) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
+func (entry *Entry) writerScanner(reader *io.PipeReader, printFunc func(args ...interface{})) {
 	scanner := bufio.NewScanner(reader)
 	for scanner.Scan() {
 		printFunc(scanner.Text())
 	}
 	if err := scanner.Err(); err != nil {
-		logger.Errorf("Error while reading from Writer: %s", err)
+		entry.Errorf("Error while reading from Writer: %s", err)
 	}
 	reader.Close()
 }
diff --git a/installer/vendor/github.com/armon/go-radix/.gitignore b/installer/vendor/github.com/armon/go-radix/.gitignore
deleted file mode 100644
index 00268614f0..0000000000
--- a/installer/vendor/github.com/armon/go-radix/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/installer/vendor/github.com/armon/go-radix/.travis.yml b/installer/vendor/github.com/armon/go-radix/.travis.yml
deleted file mode 100644
index 1a0bbea6c7..0000000000
--- a/installer/vendor/github.com/armon/go-radix/.travis.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-language: go
-go:
-  - tip
diff --git a/installer/vendor/github.com/armon/go-radix/README.md b/installer/vendor/github.com/armon/go-radix/README.md
deleted file mode 100644
index 26f42a2837..0000000000
--- a/installer/vendor/github.com/armon/go-radix/README.md
+++ /dev/null
@@ -1,38 +0,0 @@
-go-radix [![Build Status](https://travis-ci.org/armon/go-radix.png)](https://travis-ci.org/armon/go-radix)
-=========
-
-Provides the `radix` package that implements a [radix tree](http://en.wikipedia.org/wiki/Radix_tree).
-The package only provides a single `Tree` implementation, optimized for sparse nodes.
-
-As a radix tree, it provides the following:
- * O(k) operations. In many cases, this can be faster than a hash table since
-   the hash function is an O(k) operation, and hash tables have very poor cache locality.
- * Minimum / Maximum value lookups
- * Ordered iteration
-
-For an immutable variant, see [go-immutable-radix](https://github.com/hashicorp/go-immutable-radix).
-
-Documentation
-=============
-
-The full documentation is available on [Godoc](http://godoc.org/github.com/armon/go-radix).
-
-Example
-=======
-
-Below is a simple example of usage
-
-```go
-// Create a tree
-r := radix.New()
-r.Insert("foo", 1)
-r.Insert("bar", 2)
-r.Insert("foobar", 2)
-
-// Find the longest prefix match
-m, _, _ := r.LongestPrefix("foozip")
-if m != "foo" {
-    panic("should be foo")
-}
-```
-
diff --git a/installer/vendor/github.com/armon/go-radix/radix_test.go b/installer/vendor/github.com/armon/go-radix/radix_test.go
deleted file mode 100644
index a7a4eab332..0000000000
--- a/installer/vendor/github.com/armon/go-radix/radix_test.go
+++ /dev/null
@@ -1,359 +0,0 @@
-package radix
-
-import (
-	crand "crypto/rand"
-	"fmt"
-	"reflect"
-	"sort"
-	"testing"
-)
-
-func TestRadix(t *testing.T) {
-	var min, max string
-	inp := make(map[string]interface{})
-	for i := 0; i < 1000; i++ {
-		gen := generateUUID()
-		inp[gen] = i
-		if gen < min || i == 0 {
-			min = gen
-		}
-		if gen > max || i == 0 {
-			max = gen
-		}
-	}
-
-	r := NewFromMap(inp)
-	if r.Len() != len(inp) {
-		t.Fatalf("bad length: %v %v", r.Len(), len(inp))
-	}
-
-	r.Walk(func(k string, v interface{}) bool {
-		println(k)
-		return false
-	})
-
-	for k, v := range inp {
-		out, ok := r.Get(k)
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-
-	// Check min and max
-	outMin, _, _ := r.Minimum()
-	if outMin != min {
-		t.Fatalf("bad minimum: %v %v", outMin, min)
-	}
-	outMax, _, _ := r.Maximum()
-	if outMax != max {
-		t.Fatalf("bad maximum: %v %v", outMax, max)
-	}
-
-	for k, v := range inp {
-		out, ok := r.Delete(k)
-		if !ok {
-			t.Fatalf("missing key: %v", k)
-		}
-		if out != v {
-			t.Fatalf("value mis-match: %v %v", out, v)
-		}
-	}
-	if r.Len() != 0 {
-		t.Fatalf("bad length: %v", r.Len())
-	}
-}
-
-func TestRoot(t *testing.T) {
-	r := New()
-	_, ok := r.Delete("")
-	if ok {
-		t.Fatalf("bad")
-	}
-	_, ok = r.Insert("", true)
-	if ok {
-		t.Fatalf("bad")
-	}
-	val, ok := r.Get("")
-	if !ok || val != true {
-		t.Fatalf("bad: %v", val)
-	}
-	val, ok = r.Delete("")
-	if !ok || val != true {
-		t.Fatalf("bad: %v", val)
-	}
-}
-
-func TestDelete(t *testing.T) {
-
-	r := New()
-
-	s := []string{"", "A", "AB"}
-
-	for _, ss := range s {
-		r.Insert(ss, true)
-	}
-
-	for _, ss := range s {
-		_, ok := r.Delete(ss)
-		if !ok {
-			t.Fatalf("bad %q", ss)
-		}
-	}
-}
-
-func TestDeletePrefix(t *testing.T) {
-	type exp struct {
-		inp[] string
-		prefix string
-		out[] string
-		numDeleted int
-	}
-
-	cases := []exp{
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "A", []string{"", "R", "S"},  3},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "ABC", []string{"", "A", "AB", "R", "S"},  1},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "", []string{},  6},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "S", []string{"", "A", "AB", "ABC", "R"},  1},
-		{[]string{"", "A", "AB", "ABC", "R", "S"}, "SS", []string{"", "A", "AB", "ABC", "R", "S"},  0},
-	}
-
-	for _, test := range cases {
-		r := New()
-		for _, ss := range test.inp {
-			r.Insert(ss, true)
-		}
-
-		deleted := r.DeletePrefix(test.prefix)
-		if deleted != test.numDeleted {
-			t.Fatalf("Bad delete, expected %v to be deleted but got %v", test.numDeleted, deleted)
-		}
-
-		out := []string{}
-		fn := func(s string, v interface{}) bool {
-			out = append(out, s)
-			return false
-		}
-		r.Walk(fn)
-
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestLongestPrefix(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"",
-		"foo",
-		"foobar",
-		"foobarbaz",
-		"foobarbazzip",
-		"foozip",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out string
-	}
-	cases := []exp{
-		{"a", ""},
-		{"abc", ""},
-		{"fo", ""},
-		{"foo", "foo"},
-		{"foob", "foo"},
-		{"foobar", "foobar"},
-		{"foobarba", "foobar"},
-		{"foobarbaz", "foobarbaz"},
-		{"foobarbazzi", "foobarbaz"},
-		{"foobarbazzip", "foobarbazzip"},
-		{"foozi", "foo"},
-		{"foozip", "foozip"},
-		{"foozipzap", "foozip"},
-	}
-	for _, test := range cases {
-		m, _, ok := r.LongestPrefix(test.inp)
-		if !ok {
-			t.Fatalf("no match: %v", test)
-		}
-		if m != test.out {
-			t.Fatalf("mis-match: %v %v", m, test)
-		}
-	}
-}
-
-func TestWalkPrefix(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foobar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		{
-			"f",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foo",
-			[]string{"foobar", "foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foob",
-			[]string{"foobar"},
-		},
-		{
-			"foo/",
-			[]string{"foo/bar/baz", "foo/baz/bar", "foo/zip/zap"},
-		},
-		{
-			"foo/b",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		{
-			"foo/ba",
-			[]string{"foo/bar/baz", "foo/baz/bar"},
-		},
-		{
-			"foo/bar",
-			[]string{"foo/bar/baz"},
-		},
-		{
-			"foo/bar/baz",
-			[]string{"foo/bar/baz"},
-		},
-		{
-			"foo/bar/bazoo",
-			[]string{},
-		},
-		{
-			"z",
-			[]string{"zipzap"},
-		},
-	}
-
-	for _, test := range cases {
-		out := []string{}
-		fn := func(s string, v interface{}) bool {
-			out = append(out, s)
-			return false
-		}
-		r.WalkPrefix(test.inp, fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-func TestWalkPath(t *testing.T) {
-	r := New()
-
-	keys := []string{
-		"foo",
-		"foo/bar",
-		"foo/bar/baz",
-		"foo/baz/bar",
-		"foo/zip/zap",
-		"zipzap",
-	}
-	for _, k := range keys {
-		r.Insert(k, nil)
-	}
-	if r.Len() != len(keys) {
-		t.Fatalf("bad len: %v %v", r.Len(), len(keys))
-	}
-
-	type exp struct {
-		inp string
-		out []string
-	}
-	cases := []exp{
-		{
-			"f",
-			[]string{},
-		},
-		{
-			"foo",
-			[]string{"foo"},
-		},
-		{
-			"foo/",
-			[]string{"foo"},
-		},
-		{
-			"foo/ba",
-			[]string{"foo"},
-		},
-		{
-			"foo/bar",
-			[]string{"foo", "foo/bar"},
-		},
-		{
-			"foo/bar/baz",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		{
-			"foo/bar/bazoo",
-			[]string{"foo", "foo/bar", "foo/bar/baz"},
-		},
-		{
-			"z",
-			[]string{},
-		},
-	}
-
-	for _, test := range cases {
-		out := []string{}
-		fn := func(s string, v interface{}) bool {
-			out = append(out, s)
-			return false
-		}
-		r.WalkPath(test.inp, fn)
-		sort.Strings(out)
-		sort.Strings(test.out)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Fatalf("mis-match: %v %v", out, test.out)
-		}
-	}
-}
-
-// generateUUID is used to generate a random UUID
-func generateUUID() string {
-	buf := make([]byte, 16)
-	if _, err := crand.Read(buf); err != nil {
-		panic(fmt.Errorf("failed to read random bytes: %v", err))
-	}
-
-	return fmt.Sprintf("%08x-%04x-%04x-%04x-%12x",
-		buf[0:4],
-		buf[4:6],
-		buf[6:8],
-		buf[8:10],
-		buf[10:16])
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/.gitignore b/installer/vendor/github.com/boltdb/bolt/.gitignore
deleted file mode 100644
index c7bd2b7a5b..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-*.prof
-*.test
-*.swp
-/bin/
diff --git a/installer/vendor/github.com/boltdb/bolt/Makefile b/installer/vendor/github.com/boltdb/bolt/Makefile
deleted file mode 100644
index e035e63adc..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/Makefile
+++ /dev/null
@@ -1,18 +0,0 @@
-BRANCH=`git rev-parse --abbrev-ref HEAD`
-COMMIT=`git rev-parse --short HEAD`
-GOLDFLAGS="-X main.branch $(BRANCH) -X main.commit $(COMMIT)"
-
-default: build
-
-race:
-	@go test -v -race -test.run="TestSimulate_(100op|1000op)"
-
-# go get github.com/kisielk/errcheck
-errcheck:
-	@errcheck -ignorepkg=bytes -ignore=os:Remove github.com/boltdb/bolt
-
-test: 
-	@go test -v -cover .
-	@go test -v ./cmd/bolt
-
-.PHONY: fmt test
diff --git a/installer/vendor/github.com/boltdb/bolt/README.md b/installer/vendor/github.com/boltdb/bolt/README.md
deleted file mode 100644
index 7d43a15b2c..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/README.md
+++ /dev/null
@@ -1,916 +0,0 @@
-Bolt [![Coverage Status](https://coveralls.io/repos/boltdb/bolt/badge.svg?branch=master)](https://coveralls.io/r/boltdb/bolt?branch=master) [![GoDoc](https://godoc.org/github.com/boltdb/bolt?status.svg)](https://godoc.org/github.com/boltdb/bolt) ![Version](https://img.shields.io/badge/version-1.2.1-green.svg)
-====
-
-Bolt is a pure Go key/value store inspired by [Howard Chu's][hyc_symas]
-[LMDB project][lmdb]. The goal of the project is to provide a simple,
-fast, and reliable database for projects that don't require a full database
-server such as Postgres or MySQL.
-
-Since Bolt is meant to be used as such a low-level piece of functionality,
-simplicity is key. The API will be small and only focus on getting values
-and setting values. That's it.
-
-[hyc_symas]: https://twitter.com/hyc_symas
-[lmdb]: http://symas.com/mdb/
-
-## Project Status
-
-Bolt is stable, the API is fixed, and the file format is fixed. Full unit
-test coverage and randomized black box testing are used to ensure database
-consistency and thread safety. Bolt is currently used in high-load production
-environments serving databases as large as 1TB. Many companies such as
-Shopify and Heroku use Bolt-backed services every day.
-
-## Table of Contents
-
-- [Getting Started](#getting-started)
-  - [Installing](#installing)
-  - [Opening a database](#opening-a-database)
-  - [Transactions](#transactions)
-    - [Read-write transactions](#read-write-transactions)
-    - [Read-only transactions](#read-only-transactions)
-    - [Batch read-write transactions](#batch-read-write-transactions)
-    - [Managing transactions manually](#managing-transactions-manually)
-  - [Using buckets](#using-buckets)
-  - [Using key/value pairs](#using-keyvalue-pairs)
-  - [Autoincrementing integer for the bucket](#autoincrementing-integer-for-the-bucket)
-  - [Iterating over keys](#iterating-over-keys)
-    - [Prefix scans](#prefix-scans)
-    - [Range scans](#range-scans)
-    - [ForEach()](#foreach)
-  - [Nested buckets](#nested-buckets)
-  - [Database backups](#database-backups)
-  - [Statistics](#statistics)
-  - [Read-Only Mode](#read-only-mode)
-  - [Mobile Use (iOS/Android)](#mobile-use-iosandroid)
-- [Resources](#resources)
-- [Comparison with other databases](#comparison-with-other-databases)
-  - [Postgres, MySQL, & other relational databases](#postgres-mysql--other-relational-databases)
-  - [LevelDB, RocksDB](#leveldb-rocksdb)
-  - [LMDB](#lmdb)
-- [Caveats & Limitations](#caveats--limitations)
-- [Reading the Source](#reading-the-source)
-- [Other Projects Using Bolt](#other-projects-using-bolt)
-
-## Getting Started
-
-### Installing
-
-To start using Bolt, install Go and run `go get`:
-
-```sh
-$ go get github.com/boltdb/bolt/...
-```
-
-This will retrieve the library and install the `bolt` command line utility into
-your `$GOBIN` path.
-
-
-### Opening a database
-
-The top-level object in Bolt is a `DB`. It is represented as a single file on
-your disk and represents a consistent snapshot of your data.
-
-To open your database, simply use the `bolt.Open()` function:
-
-```go
-package main
-
-import (
-	"log"
-
-	"github.com/boltdb/bolt"
-)
-
-func main() {
-	// Open the my.db data file in your current directory.
-	// It will be created if it doesn't exist.
-	db, err := bolt.Open("my.db", 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-
-	...
-}
-```
-
-Please note that Bolt obtains a file lock on the data file so multiple processes
-cannot open the same database at the same time. Opening an already open Bolt
-database will cause it to hang until the other process closes it. To prevent
-an indefinite wait you can pass a timeout option to the `Open()` function:
-
-```go
-db, err := bolt.Open("my.db", 0600, &bolt.Options{Timeout: 1 * time.Second})
-```
-
-
-### Transactions
-
-Bolt allows only one read-write transaction at a time but allows as many
-read-only transactions as you want at a time. Each transaction has a consistent
-view of the data as it existed when the transaction started.
-
-Individual transactions and all objects created from them (e.g. buckets, keys)
-are not thread safe. To work with data in multiple goroutines you must start
-a transaction for each one or use locking to ensure only one goroutine accesses
-a transaction at a time. Creating transaction from the `DB` is thread safe.
-
-Read-only transactions and read-write transactions should not depend on one
-another and generally shouldn't be opened simultaneously in the same goroutine.
-This can cause a deadlock as the read-write transaction needs to periodically
-re-map the data file but it cannot do so while a read-only transaction is open.
-
-
-#### Read-write transactions
-
-To start a read-write transaction, you can use the `DB.Update()` function:
-
-```go
-err := db.Update(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-Inside the closure, you have a consistent view of the database. You commit the
-transaction by returning `nil` at the end. You can also rollback the transaction
-at any point by returning an error. All database operations are allowed inside
-a read-write transaction.
-
-Always check the return error as it will report any disk failures that can cause
-your transaction to not complete. If you return an error within your closure
-it will be passed through.
-
-
-#### Read-only transactions
-
-To start a read-only transaction, you can use the `DB.View()` function:
-
-```go
-err := db.View(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-You also get a consistent view of the database within this closure, however,
-no mutating operations are allowed within a read-only transaction. You can only
-retrieve buckets, retrieve values, and copy the database within a read-only
-transaction.
-
-
-#### Batch read-write transactions
-
-Each `DB.Update()` waits for disk to commit the writes. This overhead
-can be minimized by combining multiple updates with the `DB.Batch()`
-function:
-
-```go
-err := db.Batch(func(tx *bolt.Tx) error {
-	...
-	return nil
-})
-```
-
-Concurrent Batch calls are opportunistically combined into larger
-transactions. Batch is only useful when there are multiple goroutines
-calling it.
-
-The trade-off is that `Batch` can call the given
-function multiple times, if parts of the transaction fail. The
-function must be idempotent and side effects must take effect only
-after a successful return from `DB.Batch()`.
-
-For example: don't display messages from inside the function, instead
-set variables in the enclosing scope:
-
-```go
-var id uint64
-err := db.Batch(func(tx *bolt.Tx) error {
-	// Find last key in bucket, decode as bigendian uint64, increment
-	// by one, encode back to []byte, and add new key.
-	...
-	id = newValue
-	return nil
-})
-if err != nil {
-	return ...
-}
-fmt.Println("Allocated ID %d", id)
-```
-
-
-#### Managing transactions manually
-
-The `DB.View()` and `DB.Update()` functions are wrappers around the `DB.Begin()`
-function. These helper functions will start the transaction, execute a function,
-and then safely close your transaction if an error is returned. This is the
-recommended way to use Bolt transactions.
-
-However, sometimes you may want to manually start and end your transactions.
-You can use the `DB.Begin()` function directly but **please** be sure to close
-the transaction.
-
-```go
-// Start a writable transaction.
-tx, err := db.Begin(true)
-if err != nil {
-    return err
-}
-defer tx.Rollback()
-
-// Use the transaction...
-_, err := tx.CreateBucket([]byte("MyBucket"))
-if err != nil {
-    return err
-}
-
-// Commit the transaction and check for error.
-if err := tx.Commit(); err != nil {
-    return err
-}
-```
-
-The first argument to `DB.Begin()` is a boolean stating if the transaction
-should be writable.
-
-
-### Using buckets
-
-Buckets are collections of key/value pairs within the database. All keys in a
-bucket must be unique. You can create a bucket using the `DB.CreateBucket()`
-function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
-	b, err := tx.CreateBucket([]byte("MyBucket"))
-	if err != nil {
-		return fmt.Errorf("create bucket: %s", err)
-	}
-	return nil
-})
-```
-
-You can also create a bucket only if it doesn't exist by using the
-`Tx.CreateBucketIfNotExists()` function. It's a common pattern to call this
-function for all your top-level buckets after you open your database so you can
-guarantee that they exist for future transactions.
-
-To delete a bucket, simply call the `Tx.DeleteBucket()` function.
-
-
-### Using key/value pairs
-
-To save a key/value pair to a bucket, use the `Bucket.Put()` function:
-
-```go
-db.Update(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	err := b.Put([]byte("answer"), []byte("42"))
-	return err
-})
-```
-
-This will set the value of the `"answer"` key to `"42"` in the `MyBucket`
-bucket. To retrieve this value, we can use the `Bucket.Get()` function:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	b := tx.Bucket([]byte("MyBucket"))
-	v := b.Get([]byte("answer"))
-	fmt.Printf("The answer is: %s\n", v)
-	return nil
-})
-```
-
-The `Get()` function does not return an error because its operation is
-guaranteed to work (unless there is some kind of system failure). If the key
-exists then it will return its byte slice value. If it doesn't exist then it
-will return `nil`. It's important to note that you can have a zero-length value
-set to a key which is different than the key not existing.
-
-Use the `Bucket.Delete()` function to delete a key from the bucket.
-
-Please note that values returned from `Get()` are only valid while the
-transaction is open. If you need to use a value outside of the transaction
-then you must use `copy()` to copy it to another byte slice.
-
-
-### Autoincrementing integer for the bucket
-By using the `NextSequence()` function, you can let Bolt determine a sequence
-which can be used as the unique identifier for your key/value pairs. See the
-example below.
-
-```go
-// CreateUser saves u to the store. The new user ID is set on u once the data is persisted.
-func (s *Store) CreateUser(u *User) error {
-    return s.db.Update(func(tx *bolt.Tx) error {
-        // Retrieve the users bucket.
-        // This should be created when the DB is first opened.
-        b := tx.Bucket([]byte("users"))
-
-        // Generate ID for the user.
-        // This returns an error only if the Tx is closed or not writeable.
-        // That can't happen in an Update() call so I ignore the error check.
-        id, _ := b.NextSequence()
-        u.ID = int(id)
-
-        // Marshal user data into bytes.
-        buf, err := json.Marshal(u)
-        if err != nil {
-            return err
-        }
-
-        // Persist bytes to users bucket.
-        return b.Put(itob(u.ID), buf)
-    })
-}
-
-// itob returns an 8-byte big endian representation of v.
-func itob(v int) []byte {
-    b := make([]byte, 8)
-    binary.BigEndian.PutUint64(b, uint64(v))
-    return b
-}
-
-type User struct {
-    ID int
-    ...
-}
-```
-
-### Iterating over keys
-
-Bolt stores its keys in byte-sorted order within a bucket. This makes sequential
-iteration over these keys extremely fast. To iterate over keys we'll use a
-`Cursor`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	// Assume bucket exists and has keys
-	b := tx.Bucket([]byte("MyBucket"))
-
-	c := b.Cursor()
-
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-The cursor allows you to move to a specific point in the list of keys and move
-forward or backward through the keys one at a time.
-
-The following functions are available on the cursor:
-
-```
-First()  Move to the first key.
-Last()   Move to the last key.
-Seek()   Move to a specific key.
-Next()   Move to the next key.
-Prev()   Move to the previous key.
-```
-
-Each of those functions has a return signature of `(key []byte, value []byte)`.
-When you have iterated to the end of the cursor then `Next()` will return a
-`nil` key.  You must seek to a position using `First()`, `Last()`, or `Seek()`
-before calling `Next()` or `Prev()`. If you do not seek to a position then
-these functions will return a `nil` key.
-
-During iteration, if the key is non-`nil` but the value is `nil`, that means
-the key refers to a bucket rather than a value.  Use `Bucket.Bucket()` to
-access the sub-bucket.
-
-
-#### Prefix scans
-
-To iterate over a key prefix, you can combine `Seek()` and `bytes.HasPrefix()`:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	// Assume bucket exists and has keys
-	c := tx.Bucket([]byte("MyBucket")).Cursor()
-
-	prefix := []byte("1234")
-	for k, v := c.Seek(prefix); k != nil && bytes.HasPrefix(k, prefix); k, v = c.Next() {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-#### Range scans
-
-Another common use case is scanning over a range such as a time range. If you
-use a sortable time encoding such as RFC3339 then you can query a specific
-date range like this:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	// Assume our events bucket exists and has RFC3339 encoded time keys.
-	c := tx.Bucket([]byte("Events")).Cursor()
-
-	// Our time range spans the 90's decade.
-	min := []byte("1990-01-01T00:00:00Z")
-	max := []byte("2000-01-01T00:00:00Z")
-
-	// Iterate over the 90's.
-	for k, v := c.Seek(min); k != nil && bytes.Compare(k, max) <= 0; k, v = c.Next() {
-		fmt.Printf("%s: %s\n", k, v)
-	}
-
-	return nil
-})
-```
-
-Note that, while RFC3339 is sortable, the Golang implementation of RFC3339Nano does not use a fixed number of digits after the decimal point and is therefore not sortable.
-
-
-#### ForEach()
-
-You can also use the function `ForEach()` if you know you'll be iterating over
-all the keys in a bucket:
-
-```go
-db.View(func(tx *bolt.Tx) error {
-	// Assume bucket exists and has keys
-	b := tx.Bucket([]byte("MyBucket"))
-
-	b.ForEach(func(k, v []byte) error {
-		fmt.Printf("key=%s, value=%s\n", k, v)
-		return nil
-	})
-	return nil
-})
-```
-
-Please note that keys and values in `ForEach()` are only valid while
-the transaction is open. If you need to use a key or value outside of
-the transaction, you must use `copy()` to copy it to another byte
-slice.
-
-### Nested buckets
-
-You can also store a bucket in a key to create nested buckets. The API is the
-same as the bucket management API on the `DB` object:
-
-```go
-func (*Bucket) CreateBucket(key []byte) (*Bucket, error)
-func (*Bucket) CreateBucketIfNotExists(key []byte) (*Bucket, error)
-func (*Bucket) DeleteBucket(key []byte) error
-```
-
-Say you had a multi-tenant application where the root level bucket was the account bucket. Inside of this bucket was a sequence of accounts which themselves are buckets. And inside the sequence bucket you could have many buckets pertaining to the Account itself (Users, Notes, etc) isolating the information into logical groupings.
-
-```go
-
-// createUser creates a new user in the given account.
-func createUser(accountID int, u *User) error {
-    // Start the transaction.
-    tx, err := db.Begin(true)
-    if err != nil {
-        return err
-    }
-    defer tx.Rollback()
-
-    // Retrieve the root bucket for the account.
-    // Assume this has already been created when the account was set up.
-    root := tx.Bucket([]byte(strconv.FormatUint(accountID, 10)))
-
-    // Setup the users bucket.
-    bkt, err := root.CreateBucketIfNotExists([]byte("USERS"))
-    if err != nil {
-        return err
-    }
-
-    // Generate an ID for the new user.
-    userID, err := bkt.NextSequence()
-    if err != nil {
-        return err
-    }
-    u.ID = userID
-
-    // Marshal and save the encoded user.
-    if buf, err := json.Marshal(u); err != nil {
-        return err
-    } else if err := bkt.Put([]byte(strconv.FormatUint(u.ID, 10)), buf); err != nil {
-        return err
-    }
-
-    // Commit the transaction.
-    if err := tx.Commit(); err != nil {
-        return err
-    }
-
-    return nil
-}
-
-```
-
-
-
-
-### Database backups
-
-Bolt is a single file so it's easy to backup. You can use the `Tx.WriteTo()`
-function to write a consistent view of the database to a writer. If you call
-this from a read-only transaction, it will perform a hot backup and not block
-your other database reads and writes.
-
-By default, it will use a regular file handle which will utilize the operating
-system's page cache. See the [`Tx`](https://godoc.org/github.com/boltdb/bolt#Tx)
-documentation for information about optimizing for larger-than-RAM datasets.
-
-One common use case is to backup over HTTP so you can use tools like `cURL` to
-do database backups:
-
-```go
-func BackupHandleFunc(w http.ResponseWriter, req *http.Request) {
-	err := db.View(func(tx *bolt.Tx) error {
-		w.Header().Set("Content-Type", "application/octet-stream")
-		w.Header().Set("Content-Disposition", `attachment; filename="my.db"`)
-		w.Header().Set("Content-Length", strconv.Itoa(int(tx.Size())))
-		_, err := tx.WriteTo(w)
-		return err
-	})
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-	}
-}
-```
-
-Then you can backup using this command:
-
-```sh
-$ curl http://localhost/backup > my.db
-```
-
-Or you can open your browser to `http://localhost/backup` and it will download
-automatically.
-
-If you want to backup to another file you can use the `Tx.CopyFile()` helper
-function.
-
-
-### Statistics
-
-The database keeps a running count of many of the internal operations it
-performs so you can better understand what's going on. By grabbing a snapshot
-of these stats at two points in time we can see what operations were performed
-in that time range.
-
-For example, we could start a goroutine to log stats every 10 seconds:
-
-```go
-go func() {
-	// Grab the initial stats.
-	prev := db.Stats()
-
-	for {
-		// Wait for 10s.
-		time.Sleep(10 * time.Second)
-
-		// Grab the current stats and diff them.
-		stats := db.Stats()
-		diff := stats.Sub(&prev)
-
-		// Encode stats to JSON and print to STDERR.
-		json.NewEncoder(os.Stderr).Encode(diff)
-
-		// Save stats for the next loop.
-		prev = stats
-	}
-}()
-```
-
-It's also useful to pipe these stats to a service such as statsd for monitoring
-or to provide an HTTP endpoint that will perform a fixed-length sample.
-
-
-### Read-Only Mode
-
-Sometimes it is useful to create a shared, read-only Bolt database. To this,
-set the `Options.ReadOnly` flag when opening your database. Read-only mode
-uses a shared lock to allow multiple processes to read from the database but
-it will block any processes from opening the database in read-write mode.
-
-```go
-db, err := bolt.Open("my.db", 0666, &bolt.Options{ReadOnly: true})
-if err != nil {
-	log.Fatal(err)
-}
-```
-
-### Mobile Use (iOS/Android)
-
-Bolt is able to run on mobile devices by leveraging the binding feature of the
-[gomobile](https://github.com/golang/mobile) tool. Create a struct that will
-contain your database logic and a reference to a `*bolt.DB` with a initializing
-constructor that takes in a filepath where the database file will be stored.
-Neither Android nor iOS require extra permissions or cleanup from using this method.
-
-```go
-func NewBoltDB(filepath string) *BoltDB {
-	db, err := bolt.Open(filepath+"/demo.db", 0600, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return &BoltDB{db}
-}
-
-type BoltDB struct {
-	db *bolt.DB
-	...
-}
-
-func (b *BoltDB) Path() string {
-	return b.db.Path()
-}
-
-func (b *BoltDB) Close() {
-	b.db.Close()
-}
-```
-
-Database logic should be defined as methods on this wrapper struct.
-
-To initialize this struct from the native language (both platforms now sync
-their local storage to the cloud. These snippets disable that functionality for the
-database file):
-
-#### Android
-
-```java
-String path;
-if (android.os.Build.VERSION.SDK_INT >=android.os.Build.VERSION_CODES.LOLLIPOP){
-    path = getNoBackupFilesDir().getAbsolutePath();
-} else{
-    path = getFilesDir().getAbsolutePath();
-}
-Boltmobiledemo.BoltDB boltDB = Boltmobiledemo.NewBoltDB(path)
-```
-
-#### iOS
-
-```objc
-- (void)demo {
-    NSString* path = [NSSearchPathForDirectoriesInDomains(NSLibraryDirectory,
-                                                          NSUserDomainMask,
-                                                          YES) objectAtIndex:0];
-	GoBoltmobiledemoBoltDB * demo = GoBoltmobiledemoNewBoltDB(path);
-	[self addSkipBackupAttributeToItemAtPath:demo.path];
-	//Some DB Logic would go here
-	[demo close];
-}
-
-- (BOOL)addSkipBackupAttributeToItemAtPath:(NSString *) filePathString
-{
-    NSURL* URL= [NSURL fileURLWithPath: filePathString];
-    assert([[NSFileManager defaultManager] fileExistsAtPath: [URL path]]);
-
-    NSError *error = nil;
-    BOOL success = [URL setResourceValue: [NSNumber numberWithBool: YES]
-                                  forKey: NSURLIsExcludedFromBackupKey error: &error];
-    if(!success){
-        NSLog(@"Error excluding %@ from backup %@", [URL lastPathComponent], error);
-    }
-    return success;
-}
-
-```
-
-## Resources
-
-For more information on getting started with Bolt, check out the following articles:
-
-* [Intro to BoltDB: Painless Performant Persistence](http://npf.io/2014/07/intro-to-boltdb-painless-performant-persistence/) by [Nate Finch](https://github.com/natefinch).
-* [Bolt -- an embedded key/value database for Go](https://www.progville.com/go/bolt-embedded-db-golang/) by Progville
-
-
-## Comparison with other databases
-
-### Postgres, MySQL, & other relational databases
-
-Relational databases structure data into rows and are only accessible through
-the use of SQL. This approach provides flexibility in how you store and query
-your data but also incurs overhead in parsing and planning SQL statements. Bolt
-accesses all data by a byte slice key. This makes Bolt fast to read and write
-data by key but provides no built-in support for joining values together.
-
-Most relational databases (with the exception of SQLite) are standalone servers
-that run separately from your application. This gives your systems
-flexibility to connect multiple application servers to a single database
-server but also adds overhead in serializing and transporting data over the
-network. Bolt runs as a library included in your application so all data access
-has to go through your application's process. This brings data closer to your
-application but limits multi-process access to the data.
-
-
-### LevelDB, RocksDB
-
-LevelDB and its derivatives (RocksDB, HyperLevelDB) are similar to Bolt in that
-they are libraries bundled into the application, however, their underlying
-structure is a log-structured merge-tree (LSM tree). An LSM tree optimizes
-random writes by using a write ahead log and multi-tiered, sorted files called
-SSTables. Bolt uses a B+tree internally and only a single file. Both approaches
-have trade-offs.
-
-If you require a high random write throughput (>10,000 w/sec) or you need to use
-spinning disks then LevelDB could be a good choice. If your application is
-read-heavy or does a lot of range scans then Bolt could be a good choice.
-
-One other important consideration is that LevelDB does not have transactions.
-It supports batch writing of key/values pairs and it supports read snapshots
-but it will not give you the ability to do a compare-and-swap operation safely.
-Bolt supports fully serializable ACID transactions.
-
-
-### LMDB
-
-Bolt was originally a port of LMDB so it is architecturally similar. Both use
-a B+tree, have ACID semantics with fully serializable transactions, and support
-lock-free MVCC using a single writer and multiple readers.
-
-The two projects have somewhat diverged. LMDB heavily focuses on raw performance
-while Bolt has focused on simplicity and ease of use. For example, LMDB allows
-several unsafe actions such as direct writes for the sake of performance. Bolt
-opts to disallow actions which can leave the database in a corrupted state. The
-only exception to this in Bolt is `DB.NoSync`.
-
-There are also a few differences in API. LMDB requires a maximum mmap size when
-opening an `mdb_env` whereas Bolt will handle incremental mmap resizing
-automatically. LMDB overloads the getter and setter functions with multiple
-flags whereas Bolt splits these specialized cases into their own functions.
-
-
-## Caveats & Limitations
-
-It's important to pick the right tool for the job and Bolt is no exception.
-Here are a few things to note when evaluating and using Bolt:
-
-* Bolt is good for read intensive workloads. Sequential write performance is
-  also fast but random writes can be slow. You can use `DB.Batch()` or add a
-  write-ahead log to help mitigate this issue.
-
-* Bolt uses a B+tree internally so there can be a lot of random page access.
-  SSDs provide a significant performance boost over spinning disks.
-
-* Try to avoid long running read transactions. Bolt uses copy-on-write so
-  old pages cannot be reclaimed while an old transaction is using them.
-
-* Byte slices returned from Bolt are only valid during a transaction. Once the
-  transaction has been committed or rolled back then the memory they point to
-  can be reused by a new page or can be unmapped from virtual memory and you'll
-  see an `unexpected fault address` panic when accessing it.
-
-* Bolt uses an exclusive write lock on the database file so it cannot be
-  shared by multiple processes.
-
-* Be careful when using `Bucket.FillPercent`. Setting a high fill percent for
-  buckets that have random inserts will cause your database to have very poor
-  page utilization.
-
-* Use larger buckets in general. Smaller buckets causes poor page utilization
-  once they become larger than the page size (typically 4KB).
-
-* Bulk loading a lot of random writes into a new bucket can be slow as the
-  page will not split until the transaction is committed. Randomly inserting
-  more than 100,000 key/value pairs into a single new bucket in a single
-  transaction is not advised.
-
-* Bolt uses a memory-mapped file so the underlying operating system handles the
-  caching of the data. Typically, the OS will cache as much of the file as it
-  can in memory and will release memory as needed to other processes. This means
-  that Bolt can show very high memory usage when working with large databases.
-  However, this is expected and the OS will release memory as needed. Bolt can
-  handle databases much larger than the available physical RAM, provided its
-  memory-map fits in the process virtual address space. It may be problematic
-  on 32-bits systems.
-
-* The data structures in the Bolt database are memory mapped so the data file
-  will be endian specific. This means that you cannot copy a Bolt file from a
-  little endian machine to a big endian machine and have it work. For most
-  users this is not a concern since most modern CPUs are little endian.
-
-* Because of the way pages are laid out on disk, Bolt cannot truncate data files
-  and return free pages back to the disk. Instead, Bolt maintains a free list
-  of unused pages within its data file. These free pages can be reused by later
-  transactions. This works well for many use cases as databases generally tend
-  to grow. However, it's important to note that deleting large chunks of data
-  will not allow you to reclaim that space on disk.
-
-  For more information on page allocation, [see this comment][page-allocation].
-
-[page-allocation]: https://github.com/boltdb/bolt/issues/308#issuecomment-74811638
-
-
-## Reading the Source
-
-Bolt is a relatively small code base (<3KLOC) for an embedded, serializable,
-transactional key/value database so it can be a good starting point for people
-interested in how databases work.
-
-The best places to start are the main entry points into Bolt:
-
-- `Open()` - Initializes the reference to the database. It's responsible for
-  creating the database if it doesn't exist, obtaining an exclusive lock on the
-  file, reading the meta pages, & memory-mapping the file.
-
-- `DB.Begin()` - Starts a read-only or read-write transaction depending on the
-  value of the `writable` argument. This requires briefly obtaining the "meta"
-  lock to keep track of open transactions. Only one read-write transaction can
-  exist at a time so the "rwlock" is acquired during the life of a read-write
-  transaction.
-
-- `Bucket.Put()` - Writes a key/value pair into a bucket. After validating the
-  arguments, a cursor is used to traverse the B+tree to the page and position
-  where they key & value will be written. Once the position is found, the bucket
-  materializes the underlying page and the page's parent pages into memory as
-  "nodes". These nodes are where mutations occur during read-write transactions.
-  These changes get flushed to disk during commit.
-
-- `Bucket.Get()` - Retrieves a key/value pair from a bucket. This uses a cursor
-  to move to the page & position of a key/value pair. During a read-only
-  transaction, the key and value data is returned as a direct reference to the
-  underlying mmap file so there's no allocation overhead. For read-write
-  transactions, this data may reference the mmap file or one of the in-memory
-  node values.
-
-- `Cursor` - This object is simply for traversing the B+tree of on-disk pages
-  or in-memory nodes. It can seek to a specific key, move to the first or last
-  value, or it can move forward or backward. The cursor handles the movement up
-  and down the B+tree transparently to the end user.
-
-- `Tx.Commit()` - Converts the in-memory dirty nodes and the list of free pages
-  into pages to be written to disk. Writing to disk then occurs in two phases.
-  First, the dirty pages are written to disk and an `fsync()` occurs. Second, a
-  new meta page with an incremented transaction ID is written and another
-  `fsync()` occurs. This two phase write ensures that partially written data
-  pages are ignored in the event of a crash since the meta page pointing to them
-  is never written. Partially written meta pages are invalidated because they
-  are written with a checksum.
-
-If you have additional notes that could be helpful for others, please submit
-them via pull request.
-
-
-## Other Projects Using Bolt
-
-Below is a list of public, open source projects that use Bolt:
-
-* [BoltDbWeb](https://github.com/evnix/boltdbweb) - A web based GUI for BoltDB files.
-* [Operation Go: A Routine Mission](http://gocode.io) - An online programming game for Golang using Bolt for user accounts and a leaderboard.
-* [Bazil](https://bazil.org/) - A file system that lets your data reside where it is most convenient for it to reside.
-* [DVID](https://github.com/janelia-flyem/dvid) - Added Bolt as optional storage engine and testing it against Basho-tuned leveldb.
-* [Skybox Analytics](https://github.com/skybox/skybox) - A standalone funnel analysis tool for web analytics.
-* [Scuttlebutt](https://github.com/benbjohnson/scuttlebutt) - Uses Bolt to store and process all Twitter mentions of GitHub projects.
-* [Wiki](https://github.com/peterhellberg/wiki) - A tiny wiki using Goji, BoltDB and Blackfriday.
-* [ChainStore](https://github.com/pressly/chainstore) - Simple key-value interface to a variety of storage engines organized as a chain of operations.
-* [MetricBase](https://github.com/msiebuhr/MetricBase) - Single-binary version of Graphite.
-* [Gitchain](https://github.com/gitchain/gitchain) - Decentralized, peer-to-peer Git repositories aka "Git meets Bitcoin".
-* [event-shuttle](https://github.com/sclasen/event-shuttle) - A Unix system service to collect and reliably deliver messages to Kafka.
-* [ipxed](https://github.com/kelseyhightower/ipxed) - Web interface and api for ipxed.
-* [BoltStore](https://github.com/yosssi/boltstore) - Session store using Bolt.
-* [photosite/session](https://godoc.org/bitbucket.org/kardianos/photosite/session) - Sessions for a photo viewing site.
-* [LedisDB](https://github.com/siddontang/ledisdb) - A high performance NoSQL, using Bolt as optional storage.
-* [ipLocator](https://github.com/AndreasBriese/ipLocator) - A fast ip-geo-location-server using bolt with bloom filters.
-* [cayley](https://github.com/google/cayley) - Cayley is an open-source graph database using Bolt as optional backend.
-* [bleve](http://www.blevesearch.com/) - A pure Go search engine similar to ElasticSearch that uses Bolt as the default storage backend.
-* [tentacool](https://github.com/optiflows/tentacool) - REST api server to manage system stuff (IP, DNS, Gateway...) on a linux server.
-* [Seaweed File System](https://github.com/chrislusf/seaweedfs) - Highly scalable distributed key~file system with O(1) disk read.
-* [InfluxDB](https://influxdata.com) - Scalable datastore for metrics, events, and real-time analytics.
-* [Freehold](http://tshannon.bitbucket.org/freehold/) - An open, secure, and lightweight platform for your files and data.
-* [Prometheus Annotation Server](https://github.com/oliver006/prom_annotation_server) - Annotation server for PromDash & Prometheus service monitoring system.
-* [Consul](https://github.com/hashicorp/consul) - Consul is service discovery and configuration made easy. Distributed, highly available, and datacenter-aware.
-* [Kala](https://github.com/ajvb/kala) - Kala is a modern job scheduler optimized to run on a single node. It is persistent, JSON over HTTP API, ISO 8601 duration notation, and dependent jobs.
-* [drive](https://github.com/odeke-em/drive) - drive is an unofficial Google Drive command line client for \*NIX operating systems.
-* [stow](https://github.com/djherbis/stow) -  a persistence manager for objects
-  backed by boltdb.
-* [buckets](https://github.com/joyrexus/buckets) - a bolt wrapper streamlining
-  simple tx and key scans.
-* [mbuckets](https://github.com/abhigupta912/mbuckets) - A Bolt wrapper that allows easy operations on multi level (nested) buckets.
-* [Request Baskets](https://github.com/darklynx/request-baskets) - A web service to collect arbitrary HTTP requests and inspect them via REST API or simple web UI, similar to [RequestBin](http://requestb.in/) service
-* [Go Report Card](https://goreportcard.com/) - Go code quality report cards as a (free and open source) service.
-* [Boltdb Boilerplate](https://github.com/bobintornado/boltdb-boilerplate) - Boilerplate wrapper around bolt aiming to make simple calls one-liners.
-* [lru](https://github.com/crowdriff/lru) - Easy to use Bolt-backed Least-Recently-Used (LRU) read-through cache with chainable remote stores.
-* [Storm](https://github.com/asdine/storm) - Simple and powerful ORM for BoltDB.
-* [GoWebApp](https://github.com/josephspurrier/gowebapp) - A basic MVC web application in Go using BoltDB.
-* [SimpleBolt](https://github.com/xyproto/simplebolt) - A simple way to use BoltDB. Deals mainly with strings.
-* [Algernon](https://github.com/xyproto/algernon) - A HTTP/2 web server with built-in support for Lua. Uses BoltDB as the default database backend.
-* [MuLiFS](https://github.com/dankomiocevic/mulifs) - Music Library Filesystem creates a filesystem to organise your music files.
-* [GoShort](https://github.com/pankajkhairnar/goShort) - GoShort is a URL shortener written in Golang and BoltDB for persistent key/value storage and for routing it's using high performent HTTPRouter.
-* [torrent](https://github.com/anacrolix/torrent) - Full-featured BitTorrent client package and utilities in Go. BoltDB is a storage backend in development.
-* [gopherpit](https://github.com/gopherpit/gopherpit) - A web service to manage Go remote import paths with custom domains
-* [bolter](https://github.com/hasit/bolter) - Command-line app for viewing BoltDB file in your terminal.
-* [btcwallet](https://github.com/btcsuite/btcwallet) - A bitcoin wallet.
-* [dcrwallet](https://github.com/decred/dcrwallet) - A wallet for the Decred cryptocurrency.
-* [Ironsmith](https://github.com/timshannon/ironsmith) - A simple, script-driven continuous integration (build - > test -> release) tool, with no external dependencies
-* [BoltHold](https://github.com/timshannon/bolthold) - An embeddable NoSQL store for Go types built on BoltDB
-* [Ponzu CMS](https://ponzu-cms.org) - Headless CMS + automatic JSON API with auto-HTTPS, HTTP/2 Server Push, and flexible server framework.
-
-If you are using Bolt in a project please send a pull request to add it to the list.
diff --git a/installer/vendor/github.com/boltdb/bolt/appveyor.yml b/installer/vendor/github.com/boltdb/bolt/appveyor.yml
deleted file mode 100644
index 6e26e941d6..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/appveyor.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-version: "{build}"
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\gopath\src\github.com\boltdb\bolt
-
-environment:
-  GOPATH: c:\gopath
-
-install:
-  - echo %PATH%
-  - echo %GOPATH%
-  - go version
-  - go env
-  - go get -v -t ./...
-
-build_script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/boltdb/bolt/bucket_test.go b/installer/vendor/github.com/boltdb/bolt/bucket_test.go
deleted file mode 100644
index cddbe27131..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/bucket_test.go
+++ /dev/null
@@ -1,1909 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"log"
-	"math/rand"
-	"os"
-	"strconv"
-	"strings"
-	"testing"
-	"testing/quick"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that a bucket that gets a non-existent key returns nil.
-func TestBucket_Get_NonExistent(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if v := b.Get([]byte("foo")); v != nil {
-			t.Fatal("expected nil value")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can read a value that is not flushed yet.
-func TestBucket_Get_FromNode(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if v := b.Get([]byte("foo")); !bytes.Equal(v, []byte("bar")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket retrieved via Get() returns a nil.
-func TestBucket_Get_IncompatibleValue(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-
-		if tx.Bucket([]byte("widgets")).Get([]byte("foo")) != nil {
-			t.Fatal("expected nil value")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a slice returned from a bucket has a capacity equal to its length.
-// This also allows slices to be appended to since it will require a realloc by Go.
-//
-// https://github.com/boltdb/bolt/issues/544
-func TestBucket_Get_Capacity(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Write key to a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("bucket"))
-		if err != nil {
-			return err
-		}
-		return b.Put([]byte("key"), []byte("val"))
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Retrieve value and attempt to append to it.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		k, v := tx.Bucket([]byte("bucket")).Cursor().First()
-
-		// Verify capacity.
-		if len(k) != cap(k) {
-			t.Fatalf("unexpected key slice capacity: %d", cap(k))
-		} else if len(v) != cap(v) {
-			t.Fatalf("unexpected value slice capacity: %d", cap(v))
-		}
-
-		// Ensure slice can be appended to without a segfault.
-		k = append(k, []byte("123")...)
-		v = append(v, []byte("123")...)
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can write a key/value.
-func TestBucket_Put(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-
-		v := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		if !bytes.Equal([]byte("bar"), v) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can rewrite a key in the same transaction.
-func TestBucket_Put_Repeat(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("baz")); err != nil {
-			t.Fatal(err)
-		}
-
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		if !bytes.Equal([]byte("baz"), value) {
-			t.Fatalf("unexpected value: %v", value)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can write a bunch of large values.
-func TestBucket_Put_Large(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	count, factor := 100, 200
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i := 1; i < count; i++ {
-			if err := b.Put([]byte(strings.Repeat("0", i*factor)), []byte(strings.Repeat("X", (count-i)*factor))); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i < count; i++ {
-			value := b.Get([]byte(strings.Repeat("0", i*factor)))
-			if !bytes.Equal(value, []byte(strings.Repeat("X", (count-i)*factor))) {
-				t.Fatalf("unexpected value: %v", value)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a database can perform multiple large appends safely.
-func TestDB_Put_VeryLarge(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	n, batchN := 400000, 200000
-	ksize, vsize := 8, 500
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	for i := 0; i < n; i += batchN {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("widgets"))
-			if err != nil {
-				t.Fatal(err)
-			}
-			for j := 0; j < batchN; j++ {
-				k, v := make([]byte, ksize), make([]byte, vsize)
-				binary.BigEndian.PutUint32(k, uint32(i+j))
-				if err := b.Put(k, v); err != nil {
-					t.Fatal(err)
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-// Ensure that a setting a value on a key with a bucket value returns an error.
-func TestBucket_Put_IncompatibleValue(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b0, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err := tx.Bucket([]byte("widgets")).CreateBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b0.Put([]byte("foo"), []byte("bar")); err != bolt.ErrIncompatibleValue {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a setting a value while the transaction is closed returns an error.
-func TestBucket_Put_Closed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := tx.CreateBucket([]byte("widgets"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := b.Put([]byte("foo"), []byte("bar")); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that setting a value on a read-only bucket returns an error.
-func TestBucket_Put_ReadOnly(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		if err := b.Put([]byte("foo"), []byte("bar")); err != bolt.ErrTxNotWritable {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can delete an existing key.
-func TestBucket_Delete(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Delete([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		if v := b.Get([]byte("foo")); v != nil {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a large set of keys will work correctly.
-func TestBucket_Delete_Large(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for i := 0; i < 100; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strings.Repeat("*", 1024))); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 0; i < 100; i++ {
-			if err := b.Delete([]byte(strconv.Itoa(i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 0; i < 100; i++ {
-			if v := b.Get([]byte(strconv.Itoa(i))); v != nil {
-				t.Fatalf("unexpected value: %v, i=%d", v, i)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Deleting a very large list of keys will cause the freelist to use overflow.
-func TestBucket_Delete_FreelistOverflow(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	k := make([]byte, 16)
-	for i := uint64(0); i < 10000; i++ {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("0"))
-			if err != nil {
-				t.Fatalf("bucket error: %s", err)
-			}
-
-			for j := uint64(0); j < 1000; j++ {
-				binary.BigEndian.PutUint64(k[:8], i)
-				binary.BigEndian.PutUint64(k[8:], j)
-				if err := b.Put(k, nil); err != nil {
-					t.Fatalf("put error: %s", err)
-				}
-			}
-
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Delete all of them in one large transaction
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("0"))
-		c := b.Cursor()
-		for k, _ := c.First(); k != nil; k, _ = c.Next() {
-			if err := c.Delete(); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that accessing and updating nested buckets is ok across transactions.
-func TestBucket_Nested(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create a widgets bucket.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Create a widgets/foo bucket.
-		_, err = b.CreateBucket([]byte("foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Create a widgets/bar key.
-		if err := b.Put([]byte("bar"), []byte("0000")); err != nil {
-			t.Fatal(err)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.MustCheck()
-
-	// Update widgets/bar.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		if err := b.Put([]byte("bar"), []byte("xxxx")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.MustCheck()
-
-	// Cause a split.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		for i := 0; i < 10000; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.MustCheck()
-
-	// Insert into widgets/foo/baz.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		if err := b.Bucket([]byte("foo")).Put([]byte("baz"), []byte("yyyy")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.MustCheck()
-
-	// Verify.
-	if err := db.View(func(tx *bolt.Tx) error {
-		var b = tx.Bucket([]byte("widgets"))
-		if v := b.Bucket([]byte("foo")).Get([]byte("baz")); !bytes.Equal(v, []byte("yyyy")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		if v := b.Get([]byte("bar")); !bytes.Equal(v, []byte("xxxx")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		for i := 0; i < 10000; i++ {
-			if v := b.Get([]byte(strconv.Itoa(i))); !bytes.Equal(v, []byte(strconv.Itoa(i))) {
-				t.Fatalf("unexpected value: %v", v)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a bucket using Delete() returns an error.
-func TestBucket_Delete_Bucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Delete([]byte("foo")); err != bolt.ErrIncompatibleValue {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a key on a read-only bucket returns an error.
-func TestBucket_Delete_ReadOnly(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		if err := tx.Bucket([]byte("widgets")).Delete([]byte("foo")); err != bolt.ErrTxNotWritable {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a deleting value while the transaction is closed returns an error.
-func TestBucket_Delete_Closed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := tx.CreateBucket([]byte("widgets"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-	if err := b.Delete([]byte("foo")); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that deleting a bucket causes nested buckets to be deleted.
-func TestBucket_DeleteBucket_Nested(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		foo, err := widgets.CreateBucket([]byte("foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		bar, err := foo.CreateBucket([]byte("bar"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := bar.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		if err := tx.Bucket([]byte("widgets")).DeleteBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a bucket causes nested buckets to be deleted after they have been committed.
-func TestBucket_DeleteBucket_Nested2(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		foo, err := widgets.CreateBucket([]byte("foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		bar, err := foo.CreateBucket([]byte("bar"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := bar.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets := tx.Bucket([]byte("widgets"))
-		if widgets == nil {
-			t.Fatal("expected widgets bucket")
-		}
-
-		foo := widgets.Bucket([]byte("foo"))
-		if foo == nil {
-			t.Fatal("expected foo bucket")
-		}
-
-		bar := foo.Bucket([]byte("bar"))
-		if bar == nil {
-			t.Fatal("expected bar bucket")
-		}
-
-		if v := bar.Get([]byte("baz")); !bytes.Equal(v, []byte("bat")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		if err := tx.DeleteBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		if tx.Bucket([]byte("widgets")) != nil {
-			t.Fatal("expected bucket to be deleted")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a child bucket with multiple pages causes all pages to get collected.
-// NOTE: Consistency check in bolt_test.DB.Close() will panic if pages not freed properly.
-func TestBucket_DeleteBucket_Large(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		foo, err := widgets.CreateBucket([]byte("foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for i := 0; i < 1000; i++ {
-			if err := foo.Put([]byte(fmt.Sprintf("%d", i)), []byte(fmt.Sprintf("%0100d", i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if err := tx.DeleteBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a simple value retrieved via Bucket() returns a nil.
-func TestBucket_Bucket_IncompatibleValue(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := widgets.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if b := tx.Bucket([]byte("widgets")).Bucket([]byte("foo")); b != nil {
-			t.Fatal("expected nil bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating a bucket on an existing non-bucket key returns an error.
-func TestBucket_CreateBucket_IncompatibleValue(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := widgets.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := widgets.CreateBucket([]byte("foo")); err != bolt.ErrIncompatibleValue {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a bucket on an existing non-bucket key returns an error.
-func TestBucket_DeleteBucket_IncompatibleValue(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := widgets.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := tx.Bucket([]byte("widgets")).DeleteBucket([]byte("foo")); err != bolt.ErrIncompatibleValue {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure bucket can set and update its sequence number.
-func TestBucket_Sequence(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		bkt, err := tx.CreateBucket([]byte("0"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Retrieve sequence.
-		if v := bkt.Sequence(); v != 0 {
-			t.Fatalf("unexpected sequence: %d", v)
-		}
-
-		// Update sequence.
-		if err := bkt.SetSequence(1000); err != nil {
-			t.Fatal(err)
-		}
-
-		// Read sequence again.
-		if v := bkt.Sequence(); v != 1000 {
-			t.Fatalf("unexpected sequence: %d", v)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify sequence in separate transaction.
-	if err := db.View(func(tx *bolt.Tx) error {
-		if v := tx.Bucket([]byte("0")).Sequence(); v != 1000 {
-			t.Fatalf("unexpected sequence: %d", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can return an autoincrementing sequence.
-func TestBucket_NextSequence(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		widgets, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		woojits, err := tx.CreateBucket([]byte("woojits"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Make sure sequence increments.
-		if seq, err := widgets.NextSequence(); err != nil {
-			t.Fatal(err)
-		} else if seq != 1 {
-			t.Fatalf("unexpecte sequence: %d", seq)
-		}
-
-		if seq, err := widgets.NextSequence(); err != nil {
-			t.Fatal(err)
-		} else if seq != 2 {
-			t.Fatalf("unexpected sequence: %d", seq)
-		}
-
-		// Buckets should be separate.
-		if seq, err := woojits.NextSequence(); err != nil {
-			t.Fatal(err)
-		} else if seq != 1 {
-			t.Fatalf("unexpected sequence: %d", 1)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket will persist an autoincrementing sequence even if its
-// the only thing updated on the bucket.
-// https://github.com/boltdb/bolt/issues/296
-func TestBucket_NextSequence_Persist(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.Bucket([]byte("widgets")).NextSequence(); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		seq, err := tx.Bucket([]byte("widgets")).NextSequence()
-		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
-		} else if seq != 2 {
-			t.Fatalf("unexpected sequence: %d", seq)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that retrieving the next sequence on a read-only bucket returns an error.
-func TestBucket_NextSequence_ReadOnly(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		_, err := tx.Bucket([]byte("widgets")).NextSequence()
-		if err != bolt.ErrTxNotWritable {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that retrieving the next sequence for a bucket on a closed database return an error.
-func TestBucket_NextSequence_Closed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	b, err := tx.CreateBucket([]byte("widgets"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := b.NextSequence(); err != bolt.ErrTxClosed {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a user can loop over all key/value pairs in a bucket.
-func TestBucket_ForEach(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("0000")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("0001")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte("0002")); err != nil {
-			t.Fatal(err)
-		}
-
-		var index int
-		if err := b.ForEach(func(k, v []byte) error {
-			switch index {
-			case 0:
-				if !bytes.Equal(k, []byte("bar")) {
-					t.Fatalf("unexpected key: %v", k)
-				} else if !bytes.Equal(v, []byte("0002")) {
-					t.Fatalf("unexpected value: %v", v)
-				}
-			case 1:
-				if !bytes.Equal(k, []byte("baz")) {
-					t.Fatalf("unexpected key: %v", k)
-				} else if !bytes.Equal(v, []byte("0001")) {
-					t.Fatalf("unexpected value: %v", v)
-				}
-			case 2:
-				if !bytes.Equal(k, []byte("foo")) {
-					t.Fatalf("unexpected key: %v", k)
-				} else if !bytes.Equal(v, []byte("0000")) {
-					t.Fatalf("unexpected value: %v", v)
-				}
-			}
-			index++
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		if index != 3 {
-			t.Fatalf("unexpected index: %d", index)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a database can stop iteration early.
-func TestBucket_ForEach_ShortCircuit(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte("0000")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("0000")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("0000")); err != nil {
-			t.Fatal(err)
-		}
-
-		var index int
-		if err := tx.Bucket([]byte("widgets")).ForEach(func(k, v []byte) error {
-			index++
-			if bytes.Equal(k, []byte("baz")) {
-				return errors.New("marker")
-			}
-			return nil
-		}); err == nil || err.Error() != "marker" {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		if index != 2 {
-			t.Fatalf("unexpected index: %d", index)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that looping over a bucket on a closed database returns an error.
-func TestBucket_ForEach_Closed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := tx.CreateBucket([]byte("widgets"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := b.ForEach(func(k, v []byte) error { return nil }); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that an error is returned when inserting with an empty key.
-func TestBucket_Put_EmptyKey(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte(""), []byte("bar")); err != bolt.ErrKeyRequired {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		if err := b.Put(nil, []byte("bar")); err != bolt.ErrKeyRequired {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that an error is returned when inserting with a key that's too large.
-func TestBucket_Put_KeyTooLarge(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put(make([]byte, 32769), []byte("bar")); err != bolt.ErrKeyTooLarge {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that an error is returned when inserting a value that's too large.
-func TestBucket_Put_ValueTooLarge(t *testing.T) {
-	// Skip this test on DroneCI because the machine is resource constrained.
-	if os.Getenv("DRONE") == "true" {
-		t.Skip("not enough RAM for test")
-	}
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), make([]byte, bolt.MaxValueSize+1)); err != bolt.ErrValueTooLarge {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Add bucket with fewer keys but one big value.
-	bigKey := []byte("really-big-value")
-	for i := 0; i < 500; i++ {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("woojits"))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if err := b.Put([]byte(fmt.Sprintf("%03d", i)), []byte(strconv.Itoa(i))); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if err := tx.Bucket([]byte("woojits")).Put(bigKey, []byte(strings.Repeat("*", 10000))); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		stats := tx.Bucket([]byte("woojits")).Stats()
-		if stats.BranchPageN != 1 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.LeafPageN != 7 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 2 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.KeyN != 501 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		} else if stats.Depth != 2 {
-			t.Fatalf("unexpected Depth: %d", stats.Depth)
-		}
-
-		branchInuse := 16     // branch page header
-		branchInuse += 7 * 16 // branch elements
-		branchInuse += 7 * 3  // branch keys (6 3-byte keys)
-		if stats.BranchInuse != branchInuse {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		}
-
-		leafInuse := 7 * 16                      // leaf page header
-		leafInuse += 501 * 16                    // leaf elements
-		leafInuse += 500*3 + len(bigKey)         // leaf keys
-		leafInuse += 1*10 + 2*90 + 3*400 + 10000 // leaf values
-		if stats.LeafInuse != leafInuse {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		}
-
-		// Only check allocations for 4KB pages.
-		if os.Getpagesize() == 4096 {
-			if stats.BranchAlloc != 4096 {
-				t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-			} else if stats.LeafAlloc != 36864 {
-				t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-			}
-		}
-
-		if stats.BucketN != 1 {
-			t.Fatalf("unexpected BucketN: %d", stats.BucketN)
-		} else if stats.InlineBucketN != 0 {
-			t.Fatalf("unexpected InlineBucketN: %d", stats.InlineBucketN)
-		} else if stats.InlineBucketInuse != 0 {
-			t.Fatalf("unexpected InlineBucketInuse: %d", stats.InlineBucketInuse)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a bucket with random insertion utilizes fill percentage correctly.
-func TestBucket_Stats_RandomFill(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	} else if os.Getpagesize() != 4096 {
-		t.Skip("invalid page size for test")
-	}
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Add a set of values in random order. It will be the same random
-	// order so we can maintain consistency between test runs.
-	var count int
-	rand := rand.New(rand.NewSource(42))
-	for _, i := range rand.Perm(1000) {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("woojits"))
-			if err != nil {
-				t.Fatal(err)
-			}
-			b.FillPercent = 0.9
-			for _, j := range rand.Perm(100) {
-				index := (j * 10000) + i
-				if err := b.Put([]byte(fmt.Sprintf("%d000000000000000", index)), []byte("0000000000")); err != nil {
-					t.Fatal(err)
-				}
-				count++
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		stats := tx.Bucket([]byte("woojits")).Stats()
-		if stats.KeyN != 100000 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		}
-
-		if stats.BranchPageN != 98 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.BranchInuse != 130984 {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		} else if stats.BranchAlloc != 401408 {
-			t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-		}
-
-		if stats.LeafPageN != 3412 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 0 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.LeafInuse != 4742482 {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		} else if stats.LeafAlloc != 13975552 {
-			t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats_Small(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Add a bucket that fits on a single root leaf.
-		b, err := tx.CreateBucket([]byte("whozawhats"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("whozawhats"))
-		stats := b.Stats()
-		if stats.BranchPageN != 0 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.LeafPageN != 0 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 0 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.KeyN != 1 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		} else if stats.Depth != 1 {
-			t.Fatalf("unexpected Depth: %d", stats.Depth)
-		} else if stats.BranchInuse != 0 {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		} else if stats.LeafInuse != 0 {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		}
-
-		if os.Getpagesize() == 4096 {
-			if stats.BranchAlloc != 0 {
-				t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-			} else if stats.LeafAlloc != 0 {
-				t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-			}
-		}
-
-		if stats.BucketN != 1 {
-			t.Fatalf("unexpected BucketN: %d", stats.BucketN)
-		} else if stats.InlineBucketN != 1 {
-			t.Fatalf("unexpected InlineBucketN: %d", stats.InlineBucketN)
-		} else if stats.InlineBucketInuse != 16+16+6 {
-			t.Fatalf("unexpected InlineBucketInuse: %d", stats.InlineBucketInuse)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestBucket_Stats_EmptyBucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Add a bucket that fits on a single root leaf.
-		if _, err := tx.CreateBucket([]byte("whozawhats")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("whozawhats"))
-		stats := b.Stats()
-		if stats.BranchPageN != 0 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.LeafPageN != 0 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 0 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.KeyN != 0 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		} else if stats.Depth != 1 {
-			t.Fatalf("unexpected Depth: %d", stats.Depth)
-		} else if stats.BranchInuse != 0 {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		} else if stats.LeafInuse != 0 {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		}
-
-		if os.Getpagesize() == 4096 {
-			if stats.BranchAlloc != 0 {
-				t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-			} else if stats.LeafAlloc != 0 {
-				t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-			}
-		}
-
-		if stats.BucketN != 1 {
-			t.Fatalf("unexpected BucketN: %d", stats.BucketN)
-		} else if stats.InlineBucketN != 1 {
-			t.Fatalf("unexpected InlineBucketN: %d", stats.InlineBucketN)
-		} else if stats.InlineBucketInuse != 16 {
-			t.Fatalf("unexpected InlineBucketInuse: %d", stats.InlineBucketInuse)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a bucket can calculate stats.
-func TestBucket_Stats_Nested(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("foo"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i := 0; i < 100; i++ {
-			if err := b.Put([]byte(fmt.Sprintf("%02d", i)), []byte(fmt.Sprintf("%02d", i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		bar, err := b.CreateBucket([]byte("bar"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i := 0; i < 10; i++ {
-			if err := bar.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		baz, err := bar.CreateBucket([]byte("baz"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i := 0; i < 10; i++ {
-			if err := baz.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("foo"))
-		stats := b.Stats()
-		if stats.BranchPageN != 0 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.LeafPageN != 2 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 0 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.KeyN != 122 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		} else if stats.Depth != 3 {
-			t.Fatalf("unexpected Depth: %d", stats.Depth)
-		} else if stats.BranchInuse != 0 {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		}
-
-		foo := 16            // foo (pghdr)
-		foo += 101 * 16      // foo leaf elements
-		foo += 100*2 + 100*2 // foo leaf key/values
-		foo += 3 + 16        // foo -> bar key/value
-
-		bar := 16      // bar (pghdr)
-		bar += 11 * 16 // bar leaf elements
-		bar += 10 + 10 // bar leaf key/values
-		bar += 3 + 16  // bar -> baz key/value
-
-		baz := 16      // baz (inline) (pghdr)
-		baz += 10 * 16 // baz leaf elements
-		baz += 10 + 10 // baz leaf key/values
-
-		if stats.LeafInuse != foo+bar+baz {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		}
-
-		if os.Getpagesize() == 4096 {
-			if stats.BranchAlloc != 0 {
-				t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-			} else if stats.LeafAlloc != 8192 {
-				t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-			}
-		}
-
-		if stats.BucketN != 3 {
-			t.Fatalf("unexpected BucketN: %d", stats.BucketN)
-		} else if stats.InlineBucketN != 1 {
-			t.Fatalf("unexpected InlineBucketN: %d", stats.InlineBucketN)
-		} else if stats.InlineBucketInuse != baz {
-			t.Fatalf("unexpected InlineBucketInuse: %d", stats.InlineBucketInuse)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a large bucket can calculate stats.
-func TestBucket_Stats_Large(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var index int
-	for i := 0; i < 100; i++ {
-		// Add bucket with lots of keys.
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("widgets"))
-			if err != nil {
-				t.Fatal(err)
-			}
-			for i := 0; i < 1000; i++ {
-				if err := b.Put([]byte(strconv.Itoa(index)), []byte(strconv.Itoa(index))); err != nil {
-					t.Fatal(err)
-				}
-				index++
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	db.MustCheck()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		stats := tx.Bucket([]byte("widgets")).Stats()
-		if stats.BranchPageN != 13 {
-			t.Fatalf("unexpected BranchPageN: %d", stats.BranchPageN)
-		} else if stats.BranchOverflowN != 0 {
-			t.Fatalf("unexpected BranchOverflowN: %d", stats.BranchOverflowN)
-		} else if stats.LeafPageN != 1196 {
-			t.Fatalf("unexpected LeafPageN: %d", stats.LeafPageN)
-		} else if stats.LeafOverflowN != 0 {
-			t.Fatalf("unexpected LeafOverflowN: %d", stats.LeafOverflowN)
-		} else if stats.KeyN != 100000 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		} else if stats.Depth != 3 {
-			t.Fatalf("unexpected Depth: %d", stats.Depth)
-		} else if stats.BranchInuse != 25257 {
-			t.Fatalf("unexpected BranchInuse: %d", stats.BranchInuse)
-		} else if stats.LeafInuse != 2596916 {
-			t.Fatalf("unexpected LeafInuse: %d", stats.LeafInuse)
-		}
-
-		if os.Getpagesize() == 4096 {
-			if stats.BranchAlloc != 53248 {
-				t.Fatalf("unexpected BranchAlloc: %d", stats.BranchAlloc)
-			} else if stats.LeafAlloc != 4898816 {
-				t.Fatalf("unexpected LeafAlloc: %d", stats.LeafAlloc)
-			}
-		}
-
-		if stats.BucketN != 1 {
-			t.Fatalf("unexpected BucketN: %d", stats.BucketN)
-		} else if stats.InlineBucketN != 0 {
-			t.Fatalf("unexpected InlineBucketN: %d", stats.InlineBucketN)
-		} else if stats.InlineBucketInuse != 0 {
-			t.Fatalf("unexpected InlineBucketInuse: %d", stats.InlineBucketInuse)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can write random keys and values across multiple transactions.
-func TestBucket_Put_Single(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	index := 0
-	if err := quick.Check(func(items testdata) bool {
-		db := MustOpenDB()
-		defer db.MustClose()
-
-		m := make(map[string][]byte)
-
-		if err := db.Update(func(tx *bolt.Tx) error {
-			if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		for _, item := range items {
-			if err := db.Update(func(tx *bolt.Tx) error {
-				if err := tx.Bucket([]byte("widgets")).Put(item.Key, item.Value); err != nil {
-					panic("put error: " + err.Error())
-				}
-				m[string(item.Key)] = item.Value
-				return nil
-			}); err != nil {
-				t.Fatal(err)
-			}
-
-			// Verify all key/values so far.
-			if err := db.View(func(tx *bolt.Tx) error {
-				i := 0
-				for k, v := range m {
-					value := tx.Bucket([]byte("widgets")).Get([]byte(k))
-					if !bytes.Equal(value, v) {
-						t.Logf("value mismatch [run %d] (%d of %d):\nkey: %x\ngot: %x\nexp: %x", index, i, len(m), []byte(k), value, v)
-						db.CopyTempFile()
-						t.FailNow()
-					}
-					i++
-				}
-				return nil
-			}); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		index++
-		return true
-	}, nil); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can insert multiple key/value pairs at once.
-func TestBucket_Put_Multiple(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	if err := quick.Check(func(items testdata) bool {
-		db := MustOpenDB()
-		defer db.MustClose()
-
-		// Bulk insert all values.
-		if err := db.Update(func(tx *bolt.Tx) error {
-			if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				if err := b.Put(item.Key, item.Value); err != nil {
-					t.Fatal(err)
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		// Verify all items exist.
-		if err := db.View(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				value := b.Get(item.Key)
-				if !bytes.Equal(item.Value, value) {
-					db.CopyTempFile()
-					t.Fatalf("exp=%x; got=%x", item.Value, value)
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		return true
-	}, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can delete all key/value pairs and return to a single leaf page.
-func TestBucket_Delete_Quick(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	if err := quick.Check(func(items testdata) bool {
-		db := MustOpenDB()
-		defer db.MustClose()
-
-		// Bulk insert all values.
-		if err := db.Update(func(tx *bolt.Tx) error {
-			if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b := tx.Bucket([]byte("widgets"))
-			for _, item := range items {
-				if err := b.Put(item.Key, item.Value); err != nil {
-					t.Fatal(err)
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		// Remove items one at a time and check consistency.
-		for _, item := range items {
-			if err := db.Update(func(tx *bolt.Tx) error {
-				return tx.Bucket([]byte("widgets")).Delete(item.Key)
-			}); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		// Anything before our deletion index should be nil.
-		if err := db.View(func(tx *bolt.Tx) error {
-			if err := tx.Bucket([]byte("widgets")).ForEach(func(k, v []byte) error {
-				t.Fatalf("bucket should be empty; found: %06x", trunc(k, 3))
-				return nil
-			}); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-
-		return true
-	}, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-func ExampleBucket_Put() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Start a write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create a bucket.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			return err
-		}
-
-		// Set the value "bar" for the key "foo".
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Read value back in a different read-only transaction.
-	if err := db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value of 'foo' is: %s\n", value)
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// The value of 'foo' is: bar
-}
-
-func ExampleBucket_Delete() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Start a write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create a bucket.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			return err
-		}
-
-		// Set the value "bar" for the key "foo".
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			return err
-		}
-
-		// Retrieve the key back from the database and verify it.
-		value := b.Get([]byte("foo"))
-		fmt.Printf("The value of 'foo' was: %s\n", value)
-
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Delete the key in a different write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("widgets")).Delete([]byte("foo"))
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Retrieve the key again.
-	if err := db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		if value == nil {
-			fmt.Printf("The value of 'foo' is now: nil\n")
-		}
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// The value of 'foo' was: bar
-	// The value of 'foo' is now: nil
-}
-
-func ExampleBucket_ForEach() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Insert data into a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("animals"))
-		if err != nil {
-			return err
-		}
-
-		if err := b.Put([]byte("dog"), []byte("fun")); err != nil {
-			return err
-		}
-		if err := b.Put([]byte("cat"), []byte("lame")); err != nil {
-			return err
-		}
-		if err := b.Put([]byte("liger"), []byte("awesome")); err != nil {
-			return err
-		}
-
-		// Iterate over items in sorted key order.
-		if err := b.ForEach(func(k, v []byte) error {
-			fmt.Printf("A %s is %s.\n", k, v)
-			return nil
-		}); err != nil {
-			return err
-		}
-
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// A cat is lame.
-	// A dog is fun.
-	// A liger is awesome.
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main.go b/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main.go
deleted file mode 100644
index 057eca50a2..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main.go
+++ /dev/null
@@ -1,1740 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"runtime"
-	"runtime/pprof"
-	"strconv"
-	"strings"
-	"time"
-	"unicode"
-	"unicode/utf8"
-	"unsafe"
-
-	"github.com/boltdb/bolt"
-)
-
-var (
-	// ErrUsage is returned when a usage message was printed and the process
-	// should simply exit with an error.
-	ErrUsage = errors.New("usage")
-
-	// ErrUnknownCommand is returned when a CLI command is not specified.
-	ErrUnknownCommand = errors.New("unknown command")
-
-	// ErrPathRequired is returned when the path to a Bolt database is not specified.
-	ErrPathRequired = errors.New("path required")
-
-	// ErrFileNotFound is returned when a Bolt database does not exist.
-	ErrFileNotFound = errors.New("file not found")
-
-	// ErrInvalidValue is returned when a benchmark reads an unexpected value.
-	ErrInvalidValue = errors.New("invalid value")
-
-	// ErrCorrupt is returned when a checking a data file finds errors.
-	ErrCorrupt = errors.New("invalid value")
-
-	// ErrNonDivisibleBatchSize is returned when the batch size can't be evenly
-	// divided by the iteration count.
-	ErrNonDivisibleBatchSize = errors.New("number of iterations must be divisible by the batch size")
-
-	// ErrPageIDRequired is returned when a required page id is not specified.
-	ErrPageIDRequired = errors.New("page id required")
-
-	// ErrPageNotFound is returned when specifying a page above the high water mark.
-	ErrPageNotFound = errors.New("page not found")
-
-	// ErrPageFreed is returned when reading a page that has already been freed.
-	ErrPageFreed = errors.New("page freed")
-)
-
-// PageHeaderSize represents the size of the bolt.page header.
-const PageHeaderSize = 16
-
-func main() {
-	m := NewMain()
-	if err := m.Run(os.Args[1:]...); err == ErrUsage {
-		os.Exit(2)
-	} else if err != nil {
-		fmt.Println(err.Error())
-		os.Exit(1)
-	}
-}
-
-// Main represents the main program execution.
-type Main struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewMain returns a new instance of Main connect to the standard input/output.
-func NewMain() *Main {
-	return &Main{
-		Stdin:  os.Stdin,
-		Stdout: os.Stdout,
-		Stderr: os.Stderr,
-	}
-}
-
-// Run executes the program.
-func (m *Main) Run(args ...string) error {
-	// Require a command at the beginning.
-	if len(args) == 0 || strings.HasPrefix(args[0], "-") {
-		fmt.Fprintln(m.Stderr, m.Usage())
-		return ErrUsage
-	}
-
-	// Execute command.
-	switch args[0] {
-	case "help":
-		fmt.Fprintln(m.Stderr, m.Usage())
-		return ErrUsage
-	case "bench":
-		return newBenchCommand(m).Run(args[1:]...)
-	case "check":
-		return newCheckCommand(m).Run(args[1:]...)
-	case "compact":
-		return newCompactCommand(m).Run(args[1:]...)
-	case "dump":
-		return newDumpCommand(m).Run(args[1:]...)
-	case "info":
-		return newInfoCommand(m).Run(args[1:]...)
-	case "page":
-		return newPageCommand(m).Run(args[1:]...)
-	case "pages":
-		return newPagesCommand(m).Run(args[1:]...)
-	case "stats":
-		return newStatsCommand(m).Run(args[1:]...)
-	default:
-		return ErrUnknownCommand
-	}
-}
-
-// Usage returns the help message.
-func (m *Main) Usage() string {
-	return strings.TrimLeft(`
-Bolt is a tool for inspecting bolt databases.
-
-Usage:
-
-	bolt command [arguments]
-
-The commands are:
-
-    bench       run synthetic benchmark against bolt
-    check       verifies integrity of bolt database
-    compact     copies a bolt database, compacting it in the process
-    info        print basic info
-    help        print this screen
-    pages       print list of pages with their types
-    stats       iterate over all pages and generate usage stats
-
-Use "bolt [command] -h" for more information about a command.
-`, "\n")
-}
-
-// CheckCommand represents the "check" command execution.
-type CheckCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewCheckCommand returns a CheckCommand.
-func newCheckCommand(m *Main) *CheckCommand {
-	return &CheckCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *CheckCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	// Perform consistency check.
-	return db.View(func(tx *bolt.Tx) error {
-		var count int
-		ch := tx.Check()
-	loop:
-		for {
-			select {
-			case err, ok := <-ch:
-				if !ok {
-					break loop
-				}
-				fmt.Fprintln(cmd.Stdout, err)
-				count++
-			}
-		}
-
-		// Print summary of errors.
-		if count > 0 {
-			fmt.Fprintf(cmd.Stdout, "%d errors found\n", count)
-			return ErrCorrupt
-		}
-
-		// Notify user that database is valid.
-		fmt.Fprintln(cmd.Stdout, "OK")
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *CheckCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt check PATH
-
-Check opens a database at PATH and runs an exhaustive check to verify that
-all pages are accessible or are marked as freed. It also verifies that no
-pages are double referenced.
-
-Verification errors will stream out as they are found and the process will
-return after all pages have been checked.
-`, "\n")
-}
-
-// InfoCommand represents the "info" command execution.
-type InfoCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewInfoCommand returns a InfoCommand.
-func newInfoCommand(m *Main) *InfoCommand {
-	return &InfoCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *InfoCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open the database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	// Print basic database info.
-	info := db.Info()
-	fmt.Fprintf(cmd.Stdout, "Page Size: %d\n", info.PageSize)
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *InfoCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt info PATH
-
-Info prints basic information about the Bolt database at PATH.
-`, "\n")
-}
-
-// DumpCommand represents the "dump" command execution.
-type DumpCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// newDumpCommand returns a DumpCommand.
-func newDumpCommand(m *Main) *DumpCommand {
-	return &DumpCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *DumpCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path and page id.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Read page ids.
-	pageIDs, err := atois(fs.Args()[1:])
-	if err != nil {
-		return err
-	} else if len(pageIDs) == 0 {
-		return ErrPageIDRequired
-	}
-
-	// Open database to retrieve page size.
-	pageSize, err := ReadPageSize(path)
-	if err != nil {
-		return err
-	}
-
-	// Open database file handler.
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = f.Close() }()
-
-	// Print each page listed.
-	for i, pageID := range pageIDs {
-		// Print a separator.
-		if i > 0 {
-			fmt.Fprintln(cmd.Stdout, "===============================================")
-		}
-
-		// Print page to stdout.
-		if err := cmd.PrintPage(cmd.Stdout, f, pageID, pageSize); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// PrintPage prints a given page as hexadecimal.
-func (cmd *DumpCommand) PrintPage(w io.Writer, r io.ReaderAt, pageID int, pageSize int) error {
-	const bytesPerLineN = 16
-
-	// Read page into buffer.
-	buf := make([]byte, pageSize)
-	addr := pageID * pageSize
-	if n, err := r.ReadAt(buf, int64(addr)); err != nil {
-		return err
-	} else if n != pageSize {
-		return io.ErrUnexpectedEOF
-	}
-
-	// Write out to writer in 16-byte lines.
-	var prev []byte
-	var skipped bool
-	for offset := 0; offset < pageSize; offset += bytesPerLineN {
-		// Retrieve current 16-byte line.
-		line := buf[offset : offset+bytesPerLineN]
-		isLastLine := (offset == (pageSize - bytesPerLineN))
-
-		// If it's the same as the previous line then print a skip.
-		if bytes.Equal(line, prev) && !isLastLine {
-			if !skipped {
-				fmt.Fprintf(w, "%07x *\n", addr+offset)
-				skipped = true
-			}
-		} else {
-			// Print line as hexadecimal in 2-byte groups.
-			fmt.Fprintf(w, "%07x %04x %04x %04x %04x %04x %04x %04x %04x\n", addr+offset,
-				line[0:2], line[2:4], line[4:6], line[6:8],
-				line[8:10], line[10:12], line[12:14], line[14:16],
-			)
-
-			skipped = false
-		}
-
-		// Save the previous line.
-		prev = line
-	}
-	fmt.Fprint(w, "\n")
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *DumpCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt dump -page PAGEID PATH
-
-Dump prints a hexadecimal dump of a single page.
-`, "\n")
-}
-
-// PageCommand represents the "page" command execution.
-type PageCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// newPageCommand returns a PageCommand.
-func newPageCommand(m *Main) *PageCommand {
-	return &PageCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *PageCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path and page id.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Read page ids.
-	pageIDs, err := atois(fs.Args()[1:])
-	if err != nil {
-		return err
-	} else if len(pageIDs) == 0 {
-		return ErrPageIDRequired
-	}
-
-	// Open database file handler.
-	f, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = f.Close() }()
-
-	// Print each page listed.
-	for i, pageID := range pageIDs {
-		// Print a separator.
-		if i > 0 {
-			fmt.Fprintln(cmd.Stdout, "===============================================")
-		}
-
-		// Retrieve page info and page size.
-		p, buf, err := ReadPage(path, pageID)
-		if err != nil {
-			return err
-		}
-
-		// Print basic page info.
-		fmt.Fprintf(cmd.Stdout, "Page ID:    %d\n", p.id)
-		fmt.Fprintf(cmd.Stdout, "Page Type:  %s\n", p.Type())
-		fmt.Fprintf(cmd.Stdout, "Total Size: %d bytes\n", len(buf))
-
-		// Print type-specific data.
-		switch p.Type() {
-		case "meta":
-			err = cmd.PrintMeta(cmd.Stdout, buf)
-		case "leaf":
-			err = cmd.PrintLeaf(cmd.Stdout, buf)
-		case "branch":
-			err = cmd.PrintBranch(cmd.Stdout, buf)
-		case "freelist":
-			err = cmd.PrintFreelist(cmd.Stdout, buf)
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// PrintMeta prints the data from the meta page.
-func (cmd *PageCommand) PrintMeta(w io.Writer, buf []byte) error {
-	m := (*meta)(unsafe.Pointer(&buf[PageHeaderSize]))
-	fmt.Fprintf(w, "Version:    %d\n", m.version)
-	fmt.Fprintf(w, "Page Size:  %d bytes\n", m.pageSize)
-	fmt.Fprintf(w, "Flags:      %08x\n", m.flags)
-	fmt.Fprintf(w, "Root:       <pgid=%d>\n", m.root.root)
-	fmt.Fprintf(w, "Freelist:   <pgid=%d>\n", m.freelist)
-	fmt.Fprintf(w, "HWM:        <pgid=%d>\n", m.pgid)
-	fmt.Fprintf(w, "Txn ID:     %d\n", m.txid)
-	fmt.Fprintf(w, "Checksum:   %016x\n", m.checksum)
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintLeaf prints the data for a leaf page.
-func (cmd *PageCommand) PrintLeaf(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each key/value.
-	for i := uint16(0); i < p.count; i++ {
-		e := p.leafPageElement(i)
-
-		// Format key as string.
-		var k string
-		if isPrintable(string(e.key())) {
-			k = fmt.Sprintf("%q", string(e.key()))
-		} else {
-			k = fmt.Sprintf("%x", string(e.key()))
-		}
-
-		// Format value as string.
-		var v string
-		if (e.flags & uint32(bucketLeafFlag)) != 0 {
-			b := (*bucket)(unsafe.Pointer(&e.value()[0]))
-			v = fmt.Sprintf("<pgid=%d,seq=%d>", b.root, b.sequence)
-		} else if isPrintable(string(e.value())) {
-			v = fmt.Sprintf("%q", string(e.value()))
-		} else {
-			v = fmt.Sprintf("%x", string(e.value()))
-		}
-
-		fmt.Fprintf(w, "%s: %s\n", k, v)
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintBranch prints the data for a leaf page.
-func (cmd *PageCommand) PrintBranch(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each key/value.
-	for i := uint16(0); i < p.count; i++ {
-		e := p.branchPageElement(i)
-
-		// Format key as string.
-		var k string
-		if isPrintable(string(e.key())) {
-			k = fmt.Sprintf("%q", string(e.key()))
-		} else {
-			k = fmt.Sprintf("%x", string(e.key()))
-		}
-
-		fmt.Fprintf(w, "%s: <pgid=%d>\n", k, e.pgid)
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintFreelist prints the data for a freelist page.
-func (cmd *PageCommand) PrintFreelist(w io.Writer, buf []byte) error {
-	p := (*page)(unsafe.Pointer(&buf[0]))
-
-	// Print number of items.
-	fmt.Fprintf(w, "Item Count: %d\n", p.count)
-	fmt.Fprintf(w, "\n")
-
-	// Print each page in the freelist.
-	ids := (*[maxAllocSize]pgid)(unsafe.Pointer(&p.ptr))
-	for i := uint16(0); i < p.count; i++ {
-		fmt.Fprintf(w, "%d\n", ids[i])
-	}
-	fmt.Fprintf(w, "\n")
-	return nil
-}
-
-// PrintPage prints a given page as hexadecimal.
-func (cmd *PageCommand) PrintPage(w io.Writer, r io.ReaderAt, pageID int, pageSize int) error {
-	const bytesPerLineN = 16
-
-	// Read page into buffer.
-	buf := make([]byte, pageSize)
-	addr := pageID * pageSize
-	if n, err := r.ReadAt(buf, int64(addr)); err != nil {
-		return err
-	} else if n != pageSize {
-		return io.ErrUnexpectedEOF
-	}
-
-	// Write out to writer in 16-byte lines.
-	var prev []byte
-	var skipped bool
-	for offset := 0; offset < pageSize; offset += bytesPerLineN {
-		// Retrieve current 16-byte line.
-		line := buf[offset : offset+bytesPerLineN]
-		isLastLine := (offset == (pageSize - bytesPerLineN))
-
-		// If it's the same as the previous line then print a skip.
-		if bytes.Equal(line, prev) && !isLastLine {
-			if !skipped {
-				fmt.Fprintf(w, "%07x *\n", addr+offset)
-				skipped = true
-			}
-		} else {
-			// Print line as hexadecimal in 2-byte groups.
-			fmt.Fprintf(w, "%07x %04x %04x %04x %04x %04x %04x %04x %04x\n", addr+offset,
-				line[0:2], line[2:4], line[4:6], line[6:8],
-				line[8:10], line[10:12], line[12:14], line[14:16],
-			)
-
-			skipped = false
-		}
-
-		// Save the previous line.
-		prev = line
-	}
-	fmt.Fprint(w, "\n")
-
-	return nil
-}
-
-// Usage returns the help message.
-func (cmd *PageCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt page -page PATH pageid [pageid...]
-
-Page prints one or more pages in human readable format.
-`, "\n")
-}
-
-// PagesCommand represents the "pages" command execution.
-type PagesCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewPagesCommand returns a PagesCommand.
-func newPagesCommand(m *Main) *PagesCommand {
-	return &PagesCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *PagesCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path := fs.Arg(0)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer func() { _ = db.Close() }()
-
-	// Write header.
-	fmt.Fprintln(cmd.Stdout, "ID       TYPE       ITEMS  OVRFLW")
-	fmt.Fprintln(cmd.Stdout, "======== ========== ====== ======")
-
-	return db.Update(func(tx *bolt.Tx) error {
-		var id int
-		for {
-			p, err := tx.Page(id)
-			if err != nil {
-				return &PageError{ID: id, Err: err}
-			} else if p == nil {
-				break
-			}
-
-			// Only display count and overflow if this is a non-free page.
-			var count, overflow string
-			if p.Type != "free" {
-				count = strconv.Itoa(p.Count)
-				if p.OverflowCount > 0 {
-					overflow = strconv.Itoa(p.OverflowCount)
-				}
-			}
-
-			// Print table row.
-			fmt.Fprintf(cmd.Stdout, "%-8d %-10s %-6s %-6s\n", p.ID, p.Type, count, overflow)
-
-			// Move to the next non-overflow page.
-			id += 1
-			if p.Type != "free" {
-				id += p.OverflowCount
-			}
-		}
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *PagesCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt pages PATH
-
-Pages prints a table of pages with their type (meta, leaf, branch, freelist).
-Leaf and branch pages will show a key count in the "items" column while the
-freelist will show the number of free pages in the "items" column.
-
-The "overflow" column shows the number of blocks that the page spills over
-into. Normally there is no overflow but large keys and values can cause
-a single page to take up multiple blocks.
-`, "\n")
-}
-
-// StatsCommand represents the "stats" command execution.
-type StatsCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewStatsCommand returns a StatsCommand.
-func newStatsCommand(m *Main) *StatsCommand {
-	return &StatsCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *StatsCommand) Run(args ...string) error {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	help := fs.Bool("h", false, "")
-	if err := fs.Parse(args); err != nil {
-		return err
-	} else if *help {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	}
-
-	// Require database path.
-	path, prefix := fs.Arg(0), fs.Arg(1)
-	if path == "" {
-		return ErrPathRequired
-	} else if _, err := os.Stat(path); os.IsNotExist(err) {
-		return ErrFileNotFound
-	}
-
-	// Open database.
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer db.Close()
-
-	return db.View(func(tx *bolt.Tx) error {
-		var s bolt.BucketStats
-		var count int
-		if err := tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			if bytes.HasPrefix(name, []byte(prefix)) {
-				s.Add(b.Stats())
-				count += 1
-			}
-			return nil
-		}); err != nil {
-			return err
-		}
-
-		fmt.Fprintf(cmd.Stdout, "Aggregate statistics for %d buckets\n\n", count)
-
-		fmt.Fprintln(cmd.Stdout, "Page count statistics")
-		fmt.Fprintf(cmd.Stdout, "\tNumber of logical branch pages: %d\n", s.BranchPageN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of physical branch overflow pages: %d\n", s.BranchOverflowN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of logical leaf pages: %d\n", s.LeafPageN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of physical leaf overflow pages: %d\n", s.LeafOverflowN)
-
-		fmt.Fprintln(cmd.Stdout, "Tree statistics")
-		fmt.Fprintf(cmd.Stdout, "\tNumber of keys/value pairs: %d\n", s.KeyN)
-		fmt.Fprintf(cmd.Stdout, "\tNumber of levels in B+tree: %d\n", s.Depth)
-
-		fmt.Fprintln(cmd.Stdout, "Page size utilization")
-		fmt.Fprintf(cmd.Stdout, "\tBytes allocated for physical branch pages: %d\n", s.BranchAlloc)
-		var percentage int
-		if s.BranchAlloc != 0 {
-			percentage = int(float32(s.BranchInuse) * 100.0 / float32(s.BranchAlloc))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes actually used for branch data: %d (%d%%)\n", s.BranchInuse, percentage)
-		fmt.Fprintf(cmd.Stdout, "\tBytes allocated for physical leaf pages: %d\n", s.LeafAlloc)
-		percentage = 0
-		if s.LeafAlloc != 0 {
-			percentage = int(float32(s.LeafInuse) * 100.0 / float32(s.LeafAlloc))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes actually used for leaf data: %d (%d%%)\n", s.LeafInuse, percentage)
-
-		fmt.Fprintln(cmd.Stdout, "Bucket statistics")
-		fmt.Fprintf(cmd.Stdout, "\tTotal number of buckets: %d\n", s.BucketN)
-		percentage = 0
-		if s.BucketN != 0 {
-			percentage = int(float32(s.InlineBucketN) * 100.0 / float32(s.BucketN))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tTotal number on inlined buckets: %d (%d%%)\n", s.InlineBucketN, percentage)
-		percentage = 0
-		if s.LeafInuse != 0 {
-			percentage = int(float32(s.InlineBucketInuse) * 100.0 / float32(s.LeafInuse))
-		}
-		fmt.Fprintf(cmd.Stdout, "\tBytes used for inlined buckets: %d (%d%%)\n", s.InlineBucketInuse, percentage)
-
-		return nil
-	})
-}
-
-// Usage returns the help message.
-func (cmd *StatsCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt stats PATH
-
-Stats performs an extensive search of the database to track every page
-reference. It starts at the current meta page and recursively iterates
-through every accessible bucket.
-
-The following errors can be reported:
-
-    already freed
-        The page is referenced more than once in the freelist.
-
-    unreachable unfreed
-        The page is not referenced by a bucket or in the freelist.
-
-    reachable freed
-        The page is referenced by a bucket but is also in the freelist.
-
-    out of bounds
-        A page is referenced that is above the high water mark.
-
-    multiple references
-        A page is referenced by more than one other page.
-
-    invalid type
-        The page type is not "meta", "leaf", "branch", or "freelist".
-
-No errors should occur in your database. However, if for some reason you
-experience corruption, please submit a ticket to the Bolt project page:
-
-  https://github.com/boltdb/bolt/issues
-`, "\n")
-}
-
-var benchBucketName = []byte("bench")
-
-// BenchCommand represents the "bench" command execution.
-type BenchCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-}
-
-// NewBenchCommand returns a BenchCommand using the
-func newBenchCommand(m *Main) *BenchCommand {
-	return &BenchCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the "bench" command.
-func (cmd *BenchCommand) Run(args ...string) error {
-	// Parse CLI arguments.
-	options, err := cmd.ParseFlags(args)
-	if err != nil {
-		return err
-	}
-
-	// Remove path if "-work" is not set. Otherwise keep path.
-	if options.Work {
-		fmt.Fprintf(cmd.Stdout, "work: %s\n", options.Path)
-	} else {
-		defer os.Remove(options.Path)
-	}
-
-	// Create database.
-	db, err := bolt.Open(options.Path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	db.NoSync = options.NoSync
-	defer db.Close()
-
-	// Write to the database.
-	var results BenchResults
-	if err := cmd.runWrites(db, options, &results); err != nil {
-		return fmt.Errorf("write: %v", err)
-	}
-
-	// Read from the database.
-	if err := cmd.runReads(db, options, &results); err != nil {
-		return fmt.Errorf("bench: read: %s", err)
-	}
-
-	// Print results.
-	fmt.Fprintf(os.Stderr, "# Write\t%v\t(%v/op)\t(%v op/sec)\n", results.WriteDuration, results.WriteOpDuration(), results.WriteOpsPerSecond())
-	fmt.Fprintf(os.Stderr, "# Read\t%v\t(%v/op)\t(%v op/sec)\n", results.ReadDuration, results.ReadOpDuration(), results.ReadOpsPerSecond())
-	fmt.Fprintln(os.Stderr, "")
-	return nil
-}
-
-// ParseFlags parses the command line flags.
-func (cmd *BenchCommand) ParseFlags(args []string) (*BenchOptions, error) {
-	var options BenchOptions
-
-	// Parse flagset.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.StringVar(&options.ProfileMode, "profile-mode", "rw", "")
-	fs.StringVar(&options.WriteMode, "write-mode", "seq", "")
-	fs.StringVar(&options.ReadMode, "read-mode", "seq", "")
-	fs.IntVar(&options.Iterations, "count", 1000, "")
-	fs.IntVar(&options.BatchSize, "batch-size", 0, "")
-	fs.IntVar(&options.KeySize, "key-size", 8, "")
-	fs.IntVar(&options.ValueSize, "value-size", 32, "")
-	fs.StringVar(&options.CPUProfile, "cpuprofile", "", "")
-	fs.StringVar(&options.MemProfile, "memprofile", "", "")
-	fs.StringVar(&options.BlockProfile, "blockprofile", "", "")
-	fs.Float64Var(&options.FillPercent, "fill-percent", bolt.DefaultFillPercent, "")
-	fs.BoolVar(&options.NoSync, "no-sync", false, "")
-	fs.BoolVar(&options.Work, "work", false, "")
-	fs.StringVar(&options.Path, "path", "", "")
-	fs.SetOutput(cmd.Stderr)
-	if err := fs.Parse(args); err != nil {
-		return nil, err
-	}
-
-	// Set batch size to iteration size if not set.
-	// Require that batch size can be evenly divided by the iteration count.
-	if options.BatchSize == 0 {
-		options.BatchSize = options.Iterations
-	} else if options.Iterations%options.BatchSize != 0 {
-		return nil, ErrNonDivisibleBatchSize
-	}
-
-	// Generate temp path if one is not passed in.
-	if options.Path == "" {
-		f, err := ioutil.TempFile("", "bolt-bench-")
-		if err != nil {
-			return nil, fmt.Errorf("temp file: %s", err)
-		}
-		f.Close()
-		os.Remove(f.Name())
-		options.Path = f.Name()
-	}
-
-	return &options, nil
-}
-
-// Writes to the database.
-func (cmd *BenchCommand) runWrites(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	// Start profiling for writes.
-	if options.ProfileMode == "rw" || options.ProfileMode == "w" {
-		cmd.startProfiling(options)
-	}
-
-	t := time.Now()
-
-	var err error
-	switch options.WriteMode {
-	case "seq":
-		err = cmd.runWritesSequential(db, options, results)
-	case "rnd":
-		err = cmd.runWritesRandom(db, options, results)
-	case "seq-nest":
-		err = cmd.runWritesSequentialNested(db, options, results)
-	case "rnd-nest":
-		err = cmd.runWritesRandomNested(db, options, results)
-	default:
-		return fmt.Errorf("invalid write mode: %s", options.WriteMode)
-	}
-
-	// Save time to write.
-	results.WriteDuration = time.Since(t)
-
-	// Stop profiling for writes only.
-	if options.ProfileMode == "w" {
-		cmd.stopProfiling()
-	}
-
-	return err
-}
-
-func (cmd *BenchCommand) runWritesSequential(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	var i = uint32(0)
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { i++; return i })
-}
-
-func (cmd *BenchCommand) runWritesRandom(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { return r.Uint32() })
-}
-
-func (cmd *BenchCommand) runWritesSequentialNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	var i = uint32(0)
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { i++; return i })
-}
-
-func (cmd *BenchCommand) runWritesRandomNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	r := rand.New(rand.NewSource(time.Now().UnixNano()))
-	return cmd.runWritesWithSource(db, options, results, func() uint32 { return r.Uint32() })
-}
-
-func (cmd *BenchCommand) runWritesWithSource(db *bolt.DB, options *BenchOptions, results *BenchResults, keySource func() uint32) error {
-	results.WriteOps = options.Iterations
-
-	for i := 0; i < options.Iterations; i += options.BatchSize {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists(benchBucketName)
-			b.FillPercent = options.FillPercent
-
-			for j := 0; j < options.BatchSize; j++ {
-				key := make([]byte, options.KeySize)
-				value := make([]byte, options.ValueSize)
-
-				// Write key as uint32.
-				binary.BigEndian.PutUint32(key, keySource())
-
-				// Insert key/value.
-				if err := b.Put(key, value); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (cmd *BenchCommand) runWritesNestedWithSource(db *bolt.DB, options *BenchOptions, results *BenchResults, keySource func() uint32) error {
-	results.WriteOps = options.Iterations
-
-	for i := 0; i < options.Iterations; i += options.BatchSize {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			top, err := tx.CreateBucketIfNotExists(benchBucketName)
-			if err != nil {
-				return err
-			}
-			top.FillPercent = options.FillPercent
-
-			// Create bucket key.
-			name := make([]byte, options.KeySize)
-			binary.BigEndian.PutUint32(name, keySource())
-
-			// Create bucket.
-			b, err := top.CreateBucketIfNotExists(name)
-			if err != nil {
-				return err
-			}
-			b.FillPercent = options.FillPercent
-
-			for j := 0; j < options.BatchSize; j++ {
-				var key = make([]byte, options.KeySize)
-				var value = make([]byte, options.ValueSize)
-
-				// Generate key as uint32.
-				binary.BigEndian.PutUint32(key, keySource())
-
-				// Insert value into subbucket.
-				if err := b.Put(key, value); err != nil {
-					return err
-				}
-			}
-
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Reads from the database.
-func (cmd *BenchCommand) runReads(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	// Start profiling for reads.
-	if options.ProfileMode == "r" {
-		cmd.startProfiling(options)
-	}
-
-	t := time.Now()
-
-	var err error
-	switch options.ReadMode {
-	case "seq":
-		switch options.WriteMode {
-		case "seq-nest", "rnd-nest":
-			err = cmd.runReadsSequentialNested(db, options, results)
-		default:
-			err = cmd.runReadsSequential(db, options, results)
-		}
-	default:
-		return fmt.Errorf("invalid read mode: %s", options.ReadMode)
-	}
-
-	// Save read time.
-	results.ReadDuration = time.Since(t)
-
-	// Stop profiling for reads.
-	if options.ProfileMode == "rw" || options.ProfileMode == "r" {
-		cmd.stopProfiling()
-	}
-
-	return err
-}
-
-func (cmd *BenchCommand) runReadsSequential(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	return db.View(func(tx *bolt.Tx) error {
-		t := time.Now()
-
-		for {
-			var count int
-
-			c := tx.Bucket(benchBucketName).Cursor()
-			for k, v := c.First(); k != nil; k, v = c.Next() {
-				if v == nil {
-					return errors.New("invalid value")
-				}
-				count++
-			}
-
-			if options.WriteMode == "seq" && count != options.Iterations {
-				return fmt.Errorf("read seq: iter mismatch: expected %d, got %d", options.Iterations, count)
-			}
-
-			results.ReadOps += count
-
-			// Make sure we do this for at least a second.
-			if time.Since(t) >= time.Second {
-				break
-			}
-		}
-
-		return nil
-	})
-}
-
-func (cmd *BenchCommand) runReadsSequentialNested(db *bolt.DB, options *BenchOptions, results *BenchResults) error {
-	return db.View(func(tx *bolt.Tx) error {
-		t := time.Now()
-
-		for {
-			var count int
-			var top = tx.Bucket(benchBucketName)
-			if err := top.ForEach(func(name, _ []byte) error {
-				c := top.Bucket(name).Cursor()
-				for k, v := c.First(); k != nil; k, v = c.Next() {
-					if v == nil {
-						return ErrInvalidValue
-					}
-					count++
-				}
-				return nil
-			}); err != nil {
-				return err
-			}
-
-			if options.WriteMode == "seq-nest" && count != options.Iterations {
-				return fmt.Errorf("read seq-nest: iter mismatch: expected %d, got %d", options.Iterations, count)
-			}
-
-			results.ReadOps += count
-
-			// Make sure we do this for at least a second.
-			if time.Since(t) >= time.Second {
-				break
-			}
-		}
-
-		return nil
-	})
-}
-
-// File handlers for the various profiles.
-var cpuprofile, memprofile, blockprofile *os.File
-
-// Starts all profiles set on the options.
-func (cmd *BenchCommand) startProfiling(options *BenchOptions) {
-	var err error
-
-	// Start CPU profiling.
-	if options.CPUProfile != "" {
-		cpuprofile, err = os.Create(options.CPUProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create cpu profile %q: %v\n", options.CPUProfile, err)
-			os.Exit(1)
-		}
-		pprof.StartCPUProfile(cpuprofile)
-	}
-
-	// Start memory profiling.
-	if options.MemProfile != "" {
-		memprofile, err = os.Create(options.MemProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create memory profile %q: %v\n", options.MemProfile, err)
-			os.Exit(1)
-		}
-		runtime.MemProfileRate = 4096
-	}
-
-	// Start fatal profiling.
-	if options.BlockProfile != "" {
-		blockprofile, err = os.Create(options.BlockProfile)
-		if err != nil {
-			fmt.Fprintf(cmd.Stderr, "bench: could not create block profile %q: %v\n", options.BlockProfile, err)
-			os.Exit(1)
-		}
-		runtime.SetBlockProfileRate(1)
-	}
-}
-
-// Stops all profiles.
-func (cmd *BenchCommand) stopProfiling() {
-	if cpuprofile != nil {
-		pprof.StopCPUProfile()
-		cpuprofile.Close()
-		cpuprofile = nil
-	}
-
-	if memprofile != nil {
-		pprof.Lookup("heap").WriteTo(memprofile, 0)
-		memprofile.Close()
-		memprofile = nil
-	}
-
-	if blockprofile != nil {
-		pprof.Lookup("block").WriteTo(blockprofile, 0)
-		blockprofile.Close()
-		blockprofile = nil
-		runtime.SetBlockProfileRate(0)
-	}
-}
-
-// BenchOptions represents the set of options that can be passed to "bolt bench".
-type BenchOptions struct {
-	ProfileMode   string
-	WriteMode     string
-	ReadMode      string
-	Iterations    int
-	BatchSize     int
-	KeySize       int
-	ValueSize     int
-	CPUProfile    string
-	MemProfile    string
-	BlockProfile  string
-	StatsInterval time.Duration
-	FillPercent   float64
-	NoSync        bool
-	Work          bool
-	Path          string
-}
-
-// BenchResults represents the performance results of the benchmark.
-type BenchResults struct {
-	WriteOps      int
-	WriteDuration time.Duration
-	ReadOps       int
-	ReadDuration  time.Duration
-}
-
-// Returns the duration for a single write operation.
-func (r *BenchResults) WriteOpDuration() time.Duration {
-	if r.WriteOps == 0 {
-		return 0
-	}
-	return r.WriteDuration / time.Duration(r.WriteOps)
-}
-
-// Returns average number of write operations that can be performed per second.
-func (r *BenchResults) WriteOpsPerSecond() int {
-	var op = r.WriteOpDuration()
-	if op == 0 {
-		return 0
-	}
-	return int(time.Second) / int(op)
-}
-
-// Returns the duration for a single read operation.
-func (r *BenchResults) ReadOpDuration() time.Duration {
-	if r.ReadOps == 0 {
-		return 0
-	}
-	return r.ReadDuration / time.Duration(r.ReadOps)
-}
-
-// Returns average number of read operations that can be performed per second.
-func (r *BenchResults) ReadOpsPerSecond() int {
-	var op = r.ReadOpDuration()
-	if op == 0 {
-		return 0
-	}
-	return int(time.Second) / int(op)
-}
-
-type PageError struct {
-	ID  int
-	Err error
-}
-
-func (e *PageError) Error() string {
-	return fmt.Sprintf("page error: id=%d, err=%s", e.ID, e.Err)
-}
-
-// isPrintable returns true if the string is valid unicode and contains only printable runes.
-func isPrintable(s string) bool {
-	if !utf8.ValidString(s) {
-		return false
-	}
-	for _, ch := range s {
-		if !unicode.IsPrint(ch) {
-			return false
-		}
-	}
-	return true
-}
-
-// ReadPage reads page info & full page data from a path.
-// This is not transactionally safe.
-func ReadPage(path string, pageID int) (*page, []byte, error) {
-	// Find page size.
-	pageSize, err := ReadPageSize(path)
-	if err != nil {
-		return nil, nil, fmt.Errorf("read page size: %s", err)
-	}
-
-	// Open database file.
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer f.Close()
-
-	// Read one block into buffer.
-	buf := make([]byte, pageSize)
-	if n, err := f.ReadAt(buf, int64(pageID*pageSize)); err != nil {
-		return nil, nil, err
-	} else if n != len(buf) {
-		return nil, nil, io.ErrUnexpectedEOF
-	}
-
-	// Determine total number of blocks.
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	overflowN := p.overflow
-
-	// Re-read entire page (with overflow) into buffer.
-	buf = make([]byte, (int(overflowN)+1)*pageSize)
-	if n, err := f.ReadAt(buf, int64(pageID*pageSize)); err != nil {
-		return nil, nil, err
-	} else if n != len(buf) {
-		return nil, nil, io.ErrUnexpectedEOF
-	}
-	p = (*page)(unsafe.Pointer(&buf[0]))
-
-	return p, buf, nil
-}
-
-// ReadPageSize reads page size a path.
-// This is not transactionally safe.
-func ReadPageSize(path string) (int, error) {
-	// Open database file.
-	f, err := os.Open(path)
-	if err != nil {
-		return 0, err
-	}
-	defer f.Close()
-
-	// Read 4KB chunk.
-	buf := make([]byte, 4096)
-	if _, err := io.ReadFull(f, buf); err != nil {
-		return 0, err
-	}
-
-	// Read page size from metadata.
-	m := (*meta)(unsafe.Pointer(&buf[PageHeaderSize]))
-	return int(m.pageSize), nil
-}
-
-// atois parses a slice of strings into integers.
-func atois(strs []string) ([]int, error) {
-	var a []int
-	for _, str := range strs {
-		i, err := strconv.Atoi(str)
-		if err != nil {
-			return nil, err
-		}
-		a = append(a, i)
-	}
-	return a, nil
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const maxAllocSize = 0xFFFFFFF
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const (
-	branchPageFlag   = 0x01
-	leafPageFlag     = 0x02
-	metaPageFlag     = 0x04
-	freelistPageFlag = 0x10
-)
-
-// DO NOT EDIT. Copied from the "bolt" package.
-const bucketLeafFlag = 0x01
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type pgid uint64
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type txid uint64
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type meta struct {
-	magic    uint32
-	version  uint32
-	pageSize uint32
-	flags    uint32
-	root     bucket
-	freelist pgid
-	pgid     pgid
-	txid     txid
-	checksum uint64
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type bucket struct {
-	root     pgid
-	sequence uint64
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type page struct {
-	id       pgid
-	flags    uint16
-	count    uint16
-	overflow uint32
-	ptr      uintptr
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) Type() string {
-	if (p.flags & branchPageFlag) != 0 {
-		return "branch"
-	} else if (p.flags & leafPageFlag) != 0 {
-		return "leaf"
-	} else if (p.flags & metaPageFlag) != 0 {
-		return "meta"
-	} else if (p.flags & freelistPageFlag) != 0 {
-		return "freelist"
-	}
-	return fmt.Sprintf("unknown<%02x>", p.flags)
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) leafPageElement(index uint16) *leafPageElement {
-	n := &((*[0x7FFFFFF]leafPageElement)(unsafe.Pointer(&p.ptr)))[index]
-	return n
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (p *page) branchPageElement(index uint16) *branchPageElement {
-	return &((*[0x7FFFFFF]branchPageElement)(unsafe.Pointer(&p.ptr)))[index]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type branchPageElement struct {
-	pos   uint32
-	ksize uint32
-	pgid  pgid
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *branchPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos : n.pos+n.ksize]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-type leafPageElement struct {
-	flags uint32
-	pos   uint32
-	ksize uint32
-	vsize uint32
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *leafPageElement) key() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos : n.pos+n.ksize]
-}
-
-// DO NOT EDIT. Copied from the "bolt" package.
-func (n *leafPageElement) value() []byte {
-	buf := (*[maxAllocSize]byte)(unsafe.Pointer(n))
-	return buf[n.pos+n.ksize : n.pos+n.ksize+n.vsize]
-}
-
-// CompactCommand represents the "compact" command execution.
-type CompactCommand struct {
-	Stdin  io.Reader
-	Stdout io.Writer
-	Stderr io.Writer
-
-	SrcPath   string
-	DstPath   string
-	TxMaxSize int64
-}
-
-// newCompactCommand returns a CompactCommand.
-func newCompactCommand(m *Main) *CompactCommand {
-	return &CompactCommand{
-		Stdin:  m.Stdin,
-		Stdout: m.Stdout,
-		Stderr: m.Stderr,
-	}
-}
-
-// Run executes the command.
-func (cmd *CompactCommand) Run(args ...string) (err error) {
-	// Parse flags.
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	fs.SetOutput(ioutil.Discard)
-	fs.StringVar(&cmd.DstPath, "o", "", "")
-	fs.Int64Var(&cmd.TxMaxSize, "tx-max-size", 65536, "")
-	if err := fs.Parse(args); err == flag.ErrHelp {
-		fmt.Fprintln(cmd.Stderr, cmd.Usage())
-		return ErrUsage
-	} else if err != nil {
-		return err
-	} else if cmd.DstPath == "" {
-		return fmt.Errorf("output file required")
-	}
-
-	// Require database paths.
-	cmd.SrcPath = fs.Arg(0)
-	if cmd.SrcPath == "" {
-		return ErrPathRequired
-	}
-
-	// Ensure source file exists.
-	fi, err := os.Stat(cmd.SrcPath)
-	if os.IsNotExist(err) {
-		return ErrFileNotFound
-	} else if err != nil {
-		return err
-	}
-	initialSize := fi.Size()
-
-	// Open source database.
-	src, err := bolt.Open(cmd.SrcPath, 0444, nil)
-	if err != nil {
-		return err
-	}
-	defer src.Close()
-
-	// Open destination database.
-	dst, err := bolt.Open(cmd.DstPath, fi.Mode(), nil)
-	if err != nil {
-		return err
-	}
-	defer dst.Close()
-
-	// Run compaction.
-	if err := cmd.compact(dst, src); err != nil {
-		return err
-	}
-
-	// Report stats on new size.
-	fi, err = os.Stat(cmd.DstPath)
-	if err != nil {
-		return err
-	} else if fi.Size() == 0 {
-		return fmt.Errorf("zero db size")
-	}
-	fmt.Fprintf(cmd.Stdout, "%d -> %d bytes (gain=%.2fx)\n", initialSize, fi.Size(), float64(initialSize)/float64(fi.Size()))
-
-	return nil
-}
-
-func (cmd *CompactCommand) compact(dst, src *bolt.DB) error {
-	// commit regularly, or we'll run out of memory for large datasets if using one transaction.
-	var size int64
-	tx, err := dst.Begin(true)
-	if err != nil {
-		return err
-	}
-	defer tx.Rollback()
-
-	if err := cmd.walk(src, func(keys [][]byte, k, v []byte, seq uint64) error {
-		// On each key/value, check if we have exceeded tx size.
-		sz := int64(len(k) + len(v))
-		if size+sz > cmd.TxMaxSize && cmd.TxMaxSize != 0 {
-			// Commit previous transaction.
-			if err := tx.Commit(); err != nil {
-				return err
-			}
-
-			// Start new transaction.
-			tx, err = dst.Begin(true)
-			if err != nil {
-				return err
-			}
-			size = 0
-		}
-		size += sz
-
-		// Create bucket on the root transaction if this is the first level.
-		nk := len(keys)
-		if nk == 0 {
-			bkt, err := tx.CreateBucket(k)
-			if err != nil {
-				return err
-			}
-			if err := bkt.SetSequence(seq); err != nil {
-				return err
-			}
-			return nil
-		}
-
-		// Create buckets on subsequent levels, if necessary.
-		b := tx.Bucket(keys[0])
-		if nk > 1 {
-			for _, k := range keys[1:] {
-				b = b.Bucket(k)
-			}
-		}
-
-		// If there is no value then this is a bucket call.
-		if v == nil {
-			bkt, err := b.CreateBucket(k)
-			if err != nil {
-				return err
-			}
-			if err := bkt.SetSequence(seq); err != nil {
-				return err
-			}
-			return nil
-		}
-
-		// Otherwise treat it as a key/value pair.
-		return b.Put(k, v)
-	}); err != nil {
-		return err
-	}
-
-	return tx.Commit()
-}
-
-// walkFunc is the type of the function called for keys (buckets and "normal"
-// values) discovered by Walk. keys is the list of keys to descend to the bucket
-// owning the discovered key/value pair k/v.
-type walkFunc func(keys [][]byte, k, v []byte, seq uint64) error
-
-// walk walks recursively the bolt database db, calling walkFn for each key it finds.
-func (cmd *CompactCommand) walk(db *bolt.DB, walkFn walkFunc) error {
-	return db.View(func(tx *bolt.Tx) error {
-		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return cmd.walkBucket(b, nil, name, nil, b.Sequence(), walkFn)
-		})
-	})
-}
-
-func (cmd *CompactCommand) walkBucket(b *bolt.Bucket, keypath [][]byte, k, v []byte, seq uint64, fn walkFunc) error {
-	// Execute callback.
-	if err := fn(keypath, k, v, seq); err != nil {
-		return err
-	}
-
-	// If this is not a bucket then stop.
-	if v != nil {
-		return nil
-	}
-
-	// Iterate over each child key/value.
-	keypath = append(keypath, k)
-	return b.ForEach(func(k, v []byte) error {
-		if v == nil {
-			bkt := b.Bucket(k)
-			return cmd.walkBucket(bkt, keypath, k, nil, bkt.Sequence(), fn)
-		}
-		return cmd.walkBucket(b, keypath, k, v, b.Sequence(), fn)
-	})
-}
-
-// Usage returns the help message.
-func (cmd *CompactCommand) Usage() string {
-	return strings.TrimLeft(`
-usage: bolt compact [options] -o DST SRC
-
-Compact opens a database at SRC path and walks it recursively, copying keys
-as they are found from all buckets, to a newly created database at DST path.
-
-The original database is left untouched.
-
-Additional options include:
-
-	-tx-max-size NUM
-		Specifies the maximum size of individual transactions.
-		Defaults to 64KB.
-`, "\n")
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main_test.go b/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main_test.go
deleted file mode 100644
index 0a11ff3395..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/cmd/bolt/main_test.go
+++ /dev/null
@@ -1,356 +0,0 @@
-package main_test
-
-import (
-	"bytes"
-	crypto "crypto/rand"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"strconv"
-	"testing"
-
-	"github.com/boltdb/bolt"
-	"github.com/boltdb/bolt/cmd/bolt"
-)
-
-// Ensure the "info" command can print information about a database.
-func TestInfoCommand_Run(t *testing.T) {
-	db := MustOpen(0666, nil)
-	db.DB.Close()
-	defer db.Close()
-
-	// Run the info command.
-	m := NewMain()
-	if err := m.Run("info", db.Path); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure the "stats" command executes correctly with an empty database.
-func TestStatsCommand_Run_EmptyDatabase(t *testing.T) {
-	// Ignore
-	if os.Getpagesize() != 4096 {
-		t.Skip("system does not use 4KB page size")
-	}
-
-	db := MustOpen(0666, nil)
-	defer db.Close()
-	db.DB.Close()
-
-	// Generate expected result.
-	exp := "Aggregate statistics for 0 buckets\n\n" +
-		"Page count statistics\n" +
-		"\tNumber of logical branch pages: 0\n" +
-		"\tNumber of physical branch overflow pages: 0\n" +
-		"\tNumber of logical leaf pages: 0\n" +
-		"\tNumber of physical leaf overflow pages: 0\n" +
-		"Tree statistics\n" +
-		"\tNumber of keys/value pairs: 0\n" +
-		"\tNumber of levels in B+tree: 0\n" +
-		"Page size utilization\n" +
-		"\tBytes allocated for physical branch pages: 0\n" +
-		"\tBytes actually used for branch data: 0 (0%)\n" +
-		"\tBytes allocated for physical leaf pages: 0\n" +
-		"\tBytes actually used for leaf data: 0 (0%)\n" +
-		"Bucket statistics\n" +
-		"\tTotal number of buckets: 0\n" +
-		"\tTotal number on inlined buckets: 0 (0%)\n" +
-		"\tBytes used for inlined buckets: 0 (0%)\n"
-
-	// Run the command.
-	m := NewMain()
-	if err := m.Run("stats", db.Path); err != nil {
-		t.Fatal(err)
-	} else if m.Stdout.String() != exp {
-		t.Fatalf("unexpected stdout:\n\n%s", m.Stdout.String())
-	}
-}
-
-// Ensure the "stats" command can execute correctly.
-func TestStatsCommand_Run(t *testing.T) {
-	// Ignore
-	if os.Getpagesize() != 4096 {
-		t.Skip("system does not use 4KB page size")
-	}
-
-	db := MustOpen(0666, nil)
-	defer db.Close()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create "foo" bucket.
-		b, err := tx.CreateBucket([]byte("foo"))
-		if err != nil {
-			return err
-		}
-		for i := 0; i < 10; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				return err
-			}
-		}
-
-		// Create "bar" bucket.
-		b, err = tx.CreateBucket([]byte("bar"))
-		if err != nil {
-			return err
-		}
-		for i := 0; i < 100; i++ {
-			if err := b.Put([]byte(strconv.Itoa(i)), []byte(strconv.Itoa(i))); err != nil {
-				return err
-			}
-		}
-
-		// Create "baz" bucket.
-		b, err = tx.CreateBucket([]byte("baz"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("key"), []byte("value")); err != nil {
-			return err
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	db.DB.Close()
-
-	// Generate expected result.
-	exp := "Aggregate statistics for 3 buckets\n\n" +
-		"Page count statistics\n" +
-		"\tNumber of logical branch pages: 0\n" +
-		"\tNumber of physical branch overflow pages: 0\n" +
-		"\tNumber of logical leaf pages: 1\n" +
-		"\tNumber of physical leaf overflow pages: 0\n" +
-		"Tree statistics\n" +
-		"\tNumber of keys/value pairs: 111\n" +
-		"\tNumber of levels in B+tree: 1\n" +
-		"Page size utilization\n" +
-		"\tBytes allocated for physical branch pages: 0\n" +
-		"\tBytes actually used for branch data: 0 (0%)\n" +
-		"\tBytes allocated for physical leaf pages: 4096\n" +
-		"\tBytes actually used for leaf data: 1996 (48%)\n" +
-		"Bucket statistics\n" +
-		"\tTotal number of buckets: 3\n" +
-		"\tTotal number on inlined buckets: 2 (66%)\n" +
-		"\tBytes used for inlined buckets: 236 (11%)\n"
-
-	// Run the command.
-	m := NewMain()
-	if err := m.Run("stats", db.Path); err != nil {
-		t.Fatal(err)
-	} else if m.Stdout.String() != exp {
-		t.Fatalf("unexpected stdout:\n\n%s", m.Stdout.String())
-	}
-}
-
-// Main represents a test wrapper for main.Main that records output.
-type Main struct {
-	*main.Main
-	Stdin  bytes.Buffer
-	Stdout bytes.Buffer
-	Stderr bytes.Buffer
-}
-
-// NewMain returns a new instance of Main.
-func NewMain() *Main {
-	m := &Main{Main: main.NewMain()}
-	m.Main.Stdin = &m.Stdin
-	m.Main.Stdout = &m.Stdout
-	m.Main.Stderr = &m.Stderr
-	return m
-}
-
-// MustOpen creates a Bolt database in a temporary location.
-func MustOpen(mode os.FileMode, options *bolt.Options) *DB {
-	// Create temporary path.
-	f, _ := ioutil.TempFile("", "bolt-")
-	f.Close()
-	os.Remove(f.Name())
-
-	db, err := bolt.Open(f.Name(), mode, options)
-	if err != nil {
-		panic(err.Error())
-	}
-	return &DB{DB: db, Path: f.Name()}
-}
-
-// DB is a test wrapper for bolt.DB.
-type DB struct {
-	*bolt.DB
-	Path string
-}
-
-// Close closes and removes the database.
-func (db *DB) Close() error {
-	defer os.Remove(db.Path)
-	return db.DB.Close()
-}
-
-func TestCompactCommand_Run(t *testing.T) {
-	var s int64
-	if err := binary.Read(crypto.Reader, binary.BigEndian, &s); err != nil {
-		t.Fatal(err)
-	}
-	rand.Seed(s)
-
-	dstdb := MustOpen(0666, nil)
-	dstdb.Close()
-
-	// fill the db
-	db := MustOpen(0666, nil)
-	if err := db.Update(func(tx *bolt.Tx) error {
-		n := 2 + rand.Intn(5)
-		for i := 0; i < n; i++ {
-			k := []byte(fmt.Sprintf("b%d", i))
-			b, err := tx.CreateBucketIfNotExists(k)
-			if err != nil {
-				return err
-			}
-			if err := b.SetSequence(uint64(i)); err != nil {
-				return err
-			}
-			if err := fillBucket(b, append(k, '.')); err != nil {
-				return err
-			}
-		}
-		return nil
-	}); err != nil {
-		db.Close()
-		t.Fatal(err)
-	}
-
-	// make the db grow by adding large values, and delete them.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucketIfNotExists([]byte("large_vals"))
-		if err != nil {
-			return err
-		}
-		n := 5 + rand.Intn(5)
-		for i := 0; i < n; i++ {
-			v := make([]byte, 1000*1000*(1+rand.Intn(5)))
-			_, err := crypto.Read(v)
-			if err != nil {
-				return err
-			}
-			if err := b.Put([]byte(fmt.Sprintf("l%d", i)), v); err != nil {
-				return err
-			}
-		}
-		return nil
-	}); err != nil {
-		db.Close()
-		t.Fatal(err)
-	}
-	if err := db.Update(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("large_vals")).Cursor()
-		for k, _ := c.First(); k != nil; k, _ = c.Next() {
-			if err := c.Delete(); err != nil {
-				return err
-			}
-		}
-		return tx.DeleteBucket([]byte("large_vals"))
-	}); err != nil {
-		db.Close()
-		t.Fatal(err)
-	}
-	db.DB.Close()
-	defer db.Close()
-	defer dstdb.Close()
-
-	dbChk, err := chkdb(db.Path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m := NewMain()
-	if err := m.Run("compact", "-o", dstdb.Path, db.Path); err != nil {
-		t.Fatal(err)
-	}
-
-	dbChkAfterCompact, err := chkdb(db.Path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dstdbChk, err := chkdb(dstdb.Path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !bytes.Equal(dbChk, dbChkAfterCompact) {
-		t.Error("the original db has been touched")
-	}
-	if !bytes.Equal(dbChk, dstdbChk) {
-		t.Error("the compacted db data isn't the same than the original db")
-	}
-}
-
-func fillBucket(b *bolt.Bucket, prefix []byte) error {
-	n := 10 + rand.Intn(50)
-	for i := 0; i < n; i++ {
-		v := make([]byte, 10*(1+rand.Intn(4)))
-		_, err := crypto.Read(v)
-		if err != nil {
-			return err
-		}
-		k := append(prefix, []byte(fmt.Sprintf("k%d", i))...)
-		if err := b.Put(k, v); err != nil {
-			return err
-		}
-	}
-	// limit depth of subbuckets
-	s := 2 + rand.Intn(4)
-	if len(prefix) > (2*s + 1) {
-		return nil
-	}
-	n = 1 + rand.Intn(3)
-	for i := 0; i < n; i++ {
-		k := append(prefix, []byte(fmt.Sprintf("b%d", i))...)
-		sb, err := b.CreateBucket(k)
-		if err != nil {
-			return err
-		}
-		if err := fillBucket(sb, append(k, '.')); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func chkdb(path string) ([]byte, error) {
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return nil, err
-	}
-	defer db.Close()
-	var buf bytes.Buffer
-	err = db.View(func(tx *bolt.Tx) error {
-		return tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return walkBucket(b, name, nil, &buf)
-		})
-	})
-	if err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-func walkBucket(parent *bolt.Bucket, k []byte, v []byte, w io.Writer) error {
-	if _, err := fmt.Fprintf(w, "%d:%x=%x\n", parent.Sequence(), k, v); err != nil {
-		return err
-	}
-
-	// not a bucket, exit.
-	if v != nil {
-		return nil
-	}
-	return parent.ForEach(func(k, v []byte) error {
-		if v == nil {
-			return walkBucket(parent.Bucket(k), k, nil, w)
-		}
-		return walkBucket(parent, k, v, w)
-	})
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/cursor_test.go b/installer/vendor/github.com/boltdb/bolt/cursor_test.go
deleted file mode 100644
index 562d60f9af..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/cursor_test.go
+++ /dev/null
@@ -1,817 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"log"
-	"os"
-	"reflect"
-	"sort"
-	"testing"
-	"testing/quick"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that a cursor can return a reference to the bucket that created it.
-func TestCursor_Bucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if cb := b.Cursor().Bucket(); !reflect.DeepEqual(cb, b) {
-			t.Fatal("cursor bucket mismatch")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can seek to the appropriate keys.
-func TestCursor_Seek(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("0001")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte("0002")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("0003")); err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err := b.CreateBucket([]byte("bkt")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-
-		// Exact match should go to the key.
-		if k, v := c.Seek([]byte("bar")); !bytes.Equal(k, []byte("bar")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if !bytes.Equal(v, []byte("0002")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-
-		// Inexact match should go to the next key.
-		if k, v := c.Seek([]byte("bas")); !bytes.Equal(k, []byte("baz")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if !bytes.Equal(v, []byte("0003")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-
-		// Low key should go to the first key.
-		if k, v := c.Seek([]byte("")); !bytes.Equal(k, []byte("bar")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if !bytes.Equal(v, []byte("0002")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-
-		// High key should return no key.
-		if k, v := c.Seek([]byte("zzz")); k != nil {
-			t.Fatalf("expected nil key: %v", k)
-		} else if v != nil {
-			t.Fatalf("expected nil value: %v", v)
-		}
-
-		// Buckets should return their key but no value.
-		if k, v := c.Seek([]byte("bkt")); !bytes.Equal(k, []byte("bkt")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("expected nil value: %v", v)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCursor_Delete(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	const count = 1000
-
-	// Insert every other key between 0 and $count.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i := 0; i < count; i += 1 {
-			k := make([]byte, 8)
-			binary.BigEndian.PutUint64(k, uint64(i))
-			if err := b.Put(k, make([]byte, 100)); err != nil {
-				t.Fatal(err)
-			}
-		}
-		if _, err := b.CreateBucket([]byte("sub")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		bound := make([]byte, 8)
-		binary.BigEndian.PutUint64(bound, uint64(count/2))
-		for key, _ := c.First(); bytes.Compare(key, bound) < 0; key, _ = c.Next() {
-			if err := c.Delete(); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		c.Seek([]byte("sub"))
-		if err := c.Delete(); err != bolt.ErrIncompatibleValue {
-			t.Fatalf("unexpected error: %s", err)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		stats := tx.Bucket([]byte("widgets")).Stats()
-		if stats.KeyN != count/2+1 {
-			t.Fatalf("unexpected KeyN: %d", stats.KeyN)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can seek to the appropriate keys when there are a
-// large number of keys. This test also checks that seek will always move
-// forward to the next key.
-//
-// Related: https://github.com/boltdb/bolt/pull/187
-func TestCursor_Seek_Large(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var count = 10000
-
-	// Insert every other key between 0 and $count.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for i := 0; i < count; i += 100 {
-			for j := i; j < i+100; j += 2 {
-				k := make([]byte, 8)
-				binary.BigEndian.PutUint64(k, uint64(j))
-				if err := b.Put(k, make([]byte, 100)); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for i := 0; i < count; i++ {
-			seek := make([]byte, 8)
-			binary.BigEndian.PutUint64(seek, uint64(i))
-
-			k, _ := c.Seek(seek)
-
-			// The last seek is beyond the end of the the range so
-			// it should return nil.
-			if i == count-1 {
-				if k != nil {
-					t.Fatal("expected nil key")
-				}
-				continue
-			}
-
-			// Otherwise we should seek to the exact key or the next key.
-			num := binary.BigEndian.Uint64(k)
-			if i%2 == 0 {
-				if num != uint64(i) {
-					t.Fatalf("unexpected num: %d", num)
-				}
-			} else {
-				if num != uint64(i+1) {
-					t.Fatalf("unexpected num: %d", num)
-				}
-			}
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a cursor can iterate over an empty bucket without error.
-func TestCursor_EmptyBucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		k, v := c.First()
-		if k != nil {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can reverse iterate over an empty bucket without error.
-func TestCursor_EmptyBucketReverse(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.View(func(tx *bolt.Tx) error {
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		k, v := c.Last()
-		if k != nil {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can iterate over a single root with a couple elements.
-func TestCursor_Iterate_Leaf(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte{}); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte{0}); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte{1}); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	tx, err := db.Begin(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() { _ = tx.Rollback() }()
-
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	k, v := c.First()
-	if !bytes.Equal(k, []byte("bar")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{1}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	k, v = c.Next()
-	if !bytes.Equal(k, []byte("baz")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	k, v = c.Next()
-	if !bytes.Equal(k, []byte("foo")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{0}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	k, v = c.Next()
-	if k != nil {
-		t.Fatalf("expected nil key: %v", k)
-	} else if v != nil {
-		t.Fatalf("expected nil value: %v", v)
-	}
-
-	k, v = c.Next()
-	if k != nil {
-		t.Fatalf("expected nil key: %v", k)
-	} else if v != nil {
-		t.Fatalf("expected nil value: %v", v)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can iterate in reverse over a single root with a couple elements.
-func TestCursor_LeafRootReverse(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte{}); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte{0}); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte{1}); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	tx, err := db.Begin(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	if k, v := c.Last(); !bytes.Equal(k, []byte("foo")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{0}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	if k, v := c.Prev(); !bytes.Equal(k, []byte("baz")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	if k, v := c.Prev(); !bytes.Equal(k, []byte("bar")) {
-		t.Fatalf("unexpected key: %v", k)
-	} else if !bytes.Equal(v, []byte{1}) {
-		t.Fatalf("unexpected value: %v", v)
-	}
-
-	if k, v := c.Prev(); k != nil {
-		t.Fatalf("expected nil key: %v", k)
-	} else if v != nil {
-		t.Fatalf("expected nil value: %v", v)
-	}
-
-	if k, v := c.Prev(); k != nil {
-		t.Fatalf("expected nil key: %v", k)
-	} else if v != nil {
-		t.Fatalf("expected nil value: %v", v)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can restart from the beginning.
-func TestCursor_Restart(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("bar"), []byte{}); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte{}); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	tx, err := db.Begin(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c := tx.Bucket([]byte("widgets")).Cursor()
-
-	if k, _ := c.First(); !bytes.Equal(k, []byte("bar")) {
-		t.Fatalf("unexpected key: %v", k)
-	}
-	if k, _ := c.Next(); !bytes.Equal(k, []byte("foo")) {
-		t.Fatalf("unexpected key: %v", k)
-	}
-
-	if k, _ := c.First(); !bytes.Equal(k, []byte("bar")) {
-		t.Fatalf("unexpected key: %v", k)
-	}
-	if k, _ := c.Next(); !bytes.Equal(k, []byte("foo")) {
-		t.Fatalf("unexpected key: %v", k)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a cursor can skip over empty pages that have been deleted.
-func TestCursor_First_EmptyPages(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Create 1000 keys in the "widgets" bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for i := 0; i < 1000; i++ {
-			if err := b.Put(u64tob(uint64(i)), []byte{}); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Delete half the keys and then try to iterate.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 0; i < 600; i++ {
-			if err := b.Delete(u64tob(uint64(i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		c := b.Cursor()
-		var n int
-		for k, _ := c.First(); k != nil; k, _ = c.Next() {
-			n++
-		}
-		if n != 400 {
-			t.Fatalf("unexpected key count: %d", n)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx can iterate over all elements in a bucket.
-func TestCursor_QuickCheck(t *testing.T) {
-	f := func(items testdata) bool {
-		db := MustOpenDB()
-		defer db.MustClose()
-
-		// Bulk insert all values.
-		tx, err := db.Begin(true)
-		if err != nil {
-			t.Fatal(err)
-		}
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for _, item := range items {
-			if err := b.Put(item.Key, item.Value); err != nil {
-				t.Fatal(err)
-			}
-		}
-		if err := tx.Commit(); err != nil {
-			t.Fatal(err)
-		}
-
-		// Sort test data.
-		sort.Sort(items)
-
-		// Iterate over all items and check consistency.
-		var index = 0
-		tx, err = db.Begin(false)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.First(); k != nil && index < len(items); k, v = c.Next() {
-			if !bytes.Equal(k, items[index].Key) {
-				t.Fatalf("unexpected key: %v", k)
-			} else if !bytes.Equal(v, items[index].Value) {
-				t.Fatalf("unexpected value: %v", v)
-			}
-			index++
-		}
-		if len(items) != index {
-			t.Fatalf("unexpected item count: %v, expected %v", len(items), index)
-		}
-
-		if err := tx.Rollback(); err != nil {
-			t.Fatal(err)
-		}
-
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a transaction can iterate over all elements in a bucket in reverse.
-func TestCursor_QuickCheck_Reverse(t *testing.T) {
-	f := func(items testdata) bool {
-		db := MustOpenDB()
-		defer db.MustClose()
-
-		// Bulk insert all values.
-		tx, err := db.Begin(true)
-		if err != nil {
-			t.Fatal(err)
-		}
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		for _, item := range items {
-			if err := b.Put(item.Key, item.Value); err != nil {
-				t.Fatal(err)
-			}
-		}
-		if err := tx.Commit(); err != nil {
-			t.Fatal(err)
-		}
-
-		// Sort test data.
-		sort.Sort(revtestdata(items))
-
-		// Iterate over all items and check consistency.
-		var index = 0
-		tx, err = db.Begin(false)
-		if err != nil {
-			t.Fatal(err)
-		}
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.Last(); k != nil && index < len(items); k, v = c.Prev() {
-			if !bytes.Equal(k, items[index].Key) {
-				t.Fatalf("unexpected key: %v", k)
-			} else if !bytes.Equal(v, items[index].Value) {
-				t.Fatalf("unexpected value: %v", v)
-			}
-			index++
-		}
-		if len(items) != index {
-			t.Fatalf("unexpected item count: %v, expected %v", len(items), index)
-		}
-
-		if err := tx.Rollback(); err != nil {
-			t.Fatal(err)
-		}
-
-		return true
-	}
-	if err := quick.Check(f, qconfig()); err != nil {
-		t.Error(err)
-	}
-}
-
-// Ensure that a Tx cursor can iterate over subbuckets.
-func TestCursor_QuickCheck_BucketsOnly(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("baz")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		var names []string
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			names = append(names, string(k))
-			if v != nil {
-				t.Fatalf("unexpected value: %v", v)
-			}
-		}
-		if !reflect.DeepEqual(names, []string{"bar", "baz", "foo"}) {
-			t.Fatalf("unexpected names: %+v", names)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx cursor can reverse iterate over subbuckets.
-func TestCursor_QuickCheck_BucketsOnly_Reverse(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := b.CreateBucket([]byte("baz")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		var names []string
-		c := tx.Bucket([]byte("widgets")).Cursor()
-		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			names = append(names, string(k))
-			if v != nil {
-				t.Fatalf("unexpected value: %v", v)
-			}
-		}
-		if !reflect.DeepEqual(names, []string{"foo", "baz", "bar"}) {
-			t.Fatalf("unexpected names: %+v", names)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func ExampleCursor() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Start a read-write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create a new bucket.
-		b, err := tx.CreateBucket([]byte("animals"))
-		if err != nil {
-			return err
-		}
-
-		// Insert data into a bucket.
-		if err := b.Put([]byte("dog"), []byte("fun")); err != nil {
-			log.Fatal(err)
-		}
-		if err := b.Put([]byte("cat"), []byte("lame")); err != nil {
-			log.Fatal(err)
-		}
-		if err := b.Put([]byte("liger"), []byte("awesome")); err != nil {
-			log.Fatal(err)
-		}
-
-		// Create a cursor for iteration.
-		c := b.Cursor()
-
-		// Iterate over items in sorted key order. This starts from the
-		// first key/value pair and updates the k/v variables to the
-		// next key/value on each iteration.
-		//
-		// The loop finishes at the end of the cursor when a nil key is returned.
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			fmt.Printf("A %s is %s.\n", k, v)
-		}
-
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// A cat is lame.
-	// A dog is fun.
-	// A liger is awesome.
-}
-
-func ExampleCursor_reverse() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Start a read-write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create a new bucket.
-		b, err := tx.CreateBucket([]byte("animals"))
-		if err != nil {
-			return err
-		}
-
-		// Insert data into a bucket.
-		if err := b.Put([]byte("dog"), []byte("fun")); err != nil {
-			log.Fatal(err)
-		}
-		if err := b.Put([]byte("cat"), []byte("lame")); err != nil {
-			log.Fatal(err)
-		}
-		if err := b.Put([]byte("liger"), []byte("awesome")); err != nil {
-			log.Fatal(err)
-		}
-
-		// Create a cursor for iteration.
-		c := b.Cursor()
-
-		// Iterate over items in reverse sorted key order. This starts
-		// from the last key/value pair and updates the k/v variables to
-		// the previous key/value on each iteration.
-		//
-		// The loop finishes at the beginning of the cursor when a nil key
-		// is returned.
-		for k, v := c.Last(); k != nil; k, v = c.Prev() {
-			fmt.Printf("A %s is %s.\n", k, v)
-		}
-
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close the database to release the file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// A liger is awesome.
-	// A dog is fun.
-	// A cat is lame.
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/db_test.go b/installer/vendor/github.com/boltdb/bolt/db_test.go
deleted file mode 100644
index 3034d4f476..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/db_test.go
+++ /dev/null
@@ -1,1545 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"flag"
-	"fmt"
-	"hash/fnv"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-	"unsafe"
-
-	"github.com/boltdb/bolt"
-)
-
-var statsFlag = flag.Bool("stats", false, "show performance stats")
-
-// version is the data file format version.
-const version = 2
-
-// magic is the marker value to indicate that a file is a Bolt DB.
-const magic uint32 = 0xED0CDAED
-
-// pageSize is the size of one page in the data file.
-const pageSize = 4096
-
-// pageHeaderSize is the size of a page header.
-const pageHeaderSize = 16
-
-// meta represents a simplified version of a database meta page for testing.
-type meta struct {
-	magic    uint32
-	version  uint32
-	_        uint32
-	_        uint32
-	_        [16]byte
-	_        uint64
-	pgid     uint64
-	_        uint64
-	checksum uint64
-}
-
-// Ensure that a database can be opened without error.
-func TestOpen(t *testing.T) {
-	path := tempfile()
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	} else if db == nil {
-		t.Fatal("expected db")
-	}
-
-	if s := db.Path(); s != path {
-		t.Fatalf("unexpected path: %s", s)
-	}
-
-	if err := db.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that opening a database with a blank path returns an error.
-func TestOpen_ErrPathRequired(t *testing.T) {
-	_, err := bolt.Open("", 0666, nil)
-	if err == nil {
-		t.Fatalf("expected error")
-	}
-}
-
-// Ensure that opening a database with a bad path returns an error.
-func TestOpen_ErrNotExists(t *testing.T) {
-	_, err := bolt.Open(filepath.Join(tempfile(), "bad-path"), 0666, nil)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-}
-
-// Ensure that opening a file that is not a Bolt database returns ErrInvalid.
-func TestOpen_ErrInvalid(t *testing.T) {
-	path := tempfile()
-
-	f, err := os.Create(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := fmt.Fprintln(f, "this is not a bolt database"); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(path)
-
-	if _, err := bolt.Open(path, 0666, nil); err != bolt.ErrInvalid {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that opening a file with two invalid versions returns ErrVersionMismatch.
-func TestOpen_ErrVersionMismatch(t *testing.T) {
-	if pageSize != os.Getpagesize() {
-		t.Skip("page size mismatch")
-	}
-
-	// Create empty database.
-	db := MustOpenDB()
-	path := db.Path()
-	defer db.MustClose()
-
-	// Close database.
-	if err := db.DB.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read data file.
-	buf, err := ioutil.ReadFile(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Rewrite meta pages.
-	meta0 := (*meta)(unsafe.Pointer(&buf[pageHeaderSize]))
-	meta0.version++
-	meta1 := (*meta)(unsafe.Pointer(&buf[pageSize+pageHeaderSize]))
-	meta1.version++
-	if err := ioutil.WriteFile(path, buf, 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	// Reopen data file.
-	if _, err := bolt.Open(path, 0666, nil); err != bolt.ErrVersionMismatch {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that opening a file with two invalid checksums returns ErrChecksum.
-func TestOpen_ErrChecksum(t *testing.T) {
-	if pageSize != os.Getpagesize() {
-		t.Skip("page size mismatch")
-	}
-
-	// Create empty database.
-	db := MustOpenDB()
-	path := db.Path()
-	defer db.MustClose()
-
-	// Close database.
-	if err := db.DB.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read data file.
-	buf, err := ioutil.ReadFile(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Rewrite meta pages.
-	meta0 := (*meta)(unsafe.Pointer(&buf[pageHeaderSize]))
-	meta0.pgid++
-	meta1 := (*meta)(unsafe.Pointer(&buf[pageSize+pageHeaderSize]))
-	meta1.pgid++
-	if err := ioutil.WriteFile(path, buf, 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	// Reopen data file.
-	if _, err := bolt.Open(path, 0666, nil); err != bolt.ErrChecksum {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that opening a database does not increase its size.
-// https://github.com/boltdb/bolt/issues/291
-func TestOpen_Size(t *testing.T) {
-	// Open a data file.
-	db := MustOpenDB()
-	path := db.Path()
-	defer db.MustClose()
-
-	pagesize := db.Info().PageSize
-
-	// Insert until we get above the minimum 4MB size.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, _ := tx.CreateBucketIfNotExists([]byte("data"))
-		for i := 0; i < 10000; i++ {
-			if err := b.Put([]byte(fmt.Sprintf("%04d", i)), make([]byte, 1000)); err != nil {
-				t.Fatal(err)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Close database and grab the size.
-	if err := db.DB.Close(); err != nil {
-		t.Fatal(err)
-	}
-	sz := fileSize(path)
-	if sz == 0 {
-		t.Fatalf("unexpected new file size: %d", sz)
-	}
-
-	// Reopen database, update, and check size again.
-	db0, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db0.Update(func(tx *bolt.Tx) error {
-		if err := tx.Bucket([]byte("data")).Put([]byte{0}, []byte{0}); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := db0.Close(); err != nil {
-		t.Fatal(err)
-	}
-	newSz := fileSize(path)
-	if newSz == 0 {
-		t.Fatalf("unexpected new file size: %d", newSz)
-	}
-
-	// Compare the original size with the new size.
-	// db size might increase by a few page sizes due to the new small update.
-	if sz < newSz-5*int64(pagesize) {
-		t.Fatalf("unexpected file growth: %d => %d", sz, newSz)
-	}
-}
-
-// Ensure that opening a database beyond the max step size does not increase its size.
-// https://github.com/boltdb/bolt/issues/303
-func TestOpen_Size_Large(t *testing.T) {
-	if testing.Short() {
-		t.Skip("short mode")
-	}
-
-	// Open a data file.
-	db := MustOpenDB()
-	path := db.Path()
-	defer db.MustClose()
-
-	pagesize := db.Info().PageSize
-
-	// Insert until we get above the minimum 4MB size.
-	var index uint64
-	for i := 0; i < 10000; i++ {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, _ := tx.CreateBucketIfNotExists([]byte("data"))
-			for j := 0; j < 1000; j++ {
-				if err := b.Put(u64tob(index), make([]byte, 50)); err != nil {
-					t.Fatal(err)
-				}
-				index++
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Close database and grab the size.
-	if err := db.DB.Close(); err != nil {
-		t.Fatal(err)
-	}
-	sz := fileSize(path)
-	if sz == 0 {
-		t.Fatalf("unexpected new file size: %d", sz)
-	} else if sz < (1 << 30) {
-		t.Fatalf("expected larger initial size: %d", sz)
-	}
-
-	// Reopen database, update, and check size again.
-	db0, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db0.Update(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("data")).Put([]byte{0}, []byte{0})
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := db0.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	newSz := fileSize(path)
-	if newSz == 0 {
-		t.Fatalf("unexpected new file size: %d", newSz)
-	}
-
-	// Compare the original size with the new size.
-	// db size might increase by a few page sizes due to the new small update.
-	if sz < newSz-5*int64(pagesize) {
-		t.Fatalf("unexpected file growth: %d => %d", sz, newSz)
-	}
-}
-
-// Ensure that a re-opened database is consistent.
-func TestOpen_Check(t *testing.T) {
-	path := tempfile()
-
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.View(func(tx *bolt.Tx) error { return <-tx.Check() }); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	db, err = bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.View(func(tx *bolt.Tx) error { return <-tx.Check() }); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that write errors to the meta file handler during initialization are returned.
-func TestOpen_MetaInitWriteError(t *testing.T) {
-	t.Skip("pending")
-}
-
-// Ensure that a database that is too small returns an error.
-func TestOpen_FileTooSmall(t *testing.T) {
-	path := tempfile()
-
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := db.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// corrupt the database
-	if err := os.Truncate(path, int64(os.Getpagesize())); err != nil {
-		t.Fatal(err)
-	}
-
-	db, err = bolt.Open(path, 0666, nil)
-	if err == nil || err.Error() != "file size too small" {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// TestDB_Open_InitialMmapSize tests if having InitialMmapSize large enough
-// to hold data from concurrent write transaction resolves the issue that
-// read transaction blocks the write transaction and causes deadlock.
-// This is a very hacky test since the mmap size is not exposed.
-func TestDB_Open_InitialMmapSize(t *testing.T) {
-	path := tempfile()
-	defer os.Remove(path)
-
-	initMmapSize := 1 << 31  // 2GB
-	testWriteSize := 1 << 27 // 134MB
-
-	db, err := bolt.Open(path, 0666, &bolt.Options{InitialMmapSize: initMmapSize})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// create a long-running read transaction
-	// that never gets closed while writing
-	rtx, err := db.Begin(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// create a write transaction
-	wtx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := wtx.CreateBucket([]byte("test"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// and commit a large write
-	err = b.Put([]byte("foo"), make([]byte, testWriteSize))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	done := make(chan struct{})
-
-	go func() {
-		if err := wtx.Commit(); err != nil {
-			t.Fatal(err)
-		}
-		done <- struct{}{}
-	}()
-
-	select {
-	case <-time.After(5 * time.Second):
-		t.Errorf("unexpected that the reader blocks writer")
-	case <-done:
-	}
-
-	if err := rtx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a database cannot open a transaction when it's not open.
-func TestDB_Begin_ErrDatabaseNotOpen(t *testing.T) {
-	var db bolt.DB
-	if _, err := db.Begin(false); err != bolt.ErrDatabaseNotOpen {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that a read-write transaction can be retrieved.
-func TestDB_BeginRW(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	} else if tx == nil {
-		t.Fatal("expected tx")
-	}
-
-	if tx.DB() != db.DB {
-		t.Fatal("unexpected tx database")
-	} else if !tx.Writable() {
-		t.Fatal("expected writable tx")
-	}
-
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that opening a transaction while the DB is closed returns an error.
-func TestDB_BeginRW_Closed(t *testing.T) {
-	var db bolt.DB
-	if _, err := db.Begin(true); err != bolt.ErrDatabaseNotOpen {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-func TestDB_Close_PendingTx_RW(t *testing.T) { testDB_Close_PendingTx(t, true) }
-func TestDB_Close_PendingTx_RO(t *testing.T) { testDB_Close_PendingTx(t, false) }
-
-// Ensure that a database cannot close while transactions are open.
-func testDB_Close_PendingTx(t *testing.T, writable bool) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Start transaction.
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Open update in separate goroutine.
-	done := make(chan struct{})
-	go func() {
-		if err := db.Close(); err != nil {
-			t.Fatal(err)
-		}
-		close(done)
-	}()
-
-	// Ensure database hasn't closed.
-	time.Sleep(100 * time.Millisecond)
-	select {
-	case <-done:
-		t.Fatal("database closed too early")
-	default:
-	}
-
-	// Commit transaction.
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure database closed now.
-	time.Sleep(100 * time.Millisecond)
-	select {
-	case <-done:
-	default:
-		t.Fatal("database did not close")
-	}
-}
-
-// Ensure a database can provide a transactional block.
-func TestDB_Update(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Delete([]byte("foo")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		if v := b.Get([]byte("foo")); v != nil {
-			t.Fatalf("expected nil value, got: %v", v)
-		}
-		if v := b.Get([]byte("baz")); !bytes.Equal(v, []byte("bat")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a closed database returns an error while running a transaction block
-func TestDB_Update_Closed(t *testing.T) {
-	var db bolt.DB
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != bolt.ErrDatabaseNotOpen {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure a panic occurs while trying to commit a managed transaction.
-func TestDB_Update_ManualCommit(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var panicked bool
-	if err := db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					panicked = true
-				}
-			}()
-
-			if err := tx.Commit(); err != nil {
-				t.Fatal(err)
-			}
-		}()
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	} else if !panicked {
-		t.Fatal("expected panic")
-	}
-}
-
-// Ensure a panic occurs while trying to rollback a managed transaction.
-func TestDB_Update_ManualRollback(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var panicked bool
-	if err := db.Update(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					panicked = true
-				}
-			}()
-
-			if err := tx.Rollback(); err != nil {
-				t.Fatal(err)
-			}
-		}()
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	} else if !panicked {
-		t.Fatal("expected panic")
-	}
-}
-
-// Ensure a panic occurs while trying to commit a managed transaction.
-func TestDB_View_ManualCommit(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var panicked bool
-	if err := db.View(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					panicked = true
-				}
-			}()
-
-			if err := tx.Commit(); err != nil {
-				t.Fatal(err)
-			}
-		}()
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	} else if !panicked {
-		t.Fatal("expected panic")
-	}
-}
-
-// Ensure a panic occurs while trying to rollback a managed transaction.
-func TestDB_View_ManualRollback(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var panicked bool
-	if err := db.View(func(tx *bolt.Tx) error {
-		func() {
-			defer func() {
-				if r := recover(); r != nil {
-					panicked = true
-				}
-			}()
-
-			if err := tx.Rollback(); err != nil {
-				t.Fatal(err)
-			}
-		}()
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	} else if !panicked {
-		t.Fatal("expected panic")
-	}
-}
-
-// Ensure a write transaction that panics does not hold open locks.
-func TestDB_Update_Panic(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Panic during update but recover.
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				t.Log("recover: update", r)
-			}
-		}()
-
-		if err := db.Update(func(tx *bolt.Tx) error {
-			if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-				t.Fatal(err)
-			}
-			panic("omg")
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// Verify we can update again.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Verify that our change persisted.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if tx.Bucket([]byte("widgets")) == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure a database can return an error through a read-only transactional block.
-func TestDB_View_Error(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		return errors.New("xxx")
-	}); err == nil || err.Error() != "xxx" {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure a read transaction that panics does not hold open locks.
-func TestDB_View_Panic(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Panic during view transaction but recover.
-	func() {
-		defer func() {
-			if r := recover(); r != nil {
-				t.Log("recover: view", r)
-			}
-		}()
-
-		if err := db.View(func(tx *bolt.Tx) error {
-			if tx.Bucket([]byte("widgets")) == nil {
-				t.Fatal("expected bucket")
-			}
-			panic("omg")
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// Verify that we can still use read transactions.
-	if err := db.View(func(tx *bolt.Tx) error {
-		if tx.Bucket([]byte("widgets")) == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that DB stats can be returned.
-func TestDB_Stats(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	stats := db.Stats()
-	if stats.TxStats.PageCount != 2 {
-		t.Fatalf("unexpected TxStats.PageCount: %d", stats.TxStats.PageCount)
-	} else if stats.FreePageN != 0 {
-		t.Fatalf("unexpected FreePageN != 0: %d", stats.FreePageN)
-	} else if stats.PendingPageN != 2 {
-		t.Fatalf("unexpected PendingPageN != 2: %d", stats.PendingPageN)
-	}
-}
-
-// Ensure that database pages are in expected order and type.
-func TestDB_Consistency(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			if err := tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar")); err != nil {
-				t.Fatal(err)
-			}
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if p, _ := tx.Page(0); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "meta" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(1); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "meta" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(2); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "free" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(3); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "free" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(4); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "leaf" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(5); p == nil {
-			t.Fatal("expected page")
-		} else if p.Type != "freelist" {
-			t.Fatalf("unexpected page type: %s", p.Type)
-		}
-
-		if p, _ := tx.Page(6); p != nil {
-			t.Fatal("unexpected page")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that DB stats can be subtracted from one another.
-func TestDBStats_Sub(t *testing.T) {
-	var a, b bolt.Stats
-	a.TxStats.PageCount = 3
-	a.FreePageN = 4
-	b.TxStats.PageCount = 10
-	b.FreePageN = 14
-	diff := b.Sub(&a)
-	if diff.TxStats.PageCount != 7 {
-		t.Fatalf("unexpected TxStats.PageCount: %d", diff.TxStats.PageCount)
-	}
-
-	// free page stats are copied from the receiver and not subtracted
-	if diff.FreePageN != 14 {
-		t.Fatalf("unexpected FreePageN: %d", diff.FreePageN)
-	}
-}
-
-// Ensure two functions can perform updates in a single batch.
-func TestDB_Batch(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Iterate over multiple updates in separate goroutines.
-	n := 2
-	ch := make(chan error)
-	for i := 0; i < n; i++ {
-		go func(i int) {
-			ch <- db.Batch(func(tx *bolt.Tx) error {
-				return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-			})
-		}(i)
-	}
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < n; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 0; i < n; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDB_Batch_Panic(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var sentinel int
-	var bork = &sentinel
-	var problem interface{}
-	var err error
-
-	// Execute a function inside a batch that panics.
-	func() {
-		defer func() {
-			if p := recover(); p != nil {
-				problem = p
-			}
-		}()
-		err = db.Batch(func(tx *bolt.Tx) error {
-			panic(bork)
-		})
-	}()
-
-	// Verify there is no error.
-	if g, e := err, error(nil); g != e {
-		t.Fatalf("wrong error: %v != %v", g, e)
-	}
-	// Verify the panic was captured.
-	if g, e := problem, bork; g != e {
-		t.Fatalf("wrong error: %v != %v", g, e)
-	}
-}
-
-func TestDB_BatchFull(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	const size = 3
-	// buffered so we never leak goroutines
-	ch := make(chan error, size)
-	put := func(i int) {
-		ch <- db.Batch(func(tx *bolt.Tx) error {
-			return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-		})
-	}
-
-	db.MaxBatchSize = size
-	// high enough to never trigger here
-	db.MaxBatchDelay = 1 * time.Hour
-
-	go put(1)
-	go put(2)
-
-	// Give the batch a chance to exhibit bugs.
-	time.Sleep(10 * time.Millisecond)
-
-	// not triggered yet
-	select {
-	case <-ch:
-		t.Fatalf("batch triggered too early")
-	default:
-	}
-
-	go put(3)
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < size; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i <= size; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDB_BatchTime(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	const size = 1
-	// buffered so we never leak goroutines
-	ch := make(chan error, size)
-	put := func(i int) {
-		ch <- db.Batch(func(tx *bolt.Tx) error {
-			return tx.Bucket([]byte("widgets")).Put(u64tob(uint64(i)), []byte{})
-		})
-	}
-
-	db.MaxBatchSize = 1000
-	db.MaxBatchDelay = 0
-
-	go put(1)
-
-	// Batch must trigger by time alone.
-
-	// Check all responses to make sure there's no error.
-	for i := 0; i < size; i++ {
-		if err := <-ch; err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Ensure data is correct.
-	if err := db.View(func(tx *bolt.Tx) error {
-		b := tx.Bucket([]byte("widgets"))
-		for i := 1; i <= size; i++ {
-			if v := b.Get(u64tob(uint64(i))); v == nil {
-				t.Errorf("key not found: %d", i)
-			}
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func ExampleDB_Update() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Execute several commands within a read-write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Read the value back from a separate read-only transaction.
-	if err := db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value of 'foo' is: %s\n", value)
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release the file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// The value of 'foo' is: bar
-}
-
-func ExampleDB_View() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Insert data into a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("people"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("john"), []byte("doe")); err != nil {
-			return err
-		}
-		if err := b.Put([]byte("susy"), []byte("que")); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Access data from within a read-only transactional block.
-	if err := db.View(func(tx *bolt.Tx) error {
-		v := tx.Bucket([]byte("people")).Get([]byte("john"))
-		fmt.Printf("John's last name is %s.\n", v)
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release the file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// John's last name is doe.
-}
-
-func ExampleDB_Begin_ReadOnly() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Create a bucket using a read-write transaction.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Create several keys in a transaction.
-	tx, err := db.Begin(true)
-	if err != nil {
-		log.Fatal(err)
-	}
-	b := tx.Bucket([]byte("widgets"))
-	if err := b.Put([]byte("john"), []byte("blue")); err != nil {
-		log.Fatal(err)
-	}
-	if err := b.Put([]byte("abby"), []byte("red")); err != nil {
-		log.Fatal(err)
-	}
-	if err := b.Put([]byte("zephyr"), []byte("purple")); err != nil {
-		log.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Iterate over the values in sorted key order.
-	tx, err = db.Begin(false)
-	if err != nil {
-		log.Fatal(err)
-	}
-	c := tx.Bucket([]byte("widgets")).Cursor()
-	for k, v := c.First(); k != nil; k, v = c.Next() {
-		fmt.Printf("%s likes %s\n", k, v)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// abby likes red
-	// john likes blue
-	// zephyr likes purple
-}
-
-func BenchmarkDBBatchAutomatic(b *testing.B) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("bench"))
-		return err
-	}); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for round := 0; round < 1000; round++ {
-			wg.Add(1)
-
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				h := fnv.New32a()
-				buf := make([]byte, 4)
-				binary.LittleEndian.PutUint32(buf, id)
-				_, _ = h.Write(buf[:])
-				k := h.Sum(nil)
-				insert := func(tx *bolt.Tx) error {
-					b := tx.Bucket([]byte("bench"))
-					return b.Put(k, []byte("filler"))
-				}
-				if err := db.Batch(insert); err != nil {
-					b.Error(err)
-					return
-				}
-			}(uint32(round))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
-
-func BenchmarkDBBatchSingle(b *testing.B) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("bench"))
-		return err
-	}); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for round := 0; round < 1000; round++ {
-			wg.Add(1)
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				h := fnv.New32a()
-				buf := make([]byte, 4)
-				binary.LittleEndian.PutUint32(buf, id)
-				_, _ = h.Write(buf[:])
-				k := h.Sum(nil)
-				insert := func(tx *bolt.Tx) error {
-					b := tx.Bucket([]byte("bench"))
-					return b.Put(k, []byte("filler"))
-				}
-				if err := db.Update(insert); err != nil {
-					b.Error(err)
-					return
-				}
-			}(uint32(round))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
-
-func BenchmarkDBBatchManual10x100(b *testing.B) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("bench"))
-		return err
-	}); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		start := make(chan struct{})
-		var wg sync.WaitGroup
-
-		for major := 0; major < 10; major++ {
-			wg.Add(1)
-			go func(id uint32) {
-				defer wg.Done()
-				<-start
-
-				insert100 := func(tx *bolt.Tx) error {
-					h := fnv.New32a()
-					buf := make([]byte, 4)
-					for minor := uint32(0); minor < 100; minor++ {
-						binary.LittleEndian.PutUint32(buf, uint32(id*100+minor))
-						h.Reset()
-						_, _ = h.Write(buf[:])
-						k := h.Sum(nil)
-						b := tx.Bucket([]byte("bench"))
-						if err := b.Put(k, []byte("filler")); err != nil {
-							return err
-						}
-					}
-					return nil
-				}
-				if err := db.Update(insert100); err != nil {
-					b.Fatal(err)
-				}
-			}(uint32(major))
-		}
-		close(start)
-		wg.Wait()
-	}
-
-	b.StopTimer()
-	validateBatchBench(b, db)
-}
-
-func validateBatchBench(b *testing.B, db *DB) {
-	var rollback = errors.New("sentinel error to cause rollback")
-	validate := func(tx *bolt.Tx) error {
-		bucket := tx.Bucket([]byte("bench"))
-		h := fnv.New32a()
-		buf := make([]byte, 4)
-		for id := uint32(0); id < 1000; id++ {
-			binary.LittleEndian.PutUint32(buf, id)
-			h.Reset()
-			_, _ = h.Write(buf[:])
-			k := h.Sum(nil)
-			v := bucket.Get(k)
-			if v == nil {
-				b.Errorf("not found id=%d key=%x", id, k)
-				continue
-			}
-			if g, e := v, []byte("filler"); !bytes.Equal(g, e) {
-				b.Errorf("bad value for id=%d key=%x: %s != %q", id, k, g, e)
-			}
-			if err := bucket.Delete(k); err != nil {
-				return err
-			}
-		}
-		// should be empty now
-		c := bucket.Cursor()
-		for k, v := c.First(); k != nil; k, v = c.Next() {
-			b.Errorf("unexpected key: %x = %q", k, v)
-		}
-		return rollback
-	}
-	if err := db.Update(validate); err != nil && err != rollback {
-		b.Error(err)
-	}
-}
-
-// DB is a test wrapper for bolt.DB.
-type DB struct {
-	*bolt.DB
-}
-
-// MustOpenDB returns a new, open DB at a temporary location.
-func MustOpenDB() *DB {
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		panic(err)
-	}
-	return &DB{db}
-}
-
-// Close closes the database and deletes the underlying file.
-func (db *DB) Close() error {
-	// Log statistics.
-	if *statsFlag {
-		db.PrintStats()
-	}
-
-	// Check database consistency after every test.
-	db.MustCheck()
-
-	// Close database and remove file.
-	defer os.Remove(db.Path())
-	return db.DB.Close()
-}
-
-// MustClose closes the database and deletes the underlying file. Panic on error.
-func (db *DB) MustClose() {
-	if err := db.Close(); err != nil {
-		panic(err)
-	}
-}
-
-// PrintStats prints the database stats
-func (db *DB) PrintStats() {
-	var stats = db.Stats()
-	fmt.Printf("[db] %-20s %-20s %-20s\n",
-		fmt.Sprintf("pg(%d/%d)", stats.TxStats.PageCount, stats.TxStats.PageAlloc),
-		fmt.Sprintf("cur(%d)", stats.TxStats.CursorCount),
-		fmt.Sprintf("node(%d/%d)", stats.TxStats.NodeCount, stats.TxStats.NodeDeref),
-	)
-	fmt.Printf("     %-20s %-20s %-20s\n",
-		fmt.Sprintf("rebal(%d/%v)", stats.TxStats.Rebalance, truncDuration(stats.TxStats.RebalanceTime)),
-		fmt.Sprintf("spill(%d/%v)", stats.TxStats.Spill, truncDuration(stats.TxStats.SpillTime)),
-		fmt.Sprintf("w(%d/%v)", stats.TxStats.Write, truncDuration(stats.TxStats.WriteTime)),
-	)
-}
-
-// MustCheck runs a consistency check on the database and panics if any errors are found.
-func (db *DB) MustCheck() {
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Collect all the errors.
-		var errors []error
-		for err := range tx.Check() {
-			errors = append(errors, err)
-			if len(errors) > 10 {
-				break
-			}
-		}
-
-		// If errors occurred, copy the DB and print the errors.
-		if len(errors) > 0 {
-			var path = tempfile()
-			if err := tx.CopyFile(path, 0600); err != nil {
-				panic(err)
-			}
-
-			// Print errors.
-			fmt.Print("\n\n")
-			fmt.Printf("consistency check failed (%d errors)\n", len(errors))
-			for _, err := range errors {
-				fmt.Println(err)
-			}
-			fmt.Println("")
-			fmt.Println("db saved to:")
-			fmt.Println(path)
-			fmt.Print("\n\n")
-			os.Exit(-1)
-		}
-
-		return nil
-	}); err != nil && err != bolt.ErrDatabaseNotOpen {
-		panic(err)
-	}
-}
-
-// CopyTempFile copies a database to a temporary file.
-func (db *DB) CopyTempFile() {
-	path := tempfile()
-	if err := db.View(func(tx *bolt.Tx) error {
-		return tx.CopyFile(path, 0600)
-	}); err != nil {
-		panic(err)
-	}
-	fmt.Println("db copied to: ", path)
-}
-
-// tempfile returns a temporary file path.
-func tempfile() string {
-	f, err := ioutil.TempFile("", "bolt-")
-	if err != nil {
-		panic(err)
-	}
-	if err := f.Close(); err != nil {
-		panic(err)
-	}
-	if err := os.Remove(f.Name()); err != nil {
-		panic(err)
-	}
-	return f.Name()
-}
-
-// mustContainKeys checks that a bucket contains a given set of keys.
-func mustContainKeys(b *bolt.Bucket, m map[string]string) {
-	found := make(map[string]string)
-	if err := b.ForEach(func(k, _ []byte) error {
-		found[string(k)] = ""
-		return nil
-	}); err != nil {
-		panic(err)
-	}
-
-	// Check for keys found in bucket that shouldn't be there.
-	var keys []string
-	for k, _ := range found {
-		if _, ok := m[string(k)]; !ok {
-			keys = append(keys, k)
-		}
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		panic(fmt.Sprintf("keys found(%d): %s", len(keys), strings.Join(keys, ",")))
-	}
-
-	// Check for keys not found in bucket that should be there.
-	for k, _ := range m {
-		if _, ok := found[string(k)]; !ok {
-			keys = append(keys, k)
-		}
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		panic(fmt.Sprintf("keys not found(%d): %s", len(keys), strings.Join(keys, ",")))
-	}
-}
-
-func trunc(b []byte, length int) []byte {
-	if length < len(b) {
-		return b[:length]
-	}
-	return b
-}
-
-func truncDuration(d time.Duration) string {
-	return regexp.MustCompile(`^(\d+)(\.\d+)`).ReplaceAllString(d.String(), "$1")
-}
-
-func fileSize(path string) int64 {
-	fi, err := os.Stat(path)
-	if err != nil {
-		return 0
-	}
-	return fi.Size()
-}
-
-func warn(v ...interface{})              { fmt.Fprintln(os.Stderr, v...) }
-func warnf(msg string, v ...interface{}) { fmt.Fprintf(os.Stderr, msg+"\n", v...) }
-
-// u64tob converts a uint64 into an 8-byte slice.
-func u64tob(v uint64) []byte {
-	b := make([]byte, 8)
-	binary.BigEndian.PutUint64(b, v)
-	return b
-}
-
-// btou64 converts an 8-byte slice into an uint64.
-func btou64(b []byte) uint64 { return binary.BigEndian.Uint64(b) }
diff --git a/installer/vendor/github.com/boltdb/bolt/freelist_test.go b/installer/vendor/github.com/boltdb/bolt/freelist_test.go
deleted file mode 100644
index 4e9b3a8dbf..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/freelist_test.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package bolt
-
-import (
-	"math/rand"
-	"reflect"
-	"sort"
-	"testing"
-	"unsafe"
-)
-
-// Ensure that a page is added to a transaction's freelist.
-func TestFreelist_free(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12})
-	if !reflect.DeepEqual([]pgid{12}, f.pending[100]) {
-		t.Fatalf("exp=%v; got=%v", []pgid{12}, f.pending[100])
-	}
-}
-
-// Ensure that a page and its overflow is added to a transaction's freelist.
-func TestFreelist_free_overflow(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12, overflow: 3})
-	if exp := []pgid{12, 13, 14, 15}; !reflect.DeepEqual(exp, f.pending[100]) {
-		t.Fatalf("exp=%v; got=%v", exp, f.pending[100])
-	}
-}
-
-// Ensure that a transaction's free pages can be released.
-func TestFreelist_release(t *testing.T) {
-	f := newFreelist()
-	f.free(100, &page{id: 12, overflow: 1})
-	f.free(100, &page{id: 9})
-	f.free(102, &page{id: 39})
-	f.release(100)
-	f.release(101)
-	if exp := []pgid{9, 12, 13}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-
-	f.release(102)
-	if exp := []pgid{9, 12, 13, 39}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can find contiguous blocks of pages.
-func TestFreelist_allocate(t *testing.T) {
-	f := &freelist{ids: []pgid{3, 4, 5, 6, 7, 9, 12, 13, 18}}
-	if id := int(f.allocate(3)); id != 3 {
-		t.Fatalf("exp=3; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 6 {
-		t.Fatalf("exp=6; got=%v", id)
-	}
-	if id := int(f.allocate(3)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if id := int(f.allocate(2)); id != 12 {
-		t.Fatalf("exp=12; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 7 {
-		t.Fatalf("exp=7; got=%v", id)
-	}
-	if id := int(f.allocate(0)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if id := int(f.allocate(0)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if exp := []pgid{9, 18}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-
-	if id := int(f.allocate(1)); id != 9 {
-		t.Fatalf("exp=9; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 18 {
-		t.Fatalf("exp=18; got=%v", id)
-	}
-	if id := int(f.allocate(1)); id != 0 {
-		t.Fatalf("exp=0; got=%v", id)
-	}
-	if exp := []pgid{}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can deserialize from a freelist page.
-func TestFreelist_read(t *testing.T) {
-	// Create a page.
-	var buf [4096]byte
-	page := (*page)(unsafe.Pointer(&buf[0]))
-	page.flags = freelistPageFlag
-	page.count = 2
-
-	// Insert 2 page ids.
-	ids := (*[3]pgid)(unsafe.Pointer(&page.ptr))
-	ids[0] = 23
-	ids[1] = 50
-
-	// Deserialize page into a freelist.
-	f := newFreelist()
-	f.read(page)
-
-	// Ensure that there are two page ids in the freelist.
-	if exp := []pgid{23, 50}; !reflect.DeepEqual(exp, f.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f.ids)
-	}
-}
-
-// Ensure that a freelist can serialize into a freelist page.
-func TestFreelist_write(t *testing.T) {
-	// Create a freelist and write it to a page.
-	var buf [4096]byte
-	f := &freelist{ids: []pgid{12, 39}, pending: make(map[txid][]pgid)}
-	f.pending[100] = []pgid{28, 11}
-	f.pending[101] = []pgid{3}
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	if err := f.write(p); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read the page back out.
-	f2 := newFreelist()
-	f2.read(p)
-
-	// Ensure that the freelist is correct.
-	// All pages should be present and in reverse order.
-	if exp := []pgid{3, 11, 12, 28, 39}; !reflect.DeepEqual(exp, f2.ids) {
-		t.Fatalf("exp=%v; got=%v", exp, f2.ids)
-	}
-}
-
-func Benchmark_FreelistRelease10K(b *testing.B)    { benchmark_FreelistRelease(b, 10000) }
-func Benchmark_FreelistRelease100K(b *testing.B)   { benchmark_FreelistRelease(b, 100000) }
-func Benchmark_FreelistRelease1000K(b *testing.B)  { benchmark_FreelistRelease(b, 1000000) }
-func Benchmark_FreelistRelease10000K(b *testing.B) { benchmark_FreelistRelease(b, 10000000) }
-
-func benchmark_FreelistRelease(b *testing.B, size int) {
-	ids := randomPgids(size)
-	pending := randomPgids(len(ids) / 400)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		f := &freelist{ids: ids, pending: map[txid][]pgid{1: pending}}
-		f.release(1)
-	}
-}
-
-func randomPgids(n int) []pgid {
-	rand.Seed(42)
-	pgids := make(pgids, n)
-	for i := range pgids {
-		pgids[i] = pgid(rand.Int63())
-	}
-	sort.Sort(pgids)
-	return pgids
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/node_test.go b/installer/vendor/github.com/boltdb/bolt/node_test.go
deleted file mode 100644
index fa5d10f999..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/node_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package bolt
-
-import (
-	"testing"
-	"unsafe"
-)
-
-// Ensure that a node can insert a key/value.
-func TestNode_put(t *testing.T) {
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{meta: &meta{pgid: 1}}}}
-	n.put([]byte("baz"), []byte("baz"), []byte("2"), 0, 0)
-	n.put([]byte("foo"), []byte("foo"), []byte("0"), 0, 0)
-	n.put([]byte("bar"), []byte("bar"), []byte("1"), 0, 0)
-	n.put([]byte("foo"), []byte("foo"), []byte("3"), 0, leafPageFlag)
-
-	if len(n.inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(n.inodes))
-	}
-	if k, v := n.inodes[0].key, n.inodes[0].value; string(k) != "bar" || string(v) != "1" {
-		t.Fatalf("exp=<bar,1>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[1].key, n.inodes[1].value; string(k) != "baz" || string(v) != "2" {
-		t.Fatalf("exp=<baz,2>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[2].key, n.inodes[2].value; string(k) != "foo" || string(v) != "3" {
-		t.Fatalf("exp=<foo,3>; got=<%s,%s>", k, v)
-	}
-	if n.inodes[2].flags != uint32(leafPageFlag) {
-		t.Fatalf("not a leaf: %d", n.inodes[2].flags)
-	}
-}
-
-// Ensure that a node can deserialize from a leaf page.
-func TestNode_read_LeafPage(t *testing.T) {
-	// Create a page.
-	var buf [4096]byte
-	page := (*page)(unsafe.Pointer(&buf[0]))
-	page.flags = leafPageFlag
-	page.count = 2
-
-	// Insert 2 elements at the beginning. sizeof(leafPageElement) == 16
-	nodes := (*[3]leafPageElement)(unsafe.Pointer(&page.ptr))
-	nodes[0] = leafPageElement{flags: 0, pos: 32, ksize: 3, vsize: 4}  // pos = sizeof(leafPageElement) * 2
-	nodes[1] = leafPageElement{flags: 0, pos: 23, ksize: 10, vsize: 3} // pos = sizeof(leafPageElement) + 3 + 4
-
-	// Write data for the nodes at the end.
-	data := (*[4096]byte)(unsafe.Pointer(&nodes[2]))
-	copy(data[:], []byte("barfooz"))
-	copy(data[7:], []byte("helloworldbye"))
-
-	// Deserialize page into a leaf.
-	n := &node{}
-	n.read(page)
-
-	// Check that there are two inodes with correct data.
-	if !n.isLeaf {
-		t.Fatal("expected leaf")
-	}
-	if len(n.inodes) != 2 {
-		t.Fatalf("exp=2; got=%d", len(n.inodes))
-	}
-	if k, v := n.inodes[0].key, n.inodes[0].value; string(k) != "bar" || string(v) != "fooz" {
-		t.Fatalf("exp=<bar,fooz>; got=<%s,%s>", k, v)
-	}
-	if k, v := n.inodes[1].key, n.inodes[1].value; string(k) != "helloworld" || string(v) != "bye" {
-		t.Fatalf("exp=<helloworld,bye>; got=<%s,%s>", k, v)
-	}
-}
-
-// Ensure that a node can serialize into a leaf page.
-func TestNode_write_LeafPage(t *testing.T) {
-	// Create a node.
-	n := &node{isLeaf: true, inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("susy"), []byte("susy"), []byte("que"), 0, 0)
-	n.put([]byte("ricki"), []byte("ricki"), []byte("lake"), 0, 0)
-	n.put([]byte("john"), []byte("john"), []byte("johnson"), 0, 0)
-
-	// Write it to a page.
-	var buf [4096]byte
-	p := (*page)(unsafe.Pointer(&buf[0]))
-	n.write(p)
-
-	// Read the page back in.
-	n2 := &node{}
-	n2.read(p)
-
-	// Check that the two pages are the same.
-	if len(n2.inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(n2.inodes))
-	}
-	if k, v := n2.inodes[0].key, n2.inodes[0].value; string(k) != "john" || string(v) != "johnson" {
-		t.Fatalf("exp=<john,johnson>; got=<%s,%s>", k, v)
-	}
-	if k, v := n2.inodes[1].key, n2.inodes[1].value; string(k) != "ricki" || string(v) != "lake" {
-		t.Fatalf("exp=<ricki,lake>; got=<%s,%s>", k, v)
-	}
-	if k, v := n2.inodes[2].key, n2.inodes[2].value; string(k) != "susy" || string(v) != "que" {
-		t.Fatalf("exp=<susy,que>; got=<%s,%s>", k, v)
-	}
-}
-
-// Ensure that a node can split into appropriate subgroups.
-func TestNode_split(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000003"), []byte("00000003"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000004"), []byte("00000004"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000005"), []byte("00000005"), []byte("0123456701234567"), 0, 0)
-
-	// Split between 2 & 3.
-	n.split(100)
-
-	var parent = n.parent
-	if len(parent.children) != 2 {
-		t.Fatalf("exp=2; got=%d", len(parent.children))
-	}
-	if len(parent.children[0].inodes) != 2 {
-		t.Fatalf("exp=2; got=%d", len(parent.children[0].inodes))
-	}
-	if len(parent.children[1].inodes) != 3 {
-		t.Fatalf("exp=3; got=%d", len(parent.children[1].inodes))
-	}
-}
-
-// Ensure that a page with the minimum number of inodes just returns a single node.
-func TestNode_split_MinKeys(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-
-	// Split.
-	n.split(20)
-	if n.parent != nil {
-		t.Fatalf("expected nil parent")
-	}
-}
-
-// Ensure that a node that has keys that all fit on a page just returns one leaf.
-func TestNode_split_SinglePage(t *testing.T) {
-	// Create a node.
-	n := &node{inodes: make(inodes, 0), bucket: &Bucket{tx: &Tx{db: &DB{}, meta: &meta{pgid: 1}}}}
-	n.put([]byte("00000001"), []byte("00000001"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000002"), []byte("00000002"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000003"), []byte("00000003"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000004"), []byte("00000004"), []byte("0123456701234567"), 0, 0)
-	n.put([]byte("00000005"), []byte("00000005"), []byte("0123456701234567"), 0, 0)
-
-	// Split.
-	n.split(4096)
-	if n.parent != nil {
-		t.Fatalf("expected nil parent")
-	}
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/page_test.go b/installer/vendor/github.com/boltdb/bolt/page_test.go
deleted file mode 100644
index 59f4a30ed8..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/page_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package bolt
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-	"testing/quick"
-)
-
-// Ensure that the page type can be returned in human readable format.
-func TestPage_typ(t *testing.T) {
-	if typ := (&page{flags: branchPageFlag}).typ(); typ != "branch" {
-		t.Fatalf("exp=branch; got=%v", typ)
-	}
-	if typ := (&page{flags: leafPageFlag}).typ(); typ != "leaf" {
-		t.Fatalf("exp=leaf; got=%v", typ)
-	}
-	if typ := (&page{flags: metaPageFlag}).typ(); typ != "meta" {
-		t.Fatalf("exp=meta; got=%v", typ)
-	}
-	if typ := (&page{flags: freelistPageFlag}).typ(); typ != "freelist" {
-		t.Fatalf("exp=freelist; got=%v", typ)
-	}
-	if typ := (&page{flags: 20000}).typ(); typ != "unknown<4e20>" {
-		t.Fatalf("exp=unknown<4e20>; got=%v", typ)
-	}
-}
-
-// Ensure that the hexdump debugging function doesn't blow up.
-func TestPage_dump(t *testing.T) {
-	(&page{id: 256}).hexdump(16)
-}
-
-func TestPgids_merge(t *testing.T) {
-	a := pgids{4, 5, 6, 10, 11, 12, 13, 27}
-	b := pgids{1, 3, 8, 9, 25, 30}
-	c := a.merge(b)
-	if !reflect.DeepEqual(c, pgids{1, 3, 4, 5, 6, 8, 9, 10, 11, 12, 13, 25, 27, 30}) {
-		t.Errorf("mismatch: %v", c)
-	}
-
-	a = pgids{4, 5, 6, 10, 11, 12, 13, 27, 35, 36}
-	b = pgids{8, 9, 25, 30}
-	c = a.merge(b)
-	if !reflect.DeepEqual(c, pgids{4, 5, 6, 8, 9, 10, 11, 12, 13, 25, 27, 30, 35, 36}) {
-		t.Errorf("mismatch: %v", c)
-	}
-}
-
-func TestPgids_merge_quick(t *testing.T) {
-	if err := quick.Check(func(a, b pgids) bool {
-		// Sort incoming lists.
-		sort.Sort(a)
-		sort.Sort(b)
-
-		// Merge the two lists together.
-		got := a.merge(b)
-
-		// The expected value should be the two lists combined and sorted.
-		exp := append(a, b...)
-		sort.Sort(exp)
-
-		if !reflect.DeepEqual(exp, got) {
-			t.Errorf("\nexp=%+v\ngot=%+v\n", exp, got)
-			return false
-		}
-
-		return true
-	}, nil); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/quick_test.go b/installer/vendor/github.com/boltdb/bolt/quick_test.go
deleted file mode 100644
index 9e27792e1a..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/quick_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"reflect"
-	"testing/quick"
-	"time"
-)
-
-// testing/quick defaults to 5 iterations and a random seed.
-// You can override these settings from the command line:
-//
-//   -quick.count     The number of iterations to perform.
-//   -quick.seed      The seed to use for randomizing.
-//   -quick.maxitems  The maximum number of items to insert into a DB.
-//   -quick.maxksize  The maximum size of a key.
-//   -quick.maxvsize  The maximum size of a value.
-//
-
-var qcount, qseed, qmaxitems, qmaxksize, qmaxvsize int
-
-func init() {
-	flag.IntVar(&qcount, "quick.count", 5, "")
-	flag.IntVar(&qseed, "quick.seed", int(time.Now().UnixNano())%100000, "")
-	flag.IntVar(&qmaxitems, "quick.maxitems", 1000, "")
-	flag.IntVar(&qmaxksize, "quick.maxksize", 1024, "")
-	flag.IntVar(&qmaxvsize, "quick.maxvsize", 1024, "")
-	flag.Parse()
-	fmt.Fprintln(os.Stderr, "seed:", qseed)
-	fmt.Fprintf(os.Stderr, "quick settings: count=%v, items=%v, ksize=%v, vsize=%v\n", qcount, qmaxitems, qmaxksize, qmaxvsize)
-}
-
-func qconfig() *quick.Config {
-	return &quick.Config{
-		MaxCount: qcount,
-		Rand:     rand.New(rand.NewSource(int64(qseed))),
-	}
-}
-
-type testdata []testdataitem
-
-func (t testdata) Len() int           { return len(t) }
-func (t testdata) Swap(i, j int)      { t[i], t[j] = t[j], t[i] }
-func (t testdata) Less(i, j int) bool { return bytes.Compare(t[i].Key, t[j].Key) == -1 }
-
-func (t testdata) Generate(rand *rand.Rand, size int) reflect.Value {
-	n := rand.Intn(qmaxitems-1) + 1
-	items := make(testdata, n)
-	used := make(map[string]bool)
-	for i := 0; i < n; i++ {
-		item := &items[i]
-		// Ensure that keys are unique by looping until we find one that we have not already used.
-		for {
-			item.Key = randByteSlice(rand, 1, qmaxksize)
-			if !used[string(item.Key)] {
-				used[string(item.Key)] = true
-				break
-			}
-		}
-		item.Value = randByteSlice(rand, 0, qmaxvsize)
-	}
-	return reflect.ValueOf(items)
-}
-
-type revtestdata []testdataitem
-
-func (t revtestdata) Len() int           { return len(t) }
-func (t revtestdata) Swap(i, j int)      { t[i], t[j] = t[j], t[i] }
-func (t revtestdata) Less(i, j int) bool { return bytes.Compare(t[i].Key, t[j].Key) == 1 }
-
-type testdataitem struct {
-	Key   []byte
-	Value []byte
-}
-
-func randByteSlice(rand *rand.Rand, minSize, maxSize int) []byte {
-	n := rand.Intn(maxSize-minSize) + minSize
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/simulation_test.go b/installer/vendor/github.com/boltdb/bolt/simulation_test.go
deleted file mode 100644
index 3831016557..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/simulation_test.go
+++ /dev/null
@@ -1,329 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"fmt"
-	"math/rand"
-	"sync"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-func TestSimulate_1op_1p(t *testing.T)     { testSimulate(t, 1, 1) }
-func TestSimulate_10op_1p(t *testing.T)    { testSimulate(t, 10, 1) }
-func TestSimulate_100op_1p(t *testing.T)   { testSimulate(t, 100, 1) }
-func TestSimulate_1000op_1p(t *testing.T)  { testSimulate(t, 1000, 1) }
-func TestSimulate_10000op_1p(t *testing.T) { testSimulate(t, 10000, 1) }
-
-func TestSimulate_10op_10p(t *testing.T)    { testSimulate(t, 10, 10) }
-func TestSimulate_100op_10p(t *testing.T)   { testSimulate(t, 100, 10) }
-func TestSimulate_1000op_10p(t *testing.T)  { testSimulate(t, 1000, 10) }
-func TestSimulate_10000op_10p(t *testing.T) { testSimulate(t, 10000, 10) }
-
-func TestSimulate_100op_100p(t *testing.T)   { testSimulate(t, 100, 100) }
-func TestSimulate_1000op_100p(t *testing.T)  { testSimulate(t, 1000, 100) }
-func TestSimulate_10000op_100p(t *testing.T) { testSimulate(t, 10000, 100) }
-
-func TestSimulate_10000op_1000p(t *testing.T) { testSimulate(t, 10000, 1000) }
-
-// Randomly generate operations on a given database with multiple clients to ensure consistency and thread safety.
-func testSimulate(t *testing.T, threadCount, parallelism int) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode.")
-	}
-
-	rand.Seed(int64(qseed))
-
-	// A list of operations that readers and writers can perform.
-	var readerHandlers = []simulateHandler{simulateGetHandler}
-	var writerHandlers = []simulateHandler{simulateGetHandler, simulatePutHandler}
-
-	var versions = make(map[int]*QuickDB)
-	versions[1] = NewQuickDB()
-
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var mutex sync.Mutex
-
-	// Run n threads in parallel, each with their own operation.
-	var wg sync.WaitGroup
-	var threads = make(chan bool, parallelism)
-	var i int
-	for {
-		threads <- true
-		wg.Add(1)
-		writable := ((rand.Int() % 100) < 20) // 20% writers
-
-		// Choose an operation to execute.
-		var handler simulateHandler
-		if writable {
-			handler = writerHandlers[rand.Intn(len(writerHandlers))]
-		} else {
-			handler = readerHandlers[rand.Intn(len(readerHandlers))]
-		}
-
-		// Execute a thread for the given operation.
-		go func(writable bool, handler simulateHandler) {
-			defer wg.Done()
-
-			// Start transaction.
-			tx, err := db.Begin(writable)
-			if err != nil {
-				t.Fatal("tx begin: ", err)
-			}
-
-			// Obtain current state of the dataset.
-			mutex.Lock()
-			var qdb = versions[tx.ID()]
-			if writable {
-				qdb = versions[tx.ID()-1].Copy()
-			}
-			mutex.Unlock()
-
-			// Make sure we commit/rollback the tx at the end and update the state.
-			if writable {
-				defer func() {
-					mutex.Lock()
-					versions[tx.ID()] = qdb
-					mutex.Unlock()
-
-					if err := tx.Commit(); err != nil {
-						t.Fatal(err)
-					}
-				}()
-			} else {
-				defer func() { _ = tx.Rollback() }()
-			}
-
-			// Ignore operation if we don't have data yet.
-			if qdb == nil {
-				return
-			}
-
-			// Execute handler.
-			handler(tx, qdb)
-
-			// Release a thread back to the scheduling loop.
-			<-threads
-		}(writable, handler)
-
-		i++
-		if i > threadCount {
-			break
-		}
-	}
-
-	// Wait until all threads are done.
-	wg.Wait()
-}
-
-type simulateHandler func(tx *bolt.Tx, qdb *QuickDB)
-
-// Retrieves a key from the database and verifies that it is what is expected.
-func simulateGetHandler(tx *bolt.Tx, qdb *QuickDB) {
-	// Randomly retrieve an existing exist.
-	keys := qdb.Rand()
-	if len(keys) == 0 {
-		return
-	}
-
-	// Retrieve root bucket.
-	b := tx.Bucket(keys[0])
-	if b == nil {
-		panic(fmt.Sprintf("bucket[0] expected: %08x\n", trunc(keys[0], 4)))
-	}
-
-	// Drill into nested buckets.
-	for _, key := range keys[1 : len(keys)-1] {
-		b = b.Bucket(key)
-		if b == nil {
-			panic(fmt.Sprintf("bucket[n] expected: %v -> %v\n", keys, key))
-		}
-	}
-
-	// Verify key/value on the final bucket.
-	expected := qdb.Get(keys)
-	actual := b.Get(keys[len(keys)-1])
-	if !bytes.Equal(actual, expected) {
-		fmt.Println("=== EXPECTED ===")
-		fmt.Println(expected)
-		fmt.Println("=== ACTUAL ===")
-		fmt.Println(actual)
-		fmt.Println("=== END ===")
-		panic("value mismatch")
-	}
-}
-
-// Inserts a key into the database.
-func simulatePutHandler(tx *bolt.Tx, qdb *QuickDB) {
-	var err error
-	keys, value := randKeys(), randValue()
-
-	// Retrieve root bucket.
-	b := tx.Bucket(keys[0])
-	if b == nil {
-		b, err = tx.CreateBucket(keys[0])
-		if err != nil {
-			panic("create bucket: " + err.Error())
-		}
-	}
-
-	// Create nested buckets, if necessary.
-	for _, key := range keys[1 : len(keys)-1] {
-		child := b.Bucket(key)
-		if child != nil {
-			b = child
-		} else {
-			b, err = b.CreateBucket(key)
-			if err != nil {
-				panic("create bucket: " + err.Error())
-			}
-		}
-	}
-
-	// Insert into database.
-	if err := b.Put(keys[len(keys)-1], value); err != nil {
-		panic("put: " + err.Error())
-	}
-
-	// Insert into in-memory database.
-	qdb.Put(keys, value)
-}
-
-// QuickDB is an in-memory database that replicates the functionality of the
-// Bolt DB type except that it is entirely in-memory. It is meant for testing
-// that the Bolt database is consistent.
-type QuickDB struct {
-	sync.RWMutex
-	m map[string]interface{}
-}
-
-// NewQuickDB returns an instance of QuickDB.
-func NewQuickDB() *QuickDB {
-	return &QuickDB{m: make(map[string]interface{})}
-}
-
-// Get retrieves the value at a key path.
-func (db *QuickDB) Get(keys [][]byte) []byte {
-	db.RLock()
-	defer db.RUnlock()
-
-	m := db.m
-	for _, key := range keys[:len(keys)-1] {
-		value := m[string(key)]
-		if value == nil {
-			return nil
-		}
-		switch value := value.(type) {
-		case map[string]interface{}:
-			m = value
-		case []byte:
-			return nil
-		}
-	}
-
-	// Only return if it's a simple value.
-	if value, ok := m[string(keys[len(keys)-1])].([]byte); ok {
-		return value
-	}
-	return nil
-}
-
-// Put inserts a value into a key path.
-func (db *QuickDB) Put(keys [][]byte, value []byte) {
-	db.Lock()
-	defer db.Unlock()
-
-	// Build buckets all the way down the key path.
-	m := db.m
-	for _, key := range keys[:len(keys)-1] {
-		if _, ok := m[string(key)].([]byte); ok {
-			return // Keypath intersects with a simple value. Do nothing.
-		}
-
-		if m[string(key)] == nil {
-			m[string(key)] = make(map[string]interface{})
-		}
-		m = m[string(key)].(map[string]interface{})
-	}
-
-	// Insert value into the last key.
-	m[string(keys[len(keys)-1])] = value
-}
-
-// Rand returns a random key path that points to a simple value.
-func (db *QuickDB) Rand() [][]byte {
-	db.RLock()
-	defer db.RUnlock()
-	if len(db.m) == 0 {
-		return nil
-	}
-	var keys [][]byte
-	db.rand(db.m, &keys)
-	return keys
-}
-
-func (db *QuickDB) rand(m map[string]interface{}, keys *[][]byte) {
-	i, index := 0, rand.Intn(len(m))
-	for k, v := range m {
-		if i == index {
-			*keys = append(*keys, []byte(k))
-			if v, ok := v.(map[string]interface{}); ok {
-				db.rand(v, keys)
-			}
-			return
-		}
-		i++
-	}
-	panic("quickdb rand: out-of-range")
-}
-
-// Copy copies the entire database.
-func (db *QuickDB) Copy() *QuickDB {
-	db.RLock()
-	defer db.RUnlock()
-	return &QuickDB{m: db.copy(db.m)}
-}
-
-func (db *QuickDB) copy(m map[string]interface{}) map[string]interface{} {
-	clone := make(map[string]interface{}, len(m))
-	for k, v := range m {
-		switch v := v.(type) {
-		case map[string]interface{}:
-			clone[k] = db.copy(v)
-		default:
-			clone[k] = v
-		}
-	}
-	return clone
-}
-
-func randKey() []byte {
-	var min, max = 1, 1024
-	n := rand.Intn(max-min) + min
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
-
-func randKeys() [][]byte {
-	var keys [][]byte
-	var count = rand.Intn(2) + 2
-	for i := 0; i < count; i++ {
-		keys = append(keys, randKey())
-	}
-	return keys
-}
-
-func randValue() []byte {
-	n := rand.Intn(8192)
-	b := make([]byte, n)
-	for i := 0; i < n; i++ {
-		b[i] = byte(rand.Intn(255))
-	}
-	return b
-}
diff --git a/installer/vendor/github.com/boltdb/bolt/tx_test.go b/installer/vendor/github.com/boltdb/bolt/tx_test.go
deleted file mode 100644
index 2201e79288..0000000000
--- a/installer/vendor/github.com/boltdb/bolt/tx_test.go
+++ /dev/null
@@ -1,716 +0,0 @@
-package bolt_test
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-// Ensure that committing a closed transaction returns an error.
-func TestTx_Commit_ErrTxClosed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := tx.CreateBucket([]byte("foo")); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Commit(); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that rolling back a closed transaction returns an error.
-func TestTx_Rollback_ErrTxClosed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.Rollback(); err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Rollback(); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that committing a read-only transaction returns an error.
-func TestTx_Commit_ErrTxNotWritable(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Commit(); err != bolt.ErrTxNotWritable {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a transaction can retrieve a cursor on the root bucket.
-func TestTx_Cursor(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err := tx.CreateBucket([]byte("woojits")); err != nil {
-			t.Fatal(err)
-		}
-
-		c := tx.Cursor()
-		if k, v := c.First(); !bytes.Equal(k, []byte("widgets")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("unexpected value: %v", v)
-		}
-
-		if k, v := c.Next(); !bytes.Equal(k, []byte("woojits")) {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("unexpected value: %v", v)
-		}
-
-		if k, v := c.Next(); k != nil {
-			t.Fatalf("unexpected key: %v", k)
-		} else if v != nil {
-			t.Fatalf("unexpected value: %v", k)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating a bucket with a read-only transaction returns an error.
-func TestTx_CreateBucket_ErrTxNotWritable(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.View(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("foo"))
-		if err != bolt.ErrTxNotWritable {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that creating a bucket on a closed transaction returns an error.
-func TestTx_CreateBucket_ErrTxClosed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := tx.CreateBucket([]byte("foo")); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that a Tx can retrieve a bucket.
-func TestTx_Bucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		if tx.Bucket([]byte("widgets")) == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a Tx retrieving a non-existent key returns nil.
-func TestTx_Get_NotFound(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if b.Get([]byte("no_such_key")) != nil {
-			t.Fatal("expected nil value")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can be created and retrieved.
-func TestTx_CreateBucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Create a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		} else if b == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read the bucket through a separate transaction.
-	if err := db.View(func(tx *bolt.Tx) error {
-		if tx.Bucket([]byte("widgets")) == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can be created if it doesn't already exist.
-func TestTx_CreateBucketIfNotExists(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create bucket.
-		if b, err := tx.CreateBucketIfNotExists([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		} else if b == nil {
-			t.Fatal("expected bucket")
-		}
-
-		// Create bucket again.
-		if b, err := tx.CreateBucketIfNotExists([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		} else if b == nil {
-			t.Fatal("expected bucket")
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Read the bucket through a separate transaction.
-	if err := db.View(func(tx *bolt.Tx) error {
-		if tx.Bucket([]byte("widgets")) == nil {
-			t.Fatal("expected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure transaction returns an error if creating an unnamed bucket.
-func TestTx_CreateBucketIfNotExists_ErrBucketNameRequired(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucketIfNotExists([]byte{}); err != bolt.ErrBucketNameRequired {
-			t.Fatalf("unexpected error: %s", err)
-		}
-
-		if _, err := tx.CreateBucketIfNotExists(nil); err != bolt.ErrBucketNameRequired {
-			t.Fatalf("unexpected error: %s", err)
-		}
-
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket cannot be created twice.
-func TestTx_CreateBucket_ErrBucketExists(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Create a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create the same bucket again.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket([]byte("widgets")); err != bolt.ErrBucketExists {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket is created with a non-blank name.
-func TestTx_CreateBucket_ErrBucketNameRequired(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if _, err := tx.CreateBucket(nil); err != bolt.ErrBucketNameRequired {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that a bucket can be deleted.
-func TestTx_DeleteBucket(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	// Create a bucket and add a value.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	// Delete the bucket and make sure we can't get the value.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if err := tx.DeleteBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		if tx.Bucket([]byte("widgets")) != nil {
-			t.Fatal("unexpected bucket")
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Update(func(tx *bolt.Tx) error {
-		// Create the bucket again and make sure there's not a phantom value.
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if v := b.Get([]byte("foo")); v != nil {
-			t.Fatalf("unexpected phantom value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that deleting a bucket on a closed transaction returns an error.
-func TestTx_DeleteBucket_ErrTxClosed(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	tx, err := db.Begin(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.Commit(); err != nil {
-		t.Fatal(err)
-	}
-	if err := tx.DeleteBucket([]byte("foo")); err != bolt.ErrTxClosed {
-		t.Fatalf("unexpected error: %s", err)
-	}
-}
-
-// Ensure that deleting a bucket with a read-only transaction returns an error.
-func TestTx_DeleteBucket_ReadOnly(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.View(func(tx *bolt.Tx) error {
-		if err := tx.DeleteBucket([]byte("foo")); err != bolt.ErrTxNotWritable {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that nothing happens when deleting a bucket that doesn't exist.
-func TestTx_DeleteBucket_NotFound(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		if err := tx.DeleteBucket([]byte("widgets")); err != bolt.ErrBucketNotFound {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that no error is returned when a tx.ForEach function does not return
-// an error.
-func TestTx_ForEach_NoError(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-
-		if err := tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return nil
-		}); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that an error is returned when a tx.ForEach function returns an error.
-func TestTx_ForEach_WithError(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-
-		marker := errors.New("marker")
-		if err := tx.ForEach(func(name []byte, b *bolt.Bucket) error {
-			return marker
-		}); err != marker {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Ensure that Tx commit handlers are called after a transaction successfully commits.
-func TestTx_OnCommit(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var x int
-	if err := db.Update(func(tx *bolt.Tx) error {
-		tx.OnCommit(func() { x += 1 })
-		tx.OnCommit(func() { x += 2 })
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	} else if x != 3 {
-		t.Fatalf("unexpected x: %d", x)
-	}
-}
-
-// Ensure that Tx commit handlers are NOT called after a transaction rolls back.
-func TestTx_OnCommit_Rollback(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	var x int
-	if err := db.Update(func(tx *bolt.Tx) error {
-		tx.OnCommit(func() { x += 1 })
-		tx.OnCommit(func() { x += 2 })
-		if _, err := tx.CreateBucket([]byte("widgets")); err != nil {
-			t.Fatal(err)
-		}
-		return errors.New("rollback this commit")
-	}); err == nil || err.Error() != "rollback this commit" {
-		t.Fatalf("unexpected error: %s", err)
-	} else if x != 0 {
-		t.Fatalf("unexpected x: %d", x)
-	}
-}
-
-// Ensure that the database can be copied to a file path.
-func TestTx_CopyFile(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-
-	path := tempfile()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		return tx.CopyFile(path, 0600)
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	db2, err := bolt.Open(path, 0600, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db2.View(func(tx *bolt.Tx) error {
-		if v := tx.Bucket([]byte("widgets")).Get([]byte("foo")); !bytes.Equal(v, []byte("bar")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		if v := tx.Bucket([]byte("widgets")).Get([]byte("baz")); !bytes.Equal(v, []byte("bat")) {
-			t.Fatalf("unexpected value: %v", v)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db2.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-type failWriterError struct{}
-
-func (failWriterError) Error() string {
-	return "error injected for tests"
-}
-
-type failWriter struct {
-	// fail after this many bytes
-	After int
-}
-
-func (f *failWriter) Write(p []byte) (n int, err error) {
-	n = len(p)
-	if n > f.After {
-		n = f.After
-		err = failWriterError{}
-	}
-	f.After -= n
-	return n, err
-}
-
-// Ensure that Copy handles write errors right.
-func TestTx_CopyFile_Error_Meta(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		return tx.Copy(&failWriter{})
-	}); err == nil || err.Error() != "meta 0 copy: error injected for tests" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-// Ensure that Copy handles write errors right.
-func TestTx_CopyFile_Error_Normal(t *testing.T) {
-	db := MustOpenDB()
-	defer db.MustClose()
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			t.Fatal(err)
-		}
-		if err := b.Put([]byte("baz"), []byte("bat")); err != nil {
-			t.Fatal(err)
-		}
-		return nil
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.View(func(tx *bolt.Tx) error {
-		return tx.Copy(&failWriter{3 * db.Info().PageSize})
-	}); err == nil || err.Error() != "error injected for tests" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func ExampleTx_Rollback() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Create a bucket.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		_, err := tx.CreateBucket([]byte("widgets"))
-		return err
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Set a value for a key.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		return tx.Bucket([]byte("widgets")).Put([]byte("foo"), []byte("bar"))
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Update the key but rollback the transaction so it never saves.
-	tx, err := db.Begin(true)
-	if err != nil {
-		log.Fatal(err)
-	}
-	b := tx.Bucket([]byte("widgets"))
-	if err := b.Put([]byte("foo"), []byte("baz")); err != nil {
-		log.Fatal(err)
-	}
-	if err := tx.Rollback(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Ensure that our original value is still set.
-	if err := db.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value for 'foo' is still: %s\n", value)
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// The value for 'foo' is still: bar
-}
-
-func ExampleTx_CopyFile() {
-	// Open the database.
-	db, err := bolt.Open(tempfile(), 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(db.Path())
-
-	// Create a bucket and a key.
-	if err := db.Update(func(tx *bolt.Tx) error {
-		b, err := tx.CreateBucket([]byte("widgets"))
-		if err != nil {
-			return err
-		}
-		if err := b.Put([]byte("foo"), []byte("bar")); err != nil {
-			return err
-		}
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Copy the database to another file.
-	toFile := tempfile()
-	if err := db.View(func(tx *bolt.Tx) error {
-		return tx.CopyFile(toFile, 0666)
-	}); err != nil {
-		log.Fatal(err)
-	}
-	defer os.Remove(toFile)
-
-	// Open the cloned database.
-	db2, err := bolt.Open(toFile, 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Ensure that the key exists in the copy.
-	if err := db2.View(func(tx *bolt.Tx) error {
-		value := tx.Bucket([]byte("widgets")).Get([]byte("foo"))
-		fmt.Printf("The value for 'foo' in the clone is: %s\n", value)
-		return nil
-	}); err != nil {
-		log.Fatal(err)
-	}
-
-	// Close database to release file lock.
-	if err := db.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	if err := db2.Close(); err != nil {
-		log.Fatal(err)
-	}
-
-	// Output:
-	// The value for 'foo' in the clone is: bar
-}
diff --git a/installer/vendor/github.com/cenkalti/backoff/LICENSE b/installer/vendor/github.com/cenkalti/backoff/LICENSE
new file mode 100644
index 0000000000..89b8179965
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/LICENSE
@@ -0,0 +1,20 @@
+The MIT License (MIT)
+
+Copyright (c) 2014 Cenk Altı
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/installer/vendor/github.com/cenkalti/backoff/backoff.go b/installer/vendor/github.com/cenkalti/backoff/backoff.go
new file mode 100644
index 0000000000..3676ee405d
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/backoff.go
@@ -0,0 +1,66 @@
+// Package backoff implements backoff algorithms for retrying operations.
+//
+// Use Retry function for retrying operations that may fail.
+// If Retry does not meet your needs,
+// copy/paste the function into your project and modify as you wish.
+//
+// There is also Ticker type similar to time.Ticker.
+// You can use it if you need to work with channels.
+//
+// See Examples section below for usage examples.
+package backoff
+
+import "time"
+
+// BackOff is a backoff policy for retrying an operation.
+type BackOff interface {
+	// NextBackOff returns the duration to wait before retrying the operation,
+	// or backoff. Stop to indicate that no more retries should be made.
+	//
+	// Example usage:
+	//
+	// 	duration := backoff.NextBackOff();
+	// 	if (duration == backoff.Stop) {
+	// 		// Do not retry operation.
+	// 	} else {
+	// 		// Sleep for duration and retry operation.
+	// 	}
+	//
+	NextBackOff() time.Duration
+
+	// Reset to initial state.
+	Reset()
+}
+
+// Stop indicates that no more retries should be made for use in NextBackOff().
+const Stop time.Duration = -1
+
+// ZeroBackOff is a fixed backoff policy whose backoff time is always zero,
+// meaning that the operation is retried immediately without waiting, indefinitely.
+type ZeroBackOff struct{}
+
+func (b *ZeroBackOff) Reset() {}
+
+func (b *ZeroBackOff) NextBackOff() time.Duration { return 0 }
+
+// StopBackOff is a fixed backoff policy that always returns backoff.Stop for
+// NextBackOff(), meaning that the operation should never be retried.
+type StopBackOff struct{}
+
+func (b *StopBackOff) Reset() {}
+
+func (b *StopBackOff) NextBackOff() time.Duration { return Stop }
+
+// ConstantBackOff is a backoff policy that always returns the same backoff delay.
+// This is in contrast to an exponential backoff policy,
+// which returns a delay that grows longer as you call NextBackOff() over and over again.
+type ConstantBackOff struct {
+	Interval time.Duration
+}
+
+func (b *ConstantBackOff) Reset()                     {}
+func (b *ConstantBackOff) NextBackOff() time.Duration { return b.Interval }
+
+func NewConstantBackOff(d time.Duration) *ConstantBackOff {
+	return &ConstantBackOff{Interval: d}
+}
diff --git a/installer/vendor/github.com/cenkalti/backoff/context.go b/installer/vendor/github.com/cenkalti/backoff/context.go
new file mode 100644
index 0000000000..5d15709254
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/context.go
@@ -0,0 +1,60 @@
+package backoff
+
+import (
+	"time"
+
+	"golang.org/x/net/context"
+)
+
+// BackOffContext is a backoff policy that stops retrying after the context
+// is canceled.
+type BackOffContext interface {
+	BackOff
+	Context() context.Context
+}
+
+type backOffContext struct {
+	BackOff
+	ctx context.Context
+}
+
+// WithContext returns a BackOffContext with context ctx
+//
+// ctx must not be nil
+func WithContext(b BackOff, ctx context.Context) BackOffContext {
+	if ctx == nil {
+		panic("nil context")
+	}
+
+	if b, ok := b.(*backOffContext); ok {
+		return &backOffContext{
+			BackOff: b.BackOff,
+			ctx:     ctx,
+		}
+	}
+
+	return &backOffContext{
+		BackOff: b,
+		ctx:     ctx,
+	}
+}
+
+func ensureContext(b BackOff) BackOffContext {
+	if cb, ok := b.(BackOffContext); ok {
+		return cb
+	}
+	return WithContext(b, context.Background())
+}
+
+func (b *backOffContext) Context() context.Context {
+	return b.ctx
+}
+
+func (b *backOffContext) NextBackOff() time.Duration {
+	select {
+	case <-b.Context().Done():
+		return Stop
+	default:
+		return b.BackOff.NextBackOff()
+	}
+}
diff --git a/installer/vendor/github.com/cenkalti/backoff/exponential.go b/installer/vendor/github.com/cenkalti/backoff/exponential.go
new file mode 100644
index 0000000000..d9de15a177
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/exponential.go
@@ -0,0 +1,158 @@
+package backoff
+
+import (
+	"math/rand"
+	"time"
+)
+
+/*
+ExponentialBackOff is a backoff implementation that increases the backoff
+period for each retry attempt using a randomization function that grows exponentially.
+
+NextBackOff() is calculated using the following formula:
+
+ randomized interval =
+     RetryInterval * (random value in range [1 - RandomizationFactor, 1 + RandomizationFactor])
+
+In other words NextBackOff() will range between the randomization factor
+percentage below and above the retry interval.
+
+For example, given the following parameters:
+
+ RetryInterval = 2
+ RandomizationFactor = 0.5
+ Multiplier = 2
+
+the actual backoff period used in the next retry attempt will range between 1 and 3 seconds,
+multiplied by the exponential, that is, between 2 and 6 seconds.
+
+Note: MaxInterval caps the RetryInterval and not the randomized interval.
+
+If the time elapsed since an ExponentialBackOff instance is created goes past the
+MaxElapsedTime, then the method NextBackOff() starts returning backoff.Stop.
+
+The elapsed time can be reset by calling Reset().
+
+Example: Given the following default arguments, for 10 tries the sequence will be,
+and assuming we go over the MaxElapsedTime on the 10th try:
+
+ Request #  RetryInterval (seconds)  Randomized Interval (seconds)
+
+  1          0.5                     [0.25,   0.75]
+  2          0.75                    [0.375,  1.125]
+  3          1.125                   [0.562,  1.687]
+  4          1.687                   [0.8435, 2.53]
+  5          2.53                    [1.265,  3.795]
+  6          3.795                   [1.897,  5.692]
+  7          5.692                   [2.846,  8.538]
+  8          8.538                   [4.269, 12.807]
+  9         12.807                   [6.403, 19.210]
+ 10         19.210                   backoff.Stop
+
+Note: Implementation is not thread-safe.
+*/
+type ExponentialBackOff struct {
+	InitialInterval     time.Duration
+	RandomizationFactor float64
+	Multiplier          float64
+	MaxInterval         time.Duration
+	// After MaxElapsedTime the ExponentialBackOff stops.
+	// It never stops if MaxElapsedTime == 0.
+	MaxElapsedTime time.Duration
+	Clock          Clock
+
+	currentInterval time.Duration
+	startTime       time.Time
+	random          *rand.Rand
+}
+
+// Clock is an interface that returns current time for BackOff.
+type Clock interface {
+	Now() time.Time
+}
+
+// Default values for ExponentialBackOff.
+const (
+	DefaultInitialInterval     = 500 * time.Millisecond
+	DefaultRandomizationFactor = 0.5
+	DefaultMultiplier          = 1.5
+	DefaultMaxInterval         = 60 * time.Second
+	DefaultMaxElapsedTime      = 15 * time.Minute
+)
+
+// NewExponentialBackOff creates an instance of ExponentialBackOff using default values.
+func NewExponentialBackOff() *ExponentialBackOff {
+	b := &ExponentialBackOff{
+		InitialInterval:     DefaultInitialInterval,
+		RandomizationFactor: DefaultRandomizationFactor,
+		Multiplier:          DefaultMultiplier,
+		MaxInterval:         DefaultMaxInterval,
+		MaxElapsedTime:      DefaultMaxElapsedTime,
+		Clock:               SystemClock,
+		random:              rand.New(rand.NewSource(time.Now().UnixNano())),
+	}
+	b.Reset()
+	return b
+}
+
+type systemClock struct{}
+
+func (t systemClock) Now() time.Time {
+	return time.Now()
+}
+
+// SystemClock implements Clock interface that uses time.Now().
+var SystemClock = systemClock{}
+
+// Reset the interval back to the initial retry interval and restarts the timer.
+func (b *ExponentialBackOff) Reset() {
+	b.currentInterval = b.InitialInterval
+	b.startTime = b.Clock.Now()
+}
+
+// NextBackOff calculates the next backoff interval using the formula:
+// 	Randomized interval = RetryInterval +/- (RandomizationFactor * RetryInterval)
+func (b *ExponentialBackOff) NextBackOff() time.Duration {
+	// Make sure we have not gone over the maximum elapsed time.
+	if b.MaxElapsedTime != 0 && b.GetElapsedTime() > b.MaxElapsedTime {
+		return Stop
+	}
+	defer b.incrementCurrentInterval()
+	if b.random == nil {
+		b.random = rand.New(rand.NewSource(time.Now().UnixNano()))
+	}
+	return getRandomValueFromInterval(b.RandomizationFactor, b.random.Float64(), b.currentInterval)
+}
+
+// GetElapsedTime returns the elapsed time since an ExponentialBackOff instance
+// is created and is reset when Reset() is called.
+//
+// The elapsed time is computed using time.Now().UnixNano(). It is
+// safe to call even while the backoff policy is used by a running
+// ticker.
+func (b *ExponentialBackOff) GetElapsedTime() time.Duration {
+	return b.Clock.Now().Sub(b.startTime)
+}
+
+// Increments the current interval by multiplying it with the multiplier.
+func (b *ExponentialBackOff) incrementCurrentInterval() {
+	// Check for overflow, if overflow is detected set the current interval to the max interval.
+	if float64(b.currentInterval) >= float64(b.MaxInterval)/b.Multiplier {
+		b.currentInterval = b.MaxInterval
+	} else {
+		b.currentInterval = time.Duration(float64(b.currentInterval) * b.Multiplier)
+	}
+}
+
+// Returns a random value from the following interval:
+// 	[randomizationFactor * currentInterval, randomizationFactor * currentInterval].
+func getRandomValueFromInterval(randomizationFactor, random float64, currentInterval time.Duration) time.Duration {
+	var delta = randomizationFactor * float64(currentInterval)
+	var minInterval = float64(currentInterval) - delta
+	var maxInterval = float64(currentInterval) + delta
+
+	// Get a random value from the range [minInterval, maxInterval].
+	// The formula used below has a +1 because if the minInterval is 1 and the maxInterval is 3 then
+	// we want a 33% chance for selecting either 1, 2 or 3.
+	return time.Duration(minInterval + (random * (maxInterval - minInterval + 1)))
+}
diff --git a/installer/vendor/github.com/cenkalti/backoff/retry.go b/installer/vendor/github.com/cenkalti/backoff/retry.go
new file mode 100644
index 0000000000..5dbd825b5c
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/retry.go
@@ -0,0 +1,78 @@
+package backoff
+
+import "time"
+
+// An Operation is executing by Retry() or RetryNotify().
+// The operation will be retried using a backoff policy if it returns an error.
+type Operation func() error
+
+// Notify is a notify-on-error function. It receives an operation error and
+// backoff delay if the operation failed (with an error).
+//
+// NOTE that if the backoff policy stated to stop retrying,
+// the notify function isn't called.
+type Notify func(error, time.Duration)
+
+// Retry the operation o until it does not return error or BackOff stops.
+// o is guaranteed to be run at least once.
+// It is the caller's responsibility to reset b after Retry returns.
+//
+// If o returns a *PermanentError, the operation is not retried, and the
+// wrapped error is returned.
+//
+// Retry sleeps the goroutine for the duration returned by BackOff after a
+// failed operation returns.
+func Retry(o Operation, b BackOff) error { return RetryNotify(o, b, nil) }
+
+// RetryNotify calls notify function with the error and wait duration
+// for each failed attempt before sleep.
+func RetryNotify(operation Operation, b BackOff, notify Notify) error {
+	var err error
+	var next time.Duration
+
+	cb := ensureContext(b)
+
+	b.Reset()
+	for {
+		if err = operation(); err == nil {
+			return nil
+		}
+
+		if permanent, ok := err.(*PermanentError); ok {
+			return permanent.Err
+		}
+
+		if next = b.NextBackOff(); next == Stop {
+			return err
+		}
+
+		if notify != nil {
+			notify(err, next)
+		}
+
+		t := time.NewTimer(next)
+
+		select {
+		case <-cb.Context().Done():
+			t.Stop()
+			return err
+		case <-t.C:
+		}
+	}
+}
+
+// PermanentError signals that the operation should not be retried.
+type PermanentError struct {
+	Err error
+}
+
+func (e *PermanentError) Error() string {
+	return e.Err.Error()
+}
+
+// Permanent wraps the given err in a *PermanentError.
+func Permanent(err error) *PermanentError {
+	return &PermanentError{
+		Err: err,
+	}
+}
diff --git a/installer/vendor/github.com/cenkalti/backoff/ticker.go b/installer/vendor/github.com/cenkalti/backoff/ticker.go
new file mode 100644
index 0000000000..e742512fd3
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/ticker.go
@@ -0,0 +1,84 @@
+package backoff
+
+import (
+	"runtime"
+	"sync"
+	"time"
+)
+
+// Ticker holds a channel that delivers `ticks' of a clock at times reported by a BackOff.
+//
+// Ticks will continue to arrive when the previous operation is still running,
+// so operations that take a while to fail could run in quick succession.
+type Ticker struct {
+	C        <-chan time.Time
+	c        chan time.Time
+	b        BackOffContext
+	stop     chan struct{}
+	stopOnce sync.Once
+}
+
+// NewTicker returns a new Ticker containing a channel that will send
+// the time at times specified by the BackOff argument. Ticker is
+// guaranteed to tick at least once.  The channel is closed when Stop
+// method is called or BackOff stops. It is not safe to manipulate the
+// provided backoff policy (notably calling NextBackOff or Reset)
+// while the ticker is running.
+func NewTicker(b BackOff) *Ticker {
+	c := make(chan time.Time)
+	t := &Ticker{
+		C:    c,
+		c:    c,
+		b:    ensureContext(b),
+		stop: make(chan struct{}),
+	}
+	t.b.Reset()
+	go t.run()
+	runtime.SetFinalizer(t, (*Ticker).Stop)
+	return t
+}
+
+// Stop turns off a ticker. After Stop, no more ticks will be sent.
+func (t *Ticker) Stop() {
+	t.stopOnce.Do(func() { close(t.stop) })
+}
+
+func (t *Ticker) run() {
+	c := t.c
+	defer close(c)
+
+	// Ticker is guaranteed to tick at least once.
+	afterC := t.send(time.Now())
+
+	for {
+		if afterC == nil {
+			return
+		}
+
+		select {
+		case tick := <-afterC:
+			afterC = t.send(tick)
+		case <-t.stop:
+			t.c = nil // Prevent future ticks from being sent to the channel.
+			return
+		case <-t.b.Context().Done():
+			return
+		}
+	}
+}
+
+func (t *Ticker) send(tick time.Time) <-chan time.Time {
+	select {
+	case t.c <- tick:
+	case <-t.stop:
+		return nil
+	}
+
+	next := t.b.NextBackOff()
+	if next == Stop {
+		t.Stop()
+		return nil
+	}
+
+	return time.After(next)
+}
diff --git a/installer/vendor/github.com/cenkalti/backoff/tries.go b/installer/vendor/github.com/cenkalti/backoff/tries.go
new file mode 100644
index 0000000000..cfeefd9b76
--- /dev/null
+++ b/installer/vendor/github.com/cenkalti/backoff/tries.go
@@ -0,0 +1,35 @@
+package backoff
+
+import "time"
+
+/*
+WithMaxRetries creates a wrapper around another BackOff, which will
+return Stop if NextBackOff() has been called too many times since
+the last time Reset() was called
+
+Note: Implementation is not thread-safe.
+*/
+func WithMaxRetries(b BackOff, max uint64) BackOff {
+	return &backOffTries{delegate: b, maxTries: max}
+}
+
+type backOffTries struct {
+	delegate BackOff
+	maxTries uint64
+	numTries uint64
+}
+
+func (b *backOffTries) NextBackOff() time.Duration {
+	if b.maxTries > 0 {
+		if b.maxTries <= b.numTries {
+			return Stop
+		}
+		b.numTries++
+	}
+	return b.delegate.NextBackOff()
+}
+
+func (b *backOffTries) Reset() {
+	b.numTries = 0
+	b.delegate.Reset()
+}
diff --git a/installer/vendor/github.com/coreos/go-systemd/.travis.yml b/installer/vendor/github.com/coreos/go-systemd/.travis.yml
deleted file mode 100644
index 21fb7a01d6..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/.travis.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-language: shell # We do everything inside Docker and don't want travis fiddling with steps or environment variables
-
-sudo: required
-
-services:
-  - docker
-
-env:
-  global:
-    - GOPATH=/opt
-    - BUILD_DIR=/opt/src/github.com/coreos/go-systemd
-  matrix:
-    - DOCKER_BASE=ubuntu:16.04
-    - DOCKER_BASE=debian:stretch
-
-before_install:
- - docker pull ${DOCKER_BASE}
- - docker run --privileged -e GOPATH=${GOPATH} --cidfile=/tmp/cidfile ${DOCKER_BASE} /bin/bash -c "apt-get update && apt-get install -y build-essential git golang dbus libsystemd-dev libpam-systemd systemd-container && go get github.com/coreos/pkg/dlopen && go get github.com/godbus/dbus"
- - docker commit `cat /tmp/cidfile` go-systemd/container-tests
- - rm -f /tmp/cidfile
-
-install:
- - docker run -d --cidfile=/tmp/cidfile --privileged -e GOPATH=${GOPATH} -v ${PWD}:${BUILD_DIR} go-systemd/container-tests /bin/systemd --system
-
-script:
- - docker exec `cat /tmp/cidfile` /bin/bash -c "cd ${BUILD_DIR} && ./test"
-
-after_script:
- - docker kill `cat /tmp/cidfile`
diff --git a/installer/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md b/installer/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
deleted file mode 100644
index 0551ed53d3..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/CONTRIBUTING.md
+++ /dev/null
@@ -1,77 +0,0 @@
-# How to Contribute
-
-CoreOS projects are [Apache 2.0 licensed](LICENSE) and accept contributions via
-GitHub pull requests.  This document outlines some of the conventions on
-development workflow, commit message formatting, contact points and other
-resources to make it easier to get your contribution accepted.
-
-# Certificate of Origin
-
-By contributing to this project you agree to the Developer Certificate of
-Origin (DCO). This document was created by the Linux Kernel community and is a
-simple statement that you, as a contributor, have the legal right to make the
-contribution. See the [DCO](DCO) file for details.
-
-# Email and Chat
-
-The project currently uses the general CoreOS email list and IRC channel:
-- Email: [coreos-dev](https://groups.google.com/forum/#!forum/coreos-dev)
-- IRC: #[coreos](irc://irc.freenode.org:6667/#coreos) IRC channel on freenode.org
-
-Please avoid emailing maintainers found in the MAINTAINERS file directly. They
-are very busy and read the mailing lists.
-
-## Getting Started
-
-- Fork the repository on GitHub
-- Read the [README](README.md) for build and test instructions
-- Play with the project, submit bugs, submit patches!
-
-## Contribution Flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work (usually master).
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Make sure the tests pass, and add any new tests as appropriate.
-- Submit a pull request to the original repository.
-
-Thanks for your contributions!
-
-### Coding Style
-
-CoreOS projects written in Go follow a set of style guidelines that we've documented 
-[here](https://github.com/coreos/docs/tree/master/golang). Please follow them when 
-working on your contributions.
-
-### Format of the Commit Message
-
-We follow a rough convention for commit messages that is designed to answer two
-questions: what changed and why. The subject line should feature the what and
-the body of the commit should describe the why.
-
-```
-scripts: add the test-cluster command
-
-this uses tmux to setup a test cluster that you can easily kill and
-start for debugging.
-
-Fixes #38
-```
-
-The format can be described more formally as follows:
-
-```
-<subsystem>: <what changed>
-<BLANK LINE>
-<why this change was made>
-<BLANK LINE>
-<footer>
-```
-
-The first line is the subject and should be no longer than 70 characters, the
-second line is always blank, and other lines should be wrapped at 80 characters.
-This allows the message to be easier to read on GitHub as well as in various
-git tools.
diff --git a/installer/vendor/github.com/coreos/go-systemd/DCO b/installer/vendor/github.com/coreos/go-systemd/DCO
deleted file mode 100644
index 716561d5d2..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/DCO
+++ /dev/null
@@ -1,36 +0,0 @@
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
diff --git a/installer/vendor/github.com/coreos/go-systemd/Jenkinsfile b/installer/vendor/github.com/coreos/go-systemd/Jenkinsfile
deleted file mode 100644
index 7c898974bc..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/Jenkinsfile
+++ /dev/null
@@ -1,38 +0,0 @@
-matrixJob('Periodic go-systemd builder') {
-    label('master')
-    displayName('Periodic go-systemd builder (master branch)')
-
-    scm {
-        git {
-            remote {
-                url('https://github.com/coreos/go-systemd.git')
-            }
-            branch('master')
-        }
-    }
-
-    concurrentBuild()
-
-    triggers {
-        cron('@daily')
-    }
-
-    axes {
-        label('os_type', 'debian-testing', 'fedora-24', 'fedora-25')
-    }
-
-    wrappers {
-        buildNameSetter {
-            template('go-systemd master (periodic #${BUILD_NUMBER})')
-            runAtStart(true)
-            runAtEnd(true)
-        }
-        timeout {
-            absolute(25)
-        }
-    }
-
-    steps {
-        shell('./scripts/jenkins/periodic-go-systemd-builder.sh')
-    }
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/coreos/go-systemd/NOTICE b/installer/vendor/github.com/coreos/go-systemd/NOTICE
new file mode 100644
index 0000000000..23a0ada2fb
--- /dev/null
+++ b/installer/vendor/github.com/coreos/go-systemd/NOTICE
@@ -0,0 +1,5 @@
+CoreOS Project
+Copyright 2018 CoreOS, Inc
+
+This product includes software developed at CoreOS, Inc.
+(http://www.coreos.com/).
diff --git a/installer/vendor/github.com/coreos/go-systemd/README.md b/installer/vendor/github.com/coreos/go-systemd/README.md
deleted file mode 100644
index cb87a11245..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/README.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# go-systemd
-
-[![Build Status](https://travis-ci.org/coreos/go-systemd.png?branch=master)](https://travis-ci.org/coreos/go-systemd)
-[![godoc](https://godoc.org/github.com/coreos/go-systemd?status.svg)](http://godoc.org/github.com/coreos/go-systemd)
-
-Go bindings to systemd. The project has several packages:
-
-- `activation` - for writing and using socket activation from Go
-- `dbus` - for starting/stopping/inspecting running services and units
-- `journal` - for writing to systemd's logging service, journald
-- `sdjournal` - for reading from journald by wrapping its C API
-- `machine1` - for registering machines/containers with systemd
-- `unit` - for (de)serialization and comparison of unit files
-
-## Socket Activation
-
-An example HTTP server using socket activation can be quickly set up by following this README on a Linux machine running systemd:
-
-https://github.com/coreos/go-systemd/tree/master/examples/activation/httpserver
-
-## Journal
-
-Using the pure-Go `journal` package you can submit journal entries directly to systemd's journal, taking advantage of features like indexed key/value pairs for each log entry.
-The `sdjournal` package provides read access to the journal by wrapping around journald's native C API; consequently it requires cgo and the journal headers to be available.
-
-## D-Bus
-
-The `dbus` package connects to the [systemd D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/dbus/) and lets you start, stop and introspect systemd units. The API docs are here:
-
-http://godoc.org/github.com/coreos/go-systemd/dbus
-
-### Debugging
-
-Create `/etc/dbus-1/system-local.conf` that looks like this:
-
-```
-<!DOCTYPE busconfig PUBLIC
-"-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
-"http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-<busconfig>
-    <policy user="root">
-        <allow eavesdrop="true"/>
-        <allow eavesdrop="true" send_destination="*"/>
-    </policy>
-</busconfig>
-```
-
-## machined
-
-The `machine1` package allows interaction with the [systemd machined D-Bus API](http://www.freedesktop.org/wiki/Software/systemd/machined/).
-
-## Units
-
-The `unit` package provides various functions for working with [systemd unit files](http://www.freedesktop.org/software/systemd/man/systemd.unit.html).
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/files.go b/installer/vendor/github.com/coreos/go-systemd/activation/files.go
deleted file mode 100644
index c8e85fcd58..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/files.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package activation implements primitives for systemd socket activation.
-package activation
-
-import (
-	"os"
-	"strconv"
-	"syscall"
-)
-
-// based on: https://gist.github.com/alberts/4640792
-const (
-	listenFdsStart = 3
-)
-
-func Files(unsetEnv bool) []*os.File {
-	if unsetEnv {
-		defer os.Unsetenv("LISTEN_PID")
-		defer os.Unsetenv("LISTEN_FDS")
-	}
-
-	pid, err := strconv.Atoi(os.Getenv("LISTEN_PID"))
-	if err != nil || pid != os.Getpid() {
-		return nil
-	}
-
-	nfds, err := strconv.Atoi(os.Getenv("LISTEN_FDS"))
-	if err != nil || nfds == 0 {
-		return nil
-	}
-
-	files := make([]*os.File, 0, nfds)
-	for fd := listenFdsStart; fd < listenFdsStart+nfds; fd++ {
-		syscall.CloseOnExec(fd)
-		files = append(files, os.NewFile(uintptr(fd), "LISTEN_FD_"+strconv.Itoa(fd)))
-	}
-
-	return files
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/files_test.go b/installer/vendor/github.com/coreos/go-systemd/activation/files_test.go
deleted file mode 100644
index 8e15f2a10e..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/files_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// correctStringWritten fails the text if the correct string wasn't written
-// to the other side of the pipe.
-func correctStringWritten(t *testing.T, r *os.File, expected string) bool {
-	bytes := make([]byte, len(expected))
-	io.ReadAtLeast(r, bytes, len(expected))
-
-	if string(bytes) != expected {
-		t.Fatalf("Unexpected string %s", string(bytes))
-	}
-
-	return true
-}
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestActivation(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-
-	r1, w1, _ := os.Pipe()
-	r2, w2, _ := os.Pipe()
-	cmd.ExtraFiles = []*os.File{
-		w1,
-		w2,
-	}
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "FIX_LISTEN_PID=1")
-
-	err := cmd.Run()
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	correctStringWritten(t, r1, "Hello world")
-	correctStringWritten(t, r2, "Goodbye world")
-}
-
-func TestActivationNoFix(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2")
-
-	out, _ := cmd.CombinedOutput()
-	if bytes.Contains(out, []byte("No files")) == false {
-		t.Fatalf("Child didn't error out as expected")
-	}
-}
-
-func TestActivationNoFiles(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/activation.go")
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=0", "FIX_LISTEN_PID=1")
-
-	out, _ := cmd.CombinedOutput()
-	if bytes.Contains(out, []byte("No files")) == false {
-		t.Fatalf("Child didn't error out as expected")
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/listeners.go b/installer/vendor/github.com/coreos/go-systemd/activation/listeners.go
deleted file mode 100644
index fd5dfc709c..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/listeners.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"crypto/tls"
-	"net"
-)
-
-// Listeners returns a slice containing a net.Listener for each matching socket type
-// passed to this process.
-//
-// The order of the file descriptors is preserved in the returned slice.
-// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
-// corresponding with "udp, tcp, tcp", then the slice would contain {nil, net.Listener, net.Listener}
-func Listeners(unsetEnv bool) ([]net.Listener, error) {
-	files := Files(unsetEnv)
-	listeners := make([]net.Listener, len(files))
-
-	for i, f := range files {
-		if pc, err := net.FileListener(f); err == nil {
-			listeners[i] = pc
-		}
-	}
-	return listeners, nil
-}
-
-// TLSListeners returns a slice containing a net.listener for each matching TCP socket type
-// passed to this process.
-// It uses default Listeners func and forces TCP sockets handlers to use TLS based on tlsConfig.
-func TLSListeners(unsetEnv bool, tlsConfig *tls.Config) ([]net.Listener, error) {
-	listeners, err := Listeners(unsetEnv)
-
-	if listeners == nil || err != nil {
-		return nil, err
-	}
-
-	if tlsConfig != nil && err == nil {
-		for i, l := range listeners {
-			// Activate TLS only for TCP sockets
-			if l.Addr().Network() == "tcp" {
-				listeners[i] = tls.NewListener(l, tlsConfig)
-			}
-		}
-	}
-
-	return listeners, err
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/listeners_test.go b/installer/vendor/github.com/coreos/go-systemd/activation/listeners_test.go
deleted file mode 100644
index 72fb0ff628..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/listeners_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"io"
-	"net"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// correctStringWritten fails the text if the correct string wasn't written
-// to the other side of the pipe.
-func correctStringWrittenNet(t *testing.T, r net.Conn, expected string) bool {
-	bytes := make([]byte, len(expected))
-	io.ReadAtLeast(r, bytes, len(expected))
-
-	if string(bytes) != expected {
-		t.Fatalf("Unexpected string %s", string(bytes))
-	}
-
-	return true
-}
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestListeners(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/listen.go")
-
-	l1, err := net.Listen("tcp", ":9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	l2, err := net.Listen("tcp", ":1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	t1 := l1.(*net.TCPListener)
-	t2 := l2.(*net.TCPListener)
-
-	f1, _ := t1.File()
-	f2, _ := t2.File()
-
-	cmd.ExtraFiles = []*os.File{
-		f1,
-		f2,
-	}
-
-	r1, err := net.Dial("tcp", "127.0.0.1:9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r1.Write([]byte("Hi"))
-
-	r2, err := net.Dial("tcp", "127.0.0.1:1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r2.Write([]byte("Hi"))
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "FIX_LISTEN_PID=1")
-
-	out, err := cmd.Output()
-	if err != nil {
-		println(string(out))
-		t.Fatalf(err.Error())
-	}
-
-	correctStringWrittenNet(t, r1, "Hello world")
-	correctStringWrittenNet(t, r2, "Goodbye world")
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/packetconns.go b/installer/vendor/github.com/coreos/go-systemd/activation/packetconns.go
deleted file mode 100644
index 48b2ca029d..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/packetconns.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"net"
-)
-
-// PacketConns returns a slice containing a net.PacketConn for each matching socket type
-// passed to this process.
-//
-// The order of the file descriptors is preserved in the returned slice.
-// Nil values are used to fill any gaps. For example if systemd were to return file descriptors
-// corresponding with "udp, tcp, udp", then the slice would contain {net.PacketConn, nil, net.PacketConn}
-func PacketConns(unsetEnv bool) ([]net.PacketConn, error) {
-	files := Files(unsetEnv)
-	conns := make([]net.PacketConn, len(files))
-
-	for i, f := range files {
-		if pc, err := net.FilePacketConn(f); err == nil {
-			conns[i] = pc
-		}
-	}
-	return conns, nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go b/installer/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
deleted file mode 100644
index 8449756cbe..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/activation/packetconns_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package activation
-
-import (
-	"net"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-// TestActivation forks out a copy of activation.go example and reads back two
-// strings from the pipes that are passed in.
-func TestPacketConns(t *testing.T) {
-	cmd := exec.Command("go", "run", "../examples/activation/udpconn.go")
-
-	u1, err := net.ListenUDP("udp", &net.UDPAddr{Port: 9999})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	u2, err := net.ListenUDP("udp", &net.UDPAddr{Port: 1234})
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	f1, _ := u1.File()
-	f2, _ := u2.File()
-
-	cmd.ExtraFiles = []*os.File{
-		f1,
-		f2,
-	}
-
-	r1, err := net.Dial("udp", "127.0.0.1:9999")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r1.Write([]byte("Hi"))
-
-	r2, err := net.Dial("udp", "127.0.0.1:1234")
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-	r2.Write([]byte("Hi"))
-
-	cmd.Env = os.Environ()
-	cmd.Env = append(cmd.Env, "LISTEN_FDS=2", "FIX_LISTEN_PID=1")
-
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Cmd output '%s', err: '%s'\n", out, err)
-	}
-
-	correctStringWrittenNet(t, r1, "Hello world")
-	correctStringWrittenNet(t, r2, "Goodbye world")
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go b/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
index ba6d41d85b..ba4ae31f19 100644
--- a/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
+++ b/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify.go
@@ -1,4 +1,5 @@
 // Copyright 2014 Docker, Inc.
+// Copyright 2015-2018 CoreOS, Inc.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -13,7 +14,11 @@
 // limitations under the License.
 //
 
-// Code forked from Docker project
+// Package daemon provides a Go implementation of the sd_notify protocol.
+// It can be used to inform systemd of service start-up completion, watchdog
+// events, and other status changes.
+//
+// https://www.freedesktop.org/software/systemd/man/sd_notify.html#Description
 package daemon
 
 import (
@@ -21,6 +26,25 @@ import (
 	"os"
 )
 
+const (
+	// SdNotifyReady tells the service manager that service startup is finished
+	// or the service finished loading its configuration.
+	SdNotifyReady = "READY=1"
+
+	// SdNotifyStopping tells the service manager that the service is beginning
+	// its shutdown.
+	SdNotifyStopping = "STOPPING=1"
+
+	// SdNotifyReloading tells the service manager that this service is
+	// reloading its configuration. Note that you must call SdNotifyReady when
+	// it completed reloading.
+	SdNotifyReloading = "RELOADING=1"
+
+	// SdNotifyWatchdog tells the service manager to update the watchdog
+	// timestamp for the service.
+	SdNotifyWatchdog = "WATCHDOG=1"
+)
+
 // SdNotify sends a message to the init daemon. It is common to ignore the error.
 // If `unsetEnvironment` is true, the environment variable `NOTIFY_SOCKET`
 // will be unconditionally unset.
@@ -29,7 +53,7 @@ import (
 // (false, nil) - notification not supported (i.e. NOTIFY_SOCKET is unset)
 // (false, err) - notification supported, but failure happened (e.g. error connecting to NOTIFY_SOCKET or while sending data)
 // (true, nil) - notification supported, data has been sent
-func SdNotify(unsetEnvironment bool, state string) (sent bool, err error) {
+func SdNotify(unsetEnvironment bool, state string) (bool, error) {
 	socketAddr := &net.UnixAddr{
 		Name: os.Getenv("NOTIFY_SOCKET"),
 		Net:  "unixgram",
@@ -41,10 +65,9 @@ func SdNotify(unsetEnvironment bool, state string) (sent bool, err error) {
 	}
 
 	if unsetEnvironment {
-		err = os.Unsetenv("NOTIFY_SOCKET")
-	}
-	if err != nil {
-		return false, err
+		if err := os.Unsetenv("NOTIFY_SOCKET"); err != nil {
+			return false, err
+		}
 	}
 
 	conn, err := net.DialUnix(socketAddr.Net, nil, socketAddr)
@@ -54,9 +77,7 @@ func SdNotify(unsetEnvironment bool, state string) (sent bool, err error) {
 	}
 	defer conn.Close()
 
-	_, err = conn.Write([]byte(state))
-	// Error sending the message
-	if err != nil {
+	if _, err = conn.Write([]byte(state)); err != nil {
 		return false, err
 	}
 	return true, nil
diff --git a/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go b/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
deleted file mode 100644
index 0a4cdb744b..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/daemon/sdnotify_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"testing"
-)
-
-// TestSdNotify
-func TestSdNotify(t *testing.T) {
-
-	testDir, e := ioutil.TempDir("/tmp/", "test-")
-	if e != nil {
-		panic(e)
-	}
-	defer os.RemoveAll(testDir)
-
-	notifySocket := testDir + "/notify-socket.sock"
-	laddr := net.UnixAddr{
-		Name: notifySocket,
-		Net:  "unixgram",
-	}
-	_, e = net.ListenUnixgram("unixgram", &laddr)
-	if e != nil {
-		panic(e)
-	}
-
-	tests := []struct {
-		unsetEnv  bool
-		envSocket string
-
-		wsent bool
-		werr  bool
-	}{
-		// (true, nil) - notification supported, data has been sent
-		{false, notifySocket, true, false},
-		// (false, err) - notification supported, but failure happened
-		{true, testDir + "/missing.sock", false, true},
-		// (false, nil) - notification not supported
-		{true, "", false, false},
-	}
-
-	for i, tt := range tests {
-		must(os.Unsetenv("NOTIFY_SOCKET"))
-		if tt.envSocket != "" {
-			must(os.Setenv("NOTIFY_SOCKET", tt.envSocket))
-		}
-		sent, err := SdNotify(tt.unsetEnv, fmt.Sprintf("TestSdNotify test message #%d", i))
-
-		if sent != tt.wsent {
-			t.Errorf("#%d: expected send result %t, got %t", i, tt.wsent, sent)
-		}
-		if tt.werr && err == nil {
-			t.Errorf("#%d: want non-nil err, got nil", i)
-		} else if !tt.werr && err != nil {
-			t.Errorf("#%d: want nil err, got %v", i, err)
-		}
-		if tt.unsetEnv && tt.envSocket != "" && os.Getenv("NOTIFY_SOCKET") != "" {
-			t.Errorf("#%d: environment variable not cleaned up", i)
-		}
-
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog.go b/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog.go
index 35a92e6e67..7a0e0d3a51 100644
--- a/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog.go
+++ b/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog.go
@@ -21,10 +21,11 @@ import (
 	"time"
 )
 
-// SdWatchdogEnabled return watchdog information for a service.
-// Process should send daemon.SdNotify("WATCHDOG=1") every time / 2.
-// If `unsetEnvironment` is true, the environment variables `WATCHDOG_USEC`
-// and `WATCHDOG_PID` will be unconditionally unset.
+// SdWatchdogEnabled returns watchdog information for a service.
+// Processes should call daemon.SdNotify(false, daemon.SdNotifyWatchdog) every
+// time / 2.
+// If `unsetEnvironment` is true, the environment variables `WATCHDOG_USEC` and
+// `WATCHDOG_PID` will be unconditionally unset.
 //
 // It returns one of the following:
 // (0, nil) - watchdog isn't enabled or we aren't the watched PID.
diff --git a/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go b/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
deleted file mode 100644
index 5358cf588f..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/daemon/watchdog_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package daemon
-
-import (
-	"os"
-	"strconv"
-	"testing"
-	"time"
-)
-
-func must(err error) {
-	if err != nil {
-		panic(err)
-	}
-}
-
-func TestSdWatchdogEnabled(t *testing.T) {
-	mypid := strconv.Itoa(os.Getpid())
-	tests := []struct {
-		usec     string // empty => unset
-		pid      string // empty => unset
-		unsetEnv bool   // arbitrarily set across testcases
-
-		werr   bool
-		wdelay time.Duration
-	}{
-		// Success cases
-		{"100", mypid, true, false, 100 * time.Microsecond},
-		{"50", mypid, true, false, 50 * time.Microsecond},
-		{"1", mypid, false, false, 1 * time.Microsecond},
-		{"1", "", true, false, 1 * time.Microsecond},
-
-		// No-op cases
-		{"", mypid, true, false, 0}, // WATCHDOG_USEC not set
-		{"1", "0", false, false, 0}, // WATCHDOG_PID doesn't match
-		{"", "", true, false, 0},    // Both not set
-
-		// Failure cases
-		{"-1", mypid, true, true, 0},                // Negative USEC
-		{"string", "1", false, true, 0},             // Non-integer USEC value
-		{"1", "string", true, true, 0},              // Non-integer PID value
-		{"stringa", "stringb", false, true, 0},      // E v e r y t h i n g
-		{"-10239", "-eleventythree", true, true, 0}, // i s   w r o n g
-	}
-
-	for i, tt := range tests {
-		if tt.usec != "" {
-			must(os.Setenv("WATCHDOG_USEC", tt.usec))
-		} else {
-			must(os.Unsetenv("WATCHDOG_USEC"))
-		}
-		if tt.pid != "" {
-			must(os.Setenv("WATCHDOG_PID", tt.pid))
-		} else {
-			must(os.Unsetenv("WATCHDOG_PID"))
-		}
-
-		delay, err := SdWatchdogEnabled(tt.unsetEnv)
-
-		if tt.werr && err == nil {
-			t.Errorf("#%d: want non-nil err, got nil", i)
-		} else if !tt.werr && err != nil {
-			t.Errorf("#%d: want nil err, got %v", i, err)
-		}
-		if tt.wdelay != delay {
-			t.Errorf("#%d: want delay=%d, got %d", i, tt.wdelay, delay)
-		}
-		if tt.unsetEnv && (os.Getenv("WATCHDOG_PID") != "" || os.Getenv("WATCHDOG_USEC") != "") {
-			t.Errorf("#%d: environment variables not cleaned up", i)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/dbus.go b/installer/vendor/github.com/coreos/go-systemd/dbus/dbus.go
deleted file mode 100644
index c1694fb522..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/dbus.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Integration with the systemd D-Bus API.  See http://www.freedesktop.org/wiki/Software/systemd/dbus/
-package dbus
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	alpha        = `abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ`
-	num          = `0123456789`
-	alphanum     = alpha + num
-	signalBuffer = 100
-)
-
-// needsEscape checks whether a byte in a potential dbus ObjectPath needs to be escaped
-func needsEscape(i int, b byte) bool {
-	// Escape everything that is not a-z-A-Z-0-9
-	// Also escape 0-9 if it's the first character
-	return strings.IndexByte(alphanum, b) == -1 ||
-		(i == 0 && strings.IndexByte(num, b) != -1)
-}
-
-// PathBusEscape sanitizes a constituent string of a dbus ObjectPath using the
-// rules that systemd uses for serializing special characters.
-func PathBusEscape(path string) string {
-	// Special case the empty string
-	if len(path) == 0 {
-		return "_"
-	}
-	n := []byte{}
-	for i := 0; i < len(path); i++ {
-		c := path[i]
-		if needsEscape(i, c) {
-			e := fmt.Sprintf("_%x", c)
-			n = append(n, []byte(e)...)
-		} else {
-			n = append(n, c)
-		}
-	}
-	return string(n)
-}
-
-// Conn is a connection to systemd's dbus endpoint.
-type Conn struct {
-	// sysconn/sysobj are only used to call dbus methods
-	sysconn *dbus.Conn
-	sysobj  dbus.BusObject
-
-	// sigconn/sigobj are only used to receive dbus signals
-	sigconn *dbus.Conn
-	sigobj  dbus.BusObject
-
-	jobListener struct {
-		jobs map[dbus.ObjectPath]chan<- string
-		sync.Mutex
-	}
-	subscriber struct {
-		updateCh chan<- *SubStateUpdate
-		errCh    chan<- error
-		sync.Mutex
-		ignore      map[dbus.ObjectPath]int64
-		cleanIgnore int64
-	}
-}
-
-// New establishes a connection to any available bus and authenticates.
-// Callers should call Close() when done with the connection.
-func New() (*Conn, error) {
-	conn, err := NewSystemConnection()
-	if err != nil && os.Geteuid() == 0 {
-		return NewSystemdConnection()
-	}
-	return conn, err
-}
-
-// NewSystemConnection establishes a connection to the system bus and authenticates.
-// Callers should call Close() when done with the connection
-func NewSystemConnection() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		return dbusAuthHelloConnection(dbus.SystemBusPrivate)
-	})
-}
-
-// NewUserConnection establishes a connection to the session bus and
-// authenticates. This can be used to connect to systemd user instances.
-// Callers should call Close() when done with the connection.
-func NewUserConnection() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		return dbusAuthHelloConnection(dbus.SessionBusPrivate)
-	})
-}
-
-// NewSystemdConnection establishes a private, direct connection to systemd.
-// This can be used for communicating with systemd without a dbus daemon.
-// Callers should call Close() when done with the connection.
-func NewSystemdConnection() (*Conn, error) {
-	return NewConnection(func() (*dbus.Conn, error) {
-		// We skip Hello when talking directly to systemd.
-		return dbusAuthConnection(func() (*dbus.Conn, error) {
-			return dbus.Dial("unix:path=/run/systemd/private")
-		})
-	})
-}
-
-// Close closes an established connection
-func (c *Conn) Close() {
-	c.sysconn.Close()
-	c.sigconn.Close()
-}
-
-// NewConnection establishes a connection to a bus using a caller-supplied function.
-// This allows connecting to remote buses through a user-supplied mechanism.
-// The supplied function may be called multiple times, and should return independent connections.
-// The returned connection must be fully initialised: the org.freedesktop.DBus.Hello call must have succeeded,
-// and any authentication should be handled by the function.
-func NewConnection(dialBus func() (*dbus.Conn, error)) (*Conn, error) {
-	sysconn, err := dialBus()
-	if err != nil {
-		return nil, err
-	}
-
-	sigconn, err := dialBus()
-	if err != nil {
-		sysconn.Close()
-		return nil, err
-	}
-
-	c := &Conn{
-		sysconn: sysconn,
-		sysobj:  systemdObject(sysconn),
-		sigconn: sigconn,
-		sigobj:  systemdObject(sigconn),
-	}
-
-	c.subscriber.ignore = make(map[dbus.ObjectPath]int64)
-	c.jobListener.jobs = make(map[dbus.ObjectPath]chan<- string)
-
-	// Setup the listeners on jobs so that we can get completions
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal', interface='org.freedesktop.systemd1.Manager', member='JobRemoved'")
-
-	c.dispatch()
-	return c, nil
-}
-
-// GetManagerProperty returns the value of a property on the org.freedesktop.systemd1.Manager
-// interface. The value is returned in its string representation, as defined at
-// https://developer.gnome.org/glib/unstable/gvariant-text.html
-func (c *Conn) GetManagerProperty(prop string) (string, error) {
-	variant, err := c.sysobj.GetProperty("org.freedesktop.systemd1.Manager." + prop)
-	if err != nil {
-		return "", err
-	}
-	return variant.String(), nil
-}
-
-func dbusAuthConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
-	conn, err := createBus()
-	if err != nil {
-		return nil, err
-	}
-
-	// Only use EXTERNAL method, and hardcode the uid (not username)
-	// to avoid a username lookup (which requires a dynamically linked
-	// libc)
-	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
-
-	err = conn.Auth(methods)
-	if err != nil {
-		conn.Close()
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-func dbusAuthHelloConnection(createBus func() (*dbus.Conn, error)) (*dbus.Conn, error) {
-	conn, err := dbusAuthConnection(createBus)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = conn.Hello(); err != nil {
-		conn.Close()
-		return nil, err
-	}
-
-	return conn, nil
-}
-
-func systemdObject(conn *dbus.Conn) dbus.BusObject {
-	return conn.Object("org.freedesktop.systemd1", dbus.ObjectPath("/org/freedesktop/systemd1"))
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/dbus_test.go b/installer/vendor/github.com/coreos/go-systemd/dbus/dbus_test.go
deleted file mode 100644
index 3ea131e209..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/dbus_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"testing"
-)
-
-func TestNeedsEscape(t *testing.T) {
-	// Anything not 0-9a-zA-Z should always be escaped
-	for want, vals := range map[bool][]byte{
-		false: []byte{'a', 'b', 'z', 'A', 'Q', '1', '4', '9'},
-		true:  []byte{'#', '%', '$', '!', '.', '_', '-', '%', '\\'},
-	} {
-		for i := 1; i < 10; i++ {
-			for _, b := range vals {
-				got := needsEscape(i, b)
-				if got != want {
-					t.Errorf("needsEscape(%d, %c) returned %t, want %t", i, b, got, want)
-				}
-			}
-		}
-	}
-
-	// 0-9 in position 0 should be escaped
-	for want, vals := range map[bool][]byte{
-		false: []byte{'A', 'a', 'e', 'x', 'Q', 'Z'},
-		true:  []byte{'0', '4', '5', '9'},
-	} {
-		for _, b := range vals {
-			got := needsEscape(0, b)
-			if got != want {
-				t.Errorf("needsEscape(0, %c) returned %t, want %t", b, got, want)
-			}
-		}
-	}
-
-}
-
-func TestPathBusEscape(t *testing.T) {
-	for in, want := range map[string]string{
-		"":                   "_",
-		"foo.service":        "foo_2eservice",
-		"foobar":             "foobar",
-		"woof@woof.service":  "woof_40woof_2eservice",
-		"0123456":            "_30123456",
-		"account_db.service": "account_5fdb_2eservice",
-		"got-dashes":         "got_2ddashes",
-	} {
-		got := PathBusEscape(in)
-		if got != want {
-			t.Errorf("bad result for PathBusEscape(%s): got %q, want %q", in, got, want)
-		}
-	}
-
-}
-
-// TestNew ensures that New() works without errors.
-func TestNew(t *testing.T) {
-	_, err := New()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/methods.go b/installer/vendor/github.com/coreos/go-systemd/dbus/methods.go
deleted file mode 100644
index ab17f7cc75..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/methods.go
+++ /dev/null
@@ -1,565 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"errors"
-	"path"
-	"strconv"
-
-	"github.com/godbus/dbus"
-)
-
-func (c *Conn) jobComplete(signal *dbus.Signal) {
-	var id uint32
-	var job dbus.ObjectPath
-	var unit string
-	var result string
-	dbus.Store(signal.Body, &id, &job, &unit, &result)
-	c.jobListener.Lock()
-	out, ok := c.jobListener.jobs[job]
-	if ok {
-		out <- result
-		delete(c.jobListener.jobs, job)
-	}
-	c.jobListener.Unlock()
-}
-
-func (c *Conn) startJob(ch chan<- string, job string, args ...interface{}) (int, error) {
-	if ch != nil {
-		c.jobListener.Lock()
-		defer c.jobListener.Unlock()
-	}
-
-	var p dbus.ObjectPath
-	err := c.sysobj.Call(job, 0, args...).Store(&p)
-	if err != nil {
-		return 0, err
-	}
-
-	if ch != nil {
-		c.jobListener.jobs[p] = ch
-	}
-
-	// ignore error since 0 is fine if conversion fails
-	jobID, _ := strconv.Atoi(path.Base(string(p)))
-
-	return jobID, nil
-}
-
-// StartUnit enqueues a start job and depending jobs, if any (unless otherwise
-// specified by the mode string).
-//
-// Takes the unit to activate, plus a mode string. The mode needs to be one of
-// replace, fail, isolate, ignore-dependencies, ignore-requirements. If
-// "replace" the call will start the unit and its dependencies, possibly
-// replacing already queued jobs that conflict with this. If "fail" the call
-// will start the unit and its dependencies, but will fail if this would change
-// an already queued job. If "isolate" the call will start the unit in question
-// and terminate all units that aren't dependencies of it. If
-// "ignore-dependencies" it will start a unit but ignore all its dependencies.
-// If "ignore-requirements" it will start a unit but only ignore the
-// requirement dependencies. It is not recommended to make use of the latter
-// two options.
-//
-// If the provided channel is non-nil, a result string will be sent to it upon
-// job completion: one of done, canceled, timeout, failed, dependency, skipped.
-// done indicates successful execution of a job. canceled indicates that a job
-// has been canceled  before it finished execution. timeout indicates that the
-// job timeout was reached. failed indicates that the job failed. dependency
-// indicates that a job this job has been depending on failed and the job hence
-// has been removed too. skipped indicates that a job was skipped because it
-// didn't apply to the units current state.
-//
-// If no error occurs, the ID of the underlying systemd job will be returned. There
-// does exist the possibility for no error to be returned, but for the returned job
-// ID to be 0. In this case, the actual underlying ID is not 0 and this datapoint
-// should not be considered authoritative.
-//
-// If an error does occur, it will be returned to the user alongside a job ID of 0.
-func (c *Conn) StartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartUnit", name, mode)
-}
-
-// StopUnit is similar to StartUnit but stops the specified unit rather
-// than starting it.
-func (c *Conn) StopUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StopUnit", name, mode)
-}
-
-// ReloadUnit reloads a unit.  Reloading is done only if the unit is already running and fails otherwise.
-func (c *Conn) ReloadUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadUnit", name, mode)
-}
-
-// RestartUnit restarts a service.  If a service is restarted that isn't
-// running it will be started.
-func (c *Conn) RestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.RestartUnit", name, mode)
-}
-
-// TryRestartUnit is like RestartUnit, except that a service that isn't running
-// is not affected by the restart.
-func (c *Conn) TryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.TryRestartUnit", name, mode)
-}
-
-// ReloadOrRestart attempts a reload if the unit supports it and use a restart
-// otherwise.
-func (c *Conn) ReloadOrRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrRestartUnit", name, mode)
-}
-
-// ReloadOrTryRestart attempts a reload if the unit supports it and use a "Try"
-// flavored restart otherwise.
-func (c *Conn) ReloadOrTryRestartUnit(name string, mode string, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.ReloadOrTryRestartUnit", name, mode)
-}
-
-// StartTransientUnit() may be used to create and start a transient unit, which
-// will be released as soon as it is not running or referenced anymore or the
-// system is rebooted. name is the unit name including suffix, and must be
-// unique. mode is the same as in StartUnit(), properties contains properties
-// of the unit.
-func (c *Conn) StartTransientUnit(name string, mode string, properties []Property, ch chan<- string) (int, error) {
-	return c.startJob(ch, "org.freedesktop.systemd1.Manager.StartTransientUnit", name, mode, properties, make([]PropertyCollection, 0))
-}
-
-// KillUnit takes the unit name and a UNIX signal number to send.  All of the unit's
-// processes are killed.
-func (c *Conn) KillUnit(name string, signal int32) {
-	c.sysobj.Call("org.freedesktop.systemd1.Manager.KillUnit", 0, name, "all", signal).Store()
-}
-
-// ResetFailedUnit resets the "failed" state of a specific unit.
-func (c *Conn) ResetFailedUnit(name string) error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.ResetFailedUnit", 0, name).Store()
-}
-
-// getProperties takes the unit name and returns all of its dbus object properties, for the given dbus interface
-func (c *Conn) getProperties(unit string, dbusInterface string) (map[string]interface{}, error) {
-	var err error
-	var props map[string]dbus.Variant
-
-	path := unitPath(unit)
-	if !path.IsValid() {
-		return nil, errors.New("invalid unit name: " + unit)
-	}
-
-	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
-	err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, dbusInterface).Store(&props)
-	if err != nil {
-		return nil, err
-	}
-
-	out := make(map[string]interface{}, len(props))
-	for k, v := range props {
-		out[k] = v.Value()
-	}
-
-	return out, nil
-}
-
-// GetUnitProperties takes the unit name and returns all of its dbus object properties.
-func (c *Conn) GetUnitProperties(unit string) (map[string]interface{}, error) {
-	return c.getProperties(unit, "org.freedesktop.systemd1.Unit")
-}
-
-func (c *Conn) getProperty(unit string, dbusInterface string, propertyName string) (*Property, error) {
-	var err error
-	var prop dbus.Variant
-
-	path := unitPath(unit)
-	if !path.IsValid() {
-		return nil, errors.New("invalid unit name: " + unit)
-	}
-
-	obj := c.sysconn.Object("org.freedesktop.systemd1", path)
-	err = obj.Call("org.freedesktop.DBus.Properties.Get", 0, dbusInterface, propertyName).Store(&prop)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Property{Name: propertyName, Value: prop}, nil
-}
-
-func (c *Conn) GetUnitProperty(unit string, propertyName string) (*Property, error) {
-	return c.getProperty(unit, "org.freedesktop.systemd1.Unit", propertyName)
-}
-
-// GetServiceProperty returns property for given service name and property name
-func (c *Conn) GetServiceProperty(service string, propertyName string) (*Property, error) {
-	return c.getProperty(service, "org.freedesktop.systemd1.Service", propertyName)
-}
-
-// GetUnitTypeProperties returns the extra properties for a unit, specific to the unit type.
-// Valid values for unitType: Service, Socket, Target, Device, Mount, Automount, Snapshot, Timer, Swap, Path, Slice, Scope
-// return "dbus.Error: Unknown interface" if the unitType is not the correct type of the unit
-func (c *Conn) GetUnitTypeProperties(unit string, unitType string) (map[string]interface{}, error) {
-	return c.getProperties(unit, "org.freedesktop.systemd1."+unitType)
-}
-
-// SetUnitProperties() may be used to modify certain unit properties at runtime.
-// Not all properties may be changed at runtime, but many resource management
-// settings (primarily those in systemd.cgroup(5)) may. The changes are applied
-// instantly, and stored on disk for future boots, unless runtime is true, in which
-// case the settings only apply until the next reboot. name is the name of the unit
-// to modify. properties are the settings to set, encoded as an array of property
-// name and value pairs.
-func (c *Conn) SetUnitProperties(name string, runtime bool, properties ...Property) error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.SetUnitProperties", 0, name, runtime, properties).Store()
-}
-
-func (c *Conn) GetUnitTypeProperty(unit string, unitType string, propertyName string) (*Property, error) {
-	return c.getProperty(unit, "org.freedesktop.systemd1."+unitType, propertyName)
-}
-
-type UnitStatus struct {
-	Name        string          // The primary unit name as string
-	Description string          // The human readable description string
-	LoadState   string          // The load state (i.e. whether the unit file has been loaded successfully)
-	ActiveState string          // The active state (i.e. whether the unit is currently started or not)
-	SubState    string          // The sub state (a more fine-grained version of the active state that is specific to the unit type, which the active state is not)
-	Followed    string          // A unit that is being followed in its state by this unit, if there is any, otherwise the empty string.
-	Path        dbus.ObjectPath // The unit object path
-	JobId       uint32          // If there is a job queued for the job unit the numeric job id, 0 otherwise
-	JobType     string          // The job type as string
-	JobPath     dbus.ObjectPath // The job object path
-}
-
-type storeFunc func(retvalues ...interface{}) error
-
-func (c *Conn) listUnitsInternal(f storeFunc) ([]UnitStatus, error) {
-	result := make([][]interface{}, 0)
-	err := f(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	status := make([]UnitStatus, len(result))
-	statusInterface := make([]interface{}, len(status))
-	for i := range status {
-		statusInterface[i] = &status[i]
-	}
-
-	err = dbus.Store(resultInterface, statusInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return status, nil
-}
-
-// ListUnits returns an array with all currently loaded units. Note that
-// units may be known by multiple names at the same time, and hence there might
-// be more unit names loaded than actual units behind them.
-func (c *Conn) ListUnits() ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnits", 0).Store)
-}
-
-// ListUnitsFiltered returns an array with units filtered by state.
-// It takes a list of units' statuses to filter.
-func (c *Conn) ListUnitsFiltered(states []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsFiltered", 0, states).Store)
-}
-
-// ListUnitsByPatterns returns an array with units.
-// It takes a list of units' statuses and names to filter.
-// Note that units may be known by multiple names at the same time,
-// and hence there might be more unit names loaded than actual units behind them.
-func (c *Conn) ListUnitsByPatterns(states []string, patterns []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByPatterns", 0, states, patterns).Store)
-}
-
-// ListUnitsByNames returns an array with units. It takes a list of units'
-// names and returns an UnitStatus array. Comparing to ListUnitsByPatterns
-// method, this method returns statuses even for inactive or non-existing
-// units. Input array should contain exact unit names, but not patterns.
-func (c *Conn) ListUnitsByNames(units []string) ([]UnitStatus, error) {
-	return c.listUnitsInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitsByNames", 0, units).Store)
-}
-
-type UnitFile struct {
-	Path string
-	Type string
-}
-
-func (c *Conn) listUnitFilesInternal(f storeFunc) ([]UnitFile, error) {
-	result := make([][]interface{}, 0)
-	err := f(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	files := make([]UnitFile, len(result))
-	fileInterface := make([]interface{}, len(files))
-	for i := range files {
-		fileInterface[i] = &files[i]
-	}
-
-	err = dbus.Store(resultInterface, fileInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return files, nil
-}
-
-// ListUnitFiles returns an array of all available units on disk.
-func (c *Conn) ListUnitFiles() ([]UnitFile, error) {
-	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFiles", 0).Store)
-}
-
-// ListUnitFilesByPatterns returns an array of all available units on disk matched the patterns.
-func (c *Conn) ListUnitFilesByPatterns(states []string, patterns []string) ([]UnitFile, error) {
-	return c.listUnitFilesInternal(c.sysobj.Call("org.freedesktop.systemd1.Manager.ListUnitFilesByPatterns", 0, states, patterns).Store)
-}
-
-type LinkUnitFileChange EnableUnitFileChange
-
-// LinkUnitFiles() links unit files (that are located outside of the
-// usual unit search paths) into the unit search path.
-//
-// It takes a list of absolute paths to unit files to link and two
-// booleans. The first boolean controls whether the unit shall be
-// enabled for runtime only (true, /run), or persistently (false,
-// /etc).
-// The second controls whether symlinks pointing to other units shall
-// be replaced if necessary.
-//
-// This call returns a list of the changes made. The list consists of
-// structures with three strings: the type of the change (one of symlink
-// or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) LinkUnitFiles(files []string, runtime bool, force bool) ([]LinkUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.LinkUnitFiles", 0, files, runtime, force).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]LinkUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-// EnableUnitFiles() may be used to enable one or more units in the system (by
-// creating symlinks to them in /etc or /run).
-//
-// It takes a list of unit files to enable (either just file names or full
-// absolute paths if the unit files are residing outside the usual unit
-// search paths), and two booleans: the first controls whether the unit shall
-// be enabled for runtime only (true, /run), or persistently (false, /etc).
-// The second one controls whether symlinks pointing to other units shall
-// be replaced if necessary.
-//
-// This call returns one boolean and an array with the changes made. The
-// boolean signals whether the unit files contained any enablement
-// information (i.e. an [Install]) section. The changes list consists of
-// structures with three strings: the type of the change (one of symlink
-// or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) EnableUnitFiles(files []string, runtime bool, force bool) (bool, []EnableUnitFileChange, error) {
-	var carries_install_info bool
-
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.EnableUnitFiles", 0, files, runtime, force).Store(&carries_install_info, &result)
-	if err != nil {
-		return false, nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]EnableUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return false, nil, err
-	}
-
-	return carries_install_info, changes, nil
-}
-
-type EnableUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// DisableUnitFiles() may be used to disable one or more units in the system (by
-// removing symlinks to them from /etc or /run).
-//
-// It takes a list of unit files to disable (either just file names or full
-// absolute paths if the unit files are residing outside the usual unit
-// search paths), and one boolean: whether the unit was enabled for runtime
-// only (true, /run), or persistently (false, /etc).
-//
-// This call returns an array with the changes made. The changes list
-// consists of structures with three strings: the type of the change (one of
-// symlink or unlink), the file name of the symlink and the destination of the
-// symlink.
-func (c *Conn) DisableUnitFiles(files []string, runtime bool) ([]DisableUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.DisableUnitFiles", 0, files, runtime).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]DisableUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-type DisableUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// MaskUnitFiles masks one or more units in the system
-//
-// It takes three arguments:
-//   * list of units to mask (either just file names or full
-//     absolute paths if the unit files are residing outside
-//     the usual unit search paths)
-//   * runtime to specify whether the unit was enabled for runtime
-//     only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
-//   * force flag
-func (c *Conn) MaskUnitFiles(files []string, runtime bool, force bool) ([]MaskUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.MaskUnitFiles", 0, files, runtime, force).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]MaskUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-type MaskUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// UnmaskUnitFiles unmasks one or more units in the system
-//
-// It takes two arguments:
-//   * list of unit files to mask (either just file names or full
-//     absolute paths if the unit files are residing outside
-//     the usual unit search paths)
-//   * runtime to specify whether the unit was enabled for runtime
-//     only (true, /run/systemd/..), or persistently (false, /etc/systemd/..)
-func (c *Conn) UnmaskUnitFiles(files []string, runtime bool) ([]UnmaskUnitFileChange, error) {
-	result := make([][]interface{}, 0)
-	err := c.sysobj.Call("org.freedesktop.systemd1.Manager.UnmaskUnitFiles", 0, files, runtime).Store(&result)
-	if err != nil {
-		return nil, err
-	}
-
-	resultInterface := make([]interface{}, len(result))
-	for i := range result {
-		resultInterface[i] = result[i]
-	}
-
-	changes := make([]UnmaskUnitFileChange, len(result))
-	changesInterface := make([]interface{}, len(changes))
-	for i := range changes {
-		changesInterface[i] = &changes[i]
-	}
-
-	err = dbus.Store(resultInterface, changesInterface...)
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-type UnmaskUnitFileChange struct {
-	Type        string // Type of the change (one of symlink or unlink)
-	Filename    string // File name of the symlink
-	Destination string // Destination of the symlink
-}
-
-// Reload instructs systemd to scan for and reload unit files. This is
-// equivalent to a 'systemctl daemon-reload'.
-func (c *Conn) Reload() error {
-	return c.sysobj.Call("org.freedesktop.systemd1.Manager.Reload", 0).Store()
-}
-
-func unitPath(name string) dbus.ObjectPath {
-	return dbus.ObjectPath("/org/freedesktop/systemd1/unit/" + PathBusEscape(name))
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/methods_test.go b/installer/vendor/github.com/coreos/go-systemd/dbus/methods_test.go
deleted file mode 100644
index d3d65a7472..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/methods_test.go
+++ /dev/null
@@ -1,1492 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"reflect"
-	"syscall"
-	"testing"
-	"time"
-
-	"github.com/godbus/dbus"
-)
-
-type TrUnitProp struct {
-	name  string
-	props []Property
-}
-
-func setupConn(t *testing.T) *Conn {
-	conn, err := New()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return conn
-}
-
-func findFixture(target string, t *testing.T) string {
-	abs, err := filepath.Abs("../fixtures/" + target)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return abs
-}
-
-func setupUnit(target string, conn *Conn, t *testing.T) {
-	// Blindly stop the unit in case it is running
-	conn.StopUnit(target, "replace", nil)
-
-	// Blindly remove the symlink in case it exists
-	targetRun := filepath.Join("/run/systemd/system/", target)
-	os.Remove(targetRun)
-}
-
-func linkUnit(target string, conn *Conn, t *testing.T) {
-	abs := findFixture(target, t)
-	fixture := []string{abs}
-
-	changes, err := conn.LinkUnitFiles(fixture, true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(changes) < 1 {
-		t.Fatalf("Expected one change, got %v", changes)
-	}
-
-	runPath := filepath.Join("/run/systemd/system/", target)
-	if changes[0].Filename != runPath {
-		t.Fatal("Unexpected target filename")
-	}
-}
-
-func getUnitStatus(units []UnitStatus, name string) *UnitStatus {
-	for _, u := range units {
-		if u.Name == name {
-			return &u
-		}
-	}
-	return nil
-}
-
-func getUnitStatusSingle(conn *Conn, name string) *UnitStatus {
-	units, err := conn.ListUnits()
-	if err != nil {
-		return nil
-	}
-	return getUnitStatus(units, name)
-}
-
-func getUnitFile(units []UnitFile, name string) *UnitFile {
-	for _, u := range units {
-		if path.Base(u.Path) == name {
-			return &u
-		}
-	}
-	return nil
-}
-
-func runStartTrUnit(t *testing.T, conn *Conn, trTarget TrUnitProp) error {
-	reschan := make(chan string)
-	_, err := conn.StartTransientUnit(trTarget.name, "replace", trTarget.props, reschan)
-	if err != nil {
-		return err
-	}
-
-	job := <-reschan
-	if job != "done" {
-		return fmt.Errorf("Job is not done: %s", job)
-	}
-
-	return nil
-}
-
-func runStopUnit(t *testing.T, conn *Conn, trTarget TrUnitProp) error {
-	reschan := make(chan string)
-	_, err := conn.StopUnit(trTarget.name, "replace", reschan)
-	if err != nil {
-		return err
-	}
-
-	// wait for StopUnit job to complete
-	<-reschan
-
-	return nil
-}
-
-// Ensure that basic unit starting and stopping works.
-func TestStartStopUnit(t *testing.T) {
-	target := "start-stop.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// 2. Start the unit
-	reschan := make(chan string)
-	_, err := conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// 3. Stop the unit
-	_, err = conn.StopUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// wait for StopUnit job to complete
-	<-reschan
-
-	units, err = conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitStatus(units, target)
-
-	if unit != nil {
-		t.Fatalf("Test unit found in list, should be stopped")
-	}
-}
-
-// Ensure that basic unit restarting works.
-func TestRestartUnit(t *testing.T) {
-	target := "start-stop.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err := conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// Restart the unit
-	reschan = make(chan string)
-	_, err = conn.RestartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job = <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	// Stop the unit
-	_, err = conn.StopUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// wait for StopUnit job to complete
-	<-reschan
-
-	units, err = conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitStatus(units, target)
-	if unit != nil {
-		t.Fatalf("Test unit found in list, should be stopped")
-	}
-
-	// Try to restart the unit.
-	// It should still succeed, even if the unit is inactive.
-	reschan = make(chan string)
-	_, err = conn.TryRestartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// wait for StopUnit job to complete
-	<-reschan
-
-	units, err = conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitStatus(units, target)
-	if unit != nil {
-		t.Fatalf("Test unit found in list, should be stopped")
-	}
-}
-
-// Ensure that basic unit reloading works.
-func TestReloadUnit(t *testing.T) {
-	target := "reload.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	err := conn.Subscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	subSet := conn.NewSubscriptionSet()
-	evChan, errChan := subSet.Subscribe()
-
-	subSet.Add(target)
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err = conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// Reload the unit
-	reschan = make(chan string)
-
-	_, err = conn.ReloadUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job = <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	timeout := make(chan bool, 1)
-	go func() {
-		time.Sleep(3 * time.Second)
-		close(timeout)
-	}()
-
-	// Wait for the event, expecting the target UnitStatus meets all of the
-	// following conditions:
-	//  * target is non-nil
-	//  * target's ActiveState is active.
-waitevent:
-	for {
-		select {
-		case changes := <-evChan:
-			tch, ok := changes[target]
-			if !ok {
-				continue waitevent
-			}
-			if tch != nil && tch.Name == target && tch.ActiveState == "active" {
-				break waitevent
-			}
-		case err = <-errChan:
-			t.Fatal(err)
-		case <-timeout:
-			t.Fatal("Reached timeout")
-		}
-	}
-}
-
-// Ensure that basic unit reload-or-restarting works.
-func TestReloadOrRestartUnit(t *testing.T) {
-	target := "reload.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err := conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// Reload or restart the unit
-	reschan = make(chan string)
-	_, err = conn.ReloadOrRestartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job = <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	// Stop the unit
-	_, err = conn.StopUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// wait for StopUnit job to complete
-	<-reschan
-
-	units, err = conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitStatus(units, target)
-	if unit != nil && unit.ActiveState == "active" {
-		t.Fatalf("Test unit still active, should be inactive.")
-	}
-
-	// Reload or try to restart the unit
-	// It should still succeed, even if the unit is inactive.
-	reschan = make(chan string)
-	_, err = conn.ReloadOrTryRestartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job = <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-}
-
-// Ensure that ListUnitsByNames works.
-func TestListUnitsByNames(t *testing.T) {
-	target1 := "systemd-journald.service"
-	target2 := "unexisting.service"
-
-	conn := setupConn(t)
-	defer conn.Close()
-
-	units, err := conn.ListUnitsByNames([]string{target1, target2})
-
-	if err != nil {
-		t.Skip(err)
-	}
-
-	unit := getUnitStatus(units, target1)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target1)
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("%s unit should be active but it is %s", target1, unit.ActiveState)
-	}
-
-	unit = getUnitStatus(units, target2)
-
-	if unit == nil {
-		t.Fatalf("Unexisting test unit not found in list")
-	} else if unit.ActiveState != "inactive" {
-		t.Fatalf("Test unit should be inactive")
-	}
-}
-
-// Ensure that ListUnitsByPatterns works.
-func TestListUnitsByPatterns(t *testing.T) {
-	target1 := "systemd-journald.service"
-	target2 := "unexisting.service"
-
-	conn := setupConn(t)
-	defer conn.Close()
-
-	units, err := conn.ListUnitsByPatterns([]string{}, []string{"systemd-journald*", target2})
-
-	if err != nil {
-		t.Skip(err)
-	}
-
-	unit := getUnitStatus(units, target1)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target1)
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit should be active")
-	}
-
-	unit = getUnitStatus(units, target2)
-
-	if unit != nil {
-		t.Fatalf("Unexisting test unit found in list")
-	}
-}
-
-// Ensure that ListUnitsFiltered works.
-func TestListUnitsFiltered(t *testing.T) {
-	target := "systemd-journald.service"
-
-	conn := setupConn(t)
-	defer conn.Close()
-
-	units, err := conn.ListUnitsFiltered([]string{"active"})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target)
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit should be active")
-	}
-
-	units, err = conn.ListUnitsFiltered([]string{"inactive"})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitStatus(units, target)
-
-	if unit != nil {
-		t.Fatalf("Inactive unit should not be found in list")
-	}
-}
-
-// Ensure that ListUnitFilesByPatterns works.
-func TestListUnitFilesByPatterns(t *testing.T) {
-	target1 := "systemd-journald.service"
-	target2 := "exit.target"
-
-	conn := setupConn(t)
-	defer conn.Close()
-
-	units, err := conn.ListUnitFilesByPatterns([]string{"static"}, []string{"systemd-journald*", target2})
-
-	if err != nil {
-		t.Skip(err)
-	}
-
-	unit := getUnitFile(units, target1)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target1)
-	} else if unit.Type != "static" {
-		t.Fatalf("Test unit file should be static")
-	}
-
-	units, err = conn.ListUnitFilesByPatterns([]string{"disabled"}, []string{"systemd-journald*", target2})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit = getUnitFile(units, target2)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target2)
-	} else if unit.Type != "disabled" {
-		t.Fatalf("%s unit file should be disabled", target2)
-	}
-}
-
-func TestListUnitFiles(t *testing.T) {
-	target1 := "systemd-journald.service"
-	target2 := "exit.target"
-
-	conn := setupConn(t)
-	defer conn.Close()
-
-	units, err := conn.ListUnitFiles()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitFile(units, target1)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target1)
-	} else if unit.Type != "static" {
-		t.Fatalf("Test unit file should be static")
-	}
-
-	unit = getUnitFile(units, target2)
-
-	if unit == nil {
-		t.Fatalf("%s unit not found in list", target2)
-	} else if unit.Type != "disabled" {
-		t.Fatalf("%s unit file should be disabled", target2)
-	}
-}
-
-// Enables a unit and then immediately tears it down
-func TestEnableDisableUnit(t *testing.T) {
-	target := "enable-disable.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	abs := findFixture(target, t)
-	runPath := filepath.Join("/run/systemd/system/", target)
-
-	// 1. Enable the unit
-	install, changes, err := conn.EnableUnitFiles([]string{abs}, true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if install != false {
-		t.Log("Install was true")
-	}
-
-	if len(changes) < 1 {
-		t.Fatalf("Expected one change, got %v", changes)
-	}
-
-	if changes[0].Filename != runPath {
-		t.Fatal("Unexpected target filename")
-	}
-
-	// 2. Disable the unit
-	dChanges, err := conn.DisableUnitFiles([]string{target}, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(dChanges) != 1 {
-		t.Fatalf("Changes should include the path, %v", dChanges)
-	}
-	if dChanges[0].Filename != runPath {
-		t.Fatalf("Change should include correct filename, %+v", dChanges[0])
-	}
-	if dChanges[0].Destination != "" {
-		t.Fatalf("Change destination should be empty, %+v", dChanges[0])
-	}
-}
-
-// TestGetUnitProperties reads the `-.mount` which should exist on all systemd
-// systems and ensures that one of its properties is valid.
-func TestGetUnitProperties(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	unit := "-.mount"
-
-	info, err := conn.GetUnitProperties(unit)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	desc, _ := info["Description"].(string)
-
-	prop, err := conn.GetUnitProperty(unit, "Description")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if prop.Name != "Description" {
-		t.Fatal("unexpected property name")
-	}
-
-	val := prop.Value.Value().(string)
-	if !reflect.DeepEqual(val, desc) {
-		t.Fatal("unexpected property value")
-	}
-}
-
-// TestGetUnitPropertiesRejectsInvalidName attempts to get the properties for a
-// unit with an invalid name. This test should be run with --test.timeout set,
-// as a fail will manifest as GetUnitProperties hanging indefinitely.
-func TestGetUnitPropertiesRejectsInvalidName(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	unit := "//invalid#$^/"
-
-	_, err := conn.GetUnitProperties(unit)
-	if err == nil {
-		t.Fatal("Expected an error, got nil")
-	}
-
-	_, err = conn.GetUnitProperty(unit, "Wants")
-	if err == nil {
-		t.Fatal("Expected an error, got nil")
-	}
-}
-
-// TestGetServiceProperty reads the `systemd-udevd.service` which should exist
-// on all systemd systems and ensures that one of its property is valid.
-func TestGetServiceProperty(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	service := "systemd-udevd.service"
-
-	prop, err := conn.GetServiceProperty(service, "Type")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if prop.Name != "Type" {
-		t.Fatal("unexpected property name")
-	}
-
-	if _, ok := prop.Value.Value().(string); !ok {
-		t.Fatal("invalid property value")
-	}
-}
-
-// TestSetUnitProperties changes a cgroup setting on the `-.mount`
-// which should exist on all systemd systems and ensures that the
-// property was set.
-func TestSetUnitProperties(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	unit := "-.mount"
-
-	if err := conn.SetUnitProperties(unit, true, Property{"CPUShares", dbus.MakeVariant(uint64(1023))}); err != nil {
-		t.Fatal(err)
-	}
-
-	info, err := conn.GetUnitTypeProperties(unit, "Mount")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	value, _ := info["CPUShares"].(uint64)
-	if value != 1023 {
-		t.Fatal("CPUShares of unit is not 1023:", value)
-	}
-}
-
-// Ensure that oneshot transient unit starting and stopping works.
-func TestStartStopTransientUnitAll(t *testing.T) {
-	testCases := []struct {
-		trTarget  TrUnitProp
-		trDep     TrUnitProp
-		checkFunc func(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error
-	}{
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			trDep:     TrUnitProp{"", nil},
-			checkFunc: checkTransientUnit,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-oneshot.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/true"}, false),
-					PropType("oneshot"),
-					PropRemainAfterExit(true),
-				},
-			},
-			trDep:     TrUnitProp{"", nil},
-			checkFunc: checkTransientUnitOneshot,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-requires.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropRequires("testing-transient-requiresdep.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-requiresdep.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitRequires,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-requires-ov.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropRequires("testing-transient-requiresdep-ov.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-requiresdep-ov.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitRequiresOv,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-requisite.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropRequisite("testing-transient-requisitedep.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-requisitedep.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitRequisite,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-requisite-ov.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropRequisiteOverridable("testing-transient-requisitedep-ov.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-requisitedep-ov.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitRequisiteOv,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-wants.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropWants("testing-transient-wantsdep.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-wantsdep.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitWants,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-bindsto.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropBindsTo("testing-transient-bindstodep.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-bindstodep.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitBindsTo,
-		},
-		{
-			trTarget: TrUnitProp{
-				name: "testing-transient-conflicts.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-					PropConflicts("testing-transient-conflictsdep.service"),
-				},
-			},
-			trDep: TrUnitProp{
-				name: "testing-transient-conflictsdep.service",
-				props: []Property{
-					PropExecStart([]string{"/bin/sleep", "400"}, false),
-				},
-			},
-			checkFunc: checkTransientUnitConflicts,
-		},
-	}
-
-	for i, tt := range testCases {
-		if err := tt.checkFunc(t, tt.trTarget, tt.trDep); err != nil {
-			t.Errorf("case %d: failed test with unit %s. err: %v", i, tt.trTarget.name, err)
-		}
-	}
-}
-
-// Ensure that basic transient unit starting and stopping works.
-func checkTransientUnit(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the unit
-	err := runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		return fmt.Errorf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		return fmt.Errorf("Test unit not active")
-	}
-
-	// Stop the unit
-	err = runStopUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-func checkTransientUnitOneshot(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the unit
-	err := runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		return fmt.Errorf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		return fmt.Errorf("Test unit not active")
-	}
-
-	// Stop the unit
-	err = runStopUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with Requires starting and stopping works.
-func checkTransientUnitRequires(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the dependent unit
-	err := runStartTrUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	// Start the target unit
-	err = runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		return fmt.Errorf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		return fmt.Errorf("Test unit not active")
-	}
-
-	// Stop the unit
-	err = runStopUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	// Stop the dependent unit
-	err = runStopUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trDep.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with RequiresOverridable starting and stopping works.
-func checkTransientUnitRequiresOv(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the dependent unit
-	err := runStartTrUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	// Start the target unit
-	err = runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		return fmt.Errorf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		return fmt.Errorf("Test unit not active")
-	}
-
-	// Stop the unit
-	err = runStopUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	// Stop the dependent unit
-	err = runStopUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trDep.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with Requisite starting and stopping works.
-// It's expected for target unit to fail, as its child is not started at all.
-func checkTransientUnitRequisite(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the target unit
-	err := runStartTrUnit(t, conn, trTarget)
-	if err == nil {
-		return fmt.Errorf("Unit %s is expected to fail, but succeeded.", trTarget.name)
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil && unit.ActiveState == "active" {
-		return fmt.Errorf("Test unit %s is active, should be inactive", trTarget.name)
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with RequisiteOverridable starting and stopping works.
-// It's expected for target unit to fail, as its child is not started at all.
-func checkTransientUnitRequisiteOv(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the target unit
-	err := runStartTrUnit(t, conn, trTarget)
-	if err == nil {
-		return fmt.Errorf("Unit %s is expected to fail, but succeeded.", trTarget.name)
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil && unit.ActiveState == "active" {
-		return fmt.Errorf("Test unit %s is active, should be inactive", trTarget.name)
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with Wants starting and stopping works.
-// It's expected for target to successfully start, even when its child is not started.
-func checkTransientUnitWants(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the target unit
-	err := runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		return fmt.Errorf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		return fmt.Errorf("Test unit not active")
-	}
-
-	// Stop the unit
-	err = runStopUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		return fmt.Errorf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with BindsTo starting and stopping works.
-// Stopping its child should result in stopping target unit.
-func checkTransientUnitBindsTo(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the dependent unit
-	err := runStartTrUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	// Start the target unit
-	err = runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// Stop the dependent unit
-	err = runStopUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	unit = getUnitStatusSingle(conn, trDep.name)
-	if unit != nil {
-		t.Fatalf("Test unit found in list, should be stopped")
-	}
-
-	// Then the target unit should be gone
-	unit = getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil {
-		t.Fatalf("Test unit found in list, should be stopped")
-	}
-
-	return nil
-}
-
-// Ensure that transient unit with Conflicts starting and stopping works.
-func checkTransientUnitConflicts(t *testing.T, trTarget TrUnitProp, trDep TrUnitProp) error {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	// Start the dependent unit
-	err := runStartTrUnit(t, conn, trDep)
-	if err != nil {
-		return err
-	}
-
-	// Start the target unit
-	err = runStartTrUnit(t, conn, trTarget)
-	if err != nil {
-		return err
-	}
-
-	isTargetActive := false
-	unit := getUnitStatusSingle(conn, trTarget.name)
-	if unit != nil && unit.ActiveState == "active" {
-		isTargetActive = true
-	}
-
-	isReqDepActive := false
-	unit = getUnitStatusSingle(conn, trDep.name)
-	if unit != nil && unit.ActiveState == "active" {
-		isReqDepActive = true
-	}
-
-	if isTargetActive && isReqDepActive {
-		return fmt.Errorf("Conflicts didn't take place")
-	}
-
-	// Stop the target unit
-	if isTargetActive {
-		err = runStopUnit(t, conn, trTarget)
-		if err != nil {
-			return err
-		}
-
-		unit = getUnitStatusSingle(conn, trTarget.name)
-		if unit != nil {
-			return fmt.Errorf("Test unit %s found in list, should be stopped", trTarget.name)
-		}
-	}
-
-	// Stop the dependent unit
-	if isReqDepActive {
-		err = runStopUnit(t, conn, trDep)
-		if err != nil {
-			return err
-		}
-
-		unit = getUnitStatusSingle(conn, trDep.name)
-		if unit != nil {
-			return fmt.Errorf("Test unit %s found in list, should be stopped", trDep.name)
-		}
-	}
-
-	return nil
-}
-
-// Ensure that putting running programs into scopes works
-func TestStartStopTransientScope(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	cmd := exec.Command("/bin/sleep", "400")
-	err := cmd.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer cmd.Process.Kill()
-
-	props := []Property{
-		PropPids(uint32(cmd.Process.Pid)),
-	}
-	target := fmt.Sprintf("testing-transient-%d.scope", cmd.Process.Pid)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err = conn.StartTransientUnit(target, "replace", props, reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	} else if unit.ActiveState != "active" {
-		t.Fatalf("Test unit not active")
-	}
-
-	// maybe check if pid is really a member of the just created scope
-	//   systemd uses the following api which does not use dbus, but directly
-	//   accesses procfs for cgroup information.
-	//     int sd_pid_get_unit(pid_t pid, char **session)
-}
-
-// Ensure that basic unit gets killed by SIGTERM
-func TestKillUnit(t *testing.T) {
-	target := "start-stop.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	err := conn.Subscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	subSet := conn.NewSubscriptionSet()
-	evChan, errChan := subSet.Subscribe()
-
-	subSet.Add(target)
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err = conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Job is not done:", job)
-	}
-
-	// send SIGTERM
-	conn.KillUnit(target, int32(syscall.SIGTERM))
-
-	timeout := make(chan bool, 1)
-	go func() {
-		time.Sleep(3 * time.Second)
-		close(timeout)
-	}()
-
-	// Wait for the event, expecting the target UnitStatus meets one of the
-	// following conditions:
-	//  * target is nil, meaning the unit has completely gone.
-	//  * target is non-nil, and its ActiveState is not active.
-waitevent:
-	for {
-		select {
-		case changes := <-evChan:
-			tch, ok := changes[target]
-			if !ok {
-				continue waitevent
-			}
-			if tch == nil || (tch != nil && tch.Name == target && tch.ActiveState != "active") {
-				break waitevent
-			}
-		case err = <-errChan:
-			t.Fatal(err)
-		case <-timeout:
-			t.Fatal("Reached timeout")
-		}
-	}
-}
-
-// Ensure that a failed unit gets reset
-func TestResetFailedUnit(t *testing.T) {
-	target := "start-failed.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	// Start the unit
-	reschan := make(chan string)
-	_, err := conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "failed" {
-		t.Fatal("Job is not failed:", job)
-	}
-
-	units, err := conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	unit := getUnitStatus(units, target)
-	if unit == nil {
-		t.Fatalf("Test unit not found in list")
-	}
-
-	// reset the failed unit
-	err = conn.ResetFailedUnit(target)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure that the target unit is actually gone
-	units, err = conn.ListUnits()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	found := false
-	for _, u := range units {
-		if u.Name == target {
-			found = true
-			break
-		}
-	}
-	if found {
-		t.Fatalf("Test unit still found in list. units = %v", units)
-	}
-}
-
-func TestConnJobListener(t *testing.T) {
-	target := "start-stop.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	jobSize := len(conn.jobListener.jobs)
-
-	reschan := make(chan string)
-	_, err := conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	<-reschan
-
-	_, err = conn.StopUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	<-reschan
-
-	currentJobSize := len(conn.jobListener.jobs)
-	if jobSize != currentJobSize {
-		t.Fatal("JobListener jobs leaked")
-	}
-}
-
-// Enables a unit and then masks/unmasks it
-func TestMaskUnmask(t *testing.T) {
-	target := "mask-unmask.service"
-	conn := setupConn(t)
-	defer conn.Close()
-
-	setupUnit(target, conn, t)
-	abs := findFixture(target, t)
-	runPath := filepath.Join("/run/systemd/system/", target)
-
-	// 1. Enable the unit
-	install, changes, err := conn.EnableUnitFiles([]string{abs}, true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if install != false {
-		t.Log("Install was true")
-	}
-
-	if len(changes) < 1 {
-		t.Fatalf("Expected one change, got %v", changes)
-	}
-
-	if changes[0].Filename != runPath {
-		t.Fatal("Unexpected target filename")
-	}
-
-	// 2. Mask the unit
-	mChanges, err := conn.MaskUnitFiles([]string{target}, true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if mChanges[0].Filename != runPath {
-		t.Fatalf("Change should include correct filename, %+v", mChanges[0])
-	}
-	if mChanges[0].Destination != "" {
-		t.Fatalf("Change destination should be empty, %+v", mChanges[0])
-	}
-
-	// 3. Unmask the unit
-	uChanges, err := conn.UnmaskUnitFiles([]string{target}, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if uChanges[0].Filename != runPath {
-		t.Fatalf("Change should include correct filename, %+v", uChanges[0])
-	}
-	if uChanges[0].Destination != "" {
-		t.Fatalf("Change destination should be empty, %+v", uChanges[0])
-	}
-
-}
-
-// Test a global Reload
-func TestReload(t *testing.T) {
-	conn := setupConn(t)
-	defer conn.Close()
-
-	err := conn.Reload()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/properties.go b/installer/vendor/github.com/coreos/go-systemd/dbus/properties.go
deleted file mode 100644
index 6c81895876..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/properties.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"github.com/godbus/dbus"
-)
-
-// From the systemd docs:
-//
-// The properties array of StartTransientUnit() may take many of the settings
-// that may also be configured in unit files. Not all parameters are currently
-// accepted though, but we plan to cover more properties with future release.
-// Currently you may set the Description, Slice and all dependency types of
-// units, as well as RemainAfterExit, ExecStart for service units,
-// TimeoutStopUSec and PIDs for scope units, and CPUAccounting, CPUShares,
-// BlockIOAccounting, BlockIOWeight, BlockIOReadBandwidth,
-// BlockIOWriteBandwidth, BlockIODeviceWeight, MemoryAccounting, MemoryLimit,
-// DevicePolicy, DeviceAllow for services/scopes/slices. These fields map
-// directly to their counterparts in unit files and as normal D-Bus object
-// properties. The exception here is the PIDs field of scope units which is
-// used for construction of the scope only and specifies the initial PIDs to
-// add to the scope object.
-
-type Property struct {
-	Name  string
-	Value dbus.Variant
-}
-
-type PropertyCollection struct {
-	Name       string
-	Properties []Property
-}
-
-type execStart struct {
-	Path             string   // the binary path to execute
-	Args             []string // an array with all arguments to pass to the executed command, starting with argument 0
-	UncleanIsFailure bool     // a boolean whether it should be considered a failure if the process exits uncleanly
-}
-
-// PropExecStart sets the ExecStart service property.  The first argument is a
-// slice with the binary path to execute followed by the arguments to pass to
-// the executed command. See
-// http://www.freedesktop.org/software/systemd/man/systemd.service.html#ExecStart=
-func PropExecStart(command []string, uncleanIsFailure bool) Property {
-	execStarts := []execStart{
-		execStart{
-			Path:             command[0],
-			Args:             command,
-			UncleanIsFailure: uncleanIsFailure,
-		},
-	}
-
-	return Property{
-		Name:  "ExecStart",
-		Value: dbus.MakeVariant(execStarts),
-	}
-}
-
-// PropRemainAfterExit sets the RemainAfterExit service property. See
-// http://www.freedesktop.org/software/systemd/man/systemd.service.html#RemainAfterExit=
-func PropRemainAfterExit(b bool) Property {
-	return Property{
-		Name:  "RemainAfterExit",
-		Value: dbus.MakeVariant(b),
-	}
-}
-
-// PropType sets the Type service property. See
-// http://www.freedesktop.org/software/systemd/man/systemd.service.html#Type=
-func PropType(t string) Property {
-	return Property{
-		Name:  "Type",
-		Value: dbus.MakeVariant(t),
-	}
-}
-
-// PropDescription sets the Description unit property. See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit#Description=
-func PropDescription(desc string) Property {
-	return Property{
-		Name:  "Description",
-		Value: dbus.MakeVariant(desc),
-	}
-}
-
-func propDependency(name string, units []string) Property {
-	return Property{
-		Name:  name,
-		Value: dbus.MakeVariant(units),
-	}
-}
-
-// PropRequires sets the Requires unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requires=
-func PropRequires(units ...string) Property {
-	return propDependency("Requires", units)
-}
-
-// PropRequiresOverridable sets the RequiresOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresOverridable=
-func PropRequiresOverridable(units ...string) Property {
-	return propDependency("RequiresOverridable", units)
-}
-
-// PropRequisite sets the Requisite unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Requisite=
-func PropRequisite(units ...string) Property {
-	return propDependency("Requisite", units)
-}
-
-// PropRequisiteOverridable sets the RequisiteOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequisiteOverridable=
-func PropRequisiteOverridable(units ...string) Property {
-	return propDependency("RequisiteOverridable", units)
-}
-
-// PropWants sets the Wants unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Wants=
-func PropWants(units ...string) Property {
-	return propDependency("Wants", units)
-}
-
-// PropBindsTo sets the BindsTo unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#BindsTo=
-func PropBindsTo(units ...string) Property {
-	return propDependency("BindsTo", units)
-}
-
-// PropRequiredBy sets the RequiredBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredBy=
-func PropRequiredBy(units ...string) Property {
-	return propDependency("RequiredBy", units)
-}
-
-// PropRequiredByOverridable sets the RequiredByOverridable unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiredByOverridable=
-func PropRequiredByOverridable(units ...string) Property {
-	return propDependency("RequiredByOverridable", units)
-}
-
-// PropWantedBy sets the WantedBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#WantedBy=
-func PropWantedBy(units ...string) Property {
-	return propDependency("WantedBy", units)
-}
-
-// PropBoundBy sets the BoundBy unit property.  See
-// http://www.freedesktop.org/software/systemd/main/systemd.unit.html#BoundBy=
-func PropBoundBy(units ...string) Property {
-	return propDependency("BoundBy", units)
-}
-
-// PropConflicts sets the Conflicts unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Conflicts=
-func PropConflicts(units ...string) Property {
-	return propDependency("Conflicts", units)
-}
-
-// PropConflictedBy sets the ConflictedBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#ConflictedBy=
-func PropConflictedBy(units ...string) Property {
-	return propDependency("ConflictedBy", units)
-}
-
-// PropBefore sets the Before unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=
-func PropBefore(units ...string) Property {
-	return propDependency("Before", units)
-}
-
-// PropAfter sets the After unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#After=
-func PropAfter(units ...string) Property {
-	return propDependency("After", units)
-}
-
-// PropOnFailure sets the OnFailure unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#OnFailure=
-func PropOnFailure(units ...string) Property {
-	return propDependency("OnFailure", units)
-}
-
-// PropTriggers sets the Triggers unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Triggers=
-func PropTriggers(units ...string) Property {
-	return propDependency("Triggers", units)
-}
-
-// PropTriggeredBy sets the TriggeredBy unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#TriggeredBy=
-func PropTriggeredBy(units ...string) Property {
-	return propDependency("TriggeredBy", units)
-}
-
-// PropPropagatesReloadTo sets the PropagatesReloadTo unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#PropagatesReloadTo=
-func PropPropagatesReloadTo(units ...string) Property {
-	return propDependency("PropagatesReloadTo", units)
-}
-
-// PropRequiresMountsFor sets the RequiresMountsFor unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.unit.html#RequiresMountsFor=
-func PropRequiresMountsFor(units ...string) Property {
-	return propDependency("RequiresMountsFor", units)
-}
-
-// PropSlice sets the Slice unit property.  See
-// http://www.freedesktop.org/software/systemd/man/systemd.resource-control.html#Slice=
-func PropSlice(slice string) Property {
-	return Property{
-		Name:  "Slice",
-		Value: dbus.MakeVariant(slice),
-	}
-}
-
-// PropPids sets the PIDs field of scope units used in the initial construction
-// of the scope only and specifies the initial PIDs to add to the scope object.
-// See https://www.freedesktop.org/wiki/Software/systemd/ControlGroupInterface/#properties
-func PropPids(pids ...uint32) Property {
-	return Property{
-		Name:  "PIDs",
-		Value: dbus.MakeVariant(pids),
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/set.go b/installer/vendor/github.com/coreos/go-systemd/dbus/set.go
deleted file mode 100644
index f92e6fbed1..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/set.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-type set struct {
-	data map[string]bool
-}
-
-func (s *set) Add(value string) {
-	s.data[value] = true
-}
-
-func (s *set) Remove(value string) {
-	delete(s.data, value)
-}
-
-func (s *set) Contains(value string) (exists bool) {
-	_, exists = s.data[value]
-	return
-}
-
-func (s *set) Length() int {
-	return len(s.data)
-}
-
-func (s *set) Values() (values []string) {
-	for val, _ := range s.data {
-		values = append(values, val)
-	}
-	return
-}
-
-func newSet() *set {
-	return &set{make(map[string]bool)}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/set_test.go b/installer/vendor/github.com/coreos/go-systemd/dbus/set_test.go
deleted file mode 100644
index 2f04096f99..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/set_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"testing"
-)
-
-// TestBasicSetActions asserts that Add & Remove behavior is correct
-func TestBasicSetActions(t *testing.T) {
-	s := newSet()
-
-	if s.Contains("foo") {
-		t.Fatal("set should not contain 'foo'")
-	}
-
-	s.Add("foo")
-
-	if !s.Contains("foo") {
-		t.Fatal("set should contain 'foo'")
-	}
-
-	v := s.Values()
-	if len(v) != 1 {
-		t.Fatal("set.Values did not report correct number of values")
-	}
-	if v[0] != "foo" {
-		t.Fatal("set.Values did not report value")
-	}
-
-	s.Remove("foo")
-
-	if s.Contains("foo") {
-		t.Fatal("set should not contain 'foo'")
-	}
-
-	v = s.Values()
-	if len(v) != 0 {
-		t.Fatal("set.Values did not report correct number of values")
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription.go b/installer/vendor/github.com/coreos/go-systemd/dbus/subscription.go
deleted file mode 100644
index 996451445c..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"errors"
-	"time"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	cleanIgnoreInterval = int64(10 * time.Second)
-	ignoreInterval      = int64(30 * time.Millisecond)
-)
-
-// Subscribe sets up this connection to subscribe to all systemd dbus events.
-// This is required before calling SubscribeUnits. When the connection closes
-// systemd will automatically stop sending signals so there is no need to
-// explicitly call Unsubscribe().
-func (c *Conn) Subscribe() error {
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal',interface='org.freedesktop.systemd1.Manager',member='UnitNew'")
-	c.sigconn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-		"type='signal',interface='org.freedesktop.DBus.Properties',member='PropertiesChanged'")
-
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Subscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Unsubscribe this connection from systemd dbus events.
-func (c *Conn) Unsubscribe() error {
-	err := c.sigobj.Call("org.freedesktop.systemd1.Manager.Unsubscribe", 0).Store()
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Conn) dispatch() {
-	ch := make(chan *dbus.Signal, signalBuffer)
-
-	c.sigconn.Signal(ch)
-
-	go func() {
-		for {
-			signal, ok := <-ch
-			if !ok {
-				return
-			}
-
-			if signal.Name == "org.freedesktop.systemd1.Manager.JobRemoved" {
-				c.jobComplete(signal)
-			}
-
-			if c.subscriber.updateCh == nil {
-				continue
-			}
-
-			var unitPath dbus.ObjectPath
-			switch signal.Name {
-			case "org.freedesktop.systemd1.Manager.JobRemoved":
-				unitName := signal.Body[2].(string)
-				c.sysobj.Call("org.freedesktop.systemd1.Manager.GetUnit", 0, unitName).Store(&unitPath)
-			case "org.freedesktop.systemd1.Manager.UnitNew":
-				unitPath = signal.Body[1].(dbus.ObjectPath)
-			case "org.freedesktop.DBus.Properties.PropertiesChanged":
-				if signal.Body[0].(string) == "org.freedesktop.systemd1.Unit" {
-					unitPath = signal.Path
-				}
-			}
-
-			if unitPath == dbus.ObjectPath("") {
-				continue
-			}
-
-			c.sendSubStateUpdate(unitPath)
-		}
-	}()
-}
-
-// Returns two unbuffered channels which will receive all changed units every
-// interval.  Deleted units are sent as nil.
-func (c *Conn) SubscribeUnits(interval time.Duration) (<-chan map[string]*UnitStatus, <-chan error) {
-	return c.SubscribeUnitsCustom(interval, 0, func(u1, u2 *UnitStatus) bool { return *u1 != *u2 }, nil)
-}
-
-// SubscribeUnitsCustom is like SubscribeUnits but lets you specify the buffer
-// size of the channels, the comparison function for detecting changes and a filter
-// function for cutting down on the noise that your channel receives.
-func (c *Conn) SubscribeUnitsCustom(interval time.Duration, buffer int, isChanged func(*UnitStatus, *UnitStatus) bool, filterUnit func(string) bool) (<-chan map[string]*UnitStatus, <-chan error) {
-	old := make(map[string]*UnitStatus)
-	statusChan := make(chan map[string]*UnitStatus, buffer)
-	errChan := make(chan error, buffer)
-
-	go func() {
-		for {
-			timerChan := time.After(interval)
-
-			units, err := c.ListUnits()
-			if err == nil {
-				cur := make(map[string]*UnitStatus)
-				for i := range units {
-					if filterUnit != nil && filterUnit(units[i].Name) {
-						continue
-					}
-					cur[units[i].Name] = &units[i]
-				}
-
-				// add all new or changed units
-				changed := make(map[string]*UnitStatus)
-				for n, u := range cur {
-					if oldU, ok := old[n]; !ok || isChanged(oldU, u) {
-						changed[n] = u
-					}
-					delete(old, n)
-				}
-
-				// add all deleted units
-				for oldN := range old {
-					changed[oldN] = nil
-				}
-
-				old = cur
-
-				if len(changed) != 0 {
-					statusChan <- changed
-				}
-			} else {
-				errChan <- err
-			}
-
-			<-timerChan
-		}
-	}()
-
-	return statusChan, errChan
-}
-
-type SubStateUpdate struct {
-	UnitName string
-	SubState string
-}
-
-// SetSubStateSubscriber writes to updateCh when any unit's substate changes.
-// Although this writes to updateCh on every state change, the reported state
-// may be more recent than the change that generated it (due to an unavoidable
-// race in the systemd dbus interface).  That is, this method provides a good
-// way to keep a current view of all units' states, but is not guaranteed to
-// show every state transition they go through.  Furthermore, state changes
-// will only be written to the channel with non-blocking writes.  If updateCh
-// is full, it attempts to write an error to errCh; if errCh is full, the error
-// passes silently.
-func (c *Conn) SetSubStateSubscriber(updateCh chan<- *SubStateUpdate, errCh chan<- error) {
-	c.subscriber.Lock()
-	defer c.subscriber.Unlock()
-	c.subscriber.updateCh = updateCh
-	c.subscriber.errCh = errCh
-}
-
-func (c *Conn) sendSubStateUpdate(path dbus.ObjectPath) {
-	c.subscriber.Lock()
-	defer c.subscriber.Unlock()
-
-	if c.shouldIgnore(path) {
-		return
-	}
-
-	info, err := c.GetUnitProperties(string(path))
-	if err != nil {
-		select {
-		case c.subscriber.errCh <- err:
-		default:
-		}
-	}
-
-	name := info["Id"].(string)
-	substate := info["SubState"].(string)
-
-	update := &SubStateUpdate{name, substate}
-	select {
-	case c.subscriber.updateCh <- update:
-	default:
-		select {
-		case c.subscriber.errCh <- errors.New("update channel full!"):
-		default:
-		}
-	}
-
-	c.updateIgnore(path, info)
-}
-
-// The ignore functions work around a wart in the systemd dbus interface.
-// Requesting the properties of an unloaded unit will cause systemd to send a
-// pair of UnitNew/UnitRemoved signals.  Because we need to get a unit's
-// properties on UnitNew (as that's the only indication of a new unit coming up
-// for the first time), we would enter an infinite loop if we did not attempt
-// to detect and ignore these spurious signals.  The signal themselves are
-// indistinguishable from relevant ones, so we (somewhat hackishly) ignore an
-// unloaded unit's signals for a short time after requesting its properties.
-// This means that we will miss e.g. a transient unit being restarted
-// *immediately* upon failure and also a transient unit being started
-// immediately after requesting its status (with systemctl status, for example,
-// because this causes a UnitNew signal to be sent which then causes us to fetch
-// the properties).
-
-func (c *Conn) shouldIgnore(path dbus.ObjectPath) bool {
-	t, ok := c.subscriber.ignore[path]
-	return ok && t >= time.Now().UnixNano()
-}
-
-func (c *Conn) updateIgnore(path dbus.ObjectPath, info map[string]interface{}) {
-	c.cleanIgnore()
-
-	// unit is unloaded - it will trigger bad systemd dbus behavior
-	if info["LoadState"].(string) == "not-found" {
-		c.subscriber.ignore[path] = time.Now().UnixNano() + ignoreInterval
-	}
-}
-
-// without this, ignore would grow unboundedly over time
-func (c *Conn) cleanIgnore() {
-	now := time.Now().UnixNano()
-	if c.subscriber.cleanIgnore < now {
-		c.subscriber.cleanIgnore = now + cleanIgnoreInterval
-
-		for p, t := range c.subscriber.ignore {
-			if t < now {
-				delete(c.subscriber.ignore, p)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go b/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
deleted file mode 100644
index 5b408d5847..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"time"
-)
-
-// SubscriptionSet returns a subscription set which is like conn.Subscribe but
-// can filter to only return events for a set of units.
-type SubscriptionSet struct {
-	*set
-	conn *Conn
-}
-
-func (s *SubscriptionSet) filter(unit string) bool {
-	return !s.Contains(unit)
-}
-
-// Subscribe starts listening for dbus events for all of the units in the set.
-// Returns channels identical to conn.SubscribeUnits.
-func (s *SubscriptionSet) Subscribe() (<-chan map[string]*UnitStatus, <-chan error) {
-	// TODO: Make fully evented by using systemd 209 with properties changed values
-	return s.conn.SubscribeUnitsCustom(time.Second, 0,
-		mismatchUnitStatus,
-		func(unit string) bool { return s.filter(unit) },
-	)
-}
-
-// NewSubscriptionSet returns a new subscription set.
-func (conn *Conn) NewSubscriptionSet() *SubscriptionSet {
-	return &SubscriptionSet{newSet(), conn}
-}
-
-// mismatchUnitStatus returns true if the provided UnitStatus objects
-// are not equivalent. false is returned if the objects are equivalent.
-// Only the Name, Description and state-related fields are used in
-// the comparison.
-func mismatchUnitStatus(u1, u2 *UnitStatus) bool {
-	return u1.Name != u2.Name ||
-		u1.Description != u2.Description ||
-		u1.LoadState != u2.LoadState ||
-		u1.ActiveState != u2.ActiveState ||
-		u1.SubState != u2.SubState
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set_test.go b/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set_test.go
deleted file mode 100644
index 53f75dfb22..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_set_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"testing"
-	"time"
-)
-
-// TestSubscribeUnit exercises the basics of subscription of a particular unit.
-func TestSubscriptionSetUnit(t *testing.T) {
-	target := "subscribe-events-set.service"
-
-	conn, err := New()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = conn.Subscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	subSet := conn.NewSubscriptionSet()
-	evChan, errChan := subSet.Subscribe()
-
-	subSet.Add(target)
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	reschan := make(chan string)
-	_, err = conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Couldn't start", target)
-	}
-
-	timeout := make(chan bool, 1)
-	go func() {
-		time.Sleep(3 * time.Second)
-		close(timeout)
-	}()
-
-	for {
-		select {
-		case changes := <-evChan:
-			tCh, ok := changes[target]
-
-			if !ok {
-				t.Fatal("Unexpected event:", changes)
-			}
-
-			if tCh.ActiveState == "active" && tCh.Name == target {
-				goto success
-			}
-		case err = <-errChan:
-			t.Fatal(err)
-		case <-timeout:
-			t.Fatal("Reached timeout")
-		}
-	}
-
-success:
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_test.go b/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_test.go
deleted file mode 100644
index e50fc6f960..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/dbus/subscription_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dbus
-
-import (
-	"testing"
-	"time"
-)
-
-// TestSubscribe exercises the basics of subscription
-func TestSubscribe(t *testing.T) {
-	conn, err := New()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = conn.Subscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = conn.Unsubscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestSubscribeUnit exercises the basics of subscription of a particular unit.
-func TestSubscribeUnit(t *testing.T) {
-	target := "subscribe-events.service"
-
-	conn, err := New()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = conn.Subscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = conn.Unsubscribe()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	evChan, errChan := conn.SubscribeUnits(time.Second)
-
-	setupUnit(target, conn, t)
-	linkUnit(target, conn, t)
-
-	reschan := make(chan string)
-	_, err = conn.StartUnit(target, "replace", reschan)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	job := <-reschan
-	if job != "done" {
-		t.Fatal("Couldn't start", target)
-	}
-
-	timeout := make(chan bool, 1)
-	go func() {
-		time.Sleep(3 * time.Second)
-		close(timeout)
-	}()
-
-	for {
-		select {
-		case changes := <-evChan:
-			tCh, ok := changes[target]
-
-			// Just continue until we see our event.
-			if !ok {
-				continue
-			}
-
-			if tCh.ActiveState == "active" && tCh.Name == target {
-				goto success
-			}
-		case err = <-errChan:
-			t.Fatal(err)
-		case <-timeout:
-			t.Fatal("Reached timeout")
-		}
-	}
-
-success:
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/activation.go b/installer/vendor/github.com/coreos/go-systemd/examples/activation/activation.go
deleted file mode 100644
index d365d27b92..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/activation.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build ignore
-
-// Activation example used by the activation unit tests.
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/coreos/go-systemd/activation"
-)
-
-func fixListenPid() {
-	if os.Getenv("FIX_LISTEN_PID") != "" {
-		// HACK: real systemd would set LISTEN_PID before exec'ing but
-		// this is too difficult in golang for the purpose of a test.
-		// Do not do this in real code.
-		os.Setenv("LISTEN_PID", fmt.Sprintf("%d", os.Getpid()))
-	}
-}
-
-func main() {
-	fixListenPid()
-
-	files := activation.Files(false)
-
-	if len(files) == 0 {
-		panic("No files")
-	}
-
-	if os.Getenv("LISTEN_PID") == "" || os.Getenv("LISTEN_FDS") == "" {
-		panic("Should not unset envs")
-	}
-
-	files = activation.Files(true)
-
-	if os.Getenv("LISTEN_PID") != "" || os.Getenv("LISTEN_FDS") != "" {
-		panic("Can not unset envs")
-	}
-
-	// Write out the expected strings to the two pipes
-	files[0].Write([]byte("Hello world"))
-	files[1].Write([]byte("Goodbye world"))
-
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/README.md b/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/README.md
deleted file mode 100644
index 1549576c6e..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-## socket activated http server
-
-This is a simple example of using socket activation with systemd to serve a
-simple HTTP server on http://127.0.0.1:8076
-
-To try it out `go get` the httpserver and run it under the systemd-activate helper
-
-```bash
-export GOPATH="$PWD"
-go get github.com/coreos/go-systemd/examples/activation/httpserver
-/usr/lib/systemd/systemd-activate -l 127.0.0.1:8076 ./bin/httpserver
-```
-
-Then curl the URL and you will notice that it starts up:
-
-```
-curl 127.0.0.1:8076
-hello socket activated world!
-```
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.service b/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.service
deleted file mode 100644
index c8dea0f6b3..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Hello World HTTP
-Requires=network.target
-After=multi-user.target
-
-[Service]
-Type=simple
-ExecStart=/usr/local/bin/httpserver
-
-[Install]
-WantedBy=multi-user.target
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.socket b/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.socket
deleted file mode 100644
index 723ed7ed92..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/hello.socket
+++ /dev/null
@@ -1,5 +0,0 @@
-[Socket]
-ListenStream=127.0.0.1:8076
-
-[Install]
-WantedBy=sockets.target
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/httpserver.go b/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/httpserver.go
deleted file mode 100644
index 560347126c..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/httpserver/httpserver.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build ignore
-
-package main
-
-import (
-	"io"
-	"net/http"
-
-	"github.com/coreos/go-systemd/activation"
-)
-
-func HelloServer(w http.ResponseWriter, req *http.Request) {
-	io.WriteString(w, "hello socket activated world!\n")
-}
-
-func main() {
-	listeners, err := activation.Listeners(true)
-	if err != nil {
-		panic(err)
-	}
-
-	if len(listeners) != 1 {
-		panic("Unexpected number of socket activation fds")
-	}
-
-	http.HandleFunc("/", HelloServer)
-	http.Serve(listeners[0], nil)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/listen.go b/installer/vendor/github.com/coreos/go-systemd/examples/activation/listen.go
deleted file mode 100644
index 062db15651..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/listen.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build ignore
-
-// Activation example used by the activation unit tests.
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/coreos/go-systemd/activation"
-)
-
-func fixListenPid() {
-	if os.Getenv("FIX_LISTEN_PID") != "" {
-		// HACK: real systemd would set LISTEN_PID before exec'ing but
-		// this is too difficult in golang for the purpose of a test.
-		// Do not do this in real code.
-		os.Setenv("LISTEN_PID", fmt.Sprintf("%d", os.Getpid()))
-	}
-}
-
-func main() {
-	fixListenPid()
-
-	listeners, _ := activation.Listeners(false)
-
-	if len(listeners) == 0 {
-		panic("No listeners")
-	}
-
-	if os.Getenv("LISTEN_PID") == "" || os.Getenv("LISTEN_FDS") == "" {
-		panic("Should not unset envs")
-	}
-
-	listeners, err := activation.Listeners(true)
-	if err != nil {
-		panic(err)
-	}
-
-	if os.Getenv("LISTEN_PID") != "" || os.Getenv("LISTEN_FDS") != "" {
-		panic("Can not unset envs")
-	}
-
-	c0, _ := listeners[0].Accept()
-	c1, _ := listeners[1].Accept()
-
-	// Write out the expected strings to the two pipes
-	c0.Write([]byte("Hello world"))
-	c1.Write([]byte("Goodbye world"))
-
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/examples/activation/udpconn.go b/installer/vendor/github.com/coreos/go-systemd/examples/activation/udpconn.go
deleted file mode 100644
index f65194d4d1..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/examples/activation/udpconn.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build ignore
-
-// Activation example used by the activation unit tests.
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-
-	"github.com/coreos/go-systemd/activation"
-)
-
-func fixListenPid() {
-	if os.Getenv("FIX_LISTEN_PID") != "" {
-		// HACK: real systemd would set LISTEN_PID before exec'ing but
-		// this is too difficult in golang for the purpose of a test.
-		// Do not do this in real code.
-		os.Setenv("LISTEN_PID", fmt.Sprintf("%d", os.Getpid()))
-	}
-}
-
-func main() {
-	fixListenPid()
-
-	pc, _ := activation.PacketConns(false)
-
-	if len(pc) == 0 {
-		panic("No packetConns")
-	}
-
-	if os.Getenv("LISTEN_PID") == "" || os.Getenv("LISTEN_FDS") == "" {
-		panic("Should not unset envs")
-	}
-
-	pc, err := activation.PacketConns(true)
-	if err != nil {
-		panic(err)
-	}
-
-	if os.Getenv("LISTEN_PID") != "" || os.Getenv("LISTEN_FDS") != "" {
-		panic("Can not unset envs")
-	}
-
-	udp1, ok := pc[0].(*net.UDPConn)
-	if !ok {
-		panic("packetConn 1 not UDP")
-	}
-	udp2, ok := pc[1].(*net.UDPConn)
-	if !ok {
-		panic("packetConn 2 not UDP")
-	}
-
-	_, addr1, err := udp1.ReadFromUDP(nil)
-	if err != nil {
-		panic(err)
-	}
-	_, addr2, err := udp2.ReadFromUDP(nil)
-	if err != nil {
-		panic(err)
-	}
-
-	// Write out the expected strings to the two pipes
-	_, err = udp1.WriteToUDP([]byte("Hello world"), addr1)
-	if err != nil {
-		panic(err)
-	}
-	_, err = udp2.WriteToUDP([]byte("Goodbye world"), addr2)
-	if err != nil {
-		panic(err)
-	}
-
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/enable-disable.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/enable-disable.service
deleted file mode 100644
index 74c9459088..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/enable-disable.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=enable disable test
-
-[Service]
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/mask-unmask.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/mask-unmask.service
deleted file mode 100644
index 0686ef2bef..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/mask-unmask.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=mask unmask test
-
-[Service]
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/reload.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/reload.service
deleted file mode 100644
index b317157c07..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/reload.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=reload test
-
-[Service]
-ExecStart=/bin/bash -c "trap '' HUP; /bin/sleep 400"
-ExecReload=-/bin/systemctl kill -s HUP reload.service
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/start-failed.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/start-failed.service
deleted file mode 100644
index 2364eea77c..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/start-failed.service
+++ /dev/null
@@ -1,6 +0,0 @@
-[Unit]
-Description=starting a failed test
-
-[Service]
-ExecStartPre=/bin/false
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/start-stop.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/start-stop.service
deleted file mode 100644
index a1f8c36773..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/start-stop.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=start stop test
-
-[Service]
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events-set.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events-set.service
deleted file mode 100644
index a1f8c36773..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events-set.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=start stop test
-
-[Service]
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events.service b/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events.service
deleted file mode 100644
index a1f8c36773..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/fixtures/subscribe-events.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=start stop test
-
-[Service]
-ExecStart=/bin/sleep 400
diff --git a/installer/vendor/github.com/coreos/go-systemd/journal/journal.go b/installer/vendor/github.com/coreos/go-systemd/journal/journal.go
deleted file mode 100644
index 7f434990d2..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/journal/journal.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package journal provides write bindings to the local systemd journal.
-// It is implemented in pure Go and connects to the journal directly over its
-// unix socket.
-//
-// To read from the journal, see the "sdjournal" package, which wraps the
-// sd-journal a C API.
-//
-// http://www.freedesktop.org/software/systemd/man/systemd-journald.service.html
-package journal
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// Priority of a journal message
-type Priority int
-
-const (
-	PriEmerg Priority = iota
-	PriAlert
-	PriCrit
-	PriErr
-	PriWarning
-	PriNotice
-	PriInfo
-	PriDebug
-)
-
-var conn net.Conn
-
-func init() {
-	var err error
-	conn, err = net.Dial("unixgram", "/run/systemd/journal/socket")
-	if err != nil {
-		conn = nil
-	}
-}
-
-// Enabled returns true if the local systemd journal is available for logging
-func Enabled() bool {
-	return conn != nil
-}
-
-// Send a message to the local systemd journal. vars is a map of journald
-// fields to values.  Fields must be composed of uppercase letters, numbers,
-// and underscores, but must not start with an underscore. Within these
-// restrictions, any arbitrary field name may be used.  Some names have special
-// significance: see the journalctl documentation
-// (http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html)
-// for more details.  vars may be nil.
-func Send(message string, priority Priority, vars map[string]string) error {
-	if conn == nil {
-		return journalError("could not connect to journald socket")
-	}
-
-	data := new(bytes.Buffer)
-	appendVariable(data, "PRIORITY", strconv.Itoa(int(priority)))
-	appendVariable(data, "MESSAGE", message)
-	for k, v := range vars {
-		appendVariable(data, k, v)
-	}
-
-	_, err := io.Copy(conn, data)
-	if err != nil && isSocketSpaceError(err) {
-		file, err := tempFd()
-		if err != nil {
-			return journalError(err.Error())
-		}
-		defer file.Close()
-		_, err = io.Copy(file, data)
-		if err != nil {
-			return journalError(err.Error())
-		}
-
-		rights := syscall.UnixRights(int(file.Fd()))
-
-		/* this connection should always be a UnixConn, but better safe than sorry */
-		unixConn, ok := conn.(*net.UnixConn)
-		if !ok {
-			return journalError("can't send file through non-Unix connection")
-		}
-		unixConn.WriteMsgUnix([]byte{}, rights, nil)
-	} else if err != nil {
-		return journalError(err.Error())
-	}
-	return nil
-}
-
-// Print prints a message to the local systemd journal using Send().
-func Print(priority Priority, format string, a ...interface{}) error {
-	return Send(fmt.Sprintf(format, a...), priority, nil)
-}
-
-func appendVariable(w io.Writer, name, value string) {
-	if !validVarName(name) {
-		journalError("variable name contains invalid character, ignoring")
-	}
-	if strings.ContainsRune(value, '\n') {
-		/* When the value contains a newline, we write:
-		 * - the variable name, followed by a newline
-		 * - the size (in 64bit little endian format)
-		 * - the data, followed by a newline
-		 */
-		fmt.Fprintln(w, name)
-		binary.Write(w, binary.LittleEndian, uint64(len(value)))
-		fmt.Fprintln(w, value)
-	} else {
-		/* just write the variable and value all on one line */
-		fmt.Fprintf(w, "%s=%s\n", name, value)
-	}
-}
-
-func validVarName(name string) bool {
-	/* The variable name must be in uppercase and consist only of characters,
-	 * numbers and underscores, and may not begin with an underscore. (from the docs)
-	 */
-
-	valid := name[0] != '_'
-	for _, c := range name {
-		valid = valid && ('A' <= c && c <= 'Z') || ('0' <= c && c <= '9') || c == '_'
-	}
-	return valid
-}
-
-func isSocketSpaceError(err error) bool {
-	opErr, ok := err.(*net.OpError)
-	if !ok {
-		return false
-	}
-
-	sysErr, ok := opErr.Err.(syscall.Errno)
-	if !ok {
-		return false
-	}
-
-	return sysErr == syscall.EMSGSIZE || sysErr == syscall.ENOBUFS
-}
-
-func tempFd() (*os.File, error) {
-	file, err := ioutil.TempFile("/dev/shm/", "journal.XXXXX")
-	if err != nil {
-		return nil, err
-	}
-	syscall.Unlink(file.Name())
-	if err != nil {
-		return nil, err
-	}
-	return file, nil
-}
-
-func journalError(s string) error {
-	s = "journal error: " + s
-	fmt.Fprintln(os.Stderr, s)
-	return errors.New(s)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/login1/dbus.go b/installer/vendor/github.com/coreos/go-systemd/login1/dbus.go
deleted file mode 100644
index 5e1e670b1d..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/login1/dbus.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Integration with the systemd logind API.  See http://www.freedesktop.org/wiki/Software/systemd/logind/
-package login1
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	dbusInterface = "org.freedesktop.login1.Manager"
-	dbusPath      = "/org/freedesktop/login1"
-)
-
-// Conn is a connection to systemds dbus endpoint.
-type Conn struct {
-	conn   *dbus.Conn
-	object dbus.BusObject
-}
-
-// New() establishes a connection to the system bus and authenticates.
-func New() (*Conn, error) {
-	c := new(Conn)
-
-	if err := c.initConnection(); err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-func (c *Conn) initConnection() error {
-	var err error
-	c.conn, err = dbus.SystemBusPrivate()
-	if err != nil {
-		return err
-	}
-
-	// Only use EXTERNAL method, and hardcode the uid (not username)
-	// to avoid a username lookup (which requires a dynamically linked
-	// libc)
-	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
-
-	err = c.conn.Auth(methods)
-	if err != nil {
-		c.conn.Close()
-		return err
-	}
-
-	err = c.conn.Hello()
-	if err != nil {
-		c.conn.Close()
-		return err
-	}
-
-	c.object = c.conn.Object("org.freedesktop.login1", dbus.ObjectPath(dbusPath))
-
-	return nil
-}
-
-// Reboot asks logind for a reboot optionally asking for auth.
-func (c *Conn) Reboot(askForAuth bool) {
-	c.object.Call(dbusInterface+".Reboot", 0, askForAuth)
-}
-
-// Inhibit takes inhibition lock in logind.
-func (c *Conn) Inhibit(what, who, why, mode string) (*os.File, error) {
-	var fd dbus.UnixFD
-
-	err := c.object.Call(dbusInterface+".Inhibit", 0, what, who, why, mode).Store(&fd)
-	if err != nil {
-		return nil, err
-	}
-
-	return os.NewFile(uintptr(fd), "inhibit"), nil
-}
-
-// Subscribe to signals on the logind dbus
-func (c *Conn) Subscribe(members ...string) chan *dbus.Signal {
-	for _, member := range members {
-		c.conn.BusObject().Call("org.freedesktop.DBus.AddMatch", 0,
-			fmt.Sprintf("type='signal',interface='org.freedesktop.login1.Manager',member='%s'", member))
-	}
-	ch := make(chan *dbus.Signal, 10)
-	c.conn.Signal(ch)
-	return ch
-}
-
-// PowerOff asks logind for a power off optionally asking for auth.
-func (c *Conn) PowerOff(askForAuth bool) {
-	c.object.Call(dbusInterface+".PowerOff", 0, askForAuth)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/login1/dbus_test.go b/installer/vendor/github.com/coreos/go-systemd/login1/dbus_test.go
deleted file mode 100644
index d160f470b2..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/login1/dbus_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package login1
-
-import (
-	"testing"
-)
-
-// TestNew ensures that New() works without errors.
-func TestNew(t *testing.T) {
-	_, err := New()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/machine1/dbus.go b/installer/vendor/github.com/coreos/go-systemd/machine1/dbus.go
deleted file mode 100644
index 9f83ac2e25..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/machine1/dbus.go
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-Copyright 2015 CoreOS Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-// Integration with the systemd machined API.  See http://www.freedesktop.org/wiki/Software/systemd/machined/
-package machine1
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-	"syscall"
-
-	"github.com/godbus/dbus"
-)
-
-const (
-	dbusInterface = "org.freedesktop.machine1.Manager"
-	dbusPath      = "/org/freedesktop/machine1"
-)
-
-// Conn is a connection to systemds dbus endpoint.
-type Conn struct {
-	conn   *dbus.Conn
-	object dbus.BusObject
-}
-
-// New() establishes a connection to the system bus and authenticates.
-func New() (*Conn, error) {
-	c := new(Conn)
-
-	if err := c.initConnection(); err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-func (c *Conn) initConnection() error {
-	var err error
-	c.conn, err = dbus.SystemBusPrivate()
-	if err != nil {
-		return err
-	}
-
-	// Only use EXTERNAL method, and hardcode the uid (not username)
-	// to avoid a username lookup (which requires a dynamically linked
-	// libc)
-	methods := []dbus.Auth{dbus.AuthExternal(strconv.Itoa(os.Getuid()))}
-
-	err = c.conn.Auth(methods)
-	if err != nil {
-		c.conn.Close()
-		return err
-	}
-
-	err = c.conn.Hello()
-	if err != nil {
-		c.conn.Close()
-		return err
-	}
-
-	c.object = c.conn.Object("org.freedesktop.machine1", dbus.ObjectPath(dbusPath))
-
-	return nil
-}
-
-func (c *Conn) getPath(method string, args ...interface{}) (dbus.ObjectPath, error) {
-	result := c.object.Call(fmt.Sprintf("%s.%s", dbusInterface, method), 0, args...)
-	if result.Err != nil {
-		return "", result.Err
-	}
-
-	path, typeErr := result.Body[0].(dbus.ObjectPath)
-	if !typeErr {
-		return "", fmt.Errorf("unable to convert dbus response '%v' to dbus.ObjectPath", result.Body[0])
-	}
-
-	return path, nil
-}
-
-// GetMachine gets a specific container with systemd-machined
-func (c *Conn) GetMachine(name string) (dbus.ObjectPath, error) {
-	return c.getPath("GetMachine", name)
-}
-
-// GetImage gets a specific image with systemd-machined
-func (c *Conn) GetImage(name string) (dbus.ObjectPath, error) {
-	return c.getPath("GetImage", name)
-}
-
-// GetMachineByPID gets a machine specified by a PID from systemd-machined
-func (c *Conn) GetMachineByPID(pid uint) (dbus.ObjectPath, error) {
-	return c.getPath("GetMachineByPID", pid)
-}
-
-// DescribeMachine gets the properties of a machine
-func (c *Conn) DescribeMachine(name string) (machineProps map[string]interface{}, err error) {
-	var dbusProps map[string]dbus.Variant
-	path, pathErr := c.GetMachine(name)
-	if pathErr != nil {
-		return nil, pathErr
-	}
-	obj := c.conn.Object("org.freedesktop.machine1", path)
-	err = obj.Call("org.freedesktop.DBus.Properties.GetAll", 0, "").Store(&dbusProps)
-	if err != nil {
-		return nil, err
-	}
-	machineProps = make(map[string]interface{}, len(dbusProps))
-	for key, val := range dbusProps {
-		machineProps[key] = val.Value()
-	}
-	return
-}
-
-// KillMachine sends a signal to a machine
-func (c *Conn) KillMachine(name, who string, sig syscall.Signal) error {
-	return c.object.Call(dbusInterface+".KillMachine", 0, name, who, sig).Err
-}
-
-// TerminateMachine causes systemd-machined to terminate a machine, killing its processes
-func (c *Conn) TerminateMachine(name string) error {
-	return c.object.Call(dbusInterface+".TerminateMachine", 0, name).Err
-}
-
-// RegisterMachine registers the container with the systemd-machined
-func (c *Conn) RegisterMachine(name string, id []byte, service string, class string, pid int, root_directory string) error {
-	return c.object.Call(dbusInterface+".RegisterMachine", 0, name, id, service, class, uint32(pid), root_directory).Err
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/machine1/dbus_test.go b/installer/vendor/github.com/coreos/go-systemd/machine1/dbus_test.go
deleted file mode 100644
index 3001eb5a9f..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/machine1/dbus_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright 2015 CoreOS Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-     http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package machine1
-
-import (
-	"fmt"
-	"math/rand"
-	"os/exec"
-	"testing"
-	"time"
-
-	"github.com/coreos/go-systemd/dbus"
-)
-
-const (
-	machinePrefix = "machined-test-"
-)
-
-func mustCreateTestProcess(machineName string) (pid int) {
-	testServiceName := machineName + ".service"
-	systemdRun, err := exec.LookPath("systemd-run")
-	if err != nil {
-		panic(err.Error())
-	}
-	sleep, err := exec.LookPath("sleep")
-	if err != nil {
-		panic(err.Error())
-	}
-	cmd := exec.Command(systemdRun, "--unit="+testServiceName, sleep, "5000")
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		panic(fmt.Errorf("systemd-run failed: %q", out))
-	}
-	dbusConn, err := dbus.New()
-	if err != nil {
-		panic(err.Error())
-	}
-	defer dbusConn.Close()
-	mainPIDProperty, err := dbusConn.GetServiceProperty(testServiceName, "MainPID")
-	if err != nil {
-		panic(err.Error())
-	}
-	mainPID := mainPIDProperty.Value.Value().(uint32)
-	return int(mainPID)
-}
-
-func TestMachine(t *testing.T) {
-	machineName := machinePrefix + generateRandomLabel(8)
-	leader := mustCreateTestProcess(machineName)
-
-	conn, newErr := New()
-	if newErr != nil {
-		t.Fatal(newErr)
-	}
-
-	regErr := conn.RegisterMachine(machineName, nil, "go-systemd", "container", leader, "")
-	if regErr != nil {
-		t.Fatal(regErr)
-	}
-
-	machine, getErr := conn.GetMachine(machineName)
-	if getErr != nil {
-		t.Fatal(getErr)
-	}
-	if len(machine) == 0 {
-		t.Fatalf("did not find machine named %s", machineName)
-	}
-
-	tErr := conn.TerminateMachine(machineName)
-	if tErr != nil {
-		t.Fatal(tErr)
-	}
-
-	machine, getErr = conn.GetMachine(machineName)
-	if len(machine) != 0 {
-		t.Fatalf("unexpectedly found machine named %s", machineName)
-	} else if getErr == nil {
-		t.Fatal("expected error but got nil")
-	}
-}
-
-func generateRandomLabel(n int) string {
-	letters := []rune("abcdefghijklmnopqrstuvwxyz")
-	s := make([]rune, n)
-	rand.Seed(time.Now().UnixNano())
-	for i := range s {
-		s[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(s)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/scripts/jenkins/periodic-go-systemd-builder.sh b/installer/vendor/github.com/coreos/go-systemd/scripts/jenkins/periodic-go-systemd-builder.sh
deleted file mode 100755
index 05089f72f6..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/scripts/jenkins/periodic-go-systemd-builder.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash
-
-echo ""
-echo "Public IP: "`wget -O - http://checkip.amazonaws.com/ 2>/dev/null || true`
-echo "Systemd version: "`systemctl --version || true`
-echo "Linux version: "`uname -srm || true`
-echo "Distribution version: "`(. /etc/os-release ; echo $PRETTY_NAME) || true`
-echo ""
-echo "git commit: "`git describe --abbrev=40 HEAD || true`
-echo ""
-
-# unsquashfs is in /usr/sbin
-export PATH=/usr/lib64/ccache:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/sbin:/home/fedora/.local/bin:/home/fedora/bin
-
-# As a convenience, set up a self-contained GOPATH if none set
-if [ ! -h gopath/src/github.com/coreos/go-systemd ]; then
-    mkdir -p gopath/src/github.com/coreos
-    ln -s ../../../.. gopath/src/github.com/coreos/go-systemd || exit 255
-fi
-export GOPATH=${PWD}/gopath
-go get -u github.com/godbus/dbus
-go get github.com/coreos/pkg/dlopen
-
-sudo -E ./test
diff --git a/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions.go b/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions.go
deleted file mode 100644
index e132369c12..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sdjournal
-
-import (
-	"github.com/coreos/pkg/dlopen"
-	"sync"
-	"unsafe"
-)
-
-var (
-	// lazy initialized
-	libsystemdHandle *dlopen.LibHandle
-
-	libsystemdMutex     = &sync.Mutex{}
-	libsystemdFunctions = map[string]unsafe.Pointer{}
-	libsystemdNames     = []string{
-		// systemd < 209
-		"libsystemd-journal.so.0",
-		"libsystemd-journal.so",
-
-		// systemd >= 209 merged libsystemd-journal into libsystemd proper
-		"libsystemd.so.0",
-		"libsystemd.so",
-	}
-)
-
-func getFunction(name string) (unsafe.Pointer, error) {
-	libsystemdMutex.Lock()
-	defer libsystemdMutex.Unlock()
-
-	if libsystemdHandle == nil {
-		h, err := dlopen.GetHandle(libsystemdNames)
-		if err != nil {
-			return nil, err
-		}
-
-		libsystemdHandle = h
-	}
-
-	f, ok := libsystemdFunctions[name]
-	if !ok {
-		var err error
-		f, err = libsystemdHandle.GetSymbolPointer(name)
-		if err != nil {
-			return nil, err
-		}
-
-		libsystemdFunctions[name] = f
-	}
-
-	return f, nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions_test.go b/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions_test.go
deleted file mode 100644
index d846113657..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/sdjournal/functions_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sdjournal
-
-import "testing"
-
-func TestGetFunction(t *testing.T) {
-	f, err := getFunction("sd_journal_open")
-
-	if err != nil {
-		t.Errorf("Error getting an existing function: %s", err)
-	}
-
-	if f == nil {
-		t.Error("Got nil function pointer")
-	}
-
-	_, err = getFunction("non_existent_function")
-
-	if err == nil {
-		t.Error("Expected to get an error, got nil")
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal.go b/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
deleted file mode 100644
index 732a62521a..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal.go
+++ /dev/null
@@ -1,1090 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package sdjournal provides a low-level Go interface to the
-// systemd journal wrapped around the sd-journal C API.
-//
-// All public read methods map closely to the sd-journal API functions. See the
-// sd-journal.h documentation[1] for information about each function.
-//
-// To write to the journal, see the pure-Go "journal" package
-//
-// [1] http://www.freedesktop.org/software/systemd/man/sd-journal.html
-package sdjournal
-
-// #include <systemd/sd-journal.h>
-// #include <systemd/sd-id128.h>
-// #include <stdlib.h>
-// #include <syslog.h>
-//
-// int
-// my_sd_journal_open(void *f, sd_journal **ret, int flags)
-// {
-//   int (*sd_journal_open)(sd_journal **, int);
-//
-//   sd_journal_open = f;
-//   return sd_journal_open(ret, flags);
-// }
-//
-// int
-// my_sd_journal_open_directory(void *f, sd_journal **ret, const char *path, int flags)
-// {
-//   int (*sd_journal_open_directory)(sd_journal **, const char *, int);
-//
-//   sd_journal_open_directory = f;
-//   return sd_journal_open_directory(ret, path, flags);
-// }
-//
-// int
-// my_sd_journal_open_files(void *f, sd_journal **ret, const char **paths, int flags)
-// {
-//   int (*sd_journal_open_files)(sd_journal **, const char **, int);
-//
-//   sd_journal_open_files = f;
-//   return sd_journal_open_files(ret, paths, flags);
-// }
-//
-// void
-// my_sd_journal_close(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_close)(sd_journal *);
-//
-//   sd_journal_close = f;
-//   sd_journal_close(j);
-// }
-//
-// int
-// my_sd_journal_get_usage(void *f, sd_journal *j, uint64_t *bytes)
-// {
-//   int (*sd_journal_get_usage)(sd_journal *, uint64_t *);
-//
-//   sd_journal_get_usage = f;
-//   return sd_journal_get_usage(j, bytes);
-// }
-//
-// int
-// my_sd_journal_add_match(void *f, sd_journal *j, const void *data, size_t size)
-// {
-//   int (*sd_journal_add_match)(sd_journal *, const void *, size_t);
-//
-//   sd_journal_add_match = f;
-//   return sd_journal_add_match(j, data, size);
-// }
-//
-// int
-// my_sd_journal_add_disjunction(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_add_disjunction)(sd_journal *);
-//
-//   sd_journal_add_disjunction = f;
-//   return sd_journal_add_disjunction(j);
-// }
-//
-// int
-// my_sd_journal_add_conjunction(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_add_conjunction)(sd_journal *);
-//
-//   sd_journal_add_conjunction = f;
-//   return sd_journal_add_conjunction(j);
-// }
-//
-// void
-// my_sd_journal_flush_matches(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_flush_matches)(sd_journal *);
-//
-//   sd_journal_flush_matches = f;
-//   sd_journal_flush_matches(j);
-// }
-//
-// int
-// my_sd_journal_next(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_next)(sd_journal *);
-//
-//   sd_journal_next = f;
-//   return sd_journal_next(j);
-// }
-//
-// int
-// my_sd_journal_next_skip(void *f, sd_journal *j, uint64_t skip)
-// {
-//   int (*sd_journal_next_skip)(sd_journal *, uint64_t);
-//
-//   sd_journal_next_skip = f;
-//   return sd_journal_next_skip(j, skip);
-// }
-//
-// int
-// my_sd_journal_previous(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_previous)(sd_journal *);
-//
-//   sd_journal_previous = f;
-//   return sd_journal_previous(j);
-// }
-//
-// int
-// my_sd_journal_previous_skip(void *f, sd_journal *j, uint64_t skip)
-// {
-//   int (*sd_journal_previous_skip)(sd_journal *, uint64_t);
-//
-//   sd_journal_previous_skip = f;
-//   return sd_journal_previous_skip(j, skip);
-// }
-//
-// int
-// my_sd_journal_get_data(void *f, sd_journal *j, const char *field, const void **data, size_t *length)
-// {
-//   int (*sd_journal_get_data)(sd_journal *, const char *, const void **, size_t *);
-//
-//   sd_journal_get_data = f;
-//   return sd_journal_get_data(j, field, data, length);
-// }
-//
-// int
-// my_sd_journal_set_data_threshold(void *f, sd_journal *j, size_t sz)
-// {
-//   int (*sd_journal_set_data_threshold)(sd_journal *, size_t);
-//
-//   sd_journal_set_data_threshold = f;
-//   return sd_journal_set_data_threshold(j, sz);
-// }
-//
-// int
-// my_sd_journal_get_cursor(void *f, sd_journal *j, char **cursor)
-// {
-//   int (*sd_journal_get_cursor)(sd_journal *, char **);
-//
-//   sd_journal_get_cursor = f;
-//   return sd_journal_get_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_test_cursor(void *f, sd_journal *j, const char *cursor)
-// {
-//   int (*sd_journal_test_cursor)(sd_journal *, const char *);
-//
-//   sd_journal_test_cursor = f;
-//   return sd_journal_test_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_get_realtime_usec(void *f, sd_journal *j, uint64_t *usec)
-// {
-//   int (*sd_journal_get_realtime_usec)(sd_journal *, uint64_t *);
-//
-//   sd_journal_get_realtime_usec = f;
-//   return sd_journal_get_realtime_usec(j, usec);
-// }
-//
-// int
-// my_sd_journal_get_monotonic_usec(void *f, sd_journal *j, uint64_t *usec, sd_id128_t *boot_id)
-// {
-//   int (*sd_journal_get_monotonic_usec)(sd_journal *, uint64_t *, sd_id128_t *);
-//
-//   sd_journal_get_monotonic_usec = f;
-//   return sd_journal_get_monotonic_usec(j, usec, boot_id);
-// }
-//
-// int
-// my_sd_journal_seek_head(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_seek_head)(sd_journal *);
-//
-//   sd_journal_seek_head = f;
-//   return sd_journal_seek_head(j);
-// }
-//
-// int
-// my_sd_journal_seek_tail(void *f, sd_journal *j)
-// {
-//   int (*sd_journal_seek_tail)(sd_journal *);
-//
-//   sd_journal_seek_tail = f;
-//   return sd_journal_seek_tail(j);
-// }
-//
-//
-// int
-// my_sd_journal_seek_cursor(void *f, sd_journal *j, const char *cursor)
-// {
-//   int (*sd_journal_seek_cursor)(sd_journal *, const char *);
-//
-//   sd_journal_seek_cursor = f;
-//   return sd_journal_seek_cursor(j, cursor);
-// }
-//
-// int
-// my_sd_journal_seek_realtime_usec(void *f, sd_journal *j, uint64_t usec)
-// {
-//   int (*sd_journal_seek_realtime_usec)(sd_journal *, uint64_t);
-//
-//   sd_journal_seek_realtime_usec = f;
-//   return sd_journal_seek_realtime_usec(j, usec);
-// }
-//
-// int
-// my_sd_journal_wait(void *f, sd_journal *j, uint64_t timeout_usec)
-// {
-//   int (*sd_journal_wait)(sd_journal *, uint64_t);
-//
-//   sd_journal_wait = f;
-//   return sd_journal_wait(j, timeout_usec);
-// }
-//
-// void
-// my_sd_journal_restart_data(void *f, sd_journal *j)
-// {
-//   void (*sd_journal_restart_data)(sd_journal *);
-//
-//   sd_journal_restart_data = f;
-//   sd_journal_restart_data(j);
-// }
-//
-// int
-// my_sd_journal_enumerate_data(void *f, sd_journal *j, const void **data, size_t *length)
-// {
-//   int (*sd_journal_enumerate_data)(sd_journal *, const void **, size_t *);
-//
-//   sd_journal_enumerate_data = f;
-//   return sd_journal_enumerate_data(j, data, length);
-// }
-//
-// int
-// my_sd_journal_query_unique(void *f, sd_journal *j, const char *field)
-// {
-//   int(*sd_journal_query_unique)(sd_journal *, const char *);
-//
-//   sd_journal_query_unique = f;
-//   return sd_journal_query_unique(j, field);
-// }
-//
-// int
-// my_sd_journal_enumerate_unique(void *f, sd_journal *j, const void **data, size_t *length)
-// {
-//   int(*sd_journal_enumerate_unique)(sd_journal *, const void **, size_t *);
-//
-//   sd_journal_enumerate_unique = f;
-//   return sd_journal_enumerate_unique(j, data, length);
-// }
-//
-// void
-// my_sd_journal_restart_unique(void *f, sd_journal *j)
-// {
-//   void(*sd_journal_restart_unique)(sd_journal *);
-//
-//   sd_journal_restart_unique = f;
-//   sd_journal_restart_unique(j);
-// }
-//
-// int
-// my_sd_journal_get_catalog(void *f, sd_journal *j, char **ret)
-// {
-//   int(*sd_journal_get_catalog)(sd_journal *, char **);
-//
-//   sd_journal_get_catalog = f;
-//   return sd_journal_get_catalog(j, ret);
-// }
-//
-import "C"
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-// Journal entry field strings which correspond to:
-// http://www.freedesktop.org/software/systemd/man/systemd.journal-fields.html
-const (
-	// User Journal Fields
-	SD_JOURNAL_FIELD_MESSAGE           = "MESSAGE"
-	SD_JOURNAL_FIELD_MESSAGE_ID        = "MESSAGE_ID"
-	SD_JOURNAL_FIELD_PRIORITY          = "PRIORITY"
-	SD_JOURNAL_FIELD_CODE_FILE         = "CODE_FILE"
-	SD_JOURNAL_FIELD_CODE_LINE         = "CODE_LINE"
-	SD_JOURNAL_FIELD_CODE_FUNC         = "CODE_FUNC"
-	SD_JOURNAL_FIELD_ERRNO             = "ERRNO"
-	SD_JOURNAL_FIELD_SYSLOG_FACILITY   = "SYSLOG_FACILITY"
-	SD_JOURNAL_FIELD_SYSLOG_IDENTIFIER = "SYSLOG_IDENTIFIER"
-	SD_JOURNAL_FIELD_SYSLOG_PID        = "SYSLOG_PID"
-
-	// Trusted Journal Fields
-	SD_JOURNAL_FIELD_PID                       = "_PID"
-	SD_JOURNAL_FIELD_UID                       = "_UID"
-	SD_JOURNAL_FIELD_GID                       = "_GID"
-	SD_JOURNAL_FIELD_COMM                      = "_COMM"
-	SD_JOURNAL_FIELD_EXE                       = "_EXE"
-	SD_JOURNAL_FIELD_CMDLINE                   = "_CMDLINE"
-	SD_JOURNAL_FIELD_CAP_EFFECTIVE             = "_CAP_EFFECTIVE"
-	SD_JOURNAL_FIELD_AUDIT_SESSION             = "_AUDIT_SESSION"
-	SD_JOURNAL_FIELD_AUDIT_LOGINUID            = "_AUDIT_LOGINUID"
-	SD_JOURNAL_FIELD_SYSTEMD_CGROUP            = "_SYSTEMD_CGROUP"
-	SD_JOURNAL_FIELD_SYSTEMD_SESSION           = "_SYSTEMD_SESSION"
-	SD_JOURNAL_FIELD_SYSTEMD_UNIT              = "_SYSTEMD_UNIT"
-	SD_JOURNAL_FIELD_SYSTEMD_USER_UNIT         = "_SYSTEMD_USER_UNIT"
-	SD_JOURNAL_FIELD_SYSTEMD_OWNER_UID         = "_SYSTEMD_OWNER_UID"
-	SD_JOURNAL_FIELD_SYSTEMD_SLICE             = "_SYSTEMD_SLICE"
-	SD_JOURNAL_FIELD_SELINUX_CONTEXT           = "_SELINUX_CONTEXT"
-	SD_JOURNAL_FIELD_SOURCE_REALTIME_TIMESTAMP = "_SOURCE_REALTIME_TIMESTAMP"
-	SD_JOURNAL_FIELD_BOOT_ID                   = "_BOOT_ID"
-	SD_JOURNAL_FIELD_MACHINE_ID                = "_MACHINE_ID"
-	SD_JOURNAL_FIELD_HOSTNAME                  = "_HOSTNAME"
-	SD_JOURNAL_FIELD_TRANSPORT                 = "_TRANSPORT"
-
-	// Address Fields
-	SD_JOURNAL_FIELD_CURSOR              = "__CURSOR"
-	SD_JOURNAL_FIELD_REALTIME_TIMESTAMP  = "__REALTIME_TIMESTAMP"
-	SD_JOURNAL_FIELD_MONOTONIC_TIMESTAMP = "__MONOTONIC_TIMESTAMP"
-)
-
-// Journal event constants
-const (
-	SD_JOURNAL_NOP        = int(C.SD_JOURNAL_NOP)
-	SD_JOURNAL_APPEND     = int(C.SD_JOURNAL_APPEND)
-	SD_JOURNAL_INVALIDATE = int(C.SD_JOURNAL_INVALIDATE)
-)
-
-const (
-	// IndefiniteWait is a sentinel value that can be passed to
-	// sdjournal.Wait() to signal an indefinite wait for new journal
-	// events. It is implemented as the maximum value for a time.Duration:
-	// https://github.com/golang/go/blob/e4dcf5c8c22d98ac9eac7b9b226596229624cb1d/src/time/time.go#L434
-	IndefiniteWait time.Duration = 1<<63 - 1
-)
-
-// Journal is a Go wrapper of an sd_journal structure.
-type Journal struct {
-	cjournal *C.sd_journal
-	mu       sync.Mutex
-}
-
-// JournalEntry represents all fields of a journal entry plus address fields.
-type JournalEntry struct {
-	Fields             map[string]string
-	Cursor             string
-	RealtimeTimestamp  uint64
-	MonotonicTimestamp uint64
-}
-
-// Match is a convenience wrapper to describe filters supplied to AddMatch.
-type Match struct {
-	Field string
-	Value string
-}
-
-// String returns a string representation of a Match suitable for use with AddMatch.
-func (m *Match) String() string {
-	return m.Field + "=" + m.Value
-}
-
-// NewJournal returns a new Journal instance pointing to the local journal
-func NewJournal() (j *Journal, err error) {
-	j = &Journal{}
-
-	sd_journal_open, err := getFunction("sd_journal_open")
-	if err != nil {
-		return nil, err
-	}
-
-	r := C.my_sd_journal_open(sd_journal_open, &j.cjournal, C.SD_JOURNAL_LOCAL_ONLY)
-
-	if r < 0 {
-		return nil, fmt.Errorf("failed to open journal: %d", syscall.Errno(-r))
-	}
-
-	return j, nil
-}
-
-// NewJournalFromDir returns a new Journal instance pointing to a journal residing
-// in a given directory.
-func NewJournalFromDir(path string) (j *Journal, err error) {
-	j = &Journal{}
-
-	sd_journal_open_directory, err := getFunction("sd_journal_open_directory")
-	if err != nil {
-		return nil, err
-	}
-
-	p := C.CString(path)
-	defer C.free(unsafe.Pointer(p))
-
-	r := C.my_sd_journal_open_directory(sd_journal_open_directory, &j.cjournal, p, 0)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to open journal in directory %q: %d", path, syscall.Errno(-r))
-	}
-
-	return j, nil
-}
-
-// NewJournalFromFiles returns a new Journal instance pointing to a journals residing
-// in a given files.
-func NewJournalFromFiles(paths ...string) (j *Journal, err error) {
-	j = &Journal{}
-
-	sd_journal_open_files, err := getFunction("sd_journal_open_files")
-	if err != nil {
-		return nil, err
-	}
-
-	// by making the slice 1 elem too long, we guarantee it'll be null-terminated
-	cPaths := make([]*C.char, len(paths)+1)
-	for idx, path := range paths {
-		p := C.CString(path)
-		cPaths[idx] = p
-		defer C.free(unsafe.Pointer(p))
-	}
-
-	r := C.my_sd_journal_open_files(sd_journal_open_files, &j.cjournal, &cPaths[0], 0)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to open journals in paths %q: %d", paths, syscall.Errno(-r))
-	}
-
-	return j, nil
-}
-
-// Close closes a journal opened with NewJournal.
-func (j *Journal) Close() error {
-	sd_journal_close, err := getFunction("sd_journal_close")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	C.my_sd_journal_close(sd_journal_close, j.cjournal)
-	j.mu.Unlock()
-
-	return nil
-}
-
-// AddMatch adds a match by which to filter the entries of the journal.
-func (j *Journal) AddMatch(match string) error {
-	sd_journal_add_match, err := getFunction("sd_journal_add_match")
-	if err != nil {
-		return err
-	}
-
-	m := C.CString(match)
-	defer C.free(unsafe.Pointer(m))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_match(sd_journal_add_match, j.cjournal, unsafe.Pointer(m), C.size_t(len(match)))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add match: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// AddDisjunction inserts a logical OR in the match list.
-func (j *Journal) AddDisjunction() error {
-	sd_journal_add_disjunction, err := getFunction("sd_journal_add_disjunction")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_disjunction(sd_journal_add_disjunction, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add a disjunction in the match list: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// AddConjunction inserts a logical AND in the match list.
-func (j *Journal) AddConjunction() error {
-	sd_journal_add_conjunction, err := getFunction("sd_journal_add_conjunction")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_add_conjunction(sd_journal_add_conjunction, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to add a conjunction in the match list: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// FlushMatches flushes all matches, disjunctions and conjunctions.
-func (j *Journal) FlushMatches() {
-	sd_journal_flush_matches, err := getFunction("sd_journal_flush_matches")
-	if err != nil {
-		return
-	}
-
-	j.mu.Lock()
-	C.my_sd_journal_flush_matches(sd_journal_flush_matches, j.cjournal)
-	j.mu.Unlock()
-}
-
-// Next advances the read pointer into the journal by one entry.
-func (j *Journal) Next() (uint64, error) {
-	sd_journal_next, err := getFunction("sd_journal_next")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_next(sd_journal_next, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// NextSkip advances the read pointer by multiple entries at once,
-// as specified by the skip parameter.
-func (j *Journal) NextSkip(skip uint64) (uint64, error) {
-	sd_journal_next_skip, err := getFunction("sd_journal_next_skip")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_next_skip(sd_journal_next_skip, j.cjournal, C.uint64_t(skip))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// Previous sets the read pointer into the journal back by one entry.
-func (j *Journal) Previous() (uint64, error) {
-	sd_journal_previous, err := getFunction("sd_journal_previous")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_previous(sd_journal_previous, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-// PreviousSkip sets back the read pointer by multiple entries at once,
-// as specified by the skip parameter.
-func (j *Journal) PreviousSkip(skip uint64) (uint64, error) {
-	sd_journal_previous_skip, err := getFunction("sd_journal_previous_skip")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_previous_skip(sd_journal_previous_skip, j.cjournal, C.uint64_t(skip))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to iterate journal: %d", syscall.Errno(-r))
-	}
-
-	return uint64(r), nil
-}
-
-func (j *Journal) getData(field string) (unsafe.Pointer, C.int, error) {
-	sd_journal_get_data, err := getFunction("sd_journal_get_data")
-	if err != nil {
-		return nil, 0, err
-	}
-
-	f := C.CString(field)
-	defer C.free(unsafe.Pointer(f))
-
-	var d unsafe.Pointer
-	var l C.size_t
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_data(sd_journal_get_data, j.cjournal, f, &d, &l)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return nil, 0, fmt.Errorf("failed to read message: %d", syscall.Errno(-r))
-	}
-
-	return d, C.int(l), nil
-}
-
-// GetData gets the data object associated with a specific field from the
-// current journal entry.
-func (j *Journal) GetData(field string) (string, error) {
-	d, l, err := j.getData(field)
-	if err != nil {
-		return "", err
-	}
-
-	return C.GoStringN((*C.char)(d), l), nil
-}
-
-// GetDataValue gets the data object associated with a specific field from the
-// current journal entry, returning only the value of the object.
-func (j *Journal) GetDataValue(field string) (string, error) {
-	val, err := j.GetData(field)
-	if err != nil {
-		return "", err
-	}
-
-	return strings.SplitN(val, "=", 2)[1], nil
-}
-
-// GetDataBytes gets the data object associated with a specific field from the
-// current journal entry.
-func (j *Journal) GetDataBytes(field string) ([]byte, error) {
-	d, l, err := j.getData(field)
-	if err != nil {
-		return nil, err
-	}
-
-	return C.GoBytes(d, l), nil
-}
-
-// GetDataValueBytes gets the data object associated with a specific field from the
-// current journal entry, returning only the value of the object.
-func (j *Journal) GetDataValueBytes(field string) ([]byte, error) {
-	val, err := j.GetDataBytes(field)
-	if err != nil {
-		return nil, err
-	}
-
-	return bytes.SplitN(val, []byte("="), 2)[1], nil
-}
-
-// GetEntry returns a full representation of a journal entry with
-// all key-value pairs of data as well as address fields (cursor, realtime
-// timestamp and monotonic timestamp)
-func (j *Journal) GetEntry() (*JournalEntry, error) {
-	sd_journal_get_realtime_usec, err := getFunction("sd_journal_get_realtime_usec")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_get_monotonic_usec, err := getFunction("sd_journal_get_monotonic_usec")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_get_cursor, err := getFunction("sd_journal_get_cursor")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_restart_data, err := getFunction("sd_journal_restart_data")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_enumerate_data, err := getFunction("sd_journal_enumerate_data")
-	if err != nil {
-		return nil, err
-	}
-
-	j.mu.Lock()
-	defer j.mu.Unlock()
-
-	var r C.int
-	entry := &JournalEntry{Fields: make(map[string]string)}
-
-	var realtimeUsec C.uint64_t
-	r = C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &realtimeUsec)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
-	}
-
-	entry.RealtimeTimestamp = uint64(realtimeUsec)
-
-	var monotonicUsec C.uint64_t
-	var boot_id C.sd_id128_t
-
-	r = C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &monotonicUsec, &boot_id)
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
-	}
-
-	entry.MonotonicTimestamp = uint64(monotonicUsec)
-
-	var c *C.char
-	// since the pointer is mutated by sd_journal_get_cursor, need to wait
-	// until after the call to free the memory
-	r = C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &c)
-	defer C.free(unsafe.Pointer(c))
-	if r < 0 {
-		return nil, fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
-	}
-
-	entry.Cursor = C.GoString(c)
-
-	// Implements the JOURNAL_FOREACH_DATA_RETVAL macro from journal-internal.h
-	var d unsafe.Pointer
-	var l C.size_t
-	C.my_sd_journal_restart_data(sd_journal_restart_data, j.cjournal)
-	for {
-		r = C.my_sd_journal_enumerate_data(sd_journal_enumerate_data, j.cjournal, &d, &l)
-		if r == 0 {
-			break
-		}
-
-		if r < 0 {
-			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
-		}
-
-		msg := C.GoStringN((*C.char)(d), C.int(l))
-		kv := strings.SplitN(msg, "=", 2)
-		if len(kv) < 2 {
-			return nil, fmt.Errorf("failed to parse field")
-		}
-
-		entry.Fields[kv[0]] = kv[1]
-	}
-
-	return entry, nil
-}
-
-// SetDataThresold sets the data field size threshold for data returned by
-// GetData. To retrieve the complete data fields this threshold should be
-// turned off by setting it to 0, so that the library always returns the
-// complete data objects.
-func (j *Journal) SetDataThreshold(threshold uint64) error {
-	sd_journal_set_data_threshold, err := getFunction("sd_journal_set_data_threshold")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_set_data_threshold(sd_journal_set_data_threshold, j.cjournal, C.size_t(threshold))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to set data threshold: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// GetRealtimeUsec gets the realtime (wallclock) timestamp of the current
-// journal entry.
-func (j *Journal) GetRealtimeUsec() (uint64, error) {
-	var usec C.uint64_t
-
-	sd_journal_get_realtime_usec, err := getFunction("sd_journal_get_realtime_usec")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_realtime_usec(sd_journal_get_realtime_usec, j.cjournal, &usec)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get realtime timestamp: %d", syscall.Errno(-r))
-	}
-
-	return uint64(usec), nil
-}
-
-// GetMonotonicUsec gets the monotonic timestamp of the current journal entry.
-func (j *Journal) GetMonotonicUsec() (uint64, error) {
-	var usec C.uint64_t
-	var boot_id C.sd_id128_t
-
-	sd_journal_get_monotonic_usec, err := getFunction("sd_journal_get_monotonic_usec")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_monotonic_usec(sd_journal_get_monotonic_usec, j.cjournal, &usec, &boot_id)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get monotonic timestamp: %d", syscall.Errno(-r))
-	}
-
-	return uint64(usec), nil
-}
-
-// GetCursor gets the cursor of the current journal entry.
-func (j *Journal) GetCursor() (string, error) {
-	sd_journal_get_cursor, err := getFunction("sd_journal_get_cursor")
-	if err != nil {
-		return "", err
-	}
-
-	var d *C.char
-	// since the pointer is mutated by sd_journal_get_cursor, need to wait
-	// until after the call to free the memory
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_cursor(sd_journal_get_cursor, j.cjournal, &d)
-	j.mu.Unlock()
-	defer C.free(unsafe.Pointer(d))
-
-	if r < 0 {
-		return "", fmt.Errorf("failed to get cursor: %d", syscall.Errno(-r))
-	}
-
-	cursor := C.GoString(d)
-
-	return cursor, nil
-}
-
-// TestCursor checks whether the current position in the journal matches the
-// specified cursor
-func (j *Journal) TestCursor(cursor string) error {
-	sd_journal_test_cursor, err := getFunction("sd_journal_test_cursor")
-	if err != nil {
-		return err
-	}
-
-	c := C.CString(cursor)
-	defer C.free(unsafe.Pointer(c))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_test_cursor(sd_journal_test_cursor, j.cjournal, c)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to test to cursor %q: %d", cursor, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekHead seeks to the beginning of the journal, i.e. the oldest available
-// entry.
-func (j *Journal) SeekHead() error {
-	sd_journal_seek_head, err := getFunction("sd_journal_seek_head")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_head(sd_journal_seek_head, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to head of journal: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekTail may be used to seek to the end of the journal, i.e. the most recent
-// available entry.
-func (j *Journal) SeekTail() error {
-	sd_journal_seek_tail, err := getFunction("sd_journal_seek_tail")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_tail(sd_journal_seek_tail, j.cjournal)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to tail of journal: %d", syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekRealtimeUsec seeks to the entry with the specified realtime (wallclock)
-// timestamp, i.e. CLOCK_REALTIME.
-func (j *Journal) SeekRealtimeUsec(usec uint64) error {
-	sd_journal_seek_realtime_usec, err := getFunction("sd_journal_seek_realtime_usec")
-	if err != nil {
-		return err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_realtime_usec(sd_journal_seek_realtime_usec, j.cjournal, C.uint64_t(usec))
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to %d: %d", usec, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// SeekCursor seeks to a concrete journal cursor.
-func (j *Journal) SeekCursor(cursor string) error {
-	sd_journal_seek_cursor, err := getFunction("sd_journal_seek_cursor")
-	if err != nil {
-		return err
-	}
-
-	c := C.CString(cursor)
-	defer C.free(unsafe.Pointer(c))
-
-	j.mu.Lock()
-	r := C.my_sd_journal_seek_cursor(sd_journal_seek_cursor, j.cjournal, c)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return fmt.Errorf("failed to seek to cursor %q: %d", cursor, syscall.Errno(-r))
-	}
-
-	return nil
-}
-
-// Wait will synchronously wait until the journal gets changed. The maximum time
-// this call sleeps may be controlled with the timeout parameter.  If
-// sdjournal.IndefiniteWait is passed as the timeout parameter, Wait will
-// wait indefinitely for a journal change.
-func (j *Journal) Wait(timeout time.Duration) int {
-	var to uint64
-
-	sd_journal_wait, err := getFunction("sd_journal_wait")
-	if err != nil {
-		return -1
-	}
-
-	if timeout == IndefiniteWait {
-		// sd_journal_wait(3) calls for a (uint64_t) -1 to be passed to signify
-		// indefinite wait, but using a -1 overflows our C.uint64_t, so we use an
-		// equivalent hex value.
-		to = 0xffffffffffffffff
-	} else {
-		to = uint64(timeout / time.Microsecond)
-	}
-	j.mu.Lock()
-	r := C.my_sd_journal_wait(sd_journal_wait, j.cjournal, C.uint64_t(to))
-	j.mu.Unlock()
-
-	return int(r)
-}
-
-// GetUsage returns the journal disk space usage, in bytes.
-func (j *Journal) GetUsage() (uint64, error) {
-	var out C.uint64_t
-
-	sd_journal_get_usage, err := getFunction("sd_journal_get_usage")
-	if err != nil {
-		return 0, err
-	}
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_usage(sd_journal_get_usage, j.cjournal, &out)
-	j.mu.Unlock()
-
-	if r < 0 {
-		return 0, fmt.Errorf("failed to get journal disk space usage: %d", syscall.Errno(-r))
-	}
-
-	return uint64(out), nil
-}
-
-// GetUniqueValues returns all unique values for a given field.
-func (j *Journal) GetUniqueValues(field string) ([]string, error) {
-	var result []string
-
-	sd_journal_query_unique, err := getFunction("sd_journal_query_unique")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_enumerate_unique, err := getFunction("sd_journal_enumerate_unique")
-	if err != nil {
-		return nil, err
-	}
-
-	sd_journal_restart_unique, err := getFunction("sd_journal_restart_unique")
-	if err != nil {
-		return nil, err
-	}
-
-	j.mu.Lock()
-	defer j.mu.Unlock()
-
-	f := C.CString(field)
-	defer C.free(unsafe.Pointer(f))
-
-	r := C.my_sd_journal_query_unique(sd_journal_query_unique, j.cjournal, f)
-
-	if r < 0 {
-		return nil, fmt.Errorf("failed to query journal: %d", syscall.Errno(-r))
-	}
-
-	// Implements the SD_JOURNAL_FOREACH_UNIQUE macro from sd-journal.h
-	var d unsafe.Pointer
-	var l C.size_t
-	C.my_sd_journal_restart_unique(sd_journal_restart_unique, j.cjournal)
-	for {
-		r = C.my_sd_journal_enumerate_unique(sd_journal_enumerate_unique, j.cjournal, &d, &l)
-		if r == 0 {
-			break
-		}
-
-		if r < 0 {
-			return nil, fmt.Errorf("failed to read message field: %d", syscall.Errno(-r))
-		}
-
-		msg := C.GoStringN((*C.char)(d), C.int(l))
-		kv := strings.SplitN(msg, "=", 2)
-		if len(kv) < 2 {
-			return nil, fmt.Errorf("failed to parse field")
-		}
-
-		result = append(result, kv[1])
-	}
-
-	return result, nil
-}
-
-// GetCatalog retrieves a message catalog entry for the current journal entry.
-func (j *Journal) GetCatalog() (string, error) {
-	sd_journal_get_catalog, err := getFunction("sd_journal_get_catalog")
-	if err != nil {
-		return "", err
-	}
-
-	var c *C.char
-
-	j.mu.Lock()
-	r := C.my_sd_journal_get_catalog(sd_journal_get_catalog, j.cjournal, &c)
-	j.mu.Unlock()
-	defer C.free(unsafe.Pointer(c))
-
-	if r < 0 {
-		return "", fmt.Errorf("failed to retrieve catalog entry for current journal entry: %d", syscall.Errno(-r))
-	}
-
-	catalog := C.GoString(c)
-
-	return catalog, nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal_test.go b/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal_test.go
deleted file mode 100755
index c710a594df..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/sdjournal/journal_test.go
+++ /dev/null
@@ -1,486 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sdjournal
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/coreos/go-systemd/journal"
-)
-
-func TestJournalFollow(t *testing.T) {
-	r, err := NewJournalReader(JournalReaderConfig{
-		Since: time.Duration(-15) * time.Second,
-		Matches: []Match{
-			{
-				Field: SD_JOURNAL_FIELD_SYSTEMD_UNIT,
-				Value: "NetworkManager.service",
-			},
-		},
-	})
-
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-
-	if r == nil {
-		t.Fatal("Got a nil reader")
-	}
-
-	defer r.Close()
-
-	// start writing some test entries
-	done := make(chan struct{}, 1)
-	defer close(done)
-	go func() {
-		for {
-			select {
-			case <-done:
-				return
-			default:
-				if err := journal.Print(journal.PriInfo, "test message %s", time.Now()); err != nil {
-					t.Fatalf("Error writing to journal: %s", err)
-				}
-
-				time.Sleep(time.Second)
-			}
-		}
-	}()
-
-	// and follow the reader synchronously
-	timeout := time.Duration(5) * time.Second
-	if err = r.Follow(time.After(timeout), os.Stdout); err != ErrExpired {
-		t.Fatalf("Error during follow: %s", err)
-	}
-}
-
-func TestJournalWait(t *testing.T) {
-	id := time.Now().String()
-	j, err := NewJournal()
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-	if err := j.AddMatch("TEST=TestJournalWait " + id); err != nil {
-		t.Fatalf("Error adding match: %s", err)
-	}
-	if err := j.SeekTail(); err != nil {
-		t.Fatalf("Error seeking to tail: %s", err)
-	}
-	if _, err := j.Next(); err != nil {
-		t.Fatalf("Error retrieving next entry: %s", err)
-	}
-
-	var t1, t2 time.Time
-	for ret := -1; ret != SD_JOURNAL_NOP; {
-		// Wait() might return for reasons other than timeout.
-		// For example the first call initializes stuff and returns immediately.
-		t1 = time.Now()
-		ret = j.Wait(time.Millisecond * 300)
-		t2 = time.Now()
-	}
-	duration := t2.Sub(t1)
-
-	if duration > time.Millisecond*325 || duration < time.Millisecond*300 {
-		t.Errorf("Wait did not wait 300ms. Actually waited %s", duration.String())
-	}
-
-	journal.Send("test message", journal.PriInfo, map[string]string{"TEST": "TestJournalWait " + id})
-	for ret := -1; ret != SD_JOURNAL_APPEND; {
-		t1 = time.Now()
-		ret = j.Wait(time.Millisecond * 300)
-		t2 = time.Now()
-	}
-	duration = t2.Sub(t1)
-
-	if duration >= time.Millisecond*300 {
-		t.Errorf("Wait took longer than 300ms. Actual duration %s", duration.String())
-	}
-}
-
-func TestJournalGetUsage(t *testing.T) {
-	j, err := NewJournal()
-
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-
-	if j == nil {
-		t.Fatal("Got a nil journal")
-	}
-
-	defer j.Close()
-
-	_, err = j.GetUsage()
-
-	if err != nil {
-		t.Fatalf("Error getting journal size: %s", err)
-	}
-}
-
-func TestJournalCursorGetSeekAndTest(t *testing.T) {
-	j, err := NewJournal()
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-
-	if j == nil {
-		t.Fatal("Got a nil journal")
-	}
-
-	defer j.Close()
-
-	err = journal.Print(journal.PriInfo, "test message for cursor %s", time.Now())
-	if err != nil {
-		t.Fatalf("Error writing to journal: %s", err)
-	}
-
-	if err = waitAndNext(j); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	c, err := j.GetCursor()
-	if err != nil {
-		t.Fatalf("Error getting cursor from journal: %s", err)
-	}
-
-	err = j.SeekCursor(c)
-	if err != nil {
-		t.Fatalf("Error seeking cursor to journal: %s", err)
-	}
-
-	if err = waitAndNext(j); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	err = j.TestCursor(c)
-	if err != nil {
-		t.Fatalf("Error testing cursor to journal: %s", err)
-	}
-}
-
-func TestNewJournalFromDir(t *testing.T) {
-	// test for error handling
-	dir := "/ClearlyNonExistingPath/"
-	j, err := NewJournalFromDir(dir)
-	if err == nil {
-		defer j.Close()
-		t.Fatalf("Error expected when opening dummy path (%s)", dir)
-	}
-	// test for main code path
-	dir, err = ioutil.TempDir("", "go-systemd-test")
-	if err != nil {
-		t.Fatalf("Error creating tempdir: %s", err)
-	}
-	defer os.RemoveAll(dir)
-	j, err = NewJournalFromDir(dir)
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-	if j == nil {
-		t.Fatal("Got a nil journal")
-	}
-	j.Close()
-}
-
-func setupJournalRoundtrip() (*Journal, map[string]string, error) {
-	j, err := NewJournal()
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error opening journal: %s", err)
-	}
-
-	if j == nil {
-		return nil, nil, fmt.Errorf("Got a nil journal")
-	}
-
-	j.FlushMatches()
-
-	matchField := "TESTJOURNALENTRY"
-	matchValue := fmt.Sprintf("%d", time.Now().UnixNano())
-	m := Match{Field: matchField, Value: matchValue}
-	err = j.AddMatch(m.String())
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error adding matches to journal: %s", err)
-	}
-
-	msg := fmt.Sprintf("test journal get entry message %s", time.Now())
-	data := map[string]string{matchField: matchValue}
-	err = journal.Send(msg, journal.PriInfo, data)
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error writing to journal: %s", err)
-	}
-
-	time.Sleep(time.Duration(1) * time.Second)
-
-	n, err := j.Next()
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error reading from journal: %s", err)
-	}
-
-	if n == 0 {
-		return nil, nil, fmt.Errorf("Error reading from journal: %s", io.EOF)
-	}
-
-	data["MESSAGE"] = msg
-
-	return j, data, nil
-}
-
-func TestJournalGetData(t *testing.T) {
-	j, wantEntry, err := setupJournalRoundtrip()
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
-	defer j.Close()
-
-	for k, v := range wantEntry {
-		data := fmt.Sprintf("%s=%s", k, v)
-
-		dataStr, err := j.GetData(k)
-		if err != nil {
-			t.Fatalf("GetData() error: %v", err)
-		}
-
-		if dataStr != data {
-			t.Fatalf("Invalid data for \"%s\": got %s, want %s", k, dataStr, data)
-		}
-
-		dataBytes, err := j.GetDataBytes(k)
-		if err != nil {
-			t.Fatalf("GetDataBytes() error: %v", err)
-		}
-
-		if string(dataBytes) != data {
-			t.Fatalf("Invalid data bytes for \"%s\": got %s, want %s", k, string(dataBytes), data)
-		}
-
-		valStr, err := j.GetDataValue(k)
-		if err != nil {
-			t.Fatalf("GetDataValue() error: %v", err)
-		}
-
-		if valStr != v {
-			t.Fatalf("Invalid data value for \"%s\": got %s, want %s", k, valStr, v)
-		}
-
-		valBytes, err := j.GetDataValueBytes(k)
-		if err != nil {
-			t.Fatalf("GetDataValueBytes() error: %v", err)
-		}
-
-		if string(valBytes) != v {
-			t.Fatalf("Invalid data value bytes for \"%s\": got %s, want %s", k, string(valBytes), v)
-		}
-	}
-}
-
-func TestJournalGetEntry(t *testing.T) {
-	j, wantEntry, err := setupJournalRoundtrip()
-	if err != nil {
-		t.Fatal(err.Error())
-	}
-
-	defer j.Close()
-
-	entry, err := j.GetEntry()
-	if err != nil {
-		t.Fatalf("Error getting the entry to journal: %s", err)
-	}
-
-	for k, wantV := range wantEntry {
-		gotV := entry.Fields[k]
-		if gotV != wantV {
-			t.Fatalf("Bad result for entry.Fields[\"%s\"]: got %s, want %s", k, gotV, wantV)
-		}
-	}
-}
-
-// Check for incorrect read into small buffers,
-// see https://github.com/coreos/go-systemd/issues/172
-func TestJournalReaderSmallReadBuffer(t *testing.T) {
-	// Write a long entry ...
-	delim := "%%%%%%"
-	longEntry := strings.Repeat("a", 256)
-	matchField := "TESTJOURNALREADERSMALLBUF"
-	matchValue := fmt.Sprintf("%d", time.Now().UnixNano())
-	r, err := NewJournalReader(JournalReaderConfig{
-		Since: time.Duration(-15) * time.Second,
-		Matches: []Match{
-			{
-				Field: matchField,
-				Value: matchValue,
-			},
-		},
-	})
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-	if r == nil {
-		t.Fatal("Got a nil reader")
-	}
-	defer r.Close()
-
-	want := fmt.Sprintf("%slongentry %s%s", delim, longEntry, delim)
-	err = journal.Send(want, journal.PriInfo, map[string]string{matchField: matchValue})
-	if err != nil {
-		t.Fatal("Error writing to journal", err)
-	}
-	time.Sleep(time.Second)
-
-	// ... and try to read it back piece by piece via a small buffer
-	finalBuff := new(bytes.Buffer)
-	var e error
-	for c := -1; c != 0 && e == nil; {
-		smallBuf := make([]byte, 5)
-		c, e = r.Read(smallBuf)
-		if c > len(smallBuf) {
-			t.Fatalf("Got unexpected read length: %d vs %d", c, len(smallBuf))
-		}
-		_, _ = finalBuff.Write(smallBuf)
-	}
-	b := finalBuff.String()
-	got := strings.Split(b, delim)
-	if len(got) != 3 {
-		t.Fatalf("Got unexpected entry %s", b)
-	}
-	if got[1] != strings.Trim(want, delim) {
-		t.Fatalf("Got unexpected message %s", got[1])
-	}
-}
-
-func TestJournalGetUniqueValues(t *testing.T) {
-	j, err := NewJournal()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer j.Close()
-
-	uniqueString := generateRandomField(20)
-	testEntries := []string{"A", "B", "C", "D"}
-	for _, v := range testEntries {
-		err := journal.Send("TEST: "+uniqueString, journal.PriInfo, map[string]string{uniqueString: v})
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// TODO: add proper `waitOnMatch` function which should wait for journal entry with filter to commit.
-	time.Sleep(time.Millisecond * 500)
-
-	values, err := j.GetUniqueValues(uniqueString)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(values) != len(testEntries) {
-		t.Fatalf("Expect %d entries. Got %d", len(testEntries), len(values))
-	}
-
-	if !contains(values, "A") || !contains(values, "B") || !contains(values, "C") || !contains(values, "D") {
-		t.Fatalf("Expect 4 values for %s field: A,B,C,D. Got %s", uniqueString, values)
-	}
-}
-
-func TestJournalGetCatalog(t *testing.T) {
-	want := []string{
-		"Subject: ",
-		"Defined-By: systemd",
-		"Support: ",
-	}
-	j, err := NewJournal()
-	if err != nil {
-		t.Fatalf("Error opening journal: %s", err)
-	}
-
-	if j == nil {
-		t.Fatal("Got a nil journal")
-	}
-
-	defer j.Close()
-
-	if err = j.SeekHead(); err != nil {
-		t.Fatalf("Seek to head failed: %s", err)
-	}
-
-	matchField := SD_JOURNAL_FIELD_SYSTEMD_UNIT
-	m := Match{Field: matchField, Value: "systemd-journald.service"}
-	if err = j.AddMatch(m.String()); err != nil {
-		t.Fatalf("Error adding matches to journal: %s", err)
-	}
-
-	if err = waitAndNext(j); err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	catalog, err := j.GetCatalog()
-
-	if err != nil {
-		t.Fatalf("Failed to retrieve catalog entry: %s", err)
-	}
-
-	for _, w := range want {
-		if !strings.Contains(catalog, w) {
-			t.Fatalf("Failed to find \"%s\" in \n%s", w, catalog)
-		}
-	}
-}
-
-func contains(s []string, v string) bool {
-	for _, entry := range s {
-		if entry == v {
-			return true
-		}
-	}
-	return false
-}
-
-func generateRandomField(n int) string {
-	letters := []rune("ABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	s := make([]rune, n)
-	rand.Seed(time.Now().UnixNano())
-	for i := range s {
-		s[i] = letters[rand.Intn(len(letters))]
-	}
-	return string(s)
-}
-
-func waitAndNext(j *Journal) error {
-	r := j.Wait(time.Duration(1) * time.Second)
-	if r < 0 {
-		return errors.New("Error waiting to journal")
-	}
-
-	n, err := j.Next()
-	if err != nil {
-		return fmt.Errorf("Error reading to journal: %s", err)
-	}
-
-	if n == 0 {
-		return fmt.Errorf("Error reading to journal: %s", io.EOF)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/sdjournal/read.go b/installer/vendor/github.com/coreos/go-systemd/sdjournal/read.go
deleted file mode 100644
index 100ee6f8da..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/sdjournal/read.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2015 RedHat, Inc.
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package sdjournal
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"strings"
-	"time"
-)
-
-var (
-	ErrExpired = errors.New("Timeout expired")
-)
-
-// JournalReaderConfig represents options to drive the behavior of a JournalReader.
-type JournalReaderConfig struct {
-	// The Since, NumFromTail and Cursor options are mutually exclusive and
-	// determine where the reading begins within the journal. The order in which
-	// options are written is exactly the order of precedence.
-	Since       time.Duration // start relative to a Duration from now
-	NumFromTail uint64        // start relative to the tail
-	Cursor      string        // start relative to the cursor
-
-	// Show only journal entries whose fields match the supplied values. If
-	// the array is empty, entries will not be filtered.
-	Matches []Match
-
-	// If not empty, the journal instance will point to a journal residing
-	// in this directory. The supplied path may be relative or absolute.
-	Path string
-}
-
-// JournalReader is an io.ReadCloser which provides a simple interface for iterating through the
-// systemd journal. A JournalReader is not safe for concurrent use by multiple goroutines.
-type JournalReader struct {
-	journal   *Journal
-	msgReader *strings.Reader
-}
-
-// NewJournalReader creates a new JournalReader with configuration options that are similar to the
-// systemd journalctl tool's iteration and filtering features.
-func NewJournalReader(config JournalReaderConfig) (*JournalReader, error) {
-	r := &JournalReader{}
-
-	// Open the journal
-	var err error
-	if config.Path != "" {
-		r.journal, err = NewJournalFromDir(config.Path)
-	} else {
-		r.journal, err = NewJournal()
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Add any supplied matches
-	for _, m := range config.Matches {
-		r.journal.AddMatch(m.String())
-	}
-
-	// Set the start position based on options
-	if config.Since != 0 {
-		// Start based on a relative time
-		start := time.Now().Add(config.Since)
-		if err := r.journal.SeekRealtimeUsec(uint64(start.UnixNano() / 1000)); err != nil {
-			return nil, err
-		}
-	} else if config.NumFromTail != 0 {
-		// Start based on a number of lines before the tail
-		if err := r.journal.SeekTail(); err != nil {
-			return nil, err
-		}
-
-		// Move the read pointer into position near the tail. Go one further than
-		// the option so that the initial cursor advancement positions us at the
-		// correct starting point.
-		skip, err := r.journal.PreviousSkip(config.NumFromTail + 1)
-		if err != nil {
-			return nil, err
-		}
-		// If we skipped fewer lines than expected, we have reached journal start.
-		// Thus, we seek to head so that next invocation can read the first line.
-		if skip != config.NumFromTail+1 {
-			if err := r.journal.SeekHead(); err != nil {
-				return nil, err
-			}
-		}
-	} else if config.Cursor != "" {
-		// Start based on a custom cursor
-		if err := r.journal.SeekCursor(config.Cursor); err != nil {
-			return nil, err
-		}
-	}
-
-	return r, nil
-}
-
-// Read reads entries from the journal. Read follows the Reader interface so
-// it must be able to read a specific amount of bytes. Journald on the other
-// hand only allows us to read full entries of arbitrary size (without byte
-// granularity). JournalReader is therefore internally buffering entries that
-// don't fit in the read buffer. Callers should keep calling until 0 and/or an
-// error is returned.
-func (r *JournalReader) Read(b []byte) (int, error) {
-	var err error
-
-	if r.msgReader == nil {
-		var c uint64
-
-		// Advance the journal cursor. It has to be called at least one time
-		// before reading
-		c, err = r.journal.Next()
-
-		// An unexpected error
-		if err != nil {
-			return 0, err
-		}
-
-		// EOF detection
-		if c == 0 {
-			return 0, io.EOF
-		}
-
-		// Build a message
-		var msg string
-		msg, err = r.buildMessage()
-
-		if err != nil {
-			return 0, err
-		}
-		r.msgReader = strings.NewReader(msg)
-	}
-
-	// Copy and return the message
-	var sz int
-	sz, err = r.msgReader.Read(b)
-	if err == io.EOF {
-		// The current entry has been fully read. Don't propagate this
-		// EOF, so the next entry can be read at the next Read()
-		// iteration.
-		r.msgReader = nil
-		return sz, nil
-	}
-	if err != nil {
-		return sz, err
-	}
-	if r.msgReader.Len() == 0 {
-		r.msgReader = nil
-	}
-
-	return sz, nil
-}
-
-// Close closes the JournalReader's handle to the journal.
-func (r *JournalReader) Close() error {
-	return r.journal.Close()
-}
-
-// Rewind attempts to rewind the JournalReader to the first entry.
-func (r *JournalReader) Rewind() error {
-	r.msgReader = nil
-	return r.journal.SeekHead()
-}
-
-// Follow synchronously follows the JournalReader, writing each new journal entry to writer. The
-// follow will continue until a single time.Time is received on the until channel.
-func (r *JournalReader) Follow(until <-chan time.Time, writer io.Writer) (err error) {
-
-	// Process journal entries and events. Entries are flushed until the tail or
-	// timeout is reached, and then we wait for new events or the timeout.
-	var msg = make([]byte, 64*1<<(10))
-	var waitCh = make(chan int)
-	var waitStop = make(chan bool)
-	defer close(waitStop)
-
-process:
-	for {
-		c, err := r.Read(msg)
-		if err != nil && err != io.EOF {
-			break process
-		}
-
-		select {
-		case <-until:
-			return ErrExpired
-		default:
-		}
-		if c > 0 {
-			if _, err = writer.Write(msg[:c]); err != nil {
-				break process
-			}
-			continue process
-		}
-
-		// We're at the tail, so wait for new events or time out.
-		// Holds journal events to process. Tightly bounded for now unless there's a
-		// reason to unblock the journal watch routine more quickly.
-		for {
-			go func() {
-				select {
-				case <-waitStop:
-				case waitCh <- r.journal.Wait(1 * time.Second):
-				}
-			}()
-
-			select {
-			case <-until:
-				return ErrExpired
-			case e := <-waitCh:
-				switch e {
-				case SD_JOURNAL_NOP:
-					// the journal did not change since the last invocation
-				case SD_JOURNAL_APPEND, SD_JOURNAL_INVALIDATE:
-					continue process
-				default:
-					log.Printf("Received unknown event: %d\n", e)
-				}
-			}
-		}
-	}
-
-	return
-}
-
-// buildMessage returns a string representing the current journal entry in a simple format which
-// includes the entry timestamp and MESSAGE field.
-func (r *JournalReader) buildMessage() (string, error) {
-	var msg string
-	var usec uint64
-	var err error
-
-	if msg, err = r.journal.GetData("MESSAGE"); err != nil {
-		return "", err
-	}
-
-	if usec, err = r.journal.GetRealtimeUsec(); err != nil {
-		return "", err
-	}
-
-	timestamp := time.Unix(0, int64(usec)*int64(time.Microsecond))
-
-	return fmt.Sprintf("%s %s\n", timestamp, msg), nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/test b/installer/vendor/github.com/coreos/go-systemd/test
deleted file mode 100755
index 2ffd61176d..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/test
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/bash -e
-#
-# Run all tests
-#   ./test
-#   ./test -v
-#
-# Run tests for one package
-#   PKG=./foo ./test
-#   PKG=bar ./test
-#
-
-# Invoke ./cover for HTML output
-COVER=${COVER:-"-cover"}
-
-PROJ="go-systemd"
-ORG_PATH="github.com/coreos"
-REPO_PATH="${ORG_PATH}/${PROJ}"
-
-# As a convenience, set up a self-contained GOPATH if none set
-if [ -z "$GOPATH" ]; then
-	if [ ! -h gopath/src/${REPO_PATH} ]; then
-		mkdir -p gopath/src/${ORG_PATH}
-		ln -s ../../../.. gopath/src/${REPO_PATH} || exit 255
-	fi
-	export GOPATH=${PWD}/gopath
-	go get -u github.com/godbus/dbus
-	go get -u github.com/coreos/pkg/dlopen
-fi
-
-TESTABLE="activation daemon journal login1 unit"
-FORMATTABLE="$TESTABLE sdjournal dbus machine1"
-if [ -e "/run/systemd/system/" ]; then
-	# if we're on a systemd-system, we can test sdjournal
-	TESTABLE="${TESTABLE} sdjournal"
-	if [ "$EUID" == "0" ]; then
-		# testing actual systemd/machined behaviour requires root
-		TESTABLE="${TESTABLE} dbus machine1"
-	fi
-fi
-
-
-# user has not provided PKG override
-if [ -z "$PKG" ]; then
-	TEST=$TESTABLE
-	FMT=$FORMATTABLE
-
-# user has provided PKG override
-else
-	# strip out slashes and dots from PKG=./foo/
-	TEST=${PKG//\//}
-	TEST=${TEST//./}
-
-	# only run gofmt on packages provided by user
-	FMT="$TEST"
-fi
-
-# split TEST into an array and prepend REPO_PATH to each local package
-split=(${TEST// / })
-TEST=${split[@]/#/${REPO_PATH}/}
-
-echo "Running tests..."
-go test -v ${COVER} $@ ${TEST}
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FMT)
-if [ -n "${fmtRes}" ]; then
-	echo -e "gofmt checking failed:\n${fmtRes}"
-	exit 255
-fi
-
-echo "Checking govet..."
-vetRes=$(go vet $TEST)
-if [ -n "${vetRes}" ]; then
-	echo -e "govet checking failed:\n${vetRes}"
-	exit 255
-fi
-
-echo "Checking for license header..."
-licRes=$(for file in $(find . -type f -iname '*.go' ! -path './gopath/*'); do
-		head -n3 "${file}" | grep -Eq "(Copyright|generated|GENERATED)" || echo -e "  ${file}"
-	done;)
-if [ -n "${licRes}" ]; then
-	echo -e "license header checking failed:\n${licRes}"
-	exit 255
-fi
-
-
-echo "Success"
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/deserialize.go b/installer/vendor/github.com/coreos/go-systemd/unit/deserialize.go
deleted file mode 100644
index 8a88162f98..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/deserialize.go
+++ /dev/null
@@ -1,276 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"unicode"
-)
-
-const (
-	// SYSTEMD_LINE_MAX mimics the maximum line length that systemd can use.
-	// On typical systemd platforms (i.e. modern Linux), this will most
-	// commonly be 2048, so let's use that as a sanity check.
-	// Technically, we should probably pull this at runtime:
-	//    SYSTEMD_LINE_MAX = int(C.sysconf(C.__SC_LINE_MAX))
-	// but this would introduce an (unfortunate) dependency on cgo
-	SYSTEMD_LINE_MAX = 2048
-
-	// characters that systemd considers indicate a newline
-	SYSTEMD_NEWLINE = "\r\n"
-)
-
-var (
-	ErrLineTooLong = fmt.Errorf("line too long (max %d bytes)", SYSTEMD_LINE_MAX)
-)
-
-// Deserialize parses a systemd unit file into a list of UnitOption objects.
-func Deserialize(f io.Reader) (opts []*UnitOption, err error) {
-	lexer, optchan, errchan := newLexer(f)
-	go lexer.lex()
-
-	for opt := range optchan {
-		opts = append(opts, &(*opt))
-	}
-
-	err = <-errchan
-	return opts, err
-}
-
-func newLexer(f io.Reader) (*lexer, <-chan *UnitOption, <-chan error) {
-	optchan := make(chan *UnitOption)
-	errchan := make(chan error, 1)
-	buf := bufio.NewReader(f)
-
-	return &lexer{buf, optchan, errchan, ""}, optchan, errchan
-}
-
-type lexer struct {
-	buf     *bufio.Reader
-	optchan chan *UnitOption
-	errchan chan error
-	section string
-}
-
-func (l *lexer) lex() {
-	var err error
-	defer func() {
-		close(l.optchan)
-		close(l.errchan)
-	}()
-	next := l.lexNextSection
-	for next != nil {
-		if l.buf.Buffered() >= SYSTEMD_LINE_MAX {
-			// systemd truncates lines longer than LINE_MAX
-			// https://bugs.freedesktop.org/show_bug.cgi?id=85308
-			// Rather than allowing this to pass silently, let's
-			// explicitly gate people from encountering this
-			line, err := l.buf.Peek(SYSTEMD_LINE_MAX)
-			if err != nil {
-				l.errchan <- err
-				return
-			}
-			if bytes.IndexAny(line, SYSTEMD_NEWLINE) == -1 {
-				l.errchan <- ErrLineTooLong
-				return
-			}
-		}
-
-		next, err = next()
-		if err != nil {
-			l.errchan <- err
-			return
-		}
-	}
-}
-
-type lexStep func() (lexStep, error)
-
-func (l *lexer) lexSectionName() (lexStep, error) {
-	sec, err := l.buf.ReadBytes(']')
-	if err != nil {
-		return nil, errors.New("unable to find end of section")
-	}
-
-	return l.lexSectionSuffixFunc(string(sec[:len(sec)-1])), nil
-}
-
-func (l *lexer) lexSectionSuffixFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		garbage, _, err := l.toEOL()
-		if err != nil {
-			return nil, err
-		}
-
-		garbage = bytes.TrimSpace(garbage)
-		if len(garbage) > 0 {
-			return nil, fmt.Errorf("found garbage after section name %s: %v", l.section, garbage)
-		}
-
-		return l.lexNextSectionOrOptionFunc(section), nil
-	}
-}
-
-func (l *lexer) ignoreLineFunc(next lexStep) lexStep {
-	return func() (lexStep, error) {
-		for {
-			line, _, err := l.toEOL()
-			if err != nil {
-				return nil, err
-			}
-
-			line = bytes.TrimSuffix(line, []byte{' '})
-
-			// lack of continuation means this line has been exhausted
-			if !bytes.HasSuffix(line, []byte{'\\'}) {
-				break
-			}
-		}
-
-		// reached end of buffer, safe to exit
-		return next, nil
-	}
-}
-
-func (l *lexer) lexNextSection() (lexStep, error) {
-	r, _, err := l.buf.ReadRune()
-	if err != nil {
-		if err == io.EOF {
-			err = nil
-		}
-		return nil, err
-	}
-
-	if r == '[' {
-		return l.lexSectionName, nil
-	} else if isComment(r) {
-		return l.ignoreLineFunc(l.lexNextSection), nil
-	}
-
-	return l.lexNextSection, nil
-}
-
-func (l *lexer) lexNextSectionOrOptionFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		r, _, err := l.buf.ReadRune()
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			return nil, err
-		}
-
-		if unicode.IsSpace(r) {
-			return l.lexNextSectionOrOptionFunc(section), nil
-		} else if r == '[' {
-			return l.lexSectionName, nil
-		} else if isComment(r) {
-			return l.ignoreLineFunc(l.lexNextSectionOrOptionFunc(section)), nil
-		}
-
-		l.buf.UnreadRune()
-		return l.lexOptionNameFunc(section), nil
-	}
-}
-
-func (l *lexer) lexOptionNameFunc(section string) lexStep {
-	return func() (lexStep, error) {
-		var partial bytes.Buffer
-		for {
-			r, _, err := l.buf.ReadRune()
-			if err != nil {
-				return nil, err
-			}
-
-			if r == '\n' || r == '\r' {
-				return nil, errors.New("unexpected newline encountered while parsing option name")
-			}
-
-			if r == '=' {
-				break
-			}
-
-			partial.WriteRune(r)
-		}
-
-		name := strings.TrimSpace(partial.String())
-		return l.lexOptionValueFunc(section, name, bytes.Buffer{}), nil
-	}
-}
-
-func (l *lexer) lexOptionValueFunc(section, name string, partial bytes.Buffer) lexStep {
-	return func() (lexStep, error) {
-		for {
-			line, eof, err := l.toEOL()
-			if err != nil {
-				return nil, err
-			}
-
-			if len(bytes.TrimSpace(line)) == 0 {
-				break
-			}
-
-			partial.Write(line)
-
-			// lack of continuation means this value has been exhausted
-			idx := bytes.LastIndex(line, []byte{'\\'})
-			if idx == -1 || idx != (len(line)-1) {
-				break
-			}
-
-			if !eof {
-				partial.WriteRune('\n')
-			}
-
-			return l.lexOptionValueFunc(section, name, partial), nil
-		}
-
-		val := partial.String()
-		if strings.HasSuffix(val, "\n") {
-			// A newline was added to the end, so the file didn't end with a backslash.
-			// => Keep the newline
-			val = strings.TrimSpace(val) + "\n"
-		} else {
-			val = strings.TrimSpace(val)
-		}
-		l.optchan <- &UnitOption{Section: section, Name: name, Value: val}
-
-		return l.lexNextSectionOrOptionFunc(section), nil
-	}
-}
-
-// toEOL reads until the end-of-line or end-of-file.
-// Returns (data, EOFfound, error)
-func (l *lexer) toEOL() ([]byte, bool, error) {
-	line, err := l.buf.ReadBytes('\n')
-	// ignore EOF here since it's roughly equivalent to EOL
-	if err != nil && err != io.EOF {
-		return nil, false, err
-	}
-
-	line = bytes.TrimSuffix(line, []byte{'\r'})
-	line = bytes.TrimSuffix(line, []byte{'\n'})
-
-	return line, err == io.EOF, nil
-}
-
-func isComment(r rune) bool {
-	return r == '#' || r == ';'
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/deserialize_test.go b/installer/vendor/github.com/coreos/go-systemd/unit/deserialize_test.go
deleted file mode 100644
index 84b7169fcf..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/deserialize_test.go
+++ /dev/null
@@ -1,381 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func TestDeserialize(t *testing.T) {
-	tests := []struct {
-		input  []byte
-		output []*UnitOption
-	}{
-		// multiple options underneath a section
-		{
-			[]byte(`[Unit]
-Description=Foo
-Description=Bar
-Requires=baz.service
-After=baz.service
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Unit", "Description", "Bar"},
-				&UnitOption{"Unit", "Requires", "baz.service"},
-				&UnitOption{"Unit", "After", "baz.service"},
-			},
-		},
-
-		// multiple sections
-		{
-			[]byte(`[Unit]
-Description=Foo
-
-[Service]
-ExecStart=/usr/bin/sleep infinity
-
-[X-Third-Party]
-Pants=on
-
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Service", "ExecStart", "/usr/bin/sleep infinity"},
-				&UnitOption{"X-Third-Party", "Pants", "on"},
-			},
-		},
-
-		// multiple sections with no options
-		{
-			[]byte(`[Unit]
-[Service]
-[X-Third-Party]
-`),
-			[]*UnitOption{},
-		},
-
-		// multiple values not special-cased
-		{
-			[]byte(`[Service]
-Environment= "FOO=BAR" "BAZ=QUX"
-`),
-			[]*UnitOption{
-				&UnitOption{"Service", "Environment", "\"FOO=BAR\" \"BAZ=QUX\""},
-			},
-		},
-
-		// line continuations unmodified
-		{
-			[]byte(`[Unit]
-Description= Unnecessarily wrapped \
-    words here
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", `Unnecessarily wrapped \
-    words here`},
-			},
-		},
-
-		// comments ignored
-		{
-			[]byte(`; comment alpha
-# comment bravo
-[Unit]
-; comment charlie
-# comment delta
-#Description=Foo
-Description=Bar
-; comment echo
-# comment foxtrot
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar"},
-			},
-		},
-
-		// apparent comment lines inside of line continuations not ignored
-		{
-			[]byte(`[Unit]
-Description=Bar\
-# comment alpha
-
-Description=Bar\
-# comment bravo \
-Baz
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar\\\n# comment alpha"},
-				&UnitOption{"Unit", "Description", "Bar\\\n# comment bravo \\\nBaz"},
-			},
-		},
-
-		// options outside of sections are ignored
-		{
-			[]byte(`Description=Foo
-[Unit]
-Description=Bar
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar"},
-			},
-		},
-
-		// garbage outside of sections are ignored
-		{
-			[]byte(`<<<<<<<<
-[Unit]
-Description=Bar
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar"},
-			},
-		},
-
-		// garbage used as unit option
-		{
-			[]byte(`[Unit]
-<<<<<<<<=Bar
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "<<<<<<<<", "Bar"},
-			},
-		},
-
-		// option name with spaces are valid
-		{
-			[]byte(`[Unit]
-Some Thing = Bar
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Some Thing", "Bar"},
-			},
-		},
-
-		// lack of trailing newline doesn't cause problem for non-continued file
-		{
-			[]byte(`[Unit]
-Description=Bar`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar"},
-			},
-		},
-
-		// unit file with continuation but no following line is ok, too
-		{
-			[]byte(`[Unit]
-Description=Bar \`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Bar \\"},
-			},
-		},
-
-		// Assert utf8 characters are preserved
-		{
-			[]byte(`[©]
-µ☃=ÇôrèÕ$`),
-			[]*UnitOption{
-				&UnitOption{"©", "µ☃", "ÇôrèÕ$"},
-			},
-		},
-
-		// whitespace removed around option name
-		{
-			[]byte(`[Unit]
- Description   =words here
-`),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "words here"},
-			},
-		},
-
-		// whitespace around option value stripped
-		{
-			[]byte(`[Unit]
-Description= words here `),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "words here"},
-			},
-		},
-
-		// whitespace around option value stripped, regardless of continuation
-		{
-			[]byte(`[Unit]
-Description= words here \
-  `),
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "words here \\\n"},
-			},
-		},
-
-		// backslash not considered continuation if followed by text
-		{
-			[]byte(`[Service]
-ExecStart=/bin/bash -c "while true; do echo \"ping\"; sleep 1; done"
-`),
-			[]*UnitOption{
-				&UnitOption{"Service", "ExecStart", `/bin/bash -c "while true; do echo \"ping\"; sleep 1; done"`},
-			},
-		},
-
-		// backslash not considered continuation if followed by whitespace, but still trimmed
-		{
-			[]byte(`[Service]
-ExecStart=/bin/bash echo poof \  `),
-			[]*UnitOption{
-				&UnitOption{"Service", "ExecStart", `/bin/bash echo poof \`},
-			},
-		},
-		// a long unit file line that's just equal to the maximum permitted length
-		{
-			[]byte(`[Service]
-ExecStart=/bin/bash -c "echo ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."`),
-			[]*UnitOption{
-				&UnitOption{"Service", "ExecStart", `/bin/bash -c "echo ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."`},
-			},
-		},
-		// the same, but with a trailing newline
-		{
-			[]byte(`[Service]
-ExecStart=/bin/bash -c "echo ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."
-Option=value
-`),
-			[]*UnitOption{
-				&UnitOption{"Service", "ExecStart", `/bin/bash -c "echo ................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."`},
-				&UnitOption{"Service", "Option", "value"},
-			},
-		},
-	}
-
-	assert := func(expect, output []*UnitOption) error {
-		if len(expect) != len(output) {
-			return fmt.Errorf("expected %d items, got %d", len(expect), len(output))
-		}
-
-		for i, _ := range expect {
-			if !reflect.DeepEqual(expect[i], output[i]) {
-				return fmt.Errorf("item %d: expected %v, got %v", i, expect[i], output[i])
-			}
-		}
-
-		return nil
-	}
-
-	for i, tt := range tests {
-		output, err := Deserialize(bytes.NewReader(tt.input))
-		if err != nil {
-			t.Errorf("case %d: unexpected error parsing unit: %v", i, err)
-			continue
-		}
-
-		err = assert(tt.output, output)
-		if err != nil {
-			t.Errorf("case %d: %v", i, err)
-			t.Log("Expected options:")
-			logUnitOptionSlice(t, tt.output)
-			t.Log("Actual options:")
-			logUnitOptionSlice(t, output)
-		}
-	}
-}
-
-func TestDeserializeFail(t *testing.T) {
-	tests := [][]byte{
-		// malformed section header
-		[]byte(`[Unit
-Description=Foo
-`),
-
-		// garbage following section header
-		[]byte(`[Unit] pants
-Description=Foo
-`),
-
-		// option without value
-		[]byte(`[Unit]
-Description
-`),
-
-		// garbage inside of section
-		[]byte(`[Unit]
-<<<<<<
-Description=Foo
-`),
-	}
-
-	for i, tt := range tests {
-		output, err := Deserialize(bytes.NewReader(tt))
-		if err == nil {
-			t.Errorf("case %d: unexpected nil error", i)
-			t.Log("Output:")
-			logUnitOptionSlice(t, output)
-		}
-	}
-}
-
-func logUnitOptionSlice(t *testing.T, opts []*UnitOption) {
-	for idx, opt := range opts {
-		t.Logf("%d: %v", idx, opt)
-	}
-}
-
-func TestDeserializeLineTooLong(t *testing.T) {
-	tests := [][]byte{
-		// section header that's far too long
-		[]byte(`[Seeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeervice]
-`),
-		// sane-looking unit file with a line just greater than the maximum allowed (currently, 2048)
-		[]byte(`[Service]
-ExecStart=/bin/bash -c "echo ..................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................................."
-`),
-		// sane-looking unit file with option value way too long
-		[]byte(`
-# test unit file
-
-[Service]
-ExecStartPre=-/usr/bin/docker rm %p
-ExecStartPre=-/usr/bin/docker pull busybox
-ExecStart=/usr/bin/docker run --rm --name %p --net=host \
-  -e "test=1123t" \
-  -e "test=1123t" \
-  -e "fiz=1123t" \
-  -e "buz=1123t" \
-  -e "FOO=BARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBABARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARRBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBAR"BARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBABARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARRBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBARBAR" \
-  busybox sleep 10
-ExecStop=-/usr/bin/docker kill %p
-SyslogIdentifier=busybox
-Restart=always
-RestartSec=10s
-`),
-		// single arbitrary line that's way too long
-		[]byte(`arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 character arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 character arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 character arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 character arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters arbitrary and extraordinarily long line that is far greater than 2048 characters`),
-		// sane-looking unit file with option name way too long
-		[]byte(`[Service]
-ExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStartExecStart=/bin/true
-`),
-	}
-
-	for i, tt := range tests {
-		output, err := Deserialize(bytes.NewReader(tt))
-		if err != ErrLineTooLong {
-			t.Errorf("case %d: unexpected err: %v", i, err)
-			t.Log("Output:")
-			logUnitOptionSlice(t, output)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/end_to_end_test.go b/installer/vendor/github.com/coreos/go-systemd/unit/end_to_end_test.go
deleted file mode 100644
index 7182327ad5..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/end_to_end_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bytes"
-	"io/ioutil"
-	"testing"
-)
-
-func TestDeserializeAndReserialize(t *testing.T) {
-	tests := []struct {
-		in   string
-		wout string
-	}{
-		{
-			`[Service]
-ExecStart=/bin/bash -c "while true; do echo \"ping\"; sleep 1; done"
-`,
-			`[Service]
-ExecStart=/bin/bash -c "while true; do echo \"ping\"; sleep 1; done"
-`},
-		{
-			`[Unit]
-Description= Unnecessarily wrapped \
-    words here`,
-			`[Unit]
-Description=Unnecessarily wrapped \
-    words here
-`,
-		},
-		{
-			`[Unit]
-Description=Demo \
-
-Requires=docker.service
-`,
-			`[Unit]
-Description=Demo \
-
-Requires=docker.service
-`,
-		},
-		{
-			`; comment alpha
-# comment bravo
-[Unit]
-; comment charlie
-# comment delta
-#Description=Foo
-Description=Bar
-; comment echo
-# comment foxtrot
-`,
-			`[Unit]
-Description=Bar
-`},
-	}
-	for i, tt := range tests {
-		ds, err := Deserialize(bytes.NewBufferString(tt.in))
-		if err != nil {
-			t.Errorf("case %d: unexpected error parsing unit: %v", i, err)
-			continue
-		}
-		out, err := ioutil.ReadAll(Serialize(ds))
-		if err != nil {
-			t.Errorf("case %d: unexpected error serializing unit: %v", i, err)
-			continue
-		}
-		if g := string(out); g != tt.wout {
-			t.Errorf("case %d: incorrect output", i)
-			t.Logf("Expected:\n%#v", tt.wout)
-			t.Logf("Actual:\n%#v", g)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/escape.go b/installer/vendor/github.com/coreos/go-systemd/unit/escape.go
deleted file mode 100644
index 63b11726db..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/escape.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Implements systemd-escape [--unescape] [--path]
-
-package unit
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-const (
-	allowed = `:_.abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789`
-)
-
-// If isPath is true:
-//   We remove redundant '/'s, the leading '/', and trailing '/'.
-//   If the result is empty, a '/' is inserted.
-//
-// We always:
-//  Replace the following characters with `\x%x`:
-//   Leading `.`
-//   `-`, `\`, and anything not in this set: `:-_.\[0-9a-zA-Z]`
-//  Replace '/' with '-'.
-func escape(unescaped string, isPath bool) string {
-	e := []byte{}
-	inSlashes := false
-	start := true
-	for i := 0; i < len(unescaped); i++ {
-		c := unescaped[i]
-		if isPath {
-			if c == '/' {
-				inSlashes = true
-				continue
-			} else if inSlashes {
-				inSlashes = false
-				if !start {
-					e = append(e, '-')
-				}
-			}
-		}
-
-		if c == '/' {
-			e = append(e, '-')
-		} else if start && c == '.' || strings.IndexByte(allowed, c) == -1 {
-			e = append(e, []byte(fmt.Sprintf(`\x%x`, c))...)
-		} else {
-			e = append(e, c)
-		}
-		start = false
-	}
-	if isPath && len(e) == 0 {
-		e = append(e, '-')
-	}
-	return string(e)
-}
-
-// If isPath is true:
-//   We always return a string beginning with '/'.
-//
-// We always:
-//  Replace '-' with '/'.
-//  Replace `\x%x` with the value represented in hex.
-func unescape(escaped string, isPath bool) string {
-	u := []byte{}
-	for i := 0; i < len(escaped); i++ {
-		c := escaped[i]
-		if c == '-' {
-			c = '/'
-		} else if c == '\\' && len(escaped)-i >= 4 && escaped[i+1] == 'x' {
-			n, err := strconv.ParseInt(escaped[i+2:i+4], 16, 8)
-			if err == nil {
-				c = byte(n)
-				i += 3
-			}
-		}
-		u = append(u, c)
-	}
-	if isPath && (len(u) == 0 || u[0] != '/') {
-		u = append([]byte("/"), u...)
-	}
-	return string(u)
-}
-
-// UnitNameEscape escapes a string as `systemd-escape` would
-func UnitNameEscape(unescaped string) string {
-	return escape(unescaped, false)
-}
-
-// UnitNameUnescape unescapes a string as `systemd-escape --unescape` would
-func UnitNameUnescape(escaped string) string {
-	return unescape(escaped, false)
-}
-
-// UnitNamePathEscape escapes a string as `systemd-escape --path` would
-func UnitNamePathEscape(unescaped string) string {
-	return escape(unescaped, true)
-}
-
-// UnitNamePathUnescape unescapes a string as `systemd-escape --path --unescape` would
-func UnitNamePathUnescape(escaped string) string {
-	return unescape(escaped, true)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/escape_test.go b/installer/vendor/github.com/coreos/go-systemd/unit/escape_test.go
deleted file mode 100644
index 36b1a7d374..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/escape_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"testing"
-)
-
-func TestUnitNameEscape(t *testing.T) {
-	tests := []struct {
-		in     string
-		out    string
-		isPath bool
-	}{
-		// turn empty string path into escaped /
-		{
-			in:     "",
-			out:    "-",
-			isPath: true,
-		},
-		// turn redundant ////s into single escaped /
-		{
-			in:     "/////////",
-			out:    "-",
-			isPath: true,
-		},
-		// remove all redundant ////s
-		{
-			in:     "///foo////bar/////tail//////",
-			out:    "foo-bar-tail",
-			isPath: true,
-		},
-		// leave empty string empty
-		{
-			in:     "",
-			out:    "",
-			isPath: false,
-		},
-		// escape leading dot
-		{
-			in:     ".",
-			out:    `\x2e`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     "/.",
-			out:    `\x2e`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     "/////////.",
-			out:    `\x2e`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     "/////////.///////////////",
-			out:    `\x2e`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     ".....",
-			out:    `\x2e....`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     "/.foo/.bar",
-			out:    `\x2efoo-.bar`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     ".foo/.bar",
-			out:    `\x2efoo-.bar`,
-			isPath: true,
-		},
-		// escape leading dot
-		{
-			in:     ".foo/.bar",
-			out:    `\x2efoo-.bar`,
-			isPath: false,
-		},
-		// escape disallowed
-		{
-			in:     `///..\-!#??///`,
-			out:    `---..\x5c\x2d\x21\x23\x3f\x3f---`,
-			isPath: false,
-		},
-		// escape disallowed
-		{
-			in:     `///..\-!#??///`,
-			out:    `\x2e.\x5c\x2d\x21\x23\x3f\x3f`,
-			isPath: true,
-		},
-		// escape real-world example
-		{
-			in:     `user-cloudinit@/var/lib/coreos/vagrant/vagrantfile-user-data.service`,
-			out:    `user\x2dcloudinit\x40-var-lib-coreos-vagrant-vagrantfile\x2duser\x2ddata.service`,
-			isPath: false,
-		},
-	}
-
-	for i, tt := range tests {
-		var s string
-		if tt.isPath {
-			s = UnitNamePathEscape(tt.in)
-		} else {
-			s = UnitNameEscape(tt.in)
-		}
-		if s != tt.out {
-			t.Errorf("case %d: failed escaping %v isPath: %v - expected %v, got %v", i, tt.in, tt.isPath, tt.out, s)
-		}
-	}
-}
-
-func TestUnitNameUnescape(t *testing.T) {
-	tests := []struct {
-		in     string
-		out    string
-		isPath bool
-	}{
-		// turn empty string path into /
-		{
-			in:     "",
-			out:    "/",
-			isPath: true,
-		},
-		// leave empty string empty
-		{
-			in:     "",
-			out:    "",
-			isPath: false,
-		},
-		// turn ////s into
-		{
-			in:     "---------",
-			out:    "/////////",
-			isPath: true,
-		},
-		// unescape hex
-		{
-			in:     `---..\x5c\x2d\x21\x23\x3f\x3f---`,
-			out:    `///..\-!#??///`,
-			isPath: false,
-		},
-		// unescape hex
-		{
-			in:     `\x2e.\x5c\x2d\x21\x23\x3f\x3f`,
-			out:    `/..\-!#??`,
-			isPath: true,
-		},
-		// unescape hex, retain invalids
-		{
-			in:     `\x2e.\x5c\x2d\xaZ\x.o\x21\x23\x3f\x3f`,
-			out:    `/..\-\xaZ\x.o!#??`,
-			isPath: true,
-		},
-		// unescape hex, retain invalids, partial tail
-		{
-			in:     `\x2e.\x5c\x\x2d\xaZ\x.o\x21\x23\x3f\x3f\x3`,
-			out:    `/..\\x-\xaZ\x.o!#??\x3`,
-			isPath: true,
-		},
-		// unescape hex, retain invalids, partial tail
-		{
-			in:     `\x2e.\x5c\x\x2d\xaZ\x.o\x21\x23\x3f\x3f\x`,
-			out:    `/..\\x-\xaZ\x.o!#??\x`,
-			isPath: true,
-		},
-		// unescape hex, retain invalids, partial tail
-		{
-			in:     `\x2e.\x5c\x\x2d\xaZ\x.o\x21\x23\x3f\x3f\`,
-			out:    `/..\\x-\xaZ\x.o!#??\`,
-			isPath: true,
-		},
-		// unescape real-world example
-		{
-			in:     `user\x2dcloudinit\x40-var-lib-coreos-vagrant-vagrantfile\x2duser\x2ddata.service`,
-			out:    `user-cloudinit@/var/lib/coreos/vagrant/vagrantfile-user-data.service`,
-			isPath: false,
-		},
-	}
-
-	for i, tt := range tests {
-		var s string
-		if tt.isPath {
-			s = UnitNamePathUnescape(tt.in)
-		} else {
-			s = UnitNameUnescape(tt.in)
-		}
-		if s != tt.out {
-			t.Errorf("case %d: failed unescaping %v isPath: %v - expected %v, got %v", i, tt.in, tt.isPath, tt.out, s)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/option.go b/installer/vendor/github.com/coreos/go-systemd/unit/option.go
deleted file mode 100644
index e5d21e19d9..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/option.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"fmt"
-)
-
-type UnitOption struct {
-	Section string
-	Name    string
-	Value   string
-}
-
-func NewUnitOption(section, name, value string) *UnitOption {
-	return &UnitOption{Section: section, Name: name, Value: value}
-}
-
-func (uo *UnitOption) String() string {
-	return fmt.Sprintf("{Section: %q, Name: %q, Value: %q}", uo.Section, uo.Name, uo.Value)
-}
-
-func (uo *UnitOption) Match(other *UnitOption) bool {
-	return uo.Section == other.Section &&
-		uo.Name == other.Name &&
-		uo.Value == other.Value
-}
-
-func AllMatch(u1 []*UnitOption, u2 []*UnitOption) bool {
-	length := len(u1)
-	if length != len(u2) {
-		return false
-	}
-
-	for i := 0; i < length; i++ {
-		if !u1[i].Match(u2[i]) {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/option_test.go b/installer/vendor/github.com/coreos/go-systemd/unit/option_test.go
deleted file mode 100644
index 0765f03aed..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/option_test.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"testing"
-)
-
-func TestAllMatch(t *testing.T) {
-	tests := []struct {
-		u1    []*UnitOption
-		u2    []*UnitOption
-		match bool
-	}{
-		// empty lists match
-		{
-			u1:    []*UnitOption{},
-			u2:    []*UnitOption{},
-			match: true,
-		},
-
-		// simple match of a single option
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-			},
-			u2: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-			},
-			match: true,
-		},
-
-		// single option mismatched
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-			},
-			u2: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "BAR"},
-			},
-			match: false,
-		},
-
-		// multiple options match
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-			},
-			u2: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-			},
-			match: true,
-		},
-
-		// mismatch length
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-			},
-			u2: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-			},
-			match: false,
-		},
-
-		// multiple options misordered
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-			},
-			u2: []*UnitOption{
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-			},
-			match: false,
-		},
-
-		// interleaved sections mismatch
-		{
-			u1: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-				{Section: "Service", Name: "ExecStop", Value: "/bin/true"},
-			},
-			u2: []*UnitOption{
-				{Section: "Unit", Name: "Description", Value: "FOO"},
-				{Section: "Service", Name: "ExecStart", Value: "/bin/true"},
-				{Section: "Unit", Name: "BindsTo", Value: "bar.service"},
-				{Section: "Service", Name: "ExecStop", Value: "/bin/true"},
-			},
-			match: false,
-		},
-	}
-
-	for i, tt := range tests {
-		match := AllMatch(tt.u1, tt.u2)
-		if match != tt.match {
-			t.Errorf("case %d: failed comparing u1 to u2 - expected match=%t, got %t", i, tt.match, match)
-		}
-
-		match = AllMatch(tt.u2, tt.u1)
-		if match != tt.match {
-			t.Errorf("case %d: failed comparing u2 to u1 - expected match=%t, got %t", i, tt.match, match)
-		}
-	}
-}
-
-func TestMatch(t *testing.T) {
-	tests := []struct {
-		o1    *UnitOption
-		o2    *UnitOption
-		match bool
-	}{
-		// empty options match
-		{
-			o1:    &UnitOption{},
-			o2:    &UnitOption{},
-			match: true,
-		},
-
-		// all fields match
-		{
-			o1: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			o2: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			match: true,
-		},
-
-		// Section mismatch
-		{
-			o1: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			o2: &UnitOption{
-				Section: "X-Other",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			match: false,
-		},
-
-		// Name mismatch
-		{
-			o1: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			o2: &UnitOption{
-				Section: "Unit",
-				Name:    "BindsTo",
-				Value:   "FOO",
-			},
-			match: false,
-		},
-
-		// Value mismatch
-		{
-			o1: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "FOO",
-			},
-			o2: &UnitOption{
-				Section: "Unit",
-				Name:    "Description",
-				Value:   "BAR",
-			},
-			match: false,
-		},
-	}
-
-	for i, tt := range tests {
-		match := tt.o1.Match(tt.o2)
-		if match != tt.match {
-			t.Errorf("case %d: failed comparing o1 to o2 - expected match=%t, got %t", i, tt.match, match)
-		}
-
-		match = tt.o2.Match(tt.o1)
-		if match != tt.match {
-			t.Errorf("case %d: failed comparing o2 to o1 - expected match=%t, got %t", i, tt.match, match)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/serialize.go b/installer/vendor/github.com/coreos/go-systemd/unit/serialize.go
deleted file mode 100644
index e07799cad6..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/serialize.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"bytes"
-	"io"
-)
-
-// Serialize encodes all of the given UnitOption objects into a
-// unit file. When serialized the options are sorted in their
-// supplied order but grouped by section.
-func Serialize(opts []*UnitOption) io.Reader {
-	var buf bytes.Buffer
-
-	if len(opts) == 0 {
-		return &buf
-	}
-
-	// Index of sections -> ordered options
-	idx := map[string][]*UnitOption{}
-	// Separately preserve order in which sections were seen
-	sections := []string{}
-	for _, opt := range opts {
-		sec := opt.Section
-		if _, ok := idx[sec]; !ok {
-			sections = append(sections, sec)
-		}
-		idx[sec] = append(idx[sec], opt)
-	}
-
-	for i, sect := range sections {
-		writeSectionHeader(&buf, sect)
-		writeNewline(&buf)
-
-		opts := idx[sect]
-		for _, opt := range opts {
-			writeOption(&buf, opt)
-			writeNewline(&buf)
-		}
-		if i < len(sections)-1 {
-			writeNewline(&buf)
-		}
-	}
-
-	return &buf
-}
-
-func writeNewline(buf *bytes.Buffer) {
-	buf.WriteRune('\n')
-}
-
-func writeSectionHeader(buf *bytes.Buffer, section string) {
-	buf.WriteRune('[')
-	buf.WriteString(section)
-	buf.WriteRune(']')
-}
-
-func writeOption(buf *bytes.Buffer, opt *UnitOption) {
-	buf.WriteString(opt.Name)
-	buf.WriteRune('=')
-	buf.WriteString(opt.Value)
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/unit/serialize_test.go b/installer/vendor/github.com/coreos/go-systemd/unit/serialize_test.go
deleted file mode 100644
index bd492b0d43..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/unit/serialize_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package unit
-
-import (
-	"io/ioutil"
-	"testing"
-)
-
-func TestSerialize(t *testing.T) {
-	tests := []struct {
-		input  []*UnitOption
-		output string
-	}{
-		// no options results in empty file
-		{
-			[]*UnitOption{},
-			``,
-		},
-
-		// options with same section share the header
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Unit", "BindsTo", "bar.service"},
-			},
-			`[Unit]
-Description=Foo
-BindsTo=bar.service
-`,
-		},
-
-		// options with same name are not combined
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Unit", "Description", "Bar"},
-			},
-			`[Unit]
-Description=Foo
-Description=Bar
-`,
-		},
-
-		// multiple options printed under different section headers
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Service", "ExecStart", "/usr/bin/sleep infinity"},
-			},
-			`[Unit]
-Description=Foo
-
-[Service]
-ExecStart=/usr/bin/sleep infinity
-`,
-		},
-
-		// options are grouped into sections
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Service", "ExecStart", "/usr/bin/sleep infinity"},
-				&UnitOption{"Unit", "BindsTo", "bar.service"},
-			},
-			`[Unit]
-Description=Foo
-BindsTo=bar.service
-
-[Service]
-ExecStart=/usr/bin/sleep infinity
-`,
-		},
-
-		// options are ordered within groups, and sections are ordered in the order in which they were first seen
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Foo"},
-				&UnitOption{"Service", "ExecStart", "/usr/bin/sleep infinity"},
-				&UnitOption{"Unit", "BindsTo", "bar.service"},
-				&UnitOption{"X-Foo", "Bar", "baz"},
-				&UnitOption{"Service", "ExecStop", "/usr/bin/sleep 1"},
-				&UnitOption{"Unit", "Documentation", "https://foo.com"},
-			},
-			`[Unit]
-Description=Foo
-BindsTo=bar.service
-Documentation=https://foo.com
-
-[Service]
-ExecStart=/usr/bin/sleep infinity
-ExecStop=/usr/bin/sleep 1
-
-[X-Foo]
-Bar=baz
-`,
-		},
-
-		// utf8 characters are not a problem
-		{
-			[]*UnitOption{
-				&UnitOption{"©", "µ☃", "ÇôrèÕ$"},
-			},
-			`[©]
-µ☃=ÇôrèÕ$
-`,
-		},
-
-		// no verification is done on section names
-		{
-			[]*UnitOption{
-				&UnitOption{"Un\nit", "Description", "Foo"},
-			},
-			`[Un
-it]
-Description=Foo
-`,
-		},
-
-		// no verification is done on option names
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Desc\nription", "Foo"},
-			},
-			`[Unit]
-Desc
-ription=Foo
-`,
-		},
-
-		// no verification is done on option values
-		{
-			[]*UnitOption{
-				&UnitOption{"Unit", "Description", "Fo\no"},
-			},
-			`[Unit]
-Description=Fo
-o
-`,
-		},
-	}
-
-	for i, tt := range tests {
-		outReader := Serialize(tt.input)
-		outBytes, err := ioutil.ReadAll(outReader)
-		if err != nil {
-			t.Errorf("case %d: encountered error while reading output: %v", i, err)
-			continue
-		}
-
-		output := string(outBytes)
-		if tt.output != output {
-			t.Errorf("case %d: incorrect output", i)
-			t.Logf("Expected:\n%s", tt.output)
-			t.Logf("Actual:\n%s", output)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/util/util.go b/installer/vendor/github.com/coreos/go-systemd/util/util.go
deleted file mode 100644
index 7828ce6f04..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/util/util.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2015 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package util contains utility functions related to systemd that applications
-// can use to check things like whether systemd is running.  Note that some of
-// these functions attempt to manually load systemd libraries at runtime rather
-// than linking against them.
-package util
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-)
-
-var (
-	ErrNoCGO = fmt.Errorf("go-systemd built with CGO disabled")
-)
-
-// GetRunningSlice attempts to retrieve the name of the systemd slice in which
-// the current process is running.
-// This function is a wrapper around the libsystemd C library; if it cannot be
-// opened, an error is returned.
-func GetRunningSlice() (string, error) {
-	return getRunningSlice()
-}
-
-// RunningFromSystemService tries to detect whether the current process has
-// been invoked from a system service. The condition for this is whether the
-// process is _not_ a user process. User processes are those running in session
-// scopes or under per-user `systemd --user` instances.
-//
-// To avoid false positives on systems without `pam_systemd` (which is
-// responsible for creating user sessions), this function also uses a heuristic
-// to detect whether it's being invoked from a session leader process. This is
-// the case if the current process is executed directly from a service file
-// (e.g. with `ExecStart=/this/cmd`). Note that this heuristic will fail if the
-// command is instead launched in a subshell or similar so that it is not
-// session leader (e.g. `ExecStart=/bin/bash -c "/this/cmd"`)
-//
-// This function is a wrapper around the libsystemd C library; if this is
-// unable to successfully open a handle to the library for any reason (e.g. it
-// cannot be found), an error will be returned.
-func RunningFromSystemService() (bool, error) {
-	return runningFromSystemService()
-}
-
-// CurrentUnitName attempts to retrieve the name of the systemd system unit
-// from which the calling process has been invoked. It wraps the systemd
-// `sd_pid_get_unit` call, with the same caveat: for processes not part of a
-// systemd system unit, this function will return an error.
-func CurrentUnitName() (string, error) {
-	return currentUnitName()
-}
-
-// IsRunningSystemd checks whether the host was booted with systemd as its init
-// system. This functions similarly to systemd's `sd_booted(3)`: internally, it
-// checks whether /run/systemd/system/ exists and is a directory.
-// http://www.freedesktop.org/software/systemd/man/sd_booted.html
-func IsRunningSystemd() bool {
-	fi, err := os.Lstat("/run/systemd/system")
-	if err != nil {
-		return false
-	}
-	return fi.IsDir()
-}
-
-// GetMachineID returns a host's 128-bit machine ID as a string. This functions
-// similarly to systemd's `sd_id128_get_machine`: internally, it simply reads
-// the contents of /etc/machine-id
-// http://www.freedesktop.org/software/systemd/man/sd_id128_get_machine.html
-func GetMachineID() (string, error) {
-	machineID, err := ioutil.ReadFile("/etc/machine-id")
-	if err != nil {
-		return "", fmt.Errorf("failed to read /etc/machine-id: %v", err)
-	}
-	return strings.TrimSpace(string(machineID)), nil
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/util/util_cgo.go b/installer/vendor/github.com/coreos/go-systemd/util/util_cgo.go
deleted file mode 100644
index 22c0d6099d..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/util/util_cgo.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build cgo
-
-package util
-
-// #include <stdlib.h>
-// #include <sys/types.h>
-// #include <unistd.h>
-//
-// int
-// my_sd_pid_get_owner_uid(void *f, pid_t pid, uid_t *uid)
-// {
-//   int (*sd_pid_get_owner_uid)(pid_t, uid_t *);
-//
-//   sd_pid_get_owner_uid = (int (*)(pid_t, uid_t *))f;
-//   return sd_pid_get_owner_uid(pid, uid);
-// }
-//
-// int
-// my_sd_pid_get_unit(void *f, pid_t pid, char **unit)
-// {
-//   int (*sd_pid_get_unit)(pid_t, char **);
-//
-//   sd_pid_get_unit = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_unit(pid, unit);
-// }
-//
-// int
-// my_sd_pid_get_slice(void *f, pid_t pid, char **slice)
-// {
-//   int (*sd_pid_get_slice)(pid_t, char **);
-//
-//   sd_pid_get_slice = (int (*)(pid_t, char **))f;
-//   return sd_pid_get_slice(pid, slice);
-// }
-//
-// int
-// am_session_leader()
-// {
-//   return (getsid(0) == getpid());
-// }
-import "C"
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-
-	"github.com/coreos/pkg/dlopen"
-)
-
-var libsystemdNames = []string{
-	// systemd < 209
-	"libsystemd-login.so.0",
-	"libsystemd-login.so",
-
-	// systemd >= 209 merged libsystemd-login into libsystemd proper
-	"libsystemd.so.0",
-	"libsystemd.so",
-}
-
-func getRunningSlice() (slice string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_slice, err := h.GetSymbolPointer("sd_pid_get_slice")
-	if err != nil {
-		return
-	}
-
-	var s string
-	sl := C.CString(s)
-	defer C.free(unsafe.Pointer(sl))
-
-	ret := C.my_sd_pid_get_slice(sd_pid_get_slice, 0, &sl)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_slice: %v", syscall.Errno(-ret))
-		return
-	}
-
-	return C.GoString(sl), nil
-}
-
-func runningFromSystemService() (ret bool, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_owner_uid, err := h.GetSymbolPointer("sd_pid_get_owner_uid")
-	if err != nil {
-		return
-	}
-
-	var uid C.uid_t
-	errno := C.my_sd_pid_get_owner_uid(sd_pid_get_owner_uid, 0, &uid)
-	serrno := syscall.Errno(-errno)
-	// when we're running from a unit file, sd_pid_get_owner_uid returns
-	// ENOENT (systemd <220) or ENXIO (systemd >=220)
-	switch {
-	case errno >= 0:
-		ret = false
-	case serrno == syscall.ENOENT, serrno == syscall.ENXIO:
-		// Since the implementation of sessions in systemd relies on
-		// the `pam_systemd` module, using the sd_pid_get_owner_uid
-		// heuristic alone can result in false positives if that module
-		// (or PAM itself) is not present or properly configured on the
-		// system. As such, we also check if we're the session leader,
-		// which should be the case if we're invoked from a unit file,
-		// but not if e.g. we're invoked from the command line from a
-		// user's login session
-		ret = C.am_session_leader() == 1
-	default:
-		err = fmt.Errorf("error calling sd_pid_get_owner_uid: %v", syscall.Errno(-errno))
-	}
-	return
-}
-
-func currentUnitName() (unit string, err error) {
-	var h *dlopen.LibHandle
-	h, err = dlopen.GetHandle(libsystemdNames)
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err1 := h.Close(); err1 != nil {
-			err = err1
-		}
-	}()
-
-	sd_pid_get_unit, err := h.GetSymbolPointer("sd_pid_get_unit")
-	if err != nil {
-		return
-	}
-
-	var s string
-	u := C.CString(s)
-	defer C.free(unsafe.Pointer(u))
-
-	ret := C.my_sd_pid_get_unit(sd_pid_get_unit, 0, &u)
-	if ret < 0 {
-		err = fmt.Errorf("error calling sd_pid_get_unit: %v", syscall.Errno(-ret))
-		return
-	}
-
-	unit = C.GoString(u)
-	return
-}
diff --git a/installer/vendor/github.com/coreos/go-systemd/util/util_stub.go b/installer/vendor/github.com/coreos/go-systemd/util/util_stub.go
deleted file mode 100644
index 477589e122..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/util/util_stub.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !cgo
-
-package util
-
-func getRunningSlice() (string, error) { return "", ErrNoCGO }
-
-func runningFromSystemService() (bool, error) { return false, ErrNoCGO }
-
-func currentUnitName() (string, error) { return "", ErrNoCGO }
diff --git a/installer/vendor/github.com/coreos/go-systemd/util/util_test.go b/installer/vendor/github.com/coreos/go-systemd/util/util_test.go
deleted file mode 100644
index 0d4804c963..0000000000
--- a/installer/vendor/github.com/coreos/go-systemd/util/util_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2016 CoreOS, Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"testing"
-)
-
-func testIsRunningSystemd(t *testing.T) {
-	if !IsRunningSystemd() {
-		t.Skip("Not running on a systemd host")
-	}
-}
-
-func TestRunningFromSystemService(t *testing.T) {
-	testIsRunningSystemd(t)
-	t.Parallel()
-
-	// tests shouldn't be running as a service
-	s, err := RunningFromSystemService()
-	if err != nil {
-		t.Error(err.Error())
-	} else if s {
-		t.Errorf("tests aren't expected to run as a service")
-	}
-}
-
-func TestCurrentUnitName(t *testing.T) {
-	testIsRunningSystemd(t)
-
-	s, err := CurrentUnitName()
-	if err != nil {
-		t.Error(err.Error())
-	}
-	if s == "" {
-		t.Error("CurrentUnitName returned a empty string")
-	}
-}
-
-func TestGetMachineID(t *testing.T) {
-	testIsRunningSystemd(t)
-
-	id, err := GetMachineID()
-	if err != nil {
-		t.Error(err.Error())
-	}
-	if id == "" {
-		t.Error("GetMachineID returned a empty string")
-	}
-}
-
-func TestGetRunningSlice(t *testing.T) {
-	testIsRunningSystemd(t)
-
-	s, err := getRunningSlice()
-	if err != nil {
-		t.Error(err.Error())
-	}
-	if s == "" {
-		t.Error("getRunningSlice returned a empty string")
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/.gitignore b/installer/vendor/github.com/davecgh/go-spew/.gitignore
deleted file mode 100644
index 00268614f0..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/installer/vendor/github.com/davecgh/go-spew/.travis.yml b/installer/vendor/github.com/davecgh/go-spew/.travis.yml
deleted file mode 100644
index 984e0736e7..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-go:
-    - 1.5.4
-    - 1.6.3
-    - 1.7
-install:
-    - go get -v golang.org/x/tools/cmd/cover
-script:
-    - go test -v -tags=safe ./spew
-    - go test -v -tags=testcgo ./spew -covermode=count -coverprofile=profile.cov
-after_success:
-    - go get -v github.com/mattn/goveralls
-    - export PATH=$PATH:$HOME/gopath/bin
-    - goveralls -coverprofile=profile.cov -service=travis-ci
diff --git a/installer/vendor/github.com/davecgh/go-spew/README.md b/installer/vendor/github.com/davecgh/go-spew/README.md
deleted file mode 100644
index 262430449b..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/README.md
+++ /dev/null
@@ -1,205 +0,0 @@
-go-spew
-=======
-
-[![Build Status](https://img.shields.io/travis/davecgh/go-spew.svg)]
-(https://travis-ci.org/davecgh/go-spew) [![ISC License]
-(http://img.shields.io/badge/license-ISC-blue.svg)](http://copyfree.org) [![Coverage Status]
-(https://img.shields.io/coveralls/davecgh/go-spew.svg)]
-(https://coveralls.io/r/davecgh/go-spew?branch=master)
-
-
-Go-spew implements a deep pretty printer for Go data structures to aid in
-debugging.  A comprehensive suite of tests with 100% test coverage is provided
-to ensure proper functionality.  See `test_coverage.txt` for the gocov coverage
-report.  Go-spew is licensed under the liberal ISC license, so it may be used in
-open source or commercial projects.
-
-If you're interested in reading about how this package came to life and some
-of the challenges involved in providing a deep pretty printer, there is a blog
-post about it
-[here](https://web.archive.org/web/20160304013555/https://blog.cyphertite.com/go-spew-a-journey-into-dumping-go-data-structures/).
-
-## Documentation
-
-[![GoDoc](https://img.shields.io/badge/godoc-reference-blue.svg)]
-(http://godoc.org/github.com/davecgh/go-spew/spew)
-
-Full `go doc` style documentation for the project can be viewed online without
-installing this package by using the excellent GoDoc site here:
-http://godoc.org/github.com/davecgh/go-spew/spew
-
-You can also view the documentation locally once the package is installed with
-the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to
-http://localhost:6060/pkg/github.com/davecgh/go-spew/spew
-
-## Installation
-
-```bash
-$ go get -u github.com/davecgh/go-spew/spew
-```
-
-## Quick Start
-
-Add this import line to the file you're working in:
-
-```Go
-import "github.com/davecgh/go-spew/spew"
-```
-
-To dump a variable with full newlines, indentation, type, and pointer
-information use Dump, Fdump, or Sdump:
-
-```Go
-spew.Dump(myVar1, myVar2, ...)
-spew.Fdump(someWriter, myVar1, myVar2, ...)
-str := spew.Sdump(myVar1, myVar2, ...)
-```
-
-Alternatively, if you would prefer to use format strings with a compacted inline
-printing style, use the convenience wrappers Printf, Fprintf, etc with %v (most
-compact), %+v (adds pointer addresses), %#v (adds types), or %#+v (adds types
-and pointer addresses): 
-
-```Go
-spew.Printf("myVar1: %v -- myVar2: %+v", myVar1, myVar2)
-spew.Printf("myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
-spew.Fprintf(someWriter, "myVar1: %v -- myVar2: %+v", myVar1, myVar2)
-spew.Fprintf(someWriter, "myVar3: %#v -- myVar4: %#+v", myVar3, myVar4)
-```
-
-## Debugging a Web Application Example
-
-Here is an example of how you can use `spew.Sdump()` to help debug a web application. Please be sure to wrap your output using the `html.EscapeString()` function for safety reasons. You should also only use this debugging technique in a development environment, never in production.
-
-```Go
-package main
-
-import (
-    "fmt"
-    "html"
-    "net/http"
-
-    "github.com/davecgh/go-spew/spew"
-)
-
-func handler(w http.ResponseWriter, r *http.Request) {
-    w.Header().Set("Content-Type", "text/html")
-    fmt.Fprintf(w, "Hi there, %s!", r.URL.Path[1:])
-    fmt.Fprintf(w, "<!--\n" + html.EscapeString(spew.Sdump(w)) + "\n-->")
-}
-
-func main() {
-    http.HandleFunc("/", handler)
-    http.ListenAndServe(":8080", nil)
-}
-```
-
-## Sample Dump Output
-
-```
-(main.Foo) {
- unexportedField: (*main.Bar)(0xf84002e210)({
-  flag: (main.Flag) flagTwo,
-  data: (uintptr) <nil>
- }),
- ExportedField: (map[interface {}]interface {}) {
-  (string) "one": (bool) true
- }
-}
-([]uint8) {
- 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20  |............... |
- 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30  |!"#$%&'()*+,-./0|
- 00000020  31 32                                             |12|
-}
-```
-
-## Sample Formatter Output
-
-Double pointer to a uint8:
-```
-	  %v: <**>5
-	 %+v: <**>(0xf8400420d0->0xf8400420c8)5
-	 %#v: (**uint8)5
-	%#+v: (**uint8)(0xf8400420d0->0xf8400420c8)5
-```
-
-Pointer to circular struct with a uint8 field and a pointer to itself:
-```
-	  %v: <*>{1 <*><shown>}
-	 %+v: <*>(0xf84003e260){ui8:1 c:<*>(0xf84003e260)<shown>}
-	 %#v: (*main.circular){ui8:(uint8)1 c:(*main.circular)<shown>}
-	%#+v: (*main.circular)(0xf84003e260){ui8:(uint8)1 c:(*main.circular)(0xf84003e260)<shown>}
-```
-
-## Configuration Options
-
-Configuration of spew is handled by fields in the ConfigState type. For
-convenience, all of the top-level functions use a global state available via the
-spew.Config global.
-
-It is also possible to create a ConfigState instance that provides methods
-equivalent to the top-level functions. This allows concurrent configuration
-options. See the ConfigState documentation for more details.
-
-```
-* Indent
-	String to use for each indentation level for Dump functions.
-	It is a single space by default.  A popular alternative is "\t".
-
-* MaxDepth
-	Maximum number of levels to descend into nested data structures.
-	There is no limit by default.
-
-* DisableMethods
-	Disables invocation of error and Stringer interface methods.
-	Method invocation is enabled by default.
-
-* DisablePointerMethods
-	Disables invocation of error and Stringer interface methods on types
-	which only accept pointer receivers from non-pointer variables.  This option
-	relies on access to the unsafe package, so it will not have any effect when
-	running in environments without access to the unsafe package such as Google
-	App Engine or with the "safe" build tag specified.
-	Pointer method invocation is enabled by default.
-
-* DisablePointerAddresses
-	DisablePointerAddresses specifies whether to disable the printing of
-	pointer addresses. This is useful when diffing data structures in tests.
-
-* DisableCapacities
-	DisableCapacities specifies whether to disable the printing of capacities
-	for arrays, slices, maps and channels. This is useful when diffing data
-	structures in tests.
-
-* ContinueOnMethod
-	Enables recursion into types after invoking error and Stringer interface
-	methods. Recursion after method invocation is disabled by default.
-
-* SortKeys
-	Specifies map keys should be sorted before being printed. Use
-	this to have a more deterministic, diffable output.  Note that
-	only native types (bool, int, uint, floats, uintptr and string)
-	and types which implement error or Stringer interfaces are supported,
-	with other types sorted according to the reflect.Value.String() output
-	which guarantees display stability.  Natural map order is used by
-	default.
-
-* SpewKeys
-	SpewKeys specifies that, as a last resort attempt, map keys should be
-	spewed to strings and sorted by those strings.  This is only considered
-	if SortKeys is true.
-
-```
-
-## Unsafe Package Dependency
-
-This package relies on the unsafe package to perform some of the more advanced
-features, however it also supports a "limited" mode which allows it to work in
-environments where the unsafe package is not available.  By default, it will
-operate in this mode on Google App Engine and when compiled with GopherJS.  The
-"safe" build tag may also be specified to force the package to build without
-using the unsafe package.
-
-## License
-
-Go-spew is licensed under the [copyfree](http://copyfree.org) ISC License.
diff --git a/installer/vendor/github.com/davecgh/go-spew/cov_report.sh b/installer/vendor/github.com/davecgh/go-spew/cov_report.sh
deleted file mode 100644
index 9579497e41..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/cov_report.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-
-# This script uses gocov to generate a test coverage report.
-# The gocov tool my be obtained with the following command:
-#   go get github.com/axw/gocov/gocov
-#
-# It will be installed to $GOPATH/bin, so ensure that location is in your $PATH.
-
-# Check for gocov.
-if ! type gocov >/dev/null 2>&1; then
-	echo >&2 "This script requires the gocov tool."
-	echo >&2 "You may obtain it with the following command:"
-	echo >&2 "go get github.com/axw/gocov/gocov"
-	exit 1
-fi
-
-# Only run the cgo tests if gcc is installed.
-if type gcc >/dev/null 2>&1; then
-	(cd spew && gocov test -tags testcgo | gocov report)
-else
-	(cd spew && gocov test | gocov report)
-fi
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/common_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/common_test.go
deleted file mode 100644
index 0f5ce47dca..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/common_test.go
+++ /dev/null
@@ -1,298 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// custom type to test Stinger interface on non-pointer receiver.
-type stringer string
-
-// String implements the Stringer interface for testing invocation of custom
-// stringers on types with non-pointer receivers.
-func (s stringer) String() string {
-	return "stringer " + string(s)
-}
-
-// custom type to test Stinger interface on pointer receiver.
-type pstringer string
-
-// String implements the Stringer interface for testing invocation of custom
-// stringers on types with only pointer receivers.
-func (s *pstringer) String() string {
-	return "stringer " + string(*s)
-}
-
-// xref1 and xref2 are cross referencing structs for testing circular reference
-// detection.
-type xref1 struct {
-	ps2 *xref2
-}
-type xref2 struct {
-	ps1 *xref1
-}
-
-// indirCir1, indirCir2, and indirCir3 are used to generate an indirect circular
-// reference for testing detection.
-type indirCir1 struct {
-	ps2 *indirCir2
-}
-type indirCir2 struct {
-	ps3 *indirCir3
-}
-type indirCir3 struct {
-	ps1 *indirCir1
-}
-
-// embed is used to test embedded structures.
-type embed struct {
-	a string
-}
-
-// embedwrap is used to test embedded structures.
-type embedwrap struct {
-	*embed
-	e *embed
-}
-
-// panicer is used to intentionally cause a panic for testing spew properly
-// handles them
-type panicer int
-
-func (p panicer) String() string {
-	panic("test panic")
-}
-
-// customError is used to test custom error interface invocation.
-type customError int
-
-func (e customError) Error() string {
-	return fmt.Sprintf("error: %d", int(e))
-}
-
-// stringizeWants converts a slice of wanted test output into a format suitable
-// for a test error message.
-func stringizeWants(wants []string) string {
-	s := ""
-	for i, want := range wants {
-		if i > 0 {
-			s += fmt.Sprintf("want%d: %s", i+1, want)
-		} else {
-			s += "want: " + want
-		}
-	}
-	return s
-}
-
-// testFailed returns whether or not a test failed by checking if the result
-// of the test is in the slice of wanted strings.
-func testFailed(result string, wants []string) bool {
-	for _, want := range wants {
-		if result == want {
-			return false
-		}
-	}
-	return true
-}
-
-type sortableStruct struct {
-	x int
-}
-
-func (ss sortableStruct) String() string {
-	return fmt.Sprintf("ss.%d", ss.x)
-}
-
-type unsortableStruct struct {
-	x int
-}
-
-type sortTestCase struct {
-	input    []reflect.Value
-	expected []reflect.Value
-}
-
-func helpTestSortValues(tests []sortTestCase, cs *spew.ConfigState, t *testing.T) {
-	getInterfaces := func(values []reflect.Value) []interface{} {
-		interfaces := []interface{}{}
-		for _, v := range values {
-			interfaces = append(interfaces, v.Interface())
-		}
-		return interfaces
-	}
-
-	for _, test := range tests {
-		spew.SortValues(test.input, cs)
-		// reflect.DeepEqual cannot really make sense of reflect.Value,
-		// probably because of all the pointer tricks. For instance,
-		// v(2.0) != v(2.0) on a 32-bits system. Turn them into interface{}
-		// instead.
-		input := getInterfaces(test.input)
-		expected := getInterfaces(test.expected)
-		if !reflect.DeepEqual(input, expected) {
-			t.Errorf("Sort mismatch:\n %v != %v", input, expected)
-		}
-	}
-}
-
-// TestSortValues ensures the sort functionality for relect.Value based sorting
-// works as intended.
-func TestSortValues(t *testing.T) {
-	v := reflect.ValueOf
-
-	a := v("a")
-	b := v("b")
-	c := v("c")
-	embedA := v(embed{"a"})
-	embedB := v(embed{"b"})
-	embedC := v(embed{"c"})
-	tests := []sortTestCase{
-		// No values.
-		{
-			[]reflect.Value{},
-			[]reflect.Value{},
-		},
-		// Bools.
-		{
-			[]reflect.Value{v(false), v(true), v(false)},
-			[]reflect.Value{v(false), v(false), v(true)},
-		},
-		// Ints.
-		{
-			[]reflect.Value{v(2), v(1), v(3)},
-			[]reflect.Value{v(1), v(2), v(3)},
-		},
-		// Uints.
-		{
-			[]reflect.Value{v(uint8(2)), v(uint8(1)), v(uint8(3))},
-			[]reflect.Value{v(uint8(1)), v(uint8(2)), v(uint8(3))},
-		},
-		// Floats.
-		{
-			[]reflect.Value{v(2.0), v(1.0), v(3.0)},
-			[]reflect.Value{v(1.0), v(2.0), v(3.0)},
-		},
-		// Strings.
-		{
-			[]reflect.Value{b, a, c},
-			[]reflect.Value{a, b, c},
-		},
-		// Array
-		{
-			[]reflect.Value{v([3]int{3, 2, 1}), v([3]int{1, 3, 2}), v([3]int{1, 2, 3})},
-			[]reflect.Value{v([3]int{1, 2, 3}), v([3]int{1, 3, 2}), v([3]int{3, 2, 1})},
-		},
-		// Uintptrs.
-		{
-			[]reflect.Value{v(uintptr(2)), v(uintptr(1)), v(uintptr(3))},
-			[]reflect.Value{v(uintptr(1)), v(uintptr(2)), v(uintptr(3))},
-		},
-		// SortableStructs.
-		{
-			// Note: not sorted - DisableMethods is set.
-			[]reflect.Value{v(sortableStruct{2}), v(sortableStruct{1}), v(sortableStruct{3})},
-			[]reflect.Value{v(sortableStruct{2}), v(sortableStruct{1}), v(sortableStruct{3})},
-		},
-		// UnsortableStructs.
-		{
-			// Note: not sorted - SpewKeys is false.
-			[]reflect.Value{v(unsortableStruct{2}), v(unsortableStruct{1}), v(unsortableStruct{3})},
-			[]reflect.Value{v(unsortableStruct{2}), v(unsortableStruct{1}), v(unsortableStruct{3})},
-		},
-		// Invalid.
-		{
-			[]reflect.Value{embedB, embedA, embedC},
-			[]reflect.Value{embedB, embedA, embedC},
-		},
-	}
-	cs := spew.ConfigState{DisableMethods: true, SpewKeys: false}
-	helpTestSortValues(tests, &cs, t)
-}
-
-// TestSortValuesWithMethods ensures the sort functionality for relect.Value
-// based sorting works as intended when using string methods.
-func TestSortValuesWithMethods(t *testing.T) {
-	v := reflect.ValueOf
-
-	a := v("a")
-	b := v("b")
-	c := v("c")
-	tests := []sortTestCase{
-		// Ints.
-		{
-			[]reflect.Value{v(2), v(1), v(3)},
-			[]reflect.Value{v(1), v(2), v(3)},
-		},
-		// Strings.
-		{
-			[]reflect.Value{b, a, c},
-			[]reflect.Value{a, b, c},
-		},
-		// SortableStructs.
-		{
-			[]reflect.Value{v(sortableStruct{2}), v(sortableStruct{1}), v(sortableStruct{3})},
-			[]reflect.Value{v(sortableStruct{1}), v(sortableStruct{2}), v(sortableStruct{3})},
-		},
-		// UnsortableStructs.
-		{
-			// Note: not sorted - SpewKeys is false.
-			[]reflect.Value{v(unsortableStruct{2}), v(unsortableStruct{1}), v(unsortableStruct{3})},
-			[]reflect.Value{v(unsortableStruct{2}), v(unsortableStruct{1}), v(unsortableStruct{3})},
-		},
-	}
-	cs := spew.ConfigState{DisableMethods: false, SpewKeys: false}
-	helpTestSortValues(tests, &cs, t)
-}
-
-// TestSortValuesWithSpew ensures the sort functionality for relect.Value
-// based sorting works as intended when using spew to stringify keys.
-func TestSortValuesWithSpew(t *testing.T) {
-	v := reflect.ValueOf
-
-	a := v("a")
-	b := v("b")
-	c := v("c")
-	tests := []sortTestCase{
-		// Ints.
-		{
-			[]reflect.Value{v(2), v(1), v(3)},
-			[]reflect.Value{v(1), v(2), v(3)},
-		},
-		// Strings.
-		{
-			[]reflect.Value{b, a, c},
-			[]reflect.Value{a, b, c},
-		},
-		// SortableStructs.
-		{
-			[]reflect.Value{v(sortableStruct{2}), v(sortableStruct{1}), v(sortableStruct{3})},
-			[]reflect.Value{v(sortableStruct{1}), v(sortableStruct{2}), v(sortableStruct{3})},
-		},
-		// UnsortableStructs.
-		{
-			[]reflect.Value{v(unsortableStruct{2}), v(unsortableStruct{1}), v(unsortableStruct{3})},
-			[]reflect.Value{v(unsortableStruct{1}), v(unsortableStruct{2}), v(unsortableStruct{3})},
-		},
-	}
-	cs := spew.ConfigState{DisableMethods: true, SpewKeys: true}
-	helpTestSortValues(tests, &cs, t)
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/dump_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/dump_test.go
deleted file mode 100644
index 5aad9c7af0..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/dump_test.go
+++ /dev/null
@@ -1,1042 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-Test Summary:
-NOTE: For each test, a nil pointer, a single pointer and double pointer to the
-base test element are also tested to ensure proper indirection across all types.
-
-- Max int8, int16, int32, int64, int
-- Max uint8, uint16, uint32, uint64, uint
-- Boolean true and false
-- Standard complex64 and complex128
-- Array containing standard ints
-- Array containing type with custom formatter on pointer receiver only
-- Array containing interfaces
-- Array containing bytes
-- Slice containing standard float32 values
-- Slice containing type with custom formatter on pointer receiver only
-- Slice containing interfaces
-- Slice containing bytes
-- Nil slice
-- Standard string
-- Nil interface
-- Sub-interface
-- Map with string keys and int vals
-- Map with custom formatter type on pointer receiver only keys and vals
-- Map with interface keys and values
-- Map with nil interface value
-- Struct with primitives
-- Struct that contains another struct
-- Struct that contains custom type with Stringer pointer interface via both
-  exported and unexported fields
-- Struct that contains embedded struct and field to same struct
-- Uintptr to 0 (null pointer)
-- Uintptr address of real variable
-- Unsafe.Pointer to 0 (null pointer)
-- Unsafe.Pointer to address of real variable
-- Nil channel
-- Standard int channel
-- Function with no params and no returns
-- Function with param and no returns
-- Function with multiple params and multiple returns
-- Struct that is circular through self referencing
-- Structs that are circular through cross referencing
-- Structs that are indirectly circular
-- Type that panics in its Stringer interface
-*/
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-	"unsafe"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// dumpTest is used to describe a test to be performed against the Dump method.
-type dumpTest struct {
-	in    interface{}
-	wants []string
-}
-
-// dumpTests houses all of the tests to be performed against the Dump method.
-var dumpTests = make([]dumpTest, 0)
-
-// addDumpTest is a helper method to append the passed input and desired result
-// to dumpTests
-func addDumpTest(in interface{}, wants ...string) {
-	test := dumpTest{in, wants}
-	dumpTests = append(dumpTests, test)
-}
-
-func addIntDumpTests() {
-	// Max int8.
-	v := int8(127)
-	nv := (*int8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int8"
-	vs := "127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Max int16.
-	v2 := int16(32767)
-	nv2 := (*int16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "int16"
-	v2s := "32767"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Max int32.
-	v3 := int32(2147483647)
-	nv3 := (*int32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "int32"
-	v3s := "2147483647"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Max int64.
-	v4 := int64(9223372036854775807)
-	nv4 := (*int64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "int64"
-	v4s := "9223372036854775807"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Max int.
-	v5 := int(2147483647)
-	nv5 := (*int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "int"
-	v5s := "2147483647"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addUintDumpTests() {
-	// Max uint8.
-	v := uint8(255)
-	nv := (*uint8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uint8"
-	vs := "255"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Max uint16.
-	v2 := uint16(65535)
-	nv2 := (*uint16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Max uint32.
-	v3 := uint32(4294967295)
-	nv3 := (*uint32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "uint32"
-	v3s := "4294967295"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Max uint64.
-	v4 := uint64(18446744073709551615)
-	nv4 := (*uint64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "uint64"
-	v4s := "18446744073709551615"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Max uint.
-	v5 := uint(4294967295)
-	nv5 := (*uint)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "uint"
-	v5s := "4294967295"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addBoolDumpTests() {
-	// Boolean true.
-	v := bool(true)
-	nv := (*bool)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "bool"
-	vs := "true"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Boolean false.
-	v2 := bool(false)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "bool"
-	v2s := "false"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addFloatDumpTests() {
-	// Standard float32.
-	v := float32(3.1415)
-	nv := (*float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "3.1415"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Standard float64.
-	v2 := float64(3.1415926)
-	nv2 := (*float64)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "float64"
-	v2s := "3.1415926"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addComplexDumpTests() {
-	// Standard complex64.
-	v := complex(float32(6), -2)
-	nv := (*complex64)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "complex64"
-	vs := "(6-2i)"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Standard complex128.
-	v2 := complex(float64(-6), 2)
-	nv2 := (*complex128)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "complex128"
-	v2s := "(-6+2i)"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addArrayDumpTests() {
-	// Array containing standard ints.
-	v := [3]int{1, 2, 3}
-	vLen := fmt.Sprintf("%d", len(v))
-	vCap := fmt.Sprintf("%d", cap(v))
-	nv := (*[3]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int"
-	vs := "(len=" + vLen + " cap=" + vCap + ") {\n (" + vt + ") 1,\n (" +
-		vt + ") 2,\n (" + vt + ") 3\n}"
-	addDumpTest(v, "([3]"+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*[3]"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**[3]"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*[3]"+vt+")(<nil>)\n")
-
-	// Array containing type with custom formatter on pointer receiver only.
-	v2i0 := pstringer("1")
-	v2i1 := pstringer("2")
-	v2i2 := pstringer("3")
-	v2 := [3]pstringer{v2i0, v2i1, v2i2}
-	v2i0Len := fmt.Sprintf("%d", len(v2i0))
-	v2i1Len := fmt.Sprintf("%d", len(v2i1))
-	v2i2Len := fmt.Sprintf("%d", len(v2i2))
-	v2Len := fmt.Sprintf("%d", len(v2))
-	v2Cap := fmt.Sprintf("%d", cap(v2))
-	nv2 := (*[3]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.pstringer"
-	v2sp := "(len=" + v2Len + " cap=" + v2Cap + ") {\n (" + v2t +
-		") (len=" + v2i0Len + ") stringer 1,\n (" + v2t +
-		") (len=" + v2i1Len + ") stringer 2,\n (" + v2t +
-		") (len=" + v2i2Len + ") " + "stringer 3\n}"
-	v2s := v2sp
-	if spew.UnsafeDisabled {
-		v2s = "(len=" + v2Len + " cap=" + v2Cap + ") {\n (" + v2t +
-			") (len=" + v2i0Len + ") \"1\",\n (" + v2t + ") (len=" +
-			v2i1Len + ") \"2\",\n (" + v2t + ") (len=" + v2i2Len +
-			") " + "\"3\"\n}"
-	}
-	addDumpTest(v2, "([3]"+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*[3]"+v2t+")("+v2Addr+")("+v2sp+")\n")
-	addDumpTest(&pv2, "(**[3]"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2sp+")\n")
-	addDumpTest(nv2, "(*[3]"+v2t+")(<nil>)\n")
-
-	// Array containing interfaces.
-	v3i0 := "one"
-	v3 := [3]interface{}{v3i0, int(2), uint(3)}
-	v3i0Len := fmt.Sprintf("%d", len(v3i0))
-	v3Len := fmt.Sprintf("%d", len(v3))
-	v3Cap := fmt.Sprintf("%d", cap(v3))
-	nv3 := (*[3]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[3]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3s := "(len=" + v3Len + " cap=" + v3Cap + ") {\n (" + v3t2 + ") " +
-		"(len=" + v3i0Len + ") \"one\",\n (" + v3t3 + ") 2,\n (" +
-		v3t4 + ") 3\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Array containing bytes.
-	v4 := [34]byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-	v4Len := fmt.Sprintf("%d", len(v4))
-	v4Cap := fmt.Sprintf("%d", cap(v4))
-	nv4 := (*[34]byte)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[34]uint8"
-	v4s := "(len=" + v4Len + " cap=" + v4Cap + ") " +
-		"{\n 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20" +
-		"  |............... |\n" +
-		" 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30" +
-		"  |!\"#$%&'()*+,-./0|\n" +
-		" 00000020  31 32                                           " +
-		"  |12|\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-}
-
-func addSliceDumpTests() {
-	// Slice containing standard float32 values.
-	v := []float32{3.14, 6.28, 12.56}
-	vLen := fmt.Sprintf("%d", len(v))
-	vCap := fmt.Sprintf("%d", cap(v))
-	nv := (*[]float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "(len=" + vLen + " cap=" + vCap + ") {\n (" + vt + ") 3.14,\n (" +
-		vt + ") 6.28,\n (" + vt + ") 12.56\n}"
-	addDumpTest(v, "([]"+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*[]"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**[]"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*[]"+vt+")(<nil>)\n")
-
-	// Slice containing type with custom formatter on pointer receiver only.
-	v2i0 := pstringer("1")
-	v2i1 := pstringer("2")
-	v2i2 := pstringer("3")
-	v2 := []pstringer{v2i0, v2i1, v2i2}
-	v2i0Len := fmt.Sprintf("%d", len(v2i0))
-	v2i1Len := fmt.Sprintf("%d", len(v2i1))
-	v2i2Len := fmt.Sprintf("%d", len(v2i2))
-	v2Len := fmt.Sprintf("%d", len(v2))
-	v2Cap := fmt.Sprintf("%d", cap(v2))
-	nv2 := (*[]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.pstringer"
-	v2s := "(len=" + v2Len + " cap=" + v2Cap + ") {\n (" + v2t + ") (len=" +
-		v2i0Len + ") stringer 1,\n (" + v2t + ") (len=" + v2i1Len +
-		") stringer 2,\n (" + v2t + ") (len=" + v2i2Len + ") " +
-		"stringer 3\n}"
-	addDumpTest(v2, "([]"+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*[]"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**[]"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*[]"+v2t+")(<nil>)\n")
-
-	// Slice containing interfaces.
-	v3i0 := "one"
-	v3 := []interface{}{v3i0, int(2), uint(3), nil}
-	v3i0Len := fmt.Sprintf("%d", len(v3i0))
-	v3Len := fmt.Sprintf("%d", len(v3))
-	v3Cap := fmt.Sprintf("%d", cap(v3))
-	nv3 := (*[]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3t5 := "interface {}"
-	v3s := "(len=" + v3Len + " cap=" + v3Cap + ") {\n (" + v3t2 + ") " +
-		"(len=" + v3i0Len + ") \"one\",\n (" + v3t3 + ") 2,\n (" +
-		v3t4 + ") 3,\n (" + v3t5 + ") <nil>\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Slice containing bytes.
-	v4 := []byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-	v4Len := fmt.Sprintf("%d", len(v4))
-	v4Cap := fmt.Sprintf("%d", cap(v4))
-	nv4 := (*[]byte)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[]uint8"
-	v4s := "(len=" + v4Len + " cap=" + v4Cap + ") " +
-		"{\n 00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20" +
-		"  |............... |\n" +
-		" 00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30" +
-		"  |!\"#$%&'()*+,-./0|\n" +
-		" 00000020  31 32                                           " +
-		"  |12|\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-
-	// Nil slice.
-	v5 := []int(nil)
-	nv5 := (*[]int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "[]int"
-	v5s := "<nil>"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-	addDumpTest(pv5, "(*"+v5t+")("+v5Addr+")("+v5s+")\n")
-	addDumpTest(&pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")("+v5s+")\n")
-	addDumpTest(nv5, "(*"+v5t+")(<nil>)\n")
-}
-
-func addStringDumpTests() {
-	// Standard string.
-	v := "test"
-	vLen := fmt.Sprintf("%d", len(v))
-	nv := (*string)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "string"
-	vs := "(len=" + vLen + ") \"test\""
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addInterfaceDumpTests() {
-	// Nil interface.
-	var v interface{}
-	nv := (*interface{})(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "interface {}"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Sub-interface.
-	v2 := interface{}(uint16(65535))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addMapDumpTests() {
-	// Map with string keys and int vals.
-	k := "one"
-	kk := "two"
-	m := map[string]int{k: 1, kk: 2}
-	klen := fmt.Sprintf("%d", len(k)) // not kLen to shut golint up
-	kkLen := fmt.Sprintf("%d", len(kk))
-	mLen := fmt.Sprintf("%d", len(m))
-	nilMap := map[string]int(nil)
-	nm := (*map[string]int)(nil)
-	pm := &m
-	mAddr := fmt.Sprintf("%p", pm)
-	pmAddr := fmt.Sprintf("%p", &pm)
-	mt := "map[string]int"
-	mt1 := "string"
-	mt2 := "int"
-	ms := "(len=" + mLen + ") {\n (" + mt1 + ") (len=" + klen + ") " +
-		"\"one\": (" + mt2 + ") 1,\n (" + mt1 + ") (len=" + kkLen +
-		") \"two\": (" + mt2 + ") 2\n}"
-	ms2 := "(len=" + mLen + ") {\n (" + mt1 + ") (len=" + kkLen + ") " +
-		"\"two\": (" + mt2 + ") 2,\n (" + mt1 + ") (len=" + klen +
-		") \"one\": (" + mt2 + ") 1\n}"
-	addDumpTest(m, "("+mt+") "+ms+"\n", "("+mt+") "+ms2+"\n")
-	addDumpTest(pm, "(*"+mt+")("+mAddr+")("+ms+")\n",
-		"(*"+mt+")("+mAddr+")("+ms2+")\n")
-	addDumpTest(&pm, "(**"+mt+")("+pmAddr+"->"+mAddr+")("+ms+")\n",
-		"(**"+mt+")("+pmAddr+"->"+mAddr+")("+ms2+")\n")
-	addDumpTest(nm, "(*"+mt+")(<nil>)\n")
-	addDumpTest(nilMap, "("+mt+") <nil>\n")
-
-	// Map with custom formatter type on pointer receiver only keys and vals.
-	k2 := pstringer("one")
-	v2 := pstringer("1")
-	m2 := map[pstringer]pstringer{k2: v2}
-	k2Len := fmt.Sprintf("%d", len(k2))
-	v2Len := fmt.Sprintf("%d", len(v2))
-	m2Len := fmt.Sprintf("%d", len(m2))
-	nilMap2 := map[pstringer]pstringer(nil)
-	nm2 := (*map[pstringer]pstringer)(nil)
-	pm2 := &m2
-	m2Addr := fmt.Sprintf("%p", pm2)
-	pm2Addr := fmt.Sprintf("%p", &pm2)
-	m2t := "map[spew_test.pstringer]spew_test.pstringer"
-	m2t1 := "spew_test.pstringer"
-	m2t2 := "spew_test.pstringer"
-	m2s := "(len=" + m2Len + ") {\n (" + m2t1 + ") (len=" + k2Len + ") " +
-		"stringer one: (" + m2t2 + ") (len=" + v2Len + ") stringer 1\n}"
-	if spew.UnsafeDisabled {
-		m2s = "(len=" + m2Len + ") {\n (" + m2t1 + ") (len=" + k2Len +
-			") " + "\"one\": (" + m2t2 + ") (len=" + v2Len +
-			") \"1\"\n}"
-	}
-	addDumpTest(m2, "("+m2t+") "+m2s+"\n")
-	addDumpTest(pm2, "(*"+m2t+")("+m2Addr+")("+m2s+")\n")
-	addDumpTest(&pm2, "(**"+m2t+")("+pm2Addr+"->"+m2Addr+")("+m2s+")\n")
-	addDumpTest(nm2, "(*"+m2t+")(<nil>)\n")
-	addDumpTest(nilMap2, "("+m2t+") <nil>\n")
-
-	// Map with interface keys and values.
-	k3 := "one"
-	k3Len := fmt.Sprintf("%d", len(k3))
-	m3 := map[interface{}]interface{}{k3: 1}
-	m3Len := fmt.Sprintf("%d", len(m3))
-	nilMap3 := map[interface{}]interface{}(nil)
-	nm3 := (*map[interface{}]interface{})(nil)
-	pm3 := &m3
-	m3Addr := fmt.Sprintf("%p", pm3)
-	pm3Addr := fmt.Sprintf("%p", &pm3)
-	m3t := "map[interface {}]interface {}"
-	m3t1 := "string"
-	m3t2 := "int"
-	m3s := "(len=" + m3Len + ") {\n (" + m3t1 + ") (len=" + k3Len + ") " +
-		"\"one\": (" + m3t2 + ") 1\n}"
-	addDumpTest(m3, "("+m3t+") "+m3s+"\n")
-	addDumpTest(pm3, "(*"+m3t+")("+m3Addr+")("+m3s+")\n")
-	addDumpTest(&pm3, "(**"+m3t+")("+pm3Addr+"->"+m3Addr+")("+m3s+")\n")
-	addDumpTest(nm3, "(*"+m3t+")(<nil>)\n")
-	addDumpTest(nilMap3, "("+m3t+") <nil>\n")
-
-	// Map with nil interface value.
-	k4 := "nil"
-	k4Len := fmt.Sprintf("%d", len(k4))
-	m4 := map[string]interface{}{k4: nil}
-	m4Len := fmt.Sprintf("%d", len(m4))
-	nilMap4 := map[string]interface{}(nil)
-	nm4 := (*map[string]interface{})(nil)
-	pm4 := &m4
-	m4Addr := fmt.Sprintf("%p", pm4)
-	pm4Addr := fmt.Sprintf("%p", &pm4)
-	m4t := "map[string]interface {}"
-	m4t1 := "string"
-	m4t2 := "interface {}"
-	m4s := "(len=" + m4Len + ") {\n (" + m4t1 + ") (len=" + k4Len + ")" +
-		" \"nil\": (" + m4t2 + ") <nil>\n}"
-	addDumpTest(m4, "("+m4t+") "+m4s+"\n")
-	addDumpTest(pm4, "(*"+m4t+")("+m4Addr+")("+m4s+")\n")
-	addDumpTest(&pm4, "(**"+m4t+")("+pm4Addr+"->"+m4Addr+")("+m4s+")\n")
-	addDumpTest(nm4, "(*"+m4t+")(<nil>)\n")
-	addDumpTest(nilMap4, "("+m4t+") <nil>\n")
-}
-
-func addStructDumpTests() {
-	// Struct with primitives.
-	type s1 struct {
-		a int8
-		b uint8
-	}
-	v := s1{127, 255}
-	nv := (*s1)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.s1"
-	vt2 := "int8"
-	vt3 := "uint8"
-	vs := "{\n a: (" + vt2 + ") 127,\n b: (" + vt3 + ") 255\n}"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Struct that contains another struct.
-	type s2 struct {
-		s1 s1
-		b  bool
-	}
-	v2 := s2{s1{127, 255}, true}
-	nv2 := (*s2)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.s2"
-	v2t2 := "spew_test.s1"
-	v2t3 := "int8"
-	v2t4 := "uint8"
-	v2t5 := "bool"
-	v2s := "{\n s1: (" + v2t2 + ") {\n  a: (" + v2t3 + ") 127,\n  b: (" +
-		v2t4 + ") 255\n },\n b: (" + v2t5 + ") true\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Struct that contains custom type with Stringer pointer interface via both
-	// exported and unexported fields.
-	type s3 struct {
-		s pstringer
-		S pstringer
-	}
-	v3 := s3{"test", "test2"}
-	nv3 := (*s3)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.s3"
-	v3t2 := "spew_test.pstringer"
-	v3s := "{\n s: (" + v3t2 + ") (len=4) stringer test,\n S: (" + v3t2 +
-		") (len=5) stringer test2\n}"
-	v3sp := v3s
-	if spew.UnsafeDisabled {
-		v3s = "{\n s: (" + v3t2 + ") (len=4) \"test\",\n S: (" +
-			v3t2 + ") (len=5) \"test2\"\n}"
-		v3sp = "{\n s: (" + v3t2 + ") (len=4) \"test\",\n S: (" +
-			v3t2 + ") (len=5) stringer test2\n}"
-	}
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3sp+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3sp+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-
-	// Struct that contains embedded struct and field to same struct.
-	e := embed{"embedstr"}
-	eLen := fmt.Sprintf("%d", len("embedstr"))
-	v4 := embedwrap{embed: &e, e: &e}
-	nv4 := (*embedwrap)(nil)
-	pv4 := &v4
-	eAddr := fmt.Sprintf("%p", &e)
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "spew_test.embedwrap"
-	v4t2 := "spew_test.embed"
-	v4t3 := "string"
-	v4s := "{\n embed: (*" + v4t2 + ")(" + eAddr + ")({\n  a: (" + v4t3 +
-		") (len=" + eLen + ") \"embedstr\"\n }),\n e: (*" + v4t2 +
-		")(" + eAddr + ")({\n  a: (" + v4t3 + ") (len=" + eLen + ")" +
-		" \"embedstr\"\n })\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-	addDumpTest(pv4, "(*"+v4t+")("+v4Addr+")("+v4s+")\n")
-	addDumpTest(&pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")("+v4s+")\n")
-	addDumpTest(nv4, "(*"+v4t+")(<nil>)\n")
-}
-
-func addUintptrDumpTests() {
-	// Null pointer.
-	v := uintptr(0)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uintptr"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-
-	// Address of real variable.
-	i := 1
-	v2 := uintptr(unsafe.Pointer(&i))
-	nv2 := (*uintptr)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uintptr"
-	v2s := fmt.Sprintf("%p", &i)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-}
-
-func addUnsafePointerDumpTests() {
-	// Null pointer.
-	v := unsafe.Pointer(uintptr(0))
-	nv := (*unsafe.Pointer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "unsafe.Pointer"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Address of real variable.
-	i := 1
-	v2 := unsafe.Pointer(&i)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "unsafe.Pointer"
-	v2s := fmt.Sprintf("%p", &i)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addChanDumpTests() {
-	// Nil channel.
-	var v chan int
-	pv := &v
-	nv := (*chan int)(nil)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "chan int"
-	vs := "<nil>"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Real channel.
-	v2 := make(chan int)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "chan int"
-	v2s := fmt.Sprintf("%p", v2)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-}
-
-func addFuncDumpTests() {
-	// Function with no params and no returns.
-	v := addIntDumpTests
-	nv := (*func())(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "func()"
-	vs := fmt.Sprintf("%p", v)
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-
-	// Function with param and no returns.
-	v2 := TestDump
-	nv2 := (*func(*testing.T))(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "func(*testing.T)"
-	v2s := fmt.Sprintf("%p", v2)
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s+")\n")
-	addDumpTest(nv2, "(*"+v2t+")(<nil>)\n")
-
-	// Function with multiple params and multiple returns.
-	var v3 = func(i int, s string) (b bool, err error) {
-		return true, nil
-	}
-	nv3 := (*func(int, string) (bool, error))(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "func(int, string) (bool, error)"
-	v3s := fmt.Sprintf("%p", v3)
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s+")\n")
-	addDumpTest(nv3, "(*"+v3t+")(<nil>)\n")
-}
-
-func addCircularDumpTests() {
-	// Struct that is circular through self referencing.
-	type circular struct {
-		c *circular
-	}
-	v := circular{nil}
-	v.c = &v
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.circular"
-	vs := "{\n c: (*" + vt + ")(" + vAddr + ")({\n  c: (*" + vt + ")(" +
-		vAddr + ")(<already shown>)\n })\n}"
-	vs2 := "{\n c: (*" + vt + ")(" + vAddr + ")(<already shown>)\n}"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs2+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs2+")\n")
-
-	// Structs that are circular through cross referencing.
-	v2 := xref1{nil}
-	ts2 := xref2{&v2}
-	v2.ps2 = &ts2
-	pv2 := &v2
-	ts2Addr := fmt.Sprintf("%p", &ts2)
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.xref1"
-	v2t2 := "spew_test.xref2"
-	v2s := "{\n ps2: (*" + v2t2 + ")(" + ts2Addr + ")({\n  ps1: (*" + v2t +
-		")(" + v2Addr + ")({\n   ps2: (*" + v2t2 + ")(" + ts2Addr +
-		")(<already shown>)\n  })\n })\n}"
-	v2s2 := "{\n ps2: (*" + v2t2 + ")(" + ts2Addr + ")({\n  ps1: (*" + v2t +
-		")(" + v2Addr + ")(<already shown>)\n })\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-	addDumpTest(pv2, "(*"+v2t+")("+v2Addr+")("+v2s2+")\n")
-	addDumpTest(&pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")("+v2s2+")\n")
-
-	// Structs that are indirectly circular.
-	v3 := indirCir1{nil}
-	tic2 := indirCir2{nil}
-	tic3 := indirCir3{&v3}
-	tic2.ps3 = &tic3
-	v3.ps2 = &tic2
-	pv3 := &v3
-	tic2Addr := fmt.Sprintf("%p", &tic2)
-	tic3Addr := fmt.Sprintf("%p", &tic3)
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.indirCir1"
-	v3t2 := "spew_test.indirCir2"
-	v3t3 := "spew_test.indirCir3"
-	v3s := "{\n ps2: (*" + v3t2 + ")(" + tic2Addr + ")({\n  ps3: (*" + v3t3 +
-		")(" + tic3Addr + ")({\n   ps1: (*" + v3t + ")(" + v3Addr +
-		")({\n    ps2: (*" + v3t2 + ")(" + tic2Addr +
-		")(<already shown>)\n   })\n  })\n })\n}"
-	v3s2 := "{\n ps2: (*" + v3t2 + ")(" + tic2Addr + ")({\n  ps3: (*" + v3t3 +
-		")(" + tic3Addr + ")({\n   ps1: (*" + v3t + ")(" + v3Addr +
-		")(<already shown>)\n  })\n })\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n")
-	addDumpTest(pv3, "(*"+v3t+")("+v3Addr+")("+v3s2+")\n")
-	addDumpTest(&pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")("+v3s2+")\n")
-}
-
-func addPanicDumpTests() {
-	// Type that panics in its Stringer interface.
-	v := panicer(127)
-	nv := (*panicer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.panicer"
-	vs := "(PANIC=test panic)127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-func addErrorDumpTests() {
-	// Type that has a custom Error interface.
-	v := customError(127)
-	nv := (*customError)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.customError"
-	vs := "error: 127"
-	addDumpTest(v, "("+vt+") "+vs+"\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")("+vs+")\n")
-	addDumpTest(nv, "(*"+vt+")(<nil>)\n")
-}
-
-// TestDump executes all of the tests described by dumpTests.
-func TestDump(t *testing.T) {
-	// Setup tests.
-	addIntDumpTests()
-	addUintDumpTests()
-	addBoolDumpTests()
-	addFloatDumpTests()
-	addComplexDumpTests()
-	addArrayDumpTests()
-	addSliceDumpTests()
-	addStringDumpTests()
-	addInterfaceDumpTests()
-	addMapDumpTests()
-	addStructDumpTests()
-	addUintptrDumpTests()
-	addUnsafePointerDumpTests()
-	addChanDumpTests()
-	addFuncDumpTests()
-	addCircularDumpTests()
-	addPanicDumpTests()
-	addErrorDumpTests()
-	addCgoDumpTests()
-
-	t.Logf("Running %d tests", len(dumpTests))
-	for i, test := range dumpTests {
-		buf := new(bytes.Buffer)
-		spew.Fdump(buf, test.in)
-		s := buf.String()
-		if testFailed(s, test.wants) {
-			t.Errorf("Dump #%d\n got: %s %s", i, s, stringizeWants(test.wants))
-			continue
-		}
-	}
-}
-
-func TestDumpSortedKeys(t *testing.T) {
-	cfg := spew.ConfigState{SortKeys: true}
-	s := cfg.Sdump(map[int]string{1: "1", 3: "3", 2: "2"})
-	expected := "(map[int]string) (len=3) {\n(int) 1: (string) (len=1) " +
-		"\"1\",\n(int) 2: (string) (len=1) \"2\",\n(int) 3: (string) " +
-		"(len=1) \"3\"\n" +
-		"}\n"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sdump(map[stringer]int{"1": 1, "3": 3, "2": 2})
-	expected = "(map[spew_test.stringer]int) (len=3) {\n" +
-		"(spew_test.stringer) (len=1) stringer 1: (int) 1,\n" +
-		"(spew_test.stringer) (len=1) stringer 2: (int) 2,\n" +
-		"(spew_test.stringer) (len=1) stringer 3: (int) 3\n" +
-		"}\n"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sdump(map[pstringer]int{pstringer("1"): 1, pstringer("3"): 3, pstringer("2"): 2})
-	expected = "(map[spew_test.pstringer]int) (len=3) {\n" +
-		"(spew_test.pstringer) (len=1) stringer 1: (int) 1,\n" +
-		"(spew_test.pstringer) (len=1) stringer 2: (int) 2,\n" +
-		"(spew_test.pstringer) (len=1) stringer 3: (int) 3\n" +
-		"}\n"
-	if spew.UnsafeDisabled {
-		expected = "(map[spew_test.pstringer]int) (len=3) {\n" +
-			"(spew_test.pstringer) (len=1) \"1\": (int) 1,\n" +
-			"(spew_test.pstringer) (len=1) \"2\": (int) 2,\n" +
-			"(spew_test.pstringer) (len=1) \"3\": (int) 3\n" +
-			"}\n"
-	}
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sdump(map[customError]int{customError(1): 1, customError(3): 3, customError(2): 2})
-	expected = "(map[spew_test.customError]int) (len=3) {\n" +
-		"(spew_test.customError) error: 1: (int) 1,\n" +
-		"(spew_test.customError) error: 2: (int) 2,\n" +
-		"(spew_test.customError) error: 3: (int) 3\n" +
-		"}\n"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch:\n  %v %v", s, expected)
-	}
-
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go
deleted file mode 100644
index 6ab180809a..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/dumpcgo_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when both cgo is supported and "-tags testcgo" is added to the go test
-// command line.  This means the cgo tests are only added (and hence run) when
-// specifially requested.  This configuration is used because spew itself
-// does not require cgo to run even though it does handle certain cgo types
-// specially.  Rather than forcing all clients to require cgo and an external
-// C compiler just to run the tests, this scheme makes them optional.
-// +build cgo,testcgo
-
-package spew_test
-
-import (
-	"fmt"
-
-	"github.com/davecgh/go-spew/spew/testdata"
-)
-
-func addCgoDumpTests() {
-	// C char pointer.
-	v := testdata.GetCgoCharPointer()
-	nv := testdata.GetCgoNullCharPointer()
-	pv := &v
-	vcAddr := fmt.Sprintf("%p", v)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "*testdata._Ctype_char"
-	vs := "116"
-	addDumpTest(v, "("+vt+")("+vcAddr+")("+vs+")\n")
-	addDumpTest(pv, "(*"+vt+")("+vAddr+"->"+vcAddr+")("+vs+")\n")
-	addDumpTest(&pv, "(**"+vt+")("+pvAddr+"->"+vAddr+"->"+vcAddr+")("+vs+")\n")
-	addDumpTest(nv, "("+vt+")(<nil>)\n")
-
-	// C char array.
-	v2, v2l, v2c := testdata.GetCgoCharArray()
-	v2Len := fmt.Sprintf("%d", v2l)
-	v2Cap := fmt.Sprintf("%d", v2c)
-	v2t := "[6]testdata._Ctype_char"
-	v2s := "(len=" + v2Len + " cap=" + v2Cap + ") " +
-		"{\n 00000000  74 65 73 74 32 00                               " +
-		"  |test2.|\n}"
-	addDumpTest(v2, "("+v2t+") "+v2s+"\n")
-
-	// C unsigned char array.
-	v3, v3l, v3c := testdata.GetCgoUnsignedCharArray()
-	v3Len := fmt.Sprintf("%d", v3l)
-	v3Cap := fmt.Sprintf("%d", v3c)
-	v3t := "[6]testdata._Ctype_unsignedchar"
-	v3t2 := "[6]testdata._Ctype_uchar"
-	v3s := "(len=" + v3Len + " cap=" + v3Cap + ") " +
-		"{\n 00000000  74 65 73 74 33 00                               " +
-		"  |test3.|\n}"
-	addDumpTest(v3, "("+v3t+") "+v3s+"\n", "("+v3t2+") "+v3s+"\n")
-
-	// C signed char array.
-	v4, v4l, v4c := testdata.GetCgoSignedCharArray()
-	v4Len := fmt.Sprintf("%d", v4l)
-	v4Cap := fmt.Sprintf("%d", v4c)
-	v4t := "[6]testdata._Ctype_schar"
-	v4t2 := "testdata._Ctype_schar"
-	v4s := "(len=" + v4Len + " cap=" + v4Cap + ") " +
-		"{\n (" + v4t2 + ") 116,\n (" + v4t2 + ") 101,\n (" + v4t2 +
-		") 115,\n (" + v4t2 + ") 116,\n (" + v4t2 + ") 52,\n (" + v4t2 +
-		") 0\n}"
-	addDumpTest(v4, "("+v4t+") "+v4s+"\n")
-
-	// C uint8_t array.
-	v5, v5l, v5c := testdata.GetCgoUint8tArray()
-	v5Len := fmt.Sprintf("%d", v5l)
-	v5Cap := fmt.Sprintf("%d", v5c)
-	v5t := "[6]testdata._Ctype_uint8_t"
-	v5s := "(len=" + v5Len + " cap=" + v5Cap + ") " +
-		"{\n 00000000  74 65 73 74 35 00                               " +
-		"  |test5.|\n}"
-	addDumpTest(v5, "("+v5t+") "+v5s+"\n")
-
-	// C typedefed unsigned char array.
-	v6, v6l, v6c := testdata.GetCgoTypdefedUnsignedCharArray()
-	v6Len := fmt.Sprintf("%d", v6l)
-	v6Cap := fmt.Sprintf("%d", v6c)
-	v6t := "[6]testdata._Ctype_custom_uchar_t"
-	v6s := "(len=" + v6Len + " cap=" + v6Cap + ") " +
-		"{\n 00000000  74 65 73 74 36 00                               " +
-		"  |test6.|\n}"
-	addDumpTest(v6, "("+v6t+") "+v6s+"\n")
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go
deleted file mode 100644
index 52a0971fb3..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/dumpnocgo_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright (c) 2013 Dave Collins <dave@davec.name>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when either cgo is not supported or "-tags testcgo" is not added to the go
-// test command line.  This file intentionally does not setup any cgo tests in
-// this scenario.
-// +build !cgo !testcgo
-
-package spew_test
-
-func addCgoDumpTests() {
-	// Don't add any tests for cgo since this file is only compiled when
-	// there should not be any cgo tests.
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/example_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/example_test.go
deleted file mode 100644
index c6ec8c6d59..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/example_test.go
+++ /dev/null
@@ -1,226 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"fmt"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-type Flag int
-
-const (
-	flagOne Flag = iota
-	flagTwo
-)
-
-var flagStrings = map[Flag]string{
-	flagOne: "flagOne",
-	flagTwo: "flagTwo",
-}
-
-func (f Flag) String() string {
-	if s, ok := flagStrings[f]; ok {
-		return s
-	}
-	return fmt.Sprintf("Unknown flag (%d)", int(f))
-}
-
-type Bar struct {
-	data uintptr
-}
-
-type Foo struct {
-	unexportedField Bar
-	ExportedField   map[interface{}]interface{}
-}
-
-// This example demonstrates how to use Dump to dump variables to stdout.
-func ExampleDump() {
-	// The following package level declarations are assumed for this example:
-	/*
-		type Flag int
-
-		const (
-			flagOne Flag = iota
-			flagTwo
-		)
-
-		var flagStrings = map[Flag]string{
-			flagOne: "flagOne",
-			flagTwo: "flagTwo",
-		}
-
-		func (f Flag) String() string {
-			if s, ok := flagStrings[f]; ok {
-				return s
-			}
-			return fmt.Sprintf("Unknown flag (%d)", int(f))
-		}
-
-		type Bar struct {
-			data uintptr
-		}
-
-		type Foo struct {
-			unexportedField Bar
-			ExportedField   map[interface{}]interface{}
-		}
-	*/
-
-	// Setup some sample data structures for the example.
-	bar := Bar{uintptr(0)}
-	s1 := Foo{bar, map[interface{}]interface{}{"one": true}}
-	f := Flag(5)
-	b := []byte{
-		0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-		0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f, 0x20,
-		0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27, 0x28,
-		0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f, 0x30,
-		0x31, 0x32,
-	}
-
-	// Dump!
-	spew.Dump(s1, f, b)
-
-	// Output:
-	// (spew_test.Foo) {
-	//  unexportedField: (spew_test.Bar) {
-	//   data: (uintptr) <nil>
-	//  },
-	//  ExportedField: (map[interface {}]interface {}) (len=1) {
-	//   (string) (len=3) "one": (bool) true
-	//  }
-	// }
-	// (spew_test.Flag) Unknown flag (5)
-	// ([]uint8) (len=34 cap=34) {
-	//  00000000  11 12 13 14 15 16 17 18  19 1a 1b 1c 1d 1e 1f 20  |............... |
-	//  00000010  21 22 23 24 25 26 27 28  29 2a 2b 2c 2d 2e 2f 30  |!"#$%&'()*+,-./0|
-	//  00000020  31 32                                             |12|
-	// }
-	//
-}
-
-// This example demonstrates how to use Printf to display a variable with a
-// format string and inline formatting.
-func ExamplePrintf() {
-	// Create a double pointer to a uint 8.
-	ui8 := uint8(5)
-	pui8 := &ui8
-	ppui8 := &pui8
-
-	// Create a circular data type.
-	type circular struct {
-		ui8 uint8
-		c   *circular
-	}
-	c := circular{ui8: 1}
-	c.c = &c
-
-	// Print!
-	spew.Printf("ppui8: %v\n", ppui8)
-	spew.Printf("circular: %v\n", c)
-
-	// Output:
-	// ppui8: <**>5
-	// circular: {1 <*>{1 <*><shown>}}
-}
-
-// This example demonstrates how to use a ConfigState.
-func ExampleConfigState() {
-	// Modify the indent level of the ConfigState only.  The global
-	// configuration is not modified.
-	scs := spew.ConfigState{Indent: "\t"}
-
-	// Output using the ConfigState instance.
-	v := map[string]int{"one": 1}
-	scs.Printf("v: %v\n", v)
-	scs.Dump(v)
-
-	// Output:
-	// v: map[one:1]
-	// (map[string]int) (len=1) {
-	// 	(string) (len=3) "one": (int) 1
-	// }
-}
-
-// This example demonstrates how to use ConfigState.Dump to dump variables to
-// stdout
-func ExampleConfigState_Dump() {
-	// See the top-level Dump example for details on the types used in this
-	// example.
-
-	// Create two ConfigState instances with different indentation.
-	scs := spew.ConfigState{Indent: "\t"}
-	scs2 := spew.ConfigState{Indent: " "}
-
-	// Setup some sample data structures for the example.
-	bar := Bar{uintptr(0)}
-	s1 := Foo{bar, map[interface{}]interface{}{"one": true}}
-
-	// Dump using the ConfigState instances.
-	scs.Dump(s1)
-	scs2.Dump(s1)
-
-	// Output:
-	// (spew_test.Foo) {
-	// 	unexportedField: (spew_test.Bar) {
-	// 		data: (uintptr) <nil>
-	// 	},
-	// 	ExportedField: (map[interface {}]interface {}) (len=1) {
-	//		(string) (len=3) "one": (bool) true
-	// 	}
-	// }
-	// (spew_test.Foo) {
-	//  unexportedField: (spew_test.Bar) {
-	//   data: (uintptr) <nil>
-	//  },
-	//  ExportedField: (map[interface {}]interface {}) (len=1) {
-	//   (string) (len=3) "one": (bool) true
-	//  }
-	// }
-	//
-}
-
-// This example demonstrates how to use ConfigState.Printf to display a variable
-// with a format string and inline formatting.
-func ExampleConfigState_Printf() {
-	// See the top-level Dump example for details on the types used in this
-	// example.
-
-	// Create two ConfigState instances and modify the method handling of the
-	// first ConfigState only.
-	scs := spew.NewDefaultConfig()
-	scs2 := spew.NewDefaultConfig()
-	scs.DisableMethods = true
-
-	// Alternatively
-	// scs := spew.ConfigState{Indent: " ", DisableMethods: true}
-	// scs2 := spew.ConfigState{Indent: " "}
-
-	// This is of type Flag which implements a Stringer and has raw value 1.
-	f := flagTwo
-
-	// Dump using the ConfigState instances.
-	scs.Printf("f: %v\n", f)
-	scs2.Printf("f: %v\n", f)
-
-	// Output:
-	// f: 1
-	// f: flagTwo
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/format_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/format_test.go
deleted file mode 100644
index f9b93abe86..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/format_test.go
+++ /dev/null
@@ -1,1558 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-Test Summary:
-NOTE: For each test, a nil pointer, a single pointer and double pointer to the
-base test element are also tested to ensure proper indirection across all types.
-
-- Max int8, int16, int32, int64, int
-- Max uint8, uint16, uint32, uint64, uint
-- Boolean true and false
-- Standard complex64 and complex128
-- Array containing standard ints
-- Array containing type with custom formatter on pointer receiver only
-- Array containing interfaces
-- Slice containing standard float32 values
-- Slice containing type with custom formatter on pointer receiver only
-- Slice containing interfaces
-- Nil slice
-- Standard string
-- Nil interface
-- Sub-interface
-- Map with string keys and int vals
-- Map with custom formatter type on pointer receiver only keys and vals
-- Map with interface keys and values
-- Map with nil interface value
-- Struct with primitives
-- Struct that contains another struct
-- Struct that contains custom type with Stringer pointer interface via both
-  exported and unexported fields
-- Struct that contains embedded struct and field to same struct
-- Uintptr to 0 (null pointer)
-- Uintptr address of real variable
-- Unsafe.Pointer to 0 (null pointer)
-- Unsafe.Pointer to address of real variable
-- Nil channel
-- Standard int channel
-- Function with no params and no returns
-- Function with param and no returns
-- Function with multiple params and multiple returns
-- Struct that is circular through self referencing
-- Structs that are circular through cross referencing
-- Structs that are indirectly circular
-- Type that panics in its Stringer interface
-- Type that has a custom Error interface
-- %x passthrough with uint
-- %#x passthrough with uint
-- %f passthrough with precision
-- %f passthrough with width and precision
-- %d passthrough with width
-- %q passthrough with string
-*/
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-	"unsafe"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// formatterTest is used to describe a test to be performed against NewFormatter.
-type formatterTest struct {
-	format string
-	in     interface{}
-	wants  []string
-}
-
-// formatterTests houses all of the tests to be performed against NewFormatter.
-var formatterTests = make([]formatterTest, 0)
-
-// addFormatterTest is a helper method to append the passed input and desired
-// result to formatterTests.
-func addFormatterTest(format string, in interface{}, wants ...string) {
-	test := formatterTest{format, in, wants}
-	formatterTests = append(formatterTests, test)
-}
-
-func addIntFormatterTests() {
-	// Max int8.
-	v := int8(127)
-	nv := (*int8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "int8"
-	vs := "127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Max int16.
-	v2 := int16(32767)
-	nv2 := (*int16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "int16"
-	v2s := "32767"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Max int32.
-	v3 := int32(2147483647)
-	nv3 := (*int32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "int32"
-	v3s := "2147483647"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Max int64.
-	v4 := int64(9223372036854775807)
-	nv4 := (*int64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "int64"
-	v4s := "9223372036854775807"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-
-	// Max int.
-	v5 := int(2147483647)
-	nv5 := (*int)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "int"
-	v5s := "2147483647"
-	addFormatterTest("%v", v5, v5s)
-	addFormatterTest("%v", pv5, "<*>"+v5s)
-	addFormatterTest("%v", &pv5, "<**>"+v5s)
-	addFormatterTest("%v", nv5, "<nil>")
-	addFormatterTest("%+v", v5, v5s)
-	addFormatterTest("%+v", pv5, "<*>("+v5Addr+")"+v5s)
-	addFormatterTest("%+v", &pv5, "<**>("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%+v", nv5, "<nil>")
-	addFormatterTest("%#v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#v", pv5, "(*"+v5t+")"+v5s)
-	addFormatterTest("%#v", &pv5, "(**"+v5t+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-	addFormatterTest("%#+v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#+v", pv5, "(*"+v5t+")("+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", &pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", nv5, "(*"+v5t+")"+"<nil>")
-}
-
-func addUintFormatterTests() {
-	// Max uint8.
-	v := uint8(255)
-	nv := (*uint8)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uint8"
-	vs := "255"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Max uint16.
-	v2 := uint16(65535)
-	nv2 := (*uint16)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Max uint32.
-	v3 := uint32(4294967295)
-	nv3 := (*uint32)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "uint32"
-	v3s := "4294967295"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Max uint64.
-	v4 := uint64(18446744073709551615)
-	nv4 := (*uint64)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "uint64"
-	v4s := "18446744073709551615"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-
-	// Max uint.
-	v5 := uint(4294967295)
-	nv5 := (*uint)(nil)
-	pv5 := &v5
-	v5Addr := fmt.Sprintf("%p", pv5)
-	pv5Addr := fmt.Sprintf("%p", &pv5)
-	v5t := "uint"
-	v5s := "4294967295"
-	addFormatterTest("%v", v5, v5s)
-	addFormatterTest("%v", pv5, "<*>"+v5s)
-	addFormatterTest("%v", &pv5, "<**>"+v5s)
-	addFormatterTest("%v", nv5, "<nil>")
-	addFormatterTest("%+v", v5, v5s)
-	addFormatterTest("%+v", pv5, "<*>("+v5Addr+")"+v5s)
-	addFormatterTest("%+v", &pv5, "<**>("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%+v", nv5, "<nil>")
-	addFormatterTest("%#v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#v", pv5, "(*"+v5t+")"+v5s)
-	addFormatterTest("%#v", &pv5, "(**"+v5t+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-	addFormatterTest("%#+v", v5, "("+v5t+")"+v5s)
-	addFormatterTest("%#+v", pv5, "(*"+v5t+")("+v5Addr+")"+v5s)
-	addFormatterTest("%#+v", &pv5, "(**"+v5t+")("+pv5Addr+"->"+v5Addr+")"+v5s)
-	addFormatterTest("%#v", nv5, "(*"+v5t+")"+"<nil>")
-}
-
-func addBoolFormatterTests() {
-	// Boolean true.
-	v := bool(true)
-	nv := (*bool)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "bool"
-	vs := "true"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Boolean false.
-	v2 := bool(false)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "bool"
-	v2s := "false"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addFloatFormatterTests() {
-	// Standard float32.
-	v := float32(3.1415)
-	nv := (*float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "float32"
-	vs := "3.1415"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Standard float64.
-	v2 := float64(3.1415926)
-	nv2 := (*float64)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "float64"
-	v2s := "3.1415926"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-}
-
-func addComplexFormatterTests() {
-	// Standard complex64.
-	v := complex(float32(6), -2)
-	nv := (*complex64)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "complex64"
-	vs := "(6-2i)"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Standard complex128.
-	v2 := complex(float64(-6), 2)
-	nv2 := (*complex128)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "complex128"
-	v2s := "(-6+2i)"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-}
-
-func addArrayFormatterTests() {
-	// Array containing standard ints.
-	v := [3]int{1, 2, 3}
-	nv := (*[3]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "[3]int"
-	vs := "[1 2 3]"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Array containing type with custom formatter on pointer receiver only.
-	v2 := [3]pstringer{"1", "2", "3"}
-	nv2 := (*[3]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "[3]spew_test.pstringer"
-	v2sp := "[stringer 1 stringer 2 stringer 3]"
-	v2s := v2sp
-	if spew.UnsafeDisabled {
-		v2s = "[1 2 3]"
-	}
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2sp)
-	addFormatterTest("%v", &pv2, "<**>"+v2sp)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2sp)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2sp)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2sp)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2sp)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2sp)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2sp)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Array containing interfaces.
-	v3 := [3]interface{}{"one", int(2), uint(3)}
-	nv3 := (*[3]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[3]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3s := "[one 2 3]"
-	v3s2 := "[(" + v3t2 + ")one (" + v3t3 + ")2 (" + v3t4 + ")3]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-}
-
-func addSliceFormatterTests() {
-	// Slice containing standard float32 values.
-	v := []float32{3.14, 6.28, 12.56}
-	nv := (*[]float32)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "[]float32"
-	vs := "[3.14 6.28 12.56]"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Slice containing type with custom formatter on pointer receiver only.
-	v2 := []pstringer{"1", "2", "3"}
-	nv2 := (*[]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "[]spew_test.pstringer"
-	v2s := "[stringer 1 stringer 2 stringer 3]"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Slice containing interfaces.
-	v3 := []interface{}{"one", int(2), uint(3), nil}
-	nv3 := (*[]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "[]interface {}"
-	v3t2 := "string"
-	v3t3 := "int"
-	v3t4 := "uint"
-	v3t5 := "interface {}"
-	v3s := "[one 2 3 <nil>]"
-	v3s2 := "[(" + v3t2 + ")one (" + v3t3 + ")2 (" + v3t4 + ")3 (" + v3t5 +
-		")<nil>]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Nil slice.
-	var v4 []int
-	nv4 := (*[]int)(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "[]int"
-	v4s := "<nil>"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addStringFormatterTests() {
-	// Standard string.
-	v := "test"
-	nv := (*string)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "string"
-	vs := "test"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addInterfaceFormatterTests() {
-	// Nil interface.
-	var v interface{}
-	nv := (*interface{})(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "interface {}"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Sub-interface.
-	v2 := interface{}(uint16(65535))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uint16"
-	v2s := "65535"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addMapFormatterTests() {
-	// Map with string keys and int vals.
-	v := map[string]int{"one": 1, "two": 2}
-	nilMap := map[string]int(nil)
-	nv := (*map[string]int)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "map[string]int"
-	vs := "map[one:1 two:2]"
-	vs2 := "map[two:2 one:1]"
-	addFormatterTest("%v", v, vs, vs2)
-	addFormatterTest("%v", pv, "<*>"+vs, "<*>"+vs2)
-	addFormatterTest("%v", &pv, "<**>"+vs, "<**>"+vs2)
-	addFormatterTest("%+v", nilMap, "<nil>")
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs, vs2)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs, "<*>("+vAddr+")"+vs2)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs,
-		"<**>("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%+v", nilMap, "<nil>")
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs, "("+vt+")"+vs2)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs, "(*"+vt+")"+vs2)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs, "(**"+vt+")"+vs2)
-	addFormatterTest("%#v", nilMap, "("+vt+")"+"<nil>")
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs, "("+vt+")"+vs2)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs,
-		"(*"+vt+")("+vAddr+")"+vs2)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs,
-		"(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%#+v", nilMap, "("+vt+")"+"<nil>")
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Map with custom formatter type on pointer receiver only keys and vals.
-	v2 := map[pstringer]pstringer{"one": "1"}
-	nv2 := (*map[pstringer]pstringer)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "map[spew_test.pstringer]spew_test.pstringer"
-	v2s := "map[stringer one:stringer 1]"
-	if spew.UnsafeDisabled {
-		v2s = "map[one:1]"
-	}
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Map with interface keys and values.
-	v3 := map[interface{}]interface{}{"one": 1}
-	nv3 := (*map[interface{}]interface{})(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "map[interface {}]interface {}"
-	v3t1 := "string"
-	v3t2 := "int"
-	v3s := "map[one:1]"
-	v3s2 := "map[(" + v3t1 + ")one:(" + v3t2 + ")1]"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s2)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s2)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s2)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s2)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Map with nil interface value
-	v4 := map[string]interface{}{"nil": nil}
-	nv4 := (*map[string]interface{})(nil)
-	pv4 := &v4
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "map[string]interface {}"
-	v4t1 := "interface {}"
-	v4s := "map[nil:<nil>]"
-	v4s2 := "map[nil:(" + v4t1 + ")<nil>]"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s2)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s2)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s2)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s2)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s2)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s2)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addStructFormatterTests() {
-	// Struct with primitives.
-	type s1 struct {
-		a int8
-		b uint8
-	}
-	v := s1{127, 255}
-	nv := (*s1)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.s1"
-	vt2 := "int8"
-	vt3 := "uint8"
-	vs := "{127 255}"
-	vs2 := "{a:127 b:255}"
-	vs3 := "{a:(" + vt2 + ")127 b:(" + vt3 + ")255}"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs2)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs2)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs2)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs3)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs3)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs3)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs3)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs3)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs3)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Struct that contains another struct.
-	type s2 struct {
-		s1 s1
-		b  bool
-	}
-	v2 := s2{s1{127, 255}, true}
-	nv2 := (*s2)(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.s2"
-	v2t2 := "spew_test.s1"
-	v2t3 := "int8"
-	v2t4 := "uint8"
-	v2t5 := "bool"
-	v2s := "{{127 255} true}"
-	v2s2 := "{s1:{a:127 b:255} b:true}"
-	v2s3 := "{s1:(" + v2t2 + "){a:(" + v2t3 + ")127 b:(" + v2t4 + ")255} b:(" +
-		v2t5 + ")true}"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s2)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s2)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s2)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s3)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s3)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s3)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s3)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s3)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s3)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Struct that contains custom type with Stringer pointer interface via both
-	// exported and unexported fields.
-	type s3 struct {
-		s pstringer
-		S pstringer
-	}
-	v3 := s3{"test", "test2"}
-	nv3 := (*s3)(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.s3"
-	v3t2 := "spew_test.pstringer"
-	v3s := "{stringer test stringer test2}"
-	v3sp := v3s
-	v3s2 := "{s:stringer test S:stringer test2}"
-	v3s2p := v3s2
-	v3s3 := "{s:(" + v3t2 + ")stringer test S:(" + v3t2 + ")stringer test2}"
-	v3s3p := v3s3
-	if spew.UnsafeDisabled {
-		v3s = "{test test2}"
-		v3sp = "{test stringer test2}"
-		v3s2 = "{s:test S:test2}"
-		v3s2p = "{s:test S:stringer test2}"
-		v3s3 = "{s:(" + v3t2 + ")test S:(" + v3t2 + ")test2}"
-		v3s3p = "{s:(" + v3t2 + ")test S:(" + v3t2 + ")stringer test2}"
-	}
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3sp)
-	addFormatterTest("%v", &pv3, "<**>"+v3sp)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s2)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s2p)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s2p)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s3)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s3p)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s3p)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s3)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s3p)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s3p)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-
-	// Struct that contains embedded struct and field to same struct.
-	e := embed{"embedstr"}
-	v4 := embedwrap{embed: &e, e: &e}
-	nv4 := (*embedwrap)(nil)
-	pv4 := &v4
-	eAddr := fmt.Sprintf("%p", &e)
-	v4Addr := fmt.Sprintf("%p", pv4)
-	pv4Addr := fmt.Sprintf("%p", &pv4)
-	v4t := "spew_test.embedwrap"
-	v4t2 := "spew_test.embed"
-	v4t3 := "string"
-	v4s := "{<*>{embedstr} <*>{embedstr}}"
-	v4s2 := "{embed:<*>(" + eAddr + "){a:embedstr} e:<*>(" + eAddr +
-		"){a:embedstr}}"
-	v4s3 := "{embed:(*" + v4t2 + "){a:(" + v4t3 + ")embedstr} e:(*" + v4t2 +
-		"){a:(" + v4t3 + ")embedstr}}"
-	v4s4 := "{embed:(*" + v4t2 + ")(" + eAddr + "){a:(" + v4t3 +
-		")embedstr} e:(*" + v4t2 + ")(" + eAddr + "){a:(" + v4t3 + ")embedstr}}"
-	addFormatterTest("%v", v4, v4s)
-	addFormatterTest("%v", pv4, "<*>"+v4s)
-	addFormatterTest("%v", &pv4, "<**>"+v4s)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%+v", v4, v4s2)
-	addFormatterTest("%+v", pv4, "<*>("+v4Addr+")"+v4s2)
-	addFormatterTest("%+v", &pv4, "<**>("+pv4Addr+"->"+v4Addr+")"+v4s2)
-	addFormatterTest("%+v", nv4, "<nil>")
-	addFormatterTest("%#v", v4, "("+v4t+")"+v4s3)
-	addFormatterTest("%#v", pv4, "(*"+v4t+")"+v4s3)
-	addFormatterTest("%#v", &pv4, "(**"+v4t+")"+v4s3)
-	addFormatterTest("%#v", nv4, "(*"+v4t+")"+"<nil>")
-	addFormatterTest("%#+v", v4, "("+v4t+")"+v4s4)
-	addFormatterTest("%#+v", pv4, "(*"+v4t+")("+v4Addr+")"+v4s4)
-	addFormatterTest("%#+v", &pv4, "(**"+v4t+")("+pv4Addr+"->"+v4Addr+")"+v4s4)
-	addFormatterTest("%#+v", nv4, "(*"+v4t+")"+"<nil>")
-}
-
-func addUintptrFormatterTests() {
-	// Null pointer.
-	v := uintptr(0)
-	nv := (*uintptr)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "uintptr"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Address of real variable.
-	i := 1
-	v2 := uintptr(unsafe.Pointer(&i))
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "uintptr"
-	v2s := fmt.Sprintf("%p", &i)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addUnsafePointerFormatterTests() {
-	// Null pointer.
-	v := unsafe.Pointer(uintptr(0))
-	nv := (*unsafe.Pointer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "unsafe.Pointer"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Address of real variable.
-	i := 1
-	v2 := unsafe.Pointer(&i)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "unsafe.Pointer"
-	v2s := fmt.Sprintf("%p", &i)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addChanFormatterTests() {
-	// Nil channel.
-	var v chan int
-	pv := &v
-	nv := (*chan int)(nil)
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "chan int"
-	vs := "<nil>"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Real channel.
-	v2 := make(chan int)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "chan int"
-	v2s := fmt.Sprintf("%p", v2)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-}
-
-func addFuncFormatterTests() {
-	// Function with no params and no returns.
-	v := addIntFormatterTests
-	nv := (*func())(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "func()"
-	vs := fmt.Sprintf("%p", v)
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-
-	// Function with param and no returns.
-	v2 := TestFormatter
-	nv2 := (*func(*testing.T))(nil)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "func(*testing.T)"
-	v2s := fmt.Sprintf("%p", v2)
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s)
-	addFormatterTest("%v", &pv2, "<**>"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%+v", v2, v2s)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%+v", nv2, "<nil>")
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s)
-	addFormatterTest("%#v", nv2, "(*"+v2t+")"+"<nil>")
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s)
-	addFormatterTest("%#+v", nv2, "(*"+v2t+")"+"<nil>")
-
-	// Function with multiple params and multiple returns.
-	var v3 = func(i int, s string) (b bool, err error) {
-		return true, nil
-	}
-	nv3 := (*func(int, string) (bool, error))(nil)
-	pv3 := &v3
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "func(int, string) (bool, error)"
-	v3s := fmt.Sprintf("%p", v3)
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s)
-	addFormatterTest("%v", &pv3, "<**>"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%+v", v3, v3s)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%+v", nv3, "<nil>")
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s)
-	addFormatterTest("%#v", nv3, "(*"+v3t+")"+"<nil>")
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s)
-	addFormatterTest("%#+v", nv3, "(*"+v3t+")"+"<nil>")
-}
-
-func addCircularFormatterTests() {
-	// Struct that is circular through self referencing.
-	type circular struct {
-		c *circular
-	}
-	v := circular{nil}
-	v.c = &v
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.circular"
-	vs := "{<*>{<*><shown>}}"
-	vs2 := "{<*><shown>}"
-	vs3 := "{c:<*>(" + vAddr + "){c:<*>(" + vAddr + ")<shown>}}"
-	vs4 := "{c:<*>(" + vAddr + ")<shown>}"
-	vs5 := "{c:(*" + vt + "){c:(*" + vt + ")<shown>}}"
-	vs6 := "{c:(*" + vt + ")<shown>}"
-	vs7 := "{c:(*" + vt + ")(" + vAddr + "){c:(*" + vt + ")(" + vAddr +
-		")<shown>}}"
-	vs8 := "{c:(*" + vt + ")(" + vAddr + ")<shown>}"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs2)
-	addFormatterTest("%v", &pv, "<**>"+vs2)
-	addFormatterTest("%+v", v, vs3)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs4)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs4)
-	addFormatterTest("%#v", v, "("+vt+")"+vs5)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs6)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs6)
-	addFormatterTest("%#+v", v, "("+vt+")"+vs7)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs8)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs8)
-
-	// Structs that are circular through cross referencing.
-	v2 := xref1{nil}
-	ts2 := xref2{&v2}
-	v2.ps2 = &ts2
-	pv2 := &v2
-	ts2Addr := fmt.Sprintf("%p", &ts2)
-	v2Addr := fmt.Sprintf("%p", pv2)
-	pv2Addr := fmt.Sprintf("%p", &pv2)
-	v2t := "spew_test.xref1"
-	v2t2 := "spew_test.xref2"
-	v2s := "{<*>{<*>{<*><shown>}}}"
-	v2s2 := "{<*>{<*><shown>}}"
-	v2s3 := "{ps2:<*>(" + ts2Addr + "){ps1:<*>(" + v2Addr + "){ps2:<*>(" +
-		ts2Addr + ")<shown>}}}"
-	v2s4 := "{ps2:<*>(" + ts2Addr + "){ps1:<*>(" + v2Addr + ")<shown>}}"
-	v2s5 := "{ps2:(*" + v2t2 + "){ps1:(*" + v2t + "){ps2:(*" + v2t2 +
-		")<shown>}}}"
-	v2s6 := "{ps2:(*" + v2t2 + "){ps1:(*" + v2t + ")<shown>}}"
-	v2s7 := "{ps2:(*" + v2t2 + ")(" + ts2Addr + "){ps1:(*" + v2t +
-		")(" + v2Addr + "){ps2:(*" + v2t2 + ")(" + ts2Addr +
-		")<shown>}}}"
-	v2s8 := "{ps2:(*" + v2t2 + ")(" + ts2Addr + "){ps1:(*" + v2t +
-		")(" + v2Addr + ")<shown>}}"
-	addFormatterTest("%v", v2, v2s)
-	addFormatterTest("%v", pv2, "<*>"+v2s2)
-	addFormatterTest("%v", &pv2, "<**>"+v2s2)
-	addFormatterTest("%+v", v2, v2s3)
-	addFormatterTest("%+v", pv2, "<*>("+v2Addr+")"+v2s4)
-	addFormatterTest("%+v", &pv2, "<**>("+pv2Addr+"->"+v2Addr+")"+v2s4)
-	addFormatterTest("%#v", v2, "("+v2t+")"+v2s5)
-	addFormatterTest("%#v", pv2, "(*"+v2t+")"+v2s6)
-	addFormatterTest("%#v", &pv2, "(**"+v2t+")"+v2s6)
-	addFormatterTest("%#+v", v2, "("+v2t+")"+v2s7)
-	addFormatterTest("%#+v", pv2, "(*"+v2t+")("+v2Addr+")"+v2s8)
-	addFormatterTest("%#+v", &pv2, "(**"+v2t+")("+pv2Addr+"->"+v2Addr+")"+v2s8)
-
-	// Structs that are indirectly circular.
-	v3 := indirCir1{nil}
-	tic2 := indirCir2{nil}
-	tic3 := indirCir3{&v3}
-	tic2.ps3 = &tic3
-	v3.ps2 = &tic2
-	pv3 := &v3
-	tic2Addr := fmt.Sprintf("%p", &tic2)
-	tic3Addr := fmt.Sprintf("%p", &tic3)
-	v3Addr := fmt.Sprintf("%p", pv3)
-	pv3Addr := fmt.Sprintf("%p", &pv3)
-	v3t := "spew_test.indirCir1"
-	v3t2 := "spew_test.indirCir2"
-	v3t3 := "spew_test.indirCir3"
-	v3s := "{<*>{<*>{<*>{<*><shown>}}}}"
-	v3s2 := "{<*>{<*>{<*><shown>}}}"
-	v3s3 := "{ps2:<*>(" + tic2Addr + "){ps3:<*>(" + tic3Addr + "){ps1:<*>(" +
-		v3Addr + "){ps2:<*>(" + tic2Addr + ")<shown>}}}}"
-	v3s4 := "{ps2:<*>(" + tic2Addr + "){ps3:<*>(" + tic3Addr + "){ps1:<*>(" +
-		v3Addr + ")<shown>}}}"
-	v3s5 := "{ps2:(*" + v3t2 + "){ps3:(*" + v3t3 + "){ps1:(*" + v3t +
-		"){ps2:(*" + v3t2 + ")<shown>}}}}"
-	v3s6 := "{ps2:(*" + v3t2 + "){ps3:(*" + v3t3 + "){ps1:(*" + v3t +
-		")<shown>}}}"
-	v3s7 := "{ps2:(*" + v3t2 + ")(" + tic2Addr + "){ps3:(*" + v3t3 + ")(" +
-		tic3Addr + "){ps1:(*" + v3t + ")(" + v3Addr + "){ps2:(*" + v3t2 +
-		")(" + tic2Addr + ")<shown>}}}}"
-	v3s8 := "{ps2:(*" + v3t2 + ")(" + tic2Addr + "){ps3:(*" + v3t3 + ")(" +
-		tic3Addr + "){ps1:(*" + v3t + ")(" + v3Addr + ")<shown>}}}"
-	addFormatterTest("%v", v3, v3s)
-	addFormatterTest("%v", pv3, "<*>"+v3s2)
-	addFormatterTest("%v", &pv3, "<**>"+v3s2)
-	addFormatterTest("%+v", v3, v3s3)
-	addFormatterTest("%+v", pv3, "<*>("+v3Addr+")"+v3s4)
-	addFormatterTest("%+v", &pv3, "<**>("+pv3Addr+"->"+v3Addr+")"+v3s4)
-	addFormatterTest("%#v", v3, "("+v3t+")"+v3s5)
-	addFormatterTest("%#v", pv3, "(*"+v3t+")"+v3s6)
-	addFormatterTest("%#v", &pv3, "(**"+v3t+")"+v3s6)
-	addFormatterTest("%#+v", v3, "("+v3t+")"+v3s7)
-	addFormatterTest("%#+v", pv3, "(*"+v3t+")("+v3Addr+")"+v3s8)
-	addFormatterTest("%#+v", &pv3, "(**"+v3t+")("+pv3Addr+"->"+v3Addr+")"+v3s8)
-}
-
-func addPanicFormatterTests() {
-	// Type that panics in its Stringer interface.
-	v := panicer(127)
-	nv := (*panicer)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.panicer"
-	vs := "(PANIC=test panic)127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addErrorFormatterTests() {
-	// Type that has a custom Error interface.
-	v := customError(127)
-	nv := (*customError)(nil)
-	pv := &v
-	vAddr := fmt.Sprintf("%p", pv)
-	pvAddr := fmt.Sprintf("%p", &pv)
-	vt := "spew_test.customError"
-	vs := "error: 127"
-	addFormatterTest("%v", v, vs)
-	addFormatterTest("%v", pv, "<*>"+vs)
-	addFormatterTest("%v", &pv, "<**>"+vs)
-	addFormatterTest("%v", nv, "<nil>")
-	addFormatterTest("%+v", v, vs)
-	addFormatterTest("%+v", pv, "<*>("+vAddr+")"+vs)
-	addFormatterTest("%+v", &pv, "<**>("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%+v", nv, "<nil>")
-	addFormatterTest("%#v", v, "("+vt+")"+vs)
-	addFormatterTest("%#v", pv, "(*"+vt+")"+vs)
-	addFormatterTest("%#v", &pv, "(**"+vt+")"+vs)
-	addFormatterTest("%#v", nv, "(*"+vt+")"+"<nil>")
-	addFormatterTest("%#+v", v, "("+vt+")"+vs)
-	addFormatterTest("%#+v", pv, "(*"+vt+")("+vAddr+")"+vs)
-	addFormatterTest("%#+v", &pv, "(**"+vt+")("+pvAddr+"->"+vAddr+")"+vs)
-	addFormatterTest("%#+v", nv, "(*"+vt+")"+"<nil>")
-}
-
-func addPassthroughFormatterTests() {
-	// %x passthrough with uint.
-	v := uint(4294967295)
-	pv := &v
-	vAddr := fmt.Sprintf("%x", pv)
-	pvAddr := fmt.Sprintf("%x", &pv)
-	vs := "ffffffff"
-	addFormatterTest("%x", v, vs)
-	addFormatterTest("%x", pv, vAddr)
-	addFormatterTest("%x", &pv, pvAddr)
-
-	// %#x passthrough with uint.
-	v2 := int(2147483647)
-	pv2 := &v2
-	v2Addr := fmt.Sprintf("%#x", pv2)
-	pv2Addr := fmt.Sprintf("%#x", &pv2)
-	v2s := "0x7fffffff"
-	addFormatterTest("%#x", v2, v2s)
-	addFormatterTest("%#x", pv2, v2Addr)
-	addFormatterTest("%#x", &pv2, pv2Addr)
-
-	// %f passthrough with precision.
-	addFormatterTest("%.2f", 3.1415, "3.14")
-	addFormatterTest("%.3f", 3.1415, "3.142")
-	addFormatterTest("%.4f", 3.1415, "3.1415")
-
-	// %f passthrough with width and precision.
-	addFormatterTest("%5.2f", 3.1415, " 3.14")
-	addFormatterTest("%6.3f", 3.1415, " 3.142")
-	addFormatterTest("%7.4f", 3.1415, " 3.1415")
-
-	// %d passthrough with width.
-	addFormatterTest("%3d", 127, "127")
-	addFormatterTest("%4d", 127, " 127")
-	addFormatterTest("%5d", 127, "  127")
-
-	// %q passthrough with string.
-	addFormatterTest("%q", "test", "\"test\"")
-}
-
-// TestFormatter executes all of the tests described by formatterTests.
-func TestFormatter(t *testing.T) {
-	// Setup tests.
-	addIntFormatterTests()
-	addUintFormatterTests()
-	addBoolFormatterTests()
-	addFloatFormatterTests()
-	addComplexFormatterTests()
-	addArrayFormatterTests()
-	addSliceFormatterTests()
-	addStringFormatterTests()
-	addInterfaceFormatterTests()
-	addMapFormatterTests()
-	addStructFormatterTests()
-	addUintptrFormatterTests()
-	addUnsafePointerFormatterTests()
-	addChanFormatterTests()
-	addFuncFormatterTests()
-	addCircularFormatterTests()
-	addPanicFormatterTests()
-	addErrorFormatterTests()
-	addPassthroughFormatterTests()
-
-	t.Logf("Running %d tests", len(formatterTests))
-	for i, test := range formatterTests {
-		buf := new(bytes.Buffer)
-		spew.Fprintf(buf, test.format, test.in)
-		s := buf.String()
-		if testFailed(s, test.wants) {
-			t.Errorf("Formatter #%d format: %s got: %s %s", i, test.format, s,
-				stringizeWants(test.wants))
-			continue
-		}
-	}
-}
-
-type testStruct struct {
-	x int
-}
-
-func (ts testStruct) String() string {
-	return fmt.Sprintf("ts.%d", ts.x)
-}
-
-type testStructP struct {
-	x int
-}
-
-func (ts *testStructP) String() string {
-	return fmt.Sprintf("ts.%d", ts.x)
-}
-
-func TestPrintSortedKeys(t *testing.T) {
-	cfg := spew.ConfigState{SortKeys: true}
-	s := cfg.Sprint(map[int]string{1: "1", 3: "3", 2: "2"})
-	expected := "map[1:1 2:2 3:3]"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch 1:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sprint(map[stringer]int{"1": 1, "3": 3, "2": 2})
-	expected = "map[stringer 1:1 stringer 2:2 stringer 3:3]"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch 2:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sprint(map[pstringer]int{pstringer("1"): 1, pstringer("3"): 3, pstringer("2"): 2})
-	expected = "map[stringer 1:1 stringer 2:2 stringer 3:3]"
-	if spew.UnsafeDisabled {
-		expected = "map[1:1 2:2 3:3]"
-	}
-	if s != expected {
-		t.Errorf("Sorted keys mismatch 3:\n  %v %v", s, expected)
-	}
-
-	s = cfg.Sprint(map[testStruct]int{testStruct{1}: 1, testStruct{3}: 3, testStruct{2}: 2})
-	expected = "map[ts.1:1 ts.2:2 ts.3:3]"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch 4:\n  %v %v", s, expected)
-	}
-
-	if !spew.UnsafeDisabled {
-		s = cfg.Sprint(map[testStructP]int{testStructP{1}: 1, testStructP{3}: 3, testStructP{2}: 2})
-		expected = "map[ts.1:1 ts.2:2 ts.3:3]"
-		if s != expected {
-			t.Errorf("Sorted keys mismatch 5:\n  %v %v", s, expected)
-		}
-	}
-
-	s = cfg.Sprint(map[customError]int{customError(1): 1, customError(3): 3, customError(2): 2})
-	expected = "map[error: 1:1 error: 2:2 error: 3:3]"
-	if s != expected {
-		t.Errorf("Sorted keys mismatch 6:\n  %v %v", s, expected)
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/internal_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/internal_test.go
deleted file mode 100644
index 20a9cfefc6..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/internal_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-This test file is part of the spew package rather than than the spew_test
-package because it needs access to internals to properly test certain cases
-which are not possible via the public interface since they should never happen.
-*/
-
-package spew
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-)
-
-// dummyFmtState implements a fake fmt.State to use for testing invalid
-// reflect.Value handling.  This is necessary because the fmt package catches
-// invalid values before invoking the formatter on them.
-type dummyFmtState struct {
-	bytes.Buffer
-}
-
-func (dfs *dummyFmtState) Flag(f int) bool {
-	if f == int('+') {
-		return true
-	}
-	return false
-}
-
-func (dfs *dummyFmtState) Precision() (int, bool) {
-	return 0, false
-}
-
-func (dfs *dummyFmtState) Width() (int, bool) {
-	return 0, false
-}
-
-// TestInvalidReflectValue ensures the dump and formatter code handles an
-// invalid reflect value properly.  This needs access to internal state since it
-// should never happen in real code and therefore can't be tested via the public
-// API.
-func TestInvalidReflectValue(t *testing.T) {
-	i := 1
-
-	// Dump invalid reflect value.
-	v := new(reflect.Value)
-	buf := new(bytes.Buffer)
-	d := dumpState{w: buf, cs: &Config}
-	d.dump(*v)
-	s := buf.String()
-	want := "<invalid>"
-	if s != want {
-		t.Errorf("InvalidReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter invalid reflect value.
-	buf2 := new(dummyFmtState)
-	f := formatState{value: *v, cs: &Config, fs: buf2}
-	f.format(*v)
-	s = buf2.String()
-	want = "<invalid>"
-	if s != want {
-		t.Errorf("InvalidReflectValue #%d got: %s want: %s", i, s, want)
-	}
-}
-
-// SortValues makes the internal sortValues function available to the test
-// package.
-func SortValues(values []reflect.Value, cs *ConfigState) {
-	sortValues(values, cs)
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/internalunsafe_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/internalunsafe_test.go
deleted file mode 100644
index a0c612ec3d..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/internalunsafe_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
-
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when the code is not running on Google App Engine, compiled by GopherJS, and
-// "-tags safe" is not added to the go build command line.  The "disableunsafe"
-// tag is deprecated and thus should not be used.
-// +build !js,!appengine,!safe,!disableunsafe
-
-/*
-This test file is part of the spew package rather than than the spew_test
-package because it needs access to internals to properly test certain cases
-which are not possible via the public interface since they should never happen.
-*/
-
-package spew
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-	"unsafe"
-)
-
-// changeKind uses unsafe to intentionally change the kind of a reflect.Value to
-// the maximum kind value which does not exist.  This is needed to test the
-// fallback code which punts to the standard fmt library for new types that
-// might get added to the language.
-func changeKind(v *reflect.Value, readOnly bool) {
-	rvf := (*uintptr)(unsafe.Pointer(uintptr(unsafe.Pointer(v)) + offsetFlag))
-	*rvf = *rvf | ((1<<flagKindWidth - 1) << flagKindShift)
-	if readOnly {
-		*rvf |= flagRO
-	} else {
-		*rvf &= ^uintptr(flagRO)
-	}
-}
-
-// TestAddedReflectValue tests functionaly of the dump and formatter code which
-// falls back to the standard fmt library for new types that might get added to
-// the language.
-func TestAddedReflectValue(t *testing.T) {
-	i := 1
-
-	// Dump using a reflect.Value that is exported.
-	v := reflect.ValueOf(int8(5))
-	changeKind(&v, false)
-	buf := new(bytes.Buffer)
-	d := dumpState{w: buf, cs: &Config}
-	d.dump(v)
-	s := buf.String()
-	want := "(int8) 5"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Dump using a reflect.Value that is not exported.
-	changeKind(&v, true)
-	buf.Reset()
-	d.dump(v)
-	s = buf.String()
-	want = "(int8) <int8 Value>"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d\n got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter using a reflect.Value that is exported.
-	changeKind(&v, false)
-	buf2 := new(dummyFmtState)
-	f := formatState{value: v, cs: &Config, fs: buf2}
-	f.format(v)
-	s = buf2.String()
-	want = "5"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d got: %s want: %s", i, s, want)
-	}
-	i++
-
-	// Formatter using a reflect.Value that is not exported.
-	changeKind(&v, true)
-	buf2.Reset()
-	f = formatState{value: v, cs: &Config, fs: buf2}
-	f.format(v)
-	s = buf2.String()
-	want = "<int8 Value>"
-	if s != want {
-		t.Errorf("TestAddedReflectValue #%d got: %s want: %s", i, s, want)
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/spew_test.go b/installer/vendor/github.com/davecgh/go-spew/spew/spew_test.go
deleted file mode 100644
index b70466c69f..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/spew_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-/*
- * Copyright (c) 2013-2016 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package spew_test
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// spewFunc is used to identify which public function of the spew package or
-// ConfigState a test applies to.
-type spewFunc int
-
-const (
-	fCSFdump spewFunc = iota
-	fCSFprint
-	fCSFprintf
-	fCSFprintln
-	fCSPrint
-	fCSPrintln
-	fCSSdump
-	fCSSprint
-	fCSSprintf
-	fCSSprintln
-	fCSErrorf
-	fCSNewFormatter
-	fErrorf
-	fFprint
-	fFprintln
-	fPrint
-	fPrintln
-	fSdump
-	fSprint
-	fSprintf
-	fSprintln
-)
-
-// Map of spewFunc values to names for pretty printing.
-var spewFuncStrings = map[spewFunc]string{
-	fCSFdump:        "ConfigState.Fdump",
-	fCSFprint:       "ConfigState.Fprint",
-	fCSFprintf:      "ConfigState.Fprintf",
-	fCSFprintln:     "ConfigState.Fprintln",
-	fCSSdump:        "ConfigState.Sdump",
-	fCSPrint:        "ConfigState.Print",
-	fCSPrintln:      "ConfigState.Println",
-	fCSSprint:       "ConfigState.Sprint",
-	fCSSprintf:      "ConfigState.Sprintf",
-	fCSSprintln:     "ConfigState.Sprintln",
-	fCSErrorf:       "ConfigState.Errorf",
-	fCSNewFormatter: "ConfigState.NewFormatter",
-	fErrorf:         "spew.Errorf",
-	fFprint:         "spew.Fprint",
-	fFprintln:       "spew.Fprintln",
-	fPrint:          "spew.Print",
-	fPrintln:        "spew.Println",
-	fSdump:          "spew.Sdump",
-	fSprint:         "spew.Sprint",
-	fSprintf:        "spew.Sprintf",
-	fSprintln:       "spew.Sprintln",
-}
-
-func (f spewFunc) String() string {
-	if s, ok := spewFuncStrings[f]; ok {
-		return s
-	}
-	return fmt.Sprintf("Unknown spewFunc (%d)", int(f))
-}
-
-// spewTest is used to describe a test to be performed against the public
-// functions of the spew package or ConfigState.
-type spewTest struct {
-	cs     *spew.ConfigState
-	f      spewFunc
-	format string
-	in     interface{}
-	want   string
-}
-
-// spewTests houses the tests to be performed against the public functions of
-// the spew package and ConfigState.
-//
-// These tests are only intended to ensure the public functions are exercised
-// and are intentionally not exhaustive of types.  The exhaustive type
-// tests are handled in the dump and format tests.
-var spewTests []spewTest
-
-// redirStdout is a helper function to return the standard output from f as a
-// byte slice.
-func redirStdout(f func()) ([]byte, error) {
-	tempFile, err := ioutil.TempFile("", "ss-test")
-	if err != nil {
-		return nil, err
-	}
-	fileName := tempFile.Name()
-	defer os.Remove(fileName) // Ignore error
-
-	origStdout := os.Stdout
-	os.Stdout = tempFile
-	f()
-	os.Stdout = origStdout
-	tempFile.Close()
-
-	return ioutil.ReadFile(fileName)
-}
-
-func initSpewTests() {
-	// Config states with various settings.
-	scsDefault := spew.NewDefaultConfig()
-	scsNoMethods := &spew.ConfigState{Indent: " ", DisableMethods: true}
-	scsNoPmethods := &spew.ConfigState{Indent: " ", DisablePointerMethods: true}
-	scsMaxDepth := &spew.ConfigState{Indent: " ", MaxDepth: 1}
-	scsContinue := &spew.ConfigState{Indent: " ", ContinueOnMethod: true}
-	scsNoPtrAddr := &spew.ConfigState{DisablePointerAddresses: true}
-	scsNoCap := &spew.ConfigState{DisableCapacities: true}
-
-	// Variables for tests on types which implement Stringer interface with and
-	// without a pointer receiver.
-	ts := stringer("test")
-	tps := pstringer("test")
-
-	type ptrTester struct {
-		s *struct{}
-	}
-	tptr := &ptrTester{s: &struct{}{}}
-
-	// depthTester is used to test max depth handling for structs, array, slices
-	// and maps.
-	type depthTester struct {
-		ic    indirCir1
-		arr   [1]string
-		slice []string
-		m     map[string]int
-	}
-	dt := depthTester{indirCir1{nil}, [1]string{"arr"}, []string{"slice"},
-		map[string]int{"one": 1}}
-
-	// Variable for tests on types which implement error interface.
-	te := customError(10)
-
-	spewTests = []spewTest{
-		{scsDefault, fCSFdump, "", int8(127), "(int8) 127\n"},
-		{scsDefault, fCSFprint, "", int16(32767), "32767"},
-		{scsDefault, fCSFprintf, "%v", int32(2147483647), "2147483647"},
-		{scsDefault, fCSFprintln, "", int(2147483647), "2147483647\n"},
-		{scsDefault, fCSPrint, "", int64(9223372036854775807), "9223372036854775807"},
-		{scsDefault, fCSPrintln, "", uint8(255), "255\n"},
-		{scsDefault, fCSSdump, "", uint8(64), "(uint8) 64\n"},
-		{scsDefault, fCSSprint, "", complex(1, 2), "(1+2i)"},
-		{scsDefault, fCSSprintf, "%v", complex(float32(3), 4), "(3+4i)"},
-		{scsDefault, fCSSprintln, "", complex(float64(5), 6), "(5+6i)\n"},
-		{scsDefault, fCSErrorf, "%#v", uint16(65535), "(uint16)65535"},
-		{scsDefault, fCSNewFormatter, "%v", uint32(4294967295), "4294967295"},
-		{scsDefault, fErrorf, "%v", uint64(18446744073709551615), "18446744073709551615"},
-		{scsDefault, fFprint, "", float32(3.14), "3.14"},
-		{scsDefault, fFprintln, "", float64(6.28), "6.28\n"},
-		{scsDefault, fPrint, "", true, "true"},
-		{scsDefault, fPrintln, "", false, "false\n"},
-		{scsDefault, fSdump, "", complex(-10, -20), "(complex128) (-10-20i)\n"},
-		{scsDefault, fSprint, "", complex(-1, -2), "(-1-2i)"},
-		{scsDefault, fSprintf, "%v", complex(float32(-3), -4), "(-3-4i)"},
-		{scsDefault, fSprintln, "", complex(float64(-5), -6), "(-5-6i)\n"},
-		{scsNoMethods, fCSFprint, "", ts, "test"},
-		{scsNoMethods, fCSFprint, "", &ts, "<*>test"},
-		{scsNoMethods, fCSFprint, "", tps, "test"},
-		{scsNoMethods, fCSFprint, "", &tps, "<*>test"},
-		{scsNoPmethods, fCSFprint, "", ts, "stringer test"},
-		{scsNoPmethods, fCSFprint, "", &ts, "<*>stringer test"},
-		{scsNoPmethods, fCSFprint, "", tps, "test"},
-		{scsNoPmethods, fCSFprint, "", &tps, "<*>stringer test"},
-		{scsMaxDepth, fCSFprint, "", dt, "{{<max>} [<max>] [<max>] map[<max>]}"},
-		{scsMaxDepth, fCSFdump, "", dt, "(spew_test.depthTester) {\n" +
-			" ic: (spew_test.indirCir1) {\n  <max depth reached>\n },\n" +
-			" arr: ([1]string) (len=1 cap=1) {\n  <max depth reached>\n },\n" +
-			" slice: ([]string) (len=1 cap=1) {\n  <max depth reached>\n },\n" +
-			" m: (map[string]int) (len=1) {\n  <max depth reached>\n }\n}\n"},
-		{scsContinue, fCSFprint, "", ts, "(stringer test) test"},
-		{scsContinue, fCSFdump, "", ts, "(spew_test.stringer) " +
-			"(len=4) (stringer test) \"test\"\n"},
-		{scsContinue, fCSFprint, "", te, "(error: 10) 10"},
-		{scsContinue, fCSFdump, "", te, "(spew_test.customError) " +
-			"(error: 10) 10\n"},
-		{scsNoPtrAddr, fCSFprint, "", tptr, "<*>{<*>{}}"},
-		{scsNoPtrAddr, fCSSdump, "", tptr, "(*spew_test.ptrTester)({\ns: (*struct {})({\n})\n})\n"},
-		{scsNoCap, fCSSdump, "", make([]string, 0, 10), "([]string) {\n}\n"},
-		{scsNoCap, fCSSdump, "", make([]string, 1, 10), "([]string) (len=1) {\n(string) \"\"\n}\n"},
-	}
-}
-
-// TestSpew executes all of the tests described by spewTests.
-func TestSpew(t *testing.T) {
-	initSpewTests()
-
-	t.Logf("Running %d tests", len(spewTests))
-	for i, test := range spewTests {
-		buf := new(bytes.Buffer)
-		switch test.f {
-		case fCSFdump:
-			test.cs.Fdump(buf, test.in)
-
-		case fCSFprint:
-			test.cs.Fprint(buf, test.in)
-
-		case fCSFprintf:
-			test.cs.Fprintf(buf, test.format, test.in)
-
-		case fCSFprintln:
-			test.cs.Fprintln(buf, test.in)
-
-		case fCSPrint:
-			b, err := redirStdout(func() { test.cs.Print(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fCSPrintln:
-			b, err := redirStdout(func() { test.cs.Println(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fCSSdump:
-			str := test.cs.Sdump(test.in)
-			buf.WriteString(str)
-
-		case fCSSprint:
-			str := test.cs.Sprint(test.in)
-			buf.WriteString(str)
-
-		case fCSSprintf:
-			str := test.cs.Sprintf(test.format, test.in)
-			buf.WriteString(str)
-
-		case fCSSprintln:
-			str := test.cs.Sprintln(test.in)
-			buf.WriteString(str)
-
-		case fCSErrorf:
-			err := test.cs.Errorf(test.format, test.in)
-			buf.WriteString(err.Error())
-
-		case fCSNewFormatter:
-			fmt.Fprintf(buf, test.format, test.cs.NewFormatter(test.in))
-
-		case fErrorf:
-			err := spew.Errorf(test.format, test.in)
-			buf.WriteString(err.Error())
-
-		case fFprint:
-			spew.Fprint(buf, test.in)
-
-		case fFprintln:
-			spew.Fprintln(buf, test.in)
-
-		case fPrint:
-			b, err := redirStdout(func() { spew.Print(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fPrintln:
-			b, err := redirStdout(func() { spew.Println(test.in) })
-			if err != nil {
-				t.Errorf("%v #%d %v", test.f, i, err)
-				continue
-			}
-			buf.Write(b)
-
-		case fSdump:
-			str := spew.Sdump(test.in)
-			buf.WriteString(str)
-
-		case fSprint:
-			str := spew.Sprint(test.in)
-			buf.WriteString(str)
-
-		case fSprintf:
-			str := spew.Sprintf(test.format, test.in)
-			buf.WriteString(str)
-
-		case fSprintln:
-			str := spew.Sprintln(test.in)
-			buf.WriteString(str)
-
-		default:
-			t.Errorf("%v #%d unrecognized function", test.f, i)
-			continue
-		}
-		s := buf.String()
-		if test.want != s {
-			t.Errorf("ConfigState #%d\n got: %s want: %s", i, s, test.want)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/spew/testdata/dumpcgo.go b/installer/vendor/github.com/davecgh/go-spew/spew/testdata/dumpcgo.go
deleted file mode 100644
index 5c87dd456e..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/spew/testdata/dumpcgo.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright (c) 2013 Dave Collins <dave@davec.name>
-//
-// Permission to use, copy, modify, and distribute this software for any
-// purpose with or without fee is hereby granted, provided that the above
-// copyright notice and this permission notice appear in all copies.
-//
-// THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-// WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-// MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-// ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-// WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-// ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-// OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-// NOTE: Due to the following build constraints, this file will only be compiled
-// when both cgo is supported and "-tags testcgo" is added to the go test
-// command line.  This code should really only be in the dumpcgo_test.go file,
-// but unfortunately Go will not allow cgo in test files, so this is a
-// workaround to allow cgo types to be tested.  This configuration is used
-// because spew itself does not require cgo to run even though it does handle
-// certain cgo types specially.  Rather than forcing all clients to require cgo
-// and an external C compiler just to run the tests, this scheme makes them
-// optional.
-// +build cgo,testcgo
-
-package testdata
-
-/*
-#include <stdint.h>
-typedef unsigned char custom_uchar_t;
-
-char            *ncp = 0;
-char            *cp = "test";
-char             ca[6] = {'t', 'e', 's', 't', '2', '\0'};
-unsigned char    uca[6] = {'t', 'e', 's', 't', '3', '\0'};
-signed char      sca[6] = {'t', 'e', 's', 't', '4', '\0'};
-uint8_t          ui8ta[6] = {'t', 'e', 's', 't', '5', '\0'};
-custom_uchar_t   tuca[6] = {'t', 'e', 's', 't', '6', '\0'};
-*/
-import "C"
-
-// GetCgoNullCharPointer returns a null char pointer via cgo.  This is only
-// used for tests.
-func GetCgoNullCharPointer() interface{} {
-	return C.ncp
-}
-
-// GetCgoCharPointer returns a char pointer via cgo.  This is only used for
-// tests.
-func GetCgoCharPointer() interface{} {
-	return C.cp
-}
-
-// GetCgoCharArray returns a char array via cgo and the array's len and cap.
-// This is only used for tests.
-func GetCgoCharArray() (interface{}, int, int) {
-	return C.ca, len(C.ca), cap(C.ca)
-}
-
-// GetCgoUnsignedCharArray returns an unsigned char array via cgo and the
-// array's len and cap.  This is only used for tests.
-func GetCgoUnsignedCharArray() (interface{}, int, int) {
-	return C.uca, len(C.uca), cap(C.uca)
-}
-
-// GetCgoSignedCharArray returns a signed char array via cgo and the array's len
-// and cap.  This is only used for tests.
-func GetCgoSignedCharArray() (interface{}, int, int) {
-	return C.sca, len(C.sca), cap(C.sca)
-}
-
-// GetCgoUint8tArray returns a uint8_t array via cgo and the array's len and
-// cap.  This is only used for tests.
-func GetCgoUint8tArray() (interface{}, int, int) {
-	return C.ui8ta, len(C.ui8ta), cap(C.ui8ta)
-}
-
-// GetCgoTypdefedUnsignedCharArray returns a typedefed unsigned char array via
-// cgo and the array's len and cap.  This is only used for tests.
-func GetCgoTypdefedUnsignedCharArray() (interface{}, int, int) {
-	return C.tuca, len(C.tuca), cap(C.tuca)
-}
diff --git a/installer/vendor/github.com/davecgh/go-spew/test_coverage.txt b/installer/vendor/github.com/davecgh/go-spew/test_coverage.txt
deleted file mode 100644
index 2cd087a2a1..0000000000
--- a/installer/vendor/github.com/davecgh/go-spew/test_coverage.txt
+++ /dev/null
@@ -1,61 +0,0 @@
-
-github.com/davecgh/go-spew/spew/dump.go		 dumpState.dump			 100.00% (88/88)
-github.com/davecgh/go-spew/spew/format.go	 formatState.format		 100.00% (82/82)
-github.com/davecgh/go-spew/spew/format.go	 formatState.formatPtr		 100.00% (52/52)
-github.com/davecgh/go-spew/spew/dump.go		 dumpState.dumpPtr		 100.00% (44/44)
-github.com/davecgh/go-spew/spew/dump.go		 dumpState.dumpSlice		 100.00% (39/39)
-github.com/davecgh/go-spew/spew/common.go	 handleMethods			 100.00% (30/30)
-github.com/davecgh/go-spew/spew/common.go	 printHexPtr			 100.00% (18/18)
-github.com/davecgh/go-spew/spew/common.go	 unsafeReflectValue		 100.00% (13/13)
-github.com/davecgh/go-spew/spew/format.go	 formatState.constructOrigFormat 100.00% (12/12)
-github.com/davecgh/go-spew/spew/dump.go		 fdump				 100.00% (11/11)
-github.com/davecgh/go-spew/spew/format.go	 formatState.Format		 100.00% (11/11)
-github.com/davecgh/go-spew/spew/common.go	 init				 100.00% (10/10)
-github.com/davecgh/go-spew/spew/common.go	 printComplex			 100.00% (9/9)
-github.com/davecgh/go-spew/spew/common.go	 valuesSorter.Less		 100.00% (8/8)
-github.com/davecgh/go-spew/spew/format.go	 formatState.buildDefaultFormat	 100.00% (7/7)
-github.com/davecgh/go-spew/spew/format.go	 formatState.unpackValue	 100.00% (5/5)
-github.com/davecgh/go-spew/spew/dump.go		 dumpState.indent		 100.00% (4/4)
-github.com/davecgh/go-spew/spew/common.go	 catchPanic			 100.00% (4/4)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.convertArgs	 100.00% (4/4)
-github.com/davecgh/go-spew/spew/spew.go		 convertArgs			 100.00% (4/4)
-github.com/davecgh/go-spew/spew/format.go	 newFormatter			 100.00% (3/3)
-github.com/davecgh/go-spew/spew/dump.go		 Sdump				 100.00% (3/3)
-github.com/davecgh/go-spew/spew/common.go	 printBool			 100.00% (3/3)
-github.com/davecgh/go-spew/spew/common.go	 sortValues			 100.00% (3/3)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Sdump		 100.00% (3/3)
-github.com/davecgh/go-spew/spew/dump.go		 dumpState.unpackValue		 100.00% (3/3)
-github.com/davecgh/go-spew/spew/spew.go		 Printf				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Println			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Sprint				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Sprintf			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Sprintln			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/common.go	 printFloat			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 NewDefaultConfig		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/common.go	 printInt			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/common.go	 printUint			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/common.go	 valuesSorter.Len		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/common.go	 valuesSorter.Swap		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Errorf		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Fprint		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Fprintf		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Fprintln		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Print		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Printf		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Println		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Sprint		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Sprintf		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Sprintln		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.NewFormatter	 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Fdump		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/config.go	 ConfigState.Dump		 100.00% (1/1)
-github.com/davecgh/go-spew/spew/dump.go		 Fdump				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/dump.go		 Dump				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Fprintln			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/format.go	 NewFormatter			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Errorf				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Fprint				 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Fprintf			 100.00% (1/1)
-github.com/davecgh/go-spew/spew/spew.go		 Print				 100.00% (1/1)
-github.com/davecgh/go-spew/spew			 ------------------------------- 100.00% (505/505)
-
diff --git a/installer/vendor/github.com/davecgh/go-xdr/.gitignore b/installer/vendor/github.com/davecgh/go-xdr/.gitignore
deleted file mode 100644
index 00268614f0..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/.gitignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/installer/vendor/github.com/davecgh/go-xdr/.travis.yml b/installer/vendor/github.com/davecgh/go-xdr/.travis.yml
deleted file mode 100644
index 25fcfb11c0..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: go
-go:
-  - 1.6.3
-  - 1.7.3
-sudo: false
-install:
-  - go get -d -t -v ./...
-  - go get -v golang.org/x/tools/cover
-  - go get -v github.com/bradfitz/goimports
-  - go get -v github.com/golang/lint/golint
-script:
-  - export PATH=$PATH:$HOME/gopath/bin
-  - ./goclean.sh
-after_success:
-  - go get -v github.com/mattn/goveralls
-  - goveralls -coverprofile=xdr2/profile.cov -service=travis-ci
diff --git a/installer/vendor/github.com/davecgh/go-xdr/README.md b/installer/vendor/github.com/davecgh/go-xdr/README.md
deleted file mode 100644
index bf14be3100..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/README.md
+++ /dev/null
@@ -1,146 +0,0 @@
-go-xdr
-======
-
-[![Build Status](https://travis-ci.org/davecgh/go-xdr.png?branch=master)]
-(https://travis-ci.org/davecgh/go-xdr) [![Coverage Status]
-(https://coveralls.io/repos/davecgh/go-xdr/badge.png?branch=master)]
-(https://coveralls.io/r/davecgh/go-xdr?branch=master)
-
-Go-xdr implements the data representation portion of the External Data
-Representation (XDR) standard protocol as specified in RFC 4506 (obsoletes RFC
-1832 and RFC 1014) in Pure Go (Golang).  A comprehensive suite of tests are
-provided to ensure proper functionality.  It is licensed under the liberal ISC
-license, so it may be used in open source or commercial projects.
-
-NOTE: Version 1 of this package is still available via the
-github.com/davecgh/go-xdr/xdr import path to avoid breaking existing clients.  However, it is highly recommended that all old clients upgrade to version 2
-and all new clients use version 2.  In addition to some speed optimizations,
-version 2 has been been updated to work with standard the io.Reader and
-io.Writer interfaces instead of raw byte slices.  This allows it to be much more
-flexible and work directly with files, network connections, etc.
-
-## Documentation
-
-[![GoDoc](https://godoc.org/github.com/davecgh/go-xdr/xdr2?status.png)]
-(http://godoc.org/github.com/davecgh/go-xdr/xdr2)
-
-Full `go doc` style documentation for the project can be viewed online without
-installing this package by using the excellent GoDoc site here:
-http://godoc.org/github.com/davecgh/go-xdr/xdr2
-
-You can also view the documentation locally once the package is installed with
-the `godoc` tool by running `godoc -http=":6060"` and pointing your browser to
-http://localhost:6060/pkg/github.com/davecgh/go-xdr/xdr2/
-
-## Installation
-
-```bash
-$ go get github.com/davecgh/go-xdr/xdr2
-```
-
-## Sample Decode Program
-
-```Go
-package main
-
-import (
-	"bytes"
-    "fmt"
-
-    "github.com/davecgh/go-xdr/xdr2"
-)
-
-func main() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// XDR encoded data described by the above structure.  Typically this would
-	// be read from a file or across the network, but use a manual byte array
-	// here as an example.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00, // Signature
-		0x00, 0x00, 0x00, 0x02, // Version
-		0x00, 0x00, 0x00, 0x01, // IsGrayscale
-		0x00, 0x00, 0x00, 0x0A, // NumSections
-	}
-
-	// Declare a variable to provide Unmarshal with a concrete type and instance
-	// to decode into.
-	var h ImageHeader
-	bytesRead, err := xdr.Unmarshal(bytes.NewReader(encodedData), &h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-  
-	fmt.Println("bytes read:", bytesRead)
-	fmt.Printf("h: %+v", h)
-}
-```
-
-The struct instance, `h`, will then contain the following values:
-
-```Go
-h.Signature = [3]byte{0xAB, 0xCD, 0xEF}
-h.Version = 2
-h.IsGrayscale = true
-h.NumSections = 10
-```
-
-## Sample Encode Program
-
-```Go
-package main
-
-import (
-	"bytes"
-    "fmt"
-
-    "github.com/davecgh/go-xdr/xdr2"
-)
-
-func main() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// Sample image header data.
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-
-	// Use marshal to automatically determine the appropriate underlying XDR
-	// types and encode.
-	var w bytes.Buffer
-	bytesWritten, err := xdr.Marshal(&w, &h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	encodedData := w.Bytes()
-	fmt.Println("bytes written:", bytesWritten)
-	fmt.Println("encoded data:", encodedData)
-}
-```
-
-The result, `encodedData`, will then contain the following XDR encoded byte
-sequence:
-
-```
-0xAB, 0xCD, 0xEF, 0x00,
-0x00, 0x00, 0x00, 0x02,
-0x00, 0x00, 0x00, 0x01,
-0x00, 0x00, 0x00, 0x0A,
-```
-
-## License
-
-Go-xdr is licensed under the liberal ISC License.
diff --git a/installer/vendor/github.com/davecgh/go-xdr/goclean.sh b/installer/vendor/github.com/davecgh/go-xdr/goclean.sh
deleted file mode 100755
index 5e996cb00f..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/goclean.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/bash
-# The script does automatic checking on a Go package and its sub-packages, including:
-# 1. gofmt         (http://golang.org/cmd/gofmt/)
-# 2. goimports     (https://github.com/bradfitz/goimports)
-# 3. golint        (https://github.com/golang/lint)
-# 4. go vet        (http://golang.org/cmd/vet)
-# 5. test coverage (http://blog.golang.org/cover)
-
-set -e
-
-# Automatic checks
-cd xdr2
-test -z "$(gofmt -l -w .     | tee /dev/stderr)"
-test -z "$(goimports -l -w . | tee /dev/stderr)"
-test -z "$(golint .          | tee /dev/stderr)"
-go vet ./...
-env GORACE="halt_on_error=1" go test -v -race ./...
-
-# Run test coverage on each subdirectories and merge the coverage profile.
-
-echo "mode: count" > profile.cov
-
-# Standard go tooling behavior is to ignore dirs with leading underscores.
-for dir in $(find . -maxdepth 10 -not -path './.git*' -not -path '*/_*' -type d);
-do
-if ls $dir/*.go &> /dev/null; then
-  go test -covermode=count -coverprofile=$dir/profile.tmp $dir
-  if [ -f $dir/profile.tmp ]; then
-    cat $dir/profile.tmp | tail -n +2 >> profile.cov
-    rm $dir/profile.tmp
-  fi
-fi
-done
-
-go tool cover -func profile.cov
-
-# To submit the test coverage result to coveralls.io,
-# use goveralls (https://github.com/mattn/goveralls)
-# goveralls -coverprofile=profile.cov -service=travis-ci
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/bench_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/bench_test.go
deleted file mode 100644
index c866d907a7..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/bench_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2012 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"testing"
-	"unsafe"
-
-	"github.com/davecgh/go-xdr/xdr"
-)
-
-func BenchmarkUnmarshal(b *testing.B) {
-	b.StopTimer()
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-	// XDR encoded data described by the above structure.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00,
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x0A}
-	var h ImageHeader
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = xdr.Unmarshal(encodedData, &h)
-	}
-	b.SetBytes(int64(len(encodedData)))
-}
-
-func BenchmarkMarshal(b *testing.B) {
-	b.StopTimer()
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-	size := unsafe.Sizeof(h)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		_, _ = xdr.Marshal(&h)
-	}
-	b.SetBytes(int64(size))
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/decode.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/decode.go
deleted file mode 100644
index 5eaf52d7d9..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/decode.go
+++ /dev/null
@@ -1,784 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"time"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-var errMaxSlice = "data exceeds max slice limit"
-var errInsufficientBytes = "insufficient bytes to decode %d bytes"
-var errInsufficientPad = "insufficient pad bytes to decode %d bytes"
-
-/*
-Unmarshal parses XDR-encoded data into the value pointed to by v.  An
-addressable pointer must be provided since Unmarshal needs to both store the
-result of the decode as well as obtain target type information.  Unmarhsal
-traverses v recursively and automatically indirects pointers through arbitrary
-depth, allocating them as necessary, to decode the data into the underlying value
-pointed to.
-
-Unmarshal uses reflection to determine the type of the concrete value contained
-by v and performs a mapping of underlying XDR types to Go types as follows:
-
-	Go Type <- XDR Type
-	--------------------
-	int8, int16, int32, int <- XDR Integer
-	uint8, uint16, uint32, uint <- XDR Unsigned Integer
-	int64 <- XDR Hyper Integer
-	uint64 <- XDR Unsigned Hyper Integer
-	bool <- XDR Boolean
-	float32 <- XDR Floating-Point
-	float64 <- XDR Double-Precision Floating-Point
-	string <- XDR String
-	byte <- XDR Integer
-	[]byte <- XDR Variable-Length Opaque Data
-	[#]byte <- XDR Fixed-Length Opaque Data
-	[]<type> <- XDR Variable-Length Array
-	[#]<type> <- XDR Fixed-Length Array
-	struct <- XDR Structure
-	map <- XDR Variable-Length Array of two-element XDR Structures
-	time.Time <- XDR String encoded with RFC3339 nanosecond precision
-
-Notes and Limitations:
-
-	* Automatic unmarshalling of variable and fixed-length arrays of uint8s
-	  requires a special struct tag `xdropaque:"false"` since byte slices and
-	  byte arrays are assumed to be opaque data and byte is a Go alias for uint8
-	  thus indistinguishable under reflection
-	* Cyclic data structures are not supported and will result in infinite loops
-
-If any issues are encountered during the unmarshalling process, an
-UnmarshalError is returned with a human readable description as well as
-an ErrorCode value for further inspection from sophisticated callers.  Some
-potential issues are unsupported Go types, attempting to decode a value which is
-too large to fit into a specified Go type, and exceeding max slice limitations.
-*/
-func Unmarshal(data []byte, v interface{}) (rest []byte, err error) {
-	if v == nil {
-		msg := "can't unmarshal to nil interface"
-		err = unmarshalError("Unmarshal", ErrNilInterface, msg, nil)
-		return data, err
-	}
-
-	vv := reflect.ValueOf(v)
-	if vv.Kind() != reflect.Ptr {
-		msg := fmt.Sprintf("can't unmarshal to non-pointer '%v' - use & operator",
-			vv.Type().String())
-		err = unmarshalError("Unmarshal", ErrBadArguments, msg, nil)
-		return data, err
-	}
-	if vv.IsNil() && !vv.CanSet() {
-		msg := fmt.Sprintf("can't unmarshal to unsettable '%v' - use & operator",
-			vv.Type().String())
-		err = unmarshalError("Unmarshal", ErrNotSettable, msg, nil)
-		return data, err
-	}
-
-	d := Decoder{data: data, off: 0}
-	err = d.decode(vv)
-	return d.data, err
-}
-
-// A Decoder contains information about the state of a decode operation
-// from an XDR-encoded byte slice into interface values and provides several
-// exposed methods to manually decode various XDR primitives without relying
-// on reflection.  The NewDecoder function can be used to get a new Decoder
-// directly.
-//
-// Typically, Unmarshal should be used instead of manual decoding.  A
-// Decoder is exposed so it is possible to perform manual decoding should it be
-// necessary in complex scenarios where automatic reflection-based decoding
-// won't work.
-type Decoder struct {
-	data []byte
-	off  int
-}
-
-// DecodeInt treats the next 4 bytes as an XDR encoded integer and returns the
-// result as an int32.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.1 - Integer
-// 	32-bit big-endian signed integer in range [-2147483648, 2147483647]
-func (d *Decoder) DecodeInt() (rv int32, err error) {
-	data := d.data
-	if len(data) < 4 {
-		msg := fmt.Sprintf(errInsufficientBytes, 4)
-		err = unmarshalError("DecodeInt", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	rv = int32(data[3]) | int32(data[2])<<8 |
-		int32(data[1])<<16 | int32(data[0])<<24
-
-	d.data = data[4:]
-	return
-}
-
-// DecodeUint treats the next 4 bytes as an XDR encoded unsigned integer and
-// returns the result as a uint32.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.2 - Unsigned Integer
-// 	32-bit big-endian unsigned integer in range [0, 4294967295]
-func (d *Decoder) DecodeUint() (rv uint32, err error) {
-	data := d.data
-	if len(data) < 4 {
-		msg := fmt.Sprintf(errInsufficientBytes, 4)
-		err = unmarshalError("DecodeUint", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	rv = uint32(data[3]) | uint32(data[2])<<8 |
-		uint32(data[1])<<16 | uint32(data[0])<<24
-
-	d.data = data[4:]
-	return
-}
-
-// DecodeEnum treats the next 4 bytes as an XDR encoded enumeration value and
-// returns the result as an int32 after verifying that the value is in the
-// provided map of valid values.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining or
-// the parsed enumeration value is not one of the provided valid values.
-//
-// Reference:
-// 	RFC Section 4.3 - Enumeration
-// 	Represented as an XDR encoded signed integer
-func (d *Decoder) DecodeEnum(validEnums map[int32]bool) (rv int32, err error) {
-	val, err := d.DecodeInt()
-	if err != nil {
-		return
-	}
-	if !validEnums[val] {
-		err = unmarshalError("DecodeEnum", ErrBadEnumValue, "invalid enum", val)
-		return
-	}
-	return val, nil
-}
-
-// DecodeBool treats the next 4 bytes as an XDR encoded boolean value and
-// returns the result as a bool.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining or
-// the parsed value is not a 0 or 1.
-//
-// Reference:
-// 	RFC Section 4.4 - Boolean
-// 	Represented as an XDR encoded enumeration where 0 is false and 1 is true
-func (d *Decoder) DecodeBool() (rv bool, err error) {
-	val, err := d.DecodeInt()
-	if err != nil {
-		return
-	}
-	switch val {
-	case 0:
-		return false, nil
-	case 1:
-		return true, nil
-	}
-	err = unmarshalError("DecodeBool", ErrBadEnumValue, "bool not 0 or 1", val)
-	return
-}
-
-// DecodeHyper treats the next 8 bytes as an XDR encoded hyper value and
-// returns the result as an int64.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.5 - Hyper Integer
-// 	64-bit big-endian signed integer in range [-9223372036854775808, 9223372036854775807]
-func (d *Decoder) DecodeHyper() (rv int64, err error) {
-	data := d.data
-	if len(data) < 8 {
-		msg := fmt.Sprintf(errInsufficientBytes, 8)
-		err = unmarshalError("DecodeHyper", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	rv = int64(data[7]) | int64(data[6])<<8 |
-		int64(data[5])<<16 | int64(data[4])<<24 |
-		int64(data[3])<<32 | int64(data[2])<<40 |
-		int64(data[1])<<48 | int64(data[0])<<56
-
-	d.data = data[8:]
-	return
-}
-
-// DecodeUhyper treats the next 8  bytes as an XDR encoded unsigned hyper value
-// and returns the result as a uint64.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.5 - Unsigned Hyper Integer
-// 	64-bit big-endian unsigned integer in range [0, 18446744073709551615]
-func (d *Decoder) DecodeUhyper() (rv uint64, err error) {
-	data := d.data
-	if len(data) < 8 {
-		msg := fmt.Sprintf(errInsufficientBytes, 8)
-		err = unmarshalError("DecodeUhyper", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	rv = uint64(data[7]) | uint64(data[6])<<8 |
-		uint64(data[5])<<16 | uint64(data[4])<<24 |
-		uint64(data[3])<<32 | uint64(data[2])<<40 |
-		uint64(data[1])<<48 | uint64(data[0])<<56
-
-	d.data = data[8:]
-	return
-}
-
-// DecodeFloat treats the next 4 bytes as an XDR encoded floating point and
-// returns the result as a float32.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.6 - Floating Point
-// 	32-bit single-precision IEEE 754 floating point
-func (d *Decoder) DecodeFloat() (rv float32, err error) {
-	data := d.data
-	if len(data) < 4 {
-		msg := fmt.Sprintf(errInsufficientBytes, 4)
-		err = unmarshalError("DecodeFloat", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	val := uint32(data[3]) | uint32(data[2])<<8 |
-		uint32(data[1])<<16 | uint32(data[0])<<24
-
-	d.data = data[4:]
-	return math.Float32frombits(val), nil
-}
-
-// DecodeDouble treats the next 8 bytes as an XDR encoded double-precision
-// floating point and returns the result as a float64.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining.
-//
-// Reference:
-// 	RFC Section 4.7 -  Double-Precision Floating Point
-// 	64-bit double-precision IEEE 754 floating point
-func (d *Decoder) DecodeDouble() (rv float64, err error) {
-	data := d.data
-	if len(data) < 8 {
-		msg := fmt.Sprintf(errInsufficientBytes, 8)
-		err = unmarshalError("DecodeDouble", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	val := uint64(data[7]) | uint64(data[6])<<8 |
-		uint64(data[5])<<16 | uint64(data[4])<<24 |
-		uint64(data[3])<<32 | uint64(data[2])<<40 |
-		uint64(data[1])<<48 | uint64(data[0])<<56
-
-	d.data = data[8:]
-	return math.Float64frombits(val), nil
-}
-
-// RFC Section 4.8 -  Quadruple-Precision Floating Point
-// 128-bit quadruple-precision floating point
-// Not Implemented
-
-// DecodeFixedOpaque treats the next 'size' bytes as XDR encoded opaque data and
-// returns the result as a byte slice.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining to
-// satisfy the passed size, including the necessary padding to make it a
-// multiple of 4.
-//
-// Reference:
-// 	RFC Section 4.9 - Fixed-Length Opaque Data
-// 	Fixed-length uninterpreted data zero-padded to a multiple of four
-func (d *Decoder) DecodeFixedOpaque(size int32) (rv []byte, err error) {
-	if size == 0 {
-		return
-	}
-	data := d.data
-	if int32(len(data)) < size {
-		msg := fmt.Sprintf(errInsufficientBytes, size)
-		err = unmarshalError("DecodeFixedOpaque", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	pad := (4 - (size % 4)) % 4
-	if int32(len(data[size:])) < pad {
-		msg := fmt.Sprintf(errInsufficientPad, size+pad)
-		err = unmarshalError("DecodeFixedOpaque", ErrUnexpectedEnd, msg, data)
-		return
-	}
-	rv = data[0:size]
-
-	d.data = data[size+pad:]
-	return
-}
-
-// DecodeOpaque treats the next bytes as variable length XDR encoded opaque
-// data and returns the result as a byte slice.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining or
-// the opaque data is larger than the max length of a Go slice.
-//
-// Reference:
-// 	RFC Section 4.10 - Variable-Length Opaque Data
-// 	Unsigned integer length followed by fixed opaque data of that length
-func (d *Decoder) DecodeOpaque() (rv []byte, err error) {
-	dataLen, err := d.DecodeUint()
-	if err != nil {
-		return
-	}
-	if uint(dataLen) > uint(maxInt) {
-		err = unmarshalError("DecodeOpaque", ErrOverflow, errMaxSlice, dataLen)
-		return
-	}
-	return d.DecodeFixedOpaque(int32(dataLen))
-}
-
-// DecodeString treats the next bytes as a variable length XDR encoded string
-// and returns the result as a string.  Character encoding is assumed to be
-// UTF-8 and therefore ASCII compatible.  If the underlying character encoding
-// is not compatibile with this assumption, the data can instead be read as
-// variable-length opaque data (DecodeOpaque) and manually converted as needed.
-//
-// An UnmarshalError is returned if there are insufficient bytes remaining or
-// the string data is larger than the max length of a Go slice.
-//
-// Reference:
-// 	RFC Section 4.11 - String
-// 	Unsigned integer length followed by bytes zero-padded to a multiple of four
-func (d *Decoder) DecodeString() (rv string, err error) {
-	dataLen, err := d.DecodeUint()
-	if err != nil {
-		return
-	}
-	if uint(dataLen) > uint(maxInt) {
-		err = unmarshalError("DecodeString", ErrOverflow, errMaxSlice, dataLen)
-		return
-	}
-	opaque, err := d.DecodeFixedOpaque(int32(dataLen))
-	if err != nil {
-		return
-	}
-	rv = string(opaque)
-	return
-}
-
-// decodeFixedArray treats the next bytes as a series of XDR encoded elements
-// of the same type as the array represented by the reflection value and decodes
-// each element into the passed array.  The ignoreOpaque flag controls whether
-// or not uint8 (byte) elements should be decoded individually or as a fixed
-// sequence of opaque data.
-//
-// An UnmarshalError is returned if any issues are encountered while decoding
-// the array elements.
-//
-// Reference:
-// 	RFC Section 4.12 - Fixed-Length Array
-// 	Individually XDR encoded array elements
-func (d *Decoder) decodeFixedArray(v reflect.Value, ignoreOpaque bool) (err error) {
-	// Treat [#]byte (byte is alias for uint8) as opaque data unless ignored.
-	if !ignoreOpaque && v.Type().Elem().Kind() == reflect.Uint8 {
-		data, err := d.DecodeFixedOpaque(int32(v.Len()))
-		if err != nil {
-			return err
-		}
-		reflect.Copy(v, reflect.ValueOf(data))
-		return nil
-	}
-
-	// Decode each array element.
-	for i := 0; i < v.Len(); i++ {
-		err = d.decode(v.Index(i))
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// decodeArray treats the next bytes as a variable length series of XDR encoded
-// elements of the same type as the array represented by the reflection value.
-// The number of elements is obtained by first decoding the unsigned integer
-// element count.  Then each element is decoded into the passed array. The
-// ignoreOpaque flag controls whether or not uint8 (byte) elements should be
-// decoded individually or as a variable sequence of opaque data.
-//
-// An UnmarshalError is returned if any issues are encountered while decoding
-// the array elements.
-//
-// Reference:
-// 	RFC Section 4.13 - Variable-Length Array
-// 	Unsigned integer length followed by individually XDR encoded array elements
-func (d *Decoder) decodeArray(v reflect.Value, ignoreOpaque bool) (err error) {
-	dataLen, err := d.DecodeUint()
-	if err != nil {
-		return
-	}
-	if uint(dataLen) > uint(maxInt) {
-		err = unmarshalError("decodeArray", ErrOverflow, errMaxSlice, dataLen)
-		return
-	}
-
-	// Allocate storage for the slice elements (the underlying array) if
-	// existing slice does not enough capacity.
-	sliceLen := int(dataLen)
-	if v.Cap() < sliceLen {
-		v.Set(reflect.MakeSlice(v.Type(), sliceLen, sliceLen))
-	}
-	if v.Len() < sliceLen {
-		v.SetLen(sliceLen)
-	}
-
-	// Treat []byte (byte is alias for uint8) as opaque data unless ignored.
-	if !ignoreOpaque && v.Type().Elem().Kind() == reflect.Uint8 {
-		data, err := d.DecodeFixedOpaque(int32(sliceLen))
-		if err != nil {
-			return err
-		}
-		v.SetBytes(data)
-		return nil
-	}
-
-	// Decode each slice element.
-	for i := 0; i < sliceLen; i++ {
-		err = d.decode(v.Index(i))
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// decodeStruct treats the next bytes as a series of XDR encoded elements
-// of the same type as the exported fields of the struct represented by the
-// passed reflection value.  Pointers are automatically indirected and
-// allocated as necessary.
-//
-// An UnmarshalError is returned if any issues are encountered while decoding
-// the elements.
-//
-// Reference:
-// 	RFC Section 4.14 - Structure
-// 	XDR encoded elements in the order of their declaration in the struct
-func (d *Decoder) decodeStruct(v reflect.Value) (err error) {
-	vt := v.Type()
-	for i := 0; i < v.NumField(); i++ {
-		// Skip unexported fields.
-		vtf := vt.Field(i)
-		if vtf.PkgPath != "" {
-			continue
-		}
-
-		// Indirect through pointers allocating them as needed and ensure
-		// the field is settable.
-		vf := v.Field(i)
-		vf, err = d.indirect(vf)
-		if err != nil {
-			return err
-		}
-		if !vf.CanSet() {
-			msg := fmt.Sprintf("can't decode to unsettable '%v'",
-				vf.Type().String())
-			err = unmarshalError("decodeStruct", ErrNotSettable, msg, nil)
-			return err
-		}
-
-		// Handle non-opaque data to []uint8 and [#]uint8 based on struct tag.
-		tag := vtf.Tag.Get("xdropaque")
-		if tag == "false" {
-			switch vf.Kind() {
-			case reflect.Slice:
-				err = d.decodeArray(vf, true)
-				if err != nil {
-					return
-				}
-				continue
-
-			case reflect.Array:
-				err = d.decodeFixedArray(vf, true)
-				if err != nil {
-					return
-				}
-				continue
-			}
-		}
-
-		// Decode each struct field.
-		err = d.decode(vf)
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// RFC Section 4.15 - Discriminated Union
-// RFC Section 4.16 - Void
-// RFC Section 4.17 - Constant
-// RFC Section 4.18 - Typedef
-// RFC Section 4.19 - Optional data
-// RFC Sections 4.15 though 4.19 only apply to the data specification language
-// which is not implemented by this package.  In the case of discriminated
-// unions, struct tags are used to perform a similar function.
-
-// decodeMap treats the next bytes as an XDR encoded variable array of 2-element
-// structures whose fields are of the same type as the map keys and elements
-// represented by the passed reflection value.  Pointers are automatically
-// indirected and allocated as necessary.
-//
-// An UnmarshalError is returned if any issues are encountered while decoding
-// the elements.
-func (d *Decoder) decodeMap(v reflect.Value) (err error) {
-	dataLen, err := d.DecodeUint()
-	if err != nil {
-		return
-	}
-
-	// Allocate storage for the underlying map if needed.
-	vt := v.Type()
-	if v.IsNil() {
-		v.Set(reflect.MakeMap(vt))
-	}
-
-	// Decode each key and value according to their type.
-	keyType := vt.Key()
-	elemType := vt.Elem()
-	for i := uint32(0); i < dataLen; i++ {
-		key := reflect.New(keyType).Elem()
-		err = d.decode(key)
-		if err != nil {
-			return
-		}
-
-		val := reflect.New(elemType).Elem()
-		err = d.decode(val)
-		if err != nil {
-			return
-		}
-		v.SetMapIndex(key, val)
-	}
-	return
-}
-
-// decodeInterface examines the interface represented by the passed reflection
-// value to detect whether it is an interface that can be decoded into and
-// if it is, extracts the underlying value to pass back into the decode function
-// for decoding according to its type.
-//
-// An UnmarshalError is returned if any issues are encountered while decoding
-// the interface.
-func (d *Decoder) decodeInterface(v reflect.Value) (err error) {
-	if v.IsNil() || !v.CanInterface() {
-		msg := fmt.Sprintf("can't decode to nil interface")
-		err = unmarshalError("decodeInterface", ErrNilInterface, msg, nil)
-		return err
-	}
-
-	// Extract underlying value from the interface and indirect through pointers
-	// allocating them as needed.
-	ve := reflect.ValueOf(v.Interface())
-	ve, err = d.indirect(ve)
-	if err != nil {
-		return err
-	}
-	if !ve.CanSet() {
-		msg := fmt.Sprintf("can't decode to unsettable '%v'", ve.Type().String())
-		err = unmarshalError("decodeInterface", ErrNotSettable, msg, nil)
-		return err
-	}
-	return d.decode(ve)
-}
-
-// decode is the main workhorse for unmarshalling via reflection.  It uses
-// the passed reflection value to choose the XDR primitives to decode from
-// the XDR encoded data stored in the Decoder.  It is a recursive function,
-// so cyclic data structures are not supported and will result in an infinite
-// loop.
-func (d *Decoder) decode(v reflect.Value) (err error) {
-	if !v.IsValid() {
-		msg := fmt.Sprintf("type '%s' is not valid", v.Kind().String())
-		err = unmarshalError("decode", ErrUnsupportedType, msg, nil)
-		return
-	}
-
-	// Indirect through pointers allocating them as needed.
-	ve, err := d.indirect(v)
-	if err != nil {
-		return err
-	}
-
-	// Handle time.Time values by decoding them as an RFC3339 formatted
-	// string with nanosecond precision.  Check the type string rather
-	// than doing a full blown conversion to interface and type assertion
-	// since checking a string is much quicker.
-	if ve.Type().String() == "time.Time" {
-		// Read the value as a string and parse it.
-		timeString, err := d.DecodeString()
-		if err != nil {
-			return err
-		}
-		ttv, err := time.Parse(time.RFC3339, timeString)
-		if err != nil {
-			return err
-		}
-		ve.Set(reflect.ValueOf(ttv))
-		return nil
-	}
-
-	// Handle native Go types.
-	switch ve.Kind() {
-	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int:
-		i, err := d.DecodeInt()
-		if err != nil {
-			return err
-		}
-		if ve.OverflowInt(int64(i)) {
-			msg := fmt.Sprintf("signed integer too large to fit '%s'",
-				ve.Kind().String())
-			err = unmarshalError("decode", ErrOverflow, msg, i)
-			return err
-		}
-		ve.SetInt(int64(i))
-
-	case reflect.Int64:
-		i, err := d.DecodeHyper()
-		if err != nil {
-			return err
-		}
-		ve.SetInt(i)
-
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint:
-		ui, err := d.DecodeUint()
-		if err != nil {
-			return err
-		}
-		if ve.OverflowUint(uint64(ui)) {
-			msg := fmt.Sprintf("unsigned integer too large to fit '%s'",
-				ve.Kind().String())
-			err = unmarshalError("decode", ErrOverflow, msg, ui)
-			return err
-		}
-		ve.SetUint(uint64(ui))
-
-	case reflect.Uint64:
-		ui, err := d.DecodeUhyper()
-		if err != nil {
-			return err
-		}
-		ve.SetUint(ui)
-
-	case reflect.Bool:
-		b, err := d.DecodeBool()
-		if err != nil {
-			return err
-		}
-		ve.SetBool(b)
-
-	case reflect.Float32:
-		f, err := d.DecodeFloat()
-		if err != nil {
-			return err
-		}
-		ve.SetFloat(float64(f))
-
-	case reflect.Float64:
-		f, err := d.DecodeDouble()
-		if err != nil {
-			return err
-		}
-		ve.SetFloat(f)
-
-	case reflect.String:
-		s, err := d.DecodeString()
-		if err != nil {
-			return err
-		}
-		ve.SetString(s)
-
-	case reflect.Array:
-		err := d.decodeFixedArray(ve, false)
-		if err != nil {
-			return err
-		}
-
-	case reflect.Slice:
-		err := d.decodeArray(ve, false)
-		if err != nil {
-			return err
-		}
-
-	case reflect.Struct:
-		err := d.decodeStruct(ve)
-		if err != nil {
-			return err
-		}
-
-	case reflect.Map:
-		err := d.decodeMap(ve)
-		if err != nil {
-			return err
-		}
-
-	case reflect.Interface:
-		err := d.decodeInterface(ve)
-		if err != nil {
-			return err
-		}
-
-	// reflect.Uintptr, reflect.UnsafePointer
-	default:
-		msg := fmt.Sprintf("unsupported Go type '%s'", ve.Kind().String())
-		err = unmarshalError("decode", ErrUnsupportedType, msg, nil)
-	}
-
-	return
-}
-
-// indirect dereferences pointers allocating them as needed until it reaches
-// a non-pointer.  This allows transparent decoding through arbitrary levels
-// of indirection.
-func (d *Decoder) indirect(v reflect.Value) (rv reflect.Value, err error) {
-	rv = v
-	for rv.Kind() == reflect.Ptr {
-		// Allocate pointer if needed.
-		isNil := rv.IsNil()
-		if isNil && !rv.CanSet() {
-			msg := fmt.Sprintf("unable to allocate pointer for '%v'", rv.Type().String())
-			err = unmarshalError("indirect", ErrNotSettable, msg, nil)
-			return
-		}
-		if isNil {
-			rv.Set(reflect.New(rv.Type().Elem()))
-		}
-		rv = rv.Elem()
-	}
-	return
-}
-
-// NewDecoder returns a Decoder that can be used to manually decode XDR data
-// from a provided byte slice.  Typically, Unmarshal should be used instead of
-// manually creating a Decoder.
-func NewDecoder(bytes []byte) *Decoder {
-	return &Decoder{data: bytes}
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/decode_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/decode_test.go
deleted file mode 100644
index af96ba3917..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/decode_test.go
+++ /dev/null
@@ -1,474 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-	"time"
-)
-
-// subTest is used to allow testing of the Unmarshal function into struct fields
-// which are structs themselves.
-type subTest struct {
-	A string
-	B uint8
-}
-
-// allTypesTest is used to allow testing of the Unmarshal function into struct
-// fields of all supported types.
-type allTypesTest struct {
-	A int8
-	B uint8
-	C int16
-	D uint16
-	E int32
-	F uint32
-	G int64
-	H uint64
-	I bool
-	J float32
-	K float64
-	L string
-	M []byte
-	N [3]byte
-	O []int16
-	P [2]subTest
-	Q subTest
-	R map[string]uint32
-	S time.Time
-}
-
-// TestUnmarshal executes all of the tests described by unmarshalTests.
-func TestUnmarshal(t *testing.T) {
-	// structTestIn is input data for the big struct test of all supported
-	// types.
-	structTestIn := []byte{
-		0x00, 0x00, 0x00, 0x7F, // A
-		0x00, 0x00, 0x00, 0xFF, // B
-		0x00, 0x00, 0x7F, 0xFF, // C
-		0x00, 0x00, 0xFF, 0xFF, // D
-		0x7F, 0xFF, 0xFF, 0xFF, // E
-		0xFF, 0xFF, 0xFF, 0xFF, // F
-		0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // G
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // H
-		0x00, 0x00, 0x00, 0x01, // I
-		0x40, 0x48, 0xF5, 0xC3, // J
-		0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, // K
-		0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00, // L
-		0x00, 0x00, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04, // M
-		0x01, 0x02, 0x03, 0x00, // N
-		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00,
-		0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, // O
-		0x00, 0x00, 0x00, 0x03, 0x6F, 0x6E, 0x65, 0x00, // P[0].A
-		0x00, 0x00, 0x00, 0x01, // P[0].B
-		0x00, 0x00, 0x00, 0x03, 0x74, 0x77, 0x6F, 0x00, // P[1].A
-		0x00, 0x00, 0x00, 0x02, // P[1].B
-		0x00, 0x00, 0x00, 0x03, 0x62, 0x61, 0x72, 0x00, // Q.A
-		0x00, 0x00, 0x00, 0x03, // Q.B
-		0x00, 0x00, 0x00, 0x02, // R length
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, // R key map1
-		0x00, 0x00, 0x00, 0x01, // R value map1
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x32, // R key map2
-		0x00, 0x00, 0x00, 0x02, // R value map2
-		0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-		0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-		0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a, // S
-	}
-
-	// structTestWant is the expected output after unmarshalling
-	// structTestIn.
-	structTestWant := allTypesTest{
-		127,                                     // A
-		255,                                     // B
-		32767,                                   // C
-		65535,                                   // D
-		2147483647,                              // E
-		4294967295,                              // F
-		9223372036854775807,                     // G
-		18446744073709551615,                    // H
-		true,                                    // I
-		3.14,                                    // J
-		3.141592653589793,                       // K
-		"xdr",                                   // L
-		[]byte{1, 2, 3, 4},                      // M
-		[3]byte{1, 2, 3},                        // N
-		[]int16{512, 1024, 2048},                // O
-		[2]subTest{{"one", 1}, {"two", 2}},      // P
-		subTest{"bar", 3},                       // Q
-		map[string]uint32{"map1": 1, "map2": 2}, // R
-		time.Unix(1396581888, 0).UTC(),          // S
-	}
-
-	tests := []struct {
-		in   []byte
-		want interface{}
-		err  error
-	}{
-		// int8 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int8(0), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x40}, int8(64), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x7F}, int8(127), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int8(-1), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0x80}, int8(-128), nil},
-		// Expected Failures -- 128, -129 overflow int8
-		{[]byte{0x00, 0x00, 0x00, 0x80}, int8(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0x7F}, int8(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// uint8 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint8(0), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x40}, uint8(64), nil},
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, uint8(255), nil},
-		// Expected Failures -- 256, -1 overflow uint8
-		{[]byte{0x00, 0x00, 0x01, 0x00}, uint8(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint8(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// int16 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int16(0), nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00}, int16(1024), nil},
-		{[]byte{0x00, 0x00, 0x7F, 0xFF}, int16(32767), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int16(-1), nil},
-		{[]byte{0xFF, 0xFF, 0x80, 0x00}, int16(-32768), nil},
-		// Expected Failures -- 32768, -32769 overflow int16
-		{[]byte{0x00, 0x00, 0x80, 0x00}, int16(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0x7F, 0xFF}, int16(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// uint16 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint16(0), nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00}, uint16(1024), nil},
-		{[]byte{0x00, 0x00, 0xFF, 0xFF}, uint16(65535), nil},
-		// Expected Failures -- 65536, -1 overflow uint16
-		{[]byte{0x00, 0x01, 0x00, 0x00}, uint16(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint16(0), &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// int32 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int32(0), nil},
-		{[]byte{0x00, 0x04, 0x00, 0x00}, int32(262144), nil},
-		{[]byte{0x7F, 0xFF, 0xFF, 0xFF}, int32(2147483647), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int32(-1), nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00}, int32(-2147483648), nil},
-
-		// uint32 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint32(0), nil},
-		{[]byte{0x00, 0x04, 0x00, 0x00}, uint32(262144), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint32(4294967295), nil},
-
-		// int64 - XDR Hyper Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(0), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, int64(1 << 34), nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(1 << 42), nil},
-		{[]byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(9223372036854775807), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(-1), nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(-9223372036854775808), nil},
-
-		// uint64 - XDR Unsigned Hyper Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(0), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 34), nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 42), nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, uint64(18446744073709551615), nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(9223372036854775808), nil},
-
-		// bool - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, false, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x01}, true, nil},
-		// Expected Failures -- only 0 or 1 is a valid bool
-		{[]byte{0x01, 0x00, 0x00, 0x00}, true, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{[]byte{0x00, 0x00, 0x40, 0x00}, true, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// float32 - XDR Floating-Point
-		{[]byte{0x00, 0x00, 0x00, 0x00}, float32(0), nil},
-		{[]byte{0x40, 0x48, 0xF5, 0xC3}, float32(3.14), nil},
-		{[]byte{0x49, 0x96, 0xB4, 0x38}, float32(1234567.0), nil},
-		{[]byte{0xFF, 0x80, 0x00, 0x00}, float32(math.Inf(-1)), nil},
-		{[]byte{0x7F, 0x80, 0x00, 0x00}, float32(math.Inf(0)), nil},
-
-		// float64 - XDR Double-precision Floating-Point
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(0), nil},
-		{[]byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, float64(3.141592653589793), nil},
-		{[]byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(-1)), nil},
-		{[]byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(0)), nil},
-
-		// string - XDR String
-		{[]byte{0x00, 0x00, 0x00, 0x00}, "", nil},
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", nil},
-		{[]byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, "τ=2π", nil},
-		// Expected Failure -- String len 255 larger than available bytes
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, "", &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// []byte - XDR Variable Opaque
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, []byte{0x01}, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, nil},
-		// Expected Failure -- 255 bytes of opaque data larger than available bytes
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, []byte{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// [#]byte - XDR Fixed Opaque
-		{[]byte{0x01, 0x00, 0x00, 0x00}, [1]byte{0x01}, nil},
-		{[]byte{0x01, 0x02, 0x00, 0x00}, [2]byte{0x01, 0x02}, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x00}, [3]byte{0x01, 0x02, 0x03}, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x04}, [4]byte{0x01, 0x02, 0x03, 0x04}, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, [5]byte{0x01, 0x02, 0x03, 0x04, 0x05}, nil},
-		// Expected Failure -- fixed opaque data not padded
-		{[]byte{0x01}, [1]byte{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// []<type> - XDR Variable-Length Array
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00},
-			[]int16{512, 1024, 2048}, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}, []bool{true, false}, nil},
-		// Expected Failure -- 2 entries in array - not enough bytes
-		{[]byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01}, []bool{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// [#]<type> - XDR Fixed-Length Array
-		{[]byte{0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00}, [2]uint32{512, 1024}, nil},
-		{[]byte{0x00, 0x00, 0x02, 0x00}, [2]uint32{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// map[string]uint32
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, 0x00, 0x00, 0x00, 0x01},
-			map[string]uint32{"map1": 1}, nil},
-		// Expected Failure -- 1 map element - not enough bytes
-		{[]byte{0x00, 0x00, 0x00, 0x01}, map[string]uint32{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// time.Time - XDR String per RFC3339
-		{[]byte{
-			0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-			0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-			0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a,
-		}, time.Unix(1396581888, 0).UTC(), nil},
-
-		// struct - XDR Structure -- test struct contains all supported types
-		{structTestIn, structTestWant, nil},
-	}
-
-	for i, test := range tests {
-		// Create a new pointer to the appropriate type
-		want := reflect.New(reflect.TypeOf(test.want)).Interface()
-		rest, err := Unmarshal(test.in, want)
-		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
-			t.Errorf("Unmarshal #%d failed to detect error - got: %v <%T> want: %T",
-				i, err, err, test.err)
-			continue
-		}
-		if rerr, ok := err.(*UnmarshalError); ok {
-			if terr, ok := test.err.(*UnmarshalError); ok {
-				if rerr.ErrorCode != terr.ErrorCode {
-					t.Errorf("Unmarshal #%d failed to detect error code - got: %v want: %v",
-						i, rerr.ErrorCode, terr.ErrorCode)
-					continue
-				}
-				// Got expected error.  Move on to the next test.
-				continue
-			}
-		}
-
-		if len(rest) != 0 {
-			t.Errorf("Unmarshal #%d len got: %v want: %v\n", i, len(rest), 0)
-			continue
-		}
-		wantElem := reflect.Indirect(reflect.ValueOf(want)).Interface()
-		if !reflect.DeepEqual(wantElem, test.want) {
-			t.Errorf("Unmarshal #%d got: %v want: %v\n", i, wantElem, test.want)
-			continue
-		}
-	}
-}
-
-// decodeFunc is used to identify which public function of the Decoder object
-// a test applies to.
-type decodeFunc int
-
-const (
-	fDecodeBool decodeFunc = iota
-	fDecodeDouble
-	fDecodeEnum
-	fDecodeFixedOpaque
-	fDecodeFloat
-	fDecodeHyper
-	fDecodeInt
-	fDecodeOpaque
-	fDecodeString
-	fDecodeUhyper
-	fDecodeUint
-)
-
-// Map of decodeFunc values to names for pretty printing.
-var decodeFuncStrings = map[decodeFunc]string{
-	fDecodeBool:        "DecodeBool",
-	fDecodeDouble:      "DecodeDouble",
-	fDecodeEnum:        "DecodeEnum",
-	fDecodeFixedOpaque: "DecodeFixedOpaque",
-	fDecodeFloat:       "DecodeFloat",
-	fDecodeHyper:       "DecodeHyper",
-	fDecodeInt:         "DecodeInt",
-	fDecodeOpaque:      "DecodeOpaque",
-	fDecodeString:      "DecodeString",
-	fDecodeUhyper:      "DecodeUhyper",
-	fDecodeUint:        "DecodeUint",
-}
-
-func (f decodeFunc) String() string {
-	if s := decodeFuncStrings[f]; s != "" {
-		return s
-	}
-	return fmt.Sprintf("Unknown decodeFunc (%d)", f)
-}
-
-// TestDecoder executes all of the tests described by decodeTests.
-func TestDecoder(t *testing.T) {
-	tests := []struct {
-		f    decodeFunc
-		in   []byte
-		want interface{}
-		err  error
-	}{
-		// Bool
-		{fDecodeBool, []byte{0x00, 0x00, 0x00, 0x00}, false, nil},
-		{fDecodeBool, []byte{0x00, 0x00, 0x00, 0x01}, true, nil},
-		// Expected Failures -- only 0 or 1 is a valid bool
-		{fDecodeBool, []byte{0x01, 0x00, 0x00, 0x00}, true, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{fDecodeBool, []byte{0x00, 0x00, 0x40, 0x00}, true, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// Double
-		{fDecodeDouble, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(0), nil},
-		{fDecodeDouble, []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, float64(3.141592653589793), nil},
-		{fDecodeDouble, []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(-1)), nil},
-		{fDecodeDouble, []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(0)), nil},
-
-		// Enum
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x00}, int32(0), nil},
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x01}, int32(1), nil},
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x02}, nil, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{fDecodeEnum, []byte{0x12, 0x34, 0x56, 0x78}, nil, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// FixedOpaque
-		{fDecodeFixedOpaque, []byte{0x01, 0x00, 0x00, 0x00}, []byte{0x01}, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x00, 0x00}, []byte{0x01, 0x02}, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, []byte{0x01, 0x02, 0x03, 0x04, 0x05}, nil},
-		// Expected Failure -- fixed opaque data not padded
-		{fDecodeFixedOpaque, []byte{0x01}, []byte{0x00}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// Float
-		{fDecodeFloat, []byte{0x00, 0x00, 0x00, 0x00}, float32(0), nil},
-		{fDecodeFloat, []byte{0x40, 0x48, 0xF5, 0xC3}, float32(3.14), nil},
-		{fDecodeFloat, []byte{0x49, 0x96, 0xB4, 0x38}, float32(1234567.0), nil},
-		{fDecodeFloat, []byte{0xFF, 0x80, 0x00, 0x00}, float32(math.Inf(-1)), nil},
-		{fDecodeFloat, []byte{0x7F, 0x80, 0x00, 0x00}, float32(math.Inf(0)), nil},
-
-		// Hyper
-		{fDecodeHyper, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(0), nil},
-		{fDecodeHyper, []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, int64(1 << 34), nil},
-		{fDecodeHyper, []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(1 << 42), nil},
-		{fDecodeHyper, []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(9223372036854775807), nil},
-		{fDecodeHyper, []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(-1), nil},
-		{fDecodeHyper, []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(-9223372036854775808), nil},
-
-		// Int
-		{fDecodeInt, []byte{0x00, 0x00, 0x00, 0x00}, int32(0), nil},
-		{fDecodeInt, []byte{0x00, 0x04, 0x00, 0x00}, int32(262144), nil},
-		{fDecodeInt, []byte{0x7F, 0xFF, 0xFF, 0xFF}, int32(2147483647), nil},
-		{fDecodeInt, []byte{0xFF, 0xFF, 0xFF, 0xFF}, int32(-1), nil},
-		{fDecodeInt, []byte{0x80, 0x00, 0x00, 0x00}, int32(-2147483648), nil},
-
-		// Opaque
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, []byte{0x01}, nil},
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, nil},
-		// Expected Failure -- 255 bytes of opaque data larger than available bytes
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0xFF}, []byte{}, &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// String
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x00}, "", nil},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", nil},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, "τ=2π", nil},
-		// Expected Failure -- String len 255 larger than available bytes
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0xFF}, "", &UnmarshalError{ErrorCode: ErrUnexpectedEnd}},
-
-		// Uhyper
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(0), nil},
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 34), nil},
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 42), nil},
-		{fDecodeUhyper, []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, uint64(18446744073709551615), nil},
-		{fDecodeUhyper, []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(9223372036854775808), nil},
-
-		// Uint
-		{fDecodeUint, []byte{0x00, 0x00, 0x00, 0x00}, uint32(0), nil},
-		{fDecodeUint, []byte{0x00, 0x04, 0x00, 0x00}, uint32(262144), nil},
-		{fDecodeUint, []byte{0xFF, 0xFF, 0xFF, 0xFF}, uint32(4294967295), nil},
-	}
-
-	validEnums := make(map[int32]bool)
-	validEnums[0] = true
-	validEnums[1] = true
-
-	var rv interface{}
-	var err error
-
-	for i, test := range tests {
-		err = nil
-		dec := NewDecoder(test.in)
-		switch test.f {
-		case fDecodeBool:
-			rv, err = dec.DecodeBool()
-		case fDecodeDouble:
-			rv, err = dec.DecodeDouble()
-		case fDecodeEnum:
-			rv, err = dec.DecodeEnum(validEnums)
-		case fDecodeFixedOpaque:
-			want := test.want.([]byte)
-			rv, err = dec.DecodeFixedOpaque(int32(len(want)))
-		case fDecodeFloat:
-			rv, err = dec.DecodeFloat()
-		case fDecodeHyper:
-			rv, err = dec.DecodeHyper()
-		case fDecodeInt:
-			rv, err = dec.DecodeInt()
-		case fDecodeOpaque:
-			rv, err = dec.DecodeOpaque()
-		case fDecodeString:
-			rv, err = dec.DecodeString()
-		case fDecodeUhyper:
-			rv, err = dec.DecodeUhyper()
-		case fDecodeUint:
-			rv, err = dec.DecodeUint()
-		default:
-			t.Errorf("%v #%d unrecognized function", test.f, i)
-			continue
-		}
-		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
-			t.Errorf("%v #%d failed to detect error - got: %v <%T> want: %T",
-				test.f, i, err, err, test.err)
-			continue
-		}
-		if rerr, ok := err.(*UnmarshalError); ok {
-			if terr, ok := test.err.(*UnmarshalError); ok {
-				if rerr.ErrorCode != terr.ErrorCode {
-					t.Errorf("%v #%d failed to detect error code - got: %v want: %v",
-						test.f, i, rerr.ErrorCode, terr.ErrorCode)
-					continue
-				}
-				// Got expected error.  Move on to the next test.
-				continue
-			}
-		}
-
-		if !reflect.DeepEqual(rv, test.want) {
-			t.Errorf("%v #%d got: %v want: %v\n", test.f, i, rv, test.want)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/doc.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/doc.go
deleted file mode 100644
index b039096551..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/doc.go
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-Package xdr implements the data representation portion of the External Data
-Representation (XDR) standard protocol as specified in RFC 4506 (obsoletes
-RFC 1832 and RFC 1014).
-
-The XDR RFC defines both a data specification language and a data
-representation standard.  This package implements methods to encode
-and decode XDR data per the data representation standard with the exception
-of 128-bit quadruple-precision floating points.  It does not currently implement
-parsing of the data specification language.  In other words, the ability to
-automatically generate Go code by parsing an XDR data specification file
-(typically .x extension) is not supported.  In practice, this limitation of the
-package is fairly minor since it is largely unnecessary due to the reflection
-capabilities of Go as described below.
-
-This package provides two approaches for encoding and decoding XDR data:
-
-	1) Marshal/Unmarshal functions which automatically map between XDR and Go types
-	2) Individual Encoder/Decoder objects to manually work with XDR primitives
-
-For the Marshal/Unmarshal functions, Go reflection capabilities are used to choose
-the type of the underlying XDR data based upon the Go type to encode or the target
-Go type to decode into.  A description of how each type is mapped is provided
-below, however one important type worth reviewing is Go structs.  In the case of
-structs, each exported field (first letter capitalized) is reflected and mapped
-in order.  As a result, this means a Go struct with exported fields of the
-appropriate types listed in the expected order can be used to automatically
-encode / decode the XDR data thereby eliminating the need to write a lot of
-boilerplate code to encode/decode and error check each piece of XDR data as is
-typically required with C based XDR libraries.
-
-Go Type to XDR Type Mappings
-
-The following chart shows an overview of how Go types are mapped to XDR types
-for automatic marshalling and unmarshalling.  The documentation for the Marshal
-and Unmarshal functions has specific details of how the mapping proceeds.
-
-	Go Type <-> XDR Type
-	--------------------
-	int8, int16, int32, int <-> XDR Integer
-	uint8, uint16, uint32, uint <-> XDR Unsigned Integer
-	int64 <-> XDR Hyper Integer
-	uint64 <-> XDR Unsigned Hyper Integer
-	bool <-> XDR Boolean
-	float32 <-> XDR Floating-Point
-	float64 <-> XDR Double-Precision Floating-Point
-	string <-> XDR String
-	byte <-> XDR Integer
-	[]byte <-> XDR Variable-Length Opaque Data
-	[#]byte <-> XDR Fixed-Length Opaque Data
-	[]<type> <-> XDR Variable-Length Array
-	[#]<type> <-> XDR Fixed-Length Array
-	struct <-> XDR Structure
-	map <-> XDR Variable-Length Array of two-element XDR Structures
-	time.Time <-> XDR String encoded with RFC3339 nanosecond precision
-
-Notes and Limitations:
-
-	* Automatic marshalling and unmarshalling of variable and fixed-length arrays
-	  of uint8s require a special struct tag `xdropaque:"false"` since byte
-	  slices and byte arrays are assumed to be opaque data and byte is a Go
-	  alias for uint8 thus indistinguishable under reflection
-	* Channel, complex, and function types cannot be encoded
-	* Interfaces without a concrete value cannot be encoded
-	* Cyclic data structures are not supported and will result in infinite loops
-	* Strings are marshalled and unmarshalled with UTF-8 character encoding
-	  which differs from the XDR specification of ASCII, however UTF-8 is
-	  backwards compatible with ASCII so this should rarely cause issues
-
-
-Encoding
-
-To encode XDR data, use the Marshal function.
-	func Marshal(v interface{}) (rv []byte, err error)
-
-For example, given the following code snippet:
-
-	type ImageHeader struct {
-		Signature	[3]byte
-		Version		uint32
-		IsGrayscale	bool
-		NumSections	uint32
-	}
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-
-	encodedData, err := xdr.Marshal(&h)
-	// Error check elided
-
-The result, encodedData, will then contain the following XDR encoded byte
-sequence:
-
-	0xAB, 0xCD, 0xEF, 0x00,
-	0x00, 0x00, 0x00, 0x02,
-	0x00, 0x00, 0x00, 0x01,
-	0x00, 0x00, 0x00, 0x0A
-
-
-In addition, while the automatic marshalling discussed above will work for the
-vast majority of cases, an Encoder object is provided that can be used to
-manually encode XDR primitives for complex scenarios where automatic
-reflection-based encoding won't work.  The included examples provide a sample of
-manual usage via an Encoder.
-
-
-Decoding
-
-To decode XDR data, use the Unmarshal function.
-	func Unmarshal(data []byte, v interface{}) (rest []byte, err error)
-
-For example, given the following code snippet:
-
-	type ImageHeader struct {
-		Signature	[3]byte
-		Version		uint32
-		IsGrayscale	bool
-		NumSections	uint32
-	}
-
-	// Using output from the Encoding section above.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00,
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x0A}
-
-	var h ImageHeader
-	remainingBytes, err := xdr.Unmarshal(encodedData, &h)
-	// Error check elided
-
-The struct instance, h, will then contain the following values:
-
-	h.Signature = [3]byte{0xAB, 0xCD, 0xEF}
-	h.Version = 2
-	h.IsGrayscale = true
-	h.NumSections = 10
-
-In addition, while the automatic unmarshalling discussed above will work for the
-vast majority of cases, a Decoder object is provided that can be used to
-manually decode XDR primitives for complex scenarios where automatic
-reflection-based decoding won't work.  The included examples provide a sample of
-manual usage via an Decoder.
-
-Errors
-
-All errors are either of type UnmarshalError or MarshalError.  Both provide
-human readable output as well as an ErrorCode field which can be inspected by
-sophisticated callers if necessary
-
-See the documentation of UnmarshalError, MarshalError, and ErrorCode for further
-details.
-
-*/
-package xdr
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/encode.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/encode.go
deleted file mode 100644
index bc870d1cf6..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/encode.go
+++ /dev/null
@@ -1,640 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"time"
-)
-
-var errMaxXdr = "data exceeds max xdr size limit"
-
-/*
-Marshal returns the XDR encoding of v.  It traverses v recursively and
-automatically indirects pointers through arbitrary depth to encode the actual
-value pointed to.
-
-Marshal uses reflection to determine the type of the concrete value contained
-by v and performs a mapping of Go types to the underlying XDR types as follows:
-
-	Go Type -> XDR Type
-	--------------------
-	int8, int16, int32, int -> XDR Integer
-	uint8, uint16, uint32, uint -> XDR Unsigned Integer
-	int64 -> XDR Hyper Integer
-	uint64 -> XDR Unsigned Hyper Integer
-	bool -> XDR Boolean
-	float32 -> XDR Floating-Point
-	float64 -> XDR Double-Precision Floating-Point
-	string -> XDR String
-	byte -> XDR Integer
-	[]byte -> XDR Variable-Length Opaque Data
-	[#]byte -> XDR Fixed-Length Opaque Data
-	[]<type> -> XDR Variable-Length Array
-	[#]<type> -> XDR Fixed-Length Array
-	struct -> XDR Structure
-	map -> XDR Variable-Length Array of two-element XDR Structures
-	time.Time -> XDR String encoded with RFC3339 nanosecond precision
-
-Notes and Limitations:
-
-	* Automatic marshalling of variable and fixed-length arrays of uint8s
-	  requires a special struct tag `xdropaque:"false"` since byte slices and
-	  byte arrays are assumed to be opaque data and byte is a Go alias for uint8
-	  thus indistinguishable under reflection
-	* Channel, complex, and function types cannot be encoded
-	* Interfaces without a concrete value cannot be encoded
-	* Cyclic data structures are not supported and will result in infinite loops
-	* Strings are marshalled with UTF-8 character encoding which differs from
-	  the XDR specification of ASCII, however UTF-8 is backwards compatible with
-	  ASCII so this should rarely cause issues
-
-If any issues are encountered during the marshalling process, a MarshalError is
-returned with a human readable description as well as an ErrorCode value for
-further inspection from sophisticated callers.  Some potential issues are
-unsupported Go types, attempting to encode more opaque data than can be
-represented by a single opaque XDR entry, and exceeding max slice limitations.
-*/
-func Marshal(v interface{}) (rv []byte, err error) {
-	if v == nil {
-		msg := "can't marshal nil interface"
-		err = marshalError("Marshal", ErrNilInterface, msg, nil)
-		return nil, err
-	}
-
-	vv := reflect.ValueOf(v)
-	vve := vv
-	for vve.Kind() == reflect.Ptr {
-		if vve.IsNil() {
-			msg := fmt.Sprintf("can't marshal nil pointer '%v'",
-				vv.Type().String())
-			err = marshalError("Marshal", ErrBadArguments, msg, nil)
-			return nil, err
-		}
-		vve = vve.Elem()
-	}
-
-	enc := Encoder{}
-	err = enc.encode(vve)
-	return enc.data, err
-}
-
-// An Encoder contains information about the state of an encode operation
-// from an interface value into an XDR-encoded byte slice.  See NewEncoder.
-type Encoder struct {
-	data []byte
-	off  int
-}
-
-// EncodeInt appends the XDR encoded representation of the passed 32-bit signed
-// integer to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.1 - Integer
-// 	32-bit big-endian signed integer in range [-2147483648, 2147483647]
-func (enc *Encoder) EncodeInt(v int32) (err error) {
-	b := make([]byte, 4, 4)
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-
-	if len(enc.data) > maxInt-4 {
-		err = marshalError("EncodeInt", ErrOverflow, errMaxSlice, b)
-		return
-	}
-
-	enc.data = append(enc.data, b...)
-	return
-}
-
-// EncodeInt appends the XDR encoded representation of the passed 32-bit
-// unsigned integer to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.2 - Unsigned Integer
-// 	32-bit big-endian unsigned integer in range [0, 4294967295]
-func (enc *Encoder) EncodeUint(v uint32) (err error) {
-	b := make([]byte, 4, 4)
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-
-	if len(enc.data) > maxInt-4 {
-		err = marshalError("EncodeUint", ErrOverflow, errMaxSlice, b)
-		return
-	}
-
-	enc.data = append(enc.data, b...)
-	return
-}
-
-// EncodeEnum treats the passed 32-bit signed integer as an enumeration value
-// and, if it is in the list of passed valid enumeration values, appends the XDR
-// encoded representation of it to the Encoder's data.
-//
-// A MarshalError is returned if the enumeration value is not one of the provided
-// valid values or appending the data would overflow the internal data slice.
-//
-// Reference:
-// 	RFC Section 4.3 - Enumeration
-// 	Represented as an XDR encoded signed integer
-func (enc *Encoder) EncodeEnum(v int32, validEnums map[int32]bool) (err error) {
-	if !validEnums[v] {
-		err = marshalError("EncodeEnum", ErrBadEnumValue, "invalid enum", v)
-		return
-	}
-	return enc.EncodeInt(v)
-}
-
-// EncodeInt appends the XDR encoded representation of the passed boolean
-// to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.4 - Boolean
-// 	Represented as an XDR encoded enumeration where 0 is false and 1 is true
-func (enc *Encoder) EncodeBool(v bool) (err error) {
-	i := int32(0)
-	if v == true {
-		i = 1
-	}
-	return enc.EncodeInt(i)
-}
-
-// EncodeHyper appends the XDR encoded representation of the passed 64-bit
-// signed integer to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.5 - Hyper Integer
-// 	64-bit big-endian signed integer in range [-9223372036854775808, 9223372036854775807]
-func (enc *Encoder) EncodeHyper(v int64) (err error) {
-	b := make([]byte, 8, 8)
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-
-	if len(enc.data) > maxInt-8 {
-		err = marshalError("EncodeHyper", ErrOverflow, errMaxSlice, b)
-		return
-	}
-
-	enc.data = append(enc.data, b...)
-	return
-}
-
-// EncodeUhyper appends the XDR encoded representation of the passed 64-bit
-// unsigned integer to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.5 - Unsigned Hyper Integer
-// 	64-bit big-endian unsigned integer in range [0, 18446744073709551615]
-func (enc *Encoder) EncodeUhyper(v uint64) (err error) {
-	b := make([]byte, 8, 8)
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-
-	if len(enc.data) > maxInt-8 {
-		err = marshalError("EncodeUhyper", ErrOverflow, errMaxSlice, b)
-		return
-	}
-
-	enc.data = append(enc.data, b...)
-	return
-}
-
-// EncodeFloat appends the XDR encoded representation of the passed 32-bit
-// (single-precision) floating point to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.6 - Floating Point
-// 	32-bit single-precision IEEE 754 floating point
-func (enc *Encoder) EncodeFloat(v float32) (err error) {
-	ui := math.Float32bits(v)
-	return enc.EncodeUint(ui)
-}
-
-// EncodeDouble appends the XDR encoded representation of the passed 64-bit
-// (double-precision) floating point to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.7 -  Double-Precision Floating Point
-// 	64-bit double-precision IEEE 754 floating point
-func (enc *Encoder) EncodeDouble(v float64) (err error) {
-	ui := math.Float64bits(v)
-	return enc.EncodeUhyper(ui)
-}
-
-// RFC Section 4.8 -  Quadruple-Precision Floating Point
-// 128-bit quadruple-precision floating point
-// Not Implemented
-
-// EncodeFixedOpaque treats the passed byte slice as opaque data of a fixed
-// size and appends the XDR encoded representation of it to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice.
-//
-// Reference:
-// 	RFC Section 4.9 - Fixed-Length Opaque Data
-// 	Fixed-length uninterpreted data zero-padded to a multiple of four
-func (enc *Encoder) EncodeFixedOpaque(v []byte) (err error) {
-	l := len(v)
-	pad := (4 - (l % 4)) % 4
-	size := l + pad
-
-	if len(enc.data) > maxInt-size {
-		err = marshalError("EncodeFixedOpaque", ErrOverflow, errMaxSlice, size)
-		return
-	}
-
-	enc.data = append(enc.data, v...)
-	if pad > 0 {
-		b := make([]byte, pad, pad)
-		for i := 0; i < pad; i++ {
-			b[i] = 0
-		}
-		enc.data = append(enc.data, b...)
-	}
-	return
-}
-
-// EncodeOpaque treats the passed byte slice as opaque data of a variable
-// size and appends the XDR encoded representation of it to the Encoder's data.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice or the data in the byte slice is larger than XDR
-// supports.
-//
-// Reference:
-// 	RFC Section 4.10 - Variable-Length Opaque Data
-// 	Unsigned integer length followed by fixed opaque data of that length
-func (enc *Encoder) EncodeOpaque(v []byte) (err error) {
-	dataLen := len(v)
-	if uint(dataLen) > math.MaxUint32 {
-		err = marshalError("EncodeOpaque", ErrOverflow, errMaxXdr, dataLen)
-		return
-	}
-	err = enc.EncodeUint(uint32(dataLen))
-	if err != nil {
-		return
-	}
-	err = enc.EncodeFixedOpaque(v)
-	return
-}
-
-// EncodeString appends the XDR encoded representation of the passed string
-// to the Encoder's data.  Character encoding is assumed to be UTF-8 and
-// therefore ASCII compatible.  If the underlying character encoding
-// is not compatible with this assumption, the data can instead be written as
-// variable-length opaque data (EncodeOpaque) and manually converted as needed.
-//
-// A MarshalError is returned if appending the data would overflow the
-// internal data slice or the length of the string is larger than XDR supports.
-//
-// Reference:
-// 	RFC Section 4.11 - String
-// 	Unsigned integer length followed by bytes zero-padded to a multiple of four
-func (enc *Encoder) EncodeString(v string) (err error) {
-	dataLen := len(v)
-	if uint(dataLen) > math.MaxUint32 {
-		err = marshalError("EncodeString", ErrOverflow, errMaxXdr, dataLen)
-		return
-	}
-	err = enc.EncodeUint(uint32(dataLen))
-	if err != nil {
-		return
-	}
-	err = enc.EncodeFixedOpaque([]byte(v))
-	return
-}
-
-// encodeFixedArray appends the XDR encoded representation of each element
-// in the passed array represented by the reflection value to the Encoder's
-// data.  The ignoreOpaque flag controls whether or not uint8 (byte) elements
-// should be encoded individually or as a fixed sequence of opaque data.
-//
-// A MarshalError is returned if any issues are encountered while encoding
-// the array elements.
-//
-// Reference:
-// 	RFC Section 4.12 - Fixed-Length Array
-// 	Individually XDR encoded array elements
-func (enc *Encoder) encodeFixedArray(v reflect.Value, ignoreOpaque bool) (err error) {
-	// Treat [#]byte (byte is alias for uint8) as opaque data unless ignored.
-	if !ignoreOpaque && v.Type().Elem().Kind() == reflect.Uint8 {
-		// Create a slice of the underlying array for better efficiency when
-		// possible.  Can't create a slice of an unaddressable value.
-		if v.CanAddr() {
-			err = enc.EncodeFixedOpaque(v.Slice(0, v.Len()).Bytes())
-			return
-		}
-
-		// When the underlying array isn't addressable fall back to copying the
-		// array into a new slice.  This is rather ugly, but the inability to
-		// create a constant slice from an unaddressable array seems to be a
-		// limitation of Go.
-		slice := make([]byte, v.Len(), v.Len())
-		reflect.Copy(reflect.ValueOf(slice), v)
-		err = enc.EncodeFixedOpaque(slice)
-		return
-	}
-
-	// Encode each array element.
-	for i := 0; i < v.Len(); i++ {
-		err = enc.encode(v.Index(i))
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// encodeArray appends an XDR encoded integer representing the number of
-// elements in the passed slice represented by the reflection value followed by
-// the XDR encoded representation of each element in slice to the Encoder's
-// data.  The ignoreOpaque flag controls whether or not uint8 (byte) elements
-// should be encoded individually or as a variable sequence of opaque data.
-//
-// A MarshalError is returned if any issues are encountered while encoding
-// the array elements.
-//
-// Reference:
-// 	RFC Section 4.13 - Variable-Length Array
-// 	Unsigned integer length followed by individually XDR encoded array elements
-func (enc *Encoder) encodeArray(v reflect.Value, ignoreOpaque bool) (err error) {
-	numItems := uint32(v.Len())
-	err = enc.encode(reflect.ValueOf(numItems))
-	if err != nil {
-		return err
-	}
-	err = enc.encodeFixedArray(v, ignoreOpaque)
-	return
-}
-
-// encodeStruct appends an XDR encoded representation of each value in the
-// exported fields of the struct represented by the passed reflection value to
-// the Encoder's data.  Pointers are automatically indirected through arbitrary
-// depth to encode the actual value pointed to.
-//
-// A MarshalError is returned if any issues are encountered while encoding
-// the elements.
-//
-// Reference:
-// 	RFC Section 4.14 - Structure
-// 	XDR encoded elements in the order of their declaration in the struct
-func (enc *Encoder) encodeStruct(v reflect.Value) (err error) {
-	vt := v.Type()
-	for i := 0; i < v.NumField(); i++ {
-		// Skip unexported fields and indirect through pointers.
-		vtf := vt.Field(i)
-		if vtf.PkgPath != "" {
-			continue
-		}
-		vf := v.Field(i)
-		vf = enc.indirect(vf)
-
-		// Handle non-opaque data to []uint8 and [#]uint8 based on struct tag.
-		tag := vtf.Tag.Get("xdropaque")
-		if tag == "false" {
-			switch vf.Kind() {
-			case reflect.Slice:
-				err = enc.encodeArray(vf, true)
-				if err != nil {
-					return
-				}
-				continue
-
-			case reflect.Array:
-				err = enc.encodeFixedArray(vf, true)
-				if err != nil {
-					return
-				}
-				continue
-			}
-		}
-
-		// Encode each struct field.
-		err = enc.encode(vf)
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// RFC Section 4.15 - Discriminated Union
-// RFC Section 4.16 - Void
-// RFC Section 4.17 - Constant
-// RFC Section 4.18 - Typedef
-// RFC Section 4.19 - Optional data
-// RFC Sections 4.15 though 4.19 only apply to the data specification language
-// which is not implemented by this package.  In the case of discriminated
-// unions, struct tags are used to perform a similar function.
-
-// encodeMap treats the map represented by the passed reflection value as a
-// variable-length array of 2-element structures whose fields are of the same
-// type as the map keys and elements and appends its XDR encoded representation
-// to the Encoder's data.
-//
-// A MarshalError is returned if any issues are encountered while encoding
-// the elements.
-func (enc *Encoder) encodeMap(v reflect.Value) (err error) {
-	dataLen := v.Len()
-	if uint(dataLen) > math.MaxUint32 {
-		err = marshalError("encodeMap", ErrOverflow, errMaxXdr, dataLen)
-		return
-	}
-	err = enc.EncodeUint(uint32(dataLen))
-	if err != nil {
-		return
-	}
-
-	// Encode each key and value according to their type.
-	for _, key := range v.MapKeys() {
-		err = enc.encode(key)
-		if err != nil {
-			return
-		}
-
-		err = enc.encode(v.MapIndex(key))
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// encodeInterface examines the interface represented by the passed reflection
-// value to detect whether it is an interface that can be encoded if it is,
-// extracts the underlying value to pass back into the encode function for
-// encoding according to its type.
-//
-// A MarshalError is returned if any issues are encountered while encoding
-// the interface.
-func (enc *Encoder) encodeInterface(v reflect.Value) (err error) {
-	if v.IsNil() || !v.CanInterface() {
-		msg := fmt.Sprintf("can't encode nil interface")
-		err = marshalError("encodeInterface", ErrNilInterface, msg, nil)
-		return err
-	}
-
-	// Extract underlying value from the interface and indirect through pointers.
-	ve := reflect.ValueOf(v.Interface())
-	ve = enc.indirect(ve)
-	return enc.encode(ve)
-}
-
-// encode is the main workhorse for marshalling via reflection.  It uses
-// the passed reflection value to choose the XDR primitives to encode into
-// the data field of the Encoder.  It is a recursive function, so cyclic data
-// structures are not supported and will result in an infinite loop.
-func (enc *Encoder) encode(v reflect.Value) (err error) {
-	if !v.IsValid() {
-		msg := fmt.Sprintf("type '%s' is not valid", v.Kind().String())
-		err = marshalError("encode", ErrUnsupportedType, msg, nil)
-		return
-	}
-
-	// Indirect through pointers to get at the concrete value.
-	ve := enc.indirect(v)
-
-	// Handle time.Time values by encoding them as an RFC3339 formatted
-	// string with nanosecond precision.  Check the type string before
-	// doing a full blown conversion to interface and type assertion since
-	// checking a string is much quicker.
-	if ve.Type().String() == "time.Time" && ve.CanInterface() {
-		viface := ve.Interface()
-		if tv, ok := viface.(time.Time); ok {
-			err = enc.EncodeString(tv.Format(time.RFC3339Nano))
-			return
-		}
-	}
-
-	// Handle native Go types.
-	switch ve.Kind() {
-	case reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int:
-		err = enc.EncodeInt(int32(ve.Int()))
-
-	case reflect.Int64:
-		err = enc.EncodeHyper(ve.Int())
-
-	case reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint:
-		err = enc.EncodeUint(uint32(ve.Uint()))
-
-	case reflect.Uint64:
-		err = enc.EncodeUhyper(ve.Uint())
-
-	case reflect.Bool:
-		err = enc.EncodeBool(ve.Bool())
-
-	case reflect.Float32:
-		err = enc.EncodeFloat(float32(ve.Float()))
-
-	case reflect.Float64:
-		err = enc.EncodeDouble(ve.Float())
-
-	case reflect.String:
-		err = enc.EncodeString(ve.String())
-
-	case reflect.Array:
-		err = enc.encodeFixedArray(ve, false)
-
-	case reflect.Slice:
-		err = enc.encodeArray(ve, false)
-
-	case reflect.Struct:
-		err = enc.encodeStruct(ve)
-
-	case reflect.Map:
-		err = enc.encodeMap(ve)
-
-	case reflect.Interface:
-		err = enc.encodeInterface(ve)
-
-	// reflect.Uintptr, reflect.UnsafePointer
-	default:
-		msg := fmt.Sprintf("unsupported Go type '%s'", ve.Kind().String())
-		err = marshalError("encode", ErrUnsupportedType, msg, nil)
-	}
-
-	return
-}
-
-// indirect dereferences pointers until it reaches a non-pointer.  This allows
-// transparent encoding through arbitrary levels of indirection.
-func (enc *Encoder) indirect(v reflect.Value) (rv reflect.Value) {
-	rv = v
-	for rv.Kind() == reflect.Ptr {
-		rv = rv.Elem()
-	}
-	return
-}
-
-// Data returns the XDR encoded data stored in the Encoder.
-func (enc *Encoder) Data() (rv []byte) {
-	return enc.data[:]
-}
-
-// Reset clears the internal XDR encoded data so the Encoder may be reused.
-func (enc *Encoder) Reset() {
-	enc.data = enc.data[0:0]
-}
-
-// NewEncoder returns an object that can be used to manually build an XDR
-// encoded byte slice.  Typically, Marshal should be used instead of manually
-// creating an Encoder. An Encoder, along with several of its methods to encode
-// XDR primitives, is exposed so it is possible to perform manual encoding of
-// data without relying on reflection should it be necessary in complex
-// scenarios where automatic reflection-based decoding won't work.
-func NewEncoder() *Encoder {
-	return &Encoder{}
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/encode_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/encode_test.go
deleted file mode 100644
index bf8940bdf6..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/encode_test.go
+++ /dev/null
@@ -1,448 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-	"time"
-)
-
-// TestMarshal executes all of the tests described by marshalTests.
-func TestMarshal(t *testing.T) {
-	// Variables for various unsupported Marshal types.
-	var nilInterface interface{}
-	var testChan chan int
-	var testFunc func()
-	var testComplex64 complex64
-	var testComplex128 complex128
-
-	// testInterface is used to test Marshal with values nested in an
-	// interface.
-	testInterface := interface{}(17)
-
-	// structMarshalTestIn is input data for the big struct test of all
-	// supported types.
-	structMarshalTestIn := allTypesTest{
-		127,                                // A
-		255,                                // B
-		32767,                              // C
-		65535,                              // D
-		2147483647,                         // E
-		4294967295,                         // F
-		9223372036854775807,                // G
-		18446744073709551615,               // H
-		true,                               // I
-		3.14,                               // J
-		3.141592653589793,                  // K
-		"xdr",                              // L
-		[]byte{1, 2, 3, 4},                 // M
-		[3]byte{1, 2, 3},                   // N
-		[]int16{512, 1024, 2048},           // O
-		[2]subTest{{"one", 1}, {"two", 2}}, // P
-		subTest{"bar", 3},                  // Q
-		map[string]uint32{"map1": 1},       // R
-		time.Unix(1396581888, 0).UTC(),     // S
-	}
-
-	// structMarshalTestWant is the expected output after marshalling
-	// structMarshalTestIn.
-	structMarshalTestWant := []byte{
-		0x00, 0x00, 0x00, 0x7F, // A
-		0x00, 0x00, 0x00, 0xFF, // B
-		0x00, 0x00, 0x7F, 0xFF, // C
-		0x00, 0x00, 0xFF, 0xFF, // D
-		0x7F, 0xFF, 0xFF, 0xFF, // E
-		0xFF, 0xFF, 0xFF, 0xFF, // F
-		0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // G
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // H
-		0x00, 0x00, 0x00, 0x01, // I
-		0x40, 0x48, 0xF5, 0xC3, // J
-		0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, // K
-		0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00, // L
-		0x00, 0x00, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04, // M
-		0x01, 0x02, 0x03, 0x00, // N
-		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00,
-		0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, // O
-		0x00, 0x00, 0x00, 0x03, 0x6F, 0x6E, 0x65, 0x00, // P[0].A
-		0x00, 0x00, 0x00, 0x01, // P[0].B
-		0x00, 0x00, 0x00, 0x03, 0x74, 0x77, 0x6F, 0x00, // P[1].A
-		0x00, 0x00, 0x00, 0x02, // P[1].B
-		0x00, 0x00, 0x00, 0x03, 0x62, 0x61, 0x72, 0x00, // Q.A
-		0x00, 0x00, 0x00, 0x03, // Q.B
-		0x00, 0x00, 0x00, 0x01, // R length
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, // R key map1
-		0x00, 0x00, 0x00, 0x01, // R value map1
-		0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-		0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-		0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a, // S
-	}
-
-	tests := []struct {
-		in   interface{}
-		want []byte
-		err  error
-	}{
-		// interface
-		{testInterface, []byte{0x00, 0x00, 0x00, 0x11}, nil},
-		{&testInterface, []byte{0x00, 0x00, 0x00, 0x11}, nil},
-
-		// int8 - XDR Integer
-		{int8(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{int8(64), []byte{0x00, 0x00, 0x00, 0x40}, nil},
-		{int8(127), []byte{0x00, 0x00, 0x00, 0x7F}, nil},
-		{int8(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{int8(-128), []byte{0xFF, 0xFF, 0xFF, 0x80}, nil},
-
-		// uint8 - XDR Unsigned Integer
-		{uint8(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{uint8(64), []byte{0x00, 0x00, 0x00, 0x40}, nil},
-		{uint8(255), []byte{0x00, 0x00, 0x00, 0xFF}, nil},
-
-		// int16 - XDR Integer
-		{int16(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{int16(1024), []byte{0x00, 0x00, 0x04, 0x00}, nil},
-		{int16(32767), []byte{0x00, 0x00, 0x7F, 0xFF}, nil},
-		{int16(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{int16(-32768), []byte{0xFF, 0xFF, 0x80, 0x00}, nil},
-
-		// uint16 - XDR Unsigned Integer
-		{uint16(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{uint16(1024), []byte{0x00, 0x00, 0x04, 0x00}, nil},
-		{uint16(65535), []byte{0x00, 0x00, 0xFF, 0xFF}, nil},
-
-		// int32 - XDR Integer
-		{int32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{int32(262144), []byte{0x00, 0x04, 0x00, 0x00}, nil},
-		{int32(2147483647), []byte{0x7F, 0xFF, 0xFF, 0xFF}, nil},
-		{int32(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{int32(-2147483648), []byte{0x80, 0x00, 0x00, 0x00}, nil},
-
-		// uint32 - XDR Unsigned Integer
-		{uint32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{uint32(262144), []byte{0x00, 0x04, 0x00, 0x00}, nil},
-		{uint32(4294967295), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-
-		// int64 - XDR Hyper Integer
-		{int64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{int64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, nil},
-		{int64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{int64(9223372036854775807), []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{int64(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// uint64 - XDR Unsigned Hyper Integer
-		{uint64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{uint64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, nil},
-		{uint64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{uint64(18446744073709551615), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{uint64(9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// bool - XDR Integer
-		{false, []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{true, []byte{0x00, 0x00, 0x00, 0x01}, nil},
-
-		// float32 - XDR Floating-Point
-		{float32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{float32(3.14), []byte{0x40, 0x48, 0xF5, 0xC3}, nil},
-		{float32(1234567.0), []byte{0x49, 0x96, 0xB4, 0x38}, nil},
-		{float32(math.Inf(-1)), []byte{0xFF, 0x80, 0x00, 0x00}, nil},
-		{float32(math.Inf(0)), []byte{0x7F, 0x80, 0x00, 0x00}, nil},
-
-		// float64 - XDR Double-precision Floating-Point
-		{float64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, nil},
-		{float64(math.Inf(-1)), []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{float64(math.Inf(0)), []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// string - XDR String
-		{"", []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{"xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, nil},
-		{"τ=2π", []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, nil},
-
-		// []byte - XDR Variable Opaque
-		{[]byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, nil},
-		{[]byte{0x01, 0x02, 0x03}, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, nil},
-
-		// [#]byte - XDR Fixed Opaque
-		{[1]byte{0x01}, []byte{0x01, 0x00, 0x00, 0x00}, nil}, // No & here to test unaddressable arrays
-		{&[2]byte{0x01, 0x02}, []byte{0x01, 0x02, 0x00, 0x00}, nil},
-		{&[3]byte{0x01, 0x02, 0x03}, []byte{0x01, 0x02, 0x03, 0x00}, nil},
-		{&[4]byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, nil},
-		{&[5]byte{0x01, 0x02, 0x03, 0x04, 0x05}, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, nil},
-
-		// []<type> - XDR Variable-Length Array
-		{&[]int16{512, 1024, 2048},
-			[]byte{0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00},
-			nil},
-		{[]bool{true, false}, []byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// [#]<type> - XDR Fixed-Length Array
-		{&[2]uint32{512, 1024}, []byte{0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00}, nil},
-
-		// map[string]uint32
-		{map[string]uint32{"map1": 1},
-			[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, 0x00, 0x00, 0x00, 0x01},
-			nil},
-
-		// time.Time - XDR String per RFC3339
-		{time.Unix(1396581888, 0).UTC(),
-			[]byte{
-				0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-				0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-				0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a,
-			}, nil},
-
-		// struct - XDR Structure -- test struct contains all supported types
-		{&structMarshalTestIn, structMarshalTestWant, nil},
-
-		// Expected errors
-		{nilInterface, nil, &MarshalError{ErrorCode: ErrNilInterface}},
-		{&nilInterface, nil, &MarshalError{ErrorCode: ErrNilInterface}},
-		{testChan, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testChan, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testFunc, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testFunc, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testComplex64, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testComplex64, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testComplex128, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testComplex128, nil, &MarshalError{ErrorCode: ErrUnsupportedType}},
-	}
-
-	for i, test := range tests {
-		rv, err := Marshal(test.in)
-		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
-			t.Errorf("Marshal #%d failed to detect error - got: %v <%T> want: %T",
-				i, err, err, test.err)
-			continue
-		}
-		if rerr, ok := err.(*MarshalError); ok {
-			if terr, ok := test.err.(*MarshalError); ok {
-				if rerr.ErrorCode != terr.ErrorCode {
-					t.Errorf("Marshal #%d failed to detect error code - got: %v want: %v",
-						i, rerr.ErrorCode, terr.ErrorCode)
-					continue
-				}
-				// Got expected error.  Move on to the next test.
-				continue
-			}
-		}
-
-		if len(rv) != len(test.want) {
-			t.Errorf("Marshal #%d len got: %v want: %v\n", i, len(rv), len(test.want))
-			continue
-		}
-		if !reflect.DeepEqual(rv, test.want) {
-			t.Errorf("Marshal #%d got: %v want: %v\n", i, rv, test.want)
-			continue
-		}
-	}
-}
-
-// encodeFunc is used to identify which public function of the Encoder object
-// a test applies to.
-type encodeFunc int
-
-const (
-	fEncodeBool encodeFunc = iota
-	fEncodeDouble
-	fEncodeEnum
-	fEncodeFixedOpaque
-	fEncodeFloat
-	fEncodeHyper
-	fEncodeInt
-	fEncodeOpaque
-	fEncodeString
-	fEncodeUhyper
-	fEncodeUint
-)
-
-// Map of encodeFunc values to names for pretty printing.
-var encodeFuncStrings = map[encodeFunc]string{
-	fEncodeBool:        "EncodeBool",
-	fEncodeDouble:      "EncodeDouble",
-	fEncodeEnum:        "EncodeEnum",
-	fEncodeFixedOpaque: "EncodeFixedOpaque",
-	fEncodeFloat:       "EncodeFloat",
-	fEncodeHyper:       "EncodeHyper",
-	fEncodeInt:         "EncodeInt",
-	fEncodeOpaque:      "EncodeOpaque",
-	fEncodeString:      "EncodeString",
-	fEncodeUhyper:      "EncodeUhyper",
-	fEncodeUint:        "EncodeUint",
-}
-
-func (f encodeFunc) String() string {
-	if s := encodeFuncStrings[f]; s != "" {
-		return s
-	}
-	return fmt.Sprintf("Unknown encodeFunc (%d)", f)
-}
-
-// TestEncoder executes all of the tests described by encodeTests.
-func TestEncoder(t *testing.T) {
-	tests := []struct {
-		f    encodeFunc
-		in   interface{}
-		want []byte
-		err  error
-	}{
-		// Bool
-		{fEncodeBool, false, []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeBool, true, []byte{0x00, 0x00, 0x00, 0x01}, nil},
-
-		// Double
-		{fEncodeDouble, float64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeDouble, float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, nil},
-		{fEncodeDouble, float64(math.Inf(-1)), []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeDouble, float64(math.Inf(0)), []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// Enum
-		{fEncodeEnum, int32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeEnum, int32(1), []byte{0x00, 0x00, 0x00, 0x01}, nil},
-		{fEncodeEnum, int32(2), nil, &MarshalError{ErrorCode: ErrBadEnumValue}},
-		{fEncodeEnum, int32(1234), nil, &MarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// FixedOpaque
-		{fEncodeFixedOpaque, []byte{0x01}, []byte{0x01, 0x00, 0x00, 0x00}, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02}, []byte{0x01, 0x02, 0x00, 0x00}, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03}, []byte{0x01, 0x02, 0x03, 0x00}, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04, 0x05}, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, nil},
-
-		// Float
-		{fEncodeFloat, float32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeFloat, float32(3.14), []byte{0x40, 0x48, 0xF5, 0xC3}, nil},
-		{fEncodeFloat, float32(1234567.0), []byte{0x49, 0x96, 0xB4, 0x38}, nil},
-		{fEncodeFloat, float32(math.Inf(-1)), []byte{0xFF, 0x80, 0x00, 0x00}, nil},
-		{fEncodeFloat, float32(math.Inf(0)), []byte{0x7F, 0x80, 0x00, 0x00}, nil},
-
-		// Hyper
-		{fEncodeHyper, int64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeHyper, int64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeHyper, int64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeHyper, int64(9223372036854775807), []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{fEncodeHyper, int64(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{fEncodeHyper, int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// Int
-		{fEncodeInt, int32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeInt, int32(262144), []byte{0x00, 0x04, 0x00, 0x00}, nil},
-		{fEncodeInt, int32(2147483647), []byte{0x7F, 0xFF, 0xFF, 0xFF}, nil},
-		{fEncodeInt, int32(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{fEncodeInt, int32(-2147483648), []byte{0x80, 0x00, 0x00, 0x00}, nil},
-
-		// Opaque
-		{fEncodeOpaque, []byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, nil},
-		{fEncodeOpaque, []byte{0x01, 0x02, 0x03}, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, nil},
-
-		// String
-		{fEncodeString, "", []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeString, "xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, nil},
-		{fEncodeString, "τ=2π", []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, nil},
-
-		// Uhyper
-		{fEncodeUhyper, uint64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeUhyper, uint64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeUhyper, uint64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeUhyper, uint64(18446744073709551615), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, nil},
-		{fEncodeUhyper, uint64(9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, nil},
-
-		// Uint
-		{fEncodeUint, uint32(0), []byte{0x00, 0x00, 0x00, 0x00}, nil},
-		{fEncodeUint, uint32(262144), []byte{0x00, 0x04, 0x00, 0x00}, nil},
-		{fEncodeUint, uint32(4294967295), []byte{0xFF, 0xFF, 0xFF, 0xFF}, nil},
-	}
-
-	validEnums := make(map[int32]bool)
-	validEnums[0] = true
-	validEnums[1] = true
-
-	var err error
-	enc := NewEncoder()
-
-	for i, test := range tests {
-		err = nil
-		enc.Reset()
-		switch test.f {
-		case fEncodeBool:
-			in := test.in.(bool)
-			err = enc.EncodeBool(in)
-		case fEncodeDouble:
-			in := test.in.(float64)
-			err = enc.EncodeDouble(in)
-		case fEncodeEnum:
-			in := test.in.(int32)
-			err = enc.EncodeEnum(in, validEnums)
-		case fEncodeFixedOpaque:
-			in := test.in.([]byte)
-			err = enc.EncodeFixedOpaque(in)
-		case fEncodeFloat:
-			in := test.in.(float32)
-			err = enc.EncodeFloat(in)
-		case fEncodeHyper:
-			in := test.in.(int64)
-			err = enc.EncodeHyper(in)
-		case fEncodeInt:
-			in := test.in.(int32)
-			err = enc.EncodeInt(in)
-		case fEncodeOpaque:
-			in := test.in.([]byte)
-			err = enc.EncodeOpaque(in)
-		case fEncodeString:
-			in := test.in.(string)
-			err = enc.EncodeString(in)
-		case fEncodeUhyper:
-			in := test.in.(uint64)
-			err = enc.EncodeUhyper(in)
-		case fEncodeUint:
-			in := test.in.(uint32)
-			err = enc.EncodeUint(in)
-		default:
-			t.Errorf("%v #%d unrecognized function", test.f, i)
-			continue
-		}
-		if reflect.TypeOf(err) != reflect.TypeOf(test.err) {
-			t.Errorf("%v #%d failed to detect error - got: %v <%T> want: %T",
-				test.f, i, err, err, test.err)
-			continue
-		}
-		if rerr, ok := err.(*MarshalError); ok {
-			if terr, ok := test.err.(*MarshalError); ok {
-				if rerr.ErrorCode != terr.ErrorCode {
-					t.Errorf("%v #%d failed to detect error code - got: %v want: %v",
-						test.f, i, rerr.ErrorCode, terr.ErrorCode)
-					continue
-				}
-				// Got expected error.  Move on to the next test.
-				continue
-			}
-		}
-
-		rv := enc.Data()
-		if len(rv) != len(test.want) {
-			t.Errorf("%v #%d len got: %v want: %v\n", test.f, i, len(rv), len(test.want))
-			continue
-		}
-		if !reflect.DeepEqual(rv, test.want) {
-			t.Errorf("%v #%d got: %v want: %v\n", test.f, i, rv, test.want)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/error.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/error.go
deleted file mode 100644
index 90e46a08e4..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/error.go
+++ /dev/null
@@ -1,152 +0,0 @@
-/*
- * Copyright (c) 2012 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr
-
-import (
-	"fmt"
-)
-
-// ErrorCode identifies a kind of error.
-type ErrorCode int
-
-const (
-	// ErrBadArguments indicates arguments passed to the function are not
-	// what was expected.
-	ErrBadArguments ErrorCode = iota
-
-	// ErrUnsupportedType indicates the Go type is not a supported type for
-	// marshalling and unmarshalling XDR data.
-	ErrUnsupportedType
-
-	// ErrUnexpectedEnd indicates the end of a sequence of bytes was encountered
-	// before it was expected.  This typically indicates issues such as
-	// truncated data or improper structure.
-	ErrUnexpectedEnd
-
-	// ErrBadEnumValue indicates an enumeration value is not in the list of
-	// valid values.
-	ErrBadEnumValue
-
-	// ErrNotSettable indicates an interface value cannot be written to.  This
-	// usually means the interface value was not passed with the & operator, but
-	// it can also happen if automatic pointer allocation fails.
-	ErrNotSettable
-
-	// ErrOverflow indicates that the data in question is too large to fit into
-	// the corresponding Go or XDR data type.  For example, an integer decoded
-	// from XDR that is too large to fit into a target type of int8, or opaque
-	// data that exceeds the max length of a Go slice.
-	ErrOverflow
-
-	// ErrNilInterface indicates an interface with no concrete type information
-	// was encountered.  Type information is necessary to perform mapping
-	// between XDR and Go types.
-	ErrNilInterface
-)
-
-// Map of ErrorCode values back to their constant names for pretty printing.
-var errorCodeStrings = map[ErrorCode]string{
-	ErrBadArguments:    "ErrBadArguments",
-	ErrUnsupportedType: "ErrUnsupportedType",
-	ErrUnexpectedEnd:   "ErrUnexpectedEnd",
-	ErrBadEnumValue:    "ErrBadEnumValue",
-	ErrNotSettable:     "ErrNotSettable",
-	ErrOverflow:        "ErrOverflow",
-	ErrNilInterface:    "ErrNilInterface",
-}
-
-// String returns the ErrorCode as a human-readable name.
-func (e ErrorCode) String() string {
-	if s := errorCodeStrings[e]; s != "" {
-		return s
-	}
-	return fmt.Sprintf("Unknown ErrorCode (%d)", e)
-}
-
-// UnmarshalError describes a problem encountered while unmarshaling data.
-// Some potential issues are unsupported Go types, attempting to decode a value
-// which is too large to fit into a specified Go type, and exceeding max slice
-// limitations.
-type UnmarshalError struct {
-	ErrorCode   ErrorCode   // Describes the kind of error
-	Func        string      // Function name
-	Value       interface{} // Value actually parsed where appropriate
-	Description string      // Human readable description of the issue
-}
-
-// Error satisfies the error interface and prints human-readable errors.
-func (e *UnmarshalError) Error() string {
-	switch e.ErrorCode {
-	case ErrUnexpectedEnd, ErrBadEnumValue, ErrOverflow:
-		return fmt.Sprintf("xdr:%s: %s - read: '%v'", e.Func, e.Description, e.Value)
-	}
-	return fmt.Sprintf("xdr:%s: %s", e.Func, e.Description)
-}
-
-// unmarshalError creates an error given a set of arguments and will copy byte
-// slices into the Value field since they might otherwise be changed from from
-// the original value.
-func unmarshalError(f string, c ErrorCode, desc string, v interface{}) *UnmarshalError {
-	e := &UnmarshalError{ErrorCode: c, Func: f, Description: desc}
-	switch t := v.(type) {
-	case []byte:
-		slice := make([]byte, len(t))
-		copy(slice, t)
-		e.Value = slice
-	default:
-		e.Value = v
-	}
-
-	return e
-}
-
-// MarshalError describes a problem encountered while marshaling data.
-// Some potential issues are unsupported Go types, attempting to encode more
-// opaque data than can be represented by a single opaque XDR entry, and
-// exceeding max slice limitations.
-type MarshalError struct {
-	ErrorCode   ErrorCode   // Describes the kind of error
-	Func        string      // Function name
-	Value       interface{} // Value actually parsed where appropriate
-	Description string      // Human readable description of the issue
-}
-
-// Error satisfies the error interface and prints human-readable errors.
-func (e *MarshalError) Error() string {
-	switch e.ErrorCode {
-	case ErrUnexpectedEnd, ErrBadEnumValue, ErrOverflow:
-		return fmt.Sprintf("xdr:%s: %s - read: '%v'", e.Func, e.Description, e.Value)
-	}
-	return fmt.Sprintf("xdr:%s: %s", e.Func, e.Description)
-}
-
-// marshalError creates an error given a set of arguments and will copy byte
-// slices into the Value field since they might otherwise be changed from from
-// the original value.
-func marshalError(f string, c ErrorCode, desc string, v interface{}) *MarshalError {
-	e := &MarshalError{ErrorCode: c, Func: f, Description: desc}
-	switch t := v.(type) {
-	case []byte:
-		slice := make([]byte, len(t))
-		copy(slice, t)
-		e.Value = slice
-	default:
-		e.Value = v
-	}
-
-	return e
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr/example_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr/example_test.go
deleted file mode 100644
index 9d86457925..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr/example_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-/*
- * Copyright (c) 2012 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"fmt"
-
-	"github.com/davecgh/go-xdr/xdr"
-)
-
-// This example demonstrates how to use Marshal to automatically XDR encode
-// data using reflection.
-func ExampleMarshal() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// Sample image header data.
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-
-	// Use marshal to automatically determine the appropriate underlying XDR
-	// types and encode.
-	encodedData, err := xdr.Marshal(&h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("encodedData:", encodedData)
-
-	// Output:
-	// encodedData: [171 205 239 0 0 0 0 2 0 0 0 1 0 0 0 10]
-}
-
-// This example demonstrates how to use Unmarshal to decode XDR encoded data from
-// a byte slice into a struct.
-func ExampleUnmarshal() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// XDR encoded data described by the above structure.  Typically this would
-	// be read from a file or across the network, but use a manual byte array
-	// here as an example.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00, // Signature
-		0x00, 0x00, 0x00, 0x02, // Version
-		0x00, 0x00, 0x00, 0x01, // IsGrayscale
-		0x00, 0x00, 0x00, 0x0A} // NumSections
-
-	// Declare a variable to provide Unmarshal with a concrete type and instance
-	// to decode into.
-	var h ImageHeader
-	remainingBytes, err := xdr.Unmarshal(encodedData, &h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("remainingBytes:", remainingBytes)
-	fmt.Printf("h: %+v", h)
-
-	// Output:
-	// remainingBytes: []
-	// h: {Signature:[171 205 239] Version:2 IsGrayscale:true NumSections:10}
-}
-
-// This example demonstrates how to manually decode XDR encoded data from a
-// byte slice. Compare this example with the Unmarshal example which performs
-// the same task automatically by utilizing a struct type definition and
-// reflection.
-func ExampleNewDecoder() {
-
-	// XDR encoded data for a hypothetical ImageHeader struct as follows:
-	// type ImageHeader struct {
-	// 		Signature	[3]byte
-	// 		Version		uint32
-	// 		IsGrayscale	bool
-	// 		NumSections	uint32
-	// }
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00, // Signature
-		0x00, 0x00, 0x00, 0x02, // Version
-		0x00, 0x00, 0x00, 0x01, // IsGrayscale
-		0x00, 0x00, 0x00, 0x0A} // NumSections
-
-	// Get a new decoder for manual decoding.
-	dec := xdr.NewDecoder(encodedData)
-
-	signature, err := dec.DecodeFixedOpaque(3)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	version, err := dec.DecodeUint()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	isGrayscale, err := dec.DecodeBool()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	numSections, err := dec.DecodeUint()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("signature:", signature)
-	fmt.Println("version:", version)
-	fmt.Println("isGrayscale:", isGrayscale)
-	fmt.Println("numSections:", numSections)
-
-	// Output:
-	// signature: [171 205 239]
-	// version: 2
-	// isGrayscale: true
-	// numSections: 10
-}
-
-// This example demonstrates how to manually encode XDR data from Go variables.
-// Compare this example with the Marshal example which performs the same task
-// automatically by utilizing a struct type definition and reflection.
-func ExampleNewEncoder() {
-	// Data for a hypothetical ImageHeader struct as follows:
-	// type ImageHeader struct {
-	// 		Signature	[3]byte
-	//		Version		uint32
-	//		IsGrayscale	bool
-	//		NumSections	uint32
-	// }
-	signature := []byte{0xAB, 0xCD, 0xEF}
-	version := uint32(2)
-	isGrayscale := true
-	numSections := uint32(10)
-
-	// Get a new encoder for manual encoding.
-	enc := xdr.NewEncoder()
-
-	err := enc.EncodeFixedOpaque(signature)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	err = enc.EncodeUint(version)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	err = enc.EncodeBool(isGrayscale)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	err = enc.EncodeUint(numSections)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("encodedData:", enc.Data())
-
-	// Output:
-	// encodedData: [171 205 239 0 0 0 0 2 0 0 0 1 0 0 0 10]
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/bench_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/bench_test.go
deleted file mode 100644
index 0fea4dbb8d..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/bench_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"bytes"
-	"testing"
-	"unsafe"
-
-	"github.com/davecgh/go-xdr/xdr2"
-)
-
-// BenchmarkUnmarshal benchmarks the Unmarshal function by using a dummy
-// ImageHeader structure.
-func BenchmarkUnmarshal(b *testing.B) {
-	b.StopTimer()
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-	// XDR encoded data described by the above structure.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00,
-		0x00, 0x00, 0x00, 0x02,
-		0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x0A,
-	}
-	var h ImageHeader
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		r := bytes.NewReader(encodedData)
-		_, _ = xdr.Unmarshal(r, &h)
-	}
-	b.SetBytes(int64(len(encodedData)))
-}
-
-// BenchmarkMarshal benchmarks the Marshal function by using a dummy ImageHeader
-// structure.
-func BenchmarkMarshal(b *testing.B) {
-	b.StopTimer()
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-	size := unsafe.Sizeof(h)
-	w := bytes.NewBuffer(nil)
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		w.Reset()
-		_, _ = xdr.Marshal(w, &h)
-	}
-	b.SetBytes(int64(size))
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/decode_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/decode_test.go
deleted file mode 100644
index 310629dd15..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/decode_test.go
+++ /dev/null
@@ -1,795 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-	"time"
-
-	. "github.com/davecgh/go-xdr/xdr2"
-)
-
-// subTest is used to allow testing of the Unmarshal function into struct fields
-// which are structs themselves.
-type subTest struct {
-	A string
-	B uint8
-}
-
-// allTypesTest is used to allow testing of the Unmarshal function into struct
-// fields of all supported types.
-type allTypesTest struct {
-	A int8
-	B uint8
-	C int16
-	D uint16
-	E int32
-	F uint32
-	G int64
-	H uint64
-	I bool
-	J float32
-	K float64
-	L string
-	M []byte
-	N [3]byte
-	O []int16
-	P [2]subTest
-	Q *subTest
-	R map[string]uint32
-	S time.Time
-}
-
-// opaqueStruct is used to test handling of uint8 slices and arrays.
-type opaqueStruct struct {
-	Slice []uint8  `xdropaque:"false"`
-	Array [1]uint8 `xdropaque:"false"`
-}
-
-// testExpectedURet is a convenience method to test an expected number of bytes
-// read and error for an unmarshal.
-func testExpectedURet(t *testing.T, name string, n, wantN int, err, wantErr error) bool {
-	// First ensure the number of bytes read is the expected value.  The
-	// byes read should be accurate even when an error occurs.
-	if n != wantN {
-		t.Errorf("%s: unexpected num bytes read - got: %v want: %v\n",
-			name, n, wantN)
-		return false
-	}
-
-	// Next check for the expected error.
-	if reflect.TypeOf(err) != reflect.TypeOf(wantErr) {
-		t.Errorf("%s: failed to detect error - got: %v <%[2]T> want: %T",
-			name, err, wantErr)
-		return false
-	}
-	if rerr, ok := err.(*UnmarshalError); ok {
-		if werr, ok := wantErr.(*UnmarshalError); ok {
-			if rerr.ErrorCode != werr.ErrorCode {
-				t.Errorf("%s: failed to detect error code - "+
-					"got: %v want: %v", name,
-					rerr.ErrorCode, werr.ErrorCode)
-				return false
-			}
-		}
-	}
-
-	return true
-}
-
-// TestUnmarshal ensures the Unmarshal function works properly with all types.
-func TestUnmarshal(t *testing.T) {
-	// Variables for various unsupported Unmarshal types.
-	var nilInterface interface{}
-	var testChan chan int
-	var testFunc func()
-	var testComplex64 complex64
-	var testComplex128 complex128
-
-	// structTestIn is input data for the big struct test of all supported
-	// types.
-	structTestIn := []byte{
-		0x00, 0x00, 0x00, 0x7F, // A
-		0x00, 0x00, 0x00, 0xFF, // B
-		0x00, 0x00, 0x7F, 0xFF, // C
-		0x00, 0x00, 0xFF, 0xFF, // D
-		0x7F, 0xFF, 0xFF, 0xFF, // E
-		0xFF, 0xFF, 0xFF, 0xFF, // F
-		0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // G
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // H
-		0x00, 0x00, 0x00, 0x01, // I
-		0x40, 0x48, 0xF5, 0xC3, // J
-		0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, // K
-		0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00, // L
-		0x00, 0x00, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04, // M
-		0x01, 0x02, 0x03, 0x00, // N
-		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00,
-		0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, // O
-		0x00, 0x00, 0x00, 0x03, 0x6F, 0x6E, 0x65, 0x00, // P[0].A
-		0x00, 0x00, 0x00, 0x01, // P[0].B
-		0x00, 0x00, 0x00, 0x03, 0x74, 0x77, 0x6F, 0x00, // P[1].A
-		0x00, 0x00, 0x00, 0x02, // P[1].B
-		0x00, 0x00, 0x00, 0x03, 0x62, 0x61, 0x72, 0x00, // Q.A
-		0x00, 0x00, 0x00, 0x03, // Q.B
-		0x00, 0x00, 0x00, 0x02, // R length
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, // R key map1
-		0x00, 0x00, 0x00, 0x01, // R value map1
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x32, // R key map2
-		0x00, 0x00, 0x00, 0x02, // R value map2
-		0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-		0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-		0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a, // S
-	}
-
-	// structTestWant is the expected output after unmarshalling
-	// structTestIn.
-	structTestWant := allTypesTest{
-		127,                                     // A
-		255,                                     // B
-		32767,                                   // C
-		65535,                                   // D
-		2147483647,                              // E
-		4294967295,                              // F
-		9223372036854775807,                     // G
-		18446744073709551615,                    // H
-		true,                                    // I
-		3.14,                                    // J
-		3.141592653589793,                       // K
-		"xdr",                                   // L
-		[]byte{1, 2, 3, 4},                      // M
-		[3]byte{1, 2, 3},                        // N
-		[]int16{512, 1024, 2048},                // O
-		[2]subTest{{"one", 1}, {"two", 2}},      // P
-		&subTest{"bar", 3},                      // Q
-		map[string]uint32{"map1": 1, "map2": 2}, // R
-		time.Unix(1396581888, 0).UTC(),          // S
-	}
-
-	tests := []struct {
-		in      []byte      // input bytes
-		wantVal interface{} // expected value
-		wantN   int         // expected number of bytes read
-		err     error       // expected error
-	}{
-		// int8 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int8(0), 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x40}, int8(64), 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x7F}, int8(127), 4, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int8(-1), 4, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0x80}, int8(-128), 4, nil},
-		// Expected Failures -- 128, -129 overflow int8 and not enough
-		// bytes
-		{[]byte{0x00, 0x00, 0x00, 0x80}, int8(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0x7F}, int8(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00}, int8(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// uint8 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint8(0), 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x40}, uint8(64), 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, uint8(255), 4, nil},
-		// Expected Failures -- 256, -1 overflow uint8 and not enough
-		// bytes
-		{[]byte{0x00, 0x00, 0x01, 0x00}, uint8(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint8(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00}, uint8(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// int16 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int16(0), 4, nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00}, int16(1024), 4, nil},
-		{[]byte{0x00, 0x00, 0x7F, 0xFF}, int16(32767), 4, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int16(-1), 4, nil},
-		{[]byte{0xFF, 0xFF, 0x80, 0x00}, int16(-32768), 4, nil},
-		// Expected Failures -- 32768, -32769 overflow int16 and not
-		// enough bytes
-		{[]byte{0x00, 0x00, 0x80, 0x00}, int16(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0x7F, 0xFF}, int16(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00}, uint16(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// uint16 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint16(0), 4, nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00}, uint16(1024), 4, nil},
-		{[]byte{0x00, 0x00, 0xFF, 0xFF}, uint16(65535), 4, nil},
-		// Expected Failures -- 65536, -1 overflow uint16 and not enough
-		// bytes
-		{[]byte{0x00, 0x01, 0x00, 0x00}, uint16(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint16(0), 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00}, uint16(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// int32 - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, int32(0), 4, nil},
-		{[]byte{0x00, 0x04, 0x00, 0x00}, int32(262144), 4, nil},
-		{[]byte{0x7F, 0xFF, 0xFF, 0xFF}, int32(2147483647), 4, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, int32(-1), 4, nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00}, int32(-2147483648), 4, nil},
-		// Expected Failure -- not enough bytes
-		{[]byte{0x00, 0x00, 0x00}, int32(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// uint32 - XDR Unsigned Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, uint32(0), 4, nil},
-		{[]byte{0x00, 0x04, 0x00, 0x00}, uint32(262144), 4, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, uint32(4294967295), 4, nil},
-		// Expected Failure -- not enough bytes
-		{[]byte{0x00, 0x00, 0x00}, uint32(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// int64 - XDR Hyper Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(0), 8, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, int64(1 << 34), 8, nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(1 << 42), 8, nil},
-		{[]byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(9223372036854775807), 8, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(-1), 8, nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(-9223372036854775808), 8, nil},
-		// Expected Failures -- not enough bytes
-		{[]byte{0x7f, 0xff, 0xff}, int64(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x7f, 0x00, 0xff, 0x00}, int64(0), 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// uint64 - XDR Unsigned Hyper Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(0), 8, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 34), 8, nil},
-		{[]byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 42), 8, nil},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, uint64(18446744073709551615), 8, nil},
-		{[]byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(9223372036854775808), 8, nil},
-		// Expected Failures -- not enough bytes
-		{[]byte{0xff, 0xff, 0xff}, uint64(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0xff, 0x00, 0xff, 0x00}, uint64(0), 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// bool - XDR Integer
-		{[]byte{0x00, 0x00, 0x00, 0x00}, false, 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x01}, true, 4, nil},
-		// Expected Failures -- only 0 or 1 is a valid bool
-		{[]byte{0x01, 0x00, 0x00, 0x00}, true, 4, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{[]byte{0x00, 0x00, 0x40, 0x00}, true, 4, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// float32 - XDR Floating-Point
-		{[]byte{0x00, 0x00, 0x00, 0x00}, float32(0), 4, nil},
-		{[]byte{0x40, 0x48, 0xF5, 0xC3}, float32(3.14), 4, nil},
-		{[]byte{0x49, 0x96, 0xB4, 0x38}, float32(1234567.0), 4, nil},
-		{[]byte{0xFF, 0x80, 0x00, 0x00}, float32(math.Inf(-1)), 4, nil},
-		{[]byte{0x7F, 0x80, 0x00, 0x00}, float32(math.Inf(0)), 4, nil},
-		// Expected Failures -- not enough bytes
-		{[]byte{0xff, 0xff}, float32(0), 2, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0xff, 0x00, 0xff}, float32(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// float64 - XDR Double-precision Floating-Point
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(0), 8, nil},
-		{[]byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, float64(3.141592653589793), 8, nil},
-		{[]byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(-1)), 8, nil},
-		{[]byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(0)), 8, nil},
-		// Expected Failures -- not enough bytes
-		{[]byte{0xff, 0xff, 0xff}, float64(0), 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0xff, 0x00, 0xff, 0x00}, float64(0), 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// string - XDR String
-		{[]byte{0x00, 0x00, 0x00, 0x00}, "", 4, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", 8, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, "τ=2π", 12, nil},
-		// Expected Failures -- not enough bytes for length, length
-		// larger than allowed, and len larger than available bytes.
-		{[]byte{0x00, 0x00, 0xFF}, "", 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, "", 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, "", 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// []byte - XDR Variable Opaque
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, []byte{0x01}, 8, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, 8, nil},
-		// Expected Failures -- not enough bytes for length, length
-		// larger than allowed, and data larger than available bytes.
-		{[]byte{0x00, 0x00, 0xFF}, []byte{}, 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0xFF, 0xFF, 0xFF, 0xFF}, []byte{}, 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{[]byte{0x00, 0x00, 0x00, 0xFF}, []byte{}, 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// [#]byte - XDR Fixed Opaque
-		{[]byte{0x01, 0x00, 0x00, 0x00}, [1]byte{0x01}, 4, nil},
-		{[]byte{0x01, 0x02, 0x00, 0x00}, [2]byte{0x01, 0x02}, 4, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x00}, [3]byte{0x01, 0x02, 0x03}, 4, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x04}, [4]byte{0x01, 0x02, 0x03, 0x04}, 4, nil},
-		{[]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, [5]byte{0x01, 0x02, 0x03, 0x04, 0x05}, 8, nil},
-		// Expected Failure -- fixed opaque data not padded
-		{[]byte{0x01}, [1]byte{}, 1, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// []<type> - XDR Variable-Length Array
-		{[]byte{0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00},
-			[]int16{512, 1024, 2048}, 16, nil},
-		{[]byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}, []bool{true, false}, 12, nil},
-		// Expected Failure -- 2 entries in array - not enough bytes
-		{[]byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01}, []bool{}, 8, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// [#]<type> - XDR Fixed-Length Array
-		{[]byte{0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00}, [2]uint32{512, 1024}, 8, nil},
-		// Expected Failure -- 2 entries in array - not enough bytes
-		{[]byte{0x00, 0x00, 0x00, 0x02}, [2]uint32{}, 4, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// map[string]uint32
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, 0x00, 0x00, 0x00, 0x01},
-			map[string]uint32{"map1": 1}, 16, nil},
-		// Expected Failures -- not enough bytes in length, 1 map
-		// element no extra bytes, 1 map element not enough bytes for
-		// key, 1 map element not enough bytes for value.
-		{[]byte{0x00, 0x00, 0x00}, map[string]uint32{}, 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00, 0x01}, map[string]uint32{}, 4, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00}, map[string]uint32{}, 7, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31},
-			map[string]uint32{}, 12, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// time.Time - XDR String per RFC3339
-		{[]byte{
-			0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-			0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-			0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a,
-		}, time.Unix(1396581888, 0).UTC(), 24, nil},
-		// Expected Failures -- not enough bytes, improperly formatted
-		// time
-		{[]byte{0x00, 0x00, 0x00}, time.Time{}, 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00, 0x00}, time.Time{}, 4, &UnmarshalError{ErrorCode: ErrParseTime}},
-
-		// struct - XDR Structure -- test struct contains all supported types
-		{structTestIn, structTestWant, len(structTestIn), nil},
-		{[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x02},
-			opaqueStruct{[]uint8{1}, [1]uint8{2}}, 12, nil},
-		// Expected Failures -- normal struct not enough bytes, non
-		// opaque data not enough bytes for slice, non opaque data not
-		// enough bytes for slice.
-		{[]byte{0x00, 0x00}, allTypesTest{}, 2, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00}, opaqueStruct{}, 3, &UnmarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x00, 0x00, 0x00, 0x00, 0x00}, opaqueStruct{}, 5, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// Expected errors
-		{nil, nilInterface, 0, &UnmarshalError{ErrorCode: ErrNilInterface}},
-		{nil, &nilInterface, 0, &UnmarshalError{ErrorCode: ErrNilInterface}},
-		{nil, testChan, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, &testChan, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, testFunc, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, &testFunc, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, testComplex64, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, &testComplex64, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, testComplex128, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-		{nil, &testComplex128, 0, &UnmarshalError{ErrorCode: ErrUnsupportedType}},
-	}
-
-	for i, test := range tests {
-		// Attempt to unmarshal to a non-pointer version of each
-		// positive test type to ensure the appropriate error is
-		// returned.
-		if test.err == nil && test.wantVal != nil {
-			testName := fmt.Sprintf("Unmarshal #%d (non-pointer)", i)
-			wantErr := &UnmarshalError{ErrorCode: ErrBadArguments}
-
-			wvt := reflect.TypeOf(test.wantVal)
-			want := reflect.New(wvt).Elem().Interface()
-			n, err := Unmarshal(bytes.NewReader(test.in), want)
-			if !testExpectedURet(t, testName, n, 0, err, wantErr) {
-				continue
-			}
-		}
-
-		testName := fmt.Sprintf("Unmarshal #%d", i)
-		// Create a new pointer to the appropriate type.
-		var want interface{}
-		if test.wantVal != nil {
-			wvt := reflect.TypeOf(test.wantVal)
-			want = reflect.New(wvt).Interface()
-		}
-		n, err := Unmarshal(bytes.NewReader(test.in), want)
-
-		// First ensure the number of bytes read is the expected value
-		// and the error is the expected one.
-		if !testExpectedURet(t, testName, n, test.wantN, err, test.err) {
-			continue
-		}
-		if test.err != nil {
-			continue
-		}
-
-		// Finally, ensure the read value is the expected one.
-		wantElem := reflect.Indirect(reflect.ValueOf(want)).Interface()
-		if !reflect.DeepEqual(wantElem, test.wantVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, wantElem, test.wantVal)
-			continue
-		}
-	}
-}
-
-// decodeFunc is used to identify which public function of the Decoder object
-// a test applies to.
-type decodeFunc int
-
-const (
-	fDecodeBool decodeFunc = iota
-	fDecodeDouble
-	fDecodeEnum
-	fDecodeFixedOpaque
-	fDecodeFloat
-	fDecodeHyper
-	fDecodeInt
-	fDecodeOpaque
-	fDecodeString
-	fDecodeUhyper
-	fDecodeUint
-)
-
-// Map of decodeFunc values to names for pretty printing.
-var decodeFuncStrings = map[decodeFunc]string{
-	fDecodeBool:        "DecodeBool",
-	fDecodeDouble:      "DecodeDouble",
-	fDecodeEnum:        "DecodeEnum",
-	fDecodeFixedOpaque: "DecodeFixedOpaque",
-	fDecodeFloat:       "DecodeFloat",
-	fDecodeHyper:       "DecodeHyper",
-	fDecodeInt:         "DecodeInt",
-	fDecodeOpaque:      "DecodeOpaque",
-	fDecodeString:      "DecodeString",
-	fDecodeUhyper:      "DecodeUhyper",
-	fDecodeUint:        "DecodeUint",
-}
-
-// String implements the fmt.Stringer interface and returns the encode function
-// as a human-readable string.
-func (f decodeFunc) String() string {
-	if s := decodeFuncStrings[f]; s != "" {
-		return s
-	}
-	return fmt.Sprintf("Unknown decodeFunc (%d)", f)
-}
-
-// TestDecoder ensures a Decoder works as intended.
-func TestDecoder(t *testing.T) {
-	type test struct {
-		f       decodeFunc  // function to use to decode
-		in      []byte      // input bytes
-		wantVal interface{} // expected value
-		wantN   int         // expected number of bytes read
-		maxSize uint        // read limiter value
-		err     error       // expected error
-	}
-	tests := []test{
-		// Bool
-		{fDecodeBool, []byte{0x00, 0x00, 0x00, 0x00}, false, 4, 0, nil},
-		{fDecodeBool, []byte{0x00, 0x00, 0x00, 0x01}, true, 4, 0, nil},
-		// Expected Failures -- only 0 or 1 is a valid bool
-		{fDecodeBool, []byte{0x01, 0x00, 0x00, 0x00}, true, 4, 0, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{fDecodeBool, []byte{0x00, 0x00, 0x40, 0x00}, true, 4, 0, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// Double
-		{fDecodeDouble, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(0), 8, 0, nil},
-		{fDecodeDouble, []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, float64(3.141592653589793), 8, 0, nil},
-		{fDecodeDouble, []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(-1)), 8, 0, nil},
-		{fDecodeDouble, []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, float64(math.Inf(0)), 8, 0, nil},
-
-		// Enum
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x00}, int32(0), 4, 0, nil},
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x01}, int32(1), 4, 0, nil},
-		{fDecodeEnum, []byte{0x00, 0x00, 0x00, 0x02}, nil, 4, 0, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{fDecodeEnum, []byte{0x12, 0x34, 0x56, 0x78}, nil, 4, 0, &UnmarshalError{ErrorCode: ErrBadEnumValue}},
-		{fDecodeEnum, []byte{0x00}, nil, 1, 0, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// FixedOpaque
-		{fDecodeFixedOpaque, []byte{0x01, 0x00, 0x00, 0x00}, []byte{0x01}, 4, 0, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x00, 0x00}, []byte{0x01, 0x02}, 4, 0, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, 4, 0, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, 4, 0, nil},
-		{fDecodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, []byte{0x01, 0x02, 0x03, 0x04, 0x05}, 8, 0, nil},
-		// Expected Failure -- fixed opaque data not padded
-		{fDecodeFixedOpaque, []byte{0x01}, []byte{0x00}, 1, 0, &UnmarshalError{ErrorCode: ErrIO}},
-
-		// Float
-		{fDecodeFloat, []byte{0x00, 0x00, 0x00, 0x00}, float32(0), 4, 0, nil},
-		{fDecodeFloat, []byte{0x40, 0x48, 0xF5, 0xC3}, float32(3.14), 4, 0, nil},
-		{fDecodeFloat, []byte{0x49, 0x96, 0xB4, 0x38}, float32(1234567.0), 4, 0, nil},
-		{fDecodeFloat, []byte{0xFF, 0x80, 0x00, 0x00}, float32(math.Inf(-1)), 4, 0, nil},
-		{fDecodeFloat, []byte{0x7F, 0x80, 0x00, 0x00}, float32(math.Inf(0)), 4, 0, nil},
-
-		// Hyper
-		{fDecodeHyper, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(0), 8, 0, nil},
-		{fDecodeHyper, []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, int64(1 << 34), 8, 0, nil},
-		{fDecodeHyper, []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(1 << 42), 8, 0, nil},
-		{fDecodeHyper, []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(9223372036854775807), 8, 0, nil},
-		{fDecodeHyper, []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, int64(-1), 8, 0, nil},
-		{fDecodeHyper, []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, int64(-9223372036854775808), 8, 0, nil},
-
-		// Int
-		{fDecodeInt, []byte{0x00, 0x00, 0x00, 0x00}, int32(0), 4, 0, nil},
-		{fDecodeInt, []byte{0x00, 0x04, 0x00, 0x00}, int32(262144), 4, 0, nil},
-		{fDecodeInt, []byte{0x7F, 0xFF, 0xFF, 0xFF}, int32(2147483647), 4, 0, nil},
-		{fDecodeInt, []byte{0xFF, 0xFF, 0xFF, 0xFF}, int32(-1), 4, 0, nil},
-		{fDecodeInt, []byte{0x80, 0x00, 0x00, 0x00}, int32(-2147483648), 4, 0, nil},
-
-		// Opaque
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, []byte{0x01}, 8, 0, nil},
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, []byte{0x01, 0x02, 0x03}, 8, 0, nil},
-		// Expected Failures -- not enough bytes for length, length
-		// larger than allowed, and data larger than available bytes.
-		{fDecodeOpaque, []byte{0x00, 0x00, 0xFF}, []byte{}, 3, 0, &UnmarshalError{ErrorCode: ErrIO}},
-		{fDecodeOpaque, []byte{0xFF, 0xFF, 0xFF, 0xFF}, []byte{}, 4, 0, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{fDecodeOpaque, []byte{0x7F, 0xFF, 0xFF, 0xFD}, []byte{}, 4, 0, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0xFF}, []byte{}, 4, 0, &UnmarshalError{ErrorCode: ErrIO}},
-		// Hit maxReadSize in opaque
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, []byte{0x01}, 8, 4, nil},
-		{fDecodeOpaque, []byte{0x00, 0x00, 0x00, 0x08, 0x01, 0x00, 0x00, 0x00}, []byte{}, 4, 4, &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// String
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x00}, "", 4, 0, nil},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", 8, 0, nil},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, "τ=2π", 12, 0, nil},
-		// Expected Failures -- not enough bytes for length, length
-		// larger than allowed, and len larger than available bytes.
-		{fDecodeString, []byte{0x00, 0x00, 0xFF}, "", 3, 0, &UnmarshalError{ErrorCode: ErrIO}},
-		{fDecodeString, []byte{0xFF, 0xFF, 0xFF, 0xFF}, "", 4, 0, &UnmarshalError{ErrorCode: ErrOverflow}},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0xFF}, "", 4, 0, &UnmarshalError{ErrorCode: ErrIO}},
-		// Hit maxReadSize in string
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", 8, 4, nil},
-		{fDecodeString, []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, "xdr", 4, 2, &UnmarshalError{ErrorCode: ErrOverflow}},
-
-		// Uhyper
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(0), 8, 0, nil},
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 34), 8, 0, nil},
-		{fDecodeUhyper, []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(1 << 42), 8, 0, nil},
-		{fDecodeUhyper, []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, uint64(18446744073709551615), 8, 0, nil},
-		{fDecodeUhyper, []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, uint64(9223372036854775808), 8, 0, nil},
-
-		// Uint
-		{fDecodeUint, []byte{0x00, 0x00, 0x00, 0x00}, uint32(0), 4, 0, nil},
-		{fDecodeUint, []byte{0x00, 0x04, 0x00, 0x00}, uint32(262144), 4, 0, nil},
-		{fDecodeUint, []byte{0xFF, 0xFF, 0xFF, 0xFF}, uint32(4294967295), 4, 0, nil},
-	}
-
-	validEnums := make(map[int32]bool)
-	validEnums[0] = true
-	validEnums[1] = true
-
-	var rv interface{}
-	var n int
-	var err error
-
-	decoders := []func(test) *Decoder{
-		func(t test) *Decoder {
-			// return DecoderLimited for test cases that can't succeed.
-			if t.maxSize == 0 {
-				return NewDecoder(bytes.NewReader(t.in))
-			}
-			return NewDecoderLimited(bytes.NewReader(t.in), t.maxSize)
-		},
-		func(t test) *Decoder {
-			return NewDecoderLimited(bytes.NewReader(t.in), t.maxSize)
-		},
-	}
-	for _, decoder := range decoders {
-		for i, test := range tests {
-			err = nil
-			var dec *Decoder
-			dec = decoder(test)
-			switch test.f {
-			case fDecodeBool:
-				rv, n, err = dec.DecodeBool()
-			case fDecodeDouble:
-				rv, n, err = dec.DecodeDouble()
-			case fDecodeEnum:
-				rv, n, err = dec.DecodeEnum(validEnums)
-			case fDecodeFixedOpaque:
-				want := test.wantVal.([]byte)
-				rv, n, err = dec.DecodeFixedOpaque(int32(len(want)))
-			case fDecodeFloat:
-				rv, n, err = dec.DecodeFloat()
-			case fDecodeHyper:
-				rv, n, err = dec.DecodeHyper()
-			case fDecodeInt:
-				rv, n, err = dec.DecodeInt()
-			case fDecodeOpaque:
-				rv, n, err = dec.DecodeOpaque()
-			case fDecodeString:
-				rv, n, err = dec.DecodeString()
-			case fDecodeUhyper:
-				rv, n, err = dec.DecodeUhyper()
-			case fDecodeUint:
-				rv, n, err = dec.DecodeUint()
-			default:
-				t.Errorf("%v #%d unrecognized function", test.f, i)
-				continue
-			}
-
-			// First ensure the number of bytes read is the expected value
-			// and the error is the expected one.
-			testName := fmt.Sprintf("%v #%d", test.f, i)
-			if !testExpectedURet(t, testName, n, test.wantN, err, test.err) {
-				continue
-			}
-			if test.err != nil {
-				continue
-			}
-
-			// Finally, ensure the read value is the expected one.
-			if !reflect.DeepEqual(rv, test.wantVal) {
-				t.Errorf("%s: unexpected result - got: %v want: %v\n",
-					testName, rv, test.wantVal)
-				continue
-			}
-		}
-	}
-}
-
-// TestUnmarshalLimited ensures the UnmarshalLimited function properly handles
-// various cases not already covered by the other tests.
-func TestUnmarshalLimited(t *testing.T) {
-	buf := []byte{
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x02,
-	}
-
-	testName := "UnmarshalLimited to capped slice"
-	cappedSlice := make([]bool, 0, 1)
-	expectedN := 8
-	expectedErr := error(nil)
-	expectedVal := []bool{true}
-	n, err := UnmarshalLimited(bytes.NewReader(buf), &cappedSlice, 8)
-	if testExpectedURet(t, testName, n, expectedN, err, expectedErr) {
-		if !reflect.DeepEqual(cappedSlice, expectedVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, cappedSlice, expectedVal)
-		}
-	}
-
-	// Positive map test.
-	buf = []byte{
-		0x00, 0x00, 0x00, 0x02, // R length
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, // R key map1
-		0x00, 0x00, 0x00, 0x01, // R value map1
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x32, // R key map2
-		0x00, 0x00, 0x00, 0x02, // R value map2
-	}
-	type myMap struct {
-		R map[string]uint32
-	}
-	expectedMapVal := &myMap{
-		R: map[string]uint32{"map1": 1, "map2": 2}, // R
-	}
-	var m myMap
-	n, err = UnmarshalLimited(bytes.NewReader(buf), &m, 28)
-	expectedN = 28
-	if testExpectedURet(t, testName, n, expectedN, err, expectedErr) {
-		if !reflect.DeepEqual(&m, expectedMapVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, m, expectedMapVal)
-		}
-	}
-}
-
-// TestUnmarshalCorners ensures the Unmarshal function properly handles various
-// cases not already covered by the other tests.
-func TestUnmarshalCorners(t *testing.T) {
-	buf := []byte{
-		0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-		0x00, 0x00, 0x00, 0x02,
-	}
-
-	// Ensure unmarshal to unsettable pointer returns the expected error.
-	testName := "Unmarshal to unsettable pointer"
-	var i32p *int32
-	expectedN := 0
-	expectedErr := error(&UnmarshalError{ErrorCode: ErrNotSettable})
-	n, err := Unmarshal(bytes.NewReader(buf), i32p)
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure decode of unsettable pointer returns the expected error.
-	testName = "Decode to unsettable pointer"
-	expectedN = 0
-	expectedErr = &UnmarshalError{ErrorCode: ErrNotSettable}
-	n, err = TstDecode(bytes.NewReader(buf))(reflect.ValueOf(i32p))
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure unmarshal to indirected unsettable pointer returns the
-	// expected error.
-	testName = "Unmarshal to indirected unsettable pointer"
-	ii32p := interface{}(i32p)
-	expectedN = 0
-	expectedErr = &UnmarshalError{ErrorCode: ErrNotSettable}
-	n, err = Unmarshal(bytes.NewReader(buf), &ii32p)
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure unmarshal to embedded unsettable interface value returns the
-	// expected error.
-	testName = "Unmarshal to embedded unsettable interface value"
-	var i32 int32
-	ii32 := interface{}(i32)
-	expectedN = 0
-	expectedErr = &UnmarshalError{ErrorCode: ErrNotSettable}
-	n, err = Unmarshal(bytes.NewReader(buf), &ii32)
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure unmarshal to embedded interface value works properly.
-	testName = "Unmarshal to embedded interface value"
-	ii32vp := interface{}(&i32)
-	expectedN = 4
-	expectedErr = nil
-	ii32vpr := int32(1)
-	expectedVal := interface{}(&ii32vpr)
-	n, err = Unmarshal(bytes.NewReader(buf), &ii32vp)
-	if testExpectedURet(t, testName, n, expectedN, err, expectedErr) {
-		if !reflect.DeepEqual(ii32vp, expectedVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, ii32vp, expectedVal)
-		}
-	}
-
-	// Ensure decode of an invalid reflect value returns the expected
-	// error.
-	testName = "Decode invalid reflect value"
-	expectedN = 0
-	expectedErr = error(&UnmarshalError{ErrorCode: ErrUnsupportedType})
-	n, err = TstDecode(bytes.NewReader(buf))(reflect.Value{})
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure unmarshal to a slice with a cap and 0 length adjusts the
-	// length properly.
-	testName = "Unmarshal to capped slice"
-	cappedSlice := make([]bool, 0, 1)
-	expectedN = 8
-	expectedErr = nil
-	expectedVal = []bool{true}
-	n, err = Unmarshal(bytes.NewReader(buf), &cappedSlice)
-	if testExpectedURet(t, testName, n, expectedN, err, expectedErr) {
-		if !reflect.DeepEqual(cappedSlice, expectedVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, cappedSlice, expectedVal)
-		}
-	}
-
-	// Ensure unmarshal to struct with both exported and unexported fields
-	// skips the unexported fields but still unmarshals to the exported
-	// fields.
-	type unexportedStruct struct {
-		unexported int
-		Exported   int
-	}
-	testName = "Unmarshal to struct with exported and unexported fields"
-	var tstruct unexportedStruct
-	expectedN = 4
-	expectedErr = nil
-	expectedVal = unexportedStruct{0, 1}
-	n, err = Unmarshal(bytes.NewReader(buf), &tstruct)
-	if testExpectedURet(t, testName, n, expectedN, err, expectedErr) {
-		if !reflect.DeepEqual(tstruct, expectedVal) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, tstruct, expectedVal)
-		}
-	}
-
-	// Ensure decode to struct with unsettable fields return expected error.
-	type unsettableStruct struct {
-		Exported int
-	}
-	testName = "Decode to struct with unsettable fields"
-	var ustruct unsettableStruct
-	expectedN = 0
-	expectedErr = error(&UnmarshalError{ErrorCode: ErrNotSettable})
-	n, err = TstDecode(bytes.NewReader(buf))(reflect.ValueOf(ustruct))
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-
-	// Ensure decode to struct with unsettable pointer fields return
-	// expected error.
-	type unsettablePointerStruct struct {
-		Exported *int
-	}
-	testName = "Decode to struct with unsettable pointer fields"
-	var upstruct unsettablePointerStruct
-	expectedN = 0
-	expectedErr = error(&UnmarshalError{ErrorCode: ErrNotSettable})
-	n, err = TstDecode(bytes.NewReader(buf))(reflect.ValueOf(upstruct))
-	testExpectedURet(t, testName, n, expectedN, err, expectedErr)
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/encode_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/encode_test.go
deleted file mode 100644
index 1b04cfa2d0..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/encode_test.go
+++ /dev/null
@@ -1,595 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-	"time"
-
-	. "github.com/davecgh/go-xdr/xdr2"
-)
-
-// testExpectedMRet is a convenience method to test an expected number of bytes
-// written and error for a marshal.
-func testExpectedMRet(t *testing.T, name string, n, wantN int, err, wantErr error) bool {
-	// First ensure the number of bytes written is the expected value.  The
-	// bytes read should be accurate even when an error occurs.
-	if n != wantN {
-		t.Errorf("%s: unexpected num bytes written - got: %v want: %v\n",
-			name, n, wantN)
-		return false
-	}
-
-	// Next check for the expected error.
-	if reflect.TypeOf(err) != reflect.TypeOf(wantErr) {
-		t.Errorf("%s: failed to detect error - got: %v <%[2]T> want: %T",
-			name, err, wantErr)
-		return false
-	}
-	if rerr, ok := err.(*MarshalError); ok {
-		if werr, ok := wantErr.(*MarshalError); ok {
-			if rerr.ErrorCode != werr.ErrorCode {
-				t.Errorf("%s: failed to detect error code - "+
-					"got: %v want: %v", name,
-					rerr.ErrorCode, werr.ErrorCode)
-				return false
-			}
-		}
-	}
-
-	return true
-}
-
-// TestMarshal ensures the Marshal function works properly with all types.
-func TestMarshal(t *testing.T) {
-	// Variables for various unsupported Marshal types.
-	var nilInterface interface{}
-	var testChan chan int
-	var testFunc func()
-	var testComplex64 complex64
-	var testComplex128 complex128
-
-	// testInterface is used to test Marshal with values nested in an
-	// interface.
-	testInterface := interface{}(17)
-
-	// structMarshalTestIn is input data for the big struct test of all
-	// supported types.
-	structMarshalTestIn := allTypesTest{
-		127,                                // A
-		255,                                // B
-		32767,                              // C
-		65535,                              // D
-		2147483647,                         // E
-		4294967295,                         // F
-		9223372036854775807,                // G
-		18446744073709551615,               // H
-		true,                               // I
-		3.14,                               // J
-		3.141592653589793,                  // K
-		"xdr",                              // L
-		[]byte{1, 2, 3, 4},                 // M
-		[3]byte{1, 2, 3},                   // N
-		[]int16{512, 1024, 2048},           // O
-		[2]subTest{{"one", 1}, {"two", 2}}, // P
-		&subTest{"bar", 3},                 // Q
-		map[string]uint32{"map1": 1},       // R
-		time.Unix(1396581888, 0).UTC(),     // S
-	}
-
-	// structMarshalTestWant is the expected output after marshalling
-	// structMarshalTestIn.
-	structMarshalTestWant := []byte{
-		0x00, 0x00, 0x00, 0x7F, // A
-		0x00, 0x00, 0x00, 0xFF, // B
-		0x00, 0x00, 0x7F, 0xFF, // C
-		0x00, 0x00, 0xFF, 0xFF, // D
-		0x7F, 0xFF, 0xFF, 0xFF, // E
-		0xFF, 0xFF, 0xFF, 0xFF, // F
-		0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // G
-		0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, // H
-		0x00, 0x00, 0x00, 0x01, // I
-		0x40, 0x48, 0xF5, 0xC3, // J
-		0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18, // K
-		0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00, // L
-		0x00, 0x00, 0x00, 0x04, 0x01, 0x02, 0x03, 0x04, // M
-		0x01, 0x02, 0x03, 0x00, // N
-		0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00,
-		0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00, // O
-		0x00, 0x00, 0x00, 0x03, 0x6F, 0x6E, 0x65, 0x00, // P[0].A
-		0x00, 0x00, 0x00, 0x01, // P[0].B
-		0x00, 0x00, 0x00, 0x03, 0x74, 0x77, 0x6F, 0x00, // P[1].A
-		0x00, 0x00, 0x00, 0x02, // P[1].B
-		0x00, 0x00, 0x00, 0x03, 0x62, 0x61, 0x72, 0x00, // Q.A
-		0x00, 0x00, 0x00, 0x03, // Q.B
-		0x00, 0x00, 0x00, 0x01, // R length
-		0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, // R key map1
-		0x00, 0x00, 0x00, 0x01, // R value map1
-		0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-		0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-		0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a, // S
-	}
-
-	tests := []struct {
-		in        interface{} // input value
-		wantBytes []byte      // expected bytes
-		wantN     int         // expected/max number of bytes written
-		err       error       // expected error
-	}{
-		// interface
-		{testInterface, []byte{0x00, 0x00, 0x00, 0x11}, 4, nil},
-		{&testInterface, []byte{0x00, 0x00, 0x00, 0x11}, 4, nil},
-
-		// int8 - XDR Integer
-		{int8(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{int8(64), []byte{0x00, 0x00, 0x00, 0x40}, 4, nil},
-		{int8(127), []byte{0x00, 0x00, 0x00, 0x7F}, 4, nil},
-		{int8(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{int8(-128), []byte{0xFF, 0xFF, 0xFF, 0x80}, 4, nil},
-		// Expected Failure -- Short write
-		{int8(127), []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// uint8 - XDR Unsigned Integer
-		{uint8(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{uint8(64), []byte{0x00, 0x00, 0x00, 0x40}, 4, nil},
-		{uint8(255), []byte{0x00, 0x00, 0x00, 0xFF}, 4, nil},
-		// Expected Failure -- Short write
-		{uint8(255), []byte{0x00, 0x00}, 2, &MarshalError{ErrorCode: ErrIO}},
-
-		// int16 - XDR Integer
-		{int16(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{int16(1024), []byte{0x00, 0x00, 0x04, 0x00}, 4, nil},
-		{int16(32767), []byte{0x00, 0x00, 0x7F, 0xFF}, 4, nil},
-		{int16(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{int16(-32768), []byte{0xFF, 0xFF, 0x80, 0x00}, 4, nil},
-		// Expected Failure -- Short write
-		{int16(-32768), []byte{0xFF}, 1, &MarshalError{ErrorCode: ErrIO}},
-
-		// uint16 - XDR Unsigned Integer
-		{uint16(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{uint16(1024), []byte{0x00, 0x00, 0x04, 0x00}, 4, nil},
-		{uint16(65535), []byte{0x00, 0x00, 0xFF, 0xFF}, 4, nil},
-		// Expected Failure -- Short write
-		{uint16(65535), []byte{0x00, 0x00}, 2, &MarshalError{ErrorCode: ErrIO}},
-
-		// int32 - XDR Integer
-		{int32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{int32(262144), []byte{0x00, 0x04, 0x00, 0x00}, 4, nil},
-		{int32(2147483647), []byte{0x7F, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{int32(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{int32(-2147483648), []byte{0x80, 0x00, 0x00, 0x00}, 4, nil},
-		// Expected Failure -- Short write
-		{int32(2147483647), []byte{0x7F, 0xFF, 0xFF}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// uint32 - XDR Unsigned Integer
-		{uint32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{uint32(262144), []byte{0x00, 0x04, 0x00, 0x00}, 4, nil},
-		{uint32(4294967295), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		// Expected Failure -- Short write
-		{uint32(262144), []byte{0x00, 0x04, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// int64 - XDR Hyper Integer
-		{int64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{int64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{int64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{int64(9223372036854775807), []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{int64(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 7, &MarshalError{ErrorCode: ErrIO}},
-
-		// uint64 - XDR Unsigned Hyper Integer
-		{uint64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{uint64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{uint64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{uint64(18446744073709551615), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{uint64(9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{uint64(9223372036854775808), []byte{0x80}, 1, &MarshalError{ErrorCode: ErrIO}},
-
-		// bool - XDR Integer
-		{false, []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{true, []byte{0x00, 0x00, 0x00, 0x01}, 4, nil},
-		// Expected Failure -- Short write
-		{true, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// float32 - XDR Floating-Point
-		{float32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{float32(3.14), []byte{0x40, 0x48, 0xF5, 0xC3}, 4, nil},
-		{float32(1234567.0), []byte{0x49, 0x96, 0xB4, 0x38}, 4, nil},
-		{float32(math.Inf(-1)), []byte{0xFF, 0x80, 0x00, 0x00}, 4, nil},
-		{float32(math.Inf(0)), []byte{0x7F, 0x80, 0x00, 0x00}, 4, nil},
-		// Expected Failure -- Short write
-		{float32(3.14), []byte{0x40, 0x48, 0xF5}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// float64 - XDR Double-precision Floating-Point
-		{float64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, 8, nil},
-		{float64(math.Inf(-1)), []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{float64(math.Inf(0)), []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d}, 7, &MarshalError{ErrorCode: ErrIO}},
-
-		// string - XDR String
-		{"", []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{"xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, 8, nil},
-		{"τ=2π", []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, 12, nil},
-		// Expected Failures -- Short write in length and payload
-		{"xdr", []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{"xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// []byte - XDR Variable Opaque
-		{[]byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, 8, nil},
-		{[]byte{0x01, 0x02, 0x03}, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, 8, nil},
-		// Expected Failures -- Short write in length and payload
-		{[]byte{0x01}, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{[]byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// [#]byte - XDR Fixed Opaque
-		{[1]byte{0x01}, []byte{0x01, 0x00, 0x00, 0x00}, 4, nil}, // No & here to test unaddressable arrays
-		{&[2]byte{0x01, 0x02}, []byte{0x01, 0x02, 0x00, 0x00}, 4, nil},
-		{&[3]byte{0x01, 0x02, 0x03}, []byte{0x01, 0x02, 0x03, 0x00}, 4, nil},
-		{&[4]byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, 4, nil},
-		{&[5]byte{0x01, 0x02, 0x03, 0x04, 0x05}, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{[1]byte{0x01}, []byte{0x01, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// []<type> - XDR Variable-Length Array
-		{&[]int16{512, 1024, 2048},
-			[]byte{0x00, 0x00, 0x00, 0x03, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x08, 0x00},
-			16, nil},
-		{[]bool{true, false}, []byte{0x00, 0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00}, 12, nil},
-		// Expected Failures -- Short write in number of elements and
-		// payload
-		{[]bool{true, false}, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{[]bool{true, false}, []byte{0x00, 0x00, 0x00, 0x02, 0x00}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// [#]<type> - XDR Fixed-Length Array
-		{&[2]uint32{512, 1024}, []byte{0x00, 0x00, 0x02, 0x00, 0x00, 0x00, 0x04, 0x00}, 8, nil},
-		// Expected Failures -- Short write in number of elements and
-		// payload
-		{[2]uint32{512, 1024}, []byte{0x00, 0x00, 0x02}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{[2]uint32{512, 1024}, []byte{0x00, 0x00, 0x02, 0x00, 0x00}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// map[string]uint32
-		{map[string]uint32{"map1": 1},
-			[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31, 0x00, 0x00, 0x00, 0x01},
-			16, nil},
-		// Expected Failures -- Short write in number of elements, key,
-		// and payload
-		{map[string]uint32{"map1": 1}, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{map[string]uint32{"map1": 1}, []byte{0x00, 0x00, 0x00, 0x01, 0x00}, 5, &MarshalError{ErrorCode: ErrIO}},
-		{map[string]uint32{"map1": 1}, []byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04}, 8, &MarshalError{ErrorCode: ErrIO}},
-		{map[string]uint32{"map1": 1},
-			[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x04, 0x6D, 0x61, 0x70, 0x31},
-			12, &MarshalError{ErrorCode: ErrIO}},
-
-		// time.Time - XDR String per RFC3339
-		{time.Unix(1396581888, 0).UTC(),
-			[]byte{
-				0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34,
-				0x2d, 0x30, 0x34, 0x2d, 0x30, 0x34, 0x54, 0x30,
-				0x33, 0x3a, 0x32, 0x34, 0x3a, 0x34, 0x38, 0x5a,
-			}, 24, nil},
-		// Expected Failure -- Short write
-		{time.Unix(1396581888, 0).UTC(), []byte{0x00, 0x00, 0x00, 0x14, 0x32, 0x30, 0x31, 0x34}, 8, &MarshalError{ErrorCode: ErrIO}},
-
-		// struct - XDR Structure -- test struct contains all supported types
-		{&structMarshalTestIn, structMarshalTestWant, len(structMarshalTestWant), nil},
-		{opaqueStruct{[]uint8{1}, [1]uint8{2}},
-			[]byte{
-				0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01,
-				0x00, 0x00, 0x00, 0x02,
-			}, 12, nil},
-		// Expected Failures -- Short write in variable length,
-		// variable payload, and fixed payload.
-		{structMarshalTestIn, structMarshalTestWant[:3], 3, &MarshalError{ErrorCode: ErrIO}},
-		{opaqueStruct{[]uint8{1}, [1]uint8{2}}, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{opaqueStruct{[]uint8{1}, [1]uint8{2}}, []byte{0x00, 0x00, 0x00, 0x01}, 4, &MarshalError{ErrorCode: ErrIO}},
-		{opaqueStruct{[]uint8{1}, [1]uint8{2}},
-			[]byte{0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01},
-			8, &MarshalError{ErrorCode: ErrIO}},
-
-		// Expected errors
-		{nilInterface, []byte{}, 0, &MarshalError{ErrorCode: ErrNilInterface}},
-		{&nilInterface, []byte{}, 0, &MarshalError{ErrorCode: ErrNilInterface}},
-		{(*interface{})(nil), []byte{}, 0, &MarshalError{ErrorCode: ErrBadArguments}},
-		{testChan, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testChan, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testFunc, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testFunc, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testComplex64, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testComplex64, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{testComplex128, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-		{&testComplex128, []byte{}, 0, &MarshalError{ErrorCode: ErrUnsupportedType}},
-	}
-
-	for i, test := range tests {
-		data := newFixedWriter(test.wantN)
-		n, err := Marshal(data, test.in)
-
-		// First ensure the number of bytes written is the expected
-		// value and the error is the expected one.
-		testName := fmt.Sprintf("Marshal #%d", i)
-		testExpectedMRet(t, testName, n, test.wantN, err, test.err)
-
-		rv := data.Bytes()
-		if len(rv) != len(test.wantBytes) {
-			t.Errorf("%s: unexpected len - got: %v want: %v\n",
-				testName, len(rv), len(test.wantBytes))
-			continue
-		}
-		if !reflect.DeepEqual(rv, test.wantBytes) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, rv, test.wantBytes)
-			continue
-		}
-	}
-}
-
-// encodeFunc is used to identify which public function of the Encoder object
-// a test applies to.
-type encodeFunc int
-
-const (
-	fEncodeBool encodeFunc = iota
-	fEncodeDouble
-	fEncodeEnum
-	fEncodeFixedOpaque
-	fEncodeFloat
-	fEncodeHyper
-	fEncodeInt
-	fEncodeOpaque
-	fEncodeString
-	fEncodeUhyper
-	fEncodeUint
-)
-
-// Map of encodeFunc values to names for pretty printing.
-var encodeFuncStrings = map[encodeFunc]string{
-	fEncodeBool:        "EncodeBool",
-	fEncodeDouble:      "EncodeDouble",
-	fEncodeEnum:        "EncodeEnum",
-	fEncodeFixedOpaque: "EncodeFixedOpaque",
-	fEncodeFloat:       "EncodeFloat",
-	fEncodeHyper:       "EncodeHyper",
-	fEncodeInt:         "EncodeInt",
-	fEncodeOpaque:      "EncodeOpaque",
-	fEncodeString:      "EncodeString",
-	fEncodeUhyper:      "EncodeUhyper",
-	fEncodeUint:        "EncodeUint",
-}
-
-// String implements the fmt.Stringer interface and returns the encode function
-// as a human-readable string.
-func (f encodeFunc) String() string {
-	if s := encodeFuncStrings[f]; s != "" {
-		return s
-	}
-	return fmt.Sprintf("Unknown encodeFunc (%d)", f)
-}
-
-// TestEncoder ensures an Encoder works as intended.
-func TestEncoder(t *testing.T) {
-	tests := []struct {
-		f         encodeFunc  // function to use to encode
-		in        interface{} // input value
-		wantBytes []byte      // expected bytes
-		wantN     int         // expected number of bytes written
-		err       error       // expected error
-	}{
-		// Bool
-		{fEncodeBool, false, []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeBool, true, []byte{0x00, 0x00, 0x00, 0x01}, 4, nil},
-		// Expected Failure -- Short write
-		{fEncodeBool, true, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// Double
-		{fEncodeDouble, float64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeDouble, float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d, 0x18}, 8, nil},
-		{fEncodeDouble, float64(math.Inf(-1)), []byte{0xFF, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeDouble, float64(math.Inf(0)), []byte{0x7F, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{fEncodeDouble, float64(3.141592653589793), []byte{0x40, 0x09, 0x21, 0xfb, 0x54, 0x44, 0x2d}, 7, &MarshalError{ErrorCode: ErrIO}},
-
-		// Enum
-		{fEncodeEnum, int32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeEnum, int32(1), []byte{0x00, 0x00, 0x00, 0x01}, 4, nil},
-		// Expected Failures -- Invalid enum values
-		{fEncodeEnum, int32(2), []byte{}, 0, &MarshalError{ErrorCode: ErrBadEnumValue}},
-		{fEncodeEnum, int32(1234), []byte{}, 0, &MarshalError{ErrorCode: ErrBadEnumValue}},
-
-		// FixedOpaque
-		{fEncodeFixedOpaque, []byte{0x01}, []byte{0x01, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02}, []byte{0x01, 0x02, 0x00, 0x00}, 4, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03}, []byte{0x01, 0x02, 0x03, 0x00}, 4, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04}, []byte{0x01, 0x02, 0x03, 0x04}, 4, nil},
-		{fEncodeFixedOpaque, []byte{0x01, 0x02, 0x03, 0x04, 0x05}, []byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{fEncodeFixedOpaque, []byte{0x01}, []byte{0x01, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// Float
-		{fEncodeFloat, float32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeFloat, float32(3.14), []byte{0x40, 0x48, 0xF5, 0xC3}, 4, nil},
-		{fEncodeFloat, float32(1234567.0), []byte{0x49, 0x96, 0xB4, 0x38}, 4, nil},
-		{fEncodeFloat, float32(math.Inf(-1)), []byte{0xFF, 0x80, 0x00, 0x00}, 4, nil},
-		{fEncodeFloat, float32(math.Inf(0)), []byte{0x7F, 0x80, 0x00, 0x00}, 4, nil},
-		// Expected Failure -- Short write
-		{fEncodeFloat, float32(3.14), []byte{0x40, 0x48, 0xF5}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// Hyper
-		{fEncodeHyper, int64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeHyper, int64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeHyper, int64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeHyper, int64(9223372036854775807), []byte{0x7F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{fEncodeHyper, int64(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{fEncodeHyper, int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{fEncodeHyper, int64(-9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 7, &MarshalError{ErrorCode: ErrIO}},
-
-		// Int
-		{fEncodeInt, int32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeInt, int32(262144), []byte{0x00, 0x04, 0x00, 0x00}, 4, nil},
-		{fEncodeInt, int32(2147483647), []byte{0x7F, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{fEncodeInt, int32(-1), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		{fEncodeInt, int32(-2147483648), []byte{0x80, 0x00, 0x00, 0x00}, 4, nil},
-		// Expected Failure -- Short write
-		{fEncodeInt, int32(2147483647), []byte{0x7F, 0xFF, 0xFF}, 3, &MarshalError{ErrorCode: ErrIO}},
-
-		// Opaque
-		{fEncodeOpaque, []byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeOpaque, []byte{0x01, 0x02, 0x03}, []byte{0x00, 0x00, 0x00, 0x03, 0x01, 0x02, 0x03, 0x00}, 8, nil},
-		// Expected Failures -- Short write in length and payload
-		{fEncodeOpaque, []byte{0x01}, []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{fEncodeOpaque, []byte{0x01}, []byte{0x00, 0x00, 0x00, 0x01, 0x01}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// String
-		{fEncodeString, "", []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeString, "xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78, 0x64, 0x72, 0x00}, 8, nil},
-		{fEncodeString, "τ=2π", []byte{0x00, 0x00, 0x00, 0x06, 0xCF, 0x84, 0x3D, 0x32, 0xCF, 0x80, 0x00, 0x00}, 12, nil},
-		// Expected Failures -- Short write in length and payload
-		{fEncodeString, "xdr", []byte{0x00, 0x00, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-		{fEncodeString, "xdr", []byte{0x00, 0x00, 0x00, 0x03, 0x78}, 5, &MarshalError{ErrorCode: ErrIO}},
-
-		// Uhyper
-		{fEncodeUhyper, uint64(0), []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeUhyper, uint64(1 << 34), []byte{0x00, 0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeUhyper, uint64(1 << 42), []byte{0x00, 0x00, 0x04, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		{fEncodeUhyper, uint64(18446744073709551615), []byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, 8, nil},
-		{fEncodeUhyper, uint64(9223372036854775808), []byte{0x80, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}, 8, nil},
-		// Expected Failure -- Short write
-		{fEncodeUhyper, uint64(9223372036854775808), []byte{0x80}, 1, &MarshalError{ErrorCode: ErrIO}},
-
-		// Uint
-		{fEncodeUint, uint32(0), []byte{0x00, 0x00, 0x00, 0x00}, 4, nil},
-		{fEncodeUint, uint32(262144), []byte{0x00, 0x04, 0x00, 0x00}, 4, nil},
-		{fEncodeUint, uint32(4294967295), []byte{0xFF, 0xFF, 0xFF, 0xFF}, 4, nil},
-		// Expected Failure -- Short write
-		{fEncodeUint, uint32(262144), []byte{0x00, 0x04, 0x00}, 3, &MarshalError{ErrorCode: ErrIO}},
-	}
-
-	validEnums := make(map[int32]bool)
-	validEnums[0] = true
-	validEnums[1] = true
-
-	var err error
-	var n int
-
-	for i, test := range tests {
-		err = nil
-		data := newFixedWriter(test.wantN)
-		enc := NewEncoder(data)
-		switch test.f {
-		case fEncodeBool:
-			in := test.in.(bool)
-			n, err = enc.EncodeBool(in)
-		case fEncodeDouble:
-			in := test.in.(float64)
-			n, err = enc.EncodeDouble(in)
-		case fEncodeEnum:
-			in := test.in.(int32)
-			n, err = enc.EncodeEnum(in, validEnums)
-		case fEncodeFixedOpaque:
-			in := test.in.([]byte)
-			n, err = enc.EncodeFixedOpaque(in)
-		case fEncodeFloat:
-			in := test.in.(float32)
-			n, err = enc.EncodeFloat(in)
-		case fEncodeHyper:
-			in := test.in.(int64)
-			n, err = enc.EncodeHyper(in)
-		case fEncodeInt:
-			in := test.in.(int32)
-			n, err = enc.EncodeInt(in)
-		case fEncodeOpaque:
-			in := test.in.([]byte)
-			n, err = enc.EncodeOpaque(in)
-		case fEncodeString:
-			in := test.in.(string)
-			n, err = enc.EncodeString(in)
-		case fEncodeUhyper:
-			in := test.in.(uint64)
-			n, err = enc.EncodeUhyper(in)
-		case fEncodeUint:
-			in := test.in.(uint32)
-			n, err = enc.EncodeUint(in)
-		default:
-			t.Errorf("%v #%d unrecognized function", test.f, i)
-			continue
-		}
-
-		// First ensure the number of bytes written is the expected
-		// value and the error is the expected one.
-		testName := fmt.Sprintf("%v #%d", test.f, i)
-		testExpectedMRet(t, testName, n, test.wantN, err, test.err)
-
-		// Finally, ensure the written bytes are what is expected.
-		rv := data.Bytes()
-		if len(rv) != len(test.wantBytes) {
-			t.Errorf("%s: unexpected len - got: %v want: %v\n",
-				testName, len(rv), len(test.wantBytes))
-			continue
-		}
-		if !reflect.DeepEqual(rv, test.wantBytes) {
-			t.Errorf("%s: unexpected result - got: %v want: %v\n",
-				testName, rv, test.wantBytes)
-			continue
-		}
-	}
-}
-
-// TestMarshalCorners ensures the Marshal function properly handles various
-// cases not already covered by the other tests.
-func TestMarshalCorners(t *testing.T) {
-	// Ensure encode of an invalid reflect value returns the expected
-	// error.
-	testName := "Encode invalid reflect value"
-	expectedN := 0
-	expectedErr := error(&MarshalError{ErrorCode: ErrUnsupportedType})
-	expectedVal := []byte{}
-	data := newFixedWriter(expectedN)
-	n, err := TstEncode(data)(reflect.Value{})
-	testExpectedMRet(t, testName, n, expectedN, err, expectedErr)
-	if !reflect.DeepEqual(data.Bytes(), expectedVal) {
-		t.Errorf("%s: unexpected result - got: %x want: %x\n",
-			testName, data.Bytes(), expectedVal)
-	}
-
-	// Ensure marshal of a struct with both exported and unexported fields
-	// skips the unexported fields but still marshals to the exported
-	// fields.
-	type unexportedStruct struct {
-		unexported int
-		Exported   int
-	}
-	testName = "Marshal struct with exported and unexported fields"
-	tstruct := unexportedStruct{0, 1}
-	expectedN = 4
-	expectedErr = nil
-	expectedVal = []byte{0x00, 0x00, 0x00, 0x01}
-	data = newFixedWriter(expectedN)
-	n, err = Marshal(data, tstruct)
-	testExpectedMRet(t, testName, n, expectedN, err, expectedErr)
-	if !reflect.DeepEqual(data.Bytes(), expectedVal) {
-		t.Errorf("%s: unexpected result - got: %x want: %x\n",
-			testName, data.Bytes(), expectedVal)
-	}
-
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/error_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/error_test.go
deleted file mode 100644
index ac9c156ce3..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/error_test.go
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"errors"
-	"testing"
-
-	. "github.com/davecgh/go-xdr/xdr2"
-)
-
-// TestErrorCodeStringer tests the stringized output for the ErrorCode type.
-func TestErrorCodeStringer(t *testing.T) {
-	tests := []struct {
-		in   ErrorCode
-		want string
-	}{
-		{ErrBadArguments, "ErrBadArguments"},
-		{ErrUnsupportedType, "ErrUnsupportedType"},
-		{ErrBadEnumValue, "ErrBadEnumValue"},
-		{ErrNotSettable, "ErrNotSettable"},
-		{ErrOverflow, "ErrOverflow"},
-		{ErrNilInterface, "ErrNilInterface"},
-		{ErrIO, "ErrIO"},
-		{ErrParseTime, "ErrParseTime"},
-		{0xffff, "Unknown ErrorCode (65535)"},
-	}
-
-	for i, test := range tests {
-		result := test.in.String()
-		if result != test.want {
-			t.Errorf("String #%d\n got: %s want: %s", i, result,
-				test.want)
-			continue
-		}
-	}
-}
-
-// TestUnmarshalError tests the error output for the UnmarshalError type.
-func TestUnmarshalError(t *testing.T) {
-	tests := []struct {
-		in   UnmarshalError
-		want string
-	}{
-		{
-			UnmarshalError{
-				ErrorCode:   ErrIO,
-				Func:        "test",
-				Description: "EOF while decoding 5 bytes",
-				Value:       "testval",
-			},
-			"xdr:test: EOF while decoding 5 bytes - read: 'testval'",
-		},
-		{
-			UnmarshalError{
-				ErrorCode:   ErrBadEnumValue,
-				Func:        "test",
-				Description: "invalid enum",
-				Value:       "testenum",
-			},
-			"xdr:test: invalid enum - read: 'testenum'",
-		},
-		{
-			UnmarshalError{
-				ErrorCode:   ErrNilInterface,
-				Func:        "test",
-				Description: "can't unmarshal to nil interface",
-				Value:       nil,
-			},
-			"xdr:test: can't unmarshal to nil interface",
-		},
-	}
-
-	for i, test := range tests {
-		result := test.in.Error()
-		if result != test.want {
-			t.Errorf("Error #%d\n got: %s want: %s", i, result,
-				test.want)
-			continue
-		}
-	}
-}
-
-// TestMarshalError tests the error output for the MarshalError type.
-func TestMarshalError(t *testing.T) {
-	tests := []struct {
-		in   MarshalError
-		want string
-	}{
-		{
-			MarshalError{
-				ErrorCode:   ErrIO,
-				Func:        "test",
-				Description: "EOF while encoding 5 bytes",
-				Value:       []byte{0x01, 0x02},
-			},
-			"xdr:test: EOF while encoding 5 bytes - wrote: '[1 2]'",
-		},
-		{
-			MarshalError{
-				ErrorCode:   ErrBadEnumValue,
-				Func:        "test",
-				Description: "invalid enum",
-				Value:       "testenum",
-			},
-			"xdr:test: invalid enum - value: 'testenum'",
-		},
-		{
-			MarshalError{
-				ErrorCode:   ErrNilInterface,
-				Func:        "test",
-				Description: "can't marshal to nil interface",
-				Value:       nil,
-			},
-			"xdr:test: can't marshal to nil interface",
-		},
-	}
-
-	for i, test := range tests {
-		result := test.in.Error()
-		if result != test.want {
-			t.Errorf("Error #%d\n got: %s want: %s", i, result,
-				test.want)
-			continue
-		}
-	}
-}
-
-// TestIOErr ensures the IsIO function behaves as expected given different error
-// types.
-func TestIOErr(t *testing.T) {
-	tests := []struct {
-		in   error
-		want bool
-	}{
-		{
-			&MarshalError{
-				ErrorCode:   ErrIO,
-				Func:        "test",
-				Description: "EOF while encoding 5 bytes",
-				Value:       []byte{0x01, 0x02},
-			},
-			true,
-		},
-		{
-			&MarshalError{
-				ErrorCode:   ErrUnsupportedType,
-				Func:        "test",
-				Description: "ErrUnsupportedType",
-				Value:       []byte{},
-			},
-			false,
-		},
-		{
-			&UnmarshalError{
-				ErrorCode:   ErrIO,
-				Func:        "test",
-				Description: "EOF while decoding 5 bytes",
-				Value:       []byte{0x01, 0x02},
-			},
-			true,
-		},
-		{
-			&UnmarshalError{
-				ErrorCode:   ErrUnsupportedType,
-				Func:        "test",
-				Description: "ErrUnsupportedType",
-				Value:       []byte{},
-			},
-			false,
-		},
-		{
-			errors.New("boom"),
-			false,
-		},
-	}
-
-	for i, test := range tests {
-		result := IsIO(test.in)
-		if result != test.want {
-			t.Errorf("Error #%d\n got: %v want: %v", i, result,
-				test.want)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/example_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/example_test.go
deleted file mode 100644
index 12728629e8..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/example_test.go
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"bytes"
-	"fmt"
-
-	"github.com/davecgh/go-xdr/xdr2"
-)
-
-// This example demonstrates how to use Marshal to automatically XDR encode
-// data using reflection.
-func ExampleMarshal() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// Sample image header data.
-	h := ImageHeader{[3]byte{0xAB, 0xCD, 0xEF}, 2, true, 10}
-
-	// Use marshal to automatically determine the appropriate underlying XDR
-	// types and encode.
-	var w bytes.Buffer
-	bytesWritten, err := xdr.Marshal(&w, &h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("bytes written:", bytesWritten)
-	fmt.Println("encoded data:", w.Bytes())
-
-	// Output:
-	// bytes written: 16
-	// encoded data: [171 205 239 0 0 0 0 2 0 0 0 1 0 0 0 10]
-}
-
-// This example demonstrates how to use Unmarshal to decode XDR encoded data
-// from a byte slice into a struct.
-func ExampleUnmarshal() {
-	// Hypothetical image header format.
-	type ImageHeader struct {
-		Signature   [3]byte
-		Version     uint32
-		IsGrayscale bool
-		NumSections uint32
-	}
-
-	// XDR encoded data described by the above structure.  Typically this
-	// would be read from a file or across the network, but use a manual
-	// byte array here as an example.
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00, // Signature
-		0x00, 0x00, 0x00, 0x02, // Version
-		0x00, 0x00, 0x00, 0x01, // IsGrayscale
-		0x00, 0x00, 0x00, 0x0A, // NumSections
-	}
-
-	// Declare a variable to provide Unmarshal with a concrete type and
-	// instance to decode into.
-	var h ImageHeader
-	bytesRead, err := xdr.Unmarshal(bytes.NewReader(encodedData), &h)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("bytes read:", bytesRead)
-	fmt.Printf("h: %+v", h)
-
-	// Output:
-	// bytes read: 16
-	// h: {Signature:[171 205 239] Version:2 IsGrayscale:true NumSections:10}
-}
-
-// This example demonstrates how to manually decode XDR encoded data from a
-// reader. Compare this example with the Unmarshal example which performs the
-// same task automatically by utilizing a struct type definition and reflection.
-func ExampleNewDecoder() {
-	// XDR encoded data for a hypothetical ImageHeader struct as follows:
-	// type ImageHeader struct {
-	// 		Signature	[3]byte
-	// 		Version		uint32
-	// 		IsGrayscale	bool
-	// 		NumSections	uint32
-	// }
-	encodedData := []byte{
-		0xAB, 0xCD, 0xEF, 0x00, // Signature
-		0x00, 0x00, 0x00, 0x02, // Version
-		0x00, 0x00, 0x00, 0x01, // IsGrayscale
-		0x00, 0x00, 0x00, 0x0A, // NumSections
-	}
-
-	// Get a new decoder for manual decoding.
-	dec := xdr.NewDecoder(bytes.NewReader(encodedData))
-
-	signature, _, err := dec.DecodeFixedOpaque(3)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	version, _, err := dec.DecodeUint()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	isGrayscale, _, err := dec.DecodeBool()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	numSections, _, err := dec.DecodeUint()
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("signature:", signature)
-	fmt.Println("version:", version)
-	fmt.Println("isGrayscale:", isGrayscale)
-	fmt.Println("numSections:", numSections)
-
-	// Output:
-	// signature: [171 205 239]
-	// version: 2
-	// isGrayscale: true
-	// numSections: 10
-}
-
-// This example demonstrates how to manually encode XDR data from Go variables.
-// Compare this example with the Marshal example which performs the same task
-// automatically by utilizing a struct type definition and reflection.
-func ExampleNewEncoder() {
-	// Data for a hypothetical ImageHeader struct as follows:
-	// type ImageHeader struct {
-	// 		Signature	[3]byte
-	//		Version		uint32
-	//		IsGrayscale	bool
-	//		NumSections	uint32
-	// }
-	signature := []byte{0xAB, 0xCD, 0xEF}
-	version := uint32(2)
-	isGrayscale := true
-	numSections := uint32(10)
-
-	// Get a new encoder for manual encoding.
-	var w bytes.Buffer
-	enc := xdr.NewEncoder(&w)
-
-	_, err := enc.EncodeFixedOpaque(signature)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	_, err = enc.EncodeUint(version)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	_, err = enc.EncodeBool(isGrayscale)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	_, err = enc.EncodeUint(numSections)
-	if err != nil {
-		fmt.Println(err)
-		return
-	}
-
-	fmt.Println("encoded data:", w.Bytes())
-
-	// Output:
-	// encoded data: [171 205 239 0 0 0 0 2 0 0 0 1 0 0 0 10]
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/fixedIO_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/fixedIO_test.go
deleted file mode 100644
index d329a9a84f..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/fixedIO_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright (c) 2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-package xdr_test
-
-import (
-	"io"
-)
-
-// fixedWriter implements the io.Writer interface and intentially allows
-// testing of error paths by forcing short writes.
-type fixedWriter struct {
-	b   []byte
-	pos int
-}
-
-// Write writes the contents of p to w. When the contents of p would cause
-// the writer to exceed the maximum allowed size of the fixed writer, the writer
-// writes as many bytes as possible to reach the maximum allowed size and
-// io.ErrShortWrite is returned.
-//
-// This satisfies the io.Writer interface.
-func (w *fixedWriter) Write(p []byte) (int, error) {
-	if w.pos+len(p) > cap(w.b) {
-		n := copy(w.b[w.pos:], p[:cap(w.b)-w.pos])
-		w.pos += n
-		return n, io.ErrShortWrite
-	}
-
-	n := copy(w.b[w.pos:], p)
-	w.pos += n
-	return n, nil
-}
-
-// Bytes returns the bytes already written to the fixed writer.
-func (w *fixedWriter) Bytes() []byte {
-	return w.b
-}
-
-// newFixedWriter returns a new io.Writer that will error once more bytes than
-// the specified max have been written.
-func newFixedWriter(max int) *fixedWriter {
-	b := make([]byte, max, max)
-	fw := fixedWriter{b, 0}
-	return &fw
-}
diff --git a/installer/vendor/github.com/davecgh/go-xdr/xdr2/internal_test.go b/installer/vendor/github.com/davecgh/go-xdr/xdr2/internal_test.go
deleted file mode 100644
index bd180d4ee6..0000000000
--- a/installer/vendor/github.com/davecgh/go-xdr/xdr2/internal_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (c) 2012-2014 Dave Collins <dave@davec.name>
- *
- * Permission to use, copy, modify, and distribute this software for any
- * purpose with or without fee is hereby granted, provided that the above
- * copyright notice and this permission notice appear in all copies.
- *
- * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-/*
-This test file is part of the xdr package rather than than the xdr_test package
-so it can bridge access to the internals to properly test cases which are either
-not possible or can't reliably be tested via the public interface. The functions
-are only exported while the tests are being run.
-*/
-
-package xdr
-
-import (
-	"io"
-	"reflect"
-)
-
-// TstEncode creates a new Encoder to the passed writer and returns the internal
-// encode function on the Encoder.
-func TstEncode(w io.Writer) func(v reflect.Value) (int, error) {
-	enc := NewEncoder(w)
-	return enc.encode
-}
-
-// TstDecode creates a new Decoder for the passed reader and returns the
-// internal decode function on the Decoder.
-func TstDecode(r io.Reader) func(v reflect.Value) (int, error) {
-	dec := NewDecoder(r)
-	return dec.decode
-}
diff --git a/installer/vendor/github.com/docker/docker/.dockerignore b/installer/vendor/github.com/docker/docker/.dockerignore
deleted file mode 100644
index 082cac9224..0000000000
--- a/installer/vendor/github.com/docker/docker/.dockerignore
+++ /dev/null
@@ -1,4 +0,0 @@
-bundles
-.gopath
-vendor/pkg
-.go-pkg-cache
diff --git a/installer/vendor/github.com/docker/docker/.github/ISSUE_TEMPLATE.md b/installer/vendor/github.com/docker/docker/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 7362480a4a..0000000000
--- a/installer/vendor/github.com/docker/docker/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-If you are reporting a new issue, make sure that we do not have any duplicates
-already open. You can ensure this by searching the issue list for this
-repository. If there is a duplicate, please close your issue and add a comment
-to the existing issue instead.
-
-If you suspect your issue is a bug, please edit your issue description to
-include the BUG REPORT INFORMATION shown below. If you fail to provide this
-information within 7 days, we cannot debug your issue and will close it. We
-will, however, reopen it if you later provide the information.
-
-For more information about reporting issues, see
-https://github.com/docker/docker/blob/master/CONTRIBUTING.md#reporting-other-issues
-
----------------------------------------------------
-GENERAL SUPPORT INFORMATION
----------------------------------------------------
-
-The GitHub issue tracker is for bug reports and feature requests.
-General support can be found at the following locations:
-
-- Docker Support Forums - https://forums.docker.com
-- IRC - irc.freenode.net #docker channel
-- Post a question on StackOverflow, using the Docker tag
-
----------------------------------------------------
-BUG REPORT INFORMATION
----------------------------------------------------
-Use the commands below to provide key information from your environment:
-You do NOT have to include this information if this is a FEATURE REQUEST
--->
-
-**Description**
-
-<!--
-Briefly describe the problem you are having in a few paragraphs.
--->
-
-**Steps to reproduce the issue:**
-1.
-2.
-3.
-
-**Describe the results you received:**
-
-
-**Describe the results you expected:**
-
-
-**Additional information you deem important (e.g. issue happens only occasionally):**
-
-**Output of `docker version`:**
-
-```
-(paste your output here)
-```
-
-**Output of `docker info`:**
-
-```
-(paste your output here)
-```
-
-**Additional environment details (AWS, VirtualBox, physical, etc.):**
diff --git a/installer/vendor/github.com/docker/docker/.github/PULL_REQUEST_TEMPLATE.md b/installer/vendor/github.com/docker/docker/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index 426981828b..0000000000
--- a/installer/vendor/github.com/docker/docker/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-Please make sure you've read and understood our contributing guidelines;
-https://github.com/docker/docker/blob/master/CONTRIBUTING.md
-
-** Make sure all your commits include a signature generated with `git commit -s` **
-
-For additional information on our contributing process, read our contributing
-guide https://docs.docker.com/opensource/code/
-
-If this is a bug fix, make sure your description includes "fixes #xxxx", or
-"closes #xxxx"
-
-Please provide the following information:
--->
-
-**- What I did**
-
-**- How I did it**
-
-**- How to verify it**
-
-**- Description for the changelog**
-<!--
-Write a short (one line) summary that describes the changes in this
-pull request for inclusion in the changelog:
--->
-
-
-**- A picture of a cute animal (not mandatory but encouraged)**
-
diff --git a/installer/vendor/github.com/docker/docker/.gitignore b/installer/vendor/github.com/docker/docker/.gitignore
deleted file mode 100644
index be8b03d17b..0000000000
--- a/installer/vendor/github.com/docker/docker/.gitignore
+++ /dev/null
@@ -1,33 +0,0 @@
-# Docker project generated files to ignore
-#  if you want to ignore files created by your editor/tools,
-#  please consider a global .gitignore https://help.github.com/articles/ignoring-files
-*.exe
-*.exe~
-*.orig
-*.test
-.*.swp
-.DS_Store
-# a .bashrc may be added to customize the build environment
-.bashrc
-.editorconfig
-.gopath/
-.go-pkg-cache/
-autogen/
-bundles/
-cmd/dockerd/dockerd
-cmd/docker/docker
-dockerversion/version_autogen.go
-dockerversion/version_autogen_unix.go
-docs/AWS_S3_BUCKET
-docs/GITCOMMIT
-docs/GIT_BRANCH
-docs/VERSION
-docs/_build
-docs/_static
-docs/_templates
-docs/changed-files
-# generated by man/md2man-all.sh
-man/man1
-man/man5
-man/man8
-vendor/pkg/
diff --git a/installer/vendor/github.com/docker/docker/.mailmap b/installer/vendor/github.com/docker/docker/.mailmap
deleted file mode 100644
index fe99e2086f..0000000000
--- a/installer/vendor/github.com/docker/docker/.mailmap
+++ /dev/null
@@ -1,275 +0,0 @@
-# Generate AUTHORS: hack/generate-authors.sh
-
-# Tip for finding duplicates (besides scanning the output of AUTHORS for name
-# duplicates that aren't also email duplicates): scan the output of:
-#   git log --format='%aE - %aN' | sort -uf
-#
-# For explanation on this file format: man git-shortlog
-
-Patrick Stapleton <github@gdi2290.com>
-Shishir Mahajan <shishir.mahajan@redhat.com> <smahajan@redhat.com>
-Erwin van der Koogh <info@erronis.nl>
-Ahmed Kamal <email.ahmedkamal@googlemail.com>
-Tejesh Mehta <tejesh.mehta@gmail.com> <tj@init.me>
-Cristian Staretu <cristian.staretu@gmail.com>
-Cristian Staretu <cristian.staretu@gmail.com> <unclejacksons@gmail.com>
-Cristian Staretu <cristian.staretu@gmail.com> <unclejack@users.noreply.github.com>
-Marcus Linke <marcus.linke@gmx.de>
-Aleksandrs Fadins <aleks@s-ko.net>
-Christopher Latham <sudosurootdev@gmail.com>
-Hu Keping <hukeping@huawei.com>
-Wayne Chang <wayne@neverfear.org>
-Chen Chao <cc272309126@gmail.com>
-Daehyeok Mun <daehyeok@gmail.com>
-<daehyeok@gmail.com> <daehyeok@daehyeokui-MacBook-Air.local>
-<jt@yadutaf.fr> <admin@jtlebi.fr>
-<jeff@docker.com> <jefferya@programmerq.net>
-<charles.hooper@dotcloud.com> <chooper@plumata.com>
-<daniel.mizyrycki@dotcloud.com> <daniel@dotcloud.com>
-<daniel.mizyrycki@dotcloud.com> <mzdaniel@glidelink.net>
-Guillaume J. Charmes <guillaume.charmes@docker.com> <charmes.guillaume@gmail.com>
-<guillaume.charmes@docker.com> <guillaume@dotcloud.com>
-<guillaume.charmes@docker.com> <guillaume@docker.com>
-<guillaume.charmes@docker.com> <guillaume.charmes@dotcloud.com>
-<guillaume.charmes@docker.com> <guillaume@charmes.net>
-<kencochrane@gmail.com> <KenCochrane@gmail.com>
-Thatcher Peskens <thatcher@docker.com>
-Thatcher Peskens <thatcher@docker.com> <thatcher@dotcloud.com>
-Thatcher Peskens <thatcher@docker.com> dhrp <thatcher@gmx.net>
-Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> jpetazzo <jerome.petazzoni@dotcloud.com>
-Jérôme Petazzoni <jerome.petazzoni@dotcloud.com> <jp@enix.org>
-Joffrey F <joffrey@docker.com>
-Joffrey F <joffrey@docker.com> <joffrey@dotcloud.com>
-Joffrey F <joffrey@docker.com> <f.joffrey@gmail.com>
-Tim Terhorst <mynamewastaken+git@gmail.com>
-Andy Smith <github@anarkystic.com>
-<kalessin@kalessin.fr> <louis@dotcloud.com>
-<victor.vieux@docker.com> <victor.vieux@dotcloud.com>
-<victor.vieux@docker.com> <victor@dotcloud.com>
-<victor.vieux@docker.com> <dev@vvieux.com>
-<victor.vieux@docker.com> <victor@docker.com>
-<victor.vieux@docker.com> <vieux@docker.com>
-<victor.vieux@docker.com> <victorvieux@gmail.com>
-<dominik@honnef.co> <dominikh@fork-bomb.org>
-<ehanchrow@ine.com> <eric.hanchrow@gmail.com>
-Walter Stanish <walter@pratyeka.org>
-<daniel@gasienica.ch> <dgasienica@zynga.com>
-Roberto Hashioka <roberto_hashioka@hotmail.com>
-Konstantin Pelykh <kpelykh@zettaset.com>
-David Sissitka <me@dsissitka.com>
-Nolan Darilek <nolan@thewordnerd.info>
-<mastahyeti@gmail.com> <mastahyeti@users.noreply.github.com>
-Benoit Chesneau <bchesneau@gmail.com>
-Jordan Arentsen <blissdev@gmail.com>
-Daniel Garcia <daniel@danielgarcia.info>
-Miguel Angel Fernández <elmendalerenda@gmail.com>
-Bhiraj Butala <abhiraj.butala@gmail.com>
-Faiz Khan <faizkhan00@gmail.com>
-Victor Lyuboslavsky <victor@victoreda.com>
-Jean-Baptiste Barth <jeanbaptiste.barth@gmail.com>
-Matthew Mueller <mattmuelle@gmail.com>
-<mosoni@ebay.com> <mohitsoni1989@gmail.com>
-Shih-Yuan Lee <fourdollars@gmail.com>
-Daniel Mizyrycki <daniel.mizyrycki@dotcloud.com> root <root@vagrant-ubuntu-12.10.vagrantup.com>
-Jean-Baptiste Dalido <jeanbaptiste@appgratis.com>
-<proppy@google.com> <proppy@aminche.com>
-<michael@docker.com> <michael@crosbymichael.com>
-<michael@docker.com> <crosby.michael@gmail.com>
-<michael@docker.com> <crosbymichael@gmail.com>
-<github@developersupport.net> <github@metaliveblog.com>
-<brandon@ifup.org> <brandon@ifup.co>
-<dano@spotify.com> <daniel.norberg@gmail.com>
-<danny@codeaholics.org> <Danny.Yates@mailonline.co.uk>
-<gurjeet@singh.im> <singh.gurjeet@gmail.com>
-<shawn@churchofgit.com> <shawnlandden@gmail.com>
-<sjoerd-github@linuxonly.nl> <sjoerd@byte.nl>
-<solomon@docker.com> <solomon.hykes@dotcloud.com>
-<solomon@docker.com> <solomon@dotcloud.com>
-<solomon@docker.com> <s@docker.com>
-Sven Dowideit <SvenDowideit@home.org.au>
-Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@fosiki.com>
-Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@docker.com>
-Sven Dowideit <SvenDowideit@home.org.au> <¨SvenDowideit@home.org.au¨>
-Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@home.org.au>
-Sven Dowideit <SvenDowideit@home.org.au> <SvenDowideit@users.noreply.github.com>
-Sven Dowideit <SvenDowideit@home.org.au> <sven@t440s.home.gateway>
-<alexl@redhat.com> <alexander.larsson@gmail.com>
-Alexander Morozov <lk4d4@docker.com> <lk4d4math@gmail.com>
-Alexander Morozov <lk4d4@docker.com>
-<git.nivoc@neverbox.com> <kuehnle@online.de>
-O.S. Tezer <ostezer@gmail.com>
-<ostezer@gmail.com> <ostezer@users.noreply.github.com>
-Roberto G. Hashioka <roberto.hashioka@docker.com> <roberto_hashioka@hotmail.com>
-<justin.p.simonelis@gmail.com> <justin.simonelis@PTS-JSIMON2.toronto.exclamation.com>
-<taim@bosboot.org> <maztaim@users.noreply.github.com>
-<viktor.vojnovski@amadeus.com> <vojnovski@gmail.com>
-<vbatts@redhat.com> <vbatts@hashbangbash.com>
-<altsysrq@gmail.com> <iamironbob@gmail.com>
-Sridhar Ratnakumar <sridharr@activestate.com>
-Sridhar Ratnakumar <sridharr@activestate.com> <github@srid.name>
-Liang-Chi Hsieh <viirya@gmail.com>
-Aleksa Sarai <asarai@suse.de>
-Aleksa Sarai <asarai@suse.de> <asarai@suse.com>
-Aleksa Sarai <asarai@suse.de> <cyphar@cyphar.com>
-Will Weaver <monkey@buildingbananas.com>
-Timothy Hobbs <timothyhobbs@seznam.cz>
-Nathan LeClaire <nathan.leclaire@docker.com> <nathan.leclaire@gmail.com>
-Nathan LeClaire <nathan.leclaire@docker.com> <nathanleclaire@gmail.com>
-<github@hollensbe.org> <erik+github@hollensbe.org>
-<github@albersweb.de> <albers@users.noreply.github.com>
-<lsm5@fedoraproject.org> <lsm5@redhat.com>
-<marc@marc-abramowitz.com> <msabramo@gmail.com>
-Matthew Heon <mheon@redhat.com> <mheon@mheonlaptop.redhat.com>
-<bernat@luffy.cx> <vincent@bernat.im>
-<bernat@luffy.cx> <Vincent.Bernat@exoscale.ch>
-<p@pwaller.net> <peter@scraperwiki.com>
-<andrew.weiss@outlook.com> <andrew.weiss@microsoft.com>
-Francisco Carriedo <fcarriedo@gmail.com>
-<julienbordellier@gmail.com> <git@julienbordellier.com>
-<ahmetb@microsoft.com> <ahmetalpbalkan@gmail.com>
-<arnaud.porterie@docker.com> <icecrime@gmail.com>
-<baloo@gandi.net> <superbaloo+registrations.github@superbaloo.net>
-Brian Goff <cpuguy83@gmail.com>
-<cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.home>
-<eric@windisch.us> <ewindisch@docker.com>
-<frank.rosquin+github@gmail.com> <frank.rosquin@gmail.com>
-Hollie Teal <hollie@docker.com>
-<hollie@docker.com> <hollie.teal@docker.com>
-<hollie@docker.com> <hollietealok@users.noreply.github.com>
-<huu@prismskylabs.com> <whoshuu@gmail.com>
-Jessica Frazelle <jessfraz@google.com>
-Jessica Frazelle <jessfraz@google.com> <me@jessfraz.com>
-Jessica Frazelle <jessfraz@google.com> <jess@mesosphere.com>
-Jessica Frazelle <jessfraz@google.com> <jfrazelle@users.noreply.github.com>
-Jessica Frazelle <jessfraz@google.com> <acidburn@docker.com>
-Jessica Frazelle <jessfraz@google.com> <jess@docker.com>
-Jessica Frazelle <jessfraz@google.com> <princess@docker.com>
-<konrad.wilhelm.kleine@gmail.com> <kwk@users.noreply.github.com>
-<tintypemolly@gmail.com> <tintypemolly@Ohui-MacBook-Pro.local>
-<estesp@linux.vnet.ibm.com> <estesp@gmail.com>
-<github@gone.nl> <thaJeztah@users.noreply.github.com>
-Thomas LEVEIL <thomasleveil@gmail.com> Thomas LÉVEIL <thomasleveil@users.noreply.github.com>
-<oi@truffles.me.uk> <timruffles@googlemail.com>
-<Vincent.Bernat@exoscale.ch> <bernat@luffy.cx>
-Antonio Murdaca <antonio.murdaca@gmail.com> <amurdaca@redhat.com>
-Antonio Murdaca <antonio.murdaca@gmail.com> <runcom@redhat.com>
-Antonio Murdaca <antonio.murdaca@gmail.com> <me@runcom.ninja>
-Antonio Murdaca <antonio.murdaca@gmail.com> <runcom@linux.com>
-Antonio Murdaca <antonio.murdaca@gmail.com> <runcom@users.noreply.github.com>
-Darren Shepherd <darren.s.shepherd@gmail.com> <darren@rancher.com>
-Deshi Xiao <dxiao@redhat.com> <dsxiao@dataman-inc.com>
-Deshi Xiao <dxiao@redhat.com> <xiaods@gmail.com>
-Doug Davis <dug@us.ibm.com> <duglin@users.noreply.github.com>
-Jacob Atzen <jacob@jacobatzen.dk> <jatzen@gmail.com>
-Jeff Nickoloff <jeff.nickoloff@gmail.com> <jeff@allingeek.com>
-John Howard (VM) <John.Howard@microsoft.com> <jhowardmsft@users.noreply.github.com>
-John Howard (VM) <John.Howard@microsoft.com>
-John Howard (VM) <John.Howard@microsoft.com> <john.howard@microsoft.com>
-John Howard (VM) <John.Howard@microsoft.com> <jhoward@microsoft.com>
-Madhu Venugopal <madhu@socketplane.io> <madhu@docker.com>
-Mary Anthony <mary.anthony@docker.com> <mary@docker.com>
-Mary Anthony <mary.anthony@docker.com> moxiegirl <mary@docker.com>
-Mary Anthony <mary.anthony@docker.com> <moxieandmore@gmail.com>
-mattyw <mattyw@me.com> <gh@mattyw.net>
-resouer <resouer@163.com> <resouer@gmail.com>
-AJ Bowen <aj@gandi.net> soulshake <amy@gandi.net> 
-AJ Bowen <aj@gandi.net> soulshake <aj@gandi.net>
-Tibor Vass <teabee89@gmail.com> <tibor@docker.com>
-Tibor Vass <teabee89@gmail.com> <tiborvass@users.noreply.github.com>
-Vincent Bernat <bernat@luffy.cx> <Vincent.Bernat@exoscale.ch>
-Yestin Sun <sunyi0804@gmail.com> <yestin.sun@polyera.com>
-bin liu <liubin0329@users.noreply.github.com> <liubin0329@gmail.com>
-John Howard (VM) <John.Howard@microsoft.com> jhowardmsft <jhoward@microsoft.com>
-Ankush Agarwal <ankushagarwal11@gmail.com> <ankushagarwal@users.noreply.github.com>
-Tangi COLIN <tangicolin@gmail.com> tangicolin <tangicolin@gmail.com>
-Allen Sun <allen.sun@daocloud.io>
-Adrien Gallouët <adrien@gallouet.fr> <angt@users.noreply.github.com>
-<aanm90@gmail.com> <martins@noironetworks.com>
-Anuj Bahuguna <anujbahuguna.dev@gmail.com>
-Anusha Ragunathan <anusha.ragunathan@docker.com> <anusha@docker.com>
-Avi Miller <avi.miller@oracle.com> <avi.miller@gmail.com>
-Brent Salisbury <brent.salisbury@docker.com> <brent@docker.com>
-Chander G <chandergovind@gmail.com>
-Chun Chen <ramichen@tencent.com> <chenchun.feed@gmail.com>
-Ying Li <cyli@twistedmatrix.com>
-Daehyeok Mun <daehyeok@gmail.com> <daehyeok@daehyeok-ui-MacBook-Air.local>
-<dqminh@cloudflare.com> <dqminh89@gmail.com>
-Daniel, Dao Quang Minh <dqminh@cloudflare.com>
-Daniel Nephin <dnephin@docker.com> <dnephin@gmail.com>
-Dave Tucker <dt@docker.com> <dave@dtucker.co.uk>
-Doug Tangren <d.tangren@gmail.com>
-Frederick F. Kautz IV <fkautz@redhat.com> <fkautz@alumni.cmu.edu>
-Ben Golub <ben.golub@dotcloud.com>
-Harold Cooper <hrldcpr@gmail.com>
-hsinko <21551195@zju.edu.cn> <hsinko@users.noreply.github.com>
-Josh Hawn <josh.hawn@docker.com> <jlhawn@berkeley.edu>
-Justin Cormack <justin.cormack@docker.com>
-<justin.cormack@docker.com> <justin.cormack@unikernel.com>
-<justin.cormack@docker.com> <justin@specialbusservice.com>
-Kamil Domański <kamil@domanski.co>
-Lei Jitang <leijitang@huawei.com>
-<leijitang@huawei.com> <leijitang@gmail.com>
-Linus Heckemann <lheckemann@twig-world.com>
-<lheckemann@twig-world.com> <anonymouse2048@gmail.com>
-Lynda O'Leary <lyndaoleary29@gmail.com>
-<lyndaoleary29@gmail.com> <lyndaoleary@hotmail.com>
-Marianna Tessel <mtesselh@gmail.com>
-Michael Huettermann <michael@huettermann.net>
-Moysés Borges <moysesb@gmail.com>
-<moysesb@gmail.com> <moyses.furtado@wplex.com.br>
-Nigel Poulton <nigelpoulton@hotmail.com>
-Qiang Huang <h.huangqiang@huawei.com>
-<h.huangqiang@huawei.com> <qhuang@10.0.2.15>
-Boaz Shuster <ripcurld.github@gmail.com>
-Shuwei Hao <haosw@cn.ibm.com>
-<haosw@cn.ibm.com> <haoshuwei24@gmail.com>
-Soshi Katsuta <soshi.katsuta@gmail.com>
-<soshi.katsuta@gmail.com> <katsuta_soshi@cyberagent.co.jp>
-Stefan Berger <stefanb@linux.vnet.ibm.com>
-<stefanb@linux.vnet.ibm.com> <stefanb@us.ibm.com>
-Stephen Day <stephen.day@docker.com>
-<stephen.day@docker.com> <stevvooe@users.noreply.github.com>
-Toli Kuznets <toli@docker.com>
-Tristan Carel <tristan@cogniteev.com>
-<tristan@cogniteev.com> <tristan.carel@gmail.com>
-Vincent Demeester <vincent@sbr.pm>
-<vincent@sbr.pm> <vincent+github@demeester.fr>
-Vishnu Kannan <vishnuk@google.com>
-xlgao-zju <xlgao@zju.edu.cn> xlgao <xlgao@zju.edu.cn>
-yuchangchun <yuchangchun1@huawei.com> y00277921 <yuchangchun1@huawei.com> 
-<zij@case.edu> <zjaffee@us.ibm.com>
-<anujbahuguna.dev@gmail.com> <abahuguna@fiberlink.com>
-<eungjun.yi@navercorp.com> <semtlenori@gmail.com>
-<haosw@cn.ibm.com> <haoshuwei1989@163.com>
-Hao Shu Wei <haosw@cn.ibm.com>
-<matt.bentley@docker.com> <mbentley@mbentley.net>
-<MihaiBorob@gmail.com> <MihaiBorobocea@gmail.com>
-<redmond.martin@gmail.com> <xgithub@redmond5.com>
-<redmond.martin@gmail.com> <martin@tinychat.com>
-<srbrahma@us.ibm.com> <sbrahma@us.ibm.com>
-<suda.akihiro@lab.ntt.co.jp> <suda.kyoto@gmail.com>
-<thomas@gazagnaire.org> <thomas@gazagnaire.com>
-Shengbo Song <thomassong@tencent.com> mYmNeo <mymneo@163.com>
-Shengbo Song <thomassong@tencent.com>
-<sylvain@ascribe.io> <sylvain.bellemare@ezeep.com>
-Sylvain Bellemare <sylvain@ascribe.io>
-<alexandre.beslic@gmail.com> <abronan@docker.com>
-<bilal.amarni@gmail.com> <bamarni@users.noreply.github.com>
-<misty@docker.com> <misty@apache.org>
-Arnaud Porterie <arnaud.porterie@docker.com>
-<cpuguy83@gmail.com> <bgoff@cpuguy83-mbp.local>
-David M. Karr <davidmichaelkarr@gmail.com>
-<diogo@docker.com> <diogo.monica@gmail.com>
-<horwitz@addthis.com> <horwitzja@gmail.com>
-<kherner@progress.com> <chosenken@gmail.com>
-Kenfe-Mickaël Laventure <mickael.laventure@gmail.com>
-<mauricio@medallia.com> <mauriciogaravaglia@gmail.com>
-<dhenderson@gmail.com> <Dave.Henderson@ca.ibm.com>
-<wkq5325@gmail.com> <wkqwu@cn.ibm.com>
-<mike.goelzer@docker.com> <mgoelzer@docker.com>
-<nicholasjamesrusso@gmail.com> <nicholasrusso@icloud.com>
-Runshen Zhu <runshen.zhu@gmail.com>
-Tom Barlow <tomwbarlow@gmail.com>
-Xianlu Bird <xianlubird@gmail.com>
-Dan Feldman <danf@jfrog.com>
-Harry Zhang <harryz@hyper.sh> <harryzhang@zju.edu.cn>
diff --git a/installer/vendor/github.com/docker/docker/CHANGELOG.md b/installer/vendor/github.com/docker/docker/CHANGELOG.md
deleted file mode 100644
index 36bb880639..0000000000
--- a/installer/vendor/github.com/docker/docker/CHANGELOG.md
+++ /dev/null
@@ -1,3337 +0,0 @@
-# Changelog
-
-Items starting with `DEPRECATE` are important deprecation notices. For more
-information on the list of deprecated flags and APIs please have a look at
-https://docs.docker.com/engine/deprecated/ where target removal dates can also
-be found.
-
-## 1.13.1 (2017-02-08)
-
-**IMPORTANT**: On Linux distributions where `devicemapper` was the default storage driver,
-the `overlay2`, or `overlay` is now used by default (if the kernel supports it).
-To use devicemapper, you can manually configure the storage driver to use through
-the `--storage-driver` daemon option, or by setting "storage-driver" in the `daemon.json`
-configuration file.
-
-**IMPORTANT**: In Docker 1.13, the managed plugin api changed, as compared to the experimental
-version introduced in Docker 1.12. You must **uninstall** plugins which you installed with Docker 1.12
-_before_ upgrading to Docker 1.13. You can uninstall plugins using the `docker plugin rm` command.
-
-If you have already upgraded to Docker 1.13 without uninstalling
-previously-installed plugins, you may see this message when the Docker daemon
-starts:
-
-    Error starting daemon: json: cannot unmarshal string into Go value of type types.PluginEnv
-
-To manually remove all plugins and resolve this problem, take the following steps:
-
-1. Remove plugins.json from: `/var/lib/docker/plugins/`.
-2. Restart Docker. Verify that the Docker daemon starts with no errors.
-3. Reinstall your plugins.
-
-### Contrib
-
-* Do not require a custom build of tini [#28454](https://github.com/docker/docker/pull/28454)
-* Upgrade to Go 1.7.5 [#30489](https://github.com/docker/docker/pull/30489)
-
-### Remote API (v1.26) & Client
-
-+ Support secrets in docker stack deploy with compose file [#30144](https://github.com/docker/docker/pull/30144)
-
-### Runtime
-
-* Fix size issue in `docker system df` [#30378](https://github.com/docker/docker/pull/30378)
-* Fix error on `docker inspect` when Swarm certificates were expired. [#29246](https://github.com/docker/docker/pull/29246)
-* Fix deadlock on v1 plugin with activate error [#30408](https://github.com/docker/docker/pull/30408)
-* Fix SELinux regression [#30649](https://github.com/docker/docker/pull/30649)
-
-### Plugins
-
-* Support global scoped network plugins (v2) in swarm mode [#30332](https://github.com/docker/docker/pull/30332)
-+ Add `docker plugin upgrade` [#29414](https://github.com/docker/docker/pull/29414)
-
-### Windows
-
-* Fix small regression with old plugins in Windows [#30150](https://github.com/docker/docker/pull/30150)
-* Fix warning on Windows [#30730](https://github.com/docker/docker/pull/30730)
-
-## 1.13.0 (2017-01-18)
-
-**IMPORTANT**: On Linux distributions where `devicemapper` was the default storage driver,
-the `overlay2`, or `overlay` is now used by default (if the kernel supports it).
-To use devicemapper, you can manually configure the storage driver to use through
-the `--storage-driver` daemon option, or by setting "storage-driver" in the `daemon.json`
-configuration file.
-
-**IMPORTANT**: In Docker 1.13, the managed plugin api changed, as compared to the experimental
-version introduced in Docker 1.12. You must **uninstall** plugins which you installed with Docker 1.12
-_before_ upgrading to Docker 1.13. You can uninstall plugins using the `docker plugin rm` command.
-
-If you have already upgraded to Docker 1.13 without uninstalling
-previously-installed plugins, you may see this message when the Docker daemon
-starts:
-
-    Error starting daemon: json: cannot unmarshal string into Go value of type types.PluginEnv
-
-To manually remove all plugins and resolve this problem, take the following steps:
-
-1. Remove plugins.json from: `/var/lib/docker/plugins/`.
-2. Restart Docker. Verify that the Docker daemon starts with no errors.
-3. Reinstall your plugins.
-
-### Builder
-
-+ Add capability to specify images used as a cache source on build. These images do not need to have local parent chain and can be pulled from other registries [#26839](https://github.com/docker/docker/pull/26839)
-+ (experimental) Add option to squash image layers to the FROM image after successful builds [#22641](https://github.com/docker/docker/pull/22641)
-* Fix dockerfile parser with empty line after escape [#24725](https://github.com/docker/docker/pull/24725)
-- Add step number on `docker build` [#24978](https://github.com/docker/docker/pull/24978)
-+ Add support for compressing build context during image build [#25837](https://github.com/docker/docker/pull/25837)
-+ add `--network` to `docker build` [#27702](https://github.com/docker/docker/pull/27702)
-- Fix inconsistent behavior between `--label` flag on `docker build` and `docker run` [#26027](https://github.com/docker/docker/issues/26027)
-- Fix image layer inconsistencies when using the overlay storage driver [#27209](https://github.com/docker/docker/pull/27209)
-* Unused build-args are now allowed. A warning is presented instead of an error and failed build [#27412](https://github.com/docker/docker/pull/27412)
-- Fix builder cache issue on Windows [#27805](https://github.com/docker/docker/pull/27805)
-+ Allow `USER` in builder on Windows [#28415](https://github.com/docker/docker/pull/28415)
-+ Handle env case-insensitive on Windows [#28725](https://github.com/docker/docker/pull/28725)
-
-### Contrib
-
-+ Add support for building docker debs for Ubuntu 16.04 Xenial on PPC64LE [#23438](https://github.com/docker/docker/pull/23438)
-+ Add support for building docker debs for Ubuntu 16.04 Xenial on s390x [#26104](https://github.com/docker/docker/pull/26104)
-+ Add support for building docker debs for Ubuntu 16.10 Yakkety Yak on PPC64LE [#28046](https://github.com/docker/docker/pull/28046)
-- Add RPM builder for VMWare Photon OS [#24116](https://github.com/docker/docker/pull/24116)
-+ Add shell completions to tgz [#27735](https://github.com/docker/docker/pull/27735)
-* Update the install script to allow using the mirror in China [#27005](https://github.com/docker/docker/pull/27005)
-+ Add DEB builder for Ubuntu 16.10 Yakkety Yak [#27993](https://github.com/docker/docker/pull/27993)
-+ Add RPM builder for Fedora 25 [#28222](https://github.com/docker/docker/pull/28222)
-+ Add `make deb` support for aarch64 [#27625](https://github.com/docker/docker/pull/27625)
-
-### Distribution
-
-* Update notary dependency to 0.4.2 (full changelogs [here](https://github.com/docker/notary/releases/tag/v0.4.2)) [#27074](https://github.com/docker/docker/pull/27074)
-  - Support for compilation on windows [docker/notary#970](https://github.com/docker/notary/pull/970)
-  - Improved error messages for client authentication errors [docker/notary#972](https://github.com/docker/notary/pull/972)
-  - Support for finding keys that are anywhere in the `~/.docker/trust/private` directory, not just under `~/.docker/trust/private/root_keys` or `~/.docker/trust/private/tuf_keys` [docker/notary#981](https://github.com/docker/notary/pull/981)
-  - Previously, on any error updating, the client would fall back on the cache.  Now we only do so if there is a network error or if the server is unavailable or missing the TUF data. Invalid TUF data will cause the update to fail - for example if there was an invalid root rotation. [docker/notary#982](https://github.com/docker/notary/pull/982)
-  - Improve root validation and yubikey debug logging [docker/notary#858](https://github.com/docker/notary/pull/858) [docker/notary#891](https://github.com/docker/notary/pull/891)
-  - Warn if certificates for root or delegations are near expiry [docker/notary#802](https://github.com/docker/notary/pull/802)
-  - Warn if role metadata is near expiry [docker/notary#786](https://github.com/docker/notary/pull/786)
-  - Fix passphrase retrieval attempt counting and terminal detection [docker/notary#906](https://github.com/docker/notary/pull/906)
-- Avoid unnecessary blob uploads when different users push same layers to authenticated registry [#26564](https://github.com/docker/docker/pull/26564)
-* Allow external storage for registry credentials [#26354](https://github.com/docker/docker/pull/26354)
-
-### Logging
-
-* Standardize the default logging tag value in all logging drivers [#22911](https://github.com/docker/docker/pull/22911)
-- Improve performance and memory use when logging of long log lines [#22982](https://github.com/docker/docker/pull/22982)
-+ Enable syslog driver for windows [#25736](https://github.com/docker/docker/pull/25736)
-+ Add Logentries Driver [#27471](https://github.com/docker/docker/pull/27471)
-+ Update of AWS log driver to support tags [#27707](https://github.com/docker/docker/pull/27707)
-+ Unix socket support for fluentd [#26088](https://github.com/docker/docker/pull/26088)
-* Enable fluentd logging driver on Windows [#28189](https://github.com/docker/docker/pull/28189)
-- Sanitize docker labels when used as journald field names [#23725](https://github.com/docker/docker/pull/23725)
-- Fix an issue where `docker logs --tail` returned less lines than expected [#28203](https://github.com/docker/docker/pull/28203)
-- Splunk Logging Driver: performance and reliability improvements [#26207](https://github.com/docker/docker/pull/26207)
-- Splunk Logging Driver: configurable formats and skip for verifying connection [#25786](https://github.com/docker/docker/pull/25786)
-
-### Networking
-
-+ Add `--attachable` network support to enable `docker run` to work in swarm-mode overlay network [#25962](https://github.com/docker/docker/pull/25962)
-+ Add support for host port PublishMode in services using the `--publish` option in `docker service create` [#27917](https://github.com/docker/docker/pull/27917) and [#28943](https://github.com/docker/docker/pull/28943)
-+ Add support for Windows server 2016 overlay network driver (requires upcoming ws2016 update) [#28182](https://github.com/docker/docker/pull/28182)
-* Change the default `FORWARD` policy to `DROP` [#28257](https://github.com/docker/docker/pull/28257)
-+ Add support for specifying static IP addresses for predefined network on windows [#22208](https://github.com/docker/docker/pull/22208)
-- Fix `--publish` flag on `docker run` not working with IPv6 addresses [#27860](https://github.com/docker/docker/pull/27860)
-- Fix inspect network show gateway with mask [#25564](https://github.com/docker/docker/pull/25564)
-- Fix an issue where multiple addresses in a bridge may cause `--fixed-cidr` to not have the correct addresses [#26659](https://github.com/docker/docker/pull/26659)
-+ Add creation timestamp to `docker network inspect` [#26130](https://github.com/docker/docker/pull/26130)
-- Show peer nodes in `docker network inspect` for swarm overlay networks [#28078](https://github.com/docker/docker/pull/28078)
-- Enable ping for service VIP address [#28019](https://github.com/docker/docker/pull/28019)
-
-### Plugins
-
-- Move plugins out of experimental [#28226](https://github.com/docker/docker/pull/28226)
-- Add `--force` on `docker plugin remove` [#25096](https://github.com/docker/docker/pull/25096)
-* Add support for dynamically reloading authorization plugins [#22770](https://github.com/docker/docker/pull/22770)
-+ Add description in `docker plugin ls` [#25556](https://github.com/docker/docker/pull/25556)
-+ Add `-f`/`--format` to `docker plugin inspect` [#25990](https://github.com/docker/docker/pull/25990)
-+ Add `docker plugin create` command [#28164](https://github.com/docker/docker/pull/28164)
-* Send request's TLS peer certificates to authorization plugins [#27383](https://github.com/docker/docker/pull/27383)
-* Support for global-scoped network and ipam plugins in swarm-mode [#27287](https://github.com/docker/docker/pull/27287)
-* Split `docker plugin install` into two API call `/privileges` and `/pull` [#28963](https://github.com/docker/docker/pull/28963)
-
-### Remote API (v1.25) & Client
-
-+ Support `docker stack deploy` from a Compose file [#27998](https://github.com/docker/docker/pull/27998)
-+ (experimental) Implement checkpoint and restore [#22049](https://github.com/docker/docker/pull/22049)
-+ Add `--format` flag to `docker info` [#23808](https://github.com/docker/docker/pull/23808)
-* Remove `--name` from `docker volume create` [#23830](https://github.com/docker/docker/pull/23830)
-+ Add `docker stack ls` [#23886](https://github.com/docker/docker/pull/23886)
-+ Add a new `is-task` ps filter [#24411](https://github.com/docker/docker/pull/24411)
-+ Add `--env-file` flag to `docker service create` [#24844](https://github.com/docker/docker/pull/24844)
-+ Add `--format` on `docker stats` [#24987](https://github.com/docker/docker/pull/24987)
-+ Make `docker node ps` default to `self` in swarm node [#25214](https://github.com/docker/docker/pull/25214)
-+ Add `--group` in `docker service create` [#25317](https://github.com/docker/docker/pull/25317)
-+ Add `--no-trunc` to service/node/stack ps output [#25337](https://github.com/docker/docker/pull/25337)
-+ Add Logs to `ContainerAttachOptions` so go clients can request to retrieve container logs as part of the attach process [#26718](https://github.com/docker/docker/pull/26718)
-+ Allow client to talk to an older server [#27745](https://github.com/docker/docker/pull/27745)
-* Inform user client-side that a container removal is in progress [#26074](https://github.com/docker/docker/pull/26074)
-+ Add `Isolation` to the /info endpoint [#26255](https://github.com/docker/docker/pull/26255)
-+ Add `userns` to the /info endpoint [#27840](https://github.com/docker/docker/pull/27840)
-- Do not allow more than one mode be requested at once in the services endpoint [#26643](https://github.com/docker/docker/pull/26643)
-+ Add capability to /containers/create API to specify mounts in a more granular and safer way [#22373](https://github.com/docker/docker/pull/22373)
-+ Add `--format` flag to `network ls` and `volume ls` [#23475](https://github.com/docker/docker/pull/23475)
-* Allow the top-level `docker inspect` command to inspect any kind of resource [#23614](https://github.com/docker/docker/pull/23614)
-+ Add --cpus flag to control cpu resources for `docker run` and `docker create`, and add `NanoCPUs` to `HostConfig` [#27958](https://github.com/docker/docker/pull/27958)
-- Allow unsetting the `--entrypoint` in `docker run` or `docker create` [#23718](https://github.com/docker/docker/pull/23718)
-* Restructure CLI commands by adding `docker image` and `docker container` commands for more consistency [#26025](https://github.com/docker/docker/pull/26025)
-- Remove `COMMAND` column from `service ls` output [#28029](https://github.com/docker/docker/pull/28029)
-+ Add `--format` to `docker events` [#26268](https://github.com/docker/docker/pull/26268)
-* Allow specifying multiple nodes on `docker node ps` [#26299](https://github.com/docker/docker/pull/26299)
-* Restrict fractional digits to 2 decimals in `docker images` output [#26303](https://github.com/docker/docker/pull/26303)
-+ Add `--dns-option` to `docker run` [#28186](https://github.com/docker/docker/pull/28186)
-+ Add Image ID to container commit event [#28128](https://github.com/docker/docker/pull/28128)
-+ Add external binaries version to docker info [#27955](https://github.com/docker/docker/pull/27955)
-+ Add information for `Manager Addresses` in the output of `docker info` [#28042](https://github.com/docker/docker/pull/28042)
-+ Add a new reference filter for `docker images` [#27872](https://github.com/docker/docker/pull/27872)
-
-### Runtime
-
-+ Add `--experimental` daemon flag to enable experimental features, instead of shipping them in a separate build [#27223](https://github.com/docker/docker/pull/27223)
-+ Add a `--shutdown-timeout` daemon flag to specify the default timeout (in seconds) to stop containers gracefully before daemon exit [#23036](https://github.com/docker/docker/pull/23036)
-+ Add `--stop-timeout` to specify the timeout value (in seconds) for individual containers to stop [#22566](https://github.com/docker/docker/pull/22566)
-+ Add a new daemon flag `--userland-proxy-path` to allow configuring the userland proxy instead of using the hardcoded `docker-proxy` from `$PATH` [#26882](https://github.com/docker/docker/pull/26882)
-+ Add boolean flag `--init` on `dockerd` and on `docker run` to use [tini](https://github.com/krallin/tini) a zombie-reaping init process as PID 1 [#26061](https://github.com/docker/docker/pull/26061) [#28037](https://github.com/docker/docker/pull/28037)
-+ Add a new daemon flag `--init-path` to allow configuring the path to the `docker-init` binary [#26941](https://github.com/docker/docker/pull/26941)
-+ Add support for live reloading insecure registry in configuration [#22337](https://github.com/docker/docker/pull/22337)
-+ Add support for storage-opt size on Windows daemons [#23391](https://github.com/docker/docker/pull/23391)
-* Improve reliability of `docker run --rm` by moving it from the client to the daemon  [#20848](https://github.com/docker/docker/pull/20848)
-+ Add support for `--cpu-rt-period` and `--cpu-rt-runtime` flags, allowing containers to run real-time threads when `CONFIG_RT_GROUP_SCHED` is enabled in the kernel [#23430](https://github.com/docker/docker/pull/23430)
-* Allow parallel stop, pause, unpause [#24761](https://github.com/docker/docker/pull/24761) / [#26778](https://github.com/docker/docker/pull/26778)
-* Implement XFS quota for overlay2 [#24771](https://github.com/docker/docker/pull/24771)
-- Fix partial/full filter issue in `service tasks --filter` [#24850](https://github.com/docker/docker/pull/24850)
-- Allow engine to run inside a user namespace [#25672](https://github.com/docker/docker/pull/25672)
-- Fix a race condition between device deferred removal and resume device, when using the devicemapper graphdriver [#23497](https://github.com/docker/docker/pull/23497)
-- Add `docker stats` support in Windows [#25737](https://github.com/docker/docker/pull/25737)
-- Allow using `--pid=host` and `--net=host` when `--userns=host` [#25771](https://github.com/docker/docker/pull/25771)
-+ (experimental) Add metrics (Prometheus) output for basic `container`, `image`, and `daemon` operations [#25820](https://github.com/docker/docker/pull/25820)
-- Fix issue in `docker stats` with `NetworkDisabled=true` [#25905](https://github.com/docker/docker/pull/25905)
-+ Add `docker top` support in Windows [#25891](https://github.com/docker/docker/pull/25891)
-+ Record pid of exec'd process [#27470](https://github.com/docker/docker/pull/27470)
-+ Add support for looking up user/groups via `getent` [#27599](https://github.com/docker/docker/pull/27599)
-+ Add new `docker system` command with `df` and `prune` subcommands for system resource management, as well as `docker {container,image,volume,network} prune` subcommands [#26108](https://github.com/docker/docker/pull/26108) [#27525](https://github.com/docker/docker/pull/27525) / [#27525](https://github.com/docker/docker/pull/27525)
-- Fix an issue where containers could not be stopped or killed by setting xfs max_retries to 0 upon ENOSPC with devicemapper [#26212](https://github.com/docker/docker/pull/26212)
-- Fix `docker cp` failing to copy to a container's volume dir on CentOS with devicemapper [#28047](https://github.com/docker/docker/pull/28047)
-* Promote overlay(2) graphdriver [#27932](https://github.com/docker/docker/pull/27932)
-+ Add `--seccomp-profile` daemon flag to specify a path to a seccomp profile that overrides the default [#26276](https://github.com/docker/docker/pull/26276)
-- Fix ulimits in `docker inspect` when `--default-ulimit` is set on daemon [#26405](https://github.com/docker/docker/pull/26405)
-- Add workaround for overlay issues during build in older kernels [#28138](https://github.com/docker/docker/pull/28138)
-+ Add `TERM` environment variable on `docker exec -t` [#26461](https://github.com/docker/docker/pull/26461)
-* Honor a container’s `--stop-signal` setting upon `docker kill` [#26464](https://github.com/docker/docker/pull/26464)
-
-### Swarm Mode
-
-+ Add secret management [#27794](https://github.com/docker/docker/pull/27794)
-+ Add support for templating service options (hostname, mounts, and environment variables) [#28025](https://github.com/docker/docker/pull/28025)
-* Display the endpoint mode in the output of `docker service inspect --pretty` [#26906](https://github.com/docker/docker/pull/26906)
-* Make `docker service ps` output more bearable by shortening service IDs in task names [#28088](https://github.com/docker/docker/pull/28088)
-* Make `docker node ps` default to the current node [#25214](https://github.com/docker/docker/pull/25214)
-+ Add `--dns`, -`-dns-opt`, and `--dns-search` to service create. [#27567](https://github.com/docker/docker/pull/27567)
-+ Add `--force` to `docker service update` [#27596](https://github.com/docker/docker/pull/27596)
-+ Add `--health-*` and `--no-healthcheck` flags to `docker service create` and `docker service update` [#27369](https://github.com/docker/docker/pull/27369)
-+ Add `-q` to `docker service ps` [#27654](https://github.com/docker/docker/pull/27654)
-* Display number of global services in `docker service ls` [#27710](https://github.com/docker/docker/pull/27710)
-- Remove `--name` flag from `docker service update`. This flag is only functional on `docker service create`, so was removed from the `update` command [#26988](https://github.com/docker/docker/pull/26988)
-- Fix worker nodes failing to recover because of transient networking issues [#26646](https://github.com/docker/docker/issues/26646)
-* Add support for health aware load balancing and DNS records [#27279](https://github.com/docker/docker/pull/27279)
-+ Add `--hostname` to `docker service create` [#27857](https://github.com/docker/docker/pull/27857)
-+ Add `--host` to `docker service create`, and `--host-add`, `--host-rm` to `docker service update` [#28031](https://github.com/docker/docker/pull/28031)
-+ Add `--tty` flag to `docker service create`/`update` [#28076](https://github.com/docker/docker/pull/28076)
-* Autodetect, store, and expose node IP address as seen by the manager [#27910](https://github.com/docker/docker/pull/27910)
-* Encryption at rest of manager keys and raft data [#27967](https://github.com/docker/docker/pull/27967)
-+ Add `--update-max-failure-ratio`, `--update-monitor` and `--rollback` flags to `docker service update` [#26421](https://github.com/docker/docker/pull/26421)
-- Fix an issue with address autodiscovery on `docker swarm init` running inside a container [#26457](https://github.com/docker/docker/pull/26457)
-+ (experimental) Add `docker service logs` command to view logs for a service [#28089](https://github.com/docker/docker/pull/28089)
-+ Pin images by digest for `docker service create` and `update` [#28173](https://github.com/docker/docker/pull/28173)
-* Add short (`-f`) flag for `docker node rm --force` and `docker swarm leave --force` [#28196](https://github.com/docker/docker/pull/28196)
-+ Add options to customize Raft snapshots (`--max-snapshots`, `--snapshot-interval`) [#27997](https://github.com/docker/docker/pull/27997)
-- Don't repull image if pinned by digest [#28265](https://github.com/docker/docker/pull/28265)
-+ Swarm-mode support for Windows [#27838](https://github.com/docker/docker/pull/27838)
-+ Allow hostname to be updated on service [#28771](https://github.com/docker/docker/pull/28771)
-+ Support v2 plugins [#29433](https://github.com/docker/docker/pull/29433)
-+ Add content trust for services [#29469](https://github.com/docker/docker/pull/29469)
-
-### Volume
-
-+ Add support for labels on volumes [#21270](https://github.com/docker/docker/pull/21270)
-+ Add support for filtering volumes by label [#25628](https://github.com/docker/docker/pull/25628)
-* Add a `--force` flag in `docker volume rm` to forcefully purge the data of the volume that has already been deleted [#23436](https://github.com/docker/docker/pull/23436)
-* Enhance `docker volume inspect` to show all options used when creating the volume [#26671](https://github.com/docker/docker/pull/26671)
-* Add support for local NFS volumes to resolve hostnames [#27329](https://github.com/docker/docker/pull/27329)
-
-### Security
-
-- Fix selinux labeling of volumes shared in a container [#23024](https://github.com/docker/docker/pull/23024)
-- Prohibit `/sys/firmware/**` from being accessed with apparmor [#26618](https://github.com/docker/docker/pull/26618)
-
-### DEPRECATION
-
-- Marked the `docker daemon` command as deprecated. The daemon is moved to a separate binary (`dockerd`), and should be used instead [#26834](https://github.com/docker/docker/pull/26834)
-- Deprecate unversioned API endpoints [#28208](https://github.com/docker/docker/pull/28208)
-- Remove Ubuntu 15.10 (Wily Werewolf) as supported platform. Ubuntu 15.10 is EOL, and no longer receives updates [#27042](https://github.com/docker/docker/pull/27042)
-- Remove Fedora 22 as supported platform. Fedora 22 is EOL, and no longer receives updates [#27432](https://github.com/docker/docker/pull/27432)
-- Remove Fedora 23 as supported platform. Fedora 23 is EOL, and no longer receives updates [#29455](https://github.com/docker/docker/pull/29455)
-- Deprecate the `repo:shortid` syntax on `docker pull` [#27207](https://github.com/docker/docker/pull/27207)
-- Deprecate backing filesystem without `d_type` for overlay and overlay2 storage drivers [#27433](https://github.com/docker/docker/pull/27433)
-- Deprecate `MAINTAINER` in Dockerfile [#25466](https://github.com/docker/docker/pull/25466)
-- Deprecate `filter` param for endpoint `/images/json` [#27872](https://github.com/docker/docker/pull/27872)
-- Deprecate setting duplicate engine labels [#24533](https://github.com/docker/docker/pull/24533)
-- Deprecate "top-level" network information in `NetworkSettings` [#28437](https://github.com/docker/docker/pull/28437)
-
-## 1.12.6 (2017-01-10)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-**NOTE**: Docker 1.12.5 will correctly validate that either an IPv6 subnet is provided or
-that the IPAM driver can provide one when you specify the `--ipv6` option.
-
-If you are currently using the `--ipv6` option _without_ specifying the
-`--fixed-cidr-v6` option, the Docker daemon will refuse to start with the
-following message:
-
-```none
-Error starting daemon: Error initializing network controller: Error creating
-                       default "bridge" network: failed to parse pool request
-                       for address space "LocalDefault" pool " subpool ":
-                       could not find an available, non-overlapping IPv6 address
-                       pool among the defaults to assign to the network
-```
-
-To resolve this error, either remove the `--ipv6` flag (to preserve the same
-behavior as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the
-value of the `--fixed-cidr-v6` flag.
-
-In a similar way, if you specify the `--ipv6` flag when creating a network
-with the default IPAM driver, without providing an IPv6 `--subnet`, network
-creation will fail with the following message:
-
-```none
-Error response from daemon: failed to parse pool request for address space
-                            "LocalDefault" pool "" subpool "": could not find an
-                            available, non-overlapping IPv6 address pool among
-                            the defaults to assign to the network
-```
-
-To resolve this, either remove the `--ipv6` flag (to preserve the same behavior
-as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the value of the
-`--subnet` flag.
-
-The network network creation will instead succeed if you use an external IPAM driver
-which supports automatic allocation of IPv6 subnets.
-
-### Runtime
-
-- Fix runC privilege escalation (CVE-2016-9962)
-
-## 1.12.5 (2016-12-15)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-**NOTE**: Docker 1.12.5 will correctly validate that either an IPv6 subnet is provided or
-that the IPAM driver can provide one when you specify the `--ipv6` option.
-
-If you are currently using the `--ipv6` option _without_ specifying the
-`--fixed-cidr-v6` option, the Docker daemon will refuse to start with the
-following message:
-
-```none
-Error starting daemon: Error initializing network controller: Error creating
-                       default "bridge" network: failed to parse pool request
-                       for address space "LocalDefault" pool " subpool ":
-                       could not find an available, non-overlapping IPv6 address
-                       pool among the defaults to assign to the network
-```
-
-To resolve this error, either remove the `--ipv6` flag (to preserve the same
-behavior as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the
-value of the `--fixed-cidr-v6` flag.
-
-In a similar way, if you specify the `--ipv6` flag when creating a network
-with the default IPAM driver, without providing an IPv6 `--subnet`, network
-creation will fail with the following message:
-
-```none
-Error response from daemon: failed to parse pool request for address space
-                            "LocalDefault" pool "" subpool "": could not find an
-                            available, non-overlapping IPv6 address pool among
-                            the defaults to assign to the network
-```
-
-To resolve this, either remove the `--ipv6` flag (to preserve the same behavior
-as in Docker 1.12.3 and earlier), or provide an IPv6 subnet as the value of the
-`--subnet` flag.
-
-The network network creation will instead succeed if you use an external IPAM driver
-which supports automatic allocation of IPv6 subnets.
-
-### Runtime
-
-- Fix race on sending stdin close event [#29424](https://github.com/docker/docker/pull/29424)
-
-### Networking
-
-- Fix panic in docker network ls when a network was created with `--ipv6` and no ipv6 `--subnet` in older docker versions [#29416](https://github.com/docker/docker/pull/29416)
-
-### Contrib
-
-- Fix compilation on Darwin [#29370](https://github.com/docker/docker/pull/29370)
-
-## 1.12.4 (2016-12-12)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-
-### Runtime
-
-- Fix issue where volume metadata was not removed [#29083](https://github.com/docker/docker/pull/29083)
-- Asynchronously close streams to prevent holding container lock [#29050](https://github.com/docker/docker/pull/29050)
-- Fix selinux labels for newly created container volumes [#29050](https://github.com/docker/docker/pull/29050)
-- Remove hostname validation [#28990](https://github.com/docker/docker/pull/28990)
-- Fix deadlocks caused by IO races [#29095](https://github.com/docker/docker/pull/29095) [#29141](https://github.com/docker/docker/pull/29141)
-- Return an empty stats if the container is restarting [#29150](https://github.com/docker/docker/pull/29150)
-- Fix volume store locking [#29151](https://github.com/docker/docker/pull/29151)
-- Ensure consistent status code in API [#29150](https://github.com/docker/docker/pull/29150)
-- Fix incorrect opaque directory permission in overlay2 [#29093](https://github.com/docker/docker/pull/29093)
-- Detect plugin content and error out on `docker pull` [#29297](https://github.com/docker/docker/pull/29297)
-
-### Swarm Mode
-
-* Update Swarmkit [#29047](https://github.com/docker/docker/pull/29047)
-  - orchestrator/global: Fix deadlock on updates [docker/swarmkit#1760](https://github.com/docker/swarmkit/pull/1760)
-  - on leader switchover preserve the vxlan id for existing networks [docker/swarmkit#1773](https://github.com/docker/swarmkit/pull/1773)
-- Refuse swarm spec not named "default" [#29152](https://github.com/docker/docker/pull/29152)
-
-### Networking
-
-* Update libnetwork [#29004](https://github.com/docker/docker/pull/29004) [#29146](https://github.com/docker/docker/pull/29146)
-  - Fix panic in embedded DNS [docker/libnetwork#1561](https://github.com/docker/libnetwork/pull/1561)
-  - Fix unmarhalling panic when passing --link-local-ip on global scope network [docker/libnetwork#1564](https://github.com/docker/libnetwork/pull/1564)
-  - Fix panic when network plugin returns nil StaticRoutes [docker/libnetwork#1563](https://github.com/docker/libnetwork/pull/1563)
-  - Fix panic in osl.(*networkNamespace).DeleteNeighbor [docker/libnetwork#1555](https://github.com/docker/libnetwork/pull/1555)
-  - Fix panic in swarm networking concurrent map read/write [docker/libnetwork#1570](https://github.com/docker/libnetwork/pull/1570)
-  * Allow encrypted networks when running docker inside a container [docker/libnetwork#1502](https://github.com/docker/libnetwork/pull/1502)
-  - Do not block autoallocation of IPv6 pool [docker/libnetwork#1538](https://github.com/docker/libnetwork/pull/1538)
-  - Set timeout for netlink calls [docker/libnetwork#1557](https://github.com/docker/libnetwork/pull/1557)
-  - Increase networking local store timeout to one minute [docker/libkv#140](https://github.com/docker/libkv/pull/140)
-  - Fix a panic in libnetwork.(*sandbox).execFunc [docker/libnetwork#1556](https://github.com/docker/libnetwork/pull/1556)
-  - Honor icc=false for internal networks [docker/libnetwork#1525](https://github.com/docker/libnetwork/pull/1525)
-
-### Logging
-
-* Update syslog log driver [#29150](https://github.com/docker/docker/pull/29150)
-
-### Contrib
-
-- Run "dnf upgrade" before installing in fedora [#29150](https://github.com/docker/docker/pull/29150)
-- Add build-date back to RPM packages [#29150](https://github.com/docker/docker/pull/29150)
-- deb package filename changed to include distro to distinguish between distro code names [#27829](https://github.com/docker/docker/pull/27829)
-
-## 1.12.3 (2016-10-26)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-
-### Runtime
-
-- Fix ambient capability usage in containers (CVE-2016-8867) [#27610](https://github.com/docker/docker/pull/27610)
-- Prevent a deadlock in libcontainerd for Windows [#27136](https://github.com/docker/docker/pull/27136)
-- Fix error reporting in CopyFileWithTar [#27075](https://github.com/docker/docker/pull/27075)
-* Reset health status to starting when a container is restarted [#27387](https://github.com/docker/docker/pull/27387)
-* Properly handle shared mount propagation in storage directory [#27609](https://github.com/docker/docker/pull/27609)
-- Fix docker exec [#27610](https://github.com/docker/docker/pull/27610)
-- Fix backward compatibility with containerd’s events log [#27693](https://github.com/docker/docker/pull/27693)
-
-### Swarm Mode
-
-- Fix conversion of restart-policy [#27062](https://github.com/docker/docker/pull/27062)
-* Update Swarmkit [#27554](https://github.com/docker/docker/pull/27554)
- * Avoid restarting a task that has already been restarted [docker/swarmkit#1305](https://github.com/docker/swarmkit/pull/1305)
- * Allow duplicate published ports when they use different protocols [docker/swarmkit#1632](https://github.com/docker/swarmkit/pull/1632)
- * Allow multiple randomly assigned published ports on service [docker/swarmkit#1657](https://github.com/docker/swarmkit/pull/1657)
- - Fix panic when allocations happen at init time [docker/swarmkit#1651](https://github.com/docker/swarmkit/pull/1651)
-
-### Networking
-
-* Update libnetwork [#27559](https://github.com/docker/docker/pull/27559)
- - Fix race in serializing sandbox to string [docker/libnetwork#1495](https://github.com/docker/libnetwork/pull/1495)
- - Fix race during deletion [docker/libnetwork#1503](https://github.com/docker/libnetwork/pull/1503)
- * Reset endpoint port info on connectivity revoke in bridge driver [docker/libnetwork#1504](https://github.com/docker/libnetwork/pull/1504)
- - Fix a deadlock in networking code [docker/libnetwork#1507](https://github.com/docker/libnetwork/pull/1507)
- - Fix a race in load balancer state [docker/libnetwork#1512](https://github.com/docker/libnetwork/pull/1512)
-
-### Logging
-
-* Update fluent-logger-golang to v1.2.1 [#27474](https://github.com/docker/docker/pull/27474)
-
-### Contrib
-
-* Update buildtags for armhf ubuntu-trusty [#27327](https://github.com/docker/docker/pull/27327)
-* Add AppArmor to runc buildtags for armhf [#27421](https://github.com/docker/docker/pull/27421)
-
-## 1.12.2 (2016-10-11)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-
-### Runtime
-
-- Fix a panic due to a race condition filtering `docker ps` [#26049](https://github.com/docker/docker/pull/26049)
-* Implement retry logic to prevent "Unable to remove filesystem" errors when using the aufs storage driver [#26536](https://github.com/docker/docker/pull/26536)
-* Prevent devicemapper from removing device symlinks if `dm.use_deferred_removal` is enabled [#24740](https://github.com/docker/docker/pull/24740)
-- Fix an issue where the CLI did not return correct exit codes if a command was run with invalid options [#26777](https://github.com/docker/docker/pull/26777)
-- Fix a panic due to a bug in stdout / stderr processing in health checks [#26507](https://github.com/docker/docker/pull/26507)
-- Fix exec's children handling [#26874](https://github.com/docker/docker/pull/26874)
-- Fix exec form of HEALTHCHECK CMD [#26208](https://github.com/docker/docker/pull/26208)
-
-### Networking
-
-- Fix a daemon start panic on armv5 [#24315](https://github.com/docker/docker/issues/24315)
-* Vendor libnetwork [#26879](https://github.com/docker/docker/pull/26879) [#26953](https://github.com/docker/docker/pull/26953)
- * Avoid returning early on agent join failures [docker/libnetwork#1473](https://github.com/docker/libnetwork/pull/1473)
- - Fix service published port cleanup issues [docker/libetwork#1432](https://github.com/docker/libnetwork/pull/1432) [docker/libnetwork#1433](https://github.com/docker/libnetwork/pull/1433)
- * Recover properly from transient gossip failures [docker/libnetwork#1446](https://github.com/docker/libnetwork/pull/1446)
- * Disambiguate node names known to gossip cluster to avoid node name collision [docker/libnetwork#1451](https://github.com/docker/libnetwork/pull/1451)
- * Honor user provided listen address for gossip  [docker/libnetwork#1460](https://github.com/docker/libnetwork/pull/1460)
- * Allow reachability via published port across services on the same host [docker/libnetwork#1398](https://github.com/docker/libnetwork/pull/1398)
- * Change the ingress sandbox name from random id to just `ingress_sbox` [docker/libnetwork#1449](https://github.com/docker/libnetwork/pull/1449)
- - Disable service discovery in ingress network [docker/libnetwork#1489](https://github.com/docker/libnetwork/pull/1489)
-
-### Swarm Mode
-
-* Fix remote detection of a node's address when it joins the cluster [#26211](https://github.com/docker/docker/pull/26211)
-* Vendor SwarmKit [#26765](https://github.com/docker/docker/pull/26765)
- * Bounce session after failed status update [docker/swarmkit#1539](https://github.com/docker/swarmkit/pull/1539)
- - Fix possible raft deadlocks [docker/swarmkit#1537](https://github.com/docker/swarmkit/pull/1537)
- - Fix panic and endpoint leak when a service is updated with no endpoints [docker/swarmkit#1481](https://github.com/docker/swarmkit/pull/1481)
- * Produce an error if the same port is published twice on `service create` or `service update` [docker/swarmkit#1495](https://github.com/docker/swarmkit/pull/1495)
- - Fix an issue where changes to a service were not detected, resulting in the service not being updated [docker/swarmkit#1497](https://github.com/docker/swarmkit/pull/1497)
- - Do not allow service creation on ingress network [docker/swarmkit#1600](https://github.com/docker/swarmkit/pull/1600)
-
-### Contrib
-
-* Update the debian sysv-init script to use `dockerd` instead of `docker daemon` [#25869](https://github.com/docker/docker/pull/25869)
-* Improve stability when running the docker client on MacOS Sierra [#26875](https://github.com/docker/docker/pull/26875)
-- Fix installation on debian stretch [#27184](https://github.com/docker/docker/pull/27184)
-
-### Windows
-
-- Fix an issue where arrow-navigation did not work when running the docker client in ConEmu [#25578](https://github.com/docker/docker/pull/25578)
-
-## 1.12.1 (2016-08-18)
-
-**IMPORTANT**: Docker 1.12 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-
-### Client
-
-* Add `Joined at` information in `node inspect --pretty` [#25512](https://github.com/docker/docker/pull/25512)
-- Fix a crash on `service inspect` [#25454](https://github.com/docker/docker/pull/25454)
-- Fix issue preventing `service update --env-add` to work as intended [#25427](https://github.com/docker/docker/pull/25427)
-- Fix issue preventing `service update --publish-add` to work as intended [#25428](https://github.com/docker/docker/pull/25428)
-- Remove `service update --network-add` and `service update --network-rm` flags
-  because this feature is not yet implemented in 1.12, but was inadvertently added
-  to the client in 1.12.0 [#25646](https://github.com/docker/docker/pull/25646)
-
-### Contrib
-
-+ Official ARM installation for Debian Jessie, Ubuntu Trusty, and Raspbian Jessie [#24815](https://github.com/docker/docker/pull/24815) [#25591](https://github.com/docker/docker/pull/25637)
-- Add selinux policy per distro/version, fixing issue preventing successful installation on Fedora 24, and Oracle Linux [#25334](https://github.com/docker/docker/pull/25334) [#25593](https://github.com/docker/docker/pull/25593)
-
-### Networking
-
-- Fix issue that prevented containers to be accessed by hostname with Docker overlay driver in Swarm Mode [#25603](https://github.com/docker/docker/pull/25603) [#25648](https://github.com/docker/docker/pull/25648)
-- Fix random network issues on service with published port [#25603](https://github.com/docker/docker/pull/25603)
-- Fix unreliable inter-service communication after scaling down and up [#25603](https://github.com/docker/docker/pull/25603)
-- Fix issue where removing all tasks on a node and adding them back breaks connectivity with other services [#25603](https://github.com/docker/docker/pull/25603)
-- Fix issue where a task that fails to start results in a race, causing a `network xxx not found` error that masks the actual error [#25550](https://github.com/docker/docker/pull/25550)
-- Relax validation of SRV records for external services that use SRV records not formatted according to RFC 2782 [#25739](https://github.com/docker/docker/pull/25739)
-
-### Plugins (experimental)
-
-* Make daemon events listen for plugin lifecycle events [#24760](https://github.com/docker/docker/pull/24760)
-* Check for plugin state before enabling plugin [#25033](https://github.com/docker/docker/pull/25033)
-- Remove plugin root from filesystem on `plugin rm` [#25187](https://github.com/docker/docker/pull/25187)
-- Prevent deadlock when more than one plugin is installed [#25384](https://github.com/docker/docker/pull/25384)
-
-### Runtime
-
-* Mask join tokens in daemon logs [#25346](https://github.com/docker/docker/pull/25346)
-- Fix `docker ps --filter` causing the results to no longer be sorted by creation time [#25387](https://github.com/docker/docker/pull/25387)
-- Fix various crashes [#25053](https://github.com/docker/docker/pull/25053)
-
-### Security
-
-* Add `/proc/timer_list` to the masked paths list to prevent information leak from the host [#25630](https://github.com/docker/docker/pull/25630)
-* Allow systemd to run with only `--cap-add SYS_ADMIN` rather than having to also add `--cap-add DAC_READ_SEARCH` or disabling seccomp filtering [#25567](https://github.com/docker/docker/pull/25567)
-
-### Swarm
-
-- Fix an issue where the swarm can get stuck electing a new leader after quorum is lost [#25055](https://github.com/docker/docker/issues/25055)
-- Fix unwanted rescheduling of containers after a leader failover [#25017](https://github.com/docker/docker/issues/25017)
-- Change swarm root CA key to P256 curve [swarmkit#1376](https://github.com/docker/swarmkit/pull/1376)
-- Allow forced removal of a node from a swarm [#25159](https://github.com/docker/docker/pull/25159)
-- Fix connection leak when a node leaves a swarm [swarmkit/#1277](https://github.com/docker/swarmkit/pull/1277)
-- Backdate swarm certificates by one hour to tolerate more clock skew [swarmkit/#1243](https://github.com/docker/swarmkit/pull/1243)
-- Avoid high CPU use with many unschedulable tasks [swarmkit/#1287](https://github.com/docker/swarmkit/pull/1287)
-- Fix issue with global tasks not starting up [swarmkit/#1295](https://github.com/docker/swarmkit/pull/1295)
-- Garbage collect raft logs [swarmkit/#1327](https://github.com/docker/swarmkit/pull/1327)
-
-### Volume
-
-- Persist local volume options after a daemon restart [#25316](https://github.com/docker/docker/pull/25316)
-- Fix an issue where the mount ID was not returned on volume unmount [#25333](https://github.com/docker/docker/pull/25333)
-- Fix an issue where a volume mount could inadvertently create a bind mount [#25309](https://github.com/docker/docker/pull/25309)
-- `docker service create --mount type=bind,...` now correctly validates if the source path exists, instead of creating it [#25494](https://github.com/docker/docker/pull/25494)
-
-## 1.12.0 (2016-07-28)
-
-
-**IMPORTANT**: Docker 1.12.0 ships with an updated systemd unit file for rpm
-based installs (which includes RHEL, Fedora, CentOS, and Oracle Linux 7). When
-upgrading from an older version of docker, the upgrade process may not
-automatically install the updated version of the unit file, or fail to start
-the docker service if;
-
-- the systemd unit file (`/usr/lib/systemd/system/docker.service`) contains local changes, or
-- a systemd drop-in file is present, and contains `-H fd://` in the `ExecStart` directive
-
-Starting the docker service will produce an error:
-
-    Failed to start docker.service: Unit docker.socket failed to load: No such file or directory.
-
-or
-
-    no sockets found via socket activation: make sure the service was started by systemd.
-
-To resolve this:
-
-- Backup the current version of the unit file, and replace the file with the
-  [version that ships with docker 1.12](https://raw.githubusercontent.com/docker/docker/v1.12.0/contrib/init/systemd/docker.service.rpm)
-- Remove the `Requires=docker.socket` directive from the `/usr/lib/systemd/system/docker.service` file if present
-- Remove `-H fd://` from the `ExecStart` directive (both in the main unit file, and in any drop-in files present).
-
-After making those changes, run `sudo systemctl daemon-reload`, and `sudo
-systemctl restart docker` to reload changes and (re)start the docker daemon.
-
-**IMPORTANT**: With Docker 1.12, a Linux docker installation now has two
-additional binaries; `dockerd`, and `docker-proxy`. If you have scripts for
-installing docker, please make sure to update them accordingly.
-
-### Builder
-
-+ New `HEALTHCHECK` Dockerfile instruction to support user-defined healthchecks [#23218](https://github.com/docker/docker/pull/23218)
-+ New `SHELL` Dockerfile instruction to specify the default shell when using the shell form for commands in a Dockerfile [#22489](https://github.com/docker/docker/pull/22489)
-+ Add `#escape=` Dockerfile directive to support platform-specific parsing of file paths in Dockerfile [#22268](https://github.com/docker/docker/pull/22268)
-+ Add support for comments in `.dockerignore` [#23111](https://github.com/docker/docker/pull/23111)
-* Support for UTF-8 in Dockerfiles [#23372](https://github.com/docker/docker/pull/23372)
-* Skip UTF-8 BOM bytes from `Dockerfile` and `.dockerignore` if exist [#23234](https://github.com/docker/docker/pull/23234)
-* Windows: support for `ARG` to match Linux [#22508](https://github.com/docker/docker/pull/22508)
-- Fix error message when building using a daemon with the bridge network disabled [#22932](https://github.com/docker/docker/pull/22932)
-
-### Contrib
-
-* Enable seccomp for Centos 7 and Oracle Linux 7 [#22344](https://github.com/docker/docker/pull/22344)
-- Remove MountFlags in systemd unit to allow shared mount propagation [#22806](https://github.com/docker/docker/pull/22806)
-
-### Distribution
-
-+ Add `--max-concurrent-downloads` and `--max-concurrent-uploads` daemon flags useful for situations where network connections don't support multiple downloads/uploads [#22445](https://github.com/docker/docker/pull/22445)
-* Registry operations now honor the `ALL_PROXY` environment variable [#22316](https://github.com/docker/docker/pull/22316)
-* Provide more information to the user on `docker load` [#23377](https://github.com/docker/docker/pull/23377)
-* Always save registry digest metadata about images pushed and pulled [#23996](https://github.com/docker/docker/pull/23996)
-
-### Logging
-
-+ Syslog logging driver now supports DGRAM sockets [#21613](https://github.com/docker/docker/pull/21613)
-+ Add `--details` option to `docker logs` to also display log tags [#21889](https://github.com/docker/docker/pull/21889)
-+ Enable syslog logger to have access to env and labels [#21724](https://github.com/docker/docker/pull/21724)
-+ An additional syslog-format option `rfc5424micro` to allow microsecond resolution in syslog timestamp [#21844](https://github.com/docker/docker/pull/21844)
-* Inherit the daemon log options when creating containers [#21153](https://github.com/docker/docker/pull/21153)
-* Remove `docker/` prefix from log messages tag and replace it with `{{.DaemonName}}` so that users have the option of changing the prefix [#22384](https://github.com/docker/docker/pull/22384)
-
-### Networking
-
-+ Built-in Virtual-IP based  internal and ingress load-balancing using IPVS [#23361](https://github.com/docker/docker/pull/23361)
-+ Routing Mesh using ingress overlay network [#23361](https://github.com/docker/docker/pull/23361)
-+ Secured multi-host overlay networking using encrypted control-plane and Data-plane [#23361](https://github.com/docker/docker/pull/23361)
-+ MacVlan driver is out of experimental [#23524](https://github.com/docker/docker/pull/23524)
-+ Add `driver` filter to `network ls` [#22319](https://github.com/docker/docker/pull/22319)
-+ Adding `network` filter to `docker ps --filter` [#23300](https://github.com/docker/docker/pull/23300)
-+ Add `--link-local-ip` flag to `create`, `run` and `network connect` to specify a container's link-local address [#23415](https://github.com/docker/docker/pull/23415)
-+ Add network label filter support [#21495](https://github.com/docker/docker/pull/21495)
-* Removed dependency on external KV-Store for Overlay networking in Swarm-Mode  [#23361](https://github.com/docker/docker/pull/23361)
-* Add container's short-id as default network alias [#21901](https://github.com/docker/docker/pull/21901)
-* `run` options `--dns` and `--net=host` are no longer mutually exclusive [#22408](https://github.com/docker/docker/pull/22408)
-- Fix DNS issue when renaming containers with generated names [#22716](https://github.com/docker/docker/pull/22716)
-- Allow both `network inspect -f {{.Id}}` and `network inspect -f {{.ID}}` to address inconsistency with inspect output [#23226](https://github.com/docker/docker/pull/23226)
-
-### Plugins (experimental)
-
-+ New `plugin` command to manager plugins with `install`, `enable`, `disable`, `rm`, `inspect`, `set` subcommands [#23446](https://github.com/docker/docker/pull/23446)
-
-### Remote API (v1.24) & Client
-
-+ Split the binary into two: `docker` (client) and `dockerd` (daemon) [#20639](https://github.com/docker/docker/pull/20639)
-+ Add `before` and `since` filters to `docker images --filter` [#22908](https://github.com/docker/docker/pull/22908)
-+ Add `--limit` option to `docker search` [#23107](https://github.com/docker/docker/pull/23107)
-+ Add `--filter` option to `docker search` [#22369](https://github.com/docker/docker/pull/22369)
-+ Add security options to `docker info` output [#21172](https://github.com/docker/docker/pull/21172) [#23520](https://github.com/docker/docker/pull/23520)
-+ Add insecure registries to `docker info` output [#20410](https://github.com/docker/docker/pull/20410)
-+ Extend Docker authorization with TLS user information [#21556](https://github.com/docker/docker/pull/21556)
-+ devicemapper: expose Mininum Thin Pool Free Space through `docker info` [#21945](https://github.com/docker/docker/pull/21945)
-* API now returns a JSON object when an error occurs making it more consistent [#22880](https://github.com/docker/docker/pull/22880)
-- Prevent `docker run -i --restart` from hanging on exit [#22777](https://github.com/docker/docker/pull/22777)
-- Fix API/CLI discrepancy on hostname validation [#21641](https://github.com/docker/docker/pull/21641)
-- Fix discrepancy in the format of sizes in `stats` from HumanSize to BytesSize [#21773](https://github.com/docker/docker/pull/21773)
-- authz: when request is denied return forbbiden exit code (403) [#22448](https://github.com/docker/docker/pull/22448)
-- Windows: fix tty-related displaying issues [#23878](https://github.com/docker/docker/pull/23878)
-
-### Runtime
-
-+ Split the userland proxy to a separate binary (`docker-proxy`) [#23312](https://github.com/docker/docker/pull/23312)
-+ Add `--live-restore` daemon flag to keep containers running when daemon shuts down, and regain control on startup [#23213](https://github.com/docker/docker/pull/23213)
-+ Ability to add OCI-compatible runtimes (via `--add-runtime` daemon flag) and select one with `--runtime` on `create` and `run` [#22983](https://github.com/docker/docker/pull/22983)
-+ New `overlay2` graphdriver for Linux 4.0+ with multiple lower directory support [#22126](https://github.com/docker/docker/pull/22126)
-+ New load/save image events [#22137](https://github.com/docker/docker/pull/22137)
-+ Add support for reloading daemon configuration through systemd [#22446](https://github.com/docker/docker/pull/22446)
-+ Add disk quota support for btrfs [#19651](https://github.com/docker/docker/pull/19651)
-+ Add disk quota support for zfs [#21946](https://github.com/docker/docker/pull/21946)
-+ Add support for `docker run --pid=container:<id>` [#22481](https://github.com/docker/docker/pull/22481)
-+ Align default seccomp profile with selected capabilities [#22554](https://github.com/docker/docker/pull/22554)
-+ Add a `daemon reload` event when the daemon reloads its configuration [#22590](https://github.com/docker/docker/pull/22590)
-+ Add `trace` capability in the pprof profiler to show execution traces in binary form [#22715](https://github.com/docker/docker/pull/22715)
-+ Add a `detach` event [#22898](https://github.com/docker/docker/pull/22898)
-+ Add support for setting sysctls with `--sysctl` [#19265](https://github.com/docker/docker/pull/19265)
-+ Add `--storage-opt` flag to `create` and `run` allowing to set `size` on devicemapper [#19367](https://github.com/docker/docker/pull/19367)
-+ Add `--oom-score-adjust` daemon flag with a default value of `-500` making the daemon less likely to be killed before containers [#24516](https://github.com/docker/docker/pull/24516)
-* Undeprecate the `-c` short alias of `--cpu-shares` on `run`, `build`, `create`, `update` [#22621](https://github.com/docker/docker/pull/22621)
-* Prevent from using aufs and overlay graphdrivers on an eCryptfs mount [#23121](https://github.com/docker/docker/pull/23121)
-- Fix issues with tmpfs mount ordering [#22329](https://github.com/docker/docker/pull/22329)
-- Created containers are no longer listed on `docker ps -a -f exited=0` [#21947](https://github.com/docker/docker/pull/21947)
-- Fix an issue where containers are stuck in a "Removal In Progress" state [#22423](https://github.com/docker/docker/pull/22423)
-- Fix bug that was returning an HTTP 500 instead of a 400 when not specifying a command on run/create [#22762](https://github.com/docker/docker/pull/22762)
-- Fix bug with `--detach-keys` whereby input matching a prefix of the detach key was not preserved [#22943](https://github.com/docker/docker/pull/22943)
-- SELinux labeling is now disabled when using `--privileged` mode [#22993](https://github.com/docker/docker/pull/22993)
-- If volume-mounted into a container, `/etc/hosts`, `/etc/resolv.conf`, `/etc/hostname` are no longer SELinux-relabeled [#22993](https://github.com/docker/docker/pull/22993)
-- Fix inconsistency in `--tmpfs` behavior regarding mount options [#22438](https://github.com/docker/docker/pull/22438)
-- Fix an issue where daemon hangs at startup [#23148](https://github.com/docker/docker/pull/23148)
-- Ignore SIGPIPE events to prevent journald restarts to crash docker in some cases [#22460](https://github.com/docker/docker/pull/22460)
-- Containers are not removed from stats list on error [#20835](https://github.com/docker/docker/pull/20835)
-- Fix `on-failure` restart policy when daemon restarts [#20853](https://github.com/docker/docker/pull/20853)
-- Fix an issue with `stats` when a container is using another container's network [#21904](https://github.com/docker/docker/pull/21904)
-
-### Swarm Mode
-
-+ New `swarm` command to manage swarms with `init`, `join`, `join-token`, `leave`, `update` subcommands [#23361](https://github.com/docker/docker/pull/23361) [#24823](https://github.com/docker/docker/pull/24823)
-+ New `service` command to manage swarm-wide services with `create`, `inspect`, `update`, `rm`, `ps` subcommands [#23361](https://github.com/docker/docker/pull/23361) [#25140](https://github.com/docker/docker/pull/25140)
-+ New `node` command to manage nodes with `accept`, `promote`, `demote`, `inspect`, `update`, `ps`, `ls` and `rm` subcommands [#23361](https://github.com/docker/docker/pull/23361) [#25140](https://github.com/docker/docker/pull/25140)
-+ (experimental) New `stack` and `deploy` commands to manage and deploy multi-service applications [#23522](https://github.com/docker/docker/pull/23522) [#25140](https://github.com/docker/docker/pull/25140)
-
-### Volume
-
-+ Add support for local and global volume scopes (analogous to network scopes) [#22077](https://github.com/docker/docker/pull/22077)
-+ Allow volume drivers to provide a `Status` field [#21006](https://github.com/docker/docker/pull/21006)
-+ Add name/driver filter support for volume [#21361](https://github.com/docker/docker/pull/21361)
-* Mount/Unmount operations now receives an opaque ID to allow volume drivers to differentiate between two callers [#21015](https://github.com/docker/docker/pull/21015)
-- Fix issue preventing to remove a volume in a corner case [#22103](https://github.com/docker/docker/pull/22103)
-- Windows: Enable auto-creation of host-path to match Linux [#22094](https://github.com/docker/docker/pull/22094)
-
-
-### DEPRECATION
-* Environment variables `DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE` and `DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE` have been renamed
-  to `DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE` and `DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE` respectively [#22574](https://github.com/docker/docker/pull/22574)
-* Remove deprecated `syslog-tag`, `gelf-tag`, `fluentd-tag` log option in favor of the more generic `tag` one [#22620](https://github.com/docker/docker/pull/22620)
-* Remove deprecated feature of passing HostConfig at API container start [#22570](https://github.com/docker/docker/pull/22570)
-* Remove deprecated `-f`/`--force` flag on docker tag [#23090](https://github.com/docker/docker/pull/23090)
-* Remove deprecated `/containers/<id|name>/copy` endpoint [#22149](https://github.com/docker/docker/pull/22149)
-* Remove deprecated `docker ps` flags `--since` and `--before` [#22138](https://github.com/docker/docker/pull/22138)
-* Deprecate the old 3-args form of `docker import` [#23273](https://github.com/docker/docker/pull/23273)
-
-## 1.11.2 (2016-05-31)
-
-### Networking
-
-- Fix a stale endpoint issue on overlay networks during ungraceful restart ([#23015](https://github.com/docker/docker/pull/23015))
-- Fix an issue where the wrong port could be reported by `docker inspect/ps/port` ([#22997](https://github.com/docker/docker/pull/22997))
-
-### Runtime
-
-- Fix a potential panic when running `docker build` ([#23032](https://github.com/docker/docker/pull/23032))
-- Fix interpretation of `--user` parameter ([#22998](https://github.com/docker/docker/pull/22998))
-- Fix a bug preventing container statistics to be correctly reported ([#22955](https://github.com/docker/docker/pull/22955))
-- Fix an issue preventing container to be restarted after daemon restart ([#22947](https://github.com/docker/docker/pull/22947))
-- Fix issues when running 32 bit binaries on Ubuntu 16.04 ([#22922](https://github.com/docker/docker/pull/22922))
-- Fix a possible deadlock on image deletion and container attach ([#22918](https://github.com/docker/docker/pull/22918))
-- Fix an issue where containers fail to start after a daemon restart if they depend on a containerized cluster store ([#22561](https://github.com/docker/docker/pull/22561))
-- Fix an issue causing `docker ps` to hang on CentOS when using devicemapper ([#22168](https://github.com/docker/docker/pull/22168), [#23067](https://github.com/docker/docker/pull/23067))
-- Fix a bug preventing to `docker exec` into a container when using devicemapper ([#22168](https://github.com/docker/docker/pull/22168), [#23067](https://github.com/docker/docker/pull/23067))
-
-
-## 1.11.1 (2016-04-26)
-
-### Distribution
-
-- Fix schema2 manifest media type to be of type `application/vnd.docker.container.image.v1+json` ([#21949](https://github.com/docker/docker/pull/21949))
-
-### Documentation
-
-+ Add missing API documentation for changes introduced with 1.11.0 ([#22048](https://github.com/docker/docker/pull/22048))
-
-### Builder
-
-* Append label passed to `docker build` as arguments as an implicit `LABEL` command at the end of the processed `Dockerfile` ([#22184](https://github.com/docker/docker/pull/22184))
-
-### Networking
-
-- Fix a panic that would occur when forwarding DNS query ([#22261](https://github.com/docker/docker/pull/22261))
-- Fix an issue where OS threads could end up within an incorrect network namespace when using user defined networks ([#22261](https://github.com/docker/docker/pull/22261))
-
-### Runtime
-
-- Fix a bug preventing labels configuration to be reloaded via the config file ([#22299](https://github.com/docker/docker/pull/22299))
-- Fix a regression where container mounting `/var/run` would prevent other containers from being removed ([#22256](https://github.com/docker/docker/pull/22256))
-- Fix an issue where it would be impossible to update both `memory-swap` and `memory` value together ([#22255](https://github.com/docker/docker/pull/22255))
-- Fix a regression from 1.11.0 where the `/auth` endpoint would not initialize `serveraddress` if it is not provided ([#22254](https://github.com/docker/docker/pull/22254))
-- Add missing cleanup of container temporary files when cancelling a schedule restart ([#22237](https://github.com/docker/docker/pull/22237))
-- Remove scary error message when no restart policy is specified ([#21993](https://github.com/docker/docker/pull/21993))
-- Fix a panic that would occur when the plugins were activated via the json spec ([#22191](https://github.com/docker/docker/pull/22191))
-- Fix restart backoff logic to correctly reset delay if container ran for at least 10secs ([#22125](https://github.com/docker/docker/pull/22125))
-- Remove error message when a container restart get cancelled ([#22123](https://github.com/docker/docker/pull/22123))
-- Fix an issue where `docker` would not correctly clean up after `docker exec` ([#22121](https://github.com/docker/docker/pull/22121))
-- Fix a panic that could occur when serving concurrent `docker stats` commands ([#22120](https://github.com/docker/docker/pull/22120))`
-- Revert deprecation of non-existent host directories auto-creation ([#22065](https://github.com/docker/docker/pull/22065))
-- Hide misleading rpc error on daemon shutdown ([#22058](https://github.com/docker/docker/pull/22058))
-
-## 1.11.0 (2016-04-13)
-
-**IMPORTANT**: With Docker 1.11, a Linux docker installation is now made of 4 binaries (`docker`, [`docker-containerd`](https://github.com/docker/containerd), [`docker-containerd-shim`](https://github.com/docker/containerd) and [`docker-runc`](https://github.com/opencontainers/runc)). If you have scripts relying on docker being a single static binaries, please make sure to update them. Interaction with the daemon stay the same otherwise, the usage of the other binaries should be transparent. A Windows docker installation remains a single binary, `docker.exe`.
-
-### Builder
-
-- Fix a bug where Docker would not use the correct uid/gid when processing the `WORKDIR` command ([#21033](https://github.com/docker/docker/pull/21033))
-- Fix a bug where copy operations with userns would not use the proper uid/gid ([#20782](https://github.com/docker/docker/pull/20782), [#21162](https://github.com/docker/docker/pull/21162))
-
-### Client
-
-* Usage of the `:` separator for security option has been deprecated. `=` should be used instead ([#21232](https://github.com/docker/docker/pull/21232))
-+ The client user agent is now passed to the registry on `pull`, `build`, `push`, `login` and `search` operations ([#21306](https://github.com/docker/docker/pull/21306), [#21373](https://github.com/docker/docker/pull/21373))
-* Allow setting the Domainname and Hostname separately through the API ([#20200](https://github.com/docker/docker/pull/20200))
-* Docker info will now warn users if it can not detect the kernel version or the operating system ([#21128](https://github.com/docker/docker/pull/21128))
-- Fix an issue where `docker stats --no-stream` output could be all 0s ([#20803](https://github.com/docker/docker/pull/20803))
-- Fix a bug where some newly started container would not appear in a running `docker stats` command ([#20792](https://github.com/docker/docker/pull/20792))
-* Post processing is no longer enabled for linux-cgo terminals ([#20587](https://github.com/docker/docker/pull/20587))
-- Values to `--hostname` are now refused if they do not comply with [RFC1123](https://tools.ietf.org/html/rfc1123) ([#20566](https://github.com/docker/docker/pull/20566))
-+ Docker learned how to use a SOCKS proxy ([#20366](https://github.com/docker/docker/pull/20366), [#18373](https://github.com/docker/docker/pull/18373))
-+ Docker now supports external credential stores ([#20107](https://github.com/docker/docker/pull/20107))
-* `docker ps` now supports displaying the list of volumes mounted inside a container ([#20017](https://github.com/docker/docker/pull/20017))
-* `docker info` now also reports Docker's root directory location ([#19986](https://github.com/docker/docker/pull/19986))
-- Docker now prohibits login in with an empty username (spaces are trimmed) ([#19806](https://github.com/docker/docker/pull/19806))
-* Docker events attributes are now sorted by key ([#19761](https://github.com/docker/docker/pull/19761))
-* `docker ps` no longer shows exported port for stopped containers ([#19483](https://github.com/docker/docker/pull/19483))
-- Docker now cleans after itself if a save/export command fails ([#17849](https://github.com/docker/docker/pull/17849))
-* Docker load learned how to display a progress bar ([#17329](https://github.com/docker/docker/pull/17329), [#120078](https://github.com/docker/docker/pull/20078))
-
-### Distribution
-
-- Fix a panic that occurred when pulling an image with 0 layers ([#21222](https://github.com/docker/docker/pull/21222))
-- Fix a panic that could occur on error while pushing to a registry with a misconfigured token service ([#21212](https://github.com/docker/docker/pull/21212))
-+ All first-level delegation roles are now signed when doing a trusted push ([#21046](https://github.com/docker/docker/pull/21046))
-+ OAuth support for registries was added ([#20970](https://github.com/docker/docker/pull/20970))
-* `docker login` now handles token using the implementation found in [docker/distribution](https://github.com/docker/distribution) ([#20832](https://github.com/docker/docker/pull/20832))
-* `docker login` will no longer prompt for an email ([#20565](https://github.com/docker/docker/pull/20565))
-* Docker will now fallback to registry V1 if no basic auth credentials are available ([#20241](https://github.com/docker/docker/pull/20241))
-* Docker will now try to resume layer download where it left off after a network error/timeout ([#19840](https://github.com/docker/docker/pull/19840))
-- Fix generated manifest mediaType when pushing cross-repository ([#19509](https://github.com/docker/docker/pull/19509))
-- Fix docker requesting additional push credentials when pulling an image if Content Trust is enabled ([#20382](https://github.com/docker/docker/pull/20382))
-
-### Logging
-
-- Fix a race in the journald log driver ([#21311](https://github.com/docker/docker/pull/21311))
-* Docker syslog driver now uses the RFC-5424 format when emitting logs ([#20121](https://github.com/docker/docker/pull/20121))
-* Docker GELF log driver now allows to specify the compression algorithm and level via the `gelf-compression-type` and `gelf-compression-level` options ([#19831](https://github.com/docker/docker/pull/19831))
-* Docker daemon learned to output uncolorized logs via the `--raw-logs` options ([#19794](https://github.com/docker/docker/pull/19794))
-+ Docker, on Windows platform, now includes an ETW (Event Tracing in Windows) logging driver named `etwlogs` ([#19689](https://github.com/docker/docker/pull/19689))
-* Journald log driver learned how to handle tags ([#19564](https://github.com/docker/docker/pull/19564))
-+ The fluentd log driver learned the following options: `fluentd-address`, `fluentd-buffer-limit`, `fluentd-retry-wait`, `fluentd-max-retries` and `fluentd-async-connect` ([#19439](https://github.com/docker/docker/pull/19439))
-+ Docker learned to send log to Google Cloud via the new `gcplogs` logging driver. ([#18766](https://github.com/docker/docker/pull/18766))
-
-
-### Misc
-
-+ When saving linked images together with `docker save` a subsequent `docker load` will correctly restore their parent/child relationship ([#21385](https://github.com/docker/docker/pull/21385))
-+ Support for building the Docker cli for OpenBSD was added ([#21325](https://github.com/docker/docker/pull/21325))
-+ Labels can now be applied at network, volume and image creation ([#21270](https://github.com/docker/docker/pull/21270))
-* The `dockremap` is now created as a system user ([#21266](https://github.com/docker/docker/pull/21266))
-- Fix a few response body leaks ([#21258](https://github.com/docker/docker/pull/21258))
-- Docker, when run as a service with systemd, will now properly manage its processes cgroups ([#20633](https://github.com/docker/docker/pull/20633))
-* `docker info` now reports the value of cgroup KernelMemory or emits a warning if it is not supported ([#20863](https://github.com/docker/docker/pull/20863))
-* `docker info` now also reports the cgroup driver in use ([#20388](https://github.com/docker/docker/pull/20388))
-* Docker completion is now available on PowerShell ([#19894](https://github.com/docker/docker/pull/19894))
-* `dockerinit` is no more ([#19490](https://github.com/docker/docker/pull/19490),[#19851](https://github.com/docker/docker/pull/19851))
-+ Support for building Docker on arm64 was added ([#19013](https://github.com/docker/docker/pull/19013))
-+ Experimental support for building docker.exe in a native Windows Docker installation ([#18348](https://github.com/docker/docker/pull/18348))
-
-### Networking
-
-- Fix panic if a node is forcibly removed from the cluster ([#21671](https://github.com/docker/docker/pull/21671))
-- Fix "error creating vxlan interface" when starting a container in a Swarm cluster ([#21671](https://github.com/docker/docker/pull/21671))
-* `docker network inspect` will now report all endpoints whether they have an active container or not ([#21160](https://github.com/docker/docker/pull/21160))
-+ Experimental support for the MacVlan and IPVlan network drivers has been added ([#21122](https://github.com/docker/docker/pull/21122))
-* Output of `docker network ls` is now sorted by network name ([#20383](https://github.com/docker/docker/pull/20383))
-- Fix a bug where Docker would allow a network to be created with the reserved `default` name ([#19431](https://github.com/docker/docker/pull/19431))
-* `docker network inspect` returns whether a network is internal or not ([#19357](https://github.com/docker/docker/pull/19357))
-+ Control IPv6 via explicit option when creating a network (`docker network create --ipv6`). This shows up as a new `EnableIPv6` field in `docker network inspect` ([#17513](https://github.com/docker/docker/pull/17513))
-* Support for AAAA Records (aka IPv6 Service Discovery) in embedded DNS Server ([#21396](https://github.com/docker/docker/pull/21396))
-- Fix to not forward docker domain IPv6 queries to external servers ([#21396](https://github.com/docker/docker/pull/21396))
-* Multiple A/AAAA records from embedded DNS Server for DNS Round robin ([#21019](https://github.com/docker/docker/pull/21019))
-- Fix endpoint count inconsistency after an ungraceful dameon restart ([#21261](https://github.com/docker/docker/pull/21261))
-- Move the ownership of exposed ports and port-mapping options from Endpoint to Sandbox ([#21019](https://github.com/docker/docker/pull/21019))
-- Fixed a bug which prevents docker reload when host is configured with ipv6.disable=1 ([#21019](https://github.com/docker/docker/pull/21019))
-- Added inbuilt nil IPAM driver ([#21019](https://github.com/docker/docker/pull/21019))
-- Fixed bug in iptables.Exists() logic [#21019](https://github.com/docker/docker/pull/21019)
-- Fixed a Veth interface leak when using overlay network ([#21019](https://github.com/docker/docker/pull/21019))
-- Fixed a bug which prevents docker reload after a network delete during shutdown ([#20214](https://github.com/docker/docker/pull/20214))
-- Make sure iptables chains are recreated on firewalld reload ([#20419](https://github.com/docker/docker/pull/20419))
-- Allow to pass global datastore during config reload ([#20419](https://github.com/docker/docker/pull/20419))
-- For anonymous containers use the alias name for IP to name mapping, ie:DNS PTR record ([#21019](https://github.com/docker/docker/pull/21019))
-- Fix a panic when deleting an entry from /etc/hosts file  ([#21019](https://github.com/docker/docker/pull/21019))
-- Source the forwarded DNS queries from the container net namespace  ([#21019](https://github.com/docker/docker/pull/21019))
-- Fix to retain the network internal mode config for bridge networks on daemon reload ([#21780] (https://github.com/docker/docker/pull/21780))
-- Fix to retain IPAM driver option configs on daemon reload ([#21914] (https://github.com/docker/docker/pull/21914))
-
-### Plugins
-
-- Fix a file descriptor leak that would occur every time plugins were enumerated ([#20686](https://github.com/docker/docker/pull/20686))
-- Fix an issue where Authz plugin would corrupt the payload body when faced with a large amount of data ([#20602](https://github.com/docker/docker/pull/20602))
-
-### Runtime
-
-- Fix a panic that could occur when cleanup after a container started with invalid parameters ([#21716](https://github.com/docker/docker/pull/21716))
-- Fix a race with event timers stopping early ([#21692](https://github.com/docker/docker/pull/21692))
-- Fix race conditions in the layer store, potentially corrupting the map and crashing the process ([#21677](https://github.com/docker/docker/pull/21677))
-- Un-deprecate auto-creation of host directories for mounts. This feature was marked deprecated in ([#21666](https://github.com/docker/docker/pull/21666))
-  Docker 1.9, but was decided to be too much of a backward-incompatible change, so it was decided to keep the feature.
-+ It is now possible for containers to share the NET and IPC namespaces when `userns` is enabled ([#21383](https://github.com/docker/docker/pull/21383))
-+ `docker inspect <image-id>` will now expose the rootfs layers ([#21370](https://github.com/docker/docker/pull/21370))
-+ Docker Windows gained a minimal `top` implementation ([#21354](https://github.com/docker/docker/pull/21354))
-* Docker learned to report the faulty exe when a container cannot be started due to its condition ([#21345](https://github.com/docker/docker/pull/21345))
-* Docker with device mapper will now refuse to run if `udev sync` is not available ([#21097](https://github.com/docker/docker/pull/21097))
-- Fix a bug where Docker would not validate the config file upon configuration reload ([#21089](https://github.com/docker/docker/pull/21089))
-- Fix a hang that would happen on attach if initial start was to fail ([#21048](https://github.com/docker/docker/pull/21048))
-- Fix an issue where registry service options in the daemon configuration file were not properly taken into account ([#21045](https://github.com/docker/docker/pull/21045))
-- Fix a race between the exec and resize operations ([#21022](https://github.com/docker/docker/pull/21022))
-- Fix an issue where nanoseconds were not correctly taken in account when filtering Docker events ([#21013](https://github.com/docker/docker/pull/21013))
-- Fix the handling of Docker command when passed a 64 bytes id ([#21002](https://github.com/docker/docker/pull/21002))
-* Docker will now return a `204` (i.e http.StatusNoContent) code when it successfully deleted a network ([#20977](https://github.com/docker/docker/pull/20977))
-- Fix a bug where the daemon would wait indefinitely in case the process it was about to killed had already exited on its own ([#20967](https://github.com/docker/docker/pull/20967)
-* The devmapper driver learned the `dm.min_free_space` option. If the mapped device free space reaches the passed value, new device creation will be prohibited. ([#20786](https://github.com/docker/docker/pull/20786))
-+ Docker can now prevent processes in container to gain new privileges via the `--security-opt=no-new-privileges` flag ([#20727](https://github.com/docker/docker/pull/20727))
-- Starting a container with the `--device` option will now correctly resolves symlinks ([#20684](https://github.com/docker/docker/pull/20684))
-+ Docker now relies on [`containerd`](https://github.com/docker/containerd) and [`runc`](https://github.com/opencontainers/runc) to spawn containers. ([#20662](https://github.com/docker/docker/pull/20662))
-- Fix docker configuration reloading to only alter value present in the given config file ([#20604](https://github.com/docker/docker/pull/20604))
-+ Docker now allows setting a container hostname via the `--hostname` flag when `--net=host` ([#20177](https://github.com/docker/docker/pull/20177))
-+ Docker now allows executing privileged container while running with `--userns-remap` if both `--privileged` and the new `--userns=host` flag are specified ([#20111](https://github.com/docker/docker/pull/20111))
-- Fix Docker not cleaning up correctly old containers upon restarting after a crash ([#19679](https://github.com/docker/docker/pull/19679))
-* Docker will now error out if it doesn't recognize a configuration key within the config file ([#19517](https://github.com/docker/docker/pull/19517))
-- Fix container loading, on daemon startup, when they depends on a plugin running within a container ([#19500](https://github.com/docker/docker/pull/19500))
-* `docker update` learned how to change a container restart policy ([#19116](https://github.com/docker/docker/pull/19116))
-* `docker inspect` now also returns a new `State` field containing the container state in a human readable way (i.e. one of `created`, `restarting`, `running`, `paused`, `exited` or `dead`)([#18966](https://github.com/docker/docker/pull/18966))
-+ Docker learned to limit the number of active pids (i.e. processes) within the container via the `pids-limit` flags. NOTE: This requires `CGROUP_PIDS=y` to be in the kernel configuration. ([#18697](https://github.com/docker/docker/pull/18697))
-- `docker load` now has a `--quiet` option to suppress the load output ([#20078](https://github.com/docker/docker/pull/20078))
-- Fix a bug in neighbor discovery for IPv6 peers ([#20842](https://github.com/docker/docker/pull/20842))
-- Fix a panic during cleanup if a container was started with invalid options ([#21802](https://github.com/docker/docker/pull/21802))
-- Fix a situation where a container cannot be stopped if the terminal is closed ([#21840](https://github.com/docker/docker/pull/21840))
-
-### Security
-
-* Object with the `pcp_pmcd_t` selinux type were given management access to `/var/lib/docker(/.*)?` ([#21370](https://github.com/docker/docker/pull/21370))
-* `restart_syscall`, `copy_file_range`, `mlock2` joined the list of allowed calls in the default seccomp profile ([#21117](https://github.com/docker/docker/pull/21117), [#21262](https://github.com/docker/docker/pull/21262))
-* `send`, `recv` and `x32` were added to the list of allowed syscalls and arch in the default seccomp profile ([#19432](https://github.com/docker/docker/pull/19432))
-* Docker Content Trust now requests the server to perform snapshot signing ([#21046](https://github.com/docker/docker/pull/21046))
-* Support for using YubiKeys for Content Trust signing has been moved out of experimental ([#21591](https://github.com/docker/docker/pull/21591))
-
-### Volumes
-
-* Output of `docker volume ls` is now sorted by volume name ([#20389](https://github.com/docker/docker/pull/20389))
-* Local volumes can now accept options similar to the unix `mount` tool ([#20262](https://github.com/docker/docker/pull/20262))
-- Fix an issue where one letter directory name could not be used as source for volumes ([#21106](https://github.com/docker/docker/pull/21106))
-+ `docker run -v` now accepts a new flag `nocopy`. This tells the runtime not to copy the container path content into the volume (which is the default behavior) ([#21223](https://github.com/docker/docker/pull/21223))
-
-## 1.10.3 (2016-03-10)
-
-### Runtime
-
-- Fix Docker client exiting with an "Unrecognized input header" error [#20706](https://github.com/docker/docker/pull/20706)
-- Fix Docker exiting if Exec is started with both `AttachStdin` and `Detach` [#20647](https://github.com/docker/docker/pull/20647)
-
-### Distribution
-
-- Fix a crash when pushing multiple images sharing the same layers to the same repository in parallel [#20831](https://github.com/docker/docker/pull/20831)
-- Fix a panic when pushing images to a registry which uses a misconfigured token service [#21030](https://github.com/docker/docker/pull/21030)
-
-### Plugin system
-
-- Fix issue preventing volume plugins to start when SELinux is enabled [#20834](https://github.com/docker/docker/pull/20834)
-- Prevent Docker from exiting if a volume plugin returns a null response for Get requests [#20682](https://github.com/docker/docker/pull/20682)
-- Fix plugin system leaking file descriptors if a plugin has an error [#20680](https://github.com/docker/docker/pull/20680)
-
-### Security
-
-- Fix linux32 emulation to fail during docker build [#20672](https://github.com/docker/docker/pull/20672)
-  It was due to the `personality` syscall being blocked by the default seccomp profile.
-- Fix Oracle XE 10g failing to start in a container [#20981](https://github.com/docker/docker/pull/20981)
-  It was due to the `ipc` syscall being blocked by the default seccomp profile.
-- Fix user namespaces not working on Linux From Scratch [#20685](https://github.com/docker/docker/pull/20685)
-- Fix issue preventing daemon to start if userns is enabled and the `subuid` or `subgid` files contain comments [#20725](https://github.com/docker/docker/pull/20725)
-
-## 1.10.2 (2016-02-22)
-
-### Runtime
-
-- Prevent systemd from deleting containers' cgroups when its configuration is reloaded [#20518](https://github.com/docker/docker/pull/20518)
-- Fix SELinux issues by disregarding `--read-only` when mounting `/dev/mqueue` [#20333](https://github.com/docker/docker/pull/20333)
-- Fix chown permissions used during `docker cp` when userns is used [#20446](https://github.com/docker/docker/pull/20446)
-- Fix configuration loading issue with all booleans defaulting to `true` [#20471](https://github.com/docker/docker/pull/20471)
-- Fix occasional panic with `docker logs -f` [#20522](https://github.com/docker/docker/pull/20522)
-
-### Distribution
-
-- Keep layer reference if deletion failed to avoid a badly inconsistent state [#20513](https://github.com/docker/docker/pull/20513)
-- Handle gracefully a corner case when canceling migration [#20372](https://github.com/docker/docker/pull/20372)
-- Fix docker import on compressed data [#20367](https://github.com/docker/docker/pull/20367)
-- Fix tar-split files corruption during migration that later cause docker push and docker save to fail [#20458](https://github.com/docker/docker/pull/20458)
-
-### Networking
-
-- Fix daemon crash if embedded DNS is sent garbage [#20510](https://github.com/docker/docker/pull/20510)
-
-### Volumes
-
-- Fix issue with multiple volume references with same name [#20381](https://github.com/docker/docker/pull/20381)
-
-### Security
-
-- Fix potential cache corruption and delegation conflict issues [#20523](https://github.com/docker/docker/pull/20523)
-
-## 1.10.1 (2016-02-11)
-
-### Runtime
-
-* Do not stop daemon on migration hard failure [#20156](https://github.com/docker/docker/pull/20156)
-- Fix various issues with migration to content-addressable images [#20058](https://github.com/docker/docker/pull/20058)
-- Fix ZFS permission bug with user namespaces [#20045](https://github.com/docker/docker/pull/20045)
-- Do not leak /dev/mqueue from the host to all containers, keep it container-specific [#19876](https://github.com/docker/docker/pull/19876) [#20133](https://github.com/docker/docker/pull/20133)
-- Fix `docker ps --filter before=...` to not show stopped containers without providing `-a` flag [#20135](https://github.com/docker/docker/pull/20135)
-
-### Security
-
-- Fix issue preventing docker events to work properly with authorization plugin [#20002](https://github.com/docker/docker/pull/20002)
-
-### Distribution
-
-* Add additional verifications and prevent from uploading invalid data to registries [#20164](https://github.com/docker/docker/pull/20164)
-- Fix regression preventing uppercase characters in image reference hostname [#20175](https://github.com/docker/docker/pull/20175)
-
-### Networking
-
-- Fix embedded DNS for user-defined networks in the presence of firewalld [#20060](https://github.com/docker/docker/pull/20060)
-- Fix issue where removing a network during shutdown left Docker inoperable [#20181](https://github.com/docker/docker/issues/20181) [#20235](https://github.com/docker/docker/issues/20235)
-- Embedded DNS is now able to return compressed results [#20181](https://github.com/docker/docker/issues/20181)
-- Fix port-mapping issue with `userland-proxy=false` [#20181](https://github.com/docker/docker/issues/20181)
-
-### Logging
-
-- Fix bug where tcp+tls protocol would be rejected [#20109](https://github.com/docker/docker/pull/20109)
-
-### Volumes
-
-- Fix issue whereby older volume drivers would not receive volume options [#19983](https://github.com/docker/docker/pull/19983)
-
-### Misc
-
-- Remove TasksMax from Docker systemd service [#20167](https://github.com/docker/docker/pull/20167)
-
-## 1.10.0 (2016-02-04)
-
-**IMPORTANT**: Docker 1.10 uses a new content-addressable storage for images and layers.
-A migration is performed the first time docker is run, and can take a significant amount of time depending on the number of images present.
-Refer to this page on the wiki for more information: https://github.com/docker/docker/wiki/Engine-v1.10.0-content-addressability-migration
-We also released a cool migration utility that enables you to perform the migration before updating to reduce downtime.
-Engine 1.10 migrator can be found on Docker Hub: https://hub.docker.com/r/docker/v1.10-migrator/
-
-### Runtime
-
-+ New `docker update` command that allows updating resource constraints on running containers [#15078](https://github.com/docker/docker/pull/15078)
-+ Add `--tmpfs` flag to `docker run` to create a tmpfs mount in a container [#13587](https://github.com/docker/docker/pull/13587)
-+ Add `--format` flag to `docker images` command [#17692](https://github.com/docker/docker/pull/17692)
-+ Allow to set daemon configuration in a file and hot-reload it with the `SIGHUP` signal [#18587](https://github.com/docker/docker/pull/18587)
-+ Updated docker events to include more meta-data and event types [#18888](https://github.com/docker/docker/pull/18888)
-  This change is backward compatible in the API, but not on the CLI.
-+ Add `--blkio-weight-device` flag to `docker run` [#13959](https://github.com/docker/docker/pull/13959)
-+ Add `--device-read-bps` and `--device-write-bps` flags to `docker run` [#14466](https://github.com/docker/docker/pull/14466)
-+ Add `--device-read-iops` and `--device-write-iops` flags to `docker run` [#15879](https://github.com/docker/docker/pull/15879)
-+ Add `--oom-score-adj` flag to `docker run` [#16277](https://github.com/docker/docker/pull/16277)
-+ Add `--detach-keys` flag to `attach`, `run`, `start` and `exec` commands to override the default key sequence that detaches from a container  [#15666](https://github.com/docker/docker/pull/15666)
-+ Add `--shm-size` flag to `run`, `create` and `build` to set the size of `/dev/shm` [#16168](https://github.com/docker/docker/pull/16168)
-+ Show the number of running, stopped, and paused containers in `docker info` [#19249](https://github.com/docker/docker/pull/19249)
-+ Show the `OSType` and `Architecture` in `docker info` [#17478](https://github.com/docker/docker/pull/17478)
-+ Add `--cgroup-parent` flag on `daemon` to set cgroup parent for all containers [#19062](https://github.com/docker/docker/pull/19062)
-+ Add `-L` flag to docker cp to follow symlinks [#16613](https://github.com/docker/docker/pull/16613)
-+ New `status=dead` filter for `docker ps` [#17908](https://github.com/docker/docker/pull/17908)
-* Change `docker run` exit codes to distinguish between runtime and application errors [#14012](https://github.com/docker/docker/pull/14012)
-* Enhance `docker events --since` and `--until` to support nanoseconds and timezones [#17495](https://github.com/docker/docker/pull/17495)
-* Add `--all`/`-a` flag to `stats` to include both running and stopped containers [#16742](https://github.com/docker/docker/pull/16742)
-* Change the default cgroup-driver to `cgroupfs` [#17704](https://github.com/docker/docker/pull/17704)
-* Emit a "tag" event when tagging an image with `build -t` [#17115](https://github.com/docker/docker/pull/17115)
-* Best effort for linked containers' start order when starting the daemon [#18208](https://github.com/docker/docker/pull/18208)
-* Add ability to add multiple tags on `build` [#15780](https://github.com/docker/docker/pull/15780)
-* Permit `OPTIONS` request against any url, thus fixing issue with CORS [#19569](https://github.com/docker/docker/pull/19569)
-- Fix the `--quiet` flag on `docker build` to actually be quiet [#17428](https://github.com/docker/docker/pull/17428)
-- Fix `docker images --filter dangling=false` to now show all non-dangling images [#19326](https://github.com/docker/docker/pull/19326)
-- Fix race condition causing autorestart turning off on restart [#17629](https://github.com/docker/docker/pull/17629)
-- Recognize GPFS filesystems [#19216](https://github.com/docker/docker/pull/19216)
-- Fix obscure bug preventing to start containers [#19751](https://github.com/docker/docker/pull/19751)
-- Forbid `exec` during container restart [#19722](https://github.com/docker/docker/pull/19722)
-- devicemapper: Increasing `--storage-opt dm.basesize` will now increase the base device size on daemon restart [#19123](https://github.com/docker/docker/pull/19123)
-
-### Security
-
-+ Add `--userns-remap` flag to `daemon` to support user namespaces (previously in experimental) [#19187](https://github.com/docker/docker/pull/19187)
-+ Add support for custom seccomp profiles in `--security-opt` [#17989](https://github.com/docker/docker/pull/17989)
-+ Add default seccomp profile [#18780](https://github.com/docker/docker/pull/18780)
-+ Add `--authorization-plugin` flag to `daemon` to customize ACLs [#15365](https://github.com/docker/docker/pull/15365)
-+ Docker Content Trust now supports the ability to read and write user delegations [#18887](https://github.com/docker/docker/pull/18887)
-  This is an optional, opt-in feature that requires the explicit use of the Notary command-line utility in order to be enabled.
-  Enabling delegation support in a specific repository will break the ability of Docker 1.9 and 1.8 to pull from that repository, if content trust is enabled.
-* Allow SELinux to run in a container when using the BTRFS storage driver [#16452](https://github.com/docker/docker/pull/16452)
-
-### Distribution
-
-* Use content-addressable storage for images and layers [#17924](https://github.com/docker/docker/pull/17924)
-  Note that a migration is performed the first time docker is run; it can take a significant amount of time depending on the number of images and containers present.
-  Images no longer depend on the parent chain but contain a list of layer references.
-  `docker load`/`docker save` tarballs now also contain content-addressable image configurations.
-  For more information: https://github.com/docker/docker/wiki/Engine-v1.10.0-content-addressability-migration
-* Add support for the new [manifest format ("schema2")](https://github.com/docker/distribution/blob/master/docs/spec/manifest-v2-2.md) [#18785](https://github.com/docker/docker/pull/18785)
-* Lots of improvements for push and pull: performance++, retries on failed downloads, cancelling on client disconnect [#18353](https://github.com/docker/docker/pull/18353), [#18418](https://github.com/docker/docker/pull/18418), [#19109](https://github.com/docker/docker/pull/19109), [#18353](https://github.com/docker/docker/pull/18353)
-* Limit v1 protocol fallbacks [#18590](https://github.com/docker/docker/pull/18590)
-- Fix issue where docker could hang indefinitely waiting for a nonexistent process to pull an image [#19743](https://github.com/docker/docker/pull/19743)
-
-### Networking
-
-+ Use DNS-based discovery instead of `/etc/hosts` [#19198](https://github.com/docker/docker/pull/19198)
-+ Support for network-scoped alias using `--net-alias` on `run` and `--alias` on `network connect` [#19242](https://github.com/docker/docker/pull/19242)
-+ Add `--ip` and `--ip6` on `run` and `network connect` to support custom IP addresses for a container in a network [#19001](https://github.com/docker/docker/pull/19001)
-+ Add `--ipam-opt` to `network create` for passing custom IPAM options [#17316](https://github.com/docker/docker/pull/17316)
-+ Add `--internal` flag to `network create` to restrict external access to and from the network [#19276](https://github.com/docker/docker/pull/19276)
-+ Add `kv.path` option to `--cluster-store-opt` [#19167](https://github.com/docker/docker/pull/19167)
-+ Add `discovery.heartbeat` and `discovery.ttl` options to `--cluster-store-opt` to configure discovery TTL and heartbeat timer [#18204](https://github.com/docker/docker/pull/18204)
-+ Add `--format` flag to `network inspect` [#17481](https://github.com/docker/docker/pull/17481)
-+ Add `--link` to `network connect` to provide a container-local alias [#19229](https://github.com/docker/docker/pull/19229)
-+ Support for Capability exchange with remote IPAM plugins [#18775](https://github.com/docker/docker/pull/18775)
-+ Add `--force` to `network disconnect` to force container to be disconnected from network [#19317](https://github.com/docker/docker/pull/19317)
-* Support for multi-host networking using built-in overlay driver for all engine supported kernels: 3.10+ [#18775](https://github.com/docker/docker/pull/18775)
-* `--link` is now supported on `docker run` for containers in user-defined network [#19229](https://github.com/docker/docker/pull/19229)
-* Enhance `docker network rm` to allow removing multiple networks [#17489](https://github.com/docker/docker/pull/17489)
-* Include container names in `network inspect` [#17615](https://github.com/docker/docker/pull/17615)
-* Include auto-generated subnets for user-defined networks in `network inspect` [#17316](https://github.com/docker/docker/pull/17316)
-* Add `--filter` flag to `network ls` to hide predefined networks [#17782](https://github.com/docker/docker/pull/17782)
-* Add support for network connect/disconnect to stopped containers [#18906](https://github.com/docker/docker/pull/18906)
-* Add network ID to container inspect [#19323](https://github.com/docker/docker/pull/19323)
-- Fix MTU issue where Docker would not start with two or more default routes [#18108](https://github.com/docker/docker/pull/18108)
-- Fix duplicate IP address for containers [#18106](https://github.com/docker/docker/pull/18106)
-- Fix issue preventing sometimes docker from creating the bridge network [#19338](https://github.com/docker/docker/pull/19338)
-- Do not substitute 127.0.0.1 name server when using `--net=host` [#19573](https://github.com/docker/docker/pull/19573)
-
-### Logging
-
-+ New logging driver for Splunk [#16488](https://github.com/docker/docker/pull/16488)
-+ Add support for syslog over TCP+TLS [#18998](https://github.com/docker/docker/pull/18998)
-* Enhance `docker logs --since` and `--until` to support nanoseconds and time [#17495](https://github.com/docker/docker/pull/17495)
-* Enhance AWS logs to auto-detect region [#16640](https://github.com/docker/docker/pull/16640)
-
-### Volumes
-
-+ Add support to set the mount propagation mode for a volume [#17034](https://github.com/docker/docker/pull/17034)
-* Add `ls` and `inspect` endpoints to volume plugin API [#16534](https://github.com/docker/docker/pull/16534)
-  Existing plugins need to make use of these new APIs to satisfy users' expectation
-  For that, please use the new MIME type `application/vnd.docker.plugins.v1.2+json` [#19549](https://github.com/docker/docker/pull/19549)
-- Fix data not being copied to named volumes [#19175](https://github.com/docker/docker/pull/19175)
-- Fix issues preventing volume drivers from being containerized [#19500](https://github.com/docker/docker/pull/19500)
-- Fix `docker volumes ls --dangling=false` to now show all non-dangling volumes [#19671](https://github.com/docker/docker/pull/19671)
-- Do not remove named volumes on container removal [#19568](https://github.com/docker/docker/pull/19568)
-- Allow external volume drivers to host anonymous volumes [#19190](https://github.com/docker/docker/pull/19190)
-
-### Builder
-
-+ Add support for `**` in `.dockerignore` to wildcard multiple levels of directories [#17090](https://github.com/docker/docker/pull/17090)
-- Fix handling of UTF-8 characters in Dockerfiles [#17055](https://github.com/docker/docker/pull/17055)
-- Fix permissions problem when reading from STDIN [#19283](https://github.com/docker/docker/pull/19283)
-
-### Client
-
-+ Add support for overriding the API version to use via an `DOCKER_API_VERSION` environment-variable [#15964](https://github.com/docker/docker/pull/15964)
-- Fix a bug preventing Windows clients to log in to Docker Hub [#19891](https://github.com/docker/docker/pull/19891)
-
-### Misc
-
-* systemd: Set TasksMax in addition to LimitNPROC in systemd service file [#19391](https://github.com/docker/docker/pull/19391)
-
-### Deprecations
-
-* Remove LXC support. The LXC driver was deprecated in Docker 1.8, and has now been removed [#17700](https://github.com/docker/docker/pull/17700)
-* Remove `--exec-driver` daemon flag, because it is no longer in use [#17700](https://github.com/docker/docker/pull/17700)
-* Remove old deprecated single-dashed long CLI flags (such as `-rm`; use `--rm` instead) [#17724](https://github.com/docker/docker/pull/17724)
-* Deprecate HostConfig at API container start [#17799](https://github.com/docker/docker/pull/17799)
-* Deprecate docker packages for newly EOL'd Linux distributions: Fedora 21 and Ubuntu 15.04 (Vivid) [#18794](https://github.com/docker/docker/pull/18794), [#18809](https://github.com/docker/docker/pull/18809)
-* Deprecate `-f` flag for docker tag [#18350](https://github.com/docker/docker/pull/18350)
-
-## 1.9.1 (2015-11-21)
-
-### Runtime
-
-- Do not prevent daemon from booting if images could not be restored (#17695)
-- Force IPC mount to unmount on daemon shutdown/init (#17539)
-- Turn IPC unmount errors into warnings (#17554)
-- Fix `docker stats` performance regression (#17638)
-- Clarify cryptic error message upon `docker logs` if `--log-driver=none` (#17767)
-- Fix seldom panics (#17639, #17634, #17703)
-- Fix opq whiteouts problems for files with dot prefix (#17819)
-- devicemapper: try defaulting to xfs instead of ext4 for performance reasons (#17903, #17918)
-- devicemapper: fix displayed fs in docker info (#17974)
-- selinux: only relabel if user requested so with the `z` option (#17450, #17834)
-- Do not make network calls when normalizing names (#18014)
-
-### Client
-
-- Fix `docker login` on windows (#17738)
-- Fix bug with `docker inspect` output when not connected to daemon (#17715)
-- Fix `docker inspect -f {{.HostConfig.Dns}} somecontainer` (#17680)
-
-### Builder
-
-- Fix regression with symlink behavior in ADD/COPY (#17710)
-
-### Networking
-
-- Allow passing a network ID as an argument for `--net` (#17558)
-- Fix connect to host and prevent disconnect from host for `host` network (#17476)
-- Fix `--fixed-cidr` issue when gateway ip falls in ip-range and ip-range is
-  not the first block in the network (#17853)
-- Restore deterministic `IPv6` generation from `MAC` address on default `bridge` network (#17890)
-- Allow port-mapping only for endpoints created on docker run (#17858)
-- Fixed an endpoint delete issue with a possible stale sbox (#18102)
-
-### Distribution
-
-- Correct parent chain in v2 push when v1Compatibility files on the disk are inconsistent (#18047)
-
-## 1.9.0 (2015-11-03)
-
-### Runtime
-
-+ `docker stats` now returns block IO metrics (#15005)
-+ `docker stats` now details network stats per interface (#15786)
-+ Add `ancestor=<image>` filter to `docker ps --filter` flag to filter
-containers based on their ancestor images (#14570)
-+ Add `label=<somelabel>` filter to `docker ps --filter` to filter containers
-based on label (#16530)
-+ Add `--kernel-memory` flag to `docker run` (#14006)
-+ Add `--message` flag to `docker import` allowing to specify an optional
-message (#15711)
-+ Add `--privileged` flag to `docker exec` (#14113)
-+ Add `--stop-signal` flag to `docker run` allowing to replace the container
-process stopping signal (#15307)
-+ Add a new `unless-stopped` restart policy (#15348)
-+ Inspecting an image now returns tags (#13185)
-+ Add container size information to `docker inspect` (#15796)
-+ Add `RepoTags` and `RepoDigests` field to `/images/{name:.*}/json` (#17275)
-- Remove the deprecated `/container/ps` endpoint from the API (#15972)
-- Send and document correct HTTP codes for `/exec/<name>/start` (#16250)
-- Share shm and mqueue between containers sharing IPC namespace (#15862)
-- Event stream now shows OOM status when `--oom-kill-disable` is set (#16235)
-- Ensure special network files (/etc/hosts etc.) are read-only if bind-mounted
-with `ro` option (#14965)
-- Improve `rmi` performance (#16890)
-- Do not update /etc/hosts for the default bridge network, except for links (#17325)
-- Fix conflict with duplicate container names (#17389)
-- Fix an issue with incorrect template execution in `docker inspect` (#17284)
-- DEPRECATE `-c` short flag variant for `--cpu-shares` in docker run (#16271)
-
-### Client
-
-+ Allow `docker import` to import from local files (#11907)
-
-### Builder
-
-+ Add a `STOPSIGNAL` Dockerfile instruction allowing to set a different
-stop-signal for the container process (#15307)
-+ Add an `ARG` Dockerfile instruction and a `--build-arg` flag to `docker build`
-that allows to add build-time environment variables (#15182)
-- Improve cache miss performance (#16890)
-
-### Storage
-
-- devicemapper: Implement deferred deletion capability (#16381)
-
-## Networking
-
-+ `docker network` exits experimental and is part of standard release (#16645)
-+ New network top-level concept, with associated subcommands and API (#16645)
-  WARNING: the API is different from the experimental API
-+ Support for multiple isolated/micro-segmented networks (#16645)
-+ Built-in multihost networking using VXLAN based overlay driver (#14071)
-+ Support for third-party network plugins (#13424)
-+ Ability to dynamically connect containers to multiple networks (#16645)
-+ Support for user-defined IP address management via pluggable IPAM drivers (#16910)
-+ Add daemon flags `--cluster-store` and `--cluster-advertise` for built-in nodes discovery (#16229)
-+ Add `--cluster-store-opt` for setting up TLS settings (#16644)
-+ Add `--dns-opt` to the daemon (#16031)
-- DEPRECATE following container `NetworkSettings` fields in API v1.21: `EndpointID`, `Gateway`,
-  `GlobalIPv6Address`, `GlobalIPv6PrefixLen`, `IPAddress`, `IPPrefixLen`, `IPv6Gateway` and `MacAddress`.
-  Those are now specific to the `bridge` network. Use `NetworkSettings.Networks` to inspect
-  the networking settings of a container per network.
-
-### Volumes
-
-+ New top-level `volume` subcommand and API (#14242)
-- Move API volume driver settings to host-specific config (#15798)
-- Print an error message if volume name is not unique (#16009)
-- Ensure volumes created from Dockerfiles always use the local volume driver
-(#15507)
-- DEPRECATE auto-creating missing host paths for bind mounts (#16349)
-
-### Logging
-
-+ Add `awslogs` logging driver for Amazon CloudWatch (#15495)
-+ Add generic `tag` log option to allow customizing container/image
-information passed to driver (e.g. show container names) (#15384)
-- Implement the `docker logs` endpoint for the journald driver (#13707)
-- DEPRECATE driver-specific log tags (e.g. `syslog-tag`, etc.) (#15384)
-
-### Distribution
-
-+ `docker search` now works with partial names (#16509)
-- Push optimization: avoid buffering to file (#15493)
-- The daemon will display progress for images that were already being pulled
-by another client (#15489)
-- Only permissions required for the current action being performed are requested (#)
-+ Renaming trust keys (and respective environment variables) from `offline` to
-`root` and `tagging` to `repository` (#16894)
-- DEPRECATE trust key environment variables
-`DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE` and
-`DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE` (#16894)
-
-### Security
-
-+ Add SELinux profiles to the rpm package (#15832)
-- Fix various issues with AppArmor profiles provided in the deb package
-(#14609)
-- Add AppArmor policy that prevents writing to /proc (#15571)
-
-## 1.8.3 (2015-10-12)
-
-### Distribution
-
-- Fix layer IDs lead to local graph poisoning (CVE-2014-8178)
-- Fix manifest validation and parsing logic errors allow pull-by-digest validation bypass (CVE-2014-8179)
-+ Add `--disable-legacy-registry` to prevent a daemon from using a v1 registry
-
-## 1.8.2 (2015-09-10)
-
-### Distribution
-
-- Fixes rare edge case of handling GNU LongLink and LongName entries.
-- Fix ^C on docker pull.
-- Fix docker pull issues on client disconnection.
-- Fix issue that caused the daemon to panic when loggers weren't configured properly.
-- Fix goroutine leak pulling images from registry V2.
-
-### Runtime
-
-- Fix a bug mounting cgroups for docker daemons running inside docker containers.
-- Initialize log configuration properly.
-
-### Client:
-
-- Handle `-q` flag in `docker ps` properly when there is a default format.
-
-### Networking
-
-- Fix several corner cases with netlink.
-
-### Contrib
-
-- Fix several issues with bash completion.
-
-## 1.8.1 (2015-08-12)
-
-### Distribution
-
-* Fix a bug where pushing multiple tags would result in invalid images
-
-## 1.8.0 (2015-08-11)
-
-### Distribution
-
-+ Trusted pull, push and build, disabled by default
-* Make tar layers deterministic between registries
-* Don't allow deleting the image of running containers
-* Check if a tag name to load is a valid digest
-* Allow one character repository names
-* Add a more accurate error description for invalid tag name
-* Make build cache ignore mtime
-
-### Cli
-
-+ Add support for DOCKER_CONFIG/--config to specify config file dir
-+ Add --type flag  for docker inspect command
-+ Add formatting options to `docker ps` with `--format`
-+ Replace `docker -d` with new subcommand `docker daemon`
-* Zsh completion updates and improvements
-* Add some missing events to bash completion
-* Support daemon urls with base paths in `docker -H`
-* Validate status= filter to docker ps
-* Display when a container is in --net=host in docker ps
-* Extend docker inspect to export image metadata related to graph driver
-* Restore --default-gateway{,-v6} daemon options
-* Add missing unpublished ports in docker ps
-* Allow duration strings in `docker events` as --since/--until
-* Expose more mounts information in `docker inspect`
-
-### Runtime
-
-+ Add new Fluentd logging driver
-+ Allow `docker import` to load from local files
-+ Add logging driver for GELF via UDP
-+ Allow to copy files from host to containers with `docker cp`
-+ Promote volume drivers from experimental to master
-+ Add rollover options to json-file log driver, and --log-driver-opts flag
-+ Add memory swappiness tuning options
-* Remove cgroup read-only flag when privileged
-* Make /proc, /sys, & /dev readonly for readonly containers
-* Add cgroup bind mount by default
-* Overlay: Export metadata for container and image in `docker inspect`
-* Devicemapper: external device activation
-* Devicemapper: Compare uuid of base device on startup
-* Remove RC4 from the list of registry cipher suites
-* Add syslog-facility option
-* LXC execdriver compatibility with recent LXC versions
-* Mark LXC execriver as deprecated (to be removed with the migration to runc)
-
-### Plugins
-
-* Separate plugin sockets and specs locations
-* Allow TLS connections to plugins
-
-### Bug fixes
-
-- Add missing 'Names' field to /containers/json API output
-- Make `docker rmi` of dangling images safe while pulling
-- Devicemapper: Change default basesize to 100G
-- Go Scheduler issue with sync.Mutex and gcc
-- Fix issue where Search API endpoint would panic due to empty AuthConfig
-- Set image canonical names correctly
-- Check dockerinit only if lxc driver is used
-- Fix ulimit usage of nproc
-- Always attach STDIN if -i,--interactive is specified
-- Show error messages when saving container state fails
-- Fixed incorrect assumption on --bridge=none treated as disable network
-- Check for invalid port specifications in host configuration
-- Fix endpoint leave failure for --net=host mode
-- Fix goroutine leak in the stats API if the container is not running
-- Check for apparmor file before reading it
-- Fix DOCKER_TLS_VERIFY being ignored
-- Set umask to the default on startup
-- Correct the message of pause and unpause a non-running container
-- Adjust disallowed CpuShares in container creation
-- ZFS: correctly apply selinux context
-- Display empty string instead of <nil> when IP opt is nil
-- `docker kill` returns error when container is not running
-- Fix COPY/ADD quoted/json form
-- Fix goroutine leak on logs -f with no output
-- Remove panic in nat package on invalid hostport
-- Fix container linking in Fedora 22
-- Fix error caused using default gateways outside of the allocated range
-- Format times in inspect command with a template as RFC3339Nano
-- Make registry client to accept 2xx and 3xx http status responses as successful
-- Fix race issue that caused the daemon to crash with certain layer downloads failed in a specific order.
-- Fix error when the docker ps format was not valid.
-- Remove redundant ip forward check.
-- Fix issue trying to push images to repository mirrors.
-- Fix error cleaning up network entrypoints when there is an initialization issue.
-
-## 1.7.1 (2015-07-14)
-
-#### Runtime
-
-- Fix default user spawning exec process with `docker exec`
-- Make `--bridge=none` not to configure the network bridge
-- Publish networking stats properly
-- Fix implicit devicemapper selection with static binaries
-- Fix socket connections that hung intermittently
-- Fix bridge interface creation on CentOS/RHEL 6.6
-- Fix local dns lookups added to resolv.conf
-- Fix copy command mounting volumes
-- Fix read/write privileges in volumes mounted with --volumes-from
-
-#### Remote API
-
-- Fix unmarshalling of Command and Entrypoint
-- Set limit for minimum client version supported
-- Validate port specification
-- Return proper errors when attach/reattach fail
-
-#### Distribution
-
-- Fix pulling private images
-- Fix fallback between registry V2 and V1
-
-## 1.7.0 (2015-06-16)
-
-#### Runtime
-+ Experimental feature: support for out-of-process volume plugins
-* The userland proxy can be disabled in favor of hairpin NAT using the daemon’s `--userland-proxy=false` flag
-* The `exec` command supports the `-u|--user` flag to specify the new process owner
-+ Default gateway for containers can be specified daemon-wide using the `--default-gateway` and `--default-gateway-v6` flags
-+ The CPU CFS (Completely Fair Scheduler) quota can be set in `docker run` using `--cpu-quota`
-+ Container block IO can be controlled in `docker run` using`--blkio-weight`
-+ ZFS support
-+ The `docker logs` command supports a `--since` argument
-+ UTS namespace can be shared with the host with `docker run --uts=host`
-
-#### Quality
-* Networking stack was entirely rewritten as part of the libnetwork effort
-* Engine internals refactoring
-* Volumes code was entirely rewritten to support the plugins effort
-+ Sending SIGUSR1 to a daemon will dump all goroutines stacks without exiting
-
-#### Build
-+ Support ${variable:-value} and ${variable:+value} syntax for environment variables
-+ Support resource management flags `--cgroup-parent`, `--cpu-period`, `--cpu-quota`, `--cpuset-cpus`, `--cpuset-mems`
-+ git context changes with branches and directories
-* The .dockerignore file support exclusion rules
-
-#### Distribution
-+ Client support for v2 mirroring support for the official registry
-
-#### Bugfixes
-* Firewalld is now supported and will automatically be used when available
-* mounting --device recursively
-
-## 1.6.2 (2015-05-13)
-
-####  Runtime
-- Revert change prohibiting mounting into /sys
-
-## 1.6.1 (2015-05-07)
-
-####  Security
-- Fix read/write /proc paths (CVE-2015-3630)
-- Prohibit VOLUME /proc and VOLUME / (CVE-2015-3631)
-- Fix opening of file-descriptor 1 (CVE-2015-3627)
-- Fix symlink traversal on container respawn allowing local privilege escalation (CVE-2015-3629)
-- Prohibit mount of /sys
-
-#### Runtime
-- Update AppArmor policy to not allow mounts
-
-## 1.6.0 (2015-04-07)
-
-#### Builder
-+ Building images from an image ID
-+ Build containers with resource constraints, ie `docker build --cpu-shares=100 --memory=1024m...`
-+ `commit --change` to apply specified Dockerfile instructions while committing the image
-+ `import --change` to apply specified Dockerfile instructions while importing the image
-+ Builds no longer continue in the background when canceled with CTRL-C
-
-#### Client
-+ Windows Support
-
-#### Runtime
-+ Container and image Labels
-+ `--cgroup-parent` for specifying a parent cgroup to place container cgroup within
-+ Logging drivers, `json-file`, `syslog`, or `none`
-+ Pulling images by ID
-+ `--ulimit` to set the ulimit on a container
-+ `--default-ulimit` option on the daemon which applies to all created containers (and overwritten by `--ulimit` on run)
-
-## 1.5.0 (2015-02-10)
-
-#### Builder
-+ Dockerfile to use for a given `docker build` can be specified with the `-f` flag
-* Dockerfile and .dockerignore files can be themselves excluded as part of the .dockerignore file, thus preventing modifications to these files invalidating ADD or COPY instructions cache
-* ADD and COPY instructions accept relative paths
-* Dockerfile `FROM scratch` instruction is now interpreted as a no-base specifier
-* Improve performance when exposing a large number of ports
-
-#### Hack
-+ Allow client-side only integration tests for Windows
-* Include docker-py integration tests against Docker daemon as part of our test suites
-
-#### Packaging
-+ Support for the new version of the registry HTTP API
-* Speed up `docker push` for images with a majority of already existing layers
-- Fixed contacting a private registry through a proxy
-
-#### Remote API
-+ A new endpoint will stream live container resource metrics and can be accessed with the `docker stats` command
-+ Containers can be renamed using the new `rename` endpoint and the associated `docker rename` command
-* Container `inspect` endpoint show the ID of `exec` commands running in this container
-* Container `inspect` endpoint show the number of times Docker auto-restarted the container
-* New types of event can be streamed by the `events` endpoint: ‘OOM’ (container died with out of memory), ‘exec_create’, and ‘exec_start'
-- Fixed returned string fields which hold numeric characters incorrectly omitting surrounding double quotes
-
-#### Runtime
-+ Docker daemon has full IPv6 support
-+ The `docker run` command can take the `--pid=host` flag to use the host PID namespace, which makes it possible for example to debug host processes using containerized debugging tools
-+ The `docker run` command can take the `--read-only` flag to make the container’s root filesystem mounted as readonly, which can be used in combination with volumes to force a container’s processes to only write to locations that will be persisted
-+ Container total memory usage can be limited for `docker run` using the `--memory-swap` flag
-* Major stability improvements for devicemapper storage driver
-* Better integration with host system: containers will reflect changes to the host's `/etc/resolv.conf` file when restarted
-* Better integration with host system: per-container iptable rules are moved to the DOCKER chain
-- Fixed container exiting on out of memory to return an invalid exit code
-
-#### Other
-* The HTTP_PROXY, HTTPS_PROXY, and NO_PROXY environment variables are properly taken into account by the client when connecting to the Docker daemon
-
-## 1.4.1 (2014-12-15)
-
-#### Runtime
-- Fix issue with volumes-from and bind mounts not being honored after create
-
-## 1.4.0 (2014-12-11)
-
-#### Notable Features since 1.3.0
-+ Set key=value labels to the daemon (displayed in `docker info`), applied with
-  new `-label` daemon flag
-+ Add support for `ENV` in Dockerfile of the form:
-  `ENV name=value name2=value2...`
-+ New Overlayfs Storage Driver
-+ `docker info` now returns an `ID` and `Name` field
-+ Filter events by event name, container, or image
-+ `docker cp` now supports copying from container volumes
-- Fixed `docker tag`, so it honors `--force` when overriding a tag for existing
-  image.
-
-## 1.3.3 (2014-12-11)
-
-#### Security
-- Fix path traversal vulnerability in processing of absolute symbolic links (CVE-2014-9356)
-- Fix decompression of xz image archives, preventing privilege escalation (CVE-2014-9357)
-- Validate image IDs (CVE-2014-9358)
-
-#### Runtime
-- Fix an issue when image archives are being read slowly
-
-#### Client
-- Fix a regression related to stdin redirection
-- Fix a regression with `docker cp` when destination is the current directory
-
-## 1.3.2 (2014-11-20)
-
-#### Security
-- Fix tar breakout vulnerability
-* Extractions are now sandboxed chroot
-- Security options are no longer committed to images
-
-#### Runtime
-- Fix deadlock in `docker ps -f exited=1`
-- Fix a bug when `--volumes-from` references a container that failed to start
-
-#### Registry
-+ `--insecure-registry` now accepts CIDR notation such as 10.1.0.0/16
-* Private registries whose IPs fall in the 127.0.0.0/8 range do no need the `--insecure-registry` flag
-- Skip the experimental registry v2 API when mirroring is enabled
-
-## 1.3.1 (2014-10-28)
-
-#### Security
-* Prevent fallback to SSL protocols < TLS 1.0 for client, daemon and registry
-+ Secure HTTPS connection to registries with certificate verification and without HTTP fallback unless `--insecure-registry` is specified
-
-#### Runtime
-- Fix issue where volumes would not be shared
-
-#### Client
-- Fix issue with `--iptables=false` not automatically setting `--ip-masq=false`
-- Fix docker run output to non-TTY stdout
-
-#### Builder
-- Fix escaping `$` for environment variables
-- Fix issue with lowercase `onbuild` Dockerfile instruction
-- Restrict environment variable expansion to `ENV`, `ADD`, `COPY`, `WORKDIR`, `EXPOSE`, `VOLUME` and `USER`
-
-## 1.3.0 (2014-10-14)
-
-#### Notable features since 1.2.0
-+ Docker `exec` allows you to run additional processes inside existing containers
-+ Docker `create` gives you the ability to create a container via the CLI without executing a process
-+ `--security-opts` options to allow user to customize container labels and apparmor profiles
-+ Docker `ps` filters
-- Wildcard support to COPY/ADD
-+ Move production URLs to get.docker.com from get.docker.io
-+ Allocate IP address on the bridge inside a valid CIDR
-+ Use drone.io for PR and CI testing
-+ Ability to setup an official registry mirror
-+ Ability to save multiple images with docker `save`
-
-## 1.2.0 (2014-08-20)
-
-#### Runtime
-+ Make /etc/hosts /etc/resolv.conf and /etc/hostname editable at runtime
-+ Auto-restart containers using policies
-+ Use /var/lib/docker/tmp for large temporary files
-+ `--cap-add` and `--cap-drop` to tweak what linux capability you want
-+ `--device` to use devices in containers
-
-#### Client
-+ `docker search` on private registries
-+ Add `exited` filter to `docker ps --filter`
-* `docker rm -f` now kills instead of stop
-+ Support for IPv6 addresses in `--dns` flag
-
-#### Proxy
-+ Proxy instances in separate processes
-* Small bug fix on UDP proxy
-
-## 1.1.2 (2014-07-23)
-
-#### Runtime
-+ Fix port allocation for existing containers
-+ Fix containers restart on daemon restart
-
-#### Packaging
-+ Fix /etc/init.d/docker issue on Debian
-
-## 1.1.1 (2014-07-09)
-
-#### Builder
-* Fix issue with ADD
-
-## 1.1.0 (2014-07-03)
-
-#### Notable features since 1.0.1
-+ Add `.dockerignore` support
-+ Pause containers during `docker commit`
-+ Add `--tail` to `docker logs`
-
-#### Builder
-+ Allow a tar file as context for `docker build`
-* Fix issue with white-spaces and multi-lines in `Dockerfiles`
-
-#### Runtime
-* Overall performance improvements
-* Allow `/` as source of `docker run -v`
-* Fix port allocation
-* Fix bug in `docker save`
-* Add links information to `docker inspect`
-
-#### Client
-* Improve command line parsing for `docker commit`
-
-#### Remote API
-* Improve status code for the `start` and `stop` endpoints
-
-## 1.0.1 (2014-06-19)
-
-#### Notable features since 1.0.0
-* Enhance security for the LXC driver
-
-#### Builder
-* Fix `ONBUILD` instruction passed to grandchildren
-
-#### Runtime
-* Fix events subscription
-* Fix /etc/hostname file with host networking
-* Allow `-h` and `--net=none`
-* Fix issue with hotplug devices in `--privileged`
-
-#### Client
-* Fix artifacts with events
-* Fix a panic with empty flags
-* Fix `docker cp` on Mac OS X
-
-#### Miscellaneous
-* Fix compilation on Mac OS X
-* Fix several races
-
-## 1.0.0 (2014-06-09)
-
-#### Notable features since 0.12.0
-* Production support
-
-## 0.12.0 (2014-06-05)
-
-#### Notable features since 0.11.0
-* 40+ various improvements to stability, performance and usability
-* New `COPY` Dockerfile instruction to allow copying a local file from the context into the container without ever extracting if the file is a tar file
-* Inherit file permissions from the host on `ADD`
-* New `pause` and `unpause` commands to allow pausing and unpausing of containers using cgroup freezer
-* The `images` command has a `-f`/`--filter` option to filter the list of images
-* Add `--force-rm` to clean up after a failed build
-* Standardize JSON keys in Remote API to CamelCase
-* Pull from a docker run now assumes `latest` tag if not specified
-* Enhance security on Linux capabilities and device nodes
-
-## 0.11.1 (2014-05-07)
-
-#### Registry
-- Fix push and pull to private registry
-
-## 0.11.0 (2014-05-07)
-
-#### Notable features since 0.10.0
-
-* SELinux support for mount and process labels
-* Linked containers can be accessed by hostname
-* Use the net `--net` flag to allow advanced network configuration such as host networking so that containers can use the host's network interfaces
-* Add a ping endpoint to the Remote API to do healthchecks of your docker daemon
-* Logs can now be returned with an optional timestamp
-* Docker now works with registries that support SHA-512
-* Multiple registry endpoints are supported to allow registry mirrors
-
-## 0.10.0 (2014-04-08)
-
-#### Builder
-- Fix printing multiple messages on a single line. Fixes broken output during builds.
-- Follow symlinks inside container's root for ADD build instructions.
-- Fix EXPOSE caching.
-
-#### Documentation
-- Add the new options of `docker ps` to the documentation.
-- Add the options of `docker restart` to the documentation.
-- Update daemon docs and help messages for --iptables and --ip-forward.
-- Updated apt-cacher-ng docs example.
-- Remove duplicate description of --mtu from docs.
-- Add missing -t and -v for `docker images` to the docs.
-- Add fixes to the cli docs.
-- Update libcontainer docs.
-- Update images in docs to remove references to AUFS and LXC.
-- Update the nodejs_web_app in the docs to use the new epel RPM address.
-- Fix external link on security of containers.
-- Update remote API docs.
-- Add image size to history docs.
-- Be explicit about binding to all interfaces in redis example.
-- Document DisableNetwork flag in the 1.10 remote api.
-- Document that `--lxc-conf` is lxc only.
-- Add chef usage documentation.
-- Add example for an image with multiple for `docker load`.
-- Explain what `docker run -a` does in the docs.
-
-#### Contrib
-- Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile.
-- Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly.
-- Remove inotifywait hack from the upstart host-integration example because it's not necessary any more.
-- Add check-config script to contrib.
-- Fix fish shell completion.
-
-#### Hack
-* Clean up "go test" output from "make test" to be much more readable/scannable.
-* Exclude more "definitely not unit tested Go source code" directories from hack/make/test.
-+ Generate md5 and sha256 hashes when building, and upload them via hack/release.sh.
-- Include contributed completions in Ubuntu PPA.
-+ Add cli integration tests.
-* Add tweaks to the hack scripts to make them simpler.
-
-#### Remote API
-+ Add TLS auth support for API.
-* Move git clone from daemon to client.
-- Fix content-type detection in docker cp.
-* Split API into 2 go packages.
-
-#### Runtime
-* Support hairpin NAT without going through Docker server.
-- devicemapper: succeed immediately when removing non-existent devices.
-- devicemapper: improve handling of devicemapper devices (add per device lock, increase sleep time and unlock while sleeping).
-- devicemapper: increase timeout in waitClose to 10 seconds.
-- devicemapper: ensure we shut down thin pool cleanly.
-- devicemapper: pass info, rather than hash to activateDeviceIfNeeded, deactivateDevice, setInitialized, deleteDevice.
-- devicemapper: avoid AB-BA deadlock.
-- devicemapper: make shutdown better/faster.
-- improve alpha sorting in mflag.
-- Remove manual http cookie management because the cookiejar is being used.
-- Use BSD raw mode on Darwin. Fixes nano, tmux and others.
-- Add FreeBSD support for the client.
-- Merge auth package into registry.
-- Add deprecation warning for -t on `docker pull`.
-- Remove goroutine leak on error.
-- Update parseLxcInfo to comply with new lxc1.0 format.
-- Fix attach exit on darwin.
-- Improve deprecation message.
-- Retry to retrieve the layer metadata up to 5 times for `docker pull`.
-- Only unshare the mount namespace for execin.
-- Merge existing config when committing.
-- Disable daemon startup timeout.
-- Fix issue #4681: add loopback interface when networking is disabled.
-- Add failing test case for issue #4681.
-- Send SIGTERM to child, instead of SIGKILL.
-- Show the driver and the kernel version in `docker info` even when not in debug mode.
-- Always symlink /dev/ptmx for libcontainer. This fixes console related problems.
-- Fix issue caused by the absence of /etc/apparmor.d.
-- Don't leave empty cidFile behind when failing to create the container.
-- Mount cgroups automatically if they're not mounted already.
-- Use mock for search tests.
-- Update to double-dash everywhere.
-- Move .dockerenv parsing to lxc driver.
-- Move all bind-mounts in the container inside the namespace.
-- Don't use separate bind mount for container.
-- Always symlink /dev/ptmx for libcontainer.
-- Don't kill by pid for other drivers.
-- Add initial logging to libcontainer.
-* Sort by port in `docker ps`.
-- Move networking drivers into runtime top level package.
-+ Add --no-prune to `docker rmi`.
-+ Add time since exit in `docker ps`.
-- graphdriver: add build tags.
-- Prevent allocation of previously allocated ports & prevent improve port allocation.
-* Add support for --since/--before in `docker ps`.
-- Clean up container stop.
-+ Add support for configurable dns search domains.
-- Add support for relative WORKDIR instructions.
-- Add --output flag for docker save.
-- Remove duplication of DNS entries in config merging.
-- Add cpuset.cpus to cgroups and native driver options.
-- Remove docker-ci.
-- Promote btrfs. btrfs is no longer considered experimental.
-- Add --input flag to `docker load`.
-- Return error when existing bridge doesn't match IP address.
-- Strip comments before parsing line continuations to avoid interpreting instructions as comments.
-- Fix TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces.
-- Add systemd implementation of cgroups and make containers show up as systemd units.
-- Fix commit and import when no repository is specified.
-- Remount /var/lib/docker as --private to fix scaling issue.
-- Use the environment's proxy when pinging the remote registry.
-- Reduce error level from harmless errors.
-* Allow --volumes-from to be individual files.
-- Fix expanding buffer in StdCopy.
-- Set error regardless of attach or stdin. This fixes #3364.
-- Add support for --env-file to load environment variables from files.
-- Symlink /etc/mtab and /proc/mounts.
-- Allow pushing a single tag.
-- Shut down containers cleanly at shutdown and wait forever for the containers to shut down. This makes container shutdown on daemon shutdown work properly via SIGTERM.
-- Don't throw error when starting an already running container.
-- Fix dynamic port allocation limit.
-- remove setupDev from libcontainer.
-- Add API version to `docker version`.
-- Return correct exit code when receiving signal and make SIGQUIT quit without cleanup.
-- Fix --volumes-from mount failure.
-- Allow non-privileged containers to create device nodes.
-- Skip login tests because of external dependency on a hosted service.
-- Deprecate `docker images --tree` and `docker images --viz`.
-- Deprecate `docker insert`.
-- Include base abstraction for apparmor. This fixes some apparmor related problems on Ubuntu 14.04.
-- Add specific error message when hitting 401 over HTTP on push.
-- Fix absolute volume check.
-- Remove volumes-from from the config.
-- Move DNS options to hostconfig.
-- Update the apparmor profile for libcontainer.
-- Add deprecation notice for `docker commit -run`.
-
-## 0.9.1 (2014-03-24)
-
-#### Builder
-- Fix printing multiple messages on a single line. Fixes broken output during builds.
-
-#### Documentation
-- Fix external link on security of containers.
-
-#### Contrib
-- Fix init script cgroup mounting workarounds to be more similar to cgroupfs-mount and thus work properly.
-- Add variable for DOCKER_LOGFILE to sysvinit and use append instead of overwrite in opening the logfile.
-
-#### Hack
-- Generate md5 and sha256 hashes when building, and upload them via hack/release.sh.
-
-#### Remote API
-- Fix content-type detection in `docker cp`.
-
-#### Runtime
-- Use BSD raw mode on Darwin. Fixes nano, tmux and others.
-- Only unshare the mount namespace for execin.
-- Retry to retrieve the layer metadata up to 5 times for `docker pull`.
-- Merge existing config when committing.
-- Fix panic in monitor.
-- Disable daemon startup timeout.
-- Fix issue #4681: add loopback interface when networking is disabled.
-- Add failing test case for issue #4681.
-- Send SIGTERM to child, instead of SIGKILL.
-- Show the driver and the kernel version in `docker info` even when not in debug mode.
-- Always symlink /dev/ptmx for libcontainer. This fixes console related problems.
-- Fix issue caused by the absence of /etc/apparmor.d.
-- Don't leave empty cidFile behind when failing to create the container.
-- Improve deprecation message.
-- Fix attach exit on darwin.
-- devicemapper: improve handling of devicemapper devices (add per device lock, increase sleep time, unlock while sleeping).
-- devicemapper: succeed immediately when removing non-existent devices.
-- devicemapper: increase timeout in waitClose to 10 seconds.
-- Remove goroutine leak on error.
-- Update parseLxcInfo to comply with new lxc1.0 format.
-
-## 0.9.0 (2014-03-10)
-
-#### Builder
-- Avoid extra mount/unmount during build. This fixes mount/unmount related errors during build.
-- Add error to docker build --rm. This adds missing error handling.
-- Forbid chained onbuild, `onbuild from` and  `onbuild maintainer` triggers.
-- Make `--rm` the default for `docker build`.
-
-#### Documentation
-- Download the docker client binary for Mac over https.
-- Update the titles of the install instructions & descriptions.
-* Add instructions for upgrading boot2docker.
-* Add port forwarding example in OS X install docs.
-- Attempt to disentangle repository and registry.
-- Update docs to explain more about `docker ps`.
-- Update sshd example to use a Dockerfile.
-- Rework some examples, including the Python examples.
-- Update docs to include instructions for a container's lifecycle.
-- Update docs documentation to discuss the docs branch.
-- Don't skip cert check for an example & use HTTPS.
-- Bring back the memory and swap accounting section which was lost when the kernel page was removed.
-- Explain DNS warnings and how to fix them on systems running and using a local nameserver.
-
-#### Contrib
-- Add Tanglu support for mkimage-debootstrap.
-- Add SteamOS support for mkimage-debootstrap.
-
-#### Hack
-- Get package coverage when running integration tests.
-- Remove the Vagrantfile. This is being replaced with boot2docker.
-- Fix tests on systems where aufs isn't available.
-- Update packaging instructions and remove the dependency on lxc.
-
-#### Remote API
-* Move code specific to the API to the api package.
-- Fix header content type for the API. Makes all endpoints use proper content type.
-- Fix registry auth & remove ping calls from CmdPush and CmdPull.
-- Add newlines to the JSON stream functions.
-
-#### Runtime
-* Do not ping the registry from the CLI. All requests to registries flow through the daemon.
-- Check for nil information return in the lxc driver. This fixes panics with older lxc versions.
-- Devicemapper: cleanups and fix for unmount. Fixes two problems which were causing unmount to fail intermittently.
-- Devicemapper: remove directory when removing device. Directories don't get left behind when removing the device.
-* Devicemapper: enable skip_block_zeroing. Improves performance by not zeroing blocks.
-- Devicemapper: fix shutdown warnings. Fixes shutdown warnings concerning pool device removal.
-- Ensure docker cp stream is closed properly. Fixes problems with files not being copied by `docker cp`.
-- Stop making `tcp://` default to `127.0.0.1:4243` and remove the default port for tcp.
-- Fix `--run` in `docker commit`. This makes `docker commit --run` work again.
-- Fix custom bridge related options. This makes custom bridges work again.
-+ Mount-bind the PTY as container console. This allows tmux/screen to run.
-+ Add the pure Go libcontainer library to make it possible to run containers using only features of the Linux kernel.
-+ Add native exec driver which uses libcontainer and make it the default exec driver.
-- Add support for handling extended attributes in archives.
-* Set the container MTU to be the same as the host MTU.
-+ Add simple sha256 checksums for layers to speed up `docker push`.
-* Improve kernel version parsing.
-* Allow flag grouping (`docker run -it`).
-- Remove chroot exec driver.
-- Fix divide by zero to fix panic.
-- Rewrite `docker rmi`.
-- Fix docker info with lxc 1.0.0.
-- Fix fedora tty with apparmor.
-* Don't always append env vars, replace defaults with vars from config.
-* Fix a goroutine leak.
-* Switch to Go 1.2.1.
-- Fix unique constraint error checks.
-* Handle symlinks for Docker's data directory and for TMPDIR.
-- Add deprecation warnings for flags (-flag is deprecated in favor of --flag)
-- Add apparmor profile for the native execution driver.
-* Move system specific code from archive to pkg/system.
-- Fix duplicate signal for `docker run -i -t` (issue #3336).
-- Return correct process pid for lxc.
-- Add a -G option to specify the group which unix sockets belong to.
-+ Add `-f` flag to `docker rm` to force removal of running containers.
-+ Kill ghost containers and restart all ghost containers when the docker daemon restarts.
-+ Add `DOCKER_RAMDISK` environment variable to make Docker work when the root is on a ramdisk.
-
-## 0.8.1 (2014-02-18)
-
-#### Builder
-
-- Avoid extra mount/unmount during build. This removes an unneeded mount/unmount operation which was causing problems with devicemapper
-- Fix regression with ADD of tar files. This stops Docker from decompressing tarballs added via ADD from the local file system
-- Add error to `docker build --rm`. This adds a missing error check to ensure failures to remove containers are detected and reported
-
-#### Documentation
-
-* Update issue filing instructions
-* Warn against the use of symlinks for Docker's storage folder
-* Replace the Firefox example with an IceWeasel example
-* Rewrite the PostgreSQL example using a Dockerfile and add more details to it
-* Improve the OS X documentation
-
-#### Remote API
-
-- Fix broken images API for version less than 1.7
-- Use the right encoding for all API endpoints which return JSON
-- Move remote api client to api/
-- Queue calls to the API using generic socket wait
-
-#### Runtime
-
-- Fix the use of custom settings for bridges and custom bridges
-- Refactor the devicemapper code to avoid many mount/unmount race conditions and failures
-- Remove two panics which could make Docker crash in some situations
-- Don't ping registry from the CLI client
-- Enable skip_block_zeroing for devicemapper. This stops devicemapper from always zeroing entire blocks
-- Fix --run in `docker commit`. This makes docker commit store `--run` in the image configuration
-- Remove directory when removing devicemapper device. This cleans up leftover mount directories
-- Drop NET_ADMIN capability for non-privileged containers. Unprivileged containers can't change their network configuration
-- Ensure `docker cp` stream is closed properly
-- Avoid extra mount/unmount during container registration. This removes an unneeded mount/unmount operation which was causing problems with devicemapper
-- Stop allowing tcp:// as a default tcp bin address which binds to 127.0.0.1:4243 and remove the default port
-+ Mount-bind the PTY as container console. This allows tmux and screen to run in a container
-- Clean up archive closing. This fixes and improves archive handling
-- Fix engine tests on systems where temp directories are symlinked
-- Add test methods for save and load
-- Avoid temporarily unmounting the container when restarting it. This fixes a race for devicemapper during restart
-- Support submodules when building from a GitHub repository
-- Quote volume path to allow spaces
-- Fix remote tar ADD behavior. This fixes a regression which was causing Docker to extract tarballs
-
-## 0.8.0 (2014-02-04)
-
-#### Notable features since 0.7.0
-
-* Images and containers can be removed much faster
-* Building an image from source with docker build is now much faster
-* The Docker daemon starts and stops much faster
-* The memory footprint of many common operations has been reduced, by streaming files instead of buffering them in memory, fixing memory leaks, and fixing various suboptimal memory allocations
-* Several race conditions were fixed, making Docker more stable under very high concurrency load. This makes Docker more stable and less likely to crash and reduces the memory footprint of many common operations
-* All packaging operations are now built on the Go language’s standard tar implementation, which is bundled with Docker itself. This makes packaging more portable across host distributions, and solves several issues caused by quirks and incompatibilities between different distributions of tar
-* Docker can now create, remove and modify larger numbers of containers and images graciously thanks to more aggressive releasing of system resources. For example the storage driver API now allows Docker to do reference counting on mounts created by the drivers
-With the ongoing changes to the networking and execution subsystems of docker testing these areas have been a focus of the refactoring.  By moving these subsystems into separate packages we can test, analyze, and monitor coverage and quality of these packages
-* Many components have been separated into smaller sub-packages, each with a dedicated test suite. As a result the code is better-tested, more readable and easier to change
-
-* The ADD instruction now supports caching, which avoids unnecessarily re-uploading the same source content again and again when it hasn’t changed
-* The new ONBUILD instruction adds to your image a “trigger” instruction to be executed at a later time, when the image is used as the base for another build
-* Docker now ships with an experimental storage driver which uses the BTRFS filesystem for copy-on-write
-* Docker is officially supported on Mac OS X
-* The Docker daemon supports systemd socket activation
-
-## 0.7.6 (2014-01-14)
-
-#### Builder
-
-* Do not follow symlink outside of build context
-
-#### Runtime
-
-- Remount bind mounts when ro is specified
-* Use https for fetching docker version
-
-#### Other
-
-* Inline the test.docker.io fingerprint
-* Add ca-certificates to packaging documentation
-
-## 0.7.5 (2014-01-09)
-
-#### Builder
-
-* Disable compression for build. More space usage but a much faster upload
-- Fix ADD caching for certain paths
-- Do not compress archive from git build
-
-#### Documentation
-
-- Fix error in GROUP add example
-* Make sure the GPG fingerprint is inline in the documentation
-* Give more specific advice on setting up signing of commits for DCO
-
-#### Runtime
-
-- Fix misspelled container names
-- Do not add hostname when networking is disabled
-* Return most recent image from the cache by date
-- Return all errors from docker wait
-* Add Content-Type Header "application/json" to GET /version and /info responses
-
-#### Other
-
-* Update DCO to version 1.1
-+ Update Makefile to use "docker:GIT_BRANCH" as the generated image name
-* Update Travis to check for new 1.1 DCO version
-
-## 0.7.4 (2014-01-07)
-
-#### Builder
-
-- Fix ADD caching issue with . prefixed path
-- Fix docker build on devicemapper by reverting sparse file tar option
-- Fix issue with file caching and prevent wrong cache hit
-* Use same error handling while unmarshalling CMD and ENTRYPOINT
-
-#### Documentation
-
-* Simplify and streamline Amazon Quickstart
-* Install instructions use unprefixed Fedora image
-* Update instructions for mtu flag for Docker on GCE
-+ Add Ubuntu Saucy to installation
-- Fix for wrong version warning on master instead of latest
-
-#### Runtime
-
-- Only get the image's rootfs when we need to calculate the image size
-- Correctly handle unmapping UDP ports
-* Make CopyFileWithTar use a pipe instead of a buffer to save memory on docker build
-- Fix login message to say pull instead of push
-- Fix "docker load" help by removing "SOURCE" prompt and mentioning STDIN
-* Make blank -H option default to the same as no -H was sent
-* Extract cgroups utilities to own submodule
-
-#### Other
-
-+ Add Travis CI configuration to validate DCO and gofmt requirements
-+ Add Developer Certificate of Origin Text
-* Upgrade VBox Guest Additions
-* Check standalone header when pinging a registry server
-
-## 0.7.3 (2014-01-02)
-
-#### Builder
-
-+ Update ADD to use the image cache, based on a hash of the added content
-* Add error message for empty Dockerfile
-
-#### Documentation
-
-- Fix outdated link to the "Introduction" on www.docker.io
-+ Update the docs to get wider when the screen does
-- Add information about needing to install LXC when using raw binaries
-* Update Fedora documentation to disentangle the docker and docker.io conflict
-* Add a note about using the new `-mtu` flag in several GCE zones
-+ Add FrugalWare installation instructions
-+ Add a more complete example of `docker run`
-- Fix API documentation for creating and starting Privileged containers
-- Add missing "name" parameter documentation on "/containers/create"
-* Add a mention of `lxc-checkconfig` as a way to check for some of the necessary kernel configuration
-- Update the 1.8 API documentation with some additions that were added to the docs for 1.7
-
-#### Hack
-
-- Add missing libdevmapper dependency to the packagers documentation
-* Update minimum Go requirement to a hard line at Go 1.2+
-* Many minor improvements to the Vagrantfile
-+ Add ability to customize dockerinit search locations when compiling (to be used very sparingly only by packagers of platforms who require a nonstandard location)
-+ Add coverprofile generation reporting
-- Add `-a` to our Go build flags, removing the need for recompiling the stdlib manually
-* Update Dockerfile to be more canonical and have less spurious warnings during build
-- Fix some miscellaneous `docker pull` progress bar display issues
-* Migrate more miscellaneous packages under the "pkg" folder
-* Update TextMate highlighting to automatically be enabled for files named "Dockerfile"
-* Reorganize syntax highlighting files under a common "contrib/syntax" directory
-* Update install.sh script (https://get.docker.io/) to not fail if busybox fails to download or run at the end of the Ubuntu/Debian installation
-* Add support for container names in bash completion
-
-#### Packaging
-
-+ Add an official Docker client binary for Darwin (Mac OS X)
-* Remove empty "Vendor" string and added "License" on deb package
-+ Add a stubbed version of "/etc/default/docker" in the deb package
-
-#### Runtime
-
-* Update layer application to extract tars in place, avoiding file churn while handling whiteouts
-- Fix permissiveness of mtime comparisons in tar handling (since GNU tar and Go tar do not yet support sub-second mtime precision)
-* Reimplement `docker top` in pure Go to work more consistently, and even inside Docker-in-Docker (thus removing the shell injection vulnerability present in some versions of `lxc-ps`)
-+ Update `-H unix://` to work similarly to `-H tcp://` by inserting the default values for missing portions
-- Fix more edge cases regarding dockerinit and deleted or replaced docker or dockerinit files
-* Update container name validation to include '.'
-- Fix use of a symlink or non-absolute path as the argument to `-g` to work as expected
-* Update to handle external mounts outside of LXC, fixing many small mounting quirks and making future execution backends and other features simpler
-* Update to use proper box-drawing characters everywhere in `docker images -tree`
-* Move MTU setting from LXC configuration to directly use netlink
-* Add `-S` option to external tar invocation for more efficient spare file handling
-+ Add arch/os info to User-Agent string, especially for registry requests
-+ Add `-mtu` option to Docker daemon for configuring MTU
-- Fix `docker build` to exit with a non-zero exit code on error
-+ Add `DOCKER_HOST` environment variable to configure the client `-H` flag without specifying it manually for every invocation
-
-## 0.7.2 (2013-12-16)
-
-#### Runtime
-
-+ Validate container names on creation with standard regex
-* Increase maximum image depth to 127 from 42
-* Continue to move api endpoints to the job api
-+ Add -bip flag to allow specification of dynamic bridge IP via CIDR
-- Allow bridge creation when ipv6 is not enabled on certain systems
-* Set hostname and IP address from within dockerinit
-* Drop capabilities from within dockerinit
-- Fix volumes on host when symlink is present the image
-- Prevent deletion of image if ANY container is depending on it even if the container is not running
-* Update docker push to use new progress display
-* Use os.Lstat to allow mounting unix sockets when inspecting volumes
-- Adjust handling of inactive user login
-- Add missing defines in devicemapper for older kernels
-- Allow untag operations with no container validation
-- Add auth config to docker build
-
-#### Documentation
-
-* Add more information about Docker logging
-+ Add RHEL documentation
-* Add a direct example for changing the CMD that is run in a container
-* Update Arch installation documentation
-+ Add section on Trusted Builds
-+ Add Network documentation page
-
-#### Other
-
-+ Add new cover bundle for providing code coverage reporting
-* Separate integration tests in bundles
-* Make Tianon the hack maintainer
-* Update mkimage-debootstrap with more tweaks for keeping images small
-* Use https to get the install script
-* Remove vendored dotcloud/tar now that Go 1.2 has been released
-
-## 0.7.1 (2013-12-05)
-
-#### Documentation
-
-+ Add @SvenDowideit as documentation maintainer
-+ Add links example
-+ Add documentation regarding ambassador pattern
-+ Add Google Cloud Platform docs
-+ Add dockerfile best practices
-* Update doc for RHEL
-* Update doc for registry
-* Update Postgres examples
-* Update doc for Ubuntu install
-* Improve remote api doc
-
-#### Runtime
-
-+ Add hostconfig to docker inspect
-+ Implement `docker log -f` to stream logs
-+ Add env variable to disable kernel version warning
-+ Add -format to `docker inspect`
-+ Support bind-mount for files
-- Fix bridge creation on RHEL
-- Fix image size calculation
-- Make sure iptables are called even if the bridge already exists
-- Fix issue with stderr only attach
-- Remove init layer when destroying a container
-- Fix same port binding on different interfaces
-- `docker build` now returns the correct exit code
-- Fix `docker port` to display correct port
-- `docker build` now check that the dockerfile exists client side
-- `docker attach` now returns the correct exit code
-- Remove the name entry when the container does not exist
-
-#### Registry
-
-* Improve progress bars, add ETA for downloads
-* Simultaneous pulls now waits for the first to finish instead of failing
-- Tag only the top-layer image when pushing to registry
-- Fix issue with offline image transfer
-- Fix issue preventing using ':' in password for registry
-
-#### Other
-
-+ Add pprof handler for debug
-+ Create a Makefile
-* Use stdlib tar that now includes fix
-* Improve make.sh test script
-* Handle SIGQUIT on the daemon
-* Disable verbose during tests
-* Upgrade to go1.2 for official build
-* Improve unit tests
-* The test suite now runs all tests even if one fails
-* Refactor C in Go (Devmapper)
-- Fix OS X compilation
-
-## 0.7.0 (2013-11-25)
-
-#### Notable features since 0.6.0
-
-* Storage drivers: choose from aufs, device-mapper, or vfs.
-* Standard Linux support: docker now runs on unmodified Linux kernels and all major distributions.
-* Links: compose complex software stacks by connecting containers to each other.
-* Container naming: organize your containers by giving them memorable names.
-* Advanced port redirects: specify port redirects per interface, or keep sensitive ports private.
-* Offline transfer: push and pull images to the filesystem without losing information.
-* Quality: numerous bugfixes and small usability improvements. Significant increase in test coverage.
-
-## 0.6.7 (2013-11-21)
-
-#### Runtime
-
-* Improve stability, fixes some race conditions
-* Skip the volumes mounted when deleting the volumes of container.
-* Fix layer size computation: handle hard links correctly
-* Use the work Path for docker cp CONTAINER:PATH
-* Fix tmp dir never cleanup
-* Speedup docker ps
-* More informative error message on name collisions
-* Fix nameserver regex
-* Always return long id's
-* Fix container restart race condition
-* Keep published ports on docker stop;docker start
-* Fix container networking on Fedora
-* Correctly express "any address" to iptables
-* Fix network setup when reconnecting to ghost container
-* Prevent deletion if image is used by a running container
-* Lock around read operations in graph
-
-#### RemoteAPI
-
-* Return full ID on docker rmi
-
-#### Client
-
-+ Add -tree option to images
-+ Offline image transfer
-* Exit with status 2 on usage error and display usage on stderr
-* Do not forward SIGCHLD to container
-* Use string timestamp for docker events -since
-
-#### Other
-
-* Update to go 1.2rc5
-+ Add /etc/default/docker support to upstart
-
-## 0.6.6 (2013-11-06)
-
-#### Runtime
-
-* Ensure container name on register
-* Fix regression in /etc/hosts
-+ Add lock around write operations in graph
-* Check if port is valid
-* Fix restart runtime error with ghost container networking
-+ Add some more colors and animals to increase the pool of generated names
-* Fix issues in docker inspect
-+ Escape apparmor confinement
-+ Set environment variables using a file.
-* Prevent docker insert to erase something
-+ Prevent DNS server conflicts in CreateBridgeIface
-+ Validate bind mounts on the server side
-+ Use parent image config in docker build
-* Fix regression in /etc/hosts
-
-#### Client
-
-+ Add -P flag to publish all exposed ports
-+ Add -notrunc and -q flags to docker history
-* Fix docker commit, tag and import usage
-+ Add stars, trusted builds and library flags in docker search
-* Fix docker logs with tty
-
-#### RemoteAPI
-
-* Make /events API send headers immediately
-* Do not split last column docker top
-+ Add size to history
-
-#### Other
-
-+ Contrib: Desktop integration. Firefox usecase.
-+ Dockerfile: bump to go1.2rc3
-
-## 0.6.5 (2013-10-29)
-
-#### Runtime
-
-+ Containers can now be named
-+ Containers can now be linked together for service discovery
-+ 'run -a', 'start -a' and 'attach' can forward signals to the container for better integration with process supervisors
-+ Automatically start crashed containers after a reboot
-+ Expose IP, port, and proto as separate environment vars for container links
-* Allow ports to be published to specific ips
-* Prohibit inter-container communication by default
-- Ignore ErrClosedPipe for stdin in Container.Attach
-- Remove unused field kernelVersion
-* Fix issue when mounting subdirectories of /mnt in container
-- Fix untag during removal of images
-* Check return value of syscall.Chdir when changing working directory inside dockerinit
-
-#### Client
-
-- Only pass stdin to hijack when needed to avoid closed pipe errors
-* Use less reflection in command-line method invocation
-- Monitor the tty size after starting the container, not prior
-- Remove useless os.Exit() calls after log.Fatal
-
-#### Hack
-
-+ Add initial init scripts library and a safer Ubuntu packaging script that works for Debian
-* Add -p option to invoke debootstrap with http_proxy
-- Update install.sh with $sh_c to get sudo/su for modprobe
-* Update all the mkimage scripts to use --numeric-owner as a tar argument
-* Update hack/release.sh process to automatically invoke hack/make.sh and bail on build and test issues
-
-#### Other
-
-* Documentation: Fix the flags for nc in example
-* Testing: Remove warnings and prevent mount issues
-- Testing: Change logic for tty resize to avoid warning in tests
-- Builder: Fix race condition in docker build with verbose output
-- Registry: Fix content-type for PushImageJSONIndex method
-* Contrib: Improve helper tools to generate debian and Arch linux server images
-
-## 0.6.4 (2013-10-16)
-
-#### Runtime
-
-- Add cleanup of container when Start() fails
-* Add better comments to utils/stdcopy.go
-* Add utils.Errorf for error logging
-+ Add -rm to docker run for removing a container on exit
-- Remove error messages which are not actually errors
-- Fix `docker rm` with volumes
-- Fix some error cases where an HTTP body might not be closed
-- Fix panic with wrong dockercfg file
-- Fix the attach behavior with -i
-* Record termination time in state.
-- Use empty string so TempDir uses the OS's temp dir automatically
-- Make sure to close the network allocators
-+ Autorestart containers by default
-* Bump vendor kr/pty to commit 3b1f6487b `(syscall.O_NOCTTY)`
-* lxc: Allow set_file_cap capability in container
-- Move run -rm to the cli only
-* Split stdout stderr
-* Always create a new session for the container
-
-#### Testing
-
-- Add aggregated docker-ci email report
-- Add cleanup to remove leftover containers
-* Add nightly release to docker-ci
-* Add more tests around auth.ResolveAuthConfig
-- Remove a few errors in tests
-- Catch errClosing error when TCP and UDP proxies are terminated
-* Only run certain tests with TESTFLAGS='-run TestName' make.sh
-* Prevent docker-ci to test closing PRs
-* Replace panic by log.Fatal in tests
-- Increase TestRunDetach timeout
-
-#### Documentation
-
-* Add initial draft of the Docker infrastructure doc
-* Add devenvironment link to CONTRIBUTING.md
-* Add `apt-get install curl` to Ubuntu docs
-* Add explanation for export restrictions
-* Add .dockercfg doc
-* Remove Gentoo install notes about #1422 workaround
-* Fix help text for -v option
-* Fix Ping endpoint documentation
-- Fix parameter names in docs for ADD command
-- Fix ironic typo in changelog
-* Various command fixes in postgres example
-* Document how to edit and release docs
-- Minor updates to `postgresql_service.rst`
-* Clarify LGTM process to contributors
-- Corrected error in the package name
-* Document what `vagrant up` is actually doing
-+ improve doc search results
-* Cleanup whitespace in API 1.5 docs
-* use angle brackets in MAINTAINER example email
-* Update archlinux.rst
-+ Changes to a new style for the docs. Includes version switcher.
-* Formatting, add information about multiline json
-* Improve registry and index REST API documentation
-- Replace deprecated upgrading reference to docker-latest.tgz, which hasn't been updated since 0.5.3
-* Update Gentoo installation documentation now that we're in the portage tree proper
-* Cleanup and reorganize docs and tooling for contributors and maintainers
-- Minor spelling correction of protocoll -> protocol
-
-#### Contrib
-
-* Add vim syntax highlighting for Dockerfiles from @honza
-* Add mkimage-arch.sh
-* Reorganize contributed completion scripts to add zsh completion
-
-#### Hack
-
-* Add vagrant user to the docker group
-* Add proper bash completion for "docker push"
-* Add xz utils as a runtime dep
-* Add cleanup/refactor portion of #2010 for hack and Dockerfile updates
-+ Add contrib/mkimage-centos.sh back (from #1621), and associated documentation link
-* Add several of the small make.sh fixes from #1920, and make the output more consistent and contributor-friendly
-+ Add @tianon to hack/MAINTAINERS
-* Improve network performance for VirtualBox
-* Revamp install.sh to be usable by more people, and to use official install methods whenever possible (apt repo, portage tree, etc.)
-- Fix contrib/mkimage-debian.sh apt caching prevention
-+ Add Dockerfile.tmLanguage to contrib
-* Configured FPM to make /etc/init/docker.conf a config file
-* Enable SSH Agent forwarding in Vagrant VM
-* Several small tweaks/fixes for contrib/mkimage-debian.sh
-
-#### Other
-
-- Builder: Abort build if mergeConfig returns an error and fix duplicate error message
-- Packaging: Remove deprecated packaging directory
-- Registry: Use correct auth config when logging in.
-- Registry: Fix the error message so it is the same as the regex
-
-## 0.6.3 (2013-09-23)
-
-#### Packaging
-
-* Add 'docker' group on install for ubuntu package
-* Update tar vendor dependency
-* Download apt key over HTTPS
-
-#### Runtime
-
-- Only copy and change permissions on non-bindmount volumes
-* Allow multiple volumes-from
-- Fix HTTP imports from STDIN
-
-#### Documentation
-
-* Update section on extracting the docker binary after build
-* Update development environment docs for new build process
-* Remove 'base' image from documentation
-
-#### Other
-
-- Client: Fix detach issue
-- Registry: Update regular expression to match index
-
-## 0.6.2 (2013-09-17)
-
-#### Runtime
-
-+ Add domainname support
-+ Implement image filtering with path.Match
-* Remove unnecessary warnings
-* Remove os/user dependency
-* Only mount the hostname file when the config exists
-* Handle signals within the `docker login` command
-- UID and GID are now also applied to volumes
-- `docker start` set error code upon error
-- `docker run` set the same error code as the process started
-
-#### Builder
-
-+ Add -rm option in order to remove intermediate containers
-* Allow multiline for the RUN instruction
-
-#### Registry
-
-* Implement login with private registry
-- Fix push issues
-
-#### Other
-
-+ Hack: Vendor all dependencies
-* Remote API: Bump to v1.5
-* Packaging: Break down hack/make.sh into small scripts, one per 'bundle': test, binary, ubuntu etc.
-* Documentation: General improvements
-
-## 0.6.1 (2013-08-23)
-
-#### Registry
-
-* Pass "meta" headers in API calls to the registry
-
-#### Packaging
-
-- Use correct upstart script with new build tool
-- Use libffi-dev, don`t build it from sources
-- Remove duplicate mercurial install command
-
-## 0.6.0 (2013-08-22)
-
-#### Runtime
-
-+ Add lxc-conf flag to allow custom lxc options
-+ Add an option to set the working directory
-* Add Image name to LogEvent tests
-+ Add -privileged flag and relevant tests, docs, and examples
-* Add websocket support to /container/<name>/attach/ws
-* Add warning when net.ipv4.ip_forwarding = 0
-* Add hostname to environment
-* Add last stable version in `docker version`
-- Fix race conditions in parallel pull
-- Fix Graph ByParent() to generate list of child images per parent image.
-- Fix typo: fmt.Sprint -> fmt.Sprintf
-- Fix small \n error un docker build
-* Fix to "Inject dockerinit at /.dockerinit"
-* Fix #910. print user name to docker info output
-* Use Go 1.1.2 for dockerbuilder
-* Use ranged for loop on channels
-- Use utils.ParseRepositoryTag instead of strings.Split(name, ":") in server.ImageDelete
-- Improve CMD, ENTRYPOINT, and attach docs.
-- Improve connect message with socket error
-- Load authConfig only when needed and fix useless WARNING
-- Show tag used when image is missing
-* Apply volumes-from before creating volumes
-- Make docker run handle SIGINT/SIGTERM
-- Prevent crash when .dockercfg not readable
-- Install script should be fetched over https, not http.
-* API, issue 1471: Use groups for socket permissions
-- Correctly detect IPv4 forwarding
-* Mount /dev/shm as a tmpfs
-- Switch from http to https for get.docker.io
-* Let userland proxy handle container-bound traffic
-* Update the Docker CLI to specify a value for the "Host" header.
-- Change network range to avoid conflict with EC2 DNS
-- Reduce connect and read timeout when pinging the registry
-* Parallel pull
-- Handle ip route showing mask-less IP addresses
-* Allow ENTRYPOINT without CMD
-- Always consider localhost as a domain name when parsing the FQN repos name
-* Refactor checksum
-
-#### Documentation
-
-* Add MongoDB image example
-* Add instructions for creating and using the docker group
-* Add sudo to examples and installation to documentation
-* Add ufw doc
-* Add a reference to ps -a
-* Add information about Docker`s high level tools over LXC.
-* Fix typo in docs for docker run -dns
-* Fix a typo in the ubuntu installation guide
-* Fix to docs regarding adding docker groups
-* Update default -H docs
-* Update readme with dependencies for building
-* Update amazon.rst to explain that Vagrant is not necessary for running Docker on ec2
-* PostgreSQL service example in documentation
-* Suggest installing linux-headers by default.
-* Change the twitter handle
-* Clarify Amazon EC2 installation
-* 'Base' image is deprecated and should no longer be referenced in the docs.
-* Move note about officially supported kernel
-- Solved the logo being squished in Safari
-
-#### Builder
-
-+ Add USER instruction do Dockerfile
-+ Add workdir support for the Buildfile
-* Add no cache for docker build
-- Fix docker build and docker events output
-- Only count known instructions as build steps
-- Make sure ENV instruction within build perform a commit each time
-- Forbid certain paths within docker build ADD
-- Repository name (and optionally a tag) in build usage
-- Make sure ADD will create everything in 0755
-
-#### Remote API
-
-* Sort Images by most recent creation date.
-* Reworking opaque requests in registry module
-* Add image name in /events
-* Use mime pkg to parse Content-Type
-* 650 http utils and user agent field
-
-#### Hack
-
-+ Bash Completion: Limit commands to containers of a relevant state
-* Add docker dependencies coverage testing into docker-ci
-
-#### Packaging
-
-+ Docker-brew 0.5.2 support and memory footprint reduction
-* Add new docker dependencies into docker-ci
-- Revert "docker.upstart: avoid spawning a `sh` process"
-+ Docker-brew and Docker standard library
-+ Release docker with docker
-* Fix the upstart script generated by get.docker.io
-* Enabled the docs to generate manpages.
-* Revert Bind daemon to 0.0.0.0 in Vagrant.
-
-#### Register
-
-* Improve auth push
-* Registry unit tests + mock registry
-
-#### Tests
-
-* Improve TestKillDifferentUser to prevent timeout on buildbot
-- Fix typo in TestBindMounts (runContainer called without image)
-* Improve TestGetContainersTop so it does not rely on sleep
-* Relax the lo interface test to allow iface index != 1
-* Add registry functional test to docker-ci
-* Add some tests in server and utils
-
-#### Other
-
-* Contrib: bash completion script
-* Client: Add docker cp command and copy api endpoint to copy container files/folders to the host
-* Don`t read from stdout when only attached to stdin
-
-## 0.5.3 (2013-08-13)
-
-#### Runtime
-
-* Use docker group for socket permissions
-- Spawn shell within upstart script
-- Handle ip route showing mask-less IP addresses
-- Add hostname to environment
-
-#### Builder
-
-- Make sure ENV instruction within build perform a commit each time
-
-## 0.5.2 (2013-08-08)
-
-* Builder: Forbid certain paths within docker build ADD
-- Runtime: Change network range to avoid conflict with EC2 DNS
-* API: Change daemon to listen on unix socket by default
-
-## 0.5.1 (2013-07-30)
-
-#### Runtime
-
-+ Add `ps` args to `docker top`
-+ Add support for container ID files (pidfile like)
-+ Add container=lxc in default env
-+ Support networkless containers with `docker run -n` and `docker -d -b=none`
-* Stdout/stderr logs are now stored in the same file as JSON
-* Allocate a /16 IP range by default, with fallback to /24. Try 12 ranges instead of 3.
-* Change .dockercfg format to json and support multiple auth remote
-- Do not override volumes from config
-- Fix issue with EXPOSE override
-
-#### API
-
-+ Docker client now sets useragent (RFC 2616)
-+ Add /events endpoint
-
-#### Builder
-
-+ ADD command now understands URLs
-+ CmdAdd and CmdEnv now respect Dockerfile-set ENV variables
-- Create directories with 755 instead of 700 within ADD instruction
-
-#### Hack
-
-* Simplify unit tests with helpers
-* Improve docker.upstart event
-* Add coverage testing into docker-ci
-
-## 0.5.0 (2013-07-17)
-
-#### Runtime
-
-+ List all processes running inside a container with 'docker top'
-+ Host directories can be mounted as volumes with 'docker run -v'
-+ Containers can expose public UDP ports (eg, '-p 123/udp')
-+ Optionally specify an exact public port (eg. '-p 80:4500')
-* 'docker login' supports additional options
-- Don't save a container`s hostname when committing an image.
-
-#### Registry
-
-+ New image naming scheme inspired by Go packaging convention allows arbitrary combinations of registries
-- Fix issues when uploading images to a private registry
-
-#### Builder
-
-+ ENTRYPOINT instruction sets a default binary entry point to a container
-+ VOLUME instruction marks a part of the container as persistent data
-* 'docker build' displays the full output of a build by default
-
-## 0.4.8 (2013-07-01)
-
-+ Builder: New build operation ENTRYPOINT adds an executable entry point to the container.  - Runtime: Fix a bug which caused 'docker run -d' to no longer print the container ID.
-- Tests: Fix issues in the test suite
-
-## 0.4.7 (2013-06-28)
-
-#### Remote API
-
-* The progress bar updates faster when downloading and uploading large files
-- Fix a bug in the optional unix socket transport
-
-#### Runtime
-
-* Improve detection of kernel version
-+ Host directories can be mounted as volumes with 'docker run -b'
-- fix an issue when only attaching to stdin
-* Use 'tar --numeric-owner' to avoid uid mismatch across multiple hosts
-
-#### Hack
-
-* Improve test suite and dev environment
-* Remove dependency on unit tests on 'os/user'
-
-#### Other
-
-* Registry: easier push/pull to a custom registry
-+ Documentation: add terminology section
-
-## 0.4.6 (2013-06-22)
-
-- Runtime: fix a bug which caused creation of empty images (and volumes) to crash.
-
-## 0.4.5 (2013-06-21)
-
-+ Builder: 'docker build git://URL' fetches and builds a remote git repository
-* Runtime: 'docker ps -s' optionally prints container size
-* Tests: improved and simplified
-- Runtime: fix a regression introduced in 0.4.3 which caused the logs command to fail.
-- Builder: fix a regression when using ADD with single regular file.
-
-## 0.4.4 (2013-06-19)
-
-- Builder: fix a regression introduced in 0.4.3 which caused builds to fail on new clients.
-
-## 0.4.3 (2013-06-19)
-
-#### Builder
-
-+ ADD of a local file will detect tar archives and unpack them
-* ADD improvements: use tar for copy + automatically unpack local archives
-* ADD uses tar/untar for copies instead of calling 'cp -ar'
-* Fix the behavior of ADD to be (mostly) reverse-compatible, predictable and well-documented.
-- Fix a bug which caused builds to fail if ADD was the first command
-* Nicer output for 'docker build'
-
-#### Runtime
-
-* Remove bsdtar dependency
-* Add unix socket and multiple -H support
-* Prevent rm of running containers
-* Use go1.1 cookiejar
-- Fix issue detaching from running TTY container
-- Forbid parallel push/pull for a single image/repo. Fixes #311
-- Fix race condition within Run command when attaching.
-
-#### Client
-
-* HumanReadable ProgressBar sizes in pull
-* Fix docker version`s git commit output
-
-#### API
-
-* Send all tags on History API call
-* Add tag lookup to history command. Fixes #882
-
-#### Documentation
-
-- Fix missing command in irc bouncer example
-
-## 0.4.2 (2013-06-17)
-
-- Packaging: Bumped version to work around an Ubuntu bug
-
-## 0.4.1 (2013-06-17)
-
-#### Remote Api
-
-+ Add flag to enable cross domain requests
-+ Add images and containers sizes in docker ps and docker images
-
-#### Runtime
-
-+ Configure dns configuration host-wide with 'docker -d -dns'
-+ Detect faulty DNS configuration and replace it with a public default
-+ Allow docker run <name>:<id>
-+ You can now specify public port (ex: -p 80:4500)
-* Improve image removal to garbage-collect unreferenced parents
-
-#### Client
-
-* Allow multiple params in inspect
-* Print the container id before the hijack in `docker run`
-
-#### Registry
-
-* Add regexp check on repo`s name
-* Move auth to the client
-- Remove login check on pull
-
-#### Other
-
-* Vagrantfile: Add the rest api port to vagrantfile`s port_forward
-* Upgrade to Go 1.1
-- Builder: don`t ignore last line in Dockerfile when it doesn`t end with \n
-
-## 0.4.0 (2013-06-03)
-
-#### Builder
-
-+ Introducing Builder
-+ 'docker build' builds a container, layer by layer, from a source repository containing a Dockerfile
-
-#### Remote API
-
-+ Introducing Remote API
-+ control Docker programmatically using a simple HTTP/json API
-
-#### Runtime
-
-* Various reliability and usability improvements
-
-## 0.3.4 (2013-05-30)
-
-#### Builder
-
-+ 'docker build' builds a container, layer by layer, from a source repository containing a Dockerfile
-+ 'docker build -t FOO' applies the tag FOO to the newly built container.
-
-#### Runtime
-
-+ Interactive TTYs correctly handle window resize
-* Fix how configuration is merged between layers
-
-#### Remote API
-
-+ Split stdout and stderr on 'docker run'
-+ Optionally listen on a different IP and port (use at your own risk)
-
-#### Documentation
-
-* Improve install instructions.
-
-## 0.3.3 (2013-05-23)
-
-- Registry: Fix push regression
-- Various bugfixes
-
-## 0.3.2 (2013-05-09)
-
-#### Registry
-
-* Improve the checksum process
-* Use the size to have a good progress bar while pushing
-* Use the actual archive if it exists in order to speed up the push
-- Fix error 400 on push
-
-#### Runtime
-
-* Store the actual archive on commit
-
-## 0.3.1 (2013-05-08)
-
-#### Builder
-
-+ Implement the autorun capability within docker builder
-+ Add caching to docker builder
-+ Add support for docker builder with native API as top level command
-+ Implement ENV within docker builder
-- Check the command existence prior create and add Unit tests for the case
-* use any whitespaces instead of tabs
-
-#### Runtime
-
-+ Add go version to debug infos
-* Kernel version - don`t show the dash if flavor is empty
-
-#### Registry
-
-+ Add docker search top level command in order to search a repository
-- Fix pull for official images with specific tag
-- Fix issue when login in with a different user and trying to push
-* Improve checksum - async calculation
-
-#### Images
-
-+ Output graph of images to dot (graphviz)
-- Fix ByParent function
-
-#### Documentation
-
-+ New introduction and high-level overview
-+ Add the documentation for docker builder
-- CSS fix for docker documentation to make REST API docs look better.
-- Fix CouchDB example page header mistake
-- Fix README formatting
-* Update www.docker.io website.
-
-#### Other
-
-+ Website: new high-level overview
-- Makefile: Swap "go get" for "go get -d", especially to compile on go1.1rc
-* Packaging: packaging ubuntu; issue #510: Use goland-stable PPA package to build docker
-
-## 0.3.0 (2013-05-06)
-
-#### Runtime
-
-- Fix the command existence check
-- strings.Split may return an empty string on no match
-- Fix an index out of range crash if cgroup memory is not
-
-#### Documentation
-
-* Various improvements
-+ New example: sharing data between 2 couchdb databases
-
-#### Other
-
-* Vagrant: Use only one deb line in /etc/apt
-+ Registry: Implement the new registry
-
-## 0.2.2 (2013-05-03)
-
-+ Support for data volumes ('docker run -v=PATH')
-+ Share data volumes between containers ('docker run -volumes-from')
-+ Improve documentation
-* Upgrade to Go 1.0.3
-* Various upgrades to the dev environment for contributors
-
-## 0.2.1 (2013-05-01)
-
-+ 'docker commit -run' bundles a layer with default runtime options: command, ports etc.
-* Improve install process on Vagrant
-+ New Dockerfile operation: "maintainer"
-+ New Dockerfile operation: "expose"
-+ New Dockerfile operation: "cmd"
-+ Contrib script to build a Debian base layer
-+ 'docker -d -r': restart crashed containers at daemon startup
-* Runtime: improve test coverage
-
-## 0.2.0 (2013-04-23)
-
-- Runtime: ghost containers can be killed and waited for
-* Documentation: update install instructions
-- Packaging: fix Vagrantfile
-- Development: automate releasing binaries and ubuntu packages
-+ Add a changelog
-- Various bugfixes
-
-## 0.1.8 (2013-04-22)
-
-- Dynamically detect cgroup capabilities
-- Issue stability warning on kernels <3.8
-- 'docker push' buffers on disk instead of memory
-- Fix 'docker diff' for removed files
-- Fix 'docker stop' for ghost containers
-- Fix handling of pidfile
-- Various bugfixes and stability improvements
-
-## 0.1.7 (2013-04-18)
-
-- Container ports are available on localhost
-- 'docker ps' shows allocated TCP ports
-- Contributors can run 'make hack' to start a continuous integration VM
-- Streamline ubuntu packaging & uploading
-- Various bugfixes and stability improvements
-
-## 0.1.6 (2013-04-17)
-
-- Record the author an image with 'docker commit -author'
-
-## 0.1.5 (2013-04-17)
-
-- Disable standalone mode
-- Use a custom DNS resolver with 'docker -d -dns'
-- Detect ghost containers
-- Improve diagnosis of missing system capabilities
-- Allow disabling memory limits at compile time
-- Add debian packaging
-- Documentation: installing on Arch Linux
-- Documentation: running Redis on docker
-- Fix lxc 0.9 compatibility
-- Automatically load aufs module
-- Various bugfixes and stability improvements
-
-## 0.1.4 (2013-04-09)
-
-- Full support for TTY emulation
-- Detach from a TTY session with the escape sequence `C-p C-q`
-- Various bugfixes and stability improvements
-- Minor UI improvements
-- Automatically create our own bridge interface 'docker0'
-
-## 0.1.3 (2013-04-04)
-
-- Choose TCP frontend port with '-p :PORT'
-- Layer format is versioned
-- Major reliability improvements to the process manager
-- Various bugfixes and stability improvements
-
-## 0.1.2 (2013-04-03)
-
-- Set container hostname with 'docker run -h'
-- Selective attach at run with 'docker run -a [stdin[,stdout[,stderr]]]'
-- Various bugfixes and stability improvements
-- UI polish
-- Progress bar on push/pull
-- Use XZ compression by default
-- Make IP allocator lazy
-
-## 0.1.1 (2013-03-31)
-
-- Display shorthand IDs for convenience
-- Stabilize process management
-- Layers can include a commit message
-- Simplified 'docker attach'
-- Fix support for re-attaching
-- Various bugfixes and stability improvements
-- Auto-download at run
-- Auto-login on push
-- Beefed up documentation
-
-## 0.1.0 (2013-03-23)
-
-Initial public release
-
-- Implement registry in order to push/pull images
-- TCP port allocation
-- Fix termcaps on Linux
-- Add documentation
-- Add Vagrant support with Vagrantfile
-- Add unit tests
-- Add repository/tags to ease image management
-- Improve the layer implementation
diff --git a/installer/vendor/github.com/docker/docker/CONTRIBUTING.md b/installer/vendor/github.com/docker/docker/CONTRIBUTING.md
deleted file mode 100644
index eb5f8ab0e9..0000000000
--- a/installer/vendor/github.com/docker/docker/CONTRIBUTING.md
+++ /dev/null
@@ -1,401 +0,0 @@
-# Contributing to Docker
-
-Want to hack on Docker? Awesome!  We have a contributor's guide that explains
-[setting up a Docker development environment and the contribution
-process](https://docs.docker.com/opensource/project/who-written-for/). 
-
-[![Contributors guide](docs/static_files/contributors.png)](https://docs.docker.com/opensource/project/who-written-for/)
-
-This page contains information about reporting issues as well as some tips and
-guidelines useful to experienced open source contributors. Finally, make sure
-you read our [community guidelines](#docker-community-guidelines) before you
-start participating.
-
-## Topics
-
-* [Reporting Security Issues](#reporting-security-issues)
-* [Design and Cleanup Proposals](#design-and-cleanup-proposals)
-* [Reporting Issues](#reporting-other-issues)
-* [Quick Contribution Tips and Guidelines](#quick-contribution-tips-and-guidelines)
-* [Community Guidelines](#docker-community-guidelines)
-
-## Reporting security issues
-
-The Docker maintainers take security seriously. If you discover a security
-issue, please bring it to their attention right away!
-
-Please **DO NOT** file a public issue, instead send your report privately to
-[security@docker.com](mailto:security@docker.com).
-
-Security reports are greatly appreciated and we will publicly thank you for it.
-We also like to send gifts&mdash;if you're into Docker schwag, make sure to let
-us know. We currently do not offer a paid security bounty program, but are not
-ruling it out in the future.
-
-
-## Reporting other issues
-
-A great way to contribute to the project is to send a detailed report when you
-encounter an issue. We always appreciate a well-written, thorough bug report,
-and will thank you for it!
-
-Check that [our issue database](https://github.com/docker/docker/issues)
-doesn't already include that problem or suggestion before submitting an issue.
-If you find a match, you can use the "subscribe" button to get notified on
-updates. Do *not* leave random "+1" or "I have this too" comments, as they
-only clutter the discussion, and don't help resolving it. However, if you
-have ways to reproduce the issue or have additional information that may help
-resolving the issue, please leave a comment.
-
-When reporting issues, always include:
-
-* The output of `docker version`.
-* The output of `docker info`.
-
-Also include the steps required to reproduce the problem if possible and
-applicable. This information will help us review and fix your issue faster.
-When sending lengthy log-files, consider posting them as a gist (https://gist.github.com).
-Don't forget to remove sensitive data from your logfiles before posting (you can
-replace those parts with "REDACTED").
-
-## Quick contribution tips and guidelines
-
-This section gives the experienced contributor some tips and guidelines.
-
-### Pull requests are always welcome
-
-Not sure if that typo is worth a pull request? Found a bug and know how to fix
-it? Do it! We will appreciate it. Any significant improvement should be
-documented as [a GitHub issue](https://github.com/docker/docker/issues) before
-anybody starts working on it.
-
-We are always thrilled to receive pull requests. We do our best to process them
-quickly. If your pull request is not accepted on the first try,
-don't get discouraged! Our contributor's guide explains [the review process we
-use for simple changes](https://docs.docker.com/opensource/workflow/make-a-contribution/).
-
-### Design and cleanup proposals
-
-You can propose new designs for existing Docker features. You can also design
-entirely new features. We really appreciate contributors who want to refactor or
-otherwise cleanup our project. For information on making these types of
-contributions, see [the advanced contribution
-section](https://docs.docker.com/opensource/workflow/advanced-contributing/) in
-the contributors guide.
-
-We try hard to keep Docker lean and focused. Docker can't do everything for
-everybody. This means that we might decide against incorporating a new feature.
-However, there might be a way to implement that feature *on top of* Docker.
-
-### Talking to other Docker users and contributors
-
-<table class="tg">
-  <col width="45%">
-  <col width="65%">
-  <tr>
-    <td>Forums</td>
-    <td>
-      A public forum for users to discuss questions and explore current design patterns and
-      best practices about Docker and related projects in the Docker Ecosystem. To participate,
-      just log in with your Docker Hub account on <a href="https://forums.docker.com" target="_blank">https://forums.docker.com</a>.
-    </td>
-  </tr>
-  <tr>
-    <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>
-    <td>
-      <p>
-        IRC a direct line to our most knowledgeable Docker users; we have
-        both the  <code>#docker</code> and <code>#docker-dev</code> group on
-        <strong>irc.freenode.net</strong>.
-        IRC is a rich chat protocol but it can overwhelm new users. You can search
-        <a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.
-      </p>
-      <p>
-        Read our <a href="https://docs.docker.com/opensource/get-help/#irc-quickstart" target="_blank">IRC quickstart guide</a>
-        for an easy way to get started.
-      </p>
-    </td>
-  </tr>
-  <tr>
-    <td>Google Group</td>
-    <td>
-      The <a href="https://groups.google.com/forum/#!forum/docker-dev" target="_blank">docker-dev</a>
-      group is for contributors and other people contributing to the Docker project.
-      You can join them without a google account by sending an email to 
-      <a href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>.
-      After receiving the join-request message, you can simply reply to that to confirm the subscription.
-    </td>
-  </tr>
-  <tr>
-    <td>Twitter</td>
-    <td>
-      You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>
-      to get updates on our products. You can also tweet us questions or just
-      share blogs or stories.
-    </td>
-  </tr>
-  <tr>
-    <td>Stack Overflow</td>
-    <td>
-      Stack Overflow has over 17000 Docker questions listed. We regularly
-      monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>
-      and so do many other knowledgeable Docker users.
-    </td>
-  </tr>
-</table>
-
-
-### Conventions
-
-Fork the repository and make changes on your fork in a feature branch:
-
-- If it's a bug fix branch, name it XXXX-something where XXXX is the number of
-	the issue. 
-- If it's a feature branch, create an enhancement issue to announce
-	your intentions, and name it XXXX-something where XXXX is the number of the
-	issue.
-
-Submit unit tests for your changes. Go has a great test framework built in; use
-it! Take a look at existing tests for inspiration. [Run the full test
-suite](https://docs.docker.com/opensource/project/test-and-docs/) on your branch before
-submitting a pull request.
-
-Update the documentation when creating or modifying features. Test your
-documentation changes for clarity, concision, and correctness, as well as a
-clean documentation build. See our contributors guide for [our style
-guide](https://docs.docker.com/opensource/doc-style) and instructions on [building
-the documentation](https://docs.docker.com/opensource/project/test-and-docs/#build-and-test-the-documentation).
-
-Write clean code. Universally formatted code promotes ease of writing, reading,
-and maintenance. Always run `gofmt -s -w file.go` on each changed file before
-committing your changes. Most editors have plug-ins that do this automatically.
-
-Pull request descriptions should be as clear as possible and include a reference
-to all the issues that they address.
-
-Commit messages must start with a capitalized and short summary (max. 50 chars)
-written in the imperative, followed by an optional, more detailed explanatory
-text which is separated from the summary by an empty line.
-
-Code review comments may be added to your pull request. Discuss, then make the
-suggested modifications and push additional commits to your feature branch. Post
-a comment after pushing. New commits show up in the pull request automatically,
-but the reviewers are notified only when you comment.
-
-Pull requests must be cleanly rebased on top of master without multiple branches
-mixed into the PR.
-
-**Git tip**: If your PR no longer merges cleanly, use `rebase master` in your
-feature branch to update your pull request rather than `merge master`.
-
-Before you make a pull request, squash your commits into logical units of work
-using `git rebase -i` and `git push -f`. A logical unit of work is a consistent
-set of patches that should be reviewed together: for example, upgrading the
-version of a vendored dependency and taking advantage of its now available new
-feature constitute two separate units of work. Implementing a new function and
-calling it in another file constitute a single logical unit of work. The very
-high majority of submissions should have a single commit, so if in doubt: squash
-down to one.
-
-After every commit, [make sure the test suite passes]
-(https://docs.docker.com/opensource/project/test-and-docs/). Include documentation
-changes in the same pull request so that a revert would remove all traces of
-the feature or fix.
-
-Include an issue reference like `Closes #XXXX` or `Fixes #XXXX` in commits that
-close an issue. Including references automatically closes the issue on a merge.
-
-Please do not add yourself to the `AUTHORS` file, as it is regenerated regularly
-from the Git history.
-
-Please see the [Coding Style](#coding-style) for further guidelines.
-
-### Merge approval
-
-Docker maintainers use LGTM (Looks Good To Me) in comments on the code review to
-indicate acceptance.
-
-A change requires LGTMs from an absolute majority of the maintainers of each
-component affected. For example, if a change affects `docs/` and `registry/`, it
-needs an absolute majority from the maintainers of `docs/` AND, separately, an
-absolute majority of the maintainers of `registry/`.
-
-For more details, see the [MAINTAINERS](MAINTAINERS) page.
-
-### Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your
-signature certifies that you wrote the patch or otherwise have the right to pass
-it on as an open-source patch. The rules are pretty simple: if you can certify
-the below (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-1 Letterman Drive
-Suite D4700
-San Francisco, CA, 94129
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
-
-### How can I become a maintainer?
-
-The procedures for adding new maintainers are explained in the 
-global [MAINTAINERS](https://github.com/docker/opensource/blob/master/MAINTAINERS)
-file in the [https://github.com/docker/opensource/](https://github.com/docker/opensource/)
-repository.
-
-Don't forget: being a maintainer is a time investment. Make sure you
-will have time to make yourself available. You don't have to be a
-maintainer to make a difference on the project!
-
-## Docker community guidelines
-
-We want to keep the Docker community awesome, growing and collaborative. We need
-your help to keep it that way. To help with this we've come up with some general
-guidelines for the community as a whole:
-
-* Be nice: Be courteous, respectful and polite to fellow community members:
-  no regional, racial, gender, or other abuse will be tolerated. We like
-  nice people way better than mean ones!
-
-* Encourage diversity and participation: Make everyone in our community feel
-  welcome, regardless of their background and the extent of their
-  contributions, and do everything possible to encourage participation in
-  our community.
-
-* Keep it legal: Basically, don't get us in trouble. Share only content that
-  you own, do not share private or sensitive information, and don't break
-  the law.
-
-* Stay on topic: Make sure that you are posting to the correct channel and
-  avoid off-topic discussions. Remember when you update an issue or respond
-  to an email you are potentially sending to a large number of people. Please
-  consider this before you update. Also remember that nobody likes spam.
-
-* Don't send email to the maintainers: There's no need to send email to the
-  maintainers to ask them to investigate an issue or to take a look at a
-  pull request. Instead of sending an email, GitHub mentions should be
-  used to ping maintainers to review a pull request, a proposal or an
-  issue.
-
-### Guideline violations — 3 strikes method
-
-The point of this section is not to find opportunities to punish people, but we
-do need a fair way to deal with people who are making our community suck.
-
-1. First occurrence: We'll give you a friendly, but public reminder that the
-   behavior is inappropriate according to our guidelines.
-
-2. Second occurrence: We will send you a private message with a warning that
-   any additional violations will result in removal from the community.
-
-3. Third occurrence: Depending on the violation, we may need to delete or ban
-   your account.
-
-**Notes:**
-
-* Obvious spammers are banned on first occurrence. If we don't do this, we'll
-  have spam all over the place.
-
-* Violations are forgiven after 6 months of good behavior, and we won't hold a
-  grudge.
-
-* People who commit minor infractions will get some education, rather than
-  hammering them in the 3 strikes process.
-
-* The rules apply equally to everyone in the community, no matter how much
-	you've contributed.
-
-* Extreme violations of a threatening, abusive, destructive or illegal nature
-	will be addressed immediately and are not subject to 3 strikes or forgiveness.
-
-* Contact abuse@docker.com to report abuse or appeal violations. In the case of
-	appeals, we know that mistakes happen, and we'll work with you to come up with a
-	fair solution if there has been a misunderstanding.
-
-## Coding Style
-
-Unless explicitly stated, we follow all coding guidelines from the Go
-community. While some of these standards may seem arbitrary, they somehow seem
-to result in a solid, consistent codebase.
-
-It is possible that the code base does not currently comply with these
-guidelines. We are not looking for a massive PR that fixes this, since that
-goes against the spirit of the guidelines. All new contributions should make a
-best effort to clean up and make the code base better than they left it.
-Obviously, apply your best judgement. Remember, the goal here is to make the
-code base easier for humans to navigate and understand. Always keep that in
-mind when nudging others to comply.
-
-The rules:
-
-1. All code should be formatted with `gofmt -s`.
-2. All code should pass the default levels of
-   [`golint`](https://github.com/golang/lint).
-3. All code should follow the guidelines covered in [Effective
-   Go](http://golang.org/doc/effective_go.html) and [Go Code Review
-   Comments](https://github.com/golang/go/wiki/CodeReviewComments).
-4. Comment the code. Tell us the why, the history and the context.
-5. Document _all_ declarations and methods, even private ones. Declare
-   expectations, caveats and anything else that may be important. If a type
-   gets exported, having the comments already there will ensure it's ready.
-6. Variable name length should be proportional to its context and no longer.
-   `noCommaALongVariableNameLikeThisIsNotMoreClearWhenASimpleCommentWouldDo`.
-   In practice, short methods will have short variable names and globals will
-   have longer names.
-7. No underscores in package names. If you need a compound name, step back,
-   and re-examine why you need a compound name. If you still think you need a
-   compound name, lose the underscore.
-8. No utils or helpers packages. If a function is not general enough to
-   warrant its own package, it has not been written generally enough to be a
-   part of a util package. Just leave it unexported and well-documented.
-9. All tests should run with `go test` and outside tooling should not be
-   required. No, we don't need another unit testing framework. Assertion
-   packages are acceptable if they provide _real_ incremental value.
-10. Even though we call these "rules" above, they are actually just
-    guidelines. Since you've read all the rules, you now know that.
-
-If you are having trouble getting into the mood of idiomatic Go, we recommend
-reading through [Effective Go](https://golang.org/doc/effective_go.html). The
-[Go Blog](https://blog.golang.org) is also a great resource. Drinking the
-kool-aid is a lot easier than going thirsty.
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile b/installer/vendor/github.com/docker/docker/Dockerfile
deleted file mode 100644
index ce2d702807..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile
+++ /dev/null
@@ -1,246 +0,0 @@
-# This file describes the standard way to build Docker, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# # Publish a release:
-# docker run --privileged \
-#  -e AWS_S3_BUCKET=baz \
-#  -e AWS_ACCESS_KEY=foo \
-#  -e AWS_SECRET_KEY=bar \
-#  -e GPG_PASSPHRASE=gloubiboulga \
-#  docker hack/release.sh
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-# Add zfs ppa
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61 \
-	|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
-RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	apparmor \
-	apt-utils \
-	aufs-tools \
-	automake \
-	bash-completion \
-	binutils-mingw-w64 \
-	bsdmainutils \
-	btrfs-tools \
-	build-essential \
-	clang \
-	cmake \
-	createrepo \
-	curl \
-	dpkg-sig \
-	gcc-mingw-w64 \
-	git \
-	iptables \
-	jq \
-	libapparmor-dev \
-	libcap-dev \
-	libltdl-dev \
-	libnl-3-dev \
-	libprotobuf-c0-dev \
-	libprotobuf-dev \
-	libsqlite3-dev \
-	libsystemd-journal-dev \
-	libtool \
-	mercurial \
-	net-tools \
-	pkg-config \
-	protobuf-compiler \
-	protobuf-c-compiler \
-	python-dev \
-	python-mock \
-	python-pip \
-	python-websocket \
-	ubuntu-zfs \
-	xfsprogs \
-	vim-common \
-	libzfs-dev \
-	tar \
-	zip \
-	--no-install-recommends \
-	&& pip install awscli==1.10.15
-# Get lvm2 source for compiling statically
-ENV LVM2_VERSION 2.02.103
-RUN mkdir -p /usr/local/lvm2 \
-	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
-		| tar -xzC /usr/local/lvm2 --strip-components=1
-# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-
-# Compile and install lvm2
-RUN cd /usr/local/lvm2 \
-	&& ./configure \
-		--build="$(gcc -print-multiarch)" \
-		--enable-static_link \
-	&& make device-mapper \
-	&& make install_device-mapper
-# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-# Configure the container for OSX cross compilation
-ENV OSX_SDK MacOSX10.11.sdk
-ENV OSX_CROSS_COMMIT a9317c18a3a457ca0a657f08cc4d0d43c6cf8953
-RUN set -x \
-	&& export OSXCROSS_PATH="/osxcross" \
-	&& git clone https://github.com/tpoechtrager/osxcross.git $OSXCROSS_PATH \
-	&& ( cd $OSXCROSS_PATH && git checkout -q $OSX_CROSS_COMMIT) \
-	&& curl -sSL https://s3.dockerproject.org/darwin/v2/${OSX_SDK}.tar.xz -o "${OSXCROSS_PATH}/tarballs/${OSX_SDK}.tar.xz" \
-	&& UNATTENDED=yes OSX_VERSION_MIN=10.6 ${OSXCROSS_PATH}/build.sh
-ENV PATH /osxcross/target/bin:$PATH
-
-# Install seccomp: the version shipped in trusty is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-	&& export SECCOMP_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-		| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-	&& ( \
-		cd "$SECCOMP_PATH" \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$SECCOMP_PATH"
-
-# Install Go
-# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
-#            will need updating, to avoid errors. Ping #docker-maintainers on IRC
-#            with a heads-up.
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
-	| tar -xzC /usr/local
-
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-# Compile Go for cross compilation
-ENV DOCKER_CROSSPLATFORMS \
-	linux/386 linux/arm \
-	darwin/amd64 \
-	freebsd/amd64 freebsd/386 freebsd/arm \
-	windows/amd64 windows/386 \
-	solaris/amd64
-
-# Dependency for golint
-ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
-	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
-
-# Grab Go's lint tool
-ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
-	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
-	&& go install -v github.com/golang/lint/golint
-
-# Install CRIU for checkpoint/restore support
-ENV CRIU_VERSION 2.2
-RUN mkdir -p /usr/src/criu \
-	&& curl -sSL https://github.com/xemul/criu/archive/v${CRIU_VERSION}.tar.gz | tar -v -C /usr/src/criu/ -xz --strip-components=1 \
-	&& cd /usr/src/criu \
-	&& make \
-	&& make install-criu
-
-# Install two versions of the registry. The first is an older version that
-# only supports schema1 manifests. The second is a newer version that supports
-# both. This allows integration-cli tests to cover push/pull with both schema1
-# and schema2 manifests.
-ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd
-ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
-	&& rm -rf "$GOPATH"
-
-# Install notary and notary-server
-ENV NOTARY_VERSION v0.4.2
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
-	&& rm -rf "$GOPATH"
-
-# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
-RUN git clone https://github.com/docker/docker-py.git /docker-py \
-	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT \
-	&& pip install -r test-requirements.txt
-
-# Install yamllint for validating swagger.yaml
-RUN pip install yamllint==1.5.0
-
-# Install go-swagger for validating swagger.yaml
-ENV GO_SWAGGER_COMMIT c28258affb0b6251755d92489ef685af8d4ff3eb
-RUN git clone https://github.com/go-swagger/go-swagger.git /go/src/github.com/go-swagger/go-swagger \
-	&& (cd /go/src/github.com/go-swagger/go-swagger && git checkout -q $GO_SWAGGER_COMMIT) \
-	&& go install -v github.com/go-swagger/go-swagger/cmd/swagger
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME /var/lib/docker
-WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-
-# Let us use a .bashrc file
-RUN ln -sfv $PWD/.bashrc ~/.bashrc
-# Add integration helps to bashrc
-RUN echo "source $PWD/hack/make/.integration-test-helpers" >> /etc/bash.bashrc
-
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
-	buildpack-deps:jessie@sha256:25785f89240fbcdd8a74bdaf30dd5599a9523882c6dfc567f2e9ef7cf6f79db6 \
-	busybox:latest@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0 \
-	debian:jessie@sha256:f968f10b4b523737e253a97eac59b0d1420b5c19b69928d35801a6373ffe330e \
-	hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
-
-# Install tomlv, vndr, runc, containerd, tini, docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy bindata
-
-# Wrap all commands in the "docker-in-docker" script to allow nested containers
-ENTRYPOINT ["hack/dind"]
-
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.aarch64 b/installer/vendor/github.com/docker/docker/Dockerfile.aarch64
deleted file mode 100644
index 6112f802f7..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.aarch64
+++ /dev/null
@@ -1,175 +0,0 @@
-# This file describes the standard way to build Docker on aarch64, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker -f Dockerfile.aarch64 .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM aarch64/ubuntu:wily
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	apparmor \
-	aufs-tools \
-	automake \
-	bash-completion \
-	btrfs-tools \
-	build-essential \
-	cmake \
-	createrepo \
-	curl \
-	dpkg-sig \
-	g++ \
-	gcc \
-	git \
-	iptables \
-	jq \
-	libapparmor-dev \
-	libc6-dev \
-	libcap-dev \
-	libltdl-dev \
-	libsqlite3-dev \
-	libsystemd-dev \
-	mercurial \
-	net-tools \
-	parallel \
-	pkg-config \
-	python-dev \
-	python-mock \
-	python-pip \
-	python-websocket \
-	gccgo \
-	iproute2 \
-	iputils-ping \
-	vim-common \
-	--no-install-recommends
-
-# Get lvm2 source for compiling statically
-ENV LVM2_VERSION 2.02.103
-RUN mkdir -p /usr/local/lvm2 \
-	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
-		| tar -xzC /usr/local/lvm2 --strip-components=1
-# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-
-# Fix platform enablement in lvm2 to support aarch64 properly
-RUN set -e \
-	&& for f in config.guess config.sub; do \
-		curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
-	done
-# "arch.c:78:2: error: #error the arch code needs to know about your machine type"
-
-# Compile and install lvm2
-RUN cd /usr/local/lvm2 \
-	&& ./configure \
-		--build="$(gcc -print-multiarch)" \
-		--enable-static_link \
-	&& make device-mapper \
-	&& make install_device-mapper
-# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-# Install seccomp: the version shipped in trusty is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-	&& export SECCOMP_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-		| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-	&& ( \
-		cd "$SECCOMP_PATH" \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$SECCOMP_PATH"
-
-# Install Go
-# We don't have official binary tarballs for ARM64, eigher for Go or bootstrap,
-# so we use gccgo as bootstrap to build Go from source code.
-# We don't use the official ARMv6 released binaries as a GOROOT_BOOTSTRAP, because
-# not all ARM64 platforms support 32-bit mode. 32-bit mode is optional for ARMv8.
-ENV GO_VERSION 1.7.5
-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \
-	&& cd /usr/src/go/src \
-	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
-
-ENV PATH /usr/src/go/bin:$PATH
-ENV GOPATH /go
-
-# Only install one version of the registry, because old version which support
-# schema1 manifests is not working on ARM64, we should skip integration-cli
-# tests for schema1 manifests on ARM64.
-ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& rm -rf "$GOPATH"
-
-# Install notary and notary-server
-ENV NOTARY_VERSION v0.4.2
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
-	&& rm -rf "$GOPATH"
-
-# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
-RUN git clone https://github.com/docker/docker-py.git /docker-py \
-	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT \
-	&& pip install -r test-requirements.txt
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME /var/lib/docker
-WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-
-# Let us use a .bashrc file
-RUN ln -sfv $PWD/.bashrc ~/.bashrc
-
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
-	aarch64/buildpack-deps:jessie@sha256:6aa1d6910791b7ac78265fd0798e5abd6cb3f27ae992f6f960f6c303ec9535f2 \
-	aarch64/busybox:latest@sha256:b23a6a37cf269dff6e46d2473b6e227afa42b037e6d23435f1d2bc40fc8c2828 \
-	aarch64/debian:jessie@sha256:4be74a41a7c70ebe887b634b11ffe516cf4fcd56864a54941e56bb49883c3170 \
-	aarch64/hello-world:latest@sha256:65a4a158587b307bb02db4de41b836addb0c35175bdc801367b1ac1ddeb9afda
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
-
-# Install tomlv, vndr, runc, containerd, tini, docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy
-
-# Wrap all commands in the "docker-in-docker" script to allow nested containers
-ENTRYPOINT ["hack/dind"]
-
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.armhf b/installer/vendor/github.com/docker/docker/Dockerfile.armhf
deleted file mode 100644
index 1aebc166b3..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.armhf
+++ /dev/null
@@ -1,182 +0,0 @@
-# This file describes the standard way to build Docker on ARMv7, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker -f Dockerfile.armhf .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM armhf/debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	apparmor \
-	aufs-tools \
-	automake \
-	bash-completion \
-	btrfs-tools \
-	build-essential \
-	createrepo \
-	curl \
-	cmake \
-	dpkg-sig \
-	git \
-	iptables \
-	jq \
-	net-tools \
-	libapparmor-dev \
-	libcap-dev \
-	libltdl-dev \
-	libsqlite3-dev \
-	libsystemd-journal-dev \
-	libtool \
-	mercurial \
-	pkg-config \
-	python-dev \
-	python-mock \
-	python-pip \
-	python-websocket \
-	xfsprogs \
-	tar \
-	vim-common \
-	--no-install-recommends \
-	&& pip install awscli==1.10.15
-
-# Get lvm2 source for compiling statically
-ENV LVM2_VERSION 2.02.103
-RUN mkdir -p /usr/local/lvm2 \
-	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
-		| tar -xzC /usr/local/lvm2 --strip-components=1
-# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-
-# Compile and install lvm2
-RUN cd /usr/local/lvm2 \
-	&& ./configure \
-		--build="$(gcc -print-multiarch)" \
-		--enable-static_link \
-	&& make device-mapper \
-	&& make install_device-mapper
-# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-# Install Go
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" \
-	| tar -xzC /usr/local
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-# We're building for armhf, which is ARMv7, so let's be explicit about that
-ENV GOARCH arm
-ENV GOARM 7
-
-# Dependency for golint
-ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
-	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
-
-# Grab Go's lint tool
-ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
-	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
-	&& go install -v github.com/golang/lint/golint
-
-# Install seccomp: the version shipped in trusty is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-	&& export SECCOMP_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-		| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-	&& ( \
-		cd "$SECCOMP_PATH" \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$SECCOMP_PATH"
-
-# Install two versions of the registry. The first is an older version that
-# only supports schema1 manifests. The second is a newer version that supports
-# both. This allows integration-cli tests to cover push/pull with both schema1
-# and schema2 manifests.
-ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd
-ENV REGISTRY_COMMIT cb08de17d74bef86ce6c5abe8b240e282f5750be
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
-	&& rm -rf "$GOPATH"
-
-# Install notary and notary-server
-ENV NOTARY_VERSION v0.4.2
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
-	&& rm -rf "$GOPATH"
-
-# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
-RUN git clone https://github.com/docker/docker-py.git /docker-py \
-	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT \
-	&& pip install -r test-requirements.txt
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME /var/lib/docker
-WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-
-# Let us use a .bashrc file
-RUN ln -sfv $PWD/.bashrc ~/.bashrc
-
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
-	armhf/buildpack-deps:jessie@sha256:ca6cce8e5bf5c952129889b5cc15cd6aa8d995d77e55e3749bbaadae50e476cb \
-	armhf/busybox:latest@sha256:d98a7343ac750ffe387e3d514f8521ba69846c216778919b01414b8617cfb3d4 \
-	armhf/debian:jessie@sha256:4a2187483f04a84f9830910fe3581d69b3c985cc045d9f01d8e2f3795b28107b \
-	armhf/hello-world:latest@sha256:161dcecea0225975b2ad5f768058212c1e0d39e8211098666ffa1ac74cfb7791
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
-
-# Install tomlv, vndr, runc, containerd, tini, docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy
-
-ENTRYPOINT ["hack/dind"]
-
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.ppc64le b/installer/vendor/github.com/docker/docker/Dockerfile.ppc64le
deleted file mode 100644
index 1f9f5006ff..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.ppc64le
+++ /dev/null
@@ -1,188 +0,0 @@
-# This file describes the standard way to build Docker on ppc64le, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker -f Dockerfile.ppc64le .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM ppc64le/debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	apparmor \
-	aufs-tools \
-	automake \
-	bash-completion \
-	btrfs-tools \
-	build-essential \
-	cmake \
-	createrepo \
-	curl \
-	dpkg-sig \
-	git \
-	iptables \
-	jq \
-	net-tools \
-	libapparmor-dev \
-	libcap-dev \
-	libltdl-dev \
-	libsqlite3-dev \
-	libsystemd-journal-dev \
-	libtool \
-	mercurial \
-	pkg-config \
-	python-dev \
-	python-mock \
-	python-pip \
-	python-websocket \
-	xfsprogs \
-	tar \
-	vim-common \
-	--no-install-recommends
-
-# Get lvm2 source for compiling statically
-ENV LVM2_VERSION 2.02.103
-RUN mkdir -p /usr/local/lvm2 \
-	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
-		| tar -xzC /usr/local/lvm2 --strip-components=1
-# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-
-# Fix platform enablement in lvm2 to support ppc64le properly
-RUN set -e \
-	&& for f in config.guess config.sub; do \
-		curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
-	done
-# "arch.c:78:2: error: #error the arch code needs to know about your machine type"
-
-# Compile and install lvm2
-RUN cd /usr/local/lvm2 \
-	&& ./configure \
-		--build="$(gcc -print-multiarch)" \
-		--enable-static_link \
-	&& make device-mapper \
-	&& make install_device-mapper
-# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-# Install seccomp: the version shipped in jessie is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-        && export SECCOMP_PATH="$(mktemp -d)" \
-        && curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-                | tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-        && ( \
-                cd "$SECCOMP_PATH" \
-                && ./configure --prefix=/usr/local \
-                && make \
-                && make install \
-                && ldconfig \
-        ) \
-        && rm -rf "$SECCOMP_PATH"
-
-
-# Install Go
-# NOTE: official ppc64le go binaries weren't available until go 1.6.4 and 1.7.4
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \
-	| tar -xzC /usr/local
-
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-# Dependency for golint
-ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
-	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
-
-# Grab Go's lint tool
-ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
-	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
-	&& go install -v github.com/golang/lint/golint
-
-# Install two versions of the registry. The first is an older version that
-# only supports schema1 manifests. The second is a newer version that supports
-# both. This allows integration-cli tests to cover push/pull with both schema1
-# and schema2 manifests.
-ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd
-ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
-	&& rm -rf "$GOPATH"
-
-# Install notary and notary-server
-ENV NOTARY_VERSION v0.4.2
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
-	&& rm -rf "$GOPATH"
-
-# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
-RUN git clone https://github.com/docker/docker-py.git /docker-py \
-	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT \
-	&& pip install -r test-requirements.txt
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME /var/lib/docker
-WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-
-# Let us use a .bashrc file
-RUN ln -sfv $PWD/.bashrc ~/.bashrc
-
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
-	ppc64le/buildpack-deps:jessie@sha256:902bfe4ef1389f94d143d64516dd50a2de75bca2e66d4a44b1d73f63ddf05dda \
-	ppc64le/busybox:latest@sha256:38bb82085248d5a3c24bd7a5dc146f2f2c191e189da0441f1c2ca560e3fc6f1b \
-	ppc64le/debian:jessie@sha256:412845f51b6ab662afba71bc7a716e20fdb9b84f185d180d4c7504f8a75c4f91 \
-	ppc64le/hello-world:latest@sha256:186a40a9a02ca26df0b6c8acdfb8ac2f3ae6678996a838f977e57fac9d963974
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
-
-# Install tomlv, vndr, runc, containerd, tini, docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy
-
-# Wrap all commands in the "docker-in-docker" script to allow nested containers
-ENTRYPOINT ["hack/dind"]
-
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.s390x b/installer/vendor/github.com/docker/docker/Dockerfile.s390x
deleted file mode 100644
index ba94bc70aa..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.s390x
+++ /dev/null
@@ -1,190 +0,0 @@
-# This file describes the standard way to build Docker on s390x, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker -f Dockerfile.s390x .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM s390x/gcc:6.1
-
-# Packaged dependencies
-RUN apt-get update && apt-get install -y \
-	apparmor \
-	aufs-tools \
-	automake \
-	bash-completion \
-	btrfs-tools \
-	build-essential \
-	cmake \
-	createrepo \
-	curl \
-	dpkg-sig \
-	git \
-	iptables \
-	jq \
-	net-tools \
-	libapparmor-dev \
-	libcap-dev \
-	libltdl-dev \
-	libsqlite3-dev \
-	libsystemd-journal-dev \
-	libtool \
-	mercurial \
-	pkg-config \
-	python-dev \
-	python-mock \
-	python-pip \
-	python-websocket \
-	xfsprogs \
-	tar \
-	vim-common \
-	--no-install-recommends
-
-# glibc in Debian has a bug specific to s390x that won't be fixed until Debian 8.6 is released
-# - https://github.com/docker/docker/issues/24748
-# - https://sourceware.org/git/?p=glibc.git;a=commit;h=890b7a4b33d482b5c768ab47d70758b80227e9bc
-# - https://sourceware.org/git/?p=glibc.git;a=commit;h=2e807f29595eb5b1e5d0decc6e356a3562ecc58e
-RUN echo 'deb http://httpredir.debian.org/debian jessie-proposed-updates main' >> /etc/apt/sources.list.d/pu.list \
-	&& apt-get update \
-	&& apt-get install -y libc6 \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Install seccomp: the version shipped in jessie is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-	&& export SECCOMP_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-		| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-	&& ( \
-		cd "$SECCOMP_PATH" \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$SECCOMP_PATH"
-
-# Get lvm2 source for compiling statically
-ENV LVM2_VERSION 2.02.103
-RUN mkdir -p /usr/local/lvm2 \
-	&& curl -fsSL "https://mirrors.kernel.org/sourceware/lvm2/LVM2.${LVM2_VERSION}.tgz" \
-		| tar -xzC /usr/local/lvm2 --strip-components=1
-# See https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-
-# Fix platform enablement in lvm2 to support s390x properly
-RUN set -e \
-	&& for f in config.guess config.sub; do \
-		curl -fsSL -o "/usr/local/lvm2/autoconf/$f" "http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=$f;hb=HEAD"; \
-	done
-# "arch.c:78:2: error: #error the arch code needs to know about your machine type"
-
-# Compile and install lvm2
-RUN cd /usr/local/lvm2 \
-	&& ./configure \
-		--build="$(gcc -print-multiarch)" \
-		--enable-static_link \
-	&& make device-mapper \
-	&& make install_device-mapper
-# See https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \
-	| tar -xzC /usr/local
-
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-# Dependency for golint
-ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
-RUN git clone https://github.com/golang/tools.git /go/src/golang.org/x/tools \
-	&& (cd /go/src/golang.org/x/tools && git checkout -q $GO_TOOLS_COMMIT)
-
-# Grab Go's lint tool
-ENV GO_LINT_COMMIT 32a87160691b3c96046c0c678fe57c5bef761456
-RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint \
-	&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
-	&& go install -v github.com/golang/lint/golint
-
-# Install two versions of the registry. The first is an older version that
-# only supports schema1 manifests. The second is a newer version that supports
-# both. This allows integration-cli tests to cover push/pull with both schema1
-# and schema2 manifests.
-ENV REGISTRY_COMMIT_SCHEMA1 ec87e9b6971d831f0eff752ddb54fb64693e51cd
-ENV REGISTRY_COMMIT 47a064d4195a9b56133891bbb13620c3ac83a827
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/distribution.git "$GOPATH/src/github.com/docker/distribution" \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2 github.com/docker/distribution/cmd/registry \
-	&& (cd "$GOPATH/src/github.com/docker/distribution" && git checkout -q "$REGISTRY_COMMIT_SCHEMA1") \
-	&& GOPATH="$GOPATH/src/github.com/docker/distribution/Godeps/_workspace:$GOPATH" \
-		go build -o /usr/local/bin/registry-v2-schema1 github.com/docker/distribution/cmd/registry \
-	&& rm -rf "$GOPATH"
-
-# Install notary and notary-server
-ENV NOTARY_VERSION v0.4.2
-RUN set -x \
-	&& export GOPATH="$(mktemp -d)" \
-	&& git clone https://github.com/docker/notary.git "$GOPATH/src/github.com/docker/notary" \
-	&& (cd "$GOPATH/src/github.com/docker/notary" && git checkout -q "$NOTARY_VERSION") \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary-server github.com/docker/notary/cmd/notary-server \
-	&& GOPATH="$GOPATH/src/github.com/docker/notary/vendor:$GOPATH" \
-		go build -o /usr/local/bin/notary github.com/docker/notary/cmd/notary \
-	&& rm -rf "$GOPATH"
-
-# Get the "docker-py" source so we can run their integration tests
-ENV DOCKER_PY_COMMIT e2655f658408f9ad1f62abdef3eb6ed43c0cf324
-RUN git clone https://github.com/docker/docker-py.git /docker-py \
-	&& cd /docker-py \
-	&& git checkout -q $DOCKER_PY_COMMIT \
-	&& pip install -r test-requirements.txt
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME /var/lib/docker
-WORKDIR /go/src/github.com/docker/docker
-ENV DOCKER_BUILDTAGS apparmor selinux seccomp
-
-# Let us use a .bashrc file
-RUN ln -sfv $PWD/.bashrc ~/.bashrc
-
-# Register Docker's bash completion.
-RUN ln -sv $PWD/contrib/completion/bash/docker /etc/bash_completion.d/docker
-
-# Get useful and necessary Hub images so we can "docker load" locally instead of pulling
-COPY contrib/download-frozen-image-v2.sh /go/src/github.com/docker/docker/contrib/
-RUN ./contrib/download-frozen-image-v2.sh /docker-frozen-images \
-	s390x/buildpack-deps:jessie@sha256:4d1381224acaca6c4bfe3604de3af6972083a8558a99672cb6989c7541780099 \
-	s390x/busybox:latest@sha256:dd61522c983884a66ed72d60301925889028c6d2d5e0220a8fe1d9b4c6a4f01b \
-	s390x/debian:jessie@sha256:b74c863400909eff3c5e196cac9bfd1f6333ce47aae6a38398d87d5875da170a \
-	s390x/hello-world:latest@sha256:780d80b3a7677c3788c0d5cd9168281320c8d4a6d9183892d8ee5cdd610f5699
-# See also "hack/make/.ensure-frozen-images" (which needs to be updated any time this list is)
-
-# Install tomlv, vndr, runc, containerd, tini, docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh tomlv vndr runc containerd tini proxy
-
-# Wrap all commands in the "docker-in-docker" script to allow nested containers
-ENTRYPOINT ["hack/dind"]
-
-# Upload docker source
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.simple b/installer/vendor/github.com/docker/docker/Dockerfile.simple
deleted file mode 100644
index 8eeb3d96bb..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.simple
+++ /dev/null
@@ -1,73 +0,0 @@
-# docker build -t docker:simple -f Dockerfile.simple .
-# docker run --rm docker:simple hack/make.sh dynbinary
-# docker run --rm --privileged docker:simple hack/dind hack/make.sh test-unit
-# docker run --rm --privileged -v /var/lib/docker docker:simple hack/dind hack/make.sh dynbinary test-integration-cli
-
-# This represents the bare minimum required to build and test Docker.
-
-FROM debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-# Compile and runtime deps
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-RUN apt-get update && apt-get install -y --no-install-recommends \
-		btrfs-tools \
-		build-essential \
-		curl \
-		cmake \
-		gcc \
-		git \
-		libapparmor-dev \
-		libdevmapper-dev \
-		libsqlite3-dev \
-		\
-		ca-certificates \
-		e2fsprogs \
-		iptables \
-		procps \
-		xfsprogs \
-		xz-utils \
-		\
-		aufs-tools \
-		vim-common \
-	&& rm -rf /var/lib/apt/lists/*
-
-# Install seccomp: the version shipped in trusty is too old
-ENV SECCOMP_VERSION 2.3.1
-RUN set -x \
-	&& export SECCOMP_PATH="$(mktemp -d)" \
-	&& curl -fsSL "https://github.com/seccomp/libseccomp/releases/download/v${SECCOMP_VERSION}/libseccomp-${SECCOMP_VERSION}.tar.gz" \
-		| tar -xzC "$SECCOMP_PATH" --strip-components=1 \
-	&& ( \
-		cd "$SECCOMP_PATH" \
-		&& ./configure --prefix=/usr/local \
-		&& make \
-		&& make install \
-		&& ldconfig \
-	) \
-	&& rm -rf "$SECCOMP_PATH"
-
-# Install Go
-# IMPORTANT: If the version of Go is updated, the Windows to Linux CI machines
-#            will need updating, to avoid errors. Ping #docker-maintainers on IRC
-#            with a heads-up.
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" \
-	| tar -xzC /usr/local
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-ENV CGO_LDFLAGS -L/lib
-
-# Install runc, containerd, tini and docker-proxy
-# Please edit hack/dockerfile/install-binaries.sh to update them.
-COPY hack/dockerfile/binaries-commits /tmp/binaries-commits
-COPY hack/dockerfile/install-binaries.sh /tmp/install-binaries.sh
-RUN /tmp/install-binaries.sh runc containerd tini proxy
-
-ENV AUTO_GOPATH 1
-WORKDIR /usr/src/docker
-COPY . /usr/src/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.solaris b/installer/vendor/github.com/docker/docker/Dockerfile.solaris
deleted file mode 100644
index bb342e5e6a..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.solaris
+++ /dev/null
@@ -1,20 +0,0 @@
-# Defines an image that hosts a native Docker build environment for Solaris
-# TODO: Improve stub
-
-FROM solaris:latest
-
-# compile and runtime deps
-RUN pkg install --accept \
-		git \
-		gnu-coreutils \
-		gnu-make \
-		gnu-tar \
-		diagnostic/top \
-		golang \
-		library/golang/* \
-		developer/gcc-*
-
-ENV GOPATH /go/:/usr/lib/gocode/1.5/
-ENV DOCKER_CROSSPLATFORMS solaris/amd64
-WORKDIR /go/src/github.com/docker/docker
-COPY . /go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/Dockerfile.windows b/installer/vendor/github.com/docker/docker/Dockerfile.windows
deleted file mode 100644
index 652d07275e..0000000000
--- a/installer/vendor/github.com/docker/docker/Dockerfile.windows
+++ /dev/null
@@ -1,267 +0,0 @@
-# escape=`
-
-# -----------------------------------------------------------------------------------------
-# This file describes the standard way to build Docker in a container on Windows
-# Server 2016 or Windows 10.
-#
-# Maintainer: @jhowardmsft
-# -----------------------------------------------------------------------------------------
-
-
-# Prerequisites:
-# --------------
-#
-# 1. Windows Server 2016 or Windows 10 with all Windows updates applied. The major 
-#    build number must be at least 14393. This can be confirmed, for example, by 
-#    running the following from an elevated PowerShell prompt - this sample output 
-#    is from a fully up to date machine as at mid-November 2016:
-#
-#    >> PS C:\> $(gin).WindowsBuildLabEx
-#    >> 14393.447.amd64fre.rs1_release_inmarket.161102-0100
-#
-# 2. Git for Windows (or another git client) must be installed. https://git-scm.com/download/win.
-#
-# 3. The machine must be configured to run containers. For example, by following
-#    the quick start guidance at https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start or
-#    https://github.com/docker/labs/blob/master/windows/windows-containers/Setup.md
-#
-# 4. If building in a Hyper-V VM: For Windows Server 2016 using Windows Server
-#    containers as the default option, it is recommended you have at least 1GB 
-#    of memory assigned; For Windows 10 where Hyper-V Containers are employed, you
-#    should have at least 4GB of memory assigned. Note also, to run Hyper-V 
-#    containers in a VM, it is necessary to configure the VM for nested virtualization.
-
-# -----------------------------------------------------------------------------------------
-
-
-# Usage:
-# -----
-#
-#  The following steps should be run from an (elevated*) Windows PowerShell prompt. 
-#
-#  (*In a default installation of containers on Windows following the quick-start guidance at
-#    https://msdn.microsoft.com/en-us/virtualization/windowscontainers/quick_start/quick_start,
-#    the docker.exe client must run elevated to be able to connect to the daemon).
-#
-# 1. Clone the sources from github.com:
-#
-#    >>   git clone https://github.com/docker/docker.git C:\go\src\github.com\docker\docker
-#    >>   Cloning into 'C:\go\src\github.com\docker\docker'...
-#    >>   remote: Counting objects: 186216, done.
-#    >>   remote: Compressing objects: 100% (21/21), done.
-#    >>   remote: Total 186216 (delta 5), reused 0 (delta 0), pack-reused 186195
-#    >>   Receiving objects: 100% (186216/186216), 104.32 MiB | 8.18 MiB/s, done.
-#    >>   Resolving deltas: 100% (123139/123139), done.
-#    >>   Checking connectivity... done.
-#    >>   Checking out files: 100% (3912/3912), done.
-#    >>   PS C:\>
-#
-#
-# 2. Change directory to the cloned docker sources:
-#
-#    >>   cd C:\go\src\github.com\docker\docker 
-#
-#
-# 3. Build a docker image with the components required to build the docker binaries from source
-#    by running one of the following:
-#
-#    >>   docker build -t nativebuildimage -f Dockerfile.windows .          
-#    >>   docker build -t nativebuildimage -f Dockerfile.windows -m 2GB .    (if using Hyper-V containers)
-#
-#
-# 4. Build the docker executable binaries by running one of the following:
-#
-#    >>   docker run --name binaries nativebuildimage hack\make.ps1 -Binary
-#    >>   docker run --name binaries -m 2GB nativebuildimage hack\make.ps1 -Binary    (if using Hyper-V containers)
-#
-#
-# 5. Copy the binaries out of the container, replacing HostPath with an appropriate destination 
-#    folder on the host system where you want the binaries to be located.
-#
-#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\docker.exe C:\HostPath\docker.exe
-#    >>   docker cp binaries:C:\go\src\github.com\docker\docker\bundles\dockerd.exe C:\HostPath\dockerd.exe
-#
-#
-# 6. (Optional) Remove the interim container holding the built executable binaries:
-#
-#    >>    docker rm binaries
-#
-#
-# 7. (Optional) Remove the image used for the container in which the executable
-#    binaries are build. Tip - it may be useful to keep this image around if you need to
-#    build multiple times. Then you can take advantage of the builder cache to have an
-#    image which has all the components required to build the binaries already installed.
-#
-#    >>    docker rmi nativebuildimage
-#
-
-# -----------------------------------------------------------------------------------------
-
-
-#  The validation tests can either run in a container, or directly on the host. To run in a
-#  container, ensure you have created the nativebuildimage above. Then run one of the
-#  following from an (elevated) Windows PowerShell prompt:
-#
-#    >>   docker run --rm nativebuildimage hack\make.ps1 -DCO -PkgImports -GoFormat
-#    >>   docker run --rm -m 2GB nativebuildimage hack\make.ps1 -DCO -PkgImports -GoFormat    (if using Hyper-V containers)
-
-# To run the validation tests on the host, from the root of the repository, run the
-# following from a Windows PowerShell prompt (elevation is not required): (Note Go
-# must be installed to run these tests)
-#
-#    >>   hack\make.ps1 -DCO -PkgImports -GoFormat
-
-# -----------------------------------------------------------------------------------------
-
-
-#  To run unit tests, ensure you have created the nativebuildimage above. Then run one of
-#  the following from an (elevated) Windows PowerShell prompt:
-#
-#    >>   docker run --rm nativebuildimage hack\make.ps1 -TestUnit
-#    >>   docker run --rm -m 2GB nativebuildimage hack\make.ps1 -TestUnit    (if using Hyper-V containers)
-
-
-# -----------------------------------------------------------------------------------------
-
-
-#  To run all tests and binary build, ensure you have created the nativebuildimage above. Then 
-#  run one of the following from an (elevated) Windows PowerShell prompt:
-#
-#    >>   docker run nativebuildimage hack\make.ps1 -All
-#    >>   docker run -m 2GB nativebuildimage hack\make.ps1 -All    (if using Hyper-V containers)
-
-# -----------------------------------------------------------------------------------------
-
-
-# Important notes:
-# ---------------
-#
-# Don't attempt to use a bind-mount to pass a local directory as the bundles target
-# directory. It does not work (golang attempts for follow a mapped folder incorrectly). 
-# Instead, use docker cp as per the example.
-#
-# go.zip is not removed from the image as it is used by the Windows CI servers
-# to ensure the host and image are running consistent versions of go.
-#
-# Nanoserver support is a work in progress. Although the image will build if the 
-# FROM statement is updated, it will not work when running autogen through hack\make.ps1. 
-# It is suspected that the required GCC utilities (eg gcc, windres, windmc) silently
-# quit due to the use of console hooks which are not available.
-#
-# The docker integration tests do not currently run in a container on Windows, predominantly
-# due to Windows not supporting privileged mode, so anything using a volume would fail.
-# They (along with the rest of the docker CI suite) can be run using 
-# https://github.com/jhowardmsft/docker-w2wCIScripts/blob/master/runCI/Invoke-DockerCI.ps1.
-#
-# -----------------------------------------------------------------------------------------
-
-
-# The number of build steps below are explicitly minimised to improve performance.
-FROM microsoft/windowsservercore
-
-# Use PowerShell as the default shell
-SHELL ["powershell", "-command"]
-
-# Environment variable notes:
-#  - GO_VERSION must be consistent with 'Dockerfile' used by Linux.
-#  - FROM_DOCKERFILE is used for detection of building within a container.
-ENV GO_VERSION=1.7.5 `
-    GIT_VERSION=2.11.0 `
-    GOPATH=C:\go `
-    FROM_DOCKERFILE=1
-
-RUN `
-  $ErrorActionPreference = 'Stop'; `
-  $ProgressPreference = 'SilentlyContinue'; `
-  `
-  Function Test-Nano() { `
-    $EditionId = (Get-ItemProperty -Path 'HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion' -Name 'EditionID').EditionId; `
-    return (($EditionId -eq 'ServerStandardNano') -or ($EditionId -eq 'ServerDataCenterNano') -or ($EditionId -eq 'NanoServer')); `
-  }`
-  `
-  Function Download-File([string] $source, [string] $target) { `
-    if (Test-Nano) { `
-      $handler = New-Object System.Net.Http.HttpClientHandler; `
-      $client = New-Object System.Net.Http.HttpClient($handler); `
-      $client.Timeout = New-Object System.TimeSpan(0, 30, 0); `
-      $cancelTokenSource = [System.Threading.CancellationTokenSource]::new(); `
-      $responseMsg = $client.GetAsync([System.Uri]::new($source), $cancelTokenSource.Token); `
-      $responseMsg.Wait(); `
-      if (!$responseMsg.IsCanceled) { `
-        $response = $responseMsg.Result; `
-        if ($response.IsSuccessStatusCode) { `
-          $downloadedFileStream = [System.IO.FileStream]::new($target, [System.IO.FileMode]::Create, [System.IO.FileAccess]::Write); `
-          $copyStreamOp = $response.Content.CopyToAsync($downloadedFileStream); `
-          $copyStreamOp.Wait(); `
-          $downloadedFileStream.Close(); `
-          if ($copyStreamOp.Exception -ne $null) { throw $copyStreamOp.Exception } `
-        } `
-      } else { `
-      Throw ("Failed to download " + $source) `
-      }`
-    } else { `
-      $webClient = New-Object System.Net.WebClient; `
-      $webClient.DownloadFile($source, $target); `
-    } `
-  } `
-  `
-  setx /M PATH $('C:\git\bin;C:\git\usr\bin;'+$Env:PATH+';C:\gcc\bin;C:\go\bin'); `
-  `
-  Write-Host INFO: Downloading git...; `
-  $location='https://github.com/git-for-windows/git/releases/download/v'+$env:GIT_VERSION+'.windows.1/PortableGit-'+$env:GIT_VERSION+'-64-bit.7z.exe'; `
-  Download-File $location C:\gitsetup.7z.exe; `
-  `
-  Write-Host INFO: Downloading go...; `
-  Download-File $('https://golang.org/dl/go'+$Env:GO_VERSION+'.windows-amd64.zip') C:\go.zip; `
-  `
-  Write-Host INFO: Downloading compiler 1 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/gcc.zip C:\gcc.zip; `
-  `
-  Write-Host INFO: Downloading compiler 2 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/runtime.zip C:\runtime.zip; `
-  `
-  Write-Host INFO: Downloading compiler 3 of 3...; `
-  Download-File https://raw.githubusercontent.com/jhowardmsft/docker-tdmgcc/master/binutils.zip C:\binutils.zip; `
-  `
-  Write-Host INFO: Installing PS7Zip package...; `
-  Install-Package PS7Zip -Force | Out-Null; `
-  Write-Host INFO: Importing PS7Zip...; `
-  Import-Module PS7Zip -Force; `
-  New-Item C:\git -ItemType Directory | Out-Null ; `
-  cd C:\git; `
-  Write-Host INFO: Extracting git...; `
-  Expand-7Zip C:\gitsetup.7z.exe | Out-Null; `
-  cd C:\; `
-  `
-  Write-Host INFO: Expanding go...; `
-  Expand-Archive C:\go.zip -DestinationPath C:\; `
-  `
-  Write-Host INFO: Expanding compiler 1 of 3...; `
-  Expand-Archive C:\gcc.zip -DestinationPath C:\gcc -Force; `
-  Write-Host INFO: Expanding compiler 2 of 3...; `
-  Expand-Archive C:\runtime.zip -DestinationPath C:\gcc -Force; `
-  Write-Host INFO: Expanding compiler 3 of 3...; `
-  Expand-Archive C:\binutils.zip -DestinationPath C:\gcc -Force; `
-  `
-  Write-Host INFO: Removing downloaded files...; `
-  Remove-Item C:\gcc.zip; `
-  Remove-Item C:\runtime.zip; `
-  Remove-Item C:\binutils.zip; `
-  Remove-Item C:\gitsetup.7z.exe; `
-  `
-  Write-Host INFO: Creating source directory...; `
-  New-Item -ItemType Directory -Path C:\go\src\github.com\docker\docker | Out-Null; `
-  `
-  Write-Host INFO: Configuring git core.autocrlf...; `
-  C:\git\bin\git config --global core.autocrlf true; `
-  `
-  Write-Host INFO: Completed
-
-# Make PowerShell the default entrypoint
-ENTRYPOINT ["powershell.exe"]
-
-# Set the working directory to the location of the sources
-WORKDIR C:\go\src\github.com\docker\docker
-
-# Copy the sources into the container
-COPY . .
diff --git a/installer/vendor/github.com/docker/docker/MAINTAINERS b/installer/vendor/github.com/docker/docker/MAINTAINERS
deleted file mode 100644
index 39bb8c1308..0000000000
--- a/installer/vendor/github.com/docker/docker/MAINTAINERS
+++ /dev/null
@@ -1,376 +0,0 @@
-# Docker maintainers file
-#
-# This file describes who runs the docker/docker project and how.
-# This is a living document - if you see something out of date or missing, speak up!
-#
-# It is structured to be consumable by both humans and programs.
-# To extract its contents programmatically, use any TOML-compliant
-# parser.
-#
-# This file is compiled into the MAINTAINERS file in docker/opensource.
-#
-[Org]
-
-	[Org."Core maintainers"]
-
-	# The Core maintainers are the ghostbusters of the project: when there's a problem others
-	# can't solve, they show up and fix it with bizarre devices and weaponry.
-	# They have final say on technical implementation and coding style.
-	# They are ultimately responsible for quality in all its forms: usability polish,
-	# bugfixes, performance, stability, etc. When ownership  can cleanly be passed to
-	# a subsystem, they are responsible for doing so and holding the
-	# subsystem maintainers accountable. If ownership is unclear, they are the de facto owners.
-
-	# For each release (including minor releases), a "release captain" is assigned from the
-	# pool of core maintainers. Rotation is encouraged across all maintainers, to ensure
-	# the release process is clear and up-to-date.
-
-		people = [
-			"aaronlehmann",
-			"akihirosuda",
-			"aluzzardi",
-			"anusha",
-			"coolljt0725",
-			"cpuguy83",
-			"crosbymichael",
-			"dnephin",
-			"duglin",
-			"estesp",
-			"icecrime",
-			"jhowardmsft",
-			"justincormack",
-			"lk4d4",
-			"mavenugo",
-			"mhbauer",
-			"mlaventure",
-			"mrjana",
-			"runcom",
-			"stevvooe",
-			"tianon",
-			"tibor",
-			"tonistiigi",
-			"unclejack",
-			"vdemeester",
-			"vieux"
-		]
-
-	[Org."Docs maintainers"]
-
-	# TODO Describe the docs maintainers role.
-
-		people = [
-			"jamtur01",
-			"misty",
-			"sven",
-			"thajeztah"
-		]
-
-	[Org.Curators]
-
-	# The curators help ensure that incoming issues and pull requests are properly triaged and
-	# that our various contribution and reviewing processes are respected. With their knowledge of
-	# the repository activity, they can also guide contributors to relevant material or
-	# discussions.
-	#
-	# They are neither code nor docs reviewers, so they are never expected to merge. They can
-	# however:
-	# - close an issue or pull request when it's an exact duplicate
-	# - close an issue or pull request when it's inappropriate or off-topic
-
-		people = [
-			"aboch",
-			"andrewhsu",
-			"ehazlett",
-			"mgoelzer",
-			"programmerq",
-			"thajeztah"
-		]
-
-	[Org.Alumni]
-
-	# This list contains maintainers that are no longer active on the project.
-	# It is thanks to these people that the project has become what it is today.
-	# Thank you!
-
-		people = [
-			# David Calavera contributed many features to Docker, such as an improved
-			# event system, dynamic configuration reloading, volume plugins, fancy
-			# new templating options, and an external client credential store. As a
-			# maintainer, David was release captain for Docker 1.8, and competing
-			# with Jess Frazelle to be "top dream killer".
-			# David is now doing amazing stuff as CTO for https://www.netlify.com,
-			# and tweets as @calavera.
-			"calavera",
-
-			# As a maintainer, Erik was responsible for the "builder", and
-			# started the first designs for the new networking model in
-			# Docker. Erik is now working on all kinds of plugins for Docker
-			# (https://github.com/contiv) and various open source projects
-			# in his own repository https://github.com/erikh. You may
-			# still stumble into him in our issue tracker, or on IRC.
-			"erikh",
-
-			# Jessica Frazelle, also known as the "Keyser Söze of containers",
-			# runs *everything* in containers. She started contributing to
-			# Docker with a (fun fun) change involving both iptables and regular
-			# expressions (coz, YOLO!) on July 10, 2014
-			# https://github.com/docker/docker/pull/6950/commits/f3a68ffa390fb851115c77783fa4031f1d3b2995.
-			# Jess was Release Captain for Docker 1.4, 1.6 and 1.7, and contributed
-			# many features and improvement, among which "seccomp profiles" (making
-			# containers a lot more secure). Besides being a maintainer, she
-			# set up the CI infrastructure for the project, giving everyone
-			# something to shout at if a PR failed ("noooo Janky!").
-			# Jess is currently working on the DCOS security team at Mesosphere,
-			# and contributing to various open source projects.
-			# Be sure you don't miss her talks at a conference near you (a must-see),
-			# read her blog at https://blog.jessfraz.com (a must-read), and
-			# check out her open source projects on GitHub https://github.com/jessfraz (a must-try).
-			"jessfraz",
-
-			# As a docs maintainer, Mary Anthony contributed greatly to the Docker
-			# docs. She wrote the Docker Contributor Guide and Getting Started
-			# Guides. She helped create a doc build system independent of
-			# docker/docker project, and implemented a new docs.docker.com theme and
-			# nav for 2015 Dockercon. Fun fact: the most inherited layer in DockerHub
-			# public repositories was originally referenced in
-			# maryatdocker/docker-whale back in May 2015.
-			"moxiegirl",
-
-			# Vincent "vbatts!" Batts made his first contribution to the project
-			# in November 2013, to become a maintainer a few months later, on
-			# May 10, 2014 (https://github.com/docker/docker/commit/d6e666a87a01a5634c250358a94c814bf26cb778).
-			# As a maintainer, Vincent made important contributions to core elements
-			# of Docker, such as "distribution" (tarsum) and graphdrivers (btrfs, devicemapper).
-			# He also contributed the "tar-split" library, an important element
-			# for the content-addressable store.
-			# Vincent is currently a member of the Open Containers Initiative
-			# Technical Oversight Board (TOB), besides his work at Red Hat and
-			# Project Atomic. You can still find him regularly hanging out in
-			# our repository and the #docker-dev and #docker-maintainers IRC channels
-			# for a chat, as he's always a lot of fun.
-			"vbatts",
-
-			# Vishnu became a maintainer to help out on the daemon codebase and
-			# libcontainer integration. He's currently involved in the
-			# Open Containers Initiative, working on the specifications,
-			# besides his work on cAdvisor and Kubernetes for Google.
-			"vishh"
-		]
-
-[people]
-
-# A reference list of all people associated with the project.
-# All other sections should refer to people by their canonical key
-# in the people section.
-
-	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
-
-	[people.aaronlehmann]
-	Name = "Aaron Lehmann"
-	Email = "aaron.lehmann@docker.com"
-	GitHub = "aaronlehmann"
-
-	[people.aboch]
-	Name = "Alessandro Boch"
-	Email = "aboch@docker.com"
-	GitHub = "aboch"
-
-	[people.akihirosuda]
-	Name = "Akihiro Suda"
-	Email = "suda.akihiro@lab.ntt.co.jp"
-	GitHub = "AkihiroSuda"
-
-	[people.aluzzardi]
-	Name = "Andrea Luzzardi"
-	Email = "al@docker.com"
-	GitHub = "aluzzardi"
-
-	[people.andrewhsu]
-	Name = "Andrew Hsu"
-	Email = "andrewhsu@docker.com"
-	GitHub = "andrewhsu"
-
-	[people.anusha]
-	Name = "Anusha Ragunathan"
-	Email = "anusha@docker.com"
-	GitHub = "anusha-ragunathan"
-
-	[people.calavera]
-	Name = "David Calavera"
-	Email = "david.calavera@gmail.com"
-	GitHub = "calavera"
-
-	[people.coolljt0725]
-	Name = "Lei Jitang"
-	Email = "leijitang@huawei.com"
-	GitHub = "coolljt0725"
-
-	[people.cpuguy83]
-	Name = "Brian Goff"
-	Email = "cpuguy83@gmail.com"
-	Github = "cpuguy83"
-
-	[people.crosbymichael]
-	Name = "Michael Crosby"
-	Email = "crosbymichael@gmail.com"
-	GitHub = "crosbymichael"
-
-	[people.dnephin]
-	Name = "Daniel Nephin"
-	Email = "dnephin@gmail.com"
-	GitHub = "dnephin"
-
-	[people.duglin]
-	Name = "Doug Davis"
-	Email = "dug@us.ibm.com"
-	GitHub = "duglin"
-
-	[people.ehazlett]
-	Name = "Evan Hazlett"
-	Email = "ejhazlett@gmail.com"
-	GitHub = "ehazlett"
-
-	[people.erikh]
-	Name = "Erik Hollensbe"
-	Email = "erik@docker.com"
-	GitHub = "erikh"
-
-	[people.estesp]
-	Name = "Phil Estes"
-	Email = "estesp@linux.vnet.ibm.com"
-	GitHub = "estesp"
-
-	[people.icecrime]
-	Name = "Arnaud Porterie"
-	Email = "arnaud@docker.com"
-	GitHub = "icecrime"
-
-	[people.jamtur01]
-	Name = "James Turnbull"
-	Email = "james@lovedthanlost.net"
-	GitHub = "jamtur01"
-
-	[people.jhowardmsft]
-	Name = "John Howard"
-	Email = "jhoward@microsoft.com"
-	GitHub = "jhowardmsft"
-
-	[people.jessfraz]
-	Name = "Jessie Frazelle"
-	Email = "jess@linux.com"
-	GitHub = "jessfraz"
-
-	[people.justincormack]
-	Name = "Justin Cormack"
-	Email = "justin.cormack@docker.com"
-	GitHub = "justincormack"
-
-	[people.lk4d4]
-	Name = "Alexander Morozov"
-	Email = "lk4d4@docker.com"
-	GitHub = "lk4d4"
-
-	[people.mavenugo]
-	Name = "Madhu Venugopal"
-	Email = "madhu@docker.com"
-	GitHub = "mavenugo"
-
-	[people.mgoelzer]
-	Name = "Mike Goelzer"
-	Email = "mike.goelzer@docker.com"
-	GitHub = "mgoelzer"
-
-	[people.mhbauer]
-	Name = "Morgan Bauer"
-	Email = "mbauer@us.ibm.com"
-	GitHub = "mhbauer"
-
-	[people.misty]
-	Name = "Misty Stanley-Jones"
-	Email = "misty@docker.com"
-	GitHub = "mstanleyjones"
-
-	[people.mlaventure]
-	Name = "Kenfe-Mickaël Laventure"
-	Email = "mickael.laventure@docker.com"
-	GitHub = "mlaventure"
-
-	[people.moxiegirl]
-	Name = "Mary Anthony"
-	Email = "mary.anthony@docker.com"
-	GitHub = "moxiegirl"
-
-	[people.mrjana]
-	Name = "Jana Radhakrishnan"
-	Email = "mrjana@docker.com"
-	GitHub = "mrjana"
-
-	[people.programmerq]
-	Name = "Jeff Anderson"
-	Email = "jeff@docker.com"
-	GitHub = "programmerq"
-
-	[people.runcom]
-	Name = "Antonio Murdaca"
-	Email = "runcom@redhat.com"
-	GitHub = "runcom"
-
-	[people.shykes]
-	Name = "Solomon Hykes"
-	Email = "solomon@docker.com"
-	GitHub = "shykes"
-
-	[people.stevvooe]
-	Name = "Stephen Day"
-	Email = "stephen.day@docker.com"
-	GitHub = "stevvooe"
-
-	[people.sven]
-	Name = "Sven Dowideit"
-	Email = "SvenDowideit@home.org.au"
-	GitHub = "SvenDowideit"
-
-	[people.thajeztah]
-	Name = "Sebastiaan van Stijn"
-	Email = "github@gone.nl"
-	GitHub = "thaJeztah"
-
-	[people.tianon]
-	Name = "Tianon Gravi"
-	Email = "admwiggin@gmail.com"
-	GitHub = "tianon"
-
-	[people.tibor]
-	Name = "Tibor Vass"
-	Email = "tibor@docker.com"
-	GitHub = "tiborvass"
-
-	[people.tonistiigi]
-	Name = "Tõnis Tiigi"
-	Email = "tonis@docker.com"
-	GitHub = "tonistiigi"
-
-	[people.unclejack]
-	Name = "Cristian Staretu"
-	Email = "cristian.staretu@gmail.com"
-	GitHub = "unclejack"
-
-	[people.vbatts]
-	Name = "Vincent Batts"
-	Email = "vbatts@redhat.com"
-	GitHub = "vbatts"
-
-	[people.vdemeester]
-	Name = "Vincent Demeester"
-	Email = "vincent@sbr.pm"
-	GitHub = "vdemeester"
-
-	[people.vieux]
-	Name = "Victor Vieux"
-	Email = "vieux@docker.com"
-	GitHub = "vieux"
-
-	[people.vishh]
-	Name = "Vishnu Kannan"
-	Email = "vishnuk@google.com"
-	GitHub = "vishh"
diff --git a/installer/vendor/github.com/docker/docker/Makefile b/installer/vendor/github.com/docker/docker/Makefile
deleted file mode 100644
index 81bde6b4f6..0000000000
--- a/installer/vendor/github.com/docker/docker/Makefile
+++ /dev/null
@@ -1,147 +0,0 @@
-.PHONY: all binary build cross deb help init-go-pkg-cache install manpages rpm run shell test test-docker-py test-integration-cli test-unit tgz validate win
-
-# set the graph driver as the current graphdriver if not set
-DOCKER_GRAPHDRIVER := $(if $(DOCKER_GRAPHDRIVER),$(DOCKER_GRAPHDRIVER),$(shell docker info 2>&1 | grep "Storage Driver" | sed 's/.*: //'))
-
-# get OS/Arch of docker engine
-DOCKER_OSARCH := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKER_ENGINE_OSARCH:-$$DOCKER_CLIENT_OSARCH}')
-DOCKERFILE := $(shell bash -c 'source hack/make/.detect-daemon-osarch && echo $${DOCKERFILE}')
-
-# env vars passed through directly to Docker's build scripts
-# to allow things like `make KEEPBUNDLE=1 binary` easily
-# `project/PACKAGERS.md` have some limited documentation of some of these
-DOCKER_ENVS := \
-	-e BUILD_APT_MIRROR \
-	-e BUILDFLAGS \
-	-e KEEPBUNDLE \
-	-e DOCKER_BUILD_ARGS \
-	-e DOCKER_BUILD_GOGC \
-	-e DOCKER_BUILD_PKGS \
-	-e DOCKER_DEBUG \
-	-e DOCKER_EXPERIMENTAL \
-	-e DOCKER_GITCOMMIT \
-	-e DOCKER_GRAPHDRIVER=$(DOCKER_GRAPHDRIVER) \
-	-e DOCKER_INCREMENTAL_BINARY \
-	-e DOCKER_PORT \
-	-e DOCKER_REMAP_ROOT \
-	-e DOCKER_STORAGE_OPTS \
-	-e DOCKER_USERLANDPROXY \
-	-e TESTDIRS \
-	-e TESTFLAGS \
-	-e TIMEOUT \
-	-e HTTP_PROXY \
-	-e HTTPS_PROXY \
-	-e NO_PROXY \
-	-e http_proxy \
-	-e https_proxy \
-	-e no_proxy
-# note: we _cannot_ add "-e DOCKER_BUILDTAGS" here because even if it's unset in the shell, that would shadow the "ENV DOCKER_BUILDTAGS" set in our Dockerfile, which is very important for our official builds
-
-# to allow `make BIND_DIR=. shell` or `make BIND_DIR= test`
-# (default to no bind mount if DOCKER_HOST is set)
-# note: BINDDIR is supported for backwards-compatibility here
-BIND_DIR := $(if $(BINDDIR),$(BINDDIR),$(if $(DOCKER_HOST),,bundles))
-DOCKER_MOUNT := $(if $(BIND_DIR),-v "$(CURDIR)/$(BIND_DIR):/go/src/github.com/docker/docker/$(BIND_DIR)")
-
-# This allows the test suite to be able to run without worrying about the underlying fs used by the container running the daemon (e.g. aufs-on-aufs), so long as the host running the container is running a supported fs.
-# The volume will be cleaned up when the container is removed due to `--rm`.
-# Note that `BIND_DIR` will already be set to `bundles` if `DOCKER_HOST` is not set (see above BIND_DIR line), in such case this will do nothing since `DOCKER_MOUNT` will already be set.
-DOCKER_MOUNT := $(if $(DOCKER_MOUNT),$(DOCKER_MOUNT),-v /go/src/github.com/docker/docker/bundles)
-
-# enable .go-pkg-cache if DOCKER_INCREMENTAL_BINARY and DOCKER_MOUNT (i.e.DOCKER_HOST) are set
-PKGCACHE_DIR := $(if $(PKGCACHE_DIR),$(PKGCACHE_DIR),.go-pkg-cache)
-PKGCACHE_MAP := gopath:/go/pkg goroot-linux_amd64_netgo:/usr/local/go/pkg/linux_amd64_netgo
-DOCKER_MOUNT := $(if $(DOCKER_INCREMENTAL_BINARY),$(DOCKER_MOUNT) $(shell echo $(PKGCACHE_MAP) | sed -E 's@([^ ]*)@-v "$(CURDIR)/$(PKGCACHE_DIR)/\1"@g'),$(DOCKER_MOUNT))
-
-GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2>/dev/null)
-GIT_BRANCH_CLEAN := $(shell echo $(GIT_BRANCH) | sed -e "s/[^[:alnum:]]/-/g")
-DOCKER_IMAGE := docker-dev$(if $(GIT_BRANCH_CLEAN),:$(GIT_BRANCH_CLEAN))
-DOCKER_PORT_FORWARD := $(if $(DOCKER_PORT),-p "$(DOCKER_PORT)",)
-
-DOCKER_FLAGS := docker run --rm -i --privileged $(DOCKER_ENVS) $(DOCKER_MOUNT) $(DOCKER_PORT_FORWARD)
-BUILD_APT_MIRROR := $(if $(DOCKER_BUILD_APT_MIRROR),--build-arg APT_MIRROR=$(DOCKER_BUILD_APT_MIRROR))
-export BUILD_APT_MIRROR
-
-# if this session isn't interactive, then we don't want to allocate a
-# TTY, which would fail, but if it is interactive, we do want to attach
-# so that the user can send e.g. ^C through.
-INTERACTIVE := $(shell [ -t 0 ] && echo 1 || echo 0)
-ifeq ($(INTERACTIVE), 1)
-	DOCKER_FLAGS += -t
-endif
-
-DOCKER_RUN_DOCKER := $(DOCKER_FLAGS) "$(DOCKER_IMAGE)"
-
-default: binary
-
-all: build ## validate all checks, build linux binaries, run all tests\ncross build non-linux binaries and generate archives
-	$(DOCKER_RUN_DOCKER) bash -c 'hack/validate/default && hack/make.sh'
-
-binary: build ## build the linux binaries
-	$(DOCKER_RUN_DOCKER) hack/make.sh binary
-
-build: bundles init-go-pkg-cache
-	docker build ${BUILD_APT_MIRROR} ${DOCKER_BUILD_ARGS} -t "$(DOCKER_IMAGE)" -f "$(DOCKERFILE)" .
-
-bundles:
-	mkdir bundles
-
-cross: build ## cross build the binaries for darwin, freebsd and\nwindows
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross
-
-deb: build  ## build the deb packages
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-deb
-
-
-help: ## this help
-	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {sub("\\\\n",sprintf("\n%22c"," "), $$2);printf "\033[36m%-20s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
-
-init-go-pkg-cache:
-	mkdir -p $(shell echo $(PKGCACHE_MAP) | sed -E 's@([^: ]*):[^ ]*@$(PKGCACHE_DIR)/\1@g')
-
-install: ## install the linux binaries
-	KEEPBUNDLE=1 hack/make.sh install-binary
-
-manpages: ## Generate man pages from go source and markdown
-	docker build -t docker-manpage-dev -f "man/$(DOCKERFILE)" ./man
-	docker run --rm \
-		-v $(PWD):/go/src/github.com/docker/docker/ \
-		docker-manpage-dev
-
-rpm: build ## build the rpm packages
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary build-rpm
-
-run: build ## run the docker daemon in a container
-	$(DOCKER_RUN_DOCKER) sh -c "KEEPBUNDLE=1 hack/make.sh install-binary run"
-
-shell: build ## start a shell inside the build env
-	$(DOCKER_RUN_DOCKER) bash
-
-test: build ## run the unit, integration and docker-py tests
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary cross test-unit test-integration-cli test-docker-py
-
-test-docker-py: build ## run the docker-py tests
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary test-docker-py
-
-test-integration-cli: build ## run the integration tests
-	$(DOCKER_RUN_DOCKER) hack/make.sh build-integration-test-binary dynbinary test-integration-cli
-
-test-unit: build ## run the unit tests
-	$(DOCKER_RUN_DOCKER) hack/make.sh test-unit
-
-tgz: build ## build the archives (.zip on windows and .tgz\notherwise) containing the binaries
-	$(DOCKER_RUN_DOCKER) hack/make.sh dynbinary binary cross tgz
-
-validate: build ## validate DCO, Seccomp profile generation, gofmt,\n./pkg/ isolation, golint, tests, tomls, go vet and vendor
-	$(DOCKER_RUN_DOCKER) hack/validate/all
-
-win: build ## cross build the binary for windows
-	$(DOCKER_RUN_DOCKER) hack/make.sh win
-
-.PHONY: swagger-gen
-swagger-gen:
-	docker run --rm -v $(PWD):/go/src/github.com/docker/docker \
-		-w /go/src/github.com/docker/docker \
-		--entrypoint hack/generate-swagger-api.sh \
-		-e GOPATH=/go \
-		quay.io/goswagger/swagger:0.7.4
diff --git a/installer/vendor/github.com/docker/docker/README.md b/installer/vendor/github.com/docker/docker/README.md
deleted file mode 100644
index 0b33bdca0d..0000000000
--- a/installer/vendor/github.com/docker/docker/README.md
+++ /dev/null
@@ -1,304 +0,0 @@
-Docker: the container engine [![Release](https://img.shields.io/github/release/docker/docker.svg)](https://github.com/docker/docker/releases/latest)
-============================
-
-Docker is an open source project to pack, ship and run any application
-as a lightweight container.
-
-Docker containers are both *hardware-agnostic* and *platform-agnostic*.
-This means they can run anywhere, from your laptop to the largest
-cloud compute instance and everything in between - and they don't require
-you to use a particular language, framework or packaging system. That
-makes them great building blocks for deploying and scaling web apps,
-databases, and backend services without depending on a particular stack
-or provider.
-
-Docker began as an open-source implementation of the deployment engine which
-powered [dotCloud](http://web.archive.org/web/20130530031104/https://www.dotcloud.com/),
-a popular Platform-as-a-Service. It benefits directly from the experience
-accumulated over several years of large-scale operation and support of hundreds
-of thousands of applications and databases.
-
-![Docker logo](docs/static_files/docker-logo-compressed.png "Docker")
-
-## Security Disclosure
-
-Security is very important to us. If you have any issue regarding security,
-please disclose the information responsibly by sending an email to
-security@docker.com and not by creating a GitHub issue.
-
-## Better than VMs
-
-A common method for distributing applications and sandboxing their
-execution is to use virtual machines, or VMs. Typical VM formats are
-VMware's vmdk, Oracle VirtualBox's vdi, and Amazon EC2's ami. In theory
-these formats should allow every developer to automatically package
-their application into a "machine" for easy distribution and deployment.
-In practice, that almost never happens, for a few reasons:
-
-  * *Size*: VMs are very large which makes them impractical to store
-     and transfer.
-  * *Performance*: running VMs consumes significant CPU and memory,
-    which makes them impractical in many scenarios, for example local
-    development of multi-tier applications, and large-scale deployment
-    of cpu and memory-intensive applications on large numbers of
-    machines.
-  * *Portability*: competing VM environments don't play well with each
-     other. Although conversion tools do exist, they are limited and
-     add even more overhead.
-  * *Hardware-centric*: VMs were designed with machine operators in
-    mind, not software developers. As a result, they offer very
-    limited tooling for what developers need most: building, testing
-    and running their software. For example, VMs offer no facilities
-    for application versioning, monitoring, configuration, logging or
-    service discovery.
-
-By contrast, Docker relies on a different sandboxing method known as
-*containerization*. Unlike traditional virtualization, containerization
-takes place at the kernel level. Most modern operating system kernels
-now support the primitives necessary for containerization, including
-Linux with [openvz](https://openvz.org),
-[vserver](http://linux-vserver.org) and more recently
-[lxc](https://linuxcontainers.org/), Solaris with
-[zones](https://docs.oracle.com/cd/E26502_01/html/E29024/preface-1.html#scrolltoc),
-and FreeBSD with
-[Jails](https://www.freebsd.org/doc/handbook/jails.html).
-
-Docker builds on top of these low-level primitives to offer developers a
-portable format and runtime environment that solves all four problems.
-Docker containers are small (and their transfer can be optimized with
-layers), they have basically zero memory and cpu overhead, they are
-completely portable, and are designed from the ground up with an
-application-centric design.
-
-Perhaps best of all, because Docker operates at the OS level, it can still be
-run inside a VM!
-
-## Plays well with others
-
-Docker does not require you to buy into a particular programming
-language, framework, packaging system, or configuration language.
-
-Is your application a Unix process? Does it use files, tcp connections,
-environment variables, standard Unix streams and command-line arguments
-as inputs and outputs? Then Docker can run it.
-
-Can your application's build be expressed as a sequence of such
-commands? Then Docker can build it.
-
-## Escape dependency hell
-
-A common problem for developers is the difficulty of managing all
-their application's dependencies in a simple and automated way.
-
-This is usually difficult for several reasons:
-
-  * *Cross-platform dependencies*. Modern applications often depend on
-    a combination of system libraries and binaries, language-specific
-    packages, framework-specific modules, internal components
-    developed for another project, etc. These dependencies live in
-    different "worlds" and require different tools - these tools
-    typically don't work well with each other, requiring awkward
-    custom integrations.
-
-  * *Conflicting dependencies*. Different applications may depend on
-    different versions of the same dependency. Packaging tools handle
-    these situations with various degrees of ease - but they all
-    handle them in different and incompatible ways, which again forces
-    the developer to do extra work.
-
-  * *Custom dependencies*. A developer may need to prepare a custom
-    version of their application's dependency. Some packaging systems
-    can handle custom versions of a dependency, others can't - and all
-    of them handle it differently.
-
-
-Docker solves the problem of dependency hell by giving the developer a simple
-way to express *all* their application's dependencies in one place, while
-streamlining the process of assembling them. If this makes you think of
-[XKCD 927](https://xkcd.com/927/), don't worry. Docker doesn't
-*replace* your favorite packaging systems. It simply orchestrates
-their use in a simple and repeatable way. How does it do that? With
-layers.
-
-Docker defines a build as running a sequence of Unix commands, one
-after the other, in the same container. Build commands modify the
-contents of the container (usually by installing new files on the
-filesystem), the next command modifies it some more, etc. Since each
-build command inherits the result of the previous commands, the
-*order* in which the commands are executed expresses *dependencies*.
-
-Here's a typical Docker build process:
-
-```bash
-FROM ubuntu:12.04
-RUN apt-get update && apt-get install -y python python-pip curl
-RUN curl -sSL https://github.com/shykes/helloflask/archive/master.tar.gz | tar -xzv
-RUN cd helloflask-master && pip install -r requirements.txt
-```
-
-Note that Docker doesn't care *how* dependencies are built - as long
-as they can be built by running a Unix command in a container.
-
-
-Getting started
-===============
-
-Docker can be installed either on your computer for building applications or
-on servers for running them. To get started, [check out the installation
-instructions in the
-documentation](https://docs.docker.com/engine/installation/).
-
-Usage examples
-==============
-
-Docker can be used to run short-lived commands, long-running daemons
-(app servers, databases, etc.), interactive shell sessions, etc.
-
-You can find a [list of real-world
-examples](https://docs.docker.com/engine/examples/) in the
-documentation.
-
-Under the hood
---------------
-
-Under the hood, Docker is built on the following components:
-
-* The
-  [cgroups](https://www.kernel.org/doc/Documentation/cgroup-v1/cgroups.txt)
-  and
-  [namespaces](http://man7.org/linux/man-pages/man7/namespaces.7.html)
-  capabilities of the Linux kernel
-* The [Go](https://golang.org) programming language
-* The [Docker Image Specification](https://github.com/docker/docker/blob/master/image/spec/v1.md)
-* The [Libcontainer Specification](https://github.com/opencontainers/runc/blob/master/libcontainer/SPEC.md)
-
-Contributing to Docker [![GoDoc](https://godoc.org/github.com/docker/docker?status.svg)](https://godoc.org/github.com/docker/docker)
-======================
-
-| **Master** (Linux) | **Experimental** (Linux) | **Windows** | **FreeBSD** |
-|------------------|----------------------|---------|---------|
-| [![Jenkins Build Status](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master/badge/icon)](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master/) | [![Jenkins Build Status](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master%20%28experimental%29/badge/icon)](https://jenkins.dockerproject.org/view/Docker/job/Docker%20Master%20%28experimental%29/) | [![Build Status](http://jenkins.dockerproject.org/job/Docker%20Master%20(windows)/badge/icon)](http://jenkins.dockerproject.org/job/Docker%20Master%20(windows)/) | [![Build Status](http://jenkins.dockerproject.org/job/Docker%20Master%20(freebsd)/badge/icon)](http://jenkins.dockerproject.org/job/Docker%20Master%20(freebsd)/) |
-
-Want to hack on Docker? Awesome! We have [instructions to help you get
-started contributing code or documentation](https://docs.docker.com/opensource/project/who-written-for/).
-
-These instructions are probably not perfect, please let us know if anything
-feels wrong or incomplete. Better yet, submit a PR and improve them yourself.
-
-Getting the development builds
-==============================
-
-Want to run Docker from a master build? You can download
-master builds at [master.dockerproject.org](https://master.dockerproject.org).
-They are updated with each commit merged into the master branch.
-
-Don't know how to use that super cool new feature in the master build? Check
-out the master docs at
-[docs.master.dockerproject.org](http://docs.master.dockerproject.org).
-
-How the project is run
-======================
-
-Docker is a very, very active project. If you want to learn more about how it is run,
-or want to get more involved, the best place to start is [the project directory](https://github.com/docker/docker/tree/master/project).
-
-We are always open to suggestions on process improvements, and are always looking for more maintainers.
-
-### Talking to other Docker users and contributors
-
-<table class="tg">
-  <col width="45%">
-  <col width="65%">
-  <tr>
-    <td>Internet&nbsp;Relay&nbsp;Chat&nbsp;(IRC)</td>
-    <td>
-      <p>
-        IRC is a direct line to our most knowledgeable Docker users; we have
-        both the  <code>#docker</code> and <code>#docker-dev</code> group on
-        <strong>irc.freenode.net</strong>.
-        IRC is a rich chat protocol but it can overwhelm new users. You can search
-        <a href="https://botbot.me/freenode/docker/#" target="_blank">our chat archives</a>.
-      </p>
-      Read our <a href="https://docs.docker.com/opensource/get-help/#/irc-quickstart" target="_blank">IRC quickstart guide</a> for an easy way to get started.
-    </td>
-  </tr>
-  <tr>
-    <td>Docker Community Forums</td>
-    <td>
-      The <a href="https://forums.docker.com/c/open-source-projects/de" target="_blank">Docker Engine</a>
-      group is for users of the Docker Engine project.
-    </td>
-  </tr>
-  <tr>
-    <td>Google Groups</td>
-    <td>
-      The <a href="https://groups.google.com/forum/#!forum/docker-dev"
-      target="_blank">docker-dev</a> group is for contributors and other people
-      contributing to the Docker project.  You can join this group without a
-      Google account by sending an email to <a
-      href="mailto:docker-dev+subscribe@googlegroups.com">docker-dev+subscribe@googlegroups.com</a>.
-      You'll receive a join-request message; simply reply to the message to
-      confirm your subscription.
-    </td>
-  </tr>
-  <tr>
-    <td>Twitter</td>
-    <td>
-      You can follow <a href="https://twitter.com/docker/" target="_blank">Docker's Twitter feed</a>
-      to get updates on our products. You can also tweet us questions or just
-      share blogs or stories.
-    </td>
-  </tr>
-  <tr>
-    <td>Stack Overflow</td>
-    <td>
-      Stack Overflow has over 7000 Docker questions listed. We regularly
-      monitor <a href="https://stackoverflow.com/search?tab=newest&q=docker" target="_blank">Docker questions</a>
-      and so do many other knowledgeable Docker users.
-    </td>
-  </tr>
-</table>
-
-### Legal
-
-*Brought to you courtesy of our legal counsel. For more context,
-please see the [NOTICE](https://github.com/docker/docker/blob/master/NOTICE) document in this repo.*
-
-Use and transfer of Docker may be subject to certain restrictions by the
-United States and other governments.
-
-It is your responsibility to ensure that your use and/or transfer does not
-violate applicable laws.
-
-For more information, please see https://www.bis.doc.gov
-
-
-Licensing
-=========
-Docker is licensed under the Apache License, Version 2.0. See
-[LICENSE](https://github.com/docker/docker/blob/master/LICENSE) for the full
-license text.
-
-Other Docker Related Projects
-=============================
-There are a number of projects under development that are based on Docker's
-core technology. These projects expand the tooling built around the
-Docker platform to broaden its application and utility.
-
-* [Docker Registry](https://github.com/docker/distribution): Registry
-server for Docker (hosting/delivery of repositories and images)
-* [Docker Machine](https://github.com/docker/machine): Machine management
-for a container-centric world
-* [Docker Swarm](https://github.com/docker/swarm): A Docker-native clustering
-system
-* [Docker Compose](https://github.com/docker/compose) (formerly Fig):
-Define and run multi-container apps
-* [Kitematic](https://github.com/docker/kitematic): The easiest way to use
-Docker on Mac and Windows
-
-If you know of another project underway that should be listed here, please help
-us keep this list up-to-date by submitting a PR.
-
-Awesome-Docker
-==============
-You can find more projects, tools and articles related to Docker on the [awesome-docker list](https://github.com/veggiemonk/awesome-docker). Add your project there.
diff --git a/installer/vendor/github.com/docker/docker/ROADMAP.md b/installer/vendor/github.com/docker/docker/ROADMAP.md
deleted file mode 100644
index 21fe06dba6..0000000000
--- a/installer/vendor/github.com/docker/docker/ROADMAP.md
+++ /dev/null
@@ -1,118 +0,0 @@
-Docker Engine Roadmap
-=====================
-
-### How should I use this document?
-
-This document provides description of items that the project decided to prioritize. This should
-serve as a reference point for Docker contributors to understand where the project is going, and
-help determine if a contribution could be conflicting with some longer terms plans.
-
-The fact that a feature isn't listed here doesn't mean that a patch for it will automatically be
-refused (except for those mentioned as "frozen features" below)! We are always happy to receive
-patches for new cool features we haven't thought about, or didn't judge priority. Please however
-understand that such patches might take longer for us to review.
-
-### How can I help?
-
-Short term objectives are listed in the [wiki](https://github.com/docker/docker/wiki) and described
-in [Issues](https://github.com/docker/docker/issues?q=is%3Aopen+is%3Aissue+label%3Aroadmap). Our
-goal is to split down the workload in such way that anybody can jump in and help. Please comment on
-issues if you want to take it to avoid duplicating effort! Similarly, if a maintainer is already
-assigned on an issue you'd like to participate in, pinging him on IRC or GitHub to offer your help is
-the best way to go.
-
-### How can I add something to the roadmap?
-
-The roadmap process is new to the Docker Engine: we are only beginning to structure and document the
-project objectives. Our immediate goal is to be more transparent, and work with our community to
-focus our efforts on fewer prioritized topics.
-
-We hope to offer in the near future a process allowing anyone to propose a topic to the roadmap, but
-we are not quite there yet. For the time being, the BDFL remains the keeper of the roadmap, and we
-won't be accepting pull requests adding or removing items from this file.
-
-# 1. Features and refactoring
-
-## 1.1 Runtime improvements
-
-We recently introduced [`runC`](https://runc.io) as a standalone low-level tool for container
-execution. The initial goal was to integrate runC as a replacement in the Engine for the traditional
-default libcontainer `execdriver`, but the Engine internals were not ready for this.
-
-As runC continued evolving, and the OCI specification along with it, we created
-[`containerd`](https://containerd.tools/), a daemon to control and monitor multiple `runC`. This is
-the new target for Engine integration, as it can entirely replace the whole `execdriver`
-architecture, and container monitoring along with it.
-
-Docker Engine will rely on a long-running `containerd` companion daemon for all container execution
-related operations. This could open the door in the future for Engine restarts without interrupting
-running containers.
-
-## 1.2 Plugins improvements
-
-Docker Engine 1.7.0 introduced plugin support, initially for the use cases of volumes and networks
-extensions. The plugin infrastructure was kept minimal as we were collecting use cases and real
-world feedback before optimizing for any particular workflow.
-
-In the future, we'd like plugins to become first class citizens, and encourage an ecosystem of
-plugins. This implies in particular making it trivially easy to distribute plugins as containers
-through any Registry instance, as well as solving the commonly heard pain points of plugins needing
-to be treated as somewhat special (being active at all time, started before any other user
-containers, and not as easily dismissed).
-
-## 1.3 Internal decoupling
-
-A lot of work has been done in trying to decouple the Docker Engine's internals. In particular, the
-API implementation has been refactored, and the Builder side of the daemon is now
-[fully independent](https://github.com/docker/docker/tree/master/builder) while still residing in
-the same repository.
-
-We are exploring ways to go further with that decoupling, capitalizing on the work introduced by the
-runtime renovation and plugins improvement efforts. Indeed, the combination of `containerd` support
-with the concept of "special" containers opens the door for bootstrapping more Engine internals
-using the same facilities.
-
-## 1.4 Cluster capable Engine
-
-The community has been pushing for a more cluster capable Docker Engine, and a huge effort was spent
-adding features such as multihost networking, and node discovery down at the Engine level. Yet, the
-Engine is currently incapable of taking scheduling decisions alone, and continues relying on Swarm
-for that.
-
-We plan to complete this effort and make Engine fully cluster capable. Multiple instances of the
-Docker Engine being already capable of discovering each other and establish overlay networking for
-their container to communicate, the next step is for a given Engine to gain ability to dispatch work
-to another node in the cluster. This will be introduced in a backward compatible way, such that a
-`docker run` invocation on a particular node remains fully deterministic.
-
-# 2 Frozen features
-
-## 2.1 Docker exec
-
-We won't accept patches expanding the surface of `docker exec`, which we intend to keep as a
-*debugging* feature, as well as being strongly dependent on the Runtime ingredient effort.
-
-## 2.2 Remote Registry Operations
-
-A large amount of work is ongoing in the area of image distribution and provenance. This includes
-moving to the V2 Registry API and heavily refactoring the code that powers these features. The
-desired result is more secure, reliable and easier to use image distribution.
-
-Part of the problem with this part of the code base is the lack of a stable and flexible interface.
-If new features are added that access the registry without solidifying these interfaces, achieving
-feature parity will continue to be elusive. While we get a handle on this situation, we are imposing
-a moratorium on new code that accesses the Registry API in commands that don't already make remote
-calls.
-
-Currently, only the following commands cause interaction with a remote registry:
-
-  - push
-  - pull
-  - run
-  - build
-  - search
-  - login
-
-In the interest of stabilizing the registry access model during this ongoing work, we are not
-accepting additions to other commands that will cause remote interaction with the Registry API. This
-moratorium will lift when the goals of the distribution project have been met.
diff --git a/installer/vendor/github.com/docker/docker/VENDORING.md b/installer/vendor/github.com/docker/docker/VENDORING.md
deleted file mode 100644
index 3086f9d172..0000000000
--- a/installer/vendor/github.com/docker/docker/VENDORING.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Vendoring policies
-
-This document outlines recommended Vendoring policies for Docker repositories.
-(Example, libnetwork is a Docker repo and logrus is not.)
-
-## Vendoring using tags
-
-Commit ID based vendoring provides little/no information about the updates
-vendored. To fix this, vendors will now require that repositories use annotated
-tags along with commit ids to snapshot commits. Annotated tags by themselves
-are not sufficient, since the same tag can be force updated to reference
-different commits.
-
-Each tag should:
-- Follow Semantic Versioning rules (refer to section on "Semantic Versioning")
-- Have a corresponding entry in the change tracking document.
-
-Each repo should:
-- Have a change tracking document between tags/releases. Ex: CHANGELOG.md,
-github releases file.
-
-The goal here is for consuming repos to be able to use the tag version and
-changelog updates to determine whether the vendoring will cause any breaking or
-backward incompatible changes. This also means that repos can specify having
-dependency on a package of a specific version or greater up to the next major
-release, without encountering breaking changes.
-
-## Semantic Versioning
-Annotated version tags should follow Schema Versioning policies.
-According to http://semver.org:
-
-"Given a version number MAJOR.MINOR.PATCH, increment the:
-    MAJOR version when you make incompatible API changes,
-    MINOR version when you add functionality in a backwards-compatible manner, and
-    PATCH version when you make backwards-compatible bug fixes.
-Additional labels for pre-release and build metadata are available as extensions
-to the MAJOR.MINOR.PATCH format."
-
-## Vendoring cadence
-In order to avoid huge vendoring changes, it is recommended to have a regular
-cadence for vendoring updates. e.g. monthly.
-
-## Pre-merge vendoring tests
-All related repos will be vendored into docker/docker.
-CI on docker/docker should catch any breaking changes involving multiple repos.
diff --git a/installer/vendor/github.com/docker/docker/VERSION b/installer/vendor/github.com/docker/docker/VERSION
deleted file mode 100644
index b50dd27dd9..0000000000
--- a/installer/vendor/github.com/docker/docker/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-1.13.1
diff --git a/installer/vendor/github.com/docker/docker/api/README.md b/installer/vendor/github.com/docker/docker/api/README.md
deleted file mode 100644
index 464e056958..0000000000
--- a/installer/vendor/github.com/docker/docker/api/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Working on the Engine API
-
-The Engine API is an HTTP API used by the command-line client to communicate with the daemon. It can also be used by third-party software to control the daemon.
-
-It consists of various components in this repository:
-
-- `api/swagger.yaml` A Swagger definition of the API.
-- `api/types/` Types shared by both the client and server, representing various objects, options, responses, etc. Most are written manually, but some are automatically generated from the Swagger definition. See [#27919](https://github.com/docker/docker/issues/27919) for progress on this.
-- `cli/` The command-line client.
-- `client/` The Go client used by the command-line client. It can also be used by third-party Go programs.
-- `daemon/` The daemon, which serves the API.
-
-## Swagger definition
-
-The API is defined by the [Swagger](http://swagger.io/specification/) definition in `api/swagger.yaml`. This definition can be used to:
-
-1. To automatically generate documentation.
-2. To automatically generate the Go server and client. (A work-in-progress.)
-3. Provide a machine readable version of the API for introspecting what it can do, automatically generating clients for other languages, etc.
-
-## Updating the API documentation
-
-The API documentation is generated entirely from `api/swagger.yaml`. If you make updates to the API, you'll need to edit this file to represent the change in the documentation.
-
-The file is split into two main sections:
-
-- `definitions`, which defines re-usable objects used in requests and responses
-- `paths`, which defines the API endpoints (and some inline objects which don't need to be reusable)
-
-To make an edit, first look for the endpoint you want to edit under `paths`, then make the required edits. Endpoints may reference reusable objects with `$ref`, which can be found in the `definitions` section.
-
-There is hopefully enough example material in the file for you to copy a similar pattern from elsewhere in the file (e.g. adding new fields or endpoints), but for the full reference, see the [Swagger specification](https://github.com/docker/docker/issues/27919)
-
-`swagger.yaml` is validated by `hack/validate/swagger` to ensure it is a valid Swagger definition. This is useful for when you are making edits to ensure you are doing the right thing.
-
-## Viewing the API documentation
-
-When you make edits to `swagger.yaml`, you may want to check the generated API documentation to ensure it renders correctly.
-
-All the documentation generation is done in the documentation repository, [docker/docker.github.io](https://github.com/docker/docker.github.io). The Swagger definition is vendored periodically into this repository, but you can manually copy over the Swagger definition to test changes.
-
-Copy `api/swagger.yaml` in this repository to `engine/api/[VERSION_NUMBER]/swagger.yaml` in the documentation repository, overwriting what is already there. Then, run `docker-compose up` in the documentation repository and browse to [http://localhost:4000/engine/api/](http://localhost:4000/engine/api/) when it finishes rendering.
diff --git a/installer/vendor/github.com/docker/docker/api/common.go b/installer/vendor/github.com/docker/docker/api/common.go
deleted file mode 100644
index fd065d5abe..0000000000
--- a/installer/vendor/github.com/docker/docker/api/common.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package api
-
-import (
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"mime"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/libtrust"
-)
-
-// Common constants for daemon and client.
-const (
-	// DefaultVersion of Current REST API
-	DefaultVersion string = "1.26"
-
-	// NoBaseImageSpecifier is the symbol used by the FROM
-	// command to specify that no base image is to be used.
-	NoBaseImageSpecifier string = "scratch"
-)
-
-// byPortInfo is a temporary type used to sort types.Port by its fields
-type byPortInfo []types.Port
-
-func (r byPortInfo) Len() int      { return len(r) }
-func (r byPortInfo) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r byPortInfo) Less(i, j int) bool {
-	if r[i].PrivatePort != r[j].PrivatePort {
-		return r[i].PrivatePort < r[j].PrivatePort
-	}
-
-	if r[i].IP != r[j].IP {
-		return r[i].IP < r[j].IP
-	}
-
-	if r[i].PublicPort != r[j].PublicPort {
-		return r[i].PublicPort < r[j].PublicPort
-	}
-
-	return r[i].Type < r[j].Type
-}
-
-// DisplayablePorts returns formatted string representing open ports of container
-// e.g. "0.0.0.0:80->9090/tcp, 9988/tcp"
-// it's used by command 'docker ps'
-func DisplayablePorts(ports []types.Port) string {
-	type portGroup struct {
-		first uint16
-		last  uint16
-	}
-	groupMap := make(map[string]*portGroup)
-	var result []string
-	var hostMappings []string
-	var groupMapKeys []string
-	sort.Sort(byPortInfo(ports))
-	for _, port := range ports {
-		current := port.PrivatePort
-		portKey := port.Type
-		if port.IP != "" {
-			if port.PublicPort != current {
-				hostMappings = append(hostMappings, fmt.Sprintf("%s:%d->%d/%s", port.IP, port.PublicPort, port.PrivatePort, port.Type))
-				continue
-			}
-			portKey = fmt.Sprintf("%s/%s", port.IP, port.Type)
-		}
-		group := groupMap[portKey]
-
-		if group == nil {
-			groupMap[portKey] = &portGroup{first: current, last: current}
-			// record order that groupMap keys are created
-			groupMapKeys = append(groupMapKeys, portKey)
-			continue
-		}
-		if current == (group.last + 1) {
-			group.last = current
-			continue
-		}
-
-		result = append(result, formGroup(portKey, group.first, group.last))
-		groupMap[portKey] = &portGroup{first: current, last: current}
-	}
-	for _, portKey := range groupMapKeys {
-		g := groupMap[portKey]
-		result = append(result, formGroup(portKey, g.first, g.last))
-	}
-	result = append(result, hostMappings...)
-	return strings.Join(result, ", ")
-}
-
-func formGroup(key string, start, last uint16) string {
-	parts := strings.Split(key, "/")
-	groupType := parts[0]
-	var ip string
-	if len(parts) > 1 {
-		ip = parts[0]
-		groupType = parts[1]
-	}
-	group := strconv.Itoa(int(start))
-	if start != last {
-		group = fmt.Sprintf("%s-%d", group, last)
-	}
-	if ip != "" {
-		group = fmt.Sprintf("%s:%s->%s", ip, group, group)
-	}
-	return fmt.Sprintf("%s/%s", group, groupType)
-}
-
-// MatchesContentType validates the content type against the expected one
-func MatchesContentType(contentType, expectedType string) bool {
-	mimetype, _, err := mime.ParseMediaType(contentType)
-	if err != nil {
-		logrus.Errorf("Error parsing media type: %s error: %v", contentType, err)
-	}
-	return err == nil && mimetype == expectedType
-}
-
-// LoadOrCreateTrustKey attempts to load the libtrust key at the given path,
-// otherwise generates a new one
-func LoadOrCreateTrustKey(trustKeyPath string) (libtrust.PrivateKey, error) {
-	err := system.MkdirAll(filepath.Dir(trustKeyPath), 0700)
-	if err != nil {
-		return nil, err
-	}
-	trustKey, err := libtrust.LoadKeyFile(trustKeyPath)
-	if err == libtrust.ErrKeyFileDoesNotExist {
-		trustKey, err = libtrust.GenerateECP256PrivateKey()
-		if err != nil {
-			return nil, fmt.Errorf("Error generating key: %s", err)
-		}
-		encodedKey, err := serializePrivateKey(trustKey, filepath.Ext(trustKeyPath))
-		if err != nil {
-			return nil, fmt.Errorf("Error serializing key: %s", err)
-		}
-		if err := ioutils.AtomicWriteFile(trustKeyPath, encodedKey, os.FileMode(0600)); err != nil {
-			return nil, fmt.Errorf("Error saving key file: %s", err)
-		}
-	} else if err != nil {
-		return nil, fmt.Errorf("Error loading key file %s: %s", trustKeyPath, err)
-	}
-	return trustKey, nil
-}
-
-func serializePrivateKey(key libtrust.PrivateKey, ext string) (encoded []byte, err error) {
-	if ext == ".json" || ext == ".jwk" {
-		encoded, err = json.Marshal(key)
-		if err != nil {
-			return nil, fmt.Errorf("unable to encode private key JWK: %s", err)
-		}
-	} else {
-		pemBlock, err := key.PEMBlock()
-		if err != nil {
-			return nil, fmt.Errorf("unable to encode private key PEM: %s", err)
-		}
-		encoded = pem.EncodeToMemory(pemBlock)
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/api/common_test.go b/installer/vendor/github.com/docker/docker/api/common_test.go
deleted file mode 100644
index 31d6f58253..0000000000
--- a/installer/vendor/github.com/docker/docker/api/common_test.go
+++ /dev/null
@@ -1,341 +0,0 @@
-package api
-
-import (
-	"io/ioutil"
-	"path/filepath"
-	"testing"
-
-	"os"
-
-	"github.com/docker/docker/api/types"
-)
-
-type ports struct {
-	ports    []types.Port
-	expected string
-}
-
-// DisplayablePorts
-func TestDisplayablePorts(t *testing.T) {
-	cases := []ports{
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9988,
-					Type:        "tcp",
-				},
-			},
-			"9988/tcp"},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9988,
-					Type:        "udp",
-				},
-			},
-			"9988/udp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "0.0.0.0",
-					PrivatePort: 9988,
-					Type:        "tcp",
-				},
-			},
-			"0.0.0.0:0->9988/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "tcp",
-				},
-			},
-			"9988/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "4.3.2.1",
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "tcp",
-				},
-			},
-			"4.3.2.1:8899->9988/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "4.3.2.1",
-					PrivatePort: 9988,
-					PublicPort:  9988,
-					Type:        "tcp",
-				},
-			},
-			"4.3.2.1:9988->9988/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9988,
-					Type:        "udp",
-				}, {
-					PrivatePort: 9988,
-					Type:        "udp",
-				},
-			},
-			"9988/udp, 9988/udp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "1.2.3.4",
-					PublicPort:  9998,
-					PrivatePort: 9998,
-					Type:        "udp",
-				}, {
-					IP:          "1.2.3.4",
-					PublicPort:  9999,
-					PrivatePort: 9999,
-					Type:        "udp",
-				},
-			},
-			"1.2.3.4:9998-9999->9998-9999/udp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "1.2.3.4",
-					PublicPort:  8887,
-					PrivatePort: 9998,
-					Type:        "udp",
-				}, {
-					IP:          "1.2.3.4",
-					PublicPort:  8888,
-					PrivatePort: 9999,
-					Type:        "udp",
-				},
-			},
-			"1.2.3.4:8887->9998/udp, 1.2.3.4:8888->9999/udp",
-		},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9998,
-					Type:        "udp",
-				}, {
-					PrivatePort: 9999,
-					Type:        "udp",
-				},
-			},
-			"9998-9999/udp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "1.2.3.4",
-					PrivatePort: 6677,
-					PublicPort:  7766,
-					Type:        "tcp",
-				}, {
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "udp",
-				},
-			},
-			"9988/udp, 1.2.3.4:7766->6677/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					IP:          "1.2.3.4",
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "udp",
-				}, {
-					IP:          "1.2.3.4",
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "tcp",
-				}, {
-					IP:          "4.3.2.1",
-					PrivatePort: 2233,
-					PublicPort:  3322,
-					Type:        "tcp",
-				},
-			},
-			"4.3.2.1:3322->2233/tcp, 1.2.3.4:8899->9988/tcp, 1.2.3.4:8899->9988/udp",
-		},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 9988,
-					PublicPort:  8899,
-					Type:        "udp",
-				}, {
-					IP:          "1.2.3.4",
-					PrivatePort: 6677,
-					PublicPort:  7766,
-					Type:        "tcp",
-				}, {
-					IP:          "4.3.2.1",
-					PrivatePort: 2233,
-					PublicPort:  3322,
-					Type:        "tcp",
-				},
-			},
-			"9988/udp, 4.3.2.1:3322->2233/tcp, 1.2.3.4:7766->6677/tcp",
-		},
-		{
-			[]types.Port{
-				{
-					PrivatePort: 80,
-					Type:        "tcp",
-				}, {
-					PrivatePort: 1024,
-					Type:        "tcp",
-				}, {
-					PrivatePort: 80,
-					Type:        "udp",
-				}, {
-					PrivatePort: 1024,
-					Type:        "udp",
-				}, {
-					IP:          "1.1.1.1",
-					PublicPort:  80,
-					PrivatePort: 1024,
-					Type:        "tcp",
-				}, {
-					IP:          "1.1.1.1",
-					PublicPort:  80,
-					PrivatePort: 1024,
-					Type:        "udp",
-				}, {
-					IP:          "1.1.1.1",
-					PublicPort:  1024,
-					PrivatePort: 80,
-					Type:        "tcp",
-				}, {
-					IP:          "1.1.1.1",
-					PublicPort:  1024,
-					PrivatePort: 80,
-					Type:        "udp",
-				}, {
-					IP:          "2.1.1.1",
-					PublicPort:  80,
-					PrivatePort: 1024,
-					Type:        "tcp",
-				}, {
-					IP:          "2.1.1.1",
-					PublicPort:  80,
-					PrivatePort: 1024,
-					Type:        "udp",
-				}, {
-					IP:          "2.1.1.1",
-					PublicPort:  1024,
-					PrivatePort: 80,
-					Type:        "tcp",
-				}, {
-					IP:          "2.1.1.1",
-					PublicPort:  1024,
-					PrivatePort: 80,
-					Type:        "udp",
-				},
-			},
-			"80/tcp, 80/udp, 1024/tcp, 1024/udp, 1.1.1.1:1024->80/tcp, 1.1.1.1:1024->80/udp, 2.1.1.1:1024->80/tcp, 2.1.1.1:1024->80/udp, 1.1.1.1:80->1024/tcp, 1.1.1.1:80->1024/udp, 2.1.1.1:80->1024/tcp, 2.1.1.1:80->1024/udp",
-		},
-	}
-
-	for _, port := range cases {
-		actual := DisplayablePorts(port.ports)
-		if port.expected != actual {
-			t.Fatalf("Expected %s, got %s.", port.expected, actual)
-		}
-	}
-}
-
-// MatchesContentType
-func TestJsonContentType(t *testing.T) {
-	if !MatchesContentType("application/json", "application/json") {
-		t.Fail()
-	}
-
-	if !MatchesContentType("application/json; charset=utf-8", "application/json") {
-		t.Fail()
-	}
-
-	if MatchesContentType("dockerapplication/json", "application/json") {
-		t.Fail()
-	}
-}
-
-// LoadOrCreateTrustKey
-func TestLoadOrCreateTrustKeyInvalidKeyFile(t *testing.T) {
-	tmpKeyFolderPath, err := ioutil.TempDir("", "api-trustkey-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpKeyFolderPath)
-
-	tmpKeyFile, err := ioutil.TempFile(tmpKeyFolderPath, "keyfile")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := LoadOrCreateTrustKey(tmpKeyFile.Name()); err == nil {
-		t.Fatalf("expected an error, got nothing.")
-	}
-
-}
-
-func TestLoadOrCreateTrustKeyCreateKey(t *testing.T) {
-	tmpKeyFolderPath, err := ioutil.TempDir("", "api-trustkey-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpKeyFolderPath)
-
-	// Without the need to create the folder hierarchy
-	tmpKeyFile := filepath.Join(tmpKeyFolderPath, "keyfile")
-
-	if key, err := LoadOrCreateTrustKey(tmpKeyFile); err != nil || key == nil {
-		t.Fatalf("expected a new key file, got : %v and %v", err, key)
-	}
-
-	if _, err := os.Stat(tmpKeyFile); err != nil {
-		t.Fatalf("Expected to find a file %s, got %v", tmpKeyFile, err)
-	}
-
-	// With the need to create the folder hierarchy as tmpKeyFie is in a path
-	// where some folders do not exist.
-	tmpKeyFile = filepath.Join(tmpKeyFolderPath, "folder/hierarchy/keyfile")
-
-	if key, err := LoadOrCreateTrustKey(tmpKeyFile); err != nil || key == nil {
-		t.Fatalf("expected a new key file, got : %v and %v", err, key)
-	}
-
-	if _, err := os.Stat(tmpKeyFile); err != nil {
-		t.Fatalf("Expected to find a file %s, got %v", tmpKeyFile, err)
-	}
-
-	// With no path at all
-	defer os.Remove("keyfile")
-	if key, err := LoadOrCreateTrustKey("keyfile"); err != nil || key == nil {
-		t.Fatalf("expected a new key file, got : %v and %v", err, key)
-	}
-
-	if _, err := os.Stat("keyfile"); err != nil {
-		t.Fatalf("Expected to find a file keyfile, got %v", err)
-	}
-}
-
-func TestLoadOrCreateTrustKeyLoadValidKey(t *testing.T) {
-	tmpKeyFile := filepath.Join("fixtures", "keyfile")
-
-	if key, err := LoadOrCreateTrustKey(tmpKeyFile); err != nil || key == nil {
-		t.Fatalf("expected a key file, got : %v and %v", err, key)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/common_unix.go b/installer/vendor/github.com/docker/docker/api/common_unix.go
deleted file mode 100644
index 081e61c451..0000000000
--- a/installer/vendor/github.com/docker/docker/api/common_unix.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !windows
-
-package api
-
-// MinVersion represents Minimum REST API version supported
-const MinVersion string = "1.12"
diff --git a/installer/vendor/github.com/docker/docker/api/common_windows.go b/installer/vendor/github.com/docker/docker/api/common_windows.go
deleted file mode 100644
index d930fa0720..0000000000
--- a/installer/vendor/github.com/docker/docker/api/common_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package api
-
-// MinVersion represents Minimum REST API version supported
-// Technically the first daemon API version released on Windows is v1.25 in
-// engine version 1.13. However, some clients are explicitly using downlevel
-// APIs (eg docker-compose v2.1 file format) and that is just too restrictive.
-// Hence also allowing 1.24 on Windows.
-const MinVersion string = "1.24"
diff --git a/installer/vendor/github.com/docker/docker/api/errors/errors.go b/installer/vendor/github.com/docker/docker/api/errors/errors.go
deleted file mode 100644
index 29fd2545dc..0000000000
--- a/installer/vendor/github.com/docker/docker/api/errors/errors.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package errors
-
-import "net/http"
-
-// apiError is an error wrapper that also
-// holds information about response status codes.
-type apiError struct {
-	error
-	statusCode int
-}
-
-// HTTPErrorStatusCode returns a status code.
-func (e apiError) HTTPErrorStatusCode() int {
-	return e.statusCode
-}
-
-// NewErrorWithStatusCode allows you to associate
-// a specific HTTP Status Code to an error.
-// The Server will take that code and set
-// it as the response status.
-func NewErrorWithStatusCode(err error, code int) error {
-	return apiError{err, code}
-}
-
-// NewBadRequestError creates a new API error
-// that has the 400 HTTP status code associated to it.
-func NewBadRequestError(err error) error {
-	return NewErrorWithStatusCode(err, http.StatusBadRequest)
-}
-
-// NewRequestForbiddenError creates a new API error
-// that has the 403 HTTP status code associated to it.
-func NewRequestForbiddenError(err error) error {
-	return NewErrorWithStatusCode(err, http.StatusForbidden)
-}
-
-// NewRequestNotFoundError creates a new API error
-// that has the 404 HTTP status code associated to it.
-func NewRequestNotFoundError(err error) error {
-	return NewErrorWithStatusCode(err, http.StatusNotFound)
-}
-
-// NewRequestConflictError creates a new API error
-// that has the 409 HTTP status code associated to it.
-func NewRequestConflictError(err error) error {
-	return NewErrorWithStatusCode(err, http.StatusConflict)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/fixtures/keyfile b/installer/vendor/github.com/docker/docker/api/fixtures/keyfile
deleted file mode 100644
index 322f254404..0000000000
--- a/installer/vendor/github.com/docker/docker/api/fixtures/keyfile
+++ /dev/null
@@ -1,7 +0,0 @@
------BEGIN EC PRIVATE KEY-----
-keyID: AWX2:I27X:WQFX:IOMK:CNAK:O7PW:VYNB:ZLKC:CVAE:YJP2:SI4A:XXAY
-
-MHcCAQEEILHTRWdcpKWsnORxSFyBnndJ4ROU41hMtr/GCiLVvwBQoAoGCCqGSM49
-AwEHoUQDQgAElpVFbQ2V2UQKajqdE3fVxJ+/pE/YuEFOxWbOxF2be19BY209/iky
-NzeFFK7SLpQ4CBJ7zDVXOHsMzrkY/GquGA==
------END EC PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/decoder.go b/installer/vendor/github.com/docker/docker/api/server/httputils/decoder.go
deleted file mode 100644
index 458eac5600..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/decoder.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package httputils
-
-import (
-	"io"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-)
-
-// ContainerDecoder specifies how
-// to translate an io.Reader into
-// container configuration.
-type ContainerDecoder interface {
-	DecodeConfig(src io.Reader) (*container.Config, *container.HostConfig, *network.NetworkingConfig, error)
-	DecodeHostConfig(src io.Reader) (*container.HostConfig, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/errors.go b/installer/vendor/github.com/docker/docker/api/server/httputils/errors.go
deleted file mode 100644
index 59098a9df0..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/errors.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package httputils
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/gorilla/mux"
-	"google.golang.org/grpc"
-)
-
-// httpStatusError is an interface
-// that errors with custom status codes
-// implement to tell the api layer
-// which response status to set.
-type httpStatusError interface {
-	HTTPErrorStatusCode() int
-}
-
-// inputValidationError is an interface
-// that errors generated by invalid
-// inputs can implement to tell the
-// api layer to set a 400 status code
-// in the response.
-type inputValidationError interface {
-	IsValidationError() bool
-}
-
-// GetHTTPErrorStatusCode retrieves status code from error message
-func GetHTTPErrorStatusCode(err error) int {
-	if err == nil {
-		logrus.WithFields(logrus.Fields{"error": err}).Error("unexpected HTTP error handling")
-		return http.StatusInternalServerError
-	}
-
-	var statusCode int
-	errMsg := err.Error()
-
-	switch e := err.(type) {
-	case httpStatusError:
-		statusCode = e.HTTPErrorStatusCode()
-	case inputValidationError:
-		statusCode = http.StatusBadRequest
-	default:
-		// FIXME: this is brittle and should not be necessary, but we still need to identify if
-		// there are errors falling back into this logic.
-		// If we need to differentiate between different possible error types,
-		// we should create appropriate error types that implement the httpStatusError interface.
-		errStr := strings.ToLower(errMsg)
-		for _, status := range []struct {
-			keyword string
-			code    int
-		}{
-			{"not found", http.StatusNotFound},
-			{"no such", http.StatusNotFound},
-			{"bad parameter", http.StatusBadRequest},
-			{"no command", http.StatusBadRequest},
-			{"conflict", http.StatusConflict},
-			{"impossible", http.StatusNotAcceptable},
-			{"wrong login/password", http.StatusUnauthorized},
-			{"unauthorized", http.StatusUnauthorized},
-			{"hasn't been activated", http.StatusForbidden},
-			{"this node", http.StatusServiceUnavailable},
-		} {
-			if strings.Contains(errStr, status.keyword) {
-				statusCode = status.code
-				break
-			}
-		}
-	}
-
-	if statusCode == 0 {
-		statusCode = http.StatusInternalServerError
-	}
-
-	return statusCode
-}
-
-func apiVersionSupportsJSONErrors(version string) bool {
-	const firstAPIVersionWithJSONErrors = "1.23"
-	return version == "" || versions.GreaterThan(version, firstAPIVersionWithJSONErrors)
-}
-
-// MakeErrorHandler makes an HTTP handler that decodes a Docker error and
-// returns it in the response.
-func MakeErrorHandler(err error) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		statusCode := GetHTTPErrorStatusCode(err)
-		vars := mux.Vars(r)
-		if apiVersionSupportsJSONErrors(vars["version"]) {
-			response := &types.ErrorResponse{
-				Message: err.Error(),
-			}
-			WriteJSON(w, statusCode, response)
-		} else {
-			http.Error(w, grpc.ErrorDesc(err), statusCode)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/form.go b/installer/vendor/github.com/docker/docker/api/server/httputils/form.go
deleted file mode 100644
index 20188c12d8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/form.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package httputils
-
-import (
-	"fmt"
-	"net/http"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-// BoolValue transforms a form value in different formats into a boolean type.
-func BoolValue(r *http.Request, k string) bool {
-	s := strings.ToLower(strings.TrimSpace(r.FormValue(k)))
-	return !(s == "" || s == "0" || s == "no" || s == "false" || s == "none")
-}
-
-// BoolValueOrDefault returns the default bool passed if the query param is
-// missing, otherwise it's just a proxy to boolValue above
-func BoolValueOrDefault(r *http.Request, k string, d bool) bool {
-	if _, ok := r.Form[k]; !ok {
-		return d
-	}
-	return BoolValue(r, k)
-}
-
-// Int64ValueOrZero parses a form value into an int64 type.
-// It returns 0 if the parsing fails.
-func Int64ValueOrZero(r *http.Request, k string) int64 {
-	val, err := Int64ValueOrDefault(r, k, 0)
-	if err != nil {
-		return 0
-	}
-	return val
-}
-
-// Int64ValueOrDefault parses a form value into an int64 type. If there is an
-// error, returns the error. If there is no value returns the default value.
-func Int64ValueOrDefault(r *http.Request, field string, def int64) (int64, error) {
-	if r.Form.Get(field) != "" {
-		value, err := strconv.ParseInt(r.Form.Get(field), 10, 64)
-		if err != nil {
-			return value, err
-		}
-		return value, nil
-	}
-	return def, nil
-}
-
-// ArchiveOptions stores archive information for different operations.
-type ArchiveOptions struct {
-	Name string
-	Path string
-}
-
-// ArchiveFormValues parses form values and turns them into ArchiveOptions.
-// It fails if the archive name and path are not in the request.
-func ArchiveFormValues(r *http.Request, vars map[string]string) (ArchiveOptions, error) {
-	if err := ParseForm(r); err != nil {
-		return ArchiveOptions{}, err
-	}
-
-	name := vars["name"]
-	path := filepath.FromSlash(r.Form.Get("path"))
-
-	switch {
-	case name == "":
-		return ArchiveOptions{}, fmt.Errorf("bad parameter: 'name' cannot be empty")
-	case path == "":
-		return ArchiveOptions{}, fmt.Errorf("bad parameter: 'path' cannot be empty")
-	}
-
-	return ArchiveOptions{name, path}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/form_test.go b/installer/vendor/github.com/docker/docker/api/server/httputils/form_test.go
deleted file mode 100644
index c56f7c15e3..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/form_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package httputils
-
-import (
-	"net/http"
-	"net/url"
-	"testing"
-)
-
-func TestBoolValue(t *testing.T) {
-	cases := map[string]bool{
-		"":      false,
-		"0":     false,
-		"no":    false,
-		"false": false,
-		"none":  false,
-		"1":     true,
-		"yes":   true,
-		"true":  true,
-		"one":   true,
-		"100":   true,
-	}
-
-	for c, e := range cases {
-		v := url.Values{}
-		v.Set("test", c)
-		r, _ := http.NewRequest("POST", "", nil)
-		r.Form = v
-
-		a := BoolValue(r, "test")
-		if a != e {
-			t.Fatalf("Value: %s, expected: %v, actual: %v", c, e, a)
-		}
-	}
-}
-
-func TestBoolValueOrDefault(t *testing.T) {
-	r, _ := http.NewRequest("GET", "", nil)
-	if !BoolValueOrDefault(r, "queryparam", true) {
-		t.Fatal("Expected to get true default value, got false")
-	}
-
-	v := url.Values{}
-	v.Set("param", "")
-	r, _ = http.NewRequest("GET", "", nil)
-	r.Form = v
-	if BoolValueOrDefault(r, "param", true) {
-		t.Fatal("Expected not to get true")
-	}
-}
-
-func TestInt64ValueOrZero(t *testing.T) {
-	cases := map[string]int64{
-		"":     0,
-		"asdf": 0,
-		"0":    0,
-		"1":    1,
-	}
-
-	for c, e := range cases {
-		v := url.Values{}
-		v.Set("test", c)
-		r, _ := http.NewRequest("POST", "", nil)
-		r.Form = v
-
-		a := Int64ValueOrZero(r, "test")
-		if a != e {
-			t.Fatalf("Value: %s, expected: %v, actual: %v", c, e, a)
-		}
-	}
-}
-
-func TestInt64ValueOrDefault(t *testing.T) {
-	cases := map[string]int64{
-		"":   -1,
-		"-1": -1,
-		"42": 42,
-	}
-
-	for c, e := range cases {
-		v := url.Values{}
-		v.Set("test", c)
-		r, _ := http.NewRequest("POST", "", nil)
-		r.Form = v
-
-		a, err := Int64ValueOrDefault(r, "test", -1)
-		if a != e {
-			t.Fatalf("Value: %s, expected: %v, actual: %v", c, e, a)
-		}
-		if err != nil {
-			t.Fatalf("Error should be nil, but received: %s", err)
-		}
-	}
-}
-
-func TestInt64ValueOrDefaultWithError(t *testing.T) {
-	v := url.Values{}
-	v.Set("test", "invalid")
-	r, _ := http.NewRequest("POST", "", nil)
-	r.Form = v
-
-	_, err := Int64ValueOrDefault(r, "test", -1)
-	if err == nil {
-		t.Fatalf("Expected an error.")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils.go b/installer/vendor/github.com/docker/docker/api/server/httputils/httputils.go
deleted file mode 100644
index 7930ff7a07..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package httputils
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api"
-)
-
-// APIVersionKey is the client's requested API version.
-const APIVersionKey = "api-version"
-
-// UAStringKey is used as key type for user-agent string in net/context struct
-const UAStringKey = "upstream-user-agent"
-
-// APIFunc is an adapter to allow the use of ordinary functions as Docker API endpoints.
-// Any function that has the appropriate signature can be registered as an API endpoint (e.g. getVersion).
-type APIFunc func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error
-
-// HijackConnection interrupts the http response writer to get the
-// underlying connection and operate with it.
-func HijackConnection(w http.ResponseWriter) (io.ReadCloser, io.Writer, error) {
-	conn, _, err := w.(http.Hijacker).Hijack()
-	if err != nil {
-		return nil, nil, err
-	}
-	// Flush the options to make sure the client sets the raw mode
-	conn.Write([]byte{})
-	return conn, conn, nil
-}
-
-// CloseStreams ensures that a list for http streams are properly closed.
-func CloseStreams(streams ...interface{}) {
-	for _, stream := range streams {
-		if tcpc, ok := stream.(interface {
-			CloseWrite() error
-		}); ok {
-			tcpc.CloseWrite()
-		} else if closer, ok := stream.(io.Closer); ok {
-			closer.Close()
-		}
-	}
-}
-
-// CheckForJSON makes sure that the request's Content-Type is application/json.
-func CheckForJSON(r *http.Request) error {
-	ct := r.Header.Get("Content-Type")
-
-	// No Content-Type header is ok as long as there's no Body
-	if ct == "" {
-		if r.Body == nil || r.ContentLength == 0 {
-			return nil
-		}
-	}
-
-	// Otherwise it better be json
-	if api.MatchesContentType(ct, "application/json") {
-		return nil
-	}
-	return fmt.Errorf("Content-Type specified (%s) must be 'application/json'", ct)
-}
-
-// ParseForm ensures the request form is parsed even with invalid content types.
-// If we don't do this, POST method without Content-type (even with empty body) will fail.
-func ParseForm(r *http.Request) error {
-	if r == nil {
-		return nil
-	}
-	if err := r.ParseForm(); err != nil && !strings.HasPrefix(err.Error(), "mime:") {
-		return err
-	}
-	return nil
-}
-
-// VersionFromContext returns an API version from the context using APIVersionKey.
-// It panics if the context value does not have version.Version type.
-func VersionFromContext(ctx context.Context) (ver string) {
-	if ctx == nil {
-		return
-	}
-	val := ctx.Value(APIVersionKey)
-	if val == nil {
-		return
-	}
-	return val.(string)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json.go b/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json.go
deleted file mode 100644
index 4787cc3c33..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build go1.7
-
-package httputils
-
-import (
-	"encoding/json"
-	"net/http"
-)
-
-// WriteJSON writes the value v to the http response stream as json with standard json encoding.
-func WriteJSON(w http.ResponseWriter, code int, v interface{}) error {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(code)
-	enc := json.NewEncoder(w)
-	enc.SetEscapeHTML(false)
-	return enc.Encode(v)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json_go16.go b/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json_go16.go
deleted file mode 100644
index bdc6981738..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/httputils/httputils_write_json_go16.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build go1.6,!go1.7
-
-package httputils
-
-import (
-	"encoding/json"
-	"net/http"
-)
-
-// WriteJSON writes the value v to the http response stream as json with standard json encoding.
-func WriteJSON(w http.ResponseWriter, code int, v interface{}) error {
-	w.Header().Set("Content-Type", "application/json")
-	w.WriteHeader(code)
-	enc := json.NewEncoder(w)
-	return enc.Encode(v)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware.go b/installer/vendor/github.com/docker/docker/api/server/middleware.go
deleted file mode 100644
index 537ce8028f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package server
-
-import (
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
-)
-
-// handlerWithGlobalMiddlewares wraps the handler function for a request with
-// the server's global middlewares. The order of the middlewares is backwards,
-// meaning that the first in the list will be evaluated last.
-func (s *Server) handlerWithGlobalMiddlewares(handler httputils.APIFunc) httputils.APIFunc {
-	next := handler
-
-	for _, m := range s.middlewares {
-		next = m.WrapHandler(next)
-	}
-
-	if s.cfg.Logging && logrus.GetLevel() == logrus.DebugLevel {
-		next = middleware.DebugRequestMiddleware(next)
-	}
-
-	return next
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/cors.go b/installer/vendor/github.com/docker/docker/api/server/middleware/cors.go
deleted file mode 100644
index ea725dbc72..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/cors.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
-)
-
-// CORSMiddleware injects CORS headers to each request
-// when it's configured.
-type CORSMiddleware struct {
-	defaultHeaders string
-}
-
-// NewCORSMiddleware creates a new CORSMiddleware with default headers.
-func NewCORSMiddleware(d string) CORSMiddleware {
-	return CORSMiddleware{defaultHeaders: d}
-}
-
-// WrapHandler returns a new handler function wrapping the previous one in the request chain.
-func (c CORSMiddleware) WrapHandler(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		// If "api-cors-header" is not given, but "api-enable-cors" is true, we set cors to "*"
-		// otherwise, all head values will be passed to HTTP handler
-		corsHeaders := c.defaultHeaders
-		if corsHeaders == "" {
-			corsHeaders = "*"
-		}
-
-		logrus.Debugf("CORS header is enabled and set to: %s", corsHeaders)
-		w.Header().Add("Access-Control-Allow-Origin", corsHeaders)
-		w.Header().Add("Access-Control-Allow-Headers", "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")
-		w.Header().Add("Access-Control-Allow-Methods", "HEAD, GET, POST, DELETE, PUT, OPTIONS")
-		return handler(ctx, w, r, vars)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/debug.go b/installer/vendor/github.com/docker/docker/api/server/middleware/debug.go
deleted file mode 100644
index 8c8567669b..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/debug.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package middleware
-
-import (
-	"bufio"
-	"encoding/json"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/pkg/ioutils"
-	"golang.org/x/net/context"
-)
-
-// DebugRequestMiddleware dumps the request to logger
-func DebugRequestMiddleware(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		logrus.Debugf("Calling %s %s", r.Method, r.RequestURI)
-
-		if r.Method != "POST" {
-			return handler(ctx, w, r, vars)
-		}
-		if err := httputils.CheckForJSON(r); err != nil {
-			return handler(ctx, w, r, vars)
-		}
-		maxBodySize := 4096 // 4KB
-		if r.ContentLength > int64(maxBodySize) {
-			return handler(ctx, w, r, vars)
-		}
-
-		body := r.Body
-		bufReader := bufio.NewReaderSize(body, maxBodySize)
-		r.Body = ioutils.NewReadCloserWrapper(bufReader, func() error { return body.Close() })
-
-		b, err := bufReader.Peek(maxBodySize)
-		if err != io.EOF {
-			// either there was an error reading, or the buffer is full (in which case the request is too large)
-			return handler(ctx, w, r, vars)
-		}
-
-		var postForm map[string]interface{}
-		if err := json.Unmarshal(b, &postForm); err == nil {
-			maskSecretKeys(postForm)
-			formStr, errMarshal := json.Marshal(postForm)
-			if errMarshal == nil {
-				logrus.Debugf("form data: %s", string(formStr))
-			} else {
-				logrus.Debugf("form data: %q", postForm)
-			}
-		}
-
-		return handler(ctx, w, r, vars)
-	}
-}
-
-func maskSecretKeys(inp interface{}) {
-	if arr, ok := inp.([]interface{}); ok {
-		for _, f := range arr {
-			maskSecretKeys(f)
-		}
-		return
-	}
-	if form, ok := inp.(map[string]interface{}); ok {
-	loop0:
-		for k, v := range form {
-			for _, m := range []string{"password", "secret", "jointoken", "unlockkey"} {
-				if strings.EqualFold(m, k) {
-					form[k] = "*****"
-					continue loop0
-				}
-			}
-			maskSecretKeys(v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/experimental.go b/installer/vendor/github.com/docker/docker/api/server/middleware/experimental.go
deleted file mode 100644
index b8f56e88b4..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/experimental.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"golang.org/x/net/context"
-)
-
-// ExperimentalMiddleware is a the middleware in charge of adding the
-// 'Docker-Experimental' header to every outgoing request
-type ExperimentalMiddleware struct {
-	experimental string
-}
-
-// NewExperimentalMiddleware creates a new ExperimentalMiddleware
-func NewExperimentalMiddleware(experimentalEnabled bool) ExperimentalMiddleware {
-	if experimentalEnabled {
-		return ExperimentalMiddleware{"true"}
-	}
-	return ExperimentalMiddleware{"false"}
-}
-
-// WrapHandler returns a new handler function wrapping the previous one in the request chain.
-func (e ExperimentalMiddleware) WrapHandler(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		w.Header().Set("Docker-Experimental", e.experimental)
-		return handler(ctx, w, r, vars)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/middleware.go b/installer/vendor/github.com/docker/docker/api/server/middleware/middleware.go
deleted file mode 100644
index dc1f5bfa0d..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/middleware.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-
-	"golang.org/x/net/context"
-)
-
-// Middleware is an interface to allow the use of ordinary functions as Docker API filters.
-// Any struct that has the appropriate signature can be registered as a middleware.
-type Middleware interface {
-	WrapHandler(func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/version.go b/installer/vendor/github.com/docker/docker/api/server/middleware/version.go
deleted file mode 100644
index 11014659e5..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/version.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package middleware
-
-import (
-	"fmt"
-	"net/http"
-	"runtime"
-
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// VersionMiddleware is a middleware that
-// validates the client and server versions.
-type VersionMiddleware struct {
-	serverVersion  string
-	defaultVersion string
-	minVersion     string
-}
-
-// NewVersionMiddleware creates a new VersionMiddleware
-// with the default versions.
-func NewVersionMiddleware(s, d, m string) VersionMiddleware {
-	return VersionMiddleware{
-		serverVersion:  s,
-		defaultVersion: d,
-		minVersion:     m,
-	}
-}
-
-// WrapHandler returns a new handler function wrapping the previous one in the request chain.
-func (v VersionMiddleware) WrapHandler(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		apiVersion := vars["version"]
-		if apiVersion == "" {
-			apiVersion = v.defaultVersion
-		}
-
-		if versions.LessThan(apiVersion, v.minVersion) {
-			return errors.NewBadRequestError(fmt.Errorf("client version %s is too old. Minimum supported API version is %s, please upgrade your client to a newer version", apiVersion, v.minVersion))
-		}
-
-		header := fmt.Sprintf("Docker/%s (%s)", v.serverVersion, runtime.GOOS)
-		w.Header().Set("Server", header)
-		w.Header().Set("API-Version", v.defaultVersion)
-		ctx = context.WithValue(ctx, "api-version", apiVersion)
-		return handler(ctx, w, r, vars)
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/middleware/version_test.go b/installer/vendor/github.com/docker/docker/api/server/middleware/version_test.go
deleted file mode 100644
index 9e72efd78d..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/middleware/version_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package middleware
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/server/httputils"
-	"golang.org/x/net/context"
-)
-
-func TestVersionMiddleware(t *testing.T) {
-	handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		if httputils.VersionFromContext(ctx) == "" {
-			t.Fatalf("Expected version, got empty string")
-		}
-		return nil
-	}
-
-	defaultVersion := "1.10.0"
-	minVersion := "1.2.0"
-	m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion)
-	h := m.WrapHandler(handler)
-
-	req, _ := http.NewRequest("GET", "/containers/json", nil)
-	resp := httptest.NewRecorder()
-	ctx := context.Background()
-	if err := h(ctx, resp, req, map[string]string{}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestVersionMiddlewareWithErrors(t *testing.T) {
-	handler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		if httputils.VersionFromContext(ctx) == "" {
-			t.Fatalf("Expected version, got empty string")
-		}
-		return nil
-	}
-
-	defaultVersion := "1.10.0"
-	minVersion := "1.2.0"
-	m := NewVersionMiddleware(defaultVersion, defaultVersion, minVersion)
-	h := m.WrapHandler(handler)
-
-	req, _ := http.NewRequest("GET", "/containers/json", nil)
-	resp := httptest.NewRecorder()
-	ctx := context.Background()
-
-	vars := map[string]string{"version": "0.1"}
-	err := h(ctx, resp, req, vars)
-
-	if !strings.Contains(err.Error(), "client version 0.1 is too old. Minimum supported API version is 1.2.0") {
-		t.Fatalf("Expected too old client error, got %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/profiler.go b/installer/vendor/github.com/docker/docker/api/server/profiler.go
deleted file mode 100644
index 8bf8384fdb..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/profiler.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package server
-
-import (
-	"expvar"
-	"fmt"
-	"net/http"
-	"net/http/pprof"
-
-	"github.com/gorilla/mux"
-)
-
-const debugPathPrefix = "/debug/"
-
-func profilerSetup(mainRouter *mux.Router) {
-	var r = mainRouter.PathPrefix(debugPathPrefix).Subrouter()
-	r.HandleFunc("/vars", expVars)
-	r.HandleFunc("/pprof/", pprof.Index)
-	r.HandleFunc("/pprof/cmdline", pprof.Cmdline)
-	r.HandleFunc("/pprof/profile", pprof.Profile)
-	r.HandleFunc("/pprof/symbol", pprof.Symbol)
-	r.HandleFunc("/pprof/trace", pprof.Trace)
-	r.HandleFunc("/pprof/block", pprof.Handler("block").ServeHTTP)
-	r.HandleFunc("/pprof/heap", pprof.Handler("heap").ServeHTTP)
-	r.HandleFunc("/pprof/goroutine", pprof.Handler("goroutine").ServeHTTP)
-	r.HandleFunc("/pprof/threadcreate", pprof.Handler("threadcreate").ServeHTTP)
-}
-
-// Replicated from expvar.go as not public.
-func expVars(w http.ResponseWriter, r *http.Request) {
-	first := true
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	fmt.Fprintf(w, "{\n")
-	expvar.Do(func(kv expvar.KeyValue) {
-		if !first {
-			fmt.Fprintf(w, ",\n")
-		}
-		first = false
-		fmt.Fprintf(w, "%q: %s", kv.Key, kv.Value)
-	})
-	fmt.Fprintf(w, "\n}\n")
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/build/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/build/backend.go
deleted file mode 100644
index 0f01c11af4..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/build/backend.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package build
-
-import (
-	"io"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"golang.org/x/net/context"
-)
-
-// Backend abstracts an image builder whose only purpose is to build an image referenced by an imageID.
-type Backend interface {
-	// Build builds a Docker image referenced by an imageID string.
-	//
-	// Note: Tagging an image should not be done by a Builder, it should instead be done
-	// by the caller.
-	//
-	// TODO: make this return a reference instead of string
-	BuildFromContext(ctx context.Context, src io.ReadCloser, remote string, buildOptions *types.ImageBuildOptions, pg backend.ProgressWriter) (string, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/build/build.go b/installer/vendor/github.com/docker/docker/api/server/router/build/build.go
deleted file mode 100644
index 959498e0f1..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/build/build.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package build
-
-import "github.com/docker/docker/api/server/router"
-
-// buildRouter is a router to talk with the build controller
-type buildRouter struct {
-	backend Backend
-	routes  []router.Route
-}
-
-// NewRouter initializes a new build router
-func NewRouter(b Backend) router.Router {
-	r := &buildRouter{
-		backend: b,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routers to the build controller
-func (r *buildRouter) Routes() []router.Route {
-	return r.routes
-}
-
-func (r *buildRouter) initRoutes() {
-	r.routes = []router.Route{
-		router.Cancellable(router.NewPostRoute("/build", r.postBuild)),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/build/build_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/build/build_routes.go
deleted file mode 100644
index 75425b19fb..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/build/build_routes.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package build
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/go-units"
-	"golang.org/x/net/context"
-)
-
-func newImageBuildOptions(ctx context.Context, r *http.Request) (*types.ImageBuildOptions, error) {
-	version := httputils.VersionFromContext(ctx)
-	options := &types.ImageBuildOptions{}
-	if httputils.BoolValue(r, "forcerm") && versions.GreaterThanOrEqualTo(version, "1.12") {
-		options.Remove = true
-	} else if r.FormValue("rm") == "" && versions.GreaterThanOrEqualTo(version, "1.12") {
-		options.Remove = true
-	} else {
-		options.Remove = httputils.BoolValue(r, "rm")
-	}
-	if httputils.BoolValue(r, "pull") && versions.GreaterThanOrEqualTo(version, "1.16") {
-		options.PullParent = true
-	}
-
-	options.Dockerfile = r.FormValue("dockerfile")
-	options.SuppressOutput = httputils.BoolValue(r, "q")
-	options.NoCache = httputils.BoolValue(r, "nocache")
-	options.ForceRemove = httputils.BoolValue(r, "forcerm")
-	options.MemorySwap = httputils.Int64ValueOrZero(r, "memswap")
-	options.Memory = httputils.Int64ValueOrZero(r, "memory")
-	options.CPUShares = httputils.Int64ValueOrZero(r, "cpushares")
-	options.CPUPeriod = httputils.Int64ValueOrZero(r, "cpuperiod")
-	options.CPUQuota = httputils.Int64ValueOrZero(r, "cpuquota")
-	options.CPUSetCPUs = r.FormValue("cpusetcpus")
-	options.CPUSetMems = r.FormValue("cpusetmems")
-	options.CgroupParent = r.FormValue("cgroupparent")
-	options.NetworkMode = r.FormValue("networkmode")
-	options.Tags = r.Form["t"]
-	options.SecurityOpt = r.Form["securityopt"]
-	options.Squash = httputils.BoolValue(r, "squash")
-
-	if r.Form.Get("shmsize") != "" {
-		shmSize, err := strconv.ParseInt(r.Form.Get("shmsize"), 10, 64)
-		if err != nil {
-			return nil, err
-		}
-		options.ShmSize = shmSize
-	}
-
-	if i := container.Isolation(r.FormValue("isolation")); i != "" {
-		if !container.Isolation.IsValid(i) {
-			return nil, fmt.Errorf("Unsupported isolation: %q", i)
-		}
-		options.Isolation = i
-	}
-
-	if runtime.GOOS != "windows" && options.SecurityOpt != nil {
-		return nil, fmt.Errorf("the daemon on this platform does not support --security-opt to build")
-	}
-
-	var buildUlimits = []*units.Ulimit{}
-	ulimitsJSON := r.FormValue("ulimits")
-	if ulimitsJSON != "" {
-		if err := json.Unmarshal([]byte(ulimitsJSON), &buildUlimits); err != nil {
-			return nil, err
-		}
-		options.Ulimits = buildUlimits
-	}
-
-	var buildArgs = map[string]*string{}
-	buildArgsJSON := r.FormValue("buildargs")
-
-	// Note that there are two ways a --build-arg might appear in the
-	// json of the query param:
-	//     "foo":"bar"
-	// and "foo":nil
-	// The first is the normal case, ie. --build-arg foo=bar
-	// or  --build-arg foo
-	// where foo's value was picked up from an env var.
-	// The second ("foo":nil) is where they put --build-arg foo
-	// but "foo" isn't set as an env var. In that case we can't just drop
-	// the fact they mentioned it, we need to pass that along to the builder
-	// so that it can print a warning about "foo" being unused if there is
-	// no "ARG foo" in the Dockerfile.
-	if buildArgsJSON != "" {
-		if err := json.Unmarshal([]byte(buildArgsJSON), &buildArgs); err != nil {
-			return nil, err
-		}
-		options.BuildArgs = buildArgs
-	}
-
-	var labels = map[string]string{}
-	labelsJSON := r.FormValue("labels")
-	if labelsJSON != "" {
-		if err := json.Unmarshal([]byte(labelsJSON), &labels); err != nil {
-			return nil, err
-		}
-		options.Labels = labels
-	}
-
-	var cacheFrom = []string{}
-	cacheFromJSON := r.FormValue("cachefrom")
-	if cacheFromJSON != "" {
-		if err := json.Unmarshal([]byte(cacheFromJSON), &cacheFrom); err != nil {
-			return nil, err
-		}
-		options.CacheFrom = cacheFrom
-	}
-
-	return options, nil
-}
-
-type syncWriter struct {
-	w  io.Writer
-	mu sync.Mutex
-}
-
-func (s *syncWriter) Write(b []byte) (count int, err error) {
-	s.mu.Lock()
-	count, err = s.w.Write(b)
-	s.mu.Unlock()
-	return
-}
-
-func (br *buildRouter) postBuild(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var (
-		authConfigs        = map[string]types.AuthConfig{}
-		authConfigsEncoded = r.Header.Get("X-Registry-Config")
-		notVerboseBuffer   = bytes.NewBuffer(nil)
-	)
-
-	if authConfigsEncoded != "" {
-		authConfigsJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authConfigsEncoded))
-		if err := json.NewDecoder(authConfigsJSON).Decode(&authConfigs); err != nil {
-			// for a pull it is not an error if no auth was given
-			// to increase compatibility with the existing api it is defaulting
-			// to be empty.
-		}
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-	sf := streamformatter.NewJSONStreamFormatter()
-	errf := func(err error) error {
-		if httputils.BoolValue(r, "q") && notVerboseBuffer.Len() > 0 {
-			output.Write(notVerboseBuffer.Bytes())
-		}
-		// Do not write the error in the http output if it's still empty.
-		// This prevents from writing a 200(OK) when there is an internal error.
-		if !output.Flushed() {
-			return err
-		}
-		_, err = w.Write(sf.FormatError(err))
-		if err != nil {
-			logrus.Warnf("could not write error response: %v", err)
-		}
-		return nil
-	}
-
-	buildOptions, err := newImageBuildOptions(ctx, r)
-	if err != nil {
-		return errf(err)
-	}
-	buildOptions.AuthConfigs = authConfigs
-
-	remoteURL := r.FormValue("remote")
-
-	// Currently, only used if context is from a remote url.
-	// Look at code in DetectContextFromRemoteURL for more information.
-	createProgressReader := func(in io.ReadCloser) io.ReadCloser {
-		progressOutput := sf.NewProgressOutput(output, true)
-		if buildOptions.SuppressOutput {
-			progressOutput = sf.NewProgressOutput(notVerboseBuffer, true)
-		}
-		return progress.NewProgressReader(in, progressOutput, r.ContentLength, "Downloading context", remoteURL)
-	}
-
-	out := io.Writer(output)
-	if buildOptions.SuppressOutput {
-		out = notVerboseBuffer
-	}
-	out = &syncWriter{w: out}
-	stdout := &streamformatter.StdoutFormatter{Writer: out, StreamFormatter: sf}
-	stderr := &streamformatter.StderrFormatter{Writer: out, StreamFormatter: sf}
-
-	pg := backend.ProgressWriter{
-		Output:             out,
-		StdoutFormatter:    stdout,
-		StderrFormatter:    stderr,
-		ProgressReaderFunc: createProgressReader,
-	}
-
-	imgID, err := br.backend.BuildFromContext(ctx, r.Body, remoteURL, buildOptions, pg)
-	if err != nil {
-		return errf(err)
-	}
-
-	// Everything worked so if -q was provided the output from the daemon
-	// should be just the image ID and we'll print that to stdout.
-	if buildOptions.SuppressOutput {
-		stdout := &streamformatter.StdoutFormatter{Writer: output, StreamFormatter: sf}
-		fmt.Fprintf(stdout, "%s\n", string(imgID))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/backend.go
deleted file mode 100644
index 8810f88b72..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/backend.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package checkpoint
-
-import "github.com/docker/docker/api/types"
-
-// Backend for Checkpoint
-type Backend interface {
-	CheckpointCreate(container string, config types.CheckpointCreateOptions) error
-	CheckpointDelete(container string, config types.CheckpointDeleteOptions) error
-	CheckpointList(container string, config types.CheckpointListOptions) ([]types.Checkpoint, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint.go b/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint.go
deleted file mode 100644
index c1e93926f5..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package checkpoint
-
-import (
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
-)
-
-// checkpointRouter is a router to talk with the checkpoint controller
-type checkpointRouter struct {
-	backend Backend
-	decoder httputils.ContainerDecoder
-	routes  []router.Route
-}
-
-// NewRouter initializes a new checkpoint router
-func NewRouter(b Backend, decoder httputils.ContainerDecoder) router.Router {
-	r := &checkpointRouter{
-		backend: b,
-		decoder: decoder,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routers to the checkpoint controller
-func (r *checkpointRouter) Routes() []router.Route {
-	return r.routes
-}
-
-func (r *checkpointRouter) initRoutes() {
-	r.routes = []router.Route{
-		router.Experimental(router.NewGetRoute("/containers/{name:.*}/checkpoints", r.getContainerCheckpoints)),
-		router.Experimental(router.NewPostRoute("/containers/{name:.*}/checkpoints", r.postContainerCheckpoint)),
-		router.Experimental(router.NewDeleteRoute("/containers/{name}/checkpoints/{checkpoint}", r.deleteContainerCheckpoint)),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint_routes.go
deleted file mode 100644
index f988431191..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/checkpoint/checkpoint_routes.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package checkpoint
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func (s *checkpointRouter) postContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	var options types.CheckpointCreateOptions
-
-	decoder := json.NewDecoder(r.Body)
-	if err := decoder.Decode(&options); err != nil {
-		return err
-	}
-
-	err := s.backend.CheckpointCreate(vars["name"], options)
-	if err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusCreated)
-	return nil
-}
-
-func (s *checkpointRouter) getContainerCheckpoints(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	checkpoints, err := s.backend.CheckpointList(vars["name"], types.CheckpointListOptions{
-		CheckpointDir: r.Form.Get("dir"),
-	})
-
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, checkpoints)
-}
-
-func (s *checkpointRouter) deleteContainerCheckpoint(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	err := s.backend.CheckpointDelete(vars["name"], types.CheckpointDeleteOptions{
-		CheckpointDir: r.Form.Get("dir"),
-		CheckpointID:  vars["checkpoint"],
-	})
-
-	if err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/container/backend.go
deleted file mode 100644
index 0d20188ccf..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/backend.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package container
-
-import (
-	"io"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/pkg/archive"
-)
-
-// execBackend includes functions to implement to provide exec functionality.
-type execBackend interface {
-	ContainerExecCreate(name string, config *types.ExecConfig) (string, error)
-	ContainerExecInspect(id string) (*backend.ExecInspect, error)
-	ContainerExecResize(name string, height, width int) error
-	ContainerExecStart(ctx context.Context, name string, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer) error
-	ExecExists(name string) (bool, error)
-}
-
-// copyBackend includes functions to implement to provide container copy functionality.
-type copyBackend interface {
-	ContainerArchivePath(name string, path string) (content io.ReadCloser, stat *types.ContainerPathStat, err error)
-	ContainerCopy(name string, res string) (io.ReadCloser, error)
-	ContainerExport(name string, out io.Writer) error
-	ContainerExtractToDir(name, path string, noOverwriteDirNonDir bool, content io.Reader) error
-	ContainerStatPath(name string, path string) (stat *types.ContainerPathStat, err error)
-}
-
-// stateBackend includes functions to implement to provide container state lifecycle functionality.
-type stateBackend interface {
-	ContainerCreate(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)
-	ContainerKill(name string, sig uint64) error
-	ContainerPause(name string) error
-	ContainerRename(oldName, newName string) error
-	ContainerResize(name string, height, width int) error
-	ContainerRestart(name string, seconds *int) error
-	ContainerRm(name string, config *types.ContainerRmConfig) error
-	ContainerStart(name string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error
-	ContainerStop(name string, seconds *int) error
-	ContainerUnpause(name string) error
-	ContainerUpdate(name string, hostConfig *container.HostConfig) (container.ContainerUpdateOKBody, error)
-	ContainerWait(name string, timeout time.Duration) (int, error)
-}
-
-// monitorBackend includes functions to implement to provide containers monitoring functionality.
-type monitorBackend interface {
-	ContainerChanges(name string) ([]archive.Change, error)
-	ContainerInspect(name string, size bool, version string) (interface{}, error)
-	ContainerLogs(ctx context.Context, name string, config *backend.ContainerLogsConfig, started chan struct{}) error
-	ContainerStats(ctx context.Context, name string, config *backend.ContainerStatsConfig) error
-	ContainerTop(name string, psArgs string) (*types.ContainerProcessList, error)
-
-	Containers(config *types.ContainerListOptions) ([]*types.Container, error)
-}
-
-// attachBackend includes function to implement to provide container attaching functionality.
-type attachBackend interface {
-	ContainerAttach(name string, c *backend.ContainerAttachConfig) error
-}
-
-// systemBackend includes functions to implement to provide system wide containers functionality
-type systemBackend interface {
-	ContainersPrune(pruneFilters filters.Args) (*types.ContainersPruneReport, error)
-}
-
-// Backend is all the methods that need to be implemented to provide container specific functionality.
-type Backend interface {
-	execBackend
-	copyBackend
-	stateBackend
-	monitorBackend
-	attachBackend
-	systemBackend
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/container.go b/installer/vendor/github.com/docker/docker/api/server/router/container/container.go
deleted file mode 100644
index bbed7e9944..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/container.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package container
-
-import (
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
-)
-
-type validationError struct {
-	error
-}
-
-func (validationError) IsValidationError() bool {
-	return true
-}
-
-// containerRouter is a router to talk with the container controller
-type containerRouter struct {
-	backend Backend
-	decoder httputils.ContainerDecoder
-	routes  []router.Route
-}
-
-// NewRouter initializes a new container router
-func NewRouter(b Backend, decoder httputils.ContainerDecoder) router.Router {
-	r := &containerRouter{
-		backend: b,
-		decoder: decoder,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routes to the container controller
-func (r *containerRouter) Routes() []router.Route {
-	return r.routes
-}
-
-// initRoutes initializes the routes in container router
-func (r *containerRouter) initRoutes() {
-	r.routes = []router.Route{
-		// HEAD
-		router.NewHeadRoute("/containers/{name:.*}/archive", r.headContainersArchive),
-		// GET
-		router.NewGetRoute("/containers/json", r.getContainersJSON),
-		router.NewGetRoute("/containers/{name:.*}/export", r.getContainersExport),
-		router.NewGetRoute("/containers/{name:.*}/changes", r.getContainersChanges),
-		router.NewGetRoute("/containers/{name:.*}/json", r.getContainersByName),
-		router.NewGetRoute("/containers/{name:.*}/top", r.getContainersTop),
-		router.Cancellable(router.NewGetRoute("/containers/{name:.*}/logs", r.getContainersLogs)),
-		router.Cancellable(router.NewGetRoute("/containers/{name:.*}/stats", r.getContainersStats)),
-		router.NewGetRoute("/containers/{name:.*}/attach/ws", r.wsContainersAttach),
-		router.NewGetRoute("/exec/{id:.*}/json", r.getExecByID),
-		router.NewGetRoute("/containers/{name:.*}/archive", r.getContainersArchive),
-		// POST
-		router.NewPostRoute("/containers/create", r.postContainersCreate),
-		router.NewPostRoute("/containers/{name:.*}/kill", r.postContainersKill),
-		router.NewPostRoute("/containers/{name:.*}/pause", r.postContainersPause),
-		router.NewPostRoute("/containers/{name:.*}/unpause", r.postContainersUnpause),
-		router.NewPostRoute("/containers/{name:.*}/restart", r.postContainersRestart),
-		router.NewPostRoute("/containers/{name:.*}/start", r.postContainersStart),
-		router.NewPostRoute("/containers/{name:.*}/stop", r.postContainersStop),
-		router.NewPostRoute("/containers/{name:.*}/wait", r.postContainersWait),
-		router.NewPostRoute("/containers/{name:.*}/resize", r.postContainersResize),
-		router.NewPostRoute("/containers/{name:.*}/attach", r.postContainersAttach),
-		router.NewPostRoute("/containers/{name:.*}/copy", r.postContainersCopy), // Deprecated since 1.8, Errors out since 1.12
-		router.NewPostRoute("/containers/{name:.*}/exec", r.postContainerExecCreate),
-		router.NewPostRoute("/exec/{name:.*}/start", r.postContainerExecStart),
-		router.NewPostRoute("/exec/{name:.*}/resize", r.postContainerExecResize),
-		router.NewPostRoute("/containers/{name:.*}/rename", r.postContainerRename),
-		router.NewPostRoute("/containers/{name:.*}/update", r.postContainerUpdate),
-		router.NewPostRoute("/containers/prune", r.postContainersPrune),
-		// PUT
-		router.NewPutRoute("/containers/{name:.*}/archive", r.putContainersArchive),
-		// DELETE
-		router.NewDeleteRoute("/containers/{name:.*}", r.deleteContainers),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/container_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/container/container_routes.go
deleted file mode 100644
index 9c9bc0f8c3..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/container_routes.go
+++ /dev/null
@@ -1,554 +0,0 @@
-package container
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/signal"
-	"golang.org/x/net/context"
-	"golang.org/x/net/websocket"
-)
-
-func (s *containerRouter) getContainersJSON(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	config := &types.ContainerListOptions{
-		All:     httputils.BoolValue(r, "all"),
-		Size:    httputils.BoolValue(r, "size"),
-		Since:   r.Form.Get("since"),
-		Before:  r.Form.Get("before"),
-		Filters: filter,
-	}
-
-	if tmpLimit := r.Form.Get("limit"); tmpLimit != "" {
-		limit, err := strconv.Atoi(tmpLimit)
-		if err != nil {
-			return err
-		}
-		config.Limit = limit
-	}
-
-	containers, err := s.backend.Containers(config)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, containers)
-}
-
-func (s *containerRouter) getContainersStats(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	stream := httputils.BoolValueOrDefault(r, "stream", true)
-	if !stream {
-		w.Header().Set("Content-Type", "application/json")
-	}
-
-	config := &backend.ContainerStatsConfig{
-		Stream:    stream,
-		OutStream: w,
-		Version:   string(httputils.VersionFromContext(ctx)),
-	}
-
-	return s.backend.ContainerStats(ctx, vars["name"], config)
-}
-
-func (s *containerRouter) getContainersLogs(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	// Args are validated before the stream starts because when it starts we're
-	// sending HTTP 200 by writing an empty chunk of data to tell the client that
-	// daemon is going to stream. By sending this initial HTTP 200 we can't report
-	// any error after the stream starts (i.e. container not found, wrong parameters)
-	// with the appropriate status code.
-	stdout, stderr := httputils.BoolValue(r, "stdout"), httputils.BoolValue(r, "stderr")
-	if !(stdout || stderr) {
-		return fmt.Errorf("Bad parameters: you must choose at least one stream")
-	}
-
-	containerName := vars["name"]
-	logsConfig := &backend.ContainerLogsConfig{
-		ContainerLogsOptions: types.ContainerLogsOptions{
-			Follow:     httputils.BoolValue(r, "follow"),
-			Timestamps: httputils.BoolValue(r, "timestamps"),
-			Since:      r.Form.Get("since"),
-			Tail:       r.Form.Get("tail"),
-			ShowStdout: stdout,
-			ShowStderr: stderr,
-			Details:    httputils.BoolValue(r, "details"),
-		},
-		OutStream: w,
-	}
-
-	chStarted := make(chan struct{})
-	if err := s.backend.ContainerLogs(ctx, containerName, logsConfig, chStarted); err != nil {
-		select {
-		case <-chStarted:
-			// The client may be expecting all of the data we're sending to
-			// be multiplexed, so send it through OutStream, which will
-			// have been set up to handle that if needed.
-			fmt.Fprintf(logsConfig.OutStream, "Error running logs job: %v\n", err)
-		default:
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (s *containerRouter) getContainersExport(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return s.backend.ContainerExport(vars["name"], w)
-}
-
-func (s *containerRouter) postContainersStart(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	// If contentLength is -1, we can assumed chunked encoding
-	// or more technically that the length is unknown
-	// https://golang.org/src/pkg/net/http/request.go#L139
-	// net/http otherwise seems to swallow any headers related to chunked encoding
-	// including r.TransferEncoding
-	// allow a nil body for backwards compatibility
-
-	version := httputils.VersionFromContext(ctx)
-	var hostConfig *container.HostConfig
-	// A non-nil json object is at least 7 characters.
-	if r.ContentLength > 7 || r.ContentLength == -1 {
-		if versions.GreaterThanOrEqualTo(version, "1.24") {
-			return validationError{fmt.Errorf("starting container with non-empty request body was deprecated since v1.10 and removed in v1.12")}
-		}
-
-		if err := httputils.CheckForJSON(r); err != nil {
-			return err
-		}
-
-		c, err := s.decoder.DecodeHostConfig(r.Body)
-		if err != nil {
-			return err
-		}
-		hostConfig = c
-	}
-
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	checkpoint := r.Form.Get("checkpoint")
-	checkpointDir := r.Form.Get("checkpoint-dir")
-	if err := s.backend.ContainerStart(vars["name"], hostConfig, checkpoint, checkpointDir); err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (s *containerRouter) postContainersStop(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	var seconds *int
-	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
-		valSeconds, err := strconv.Atoi(tmpSeconds)
-		if err != nil {
-			return err
-		}
-		seconds = &valSeconds
-	}
-
-	if err := s.backend.ContainerStop(vars["name"], seconds); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-type errContainerIsRunning interface {
-	ContainerIsRunning() bool
-}
-
-func (s *containerRouter) postContainersKill(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	var sig syscall.Signal
-	name := vars["name"]
-
-	// If we have a signal, look at it. Otherwise, do nothing
-	if sigStr := r.Form.Get("signal"); sigStr != "" {
-		var err error
-		if sig, err = signal.ParseSignal(sigStr); err != nil {
-			return err
-		}
-	}
-
-	if err := s.backend.ContainerKill(name, uint64(sig)); err != nil {
-		var isStopped bool
-		if e, ok := err.(errContainerIsRunning); ok {
-			isStopped = !e.ContainerIsRunning()
-		}
-
-		// Return error that's not caused because the container is stopped.
-		// Return error if the container is not running and the api is >= 1.20
-		// to keep backwards compatibility.
-		version := httputils.VersionFromContext(ctx)
-		if versions.GreaterThanOrEqualTo(version, "1.20") || !isStopped {
-			return fmt.Errorf("Cannot kill container %s: %v", name, err)
-		}
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (s *containerRouter) postContainersRestart(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	var seconds *int
-	if tmpSeconds := r.Form.Get("t"); tmpSeconds != "" {
-		valSeconds, err := strconv.Atoi(tmpSeconds)
-		if err != nil {
-			return err
-		}
-		seconds = &valSeconds
-	}
-
-	if err := s.backend.ContainerRestart(vars["name"], seconds); err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-func (s *containerRouter) postContainersPause(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := s.backend.ContainerPause(vars["name"]); err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-func (s *containerRouter) postContainersUnpause(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := s.backend.ContainerUnpause(vars["name"]); err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-func (s *containerRouter) postContainersWait(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	status, err := s.backend.ContainerWait(vars["name"], -1*time.Second)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, &container.ContainerWaitOKBody{
-		StatusCode: int64(status),
-	})
-}
-
-func (s *containerRouter) getContainersChanges(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	changes, err := s.backend.ContainerChanges(vars["name"])
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, changes)
-}
-
-func (s *containerRouter) getContainersTop(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	procList, err := s.backend.ContainerTop(vars["name"], r.Form.Get("ps_args"))
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, procList)
-}
-
-func (s *containerRouter) postContainerRename(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-	newName := r.Form.Get("name")
-	if err := s.backend.ContainerRename(name, newName); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (s *containerRouter) postContainerUpdate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	var updateConfig container.UpdateConfig
-
-	decoder := json.NewDecoder(r.Body)
-	if err := decoder.Decode(&updateConfig); err != nil {
-		return err
-	}
-
-	hostConfig := &container.HostConfig{
-		Resources:     updateConfig.Resources,
-		RestartPolicy: updateConfig.RestartPolicy,
-	}
-
-	name := vars["name"]
-	resp, err := s.backend.ContainerUpdate(name, hostConfig)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, resp)
-}
-
-func (s *containerRouter) postContainersCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	name := r.Form.Get("name")
-
-	config, hostConfig, networkingConfig, err := s.decoder.DecodeConfig(r.Body)
-	if err != nil {
-		return err
-	}
-	version := httputils.VersionFromContext(ctx)
-	adjustCPUShares := versions.LessThan(version, "1.19")
-
-	ccr, err := s.backend.ContainerCreate(types.ContainerCreateConfig{
-		Name:             name,
-		Config:           config,
-		HostConfig:       hostConfig,
-		NetworkingConfig: networkingConfig,
-		AdjustCPUShares:  adjustCPUShares,
-	})
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, ccr)
-}
-
-func (s *containerRouter) deleteContainers(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-	config := &types.ContainerRmConfig{
-		ForceRemove:  httputils.BoolValue(r, "force"),
-		RemoveVolume: httputils.BoolValue(r, "v"),
-		RemoveLink:   httputils.BoolValue(r, "link"),
-	}
-
-	if err := s.backend.ContainerRm(name, config); err != nil {
-		return err
-	}
-
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-func (s *containerRouter) postContainersResize(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	height, err := strconv.Atoi(r.Form.Get("h"))
-	if err != nil {
-		return err
-	}
-	width, err := strconv.Atoi(r.Form.Get("w"))
-	if err != nil {
-		return err
-	}
-
-	return s.backend.ContainerResize(vars["name"], height, width)
-}
-
-func (s *containerRouter) postContainersAttach(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	err := httputils.ParseForm(r)
-	if err != nil {
-		return err
-	}
-	containerName := vars["name"]
-
-	_, upgrade := r.Header["Upgrade"]
-	detachKeys := r.FormValue("detachKeys")
-
-	hijacker, ok := w.(http.Hijacker)
-	if !ok {
-		return fmt.Errorf("error attaching to container %s, hijack connection missing", containerName)
-	}
-
-	setupStreams := func() (io.ReadCloser, io.Writer, io.Writer, error) {
-		conn, _, err := hijacker.Hijack()
-		if err != nil {
-			return nil, nil, nil, err
-		}
-
-		// set raw mode
-		conn.Write([]byte{})
-
-		if upgrade {
-			fmt.Fprintf(conn, "HTTP/1.1 101 UPGRADED\r\nContent-Type: application/vnd.docker.raw-stream\r\nConnection: Upgrade\r\nUpgrade: tcp\r\n\r\n")
-		} else {
-			fmt.Fprintf(conn, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n")
-		}
-
-		closer := func() error {
-			httputils.CloseStreams(conn)
-			return nil
-		}
-		return ioutils.NewReadCloserWrapper(conn, closer), conn, conn, nil
-	}
-
-	attachConfig := &backend.ContainerAttachConfig{
-		GetStreams: setupStreams,
-		UseStdin:   httputils.BoolValue(r, "stdin"),
-		UseStdout:  httputils.BoolValue(r, "stdout"),
-		UseStderr:  httputils.BoolValue(r, "stderr"),
-		Logs:       httputils.BoolValue(r, "logs"),
-		Stream:     httputils.BoolValue(r, "stream"),
-		DetachKeys: detachKeys,
-		MuxStreams: true,
-	}
-
-	if err = s.backend.ContainerAttach(containerName, attachConfig); err != nil {
-		logrus.Errorf("Handler for %s %s returned error: %v", r.Method, r.URL.Path, err)
-		// Remember to close stream if error happens
-		conn, _, errHijack := hijacker.Hijack()
-		if errHijack == nil {
-			statusCode := httputils.GetHTTPErrorStatusCode(err)
-			statusText := http.StatusText(statusCode)
-			fmt.Fprintf(conn, "HTTP/1.1 %d %s\r\nContent-Type: application/vnd.docker.raw-stream\r\n\r\n%s\r\n", statusCode, statusText, err.Error())
-			httputils.CloseStreams(conn)
-		} else {
-			logrus.Errorf("Error Hijacking: %v", err)
-		}
-	}
-	return nil
-}
-
-func (s *containerRouter) wsContainersAttach(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	containerName := vars["name"]
-
-	var err error
-	detachKeys := r.FormValue("detachKeys")
-
-	done := make(chan struct{})
-	started := make(chan struct{})
-
-	setupStreams := func() (io.ReadCloser, io.Writer, io.Writer, error) {
-		wsChan := make(chan *websocket.Conn)
-		h := func(conn *websocket.Conn) {
-			wsChan <- conn
-			<-done
-		}
-
-		srv := websocket.Server{Handler: h, Handshake: nil}
-		go func() {
-			close(started)
-			srv.ServeHTTP(w, r)
-		}()
-
-		conn := <-wsChan
-		return conn, conn, conn, nil
-	}
-
-	attachConfig := &backend.ContainerAttachConfig{
-		GetStreams: setupStreams,
-		Logs:       httputils.BoolValue(r, "logs"),
-		Stream:     httputils.BoolValue(r, "stream"),
-		DetachKeys: detachKeys,
-		UseStdin:   true,
-		UseStdout:  true,
-		UseStderr:  true,
-		MuxStreams: false, // TODO: this should be true since it's a single stream for both stdout and stderr
-	}
-
-	err = s.backend.ContainerAttach(containerName, attachConfig)
-	close(done)
-	select {
-	case <-started:
-		logrus.Errorf("Error attaching websocket: %s", err)
-		return nil
-	default:
-	}
-	return err
-}
-
-func (s *containerRouter) postContainersPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	pruneReport, err := s.backend.ContainersPrune(pruneFilters)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, pruneReport)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/copy.go b/installer/vendor/github.com/docker/docker/api/server/router/container/copy.go
deleted file mode 100644
index ede6dff92c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/copy.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package container
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"strings"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// postContainersCopy is deprecated in favor of getContainersArchive.
-func (s *containerRouter) postContainersCopy(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	// Deprecated since 1.8, Errors out since 1.12
-	version := httputils.VersionFromContext(ctx)
-	if versions.GreaterThanOrEqualTo(version, "1.24") {
-		w.WriteHeader(http.StatusNotFound)
-		return nil
-	}
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	cfg := types.CopyConfig{}
-	if err := json.NewDecoder(r.Body).Decode(&cfg); err != nil {
-		return err
-	}
-
-	if cfg.Resource == "" {
-		return fmt.Errorf("Path cannot be empty")
-	}
-
-	data, err := s.backend.ContainerCopy(vars["name"], cfg.Resource)
-	if err != nil {
-		if strings.Contains(strings.ToLower(err.Error()), "no such container") {
-			w.WriteHeader(http.StatusNotFound)
-			return nil
-		}
-		if os.IsNotExist(err) {
-			return fmt.Errorf("Could not find the file %s in container %s", cfg.Resource, vars["name"])
-		}
-		return err
-	}
-	defer data.Close()
-
-	w.Header().Set("Content-Type", "application/x-tar")
-	if _, err := io.Copy(w, data); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// // Encode the stat to JSON, base64 encode, and place in a header.
-func setContainerPathStatHeader(stat *types.ContainerPathStat, header http.Header) error {
-	statJSON, err := json.Marshal(stat)
-	if err != nil {
-		return err
-	}
-
-	header.Set(
-		"X-Docker-Container-Path-Stat",
-		base64.StdEncoding.EncodeToString(statJSON),
-	)
-
-	return nil
-}
-
-func (s *containerRouter) headContainersArchive(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	v, err := httputils.ArchiveFormValues(r, vars)
-	if err != nil {
-		return err
-	}
-
-	stat, err := s.backend.ContainerStatPath(v.Name, v.Path)
-	if err != nil {
-		return err
-	}
-
-	return setContainerPathStatHeader(stat, w.Header())
-}
-
-func (s *containerRouter) getContainersArchive(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	v, err := httputils.ArchiveFormValues(r, vars)
-	if err != nil {
-		return err
-	}
-
-	tarArchive, stat, err := s.backend.ContainerArchivePath(v.Name, v.Path)
-	if err != nil {
-		return err
-	}
-	defer tarArchive.Close()
-
-	if err := setContainerPathStatHeader(stat, w.Header()); err != nil {
-		return err
-	}
-
-	w.Header().Set("Content-Type", "application/x-tar")
-	_, err = io.Copy(w, tarArchive)
-
-	return err
-}
-
-func (s *containerRouter) putContainersArchive(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	v, err := httputils.ArchiveFormValues(r, vars)
-	if err != nil {
-		return err
-	}
-
-	noOverwriteDirNonDir := httputils.BoolValue(r, "noOverwriteDirNonDir")
-	return s.backend.ContainerExtractToDir(v.Name, v.Path, noOverwriteDirNonDir, r.Body)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/exec.go b/installer/vendor/github.com/docker/docker/api/server/router/container/exec.go
deleted file mode 100644
index 1134a0e797..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/exec.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package container
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/stdcopy"
-	"golang.org/x/net/context"
-)
-
-func (s *containerRouter) getExecByID(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	eConfig, err := s.backend.ContainerExecInspect(vars["id"])
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, eConfig)
-}
-
-func (s *containerRouter) postContainerExecCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-	name := vars["name"]
-
-	execConfig := &types.ExecConfig{}
-	if err := json.NewDecoder(r.Body).Decode(execConfig); err != nil {
-		return err
-	}
-
-	if len(execConfig.Cmd) == 0 {
-		return fmt.Errorf("No exec command specified")
-	}
-
-	// Register an instance of Exec in container.
-	id, err := s.backend.ContainerExecCreate(name, execConfig)
-	if err != nil {
-		logrus.Errorf("Error setting up exec command in container %s: %v", name, err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, &types.IDResponse{
-		ID: id,
-	})
-}
-
-// TODO(vishh): Refactor the code to avoid having to specify stream config as part of both create and start.
-func (s *containerRouter) postContainerExecStart(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	version := httputils.VersionFromContext(ctx)
-	if versions.GreaterThan(version, "1.21") {
-		if err := httputils.CheckForJSON(r); err != nil {
-			return err
-		}
-	}
-
-	var (
-		execName                  = vars["name"]
-		stdin, inStream           io.ReadCloser
-		stdout, stderr, outStream io.Writer
-	)
-
-	execStartCheck := &types.ExecStartCheck{}
-	if err := json.NewDecoder(r.Body).Decode(execStartCheck); err != nil {
-		return err
-	}
-
-	if exists, err := s.backend.ExecExists(execName); !exists {
-		return err
-	}
-
-	if !execStartCheck.Detach {
-		var err error
-		// Setting up the streaming http interface.
-		inStream, outStream, err = httputils.HijackConnection(w)
-		if err != nil {
-			return err
-		}
-		defer httputils.CloseStreams(inStream, outStream)
-
-		if _, ok := r.Header["Upgrade"]; ok {
-			fmt.Fprint(outStream, "HTTP/1.1 101 UPGRADED\r\nContent-Type: application/vnd.docker.raw-stream\r\nConnection: Upgrade\r\nUpgrade: tcp\r\n")
-		} else {
-			fmt.Fprint(outStream, "HTTP/1.1 200 OK\r\nContent-Type: application/vnd.docker.raw-stream\r\n")
-		}
-
-		// copy headers that were removed as part of hijack
-		if err := w.Header().WriteSubset(outStream, nil); err != nil {
-			return err
-		}
-		fmt.Fprint(outStream, "\r\n")
-
-		stdin = inStream
-		stdout = outStream
-		if !execStartCheck.Tty {
-			stderr = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
-			stdout = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
-		}
-	}
-
-	// Now run the user process in container.
-	// Maybe we should we pass ctx here if we're not detaching?
-	if err := s.backend.ContainerExecStart(context.Background(), execName, stdin, stdout, stderr); err != nil {
-		if execStartCheck.Detach {
-			return err
-		}
-		stdout.Write([]byte(err.Error() + "\r\n"))
-		logrus.Errorf("Error running exec in container: %v", err)
-	}
-	return nil
-}
-
-func (s *containerRouter) postContainerExecResize(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	height, err := strconv.Atoi(r.Form.Get("h"))
-	if err != nil {
-		return err
-	}
-	width, err := strconv.Atoi(r.Form.Get("w"))
-	if err != nil {
-		return err
-	}
-
-	return s.backend.ContainerExecResize(vars["name"], height, width)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/container/inspect.go b/installer/vendor/github.com/docker/docker/api/server/router/container/inspect.go
deleted file mode 100644
index dbbced7eee..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/container/inspect.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package container
-
-import (
-	"net/http"
-
-	"github.com/docker/docker/api/server/httputils"
-	"golang.org/x/net/context"
-)
-
-// getContainersByName inspects container's configuration and serializes it as json.
-func (s *containerRouter) getContainersByName(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	displaySize := httputils.BoolValue(r, "size")
-
-	version := httputils.VersionFromContext(ctx)
-	json, err := s.backend.ContainerInspect(vars["name"], displaySize, version)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, json)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/experimental.go b/installer/vendor/github.com/docker/docker/api/server/router/experimental.go
deleted file mode 100644
index 51385c2552..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/experimental.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package router
-
-import (
-	"errors"
-	"net/http"
-
-	"golang.org/x/net/context"
-
-	apierrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/server/httputils"
-)
-
-var (
-	errExperimentalFeature = errors.New("This experimental feature is disabled by default. Start the Docker daemon with --experimental in order to enable it.")
-)
-
-// ExperimentalRoute defines an experimental API route that can be enabled or disabled.
-type ExperimentalRoute interface {
-	Route
-
-	Enable()
-	Disable()
-}
-
-// experimentalRoute defines an experimental API route that can be enabled or disabled.
-// It implements ExperimentalRoute
-type experimentalRoute struct {
-	local   Route
-	handler httputils.APIFunc
-}
-
-// Enable enables this experimental route
-func (r *experimentalRoute) Enable() {
-	r.handler = r.local.Handler()
-}
-
-// Disable disables the experimental route
-func (r *experimentalRoute) Disable() {
-	r.handler = experimentalHandler
-}
-
-func experimentalHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return apierrors.NewErrorWithStatusCode(errExperimentalFeature, http.StatusNotImplemented)
-}
-
-// Handler returns returns the APIFunc to let the server wrap it in middlewares.
-func (r *experimentalRoute) Handler() httputils.APIFunc {
-	return r.handler
-}
-
-// Method returns the http method that the route responds to.
-func (r *experimentalRoute) Method() string {
-	return r.local.Method()
-}
-
-// Path returns the subpath where the route responds to.
-func (r *experimentalRoute) Path() string {
-	return r.local.Path()
-}
-
-// Experimental will mark a route as experimental.
-func Experimental(r Route) Route {
-	return &experimentalRoute{
-		local:   r,
-		handler: experimentalHandler,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/image/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/image/backend.go
deleted file mode 100644
index 19a67a5ed0..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/image/backend.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package image
-
-import (
-	"io"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
-)
-
-// Backend is all the methods that need to be implemented
-// to provide image specific functionality.
-type Backend interface {
-	containerBackend
-	imageBackend
-	importExportBackend
-	registryBackend
-}
-
-type containerBackend interface {
-	Commit(name string, config *backend.ContainerCommitConfig) (imageID string, err error)
-}
-
-type imageBackend interface {
-	ImageDelete(imageRef string, force, prune bool) ([]types.ImageDelete, error)
-	ImageHistory(imageName string) ([]*types.ImageHistory, error)
-	Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error)
-	LookupImage(name string) (*types.ImageInspect, error)
-	TagImage(imageName, repository, tag string) error
-	ImagesPrune(pruneFilters filters.Args) (*types.ImagesPruneReport, error)
-}
-
-type importExportBackend interface {
-	LoadImage(inTar io.ReadCloser, outStream io.Writer, quiet bool) error
-	ImportImage(src string, repository, tag string, msg string, inConfig io.ReadCloser, outStream io.Writer, changes []string) error
-	ExportImage(names []string, outStream io.Writer) error
-}
-
-type registryBackend interface {
-	PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error
-	PushImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error
-	SearchRegistryForImages(ctx context.Context, filtersArgs string, term string, limit int, authConfig *types.AuthConfig, metaHeaders map[string][]string) (*registry.SearchResults, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/image/image.go b/installer/vendor/github.com/docker/docker/api/server/router/image/image.go
deleted file mode 100644
index 54a4d51482..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/image/image.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package image
-
-import (
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/router"
-)
-
-// imageRouter is a router to talk with the image controller
-type imageRouter struct {
-	backend Backend
-	decoder httputils.ContainerDecoder
-	routes  []router.Route
-}
-
-// NewRouter initializes a new image router
-func NewRouter(backend Backend, decoder httputils.ContainerDecoder) router.Router {
-	r := &imageRouter{
-		backend: backend,
-		decoder: decoder,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routes to the image controller
-func (r *imageRouter) Routes() []router.Route {
-	return r.routes
-}
-
-// initRoutes initializes the routes in the image router
-func (r *imageRouter) initRoutes() {
-	r.routes = []router.Route{
-		// GET
-		router.NewGetRoute("/images/json", r.getImagesJSON),
-		router.NewGetRoute("/images/search", r.getImagesSearch),
-		router.NewGetRoute("/images/get", r.getImagesGet),
-		router.NewGetRoute("/images/{name:.*}/get", r.getImagesGet),
-		router.NewGetRoute("/images/{name:.*}/history", r.getImagesHistory),
-		router.NewGetRoute("/images/{name:.*}/json", r.getImagesByName),
-		// POST
-		router.NewPostRoute("/commit", r.postCommit),
-		router.NewPostRoute("/images/load", r.postImagesLoad),
-		router.Cancellable(router.NewPostRoute("/images/create", r.postImagesCreate)),
-		router.Cancellable(router.NewPostRoute("/images/{name:.*}/push", r.postImagesPush)),
-		router.NewPostRoute("/images/{name:.*}/tag", r.postImagesTag),
-		router.NewPostRoute("/images/prune", r.postImagesPrune),
-		// DELETE
-		router.NewDeleteRoute("/images/{name:.*}", r.deleteImages),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/image/image_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/image/image_routes.go
deleted file mode 100644
index 69403652a0..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/image/image_routes.go
+++ /dev/null
@@ -1,344 +0,0 @@
-package image
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-func (s *imageRouter) postCommit(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	cname := r.Form.Get("container")
-
-	pause := httputils.BoolValue(r, "pause")
-	version := httputils.VersionFromContext(ctx)
-	if r.FormValue("pause") == "" && versions.GreaterThanOrEqualTo(version, "1.13") {
-		pause = true
-	}
-
-	c, _, _, err := s.decoder.DecodeConfig(r.Body)
-	if err != nil && err != io.EOF { //Do not fail if body is empty.
-		return err
-	}
-	if c == nil {
-		c = &container.Config{}
-	}
-
-	commitCfg := &backend.ContainerCommitConfig{
-		ContainerCommitConfig: types.ContainerCommitConfig{
-			Pause:        pause,
-			Repo:         r.Form.Get("repo"),
-			Tag:          r.Form.Get("tag"),
-			Author:       r.Form.Get("author"),
-			Comment:      r.Form.Get("comment"),
-			Config:       c,
-			MergeConfigs: true,
-		},
-		Changes: r.Form["changes"],
-	}
-
-	imgID, err := s.backend.Commit(cname, commitCfg)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, &types.IDResponse{
-		ID: string(imgID),
-	})
-}
-
-// Creates an image from Pull or from Import
-func (s *imageRouter) postImagesCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	var (
-		image   = r.Form.Get("fromImage")
-		repo    = r.Form.Get("repo")
-		tag     = r.Form.Get("tag")
-		message = r.Form.Get("message")
-		err     error
-		output  = ioutils.NewWriteFlusher(w)
-	)
-	defer output.Close()
-
-	w.Header().Set("Content-Type", "application/json")
-
-	if image != "" { //pull
-		metaHeaders := map[string][]string{}
-		for k, v := range r.Header {
-			if strings.HasPrefix(k, "X-Meta-") {
-				metaHeaders[k] = v
-			}
-		}
-
-		authEncoded := r.Header.Get("X-Registry-Auth")
-		authConfig := &types.AuthConfig{}
-		if authEncoded != "" {
-			authJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))
-			if err := json.NewDecoder(authJSON).Decode(authConfig); err != nil {
-				// for a pull it is not an error if no auth was given
-				// to increase compatibility with the existing api it is defaulting to be empty
-				authConfig = &types.AuthConfig{}
-			}
-		}
-
-		err = s.backend.PullImage(ctx, image, tag, metaHeaders, authConfig, output)
-	} else { //import
-		src := r.Form.Get("fromSrc")
-		// 'err' MUST NOT be defined within this block, we need any error
-		// generated from the download to be available to the output
-		// stream processing below
-		err = s.backend.ImportImage(src, repo, tag, message, r.Body, output, r.Form["changes"])
-	}
-	if err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		sf := streamformatter.NewJSONStreamFormatter()
-		output.Write(sf.FormatError(err))
-	}
-
-	return nil
-}
-
-func (s *imageRouter) postImagesPush(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	metaHeaders := map[string][]string{}
-	for k, v := range r.Header {
-		if strings.HasPrefix(k, "X-Meta-") {
-			metaHeaders[k] = v
-		}
-	}
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	authConfig := &types.AuthConfig{}
-
-	authEncoded := r.Header.Get("X-Registry-Auth")
-	if authEncoded != "" {
-		// the new format is to handle the authConfig as a header
-		authJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))
-		if err := json.NewDecoder(authJSON).Decode(authConfig); err != nil {
-			// to increase compatibility to existing api it is defaulting to be empty
-			authConfig = &types.AuthConfig{}
-		}
-	} else {
-		// the old format is supported for compatibility if there was no authConfig header
-		if err := json.NewDecoder(r.Body).Decode(authConfig); err != nil {
-			return fmt.Errorf("Bad parameters and missing X-Registry-Auth: %v", err)
-		}
-	}
-
-	image := vars["name"]
-	tag := r.Form.Get("tag")
-
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-
-	w.Header().Set("Content-Type", "application/json")
-
-	if err := s.backend.PushImage(ctx, image, tag, metaHeaders, authConfig, output); err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		sf := streamformatter.NewJSONStreamFormatter()
-		output.Write(sf.FormatError(err))
-	}
-	return nil
-}
-
-func (s *imageRouter) getImagesGet(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	w.Header().Set("Content-Type", "application/x-tar")
-
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-	var names []string
-	if name, ok := vars["name"]; ok {
-		names = []string{name}
-	} else {
-		names = r.Form["names"]
-	}
-
-	if err := s.backend.ExportImage(names, output); err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		sf := streamformatter.NewJSONStreamFormatter()
-		output.Write(sf.FormatError(err))
-	}
-	return nil
-}
-
-func (s *imageRouter) postImagesLoad(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	quiet := httputils.BoolValueOrDefault(r, "quiet", true)
-
-	w.Header().Set("Content-Type", "application/json")
-
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-	if err := s.backend.LoadImage(r.Body, output, quiet); err != nil {
-		output.Write(streamformatter.NewJSONStreamFormatter().FormatError(err))
-	}
-	return nil
-}
-
-func (s *imageRouter) deleteImages(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-
-	if strings.TrimSpace(name) == "" {
-		return fmt.Errorf("image name cannot be blank")
-	}
-
-	force := httputils.BoolValue(r, "force")
-	prune := !httputils.BoolValue(r, "noprune")
-
-	list, err := s.backend.ImageDelete(name, force, prune)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, list)
-}
-
-func (s *imageRouter) getImagesByName(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	imageInspect, err := s.backend.LookupImage(vars["name"])
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, imageInspect)
-}
-
-func (s *imageRouter) getImagesJSON(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	imageFilters, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	version := httputils.VersionFromContext(ctx)
-	filterParam := r.Form.Get("filter")
-	if versions.LessThan(version, "1.28") && filterParam != "" {
-		imageFilters.Add("reference", filterParam)
-	}
-
-	images, err := s.backend.Images(imageFilters, httputils.BoolValue(r, "all"), false)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, images)
-}
-
-func (s *imageRouter) getImagesHistory(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	name := vars["name"]
-	history, err := s.backend.ImageHistory(name)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, history)
-}
-
-func (s *imageRouter) postImagesTag(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	if err := s.backend.TagImage(vars["name"], r.Form.Get("repo"), r.Form.Get("tag")); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusCreated)
-	return nil
-}
-
-func (s *imageRouter) getImagesSearch(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	var (
-		config      *types.AuthConfig
-		authEncoded = r.Header.Get("X-Registry-Auth")
-		headers     = map[string][]string{}
-	)
-
-	if authEncoded != "" {
-		authJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))
-		if err := json.NewDecoder(authJSON).Decode(&config); err != nil {
-			// for a search it is not an error if no auth was given
-			// to increase compatibility with the existing api it is defaulting to be empty
-			config = &types.AuthConfig{}
-		}
-	}
-	for k, v := range r.Header {
-		if strings.HasPrefix(k, "X-Meta-") {
-			headers[k] = v
-		}
-	}
-	limit := registry.DefaultSearchLimit
-	if r.Form.Get("limit") != "" {
-		limitValue, err := strconv.Atoi(r.Form.Get("limit"))
-		if err != nil {
-			return err
-		}
-		limit = limitValue
-	}
-	query, err := s.backend.SearchRegistryForImages(ctx, r.Form.Get("filters"), r.Form.Get("term"), limit, config, headers)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, query.Results)
-}
-
-func (s *imageRouter) postImagesPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	pruneFilters, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	pruneReport, err := s.backend.ImagesPrune(pruneFilters)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, pruneReport)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/local.go b/installer/vendor/github.com/docker/docker/api/server/router/local.go
deleted file mode 100644
index 7cb2a5a2f3..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/local.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package router
-
-import (
-	"net/http"
-
-	"github.com/docker/docker/api/server/httputils"
-	"golang.org/x/net/context"
-)
-
-// localRoute defines an individual API route to connect
-// with the docker daemon. It implements Route.
-type localRoute struct {
-	method  string
-	path    string
-	handler httputils.APIFunc
-}
-
-// Handler returns the APIFunc to let the server wrap it in middlewares.
-func (l localRoute) Handler() httputils.APIFunc {
-	return l.handler
-}
-
-// Method returns the http method that the route responds to.
-func (l localRoute) Method() string {
-	return l.method
-}
-
-// Path returns the subpath where the route responds to.
-func (l localRoute) Path() string {
-	return l.path
-}
-
-// NewRoute initializes a new local route for the router.
-func NewRoute(method, path string, handler httputils.APIFunc) Route {
-	return localRoute{method, path, handler}
-}
-
-// NewGetRoute initializes a new route with the http method GET.
-func NewGetRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("GET", path, handler)
-}
-
-// NewPostRoute initializes a new route with the http method POST.
-func NewPostRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("POST", path, handler)
-}
-
-// NewPutRoute initializes a new route with the http method PUT.
-func NewPutRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("PUT", path, handler)
-}
-
-// NewDeleteRoute initializes a new route with the http method DELETE.
-func NewDeleteRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("DELETE", path, handler)
-}
-
-// NewOptionsRoute initializes a new route with the http method OPTIONS.
-func NewOptionsRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("OPTIONS", path, handler)
-}
-
-// NewHeadRoute initializes a new route with the http method HEAD.
-func NewHeadRoute(path string, handler httputils.APIFunc) Route {
-	return NewRoute("HEAD", path, handler)
-}
-
-func cancellableHandler(h httputils.APIFunc) httputils.APIFunc {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		if notifier, ok := w.(http.CloseNotifier); ok {
-			notify := notifier.CloseNotify()
-			notifyCtx, cancel := context.WithCancel(ctx)
-			finished := make(chan struct{})
-			defer close(finished)
-			ctx = notifyCtx
-			go func() {
-				select {
-				case <-notify:
-					cancel()
-				case <-finished:
-				}
-			}()
-		}
-		return h(ctx, w, r, vars)
-	}
-}
-
-// Cancellable makes new route which embeds http.CloseNotifier feature to
-// context.Context of handler.
-func Cancellable(r Route) Route {
-	return localRoute{
-		method:  r.Method(),
-		path:    r.Path(),
-		handler: cancellableHandler(r.Handler()),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/network/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/network/backend.go
deleted file mode 100644
index 0d1dfb0123..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/network/backend.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package network
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/libnetwork"
-)
-
-// Backend is all the methods that need to be implemented
-// to provide network specific functionality.
-type Backend interface {
-	FindNetwork(idName string) (libnetwork.Network, error)
-	GetNetworkByName(idName string) (libnetwork.Network, error)
-	GetNetworksByID(partialID string) []libnetwork.Network
-	GetNetworks() []libnetwork.Network
-	CreateNetwork(nc types.NetworkCreateRequest) (*types.NetworkCreateResponse, error)
-	ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error
-	DisconnectContainerFromNetwork(containerName string, networkName string, force bool) error
-	DeleteNetwork(name string) error
-	NetworksPrune(pruneFilters filters.Args) (*types.NetworksPruneReport, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/network/filter.go b/installer/vendor/github.com/docker/docker/api/server/router/network/filter.go
deleted file mode 100644
index 94affb83cd..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/network/filter.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package network
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/runconfig"
-)
-
-var (
-	// AcceptedFilters is an acceptable filters for validation
-	AcceptedFilters = map[string]bool{
-		"driver": true,
-		"type":   true,
-		"name":   true,
-		"id":     true,
-		"label":  true,
-	}
-)
-
-func filterNetworkByType(nws []types.NetworkResource, netType string) (retNws []types.NetworkResource, err error) {
-	switch netType {
-	case "builtin":
-		for _, nw := range nws {
-			if runconfig.IsPreDefinedNetwork(nw.Name) {
-				retNws = append(retNws, nw)
-			}
-		}
-	case "custom":
-		for _, nw := range nws {
-			if !runconfig.IsPreDefinedNetwork(nw.Name) {
-				retNws = append(retNws, nw)
-			}
-		}
-	default:
-		return nil, fmt.Errorf("Invalid filter: 'type'='%s'", netType)
-	}
-	return retNws, nil
-}
-
-// filterNetworks filters network list according to user specified filter
-// and returns user chosen networks
-func filterNetworks(nws []types.NetworkResource, filter filters.Args) ([]types.NetworkResource, error) {
-	// if filter is empty, return original network list
-	if filter.Len() == 0 {
-		return nws, nil
-	}
-
-	if err := filter.Validate(AcceptedFilters); err != nil {
-		return nil, err
-	}
-
-	displayNet := []types.NetworkResource{}
-	for _, nw := range nws {
-		if filter.Include("driver") {
-			if !filter.ExactMatch("driver", nw.Driver) {
-				continue
-			}
-		}
-		if filter.Include("name") {
-			if !filter.Match("name", nw.Name) {
-				continue
-			}
-		}
-		if filter.Include("id") {
-			if !filter.Match("id", nw.ID) {
-				continue
-			}
-		}
-		if filter.Include("label") {
-			if !filter.MatchKVList("label", nw.Labels) {
-				continue
-			}
-		}
-		displayNet = append(displayNet, nw)
-	}
-
-	if filter.Include("type") {
-		var typeNet []types.NetworkResource
-		errFilter := filter.WalkValues("type", func(fval string) error {
-			passList, err := filterNetworkByType(displayNet, fval)
-			if err != nil {
-				return err
-			}
-			typeNet = append(typeNet, passList...)
-			return nil
-		})
-		if errFilter != nil {
-			return nil, errFilter
-		}
-		displayNet = typeNet
-	}
-
-	return displayNet, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/network/network.go b/installer/vendor/github.com/docker/docker/api/server/router/network/network.go
deleted file mode 100644
index 08a5c8c6a6..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/network/network.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package network
-
-import (
-	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/daemon/cluster"
-)
-
-// networkRouter is a router to talk with the network controller
-type networkRouter struct {
-	backend         Backend
-	clusterProvider *cluster.Cluster
-	routes          []router.Route
-}
-
-// NewRouter initializes a new network router
-func NewRouter(b Backend, c *cluster.Cluster) router.Router {
-	r := &networkRouter{
-		backend:         b,
-		clusterProvider: c,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routes to the network controller
-func (r *networkRouter) Routes() []router.Route {
-	return r.routes
-}
-
-func (r *networkRouter) initRoutes() {
-	r.routes = []router.Route{
-		// GET
-		router.NewGetRoute("/networks", r.getNetworksList),
-		router.NewGetRoute("/networks/", r.getNetworksList),
-		router.NewGetRoute("/networks/{id:.+}", r.getNetwork),
-		// POST
-		router.NewPostRoute("/networks/create", r.postNetworkCreate),
-		router.NewPostRoute("/networks/{id:.*}/connect", r.postNetworkConnect),
-		router.NewPostRoute("/networks/{id:.*}/disconnect", r.postNetworkDisconnect),
-		router.NewPostRoute("/networks/prune", r.postNetworksPrune),
-		// DELETE
-		router.NewDeleteRoute("/networks/{id:.*}", r.deleteNetwork),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/network/network_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/network/network_routes.go
deleted file mode 100644
index 7bfc499552..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/network/network_routes.go
+++ /dev/null
@@ -1,308 +0,0 @@
-package network
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/networkdb"
-)
-
-func (n *networkRouter) getNetworksList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	filter := r.Form.Get("filters")
-	netFilters, err := filters.FromParam(filter)
-	if err != nil {
-		return err
-	}
-
-	list := []types.NetworkResource{}
-
-	if nr, err := n.clusterProvider.GetNetworks(); err == nil {
-		list = append(list, nr...)
-	}
-
-	// Combine the network list returned by Docker daemon if it is not already
-	// returned by the cluster manager
-SKIP:
-	for _, nw := range n.backend.GetNetworks() {
-		for _, nl := range list {
-			if nl.ID == nw.ID() {
-				continue SKIP
-			}
-		}
-		list = append(list, *n.buildNetworkResource(nw))
-	}
-
-	list, err = filterNetworks(list, netFilters)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, list)
-}
-
-func (n *networkRouter) getNetwork(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	nw, err := n.backend.FindNetwork(vars["id"])
-	if err != nil {
-		if nr, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
-			return httputils.WriteJSON(w, http.StatusOK, nr)
-		}
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, n.buildNetworkResource(nw))
-}
-
-func (n *networkRouter) postNetworkCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var create types.NetworkCreateRequest
-
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&create); err != nil {
-		return err
-	}
-
-	if nws, err := n.clusterProvider.GetNetworksByName(create.Name); err == nil && len(nws) > 0 {
-		return libnetwork.NetworkNameError(create.Name)
-	}
-
-	nw, err := n.backend.CreateNetwork(create)
-	if err != nil {
-		if _, ok := err.(libnetwork.ManagerRedirectError); !ok {
-			return err
-		}
-		id, err := n.clusterProvider.CreateNetwork(create)
-		if err != nil {
-			return err
-		}
-		nw = &types.NetworkCreateResponse{ID: id}
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, nw)
-}
-
-func (n *networkRouter) postNetworkConnect(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var connect types.NetworkConnect
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&connect); err != nil {
-		return err
-	}
-
-	return n.backend.ConnectContainerToNetwork(connect.Container, vars["id"], connect.EndpointConfig)
-}
-
-func (n *networkRouter) postNetworkDisconnect(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var disconnect types.NetworkDisconnect
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	if err := json.NewDecoder(r.Body).Decode(&disconnect); err != nil {
-		return err
-	}
-
-	return n.backend.DisconnectContainerFromNetwork(disconnect.Container, vars["id"], disconnect.Force)
-}
-
-func (n *networkRouter) deleteNetwork(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	if _, err := n.clusterProvider.GetNetwork(vars["id"]); err == nil {
-		if err = n.clusterProvider.RemoveNetwork(vars["id"]); err != nil {
-			return err
-		}
-		w.WriteHeader(http.StatusNoContent)
-		return nil
-	}
-	if err := n.backend.DeleteNetwork(vars["id"]); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (n *networkRouter) buildNetworkResource(nw libnetwork.Network) *types.NetworkResource {
-	r := &types.NetworkResource{}
-	if nw == nil {
-		return r
-	}
-
-	info := nw.Info()
-	r.Name = nw.Name()
-	r.ID = nw.ID()
-	r.Created = info.Created()
-	r.Scope = info.Scope()
-	if n.clusterProvider.IsManager() {
-		if _, err := n.clusterProvider.GetNetwork(nw.ID()); err == nil {
-			r.Scope = "swarm"
-		}
-	} else if info.Dynamic() {
-		r.Scope = "swarm"
-	}
-	r.Driver = nw.Type()
-	r.EnableIPv6 = info.IPv6Enabled()
-	r.Internal = info.Internal()
-	r.Attachable = info.Attachable()
-	r.Options = info.DriverOptions()
-	r.Containers = make(map[string]types.EndpointResource)
-	buildIpamResources(r, info)
-	r.Labels = info.Labels()
-
-	peers := info.Peers()
-	if len(peers) != 0 {
-		r.Peers = buildPeerInfoResources(peers)
-	}
-
-	epl := nw.Endpoints()
-	for _, e := range epl {
-		ei := e.Info()
-		if ei == nil {
-			continue
-		}
-		sb := ei.Sandbox()
-		tmpID := e.ID()
-		key := "ep-" + tmpID
-		if sb != nil {
-			key = sb.ContainerID()
-		}
-
-		r.Containers[key] = buildEndpointResource(tmpID, e.Name(), ei)
-	}
-	return r
-}
-
-func buildPeerInfoResources(peers []networkdb.PeerInfo) []network.PeerInfo {
-	peerInfo := make([]network.PeerInfo, 0, len(peers))
-	for _, peer := range peers {
-		peerInfo = append(peerInfo, network.PeerInfo{
-			Name: peer.Name,
-			IP:   peer.IP,
-		})
-	}
-	return peerInfo
-}
-
-func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo) {
-	id, opts, ipv4conf, ipv6conf := nwInfo.IpamConfig()
-
-	ipv4Info, ipv6Info := nwInfo.IpamInfo()
-
-	r.IPAM.Driver = id
-
-	r.IPAM.Options = opts
-
-	r.IPAM.Config = []network.IPAMConfig{}
-	for _, ip4 := range ipv4conf {
-		if ip4.PreferredPool == "" {
-			continue
-		}
-		iData := network.IPAMConfig{}
-		iData.Subnet = ip4.PreferredPool
-		iData.IPRange = ip4.SubPool
-		iData.Gateway = ip4.Gateway
-		iData.AuxAddress = ip4.AuxAddresses
-		r.IPAM.Config = append(r.IPAM.Config, iData)
-	}
-
-	if len(r.IPAM.Config) == 0 {
-		for _, ip4Info := range ipv4Info {
-			iData := network.IPAMConfig{}
-			iData.Subnet = ip4Info.IPAMData.Pool.String()
-			iData.Gateway = ip4Info.IPAMData.Gateway.IP.String()
-			r.IPAM.Config = append(r.IPAM.Config, iData)
-		}
-	}
-
-	hasIpv6Conf := false
-	for _, ip6 := range ipv6conf {
-		if ip6.PreferredPool == "" {
-			continue
-		}
-		hasIpv6Conf = true
-		iData := network.IPAMConfig{}
-		iData.Subnet = ip6.PreferredPool
-		iData.IPRange = ip6.SubPool
-		iData.Gateway = ip6.Gateway
-		iData.AuxAddress = ip6.AuxAddresses
-		r.IPAM.Config = append(r.IPAM.Config, iData)
-	}
-
-	if !hasIpv6Conf {
-		for _, ip6Info := range ipv6Info {
-			if ip6Info.IPAMData.Pool == nil {
-				continue
-			}
-			iData := network.IPAMConfig{}
-			iData.Subnet = ip6Info.IPAMData.Pool.String()
-			iData.Gateway = ip6Info.IPAMData.Gateway.String()
-			r.IPAM.Config = append(r.IPAM.Config, iData)
-		}
-	}
-}
-
-func buildEndpointResource(id string, name string, info libnetwork.EndpointInfo) types.EndpointResource {
-	er := types.EndpointResource{}
-
-	er.EndpointID = id
-	er.Name = name
-	ei := info
-	if ei == nil {
-		return er
-	}
-
-	if iface := ei.Iface(); iface != nil {
-		if mac := iface.MacAddress(); mac != nil {
-			er.MacAddress = mac.String()
-		}
-		if ip := iface.Address(); ip != nil && len(ip.IP) > 0 {
-			er.IPv4Address = ip.String()
-		}
-
-		if ipv6 := iface.AddressIPv6(); ipv6 != nil && len(ipv6.IP) > 0 {
-			er.IPv6Address = ipv6.String()
-		}
-	}
-	return er
-}
-
-func (n *networkRouter) postNetworksPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	pruneReport, err := n.backend.NetworksPrune(filters.Args{})
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, pruneReport)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/plugin/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/plugin/backend.go
deleted file mode 100644
index ab006b2256..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/plugin/backend.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package plugin
-
-import (
-	"io"
-	"net/http"
-
-	enginetypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/reference"
-	"golang.org/x/net/context"
-)
-
-// Backend for Plugin
-type Backend interface {
-	Disable(name string, config *enginetypes.PluginDisableConfig) error
-	Enable(name string, config *enginetypes.PluginEnableConfig) error
-	List() ([]enginetypes.Plugin, error)
-	Inspect(name string) (*enginetypes.Plugin, error)
-	Remove(name string, config *enginetypes.PluginRmConfig) error
-	Set(name string, args []string) error
-	Privileges(ctx context.Context, ref reference.Named, metaHeaders http.Header, authConfig *enginetypes.AuthConfig) (enginetypes.PluginPrivileges, error)
-	Pull(ctx context.Context, ref reference.Named, name string, metaHeaders http.Header, authConfig *enginetypes.AuthConfig, privileges enginetypes.PluginPrivileges, outStream io.Writer) error
-	Push(ctx context.Context, name string, metaHeaders http.Header, authConfig *enginetypes.AuthConfig, outStream io.Writer) error
-	Upgrade(ctx context.Context, ref reference.Named, name string, metaHeaders http.Header, authConfig *enginetypes.AuthConfig, privileges enginetypes.PluginPrivileges, outStream io.Writer) error
-	CreateFromContext(ctx context.Context, tarCtx io.ReadCloser, options *enginetypes.PluginCreateOptions) error
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin.go b/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin.go
deleted file mode 100644
index e4ea9e23bf..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package plugin
-
-import "github.com/docker/docker/api/server/router"
-
-// pluginRouter is a router to talk with the plugin controller
-type pluginRouter struct {
-	backend Backend
-	routes  []router.Route
-}
-
-// NewRouter initializes a new plugin router
-func NewRouter(b Backend) router.Router {
-	r := &pluginRouter{
-		backend: b,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routers to the plugin controller
-func (r *pluginRouter) Routes() []router.Route {
-	return r.routes
-}
-
-func (r *pluginRouter) initRoutes() {
-	r.routes = []router.Route{
-		router.NewGetRoute("/plugins", r.listPlugins),
-		router.NewGetRoute("/plugins/{name:.*}/json", r.inspectPlugin),
-		router.NewGetRoute("/plugins/privileges", r.getPrivileges),
-		router.NewDeleteRoute("/plugins/{name:.*}", r.removePlugin),
-		router.NewPostRoute("/plugins/{name:.*}/enable", r.enablePlugin), // PATCH?
-		router.NewPostRoute("/plugins/{name:.*}/disable", r.disablePlugin),
-		router.Cancellable(router.NewPostRoute("/plugins/pull", r.pullPlugin)),
-		router.Cancellable(router.NewPostRoute("/plugins/{name:.*}/push", r.pushPlugin)),
-		router.Cancellable(router.NewPostRoute("/plugins/{name:.*}/upgrade", r.upgradePlugin)),
-		router.NewPostRoute("/plugins/{name:.*}/set", r.setPlugin),
-		router.NewPostRoute("/plugins/create", r.createPlugin),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin_routes.go
deleted file mode 100644
index 693fa95baf..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/plugin/plugin_routes.go
+++ /dev/null
@@ -1,314 +0,0 @@
-package plugin
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"net/http"
-	"strconv"
-	"strings"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/reference"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-func parseHeaders(headers http.Header) (map[string][]string, *types.AuthConfig) {
-
-	metaHeaders := map[string][]string{}
-	for k, v := range headers {
-		if strings.HasPrefix(k, "X-Meta-") {
-			metaHeaders[k] = v
-		}
-	}
-
-	// Get X-Registry-Auth
-	authEncoded := headers.Get("X-Registry-Auth")
-	authConfig := &types.AuthConfig{}
-	if authEncoded != "" {
-		authJSON := base64.NewDecoder(base64.URLEncoding, strings.NewReader(authEncoded))
-		if err := json.NewDecoder(authJSON).Decode(authConfig); err != nil {
-			authConfig = &types.AuthConfig{}
-		}
-	}
-
-	return metaHeaders, authConfig
-}
-
-// parseRemoteRef parses the remote reference into a reference.Named
-// returning the tag associated with the reference. In the case the
-// given reference string includes both digest and tag, the returned
-// reference will have the digest without the tag, but the tag will
-// be returned.
-func parseRemoteRef(remote string) (reference.Named, string, error) {
-	// Parse remote reference, supporting remotes with name and tag
-	// NOTE: Using distribution reference to handle references
-	// containing both a name and digest
-	remoteRef, err := distreference.ParseNamed(remote)
-	if err != nil {
-		return nil, "", err
-	}
-
-	var tag string
-	if t, ok := remoteRef.(distreference.Tagged); ok {
-		tag = t.Tag()
-	}
-
-	// Convert distribution reference to docker reference
-	// TODO: remove when docker reference changes reconciled upstream
-	ref, err := reference.WithName(remoteRef.Name())
-	if err != nil {
-		return nil, "", err
-	}
-	if d, ok := remoteRef.(distreference.Digested); ok {
-		ref, err = reference.WithDigest(ref, d.Digest())
-		if err != nil {
-			return nil, "", err
-		}
-	} else if tag != "" {
-		ref, err = reference.WithTag(ref, tag)
-		if err != nil {
-			return nil, "", err
-		}
-	} else {
-		ref = reference.WithDefaultTag(ref)
-	}
-
-	return ref, tag, nil
-}
-
-func (pr *pluginRouter) getPrivileges(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	metaHeaders, authConfig := parseHeaders(r.Header)
-
-	ref, _, err := parseRemoteRef(r.FormValue("remote"))
-	if err != nil {
-		return err
-	}
-
-	privileges, err := pr.backend.Privileges(ctx, ref, metaHeaders, authConfig)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, privileges)
-}
-
-func (pr *pluginRouter) upgradePlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return errors.Wrap(err, "failed to parse form")
-	}
-
-	var privileges types.PluginPrivileges
-	dec := json.NewDecoder(r.Body)
-	if err := dec.Decode(&privileges); err != nil {
-		return errors.Wrap(err, "failed to parse privileges")
-	}
-	if dec.More() {
-		return errors.New("invalid privileges")
-	}
-
-	metaHeaders, authConfig := parseHeaders(r.Header)
-	ref, tag, err := parseRemoteRef(r.FormValue("remote"))
-	if err != nil {
-		return err
-	}
-
-	name, err := getName(ref, tag, vars["name"])
-	if err != nil {
-		return err
-	}
-	w.Header().Set("Docker-Plugin-Name", name)
-
-	w.Header().Set("Content-Type", "application/json")
-	output := ioutils.NewWriteFlusher(w)
-
-	if err := pr.backend.Upgrade(ctx, ref, name, metaHeaders, authConfig, privileges, output); err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		output.Write(streamformatter.NewJSONStreamFormatter().FormatError(err))
-	}
-
-	return nil
-}
-
-func (pr *pluginRouter) pullPlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return errors.Wrap(err, "failed to parse form")
-	}
-
-	var privileges types.PluginPrivileges
-	dec := json.NewDecoder(r.Body)
-	if err := dec.Decode(&privileges); err != nil {
-		return errors.Wrap(err, "failed to parse privileges")
-	}
-	if dec.More() {
-		return errors.New("invalid privileges")
-	}
-
-	metaHeaders, authConfig := parseHeaders(r.Header)
-	ref, tag, err := parseRemoteRef(r.FormValue("remote"))
-	if err != nil {
-		return err
-	}
-
-	name, err := getName(ref, tag, r.FormValue("name"))
-	if err != nil {
-		return err
-	}
-	w.Header().Set("Docker-Plugin-Name", name)
-
-	w.Header().Set("Content-Type", "application/json")
-	output := ioutils.NewWriteFlusher(w)
-
-	if err := pr.backend.Pull(ctx, ref, name, metaHeaders, authConfig, privileges, output); err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		output.Write(streamformatter.NewJSONStreamFormatter().FormatError(err))
-	}
-
-	return nil
-}
-
-func getName(ref reference.Named, tag, name string) (string, error) {
-	if name == "" {
-		if _, ok := ref.(reference.Canonical); ok {
-			trimmed := reference.TrimNamed(ref)
-			if tag != "" {
-				nt, err := reference.WithTag(trimmed, tag)
-				if err != nil {
-					return "", err
-				}
-				name = nt.String()
-			} else {
-				name = reference.WithDefaultTag(trimmed).String()
-			}
-		} else {
-			name = ref.String()
-		}
-	} else {
-		localRef, err := reference.ParseNamed(name)
-		if err != nil {
-			return "", err
-		}
-		if _, ok := localRef.(reference.Canonical); ok {
-			return "", errors.New("cannot use digest in plugin tag")
-		}
-		if distreference.IsNameOnly(localRef) {
-			// TODO: log change in name to out stream
-			name = reference.WithDefaultTag(localRef).String()
-		}
-	}
-	return name, nil
-}
-
-func (pr *pluginRouter) createPlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	options := &types.PluginCreateOptions{
-		RepoName: r.FormValue("name")}
-
-	if err := pr.backend.CreateFromContext(ctx, r.Body, options); err != nil {
-		return err
-	}
-	//TODO: send progress bar
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (pr *pluginRouter) enablePlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-	timeout, err := strconv.Atoi(r.Form.Get("timeout"))
-	if err != nil {
-		return err
-	}
-	config := &types.PluginEnableConfig{Timeout: timeout}
-
-	return pr.backend.Enable(name, config)
-}
-
-func (pr *pluginRouter) disablePlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-	config := &types.PluginDisableConfig{
-		ForceDisable: httputils.BoolValue(r, "force"),
-	}
-
-	return pr.backend.Disable(name, config)
-}
-
-func (pr *pluginRouter) removePlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	name := vars["name"]
-	config := &types.PluginRmConfig{
-		ForceRemove: httputils.BoolValue(r, "force"),
-	}
-	return pr.backend.Remove(name, config)
-}
-
-func (pr *pluginRouter) pushPlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return errors.Wrap(err, "failed to parse form")
-	}
-
-	metaHeaders, authConfig := parseHeaders(r.Header)
-
-	w.Header().Set("Content-Type", "application/json")
-	output := ioutils.NewWriteFlusher(w)
-
-	if err := pr.backend.Push(ctx, vars["name"], metaHeaders, authConfig, output); err != nil {
-		if !output.Flushed() {
-			return err
-		}
-		output.Write(streamformatter.NewJSONStreamFormatter().FormatError(err))
-	}
-	return nil
-}
-
-func (pr *pluginRouter) setPlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var args []string
-	if err := json.NewDecoder(r.Body).Decode(&args); err != nil {
-		return err
-	}
-	if err := pr.backend.Set(vars["name"], args); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (pr *pluginRouter) listPlugins(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	l, err := pr.backend.List()
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, l)
-}
-
-func (pr *pluginRouter) inspectPlugin(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	result, err := pr.backend.Inspect(vars["name"])
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, result)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/router.go b/installer/vendor/github.com/docker/docker/api/server/router/router.go
deleted file mode 100644
index 2de25c27ff..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/router.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package router
-
-import "github.com/docker/docker/api/server/httputils"
-
-// Router defines an interface to specify a group of routes to add to the docker server.
-type Router interface {
-	// Routes returns the list of routes to add to the docker server.
-	Routes() []Route
-}
-
-// Route defines an individual API route in the docker server.
-type Route interface {
-	// Handler returns the raw function to create the http handler.
-	Handler() httputils.APIFunc
-	// Method returns the http method that the route responds to.
-	Method() string
-	// Path returns the subpath where the route responds to.
-	Path() string
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/swarm/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/swarm/backend.go
deleted file mode 100644
index 33840f0d30..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/swarm/backend.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package swarm
-
-import (
-	basictypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	types "github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// Backend abstracts an swarm commands manager.
-type Backend interface {
-	Init(req types.InitRequest) (string, error)
-	Join(req types.JoinRequest) error
-	Leave(force bool) error
-	Inspect() (types.Swarm, error)
-	Update(uint64, types.Spec, types.UpdateFlags) error
-	GetUnlockKey() (string, error)
-	UnlockSwarm(req types.UnlockRequest) error
-	GetServices(basictypes.ServiceListOptions) ([]types.Service, error)
-	GetService(string) (types.Service, error)
-	CreateService(types.ServiceSpec, string) (*basictypes.ServiceCreateResponse, error)
-	UpdateService(string, uint64, types.ServiceSpec, string, string) (*basictypes.ServiceUpdateResponse, error)
-	RemoveService(string) error
-	ServiceLogs(context.Context, string, *backend.ContainerLogsConfig, chan struct{}) error
-	GetNodes(basictypes.NodeListOptions) ([]types.Node, error)
-	GetNode(string) (types.Node, error)
-	UpdateNode(string, uint64, types.NodeSpec) error
-	RemoveNode(string, bool) error
-	GetTasks(basictypes.TaskListOptions) ([]types.Task, error)
-	GetTask(string) (types.Task, error)
-	GetSecrets(opts basictypes.SecretListOptions) ([]types.Secret, error)
-	CreateSecret(s types.SecretSpec) (string, error)
-	RemoveSecret(id string) error
-	GetSecret(id string) (types.Secret, error)
-	UpdateSecret(id string, version uint64, spec types.SecretSpec) error
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster.go b/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster.go
deleted file mode 100644
index e2d5ad19b8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package swarm
-
-import "github.com/docker/docker/api/server/router"
-
-// swarmRouter is a router to talk with the build controller
-type swarmRouter struct {
-	backend Backend
-	routes  []router.Route
-}
-
-// NewRouter initializes a new build router
-func NewRouter(b Backend) router.Router {
-	r := &swarmRouter{
-		backend: b,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routers to the swarm controller
-func (sr *swarmRouter) Routes() []router.Route {
-	return sr.routes
-}
-
-func (sr *swarmRouter) initRoutes() {
-	sr.routes = []router.Route{
-		router.NewPostRoute("/swarm/init", sr.initCluster),
-		router.NewPostRoute("/swarm/join", sr.joinCluster),
-		router.NewPostRoute("/swarm/leave", sr.leaveCluster),
-		router.NewGetRoute("/swarm", sr.inspectCluster),
-		router.NewGetRoute("/swarm/unlockkey", sr.getUnlockKey),
-		router.NewPostRoute("/swarm/update", sr.updateCluster),
-		router.NewPostRoute("/swarm/unlock", sr.unlockCluster),
-		router.NewGetRoute("/services", sr.getServices),
-		router.NewGetRoute("/services/{id}", sr.getService),
-		router.NewPostRoute("/services/create", sr.createService),
-		router.NewPostRoute("/services/{id}/update", sr.updateService),
-		router.NewDeleteRoute("/services/{id}", sr.removeService),
-		router.Experimental(router.Cancellable(router.NewGetRoute("/services/{id}/logs", sr.getServiceLogs))),
-		router.NewGetRoute("/nodes", sr.getNodes),
-		router.NewGetRoute("/nodes/{id}", sr.getNode),
-		router.NewDeleteRoute("/nodes/{id}", sr.removeNode),
-		router.NewPostRoute("/nodes/{id}/update", sr.updateNode),
-		router.NewGetRoute("/tasks", sr.getTasks),
-		router.NewGetRoute("/tasks/{id}", sr.getTask),
-		router.NewGetRoute("/secrets", sr.getSecrets),
-		router.NewPostRoute("/secrets/create", sr.createSecret),
-		router.NewDeleteRoute("/secrets/{id}", sr.removeSecret),
-		router.NewGetRoute("/secrets/{id}", sr.getSecret),
-		router.NewPostRoute("/secrets/{id}/update", sr.updateSecret),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster_routes.go
deleted file mode 100644
index fe976434bc..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/swarm/cluster_routes.go
+++ /dev/null
@@ -1,418 +0,0 @@
-package swarm
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/server/httputils"
-	basictypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/filters"
-	types "github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func (sr *swarmRouter) initCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var req types.InitRequest
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return err
-	}
-	nodeID, err := sr.backend.Init(req)
-	if err != nil {
-		logrus.Errorf("Error initializing swarm: %v", err)
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, nodeID)
-}
-
-func (sr *swarmRouter) joinCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var req types.JoinRequest
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return err
-	}
-	return sr.backend.Join(req)
-}
-
-func (sr *swarmRouter) leaveCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	force := httputils.BoolValue(r, "force")
-	return sr.backend.Leave(force)
-}
-
-func (sr *swarmRouter) inspectCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	swarm, err := sr.backend.Inspect()
-	if err != nil {
-		logrus.Errorf("Error getting swarm: %v", err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, swarm)
-}
-
-func (sr *swarmRouter) updateCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var swarm types.Spec
-	if err := json.NewDecoder(r.Body).Decode(&swarm); err != nil {
-		return err
-	}
-
-	rawVersion := r.URL.Query().Get("version")
-	version, err := strconv.ParseUint(rawVersion, 10, 64)
-	if err != nil {
-		return fmt.Errorf("Invalid swarm version '%s': %s", rawVersion, err.Error())
-	}
-
-	var flags types.UpdateFlags
-
-	if value := r.URL.Query().Get("rotateWorkerToken"); value != "" {
-		rot, err := strconv.ParseBool(value)
-		if err != nil {
-			return fmt.Errorf("invalid value for rotateWorkerToken: %s", value)
-		}
-
-		flags.RotateWorkerToken = rot
-	}
-
-	if value := r.URL.Query().Get("rotateManagerToken"); value != "" {
-		rot, err := strconv.ParseBool(value)
-		if err != nil {
-			return fmt.Errorf("invalid value for rotateManagerToken: %s", value)
-		}
-
-		flags.RotateManagerToken = rot
-	}
-
-	if value := r.URL.Query().Get("rotateManagerUnlockKey"); value != "" {
-		rot, err := strconv.ParseBool(value)
-		if err != nil {
-			return fmt.Errorf("invalid value for rotateManagerUnlockKey: %s", value)
-		}
-
-		flags.RotateManagerUnlockKey = rot
-	}
-
-	if err := sr.backend.Update(version, swarm, flags); err != nil {
-		logrus.Errorf("Error configuring swarm: %v", err)
-		return err
-	}
-	return nil
-}
-
-func (sr *swarmRouter) unlockCluster(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var req types.UnlockRequest
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return err
-	}
-
-	if err := sr.backend.UnlockSwarm(req); err != nil {
-		logrus.Errorf("Error unlocking swarm: %v", err)
-		return err
-	}
-	return nil
-}
-
-func (sr *swarmRouter) getUnlockKey(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	unlockKey, err := sr.backend.GetUnlockKey()
-	if err != nil {
-		logrus.WithError(err).Errorf("Error retrieving swarm unlock key")
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, &basictypes.SwarmUnlockKeyResponse{
-		UnlockKey: unlockKey,
-	})
-}
-
-func (sr *swarmRouter) getServices(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	services, err := sr.backend.GetServices(basictypes.ServiceListOptions{Filters: filter})
-	if err != nil {
-		logrus.Errorf("Error getting services: %v", err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, services)
-}
-
-func (sr *swarmRouter) getService(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	service, err := sr.backend.GetService(vars["id"])
-	if err != nil {
-		logrus.Errorf("Error getting service %s: %v", vars["id"], err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, service)
-}
-
-func (sr *swarmRouter) createService(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var service types.ServiceSpec
-	if err := json.NewDecoder(r.Body).Decode(&service); err != nil {
-		return err
-	}
-
-	// Get returns "" if the header does not exist
-	encodedAuth := r.Header.Get("X-Registry-Auth")
-
-	resp, err := sr.backend.CreateService(service, encodedAuth)
-	if err != nil {
-		logrus.Errorf("Error creating service %s: %v", service.Name, err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, resp)
-}
-
-func (sr *swarmRouter) updateService(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var service types.ServiceSpec
-	if err := json.NewDecoder(r.Body).Decode(&service); err != nil {
-		return err
-	}
-
-	rawVersion := r.URL.Query().Get("version")
-	version, err := strconv.ParseUint(rawVersion, 10, 64)
-	if err != nil {
-		return fmt.Errorf("Invalid service version '%s': %s", rawVersion, err.Error())
-	}
-
-	// Get returns "" if the header does not exist
-	encodedAuth := r.Header.Get("X-Registry-Auth")
-
-	registryAuthFrom := r.URL.Query().Get("registryAuthFrom")
-
-	resp, err := sr.backend.UpdateService(vars["id"], version, service, encodedAuth, registryAuthFrom)
-	if err != nil {
-		logrus.Errorf("Error updating service %s: %v", vars["id"], err)
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, resp)
-}
-
-func (sr *swarmRouter) removeService(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := sr.backend.RemoveService(vars["id"]); err != nil {
-		logrus.Errorf("Error removing service %s: %v", vars["id"], err)
-		return err
-	}
-	return nil
-}
-
-func (sr *swarmRouter) getServiceLogs(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	// Args are validated before the stream starts because when it starts we're
-	// sending HTTP 200 by writing an empty chunk of data to tell the client that
-	// daemon is going to stream. By sending this initial HTTP 200 we can't report
-	// any error after the stream starts (i.e. container not found, wrong parameters)
-	// with the appropriate status code.
-	stdout, stderr := httputils.BoolValue(r, "stdout"), httputils.BoolValue(r, "stderr")
-	if !(stdout || stderr) {
-		return fmt.Errorf("Bad parameters: you must choose at least one stream")
-	}
-
-	serviceName := vars["id"]
-	logsConfig := &backend.ContainerLogsConfig{
-		ContainerLogsOptions: basictypes.ContainerLogsOptions{
-			Follow:     httputils.BoolValue(r, "follow"),
-			Timestamps: httputils.BoolValue(r, "timestamps"),
-			Since:      r.Form.Get("since"),
-			Tail:       r.Form.Get("tail"),
-			ShowStdout: stdout,
-			ShowStderr: stderr,
-			Details:    httputils.BoolValue(r, "details"),
-		},
-		OutStream: w,
-	}
-
-	if logsConfig.Details {
-		return fmt.Errorf("Bad parameters: details is not currently supported")
-	}
-
-	chStarted := make(chan struct{})
-	if err := sr.backend.ServiceLogs(ctx, serviceName, logsConfig, chStarted); err != nil {
-		select {
-		case <-chStarted:
-			// The client may be expecting all of the data we're sending to
-			// be multiplexed, so send it through OutStream, which will
-			// have been set up to handle that if needed.
-			fmt.Fprintf(logsConfig.OutStream, "Error grabbing service logs: %v\n", err)
-		default:
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (sr *swarmRouter) getNodes(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	nodes, err := sr.backend.GetNodes(basictypes.NodeListOptions{Filters: filter})
-	if err != nil {
-		logrus.Errorf("Error getting nodes: %v", err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, nodes)
-}
-
-func (sr *swarmRouter) getNode(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	node, err := sr.backend.GetNode(vars["id"])
-	if err != nil {
-		logrus.Errorf("Error getting node %s: %v", vars["id"], err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, node)
-}
-
-func (sr *swarmRouter) updateNode(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var node types.NodeSpec
-	if err := json.NewDecoder(r.Body).Decode(&node); err != nil {
-		return err
-	}
-
-	rawVersion := r.URL.Query().Get("version")
-	version, err := strconv.ParseUint(rawVersion, 10, 64)
-	if err != nil {
-		return fmt.Errorf("Invalid node version '%s': %s", rawVersion, err.Error())
-	}
-
-	if err := sr.backend.UpdateNode(vars["id"], version, node); err != nil {
-		logrus.Errorf("Error updating node %s: %v", vars["id"], err)
-		return err
-	}
-	return nil
-}
-
-func (sr *swarmRouter) removeNode(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	force := httputils.BoolValue(r, "force")
-
-	if err := sr.backend.RemoveNode(vars["id"], force); err != nil {
-		logrus.Errorf("Error removing node %s: %v", vars["id"], err)
-		return err
-	}
-	return nil
-}
-
-func (sr *swarmRouter) getTasks(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	filter, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	tasks, err := sr.backend.GetTasks(basictypes.TaskListOptions{Filters: filter})
-	if err != nil {
-		logrus.Errorf("Error getting tasks: %v", err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, tasks)
-}
-
-func (sr *swarmRouter) getTask(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	task, err := sr.backend.GetTask(vars["id"])
-	if err != nil {
-		logrus.Errorf("Error getting task %s: %v", vars["id"], err)
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, task)
-}
-
-func (sr *swarmRouter) getSecrets(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	filters, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	secrets, err := sr.backend.GetSecrets(basictypes.SecretListOptions{Filters: filters})
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, secrets)
-}
-
-func (sr *swarmRouter) createSecret(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var secret types.SecretSpec
-	if err := json.NewDecoder(r.Body).Decode(&secret); err != nil {
-		return err
-	}
-
-	id, err := sr.backend.CreateSecret(secret)
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusCreated, &basictypes.SecretCreateResponse{
-		ID: id,
-	})
-}
-
-func (sr *swarmRouter) removeSecret(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := sr.backend.RemoveSecret(vars["id"]); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-
-	return nil
-}
-
-func (sr *swarmRouter) getSecret(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	secret, err := sr.backend.GetSecret(vars["id"])
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, secret)
-}
-
-func (sr *swarmRouter) updateSecret(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var secret types.SecretSpec
-	if err := json.NewDecoder(r.Body).Decode(&secret); err != nil {
-		return errors.NewBadRequestError(err)
-	}
-
-	rawVersion := r.URL.Query().Get("version")
-	version, err := strconv.ParseUint(rawVersion, 10, 64)
-	if err != nil {
-		return errors.NewBadRequestError(fmt.Errorf("invalid secret version"))
-	}
-
-	id := vars["id"]
-	if err := sr.backend.UpdateSecret(id, version, secret); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/system/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/system/backend.go
deleted file mode 100644
index 6946c4e2d1..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/system/backend.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package system
-
-import (
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// Backend is the methods that need to be implemented to provide
-// system specific functionality.
-type Backend interface {
-	SystemInfo() (*types.Info, error)
-	SystemVersion() types.Version
-	SystemDiskUsage() (*types.DiskUsage, error)
-	SubscribeToEvents(since, until time.Time, ef filters.Args) ([]events.Message, chan interface{})
-	UnsubscribeFromEvents(chan interface{})
-	AuthenticateToRegistry(ctx context.Context, authConfig *types.AuthConfig) (string, string, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/system/system.go b/installer/vendor/github.com/docker/docker/api/server/router/system/system.go
deleted file mode 100644
index ed23d3bdee..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/system/system.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package system
-
-import (
-	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/daemon/cluster"
-)
-
-// systemRouter provides information about the Docker system overall.
-// It gathers information about host, daemon and container events.
-type systemRouter struct {
-	backend         Backend
-	clusterProvider *cluster.Cluster
-	routes          []router.Route
-}
-
-// NewRouter initializes a new system router
-func NewRouter(b Backend, c *cluster.Cluster) router.Router {
-	r := &systemRouter{
-		backend:         b,
-		clusterProvider: c,
-	}
-
-	r.routes = []router.Route{
-		router.NewOptionsRoute("/{anyroute:.*}", optionsHandler),
-		router.NewGetRoute("/_ping", pingHandler),
-		router.Cancellable(router.NewGetRoute("/events", r.getEvents)),
-		router.NewGetRoute("/info", r.getInfo),
-		router.NewGetRoute("/version", r.getVersion),
-		router.NewGetRoute("/system/df", r.getDiskUsage),
-		router.NewPostRoute("/auth", r.postAuth),
-	}
-
-	return r
-}
-
-// Routes returns all the API routes dedicated to the docker system
-func (s *systemRouter) Routes() []router.Route {
-	return s.routes
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/system/system_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/system/system_routes.go
deleted file mode 100644
index 0d851b684a..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/system/system_routes.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package system
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-	timetypes "github.com/docker/docker/api/types/time"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/ioutils"
-	"golang.org/x/net/context"
-)
-
-func optionsHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	w.WriteHeader(http.StatusOK)
-	return nil
-}
-
-func pingHandler(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	_, err := w.Write([]byte{'O', 'K'})
-	return err
-}
-
-func (s *systemRouter) getInfo(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	info, err := s.backend.SystemInfo()
-	if err != nil {
-		return err
-	}
-	if s.clusterProvider != nil {
-		info.Swarm = s.clusterProvider.Info()
-	}
-
-	if versions.LessThan(httputils.VersionFromContext(ctx), "1.25") {
-		// TODO: handle this conversion in engine-api
-		type oldInfo struct {
-			*types.Info
-			ExecutionDriver string
-		}
-		old := &oldInfo{
-			Info:            info,
-			ExecutionDriver: "<not supported>",
-		}
-		nameOnlySecurityOptions := []string{}
-		kvSecOpts, err := types.DecodeSecurityOptions(old.SecurityOptions)
-		if err != nil {
-			return err
-		}
-		for _, s := range kvSecOpts {
-			nameOnlySecurityOptions = append(nameOnlySecurityOptions, s.Name)
-		}
-		old.SecurityOptions = nameOnlySecurityOptions
-		return httputils.WriteJSON(w, http.StatusOK, old)
-	}
-	return httputils.WriteJSON(w, http.StatusOK, info)
-}
-
-func (s *systemRouter) getVersion(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	info := s.backend.SystemVersion()
-	info.APIVersion = api.DefaultVersion
-
-	return httputils.WriteJSON(w, http.StatusOK, info)
-}
-
-func (s *systemRouter) getDiskUsage(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	du, err := s.backend.SystemDiskUsage()
-	if err != nil {
-		return err
-	}
-
-	return httputils.WriteJSON(w, http.StatusOK, du)
-}
-
-func (s *systemRouter) getEvents(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	since, err := eventTime(r.Form.Get("since"))
-	if err != nil {
-		return err
-	}
-	until, err := eventTime(r.Form.Get("until"))
-	if err != nil {
-		return err
-	}
-
-	var (
-		timeout        <-chan time.Time
-		onlyPastEvents bool
-	)
-	if !until.IsZero() {
-		if until.Before(since) {
-			return errors.NewBadRequestError(fmt.Errorf("`since` time (%s) cannot be after `until` time (%s)", r.Form.Get("since"), r.Form.Get("until")))
-		}
-
-		now := time.Now()
-
-		onlyPastEvents = until.Before(now)
-
-		if !onlyPastEvents {
-			dur := until.Sub(now)
-			timeout = time.NewTimer(dur).C
-		}
-	}
-
-	ef, err := filters.FromParam(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-
-	w.Header().Set("Content-Type", "application/json")
-	output := ioutils.NewWriteFlusher(w)
-	defer output.Close()
-	output.Flush()
-
-	enc := json.NewEncoder(output)
-
-	buffered, l := s.backend.SubscribeToEvents(since, until, ef)
-	defer s.backend.UnsubscribeFromEvents(l)
-
-	for _, ev := range buffered {
-		if err := enc.Encode(ev); err != nil {
-			return err
-		}
-	}
-
-	if onlyPastEvents {
-		return nil
-	}
-
-	for {
-		select {
-		case ev := <-l:
-			jev, ok := ev.(events.Message)
-			if !ok {
-				logrus.Warnf("unexpected event message: %q", ev)
-				continue
-			}
-			if err := enc.Encode(jev); err != nil {
-				return err
-			}
-		case <-timeout:
-			return nil
-		case <-ctx.Done():
-			logrus.Debug("Client context cancelled, stop sending events")
-			return nil
-		}
-	}
-}
-
-func (s *systemRouter) postAuth(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	var config *types.AuthConfig
-	err := json.NewDecoder(r.Body).Decode(&config)
-	r.Body.Close()
-	if err != nil {
-		return err
-	}
-	status, token, err := s.backend.AuthenticateToRegistry(ctx, config)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, &registry.AuthenticateOKBody{
-		Status:        status,
-		IdentityToken: token,
-	})
-}
-
-func eventTime(formTime string) (time.Time, error) {
-	t, tNano, err := timetypes.ParseTimestamps(formTime, -1)
-	if err != nil {
-		return time.Time{}, err
-	}
-	if t == -1 {
-		return time.Time{}, nil
-	}
-	return time.Unix(t, tNano), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/volume/backend.go b/installer/vendor/github.com/docker/docker/api/server/router/volume/backend.go
deleted file mode 100644
index 180c06e5d3..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/volume/backend.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package volume
-
-import (
-	// TODO return types need to be refactored into pkg
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-)
-
-// Backend is the methods that need to be implemented to provide
-// volume specific functionality
-type Backend interface {
-	Volumes(filter string) ([]*types.Volume, []string, error)
-	VolumeInspect(name string) (*types.Volume, error)
-	VolumeCreate(name, driverName string, opts, labels map[string]string) (*types.Volume, error)
-	VolumeRm(name string, force bool) error
-	VolumesPrune(pruneFilters filters.Args) (*types.VolumesPruneReport, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/volume/volume.go b/installer/vendor/github.com/docker/docker/api/server/router/volume/volume.go
deleted file mode 100644
index 4e9f972a69..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/volume/volume.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package volume
-
-import "github.com/docker/docker/api/server/router"
-
-// volumeRouter is a router to talk with the volumes controller
-type volumeRouter struct {
-	backend Backend
-	routes  []router.Route
-}
-
-// NewRouter initializes a new volume router
-func NewRouter(b Backend) router.Router {
-	r := &volumeRouter{
-		backend: b,
-	}
-	r.initRoutes()
-	return r
-}
-
-// Routes returns the available routes to the volumes controller
-func (r *volumeRouter) Routes() []router.Route {
-	return r.routes
-}
-
-func (r *volumeRouter) initRoutes() {
-	r.routes = []router.Route{
-		// GET
-		router.NewGetRoute("/volumes", r.getVolumesList),
-		router.NewGetRoute("/volumes/{name:.*}", r.getVolumeByName),
-		// POST
-		router.NewPostRoute("/volumes/create", r.postVolumesCreate),
-		router.NewPostRoute("/volumes/prune", r.postVolumesPrune),
-		// DELETE
-		router.NewDeleteRoute("/volumes/{name:.*}", r.deleteVolumes),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router/volume/volume_routes.go b/installer/vendor/github.com/docker/docker/api/server/router/volume/volume_routes.go
deleted file mode 100644
index cfd4618a4d..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router/volume/volume_routes.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package volume
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/types/filters"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-func (v *volumeRouter) getVolumesList(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	volumes, warnings, err := v.backend.Volumes(r.Form.Get("filters"))
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, &volumetypes.VolumesListOKBody{Volumes: volumes, Warnings: warnings})
-}
-
-func (v *volumeRouter) getVolumeByName(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	volume, err := v.backend.VolumeInspect(vars["name"])
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, volume)
-}
-
-func (v *volumeRouter) postVolumesCreate(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	if err := httputils.CheckForJSON(r); err != nil {
-		return err
-	}
-
-	var req volumetypes.VolumesCreateBody
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return err
-	}
-
-	volume, err := v.backend.VolumeCreate(req.Name, req.Driver, req.DriverOpts, req.Labels)
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusCreated, volume)
-}
-
-func (v *volumeRouter) deleteVolumes(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-	force := httputils.BoolValue(r, "force")
-	if err := v.backend.VolumeRm(vars["name"], force); err != nil {
-		return err
-	}
-	w.WriteHeader(http.StatusNoContent)
-	return nil
-}
-
-func (v *volumeRouter) postVolumesPrune(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	if err := httputils.ParseForm(r); err != nil {
-		return err
-	}
-
-	pruneReport, err := v.backend.VolumesPrune(filters.Args{})
-	if err != nil {
-		return err
-	}
-	return httputils.WriteJSON(w, http.StatusOK, pruneReport)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/router_swapper.go b/installer/vendor/github.com/docker/docker/api/server/router_swapper.go
deleted file mode 100644
index 1ecc7a7f39..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/router_swapper.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package server
-
-import (
-	"net/http"
-	"sync"
-
-	"github.com/gorilla/mux"
-)
-
-// routerSwapper is an http.Handler that allows you to swap
-// mux routers.
-type routerSwapper struct {
-	mu     sync.Mutex
-	router *mux.Router
-}
-
-// Swap changes the old router with the new one.
-func (rs *routerSwapper) Swap(newRouter *mux.Router) {
-	rs.mu.Lock()
-	rs.router = newRouter
-	rs.mu.Unlock()
-}
-
-// ServeHTTP makes the routerSwapper to implement the http.Handler interface.
-func (rs *routerSwapper) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	rs.mu.Lock()
-	router := rs.router
-	rs.mu.Unlock()
-	router.ServeHTTP(w, r)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/server.go b/installer/vendor/github.com/docker/docker/api/server/server.go
deleted file mode 100644
index 60ee075c79..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/server.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package server
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-	"net/http"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
-	"github.com/docker/docker/api/server/router"
-	"github.com/gorilla/mux"
-	"golang.org/x/net/context"
-)
-
-// versionMatcher defines a variable matcher to be parsed by the router
-// when a request is about to be served.
-const versionMatcher = "/v{version:[0-9.]+}"
-
-// Config provides the configuration for the API server
-type Config struct {
-	Logging     bool
-	EnableCors  bool
-	CorsHeaders string
-	Version     string
-	SocketGroup string
-	TLSConfig   *tls.Config
-}
-
-// Server contains instance details for the server
-type Server struct {
-	cfg           *Config
-	servers       []*HTTPServer
-	routers       []router.Router
-	routerSwapper *routerSwapper
-	middlewares   []middleware.Middleware
-}
-
-// New returns a new instance of the server based on the specified configuration.
-// It allocates resources which will be needed for ServeAPI(ports, unix-sockets).
-func New(cfg *Config) *Server {
-	return &Server{
-		cfg: cfg,
-	}
-}
-
-// UseMiddleware appends a new middleware to the request chain.
-// This needs to be called before the API routes are configured.
-func (s *Server) UseMiddleware(m middleware.Middleware) {
-	s.middlewares = append(s.middlewares, m)
-}
-
-// Accept sets a listener the server accepts connections into.
-func (s *Server) Accept(addr string, listeners ...net.Listener) {
-	for _, listener := range listeners {
-		httpServer := &HTTPServer{
-			srv: &http.Server{
-				Addr: addr,
-			},
-			l: listener,
-		}
-		s.servers = append(s.servers, httpServer)
-	}
-}
-
-// Close closes servers and thus stop receiving requests
-func (s *Server) Close() {
-	for _, srv := range s.servers {
-		if err := srv.Close(); err != nil {
-			logrus.Error(err)
-		}
-	}
-}
-
-// serveAPI loops through all initialized servers and spawns goroutine
-// with Serve method for each. It sets createMux() as Handler also.
-func (s *Server) serveAPI() error {
-	var chErrors = make(chan error, len(s.servers))
-	for _, srv := range s.servers {
-		srv.srv.Handler = s.routerSwapper
-		go func(srv *HTTPServer) {
-			var err error
-			logrus.Infof("API listen on %s", srv.l.Addr())
-			if err = srv.Serve(); err != nil && strings.Contains(err.Error(), "use of closed network connection") {
-				err = nil
-			}
-			chErrors <- err
-		}(srv)
-	}
-
-	for i := 0; i < len(s.servers); i++ {
-		err := <-chErrors
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// HTTPServer contains an instance of http server and the listener.
-// srv *http.Server, contains configuration to create an http server and a mux router with all api end points.
-// l   net.Listener, is a TCP or Socket listener that dispatches incoming request to the router.
-type HTTPServer struct {
-	srv *http.Server
-	l   net.Listener
-}
-
-// Serve starts listening for inbound requests.
-func (s *HTTPServer) Serve() error {
-	return s.srv.Serve(s.l)
-}
-
-// Close closes the HTTPServer from listening for the inbound requests.
-func (s *HTTPServer) Close() error {
-	return s.l.Close()
-}
-
-func (s *Server) makeHTTPHandler(handler httputils.APIFunc) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		// Define the context that we'll pass around to share info
-		// like the docker-request-id.
-		//
-		// The 'context' will be used for global data that should
-		// apply to all requests. Data that is specific to the
-		// immediate function being called should still be passed
-		// as 'args' on the function call.
-		ctx := context.WithValue(context.Background(), httputils.UAStringKey, r.Header.Get("User-Agent"))
-		handlerFunc := s.handlerWithGlobalMiddlewares(handler)
-
-		vars := mux.Vars(r)
-		if vars == nil {
-			vars = make(map[string]string)
-		}
-
-		if err := handlerFunc(ctx, w, r, vars); err != nil {
-			statusCode := httputils.GetHTTPErrorStatusCode(err)
-			errFormat := "%v"
-			if statusCode == http.StatusInternalServerError {
-				errFormat = "%+v"
-			}
-			logrus.Errorf("Handler for %s %s returned error: "+errFormat, r.Method, r.URL.Path, err)
-			httputils.MakeErrorHandler(err)(w, r)
-		}
-	}
-}
-
-// InitRouter initializes the list of routers for the server.
-// This method also enables the Go profiler if enableProfiler is true.
-func (s *Server) InitRouter(enableProfiler bool, routers ...router.Router) {
-	s.routers = append(s.routers, routers...)
-
-	m := s.createMux()
-	if enableProfiler {
-		profilerSetup(m)
-	}
-	s.routerSwapper = &routerSwapper{
-		router: m,
-	}
-}
-
-// createMux initializes the main router the server uses.
-func (s *Server) createMux() *mux.Router {
-	m := mux.NewRouter()
-
-	logrus.Debug("Registering routers")
-	for _, apiRouter := range s.routers {
-		for _, r := range apiRouter.Routes() {
-			f := s.makeHTTPHandler(r.Handler())
-
-			logrus.Debugf("Registering %s, %s", r.Method(), r.Path())
-			m.Path(versionMatcher + r.Path()).Methods(r.Method()).Handler(f)
-			m.Path(r.Path()).Methods(r.Method()).Handler(f)
-		}
-	}
-
-	err := errors.NewRequestNotFoundError(fmt.Errorf("page not found"))
-	notFoundHandler := httputils.MakeErrorHandler(err)
-	m.HandleFunc(versionMatcher+"/{path:.*}", notFoundHandler)
-	m.NotFoundHandler = notFoundHandler
-
-	return m
-}
-
-// Wait blocks the server goroutine until it exits.
-// It sends an error message if there is any error during
-// the API execution.
-func (s *Server) Wait(waitChan chan error) {
-	if err := s.serveAPI(); err != nil {
-		logrus.Errorf("ServeAPI error: %v", err)
-		waitChan <- err
-		return
-	}
-	waitChan <- nil
-}
-
-// DisableProfiler reloads the server mux without adding the profiler routes.
-func (s *Server) DisableProfiler() {
-	s.routerSwapper.Swap(s.createMux())
-}
-
-// EnableProfiler reloads the server mux adding the profiler routes.
-func (s *Server) EnableProfiler() {
-	m := s.createMux()
-	profilerSetup(m)
-	s.routerSwapper.Swap(m)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/server/server_test.go b/installer/vendor/github.com/docker/docker/api/server/server_test.go
deleted file mode 100644
index 11831c148d..0000000000
--- a/installer/vendor/github.com/docker/docker/api/server/server_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package server
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/api/server/middleware"
-
-	"golang.org/x/net/context"
-)
-
-func TestMiddlewares(t *testing.T) {
-	cfg := &Config{
-		Version: "0.1omega2",
-	}
-	srv := &Server{
-		cfg: cfg,
-	}
-
-	srv.UseMiddleware(middleware.NewVersionMiddleware("0.1omega2", api.DefaultVersion, api.MinVersion))
-
-	req, _ := http.NewRequest("GET", "/containers/json", nil)
-	resp := httptest.NewRecorder()
-	ctx := context.Background()
-
-	localHandler := func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-		if httputils.VersionFromContext(ctx) == "" {
-			t.Fatalf("Expected version, got empty string")
-		}
-
-		if sv := w.Header().Get("Server"); !strings.Contains(sv, "Docker/0.1omega2") {
-			t.Fatalf("Expected server version in the header `Docker/0.1omega2`, got %s", sv)
-		}
-
-		return nil
-	}
-
-	handlerFunc := srv.handlerWithGlobalMiddlewares(localHandler)
-	if err := handlerFunc(ctx, resp, req, map[string]string{}); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/swagger-gen.yaml b/installer/vendor/github.com/docker/docker/api/swagger-gen.yaml
deleted file mode 100644
index f07a02737f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/swagger-gen.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-
-layout:
-  models:
-    - name: definition
-      source: asset:model
-      target: "{{ joinFilePath .Target .ModelPackage }}"
-      file_name: "{{ (snakize (pascalize .Name)) }}.go"
-  operations:
-    - name: handler
-      source: asset:serverOperation
-      target: "{{ joinFilePath .Target .APIPackage .Package }}"
-      file_name: "{{ (snakize (pascalize .Name)) }}.go"
diff --git a/installer/vendor/github.com/docker/docker/api/swagger.yaml b/installer/vendor/github.com/docker/docker/api/swagger.yaml
deleted file mode 100644
index d19e8c9ca8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/swagger.yaml
+++ /dev/null
@@ -1,7785 +0,0 @@
-# A Swagger 2.0 (a.k.a. OpenAPI) definition of the Engine API.
-#
-# This is used for generating API documentation and the types used by the
-# client/server. See api/README.md for more information.
-#
-# Some style notes:
-# - This file is used by ReDoc, which allows GitHub Flavored Markdown in
-#   descriptions.
-# - There is no maximum line length, for ease of editing and pretty diffs.
-# - operationIds are in the format "NounVerb", with a singular noun.
-
-swagger: "2.0"
-schemes:
-  - "http"
-  - "https"
-produces:
-  - "application/json"
-  - "text/plain"
-consumes:
-  - "application/json"
-  - "text/plain"
-basePath: "/v1.26"
-info:
-  title: "Docker Engine API"
-  version: "1.26"
-  x-logo:
-    url: "https://docs.docker.com/images/logo-docker-main.png"
-  description: |
-    The Engine API is an HTTP API served by Docker Engine. It is the API the Docker client uses to communicate with the Engine, so everything the Docker client can do can be done with the API.
-
-    Most of the client's commands map directly to API endpoints (e.g. `docker ps` is `GET /containers/json`). The notable exception is running containers, which consists of several API calls.
-
-    # Errors
-
-    The API uses standard HTTP status codes to indicate the success or failure of the API call. The body of the response will be JSON in the following format:
-
-    ```
-    {
-      "message": "page not found"
-    }
-    ```
-
-    # Versioning
-
-    The API is usually changed in each release of Docker, so API calls are versioned to ensure that clients don't break.
-
-    For Docker Engine >= 1.13.1, the API version is 1.26. To lock to this version, you prefix the URL with `/v1.26`. For example, calling `/info` is the same as calling `/v1.26/info`.
-
-    Engine releases in the near future should support this version of the API, so your client will continue to work even if it is talking to a newer Engine.
-
-    In previous versions of Docker, it was possible to access the API without providing a version. This behaviour is now deprecated will be removed in a future version of Docker.
-
-    The API uses an open schema model, which means server may add extra properties to responses. Likewise, the server will ignore any extra query parameters and request body properties. When you write clients, you need to ignore additional properties in responses to ensure they do not break when talking to newer Docker daemons.
-
-    This documentation is for version 1.26 of the API, which was introduced with Docker 1.13.1. Use this table to find documentation for previous versions of the API:
-
-    Docker version  | API version | Changes
-    ----------------|-------------|---------
-    1.13.0 | [1.25](https://docs.docker.com/engine/api/v1.25/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-25-api-changes)
-    1.12.x | [1.24](https://docs.docker.com/engine/api/v1.24/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-24-api-changes)
-    1.11.x | [1.23](https://docs.docker.com/engine/api/v1.23/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-23-api-changes)
-    1.10.x | [1.22](https://docs.docker.com/engine/api/v1.22/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-22-api-changes)
-    1.9.x | [1.21](https://docs.docker.com/engine/api/v1.21/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-21-api-changes)
-    1.8.x | [1.20](https://docs.docker.com/engine/api/v1.20/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-20-api-changes)
-    1.7.x | [1.19](https://docs.docker.com/engine/api/v1.19/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-19-api-changes)
-    1.6.x | [1.18](https://docs.docker.com/engine/api/v1.18/) | [API changes](https://docs.docker.com/engine/api/version-history/#v1-18-api-changes)
-
-    # Authentication
-
-    Authentication for registries is handled client side. The client has to send authentication details to various endpoints that need to communicate with registries, such as `POST /images/(name)/push`. These are sent as `X-Registry-Auth` header as a Base64 encoded (JSON) string with the following structure:
-
-    ```
-    {
-      "username": "string",
-      "password": "string",
-      "email": "string",
-      "serveraddress": "string"
-    }
-    ```
-
-    The `serveraddress` is a domain/IP without a protocol. Throughout this structure, double quotes are required.
-
-    If you have already got an identity token from the [`/auth` endpoint](#operation/SystemAuth), you can just pass this instead of credentials:
-
-    ```
-    {
-      "identitytoken": "9cbaf023786cd7..."
-    }
-    ```
-
-# The tags on paths define the menu sections in the ReDoc documentation, so
-# the usage of tags must make sense for that:
-# - They should be singular, not plural.
-# - There should not be too many tags, or the menu becomes unwieldly. For
-#   example, it is preferable to add a path to the "System" tag instead of
-#   creating a tag with a single path in it.
-# - The order of tags in this list defines the order in the menu.
-tags:
-  # Primary objects
-  - name: "Container"
-    x-displayName: "Containers"
-    description: |
-      Create and manage containers.
-  - name: "Image"
-    x-displayName: "Images"
-  - name: "Network"
-    x-displayName: "Networks"
-    description: |
-      Networks are user-defined networks that containers can be attached to. See the [networking documentation](https://docs.docker.com/engine/userguide/networking/) for more information.
-  - name: "Volume"
-    x-displayName: "Volumes"
-    description: |
-      Create and manage persistent storage that can be attached to containers.
-  - name: "Exec"
-    x-displayName: "Exec"
-    description: |
-      Run new commands inside running containers. See the [command-line reference](https://docs.docker.com/engine/reference/commandline/exec/) for more information.
-
-      To exec a command in a container, you first need to create an exec instance, then start it. These two API endpoints are wrapped up in a single command-line command, `docker exec`.
-  - name: "Secret"
-    x-displayName: "Secrets"
-  # Swarm things
-  - name: "Swarm"
-    x-displayName: "Swarm"
-    description: |
-      Engines can be clustered together in a swarm. See [the swarm mode documentation](https://docs.docker.com/engine/swarm/) for more information.
-  - name: "Node"
-    x-displayName: "Nodes"
-    description: |
-      Nodes are instances of the Engine participating in a swarm. Swarm mode must be enabled for these endpoints to work.
-  - name: "Service"
-    x-displayName: "Services"
-    description: |
-      Services are the definitions of tasks to run on a swarm. Swarm mode must be enabled for these endpoints to work.
-  - name: "Task"
-    x-displayName: "Tasks"
-    description: |
-      A task is a container running on a swarm. It is the atomic scheduling unit of swarm. Swarm mode must be enabled for these endpoints to work.
-  # System things
-  - name: "Plugin"
-    x-displayName: "Plugins"
-  - name: "System"
-    x-displayName: "System"
-
-definitions:
-  Port:
-    type: "object"
-    description: "An open port on a container"
-    required: [PrivatePort, Type]
-    properties:
-      IP:
-        type: "string"
-        format: "ip-address"
-      PrivatePort:
-        type: "integer"
-        format: "uint16"
-        x-nullable: false
-        description: "Port on the container"
-      PublicPort:
-        type: "integer"
-        format: "uint16"
-        description: "Port exposed on the host"
-      Type:
-        type: "string"
-        x-nullable: false
-        enum: ["tcp", "udp"]
-    example:
-      PrivatePort: 8080
-      PublicPort: 80
-      Type: "tcp"
-
-  MountPoint:
-    type: "object"
-    description: "A mount point inside a container"
-    properties:
-      Type:
-        type: "string"
-      Name:
-        type: "string"
-      Source:
-        type: "string"
-      Destination:
-        type: "string"
-      Driver:
-        type: "string"
-      Mode:
-        type: "string"
-      RW:
-        type: "boolean"
-      Propagation:
-        type: "string"
-
-  DeviceMapping:
-    type: "object"
-    description: "A device mapping between the host and container"
-    properties:
-      PathOnHost:
-        type: "string"
-      PathInContainer:
-        type: "string"
-      CgroupPermissions:
-        type: "string"
-    example:
-      PathOnHost: "/dev/deviceName"
-      PathInContainer: "/dev/deviceName"
-      CgroupPermissions: "mrw"
-
-  ThrottleDevice:
-    type: "object"
-    properties:
-      Path:
-        description: "Device path"
-        type: "string"
-      Rate:
-        description: "Rate"
-        type: "integer"
-        format: "int64"
-        minimum: 0
-
-  Mount:
-    type: "object"
-    properties:
-      Target:
-        description: "Container path."
-        type: "string"
-      Source:
-        description: "Mount source (e.g. a volume name, a host path)."
-      Type:
-        description: |
-          The mount type. Available types:
-
-          - `bind` Mounts a file or directory from the host into the container. Must exist prior to creating the container.
-          - `volume` Creates a volume with the given name and options (or uses a pre-existing volume with the same name and options). These are **not** removed when the container is removed.
-          - `tmpfs` Create a tmpfs with the given options. The mount source cannot be specified for tmpfs.
-        type: "string"
-        enum:
-          - "bind"
-          - "volume"
-          - "tmpfs"
-      ReadOnly:
-        description: "Whether the mount should be read-only."
-        type: "boolean"
-      BindOptions:
-        description: "Optional configuration for the `bind` type."
-        type: "object"
-        properties:
-          Propagation:
-            description: "A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`."
-            enum:
-              - "private"
-              - "rprivate"
-              - "shared"
-              - "rshared"
-              - "slave"
-              - "rslave"
-      VolumeOptions:
-        description: "Optional configuration for the `volume` type."
-        type: "object"
-        properties:
-          NoCopy:
-            description: "Populate volume with data from the target."
-            type: "boolean"
-            default: false
-          Labels:
-            description: "User-defined key/value metadata."
-            type: "object"
-            additionalProperties:
-              type: "string"
-          DriverConfig:
-            description: "Map of driver specific options"
-            type: "object"
-            properties:
-              Name:
-                description: "Name of the driver to use to create the volume."
-                type: "string"
-              Options:
-                description: "key/value map of driver specific options."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-      TmpfsOptions:
-        description: "Optional configuration for the `tmpfs` type."
-        type: "object"
-        properties:
-          SizeBytes:
-            description: "The size for the tmpfs mount in bytes."
-            type: "integer"
-            format: "int64"
-          Mode:
-            description: "The permission mode for the tmpfs mount in an integer."
-            type: "integer"
-  RestartPolicy:
-    description: |
-      The behavior to apply when the container exits. The default is not to restart.
-
-      An ever increasing delay (double the previous delay, starting at 100ms) is added before each restart to prevent flooding the server.
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-        description: |
-          - `always` Always restart
-          - `unless-stopped` Restart always except when the user has manually stopped the container
-          - `on-failure` Restart only when the container exit code is non-zero
-        enum:
-          - "always"
-          - "unless-stopped"
-          - "on-failure"
-      MaximumRetryCount:
-        type: "integer"
-        description: "If `on-failure` is used, the number of times to retry before giving up"
-    default: {}
-
-  Resources:
-    description: "A container's resources (cgroups config, ulimits, etc)"
-    type: "object"
-    properties:
-      # Applicable to all platforms
-      CpuShares:
-        description: "An integer value representing this container's relative CPU weight versus other containers."
-        type: "integer"
-      Memory:
-        description: "Memory limit in bytes."
-        type: "integer"
-        default: 0
-      # Applicable to UNIX platforms
-      CgroupParent:
-        description: "Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist."
-        type: "string"
-      BlkioWeight:
-        description: "Block IO weight (relative weight)."
-        type: "integer"
-        minimum: 0
-        maximum: 1000
-      BlkioWeightDevice:
-        description: |
-          Block IO weight (relative device weight) in the form `[{"Path": "device_path", "Weight": weight}]`.
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Path:
-              type: "string"
-            Weight:
-              type: "integer"
-              minimum: 0
-      BlkioDeviceReadBps:
-        description: |
-          Limit read rate (bytes per second) from a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceWriteBps:
-        description: |
-          Limit write rate (bytes per second) to a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceReadIOps:
-        description: |
-          Limit read rate (IO per second) from a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      BlkioDeviceWriteIOps:
-        description: |
-          Limit write rate (IO per second) to a device, in the form `[{"Path": "device_path", "Rate": rate}]`.
-        type: "array"
-        items:
-          $ref: "#/definitions/ThrottleDevice"
-      CpuPeriod:
-        description: "The length of a CPU period in microseconds."
-        type: "integer"
-        format: "int64"
-      CpuQuota:
-        description: "Microseconds of CPU time that the container can get in a CPU period."
-        type: "integer"
-        format: "int64"
-      CpuRealtimePeriod:
-        description: "The length of a CPU real-time period in microseconds. Set to 0 to allocate no time allocated to real-time tasks."
-        type: "integer"
-        format: "int64"
-      CpuRealtimeRuntime:
-        description: "The length of a CPU real-time runtime in microseconds. Set to 0 to allocate no time allocated to real-time tasks."
-        type: "integer"
-        format: "int64"
-      CpusetCpus:
-        description: "CPUs in which to allow execution (e.g., `0-3`, `0,1`)"
-        type: "string"
-      CpusetMems:
-        description: "Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems."
-        type: "string"
-      Devices:
-        description: "A list of devices to add to the container."
-        type: "array"
-        items:
-          $ref: "#/definitions/DeviceMapping"
-      DiskQuota:
-        description: "Disk limit (in bytes)."
-        type: "integer"
-        format: "int64"
-      KernelMemory:
-        description: "Kernel memory limit in bytes."
-        type: "integer"
-        format: "int64"
-      MemoryReservation:
-        description: "Memory soft limit in bytes."
-        type: "integer"
-        format: "int64"
-      MemorySwap:
-        description: "Total memory limit (memory + swap). Set as `-1` to enable unlimited swap."
-        type: "integer"
-        format: "int64"
-      MemorySwappiness:
-        description: "Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100."
-        type: "integer"
-        format: "int64"
-        minimum: 0
-        maximum: 100
-      NanoCPUs:
-        description: "CPU quota in units of 10<sup>-9</sup> CPUs."
-        type: "integer"
-        format: "int64"
-      OomKillDisable:
-        description: "Disable OOM Killer for the container."
-        type: "boolean"
-      PidsLimit:
-        description: "Tune a container's pids limit. Set -1 for unlimited."
-        type: "integer"
-        format: "int64"
-      Ulimits:
-        description: |
-          A list of resource limits to set in the container. For example: `{"Name": "nofile", "Soft": 1024, "Hard": 2048}`"
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Name:
-              description: "Name of ulimit"
-              type: "string"
-            Soft:
-              description: "Soft limit"
-              type: "integer"
-            Hard:
-              description: "Hard limit"
-              type: "integer"
-      # Applicable to Windows
-      CpuCount:
-        description: |
-          The number of usable CPUs (Windows only).
-
-          On Windows Server containers, the processor resource controls are mutually exclusive. The order of precedence is `CPUCount` first, then `CPUShares`, and `CPUPercent` last.
-        type: "integer"
-        format: "int64"
-      CpuPercent:
-        description: |
-          The usable percentage of the available CPUs (Windows only).
-
-          On Windows Server containers, the processor resource controls are mutually exclusive. The order of precedence is `CPUCount` first, then `CPUShares`, and `CPUPercent` last.
-        type: "integer"
-        format: "int64"
-      IOMaximumIOps:
-        description: "Maximum IOps for the container system drive (Windows only)"
-        type: "integer"
-        format: "int64"
-      IOMaximumBandwidth:
-        description: "Maximum IO in bytes per second for the container system drive (Windows only)"
-        type: "integer"
-        format: "int64"
-
-  HostConfig:
-    description: "Container configuration that depends on the host we are running on"
-    allOf:
-      - $ref: "#/definitions/Resources"
-      - type: "object"
-        properties:
-          # Applicable to all platforms
-          Binds:
-            type: "array"
-            description: |
-              A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-
-              - `host-src:container-dest` to bind-mount a host path into the container. Both `host-src`, and `container-dest` must be an _absolute_ path.
-              - `host-src:container-dest:ro` to make the bind-mount read-only inside the container. Both `host-src`, and `container-dest` must be an _absolute_ path.
-              - `volume-name:container-dest` to bind-mount a volume managed by a volume driver into the container. `container-dest` must be an _absolute_ path.
-              - `volume-name:container-dest:ro` to mount the volume read-only inside the container.  `container-dest` must be an _absolute_ path.
-            items:
-              type: "string"
-          ContainerIDFile:
-            type: "string"
-            description: "Path to a file where the container ID is written"
-          LogConfig:
-            type: "object"
-            description: "The logging configuration for this container"
-            properties:
-              Type:
-                type: "string"
-                enum:
-                  - "json-file"
-                  - "syslog"
-                  - "journald"
-                  - "gelf"
-                  - "fluentd"
-                  - "awslogs"
-                  - "splunk"
-                  - "etwlogs"
-                  - "none"
-              Config:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-          NetworkMode:
-            type: "string"
-            description: "Network mode to use for this container. Supported standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-              as a custom network's name to which this container should connect to."
-          PortBindings:
-            type: "object"
-            description: "A map of exposed container ports and the host port they should map to."
-            additionalProperties:
-              type: "object"
-              properties:
-                HostIp:
-                  type: "string"
-                  description: "The host IP address"
-                HostPort:
-                  type: "string"
-                  description: "The host port number, as a string"
-          RestartPolicy:
-            $ref: "#/definitions/RestartPolicy"
-          AutoRemove:
-            type: "boolean"
-            description: "Automatically remove the container when the container's process exits. This has no effect if `RestartPolicy` is set."
-          VolumeDriver:
-            type: "string"
-            description: "Driver that this container uses to mount volumes."
-          VolumesFrom:
-            type: "array"
-            description: "A list of volumes to inherit from another container, specified in the form `<container name>[:<ro|rw>]`."
-            items:
-              type: "string"
-          Mounts:
-            description: "Specification for mounts to be added to the container."
-            type: "array"
-            items:
-              $ref: "#/definitions/Mount"
-
-          # Applicable to UNIX platforms
-          CapAdd:
-            type: "array"
-            description: "A list of kernel capabilities to add to the container."
-            items:
-              type: "string"
-          CapDrop:
-            type: "array"
-            description: "A list of kernel capabilities to drop from the container."
-            items:
-              type: "string"
-          Dns:
-            type: "array"
-            description: "A list of DNS servers for the container to use."
-            items:
-              type: "string"
-          DnsOptions:
-            type: "array"
-            description: "A list of DNS options."
-            items:
-              type: "string"
-          DnsSearch:
-            type: "array"
-            description: "A list of DNS search domains."
-            items:
-              type: "string"
-          ExtraHosts:
-            type: "array"
-            description: |
-              A list of hostnames/IP mappings to add to the container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-            items:
-              type: "string"
-          GroupAdd:
-            type: "array"
-            description: "A list of additional groups that the container process will run as."
-            items:
-              type: "string"
-          IpcMode:
-            type: "string"
-            description: "IPC namespace to use for the container."
-          Cgroup:
-            type: "string"
-            description: "Cgroup to use for the container."
-          Links:
-            type: "array"
-            description: "A list of links for the container in the form `container_name:alias`."
-            items:
-              type: "string"
-          OomScoreAdj:
-            type: "integer"
-            description: "An integer value containing the score given to the container in order to tune OOM killer preferences."
-          PidMode:
-            type: "string"
-            description: |
-              Set the PID (Process) Namespace mode for the container. It can be either:
-
-              - `"container:<name|id>"`: joins another container's PID namespace
-              - `"host"`: use the host's PID namespace inside the container
-          Privileged:
-            type: "boolean"
-            description: "Gives the container full access to the host."
-          PublishAllPorts:
-            type: "boolean"
-            description: "Allocates a random host port for all of a container's exposed ports."
-          ReadonlyRootfs:
-            type: "boolean"
-            description: "Mount the container's root filesystem as read only."
-          SecurityOpt:
-            type: "array"
-            description: "A list of string values to customize labels for MLS
-            systems, such as SELinux."
-            items:
-              type: "string"
-          StorageOpt:
-            type: "object"
-            description: |
-              Storage driver options for this container, in the form `{"size": "120G"}`.
-            additionalProperties:
-              type: "string"
-          Tmpfs:
-            type: "object"
-            description: |
-              A map of container directories which should be replaced by tmpfs mounts, and their corresponding mount options. For example: `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
-            additionalProperties:
-              type: "string"
-          UTSMode:
-            type: "string"
-            description: "UTS namespace to use for the container."
-          UsernsMode:
-            type: "string"
-            description: "Sets the usernamespace mode for the container when usernamespace remapping option is enabled."
-          ShmSize:
-            type: "integer"
-            description: "Size of `/dev/shm` in bytes. If omitted, the system uses 64MB."
-            minimum: 0
-          Sysctls:
-            type: "object"
-            description: |
-              A list of kernel parameters (sysctls) to set in the container. For example: `{"net.ipv4.ip_forward": "1"}`
-            additionalProperties:
-              type: "string"
-          Runtime:
-            type: "string"
-            description: "Runtime to use with this container."
-          # Applicable to Windows
-          ConsoleSize:
-            type: "array"
-            description: "Initial console size, as an `[height, width]` array. (Windows only)"
-            minItems: 2
-            maxItems: 2
-            items:
-              type: "integer"
-              minimum: 0
-          Isolation:
-            type: "string"
-            description: "Isolation technology of the container. (Windows only)"
-            enum:
-              - "default"
-              - "process"
-              - "hyperv"
-
-  Config:
-    description: "Configuration for a container that is portable between hosts"
-    type: "object"
-    properties:
-      Hostname:
-        description: "The hostname to use for the container, as a valid RFC 1123 hostname."
-        type: "string"
-      Domainname:
-        description: "The domain name to use for the container."
-        type: "string"
-      User:
-        description: "The user that commands are run as inside the container."
-        type: "string"
-      AttachStdin:
-        description: "Whether to attach to `stdin`."
-        type: "boolean"
-        default: false
-      AttachStdout:
-        description: "Whether to attach to `stdout`."
-        type: "boolean"
-        default: true
-      AttachStderr:
-        description: "Whether to attach to `stderr`."
-        type: "boolean"
-        default: true
-      ExposedPorts:
-        description: |
-          An object mapping ports to an empty object in the form:
-
-          `{"<port>/<tcp|udp>": {}}`
-        type: "object"
-        additionalProperties:
-          type: "object"
-          enum:
-            - {}
-          default: {}
-      Tty:
-        description: "Attach standard streams to a TTY, including `stdin` if it is not closed."
-        type: "boolean"
-        default: false
-      OpenStdin:
-        description: "Open `stdin`"
-        type: "boolean"
-        default: false
-      StdinOnce:
-        description: "Close `stdin` after one attached client disconnects"
-        type: "boolean"
-        default: false
-      Env:
-        description: |
-          A list of environment variables to set inside the container in the form `["VAR=value", ...]`
-        type: "array"
-        items:
-          type: "string"
-      Cmd:
-        description: "Command to run specified as a string or an array of strings."
-        type:
-          - "array"
-          - "string"
-        items:
-          type: "string"
-      Healthcheck:
-        description: "A test to perform to check that the container is healthy."
-        type: "object"
-        properties:
-          Test:
-            description: |
-              The test to perform. Possible values are:
-
-              - `{}` inherit healthcheck from image or parent image
-              - `{"NONE"}` disable healthcheck
-              - `{"CMD", args...}` exec arguments directly
-              - `{"CMD-SHELL", command}` run command with system's default shell
-            type: "array"
-            items:
-              type: "string"
-          Interval:
-            description: "The time to wait between checks in nanoseconds. 0 means inherit."
-            type: "integer"
-          Timeout:
-            description: "The time to wait before considering the check to have hung. 0 means inherit."
-            type: "integer"
-          Retries:
-            description: "The number of consecutive failures needed to consider a container as unhealthy. 0 means inherit."
-            type: "integer"
-      ArgsEscaped:
-        description: "Command is already escaped (Windows only)"
-        type: "boolean"
-      Image:
-        description: "The name of the image to use when creating the container"
-        type: "string"
-      Volumes:
-        description: "An object mapping mount point paths inside the container to empty objects."
-        type: "object"
-        properties:
-          additionalProperties:
-            type: "object"
-            enum:
-              - {}
-            default: {}
-      WorkingDir:
-        description: "The working directory for commands to run in."
-        type: "string"
-      Entrypoint:
-        description: |
-          The entry point for the container as a string or an array of strings.
-
-          If the array consists of exactly one empty string (`[""]`) then the entry point is reset to system default (i.e., the entry point used by docker when there is no `ENTRYPOINT` instruction in the `Dockerfile`).
-        type:
-          - "array"
-          - "string"
-        items:
-          type: "string"
-      NetworkDisabled:
-        description: "Disable networking for the container."
-        type: "boolean"
-      MacAddress:
-        description: "MAC address of the container."
-        type: "string"
-      OnBuild:
-        description: "`ONBUILD` metadata that were defined in the image's `Dockerfile`."
-        type: "array"
-        items:
-          type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      StopSignal:
-        description: "Signal to stop a container as a string or unsigned integer."
-        type: "string"
-        default: "SIGTERM"
-      StopTimeout:
-        description: "Timeout to stop a container in seconds."
-        type: "integer"
-        default: 10
-      Shell:
-        description: "Shell for when `RUN`, `CMD`, and `ENTRYPOINT` uses a shell."
-        type: "array"
-        items:
-          type: "string"
-
-  NetworkConfig:
-    description: "TODO: check is correct"
-    type: "object"
-    properties:
-      Bridge:
-        type: "string"
-      Gateway:
-        type: "string"
-      Address:
-        type: "string"
-      IPPrefixLen:
-        type: "integer"
-      MacAddress:
-        type: "string"
-      PortMapping:
-        type: "string"
-      Ports:
-        type: "array"
-        items:
-          $ref: "#/definitions/Port"
-
-  GraphDriver:
-    description: "Information about this container's graph driver."
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-      Data:
-        type: "object"
-        additionalProperties:
-          type: "string"
-
-  Image:
-    type: "object"
-    properties:
-      Id:
-        type: "string"
-      RepoTags:
-        type: "array"
-        items:
-          type: "string"
-      RepoDigests:
-        type: "array"
-        items:
-          type: "string"
-      Parent:
-        type: "string"
-      Comment:
-        type: "string"
-      Created:
-        type: "string"
-      Container:
-        type: "string"
-      ContainerConfig:
-        $ref: "#/definitions/Config"
-      DockerVersion:
-        type: "string"
-      Author:
-        type: "string"
-      Config:
-        $ref: "#/definitions/Config"
-      Architecture:
-        type: "string"
-      Os:
-        type: "string"
-      Size:
-        type: "integer"
-        format: "int64"
-      VirtualSize:
-        type: "integer"
-        format: "int64"
-      GraphDriver:
-        $ref: "#/definitions/GraphDriver"
-      RootFS:
-        type: "object"
-        properties:
-          Type:
-            type: "string"
-          Layers:
-            type: "array"
-            items:
-              type: "string"
-          BaseLayer:
-            type: "string"
-
-  ImageSummary:
-    type: "object"
-    required:
-      - Id
-      - ParentId
-      - RepoTags
-      - RepoDigests
-      - Created
-      - Size
-      - SharedSize
-      - VirtualSize
-      - Labels
-      - Containers
-    properties:
-      Id:
-        type: "string"
-        x-nullable: false
-      ParentId:
-        type: "string"
-        x-nullable: false
-      RepoTags:
-        type: "array"
-        x-nullable: false
-        items:
-          type: "string"
-      RepoDigests:
-        type: "array"
-        x-nullable: false
-        items:
-          type: "string"
-      Created:
-        type: "integer"
-        x-nullable: false
-      Size:
-        type: "integer"
-        x-nullable: false
-      SharedSize:
-        type: "integer"
-        x-nullable: false
-      VirtualSize:
-        type: "integer"
-        x-nullable: false
-      Labels:
-        type: "object"
-        x-nullable: false
-        additionalProperties:
-          type: "string"
-      Containers:
-        x-nullable: false
-        type: "integer"
-
-  AuthConfig:
-    type: "object"
-    properties:
-      username:
-        type: "string"
-      password:
-        type: "string"
-      email:
-        type: "string"
-      serveraddress:
-        type: "string"
-    example:
-      username: "hannibal"
-      password: "xxxx"
-      serveraddress: "https://index.docker.io/v1/"
-
-  ProcessConfig:
-    type: "object"
-    properties:
-      privileged:
-        type: "boolean"
-      user:
-        type: "string"
-      tty:
-        type: "boolean"
-      entrypoint:
-        type: "string"
-      arguments:
-        type: "array"
-        items:
-          type: "string"
-
-  Volume:
-    type: "object"
-    required: [Name, Driver, Mountpoint, Labels, Scope, Options]
-    properties:
-      Name:
-        type: "string"
-        description: "Name of the volume."
-        x-nullable: false
-      Driver:
-        type: "string"
-        description: "Name of the volume driver used by the volume."
-        x-nullable: false
-      Mountpoint:
-        type: "string"
-        description: "Mount path of the volume on the host."
-        x-nullable: false
-      Status:
-        type: "object"
-        description: |
-          Low-level details about the volume, provided by the volume driver.
-          Details are returned as a map with key/value pairs:
-          `{"key":"value","key2":"value2"}`.
-
-          The `Status` field is optional, and is omitted if the volume driver
-          does not support this feature.
-        additionalProperties:
-          type: "object"
-      Labels:
-        type: "object"
-        description: "User-defined key/value metadata."
-        x-nullable: false
-        additionalProperties:
-          type: "string"
-      Scope:
-        type: "string"
-        description: "The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level."
-        default: "local"
-        x-nullable: false
-        enum: ["local", "global"]
-      Options:
-        type: "object"
-        description: "The driver specific options used when creating the volume."
-        additionalProperties:
-          type: "string"
-      UsageData:
-        type: "object"
-        required: [Size, RefCount]
-        properties:
-          Size:
-            type: "integer"
-            description: "The disk space used by the volume (local driver only)"
-            default: -1
-            x-nullable: false
-          RefCount:
-            type: "integer"
-            default: -1
-            description: "The number of containers referencing this volume."
-            x-nullable: false
-
-    example:
-      Name: "tardis"
-      Driver: "custom"
-      Mountpoint: "/var/lib/docker/volumes/tardis"
-      Status:
-        hello: "world"
-      Labels:
-        com.example.some-label: "some-value"
-        com.example.some-other-label: "some-other-value"
-      Scope: "local"
-
-  Network:
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-      Id:
-        type: "string"
-      Created:
-        type: "string"
-        format: "dateTime"
-      Scope:
-        type: "string"
-      Driver:
-        type: "string"
-      EnableIPv6:
-        type: "boolean"
-      IPAM:
-        $ref: "#/definitions/IPAM"
-      Internal:
-        type: "boolean"
-      Containers:
-        type: "object"
-        additionalProperties:
-          $ref: "#/definitions/NetworkContainer"
-      Options:
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Labels:
-        type: "object"
-        additionalProperties:
-          type: "string"
-    example:
-      Name: "net01"
-      Id: "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99"
-      Created: "2016-10-19T04:33:30.360899459Z"
-      Scope: "local"
-      Driver: "bridge"
-      EnableIPv6: false
-      IPAM:
-        Driver: "default"
-        Config:
-          - Subnet: "172.19.0.0/16"
-            Gateway: "172.19.0.1"
-        Options:
-          foo: "bar"
-      Internal: false
-      Containers:
-        19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c:
-          Name: "test"
-          EndpointID: "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a"
-          MacAddress: "02:42:ac:13:00:02"
-          IPv4Address: "172.19.0.2/16"
-          IPv6Address: ""
-      Options:
-        com.docker.network.bridge.default_bridge: "true"
-        com.docker.network.bridge.enable_icc: "true"
-        com.docker.network.bridge.enable_ip_masquerade: "true"
-        com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-        com.docker.network.bridge.name: "docker0"
-        com.docker.network.driver.mtu: "1500"
-      Labels:
-        com.example.some-label: "some-value"
-        com.example.some-other-label: "some-other-value"
-  IPAM:
-    type: "object"
-    properties:
-      Driver:
-        description: "Name of the IPAM driver to use."
-        type: "string"
-        default: "default"
-      Config:
-        description: "List of IPAM configuration options, specified as a map: `{\"Subnet\": <CIDR>, \"IPRange\": <CIDR>, \"Gateway\": <IP address>, \"AuxAddress\": <device_name:IP address>}`"
-        type: "array"
-        items:
-          type: "object"
-          additionalProperties:
-            type: "string"
-      Options:
-        description: "Driver-specific options, specified as a map."
-        type: "array"
-        items:
-          type: "object"
-          additionalProperties:
-            type: "string"
-  NetworkContainer:
-    type: "object"
-    properties:
-      EndpointID:
-        type: "string"
-      MacAddress:
-        type: "string"
-      IPv4Address:
-        type: "string"
-      IPv6Address:
-        type: "string"
-
-  BuildInfo:
-    type: "object"
-    properties:
-      id:
-        type: "string"
-      stream:
-        type: "string"
-      error:
-        type: "string"
-      errorDetail:
-        $ref: "#/definitions/ErrorDetail"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-
-  CreateImageInfo:
-    type: "object"
-    properties:
-      error:
-        type: "string"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-
-  PushImageInfo:
-    type: "object"
-    properties:
-      error:
-        type: "string"
-      status:
-        type: "string"
-      progress:
-        type: "string"
-      progressDetail:
-        $ref: "#/definitions/ProgressDetail"
-  ErrorDetail:
-    type: "object"
-    properties:
-      code:
-        type: "integer"
-      message:
-        type: "string"
-  ProgressDetail:
-    type: "object"
-    properties:
-      code:
-        type: "integer"
-      message:
-        type: "integer"
-
-  ErrorResponse:
-    description: "Represents an error."
-    type: "object"
-    required: ["message"]
-    properties:
-      message:
-        description: "The error message."
-        type: "string"
-        x-nullable: false
-    example:
-      message: "Something went wrong."
-
-  IdResponse:
-    description: "Response to an API call that returns just an Id"
-    type: "object"
-    required: ["Id"]
-    properties:
-      Id:
-        description: "The id of the newly created object."
-        type: "string"
-        x-nullable: false
-
-  EndpointSettings:
-    description: "Configuration for a network endpoint."
-    type: "object"
-    properties:
-      IPAMConfig:
-        description: "IPAM configurations for the endpoint"
-        type: "object"
-        properties:
-          IPv4Address:
-            type: "string"
-          IPv6Address:
-            type: "string"
-          LinkLocalIPs:
-            type: "array"
-            items:
-              type: "string"
-      Links:
-        type: "array"
-        items:
-          type: "string"
-      Aliases:
-        type: "array"
-        items:
-          type: "string"
-      NetworkID:
-        type: "string"
-      EndpointID:
-        type: "string"
-      Gateway:
-        type: "string"
-      IPAddress:
-        type: "string"
-      IPPrefixLen:
-        type: "integer"
-      IPv6Gateway:
-        type: "string"
-      GlobalIPv6Address:
-        type: "string"
-      GlobalIPv6PrefixLen:
-        type: "integer"
-        format: "int64"
-      MacAddress:
-        type: "string"
-
-  PluginMount:
-    type: "object"
-    x-nullable: false
-    required: [Name, Description, Settable, Source, Destination, Type, Options]
-    properties:
-      Name:
-        type: "string"
-        x-nullable: false
-      Description:
-        type: "string"
-        x-nullable: false
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Source:
-        type: "string"
-      Destination:
-        type: "string"
-        x-nullable: false
-      Type:
-        type: "string"
-        x-nullable: false
-      Options:
-        type: "array"
-        items:
-          type: "string"
-
-  PluginDevice:
-    type: "object"
-    required: [Name, Description, Settable, Path]
-    x-nullable: false
-    properties:
-      Name:
-        type: "string"
-        x-nullable: false
-      Description:
-        type: "string"
-        x-nullable: false
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Path:
-        type: "string"
-
-  PluginEnv:
-    type: "object"
-    x-nullable: false
-    required: [Name, Description, Settable, Value]
-    properties:
-      Name:
-        x-nullable: false
-        type: "string"
-      Description:
-        x-nullable: false
-        type: "string"
-      Settable:
-        type: "array"
-        items:
-          type: "string"
-      Value:
-        type: "string"
-
-  PluginInterfaceType:
-    type: "object"
-    x-nullable: false
-    required: [Prefix, Capability, Version]
-    properties:
-      Prefix:
-        type: "string"
-        x-nullable: false
-      Capability:
-        type: "string"
-        x-nullable: false
-      Version:
-        type: "string"
-        x-nullable: false
-
-  Plugin:
-    description: "A plugin for the Engine API"
-    type: "object"
-    required: [Settings, Enabled, Config, Name]
-    properties:
-      Id:
-        type: "string"
-      Name:
-        type: "string"
-        x-nullable: false
-      Enabled:
-        description: "True when the plugin is running. False when the plugin is not running, only installed."
-        type: "boolean"
-        x-nullable: false
-      Settings:
-        description: "Settings that can be modified by users."
-        type: "object"
-        x-nullable: false
-        required: [Args, Devices, Env, Mounts]
-        properties:
-          Mounts:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginMount"
-          Env:
-            type: "array"
-            items:
-              type: "string"
-          Args:
-            type: "array"
-            items:
-              type: "string"
-          Devices:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginDevice"
-      PluginReference:
-        description: "plugin remote reference used to push/pull the plugin"
-        type: "string"
-        x-nullable: false
-      Config:
-        description: "The config of a plugin."
-        type: "object"
-        x-nullable: false
-        required:
-          - Description
-          - Documentation
-          - Interface
-          - Entrypoint
-          - WorkDir
-          - Network
-          - Linux
-          - PropagatedMount
-          - Mounts
-          - Env
-          - Args
-        properties:
-          Description:
-            type: "string"
-            x-nullable: false
-          Documentation:
-            type: "string"
-            x-nullable: false
-          Interface:
-            description: "The interface between Docker and the plugin"
-            x-nullable: false
-            type: "object"
-            required: [Types, Socket]
-            properties:
-              Types:
-                type: "array"
-                items:
-                  $ref: "#/definitions/PluginInterfaceType"
-              Socket:
-                type: "string"
-                x-nullable: false
-          Entrypoint:
-            type: "array"
-            items:
-              type: "string"
-          WorkDir:
-            type: "string"
-            x-nullable: false
-          User:
-            type: "object"
-            x-nullable: false
-            properties:
-              UID:
-                type: "integer"
-                format: "uint32"
-              GID:
-                type: "integer"
-                format: "uint32"
-          Network:
-            type: "object"
-            x-nullable: false
-            required: [Type]
-            properties:
-              Type:
-                x-nullable: false
-                type: "string"
-          Linux:
-            type: "object"
-            x-nullable: false
-            required: [Capabilities, AllowAllDevices, Devices]
-            properties:
-              Capabilities:
-                type: "array"
-                items:
-                  type: "string"
-              AllowAllDevices:
-                type: "boolean"
-                x-nullable: false
-              Devices:
-                type: "array"
-                items:
-                  $ref: "#/definitions/PluginDevice"
-          PropagatedMount:
-            type: "string"
-            x-nullable: false
-          Mounts:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginMount"
-          Env:
-            type: "array"
-            items:
-              $ref: "#/definitions/PluginEnv"
-          Args:
-            type: "object"
-            x-nullable: false
-            required: [Name, Description, Settable, Value]
-            properties:
-              Name:
-                x-nullable: false
-                type: "string"
-              Description:
-                x-nullable: false
-                type: "string"
-              Settable:
-                type: "array"
-                items:
-                  type: "string"
-              Value:
-                type: "array"
-                items:
-                  type: "string"
-          rootfs:
-            type: "object"
-            properties:
-              type:
-                type: "string"
-              diff_ids:
-                type: "array"
-                items:
-                  type: "string"
-    example:
-      Id: "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078"
-      Name: "tiborvass/sample-volume-plugin"
-      Tag: "latest"
-      Active: true
-      Settings:
-        Env:
-          - "DEBUG=0"
-        Args: null
-        Devices: null
-      Config:
-        Description: "A sample volume plugin for Docker"
-        Documentation: "https://docs.docker.com/engine/extend/plugins/"
-        Interface:
-          Types:
-            - "docker.volumedriver/1.0"
-          Socket: "plugins.sock"
-        Entrypoint:
-          - "/usr/bin/sample-volume-plugin"
-          - "/data"
-        WorkDir: ""
-        User: {}
-        Network:
-          Type: ""
-        Linux:
-          Capabilities: null
-          AllowAllDevices: false
-          Devices: null
-        Mounts: null
-        PropagatedMount: "/data"
-        Env:
-          - Name: "DEBUG"
-            Description: "If set, prints debug messages"
-            Settable: null
-            Value: "0"
-        Args:
-          Name: "args"
-          Description: "command line arguments"
-          Settable: null
-          Value: []
-
-  NodeSpec:
-    type: "object"
-    properties:
-      Name:
-        description: "Name for the node."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Role:
-        description: "Role of the node."
-        type: "string"
-        enum:
-          - "worker"
-          - "manager"
-      Availability:
-        description: "Availability of the node."
-        type: "string"
-        enum:
-          - "active"
-          - "pause"
-          - "drain"
-    example:
-      Availability: "active"
-      Name: "node-name"
-      Role: "manager"
-      Labels:
-        foo: "bar"
-  Node:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        type: "object"
-        properties:
-          Index:
-            type: "integer"
-            format: "int64"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/NodeSpec"
-      Description:
-        type: "object"
-        properties:
-          Hostname:
-            type: "string"
-          Platform:
-            type: "object"
-            properties:
-              Architecture:
-                type: "string"
-              OS:
-                type: "string"
-          Resources:
-            type: "object"
-            properties:
-              NanoCPUs:
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                type: "integer"
-                format: "int64"
-          Engine:
-            type: "object"
-            properties:
-              EngineVersion:
-                type: "string"
-              Labels:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Plugins:
-                type: "array"
-                items:
-                  type: "object"
-                  properties:
-                    Type:
-                      type: "string"
-                    Name:
-                      type: "string"
-    example:
-      ID: "24ifsmvkjbyhk"
-      Version:
-        Index: 8
-      CreatedAt: "2016-06-07T20:31:11.853781916Z"
-      UpdatedAt: "2016-06-07T20:31:11.999868824Z"
-      Spec:
-        Name: "my-node"
-        Role: "manager"
-        Availability: "active"
-        Labels:
-          foo: "bar"
-      Description:
-        Hostname: "bf3067039e47"
-        Platform:
-          Architecture: "x86_64"
-          OS: "linux"
-        Resources:
-          NanoCPUs: 4000000000
-          MemoryBytes: 8272408576
-        Engine:
-          EngineVersion: "1.13.0"
-          Labels:
-            foo: "bar"
-          Plugins:
-            - Type: "Volume"
-              Name: "local"
-            - Type: "Network"
-              Name: "bridge"
-            - Type: "Network"
-              Name: "null"
-            - Type: "Network"
-              Name: "overlay"
-      Status:
-        State: "ready"
-        Addr: "172.17.0.2"
-      ManagerStatus:
-        Leader: true
-        Reachability: "reachable"
-        Addr: "172.17.0.2:2377"
-  SwarmSpec:
-    description: "User modifiable swarm configuration."
-    type: "object"
-    properties:
-      Name:
-        description: "Name of the swarm."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Orchestration:
-        description: "Orchestration configuration."
-        type: "object"
-        properties:
-          TaskHistoryRetentionLimit:
-            description: "The number of historic tasks to keep per instance or node. If negative, never remove completed or failed tasks."
-            type: "integer"
-            format: "int64"
-      Raft:
-        description: "Raft configuration."
-        type: "object"
-        properties:
-          SnapshotInterval:
-            description: "The number of log entries between snapshots."
-            type: "integer"
-            format: "int64"
-          KeepOldSnapshots:
-            description: "The number of snapshots to keep beyond the current snapshot."
-            type: "integer"
-            format: "int64"
-          LogEntriesForSlowFollowers:
-            description: "The number of log entries to keep around to sync up slow followers after a snapshot is created."
-            type: "integer"
-            format: "int64"
-          ElectionTick:
-            description: |
-              The number of ticks that a follower will wait for a message from the leader before becoming a candidate and starting an election. `ElectionTick` must be greater than `HeartbeatTick`.
-
-              A tick currently defaults to one second, so these translate directly to seconds currently, but this is NOT guaranteed.
-            type: "integer"
-          HeartbeatTick:
-            description: |
-              The number of ticks between heartbeats. Every HeartbeatTick ticks, the leader will send a heartbeat to the followers.
-
-              A tick currently defaults to one second, so these translate directly to seconds currently, but this is NOT guaranteed.
-            type: "integer"
-      Dispatcher:
-        description: "Dispatcher configuration."
-        type: "object"
-        properties:
-          HeartbeatPeriod:
-            description: "The delay for an agent to send a heartbeat to the dispatcher."
-            type: "integer"
-            format: "int64"
-      CAConfig:
-        description: "CA configuration."
-        type: "object"
-        properties:
-          NodeCertExpiry:
-            description: "The duration node certificates are issued for."
-            type: "integer"
-            format: "int64"
-          ExternalCAs:
-            description: "Configuration for forwarding signing requests to an external certificate authority."
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                Protocol:
-                  description: "Protocol for communication with the external CA (currently only `cfssl` is supported)."
-                  type: "string"
-                  enum:
-                    - "cfssl"
-                  default: "cfssl"
-                URL:
-                  description: "URL where certificate signing requests should be sent."
-                  type: "string"
-                Options:
-                  description: "An object with key/value pairs that are interpreted as protocol-specific options for the external CA driver."
-                  type: "object"
-                  additionalProperties:
-                    type: "string"
-      EncryptionConfig:
-        description: "Parameters related to encryption-at-rest."
-        type: "object"
-        properties:
-          AutoLockManagers:
-            description: "If set, generate a key and use it to lock data stored on the managers."
-            type: "boolean"
-      TaskDefaults:
-        description: "Defaults for creating tasks in this cluster."
-        type: "object"
-        properties:
-          LogDriver:
-            description: |
-              The log driver to use for tasks created in the orchestrator if unspecified by a service.
-
-              Updating this value will only have an affect on new tasks. Old tasks will continue use their previously configured log driver until recreated.
-            type: "object"
-            properties:
-              Name:
-                type: "string"
-              Options:
-                type: "object"
-                additionalProperties:
-                  type: "string"
-    example:
-      Name: "default"
-      Orchestration:
-        TaskHistoryRetentionLimit: 10
-      Raft:
-        SnapshotInterval: 10000
-        LogEntriesForSlowFollowers: 500
-        HeartbeatTick: 1
-        ElectionTick: 3
-      Dispatcher:
-        HeartbeatPeriod: 5000000000
-      CAConfig:
-        NodeCertExpiry: 7776000000000000
-      JoinTokens:
-        Worker: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx"
-        Manager: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-      EncryptionConfig:
-        AutoLockManagers: false
-  # The Swarm information for `GET /info`. It is the same as `GET /swarm`, but
-  # without `JoinTokens`.
-  ClusterInfo:
-    type: "object"
-    properties:
-      ID:
-        description: "The ID of the swarm."
-        type: "string"
-      Version:
-        type: "object"
-        properties:
-          Index:
-            type: "integer"
-            format: "int64"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/SwarmSpec"
-  TaskSpec:
-    description: "User modifiable task configuration."
-    type: "object"
-    properties:
-      ContainerSpec:
-        type: "object"
-        properties:
-          Image:
-            description: "The image name to use for the container."
-            type: "string"
-          Command:
-            description: "The command to be run in the image."
-            type: "array"
-            items:
-              type: "string"
-          Args:
-            description: "Arguments to the command."
-            type: "array"
-            items:
-              type: "string"
-          Env:
-            description: "A list of environment variables in the form `VAR=value`."
-            type: "array"
-            items:
-              type: "string"
-          Dir:
-            description: "The working directory for commands to run in."
-            type: "string"
-          User:
-            description: "The user inside the container."
-            type: "string"
-          Labels:
-            description: "User-defined key/value data."
-            type: "object"
-            additionalProperties:
-              type: "string"
-          TTY:
-            description: "Whether a pseudo-TTY should be allocated."
-            type: "boolean"
-          Mounts:
-            description: "Specification for mounts to be added to containers created as part of the service."
-            type: "array"
-            items:
-              $ref: "#/definitions/Mount"
-          StopGracePeriod:
-            description: "Amount of time to wait for the container to terminate before forcefully killing it."
-            type: "integer"
-            format: "int64"
-          DNSConfig:
-            description: "Specification for DNS related configurations in resolver configuration file (`resolv.conf`)."
-            type: "object"
-            properties:
-              Nameservers:
-                description: "The IP addresses of the name servers."
-                type: "array"
-                items:
-                  type: "string"
-              Search:
-                description: "A search list for host-name lookup."
-                type: "array"
-                items:
-                  type: "string"
-              Options:
-                description: "A list of internal resolver variables to be modified (e.g., `debug`, `ndots:3`, etc.)."
-                type: "array"
-                items:
-                  type: "string"
-      Resources:
-        description: "Resource requirements which apply to each individual container created as part of the service."
-        type: "object"
-        properties:
-          Limits:
-            description: "Define resources limits."
-            type: "object"
-            properties:
-              NanoCPUs:
-                description: "CPU limit in units of 10<sup>-9</sup> CPU shares."
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                description: "Memory limit in Bytes."
-                type: "integer"
-                format: "int64"
-          Reservation:
-            description: "Define resources reservation."
-            properties:
-              NanoCPUs:
-                description: "CPU reservation in units of 10<sup>-9</sup> CPU shares."
-                type: "integer"
-                format: "int64"
-              MemoryBytes:
-                description: "Memory reservation in Bytes."
-                type: "integer"
-                format: "int64"
-      RestartPolicy:
-        description: "Specification for the restart policy which applies to containers created as part of this service."
-        type: "object"
-        properties:
-          Condition:
-            description: "Condition for restart."
-            type: "string"
-            enum:
-              - "none"
-              - "on-failure"
-              - "any"
-          Delay:
-            description: "Delay between restart attempts."
-            type: "integer"
-            format: "int64"
-          MaxAttempts:
-            description: "Maximum attempts to restart a given container before giving up (default value is 0, which is ignored)."
-            type: "integer"
-            format: "int64"
-            default: 0
-          Window:
-            description: "Windows is the time window used to evaluate the restart policy (default value is 0, which is unbounded)."
-            type: "integer"
-            format: "int64"
-            default: 0
-      Placement:
-        type: "object"
-        properties:
-          Constraints:
-            description: "An array of constraints."
-            type: "array"
-            items:
-              type: "string"
-      ForceUpdate:
-        description: "A counter that triggers an update even if no relevant parameters have been changed."
-        type: "integer"
-      Networks:
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Target:
-              type: "string"
-            Aliases:
-              type: "array"
-              items:
-                type: "string"
-      LogDriver:
-        description: "Specifies the log driver to use for tasks created from this spec. If not present, the default one for the swarm will be used, finally falling back to the engine default if not specified."
-        type: "object"
-        properties:
-          Name:
-            type: "string"
-          Options:
-            type: "object"
-            additionalProperties:
-              type: "string"
-  TaskState:
-    type: "string"
-    enum:
-      - "new"
-      - "allocated"
-      - "pending"
-      - "assigned"
-      - "accepted"
-      - "preparing"
-      - "ready"
-      - "starting"
-      - "running"
-      - "complete"
-      - "shutdown"
-      - "failed"
-      - "rejected"
-  Task:
-    type: "object"
-    properties:
-      ID:
-        description: "The ID of the task."
-        type: "string"
-      Version:
-        type: "object"
-        properties:
-          Index:
-            type: "integer"
-            format: "int64"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Name:
-        description: "Name of the task."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Spec:
-        $ref: "#/definitions/TaskSpec"
-      ServiceID:
-        description: "The ID of the service this task is part of."
-        type: "string"
-      Slot:
-        type: "integer"
-      NodeID:
-        description: "The ID of the node that this task is on."
-        type: "string"
-      Status:
-        type: "object"
-        properties:
-          Timestamp:
-            type: "string"
-            format: "dateTime"
-          State:
-            $ref: "#/definitions/TaskState"
-          Message:
-            type: "string"
-          Err:
-            type: "string"
-          ContainerStatus:
-            type: "object"
-            properties:
-              ContainerID:
-                type: "string"
-              PID:
-                type: "integer"
-              ExitCode:
-                type: "integer"
-      DesiredState:
-        $ref: "#/definitions/TaskState"
-    example:
-      ID: "0kzzo1i0y4jz6027t0k7aezc7"
-      Version:
-        Index: 71
-      CreatedAt: "2016-06-07T21:07:31.171892745Z"
-      UpdatedAt: "2016-06-07T21:07:31.376370513Z"
-      Spec:
-        ContainerSpec:
-          Image: "redis"
-        Resources:
-          Limits: {}
-          Reservations: {}
-        RestartPolicy:
-          Condition: "any"
-          MaxAttempts: 0
-        Placement: {}
-      ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-      Slot: 1
-      NodeID: "60gvrl6tm78dmak4yl7srz94v"
-      Status:
-        Timestamp: "2016-06-07T21:07:31.290032978Z"
-        State: "running"
-        Message: "started"
-        ContainerStatus:
-          ContainerID: "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035"
-          PID: 677
-      DesiredState: "running"
-      NetworksAttachments:
-        - Network:
-            ID: "4qvuz4ko70xaltuqbt8956gd1"
-            Version:
-              Index: 18
-            CreatedAt: "2016-06-07T20:31:11.912919752Z"
-            UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-            Spec:
-              Name: "ingress"
-              Labels:
-                com.docker.swarm.internal: "true"
-              DriverConfiguration: {}
-              IPAMOptions:
-                Driver: {}
-                Configs:
-                  - Subnet: "10.255.0.0/16"
-                    Gateway: "10.255.0.1"
-            DriverState:
-              Name: "overlay"
-              Options:
-                com.docker.network.driver.overlay.vxlanid_list: "256"
-            IPAMOptions:
-              Driver:
-                Name: "default"
-              Configs:
-                - Subnet: "10.255.0.0/16"
-                  Gateway: "10.255.0.1"
-          Addresses:
-            - "10.255.0.10/16"
-  ServiceSpec:
-    description: "User modifiable configuration for a service."
-    properties:
-      Name:
-        description: "Name of the service."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      TaskTemplate:
-        $ref: "#/definitions/TaskSpec"
-      Mode:
-        description: "Scheduling mode for the service."
-        type: "object"
-        properties:
-          Replicated:
-            type: "object"
-            properties:
-              Replicas:
-                type: "integer"
-                format: "int64"
-          Global:
-            type: "object"
-      UpdateConfig:
-        description: "Specification for the update strategy of the service."
-        type: "object"
-        properties:
-          Parallelism:
-            description: "Maximum number of tasks to be updated in one iteration (0 means unlimited parallelism)."
-            type: "integer"
-            format: "int64"
-          Delay:
-            description: "Amount of time between updates, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          FailureAction:
-            description: "Action to take if an updated task fails to run, or stops running during the update."
-            type: "string"
-            enum:
-              - "continue"
-              - "pause"
-          Monitor:
-            description: "Amount of time to monitor each updated task for failures, in nanoseconds."
-            type: "integer"
-            format: "int64"
-          MaxFailureRatio:
-            description: "The fraction of tasks that may fail during an update before the failure action is invoked, specified as a floating point number between 0 and 1."
-            type: "number"
-            default: 0
-      Networks:
-        description: "Array of network names or IDs to attach the service to."
-        type: "array"
-        items:
-          type: "object"
-          properties:
-            Target:
-              type: "string"
-            Aliases:
-              type: "array"
-              items:
-                type: "string"
-      EndpointSpec:
-        $ref: "#/definitions/EndpointSpec"
-  EndpointPortConfig:
-    type: "object"
-    properties:
-      Name:
-        type: "string"
-      Protocol:
-        type: "string"
-        enum:
-          - "tcp"
-          - "udp"
-      TargetPort:
-        description: "The port inside the container."
-        type: "integer"
-      PublishedPort:
-        description: "The port on the swarm hosts."
-        type: "integer"
-  EndpointSpec:
-    description: "Properties that can be configured to access and load balance a service."
-    type: "object"
-    properties:
-      Mode:
-        description: "The mode of resolution to use for internal load balancing
-      between tasks."
-        type: "string"
-        enum:
-          - "vip"
-          - "dnsrr"
-        default: "vip"
-      Ports:
-        description: "List of exposed ports that this service is accessible on from the outside. Ports can only be provided if `vip` resolution mode is used."
-        type: "array"
-        items:
-          $ref: "#/definitions/EndpointPortConfig"
-  Service:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        type: "object"
-        properties:
-          Index:
-            type: "integer"
-            format: "int64"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/ServiceSpec"
-      Endpoint:
-        type: "object"
-        properties:
-          Spec:
-            $ref: "#/definitions/EndpointSpec"
-          Ports:
-            type: "array"
-            items:
-              $ref: "#/definitions/EndpointPortConfig"
-          VirtualIPs:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                NetworkID:
-                  type: "string"
-                Addr:
-                  type: "string"
-      UpdateStatus:
-        description: "The status of a service update."
-        type: "object"
-        properties:
-          State:
-            type: "string"
-            enum:
-              - "updating"
-              - "paused"
-              - "completed"
-          StartedAt:
-            type: "string"
-            format: "dateTime"
-          CompletedAt:
-            type: "string"
-            format: "dateTime"
-          Message:
-            type: "string"
-    example:
-      ID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-      Version:
-        Index: 19
-      CreatedAt: "2016-06-07T21:05:51.880065305Z"
-      UpdatedAt: "2016-06-07T21:07:29.962229872Z"
-      Spec:
-        Name: "hopeful_cori"
-        TaskTemplate:
-          ContainerSpec:
-            Image: "redis"
-          Resources:
-            Limits: {}
-            Reservations: {}
-          RestartPolicy:
-            Condition: "any"
-            MaxAttempts: 0
-          Placement: {}
-          ForceUpdate: 0
-        Mode:
-          Replicated:
-            Replicas: 1
-        UpdateConfig:
-          Parallelism: 1
-          FailureAction: "pause"
-          Monitor: 15000000000
-          MaxFailureRatio: 0.15
-        EndpointSpec:
-          Mode: "vip"
-          Ports:
-            -
-              Protocol: "tcp"
-              TargetPort: 6379
-              PublishedPort: 30001
-      Endpoint:
-        Spec:
-          Mode: "vip"
-          Ports:
-            -
-              Protocol: "tcp"
-              TargetPort: 6379
-              PublishedPort: 30001
-        Ports:
-          -
-            Protocol: "tcp"
-            TargetPort: 6379
-            PublishedPort: 30001
-        VirtualIPs:
-          -
-            NetworkID: "4qvuz4ko70xaltuqbt8956gd1"
-            Addr: "10.255.0.2/16"
-          -
-            NetworkID: "4qvuz4ko70xaltuqbt8956gd1"
-            Addr: "10.255.0.3/16"
-  ImageDeleteResponse:
-    type: "object"
-    properties:
-      Untagged:
-        description: "The image ID of an image that was untagged"
-        type: "string"
-      Deleted:
-        description: "The image ID of an image that was deleted"
-        type: "string"
-  ServiceUpdateResponse:
-    type: "object"
-    properties:
-      Warnings:
-        description: "Optional warning messages"
-        type: "array"
-        items:
-          type: "string"
-    example:
-      Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
-  ContainerSummary:
-    type: "array"
-    items:
-      type: "object"
-      properties:
-        Id:
-          description: "The ID of this container"
-          type: "string"
-          x-go-name: "ID"
-        Names:
-          description: "The names that this container has been given"
-          type: "array"
-          items:
-            type: "string"
-        Image:
-          description: "The name of the image used when creating this container"
-          type: "string"
-        ImageID:
-          description: "The ID of the image that this container was created from"
-          type: "string"
-        Command:
-          description: "Command to run when starting the container"
-          type: "string"
-        Created:
-          description: "When the container was created"
-          type: "integer"
-          format: "int64"
-        Ports:
-          description: "The ports exposed by this container"
-          type: "array"
-          items:
-            $ref: "#/definitions/Port"
-        SizeRw:
-          description: "The size of files that have been created or changed by this container"
-          type: "integer"
-          format: "int64"
-        SizeRootFs:
-          description: "The total size of all the files in this container"
-          type: "integer"
-          format: "int64"
-        Labels:
-          description: "User-defined key/value metadata."
-          type: "object"
-          additionalProperties:
-            type: "string"
-        State:
-          description: "The state of this container (e.g. `Exited`)"
-          type: "string"
-        Status:
-          description: "Additional human-readable status of this container (e.g. `Exit 0`)"
-          type: "string"
-        HostConfig:
-          type: "object"
-          properties:
-            NetworkMode:
-              type: "string"
-        NetworkSettings:
-          description: "A summary of the container's network settings"
-          type: "object"
-          properties:
-            Networks:
-              type: "object"
-              additionalProperties:
-                $ref: "#/definitions/EndpointSettings"
-        Mounts:
-          type: "array"
-          items:
-            $ref: "#/definitions/Mount"
-  SecretSpec:
-    type: "object"
-    properties:
-      Name:
-        description: "User-defined name of the secret."
-        type: "string"
-      Labels:
-        description: "User-defined key/value metadata."
-        type: "object"
-        additionalProperties:
-          type: "string"
-      Data:
-        description: "Base64-url-safe-encoded secret data"
-        type: "array"
-        items:
-          type: "string"
-  Secret:
-    type: "object"
-    properties:
-      ID:
-        type: "string"
-      Version:
-        type: "object"
-        properties:
-          Index:
-            type: "integer"
-            format: "int64"
-      CreatedAt:
-        type: "string"
-        format: "dateTime"
-      UpdatedAt:
-        type: "string"
-        format: "dateTime"
-      Spec:
-        $ref: "#/definitions/ServiceSpec"
-paths:
-  /containers/json:
-    get:
-      summary: "List containers"
-      operationId: "ContainerList"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "all"
-          in: "query"
-          description: "Return all containers. By default, only running containers are shown"
-          type: "boolean"
-          default: false
-        - name: "limit"
-          in: "query"
-          description: "Return this number of most recently created containers, including non-running ones."
-          type: "integer"
-        - name: "size"
-          in: "query"
-          description: "Return the size of container as fields `SizeRw` and `SizeRootFs`."
-          type: "boolean"
-          default: false
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the container list, encoded as JSON (a `map[string][]string`). For example, `{"status": ["paused"]}` will only return paused containers.
-
-            Available filters:
-            - `exited=<int>` containers with exit code of `<int>`
-            - `status=`(`created`|`restarting`|`running`|`removing`|`paused`|`exited`|`dead`)
-            - `label=key` or `label="key=value"` of a container label
-            - `isolation=`(`default`|`process`|`hyperv`) (Windows daemon only)
-            - `id=<ID>` a container's ID
-            - `name=<name>` a container's name
-            - `is-task=`(`true`|`false`)
-            - `ancestor`=(`<image-name>[:<tag>]`, `<image id>`, or `<image@digest>`)
-            - `before`=(`<container id>` or `<container name>`)
-            - `since`=(`<container id>` or `<container name>`)
-            - `volume`=(`<volume name>` or `<mount point destination>`)
-            - `network`=(`<network id>` or `<network name>`)
-            - `health`=(`starting`|`healthy`|`unhealthy`|`none`)
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/ContainerSummary"
-          examples:
-            application/json:
-              - Id: "8dfafdbc3a40"
-                Names:
-                  - "/boring_feynman"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 1"
-                Created: 1367854155
-                State: "Exited"
-                Status: "Exit 0"
-                Ports:
-                  - PrivatePort: 2222
-                    PublicPort: 3333
-                    Type: "tcp"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.2"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:02"
-                Mounts:
-                  - Name: "fac362...80535"
-                    Source: "/data"
-                    Destination: "/data"
-                    Driver: "local"
-                    Mode: "ro,Z"
-                    RW: false
-                    Propagation: ""
-              - Id: "9cd87474be90"
-                Names:
-                  - "/coolName"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 222222"
-                Created: 1367854155
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.8"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:08"
-                Mounts: []
-              - Id: "3176a2479c92"
-                Names:
-                  - "/sleepy_dog"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 3333333333333333"
-                Created: 1367854154
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.6"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:06"
-                Mounts: []
-              - Id: "4cb07b47f9fb"
-                Names:
-                  - "/running_cat"
-                Image: "ubuntu:latest"
-                ImageID: "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82"
-                Command: "echo 444444444444444444444444444444444"
-                Created: 1367854152
-                State: "Exited"
-                Status: "Exit 0"
-                Ports: []
-                Labels: {}
-                SizeRw: 12288
-                SizeRootFs: 0
-                HostConfig:
-                  NetworkMode: "default"
-                NetworkSettings:
-                  Networks:
-                    bridge:
-                      NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                      EndpointID: "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9"
-                      Gateway: "172.17.0.1"
-                      IPAddress: "172.17.0.5"
-                      IPPrefixLen: 16
-                      IPv6Gateway: ""
-                      GlobalIPv6Address: ""
-                      GlobalIPv6PrefixLen: 0
-                      MacAddress: "02:42:ac:11:00:05"
-                Mounts: []
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /containers/create:
-    post:
-      summary: "Create a container"
-      operationId: "ContainerCreate"
-      consumes:
-        - "application/json"
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "name"
-          in: "query"
-          description: "Assign the specified name to the container. Must match `/?[a-zA-Z0-9_-]+`."
-          type: "string"
-          pattern: "/?[a-zA-Z0-9_-]+"
-        - name: "body"
-          in: "body"
-          description: "Container to create"
-          schema:
-            allOf:
-              - $ref: "#/definitions/Config"
-              - type: "object"
-                properties:
-                  HostConfig:
-                    $ref: "#/definitions/HostConfig"
-                  NetworkingConfig:
-                    description: "This container's networking configuration."
-                    type: "object"
-                    properties:
-                      EndpointsConfig:
-                        description: "A mapping of network name to endpoint configuration for that network."
-                        type: "object"
-                        additionalProperties:
-                          $ref: "#/definitions/EndpointSettings"
-            example:
-              Hostname: ""
-              Domainname: ""
-              User: ""
-              AttachStdin: false
-              AttachStdout: true
-              AttachStderr: true
-              Tty: false
-              OpenStdin: false
-              StdinOnce: false
-              Env:
-                - "FOO=bar"
-                - "BAZ=quux"
-              Cmd:
-                - "date"
-              Entrypoint: ""
-              Image: "ubuntu"
-              Labels:
-                com.example.vendor: "Acme"
-                com.example.license: "GPL"
-                com.example.version: "1.0"
-              Volumes:
-                /volumes/data: {}
-              WorkingDir: ""
-              NetworkDisabled: false
-              MacAddress: "12:34:56:78:9a:bc"
-              ExposedPorts:
-                22/tcp: {}
-              StopSignal: "SIGTERM"
-              StopTimeout: 10
-              HostConfig:
-                Binds:
-                  - "/tmp:/tmp"
-                Links:
-                  - "redis3:redis"
-                Memory: 0
-                MemorySwap: 0
-                MemoryReservation: 0
-                KernelMemory: 0
-                NanoCPUs: 500000
-                CpuPercent: 80
-                CpuShares: 512
-                CpuPeriod: 100000
-                CpuRealtimePeriod: 1000000
-                CpuRealtimeRuntime: 10000
-                CpuQuota: 50000
-                CpusetCpus: "0,1"
-                CpusetMems: "0,1"
-                MaximumIOps: 0
-                MaximumIOBps: 0
-                BlkioWeight: 300
-                BlkioWeightDevice:
-                  - {}
-                BlkioDeviceReadBps:
-                  - {}
-                BlkioDeviceReadIOps:
-                  - {}
-                BlkioDeviceWriteBps:
-                  - {}
-                BlkioDeviceWriteIOps:
-                  - {}
-                MemorySwappiness: 60
-                OomKillDisable: false
-                OomScoreAdj: 500
-                PidMode: ""
-                PidsLimit: -1
-                PortBindings:
-                  22/tcp:
-                    - HostPort: "11022"
-                PublishAllPorts: false
-                Privileged: false
-                ReadonlyRootfs: false
-                Dns:
-                  - "8.8.8.8"
-                DnsOptions:
-                  - ""
-                DnsSearch:
-                  - ""
-                VolumesFrom:
-                  - "parent"
-                  - "other:ro"
-                CapAdd:
-                  - "NET_ADMIN"
-                CapDrop:
-                  - "MKNOD"
-                GroupAdd:
-                  - "newgroup"
-                RestartPolicy:
-                  Name: ""
-                  MaximumRetryCount: 0
-                AutoRemove: true
-                NetworkMode: "bridge"
-                Devices: []
-                Ulimits:
-                  - {}
-                LogConfig:
-                  Type: "json-file"
-                  Config: {}
-                SecurityOpt: []
-                StorageOpt: {}
-                CgroupParent: ""
-                VolumeDriver: ""
-                ShmSize: 67108864
-              NetworkingConfig:
-                EndpointsConfig:
-                  isolated_nw:
-                    IPAMConfig:
-                      IPv4Address: "172.20.30.33"
-                      IPv6Address: "2001:db8:abcd::3033"
-                      LinkLocalIPs:
-                        - "169.254.34.68"
-                        - "fe80::3468"
-                    Links:
-                      - "container_1"
-                      - "container_2"
-                    Aliases:
-                      - "server_x"
-                      - "server_y"
-
-          required: true
-      responses:
-        201:
-          description: "Container created successfully"
-          schema:
-            type: "object"
-            required: [Id, Warnings]
-            properties:
-              Id:
-                description: "The ID of the created container"
-                type: "string"
-                x-nullable: false
-              Warnings:
-                description: "Warnings encountered when creating the container"
-                type: "array"
-                x-nullable: false
-                items:
-                  type: "string"
-          examples:
-            application/json:
-              Id: "e90e34656806"
-              Warnings: []
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        406:
-          description: "impossible to attach"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /containers/{id}/json:
-    get:
-      summary: "Inspect a container"
-      description: "Return low-level information about a container."
-      operationId: "ContainerInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Id:
-                description: "The ID of the container"
-                type: "string"
-              Created:
-                description: "The time the container was created"
-                type: "string"
-              Path:
-                description: "The path to the command being run"
-                type: "string"
-              Args:
-                description: "The arguments to the command being run"
-                type: "array"
-                items:
-                  type: "string"
-              State:
-                description: "The state of the container."
-                type: "object"
-                properties:
-                  Status:
-                    description: "The status of the container. For example, `running` or `exited`."
-                    type: "string"
-                  Running:
-                    description: "Whether this container is running."
-                    type: "boolean"
-                  Paused:
-                    description: "Whether this container is paused."
-                    type: "boolean"
-                  Restarting:
-                    description: "Whether this container is restarting."
-                    type: "boolean"
-                  OOMKilled:
-                    description: "Whether this container has been killed because it ran out of memory."
-                    type: "boolean"
-                  Dead:
-                    type: "boolean"
-                  Pid:
-                    description: "The process ID of this container"
-                    type: "integer"
-                  ExitCode:
-                    description: "The last exit code of this container"
-                    type: "integer"
-                  Error:
-                    type: "string"
-                  StartedAt:
-                    description: "The time when this container was last started."
-                    type: "string"
-                  FinishedAt:
-                    description: "The time when this container last exited."
-                    type: "string"
-              Image:
-                description: "The container's image"
-                type: "string"
-              ResolvConfPath:
-                type: "string"
-              HostnamePath:
-                type: "string"
-              HostsPath:
-                type: "string"
-              LogPath:
-                type: "string"
-              Node:
-                description: "TODO"
-                type: "object"
-              Name:
-                type: "string"
-              RestartCount:
-                type: "integer"
-              Driver:
-                type: "string"
-              MountLabel:
-                type: "string"
-              ProcessLabel:
-                type: "string"
-              AppArmorProfile:
-                type: "string"
-              ExecIDs:
-                type: "string"
-              HostConfig:
-                $ref: "#/definitions/HostConfig"
-              GraphDriver:
-                $ref: "#/definitions/GraphDriver"
-              SizeRw:
-                description: "The size of files that have been created or changed by this container."
-                type: "integer"
-                format: "int64"
-              SizeRootFs:
-                description: "The total size of all the files in this container."
-                type: "integer"
-                format: "int64"
-              Mounts:
-                type: "array"
-                items:
-                  $ref: "#/definitions/MountPoint"
-              Config:
-                $ref: "#/definitions/Config"
-              NetworkSettings:
-                $ref: "#/definitions/NetworkConfig"
-          examples:
-            application/json:
-              AppArmorProfile: ""
-              Args:
-                - "-c"
-                - "exit 9"
-              Config:
-                AttachStderr: true
-                AttachStdin: false
-                AttachStdout: true
-                Cmd:
-                  - "/bin/sh"
-                  - "-c"
-                  - "exit 9"
-                Domainname: ""
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Hostname: "ba033ac44011"
-                Image: "ubuntu"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                MacAddress: ""
-                NetworkDisabled: false
-                OpenStdin: false
-                StdinOnce: false
-                Tty: false
-                User: ""
-                Volumes:
-                  /volumes/data: {}
-                WorkingDir: ""
-                StopSignal: "SIGTERM"
-                StopTimeout: 10
-              Created: "2015-01-06T15:47:31.485331387Z"
-              Driver: "devicemapper"
-              HostConfig:
-                MaximumIOps: 0
-                MaximumIOBps: 0
-                BlkioWeight: 0
-                BlkioWeightDevice:
-                  - {}
-                BlkioDeviceReadBps:
-                  - {}
-                BlkioDeviceWriteBps:
-                  - {}
-                BlkioDeviceReadIOps:
-                  - {}
-                BlkioDeviceWriteIOps:
-                  - {}
-                ContainerIDFile: ""
-                CpusetCpus: ""
-                CpusetMems: ""
-                CpuPercent: 80
-                CpuShares: 0
-                CpuPeriod: 100000
-                CpuRealtimePeriod: 1000000
-                CpuRealtimeRuntime: 10000
-                Devices: []
-                IpcMode: ""
-                LxcConf: []
-                Memory: 0
-                MemorySwap: 0
-                MemoryReservation: 0
-                KernelMemory: 0
-                OomKillDisable: false
-                OomScoreAdj: 500
-                NetworkMode: "bridge"
-                PidMode: ""
-                PortBindings: {}
-                Privileged: false
-                ReadonlyRootfs: false
-                PublishAllPorts: false
-                RestartPolicy:
-                  MaximumRetryCount: 2
-                  Name: "on-failure"
-                LogConfig:
-                  Type: "json-file"
-                Sysctls:
-                  net.ipv4.ip_forward: "1"
-                Ulimits:
-                  - {}
-                VolumeDriver: ""
-                ShmSize: 67108864
-              HostnamePath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname"
-              HostsPath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts"
-              LogPath: "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log"
-              Id: "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39"
-              Image: "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2"
-              MountLabel: ""
-              Name: "/boring_euclid"
-              NetworkSettings:
-                Bridge: ""
-                SandboxID: ""
-                HairpinMode: false
-                LinkLocalIPv6Address: ""
-                LinkLocalIPv6PrefixLen: 0
-                SandboxKey: ""
-                SecondaryIPAddresses: null
-                SecondaryIPv6Addresses: null
-                EndpointID: ""
-                Gateway: ""
-                GlobalIPv6Address: ""
-                GlobalIPv6PrefixLen: 0
-                IPAddress: ""
-                IPPrefixLen: 0
-                IPv6Gateway: ""
-                MacAddress: ""
-                Networks:
-                  bridge:
-                    NetworkID: "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812"
-                    EndpointID: "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d"
-                    Gateway: "172.17.0.1"
-                    IPAddress: "172.17.0.2"
-                    IPPrefixLen: 16
-                    IPv6Gateway: ""
-                    GlobalIPv6Address: ""
-                    GlobalIPv6PrefixLen: 0
-                    MacAddress: "02:42:ac:12:00:02"
-              Path: "/bin/sh"
-              ProcessLabel: ""
-              ResolvConfPath: "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf"
-              RestartCount: 1
-              State:
-                Error: ""
-                ExitCode: 9
-                FinishedAt: "2015-01-06T15:47:32.080254511Z"
-                OOMKilled: false
-                Dead: false
-                Paused: false
-                Pid: 0
-                Restarting: false
-                Running: true
-                StartedAt: "2015-01-06T15:47:32.072697474Z"
-                Status: "running"
-              Mounts:
-                - Name: "fac362...80535"
-                  Source: "/data"
-                  Destination: "/data"
-                  Driver: "local"
-                  Mode: "ro,Z"
-                  RW: false
-                  Propagation: ""
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "size"
-          in: "query"
-          type: "boolean"
-          default: false
-          description: "Return the size of container as fields `SizeRw` and `SizeRootFs`"
-      tags: ["Container"]
-  /containers/{id}/top:
-    get:
-      summary: "List processes running inside a container"
-      description: "On Unix systems, this is done by running the `ps` command. This endpoint is not supported on Windows."
-      operationId: "ContainerTop"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Titles:
-                description: "The ps column titles"
-                type: "array"
-                items:
-                  type: "string"
-              Processes:
-                description: "Each process running in the container, where each is process is an array of values corresponding to the titles"
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-          examples:
-            application/json:
-              Titles:
-                - "UID"
-                - "PID"
-                - "PPID"
-                - "C"
-                - "STIME"
-                - "TTY"
-                - "TIME"
-                - "CMD"
-              Processes:
-                -
-                  - "root"
-                  - "13642"
-                  - "882"
-                  - "0"
-                  - "17:03"
-                  - "pts/0"
-                  - "00:00:00"
-                  - "/bin/bash"
-                -
-                  - "root"
-                  - "13735"
-                  - "13642"
-                  - "0"
-                  - "17:06"
-                  - "pts/0"
-                  - "00:00:00"
-                  - "sleep 10"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "ps_args"
-          in: "query"
-          description: "The arguments to pass to `ps`. For example, `aux`"
-          type: "string"
-          default: "-ef"
-      tags: ["Container"]
-  /containers/{id}/logs:
-    get:
-      summary: "Get container logs"
-      description: |
-        Get `stdout` and `stderr` logs from a container.
-
-        Note: This endpoint works only for containers with the `json-file` or `journald` logging driver.
-      operationId: "ContainerLogs"
-      responses:
-        101:
-          description: "logs returned as a stream"
-          schema:
-            type: "string"
-            format: "binary"
-        200:
-          description: "logs returned as a string in response body"
-          schema:
-            type: "string"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "follow"
-          in: "query"
-          description: |
-            Return the logs as a stream.
-
-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Return logs from `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Return logs from `stderr`"
-          type: "boolean"
-          default: false
-        - name: "since"
-          in: "query"
-          description: "Only return logs since this time, as a UNIX timestamp"
-          type: "integer"
-          default: 0
-        - name: "timestamps"
-          in: "query"
-          description: "Add timestamps to every log line"
-          type: "boolean"
-          default: false
-        - name: "tail"
-          in: "query"
-          description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."
-          type: "string"
-          default: "all"
-      tags: ["Container"]
-  /containers/{id}/changes:
-    get:
-      summary: "Get changes on a container’s filesystem"
-      description: |
-        Returns which files in a container's filesystem have been added, deleted, or modified. The `Kind` of modification can be one of:
-
-        - `0`: Modified
-        - `1`: Added
-        - `2`: Deleted
-      operationId: "ContainerChanges"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                Path:
-                  description: "Path to file that has changed"
-                  type: "string"
-                Kind:
-                  description: "Kind of change"
-                  type: "integer"
-                  enum:
-                    - 0
-                    - 1
-                    - 2
-          examples:
-            application/json:
-              - Path: "/dev"
-                Kind: 0
-              - Path: "/dev/kmsg"
-                Kind: 1
-              - Path: "/test"
-                Kind: 1
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/export:
-    get:
-      summary: "Export a container"
-      description: "Export the contents of a container as a tarball."
-      operationId: "ContainerExport"
-      produces:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/stats:
-    get:
-      summary: "Get container stats based on resource usage"
-      description: |
-        This endpoint returns a live stream of a container’s resource usage statistics.
-
-        The `precpu_stats` is the CPU statistic of last read, which is used for calculating the CPU usage percentage. It is not the same as the `cpu_stats` field.
-      operationId: "ContainerStats"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-          examples:
-            application/json:
-              read: "2015-01-08T22:57:31.547920715Z"
-              pids_stats:
-                current: 3
-              networks:
-                eth0:
-                  rx_bytes: 5338
-                  rx_dropped: 0
-                  rx_errors: 0
-                  rx_packets: 36
-                  tx_bytes: 648
-                  tx_dropped: 0
-                  tx_errors: 0
-                  tx_packets: 8
-                eth5:
-                  rx_bytes: 4641
-                  rx_dropped: 0
-                  rx_errors: 0
-                  rx_packets: 26
-                  tx_bytes: 690
-                  tx_dropped: 0
-                  tx_errors: 0
-                  tx_packets: 9
-              memory_stats:
-                stats:
-                  total_pgmajfault: 0
-                  cache: 0
-                  mapped_file: 0
-                  total_inactive_file: 0
-                  pgpgout: 414
-                  rss: 6537216
-                  total_mapped_file: 0
-                  writeback: 0
-                  unevictable: 0
-                  pgpgin: 477
-                  total_unevictable: 0
-                  pgmajfault: 0
-                  total_rss: 6537216
-                  total_rss_huge: 6291456
-                  total_writeback: 0
-                  total_inactive_anon: 0
-                  rss_huge: 6291456
-                  hierarchical_memory_limit: 67108864
-                  total_pgfault: 964
-                  total_active_file: 0
-                  active_anon: 6537216
-                  total_active_anon: 6537216
-                  total_pgpgout: 414
-                  total_cache: 0
-                  inactive_anon: 0
-                  active_file: 0
-                  pgfault: 964
-                  inactive_file: 0
-                  total_pgpgin: 477
-                max_usage: 6651904
-                usage: 6537216
-                failcnt: 0
-                limit: 67108864
-              blkio_stats: {}
-              cpu_stats:
-                cpu_usage:
-                  percpu_usage:
-                    - 8646879
-                    - 24472255
-                    - 36438778
-                    - 30657443
-                  usage_in_usermode: 50000000
-                  total_usage: 100215355
-                  usage_in_kernelmode: 30000000
-                system_cpu_usage: 739306590000000
-                throttling_data:
-                  periods: 0
-                  throttled_periods: 0
-                  throttled_time: 0
-              precpu_stats:
-                cpu_usage:
-                  percpu_usage:
-                    - 8646879
-                    - 24350896
-                    - 36438778
-                    - 30657443
-                  usage_in_usermode: 50000000
-                  total_usage: 100093996
-                  usage_in_kernelmode: 30000000
-                system_cpu_usage: 9492140000000
-                throttling_data:
-                  periods: 0
-                  throttled_periods: 0
-                  throttled_time: 0
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "stream"
-          in: "query"
-          description: "Stream the output. If false, the stats will be output once and then it will disconnect."
-          type: "boolean"
-          default: true
-      tags: ["Container"]
-  /containers/{id}/resize:
-    post:
-      summary: "Resize a container TTY"
-      description: "Resize the TTY for a container. You must restart the container for the resize to take effect."
-      operationId: "ContainerResize"
-      consumes:
-        - "application/octet-stream"
-      produces:
-        - "text/plain"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "cannot resize container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "h"
-          in: "query"
-          description: "Height of the tty session in characters"
-          type: "integer"
-        - name: "w"
-          in: "query"
-          description: "Width of the tty session in characters"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/start:
-    post:
-      summary: "Start a container"
-      operationId: "ContainerStart"
-      responses:
-        204:
-          description: "no error"
-        304:
-          description: "container already started"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/stop:
-    post:
-      summary: "Stop a container"
-      operationId: "ContainerStop"
-      responses:
-        204:
-          description: "no error"
-        304:
-          description: "container already stopped"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "t"
-          in: "query"
-          description: "Number of seconds to wait before killing the container"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/restart:
-    post:
-      summary: "Restart a container"
-      operationId: "ContainerRestart"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "t"
-          in: "query"
-          description: "Number of seconds to wait before killing the container"
-          type: "integer"
-      tags: ["Container"]
-  /containers/{id}/kill:
-    post:
-      summary: "Kill a container"
-      description: "Send a POSIX signal to a container, defaulting to killing to the container."
-      operationId: "ContainerKill"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "signal"
-          in: "query"
-          description: "Signal to send to the container as an integer or string (e.g. `SIGINT`)"
-          type: "string"
-          default: "SIGKILL"
-      tags: ["Container"]
-  /containers/{id}/update:
-    post:
-      summary: "Update a container"
-      description: "Change various configuration options of a container without having to recreate it."
-      operationId: "ContainerUpdate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The container has been updated."
-          schema:
-            type: "object"
-            properties:
-              Warnings:
-                type: "array"
-                items:
-                  type: "string"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "update"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/Resources"
-              - type: "object"
-                properties:
-                  RestartPolicy:
-                    $ref: "#/definitions/RestartPolicy"
-            example:
-              BlkioWeight: 300
-              CpuShares: 512
-              CpuPeriod: 100000
-              CpuQuota: 50000
-              CpuRealtimePeriod: 1000000
-              CpuRealtimeRuntime: 10000
-              CpusetCpus: "0,1"
-              CpusetMems: "0"
-              Memory: 314572800
-              MemorySwap: 514288000
-              MemoryReservation: 209715200
-              KernelMemory: 52428800
-              RestartPolicy:
-                MaximumRetryCount: 4
-                Name: "on-failure"
-      tags: ["Container"]
-  /containers/{id}/rename:
-    post:
-      summary: "Rename a container"
-      operationId: "ContainerRename"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        409:
-          description: "name already in use"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "name"
-          in: "query"
-          required: true
-          description: "New name for the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/pause:
-    post:
-      summary: "Pause a container"
-      description: |
-        Use the cgroups freezer to suspend all processes in a container.
-
-        Traditionally, when suspending a process the `SIGSTOP` signal is used, which is observable by the process being suspended. With the cgroups freezer the process is unaware, and unable to capture, that it is being suspended, and subsequently resumed.
-      operationId: "ContainerPause"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/unpause:
-    post:
-      summary: "Unpause a container"
-      description: "Resume a container which has been paused."
-      operationId: "ContainerUnpause"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}/attach:
-    post:
-      summary: "Attach to a container"
-      description: |
-        Attach to a container to read its output or send it input. You can attach to the same container multiple times and you can reattach to containers that have been detached.
-
-        Either the `stream` or `logs` parameter must be `true` for this endpoint to do anything.
-
-        See [the documentation for the `docker attach` command](https://docs.docker.com/engine/reference/commandline/attach/) for more details.
-
-        ### Hijacking
-
-        This endpoint hijacks the HTTP connection to transport `stdin`, `stdout`, and `stderr` on the same socket.
-
-        This is the response from the daemon for an attach request:
-
-        ```
-        HTTP/1.1 200 OK
-        Content-Type: application/vnd.docker.raw-stream
-
-        [STREAM]
-        ```
-
-        After the headers and two new lines, the TCP connection can now be used for raw, bidirectional communication between the client and server.
-
-        To hint potential proxies about connection hijacking, the Docker client can also optionally send connection upgrade headers.
-
-        For example, the client sends this request to upgrade the connection:
-
-        ```
-        POST /containers/16253994b7c4/attach?stream=1&stdout=1 HTTP/1.1
-        Upgrade: tcp
-        Connection: Upgrade
-        ```
-
-        The Docker daemon will respond with a `101 UPGRADED` response, and will similarly follow with the raw stream:
-
-        ```
-        HTTP/1.1 101 UPGRADED
-        Content-Type: application/vnd.docker.raw-stream
-        Connection: Upgrade
-        Upgrade: tcp
-
-        [STREAM]
-        ```
-
-        ### Stream format
-
-        When the TTY setting is disabled in [`POST /containers/create`](#operation/ContainerCreate), the stream over the hijacked connected is multiplexed to separate out `stdout` and `stderr`. The stream consists of a series of frames, each containing a header and a payload.
-
-        The header contains the information which the stream writes (`stdout` or `stderr`). It also contains the size of the associated frame encoded in the last four bytes (`uint32`).
-
-        It is encoded on the first eight bytes like this:
-
-        ```go
-        header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-        ```
-
-        `STREAM_TYPE` can be:
-
-        - 0: `stdin` (is written on `stdout`)
-        - 1: `stdout`
-        - 2: `stderr`
-
-        `SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of the `uint32` size encoded as big endian.
-
-        Following the header is the payload, which is the specified number of bytes of `STREAM_TYPE`.
-
-        The simplest way to implement this protocol is the following:
-
-        1. Read 8 bytes.
-        2. Choose `stdout` or `stderr` depending on the first byte.
-        3. Extract the frame size from the last four bytes.
-        4. Read the extracted size and output it on the correct output.
-        5. Goto 1.
-
-        ### Stream format when using a TTY
-
-        When the TTY setting is enabled in [`POST /containers/create`](#operation/ContainerCreate), the stream is not multiplexed. The data exchanged over the hijacked connection is simply the raw data from the process PTY and client's `stdin`.
-
-      operationId: "ContainerAttach"
-      produces:
-        - "application/vnd.docker.raw-stream"
-      responses:
-        101:
-          description: "no error, hints proxy about hijacking"
-        200:
-          description: "no error, no upgrade header found"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container.Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-          type: "string"
-        - name: "logs"
-          in: "query"
-          description: |
-            Replay previous logs from the container.
-
-            This is useful for attaching to a container that has started and you want to output everything since the container started.
-
-            If `stream` is also enabled, once all the previous output has been returned, it will seamlessly transition into streaming current output.
-          type: "boolean"
-          default: false
-        - name: "stream"
-          in: "query"
-          description: "Stream attached streams from the the time the request was made onwards"
-          type: "boolean"
-          default: false
-        - name: "stdin"
-          in: "query"
-          description: "Attach to `stdin`"
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Attach to `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Attach to `stderr`"
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/attach/ws:
-    get:
-      summary: "Attach to a container via a websocket"
-      operationId: "ContainerAttachWebsocket"
-      responses:
-        101:
-          description: "no error, hints proxy about hijacking"
-        200:
-          description: "no error, no upgrade header found"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "detachKeys"
-          in: "query"
-          description: "Override the key sequence for detaching a container.Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,`, or `_`."
-          type: "string"
-        - name: "logs"
-          in: "query"
-          description: "Return logs"
-          type: "boolean"
-          default: false
-        - name: "stream"
-          in: "query"
-          description: "Return stream"
-          type: "boolean"
-          default: false
-        - name: "stdin"
-          in: "query"
-          description: "Attach to `stdin`"
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Attach to `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Attach to `stderr`"
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/wait:
-    post:
-      summary: "Wait for a container"
-      description: "Block until a container stops, then returns the exit code."
-      operationId: "ContainerWait"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "The container has exit."
-          schema:
-            type: "object"
-            required: [StatusCode]
-            properties:
-              StatusCode:
-                description: "Exit code of the container"
-                type: "integer"
-                x-nullable: false
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-      tags: ["Container"]
-  /containers/{id}:
-    delete:
-      summary: "Remove a container"
-      operationId: "ContainerDelete"
-      responses:
-        204:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "v"
-          in: "query"
-          description: "Remove the volumes associated with the container."
-          type: "boolean"
-          default: false
-        - name: "force"
-          in: "query"
-          description: "If the container is running, kill it before removing it."
-          type: "boolean"
-          default: false
-      tags: ["Container"]
-  /containers/{id}/archive:
-    head:
-      summary: "Get information about files in a container"
-      description: "A response header `X-Docker-Container-Path-Stat` is return containing a base64 - encoded JSON object with some filesystem header information about the path."
-      operationId: "ContainerArchiveHead"
-      responses:
-        200:
-          description: "no error"
-          headers:
-            X-Docker-Container-Path-Stat:
-              type: "string"
-              description: "TODO"
-        400:
-          description: "Bad parameter"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ErrorResponse"
-              - type: "object"
-                properties:
-                  message:
-                    description: "The error message. Either \"must specify path parameter\" (path cannot be empty) or \"not a directory\" (path was asserted to be a directory but exists as a file)."
-                    type: "string"
-                    x-nullable: false
-        404:
-          description: "Container or path does not exist"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Resource in the container’s filesystem to archive."
-          type: "string"
-      tags: ["Container"]
-    get:
-      summary: "Get an archive of a filesystem resource in a container"
-      description: "Get an tar archive of a resource in the filesystem of container id."
-      operationId: "ContainerGetArchive"
-      produces:
-        - "application/x-tar"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "Bad parameter"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ErrorResponse"
-              - type: "object"
-                properties:
-                  message:
-                    description: "The error message. Either \"must specify path parameter\" (path cannot be empty) or \"not a directory\" (path was asserted to be a directory but exists as a file)."
-                    type: "string"
-                    x-nullable: false
-        404:
-          description: "Container or path does not exist"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Resource in the container’s filesystem to archive."
-          type: "string"
-      tags: ["Container"]
-    put:
-      summary: "Extract an archive of files or folders to a directory in a container"
-      description: "Upload a tar archive to be extracted to a path in the filesystem of container id."
-      operationId: "ContainerPutArchive"
-      consumes:
-        - "application/x-tar"
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "The content was extracted successfully"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        403:
-          description: "Permission denied, the volume or container rootfs is marked as read-only."
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "No such container or path does not exist inside the container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "path"
-          in: "query"
-          required: true
-          description: "Path to a directory in the container to extract the archive’s contents into. "
-          type: "string"
-        - name: "noOverwriteDirNonDir"
-          in: "query"
-          description: "If “1”, “true”, or “True” then it will be an error if unpacking the given content would cause an existing directory to be replaced with a non-directory and vice versa."
-          type: "string"
-        - name: "inputStream"
-          in: "body"
-          required: true
-          description: "The input stream must be a tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz."
-          schema:
-            type: "string"
-      tags: ["Container"]
-  /containers/prune:
-    post:
-      summary: "Delete stopped containers"
-      produces:
-        - "application/json"
-      operationId: "ContainerPrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ContainersDeleted:
-                description: "Container IDs that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Container"]
-  /images/json:
-    get:
-      summary: "List Images"
-      description: "Returns a list of images on the server. Note that it uses a different, smaller representation of an image than inspecting a single image."
-      operationId: "ImageList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "Summary image data for the images matching the query"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/ImageSummary"
-          examples:
-            application/json:
-              - Id: "sha256:e216a057b1cb1efc11f8a268f37ef62083e70b1b38323ba252e25ac88904a7e8"
-                ParentId: ""
-                RepoTags:
-                  - "ubuntu:12.04"
-                  - "ubuntu:precise"
-                RepoDigests:
-                  - "ubuntu@sha256:992069aee4016783df6345315302fa59681aae51a8eeb2f889dea59290f21787"
-                Created: 1474925151
-                Size: 103579269
-                VirtualSize: 103579269
-                SharedSize: 0
-                Labels: {}
-                Containers: 2
-              - Id: "sha256:3e314f95dcace0f5e4fd37b10862fe8398e3c60ed36600bc0ca5fda78b087175"
-                ParentId: ""
-                RepoTags:
-                  - "ubuntu:12.10"
-                  - "ubuntu:quantal"
-                RepoDigests:
-                  - "ubuntu@sha256:002fba3e3255af10be97ea26e476692a7ebed0bb074a9ab960b2e7a1526b15d7"
-                  - "ubuntu@sha256:68ea0200f0b90df725d99d823905b04cf844f6039ef60c60bf3e019915017bd3"
-                Created: 1403128455
-                Size: 172064416
-                VirtualSize: 172064416
-                SharedSize: 0
-                Labels: {}
-                Containers: 5
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "all"
-          in: "query"
-          description: "Show all images. Only images from a final layer (no children) are shown by default."
-          type: "boolean"
-          default: false
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the images list.
-
-            Available filters:
-            - `dangling=true`
-            - `label=key` or `label="key=value"` of an image label
-            - `before`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-            - `since`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-            - `reference`=(`<image-name>[:<tag>]`)
-          type: "string"
-        - name: "digests"
-          in: "query"
-          description: "Show digest information as a `RepoDigests` field on each image."
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /build:
-    post:
-      summary: "Build an image"
-      description: |
-        Build an image from a tar archive with a `Dockerfile` in it.
-
-        The `Dockerfile` specifies how the image is built from the tar archive. It is typically in the archive's root, but can be at a different path or have a different name by specifying the `dockerfile` parameter. [See the `Dockerfile` reference for more information](https://docs.docker.com/engine/reference/builder/).
-
-        The Docker daemon performs a preliminary validation of the `Dockerfile` before starting the build, and returns an error if the syntax is incorrect. After that, each instruction is run one-by-one until the ID of the new image is output.
-
-        The build is canceled if the client drops the connection by quitting or being killed.
-      operationId: "ImageBuild"
-      consumes:
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "inputStream"
-          in: "body"
-          description: "A tar archive compressed with one of the following algorithms: identity (no compression), gzip, bzip2, xz."
-          schema:
-            type: "string"
-            format: "binary"
-        - name: "dockerfile"
-          in: "query"
-          description: "Path within the build context to the `Dockerfile`. This is ignored if `remote` is specified and points to an external `Dockerfile`."
-          type: "string"
-          default: "Dockerfile"
-        - name: "t"
-          in: "query"
-          description: "A name and optional tag to apply to the image in the `name:tag` format. If you omit the tag the default `latest` value is assumed. You can provide several `t` parameters."
-          type: "string"
-        - name: "remote"
-          in: "query"
-          description: "A Git repository URI or HTTP/HTTPS context URI. If the URI points to a single text file, the file’s contents are placed into a file called `Dockerfile` and the image is built from that file. If the URI points to a tarball, the file is downloaded by the daemon and the contents therein used as the context for the build. If the URI points to a tarball and the `dockerfile` parameter is also specified, there must be a file with the corresponding path inside the tarball."
-          type: "string"
-        - name: "q"
-          in: "query"
-          description: "Suppress verbose build output."
-          type: "boolean"
-          default: false
-        - name: "nocache"
-          in: "query"
-          description: "Do not use the cache when building the image."
-          type: "boolean"
-          default: false
-        - name: "cachefrom"
-          in: "query"
-          description: "JSON array of images used for build cache resolution."
-          type: "string"
-        - name: "pull"
-          in: "query"
-          description: "Attempt to pull the image even if an older image exists locally."
-          type: "string"
-        - name: "rm"
-          in: "query"
-          description: "Remove intermediate containers after a successful build."
-          type: "boolean"
-          default: true
-        - name: "forcerm"
-          in: "query"
-          description: "Always remove intermediate containers, even upon failure."
-          type: "boolean"
-          default: false
-        - name: "memory"
-          in: "query"
-          description: "Set memory limit for build."
-          type: "integer"
-        - name: "memswap"
-          in: "query"
-          description: "Total memory (memory + swap). Set as `-1` to disable swap."
-          type: "integer"
-        - name: "cpushares"
-          in: "query"
-          description: "CPU shares (relative weight)."
-          type: "integer"
-        - name: "cpusetcpus"
-          in: "query"
-          description: "CPUs in which to allow execution (e.g., `0-3`, `0,1`)."
-          type: "string"
-        - name: "cpuperiod"
-          in: "query"
-          description: "The length of a CPU period in microseconds."
-          type: "integer"
-        - name: "cpuquota"
-          in: "query"
-          description: "Microseconds of CPU time that the container can get in a CPU period."
-          type: "integer"
-        - name: "buildargs"
-          in: "query"
-          description: "JSON map of string pairs for build-time variables. Users pass these values at build-time. Docker uses the buildargs as the environment context for commands run via the `Dockerfile` RUN instruction, or for variable expansion in other `Dockerfile` instructions. This is not meant for passing secret values. [Read more about the buildargs instruction.](https://docs.docker.com/engine/reference/builder/#arg)"
-          type: "integer"
-        - name: "shmsize"
-          in: "query"
-          description: "Size of `/dev/shm` in bytes. The size must be greater than 0. If omitted the system uses 64MB."
-          type: "integer"
-        - name: "squash"
-          in: "query"
-          description: "Squash the resulting images layers into a single layer. *(Experimental release only.)*"
-          type: "boolean"
-        - name: "labels"
-          in: "query"
-          description: "Arbitrary key/value labels to set on the image, as a JSON map of string pairs."
-          type: "string"
-        - name: "networkmode"
-          in: "query"
-          description: "Sets the networking mode for the run commands during
-        build. Supported standard values are: `bridge`, `host`, `none`, and
-        `container:<name|id>`. Any other value is taken as a custom network's
-        name to which this container should connect to."
-          type: "string"
-        - name: "Content-type"
-          in: "header"
-          type: "string"
-          enum:
-            - "application/tar"
-          default: "application/tar"
-        - name: "X-Registry-Config"
-          in: "header"
-          description: |
-            This is a base64-encoded JSON object with auth configurations for multiple registries that a build may refer to.
-
-            The key is a registry URL, and the value is an auth configuration object, [as described in the authentication section](#section/Authentication). For example:
-
-            ```
-            {
-              "docker.example.com": {
-                "username": "janedoe",
-                "password": "hunter2"
-              },
-              "https://index.docker.io/v1/": {
-                "username": "mobydock",
-                "password": "conta1n3rize14"
-              }
-            }
-            ```
-
-            Only the registry domain name (and port if not the default 443) are required. However, for legacy reasons, the Docker Hub registry must be specified with both a `https://` prefix and a `/v1/` suffix even though Docker will prefer to use the v2 registry API.
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Image"]
-  /images/create:
-    post:
-      summary: "Create an image"
-      description: "Create an image by either pulling it from a registry or importing it."
-      operationId: "ImageCreate"
-      consumes:
-        - "text/plain"
-        - "application/octet-stream"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "repository does not exist or no read access"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "fromImage"
-          in: "query"
-          description: "Name of the image to pull. The name may include a tag or digest. This parameter may only be used when pulling an image. The pull is cancelled if the HTTP connection is closed."
-          type: "string"
-        - name: "fromSrc"
-          in: "query"
-          description: "Source to import. The value may be a URL from which the image can be retrieved or `-` to read the image from the request body. This parameter may only be used when importing an image."
-          type: "string"
-        - name: "repo"
-          in: "query"
-          description: "Repository name given to an image when it is imported. The repo may include a tag. This parameter may only be used when importing an image."
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "Tag or digest. If empty when pulling an image, this causes all tags for the given image to be pulled."
-          type: "string"
-        - name: "inputImage"
-          in: "body"
-          description: "Image content if the value `-` has been specified in fromSrc query parameter"
-          schema:
-            type: "string"
-          required: false
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-      tags: ["Image"]
-  /images/{name}/json:
-    get:
-      summary: "Inspect an image"
-      description: "Return low-level information about an image."
-      operationId: "ImageInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Image"
-          examples:
-            application/json:
-              Id: "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c"
-              Container: "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a"
-              Comment: ""
-              Os: "linux"
-              Architecture: "amd64"
-              Parent: "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-              ContainerConfig:
-                Tty: false
-                Hostname: "e611e15f9c9d"
-                Domainname: ""
-                AttachStdout: false
-                PublishService: ""
-                AttachStdin: false
-                OpenStdin: false
-                StdinOnce: false
-                NetworkDisabled: false
-                OnBuild: []
-                Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-                User: ""
-                WorkingDir: ""
-                MacAddress: ""
-                AttachStderr: false
-                Labels:
-                  com.example.license: "GPL"
-                  com.example.version: "1.0"
-                  com.example.vendor: "Acme"
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Cmd:
-                  - "/bin/sh"
-                  - "-c"
-                  - "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-              DockerVersion: "1.9.0-dev"
-              VirtualSize: 188359297
-              Size: 0
-              Author: ""
-              Created: "2015-09-10T08:30:53.26995814Z"
-              GraphDriver:
-                Name: "aufs"
-              RepoDigests:
-                - "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-              RepoTags:
-                - "example:1.0"
-                - "example:latest"
-                - "example:stable"
-              Config:
-                Image: "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"
-                NetworkDisabled: false
-                OnBuild: []
-                StdinOnce: false
-                PublishService: ""
-                AttachStdin: false
-                OpenStdin: false
-                Domainname: ""
-                AttachStdout: false
-                Tty: false
-                Hostname: "e611e15f9c9d"
-                Cmd:
-                  - "/bin/bash"
-                Env:
-                  - "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-                Labels:
-                  com.example.vendor: "Acme"
-                  com.example.version: "1.0"
-                  com.example.license: "GPL"
-                MacAddress: ""
-                AttachStderr: false
-                WorkingDir: ""
-                User: ""
-              RootFS:
-                Type: "layers"
-                Layers:
-                  - "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6"
-                  - "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such image: someimage (tag: latest)"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or id"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/history:
-    get:
-      summary: "Get the history of an image"
-      description: "Return parent layers of an image."
-      operationId: "ImageHistory"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                Id:
-                  type: "string"
-                Created:
-                  type: "integer"
-                  format: "int64"
-                CreatedBy:
-                  type: "string"
-                Tags:
-                  type: "array"
-                  items:
-                    type: "string"
-                Size:
-                  type: "integer"
-                  format: "int64"
-                Comment:
-                  type: "string"
-          examples:
-            application/json:
-              - Id: "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710"
-                Created: 1398108230
-                CreatedBy: "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /"
-                Tags:
-                  - "ubuntu:lucid"
-                  - "ubuntu:10.04"
-                Size: 182964289
-                Comment: ""
-              - Id: "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8"
-                Created: 1398108222
-                CreatedBy: "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/"
-                Tags: []
-                Size: 0
-                Comment: ""
-              - Id: "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"
-                Created: 1371157430
-                CreatedBy: ""
-                Tags:
-                  - "scratch12:latest"
-                  - "scratch:latest"
-                Size: 0
-                Comment: "Imported from -"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/push:
-    post:
-      summary: "Push an image"
-      description: |
-        Push an image to a registry.
-
-        If you wish to push an image on to a private registry, that image must already have a tag which references the registry. For example, `registry.example.com/myimage:latest`.
-
-        The push is cancelled if the HTTP connection is closed.
-      operationId: "ImagePush"
-      consumes:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "No error"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID."
-          type: "string"
-          required: true
-        - name: "tag"
-          in: "query"
-          description: "The tag to associate with the image on the registry."
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/{name}/tag:
-    post:
-      summary: "Tag an image"
-      description: "Tag an image so that it becomes part of a repository."
-      operationId: "ImageTag"
-      responses:
-        201:
-          description: "No error"
-        400:
-          description: "Bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID to tag."
-          type: "string"
-          required: true
-        - name: "repo"
-          in: "query"
-          description: "The repository to tag in. For example, `someuser/someimage`."
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "The name of the new tag."
-          type: "string"
-      tags: ["Image"]
-  /images/{name}:
-    delete:
-      summary: "Remove an image"
-      description: |
-        Remove an image, along with any untagged parent images that were referenced by that image.
-
-        Images can't be removed if they have descendant images, are being used by a running container or are being used by a build.
-      operationId: "ImageDelete"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/ImageDeleteResponse"
-          examples:
-            application/json:
-              - Untagged: "3e2f21a89f"
-              - Deleted: "3e2f21a89f"
-              - Deleted: "53b4f83ac9"
-        404:
-          description: "No such image"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Conflict"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-        - name: "force"
-          in: "query"
-          description: "Remove the image even if it is being used by stopped containers or has other tags"
-          type: "boolean"
-          default: false
-        - name: "noprune"
-          in: "query"
-          description: "Do not delete untagged parent images"
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /images/search:
-    get:
-      summary: "Search images"
-      description: "Search for an image on Docker Hub."
-      operationId: "ImageSearch"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              type: "object"
-              properties:
-                description:
-                  type: "string"
-                is_official:
-                  type: "boolean"
-                is_automated:
-                  type: "boolean"
-                name:
-                  type: "string"
-                star_count:
-                  type: "integer"
-          examples:
-            application/json:
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "wma55/u1210sshd"
-                star_count: 0
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "jdswinbank/sshd"
-                star_count: 0
-              - description: ""
-                is_official: false
-                is_automated: false
-                name: "vgauthier/sshd"
-                star_count: 0
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "term"
-          in: "query"
-          description: "Term to search"
-          type: "string"
-          required: true
-        - name: "limit"
-          in: "query"
-          description: "Maximum number of results to return"
-          type: "integer"
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the images list. Available filters:
-
-            - `stars=<number>`
-            - `is-automated=(true|false)`
-            - `is-official=(true|false)`
-          type: "string"
-      tags: ["Image"]
-  /images/prune:
-    post:
-      summary: "Delete unused images"
-      produces:
-        - "application/json"
-      operationId: "ImagePrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `dangling=<boolean>` When set to `true` (or `1`), prune only
-               unused *and* untagged images. When set to `false`
-               (or `0`), all unused images are pruned.
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ImagesDeleted:
-                description: "Images that were deleted"
-                type: "array"
-                items:
-                  $ref: "#/definitions/ImageDeleteResponse"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Image"]
-  /auth:
-    post:
-      summary: "Check auth configuration"
-      description: "Validate credentials for a registry and, if available, get an identity token for accessing the registry without password."
-      operationId: "SystemAuth"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "An identity token was generated successfully."
-          schema:
-            type: "object"
-            required: [Status]
-            properties:
-              Status:
-                description: "The status of the authentication"
-                type: "string"
-                x-nullable: false
-              IdentityToken:
-                description: "An opaque token used to authenticate a user after a successful login"
-                type: "string"
-                x-nullable: false
-          examples:
-            application/json:
-              Status: "Login Succeeded"
-              IdentityToken: "9cbaf023786cd7..."
-        204:
-          description: "No error"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "authConfig"
-          in: "body"
-          description: "Authentication to check"
-          schema:
-            $ref: "#/definitions/AuthConfig"
-      tags: ["System"]
-  /info:
-    get:
-      summary: "Get system information"
-      operationId: "SystemInfo"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              Architecture:
-                type: "string"
-              Containers:
-                type: "integer"
-              ContainersRunning:
-                type: "integer"
-              ContainersStopped:
-                type: "integer"
-              ContainersPaused:
-                type: "integer"
-              CpuCfsPeriod:
-                type: "boolean"
-              CpuCfsQuota:
-                type: "boolean"
-              Debug:
-                type: "boolean"
-              DiscoveryBackend:
-                type: "string"
-              DockerRootDir:
-                type: "string"
-              Driver:
-                type: "string"
-              DriverStatus:
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-              SystemStatus:
-                type: "array"
-                items:
-                  type: "array"
-                  items:
-                    type: "string"
-              Plugins:
-                type: "object"
-                properties:
-                  Volume:
-                    type: "array"
-                    items:
-                      type: "string"
-                  Network:
-                    type: "array"
-                    items:
-                      type: "string"
-              ExperimentalBuild:
-                type: "boolean"
-              HttpProxy:
-                type: "string"
-              HttpsProxy:
-                type: "string"
-              ID:
-                type: "string"
-              IPv4Forwarding:
-                type: "boolean"
-              Images:
-                type: "integer"
-              IndexServerAddress:
-                type: "string"
-              InitPath:
-                type: "string"
-              InitSha1:
-                type: "string"
-              KernelVersion:
-                type: "string"
-              Labels:
-                type: "array"
-                items:
-                  type: "string"
-              MemTotal:
-                type: "integer"
-              MemoryLimit:
-                type: "boolean"
-              NCPU:
-                type: "integer"
-              NEventsListener:
-                type: "integer"
-              NFd:
-                type: "integer"
-              NGoroutines:
-                type: "integer"
-              Name:
-                type: "string"
-              NoProxy:
-                type: "string"
-              OomKillDisable:
-                type: "boolean"
-              OSType:
-                type: "string"
-              OomScoreAdj:
-                type: "integer"
-              OperatingSystem:
-                type: "string"
-              RegistryConfig:
-                type: "object"
-                properties:
-                  IndexConfigs:
-                    type: "object"
-                    additionalProperties:
-                      type: "object"
-                      properties:
-                        Mirrors:
-                          type: "array"
-                          items:
-                            type: "string"
-                        Name:
-                          type: "string"
-                        Official:
-                          type: "boolean"
-                        Secure:
-                          type: "boolean"
-                  InsecureRegistryCIDRs:
-                    type: "array"
-                    items:
-                      type: "string"
-              SwapLimit:
-                type: "boolean"
-              SystemTime:
-                type: "string"
-              ServerVersion:
-                type: "string"
-          examples:
-            application/json:
-              Architecture: "x86_64"
-              ClusterStore: "etcd://localhost:2379"
-              CgroupDriver: "cgroupfs"
-              Containers: 11
-              ContainersRunning: 7
-              ContainersStopped: 3
-              ContainersPaused: 1
-              CpuCfsPeriod: true
-              CpuCfsQuota: true
-              Debug: false
-              DockerRootDir: "/var/lib/docker"
-              Driver: "btrfs"
-              DriverStatus:
-                -
-                  - ""
-              ExperimentalBuild: false
-              HttpProxy: "http://test:test@localhost:8080"
-              HttpsProxy: "https://test:test@localhost:8080"
-              ID: "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS"
-              IPv4Forwarding: true
-              Images: 16
-              IndexServerAddress: "https://index.docker.io/v1/"
-              InitPath: "/usr/bin/docker"
-              InitSha1: ""
-              KernelMemory: true
-              KernelVersion: "3.12.0-1-amd64"
-              Labels:
-                - "storage=ssd"
-              MemTotal: 2099236864
-              MemoryLimit: true
-              NCPU: 1
-              NEventsListener: 0
-              NFd: 11
-              NGoroutines: 21
-              Name: "prod-server-42"
-              NoProxy: "9.81.1.160"
-              OomKillDisable: true
-              OSType: "linux"
-              OperatingSystem: "Boot2Docker"
-              Plugins:
-                Volume:
-                  - "local"
-                Network:
-                  - "null"
-                  - "host"
-                  - "bridge"
-              RegistryConfig:
-                IndexConfigs:
-                  docker.io:
-                    Name: "docker.io"
-                    Official: true
-                    Secure: true
-                InsecureRegistryCIDRs:
-                  - "127.0.0.0/8"
-              SecurityOptions:
-                - Key: "Name"
-                  Value: "seccomp"
-                - Key: "Profile"
-                  Value: "default"
-                - Key: "Name"
-                  Value: "apparmor"
-                - Key: "Name"
-                  Value: "selinux"
-                - Key: "Name"
-                  Value: "userns"
-              ServerVersion: "1.9.0"
-              SwapLimit: false
-              SystemStatus:
-                -
-                  - "State"
-                  - "Healthy"
-              SystemTime: "2015-03-10T11:11:23.730591467-07:00"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /version:
-    get:
-      summary: "Get version"
-      description: "Returns the version of Docker that is running and various information about the system that Docker is running on."
-      operationId: "SystemVersion"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Version:
-                type: "string"
-              ApiVersion:
-                type: "string"
-              MinAPIVersion:
-                type: "string"
-              GitCommit:
-                type: "string"
-              GoVersion:
-                type: "string"
-              Os:
-                type: "string"
-              Arch:
-                type: "string"
-              KernelVersion:
-                type: "string"
-              Experimental:
-                type: "boolean"
-              BuildTime:
-                type: "string"
-          examples:
-            application/json:
-              Version: "1.13.0"
-              Os: "linux"
-              KernelVersion: "3.19.0-23-generic"
-              GoVersion: "go1.6.3"
-              GitCommit: "deadbee"
-              Arch: "amd64"
-              ApiVersion: "1.25"
-              MinAPIVersion: "1.12"
-              BuildTime: "2016-06-14T07:09:13.444803460+00:00"
-              Experimental: true
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /_ping:
-    get:
-      summary: "Ping"
-      description: "This is a dummy endpoint you can use to test if the server is accessible."
-      operationId: "SystemPing"
-      produces:
-        - "text/plain"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            example: "OK"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /commit:
-    post:
-      summary: "Create a new image from a container"
-      operationId: "ImageCommit"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/IdResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "containerConfig"
-          in: "body"
-          description: "The container configuration"
-          schema:
-            $ref: "#/definitions/Config"
-        - name: "container"
-          in: "query"
-          description: "The ID or name of the container to commit"
-          type: "string"
-        - name: "repo"
-          in: "query"
-          description: "Repository name for the created image"
-          type: "string"
-        - name: "tag"
-          in: "query"
-          description: "Tag name for the create image"
-          type: "string"
-        - name: "comment"
-          in: "query"
-          description: "Commit message"
-          type: "string"
-        - name: "author"
-          in: "query"
-          description: "Author of the image (e.g., `John Hannibal Smith <hannibal@a-team.com>`)"
-          type: "string"
-        - name: "pause"
-          in: "query"
-          description: "Whether to pause the container before committing"
-          type: "boolean"
-          default: true
-        - name: "changes"
-          in: "query"
-          description: "`Dockerfile` instructions to apply while committing"
-          type: "string"
-      tags: ["Image"]
-  /events:
-    get:
-      summary: "Monitor events"
-      description: |
-        Stream real-time events from the server.
-
-        Various objects within Docker report events when something happens to them.
-
-        Containers report these events: `attach, commit, copy, create, destroy, detach, die, exec_create, exec_detach, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update`
-
-        Images report these events: `delete, import, load, pull, push, save, tag, untag`
-
-        Volumes report these events: `create, mount, unmount, destroy`
-
-        Networks report these events: `create, connect, disconnect, destroy`
-
-        The Docker daemon reports these events: `reload`
-
-      operationId: "SystemEvents"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              Type:
-                description: "The type of object emitting the event"
-                type: "string"
-              Action:
-                description: "The type of event"
-                type: "string"
-              Actor:
-                type: "object"
-                properties:
-                  ID:
-                    description: "The ID of the object emitting the event"
-                    type: "string"
-                  Attributes:
-                    description: "Various key/value attributes of the object, depending on its type"
-                    type: "object"
-                    additionalProperties:
-                      type: "string"
-              time:
-                description: "Timestamp of event"
-                type: "integer"
-              timeNano:
-                description: "Timestamp of event, with nanosecond accuracy"
-                type: "integer"
-                format: "int64"
-          examples:
-            application/json:
-              Type: "container"
-              Action: "create"
-              Actor:
-                ID: "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743"
-                Attributes:
-                  com.example.some-label: "some-label-value"
-                  image: "alpine"
-                  name: "my-container"
-              time: 1461943101
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "since"
-          in: "query"
-          description: "Show events created since this timestamp then stream new events."
-          type: "string"
-        - name: "until"
-          in: "query"
-          description: "Show events created until this timestamp then stop streaming."
-          type: "string"
-        - name: "filters"
-          in: "query"
-          description: |
-            A JSON encoded value of filters (a `map[string][]string`) to process on the event list. Available filters:
-
-            - `container=<string>` container name or ID
-            - `event=<string>` event type
-            - `image=<string>` image name or ID
-            - `label=<string>` image or container label
-            - `type=<string>` object to filter by, one of `container`, `image`, `volume`, `network`, or `daemon`
-            - `volume=<string>` volume name or ID
-            - `network=<string>` network name or ID
-            - `daemon=<string>` daemon name or ID
-          type: "string"
-      tags: ["System"]
-  /system/df:
-    get:
-      summary: "Get data usage information"
-      operationId: "SystemDataUsage"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              LayersSize:
-                type: "integer"
-                format: "int64"
-              Images:
-                type: "array"
-                items:
-                  $ref: "#/definitions/ImageSummary"
-              Containers:
-                type: "array"
-                items:
-                  $ref: "#/definitions/ContainerSummary"
-              Volumes:
-                type: "array"
-                items:
-                  $ref: "#/definitions/Volume"
-            example:
-              LayersSize: 1092588
-              Images:
-                -
-                  Id: "sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749"
-                  ParentId: ""
-                  RepoTags:
-                    - "busybox:latest"
-                  RepoDigests:
-                    - "busybox@sha256:a59906e33509d14c036c8678d687bd4eec81ed7c4b8ce907b888c607f6a1e0e6"
-                  Created: 1466724217
-                  Size: 1092588
-                  SharedSize: 0
-                  VirtualSize: 1092588
-                  Labels: {}
-                  Containers: 1
-              Containers:
-                -
-                  Id: "e575172ed11dc01bfce087fb27bee502db149e1a0fad7c296ad300bbff178148"
-                  Names:
-                    - "/top"
-                  Image: "busybox"
-                  ImageID: "sha256:2b8fd9751c4c0f5dd266fcae00707e67a2545ef34f9a29354585f93dac906749"
-                  Command: "top"
-                  Created: 1472592424
-                  Ports: []
-                  SizeRootFs: 1092588
-                  Labels: {}
-                  State: "exited"
-                  Status: "Exited (0) 56 minutes ago"
-                  HostConfig:
-                    NetworkMode: "default"
-                  NetworkSettings:
-                    Networks:
-                      bridge:
-                        IPAMConfig: null
-                        Links: null
-                        Aliases: null
-                        NetworkID: "d687bc59335f0e5c9ee8193e5612e8aee000c8c62ea170cfb99c098f95899d92"
-                        EndpointID: "8ed5115aeaad9abb174f68dcf135b49f11daf597678315231a32ca28441dec6a"
-                        Gateway: "172.18.0.1"
-                        IPAddress: "172.18.0.2"
-                        IPPrefixLen: 16
-                        IPv6Gateway: ""
-                        GlobalIPv6Address: ""
-                        GlobalIPv6PrefixLen: 0
-                        MacAddress: "02:42:ac:12:00:02"
-                  Mounts: []
-              Volumes:
-                -
-                  Name: "my-volume"
-                  Driver: "local"
-                  Mountpoint: ""
-                  Labels: null
-                  Scope: ""
-                  Options: null
-                  UsageData:
-                    Size: 0
-                    RefCount: 0
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["System"]
-  /images/{name}/get:
-    get:
-      summary: "Export an image"
-      description: |
-        Get a tarball containing all images and metadata for a repository.
-
-        If `name` is a specific name and tag (e.g. `ubuntu:latest`), then only that image (and its parents) are returned. If `name` is an image ID, similarly only that image (and its parents) are returned, but with the exclusion of the `repositories` file in the tarball, as there were no image names referenced.
-
-        ### Image tarball format
-
-        An image tarball contains one directory per image layer (named using its long ID), each containing these files:
-
-        - `VERSION`: currently `1.0` - the file format version
-        - `json`: detailed layer information, similar to `docker inspect layer_id`
-        - `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-        The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories for storing attribute changes and deletions.
-
-        If the tarball defines a repository, the tarball should also include a `repositories` file at the root that contains a list of repository and tag names mapped to layer IDs.
-
-        ```json
-        {
-          "hello-world": {
-            "latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"
-          }
-        }
-        ```
-      operationId: "ImageGet"
-      produces:
-        - "application/x-tar"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            format: "binary"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "Image name or ID"
-          type: "string"
-          required: true
-      tags: ["Image"]
-  /images/get:
-    get:
-      summary: "Export several images"
-      description: |
-        Get a tarball containing all images and metadata for several image repositories.
-
-        For each value of the `names` parameter: if it is a specific name and tag (e.g. `ubuntu:latest`), then only that image (and its parents) are returned; if it is an image ID, similarly only that image (and its parents) are returned and there would be no names referenced in the 'repositories' file for this image ID.
-
-        For details on the format, see [the export image endpoint](#operation/ImageGet).
-      operationId: "ImageGetAll"
-      produces:
-        - "application/x-tar"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "string"
-            format: "binary"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "names"
-          in: "query"
-          description: "Image names to filter by"
-          type: "array"
-          items:
-            type: "string"
-      tags: ["Image"]
-  /images/load:
-    post:
-      summary: "Import images"
-      description: |
-        Load a set of images and tags into a repository.
-
-        For details on the format, see [the export image endpoint](#operation/ImageGet).
-      operationId: "ImageLoad"
-      consumes:
-        - "application/x-tar"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "imagesTarball"
-          in: "body"
-          description: "Tar archive containing images"
-          schema:
-            type: "string"
-            format: "binary"
-        - name: "quiet"
-          in: "query"
-          description: "Suppress progress details during load."
-          type: "boolean"
-          default: false
-      tags: ["Image"]
-  /containers/{id}/exec:
-    post:
-      summary: "Create an exec instance"
-      description: "Run a command inside a running container."
-      operationId: "ContainerExec"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/IdResponse"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        409:
-          description: "container is paused"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "execConfig"
-          in: "body"
-          description: "Exec configuration"
-          schema:
-            type: "object"
-            properties:
-              AttachStdin:
-                type: "boolean"
-                description: "Attach to `stdin` of the exec command."
-              AttachStdout:
-                type: "boolean"
-                description: "Attach to `stdout` of the exec command."
-              AttachStderr:
-                type: "boolean"
-                description: "Attach to `stderr` of the exec command."
-              DetachKeys:
-                type: "string"
-                description: "Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`."
-              Tty:
-                type: "boolean"
-                description: "Allocate a pseudo-TTY."
-              Env:
-                description: "A list of environment variables in the form `[\"VAR=value\", ...]`."
-                type: "array"
-                items:
-                  type: "string"
-              Cmd:
-                type: "array"
-                description: "Command to run, as a string or array of strings."
-                items:
-                  type: "string"
-              Privileged:
-                type: "boolean"
-                description: "Runs the exec process with extended privileges."
-                default: false
-              User:
-                type: "string"
-                description: "The user, and optionally, group to run the exec process inside the container. Format is one of: `user`, `user:group`, `uid`, or `uid:gid`."
-            example:
-              AttachStdin: false
-              AttachStdout: true
-              AttachStderr: true
-              DetachKeys: "ctrl-p,ctrl-q"
-              Tty: false
-              Cmd:
-                - "date"
-              Env:
-                - "FOO=bar"
-                - "BAZ=quux"
-          required: true
-        - name: "id"
-          in: "path"
-          description: "ID or name of container"
-          type: "string"
-          required: true
-      tags: ["Exec"]
-  /exec/{id}/start:
-    post:
-      summary: "Start an exec instance"
-      description: "Starts a previously set up exec instance. If detach is true, this endpoint returns immediately after starting the command. Otherwise, it sets up an interactive session with the command."
-      operationId: "ExecStart"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/vnd.docker.raw-stream"
-      responses:
-        200:
-          description: "No error"
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Container is stopped or paused"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "execStartConfig"
-          in: "body"
-          schema:
-            type: "object"
-            properties:
-              Detach:
-                type: "boolean"
-                description: "Detach from the command."
-              Tty:
-                type: "boolean"
-                description: "Allocate a pseudo-TTY."
-            example:
-              Detach: false
-              Tty: false
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-      tags: ["Exec"]
-  /exec/{id}/resize:
-    post:
-      summary: "Resize an exec instance"
-      description: "Resize the TTY session used by an exec instance. This endpoint only works if `tty` was specified as part of creating and starting the exec instance."
-      operationId: "ExecResize"
-      responses:
-        201:
-          description: "No error"
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-        - name: "h"
-          in: "query"
-          description: "Height of the TTY session in characters"
-          type: "integer"
-        - name: "w"
-          in: "query"
-          description: "Width of the TTY session in characters"
-          type: "integer"
-      tags: ["Exec"]
-  /exec/{id}/json:
-    get:
-      summary: "Inspect an exec instance"
-      description: "Return low-level information about an exec instance."
-      operationId: "ExecInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                type: "string"
-              Running:
-                type: "boolean"
-              ExitCode:
-                type: "integer"
-              ProcessConfig:
-                $ref: "#/definitions/ProcessConfig"
-              OpenStdin:
-                type: "boolean"
-              OpenStderr:
-                type: "boolean"
-              OpenStdout:
-                type: "boolean"
-              ContainerID:
-                type: "string"
-              Pid:
-                type: "integer"
-                description: "The system process ID for the exec process."
-          examples:
-            application/json:
-              CanRemove: false
-              ContainerID: "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126"
-              DetachKeys: ""
-              ExitCode: 2
-              ID: "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b"
-              OpenStderr: true
-              OpenStdin: true
-              OpenStdout: true
-              ProcessConfig:
-                arguments:
-                  - "-c"
-                  - "exit 2"
-                entrypoint: "sh"
-                privileged: false
-                tty: true
-                user: "1000"
-              Running: false
-              Pid: 42000
-        404:
-          description: "No such exec instance"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Exec instance ID"
-          required: true
-          type: "string"
-      tags: ["Exec"]
-
-  /volumes:
-    get:
-      summary: "List volumes"
-      operationId: "VolumeList"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "Summary volume data that matches the query"
-          schema:
-            type: "object"
-            required: [Volumes, Warnings]
-            properties:
-              Volumes:
-                type: "array"
-                x-nullable: false
-                description: "List of volumes"
-                items:
-                  $ref: "#/definitions/Volume"
-              Warnings:
-                type: "array"
-                x-nullable: false
-                description: "Warnings that occurred when fetching the list of volumes"
-                items:
-                  type: "string"
-
-          examples:
-            application/json:
-              Volumes:
-                - Name: "tardis"
-                  Driver: "local"
-                  Mountpoint: "/var/lib/docker/volumes/tardis"
-                  Labels:
-                    com.example.some-label: "some-value"
-                    com.example.some-other-label: "some-other-value"
-                  Scope: "local"
-                  Options:
-                    device: "tmpfs"
-                    o: "size=100m,uid=1000"
-                    type: "tmpfs"
-              Warnings: []
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            JSON encoded value of the filters (a `map[string][]string`) to
-            process on the volumes list. Available filters:
-
-            - `name=<volume-name>` Matches all or part of a volume name.
-            - `dangling=<boolean>` When set to `true` (or `1`), returns all
-               volumes that are not in use by a container. When set to `false`
-               (or `0`), only volumes that are in use by one or more
-               containers are returned.
-            - `driver=<volume-driver-name>` Matches all or part of a volume
-              driver name.
-          type: "string"
-          format: "json"
-      tags: ["Volume"]
-
-  /volumes/create:
-    post:
-      summary: "Create a volume"
-      operationId: "VolumeCreate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        201:
-          description: "The volume was created successfully"
-          schema:
-            $ref: "#/definitions/Volume"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "volumeConfig"
-          in: "body"
-          required: true
-          description: "Volume configuration"
-          schema:
-            type: "object"
-            properties:
-              Name:
-                description: "The new volume's name. If not specified, Docker generates a name."
-                type: "string"
-                x-nullable: false
-              Driver:
-                description: "Name of the volume driver to use."
-                type: "string"
-                default: "local"
-                x-nullable: false
-              DriverOpts:
-                description: "A mapping of driver options and values. These options are passed directly to the driver and are driver specific."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Labels:
-                description: "User-defined key/value metadata."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-            example:
-              Name: "tardis"
-              Labels:
-                com.example.some-label: "some-value"
-                com.example.some-other-label: "some-other-value"
-              Driver: "custom"
-      tags: ["Volume"]
-
-  /volumes/{name}:
-    get:
-      summary: "Inspect a volume"
-      operationId: "VolumeInspect"
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Volume"
-        404:
-          description: "No such volume"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          required: true
-          description: "Volume name or ID"
-          type: "string"
-      tags: ["Volume"]
-
-    delete:
-      summary: "Remove a volume"
-      description: "Instruct the driver to remove the volume."
-      operationId: "VolumeDelete"
-      responses:
-        204:
-          description: "The volume was removed"
-        404:
-          description: "No such volume or volume driver"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "Volume is in use and cannot be removed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          required: true
-          description: "Volume name or ID"
-          type: "string"
-        - name: "force"
-          in: "query"
-          description: "Force the removal of the volume"
-          type: "boolean"
-          default: false
-      tags: ["Volume"]
-  /volumes/prune:
-    post:
-      summary: "Delete unused volumes"
-      produces:
-        - "application/json"
-      operationId: "VolumePrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              VolumesDeleted:
-                description: "Volumes that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-              SpaceReclaimed:
-                description: "Disk space reclaimed in bytes"
-                type: "integer"
-                format: "int64"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Volume"]
-  /networks:
-    get:
-      summary: "List networks"
-      operationId: "NetworkList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Network"
-          examples:
-            application/json:
-              - Name: "bridge"
-                Id: "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566"
-                Created: "2016-10-19T06:21:00.416543526Z"
-                Scope: "local"
-                Driver: "bridge"
-                EnableIPv6: false
-                Internal: false
-                IPAM:
-                  Driver: "default"
-                  Config:
-                    -
-                      Subnet: "172.17.0.0/16"
-                Containers:
-                  39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867:
-                    EndpointID: "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda"
-                    MacAddress: "02:42:ac:11:00:02"
-                    IPv4Address: "172.17.0.2/16"
-                    IPv6Address: ""
-                Options:
-                  com.docker.network.bridge.default_bridge: "true"
-                  com.docker.network.bridge.enable_icc: "true"
-                  com.docker.network.bridge.enable_ip_masquerade: "true"
-                  com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-                  com.docker.network.bridge.name: "docker0"
-                  com.docker.network.driver.mtu: "1500"
-              - Name: "none"
-                Id: "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794"
-                Created: "0001-01-01T00:00:00Z"
-                Scope: "local"
-                Driver: "null"
-                EnableIPv6: false
-                Internal: false
-                IPAM:
-                  Driver: "default"
-                  Config: []
-                Containers: {}
-                Options: {}
-              - Name: "host"
-                Id: "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e"
-                Created: "0001-01-01T00:00:00Z"
-                Scope: "local"
-                Driver: "host"
-                EnableIPv6: false
-                Internal: false
-                IPAM:
-                  Driver: "default"
-                  Config: []
-                Containers: {}
-                Options: {}
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            JSON encoded value of the filters (a `map[string][]string`) to process on the networks list. Available filters:
-
-            - `driver=<driver-name>` Matches a network's driver.
-            - `id=<network-id>` Matches all or part of a network ID.
-            - `label=<key>` or `label=<key>=<value>` of a network label.
-            - `name=<network-name>` Matches all or part of a network name.
-            - `type=["custom"|"builtin"]` Filters networks by type. The `custom` keyword returns all user-defined networks.
-          type: "string"
-      tags: ["Network"]
-
-  /networks/{id}:
-    get:
-      summary: "Inspect a network"
-      operationId: "NetworkInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            $ref: "#/definitions/Network"
-        404:
-          description: "Network not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-      tags: ["Network"]
-
-    delete:
-      summary: "Remove a network"
-      operationId: "NetworkDelete"
-      responses:
-        204:
-          description: "No error"
-        404:
-          description: "no such network"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-      tags: ["Network"]
-
-  /networks/create:
-    post:
-      summary: "Create a network"
-      operationId: "NetworkCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              Id:
-                description: "The ID of the created network."
-                type: "string"
-              Warning:
-                type: "string"
-            example:
-              Id: "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30"
-              Warning: ""
-        403:
-          description: "operation not supported for pre-defined networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "plugin not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "networkConfig"
-          in: "body"
-          description: "Network configuration"
-          required: true
-          schema:
-            type: "object"
-            required: ["Name"]
-            properties:
-              Name:
-                description: "The network's name."
-                type: "string"
-              CheckDuplicate:
-                description: "Check for networks with duplicate names."
-                type: "boolean"
-              Driver:
-                description: "Name of the network driver plugin to use."
-                type: "string"
-                default: "bridge"
-              Internal:
-                description: "Restrict external access to the network."
-                type: "boolean"
-              IPAM:
-                description: "Optional custom IP scheme for the network."
-                $ref: "#/definitions/IPAM"
-              EnableIPv6:
-                description: "Enable IPv6 on the network."
-                type: "boolean"
-              Options:
-                description: "Network specific options to be used by the drivers."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-              Labels:
-                description: "User-defined key/value metadata."
-                type: "object"
-                additionalProperties:
-                  type: "string"
-            example:
-              Name: "isolated_nw"
-              CheckDuplicate: false
-              Driver: "bridge"
-              EnableIPv6: true
-              IPAM:
-                Driver: "default"
-                Config:
-                  - Subnet: "172.20.0.0/16"
-                    IPRange: "172.20.10.0/24"
-                    Gateway: "172.20.10.11"
-                  - Subnet: "2001:db8:abcd::/64"
-                    Gateway: "2001:db8:abcd::1011"
-                Options:
-                  foo: "bar"
-              Internal: true
-              Options:
-                com.docker.network.bridge.default_bridge: "true"
-                com.docker.network.bridge.enable_icc: "true"
-                com.docker.network.bridge.enable_ip_masquerade: "true"
-                com.docker.network.bridge.host_binding_ipv4: "0.0.0.0"
-                com.docker.network.bridge.name: "docker0"
-                com.docker.network.driver.mtu: "1500"
-              Labels:
-                com.example.some-label: "some-value"
-                com.example.some-other-label: "some-other-value"
-      tags: ["Network"]
-
-  /networks/{id}/connect:
-    post:
-      summary: "Connect a container to a network"
-      operationId: "NetworkConnect"
-      consumes:
-        - "application/octet-stream"
-      responses:
-        200:
-          description: "No error"
-        403:
-          description: "Operation not supported for swarm scoped networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "Network or container not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-        - name: "container"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              Container:
-                type: "string"
-                description: "The ID or name of the container to connect to the network."
-              EndpointConfig:
-                $ref: "#/definitions/EndpointSettings"
-            example:
-              Container: "3613f73ba0e4"
-              EndpointConfig:
-                IPAMConfig:
-                  IPv4Address: "172.24.56.89"
-                  IPv6Address: "2001:db8::5689"
-      tags: ["Network"]
-
-  /networks/{id}/disconnect:
-    post:
-      summary: "Disconnect a container from a network"
-      operationId: "NetworkDisconnect"
-      consumes:
-        - "application/json"
-      responses:
-        200:
-          description: "No error"
-        403:
-          description: "Operation not supported for swarm scoped networks"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        404:
-          description: "Network or container not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "Network ID or name"
-          required: true
-          type: "string"
-        - name: "container"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              Container:
-                type: "string"
-                description: "The ID or name of the container to disconnect from the network."
-              Force:
-                type: "boolean"
-                description: "Force the container to disconnect from the network."
-      tags: ["Network"]
-  /networks/prune:
-    post:
-      summary: "Delete unused networks"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      operationId: "NetworkPrune"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the prune list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-          type: "string"
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "object"
-            properties:
-              NetworksDeleted:
-                description: "Networks that were deleted"
-                type: "array"
-                items:
-                  type: "string"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Network"]
-  /plugins:
-    get:
-      summary: "List plugins"
-      operationId: "PluginList"
-      description: "Returns information about installed plugins."
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "No error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Plugin"
-            example:
-              - Id: "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078"
-                Name: "tiborvass/sample-volume-plugin"
-                Tag: "latest"
-                Active: true
-                Settings:
-                  Env:
-                    - "DEBUG=0"
-                  Args: null
-                  Devices: null
-                Config:
-                  Description: "A sample volume plugin for Docker"
-                  Documentation: "https://docs.docker.com/engine/extend/plugins/"
-                  Interface:
-                    Types:
-                      - "docker.volumedriver/1.0"
-                    Socket: "plugins.sock"
-                  Entrypoint:
-                    - "/usr/bin/sample-volume-plugin"
-                    - "/data"
-                  WorkDir: ""
-                  User: {}
-                  Network:
-                    Type: ""
-                  Linux:
-                    Capabilities: null
-                    AllowAllDevices: false
-                    Devices: null
-                  Mounts: null
-                  PropagatedMount: "/data"
-                  Env:
-                    - Name: "DEBUG"
-                      Description: "If set, prints debug messages"
-                      Settable: null
-                      Value: "0"
-                  Args:
-                    Name: "args"
-                    Description: "command line arguments"
-                    Settable: null
-                    Value: []
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Plugin"]
-
-  /plugins/privileges:
-    get:
-      summary: "Get plugin privileges"
-      operationId: "GetPluginPrivileges"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission the user has to accept upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "query"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags:
-        - "Plugin"
-
-  /plugins/pull:
-    post:
-      summary: "Install a plugin"
-      operationId: "PluginPull"
-      description: |
-        Pulls and installs a plugin. After the plugin is installed, it can be enabled using the [`POST /plugins/{name}/enable` endpoint](#operation/PostPluginsEnable).
-      produces:
-        - "application/json"
-      responses:
-        204:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "remote"
-          in: "query"
-          description: |
-            Remote reference for plugin to install.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: true
-          type: "string"
-        - name: "name"
-          in: "query"
-          description: |
-            Local name for the pulled plugin.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: false
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration to use when pulling a plugin from a registry. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission accepted by the user upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-      tags: ["Plugin"]
-  /plugins/{name}/json:
-    get:
-      summary: "Inspect a plugin"
-      operationId: "PluginInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Plugin"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags: ["Plugin"]
-  /plugins/{name}:
-    delete:
-      summary: "Remove a plugin"
-      operationId: "PluginDelete"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Plugin"
-        404:
-          description: "plugin is not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "force"
-          in: "query"
-          description: "Disable the plugin before removing. This may result in issues if the plugin is in use by a container."
-          type: "boolean"
-          default: false
-      tags: ["Plugin"]
-  /plugins/{name}/enable:
-    post:
-      summary: "Enable a plugin"
-      operationId: "PluginEnable"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "timeout"
-          in: "query"
-          description: "Set the HTTP client timeout (in seconds)"
-          type: "integer"
-          default: 0
-      tags: ["Plugin"]
-  /plugins/{name}/disable:
-    post:
-      summary: "Disable a plugin"
-      operationId: "PluginDisable"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      tags: ["Plugin"]
-  /plugins/{name}/upgrade:
-    post:
-      summary: "Upgrade a plugin"
-      operationId: "PluginUpgrade"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "remote"
-          in: "query"
-          description: |
-            Remote reference to upgrade to.
-
-            The `:latest` tag is optional, and is used as the default if omitted.
-          required: true
-          type: "string"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration to use when pulling a plugin from a registry. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              description: "Describes a permission accepted by the user upon installing the plugin."
-              type: "object"
-              properties:
-                Name:
-                  type: "string"
-                Description:
-                  type: "string"
-                Value:
-                  type: "array"
-                  items:
-                    type: "string"
-            example:
-              - Name: "network"
-                Description: ""
-                Value:
-                  - "host"
-              - Name: "mount"
-                Description: ""
-                Value:
-                  - "/data"
-              - Name: "device"
-                Description: ""
-                Value:
-                  - "/dev/cpu_dma_latency"
-      tags: ["Plugin"]
-  /plugins/create:
-    post:
-      summary: "Create a plugin"
-      operationId: "PluginCreate"
-      consumes:
-        - "application/x-tar"
-      responses:
-        204:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "name"
-          in: "query"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "tarContext"
-          in: "body"
-          description: "Path to tar containing plugin rootfs and manifest"
-          schema:
-            type: "string"
-            format: "binary"
-      tags: ["Plugin"]
-  /plugins/{name}/push:
-    post:
-      summary: "Push a plugin"
-      operationId: "PluginPush"
-      description: |
-        Push a plugin to the registry.
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Plugin"]
-  /plugins/{name}/set:
-    post:
-      summary: "Configure a plugin"
-      operationId: "PluginSet"
-      consumes:
-        - "application/json"
-      parameters:
-        - name: "name"
-          in: "path"
-          description: "The name of the plugin. The `:latest` tag is optional, and is the default if omitted."
-          required: true
-          type: "string"
-        - name: "body"
-          in: "body"
-          schema:
-            type: "array"
-            items:
-              type: "string"
-            example: ["DEBUG=1"]
-      responses:
-        204:
-          description: "No error"
-        404:
-          description: "Plugin not installed"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "Server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Plugin"]
-  /nodes:
-    get:
-      summary: "List nodes"
-      operationId: "NodeList"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Node"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          description: |
-            Filters to process on the nodes list, encoded as JSON (a `map[string][]string`).
-
-            Available filters:
-            - `id=<node id>`
-            - `label=<engine label>`
-            - `membership=`(`accepted`|`pending`)`
-            - `name=<node name>`
-            - `role=`(`manager`|`worker`)`
-          type: "string"
-      tags: ["Node"]
-  /nodes/{id}:
-    get:
-      summary: "Inspect a node"
-      operationId: "NodeInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Node"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID or name of the node"
-          type: "string"
-          required: true
-      tags: ["Node"]
-    delete:
-      summary: "Delete a node"
-      operationId: "NodeDelete"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID or name of the node"
-          type: "string"
-          required: true
-        - name: "force"
-          in: "query"
-          description: "Force remove a node from the swarm"
-          default: false
-          type: "boolean"
-      tags: ["Node"]
-  /nodes/{id}/update:
-    post:
-      summary: "Update a node"
-      operationId: "NodeUpdate"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such node"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID of the node"
-          type: "string"
-          required: true
-        - name: "body"
-          in: "body"
-          schema:
-            $ref: "#/definitions/NodeSpec"
-        - name: "version"
-          in: "query"
-          description: "The version number of the node object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-      tags: ["Node"]
-  /swarm:
-    get:
-      summary: "Inspect swarm"
-      operationId: "SwarmInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            allOf:
-              - $ref: "#/definitions/ClusterInfo"
-              - type: "object"
-                properties:
-                  JoinTokens:
-                    description: "The tokens workers and managers need to join the swarm."
-                    type: "object"
-                    properties:
-                      Worker:
-                        description: "The token workers can use to join the swarm."
-                        type: "string"
-                      Manager:
-                        description: "The token managers can use to join the swarm."
-                        type: "string"
-            example:
-              CreatedAt: "2016-08-15T16:00:20.349727406Z"
-              Spec:
-                Dispatcher:
-                  HeartbeatPeriod: 5000000000
-                Orchestration:
-                  TaskHistoryRetentionLimit: 10
-                CAConfig:
-                  NodeCertExpiry: 7776000000000000
-                Raft:
-                  LogEntriesForSlowFollowers: 500
-                  HeartbeatTick: 1
-                  SnapshotInterval: 10000
-                  ElectionTick: 3
-                TaskDefaults: {}
-                EncryptionConfig:
-                  AutoLockManagers: false
-                Name: "default"
-              JoinTokens:
-                Worker: "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-6qmn92w6bu3jdvnglku58u11a"
-                Manager: "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-8llk83c4wm9lwioey2s316r9l"
-              ID: "70ilmkj2f6sp2137c753w2nmt"
-              UpdatedAt: "2016-08-15T16:32:09.623207604Z"
-              Version:
-                Index: 51
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /swarm/init:
-    post:
-      summary: "Initialize a new swarm"
-      operationId: "SwarmInit"
-      produces:
-        - "application/json"
-        - "text/plain"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            description: "The node ID"
-            type: "string"
-            example: "7v2t30z9blmxuhnyo6s4cpenp"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        406:
-          description: "node is already part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              ListenAddr:
-                description: "Listen address used for inter-manager communication, as well as determining the networking interface used for the VXLAN Tunnel Endpoint (VTEP). This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the default swarm listening port is used."
-                type: "string"
-              AdvertiseAddr:
-                description: "Externally reachable address advertised to other nodes. This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the port number from the listen address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when possible."
-                type: "string"
-              ForceNewCluster:
-                description: "Force creation of a new swarm."
-                type: "boolean"
-              Spec:
-                $ref: "#/definitions/SwarmSpec"
-            example:
-              ListenAddr: "0.0.0.0:2377"
-              AdvertiseAddr: "192.168.1.1:2377"
-              ForceNewCluster: false
-              Spec:
-                Orchestration: {}
-                Raft: {}
-                Dispatcher: {}
-                CAConfig: {}
-                EncryptionConfig:
-                  AutoLockManagers: false
-      tags: ["Swarm"]
-  /swarm/join:
-    post:
-      summary: "Join an existing swarm"
-      operationId: "SwarmJoin"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is already part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              ListenAddr:
-                description: "Listen address used for inter-manager communication if the node gets promoted to manager, as well as determining the networking interface used for the VXLAN Tunnel Endpoint (VTEP)."
-                type: "string"
-              AdvertiseAddr:
-                description: "Externally reachable address advertised to other nodes. This can either be an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port number, like `eth0:4567`. If the port number is omitted, the port number from the listen address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when possible."
-                type: "string"
-              RemoteAddrs:
-                description: "Addresses of manager nodes already participating in the swarm."
-                type: "string"
-              JoinToken:
-                description: "Secret token for joining this swarm."
-                type: "string"
-            example:
-              ListenAddr: "0.0.0.0:2377"
-              AdvertiseAddr: "192.168.1.1:2377"
-              RemoteAddrs:
-                - "node1:2377"
-              JoinToken: "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-      tags: ["Swarm"]
-  /swarm/leave:
-    post:
-      summary: "Leave a swarm"
-      operationId: "SwarmLeave"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "force"
-          description: "Force leave swarm, even if this is the last manager or that it will break the cluster."
-          in: "query"
-          type: "boolean"
-          default: false
-      tags: ["Swarm"]
-  /swarm/update:
-    post:
-      summary: "Update a swarm"
-      operationId: "SwarmUpdate"
-      responses:
-        200:
-          description: "no error"
-        400:
-          description: "bad parameter"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            $ref: "#/definitions/SwarmSpec"
-        - name: "version"
-          in: "query"
-          description: "The version number of the swarm object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-        - name: "rotateWorkerToken"
-          in: "query"
-          description: "Rotate the worker join token."
-          type: "boolean"
-          default: false
-        - name: "rotateManagerToken"
-          in: "query"
-          description: "Rotate the manager join token."
-          type: "boolean"
-          default: false
-        - name: "rotateManagerUnlockKey"
-          in: "query"
-          description: "Rotate the manager unlock key."
-          type: "boolean"
-          default: false
-      tags: ["Swarm"]
-  /swarm/unlockkey:
-    get:
-      summary: "Get the unlock key"
-      operationId: "SwarmUnlockkey"
-      consumes:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              UnlockKey:
-                description: "The swarm's unlock key."
-                type: "string"
-            example:
-              UnlockKey: "SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /swarm/unlock:
-    post:
-      summary: "Unlock a locked manager"
-      operationId: "SwarmUnlock"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            type: "object"
-            properties:
-              UnlockKey:
-                description: "The swarm's unlock key."
-                type: "string"
-            example:
-              UnlockKey: "SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8"
-      responses:
-        200:
-          description: "no error"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      tags: ["Swarm"]
-  /services:
-    get:
-      summary: "List services"
-      operationId: "ServiceList"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Service"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the services list. Available filters:
-
-            - `id=<service id>`
-            - `name=<service name>`
-            - `label=<service label>`
-      tags: ["Service"]
-  /services/create:
-    post:
-      summary: "Create a service"
-      operationId: "ServiceCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                description: "The ID of the created service."
-                type: "string"
-              Warning:
-                description: "Optional warning message"
-                type: "string"
-            example:
-              ID: "ak7w3gjqoa3kuz8xcpnyy0pvl"
-              Warning: "unable to pin image doesnotexist:latest to digest: image library/doesnotexist:latest not found"
-        403:
-          description: "network is not eligible for services"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "name conflicts with an existing service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        503:
-          description: "server error or node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/ServiceSpec"
-              - type: "object"
-                example:
-                  Name: "web"
-                  TaskTemplate:
-                    ContainerSpec:
-                      Image: "nginx:alpine"
-                      Mounts:
-                        -
-                          ReadOnly: true
-                          Source: "web-data"
-                          Target: "/usr/share/nginx/html"
-                          Type: "volume"
-                          VolumeOptions:
-                            DriverConfig: {}
-                            Labels:
-                              com.example.something: "something-value"
-                      User: "33"
-                      DNSConfig:
-                        Nameservers: ["8.8.8.8"]
-                        Search: ["example.org"]
-                        Options: ["timeout:3"]
-                    LogDriver:
-                      Name: "json-file"
-                      Options:
-                        max-file: "3"
-                        max-size: "10M"
-                    Placement: {}
-                    Resources:
-                      Limits:
-                        MemoryBytes: 104857600
-                      Reservations: {}
-                    RestartPolicy:
-                      Condition: "on-failure"
-                      Delay: 10000000000
-                      MaxAttempts: 10
-                  Mode:
-                    Replicated:
-                      Replicas: 4
-                  UpdateConfig:
-                    Delay: 30000000000
-                    Parallelism: 2
-                    FailureAction: "pause"
-                  EndpointSpec:
-                    Ports:
-                      -
-                        Protocol: "tcp"
-                        PublishedPort: 8080
-                        TargetPort: 80
-                  Labels:
-                    foo: "bar"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration for pulling from private registries. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-      tags: ["Service"]
-  /services/{id}:
-    get:
-      summary: "Inspect a service"
-      operationId: "ServiceInspect"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Service"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-      tags: ["Service"]
-    delete:
-      summary: "Delete a service"
-      operationId: "ServiceDelete"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-      tags: ["Service"]
-  /services/{id}/update:
-    post:
-      summary: "Update a service"
-      operationId: "ServiceUpdate"
-      consumes: ["application/json"]
-      produces: ["application/json"]
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/ImageDeleteResponse"
-        404:
-          description: "no such service"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID or name of service."
-          required: true
-          type: "string"
-        - name: "body"
-          in: "body"
-          required: true
-          schema:
-            allOf:
-              - $ref: "#/definitions/ServiceSpec"
-              - type: "object"
-                example:
-                  Name: "top"
-                  TaskTemplate:
-                    ContainerSpec:
-                      Image: "busybox"
-                      Args:
-                        - "top"
-                    Resources:
-                      Limits: {}
-                      Reservations: {}
-                    RestartPolicy:
-                      Condition: "any"
-                      MaxAttempts: 0
-                    Placement: {}
-                    ForceUpdate: 0
-                  Mode:
-                    Replicated:
-                      Replicas: 1
-                  UpdateConfig:
-                    Parallelism: 1
-                    Monitor: 15000000000
-                    MaxFailureRatio: 0.15
-                  EndpointSpec:
-                    Mode: "vip"
-
-        - name: "version"
-          in: "query"
-          description: "The version number of the service object being updated. This is required to avoid conflicting writes."
-          required: true
-          type: "integer"
-        - name: "registryAuthFrom"
-          in: "query"
-          type: "string"
-          description: "If the X-Registry-Auth header is not specified, this
-  parameter indicates where to find registry authorization credentials. The
-  valid values are `spec` and `previous-spec`."
-          default: "spec"
-        - name: "X-Registry-Auth"
-          in: "header"
-          description: "A base64-encoded auth configuration for pulling from private registries. [See the authentication section for details.](#section/Authentication)"
-          type: "string"
-
-      tags: ["Service"]
-  /services/{id}/logs:
-    get:
-      summary: "Get service logs"
-      description: |
-        Get `stdout` and `stderr` logs from a service.
-
-        **Note**: This endpoint works only for services with the `json-file` or `journald` logging drivers.
-      operationId: "ServiceLogs"
-      produces:
-        - "application/vnd.docker.raw-stream"
-        - "application/json"
-      responses:
-        101:
-          description: "logs returned as a stream"
-          schema:
-            type: "string"
-            format: "binary"
-        200:
-          description: "logs returned as a string in response body"
-          schema:
-            type: "string"
-        404:
-          description: "no such container"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-          examples:
-            application/json:
-              message: "No such container: c2ada9df5af8"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          description: "ID or name of the container"
-          type: "string"
-        - name: "details"
-          in: "query"
-          description: "Show extra details provided to logs."
-          type: "boolean"
-          default: false
-        - name: "follow"
-          in: "query"
-          description: |
-            Return the logs as a stream.
-
-            This will return a `101` HTTP response with a `Connection: upgrade` header, then hijack the HTTP connection to send raw output. For more information about hijacking and the stream format, [see the documentation for the attach endpoint](#operation/ContainerAttach).
-          type: "boolean"
-          default: false
-        - name: "stdout"
-          in: "query"
-          description: "Return logs from `stdout`"
-          type: "boolean"
-          default: false
-        - name: "stderr"
-          in: "query"
-          description: "Return logs from `stderr`"
-          type: "boolean"
-          default: false
-        - name: "since"
-          in: "query"
-          description: "Only return logs since this time, as a UNIX timestamp"
-          type: "integer"
-          default: 0
-        - name: "timestamps"
-          in: "query"
-          description: "Add timestamps to every log line"
-          type: "boolean"
-          default: false
-        - name: "tail"
-          in: "query"
-          description: "Only return this number of log lines from the end of the logs. Specify as an integer or `all` to output all log lines."
-          type: "string"
-          default: "all"
-      tags: ["Service"]
-  /tasks:
-    get:
-      summary: "List tasks"
-      operationId: "TaskList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Task"
-            example:
-              - ID: "0kzzo1i0y4jz6027t0k7aezc7"
-                Version:
-                  Index: 71
-                CreatedAt: "2016-06-07T21:07:31.171892745Z"
-                UpdatedAt: "2016-06-07T21:07:31.376370513Z"
-                Spec:
-                  ContainerSpec:
-                    Image: "redis"
-                  Resources:
-                    Limits: {}
-                    Reservations: {}
-                  RestartPolicy:
-                    Condition: "any"
-                    MaxAttempts: 0
-                  Placement: {}
-                ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-                Slot: 1
-                NodeID: "60gvrl6tm78dmak4yl7srz94v"
-                Status:
-                  Timestamp: "2016-06-07T21:07:31.290032978Z"
-                  State: "running"
-                  Message: "started"
-                  ContainerStatus:
-                    ContainerID: "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035"
-                    PID: 677
-                DesiredState: "running"
-                NetworksAttachments:
-                  - Network:
-                      ID: "4qvuz4ko70xaltuqbt8956gd1"
-                      Version:
-                        Index: 18
-                      CreatedAt: "2016-06-07T20:31:11.912919752Z"
-                      UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-                      Spec:
-                        Name: "ingress"
-                        Labels:
-                          com.docker.swarm.internal: "true"
-                        DriverConfiguration: {}
-                        IPAMOptions:
-                          Driver: {}
-                          Configs:
-                            - Subnet: "10.255.0.0/16"
-                              Gateway: "10.255.0.1"
-                      DriverState:
-                        Name: "overlay"
-                        Options:
-                          com.docker.network.driver.overlay.vxlanid_list: "256"
-                      IPAMOptions:
-                        Driver:
-                          Name: "default"
-                        Configs:
-                          - Subnet: "10.255.0.0/16"
-                            Gateway: "10.255.0.1"
-                    Addresses:
-                      - "10.255.0.10/16"
-              - ID: "1yljwbmlr8er2waf8orvqpwms"
-                Version:
-                  Index: 30
-                CreatedAt: "2016-06-07T21:07:30.019104782Z"
-                UpdatedAt: "2016-06-07T21:07:30.231958098Z"
-                Name: "hopeful_cori"
-                Spec:
-                  ContainerSpec:
-                    Image: "redis"
-                  Resources:
-                    Limits: {}
-                    Reservations: {}
-                  RestartPolicy:
-                    Condition: "any"
-                    MaxAttempts: 0
-                  Placement: {}
-                ServiceID: "9mnpnzenvg8p8tdbtq4wvbkcz"
-                Slot: 1
-                NodeID: "60gvrl6tm78dmak4yl7srz94v"
-                Status:
-                  Timestamp: "2016-06-07T21:07:30.202183143Z"
-                  State: "shutdown"
-                  Message: "shutdown"
-                  ContainerStatus:
-                    ContainerID: "1cf8d63d18e79668b0004a4be4c6ee58cddfad2dae29506d8781581d0688a213"
-                DesiredState: "shutdown"
-                NetworksAttachments:
-                  - Network:
-                      ID: "4qvuz4ko70xaltuqbt8956gd1"
-                      Version:
-                        Index: 18
-                      CreatedAt: "2016-06-07T20:31:11.912919752Z"
-                      UpdatedAt: "2016-06-07T21:07:29.955277358Z"
-                      Spec:
-                        Name: "ingress"
-                        Labels:
-                          com.docker.swarm.internal: "true"
-                        DriverConfiguration: {}
-                        IPAMOptions:
-                          Driver: {}
-                          Configs:
-                            - Subnet: "10.255.0.0/16"
-                              Gateway: "10.255.0.1"
-                      DriverState:
-                        Name: "overlay"
-                        Options:
-                          com.docker.network.driver.overlay.vxlanid_list: "256"
-                      IPAMOptions:
-                        Driver:
-                          Name: "default"
-                        Configs:
-                          - Subnet: "10.255.0.0/16"
-                            Gateway: "10.255.0.1"
-                    Addresses:
-                      - "10.255.0.5/16"
-
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the tasks list. Available filters:
-
-            - `id=<task id>`
-            - `name=<task name>`
-            - `service=<service name>`
-            - `node=<node id or name>`
-            - `label=key` or `label="key=value"`
-            - `desired-state=(running | shutdown | accepted)`
-      tags: ["Task"]
-  /tasks/{id}:
-    get:
-      summary: "Inspect a task"
-      operationId: "TaskInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Task"
-        404:
-          description: "no such task"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "ID of the task"
-          required: true
-          type: "string"
-      tags: ["Task"]
-  /secrets:
-    get:
-      summary: "List secrets"
-      operationId: "SecretList"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            type: "array"
-            items:
-              $ref: "#/definitions/Secret"
-            example:
-              - ID: "ktnbjxoalbkvbvedmg1urrz8h"
-                Version:
-                  Index: 11
-                CreatedAt: "2016-11-05T01:20:17.327670065Z"
-                UpdatedAt: "2016-11-05T01:20:17.327670065Z"
-                Spec:
-                  Name: "app-dev.crt"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "filters"
-          in: "query"
-          type: "string"
-          description: |
-            A JSON encoded value of the filters (a `map[string][]string`) to process on the secrets list. Available filters:
-
-            - `names=<secret name>`
-      tags: ["Secret"]
-  /secrets/create:
-    post:
-      summary: "Create a secret"
-      operationId: "SecretCreate"
-      consumes:
-        - "application/json"
-      produces:
-        - "application/json"
-      responses:
-        201:
-          description: "no error"
-          schema:
-            type: "object"
-            properties:
-              ID:
-                description: "The ID of the created secret."
-                type: "string"
-            example:
-              ID: "ktnbjxoalbkvbvedmg1urrz8h"
-        406:
-          description: "server error or node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        409:
-          description: "name conflicts with an existing object"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "body"
-          in: "body"
-          schema:
-            allOf:
-              - $ref: "#/definitions/SecretSpec"
-              - type: "object"
-                example:
-                  Name: "app-key.crt"
-                  Labels:
-                    foo: "bar"
-                  Data: "VEhJUyBJUyBOT1QgQSBSRUFMIENFUlRJRklDQVRFCg=="
-      tags: ["Secret"]
-  /secrets/{id}:
-    get:
-      summary: "Inspect a secret"
-      operationId: "SecretInspect"
-      produces:
-        - "application/json"
-      responses:
-        200:
-          description: "no error"
-          schema:
-            $ref: "#/definitions/Secret"
-            example:
-              ID: "ktnbjxoalbkvbvedmg1urrz8h"
-              Version:
-                Index: 11
-              CreatedAt: "2016-11-05T01:20:17.327670065Z"
-              UpdatedAt: "2016-11-05T01:20:17.327670065Z"
-              Spec:
-                Name: "app-dev.crt"
-        404:
-          description: "secret not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        406:
-          description: "node is not part of a swarm"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          type: "string"
-          description: "ID of the secret"
-      tags: ["Secret"]
-    delete:
-      summary: "Delete a secret"
-      operationId: "SecretDelete"
-      produces:
-        - "application/json"
-      responses:
-        204:
-          description: "no error"
-        404:
-          description: "secret not found"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          required: true
-          type: "string"
-          description: "ID of the secret"
-      tags: ["Secret"]
-  /secrets/{id}/update:
-    post:
-      summary: "Update a Secret"
-      operationId: "SecretUpdate"
-      responses:
-        200:
-          description: "no error"
-        404:
-          description: "no such secret"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-        500:
-          description: "server error"
-          schema:
-            $ref: "#/definitions/ErrorResponse"
-      parameters:
-        - name: "id"
-          in: "path"
-          description: "The ID of the secret"
-          type: "string"
-          required: true
-        - name: "body"
-          in: "body"
-          schema:
-            $ref: "#/definitions/SecretSpec"
-          description: "The spec of the secret to update. Currently, only the Labels field can be updated. All other fields must remain unchanged from the [SecretInspect endpoint](#operation/SecretInspect) response values."
-        - name: "version"
-          in: "query"
-          description: "The version number of the secret object being updated. This is required to avoid conflicting writes."
-          type: "integer"
-          format: "int64"
-          required: true
-      tags: ["Secret"]
diff --git a/installer/vendor/github.com/docker/docker/api/templates/server/operation.gotmpl b/installer/vendor/github.com/docker/docker/api/templates/server/operation.gotmpl
deleted file mode 100644
index 3a3d7527da..0000000000
--- a/installer/vendor/github.com/docker/docker/api/templates/server/operation.gotmpl
+++ /dev/null
@@ -1,26 +0,0 @@
-package {{ .Package }}
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-import (
-	"net/http"
-
-	context "golang.org/x/net/context"
-
-  {{ range .DefaultImports }}{{ printf "%q" . }}
-  {{ end }}
-  {{ range $key, $value := .Imports }}{{ $key }} {{ printf "%q" $value }}
-  {{ end }}
-)
-
-
-{{ range .ExtraSchemas }}
-// {{ .Name }} {{ template "docstring" . }}
-// swagger:model {{ .Name }}
-{{ template "schema" . }}
-{{ end }}
diff --git a/installer/vendor/github.com/docker/docker/api/types/auth.go b/installer/vendor/github.com/docker/docker/api/types/auth.go
deleted file mode 100644
index 056af6b842..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/auth.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package types
-
-// AuthConfig contains authorization information for connecting to a Registry
-type AuthConfig struct {
-	Username string `json:"username,omitempty"`
-	Password string `json:"password,omitempty"`
-	Auth     string `json:"auth,omitempty"`
-
-	// Email is an optional value associated with the username.
-	// This field is deprecated and will be removed in a later
-	// version of docker.
-	Email string `json:"email,omitempty"`
-
-	ServerAddress string `json:"serveraddress,omitempty"`
-
-	// IdentityToken is used to authenticate the user and get
-	// an access token for the registry.
-	IdentityToken string `json:"identitytoken,omitempty"`
-
-	// RegistryToken is a bearer token to be sent to a registry
-	RegistryToken string `json:"registrytoken,omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/backend/backend.go b/installer/vendor/github.com/docker/docker/api/types/backend/backend.go
deleted file mode 100644
index abc0bba3fe..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/backend/backend.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Package backend includes types to send information to server backends.
-package backend
-
-import (
-	"io"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/streamformatter"
-)
-
-// ContainerAttachConfig holds the streams to use when connecting to a container to view logs.
-type ContainerAttachConfig struct {
-	GetStreams func() (io.ReadCloser, io.Writer, io.Writer, error)
-	UseStdin   bool
-	UseStdout  bool
-	UseStderr  bool
-	Logs       bool
-	Stream     bool
-	DetachKeys string
-
-	// Used to signify that streams are multiplexed and therefore need a StdWriter to encode stdout/sderr messages accordingly.
-	// TODO @cpuguy83: This shouldn't be needed. It was only added so that http and websocket endpoints can use the same function, and the websocket function was not using a stdwriter prior to this change...
-	// HOWEVER, the websocket endpoint is using a single stream and SHOULD be encoded with stdout/stderr as is done for HTTP since it is still just a single stream.
-	// Since such a change is an API change unrelated to the current changeset we'll keep it as is here and change separately.
-	MuxStreams bool
-}
-
-// ContainerLogsConfig holds configs for logging operations. Exists
-// for users of the backend to to pass it a logging configuration.
-type ContainerLogsConfig struct {
-	types.ContainerLogsOptions
-	OutStream io.Writer
-}
-
-// ContainerStatsConfig holds information for configuring the runtime
-// behavior of a backend.ContainerStats() call.
-type ContainerStatsConfig struct {
-	Stream    bool
-	OutStream io.Writer
-	Version   string
-}
-
-// ExecInspect holds information about a running process started
-// with docker exec.
-type ExecInspect struct {
-	ID            string
-	Running       bool
-	ExitCode      *int
-	ProcessConfig *ExecProcessConfig
-	OpenStdin     bool
-	OpenStderr    bool
-	OpenStdout    bool
-	CanRemove     bool
-	ContainerID   string
-	DetachKeys    []byte
-	Pid           int
-}
-
-// ExecProcessConfig holds information about the exec process
-// running on the host.
-type ExecProcessConfig struct {
-	Tty        bool     `json:"tty"`
-	Entrypoint string   `json:"entrypoint"`
-	Arguments  []string `json:"arguments"`
-	Privileged *bool    `json:"privileged,omitempty"`
-	User       string   `json:"user,omitempty"`
-}
-
-// ContainerCommitConfig is a wrapper around
-// types.ContainerCommitConfig that also
-// transports configuration changes for a container.
-type ContainerCommitConfig struct {
-	types.ContainerCommitConfig
-	Changes []string
-}
-
-// ProgressWriter is an interface
-// to transport progress streams.
-type ProgressWriter struct {
-	Output             io.Writer
-	StdoutFormatter    *streamformatter.StdoutFormatter
-	StderrFormatter    *streamformatter.StderrFormatter
-	ProgressReaderFunc func(io.ReadCloser) io.ReadCloser
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go b/installer/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
deleted file mode 100644
index 931ae10ab1..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package blkiodev
-
-import "fmt"
-
-// WeightDevice is a structure that holds device:weight pair
-type WeightDevice struct {
-	Path   string
-	Weight uint16
-}
-
-func (w *WeightDevice) String() string {
-	return fmt.Sprintf("%s:%d", w.Path, w.Weight)
-}
-
-// ThrottleDevice is a structure that holds device:rate_per_second pair
-type ThrottleDevice struct {
-	Path string
-	Rate uint64
-}
-
-func (t *ThrottleDevice) String() string {
-	return fmt.Sprintf("%s:%d", t.Path, t.Rate)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/client.go b/installer/vendor/github.com/docker/docker/api/types/client.go
deleted file mode 100644
index 7900d64f0d..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/client.go
+++ /dev/null
@@ -1,378 +0,0 @@
-package types
-
-import (
-	"bufio"
-	"io"
-	"net"
-	"os"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/go-units"
-)
-
-// CheckpointCreateOptions holds parameters to create a checkpoint from a container
-type CheckpointCreateOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-	Exit          bool
-}
-
-// CheckpointListOptions holds parameters to list checkpoints for a container
-type CheckpointListOptions struct {
-	CheckpointDir string
-}
-
-// CheckpointDeleteOptions holds parameters to delete a checkpoint from a container
-type CheckpointDeleteOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-}
-
-// ContainerAttachOptions holds parameters to attach to a container.
-type ContainerAttachOptions struct {
-	Stream     bool
-	Stdin      bool
-	Stdout     bool
-	Stderr     bool
-	DetachKeys string
-	Logs       bool
-}
-
-// ContainerCommitOptions holds parameters to commit changes into a container.
-type ContainerCommitOptions struct {
-	Reference string
-	Comment   string
-	Author    string
-	Changes   []string
-	Pause     bool
-	Config    *container.Config
-}
-
-// ContainerExecInspect holds information returned by exec inspect.
-type ContainerExecInspect struct {
-	ExecID      string
-	ContainerID string
-	Running     bool
-	ExitCode    int
-	Pid         int
-}
-
-// ContainerListOptions holds parameters to list containers with.
-type ContainerListOptions struct {
-	Quiet   bool
-	Size    bool
-	All     bool
-	Latest  bool
-	Since   string
-	Before  string
-	Limit   int
-	Filters filters.Args
-}
-
-// ContainerLogsOptions holds parameters to filter logs with.
-type ContainerLogsOptions struct {
-	ShowStdout bool
-	ShowStderr bool
-	Since      string
-	Timestamps bool
-	Follow     bool
-	Tail       string
-	Details    bool
-}
-
-// ContainerRemoveOptions holds parameters to remove containers.
-type ContainerRemoveOptions struct {
-	RemoveVolumes bool
-	RemoveLinks   bool
-	Force         bool
-}
-
-// ContainerStartOptions holds parameters to start containers.
-type ContainerStartOptions struct {
-	CheckpointID  string
-	CheckpointDir string
-}
-
-// CopyToContainerOptions holds information
-// about files to copy into a container
-type CopyToContainerOptions struct {
-	AllowOverwriteDirWithFile bool
-}
-
-// EventsOptions holds parameters to filter events with.
-type EventsOptions struct {
-	Since   string
-	Until   string
-	Filters filters.Args
-}
-
-// NetworkListOptions holds parameters to filter the list of networks with.
-type NetworkListOptions struct {
-	Filters filters.Args
-}
-
-// HijackedResponse holds connection information for a hijacked request.
-type HijackedResponse struct {
-	Conn   net.Conn
-	Reader *bufio.Reader
-}
-
-// Close closes the hijacked connection and reader.
-func (h *HijackedResponse) Close() {
-	h.Conn.Close()
-}
-
-// CloseWriter is an interface that implements structs
-// that close input streams to prevent from writing.
-type CloseWriter interface {
-	CloseWrite() error
-}
-
-// CloseWrite closes a readWriter for writing.
-func (h *HijackedResponse) CloseWrite() error {
-	if conn, ok := h.Conn.(CloseWriter); ok {
-		return conn.CloseWrite()
-	}
-	return nil
-}
-
-// ImageBuildOptions holds the information
-// necessary to build images.
-type ImageBuildOptions struct {
-	Tags           []string
-	SuppressOutput bool
-	RemoteContext  string
-	NoCache        bool
-	Remove         bool
-	ForceRemove    bool
-	PullParent     bool
-	Isolation      container.Isolation
-	CPUSetCPUs     string
-	CPUSetMems     string
-	CPUShares      int64
-	CPUQuota       int64
-	CPUPeriod      int64
-	Memory         int64
-	MemorySwap     int64
-	CgroupParent   string
-	NetworkMode    string
-	ShmSize        int64
-	Dockerfile     string
-	Ulimits        []*units.Ulimit
-	// See the parsing of buildArgs in api/server/router/build/build_routes.go
-	// for an explaination of why BuildArgs needs to use *string instead of
-	// just a string
-	BuildArgs   map[string]*string
-	AuthConfigs map[string]AuthConfig
-	Context     io.Reader
-	Labels      map[string]string
-	// squash the resulting image's layers to the parent
-	// preserves the original image and creates a new one from the parent with all
-	// the changes applied to a single layer
-	Squash bool
-	// CacheFrom specifies images that are used for matching cache. Images
-	// specified here do not need to have a valid parent chain to match cache.
-	CacheFrom   []string
-	SecurityOpt []string
-}
-
-// ImageBuildResponse holds information
-// returned by a server after building
-// an image.
-type ImageBuildResponse struct {
-	Body   io.ReadCloser
-	OSType string
-}
-
-// ImageCreateOptions holds information to create images.
-type ImageCreateOptions struct {
-	RegistryAuth string // RegistryAuth is the base64 encoded credentials for the registry
-}
-
-// ImageImportSource holds source information for ImageImport
-type ImageImportSource struct {
-	Source     io.Reader // Source is the data to send to the server to create this image from (mutually exclusive with SourceName)
-	SourceName string    // SourceName is the name of the image to pull (mutually exclusive with Source)
-}
-
-// ImageImportOptions holds information to import images from the client host.
-type ImageImportOptions struct {
-	Tag     string   // Tag is the name to tag this image with. This attribute is deprecated.
-	Message string   // Message is the message to tag the image with
-	Changes []string // Changes are the raw changes to apply to this image
-}
-
-// ImageListOptions holds parameters to filter the list of images with.
-type ImageListOptions struct {
-	All     bool
-	Filters filters.Args
-}
-
-// ImageLoadResponse returns information to the client about a load process.
-type ImageLoadResponse struct {
-	// Body must be closed to avoid a resource leak
-	Body io.ReadCloser
-	JSON bool
-}
-
-// ImagePullOptions holds information to pull images.
-type ImagePullOptions struct {
-	All           bool
-	RegistryAuth  string // RegistryAuth is the base64 encoded credentials for the registry
-	PrivilegeFunc RequestPrivilegeFunc
-}
-
-// RequestPrivilegeFunc is a function interface that
-// clients can supply to retry operations after
-// getting an authorization error.
-// This function returns the registry authentication
-// header value in base 64 format, or an error
-// if the privilege request fails.
-type RequestPrivilegeFunc func() (string, error)
-
-//ImagePushOptions holds information to push images.
-type ImagePushOptions ImagePullOptions
-
-// ImageRemoveOptions holds parameters to remove images.
-type ImageRemoveOptions struct {
-	Force         bool
-	PruneChildren bool
-}
-
-// ImageSearchOptions holds parameters to search images with.
-type ImageSearchOptions struct {
-	RegistryAuth  string
-	PrivilegeFunc RequestPrivilegeFunc
-	Filters       filters.Args
-	Limit         int
-}
-
-// ResizeOptions holds parameters to resize a tty.
-// It can be used to resize container ttys and
-// exec process ttys too.
-type ResizeOptions struct {
-	Height uint
-	Width  uint
-}
-
-// VersionResponse holds version information for the client and the server
-type VersionResponse struct {
-	Client *Version
-	Server *Version
-}
-
-// ServerOK returns true when the client could connect to the docker server
-// and parse the information received. It returns false otherwise.
-func (v VersionResponse) ServerOK() bool {
-	return v.Server != nil
-}
-
-// NodeListOptions holds parameters to list nodes with.
-type NodeListOptions struct {
-	Filters filters.Args
-}
-
-// NodeRemoveOptions holds parameters to remove nodes with.
-type NodeRemoveOptions struct {
-	Force bool
-}
-
-// ServiceCreateOptions contains the options to use when creating a service.
-type ServiceCreateOptions struct {
-	// EncodedRegistryAuth is the encoded registry authorization credentials to
-	// use when updating the service.
-	//
-	// This field follows the format of the X-Registry-Auth header.
-	EncodedRegistryAuth string
-}
-
-// ServiceCreateResponse contains the information returned to a client
-// on the creation of a new service.
-type ServiceCreateResponse struct {
-	// ID is the ID of the created service.
-	ID string
-	// Warnings is a set of non-fatal warning messages to pass on to the user.
-	Warnings []string `json:",omitempty"`
-}
-
-// Values for RegistryAuthFrom in ServiceUpdateOptions
-const (
-	RegistryAuthFromSpec         = "spec"
-	RegistryAuthFromPreviousSpec = "previous-spec"
-)
-
-// ServiceUpdateOptions contains the options to be used for updating services.
-type ServiceUpdateOptions struct {
-	// EncodedRegistryAuth is the encoded registry authorization credentials to
-	// use when updating the service.
-	//
-	// This field follows the format of the X-Registry-Auth header.
-	EncodedRegistryAuth string
-
-	// TODO(stevvooe): Consider moving the version parameter of ServiceUpdate
-	// into this field. While it does open API users up to racy writes, most
-	// users may not need that level of consistency in practice.
-
-	// RegistryAuthFrom specifies where to find the registry authorization
-	// credentials if they are not given in EncodedRegistryAuth. Valid
-	// values are "spec" and "previous-spec".
-	RegistryAuthFrom string
-}
-
-// ServiceListOptions holds parameters to list  services with.
-type ServiceListOptions struct {
-	Filters filters.Args
-}
-
-// TaskListOptions holds parameters to list  tasks with.
-type TaskListOptions struct {
-	Filters filters.Args
-}
-
-// PluginRemoveOptions holds parameters to remove plugins.
-type PluginRemoveOptions struct {
-	Force bool
-}
-
-// PluginEnableOptions holds parameters to enable plugins.
-type PluginEnableOptions struct {
-	Timeout int
-}
-
-// PluginDisableOptions holds parameters to disable plugins.
-type PluginDisableOptions struct {
-	Force bool
-}
-
-// PluginInstallOptions holds parameters to install a plugin.
-type PluginInstallOptions struct {
-	Disabled              bool
-	AcceptAllPermissions  bool
-	RegistryAuth          string // RegistryAuth is the base64 encoded credentials for the registry
-	RemoteRef             string // RemoteRef is the plugin name on the registry
-	PrivilegeFunc         RequestPrivilegeFunc
-	AcceptPermissionsFunc func(PluginPrivileges) (bool, error)
-	Args                  []string
-}
-
-// SecretRequestOption is a type for requesting secrets
-type SecretRequestOption struct {
-	Source string
-	Target string
-	UID    string
-	GID    string
-	Mode   os.FileMode
-}
-
-// SwarmUnlockKeyResponse contains the response for Engine API:
-// GET /swarm/unlockkey
-type SwarmUnlockKeyResponse struct {
-	// UnlockKey is the unlock key in ASCII-armored format.
-	UnlockKey string
-}
-
-// PluginCreateOptions hold all options to plugin create.
-type PluginCreateOptions struct {
-	RepoName string
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/configs.go b/installer/vendor/github.com/docker/docker/api/types/configs.go
deleted file mode 100644
index 20c19f2132..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/configs.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package types
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-)
-
-// configs holds structs used for internal communication between the
-// frontend (such as an http server) and the backend (such as the
-// docker daemon).
-
-// ContainerCreateConfig is the parameter set to ContainerCreate()
-type ContainerCreateConfig struct {
-	Name             string
-	Config           *container.Config
-	HostConfig       *container.HostConfig
-	NetworkingConfig *network.NetworkingConfig
-	AdjustCPUShares  bool
-}
-
-// ContainerRmConfig holds arguments for the container remove
-// operation. This struct is used to tell the backend what operations
-// to perform.
-type ContainerRmConfig struct {
-	ForceRemove, RemoveVolume, RemoveLink bool
-}
-
-// ContainerCommitConfig contains build configs for commit operation,
-// and is used when making a commit with the current state of the container.
-type ContainerCommitConfig struct {
-	Pause   bool
-	Repo    string
-	Tag     string
-	Author  string
-	Comment string
-	// merge container config into commit config before commit
-	MergeConfigs bool
-	Config       *container.Config
-}
-
-// ExecConfig is a small subset of the Config struct that holds the configuration
-// for the exec feature of docker.
-type ExecConfig struct {
-	User         string   // User that will run the command
-	Privileged   bool     // Is the container in privileged mode
-	Tty          bool     // Attach standard streams to a tty.
-	AttachStdin  bool     // Attach the standard input, makes possible user interaction
-	AttachStderr bool     // Attach the standard error
-	AttachStdout bool     // Attach the standard output
-	Detach       bool     // Execute in detach mode
-	DetachKeys   string   // Escape keys for detach
-	Env          []string // Environment variables
-	Cmd          []string // Execution commands and args
-}
-
-// PluginRmConfig holds arguments for plugin remove.
-type PluginRmConfig struct {
-	ForceRemove bool
-}
-
-// PluginEnableConfig holds arguments for plugin enable
-type PluginEnableConfig struct {
-	Timeout int
-}
-
-// PluginDisableConfig holds arguments for plugin disable.
-type PluginDisableConfig struct {
-	ForceDisable bool
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/config.go b/installer/vendor/github.com/docker/docker/api/types/container/config.go
deleted file mode 100644
index fc050e5dba..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/config.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package container
-
-import (
-	"time"
-
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-)
-
-// HealthConfig holds configuration settings for the HEALTHCHECK feature.
-type HealthConfig struct {
-	// Test is the test to perform to check that the container is healthy.
-	// An empty slice means to inherit the default.
-	// The options are:
-	// {} : inherit healthcheck
-	// {"NONE"} : disable healthcheck
-	// {"CMD", args...} : exec arguments directly
-	// {"CMD-SHELL", command} : run command with system's default shell
-	Test []string `json:",omitempty"`
-
-	// Zero means to inherit. Durations are expressed as integer nanoseconds.
-	Interval time.Duration `json:",omitempty"` // Interval is the time to wait between checks.
-	Timeout  time.Duration `json:",omitempty"` // Timeout is the time to wait before considering the check to have hung.
-
-	// Retries is the number of consecutive failures needed to consider a container as unhealthy.
-	// Zero means inherit.
-	Retries int `json:",omitempty"`
-}
-
-// Config contains the configuration data about a container.
-// It should hold only portable information about the container.
-// Here, "portable" means "independent from the host we are running on".
-// Non-portable information *should* appear in HostConfig.
-// All fields added to this struct must be marked `omitempty` to keep getting
-// predictable hashes from the old `v1Compatibility` configuration.
-type Config struct {
-	Hostname        string              // Hostname
-	Domainname      string              // Domainname
-	User            string              // User that will run the command(s) inside the container, also support user:group
-	AttachStdin     bool                // Attach the standard input, makes possible user interaction
-	AttachStdout    bool                // Attach the standard output
-	AttachStderr    bool                // Attach the standard error
-	ExposedPorts    nat.PortSet         `json:",omitempty"` // List of exposed ports
-	Tty             bool                // Attach standard streams to a tty, including stdin if it is not closed.
-	OpenStdin       bool                // Open stdin
-	StdinOnce       bool                // If true, close stdin after the 1 attached client disconnects.
-	Env             []string            // List of environment variable to set in the container
-	Cmd             strslice.StrSlice   // Command to run when starting the container
-	Healthcheck     *HealthConfig       `json:",omitempty"` // Healthcheck describes how to check the container is healthy
-	ArgsEscaped     bool                `json:",omitempty"` // True if command is already escaped (Windows specific)
-	Image           string              // Name of the image as it was passed by the operator (e.g. could be symbolic)
-	Volumes         map[string]struct{} // List of volumes (mounts) used for the container
-	WorkingDir      string              // Current directory (PWD) in the command will be launched
-	Entrypoint      strslice.StrSlice   // Entrypoint to run when starting the container
-	NetworkDisabled bool                `json:",omitempty"` // Is network disabled
-	MacAddress      string              `json:",omitempty"` // Mac Address of the container
-	OnBuild         []string            // ONBUILD metadata that were defined on the image Dockerfile
-	Labels          map[string]string   // List of labels set to this container
-	StopSignal      string              `json:",omitempty"` // Signal to stop a container
-	StopTimeout     *int                `json:",omitempty"` // Timeout (in seconds) to stop a container
-	Shell           strslice.StrSlice   `json:",omitempty"` // Shell for shell-form of RUN, CMD, ENTRYPOINT
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/container_create.go b/installer/vendor/github.com/docker/docker/api/types/container/container_create.go
deleted file mode 100644
index d028e3b121..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/container_create.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-// ContainerCreateCreatedBody container create created body
-// swagger:model ContainerCreateCreatedBody
-type ContainerCreateCreatedBody struct {
-
-	// The ID of the created container
-	// Required: true
-	ID string `json:"Id"`
-
-	// Warnings encountered when creating the container
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/container_update.go b/installer/vendor/github.com/docker/docker/api/types/container/container_update.go
deleted file mode 100644
index 81ee12c678..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/container_update.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-// ContainerUpdateOKBody container update o k body
-// swagger:model ContainerUpdateOKBody
-type ContainerUpdateOKBody struct {
-
-	// warnings
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/container_wait.go b/installer/vendor/github.com/docker/docker/api/types/container/container_wait.go
deleted file mode 100644
index 16cf335321..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/container_wait.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package container
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-// ContainerWaitOKBody container wait o k body
-// swagger:model ContainerWaitOKBody
-type ContainerWaitOKBody struct {
-
-	// Exit code of the container
-	// Required: true
-	StatusCode int64 `json:"StatusCode"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/host_config.go b/installer/vendor/github.com/docker/docker/api/types/container/host_config.go
deleted file mode 100644
index 0c82d625e8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/host_config.go
+++ /dev/null
@@ -1,333 +0,0 @@
-package container
-
-import (
-	"strings"
-
-	"github.com/docker/docker/api/types/blkiodev"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/go-units"
-)
-
-// NetworkMode represents the container network stack.
-type NetworkMode string
-
-// Isolation represents the isolation technology of a container. The supported
-// values are platform specific
-type Isolation string
-
-// IsDefault indicates the default isolation technology of a container. On Linux this
-// is the native driver. On Windows, this is a Windows Server Container.
-func (i Isolation) IsDefault() bool {
-	return strings.ToLower(string(i)) == "default" || string(i) == ""
-}
-
-// IpcMode represents the container ipc stack.
-type IpcMode string
-
-// IsPrivate indicates whether the container uses its private ipc stack.
-func (n IpcMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsHost indicates whether the container uses the host's ipc stack.
-func (n IpcMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsContainer indicates whether the container uses a container's ipc stack.
-func (n IpcMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the ipc stack is valid.
-func (n IpcMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	case "container":
-		if len(parts) != 2 || parts[1] == "" {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}
-
-// Container returns the name of the container ipc stack is going to be used.
-func (n IpcMode) Container() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// UsernsMode represents userns mode in the container.
-type UsernsMode string
-
-// IsHost indicates whether the container uses the host's userns.
-func (n UsernsMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsPrivate indicates whether the container uses the a private userns.
-func (n UsernsMode) IsPrivate() bool {
-	return !(n.IsHost())
-}
-
-// Valid indicates whether the userns is valid.
-func (n UsernsMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	default:
-		return false
-	}
-	return true
-}
-
-// CgroupSpec represents the cgroup to use for the container.
-type CgroupSpec string
-
-// IsContainer indicates whether the container is using another container cgroup
-func (c CgroupSpec) IsContainer() bool {
-	parts := strings.SplitN(string(c), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the cgroup spec is valid.
-func (c CgroupSpec) Valid() bool {
-	return c.IsContainer() || c == ""
-}
-
-// Container returns the name of the container whose cgroup will be used.
-func (c CgroupSpec) Container() string {
-	parts := strings.SplitN(string(c), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// UTSMode represents the UTS namespace of the container.
-type UTSMode string
-
-// IsPrivate indicates whether the container uses its private UTS namespace.
-func (n UTSMode) IsPrivate() bool {
-	return !(n.IsHost())
-}
-
-// IsHost indicates whether the container uses the host's UTS namespace.
-func (n UTSMode) IsHost() bool {
-	return n == "host"
-}
-
-// Valid indicates whether the UTS namespace is valid.
-func (n UTSMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	default:
-		return false
-	}
-	return true
-}
-
-// PidMode represents the pid namespace of the container.
-type PidMode string
-
-// IsPrivate indicates whether the container uses its own new pid namespace.
-func (n PidMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsHost indicates whether the container uses the host's pid namespace.
-func (n PidMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsContainer indicates whether the container uses a container's pid namespace.
-func (n PidMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// Valid indicates whether the pid namespace is valid.
-func (n PidMode) Valid() bool {
-	parts := strings.Split(string(n), ":")
-	switch mode := parts[0]; mode {
-	case "", "host":
-	case "container":
-		if len(parts) != 2 || parts[1] == "" {
-			return false
-		}
-	default:
-		return false
-	}
-	return true
-}
-
-// Container returns the name of the container whose pid namespace is going to be used.
-func (n PidMode) Container() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// DeviceMapping represents the device mapping between the host and the container.
-type DeviceMapping struct {
-	PathOnHost        string
-	PathInContainer   string
-	CgroupPermissions string
-}
-
-// RestartPolicy represents the restart policies of the container.
-type RestartPolicy struct {
-	Name              string
-	MaximumRetryCount int
-}
-
-// IsNone indicates whether the container has the "no" restart policy.
-// This means the container will not automatically restart when exiting.
-func (rp *RestartPolicy) IsNone() bool {
-	return rp.Name == "no" || rp.Name == ""
-}
-
-// IsAlways indicates whether the container has the "always" restart policy.
-// This means the container will automatically restart regardless of the exit status.
-func (rp *RestartPolicy) IsAlways() bool {
-	return rp.Name == "always"
-}
-
-// IsOnFailure indicates whether the container has the "on-failure" restart policy.
-// This means the container will automatically restart of exiting with a non-zero exit status.
-func (rp *RestartPolicy) IsOnFailure() bool {
-	return rp.Name == "on-failure"
-}
-
-// IsUnlessStopped indicates whether the container has the
-// "unless-stopped" restart policy. This means the container will
-// automatically restart unless user has put it to stopped state.
-func (rp *RestartPolicy) IsUnlessStopped() bool {
-	return rp.Name == "unless-stopped"
-}
-
-// IsSame compares two RestartPolicy to see if they are the same
-func (rp *RestartPolicy) IsSame(tp *RestartPolicy) bool {
-	return rp.Name == tp.Name && rp.MaximumRetryCount == tp.MaximumRetryCount
-}
-
-// LogConfig represents the logging configuration of the container.
-type LogConfig struct {
-	Type   string
-	Config map[string]string
-}
-
-// Resources contains container's resources (cgroups config, ulimits...)
-type Resources struct {
-	// Applicable to all platforms
-	CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
-	Memory    int64 // Memory limit (in bytes)
-	NanoCPUs  int64 `json:"NanoCpus"` // CPU quota in units of 10<sup>-9</sup> CPUs.
-
-	// Applicable to UNIX platforms
-	CgroupParent         string // Parent cgroup.
-	BlkioWeight          uint16 // Block IO weight (relative weight vs. other containers)
-	BlkioWeightDevice    []*blkiodev.WeightDevice
-	BlkioDeviceReadBps   []*blkiodev.ThrottleDevice
-	BlkioDeviceWriteBps  []*blkiodev.ThrottleDevice
-	BlkioDeviceReadIOps  []*blkiodev.ThrottleDevice
-	BlkioDeviceWriteIOps []*blkiodev.ThrottleDevice
-	CPUPeriod            int64           `json:"CpuPeriod"`          // CPU CFS (Completely Fair Scheduler) period
-	CPUQuota             int64           `json:"CpuQuota"`           // CPU CFS (Completely Fair Scheduler) quota
-	CPURealtimePeriod    int64           `json:"CpuRealtimePeriod"`  // CPU real-time period
-	CPURealtimeRuntime   int64           `json:"CpuRealtimeRuntime"` // CPU real-time runtime
-	CpusetCpus           string          // CpusetCpus 0-2, 0,1
-	CpusetMems           string          // CpusetMems 0-2, 0,1
-	Devices              []DeviceMapping // List of devices to map inside the container
-	DiskQuota            int64           // Disk limit (in bytes)
-	KernelMemory         int64           // Kernel memory limit (in bytes)
-	MemoryReservation    int64           // Memory soft limit (in bytes)
-	MemorySwap           int64           // Total memory usage (memory + swap); set `-1` to enable unlimited swap
-	MemorySwappiness     *int64          // Tuning container memory swappiness behaviour
-	OomKillDisable       *bool           // Whether to disable OOM Killer or not
-	PidsLimit            int64           // Setting pids limit for a container
-	Ulimits              []*units.Ulimit // List of ulimits to be set in the container
-
-	// Applicable to Windows
-	CPUCount           int64  `json:"CpuCount"`   // CPU count
-	CPUPercent         int64  `json:"CpuPercent"` // CPU percent
-	IOMaximumIOps      uint64 // Maximum IOps for the container system drive
-	IOMaximumBandwidth uint64 // Maximum IO in bytes per second for the container system drive
-}
-
-// UpdateConfig holds the mutable attributes of a Container.
-// Those attributes can be updated at runtime.
-type UpdateConfig struct {
-	// Contains container's resources (cgroups, ulimits)
-	Resources
-	RestartPolicy RestartPolicy
-}
-
-// HostConfig the non-portable Config structure of a container.
-// Here, "non-portable" means "dependent of the host we are running on".
-// Portable information *should* appear in Config.
-type HostConfig struct {
-	// Applicable to all platforms
-	Binds           []string      // List of volume bindings for this container
-	ContainerIDFile string        // File (path) where the containerId is written
-	LogConfig       LogConfig     // Configuration of the logs for this container
-	NetworkMode     NetworkMode   // Network mode to use for the container
-	PortBindings    nat.PortMap   // Port mapping between the exposed port (container) and the host
-	RestartPolicy   RestartPolicy // Restart policy to be used for the container
-	AutoRemove      bool          // Automatically remove container when it exits
-	VolumeDriver    string        // Name of the volume driver used to mount volumes
-	VolumesFrom     []string      // List of volumes to take from other container
-
-	// Applicable to UNIX platforms
-	CapAdd          strslice.StrSlice // List of kernel capabilities to add to the container
-	CapDrop         strslice.StrSlice // List of kernel capabilities to remove from the container
-	DNS             []string          `json:"Dns"`        // List of DNS server to lookup
-	DNSOptions      []string          `json:"DnsOptions"` // List of DNSOption to look for
-	DNSSearch       []string          `json:"DnsSearch"`  // List of DNSSearch to look for
-	ExtraHosts      []string          // List of extra hosts
-	GroupAdd        []string          // List of additional groups that the container process will run as
-	IpcMode         IpcMode           // IPC namespace to use for the container
-	Cgroup          CgroupSpec        // Cgroup to use for the container
-	Links           []string          // List of links (in the name:alias form)
-	OomScoreAdj     int               // Container preference for OOM-killing
-	PidMode         PidMode           // PID namespace to use for the container
-	Privileged      bool              // Is the container in privileged mode
-	PublishAllPorts bool              // Should docker publish all exposed port for the container
-	ReadonlyRootfs  bool              // Is the container root filesystem in read-only
-	SecurityOpt     []string          // List of string values to customize labels for MLS systems, such as SELinux.
-	StorageOpt      map[string]string `json:",omitempty"` // Storage driver options per container.
-	Tmpfs           map[string]string `json:",omitempty"` // List of tmpfs (mounts) used for the container
-	UTSMode         UTSMode           // UTS namespace to use for the container
-	UsernsMode      UsernsMode        // The user namespace to use for the container
-	ShmSize         int64             // Total shm memory usage
-	Sysctls         map[string]string `json:",omitempty"` // List of Namespaced sysctls used for the container
-	Runtime         string            `json:",omitempty"` // Runtime to use with this container
-
-	// Applicable to Windows
-	ConsoleSize [2]uint   // Initial console size (height,width)
-	Isolation   Isolation // Isolation technology of the container (eg default, hyperv)
-
-	// Contains container's resources (cgroups, ulimits)
-	Resources
-
-	// Mounts specs used by the container
-	Mounts []mount.Mount `json:",omitempty"`
-
-	// Run a custom init inside the container, if null, use the daemon's configured settings
-	Init *bool `json:",omitempty"`
-
-	// Custom init path
-	InitPath string `json:",omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go b/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
deleted file mode 100644
index 9fb79bed6f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// +build !windows
-
-package container
-
-import "strings"
-
-// IsValid indicates if an isolation technology is valid
-func (i Isolation) IsValid() bool {
-	return i.IsDefault()
-}
-
-// IsPrivate indicates whether container uses its private network stack.
-func (n NetworkMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// IsDefault indicates whether container uses the default network stack.
-func (n NetworkMode) IsDefault() bool {
-	return n == "default"
-}
-
-// NetworkName returns the name of the network stack.
-func (n NetworkMode) NetworkName() string {
-	if n.IsBridge() {
-		return "bridge"
-	} else if n.IsHost() {
-		return "host"
-	} else if n.IsContainer() {
-		return "container"
-	} else if n.IsNone() {
-		return "none"
-	} else if n.IsDefault() {
-		return "default"
-	} else if n.IsUserDefined() {
-		return n.UserDefined()
-	}
-	return ""
-}
-
-// IsBridge indicates whether container uses the bridge network stack
-func (n NetworkMode) IsBridge() bool {
-	return n == "bridge"
-}
-
-// IsHost indicates whether container uses the host network stack.
-func (n NetworkMode) IsHost() bool {
-	return n == "host"
-}
-
-// IsContainer indicates whether container uses a container network stack.
-func (n NetworkMode) IsContainer() bool {
-	parts := strings.SplitN(string(n), ":", 2)
-	return len(parts) > 1 && parts[0] == "container"
-}
-
-// IsNone indicates whether container isn't using a network stack.
-func (n NetworkMode) IsNone() bool {
-	return n == "none"
-}
-
-// ConnectedContainer is the id of the container which network this container is connected to.
-func (n NetworkMode) ConnectedContainer() string {
-	parts := strings.SplitN(string(n), ":", 2)
-	if len(parts) > 1 {
-		return parts[1]
-	}
-	return ""
-}
-
-// IsUserDefined indicates user-created network
-func (n NetworkMode) IsUserDefined() bool {
-	return !n.IsDefault() && !n.IsBridge() && !n.IsHost() && !n.IsNone() && !n.IsContainer()
-}
-
-//UserDefined indicates user-created network
-func (n NetworkMode) UserDefined() string {
-	if n.IsUserDefined() {
-		return string(n)
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go b/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
deleted file mode 100644
index 0ee332ba68..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package container
-
-import (
-	"strings"
-)
-
-// IsDefault indicates whether container uses the default network stack.
-func (n NetworkMode) IsDefault() bool {
-	return n == "default"
-}
-
-// IsNone indicates whether container isn't using a network stack.
-func (n NetworkMode) IsNone() bool {
-	return n == "none"
-}
-
-// IsContainer indicates whether container uses a container network stack.
-// Returns false as windows doesn't support this mode
-func (n NetworkMode) IsContainer() bool {
-	return false
-}
-
-// IsBridge indicates whether container uses the bridge network stack
-// in windows it is given the name NAT
-func (n NetworkMode) IsBridge() bool {
-	return n == "nat"
-}
-
-// IsHost indicates whether container uses the host network stack.
-// returns false as this is not supported by windows
-func (n NetworkMode) IsHost() bool {
-	return false
-}
-
-// IsPrivate indicates whether container uses its private network stack.
-func (n NetworkMode) IsPrivate() bool {
-	return !(n.IsHost() || n.IsContainer())
-}
-
-// ConnectedContainer is the id of the container which network this container is connected to.
-// Returns blank string on windows
-func (n NetworkMode) ConnectedContainer() string {
-	return ""
-}
-
-// IsUserDefined indicates user-created network
-func (n NetworkMode) IsUserDefined() bool {
-	return !n.IsDefault() && !n.IsNone() && !n.IsBridge()
-}
-
-// IsHyperV indicates the use of a Hyper-V partition for isolation
-func (i Isolation) IsHyperV() bool {
-	return strings.ToLower(string(i)) == "hyperv"
-}
-
-// IsProcess indicates the use of process isolation
-func (i Isolation) IsProcess() bool {
-	return strings.ToLower(string(i)) == "process"
-}
-
-// IsValid indicates if an isolation technology is valid
-func (i Isolation) IsValid() bool {
-	return i.IsDefault() || i.IsHyperV() || i.IsProcess()
-}
-
-// NetworkName returns the name of the network stack.
-func (n NetworkMode) NetworkName() string {
-	if n.IsDefault() {
-		return "default"
-	} else if n.IsBridge() {
-		return "nat"
-	} else if n.IsNone() {
-		return "none"
-	} else if n.IsUserDefined() {
-		return n.UserDefined()
-	}
-
-	return ""
-}
-
-//UserDefined indicates user-created network
-func (n NetworkMode) UserDefined() string {
-	if n.IsUserDefined() {
-		return string(n)
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/error_response.go b/installer/vendor/github.com/docker/docker/api/types/error_response.go
deleted file mode 100644
index dc942d9d9e..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/error_response.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ErrorResponse Represents an error.
-// swagger:model ErrorResponse
-type ErrorResponse struct {
-
-	// The error message.
-	// Required: true
-	Message string `json:"message"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/events/events.go b/installer/vendor/github.com/docker/docker/api/types/events/events.go
deleted file mode 100644
index 7129a65acf..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/events/events.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package events
-
-const (
-	// ContainerEventType is the event type that containers generate
-	ContainerEventType = "container"
-	// DaemonEventType is the event type that daemon generate
-	DaemonEventType = "daemon"
-	// ImageEventType is the event type that images generate
-	ImageEventType = "image"
-	// NetworkEventType is the event type that networks generate
-	NetworkEventType = "network"
-	// PluginEventType is the event type that plugins generate
-	PluginEventType = "plugin"
-	// VolumeEventType is the event type that volumes generate
-	VolumeEventType = "volume"
-)
-
-// Actor describes something that generates events,
-// like a container, or a network, or a volume.
-// It has a defined name and a set or attributes.
-// The container attributes are its labels, other actors
-// can generate these attributes from other properties.
-type Actor struct {
-	ID         string
-	Attributes map[string]string
-}
-
-// Message represents the information an event contains
-type Message struct {
-	// Deprecated information from JSONMessage.
-	// With data only in container events.
-	Status string `json:"status,omitempty"`
-	ID     string `json:"id,omitempty"`
-	From   string `json:"from,omitempty"`
-
-	Type   string
-	Action string
-	Actor  Actor
-
-	Time     int64 `json:"time,omitempty"`
-	TimeNano int64 `json:"timeNano,omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/filters/parse.go b/installer/vendor/github.com/docker/docker/api/types/filters/parse.go
deleted file mode 100644
index e01a41deb8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/filters/parse.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Package filters provides helper function to parse and handle command line
-// filter, used for example in docker ps or docker images commands.
-package filters
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/api/types/versions"
-)
-
-// Args stores filter arguments as map key:{map key: bool}.
-// It contains an aggregation of the map of arguments (which are in the form
-// of -f 'key=value') based on the key, and stores values for the same key
-// in a map with string keys and boolean values.
-// e.g given -f 'label=label1=1' -f 'label=label2=2' -f 'image.name=ubuntu'
-// the args will be {"image.name":{"ubuntu":true},"label":{"label1=1":true,"label2=2":true}}
-type Args struct {
-	fields map[string]map[string]bool
-}
-
-// NewArgs initializes a new Args struct.
-func NewArgs() Args {
-	return Args{fields: map[string]map[string]bool{}}
-}
-
-// ParseFlag parses the argument to the filter flag. Like
-//
-//   `docker ps -f 'created=today' -f 'image.name=ubuntu*'`
-//
-// If prev map is provided, then it is appended to, and returned. By default a new
-// map is created.
-func ParseFlag(arg string, prev Args) (Args, error) {
-	filters := prev
-	if len(arg) == 0 {
-		return filters, nil
-	}
-
-	if !strings.Contains(arg, "=") {
-		return filters, ErrBadFormat
-	}
-
-	f := strings.SplitN(arg, "=", 2)
-
-	name := strings.ToLower(strings.TrimSpace(f[0]))
-	value := strings.TrimSpace(f[1])
-
-	filters.Add(name, value)
-
-	return filters, nil
-}
-
-// ErrBadFormat is an error returned in case of bad format for a filter.
-var ErrBadFormat = errors.New("bad format of filter (expected name=value)")
-
-// ToParam packs the Args into a string for easy transport from client to server.
-func ToParam(a Args) (string, error) {
-	// this way we don't URL encode {}, just empty space
-	if a.Len() == 0 {
-		return "", nil
-	}
-
-	buf, err := json.Marshal(a.fields)
-	if err != nil {
-		return "", err
-	}
-	return string(buf), nil
-}
-
-// ToParamWithVersion packs the Args into a string for easy transport from client to server.
-// The generated string will depend on the specified version (corresponding to the API version).
-func ToParamWithVersion(version string, a Args) (string, error) {
-	// this way we don't URL encode {}, just empty space
-	if a.Len() == 0 {
-		return "", nil
-	}
-
-	// for daemons older than v1.10, filter must be of the form map[string][]string
-	buf := []byte{}
-	err := errors.New("")
-	if version != "" && versions.LessThan(version, "1.22") {
-		buf, err = json.Marshal(convertArgsToSlice(a.fields))
-	} else {
-		buf, err = json.Marshal(a.fields)
-	}
-	if err != nil {
-		return "", err
-	}
-	return string(buf), nil
-}
-
-// FromParam unpacks the filter Args.
-func FromParam(p string) (Args, error) {
-	if len(p) == 0 {
-		return NewArgs(), nil
-	}
-
-	r := strings.NewReader(p)
-	d := json.NewDecoder(r)
-
-	m := map[string]map[string]bool{}
-	if err := d.Decode(&m); err != nil {
-		r.Seek(0, 0)
-
-		// Allow parsing old arguments in slice format.
-		// Because other libraries might be sending them in this format.
-		deprecated := map[string][]string{}
-		if deprecatedErr := d.Decode(&deprecated); deprecatedErr == nil {
-			m = deprecatedArgs(deprecated)
-		} else {
-			return NewArgs(), err
-		}
-	}
-	return Args{m}, nil
-}
-
-// Get returns the list of values associates with a field.
-// It returns a slice of strings to keep backwards compatibility with old code.
-func (filters Args) Get(field string) []string {
-	values := filters.fields[field]
-	if values == nil {
-		return make([]string, 0)
-	}
-	slice := make([]string, 0, len(values))
-	for key := range values {
-		slice = append(slice, key)
-	}
-	return slice
-}
-
-// Add adds a new value to a filter field.
-func (filters Args) Add(name, value string) {
-	if _, ok := filters.fields[name]; ok {
-		filters.fields[name][value] = true
-	} else {
-		filters.fields[name] = map[string]bool{value: true}
-	}
-}
-
-// Del removes a value from a filter field.
-func (filters Args) Del(name, value string) {
-	if _, ok := filters.fields[name]; ok {
-		delete(filters.fields[name], value)
-		if len(filters.fields[name]) == 0 {
-			delete(filters.fields, name)
-		}
-	}
-}
-
-// Len returns the number of fields in the arguments.
-func (filters Args) Len() int {
-	return len(filters.fields)
-}
-
-// MatchKVList returns true if the values for the specified field matches the ones
-// from the sources.
-// e.g. given Args are {'label': {'label1=1','label2=1'}, 'image.name', {'ubuntu'}},
-//      field is 'label' and sources are {'label1': '1', 'label2': '2'}
-//      it returns true.
-func (filters Args) MatchKVList(field string, sources map[string]string) bool {
-	fieldValues := filters.fields[field]
-
-	//do not filter if there is no filter set or cannot determine filter
-	if len(fieldValues) == 0 {
-		return true
-	}
-
-	if len(sources) == 0 {
-		return false
-	}
-
-	for name2match := range fieldValues {
-		testKV := strings.SplitN(name2match, "=", 2)
-
-		v, ok := sources[testKV[0]]
-		if !ok {
-			return false
-		}
-		if len(testKV) == 2 && testKV[1] != v {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Match returns true if the values for the specified field matches the source string
-// e.g. given Args are {'label': {'label1=1','label2=1'}, 'image.name', {'ubuntu'}},
-//      field is 'image.name' and source is 'ubuntu'
-//      it returns true.
-func (filters Args) Match(field, source string) bool {
-	if filters.ExactMatch(field, source) {
-		return true
-	}
-
-	fieldValues := filters.fields[field]
-	for name2match := range fieldValues {
-		match, err := regexp.MatchString(name2match, source)
-		if err != nil {
-			continue
-		}
-		if match {
-			return true
-		}
-	}
-	return false
-}
-
-// ExactMatch returns true if the source matches exactly one of the filters.
-func (filters Args) ExactMatch(field, source string) bool {
-	fieldValues, ok := filters.fields[field]
-	//do not filter if there is no filter set or cannot determine filter
-	if !ok || len(fieldValues) == 0 {
-		return true
-	}
-
-	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
-}
-
-// UniqueExactMatch returns true if there is only one filter and the source matches exactly this one.
-func (filters Args) UniqueExactMatch(field, source string) bool {
-	fieldValues := filters.fields[field]
-	//do not filter if there is no filter set or cannot determine filter
-	if len(fieldValues) == 0 {
-		return true
-	}
-	if len(filters.fields[field]) != 1 {
-		return false
-	}
-
-	// try to match full name value to avoid O(N) regular expression matching
-	return fieldValues[source]
-}
-
-// FuzzyMatch returns true if the source matches exactly one of the filters,
-// or the source has one of the filters as a prefix.
-func (filters Args) FuzzyMatch(field, source string) bool {
-	if filters.ExactMatch(field, source) {
-		return true
-	}
-
-	fieldValues := filters.fields[field]
-	for prefix := range fieldValues {
-		if strings.HasPrefix(source, prefix) {
-			return true
-		}
-	}
-	return false
-}
-
-// Include returns true if the name of the field to filter is in the filters.
-func (filters Args) Include(field string) bool {
-	_, ok := filters.fields[field]
-	return ok
-}
-
-// Validate ensures that all the fields in the filter are valid.
-// It returns an error as soon as it finds an invalid field.
-func (filters Args) Validate(accepted map[string]bool) error {
-	for name := range filters.fields {
-		if !accepted[name] {
-			return fmt.Errorf("Invalid filter '%s'", name)
-		}
-	}
-	return nil
-}
-
-// WalkValues iterates over the list of filtered values for a field.
-// It stops the iteration if it finds an error and it returns that error.
-func (filters Args) WalkValues(field string, op func(value string) error) error {
-	if _, ok := filters.fields[field]; !ok {
-		return nil
-	}
-	for v := range filters.fields[field] {
-		if err := op(v); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func deprecatedArgs(d map[string][]string) map[string]map[string]bool {
-	m := map[string]map[string]bool{}
-	for k, v := range d {
-		values := map[string]bool{}
-		for _, vv := range v {
-			values[vv] = true
-		}
-		m[k] = values
-	}
-	return m
-}
-
-func convertArgsToSlice(f map[string]map[string]bool) map[string][]string {
-	m := map[string][]string{}
-	for k, v := range f {
-		values := []string{}
-		for kk := range v {
-			if v[kk] {
-				values = append(values, kk)
-			}
-		}
-		m[k] = values
-	}
-	return m
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/filters/parse_test.go b/installer/vendor/github.com/docker/docker/api/types/filters/parse_test.go
deleted file mode 100644
index b2ed27b9ce..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/filters/parse_test.go
+++ /dev/null
@@ -1,417 +0,0 @@
-package filters
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestParseArgs(t *testing.T) {
-	// equivalent of `docker ps -f 'created=today' -f 'image.name=ubuntu*' -f 'image.name=*untu'`
-	flagArgs := []string{
-		"created=today",
-		"image.name=ubuntu*",
-		"image.name=*untu",
-	}
-	var (
-		args = NewArgs()
-		err  error
-	)
-	for i := range flagArgs {
-		args, err = ParseFlag(flagArgs[i], args)
-		if err != nil {
-			t.Errorf("failed to parse %s: %s", flagArgs[i], err)
-		}
-	}
-	if len(args.Get("created")) != 1 {
-		t.Errorf("failed to set this arg")
-	}
-	if len(args.Get("image.name")) != 2 {
-		t.Errorf("the args should have collapsed")
-	}
-}
-
-func TestParseArgsEdgeCase(t *testing.T) {
-	var filters Args
-	args, err := ParseFlag("", filters)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if args.Len() != 0 {
-		t.Fatalf("Expected an empty Args (map), got %v", args)
-	}
-	if args, err = ParseFlag("anything", args); err == nil || err != ErrBadFormat {
-		t.Fatalf("Expected ErrBadFormat, got %v", err)
-	}
-}
-
-func TestToParam(t *testing.T) {
-	fields := map[string]map[string]bool{
-		"created":    {"today": true},
-		"image.name": {"ubuntu*": true, "*untu": true},
-	}
-	a := Args{fields: fields}
-
-	_, err := ToParam(a)
-	if err != nil {
-		t.Errorf("failed to marshal the filters: %s", err)
-	}
-}
-
-func TestToParamWithVersion(t *testing.T) {
-	fields := map[string]map[string]bool{
-		"created":    {"today": true},
-		"image.name": {"ubuntu*": true, "*untu": true},
-	}
-	a := Args{fields: fields}
-
-	str1, err := ToParamWithVersion("1.21", a)
-	if err != nil {
-		t.Errorf("failed to marshal the filters with version < 1.22: %s", err)
-	}
-	str2, err := ToParamWithVersion("1.22", a)
-	if err != nil {
-		t.Errorf("failed to marshal the filters with version >= 1.22: %s", err)
-	}
-	if str1 != `{"created":["today"],"image.name":["*untu","ubuntu*"]}` &&
-		str1 != `{"created":["today"],"image.name":["ubuntu*","*untu"]}` {
-		t.Errorf("incorrectly marshaled the filters: %s", str1)
-	}
-	if str2 != `{"created":{"today":true},"image.name":{"*untu":true,"ubuntu*":true}}` &&
-		str2 != `{"created":{"today":true},"image.name":{"ubuntu*":true,"*untu":true}}` {
-		t.Errorf("incorrectly marshaled the filters: %s", str2)
-	}
-}
-
-func TestFromParam(t *testing.T) {
-	invalids := []string{
-		"anything",
-		"['a','list']",
-		"{'key': 'value'}",
-		`{"key": "value"}`,
-	}
-	valid := map[*Args][]string{
-		&Args{fields: map[string]map[string]bool{"key": {"value": true}}}: {
-			`{"key": ["value"]}`,
-			`{"key": {"value": true}}`,
-		},
-		&Args{fields: map[string]map[string]bool{"key": {"value1": true, "value2": true}}}: {
-			`{"key": ["value1", "value2"]}`,
-			`{"key": {"value1": true, "value2": true}}`,
-		},
-		&Args{fields: map[string]map[string]bool{"key1": {"value1": true}, "key2": {"value2": true}}}: {
-			`{"key1": ["value1"], "key2": ["value2"]}`,
-			`{"key1": {"value1": true}, "key2": {"value2": true}}`,
-		},
-	}
-
-	for _, invalid := range invalids {
-		if _, err := FromParam(invalid); err == nil {
-			t.Fatalf("Expected an error with %v, got nothing", invalid)
-		}
-	}
-
-	for expectedArgs, matchers := range valid {
-		for _, json := range matchers {
-			args, err := FromParam(json)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if args.Len() != expectedArgs.Len() {
-				t.Fatalf("Expected %v, go %v", expectedArgs, args)
-			}
-			for key, expectedValues := range expectedArgs.fields {
-				values := args.Get(key)
-
-				if len(values) != len(expectedValues) {
-					t.Fatalf("Expected %v, go %v", expectedArgs, args)
-				}
-
-				for _, v := range values {
-					if !expectedValues[v] {
-						t.Fatalf("Expected %v, go %v", expectedArgs, args)
-					}
-				}
-			}
-		}
-	}
-}
-
-func TestEmpty(t *testing.T) {
-	a := Args{}
-	v, err := ToParam(a)
-	if err != nil {
-		t.Errorf("failed to marshal the filters: %s", err)
-	}
-	v1, err := FromParam(v)
-	if err != nil {
-		t.Errorf("%s", err)
-	}
-	if a.Len() != v1.Len() {
-		t.Errorf("these should both be empty sets")
-	}
-}
-
-func TestArgsMatchKVListEmptySources(t *testing.T) {
-	args := NewArgs()
-	if !args.MatchKVList("created", map[string]string{}) {
-		t.Fatalf("Expected true for (%v,created), got true", args)
-	}
-
-	args = Args{map[string]map[string]bool{"created": {"today": true}}}
-	if args.MatchKVList("created", map[string]string{}) {
-		t.Fatalf("Expected false for (%v,created), got true", args)
-	}
-}
-
-func TestArgsMatchKVList(t *testing.T) {
-	// Not empty sources
-	sources := map[string]string{
-		"key1": "value1",
-		"key2": "value2",
-		"key3": "value3",
-	}
-
-	matches := map[*Args]string{
-		&Args{}: "field",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true},
-			"labels":  map[string]bool{"key1": true}},
-		}: "labels",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true},
-			"labels":  map[string]bool{"key1=value1": true}},
-		}: "labels",
-	}
-
-	for args, field := range matches {
-		if args.MatchKVList(field, sources) != true {
-			t.Fatalf("Expected true for %v on %v, got false", sources, args)
-		}
-	}
-
-	differs := map[*Args]string{
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true},
-			"labels":  map[string]bool{"key4": true}},
-		}: "labels",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true},
-			"labels":  map[string]bool{"key1=value3": true}},
-		}: "labels",
-	}
-
-	for args, field := range differs {
-		if args.MatchKVList(field, sources) != false {
-			t.Fatalf("Expected false for %v on %v, got true", sources, args)
-		}
-	}
-}
-
-func TestArgsMatch(t *testing.T) {
-	source := "today"
-
-	matches := map[*Args]string{
-		&Args{}: "field",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today": true}},
-		}: "today",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"to*": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"to(.*)": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"tod": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"anyting": true, "to*": true}},
-		}: "created",
-	}
-
-	for args, field := range matches {
-		if args.Match(field, source) != true {
-			t.Fatalf("Expected true for %v on %v, got false", source, args)
-		}
-	}
-
-	differs := map[*Args]string{
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"tomorrow": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"to(day": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"tom(.*)": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"tom": true}},
-		}: "created",
-		&Args{map[string]map[string]bool{
-			"created": map[string]bool{"today1": true},
-			"labels":  map[string]bool{"today": true}},
-		}: "created",
-	}
-
-	for args, field := range differs {
-		if args.Match(field, source) != false {
-			t.Fatalf("Expected false for %v on %v, got true", source, args)
-		}
-	}
-}
-
-func TestAdd(t *testing.T) {
-	f := NewArgs()
-	f.Add("status", "running")
-	v := f.fields["status"]
-	if len(v) != 1 || !v["running"] {
-		t.Fatalf("Expected to include a running status, got %v", v)
-	}
-
-	f.Add("status", "paused")
-	if len(v) != 2 || !v["paused"] {
-		t.Fatalf("Expected to include a paused status, got %v", v)
-	}
-}
-
-func TestDel(t *testing.T) {
-	f := NewArgs()
-	f.Add("status", "running")
-	f.Del("status", "running")
-	v := f.fields["status"]
-	if v["running"] {
-		t.Fatalf("Expected to not include a running status filter, got true")
-	}
-}
-
-func TestLen(t *testing.T) {
-	f := NewArgs()
-	if f.Len() != 0 {
-		t.Fatalf("Expected to not include any field")
-	}
-	f.Add("status", "running")
-	if f.Len() != 1 {
-		t.Fatalf("Expected to include one field")
-	}
-}
-
-func TestExactMatch(t *testing.T) {
-	f := NewArgs()
-
-	if !f.ExactMatch("status", "running") {
-		t.Fatalf("Expected to match `running` when there are no filters, got false")
-	}
-
-	f.Add("status", "running")
-	f.Add("status", "pause*")
-
-	if !f.ExactMatch("status", "running") {
-		t.Fatalf("Expected to match `running` with one of the filters, got false")
-	}
-
-	if f.ExactMatch("status", "paused") {
-		t.Fatalf("Expected to not match `paused` with one of the filters, got true")
-	}
-}
-
-func TestOnlyOneExactMatch(t *testing.T) {
-	f := NewArgs()
-
-	if !f.UniqueExactMatch("status", "running") {
-		t.Fatalf("Expected to match `running` when there are no filters, got false")
-	}
-
-	f.Add("status", "running")
-
-	if !f.UniqueExactMatch("status", "running") {
-		t.Fatalf("Expected to match `running` with one of the filters, got false")
-	}
-
-	if f.UniqueExactMatch("status", "paused") {
-		t.Fatalf("Expected to not match `paused` with one of the filters, got true")
-	}
-
-	f.Add("status", "pause")
-	if f.UniqueExactMatch("status", "running") {
-		t.Fatalf("Expected to not match only `running` with two filters, got true")
-	}
-}
-
-func TestInclude(t *testing.T) {
-	f := NewArgs()
-	if f.Include("status") {
-		t.Fatalf("Expected to not include a status key, got true")
-	}
-	f.Add("status", "running")
-	if !f.Include("status") {
-		t.Fatalf("Expected to include a status key, got false")
-	}
-}
-
-func TestValidate(t *testing.T) {
-	f := NewArgs()
-	f.Add("status", "running")
-
-	valid := map[string]bool{
-		"status":   true,
-		"dangling": true,
-	}
-
-	if err := f.Validate(valid); err != nil {
-		t.Fatal(err)
-	}
-
-	f.Add("bogus", "running")
-	if err := f.Validate(valid); err == nil {
-		t.Fatalf("Expected to return an error, got nil")
-	}
-}
-
-func TestWalkValues(t *testing.T) {
-	f := NewArgs()
-	f.Add("status", "running")
-	f.Add("status", "paused")
-
-	f.WalkValues("status", func(value string) error {
-		if value != "running" && value != "paused" {
-			t.Fatalf("Unexpected value %s", value)
-		}
-		return nil
-	})
-
-	err := f.WalkValues("status", func(value string) error {
-		return fmt.Errorf("return")
-	})
-	if err == nil {
-		t.Fatalf("Expected to get an error, got nil")
-	}
-
-	err = f.WalkValues("foo", func(value string) error {
-		return fmt.Errorf("return")
-	})
-	if err != nil {
-		t.Fatalf("Expected to not iterate when the field doesn't exist, got %v", err)
-	}
-}
-
-func TestFuzzyMatch(t *testing.T) {
-	f := NewArgs()
-	f.Add("container", "foo")
-
-	cases := map[string]bool{
-		"foo":    true,
-		"foobar": true,
-		"barfoo": false,
-		"bar":    false,
-	}
-	for source, match := range cases {
-		got := f.FuzzyMatch("container", source)
-		if got != match {
-			t.Fatalf("Expected %v, got %v: %s", match, got, source)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/id_response.go b/installer/vendor/github.com/docker/docker/api/types/id_response.go
deleted file mode 100644
index 7592d2f8b1..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/id_response.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// IDResponse Response to an API call that returns just an Id
-// swagger:model IdResponse
-type IDResponse struct {
-
-	// The id of the newly created object.
-	// Required: true
-	ID string `json:"Id"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/image_summary.go b/installer/vendor/github.com/docker/docker/api/types/image_summary.go
deleted file mode 100644
index e145b3dcfc..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/image_summary.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ImageSummary image summary
-// swagger:model ImageSummary
-type ImageSummary struct {
-
-	// containers
-	// Required: true
-	Containers int64 `json:"Containers"`
-
-	// created
-	// Required: true
-	Created int64 `json:"Created"`
-
-	// Id
-	// Required: true
-	ID string `json:"Id"`
-
-	// labels
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// parent Id
-	// Required: true
-	ParentID string `json:"ParentId"`
-
-	// repo digests
-	// Required: true
-	RepoDigests []string `json:"RepoDigests"`
-
-	// repo tags
-	// Required: true
-	RepoTags []string `json:"RepoTags"`
-
-	// shared size
-	// Required: true
-	SharedSize int64 `json:"SharedSize"`
-
-	// size
-	// Required: true
-	Size int64 `json:"Size"`
-
-	// virtual size
-	// Required: true
-	VirtualSize int64 `json:"VirtualSize"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/mount/mount.go b/installer/vendor/github.com/docker/docker/api/types/mount/mount.go
deleted file mode 100644
index 31f2365b8e..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/mount/mount.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package mount
-
-import (
-	"os"
-)
-
-// Type represents the type of a mount.
-type Type string
-
-// Type constants
-const (
-	// TypeBind is the type for mounting host dir
-	TypeBind Type = "bind"
-	// TypeVolume is the type for remote storage volumes
-	TypeVolume Type = "volume"
-	// TypeTmpfs is the type for mounting tmpfs
-	TypeTmpfs Type = "tmpfs"
-)
-
-// Mount represents a mount (volume).
-type Mount struct {
-	Type Type `json:",omitempty"`
-	// Source specifies the name of the mount. Depending on mount type, this
-	// may be a volume name or a host path, or even ignored.
-	// Source is not supported for tmpfs (must be an empty value)
-	Source   string `json:",omitempty"`
-	Target   string `json:",omitempty"`
-	ReadOnly bool   `json:",omitempty"`
-
-	BindOptions   *BindOptions   `json:",omitempty"`
-	VolumeOptions *VolumeOptions `json:",omitempty"`
-	TmpfsOptions  *TmpfsOptions  `json:",omitempty"`
-}
-
-// Propagation represents the propagation of a mount.
-type Propagation string
-
-const (
-	// PropagationRPrivate RPRIVATE
-	PropagationRPrivate Propagation = "rprivate"
-	// PropagationPrivate PRIVATE
-	PropagationPrivate Propagation = "private"
-	// PropagationRShared RSHARED
-	PropagationRShared Propagation = "rshared"
-	// PropagationShared SHARED
-	PropagationShared Propagation = "shared"
-	// PropagationRSlave RSLAVE
-	PropagationRSlave Propagation = "rslave"
-	// PropagationSlave SLAVE
-	PropagationSlave Propagation = "slave"
-)
-
-// Propagations is the list of all valid mount propagations
-var Propagations = []Propagation{
-	PropagationRPrivate,
-	PropagationPrivate,
-	PropagationRShared,
-	PropagationShared,
-	PropagationRSlave,
-	PropagationSlave,
-}
-
-// BindOptions defines options specific to mounts of type "bind".
-type BindOptions struct {
-	Propagation Propagation `json:",omitempty"`
-}
-
-// VolumeOptions represents the options for a mount of type volume.
-type VolumeOptions struct {
-	NoCopy       bool              `json:",omitempty"`
-	Labels       map[string]string `json:",omitempty"`
-	DriverConfig *Driver           `json:",omitempty"`
-}
-
-// Driver represents a volume driver.
-type Driver struct {
-	Name    string            `json:",omitempty"`
-	Options map[string]string `json:",omitempty"`
-}
-
-// TmpfsOptions defines options specific to mounts of type "tmpfs".
-type TmpfsOptions struct {
-	// Size sets the size of the tmpfs, in bytes.
-	//
-	// This will be converted to an operating system specific value
-	// depending on the host. For example, on linux, it will be convered to
-	// use a 'k', 'm' or 'g' syntax. BSD, though not widely supported with
-	// docker, uses a straight byte value.
-	//
-	// Percentages are not supported.
-	SizeBytes int64 `json:",omitempty"`
-	// Mode of the tmpfs upon creation
-	Mode os.FileMode `json:",omitempty"`
-
-	// TODO(stevvooe): There are several more tmpfs flags, specified in the
-	// daemon, that are accepted. Only the most basic are added for now.
-	//
-	// From docker/docker/pkg/mount/flags.go:
-	//
-	// var validFlags = map[string]bool{
-	// 	"":          true,
-	// 	"size":      true, X
-	// 	"mode":      true, X
-	// 	"uid":       true,
-	// 	"gid":       true,
-	// 	"nr_inodes": true,
-	// 	"nr_blocks": true,
-	// 	"mpol":      true,
-	// }
-	//
-	// Some of these may be straightforward to add, but others, such as
-	// uid/gid have implications in a clustered system.
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/network/network.go b/installer/vendor/github.com/docker/docker/api/types/network/network.go
deleted file mode 100644
index 832b3edb9f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/network/network.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package network
-
-// Address represents an IP address
-type Address struct {
-	Addr      string
-	PrefixLen int
-}
-
-// IPAM represents IP Address Management
-type IPAM struct {
-	Driver  string
-	Options map[string]string //Per network IPAM driver options
-	Config  []IPAMConfig
-}
-
-// IPAMConfig represents IPAM configurations
-type IPAMConfig struct {
-	Subnet     string            `json:",omitempty"`
-	IPRange    string            `json:",omitempty"`
-	Gateway    string            `json:",omitempty"`
-	AuxAddress map[string]string `json:"AuxiliaryAddresses,omitempty"`
-}
-
-// EndpointIPAMConfig represents IPAM configurations for the endpoint
-type EndpointIPAMConfig struct {
-	IPv4Address  string   `json:",omitempty"`
-	IPv6Address  string   `json:",omitempty"`
-	LinkLocalIPs []string `json:",omitempty"`
-}
-
-// PeerInfo represents one peer of a overlay network
-type PeerInfo struct {
-	Name string
-	IP   string
-}
-
-// EndpointSettings stores the network endpoint details
-type EndpointSettings struct {
-	// Configurations
-	IPAMConfig *EndpointIPAMConfig
-	Links      []string
-	Aliases    []string
-	// Operational data
-	NetworkID           string
-	EndpointID          string
-	Gateway             string
-	IPAddress           string
-	IPPrefixLen         int
-	IPv6Gateway         string
-	GlobalIPv6Address   string
-	GlobalIPv6PrefixLen int
-	MacAddress          string
-}
-
-// NetworkingConfig represents the container's networking configuration for each of its interfaces
-// Carries the networking configs specified in the `docker run` and `docker network connect` commands
-type NetworkingConfig struct {
-	EndpointsConfig map[string]*EndpointSettings // Endpoint configs for each connecting network
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin.go b/installer/vendor/github.com/docker/docker/api/types/plugin.go
deleted file mode 100644
index 6cc7a23b02..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Plugin A plugin for the Engine API
-// swagger:model Plugin
-type Plugin struct {
-
-	// config
-	// Required: true
-	Config PluginConfig `json:"Config"`
-
-	// True when the plugin is running. False when the plugin is not running, only installed.
-	// Required: true
-	Enabled bool `json:"Enabled"`
-
-	// Id
-	ID string `json:"Id,omitempty"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// plugin remote reference used to push/pull the plugin
-	PluginReference string `json:"PluginReference,omitempty"`
-
-	// settings
-	// Required: true
-	Settings PluginSettings `json:"Settings"`
-}
-
-// PluginConfig The config of a plugin.
-// swagger:model PluginConfig
-type PluginConfig struct {
-
-	// args
-	// Required: true
-	Args PluginConfigArgs `json:"Args"`
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// documentation
-	// Required: true
-	Documentation string `json:"Documentation"`
-
-	// entrypoint
-	// Required: true
-	Entrypoint []string `json:"Entrypoint"`
-
-	// env
-	// Required: true
-	Env []PluginEnv `json:"Env"`
-
-	// interface
-	// Required: true
-	Interface PluginConfigInterface `json:"Interface"`
-
-	// linux
-	// Required: true
-	Linux PluginConfigLinux `json:"Linux"`
-
-	// mounts
-	// Required: true
-	Mounts []PluginMount `json:"Mounts"`
-
-	// network
-	// Required: true
-	Network PluginConfigNetwork `json:"Network"`
-
-	// propagated mount
-	// Required: true
-	PropagatedMount string `json:"PropagatedMount"`
-
-	// user
-	User PluginConfigUser `json:"User,omitempty"`
-
-	// work dir
-	// Required: true
-	WorkDir string `json:"WorkDir"`
-
-	// rootfs
-	Rootfs *PluginConfigRootfs `json:"rootfs,omitempty"`
-}
-
-// PluginConfigArgs plugin config args
-// swagger:model PluginConfigArgs
-type PluginConfigArgs struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// value
-	// Required: true
-	Value []string `json:"Value"`
-}
-
-// PluginConfigInterface The interface between Docker and the plugin
-// swagger:model PluginConfigInterface
-type PluginConfigInterface struct {
-
-	// socket
-	// Required: true
-	Socket string `json:"Socket"`
-
-	// types
-	// Required: true
-	Types []PluginInterfaceType `json:"Types"`
-}
-
-// PluginConfigLinux plugin config linux
-// swagger:model PluginConfigLinux
-type PluginConfigLinux struct {
-
-	// allow all devices
-	// Required: true
-	AllowAllDevices bool `json:"AllowAllDevices"`
-
-	// capabilities
-	// Required: true
-	Capabilities []string `json:"Capabilities"`
-
-	// devices
-	// Required: true
-	Devices []PluginDevice `json:"Devices"`
-}
-
-// PluginConfigNetwork plugin config network
-// swagger:model PluginConfigNetwork
-type PluginConfigNetwork struct {
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
-
-// PluginConfigRootfs plugin config rootfs
-// swagger:model PluginConfigRootfs
-type PluginConfigRootfs struct {
-
-	// diff ids
-	DiffIds []string `json:"diff_ids"`
-
-	// type
-	Type string `json:"type,omitempty"`
-}
-
-// PluginConfigUser plugin config user
-// swagger:model PluginConfigUser
-type PluginConfigUser struct {
-
-	// g ID
-	GID uint32 `json:"GID,omitempty"`
-
-	// UID
-	UID uint32 `json:"UID,omitempty"`
-}
-
-// PluginSettings Settings that can be modified by users.
-// swagger:model PluginSettings
-type PluginSettings struct {
-
-	// args
-	// Required: true
-	Args []string `json:"Args"`
-
-	// devices
-	// Required: true
-	Devices []PluginDevice `json:"Devices"`
-
-	// env
-	// Required: true
-	Env []string `json:"Env"`
-
-	// mounts
-	// Required: true
-	Mounts []PluginMount `json:"Mounts"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin_device.go b/installer/vendor/github.com/docker/docker/api/types/plugin_device.go
deleted file mode 100644
index 5699010675..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin_device.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginDevice plugin device
-// swagger:model PluginDevice
-type PluginDevice struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// path
-	// Required: true
-	Path *string `json:"Path"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin_env.go b/installer/vendor/github.com/docker/docker/api/types/plugin_env.go
deleted file mode 100644
index 32962dc2eb..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin_env.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginEnv plugin env
-// swagger:model PluginEnv
-type PluginEnv struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// value
-	// Required: true
-	Value *string `json:"Value"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin_interface_type.go b/installer/vendor/github.com/docker/docker/api/types/plugin_interface_type.go
deleted file mode 100644
index c82f204e87..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin_interface_type.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginInterfaceType plugin interface type
-// swagger:model PluginInterfaceType
-type PluginInterfaceType struct {
-
-	// capability
-	// Required: true
-	Capability string `json:"Capability"`
-
-	// prefix
-	// Required: true
-	Prefix string `json:"Prefix"`
-
-	// version
-	// Required: true
-	Version string `json:"Version"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin_mount.go b/installer/vendor/github.com/docker/docker/api/types/plugin_mount.go
deleted file mode 100644
index 5c031cf8b5..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin_mount.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// PluginMount plugin mount
-// swagger:model PluginMount
-type PluginMount struct {
-
-	// description
-	// Required: true
-	Description string `json:"Description"`
-
-	// destination
-	// Required: true
-	Destination string `json:"Destination"`
-
-	// name
-	// Required: true
-	Name string `json:"Name"`
-
-	// options
-	// Required: true
-	Options []string `json:"Options"`
-
-	// settable
-	// Required: true
-	Settable []string `json:"Settable"`
-
-	// source
-	// Required: true
-	Source *string `json:"Source"`
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/plugin_responses.go b/installer/vendor/github.com/docker/docker/api/types/plugin_responses.go
deleted file mode 100644
index d6f7553119..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/plugin_responses.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package types
-
-import (
-	"encoding/json"
-	"fmt"
-)
-
-// PluginsListResponse contains the response for the Engine API
-type PluginsListResponse []*Plugin
-
-const (
-	authzDriver   = "AuthzDriver"
-	graphDriver   = "GraphDriver"
-	ipamDriver    = "IpamDriver"
-	networkDriver = "NetworkDriver"
-	volumeDriver  = "VolumeDriver"
-)
-
-// UnmarshalJSON implements json.Unmarshaler for PluginInterfaceType
-func (t *PluginInterfaceType) UnmarshalJSON(p []byte) error {
-	versionIndex := len(p)
-	prefixIndex := 0
-	if len(p) < 2 || p[0] != '"' || p[len(p)-1] != '"' {
-		return fmt.Errorf("%q is not a plugin interface type", p)
-	}
-	p = p[1 : len(p)-1]
-loop:
-	for i, b := range p {
-		switch b {
-		case '.':
-			prefixIndex = i
-		case '/':
-			versionIndex = i
-			break loop
-		}
-	}
-	t.Prefix = string(p[:prefixIndex])
-	t.Capability = string(p[prefixIndex+1 : versionIndex])
-	if versionIndex < len(p) {
-		t.Version = string(p[versionIndex+1:])
-	}
-	return nil
-}
-
-// MarshalJSON implements json.Marshaler for PluginInterfaceType
-func (t *PluginInterfaceType) MarshalJSON() ([]byte, error) {
-	return json.Marshal(t.String())
-}
-
-// String implements fmt.Stringer for PluginInterfaceType
-func (t PluginInterfaceType) String() string {
-	return fmt.Sprintf("%s.%s/%s", t.Prefix, t.Capability, t.Version)
-}
-
-// PluginPrivilege describes a permission the user has to accept
-// upon installing a plugin.
-type PluginPrivilege struct {
-	Name        string
-	Description string
-	Value       []string
-}
-
-// PluginPrivileges is a list of PluginPrivilege
-type PluginPrivileges []PluginPrivilege
diff --git a/installer/vendor/github.com/docker/docker/api/types/port.go b/installer/vendor/github.com/docker/docker/api/types/port.go
deleted file mode 100644
index ad52d46d56..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/port.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Port An open port on a container
-// swagger:model Port
-type Port struct {
-
-	// IP
-	IP string `json:"IP,omitempty"`
-
-	// Port on the container
-	// Required: true
-	PrivatePort uint16 `json:"PrivatePort"`
-
-	// Port exposed on the host
-	PublicPort uint16 `json:"PublicPort,omitempty"`
-
-	// type
-	// Required: true
-	Type string `json:"Type"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/reference/image_reference.go b/installer/vendor/github.com/docker/docker/api/types/reference/image_reference.go
deleted file mode 100644
index be9cf8ebed..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/reference/image_reference.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package reference
-
-import (
-	distreference "github.com/docker/distribution/reference"
-)
-
-// Parse parses the given references and returns the repository and
-// tag (if present) from it. If there is an error during parsing, it will
-// return an error.
-func Parse(ref string) (string, string, error) {
-	distributionRef, err := distreference.ParseNamed(ref)
-	if err != nil {
-		return "", "", err
-	}
-
-	tag := GetTagFromNamedRef(distributionRef)
-	return distributionRef.Name(), tag, nil
-}
-
-// GetTagFromNamedRef returns a tag from the specified reference.
-// This function is necessary as long as the docker "server" api makes the distinction between repository
-// and tags.
-func GetTagFromNamedRef(ref distreference.Named) string {
-	var tag string
-	switch x := ref.(type) {
-	case distreference.Digested:
-		tag = x.Digest().String()
-	case distreference.NamedTagged:
-		tag = x.Tag()
-	default:
-		tag = "latest"
-	}
-	return tag
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/reference/image_reference_test.go b/installer/vendor/github.com/docker/docker/api/types/reference/image_reference_test.go
deleted file mode 100644
index 61fb676b6c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/reference/image_reference_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package reference
-
-import (
-	"testing"
-)
-
-func TestParse(t *testing.T) {
-	testCases := []struct {
-		ref           string
-		expectedName  string
-		expectedTag   string
-		expectedError bool
-	}{
-		{
-			ref:           "",
-			expectedName:  "",
-			expectedTag:   "",
-			expectedError: true,
-		},
-		{
-			ref:           "repository",
-			expectedName:  "repository",
-			expectedTag:   "latest",
-			expectedError: false,
-		},
-		{
-			ref:           "repository:tag",
-			expectedName:  "repository",
-			expectedTag:   "tag",
-			expectedError: false,
-		},
-		{
-			ref:           "test.com/repository",
-			expectedName:  "test.com/repository",
-			expectedTag:   "latest",
-			expectedError: false,
-		},
-		{
-			ref:           "test.com:5000/test/repository",
-			expectedName:  "test.com:5000/test/repository",
-			expectedTag:   "latest",
-			expectedError: false,
-		},
-		{
-			ref:           "test.com:5000/repo@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-			expectedName:  "test.com:5000/repo",
-			expectedTag:   "sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-			expectedError: false,
-		},
-		{
-			ref:           "test.com:5000/repo:tag@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-			expectedName:  "test.com:5000/repo",
-			expectedTag:   "sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff",
-			expectedError: false,
-		},
-	}
-
-	for _, c := range testCases {
-		name, tag, err := Parse(c.ref)
-		if err != nil && c.expectedError {
-			continue
-		} else if err != nil {
-			t.Fatalf("error with %s: %s", c.ref, err.Error())
-		}
-		if name != c.expectedName {
-			t.Fatalf("expected name %s, got %s", c.expectedName, name)
-		}
-		if tag != c.expectedTag {
-			t.Fatalf("expected tag %s, got %s", c.expectedTag, tag)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/registry/authenticate.go b/installer/vendor/github.com/docker/docker/api/types/registry/authenticate.go
deleted file mode 100644
index 5e37d19bd4..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/registry/authenticate.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package registry
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-// AuthenticateOKBody authenticate o k body
-// swagger:model AuthenticateOKBody
-type AuthenticateOKBody struct {
-
-	// An opaque token used to authenticate a user after a successful login
-	// Required: true
-	IdentityToken string `json:"IdentityToken"`
-
-	// The status of the authentication
-	// Required: true
-	Status string `json:"Status"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/registry/registry.go b/installer/vendor/github.com/docker/docker/api/types/registry/registry.go
deleted file mode 100644
index 28fafab901..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/registry/registry.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package registry
-
-import (
-	"encoding/json"
-	"net"
-)
-
-// ServiceConfig stores daemon registry services configuration.
-type ServiceConfig struct {
-	InsecureRegistryCIDRs []*NetIPNet           `json:"InsecureRegistryCIDRs"`
-	IndexConfigs          map[string]*IndexInfo `json:"IndexConfigs"`
-	Mirrors               []string
-}
-
-// NetIPNet is the net.IPNet type, which can be marshalled and
-// unmarshalled to JSON
-type NetIPNet net.IPNet
-
-// String returns the CIDR notation of ipnet
-func (ipnet *NetIPNet) String() string {
-	return (*net.IPNet)(ipnet).String()
-}
-
-// MarshalJSON returns the JSON representation of the IPNet
-func (ipnet *NetIPNet) MarshalJSON() ([]byte, error) {
-	return json.Marshal((*net.IPNet)(ipnet).String())
-}
-
-// UnmarshalJSON sets the IPNet from a byte array of JSON
-func (ipnet *NetIPNet) UnmarshalJSON(b []byte) (err error) {
-	var ipnetStr string
-	if err = json.Unmarshal(b, &ipnetStr); err == nil {
-		var cidr *net.IPNet
-		if _, cidr, err = net.ParseCIDR(ipnetStr); err == nil {
-			*ipnet = NetIPNet(*cidr)
-		}
-	}
-	return
-}
-
-// IndexInfo contains information about a registry
-//
-// RepositoryInfo Examples:
-// {
-//   "Index" : {
-//     "Name" : "docker.io",
-//     "Mirrors" : ["https://registry-2.docker.io/v1/", "https://registry-3.docker.io/v1/"],
-//     "Secure" : true,
-//     "Official" : true,
-//   },
-//   "RemoteName" : "library/debian",
-//   "LocalName" : "debian",
-//   "CanonicalName" : "docker.io/debian"
-//   "Official" : true,
-// }
-//
-// {
-//   "Index" : {
-//     "Name" : "127.0.0.1:5000",
-//     "Mirrors" : [],
-//     "Secure" : false,
-//     "Official" : false,
-//   },
-//   "RemoteName" : "user/repo",
-//   "LocalName" : "127.0.0.1:5000/user/repo",
-//   "CanonicalName" : "127.0.0.1:5000/user/repo",
-//   "Official" : false,
-// }
-type IndexInfo struct {
-	// Name is the name of the registry, such as "docker.io"
-	Name string
-	// Mirrors is a list of mirrors, expressed as URIs
-	Mirrors []string
-	// Secure is set to false if the registry is part of the list of
-	// insecure registries. Insecure registries accept HTTP and/or accept
-	// HTTPS with certificates from unknown CAs.
-	Secure bool
-	// Official indicates whether this is an official registry
-	Official bool
-}
-
-// SearchResult describes a search result returned from a registry
-type SearchResult struct {
-	// StarCount indicates the number of stars this repository has
-	StarCount int `json:"star_count"`
-	// IsOfficial is true if the result is from an official repository.
-	IsOfficial bool `json:"is_official"`
-	// Name is the name of the repository
-	Name string `json:"name"`
-	// IsAutomated indicates whether the result is automated
-	IsAutomated bool `json:"is_automated"`
-	// Description is a textual description of the repository
-	Description string `json:"description"`
-}
-
-// SearchResults lists a collection search results returned from a registry
-type SearchResults struct {
-	// Query contains the query string that generated the search results
-	Query string `json:"query"`
-	// NumResults indicates the number of results the query returned
-	NumResults int `json:"num_results"`
-	// Results is a slice containing the actual results for the search
-	Results []SearchResult `json:"results"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/seccomp.go b/installer/vendor/github.com/docker/docker/api/types/seccomp.go
deleted file mode 100644
index 4f02ef36b8..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/seccomp.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package types
-
-// Seccomp represents the config for a seccomp profile for syscall restriction.
-type Seccomp struct {
-	DefaultAction Action `json:"defaultAction"`
-	// Architectures is kept to maintain backward compatibility with the old
-	// seccomp profile.
-	Architectures []Arch         `json:"architectures,omitempty"`
-	ArchMap       []Architecture `json:"archMap,omitempty"`
-	Syscalls      []*Syscall     `json:"syscalls"`
-}
-
-// Architecture is used to represent an specific architecture
-// and its sub-architectures
-type Architecture struct {
-	Arch      Arch   `json:"architecture"`
-	SubArches []Arch `json:"subArchitectures"`
-}
-
-// Arch used for architectures
-type Arch string
-
-// Additional architectures permitted to be used for system calls
-// By default only the native architecture of the kernel is permitted
-const (
-	ArchX86         Arch = "SCMP_ARCH_X86"
-	ArchX86_64      Arch = "SCMP_ARCH_X86_64"
-	ArchX32         Arch = "SCMP_ARCH_X32"
-	ArchARM         Arch = "SCMP_ARCH_ARM"
-	ArchAARCH64     Arch = "SCMP_ARCH_AARCH64"
-	ArchMIPS        Arch = "SCMP_ARCH_MIPS"
-	ArchMIPS64      Arch = "SCMP_ARCH_MIPS64"
-	ArchMIPS64N32   Arch = "SCMP_ARCH_MIPS64N32"
-	ArchMIPSEL      Arch = "SCMP_ARCH_MIPSEL"
-	ArchMIPSEL64    Arch = "SCMP_ARCH_MIPSEL64"
-	ArchMIPSEL64N32 Arch = "SCMP_ARCH_MIPSEL64N32"
-	ArchPPC         Arch = "SCMP_ARCH_PPC"
-	ArchPPC64       Arch = "SCMP_ARCH_PPC64"
-	ArchPPC64LE     Arch = "SCMP_ARCH_PPC64LE"
-	ArchS390        Arch = "SCMP_ARCH_S390"
-	ArchS390X       Arch = "SCMP_ARCH_S390X"
-)
-
-// Action taken upon Seccomp rule match
-type Action string
-
-// Define actions for Seccomp rules
-const (
-	ActKill  Action = "SCMP_ACT_KILL"
-	ActTrap  Action = "SCMP_ACT_TRAP"
-	ActErrno Action = "SCMP_ACT_ERRNO"
-	ActTrace Action = "SCMP_ACT_TRACE"
-	ActAllow Action = "SCMP_ACT_ALLOW"
-)
-
-// Operator used to match syscall arguments in Seccomp
-type Operator string
-
-// Define operators for syscall arguments in Seccomp
-const (
-	OpNotEqual     Operator = "SCMP_CMP_NE"
-	OpLessThan     Operator = "SCMP_CMP_LT"
-	OpLessEqual    Operator = "SCMP_CMP_LE"
-	OpEqualTo      Operator = "SCMP_CMP_EQ"
-	OpGreaterEqual Operator = "SCMP_CMP_GE"
-	OpGreaterThan  Operator = "SCMP_CMP_GT"
-	OpMaskedEqual  Operator = "SCMP_CMP_MASKED_EQ"
-)
-
-// Arg used for matching specific syscall arguments in Seccomp
-type Arg struct {
-	Index    uint     `json:"index"`
-	Value    uint64   `json:"value"`
-	ValueTwo uint64   `json:"valueTwo"`
-	Op       Operator `json:"op"`
-}
-
-// Filter is used to conditionally apply Seccomp rules
-type Filter struct {
-	Caps   []string `json:"caps,omitempty"`
-	Arches []string `json:"arches,omitempty"`
-}
-
-// Syscall is used to match a group of syscalls in Seccomp
-type Syscall struct {
-	Name     string   `json:"name,omitempty"`
-	Names    []string `json:"names,omitempty"`
-	Action   Action   `json:"action"`
-	Args     []*Arg   `json:"args"`
-	Comment  string   `json:"comment"`
-	Includes Filter   `json:"includes"`
-	Excludes Filter   `json:"excludes"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/service_update_response.go b/installer/vendor/github.com/docker/docker/api/types/service_update_response.go
deleted file mode 100644
index 74ea64b1bb..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/service_update_response.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// ServiceUpdateResponse service update response
-// swagger:model ServiceUpdateResponse
-type ServiceUpdateResponse struct {
-
-	// Optional warning messages
-	Warnings []string `json:"Warnings"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/stats.go b/installer/vendor/github.com/docker/docker/api/types/stats.go
deleted file mode 100644
index 9bf1928b8c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/stats.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Package types is used for API stability in the types and response to the
-// consumers of the API stats endpoint.
-package types
-
-import "time"
-
-// ThrottlingData stores CPU throttling stats of one running container.
-// Not used on Windows.
-type ThrottlingData struct {
-	// Number of periods with throttling active
-	Periods uint64 `json:"periods"`
-	// Number of periods when the container hits its throttling limit.
-	ThrottledPeriods uint64 `json:"throttled_periods"`
-	// Aggregate time the container was throttled for in nanoseconds.
-	ThrottledTime uint64 `json:"throttled_time"`
-}
-
-// CPUUsage stores All CPU stats aggregated since container inception.
-type CPUUsage struct {
-	// Total CPU time consumed.
-	// Units: nanoseconds (Linux)
-	// Units: 100's of nanoseconds (Windows)
-	TotalUsage uint64 `json:"total_usage"`
-
-	// Total CPU time consumed per core (Linux). Not used on Windows.
-	// Units: nanoseconds.
-	PercpuUsage []uint64 `json:"percpu_usage,omitempty"`
-
-	// Time spent by tasks of the cgroup in kernel mode (Linux).
-	// Time spent by all container processes in kernel mode (Windows).
-	// Units: nanoseconds (Linux).
-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers.
-	UsageInKernelmode uint64 `json:"usage_in_kernelmode"`
-
-	// Time spent by tasks of the cgroup in user mode (Linux).
-	// Time spent by all container processes in user mode (Windows).
-	// Units: nanoseconds (Linux).
-	// Units: 100's of nanoseconds (Windows). Not populated for Hyper-V Containers
-	UsageInUsermode uint64 `json:"usage_in_usermode"`
-}
-
-// CPUStats aggregates and wraps all CPU related info of container
-type CPUStats struct {
-	// CPU Usage. Linux and Windows.
-	CPUUsage CPUUsage `json:"cpu_usage"`
-
-	// System Usage. Linux only.
-	SystemUsage uint64 `json:"system_cpu_usage,omitempty"`
-
-	// Throttling Data. Linux only.
-	ThrottlingData ThrottlingData `json:"throttling_data,omitempty"`
-}
-
-// MemoryStats aggregates all memory stats since container inception on Linux.
-// Windows returns stats for commit and private working set only.
-type MemoryStats struct {
-	// Linux Memory Stats
-
-	// current res_counter usage for memory
-	Usage uint64 `json:"usage,omitempty"`
-	// maximum usage ever recorded.
-	MaxUsage uint64 `json:"max_usage,omitempty"`
-	// TODO(vishh): Export these as stronger types.
-	// all the stats exported via memory.stat.
-	Stats map[string]uint64 `json:"stats,omitempty"`
-	// number of times memory usage hits limits.
-	Failcnt uint64 `json:"failcnt,omitempty"`
-	Limit   uint64 `json:"limit,omitempty"`
-
-	// Windows Memory Stats
-	// See https://technet.microsoft.com/en-us/magazine/ff382715.aspx
-
-	// committed bytes
-	Commit uint64 `json:"commitbytes,omitempty"`
-	// peak committed bytes
-	CommitPeak uint64 `json:"commitpeakbytes,omitempty"`
-	// private working set
-	PrivateWorkingSet uint64 `json:"privateworkingset,omitempty"`
-}
-
-// BlkioStatEntry is one small entity to store a piece of Blkio stats
-// Not used on Windows.
-type BlkioStatEntry struct {
-	Major uint64 `json:"major"`
-	Minor uint64 `json:"minor"`
-	Op    string `json:"op"`
-	Value uint64 `json:"value"`
-}
-
-// BlkioStats stores All IO service stats for data read and write.
-// This is a Linux specific structure as the differences between expressing
-// block I/O on Windows and Linux are sufficiently significant to make
-// little sense attempting to morph into a combined structure.
-type BlkioStats struct {
-	// number of bytes transferred to and from the block device
-	IoServiceBytesRecursive []BlkioStatEntry `json:"io_service_bytes_recursive"`
-	IoServicedRecursive     []BlkioStatEntry `json:"io_serviced_recursive"`
-	IoQueuedRecursive       []BlkioStatEntry `json:"io_queue_recursive"`
-	IoServiceTimeRecursive  []BlkioStatEntry `json:"io_service_time_recursive"`
-	IoWaitTimeRecursive     []BlkioStatEntry `json:"io_wait_time_recursive"`
-	IoMergedRecursive       []BlkioStatEntry `json:"io_merged_recursive"`
-	IoTimeRecursive         []BlkioStatEntry `json:"io_time_recursive"`
-	SectorsRecursive        []BlkioStatEntry `json:"sectors_recursive"`
-}
-
-// StorageStats is the disk I/O stats for read/write on Windows.
-type StorageStats struct {
-	ReadCountNormalized  uint64 `json:"read_count_normalized,omitempty"`
-	ReadSizeBytes        uint64 `json:"read_size_bytes,omitempty"`
-	WriteCountNormalized uint64 `json:"write_count_normalized,omitempty"`
-	WriteSizeBytes       uint64 `json:"write_size_bytes,omitempty"`
-}
-
-// NetworkStats aggregates the network stats of one container
-type NetworkStats struct {
-	// Bytes received. Windows and Linux.
-	RxBytes uint64 `json:"rx_bytes"`
-	// Packets received. Windows and Linux.
-	RxPackets uint64 `json:"rx_packets"`
-	// Received errors. Not used on Windows. Note that we dont `omitempty` this
-	// field as it is expected in the >=v1.21 API stats structure.
-	RxErrors uint64 `json:"rx_errors"`
-	// Incoming packets dropped. Windows and Linux.
-	RxDropped uint64 `json:"rx_dropped"`
-	// Bytes sent. Windows and Linux.
-	TxBytes uint64 `json:"tx_bytes"`
-	// Packets sent. Windows and Linux.
-	TxPackets uint64 `json:"tx_packets"`
-	// Sent errors. Not used on Windows. Note that we dont `omitempty` this
-	// field as it is expected in the >=v1.21 API stats structure.
-	TxErrors uint64 `json:"tx_errors"`
-	// Outgoing packets dropped. Windows and Linux.
-	TxDropped uint64 `json:"tx_dropped"`
-	// Endpoint ID. Not used on Linux.
-	EndpointID string `json:"endpoint_id,omitempty"`
-	// Instance ID. Not used on Linux.
-	InstanceID string `json:"instance_id,omitempty"`
-}
-
-// PidsStats contains the stats of a container's pids
-type PidsStats struct {
-	// Current is the number of pids in the cgroup
-	Current uint64 `json:"current,omitempty"`
-	// Limit is the hard limit on the number of pids in the cgroup.
-	// A "Limit" of 0 means that there is no limit.
-	Limit uint64 `json:"limit,omitempty"`
-}
-
-// Stats is Ultimate struct aggregating all types of stats of one container
-type Stats struct {
-	// Common stats
-	Read    time.Time `json:"read"`
-	PreRead time.Time `json:"preread"`
-
-	// Linux specific stats, not populated on Windows.
-	PidsStats  PidsStats  `json:"pids_stats,omitempty"`
-	BlkioStats BlkioStats `json:"blkio_stats,omitempty"`
-
-	// Windows specific stats, not populated on Linux.
-	NumProcs     uint32       `json:"num_procs"`
-	StorageStats StorageStats `json:"storage_stats,omitempty"`
-
-	// Shared stats
-	CPUStats    CPUStats    `json:"cpu_stats,omitempty"`
-	PreCPUStats CPUStats    `json:"precpu_stats,omitempty"` // "Pre"="Previous"
-	MemoryStats MemoryStats `json:"memory_stats,omitempty"`
-}
-
-// StatsJSON is newly used Networks
-type StatsJSON struct {
-	Stats
-
-	Name string `json:"name,omitempty"`
-	ID   string `json:"id,omitempty"`
-
-	// Networks request version >=1.21
-	Networks map[string]NetworkStats `json:"networks,omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/strslice/strslice.go b/installer/vendor/github.com/docker/docker/api/types/strslice/strslice.go
deleted file mode 100644
index bad493fb89..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/strslice/strslice.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package strslice
-
-import "encoding/json"
-
-// StrSlice represents a string or an array of strings.
-// We need to override the json decoder to accept both options.
-type StrSlice []string
-
-// UnmarshalJSON decodes the byte slice whether it's a string or an array of
-// strings. This method is needed to implement json.Unmarshaler.
-func (e *StrSlice) UnmarshalJSON(b []byte) error {
-	if len(b) == 0 {
-		// With no input, we preserve the existing value by returning nil and
-		// leaving the target alone. This allows defining default values for
-		// the type.
-		return nil
-	}
-
-	p := make([]string, 0, 1)
-	if err := json.Unmarshal(b, &p); err != nil {
-		var s string
-		if err := json.Unmarshal(b, &s); err != nil {
-			return err
-		}
-		p = append(p, s)
-	}
-
-	*e = p
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/strslice/strslice_test.go b/installer/vendor/github.com/docker/docker/api/types/strslice/strslice_test.go
deleted file mode 100644
index 1163b3652c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/strslice/strslice_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package strslice
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-)
-
-func TestStrSliceMarshalJSON(t *testing.T) {
-	for _, testcase := range []struct {
-		input    StrSlice
-		expected string
-	}{
-		// MADNESS(stevvooe): No clue why nil would be "" but empty would be
-		// "null". Had to make a change here that may affect compatibility.
-		{input: nil, expected: "null"},
-		{StrSlice{}, "[]"},
-		{StrSlice{"/bin/sh", "-c", "echo"}, `["/bin/sh","-c","echo"]`},
-	} {
-		data, err := json.Marshal(testcase.input)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(data) != testcase.expected {
-			t.Fatalf("%#v: expected %v, got %v", testcase.input, testcase.expected, string(data))
-		}
-	}
-}
-
-func TestStrSliceUnmarshalJSON(t *testing.T) {
-	parts := map[string][]string{
-		"":   {"default", "values"},
-		"[]": {},
-		`["/bin/sh","-c","echo"]`: {"/bin/sh", "-c", "echo"},
-	}
-	for json, expectedParts := range parts {
-		strs := StrSlice{"default", "values"}
-		if err := strs.UnmarshalJSON([]byte(json)); err != nil {
-			t.Fatal(err)
-		}
-
-		actualParts := []string(strs)
-		if !reflect.DeepEqual(actualParts, expectedParts) {
-			t.Fatalf("%#v: expected %v, got %v", json, expectedParts, actualParts)
-		}
-
-	}
-}
-
-func TestStrSliceUnmarshalString(t *testing.T) {
-	var e StrSlice
-	echo, err := json.Marshal("echo")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := json.Unmarshal(echo, &e); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(e) != 1 {
-		t.Fatalf("expected 1 element after unmarshal: %q", e)
-	}
-
-	if e[0] != "echo" {
-		t.Fatalf("expected `echo`, got: %q", e[0])
-	}
-}
-
-func TestStrSliceUnmarshalSlice(t *testing.T) {
-	var e StrSlice
-	echo, err := json.Marshal([]string{"echo"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := json.Unmarshal(echo, &e); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(e) != 1 {
-		t.Fatalf("expected 1 element after unmarshal: %q", e)
-	}
-
-	if e[0] != "echo" {
-		t.Fatalf("expected `echo`, got: %q", e[0])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/common.go b/installer/vendor/github.com/docker/docker/api/types/swarm/common.go
deleted file mode 100644
index 64a648bad1..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/common.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package swarm
-
-import "time"
-
-// Version represents the internal object version.
-type Version struct {
-	Index uint64 `json:",omitempty"`
-}
-
-// Meta is a base object inherited by most of the other once.
-type Meta struct {
-	Version   Version   `json:",omitempty"`
-	CreatedAt time.Time `json:",omitempty"`
-	UpdatedAt time.Time `json:",omitempty"`
-}
-
-// Annotations represents how to describe an object.
-type Annotations struct {
-	Name   string            `json:",omitempty"`
-	Labels map[string]string `json:",omitempty"`
-}
-
-// Driver represents a driver (network, logging).
-type Driver struct {
-	Name    string            `json:",omitempty"`
-	Options map[string]string `json:",omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/container.go b/installer/vendor/github.com/docker/docker/api/types/swarm/container.go
deleted file mode 100644
index 4ab476ccc3..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/container.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package swarm
-
-import (
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-)
-
-// DNSConfig specifies DNS related configurations in resolver configuration file (resolv.conf)
-// Detailed documentation is available in:
-// http://man7.org/linux/man-pages/man5/resolv.conf.5.html
-// `nameserver`, `search`, `options` have been supported.
-// TODO: `domain` is not supported yet.
-type DNSConfig struct {
-	// Nameservers specifies the IP addresses of the name servers
-	Nameservers []string `json:",omitempty"`
-	// Search specifies the search list for host-name lookup
-	Search []string `json:",omitempty"`
-	// Options allows certain internal resolver variables to be modified
-	Options []string `json:",omitempty"`
-}
-
-// ContainerSpec represents the spec of a container.
-type ContainerSpec struct {
-	Image           string                  `json:",omitempty"`
-	Labels          map[string]string       `json:",omitempty"`
-	Command         []string                `json:",omitempty"`
-	Args            []string                `json:",omitempty"`
-	Hostname        string                  `json:",omitempty"`
-	Env             []string                `json:",omitempty"`
-	Dir             string                  `json:",omitempty"`
-	User            string                  `json:",omitempty"`
-	Groups          []string                `json:",omitempty"`
-	TTY             bool                    `json:",omitempty"`
-	OpenStdin       bool                    `json:",omitempty"`
-	Mounts          []mount.Mount           `json:",omitempty"`
-	StopGracePeriod *time.Duration          `json:",omitempty"`
-	Healthcheck     *container.HealthConfig `json:",omitempty"`
-	// The format of extra hosts on swarmkit is specified in:
-	// http://man7.org/linux/man-pages/man5/hosts.5.html
-	//    IP_address canonical_hostname [aliases...]
-	Hosts     []string           `json:",omitempty"`
-	DNSConfig *DNSConfig         `json:",omitempty"`
-	Secrets   []*SecretReference `json:",omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/network.go b/installer/vendor/github.com/docker/docker/api/types/swarm/network.go
deleted file mode 100644
index 5a5e11bdba..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/network.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package swarm
-
-// Endpoint represents an endpoint.
-type Endpoint struct {
-	Spec       EndpointSpec        `json:",omitempty"`
-	Ports      []PortConfig        `json:",omitempty"`
-	VirtualIPs []EndpointVirtualIP `json:",omitempty"`
-}
-
-// EndpointSpec represents the spec of an endpoint.
-type EndpointSpec struct {
-	Mode  ResolutionMode `json:",omitempty"`
-	Ports []PortConfig   `json:",omitempty"`
-}
-
-// ResolutionMode represents a resolution mode.
-type ResolutionMode string
-
-const (
-	// ResolutionModeVIP VIP
-	ResolutionModeVIP ResolutionMode = "vip"
-	// ResolutionModeDNSRR DNSRR
-	ResolutionModeDNSRR ResolutionMode = "dnsrr"
-)
-
-// PortConfig represents the config of a port.
-type PortConfig struct {
-	Name     string             `json:",omitempty"`
-	Protocol PortConfigProtocol `json:",omitempty"`
-	// TargetPort is the port inside the container
-	TargetPort uint32 `json:",omitempty"`
-	// PublishedPort is the port on the swarm hosts
-	PublishedPort uint32 `json:",omitempty"`
-	// PublishMode is the mode in which port is published
-	PublishMode PortConfigPublishMode `json:",omitempty"`
-}
-
-// PortConfigPublishMode represents the mode in which the port is to
-// be published.
-type PortConfigPublishMode string
-
-const (
-	// PortConfigPublishModeIngress is used for ports published
-	// for ingress load balancing using routing mesh.
-	PortConfigPublishModeIngress PortConfigPublishMode = "ingress"
-	// PortConfigPublishModeHost is used for ports published
-	// for direct host level access on the host where the task is running.
-	PortConfigPublishModeHost PortConfigPublishMode = "host"
-)
-
-// PortConfigProtocol represents the protocol of a port.
-type PortConfigProtocol string
-
-const (
-	// TODO(stevvooe): These should be used generally, not just for PortConfig.
-
-	// PortConfigProtocolTCP TCP
-	PortConfigProtocolTCP PortConfigProtocol = "tcp"
-	// PortConfigProtocolUDP UDP
-	PortConfigProtocolUDP PortConfigProtocol = "udp"
-)
-
-// EndpointVirtualIP represents the virtual ip of a port.
-type EndpointVirtualIP struct {
-	NetworkID string `json:",omitempty"`
-	Addr      string `json:",omitempty"`
-}
-
-// Network represents a network.
-type Network struct {
-	ID string
-	Meta
-	Spec        NetworkSpec  `json:",omitempty"`
-	DriverState Driver       `json:",omitempty"`
-	IPAMOptions *IPAMOptions `json:",omitempty"`
-}
-
-// NetworkSpec represents the spec of a network.
-type NetworkSpec struct {
-	Annotations
-	DriverConfiguration *Driver      `json:",omitempty"`
-	IPv6Enabled         bool         `json:",omitempty"`
-	Internal            bool         `json:",omitempty"`
-	Attachable          bool         `json:",omitempty"`
-	IPAMOptions         *IPAMOptions `json:",omitempty"`
-}
-
-// NetworkAttachmentConfig represents the configuration of a network attachment.
-type NetworkAttachmentConfig struct {
-	Target  string   `json:",omitempty"`
-	Aliases []string `json:",omitempty"`
-}
-
-// NetworkAttachment represents a network attachment.
-type NetworkAttachment struct {
-	Network   Network  `json:",omitempty"`
-	Addresses []string `json:",omitempty"`
-}
-
-// IPAMOptions represents ipam options.
-type IPAMOptions struct {
-	Driver  Driver       `json:",omitempty"`
-	Configs []IPAMConfig `json:",omitempty"`
-}
-
-// IPAMConfig represents ipam configuration.
-type IPAMConfig struct {
-	Subnet  string `json:",omitempty"`
-	Range   string `json:",omitempty"`
-	Gateway string `json:",omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/node.go b/installer/vendor/github.com/docker/docker/api/types/swarm/node.go
deleted file mode 100644
index 379e17a779..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/node.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package swarm
-
-// Node represents a node.
-type Node struct {
-	ID string
-	Meta
-	// Spec defines the desired state of the node as specified by the user.
-	// The system will honor this and will *never* modify it.
-	Spec NodeSpec `json:",omitempty"`
-	// Description encapsulates the properties of the Node as reported by the
-	// agent.
-	Description NodeDescription `json:",omitempty"`
-	// Status provides the current status of the node, as seen by the manager.
-	Status NodeStatus `json:",omitempty"`
-	// ManagerStatus provides the current status of the node's manager
-	// component, if the node is a manager.
-	ManagerStatus *ManagerStatus `json:",omitempty"`
-}
-
-// NodeSpec represents the spec of a node.
-type NodeSpec struct {
-	Annotations
-	Role         NodeRole         `json:",omitempty"`
-	Availability NodeAvailability `json:",omitempty"`
-}
-
-// NodeRole represents the role of a node.
-type NodeRole string
-
-const (
-	// NodeRoleWorker WORKER
-	NodeRoleWorker NodeRole = "worker"
-	// NodeRoleManager MANAGER
-	NodeRoleManager NodeRole = "manager"
-)
-
-// NodeAvailability represents the availability of a node.
-type NodeAvailability string
-
-const (
-	// NodeAvailabilityActive ACTIVE
-	NodeAvailabilityActive NodeAvailability = "active"
-	// NodeAvailabilityPause PAUSE
-	NodeAvailabilityPause NodeAvailability = "pause"
-	// NodeAvailabilityDrain DRAIN
-	NodeAvailabilityDrain NodeAvailability = "drain"
-)
-
-// NodeDescription represents the description of a node.
-type NodeDescription struct {
-	Hostname  string            `json:",omitempty"`
-	Platform  Platform          `json:",omitempty"`
-	Resources Resources         `json:",omitempty"`
-	Engine    EngineDescription `json:",omitempty"`
-}
-
-// Platform represents the platform (Arch/OS).
-type Platform struct {
-	Architecture string `json:",omitempty"`
-	OS           string `json:",omitempty"`
-}
-
-// EngineDescription represents the description of an engine.
-type EngineDescription struct {
-	EngineVersion string              `json:",omitempty"`
-	Labels        map[string]string   `json:",omitempty"`
-	Plugins       []PluginDescription `json:",omitempty"`
-}
-
-// PluginDescription represents the description of an engine plugin.
-type PluginDescription struct {
-	Type string `json:",omitempty"`
-	Name string `json:",omitempty"`
-}
-
-// NodeStatus represents the status of a node.
-type NodeStatus struct {
-	State   NodeState `json:",omitempty"`
-	Message string    `json:",omitempty"`
-	Addr    string    `json:",omitempty"`
-}
-
-// Reachability represents the reachability of a node.
-type Reachability string
-
-const (
-	// ReachabilityUnknown UNKNOWN
-	ReachabilityUnknown Reachability = "unknown"
-	// ReachabilityUnreachable UNREACHABLE
-	ReachabilityUnreachable Reachability = "unreachable"
-	// ReachabilityReachable REACHABLE
-	ReachabilityReachable Reachability = "reachable"
-)
-
-// ManagerStatus represents the status of a manager.
-type ManagerStatus struct {
-	Leader       bool         `json:",omitempty"`
-	Reachability Reachability `json:",omitempty"`
-	Addr         string       `json:",omitempty"`
-}
-
-// NodeState represents the state of a node.
-type NodeState string
-
-const (
-	// NodeStateUnknown UNKNOWN
-	NodeStateUnknown NodeState = "unknown"
-	// NodeStateDown DOWN
-	NodeStateDown NodeState = "down"
-	// NodeStateReady READY
-	NodeStateReady NodeState = "ready"
-	// NodeStateDisconnected DISCONNECTED
-	NodeStateDisconnected NodeState = "disconnected"
-)
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/secret.go b/installer/vendor/github.com/docker/docker/api/types/swarm/secret.go
deleted file mode 100644
index fdb2388888..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/secret.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package swarm
-
-import "os"
-
-// Secret represents a secret.
-type Secret struct {
-	ID string
-	Meta
-	Spec SecretSpec
-}
-
-// SecretSpec represents a secret specification from a secret in swarm
-type SecretSpec struct {
-	Annotations
-	Data []byte `json:",omitempty"`
-}
-
-// SecretReferenceFileTarget is a file target in a secret reference
-type SecretReferenceFileTarget struct {
-	Name string
-	UID  string
-	GID  string
-	Mode os.FileMode
-}
-
-// SecretReference is a reference to a secret in swarm
-type SecretReference struct {
-	File       *SecretReferenceFileTarget
-	SecretID   string
-	SecretName string
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/service.go b/installer/vendor/github.com/docker/docker/api/types/swarm/service.go
deleted file mode 100644
index 2cf2642c1f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/service.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package swarm
-
-import "time"
-
-// Service represents a service.
-type Service struct {
-	ID string
-	Meta
-	Spec         ServiceSpec  `json:",omitempty"`
-	PreviousSpec *ServiceSpec `json:",omitempty"`
-	Endpoint     Endpoint     `json:",omitempty"`
-	UpdateStatus UpdateStatus `json:",omitempty"`
-}
-
-// ServiceSpec represents the spec of a service.
-type ServiceSpec struct {
-	Annotations
-
-	// TaskTemplate defines how the service should construct new tasks when
-	// orchestrating this service.
-	TaskTemplate TaskSpec      `json:",omitempty"`
-	Mode         ServiceMode   `json:",omitempty"`
-	UpdateConfig *UpdateConfig `json:",omitempty"`
-
-	// Networks field in ServiceSpec is deprecated. The
-	// same field in TaskSpec should be used instead.
-	// This field will be removed in a future release.
-	Networks     []NetworkAttachmentConfig `json:",omitempty"`
-	EndpointSpec *EndpointSpec             `json:",omitempty"`
-}
-
-// ServiceMode represents the mode of a service.
-type ServiceMode struct {
-	Replicated *ReplicatedService `json:",omitempty"`
-	Global     *GlobalService     `json:",omitempty"`
-}
-
-// UpdateState is the state of a service update.
-type UpdateState string
-
-const (
-	// UpdateStateUpdating is the updating state.
-	UpdateStateUpdating UpdateState = "updating"
-	// UpdateStatePaused is the paused state.
-	UpdateStatePaused UpdateState = "paused"
-	// UpdateStateCompleted is the completed state.
-	UpdateStateCompleted UpdateState = "completed"
-)
-
-// UpdateStatus reports the status of a service update.
-type UpdateStatus struct {
-	State       UpdateState `json:",omitempty"`
-	StartedAt   time.Time   `json:",omitempty"`
-	CompletedAt time.Time   `json:",omitempty"`
-	Message     string      `json:",omitempty"`
-}
-
-// ReplicatedService is a kind of ServiceMode.
-type ReplicatedService struct {
-	Replicas *uint64 `json:",omitempty"`
-}
-
-// GlobalService is a kind of ServiceMode.
-type GlobalService struct{}
-
-const (
-	// UpdateFailureActionPause PAUSE
-	UpdateFailureActionPause = "pause"
-	// UpdateFailureActionContinue CONTINUE
-	UpdateFailureActionContinue = "continue"
-)
-
-// UpdateConfig represents the update configuration.
-type UpdateConfig struct {
-	// Maximum number of tasks to be updated in one iteration.
-	// 0 means unlimited parallelism.
-	Parallelism uint64
-
-	// Amount of time between updates.
-	Delay time.Duration `json:",omitempty"`
-
-	// FailureAction is the action to take when an update failures.
-	FailureAction string `json:",omitempty"`
-
-	// Monitor indicates how long to monitor a task for failure after it is
-	// created. If the task fails by ending up in one of the states
-	// REJECTED, COMPLETED, or FAILED, within Monitor from its creation,
-	// this counts as a failure. If it fails after Monitor, it does not
-	// count as a failure. If Monitor is unspecified, a default value will
-	// be used.
-	Monitor time.Duration `json:",omitempty"`
-
-	// MaxFailureRatio is the fraction of tasks that may fail during
-	// an update before the failure action is invoked. Any task created by
-	// the current update which ends up in one of the states REJECTED,
-	// COMPLETED or FAILED within Monitor from its creation counts as a
-	// failure. The number of failures is divided by the number of tasks
-	// being updated, and if this fraction is greater than
-	// MaxFailureRatio, the failure action is invoked.
-	//
-	// If the failure action is CONTINUE, there is no effect.
-	// If the failure action is PAUSE, no more tasks will be updated until
-	// another update is started.
-	MaxFailureRatio float32
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/swarm.go b/installer/vendor/github.com/docker/docker/api/types/swarm/swarm.go
deleted file mode 100644
index 0b42219696..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/swarm.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package swarm
-
-import "time"
-
-// ClusterInfo represents info about the cluster for outputing in "info"
-// it contains the same information as "Swarm", but without the JoinTokens
-type ClusterInfo struct {
-	ID string
-	Meta
-	Spec Spec
-}
-
-// Swarm represents a swarm.
-type Swarm struct {
-	ClusterInfo
-	JoinTokens JoinTokens
-}
-
-// JoinTokens contains the tokens workers and managers need to join the swarm.
-type JoinTokens struct {
-	// Worker is the join token workers may use to join the swarm.
-	Worker string
-	// Manager is the join token managers may use to join the swarm.
-	Manager string
-}
-
-// Spec represents the spec of a swarm.
-type Spec struct {
-	Annotations
-
-	Orchestration    OrchestrationConfig `json:",omitempty"`
-	Raft             RaftConfig          `json:",omitempty"`
-	Dispatcher       DispatcherConfig    `json:",omitempty"`
-	CAConfig         CAConfig            `json:",omitempty"`
-	TaskDefaults     TaskDefaults        `json:",omitempty"`
-	EncryptionConfig EncryptionConfig    `json:",omitempty"`
-}
-
-// OrchestrationConfig represents orchestration configuration.
-type OrchestrationConfig struct {
-	// TaskHistoryRetentionLimit is the number of historic tasks to keep per instance or
-	// node. If negative, never remove completed or failed tasks.
-	TaskHistoryRetentionLimit *int64 `json:",omitempty"`
-}
-
-// TaskDefaults parameterizes cluster-level task creation with default values.
-type TaskDefaults struct {
-	// LogDriver selects the log driver to use for tasks created in the
-	// orchestrator if unspecified by a service.
-	//
-	// Updating this value will only have an affect on new tasks. Old tasks
-	// will continue use their previously configured log driver until
-	// recreated.
-	LogDriver *Driver `json:",omitempty"`
-}
-
-// EncryptionConfig controls at-rest encryption of data and keys.
-type EncryptionConfig struct {
-	// AutoLockManagers specifies whether or not managers TLS keys and raft data
-	// should be encrypted at rest in such a way that they must be unlocked
-	// before the manager node starts up again.
-	AutoLockManagers bool
-}
-
-// RaftConfig represents raft configuration.
-type RaftConfig struct {
-	// SnapshotInterval is the number of log entries between snapshots.
-	SnapshotInterval uint64 `json:",omitempty"`
-
-	// KeepOldSnapshots is the number of snapshots to keep beyond the
-	// current snapshot.
-	KeepOldSnapshots *uint64 `json:",omitempty"`
-
-	// LogEntriesForSlowFollowers is the number of log entries to keep
-	// around to sync up slow followers after a snapshot is created.
-	LogEntriesForSlowFollowers uint64 `json:",omitempty"`
-
-	// ElectionTick is the number of ticks that a follower will wait for a message
-	// from the leader before becoming a candidate and starting an election.
-	// ElectionTick must be greater than HeartbeatTick.
-	//
-	// A tick currently defaults to one second, so these translate directly to
-	// seconds currently, but this is NOT guaranteed.
-	ElectionTick int
-
-	// HeartbeatTick is the number of ticks between heartbeats. Every
-	// HeartbeatTick ticks, the leader will send a heartbeat to the
-	// followers.
-	//
-	// A tick currently defaults to one second, so these translate directly to
-	// seconds currently, but this is NOT guaranteed.
-	HeartbeatTick int
-}
-
-// DispatcherConfig represents dispatcher configuration.
-type DispatcherConfig struct {
-	// HeartbeatPeriod defines how often agent should send heartbeats to
-	// dispatcher.
-	HeartbeatPeriod time.Duration `json:",omitempty"`
-}
-
-// CAConfig represents CA configuration.
-type CAConfig struct {
-	// NodeCertExpiry is the duration certificates should be issued for
-	NodeCertExpiry time.Duration `json:",omitempty"`
-
-	// ExternalCAs is a list of CAs to which a manager node will make
-	// certificate signing requests for node certificates.
-	ExternalCAs []*ExternalCA `json:",omitempty"`
-}
-
-// ExternalCAProtocol represents type of external CA.
-type ExternalCAProtocol string
-
-// ExternalCAProtocolCFSSL CFSSL
-const ExternalCAProtocolCFSSL ExternalCAProtocol = "cfssl"
-
-// ExternalCA defines external CA to be used by the cluster.
-type ExternalCA struct {
-	// Protocol is the protocol used by this external CA.
-	Protocol ExternalCAProtocol
-
-	// URL is the URL where the external CA can be reached.
-	URL string
-
-	// Options is a set of additional key/value pairs whose interpretation
-	// depends on the specified CA type.
-	Options map[string]string `json:",omitempty"`
-}
-
-// InitRequest is the request used to init a swarm.
-type InitRequest struct {
-	ListenAddr       string
-	AdvertiseAddr    string
-	ForceNewCluster  bool
-	Spec             Spec
-	AutoLockManagers bool
-}
-
-// JoinRequest is the request used to join a swarm.
-type JoinRequest struct {
-	ListenAddr    string
-	AdvertiseAddr string
-	RemoteAddrs   []string
-	JoinToken     string // accept by secret
-}
-
-// UnlockRequest is the request used to unlock a swarm.
-type UnlockRequest struct {
-	// UnlockKey is the unlock key in ASCII-armored format.
-	UnlockKey string
-}
-
-// LocalNodeState represents the state of the local node.
-type LocalNodeState string
-
-const (
-	// LocalNodeStateInactive INACTIVE
-	LocalNodeStateInactive LocalNodeState = "inactive"
-	// LocalNodeStatePending PENDING
-	LocalNodeStatePending LocalNodeState = "pending"
-	// LocalNodeStateActive ACTIVE
-	LocalNodeStateActive LocalNodeState = "active"
-	// LocalNodeStateError ERROR
-	LocalNodeStateError LocalNodeState = "error"
-	// LocalNodeStateLocked LOCKED
-	LocalNodeStateLocked LocalNodeState = "locked"
-)
-
-// Info represents generic information about swarm.
-type Info struct {
-	NodeID   string
-	NodeAddr string
-
-	LocalNodeState   LocalNodeState
-	ControlAvailable bool
-	Error            string
-
-	RemoteManagers []Peer
-	Nodes          int
-	Managers       int
-
-	Cluster ClusterInfo
-}
-
-// Peer represents a peer.
-type Peer struct {
-	NodeID string
-	Addr   string
-}
-
-// UpdateFlags contains flags for SwarmUpdate.
-type UpdateFlags struct {
-	RotateWorkerToken      bool
-	RotateManagerToken     bool
-	RotateManagerUnlockKey bool
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/swarm/task.go b/installer/vendor/github.com/docker/docker/api/types/swarm/task.go
deleted file mode 100644
index ace12cc89f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/swarm/task.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package swarm
-
-import "time"
-
-// TaskState represents the state of a task.
-type TaskState string
-
-const (
-	// TaskStateNew NEW
-	TaskStateNew TaskState = "new"
-	// TaskStateAllocated ALLOCATED
-	TaskStateAllocated TaskState = "allocated"
-	// TaskStatePending PENDING
-	TaskStatePending TaskState = "pending"
-	// TaskStateAssigned ASSIGNED
-	TaskStateAssigned TaskState = "assigned"
-	// TaskStateAccepted ACCEPTED
-	TaskStateAccepted TaskState = "accepted"
-	// TaskStatePreparing PREPARING
-	TaskStatePreparing TaskState = "preparing"
-	// TaskStateReady READY
-	TaskStateReady TaskState = "ready"
-	// TaskStateStarting STARTING
-	TaskStateStarting TaskState = "starting"
-	// TaskStateRunning RUNNING
-	TaskStateRunning TaskState = "running"
-	// TaskStateComplete COMPLETE
-	TaskStateComplete TaskState = "complete"
-	// TaskStateShutdown SHUTDOWN
-	TaskStateShutdown TaskState = "shutdown"
-	// TaskStateFailed FAILED
-	TaskStateFailed TaskState = "failed"
-	// TaskStateRejected REJECTED
-	TaskStateRejected TaskState = "rejected"
-)
-
-// Task represents a task.
-type Task struct {
-	ID string
-	Meta
-	Annotations
-
-	Spec                TaskSpec            `json:",omitempty"`
-	ServiceID           string              `json:",omitempty"`
-	Slot                int                 `json:",omitempty"`
-	NodeID              string              `json:",omitempty"`
-	Status              TaskStatus          `json:",omitempty"`
-	DesiredState        TaskState           `json:",omitempty"`
-	NetworksAttachments []NetworkAttachment `json:",omitempty"`
-}
-
-// TaskSpec represents the spec of a task.
-type TaskSpec struct {
-	ContainerSpec ContainerSpec             `json:",omitempty"`
-	Resources     *ResourceRequirements     `json:",omitempty"`
-	RestartPolicy *RestartPolicy            `json:",omitempty"`
-	Placement     *Placement                `json:",omitempty"`
-	Networks      []NetworkAttachmentConfig `json:",omitempty"`
-
-	// LogDriver specifies the LogDriver to use for tasks created from this
-	// spec. If not present, the one on cluster default on swarm.Spec will be
-	// used, finally falling back to the engine default if not specified.
-	LogDriver *Driver `json:",omitempty"`
-
-	// ForceUpdate is a counter that triggers an update even if no relevant
-	// parameters have been changed.
-	ForceUpdate uint64
-}
-
-// Resources represents resources (CPU/Memory).
-type Resources struct {
-	NanoCPUs    int64 `json:",omitempty"`
-	MemoryBytes int64 `json:",omitempty"`
-}
-
-// ResourceRequirements represents resources requirements.
-type ResourceRequirements struct {
-	Limits       *Resources `json:",omitempty"`
-	Reservations *Resources `json:",omitempty"`
-}
-
-// Placement represents orchestration parameters.
-type Placement struct {
-	Constraints []string `json:",omitempty"`
-}
-
-// RestartPolicy represents the restart policy.
-type RestartPolicy struct {
-	Condition   RestartPolicyCondition `json:",omitempty"`
-	Delay       *time.Duration         `json:",omitempty"`
-	MaxAttempts *uint64                `json:",omitempty"`
-	Window      *time.Duration         `json:",omitempty"`
-}
-
-// RestartPolicyCondition represents when to restart.
-type RestartPolicyCondition string
-
-const (
-	// RestartPolicyConditionNone NONE
-	RestartPolicyConditionNone RestartPolicyCondition = "none"
-	// RestartPolicyConditionOnFailure ON_FAILURE
-	RestartPolicyConditionOnFailure RestartPolicyCondition = "on-failure"
-	// RestartPolicyConditionAny ANY
-	RestartPolicyConditionAny RestartPolicyCondition = "any"
-)
-
-// TaskStatus represents the status of a task.
-type TaskStatus struct {
-	Timestamp       time.Time       `json:",omitempty"`
-	State           TaskState       `json:",omitempty"`
-	Message         string          `json:",omitempty"`
-	Err             string          `json:",omitempty"`
-	ContainerStatus ContainerStatus `json:",omitempty"`
-	PortStatus      PortStatus      `json:",omitempty"`
-}
-
-// ContainerStatus represents the status of a container.
-type ContainerStatus struct {
-	ContainerID string `json:",omitempty"`
-	PID         int    `json:",omitempty"`
-	ExitCode    int    `json:",omitempty"`
-}
-
-// PortStatus represents the port status of a task's host ports whose
-// service has published host ports
-type PortStatus struct {
-	Ports []PortConfig `json:",omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/time/duration_convert.go b/installer/vendor/github.com/docker/docker/api/types/time/duration_convert.go
deleted file mode 100644
index 63e1eec19e..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/time/duration_convert.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package time
-
-import (
-	"strconv"
-	"time"
-)
-
-// DurationToSecondsString converts the specified duration to the number
-// seconds it represents, formatted as a string.
-func DurationToSecondsString(duration time.Duration) string {
-	return strconv.FormatFloat(duration.Seconds(), 'f', 0, 64)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/time/duration_convert_test.go b/installer/vendor/github.com/docker/docker/api/types/time/duration_convert_test.go
deleted file mode 100644
index 869c08f863..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/time/duration_convert_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package time
-
-import (
-	"testing"
-	"time"
-)
-
-func TestDurationToSecondsString(t *testing.T) {
-	cases := []struct {
-		in       time.Duration
-		expected string
-	}{
-		{0 * time.Second, "0"},
-		{1 * time.Second, "1"},
-		{1 * time.Minute, "60"},
-		{24 * time.Hour, "86400"},
-	}
-
-	for _, c := range cases {
-		s := DurationToSecondsString(c.in)
-		if s != c.expected {
-			t.Errorf("wrong value for input `%v`: expected `%s`, got `%s`", c.in, c.expected, s)
-			t.Fail()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/time/timestamp.go b/installer/vendor/github.com/docker/docker/api/types/time/timestamp.go
deleted file mode 100644
index d3695ba723..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/time/timestamp.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package time
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// These are additional predefined layouts for use in Time.Format and Time.Parse
-// with --since and --until parameters for `docker logs` and `docker events`
-const (
-	rFC3339Local     = "2006-01-02T15:04:05"           // RFC3339 with local timezone
-	rFC3339NanoLocal = "2006-01-02T15:04:05.999999999" // RFC3339Nano with local timezone
-	dateWithZone     = "2006-01-02Z07:00"              // RFC3339 with time at 00:00:00
-	dateLocal        = "2006-01-02"                    // RFC3339 with local timezone and time at 00:00:00
-)
-
-// GetTimestamp tries to parse given string as golang duration,
-// then RFC3339 time and finally as a Unix timestamp. If
-// any of these were successful, it returns a Unix timestamp
-// as string otherwise returns the given value back.
-// In case of duration input, the returned timestamp is computed
-// as the given reference time minus the amount of the duration.
-func GetTimestamp(value string, reference time.Time) (string, error) {
-	if d, err := time.ParseDuration(value); value != "0" && err == nil {
-		return strconv.FormatInt(reference.Add(-d).Unix(), 10), nil
-	}
-
-	var format string
-	var parseInLocation bool
-
-	// if the string has a Z or a + or three dashes use parse otherwise use parseinlocation
-	parseInLocation = !(strings.ContainsAny(value, "zZ+") || strings.Count(value, "-") == 3)
-
-	if strings.Contains(value, ".") {
-		if parseInLocation {
-			format = rFC3339NanoLocal
-		} else {
-			format = time.RFC3339Nano
-		}
-	} else if strings.Contains(value, "T") {
-		// we want the number of colons in the T portion of the timestamp
-		tcolons := strings.Count(value, ":")
-		// if parseInLocation is off and we have a +/- zone offset (not Z) then
-		// there will be an extra colon in the input for the tz offset subtract that
-		// colon from the tcolons count
-		if !parseInLocation && !strings.ContainsAny(value, "zZ") && tcolons > 0 {
-			tcolons--
-		}
-		if parseInLocation {
-			switch tcolons {
-			case 0:
-				format = "2006-01-02T15"
-			case 1:
-				format = "2006-01-02T15:04"
-			default:
-				format = rFC3339Local
-			}
-		} else {
-			switch tcolons {
-			case 0:
-				format = "2006-01-02T15Z07:00"
-			case 1:
-				format = "2006-01-02T15:04Z07:00"
-			default:
-				format = time.RFC3339
-			}
-		}
-	} else if parseInLocation {
-		format = dateLocal
-	} else {
-		format = dateWithZone
-	}
-
-	var t time.Time
-	var err error
-
-	if parseInLocation {
-		t, err = time.ParseInLocation(format, value, time.FixedZone(reference.Zone()))
-	} else {
-		t, err = time.Parse(format, value)
-	}
-
-	if err != nil {
-		// if there is a `-` then its an RFC3339 like timestamp otherwise assume unixtimestamp
-		if strings.Contains(value, "-") {
-			return "", err // was probably an RFC3339 like timestamp but the parser failed with an error
-		}
-		return value, nil // unixtimestamp in and out case (meaning: the value passed at the command line is already in the right format for passing to the server)
-	}
-
-	return fmt.Sprintf("%d.%09d", t.Unix(), int64(t.Nanosecond())), nil
-}
-
-// ParseTimestamps returns seconds and nanoseconds from a timestamp that has the
-// format "%d.%09d", time.Unix(), int64(time.Nanosecond()))
-// if the incoming nanosecond portion is longer or shorter than 9 digits it is
-// converted to nanoseconds.  The expectation is that the seconds and
-// seconds will be used to create a time variable.  For example:
-//     seconds, nanoseconds, err := ParseTimestamp("1136073600.000000001",0)
-//     if err == nil since := time.Unix(seconds, nanoseconds)
-// returns seconds as def(aultSeconds) if value == ""
-func ParseTimestamps(value string, def int64) (int64, int64, error) {
-	if value == "" {
-		return def, 0, nil
-	}
-	sa := strings.SplitN(value, ".", 2)
-	s, err := strconv.ParseInt(sa[0], 10, 64)
-	if err != nil {
-		return s, 0, err
-	}
-	if len(sa) != 2 {
-		return s, 0, nil
-	}
-	n, err := strconv.ParseInt(sa[1], 10, 64)
-	if err != nil {
-		return s, n, err
-	}
-	// should already be in nanoseconds but just in case convert n to nanoseonds
-	n = int64(float64(n) * math.Pow(float64(10), float64(9-len(sa[1]))))
-	return s, n, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/time/timestamp_test.go b/installer/vendor/github.com/docker/docker/api/types/time/timestamp_test.go
deleted file mode 100644
index a1651309d7..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/time/timestamp_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package time
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-func TestGetTimestamp(t *testing.T) {
-	now := time.Now().In(time.UTC)
-	cases := []struct {
-		in, expected string
-		expectedErr  bool
-	}{
-		// Partial RFC3339 strings get parsed with second precision
-		{"2006-01-02T15:04:05.999999999+07:00", "1136189045.999999999", false},
-		{"2006-01-02T15:04:05.999999999Z", "1136214245.999999999", false},
-		{"2006-01-02T15:04:05.999999999", "1136214245.999999999", false},
-		{"2006-01-02T15:04:05Z", "1136214245.000000000", false},
-		{"2006-01-02T15:04:05", "1136214245.000000000", false},
-		{"2006-01-02T15:04:0Z", "", true},
-		{"2006-01-02T15:04:0", "", true},
-		{"2006-01-02T15:04Z", "1136214240.000000000", false},
-		{"2006-01-02T15:04+00:00", "1136214240.000000000", false},
-		{"2006-01-02T15:04-00:00", "1136214240.000000000", false},
-		{"2006-01-02T15:04", "1136214240.000000000", false},
-		{"2006-01-02T15:0Z", "", true},
-		{"2006-01-02T15:0", "", true},
-		{"2006-01-02T15Z", "1136214000.000000000", false},
-		{"2006-01-02T15+00:00", "1136214000.000000000", false},
-		{"2006-01-02T15-00:00", "1136214000.000000000", false},
-		{"2006-01-02T15", "1136214000.000000000", false},
-		{"2006-01-02T1Z", "1136163600.000000000", false},
-		{"2006-01-02T1", "1136163600.000000000", false},
-		{"2006-01-02TZ", "", true},
-		{"2006-01-02T", "", true},
-		{"2006-01-02+00:00", "1136160000.000000000", false},
-		{"2006-01-02-00:00", "1136160000.000000000", false},
-		{"2006-01-02-00:01", "1136160060.000000000", false},
-		{"2006-01-02Z", "1136160000.000000000", false},
-		{"2006-01-02", "1136160000.000000000", false},
-		{"2015-05-13T20:39:09Z", "1431549549.000000000", false},
-
-		// unix timestamps returned as is
-		{"1136073600", "1136073600", false},
-		{"1136073600.000000001", "1136073600.000000001", false},
-		// Durations
-		{"1m", fmt.Sprintf("%d", now.Add(-1*time.Minute).Unix()), false},
-		{"1.5h", fmt.Sprintf("%d", now.Add(-90*time.Minute).Unix()), false},
-		{"1h30m", fmt.Sprintf("%d", now.Add(-90*time.Minute).Unix()), false},
-
-		// String fallback
-		{"invalid", "invalid", false},
-	}
-
-	for _, c := range cases {
-		o, err := GetTimestamp(c.in, now)
-		if o != c.expected ||
-			(err == nil && c.expectedErr) ||
-			(err != nil && !c.expectedErr) {
-			t.Errorf("wrong value for '%s'. expected:'%s' got:'%s' with error: `%s`", c.in, c.expected, o, err)
-			t.Fail()
-		}
-	}
-}
-
-func TestParseTimestamps(t *testing.T) {
-	cases := []struct {
-		in                        string
-		def, expectedS, expectedN int64
-		expectedErr               bool
-	}{
-		// unix timestamps
-		{"1136073600", 0, 1136073600, 0, false},
-		{"1136073600.000000001", 0, 1136073600, 1, false},
-		{"1136073600.0000000010", 0, 1136073600, 1, false},
-		{"1136073600.00000001", 0, 1136073600, 10, false},
-		{"foo.bar", 0, 0, 0, true},
-		{"1136073600.bar", 0, 1136073600, 0, true},
-		{"", -1, -1, 0, false},
-	}
-
-	for _, c := range cases {
-		s, n, err := ParseTimestamps(c.in, c.def)
-		if s != c.expectedS ||
-			n != c.expectedN ||
-			(err == nil && c.expectedErr) ||
-			(err != nil && !c.expectedErr) {
-			t.Errorf("wrong values for input `%s` with default `%d` expected:'%d'seconds and `%d`nanosecond got:'%d'seconds and `%d`nanoseconds with error: `%s`", c.in, c.def, c.expectedS, c.expectedN, s, n, err)
-			t.Fail()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/types.go b/installer/vendor/github.com/docker/docker/api/types/types.go
deleted file mode 100644
index a82c3e88ef..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/types.go
+++ /dev/null
@@ -1,549 +0,0 @@
-package types
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/go-connections/nat"
-)
-
-// ContainerChange contains response of Engine API:
-// GET "/containers/{name:.*}/changes"
-type ContainerChange struct {
-	Kind int
-	Path string
-}
-
-// ImageHistory contains response of Engine API:
-// GET "/images/{name:.*}/history"
-type ImageHistory struct {
-	ID        string `json:"Id"`
-	Created   int64
-	CreatedBy string
-	Tags      []string
-	Size      int64
-	Comment   string
-}
-
-// ImageDelete contains response of Engine API:
-// DELETE "/images/{name:.*}"
-type ImageDelete struct {
-	Untagged string `json:",omitempty"`
-	Deleted  string `json:",omitempty"`
-}
-
-// GraphDriverData returns Image's graph driver config info
-// when calling inspect command
-type GraphDriverData struct {
-	Name string
-	Data map[string]string
-}
-
-// RootFS returns Image's RootFS description including the layer IDs.
-type RootFS struct {
-	Type      string
-	Layers    []string `json:",omitempty"`
-	BaseLayer string   `json:",omitempty"`
-}
-
-// ImageInspect contains response of Engine API:
-// GET "/images/{name:.*}/json"
-type ImageInspect struct {
-	ID              string `json:"Id"`
-	RepoTags        []string
-	RepoDigests     []string
-	Parent          string
-	Comment         string
-	Created         string
-	Container       string
-	ContainerConfig *container.Config
-	DockerVersion   string
-	Author          string
-	Config          *container.Config
-	Architecture    string
-	Os              string
-	OsVersion       string `json:",omitempty"`
-	Size            int64
-	VirtualSize     int64
-	GraphDriver     GraphDriverData
-	RootFS          RootFS
-}
-
-// Container contains response of Engine API:
-// GET "/containers/json"
-type Container struct {
-	ID         string `json:"Id"`
-	Names      []string
-	Image      string
-	ImageID    string
-	Command    string
-	Created    int64
-	Ports      []Port
-	SizeRw     int64 `json:",omitempty"`
-	SizeRootFs int64 `json:",omitempty"`
-	Labels     map[string]string
-	State      string
-	Status     string
-	HostConfig struct {
-		NetworkMode string `json:",omitempty"`
-	}
-	NetworkSettings *SummaryNetworkSettings
-	Mounts          []MountPoint
-}
-
-// CopyConfig contains request body of Engine API:
-// POST "/containers/"+containerID+"/copy"
-type CopyConfig struct {
-	Resource string
-}
-
-// ContainerPathStat is used to encode the header from
-// GET "/containers/{name:.*}/archive"
-// "Name" is the file or directory name.
-type ContainerPathStat struct {
-	Name       string      `json:"name"`
-	Size       int64       `json:"size"`
-	Mode       os.FileMode `json:"mode"`
-	Mtime      time.Time   `json:"mtime"`
-	LinkTarget string      `json:"linkTarget"`
-}
-
-// ContainerStats contains response of Engine API:
-// GET "/stats"
-type ContainerStats struct {
-	Body   io.ReadCloser `json:"body"`
-	OSType string        `json:"ostype"`
-}
-
-// ContainerProcessList contains response of Engine API:
-// GET "/containers/{name:.*}/top"
-type ContainerProcessList struct {
-	Processes [][]string
-	Titles    []string
-}
-
-// Ping contains response of Engine API:
-// GET "/_ping"
-type Ping struct {
-	APIVersion   string
-	Experimental bool
-}
-
-// Version contains response of Engine API:
-// GET "/version"
-type Version struct {
-	Version       string
-	APIVersion    string `json:"ApiVersion"`
-	MinAPIVersion string `json:"MinAPIVersion,omitempty"`
-	GitCommit     string
-	GoVersion     string
-	Os            string
-	Arch          string
-	KernelVersion string `json:",omitempty"`
-	Experimental  bool   `json:",omitempty"`
-	BuildTime     string `json:",omitempty"`
-}
-
-// Commit records a external tool actual commit id version along the
-// one expect by dockerd as set at build time
-type Commit struct {
-	ID       string
-	Expected string
-}
-
-// Info contains response of Engine API:
-// GET "/info"
-type Info struct {
-	ID                 string
-	Containers         int
-	ContainersRunning  int
-	ContainersPaused   int
-	ContainersStopped  int
-	Images             int
-	Driver             string
-	DriverStatus       [][2]string
-	SystemStatus       [][2]string
-	Plugins            PluginsInfo
-	MemoryLimit        bool
-	SwapLimit          bool
-	KernelMemory       bool
-	CPUCfsPeriod       bool `json:"CpuCfsPeriod"`
-	CPUCfsQuota        bool `json:"CpuCfsQuota"`
-	CPUShares          bool
-	CPUSet             bool
-	IPv4Forwarding     bool
-	BridgeNfIptables   bool
-	BridgeNfIP6tables  bool `json:"BridgeNfIp6tables"`
-	Debug              bool
-	NFd                int
-	OomKillDisable     bool
-	NGoroutines        int
-	SystemTime         string
-	LoggingDriver      string
-	CgroupDriver       string
-	NEventsListener    int
-	KernelVersion      string
-	OperatingSystem    string
-	OSType             string
-	Architecture       string
-	IndexServerAddress string
-	RegistryConfig     *registry.ServiceConfig
-	NCPU               int
-	MemTotal           int64
-	DockerRootDir      string
-	HTTPProxy          string `json:"HttpProxy"`
-	HTTPSProxy         string `json:"HttpsProxy"`
-	NoProxy            string
-	Name               string
-	Labels             []string
-	ExperimentalBuild  bool
-	ServerVersion      string
-	ClusterStore       string
-	ClusterAdvertise   string
-	Runtimes           map[string]Runtime
-	DefaultRuntime     string
-	Swarm              swarm.Info
-	// LiveRestoreEnabled determines whether containers should be kept
-	// running when the daemon is shutdown or upon daemon start if
-	// running containers are detected
-	LiveRestoreEnabled bool
-	Isolation          container.Isolation
-	InitBinary         string
-	ContainerdCommit   Commit
-	RuncCommit         Commit
-	InitCommit         Commit
-	SecurityOptions    []string
-}
-
-// KeyValue holds a key/value pair
-type KeyValue struct {
-	Key, Value string
-}
-
-// SecurityOpt contains the name and options of a security option
-type SecurityOpt struct {
-	Name    string
-	Options []KeyValue
-}
-
-// DecodeSecurityOptions decodes a security options string slice to a type safe
-// SecurityOpt
-func DecodeSecurityOptions(opts []string) ([]SecurityOpt, error) {
-	so := []SecurityOpt{}
-	for _, opt := range opts {
-		// support output from a < 1.13 docker daemon
-		if !strings.Contains(opt, "=") {
-			so = append(so, SecurityOpt{Name: opt})
-			continue
-		}
-		secopt := SecurityOpt{}
-		split := strings.Split(opt, ",")
-		for _, s := range split {
-			kv := strings.SplitN(s, "=", 2)
-			if len(kv) != 2 {
-				return nil, fmt.Errorf("invalid security option %q", s)
-			}
-			if kv[0] == "" || kv[1] == "" {
-				return nil, errors.New("invalid empty security option")
-			}
-			if kv[0] == "name" {
-				secopt.Name = kv[1]
-				continue
-			}
-			secopt.Options = append(secopt.Options, KeyValue{Key: kv[0], Value: kv[1]})
-		}
-		so = append(so, secopt)
-	}
-	return so, nil
-}
-
-// PluginsInfo is a temp struct holding Plugins name
-// registered with docker daemon. It is used by Info struct
-type PluginsInfo struct {
-	// List of Volume plugins registered
-	Volume []string
-	// List of Network plugins registered
-	Network []string
-	// List of Authorization plugins registered
-	Authorization []string
-}
-
-// ExecStartCheck is a temp struct used by execStart
-// Config fields is part of ExecConfig in runconfig package
-type ExecStartCheck struct {
-	// ExecStart will first check if it's detached
-	Detach bool
-	// Check if there's a tty
-	Tty bool
-}
-
-// HealthcheckResult stores information about a single run of a healthcheck probe
-type HealthcheckResult struct {
-	Start    time.Time // Start is the time this check started
-	End      time.Time // End is the time this check ended
-	ExitCode int       // ExitCode meanings: 0=healthy, 1=unhealthy, 2=reserved (considered unhealthy), else=error running probe
-	Output   string    // Output from last check
-}
-
-// Health states
-const (
-	NoHealthcheck = "none"      // Indicates there is no healthcheck
-	Starting      = "starting"  // Starting indicates that the container is not yet ready
-	Healthy       = "healthy"   // Healthy indicates that the container is running correctly
-	Unhealthy     = "unhealthy" // Unhealthy indicates that the container has a problem
-)
-
-// Health stores information about the container's healthcheck results
-type Health struct {
-	Status        string               // Status is one of Starting, Healthy or Unhealthy
-	FailingStreak int                  // FailingStreak is the number of consecutive failures
-	Log           []*HealthcheckResult // Log contains the last few results (oldest first)
-}
-
-// ContainerState stores container's running state
-// it's part of ContainerJSONBase and will return by "inspect" command
-type ContainerState struct {
-	Status     string
-	Running    bool
-	Paused     bool
-	Restarting bool
-	OOMKilled  bool
-	Dead       bool
-	Pid        int
-	ExitCode   int
-	Error      string
-	StartedAt  string
-	FinishedAt string
-	Health     *Health `json:",omitempty"`
-}
-
-// ContainerNode stores information about the node that a container
-// is running on.  It's only available in Docker Swarm
-type ContainerNode struct {
-	ID        string
-	IPAddress string `json:"IP"`
-	Addr      string
-	Name      string
-	Cpus      int
-	Memory    int64
-	Labels    map[string]string
-}
-
-// ContainerJSONBase contains response of Engine API:
-// GET "/containers/{name:.*}/json"
-type ContainerJSONBase struct {
-	ID              string `json:"Id"`
-	Created         string
-	Path            string
-	Args            []string
-	State           *ContainerState
-	Image           string
-	ResolvConfPath  string
-	HostnamePath    string
-	HostsPath       string
-	LogPath         string
-	Node            *ContainerNode `json:",omitempty"`
-	Name            string
-	RestartCount    int
-	Driver          string
-	MountLabel      string
-	ProcessLabel    string
-	AppArmorProfile string
-	ExecIDs         []string
-	HostConfig      *container.HostConfig
-	GraphDriver     GraphDriverData
-	SizeRw          *int64 `json:",omitempty"`
-	SizeRootFs      *int64 `json:",omitempty"`
-}
-
-// ContainerJSON is newly used struct along with MountPoint
-type ContainerJSON struct {
-	*ContainerJSONBase
-	Mounts          []MountPoint
-	Config          *container.Config
-	NetworkSettings *NetworkSettings
-}
-
-// NetworkSettings exposes the network settings in the api
-type NetworkSettings struct {
-	NetworkSettingsBase
-	DefaultNetworkSettings
-	Networks map[string]*network.EndpointSettings
-}
-
-// SummaryNetworkSettings provides a summary of container's networks
-// in /containers/json
-type SummaryNetworkSettings struct {
-	Networks map[string]*network.EndpointSettings
-}
-
-// NetworkSettingsBase holds basic information about networks
-type NetworkSettingsBase struct {
-	Bridge                 string      // Bridge is the Bridge name the network uses(e.g. `docker0`)
-	SandboxID              string      // SandboxID uniquely represents a container's network stack
-	HairpinMode            bool        // HairpinMode specifies if hairpin NAT should be enabled on the virtual interface
-	LinkLocalIPv6Address   string      // LinkLocalIPv6Address is an IPv6 unicast address using the link-local prefix
-	LinkLocalIPv6PrefixLen int         // LinkLocalIPv6PrefixLen is the prefix length of an IPv6 unicast address
-	Ports                  nat.PortMap // Ports is a collection of PortBinding indexed by Port
-	SandboxKey             string      // SandboxKey identifies the sandbox
-	SecondaryIPAddresses   []network.Address
-	SecondaryIPv6Addresses []network.Address
-}
-
-// DefaultNetworkSettings holds network information
-// during the 2 release deprecation period.
-// It will be removed in Docker 1.11.
-type DefaultNetworkSettings struct {
-	EndpointID          string // EndpointID uniquely represents a service endpoint in a Sandbox
-	Gateway             string // Gateway holds the gateway address for the network
-	GlobalIPv6Address   string // GlobalIPv6Address holds network's global IPv6 address
-	GlobalIPv6PrefixLen int    // GlobalIPv6PrefixLen represents mask length of network's global IPv6 address
-	IPAddress           string // IPAddress holds the IPv4 address for the network
-	IPPrefixLen         int    // IPPrefixLen represents mask length of network's IPv4 address
-	IPv6Gateway         string // IPv6Gateway holds gateway address specific for IPv6
-	MacAddress          string // MacAddress holds the MAC address for the network
-}
-
-// MountPoint represents a mount point configuration inside the container.
-// This is used for reporting the mountpoints in use by a container.
-type MountPoint struct {
-	Type        mount.Type `json:",omitempty"`
-	Name        string     `json:",omitempty"`
-	Source      string
-	Destination string
-	Driver      string `json:",omitempty"`
-	Mode        string
-	RW          bool
-	Propagation mount.Propagation
-}
-
-// NetworkResource is the body of the "get network" http response message
-type NetworkResource struct {
-	Name       string                      // Name is the requested name of the network
-	ID         string                      `json:"Id"` // ID uniquely identifies a network on a single machine
-	Created    time.Time                   // Created is the time the network created
-	Scope      string                      // Scope describes the level at which the network exists (e.g. `global` for cluster-wide or `local` for machine level)
-	Driver     string                      // Driver is the Driver name used to create the network (e.g. `bridge`, `overlay`)
-	EnableIPv6 bool                        // EnableIPv6 represents whether to enable IPv6
-	IPAM       network.IPAM                // IPAM is the network's IP Address Management
-	Internal   bool                        // Internal represents if the network is used internal only
-	Attachable bool                        // Attachable represents if the global scope is manually attachable by regular containers from workers in swarm mode.
-	Containers map[string]EndpointResource // Containers contains endpoints belonging to the network
-	Options    map[string]string           // Options holds the network specific options to use for when creating the network
-	Labels     map[string]string           // Labels holds metadata specific to the network being created
-	Peers      []network.PeerInfo          `json:",omitempty"` // List of peer nodes for an overlay network
-}
-
-// EndpointResource contains network resources allocated and used for a container in a network
-type EndpointResource struct {
-	Name        string
-	EndpointID  string
-	MacAddress  string
-	IPv4Address string
-	IPv6Address string
-}
-
-// NetworkCreate is the expected body of the "create network" http request message
-type NetworkCreate struct {
-	CheckDuplicate bool
-	Driver         string
-	EnableIPv6     bool
-	IPAM           *network.IPAM
-	Internal       bool
-	Attachable     bool
-	Options        map[string]string
-	Labels         map[string]string
-}
-
-// NetworkCreateRequest is the request message sent to the server for network create call.
-type NetworkCreateRequest struct {
-	NetworkCreate
-	Name string
-}
-
-// NetworkCreateResponse is the response message sent by the server for network create call
-type NetworkCreateResponse struct {
-	ID      string `json:"Id"`
-	Warning string
-}
-
-// NetworkConnect represents the data to be used to connect a container to the network
-type NetworkConnect struct {
-	Container      string
-	EndpointConfig *network.EndpointSettings `json:",omitempty"`
-}
-
-// NetworkDisconnect represents the data to be used to disconnect a container from the network
-type NetworkDisconnect struct {
-	Container string
-	Force     bool
-}
-
-// Checkpoint represents the details of a checkpoint
-type Checkpoint struct {
-	Name string // Name is the name of the checkpoint
-}
-
-// Runtime describes an OCI runtime
-type Runtime struct {
-	Path string   `json:"path"`
-	Args []string `json:"runtimeArgs,omitempty"`
-}
-
-// DiskUsage contains response of Engine API:
-// GET "/system/df"
-type DiskUsage struct {
-	LayersSize int64
-	Images     []*ImageSummary
-	Containers []*Container
-	Volumes    []*Volume
-}
-
-// ContainersPruneReport contains the response for Engine API:
-// POST "/containers/prune"
-type ContainersPruneReport struct {
-	ContainersDeleted []string
-	SpaceReclaimed    uint64
-}
-
-// VolumesPruneReport contains the response for Engine API:
-// POST "/volumes/prune"
-type VolumesPruneReport struct {
-	VolumesDeleted []string
-	SpaceReclaimed uint64
-}
-
-// ImagesPruneReport contains the response for Engine API:
-// POST "/images/prune"
-type ImagesPruneReport struct {
-	ImagesDeleted  []ImageDelete
-	SpaceReclaimed uint64
-}
-
-// NetworksPruneReport contains the response for Engine API:
-// POST "/networks/prune"
-type NetworksPruneReport struct {
-	NetworksDeleted []string
-}
-
-// SecretCreateResponse contains the information returned to a client
-// on the creation of a new secret.
-type SecretCreateResponse struct {
-	// ID is the id of the created secret.
-	ID string
-}
-
-// SecretListOptions holds parameters to list secrets
-type SecretListOptions struct {
-	Filters filters.Args
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/versions/README.md b/installer/vendor/github.com/docker/docker/api/types/versions/README.md
deleted file mode 100644
index cdac50a53c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/versions/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-## Legacy API type versions
-
-This package includes types for legacy API versions. The stable version of the API types live in `api/types/*.go`.
-
-Consider moving a type here when you need to keep backwards compatibility in the API. This legacy types are organized by the latest API version they appear in. For instance, types in the `v1p19` package are valid for API versions below or equal `1.19`. Types in the `v1p20` package are valid for the API version `1.20`, since the versions below that will use the legacy types in `v1p19`.
-
-### Package name conventions
-
-The package name convention is to use `v` as a prefix for the version number and `p`(patch) as a separator. We use this nomenclature due to a few restrictions in the Go package name convention:
-
-1. We cannot use `.` because it's interpreted by the language, think of `v1.20.CallFunction`.
-2. We cannot use `_` because golint complains about it. The code is actually valid, but it looks probably more weird: `v1_20.CallFunction`.
-
-For instance, if you want to modify a type that was available in the version `1.21` of the API but it will have different fields in the version `1.22`, you want to create a new package under `api/types/versions/v1p21`.
diff --git a/installer/vendor/github.com/docker/docker/api/types/versions/compare.go b/installer/vendor/github.com/docker/docker/api/types/versions/compare.go
deleted file mode 100644
index 611d4fed66..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/versions/compare.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package versions
-
-import (
-	"strconv"
-	"strings"
-)
-
-// compare compares two version strings
-// returns -1 if v1 < v2, 1 if v1 > v2, 0 otherwise.
-func compare(v1, v2 string) int {
-	var (
-		currTab  = strings.Split(v1, ".")
-		otherTab = strings.Split(v2, ".")
-	)
-
-	max := len(currTab)
-	if len(otherTab) > max {
-		max = len(otherTab)
-	}
-	for i := 0; i < max; i++ {
-		var currInt, otherInt int
-
-		if len(currTab) > i {
-			currInt, _ = strconv.Atoi(currTab[i])
-		}
-		if len(otherTab) > i {
-			otherInt, _ = strconv.Atoi(otherTab[i])
-		}
-		if currInt > otherInt {
-			return 1
-		}
-		if otherInt > currInt {
-			return -1
-		}
-	}
-	return 0
-}
-
-// LessThan checks if a version is less than another
-func LessThan(v, other string) bool {
-	return compare(v, other) == -1
-}
-
-// LessThanOrEqualTo checks if a version is less than or equal to another
-func LessThanOrEqualTo(v, other string) bool {
-	return compare(v, other) <= 0
-}
-
-// GreaterThan checks if a version is greater than another
-func GreaterThan(v, other string) bool {
-	return compare(v, other) == 1
-}
-
-// GreaterThanOrEqualTo checks if a version is greater than or equal to another
-func GreaterThanOrEqualTo(v, other string) bool {
-	return compare(v, other) >= 0
-}
-
-// Equal checks if a version is equal to another
-func Equal(v, other string) bool {
-	return compare(v, other) == 0
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/versions/compare_test.go b/installer/vendor/github.com/docker/docker/api/types/versions/compare_test.go
deleted file mode 100644
index c2b96869f7..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/versions/compare_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package versions
-
-import (
-	"testing"
-)
-
-func assertVersion(t *testing.T, a, b string, result int) {
-	if r := compare(a, b); r != result {
-		t.Fatalf("Unexpected version comparison result. Found %d, expected %d", r, result)
-	}
-}
-
-func TestCompareVersion(t *testing.T) {
-	assertVersion(t, "1.12", "1.12", 0)
-	assertVersion(t, "1.0.0", "1", 0)
-	assertVersion(t, "1", "1.0.0", 0)
-	assertVersion(t, "1.05.00.0156", "1.0.221.9289", 1)
-	assertVersion(t, "1", "1.0.1", -1)
-	assertVersion(t, "1.0.1", "1", 1)
-	assertVersion(t, "1.0.1", "1.0.2", -1)
-	assertVersion(t, "1.0.2", "1.0.3", -1)
-	assertVersion(t, "1.0.3", "1.1", -1)
-	assertVersion(t, "1.1", "1.1.1", -1)
-	assertVersion(t, "1.1.1", "1.1.2", -1)
-	assertVersion(t, "1.1.2", "1.2", -1)
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/versions/v1p19/types.go b/installer/vendor/github.com/docker/docker/api/types/versions/v1p19/types.go
deleted file mode 100644
index dc13150545..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/versions/v1p19/types.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Package v1p19 provides specific API types for the API version 1, patch 19.
-package v1p19
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/versions/v1p20"
-	"github.com/docker/go-connections/nat"
-)
-
-// ContainerJSON is a backcompatibility struct for APIs prior to 1.20.
-// Note this is not used by the Windows daemon.
-type ContainerJSON struct {
-	*types.ContainerJSONBase
-	Volumes         map[string]string
-	VolumesRW       map[string]bool
-	Config          *ContainerConfig
-	NetworkSettings *v1p20.NetworkSettings
-}
-
-// ContainerConfig is a backcompatibility struct for APIs prior to 1.20.
-type ContainerConfig struct {
-	*container.Config
-
-	MacAddress      string
-	NetworkDisabled bool
-	ExposedPorts    map[nat.Port]struct{}
-
-	// backward compatibility, they now live in HostConfig
-	VolumeDriver string
-	Memory       int64
-	MemorySwap   int64
-	CPUShares    int64  `json:"CpuShares"`
-	CPUSet       string `json:"Cpuset"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/versions/v1p20/types.go b/installer/vendor/github.com/docker/docker/api/types/versions/v1p20/types.go
deleted file mode 100644
index 94a06d7452..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/versions/v1p20/types.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Package v1p20 provides specific API types for the API version 1, patch 20.
-package v1p20
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/go-connections/nat"
-)
-
-// ContainerJSON is a backcompatibility struct for the API 1.20
-type ContainerJSON struct {
-	*types.ContainerJSONBase
-	Mounts          []types.MountPoint
-	Config          *ContainerConfig
-	NetworkSettings *NetworkSettings
-}
-
-// ContainerConfig is a backcompatibility struct used in ContainerJSON for the API 1.20
-type ContainerConfig struct {
-	*container.Config
-
-	MacAddress      string
-	NetworkDisabled bool
-	ExposedPorts    map[nat.Port]struct{}
-
-	// backward compatibility, they now live in HostConfig
-	VolumeDriver string
-}
-
-// StatsJSON is a backcompatibility struct used in Stats for APIs prior to 1.21
-type StatsJSON struct {
-	types.Stats
-	Network types.NetworkStats `json:"network,omitempty"`
-}
-
-// NetworkSettings is a backward compatible struct for APIs prior to 1.21
-type NetworkSettings struct {
-	types.NetworkSettingsBase
-	types.DefaultNetworkSettings
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/volume.go b/installer/vendor/github.com/docker/docker/api/types/volume.go
deleted file mode 100644
index da4f8ebd9c..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/volume.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package types
-
-// This file was generated by the swagger tool.
-// Editing this file might prove futile when you re-run the swagger generate command
-
-// Volume volume
-// swagger:model Volume
-type Volume struct {
-
-	// Name of the volume driver used by the volume.
-	// Required: true
-	Driver string `json:"Driver"`
-
-	// User-defined key/value metadata.
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// Mount path of the volume on the host.
-	// Required: true
-	Mountpoint string `json:"Mountpoint"`
-
-	// Name of the volume.
-	// Required: true
-	Name string `json:"Name"`
-
-	// The driver specific options used when creating the volume.
-	// Required: true
-	Options map[string]string `json:"Options"`
-
-	// The level at which the volume exists. Either `global` for cluster-wide, or `local` for machine level.
-	// Required: true
-	Scope string `json:"Scope"`
-
-	// Low-level details about the volume, provided by the volume driver.
-	// Details are returned as a map with key/value pairs:
-	// `{"key":"value","key2":"value2"}`.
-	//
-	// The `Status` field is optional, and is omitted if the volume driver
-	// does not support this feature.
-	//
-	Status map[string]interface{} `json:"Status,omitempty"`
-
-	// usage data
-	UsageData *VolumeUsageData `json:"UsageData,omitempty"`
-}
-
-// VolumeUsageData volume usage data
-// swagger:model VolumeUsageData
-type VolumeUsageData struct {
-
-	// The number of containers referencing this volume.
-	// Required: true
-	RefCount int64 `json:"RefCount"`
-
-	// The disk space used by the volume (local driver only)
-	// Required: true
-	Size int64 `json:"Size"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/volume/volumes_create.go b/installer/vendor/github.com/docker/docker/api/types/volume/volumes_create.go
deleted file mode 100644
index 679c16006f..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/volume/volumes_create.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package volume
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-// VolumesCreateBody volumes create body
-// swagger:model VolumesCreateBody
-type VolumesCreateBody struct {
-
-	// Name of the volume driver to use.
-	// Required: true
-	Driver string `json:"Driver"`
-
-	// A mapping of driver options and values. These options are passed directly to the driver and are driver specific.
-	// Required: true
-	DriverOpts map[string]string `json:"DriverOpts"`
-
-	// User-defined key/value metadata.
-	// Required: true
-	Labels map[string]string `json:"Labels"`
-
-	// The new volume's name. If not specified, Docker generates a name.
-	// Required: true
-	Name string `json:"Name"`
-}
diff --git a/installer/vendor/github.com/docker/docker/api/types/volume/volumes_list.go b/installer/vendor/github.com/docker/docker/api/types/volume/volumes_list.go
deleted file mode 100644
index 7770bcb8fc..0000000000
--- a/installer/vendor/github.com/docker/docker/api/types/volume/volumes_list.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package volume
-
-// ----------------------------------------------------------------------------
-// DO NOT EDIT THIS FILE
-// This file was generated by `swagger generate operation`
-//
-// See hack/swagger-gen.sh
-// ----------------------------------------------------------------------------
-
-import "github.com/docker/docker/api/types"
-
-// VolumesListOKBody volumes list o k body
-// swagger:model VolumesListOKBody
-type VolumesListOKBody struct {
-
-	// List of volumes
-	// Required: true
-	Volumes []*types.Volume `json:"Volumes"`
-
-	// Warnings that occurred when fetching the list of volumes
-	// Required: true
-	Warnings []string `json:"Warnings"`
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/builder.go b/installer/vendor/github.com/docker/docker/builder/builder.go
deleted file mode 100644
index ced19e81e6..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/builder.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Package builder defines interfaces for any Docker builder to implement.
-//
-// Historically, only server-side Dockerfile interpreters existed.
-// This package allows for other implementations of Docker builders.
-package builder
-
-import (
-	"io"
-	"os"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/reference"
-	"golang.org/x/net/context"
-)
-
-const (
-	// DefaultDockerfileName is the Default filename with Docker commands, read by docker build
-	DefaultDockerfileName string = "Dockerfile"
-)
-
-// Context represents a file system tree.
-type Context interface {
-	// Close allows to signal that the filesystem tree won't be used anymore.
-	// For Context implementations using a temporary directory, it is recommended to
-	// delete the temporary directory in Close().
-	Close() error
-	// Stat returns an entry corresponding to path if any.
-	// It is recommended to return an error if path was not found.
-	// If path is a symlink it also returns the path to the target file.
-	Stat(path string) (string, FileInfo, error)
-	// Open opens path from the context and returns a readable stream of it.
-	Open(path string) (io.ReadCloser, error)
-	// Walk walks the tree of the context with the function passed to it.
-	Walk(root string, walkFn WalkFunc) error
-}
-
-// WalkFunc is the type of the function called for each file or directory visited by Context.Walk().
-type WalkFunc func(path string, fi FileInfo, err error) error
-
-// ModifiableContext represents a modifiable Context.
-// TODO: remove this interface once we can get rid of Remove()
-type ModifiableContext interface {
-	Context
-	// Remove deletes the entry specified by `path`.
-	// It is usual for directory entries to delete all its subentries.
-	Remove(path string) error
-}
-
-// FileInfo extends os.FileInfo to allow retrieving an absolute path to the file.
-// TODO: remove this interface once pkg/archive exposes a walk function that Context can use.
-type FileInfo interface {
-	os.FileInfo
-	Path() string
-}
-
-// PathFileInfo is a convenience struct that implements the FileInfo interface.
-type PathFileInfo struct {
-	os.FileInfo
-	// FilePath holds the absolute path to the file.
-	FilePath string
-	// Name holds the basename for the file.
-	FileName string
-}
-
-// Path returns the absolute path to the file.
-func (fi PathFileInfo) Path() string {
-	return fi.FilePath
-}
-
-// Name returns the basename of the file.
-func (fi PathFileInfo) Name() string {
-	if fi.FileName != "" {
-		return fi.FileName
-	}
-	return fi.FileInfo.Name()
-}
-
-// Hashed defines an extra method intended for implementations of os.FileInfo.
-type Hashed interface {
-	// Hash returns the hash of a file.
-	Hash() string
-	SetHash(string)
-}
-
-// HashedFileInfo is a convenient struct that augments FileInfo with a field.
-type HashedFileInfo struct {
-	FileInfo
-	// FileHash represents the hash of a file.
-	FileHash string
-}
-
-// Hash returns the hash of a file.
-func (fi HashedFileInfo) Hash() string {
-	return fi.FileHash
-}
-
-// SetHash sets the hash of a file.
-func (fi *HashedFileInfo) SetHash(h string) {
-	fi.FileHash = h
-}
-
-// Backend abstracts calls to a Docker Daemon.
-type Backend interface {
-	// TODO: use digest reference instead of name
-
-	// GetImageOnBuild looks up a Docker image referenced by `name`.
-	GetImageOnBuild(name string) (Image, error)
-	// TagImage tags an image with newTag
-	TagImageWithReference(image.ID, reference.Named) error
-	// PullOnBuild tells Docker to pull image referenced by `name`.
-	PullOnBuild(ctx context.Context, name string, authConfigs map[string]types.AuthConfig, output io.Writer) (Image, error)
-	// ContainerAttachRaw attaches to container.
-	ContainerAttachRaw(cID string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool) error
-	// ContainerCreate creates a new Docker container and returns potential warnings
-	ContainerCreate(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)
-	// ContainerRm removes a container specified by `id`.
-	ContainerRm(name string, config *types.ContainerRmConfig) error
-	// Commit creates a new Docker image from an existing Docker container.
-	Commit(string, *backend.ContainerCommitConfig) (string, error)
-	// ContainerKill stops the container execution abruptly.
-	ContainerKill(containerID string, sig uint64) error
-	// ContainerStart starts a new container
-	ContainerStart(containerID string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error
-	// ContainerWait stops processing until the given container is stopped.
-	ContainerWait(containerID string, timeout time.Duration) (int, error)
-	// ContainerUpdateCmdOnBuild updates container.Path and container.Args
-	ContainerUpdateCmdOnBuild(containerID string, cmd []string) error
-	// ContainerCreateWorkdir creates the workdir (currently only used on Windows)
-	ContainerCreateWorkdir(containerID string) error
-
-	// ContainerCopy copies/extracts a source FileInfo to a destination path inside a container
-	// specified by a container object.
-	// TODO: make an Extract method instead of passing `decompress`
-	// TODO: do not pass a FileInfo, instead refactor the archive package to export a Walk function that can be used
-	// with Context.Walk
-	// ContainerCopy(name string, res string) (io.ReadCloser, error)
-	// TODO: use copyBackend api
-	CopyOnBuild(containerID string, destPath string, src FileInfo, decompress bool) error
-
-	// HasExperimental checks if the backend supports experimental features
-	HasExperimental() bool
-
-	// SquashImage squashes the fs layers from the provided image down to the specified `to` image
-	SquashImage(from string, to string) (string, error)
-}
-
-// Image represents a Docker image used by the builder.
-type Image interface {
-	ImageID() string
-	RunConfig() *container.Config
-}
-
-// ImageCacheBuilder represents a generator for stateful image cache.
-type ImageCacheBuilder interface {
-	// MakeImageCache creates a stateful image cache.
-	MakeImageCache(cacheFrom []string) ImageCache
-}
-
-// ImageCache abstracts an image cache.
-// (parent image, child runconfig) -> child image
-type ImageCache interface {
-	// GetCachedImageOnBuild returns a reference to a cached image whose parent equals `parent`
-	// and runconfig equals `cfg`. A cache miss is expected to return an empty ID and a nil error.
-	GetCache(parentID string, cfg *container.Config) (imageID string, err error)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/context.go b/installer/vendor/github.com/docker/docker/builder/context.go
deleted file mode 100644
index 600f42319b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/context.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package builder
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/gitutils"
-	"github.com/docker/docker/pkg/httputils"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-)
-
-// ValidateContextDirectory checks if all the contents of the directory
-// can be read and returns an error if some files can't be read
-// symlinks which point to non-existing files don't trigger an error
-func ValidateContextDirectory(srcPath string, excludes []string) error {
-	contextRoot, err := getContextRoot(srcPath)
-	if err != nil {
-		return err
-	}
-	return filepath.Walk(contextRoot, func(filePath string, f os.FileInfo, err error) error {
-		if err != nil {
-			if os.IsPermission(err) {
-				return fmt.Errorf("can't stat '%s'", filePath)
-			}
-			if os.IsNotExist(err) {
-				return nil
-			}
-			return err
-		}
-
-		// skip this directory/file if it's not in the path, it won't get added to the context
-		if relFilePath, err := filepath.Rel(contextRoot, filePath); err != nil {
-			return err
-		} else if skip, err := fileutils.Matches(relFilePath, excludes); err != nil {
-			return err
-		} else if skip {
-			if f.IsDir() {
-				return filepath.SkipDir
-			}
-			return nil
-		}
-
-		// skip checking if symlinks point to non-existing files, such symlinks can be useful
-		// also skip named pipes, because they hanging on open
-		if f.Mode()&(os.ModeSymlink|os.ModeNamedPipe) != 0 {
-			return nil
-		}
-
-		if !f.IsDir() {
-			currentFile, err := os.Open(filePath)
-			if err != nil && os.IsPermission(err) {
-				return fmt.Errorf("no permission to read from '%s'", filePath)
-			}
-			currentFile.Close()
-		}
-		return nil
-	})
-}
-
-// GetContextFromReader will read the contents of the given reader as either a
-// Dockerfile or tar archive. Returns a tar archive used as a context and a
-// path to the Dockerfile inside the tar.
-func GetContextFromReader(r io.ReadCloser, dockerfileName string) (out io.ReadCloser, relDockerfile string, err error) {
-	buf := bufio.NewReader(r)
-
-	magic, err := buf.Peek(archive.HeaderSize)
-	if err != nil && err != io.EOF {
-		return nil, "", fmt.Errorf("failed to peek context header from STDIN: %v", err)
-	}
-
-	if archive.IsArchive(magic) {
-		return ioutils.NewReadCloserWrapper(buf, func() error { return r.Close() }), dockerfileName, nil
-	}
-
-	// Input should be read as a Dockerfile.
-	tmpDir, err := ioutil.TempDir("", "docker-build-context-")
-	if err != nil {
-		return nil, "", fmt.Errorf("unbale to create temporary context directory: %v", err)
-	}
-
-	f, err := os.Create(filepath.Join(tmpDir, DefaultDockerfileName))
-	if err != nil {
-		return nil, "", err
-	}
-	_, err = io.Copy(f, buf)
-	if err != nil {
-		f.Close()
-		return nil, "", err
-	}
-
-	if err := f.Close(); err != nil {
-		return nil, "", err
-	}
-	if err := r.Close(); err != nil {
-		return nil, "", err
-	}
-
-	tar, err := archive.Tar(tmpDir, archive.Uncompressed)
-	if err != nil {
-		return nil, "", err
-	}
-
-	return ioutils.NewReadCloserWrapper(tar, func() error {
-		err := tar.Close()
-		os.RemoveAll(tmpDir)
-		return err
-	}), DefaultDockerfileName, nil
-
-}
-
-// GetContextFromGitURL uses a Git URL as context for a `docker build`. The
-// git repo is cloned into a temporary directory used as the context directory.
-// Returns the absolute path to the temporary context directory, the relative
-// path of the dockerfile in that context directory, and a non-nil error on
-// success.
-func GetContextFromGitURL(gitURL, dockerfileName string) (absContextDir, relDockerfile string, err error) {
-	if _, err := exec.LookPath("git"); err != nil {
-		return "", "", fmt.Errorf("unable to find 'git': %v", err)
-	}
-	if absContextDir, err = gitutils.Clone(gitURL); err != nil {
-		return "", "", fmt.Errorf("unable to 'git clone' to temporary context directory: %v", err)
-	}
-
-	return getDockerfileRelPath(absContextDir, dockerfileName)
-}
-
-// GetContextFromURL uses a remote URL as context for a `docker build`. The
-// remote resource is downloaded as either a Dockerfile or a tar archive.
-// Returns the tar archive used for the context and a path of the
-// dockerfile inside the tar.
-func GetContextFromURL(out io.Writer, remoteURL, dockerfileName string) (io.ReadCloser, string, error) {
-	response, err := httputils.Download(remoteURL)
-	if err != nil {
-		return nil, "", fmt.Errorf("unable to download remote context %s: %v", remoteURL, err)
-	}
-	progressOutput := streamformatter.NewStreamFormatter().NewProgressOutput(out, true)
-
-	// Pass the response body through a progress reader.
-	progReader := progress.NewProgressReader(response.Body, progressOutput, response.ContentLength, "", fmt.Sprintf("Downloading build context from remote url: %s", remoteURL))
-
-	return GetContextFromReader(ioutils.NewReadCloserWrapper(progReader, func() error { return response.Body.Close() }), dockerfileName)
-}
-
-// GetContextFromLocalDir uses the given local directory as context for a
-// `docker build`. Returns the absolute path to the local context directory,
-// the relative path of the dockerfile in that context directory, and a non-nil
-// error on success.
-func GetContextFromLocalDir(localDir, dockerfileName string) (absContextDir, relDockerfile string, err error) {
-	// When using a local context directory, when the Dockerfile is specified
-	// with the `-f/--file` option then it is considered relative to the
-	// current directory and not the context directory.
-	if dockerfileName != "" {
-		if dockerfileName, err = filepath.Abs(dockerfileName); err != nil {
-			return "", "", fmt.Errorf("unable to get absolute path to Dockerfile: %v", err)
-		}
-	}
-
-	return getDockerfileRelPath(localDir, dockerfileName)
-}
-
-// getDockerfileRelPath uses the given context directory for a `docker build`
-// and returns the absolute path to the context directory, the relative path of
-// the dockerfile in that context directory, and a non-nil error on success.
-func getDockerfileRelPath(givenContextDir, givenDockerfile string) (absContextDir, relDockerfile string, err error) {
-	if absContextDir, err = filepath.Abs(givenContextDir); err != nil {
-		return "", "", fmt.Errorf("unable to get absolute context directory of given context directory %q: %v", givenContextDir, err)
-	}
-
-	// The context dir might be a symbolic link, so follow it to the actual
-	// target directory.
-	//
-	// FIXME. We use isUNC (always false on non-Windows platforms) to workaround
-	// an issue in golang. On Windows, EvalSymLinks does not work on UNC file
-	// paths (those starting with \\). This hack means that when using links
-	// on UNC paths, they will not be followed.
-	if !isUNC(absContextDir) {
-		absContextDir, err = filepath.EvalSymlinks(absContextDir)
-		if err != nil {
-			return "", "", fmt.Errorf("unable to evaluate symlinks in context path: %v", err)
-		}
-	}
-
-	stat, err := os.Lstat(absContextDir)
-	if err != nil {
-		return "", "", fmt.Errorf("unable to stat context directory %q: %v", absContextDir, err)
-	}
-
-	if !stat.IsDir() {
-		return "", "", fmt.Errorf("context must be a directory: %s", absContextDir)
-	}
-
-	absDockerfile := givenDockerfile
-	if absDockerfile == "" {
-		// No -f/--file was specified so use the default relative to the
-		// context directory.
-		absDockerfile = filepath.Join(absContextDir, DefaultDockerfileName)
-
-		// Just to be nice ;-) look for 'dockerfile' too but only
-		// use it if we found it, otherwise ignore this check
-		if _, err = os.Lstat(absDockerfile); os.IsNotExist(err) {
-			altPath := filepath.Join(absContextDir, strings.ToLower(DefaultDockerfileName))
-			if _, err = os.Lstat(altPath); err == nil {
-				absDockerfile = altPath
-			}
-		}
-	}
-
-	// If not already an absolute path, the Dockerfile path should be joined to
-	// the base directory.
-	if !filepath.IsAbs(absDockerfile) {
-		absDockerfile = filepath.Join(absContextDir, absDockerfile)
-	}
-
-	// Evaluate symlinks in the path to the Dockerfile too.
-	//
-	// FIXME. We use isUNC (always false on non-Windows platforms) to workaround
-	// an issue in golang. On Windows, EvalSymLinks does not work on UNC file
-	// paths (those starting with \\). This hack means that when using links
-	// on UNC paths, they will not be followed.
-	if !isUNC(absDockerfile) {
-		absDockerfile, err = filepath.EvalSymlinks(absDockerfile)
-		if err != nil {
-			return "", "", fmt.Errorf("unable to evaluate symlinks in Dockerfile path: %v", err)
-		}
-	}
-
-	if _, err := os.Lstat(absDockerfile); err != nil {
-		if os.IsNotExist(err) {
-			return "", "", fmt.Errorf("Cannot locate Dockerfile: %q", absDockerfile)
-		}
-		return "", "", fmt.Errorf("unable to stat Dockerfile: %v", err)
-	}
-
-	if relDockerfile, err = filepath.Rel(absContextDir, absDockerfile); err != nil {
-		return "", "", fmt.Errorf("unable to get relative Dockerfile path: %v", err)
-	}
-
-	if strings.HasPrefix(relDockerfile, ".."+string(filepath.Separator)) {
-		return "", "", fmt.Errorf("The Dockerfile (%s) must be within the build context (%s)", givenDockerfile, givenContextDir)
-	}
-
-	return absContextDir, relDockerfile, nil
-}
-
-// isUNC returns true if the path is UNC (one starting \\). It always returns
-// false on Linux.
-func isUNC(path string) bool {
-	return runtime.GOOS == "windows" && strings.HasPrefix(path, `\\`)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/context_test.go b/installer/vendor/github.com/docker/docker/builder/context_test.go
deleted file mode 100644
index 27d29d79f4..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/context_test.go
+++ /dev/null
@@ -1,307 +0,0 @@
-package builder
-
-import (
-	"archive/tar"
-	"bytes"
-	"io"
-	"io/ioutil"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/archive"
-)
-
-var prepareEmpty = func(t *testing.T) (string, func()) {
-	return "", func() {}
-}
-
-var prepareNoFiles = func(t *testing.T) (string, func()) {
-	return createTestTempDir(t, "", "builder-context-test")
-}
-
-var prepareOneFile = func(t *testing.T) (string, func()) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-	return contextDir, cleanup
-}
-
-func testValidateContextDirectory(t *testing.T, prepare func(t *testing.T) (string, func()), excludes []string) {
-	contextDir, cleanup := prepare(t)
-	defer cleanup()
-
-	err := ValidateContextDirectory(contextDir, excludes)
-
-	if err != nil {
-		t.Fatalf("Error should be nil, got: %s", err)
-	}
-}
-
-func TestGetContextFromLocalDirNoDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(contextDir, "")
-
-	if err == nil {
-		t.Fatalf("Error should not be nil")
-	}
-
-	if absContextDir != "" {
-		t.Fatalf("Absolute directory path should be empty, got: %s", absContextDir)
-	}
-
-	if relDockerfile != "" {
-		t.Fatalf("Relative path to Dockerfile should be empty, got: %s", relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirNotExistingDir(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	fakePath := filepath.Join(contextDir, "fake")
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(fakePath, "")
-
-	if err == nil {
-		t.Fatalf("Error should not be nil")
-	}
-
-	if absContextDir != "" {
-		t.Fatalf("Absolute directory path should be empty, got: %s", absContextDir)
-	}
-
-	if relDockerfile != "" {
-		t.Fatalf("Relative path to Dockerfile should be empty, got: %s", relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirNotExistingDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	fakePath := filepath.Join(contextDir, "fake")
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(contextDir, fakePath)
-
-	if err == nil {
-		t.Fatalf("Error should not be nil")
-	}
-
-	if absContextDir != "" {
-		t.Fatalf("Absolute directory path should be empty, got: %s", absContextDir)
-	}
-
-	if relDockerfile != "" {
-		t.Fatalf("Relative path to Dockerfile should be empty, got: %s", relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirWithNoDirectory(t *testing.T) {
-	contextDir, dirCleanup := createTestTempDir(t, "", "builder-context-test")
-	defer dirCleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	chdirCleanup := chdir(t, contextDir)
-	defer chdirCleanup()
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(contextDir, "")
-
-	if err != nil {
-		t.Fatalf("Error when getting context from local dir: %s", err)
-	}
-
-	if absContextDir != contextDir {
-		t.Fatalf("Absolute directory path should be equal to %s, got: %s", contextDir, absContextDir)
-	}
-
-	if relDockerfile != DefaultDockerfileName {
-		t.Fatalf("Relative path to dockerfile should be equal to %s, got: %s", DefaultDockerfileName, relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirWithDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(contextDir, "")
-
-	if err != nil {
-		t.Fatalf("Error when getting context from local dir: %s", err)
-	}
-
-	if absContextDir != contextDir {
-		t.Fatalf("Absolute directory path should be equal to %s, got: %s", contextDir, absContextDir)
-	}
-
-	if relDockerfile != DefaultDockerfileName {
-		t.Fatalf("Relative path to dockerfile should be equal to %s, got: %s", DefaultDockerfileName, relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirLocalFile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-	testFilename := createTestTempFile(t, contextDir, "tmpTest", "test", 0777)
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(testFilename, "")
-
-	if err == nil {
-		t.Fatalf("Error should not be nil")
-	}
-
-	if absContextDir != "" {
-		t.Fatalf("Absolute directory path should be empty, got: %s", absContextDir)
-	}
-
-	if relDockerfile != "" {
-		t.Fatalf("Relative path to Dockerfile should be empty, got: %s", relDockerfile)
-	}
-}
-
-func TestGetContextFromLocalDirWithCustomDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	chdirCleanup := chdir(t, contextDir)
-	defer chdirCleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	absContextDir, relDockerfile, err := GetContextFromLocalDir(contextDir, DefaultDockerfileName)
-
-	if err != nil {
-		t.Fatalf("Error when getting context from local dir: %s", err)
-	}
-
-	if absContextDir != contextDir {
-		t.Fatalf("Absolute directory path should be equal to %s, got: %s", contextDir, absContextDir)
-	}
-
-	if relDockerfile != DefaultDockerfileName {
-		t.Fatalf("Relative path to dockerfile should be equal to %s, got: %s", DefaultDockerfileName, relDockerfile)
-	}
-
-}
-
-func TestGetContextFromReaderString(t *testing.T) {
-	tarArchive, relDockerfile, err := GetContextFromReader(ioutil.NopCloser(strings.NewReader(dockerfileContents)), "")
-
-	if err != nil {
-		t.Fatalf("Error when executing GetContextFromReader: %s", err)
-	}
-
-	tarReader := tar.NewReader(tarArchive)
-
-	_, err = tarReader.Next()
-
-	if err != nil {
-		t.Fatalf("Error when reading tar archive: %s", err)
-	}
-
-	buff := new(bytes.Buffer)
-	buff.ReadFrom(tarReader)
-	contents := buff.String()
-
-	_, err = tarReader.Next()
-
-	if err != io.EOF {
-		t.Fatalf("Tar stream too long: %s", err)
-	}
-
-	if err = tarArchive.Close(); err != nil {
-		t.Fatalf("Error when closing tar stream: %s", err)
-	}
-
-	if dockerfileContents != contents {
-		t.Fatalf("Uncompressed tar archive does not equal: %s, got: %s", dockerfileContents, contents)
-	}
-
-	if relDockerfile != DefaultDockerfileName {
-		t.Fatalf("Relative path not equals %s, got: %s", DefaultDockerfileName, relDockerfile)
-	}
-}
-
-func TestGetContextFromReaderTar(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-context-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	tarStream, err := archive.Tar(contextDir, archive.Uncompressed)
-
-	if err != nil {
-		t.Fatalf("Error when creating tar: %s", err)
-	}
-
-	tarArchive, relDockerfile, err := GetContextFromReader(tarStream, DefaultDockerfileName)
-
-	if err != nil {
-		t.Fatalf("Error when executing GetContextFromReader: %s", err)
-	}
-
-	tarReader := tar.NewReader(tarArchive)
-
-	header, err := tarReader.Next()
-
-	if err != nil {
-		t.Fatalf("Error when reading tar archive: %s", err)
-	}
-
-	if header.Name != DefaultDockerfileName {
-		t.Fatalf("Dockerfile name should be: %s, got: %s", DefaultDockerfileName, header.Name)
-	}
-
-	buff := new(bytes.Buffer)
-	buff.ReadFrom(tarReader)
-	contents := buff.String()
-
-	_, err = tarReader.Next()
-
-	if err != io.EOF {
-		t.Fatalf("Tar stream too long: %s", err)
-	}
-
-	if err = tarArchive.Close(); err != nil {
-		t.Fatalf("Error when closing tar stream: %s", err)
-	}
-
-	if dockerfileContents != contents {
-		t.Fatalf("Uncompressed tar archive does not equal: %s, got: %s", dockerfileContents, contents)
-	}
-
-	if relDockerfile != DefaultDockerfileName {
-		t.Fatalf("Relative path not equals %s, got: %s", DefaultDockerfileName, relDockerfile)
-	}
-}
-
-func TestValidateContextDirectoryEmptyContext(t *testing.T) {
-	// This isn't a valid test on Windows. See https://play.golang.org/p/RR6z6jxR81.
-	// The test will ultimately end up calling filepath.Abs(""). On Windows,
-	// golang will error. On Linux, golang will return /. Due to there being
-	// drive letters on Windows, this is probably the correct behaviour for
-	// Windows.
-	if runtime.GOOS == "windows" {
-		t.Skip("Invalid test on Windows")
-	}
-	testValidateContextDirectory(t, prepareEmpty, []string{})
-}
-
-func TestValidateContextDirectoryContextWithNoFiles(t *testing.T) {
-	testValidateContextDirectory(t, prepareNoFiles, []string{})
-}
-
-func TestValidateContextDirectoryWithOneFile(t *testing.T) {
-	testValidateContextDirectory(t, prepareOneFile, []string{})
-}
-
-func TestValidateContextDirectoryWithOneFileExcludes(t *testing.T) {
-	testValidateContextDirectory(t, prepareOneFile, []string{DefaultDockerfileName})
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/context_unix.go b/installer/vendor/github.com/docker/docker/builder/context_unix.go
deleted file mode 100644
index d1f72e0573..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/context_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !windows
-
-package builder
-
-import (
-	"path/filepath"
-)
-
-func getContextRoot(srcPath string) (string, error) {
-	return filepath.Join(srcPath, "."), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/context_windows.go b/installer/vendor/github.com/docker/docker/builder/context_windows.go
deleted file mode 100644
index b8ba2ba231..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/context_windows.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build windows
-
-package builder
-
-import (
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/longpath"
-)
-
-func getContextRoot(srcPath string) (string, error) {
-	cr, err := filepath.Abs(srcPath)
-	if err != nil {
-		return "", err
-	}
-	return longpath.AddPrefix(cr), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag.go
deleted file mode 100644
index 1e03693072..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package dockerfile
-
-import (
-	"fmt"
-	"strings"
-)
-
-// FlagType is the type of the build flag
-type FlagType int
-
-const (
-	boolType FlagType = iota
-	stringType
-)
-
-// BFlags contains all flags information for the builder
-type BFlags struct {
-	Args  []string // actual flags/args from cmd line
-	flags map[string]*Flag
-	used  map[string]*Flag
-	Err   error
-}
-
-// Flag contains all information for a flag
-type Flag struct {
-	bf       *BFlags
-	name     string
-	flagType FlagType
-	Value    string
-}
-
-// NewBFlags returns the new BFlags struct
-func NewBFlags() *BFlags {
-	return &BFlags{
-		flags: make(map[string]*Flag),
-		used:  make(map[string]*Flag),
-	}
-}
-
-// AddBool adds a bool flag to BFlags
-// Note, any error will be generated when Parse() is called (see Parse).
-func (bf *BFlags) AddBool(name string, def bool) *Flag {
-	flag := bf.addFlag(name, boolType)
-	if flag == nil {
-		return nil
-	}
-	if def {
-		flag.Value = "true"
-	} else {
-		flag.Value = "false"
-	}
-	return flag
-}
-
-// AddString adds a string flag to BFlags
-// Note, any error will be generated when Parse() is called (see Parse).
-func (bf *BFlags) AddString(name string, def string) *Flag {
-	flag := bf.addFlag(name, stringType)
-	if flag == nil {
-		return nil
-	}
-	flag.Value = def
-	return flag
-}
-
-// addFlag is a generic func used by the other AddXXX() func
-// to add a new flag to the BFlags struct.
-// Note, any error will be generated when Parse() is called (see Parse).
-func (bf *BFlags) addFlag(name string, flagType FlagType) *Flag {
-	if _, ok := bf.flags[name]; ok {
-		bf.Err = fmt.Errorf("Duplicate flag defined: %s", name)
-		return nil
-	}
-
-	newFlag := &Flag{
-		bf:       bf,
-		name:     name,
-		flagType: flagType,
-	}
-	bf.flags[name] = newFlag
-
-	return newFlag
-}
-
-// IsUsed checks if the flag is used
-func (fl *Flag) IsUsed() bool {
-	if _, ok := fl.bf.used[fl.name]; ok {
-		return true
-	}
-	return false
-}
-
-// IsTrue checks if a bool flag is true
-func (fl *Flag) IsTrue() bool {
-	if fl.flagType != boolType {
-		// Should never get here
-		panic(fmt.Errorf("Trying to use IsTrue on a non-boolean: %s", fl.name))
-	}
-	return fl.Value == "true"
-}
-
-// Parse parses and checks if the BFlags is valid.
-// Any error noticed during the AddXXX() funcs will be generated/returned
-// here.  We do this because an error during AddXXX() is more like a
-// compile time error so it doesn't matter too much when we stop our
-// processing as long as we do stop it, so this allows the code
-// around AddXXX() to be just:
-//     defFlag := AddString("description", "")
-// w/o needing to add an if-statement around each one.
-func (bf *BFlags) Parse() error {
-	// If there was an error while defining the possible flags
-	// go ahead and bubble it back up here since we didn't do it
-	// earlier in the processing
-	if bf.Err != nil {
-		return fmt.Errorf("Error setting up flags: %s", bf.Err)
-	}
-
-	for _, arg := range bf.Args {
-		if !strings.HasPrefix(arg, "--") {
-			return fmt.Errorf("Arg should start with -- : %s", arg)
-		}
-
-		if arg == "--" {
-			return nil
-		}
-
-		arg = arg[2:]
-		value := ""
-
-		index := strings.Index(arg, "=")
-		if index >= 0 {
-			value = arg[index+1:]
-			arg = arg[:index]
-		}
-
-		flag, ok := bf.flags[arg]
-		if !ok {
-			return fmt.Errorf("Unknown flag: %s", arg)
-		}
-
-		if _, ok = bf.used[arg]; ok {
-			return fmt.Errorf("Duplicate flag specified: %s", arg)
-		}
-
-		bf.used[arg] = flag
-
-		switch flag.flagType {
-		case boolType:
-			// value == "" is only ok if no "=" was specified
-			if index >= 0 && value == "" {
-				return fmt.Errorf("Missing a value on flag: %s", arg)
-			}
-
-			lower := strings.ToLower(value)
-			if lower == "" {
-				flag.Value = "true"
-			} else if lower == "true" || lower == "false" {
-				flag.Value = lower
-			} else {
-				return fmt.Errorf("Expecting boolean value for flag %s, not: %s", arg, value)
-			}
-
-		case stringType:
-			if index < 0 {
-				return fmt.Errorf("Missing a value on flag: %s", arg)
-			}
-			flag.Value = value
-
-		default:
-			panic(fmt.Errorf("No idea what kind of flag we have! Should never get here!"))
-		}
-
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag_test.go
deleted file mode 100644
index 65cfceadd0..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/bflag_test.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package dockerfile
-
-import (
-	"testing"
-)
-
-func TestBuilderFlags(t *testing.T) {
-	var expected string
-	var err error
-
-	// ---
-
-	bf := NewBFlags()
-	bf.Args = []string{}
-	if err := bf.Parse(); err != nil {
-		t.Fatalf("Test1 of %q was supposed to work: %s", bf.Args, err)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	bf.Args = []string{"--"}
-	if err := bf.Parse(); err != nil {
-		t.Fatalf("Test2 of %q was supposed to work: %s", bf.Args, err)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 := bf.AddString("str1", "")
-	flBool1 := bf.AddBool("bool1", false)
-	bf.Args = []string{}
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test3 of %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if flStr1.IsUsed() == true {
-		t.Fatalf("Test3 - str1 was not used!")
-	}
-	if flBool1.IsUsed() == true {
-		t.Fatalf("Test3 - bool1 was not used!")
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 = bf.AddString("str1", "HI")
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test4 of %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if flStr1.Value != "HI" {
-		t.Fatalf("Str1 was supposed to default to: HI")
-	}
-	if flBool1.IsTrue() {
-		t.Fatalf("Bool1 was supposed to default to: false")
-	}
-	if flStr1.IsUsed() == true {
-		t.Fatalf("Str1 was not used!")
-	}
-	if flBool1.IsUsed() == true {
-		t.Fatalf("Bool1 was not used!")
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 = bf.AddString("str1", "HI")
-	bf.Args = []string{"--str1"}
-
-	if err = bf.Parse(); err == nil {
-		t.Fatalf("Test %q was supposed to fail", bf.Args)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 = bf.AddString("str1", "HI")
-	bf.Args = []string{"--str1="}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	expected = ""
-	if flStr1.Value != expected {
-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 = bf.AddString("str1", "HI")
-	bf.Args = []string{"--str1=BYE"}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	expected = "BYE"
-	if flStr1.Value != expected {
-		t.Fatalf("Str1 (%q) should be: %q", flStr1.Value, expected)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool1"}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if !flBool1.IsTrue() {
-		t.Fatalf("Test-b1 Bool1 was supposed to be true")
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool1=true"}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if !flBool1.IsTrue() {
-		t.Fatalf("Test-b2 Bool1 was supposed to be true")
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool1=false"}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if flBool1.IsTrue() {
-		t.Fatalf("Test-b3 Bool1 was supposed to be false")
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool1=false1"}
-
-	if err = bf.Parse(); err == nil {
-		t.Fatalf("Test %q was supposed to fail", bf.Args)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool2"}
-
-	if err = bf.Parse(); err == nil {
-		t.Fatalf("Test %q was supposed to fail", bf.Args)
-	}
-
-	// ---
-
-	bf = NewBFlags()
-	flStr1 = bf.AddString("str1", "HI")
-	flBool1 = bf.AddBool("bool1", false)
-	bf.Args = []string{"--bool1", "--str1=BYE"}
-
-	if err = bf.Parse(); err != nil {
-		t.Fatalf("Test %q was supposed to work: %s", bf.Args, err)
-	}
-
-	if flStr1.Value != "BYE" {
-		t.Fatalf("Teset %s, str1 should be BYE", bf.Args)
-	}
-	if !flBool1.IsTrue() {
-		t.Fatalf("Teset %s, bool1 should be true", bf.Args)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/builder.go
deleted file mode 100644
index da43513fff..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder.go
+++ /dev/null
@@ -1,370 +0,0 @@
-package dockerfile
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	apierrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/builder/dockerfile/parser"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	perrors "github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-var validCommitCommands = map[string]bool{
-	"cmd":         true,
-	"entrypoint":  true,
-	"healthcheck": true,
-	"env":         true,
-	"expose":      true,
-	"label":       true,
-	"onbuild":     true,
-	"user":        true,
-	"volume":      true,
-	"workdir":     true,
-}
-
-// BuiltinAllowedBuildArgs is list of built-in allowed build args
-var BuiltinAllowedBuildArgs = map[string]bool{
-	"HTTP_PROXY":  true,
-	"http_proxy":  true,
-	"HTTPS_PROXY": true,
-	"https_proxy": true,
-	"FTP_PROXY":   true,
-	"ftp_proxy":   true,
-	"NO_PROXY":    true,
-	"no_proxy":    true,
-}
-
-// Builder is a Dockerfile builder
-// It implements the builder.Backend interface.
-type Builder struct {
-	options *types.ImageBuildOptions
-
-	Stdout io.Writer
-	Stderr io.Writer
-	Output io.Writer
-
-	docker    builder.Backend
-	context   builder.Context
-	clientCtx context.Context
-	cancel    context.CancelFunc
-
-	dockerfile       *parser.Node
-	runConfig        *container.Config // runconfig for cmd, run, entrypoint etc.
-	flags            *BFlags
-	tmpContainers    map[string]struct{}
-	image            string // imageID
-	noBaseImage      bool
-	maintainer       string
-	cmdSet           bool
-	disableCommit    bool
-	cacheBusted      bool
-	allowedBuildArgs map[string]bool // list of build-time args that are allowed for expansion/substitution and passing to commands in 'run'.
-	directive        parser.Directive
-
-	// TODO: remove once docker.Commit can receive a tag
-	id string
-
-	imageCache builder.ImageCache
-	from       builder.Image
-}
-
-// BuildManager implements builder.Backend and is shared across all Builder objects.
-type BuildManager struct {
-	backend builder.Backend
-}
-
-// NewBuildManager creates a BuildManager.
-func NewBuildManager(b builder.Backend) (bm *BuildManager) {
-	return &BuildManager{backend: b}
-}
-
-// BuildFromContext builds a new image from a given context.
-func (bm *BuildManager) BuildFromContext(ctx context.Context, src io.ReadCloser, remote string, buildOptions *types.ImageBuildOptions, pg backend.ProgressWriter) (string, error) {
-	if buildOptions.Squash && !bm.backend.HasExperimental() {
-		return "", apierrors.NewBadRequestError(errors.New("squash is only supported with experimental mode"))
-	}
-	buildContext, dockerfileName, err := builder.DetectContextFromRemoteURL(src, remote, pg.ProgressReaderFunc)
-	if err != nil {
-		return "", err
-	}
-	defer func() {
-		if err := buildContext.Close(); err != nil {
-			logrus.Debugf("[BUILDER] failed to remove temporary context: %v", err)
-		}
-	}()
-
-	if len(dockerfileName) > 0 {
-		buildOptions.Dockerfile = dockerfileName
-	}
-	b, err := NewBuilder(ctx, buildOptions, bm.backend, builder.DockerIgnoreContext{ModifiableContext: buildContext}, nil)
-	if err != nil {
-		return "", err
-	}
-	return b.build(pg.StdoutFormatter, pg.StderrFormatter, pg.Output)
-}
-
-// NewBuilder creates a new Dockerfile builder from an optional dockerfile and a Config.
-// If dockerfile is nil, the Dockerfile specified by Config.DockerfileName,
-// will be read from the Context passed to Build().
-func NewBuilder(clientCtx context.Context, config *types.ImageBuildOptions, backend builder.Backend, buildContext builder.Context, dockerfile io.ReadCloser) (b *Builder, err error) {
-	if config == nil {
-		config = new(types.ImageBuildOptions)
-	}
-	if config.BuildArgs == nil {
-		config.BuildArgs = make(map[string]*string)
-	}
-	ctx, cancel := context.WithCancel(clientCtx)
-	b = &Builder{
-		clientCtx:        ctx,
-		cancel:           cancel,
-		options:          config,
-		Stdout:           os.Stdout,
-		Stderr:           os.Stderr,
-		docker:           backend,
-		context:          buildContext,
-		runConfig:        new(container.Config),
-		tmpContainers:    map[string]struct{}{},
-		id:               stringid.GenerateNonCryptoID(),
-		allowedBuildArgs: make(map[string]bool),
-		directive: parser.Directive{
-			EscapeSeen:           false,
-			LookingForDirectives: true,
-		},
-	}
-	if icb, ok := backend.(builder.ImageCacheBuilder); ok {
-		b.imageCache = icb.MakeImageCache(config.CacheFrom)
-	}
-
-	parser.SetEscapeToken(parser.DefaultEscapeToken, &b.directive) // Assume the default token for escape
-
-	if dockerfile != nil {
-		b.dockerfile, err = parser.Parse(dockerfile, &b.directive)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return b, nil
-}
-
-// sanitizeRepoAndTags parses the raw "t" parameter received from the client
-// to a slice of repoAndTag.
-// It also validates each repoName and tag.
-func sanitizeRepoAndTags(names []string) ([]reference.Named, error) {
-	var (
-		repoAndTags []reference.Named
-		// This map is used for deduplicating the "-t" parameter.
-		uniqNames = make(map[string]struct{})
-	)
-	for _, repo := range names {
-		if repo == "" {
-			continue
-		}
-
-		ref, err := reference.ParseNamed(repo)
-		if err != nil {
-			return nil, err
-		}
-
-		ref = reference.WithDefaultTag(ref)
-
-		if _, isCanonical := ref.(reference.Canonical); isCanonical {
-			return nil, errors.New("build tag cannot contain a digest")
-		}
-
-		if _, isTagged := ref.(reference.NamedTagged); !isTagged {
-			ref, err = reference.WithTag(ref, reference.DefaultTag)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		nameWithTag := ref.String()
-
-		if _, exists := uniqNames[nameWithTag]; !exists {
-			uniqNames[nameWithTag] = struct{}{}
-			repoAndTags = append(repoAndTags, ref)
-		}
-	}
-	return repoAndTags, nil
-}
-
-// build runs the Dockerfile builder from a context and a docker object that allows to make calls
-// to Docker.
-//
-// This will (barring errors):
-//
-// * read the dockerfile from context
-// * parse the dockerfile if not already parsed
-// * walk the AST and execute it by dispatching to handlers. If Remove
-//   or ForceRemove is set, additional cleanup around containers happens after
-//   processing.
-// * Tag image, if applicable.
-// * Print a happy message and return the image ID.
-//
-func (b *Builder) build(stdout io.Writer, stderr io.Writer, out io.Writer) (string, error) {
-	b.Stdout = stdout
-	b.Stderr = stderr
-	b.Output = out
-
-	// If Dockerfile was not parsed yet, extract it from the Context
-	if b.dockerfile == nil {
-		if err := b.readDockerfile(); err != nil {
-			return "", err
-		}
-	}
-
-	repoAndTags, err := sanitizeRepoAndTags(b.options.Tags)
-	if err != nil {
-		return "", err
-	}
-
-	if len(b.options.Labels) > 0 {
-		line := "LABEL "
-		for k, v := range b.options.Labels {
-			line += fmt.Sprintf("%q='%s' ", k, v)
-		}
-		_, node, err := parser.ParseLine(line, &b.directive, false)
-		if err != nil {
-			return "", err
-		}
-		b.dockerfile.Children = append(b.dockerfile.Children, node)
-	}
-
-	var shortImgID string
-	total := len(b.dockerfile.Children)
-	for _, n := range b.dockerfile.Children {
-		if err := b.checkDispatch(n, false); err != nil {
-			return "", err
-		}
-	}
-
-	for i, n := range b.dockerfile.Children {
-		select {
-		case <-b.clientCtx.Done():
-			logrus.Debug("Builder: build cancelled!")
-			fmt.Fprintf(b.Stdout, "Build cancelled")
-			return "", fmt.Errorf("Build cancelled")
-		default:
-			// Not cancelled yet, keep going...
-		}
-
-		if err := b.dispatch(i, total, n); err != nil {
-			if b.options.ForceRemove {
-				b.clearTmp()
-			}
-			return "", err
-		}
-
-		shortImgID = stringid.TruncateID(b.image)
-		fmt.Fprintf(b.Stdout, " ---> %s\n", shortImgID)
-		if b.options.Remove {
-			b.clearTmp()
-		}
-	}
-
-	// check if there are any leftover build-args that were passed but not
-	// consumed during build. Return a warning, if there are any.
-	leftoverArgs := []string{}
-	for arg := range b.options.BuildArgs {
-		if !b.isBuildArgAllowed(arg) {
-			leftoverArgs = append(leftoverArgs, arg)
-		}
-	}
-
-	if len(leftoverArgs) > 0 {
-		fmt.Fprintf(b.Stderr, "[Warning] One or more build-args %v were not consumed\n", leftoverArgs)
-	}
-
-	if b.image == "" {
-		return "", fmt.Errorf("No image was generated. Is your Dockerfile empty?")
-	}
-
-	if b.options.Squash {
-		var fromID string
-		if b.from != nil {
-			fromID = b.from.ImageID()
-		}
-		b.image, err = b.docker.SquashImage(b.image, fromID)
-		if err != nil {
-			return "", perrors.Wrap(err, "error squashing image")
-		}
-	}
-
-	imageID := image.ID(b.image)
-	for _, rt := range repoAndTags {
-		if err := b.docker.TagImageWithReference(imageID, rt); err != nil {
-			return "", err
-		}
-	}
-
-	fmt.Fprintf(b.Stdout, "Successfully built %s\n", shortImgID)
-	return b.image, nil
-}
-
-// Cancel cancels an ongoing Dockerfile build.
-func (b *Builder) Cancel() {
-	b.cancel()
-}
-
-// BuildFromConfig builds directly from `changes`, treating it as if it were the contents of a Dockerfile
-// It will:
-// - Call parse.Parse() to get an AST root for the concatenated Dockerfile entries.
-// - Do build by calling builder.dispatch() to call all entries' handling routines
-//
-// BuildFromConfig is used by the /commit endpoint, with the changes
-// coming from the query parameter of the same name.
-//
-// TODO: Remove?
-func BuildFromConfig(config *container.Config, changes []string) (*container.Config, error) {
-	b, err := NewBuilder(context.Background(), nil, nil, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	ast, err := parser.Parse(bytes.NewBufferString(strings.Join(changes, "\n")), &b.directive)
-	if err != nil {
-		return nil, err
-	}
-
-	// ensure that the commands are valid
-	for _, n := range ast.Children {
-		if !validCommitCommands[n.Value] {
-			return nil, fmt.Errorf("%s is not a valid change command", n.Value)
-		}
-	}
-
-	b.runConfig = config
-	b.Stdout = ioutil.Discard
-	b.Stderr = ioutil.Discard
-	b.disableCommit = true
-
-	total := len(ast.Children)
-	for _, n := range ast.Children {
-		if err := b.checkDispatch(n, false); err != nil {
-			return nil, err
-		}
-	}
-
-	for i, n := range ast.Children {
-		if err := b.dispatch(i, total, n); err != nil {
-			return nil, err
-		}
-	}
-
-	return b.runConfig, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_unix.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_unix.go
deleted file mode 100644
index 76a7ce74f9..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_unix.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !windows
-
-package dockerfile
-
-var defaultShell = []string{"/bin/sh", "-c"}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_windows.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_windows.go
deleted file mode 100644
index 37e9fbcf4b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/builder_windows.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package dockerfile
-
-var defaultShell = []string{"cmd", "/S", "/C"}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/command/command.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/command/command.go
deleted file mode 100644
index f23c6874b5..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/command/command.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Package command contains the set of Dockerfile commands.
-package command
-
-// Define constants for the command strings
-const (
-	Add         = "add"
-	Arg         = "arg"
-	Cmd         = "cmd"
-	Copy        = "copy"
-	Entrypoint  = "entrypoint"
-	Env         = "env"
-	Expose      = "expose"
-	From        = "from"
-	Healthcheck = "healthcheck"
-	Label       = "label"
-	Maintainer  = "maintainer"
-	Onbuild     = "onbuild"
-	Run         = "run"
-	Shell       = "shell"
-	StopSignal  = "stopsignal"
-	User        = "user"
-	Volume      = "volume"
-	Workdir     = "workdir"
-)
-
-// Commands is list of all Dockerfile commands
-var Commands = map[string]struct{}{
-	Add:         {},
-	Arg:         {},
-	Cmd:         {},
-	Copy:        {},
-	Entrypoint:  {},
-	Env:         {},
-	Expose:      {},
-	From:        {},
-	Healthcheck: {},
-	Label:       {},
-	Maintainer:  {},
-	Onbuild:     {},
-	Run:         {},
-	Shell:       {},
-	StopSignal:  {},
-	User:        {},
-	Volume:      {},
-	Workdir:     {},
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers.go
deleted file mode 100644
index 3e78abdd68..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers.go
+++ /dev/null
@@ -1,821 +0,0 @@
-package dockerfile
-
-// This file contains the dispatchers for each command. Note that
-// `nullDispatch` is not actually a command, but support for commands we parse
-// but do nothing with.
-//
-// See evaluator.go for a higher level discussion of the whole evaluator
-// package.
-
-import (
-	"fmt"
-	"regexp"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/pkg/signal"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-connections/nat"
-)
-
-// ENV foo bar
-//
-// Sets the environment variable foo to bar, also makes interpolation
-// in the dockerfile available from the next statement on via ${foo}.
-//
-func env(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) == 0 {
-		return errAtLeastOneArgument("ENV")
-	}
-
-	if len(args)%2 != 0 {
-		// should never get here, but just in case
-		return errTooManyArguments("ENV")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	// TODO/FIXME/NOT USED
-	// Just here to show how to use the builder flags stuff within the
-	// context of a builder command. Will remove once we actually add
-	// a builder command to something!
-	/*
-		flBool1 := b.flags.AddBool("bool1", false)
-		flStr1 := b.flags.AddString("str1", "HI")
-
-		if err := b.flags.Parse(); err != nil {
-			return err
-		}
-
-		fmt.Printf("Bool1:%v\n", flBool1)
-		fmt.Printf("Str1:%v\n", flStr1)
-	*/
-
-	commitStr := "ENV"
-
-	for j := 0; j < len(args); j++ {
-		// name  ==> args[j]
-		// value ==> args[j+1]
-
-		if len(args[j]) == 0 {
-			return errBlankCommandNames("ENV")
-		}
-		newVar := args[j] + "=" + args[j+1] + ""
-		commitStr += " " + newVar
-
-		gotOne := false
-		for i, envVar := range b.runConfig.Env {
-			envParts := strings.SplitN(envVar, "=", 2)
-			compareFrom := envParts[0]
-			compareTo := args[j]
-			if runtime.GOOS == "windows" {
-				// Case insensitive environment variables on Windows
-				compareFrom = strings.ToUpper(compareFrom)
-				compareTo = strings.ToUpper(compareTo)
-			}
-			if compareFrom == compareTo {
-				b.runConfig.Env[i] = newVar
-				gotOne = true
-				break
-			}
-		}
-		if !gotOne {
-			b.runConfig.Env = append(b.runConfig.Env, newVar)
-		}
-		j++
-	}
-
-	return b.commit("", b.runConfig.Cmd, commitStr)
-}
-
-// MAINTAINER some text <maybe@an.email.address>
-//
-// Sets the maintainer metadata.
-func maintainer(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("MAINTAINER")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	b.maintainer = args[0]
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("MAINTAINER %s", b.maintainer))
-}
-
-// LABEL some json data describing the image
-//
-// Sets the Label variable foo to bar,
-//
-func label(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) == 0 {
-		return errAtLeastOneArgument("LABEL")
-	}
-	if len(args)%2 != 0 {
-		// should never get here, but just in case
-		return errTooManyArguments("LABEL")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	commitStr := "LABEL"
-
-	if b.runConfig.Labels == nil {
-		b.runConfig.Labels = map[string]string{}
-	}
-
-	for j := 0; j < len(args); j++ {
-		// name  ==> args[j]
-		// value ==> args[j+1]
-
-		if len(args[j]) == 0 {
-			return errBlankCommandNames("LABEL")
-		}
-
-		newVar := args[j] + "=" + args[j+1] + ""
-		commitStr += " " + newVar
-
-		b.runConfig.Labels[args[j]] = args[j+1]
-		j++
-	}
-	return b.commit("", b.runConfig.Cmd, commitStr)
-}
-
-// ADD foo /path
-//
-// Add the file 'foo' to '/path'. Tarball and Remote URL (git, http) handling
-// exist here. If you do not wish to have this automatic handling, use COPY.
-//
-func add(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) < 2 {
-		return errAtLeastTwoArguments("ADD")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	return b.runContextCommand(args, true, true, "ADD")
-}
-
-// COPY foo /path
-//
-// Same as 'ADD' but without the tar and remote url handling.
-//
-func dispatchCopy(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) < 2 {
-		return errAtLeastTwoArguments("COPY")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	return b.runContextCommand(args, false, false, "COPY")
-}
-
-// FROM imagename
-//
-// This sets the image the dockerfile will build on top of.
-//
-func from(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("FROM")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	name := args[0]
-
-	var (
-		image builder.Image
-		err   error
-	)
-
-	// Windows cannot support a container with no base image.
-	if name == api.NoBaseImageSpecifier {
-		if runtime.GOOS == "windows" {
-			return fmt.Errorf("Windows does not support FROM scratch")
-		}
-		b.image = ""
-		b.noBaseImage = true
-	} else {
-		// TODO: don't use `name`, instead resolve it to a digest
-		if !b.options.PullParent {
-			image, err = b.docker.GetImageOnBuild(name)
-			// TODO: shouldn't we error out if error is different from "not found" ?
-		}
-		if image == nil {
-			image, err = b.docker.PullOnBuild(b.clientCtx, name, b.options.AuthConfigs, b.Output)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	b.from = image
-
-	return b.processImageFrom(image)
-}
-
-// ONBUILD RUN echo yo
-//
-// ONBUILD triggers run when the image is used in a FROM statement.
-//
-// ONBUILD handling has a lot of special-case functionality, the heading in
-// evaluator.go and comments around dispatch() in the same file explain the
-// special cases. search for 'OnBuild' in internals.go for additional special
-// cases.
-//
-func onbuild(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) == 0 {
-		return errAtLeastOneArgument("ONBUILD")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	triggerInstruction := strings.ToUpper(strings.TrimSpace(args[0]))
-	switch triggerInstruction {
-	case "ONBUILD":
-		return fmt.Errorf("Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed")
-	case "MAINTAINER", "FROM":
-		return fmt.Errorf("%s isn't allowed as an ONBUILD trigger", triggerInstruction)
-	}
-
-	original = regexp.MustCompile(`(?i)^\s*ONBUILD\s*`).ReplaceAllString(original, "")
-
-	b.runConfig.OnBuild = append(b.runConfig.OnBuild, original)
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("ONBUILD %s", original))
-}
-
-// WORKDIR /tmp
-//
-// Set the working directory for future RUN/CMD/etc statements.
-//
-func workdir(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("WORKDIR")
-	}
-
-	err := b.flags.Parse()
-	if err != nil {
-		return err
-	}
-
-	// This is from the Dockerfile and will not necessarily be in platform
-	// specific semantics, hence ensure it is converted.
-	b.runConfig.WorkingDir, err = normaliseWorkdir(b.runConfig.WorkingDir, args[0])
-	if err != nil {
-		return err
-	}
-
-	// For performance reasons, we explicitly do a create/mkdir now
-	// This avoids having an unnecessary expensive mount/unmount calls
-	// (on Windows in particular) during each container create.
-	// Prior to 1.13, the mkdir was deferred and not executed at this step.
-	if b.disableCommit {
-		// Don't call back into the daemon if we're going through docker commit --change "WORKDIR /foo".
-		// We've already updated the runConfig and that's enough.
-		return nil
-	}
-	b.runConfig.Image = b.image
-
-	cmd := b.runConfig.Cmd
-	comment := "WORKDIR " + b.runConfig.WorkingDir
-	// reset the command for cache detection
-	b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), "#(nop) "+comment))
-	defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
-
-	if hit, err := b.probeCache(); err != nil {
-		return err
-	} else if hit {
-		return nil
-	}
-
-	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})
-	if err != nil {
-		return err
-	}
-	b.tmpContainers[container.ID] = struct{}{}
-	if err := b.docker.ContainerCreateWorkdir(container.ID); err != nil {
-		return err
-	}
-
-	return b.commit(container.ID, cmd, comment)
-}
-
-// RUN some command yo
-//
-// run a command and commit the image. Args are automatically prepended with
-// the current SHELL which defaults to 'sh -c' under linux or 'cmd /S /C' under
-// Windows, in the event there is only one argument The difference in processing:
-//
-// RUN echo hi          # sh -c echo hi       (Linux)
-// RUN echo hi          # cmd /S /C echo hi   (Windows)
-// RUN [ "echo", "hi" ] # echo hi
-//
-func run(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if b.image == "" && !b.noBaseImage {
-		return fmt.Errorf("Please provide a source image with `from` prior to run")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	args = handleJSONArgs(args, attributes)
-
-	if !attributes["json"] {
-		args = append(getShell(b.runConfig), args...)
-	}
-	config := &container.Config{
-		Cmd:   strslice.StrSlice(args),
-		Image: b.image,
-	}
-
-	// stash the cmd
-	cmd := b.runConfig.Cmd
-	if len(b.runConfig.Entrypoint) == 0 && len(b.runConfig.Cmd) == 0 {
-		b.runConfig.Cmd = config.Cmd
-	}
-
-	// stash the config environment
-	env := b.runConfig.Env
-
-	defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
-	defer func(env []string) { b.runConfig.Env = env }(env)
-
-	// derive the net build-time environment for this run. We let config
-	// environment override the build time environment.
-	// This means that we take the b.buildArgs list of env vars and remove
-	// any of those variables that are defined as part of the container. In other
-	// words, anything in b.Config.Env. What's left is the list of build-time env
-	// vars that we need to add to each RUN command - note the list could be empty.
-	//
-	// We don't persist the build time environment with container's config
-	// environment, but just sort and prepend it to the command string at time
-	// of commit.
-	// This helps with tracing back the image's actual environment at the time
-	// of RUN, without leaking it to the final image. It also aids cache
-	// lookup for same image built with same build time environment.
-	cmdBuildEnv := []string{}
-	configEnv := runconfigopts.ConvertKVStringsToMap(b.runConfig.Env)
-	for key, val := range b.options.BuildArgs {
-		if !b.isBuildArgAllowed(key) {
-			// skip build-args that are not in allowed list, meaning they have
-			// not been defined by an "ARG" Dockerfile command yet.
-			// This is an error condition but only if there is no "ARG" in the entire
-			// Dockerfile, so we'll generate any necessary errors after we parsed
-			// the entire file (see 'leftoverArgs' processing in evaluator.go )
-			continue
-		}
-		if _, ok := configEnv[key]; !ok && val != nil {
-			cmdBuildEnv = append(cmdBuildEnv, fmt.Sprintf("%s=%s", key, *val))
-		}
-	}
-
-	// derive the command to use for probeCache() and to commit in this container.
-	// Note that we only do this if there are any build-time env vars.  Also, we
-	// use the special argument "|#" at the start of the args array. This will
-	// avoid conflicts with any RUN command since commands can not
-	// start with | (vertical bar). The "#" (number of build envs) is there to
-	// help ensure proper cache matches. We don't want a RUN command
-	// that starts with "foo=abc" to be considered part of a build-time env var.
-	saveCmd := config.Cmd
-	if len(cmdBuildEnv) > 0 {
-		sort.Strings(cmdBuildEnv)
-		tmpEnv := append([]string{fmt.Sprintf("|%d", len(cmdBuildEnv))}, cmdBuildEnv...)
-		saveCmd = strslice.StrSlice(append(tmpEnv, saveCmd...))
-	}
-
-	b.runConfig.Cmd = saveCmd
-	hit, err := b.probeCache()
-	if err != nil {
-		return err
-	}
-	if hit {
-		return nil
-	}
-
-	// set Cmd manually, this is special case only for Dockerfiles
-	b.runConfig.Cmd = config.Cmd
-	// set build-time environment for 'run'.
-	b.runConfig.Env = append(b.runConfig.Env, cmdBuildEnv...)
-	// set config as already being escaped, this prevents double escaping on windows
-	b.runConfig.ArgsEscaped = true
-
-	logrus.Debugf("[BUILDER] Command to be executed: %v", b.runConfig.Cmd)
-
-	cID, err := b.create()
-	if err != nil {
-		return err
-	}
-
-	if err := b.run(cID); err != nil {
-		return err
-	}
-
-	// revert to original config environment and set the command string to
-	// have the build-time env vars in it (if any) so that future cache look-ups
-	// properly match it.
-	b.runConfig.Env = env
-	b.runConfig.Cmd = saveCmd
-	return b.commit(cID, cmd, "run")
-}
-
-// CMD foo
-//
-// Set the default command to run in the container (which may be empty).
-// Argument handling is the same as RUN.
-//
-func cmd(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	cmdSlice := handleJSONArgs(args, attributes)
-
-	if !attributes["json"] {
-		cmdSlice = append(getShell(b.runConfig), cmdSlice...)
-	}
-
-	b.runConfig.Cmd = strslice.StrSlice(cmdSlice)
-	// set config as already being escaped, this prevents double escaping on windows
-	b.runConfig.ArgsEscaped = true
-
-	if err := b.commit("", b.runConfig.Cmd, fmt.Sprintf("CMD %q", cmdSlice)); err != nil {
-		return err
-	}
-
-	if len(args) != 0 {
-		b.cmdSet = true
-	}
-
-	return nil
-}
-
-// parseOptInterval(flag) is the duration of flag.Value, or 0 if
-// empty. An error is reported if the value is given and is not positive.
-func parseOptInterval(f *Flag) (time.Duration, error) {
-	s := f.Value
-	if s == "" {
-		return 0, nil
-	}
-	d, err := time.ParseDuration(s)
-	if err != nil {
-		return 0, err
-	}
-	if d <= 0 {
-		return 0, fmt.Errorf("Interval %#v must be positive", f.name)
-	}
-	return d, nil
-}
-
-// HEALTHCHECK foo
-//
-// Set the default healthcheck command to run in the container (which may be empty).
-// Argument handling is the same as RUN.
-//
-func healthcheck(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) == 0 {
-		return errAtLeastOneArgument("HEALTHCHECK")
-	}
-	typ := strings.ToUpper(args[0])
-	args = args[1:]
-	if typ == "NONE" {
-		if len(args) != 0 {
-			return fmt.Errorf("HEALTHCHECK NONE takes no arguments")
-		}
-		test := strslice.StrSlice{typ}
-		b.runConfig.Healthcheck = &container.HealthConfig{
-			Test: test,
-		}
-	} else {
-		if b.runConfig.Healthcheck != nil {
-			oldCmd := b.runConfig.Healthcheck.Test
-			if len(oldCmd) > 0 && oldCmd[0] != "NONE" {
-				fmt.Fprintf(b.Stdout, "Note: overriding previous HEALTHCHECK: %v\n", oldCmd)
-			}
-		}
-
-		healthcheck := container.HealthConfig{}
-
-		flInterval := b.flags.AddString("interval", "")
-		flTimeout := b.flags.AddString("timeout", "")
-		flRetries := b.flags.AddString("retries", "")
-
-		if err := b.flags.Parse(); err != nil {
-			return err
-		}
-
-		switch typ {
-		case "CMD":
-			cmdSlice := handleJSONArgs(args, attributes)
-			if len(cmdSlice) == 0 {
-				return fmt.Errorf("Missing command after HEALTHCHECK CMD")
-			}
-
-			if !attributes["json"] {
-				typ = "CMD-SHELL"
-			}
-
-			healthcheck.Test = strslice.StrSlice(append([]string{typ}, cmdSlice...))
-		default:
-			return fmt.Errorf("Unknown type %#v in HEALTHCHECK (try CMD)", typ)
-		}
-
-		interval, err := parseOptInterval(flInterval)
-		if err != nil {
-			return err
-		}
-		healthcheck.Interval = interval
-
-		timeout, err := parseOptInterval(flTimeout)
-		if err != nil {
-			return err
-		}
-		healthcheck.Timeout = timeout
-
-		if flRetries.Value != "" {
-			retries, err := strconv.ParseInt(flRetries.Value, 10, 32)
-			if err != nil {
-				return err
-			}
-			if retries < 1 {
-				return fmt.Errorf("--retries must be at least 1 (not %d)", retries)
-			}
-			healthcheck.Retries = int(retries)
-		} else {
-			healthcheck.Retries = 0
-		}
-
-		b.runConfig.Healthcheck = &healthcheck
-	}
-
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("HEALTHCHECK %q", b.runConfig.Healthcheck))
-}
-
-// ENTRYPOINT /usr/sbin/nginx
-//
-// Set the entrypoint to /usr/sbin/nginx. Will accept the CMD as the arguments
-// to /usr/sbin/nginx. Uses the default shell if not in JSON format.
-//
-// Handles command processing similar to CMD and RUN, only b.runConfig.Entrypoint
-// is initialized at NewBuilder time instead of through argument parsing.
-//
-func entrypoint(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	parsed := handleJSONArgs(args, attributes)
-
-	switch {
-	case attributes["json"]:
-		// ENTRYPOINT ["echo", "hi"]
-		b.runConfig.Entrypoint = strslice.StrSlice(parsed)
-	case len(parsed) == 0:
-		// ENTRYPOINT []
-		b.runConfig.Entrypoint = nil
-	default:
-		// ENTRYPOINT echo hi
-		b.runConfig.Entrypoint = strslice.StrSlice(append(getShell(b.runConfig), parsed[0]))
-	}
-
-	// when setting the entrypoint if a CMD was not explicitly set then
-	// set the command to nil
-	if !b.cmdSet {
-		b.runConfig.Cmd = nil
-	}
-
-	if err := b.commit("", b.runConfig.Cmd, fmt.Sprintf("ENTRYPOINT %q", b.runConfig.Entrypoint)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// EXPOSE 6667/tcp 7000/tcp
-//
-// Expose ports for links and port mappings. This all ends up in
-// b.runConfig.ExposedPorts for runconfig.
-//
-func expose(b *Builder, args []string, attributes map[string]bool, original string) error {
-	portsTab := args
-
-	if len(args) == 0 {
-		return errAtLeastOneArgument("EXPOSE")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	if b.runConfig.ExposedPorts == nil {
-		b.runConfig.ExposedPorts = make(nat.PortSet)
-	}
-
-	ports, _, err := nat.ParsePortSpecs(portsTab)
-	if err != nil {
-		return err
-	}
-
-	// instead of using ports directly, we build a list of ports and sort it so
-	// the order is consistent. This prevents cache burst where map ordering
-	// changes between builds
-	portList := make([]string, len(ports))
-	var i int
-	for port := range ports {
-		if _, exists := b.runConfig.ExposedPorts[port]; !exists {
-			b.runConfig.ExposedPorts[port] = struct{}{}
-		}
-		portList[i] = string(port)
-		i++
-	}
-	sort.Strings(portList)
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("EXPOSE %s", strings.Join(portList, " ")))
-}
-
-// USER foo
-//
-// Set the user to 'foo' for future commands and when running the
-// ENTRYPOINT/CMD at container run time.
-//
-func user(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("USER")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	b.runConfig.User = args[0]
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("USER %v", args))
-}
-
-// VOLUME /foo
-//
-// Expose the volume /foo for use. Will also accept the JSON array form.
-//
-func volume(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) == 0 {
-		return errAtLeastOneArgument("VOLUME")
-	}
-
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-
-	if b.runConfig.Volumes == nil {
-		b.runConfig.Volumes = map[string]struct{}{}
-	}
-	for _, v := range args {
-		v = strings.TrimSpace(v)
-		if v == "" {
-			return fmt.Errorf("VOLUME specified can not be an empty string")
-		}
-		b.runConfig.Volumes[v] = struct{}{}
-	}
-	if err := b.commit("", b.runConfig.Cmd, fmt.Sprintf("VOLUME %v", args)); err != nil {
-		return err
-	}
-	return nil
-}
-
-// STOPSIGNAL signal
-//
-// Set the signal that will be used to kill the container.
-func stopSignal(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("STOPSIGNAL")
-	}
-
-	sig := args[0]
-	_, err := signal.ParseSignal(sig)
-	if err != nil {
-		return err
-	}
-
-	b.runConfig.StopSignal = sig
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("STOPSIGNAL %v", args))
-}
-
-// ARG name[=value]
-//
-// Adds the variable foo to the trusted list of variables that can be passed
-// to builder using the --build-arg flag for expansion/subsitution or passing to 'run'.
-// Dockerfile author may optionally set a default value of this variable.
-func arg(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if len(args) != 1 {
-		return errExactlyOneArgument("ARG")
-	}
-
-	var (
-		name       string
-		newValue   string
-		hasDefault bool
-	)
-
-	arg := args[0]
-	// 'arg' can just be a name or name-value pair. Note that this is different
-	// from 'env' that handles the split of name and value at the parser level.
-	// The reason for doing it differently for 'arg' is that we support just
-	// defining an arg and not assign it a value (while 'env' always expects a
-	// name-value pair). If possible, it will be good to harmonize the two.
-	if strings.Contains(arg, "=") {
-		parts := strings.SplitN(arg, "=", 2)
-		if len(parts[0]) == 0 {
-			return errBlankCommandNames("ARG")
-		}
-
-		name = parts[0]
-		newValue = parts[1]
-		hasDefault = true
-	} else {
-		name = arg
-		hasDefault = false
-	}
-	// add the arg to allowed list of build-time args from this step on.
-	b.allowedBuildArgs[name] = true
-
-	// If there is a default value associated with this arg then add it to the
-	// b.buildArgs if one is not already passed to the builder. The args passed
-	// to builder override the default value of 'arg'. Note that a 'nil' for
-	// a value means that the user specified "--build-arg FOO" and "FOO" wasn't
-	// defined as an env var - and in that case we DO want to use the default
-	// value specified in the ARG cmd.
-	if baValue, ok := b.options.BuildArgs[name]; (!ok || baValue == nil) && hasDefault {
-		b.options.BuildArgs[name] = &newValue
-	}
-
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("ARG %s", arg))
-}
-
-// SHELL powershell -command
-//
-// Set the non-default shell to use.
-func shell(b *Builder, args []string, attributes map[string]bool, original string) error {
-	if err := b.flags.Parse(); err != nil {
-		return err
-	}
-	shellSlice := handleJSONArgs(args, attributes)
-	switch {
-	case len(shellSlice) == 0:
-		// SHELL []
-		return errAtLeastOneArgument("SHELL")
-	case attributes["json"]:
-		// SHELL ["powershell", "-command"]
-		b.runConfig.Shell = strslice.StrSlice(shellSlice)
-	default:
-		// SHELL powershell -command - not JSON
-		return errNotJSON("SHELL", original)
-	}
-	return b.commit("", b.runConfig.Cmd, fmt.Sprintf("SHELL %v", shellSlice))
-}
-
-func errAtLeastOneArgument(command string) error {
-	return fmt.Errorf("%s requires at least one argument", command)
-}
-
-func errExactlyOneArgument(command string) error {
-	return fmt.Errorf("%s requires exactly one argument", command)
-}
-
-func errAtLeastTwoArguments(command string) error {
-	return fmt.Errorf("%s requires at least two arguments", command)
-}
-
-func errBlankCommandNames(command string) error {
-	return fmt.Errorf("%s names can not be blank", command)
-}
-
-func errTooManyArguments(command string) error {
-	return fmt.Errorf("Bad input to %s, too many arguments", command)
-}
-
-// getShell is a helper function which gets the right shell for prefixing the
-// shell-form of RUN, ENTRYPOINT and CMD instructions
-func getShell(c *container.Config) []string {
-	if 0 == len(c.Shell) {
-		return defaultShell[:]
-	}
-	return c.Shell[:]
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_test.go
deleted file mode 100644
index f7c57f7e3b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_test.go
+++ /dev/null
@@ -1,517 +0,0 @@
-package dockerfile
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-)
-
-type commandWithFunction struct {
-	name     string
-	function func(args []string) error
-}
-
-func TestCommandsExactlyOneArgument(t *testing.T) {
-	commands := []commandWithFunction{
-		{"MAINTAINER", func(args []string) error { return maintainer(nil, args, nil, "") }},
-		{"FROM", func(args []string) error { return from(nil, args, nil, "") }},
-		{"WORKDIR", func(args []string) error { return workdir(nil, args, nil, "") }},
-		{"USER", func(args []string) error { return user(nil, args, nil, "") }},
-		{"STOPSIGNAL", func(args []string) error { return stopSignal(nil, args, nil, "") }}}
-
-	for _, command := range commands {
-		err := command.function([]string{})
-
-		if err == nil {
-			t.Fatalf("Error should be present for %s command", command.name)
-		}
-
-		expectedError := errExactlyOneArgument(command.name)
-
-		if err.Error() != expectedError.Error() {
-			t.Fatalf("Wrong error message for %s. Got: %s. Should be: %s", command.name, err.Error(), expectedError)
-		}
-	}
-}
-
-func TestCommandsAtLeastOneArgument(t *testing.T) {
-	commands := []commandWithFunction{
-		{"ENV", func(args []string) error { return env(nil, args, nil, "") }},
-		{"LABEL", func(args []string) error { return label(nil, args, nil, "") }},
-		{"ONBUILD", func(args []string) error { return onbuild(nil, args, nil, "") }},
-		{"HEALTHCHECK", func(args []string) error { return healthcheck(nil, args, nil, "") }},
-		{"EXPOSE", func(args []string) error { return expose(nil, args, nil, "") }},
-		{"VOLUME", func(args []string) error { return volume(nil, args, nil, "") }}}
-
-	for _, command := range commands {
-		err := command.function([]string{})
-
-		if err == nil {
-			t.Fatalf("Error should be present for %s command", command.name)
-		}
-
-		expectedError := errAtLeastOneArgument(command.name)
-
-		if err.Error() != expectedError.Error() {
-			t.Fatalf("Wrong error message for %s. Got: %s. Should be: %s", command.name, err.Error(), expectedError)
-		}
-	}
-}
-
-func TestCommandsAtLeastTwoArguments(t *testing.T) {
-	commands := []commandWithFunction{
-		{"ADD", func(args []string) error { return add(nil, args, nil, "") }},
-		{"COPY", func(args []string) error { return dispatchCopy(nil, args, nil, "") }}}
-
-	for _, command := range commands {
-		err := command.function([]string{"arg1"})
-
-		if err == nil {
-			t.Fatalf("Error should be present for %s command", command.name)
-		}
-
-		expectedError := errAtLeastTwoArguments(command.name)
-
-		if err.Error() != expectedError.Error() {
-			t.Fatalf("Wrong error message for %s. Got: %s. Should be: %s", command.name, err.Error(), expectedError)
-		}
-	}
-}
-
-func TestCommandsTooManyArguments(t *testing.T) {
-	commands := []commandWithFunction{
-		{"ENV", func(args []string) error { return env(nil, args, nil, "") }},
-		{"LABEL", func(args []string) error { return label(nil, args, nil, "") }}}
-
-	for _, command := range commands {
-		err := command.function([]string{"arg1", "arg2", "arg3"})
-
-		if err == nil {
-			t.Fatalf("Error should be present for %s command", command.name)
-		}
-
-		expectedError := errTooManyArguments(command.name)
-
-		if err.Error() != expectedError.Error() {
-			t.Fatalf("Wrong error message for %s. Got: %s. Should be: %s", command.name, err.Error(), expectedError)
-		}
-	}
-}
-
-func TestCommandseBlankNames(t *testing.T) {
-	bflags := &BFlags{}
-	config := &container.Config{}
-
-	b := &Builder{flags: bflags, runConfig: config, disableCommit: true}
-
-	commands := []commandWithFunction{
-		{"ENV", func(args []string) error { return env(b, args, nil, "") }},
-		{"LABEL", func(args []string) error { return label(b, args, nil, "") }},
-	}
-
-	for _, command := range commands {
-		err := command.function([]string{"", ""})
-
-		if err == nil {
-			t.Fatalf("Error should be present for %s command", command.name)
-		}
-
-		expectedError := errBlankCommandNames(command.name)
-
-		if err.Error() != expectedError.Error() {
-			t.Fatalf("Wrong error message for %s. Got: %s. Should be: %s", command.name, err.Error(), expectedError)
-		}
-	}
-}
-
-func TestEnv2Variables(t *testing.T) {
-	variables := []string{"var1", "val1", "var2", "val2"}
-
-	bflags := &BFlags{}
-	config := &container.Config{}
-
-	b := &Builder{flags: bflags, runConfig: config, disableCommit: true}
-
-	if err := env(b, variables, nil, ""); err != nil {
-		t.Fatalf("Error when executing env: %s", err.Error())
-	}
-
-	expectedVar1 := fmt.Sprintf("%s=%s", variables[0], variables[1])
-	expectedVar2 := fmt.Sprintf("%s=%s", variables[2], variables[3])
-
-	if b.runConfig.Env[0] != expectedVar1 {
-		t.Fatalf("Wrong env output for first variable. Got: %s. Should be: %s", b.runConfig.Env[0], expectedVar1)
-	}
-
-	if b.runConfig.Env[1] != expectedVar2 {
-		t.Fatalf("Wrong env output for second variable. Got: %s, Should be: %s", b.runConfig.Env[1], expectedVar2)
-	}
-}
-
-func TestMaintainer(t *testing.T) {
-	maintainerEntry := "Some Maintainer <maintainer@example.com>"
-
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	if err := maintainer(b, []string{maintainerEntry}, nil, ""); err != nil {
-		t.Fatalf("Error when executing maintainer: %s", err.Error())
-	}
-
-	if b.maintainer != maintainerEntry {
-		t.Fatalf("Maintainer in builder should be set to %s. Got: %s", maintainerEntry, b.maintainer)
-	}
-}
-
-func TestLabel(t *testing.T) {
-	labelName := "label"
-	labelValue := "value"
-
-	labelEntry := []string{labelName, labelValue}
-
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	if err := label(b, labelEntry, nil, ""); err != nil {
-		t.Fatalf("Error when executing label: %s", err.Error())
-	}
-
-	if val, ok := b.runConfig.Labels[labelName]; ok {
-		if val != labelValue {
-			t.Fatalf("Label %s should have value %s, had %s instead", labelName, labelValue, val)
-		}
-	} else {
-		t.Fatalf("Label %s should be present but it is not", labelName)
-	}
-}
-
-func TestFrom(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	err := from(b, []string{"scratch"}, nil, "")
-
-	if runtime.GOOS == "windows" {
-		if err == nil {
-			t.Fatalf("Error not set on Windows")
-		}
-
-		expectedError := "Windows does not support FROM scratch"
-
-		if !strings.Contains(err.Error(), expectedError) {
-			t.Fatalf("Error message not correct on Windows. Should be: %s, got: %s", expectedError, err.Error())
-		}
-	} else {
-		if err != nil {
-			t.Fatalf("Error when executing from: %s", err.Error())
-		}
-
-		if b.image != "" {
-			t.Fatalf("Image shoule be empty, got: %s", b.image)
-		}
-
-		if b.noBaseImage != true {
-			t.Fatalf("Image should not have any base image, got: %v", b.noBaseImage)
-		}
-	}
-}
-
-func TestOnbuildIllegalTriggers(t *testing.T) {
-	triggers := []struct{ command, expectedError string }{
-		{"ONBUILD", "Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed"},
-		{"MAINTAINER", "MAINTAINER isn't allowed as an ONBUILD trigger"},
-		{"FROM", "FROM isn't allowed as an ONBUILD trigger"}}
-
-	for _, trigger := range triggers {
-		b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-		err := onbuild(b, []string{trigger.command}, nil, "")
-
-		if err == nil {
-			t.Fatalf("Error should not be nil")
-		}
-
-		if !strings.Contains(err.Error(), trigger.expectedError) {
-			t.Fatalf("Error message not correct. Should be: %s, got: %s", trigger.expectedError, err.Error())
-		}
-	}
-}
-
-func TestOnbuild(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	err := onbuild(b, []string{"ADD", ".", "/app/src"}, nil, "ONBUILD ADD . /app/src")
-
-	if err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	expectedOnbuild := "ADD . /app/src"
-
-	if b.runConfig.OnBuild[0] != expectedOnbuild {
-		t.Fatalf("Wrong ONBUILD command. Expected: %s, got: %s", expectedOnbuild, b.runConfig.OnBuild[0])
-	}
-}
-
-func TestWorkdir(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	workingDir := "/app"
-
-	if runtime.GOOS == "windows" {
-		workingDir = "C:\app"
-	}
-
-	err := workdir(b, []string{workingDir}, nil, "")
-
-	if err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.WorkingDir != workingDir {
-		t.Fatalf("WorkingDir should be set to %s, got %s", workingDir, b.runConfig.WorkingDir)
-	}
-
-}
-
-func TestCmd(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	command := "./executable"
-
-	err := cmd(b, []string{command}, nil, "")
-
-	if err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	var expectedCommand strslice.StrSlice
-
-	if runtime.GOOS == "windows" {
-		expectedCommand = strslice.StrSlice(append([]string{"cmd"}, "/S", "/C", command))
-	} else {
-		expectedCommand = strslice.StrSlice(append([]string{"/bin/sh"}, "-c", command))
-	}
-
-	if !compareStrSlice(b.runConfig.Cmd, expectedCommand) {
-		t.Fatalf("Command should be set to %s, got %s", command, b.runConfig.Cmd)
-	}
-
-	if !b.cmdSet {
-		t.Fatalf("Command should be marked as set")
-	}
-}
-
-func compareStrSlice(slice1, slice2 strslice.StrSlice) bool {
-	if len(slice1) != len(slice2) {
-		return false
-	}
-
-	for i := range slice1 {
-		if slice1[i] != slice2[i] {
-			return false
-		}
-	}
-
-	return true
-}
-
-func TestHealthcheckNone(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	if err := healthcheck(b, []string{"NONE"}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.Healthcheck == nil {
-		t.Fatal("Healthcheck should be set, got nil")
-	}
-
-	expectedTest := strslice.StrSlice(append([]string{"NONE"}))
-
-	if !compareStrSlice(expectedTest, b.runConfig.Healthcheck.Test) {
-		t.Fatalf("Command should be set to %s, got %s", expectedTest, b.runConfig.Healthcheck.Test)
-	}
-}
-
-func TestHealthcheckCmd(t *testing.T) {
-	b := &Builder{flags: &BFlags{flags: make(map[string]*Flag)}, runConfig: &container.Config{}, disableCommit: true}
-
-	if err := healthcheck(b, []string{"CMD", "curl", "-f", "http://localhost/", "||", "exit", "1"}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.Healthcheck == nil {
-		t.Fatal("Healthcheck should be set, got nil")
-	}
-
-	expectedTest := strslice.StrSlice(append([]string{"CMD-SHELL"}, "curl -f http://localhost/ || exit 1"))
-
-	if !compareStrSlice(expectedTest, b.runConfig.Healthcheck.Test) {
-		t.Fatalf("Command should be set to %s, got %s", expectedTest, b.runConfig.Healthcheck.Test)
-	}
-}
-
-func TestEntrypoint(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	entrypointCmd := "/usr/sbin/nginx"
-
-	if err := entrypoint(b, []string{entrypointCmd}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.Entrypoint == nil {
-		t.Fatalf("Entrypoint should be set")
-	}
-
-	var expectedEntrypoint strslice.StrSlice
-
-	if runtime.GOOS == "windows" {
-		expectedEntrypoint = strslice.StrSlice(append([]string{"cmd"}, "/S", "/C", entrypointCmd))
-	} else {
-		expectedEntrypoint = strslice.StrSlice(append([]string{"/bin/sh"}, "-c", entrypointCmd))
-	}
-
-	if !compareStrSlice(expectedEntrypoint, b.runConfig.Entrypoint) {
-		t.Fatalf("Entrypoint command should be set to %s, got %s", expectedEntrypoint, b.runConfig.Entrypoint)
-	}
-}
-
-func TestExpose(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	exposedPort := "80"
-
-	if err := expose(b, []string{exposedPort}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.ExposedPorts == nil {
-		t.Fatalf("ExposedPorts should be set")
-	}
-
-	if len(b.runConfig.ExposedPorts) != 1 {
-		t.Fatalf("ExposedPorts should contain only 1 element. Got %s", b.runConfig.ExposedPorts)
-	}
-
-	portsMapping, err := nat.ParsePortSpec(exposedPort)
-
-	if err != nil {
-		t.Fatalf("Error when parsing port spec: %s", err.Error())
-	}
-
-	if _, ok := b.runConfig.ExposedPorts[portsMapping[0].Port]; !ok {
-		t.Fatalf("Port %s should be present. Got %s", exposedPort, b.runConfig.ExposedPorts)
-	}
-}
-
-func TestUser(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	userCommand := "foo"
-
-	if err := user(b, []string{userCommand}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.User != userCommand {
-		t.Fatalf("User should be set to %s, got %s", userCommand, b.runConfig.User)
-	}
-}
-
-func TestVolume(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	exposedVolume := "/foo"
-
-	if err := volume(b, []string{exposedVolume}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.Volumes == nil {
-		t.Fatalf("Volumes should be set")
-	}
-
-	if len(b.runConfig.Volumes) != 1 {
-		t.Fatalf("Volumes should contain only 1 element. Got %s", b.runConfig.Volumes)
-	}
-
-	if _, ok := b.runConfig.Volumes[exposedVolume]; !ok {
-		t.Fatalf("Volume %s should be present. Got %s", exposedVolume, b.runConfig.Volumes)
-	}
-}
-
-func TestStopSignal(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	signal := "SIGKILL"
-
-	if err := stopSignal(b, []string{signal}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.StopSignal != signal {
-		t.Fatalf("StopSignal should be set to %s, got %s", signal, b.runConfig.StopSignal)
-	}
-}
-
-func TestArg(t *testing.T) {
-	buildOptions := &types.ImageBuildOptions{BuildArgs: make(map[string]*string)}
-
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true, allowedBuildArgs: make(map[string]bool), options: buildOptions}
-
-	argName := "foo"
-	argVal := "bar"
-	argDef := fmt.Sprintf("%s=%s", argName, argVal)
-
-	if err := arg(b, []string{argDef}, nil, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	allowed, ok := b.allowedBuildArgs[argName]
-
-	if !ok {
-		t.Fatalf("%s argument should be allowed as a build arg", argName)
-	}
-
-	if !allowed {
-		t.Fatalf("%s argument was present in map but disallowed as a build arg", argName)
-	}
-
-	val, ok := b.options.BuildArgs[argName]
-
-	if !ok {
-		t.Fatalf("%s argument should be a build arg", argName)
-	}
-
-	if *val != "bar" {
-		t.Fatalf("%s argument should have default value 'bar', got %s", argName, val)
-	}
-}
-
-func TestShell(t *testing.T) {
-	b := &Builder{flags: &BFlags{}, runConfig: &container.Config{}, disableCommit: true}
-
-	shellCmd := "powershell"
-
-	attrs := make(map[string]bool)
-	attrs["json"] = true
-
-	if err := shell(b, []string{shellCmd}, attrs, ""); err != nil {
-		t.Fatalf("Error should be empty, got: %s", err.Error())
-	}
-
-	if b.runConfig.Shell == nil {
-		t.Fatalf("Shell should be set")
-	}
-
-	expectedShell := strslice.StrSlice([]string{shellCmd})
-
-	if !compareStrSlice(expectedShell, b.runConfig.Shell) {
-		t.Fatalf("Shell should be set to %s, got %s", expectedShell, b.runConfig.Shell)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix.go
deleted file mode 100644
index 8b0dfc3911..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build !windows
-
-package dockerfile
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-)
-
-// normaliseWorkdir normalises a user requested working directory in a
-// platform sematically consistent way.
-func normaliseWorkdir(current string, requested string) (string, error) {
-	if requested == "" {
-		return "", fmt.Errorf("cannot normalise nothing")
-	}
-	current = filepath.FromSlash(current)
-	requested = filepath.FromSlash(requested)
-	if !filepath.IsAbs(requested) {
-		return filepath.Join(string(os.PathSeparator), current, requested), nil
-	}
-	return requested, nil
-}
-
-func errNotJSON(command, _ string) error {
-	return fmt.Errorf("%s requires the arguments to be in JSON form", command)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix_test.go
deleted file mode 100644
index 4aae6b460e..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_unix_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build !windows
-
-package dockerfile
-
-import (
-	"testing"
-)
-
-func TestNormaliseWorkdir(t *testing.T) {
-	testCases := []struct{ current, requested, expected, expectedError string }{
-		{``, ``, ``, `cannot normalise nothing`},
-		{``, `foo`, `/foo`, ``},
-		{``, `/foo`, `/foo`, ``},
-		{`/foo`, `bar`, `/foo/bar`, ``},
-		{`/foo`, `/bar`, `/bar`, ``},
-	}
-
-	for _, test := range testCases {
-		normalised, err := normaliseWorkdir(test.current, test.requested)
-
-		if test.expectedError != "" && err == nil {
-			t.Fatalf("NormaliseWorkdir should return an error %s, got nil", test.expectedError)
-		}
-
-		if test.expectedError != "" && err.Error() != test.expectedError {
-			t.Fatalf("NormaliseWorkdir returned wrong error. Expected %s, got %s", test.expectedError, err.Error())
-		}
-
-		if normalised != test.expected {
-			t.Fatalf("NormaliseWorkdir error. Expected %s for current %s and requested %s, got %s", test.expected, test.current, test.requested, normalised)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows.go
deleted file mode 100644
index e890c3ae18..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package dockerfile
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-var pattern = regexp.MustCompile(`^[a-zA-Z]:\.$`)
-
-// normaliseWorkdir normalises a user requested working directory in a
-// platform sematically consistent way.
-func normaliseWorkdir(current string, requested string) (string, error) {
-	if requested == "" {
-		return "", fmt.Errorf("cannot normalise nothing")
-	}
-
-	// `filepath.Clean` will replace "" with "." so skip in that case
-	if current != "" {
-		current = filepath.Clean(current)
-	}
-	if requested != "" {
-		requested = filepath.Clean(requested)
-	}
-
-	// If either current or requested in Windows is:
-	// C:
-	// C:.
-	// then an error will be thrown as the definition for the above
-	// refers to `current directory on drive C:`
-	// Since filepath.Clean() will automatically normalize the above
-	// to `C:.`, we only need to check the last format
-	if pattern.MatchString(current) {
-		return "", fmt.Errorf("%s is not a directory. If you are specifying a drive letter, please add a trailing '\\'", current)
-	}
-	if pattern.MatchString(requested) {
-		return "", fmt.Errorf("%s is not a directory. If you are specifying a drive letter, please add a trailing '\\'", requested)
-	}
-
-	// Target semantics is C:\somefolder, specifically in the format:
-	// UPPERCASEDriveLetter-Colon-Backslash-FolderName. We are already
-	// guaranteed that `current`, if set, is consistent. This allows us to
-	// cope correctly with any of the following in a Dockerfile:
-	//	WORKDIR a                       --> C:\a
-	//	WORKDIR c:\\foo                 --> C:\foo
-	//	WORKDIR \\foo                   --> C:\foo
-	//	WORKDIR /foo                    --> C:\foo
-	//	WORKDIR c:\\foo \ WORKDIR bar   --> C:\foo --> C:\foo\bar
-	//	WORKDIR C:/foo \ WORKDIR bar    --> C:\foo --> C:\foo\bar
-	//	WORKDIR C:/foo \ WORKDIR \\bar  --> C:\foo --> C:\bar
-	//	WORKDIR /foo \ WORKDIR c:/bar   --> C:\foo --> C:\bar
-	if len(current) == 0 || system.IsAbs(requested) {
-		if (requested[0] == os.PathSeparator) ||
-			(len(requested) > 1 && string(requested[1]) != ":") ||
-			(len(requested) == 1) {
-			requested = filepath.Join(`C:\`, requested)
-		}
-	} else {
-		requested = filepath.Join(current, requested)
-	}
-	// Upper-case drive letter
-	return (strings.ToUpper(string(requested[0])) + requested[1:]), nil
-}
-
-func errNotJSON(command, original string) error {
-	// For Windows users, give a hint if it looks like it might contain
-	// a path which hasn't been escaped such as ["c:\windows\system32\prog.exe", "-param"],
-	// as JSON must be escaped. Unfortunate...
-	//
-	// Specifically looking for quote-driveletter-colon-backslash, there's no
-	// double backslash and a [] pair. No, this is not perfect, but it doesn't
-	// have to be. It's simply a hint to make life a little easier.
-	extra := ""
-	original = filepath.FromSlash(strings.ToLower(strings.Replace(strings.ToLower(original), strings.ToLower(command)+" ", "", -1)))
-	if len(regexp.MustCompile(`"[a-z]:\\.*`).FindStringSubmatch(original)) > 0 &&
-		!strings.Contains(original, `\\`) &&
-		strings.Contains(original, "[") &&
-		strings.Contains(original, "]") {
-		extra = fmt.Sprintf(`. It looks like '%s' includes a file path without an escaped back-slash. JSON requires back-slashes to be escaped such as ["c:\\path\\to\\file.exe", "/parameter"]`, original)
-	}
-	return fmt.Errorf("%s requires the arguments to be in JSON form%s", command, extra)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows_test.go
deleted file mode 100644
index 3319c06582..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/dispatchers_windows_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build windows
-
-package dockerfile
-
-import "testing"
-
-func TestNormaliseWorkdir(t *testing.T) {
-	tests := []struct{ current, requested, expected, etext string }{
-		{``, ``, ``, `cannot normalise nothing`},
-		{``, `C:`, ``, `C:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
-		{``, `C:.`, ``, `C:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
-		{`c:`, `\a`, ``, `c:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
-		{`c:.`, `\a`, ``, `c:. is not a directory. If you are specifying a drive letter, please add a trailing '\'`},
-		{``, `a`, `C:\a`, ``},
-		{``, `c:\foo`, `C:\foo`, ``},
-		{``, `c:\\foo`, `C:\foo`, ``},
-		{``, `\foo`, `C:\foo`, ``},
-		{``, `\\foo`, `C:\foo`, ``},
-		{``, `/foo`, `C:\foo`, ``},
-		{``, `C:/foo`, `C:\foo`, ``},
-		{`C:\foo`, `bar`, `C:\foo\bar`, ``},
-		{`C:\foo`, `/bar`, `C:\bar`, ``},
-		{`C:\foo`, `\bar`, `C:\bar`, ``},
-	}
-	for _, i := range tests {
-		r, e := normaliseWorkdir(i.current, i.requested)
-
-		if i.etext != "" && e == nil {
-			t.Fatalf("TestNormaliseWorkingDir Expected error %s for '%s' '%s', got no error", i.etext, i.current, i.requested)
-		}
-
-		if i.etext != "" && e.Error() != i.etext {
-			t.Fatalf("TestNormaliseWorkingDir Expected error %s for '%s' '%s', got %s", i.etext, i.current, i.requested, e.Error())
-		}
-
-		if r != i.expected {
-			t.Fatalf("TestNormaliseWorkingDir Expected '%s' for '%s' '%s', got '%s'", i.expected, i.current, i.requested, r)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/envVarTest b/installer/vendor/github.com/docker/docker/builder/dockerfile/envVarTest
deleted file mode 100644
index 067dca9a54..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/envVarTest
+++ /dev/null
@@ -1,116 +0,0 @@
-A|hello                    |     hello
-A|he'll'o                  |     hello
-A|he'llo                   |     hello
-A|he\'llo                  |     he'llo
-A|he\\'llo                 |     he\llo
-A|abc\tdef                 |     abctdef
-A|"abc\tdef"               |     abc\tdef
-A|'abc\tdef'               |     abc\tdef
-A|hello\                   |     hello
-A|hello\\                  |     hello\
-A|"hello                   |     hello
-A|"hello\"                 |     hello"
-A|"hel'lo"                 |     hel'lo
-A|'hello                   |     hello
-A|'hello\'                 |     hello\
-A|"''"                     |     ''
-A|$.                       |     $.
-A|$1                       |
-A|he$1x                    |     hex
-A|he$.x                    |     he$.x
-# Next one is different on Windows as $pwd==$PWD
-U|he$pwd.                  |     he.
-W|he$pwd.                  |     he/home.
-A|he$PWD                   |     he/home
-A|he\$PWD                  |     he$PWD
-A|he\\$PWD                 |     he\/home
-A|he\${}                   |     he${}
-A|he\${}xx                 |     he${}xx
-A|he${}                    |     he
-A|he${}xx                  |     hexx
-A|he${hi}                  |     he
-A|he${hi}xx                |     hexx
-A|he${PWD}                 |     he/home
-A|he${.}                   |     error
-A|he${XXX:-000}xx          |     he000xx
-A|he${PWD:-000}xx          |     he/homexx
-A|he${XXX:-$PWD}xx         |     he/homexx
-A|he${XXX:-${PWD:-yyy}}xx  |     he/homexx
-A|he${XXX:-${YYY:-yyy}}xx  |     heyyyxx
-A|he${XXX:YYY}             |     error
-A|he${XXX:+${PWD}}xx       |     hexx
-A|he${PWD:+${XXX}}xx       |     hexx
-A|he${PWD:+${SHELL}}xx     |     hebashxx
-A|he${XXX:+000}xx          |     hexx
-A|he${PWD:+000}xx          |     he000xx
-A|'he${XX}'                |     he${XX}
-A|"he${PWD}"               |     he/home
-A|"he'$PWD'"               |     he'/home'
-A|"$PWD"                   |     /home
-A|'$PWD'                   |     $PWD
-A|'\$PWD'                  |     \$PWD
-A|'"hello"'                |     "hello"
-A|he\$PWD                  |     he$PWD
-A|"he\$PWD"                |     he$PWD
-A|'he\$PWD'                |     he\$PWD
-A|he${PWD                  |     error
-A|he${PWD:=000}xx          |     error
-A|he${PWD:+${PWD}:}xx      |     he/home:xx
-A|he${XXX:-\$PWD:}xx       |     he$PWD:xx
-A|he${XXX:-\${PWD}z}xx     |     he${PWDz}xx
-A|안녕하세요                 |     안녕하세요
-A|안'녕'하세요               |     안녕하세요
-A|안'녕하세요                |     안녕하세요
-A|안녕\'하세요               |     안녕'하세요
-A|안\\'녕하세요              |     안\녕하세요
-A|안녕\t하세요               |     안녕t하세요
-A|"안녕\t하세요"             |     안녕\t하세요
-A|'안녕\t하세요              |     안녕\t하세요
-A|안녕하세요\                |     안녕하세요
-A|안녕하세요\\               |     안녕하세요\
-A|"안녕하세요                |     안녕하세요
-A|"안녕하세요\"              |     안녕하세요"
-A|"안녕'하세요"              |     안녕'하세요
-A|'안녕하세요                |     안녕하세요
-A|'안녕하세요\'              |     안녕하세요\
-A|안녕$1x                    |     안녕x
-A|안녕$.x                    |     안녕$.x
-# Next one is different on Windows as $pwd==$PWD
-U|안녕$pwd.                  |     안녕.
-W|안녕$pwd.                  |     안녕/home.
-A|안녕$PWD                   |     안녕/home
-A|안녕\$PWD                  |     안녕$PWD
-A|안녕\\$PWD                 |     안녕\/home
-A|안녕\${}                   |     안녕${}
-A|안녕\${}xx                 |     안녕${}xx
-A|안녕${}                    |     안녕
-A|안녕${}xx                  |     안녕xx
-A|안녕${hi}                  |     안녕
-A|안녕${hi}xx                |     안녕xx
-A|안녕${PWD}                 |     안녕/home
-A|안녕${.}                   |     error
-A|안녕${XXX:-000}xx          |     안녕000xx
-A|안녕${PWD:-000}xx          |     안녕/homexx
-A|안녕${XXX:-$PWD}xx         |     안녕/homexx
-A|안녕${XXX:-${PWD:-yyy}}xx  |     안녕/homexx
-A|안녕${XXX:-${YYY:-yyy}}xx  |     안녕yyyxx
-A|안녕${XXX:YYY}             |     error
-A|안녕${XXX:+${PWD}}xx       |     안녕xx
-A|안녕${PWD:+${XXX}}xx       |     안녕xx
-A|안녕${PWD:+${SHELL}}xx     |     안녕bashxx
-A|안녕${XXX:+000}xx          |     안녕xx
-A|안녕${PWD:+000}xx          |     안녕000xx
-A|'안녕${XX}'                |     안녕${XX}
-A|"안녕${PWD}"               |     안녕/home
-A|"안녕'$PWD'"               |     안녕'/home'
-A|'"안녕"'                   |     "안녕"
-A|안녕\$PWD                  |     안녕$PWD
-A|"안녕\$PWD"                |     안녕$PWD
-A|'안녕\$PWD'                |     안녕\$PWD
-A|안녕${PWD                  |     error
-A|안녕${PWD:=000}xx          |     error
-A|안녕${PWD:+${PWD}:}xx      |     안녕/home:xx
-A|안녕${XXX:-\$PWD:}xx       |     안녕$PWD:xx
-A|안녕${XXX:-\${PWD}z}xx     |     안녕${PWDz}xx
-A|$KOREAN                    |     한국어
-A|안녕$KOREAN                |     안녕한국어
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator.go
deleted file mode 100644
index f5997c91a6..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Package dockerfile is the evaluation step in the Dockerfile parse/evaluate pipeline.
-//
-// It incorporates a dispatch table based on the parser.Node values (see the
-// parser package for more information) that are yielded from the parser itself.
-// Calling NewBuilder with the BuildOpts struct can be used to customize the
-// experience for execution purposes only. Parsing is controlled in the parser
-// package, and this division of responsibility should be respected.
-//
-// Please see the jump table targets for the actual invocations, most of which
-// will call out to the functions in internals.go to deal with their tasks.
-//
-// ONBUILD is a special case, which is covered in the onbuild() func in
-// dispatchers.go.
-//
-// The evaluator uses the concept of "steps", which are usually each processable
-// line in the Dockerfile. Each step is numbered and certain actions are taken
-// before and after each step, such as creating an image ID and removing temporary
-// containers and images. Note that ONBUILD creates a kinda-sorta "sub run" which
-// includes its own set of steps (usually only one of them).
-package dockerfile
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/builder/dockerfile/command"
-	"github.com/docker/docker/builder/dockerfile/parser"
-)
-
-// Environment variable interpolation will happen on these statements only.
-var replaceEnvAllowed = map[string]bool{
-	command.Env:        true,
-	command.Label:      true,
-	command.Add:        true,
-	command.Copy:       true,
-	command.Workdir:    true,
-	command.Expose:     true,
-	command.Volume:     true,
-	command.User:       true,
-	command.StopSignal: true,
-	command.Arg:        true,
-}
-
-// Certain commands are allowed to have their args split into more
-// words after env var replacements. Meaning:
-//   ENV foo="123 456"
-//   EXPOSE $foo
-// should result in the same thing as:
-//   EXPOSE 123 456
-// and not treat "123 456" as a single word.
-// Note that: EXPOSE "$foo" and EXPOSE $foo are not the same thing.
-// Quotes will cause it to still be treated as single word.
-var allowWordExpansion = map[string]bool{
-	command.Expose: true,
-}
-
-var evaluateTable map[string]func(*Builder, []string, map[string]bool, string) error
-
-func init() {
-	evaluateTable = map[string]func(*Builder, []string, map[string]bool, string) error{
-		command.Add:         add,
-		command.Arg:         arg,
-		command.Cmd:         cmd,
-		command.Copy:        dispatchCopy, // copy() is a go builtin
-		command.Entrypoint:  entrypoint,
-		command.Env:         env,
-		command.Expose:      expose,
-		command.From:        from,
-		command.Healthcheck: healthcheck,
-		command.Label:       label,
-		command.Maintainer:  maintainer,
-		command.Onbuild:     onbuild,
-		command.Run:         run,
-		command.Shell:       shell,
-		command.StopSignal:  stopSignal,
-		command.User:        user,
-		command.Volume:      volume,
-		command.Workdir:     workdir,
-	}
-}
-
-// This method is the entrypoint to all statement handling routines.
-//
-// Almost all nodes will have this structure:
-// Child[Node, Node, Node] where Child is from parser.Node.Children and each
-// node comes from parser.Node.Next. This forms a "line" with a statement and
-// arguments and we process them in this normalized form by hitting
-// evaluateTable with the leaf nodes of the command and the Builder object.
-//
-// ONBUILD is a special case; in this case the parser will emit:
-// Child[Node, Child[Node, Node...]] where the first node is the literal
-// "onbuild" and the child entrypoint is the command of the ONBUILD statement,
-// such as `RUN` in ONBUILD RUN foo. There is special case logic in here to
-// deal with that, at least until it becomes more of a general concern with new
-// features.
-func (b *Builder) dispatch(stepN int, stepTotal int, ast *parser.Node) error {
-	cmd := ast.Value
-	upperCasedCmd := strings.ToUpper(cmd)
-
-	// To ensure the user is given a decent error message if the platform
-	// on which the daemon is running does not support a builder command.
-	if err := platformSupports(strings.ToLower(cmd)); err != nil {
-		return err
-	}
-
-	attrs := ast.Attributes
-	original := ast.Original
-	flags := ast.Flags
-	strList := []string{}
-	msg := fmt.Sprintf("Step %d/%d : %s", stepN+1, stepTotal, upperCasedCmd)
-
-	if len(ast.Flags) > 0 {
-		msg += " " + strings.Join(ast.Flags, " ")
-	}
-
-	if cmd == "onbuild" {
-		if ast.Next == nil {
-			return fmt.Errorf("ONBUILD requires at least one argument")
-		}
-		ast = ast.Next.Children[0]
-		strList = append(strList, ast.Value)
-		msg += " " + ast.Value
-
-		if len(ast.Flags) > 0 {
-			msg += " " + strings.Join(ast.Flags, " ")
-		}
-
-	}
-
-	// count the number of nodes that we are going to traverse first
-	// so we can pre-create the argument and message array. This speeds up the
-	// allocation of those list a lot when they have a lot of arguments
-	cursor := ast
-	var n int
-	for cursor.Next != nil {
-		cursor = cursor.Next
-		n++
-	}
-	msgList := make([]string, n)
-
-	var i int
-	// Append the build-time args to config-environment.
-	// This allows builder config to override the variables, making the behavior similar to
-	// a shell script i.e. `ENV foo bar` overrides value of `foo` passed in build
-	// context. But `ENV foo $foo` will use the value from build context if one
-	// isn't already been defined by a previous ENV primitive.
-	// Note, we get this behavior because we know that ProcessWord() will
-	// stop on the first occurrence of a variable name and not notice
-	// a subsequent one. So, putting the buildArgs list after the Config.Env
-	// list, in 'envs', is safe.
-	envs := b.runConfig.Env
-	for key, val := range b.options.BuildArgs {
-		if !b.isBuildArgAllowed(key) {
-			// skip build-args that are not in allowed list, meaning they have
-			// not been defined by an "ARG" Dockerfile command yet.
-			// This is an error condition but only if there is no "ARG" in the entire
-			// Dockerfile, so we'll generate any necessary errors after we parsed
-			// the entire file (see 'leftoverArgs' processing in evaluator.go )
-			continue
-		}
-		envs = append(envs, fmt.Sprintf("%s=%s", key, *val))
-	}
-	for ast.Next != nil {
-		ast = ast.Next
-		var str string
-		str = ast.Value
-		if replaceEnvAllowed[cmd] {
-			var err error
-			var words []string
-
-			if allowWordExpansion[cmd] {
-				words, err = ProcessWords(str, envs, b.directive.EscapeToken)
-				if err != nil {
-					return err
-				}
-				strList = append(strList, words...)
-			} else {
-				str, err = ProcessWord(str, envs, b.directive.EscapeToken)
-				if err != nil {
-					return err
-				}
-				strList = append(strList, str)
-			}
-		} else {
-			strList = append(strList, str)
-		}
-		msgList[i] = ast.Value
-		i++
-	}
-
-	msg += " " + strings.Join(msgList, " ")
-	fmt.Fprintln(b.Stdout, msg)
-
-	// XXX yes, we skip any cmds that are not valid; the parser should have
-	// picked these out already.
-	if f, ok := evaluateTable[cmd]; ok {
-		b.flags = NewBFlags()
-		b.flags.Args = flags
-		return f(b, strList, attrs, original)
-	}
-
-	return fmt.Errorf("Unknown instruction: %s", upperCasedCmd)
-}
-
-// checkDispatch does a simple check for syntax errors of the Dockerfile.
-// Because some of the instructions can only be validated through runtime,
-// arg, env, etc., this syntax check will not be complete and could not replace
-// the runtime check. Instead, this function is only a helper that allows
-// user to find out the obvious error in Dockerfile earlier on.
-// onbuild bool: indicate if instruction XXX is part of `ONBUILD XXX` trigger
-func (b *Builder) checkDispatch(ast *parser.Node, onbuild bool) error {
-	cmd := ast.Value
-	upperCasedCmd := strings.ToUpper(cmd)
-
-	// To ensure the user is given a decent error message if the platform
-	// on which the daemon is running does not support a builder command.
-	if err := platformSupports(strings.ToLower(cmd)); err != nil {
-		return err
-	}
-
-	// The instruction itself is ONBUILD, we will make sure it follows with at
-	// least one argument
-	if upperCasedCmd == "ONBUILD" {
-		if ast.Next == nil {
-			return fmt.Errorf("ONBUILD requires at least one argument")
-		}
-	}
-
-	// The instruction is part of ONBUILD trigger (not the instruction itself)
-	if onbuild {
-		switch upperCasedCmd {
-		case "ONBUILD":
-			return fmt.Errorf("Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed")
-		case "MAINTAINER", "FROM":
-			return fmt.Errorf("%s isn't allowed as an ONBUILD trigger", upperCasedCmd)
-		}
-	}
-
-	if _, ok := evaluateTable[cmd]; ok {
-		return nil
-	}
-
-	return fmt.Errorf("Unknown instruction: %s", upperCasedCmd)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_test.go
deleted file mode 100644
index 4340a2f8ac..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_test.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package dockerfile
-
-import (
-	"io/ioutil"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/builder/dockerfile/parser"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-)
-
-type dispatchTestCase struct {
-	name, dockerfile, expectedError string
-	files                           map[string]string
-}
-
-func init() {
-	reexec.Init()
-}
-
-func initDispatchTestCases() []dispatchTestCase {
-	dispatchTestCases := []dispatchTestCase{{
-		name: "copyEmptyWhitespace",
-		dockerfile: `COPY
-	quux \
-      bar`,
-		expectedError: "COPY requires at least two arguments",
-	},
-		{
-			name:          "ONBUILD forbidden FROM",
-			dockerfile:    "ONBUILD FROM scratch",
-			expectedError: "FROM isn't allowed as an ONBUILD trigger",
-			files:         nil,
-		},
-		{
-			name:          "ONBUILD forbidden MAINTAINER",
-			dockerfile:    "ONBUILD MAINTAINER docker.io",
-			expectedError: "MAINTAINER isn't allowed as an ONBUILD trigger",
-			files:         nil,
-		},
-		{
-			name:          "ARG two arguments",
-			dockerfile:    "ARG foo bar",
-			expectedError: "ARG requires exactly one argument",
-			files:         nil,
-		},
-		{
-			name:          "MAINTAINER unknown flag",
-			dockerfile:    "MAINTAINER --boo joe@example.com",
-			expectedError: "Unknown flag: boo",
-			files:         nil,
-		},
-		{
-			name:          "ADD multiple files to file",
-			dockerfile:    "ADD file1.txt file2.txt test",
-			expectedError: "When using ADD with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "JSON ADD multiple files to file",
-			dockerfile:    `ADD ["file1.txt", "file2.txt", "test"]`,
-			expectedError: "When using ADD with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "Wildcard ADD multiple files to file",
-			dockerfile:    "ADD file*.txt test",
-			expectedError: "When using ADD with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "Wildcard JSON ADD multiple files to file",
-			dockerfile:    `ADD ["file*.txt", "test"]`,
-			expectedError: "When using ADD with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "COPY multiple files to file",
-			dockerfile:    "COPY file1.txt file2.txt test",
-			expectedError: "When using COPY with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "JSON COPY multiple files to file",
-			dockerfile:    `COPY ["file1.txt", "file2.txt", "test"]`,
-			expectedError: "When using COPY with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"file1.txt": "test1", "file2.txt": "test2"},
-		},
-		{
-			name:          "ADD multiple files to file with whitespace",
-			dockerfile:    `ADD [ "test file1.txt", "test file2.txt", "test" ]`,
-			expectedError: "When using ADD with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"test file1.txt": "test1", "test file2.txt": "test2"},
-		},
-		{
-			name:          "COPY multiple files to file with whitespace",
-			dockerfile:    `COPY [ "test file1.txt", "test file2.txt", "test" ]`,
-			expectedError: "When using COPY with more than one source file, the destination must be a directory and end with a /",
-			files:         map[string]string{"test file1.txt": "test1", "test file2.txt": "test2"},
-		},
-		{
-			name:          "COPY wildcard no files",
-			dockerfile:    `COPY file*.txt /tmp/`,
-			expectedError: "No source files were specified",
-			files:         nil,
-		},
-		{
-			name:          "COPY url",
-			dockerfile:    `COPY https://index.docker.io/robots.txt /`,
-			expectedError: "Source can't be a URL for COPY",
-			files:         nil,
-		},
-		{
-			name:          "Chaining ONBUILD",
-			dockerfile:    `ONBUILD ONBUILD RUN touch foobar`,
-			expectedError: "Chaining ONBUILD via `ONBUILD ONBUILD` isn't allowed",
-			files:         nil,
-		},
-		{
-			name:          "Invalid instruction",
-			dockerfile:    `foo bar`,
-			expectedError: "Unknown instruction: FOO",
-			files:         nil,
-		}}
-
-	return dispatchTestCases
-}
-
-func TestDispatch(t *testing.T) {
-	testCases := initDispatchTestCases()
-
-	for _, testCase := range testCases {
-		executeTestCase(t, testCase)
-	}
-}
-
-func executeTestCase(t *testing.T, testCase dispatchTestCase) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
-	defer cleanup()
-
-	for filename, content := range testCase.files {
-		createTestTempFile(t, contextDir, filename, content, 0777)
-	}
-
-	tarStream, err := archive.Tar(contextDir, archive.Uncompressed)
-
-	if err != nil {
-		t.Fatalf("Error when creating tar stream: %s", err)
-	}
-
-	defer func() {
-		if err = tarStream.Close(); err != nil {
-			t.Fatalf("Error when closing tar stream: %s", err)
-		}
-	}()
-
-	context, err := builder.MakeTarSumContext(tarStream)
-
-	if err != nil {
-		t.Fatalf("Error when creating tar context: %s", err)
-	}
-
-	defer func() {
-		if err = context.Close(); err != nil {
-			t.Fatalf("Error when closing tar context: %s", err)
-		}
-	}()
-
-	r := strings.NewReader(testCase.dockerfile)
-	d := parser.Directive{}
-	parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
-	n, err := parser.Parse(r, &d)
-
-	if err != nil {
-		t.Fatalf("Error when parsing Dockerfile: %s", err)
-	}
-
-	config := &container.Config{}
-	options := &types.ImageBuildOptions{}
-
-	b := &Builder{runConfig: config, options: options, Stdout: ioutil.Discard, context: context}
-
-	err = b.dispatch(0, len(n.Children), n.Children[0])
-
-	if err == nil {
-		t.Fatalf("No error when executing test %s", testCase.name)
-	}
-
-	if !strings.Contains(err.Error(), testCase.expectedError) {
-		t.Fatalf("Wrong error message. Should be \"%s\". Got \"%s\"", testCase.expectedError, err.Error())
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_unix.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_unix.go
deleted file mode 100644
index 28fd5b156b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_unix.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !windows
-
-package dockerfile
-
-// platformSupports is a short-term function to give users a quality error
-// message if a Dockerfile uses a command not supported on the platform.
-func platformSupports(command string) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_windows.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_windows.go
deleted file mode 100644
index 72483a2ec8..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/evaluator_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package dockerfile
-
-import "fmt"
-
-// platformSupports is gives users a quality error message if a Dockerfile uses
-// a command not supported on the platform.
-func platformSupports(command string) error {
-	switch command {
-	case "stopsignal":
-		return fmt.Errorf("The daemon on this platform does not support the command '%s'", command)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/internals.go
deleted file mode 100644
index 6f0a367842..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals.go
+++ /dev/null
@@ -1,669 +0,0 @@
-package dockerfile
-
-// internals for handling commands. Covers many areas and a lot of
-// non-contiguous functionality. Please read the comments.
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/builder/dockerfile/parser"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/httputils"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/pkg/tarsum"
-	"github.com/docker/docker/pkg/urlutil"
-	"github.com/docker/docker/runconfig/opts"
-)
-
-func (b *Builder) commit(id string, autoCmd strslice.StrSlice, comment string) error {
-	if b.disableCommit {
-		return nil
-	}
-	if b.image == "" && !b.noBaseImage {
-		return fmt.Errorf("Please provide a source image with `from` prior to commit")
-	}
-	b.runConfig.Image = b.image
-
-	if id == "" {
-		cmd := b.runConfig.Cmd
-		b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), "#(nop) ", comment))
-		defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
-
-		hit, err := b.probeCache()
-		if err != nil {
-			return err
-		} else if hit {
-			return nil
-		}
-		id, err = b.create()
-		if err != nil {
-			return err
-		}
-	}
-
-	// Note: Actually copy the struct
-	autoConfig := *b.runConfig
-	autoConfig.Cmd = autoCmd
-
-	commitCfg := &backend.ContainerCommitConfig{
-		ContainerCommitConfig: types.ContainerCommitConfig{
-			Author: b.maintainer,
-			Pause:  true,
-			Config: &autoConfig,
-		},
-	}
-
-	// Commit the container
-	imageID, err := b.docker.Commit(id, commitCfg)
-	if err != nil {
-		return err
-	}
-
-	b.image = imageID
-	return nil
-}
-
-type copyInfo struct {
-	builder.FileInfo
-	decompress bool
-}
-
-func (b *Builder) runContextCommand(args []string, allowRemote bool, allowLocalDecompression bool, cmdName string) error {
-	if b.context == nil {
-		return fmt.Errorf("No context given. Impossible to use %s", cmdName)
-	}
-
-	if len(args) < 2 {
-		return fmt.Errorf("Invalid %s format - at least two arguments required", cmdName)
-	}
-
-	// Work in daemon-specific filepath semantics
-	dest := filepath.FromSlash(args[len(args)-1]) // last one is always the dest
-
-	b.runConfig.Image = b.image
-
-	var infos []copyInfo
-
-	// Loop through each src file and calculate the info we need to
-	// do the copy (e.g. hash value if cached).  Don't actually do
-	// the copy until we've looked at all src files
-	var err error
-	for _, orig := range args[0 : len(args)-1] {
-		var fi builder.FileInfo
-		decompress := allowLocalDecompression
-		if urlutil.IsURL(orig) {
-			if !allowRemote {
-				return fmt.Errorf("Source can't be a URL for %s", cmdName)
-			}
-			fi, err = b.download(orig)
-			if err != nil {
-				return err
-			}
-			defer os.RemoveAll(filepath.Dir(fi.Path()))
-			decompress = false
-			infos = append(infos, copyInfo{fi, decompress})
-			continue
-		}
-		// not a URL
-		subInfos, err := b.calcCopyInfo(cmdName, orig, allowLocalDecompression, true)
-		if err != nil {
-			return err
-		}
-
-		infos = append(infos, subInfos...)
-	}
-
-	if len(infos) == 0 {
-		return fmt.Errorf("No source files were specified")
-	}
-	if len(infos) > 1 && !strings.HasSuffix(dest, string(os.PathSeparator)) {
-		return fmt.Errorf("When using %s with more than one source file, the destination must be a directory and end with a /", cmdName)
-	}
-
-	// For backwards compat, if there's just one info then use it as the
-	// cache look-up string, otherwise hash 'em all into one
-	var srcHash string
-	var origPaths string
-
-	if len(infos) == 1 {
-		fi := infos[0].FileInfo
-		origPaths = fi.Name()
-		if hfi, ok := fi.(builder.Hashed); ok {
-			srcHash = hfi.Hash()
-		}
-	} else {
-		var hashs []string
-		var origs []string
-		for _, info := range infos {
-			fi := info.FileInfo
-			origs = append(origs, fi.Name())
-			if hfi, ok := fi.(builder.Hashed); ok {
-				hashs = append(hashs, hfi.Hash())
-			}
-		}
-		hasher := sha256.New()
-		hasher.Write([]byte(strings.Join(hashs, ",")))
-		srcHash = "multi:" + hex.EncodeToString(hasher.Sum(nil))
-		origPaths = strings.Join(origs, " ")
-	}
-
-	cmd := b.runConfig.Cmd
-	b.runConfig.Cmd = strslice.StrSlice(append(getShell(b.runConfig), fmt.Sprintf("#(nop) %s %s in %s ", cmdName, srcHash, dest)))
-	defer func(cmd strslice.StrSlice) { b.runConfig.Cmd = cmd }(cmd)
-
-	if hit, err := b.probeCache(); err != nil {
-		return err
-	} else if hit {
-		return nil
-	}
-
-	container, err := b.docker.ContainerCreate(types.ContainerCreateConfig{Config: b.runConfig})
-	if err != nil {
-		return err
-	}
-	b.tmpContainers[container.ID] = struct{}{}
-
-	comment := fmt.Sprintf("%s %s in %s", cmdName, origPaths, dest)
-
-	// Twiddle the destination when its a relative path - meaning, make it
-	// relative to the WORKINGDIR
-	if dest, err = normaliseDest(cmdName, b.runConfig.WorkingDir, dest); err != nil {
-		return err
-	}
-
-	for _, info := range infos {
-		if err := b.docker.CopyOnBuild(container.ID, dest, info.FileInfo, info.decompress); err != nil {
-			return err
-		}
-	}
-
-	return b.commit(container.ID, cmd, comment)
-}
-
-func (b *Builder) download(srcURL string) (fi builder.FileInfo, err error) {
-	// get filename from URL
-	u, err := url.Parse(srcURL)
-	if err != nil {
-		return
-	}
-	path := filepath.FromSlash(u.Path) // Ensure in platform semantics
-	if strings.HasSuffix(path, string(os.PathSeparator)) {
-		path = path[:len(path)-1]
-	}
-	parts := strings.Split(path, string(os.PathSeparator))
-	filename := parts[len(parts)-1]
-	if filename == "" {
-		err = fmt.Errorf("cannot determine filename from url: %s", u)
-		return
-	}
-
-	// Initiate the download
-	resp, err := httputils.Download(srcURL)
-	if err != nil {
-		return
-	}
-
-	// Prepare file in a tmp dir
-	tmpDir, err := ioutils.TempDir("", "docker-remote")
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			os.RemoveAll(tmpDir)
-		}
-	}()
-	tmpFileName := filepath.Join(tmpDir, filename)
-	tmpFile, err := os.OpenFile(tmpFileName, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-	if err != nil {
-		return
-	}
-
-	stdoutFormatter := b.Stdout.(*streamformatter.StdoutFormatter)
-	progressOutput := stdoutFormatter.StreamFormatter.NewProgressOutput(stdoutFormatter.Writer, true)
-	progressReader := progress.NewProgressReader(resp.Body, progressOutput, resp.ContentLength, "", "Downloading")
-	// Download and dump result to tmp file
-	if _, err = io.Copy(tmpFile, progressReader); err != nil {
-		tmpFile.Close()
-		return
-	}
-	fmt.Fprintln(b.Stdout)
-	// ignoring error because the file was already opened successfully
-	tmpFileSt, err := tmpFile.Stat()
-	if err != nil {
-		tmpFile.Close()
-		return
-	}
-
-	// Set the mtime to the Last-Modified header value if present
-	// Otherwise just remove atime and mtime
-	mTime := time.Time{}
-
-	lastMod := resp.Header.Get("Last-Modified")
-	if lastMod != "" {
-		// If we can't parse it then just let it default to 'zero'
-		// otherwise use the parsed time value
-		if parsedMTime, err := http.ParseTime(lastMod); err == nil {
-			mTime = parsedMTime
-		}
-	}
-
-	tmpFile.Close()
-
-	if err = system.Chtimes(tmpFileName, mTime, mTime); err != nil {
-		return
-	}
-
-	// Calc the checksum, even if we're using the cache
-	r, err := archive.Tar(tmpFileName, archive.Uncompressed)
-	if err != nil {
-		return
-	}
-	tarSum, err := tarsum.NewTarSum(r, true, tarsum.Version1)
-	if err != nil {
-		return
-	}
-	if _, err = io.Copy(ioutil.Discard, tarSum); err != nil {
-		return
-	}
-	hash := tarSum.Sum(nil)
-	r.Close()
-	return &builder.HashedFileInfo{FileInfo: builder.PathFileInfo{FileInfo: tmpFileSt, FilePath: tmpFileName}, FileHash: hash}, nil
-}
-
-func (b *Builder) calcCopyInfo(cmdName, origPath string, allowLocalDecompression, allowWildcards bool) ([]copyInfo, error) {
-
-	// Work in daemon-specific OS filepath semantics
-	origPath = filepath.FromSlash(origPath)
-
-	if origPath != "" && origPath[0] == os.PathSeparator && len(origPath) > 1 {
-		origPath = origPath[1:]
-	}
-	origPath = strings.TrimPrefix(origPath, "."+string(os.PathSeparator))
-
-	// Deal with wildcards
-	if allowWildcards && containsWildcards(origPath) {
-		var copyInfos []copyInfo
-		if err := b.context.Walk("", func(path string, info builder.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			if info.Name() == "" {
-				// Why are we doing this check?
-				return nil
-			}
-			if match, _ := filepath.Match(origPath, path); !match {
-				return nil
-			}
-
-			// Note we set allowWildcards to false in case the name has
-			// a * in it
-			subInfos, err := b.calcCopyInfo(cmdName, path, allowLocalDecompression, false)
-			if err != nil {
-				return err
-			}
-			copyInfos = append(copyInfos, subInfos...)
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-		return copyInfos, nil
-	}
-
-	// Must be a dir or a file
-
-	statPath, fi, err := b.context.Stat(origPath)
-	if err != nil {
-		return nil, err
-	}
-
-	copyInfos := []copyInfo{{FileInfo: fi, decompress: allowLocalDecompression}}
-
-	hfi, handleHash := fi.(builder.Hashed)
-	if !handleHash {
-		return copyInfos, nil
-	}
-
-	// Deal with the single file case
-	if !fi.IsDir() {
-		hfi.SetHash("file:" + hfi.Hash())
-		return copyInfos, nil
-	}
-	// Must be a dir
-	var subfiles []string
-	err = b.context.Walk(statPath, func(path string, info builder.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		// we already checked handleHash above
-		subfiles = append(subfiles, info.(builder.Hashed).Hash())
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	sort.Strings(subfiles)
-	hasher := sha256.New()
-	hasher.Write([]byte(strings.Join(subfiles, ",")))
-	hfi.SetHash("dir:" + hex.EncodeToString(hasher.Sum(nil)))
-
-	return copyInfos, nil
-}
-
-func (b *Builder) processImageFrom(img builder.Image) error {
-	if img != nil {
-		b.image = img.ImageID()
-
-		if img.RunConfig() != nil {
-			b.runConfig = img.RunConfig()
-		}
-	}
-
-	// Check to see if we have a default PATH, note that windows won't
-	// have one as its set by HCS
-	if system.DefaultPathEnv != "" {
-		// Convert the slice of strings that represent the current list
-		// of env vars into a map so we can see if PATH is already set.
-		// If its not set then go ahead and give it our default value
-		configEnv := opts.ConvertKVStringsToMap(b.runConfig.Env)
-		if _, ok := configEnv["PATH"]; !ok {
-			b.runConfig.Env = append(b.runConfig.Env,
-				"PATH="+system.DefaultPathEnv)
-		}
-	}
-
-	if img == nil {
-		// Typically this means they used "FROM scratch"
-		return nil
-	}
-
-	// Process ONBUILD triggers if they exist
-	if nTriggers := len(b.runConfig.OnBuild); nTriggers != 0 {
-		word := "trigger"
-		if nTriggers > 1 {
-			word = "triggers"
-		}
-		fmt.Fprintf(b.Stderr, "# Executing %d build %s...\n", nTriggers, word)
-	}
-
-	// Copy the ONBUILD triggers, and remove them from the config, since the config will be committed.
-	onBuildTriggers := b.runConfig.OnBuild
-	b.runConfig.OnBuild = []string{}
-
-	// parse the ONBUILD triggers by invoking the parser
-	for _, step := range onBuildTriggers {
-		ast, err := parser.Parse(strings.NewReader(step), &b.directive)
-		if err != nil {
-			return err
-		}
-
-		total := len(ast.Children)
-		for _, n := range ast.Children {
-			if err := b.checkDispatch(n, true); err != nil {
-				return err
-			}
-		}
-		for i, n := range ast.Children {
-			if err := b.dispatch(i, total, n); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// probeCache checks if cache match can be found for current build instruction.
-// If an image is found, probeCache returns `(true, nil)`.
-// If no image is found, it returns `(false, nil)`.
-// If there is any error, it returns `(false, err)`.
-func (b *Builder) probeCache() (bool, error) {
-	c := b.imageCache
-	if c == nil || b.options.NoCache || b.cacheBusted {
-		return false, nil
-	}
-	cache, err := c.GetCache(b.image, b.runConfig)
-	if err != nil {
-		return false, err
-	}
-	if len(cache) == 0 {
-		logrus.Debugf("[BUILDER] Cache miss: %s", b.runConfig.Cmd)
-		b.cacheBusted = true
-		return false, nil
-	}
-
-	fmt.Fprintf(b.Stdout, " ---> Using cache\n")
-	logrus.Debugf("[BUILDER] Use cached version: %s", b.runConfig.Cmd)
-	b.image = string(cache)
-
-	return true, nil
-}
-
-func (b *Builder) create() (string, error) {
-	if b.image == "" && !b.noBaseImage {
-		return "", fmt.Errorf("Please provide a source image with `from` prior to run")
-	}
-	b.runConfig.Image = b.image
-
-	resources := container.Resources{
-		CgroupParent: b.options.CgroupParent,
-		CPUShares:    b.options.CPUShares,
-		CPUPeriod:    b.options.CPUPeriod,
-		CPUQuota:     b.options.CPUQuota,
-		CpusetCpus:   b.options.CPUSetCPUs,
-		CpusetMems:   b.options.CPUSetMems,
-		Memory:       b.options.Memory,
-		MemorySwap:   b.options.MemorySwap,
-		Ulimits:      b.options.Ulimits,
-	}
-
-	// TODO: why not embed a hostconfig in builder?
-	hostConfig := &container.HostConfig{
-		SecurityOpt: b.options.SecurityOpt,
-		Isolation:   b.options.Isolation,
-		ShmSize:     b.options.ShmSize,
-		Resources:   resources,
-		NetworkMode: container.NetworkMode(b.options.NetworkMode),
-	}
-
-	config := *b.runConfig
-
-	// Create the container
-	c, err := b.docker.ContainerCreate(types.ContainerCreateConfig{
-		Config:     b.runConfig,
-		HostConfig: hostConfig,
-	})
-	if err != nil {
-		return "", err
-	}
-	for _, warning := range c.Warnings {
-		fmt.Fprintf(b.Stdout, " ---> [Warning] %s\n", warning)
-	}
-
-	b.tmpContainers[c.ID] = struct{}{}
-	fmt.Fprintf(b.Stdout, " ---> Running in %s\n", stringid.TruncateID(c.ID))
-
-	// override the entry point that may have been picked up from the base image
-	if err := b.docker.ContainerUpdateCmdOnBuild(c.ID, config.Cmd); err != nil {
-		return "", err
-	}
-
-	return c.ID, nil
-}
-
-var errCancelled = errors.New("build cancelled")
-
-func (b *Builder) run(cID string) (err error) {
-	errCh := make(chan error)
-	go func() {
-		errCh <- b.docker.ContainerAttachRaw(cID, nil, b.Stdout, b.Stderr, true)
-	}()
-
-	finished := make(chan struct{})
-	cancelErrCh := make(chan error, 1)
-	go func() {
-		select {
-		case <-b.clientCtx.Done():
-			logrus.Debugln("Build cancelled, killing and removing container:", cID)
-			b.docker.ContainerKill(cID, 0)
-			b.removeContainer(cID)
-			cancelErrCh <- errCancelled
-		case <-finished:
-			cancelErrCh <- nil
-		}
-	}()
-
-	if err := b.docker.ContainerStart(cID, nil, "", ""); err != nil {
-		close(finished)
-		if cancelErr := <-cancelErrCh; cancelErr != nil {
-			logrus.Debugf("Build cancelled (%v) and got an error from ContainerStart: %v",
-				cancelErr, err)
-		}
-		return err
-	}
-
-	// Block on reading output from container, stop on err or chan closed
-	if err := <-errCh; err != nil {
-		close(finished)
-		if cancelErr := <-cancelErrCh; cancelErr != nil {
-			logrus.Debugf("Build cancelled (%v) and got an error from errCh: %v",
-				cancelErr, err)
-		}
-		return err
-	}
-
-	if ret, _ := b.docker.ContainerWait(cID, -1); ret != 0 {
-		close(finished)
-		if cancelErr := <-cancelErrCh; cancelErr != nil {
-			logrus.Debugf("Build cancelled (%v) and got a non-zero code from ContainerWait: %d",
-				cancelErr, ret)
-		}
-		// TODO: change error type, because jsonmessage.JSONError assumes HTTP
-		return &jsonmessage.JSONError{
-			Message: fmt.Sprintf("The command '%s' returned a non-zero code: %d", strings.Join(b.runConfig.Cmd, " "), ret),
-			Code:    ret,
-		}
-	}
-	close(finished)
-	return <-cancelErrCh
-}
-
-func (b *Builder) removeContainer(c string) error {
-	rmConfig := &types.ContainerRmConfig{
-		ForceRemove:  true,
-		RemoveVolume: true,
-	}
-	if err := b.docker.ContainerRm(c, rmConfig); err != nil {
-		fmt.Fprintf(b.Stdout, "Error removing intermediate container %s: %v\n", stringid.TruncateID(c), err)
-		return err
-	}
-	return nil
-}
-
-func (b *Builder) clearTmp() {
-	for c := range b.tmpContainers {
-		if err := b.removeContainer(c); err != nil {
-			return
-		}
-		delete(b.tmpContainers, c)
-		fmt.Fprintf(b.Stdout, "Removing intermediate container %s\n", stringid.TruncateID(c))
-	}
-}
-
-// readDockerfile reads a Dockerfile from the current context.
-func (b *Builder) readDockerfile() error {
-	// If no -f was specified then look for 'Dockerfile'. If we can't find
-	// that then look for 'dockerfile'.  If neither are found then default
-	// back to 'Dockerfile' and use that in the error message.
-	if b.options.Dockerfile == "" {
-		b.options.Dockerfile = builder.DefaultDockerfileName
-		if _, _, err := b.context.Stat(b.options.Dockerfile); os.IsNotExist(err) {
-			lowercase := strings.ToLower(b.options.Dockerfile)
-			if _, _, err := b.context.Stat(lowercase); err == nil {
-				b.options.Dockerfile = lowercase
-			}
-		}
-	}
-
-	err := b.parseDockerfile()
-
-	if err != nil {
-		return err
-	}
-
-	// After the Dockerfile has been parsed, we need to check the .dockerignore
-	// file for either "Dockerfile" or ".dockerignore", and if either are
-	// present then erase them from the build context. These files should never
-	// have been sent from the client but we did send them to make sure that
-	// we had the Dockerfile to actually parse, and then we also need the
-	// .dockerignore file to know whether either file should be removed.
-	// Note that this assumes the Dockerfile has been read into memory and
-	// is now safe to be removed.
-	if dockerIgnore, ok := b.context.(builder.DockerIgnoreContext); ok {
-		dockerIgnore.Process([]string{b.options.Dockerfile})
-	}
-	return nil
-}
-
-func (b *Builder) parseDockerfile() error {
-	f, err := b.context.Open(b.options.Dockerfile)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return fmt.Errorf("Cannot locate specified Dockerfile: %s", b.options.Dockerfile)
-		}
-		return err
-	}
-	defer f.Close()
-	if f, ok := f.(*os.File); ok {
-		// ignoring error because Open already succeeded
-		fi, err := f.Stat()
-		if err != nil {
-			return fmt.Errorf("Unexpected error reading Dockerfile: %v", err)
-		}
-		if fi.Size() == 0 {
-			return fmt.Errorf("The Dockerfile (%s) cannot be empty", b.options.Dockerfile)
-		}
-	}
-	b.dockerfile, err = parser.Parse(f, &b.directive)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// determine if build arg is part of built-in args or user
-// defined args in Dockerfile at any point in time.
-func (b *Builder) isBuildArgAllowed(arg string) bool {
-	if _, ok := BuiltinAllowedBuildArgs[arg]; ok {
-		return true
-	}
-	if _, ok := b.allowedBuildArgs[arg]; ok {
-		return true
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_test.go
deleted file mode 100644
index d170d8e25a..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package dockerfile
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/pkg/archive"
-)
-
-func TestEmptyDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, builder.DefaultDockerfileName, "", 0777)
-
-	readAndCheckDockerfile(t, "emptyDockefile", contextDir, "", "The Dockerfile (Dockerfile) cannot be empty")
-}
-
-func TestSymlinkDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
-	defer cleanup()
-
-	createTestSymlink(t, contextDir, builder.DefaultDockerfileName, "/etc/passwd")
-
-	// The reason the error is "Cannot locate specified Dockerfile" is because
-	// in the builder, the symlink is resolved within the context, therefore
-	// Dockerfile -> /etc/passwd becomes etc/passwd from the context which is
-	// a nonexistent file.
-	expectedError := fmt.Sprintf("Cannot locate specified Dockerfile: %s", builder.DefaultDockerfileName)
-
-	readAndCheckDockerfile(t, "symlinkDockerfile", contextDir, builder.DefaultDockerfileName, expectedError)
-}
-
-func TestDockerfileOutsideTheBuildContext(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
-	defer cleanup()
-
-	expectedError := "Forbidden path outside the build context"
-
-	readAndCheckDockerfile(t, "DockerfileOutsideTheBuildContext", contextDir, "../../Dockerfile", expectedError)
-}
-
-func TestNonExistingDockerfile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerfile-test")
-	defer cleanup()
-
-	expectedError := "Cannot locate specified Dockerfile: Dockerfile"
-
-	readAndCheckDockerfile(t, "NonExistingDockerfile", contextDir, "Dockerfile", expectedError)
-}
-
-func readAndCheckDockerfile(t *testing.T, testName, contextDir, dockerfilePath, expectedError string) {
-	tarStream, err := archive.Tar(contextDir, archive.Uncompressed)
-
-	if err != nil {
-		t.Fatalf("Error when creating tar stream: %s", err)
-	}
-
-	defer func() {
-		if err = tarStream.Close(); err != nil {
-			t.Fatalf("Error when closing tar stream: %s", err)
-		}
-	}()
-
-	context, err := builder.MakeTarSumContext(tarStream)
-
-	if err != nil {
-		t.Fatalf("Error when creating tar context: %s", err)
-	}
-
-	defer func() {
-		if err = context.Close(); err != nil {
-			t.Fatalf("Error when closing tar context: %s", err)
-		}
-	}()
-
-	options := &types.ImageBuildOptions{
-		Dockerfile: dockerfilePath,
-	}
-
-	b := &Builder{options: options, context: context}
-
-	err = b.readDockerfile()
-
-	if err == nil {
-		t.Fatalf("No error when executing test: %s", testName)
-	}
-
-	if !strings.Contains(err.Error(), expectedError) {
-		t.Fatalf("Wrong error message. Should be \"%s\". Got \"%s\"", expectedError, err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_unix.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_unix.go
deleted file mode 100644
index a8a47c3582..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_unix.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// +build !windows
-
-package dockerfile
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// normaliseDest normalises the destination of a COPY/ADD command in a
-// platform semantically consistent way.
-func normaliseDest(cmdName, workingDir, requested string) (string, error) {
-	dest := filepath.FromSlash(requested)
-	endsInSlash := strings.HasSuffix(requested, string(os.PathSeparator))
-	if !system.IsAbs(requested) {
-		dest = filepath.Join(string(os.PathSeparator), filepath.FromSlash(workingDir), dest)
-		// Make sure we preserve any trailing slash
-		if endsInSlash {
-			dest += string(os.PathSeparator)
-		}
-	}
-	return dest, nil
-}
-
-func containsWildcards(name string) bool {
-	for i := 0; i < len(name); i++ {
-		ch := name[i]
-		if ch == '\\' {
-			i++
-		} else if ch == '*' || ch == '?' || ch == '[' {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows.go
deleted file mode 100644
index f60b112049..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package dockerfile
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// normaliseDest normalises the destination of a COPY/ADD command in a
-// platform semantically consistent way.
-func normaliseDest(cmdName, workingDir, requested string) (string, error) {
-	dest := filepath.FromSlash(requested)
-	endsInSlash := strings.HasSuffix(dest, string(os.PathSeparator))
-
-	// We are guaranteed that the working directory is already consistent,
-	// However, Windows also has, for now, the limitation that ADD/COPY can
-	// only be done to the system drive, not any drives that might be present
-	// as a result of a bind mount.
-	//
-	// So... if the path requested is Linux-style absolute (/foo or \\foo),
-	// we assume it is the system drive. If it is a Windows-style absolute
-	// (DRIVE:\\foo), error if DRIVE is not C. And finally, ensure we
-	// strip any configured working directories drive letter so that it
-	// can be subsequently legitimately converted to a Windows volume-style
-	// pathname.
-
-	// Not a typo - filepath.IsAbs, not system.IsAbs on this next check as
-	// we only want to validate where the DriveColon part has been supplied.
-	if filepath.IsAbs(dest) {
-		if strings.ToUpper(string(dest[0])) != "C" {
-			return "", fmt.Errorf("Windows does not support %s with a destinations not on the system drive (C:)", cmdName)
-		}
-		dest = dest[2:] // Strip the drive letter
-	}
-
-	// Cannot handle relative where WorkingDir is not the system drive.
-	if len(workingDir) > 0 {
-		if ((len(workingDir) > 1) && !system.IsAbs(workingDir[2:])) || (len(workingDir) == 1) {
-			return "", fmt.Errorf("Current WorkingDir %s is not platform consistent", workingDir)
-		}
-		if !system.IsAbs(dest) {
-			if string(workingDir[0]) != "C" {
-				return "", fmt.Errorf("Windows does not support %s with relative paths when WORKDIR is not the system drive", cmdName)
-			}
-			dest = filepath.Join(string(os.PathSeparator), workingDir[2:], dest)
-			// Make sure we preserve any trailing slash
-			if endsInSlash {
-				dest += string(os.PathSeparator)
-			}
-		}
-	}
-	return dest, nil
-}
-
-func containsWildcards(name string) bool {
-	for i := 0; i < len(name); i++ {
-		ch := name[i]
-		if ch == '*' || ch == '?' || ch == '[' {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows_test.go
deleted file mode 100644
index 868a6671a3..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/internals_windows_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build windows
-
-package dockerfile
-
-import "testing"
-
-func TestNormaliseDest(t *testing.T) {
-	tests := []struct{ current, requested, expected, etext string }{
-		{``, `D:\`, ``, `Windows does not support TEST with a destinations not on the system drive (C:)`},
-		{``, `e:/`, ``, `Windows does not support TEST with a destinations not on the system drive (C:)`},
-		{`invalid`, `./c1`, ``, `Current WorkingDir invalid is not platform consistent`},
-		{`C:`, ``, ``, `Current WorkingDir C: is not platform consistent`},
-		{`C`, ``, ``, `Current WorkingDir C is not platform consistent`},
-		{`D:\`, `.`, ``, "Windows does not support TEST with relative paths when WORKDIR is not the system drive"},
-		{``, `D`, `D`, ``},
-		{``, `./a1`, `.\a1`, ``},
-		{``, `.\b1`, `.\b1`, ``},
-		{``, `/`, `\`, ``},
-		{``, `\`, `\`, ``},
-		{``, `c:/`, `\`, ``},
-		{``, `c:\`, `\`, ``},
-		{``, `.`, `.`, ``},
-		{`C:\wdd`, `./a1`, `\wdd\a1`, ``},
-		{`C:\wde`, `.\b1`, `\wde\b1`, ``},
-		{`C:\wdf`, `/`, `\`, ``},
-		{`C:\wdg`, `\`, `\`, ``},
-		{`C:\wdh`, `c:/`, `\`, ``},
-		{`C:\wdi`, `c:\`, `\`, ``},
-		{`C:\wdj`, `.`, `\wdj`, ``},
-		{`C:\wdk`, `foo/bar`, `\wdk\foo\bar`, ``},
-		{`C:\wdl`, `foo\bar`, `\wdl\foo\bar`, ``},
-		{`C:\wdm`, `foo/bar/`, `\wdm\foo\bar\`, ``},
-		{`C:\wdn`, `foo\bar/`, `\wdn\foo\bar\`, ``},
-	}
-	for _, i := range tests {
-		got, err := normaliseDest("TEST", i.current, i.requested)
-		if err != nil && i.etext == "" {
-			t.Fatalf("TestNormaliseDest Got unexpected error %q for %s %s. ", err.Error(), i.current, i.requested)
-		}
-		if i.etext != "" && ((err == nil) || (err != nil && err.Error() != i.etext)) {
-			if err == nil {
-				t.Fatalf("TestNormaliseDest Expected an error for %s %s but didn't get one", i.current, i.requested)
-			} else {
-				t.Fatalf("TestNormaliseDest Wrong error text for %s %s - %s", i.current, i.requested, err.Error())
-			}
-		}
-		if i.etext == "" && got != i.expected {
-			t.Fatalf("TestNormaliseDest Expected %q for %q and %q. Got %q", i.expected, i.current, i.requested, got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/dumper/main.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/dumper/main.go
deleted file mode 100644
index fff3046fd3..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/dumper/main.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/docker/docker/builder/dockerfile/parser"
-)
-
-func main() {
-	var f *os.File
-	var err error
-
-	if len(os.Args) < 2 {
-		fmt.Println("please supply filename(s)")
-		os.Exit(1)
-	}
-
-	for _, fn := range os.Args[1:] {
-		f, err = os.Open(fn)
-		if err != nil {
-			panic(err)
-		}
-		defer f.Close()
-
-		d := parser.Directive{LookingForDirectives: true}
-		parser.SetEscapeToken(parser.DefaultEscapeToken, &d)
-
-		ast, err := parser.Parse(f, &d)
-		if err != nil {
-			panic(err)
-		} else {
-			fmt.Println(ast.Dump())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/json_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/json_test.go
deleted file mode 100644
index 60d74d9c36..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/json_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package parser
-
-import (
-	"testing"
-)
-
-var invalidJSONArraysOfStrings = []string{
-	`["a",42,"b"]`,
-	`["a",123.456,"b"]`,
-	`["a",{},"b"]`,
-	`["a",{"c": "d"},"b"]`,
-	`["a",["c"],"b"]`,
-	`["a",true,"b"]`,
-	`["a",false,"b"]`,
-	`["a",null,"b"]`,
-}
-
-var validJSONArraysOfStrings = map[string][]string{
-	`[]`:           {},
-	`[""]`:         {""},
-	`["a"]`:        {"a"},
-	`["a","b"]`:    {"a", "b"},
-	`[ "a", "b" ]`: {"a", "b"},
-	`[	"a",	"b"	]`: {"a", "b"},
-	`	[	"a",	"b"	]	`: {"a", "b"},
-	`["abc 123", "♥", "☃", "\" \\ \/ \b \f \n \r \t \u0000"]`: {"abc 123", "♥", "☃", "\" \\ / \b \f \n \r \t \u0000"},
-}
-
-func TestJSONArraysOfStrings(t *testing.T) {
-	for json, expected := range validJSONArraysOfStrings {
-		d := Directive{}
-		SetEscapeToken(DefaultEscapeToken, &d)
-
-		if node, _, err := parseJSON(json, &d); err != nil {
-			t.Fatalf("%q should be a valid JSON array of strings, but wasn't! (err: %q)", json, err)
-		} else {
-			i := 0
-			for node != nil {
-				if i >= len(expected) {
-					t.Fatalf("expected result is shorter than parsed result (%d vs %d+) in %q", len(expected), i+1, json)
-				}
-				if node.Value != expected[i] {
-					t.Fatalf("expected %q (not %q) in %q at pos %d", expected[i], node.Value, json, i)
-				}
-				node = node.Next
-				i++
-			}
-			if i != len(expected) {
-				t.Fatalf("expected result is longer than parsed result (%d vs %d) in %q", len(expected), i+1, json)
-			}
-		}
-	}
-	for _, json := range invalidJSONArraysOfStrings {
-		d := Directive{}
-		SetEscapeToken(DefaultEscapeToken, &d)
-
-		if _, _, err := parseJSON(json, &d); err != errDockerfileNotStringArray {
-			t.Fatalf("%q should be an invalid JSON array of strings, but wasn't!", json)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/line_parsers.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/line_parsers.go
deleted file mode 100644
index d2bf2b01b1..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/line_parsers.go
+++ /dev/null
@@ -1,361 +0,0 @@
-package parser
-
-// line parsers are dispatch calls that parse a single unit of text into a
-// Node object which contains the whole statement. Dockerfiles have varied
-// (but not usually unique, see ONBUILD for a unique example) parsing rules
-// per-command, and these unify the processing in a way that makes it
-// manageable.
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-var (
-	errDockerfileNotStringArray = errors.New("When using JSON array syntax, arrays must be comprised of strings only.")
-)
-
-// ignore the current argument. This will still leave a command parsed, but
-// will not incorporate the arguments into the ast.
-func parseIgnore(rest string, d *Directive) (*Node, map[string]bool, error) {
-	return &Node{}, nil, nil
-}
-
-// used for onbuild. Could potentially be used for anything that represents a
-// statement with sub-statements.
-//
-// ONBUILD RUN foo bar -> (onbuild (run foo bar))
-//
-func parseSubCommand(rest string, d *Directive) (*Node, map[string]bool, error) {
-	if rest == "" {
-		return nil, nil, nil
-	}
-
-	_, child, err := ParseLine(rest, d, false)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return &Node{Children: []*Node{child}}, nil, nil
-}
-
-// helper to parse words (i.e space delimited or quoted strings) in a statement.
-// The quotes are preserved as part of this function and they are stripped later
-// as part of processWords().
-func parseWords(rest string, d *Directive) []string {
-	const (
-		inSpaces = iota // looking for start of a word
-		inWord
-		inQuote
-	)
-
-	words := []string{}
-	phase := inSpaces
-	word := ""
-	quote := '\000'
-	blankOK := false
-	var ch rune
-	var chWidth int
-
-	for pos := 0; pos <= len(rest); pos += chWidth {
-		if pos != len(rest) {
-			ch, chWidth = utf8.DecodeRuneInString(rest[pos:])
-		}
-
-		if phase == inSpaces { // Looking for start of word
-			if pos == len(rest) { // end of input
-				break
-			}
-			if unicode.IsSpace(ch) { // skip spaces
-				continue
-			}
-			phase = inWord // found it, fall through
-		}
-		if (phase == inWord || phase == inQuote) && (pos == len(rest)) {
-			if blankOK || len(word) > 0 {
-				words = append(words, word)
-			}
-			break
-		}
-		if phase == inWord {
-			if unicode.IsSpace(ch) {
-				phase = inSpaces
-				if blankOK || len(word) > 0 {
-					words = append(words, word)
-				}
-				word = ""
-				blankOK = false
-				continue
-			}
-			if ch == '\'' || ch == '"' {
-				quote = ch
-				blankOK = true
-				phase = inQuote
-			}
-			if ch == d.EscapeToken {
-				if pos+chWidth == len(rest) {
-					continue // just skip an escape token at end of line
-				}
-				// If we're not quoted and we see an escape token, then always just
-				// add the escape token plus the char to the word, even if the char
-				// is a quote.
-				word += string(ch)
-				pos += chWidth
-				ch, chWidth = utf8.DecodeRuneInString(rest[pos:])
-			}
-			word += string(ch)
-			continue
-		}
-		if phase == inQuote {
-			if ch == quote {
-				phase = inWord
-			}
-			// The escape token is special except for ' quotes - can't escape anything for '
-			if ch == d.EscapeToken && quote != '\'' {
-				if pos+chWidth == len(rest) {
-					phase = inWord
-					continue // just skip the escape token at end
-				}
-				pos += chWidth
-				word += string(ch)
-				ch, chWidth = utf8.DecodeRuneInString(rest[pos:])
-			}
-			word += string(ch)
-		}
-	}
-
-	return words
-}
-
-// parse environment like statements. Note that this does *not* handle
-// variable interpolation, which will be handled in the evaluator.
-func parseNameVal(rest string, key string, d *Directive) (*Node, map[string]bool, error) {
-	// This is kind of tricky because we need to support the old
-	// variant:   KEY name value
-	// as well as the new one:    KEY name=value ...
-	// The trigger to know which one is being used will be whether we hit
-	// a space or = first.  space ==> old, "=" ==> new
-
-	words := parseWords(rest, d)
-	if len(words) == 0 {
-		return nil, nil, nil
-	}
-
-	var rootnode *Node
-
-	// Old format (KEY name value)
-	if !strings.Contains(words[0], "=") {
-		node := &Node{}
-		rootnode = node
-		strs := tokenWhitespace.Split(rest, 2)
-
-		if len(strs) < 2 {
-			return nil, nil, fmt.Errorf(key + " must have two arguments")
-		}
-
-		node.Value = strs[0]
-		node.Next = &Node{}
-		node.Next.Value = strs[1]
-	} else {
-		var prevNode *Node
-		for i, word := range words {
-			if !strings.Contains(word, "=") {
-				return nil, nil, fmt.Errorf("Syntax error - can't find = in %q. Must be of the form: name=value", word)
-			}
-			parts := strings.SplitN(word, "=", 2)
-
-			name := &Node{}
-			value := &Node{}
-
-			name.Next = value
-			name.Value = parts[0]
-			value.Value = parts[1]
-
-			if i == 0 {
-				rootnode = name
-			} else {
-				prevNode.Next = name
-			}
-			prevNode = value
-		}
-	}
-
-	return rootnode, nil, nil
-}
-
-func parseEnv(rest string, d *Directive) (*Node, map[string]bool, error) {
-	return parseNameVal(rest, "ENV", d)
-}
-
-func parseLabel(rest string, d *Directive) (*Node, map[string]bool, error) {
-	return parseNameVal(rest, "LABEL", d)
-}
-
-// parses a statement containing one or more keyword definition(s) and/or
-// value assignments, like `name1 name2= name3="" name4=value`.
-// Note that this is a stricter format than the old format of assignment,
-// allowed by parseNameVal(), in a way that this only allows assignment of the
-// form `keyword=[<value>]` like  `name2=`, `name3=""`, and `name4=value` above.
-// In addition, a keyword definition alone is of the form `keyword` like `name1`
-// above. And the assignments `name2=` and `name3=""` are equivalent and
-// assign an empty value to the respective keywords.
-func parseNameOrNameVal(rest string, d *Directive) (*Node, map[string]bool, error) {
-	words := parseWords(rest, d)
-	if len(words) == 0 {
-		return nil, nil, nil
-	}
-
-	var (
-		rootnode *Node
-		prevNode *Node
-	)
-	for i, word := range words {
-		node := &Node{}
-		node.Value = word
-		if i == 0 {
-			rootnode = node
-		} else {
-			prevNode.Next = node
-		}
-		prevNode = node
-	}
-
-	return rootnode, nil, nil
-}
-
-// parses a whitespace-delimited set of arguments. The result is effectively a
-// linked list of string arguments.
-func parseStringsWhitespaceDelimited(rest string, d *Directive) (*Node, map[string]bool, error) {
-	if rest == "" {
-		return nil, nil, nil
-	}
-
-	node := &Node{}
-	rootnode := node
-	prevnode := node
-	for _, str := range tokenWhitespace.Split(rest, -1) { // use regexp
-		prevnode = node
-		node.Value = str
-		node.Next = &Node{}
-		node = node.Next
-	}
-
-	// XXX to get around regexp.Split *always* providing an empty string at the
-	// end due to how our loop is constructed, nil out the last node in the
-	// chain.
-	prevnode.Next = nil
-
-	return rootnode, nil, nil
-}
-
-// parsestring just wraps the string in quotes and returns a working node.
-func parseString(rest string, d *Directive) (*Node, map[string]bool, error) {
-	if rest == "" {
-		return nil, nil, nil
-	}
-	n := &Node{}
-	n.Value = rest
-	return n, nil, nil
-}
-
-// parseJSON converts JSON arrays to an AST.
-func parseJSON(rest string, d *Directive) (*Node, map[string]bool, error) {
-	rest = strings.TrimLeftFunc(rest, unicode.IsSpace)
-	if !strings.HasPrefix(rest, "[") {
-		return nil, nil, fmt.Errorf(`Error parsing "%s" as a JSON array`, rest)
-	}
-
-	var myJSON []interface{}
-	if err := json.NewDecoder(strings.NewReader(rest)).Decode(&myJSON); err != nil {
-		return nil, nil, err
-	}
-
-	var top, prev *Node
-	for _, str := range myJSON {
-		s, ok := str.(string)
-		if !ok {
-			return nil, nil, errDockerfileNotStringArray
-		}
-
-		node := &Node{Value: s}
-		if prev == nil {
-			top = node
-		} else {
-			prev.Next = node
-		}
-		prev = node
-	}
-
-	return top, map[string]bool{"json": true}, nil
-}
-
-// parseMaybeJSON determines if the argument appears to be a JSON array. If
-// so, passes to parseJSON; if not, quotes the result and returns a single
-// node.
-func parseMaybeJSON(rest string, d *Directive) (*Node, map[string]bool, error) {
-	if rest == "" {
-		return nil, nil, nil
-	}
-
-	node, attrs, err := parseJSON(rest, d)
-
-	if err == nil {
-		return node, attrs, nil
-	}
-	if err == errDockerfileNotStringArray {
-		return nil, nil, err
-	}
-
-	node = &Node{}
-	node.Value = rest
-	return node, nil, nil
-}
-
-// parseMaybeJSONToList determines if the argument appears to be a JSON array. If
-// so, passes to parseJSON; if not, attempts to parse it as a whitespace
-// delimited string.
-func parseMaybeJSONToList(rest string, d *Directive) (*Node, map[string]bool, error) {
-	node, attrs, err := parseJSON(rest, d)
-
-	if err == nil {
-		return node, attrs, nil
-	}
-	if err == errDockerfileNotStringArray {
-		return nil, nil, err
-	}
-
-	return parseStringsWhitespaceDelimited(rest, d)
-}
-
-// The HEALTHCHECK command is like parseMaybeJSON, but has an extra type argument.
-func parseHealthConfig(rest string, d *Directive) (*Node, map[string]bool, error) {
-	// Find end of first argument
-	var sep int
-	for ; sep < len(rest); sep++ {
-		if unicode.IsSpace(rune(rest[sep])) {
-			break
-		}
-	}
-	next := sep
-	for ; next < len(rest); next++ {
-		if !unicode.IsSpace(rune(rest[next])) {
-			break
-		}
-	}
-
-	if sep == 0 {
-		return nil, nil, nil
-	}
-
-	typ := rest[:sep]
-	cmd, attrs, err := parseMaybeJSON(rest[next:], d)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return &Node{Value: typ, Next: cmd}, attrs, err
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser.go
deleted file mode 100644
index e534644491..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Package parser implements a parser and parse tree dumper for Dockerfiles.
-package parser
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-	"unicode"
-
-	"github.com/docker/docker/builder/dockerfile/command"
-)
-
-// Node is a structure used to represent a parse tree.
-//
-// In the node there are three fields, Value, Next, and Children. Value is the
-// current token's string value. Next is always the next non-child token, and
-// children contains all the children. Here's an example:
-//
-// (value next (child child-next child-next-next) next-next)
-//
-// This data structure is frankly pretty lousy for handling complex languages,
-// but lucky for us the Dockerfile isn't very complicated. This structure
-// works a little more effectively than a "proper" parse tree for our needs.
-//
-type Node struct {
-	Value      string          // actual content
-	Next       *Node           // the next item in the current sexp
-	Children   []*Node         // the children of this sexp
-	Attributes map[string]bool // special attributes for this node
-	Original   string          // original line used before parsing
-	Flags      []string        // only top Node should have this set
-	StartLine  int             // the line in the original dockerfile where the node begins
-	EndLine    int             // the line in the original dockerfile where the node ends
-}
-
-// Directive is the structure used during a build run to hold the state of
-// parsing directives.
-type Directive struct {
-	EscapeToken           rune           // Current escape token
-	LineContinuationRegex *regexp.Regexp // Current line contination regex
-	LookingForDirectives  bool           // Whether we are currently looking for directives
-	EscapeSeen            bool           // Whether the escape directive has been seen
-}
-
-var (
-	dispatch           map[string]func(string, *Directive) (*Node, map[string]bool, error)
-	tokenWhitespace    = regexp.MustCompile(`[\t\v\f\r ]+`)
-	tokenEscapeCommand = regexp.MustCompile(`^#[ \t]*escape[ \t]*=[ \t]*(?P<escapechar>.).*$`)
-	tokenComment       = regexp.MustCompile(`^#.*$`)
-)
-
-// DefaultEscapeToken is the default escape token
-const DefaultEscapeToken = "\\"
-
-// SetEscapeToken sets the default token for escaping characters in a Dockerfile.
-func SetEscapeToken(s string, d *Directive) error {
-	if s != "`" && s != "\\" {
-		return fmt.Errorf("invalid ESCAPE '%s'. Must be ` or \\", s)
-	}
-	d.EscapeToken = rune(s[0])
-	d.LineContinuationRegex = regexp.MustCompile(`\` + s + `[ \t]*$`)
-	return nil
-}
-
-func init() {
-	// Dispatch Table. see line_parsers.go for the parse functions.
-	// The command is parsed and mapped to the line parser. The line parser
-	// receives the arguments but not the command, and returns an AST after
-	// reformulating the arguments according to the rules in the parser
-	// functions. Errors are propagated up by Parse() and the resulting AST can
-	// be incorporated directly into the existing AST as a next.
-	dispatch = map[string]func(string, *Directive) (*Node, map[string]bool, error){
-		command.Add:         parseMaybeJSONToList,
-		command.Arg:         parseNameOrNameVal,
-		command.Cmd:         parseMaybeJSON,
-		command.Copy:        parseMaybeJSONToList,
-		command.Entrypoint:  parseMaybeJSON,
-		command.Env:         parseEnv,
-		command.Expose:      parseStringsWhitespaceDelimited,
-		command.From:        parseString,
-		command.Healthcheck: parseHealthConfig,
-		command.Label:       parseLabel,
-		command.Maintainer:  parseString,
-		command.Onbuild:     parseSubCommand,
-		command.Run:         parseMaybeJSON,
-		command.Shell:       parseMaybeJSON,
-		command.StopSignal:  parseString,
-		command.User:        parseString,
-		command.Volume:      parseMaybeJSONToList,
-		command.Workdir:     parseString,
-	}
-}
-
-// ParseLine parses a line and returns the remainder.
-func ParseLine(line string, d *Directive, ignoreCont bool) (string, *Node, error) {
-	// Handle the parser directive '# escape=<char>. Parser directives must precede
-	// any builder instruction or other comments, and cannot be repeated.
-	if d.LookingForDirectives {
-		tecMatch := tokenEscapeCommand.FindStringSubmatch(strings.ToLower(line))
-		if len(tecMatch) > 0 {
-			if d.EscapeSeen == true {
-				return "", nil, fmt.Errorf("only one escape parser directive can be used")
-			}
-			for i, n := range tokenEscapeCommand.SubexpNames() {
-				if n == "escapechar" {
-					if err := SetEscapeToken(tecMatch[i], d); err != nil {
-						return "", nil, err
-					}
-					d.EscapeSeen = true
-					return "", nil, nil
-				}
-			}
-		}
-	}
-
-	d.LookingForDirectives = false
-
-	if line = stripComments(line); line == "" {
-		return "", nil, nil
-	}
-
-	if !ignoreCont && d.LineContinuationRegex.MatchString(line) {
-		line = d.LineContinuationRegex.ReplaceAllString(line, "")
-		return line, nil, nil
-	}
-
-	cmd, flags, args, err := splitCommand(line)
-	if err != nil {
-		return "", nil, err
-	}
-
-	node := &Node{}
-	node.Value = cmd
-
-	sexp, attrs, err := fullDispatch(cmd, args, d)
-	if err != nil {
-		return "", nil, err
-	}
-
-	node.Next = sexp
-	node.Attributes = attrs
-	node.Original = line
-	node.Flags = flags
-
-	return "", node, nil
-}
-
-// Parse is the main parse routine.
-// It handles an io.ReadWriteCloser and returns the root of the AST.
-func Parse(rwc io.Reader, d *Directive) (*Node, error) {
-	currentLine := 0
-	root := &Node{}
-	root.StartLine = -1
-	scanner := bufio.NewScanner(rwc)
-
-	utf8bom := []byte{0xEF, 0xBB, 0xBF}
-	for scanner.Scan() {
-		scannedBytes := scanner.Bytes()
-		// We trim UTF8 BOM
-		if currentLine == 0 {
-			scannedBytes = bytes.TrimPrefix(scannedBytes, utf8bom)
-		}
-		scannedLine := strings.TrimLeftFunc(string(scannedBytes), unicode.IsSpace)
-		currentLine++
-		line, child, err := ParseLine(scannedLine, d, false)
-		if err != nil {
-			return nil, err
-		}
-		startLine := currentLine
-
-		if line != "" && child == nil {
-			for scanner.Scan() {
-				newline := scanner.Text()
-				currentLine++
-
-				if stripComments(strings.TrimSpace(newline)) == "" {
-					continue
-				}
-
-				line, child, err = ParseLine(line+newline, d, false)
-				if err != nil {
-					return nil, err
-				}
-
-				if child != nil {
-					break
-				}
-			}
-			if child == nil && line != "" {
-				// When we call ParseLine we'll pass in 'true' for
-				// the ignoreCont param if we're at the EOF. This will
-				// prevent the func from returning immediately w/o
-				// parsing the line thinking that there's more input
-				// to come.
-
-				_, child, err = ParseLine(line, d, scanner.Err() == nil)
-				if err != nil {
-					return nil, err
-				}
-			}
-		}
-
-		if child != nil {
-			// Update the line information for the current child.
-			child.StartLine = startLine
-			child.EndLine = currentLine
-			// Update the line information for the root. The starting line of the root is always the
-			// starting line of the first child and the ending line is the ending line of the last child.
-			if root.StartLine < 0 {
-				root.StartLine = currentLine
-			}
-			root.EndLine = currentLine
-			root.Children = append(root.Children, child)
-		}
-	}
-
-	return root, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser_test.go
deleted file mode 100644
index e8e26961de..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/parser_test.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package parser
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-)
-
-const testDir = "testfiles"
-const negativeTestDir = "testfiles-negative"
-const testFileLineInfo = "testfile-line/Dockerfile"
-
-func getDirs(t *testing.T, dir string) []string {
-	f, err := os.Open(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer f.Close()
-
-	dirs, err := f.Readdirnames(0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return dirs
-}
-
-func TestTestNegative(t *testing.T) {
-	for _, dir := range getDirs(t, negativeTestDir) {
-		dockerfile := filepath.Join(negativeTestDir, dir, "Dockerfile")
-
-		df, err := os.Open(dockerfile)
-		if err != nil {
-			t.Fatalf("Dockerfile missing for %s: %v", dir, err)
-		}
-		defer df.Close()
-
-		d := Directive{LookingForDirectives: true}
-		SetEscapeToken(DefaultEscapeToken, &d)
-		_, err = Parse(df, &d)
-		if err == nil {
-			t.Fatalf("No error parsing broken dockerfile for %s", dir)
-		}
-	}
-}
-
-func TestTestData(t *testing.T) {
-	for _, dir := range getDirs(t, testDir) {
-		dockerfile := filepath.Join(testDir, dir, "Dockerfile")
-		resultfile := filepath.Join(testDir, dir, "result")
-
-		df, err := os.Open(dockerfile)
-		if err != nil {
-			t.Fatalf("Dockerfile missing for %s: %v", dir, err)
-		}
-		defer df.Close()
-
-		d := Directive{LookingForDirectives: true}
-		SetEscapeToken(DefaultEscapeToken, &d)
-		ast, err := Parse(df, &d)
-		if err != nil {
-			t.Fatalf("Error parsing %s's dockerfile: %v", dir, err)
-		}
-
-		content, err := ioutil.ReadFile(resultfile)
-		if err != nil {
-			t.Fatalf("Error reading %s's result file: %v", dir, err)
-		}
-
-		if runtime.GOOS == "windows" {
-			// CRLF --> CR to match Unix behavior
-			content = bytes.Replace(content, []byte{'\x0d', '\x0a'}, []byte{'\x0a'}, -1)
-		}
-
-		if ast.Dump()+"\n" != string(content) {
-			fmt.Fprintln(os.Stderr, "Result:\n"+ast.Dump())
-			fmt.Fprintln(os.Stderr, "Expected:\n"+string(content))
-			t.Fatalf("%s: AST dump of dockerfile does not match result", dir)
-		}
-	}
-}
-
-func TestParseWords(t *testing.T) {
-	tests := []map[string][]string{
-		{
-			"input":  {"foo"},
-			"expect": {"foo"},
-		},
-		{
-			"input":  {"foo bar"},
-			"expect": {"foo", "bar"},
-		},
-		{
-			"input":  {"foo\\ bar"},
-			"expect": {"foo\\ bar"},
-		},
-		{
-			"input":  {"foo=bar"},
-			"expect": {"foo=bar"},
-		},
-		{
-			"input":  {"foo bar 'abc xyz'"},
-			"expect": {"foo", "bar", "'abc xyz'"},
-		},
-		{
-			"input":  {`foo bar "abc xyz"`},
-			"expect": {"foo", "bar", `"abc xyz"`},
-		},
-		{
-			"input":  {"àöû"},
-			"expect": {"àöû"},
-		},
-		{
-			"input":  {`föo bàr "âbc xÿz"`},
-			"expect": {"föo", "bàr", `"âbc xÿz"`},
-		},
-	}
-
-	for _, test := range tests {
-		d := Directive{LookingForDirectives: true}
-		SetEscapeToken(DefaultEscapeToken, &d)
-		words := parseWords(test["input"][0], &d)
-		if len(words) != len(test["expect"]) {
-			t.Fatalf("length check failed. input: %v, expect: %q, output: %q", test["input"][0], test["expect"], words)
-		}
-		for i, word := range words {
-			if word != test["expect"][i] {
-				t.Fatalf("word check failed for word: %q. input: %q, expect: %q, output: %q", word, test["input"][0], test["expect"], words)
-			}
-		}
-	}
-}
-
-func TestLineInformation(t *testing.T) {
-	df, err := os.Open(testFileLineInfo)
-	if err != nil {
-		t.Fatalf("Dockerfile missing for %s: %v", testFileLineInfo, err)
-	}
-	defer df.Close()
-
-	d := Directive{LookingForDirectives: true}
-	SetEscapeToken(DefaultEscapeToken, &d)
-	ast, err := Parse(df, &d)
-	if err != nil {
-		t.Fatalf("Error parsing dockerfile %s: %v", testFileLineInfo, err)
-	}
-
-	if ast.StartLine != 5 || ast.EndLine != 31 {
-		fmt.Fprintf(os.Stderr, "Wrong root line information: expected(%d-%d), actual(%d-%d)\n", 5, 31, ast.StartLine, ast.EndLine)
-		t.Fatalf("Root line information doesn't match result.")
-	}
-	if len(ast.Children) != 3 {
-		fmt.Fprintf(os.Stderr, "Wrong number of child: expected(%d), actual(%d)\n", 3, len(ast.Children))
-		t.Fatalf("Root line information doesn't match result for %s", testFileLineInfo)
-	}
-	expected := [][]int{
-		{5, 5},
-		{11, 12},
-		{17, 31},
-	}
-	for i, child := range ast.Children {
-		if child.StartLine != expected[i][0] || child.EndLine != expected[i][1] {
-			t.Logf("Wrong line information for child %d: expected(%d-%d), actual(%d-%d)\n",
-				i, expected[i][0], expected[i][1], child.StartLine, child.EndLine)
-			t.Fatalf("Root line information doesn't match result.")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfile-line/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfile-line/Dockerfile
deleted file mode 100644
index c7601c9f69..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfile-line/Dockerfile
+++ /dev/null
@@ -1,35 +0,0 @@
-# ESCAPE=\
-
-
-
-FROM brimstone/ubuntu:14.04
-
-
-# TORUN -v /var/run/docker.sock:/var/run/docker.sock
-
-
-ENV GOPATH \
-/go
-
-
-
-# Install the packages we need, clean up after them and us
-RUN apt-get update \
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean \
-
-
-    && apt-get install -y --no-install-recommends git golang ca-certificates \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists \
-
-	&& go get -v github.com/brimstone/consuldock \
-    && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \
-
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \
-	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \
-	&& rm /tmp/dpkg.* \
-	&& rm -rf $GOPATH
-
-
-
-
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/env_no_value/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/env_no_value/Dockerfile
deleted file mode 100644
index 1d65578794..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/env_no_value/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM busybox
-
-ENV PATH
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/shykes-nested-json/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/shykes-nested-json/Dockerfile
deleted file mode 100644
index d1be4596c7..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles-negative/shykes-nested-json/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD [ "echo", [ "nested json" ] ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
deleted file mode 100644
index 00b444cba5..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/Dockerfile
+++ /dev/null
@@ -1,11 +0,0 @@
-FROM	ubuntu:14.04
-MAINTAINER	Seongyeol Lim <seongyeol37@gmail.com>
-
-COPY	.	/go/src/github.com/docker/docker
-ADD		.	/
-ADD		null /
-COPY	nullfile /tmp
-ADD		[ "vimrc", "/tmp" ]
-COPY	[ "bashrc", "/tmp" ]
-COPY	[ "test file", "/tmp" ]
-ADD		[ "test file", "/tmp/test file" ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result
deleted file mode 100644
index 85aee64018..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/ADD-COPY-with-JSON/result
+++ /dev/null
@@ -1,10 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "Seongyeol Lim <seongyeol37@gmail.com>")
-(copy "." "/go/src/github.com/docker/docker")
-(add "." "/")
-(add "null" "/")
-(copy "nullfile" "/tmp")
-(add "vimrc" "/tmp")
-(copy "bashrc" "/tmp")
-(copy "test file" "/tmp")
-(add "test file" "/tmp/test file")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile
deleted file mode 100644
index 0364ef9d96..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/Dockerfile
+++ /dev/null
@@ -1,26 +0,0 @@
-#escape=\
-FROM brimstone/ubuntu:14.04
-
-MAINTAINER brimstone@the.narro.ws
-
-# TORUN -v /var/run/docker.sock:/var/run/docker.sock
-
-ENV GOPATH /go
-
-# Set our command
-ENTRYPOINT ["/usr/local/bin/consuldock"]
-
-# Install the packages we need, clean up after them and us
-RUN apt-get update \
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean \
-    && apt-get install -y --no-install-recommends git golang ca-certificates \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists \
-
-	&& go get -v github.com/brimstone/consuldock \
-    && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \
-
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \
-	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \
-	&& rm /tmp/dpkg.* \
-	&& rm -rf $GOPATH
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/result
deleted file mode 100644
index 227f748cda..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-consuldock/result
+++ /dev/null
@@ -1,5 +0,0 @@
-(from "brimstone/ubuntu:14.04")
-(maintainer "brimstone@the.narro.ws")
-(env "GOPATH" "/go")
-(entrypoint "/usr/local/bin/consuldock")
-(run "apt-get update \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean     && apt-get install -y --no-install-recommends git golang ca-certificates     && apt-get clean     && rm -rf /var/lib/apt/lists \t&& go get -v github.com/brimstone/consuldock     && mv $GOPATH/bin/consuldock /usr/local/bin/consuldock \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \t&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \t&& rm /tmp/dpkg.* \t&& rm -rf $GOPATH")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/Dockerfile
deleted file mode 100644
index 25ae352166..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/Dockerfile
+++ /dev/null
@@ -1,52 +0,0 @@
-FROM brimstone/ubuntu:14.04
-
-CMD []
-
-ENTRYPOINT ["/usr/bin/consul", "agent", "-server", "-data-dir=/consul", "-client=0.0.0.0", "-ui-dir=/webui"]
-
-EXPOSE 8500 8600 8400 8301 8302
-
-RUN apt-get update \
-    && apt-get install -y unzip wget \
-	&& apt-get clean \
-	&& rm -rf /var/lib/apt/lists
-
-RUN cd /tmp \
-    && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip \
-       -O web_ui.zip \
-    && unzip web_ui.zip \
-    && mv dist /webui \
-    && rm web_ui.zip
-
-RUN apt-get update \
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean \
-    && apt-get install -y --no-install-recommends unzip wget \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists \
-
-    && cd /tmp \
-    && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip \
-       -O web_ui.zip \
-    && unzip web_ui.zip \
-    && mv dist /webui \
-    && rm web_ui.zip \
-
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \
-	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \
-	&& rm /tmp/dpkg.*
-
-ENV GOPATH /go
-
-RUN apt-get update \
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean \
-    && apt-get install -y --no-install-recommends git golang ca-certificates build-essential \
-    && apt-get clean \
-    && rm -rf /var/lib/apt/lists \
-
-	&& go get -v github.com/hashicorp/consul \
-	&& mv $GOPATH/bin/consul /usr/bin/consul \
-
-	&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \
-	&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \
-	&& rm /tmp/dpkg.* \
-	&& rm -rf $GOPATH
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/result
deleted file mode 100644
index 16492e516a..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/brimstone-docker-consul/result
+++ /dev/null
@@ -1,9 +0,0 @@
-(from "brimstone/ubuntu:14.04")
-(cmd)
-(entrypoint "/usr/bin/consul" "agent" "-server" "-data-dir=/consul" "-client=0.0.0.0" "-ui-dir=/webui")
-(expose "8500" "8600" "8400" "8301" "8302")
-(run "apt-get update     && apt-get install -y unzip wget \t&& apt-get clean \t&& rm -rf /var/lib/apt/lists")
-(run "cd /tmp     && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip        -O web_ui.zip     && unzip web_ui.zip     && mv dist /webui     && rm web_ui.zip")
-(run "apt-get update \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean     && apt-get install -y --no-install-recommends unzip wget     && apt-get clean     && rm -rf /var/lib/apt/lists     && cd /tmp     && wget https://dl.bintray.com/mitchellh/consul/0.3.1_web_ui.zip        -O web_ui.zip     && unzip web_ui.zip     && mv dist /webui     && rm web_ui.zip \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \t&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \t&& rm /tmp/dpkg.*")
-(env "GOPATH" "/go")
-(run "apt-get update \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.clean     && apt-get install -y --no-install-recommends git golang ca-certificates build-essential     && apt-get clean     && rm -rf /var/lib/apt/lists \t&& go get -v github.com/hashicorp/consul \t&& mv $GOPATH/bin/consul /usr/bin/consul \t&& dpkg -l | awk '/^ii/ {print $2}' > /tmp/dpkg.dirty \t&& apt-get remove --purge -y $(diff /tmp/dpkg.clean /tmp/dpkg.dirty | awk '/^>/ {print $2}') \t&& rm /tmp/dpkg.* \t&& rm -rf $GOPATH")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/Dockerfile
deleted file mode 100644
index 42b324e77b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-FROM ubuntu:14.04
-
-RUN echo hello\
-  world\
-  goodnight  \
-  moon\
-  light\
-ning
-RUN echo hello  \
-  world
-RUN echo hello  \
-world
-RUN echo hello \
-goodbye\
-frog
-RUN echo hello  \  
-world
-RUN echo hi \
- \
- world \
-\
- good\
-\
-night
-RUN echo goodbye\
-frog
-RUN echo good\
-bye\
-frog
-
-RUN echo hello \
-# this is a comment
-
-# this is a comment with a blank line surrounding it
-
-this is some more useful stuff
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/result
deleted file mode 100644
index 268ae073c8..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/continueIndent/result
+++ /dev/null
@@ -1,10 +0,0 @@
-(from "ubuntu:14.04")
-(run "echo hello  world  goodnight    moon  lightning")
-(run "echo hello    world")
-(run "echo hello  world")
-(run "echo hello goodbyefrog")
-(run "echo hello  world")
-(run "echo hi   world  goodnight")
-(run "echo goodbyefrog")
-(run "echo goodbyefrog")
-(run "echo hello this is some more useful stuff")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/Dockerfile
deleted file mode 100644
index 8ccb71a578..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/Dockerfile
+++ /dev/null
@@ -1,54 +0,0 @@
-FROM cpuguy83/ubuntu
-ENV NAGIOS_HOME /opt/nagios
-ENV NAGIOS_USER nagios
-ENV NAGIOS_GROUP nagios
-ENV NAGIOS_CMDUSER nagios
-ENV NAGIOS_CMDGROUP nagios
-ENV NAGIOSADMIN_USER nagiosadmin
-ENV NAGIOSADMIN_PASS nagios
-ENV APACHE_RUN_USER nagios
-ENV APACHE_RUN_GROUP nagios
-ENV NAGIOS_TIMEZONE UTC
-
-RUN sed -i 's/universe/universe multiverse/' /etc/apt/sources.list
-RUN apt-get update && apt-get install -y iputils-ping netcat build-essential snmp snmpd snmp-mibs-downloader php5-cli apache2 libapache2-mod-php5 runit bc postfix bsd-mailx
-RUN ( egrep -i  "^${NAGIOS_GROUP}" /etc/group || groupadd $NAGIOS_GROUP ) && ( egrep -i "^${NAGIOS_CMDGROUP}" /etc/group || groupadd $NAGIOS_CMDGROUP )
-RUN ( id -u $NAGIOS_USER || useradd --system $NAGIOS_USER -g $NAGIOS_GROUP -d $NAGIOS_HOME ) && ( id -u $NAGIOS_CMDUSER || useradd --system -d $NAGIOS_HOME -g $NAGIOS_CMDGROUP $NAGIOS_CMDUSER )
-
-ADD http://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-3.5.1/nagios-3.5.1.tar.gz?r=http%3A%2F%2Fwww.nagios.org%2Fdownload%2Fcore%2Fthanks%2F%3Ft%3D1398863696&ts=1398863718&use_mirror=superb-dca3 /tmp/nagios.tar.gz
-RUN cd /tmp && tar -zxvf nagios.tar.gz && cd nagios  && ./configure --prefix=${NAGIOS_HOME} --exec-prefix=${NAGIOS_HOME} --enable-event-broker --with-nagios-command-user=${NAGIOS_CMDUSER} --with-command-group=${NAGIOS_CMDGROUP} --with-nagios-user=${NAGIOS_USER} --with-nagios-group=${NAGIOS_GROUP} && make all && make install && make install-config && make install-commandmode && cp sample-config/httpd.conf /etc/apache2/conf.d/nagios.conf
-ADD http://www.nagios-plugins.org/download/nagios-plugins-1.5.tar.gz /tmp/
-RUN cd /tmp && tar -zxvf nagios-plugins-1.5.tar.gz && cd nagios-plugins-1.5 && ./configure --prefix=${NAGIOS_HOME} && make && make install
-
-RUN sed -i.bak 's/.*\=www\-data//g' /etc/apache2/envvars
-RUN export DOC_ROOT="DocumentRoot $(echo $NAGIOS_HOME/share)"; sed -i "s,DocumentRoot.*,$DOC_ROOT," /etc/apache2/sites-enabled/000-default
-
-RUN ln -s ${NAGIOS_HOME}/bin/nagios /usr/local/bin/nagios && mkdir -p /usr/share/snmp/mibs && chmod 0755 /usr/share/snmp/mibs && touch /usr/share/snmp/mibs/.foo
-
-RUN echo "use_timezone=$NAGIOS_TIMEZONE" >> ${NAGIOS_HOME}/etc/nagios.cfg && echo "SetEnv TZ \"${NAGIOS_TIMEZONE}\"" >> /etc/apache2/conf.d/nagios.conf
-
-RUN mkdir -p ${NAGIOS_HOME}/etc/conf.d && mkdir -p ${NAGIOS_HOME}/etc/monitor && ln -s /usr/share/snmp/mibs ${NAGIOS_HOME}/libexec/mibs
-RUN echo "cfg_dir=${NAGIOS_HOME}/etc/conf.d" >> ${NAGIOS_HOME}/etc/nagios.cfg
-RUN echo "cfg_dir=${NAGIOS_HOME}/etc/monitor" >> ${NAGIOS_HOME}/etc/nagios.cfg
-RUN download-mibs && echo "mibs +ALL" > /etc/snmp/snmp.conf
-
-RUN sed -i 's,/bin/mail,/usr/bin/mail,' /opt/nagios/etc/objects/commands.cfg && \
-  sed -i 's,/usr/usr,/usr,' /opt/nagios/etc/objects/commands.cfg
-RUN cp /etc/services /var/spool/postfix/etc/
-
-RUN mkdir -p /etc/sv/nagios && mkdir -p /etc/sv/apache && rm -rf /etc/sv/getty-5 && mkdir -p /etc/sv/postfix
-ADD nagios.init /etc/sv/nagios/run
-ADD apache.init /etc/sv/apache/run
-ADD postfix.init /etc/sv/postfix/run
-ADD postfix.stop /etc/sv/postfix/finish
-
-ADD start.sh /usr/local/bin/start_nagios
-
-ENV APACHE_LOCK_DIR /var/run
-ENV APACHE_LOG_DIR /var/log/apache2
-
-EXPOSE 80
-
-VOLUME ["/opt/nagios/var", "/opt/nagios/etc", "/opt/nagios/libexec", "/var/log/apache2", "/usr/share/snmp/mibs"]
-
-CMD ["/usr/local/bin/start_nagios"]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/result
deleted file mode 100644
index 25dd3ddfe5..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/cpuguy83-nagios/result
+++ /dev/null
@@ -1,40 +0,0 @@
-(from "cpuguy83/ubuntu")
-(env "NAGIOS_HOME" "/opt/nagios")
-(env "NAGIOS_USER" "nagios")
-(env "NAGIOS_GROUP" "nagios")
-(env "NAGIOS_CMDUSER" "nagios")
-(env "NAGIOS_CMDGROUP" "nagios")
-(env "NAGIOSADMIN_USER" "nagiosadmin")
-(env "NAGIOSADMIN_PASS" "nagios")
-(env "APACHE_RUN_USER" "nagios")
-(env "APACHE_RUN_GROUP" "nagios")
-(env "NAGIOS_TIMEZONE" "UTC")
-(run "sed -i 's/universe/universe multiverse/' /etc/apt/sources.list")
-(run "apt-get update && apt-get install -y iputils-ping netcat build-essential snmp snmpd snmp-mibs-downloader php5-cli apache2 libapache2-mod-php5 runit bc postfix bsd-mailx")
-(run "( egrep -i  \"^${NAGIOS_GROUP}\" /etc/group || groupadd $NAGIOS_GROUP ) && ( egrep -i \"^${NAGIOS_CMDGROUP}\" /etc/group || groupadd $NAGIOS_CMDGROUP )")
-(run "( id -u $NAGIOS_USER || useradd --system $NAGIOS_USER -g $NAGIOS_GROUP -d $NAGIOS_HOME ) && ( id -u $NAGIOS_CMDUSER || useradd --system -d $NAGIOS_HOME -g $NAGIOS_CMDGROUP $NAGIOS_CMDUSER )")
-(add "http://downloads.sourceforge.net/project/nagios/nagios-3.x/nagios-3.5.1/nagios-3.5.1.tar.gz?r=http%3A%2F%2Fwww.nagios.org%2Fdownload%2Fcore%2Fthanks%2F%3Ft%3D1398863696&ts=1398863718&use_mirror=superb-dca3" "/tmp/nagios.tar.gz")
-(run "cd /tmp && tar -zxvf nagios.tar.gz && cd nagios  && ./configure --prefix=${NAGIOS_HOME} --exec-prefix=${NAGIOS_HOME} --enable-event-broker --with-nagios-command-user=${NAGIOS_CMDUSER} --with-command-group=${NAGIOS_CMDGROUP} --with-nagios-user=${NAGIOS_USER} --with-nagios-group=${NAGIOS_GROUP} && make all && make install && make install-config && make install-commandmode && cp sample-config/httpd.conf /etc/apache2/conf.d/nagios.conf")
-(add "http://www.nagios-plugins.org/download/nagios-plugins-1.5.tar.gz" "/tmp/")
-(run "cd /tmp && tar -zxvf nagios-plugins-1.5.tar.gz && cd nagios-plugins-1.5 && ./configure --prefix=${NAGIOS_HOME} && make && make install")
-(run "sed -i.bak 's/.*\\=www\\-data//g' /etc/apache2/envvars")
-(run "export DOC_ROOT=\"DocumentRoot $(echo $NAGIOS_HOME/share)\"; sed -i \"s,DocumentRoot.*,$DOC_ROOT,\" /etc/apache2/sites-enabled/000-default")
-(run "ln -s ${NAGIOS_HOME}/bin/nagios /usr/local/bin/nagios && mkdir -p /usr/share/snmp/mibs && chmod 0755 /usr/share/snmp/mibs && touch /usr/share/snmp/mibs/.foo")
-(run "echo \"use_timezone=$NAGIOS_TIMEZONE\" >> ${NAGIOS_HOME}/etc/nagios.cfg && echo \"SetEnv TZ \\\"${NAGIOS_TIMEZONE}\\\"\" >> /etc/apache2/conf.d/nagios.conf")
-(run "mkdir -p ${NAGIOS_HOME}/etc/conf.d && mkdir -p ${NAGIOS_HOME}/etc/monitor && ln -s /usr/share/snmp/mibs ${NAGIOS_HOME}/libexec/mibs")
-(run "echo \"cfg_dir=${NAGIOS_HOME}/etc/conf.d\" >> ${NAGIOS_HOME}/etc/nagios.cfg")
-(run "echo \"cfg_dir=${NAGIOS_HOME}/etc/monitor\" >> ${NAGIOS_HOME}/etc/nagios.cfg")
-(run "download-mibs && echo \"mibs +ALL\" > /etc/snmp/snmp.conf")
-(run "sed -i 's,/bin/mail,/usr/bin/mail,' /opt/nagios/etc/objects/commands.cfg &&   sed -i 's,/usr/usr,/usr,' /opt/nagios/etc/objects/commands.cfg")
-(run "cp /etc/services /var/spool/postfix/etc/")
-(run "mkdir -p /etc/sv/nagios && mkdir -p /etc/sv/apache && rm -rf /etc/sv/getty-5 && mkdir -p /etc/sv/postfix")
-(add "nagios.init" "/etc/sv/nagios/run")
-(add "apache.init" "/etc/sv/apache/run")
-(add "postfix.init" "/etc/sv/postfix/run")
-(add "postfix.stop" "/etc/sv/postfix/finish")
-(add "start.sh" "/usr/local/bin/start_nagios")
-(env "APACHE_LOCK_DIR" "/var/run")
-(env "APACHE_LOG_DIR" "/var/log/apache2")
-(expose "80")
-(volume "/opt/nagios/var" "/opt/nagios/etc" "/opt/nagios/libexec" "/var/log/apache2" "/usr/share/snmp/mibs")
-(cmd "/usr/local/bin/start_nagios")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/Dockerfile
deleted file mode 100644
index 99fbe55be0..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/Dockerfile
+++ /dev/null
@@ -1,103 +0,0 @@
-# This file describes the standard way to build Docker, using docker
-#
-# Usage:
-#
-# # Assemble the full dev environment. This is slow the first time.
-# docker build -t docker .
-#
-# # Mount your source in an interactive container for quick testing:
-# docker run -v `pwd`:/go/src/github.com/docker/docker --privileged -i -t docker bash
-#
-# # Run the test suite:
-# docker run --privileged docker hack/make.sh test-unit test-integration-cli test-docker-py
-#
-# # Publish a release:
-# docker run --privileged \
-#  -e AWS_S3_BUCKET=baz \
-#  -e AWS_ACCESS_KEY=foo \
-#  -e AWS_SECRET_KEY=bar \
-#  -e GPG_PASSPHRASE=gloubiboulga \
-#  docker hack/release.sh
-#
-# Note: AppArmor used to mess with privileged mode, but this is no longer
-# the case. Therefore, you don't have to disable it anymore.
-#
-
-FROM	ubuntu:14.04
-MAINTAINER	Tianon Gravi <admwiggin@gmail.com> (@tianon)
-
-# Packaged dependencies
-RUN	apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \
-	apt-utils \
-	aufs-tools \
-	automake \
-	btrfs-tools \
-	build-essential \
-	curl \
-	dpkg-sig \
-	git \
-	iptables \
-	libapparmor-dev \
-	libcap-dev \
-	libsqlite3-dev \
-	mercurial \
-	pandoc \
-	parallel \
-	reprepro \
-	ruby1.9.1 \
-	ruby1.9.1-dev \
-	s3cmd=1.1.0* \
-	--no-install-recommends
-
-# Get lvm2 source for compiling statically
-RUN	git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103
-# see https://git.fedorahosted.org/cgit/lvm2.git/refs/tags for release tags
-# note: we don't use "git clone -b" above because it then spews big nasty warnings about 'detached HEAD' state that we can't silence as easily as we can silence them using "git checkout" directly
-
-# Compile and install lvm2
-RUN	cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper
-# see https://git.fedorahosted.org/cgit/lvm2.git/tree/INSTALL
-
-# Install Go
-RUN	curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz
-ENV	PATH	/usr/local/go/bin:$PATH
-ENV	GOPATH	/go:/go/src/github.com/docker/docker/vendor
-RUN	cd /usr/local/go/src && ./make.bash --no-clean 2>&1
-
-# Compile Go for cross compilation
-ENV	DOCKER_CROSSPLATFORMS	\
-	linux/386 linux/arm \
-	darwin/amd64 darwin/386 \
-	freebsd/amd64 freebsd/386 freebsd/arm
-# (set an explicit GOARM of 5 for maximum compatibility)
-ENV	GOARM	5
-RUN	cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'
-
-# Grab Go's cover tool for dead-simple code coverage testing
-RUN	go get golang.org/x/tools/cmd/cover
-
-# TODO replace FPM with some very minimal debhelper stuff
-RUN	gem install --no-rdoc --no-ri fpm --version 1.0.2
-
-# Get the "busybox" image source so we can build locally instead of pulling
-RUN	git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox
-
-# Setup s3cmd config
-RUN	/bin/echo -e '[default]\naccess_key=$AWS_ACCESS_KEY\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg
-
-# Set user.email so crosbymichael's in-container merge commits go smoothly
-RUN	git config --global user.email 'docker-dummy@example.com'
-
-# Add an unprivileged user to be used for tests which need it
-RUN groupadd -r docker
-RUN useradd --create-home --gid docker unprivilegeduser
-
-VOLUME	/var/lib/docker
-WORKDIR	/go/src/github.com/docker/docker
-ENV	DOCKER_BUILDTAGS	apparmor selinux
-
-# Wrap all commands in the "docker-in-docker" script to allow nested containers
-ENTRYPOINT	["hack/dind"]
-
-# Upload docker source
-COPY	.	/go/src/github.com/docker/docker
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/result
deleted file mode 100644
index d032f9bac4..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/docker/result
+++ /dev/null
@@ -1,24 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "Tianon Gravi <admwiggin@gmail.com> (@tianon)")
-(run "apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -yq \tapt-utils \taufs-tools \tautomake \tbtrfs-tools \tbuild-essential \tcurl \tdpkg-sig \tgit \tiptables \tlibapparmor-dev \tlibcap-dev \tlibsqlite3-dev \tmercurial \tpandoc \tparallel \treprepro \truby1.9.1 \truby1.9.1-dev \ts3cmd=1.1.0* \t--no-install-recommends")
-(run "git clone --no-checkout https://git.fedorahosted.org/git/lvm2.git /usr/local/lvm2 && cd /usr/local/lvm2 && git checkout -q v2_02_103")
-(run "cd /usr/local/lvm2 && ./configure --enable-static_link && make device-mapper && make install_device-mapper")
-(run "curl -sSL https://golang.org/dl/go1.3.src.tar.gz | tar -v -C /usr/local -xz")
-(env "PATH" "/usr/local/go/bin:$PATH")
-(env "GOPATH" "/go:/go/src/github.com/docker/docker/vendor")
-(run "cd /usr/local/go/src && ./make.bash --no-clean 2>&1")
-(env "DOCKER_CROSSPLATFORMS" "linux/386 linux/arm \tdarwin/amd64 darwin/386 \tfreebsd/amd64 freebsd/386 freebsd/arm")
-(env "GOARM" "5")
-(run "cd /usr/local/go/src && bash -xc 'for platform in $DOCKER_CROSSPLATFORMS; do GOOS=${platform%/*} GOARCH=${platform##*/} ./make.bash --no-clean 2>&1; done'")
-(run "go get golang.org/x/tools/cmd/cover")
-(run "gem install --no-rdoc --no-ri fpm --version 1.0.2")
-(run "git clone -b buildroot-2014.02 https://github.com/jpetazzo/docker-busybox.git /docker-busybox")
-(run "/bin/echo -e '[default]\\naccess_key=$AWS_ACCESS_KEY\\nsecret_key=$AWS_SECRET_KEY' > /.s3cfg")
-(run "git config --global user.email 'docker-dummy@example.com'")
-(run "groupadd -r docker")
-(run "useradd --create-home --gid docker unprivilegeduser")
-(volume "/var/lib/docker")
-(workdir "/go/src/github.com/docker/docker")
-(env "DOCKER_BUILDTAGS" "apparmor selinux")
-(entrypoint "hack/dind")
-(copy "." "/go/src/github.com/docker/docker")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/Dockerfile
deleted file mode 100644
index 08fa18acec..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM ubuntu
-ENV name value
-ENV name=value
-ENV name=value name2=value2
-ENV name="value value1"
-ENV name=value\ value2
-ENV name="value'quote space'value2"
-ENV name='value"double quote"value2'
-ENV name=value\ value2 name2=value2\ value3
-ENV name="a\"b"
-ENV name="a\'b"
-ENV name='a\'b'
-ENV name='a\'b''
-ENV name='a\"b'
-ENV name="''"
-# don't put anything after the next line - it must be the last line of the
-# Dockerfile and it must end with \
-ENV name=value \
-    name1=value1 \
-    name2="value2a \
-           value2b" \
-    name3="value3a\n\"value3b\"" \
-	name4="value4a\\nvalue4b" \
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/result
deleted file mode 100644
index ba0a6dd7cb..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/env/result
+++ /dev/null
@@ -1,16 +0,0 @@
-(from "ubuntu")
-(env "name" "value")
-(env "name" "value")
-(env "name" "value" "name2" "value2")
-(env "name" "\"value value1\"")
-(env "name" "value\\ value2")
-(env "name" "\"value'quote space'value2\"")
-(env "name" "'value\"double quote\"value2'")
-(env "name" "value\\ value2" "name2" "value2\\ value3")
-(env "name" "\"a\\\"b\"")
-(env "name" "\"a\\'b\"")
-(env "name" "'a\\'b'")
-(env "name" "'a\\'b''")
-(env "name" "'a\\\"b'")
-(env "name" "\"''\"")
-(env "name" "value" "name1" "value1" "name2" "\"value2a            value2b\"" "name3" "\"value3a\\n\\\"value3b\\\"\"" "name4" "\"value4a\\\\nvalue4b\"")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile
deleted file mode 100644
index 6def7efdcd..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Comment here. Should not be looking for the following parser directive.
-# Hence the following line will be ignored, and the subsequent backslash
-# continuation will be the default.
-# escape = `
-
-FROM image
-MAINTAINER foo@bar.com
-ENV GOPATH \
-\go
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/result
deleted file mode 100644
index 21522a880b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-after-comment/result
+++ /dev/null
@@ -1,3 +0,0 @@
-(from "image")
-(maintainer "foo@bar.com")
-(env "GOPATH" "\\go")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile
deleted file mode 100644
index 08a8cc4326..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-# escape = ``
-# There is no white space line after the directives. This still succeeds, but goes
-# against best practices.
-FROM image
-MAINTAINER foo@bar.com
-ENV GOPATH `
-\go
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/result
deleted file mode 100644
index 21522a880b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape-nonewline/result
+++ /dev/null
@@ -1,3 +0,0 @@
-(from "image")
-(maintainer "foo@bar.com")
-(env "GOPATH" "\\go")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/Dockerfile
deleted file mode 100644
index ef30414a5e..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/Dockerfile
+++ /dev/null
@@ -1,6 +0,0 @@
-#escape = `
-
-FROM image
-MAINTAINER foo@bar.com
-ENV GOPATH `
-\go
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/result
deleted file mode 100644
index 21522a880b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escape/result
+++ /dev/null
@@ -1,3 +0,0 @@
-(from "image")
-(maintainer "foo@bar.com")
-(env "GOPATH" "\\go")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/Dockerfile
deleted file mode 100644
index 1ffb17ef08..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Erik \\Hollensbe <erik@hollensbe.org>\"
-
-RUN apt-get \update && \
-  apt-get \"install znc -y
-ADD \conf\\" /.znc
-
-RUN foo \
-
-bar \
-
-baz
-
-CMD [ "\/usr\\\"/bin/znc", "-f", "-r" ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/result
deleted file mode 100644
index 13e409cb1a..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/escapes/result
+++ /dev/null
@@ -1,6 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "Erik \\\\Hollensbe <erik@hollensbe.org>\\\"")
-(run "apt-get \\update &&   apt-get \\\"install znc -y")
-(add "\\conf\\\\\"" "/.znc")
-(run "foo bar baz")
-(cmd "/usr\\\"/bin/znc" "-f" "-r")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/Dockerfile
deleted file mode 100644
index 2418e0f069..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM scratch
-COPY foo /tmp/
-COPY --user=me foo /tmp/
-COPY --doit=true foo /tmp/
-COPY --user=me --doit=true foo /tmp/
-COPY --doit=true -- foo /tmp/
-COPY -- foo /tmp/
-CMD --doit [ "a", "b" ]
-CMD --doit=true -- [ "a", "b" ]
-CMD --doit -- [ ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/result
deleted file mode 100644
index 4578f4cba4..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/flags/result
+++ /dev/null
@@ -1,10 +0,0 @@
-(from "scratch")
-(copy "foo" "/tmp/")
-(copy ["--user=me"] "foo" "/tmp/")
-(copy ["--doit=true"] "foo" "/tmp/")
-(copy ["--user=me" "--doit=true"] "foo" "/tmp/")
-(copy ["--doit=true"] "foo" "/tmp/")
-(copy "foo" "/tmp/")
-(cmd ["--doit"] "a" "b")
-(cmd ["--doit=true"] "a" "b")
-(cmd ["--doit"])
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/Dockerfile
deleted file mode 100644
index 081e442882..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/Dockerfile
+++ /dev/null
@@ -1,10 +0,0 @@
-FROM debian
-ADD check.sh main.sh /app/
-CMD /app/main.sh
-HEALTHCHECK
-HEALTHCHECK --interval=5s --timeout=3s --retries=3 \
-  CMD /app/check.sh --quiet
-HEALTHCHECK CMD
-HEALTHCHECK   CMD   a b
-HEALTHCHECK --timeout=3s CMD ["foo"]
-HEALTHCHECK CONNECT TCP 7000
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/result
deleted file mode 100644
index 092924f88c..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/health/result
+++ /dev/null
@@ -1,9 +0,0 @@
-(from "debian")
-(add "check.sh" "main.sh" "/app/")
-(cmd "/app/main.sh")
-(healthcheck)
-(healthcheck ["--interval=5s" "--timeout=3s" "--retries=3"] "CMD" "/app/check.sh --quiet")
-(healthcheck "CMD")
-(healthcheck "CMD" "a b")
-(healthcheck ["--timeout=3s"] "CMD" "foo")
-(healthcheck "CONNECT" "TCP 7000")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/Dockerfile
deleted file mode 100644
index 587fb9b54b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM ubuntu:14.04
-
-RUN apt-get update && apt-get install wget -y
-RUN wget http://s3.amazonaws.com/influxdb/influxdb_latest_amd64.deb
-RUN dpkg -i influxdb_latest_amd64.deb
-RUN rm -r /opt/influxdb/shared
-
-VOLUME /opt/influxdb/shared
-
-CMD /usr/bin/influxdb --pidfile /var/run/influxdb.pid -config /opt/influxdb/shared/config.toml
-
-EXPOSE 8083
-EXPOSE 8086
-EXPOSE 8090
-EXPOSE 8099
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/result
deleted file mode 100644
index 0998e87e63..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/influxdb/result
+++ /dev/null
@@ -1,11 +0,0 @@
-(from "ubuntu:14.04")
-(run "apt-get update && apt-get install wget -y")
-(run "wget http://s3.amazonaws.com/influxdb/influxdb_latest_amd64.deb")
-(run "dpkg -i influxdb_latest_amd64.deb")
-(run "rm -r /opt/influxdb/shared")
-(volume "/opt/influxdb/shared")
-(cmd "/usr/bin/influxdb --pidfile /var/run/influxdb.pid -config /opt/influxdb/shared/config.toml")
-(expose "8083")
-(expose "8086")
-(expose "8090")
-(expose "8099")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile
deleted file mode 100644
index 39fe27d99c..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD "[\"echo\", \"Phew, I just managed to escaped those double quotes\"]"
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
deleted file mode 100644
index afc220c2a7..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string-double/result
+++ /dev/null
@@ -1 +0,0 @@
-(cmd "\"[\\\"echo\\\", \\\"Phew, I just managed to escaped those double quotes\\\"]\"")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile
deleted file mode 100644
index eaae081a06..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD '["echo", "Well, JSON in a string is JSON too?"]'
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/result
deleted file mode 100644
index 484804e2b2..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-json-inside-string/result
+++ /dev/null
@@ -1 +0,0 @@
-(cmd "'[\"echo\", \"Well, JSON in a string is JSON too?\"]'")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile
deleted file mode 100644
index c3ac63c07a..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD ['echo','single quotes are invalid JSON']
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/result
deleted file mode 100644
index 6147891207..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-single-quotes/result
+++ /dev/null
@@ -1 +0,0 @@
-(cmd "['echo','single quotes are invalid JSON']")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile
deleted file mode 100644
index 5fd4afa522..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD ["echo", "Please, close the brackets when you're done"
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
deleted file mode 100644
index 1ffbb8ff85..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-bracket/result
+++ /dev/null
@@ -1 +0,0 @@
-(cmd "[\"echo\", \"Please, close the brackets when you're done\"")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile
deleted file mode 100644
index 30cc4bb48f..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/Dockerfile
+++ /dev/null
@@ -1 +0,0 @@
-CMD ["echo", "look ma, no quote!]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/result
deleted file mode 100644
index 32048147b5..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/jeztah-invalid-json-unterminated-string/result
+++ /dev/null
@@ -1 +0,0 @@
-(cmd "[\"echo\", \"look ma, no quote!]")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/Dockerfile
deleted file mode 100644
index a586917110..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/Dockerfile
+++ /dev/null
@@ -1,8 +0,0 @@
-CMD []
-CMD [""]
-CMD ["a"]
-CMD ["a","b"]
-CMD [ "a", "b" ]
-CMD [	"a",	"b"	]
-CMD	[	"a",	"b"	]	
-CMD ["abc 123", "♥", "☃", "\" \\ \/ \b \f \n \r \t \u0000"]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/result
deleted file mode 100644
index c6553e6e1a..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/json/result
+++ /dev/null
@@ -1,8 +0,0 @@
-(cmd)
-(cmd "")
-(cmd "a")
-(cmd "a" "b")
-(cmd "a" "b")
-(cmd "a" "b")
-(cmd "a" "b")
-(cmd "abc 123" "♥" "☃" "\" \\ / \b \f \n \r \t \x00")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
deleted file mode 100644
index 35f9c24aa6..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER James Turnbull "james@example.com"
-ENV REFRESHED_AT 2014-06-01
-RUN apt-get update
-RUN apt-get -y install redis-server redis-tools
-EXPOSE 6379
-ENTRYPOINT [ "/usr/bin/redis-server" ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result
deleted file mode 100644
index b5ac6fe445..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/kartar-entrypoint-oddities/result
+++ /dev/null
@@ -1,7 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "James Turnbull \"james@example.com\"")
-(env "REFRESHED_AT" "2014-06-01")
-(run "apt-get update")
-(run "apt-get -y install redis-server redis-tools")
-(expose "6379")
-(entrypoint "/usr/bin/redis-server")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
deleted file mode 100644
index 188395fe83..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/Dockerfile
+++ /dev/null
@@ -1,48 +0,0 @@
-FROM busybox:buildroot-2014.02
-
-MAINTAINER docker <docker@docker.io>
-
-ONBUILD RUN ["echo", "test"]
-ONBUILD RUN echo test
-ONBUILD COPY . /
-
-
-# RUN Commands \
-# linebreak in comment \
-RUN ["ls", "-la"]
-RUN ["echo", "'1234'"]
-RUN echo "1234"
-RUN echo 1234
-RUN echo '1234' && \
-    echo "456" && \
-    echo 789
-RUN    sh -c 'echo root:testpass \
-        > /tmp/passwd'
-RUN mkdir -p /test /test2 /test3/test
-
-# ENV \
-ENV SCUBA 1 DUBA 3
-ENV SCUBA "1 DUBA 3"
-
-# CMD \
-CMD ["echo", "test"]
-CMD echo test
-CMD echo "test"
-CMD echo 'test'
-CMD echo 'test' | wc -
-
-#EXPOSE\
-EXPOSE 3000
-EXPOSE 9000 5000 6000
-
-USER docker
-USER docker:root
-
-VOLUME ["/test"]
-VOLUME ["/test", "/test2"]
-VOLUME /test3
-
-WORKDIR /test
-
-ADD . /
-COPY . copy
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result
deleted file mode 100644
index 6f7d57a396..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/lk4d4-the-edge-case-generator/result
+++ /dev/null
@@ -1,29 +0,0 @@
-(from "busybox:buildroot-2014.02")
-(maintainer "docker <docker@docker.io>")
-(onbuild (run "echo" "test"))
-(onbuild (run "echo test"))
-(onbuild (copy "." "/"))
-(run "ls" "-la")
-(run "echo" "'1234'")
-(run "echo \"1234\"")
-(run "echo 1234")
-(run "echo '1234' &&     echo \"456\" &&     echo 789")
-(run "sh -c 'echo root:testpass         > /tmp/passwd'")
-(run "mkdir -p /test /test2 /test3/test")
-(env "SCUBA" "1 DUBA 3")
-(env "SCUBA" "\"1 DUBA 3\"")
-(cmd "echo" "test")
-(cmd "echo test")
-(cmd "echo \"test\"")
-(cmd "echo 'test'")
-(cmd "echo 'test' | wc -")
-(expose "3000")
-(expose "9000" "5000" "6000")
-(user "docker")
-(user "docker:root")
-(volume "/test")
-(volume "/test" "/test2")
-(volume "/test3")
-(workdir "/test")
-(add "." "/")
-(copy "." "copy")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/Dockerfile
deleted file mode 100644
index f64c1168c1..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM ubuntu:14.04
-
-RUN apt-get update -qy && apt-get install mutt offlineimap vim-nox abook elinks curl tmux cron zsh -y
-ADD .muttrc /
-ADD .offlineimaprc /
-ADD .tmux.conf /
-ADD mutt /.mutt
-ADD vim /.vim
-ADD vimrc /.vimrc
-ADD crontab /etc/crontab
-RUN chmod 644 /etc/crontab
-RUN mkdir /Mail
-RUN mkdir /.offlineimap
-RUN echo "export TERM=screen-256color" >/.zshenv
-
-CMD setsid cron; tmux -2
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/result
deleted file mode 100644
index a0efcf04b6..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mail/result
+++ /dev/null
@@ -1,14 +0,0 @@
-(from "ubuntu:14.04")
-(run "apt-get update -qy && apt-get install mutt offlineimap vim-nox abook elinks curl tmux cron zsh -y")
-(add ".muttrc" "/")
-(add ".offlineimaprc" "/")
-(add ".tmux.conf" "/")
-(add "mutt" "/.mutt")
-(add "vim" "/.vim")
-(add "vimrc" "/.vimrc")
-(add "crontab" "/etc/crontab")
-(run "chmod 644 /etc/crontab")
-(run "mkdir /Mail")
-(run "mkdir /.offlineimap")
-(run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "setsid cron; tmux -2")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/Dockerfile
deleted file mode 100644
index 57bb5976a3..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM foo
-
-VOLUME /opt/nagios/var /opt/nagios/etc /opt/nagios/libexec /var/log/apache2 /usr/share/snmp/mibs
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/result
deleted file mode 100644
index 18dbdeeaa0..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/multiple-volumes/result
+++ /dev/null
@@ -1,2 +0,0 @@
-(from "foo")
-(volume "/opt/nagios/var" "/opt/nagios/etc" "/opt/nagios/libexec" "/var/log/apache2" "/usr/share/snmp/mibs")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/Dockerfile
deleted file mode 100644
index 5b9ec06a6c..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ubuntu:14.04
-
-RUN apt-get update && apt-get install libcap2-bin mumble-server -y
-
-ADD ./mumble-server.ini /etc/mumble-server.ini
-
-CMD /usr/sbin/murmurd
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/result
deleted file mode 100644
index a0036a943e..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/mumble/result
+++ /dev/null
@@ -1,4 +0,0 @@
-(from "ubuntu:14.04")
-(run "apt-get update && apt-get install libcap2-bin mumble-server -y")
-(add "./mumble-server.ini" "/etc/mumble-server.ini")
-(cmd "/usr/sbin/murmurd")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/Dockerfile
deleted file mode 100644
index bf8368e1ca..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/Dockerfile
+++ /dev/null
@@ -1,14 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Erik Hollensbe <erik@hollensbe.org>
-
-RUN apt-get update && apt-get install nginx-full -y
-RUN rm -rf /etc/nginx
-ADD etc /etc/nginx
-RUN chown -R root:root /etc/nginx
-RUN /usr/sbin/nginx -qt
-RUN mkdir /www
-
-CMD ["/usr/sbin/nginx"]
-
-VOLUME /www
-EXPOSE 80
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/result
deleted file mode 100644
index 56ddb6f258..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/nginx/result
+++ /dev/null
@@ -1,11 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "Erik Hollensbe <erik@hollensbe.org>")
-(run "apt-get update && apt-get install nginx-full -y")
-(run "rm -rf /etc/nginx")
-(add "etc" "/etc/nginx")
-(run "chown -R root:root /etc/nginx")
-(run "/usr/sbin/nginx -qt")
-(run "mkdir /www")
-(cmd "/usr/sbin/nginx")
-(volume "/www")
-(expose "80")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/Dockerfile
deleted file mode 100644
index 72b79bdd7d..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/Dockerfile
+++ /dev/null
@@ -1,23 +0,0 @@
-FROM ubuntu:12.04
-
-EXPOSE 27015
-EXPOSE 27005
-EXPOSE 26901
-EXPOSE 27020
-
-RUN apt-get update && apt-get install libc6-dev-i386 curl unzip -y
-RUN mkdir -p /steam
-RUN curl http://media.steampowered.com/client/steamcmd_linux.tar.gz | tar vxz -C /steam
-ADD ./script /steam/script
-RUN /steam/steamcmd.sh +runscript /steam/script
-RUN curl http://mirror.pointysoftware.net/alliedmodders/mmsource-1.10.0-linux.tar.gz | tar vxz -C /steam/tf2/tf
-RUN curl http://mirror.pointysoftware.net/alliedmodders/sourcemod-1.5.3-linux.tar.gz | tar vxz -C /steam/tf2/tf
-ADD ./server.cfg /steam/tf2/tf/cfg/server.cfg
-ADD ./ctf_2fort.cfg /steam/tf2/tf/cfg/ctf_2fort.cfg
-ADD ./sourcemod.cfg /steam/tf2/tf/cfg/sourcemod/sourcemod.cfg
-RUN rm -r /steam/tf2/tf/addons/sourcemod/configs
-ADD ./configs /steam/tf2/tf/addons/sourcemod/configs
-RUN mkdir -p /steam/tf2/tf/addons/sourcemod/translations/en
-RUN cp /steam/tf2/tf/addons/sourcemod/translations/*.txt /steam/tf2/tf/addons/sourcemod/translations/en
-
-CMD cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/result
deleted file mode 100644
index d4f94cd8be..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/tf2/result
+++ /dev/null
@@ -1,20 +0,0 @@
-(from "ubuntu:12.04")
-(expose "27015")
-(expose "27005")
-(expose "26901")
-(expose "27020")
-(run "apt-get update && apt-get install libc6-dev-i386 curl unzip -y")
-(run "mkdir -p /steam")
-(run "curl http://media.steampowered.com/client/steamcmd_linux.tar.gz | tar vxz -C /steam")
-(add "./script" "/steam/script")
-(run "/steam/steamcmd.sh +runscript /steam/script")
-(run "curl http://mirror.pointysoftware.net/alliedmodders/mmsource-1.10.0-linux.tar.gz | tar vxz -C /steam/tf2/tf")
-(run "curl http://mirror.pointysoftware.net/alliedmodders/sourcemod-1.5.3-linux.tar.gz | tar vxz -C /steam/tf2/tf")
-(add "./server.cfg" "/steam/tf2/tf/cfg/server.cfg")
-(add "./ctf_2fort.cfg" "/steam/tf2/tf/cfg/ctf_2fort.cfg")
-(add "./sourcemod.cfg" "/steam/tf2/tf/cfg/sourcemod/sourcemod.cfg")
-(run "rm -r /steam/tf2/tf/addons/sourcemod/configs")
-(add "./configs" "/steam/tf2/tf/addons/sourcemod/configs")
-(run "mkdir -p /steam/tf2/tf/addons/sourcemod/translations/en")
-(run "cp /steam/tf2/tf/addons/sourcemod/translations/*.txt /steam/tf2/tf/addons/sourcemod/translations/en")
-(cmd "cd /steam/tf2 && ./srcds_run -port 27015 +ip 0.0.0.0 +map ctf_2fort -autoupdate -steam_dir /steam -steamcmd_script /steam/script +tf_bot_quota 12 +tf_bot_quota_mode fill")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/Dockerfile
deleted file mode 100644
index 4842088166..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM ubuntu:14.04
-
-RUN apt-get update -qy && apt-get install tmux zsh weechat-curses -y
-
-ADD .weechat /.weechat
-ADD .tmux.conf /
-RUN echo "export TERM=screen-256color" >/.zshenv
-
-CMD zsh -c weechat
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/result
deleted file mode 100644
index c3abb4c54f..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/weechat/result
+++ /dev/null
@@ -1,6 +0,0 @@
-(from "ubuntu:14.04")
-(run "apt-get update -qy && apt-get install tmux zsh weechat-curses -y")
-(add ".weechat" "/.weechat")
-(add ".tmux.conf" "/")
-(run "echo \"export TERM=screen-256color\" >/.zshenv")
-(cmd "zsh -c weechat")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/Dockerfile b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/Dockerfile
deleted file mode 100644
index 3a4da6e916..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/Dockerfile
+++ /dev/null
@@ -1,7 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Erik Hollensbe <erik@hollensbe.org>
-
-RUN apt-get update && apt-get install znc -y
-ADD conf /.znc
-
-CMD [ "/usr/bin/znc", "-f", "-r" ]
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/result b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/result
deleted file mode 100644
index 5493b255fd..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/testfiles/znc/result
+++ /dev/null
@@ -1,5 +0,0 @@
-(from "ubuntu:14.04")
-(maintainer "Erik Hollensbe <erik@hollensbe.org>")
-(run "apt-get update && apt-get install znc -y")
-(add "conf" "/.znc")
-(cmd "/usr/bin/znc" "-f" "-r")
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/utils.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/utils.go
deleted file mode 100644
index cd7af75e79..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/parser/utils.go
+++ /dev/null
@@ -1,176 +0,0 @@
-package parser
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"unicode"
-)
-
-// Dump dumps the AST defined by `node` as a list of sexps.
-// Returns a string suitable for printing.
-func (node *Node) Dump() string {
-	str := ""
-	str += node.Value
-
-	if len(node.Flags) > 0 {
-		str += fmt.Sprintf(" %q", node.Flags)
-	}
-
-	for _, n := range node.Children {
-		str += "(" + n.Dump() + ")\n"
-	}
-
-	if node.Next != nil {
-		for n := node.Next; n != nil; n = n.Next {
-			if len(n.Children) > 0 {
-				str += " " + n.Dump()
-			} else {
-				str += " " + strconv.Quote(n.Value)
-			}
-		}
-	}
-
-	return strings.TrimSpace(str)
-}
-
-// performs the dispatch based on the two primal strings, cmd and args. Please
-// look at the dispatch table in parser.go to see how these dispatchers work.
-func fullDispatch(cmd, args string, d *Directive) (*Node, map[string]bool, error) {
-	fn := dispatch[cmd]
-
-	// Ignore invalid Dockerfile instructions
-	if fn == nil {
-		fn = parseIgnore
-	}
-
-	sexp, attrs, err := fn(args, d)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return sexp, attrs, nil
-}
-
-// splitCommand takes a single line of text and parses out the cmd and args,
-// which are used for dispatching to more exact parsing functions.
-func splitCommand(line string) (string, []string, string, error) {
-	var args string
-	var flags []string
-
-	// Make sure we get the same results irrespective of leading/trailing spaces
-	cmdline := tokenWhitespace.Split(strings.TrimSpace(line), 2)
-	cmd := strings.ToLower(cmdline[0])
-
-	if len(cmdline) == 2 {
-		var err error
-		args, flags, err = extractBuilderFlags(cmdline[1])
-		if err != nil {
-			return "", nil, "", err
-		}
-	}
-
-	return cmd, flags, strings.TrimSpace(args), nil
-}
-
-// covers comments and empty lines. Lines should be trimmed before passing to
-// this function.
-func stripComments(line string) string {
-	// string is already trimmed at this point
-	if tokenComment.MatchString(line) {
-		return tokenComment.ReplaceAllString(line, "")
-	}
-
-	return line
-}
-
-func extractBuilderFlags(line string) (string, []string, error) {
-	// Parses the BuilderFlags and returns the remaining part of the line
-
-	const (
-		inSpaces = iota // looking for start of a word
-		inWord
-		inQuote
-	)
-
-	words := []string{}
-	phase := inSpaces
-	word := ""
-	quote := '\000'
-	blankOK := false
-	var ch rune
-
-	for pos := 0; pos <= len(line); pos++ {
-		if pos != len(line) {
-			ch = rune(line[pos])
-		}
-
-		if phase == inSpaces { // Looking for start of word
-			if pos == len(line) { // end of input
-				break
-			}
-			if unicode.IsSpace(ch) { // skip spaces
-				continue
-			}
-
-			// Only keep going if the next word starts with --
-			if ch != '-' || pos+1 == len(line) || rune(line[pos+1]) != '-' {
-				return line[pos:], words, nil
-			}
-
-			phase = inWord // found someting with "--", fall through
-		}
-		if (phase == inWord || phase == inQuote) && (pos == len(line)) {
-			if word != "--" && (blankOK || len(word) > 0) {
-				words = append(words, word)
-			}
-			break
-		}
-		if phase == inWord {
-			if unicode.IsSpace(ch) {
-				phase = inSpaces
-				if word == "--" {
-					return line[pos:], words, nil
-				}
-				if blankOK || len(word) > 0 {
-					words = append(words, word)
-				}
-				word = ""
-				blankOK = false
-				continue
-			}
-			if ch == '\'' || ch == '"' {
-				quote = ch
-				blankOK = true
-				phase = inQuote
-				continue
-			}
-			if ch == '\\' {
-				if pos+1 == len(line) {
-					continue // just skip \ at end
-				}
-				pos++
-				ch = rune(line[pos])
-			}
-			word += string(ch)
-			continue
-		}
-		if phase == inQuote {
-			if ch == quote {
-				phase = inWord
-				continue
-			}
-			if ch == '\\' {
-				if pos+1 == len(line) {
-					phase = inWord
-					continue // just skip \ at end
-				}
-				pos++
-				ch = rune(line[pos])
-			}
-			word += string(ch)
-		}
-	}
-
-	return "", words, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser.go
deleted file mode 100644
index 189afd1fdb..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser.go
+++ /dev/null
@@ -1,329 +0,0 @@
-package dockerfile
-
-// This will take a single word and an array of env variables and
-// process all quotes (" and ') as well as $xxx and ${xxx} env variable
-// tokens.  Tries to mimic bash shell process.
-// It doesn't support all flavors of ${xx:...} formats but new ones can
-// be added by adding code to the "special ${} format processing" section
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"text/scanner"
-	"unicode"
-)
-
-type shellWord struct {
-	word        string
-	scanner     scanner.Scanner
-	envs        []string
-	pos         int
-	escapeToken rune
-}
-
-// ProcessWord will use the 'env' list of environment variables,
-// and replace any env var references in 'word'.
-func ProcessWord(word string, env []string, escapeToken rune) (string, error) {
-	sw := &shellWord{
-		word:        word,
-		envs:        env,
-		pos:         0,
-		escapeToken: escapeToken,
-	}
-	sw.scanner.Init(strings.NewReader(word))
-	word, _, err := sw.process()
-	return word, err
-}
-
-// ProcessWords will use the 'env' list of environment variables,
-// and replace any env var references in 'word' then it will also
-// return a slice of strings which represents the 'word'
-// split up based on spaces - taking into account quotes.  Note that
-// this splitting is done **after** the env var substitutions are done.
-// Note, each one is trimmed to remove leading and trailing spaces (unless
-// they are quoted", but ProcessWord retains spaces between words.
-func ProcessWords(word string, env []string, escapeToken rune) ([]string, error) {
-	sw := &shellWord{
-		word:        word,
-		envs:        env,
-		pos:         0,
-		escapeToken: escapeToken,
-	}
-	sw.scanner.Init(strings.NewReader(word))
-	_, words, err := sw.process()
-	return words, err
-}
-
-func (sw *shellWord) process() (string, []string, error) {
-	return sw.processStopOn(scanner.EOF)
-}
-
-type wordsStruct struct {
-	word   string
-	words  []string
-	inWord bool
-}
-
-func (w *wordsStruct) addChar(ch rune) {
-	if unicode.IsSpace(ch) && w.inWord {
-		if len(w.word) != 0 {
-			w.words = append(w.words, w.word)
-			w.word = ""
-			w.inWord = false
-		}
-	} else if !unicode.IsSpace(ch) {
-		w.addRawChar(ch)
-	}
-}
-
-func (w *wordsStruct) addRawChar(ch rune) {
-	w.word += string(ch)
-	w.inWord = true
-}
-
-func (w *wordsStruct) addString(str string) {
-	var scan scanner.Scanner
-	scan.Init(strings.NewReader(str))
-	for scan.Peek() != scanner.EOF {
-		w.addChar(scan.Next())
-	}
-}
-
-func (w *wordsStruct) addRawString(str string) {
-	w.word += str
-	w.inWord = true
-}
-
-func (w *wordsStruct) getWords() []string {
-	if len(w.word) > 0 {
-		w.words = append(w.words, w.word)
-
-		// Just in case we're called again by mistake
-		w.word = ""
-		w.inWord = false
-	}
-	return w.words
-}
-
-// Process the word, starting at 'pos', and stop when we get to the
-// end of the word or the 'stopChar' character
-func (sw *shellWord) processStopOn(stopChar rune) (string, []string, error) {
-	var result string
-	var words wordsStruct
-
-	var charFuncMapping = map[rune]func() (string, error){
-		'\'': sw.processSingleQuote,
-		'"':  sw.processDoubleQuote,
-		'$':  sw.processDollar,
-	}
-
-	for sw.scanner.Peek() != scanner.EOF {
-		ch := sw.scanner.Peek()
-
-		if stopChar != scanner.EOF && ch == stopChar {
-			sw.scanner.Next()
-			break
-		}
-		if fn, ok := charFuncMapping[ch]; ok {
-			// Call special processing func for certain chars
-			tmp, err := fn()
-			if err != nil {
-				return "", []string{}, err
-			}
-			result += tmp
-
-			if ch == rune('$') {
-				words.addString(tmp)
-			} else {
-				words.addRawString(tmp)
-			}
-		} else {
-			// Not special, just add it to the result
-			ch = sw.scanner.Next()
-
-			if ch == sw.escapeToken {
-				// '\' (default escape token, but ` allowed) escapes, except end of line
-
-				ch = sw.scanner.Next()
-
-				if ch == scanner.EOF {
-					break
-				}
-
-				words.addRawChar(ch)
-			} else {
-				words.addChar(ch)
-			}
-
-			result += string(ch)
-		}
-	}
-
-	return result, words.getWords(), nil
-}
-
-func (sw *shellWord) processSingleQuote() (string, error) {
-	// All chars between single quotes are taken as-is
-	// Note, you can't escape '
-	var result string
-
-	sw.scanner.Next()
-
-	for {
-		ch := sw.scanner.Next()
-		if ch == '\'' || ch == scanner.EOF {
-			break
-		}
-		result += string(ch)
-	}
-
-	return result, nil
-}
-
-func (sw *shellWord) processDoubleQuote() (string, error) {
-	// All chars up to the next " are taken as-is, even ', except any $ chars
-	// But you can escape " with a \ (or ` if escape token set accordingly)
-	var result string
-
-	sw.scanner.Next()
-
-	for sw.scanner.Peek() != scanner.EOF {
-		ch := sw.scanner.Peek()
-		if ch == '"' {
-			sw.scanner.Next()
-			break
-		}
-		if ch == '$' {
-			tmp, err := sw.processDollar()
-			if err != nil {
-				return "", err
-			}
-			result += tmp
-		} else {
-			ch = sw.scanner.Next()
-			if ch == sw.escapeToken {
-				chNext := sw.scanner.Peek()
-
-				if chNext == scanner.EOF {
-					// Ignore \ at end of word
-					continue
-				}
-
-				if chNext == '"' || chNext == '$' {
-					// \" and \$ can be escaped, all other \'s are left as-is
-					ch = sw.scanner.Next()
-				}
-			}
-			result += string(ch)
-		}
-	}
-
-	return result, nil
-}
-
-func (sw *shellWord) processDollar() (string, error) {
-	sw.scanner.Next()
-	ch := sw.scanner.Peek()
-	if ch == '{' {
-		sw.scanner.Next()
-		name := sw.processName()
-		ch = sw.scanner.Peek()
-		if ch == '}' {
-			// Normal ${xx} case
-			sw.scanner.Next()
-			return sw.getEnv(name), nil
-		}
-		if ch == ':' {
-			// Special ${xx:...} format processing
-			// Yes it allows for recursive $'s in the ... spot
-
-			sw.scanner.Next() // skip over :
-			modifier := sw.scanner.Next()
-
-			word, _, err := sw.processStopOn('}')
-			if err != nil {
-				return "", err
-			}
-
-			// Grab the current value of the variable in question so we
-			// can use to to determine what to do based on the modifier
-			newValue := sw.getEnv(name)
-
-			switch modifier {
-			case '+':
-				if newValue != "" {
-					newValue = word
-				}
-				return newValue, nil
-
-			case '-':
-				if newValue == "" {
-					newValue = word
-				}
-				return newValue, nil
-
-			default:
-				return "", fmt.Errorf("Unsupported modifier (%c) in substitution: %s", modifier, sw.word)
-			}
-		}
-		return "", fmt.Errorf("Missing ':' in substitution: %s", sw.word)
-	}
-	// $xxx case
-	name := sw.processName()
-	if name == "" {
-		return "$", nil
-	}
-	return sw.getEnv(name), nil
-}
-
-func (sw *shellWord) processName() string {
-	// Read in a name (alphanumeric or _)
-	// If it starts with a numeric then just return $#
-	var name string
-
-	for sw.scanner.Peek() != scanner.EOF {
-		ch := sw.scanner.Peek()
-		if len(name) == 0 && unicode.IsDigit(ch) {
-			ch = sw.scanner.Next()
-			return string(ch)
-		}
-		if !unicode.IsLetter(ch) && !unicode.IsDigit(ch) && ch != '_' {
-			break
-		}
-		ch = sw.scanner.Next()
-		name += string(ch)
-	}
-
-	return name
-}
-
-func (sw *shellWord) getEnv(name string) string {
-	if runtime.GOOS == "windows" {
-		// Case-insensitive environment variables on Windows
-		name = strings.ToUpper(name)
-	}
-	for _, env := range sw.envs {
-		i := strings.Index(env, "=")
-		if i < 0 {
-			if runtime.GOOS == "windows" {
-				env = strings.ToUpper(env)
-			}
-			if name == env {
-				// Should probably never get here, but just in case treat
-				// it like "var" and "var=" are the same
-				return ""
-			}
-			continue
-		}
-		compareName := env[:i]
-		if runtime.GOOS == "windows" {
-			compareName = strings.ToUpper(compareName)
-		}
-		if name != compareName {
-			continue
-		}
-		return env[i+1:]
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser_test.go
deleted file mode 100644
index 6cf691c077..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/shell_parser_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package dockerfile
-
-import (
-	"bufio"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestShellParser4EnvVars(t *testing.T) {
-	fn := "envVarTest"
-	lineCount := 0
-
-	file, err := os.Open(fn)
-	if err != nil {
-		t.Fatalf("Can't open '%s': %s", err, fn)
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	envs := []string{"PWD=/home", "SHELL=bash", "KOREAN=한국어"}
-	for scanner.Scan() {
-		line := scanner.Text()
-		lineCount++
-
-		// Trim comments and blank lines
-		i := strings.Index(line, "#")
-		if i >= 0 {
-			line = line[:i]
-		}
-		line = strings.TrimSpace(line)
-
-		if line == "" {
-			continue
-		}
-
-		words := strings.Split(line, "|")
-		if len(words) != 3 {
-			t.Fatalf("Error in '%s' - should be exactly one | in:%q", fn, line)
-		}
-
-		words[0] = strings.TrimSpace(words[0])
-		words[1] = strings.TrimSpace(words[1])
-		words[2] = strings.TrimSpace(words[2])
-
-		// Key W=Windows; A=All; U=Unix
-		if (words[0] != "W") && (words[0] != "A") && (words[0] != "U") {
-			t.Fatalf("Invalid tag %s at line %d of %s. Must be W, A or U", words[0], lineCount, fn)
-		}
-
-		if ((words[0] == "W" || words[0] == "A") && runtime.GOOS == "windows") ||
-			((words[0] == "U" || words[0] == "A") && runtime.GOOS != "windows") {
-			newWord, err := ProcessWord(words[1], envs, '\\')
-
-			if err != nil {
-				newWord = "error"
-			}
-
-			if newWord != words[2] {
-				t.Fatalf("Error. Src: %s  Calc: %s  Expected: %s at line %d", words[1], newWord, words[2], lineCount)
-			}
-		}
-	}
-}
-
-func TestShellParser4Words(t *testing.T) {
-	fn := "wordsTest"
-
-	file, err := os.Open(fn)
-	if err != nil {
-		t.Fatalf("Can't open '%s': %s", err, fn)
-	}
-	defer file.Close()
-
-	envs := []string{}
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-
-		if strings.HasPrefix(line, "#") {
-			continue
-		}
-
-		if strings.HasPrefix(line, "ENV ") {
-			line = strings.TrimLeft(line[3:], " ")
-			envs = append(envs, line)
-			continue
-		}
-
-		words := strings.Split(line, "|")
-		if len(words) != 2 {
-			t.Fatalf("Error in '%s' - should be exactly one | in: %q", fn, line)
-		}
-		test := strings.TrimSpace(words[0])
-		expected := strings.Split(strings.TrimLeft(words[1], " "), ",")
-
-		result, err := ProcessWords(test, envs, '\\')
-
-		if err != nil {
-			result = []string{"error"}
-		}
-
-		if len(result) != len(expected) {
-			t.Fatalf("Error. %q was suppose to result in %q, but got %q instead", test, expected, result)
-		}
-		for i, w := range expected {
-			if w != result[i] {
-				t.Fatalf("Error. %q was suppose to result in %q, but got %q instead", test, expected, result)
-			}
-		}
-	}
-}
-
-func TestGetEnv(t *testing.T) {
-	sw := &shellWord{
-		word: "",
-		envs: nil,
-		pos:  0,
-	}
-
-	sw.envs = []string{}
-	if sw.getEnv("foo") != "" {
-		t.Fatalf("2 - 'foo' should map to ''")
-	}
-
-	sw.envs = []string{"foo"}
-	if sw.getEnv("foo") != "" {
-		t.Fatalf("3 - 'foo' should map to ''")
-	}
-
-	sw.envs = []string{"foo="}
-	if sw.getEnv("foo") != "" {
-		t.Fatalf("4 - 'foo' should map to ''")
-	}
-
-	sw.envs = []string{"foo=bar"}
-	if sw.getEnv("foo") != "bar" {
-		t.Fatalf("5 - 'foo' should map to 'bar'")
-	}
-
-	sw.envs = []string{"foo=bar", "car=hat"}
-	if sw.getEnv("foo") != "bar" {
-		t.Fatalf("6 - 'foo' should map to 'bar'")
-	}
-	if sw.getEnv("car") != "hat" {
-		t.Fatalf("7 - 'car' should map to 'hat'")
-	}
-
-	// Make sure we grab the first 'car' in the list
-	sw.envs = []string{"foo=bar", "car=hat", "car=bike"}
-	if sw.getEnv("car") != "hat" {
-		t.Fatalf("8 - 'car' should map to 'hat'")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/support.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/support.go
deleted file mode 100644
index e87588910b..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/support.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package dockerfile
-
-import "strings"
-
-// handleJSONArgs parses command passed to CMD, ENTRYPOINT, RUN and SHELL instruction in Dockerfile
-// for exec form it returns untouched args slice
-// for shell form it returns concatenated args as the first element of a slice
-func handleJSONArgs(args []string, attributes map[string]bool) []string {
-	if len(args) == 0 {
-		return []string{}
-	}
-
-	if attributes != nil && attributes["json"] {
-		return args
-	}
-
-	// literal string command, not an exec array
-	return []string{strings.Join(args, " ")}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/support_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/support_test.go
deleted file mode 100644
index 7cc6fe9dcb..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/support_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package dockerfile
-
-import "testing"
-
-type testCase struct {
-	name       string
-	args       []string
-	attributes map[string]bool
-	expected   []string
-}
-
-func initTestCases() []testCase {
-	testCases := []testCase{}
-
-	testCases = append(testCases, testCase{
-		name:       "empty args",
-		args:       []string{},
-		attributes: make(map[string]bool),
-		expected:   []string{},
-	})
-
-	jsonAttributes := make(map[string]bool)
-	jsonAttributes["json"] = true
-
-	testCases = append(testCases, testCase{
-		name:       "json attribute with one element",
-		args:       []string{"foo"},
-		attributes: jsonAttributes,
-		expected:   []string{"foo"},
-	})
-
-	testCases = append(testCases, testCase{
-		name:       "json attribute with two elements",
-		args:       []string{"foo", "bar"},
-		attributes: jsonAttributes,
-		expected:   []string{"foo", "bar"},
-	})
-
-	testCases = append(testCases, testCase{
-		name:       "no attributes",
-		args:       []string{"foo", "bar"},
-		attributes: nil,
-		expected:   []string{"foo bar"},
-	})
-
-	return testCases
-}
-
-func TestHandleJSONArgs(t *testing.T) {
-	testCases := initTestCases()
-
-	for _, test := range testCases {
-		arguments := handleJSONArgs(test.args, test.attributes)
-
-		if len(arguments) != len(test.expected) {
-			t.Fatalf("In test \"%s\": length of returned slice is incorrect. Expected: %d, got: %d", test.name, len(test.expected), len(arguments))
-		}
-
-		for i := range test.expected {
-			if arguments[i] != test.expected[i] {
-				t.Fatalf("In test \"%s\": element as position %d is incorrect. Expected: %s, got: %s", test.name, i, test.expected[i], arguments[i])
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/utils_test.go b/installer/vendor/github.com/docker/docker/builder/dockerfile/utils_test.go
deleted file mode 100644
index 80a3f1babf..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/utils_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package dockerfile
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// createTestTempDir creates a temporary directory for testing.
-// It returns the created path and a cleanup function which is meant to be used as deferred call.
-// When an error occurs, it terminates the test.
-func createTestTempDir(t *testing.T, dir, prefix string) (string, func()) {
-	path, err := ioutil.TempDir(dir, prefix)
-
-	if err != nil {
-		t.Fatalf("Error when creating directory %s with prefix %s: %s", dir, prefix, err)
-	}
-
-	return path, func() {
-		err = os.RemoveAll(path)
-
-		if err != nil {
-			t.Fatalf("Error when removing directory %s: %s", path, err)
-		}
-	}
-}
-
-// createTestTempFile creates a temporary file within dir with specific contents and permissions.
-// When an error occurs, it terminates the test
-func createTestTempFile(t *testing.T, dir, filename, contents string, perm os.FileMode) string {
-	filePath := filepath.Join(dir, filename)
-	err := ioutil.WriteFile(filePath, []byte(contents), perm)
-
-	if err != nil {
-		t.Fatalf("Error when creating %s file: %s", filename, err)
-	}
-
-	return filePath
-}
-
-// createTestSymlink creates a symlink file within dir which points to oldname
-func createTestSymlink(t *testing.T, dir, filename, oldname string) string {
-	filePath := filepath.Join(dir, filename)
-	if err := os.Symlink(oldname, filePath); err != nil {
-		t.Fatalf("Error when creating %s symlink to %s: %s", filename, oldname, err)
-	}
-
-	return filePath
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerfile/wordsTest b/installer/vendor/github.com/docker/docker/builder/dockerfile/wordsTest
deleted file mode 100644
index fa916c67f9..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerfile/wordsTest
+++ /dev/null
@@ -1,25 +0,0 @@
-hello | hello
-hello${hi}bye | hellobye
-ENV hi=hi
-hello${hi}bye | hellohibye
-ENV space=abc  def
-hello${space}bye | helloabc,defbye
-hello"${space}"bye | helloabc  defbye
-hello "${space}"bye | hello,abc  defbye
-ENV leading=  ab c
-hello${leading}def | hello,ab,cdef
-hello"${leading}" def | hello  ab c,def
-hello"${leading}" | hello  ab c
-hello${leading} | hello,ab,c
-# next line MUST have 3 trailing spaces, don't erase them!
-ENV trailing=ab c   
-hello${trailing} | helloab,c
-hello${trailing}d | helloab,c,d
-hello"${trailing}"d | helloab c   d
-# next line MUST have 3 trailing spaces, don't erase them!
-hel"lo${trailing}" | helloab c   
-hello" there  " | hello there  
-hello there     | hello,there
-hello\ there | hello there
-hello" there | hello there
-hello\" there | hello",there
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerignore.go b/installer/vendor/github.com/docker/docker/builder/dockerignore.go
deleted file mode 100644
index 3da7913367..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerignore.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package builder
-
-import (
-	"os"
-
-	"github.com/docker/docker/builder/dockerignore"
-	"github.com/docker/docker/pkg/fileutils"
-)
-
-// DockerIgnoreContext wraps a ModifiableContext to add a method
-// for handling the .dockerignore file at the root of the context.
-type DockerIgnoreContext struct {
-	ModifiableContext
-}
-
-// Process reads the .dockerignore file at the root of the embedded context.
-// If .dockerignore does not exist in the context, then nil is returned.
-//
-// It can take a list of files to be removed after .dockerignore is removed.
-// This is used for server-side implementations of builders that need to send
-// the .dockerignore file as well as the special files specified in filesToRemove,
-// but expect them to be excluded from the context after they were processed.
-//
-// For example, server-side Dockerfile builders are expected to pass in the name
-// of the Dockerfile to be removed after it was parsed.
-//
-// TODO: Don't require a ModifiableContext (use Context instead) and don't remove
-// files, instead handle a list of files to be excluded from the context.
-func (c DockerIgnoreContext) Process(filesToRemove []string) error {
-	f, err := c.Open(".dockerignore")
-	// Note that a missing .dockerignore file isn't treated as an error
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	excludes, _ := dockerignore.ReadAll(f)
-	f.Close()
-	filesToRemove = append([]string{".dockerignore"}, filesToRemove...)
-	for _, fileToRemove := range filesToRemove {
-		rm, _ := fileutils.Matches(fileToRemove, excludes)
-		if rm {
-			c.Remove(fileToRemove)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore.go b/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore.go
deleted file mode 100644
index 2db67be799..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package dockerignore
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"path/filepath"
-	"strings"
-)
-
-// ReadAll reads a .dockerignore file and returns the list of file patterns
-// to ignore. Note this will trim whitespace from each line as well
-// as use GO's "clean" func to get the shortest/cleanest path for each.
-func ReadAll(reader io.Reader) ([]string, error) {
-	if reader == nil {
-		return nil, nil
-	}
-
-	scanner := bufio.NewScanner(reader)
-	var excludes []string
-	currentLine := 0
-
-	utf8bom := []byte{0xEF, 0xBB, 0xBF}
-	for scanner.Scan() {
-		scannedBytes := scanner.Bytes()
-		// We trim UTF8 BOM
-		if currentLine == 0 {
-			scannedBytes = bytes.TrimPrefix(scannedBytes, utf8bom)
-		}
-		pattern := string(scannedBytes)
-		currentLine++
-		// Lines starting with # (comments) are ignored before processing
-		if strings.HasPrefix(pattern, "#") {
-			continue
-		}
-		pattern = strings.TrimSpace(pattern)
-		if pattern == "" {
-			continue
-		}
-		pattern = filepath.Clean(pattern)
-		pattern = filepath.ToSlash(pattern)
-		excludes = append(excludes, pattern)
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, fmt.Errorf("Error reading .dockerignore: %v", err)
-	}
-	return excludes, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore_test.go b/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore_test.go
deleted file mode 100644
index 612a1399cd..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerignore/dockerignore_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package dockerignore
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestReadAll(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "dockerignore-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	di, err := ReadAll(nil)
-	if err != nil {
-		t.Fatalf("Expected not to have error, got %v", err)
-	}
-
-	if diLen := len(di); diLen != 0 {
-		t.Fatalf("Expected to have zero dockerignore entry, got %d", diLen)
-	}
-
-	diName := filepath.Join(tmpDir, ".dockerignore")
-	content := fmt.Sprintf("test1\n/test2\n/a/file/here\n\nlastfile")
-	err = ioutil.WriteFile(diName, []byte(content), 0777)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	diFd, err := os.Open(diName)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer diFd.Close()
-
-	di, err = ReadAll(diFd)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if di[0] != "test1" {
-		t.Fatalf("First element is not test1")
-	}
-	if di[1] != "/test2" {
-		t.Fatalf("Second element is not /test2")
-	}
-	if di[2] != "/a/file/here" {
-		t.Fatalf("Third element is not /a/file/here")
-	}
-	if di[3] != "lastfile" {
-		t.Fatalf("Fourth element is not lastfile")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/dockerignore_test.go b/installer/vendor/github.com/docker/docker/builder/dockerignore_test.go
deleted file mode 100644
index 3c0ceda4cf..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/dockerignore_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package builder
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"sort"
-	"testing"
-)
-
-const shouldStayFilename = "should_stay"
-
-func extractFilenames(files []os.FileInfo) []string {
-	filenames := make([]string, len(files), len(files))
-
-	for i, file := range files {
-		filenames[i] = file.Name()
-	}
-
-	return filenames
-}
-
-func checkDirectory(t *testing.T, dir string, expectedFiles []string) {
-	files, err := ioutil.ReadDir(dir)
-
-	if err != nil {
-		t.Fatalf("Could not read directory: %s", err)
-	}
-
-	if len(files) != len(expectedFiles) {
-		log.Fatalf("Directory should contain exactly %d file(s), got %d", len(expectedFiles), len(files))
-	}
-
-	filenames := extractFilenames(files)
-	sort.Strings(filenames)
-	sort.Strings(expectedFiles)
-
-	for i, filename := range filenames {
-		if filename != expectedFiles[i] {
-			t.Fatalf("File %s should be in the directory, got: %s", expectedFiles[i], filename)
-		}
-	}
-}
-
-func executeProcess(t *testing.T, contextDir string) {
-	modifiableCtx := &tarSumContext{root: contextDir}
-	ctx := DockerIgnoreContext{ModifiableContext: modifiableCtx}
-
-	err := ctx.Process([]string{DefaultDockerfileName})
-
-	if err != nil {
-		t.Fatalf("Error when executing Process: %s", err)
-	}
-}
-
-func TestProcessShouldRemoveDockerfileDockerignore(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, dockerignoreFilename, "Dockerfile\n.dockerignore", 0777)
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	executeProcess(t, contextDir)
-
-	checkDirectory(t, contextDir, []string{shouldStayFilename})
-
-}
-
-func TestProcessNoDockerignore(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	executeProcess(t, contextDir)
-
-	checkDirectory(t, contextDir, []string{shouldStayFilename, DefaultDockerfileName})
-
-}
-
-func TestProcessShouldLeaveAllFiles(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-dockerignore-process-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, shouldStayFilename, testfileContents, 0777)
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-	createTestTempFile(t, contextDir, dockerignoreFilename, "input1\ninput2", 0777)
-
-	executeProcess(t, contextDir)
-
-	checkDirectory(t, contextDir, []string{shouldStayFilename, DefaultDockerfileName, dockerignoreFilename})
-
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/git.go b/installer/vendor/github.com/docker/docker/builder/git.go
deleted file mode 100644
index 74df244611..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/git.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package builder
-
-import (
-	"os"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/gitutils"
-)
-
-// MakeGitContext returns a Context from gitURL that is cloned in a temporary directory.
-func MakeGitContext(gitURL string) (ModifiableContext, error) {
-	root, err := gitutils.Clone(gitURL)
-	if err != nil {
-		return nil, err
-	}
-
-	c, err := archive.Tar(root, archive.Uncompressed)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		// TODO: print errors?
-		c.Close()
-		os.RemoveAll(root)
-	}()
-	return MakeTarSumContext(c)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/remote.go b/installer/vendor/github.com/docker/docker/builder/remote.go
deleted file mode 100644
index f3a4329d16..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/remote.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package builder
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"regexp"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/httputils"
-	"github.com/docker/docker/pkg/urlutil"
-)
-
-// When downloading remote contexts, limit the amount (in bytes)
-// to be read from the response body in order to detect its Content-Type
-const maxPreambleLength = 100
-
-const acceptableRemoteMIME = `(?:application/(?:(?:x\-)?tar|octet\-stream|((?:x\-)?(?:gzip|bzip2?|xz)))|(?:text/plain))`
-
-var mimeRe = regexp.MustCompile(acceptableRemoteMIME)
-
-// MakeRemoteContext downloads a context from remoteURL and returns it.
-//
-// If contentTypeHandlers is non-nil, then the Content-Type header is read along with a maximum of
-// maxPreambleLength bytes from the body to help detecting the MIME type.
-// Look at acceptableRemoteMIME for more details.
-//
-// If a match is found, then the body is sent to the contentType handler and a (potentially compressed) tar stream is expected
-// to be returned. If no match is found, it is assumed the body is a tar stream (compressed or not).
-// In either case, an (assumed) tar stream is passed to MakeTarSumContext whose result is returned.
-func MakeRemoteContext(remoteURL string, contentTypeHandlers map[string]func(io.ReadCloser) (io.ReadCloser, error)) (ModifiableContext, error) {
-	f, err := httputils.Download(remoteURL)
-	if err != nil {
-		return nil, fmt.Errorf("error downloading remote context %s: %v", remoteURL, err)
-	}
-	defer f.Body.Close()
-
-	var contextReader io.ReadCloser
-	if contentTypeHandlers != nil {
-		contentType := f.Header.Get("Content-Type")
-		clen := f.ContentLength
-
-		contentType, contextReader, err = inspectResponse(contentType, f.Body, clen)
-		if err != nil {
-			return nil, fmt.Errorf("error detecting content type for remote %s: %v", remoteURL, err)
-		}
-		defer contextReader.Close()
-
-		// This loop tries to find a content-type handler for the detected content-type.
-		// If it could not find one from the caller-supplied map, it tries the empty content-type `""`
-		// which is interpreted as a fallback handler (usually used for raw tar contexts).
-		for _, ct := range []string{contentType, ""} {
-			if fn, ok := contentTypeHandlers[ct]; ok {
-				defer contextReader.Close()
-				if contextReader, err = fn(contextReader); err != nil {
-					return nil, err
-				}
-				break
-			}
-		}
-	}
-
-	// Pass through - this is a pre-packaged context, presumably
-	// with a Dockerfile with the right name inside it.
-	return MakeTarSumContext(contextReader)
-}
-
-// DetectContextFromRemoteURL returns a context and in certain cases the name of the dockerfile to be used
-// irrespective of user input.
-// progressReader is only used if remoteURL is actually a URL (not empty, and not a Git endpoint).
-func DetectContextFromRemoteURL(r io.ReadCloser, remoteURL string, createProgressReader func(in io.ReadCloser) io.ReadCloser) (context ModifiableContext, dockerfileName string, err error) {
-	switch {
-	case remoteURL == "":
-		context, err = MakeTarSumContext(r)
-	case urlutil.IsGitURL(remoteURL):
-		context, err = MakeGitContext(remoteURL)
-	case urlutil.IsURL(remoteURL):
-		context, err = MakeRemoteContext(remoteURL, map[string]func(io.ReadCloser) (io.ReadCloser, error){
-			httputils.MimeTypes.TextPlain: func(rc io.ReadCloser) (io.ReadCloser, error) {
-				dockerfile, err := ioutil.ReadAll(rc)
-				if err != nil {
-					return nil, err
-				}
-
-				// dockerfileName is set to signal that the remote was interpreted as a single Dockerfile, in which case the caller
-				// should use dockerfileName as the new name for the Dockerfile, irrespective of any other user input.
-				dockerfileName = DefaultDockerfileName
-
-				// TODO: return a context without tarsum
-				r, err := archive.Generate(dockerfileName, string(dockerfile))
-				if err != nil {
-					return nil, err
-				}
-
-				return ioutil.NopCloser(r), nil
-			},
-			// fallback handler (tar context)
-			"": func(rc io.ReadCloser) (io.ReadCloser, error) {
-				return createProgressReader(rc), nil
-			},
-		})
-	default:
-		err = fmt.Errorf("remoteURL (%s) could not be recognized as URL", remoteURL)
-	}
-	return
-}
-
-// inspectResponse looks into the http response data at r to determine whether its
-// content-type is on the list of acceptable content types for remote build contexts.
-// This function returns:
-//    - a string representation of the detected content-type
-//    - an io.Reader for the response body
-//    - an error value which will be non-nil either when something goes wrong while
-//      reading bytes from r or when the detected content-type is not acceptable.
-func inspectResponse(ct string, r io.ReadCloser, clen int64) (string, io.ReadCloser, error) {
-	plen := clen
-	if plen <= 0 || plen > maxPreambleLength {
-		plen = maxPreambleLength
-	}
-
-	preamble := make([]byte, plen, plen)
-	rlen, err := r.Read(preamble)
-	if rlen == 0 {
-		return ct, r, errors.New("empty response")
-	}
-	if err != nil && err != io.EOF {
-		return ct, r, err
-	}
-
-	preambleR := bytes.NewReader(preamble)
-	bodyReader := ioutil.NopCloser(io.MultiReader(preambleR, r))
-	// Some web servers will use application/octet-stream as the default
-	// content type for files without an extension (e.g. 'Dockerfile')
-	// so if we receive this value we better check for text content
-	contentType := ct
-	if len(ct) == 0 || ct == httputils.MimeTypes.OctetStream {
-		contentType, _, err = httputils.DetectContentType(preamble)
-		if err != nil {
-			return contentType, bodyReader, err
-		}
-	}
-
-	contentType = selectAcceptableMIME(contentType)
-	var cterr error
-	if len(contentType) == 0 {
-		cterr = fmt.Errorf("unsupported Content-Type %q", ct)
-		contentType = ct
-	}
-
-	return contentType, bodyReader, cterr
-}
-
-func selectAcceptableMIME(ct string) string {
-	return mimeRe.FindString(ct)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/remote_test.go b/installer/vendor/github.com/docker/docker/builder/remote_test.go
deleted file mode 100644
index 691a084761..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/remote_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package builder
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/httputils"
-)
-
-var binaryContext = []byte{0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00} //xz magic
-
-func TestSelectAcceptableMIME(t *testing.T) {
-	validMimeStrings := []string{
-		"application/x-bzip2",
-		"application/bzip2",
-		"application/gzip",
-		"application/x-gzip",
-		"application/x-xz",
-		"application/xz",
-		"application/tar",
-		"application/x-tar",
-		"application/octet-stream",
-		"text/plain",
-	}
-
-	invalidMimeStrings := []string{
-		"",
-		"application/octet",
-		"application/json",
-	}
-
-	for _, m := range invalidMimeStrings {
-		if len(selectAcceptableMIME(m)) > 0 {
-			t.Fatalf("Should not have accepted %q", m)
-		}
-	}
-
-	for _, m := range validMimeStrings {
-		if str := selectAcceptableMIME(m); str == "" {
-			t.Fatalf("Should have accepted %q", m)
-		}
-	}
-}
-
-func TestInspectEmptyResponse(t *testing.T) {
-	ct := "application/octet-stream"
-	br := ioutil.NopCloser(bytes.NewReader([]byte("")))
-	contentType, bReader, err := inspectResponse(ct, br, 0)
-	if err == nil {
-		t.Fatalf("Should have generated an error for an empty response")
-	}
-	if contentType != "application/octet-stream" {
-		t.Fatalf("Content type should be 'application/octet-stream' but is %q", contentType)
-	}
-	body, err := ioutil.ReadAll(bReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(body) != 0 {
-		t.Fatal("response body should remain empty")
-	}
-}
-
-func TestInspectResponseBinary(t *testing.T) {
-	ct := "application/octet-stream"
-	br := ioutil.NopCloser(bytes.NewReader(binaryContext))
-	contentType, bReader, err := inspectResponse(ct, br, int64(len(binaryContext)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if contentType != "application/octet-stream" {
-		t.Fatalf("Content type should be 'application/octet-stream' but is %q", contentType)
-	}
-	body, err := ioutil.ReadAll(bReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(body) != len(binaryContext) {
-		t.Fatalf("Wrong response size %d, should be == len(binaryContext)", len(body))
-	}
-	for i := range body {
-		if body[i] != binaryContext[i] {
-			t.Fatalf("Corrupted response body at byte index %d", i)
-		}
-	}
-}
-
-func TestResponseUnsupportedContentType(t *testing.T) {
-	content := []byte(dockerfileContents)
-	ct := "application/json"
-	br := ioutil.NopCloser(bytes.NewReader(content))
-	contentType, bReader, err := inspectResponse(ct, br, int64(len(dockerfileContents)))
-
-	if err == nil {
-		t.Fatal("Should have returned an error on content-type 'application/json'")
-	}
-	if contentType != ct {
-		t.Fatalf("Should not have altered content-type: orig: %s, altered: %s", ct, contentType)
-	}
-	body, err := ioutil.ReadAll(bReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(body) != dockerfileContents {
-		t.Fatalf("Corrupted response body %s", body)
-	}
-}
-
-func TestInspectResponseTextSimple(t *testing.T) {
-	content := []byte(dockerfileContents)
-	ct := "text/plain"
-	br := ioutil.NopCloser(bytes.NewReader(content))
-	contentType, bReader, err := inspectResponse(ct, br, int64(len(content)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if contentType != "text/plain" {
-		t.Fatalf("Content type should be 'text/plain' but is %q", contentType)
-	}
-	body, err := ioutil.ReadAll(bReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(body) != dockerfileContents {
-		t.Fatalf("Corrupted response body %s", body)
-	}
-}
-
-func TestInspectResponseEmptyContentType(t *testing.T) {
-	content := []byte(dockerfileContents)
-	br := ioutil.NopCloser(bytes.NewReader(content))
-	contentType, bodyReader, err := inspectResponse("", br, int64(len(content)))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if contentType != "text/plain" {
-		t.Fatalf("Content type should be 'text/plain' but is %q", contentType)
-	}
-	body, err := ioutil.ReadAll(bodyReader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(body) != dockerfileContents {
-		t.Fatalf("Corrupted response body %s", body)
-	}
-}
-
-func TestMakeRemoteContext(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, DefaultDockerfileName, dockerfileContents, 0777)
-
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-	serverURL, _ := url.Parse(server.URL)
-
-	serverURL.Path = "/" + DefaultDockerfileName
-	remoteURL := serverURL.String()
-
-	mux.Handle("/", http.FileServer(http.Dir(contextDir)))
-
-	remoteContext, err := MakeRemoteContext(remoteURL, map[string]func(io.ReadCloser) (io.ReadCloser, error){
-		httputils.MimeTypes.TextPlain: func(rc io.ReadCloser) (io.ReadCloser, error) {
-			dockerfile, err := ioutil.ReadAll(rc)
-			if err != nil {
-				return nil, err
-			}
-
-			r, err := archive.Generate(DefaultDockerfileName, string(dockerfile))
-			if err != nil {
-				return nil, err
-			}
-			return ioutil.NopCloser(r), nil
-		},
-	})
-
-	if err != nil {
-		t.Fatalf("Error when executing DetectContextFromRemoteURL: %s", err)
-	}
-
-	if remoteContext == nil {
-		t.Fatalf("Remote context should not be nil")
-	}
-
-	tarSumCtx, ok := remoteContext.(*tarSumContext)
-
-	if !ok {
-		t.Fatalf("Cast error, remote context should be casted to tarSumContext")
-	}
-
-	fileInfoSums := tarSumCtx.sums
-
-	if fileInfoSums.Len() != 1 {
-		t.Fatalf("Size of file info sums should be 1, got: %d", fileInfoSums.Len())
-	}
-
-	fileInfo := fileInfoSums.GetFile(DefaultDockerfileName)
-
-	if fileInfo == nil {
-		t.Fatalf("There should be file named %s in fileInfoSums", DefaultDockerfileName)
-	}
-
-	if fileInfo.Pos() != 0 {
-		t.Fatalf("File %s should have position 0, got %d", DefaultDockerfileName, fileInfo.Pos())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/tarsum.go b/installer/vendor/github.com/docker/docker/builder/tarsum.go
deleted file mode 100644
index 35054dcba1..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/tarsum.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package builder
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/pkg/tarsum"
-)
-
-type tarSumContext struct {
-	root string
-	sums tarsum.FileInfoSums
-}
-
-func (c *tarSumContext) Close() error {
-	return os.RemoveAll(c.root)
-}
-
-func convertPathError(err error, cleanpath string) error {
-	if err, ok := err.(*os.PathError); ok {
-		err.Path = cleanpath
-		return err
-	}
-	return err
-}
-
-func (c *tarSumContext) Open(path string) (io.ReadCloser, error) {
-	cleanpath, fullpath, err := c.normalize(path)
-	if err != nil {
-		return nil, err
-	}
-	r, err := os.Open(fullpath)
-	if err != nil {
-		return nil, convertPathError(err, cleanpath)
-	}
-	return r, nil
-}
-
-func (c *tarSumContext) Stat(path string) (string, FileInfo, error) {
-	cleanpath, fullpath, err := c.normalize(path)
-	if err != nil {
-		return "", nil, err
-	}
-
-	st, err := os.Lstat(fullpath)
-	if err != nil {
-		return "", nil, convertPathError(err, cleanpath)
-	}
-
-	rel, err := filepath.Rel(c.root, fullpath)
-	if err != nil {
-		return "", nil, convertPathError(err, cleanpath)
-	}
-
-	// We set sum to path by default for the case where GetFile returns nil.
-	// The usual case is if relative path is empty.
-	sum := path
-	// Use the checksum of the followed path(not the possible symlink) because
-	// this is the file that is actually copied.
-	if tsInfo := c.sums.GetFile(filepath.ToSlash(rel)); tsInfo != nil {
-		sum = tsInfo.Sum()
-	}
-	fi := &HashedFileInfo{PathFileInfo{st, fullpath, filepath.Base(cleanpath)}, sum}
-	return rel, fi, nil
-}
-
-// MakeTarSumContext returns a build Context from a tar stream.
-//
-// It extracts the tar stream to a temporary folder that is deleted as soon as
-// the Context is closed.
-// As the extraction happens, a tarsum is calculated for every file, and the set of
-// all those sums then becomes the source of truth for all operations on this Context.
-//
-// Closing tarStream has to be done by the caller.
-func MakeTarSumContext(tarStream io.Reader) (ModifiableContext, error) {
-	root, err := ioutils.TempDir("", "docker-builder")
-	if err != nil {
-		return nil, err
-	}
-
-	tsc := &tarSumContext{root: root}
-
-	// Make sure we clean-up upon error.  In the happy case the caller
-	// is expected to manage the clean-up
-	defer func() {
-		if err != nil {
-			tsc.Close()
-		}
-	}()
-
-	decompressedStream, err := archive.DecompressStream(tarStream)
-	if err != nil {
-		return nil, err
-	}
-
-	sum, err := tarsum.NewTarSum(decompressedStream, true, tarsum.Version1)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := chrootarchive.Untar(sum, root, nil); err != nil {
-		return nil, err
-	}
-
-	tsc.sums = sum.GetSums()
-
-	return tsc, nil
-}
-
-func (c *tarSumContext) normalize(path string) (cleanpath, fullpath string, err error) {
-	cleanpath = filepath.Clean(string(os.PathSeparator) + path)[1:]
-	fullpath, err = symlink.FollowSymlinkInScope(filepath.Join(c.root, path), c.root)
-	if err != nil {
-		return "", "", fmt.Errorf("Forbidden path outside the build context: %s (%s)", path, fullpath)
-	}
-	_, err = os.Lstat(fullpath)
-	if err != nil {
-		return "", "", convertPathError(err, path)
-	}
-	return
-}
-
-func (c *tarSumContext) Walk(root string, walkFn WalkFunc) error {
-	root = filepath.Join(c.root, filepath.Join(string(filepath.Separator), root))
-	return filepath.Walk(root, func(fullpath string, info os.FileInfo, err error) error {
-		rel, err := filepath.Rel(c.root, fullpath)
-		if err != nil {
-			return err
-		}
-		if rel == "." {
-			return nil
-		}
-
-		sum := rel
-		if tsInfo := c.sums.GetFile(filepath.ToSlash(rel)); tsInfo != nil {
-			sum = tsInfo.Sum()
-		}
-		fi := &HashedFileInfo{PathFileInfo{FileInfo: info, FilePath: fullpath}, sum}
-		if err := walkFn(rel, fi, nil); err != nil {
-			return err
-		}
-		return nil
-	})
-}
-
-func (c *tarSumContext) Remove(path string) error {
-	_, fullpath, err := c.normalize(path)
-	if err != nil {
-		return err
-	}
-	return os.RemoveAll(fullpath)
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/tarsum_test.go b/installer/vendor/github.com/docker/docker/builder/tarsum_test.go
deleted file mode 100644
index 278e5830de..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/tarsum_test.go
+++ /dev/null
@@ -1,265 +0,0 @@
-package builder
-
-import (
-	"bufio"
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-)
-
-const (
-	filename = "test"
-	contents = "contents test"
-)
-
-func init() {
-	reexec.Init()
-}
-
-func TestCloseRootDirectory(t *testing.T) {
-	contextDir, err := ioutil.TempDir("", "builder-tarsum-test")
-
-	if err != nil {
-		t.Fatalf("Error with creating temporary directory: %s", err)
-	}
-
-	tarsum := &tarSumContext{root: contextDir}
-
-	err = tarsum.Close()
-
-	if err != nil {
-		t.Fatalf("Error while executing Close: %s", err)
-	}
-
-	_, err = os.Stat(contextDir)
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("Directory should not exist at this point")
-		defer os.RemoveAll(contextDir)
-	}
-}
-
-func TestOpenFile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, filename, contents, 0777)
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	file, err := tarSum.Open(filename)
-
-	if err != nil {
-		t.Fatalf("Error when executing Open: %s", err)
-	}
-
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	buff := bytes.NewBufferString("")
-
-	for scanner.Scan() {
-		buff.WriteString(scanner.Text())
-	}
-
-	if contents != buff.String() {
-		t.Fatalf("Contents are not equal. Expected: %s, got: %s", contents, buff.String())
-	}
-
-}
-
-func TestOpenNotExisting(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	file, err := tarSum.Open("not-existing")
-
-	if file != nil {
-		t.Fatal("Opened file should be nil")
-	}
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("Error when executing Open: %s", err)
-	}
-}
-
-func TestStatFile(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	testFilename := createTestTempFile(t, contextDir, filename, contents, 0777)
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	relPath, fileInfo, err := tarSum.Stat(filename)
-
-	if err != nil {
-		t.Fatalf("Error when executing Stat: %s", err)
-	}
-
-	if relPath != filename {
-		t.Fatalf("Relative path should be equal to %s, got %s", filename, relPath)
-	}
-
-	if fileInfo.Path() != testFilename {
-		t.Fatalf("Full path should be equal to %s, got %s", testFilename, fileInfo.Path())
-	}
-}
-
-func TestStatSubdir(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
-
-	testFilename := createTestTempFile(t, contextSubdir, filename, contents, 0777)
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	relativePath, err := filepath.Rel(contextDir, testFilename)
-
-	if err != nil {
-		t.Fatalf("Error when getting relative path: %s", err)
-	}
-
-	relPath, fileInfo, err := tarSum.Stat(relativePath)
-
-	if err != nil {
-		t.Fatalf("Error when executing Stat: %s", err)
-	}
-
-	if relPath != relativePath {
-		t.Fatalf("Relative path should be equal to %s, got %s", relativePath, relPath)
-	}
-
-	if fileInfo.Path() != testFilename {
-		t.Fatalf("Full path should be equal to %s, got %s", testFilename, fileInfo.Path())
-	}
-}
-
-func TestStatNotExisting(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	relPath, fileInfo, err := tarSum.Stat("not-existing")
-
-	if relPath != "" {
-		t.Fatal("Relative path should be nil")
-	}
-
-	if fileInfo != nil {
-		t.Fatalf("File info should be nil")
-	}
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("This file should not exist: %s", err)
-	}
-}
-
-func TestRemoveDirectory(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
-
-	relativePath, err := filepath.Rel(contextDir, contextSubdir)
-
-	if err != nil {
-		t.Fatalf("Error when getting relative path: %s", err)
-	}
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	err = tarSum.Remove(relativePath)
-
-	if err != nil {
-		t.Fatalf("Error when executing Remove: %s", err)
-	}
-
-	_, err = os.Stat(contextSubdir)
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("Directory should not exist at this point")
-	}
-}
-
-func TestMakeTarSumContext(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	createTestTempFile(t, contextDir, filename, contents, 0777)
-
-	tarStream, err := archive.Tar(contextDir, archive.Uncompressed)
-
-	if err != nil {
-		t.Fatalf("error: %s", err)
-	}
-
-	defer tarStream.Close()
-
-	tarSum, err := MakeTarSumContext(tarStream)
-
-	if err != nil {
-		t.Fatalf("Error when executing MakeTarSumContext: %s", err)
-	}
-
-	if tarSum == nil {
-		t.Fatalf("Tar sum context should not be nil")
-	}
-}
-
-func TestWalkWithoutError(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
-
-	createTestTempFile(t, contextSubdir, filename, contents, 0777)
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	walkFun := func(path string, fi FileInfo, err error) error {
-		return nil
-	}
-
-	err := tarSum.Walk(contextSubdir, walkFun)
-
-	if err != nil {
-		t.Fatalf("Error when executing Walk: %s", err)
-	}
-}
-
-type WalkError struct {
-}
-
-func (we WalkError) Error() string {
-	return "Error when executing Walk"
-}
-
-func TestWalkWithError(t *testing.T) {
-	contextDir, cleanup := createTestTempDir(t, "", "builder-tarsum-test")
-	defer cleanup()
-
-	contextSubdir := createTestTempSubdir(t, contextDir, "builder-tarsum-test-subdir")
-
-	tarSum := &tarSumContext{root: contextDir}
-
-	walkFun := func(path string, fi FileInfo, err error) error {
-		return WalkError{}
-	}
-
-	err := tarSum.Walk(contextSubdir, walkFun)
-
-	if err == nil {
-		t.Fatalf("Error should not be nil")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/builder/utils_test.go b/installer/vendor/github.com/docker/docker/builder/utils_test.go
deleted file mode 100644
index 1101ff1d1d..0000000000
--- a/installer/vendor/github.com/docker/docker/builder/utils_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package builder
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-const (
-	dockerfileContents   = "FROM busybox"
-	dockerignoreFilename = ".dockerignore"
-	testfileContents     = "test"
-)
-
-// createTestTempDir creates a temporary directory for testing.
-// It returns the created path and a cleanup function which is meant to be used as deferred call.
-// When an error occurs, it terminates the test.
-func createTestTempDir(t *testing.T, dir, prefix string) (string, func()) {
-	path, err := ioutil.TempDir(dir, prefix)
-
-	if err != nil {
-		t.Fatalf("Error when creating directory %s with prefix %s: %s", dir, prefix, err)
-	}
-
-	return path, func() {
-		err = os.RemoveAll(path)
-
-		if err != nil {
-			t.Fatalf("Error when removing directory %s: %s", path, err)
-		}
-	}
-}
-
-// createTestTempSubdir creates a temporary directory for testing.
-// It returns the created path but doesn't provide a cleanup function,
-// so createTestTempSubdir should be used only for creating temporary subdirectories
-// whose parent directories are properly cleaned up.
-// When an error occurs, it terminates the test.
-func createTestTempSubdir(t *testing.T, dir, prefix string) string {
-	path, err := ioutil.TempDir(dir, prefix)
-
-	if err != nil {
-		t.Fatalf("Error when creating directory %s with prefix %s: %s", dir, prefix, err)
-	}
-
-	return path
-}
-
-// createTestTempFile creates a temporary file within dir with specific contents and permissions.
-// When an error occurs, it terminates the test
-func createTestTempFile(t *testing.T, dir, filename, contents string, perm os.FileMode) string {
-	filePath := filepath.Join(dir, filename)
-	err := ioutil.WriteFile(filePath, []byte(contents), perm)
-
-	if err != nil {
-		t.Fatalf("Error when creating %s file: %s", filename, err)
-	}
-
-	return filePath
-}
-
-// chdir changes current working directory to dir.
-// It returns a function which changes working directory back to the previous one.
-// This function is meant to be executed as a deferred call.
-// When an error occurs, it terminates the test.
-func chdir(t *testing.T, dir string) func() {
-	workingDirectory, err := os.Getwd()
-
-	if err != nil {
-		t.Fatalf("Error when retrieving working directory: %s", err)
-	}
-
-	err = os.Chdir(dir)
-
-	if err != nil {
-		t.Fatalf("Error when changing directory to %s: %s", dir, err)
-	}
-
-	return func() {
-		err = os.Chdir(workingDirectory)
-
-		if err != nil {
-			t.Fatalf("Error when changing back to working directory (%s): %s", workingDirectory, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/cobra.go b/installer/vendor/github.com/docker/docker/cli/cobra.go
deleted file mode 100644
index 139845cb1b..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/cobra.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-// SetupRootCommand sets default usage, help, and error handling for the
-// root command.
-func SetupRootCommand(rootCmd *cobra.Command) {
-	cobra.AddTemplateFunc("hasSubCommands", hasSubCommands)
-	cobra.AddTemplateFunc("hasManagementSubCommands", hasManagementSubCommands)
-	cobra.AddTemplateFunc("operationSubCommands", operationSubCommands)
-	cobra.AddTemplateFunc("managementSubCommands", managementSubCommands)
-
-	rootCmd.SetUsageTemplate(usageTemplate)
-	rootCmd.SetHelpTemplate(helpTemplate)
-	rootCmd.SetFlagErrorFunc(FlagErrorFunc)
-	rootCmd.SetHelpCommand(helpCommand)
-
-	rootCmd.PersistentFlags().BoolP("help", "h", false, "Print usage")
-	rootCmd.PersistentFlags().MarkShorthandDeprecated("help", "please use --help")
-}
-
-// FlagErrorFunc prints an error message which matches the format of the
-// docker/docker/cli error messages
-func FlagErrorFunc(cmd *cobra.Command, err error) error {
-	if err == nil {
-		return err
-	}
-
-	usage := ""
-	if cmd.HasSubCommands() {
-		usage = "\n\n" + cmd.UsageString()
-	}
-	return StatusError{
-		Status:     fmt.Sprintf("%s\nSee '%s --help'.%s", err, cmd.CommandPath(), usage),
-		StatusCode: 125,
-	}
-}
-
-var helpCommand = &cobra.Command{
-	Use:               "help [command]",
-	Short:             "Help about the command",
-	PersistentPreRun:  func(cmd *cobra.Command, args []string) {},
-	PersistentPostRun: func(cmd *cobra.Command, args []string) {},
-	RunE: func(c *cobra.Command, args []string) error {
-		cmd, args, e := c.Root().Find(args)
-		if cmd == nil || e != nil || len(args) > 0 {
-			return fmt.Errorf("unknown help topic: %v", strings.Join(args, " "))
-		}
-
-		helpFunc := cmd.HelpFunc()
-		helpFunc(cmd, args)
-		return nil
-	},
-}
-
-func hasSubCommands(cmd *cobra.Command) bool {
-	return len(operationSubCommands(cmd)) > 0
-}
-
-func hasManagementSubCommands(cmd *cobra.Command) bool {
-	return len(managementSubCommands(cmd)) > 0
-}
-
-func operationSubCommands(cmd *cobra.Command) []*cobra.Command {
-	cmds := []*cobra.Command{}
-	for _, sub := range cmd.Commands() {
-		if sub.IsAvailableCommand() && !sub.HasSubCommands() {
-			cmds = append(cmds, sub)
-		}
-	}
-	return cmds
-}
-
-func managementSubCommands(cmd *cobra.Command) []*cobra.Command {
-	cmds := []*cobra.Command{}
-	for _, sub := range cmd.Commands() {
-		if sub.IsAvailableCommand() && sub.HasSubCommands() {
-			cmds = append(cmds, sub)
-		}
-	}
-	return cmds
-}
-
-var usageTemplate = `Usage:
-
-{{- if not .HasSubCommands}}	{{.UseLine}}{{end}}
-{{- if .HasSubCommands}}	{{ .CommandPath}} COMMAND{{end}}
-
-{{ .Short | trim }}
-
-{{- if gt .Aliases 0}}
-
-Aliases:
-  {{.NameAndAliases}}
-
-{{- end}}
-{{- if .HasExample}}
-
-Examples:
-{{ .Example }}
-
-{{- end}}
-{{- if .HasFlags}}
-
-Options:
-{{.Flags.FlagUsages | trimRightSpace}}
-
-{{- end}}
-{{- if hasManagementSubCommands . }}
-
-Management Commands:
-
-{{- range managementSubCommands . }}
-  {{rpad .Name .NamePadding }} {{.Short}}
-{{- end}}
-
-{{- end}}
-{{- if hasSubCommands .}}
-
-Commands:
-
-{{- range operationSubCommands . }}
-  {{rpad .Name .NamePadding }} {{.Short}}
-{{- end}}
-{{- end}}
-
-{{- if .HasSubCommands }}
-
-Run '{{.CommandPath}} COMMAND --help' for more information on a command.
-{{- end}}
-`
-
-var helpTemplate = `
-{{if or .Runnable .HasSubCommands}}{{.UsageString}}{{end}}`
diff --git a/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile.go b/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile.go
deleted file mode 100644
index 7fd1e4f6c4..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package bundlefile
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-)
-
-// Bundlefile stores the contents of a bundlefile
-type Bundlefile struct {
-	Version  string
-	Services map[string]Service
-}
-
-// Service is a service from a bundlefile
-type Service struct {
-	Image      string
-	Command    []string          `json:",omitempty"`
-	Args       []string          `json:",omitempty"`
-	Env        []string          `json:",omitempty"`
-	Labels     map[string]string `json:",omitempty"`
-	Ports      []Port            `json:",omitempty"`
-	WorkingDir *string           `json:",omitempty"`
-	User       *string           `json:",omitempty"`
-	Networks   []string          `json:",omitempty"`
-}
-
-// Port is a port as defined in a bundlefile
-type Port struct {
-	Protocol string
-	Port     uint32
-}
-
-// LoadFile loads a bundlefile from a path to the file
-func LoadFile(reader io.Reader) (*Bundlefile, error) {
-	bundlefile := &Bundlefile{}
-
-	decoder := json.NewDecoder(reader)
-	if err := decoder.Decode(bundlefile); err != nil {
-		switch jsonErr := err.(type) {
-		case *json.SyntaxError:
-			return nil, fmt.Errorf(
-				"JSON syntax error at byte %v: %s",
-				jsonErr.Offset,
-				jsonErr.Error())
-		case *json.UnmarshalTypeError:
-			return nil, fmt.Errorf(
-				"Unexpected type at byte %v. Expected %s but received %s.",
-				jsonErr.Offset,
-				jsonErr.Type,
-				jsonErr.Value)
-		}
-		return nil, err
-	}
-
-	return bundlefile, nil
-}
-
-// Print writes the contents of the bundlefile to the output writer
-// as human readable json
-func Print(out io.Writer, bundle *Bundlefile) error {
-	bytes, err := json.MarshalIndent(*bundle, "", "    ")
-	if err != nil {
-		return err
-	}
-
-	_, err = out.Write(bytes)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile_test.go b/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile_test.go
deleted file mode 100644
index c343410df3..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/bundlefile/bundlefile_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package bundlefile
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestLoadFileV01Success(t *testing.T) {
-	reader := strings.NewReader(`{
-		"Version": "0.1",
-		"Services": {
-			"redis": {
-				"Image": "redis@sha256:4b24131101fa0117bcaa18ac37055fffd9176aa1a240392bb8ea85e0be50f2ce",
-				"Networks": ["default"]
-			},
-			"web": {
-				"Image": "dockercloud/hello-world@sha256:fe79a2cfbd17eefc344fb8419420808df95a1e22d93b7f621a7399fd1e9dca1d",
-				"Networks": ["default"],
-				"User": "web"
-			}
-		}
-	}`)
-
-	bundle, err := LoadFile(reader)
-	assert.NilError(t, err)
-	assert.Equal(t, bundle.Version, "0.1")
-	assert.Equal(t, len(bundle.Services), 2)
-}
-
-func TestLoadFileSyntaxError(t *testing.T) {
-	reader := strings.NewReader(`{
-		"Version": "0.1",
-		"Services": unquoted string
-	}`)
-
-	_, err := LoadFile(reader)
-	assert.Error(t, err, "syntax error at byte 37: invalid character 'u'")
-}
-
-func TestLoadFileTypeError(t *testing.T) {
-	reader := strings.NewReader(`{
-		"Version": "0.1",
-		"Services": {
-			"web": {
-				"Image": "redis",
-				"Networks": "none"
-			}
-		}
-	}`)
-
-	_, err := LoadFile(reader)
-	assert.Error(t, err, "Unexpected type at byte 94. Expected []string but received string")
-}
-
-func TestPrint(t *testing.T) {
-	var buffer bytes.Buffer
-	bundle := &Bundlefile{
-		Version: "0.1",
-		Services: map[string]Service{
-			"web": {
-				Image:   "image",
-				Command: []string{"echo", "something"},
-			},
-		},
-	}
-	assert.NilError(t, Print(&buffer, bundle))
-	output := buffer.String()
-	assert.Contains(t, output, "\"Image\": \"image\"")
-	assert.Contains(t, output,
-		`"Command": [
-                "echo",
-                "something"
-            ]`)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/checkpoint/cmd.go
deleted file mode 100644
index d5705a4dad..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/cmd.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package checkpoint
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-// NewCheckpointCommand returns the `checkpoint` subcommand (only in experimental)
-func NewCheckpointCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "checkpoint",
-		Short: "Manage checkpoints",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-		Tags:  map[string]string{"experimental": "", "version": "1.25"},
-	}
-	cmd.AddCommand(
-		newCreateCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/create.go b/installer/vendor/github.com/docker/docker/cli/command/checkpoint/create.go
deleted file mode 100644
index 473a941733..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/create.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package checkpoint
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type createOptions struct {
-	container     string
-	checkpoint    string
-	checkpointDir string
-	leaveRunning  bool
-}
-
-func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts createOptions
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] CONTAINER CHECKPOINT",
-		Short: "Create a checkpoint from a running container",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			opts.checkpoint = args[1]
-			return runCreate(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVar(&opts.leaveRunning, "leave-running", false, "Leave the container running after checkpoint")
-	flags.StringVarP(&opts.checkpointDir, "checkpoint-dir", "", "", "Use a custom checkpoint storage directory")
-
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
-	client := dockerCli.Client()
-
-	checkpointOpts := types.CheckpointCreateOptions{
-		CheckpointID:  opts.checkpoint,
-		CheckpointDir: opts.checkpointDir,
-		Exit:          !opts.leaveRunning,
-	}
-
-	err := client.CheckpointCreate(context.Background(), opts.container, checkpointOpts)
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "%s\n", opts.checkpoint)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/list.go b/installer/vendor/github.com/docker/docker/cli/command/checkpoint/list.go
deleted file mode 100644
index daf8349993..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/list.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package checkpoint
-
-import (
-	"fmt"
-	"text/tabwriter"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type listOptions struct {
-	checkpointDir string
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts listOptions
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS] CONTAINER",
-		Aliases: []string{"list"},
-		Short:   "List checkpoints for a container",
-		Args:    cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, args[0], opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.checkpointDir, "checkpoint-dir", "", "", "Use a custom checkpoint storage directory")
-
-	return cmd
-
-}
-
-func runList(dockerCli *command.DockerCli, container string, opts listOptions) error {
-	client := dockerCli.Client()
-
-	listOpts := types.CheckpointListOptions{
-		CheckpointDir: opts.checkpointDir,
-	}
-
-	checkpoints, err := client.CheckpointList(context.Background(), container, listOpts)
-	if err != nil {
-		return err
-	}
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-	fmt.Fprintf(w, "CHECKPOINT NAME")
-	fmt.Fprintf(w, "\n")
-
-	for _, checkpoint := range checkpoints {
-		fmt.Fprintf(w, "%s\t", checkpoint.Name)
-		fmt.Fprint(w, "\n")
-	}
-
-	w.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/remove.go b/installer/vendor/github.com/docker/docker/cli/command/checkpoint/remove.go
deleted file mode 100644
index ec39fa7b55..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/checkpoint/remove.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package checkpoint
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type removeOptions struct {
-	checkpointDir string
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts removeOptions
-
-	cmd := &cobra.Command{
-		Use:     "rm [OPTIONS] CONTAINER CHECKPOINT",
-		Aliases: []string{"remove"},
-		Short:   "Remove a checkpoint",
-		Args:    cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runRemove(dockerCli, args[0], args[1], opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.checkpointDir, "checkpoint-dir", "", "", "Use a custom checkpoint storage directory")
-
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, container string, checkpoint string, opts removeOptions) error {
-	client := dockerCli.Client()
-
-	removeOpts := types.CheckpointDeleteOptions{
-		CheckpointID:  checkpoint,
-		CheckpointDir: opts.checkpointDir,
-	}
-
-	return client.CheckpointDelete(context.Background(), container, removeOpts)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/cli.go b/installer/vendor/github.com/docker/docker/cli/command/cli.go
deleted file mode 100644
index 6d1dd7472e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/cli.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package command
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/cliconfig/configfile"
-	"github.com/docker/docker/cliconfig/credentials"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/dockerversion"
-	dopts "github.com/docker/docker/opts"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-// Streams is an interface which exposes the standard input and output streams
-type Streams interface {
-	In() *InStream
-	Out() *OutStream
-	Err() io.Writer
-}
-
-// DockerCli represents the docker command line client.
-// Instances of the client can be returned from NewDockerCli.
-type DockerCli struct {
-	configFile      *configfile.ConfigFile
-	in              *InStream
-	out             *OutStream
-	err             io.Writer
-	keyFile         string
-	client          client.APIClient
-	hasExperimental bool
-	defaultVersion  string
-}
-
-// HasExperimental returns true if experimental features are accessible.
-func (cli *DockerCli) HasExperimental() bool {
-	return cli.hasExperimental
-}
-
-// DefaultVersion returns api.defaultVersion of DOCKER_API_VERSION if specified.
-func (cli *DockerCli) DefaultVersion() string {
-	return cli.defaultVersion
-}
-
-// Client returns the APIClient
-func (cli *DockerCli) Client() client.APIClient {
-	return cli.client
-}
-
-// Out returns the writer used for stdout
-func (cli *DockerCli) Out() *OutStream {
-	return cli.out
-}
-
-// Err returns the writer used for stderr
-func (cli *DockerCli) Err() io.Writer {
-	return cli.err
-}
-
-// In returns the reader used for stdin
-func (cli *DockerCli) In() *InStream {
-	return cli.in
-}
-
-// ShowHelp shows the command help.
-func (cli *DockerCli) ShowHelp(cmd *cobra.Command, args []string) error {
-	cmd.SetOutput(cli.err)
-	cmd.HelpFunc()(cmd, args)
-	return nil
-}
-
-// ConfigFile returns the ConfigFile
-func (cli *DockerCli) ConfigFile() *configfile.ConfigFile {
-	return cli.configFile
-}
-
-// GetAllCredentials returns all of the credentials stored in all of the
-// configured credential stores.
-func (cli *DockerCli) GetAllCredentials() (map[string]types.AuthConfig, error) {
-	auths := make(map[string]types.AuthConfig)
-	for registry := range cli.configFile.CredentialHelpers {
-		helper := cli.CredentialsStore(registry)
-		newAuths, err := helper.GetAll()
-		if err != nil {
-			return nil, err
-		}
-		addAll(auths, newAuths)
-	}
-	defaultStore := cli.CredentialsStore("")
-	newAuths, err := defaultStore.GetAll()
-	if err != nil {
-		return nil, err
-	}
-	addAll(auths, newAuths)
-	return auths, nil
-}
-
-func addAll(to, from map[string]types.AuthConfig) {
-	for reg, ac := range from {
-		to[reg] = ac
-	}
-}
-
-// CredentialsStore returns a new credentials store based
-// on the settings provided in the configuration file. Empty string returns
-// the default credential store.
-func (cli *DockerCli) CredentialsStore(serverAddress string) credentials.Store {
-	if helper := getConfiguredCredentialStore(cli.configFile, serverAddress); helper != "" {
-		return credentials.NewNativeStore(cli.configFile, helper)
-	}
-	return credentials.NewFileStore(cli.configFile)
-}
-
-// getConfiguredCredentialStore returns the credential helper configured for the
-// given registry, the default credsStore, or the empty string if neither are
-// configured.
-func getConfiguredCredentialStore(c *configfile.ConfigFile, serverAddress string) string {
-	if c.CredentialHelpers != nil && serverAddress != "" {
-		if helper, exists := c.CredentialHelpers[serverAddress]; exists {
-			return helper
-		}
-	}
-	return c.CredentialsStore
-}
-
-// Initialize the dockerCli runs initialization that must happen after command
-// line flags are parsed.
-func (cli *DockerCli) Initialize(opts *cliflags.ClientOptions) error {
-	cli.configFile = LoadDefaultConfigFile(cli.err)
-
-	var err error
-	cli.client, err = NewAPIClientFromFlags(opts.Common, cli.configFile)
-	if err != nil {
-		return err
-	}
-
-	cli.defaultVersion = cli.client.ClientVersion()
-
-	if opts.Common.TrustKey == "" {
-		cli.keyFile = filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)
-	} else {
-		cli.keyFile = opts.Common.TrustKey
-	}
-
-	if ping, err := cli.client.Ping(context.Background()); err == nil {
-		cli.hasExperimental = ping.Experimental
-
-		// since the new header was added in 1.25, assume server is 1.24 if header is not present.
-		if ping.APIVersion == "" {
-			ping.APIVersion = "1.24"
-		}
-
-		// if server version is lower than the current cli, downgrade
-		if versions.LessThan(ping.APIVersion, cli.client.ClientVersion()) {
-			cli.client.UpdateClientVersion(ping.APIVersion)
-		}
-	}
-	return nil
-}
-
-// NewDockerCli returns a DockerCli instance with IO output and error streams set by in, out and err.
-func NewDockerCli(in io.ReadCloser, out, err io.Writer) *DockerCli {
-	return &DockerCli{in: NewInStream(in), out: NewOutStream(out), err: err}
-}
-
-// LoadDefaultConfigFile attempts to load the default config file and returns
-// an initialized ConfigFile struct if none is found.
-func LoadDefaultConfigFile(err io.Writer) *configfile.ConfigFile {
-	configFile, e := cliconfig.Load(cliconfig.ConfigDir())
-	if e != nil {
-		fmt.Fprintf(err, "WARNING: Error loading config file:%v\n", e)
-	}
-	if !configFile.ContainsAuth() {
-		credentials.DetectDefaultStore(configFile)
-	}
-	return configFile
-}
-
-// NewAPIClientFromFlags creates a new APIClient from command line flags
-func NewAPIClientFromFlags(opts *cliflags.CommonOptions, configFile *configfile.ConfigFile) (client.APIClient, error) {
-	host, err := getServerHost(opts.Hosts, opts.TLSOptions)
-	if err != nil {
-		return &client.Client{}, err
-	}
-
-	customHeaders := configFile.HTTPHeaders
-	if customHeaders == nil {
-		customHeaders = map[string]string{}
-	}
-	customHeaders["User-Agent"] = UserAgent()
-
-	verStr := api.DefaultVersion
-	if tmpStr := os.Getenv("DOCKER_API_VERSION"); tmpStr != "" {
-		verStr = tmpStr
-	}
-
-	httpClient, err := newHTTPClient(host, opts.TLSOptions)
-	if err != nil {
-		return &client.Client{}, err
-	}
-
-	return client.NewClient(host, verStr, httpClient, customHeaders)
-}
-
-func getServerHost(hosts []string, tlsOptions *tlsconfig.Options) (host string, err error) {
-	switch len(hosts) {
-	case 0:
-		host = os.Getenv("DOCKER_HOST")
-	case 1:
-		host = hosts[0]
-	default:
-		return "", errors.New("Please specify only one -H")
-	}
-
-	host, err = dopts.ParseHost(tlsOptions != nil, host)
-	return
-}
-
-func newHTTPClient(host string, tlsOptions *tlsconfig.Options) (*http.Client, error) {
-	if tlsOptions == nil {
-		// let the api client configure the default transport.
-		return nil, nil
-	}
-
-	config, err := tlsconfig.Client(*tlsOptions)
-	if err != nil {
-		return nil, err
-	}
-	tr := &http.Transport{
-		TLSClientConfig: config,
-	}
-	proto, addr, _, err := client.ParseHost(host)
-	if err != nil {
-		return nil, err
-	}
-
-	sockets.ConfigureTransport(tr, proto, addr)
-
-	return &http.Client{
-		Transport: tr,
-	}, nil
-}
-
-// UserAgent returns the user agent string used for making API requests
-func UserAgent() string {
-	return "Docker-Client/" + dockerversion.Version + " (" + runtime.GOOS + ")"
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/commands/commands.go b/installer/vendor/github.com/docker/docker/cli/command/commands/commands.go
deleted file mode 100644
index d64d5680cc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/commands/commands.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package commands
-
-import (
-	"os"
-
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/checkpoint"
-	"github.com/docker/docker/cli/command/container"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/cli/command/network"
-	"github.com/docker/docker/cli/command/node"
-	"github.com/docker/docker/cli/command/plugin"
-	"github.com/docker/docker/cli/command/registry"
-	"github.com/docker/docker/cli/command/secret"
-	"github.com/docker/docker/cli/command/service"
-	"github.com/docker/docker/cli/command/stack"
-	"github.com/docker/docker/cli/command/swarm"
-	"github.com/docker/docker/cli/command/system"
-	"github.com/docker/docker/cli/command/volume"
-	"github.com/spf13/cobra"
-)
-
-// AddCommands adds all the commands from cli/command to the root command
-func AddCommands(cmd *cobra.Command, dockerCli *command.DockerCli) {
-	cmd.AddCommand(
-		node.NewNodeCommand(dockerCli),
-		service.NewServiceCommand(dockerCli),
-		swarm.NewSwarmCommand(dockerCli),
-		secret.NewSecretCommand(dockerCli),
-		container.NewContainerCommand(dockerCli),
-		image.NewImageCommand(dockerCli),
-		system.NewSystemCommand(dockerCli),
-		container.NewRunCommand(dockerCli),
-		image.NewBuildCommand(dockerCli),
-		network.NewNetworkCommand(dockerCli),
-		hide(system.NewEventsCommand(dockerCli)),
-		registry.NewLoginCommand(dockerCli),
-		registry.NewLogoutCommand(dockerCli),
-		registry.NewSearchCommand(dockerCli),
-		system.NewVersionCommand(dockerCli),
-		volume.NewVolumeCommand(dockerCli),
-		hide(system.NewInfoCommand(dockerCli)),
-		hide(container.NewAttachCommand(dockerCli)),
-		hide(container.NewCommitCommand(dockerCli)),
-		hide(container.NewCopyCommand(dockerCli)),
-		hide(container.NewCreateCommand(dockerCli)),
-		hide(container.NewDiffCommand(dockerCli)),
-		hide(container.NewExecCommand(dockerCli)),
-		hide(container.NewExportCommand(dockerCli)),
-		hide(container.NewKillCommand(dockerCli)),
-		hide(container.NewLogsCommand(dockerCli)),
-		hide(container.NewPauseCommand(dockerCli)),
-		hide(container.NewPortCommand(dockerCli)),
-		hide(container.NewPsCommand(dockerCli)),
-		hide(container.NewRenameCommand(dockerCli)),
-		hide(container.NewRestartCommand(dockerCli)),
-		hide(container.NewRmCommand(dockerCli)),
-		hide(container.NewStartCommand(dockerCli)),
-		hide(container.NewStatsCommand(dockerCli)),
-		hide(container.NewStopCommand(dockerCli)),
-		hide(container.NewTopCommand(dockerCli)),
-		hide(container.NewUnpauseCommand(dockerCli)),
-		hide(container.NewUpdateCommand(dockerCli)),
-		hide(container.NewWaitCommand(dockerCli)),
-		hide(image.NewHistoryCommand(dockerCli)),
-		hide(image.NewImagesCommand(dockerCli)),
-		hide(image.NewImportCommand(dockerCli)),
-		hide(image.NewLoadCommand(dockerCli)),
-		hide(image.NewPullCommand(dockerCli)),
-		hide(image.NewPushCommand(dockerCli)),
-		hide(image.NewRemoveCommand(dockerCli)),
-		hide(image.NewSaveCommand(dockerCli)),
-		hide(image.NewTagCommand(dockerCli)),
-		hide(system.NewInspectCommand(dockerCli)),
-		stack.NewStackCommand(dockerCli),
-		stack.NewTopLevelDeployCommand(dockerCli),
-		checkpoint.NewCheckpointCommand(dockerCli),
-		plugin.NewPluginCommand(dockerCli),
-	)
-
-}
-
-func hide(cmd *cobra.Command) *cobra.Command {
-	if os.Getenv("DOCKER_HIDE_LEGACY_COMMANDS") == "" {
-		return cmd
-	}
-	cmdCopy := *cmd
-	cmdCopy.Hidden = true
-	cmdCopy.Aliases = []string{}
-	return &cmdCopy
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/attach.go b/installer/vendor/github.com/docker/docker/cli/command/container/attach.go
deleted file mode 100644
index 31bb109344..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/attach.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"net/http/httputil"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/spf13/cobra"
-)
-
-type attachOptions struct {
-	noStdin    bool
-	proxy      bool
-	detachKeys string
-
-	container string
-}
-
-// NewAttachCommand creates a new cobra.Command for `docker attach`
-func NewAttachCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts attachOptions
-
-	cmd := &cobra.Command{
-		Use:   "attach [OPTIONS] CONTAINER",
-		Short: "Attach to a running container",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			return runAttach(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVar(&opts.noStdin, "no-stdin", false, "Do not attach STDIN")
-	flags.BoolVar(&opts.proxy, "sig-proxy", true, "Proxy all received signals to the process")
-	flags.StringVar(&opts.detachKeys, "detach-keys", "", "Override the key sequence for detaching a container")
-	return cmd
-}
-
-func runAttach(dockerCli *command.DockerCli, opts *attachOptions) error {
-	ctx := context.Background()
-	client := dockerCli.Client()
-
-	c, err := client.ContainerInspect(ctx, opts.container)
-	if err != nil {
-		return err
-	}
-
-	if !c.State.Running {
-		return fmt.Errorf("You cannot attach to a stopped container, start it first")
-	}
-
-	if c.State.Paused {
-		return fmt.Errorf("You cannot attach to a paused container, unpause it first")
-	}
-
-	if err := dockerCli.In().CheckTty(!opts.noStdin, c.Config.Tty); err != nil {
-		return err
-	}
-
-	if opts.detachKeys != "" {
-		dockerCli.ConfigFile().DetachKeys = opts.detachKeys
-	}
-
-	options := types.ContainerAttachOptions{
-		Stream:     true,
-		Stdin:      !opts.noStdin && c.Config.OpenStdin,
-		Stdout:     true,
-		Stderr:     true,
-		DetachKeys: dockerCli.ConfigFile().DetachKeys,
-	}
-
-	var in io.ReadCloser
-	if options.Stdin {
-		in = dockerCli.In()
-	}
-
-	if opts.proxy && !c.Config.Tty {
-		sigc := ForwardAllSignals(ctx, dockerCli, opts.container)
-		defer signal.StopCatch(sigc)
-	}
-
-	resp, errAttach := client.ContainerAttach(ctx, opts.container, options)
-	if errAttach != nil && errAttach != httputil.ErrPersistEOF {
-		// ContainerAttach returns an ErrPersistEOF (connection closed)
-		// means server met an error and put it in Hijacked connection
-		// keep the error and read detailed error message from hijacked connection later
-		return errAttach
-	}
-	defer resp.Close()
-
-	if c.Config.Tty && dockerCli.Out().IsTerminal() {
-		height, width := dockerCli.Out().GetTtySize()
-		// To handle the case where a user repeatedly attaches/detaches without resizing their
-		// terminal, the only way to get the shell prompt to display for attaches 2+ is to artificially
-		// resize it, then go back to normal. Without this, every attach after the first will
-		// require the user to manually resize or hit enter.
-		resizeTtyTo(ctx, client, opts.container, height+1, width+1, false)
-
-		// After the above resizing occurs, the call to MonitorTtySize below will handle resetting back
-		// to the actual size.
-		if err := MonitorTtySize(ctx, dockerCli, opts.container, false); err != nil {
-			logrus.Debugf("Error monitoring TTY size: %s", err)
-		}
-	}
-	if err := holdHijackedConnection(ctx, dockerCli, c.Config.Tty, in, dockerCli.Out(), dockerCli.Err(), resp); err != nil {
-		return err
-	}
-
-	if errAttach != nil {
-		return errAttach
-	}
-
-	_, status, err := getExitCode(ctx, dockerCli, opts.container)
-	if err != nil {
-		return err
-	}
-	if status != 0 {
-		return cli.StatusError{StatusCode: status}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/container/cmd.go
deleted file mode 100644
index 3e9b4880ac..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/cmd.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package container
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewContainerCommand returns a cobra command for `container` subcommands
-func NewContainerCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "container",
-		Short: "Manage containers",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		NewAttachCommand(dockerCli),
-		NewCommitCommand(dockerCli),
-		NewCopyCommand(dockerCli),
-		NewCreateCommand(dockerCli),
-		NewDiffCommand(dockerCli),
-		NewExecCommand(dockerCli),
-		NewExportCommand(dockerCli),
-		NewKillCommand(dockerCli),
-		NewLogsCommand(dockerCli),
-		NewPauseCommand(dockerCli),
-		NewPortCommand(dockerCli),
-		NewRenameCommand(dockerCli),
-		NewRestartCommand(dockerCli),
-		NewRmCommand(dockerCli),
-		NewRunCommand(dockerCli),
-		NewStartCommand(dockerCli),
-		NewStatsCommand(dockerCli),
-		NewStopCommand(dockerCli),
-		NewTopCommand(dockerCli),
-		NewUnpauseCommand(dockerCli),
-		NewUpdateCommand(dockerCli),
-		NewWaitCommand(dockerCli),
-		newListCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		NewPruneCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/commit.go b/installer/vendor/github.com/docker/docker/cli/command/container/commit.go
deleted file mode 100644
index cf8d0102a6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/commit.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package container
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	dockeropts "github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type commitOptions struct {
-	container string
-	reference string
-
-	pause   bool
-	comment string
-	author  string
-	changes dockeropts.ListOpts
-}
-
-// NewCommitCommand creates a new cobra.Command for `docker commit`
-func NewCommitCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts commitOptions
-
-	cmd := &cobra.Command{
-		Use:   "commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]",
-		Short: "Create a new image from a container's changes",
-		Args:  cli.RequiresRangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			if len(args) > 1 {
-				opts.reference = args[1]
-			}
-			return runCommit(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	flags.BoolVarP(&opts.pause, "pause", "p", true, "Pause container during commit")
-	flags.StringVarP(&opts.comment, "message", "m", "", "Commit message")
-	flags.StringVarP(&opts.author, "author", "a", "", "Author (e.g., \"John Hannibal Smith <hannibal@a-team.com>\")")
-
-	opts.changes = dockeropts.NewListOpts(nil)
-	flags.VarP(&opts.changes, "change", "c", "Apply Dockerfile instruction to the created image")
-
-	return cmd
-}
-
-func runCommit(dockerCli *command.DockerCli, opts *commitOptions) error {
-	ctx := context.Background()
-
-	name := opts.container
-	reference := opts.reference
-
-	options := types.ContainerCommitOptions{
-		Reference: reference,
-		Comment:   opts.comment,
-		Author:    opts.author,
-		Changes:   opts.changes.GetAll(),
-		Pause:     opts.pause,
-	}
-
-	response, err := dockerCli.Client().ContainerCommit(ctx, name, options)
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintln(dockerCli.Out(), response.ID)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/cp.go b/installer/vendor/github.com/docker/docker/cli/command/container/cp.go
deleted file mode 100644
index 17ab2accf9..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/cp.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/system"
-	"github.com/spf13/cobra"
-)
-
-type copyOptions struct {
-	source      string
-	destination string
-	followLink  bool
-}
-
-type copyDirection int
-
-const (
-	fromContainer copyDirection = (1 << iota)
-	toContainer
-	acrossContainers = fromContainer | toContainer
-)
-
-type cpConfig struct {
-	followLink bool
-}
-
-// NewCopyCommand creates a new `docker cp` command
-func NewCopyCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts copyOptions
-
-	cmd := &cobra.Command{
-		Use: `cp [OPTIONS] CONTAINER:SRC_PATH DEST_PATH|-
-	docker cp [OPTIONS] SRC_PATH|- CONTAINER:DEST_PATH`,
-		Short: "Copy files/folders between a container and the local filesystem",
-		Long: strings.Join([]string{
-			"Copy files/folders between a container and the local filesystem\n",
-			"\nUse '-' as the source to read a tar archive from stdin\n",
-			"and extract it to a directory destination in a container.\n",
-			"Use '-' as the destination to stream a tar archive of a\n",
-			"container source to stdout.",
-		}, ""),
-		Args: cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if args[0] == "" {
-				return fmt.Errorf("source can not be empty")
-			}
-			if args[1] == "" {
-				return fmt.Errorf("destination can not be empty")
-			}
-			opts.source = args[0]
-			opts.destination = args[1]
-			return runCopy(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.followLink, "follow-link", "L", false, "Always follow symbol link in SRC_PATH")
-
-	return cmd
-}
-
-func runCopy(dockerCli *command.DockerCli, opts copyOptions) error {
-	srcContainer, srcPath := splitCpArg(opts.source)
-	dstContainer, dstPath := splitCpArg(opts.destination)
-
-	var direction copyDirection
-	if srcContainer != "" {
-		direction |= fromContainer
-	}
-	if dstContainer != "" {
-		direction |= toContainer
-	}
-
-	cpParam := &cpConfig{
-		followLink: opts.followLink,
-	}
-
-	ctx := context.Background()
-
-	switch direction {
-	case fromContainer:
-		return copyFromContainer(ctx, dockerCli, srcContainer, srcPath, dstPath, cpParam)
-	case toContainer:
-		return copyToContainer(ctx, dockerCli, srcPath, dstContainer, dstPath, cpParam)
-	case acrossContainers:
-		// Copying between containers isn't supported.
-		return fmt.Errorf("copying between containers is not supported")
-	default:
-		// User didn't specify any container.
-		return fmt.Errorf("must specify at least one container source")
-	}
-}
-
-func statContainerPath(ctx context.Context, dockerCli *command.DockerCli, containerName, path string) (types.ContainerPathStat, error) {
-	return dockerCli.Client().ContainerStatPath(ctx, containerName, path)
-}
-
-func resolveLocalPath(localPath string) (absPath string, err error) {
-	if absPath, err = filepath.Abs(localPath); err != nil {
-		return
-	}
-
-	return archive.PreserveTrailingDotOrSeparator(absPath, localPath), nil
-}
-
-func copyFromContainer(ctx context.Context, dockerCli *command.DockerCli, srcContainer, srcPath, dstPath string, cpParam *cpConfig) (err error) {
-	if dstPath != "-" {
-		// Get an absolute destination path.
-		dstPath, err = resolveLocalPath(dstPath)
-		if err != nil {
-			return err
-		}
-	}
-
-	// if client requests to follow symbol link, then must decide target file to be copied
-	var rebaseName string
-	if cpParam.followLink {
-		srcStat, err := statContainerPath(ctx, dockerCli, srcContainer, srcPath)
-
-		// If the destination is a symbolic link, we should follow it.
-		if err == nil && srcStat.Mode&os.ModeSymlink != 0 {
-			linkTarget := srcStat.LinkTarget
-			if !system.IsAbs(linkTarget) {
-				// Join with the parent directory.
-				srcParent, _ := archive.SplitPathDirEntry(srcPath)
-				linkTarget = filepath.Join(srcParent, linkTarget)
-			}
-
-			linkTarget, rebaseName = archive.GetRebaseName(srcPath, linkTarget)
-			srcPath = linkTarget
-		}
-
-	}
-
-	content, stat, err := dockerCli.Client().CopyFromContainer(ctx, srcContainer, srcPath)
-	if err != nil {
-		return err
-	}
-	defer content.Close()
-
-	if dstPath == "-" {
-		// Send the response to STDOUT.
-		_, err = io.Copy(os.Stdout, content)
-
-		return err
-	}
-
-	// Prepare source copy info.
-	srcInfo := archive.CopyInfo{
-		Path:       srcPath,
-		Exists:     true,
-		IsDir:      stat.Mode.IsDir(),
-		RebaseName: rebaseName,
-	}
-
-	preArchive := content
-	if len(srcInfo.RebaseName) != 0 {
-		_, srcBase := archive.SplitPathDirEntry(srcInfo.Path)
-		preArchive = archive.RebaseArchiveEntries(content, srcBase, srcInfo.RebaseName)
-	}
-	// See comments in the implementation of `archive.CopyTo` for exactly what
-	// goes into deciding how and whether the source archive needs to be
-	// altered for the correct copy behavior.
-	return archive.CopyTo(preArchive, srcInfo, dstPath)
-}
-
-func copyToContainer(ctx context.Context, dockerCli *command.DockerCli, srcPath, dstContainer, dstPath string, cpParam *cpConfig) (err error) {
-	if srcPath != "-" {
-		// Get an absolute source path.
-		srcPath, err = resolveLocalPath(srcPath)
-		if err != nil {
-			return err
-		}
-	}
-
-	// In order to get the copy behavior right, we need to know information
-	// about both the source and destination. The API is a simple tar
-	// archive/extract API but we can use the stat info header about the
-	// destination to be more informed about exactly what the destination is.
-
-	// Prepare destination copy info by stat-ing the container path.
-	dstInfo := archive.CopyInfo{Path: dstPath}
-	dstStat, err := statContainerPath(ctx, dockerCli, dstContainer, dstPath)
-
-	// If the destination is a symbolic link, we should evaluate it.
-	if err == nil && dstStat.Mode&os.ModeSymlink != 0 {
-		linkTarget := dstStat.LinkTarget
-		if !system.IsAbs(linkTarget) {
-			// Join with the parent directory.
-			dstParent, _ := archive.SplitPathDirEntry(dstPath)
-			linkTarget = filepath.Join(dstParent, linkTarget)
-		}
-
-		dstInfo.Path = linkTarget
-		dstStat, err = statContainerPath(ctx, dockerCli, dstContainer, linkTarget)
-	}
-
-	// Ignore any error and assume that the parent directory of the destination
-	// path exists, in which case the copy may still succeed. If there is any
-	// type of conflict (e.g., non-directory overwriting an existing directory
-	// or vice versa) the extraction will fail. If the destination simply did
-	// not exist, but the parent directory does, the extraction will still
-	// succeed.
-	if err == nil {
-		dstInfo.Exists, dstInfo.IsDir = true, dstStat.Mode.IsDir()
-	}
-
-	var (
-		content         io.Reader
-		resolvedDstPath string
-	)
-
-	if srcPath == "-" {
-		// Use STDIN.
-		content = os.Stdin
-		resolvedDstPath = dstInfo.Path
-		if !dstInfo.IsDir {
-			return fmt.Errorf("destination %q must be a directory", fmt.Sprintf("%s:%s", dstContainer, dstPath))
-		}
-	} else {
-		// Prepare source copy info.
-		srcInfo, err := archive.CopyInfoSourcePath(srcPath, cpParam.followLink)
-		if err != nil {
-			return err
-		}
-
-		srcArchive, err := archive.TarResource(srcInfo)
-		if err != nil {
-			return err
-		}
-		defer srcArchive.Close()
-
-		// With the stat info about the local source as well as the
-		// destination, we have enough information to know whether we need to
-		// alter the archive that we upload so that when the server extracts
-		// it to the specified directory in the container we get the desired
-		// copy behavior.
-
-		// See comments in the implementation of `archive.PrepareArchiveCopy`
-		// for exactly what goes into deciding how and whether the source
-		// archive needs to be altered for the correct copy behavior when it is
-		// extracted. This function also infers from the source and destination
-		// info which directory to extract to, which may be the parent of the
-		// destination that the user specified.
-		dstDir, preparedArchive, err := archive.PrepareArchiveCopy(srcArchive, srcInfo, dstInfo)
-		if err != nil {
-			return err
-		}
-		defer preparedArchive.Close()
-
-		resolvedDstPath = dstDir
-		content = preparedArchive
-	}
-
-	options := types.CopyToContainerOptions{
-		AllowOverwriteDirWithFile: false,
-	}
-
-	return dockerCli.Client().CopyToContainer(ctx, dstContainer, resolvedDstPath, content, options)
-}
-
-// We use `:` as a delimiter between CONTAINER and PATH, but `:` could also be
-// in a valid LOCALPATH, like `file:name.txt`. We can resolve this ambiguity by
-// requiring a LOCALPATH with a `:` to be made explicit with a relative or
-// absolute path:
-// 	`/path/to/file:name.txt` or `./file:name.txt`
-//
-// This is apparently how `scp` handles this as well:
-// 	http://www.cyberciti.biz/faq/rsync-scp-file-name-with-colon-punctuation-in-it/
-//
-// We can't simply check for a filepath separator because container names may
-// have a separator, e.g., "host0/cname1" if container is in a Docker cluster,
-// so we have to check for a `/` or `.` prefix. Also, in the case of a Windows
-// client, a `:` could be part of an absolute Windows path, in which case it
-// is immediately proceeded by a backslash.
-func splitCpArg(arg string) (container, path string) {
-	if system.IsAbs(arg) {
-		// Explicit local absolute path, e.g., `C:\foo` or `/foo`.
-		return "", arg
-	}
-
-	parts := strings.SplitN(arg, ":", 2)
-
-	if len(parts) == 1 || strings.HasPrefix(parts[0], ".") {
-		// Either there's no `:` in the arg
-		// OR it's an explicit local relative path like `./file:name.txt`.
-		return "", arg
-	}
-
-	return parts[0], parts[1]
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/create.go b/installer/vendor/github.com/docker/docker/cli/command/container/create.go
deleted file mode 100644
index d5e63bd9ef..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/create.go
+++ /dev/null
@@ -1,218 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"os"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/pkg/jsonmessage"
-	// FIXME migrate to docker/distribution/reference
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	apiclient "github.com/docker/docker/client"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-type createOptions struct {
-	name string
-}
-
-// NewCreateCommand creates a new cobra.Command for `docker create`
-func NewCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts createOptions
-	var copts *runconfigopts.ContainerOptions
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] IMAGE [COMMAND] [ARG...]",
-		Short: "Create a new container",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			copts.Image = args[0]
-			if len(args) > 1 {
-				copts.Args = args[1:]
-			}
-			return runCreate(dockerCli, cmd.Flags(), &opts, copts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	flags.StringVar(&opts.name, "name", "", "Assign a name to the container")
-
-	// Add an explicit help that doesn't have a `-h` to prevent the conflict
-	// with hostname
-	flags.Bool("help", false, "Print usage")
-
-	command.AddTrustedFlags(flags, true)
-	copts = runconfigopts.AddFlags(flags)
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *createOptions, copts *runconfigopts.ContainerOptions) error {
-	config, hostConfig, networkingConfig, err := runconfigopts.Parse(flags, copts)
-	if err != nil {
-		reportError(dockerCli.Err(), "create", err.Error(), true)
-		return cli.StatusError{StatusCode: 125}
-	}
-	response, err := createContainer(context.Background(), dockerCli, config, hostConfig, networkingConfig, hostConfig.ContainerIDFile, opts.name)
-	if err != nil {
-		return err
-	}
-	fmt.Fprintf(dockerCli.Out(), "%s\n", response.ID)
-	return nil
-}
-
-func pullImage(ctx context.Context, dockerCli *command.DockerCli, image string, out io.Writer) error {
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return err
-	}
-
-	// Resolve the Repository name from fqn to RepositoryInfo
-	repoInfo, err := registry.ParseRepositoryInfo(ref)
-	if err != nil {
-		return err
-	}
-
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return err
-	}
-
-	options := types.ImageCreateOptions{
-		RegistryAuth: encodedAuth,
-	}
-
-	responseBody, err := dockerCli.Client().ImageCreate(ctx, image, options)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	return jsonmessage.DisplayJSONMessagesStream(
-		responseBody,
-		out,
-		dockerCli.Out().FD(),
-		dockerCli.Out().IsTerminal(),
-		nil)
-}
-
-type cidFile struct {
-	path    string
-	file    *os.File
-	written bool
-}
-
-func (cid *cidFile) Close() error {
-	cid.file.Close()
-
-	if !cid.written {
-		if err := os.Remove(cid.path); err != nil {
-			return fmt.Errorf("failed to remove the CID file '%s': %s \n", cid.path, err)
-		}
-	}
-
-	return nil
-}
-
-func (cid *cidFile) Write(id string) error {
-	if _, err := cid.file.Write([]byte(id)); err != nil {
-		return fmt.Errorf("Failed to write the container ID to the file: %s", err)
-	}
-	cid.written = true
-	return nil
-}
-
-func newCIDFile(path string) (*cidFile, error) {
-	if _, err := os.Stat(path); err == nil {
-		return nil, fmt.Errorf("Container ID file found, make sure the other container isn't running or delete %s", path)
-	}
-
-	f, err := os.Create(path)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to create the container ID file: %s", err)
-	}
-
-	return &cidFile{path: path, file: f}, nil
-}
-
-func createContainer(ctx context.Context, dockerCli *command.DockerCli, config *container.Config, hostConfig *container.HostConfig, networkingConfig *networktypes.NetworkingConfig, cidfile, name string) (*container.ContainerCreateCreatedBody, error) {
-	stderr := dockerCli.Err()
-
-	var containerIDFile *cidFile
-	if cidfile != "" {
-		var err error
-		if containerIDFile, err = newCIDFile(cidfile); err != nil {
-			return nil, err
-		}
-		defer containerIDFile.Close()
-	}
-
-	var trustedRef reference.Canonical
-	_, ref, err := reference.ParseIDOrReference(config.Image)
-	if err != nil {
-		return nil, err
-	}
-	if ref != nil {
-		ref = reference.WithDefaultTag(ref)
-
-		if ref, ok := ref.(reference.NamedTagged); ok && command.IsTrusted() {
-			var err error
-			trustedRef, err = image.TrustedReference(ctx, dockerCli, ref, nil)
-			if err != nil {
-				return nil, err
-			}
-			config.Image = trustedRef.String()
-		}
-	}
-
-	//create the container
-	response, err := dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, name)
-
-	//if image not found try to pull it
-	if err != nil {
-		if apiclient.IsErrImageNotFound(err) && ref != nil {
-			fmt.Fprintf(stderr, "Unable to find image '%s' locally\n", ref.String())
-
-			// we don't want to write to stdout anything apart from container.ID
-			if err = pullImage(ctx, dockerCli, config.Image, stderr); err != nil {
-				return nil, err
-			}
-			if ref, ok := ref.(reference.NamedTagged); ok && trustedRef != nil {
-				if err := image.TagTrusted(ctx, dockerCli, trustedRef, ref); err != nil {
-					return nil, err
-				}
-			}
-			// Retry
-			var retryErr error
-			response, retryErr = dockerCli.Client().ContainerCreate(ctx, config, hostConfig, networkingConfig, name)
-			if retryErr != nil {
-				return nil, retryErr
-			}
-		} else {
-			return nil, err
-		}
-	}
-
-	for _, warning := range response.Warnings {
-		fmt.Fprintf(stderr, "WARNING: %s\n", warning)
-	}
-	if containerIDFile != nil {
-		if err = containerIDFile.Write(response.ID); err != nil {
-			return nil, err
-		}
-	}
-	return &response, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/diff.go b/installer/vendor/github.com/docker/docker/cli/command/container/diff.go
deleted file mode 100644
index 12d6591014..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/diff.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package container
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/spf13/cobra"
-)
-
-type diffOptions struct {
-	container string
-}
-
-// NewDiffCommand creates a new cobra.Command for `docker diff`
-func NewDiffCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts diffOptions
-
-	return &cobra.Command{
-		Use:   "diff CONTAINER",
-		Short: "Inspect changes on a container's filesystem",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			return runDiff(dockerCli, &opts)
-		},
-	}
-}
-
-func runDiff(dockerCli *command.DockerCli, opts *diffOptions) error {
-	if opts.container == "" {
-		return fmt.Errorf("Container name cannot be empty")
-	}
-	ctx := context.Background()
-
-	changes, err := dockerCli.Client().ContainerDiff(ctx, opts.container)
-	if err != nil {
-		return err
-	}
-
-	for _, change := range changes {
-		var kind string
-		switch change.Kind {
-		case archive.ChangeModify:
-			kind = "C"
-		case archive.ChangeAdd:
-			kind = "A"
-		case archive.ChangeDelete:
-			kind = "D"
-		}
-		fmt.Fprintf(dockerCli.Out(), "%s %s\n", kind, change.Path)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/exec.go b/installer/vendor/github.com/docker/docker/cli/command/container/exec.go
deleted file mode 100644
index f0381494e2..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/exec.go
+++ /dev/null
@@ -1,207 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	apiclient "github.com/docker/docker/client"
-	options "github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/promise"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-)
-
-type execOptions struct {
-	detachKeys  string
-	interactive bool
-	tty         bool
-	detach      bool
-	user        string
-	privileged  bool
-	env         *options.ListOpts
-}
-
-func newExecOptions() *execOptions {
-	var values []string
-	return &execOptions{
-		env: options.NewListOptsRef(&values, runconfigopts.ValidateEnv),
-	}
-}
-
-// NewExecCommand creats a new cobra.Command for `docker exec`
-func NewExecCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := newExecOptions()
-
-	cmd := &cobra.Command{
-		Use:   "exec [OPTIONS] CONTAINER COMMAND [ARG...]",
-		Short: "Run a command in a running container",
-		Args:  cli.RequiresMinArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			container := args[0]
-			execCmd := args[1:]
-			return runExec(dockerCli, opts, container, execCmd)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	flags.StringVarP(&opts.detachKeys, "detach-keys", "", "", "Override the key sequence for detaching a container")
-	flags.BoolVarP(&opts.interactive, "interactive", "i", false, "Keep STDIN open even if not attached")
-	flags.BoolVarP(&opts.tty, "tty", "t", false, "Allocate a pseudo-TTY")
-	flags.BoolVarP(&opts.detach, "detach", "d", false, "Detached mode: run command in the background")
-	flags.StringVarP(&opts.user, "user", "u", "", "Username or UID (format: <name|uid>[:<group|gid>])")
-	flags.BoolVarP(&opts.privileged, "privileged", "", false, "Give extended privileges to the command")
-	flags.VarP(opts.env, "env", "e", "Set environment variables")
-	flags.SetAnnotation("env", "version", []string{"1.25"})
-
-	return cmd
-}
-
-func runExec(dockerCli *command.DockerCli, opts *execOptions, container string, execCmd []string) error {
-	execConfig, err := parseExec(opts, execCmd)
-	// just in case the ParseExec does not exit
-	if container == "" || err != nil {
-		return cli.StatusError{StatusCode: 1}
-	}
-
-	if opts.detachKeys != "" {
-		dockerCli.ConfigFile().DetachKeys = opts.detachKeys
-	}
-
-	// Send client escape keys
-	execConfig.DetachKeys = dockerCli.ConfigFile().DetachKeys
-
-	ctx := context.Background()
-	client := dockerCli.Client()
-
-	response, err := client.ContainerExecCreate(ctx, container, *execConfig)
-	if err != nil {
-		return err
-	}
-
-	execID := response.ID
-	if execID == "" {
-		fmt.Fprintf(dockerCli.Out(), "exec ID empty")
-		return nil
-	}
-
-	//Temp struct for execStart so that we don't need to transfer all the execConfig
-	if !execConfig.Detach {
-		if err := dockerCli.In().CheckTty(execConfig.AttachStdin, execConfig.Tty); err != nil {
-			return err
-		}
-	} else {
-		execStartCheck := types.ExecStartCheck{
-			Detach: execConfig.Detach,
-			Tty:    execConfig.Tty,
-		}
-
-		if err := client.ContainerExecStart(ctx, execID, execStartCheck); err != nil {
-			return err
-		}
-		// For now don't print this - wait for when we support exec wait()
-		// fmt.Fprintf(dockerCli.Out(), "%s\n", execID)
-		return nil
-	}
-
-	// Interactive exec requested.
-	var (
-		out, stderr io.Writer
-		in          io.ReadCloser
-		errCh       chan error
-	)
-
-	if execConfig.AttachStdin {
-		in = dockerCli.In()
-	}
-	if execConfig.AttachStdout {
-		out = dockerCli.Out()
-	}
-	if execConfig.AttachStderr {
-		if execConfig.Tty {
-			stderr = dockerCli.Out()
-		} else {
-			stderr = dockerCli.Err()
-		}
-	}
-
-	resp, err := client.ContainerExecAttach(ctx, execID, *execConfig)
-	if err != nil {
-		return err
-	}
-	defer resp.Close()
-	errCh = promise.Go(func() error {
-		return holdHijackedConnection(ctx, dockerCli, execConfig.Tty, in, out, stderr, resp)
-	})
-
-	if execConfig.Tty && dockerCli.In().IsTerminal() {
-		if err := MonitorTtySize(ctx, dockerCli, execID, true); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "Error monitoring TTY size: %s\n", err)
-		}
-	}
-
-	if err := <-errCh; err != nil {
-		logrus.Debugf("Error hijack: %s", err)
-		return err
-	}
-
-	var status int
-	if _, status, err = getExecExitCode(ctx, client, execID); err != nil {
-		return err
-	}
-
-	if status != 0 {
-		return cli.StatusError{StatusCode: status}
-	}
-
-	return nil
-}
-
-// getExecExitCode perform an inspect on the exec command. It returns
-// the running state and the exit code.
-func getExecExitCode(ctx context.Context, client apiclient.ContainerAPIClient, execID string) (bool, int, error) {
-	resp, err := client.ContainerExecInspect(ctx, execID)
-	if err != nil {
-		// If we can't connect, then the daemon probably died.
-		if !apiclient.IsErrConnectionFailed(err) {
-			return false, -1, err
-		}
-		return false, -1, nil
-	}
-
-	return resp.Running, resp.ExitCode, nil
-}
-
-// parseExec parses the specified args for the specified command and generates
-// an ExecConfig from it.
-func parseExec(opts *execOptions, execCmd []string) (*types.ExecConfig, error) {
-	execConfig := &types.ExecConfig{
-		User:       opts.user,
-		Privileged: opts.privileged,
-		Tty:        opts.tty,
-		Cmd:        execCmd,
-		Detach:     opts.detach,
-	}
-
-	// If -d is not set, attach to everything by default
-	if !opts.detach {
-		execConfig.AttachStdout = true
-		execConfig.AttachStderr = true
-		if opts.interactive {
-			execConfig.AttachStdin = true
-		}
-	}
-
-	if opts.env != nil {
-		execConfig.Env = opts.env.GetAll()
-	}
-
-	return execConfig, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/exec_test.go b/installer/vendor/github.com/docker/docker/cli/command/container/exec_test.go
deleted file mode 100644
index baeeaf1904..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/exec_test.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-)
-
-type arguments struct {
-	options execOptions
-	execCmd []string
-}
-
-func TestParseExec(t *testing.T) {
-	valids := map[*arguments]*types.ExecConfig{
-		&arguments{
-			execCmd: []string{"command"},
-		}: {
-			Cmd:          []string{"command"},
-			AttachStdout: true,
-			AttachStderr: true,
-		},
-		&arguments{
-			execCmd: []string{"command1", "command2"},
-		}: {
-			Cmd:          []string{"command1", "command2"},
-			AttachStdout: true,
-			AttachStderr: true,
-		},
-		&arguments{
-			options: execOptions{
-				interactive: true,
-				tty:         true,
-				user:        "uid",
-			},
-			execCmd: []string{"command"},
-		}: {
-			User:         "uid",
-			AttachStdin:  true,
-			AttachStdout: true,
-			AttachStderr: true,
-			Tty:          true,
-			Cmd:          []string{"command"},
-		},
-		&arguments{
-			options: execOptions{
-				detach: true,
-			},
-			execCmd: []string{"command"},
-		}: {
-			AttachStdin:  false,
-			AttachStdout: false,
-			AttachStderr: false,
-			Detach:       true,
-			Cmd:          []string{"command"},
-		},
-		&arguments{
-			options: execOptions{
-				tty:         true,
-				interactive: true,
-				detach:      true,
-			},
-			execCmd: []string{"command"},
-		}: {
-			AttachStdin:  false,
-			AttachStdout: false,
-			AttachStderr: false,
-			Detach:       true,
-			Tty:          true,
-			Cmd:          []string{"command"},
-		},
-	}
-
-	for valid, expectedExecConfig := range valids {
-		execConfig, err := parseExec(&valid.options, valid.execCmd)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !compareExecConfig(expectedExecConfig, execConfig) {
-			t.Fatalf("Expected [%v] for %v, got [%v]", expectedExecConfig, valid, execConfig)
-		}
-	}
-}
-
-func compareExecConfig(config1 *types.ExecConfig, config2 *types.ExecConfig) bool {
-	if config1.AttachStderr != config2.AttachStderr {
-		return false
-	}
-	if config1.AttachStdin != config2.AttachStdin {
-		return false
-	}
-	if config1.AttachStdout != config2.AttachStdout {
-		return false
-	}
-	if config1.Detach != config2.Detach {
-		return false
-	}
-	if config1.Privileged != config2.Privileged {
-		return false
-	}
-	if config1.Tty != config2.Tty {
-		return false
-	}
-	if config1.User != config2.User {
-		return false
-	}
-	if len(config1.Cmd) != len(config2.Cmd) {
-		return false
-	}
-	for index, value := range config1.Cmd {
-		if value != config2.Cmd[index] {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/export.go b/installer/vendor/github.com/docker/docker/cli/command/container/export.go
deleted file mode 100644
index 8fa2e5d77e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/export.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package container
-
-import (
-	"errors"
-	"io"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type exportOptions struct {
-	container string
-	output    string
-}
-
-// NewExportCommand creates a new `docker export` command
-func NewExportCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts exportOptions
-
-	cmd := &cobra.Command{
-		Use:   "export [OPTIONS] CONTAINER",
-		Short: "Export a container's filesystem as a tar archive",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			return runExport(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.output, "output", "o", "", "Write to a file, instead of STDOUT")
-
-	return cmd
-}
-
-func runExport(dockerCli *command.DockerCli, opts exportOptions) error {
-	if opts.output == "" && dockerCli.Out().IsTerminal() {
-		return errors.New("Cowardly refusing to save to a terminal. Use the -o flag or redirect.")
-	}
-
-	clnt := dockerCli.Client()
-
-	responseBody, err := clnt.ContainerExport(context.Background(), opts.container)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	if opts.output == "" {
-		_, err := io.Copy(dockerCli.Out(), responseBody)
-		return err
-	}
-
-	return command.CopyToFile(opts.output, responseBody)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/hijack.go b/installer/vendor/github.com/docker/docker/cli/command/container/hijack.go
deleted file mode 100644
index ca136f0e43..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/hijack.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package container
-
-import (
-	"io"
-	"runtime"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/stdcopy"
-	"golang.org/x/net/context"
-)
-
-// holdHijackedConnection handles copying input to and output from streams to the
-// connection
-func holdHijackedConnection(ctx context.Context, streams command.Streams, tty bool, inputStream io.ReadCloser, outputStream, errorStream io.Writer, resp types.HijackedResponse) error {
-	var (
-		err         error
-		restoreOnce sync.Once
-	)
-	if inputStream != nil && tty {
-		if err := setRawTerminal(streams); err != nil {
-			return err
-		}
-		defer func() {
-			restoreOnce.Do(func() {
-				restoreTerminal(streams, inputStream)
-			})
-		}()
-	}
-
-	receiveStdout := make(chan error, 1)
-	if outputStream != nil || errorStream != nil {
-		go func() {
-			// When TTY is ON, use regular copy
-			if tty && outputStream != nil {
-				_, err = io.Copy(outputStream, resp.Reader)
-				// we should restore the terminal as soon as possible once connection end
-				// so any following print messages will be in normal type.
-				if inputStream != nil {
-					restoreOnce.Do(func() {
-						restoreTerminal(streams, inputStream)
-					})
-				}
-			} else {
-				_, err = stdcopy.StdCopy(outputStream, errorStream, resp.Reader)
-			}
-
-			logrus.Debug("[hijack] End of stdout")
-			receiveStdout <- err
-		}()
-	}
-
-	stdinDone := make(chan struct{})
-	go func() {
-		if inputStream != nil {
-			io.Copy(resp.Conn, inputStream)
-			// we should restore the terminal as soon as possible once connection end
-			// so any following print messages will be in normal type.
-			if tty {
-				restoreOnce.Do(func() {
-					restoreTerminal(streams, inputStream)
-				})
-			}
-			logrus.Debug("[hijack] End of stdin")
-		}
-
-		if err := resp.CloseWrite(); err != nil {
-			logrus.Debugf("Couldn't send EOF: %s", err)
-		}
-		close(stdinDone)
-	}()
-
-	select {
-	case err := <-receiveStdout:
-		if err != nil {
-			logrus.Debugf("Error receiveStdout: %s", err)
-			return err
-		}
-	case <-stdinDone:
-		if outputStream != nil || errorStream != nil {
-			select {
-			case err := <-receiveStdout:
-				if err != nil {
-					logrus.Debugf("Error receiveStdout: %s", err)
-					return err
-				}
-			case <-ctx.Done():
-			}
-		}
-	case <-ctx.Done():
-	}
-
-	return nil
-}
-
-func setRawTerminal(streams command.Streams) error {
-	if err := streams.In().SetRawTerminal(); err != nil {
-		return err
-	}
-	return streams.Out().SetRawTerminal()
-}
-
-func restoreTerminal(streams command.Streams, in io.Closer) error {
-	streams.In().RestoreTerminal()
-	streams.Out().RestoreTerminal()
-	// WARNING: DO NOT REMOVE THE OS CHECK !!!
-	// For some reason this Close call blocks on darwin..
-	// As the client exists right after, simply discard the close
-	// until we find a better solution.
-	if in != nil && runtime.GOOS != "darwin" {
-		return in.Close()
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/container/inspect.go
deleted file mode 100644
index 08a8d244df..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/inspect.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package container
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	format string
-	size   bool
-	refs   []string
-}
-
-// newInspectCommand creates a new cobra.Command for `docker container inspect`
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Display detailed information on one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.refs = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes")
-
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	getRefFunc := func(ref string) (interface{}, []byte, error) {
-		return client.ContainerInspectWithRaw(ctx, ref, opts.size)
-	}
-	return inspect.Inspect(dockerCli.Out(), opts.refs, opts.format, getRefFunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/kill.go b/installer/vendor/github.com/docker/docker/cli/command/container/kill.go
deleted file mode 100644
index 6da91a40e3..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/kill.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type killOptions struct {
-	signal string
-
-	containers []string
-}
-
-// NewKillCommand creates a new cobra.Command for `docker kill`
-func NewKillCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts killOptions
-
-	cmd := &cobra.Command{
-		Use:   "kill [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Kill one or more running containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runKill(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.signal, "signal", "s", "KILL", "Signal to send to the container")
-	return cmd
-}
-
-func runKill(dockerCli *command.DockerCli, opts *killOptions) error {
-	var errs []string
-	ctx := context.Background()
-	errChan := parallelOperation(ctx, opts.containers, func(ctx context.Context, container string) error {
-		return dockerCli.Client().ContainerKill(ctx, container, opts.signal)
-	})
-	for _, name := range opts.containers {
-		if err := <-errChan; err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", name)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/list.go b/installer/vendor/github.com/docker/docker/cli/command/container/list.go
deleted file mode 100644
index 5bbf41966d..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/list.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package container
-
-import (
-	"io/ioutil"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/utils/templates"
-	"github.com/spf13/cobra"
-)
-
-type psOptions struct {
-	quiet   bool
-	size    bool
-	all     bool
-	noTrunc bool
-	nLatest bool
-	last    int
-	format  string
-	filter  opts.FilterOpt
-}
-
-// NewPsCommand creates a new cobra.Command for `docker ps`
-func NewPsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := psOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "ps [OPTIONS]",
-		Short: "List containers",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPs(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display numeric IDs")
-	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Show all containers (default shows just running)")
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-	flags.BoolVarP(&opts.nLatest, "latest", "l", false, "Show the latest created container (includes all states)")
-	flags.IntVarP(&opts.last, "last", "n", -1, "Show n last created containers (includes all states)")
-	flags.StringVarP(&opts.format, "format", "", "", "Pretty-print containers using a Go template")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := *NewPsCommand(dockerCli)
-	cmd.Aliases = []string{"ps", "list"}
-	cmd.Use = "ls [OPTIONS]"
-	return &cmd
-}
-
-// listOptionsProcessor is used to set any container list options which may only
-// be embedded in the format template.
-// This is passed directly into tmpl.Execute in order to allow the preprocessor
-// to set any list options that were not provided by flags (e.g. `.Size`).
-// It is using a `map[string]bool` so that unknown fields passed into the
-// template format do not cause errors. These errors will get picked up when
-// running through the actual template processor.
-type listOptionsProcessor map[string]bool
-
-// Size sets the size of the map when called by a template execution.
-func (o listOptionsProcessor) Size() bool {
-	o["size"] = true
-	return true
-}
-
-// Label is needed here as it allows the correct pre-processing
-// because Label() is a method with arguments
-func (o listOptionsProcessor) Label(name string) string {
-	return ""
-}
-
-func buildContainerListOptions(opts *psOptions) (*types.ContainerListOptions, error) {
-	options := &types.ContainerListOptions{
-		All:     opts.all,
-		Limit:   opts.last,
-		Size:    opts.size,
-		Filters: opts.filter.Value(),
-	}
-
-	if opts.nLatest && opts.last == -1 {
-		options.Limit = 1
-	}
-
-	tmpl, err := templates.Parse(opts.format)
-
-	if err != nil {
-		return nil, err
-	}
-
-	optionsProcessor := listOptionsProcessor{}
-	// This shouldn't error out but swallowing the error makes it harder
-	// to track down if preProcessor issues come up. Ref #24696
-	if err := tmpl.Execute(ioutil.Discard, optionsProcessor); err != nil {
-		return nil, err
-	}
-	// At the moment all we need is to capture .Size for preprocessor
-	options.Size = opts.size || optionsProcessor["size"]
-
-	return options, nil
-}
-
-func runPs(dockerCli *command.DockerCli, opts *psOptions) error {
-	ctx := context.Background()
-
-	listOptions, err := buildContainerListOptions(opts)
-	if err != nil {
-		return err
-	}
-
-	containers, err := dockerCli.Client().ContainerList(ctx, *listOptions)
-	if err != nil {
-		return err
-	}
-
-	format := opts.format
-	if len(format) == 0 {
-		if len(dockerCli.ConfigFile().PsFormat) > 0 && !opts.quiet {
-			format = dockerCli.ConfigFile().PsFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-
-	containerCtx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.NewContainerFormat(format, opts.quiet, listOptions.Size),
-		Trunc:  !opts.noTrunc,
-	}
-	return formatter.ContainerWrite(containerCtx, containers)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/logs.go b/installer/vendor/github.com/docker/docker/cli/command/container/logs.go
deleted file mode 100644
index 3a37cedf43..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/logs.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/spf13/cobra"
-)
-
-var validDrivers = map[string]bool{
-	"json-file": true,
-	"journald":  true,
-}
-
-type logsOptions struct {
-	follow     bool
-	since      string
-	timestamps bool
-	details    bool
-	tail       string
-
-	container string
-}
-
-// NewLogsCommand creates a new cobra.Command for `docker logs`
-func NewLogsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts logsOptions
-
-	cmd := &cobra.Command{
-		Use:   "logs [OPTIONS] CONTAINER",
-		Short: "Fetch the logs of a container",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			return runLogs(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output")
-	flags.StringVar(&opts.since, "since", "", "Show logs since timestamp")
-	flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps")
-	flags.BoolVar(&opts.details, "details", false, "Show extra details provided to logs")
-	flags.StringVar(&opts.tail, "tail", "all", "Number of lines to show from the end of the logs")
-	return cmd
-}
-
-func runLogs(dockerCli *command.DockerCli, opts *logsOptions) error {
-	ctx := context.Background()
-
-	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
-	if err != nil {
-		return err
-	}
-
-	if !validDrivers[c.HostConfig.LogConfig.Type] {
-		return fmt.Errorf("\"logs\" command is supported only for \"json-file\" and \"journald\" logging drivers (got: %s)", c.HostConfig.LogConfig.Type)
-	}
-
-	options := types.ContainerLogsOptions{
-		ShowStdout: true,
-		ShowStderr: true,
-		Since:      opts.since,
-		Timestamps: opts.timestamps,
-		Follow:     opts.follow,
-		Tail:       opts.tail,
-		Details:    opts.details,
-	}
-	responseBody, err := dockerCli.Client().ContainerLogs(ctx, opts.container, options)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	if c.Config.Tty {
-		_, err = io.Copy(dockerCli.Out(), responseBody)
-	} else {
-		_, err = stdcopy.StdCopy(dockerCli.Out(), dockerCli.Err(), responseBody)
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/pause.go b/installer/vendor/github.com/docker/docker/cli/command/container/pause.go
deleted file mode 100644
index 6817cf60eb..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/pause.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type pauseOptions struct {
-	containers []string
-}
-
-// NewPauseCommand creates a new cobra.Command for `docker pause`
-func NewPauseCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pauseOptions
-
-	return &cobra.Command{
-		Use:   "pause CONTAINER [CONTAINER...]",
-		Short: "Pause all processes within one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runPause(dockerCli, &opts)
-		},
-	}
-}
-
-func runPause(dockerCli *command.DockerCli, opts *pauseOptions) error {
-	ctx := context.Background()
-
-	var errs []string
-	errChan := parallelOperation(ctx, opts.containers, dockerCli.Client().ContainerPause)
-	for _, container := range opts.containers {
-		if err := <-errChan; err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", container)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/port.go b/installer/vendor/github.com/docker/docker/cli/command/container/port.go
deleted file mode 100644
index ea15290145..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/port.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/go-connections/nat"
-	"github.com/spf13/cobra"
-)
-
-type portOptions struct {
-	container string
-
-	port string
-}
-
-// NewPortCommand creates a new cobra.Command for `docker port`
-func NewPortCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts portOptions
-
-	cmd := &cobra.Command{
-		Use:   "port CONTAINER [PRIVATE_PORT[/PROTO]]",
-		Short: "List port mappings or a specific mapping for the container",
-		Args:  cli.RequiresRangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			if len(args) > 1 {
-				opts.port = args[1]
-			}
-			return runPort(dockerCli, &opts)
-		},
-	}
-	return cmd
-}
-
-func runPort(dockerCli *command.DockerCli, opts *portOptions) error {
-	ctx := context.Background()
-
-	c, err := dockerCli.Client().ContainerInspect(ctx, opts.container)
-	if err != nil {
-		return err
-	}
-
-	if opts.port != "" {
-		port := opts.port
-		proto := "tcp"
-		parts := strings.SplitN(port, "/", 2)
-
-		if len(parts) == 2 && len(parts[1]) != 0 {
-			port = parts[0]
-			proto = parts[1]
-		}
-		natPort := port + "/" + proto
-		newP, err := nat.NewPort(proto, port)
-		if err != nil {
-			return err
-		}
-		if frontends, exists := c.NetworkSettings.Ports[newP]; exists && frontends != nil {
-			for _, frontend := range frontends {
-				fmt.Fprintf(dockerCli.Out(), "%s:%s\n", frontend.HostIP, frontend.HostPort)
-			}
-			return nil
-		}
-		return fmt.Errorf("Error: No public port '%s' published for %s", natPort, opts.container)
-	}
-
-	for from, frontends := range c.NetworkSettings.Ports {
-		for _, frontend := range frontends {
-			fmt.Fprintf(dockerCli.Out(), "%s -> %s:%s\n", from, frontend.HostIP, frontend.HostPort)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/prune.go b/installer/vendor/github.com/docker/docker/cli/command/container/prune.go
deleted file mode 100644
index 064f4c08e0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/prune.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package container
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	units "github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type pruneOptions struct {
-	force bool
-}
-
-// NewPruneCommand returns a new cobra prune command for containers
-func NewPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pruneOptions
-
-	cmd := &cobra.Command{
-		Use:   "prune [OPTIONS]",
-		Short: "Remove all stopped containers",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			spaceReclaimed, output, err := runPrune(dockerCli, opts)
-			if err != nil {
-				return err
-			}
-			if output != "" {
-				fmt.Fprintln(dockerCli.Out(), output)
-			}
-			fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed)))
-			return nil
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Do not prompt for confirmation")
-
-	return cmd
-}
-
-const warning = `WARNING! This will remove all stopped containers.
-Are you sure you want to continue?`
-
-func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed uint64, output string, err error) {
-	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
-		return
-	}
-
-	report, err := dockerCli.Client().ContainersPrune(context.Background(), filters.Args{})
-	if err != nil {
-		return
-	}
-
-	if len(report.ContainersDeleted) > 0 {
-		output = "Deleted Containers:\n"
-		for _, id := range report.ContainersDeleted {
-			output += id + "\n"
-		}
-		spaceReclaimed = report.SpaceReclaimed
-	}
-
-	return
-}
-
-// RunPrune calls the Container Prune API
-// This returns the amount of space reclaimed and a detailed output string
-func RunPrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	return runPrune(dockerCli, pruneOptions{force: true})
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/ps_test.go b/installer/vendor/github.com/docker/docker/cli/command/container/ps_test.go
deleted file mode 100644
index 62b0545274..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/ps_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestBuildContainerListOptions(t *testing.T) {
-	filters := opts.NewFilterOpt()
-	assert.NilError(t, filters.Set("foo=bar"))
-	assert.NilError(t, filters.Set("baz=foo"))
-
-	contexts := []struct {
-		psOpts          *psOptions
-		expectedAll     bool
-		expectedSize    bool
-		expectedLimit   int
-		expectedFilters map[string]string
-	}{
-		{
-			psOpts: &psOptions{
-				all:    true,
-				size:   true,
-				last:   5,
-				filter: filters,
-			},
-			expectedAll:   true,
-			expectedSize:  true,
-			expectedLimit: 5,
-			expectedFilters: map[string]string{
-				"foo": "bar",
-				"baz": "foo",
-			},
-		},
-		{
-			psOpts: &psOptions{
-				all:     true,
-				size:    true,
-				last:    -1,
-				nLatest: true,
-			},
-			expectedAll:     true,
-			expectedSize:    true,
-			expectedLimit:   1,
-			expectedFilters: make(map[string]string),
-		},
-		{
-			psOpts: &psOptions{
-				all:    true,
-				size:   false,
-				last:   5,
-				filter: filters,
-				// With .Size, size should be true
-				format: "{{.Size}}",
-			},
-			expectedAll:   true,
-			expectedSize:  true,
-			expectedLimit: 5,
-			expectedFilters: map[string]string{
-				"foo": "bar",
-				"baz": "foo",
-			},
-		},
-		{
-			psOpts: &psOptions{
-				all:    true,
-				size:   false,
-				last:   5,
-				filter: filters,
-				// With .Size, size should be true
-				format: "{{.Size}} {{.CreatedAt}} {{.Networks}}",
-			},
-			expectedAll:   true,
-			expectedSize:  true,
-			expectedLimit: 5,
-			expectedFilters: map[string]string{
-				"foo": "bar",
-				"baz": "foo",
-			},
-		},
-		{
-			psOpts: &psOptions{
-				all:    true,
-				size:   false,
-				last:   5,
-				filter: filters,
-				// Without .Size, size should be false
-				format: "{{.CreatedAt}} {{.Networks}}",
-			},
-			expectedAll:   true,
-			expectedSize:  false,
-			expectedLimit: 5,
-			expectedFilters: map[string]string{
-				"foo": "bar",
-				"baz": "foo",
-			},
-		},
-	}
-
-	for _, c := range contexts {
-		options, err := buildContainerListOptions(c.psOpts)
-		assert.NilError(t, err)
-
-		assert.Equal(t, c.expectedAll, options.All)
-		assert.Equal(t, c.expectedSize, options.Size)
-		assert.Equal(t, c.expectedLimit, options.Limit)
-		assert.Equal(t, options.Filters.Len(), len(c.expectedFilters))
-
-		for k, v := range c.expectedFilters {
-			f := options.Filters
-			if !f.ExactMatch(k, v) {
-				t.Fatalf("Expected filter with key %s to be %s but got %s", k, v, f.Get(k))
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/rename.go b/installer/vendor/github.com/docker/docker/cli/command/container/rename.go
deleted file mode 100644
index 346fb7b3b9..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/rename.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type renameOptions struct {
-	oldName string
-	newName string
-}
-
-// NewRenameCommand creates a new cobra.Command for `docker rename`
-func NewRenameCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts renameOptions
-
-	cmd := &cobra.Command{
-		Use:   "rename CONTAINER NEW_NAME",
-		Short: "Rename a container",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.oldName = args[0]
-			opts.newName = args[1]
-			return runRename(dockerCli, &opts)
-		},
-	}
-	return cmd
-}
-
-func runRename(dockerCli *command.DockerCli, opts *renameOptions) error {
-	ctx := context.Background()
-
-	oldName := strings.TrimSpace(opts.oldName)
-	newName := strings.TrimSpace(opts.newName)
-
-	if oldName == "" || newName == "" {
-		return fmt.Errorf("Error: Neither old nor new names may be empty")
-	}
-
-	if err := dockerCli.Client().ContainerRename(ctx, oldName, newName); err != nil {
-		fmt.Fprintf(dockerCli.Err(), "%s\n", err)
-		return fmt.Errorf("Error: failed to rename container named %s", oldName)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/restart.go b/installer/vendor/github.com/docker/docker/cli/command/container/restart.go
deleted file mode 100644
index fc3ba93c84..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/restart.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type restartOptions struct {
-	nSeconds        int
-	nSecondsChanged bool
-
-	containers []string
-}
-
-// NewRestartCommand creates a new cobra.Command for `docker restart`
-func NewRestartCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts restartOptions
-
-	cmd := &cobra.Command{
-		Use:   "restart [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Restart one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			opts.nSecondsChanged = cmd.Flags().Changed("time")
-			return runRestart(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.IntVarP(&opts.nSeconds, "time", "t", 10, "Seconds to wait for stop before killing the container")
-	return cmd
-}
-
-func runRestart(dockerCli *command.DockerCli, opts *restartOptions) error {
-	ctx := context.Background()
-	var errs []string
-	var timeout *time.Duration
-	if opts.nSecondsChanged {
-		timeoutValue := time.Duration(opts.nSeconds) * time.Second
-		timeout = &timeoutValue
-	}
-
-	for _, name := range opts.containers {
-		if err := dockerCli.Client().ContainerRestart(ctx, name, timeout); err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", name)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/rm.go b/installer/vendor/github.com/docker/docker/cli/command/container/rm.go
deleted file mode 100644
index 60724f194b..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/rm.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type rmOptions struct {
-	rmVolumes bool
-	rmLink    bool
-	force     bool
-
-	containers []string
-}
-
-// NewRmCommand creates a new cobra.Command for `docker rm`
-func NewRmCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts rmOptions
-
-	cmd := &cobra.Command{
-		Use:   "rm [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Remove one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runRm(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.rmVolumes, "volumes", "v", false, "Remove the volumes associated with the container")
-	flags.BoolVarP(&opts.rmLink, "link", "l", false, "Remove the specified link")
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force the removal of a running container (uses SIGKILL)")
-	return cmd
-}
-
-func runRm(dockerCli *command.DockerCli, opts *rmOptions) error {
-	ctx := context.Background()
-
-	var errs []string
-	options := types.ContainerRemoveOptions{
-		RemoveVolumes: opts.rmVolumes,
-		RemoveLinks:   opts.rmLink,
-		Force:         opts.force,
-	}
-
-	errChan := parallelOperation(ctx, opts.containers, func(ctx context.Context, container string) error {
-		if container == "" {
-			return fmt.Errorf("Container name cannot be empty")
-		}
-		container = strings.Trim(container, "/")
-		return dockerCli.Client().ContainerRemove(ctx, container, options)
-	})
-
-	for _, name := range opts.containers {
-		if err := <-errChan; err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", name)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/run.go b/installer/vendor/github.com/docker/docker/cli/command/container/run.go
deleted file mode 100644
index 0fad93e688..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/run.go
+++ /dev/null
@@ -1,285 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"net/http/httputil"
-	"os"
-	"runtime"
-	"strings"
-	"syscall"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	opttypes "github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/promise"
-	"github.com/docker/docker/pkg/signal"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/libnetwork/resolvconf/dns"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-type runOptions struct {
-	detach     bool
-	sigProxy   bool
-	name       string
-	detachKeys string
-}
-
-// NewRunCommand create a new `docker run` command
-func NewRunCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts runOptions
-	var copts *runconfigopts.ContainerOptions
-
-	cmd := &cobra.Command{
-		Use:   "run [OPTIONS] IMAGE [COMMAND] [ARG...]",
-		Short: "Run a command in a new container",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			copts.Image = args[0]
-			if len(args) > 1 {
-				copts.Args = args[1:]
-			}
-			return runRun(dockerCli, cmd.Flags(), &opts, copts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	// These are flags not stored in Config/HostConfig
-	flags.BoolVarP(&opts.detach, "detach", "d", false, "Run container in background and print container ID")
-	flags.BoolVar(&opts.sigProxy, "sig-proxy", true, "Proxy received signals to the process")
-	flags.StringVar(&opts.name, "name", "", "Assign a name to the container")
-	flags.StringVar(&opts.detachKeys, "detach-keys", "", "Override the key sequence for detaching a container")
-
-	// Add an explicit help that doesn't have a `-h` to prevent the conflict
-	// with hostname
-	flags.Bool("help", false, "Print usage")
-
-	command.AddTrustedFlags(flags, true)
-	copts = runconfigopts.AddFlags(flags)
-	return cmd
-}
-
-func runRun(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts *runOptions, copts *runconfigopts.ContainerOptions) error {
-	stdout, stderr, stdin := dockerCli.Out(), dockerCli.Err(), dockerCli.In()
-	client := dockerCli.Client()
-	// TODO: pass this as an argument
-	cmdPath := "run"
-
-	var (
-		flAttach                              *opttypes.ListOpts
-		ErrConflictAttachDetach               = fmt.Errorf("Conflicting options: -a and -d")
-		ErrConflictRestartPolicyAndAutoRemove = fmt.Errorf("Conflicting options: --restart and --rm")
-	)
-
-	config, hostConfig, networkingConfig, err := runconfigopts.Parse(flags, copts)
-
-	// just in case the Parse does not exit
-	if err != nil {
-		reportError(stderr, cmdPath, err.Error(), true)
-		return cli.StatusError{StatusCode: 125}
-	}
-
-	if hostConfig.AutoRemove && !hostConfig.RestartPolicy.IsNone() {
-		return ErrConflictRestartPolicyAndAutoRemove
-	}
-	if hostConfig.OomKillDisable != nil && *hostConfig.OomKillDisable && hostConfig.Memory == 0 {
-		fmt.Fprintf(stderr, "WARNING: Disabling the OOM killer on containers without setting a '-m/--memory' limit may be dangerous.\n")
-	}
-
-	if len(hostConfig.DNS) > 0 {
-		// check the DNS settings passed via --dns against
-		// localhost regexp to warn if they are trying to
-		// set a DNS to a localhost address
-		for _, dnsIP := range hostConfig.DNS {
-			if dns.IsLocalhost(dnsIP) {
-				fmt.Fprintf(stderr, "WARNING: Localhost DNS setting (--dns=%s) may fail in containers.\n", dnsIP)
-				break
-			}
-		}
-	}
-
-	config.ArgsEscaped = false
-
-	if !opts.detach {
-		if err := dockerCli.In().CheckTty(config.AttachStdin, config.Tty); err != nil {
-			return err
-		}
-	} else {
-		if fl := flags.Lookup("attach"); fl != nil {
-			flAttach = fl.Value.(*opttypes.ListOpts)
-			if flAttach.Len() != 0 {
-				return ErrConflictAttachDetach
-			}
-		}
-
-		config.AttachStdin = false
-		config.AttachStdout = false
-		config.AttachStderr = false
-		config.StdinOnce = false
-	}
-
-	// Disable sigProxy when in TTY mode
-	if config.Tty {
-		opts.sigProxy = false
-	}
-
-	// Telling the Windows daemon the initial size of the tty during start makes
-	// a far better user experience rather than relying on subsequent resizes
-	// to cause things to catch up.
-	if runtime.GOOS == "windows" {
-		hostConfig.ConsoleSize[0], hostConfig.ConsoleSize[1] = dockerCli.Out().GetTtySize()
-	}
-
-	ctx, cancelFun := context.WithCancel(context.Background())
-
-	createResponse, err := createContainer(ctx, dockerCli, config, hostConfig, networkingConfig, hostConfig.ContainerIDFile, opts.name)
-	if err != nil {
-		reportError(stderr, cmdPath, err.Error(), true)
-		return runStartContainerErr(err)
-	}
-	if opts.sigProxy {
-		sigc := ForwardAllSignals(ctx, dockerCli, createResponse.ID)
-		defer signal.StopCatch(sigc)
-	}
-	var (
-		waitDisplayID chan struct{}
-		errCh         chan error
-	)
-	if !config.AttachStdout && !config.AttachStderr {
-		// Make this asynchronous to allow the client to write to stdin before having to read the ID
-		waitDisplayID = make(chan struct{})
-		go func() {
-			defer close(waitDisplayID)
-			fmt.Fprintf(stdout, "%s\n", createResponse.ID)
-		}()
-	}
-	attach := config.AttachStdin || config.AttachStdout || config.AttachStderr
-	if attach {
-		var (
-			out, cerr io.Writer
-			in        io.ReadCloser
-		)
-		if config.AttachStdin {
-			in = stdin
-		}
-		if config.AttachStdout {
-			out = stdout
-		}
-		if config.AttachStderr {
-			if config.Tty {
-				cerr = stdout
-			} else {
-				cerr = stderr
-			}
-		}
-
-		if opts.detachKeys != "" {
-			dockerCli.ConfigFile().DetachKeys = opts.detachKeys
-		}
-
-		options := types.ContainerAttachOptions{
-			Stream:     true,
-			Stdin:      config.AttachStdin,
-			Stdout:     config.AttachStdout,
-			Stderr:     config.AttachStderr,
-			DetachKeys: dockerCli.ConfigFile().DetachKeys,
-		}
-
-		resp, errAttach := client.ContainerAttach(ctx, createResponse.ID, options)
-		if errAttach != nil && errAttach != httputil.ErrPersistEOF {
-			// ContainerAttach returns an ErrPersistEOF (connection closed)
-			// means server met an error and put it in Hijacked connection
-			// keep the error and read detailed error message from hijacked connection later
-			return errAttach
-		}
-		defer resp.Close()
-
-		errCh = promise.Go(func() error {
-			errHijack := holdHijackedConnection(ctx, dockerCli, config.Tty, in, out, cerr, resp)
-			if errHijack == nil {
-				return errAttach
-			}
-			return errHijack
-		})
-	}
-
-	statusChan := waitExitOrRemoved(ctx, dockerCli, createResponse.ID, hostConfig.AutoRemove)
-
-	//start the container
-	if err := client.ContainerStart(ctx, createResponse.ID, types.ContainerStartOptions{}); err != nil {
-		// If we have holdHijackedConnection, we should notify
-		// holdHijackedConnection we are going to exit and wait
-		// to avoid the terminal are not restored.
-		if attach {
-			cancelFun()
-			<-errCh
-		}
-
-		reportError(stderr, cmdPath, err.Error(), false)
-		if hostConfig.AutoRemove {
-			// wait container to be removed
-			<-statusChan
-		}
-		return runStartContainerErr(err)
-	}
-
-	if (config.AttachStdin || config.AttachStdout || config.AttachStderr) && config.Tty && dockerCli.Out().IsTerminal() {
-		if err := MonitorTtySize(ctx, dockerCli, createResponse.ID, false); err != nil {
-			fmt.Fprintf(stderr, "Error monitoring TTY size: %s\n", err)
-		}
-	}
-
-	if errCh != nil {
-		if err := <-errCh; err != nil {
-			logrus.Debugf("Error hijack: %s", err)
-			return err
-		}
-	}
-
-	// Detached mode: wait for the id to be displayed and return.
-	if !config.AttachStdout && !config.AttachStderr {
-		// Detached mode
-		<-waitDisplayID
-		return nil
-	}
-
-	status := <-statusChan
-	if status != 0 {
-		return cli.StatusError{StatusCode: status}
-	}
-	return nil
-}
-
-// reportError is a utility method that prints a user-friendly message
-// containing the error that occurred during parsing and a suggestion to get help
-func reportError(stderr io.Writer, name string, str string, withHelp bool) {
-	if withHelp {
-		str += ".\nSee '" + os.Args[0] + " " + name + " --help'"
-	}
-	fmt.Fprintf(stderr, "%s: %s.\n", os.Args[0], str)
-}
-
-// if container start fails with 'not found'/'no such' error, return 127
-// if container start fails with 'permission denied' error, return 126
-// return 125 for generic docker daemon failures
-func runStartContainerErr(err error) error {
-	trimmedErr := strings.TrimPrefix(err.Error(), "Error response from daemon: ")
-	statusError := cli.StatusError{StatusCode: 125}
-	if strings.Contains(trimmedErr, "executable file not found") ||
-		strings.Contains(trimmedErr, "no such file or directory") ||
-		strings.Contains(trimmedErr, "system cannot find the file specified") {
-		statusError = cli.StatusError{StatusCode: 127}
-	} else if strings.Contains(trimmedErr, syscall.EACCES.Error()) {
-		statusError = cli.StatusError{StatusCode: 126}
-	}
-
-	return statusError
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/start.go b/installer/vendor/github.com/docker/docker/cli/command/container/start.go
deleted file mode 100644
index 3521a41949..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/start.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"net/http/httputil"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/promise"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/spf13/cobra"
-)
-
-type startOptions struct {
-	attach        bool
-	openStdin     bool
-	detachKeys    string
-	checkpoint    string
-	checkpointDir string
-
-	containers []string
-}
-
-// NewStartCommand creates a new cobra.Command for `docker start`
-func NewStartCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts startOptions
-
-	cmd := &cobra.Command{
-		Use:   "start [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Start one or more stopped containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runStart(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.attach, "attach", "a", false, "Attach STDOUT/STDERR and forward signals")
-	flags.BoolVarP(&opts.openStdin, "interactive", "i", false, "Attach container's STDIN")
-	flags.StringVar(&opts.detachKeys, "detach-keys", "", "Override the key sequence for detaching a container")
-
-	flags.StringVar(&opts.checkpoint, "checkpoint", "", "Restore from this checkpoint")
-	flags.SetAnnotation("checkpoint", "experimental", nil)
-	flags.StringVar(&opts.checkpointDir, "checkpoint-dir", "", "Use a custom checkpoint storage directory")
-	flags.SetAnnotation("checkpoint-dir", "experimental", nil)
-	return cmd
-}
-
-func runStart(dockerCli *command.DockerCli, opts *startOptions) error {
-	ctx, cancelFun := context.WithCancel(context.Background())
-
-	if opts.attach || opts.openStdin {
-		// We're going to attach to a container.
-		// 1. Ensure we only have one container.
-		if len(opts.containers) > 1 {
-			return fmt.Errorf("You cannot start and attach multiple containers at once.")
-		}
-
-		// 2. Attach to the container.
-		container := opts.containers[0]
-		c, err := dockerCli.Client().ContainerInspect(ctx, container)
-		if err != nil {
-			return err
-		}
-
-		// We always use c.ID instead of container to maintain consistency during `docker start`
-		if !c.Config.Tty {
-			sigc := ForwardAllSignals(ctx, dockerCli, c.ID)
-			defer signal.StopCatch(sigc)
-		}
-
-		if opts.detachKeys != "" {
-			dockerCli.ConfigFile().DetachKeys = opts.detachKeys
-		}
-
-		options := types.ContainerAttachOptions{
-			Stream:     true,
-			Stdin:      opts.openStdin && c.Config.OpenStdin,
-			Stdout:     true,
-			Stderr:     true,
-			DetachKeys: dockerCli.ConfigFile().DetachKeys,
-		}
-
-		var in io.ReadCloser
-
-		if options.Stdin {
-			in = dockerCli.In()
-		}
-
-		resp, errAttach := dockerCli.Client().ContainerAttach(ctx, c.ID, options)
-		if errAttach != nil && errAttach != httputil.ErrPersistEOF {
-			// ContainerAttach return an ErrPersistEOF (connection closed)
-			// means server met an error and already put it in Hijacked connection,
-			// we would keep the error and read the detailed error message from hijacked connection
-			return errAttach
-		}
-		defer resp.Close()
-		cErr := promise.Go(func() error {
-			errHijack := holdHijackedConnection(ctx, dockerCli, c.Config.Tty, in, dockerCli.Out(), dockerCli.Err(), resp)
-			if errHijack == nil {
-				return errAttach
-			}
-			return errHijack
-		})
-
-		// 3. We should open a channel for receiving status code of the container
-		// no matter it's detached, removed on daemon side(--rm) or exit normally.
-		statusChan := waitExitOrRemoved(ctx, dockerCli, c.ID, c.HostConfig.AutoRemove)
-		startOptions := types.ContainerStartOptions{
-			CheckpointID:  opts.checkpoint,
-			CheckpointDir: opts.checkpointDir,
-		}
-
-		// 4. Start the container.
-		if err := dockerCli.Client().ContainerStart(ctx, c.ID, startOptions); err != nil {
-			cancelFun()
-			<-cErr
-			if c.HostConfig.AutoRemove {
-				// wait container to be removed
-				<-statusChan
-			}
-			return err
-		}
-
-		// 5. Wait for attachment to break.
-		if c.Config.Tty && dockerCli.Out().IsTerminal() {
-			if err := MonitorTtySize(ctx, dockerCli, c.ID, false); err != nil {
-				fmt.Fprintf(dockerCli.Err(), "Error monitoring TTY size: %s\n", err)
-			}
-		}
-		if attchErr := <-cErr; attchErr != nil {
-			return attchErr
-		}
-
-		if status := <-statusChan; status != 0 {
-			return cli.StatusError{StatusCode: status}
-		}
-	} else if opts.checkpoint != "" {
-		if len(opts.containers) > 1 {
-			return fmt.Errorf("You cannot restore multiple containers at once.")
-		}
-		container := opts.containers[0]
-		startOptions := types.ContainerStartOptions{
-			CheckpointID:  opts.checkpoint,
-			CheckpointDir: opts.checkpointDir,
-		}
-		return dockerCli.Client().ContainerStart(ctx, container, startOptions)
-
-	} else {
-		// We're not going to attach to anything.
-		// Start as many containers as we want.
-		return startContainersWithoutAttachments(ctx, dockerCli, opts.containers)
-	}
-
-	return nil
-}
-
-func startContainersWithoutAttachments(ctx context.Context, dockerCli *command.DockerCli, containers []string) error {
-	var failedContainers []string
-	for _, container := range containers {
-		if err := dockerCli.Client().ContainerStart(ctx, container, types.ContainerStartOptions{}); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "%s\n", err)
-			failedContainers = append(failedContainers, container)
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", container)
-		}
-	}
-
-	if len(failedContainers) > 0 {
-		return fmt.Errorf("Error: failed to start containers: %v", strings.Join(failedContainers, ", "))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/stats.go b/installer/vendor/github.com/docker/docker/cli/command/container/stats.go
deleted file mode 100644
index 12d5c68522..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/stats.go
+++ /dev/null
@@ -1,243 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/spf13/cobra"
-)
-
-type statsOptions struct {
-	all        bool
-	noStream   bool
-	format     string
-	containers []string
-}
-
-// NewStatsCommand creates a new cobra.Command for `docker stats`
-func NewStatsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts statsOptions
-
-	cmd := &cobra.Command{
-		Use:   "stats [OPTIONS] [CONTAINER...]",
-		Short: "Display a live stream of container(s) resource usage statistics",
-		Args:  cli.RequiresMinArgs(0),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runStats(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.all, "all", "a", false, "Show all containers (default shows just running)")
-	flags.BoolVar(&opts.noStream, "no-stream", false, "Disable streaming stats and only pull the first result")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print images using a Go template")
-	return cmd
-}
-
-// runStats displays a live stream of resource usage statistics for one or more containers.
-// This shows real-time information on CPU usage, memory usage, and network I/O.
-func runStats(dockerCli *command.DockerCli, opts *statsOptions) error {
-	showAll := len(opts.containers) == 0
-	closeChan := make(chan error)
-
-	ctx := context.Background()
-
-	// monitorContainerEvents watches for container creation and removal (only
-	// used when calling `docker stats` without arguments).
-	monitorContainerEvents := func(started chan<- struct{}, c chan events.Message) {
-		f := filters.NewArgs()
-		f.Add("type", "container")
-		options := types.EventsOptions{
-			Filters: f,
-		}
-
-		eventq, errq := dockerCli.Client().Events(ctx, options)
-
-		// Whether we successfully subscribed to eventq or not, we can now
-		// unblock the main goroutine.
-		close(started)
-
-		for {
-			select {
-			case event := <-eventq:
-				c <- event
-			case err := <-errq:
-				closeChan <- err
-				return
-			}
-		}
-	}
-
-	// Get the daemonOSType if not set already
-	if daemonOSType == "" {
-		svctx := context.Background()
-		sv, err := dockerCli.Client().ServerVersion(svctx)
-		if err != nil {
-			return err
-		}
-		daemonOSType = sv.Os
-	}
-
-	// waitFirst is a WaitGroup to wait first stat data's reach for each container
-	waitFirst := &sync.WaitGroup{}
-
-	cStats := stats{}
-	// getContainerList simulates creation event for all previously existing
-	// containers (only used when calling `docker stats` without arguments).
-	getContainerList := func() {
-		options := types.ContainerListOptions{
-			All: opts.all,
-		}
-		cs, err := dockerCli.Client().ContainerList(ctx, options)
-		if err != nil {
-			closeChan <- err
-		}
-		for _, container := range cs {
-			s := formatter.NewContainerStats(container.ID[:12], daemonOSType)
-			if cStats.add(s) {
-				waitFirst.Add(1)
-				go collect(ctx, s, dockerCli.Client(), !opts.noStream, waitFirst)
-			}
-		}
-	}
-
-	if showAll {
-		// If no names were specified, start a long running goroutine which
-		// monitors container events. We make sure we're subscribed before
-		// retrieving the list of running containers to avoid a race where we
-		// would "miss" a creation.
-		started := make(chan struct{})
-		eh := command.InitEventHandler()
-		eh.Handle("create", func(e events.Message) {
-			if opts.all {
-				s := formatter.NewContainerStats(e.ID[:12], daemonOSType)
-				if cStats.add(s) {
-					waitFirst.Add(1)
-					go collect(ctx, s, dockerCli.Client(), !opts.noStream, waitFirst)
-				}
-			}
-		})
-
-		eh.Handle("start", func(e events.Message) {
-			s := formatter.NewContainerStats(e.ID[:12], daemonOSType)
-			if cStats.add(s) {
-				waitFirst.Add(1)
-				go collect(ctx, s, dockerCli.Client(), !opts.noStream, waitFirst)
-			}
-		})
-
-		eh.Handle("die", func(e events.Message) {
-			if !opts.all {
-				cStats.remove(e.ID[:12])
-			}
-		})
-
-		eventChan := make(chan events.Message)
-		go eh.Watch(eventChan)
-		go monitorContainerEvents(started, eventChan)
-		defer close(eventChan)
-		<-started
-
-		// Start a short-lived goroutine to retrieve the initial list of
-		// containers.
-		getContainerList()
-	} else {
-		// Artificially send creation events for the containers we were asked to
-		// monitor (same code path than we use when monitoring all containers).
-		for _, name := range opts.containers {
-			s := formatter.NewContainerStats(name, daemonOSType)
-			if cStats.add(s) {
-				waitFirst.Add(1)
-				go collect(ctx, s, dockerCli.Client(), !opts.noStream, waitFirst)
-			}
-		}
-
-		// We don't expect any asynchronous errors: closeChan can be closed.
-		close(closeChan)
-
-		// Do a quick pause to detect any error with the provided list of
-		// container names.
-		time.Sleep(1500 * time.Millisecond)
-		var errs []string
-		cStats.mu.Lock()
-		for _, c := range cStats.cs {
-			cErr := c.GetError()
-			if cErr != nil {
-				errs = append(errs, fmt.Sprintf("%s: %v", c.Name, cErr))
-			}
-		}
-		cStats.mu.Unlock()
-		if len(errs) > 0 {
-			return fmt.Errorf("%s", strings.Join(errs, ", "))
-		}
-	}
-
-	// before print to screen, make sure each container get at least one valid stat data
-	waitFirst.Wait()
-	format := opts.format
-	if len(format) == 0 {
-		if len(dockerCli.ConfigFile().StatsFormat) > 0 {
-			format = dockerCli.ConfigFile().StatsFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-	statsCtx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.NewStatsFormat(format, daemonOSType),
-	}
-	cleanScreen := func() {
-		if !opts.noStream {
-			fmt.Fprint(dockerCli.Out(), "\033[2J")
-			fmt.Fprint(dockerCli.Out(), "\033[H")
-		}
-	}
-
-	var err error
-	for range time.Tick(500 * time.Millisecond) {
-		cleanScreen()
-		ccstats := []formatter.StatsEntry{}
-		cStats.mu.Lock()
-		for _, c := range cStats.cs {
-			ccstats = append(ccstats, c.GetStatistics())
-		}
-		cStats.mu.Unlock()
-		if err = formatter.ContainerStatsWrite(statsCtx, ccstats); err != nil {
-			break
-		}
-		if len(cStats.cs) == 0 && !showAll {
-			break
-		}
-		if opts.noStream {
-			break
-		}
-		select {
-		case err, ok := <-closeChan:
-			if ok {
-				if err != nil {
-					// this is suppressing "unexpected EOF" in the cli when the
-					// daemon restarts so it shutdowns cleanly
-					if err == io.ErrUnexpectedEOF {
-						return nil
-					}
-					return err
-				}
-			}
-		default:
-			// just skip
-		}
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/stats_helpers.go b/installer/vendor/github.com/docker/docker/cli/command/container/stats_helpers.go
deleted file mode 100644
index 4b57e3fe05..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/stats_helpers.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package container
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/client"
-	"golang.org/x/net/context"
-)
-
-type stats struct {
-	ostype string
-	mu     sync.Mutex
-	cs     []*formatter.ContainerStats
-}
-
-// daemonOSType is set once we have at least one stat for a container
-// from the daemon. It is used to ensure we print the right header based
-// on the daemon platform.
-var daemonOSType string
-
-func (s *stats) add(cs *formatter.ContainerStats) bool {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	if _, exists := s.isKnownContainer(cs.Container); !exists {
-		s.cs = append(s.cs, cs)
-		return true
-	}
-	return false
-}
-
-func (s *stats) remove(id string) {
-	s.mu.Lock()
-	if i, exists := s.isKnownContainer(id); exists {
-		s.cs = append(s.cs[:i], s.cs[i+1:]...)
-	}
-	s.mu.Unlock()
-}
-
-func (s *stats) isKnownContainer(cid string) (int, bool) {
-	for i, c := range s.cs {
-		if c.Container == cid {
-			return i, true
-		}
-	}
-	return -1, false
-}
-
-func collect(ctx context.Context, s *formatter.ContainerStats, cli client.APIClient, streamStats bool, waitFirst *sync.WaitGroup) {
-	logrus.Debugf("collecting stats for %s", s.Container)
-	var (
-		getFirst       bool
-		previousCPU    uint64
-		previousSystem uint64
-		u              = make(chan error, 1)
-	)
-
-	defer func() {
-		// if error happens and we get nothing of stats, release wait group whatever
-		if !getFirst {
-			getFirst = true
-			waitFirst.Done()
-		}
-	}()
-
-	response, err := cli.ContainerStats(ctx, s.Container, streamStats)
-	if err != nil {
-		s.SetError(err)
-		return
-	}
-	defer response.Body.Close()
-
-	dec := json.NewDecoder(response.Body)
-	go func() {
-		for {
-			var (
-				v                 *types.StatsJSON
-				memPercent        = 0.0
-				cpuPercent        = 0.0
-				blkRead, blkWrite uint64 // Only used on Linux
-				mem               = 0.0
-				memLimit          = 0.0
-				memPerc           = 0.0
-				pidsStatsCurrent  uint64
-			)
-
-			if err := dec.Decode(&v); err != nil {
-				dec = json.NewDecoder(io.MultiReader(dec.Buffered(), response.Body))
-				u <- err
-				if err == io.EOF {
-					break
-				}
-				time.Sleep(100 * time.Millisecond)
-				continue
-			}
-
-			daemonOSType = response.OSType
-
-			if daemonOSType != "windows" {
-				// MemoryStats.Limit will never be 0 unless the container is not running and we haven't
-				// got any data from cgroup
-				if v.MemoryStats.Limit != 0 {
-					memPercent = float64(v.MemoryStats.Usage) / float64(v.MemoryStats.Limit) * 100.0
-				}
-				previousCPU = v.PreCPUStats.CPUUsage.TotalUsage
-				previousSystem = v.PreCPUStats.SystemUsage
-				cpuPercent = calculateCPUPercentUnix(previousCPU, previousSystem, v)
-				blkRead, blkWrite = calculateBlockIO(v.BlkioStats)
-				mem = float64(v.MemoryStats.Usage)
-				memLimit = float64(v.MemoryStats.Limit)
-				memPerc = memPercent
-				pidsStatsCurrent = v.PidsStats.Current
-			} else {
-				cpuPercent = calculateCPUPercentWindows(v)
-				blkRead = v.StorageStats.ReadSizeBytes
-				blkWrite = v.StorageStats.WriteSizeBytes
-				mem = float64(v.MemoryStats.PrivateWorkingSet)
-			}
-			netRx, netTx := calculateNetwork(v.Networks)
-			s.SetStatistics(formatter.StatsEntry{
-				Name:             v.Name,
-				ID:               v.ID,
-				CPUPercentage:    cpuPercent,
-				Memory:           mem,
-				MemoryPercentage: memPerc,
-				MemoryLimit:      memLimit,
-				NetworkRx:        netRx,
-				NetworkTx:        netTx,
-				BlockRead:        float64(blkRead),
-				BlockWrite:       float64(blkWrite),
-				PidsCurrent:      pidsStatsCurrent,
-			})
-			u <- nil
-			if !streamStats {
-				return
-			}
-		}
-	}()
-	for {
-		select {
-		case <-time.After(2 * time.Second):
-			// zero out the values if we have not received an update within
-			// the specified duration.
-			s.SetErrorAndReset(errors.New("timeout waiting for stats"))
-			// if this is the first stat you get, release WaitGroup
-			if !getFirst {
-				getFirst = true
-				waitFirst.Done()
-			}
-		case err := <-u:
-			if err != nil {
-				s.SetError(err)
-				continue
-			}
-			s.SetError(nil)
-			// if this is the first stat you get, release WaitGroup
-			if !getFirst {
-				getFirst = true
-				waitFirst.Done()
-			}
-		}
-		if !streamStats {
-			return
-		}
-	}
-}
-
-func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJSON) float64 {
-	var (
-		cpuPercent = 0.0
-		// calculate the change for the cpu usage of the container in between readings
-		cpuDelta = float64(v.CPUStats.CPUUsage.TotalUsage) - float64(previousCPU)
-		// calculate the change for the entire system between readings
-		systemDelta = float64(v.CPUStats.SystemUsage) - float64(previousSystem)
-	)
-
-	if systemDelta > 0.0 && cpuDelta > 0.0 {
-		cpuPercent = (cpuDelta / systemDelta) * float64(len(v.CPUStats.CPUUsage.PercpuUsage)) * 100.0
-	}
-	return cpuPercent
-}
-
-func calculateCPUPercentWindows(v *types.StatsJSON) float64 {
-	// Max number of 100ns intervals between the previous time read and now
-	possIntervals := uint64(v.Read.Sub(v.PreRead).Nanoseconds()) // Start with number of ns intervals
-	possIntervals /= 100                                         // Convert to number of 100ns intervals
-	possIntervals *= uint64(v.NumProcs)                          // Multiple by the number of processors
-
-	// Intervals used
-	intervalsUsed := v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage
-
-	// Percentage avoiding divide-by-zero
-	if possIntervals > 0 {
-		return float64(intervalsUsed) / float64(possIntervals) * 100.0
-	}
-	return 0.00
-}
-
-func calculateBlockIO(blkio types.BlkioStats) (blkRead uint64, blkWrite uint64) {
-	for _, bioEntry := range blkio.IoServiceBytesRecursive {
-		switch strings.ToLower(bioEntry.Op) {
-		case "read":
-			blkRead = blkRead + bioEntry.Value
-		case "write":
-			blkWrite = blkWrite + bioEntry.Value
-		}
-	}
-	return
-}
-
-func calculateNetwork(network map[string]types.NetworkStats) (float64, float64) {
-	var rx, tx float64
-
-	for _, v := range network {
-		rx += float64(v.RxBytes)
-		tx += float64(v.TxBytes)
-	}
-	return rx, tx
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/stats_unit_test.go b/installer/vendor/github.com/docker/docker/cli/command/container/stats_unit_test.go
deleted file mode 100644
index 828d634c8a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/stats_unit_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestCalculateBlockIO(t *testing.T) {
-	blkio := types.BlkioStats{
-		IoServiceBytesRecursive: []types.BlkioStatEntry{{8, 0, "read", 1234}, {8, 1, "read", 4567}, {8, 0, "write", 123}, {8, 1, "write", 456}},
-	}
-	blkRead, blkWrite := calculateBlockIO(blkio)
-	if blkRead != 5801 {
-		t.Fatalf("blkRead = %d, want 5801", blkRead)
-	}
-	if blkWrite != 579 {
-		t.Fatalf("blkWrite = %d, want 579", blkWrite)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/stop.go b/installer/vendor/github.com/docker/docker/cli/command/container/stop.go
deleted file mode 100644
index c68ede5368..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/stop.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type stopOptions struct {
-	time        int
-	timeChanged bool
-
-	containers []string
-}
-
-// NewStopCommand creates a new cobra.Command for `docker stop`
-func NewStopCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts stopOptions
-
-	cmd := &cobra.Command{
-		Use:   "stop [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Stop one or more running containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			opts.timeChanged = cmd.Flags().Changed("time")
-			return runStop(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.IntVarP(&opts.time, "time", "t", 10, "Seconds to wait for stop before killing it")
-	return cmd
-}
-
-func runStop(dockerCli *command.DockerCli, opts *stopOptions) error {
-	ctx := context.Background()
-
-	var timeout *time.Duration
-	if opts.timeChanged {
-		timeoutValue := time.Duration(opts.time) * time.Second
-		timeout = &timeoutValue
-	}
-
-	var errs []string
-
-	errChan := parallelOperation(ctx, opts.containers, func(ctx context.Context, id string) error {
-		return dockerCli.Client().ContainerStop(ctx, id, timeout)
-	})
-	for _, container := range opts.containers {
-		if err := <-errChan; err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", container)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/top.go b/installer/vendor/github.com/docker/docker/cli/command/container/top.go
deleted file mode 100644
index 160153ba7f..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/top.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-	"text/tabwriter"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type topOptions struct {
-	container string
-
-	args []string
-}
-
-// NewTopCommand creates a new cobra.Command for `docker top`
-func NewTopCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts topOptions
-
-	cmd := &cobra.Command{
-		Use:   "top CONTAINER [ps OPTIONS]",
-		Short: "Display the running processes of a container",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.container = args[0]
-			opts.args = args[1:]
-			return runTop(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	return cmd
-}
-
-func runTop(dockerCli *command.DockerCli, opts *topOptions) error {
-	ctx := context.Background()
-
-	procList, err := dockerCli.Client().ContainerTop(ctx, opts.container, opts.args)
-	if err != nil {
-		return err
-	}
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-	fmt.Fprintln(w, strings.Join(procList.Titles, "\t"))
-
-	for _, proc := range procList.Processes {
-		fmt.Fprintln(w, strings.Join(proc, "\t"))
-	}
-	w.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/tty.go b/installer/vendor/github.com/docker/docker/cli/command/container/tty.go
deleted file mode 100644
index 6af8e2becf..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/tty.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"os"
-	gosignal "os/signal"
-	"runtime"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/signal"
-	"golang.org/x/net/context"
-)
-
-// resizeTtyTo resizes tty to specific height and width
-func resizeTtyTo(ctx context.Context, client client.ContainerAPIClient, id string, height, width uint, isExec bool) {
-	if height == 0 && width == 0 {
-		return
-	}
-
-	options := types.ResizeOptions{
-		Height: height,
-		Width:  width,
-	}
-
-	var err error
-	if isExec {
-		err = client.ContainerExecResize(ctx, id, options)
-	} else {
-		err = client.ContainerResize(ctx, id, options)
-	}
-
-	if err != nil {
-		logrus.Debugf("Error resize: %s", err)
-	}
-}
-
-// MonitorTtySize updates the container tty size when the terminal tty changes size
-func MonitorTtySize(ctx context.Context, cli *command.DockerCli, id string, isExec bool) error {
-	resizeTty := func() {
-		height, width := cli.Out().GetTtySize()
-		resizeTtyTo(ctx, cli.Client(), id, height, width, isExec)
-	}
-
-	resizeTty()
-
-	if runtime.GOOS == "windows" {
-		go func() {
-			prevH, prevW := cli.Out().GetTtySize()
-			for {
-				time.Sleep(time.Millisecond * 250)
-				h, w := cli.Out().GetTtySize()
-
-				if prevW != w || prevH != h {
-					resizeTty()
-				}
-				prevH = h
-				prevW = w
-			}
-		}()
-	} else {
-		sigchan := make(chan os.Signal, 1)
-		gosignal.Notify(sigchan, signal.SIGWINCH)
-		go func() {
-			for range sigchan {
-				resizeTty()
-			}
-		}()
-	}
-	return nil
-}
-
-// ForwardAllSignals forwards signals to the container
-func ForwardAllSignals(ctx context.Context, cli *command.DockerCli, cid string) chan os.Signal {
-	sigc := make(chan os.Signal, 128)
-	signal.CatchAll(sigc)
-	go func() {
-		for s := range sigc {
-			if s == signal.SIGCHLD || s == signal.SIGPIPE {
-				continue
-			}
-			var sig string
-			for sigStr, sigN := range signal.SignalMap {
-				if sigN == s {
-					sig = sigStr
-					break
-				}
-			}
-			if sig == "" {
-				fmt.Fprintf(cli.Err(), "Unsupported signal: %v. Discarding.\n", s)
-				continue
-			}
-
-			if err := cli.Client().ContainerKill(ctx, cid, sig); err != nil {
-				logrus.Debugf("Error sending signal: %s", err)
-			}
-		}
-	}()
-	return sigc
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/unpause.go b/installer/vendor/github.com/docker/docker/cli/command/container/unpause.go
deleted file mode 100644
index c4d8d4841e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/unpause.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type unpauseOptions struct {
-	containers []string
-}
-
-// NewUnpauseCommand creates a new cobra.Command for `docker unpause`
-func NewUnpauseCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts unpauseOptions
-
-	cmd := &cobra.Command{
-		Use:   "unpause CONTAINER [CONTAINER...]",
-		Short: "Unpause all processes within one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runUnpause(dockerCli, &opts)
-		},
-	}
-	return cmd
-}
-
-func runUnpause(dockerCli *command.DockerCli, opts *unpauseOptions) error {
-	ctx := context.Background()
-
-	var errs []string
-	errChan := parallelOperation(ctx, opts.containers, dockerCli.Client().ContainerUnpause)
-	for _, container := range opts.containers {
-		if err := <-errChan; err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", container)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/update.go b/installer/vendor/github.com/docker/docker/cli/command/container/update.go
deleted file mode 100644
index 75765856c5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/update.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type updateOptions struct {
-	blkioWeight        uint16
-	cpuPeriod          int64
-	cpuQuota           int64
-	cpuRealtimePeriod  int64
-	cpuRealtimeRuntime int64
-	cpusetCpus         string
-	cpusetMems         string
-	cpuShares          int64
-	memoryString       string
-	memoryReservation  string
-	memorySwap         string
-	kernelMemory       string
-	restartPolicy      string
-
-	nFlag int
-
-	containers []string
-}
-
-// NewUpdateCommand creates a new cobra.Command for `docker update`
-func NewUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts updateOptions
-
-	cmd := &cobra.Command{
-		Use:   "update [OPTIONS] CONTAINER [CONTAINER...]",
-		Short: "Update configuration of one or more containers",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			opts.nFlag = cmd.Flags().NFlag()
-			return runUpdate(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.Uint16Var(&opts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)")
-	flags.Int64Var(&opts.cpuPeriod, "cpu-period", 0, "Limit CPU CFS (Completely Fair Scheduler) period")
-	flags.Int64Var(&opts.cpuQuota, "cpu-quota", 0, "Limit CPU CFS (Completely Fair Scheduler) quota")
-	flags.Int64Var(&opts.cpuRealtimePeriod, "cpu-rt-period", 0, "Limit the CPU real-time period in microseconds")
-	flags.Int64Var(&opts.cpuRealtimeRuntime, "cpu-rt-runtime", 0, "Limit the CPU real-time runtime in microseconds")
-	flags.StringVar(&opts.cpusetCpus, "cpuset-cpus", "", "CPUs in which to allow execution (0-3, 0,1)")
-	flags.StringVar(&opts.cpusetMems, "cpuset-mems", "", "MEMs in which to allow execution (0-3, 0,1)")
-	flags.Int64VarP(&opts.cpuShares, "cpu-shares", "c", 0, "CPU shares (relative weight)")
-	flags.StringVarP(&opts.memoryString, "memory", "m", "", "Memory limit")
-	flags.StringVar(&opts.memoryReservation, "memory-reservation", "", "Memory soft limit")
-	flags.StringVar(&opts.memorySwap, "memory-swap", "", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap")
-	flags.StringVar(&opts.kernelMemory, "kernel-memory", "", "Kernel memory limit")
-	flags.StringVar(&opts.restartPolicy, "restart", "", "Restart policy to apply when a container exits")
-
-	return cmd
-}
-
-func runUpdate(dockerCli *command.DockerCli, opts *updateOptions) error {
-	var err error
-
-	if opts.nFlag == 0 {
-		return fmt.Errorf("You must provide one or more flags when using this command.")
-	}
-
-	var memory int64
-	if opts.memoryString != "" {
-		memory, err = units.RAMInBytes(opts.memoryString)
-		if err != nil {
-			return err
-		}
-	}
-
-	var memoryReservation int64
-	if opts.memoryReservation != "" {
-		memoryReservation, err = units.RAMInBytes(opts.memoryReservation)
-		if err != nil {
-			return err
-		}
-	}
-
-	var memorySwap int64
-	if opts.memorySwap != "" {
-		if opts.memorySwap == "-1" {
-			memorySwap = -1
-		} else {
-			memorySwap, err = units.RAMInBytes(opts.memorySwap)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	var kernelMemory int64
-	if opts.kernelMemory != "" {
-		kernelMemory, err = units.RAMInBytes(opts.kernelMemory)
-		if err != nil {
-			return err
-		}
-	}
-
-	var restartPolicy containertypes.RestartPolicy
-	if opts.restartPolicy != "" {
-		restartPolicy, err = runconfigopts.ParseRestartPolicy(opts.restartPolicy)
-		if err != nil {
-			return err
-		}
-	}
-
-	resources := containertypes.Resources{
-		BlkioWeight:        opts.blkioWeight,
-		CpusetCpus:         opts.cpusetCpus,
-		CpusetMems:         opts.cpusetMems,
-		CPUShares:          opts.cpuShares,
-		Memory:             memory,
-		MemoryReservation:  memoryReservation,
-		MemorySwap:         memorySwap,
-		KernelMemory:       kernelMemory,
-		CPUPeriod:          opts.cpuPeriod,
-		CPUQuota:           opts.cpuQuota,
-		CPURealtimePeriod:  opts.cpuRealtimePeriod,
-		CPURealtimeRuntime: opts.cpuRealtimeRuntime,
-	}
-
-	updateConfig := containertypes.UpdateConfig{
-		Resources:     resources,
-		RestartPolicy: restartPolicy,
-	}
-
-	ctx := context.Background()
-
-	var (
-		warns []string
-		errs  []string
-	)
-	for _, container := range opts.containers {
-		r, err := dockerCli.Client().ContainerUpdate(ctx, container, updateConfig)
-		if err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%s\n", container)
-		}
-		warns = append(warns, r.Warnings...)
-	}
-	if len(warns) > 0 {
-		fmt.Fprintf(dockerCli.Out(), "%s", strings.Join(warns, "\n"))
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/utils.go b/installer/vendor/github.com/docker/docker/cli/command/container/utils.go
deleted file mode 100644
index 6bef92463c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/utils.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package container
-
-import (
-	"strconv"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/cli/command"
-	clientapi "github.com/docker/docker/client"
-)
-
-func waitExitOrRemoved(ctx context.Context, dockerCli *command.DockerCli, containerID string, waitRemove bool) chan int {
-	if len(containerID) == 0 {
-		// containerID can never be empty
-		panic("Internal Error: waitExitOrRemoved needs a containerID as parameter")
-	}
-
-	var removeErr error
-	statusChan := make(chan int)
-	exitCode := 125
-
-	// Get events via Events API
-	f := filters.NewArgs()
-	f.Add("type", "container")
-	f.Add("container", containerID)
-	options := types.EventsOptions{
-		Filters: f,
-	}
-	eventCtx, cancel := context.WithCancel(ctx)
-	eventq, errq := dockerCli.Client().Events(eventCtx, options)
-
-	eventProcessor := func(e events.Message) bool {
-		stopProcessing := false
-		switch e.Status {
-		case "die":
-			if v, ok := e.Actor.Attributes["exitCode"]; ok {
-				code, cerr := strconv.Atoi(v)
-				if cerr != nil {
-					logrus.Errorf("failed to convert exitcode '%q' to int: %v", v, cerr)
-				} else {
-					exitCode = code
-				}
-			}
-			if !waitRemove {
-				stopProcessing = true
-			} else {
-				// If we are talking to an older daemon, `AutoRemove` is not supported.
-				// We need to fall back to the old behavior, which is client-side removal
-				if versions.LessThan(dockerCli.Client().ClientVersion(), "1.25") {
-					go func() {
-						removeErr = dockerCli.Client().ContainerRemove(ctx, containerID, types.ContainerRemoveOptions{RemoveVolumes: true})
-						if removeErr != nil {
-							logrus.Errorf("error removing container: %v", removeErr)
-							cancel() // cancel the event Q
-						}
-					}()
-				}
-			}
-		case "detach":
-			exitCode = 0
-			stopProcessing = true
-		case "destroy":
-			stopProcessing = true
-		}
-		return stopProcessing
-	}
-
-	go func() {
-		defer func() {
-			statusChan <- exitCode // must always send an exit code or the caller will block
-			cancel()
-		}()
-
-		for {
-			select {
-			case <-eventCtx.Done():
-				if removeErr != nil {
-					return
-				}
-			case evt := <-eventq:
-				if eventProcessor(evt) {
-					return
-				}
-			case err := <-errq:
-				logrus.Errorf("error getting events from daemon: %v", err)
-				return
-			}
-		}
-	}()
-
-	return statusChan
-}
-
-// getExitCode performs an inspect on the container. It returns
-// the running state and the exit code.
-func getExitCode(ctx context.Context, dockerCli *command.DockerCli, containerID string) (bool, int, error) {
-	c, err := dockerCli.Client().ContainerInspect(ctx, containerID)
-	if err != nil {
-		// If we can't connect, then the daemon probably died.
-		if !clientapi.IsErrConnectionFailed(err) {
-			return false, -1, err
-		}
-		return false, -1, nil
-	}
-	return c.State.Running, c.State.ExitCode, nil
-}
-
-func parallelOperation(ctx context.Context, containers []string, op func(ctx context.Context, container string) error) chan error {
-	if len(containers) == 0 {
-		return nil
-	}
-	const defaultParallel int = 50
-	sem := make(chan struct{}, defaultParallel)
-	errChan := make(chan error)
-
-	// make sure result is printed in correct order
-	output := map[string]chan error{}
-	for _, c := range containers {
-		output[c] = make(chan error, 1)
-	}
-	go func() {
-		for _, c := range containers {
-			err := <-output[c]
-			errChan <- err
-		}
-	}()
-
-	go func() {
-		for _, c := range containers {
-			sem <- struct{}{} // Wait for active queue sem to drain.
-			go func(container string) {
-				output[container] <- op(ctx, container)
-				<-sem
-			}(c)
-		}
-	}()
-	return errChan
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/container/wait.go b/installer/vendor/github.com/docker/docker/cli/command/container/wait.go
deleted file mode 100644
index 19ccf7ac25..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/container/wait.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type waitOptions struct {
-	containers []string
-}
-
-// NewWaitCommand creates a new cobra.Command for `docker wait`
-func NewWaitCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts waitOptions
-
-	cmd := &cobra.Command{
-		Use:   "wait CONTAINER [CONTAINER...]",
-		Short: "Block until one or more containers stop, then print their exit codes",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.containers = args
-			return runWait(dockerCli, &opts)
-		},
-	}
-	return cmd
-}
-
-func runWait(dockerCli *command.DockerCli, opts *waitOptions) error {
-	ctx := context.Background()
-
-	var errs []string
-	for _, container := range opts.containers {
-		status, err := dockerCli.Client().ContainerWait(ctx, container)
-		if err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			fmt.Fprintf(dockerCli.Out(), "%d\n", status)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/events_utils.go b/installer/vendor/github.com/docker/docker/cli/command/events_utils.go
deleted file mode 100644
index e710c97576..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/events_utils.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package command
-
-import (
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	eventtypes "github.com/docker/docker/api/types/events"
-)
-
-type eventProcessor func(eventtypes.Message, error) error
-
-// EventHandler is abstract interface for user to customize
-// own handle functions of each type of events
-type EventHandler interface {
-	Handle(action string, h func(eventtypes.Message))
-	Watch(c <-chan eventtypes.Message)
-}
-
-// InitEventHandler initializes and returns an EventHandler
-func InitEventHandler() EventHandler {
-	return &eventHandler{handlers: make(map[string]func(eventtypes.Message))}
-}
-
-type eventHandler struct {
-	handlers map[string]func(eventtypes.Message)
-	mu       sync.Mutex
-}
-
-func (w *eventHandler) Handle(action string, h func(eventtypes.Message)) {
-	w.mu.Lock()
-	w.handlers[action] = h
-	w.mu.Unlock()
-}
-
-// Watch ranges over the passed in event chan and processes the events based on the
-// handlers created for a given action.
-// To stop watching, close the event chan.
-func (w *eventHandler) Watch(c <-chan eventtypes.Message) {
-	for e := range c {
-		w.mu.Lock()
-		h, exists := w.handlers[e.Action]
-		w.mu.Unlock()
-		if !exists {
-			continue
-		}
-		logrus.Debugf("event handler: received event: %v", e)
-		go h(e)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/container.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/container.go
deleted file mode 100644
index 6273453355..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/container.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/stringutils"
-	units "github.com/docker/go-units"
-)
-
-const (
-	defaultContainerTableFormat = "table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.RunningFor}} ago\t{{.Status}}\t{{.Ports}}\t{{.Names}}"
-
-	containerIDHeader = "CONTAINER ID"
-	namesHeader       = "NAMES"
-	commandHeader     = "COMMAND"
-	runningForHeader  = "CREATED"
-	statusHeader      = "STATUS"
-	portsHeader       = "PORTS"
-	mountsHeader      = "MOUNTS"
-	localVolumes      = "LOCAL VOLUMES"
-	networksHeader    = "NETWORKS"
-)
-
-// NewContainerFormat returns a Format for rendering using a Context
-func NewContainerFormat(source string, quiet bool, size bool) Format {
-	switch source {
-	case TableFormatKey:
-		if quiet {
-			return defaultQuietFormat
-		}
-		format := defaultContainerTableFormat
-		if size {
-			format += `\t{{.Size}}`
-		}
-		return Format(format)
-	case RawFormatKey:
-		if quiet {
-			return `container_id: {{.ID}}`
-		}
-		format := `container_id: {{.ID}}
-image: {{.Image}}
-command: {{.Command}}
-created_at: {{.CreatedAt}}
-status: {{- pad .Status 1 0}}
-names: {{.Names}}
-labels: {{- pad .Labels 1 0}}
-ports: {{- pad .Ports 1 0}}
-`
-		if size {
-			format += `size: {{.Size}}\n`
-		}
-		return Format(format)
-	}
-	return Format(source)
-}
-
-// ContainerWrite renders the context for a list of containers
-func ContainerWrite(ctx Context, containers []types.Container) error {
-	render := func(format func(subContext subContext) error) error {
-		for _, container := range containers {
-			err := format(&containerContext{trunc: ctx.Trunc, c: container})
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	return ctx.Write(&containerContext{}, render)
-}
-
-type containerContext struct {
-	HeaderContext
-	trunc bool
-	c     types.Container
-}
-
-func (c *containerContext) MarshalJSON() ([]byte, error) {
-	return marshalJSON(c)
-}
-
-func (c *containerContext) ID() string {
-	c.AddHeader(containerIDHeader)
-	if c.trunc {
-		return stringid.TruncateID(c.c.ID)
-	}
-	return c.c.ID
-}
-
-func (c *containerContext) Names() string {
-	c.AddHeader(namesHeader)
-	names := stripNamePrefix(c.c.Names)
-	if c.trunc {
-		for _, name := range names {
-			if len(strings.Split(name, "/")) == 1 {
-				names = []string{name}
-				break
-			}
-		}
-	}
-	return strings.Join(names, ",")
-}
-
-func (c *containerContext) Image() string {
-	c.AddHeader(imageHeader)
-	if c.c.Image == "" {
-		return "<no image>"
-	}
-	if c.trunc {
-		if trunc := stringid.TruncateID(c.c.ImageID); trunc == stringid.TruncateID(c.c.Image) {
-			return trunc
-		}
-	}
-	return c.c.Image
-}
-
-func (c *containerContext) Command() string {
-	c.AddHeader(commandHeader)
-	command := c.c.Command
-	if c.trunc {
-		command = stringutils.Ellipsis(command, 20)
-	}
-	return strconv.Quote(command)
-}
-
-func (c *containerContext) CreatedAt() string {
-	c.AddHeader(createdAtHeader)
-	return time.Unix(int64(c.c.Created), 0).String()
-}
-
-func (c *containerContext) RunningFor() string {
-	c.AddHeader(runningForHeader)
-	createdAt := time.Unix(int64(c.c.Created), 0)
-	return units.HumanDuration(time.Now().UTC().Sub(createdAt))
-}
-
-func (c *containerContext) Ports() string {
-	c.AddHeader(portsHeader)
-	return api.DisplayablePorts(c.c.Ports)
-}
-
-func (c *containerContext) Status() string {
-	c.AddHeader(statusHeader)
-	return c.c.Status
-}
-
-func (c *containerContext) Size() string {
-	c.AddHeader(sizeHeader)
-	srw := units.HumanSizeWithPrecision(float64(c.c.SizeRw), 3)
-	sv := units.HumanSizeWithPrecision(float64(c.c.SizeRootFs), 3)
-
-	sf := srw
-	if c.c.SizeRootFs > 0 {
-		sf = fmt.Sprintf("%s (virtual %s)", srw, sv)
-	}
-	return sf
-}
-
-func (c *containerContext) Labels() string {
-	c.AddHeader(labelsHeader)
-	if c.c.Labels == nil {
-		return ""
-	}
-
-	var joinLabels []string
-	for k, v := range c.c.Labels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
-	}
-	return strings.Join(joinLabels, ",")
-}
-
-func (c *containerContext) Label(name string) string {
-	n := strings.Split(name, ".")
-	r := strings.NewReplacer("-", " ", "_", " ")
-	h := r.Replace(n[len(n)-1])
-
-	c.AddHeader(h)
-
-	if c.c.Labels == nil {
-		return ""
-	}
-	return c.c.Labels[name]
-}
-
-func (c *containerContext) Mounts() string {
-	c.AddHeader(mountsHeader)
-
-	var name string
-	var mounts []string
-	for _, m := range c.c.Mounts {
-		if m.Name == "" {
-			name = m.Source
-		} else {
-			name = m.Name
-		}
-		if c.trunc {
-			name = stringutils.Ellipsis(name, 15)
-		}
-		mounts = append(mounts, name)
-	}
-	return strings.Join(mounts, ",")
-}
-
-func (c *containerContext) LocalVolumes() string {
-	c.AddHeader(localVolumes)
-
-	count := 0
-	for _, m := range c.c.Mounts {
-		if m.Driver == "local" {
-			count++
-		}
-	}
-
-	return fmt.Sprintf("%d", count)
-}
-
-func (c *containerContext) Networks() string {
-	c.AddHeader(networksHeader)
-
-	if c.c.NetworkSettings == nil {
-		return ""
-	}
-
-	networks := []string{}
-	for k := range c.c.NetworkSettings.Networks {
-		networks = append(networks, k)
-	}
-
-	return strings.Join(networks, ",")
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/container_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/container_test.go
deleted file mode 100644
index 16137897b9..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/container_test.go
+++ /dev/null
@@ -1,398 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestContainerPsContext(t *testing.T) {
-	containerID := stringid.GenerateRandomID()
-	unix := time.Now().Add(-65 * time.Second).Unix()
-
-	var ctx containerContext
-	cases := []struct {
-		container types.Container
-		trunc     bool
-		expValue  string
-		expHeader string
-		call      func() string
-	}{
-		{types.Container{ID: containerID}, true, stringid.TruncateID(containerID), containerIDHeader, ctx.ID},
-		{types.Container{ID: containerID}, false, containerID, containerIDHeader, ctx.ID},
-		{types.Container{Names: []string{"/foobar_baz"}}, true, "foobar_baz", namesHeader, ctx.Names},
-		{types.Container{Image: "ubuntu"}, true, "ubuntu", imageHeader, ctx.Image},
-		{types.Container{Image: "verylongimagename"}, true, "verylongimagename", imageHeader, ctx.Image},
-		{types.Container{Image: "verylongimagename"}, false, "verylongimagename", imageHeader, ctx.Image},
-		{types.Container{
-			Image:   "a5a665ff33eced1e0803148700880edab4",
-			ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
-		},
-			true,
-			"a5a665ff33ec",
-			imageHeader,
-			ctx.Image,
-		},
-		{types.Container{
-			Image:   "a5a665ff33eced1e0803148700880edab4",
-			ImageID: "a5a665ff33eced1e0803148700880edab4269067ed77e27737a708d0d293fbf5",
-		},
-			false,
-			"a5a665ff33eced1e0803148700880edab4",
-			imageHeader,
-			ctx.Image,
-		},
-		{types.Container{Image: ""}, true, "<no image>", imageHeader, ctx.Image},
-		{types.Container{Command: "sh -c 'ls -la'"}, true, `"sh -c 'ls -la'"`, commandHeader, ctx.Command},
-		{types.Container{Created: unix}, true, time.Unix(unix, 0).String(), createdAtHeader, ctx.CreatedAt},
-		{types.Container{Ports: []types.Port{{PrivatePort: 8080, PublicPort: 8080, Type: "tcp"}}}, true, "8080/tcp", portsHeader, ctx.Ports},
-		{types.Container{Status: "RUNNING"}, true, "RUNNING", statusHeader, ctx.Status},
-		{types.Container{SizeRw: 10}, true, "10 B", sizeHeader, ctx.Size},
-		{types.Container{SizeRw: 10, SizeRootFs: 20}, true, "10 B (virtual 20 B)", sizeHeader, ctx.Size},
-		{types.Container{}, true, "", labelsHeader, ctx.Labels},
-		{types.Container{Labels: map[string]string{"cpu": "6", "storage": "ssd"}}, true, "cpu=6,storage=ssd", labelsHeader, ctx.Labels},
-		{types.Container{Created: unix}, true, "About a minute", runningForHeader, ctx.RunningFor},
-		{types.Container{
-			Mounts: []types.MountPoint{
-				{
-					Name:   "this-is-a-long-volume-name-and-will-be-truncated-if-trunc-is-set",
-					Driver: "local",
-					Source: "/a/path",
-				},
-			},
-		}, true, "this-is-a-lo...", mountsHeader, ctx.Mounts},
-		{types.Container{
-			Mounts: []types.MountPoint{
-				{
-					Driver: "local",
-					Source: "/a/path",
-				},
-			},
-		}, false, "/a/path", mountsHeader, ctx.Mounts},
-		{types.Container{
-			Mounts: []types.MountPoint{
-				{
-					Name:   "733908409c91817de8e92b0096373245f329f19a88e2c849f02460e9b3d1c203",
-					Driver: "local",
-					Source: "/a/path",
-				},
-			},
-		}, false, "733908409c91817de8e92b0096373245f329f19a88e2c849f02460e9b3d1c203", mountsHeader, ctx.Mounts},
-	}
-
-	for _, c := range cases {
-		ctx = containerContext{c: c.container, trunc: c.trunc}
-		v := c.call()
-		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
-		} else if v != c.expValue {
-			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
-		}
-
-		h := ctx.FullHeader()
-		if h != c.expHeader {
-			t.Fatalf("Expected %s, was %s\n", c.expHeader, h)
-		}
-	}
-
-	c1 := types.Container{Labels: map[string]string{"com.docker.swarm.swarm-id": "33", "com.docker.swarm.node_name": "ubuntu"}}
-	ctx = containerContext{c: c1, trunc: true}
-
-	sid := ctx.Label("com.docker.swarm.swarm-id")
-	node := ctx.Label("com.docker.swarm.node_name")
-	if sid != "33" {
-		t.Fatalf("Expected 33, was %s\n", sid)
-	}
-
-	if node != "ubuntu" {
-		t.Fatalf("Expected ubuntu, was %s\n", node)
-	}
-
-	h := ctx.FullHeader()
-	if h != "SWARM ID\tNODE NAME" {
-		t.Fatalf("Expected %s, was %s\n", "SWARM ID\tNODE NAME", h)
-
-	}
-
-	c2 := types.Container{}
-	ctx = containerContext{c: c2, trunc: true}
-
-	label := ctx.Label("anything.really")
-	if label != "" {
-		t.Fatalf("Expected an empty string, was %s", label)
-	}
-
-	ctx = containerContext{c: c2, trunc: true}
-	FullHeader := ctx.FullHeader()
-	if FullHeader != "" {
-		t.Fatalf("Expected FullHeader to be empty, was %s", FullHeader)
-	}
-
-}
-
-func TestContainerContextWrite(t *testing.T) {
-	unixTime := time.Now().AddDate(0, 0, -1).Unix()
-	expectedTime := time.Unix(unixTime, 0).String()
-
-	cases := []struct {
-		context  Context
-		expected string
-	}{
-		// Errors
-		{
-			Context{Format: "{{InvalidFunction}}"},
-			`Template parsing error: template: :1: function "InvalidFunction" not defined
-`,
-		},
-		{
-			Context{Format: "{{nil}}"},
-			`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
-`,
-		},
-		// Table Format
-		{
-			Context{Format: NewContainerFormat("table", false, true)},
-			`CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES               SIZE
-containerID1        ubuntu              ""                  24 hours ago                                                foobar_baz          0 B
-containerID2        ubuntu              ""                  24 hours ago                                                foobar_bar          0 B
-`,
-		},
-		{
-			Context{Format: NewContainerFormat("table", false, false)},
-			`CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
-containerID1        ubuntu              ""                  24 hours ago                                                foobar_baz
-containerID2        ubuntu              ""                  24 hours ago                                                foobar_bar
-`,
-		},
-		{
-			Context{Format: NewContainerFormat("table {{.Image}}", false, false)},
-			"IMAGE\nubuntu\nubuntu\n",
-		},
-		{
-			Context{Format: NewContainerFormat("table {{.Image}}", false, true)},
-			"IMAGE\nubuntu\nubuntu\n",
-		},
-		{
-			Context{Format: NewContainerFormat("table {{.Image}}", true, false)},
-			"IMAGE\nubuntu\nubuntu\n",
-		},
-		{
-			Context{Format: NewContainerFormat("table", true, false)},
-			"containerID1\ncontainerID2\n",
-		},
-		// Raw Format
-		{
-			Context{Format: NewContainerFormat("raw", false, false)},
-			fmt.Sprintf(`container_id: containerID1
-image: ubuntu
-command: ""
-created_at: %s
-status:
-names: foobar_baz
-labels:
-ports:
-
-container_id: containerID2
-image: ubuntu
-command: ""
-created_at: %s
-status:
-names: foobar_bar
-labels:
-ports:
-
-`, expectedTime, expectedTime),
-		},
-		{
-			Context{Format: NewContainerFormat("raw", false, true)},
-			fmt.Sprintf(`container_id: containerID1
-image: ubuntu
-command: ""
-created_at: %s
-status:
-names: foobar_baz
-labels:
-ports:
-size: 0 B
-
-container_id: containerID2
-image: ubuntu
-command: ""
-created_at: %s
-status:
-names: foobar_bar
-labels:
-ports:
-size: 0 B
-
-`, expectedTime, expectedTime),
-		},
-		{
-			Context{Format: NewContainerFormat("raw", true, false)},
-			"container_id: containerID1\ncontainer_id: containerID2\n",
-		},
-		// Custom Format
-		{
-			Context{Format: "{{.Image}}"},
-			"ubuntu\nubuntu\n",
-		},
-		{
-			Context{Format: NewContainerFormat("{{.Image}}", false, true)},
-			"ubuntu\nubuntu\n",
-		},
-	}
-
-	for _, testcase := range cases {
-		containers := []types.Container{
-			{ID: "containerID1", Names: []string{"/foobar_baz"}, Image: "ubuntu", Created: unixTime},
-			{ID: "containerID2", Names: []string{"/foobar_bar"}, Image: "ubuntu", Created: unixTime},
-		}
-		out := bytes.NewBufferString("")
-		testcase.context.Output = out
-		err := ContainerWrite(testcase.context, containers)
-		if err != nil {
-			assert.Error(t, err, testcase.expected)
-		} else {
-			assert.Equal(t, out.String(), testcase.expected)
-		}
-	}
-}
-
-func TestContainerContextWriteWithNoContainers(t *testing.T) {
-	out := bytes.NewBufferString("")
-	containers := []types.Container{}
-
-	contexts := []struct {
-		context  Context
-		expected string
-	}{
-		{
-			Context{
-				Format: "{{.Image}}",
-				Output: out,
-			},
-			"",
-		},
-		{
-			Context{
-				Format: "table {{.Image}}",
-				Output: out,
-			},
-			"IMAGE\n",
-		},
-		{
-			Context{
-				Format: NewContainerFormat("{{.Image}}", false, true),
-				Output: out,
-			},
-			"",
-		},
-		{
-			Context{
-				Format: NewContainerFormat("table {{.Image}}", false, true),
-				Output: out,
-			},
-			"IMAGE\n",
-		},
-		{
-			Context{
-				Format: "table {{.Image}}\t{{.Size}}",
-				Output: out,
-			},
-			"IMAGE               SIZE\n",
-		},
-		{
-			Context{
-				Format: NewContainerFormat("table {{.Image}}\t{{.Size}}", false, true),
-				Output: out,
-			},
-			"IMAGE               SIZE\n",
-		},
-	}
-
-	for _, context := range contexts {
-		ContainerWrite(context.context, containers)
-		assert.Equal(t, context.expected, out.String())
-		// Clean buffer
-		out.Reset()
-	}
-}
-
-func TestContainerContextWriteJSON(t *testing.T) {
-	unix := time.Now().Add(-65 * time.Second).Unix()
-	containers := []types.Container{
-		{ID: "containerID1", Names: []string{"/foobar_baz"}, Image: "ubuntu", Created: unix},
-		{ID: "containerID2", Names: []string{"/foobar_bar"}, Image: "ubuntu", Created: unix},
-	}
-	expectedCreated := time.Unix(unix, 0).String()
-	expectedJSONs := []map[string]interface{}{
-		{"Command": "\"\"", "CreatedAt": expectedCreated, "ID": "containerID1", "Image": "ubuntu", "Labels": "", "LocalVolumes": "0", "Mounts": "", "Names": "foobar_baz", "Networks": "", "Ports": "", "RunningFor": "About a minute", "Size": "0 B", "Status": ""},
-		{"Command": "\"\"", "CreatedAt": expectedCreated, "ID": "containerID2", "Image": "ubuntu", "Labels": "", "LocalVolumes": "0", "Mounts": "", "Names": "foobar_bar", "Networks": "", "Ports": "", "RunningFor": "About a minute", "Size": "0 B", "Status": ""},
-	}
-	out := bytes.NewBufferString("")
-	err := ContainerWrite(Context{Format: "{{json .}}", Output: out}, containers)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var m map[string]interface{}
-		if err := json.Unmarshal([]byte(line), &m); err != nil {
-			t.Fatal(err)
-		}
-		assert.DeepEqual(t, m, expectedJSONs[i])
-	}
-}
-
-func TestContainerContextWriteJSONField(t *testing.T) {
-	containers := []types.Container{
-		{ID: "containerID1", Names: []string{"/foobar_baz"}, Image: "ubuntu"},
-		{ID: "containerID2", Names: []string{"/foobar_bar"}, Image: "ubuntu"},
-	}
-	out := bytes.NewBufferString("")
-	err := ContainerWrite(Context{Format: "{{json .ID}}", Output: out}, containers)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var s string
-		if err := json.Unmarshal([]byte(line), &s); err != nil {
-			t.Fatal(err)
-		}
-		assert.Equal(t, s, containers[i].ID)
-	}
-}
-
-func TestContainerBackCompat(t *testing.T) {
-	containers := []types.Container{{ID: "brewhaha"}}
-	cases := []string{
-		"ID",
-		"Names",
-		"Image",
-		"Command",
-		"CreatedAt",
-		"RunningFor",
-		"Ports",
-		"Status",
-		"Size",
-		"Labels",
-		"Mounts",
-	}
-	buf := bytes.NewBuffer(nil)
-	for _, c := range cases {
-		ctx := Context{Format: Format(fmt.Sprintf("{{ .%s }}", c)), Output: buf}
-		if err := ContainerWrite(ctx, containers); err != nil {
-			t.Logf("could not render template for field '%s': %v", c, err)
-			t.Fail()
-		}
-		buf.Reset()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/custom.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/custom.go
deleted file mode 100644
index df32684429..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/custom.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package formatter
-
-import (
-	"strings"
-)
-
-const (
-	imageHeader        = "IMAGE"
-	createdSinceHeader = "CREATED"
-	createdAtHeader    = "CREATED AT"
-	sizeHeader         = "SIZE"
-	labelsHeader       = "LABELS"
-	nameHeader         = "NAME"
-	driverHeader       = "DRIVER"
-	scopeHeader        = "SCOPE"
-)
-
-type subContext interface {
-	FullHeader() string
-	AddHeader(header string)
-}
-
-// HeaderContext provides the subContext interface for managing headers
-type HeaderContext struct {
-	header []string
-}
-
-// FullHeader returns the header as a string
-func (c *HeaderContext) FullHeader() string {
-	if c.header == nil {
-		return ""
-	}
-	return strings.Join(c.header, "\t")
-}
-
-// AddHeader adds another column to the header
-func (c *HeaderContext) AddHeader(header string) {
-	if c.header == nil {
-		c.header = []string{}
-	}
-	c.header = append(c.header, strings.ToUpper(header))
-}
-
-func stripNamePrefix(ss []string) []string {
-	sss := make([]string, len(ss))
-	for i, s := range ss {
-		sss[i] = s[1:]
-	}
-
-	return sss
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/custom_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/custom_test.go
deleted file mode 100644
index da42039dca..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/custom_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package formatter
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func compareMultipleValues(t *testing.T, value, expected string) {
-	// comma-separated values means probably a map input, which won't
-	// be guaranteed to have the same order as our expected value
-	// We'll create maps and use reflect.DeepEquals to check instead:
-	entriesMap := make(map[string]string)
-	expMap := make(map[string]string)
-	entries := strings.Split(value, ",")
-	expectedEntries := strings.Split(expected, ",")
-	for _, entry := range entries {
-		keyval := strings.Split(entry, "=")
-		entriesMap[keyval[0]] = keyval[1]
-	}
-	for _, expected := range expectedEntries {
-		keyval := strings.Split(expected, "=")
-		expMap[keyval[0]] = keyval[1]
-	}
-	if !reflect.DeepEqual(expMap, entriesMap) {
-		t.Fatalf("Expected entries: %v, got: %v", expected, value)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/disk_usage.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/disk_usage.go
deleted file mode 100644
index 5309d880a5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/disk_usage.go
+++ /dev/null
@@ -1,334 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"text/template"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	units "github.com/docker/go-units"
-)
-
-const (
-	defaultDiskUsageImageTableFormat     = "table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedSince}} ago\t{{.VirtualSize}}\t{{.SharedSize}}\t{{.UniqueSize}}\t{{.Containers}}"
-	defaultDiskUsageContainerTableFormat = "table {{.ID}}\t{{.Image}}\t{{.Command}}\t{{.LocalVolumes}}\t{{.Size}}\t{{.RunningFor}} ago\t{{.Status}}\t{{.Names}}"
-	defaultDiskUsageVolumeTableFormat    = "table {{.Name}}\t{{.Links}}\t{{.Size}}"
-	defaultDiskUsageTableFormat          = "table {{.Type}}\t{{.TotalCount}}\t{{.Active}}\t{{.Size}}\t{{.Reclaimable}}"
-
-	typeHeader        = "TYPE"
-	totalHeader       = "TOTAL"
-	activeHeader      = "ACTIVE"
-	reclaimableHeader = "RECLAIMABLE"
-	containersHeader  = "CONTAINERS"
-	sharedSizeHeader  = "SHARED SIZE"
-	uniqueSizeHeader  = "UNIQUE SiZE"
-)
-
-// DiskUsageContext contains disk usage specific information required by the formater, encapsulate a Context struct.
-type DiskUsageContext struct {
-	Context
-	Verbose    bool
-	LayersSize int64
-	Images     []*types.ImageSummary
-	Containers []*types.Container
-	Volumes    []*types.Volume
-}
-
-func (ctx *DiskUsageContext) startSubsection(format string) (*template.Template, error) {
-	ctx.buffer = bytes.NewBufferString("")
-	ctx.header = ""
-	ctx.Format = Format(format)
-	ctx.preFormat()
-
-	return ctx.parseFormat()
-}
-
-func (ctx *DiskUsageContext) Write() {
-	if ctx.Verbose == false {
-		ctx.buffer = bytes.NewBufferString("")
-		ctx.Format = defaultDiskUsageTableFormat
-		ctx.preFormat()
-
-		tmpl, err := ctx.parseFormat()
-		if err != nil {
-			return
-		}
-
-		err = ctx.contextFormat(tmpl, &diskUsageImagesContext{
-			totalSize: ctx.LayersSize,
-			images:    ctx.Images,
-		})
-		if err != nil {
-			return
-		}
-		err = ctx.contextFormat(tmpl, &diskUsageContainersContext{
-			containers: ctx.Containers,
-		})
-		if err != nil {
-			return
-		}
-
-		err = ctx.contextFormat(tmpl, &diskUsageVolumesContext{
-			volumes: ctx.Volumes,
-		})
-		if err != nil {
-			return
-		}
-
-		ctx.postFormat(tmpl, &diskUsageContainersContext{containers: []*types.Container{}})
-
-		return
-	}
-
-	// First images
-	tmpl, err := ctx.startSubsection(defaultDiskUsageImageTableFormat)
-	if err != nil {
-		return
-	}
-
-	ctx.Output.Write([]byte("Images space usage:\n\n"))
-	for _, i := range ctx.Images {
-		repo := "<none>"
-		tag := "<none>"
-		if len(i.RepoTags) > 0 && !isDangling(*i) {
-			// Only show the first tag
-			ref, err := reference.ParseNamed(i.RepoTags[0])
-			if err != nil {
-				continue
-			}
-			if nt, ok := ref.(reference.NamedTagged); ok {
-				repo = ref.Name()
-				tag = nt.Tag()
-			}
-		}
-
-		err = ctx.contextFormat(tmpl, &imageContext{
-			repo:  repo,
-			tag:   tag,
-			trunc: true,
-			i:     *i,
-		})
-		if err != nil {
-			return
-		}
-	}
-	ctx.postFormat(tmpl, &imageContext{})
-
-	// Now containers
-	ctx.Output.Write([]byte("\nContainers space usage:\n\n"))
-	tmpl, err = ctx.startSubsection(defaultDiskUsageContainerTableFormat)
-	if err != nil {
-		return
-	}
-	for _, c := range ctx.Containers {
-		// Don't display the virtual size
-		c.SizeRootFs = 0
-		err = ctx.contextFormat(tmpl, &containerContext{
-			trunc: true,
-			c:     *c,
-		})
-		if err != nil {
-			return
-		}
-	}
-	ctx.postFormat(tmpl, &containerContext{})
-
-	// And volumes
-	ctx.Output.Write([]byte("\nLocal Volumes space usage:\n\n"))
-	tmpl, err = ctx.startSubsection(defaultDiskUsageVolumeTableFormat)
-	if err != nil {
-		return
-	}
-	for _, v := range ctx.Volumes {
-		err = ctx.contextFormat(tmpl, &volumeContext{
-			v: *v,
-		})
-		if err != nil {
-			return
-		}
-	}
-	ctx.postFormat(tmpl, &volumeContext{v: types.Volume{}})
-}
-
-type diskUsageImagesContext struct {
-	HeaderContext
-	totalSize int64
-	images    []*types.ImageSummary
-}
-
-func (c *diskUsageImagesContext) Type() string {
-	c.AddHeader(typeHeader)
-	return "Images"
-}
-
-func (c *diskUsageImagesContext) TotalCount() string {
-	c.AddHeader(totalHeader)
-	return fmt.Sprintf("%d", len(c.images))
-}
-
-func (c *diskUsageImagesContext) Active() string {
-	c.AddHeader(activeHeader)
-	used := 0
-	for _, i := range c.images {
-		if i.Containers > 0 {
-			used++
-		}
-	}
-
-	return fmt.Sprintf("%d", used)
-}
-
-func (c *diskUsageImagesContext) Size() string {
-	c.AddHeader(sizeHeader)
-	return units.HumanSize(float64(c.totalSize))
-
-}
-
-func (c *diskUsageImagesContext) Reclaimable() string {
-	var used int64
-
-	c.AddHeader(reclaimableHeader)
-	for _, i := range c.images {
-		if i.Containers != 0 {
-			if i.VirtualSize == -1 || i.SharedSize == -1 {
-				continue
-			}
-			used += i.VirtualSize - i.SharedSize
-		}
-	}
-
-	reclaimable := c.totalSize - used
-	if c.totalSize > 0 {
-		return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/c.totalSize)
-	}
-	return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable)))
-}
-
-type diskUsageContainersContext struct {
-	HeaderContext
-	verbose    bool
-	containers []*types.Container
-}
-
-func (c *diskUsageContainersContext) Type() string {
-	c.AddHeader(typeHeader)
-	return "Containers"
-}
-
-func (c *diskUsageContainersContext) TotalCount() string {
-	c.AddHeader(totalHeader)
-	return fmt.Sprintf("%d", len(c.containers))
-}
-
-func (c *diskUsageContainersContext) isActive(container types.Container) bool {
-	return strings.Contains(container.State, "running") ||
-		strings.Contains(container.State, "paused") ||
-		strings.Contains(container.State, "restarting")
-}
-
-func (c *diskUsageContainersContext) Active() string {
-	c.AddHeader(activeHeader)
-	used := 0
-	for _, container := range c.containers {
-		if c.isActive(*container) {
-			used++
-		}
-	}
-
-	return fmt.Sprintf("%d", used)
-}
-
-func (c *diskUsageContainersContext) Size() string {
-	var size int64
-
-	c.AddHeader(sizeHeader)
-	for _, container := range c.containers {
-		size += container.SizeRw
-	}
-
-	return units.HumanSize(float64(size))
-}
-
-func (c *diskUsageContainersContext) Reclaimable() string {
-	var reclaimable int64
-	var totalSize int64
-
-	c.AddHeader(reclaimableHeader)
-	for _, container := range c.containers {
-		if !c.isActive(*container) {
-			reclaimable += container.SizeRw
-		}
-		totalSize += container.SizeRw
-	}
-
-	if totalSize > 0 {
-		return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize)
-	}
-
-	return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable)))
-}
-
-type diskUsageVolumesContext struct {
-	HeaderContext
-	verbose bool
-	volumes []*types.Volume
-}
-
-func (c *diskUsageVolumesContext) Type() string {
-	c.AddHeader(typeHeader)
-	return "Local Volumes"
-}
-
-func (c *diskUsageVolumesContext) TotalCount() string {
-	c.AddHeader(totalHeader)
-	return fmt.Sprintf("%d", len(c.volumes))
-}
-
-func (c *diskUsageVolumesContext) Active() string {
-	c.AddHeader(activeHeader)
-
-	used := 0
-	for _, v := range c.volumes {
-		if v.UsageData.RefCount > 0 {
-			used++
-		}
-	}
-
-	return fmt.Sprintf("%d", used)
-}
-
-func (c *diskUsageVolumesContext) Size() string {
-	var size int64
-
-	c.AddHeader(sizeHeader)
-	for _, v := range c.volumes {
-		if v.UsageData.Size != -1 {
-			size += v.UsageData.Size
-		}
-	}
-
-	return units.HumanSize(float64(size))
-}
-
-func (c *diskUsageVolumesContext) Reclaimable() string {
-	var reclaimable int64
-	var totalSize int64
-
-	c.AddHeader(reclaimableHeader)
-	for _, v := range c.volumes {
-		if v.UsageData.Size != -1 {
-			if v.UsageData.RefCount == 0 {
-				reclaimable += v.UsageData.Size
-			}
-			totalSize += v.UsageData.Size
-		}
-	}
-
-	if totalSize > 0 {
-		return fmt.Sprintf("%s (%v%%)", units.HumanSize(float64(reclaimable)), (reclaimable*100)/totalSize)
-	}
-
-	return fmt.Sprintf("%s", units.HumanSize(float64(reclaimable)))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/formatter.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/formatter.go
deleted file mode 100644
index e859a1ca26..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/formatter.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-	"text/template"
-
-	"github.com/docker/docker/utils/templates"
-)
-
-// Format keys used to specify certain kinds of output formats
-const (
-	TableFormatKey  = "table"
-	RawFormatKey    = "raw"
-	PrettyFormatKey = "pretty"
-
-	defaultQuietFormat = "{{.ID}}"
-)
-
-// Format is the format string rendered using the Context
-type Format string
-
-// IsTable returns true if the format is a table-type format
-func (f Format) IsTable() bool {
-	return strings.HasPrefix(string(f), TableFormatKey)
-}
-
-// Contains returns true if the format contains the substring
-func (f Format) Contains(sub string) bool {
-	return strings.Contains(string(f), sub)
-}
-
-// Context contains information required by the formatter to print the output as desired.
-type Context struct {
-	// Output is the output stream to which the formatted string is written.
-	Output io.Writer
-	// Format is used to choose raw, table or custom format for the output.
-	Format Format
-	// Trunc when set to true will truncate the output of certain fields such as Container ID.
-	Trunc bool
-
-	// internal element
-	finalFormat string
-	header      string
-	buffer      *bytes.Buffer
-}
-
-func (c *Context) preFormat() {
-	c.finalFormat = string(c.Format)
-
-	// TODO: handle this in the Format type
-	if c.Format.IsTable() {
-		c.finalFormat = c.finalFormat[len(TableFormatKey):]
-	}
-
-	c.finalFormat = strings.Trim(c.finalFormat, " ")
-	r := strings.NewReplacer(`\t`, "\t", `\n`, "\n")
-	c.finalFormat = r.Replace(c.finalFormat)
-}
-
-func (c *Context) parseFormat() (*template.Template, error) {
-	tmpl, err := templates.Parse(c.finalFormat)
-	if err != nil {
-		return tmpl, fmt.Errorf("Template parsing error: %v\n", err)
-	}
-	return tmpl, err
-}
-
-func (c *Context) postFormat(tmpl *template.Template, subContext subContext) {
-	if c.Format.IsTable() {
-		if len(c.header) == 0 {
-			// if we still don't have a header, we didn't have any containers so we need to fake it to get the right headers from the template
-			tmpl.Execute(bytes.NewBufferString(""), subContext)
-			c.header = subContext.FullHeader()
-		}
-
-		t := tabwriter.NewWriter(c.Output, 20, 1, 3, ' ', 0)
-		t.Write([]byte(c.header))
-		t.Write([]byte("\n"))
-		c.buffer.WriteTo(t)
-		t.Flush()
-	} else {
-		c.buffer.WriteTo(c.Output)
-	}
-}
-
-func (c *Context) contextFormat(tmpl *template.Template, subContext subContext) error {
-	if err := tmpl.Execute(c.buffer, subContext); err != nil {
-		return fmt.Errorf("Template parsing error: %v\n", err)
-	}
-	if c.Format.IsTable() && len(c.header) == 0 {
-		c.header = subContext.FullHeader()
-	}
-	c.buffer.WriteString("\n")
-	return nil
-}
-
-// SubFormat is a function type accepted by Write()
-type SubFormat func(func(subContext) error) error
-
-// Write the template to the buffer using this Context
-func (c *Context) Write(sub subContext, f SubFormat) error {
-	c.buffer = bytes.NewBufferString("")
-	c.preFormat()
-
-	tmpl, err := c.parseFormat()
-	if err != nil {
-		return err
-	}
-
-	subFormat := func(subContext subContext) error {
-		return c.contextFormat(tmpl, subContext)
-	}
-	if err := f(subFormat); err != nil {
-		return err
-	}
-
-	c.postFormat(tmpl, sub)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/image.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/image.go
deleted file mode 100644
index 5c7de826f0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/image.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	units "github.com/docker/go-units"
-)
-
-const (
-	defaultImageTableFormat           = "table {{.Repository}}\t{{.Tag}}\t{{.ID}}\t{{.CreatedSince}} ago\t{{.Size}}"
-	defaultImageTableFormatWithDigest = "table {{.Repository}}\t{{.Tag}}\t{{.Digest}}\t{{.ID}}\t{{.CreatedSince}} ago\t{{.Size}}"
-
-	imageIDHeader    = "IMAGE ID"
-	repositoryHeader = "REPOSITORY"
-	tagHeader        = "TAG"
-	digestHeader     = "DIGEST"
-)
-
-// ImageContext contains image specific information required by the formater, encapsulate a Context struct.
-type ImageContext struct {
-	Context
-	Digest bool
-}
-
-func isDangling(image types.ImageSummary) bool {
-	return len(image.RepoTags) == 1 && image.RepoTags[0] == "<none>:<none>" && len(image.RepoDigests) == 1 && image.RepoDigests[0] == "<none>@<none>"
-}
-
-// NewImageFormat returns a format for rendering an ImageContext
-func NewImageFormat(source string, quiet bool, digest bool) Format {
-	switch source {
-	case TableFormatKey:
-		switch {
-		case quiet:
-			return defaultQuietFormat
-		case digest:
-			return defaultImageTableFormatWithDigest
-		default:
-			return defaultImageTableFormat
-		}
-	case RawFormatKey:
-		switch {
-		case quiet:
-			return `image_id: {{.ID}}`
-		case digest:
-			return `repository: {{ .Repository }}
-tag: {{.Tag}}
-digest: {{.Digest}}
-image_id: {{.ID}}
-created_at: {{.CreatedAt}}
-virtual_size: {{.Size}}
-`
-		default:
-			return `repository: {{ .Repository }}
-tag: {{.Tag}}
-image_id: {{.ID}}
-created_at: {{.CreatedAt}}
-virtual_size: {{.Size}}
-`
-		}
-	}
-
-	format := Format(source)
-	if format.IsTable() && digest && !format.Contains("{{.Digest}}") {
-		format += "\t{{.Digest}}"
-	}
-	return format
-}
-
-// ImageWrite writes the formatter images using the ImageContext
-func ImageWrite(ctx ImageContext, images []types.ImageSummary) error {
-	render := func(format func(subContext subContext) error) error {
-		return imageFormat(ctx, images, format)
-	}
-	return ctx.Write(&imageContext{}, render)
-}
-
-func imageFormat(ctx ImageContext, images []types.ImageSummary, format func(subContext subContext) error) error {
-	for _, image := range images {
-		images := []*imageContext{}
-		if isDangling(image) {
-			images = append(images, &imageContext{
-				trunc:  ctx.Trunc,
-				i:      image,
-				repo:   "<none>",
-				tag:    "<none>",
-				digest: "<none>",
-			})
-		} else {
-			repoTags := map[string][]string{}
-			repoDigests := map[string][]string{}
-
-			for _, refString := range append(image.RepoTags) {
-				ref, err := reference.ParseNamed(refString)
-				if err != nil {
-					continue
-				}
-				if nt, ok := ref.(reference.NamedTagged); ok {
-					repoTags[ref.Name()] = append(repoTags[ref.Name()], nt.Tag())
-				}
-			}
-			for _, refString := range append(image.RepoDigests) {
-				ref, err := reference.ParseNamed(refString)
-				if err != nil {
-					continue
-				}
-				if c, ok := ref.(reference.Canonical); ok {
-					repoDigests[ref.Name()] = append(repoDigests[ref.Name()], c.Digest().String())
-				}
-			}
-
-			for repo, tags := range repoTags {
-				digests := repoDigests[repo]
-
-				// Do not display digests as their own row
-				delete(repoDigests, repo)
-
-				if !ctx.Digest {
-					// Ignore digest references, just show tag once
-					digests = nil
-				}
-
-				for _, tag := range tags {
-					if len(digests) == 0 {
-						images = append(images, &imageContext{
-							trunc:  ctx.Trunc,
-							i:      image,
-							repo:   repo,
-							tag:    tag,
-							digest: "<none>",
-						})
-						continue
-					}
-					// Display the digests for each tag
-					for _, dgst := range digests {
-						images = append(images, &imageContext{
-							trunc:  ctx.Trunc,
-							i:      image,
-							repo:   repo,
-							tag:    tag,
-							digest: dgst,
-						})
-					}
-
-				}
-			}
-
-			// Show rows for remaining digest only references
-			for repo, digests := range repoDigests {
-				// If digests are displayed, show row per digest
-				if ctx.Digest {
-					for _, dgst := range digests {
-						images = append(images, &imageContext{
-							trunc:  ctx.Trunc,
-							i:      image,
-							repo:   repo,
-							tag:    "<none>",
-							digest: dgst,
-						})
-					}
-				} else {
-					images = append(images, &imageContext{
-						trunc: ctx.Trunc,
-						i:     image,
-						repo:  repo,
-						tag:   "<none>",
-					})
-				}
-			}
-		}
-		for _, imageCtx := range images {
-			if err := format(imageCtx); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-type imageContext struct {
-	HeaderContext
-	trunc  bool
-	i      types.ImageSummary
-	repo   string
-	tag    string
-	digest string
-}
-
-func (c *imageContext) ID() string {
-	c.AddHeader(imageIDHeader)
-	if c.trunc {
-		return stringid.TruncateID(c.i.ID)
-	}
-	return c.i.ID
-}
-
-func (c *imageContext) Repository() string {
-	c.AddHeader(repositoryHeader)
-	return c.repo
-}
-
-func (c *imageContext) Tag() string {
-	c.AddHeader(tagHeader)
-	return c.tag
-}
-
-func (c *imageContext) Digest() string {
-	c.AddHeader(digestHeader)
-	return c.digest
-}
-
-func (c *imageContext) CreatedSince() string {
-	c.AddHeader(createdSinceHeader)
-	createdAt := time.Unix(int64(c.i.Created), 0)
-	return units.HumanDuration(time.Now().UTC().Sub(createdAt))
-}
-
-func (c *imageContext) CreatedAt() string {
-	c.AddHeader(createdAtHeader)
-	return time.Unix(int64(c.i.Created), 0).String()
-}
-
-func (c *imageContext) Size() string {
-	c.AddHeader(sizeHeader)
-	return units.HumanSizeWithPrecision(float64(c.i.Size), 3)
-}
-
-func (c *imageContext) Containers() string {
-	c.AddHeader(containersHeader)
-	if c.i.Containers == -1 {
-		return "N/A"
-	}
-	return fmt.Sprintf("%d", c.i.Containers)
-}
-
-func (c *imageContext) VirtualSize() string {
-	c.AddHeader(sizeHeader)
-	return units.HumanSize(float64(c.i.VirtualSize))
-}
-
-func (c *imageContext) SharedSize() string {
-	c.AddHeader(sharedSizeHeader)
-	if c.i.SharedSize == -1 {
-		return "N/A"
-	}
-	return units.HumanSize(float64(c.i.SharedSize))
-}
-
-func (c *imageContext) UniqueSize() string {
-	c.AddHeader(uniqueSizeHeader)
-	if c.i.VirtualSize == -1 || c.i.SharedSize == -1 {
-		return "N/A"
-	}
-	return units.HumanSize(float64(c.i.VirtualSize - c.i.SharedSize))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/image_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/image_test.go
deleted file mode 100644
index ffe77f6677..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/image_test.go
+++ /dev/null
@@ -1,333 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestImageContext(t *testing.T) {
-	imageID := stringid.GenerateRandomID()
-	unix := time.Now().Unix()
-
-	var ctx imageContext
-	cases := []struct {
-		imageCtx  imageContext
-		expValue  string
-		expHeader string
-		call      func() string
-	}{
-		{imageContext{
-			i:     types.ImageSummary{ID: imageID},
-			trunc: true,
-		}, stringid.TruncateID(imageID), imageIDHeader, ctx.ID},
-		{imageContext{
-			i:     types.ImageSummary{ID: imageID},
-			trunc: false,
-		}, imageID, imageIDHeader, ctx.ID},
-		{imageContext{
-			i:     types.ImageSummary{Size: 10, VirtualSize: 10},
-			trunc: true,
-		}, "10 B", sizeHeader, ctx.Size},
-		{imageContext{
-			i:     types.ImageSummary{Created: unix},
-			trunc: true,
-		}, time.Unix(unix, 0).String(), createdAtHeader, ctx.CreatedAt},
-		// FIXME
-		// {imageContext{
-		// 	i:     types.ImageSummary{Created: unix},
-		// 	trunc: true,
-		// }, units.HumanDuration(time.Unix(unix, 0)), createdSinceHeader, ctx.CreatedSince},
-		{imageContext{
-			i:    types.ImageSummary{},
-			repo: "busybox",
-		}, "busybox", repositoryHeader, ctx.Repository},
-		{imageContext{
-			i:   types.ImageSummary{},
-			tag: "latest",
-		}, "latest", tagHeader, ctx.Tag},
-		{imageContext{
-			i:      types.ImageSummary{},
-			digest: "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a",
-		}, "sha256:d149ab53f8718e987c3a3024bb8aa0e2caadf6c0328f1d9d850b2a2a67f2819a", digestHeader, ctx.Digest},
-	}
-
-	for _, c := range cases {
-		ctx = c.imageCtx
-		v := c.call()
-		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
-		} else if v != c.expValue {
-			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
-		}
-
-		h := ctx.FullHeader()
-		if h != c.expHeader {
-			t.Fatalf("Expected %s, was %s\n", c.expHeader, h)
-		}
-	}
-}
-
-func TestImageContextWrite(t *testing.T) {
-	unixTime := time.Now().AddDate(0, 0, -1).Unix()
-	expectedTime := time.Unix(unixTime, 0).String()
-
-	cases := []struct {
-		context  ImageContext
-		expected string
-	}{
-		// Errors
-		{
-			ImageContext{
-				Context: Context{
-					Format: "{{InvalidFunction}}",
-				},
-			},
-			`Template parsing error: template: :1: function "InvalidFunction" not defined
-`,
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: "{{nil}}",
-				},
-			},
-			`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
-`,
-		},
-		// Table Format
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table", false, false),
-				},
-			},
-			`REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-image               tag1                imageID1            24 hours ago        0 B
-image               tag2                imageID2            24 hours ago        0 B
-<none>              <none>              imageID3            24 hours ago        0 B
-`,
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table {{.Repository}}", false, false),
-				},
-			},
-			"REPOSITORY\nimage\nimage\n<none>\n",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table {{.Repository}}", false, true),
-				},
-				Digest: true,
-			},
-			`REPOSITORY          DIGEST
-image               sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf
-image               <none>
-<none>              <none>
-`,
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table {{.Repository}}", true, false),
-				},
-			},
-			"REPOSITORY\nimage\nimage\n<none>\n",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table", true, false),
-				},
-			},
-			"imageID1\nimageID2\nimageID3\n",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table", false, true),
-				},
-				Digest: true,
-			},
-			`REPOSITORY          TAG                 DIGEST                                                                    IMAGE ID            CREATED             SIZE
-image               tag1                sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf   imageID1            24 hours ago        0 B
-image               tag2                <none>                                                                    imageID2            24 hours ago        0 B
-<none>              <none>              <none>                                                                    imageID3            24 hours ago        0 B
-`,
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table", true, true),
-				},
-				Digest: true,
-			},
-			"imageID1\nimageID2\nimageID3\n",
-		},
-		// Raw Format
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("raw", false, false),
-				},
-			},
-			fmt.Sprintf(`repository: image
-tag: tag1
-image_id: imageID1
-created_at: %s
-virtual_size: 0 B
-
-repository: image
-tag: tag2
-image_id: imageID2
-created_at: %s
-virtual_size: 0 B
-
-repository: <none>
-tag: <none>
-image_id: imageID3
-created_at: %s
-virtual_size: 0 B
-
-`, expectedTime, expectedTime, expectedTime),
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("raw", false, true),
-				},
-				Digest: true,
-			},
-			fmt.Sprintf(`repository: image
-tag: tag1
-digest: sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf
-image_id: imageID1
-created_at: %s
-virtual_size: 0 B
-
-repository: image
-tag: tag2
-digest: <none>
-image_id: imageID2
-created_at: %s
-virtual_size: 0 B
-
-repository: <none>
-tag: <none>
-digest: <none>
-image_id: imageID3
-created_at: %s
-virtual_size: 0 B
-
-`, expectedTime, expectedTime, expectedTime),
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("raw", true, false),
-				},
-			},
-			`image_id: imageID1
-image_id: imageID2
-image_id: imageID3
-`,
-		},
-		// Custom Format
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("{{.Repository}}", false, false),
-				},
-			},
-			"image\nimage\n<none>\n",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("{{.Repository}}", false, true),
-				},
-				Digest: true,
-			},
-			"image\nimage\n<none>\n",
-		},
-	}
-
-	for _, testcase := range cases {
-		images := []types.ImageSummary{
-			{ID: "imageID1", RepoTags: []string{"image:tag1"}, RepoDigests: []string{"image@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"}, Created: unixTime},
-			{ID: "imageID2", RepoTags: []string{"image:tag2"}, Created: unixTime},
-			{ID: "imageID3", RepoTags: []string{"<none>:<none>"}, RepoDigests: []string{"<none>@<none>"}, Created: unixTime},
-		}
-		out := bytes.NewBufferString("")
-		testcase.context.Output = out
-		err := ImageWrite(testcase.context, images)
-		if err != nil {
-			assert.Error(t, err, testcase.expected)
-		} else {
-			assert.Equal(t, out.String(), testcase.expected)
-		}
-	}
-}
-
-func TestImageContextWriteWithNoImage(t *testing.T) {
-	out := bytes.NewBufferString("")
-	images := []types.ImageSummary{}
-
-	contexts := []struct {
-		context  ImageContext
-		expected string
-	}{
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("{{.Repository}}", false, false),
-					Output: out,
-				},
-			},
-			"",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table {{.Repository}}", false, false),
-					Output: out,
-				},
-			},
-			"REPOSITORY\n",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("{{.Repository}}", false, true),
-					Output: out,
-				},
-			},
-			"",
-		},
-		{
-			ImageContext{
-				Context: Context{
-					Format: NewImageFormat("table {{.Repository}}", false, true),
-					Output: out,
-				},
-			},
-			"REPOSITORY          DIGEST\n",
-		},
-	}
-
-	for _, context := range contexts {
-		ImageWrite(context.context, images)
-		assert.Equal(t, out.String(), context.expected)
-		// Clean buffer
-		out.Reset()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/network.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/network.go
deleted file mode 100644
index 7fbad7d2ab..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/network.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-const (
-	defaultNetworkTableFormat = "table {{.ID}}\t{{.Name}}\t{{.Driver}}\t{{.Scope}}"
-
-	networkIDHeader = "NETWORK ID"
-	ipv6Header      = "IPV6"
-	internalHeader  = "INTERNAL"
-)
-
-// NewNetworkFormat returns a Format for rendering using a network Context
-func NewNetworkFormat(source string, quiet bool) Format {
-	switch source {
-	case TableFormatKey:
-		if quiet {
-			return defaultQuietFormat
-		}
-		return defaultNetworkTableFormat
-	case RawFormatKey:
-		if quiet {
-			return `network_id: {{.ID}}`
-		}
-		return `network_id: {{.ID}}\nname: {{.Name}}\ndriver: {{.Driver}}\nscope: {{.Scope}}\n`
-	}
-	return Format(source)
-}
-
-// NetworkWrite writes the context
-func NetworkWrite(ctx Context, networks []types.NetworkResource) error {
-	render := func(format func(subContext subContext) error) error {
-		for _, network := range networks {
-			networkCtx := &networkContext{trunc: ctx.Trunc, n: network}
-			if err := format(networkCtx); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	return ctx.Write(&networkContext{}, render)
-}
-
-type networkContext struct {
-	HeaderContext
-	trunc bool
-	n     types.NetworkResource
-}
-
-func (c *networkContext) MarshalJSON() ([]byte, error) {
-	return marshalJSON(c)
-}
-
-func (c *networkContext) ID() string {
-	c.AddHeader(networkIDHeader)
-	if c.trunc {
-		return stringid.TruncateID(c.n.ID)
-	}
-	return c.n.ID
-}
-
-func (c *networkContext) Name() string {
-	c.AddHeader(nameHeader)
-	return c.n.Name
-}
-
-func (c *networkContext) Driver() string {
-	c.AddHeader(driverHeader)
-	return c.n.Driver
-}
-
-func (c *networkContext) Scope() string {
-	c.AddHeader(scopeHeader)
-	return c.n.Scope
-}
-
-func (c *networkContext) IPv6() string {
-	c.AddHeader(ipv6Header)
-	return fmt.Sprintf("%v", c.n.EnableIPv6)
-}
-
-func (c *networkContext) Internal() string {
-	c.AddHeader(internalHeader)
-	return fmt.Sprintf("%v", c.n.Internal)
-}
-
-func (c *networkContext) Labels() string {
-	c.AddHeader(labelsHeader)
-	if c.n.Labels == nil {
-		return ""
-	}
-
-	var joinLabels []string
-	for k, v := range c.n.Labels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
-	}
-	return strings.Join(joinLabels, ",")
-}
-
-func (c *networkContext) Label(name string) string {
-	n := strings.Split(name, ".")
-	r := strings.NewReplacer("-", " ", "_", " ")
-	h := r.Replace(n[len(n)-1])
-
-	c.AddHeader(h)
-
-	if c.n.Labels == nil {
-		return ""
-	}
-	return c.n.Labels[name]
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/network_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/network_test.go
deleted file mode 100644
index b40a534eed..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/network_test.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestNetworkContext(t *testing.T) {
-	networkID := stringid.GenerateRandomID()
-
-	var ctx networkContext
-	cases := []struct {
-		networkCtx networkContext
-		expValue   string
-		expHeader  string
-		call       func() string
-	}{
-		{networkContext{
-			n:     types.NetworkResource{ID: networkID},
-			trunc: false,
-		}, networkID, networkIDHeader, ctx.ID},
-		{networkContext{
-			n:     types.NetworkResource{ID: networkID},
-			trunc: true,
-		}, stringid.TruncateID(networkID), networkIDHeader, ctx.ID},
-		{networkContext{
-			n: types.NetworkResource{Name: "network_name"},
-		}, "network_name", nameHeader, ctx.Name},
-		{networkContext{
-			n: types.NetworkResource{Driver: "driver_name"},
-		}, "driver_name", driverHeader, ctx.Driver},
-		{networkContext{
-			n: types.NetworkResource{EnableIPv6: true},
-		}, "true", ipv6Header, ctx.IPv6},
-		{networkContext{
-			n: types.NetworkResource{EnableIPv6: false},
-		}, "false", ipv6Header, ctx.IPv6},
-		{networkContext{
-			n: types.NetworkResource{Internal: true},
-		}, "true", internalHeader, ctx.Internal},
-		{networkContext{
-			n: types.NetworkResource{Internal: false},
-		}, "false", internalHeader, ctx.Internal},
-		{networkContext{
-			n: types.NetworkResource{},
-		}, "", labelsHeader, ctx.Labels},
-		{networkContext{
-			n: types.NetworkResource{Labels: map[string]string{"label1": "value1", "label2": "value2"}},
-		}, "label1=value1,label2=value2", labelsHeader, ctx.Labels},
-	}
-
-	for _, c := range cases {
-		ctx = c.networkCtx
-		v := c.call()
-		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
-		} else if v != c.expValue {
-			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
-		}
-
-		h := ctx.FullHeader()
-		if h != c.expHeader {
-			t.Fatalf("Expected %s, was %s\n", c.expHeader, h)
-		}
-	}
-}
-
-func TestNetworkContextWrite(t *testing.T) {
-	cases := []struct {
-		context  Context
-		expected string
-	}{
-
-		// Errors
-		{
-			Context{Format: "{{InvalidFunction}}"},
-			`Template parsing error: template: :1: function "InvalidFunction" not defined
-`,
-		},
-		{
-			Context{Format: "{{nil}}"},
-			`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
-`,
-		},
-		// Table format
-		{
-			Context{Format: NewNetworkFormat("table", false)},
-			`NETWORK ID          NAME                DRIVER              SCOPE
-networkID1          foobar_baz          foo                 local
-networkID2          foobar_bar          bar                 local
-`,
-		},
-		{
-			Context{Format: NewNetworkFormat("table", true)},
-			`networkID1
-networkID2
-`,
-		},
-		{
-			Context{Format: NewNetworkFormat("table {{.Name}}", false)},
-			`NAME
-foobar_baz
-foobar_bar
-`,
-		},
-		{
-			Context{Format: NewNetworkFormat("table {{.Name}}", true)},
-			`NAME
-foobar_baz
-foobar_bar
-`,
-		},
-		// Raw Format
-		{
-			Context{Format: NewNetworkFormat("raw", false)},
-			`network_id: networkID1
-name: foobar_baz
-driver: foo
-scope: local
-
-network_id: networkID2
-name: foobar_bar
-driver: bar
-scope: local
-
-`,
-		},
-		{
-			Context{Format: NewNetworkFormat("raw", true)},
-			`network_id: networkID1
-network_id: networkID2
-`,
-		},
-		// Custom Format
-		{
-			Context{Format: NewNetworkFormat("{{.Name}}", false)},
-			`foobar_baz
-foobar_bar
-`,
-		},
-	}
-
-	for _, testcase := range cases {
-		networks := []types.NetworkResource{
-			{ID: "networkID1", Name: "foobar_baz", Driver: "foo", Scope: "local"},
-			{ID: "networkID2", Name: "foobar_bar", Driver: "bar", Scope: "local"},
-		}
-		out := bytes.NewBufferString("")
-		testcase.context.Output = out
-		err := NetworkWrite(testcase.context, networks)
-		if err != nil {
-			assert.Error(t, err, testcase.expected)
-		} else {
-			assert.Equal(t, out.String(), testcase.expected)
-		}
-	}
-}
-
-func TestNetworkContextWriteJSON(t *testing.T) {
-	networks := []types.NetworkResource{
-		{ID: "networkID1", Name: "foobar_baz"},
-		{ID: "networkID2", Name: "foobar_bar"},
-	}
-	expectedJSONs := []map[string]interface{}{
-		{"Driver": "", "ID": "networkID1", "IPv6": "false", "Internal": "false", "Labels": "", "Name": "foobar_baz", "Scope": ""},
-		{"Driver": "", "ID": "networkID2", "IPv6": "false", "Internal": "false", "Labels": "", "Name": "foobar_bar", "Scope": ""},
-	}
-
-	out := bytes.NewBufferString("")
-	err := NetworkWrite(Context{Format: "{{json .}}", Output: out}, networks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var m map[string]interface{}
-		if err := json.Unmarshal([]byte(line), &m); err != nil {
-			t.Fatal(err)
-		}
-		assert.DeepEqual(t, m, expectedJSONs[i])
-	}
-}
-
-func TestNetworkContextWriteJSONField(t *testing.T) {
-	networks := []types.NetworkResource{
-		{ID: "networkID1", Name: "foobar_baz"},
-		{ID: "networkID2", Name: "foobar_bar"},
-	}
-	out := bytes.NewBufferString("")
-	err := NetworkWrite(Context{Format: "{{json .ID}}", Output: out}, networks)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var s string
-		if err := json.Unmarshal([]byte(line), &s); err != nil {
-			t.Fatal(err)
-		}
-		assert.Equal(t, s, networks[i].ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect.go
deleted file mode 100644
index d1d8737d21..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package formatter
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"unicode"
-)
-
-func marshalJSON(x interface{}) ([]byte, error) {
-	m, err := marshalMap(x)
-	if err != nil {
-		return nil, err
-	}
-	return json.Marshal(m)
-}
-
-// marshalMap marshals x to map[string]interface{}
-func marshalMap(x interface{}) (map[string]interface{}, error) {
-	val := reflect.ValueOf(x)
-	if val.Kind() != reflect.Ptr {
-		return nil, fmt.Errorf("expected a pointer to a struct, got %v", val.Kind())
-	}
-	if val.IsNil() {
-		return nil, fmt.Errorf("expxected a pointer to a struct, got nil pointer")
-	}
-	valElem := val.Elem()
-	if valElem.Kind() != reflect.Struct {
-		return nil, fmt.Errorf("expected a pointer to a struct, got a pointer to %v", valElem.Kind())
-	}
-	typ := val.Type()
-	m := make(map[string]interface{})
-	for i := 0; i < val.NumMethod(); i++ {
-		k, v, err := marshalForMethod(typ.Method(i), val.Method(i))
-		if err != nil {
-			return nil, err
-		}
-		if k != "" {
-			m[k] = v
-		}
-	}
-	return m, nil
-}
-
-var unmarshallableNames = map[string]struct{}{"FullHeader": {}}
-
-// marshalForMethod returns the map key and the map value for marshalling the method.
-// It returns ("", nil, nil) for valid but non-marshallable parameter. (e.g. "unexportedFunc()")
-func marshalForMethod(typ reflect.Method, val reflect.Value) (string, interface{}, error) {
-	if val.Kind() != reflect.Func {
-		return "", nil, fmt.Errorf("expected func, got %v", val.Kind())
-	}
-	name, numIn, numOut := typ.Name, val.Type().NumIn(), val.Type().NumOut()
-	_, blackListed := unmarshallableNames[name]
-	// FIXME: In text/template, (numOut == 2) is marshallable,
-	//        if the type of the second param is error.
-	marshallable := unicode.IsUpper(rune(name[0])) && !blackListed &&
-		numIn == 0 && numOut == 1
-	if !marshallable {
-		return "", nil, nil
-	}
-	result := val.Call(make([]reflect.Value, numIn))
-	intf := result[0].Interface()
-	return name, intf, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect_test.go
deleted file mode 100644
index e547b18411..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/reflect_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package formatter
-
-import (
-	"reflect"
-	"testing"
-)
-
-type dummy struct {
-}
-
-func (d *dummy) Func1() string {
-	return "Func1"
-}
-
-func (d *dummy) func2() string {
-	return "func2(should not be marshalled)"
-}
-
-func (d *dummy) Func3() (string, int) {
-	return "Func3(should not be marshalled)", -42
-}
-
-func (d *dummy) Func4() int {
-	return 4
-}
-
-type dummyType string
-
-func (d *dummy) Func5() dummyType {
-	return dummyType("Func5")
-}
-
-func (d *dummy) FullHeader() string {
-	return "FullHeader(should not be marshalled)"
-}
-
-var dummyExpected = map[string]interface{}{
-	"Func1": "Func1",
-	"Func4": 4,
-	"Func5": dummyType("Func5"),
-}
-
-func TestMarshalMap(t *testing.T) {
-	d := dummy{}
-	m, err := marshalMap(&d)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(dummyExpected, m) {
-		t.Fatalf("expected %+v, got %+v",
-			dummyExpected, m)
-	}
-}
-
-func TestMarshalMapBad(t *testing.T) {
-	if _, err := marshalMap(nil); err == nil {
-		t.Fatal("expected an error (argument is nil)")
-	}
-	if _, err := marshalMap(dummy{}); err == nil {
-		t.Fatal("expected an error (argument is non-pointer)")
-	}
-	x := 42
-	if _, err := marshalMap(&x); err == nil {
-		t.Fatal("expected an error (argument is a pointer to non-struct)")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/service.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/service.go
deleted file mode 100644
index aaa78386cb..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/service.go
+++ /dev/null
@@ -1,322 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command/inspect"
-	units "github.com/docker/go-units"
-)
-
-const serviceInspectPrettyTemplate Format = `
-ID:		{{.ID}}
-Name:		{{.Name}}
-{{- if .Labels }}
-Labels:
-{{- range $k, $v := .Labels }}
- {{ $k }}{{if $v }}={{ $v }}{{ end }}
-{{- end }}{{ end }}
-Service Mode:
-{{- if .IsModeGlobal }}	Global
-{{- else if .IsModeReplicated }}	Replicated
-{{- if .ModeReplicatedReplicas }}
- Replicas:	{{ .ModeReplicatedReplicas }}
-{{- end }}{{ end }}
-{{- if .HasUpdateStatus }}
-UpdateStatus:
- State:		{{ .UpdateStatusState }}
- Started:	{{ .UpdateStatusStarted }}
-{{- if .UpdateIsCompleted }}
- Completed:	{{ .UpdateStatusCompleted }}
-{{- end }}
- Message:	{{ .UpdateStatusMessage }}
-{{- end }}
-Placement:
-{{- if .TaskPlacementConstraints -}}
- Contraints:	{{ .TaskPlacementConstraints }}
-{{- end }}
-{{- if .HasUpdateConfig }}
-UpdateConfig:
- Parallelism:	{{ .UpdateParallelism }}
-{{- if .HasUpdateDelay}}
- Delay:		{{ .UpdateDelay }}
-{{- end }}
- On failure:	{{ .UpdateOnFailure }}
-{{- if .HasUpdateMonitor}}
- Monitoring Period: {{ .UpdateMonitor }}
-{{- end }}
- Max failure ratio: {{ .UpdateMaxFailureRatio }}
-{{- end }}
-ContainerSpec:
- Image:		{{ .ContainerImage }}
-{{- if .ContainerArgs }}
- Args:		{{ range $arg := .ContainerArgs }}{{ $arg }} {{ end }}
-{{- end -}}
-{{- if .ContainerEnv }}
- Env:		{{ range $env := .ContainerEnv }}{{ $env }} {{ end }}
-{{- end -}}
-{{- if .ContainerWorkDir }}
- Dir:		{{ .ContainerWorkDir }}
-{{- end -}}
-{{- if .ContainerUser }}
- User: {{ .ContainerUser }}
-{{- end }}
-{{- if .ContainerMounts }}
-Mounts:
-{{- end }}
-{{- range $mount := .ContainerMounts }}
-  Target = {{ $mount.Target }}
-   Source = {{ $mount.Source }}
-   ReadOnly = {{ $mount.ReadOnly }}
-   Type = {{ $mount.Type }}
-{{- end -}}
-{{- if .HasResources }}
-Resources:
-{{- if .HasResourceReservations }}
- Reservations:
-{{- if gt .ResourceReservationNanoCPUs 0.0 }}
-  CPU:		{{ .ResourceReservationNanoCPUs }}
-{{- end }}
-{{- if .ResourceReservationMemory }}
-  Memory:	{{ .ResourceReservationMemory }}
-{{- end }}{{ end }}
-{{- if .HasResourceLimits }}
- Limits:
-{{- if gt .ResourceLimitsNanoCPUs 0.0 }}
-  CPU:		{{ .ResourceLimitsNanoCPUs }}
-{{- end }}
-{{- if .ResourceLimitMemory }}
-  Memory:	{{ .ResourceLimitMemory }}
-{{- end }}{{ end }}{{ end }}
-{{- if .Networks }}
-Networks:
-{{- range $network := .Networks }} {{ $network }}{{ end }} {{ end }}
-Endpoint Mode:	{{ .EndpointMode }}
-{{- if .Ports }}
-Ports:
-{{- range $port := .Ports }}
- PublishedPort {{ $port.PublishedPort }}
-  Protocol = {{ $port.Protocol }}
-  TargetPort = {{ $port.TargetPort }}
-{{- end }} {{ end -}}
-`
-
-// NewServiceFormat returns a Format for rendering using a Context
-func NewServiceFormat(source string) Format {
-	switch source {
-	case PrettyFormatKey:
-		return serviceInspectPrettyTemplate
-	default:
-		return Format(strings.TrimPrefix(source, RawFormatKey))
-	}
-}
-
-// ServiceInspectWrite renders the context for a list of services
-func ServiceInspectWrite(ctx Context, refs []string, getRef inspect.GetRefFunc) error {
-	if ctx.Format != serviceInspectPrettyTemplate {
-		return inspect.Inspect(ctx.Output, refs, string(ctx.Format), getRef)
-	}
-	render := func(format func(subContext subContext) error) error {
-		for _, ref := range refs {
-			serviceI, _, err := getRef(ref)
-			if err != nil {
-				return err
-			}
-			service, ok := serviceI.(swarm.Service)
-			if !ok {
-				return fmt.Errorf("got wrong object to inspect")
-			}
-			if err := format(&serviceInspectContext{Service: service}); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	return ctx.Write(&serviceInspectContext{}, render)
-}
-
-type serviceInspectContext struct {
-	swarm.Service
-	subContext
-}
-
-func (ctx *serviceInspectContext) MarshalJSON() ([]byte, error) {
-	return marshalJSON(ctx)
-}
-
-func (ctx *serviceInspectContext) ID() string {
-	return ctx.Service.ID
-}
-
-func (ctx *serviceInspectContext) Name() string {
-	return ctx.Service.Spec.Name
-}
-
-func (ctx *serviceInspectContext) Labels() map[string]string {
-	return ctx.Service.Spec.Labels
-}
-
-func (ctx *serviceInspectContext) IsModeGlobal() bool {
-	return ctx.Service.Spec.Mode.Global != nil
-}
-
-func (ctx *serviceInspectContext) IsModeReplicated() bool {
-	return ctx.Service.Spec.Mode.Replicated != nil
-}
-
-func (ctx *serviceInspectContext) ModeReplicatedReplicas() *uint64 {
-	return ctx.Service.Spec.Mode.Replicated.Replicas
-}
-
-func (ctx *serviceInspectContext) HasUpdateStatus() bool {
-	return ctx.Service.UpdateStatus.State != ""
-}
-
-func (ctx *serviceInspectContext) UpdateStatusState() swarm.UpdateState {
-	return ctx.Service.UpdateStatus.State
-}
-
-func (ctx *serviceInspectContext) UpdateStatusStarted() string {
-	return units.HumanDuration(time.Since(ctx.Service.UpdateStatus.StartedAt))
-}
-
-func (ctx *serviceInspectContext) UpdateIsCompleted() bool {
-	return ctx.Service.UpdateStatus.State == swarm.UpdateStateCompleted
-}
-
-func (ctx *serviceInspectContext) UpdateStatusCompleted() string {
-	return units.HumanDuration(time.Since(ctx.Service.UpdateStatus.CompletedAt))
-}
-
-func (ctx *serviceInspectContext) UpdateStatusMessage() string {
-	return ctx.Service.UpdateStatus.Message
-}
-
-func (ctx *serviceInspectContext) TaskPlacementConstraints() []string {
-	if ctx.Service.Spec.TaskTemplate.Placement != nil {
-		return ctx.Service.Spec.TaskTemplate.Placement.Constraints
-	}
-	return nil
-}
-
-func (ctx *serviceInspectContext) HasUpdateConfig() bool {
-	return ctx.Service.Spec.UpdateConfig != nil
-}
-
-func (ctx *serviceInspectContext) UpdateParallelism() uint64 {
-	return ctx.Service.Spec.UpdateConfig.Parallelism
-}
-
-func (ctx *serviceInspectContext) HasUpdateDelay() bool {
-	return ctx.Service.Spec.UpdateConfig.Delay.Nanoseconds() > 0
-}
-
-func (ctx *serviceInspectContext) UpdateDelay() time.Duration {
-	return ctx.Service.Spec.UpdateConfig.Delay
-}
-
-func (ctx *serviceInspectContext) UpdateOnFailure() string {
-	return ctx.Service.Spec.UpdateConfig.FailureAction
-}
-
-func (ctx *serviceInspectContext) HasUpdateMonitor() bool {
-	return ctx.Service.Spec.UpdateConfig.Monitor.Nanoseconds() > 0
-}
-
-func (ctx *serviceInspectContext) UpdateMonitor() time.Duration {
-	return ctx.Service.Spec.UpdateConfig.Monitor
-}
-
-func (ctx *serviceInspectContext) UpdateMaxFailureRatio() float32 {
-	return ctx.Service.Spec.UpdateConfig.MaxFailureRatio
-}
-
-func (ctx *serviceInspectContext) ContainerImage() string {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Image
-}
-
-func (ctx *serviceInspectContext) ContainerArgs() []string {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Args
-}
-
-func (ctx *serviceInspectContext) ContainerEnv() []string {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Env
-}
-
-func (ctx *serviceInspectContext) ContainerWorkDir() string {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Dir
-}
-
-func (ctx *serviceInspectContext) ContainerUser() string {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.User
-}
-
-func (ctx *serviceInspectContext) ContainerMounts() []mounttypes.Mount {
-	return ctx.Service.Spec.TaskTemplate.ContainerSpec.Mounts
-}
-
-func (ctx *serviceInspectContext) HasResources() bool {
-	return ctx.Service.Spec.TaskTemplate.Resources != nil
-}
-
-func (ctx *serviceInspectContext) HasResourceReservations() bool {
-	if ctx.Service.Spec.TaskTemplate.Resources == nil || ctx.Service.Spec.TaskTemplate.Resources.Reservations == nil {
-		return false
-	}
-	return ctx.Service.Spec.TaskTemplate.Resources.Reservations.NanoCPUs > 0 || ctx.Service.Spec.TaskTemplate.Resources.Reservations.MemoryBytes > 0
-}
-
-func (ctx *serviceInspectContext) ResourceReservationNanoCPUs() float64 {
-	if ctx.Service.Spec.TaskTemplate.Resources.Reservations.NanoCPUs == 0 {
-		return float64(0)
-	}
-	return float64(ctx.Service.Spec.TaskTemplate.Resources.Reservations.NanoCPUs) / 1e9
-}
-
-func (ctx *serviceInspectContext) ResourceReservationMemory() string {
-	if ctx.Service.Spec.TaskTemplate.Resources.Reservations.MemoryBytes == 0 {
-		return ""
-	}
-	return units.BytesSize(float64(ctx.Service.Spec.TaskTemplate.Resources.Reservations.MemoryBytes))
-}
-
-func (ctx *serviceInspectContext) HasResourceLimits() bool {
-	if ctx.Service.Spec.TaskTemplate.Resources == nil || ctx.Service.Spec.TaskTemplate.Resources.Limits == nil {
-		return false
-	}
-	return ctx.Service.Spec.TaskTemplate.Resources.Limits.NanoCPUs > 0 || ctx.Service.Spec.TaskTemplate.Resources.Limits.MemoryBytes > 0
-}
-
-func (ctx *serviceInspectContext) ResourceLimitsNanoCPUs() float64 {
-	return float64(ctx.Service.Spec.TaskTemplate.Resources.Limits.NanoCPUs) / 1e9
-}
-
-func (ctx *serviceInspectContext) ResourceLimitMemory() string {
-	if ctx.Service.Spec.TaskTemplate.Resources.Limits.MemoryBytes == 0 {
-		return ""
-	}
-	return units.BytesSize(float64(ctx.Service.Spec.TaskTemplate.Resources.Limits.MemoryBytes))
-}
-
-func (ctx *serviceInspectContext) Networks() []string {
-	var out []string
-	for _, n := range ctx.Service.Spec.Networks {
-		out = append(out, n.Target)
-	}
-	return out
-}
-
-func (ctx *serviceInspectContext) EndpointMode() string {
-	if ctx.Service.Spec.EndpointSpec == nil {
-		return ""
-	}
-
-	return string(ctx.Service.Spec.EndpointSpec.Mode)
-}
-
-func (ctx *serviceInspectContext) Ports() []swarm.PortConfig {
-	return ctx.Service.Endpoint.Ports
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/stats.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/stats.go
deleted file mode 100644
index 7997f996d8..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/stats.go
+++ /dev/null
@@ -1,211 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"sync"
-
-	units "github.com/docker/go-units"
-)
-
-const (
-	winOSType                  = "windows"
-	defaultStatsTableFormat    = "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.MemPerc}}\t{{.NetIO}}\t{{.BlockIO}}\t{{.PIDs}}"
-	winDefaultStatsTableFormat = "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}\t{{.NetIO}}\t{{.BlockIO}}"
-
-	containerHeader = "CONTAINER"
-	cpuPercHeader   = "CPU %"
-	netIOHeader     = "NET I/O"
-	blockIOHeader   = "BLOCK I/O"
-	memPercHeader   = "MEM %"             // Used only on Linux
-	winMemUseHeader = "PRIV WORKING SET"  // Used only on Windows
-	memUseHeader    = "MEM USAGE / LIMIT" // Used only on Linux
-	pidsHeader      = "PIDS"              // Used only on Linux
-)
-
-// StatsEntry represents represents the statistics data collected from a container
-type StatsEntry struct {
-	Container        string
-	Name             string
-	ID               string
-	CPUPercentage    float64
-	Memory           float64 // On Windows this is the private working set
-	MemoryLimit      float64 // Not used on Windows
-	MemoryPercentage float64 // Not used on Windows
-	NetworkRx        float64
-	NetworkTx        float64
-	BlockRead        float64
-	BlockWrite       float64
-	PidsCurrent      uint64 // Not used on Windows
-	IsInvalid        bool
-	OSType           string
-}
-
-// ContainerStats represents an entity to store containers statistics synchronously
-type ContainerStats struct {
-	mutex sync.Mutex
-	StatsEntry
-	err error
-}
-
-// GetError returns the container statistics error.
-// This is used to determine whether the statistics are valid or not
-func (cs *ContainerStats) GetError() error {
-	cs.mutex.Lock()
-	defer cs.mutex.Unlock()
-	return cs.err
-}
-
-// SetErrorAndReset zeroes all the container statistics and store the error.
-// It is used when receiving time out error during statistics collecting to reduce lock overhead
-func (cs *ContainerStats) SetErrorAndReset(err error) {
-	cs.mutex.Lock()
-	defer cs.mutex.Unlock()
-	cs.CPUPercentage = 0
-	cs.Memory = 0
-	cs.MemoryPercentage = 0
-	cs.MemoryLimit = 0
-	cs.NetworkRx = 0
-	cs.NetworkTx = 0
-	cs.BlockRead = 0
-	cs.BlockWrite = 0
-	cs.PidsCurrent = 0
-	cs.err = err
-	cs.IsInvalid = true
-}
-
-// SetError sets container statistics error
-func (cs *ContainerStats) SetError(err error) {
-	cs.mutex.Lock()
-	defer cs.mutex.Unlock()
-	cs.err = err
-	if err != nil {
-		cs.IsInvalid = true
-	}
-}
-
-// SetStatistics set the container statistics
-func (cs *ContainerStats) SetStatistics(s StatsEntry) {
-	cs.mutex.Lock()
-	defer cs.mutex.Unlock()
-	s.Container = cs.Container
-	s.OSType = cs.OSType
-	cs.StatsEntry = s
-}
-
-// GetStatistics returns container statistics with other meta data such as the container name
-func (cs *ContainerStats) GetStatistics() StatsEntry {
-	cs.mutex.Lock()
-	defer cs.mutex.Unlock()
-	return cs.StatsEntry
-}
-
-// NewStatsFormat returns a format for rendering an CStatsContext
-func NewStatsFormat(source, osType string) Format {
-	if source == TableFormatKey {
-		if osType == winOSType {
-			return Format(winDefaultStatsTableFormat)
-		}
-		return Format(defaultStatsTableFormat)
-	}
-	return Format(source)
-}
-
-// NewContainerStats returns a new ContainerStats entity and sets in it the given name
-func NewContainerStats(container, osType string) *ContainerStats {
-	return &ContainerStats{
-		StatsEntry: StatsEntry{Container: container, OSType: osType},
-	}
-}
-
-// ContainerStatsWrite renders the context for a list of containers statistics
-func ContainerStatsWrite(ctx Context, containerStats []StatsEntry) error {
-	render := func(format func(subContext subContext) error) error {
-		for _, cstats := range containerStats {
-			containerStatsCtx := &containerStatsContext{
-				s: cstats,
-			}
-			if err := format(containerStatsCtx); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	return ctx.Write(&containerStatsContext{}, render)
-}
-
-type containerStatsContext struct {
-	HeaderContext
-	s StatsEntry
-}
-
-func (c *containerStatsContext) Container() string {
-	c.AddHeader(containerHeader)
-	return c.s.Container
-}
-
-func (c *containerStatsContext) Name() string {
-	c.AddHeader(nameHeader)
-	name := c.s.Name[1:]
-	return name
-}
-
-func (c *containerStatsContext) ID() string {
-	c.AddHeader(containerIDHeader)
-	return c.s.ID
-}
-
-func (c *containerStatsContext) CPUPerc() string {
-	c.AddHeader(cpuPercHeader)
-	if c.s.IsInvalid {
-		return fmt.Sprintf("--")
-	}
-	return fmt.Sprintf("%.2f%%", c.s.CPUPercentage)
-}
-
-func (c *containerStatsContext) MemUsage() string {
-	header := memUseHeader
-	if c.s.OSType == winOSType {
-		header = winMemUseHeader
-	}
-	c.AddHeader(header)
-	if c.s.IsInvalid {
-		return fmt.Sprintf("-- / --")
-	}
-	if c.s.OSType == winOSType {
-		return fmt.Sprintf("%s", units.BytesSize(c.s.Memory))
-	}
-	return fmt.Sprintf("%s / %s", units.BytesSize(c.s.Memory), units.BytesSize(c.s.MemoryLimit))
-}
-
-func (c *containerStatsContext) MemPerc() string {
-	header := memPercHeader
-	c.AddHeader(header)
-	if c.s.IsInvalid || c.s.OSType == winOSType {
-		return fmt.Sprintf("--")
-	}
-	return fmt.Sprintf("%.2f%%", c.s.MemoryPercentage)
-}
-
-func (c *containerStatsContext) NetIO() string {
-	c.AddHeader(netIOHeader)
-	if c.s.IsInvalid {
-		return fmt.Sprintf("--")
-	}
-	return fmt.Sprintf("%s / %s", units.HumanSizeWithPrecision(c.s.NetworkRx, 3), units.HumanSizeWithPrecision(c.s.NetworkTx, 3))
-}
-
-func (c *containerStatsContext) BlockIO() string {
-	c.AddHeader(blockIOHeader)
-	if c.s.IsInvalid {
-		return fmt.Sprintf("--")
-	}
-	return fmt.Sprintf("%s / %s", units.HumanSizeWithPrecision(c.s.BlockRead, 3), units.HumanSizeWithPrecision(c.s.BlockWrite, 3))
-}
-
-func (c *containerStatsContext) PIDs() string {
-	c.AddHeader(pidsHeader)
-	if c.s.IsInvalid || c.s.OSType == winOSType {
-		return fmt.Sprintf("--")
-	}
-	return fmt.Sprintf("%d", c.s.PidsCurrent)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/stats_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/stats_test.go
deleted file mode 100644
index d5a17cc70e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/stats_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestContainerStatsContext(t *testing.T) {
-	containerID := stringid.GenerateRandomID()
-
-	var ctx containerStatsContext
-	tt := []struct {
-		stats     StatsEntry
-		expValue  string
-		expHeader string
-		call      func() string
-	}{
-		{StatsEntry{Container: containerID}, containerID, containerHeader, ctx.Container},
-		{StatsEntry{CPUPercentage: 5.5}, "5.50%", cpuPercHeader, ctx.CPUPerc},
-		{StatsEntry{CPUPercentage: 5.5, IsInvalid: true}, "--", cpuPercHeader, ctx.CPUPerc},
-		{StatsEntry{NetworkRx: 0.31, NetworkTx: 12.3}, "0.31 B / 12.3 B", netIOHeader, ctx.NetIO},
-		{StatsEntry{NetworkRx: 0.31, NetworkTx: 12.3, IsInvalid: true}, "--", netIOHeader, ctx.NetIO},
-		{StatsEntry{BlockRead: 0.1, BlockWrite: 2.3}, "0.1 B / 2.3 B", blockIOHeader, ctx.BlockIO},
-		{StatsEntry{BlockRead: 0.1, BlockWrite: 2.3, IsInvalid: true}, "--", blockIOHeader, ctx.BlockIO},
-		{StatsEntry{MemoryPercentage: 10.2}, "10.20%", memPercHeader, ctx.MemPerc},
-		{StatsEntry{MemoryPercentage: 10.2, IsInvalid: true}, "--", memPercHeader, ctx.MemPerc},
-		{StatsEntry{MemoryPercentage: 10.2, OSType: "windows"}, "--", memPercHeader, ctx.MemPerc},
-		{StatsEntry{Memory: 24, MemoryLimit: 30}, "24 B / 30 B", memUseHeader, ctx.MemUsage},
-		{StatsEntry{Memory: 24, MemoryLimit: 30, IsInvalid: true}, "-- / --", memUseHeader, ctx.MemUsage},
-		{StatsEntry{Memory: 24, MemoryLimit: 30, OSType: "windows"}, "24 B", winMemUseHeader, ctx.MemUsage},
-		{StatsEntry{PidsCurrent: 10}, "10", pidsHeader, ctx.PIDs},
-		{StatsEntry{PidsCurrent: 10, IsInvalid: true}, "--", pidsHeader, ctx.PIDs},
-		{StatsEntry{PidsCurrent: 10, OSType: "windows"}, "--", pidsHeader, ctx.PIDs},
-	}
-
-	for _, te := range tt {
-		ctx = containerStatsContext{s: te.stats}
-		if v := te.call(); v != te.expValue {
-			t.Fatalf("Expected %q, got %q", te.expValue, v)
-		}
-
-		h := ctx.FullHeader()
-		if h != te.expHeader {
-			t.Fatalf("Expected %q, got %q", te.expHeader, h)
-		}
-	}
-}
-
-func TestContainerStatsContextWrite(t *testing.T) {
-	tt := []struct {
-		context  Context
-		expected string
-	}{
-		{
-			Context{Format: "{{InvalidFunction}}"},
-			`Template parsing error: template: :1: function "InvalidFunction" not defined
-`,
-		},
-		{
-			Context{Format: "{{nil}}"},
-			`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
-`,
-		},
-		{
-			Context{Format: "table {{.MemUsage}}"},
-			`MEM USAGE / LIMIT
-20 B / 20 B
--- / --
-`,
-		},
-		{
-			Context{Format: "{{.Container}}  {{.CPUPerc}}"},
-			`container1  20.00%
-container2  --
-`,
-		},
-	}
-
-	for _, te := range tt {
-		stats := []StatsEntry{
-			{
-				Container:        "container1",
-				CPUPercentage:    20,
-				Memory:           20,
-				MemoryLimit:      20,
-				MemoryPercentage: 20,
-				NetworkRx:        20,
-				NetworkTx:        20,
-				BlockRead:        20,
-				BlockWrite:       20,
-				PidsCurrent:      2,
-				IsInvalid:        false,
-				OSType:           "linux",
-			},
-			{
-				Container:        "container2",
-				CPUPercentage:    30,
-				Memory:           30,
-				MemoryLimit:      30,
-				MemoryPercentage: 30,
-				NetworkRx:        30,
-				NetworkTx:        30,
-				BlockRead:        30,
-				BlockWrite:       30,
-				PidsCurrent:      3,
-				IsInvalid:        true,
-				OSType:           "linux",
-			},
-		}
-		var out bytes.Buffer
-		te.context.Output = &out
-		err := ContainerStatsWrite(te.context, stats)
-		if err != nil {
-			assert.Error(t, err, te.expected)
-		} else {
-			assert.Equal(t, out.String(), te.expected)
-		}
-	}
-}
-
-func TestContainerStatsContextWriteWindows(t *testing.T) {
-	tt := []struct {
-		context  Context
-		expected string
-	}{
-		{
-			Context{Format: "table {{.MemUsage}}"},
-			`PRIV WORKING SET
-20 B
--- / --
-`,
-		},
-		{
-			Context{Format: "{{.Container}}  {{.CPUPerc}}"},
-			`container1  20.00%
-container2  --
-`,
-		},
-		{
-			Context{Format: "{{.Container}}  {{.MemPerc}}  {{.PIDs}}"},
-			`container1  --  --
-container2  --  --
-`,
-		},
-	}
-
-	for _, te := range tt {
-		stats := []StatsEntry{
-			{
-				Container:        "container1",
-				CPUPercentage:    20,
-				Memory:           20,
-				MemoryLimit:      20,
-				MemoryPercentage: 20,
-				NetworkRx:        20,
-				NetworkTx:        20,
-				BlockRead:        20,
-				BlockWrite:       20,
-				PidsCurrent:      2,
-				IsInvalid:        false,
-				OSType:           "windows",
-			},
-			{
-				Container:        "container2",
-				CPUPercentage:    30,
-				Memory:           30,
-				MemoryLimit:      30,
-				MemoryPercentage: 30,
-				NetworkRx:        30,
-				NetworkTx:        30,
-				BlockRead:        30,
-				BlockWrite:       30,
-				PidsCurrent:      3,
-				IsInvalid:        true,
-				OSType:           "windows",
-			},
-		}
-		var out bytes.Buffer
-		te.context.Output = &out
-		err := ContainerStatsWrite(te.context, stats)
-		if err != nil {
-			assert.Error(t, err, te.expected)
-		} else {
-			assert.Equal(t, out.String(), te.expected)
-		}
-	}
-}
-
-func TestContainerStatsContextWriteWithNoStats(t *testing.T) {
-	var out bytes.Buffer
-
-	contexts := []struct {
-		context  Context
-		expected string
-	}{
-		{
-			Context{
-				Format: "{{.Container}}",
-				Output: &out,
-			},
-			"",
-		},
-		{
-			Context{
-				Format: "table {{.Container}}",
-				Output: &out,
-			},
-			"CONTAINER\n",
-		},
-		{
-			Context{
-				Format: "table {{.Container}}\t{{.CPUPerc}}",
-				Output: &out,
-			},
-			"CONTAINER           CPU %\n",
-		},
-	}
-
-	for _, context := range contexts {
-		ContainerStatsWrite(context.context, []StatsEntry{})
-		assert.Equal(t, context.expected, out.String())
-		// Clean buffer
-		out.Reset()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/volume.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/volume.go
deleted file mode 100644
index 90c9b13536..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/volume.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package formatter
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	units "github.com/docker/go-units"
-)
-
-const (
-	defaultVolumeQuietFormat = "{{.Name}}"
-	defaultVolumeTableFormat = "table {{.Driver}}\t{{.Name}}"
-
-	volumeNameHeader = "VOLUME NAME"
-	mountpointHeader = "MOUNTPOINT"
-	linksHeader      = "LINKS"
-	// Status header ?
-)
-
-// NewVolumeFormat returns a format for use with a volume Context
-func NewVolumeFormat(source string, quiet bool) Format {
-	switch source {
-	case TableFormatKey:
-		if quiet {
-			return defaultVolumeQuietFormat
-		}
-		return defaultVolumeTableFormat
-	case RawFormatKey:
-		if quiet {
-			return `name: {{.Name}}`
-		}
-		return `name: {{.Name}}\ndriver: {{.Driver}}\n`
-	}
-	return Format(source)
-}
-
-// VolumeWrite writes formatted volumes using the Context
-func VolumeWrite(ctx Context, volumes []*types.Volume) error {
-	render := func(format func(subContext subContext) error) error {
-		for _, volume := range volumes {
-			if err := format(&volumeContext{v: *volume}); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-	return ctx.Write(&volumeContext{}, render)
-}
-
-type volumeContext struct {
-	HeaderContext
-	v types.Volume
-}
-
-func (c *volumeContext) MarshalJSON() ([]byte, error) {
-	return marshalJSON(c)
-}
-
-func (c *volumeContext) Name() string {
-	c.AddHeader(volumeNameHeader)
-	return c.v.Name
-}
-
-func (c *volumeContext) Driver() string {
-	c.AddHeader(driverHeader)
-	return c.v.Driver
-}
-
-func (c *volumeContext) Scope() string {
-	c.AddHeader(scopeHeader)
-	return c.v.Scope
-}
-
-func (c *volumeContext) Mountpoint() string {
-	c.AddHeader(mountpointHeader)
-	return c.v.Mountpoint
-}
-
-func (c *volumeContext) Labels() string {
-	c.AddHeader(labelsHeader)
-	if c.v.Labels == nil {
-		return ""
-	}
-
-	var joinLabels []string
-	for k, v := range c.v.Labels {
-		joinLabels = append(joinLabels, fmt.Sprintf("%s=%s", k, v))
-	}
-	return strings.Join(joinLabels, ",")
-}
-
-func (c *volumeContext) Label(name string) string {
-
-	n := strings.Split(name, ".")
-	r := strings.NewReplacer("-", " ", "_", " ")
-	h := r.Replace(n[len(n)-1])
-
-	c.AddHeader(h)
-
-	if c.v.Labels == nil {
-		return ""
-	}
-	return c.v.Labels[name]
-}
-
-func (c *volumeContext) Links() string {
-	c.AddHeader(linksHeader)
-	if c.v.UsageData == nil {
-		return "N/A"
-	}
-	return fmt.Sprintf("%d", c.v.UsageData.RefCount)
-}
-
-func (c *volumeContext) Size() string {
-	c.AddHeader(sizeHeader)
-	if c.v.UsageData == nil {
-		return "N/A"
-	}
-	return units.HumanSize(float64(c.v.UsageData.Size))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/formatter/volume_test.go b/installer/vendor/github.com/docker/docker/cli/command/formatter/volume_test.go
deleted file mode 100644
index 9ec18b6916..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/formatter/volume_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-package formatter
-
-import (
-	"bytes"
-	"encoding/json"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestVolumeContext(t *testing.T) {
-	volumeName := stringid.GenerateRandomID()
-
-	var ctx volumeContext
-	cases := []struct {
-		volumeCtx volumeContext
-		expValue  string
-		expHeader string
-		call      func() string
-	}{
-		{volumeContext{
-			v: types.Volume{Name: volumeName},
-		}, volumeName, volumeNameHeader, ctx.Name},
-		{volumeContext{
-			v: types.Volume{Driver: "driver_name"},
-		}, "driver_name", driverHeader, ctx.Driver},
-		{volumeContext{
-			v: types.Volume{Scope: "local"},
-		}, "local", scopeHeader, ctx.Scope},
-		{volumeContext{
-			v: types.Volume{Mountpoint: "mountpoint"},
-		}, "mountpoint", mountpointHeader, ctx.Mountpoint},
-		{volumeContext{
-			v: types.Volume{},
-		}, "", labelsHeader, ctx.Labels},
-		{volumeContext{
-			v: types.Volume{Labels: map[string]string{"label1": "value1", "label2": "value2"}},
-		}, "label1=value1,label2=value2", labelsHeader, ctx.Labels},
-	}
-
-	for _, c := range cases {
-		ctx = c.volumeCtx
-		v := c.call()
-		if strings.Contains(v, ",") {
-			compareMultipleValues(t, v, c.expValue)
-		} else if v != c.expValue {
-			t.Fatalf("Expected %s, was %s\n", c.expValue, v)
-		}
-
-		h := ctx.FullHeader()
-		if h != c.expHeader {
-			t.Fatalf("Expected %s, was %s\n", c.expHeader, h)
-		}
-	}
-}
-
-func TestVolumeContextWrite(t *testing.T) {
-	cases := []struct {
-		context  Context
-		expected string
-	}{
-
-		// Errors
-		{
-			Context{Format: "{{InvalidFunction}}"},
-			`Template parsing error: template: :1: function "InvalidFunction" not defined
-`,
-		},
-		{
-			Context{Format: "{{nil}}"},
-			`Template parsing error: template: :1:2: executing "" at <nil>: nil is not a command
-`,
-		},
-		// Table format
-		{
-			Context{Format: NewVolumeFormat("table", false)},
-			`DRIVER              VOLUME NAME
-foo                 foobar_baz
-bar                 foobar_bar
-`,
-		},
-		{
-			Context{Format: NewVolumeFormat("table", true)},
-			`foobar_baz
-foobar_bar
-`,
-		},
-		{
-			Context{Format: NewVolumeFormat("table {{.Name}}", false)},
-			`VOLUME NAME
-foobar_baz
-foobar_bar
-`,
-		},
-		{
-			Context{Format: NewVolumeFormat("table {{.Name}}", true)},
-			`VOLUME NAME
-foobar_baz
-foobar_bar
-`,
-		},
-		// Raw Format
-		{
-			Context{Format: NewVolumeFormat("raw", false)},
-			`name: foobar_baz
-driver: foo
-
-name: foobar_bar
-driver: bar
-
-`,
-		},
-		{
-			Context{Format: NewVolumeFormat("raw", true)},
-			`name: foobar_baz
-name: foobar_bar
-`,
-		},
-		// Custom Format
-		{
-			Context{Format: NewVolumeFormat("{{.Name}}", false)},
-			`foobar_baz
-foobar_bar
-`,
-		},
-	}
-
-	for _, testcase := range cases {
-		volumes := []*types.Volume{
-			{Name: "foobar_baz", Driver: "foo"},
-			{Name: "foobar_bar", Driver: "bar"},
-		}
-		out := bytes.NewBufferString("")
-		testcase.context.Output = out
-		err := VolumeWrite(testcase.context, volumes)
-		if err != nil {
-			assert.Error(t, err, testcase.expected)
-		} else {
-			assert.Equal(t, out.String(), testcase.expected)
-		}
-	}
-}
-
-func TestVolumeContextWriteJSON(t *testing.T) {
-	volumes := []*types.Volume{
-		{Driver: "foo", Name: "foobar_baz"},
-		{Driver: "bar", Name: "foobar_bar"},
-	}
-	expectedJSONs := []map[string]interface{}{
-		{"Driver": "foo", "Labels": "", "Links": "N/A", "Mountpoint": "", "Name": "foobar_baz", "Scope": "", "Size": "N/A"},
-		{"Driver": "bar", "Labels": "", "Links": "N/A", "Mountpoint": "", "Name": "foobar_bar", "Scope": "", "Size": "N/A"},
-	}
-	out := bytes.NewBufferString("")
-	err := VolumeWrite(Context{Format: "{{json .}}", Output: out}, volumes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var m map[string]interface{}
-		if err := json.Unmarshal([]byte(line), &m); err != nil {
-			t.Fatal(err)
-		}
-		assert.DeepEqual(t, m, expectedJSONs[i])
-	}
-}
-
-func TestVolumeContextWriteJSONField(t *testing.T) {
-	volumes := []*types.Volume{
-		{Driver: "foo", Name: "foobar_baz"},
-		{Driver: "bar", Name: "foobar_bar"},
-	}
-	out := bytes.NewBufferString("")
-	err := VolumeWrite(Context{Format: "{{json .Name}}", Output: out}, volumes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, line := range strings.Split(strings.TrimSpace(out.String()), "\n") {
-		t.Logf("Output: line %d: %s", i, line)
-		var s string
-		if err := json.Unmarshal([]byte(line), &s); err != nil {
-			t.Fatal(err)
-		}
-		assert.Equal(t, s, volumes[i].Name)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/idresolver/idresolver.go b/installer/vendor/github.com/docker/docker/cli/command/idresolver/idresolver.go
deleted file mode 100644
index 511b1a8f54..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/idresolver/idresolver.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package idresolver
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-// IDResolver provides ID to Name resolution.
-type IDResolver struct {
-	client    client.APIClient
-	noResolve bool
-	cache     map[string]string
-}
-
-// New creates a new IDResolver.
-func New(client client.APIClient, noResolve bool) *IDResolver {
-	return &IDResolver{
-		client:    client,
-		noResolve: noResolve,
-		cache:     make(map[string]string),
-	}
-}
-
-func (r *IDResolver) get(ctx context.Context, t interface{}, id string) (string, error) {
-	switch t := t.(type) {
-	case swarm.Node:
-		node, _, err := r.client.NodeInspectWithRaw(ctx, id)
-		if err != nil {
-			return id, nil
-		}
-		if node.Spec.Annotations.Name != "" {
-			return node.Spec.Annotations.Name, nil
-		}
-		if node.Description.Hostname != "" {
-			return node.Description.Hostname, nil
-		}
-		return id, nil
-	case swarm.Service:
-		service, _, err := r.client.ServiceInspectWithRaw(ctx, id)
-		if err != nil {
-			return id, nil
-		}
-		return service.Spec.Annotations.Name, nil
-	case swarm.Task:
-		// If the caller passes the full task there's no need to do a lookup.
-		if t.ID == "" {
-			var err error
-
-			t, _, err = r.client.TaskInspectWithRaw(ctx, id)
-			if err != nil {
-				return id, nil
-			}
-		}
-		taskID := stringid.TruncateID(t.ID)
-		if t.ServiceID == "" {
-			return taskID, nil
-		}
-		service, err := r.Resolve(ctx, swarm.Service{}, t.ServiceID)
-		if err != nil {
-			return "", err
-		}
-		return fmt.Sprintf("%s.%d.%s", service, t.Slot, taskID), nil
-	default:
-		return "", fmt.Errorf("unsupported type")
-	}
-
-}
-
-// Resolve will attempt to resolve an ID to a Name by querying the manager.
-// Results are stored into a cache.
-// If the `-n` flag is used in the command-line, resolution is disabled.
-func (r *IDResolver) Resolve(ctx context.Context, t interface{}, id string) (string, error) {
-	if r.noResolve {
-		return id, nil
-	}
-	if name, ok := r.cache[id]; ok {
-		return name, nil
-	}
-	name, err := r.get(ctx, t, id)
-	if err != nil {
-		return "", err
-	}
-	r.cache[id] = name
-	return name, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/build.go b/installer/vendor/github.com/docker/docker/cli/command/image/build.go
deleted file mode 100644
index 0c88af5fcd..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/build.go
+++ /dev/null
@@ -1,477 +0,0 @@
-package image
-
-import (
-	"archive/tar"
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/builder/dockerignore"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/pkg/urlutil"
-	"github.com/docker/docker/reference"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type buildOptions struct {
-	context        string
-	dockerfileName string
-	tags           opts.ListOpts
-	labels         opts.ListOpts
-	buildArgs      opts.ListOpts
-	ulimits        *runconfigopts.UlimitOpt
-	memory         string
-	memorySwap     string
-	shmSize        string
-	cpuShares      int64
-	cpuPeriod      int64
-	cpuQuota       int64
-	cpuSetCpus     string
-	cpuSetMems     string
-	cgroupParent   string
-	isolation      string
-	quiet          bool
-	noCache        bool
-	rm             bool
-	forceRm        bool
-	pull           bool
-	cacheFrom      []string
-	compress       bool
-	securityOpt    []string
-	networkMode    string
-	squash         bool
-}
-
-// NewBuildCommand creates a new `docker build` command
-func NewBuildCommand(dockerCli *command.DockerCli) *cobra.Command {
-	ulimits := make(map[string]*units.Ulimit)
-	options := buildOptions{
-		tags:      opts.NewListOpts(validateTag),
-		buildArgs: opts.NewListOpts(runconfigopts.ValidateEnv),
-		ulimits:   runconfigopts.NewUlimitOpt(&ulimits),
-		labels:    opts.NewListOpts(runconfigopts.ValidateEnv),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "build [OPTIONS] PATH | URL | -",
-		Short: "Build an image from a Dockerfile",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			options.context = args[0]
-			return runBuild(dockerCli, options)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.VarP(&options.tags, "tag", "t", "Name and optionally a tag in the 'name:tag' format")
-	flags.Var(&options.buildArgs, "build-arg", "Set build-time variables")
-	flags.Var(options.ulimits, "ulimit", "Ulimit options")
-	flags.StringVarP(&options.dockerfileName, "file", "f", "", "Name of the Dockerfile (Default is 'PATH/Dockerfile')")
-	flags.StringVarP(&options.memory, "memory", "m", "", "Memory limit")
-	flags.StringVar(&options.memorySwap, "memory-swap", "", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap")
-	flags.StringVar(&options.shmSize, "shm-size", "", "Size of /dev/shm, default value is 64MB")
-	flags.Int64VarP(&options.cpuShares, "cpu-shares", "c", 0, "CPU shares (relative weight)")
-	flags.Int64Var(&options.cpuPeriod, "cpu-period", 0, "Limit the CPU CFS (Completely Fair Scheduler) period")
-	flags.Int64Var(&options.cpuQuota, "cpu-quota", 0, "Limit the CPU CFS (Completely Fair Scheduler) quota")
-	flags.StringVar(&options.cpuSetCpus, "cpuset-cpus", "", "CPUs in which to allow execution (0-3, 0,1)")
-	flags.StringVar(&options.cpuSetMems, "cpuset-mems", "", "MEMs in which to allow execution (0-3, 0,1)")
-	flags.StringVar(&options.cgroupParent, "cgroup-parent", "", "Optional parent cgroup for the container")
-	flags.StringVar(&options.isolation, "isolation", "", "Container isolation technology")
-	flags.Var(&options.labels, "label", "Set metadata for an image")
-	flags.BoolVar(&options.noCache, "no-cache", false, "Do not use cache when building the image")
-	flags.BoolVar(&options.rm, "rm", true, "Remove intermediate containers after a successful build")
-	flags.BoolVar(&options.forceRm, "force-rm", false, "Always remove intermediate containers")
-	flags.BoolVarP(&options.quiet, "quiet", "q", false, "Suppress the build output and print image ID on success")
-	flags.BoolVar(&options.pull, "pull", false, "Always attempt to pull a newer version of the image")
-	flags.StringSliceVar(&options.cacheFrom, "cache-from", []string{}, "Images to consider as cache sources")
-	flags.BoolVar(&options.compress, "compress", false, "Compress the build context using gzip")
-	flags.StringSliceVar(&options.securityOpt, "security-opt", []string{}, "Security options")
-	flags.StringVar(&options.networkMode, "network", "default", "Set the networking mode for the RUN instructions during build")
-
-	command.AddTrustedFlags(flags, true)
-
-	flags.BoolVar(&options.squash, "squash", false, "Squash newly built layers into a single new layer")
-	flags.SetAnnotation("squash", "experimental", nil)
-	flags.SetAnnotation("squash", "version", []string{"1.25"})
-
-	return cmd
-}
-
-// lastProgressOutput is the same as progress.Output except
-// that it only output with the last update. It is used in
-// non terminal scenarios to depresss verbose messages
-type lastProgressOutput struct {
-	output progress.Output
-}
-
-// WriteProgress formats progress information from a ProgressReader.
-func (out *lastProgressOutput) WriteProgress(prog progress.Progress) error {
-	if !prog.LastUpdate {
-		return nil
-	}
-
-	return out.output.WriteProgress(prog)
-}
-
-func runBuild(dockerCli *command.DockerCli, options buildOptions) error {
-
-	var (
-		buildCtx      io.ReadCloser
-		err           error
-		contextDir    string
-		tempDir       string
-		relDockerfile string
-		progBuff      io.Writer
-		buildBuff     io.Writer
-	)
-
-	specifiedContext := options.context
-	progBuff = dockerCli.Out()
-	buildBuff = dockerCli.Out()
-	if options.quiet {
-		progBuff = bytes.NewBuffer(nil)
-		buildBuff = bytes.NewBuffer(nil)
-	}
-
-	switch {
-	case specifiedContext == "-":
-		buildCtx, relDockerfile, err = builder.GetContextFromReader(dockerCli.In(), options.dockerfileName)
-	case urlutil.IsGitURL(specifiedContext):
-		tempDir, relDockerfile, err = builder.GetContextFromGitURL(specifiedContext, options.dockerfileName)
-	case urlutil.IsURL(specifiedContext):
-		buildCtx, relDockerfile, err = builder.GetContextFromURL(progBuff, specifiedContext, options.dockerfileName)
-	default:
-		contextDir, relDockerfile, err = builder.GetContextFromLocalDir(specifiedContext, options.dockerfileName)
-	}
-
-	if err != nil {
-		if options.quiet && urlutil.IsURL(specifiedContext) {
-			fmt.Fprintln(dockerCli.Err(), progBuff)
-		}
-		return fmt.Errorf("unable to prepare context: %s", err)
-	}
-
-	if tempDir != "" {
-		defer os.RemoveAll(tempDir)
-		contextDir = tempDir
-	}
-
-	if buildCtx == nil {
-		// And canonicalize dockerfile name to a platform-independent one
-		relDockerfile, err = archive.CanonicalTarNameForPath(relDockerfile)
-		if err != nil {
-			return fmt.Errorf("cannot canonicalize dockerfile path %s: %v", relDockerfile, err)
-		}
-
-		f, err := os.Open(filepath.Join(contextDir, ".dockerignore"))
-		if err != nil && !os.IsNotExist(err) {
-			return err
-		}
-		defer f.Close()
-
-		var excludes []string
-		if err == nil {
-			excludes, err = dockerignore.ReadAll(f)
-			if err != nil {
-				return err
-			}
-		}
-
-		if err := builder.ValidateContextDirectory(contextDir, excludes); err != nil {
-			return fmt.Errorf("Error checking context: '%s'.", err)
-		}
-
-		// If .dockerignore mentions .dockerignore or the Dockerfile
-		// then make sure we send both files over to the daemon
-		// because Dockerfile is, obviously, needed no matter what, and
-		// .dockerignore is needed to know if either one needs to be
-		// removed. The daemon will remove them for us, if needed, after it
-		// parses the Dockerfile. Ignore errors here, as they will have been
-		// caught by validateContextDirectory above.
-		var includes = []string{"."}
-		keepThem1, _ := fileutils.Matches(".dockerignore", excludes)
-		keepThem2, _ := fileutils.Matches(relDockerfile, excludes)
-		if keepThem1 || keepThem2 {
-			includes = append(includes, ".dockerignore", relDockerfile)
-		}
-
-		compression := archive.Uncompressed
-		if options.compress {
-			compression = archive.Gzip
-		}
-		buildCtx, err = archive.TarWithOptions(contextDir, &archive.TarOptions{
-			Compression:     compression,
-			ExcludePatterns: excludes,
-			IncludeFiles:    includes,
-		})
-		if err != nil {
-			return err
-		}
-	}
-
-	ctx := context.Background()
-
-	var resolvedTags []*resolvedTag
-	if command.IsTrusted() {
-		translator := func(ctx context.Context, ref reference.NamedTagged) (reference.Canonical, error) {
-			return TrustedReference(ctx, dockerCli, ref, nil)
-		}
-		// Wrap the tar archive to replace the Dockerfile entry with the rewritten
-		// Dockerfile which uses trusted pulls.
-		buildCtx = replaceDockerfileTarWrapper(ctx, buildCtx, relDockerfile, translator, &resolvedTags)
-	}
-
-	// Setup an upload progress bar
-	progressOutput := streamformatter.NewStreamFormatter().NewProgressOutput(progBuff, true)
-	if !dockerCli.Out().IsTerminal() {
-		progressOutput = &lastProgressOutput{output: progressOutput}
-	}
-
-	var body io.Reader = progress.NewProgressReader(buildCtx, progressOutput, 0, "", "Sending build context to Docker daemon")
-
-	var memory int64
-	if options.memory != "" {
-		parsedMemory, err := units.RAMInBytes(options.memory)
-		if err != nil {
-			return err
-		}
-		memory = parsedMemory
-	}
-
-	var memorySwap int64
-	if options.memorySwap != "" {
-		if options.memorySwap == "-1" {
-			memorySwap = -1
-		} else {
-			parsedMemorySwap, err := units.RAMInBytes(options.memorySwap)
-			if err != nil {
-				return err
-			}
-			memorySwap = parsedMemorySwap
-		}
-	}
-
-	var shmSize int64
-	if options.shmSize != "" {
-		shmSize, err = units.RAMInBytes(options.shmSize)
-		if err != nil {
-			return err
-		}
-	}
-
-	authConfigs, _ := dockerCli.GetAllCredentials()
-	buildOptions := types.ImageBuildOptions{
-		Memory:         memory,
-		MemorySwap:     memorySwap,
-		Tags:           options.tags.GetAll(),
-		SuppressOutput: options.quiet,
-		NoCache:        options.noCache,
-		Remove:         options.rm,
-		ForceRemove:    options.forceRm,
-		PullParent:     options.pull,
-		Isolation:      container.Isolation(options.isolation),
-		CPUSetCPUs:     options.cpuSetCpus,
-		CPUSetMems:     options.cpuSetMems,
-		CPUShares:      options.cpuShares,
-		CPUQuota:       options.cpuQuota,
-		CPUPeriod:      options.cpuPeriod,
-		CgroupParent:   options.cgroupParent,
-		Dockerfile:     relDockerfile,
-		ShmSize:        shmSize,
-		Ulimits:        options.ulimits.GetList(),
-		BuildArgs:      runconfigopts.ConvertKVStringsToMapWithNil(options.buildArgs.GetAll()),
-		AuthConfigs:    authConfigs,
-		Labels:         runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
-		CacheFrom:      options.cacheFrom,
-		SecurityOpt:    options.securityOpt,
-		NetworkMode:    options.networkMode,
-		Squash:         options.squash,
-	}
-
-	response, err := dockerCli.Client().ImageBuild(ctx, body, buildOptions)
-	if err != nil {
-		if options.quiet {
-			fmt.Fprintf(dockerCli.Err(), "%s", progBuff)
-		}
-		return err
-	}
-	defer response.Body.Close()
-
-	err = jsonmessage.DisplayJSONMessagesStream(response.Body, buildBuff, dockerCli.Out().FD(), dockerCli.Out().IsTerminal(), nil)
-	if err != nil {
-		if jerr, ok := err.(*jsonmessage.JSONError); ok {
-			// If no error code is set, default to 1
-			if jerr.Code == 0 {
-				jerr.Code = 1
-			}
-			if options.quiet {
-				fmt.Fprintf(dockerCli.Err(), "%s%s", progBuff, buildBuff)
-			}
-			return cli.StatusError{Status: jerr.Message, StatusCode: jerr.Code}
-		}
-	}
-
-	// Windows: show error message about modified file permissions if the
-	// daemon isn't running Windows.
-	if response.OSType != "windows" && runtime.GOOS == "windows" && !options.quiet {
-		fmt.Fprintln(dockerCli.Err(), `SECURITY WARNING: You are building a Docker image from Windows against a non-Windows Docker host. All files and directories added to build context will have '-rwxr-xr-x' permissions. It is recommended to double check and reset permissions for sensitive files and directories.`)
-	}
-
-	// Everything worked so if -q was provided the output from the daemon
-	// should be just the image ID and we'll print that to stdout.
-	if options.quiet {
-		fmt.Fprintf(dockerCli.Out(), "%s", buildBuff)
-	}
-
-	if command.IsTrusted() {
-		// Since the build was successful, now we must tag any of the resolved
-		// images from the above Dockerfile rewrite.
-		for _, resolved := range resolvedTags {
-			if err := TagTrusted(ctx, dockerCli, resolved.digestRef, resolved.tagRef); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-type translatorFunc func(context.Context, reference.NamedTagged) (reference.Canonical, error)
-
-// validateTag checks if the given image name can be resolved.
-func validateTag(rawRepo string) (string, error) {
-	_, err := reference.ParseNamed(rawRepo)
-	if err != nil {
-		return "", err
-	}
-
-	return rawRepo, nil
-}
-
-var dockerfileFromLinePattern = regexp.MustCompile(`(?i)^[\s]*FROM[ \f\r\t\v]+(?P<image>[^ \f\r\t\v\n#]+)`)
-
-// resolvedTag records the repository, tag, and resolved digest reference
-// from a Dockerfile rewrite.
-type resolvedTag struct {
-	digestRef reference.Canonical
-	tagRef    reference.NamedTagged
-}
-
-// rewriteDockerfileFrom rewrites the given Dockerfile by resolving images in
-// "FROM <image>" instructions to a digest reference. `translator` is a
-// function that takes a repository name and tag reference and returns a
-// trusted digest reference.
-func rewriteDockerfileFrom(ctx context.Context, dockerfile io.Reader, translator translatorFunc) (newDockerfile []byte, resolvedTags []*resolvedTag, err error) {
-	scanner := bufio.NewScanner(dockerfile)
-	buf := bytes.NewBuffer(nil)
-
-	// Scan the lines of the Dockerfile, looking for a "FROM" line.
-	for scanner.Scan() {
-		line := scanner.Text()
-
-		matches := dockerfileFromLinePattern.FindStringSubmatch(line)
-		if matches != nil && matches[1] != api.NoBaseImageSpecifier {
-			// Replace the line with a resolved "FROM repo@digest"
-			ref, err := reference.ParseNamed(matches[1])
-			if err != nil {
-				return nil, nil, err
-			}
-			ref = reference.WithDefaultTag(ref)
-			if ref, ok := ref.(reference.NamedTagged); ok && command.IsTrusted() {
-				trustedRef, err := translator(ctx, ref)
-				if err != nil {
-					return nil, nil, err
-				}
-
-				line = dockerfileFromLinePattern.ReplaceAllLiteralString(line, fmt.Sprintf("FROM %s", trustedRef.String()))
-				resolvedTags = append(resolvedTags, &resolvedTag{
-					digestRef: trustedRef,
-					tagRef:    ref,
-				})
-			}
-		}
-
-		_, err := fmt.Fprintln(buf, line)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return buf.Bytes(), resolvedTags, scanner.Err()
-}
-
-// replaceDockerfileTarWrapper wraps the given input tar archive stream and
-// replaces the entry with the given Dockerfile name with the contents of the
-// new Dockerfile. Returns a new tar archive stream with the replaced
-// Dockerfile.
-func replaceDockerfileTarWrapper(ctx context.Context, inputTarStream io.ReadCloser, dockerfileName string, translator translatorFunc, resolvedTags *[]*resolvedTag) io.ReadCloser {
-	pipeReader, pipeWriter := io.Pipe()
-	go func() {
-		tarReader := tar.NewReader(inputTarStream)
-		tarWriter := tar.NewWriter(pipeWriter)
-
-		defer inputTarStream.Close()
-
-		for {
-			hdr, err := tarReader.Next()
-			if err == io.EOF {
-				// Signals end of archive.
-				tarWriter.Close()
-				pipeWriter.Close()
-				return
-			}
-			if err != nil {
-				pipeWriter.CloseWithError(err)
-				return
-			}
-
-			content := io.Reader(tarReader)
-			if hdr.Name == dockerfileName {
-				// This entry is the Dockerfile. Since the tar archive was
-				// generated from a directory on the local filesystem, the
-				// Dockerfile will only appear once in the archive.
-				var newDockerfile []byte
-				newDockerfile, *resolvedTags, err = rewriteDockerfileFrom(ctx, content, translator)
-				if err != nil {
-					pipeWriter.CloseWithError(err)
-					return
-				}
-				hdr.Size = int64(len(newDockerfile))
-				content = bytes.NewBuffer(newDockerfile)
-			}
-
-			if err := tarWriter.WriteHeader(hdr); err != nil {
-				pipeWriter.CloseWithError(err)
-				return
-			}
-
-			if _, err := io.Copy(tarWriter, content); err != nil {
-				pipeWriter.CloseWithError(err)
-				return
-			}
-		}
-	}()
-
-	return pipeReader
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/image/cmd.go
deleted file mode 100644
index c3ca61f85b..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/cmd.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package image
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewImageCommand returns a cobra command for `image` subcommands
-func NewImageCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "image",
-		Short: "Manage images",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		NewBuildCommand(dockerCli),
-		NewHistoryCommand(dockerCli),
-		NewImportCommand(dockerCli),
-		NewLoadCommand(dockerCli),
-		NewPullCommand(dockerCli),
-		NewPushCommand(dockerCli),
-		NewSaveCommand(dockerCli),
-		NewTagCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		NewPruneCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/history.go b/installer/vendor/github.com/docker/docker/cli/command/image/history.go
deleted file mode 100644
index 91c8f75a63..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/history.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package image
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type historyOptions struct {
-	image string
-
-	human   bool
-	quiet   bool
-	noTrunc bool
-}
-
-// NewHistoryCommand creates a new `docker history` command
-func NewHistoryCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts historyOptions
-
-	cmd := &cobra.Command{
-		Use:   "history [OPTIONS] IMAGE",
-		Short: "Show the history of an image",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.image = args[0]
-			return runHistory(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.human, "human", "H", true, "Print sizes and dates in human readable format")
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only show numeric IDs")
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-
-	return cmd
-}
-
-func runHistory(dockerCli *command.DockerCli, opts historyOptions) error {
-	ctx := context.Background()
-
-	history, err := dockerCli.Client().ImageHistory(ctx, opts.image)
-	if err != nil {
-		return err
-	}
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-
-	if opts.quiet {
-		for _, entry := range history {
-			if opts.noTrunc {
-				fmt.Fprintf(w, "%s\n", entry.ID)
-			} else {
-				fmt.Fprintf(w, "%s\n", stringid.TruncateID(entry.ID))
-			}
-		}
-		w.Flush()
-		return nil
-	}
-
-	var imageID string
-	var createdBy string
-	var created string
-	var size string
-
-	fmt.Fprintln(w, "IMAGE\tCREATED\tCREATED BY\tSIZE\tCOMMENT")
-	for _, entry := range history {
-		imageID = entry.ID
-		createdBy = strings.Replace(entry.CreatedBy, "\t", " ", -1)
-		if !opts.noTrunc {
-			createdBy = stringutils.Ellipsis(createdBy, 45)
-			imageID = stringid.TruncateID(entry.ID)
-		}
-
-		if opts.human {
-			created = units.HumanDuration(time.Now().UTC().Sub(time.Unix(entry.Created, 0))) + " ago"
-			size = units.HumanSizeWithPrecision(float64(entry.Size), 3)
-		} else {
-			created = time.Unix(entry.Created, 0).Format(time.RFC3339)
-			size = strconv.FormatInt(entry.Size, 10)
-		}
-
-		fmt.Fprintf(w, "%s\t%s\t%s\t%s\t%s\n", imageID, created, createdBy, size, entry.Comment)
-	}
-	w.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/import.go b/installer/vendor/github.com/docker/docker/cli/command/image/import.go
deleted file mode 100644
index 60024fb53c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/import.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package image
-
-import (
-	"io"
-	"os"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	dockeropts "github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/urlutil"
-	"github.com/spf13/cobra"
-)
-
-type importOptions struct {
-	source    string
-	reference string
-	changes   dockeropts.ListOpts
-	message   string
-}
-
-// NewImportCommand creates a new `docker import` command
-func NewImportCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts importOptions
-
-	cmd := &cobra.Command{
-		Use:   "import [OPTIONS] file|URL|- [REPOSITORY[:TAG]]",
-		Short: "Import the contents from a tarball to create a filesystem image",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.source = args[0]
-			if len(args) > 1 {
-				opts.reference = args[1]
-			}
-			return runImport(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	opts.changes = dockeropts.NewListOpts(nil)
-	flags.VarP(&opts.changes, "change", "c", "Apply Dockerfile instruction to the created image")
-	flags.StringVarP(&opts.message, "message", "m", "", "Set commit message for imported image")
-
-	return cmd
-}
-
-func runImport(dockerCli *command.DockerCli, opts importOptions) error {
-	var (
-		in      io.Reader
-		srcName = opts.source
-	)
-
-	if opts.source == "-" {
-		in = dockerCli.In()
-	} else if !urlutil.IsURL(opts.source) {
-		srcName = "-"
-		file, err := os.Open(opts.source)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-		in = file
-	}
-
-	source := types.ImageImportSource{
-		Source:     in,
-		SourceName: srcName,
-	}
-
-	options := types.ImageImportOptions{
-		Message: opts.message,
-		Changes: opts.changes.GetAll(),
-	}
-
-	clnt := dockerCli.Client()
-
-	responseBody, err := clnt.ImageImport(context.Background(), source, opts.reference, options)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	return jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/image/inspect.go
deleted file mode 100644
index 217863c772..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/inspect.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package image
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	format string
-	refs   []string
-}
-
-// newInspectCommand creates a new cobra.Command for `docker image inspect`
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] IMAGE [IMAGE...]",
-		Short: "Display detailed information on one or more images",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.refs = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	getRefFunc := func(ref string) (interface{}, []byte, error) {
-		return client.ImageInspectWithRaw(ctx, ref)
-	}
-	return inspect.Inspect(dockerCli.Out(), opts.refs, opts.format, getRefFunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/list.go b/installer/vendor/github.com/docker/docker/cli/command/image/list.go
deleted file mode 100644
index 679604fc02..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/list.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package image
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type imagesOptions struct {
-	matchName string
-
-	quiet       bool
-	all         bool
-	noTrunc     bool
-	showDigests bool
-	format      string
-	filter      opts.FilterOpt
-}
-
-// NewImagesCommand creates a new `docker images` command
-func NewImagesCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := imagesOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "images [OPTIONS] [REPOSITORY[:TAG]]",
-		Short: "List images",
-		Args:  cli.RequiresMaxArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) > 0 {
-				opts.matchName = args[0]
-			}
-			return runImages(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only show numeric IDs")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Show all images (default hides intermediate images)")
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-	flags.BoolVar(&opts.showDigests, "digests", false, "Show digests")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print images using a Go template")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := *NewImagesCommand(dockerCli)
-	cmd.Aliases = []string{"images", "list"}
-	cmd.Use = "ls [OPTIONS] [REPOSITORY[:TAG]]"
-	return &cmd
-}
-
-func runImages(dockerCli *command.DockerCli, opts imagesOptions) error {
-	ctx := context.Background()
-
-	filters := opts.filter.Value()
-	if opts.matchName != "" {
-		filters.Add("reference", opts.matchName)
-	}
-
-	options := types.ImageListOptions{
-		All:     opts.all,
-		Filters: filters,
-	}
-
-	images, err := dockerCli.Client().ImageList(ctx, options)
-	if err != nil {
-		return err
-	}
-
-	format := opts.format
-	if len(format) == 0 {
-		if len(dockerCli.ConfigFile().ImagesFormat) > 0 && !opts.quiet {
-			format = dockerCli.ConfigFile().ImagesFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-
-	imageCtx := formatter.ImageContext{
-		Context: formatter.Context{
-			Output: dockerCli.Out(),
-			Format: formatter.NewImageFormat(format, opts.quiet, opts.showDigests),
-			Trunc:  !opts.noTrunc,
-		},
-		Digest: opts.showDigests,
-	}
-	return formatter.ImageWrite(imageCtx, images)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/load.go b/installer/vendor/github.com/docker/docker/cli/command/image/load.go
deleted file mode 100644
index 988f5106e2..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/load.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package image
-
-import (
-	"fmt"
-	"io"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/system"
-	"github.com/spf13/cobra"
-)
-
-type loadOptions struct {
-	input string
-	quiet bool
-}
-
-// NewLoadCommand creates a new `docker load` command
-func NewLoadCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts loadOptions
-
-	cmd := &cobra.Command{
-		Use:   "load [OPTIONS]",
-		Short: "Load an image from a tar archive or STDIN",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLoad(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.input, "input", "i", "", "Read from tar archive file, instead of STDIN")
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Suppress the load output")
-
-	return cmd
-}
-
-func runLoad(dockerCli *command.DockerCli, opts loadOptions) error {
-
-	var input io.Reader = dockerCli.In()
-	if opts.input != "" {
-		// We use system.OpenSequential to use sequential file access on Windows, avoiding
-		// depleting the standby list un-necessarily. On Linux, this equates to a regular os.Open.
-		file, err := system.OpenSequential(opts.input)
-		if err != nil {
-			return err
-		}
-		defer file.Close()
-		input = file
-	}
-
-	// To avoid getting stuck, verify that a tar file is given either in
-	// the input flag or through stdin and if not display an error message and exit.
-	if opts.input == "" && dockerCli.In().IsTerminal() {
-		return fmt.Errorf("requested load from stdin, but stdin is empty")
-	}
-
-	if !dockerCli.Out().IsTerminal() {
-		opts.quiet = true
-	}
-	response, err := dockerCli.Client().ImageLoad(context.Background(), input, opts.quiet)
-	if err != nil {
-		return err
-	}
-	defer response.Body.Close()
-
-	if response.Body != nil && response.JSON {
-		return jsonmessage.DisplayJSONMessagesToStream(response.Body, dockerCli.Out(), nil)
-	}
-
-	_, err = io.Copy(dockerCli.Out(), response.Body)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/prune.go b/installer/vendor/github.com/docker/docker/cli/command/image/prune.go
deleted file mode 100644
index 82c28fcf49..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/prune.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package image
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	units "github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type pruneOptions struct {
-	force bool
-	all   bool
-}
-
-// NewPruneCommand returns a new cobra prune command for images
-func NewPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pruneOptions
-
-	cmd := &cobra.Command{
-		Use:   "prune [OPTIONS]",
-		Short: "Remove unused images",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			spaceReclaimed, output, err := runPrune(dockerCli, opts)
-			if err != nil {
-				return err
-			}
-			if output != "" {
-				fmt.Fprintln(dockerCli.Out(), output)
-			}
-			fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed)))
-			return nil
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Do not prompt for confirmation")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Remove all unused images, not just dangling ones")
-
-	return cmd
-}
-
-const (
-	allImageWarning = `WARNING! This will remove all images without at least one container associated to them.
-Are you sure you want to continue?`
-	danglingWarning = `WARNING! This will remove all dangling images.
-Are you sure you want to continue?`
-)
-
-func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed uint64, output string, err error) {
-	pruneFilters := filters.NewArgs()
-	pruneFilters.Add("dangling", fmt.Sprintf("%v", !opts.all))
-
-	warning := danglingWarning
-	if opts.all {
-		warning = allImageWarning
-	}
-	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
-		return
-	}
-
-	report, err := dockerCli.Client().ImagesPrune(context.Background(), pruneFilters)
-	if err != nil {
-		return
-	}
-
-	if len(report.ImagesDeleted) > 0 {
-		output = "Deleted Images:\n"
-		for _, st := range report.ImagesDeleted {
-			if st.Untagged != "" {
-				output += fmt.Sprintln("untagged:", st.Untagged)
-			} else {
-				output += fmt.Sprintln("deleted:", st.Deleted)
-			}
-		}
-		spaceReclaimed = report.SpaceReclaimed
-	}
-
-	return
-}
-
-// RunPrune calls the Image Prune API
-// This returns the amount of space reclaimed and a detailed output string
-func RunPrune(dockerCli *command.DockerCli, all bool) (uint64, string, error) {
-	return runPrune(dockerCli, pruneOptions{force: true, all: all})
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/pull.go b/installer/vendor/github.com/docker/docker/cli/command/image/pull.go
deleted file mode 100644
index 24933fe846..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/pull.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package image
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-)
-
-type pullOptions struct {
-	remote string
-	all    bool
-}
-
-// NewPullCommand creates a new `docker pull` command
-func NewPullCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pullOptions
-
-	cmd := &cobra.Command{
-		Use:   "pull [OPTIONS] NAME[:TAG|@DIGEST]",
-		Short: "Pull an image or a repository from a registry",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.remote = args[0]
-			return runPull(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.all, "all-tags", "a", false, "Download all tagged images in the repository")
-	command.AddTrustedFlags(flags, true)
-
-	return cmd
-}
-
-func runPull(dockerCli *command.DockerCli, opts pullOptions) error {
-	distributionRef, err := reference.ParseNamed(opts.remote)
-	if err != nil {
-		return err
-	}
-	if opts.all && !reference.IsNameOnly(distributionRef) {
-		return errors.New("tag can't be used with --all-tags/-a")
-	}
-
-	if !opts.all && reference.IsNameOnly(distributionRef) {
-		distributionRef = reference.WithDefaultTag(distributionRef)
-		fmt.Fprintf(dockerCli.Out(), "Using default tag: %s\n", reference.DefaultTag)
-	}
-
-	// Resolve the Repository name from fqn to RepositoryInfo
-	repoInfo, err := registry.ParseRepositoryInfo(distributionRef)
-	if err != nil {
-		return err
-	}
-
-	ctx := context.Background()
-
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
-	requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfo.Index, "pull")
-
-	// Check if reference has a digest
-	_, isCanonical := distributionRef.(reference.Canonical)
-	if command.IsTrusted() && !isCanonical {
-		err = trustedPull(ctx, dockerCli, repoInfo, distributionRef, authConfig, requestPrivilege)
-	} else {
-		err = imagePullPrivileged(ctx, dockerCli, authConfig, distributionRef.String(), requestPrivilege, opts.all)
-	}
-	if err != nil {
-		if strings.Contains(err.Error(), "target is plugin") {
-			return errors.New(err.Error() + " - Use `docker plugin install`")
-		}
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/push.go b/installer/vendor/github.com/docker/docker/cli/command/image/push.go
deleted file mode 100644
index a8ce4945ec..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/push.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package image
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-)
-
-// NewPushCommand creates a new `docker push` command
-func NewPushCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "push [OPTIONS] NAME[:TAG]",
-		Short: "Push an image or a repository to a registry",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPush(dockerCli, args[0])
-		},
-	}
-
-	flags := cmd.Flags()
-
-	command.AddTrustedFlags(flags, true)
-
-	return cmd
-}
-
-func runPush(dockerCli *command.DockerCli, remote string) error {
-	ref, err := reference.ParseNamed(remote)
-	if err != nil {
-		return err
-	}
-
-	// Resolve the Repository name from fqn to RepositoryInfo
-	repoInfo, err := registry.ParseRepositoryInfo(ref)
-	if err != nil {
-		return err
-	}
-
-	ctx := context.Background()
-
-	// Resolve the Auth config relevant for this server
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
-	requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfo.Index, "push")
-
-	if command.IsTrusted() {
-		return trustedPush(ctx, dockerCli, repoInfo, ref, authConfig, requestPrivilege)
-	}
-
-	responseBody, err := imagePushPrivileged(ctx, dockerCli, authConfig, ref.String(), requestPrivilege)
-	if err != nil {
-		return err
-	}
-
-	defer responseBody.Close()
-	return jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/remove.go b/installer/vendor/github.com/docker/docker/cli/command/image/remove.go
deleted file mode 100644
index c79ceba7a8..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/remove.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package image
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type removeOptions struct {
-	force   bool
-	noPrune bool
-}
-
-// NewRemoveCommand creates a new `docker remove` command
-func NewRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts removeOptions
-
-	cmd := &cobra.Command{
-		Use:   "rmi [OPTIONS] IMAGE [IMAGE...]",
-		Short: "Remove one or more images",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runRemove(dockerCli, opts, args)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force removal of the image")
-	flags.BoolVar(&opts.noPrune, "no-prune", false, "Do not delete untagged parents")
-
-	return cmd
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := *NewRemoveCommand(dockerCli)
-	cmd.Aliases = []string{"rmi", "remove"}
-	cmd.Use = "rm [OPTIONS] IMAGE [IMAGE...]"
-	return &cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, opts removeOptions, images []string) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	options := types.ImageRemoveOptions{
-		Force:         opts.force,
-		PruneChildren: !opts.noPrune,
-	}
-
-	var errs []string
-	for _, image := range images {
-		dels, err := client.ImageRemove(ctx, image, options)
-		if err != nil {
-			errs = append(errs, err.Error())
-		} else {
-			for _, del := range dels {
-				if del.Deleted != "" {
-					fmt.Fprintf(dockerCli.Out(), "Deleted: %s\n", del.Deleted)
-				} else {
-					fmt.Fprintf(dockerCli.Out(), "Untagged: %s\n", del.Untagged)
-				}
-			}
-		}
-	}
-
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/save.go b/installer/vendor/github.com/docker/docker/cli/command/image/save.go
deleted file mode 100644
index bbe82d2a05..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/save.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package image
-
-import (
-	"errors"
-	"io"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type saveOptions struct {
-	images []string
-	output string
-}
-
-// NewSaveCommand creates a new `docker save` command
-func NewSaveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts saveOptions
-
-	cmd := &cobra.Command{
-		Use:   "save [OPTIONS] IMAGE [IMAGE...]",
-		Short: "Save one or more images to a tar archive (streamed to STDOUT by default)",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.images = args
-			return runSave(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.output, "output", "o", "", "Write to a file, instead of STDOUT")
-
-	return cmd
-}
-
-func runSave(dockerCli *command.DockerCli, opts saveOptions) error {
-	if opts.output == "" && dockerCli.Out().IsTerminal() {
-		return errors.New("Cowardly refusing to save to a terminal. Use the -o flag or redirect.")
-	}
-
-	responseBody, err := dockerCli.Client().ImageSave(context.Background(), opts.images)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	if opts.output == "" {
-		_, err := io.Copy(dockerCli.Out(), responseBody)
-		return err
-	}
-
-	return command.CopyToFile(opts.output, responseBody)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/tag.go b/installer/vendor/github.com/docker/docker/cli/command/image/tag.go
deleted file mode 100644
index fb2b703856..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/tag.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package image
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type tagOptions struct {
-	image string
-	name  string
-}
-
-// NewTagCommand creates a new `docker tag` command
-func NewTagCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts tagOptions
-
-	cmd := &cobra.Command{
-		Use:   "tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG]",
-		Short: "Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.image = args[0]
-			opts.name = args[1]
-			return runTag(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.SetInterspersed(false)
-
-	return cmd
-}
-
-func runTag(dockerCli *command.DockerCli, opts tagOptions) error {
-	ctx := context.Background()
-
-	return dockerCli.Client().ImageTag(ctx, opts.image, opts.name)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/trust.go b/installer/vendor/github.com/docker/docker/cli/command/image/trust.go
deleted file mode 100644
index 5136a22156..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/trust.go
+++ /dev/null
@@ -1,381 +0,0 @@
-package image
-
-import (
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"path"
-	"sort"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/trust"
-	"github.com/docker/docker/distribution"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/docker/notary/client"
-	"github.com/docker/notary/tuf/data"
-)
-
-type target struct {
-	name   string
-	digest digest.Digest
-	size   int64
-}
-
-// trustedPush handles content trust pushing of an image
-func trustedPush(ctx context.Context, cli *command.DockerCli, repoInfo *registry.RepositoryInfo, ref reference.Named, authConfig types.AuthConfig, requestPrivilege types.RequestPrivilegeFunc) error {
-	responseBody, err := imagePushPrivileged(ctx, cli, authConfig, ref.String(), requestPrivilege)
-	if err != nil {
-		return err
-	}
-
-	defer responseBody.Close()
-
-	return PushTrustedReference(cli, repoInfo, ref, authConfig, responseBody)
-}
-
-// PushTrustedReference pushes a canonical reference to the trust server.
-func PushTrustedReference(cli *command.DockerCli, repoInfo *registry.RepositoryInfo, ref reference.Named, authConfig types.AuthConfig, in io.Reader) error {
-	// If it is a trusted push we would like to find the target entry which match the
-	// tag provided in the function and then do an AddTarget later.
-	target := &client.Target{}
-	// Count the times of calling for handleTarget,
-	// if it is called more that once, that should be considered an error in a trusted push.
-	cnt := 0
-	handleTarget := func(aux *json.RawMessage) {
-		cnt++
-		if cnt > 1 {
-			// handleTarget should only be called one. This will be treated as an error.
-			return
-		}
-
-		var pushResult distribution.PushResult
-		err := json.Unmarshal(*aux, &pushResult)
-		if err == nil && pushResult.Tag != "" && pushResult.Digest.Validate() == nil {
-			h, err := hex.DecodeString(pushResult.Digest.Hex())
-			if err != nil {
-				target = nil
-				return
-			}
-			target.Name = pushResult.Tag
-			target.Hashes = data.Hashes{string(pushResult.Digest.Algorithm()): h}
-			target.Length = int64(pushResult.Size)
-		}
-	}
-
-	var tag string
-	switch x := ref.(type) {
-	case reference.Canonical:
-		return errors.New("cannot push a digest reference")
-	case reference.NamedTagged:
-		tag = x.Tag()
-	default:
-		// We want trust signatures to always take an explicit tag,
-		// otherwise it will act as an untrusted push.
-		if err := jsonmessage.DisplayJSONMessagesToStream(in, cli.Out(), nil); err != nil {
-			return err
-		}
-		fmt.Fprintln(cli.Out(), "No tag specified, skipping trust metadata push")
-		return nil
-	}
-
-	if err := jsonmessage.DisplayJSONMessagesToStream(in, cli.Out(), handleTarget); err != nil {
-		return err
-	}
-
-	if cnt > 1 {
-		return fmt.Errorf("internal error: only one call to handleTarget expected")
-	}
-
-	if target == nil {
-		fmt.Fprintln(cli.Out(), "No targets found, please provide a specific tag in order to sign it")
-		return nil
-	}
-
-	fmt.Fprintln(cli.Out(), "Signing and pushing trust metadata")
-
-	repo, err := trust.GetNotaryRepository(cli, repoInfo, authConfig, "push", "pull")
-	if err != nil {
-		fmt.Fprintf(cli.Out(), "Error establishing connection to notary repository: %s\n", err)
-		return err
-	}
-
-	// get the latest repository metadata so we can figure out which roles to sign
-	err = repo.Update(false)
-
-	switch err.(type) {
-	case client.ErrRepoNotInitialized, client.ErrRepositoryNotExist:
-		keys := repo.CryptoService.ListKeys(data.CanonicalRootRole)
-		var rootKeyID string
-		// always select the first root key
-		if len(keys) > 0 {
-			sort.Strings(keys)
-			rootKeyID = keys[0]
-		} else {
-			rootPublicKey, err := repo.CryptoService.Create(data.CanonicalRootRole, "", data.ECDSAKey)
-			if err != nil {
-				return err
-			}
-			rootKeyID = rootPublicKey.ID()
-		}
-
-		// Initialize the notary repository with a remotely managed snapshot key
-		if err := repo.Initialize([]string{rootKeyID}, data.CanonicalSnapshotRole); err != nil {
-			return trust.NotaryError(repoInfo.FullName(), err)
-		}
-		fmt.Fprintf(cli.Out(), "Finished initializing %q\n", repoInfo.FullName())
-		err = repo.AddTarget(target, data.CanonicalTargetsRole)
-	case nil:
-		// already initialized and we have successfully downloaded the latest metadata
-		err = addTargetToAllSignableRoles(repo, target)
-	default:
-		return trust.NotaryError(repoInfo.FullName(), err)
-	}
-
-	if err == nil {
-		err = repo.Publish()
-	}
-
-	if err != nil {
-		fmt.Fprintf(cli.Out(), "Failed to sign %q:%s - %s\n", repoInfo.FullName(), tag, err.Error())
-		return trust.NotaryError(repoInfo.FullName(), err)
-	}
-
-	fmt.Fprintf(cli.Out(), "Successfully signed %q:%s\n", repoInfo.FullName(), tag)
-	return nil
-}
-
-// Attempt to add the image target to all the top level delegation roles we can
-// (based on whether we have the signing key and whether the role's path allows
-// us to).
-// If there are no delegation roles, we add to the targets role.
-func addTargetToAllSignableRoles(repo *client.NotaryRepository, target *client.Target) error {
-	var signableRoles []string
-
-	// translate the full key names, which includes the GUN, into just the key IDs
-	allCanonicalKeyIDs := make(map[string]struct{})
-	for fullKeyID := range repo.CryptoService.ListAllKeys() {
-		allCanonicalKeyIDs[path.Base(fullKeyID)] = struct{}{}
-	}
-
-	allDelegationRoles, err := repo.GetDelegationRoles()
-	if err != nil {
-		return err
-	}
-
-	// if there are no delegation roles, then just try to sign it into the targets role
-	if len(allDelegationRoles) == 0 {
-		return repo.AddTarget(target, data.CanonicalTargetsRole)
-	}
-
-	// there are delegation roles, find every delegation role we have a key for, and
-	// attempt to sign into into all those roles.
-	for _, delegationRole := range allDelegationRoles {
-		// We do not support signing any delegation role that isn't a direct child of the targets role.
-		// Also don't bother checking the keys if we can't add the target
-		// to this role due to path restrictions
-		if path.Dir(delegationRole.Name) != data.CanonicalTargetsRole || !delegationRole.CheckPaths(target.Name) {
-			continue
-		}
-
-		for _, canonicalKeyID := range delegationRole.KeyIDs {
-			if _, ok := allCanonicalKeyIDs[canonicalKeyID]; ok {
-				signableRoles = append(signableRoles, delegationRole.Name)
-				break
-			}
-		}
-	}
-
-	if len(signableRoles) == 0 {
-		return fmt.Errorf("no valid signing keys for delegation roles")
-	}
-
-	return repo.AddTarget(target, signableRoles...)
-}
-
-// imagePushPrivileged push the image
-func imagePushPrivileged(ctx context.Context, cli *command.DockerCli, authConfig types.AuthConfig, ref string, requestPrivilege types.RequestPrivilegeFunc) (io.ReadCloser, error) {
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return nil, err
-	}
-	options := types.ImagePushOptions{
-		RegistryAuth:  encodedAuth,
-		PrivilegeFunc: requestPrivilege,
-	}
-
-	return cli.Client().ImagePush(ctx, ref, options)
-}
-
-// trustedPull handles content trust pulling of an image
-func trustedPull(ctx context.Context, cli *command.DockerCli, repoInfo *registry.RepositoryInfo, ref reference.Named, authConfig types.AuthConfig, requestPrivilege types.RequestPrivilegeFunc) error {
-	var refs []target
-
-	notaryRepo, err := trust.GetNotaryRepository(cli, repoInfo, authConfig, "pull")
-	if err != nil {
-		fmt.Fprintf(cli.Out(), "Error establishing connection to trust repository: %s\n", err)
-		return err
-	}
-
-	if tagged, isTagged := ref.(reference.NamedTagged); !isTagged {
-		// List all targets
-		targets, err := notaryRepo.ListTargets(trust.ReleasesRole, data.CanonicalTargetsRole)
-		if err != nil {
-			return trust.NotaryError(repoInfo.FullName(), err)
-		}
-		for _, tgt := range targets {
-			t, err := convertTarget(tgt.Target)
-			if err != nil {
-				fmt.Fprintf(cli.Out(), "Skipping target for %q\n", repoInfo.Name())
-				continue
-			}
-			// Only list tags in the top level targets role or the releases delegation role - ignore
-			// all other delegation roles
-			if tgt.Role != trust.ReleasesRole && tgt.Role != data.CanonicalTargetsRole {
-				continue
-			}
-			refs = append(refs, t)
-		}
-		if len(refs) == 0 {
-			return trust.NotaryError(repoInfo.FullName(), fmt.Errorf("No trusted tags for %s", repoInfo.FullName()))
-		}
-	} else {
-		t, err := notaryRepo.GetTargetByName(tagged.Tag(), trust.ReleasesRole, data.CanonicalTargetsRole)
-		if err != nil {
-			return trust.NotaryError(repoInfo.FullName(), err)
-		}
-		// Only get the tag if it's in the top level targets role or the releases delegation role
-		// ignore it if it's in any other delegation roles
-		if t.Role != trust.ReleasesRole && t.Role != data.CanonicalTargetsRole {
-			return trust.NotaryError(repoInfo.FullName(), fmt.Errorf("No trust data for %s", tagged.Tag()))
-		}
-
-		logrus.Debugf("retrieving target for %s role\n", t.Role)
-		r, err := convertTarget(t.Target)
-		if err != nil {
-			return err
-
-		}
-		refs = append(refs, r)
-	}
-
-	for i, r := range refs {
-		displayTag := r.name
-		if displayTag != "" {
-			displayTag = ":" + displayTag
-		}
-		fmt.Fprintf(cli.Out(), "Pull (%d of %d): %s%s@%s\n", i+1, len(refs), repoInfo.Name(), displayTag, r.digest)
-
-		ref, err := reference.WithDigest(reference.TrimNamed(repoInfo), r.digest)
-		if err != nil {
-			return err
-		}
-		if err := imagePullPrivileged(ctx, cli, authConfig, ref.String(), requestPrivilege, false); err != nil {
-			return err
-		}
-
-		tagged, err := reference.WithTag(repoInfo, r.name)
-		if err != nil {
-			return err
-		}
-		trustedRef, err := reference.WithDigest(reference.TrimNamed(repoInfo), r.digest)
-		if err != nil {
-			return err
-		}
-		if err := TagTrusted(ctx, cli, trustedRef, tagged); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// imagePullPrivileged pulls the image and displays it to the output
-func imagePullPrivileged(ctx context.Context, cli *command.DockerCli, authConfig types.AuthConfig, ref string, requestPrivilege types.RequestPrivilegeFunc, all bool) error {
-
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return err
-	}
-	options := types.ImagePullOptions{
-		RegistryAuth:  encodedAuth,
-		PrivilegeFunc: requestPrivilege,
-		All:           all,
-	}
-
-	responseBody, err := cli.Client().ImagePull(ctx, ref, options)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	return jsonmessage.DisplayJSONMessagesToStream(responseBody, cli.Out(), nil)
-}
-
-// TrustedReference returns the canonical trusted reference for an image reference
-func TrustedReference(ctx context.Context, cli *command.DockerCli, ref reference.NamedTagged, rs registry.Service) (reference.Canonical, error) {
-	var (
-		repoInfo *registry.RepositoryInfo
-		err      error
-	)
-	if rs != nil {
-		repoInfo, err = rs.ResolveRepository(ref)
-	} else {
-		repoInfo, err = registry.ParseRepositoryInfo(ref)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	// Resolve the Auth config relevant for this server
-	authConfig := command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
-
-	notaryRepo, err := trust.GetNotaryRepository(cli, repoInfo, authConfig, "pull")
-	if err != nil {
-		fmt.Fprintf(cli.Out(), "Error establishing connection to trust repository: %s\n", err)
-		return nil, err
-	}
-
-	t, err := notaryRepo.GetTargetByName(ref.Tag(), trust.ReleasesRole, data.CanonicalTargetsRole)
-	if err != nil {
-		return nil, trust.NotaryError(repoInfo.FullName(), err)
-	}
-	// Only list tags in the top level targets role or the releases delegation role - ignore
-	// all other delegation roles
-	if t.Role != trust.ReleasesRole && t.Role != data.CanonicalTargetsRole {
-		return nil, trust.NotaryError(repoInfo.FullName(), fmt.Errorf("No trust data for %s", ref.Tag()))
-	}
-	r, err := convertTarget(t.Target)
-	if err != nil {
-		return nil, err
-
-	}
-
-	return reference.WithDigest(reference.TrimNamed(ref), r.digest)
-}
-
-func convertTarget(t client.Target) (target, error) {
-	h, ok := t.Hashes["sha256"]
-	if !ok {
-		return target{}, errors.New("no valid hash, expecting sha256")
-	}
-	return target{
-		name:   t.Name,
-		digest: digest.NewDigestFromHex("sha256", hex.EncodeToString(h)),
-		size:   t.Length,
-	}, nil
-}
-
-// TagTrusted tags a trusted ref
-func TagTrusted(ctx context.Context, cli *command.DockerCli, trustedRef reference.Canonical, ref reference.NamedTagged) error {
-	fmt.Fprintf(cli.Out(), "Tagging %s as %s\n", trustedRef.String(), ref.String())
-
-	return cli.Client().ImageTag(ctx, trustedRef.String(), ref.String())
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/image/trust_test.go b/installer/vendor/github.com/docker/docker/cli/command/image/trust_test.go
deleted file mode 100644
index 78146465e6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/image/trust_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package image
-
-import (
-	"os"
-	"testing"
-
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli/trust"
-	"github.com/docker/docker/registry"
-)
-
-func unsetENV() {
-	os.Unsetenv("DOCKER_CONTENT_TRUST")
-	os.Unsetenv("DOCKER_CONTENT_TRUST_SERVER")
-}
-
-func TestENVTrustServer(t *testing.T) {
-	defer unsetENV()
-	indexInfo := &registrytypes.IndexInfo{Name: "testserver"}
-	if err := os.Setenv("DOCKER_CONTENT_TRUST_SERVER", "https://notary-test.com:5000"); err != nil {
-		t.Fatal("Failed to set ENV variable")
-	}
-	output, err := trust.Server(indexInfo)
-	expectedStr := "https://notary-test.com:5000"
-	if err != nil || output != expectedStr {
-		t.Fatalf("Expected server to be %s, got %s", expectedStr, output)
-	}
-}
-
-func TestHTTPENVTrustServer(t *testing.T) {
-	defer unsetENV()
-	indexInfo := &registrytypes.IndexInfo{Name: "testserver"}
-	if err := os.Setenv("DOCKER_CONTENT_TRUST_SERVER", "http://notary-test.com:5000"); err != nil {
-		t.Fatal("Failed to set ENV variable")
-	}
-	_, err := trust.Server(indexInfo)
-	if err == nil {
-		t.Fatal("Expected error with invalid scheme")
-	}
-}
-
-func TestOfficialTrustServer(t *testing.T) {
-	indexInfo := &registrytypes.IndexInfo{Name: "testserver", Official: true}
-	output, err := trust.Server(indexInfo)
-	if err != nil || output != registry.NotaryServer {
-		t.Fatalf("Expected server to be %s, got %s", registry.NotaryServer, output)
-	}
-}
-
-func TestNonOfficialTrustServer(t *testing.T) {
-	indexInfo := &registrytypes.IndexInfo{Name: "testserver", Official: false}
-	output, err := trust.Server(indexInfo)
-	expectedStr := "https://" + indexInfo.Name
-	if err != nil || output != expectedStr {
-		t.Fatalf("Expected server to be %s, got %s", expectedStr, output)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/in.go b/installer/vendor/github.com/docker/docker/cli/command/in.go
deleted file mode 100644
index 7204b7ad04..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/in.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package command
-
-import (
-	"errors"
-	"io"
-	"os"
-	"runtime"
-
-	"github.com/docker/docker/pkg/term"
-)
-
-// InStream is an input stream used by the DockerCli to read user input
-type InStream struct {
-	in         io.ReadCloser
-	fd         uintptr
-	isTerminal bool
-	state      *term.State
-}
-
-func (i *InStream) Read(p []byte) (int, error) {
-	return i.in.Read(p)
-}
-
-// Close implements the Closer interface
-func (i *InStream) Close() error {
-	return i.in.Close()
-}
-
-// FD returns the file descriptor number for this stream
-func (i *InStream) FD() uintptr {
-	return i.fd
-}
-
-// IsTerminal returns true if this stream is connected to a terminal
-func (i *InStream) IsTerminal() bool {
-	return i.isTerminal
-}
-
-// SetRawTerminal sets raw mode on the input terminal
-func (i *InStream) SetRawTerminal() (err error) {
-	if os.Getenv("NORAW") != "" || !i.isTerminal {
-		return nil
-	}
-	i.state, err = term.SetRawTerminal(i.fd)
-	return err
-}
-
-// RestoreTerminal restores normal mode to the terminal
-func (i *InStream) RestoreTerminal() {
-	if i.state != nil {
-		term.RestoreTerminal(i.fd, i.state)
-	}
-}
-
-// CheckTty checks if we are trying to attach to a container tty
-// from a non-tty client input stream, and if so, returns an error.
-func (i *InStream) CheckTty(attachStdin, ttyMode bool) error {
-	// In order to attach to a container tty, input stream for the client must
-	// be a tty itself: redirecting or piping the client standard input is
-	// incompatible with `docker run -t`, `docker exec -t` or `docker attach`.
-	if ttyMode && attachStdin && !i.isTerminal {
-		eText := "the input device is not a TTY"
-		if runtime.GOOS == "windows" {
-			return errors.New(eText + ".  If you are using mintty, try prefixing the command with 'winpty'")
-		}
-		return errors.New(eText)
-	}
-	return nil
-}
-
-// NewInStream returns a new InStream object from a ReadCloser
-func NewInStream(in io.ReadCloser) *InStream {
-	fd, isTerminal := term.GetFdInfo(in)
-	return &InStream{in: in, fd: fd, isTerminal: isTerminal}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector.go b/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector.go
deleted file mode 100644
index 1d81643fb1..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector.go
+++ /dev/null
@@ -1,195 +0,0 @@
-package inspect
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"text/template"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/utils/templates"
-)
-
-// Inspector defines an interface to implement to process elements
-type Inspector interface {
-	Inspect(typedElement interface{}, rawElement []byte) error
-	Flush() error
-}
-
-// TemplateInspector uses a text template to inspect elements.
-type TemplateInspector struct {
-	outputStream io.Writer
-	buffer       *bytes.Buffer
-	tmpl         *template.Template
-}
-
-// NewTemplateInspector creates a new inspector with a template.
-func NewTemplateInspector(outputStream io.Writer, tmpl *template.Template) Inspector {
-	return &TemplateInspector{
-		outputStream: outputStream,
-		buffer:       new(bytes.Buffer),
-		tmpl:         tmpl,
-	}
-}
-
-// NewTemplateInspectorFromString creates a new TemplateInspector from a string
-// which is compiled into a template.
-func NewTemplateInspectorFromString(out io.Writer, tmplStr string) (Inspector, error) {
-	if tmplStr == "" {
-		return NewIndentedInspector(out), nil
-	}
-
-	tmpl, err := templates.Parse(tmplStr)
-	if err != nil {
-		return nil, fmt.Errorf("Template parsing error: %s", err)
-	}
-	return NewTemplateInspector(out, tmpl), nil
-}
-
-// GetRefFunc is a function which used by Inspect to fetch an object from a
-// reference
-type GetRefFunc func(ref string) (interface{}, []byte, error)
-
-// Inspect fetches objects by reference using GetRefFunc and writes the json
-// representation to the output writer.
-func Inspect(out io.Writer, references []string, tmplStr string, getRef GetRefFunc) error {
-	inspector, err := NewTemplateInspectorFromString(out, tmplStr)
-	if err != nil {
-		return cli.StatusError{StatusCode: 64, Status: err.Error()}
-	}
-
-	var inspectErr error
-	for _, ref := range references {
-		element, raw, err := getRef(ref)
-		if err != nil {
-			inspectErr = err
-			break
-		}
-
-		if err := inspector.Inspect(element, raw); err != nil {
-			inspectErr = err
-			break
-		}
-	}
-
-	if err := inspector.Flush(); err != nil {
-		logrus.Errorf("%s\n", err)
-	}
-
-	if inspectErr != nil {
-		return cli.StatusError{StatusCode: 1, Status: inspectErr.Error()}
-	}
-	return nil
-}
-
-// Inspect executes the inspect template.
-// It decodes the raw element into a map if the initial execution fails.
-// This allows docker cli to parse inspect structs injected with Swarm fields.
-func (i *TemplateInspector) Inspect(typedElement interface{}, rawElement []byte) error {
-	buffer := new(bytes.Buffer)
-	if err := i.tmpl.Execute(buffer, typedElement); err != nil {
-		if rawElement == nil {
-			return fmt.Errorf("Template parsing error: %v", err)
-		}
-		return i.tryRawInspectFallback(rawElement)
-	}
-	i.buffer.Write(buffer.Bytes())
-	i.buffer.WriteByte('\n')
-	return nil
-}
-
-// tryRawInspectFallback executes the inspect template with a raw interface.
-// This allows docker cli to parse inspect structs injected with Swarm fields.
-func (i *TemplateInspector) tryRawInspectFallback(rawElement []byte) error {
-	var raw interface{}
-	buffer := new(bytes.Buffer)
-	rdr := bytes.NewReader(rawElement)
-	dec := json.NewDecoder(rdr)
-
-	if rawErr := dec.Decode(&raw); rawErr != nil {
-		return fmt.Errorf("unable to read inspect data: %v", rawErr)
-	}
-
-	tmplMissingKey := i.tmpl.Option("missingkey=error")
-	if rawErr := tmplMissingKey.Execute(buffer, raw); rawErr != nil {
-		return fmt.Errorf("Template parsing error: %v", rawErr)
-	}
-
-	i.buffer.Write(buffer.Bytes())
-	i.buffer.WriteByte('\n')
-	return nil
-}
-
-// Flush writes the result of inspecting all elements into the output stream.
-func (i *TemplateInspector) Flush() error {
-	if i.buffer.Len() == 0 {
-		_, err := io.WriteString(i.outputStream, "\n")
-		return err
-	}
-	_, err := io.Copy(i.outputStream, i.buffer)
-	return err
-}
-
-// IndentedInspector uses a buffer to stop the indented representation of an element.
-type IndentedInspector struct {
-	outputStream io.Writer
-	elements     []interface{}
-	rawElements  [][]byte
-}
-
-// NewIndentedInspector generates a new IndentedInspector.
-func NewIndentedInspector(outputStream io.Writer) Inspector {
-	return &IndentedInspector{
-		outputStream: outputStream,
-	}
-}
-
-// Inspect writes the raw element with an indented json format.
-func (i *IndentedInspector) Inspect(typedElement interface{}, rawElement []byte) error {
-	if rawElement != nil {
-		i.rawElements = append(i.rawElements, rawElement)
-	} else {
-		i.elements = append(i.elements, typedElement)
-	}
-	return nil
-}
-
-// Flush writes the result of inspecting all elements into the output stream.
-func (i *IndentedInspector) Flush() error {
-	if len(i.elements) == 0 && len(i.rawElements) == 0 {
-		_, err := io.WriteString(i.outputStream, "[]\n")
-		return err
-	}
-
-	var buffer io.Reader
-	if len(i.rawElements) > 0 {
-		bytesBuffer := new(bytes.Buffer)
-		bytesBuffer.WriteString("[")
-		for idx, r := range i.rawElements {
-			bytesBuffer.Write(r)
-			if idx < len(i.rawElements)-1 {
-				bytesBuffer.WriteString(",")
-			}
-		}
-		bytesBuffer.WriteString("]")
-		indented := new(bytes.Buffer)
-		if err := json.Indent(indented, bytesBuffer.Bytes(), "", "    "); err != nil {
-			return err
-		}
-		buffer = indented
-	} else {
-		b, err := json.MarshalIndent(i.elements, "", "    ")
-		if err != nil {
-			return err
-		}
-		buffer = bytes.NewReader(b)
-	}
-
-	if _, err := io.Copy(i.outputStream, buffer); err != nil {
-		return err
-	}
-	_, err := io.WriteString(i.outputStream, "\n")
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector_test.go b/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector_test.go
deleted file mode 100644
index 1ce1593ab7..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/inspect/inspector_test.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package inspect
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/utils/templates"
-)
-
-type testElement struct {
-	DNS string `json:"Dns"`
-}
-
-func TestTemplateInspectorDefault(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.DNS}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-	if err := i.Inspect(testElement{"0.0.0.0"}, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if b.String() != "0.0.0.0\n" {
-		t.Fatalf("Expected `0.0.0.0\\n`, got `%s`", b.String())
-	}
-}
-
-func TestTemplateInspectorEmpty(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.DNS}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if b.String() != "\n" {
-		t.Fatalf("Expected `\\n`, got `%s`", b.String())
-	}
-}
-
-func TestTemplateInspectorTemplateError(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.Foo}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-
-	err = i.Inspect(testElement{"0.0.0.0"}, nil)
-	if err == nil {
-		t.Fatal("Expected error got nil")
-	}
-
-	if !strings.HasPrefix(err.Error(), "Template parsing error") {
-		t.Fatalf("Expected template error, got %v", err)
-	}
-}
-
-func TestTemplateInspectorRawFallback(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.Dns}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-	if err := i.Inspect(testElement{"0.0.0.0"}, []byte(`{"Dns": "0.0.0.0"}`)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if b.String() != "0.0.0.0\n" {
-		t.Fatalf("Expected `0.0.0.0\\n`, got `%s`", b.String())
-	}
-}
-
-func TestTemplateInspectorRawFallbackError(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.Dns}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-	err = i.Inspect(testElement{"0.0.0.0"}, []byte(`{"Foo": "0.0.0.0"}`))
-	if err == nil {
-		t.Fatal("Expected error got nil")
-	}
-
-	if !strings.HasPrefix(err.Error(), "Template parsing error") {
-		t.Fatalf("Expected template error, got %v", err)
-	}
-}
-
-func TestTemplateInspectorMultiple(t *testing.T) {
-	b := new(bytes.Buffer)
-	tmpl, err := templates.Parse("{{.DNS}}")
-	if err != nil {
-		t.Fatal(err)
-	}
-	i := NewTemplateInspector(b, tmpl)
-
-	if err := i.Inspect(testElement{"0.0.0.0"}, nil); err != nil {
-		t.Fatal(err)
-	}
-	if err := i.Inspect(testElement{"1.1.1.1"}, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-	if b.String() != "0.0.0.0\n1.1.1.1\n" {
-		t.Fatalf("Expected `0.0.0.0\\n1.1.1.1\\n`, got `%s`", b.String())
-	}
-}
-
-func TestIndentedInspectorDefault(t *testing.T) {
-	b := new(bytes.Buffer)
-	i := NewIndentedInspector(b)
-	if err := i.Inspect(testElement{"0.0.0.0"}, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := `[
-    {
-        "Dns": "0.0.0.0"
-    }
-]
-`
-	if b.String() != expected {
-		t.Fatalf("Expected `%s`, got `%s`", expected, b.String())
-	}
-}
-
-func TestIndentedInspectorMultiple(t *testing.T) {
-	b := new(bytes.Buffer)
-	i := NewIndentedInspector(b)
-	if err := i.Inspect(testElement{"0.0.0.0"}, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Inspect(testElement{"1.1.1.1"}, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := `[
-    {
-        "Dns": "0.0.0.0"
-    },
-    {
-        "Dns": "1.1.1.1"
-    }
-]
-`
-	if b.String() != expected {
-		t.Fatalf("Expected `%s`, got `%s`", expected, b.String())
-	}
-}
-
-func TestIndentedInspectorEmpty(t *testing.T) {
-	b := new(bytes.Buffer)
-	i := NewIndentedInspector(b)
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := "[]\n"
-	if b.String() != expected {
-		t.Fatalf("Expected `%s`, got `%s`", expected, b.String())
-	}
-}
-
-func TestIndentedInspectorRawElements(t *testing.T) {
-	b := new(bytes.Buffer)
-	i := NewIndentedInspector(b)
-	if err := i.Inspect(testElement{"0.0.0.0"}, []byte(`{"Dns": "0.0.0.0", "Node": "0"}`)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Inspect(testElement{"1.1.1.1"}, []byte(`{"Dns": "1.1.1.1", "Node": "1"}`)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := i.Flush(); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := `[
-    {
-        "Dns": "0.0.0.0",
-        "Node": "0"
-    },
-    {
-        "Dns": "1.1.1.1",
-        "Node": "1"
-    }
-]
-`
-	if b.String() != expected {
-		t.Fatalf("Expected `%s`, got `%s`", expected, b.String())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/network/cmd.go
deleted file mode 100644
index ab8393cded..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/cmd.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package network
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewNetworkCommand returns a cobra command for `network` subcommands
-func NewNetworkCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "network",
-		Short: "Manage networks",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newConnectCommand(dockerCli),
-		newCreateCommand(dockerCli),
-		newDisconnectCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		NewPruneCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/connect.go b/installer/vendor/github.com/docker/docker/cli/command/network/connect.go
deleted file mode 100644
index c4b676e5f1..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/connect.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package network
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-)
-
-type connectOptions struct {
-	network      string
-	container    string
-	ipaddress    string
-	ipv6address  string
-	links        opts.ListOpts
-	aliases      []string
-	linklocalips []string
-}
-
-func newConnectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := connectOptions{
-		links: opts.NewListOpts(runconfigopts.ValidateLink),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "connect [OPTIONS] NETWORK CONTAINER",
-		Short: "Connect a container to a network",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.network = args[0]
-			opts.container = args[1]
-			return runConnect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVar(&opts.ipaddress, "ip", "", "IP Address")
-	flags.StringVar(&opts.ipv6address, "ip6", "", "IPv6 Address")
-	flags.Var(&opts.links, "link", "Add link to another container")
-	flags.StringSliceVar(&opts.aliases, "alias", []string{}, "Add network-scoped alias for the container")
-	flags.StringSliceVar(&opts.linklocalips, "link-local-ip", []string{}, "Add a link-local address for the container")
-
-	return cmd
-}
-
-func runConnect(dockerCli *command.DockerCli, opts connectOptions) error {
-	client := dockerCli.Client()
-
-	epConfig := &network.EndpointSettings{
-		IPAMConfig: &network.EndpointIPAMConfig{
-			IPv4Address:  opts.ipaddress,
-			IPv6Address:  opts.ipv6address,
-			LinkLocalIPs: opts.linklocalips,
-		},
-		Links:   opts.links.GetAll(),
-		Aliases: opts.aliases,
-	}
-
-	return client.NetworkConnect(context.Background(), opts.network, opts.container, epConfig)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/create.go b/installer/vendor/github.com/docker/docker/cli/command/network/create.go
deleted file mode 100644
index abc494e1e0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/create.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package network
-
-import (
-	"fmt"
-	"net"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-)
-
-type createOptions struct {
-	name       string
-	driver     string
-	driverOpts opts.MapOpts
-	labels     opts.ListOpts
-	internal   bool
-	ipv6       bool
-	attachable bool
-
-	ipamDriver  string
-	ipamSubnet  []string
-	ipamIPRange []string
-	ipamGateway []string
-	ipamAux     opts.MapOpts
-	ipamOpt     opts.MapOpts
-}
-
-func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := createOptions{
-		driverOpts: *opts.NewMapOpts(nil, nil),
-		labels:     opts.NewListOpts(runconfigopts.ValidateEnv),
-		ipamAux:    *opts.NewMapOpts(nil, nil),
-		ipamOpt:    *opts.NewMapOpts(nil, nil),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] NETWORK",
-		Short: "Create a network",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.name = args[0]
-			return runCreate(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.driver, "driver", "d", "bridge", "Driver to manage the Network")
-	flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options")
-	flags.Var(&opts.labels, "label", "Set metadata on a network")
-	flags.BoolVar(&opts.internal, "internal", false, "Restrict external access to the network")
-	flags.BoolVar(&opts.ipv6, "ipv6", false, "Enable IPv6 networking")
-	flags.BoolVar(&opts.attachable, "attachable", false, "Enable manual container attachment")
-
-	flags.StringVar(&opts.ipamDriver, "ipam-driver", "default", "IP Address Management Driver")
-	flags.StringSliceVar(&opts.ipamSubnet, "subnet", []string{}, "Subnet in CIDR format that represents a network segment")
-	flags.StringSliceVar(&opts.ipamIPRange, "ip-range", []string{}, "Allocate container ip from a sub-range")
-	flags.StringSliceVar(&opts.ipamGateway, "gateway", []string{}, "IPv4 or IPv6 Gateway for the master subnet")
-
-	flags.Var(&opts.ipamAux, "aux-address", "Auxiliary IPv4 or IPv6 addresses used by Network driver")
-	flags.Var(&opts.ipamOpt, "ipam-opt", "Set IPAM driver specific options")
-
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
-	client := dockerCli.Client()
-
-	ipamCfg, err := consolidateIpam(opts.ipamSubnet, opts.ipamIPRange, opts.ipamGateway, opts.ipamAux.GetAll())
-	if err != nil {
-		return err
-	}
-
-	// Construct network create request body
-	nc := types.NetworkCreate{
-		Driver:  opts.driver,
-		Options: opts.driverOpts.GetAll(),
-		IPAM: &network.IPAM{
-			Driver:  opts.ipamDriver,
-			Config:  ipamCfg,
-			Options: opts.ipamOpt.GetAll(),
-		},
-		CheckDuplicate: true,
-		Internal:       opts.internal,
-		EnableIPv6:     opts.ipv6,
-		Attachable:     opts.attachable,
-		Labels:         runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
-	}
-
-	resp, err := client.NetworkCreate(context.Background(), opts.name, nc)
-	if err != nil {
-		return err
-	}
-	fmt.Fprintf(dockerCli.Out(), "%s\n", resp.ID)
-	return nil
-}
-
-// Consolidates the ipam configuration as a group from different related configurations
-// user can configure network with multiple non-overlapping subnets and hence it is
-// possible to correlate the various related parameters and consolidate them.
-// consoidateIpam consolidates subnets, ip-ranges, gateways and auxiliary addresses into
-// structured ipam data.
-func consolidateIpam(subnets, ranges, gateways []string, auxaddrs map[string]string) ([]network.IPAMConfig, error) {
-	if len(subnets) < len(ranges) || len(subnets) < len(gateways) {
-		return nil, fmt.Errorf("every ip-range or gateway must have a corresponding subnet")
-	}
-	iData := map[string]*network.IPAMConfig{}
-
-	// Populate non-overlapping subnets into consolidation map
-	for _, s := range subnets {
-		for k := range iData {
-			ok1, err := subnetMatches(s, k)
-			if err != nil {
-				return nil, err
-			}
-			ok2, err := subnetMatches(k, s)
-			if err != nil {
-				return nil, err
-			}
-			if ok1 || ok2 {
-				return nil, fmt.Errorf("multiple overlapping subnet configuration is not supported")
-			}
-		}
-		iData[s] = &network.IPAMConfig{Subnet: s, AuxAddress: map[string]string{}}
-	}
-
-	// Validate and add valid ip ranges
-	for _, r := range ranges {
-		match := false
-		for _, s := range subnets {
-			ok, err := subnetMatches(s, r)
-			if err != nil {
-				return nil, err
-			}
-			if !ok {
-				continue
-			}
-			if iData[s].IPRange != "" {
-				return nil, fmt.Errorf("cannot configure multiple ranges (%s, %s) on the same subnet (%s)", r, iData[s].IPRange, s)
-			}
-			d := iData[s]
-			d.IPRange = r
-			match = true
-		}
-		if !match {
-			return nil, fmt.Errorf("no matching subnet for range %s", r)
-		}
-	}
-
-	// Validate and add valid gateways
-	for _, g := range gateways {
-		match := false
-		for _, s := range subnets {
-			ok, err := subnetMatches(s, g)
-			if err != nil {
-				return nil, err
-			}
-			if !ok {
-				continue
-			}
-			if iData[s].Gateway != "" {
-				return nil, fmt.Errorf("cannot configure multiple gateways (%s, %s) for the same subnet (%s)", g, iData[s].Gateway, s)
-			}
-			d := iData[s]
-			d.Gateway = g
-			match = true
-		}
-		if !match {
-			return nil, fmt.Errorf("no matching subnet for gateway %s", g)
-		}
-	}
-
-	// Validate and add aux-addresses
-	for key, aa := range auxaddrs {
-		match := false
-		for _, s := range subnets {
-			ok, err := subnetMatches(s, aa)
-			if err != nil {
-				return nil, err
-			}
-			if !ok {
-				continue
-			}
-			iData[s].AuxAddress[key] = aa
-			match = true
-		}
-		if !match {
-			return nil, fmt.Errorf("no matching subnet for aux-address %s", aa)
-		}
-	}
-
-	idl := []network.IPAMConfig{}
-	for _, v := range iData {
-		idl = append(idl, *v)
-	}
-	return idl, nil
-}
-
-func subnetMatches(subnet, data string) (bool, error) {
-	var (
-		ip net.IP
-	)
-
-	_, s, err := net.ParseCIDR(subnet)
-	if err != nil {
-		return false, fmt.Errorf("Invalid subnet %s : %v", s, err)
-	}
-
-	if strings.Contains(data, "/") {
-		ip, _, err = net.ParseCIDR(data)
-		if err != nil {
-			return false, fmt.Errorf("Invalid cidr %s : %v", data, err)
-		}
-	} else {
-		ip = net.ParseIP(data)
-	}
-
-	return s.Contains(ip), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/disconnect.go b/installer/vendor/github.com/docker/docker/cli/command/network/disconnect.go
deleted file mode 100644
index c9d9c14a13..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/disconnect.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package network
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type disconnectOptions struct {
-	network   string
-	container string
-	force     bool
-}
-
-func newDisconnectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := disconnectOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "disconnect [OPTIONS] NETWORK CONTAINER",
-		Short: "Disconnect a container from a network",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.network = args[0]
-			opts.container = args[1]
-			return runDisconnect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force the container to disconnect from a network")
-
-	return cmd
-}
-
-func runDisconnect(dockerCli *command.DockerCli, opts disconnectOptions) error {
-	client := dockerCli.Client()
-
-	return client.NetworkDisconnect(context.Background(), opts.network, opts.container, opts.force)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/network/inspect.go
deleted file mode 100644
index 1a86855f71..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/inspect.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package network
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	format string
-	names  []string
-}
-
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] NETWORK [NETWORK...]",
-		Short: "Display detailed information on one or more networks",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.names = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-
-	ctx := context.Background()
-
-	getNetFunc := func(name string) (interface{}, []byte, error) {
-		return client.NetworkInspectWithRaw(ctx, name)
-	}
-
-	return inspect.Inspect(dockerCli.Out(), opts.names, opts.format, getNetFunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/list.go b/installer/vendor/github.com/docker/docker/cli/command/network/list.go
deleted file mode 100644
index 1a5d285103..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/list.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package network
-
-import (
-	"sort"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type byNetworkName []types.NetworkResource
-
-func (r byNetworkName) Len() int           { return len(r) }
-func (r byNetworkName) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-func (r byNetworkName) Less(i, j int) bool { return r[i].Name < r[j].Name }
-
-type listOptions struct {
-	quiet   bool
-	noTrunc bool
-	format  string
-	filter  opts.FilterOpt
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Aliases: []string{"list"},
-		Short:   "List networks",
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display network IDs")
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate the output")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print networks using a Go template")
-	flags.VarP(&opts.filter, "filter", "f", "Provide filter values (e.g. 'driver=bridge')")
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	client := dockerCli.Client()
-	options := types.NetworkListOptions{Filters: opts.filter.Value()}
-	networkResources, err := client.NetworkList(context.Background(), options)
-	if err != nil {
-		return err
-	}
-
-	format := opts.format
-	if len(format) == 0 {
-		if len(dockerCli.ConfigFile().NetworksFormat) > 0 && !opts.quiet {
-			format = dockerCli.ConfigFile().NetworksFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-
-	sort.Sort(byNetworkName(networkResources))
-
-	networksCtx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.NewNetworkFormat(format, opts.quiet),
-		Trunc:  !opts.noTrunc,
-	}
-	return formatter.NetworkWrite(networksCtx, networkResources)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/prune.go b/installer/vendor/github.com/docker/docker/cli/command/network/prune.go
deleted file mode 100644
index 9f1979e6b5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/prune.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package network
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type pruneOptions struct {
-	force bool
-}
-
-// NewPruneCommand returns a new cobra prune command for networks
-func NewPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pruneOptions
-
-	cmd := &cobra.Command{
-		Use:   "prune [OPTIONS]",
-		Short: "Remove all unused networks",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			output, err := runPrune(dockerCli, opts)
-			if err != nil {
-				return err
-			}
-			if output != "" {
-				fmt.Fprintln(dockerCli.Out(), output)
-			}
-			return nil
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Do not prompt for confirmation")
-
-	return cmd
-}
-
-const warning = `WARNING! This will remove all networks not used by at least one container.
-Are you sure you want to continue?`
-
-func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (output string, err error) {
-	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
-		return
-	}
-
-	report, err := dockerCli.Client().NetworksPrune(context.Background(), filters.Args{})
-	if err != nil {
-		return
-	}
-
-	if len(report.NetworksDeleted) > 0 {
-		output = "Deleted Networks:\n"
-		for _, id := range report.NetworksDeleted {
-			output += id + "\n"
-		}
-	}
-
-	return
-}
-
-// RunPrune calls the Network Prune API
-// This returns the amount of space reclaimed and a detailed output string
-func RunPrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	output, err := runPrune(dockerCli, pruneOptions{force: true})
-	return 0, output, err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/network/remove.go b/installer/vendor/github.com/docker/docker/cli/command/network/remove.go
deleted file mode 100644
index 2034b8709e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/network/remove.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package network
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{
-		Use:     "rm NETWORK [NETWORK...]",
-		Aliases: []string{"remove"},
-		Short:   "Remove one or more networks",
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runRemove(dockerCli, args)
-		},
-	}
-}
-
-func runRemove(dockerCli *command.DockerCli, networks []string) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-	status := 0
-
-	for _, name := range networks {
-		if err := client.NetworkRemove(ctx, name); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "%s\n", err)
-			status = 1
-			continue
-		}
-		fmt.Fprintf(dockerCli.Out(), "%s\n", name)
-	}
-
-	if status != 0 {
-		return cli.StatusError{StatusCode: status}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/node/cmd.go
deleted file mode 100644
index e71b9199ad..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/cmd.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package node
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	apiclient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-// NewNodeCommand returns a cobra command for `node` subcommands
-func NewNodeCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "node",
-		Short: "Manage Swarm nodes",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newDemoteCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newListCommand(dockerCli),
-		newPromoteCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newPsCommand(dockerCli),
-		newUpdateCommand(dockerCli),
-	)
-	return cmd
-}
-
-// Reference returns the reference of a node. The special value "self" for a node
-// reference is mapped to the current node, hence the node ID is retrieved using
-// the `/info` endpoint.
-func Reference(ctx context.Context, client apiclient.APIClient, ref string) (string, error) {
-	if ref == "self" {
-		info, err := client.Info(ctx)
-		if err != nil {
-			return "", err
-		}
-		return info.Swarm.NodeID, nil
-	}
-	return ref, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/demote.go b/installer/vendor/github.com/docker/docker/cli/command/node/demote.go
deleted file mode 100644
index 33f86c6499..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/demote.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package node
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-func newDemoteCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{
-		Use:   "demote NODE [NODE...]",
-		Short: "Demote one or more nodes from manager in the swarm",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDemote(dockerCli, args)
-		},
-	}
-}
-
-func runDemote(dockerCli *command.DockerCli, nodes []string) error {
-	demote := func(node *swarm.Node) error {
-		if node.Spec.Role == swarm.NodeRoleWorker {
-			fmt.Fprintf(dockerCli.Out(), "Node %s is already a worker.\n", node.ID)
-			return errNoRoleChange
-		}
-		node.Spec.Role = swarm.NodeRoleWorker
-		return nil
-	}
-	success := func(nodeID string) {
-		fmt.Fprintf(dockerCli.Out(), "Manager %s demoted in the swarm.\n", nodeID)
-	}
-	return updateNodes(dockerCli, nodes, demote, success)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/node/inspect.go
deleted file mode 100644
index fde70185f8..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/inspect.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type inspectOptions struct {
-	nodeIds []string
-	format  string
-	pretty  bool
-}
-
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] self|NODE [NODE...]",
-		Short: "Display detailed information on one or more nodes",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.nodeIds = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-	getRef := func(ref string) (interface{}, []byte, error) {
-		nodeRef, err := Reference(ctx, client, ref)
-		if err != nil {
-			return nil, nil, err
-		}
-		node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
-		return node, nil, err
-	}
-
-	if !opts.pretty {
-		return inspect.Inspect(dockerCli.Out(), opts.nodeIds, opts.format, getRef)
-	}
-	return printHumanFriendly(dockerCli.Out(), opts.nodeIds, getRef)
-}
-
-func printHumanFriendly(out io.Writer, refs []string, getRef inspect.GetRefFunc) error {
-	for idx, ref := range refs {
-		obj, _, err := getRef(ref)
-		if err != nil {
-			return err
-		}
-		printNode(out, obj.(swarm.Node))
-
-		// TODO: better way to do this?
-		// print extra space between objects, but not after the last one
-		if idx+1 != len(refs) {
-			fmt.Fprintf(out, "\n\n")
-		} else {
-			fmt.Fprintf(out, "\n")
-		}
-	}
-	return nil
-}
-
-// TODO: use a template
-func printNode(out io.Writer, node swarm.Node) {
-	fmt.Fprintf(out, "ID:\t\t\t%s\n", node.ID)
-	ioutils.FprintfIfNotEmpty(out, "Name:\t\t\t%s\n", node.Spec.Name)
-	if node.Spec.Labels != nil {
-		fmt.Fprintln(out, "Labels:")
-		for k, v := range node.Spec.Labels {
-			fmt.Fprintf(out, " - %s = %s\n", k, v)
-		}
-	}
-
-	ioutils.FprintfIfNotEmpty(out, "Hostname:\t\t%s\n", node.Description.Hostname)
-	fmt.Fprintf(out, "Joined at:\t\t%s\n", command.PrettyPrint(node.CreatedAt))
-	fmt.Fprintln(out, "Status:")
-	fmt.Fprintf(out, " State:\t\t\t%s\n", command.PrettyPrint(node.Status.State))
-	ioutils.FprintfIfNotEmpty(out, " Message:\t\t%s\n", command.PrettyPrint(node.Status.Message))
-	fmt.Fprintf(out, " Availability:\t\t%s\n", command.PrettyPrint(node.Spec.Availability))
-	ioutils.FprintfIfNotEmpty(out, " Address:\t\t%s\n", command.PrettyPrint(node.Status.Addr))
-
-	if node.ManagerStatus != nil {
-		fmt.Fprintln(out, "Manager Status:")
-		fmt.Fprintf(out, " Address:\t\t%s\n", node.ManagerStatus.Addr)
-		fmt.Fprintf(out, " Raft Status:\t\t%s\n", command.PrettyPrint(node.ManagerStatus.Reachability))
-		leader := "No"
-		if node.ManagerStatus.Leader {
-			leader = "Yes"
-		}
-		fmt.Fprintf(out, " Leader:\t\t%s\n", leader)
-	}
-
-	fmt.Fprintln(out, "Platform:")
-	fmt.Fprintf(out, " Operating System:\t%s\n", node.Description.Platform.OS)
-	fmt.Fprintf(out, " Architecture:\t\t%s\n", node.Description.Platform.Architecture)
-
-	fmt.Fprintln(out, "Resources:")
-	fmt.Fprintf(out, " CPUs:\t\t\t%d\n", node.Description.Resources.NanoCPUs/1e9)
-	fmt.Fprintf(out, " Memory:\t\t%s\n", units.BytesSize(float64(node.Description.Resources.MemoryBytes)))
-
-	var pluginTypes []string
-	pluginNamesByType := map[string][]string{}
-	for _, p := range node.Description.Engine.Plugins {
-		// append to pluginTypes only if not done previously
-		if _, ok := pluginNamesByType[p.Type]; !ok {
-			pluginTypes = append(pluginTypes, p.Type)
-		}
-		pluginNamesByType[p.Type] = append(pluginNamesByType[p.Type], p.Name)
-	}
-
-	if len(pluginTypes) > 0 {
-		fmt.Fprintln(out, "Plugins:")
-		sort.Strings(pluginTypes) // ensure stable output
-		for _, pluginType := range pluginTypes {
-			fmt.Fprintf(out, "  %s:\t\t%s\n", pluginType, strings.Join(pluginNamesByType[pluginType], ", "))
-		}
-	}
-	fmt.Fprintf(out, "Engine Version:\t\t%s\n", node.Description.Engine.EngineVersion)
-
-	if len(node.Description.Engine.Labels) != 0 {
-		fmt.Fprintln(out, "Engine Labels:")
-		for k, v := range node.Description.Engine.Labels {
-			fmt.Fprintf(out, " - %s = %s\n", k, v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/list.go b/installer/vendor/github.com/docker/docker/cli/command/node/list.go
deleted file mode 100644
index 9cacdcf441..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/list.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-const (
-	listItemFmt = "%s\t%s\t%s\t%s\t%s\n"
-)
-
-type listOptions struct {
-	quiet  bool
-	filter opts.FilterOpt
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Aliases: []string{"list"},
-		Short:   "List nodes in the swarm",
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display IDs")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	client := dockerCli.Client()
-	out := dockerCli.Out()
-	ctx := context.Background()
-
-	nodes, err := client.NodeList(
-		ctx,
-		types.NodeListOptions{Filters: opts.filter.Value()})
-	if err != nil {
-		return err
-	}
-
-	if len(nodes) > 0 && !opts.quiet {
-		// only non-empty nodes and not quiet, should we call /info api
-		info, err := client.Info(ctx)
-		if err != nil {
-			return err
-		}
-		printTable(out, nodes, info)
-	} else if !opts.quiet {
-		// no nodes and not quiet, print only one line with columns ID, HOSTNAME, ...
-		printTable(out, nodes, types.Info{})
-	} else {
-		printQuiet(out, nodes)
-	}
-
-	return nil
-}
-
-func printTable(out io.Writer, nodes []swarm.Node, info types.Info) {
-	writer := tabwriter.NewWriter(out, 0, 4, 2, ' ', 0)
-
-	// Ignore flushing errors
-	defer writer.Flush()
-
-	fmt.Fprintf(writer, listItemFmt, "ID", "HOSTNAME", "STATUS", "AVAILABILITY", "MANAGER STATUS")
-	for _, node := range nodes {
-		name := node.Description.Hostname
-		availability := string(node.Spec.Availability)
-
-		reachability := ""
-		if node.ManagerStatus != nil {
-			if node.ManagerStatus.Leader {
-				reachability = "Leader"
-			} else {
-				reachability = string(node.ManagerStatus.Reachability)
-			}
-		}
-
-		ID := node.ID
-		if node.ID == info.Swarm.NodeID {
-			ID = ID + " *"
-		}
-
-		fmt.Fprintf(
-			writer,
-			listItemFmt,
-			ID,
-			name,
-			command.PrettyPrint(string(node.Status.State)),
-			command.PrettyPrint(availability),
-			command.PrettyPrint(reachability))
-	}
-}
-
-func printQuiet(out io.Writer, nodes []swarm.Node) {
-	for _, node := range nodes {
-		fmt.Fprintln(out, node.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/opts.go b/installer/vendor/github.com/docker/docker/cli/command/node/opts.go
deleted file mode 100644
index 7e6c55d487..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/opts.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-)
-
-type nodeOptions struct {
-	annotations
-	role         string
-	availability string
-}
-
-type annotations struct {
-	name   string
-	labels opts.ListOpts
-}
-
-func newNodeOptions() *nodeOptions {
-	return &nodeOptions{
-		annotations: annotations{
-			labels: opts.NewListOpts(nil),
-		},
-	}
-}
-
-func (opts *nodeOptions) ToNodeSpec() (swarm.NodeSpec, error) {
-	var spec swarm.NodeSpec
-
-	spec.Annotations.Name = opts.annotations.name
-	spec.Annotations.Labels = runconfigopts.ConvertKVStringsToMap(opts.annotations.labels.GetAll())
-
-	switch swarm.NodeRole(strings.ToLower(opts.role)) {
-	case swarm.NodeRoleWorker:
-		spec.Role = swarm.NodeRoleWorker
-	case swarm.NodeRoleManager:
-		spec.Role = swarm.NodeRoleManager
-	case "":
-	default:
-		return swarm.NodeSpec{}, fmt.Errorf("invalid role %q, only worker and manager are supported", opts.role)
-	}
-
-	switch swarm.NodeAvailability(strings.ToLower(opts.availability)) {
-	case swarm.NodeAvailabilityActive:
-		spec.Availability = swarm.NodeAvailabilityActive
-	case swarm.NodeAvailabilityPause:
-		spec.Availability = swarm.NodeAvailabilityPause
-	case swarm.NodeAvailabilityDrain:
-		spec.Availability = swarm.NodeAvailabilityDrain
-	case "":
-	default:
-		return swarm.NodeSpec{}, fmt.Errorf("invalid availability %q, only active, pause and drain are supported", opts.availability)
-	}
-
-	return spec, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/promote.go b/installer/vendor/github.com/docker/docker/cli/command/node/promote.go
deleted file mode 100644
index f47d783f4c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/promote.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package node
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-func newPromoteCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{
-		Use:   "promote NODE [NODE...]",
-		Short: "Promote one or more nodes to manager in the swarm",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPromote(dockerCli, args)
-		},
-	}
-}
-
-func runPromote(dockerCli *command.DockerCli, nodes []string) error {
-	promote := func(node *swarm.Node) error {
-		if node.Spec.Role == swarm.NodeRoleManager {
-			fmt.Fprintf(dockerCli.Out(), "Node %s is already a manager.\n", node.ID)
-			return errNoRoleChange
-		}
-		node.Spec.Role = swarm.NodeRoleManager
-		return nil
-	}
-	success := func(nodeID string) {
-		fmt.Fprintf(dockerCli.Out(), "Node %s promoted to a manager in the swarm.\n", nodeID)
-	}
-	return updateNodes(dockerCli, nodes, promote, success)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/ps.go b/installer/vendor/github.com/docker/docker/cli/command/node/ps.go
deleted file mode 100644
index a034721d24..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/ps.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/cli/command/task"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type psOptions struct {
-	nodeIDs   []string
-	noResolve bool
-	noTrunc   bool
-	filter    opts.FilterOpt
-}
-
-func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := psOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "ps [OPTIONS] [NODE...]",
-		Short: "List tasks running on one or more nodes, defaults to current node",
-		Args:  cli.RequiresMinArgs(0),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.nodeIDs = []string{"self"}
-
-			if len(args) != 0 {
-				opts.nodeIDs = args
-			}
-
-			return runPs(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
-	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runPs(dockerCli *command.DockerCli, opts psOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	var (
-		errs  []string
-		tasks []swarm.Task
-	)
-
-	for _, nodeID := range opts.nodeIDs {
-		nodeRef, err := Reference(ctx, client, nodeID)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		node, _, err := client.NodeInspectWithRaw(ctx, nodeRef)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		filter := opts.filter.Value()
-		filter.Add("node", node.ID)
-
-		nodeTasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		tasks = append(tasks, nodeTasks...)
-	}
-
-	if err := task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), opts.noTrunc); err != nil {
-		errs = append(errs, err.Error())
-	}
-
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/remove.go b/installer/vendor/github.com/docker/docker/cli/command/node/remove.go
deleted file mode 100644
index 19b4a96631..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/remove.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package node
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type removeOptions struct {
-	force bool
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := removeOptions{}
-
-	cmd := &cobra.Command{
-		Use:     "rm [OPTIONS] NODE [NODE...]",
-		Aliases: []string{"remove"},
-		Short:   "Remove one or more nodes from the swarm",
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runRemove(dockerCli, args, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force remove a node from the swarm")
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, args []string, opts removeOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	var errs []string
-
-	for _, nodeID := range args {
-		err := client.NodeRemove(ctx, nodeID, types.NodeRemoveOptions{Force: opts.force})
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-		fmt.Fprintf(dockerCli.Out(), "%s\n", nodeID)
-	}
-
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/node/update.go b/installer/vendor/github.com/docker/docker/cli/command/node/update.go
deleted file mode 100644
index 65339e138b..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/node/update.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package node
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"golang.org/x/net/context"
-)
-
-var (
-	errNoRoleChange = errors.New("role was already set to the requested value")
-)
-
-func newUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	nodeOpts := newNodeOptions()
-
-	cmd := &cobra.Command{
-		Use:   "update [OPTIONS] NODE",
-		Short: "Update a node",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runUpdate(dockerCli, cmd.Flags(), args[0])
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVar(&nodeOpts.role, flagRole, "", "Role of the node (worker/manager)")
-	flags.StringVar(&nodeOpts.availability, flagAvailability, "", "Availability of the node (active/pause/drain)")
-	flags.Var(&nodeOpts.annotations.labels, flagLabelAdd, "Add or update a node label (key=value)")
-	labelKeys := opts.NewListOpts(nil)
-	flags.Var(&labelKeys, flagLabelRemove, "Remove a node label if exists")
-	return cmd
-}
-
-func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, nodeID string) error {
-	success := func(_ string) {
-		fmt.Fprintln(dockerCli.Out(), nodeID)
-	}
-	return updateNodes(dockerCli, []string{nodeID}, mergeNodeUpdate(flags), success)
-}
-
-func updateNodes(dockerCli *command.DockerCli, nodes []string, mergeNode func(node *swarm.Node) error, success func(nodeID string)) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	for _, nodeID := range nodes {
-		node, _, err := client.NodeInspectWithRaw(ctx, nodeID)
-		if err != nil {
-			return err
-		}
-
-		err = mergeNode(&node)
-		if err != nil {
-			if err == errNoRoleChange {
-				continue
-			}
-			return err
-		}
-		err = client.NodeUpdate(ctx, node.ID, node.Version, node.Spec)
-		if err != nil {
-			return err
-		}
-		success(nodeID)
-	}
-	return nil
-}
-
-func mergeNodeUpdate(flags *pflag.FlagSet) func(*swarm.Node) error {
-	return func(node *swarm.Node) error {
-		spec := &node.Spec
-
-		if flags.Changed(flagRole) {
-			str, err := flags.GetString(flagRole)
-			if err != nil {
-				return err
-			}
-			spec.Role = swarm.NodeRole(str)
-		}
-		if flags.Changed(flagAvailability) {
-			str, err := flags.GetString(flagAvailability)
-			if err != nil {
-				return err
-			}
-			spec.Availability = swarm.NodeAvailability(str)
-		}
-		if spec.Annotations.Labels == nil {
-			spec.Annotations.Labels = make(map[string]string)
-		}
-		if flags.Changed(flagLabelAdd) {
-			labels := flags.Lookup(flagLabelAdd).Value.(*opts.ListOpts).GetAll()
-			for k, v := range runconfigopts.ConvertKVStringsToMap(labels) {
-				spec.Annotations.Labels[k] = v
-			}
-		}
-		if flags.Changed(flagLabelRemove) {
-			keys := flags.Lookup(flagLabelRemove).Value.(*opts.ListOpts).GetAll()
-			for _, k := range keys {
-				// if a key doesn't exist, fail the command explicitly
-				if _, exists := spec.Annotations.Labels[k]; !exists {
-					return fmt.Errorf("key %s doesn't exist in node's labels", k)
-				}
-				delete(spec.Annotations.Labels, k)
-			}
-		}
-		return nil
-	}
-}
-
-const (
-	flagRole         = "role"
-	flagAvailability = "availability"
-	flagLabelAdd     = "label-add"
-	flagLabelRemove  = "label-rm"
-)
diff --git a/installer/vendor/github.com/docker/docker/cli/command/out.go b/installer/vendor/github.com/docker/docker/cli/command/out.go
deleted file mode 100644
index 85718d7acd..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/out.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package command
-
-import (
-	"io"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/term"
-)
-
-// OutStream is an output stream used by the DockerCli to write normal program
-// output.
-type OutStream struct {
-	out        io.Writer
-	fd         uintptr
-	isTerminal bool
-	state      *term.State
-}
-
-func (o *OutStream) Write(p []byte) (int, error) {
-	return o.out.Write(p)
-}
-
-// FD returns the file descriptor number for this stream
-func (o *OutStream) FD() uintptr {
-	return o.fd
-}
-
-// IsTerminal returns true if this stream is connected to a terminal
-func (o *OutStream) IsTerminal() bool {
-	return o.isTerminal
-}
-
-// SetRawTerminal sets raw mode on the output terminal
-func (o *OutStream) SetRawTerminal() (err error) {
-	if os.Getenv("NORAW") != "" || !o.isTerminal {
-		return nil
-	}
-	o.state, err = term.SetRawTerminalOutput(o.fd)
-	return err
-}
-
-// RestoreTerminal restores normal mode to the terminal
-func (o *OutStream) RestoreTerminal() {
-	if o.state != nil {
-		term.RestoreTerminal(o.fd, o.state)
-	}
-}
-
-// GetTtySize returns the height and width in characters of the tty
-func (o *OutStream) GetTtySize() (uint, uint) {
-	if !o.isTerminal {
-		return 0, 0
-	}
-	ws, err := term.GetWinsize(o.fd)
-	if err != nil {
-		logrus.Debugf("Error getting size: %s", err)
-		if ws == nil {
-			return 0, 0
-		}
-	}
-	return uint(ws.Height), uint(ws.Width)
-}
-
-// NewOutStream returns a new OutStream object from a Writer
-func NewOutStream(out io.Writer) *OutStream {
-	fd, isTerminal := term.GetFdInfo(out)
-	return &OutStream{out: out, fd: fd, isTerminal: isTerminal}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/cmd.go
deleted file mode 100644
index 92c990a975..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/cmd.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package plugin
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-// NewPluginCommand returns a cobra command for `plugin` subcommands
-func NewPluginCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "plugin",
-		Short: "Manage plugins",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-
-	cmd.AddCommand(
-		newDisableCommand(dockerCli),
-		newEnableCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newInstallCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newSetCommand(dockerCli),
-		newPushCommand(dockerCli),
-		newCreateCommand(dockerCli),
-		newUpgradeCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/create.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/create.go
deleted file mode 100644
index 2aab1e9e4a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/create.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package plugin
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/reference"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-// validateTag checks if the given repoName can be resolved.
-func validateTag(rawRepo string) error {
-	_, err := reference.ParseNamed(rawRepo)
-
-	return err
-}
-
-// validateConfig ensures that a valid config.json is available in the given path
-func validateConfig(path string) error {
-	dt, err := os.Open(filepath.Join(path, "config.json"))
-	if err != nil {
-		return err
-	}
-
-	m := types.PluginConfig{}
-	err = json.NewDecoder(dt).Decode(&m)
-	dt.Close()
-
-	return err
-}
-
-// validateContextDir validates the given dir and returns abs path on success.
-func validateContextDir(contextDir string) (string, error) {
-	absContextDir, err := filepath.Abs(contextDir)
-
-	stat, err := os.Lstat(absContextDir)
-	if err != nil {
-		return "", err
-	}
-
-	if !stat.IsDir() {
-		return "", fmt.Errorf("context must be a directory")
-	}
-
-	return absContextDir, nil
-}
-
-type pluginCreateOptions struct {
-	repoName string
-	context  string
-	compress bool
-}
-
-func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	options := pluginCreateOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] PLUGIN PLUGIN-DATA-DIR",
-		Short: "Create a plugin from a rootfs and configuration. Plugin data directory must contain config.json and rootfs directory.",
-		Args:  cli.RequiresMinArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			options.repoName = args[0]
-			options.context = args[1]
-			return runCreate(dockerCli, options)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVar(&options.compress, "compress", false, "Compress the context using gzip")
-
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, options pluginCreateOptions) error {
-	var (
-		createCtx io.ReadCloser
-		err       error
-	)
-
-	if err := validateTag(options.repoName); err != nil {
-		return err
-	}
-
-	absContextDir, err := validateContextDir(options.context)
-	if err != nil {
-		return err
-	}
-
-	if err := validateConfig(options.context); err != nil {
-		return err
-	}
-
-	compression := archive.Uncompressed
-	if options.compress {
-		logrus.Debugf("compression enabled")
-		compression = archive.Gzip
-	}
-
-	createCtx, err = archive.TarWithOptions(absContextDir, &archive.TarOptions{
-		Compression: compression,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	ctx := context.Background()
-
-	createOptions := types.PluginCreateOptions{RepoName: options.repoName}
-	if err = dockerCli.Client().PluginCreate(ctx, createCtx, createOptions); err != nil {
-		return err
-	}
-	fmt.Fprintln(dockerCli.Out(), options.repoName)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/disable.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/disable.go
deleted file mode 100644
index 07b0ec2288..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/disable.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-func newDisableCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var force bool
-
-	cmd := &cobra.Command{
-		Use:   "disable [OPTIONS] PLUGIN",
-		Short: "Disable a plugin",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDisable(dockerCli, args[0], force)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&force, "force", "f", false, "Force the disable of an active plugin")
-	return cmd
-}
-
-func runDisable(dockerCli *command.DockerCli, name string, force bool) error {
-	if err := dockerCli.Client().PluginDisable(context.Background(), name, types.PluginDisableOptions{Force: force}); err != nil {
-		return err
-	}
-	fmt.Fprintln(dockerCli.Out(), name)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/enable.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/enable.go
deleted file mode 100644
index 77762f4024..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/enable.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type enableOpts struct {
-	timeout int
-	name    string
-}
-
-func newEnableCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts enableOpts
-
-	cmd := &cobra.Command{
-		Use:   "enable [OPTIONS] PLUGIN",
-		Short: "Enable a plugin",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.name = args[0]
-			return runEnable(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.IntVar(&opts.timeout, "timeout", 0, "HTTP client timeout (in seconds)")
-	return cmd
-}
-
-func runEnable(dockerCli *command.DockerCli, opts *enableOpts) error {
-	name := opts.name
-	if opts.timeout < 0 {
-		return fmt.Errorf("negative timeout %d is invalid", opts.timeout)
-	}
-
-	if err := dockerCli.Client().PluginEnable(context.Background(), name, types.PluginEnableOptions{Timeout: opts.timeout}); err != nil {
-		return err
-	}
-	fmt.Fprintln(dockerCli.Out(), name)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/inspect.go
deleted file mode 100644
index c2c7a0d6bc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/inspect.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package plugin
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type inspectOptions struct {
-	pluginNames []string
-	format      string
-}
-
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] PLUGIN [PLUGIN...]",
-		Short: "Display detailed information on one or more plugins",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.pluginNames = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-	getRef := func(ref string) (interface{}, []byte, error) {
-		return client.PluginInspectWithRaw(ctx, ref)
-	}
-
-	return inspect.Inspect(dockerCli.Out(), opts.pluginNames, opts.format, getRef)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/install.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/install.go
deleted file mode 100644
index 2c3170c54a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/install.go
+++ /dev/null
@@ -1,208 +0,0 @@
-package plugin
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"strings"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-	"golang.org/x/net/context"
-)
-
-type pluginOptions struct {
-	remote          string
-	localName       string
-	grantPerms      bool
-	disable         bool
-	args            []string
-	skipRemoteCheck bool
-}
-
-func loadPullFlags(opts *pluginOptions, flags *pflag.FlagSet) {
-	flags.BoolVar(&opts.grantPerms, "grant-all-permissions", false, "Grant all permissions necessary to run the plugin")
-	command.AddTrustedFlags(flags, true)
-}
-
-func newInstallCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var options pluginOptions
-	cmd := &cobra.Command{
-		Use:   "install [OPTIONS] PLUGIN [KEY=VALUE...]",
-		Short: "Install a plugin",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			options.remote = args[0]
-			if len(args) > 1 {
-				options.args = args[1:]
-			}
-			return runInstall(dockerCli, options)
-		},
-	}
-
-	flags := cmd.Flags()
-	loadPullFlags(&options, flags)
-	flags.BoolVar(&options.disable, "disable", false, "Do not enable the plugin on install")
-	flags.StringVar(&options.localName, "alias", "", "Local name for plugin")
-	return cmd
-}
-
-func getRepoIndexFromUnnormalizedRef(ref distreference.Named) (*registrytypes.IndexInfo, error) {
-	named, err := reference.ParseNamed(ref.Name())
-	if err != nil {
-		return nil, err
-	}
-
-	repoInfo, err := registry.ParseRepositoryInfo(named)
-	if err != nil {
-		return nil, err
-	}
-
-	return repoInfo.Index, nil
-}
-
-type pluginRegistryService struct {
-	registry.Service
-}
-
-func (s pluginRegistryService) ResolveRepository(name reference.Named) (repoInfo *registry.RepositoryInfo, err error) {
-	repoInfo, err = s.Service.ResolveRepository(name)
-	if repoInfo != nil {
-		repoInfo.Class = "plugin"
-	}
-	return
-}
-
-func newRegistryService() registry.Service {
-	return pluginRegistryService{
-		Service: registry.NewService(registry.ServiceOptions{V2Only: true}),
-	}
-}
-
-func buildPullConfig(ctx context.Context, dockerCli *command.DockerCli, opts pluginOptions, cmdName string) (types.PluginInstallOptions, error) {
-	// Parse name using distribution reference package to support name
-	// containing both tag and digest. Names with both tag and digest
-	// will be treated by the daemon as a pull by digest with
-	// an alias for the tag (if no alias is provided).
-	ref, err := distreference.ParseNamed(opts.remote)
-	if err != nil {
-		return types.PluginInstallOptions{}, err
-	}
-
-	index, err := getRepoIndexFromUnnormalizedRef(ref)
-	if err != nil {
-		return types.PluginInstallOptions{}, err
-	}
-
-	repoInfoIndex, err := getRepoIndexFromUnnormalizedRef(ref)
-	if err != nil {
-		return types.PluginInstallOptions{}, err
-	}
-	remote := ref.String()
-
-	_, isCanonical := ref.(distreference.Canonical)
-	if command.IsTrusted() && !isCanonical {
-		var nt reference.NamedTagged
-		named, err := reference.ParseNamed(ref.Name())
-		if err != nil {
-			return types.PluginInstallOptions{}, err
-		}
-		if tagged, ok := ref.(distreference.Tagged); ok {
-			nt, err = reference.WithTag(named, tagged.Tag())
-			if err != nil {
-				return types.PluginInstallOptions{}, err
-			}
-		} else {
-			named = reference.WithDefaultTag(named)
-			nt = named.(reference.NamedTagged)
-		}
-
-		ctx := context.Background()
-		trusted, err := image.TrustedReference(ctx, dockerCli, nt, newRegistryService())
-		if err != nil {
-			return types.PluginInstallOptions{}, err
-		}
-		remote = trusted.String()
-	}
-
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, index)
-
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return types.PluginInstallOptions{}, err
-	}
-
-	registryAuthFunc := command.RegistryAuthenticationPrivilegedFunc(dockerCli, repoInfoIndex, cmdName)
-
-	options := types.PluginInstallOptions{
-		RegistryAuth:          encodedAuth,
-		RemoteRef:             remote,
-		Disabled:              opts.disable,
-		AcceptAllPermissions:  opts.grantPerms,
-		AcceptPermissionsFunc: acceptPrivileges(dockerCli, opts.remote),
-		// TODO: Rename PrivilegeFunc, it has nothing to do with privileges
-		PrivilegeFunc: registryAuthFunc,
-		Args:          opts.args,
-	}
-	return options, nil
-}
-
-func runInstall(dockerCli *command.DockerCli, opts pluginOptions) error {
-	var localName string
-	if opts.localName != "" {
-		aref, err := reference.ParseNamed(opts.localName)
-		if err != nil {
-			return err
-		}
-		aref = reference.WithDefaultTag(aref)
-		if _, ok := aref.(reference.NamedTagged); !ok {
-			return fmt.Errorf("invalid name: %s", opts.localName)
-		}
-		localName = aref.String()
-	}
-
-	ctx := context.Background()
-	options, err := buildPullConfig(ctx, dockerCli, opts, "plugin install")
-	if err != nil {
-		return err
-	}
-	responseBody, err := dockerCli.Client().PluginInstall(ctx, localName, options)
-	if err != nil {
-		if strings.Contains(err.Error(), "target is image") {
-			return errors.New(err.Error() + " - Use `docker image pull`")
-		}
-		return err
-	}
-	defer responseBody.Close()
-	if err := jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil); err != nil {
-		return err
-	}
-	fmt.Fprintf(dockerCli.Out(), "Installed plugin %s\n", opts.remote) // todo: return proper values from the API for this result
-	return nil
-}
-
-func acceptPrivileges(dockerCli *command.DockerCli, name string) func(privileges types.PluginPrivileges) (bool, error) {
-	return func(privileges types.PluginPrivileges) (bool, error) {
-		fmt.Fprintf(dockerCli.Out(), "Plugin %q is requesting the following privileges:\n", name)
-		for _, privilege := range privileges {
-			fmt.Fprintf(dockerCli.Out(), " - %s: %v\n", privilege.Name, privilege.Value)
-		}
-
-		fmt.Fprint(dockerCli.Out(), "Do you grant the above permissions? [y/N] ")
-		reader := bufio.NewReader(dockerCli.In())
-		line, _, err := reader.ReadLine()
-		if err != nil {
-			return false, err
-		}
-		return strings.ToLower(string(line)) == "y", nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/list.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/list.go
deleted file mode 100644
index 8fd16dae3f..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/list.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type listOptions struct {
-	noTrunc bool
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts listOptions
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Short:   "List plugins",
-		Aliases: []string{"list"},
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	plugins, err := dockerCli.Client().PluginList(context.Background())
-	if err != nil {
-		return err
-	}
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-	fmt.Fprintf(w, "ID \tNAME \tDESCRIPTION\tENABLED")
-	fmt.Fprintf(w, "\n")
-
-	for _, p := range plugins {
-		id := p.ID
-		desc := strings.Replace(p.Config.Description, "\n", " ", -1)
-		desc = strings.Replace(desc, "\r", " ", -1)
-		if !opts.noTrunc {
-			id = stringid.TruncateID(p.ID)
-			desc = stringutils.Ellipsis(desc, 45)
-		}
-
-		fmt.Fprintf(w, "%s\t%s\t%s\t%v\n", id, p.Name, desc, p.Enabled)
-	}
-	w.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/push.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/push.go
deleted file mode 100644
index 9abb38ec0b..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/push.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-)
-
-func newPushCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "push [OPTIONS] PLUGIN[:TAG]",
-		Short: "Push a plugin to a registry",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPush(dockerCli, args[0])
-		},
-	}
-
-	flags := cmd.Flags()
-
-	command.AddTrustedFlags(flags, true)
-
-	return cmd
-}
-
-func runPush(dockerCli *command.DockerCli, name string) error {
-	named, err := reference.ParseNamed(name) // FIXME: validate
-	if err != nil {
-		return err
-	}
-	if reference.IsNameOnly(named) {
-		named = reference.WithDefaultTag(named)
-	}
-	ref, ok := named.(reference.NamedTagged)
-	if !ok {
-		return fmt.Errorf("invalid name: %s", named.String())
-	}
-
-	ctx := context.Background()
-
-	repoInfo, err := registry.ParseRepositoryInfo(named)
-	if err != nil {
-		return err
-	}
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, repoInfo.Index)
-
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return err
-	}
-	responseBody, err := dockerCli.Client().PluginPush(ctx, ref.String(), encodedAuth)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	if command.IsTrusted() {
-		repoInfo.Class = "plugin"
-		return image.PushTrustedReference(dockerCli, repoInfo, named, authConfig, responseBody)
-	}
-
-	return jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/remove.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/remove.go
deleted file mode 100644
index 9f3aba9a01..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/remove.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type rmOptions struct {
-	force bool
-
-	plugins []string
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts rmOptions
-
-	cmd := &cobra.Command{
-		Use:     "rm [OPTIONS] PLUGIN [PLUGIN...]",
-		Short:   "Remove one or more plugins",
-		Aliases: []string{"remove"},
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.plugins = args
-			return runRemove(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force the removal of an active plugin")
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, opts *rmOptions) error {
-	ctx := context.Background()
-
-	var errs cli.Errors
-	for _, name := range opts.plugins {
-		// TODO: pass names to api instead of making multiple api calls
-		if err := dockerCli.Client().PluginRemove(ctx, name, types.PluginRemoveOptions{Force: opts.force}); err != nil {
-			errs = append(errs, err)
-			continue
-		}
-		fmt.Fprintln(dockerCli.Out(), name)
-	}
-	// Do not simplify to `return errs` because even if errs == nil, it is not a nil-error interface value.
-	if errs != nil {
-		return errs
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/set.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/set.go
deleted file mode 100644
index 52b09fb500..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/set.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package plugin
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-func newSetCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "set PLUGIN KEY=VALUE [KEY=VALUE...]",
-		Short: "Change settings for a plugin",
-		Args:  cli.RequiresMinArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return dockerCli.Client().PluginSet(context.Background(), args[0], args[1:])
-		},
-	}
-
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/plugin/upgrade.go b/installer/vendor/github.com/docker/docker/cli/command/plugin/upgrade.go
deleted file mode 100644
index d212cd7e52..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/plugin/upgrade.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package plugin
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/reference"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-)
-
-func newUpgradeCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var options pluginOptions
-	cmd := &cobra.Command{
-		Use:   "upgrade [OPTIONS] PLUGIN [REMOTE]",
-		Short: "Upgrade an existing plugin",
-		Args:  cli.RequiresRangeArgs(1, 2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			options.localName = args[0]
-			if len(args) == 2 {
-				options.remote = args[1]
-			}
-			return runUpgrade(dockerCli, options)
-		},
-	}
-
-	flags := cmd.Flags()
-	loadPullFlags(&options, flags)
-	flags.BoolVar(&options.skipRemoteCheck, "skip-remote-check", false, "Do not check if specified remote plugin matches existing plugin image")
-	return cmd
-}
-
-func runUpgrade(dockerCli *command.DockerCli, opts pluginOptions) error {
-	ctx := context.Background()
-	p, _, err := dockerCli.Client().PluginInspectWithRaw(ctx, opts.localName)
-	if err != nil {
-		return fmt.Errorf("error reading plugin data: %v", err)
-	}
-
-	if p.Enabled {
-		return fmt.Errorf("the plugin must be disabled before upgrading")
-	}
-
-	opts.localName = p.Name
-	if opts.remote == "" {
-		opts.remote = p.PluginReference
-	}
-	remote, err := reference.ParseNamed(opts.remote)
-	if err != nil {
-		return errors.Wrap(err, "error parsing remote upgrade image reference")
-	}
-	remote = reference.WithDefaultTag(remote)
-
-	old, err := reference.ParseNamed(p.PluginReference)
-	if err != nil {
-		return errors.Wrap(err, "error parsing current image reference")
-	}
-	old = reference.WithDefaultTag(old)
-
-	fmt.Fprintf(dockerCli.Out(), "Upgrading plugin %s from %s to %s\n", p.Name, old, remote)
-	if !opts.skipRemoteCheck && remote.String() != old.String() {
-		_, err := fmt.Fprint(dockerCli.Out(), "Plugin images do not match, are you sure? ")
-		if err != nil {
-			return errors.Wrap(err, "error writing to stdout")
-		}
-
-		rdr := bufio.NewReader(dockerCli.In())
-		line, _, err := rdr.ReadLine()
-		if err != nil {
-			return errors.Wrap(err, "error reading from stdin")
-		}
-		if strings.ToLower(string(line)) != "y" {
-			return errors.New("canceling upgrade request")
-		}
-	}
-
-	options, err := buildPullConfig(ctx, dockerCli, opts, "plugin upgrade")
-	if err != nil {
-		return err
-	}
-
-	responseBody, err := dockerCli.Client().PluginUpgrade(ctx, opts.localName, options)
-	if err != nil {
-		if strings.Contains(err.Error(), "target is image") {
-			return errors.New(err.Error() + " - Use `docker image pull`")
-		}
-		return err
-	}
-	defer responseBody.Close()
-	if err := jsonmessage.DisplayJSONMessagesToStream(responseBody, dockerCli.Out(), nil); err != nil {
-		return err
-	}
-	fmt.Fprintf(dockerCli.Out(), "Upgraded plugin %s to %s\n", opts.localName, opts.remote) // todo: return proper values from the API for this result
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/prune/prune.go b/installer/vendor/github.com/docker/docker/cli/command/prune/prune.go
deleted file mode 100644
index a022487fd6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/prune/prune.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package prune
-
-import (
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/container"
-	"github.com/docker/docker/cli/command/image"
-	"github.com/docker/docker/cli/command/network"
-	"github.com/docker/docker/cli/command/volume"
-	"github.com/spf13/cobra"
-)
-
-// NewContainerPruneCommand returns a cobra prune command for containers
-func NewContainerPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return container.NewPruneCommand(dockerCli)
-}
-
-// NewVolumePruneCommand returns a cobra prune command for volumes
-func NewVolumePruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return volume.NewPruneCommand(dockerCli)
-}
-
-// NewImagePruneCommand returns a cobra prune command for images
-func NewImagePruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return image.NewPruneCommand(dockerCli)
-}
-
-// NewNetworkPruneCommand returns a cobra prune command for Networks
-func NewNetworkPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return network.NewPruneCommand(dockerCli)
-}
-
-// RunContainerPrune executes a prune command for containers
-func RunContainerPrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	return container.RunPrune(dockerCli)
-}
-
-// RunVolumePrune executes a prune command for volumes
-func RunVolumePrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	return volume.RunPrune(dockerCli)
-}
-
-// RunImagePrune executes a prune command for images
-func RunImagePrune(dockerCli *command.DockerCli, all bool) (uint64, string, error) {
-	return image.RunPrune(dockerCli, all)
-}
-
-// RunNetworkPrune executes a prune command for networks
-func RunNetworkPrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	return network.RunPrune(dockerCli)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/registry.go b/installer/vendor/github.com/docker/docker/cli/command/registry.go
deleted file mode 100644
index 65f6b3309e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/registry.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package command
-
-import (
-	"bufio"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"runtime"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-)
-
-// ElectAuthServer returns the default registry to use (by asking the daemon)
-func ElectAuthServer(ctx context.Context, cli *DockerCli) string {
-	// The daemon `/info` endpoint informs us of the default registry being
-	// used. This is essential in cross-platforms environment, where for
-	// example a Linux client might be interacting with a Windows daemon, hence
-	// the default registry URL might be Windows specific.
-	serverAddress := registry.IndexServer
-	if info, err := cli.Client().Info(ctx); err != nil {
-		fmt.Fprintf(cli.Out(), "Warning: failed to get default registry endpoint from daemon (%v). Using system default: %s\n", err, serverAddress)
-	} else {
-		serverAddress = info.IndexServerAddress
-	}
-	return serverAddress
-}
-
-// EncodeAuthToBase64 serializes the auth configuration as JSON base64 payload
-func EncodeAuthToBase64(authConfig types.AuthConfig) (string, error) {
-	buf, err := json.Marshal(authConfig)
-	if err != nil {
-		return "", err
-	}
-	return base64.URLEncoding.EncodeToString(buf), nil
-}
-
-// RegistryAuthenticationPrivilegedFunc returns a RequestPrivilegeFunc from the specified registry index info
-// for the given command.
-func RegistryAuthenticationPrivilegedFunc(cli *DockerCli, index *registrytypes.IndexInfo, cmdName string) types.RequestPrivilegeFunc {
-	return func() (string, error) {
-		fmt.Fprintf(cli.Out(), "\nPlease login prior to %s:\n", cmdName)
-		indexServer := registry.GetAuthConfigKey(index)
-		isDefaultRegistry := indexServer == ElectAuthServer(context.Background(), cli)
-		authConfig, err := ConfigureAuth(cli, "", "", indexServer, isDefaultRegistry)
-		if err != nil {
-			return "", err
-		}
-		return EncodeAuthToBase64(authConfig)
-	}
-}
-
-// ResolveAuthConfig is like registry.ResolveAuthConfig, but if using the
-// default index, it uses the default index name for the daemon's platform,
-// not the client's platform.
-func ResolveAuthConfig(ctx context.Context, cli *DockerCli, index *registrytypes.IndexInfo) types.AuthConfig {
-	configKey := index.Name
-	if index.Official {
-		configKey = ElectAuthServer(ctx, cli)
-	}
-
-	a, _ := cli.CredentialsStore(configKey).Get(configKey)
-	return a
-}
-
-// ConfigureAuth returns an AuthConfig from the specified user, password and server.
-func ConfigureAuth(cli *DockerCli, flUser, flPassword, serverAddress string, isDefaultRegistry bool) (types.AuthConfig, error) {
-	// On Windows, force the use of the regular OS stdin stream. Fixes #14336/#14210
-	if runtime.GOOS == "windows" {
-		cli.in = NewInStream(os.Stdin)
-	}
-
-	if !isDefaultRegistry {
-		serverAddress = registry.ConvertToHostname(serverAddress)
-	}
-
-	authconfig, err := cli.CredentialsStore(serverAddress).Get(serverAddress)
-	if err != nil {
-		return authconfig, err
-	}
-
-	// Some links documenting this:
-	// - https://code.google.com/archive/p/mintty/issues/56
-	// - https://github.com/docker/docker/issues/15272
-	// - https://mintty.github.io/ (compatibility)
-	// Linux will hit this if you attempt `cat | docker login`, and Windows
-	// will hit this if you attempt docker login from mintty where stdin
-	// is a pipe, not a character based console.
-	if flPassword == "" && !cli.In().IsTerminal() {
-		return authconfig, fmt.Errorf("Error: Cannot perform an interactive login from a non TTY device")
-	}
-
-	authconfig.Username = strings.TrimSpace(authconfig.Username)
-
-	if flUser = strings.TrimSpace(flUser); flUser == "" {
-		if isDefaultRegistry {
-			// if this is a default registry (docker hub), then display the following message.
-			fmt.Fprintln(cli.Out(), "Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.")
-		}
-		promptWithDefault(cli.Out(), "Username", authconfig.Username)
-		flUser = readInput(cli.In(), cli.Out())
-		flUser = strings.TrimSpace(flUser)
-		if flUser == "" {
-			flUser = authconfig.Username
-		}
-	}
-	if flUser == "" {
-		return authconfig, fmt.Errorf("Error: Non-null Username Required")
-	}
-	if flPassword == "" {
-		oldState, err := term.SaveState(cli.In().FD())
-		if err != nil {
-			return authconfig, err
-		}
-		fmt.Fprintf(cli.Out(), "Password: ")
-		term.DisableEcho(cli.In().FD(), oldState)
-
-		flPassword = readInput(cli.In(), cli.Out())
-		fmt.Fprint(cli.Out(), "\n")
-
-		term.RestoreTerminal(cli.In().FD(), oldState)
-		if flPassword == "" {
-			return authconfig, fmt.Errorf("Error: Password Required")
-		}
-	}
-
-	authconfig.Username = flUser
-	authconfig.Password = flPassword
-	authconfig.ServerAddress = serverAddress
-	authconfig.IdentityToken = ""
-
-	return authconfig, nil
-}
-
-func readInput(in io.Reader, out io.Writer) string {
-	reader := bufio.NewReader(in)
-	line, _, err := reader.ReadLine()
-	if err != nil {
-		fmt.Fprintln(out, err.Error())
-		os.Exit(1)
-	}
-	return string(line)
-}
-
-func promptWithDefault(out io.Writer, prompt string, configDefault string) {
-	if configDefault == "" {
-		fmt.Fprintf(out, "%s: ", prompt)
-	} else {
-		fmt.Fprintf(out, "%s (%s): ", prompt, configDefault)
-	}
-}
-
-// RetrieveAuthTokenFromImage retrieves an encoded auth token given a complete image
-func RetrieveAuthTokenFromImage(ctx context.Context, cli *DockerCli, image string) (string, error) {
-	// Retrieve encoded auth token from the image reference
-	authConfig, err := resolveAuthConfigFromImage(ctx, cli, image)
-	if err != nil {
-		return "", err
-	}
-	encodedAuth, err := EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return "", err
-	}
-	return encodedAuth, nil
-}
-
-// resolveAuthConfigFromImage retrieves that AuthConfig using the image string
-func resolveAuthConfigFromImage(ctx context.Context, cli *DockerCli, image string) (types.AuthConfig, error) {
-	registryRef, err := reference.ParseNamed(image)
-	if err != nil {
-		return types.AuthConfig{}, err
-	}
-	repoInfo, err := registry.ParseRepositoryInfo(registryRef)
-	if err != nil {
-		return types.AuthConfig{}, err
-	}
-	return ResolveAuthConfig(ctx, cli, repoInfo.Index), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/registry/login.go b/installer/vendor/github.com/docker/docker/cli/command/registry/login.go
deleted file mode 100644
index 05b3bb03b2..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/registry/login.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package registry
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type loginOptions struct {
-	serverAddress string
-	user          string
-	password      string
-	email         string
-}
-
-// NewLoginCommand creates a new `docker login` command
-func NewLoginCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts loginOptions
-
-	cmd := &cobra.Command{
-		Use:   "login [OPTIONS] [SERVER]",
-		Short: "Log in to a Docker registry",
-		Long:  "Log in to a Docker registry.\nIf no server is specified, the default is defined by the daemon.",
-		Args:  cli.RequiresMaxArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) > 0 {
-				opts.serverAddress = args[0]
-			}
-			return runLogin(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.user, "username", "u", "", "Username")
-	flags.StringVarP(&opts.password, "password", "p", "", "Password")
-
-	// Deprecated in 1.11: Should be removed in docker 1.14
-	flags.StringVarP(&opts.email, "email", "e", "", "Email")
-	flags.MarkDeprecated("email", "will be removed in 1.14.")
-
-	return cmd
-}
-
-func runLogin(dockerCli *command.DockerCli, opts loginOptions) error {
-	ctx := context.Background()
-	clnt := dockerCli.Client()
-
-	var (
-		serverAddress string
-		authServer    = command.ElectAuthServer(ctx, dockerCli)
-	)
-	if opts.serverAddress != "" {
-		serverAddress = opts.serverAddress
-	} else {
-		serverAddress = authServer
-	}
-
-	isDefaultRegistry := serverAddress == authServer
-
-	authConfig, err := command.ConfigureAuth(dockerCli, opts.user, opts.password, serverAddress, isDefaultRegistry)
-	if err != nil {
-		return err
-	}
-	response, err := clnt.RegistryLogin(ctx, authConfig)
-	if err != nil {
-		return err
-	}
-	if response.IdentityToken != "" {
-		authConfig.Password = ""
-		authConfig.IdentityToken = response.IdentityToken
-	}
-	if err := dockerCli.CredentialsStore(serverAddress).Store(authConfig); err != nil {
-		return fmt.Errorf("Error saving credentials: %v", err)
-	}
-
-	if response.Status != "" {
-		fmt.Fprintln(dockerCli.Out(), response.Status)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/registry/logout.go b/installer/vendor/github.com/docker/docker/cli/command/registry/logout.go
deleted file mode 100644
index 877e60e8cc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/registry/logout.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package registry
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-)
-
-// NewLogoutCommand creates a new `docker login` command
-func NewLogoutCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "logout [SERVER]",
-		Short: "Log out from a Docker registry",
-		Long:  "Log out from a Docker registry.\nIf no server is specified, the default is defined by the daemon.",
-		Args:  cli.RequiresMaxArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			var serverAddress string
-			if len(args) > 0 {
-				serverAddress = args[0]
-			}
-			return runLogout(dockerCli, serverAddress)
-		},
-	}
-
-	return cmd
-}
-
-func runLogout(dockerCli *command.DockerCli, serverAddress string) error {
-	ctx := context.Background()
-	var isDefaultRegistry bool
-
-	if serverAddress == "" {
-		serverAddress = command.ElectAuthServer(ctx, dockerCli)
-		isDefaultRegistry = true
-	}
-
-	var (
-		loggedIn        bool
-		regsToLogout    []string
-		hostnameAddress = serverAddress
-		regsToTry       = []string{serverAddress}
-	)
-	if !isDefaultRegistry {
-		hostnameAddress = registry.ConvertToHostname(serverAddress)
-		// the tries below are kept for backward compatibility where a user could have
-		// saved the registry in one of the following format.
-		regsToTry = append(regsToTry, hostnameAddress, "http://"+hostnameAddress, "https://"+hostnameAddress)
-	}
-
-	// check if we're logged in based on the records in the config file
-	// which means it couldn't have user/pass cause they may be in the creds store
-	for _, s := range regsToTry {
-		if _, ok := dockerCli.ConfigFile().AuthConfigs[s]; ok {
-			loggedIn = true
-			regsToLogout = append(regsToLogout, s)
-		}
-	}
-
-	if !loggedIn {
-		fmt.Fprintf(dockerCli.Out(), "Not logged in to %s\n", hostnameAddress)
-		return nil
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "Removing login credentials for %s\n", hostnameAddress)
-	for _, r := range regsToLogout {
-		if err := dockerCli.CredentialsStore(r).Erase(r); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "WARNING: could not erase credentials: %v\n", err)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/registry/search.go b/installer/vendor/github.com/docker/docker/cli/command/registry/search.go
deleted file mode 100644
index 124b4ae6cc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/registry/search.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package registry
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-	"text/tabwriter"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/registry"
-	"github.com/spf13/cobra"
-)
-
-type searchOptions struct {
-	term    string
-	noTrunc bool
-	limit   int
-	filter  opts.FilterOpt
-
-	// Deprecated
-	stars     uint
-	automated bool
-}
-
-// NewSearchCommand creates a new `docker search` command
-func NewSearchCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := searchOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "search [OPTIONS] TERM",
-		Short: "Search the Docker Hub for images",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.term = args[0]
-			return runSearch(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Don't truncate output")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-	flags.IntVar(&opts.limit, "limit", registry.DefaultSearchLimit, "Max number of search results")
-
-	flags.BoolVar(&opts.automated, "automated", false, "Only show automated builds")
-	flags.UintVarP(&opts.stars, "stars", "s", 0, "Only displays with at least x stars")
-
-	flags.MarkDeprecated("automated", "use --filter=automated=true instead")
-	flags.MarkDeprecated("stars", "use --filter=stars=3 instead")
-
-	return cmd
-}
-
-func runSearch(dockerCli *command.DockerCli, opts searchOptions) error {
-	indexInfo, err := registry.ParseSearchIndexInfo(opts.term)
-	if err != nil {
-		return err
-	}
-
-	ctx := context.Background()
-
-	authConfig := command.ResolveAuthConfig(ctx, dockerCli, indexInfo)
-	requestPrivilege := command.RegistryAuthenticationPrivilegedFunc(dockerCli, indexInfo, "search")
-
-	encodedAuth, err := command.EncodeAuthToBase64(authConfig)
-	if err != nil {
-		return err
-	}
-
-	options := types.ImageSearchOptions{
-		RegistryAuth:  encodedAuth,
-		PrivilegeFunc: requestPrivilege,
-		Filters:       opts.filter.Value(),
-		Limit:         opts.limit,
-	}
-
-	clnt := dockerCli.Client()
-
-	unorderedResults, err := clnt.ImageSearch(ctx, opts.term, options)
-	if err != nil {
-		return err
-	}
-
-	results := searchResultsByStars(unorderedResults)
-	sort.Sort(results)
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 10, 1, 3, ' ', 0)
-	fmt.Fprintf(w, "NAME\tDESCRIPTION\tSTARS\tOFFICIAL\tAUTOMATED\n")
-	for _, res := range results {
-		// --automated and -s, --stars are deprecated since Docker 1.12
-		if (opts.automated && !res.IsAutomated) || (int(opts.stars) > res.StarCount) {
-			continue
-		}
-		desc := strings.Replace(res.Description, "\n", " ", -1)
-		desc = strings.Replace(desc, "\r", " ", -1)
-		if !opts.noTrunc {
-			desc = stringutils.Ellipsis(desc, 45)
-		}
-		fmt.Fprintf(w, "%s\t%s\t%d\t", res.Name, desc, res.StarCount)
-		if res.IsOfficial {
-			fmt.Fprint(w, "[OK]")
-
-		}
-		fmt.Fprint(w, "\t")
-		if res.IsAutomated {
-			fmt.Fprint(w, "[OK]")
-		}
-		fmt.Fprint(w, "\n")
-	}
-	w.Flush()
-	return nil
-}
-
-// SearchResultsByStars sorts search results in descending order by number of stars.
-type searchResultsByStars []registrytypes.SearchResult
-
-func (r searchResultsByStars) Len() int           { return len(r) }
-func (r searchResultsByStars) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-func (r searchResultsByStars) Less(i, j int) bool { return r[j].StarCount < r[i].StarCount }
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/secret/cmd.go
deleted file mode 100644
index 79e669858c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/cmd.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package secret
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewSecretCommand returns a cobra command for `secret` subcommands
-func NewSecretCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "secret",
-		Short: "Manage Docker secrets",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newSecretListCommand(dockerCli),
-		newSecretCreateCommand(dockerCli),
-		newSecretInspectCommand(dockerCli),
-		newSecretRemoveCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/create.go b/installer/vendor/github.com/docker/docker/cli/command/secret/create.go
deleted file mode 100644
index f4683a60f5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/create.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package secret
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/system"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type createOptions struct {
-	name   string
-	file   string
-	labels opts.ListOpts
-}
-
-func newSecretCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	createOpts := createOptions{
-		labels: opts.NewListOpts(runconfigopts.ValidateEnv),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] SECRET file|-",
-		Short: "Create a secret from a file or STDIN as content",
-		Args:  cli.ExactArgs(2),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			createOpts.name = args[0]
-			createOpts.file = args[1]
-			return runSecretCreate(dockerCli, createOpts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.VarP(&createOpts.labels, "label", "l", "Secret labels")
-
-	return cmd
-}
-
-func runSecretCreate(dockerCli *command.DockerCli, options createOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	var in io.Reader = dockerCli.In()
-	if options.file != "-" {
-		file, err := system.OpenSequential(options.file)
-		if err != nil {
-			return err
-		}
-		in = file
-		defer file.Close()
-	}
-
-	secretData, err := ioutil.ReadAll(in)
-	if err != nil {
-		return fmt.Errorf("Error reading content from %q: %v", options.file, err)
-	}
-
-	spec := swarm.SecretSpec{
-		Annotations: swarm.Annotations{
-			Name:   options.name,
-			Labels: runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
-		},
-		Data: secretData,
-	}
-
-	r, err := client.SecretCreate(ctx, spec)
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintln(dockerCli.Out(), r.ID)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/secret/inspect.go
deleted file mode 100644
index 0a8bd4a23f..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/inspect.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package secret
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type inspectOptions struct {
-	names  []string
-	format string
-}
-
-func newSecretInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := inspectOptions{}
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] SECRET [SECRET...]",
-		Short: "Display detailed information on one or more secrets",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.names = args
-			return runSecretInspect(dockerCli, opts)
-		},
-	}
-
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	return cmd
-}
-
-func runSecretInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	ids, err := getCliRequestedSecretIDs(ctx, client, opts.names)
-	if err != nil {
-		return err
-	}
-	getRef := func(id string) (interface{}, []byte, error) {
-		return client.SecretInspectWithRaw(ctx, id)
-	}
-
-	return inspect.Inspect(dockerCli.Out(), ids, opts.format, getRef)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/ls.go b/installer/vendor/github.com/docker/docker/cli/command/secret/ls.go
deleted file mode 100644
index faeab314b7..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/ls.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package secret
-
-import (
-	"fmt"
-	"text/tabwriter"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type listOptions struct {
-	quiet bool
-}
-
-func newSecretListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{}
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Aliases: []string{"list"},
-		Short:   "List secrets",
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runSecretList(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display IDs")
-
-	return cmd
-}
-
-func runSecretList(dockerCli *command.DockerCli, opts listOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	secrets, err := client.SecretList(ctx, types.SecretListOptions{})
-	if err != nil {
-		return err
-	}
-
-	w := tabwriter.NewWriter(dockerCli.Out(), 20, 1, 3, ' ', 0)
-	if opts.quiet {
-		for _, s := range secrets {
-			fmt.Fprintf(w, "%s\n", s.ID)
-		}
-	} else {
-		fmt.Fprintf(w, "ID\tNAME\tCREATED\tUPDATED")
-		fmt.Fprintf(w, "\n")
-
-		for _, s := range secrets {
-			created := units.HumanDuration(time.Now().UTC().Sub(s.Meta.CreatedAt)) + " ago"
-			updated := units.HumanDuration(time.Now().UTC().Sub(s.Meta.UpdatedAt)) + " ago"
-
-			fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", s.ID, s.Spec.Annotations.Name, created, updated)
-		}
-	}
-
-	w.Flush()
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/remove.go b/installer/vendor/github.com/docker/docker/cli/command/secret/remove.go
deleted file mode 100644
index f45a619f6a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/remove.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package secret
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type removeOptions struct {
-	names []string
-}
-
-func newSecretRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{
-		Use:     "rm SECRET [SECRET...]",
-		Aliases: []string{"remove"},
-		Short:   "Remove one or more secrets",
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts := removeOptions{
-				names: args,
-			}
-			return runSecretRemove(dockerCli, opts)
-		},
-	}
-}
-
-func runSecretRemove(dockerCli *command.DockerCli, opts removeOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	ids, err := getCliRequestedSecretIDs(ctx, client, opts.names)
-	if err != nil {
-		return err
-	}
-
-	var errs []string
-
-	for _, id := range ids {
-		if err := client.SecretRemove(ctx, id); err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		fmt.Fprintln(dockerCli.Out(), id)
-	}
-
-	if len(errs) > 0 {
-		return fmt.Errorf("%s", strings.Join(errs, "\n"))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/secret/utils.go b/installer/vendor/github.com/docker/docker/cli/command/secret/utils.go
deleted file mode 100644
index 11d31ffd16..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/secret/utils.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package secret
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
-	"golang.org/x/net/context"
-)
-
-// GetSecretsByNameOrIDPrefixes returns secrets given a list of ids or names
-func GetSecretsByNameOrIDPrefixes(ctx context.Context, client client.APIClient, terms []string) ([]swarm.Secret, error) {
-	args := filters.NewArgs()
-	for _, n := range terms {
-		args.Add("names", n)
-		args.Add("id", n)
-	}
-
-	return client.SecretList(ctx, types.SecretListOptions{
-		Filters: args,
-	})
-}
-
-func getCliRequestedSecretIDs(ctx context.Context, client client.APIClient, terms []string) ([]string, error) {
-	secrets, err := GetSecretsByNameOrIDPrefixes(ctx, client, terms)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(secrets) > 0 {
-		found := make(map[string]struct{})
-	next:
-		for _, term := range terms {
-			// attempt to lookup secret by full ID
-			for _, s := range secrets {
-				if s.ID == term {
-					found[s.ID] = struct{}{}
-					continue next
-				}
-			}
-			// attempt to lookup secret by full name
-			for _, s := range secrets {
-				if s.Spec.Annotations.Name == term {
-					found[s.ID] = struct{}{}
-					continue next
-				}
-			}
-			// attempt to lookup secret by partial ID (prefix)
-			// return error if more than one matches found (ambiguous)
-			n := 0
-			for _, s := range secrets {
-				if strings.HasPrefix(s.ID, term) {
-					found[s.ID] = struct{}{}
-					n++
-				}
-			}
-			if n > 1 {
-				return nil, fmt.Errorf("secret %s is ambiguous (%d matches found)", term, n)
-			}
-		}
-
-		// We already collected all the IDs found.
-		// Now we will remove duplicates by converting the map to slice
-		ids := []string{}
-		for id := range found {
-			ids = append(ids, id)
-		}
-
-		return ids, nil
-	}
-
-	return terms, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/service/cmd.go
deleted file mode 100644
index 796fe926c3..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/cmd.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package service
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewServiceCommand returns a cobra command for `service` subcommands
-func NewServiceCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "service",
-		Short: "Manage services",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newCreateCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newPsCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newScaleCommand(dockerCli),
-		newUpdateCommand(dockerCli),
-		newLogsCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/create.go b/installer/vendor/github.com/docker/docker/cli/command/service/create.go
deleted file mode 100644
index 1355c19c65..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/create.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := newServiceOptions()
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] IMAGE [COMMAND] [ARG...]",
-		Short: "Create a new service",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.image = args[0]
-			if len(args) > 1 {
-				opts.args = args[1:]
-			}
-			return runCreate(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.StringVar(&opts.mode, flagMode, "replicated", "Service mode (replicated or global)")
-	flags.StringVar(&opts.name, flagName, "", "Service name")
-
-	addServiceFlags(cmd, opts)
-
-	flags.VarP(&opts.labels, flagLabel, "l", "Service labels")
-	flags.Var(&opts.containerLabels, flagContainerLabel, "Container labels")
-	flags.VarP(&opts.env, flagEnv, "e", "Set environment variables")
-	flags.Var(&opts.envFile, flagEnvFile, "Read in a file of environment variables")
-	flags.Var(&opts.mounts, flagMount, "Attach a filesystem mount to the service")
-	flags.Var(&opts.constraints, flagConstraint, "Placement constraints")
-	flags.Var(&opts.networks, flagNetwork, "Network attachments")
-	flags.Var(&opts.secrets, flagSecret, "Specify secrets to expose to the service")
-	flags.VarP(&opts.endpoint.publishPorts, flagPublish, "p", "Publish a port as a node port")
-	flags.Var(&opts.groups, flagGroup, "Set one or more supplementary user groups for the container")
-	flags.Var(&opts.dns, flagDNS, "Set custom DNS servers")
-	flags.Var(&opts.dnsOption, flagDNSOption, "Set DNS options")
-	flags.Var(&opts.dnsSearch, flagDNSSearch, "Set custom DNS search domains")
-	flags.Var(&opts.hosts, flagHost, "Set one or more custom host-to-IP mappings (host:ip)")
-
-	flags.SetInterspersed(false)
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, opts *serviceOptions) error {
-	apiClient := dockerCli.Client()
-	createOpts := types.ServiceCreateOptions{}
-
-	service, err := opts.ToService()
-	if err != nil {
-		return err
-	}
-
-	specifiedSecrets := opts.secrets.Value()
-	if len(specifiedSecrets) > 0 {
-		// parse and validate secrets
-		secrets, err := ParseSecrets(apiClient, specifiedSecrets)
-		if err != nil {
-			return err
-		}
-		service.TaskTemplate.ContainerSpec.Secrets = secrets
-
-	}
-
-	ctx := context.Background()
-
-	if err := resolveServiceImageDigest(dockerCli, &service); err != nil {
-		return err
-	}
-
-	// only send auth if flag was set
-	if opts.registryAuth {
-		// Retrieve encoded auth token from the image reference
-		encodedAuth, err := command.RetrieveAuthTokenFromImage(ctx, dockerCli, opts.image)
-		if err != nil {
-			return err
-		}
-		createOpts.EncodedRegistryAuth = encodedAuth
-	}
-
-	response, err := apiClient.ServiceCreate(ctx, service, createOpts)
-	if err != nil {
-		return err
-	}
-
-	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "%s\n", response.ID)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/service/inspect.go
deleted file mode 100644
index deb701bf6d..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/inspect.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	apiclient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	refs   []string
-	format string
-	pretty bool
-}
-
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] SERVICE [SERVICE...]",
-		Short: "Display detailed information on one or more services",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.refs = args
-
-			if opts.pretty && len(opts.format) > 0 {
-				return fmt.Errorf("--format is incompatible with human friendly format")
-			}
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	flags.BoolVar(&opts.pretty, "pretty", false, "Print the information in a human friendly format.")
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	if opts.pretty {
-		opts.format = "pretty"
-	}
-
-	getRef := func(ref string) (interface{}, []byte, error) {
-		service, _, err := client.ServiceInspectWithRaw(ctx, ref)
-		if err == nil || !apiclient.IsErrServiceNotFound(err) {
-			return service, nil, err
-		}
-		return nil, nil, fmt.Errorf("Error: no such service: %s", ref)
-	}
-
-	f := opts.format
-	if len(f) == 0 {
-		f = "raw"
-		if len(dockerCli.ConfigFile().ServiceInspectFormat) > 0 {
-			f = dockerCli.ConfigFile().ServiceInspectFormat
-		}
-	}
-
-	// check if the user is trying to apply a template to the pretty format, which
-	// is not supported
-	if strings.HasPrefix(f, "pretty") && f != "pretty" {
-		return fmt.Errorf("Cannot supply extra formatting options to the pretty template")
-	}
-
-	serviceCtx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.NewServiceFormat(f),
-	}
-
-	if err := formatter.ServiceInspectWrite(serviceCtx, opts.refs, getRef); err != nil {
-		return cli.StatusError{StatusCode: 1, Status: err.Error()}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/inspect_test.go b/installer/vendor/github.com/docker/docker/cli/command/service/inspect_test.go
deleted file mode 100644
index 04a65080c7..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/inspect_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package service
-
-import (
-	"bytes"
-	"encoding/json"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func formatServiceInspect(t *testing.T, format formatter.Format, now time.Time) string {
-	b := new(bytes.Buffer)
-
-	endpointSpec := &swarm.EndpointSpec{
-		Mode: "vip",
-		Ports: []swarm.PortConfig{
-			{
-				Protocol:   swarm.PortConfigProtocolTCP,
-				TargetPort: 5000,
-			},
-		},
-	}
-
-	two := uint64(2)
-
-	s := swarm.Service{
-		ID: "de179gar9d0o7ltdybungplod",
-		Meta: swarm.Meta{
-			Version:   swarm.Version{Index: 315},
-			CreatedAt: now,
-			UpdatedAt: now,
-		},
-		Spec: swarm.ServiceSpec{
-			Annotations: swarm.Annotations{
-				Name:   "my_service",
-				Labels: map[string]string{"com.label": "foo"},
-			},
-			TaskTemplate: swarm.TaskSpec{
-				ContainerSpec: swarm.ContainerSpec{
-					Image: "foo/bar@sha256:this_is_a_test",
-				},
-			},
-			Mode: swarm.ServiceMode{
-				Replicated: &swarm.ReplicatedService{
-					Replicas: &two,
-				},
-			},
-			UpdateConfig: nil,
-			Networks: []swarm.NetworkAttachmentConfig{
-				{
-					Target:  "5vpyomhb6ievnk0i0o60gcnei",
-					Aliases: []string{"web"},
-				},
-			},
-			EndpointSpec: endpointSpec,
-		},
-		Endpoint: swarm.Endpoint{
-			Spec: *endpointSpec,
-			Ports: []swarm.PortConfig{
-				{
-					Protocol:      swarm.PortConfigProtocolTCP,
-					TargetPort:    5000,
-					PublishedPort: 30000,
-				},
-			},
-			VirtualIPs: []swarm.EndpointVirtualIP{
-				{
-					NetworkID: "6o4107cj2jx9tihgb0jyts6pj",
-					Addr:      "10.255.0.4/16",
-				},
-			},
-		},
-		UpdateStatus: swarm.UpdateStatus{
-			StartedAt:   now,
-			CompletedAt: now,
-		},
-	}
-
-	ctx := formatter.Context{
-		Output: b,
-		Format: format,
-	}
-
-	err := formatter.ServiceInspectWrite(ctx, []string{"de179gar9d0o7ltdybungplod"}, func(ref string) (interface{}, []byte, error) {
-		return s, nil, nil
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	return b.String()
-}
-
-func TestPrettyPrintWithNoUpdateConfig(t *testing.T) {
-	s := formatServiceInspect(t, formatter.NewServiceFormat("pretty"), time.Now())
-	if strings.Contains(s, "UpdateStatus") {
-		t.Fatal("Pretty print failed before parsing UpdateStatus")
-	}
-}
-
-func TestJSONFormatWithNoUpdateConfig(t *testing.T) {
-	now := time.Now()
-	// s1: [{"ID":..}]
-	// s2: {"ID":..}
-	s1 := formatServiceInspect(t, formatter.NewServiceFormat(""), now)
-	t.Log("// s1")
-	t.Logf("%s", s1)
-	s2 := formatServiceInspect(t, formatter.NewServiceFormat("{{json .}}"), now)
-	t.Log("// s2")
-	t.Logf("%s", s2)
-	var m1Wrap []map[string]interface{}
-	if err := json.Unmarshal([]byte(s1), &m1Wrap); err != nil {
-		t.Fatal(err)
-	}
-	if len(m1Wrap) != 1 {
-		t.Fatalf("strange s1=%s", s1)
-	}
-	m1 := m1Wrap[0]
-	t.Logf("m1=%+v", m1)
-	var m2 map[string]interface{}
-	if err := json.Unmarshal([]byte(s2), &m2); err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("m2=%+v", m2)
-	assert.DeepEqual(t, m2, m1)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/list.go b/installer/vendor/github.com/docker/docker/cli/command/service/list.go
deleted file mode 100644
index 724126079c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/list.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-const (
-	listItemFmt = "%s\t%s\t%s\t%s\t%s\n"
-)
-
-type listOptions struct {
-	quiet  bool
-	filter opts.FilterOpt
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Aliases: []string{"list"},
-		Short:   "List services",
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display IDs")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	ctx := context.Background()
-	client := dockerCli.Client()
-	out := dockerCli.Out()
-
-	services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: opts.filter.Value()})
-	if err != nil {
-		return err
-	}
-
-	if len(services) > 0 && !opts.quiet {
-		// only non-empty services and not quiet, should we call TaskList and NodeList api
-		taskFilter := filters.NewArgs()
-		for _, service := range services {
-			taskFilter.Add("service", service.ID)
-		}
-
-		tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: taskFilter})
-		if err != nil {
-			return err
-		}
-
-		nodes, err := client.NodeList(ctx, types.NodeListOptions{})
-		if err != nil {
-			return err
-		}
-
-		PrintNotQuiet(out, services, nodes, tasks)
-	} else if !opts.quiet {
-		// no services and not quiet, print only one line with columns ID, NAME, MODE, REPLICAS...
-		PrintNotQuiet(out, services, []swarm.Node{}, []swarm.Task{})
-	} else {
-		PrintQuiet(out, services)
-	}
-
-	return nil
-}
-
-// PrintNotQuiet shows service list in a non-quiet way.
-// Besides this, command `docker stack services xxx` will call this, too.
-func PrintNotQuiet(out io.Writer, services []swarm.Service, nodes []swarm.Node, tasks []swarm.Task) {
-	activeNodes := make(map[string]struct{})
-	for _, n := range nodes {
-		if n.Status.State != swarm.NodeStateDown {
-			activeNodes[n.ID] = struct{}{}
-		}
-	}
-
-	running := map[string]int{}
-	tasksNoShutdown := map[string]int{}
-
-	for _, task := range tasks {
-		if task.DesiredState != swarm.TaskStateShutdown {
-			tasksNoShutdown[task.ServiceID]++
-		}
-
-		if _, nodeActive := activeNodes[task.NodeID]; nodeActive && task.Status.State == swarm.TaskStateRunning {
-			running[task.ServiceID]++
-		}
-	}
-
-	printTable(out, services, running, tasksNoShutdown)
-}
-
-func printTable(out io.Writer, services []swarm.Service, running, tasksNoShutdown map[string]int) {
-	writer := tabwriter.NewWriter(out, 0, 4, 2, ' ', 0)
-
-	// Ignore flushing errors
-	defer writer.Flush()
-
-	fmt.Fprintf(writer, listItemFmt, "ID", "NAME", "MODE", "REPLICAS", "IMAGE")
-
-	for _, service := range services {
-		mode := ""
-		replicas := ""
-		if service.Spec.Mode.Replicated != nil && service.Spec.Mode.Replicated.Replicas != nil {
-			mode = "replicated"
-			replicas = fmt.Sprintf("%d/%d", running[service.ID], *service.Spec.Mode.Replicated.Replicas)
-		} else if service.Spec.Mode.Global != nil {
-			mode = "global"
-			replicas = fmt.Sprintf("%d/%d", running[service.ID], tasksNoShutdown[service.ID])
-		}
-		image := service.Spec.TaskTemplate.ContainerSpec.Image
-		ref, err := distreference.ParseNamed(image)
-		if err == nil {
-			// update image string for display
-			namedTagged, ok := ref.(distreference.NamedTagged)
-			if ok {
-				image = namedTagged.Name() + ":" + namedTagged.Tag()
-			}
-		}
-
-		fmt.Fprintf(
-			writer,
-			listItemFmt,
-			stringid.TruncateID(service.ID),
-			service.Spec.Name,
-			mode,
-			replicas,
-			image)
-	}
-}
-
-// PrintQuiet shows service list in a quiet way.
-// Besides this, command `docker stack services xxx` will call this, too.
-func PrintQuiet(out io.Writer, services []swarm.Service) {
-	for _, service := range services {
-		fmt.Fprintln(out, service.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/logs.go b/installer/vendor/github.com/docker/docker/cli/command/service/logs.go
deleted file mode 100644
index 19d3d9a488..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/logs.go
+++ /dev/null
@@ -1,163 +0,0 @@
-package service
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/spf13/cobra"
-)
-
-type logsOptions struct {
-	noResolve  bool
-	follow     bool
-	since      string
-	timestamps bool
-	details    bool
-	tail       string
-
-	service string
-}
-
-func newLogsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts logsOptions
-
-	cmd := &cobra.Command{
-		Use:   "logs [OPTIONS] SERVICE",
-		Short: "Fetch the logs of a service",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.service = args[0]
-			return runLogs(dockerCli, &opts)
-		},
-		Tags: map[string]string{"experimental": ""},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
-	flags.BoolVarP(&opts.follow, "follow", "f", false, "Follow log output")
-	flags.StringVar(&opts.since, "since", "", "Show logs since timestamp")
-	flags.BoolVarP(&opts.timestamps, "timestamps", "t", false, "Show timestamps")
-	flags.BoolVar(&opts.details, "details", false, "Show extra details provided to logs")
-	flags.StringVar(&opts.tail, "tail", "all", "Number of lines to show from the end of the logs")
-	return cmd
-}
-
-func runLogs(dockerCli *command.DockerCli, opts *logsOptions) error {
-	ctx := context.Background()
-
-	options := types.ContainerLogsOptions{
-		ShowStdout: true,
-		ShowStderr: true,
-		Since:      opts.since,
-		Timestamps: opts.timestamps,
-		Follow:     opts.follow,
-		Tail:       opts.tail,
-		Details:    opts.details,
-	}
-
-	client := dockerCli.Client()
-	responseBody, err := client.ServiceLogs(ctx, opts.service, options)
-	if err != nil {
-		return err
-	}
-	defer responseBody.Close()
-
-	resolver := idresolver.New(client, opts.noResolve)
-
-	stdout := &logWriter{ctx: ctx, opts: opts, r: resolver, w: dockerCli.Out()}
-	stderr := &logWriter{ctx: ctx, opts: opts, r: resolver, w: dockerCli.Err()}
-
-	// TODO(aluzzardi): Do an io.Copy for services with TTY enabled.
-	_, err = stdcopy.StdCopy(stdout, stderr, responseBody)
-	return err
-}
-
-type logWriter struct {
-	ctx  context.Context
-	opts *logsOptions
-	r    *idresolver.IDResolver
-	w    io.Writer
-}
-
-func (lw *logWriter) Write(buf []byte) (int, error) {
-	contextIndex := 0
-	numParts := 2
-	if lw.opts.timestamps {
-		contextIndex++
-		numParts++
-	}
-
-	parts := bytes.SplitN(buf, []byte(" "), numParts)
-	if len(parts) != numParts {
-		return 0, fmt.Errorf("invalid context in log message: %v", string(buf))
-	}
-
-	taskName, nodeName, err := lw.parseContext(string(parts[contextIndex]))
-	if err != nil {
-		return 0, err
-	}
-
-	output := []byte{}
-	for i, part := range parts {
-		// First part doesn't get space separation.
-		if i > 0 {
-			output = append(output, []byte(" ")...)
-		}
-
-		if i == contextIndex {
-			// TODO(aluzzardi): Consider constant padding.
-			output = append(output, []byte(fmt.Sprintf("%s@%s    |", taskName, nodeName))...)
-		} else {
-			output = append(output, part...)
-		}
-	}
-	_, err = lw.w.Write(output)
-	if err != nil {
-		return 0, err
-	}
-
-	return len(buf), nil
-}
-
-func (lw *logWriter) parseContext(input string) (string, string, error) {
-	context := make(map[string]string)
-
-	components := strings.Split(input, ",")
-	for _, component := range components {
-		parts := strings.SplitN(component, "=", 2)
-		if len(parts) != 2 {
-			return "", "", fmt.Errorf("invalid context: %s", input)
-		}
-		context[parts[0]] = parts[1]
-	}
-
-	taskID, ok := context["com.docker.swarm.task.id"]
-	if !ok {
-		return "", "", fmt.Errorf("missing task id in context: %s", input)
-	}
-	taskName, err := lw.r.Resolve(lw.ctx, swarm.Task{}, taskID)
-	if err != nil {
-		return "", "", err
-	}
-
-	nodeID, ok := context["com.docker.swarm.node.id"]
-	if !ok {
-		return "", "", fmt.Errorf("missing node id in context: %s", input)
-	}
-	nodeName, err := lw.r.Resolve(lw.ctx, swarm.Node{}, nodeID)
-	if err != nil {
-		return "", "", err
-	}
-
-	return taskName, nodeName, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/opts.go b/installer/vendor/github.com/docker/docker/cli/command/service/opts.go
deleted file mode 100644
index cbe544aacc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/opts.go
+++ /dev/null
@@ -1,648 +0,0 @@
-package service
-
-import (
-	"encoding/csv"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-connections/nat"
-	units "github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type int64Value interface {
-	Value() int64
-}
-
-type memBytes int64
-
-func (m *memBytes) String() string {
-	return units.BytesSize(float64(m.Value()))
-}
-
-func (m *memBytes) Set(value string) error {
-	val, err := units.RAMInBytes(value)
-	*m = memBytes(val)
-	return err
-}
-
-func (m *memBytes) Type() string {
-	return "bytes"
-}
-
-func (m *memBytes) Value() int64 {
-	return int64(*m)
-}
-
-// PositiveDurationOpt is an option type for time.Duration that uses a pointer.
-// It bahave similarly to DurationOpt but only allows positive duration values.
-type PositiveDurationOpt struct {
-	DurationOpt
-}
-
-// Set a new value on the option. Setting a negative duration value will cause
-// an error to be returned.
-func (d *PositiveDurationOpt) Set(s string) error {
-	err := d.DurationOpt.Set(s)
-	if err != nil {
-		return err
-	}
-	if *d.DurationOpt.value < 0 {
-		return fmt.Errorf("duration cannot be negative")
-	}
-	return nil
-}
-
-// DurationOpt is an option type for time.Duration that uses a pointer. This
-// allows us to get nil values outside, instead of defaulting to 0
-type DurationOpt struct {
-	value *time.Duration
-}
-
-// Set a new value on the option
-func (d *DurationOpt) Set(s string) error {
-	v, err := time.ParseDuration(s)
-	d.value = &v
-	return err
-}
-
-// Type returns the type of this option, which will be displayed in `--help` output
-func (d *DurationOpt) Type() string {
-	return "duration"
-}
-
-// String returns a string repr of this option
-func (d *DurationOpt) String() string {
-	if d.value != nil {
-		return d.value.String()
-	}
-	return ""
-}
-
-// Value returns the time.Duration
-func (d *DurationOpt) Value() *time.Duration {
-	return d.value
-}
-
-// Uint64Opt represents a uint64.
-type Uint64Opt struct {
-	value *uint64
-}
-
-// Set a new value on the option
-func (i *Uint64Opt) Set(s string) error {
-	v, err := strconv.ParseUint(s, 0, 64)
-	i.value = &v
-	return err
-}
-
-// Type returns the type of this option, which will be displayed in `--help` output
-func (i *Uint64Opt) Type() string {
-	return "uint"
-}
-
-// String returns a string repr of this option
-func (i *Uint64Opt) String() string {
-	if i.value != nil {
-		return fmt.Sprintf("%v", *i.value)
-	}
-	return ""
-}
-
-// Value returns the uint64
-func (i *Uint64Opt) Value() *uint64 {
-	return i.value
-}
-
-type floatValue float32
-
-func (f *floatValue) Set(s string) error {
-	v, err := strconv.ParseFloat(s, 32)
-	*f = floatValue(v)
-	return err
-}
-
-func (f *floatValue) Type() string {
-	return "float"
-}
-
-func (f *floatValue) String() string {
-	return strconv.FormatFloat(float64(*f), 'g', -1, 32)
-}
-
-func (f *floatValue) Value() float32 {
-	return float32(*f)
-}
-
-// SecretRequestSpec is a type for requesting secrets
-type SecretRequestSpec struct {
-	source string
-	target string
-	uid    string
-	gid    string
-	mode   os.FileMode
-}
-
-// SecretOpt is a Value type for parsing secrets
-type SecretOpt struct {
-	values []*SecretRequestSpec
-}
-
-// Set a new secret value
-func (o *SecretOpt) Set(value string) error {
-	csvReader := csv.NewReader(strings.NewReader(value))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return err
-	}
-
-	spec := &SecretRequestSpec{
-		source: "",
-		target: "",
-		uid:    "0",
-		gid:    "0",
-		mode:   0444,
-	}
-
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-		key := strings.ToLower(parts[0])
-
-		if len(parts) != 2 {
-			return fmt.Errorf("invalid field '%s' must be a key=value pair", field)
-		}
-
-		value := parts[1]
-		switch key {
-		case "source", "src":
-			spec.source = value
-		case "target":
-			tDir, _ := filepath.Split(value)
-			if tDir != "" {
-				return fmt.Errorf("target must not have a path")
-			}
-			spec.target = value
-		case "uid":
-			spec.uid = value
-		case "gid":
-			spec.gid = value
-		case "mode":
-			m, err := strconv.ParseUint(value, 0, 32)
-			if err != nil {
-				return fmt.Errorf("invalid mode specified: %v", err)
-			}
-
-			spec.mode = os.FileMode(m)
-		default:
-			return fmt.Errorf("invalid field in secret request: %s", key)
-		}
-	}
-
-	if spec.source == "" {
-		return fmt.Errorf("source is required")
-	}
-
-	o.values = append(o.values, spec)
-	return nil
-}
-
-// Type returns the type of this option
-func (o *SecretOpt) Type() string {
-	return "secret"
-}
-
-// String returns a string repr of this option
-func (o *SecretOpt) String() string {
-	secrets := []string{}
-	for _, secret := range o.values {
-		repr := fmt.Sprintf("%s -> %s", secret.source, secret.target)
-		secrets = append(secrets, repr)
-	}
-	return strings.Join(secrets, ", ")
-}
-
-// Value returns the secret requests
-func (o *SecretOpt) Value() []*SecretRequestSpec {
-	return o.values
-}
-
-type updateOptions struct {
-	parallelism     uint64
-	delay           time.Duration
-	monitor         time.Duration
-	onFailure       string
-	maxFailureRatio floatValue
-}
-
-type resourceOptions struct {
-	limitCPU      opts.NanoCPUs
-	limitMemBytes memBytes
-	resCPU        opts.NanoCPUs
-	resMemBytes   memBytes
-}
-
-func (r *resourceOptions) ToResourceRequirements() *swarm.ResourceRequirements {
-	return &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
-			NanoCPUs:    r.limitCPU.Value(),
-			MemoryBytes: r.limitMemBytes.Value(),
-		},
-		Reservations: &swarm.Resources{
-			NanoCPUs:    r.resCPU.Value(),
-			MemoryBytes: r.resMemBytes.Value(),
-		},
-	}
-}
-
-type restartPolicyOptions struct {
-	condition   string
-	delay       DurationOpt
-	maxAttempts Uint64Opt
-	window      DurationOpt
-}
-
-func (r *restartPolicyOptions) ToRestartPolicy() *swarm.RestartPolicy {
-	return &swarm.RestartPolicy{
-		Condition:   swarm.RestartPolicyCondition(r.condition),
-		Delay:       r.delay.Value(),
-		MaxAttempts: r.maxAttempts.Value(),
-		Window:      r.window.Value(),
-	}
-}
-
-func convertNetworks(networks []string) []swarm.NetworkAttachmentConfig {
-	nets := []swarm.NetworkAttachmentConfig{}
-	for _, network := range networks {
-		nets = append(nets, swarm.NetworkAttachmentConfig{Target: network})
-	}
-	return nets
-}
-
-type endpointOptions struct {
-	mode         string
-	publishPorts opts.PortOpt
-}
-
-func (e *endpointOptions) ToEndpointSpec() *swarm.EndpointSpec {
-	return &swarm.EndpointSpec{
-		Mode:  swarm.ResolutionMode(strings.ToLower(e.mode)),
-		Ports: e.publishPorts.Value(),
-	}
-}
-
-type logDriverOptions struct {
-	name string
-	opts opts.ListOpts
-}
-
-func newLogDriverOptions() logDriverOptions {
-	return logDriverOptions{opts: opts.NewListOpts(runconfigopts.ValidateEnv)}
-}
-
-func (ldo *logDriverOptions) toLogDriver() *swarm.Driver {
-	if ldo.name == "" {
-		return nil
-	}
-
-	// set the log driver only if specified.
-	return &swarm.Driver{
-		Name:    ldo.name,
-		Options: runconfigopts.ConvertKVStringsToMap(ldo.opts.GetAll()),
-	}
-}
-
-type healthCheckOptions struct {
-	cmd           string
-	interval      PositiveDurationOpt
-	timeout       PositiveDurationOpt
-	retries       int
-	noHealthcheck bool
-}
-
-func (opts *healthCheckOptions) toHealthConfig() (*container.HealthConfig, error) {
-	var healthConfig *container.HealthConfig
-	haveHealthSettings := opts.cmd != "" ||
-		opts.interval.Value() != nil ||
-		opts.timeout.Value() != nil ||
-		opts.retries != 0
-	if opts.noHealthcheck {
-		if haveHealthSettings {
-			return nil, fmt.Errorf("--%s conflicts with --health-* options", flagNoHealthcheck)
-		}
-		healthConfig = &container.HealthConfig{Test: []string{"NONE"}}
-	} else if haveHealthSettings {
-		var test []string
-		if opts.cmd != "" {
-			test = []string{"CMD-SHELL", opts.cmd}
-		}
-		var interval, timeout time.Duration
-		if ptr := opts.interval.Value(); ptr != nil {
-			interval = *ptr
-		}
-		if ptr := opts.timeout.Value(); ptr != nil {
-			timeout = *ptr
-		}
-		healthConfig = &container.HealthConfig{
-			Test:     test,
-			Interval: interval,
-			Timeout:  timeout,
-			Retries:  opts.retries,
-		}
-	}
-	return healthConfig, nil
-}
-
-// ValidatePort validates a string is in the expected format for a port definition
-func ValidatePort(value string) (string, error) {
-	portMappings, err := nat.ParsePortSpec(value)
-	for _, portMapping := range portMappings {
-		if portMapping.Binding.HostIP != "" {
-			return "", fmt.Errorf("HostIP is not supported by a service.")
-		}
-	}
-	return value, err
-}
-
-// convertExtraHostsToSwarmHosts converts an array of extra hosts in cli
-//     <host>:<ip>
-// into a swarmkit host format:
-//     IP_address canonical_hostname [aliases...]
-// This assumes input value (<host>:<ip>) has already been validated
-func convertExtraHostsToSwarmHosts(extraHosts []string) []string {
-	hosts := []string{}
-	for _, extraHost := range extraHosts {
-		parts := strings.SplitN(extraHost, ":", 2)
-		hosts = append(hosts, fmt.Sprintf("%s %s", parts[1], parts[0]))
-	}
-	return hosts
-}
-
-type serviceOptions struct {
-	name            string
-	labels          opts.ListOpts
-	containerLabels opts.ListOpts
-	image           string
-	args            []string
-	hostname        string
-	env             opts.ListOpts
-	envFile         opts.ListOpts
-	workdir         string
-	user            string
-	groups          opts.ListOpts
-	tty             bool
-	mounts          opts.MountOpt
-	dns             opts.ListOpts
-	dnsSearch       opts.ListOpts
-	dnsOption       opts.ListOpts
-	hosts           opts.ListOpts
-
-	resources resourceOptions
-	stopGrace DurationOpt
-
-	replicas Uint64Opt
-	mode     string
-
-	restartPolicy restartPolicyOptions
-	constraints   opts.ListOpts
-	update        updateOptions
-	networks      opts.ListOpts
-	endpoint      endpointOptions
-
-	registryAuth bool
-
-	logDriver logDriverOptions
-
-	healthcheck healthCheckOptions
-	secrets     opts.SecretOpt
-}
-
-func newServiceOptions() *serviceOptions {
-	return &serviceOptions{
-		labels:          opts.NewListOpts(runconfigopts.ValidateEnv),
-		constraints:     opts.NewListOpts(nil),
-		containerLabels: opts.NewListOpts(runconfigopts.ValidateEnv),
-		env:             opts.NewListOpts(runconfigopts.ValidateEnv),
-		envFile:         opts.NewListOpts(nil),
-		groups:          opts.NewListOpts(nil),
-		logDriver:       newLogDriverOptions(),
-		dns:             opts.NewListOpts(opts.ValidateIPAddress),
-		dnsOption:       opts.NewListOpts(nil),
-		dnsSearch:       opts.NewListOpts(opts.ValidateDNSSearch),
-		hosts:           opts.NewListOpts(runconfigopts.ValidateExtraHost),
-		networks:        opts.NewListOpts(nil),
-	}
-}
-
-func (opts *serviceOptions) ToService() (swarm.ServiceSpec, error) {
-	var service swarm.ServiceSpec
-
-	envVariables, err := runconfigopts.ReadKVStrings(opts.envFile.GetAll(), opts.env.GetAll())
-	if err != nil {
-		return service, err
-	}
-
-	currentEnv := make([]string, 0, len(envVariables))
-	for _, env := range envVariables { // need to process each var, in order
-		k := strings.SplitN(env, "=", 2)[0]
-		for i, current := range currentEnv { // remove duplicates
-			if current == env {
-				continue // no update required, may hide this behind flag to preserve order of envVariables
-			}
-			if strings.HasPrefix(current, k+"=") {
-				currentEnv = append(currentEnv[:i], currentEnv[i+1:]...)
-			}
-		}
-		currentEnv = append(currentEnv, env)
-	}
-
-	service = swarm.ServiceSpec{
-		Annotations: swarm.Annotations{
-			Name:   opts.name,
-			Labels: runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
-		},
-		TaskTemplate: swarm.TaskSpec{
-			ContainerSpec: swarm.ContainerSpec{
-				Image:    opts.image,
-				Args:     opts.args,
-				Env:      currentEnv,
-				Hostname: opts.hostname,
-				Labels:   runconfigopts.ConvertKVStringsToMap(opts.containerLabels.GetAll()),
-				Dir:      opts.workdir,
-				User:     opts.user,
-				Groups:   opts.groups.GetAll(),
-				TTY:      opts.tty,
-				Mounts:   opts.mounts.Value(),
-				DNSConfig: &swarm.DNSConfig{
-					Nameservers: opts.dns.GetAll(),
-					Search:      opts.dnsSearch.GetAll(),
-					Options:     opts.dnsOption.GetAll(),
-				},
-				Hosts:           convertExtraHostsToSwarmHosts(opts.hosts.GetAll()),
-				StopGracePeriod: opts.stopGrace.Value(),
-				Secrets:         nil,
-			},
-			Networks:      convertNetworks(opts.networks.GetAll()),
-			Resources:     opts.resources.ToResourceRequirements(),
-			RestartPolicy: opts.restartPolicy.ToRestartPolicy(),
-			Placement: &swarm.Placement{
-				Constraints: opts.constraints.GetAll(),
-			},
-			LogDriver: opts.logDriver.toLogDriver(),
-		},
-		Networks: convertNetworks(opts.networks.GetAll()),
-		Mode:     swarm.ServiceMode{},
-		UpdateConfig: &swarm.UpdateConfig{
-			Parallelism:     opts.update.parallelism,
-			Delay:           opts.update.delay,
-			Monitor:         opts.update.monitor,
-			FailureAction:   opts.update.onFailure,
-			MaxFailureRatio: opts.update.maxFailureRatio.Value(),
-		},
-		EndpointSpec: opts.endpoint.ToEndpointSpec(),
-	}
-
-	healthConfig, err := opts.healthcheck.toHealthConfig()
-	if err != nil {
-		return service, err
-	}
-	service.TaskTemplate.ContainerSpec.Healthcheck = healthConfig
-
-	switch opts.mode {
-	case "global":
-		if opts.replicas.Value() != nil {
-			return service, fmt.Errorf("replicas can only be used with replicated mode")
-		}
-
-		service.Mode.Global = &swarm.GlobalService{}
-	case "replicated":
-		service.Mode.Replicated = &swarm.ReplicatedService{
-			Replicas: opts.replicas.Value(),
-		}
-	default:
-		return service, fmt.Errorf("Unknown mode: %s", opts.mode)
-	}
-	return service, nil
-}
-
-// addServiceFlags adds all flags that are common to both `create` and `update`.
-// Any flags that are not common are added separately in the individual command
-func addServiceFlags(cmd *cobra.Command, opts *serviceOptions) {
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.workdir, flagWorkdir, "w", "", "Working directory inside the container")
-	flags.StringVarP(&opts.user, flagUser, "u", "", "Username or UID (format: <name|uid>[:<group|gid>])")
-	flags.StringVar(&opts.hostname, flagHostname, "", "Container hostname")
-
-	flags.Var(&opts.resources.limitCPU, flagLimitCPU, "Limit CPUs")
-	flags.Var(&opts.resources.limitMemBytes, flagLimitMemory, "Limit Memory")
-	flags.Var(&opts.resources.resCPU, flagReserveCPU, "Reserve CPUs")
-	flags.Var(&opts.resources.resMemBytes, flagReserveMemory, "Reserve Memory")
-	flags.Var(&opts.stopGrace, flagStopGracePeriod, "Time to wait before force killing a container (ns|us|ms|s|m|h)")
-
-	flags.Var(&opts.replicas, flagReplicas, "Number of tasks")
-
-	flags.StringVar(&opts.restartPolicy.condition, flagRestartCondition, "", "Restart when condition is met (none, on-failure, or any)")
-	flags.Var(&opts.restartPolicy.delay, flagRestartDelay, "Delay between restart attempts (ns|us|ms|s|m|h)")
-	flags.Var(&opts.restartPolicy.maxAttempts, flagRestartMaxAttempts, "Maximum number of restarts before giving up")
-	flags.Var(&opts.restartPolicy.window, flagRestartWindow, "Window used to evaluate the restart policy (ns|us|ms|s|m|h)")
-
-	flags.Uint64Var(&opts.update.parallelism, flagUpdateParallelism, 1, "Maximum number of tasks updated simultaneously (0 to update all at once)")
-	flags.DurationVar(&opts.update.delay, flagUpdateDelay, time.Duration(0), "Delay between updates (ns|us|ms|s|m|h) (default 0s)")
-	flags.DurationVar(&opts.update.monitor, flagUpdateMonitor, time.Duration(0), "Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)")
-	flags.StringVar(&opts.update.onFailure, flagUpdateFailureAction, "pause", "Action on update failure (pause|continue)")
-	flags.Var(&opts.update.maxFailureRatio, flagUpdateMaxFailureRatio, "Failure rate to tolerate during an update")
-
-	flags.StringVar(&opts.endpoint.mode, flagEndpointMode, "", "Endpoint mode (vip or dnsrr)")
-
-	flags.BoolVar(&opts.registryAuth, flagRegistryAuth, false, "Send registry authentication details to swarm agents")
-
-	flags.StringVar(&opts.logDriver.name, flagLogDriver, "", "Logging driver for service")
-	flags.Var(&opts.logDriver.opts, flagLogOpt, "Logging driver options")
-
-	flags.StringVar(&opts.healthcheck.cmd, flagHealthCmd, "", "Command to run to check health")
-	flags.Var(&opts.healthcheck.interval, flagHealthInterval, "Time between running the check (ns|us|ms|s|m|h)")
-	flags.Var(&opts.healthcheck.timeout, flagHealthTimeout, "Maximum time to allow one check to run (ns|us|ms|s|m|h)")
-	flags.IntVar(&opts.healthcheck.retries, flagHealthRetries, 0, "Consecutive failures needed to report unhealthy")
-	flags.BoolVar(&opts.healthcheck.noHealthcheck, flagNoHealthcheck, false, "Disable any container-specified HEALTHCHECK")
-
-	flags.BoolVarP(&opts.tty, flagTTY, "t", false, "Allocate a pseudo-TTY")
-}
-
-const (
-	flagConstraint            = "constraint"
-	flagConstraintRemove      = "constraint-rm"
-	flagConstraintAdd         = "constraint-add"
-	flagContainerLabel        = "container-label"
-	flagContainerLabelRemove  = "container-label-rm"
-	flagContainerLabelAdd     = "container-label-add"
-	flagDNS                   = "dns"
-	flagDNSRemove             = "dns-rm"
-	flagDNSAdd                = "dns-add"
-	flagDNSOption             = "dns-option"
-	flagDNSOptionRemove       = "dns-option-rm"
-	flagDNSOptionAdd          = "dns-option-add"
-	flagDNSSearch             = "dns-search"
-	flagDNSSearchRemove       = "dns-search-rm"
-	flagDNSSearchAdd          = "dns-search-add"
-	flagEndpointMode          = "endpoint-mode"
-	flagHost                  = "host"
-	flagHostAdd               = "host-add"
-	flagHostRemove            = "host-rm"
-	flagHostname              = "hostname"
-	flagEnv                   = "env"
-	flagEnvFile               = "env-file"
-	flagEnvRemove             = "env-rm"
-	flagEnvAdd                = "env-add"
-	flagGroup                 = "group"
-	flagGroupAdd              = "group-add"
-	flagGroupRemove           = "group-rm"
-	flagLabel                 = "label"
-	flagLabelRemove           = "label-rm"
-	flagLabelAdd              = "label-add"
-	flagLimitCPU              = "limit-cpu"
-	flagLimitMemory           = "limit-memory"
-	flagMode                  = "mode"
-	flagMount                 = "mount"
-	flagMountRemove           = "mount-rm"
-	flagMountAdd              = "mount-add"
-	flagName                  = "name"
-	flagNetwork               = "network"
-	flagPublish               = "publish"
-	flagPublishRemove         = "publish-rm"
-	flagPublishAdd            = "publish-add"
-	flagReplicas              = "replicas"
-	flagReserveCPU            = "reserve-cpu"
-	flagReserveMemory         = "reserve-memory"
-	flagRestartCondition      = "restart-condition"
-	flagRestartDelay          = "restart-delay"
-	flagRestartMaxAttempts    = "restart-max-attempts"
-	flagRestartWindow         = "restart-window"
-	flagStopGracePeriod       = "stop-grace-period"
-	flagTTY                   = "tty"
-	flagUpdateDelay           = "update-delay"
-	flagUpdateFailureAction   = "update-failure-action"
-	flagUpdateMaxFailureRatio = "update-max-failure-ratio"
-	flagUpdateMonitor         = "update-monitor"
-	flagUpdateParallelism     = "update-parallelism"
-	flagUser                  = "user"
-	flagWorkdir               = "workdir"
-	flagRegistryAuth          = "with-registry-auth"
-	flagLogDriver             = "log-driver"
-	flagLogOpt                = "log-opt"
-	flagHealthCmd             = "health-cmd"
-	flagHealthInterval        = "health-interval"
-	flagHealthRetries         = "health-retries"
-	flagHealthTimeout         = "health-timeout"
-	flagNoHealthcheck         = "no-healthcheck"
-	flagSecret                = "secret"
-	flagSecretAdd             = "secret-add"
-	flagSecretRemove          = "secret-rm"
-)
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/opts_test.go b/installer/vendor/github.com/docker/docker/cli/command/service/opts_test.go
deleted file mode 100644
index 78b956ad67..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/opts_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package service
-
-import (
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestMemBytesString(t *testing.T) {
-	var mem memBytes = 1048576
-	assert.Equal(t, mem.String(), "1 MiB")
-}
-
-func TestMemBytesSetAndValue(t *testing.T) {
-	var mem memBytes
-	assert.NilError(t, mem.Set("5kb"))
-	assert.Equal(t, mem.Value(), int64(5120))
-}
-
-func TestNanoCPUsString(t *testing.T) {
-	var cpus opts.NanoCPUs = 6100000000
-	assert.Equal(t, cpus.String(), "6.100")
-}
-
-func TestNanoCPUsSetAndValue(t *testing.T) {
-	var cpus opts.NanoCPUs
-	assert.NilError(t, cpus.Set("0.35"))
-	assert.Equal(t, cpus.Value(), int64(350000000))
-}
-
-func TestDurationOptString(t *testing.T) {
-	dur := time.Duration(300 * 10e8)
-	duration := DurationOpt{value: &dur}
-	assert.Equal(t, duration.String(), "5m0s")
-}
-
-func TestDurationOptSetAndValue(t *testing.T) {
-	var duration DurationOpt
-	assert.NilError(t, duration.Set("300s"))
-	assert.Equal(t, *duration.Value(), time.Duration(300*10e8))
-	assert.NilError(t, duration.Set("-300s"))
-	assert.Equal(t, *duration.Value(), time.Duration(-300*10e8))
-}
-
-func TestPositiveDurationOptSetAndValue(t *testing.T) {
-	var duration PositiveDurationOpt
-	assert.NilError(t, duration.Set("300s"))
-	assert.Equal(t, *duration.Value(), time.Duration(300*10e8))
-	assert.Error(t, duration.Set("-300s"), "cannot be negative")
-}
-
-func TestUint64OptString(t *testing.T) {
-	value := uint64(2345678)
-	opt := Uint64Opt{value: &value}
-	assert.Equal(t, opt.String(), "2345678")
-
-	opt = Uint64Opt{}
-	assert.Equal(t, opt.String(), "")
-}
-
-func TestUint64OptSetAndValue(t *testing.T) {
-	var opt Uint64Opt
-	assert.NilError(t, opt.Set("14445"))
-	assert.Equal(t, *opt.Value(), uint64(14445))
-}
-
-func TestHealthCheckOptionsToHealthConfig(t *testing.T) {
-	dur := time.Second
-	opt := healthCheckOptions{
-		cmd:      "curl",
-		interval: PositiveDurationOpt{DurationOpt{value: &dur}},
-		timeout:  PositiveDurationOpt{DurationOpt{value: &dur}},
-		retries:  10,
-	}
-	config, err := opt.toHealthConfig()
-	assert.NilError(t, err)
-	assert.Equal(t, reflect.DeepEqual(config, &container.HealthConfig{
-		Test:     []string{"CMD-SHELL", "curl"},
-		Interval: time.Second,
-		Timeout:  time.Second,
-		Retries:  10,
-	}), true)
-}
-
-func TestHealthCheckOptionsToHealthConfigNoHealthcheck(t *testing.T) {
-	opt := healthCheckOptions{
-		noHealthcheck: true,
-	}
-	config, err := opt.toHealthConfig()
-	assert.NilError(t, err)
-	assert.Equal(t, reflect.DeepEqual(config, &container.HealthConfig{
-		Test: []string{"NONE"},
-	}), true)
-}
-
-func TestHealthCheckOptionsToHealthConfigConflict(t *testing.T) {
-	opt := healthCheckOptions{
-		cmd:           "curl",
-		noHealthcheck: true,
-	}
-	_, err := opt.toHealthConfig()
-	assert.Error(t, err, "--no-healthcheck conflicts with --health-* options")
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/parse.go b/installer/vendor/github.com/docker/docker/cli/command/service/parse.go
deleted file mode 100644
index ce9b454edd..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/parse.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package service
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/client"
-	"golang.org/x/net/context"
-)
-
-// ParseSecrets retrieves the secrets from the requested names and converts
-// them to secret references to use with the spec
-func ParseSecrets(client client.SecretAPIClient, requestedSecrets []*types.SecretRequestOption) ([]*swarmtypes.SecretReference, error) {
-	secretRefs := make(map[string]*swarmtypes.SecretReference)
-	ctx := context.Background()
-
-	for _, secret := range requestedSecrets {
-		if _, exists := secretRefs[secret.Target]; exists {
-			return nil, fmt.Errorf("duplicate secret target for %s not allowed", secret.Source)
-		}
-		secretRef := &swarmtypes.SecretReference{
-			File: &swarmtypes.SecretReferenceFileTarget{
-				Name: secret.Target,
-				UID:  secret.UID,
-				GID:  secret.GID,
-				Mode: secret.Mode,
-			},
-			SecretName: secret.Source,
-		}
-
-		secretRefs[secret.Target] = secretRef
-	}
-
-	args := filters.NewArgs()
-	for _, s := range secretRefs {
-		args.Add("names", s.SecretName)
-	}
-
-	secrets, err := client.SecretList(ctx, types.SecretListOptions{
-		Filters: args,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	foundSecrets := make(map[string]string)
-	for _, secret := range secrets {
-		foundSecrets[secret.Spec.Annotations.Name] = secret.ID
-	}
-
-	addedSecrets := []*swarmtypes.SecretReference{}
-
-	for _, ref := range secretRefs {
-		id, ok := foundSecrets[ref.SecretName]
-		if !ok {
-			return nil, fmt.Errorf("secret not found: %s", ref.SecretName)
-		}
-
-		// set the id for the ref to properly assign in swarm
-		// since swarm needs the ID instead of the name
-		ref.SecretID = id
-		addedSecrets = append(addedSecrets, ref)
-	}
-
-	return addedSecrets, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/ps.go b/installer/vendor/github.com/docker/docker/cli/command/service/ps.go
deleted file mode 100644
index cf94ad7374..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/ps.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package service
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/cli/command/node"
-	"github.com/docker/docker/cli/command/task"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type psOptions struct {
-	serviceID string
-	quiet     bool
-	noResolve bool
-	noTrunc   bool
-	filter    opts.FilterOpt
-}
-
-func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := psOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "ps [OPTIONS] SERVICE",
-		Short: "List the tasks of a service",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.serviceID = args[0]
-			return runPS(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display task IDs")
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
-	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runPS(dockerCli *command.DockerCli, opts psOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	service, _, err := client.ServiceInspectWithRaw(ctx, opts.serviceID)
-	if err != nil {
-		return err
-	}
-
-	filter := opts.filter.Value()
-	filter.Add("service", service.ID)
-	if filter.Include("node") {
-		nodeFilters := filter.Get("node")
-		for _, nodeFilter := range nodeFilters {
-			nodeReference, err := node.Reference(ctx, client, nodeFilter)
-			if err != nil {
-				return err
-			}
-			filter.Del("node", nodeFilter)
-			filter.Add("node", nodeReference)
-		}
-	}
-
-	tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
-	if err != nil {
-		return err
-	}
-
-	if opts.quiet {
-		return task.PrintQuiet(dockerCli, tasks)
-	}
-	return task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), opts.noTrunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/remove.go b/installer/vendor/github.com/docker/docker/cli/command/service/remove.go
deleted file mode 100644
index c3fbbabbca..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/remove.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-
-	cmd := &cobra.Command{
-		Use:     "rm SERVICE [SERVICE...]",
-		Aliases: []string{"remove"},
-		Short:   "Remove one or more services",
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runRemove(dockerCli, args)
-		},
-	}
-	cmd.Flags()
-
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, sids []string) error {
-	client := dockerCli.Client()
-
-	ctx := context.Background()
-
-	var errs []string
-	for _, sid := range sids {
-		err := client.ServiceRemove(ctx, sid)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-		fmt.Fprintf(dockerCli.Out(), "%s\n", sid)
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf(strings.Join(errs, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/scale.go b/installer/vendor/github.com/docker/docker/cli/command/service/scale.go
deleted file mode 100644
index cf89e90273..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/scale.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-func newScaleCommand(dockerCli *command.DockerCli) *cobra.Command {
-	return &cobra.Command{
-		Use:   "scale SERVICE=REPLICAS [SERVICE=REPLICAS...]",
-		Short: "Scale one or multiple replicated services",
-		Args:  scaleArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runScale(dockerCli, args)
-		},
-	}
-}
-
-func scaleArgs(cmd *cobra.Command, args []string) error {
-	if err := cli.RequiresMinArgs(1)(cmd, args); err != nil {
-		return err
-	}
-	for _, arg := range args {
-		if parts := strings.SplitN(arg, "=", 2); len(parts) != 2 {
-			return fmt.Errorf(
-				"Invalid scale specifier '%s'.\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-				arg,
-				cmd.CommandPath(),
-				cmd.UseLine(),
-				cmd.Short,
-			)
-		}
-	}
-	return nil
-}
-
-func runScale(dockerCli *command.DockerCli, args []string) error {
-	var errors []string
-	for _, arg := range args {
-		parts := strings.SplitN(arg, "=", 2)
-		serviceID, scaleStr := parts[0], parts[1]
-
-		// validate input arg scale number
-		scale, err := strconv.ParseUint(scaleStr, 10, 64)
-		if err != nil {
-			errors = append(errors, fmt.Sprintf("%s: invalid replicas value %s: %v", serviceID, scaleStr, err))
-			continue
-		}
-
-		if err := runServiceScale(dockerCli, serviceID, scale); err != nil {
-			errors = append(errors, fmt.Sprintf("%s: %v", serviceID, err))
-		}
-	}
-
-	if len(errors) == 0 {
-		return nil
-	}
-	return fmt.Errorf(strings.Join(errors, "\n"))
-}
-
-func runServiceScale(dockerCli *command.DockerCli, serviceID string, scale uint64) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	service, _, err := client.ServiceInspectWithRaw(ctx, serviceID)
-	if err != nil {
-		return err
-	}
-
-	serviceMode := &service.Spec.Mode
-	if serviceMode.Replicated == nil {
-		return fmt.Errorf("scale can only be used with replicated mode")
-	}
-
-	serviceMode.Replicated.Replicas = &scale
-
-	response, err := client.ServiceUpdate(ctx, service.ID, service.Version, service.Spec, types.ServiceUpdateOptions{})
-	if err != nil {
-		return err
-	}
-
-	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "%s scaled to %d\n", serviceID, scale)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/trust.go b/installer/vendor/github.com/docker/docker/cli/command/service/trust.go
deleted file mode 100644
index 052d49c32a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/trust.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package service
-
-import (
-	"encoding/hex"
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/trust"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/docker/notary/tuf/data"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-func resolveServiceImageDigest(dockerCli *command.DockerCli, service *swarm.ServiceSpec) error {
-	if !command.IsTrusted() {
-		// Digests are resolved by the daemon when not using content
-		// trust.
-		return nil
-	}
-
-	image := service.TaskTemplate.ContainerSpec.Image
-
-	// We only attempt to resolve the digest if the reference
-	// could be parsed as a digest reference. Specifying an image ID
-	// is valid but not resolvable. There is no warning message for
-	// an image ID because it's valid to use one.
-	if _, err := digest.ParseDigest(image); err == nil {
-		return nil
-	}
-
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return fmt.Errorf("Could not parse image reference %s", service.TaskTemplate.ContainerSpec.Image)
-	}
-	if _, ok := ref.(reference.Canonical); !ok {
-		ref = reference.WithDefaultTag(ref)
-
-		taggedRef, ok := ref.(reference.NamedTagged)
-		if !ok {
-			// This should never happen because a reference either
-			// has a digest, or WithDefaultTag would give it a tag.
-			return errors.New("Failed to resolve image digest using content trust: reference is missing a tag")
-		}
-
-		resolvedImage, err := trustedResolveDigest(context.Background(), dockerCli, taggedRef)
-		if err != nil {
-			return fmt.Errorf("Failed to resolve image digest using content trust: %v", err)
-		}
-		logrus.Debugf("resolved image tag to %s using content trust", resolvedImage.String())
-		service.TaskTemplate.ContainerSpec.Image = resolvedImage.String()
-	}
-	return nil
-}
-
-func trustedResolveDigest(ctx context.Context, cli *command.DockerCli, ref reference.NamedTagged) (distreference.Canonical, error) {
-	repoInfo, err := registry.ParseRepositoryInfo(ref)
-	if err != nil {
-		return nil, err
-	}
-
-	authConfig := command.ResolveAuthConfig(ctx, cli, repoInfo.Index)
-
-	notaryRepo, err := trust.GetNotaryRepository(cli, repoInfo, authConfig, "pull")
-	if err != nil {
-		return nil, errors.Wrap(err, "error establishing connection to trust repository")
-	}
-
-	t, err := notaryRepo.GetTargetByName(ref.Tag(), trust.ReleasesRole, data.CanonicalTargetsRole)
-	if err != nil {
-		return nil, trust.NotaryError(repoInfo.FullName(), err)
-	}
-	// Only get the tag if it's in the top level targets role or the releases delegation role
-	// ignore it if it's in any other delegation roles
-	if t.Role != trust.ReleasesRole && t.Role != data.CanonicalTargetsRole {
-		return nil, trust.NotaryError(repoInfo.FullName(), fmt.Errorf("No trust data for %s", ref.String()))
-	}
-
-	logrus.Debugf("retrieving target for %s role\n", t.Role)
-	h, ok := t.Hashes["sha256"]
-	if !ok {
-		return nil, errors.New("no valid hash, expecting sha256")
-	}
-
-	dgst := digest.NewDigestFromHex("sha256", hex.EncodeToString(h))
-
-	// Using distribution reference package to make sure that adding a
-	// digest does not erase the tag. When the two reference packages
-	// are unified, this will no longer be an issue.
-	return distreference.WithDigest(ref, dgst)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/update.go b/installer/vendor/github.com/docker/docker/cli/command/service/update.go
deleted file mode 100644
index d56de10913..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/update.go
+++ /dev/null
@@ -1,849 +0,0 @@
-package service
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-connections/nat"
-	shlex "github.com/flynn-archive/go-shlex"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func newUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	serviceOpts := newServiceOptions()
-
-	cmd := &cobra.Command{
-		Use:   "update [OPTIONS] SERVICE",
-		Short: "Update a service",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runUpdate(dockerCli, cmd.Flags(), args[0])
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.String("image", "", "Service image tag")
-	flags.String("args", "", "Service command args")
-	flags.Bool("rollback", false, "Rollback to previous specification")
-	flags.Bool("force", false, "Force update even if no changes require it")
-	addServiceFlags(cmd, serviceOpts)
-
-	flags.Var(newListOptsVar(), flagEnvRemove, "Remove an environment variable")
-	flags.Var(newListOptsVar(), flagGroupRemove, "Remove a previously added supplementary user group from the container")
-	flags.Var(newListOptsVar(), flagLabelRemove, "Remove a label by its key")
-	flags.Var(newListOptsVar(), flagContainerLabelRemove, "Remove a container label by its key")
-	flags.Var(newListOptsVar(), flagMountRemove, "Remove a mount by its target path")
-	// flags.Var(newListOptsVar().WithValidator(validatePublishRemove), flagPublishRemove, "Remove a published port by its target port")
-	flags.Var(&opts.PortOpt{}, flagPublishRemove, "Remove a published port by its target port")
-	flags.Var(newListOptsVar(), flagConstraintRemove, "Remove a constraint")
-	flags.Var(newListOptsVar(), flagDNSRemove, "Remove a custom DNS server")
-	flags.Var(newListOptsVar(), flagDNSOptionRemove, "Remove a DNS option")
-	flags.Var(newListOptsVar(), flagDNSSearchRemove, "Remove a DNS search domain")
-	flags.Var(newListOptsVar(), flagHostRemove, "Remove a custom host-to-IP mapping (host:ip)")
-	flags.Var(&serviceOpts.labels, flagLabelAdd, "Add or update a service label")
-	flags.Var(&serviceOpts.containerLabels, flagContainerLabelAdd, "Add or update a container label")
-	flags.Var(&serviceOpts.env, flagEnvAdd, "Add or update an environment variable")
-	flags.Var(newListOptsVar(), flagSecretRemove, "Remove a secret")
-	flags.Var(&serviceOpts.secrets, flagSecretAdd, "Add or update a secret on a service")
-	flags.Var(&serviceOpts.mounts, flagMountAdd, "Add or update a mount on a service")
-	flags.Var(&serviceOpts.constraints, flagConstraintAdd, "Add or update a placement constraint")
-	flags.Var(&serviceOpts.endpoint.publishPorts, flagPublishAdd, "Add or update a published port")
-	flags.Var(&serviceOpts.groups, flagGroupAdd, "Add an additional supplementary user group to the container")
-	flags.Var(&serviceOpts.dns, flagDNSAdd, "Add or update a custom DNS server")
-	flags.Var(&serviceOpts.dnsOption, flagDNSOptionAdd, "Add or update a DNS option")
-	flags.Var(&serviceOpts.dnsSearch, flagDNSSearchAdd, "Add or update a custom DNS search domain")
-	flags.Var(&serviceOpts.hosts, flagHostAdd, "Add or update a custom host-to-IP mapping (host:ip)")
-
-	return cmd
-}
-
-func newListOptsVar() *opts.ListOpts {
-	return opts.NewListOptsRef(&[]string{}, nil)
-}
-
-func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, serviceID string) error {
-	apiClient := dockerCli.Client()
-	ctx := context.Background()
-	updateOpts := types.ServiceUpdateOptions{}
-
-	service, _, err := apiClient.ServiceInspectWithRaw(ctx, serviceID)
-	if err != nil {
-		return err
-	}
-
-	rollback, err := flags.GetBool("rollback")
-	if err != nil {
-		return err
-	}
-
-	spec := &service.Spec
-	if rollback {
-		spec = service.PreviousSpec
-		if spec == nil {
-			return fmt.Errorf("service does not have a previous specification to roll back to")
-		}
-	}
-
-	err = updateService(flags, spec)
-	if err != nil {
-		return err
-	}
-
-	if flags.Changed("image") {
-		if err := resolveServiceImageDigest(dockerCli, spec); err != nil {
-			return err
-		}
-	}
-
-	updatedSecrets, err := getUpdatedSecrets(apiClient, flags, spec.TaskTemplate.ContainerSpec.Secrets)
-	if err != nil {
-		return err
-	}
-
-	spec.TaskTemplate.ContainerSpec.Secrets = updatedSecrets
-
-	// only send auth if flag was set
-	sendAuth, err := flags.GetBool(flagRegistryAuth)
-	if err != nil {
-		return err
-	}
-	if sendAuth {
-		// Retrieve encoded auth token from the image reference
-		// This would be the old image if it didn't change in this update
-		image := spec.TaskTemplate.ContainerSpec.Image
-		encodedAuth, err := command.RetrieveAuthTokenFromImage(ctx, dockerCli, image)
-		if err != nil {
-			return err
-		}
-		updateOpts.EncodedRegistryAuth = encodedAuth
-	} else if rollback {
-		updateOpts.RegistryAuthFrom = types.RegistryAuthFromPreviousSpec
-	} else {
-		updateOpts.RegistryAuthFrom = types.RegistryAuthFromSpec
-	}
-
-	response, err := apiClient.ServiceUpdate(ctx, service.ID, service.Version, *spec, updateOpts)
-	if err != nil {
-		return err
-	}
-
-	for _, warning := range response.Warnings {
-		fmt.Fprintln(dockerCli.Err(), warning)
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "%s\n", serviceID)
-	return nil
-}
-
-func updateService(flags *pflag.FlagSet, spec *swarm.ServiceSpec) error {
-	updateString := func(flag string, field *string) {
-		if flags.Changed(flag) {
-			*field, _ = flags.GetString(flag)
-		}
-	}
-
-	updateInt64Value := func(flag string, field *int64) {
-		if flags.Changed(flag) {
-			*field = flags.Lookup(flag).Value.(int64Value).Value()
-		}
-	}
-
-	updateFloatValue := func(flag string, field *float32) {
-		if flags.Changed(flag) {
-			*field = flags.Lookup(flag).Value.(*floatValue).Value()
-		}
-	}
-
-	updateDuration := func(flag string, field *time.Duration) {
-		if flags.Changed(flag) {
-			*field, _ = flags.GetDuration(flag)
-		}
-	}
-
-	updateDurationOpt := func(flag string, field **time.Duration) {
-		if flags.Changed(flag) {
-			val := *flags.Lookup(flag).Value.(*DurationOpt).Value()
-			*field = &val
-		}
-	}
-
-	updateUint64 := func(flag string, field *uint64) {
-		if flags.Changed(flag) {
-			*field, _ = flags.GetUint64(flag)
-		}
-	}
-
-	updateUint64Opt := func(flag string, field **uint64) {
-		if flags.Changed(flag) {
-			val := *flags.Lookup(flag).Value.(*Uint64Opt).Value()
-			*field = &val
-		}
-	}
-
-	cspec := &spec.TaskTemplate.ContainerSpec
-	task := &spec.TaskTemplate
-
-	taskResources := func() *swarm.ResourceRequirements {
-		if task.Resources == nil {
-			task.Resources = &swarm.ResourceRequirements{}
-		}
-		return task.Resources
-	}
-
-	updateLabels(flags, &spec.Labels)
-	updateContainerLabels(flags, &cspec.Labels)
-	updateString("image", &cspec.Image)
-	updateStringToSlice(flags, "args", &cspec.Args)
-	updateEnvironment(flags, &cspec.Env)
-	updateString(flagWorkdir, &cspec.Dir)
-	updateString(flagUser, &cspec.User)
-	updateString(flagHostname, &cspec.Hostname)
-	if err := updateMounts(flags, &cspec.Mounts); err != nil {
-		return err
-	}
-
-	if flags.Changed(flagLimitCPU) || flags.Changed(flagLimitMemory) {
-		taskResources().Limits = &swarm.Resources{}
-		updateInt64Value(flagLimitCPU, &task.Resources.Limits.NanoCPUs)
-		updateInt64Value(flagLimitMemory, &task.Resources.Limits.MemoryBytes)
-	}
-	if flags.Changed(flagReserveCPU) || flags.Changed(flagReserveMemory) {
-		taskResources().Reservations = &swarm.Resources{}
-		updateInt64Value(flagReserveCPU, &task.Resources.Reservations.NanoCPUs)
-		updateInt64Value(flagReserveMemory, &task.Resources.Reservations.MemoryBytes)
-	}
-
-	updateDurationOpt(flagStopGracePeriod, &cspec.StopGracePeriod)
-
-	if anyChanged(flags, flagRestartCondition, flagRestartDelay, flagRestartMaxAttempts, flagRestartWindow) {
-		if task.RestartPolicy == nil {
-			task.RestartPolicy = &swarm.RestartPolicy{}
-		}
-
-		if flags.Changed(flagRestartCondition) {
-			value, _ := flags.GetString(flagRestartCondition)
-			task.RestartPolicy.Condition = swarm.RestartPolicyCondition(value)
-		}
-		updateDurationOpt(flagRestartDelay, &task.RestartPolicy.Delay)
-		updateUint64Opt(flagRestartMaxAttempts, &task.RestartPolicy.MaxAttempts)
-		updateDurationOpt(flagRestartWindow, &task.RestartPolicy.Window)
-	}
-
-	if anyChanged(flags, flagConstraintAdd, flagConstraintRemove) {
-		if task.Placement == nil {
-			task.Placement = &swarm.Placement{}
-		}
-		updatePlacement(flags, task.Placement)
-	}
-
-	if err := updateReplicas(flags, &spec.Mode); err != nil {
-		return err
-	}
-
-	if anyChanged(flags, flagUpdateParallelism, flagUpdateDelay, flagUpdateMonitor, flagUpdateFailureAction, flagUpdateMaxFailureRatio) {
-		if spec.UpdateConfig == nil {
-			spec.UpdateConfig = &swarm.UpdateConfig{}
-		}
-		updateUint64(flagUpdateParallelism, &spec.UpdateConfig.Parallelism)
-		updateDuration(flagUpdateDelay, &spec.UpdateConfig.Delay)
-		updateDuration(flagUpdateMonitor, &spec.UpdateConfig.Monitor)
-		updateString(flagUpdateFailureAction, &spec.UpdateConfig.FailureAction)
-		updateFloatValue(flagUpdateMaxFailureRatio, &spec.UpdateConfig.MaxFailureRatio)
-	}
-
-	if flags.Changed(flagEndpointMode) {
-		value, _ := flags.GetString(flagEndpointMode)
-		if spec.EndpointSpec == nil {
-			spec.EndpointSpec = &swarm.EndpointSpec{}
-		}
-		spec.EndpointSpec.Mode = swarm.ResolutionMode(value)
-	}
-
-	if anyChanged(flags, flagGroupAdd, flagGroupRemove) {
-		if err := updateGroups(flags, &cspec.Groups); err != nil {
-			return err
-		}
-	}
-
-	if anyChanged(flags, flagPublishAdd, flagPublishRemove) {
-		if spec.EndpointSpec == nil {
-			spec.EndpointSpec = &swarm.EndpointSpec{}
-		}
-		if err := updatePorts(flags, &spec.EndpointSpec.Ports); err != nil {
-			return err
-		}
-	}
-
-	if anyChanged(flags, flagDNSAdd, flagDNSRemove, flagDNSOptionAdd, flagDNSOptionRemove, flagDNSSearchAdd, flagDNSSearchRemove) {
-		if cspec.DNSConfig == nil {
-			cspec.DNSConfig = &swarm.DNSConfig{}
-		}
-		if err := updateDNSConfig(flags, &cspec.DNSConfig); err != nil {
-			return err
-		}
-	}
-
-	if anyChanged(flags, flagHostAdd, flagHostRemove) {
-		if err := updateHosts(flags, &cspec.Hosts); err != nil {
-			return err
-		}
-	}
-
-	if err := updateLogDriver(flags, &spec.TaskTemplate); err != nil {
-		return err
-	}
-
-	force, err := flags.GetBool("force")
-	if err != nil {
-		return err
-	}
-
-	if force {
-		spec.TaskTemplate.ForceUpdate++
-	}
-
-	if err := updateHealthcheck(flags, cspec); err != nil {
-		return err
-	}
-
-	if flags.Changed(flagTTY) {
-		tty, err := flags.GetBool(flagTTY)
-		if err != nil {
-			return err
-		}
-		cspec.TTY = tty
-	}
-
-	return nil
-}
-
-func updateStringToSlice(flags *pflag.FlagSet, flag string, field *[]string) error {
-	if !flags.Changed(flag) {
-		return nil
-	}
-
-	value, _ := flags.GetString(flag)
-	valueSlice, err := shlex.Split(value)
-	*field = valueSlice
-	return err
-}
-
-func anyChanged(flags *pflag.FlagSet, fields ...string) bool {
-	for _, flag := range fields {
-		if flags.Changed(flag) {
-			return true
-		}
-	}
-	return false
-}
-
-func updatePlacement(flags *pflag.FlagSet, placement *swarm.Placement) {
-	if flags.Changed(flagConstraintAdd) {
-		values := flags.Lookup(flagConstraintAdd).Value.(*opts.ListOpts).GetAll()
-		placement.Constraints = append(placement.Constraints, values...)
-	}
-	toRemove := buildToRemoveSet(flags, flagConstraintRemove)
-
-	newConstraints := []string{}
-	for _, constraint := range placement.Constraints {
-		if _, exists := toRemove[constraint]; !exists {
-			newConstraints = append(newConstraints, constraint)
-		}
-	}
-	// Sort so that result is predictable.
-	sort.Strings(newConstraints)
-
-	placement.Constraints = newConstraints
-}
-
-func updateContainerLabels(flags *pflag.FlagSet, field *map[string]string) {
-	if flags.Changed(flagContainerLabelAdd) {
-		if *field == nil {
-			*field = map[string]string{}
-		}
-
-		values := flags.Lookup(flagContainerLabelAdd).Value.(*opts.ListOpts).GetAll()
-		for key, value := range runconfigopts.ConvertKVStringsToMap(values) {
-			(*field)[key] = value
-		}
-	}
-
-	if *field != nil && flags.Changed(flagContainerLabelRemove) {
-		toRemove := flags.Lookup(flagContainerLabelRemove).Value.(*opts.ListOpts).GetAll()
-		for _, label := range toRemove {
-			delete(*field, label)
-		}
-	}
-}
-
-func updateLabels(flags *pflag.FlagSet, field *map[string]string) {
-	if flags.Changed(flagLabelAdd) {
-		if *field == nil {
-			*field = map[string]string{}
-		}
-
-		values := flags.Lookup(flagLabelAdd).Value.(*opts.ListOpts).GetAll()
-		for key, value := range runconfigopts.ConvertKVStringsToMap(values) {
-			(*field)[key] = value
-		}
-	}
-
-	if *field != nil && flags.Changed(flagLabelRemove) {
-		toRemove := flags.Lookup(flagLabelRemove).Value.(*opts.ListOpts).GetAll()
-		for _, label := range toRemove {
-			delete(*field, label)
-		}
-	}
-}
-
-func updateEnvironment(flags *pflag.FlagSet, field *[]string) {
-	envSet := map[string]string{}
-	for _, v := range *field {
-		envSet[envKey(v)] = v
-	}
-	if flags.Changed(flagEnvAdd) {
-		value := flags.Lookup(flagEnvAdd).Value.(*opts.ListOpts)
-		for _, v := range value.GetAll() {
-			envSet[envKey(v)] = v
-		}
-	}
-
-	*field = []string{}
-	for _, v := range envSet {
-		*field = append(*field, v)
-	}
-
-	toRemove := buildToRemoveSet(flags, flagEnvRemove)
-	*field = removeItems(*field, toRemove, envKey)
-}
-
-func getUpdatedSecrets(apiClient client.SecretAPIClient, flags *pflag.FlagSet, secrets []*swarm.SecretReference) ([]*swarm.SecretReference, error) {
-	if flags.Changed(flagSecretAdd) {
-		values := flags.Lookup(flagSecretAdd).Value.(*opts.SecretOpt).Value()
-
-		addSecrets, err := ParseSecrets(apiClient, values)
-		if err != nil {
-			return nil, err
-		}
-		secrets = append(secrets, addSecrets...)
-	}
-	toRemove := buildToRemoveSet(flags, flagSecretRemove)
-	newSecrets := []*swarm.SecretReference{}
-	for _, secret := range secrets {
-		if _, exists := toRemove[secret.SecretName]; !exists {
-			newSecrets = append(newSecrets, secret)
-		}
-	}
-
-	return newSecrets, nil
-}
-
-func envKey(value string) string {
-	kv := strings.SplitN(value, "=", 2)
-	return kv[0]
-}
-
-func itemKey(value string) string {
-	return value
-}
-
-func buildToRemoveSet(flags *pflag.FlagSet, flag string) map[string]struct{} {
-	var empty struct{}
-	toRemove := make(map[string]struct{})
-
-	if !flags.Changed(flag) {
-		return toRemove
-	}
-
-	toRemoveSlice := flags.Lookup(flag).Value.(*opts.ListOpts).GetAll()
-	for _, key := range toRemoveSlice {
-		toRemove[key] = empty
-	}
-	return toRemove
-}
-
-func removeItems(
-	seq []string,
-	toRemove map[string]struct{},
-	keyFunc func(string) string,
-) []string {
-	newSeq := []string{}
-	for _, item := range seq {
-		if _, exists := toRemove[keyFunc(item)]; !exists {
-			newSeq = append(newSeq, item)
-		}
-	}
-	return newSeq
-}
-
-type byMountSource []mounttypes.Mount
-
-func (m byMountSource) Len() int      { return len(m) }
-func (m byMountSource) Swap(i, j int) { m[i], m[j] = m[j], m[i] }
-func (m byMountSource) Less(i, j int) bool {
-	a, b := m[i], m[j]
-
-	if a.Source == b.Source {
-		return a.Target < b.Target
-	}
-
-	return a.Source < b.Source
-}
-
-func updateMounts(flags *pflag.FlagSet, mounts *[]mounttypes.Mount) error {
-
-	mountsByTarget := map[string]mounttypes.Mount{}
-
-	if flags.Changed(flagMountAdd) {
-		values := flags.Lookup(flagMountAdd).Value.(*opts.MountOpt).Value()
-		for _, mount := range values {
-			if _, ok := mountsByTarget[mount.Target]; ok {
-				return fmt.Errorf("duplicate mount target")
-			}
-			mountsByTarget[mount.Target] = mount
-		}
-	}
-
-	// Add old list of mount points minus updated one.
-	for _, mount := range *mounts {
-		if _, ok := mountsByTarget[mount.Target]; !ok {
-			mountsByTarget[mount.Target] = mount
-		}
-	}
-
-	newMounts := []mounttypes.Mount{}
-
-	toRemove := buildToRemoveSet(flags, flagMountRemove)
-
-	for _, mount := range mountsByTarget {
-		if _, exists := toRemove[mount.Target]; !exists {
-			newMounts = append(newMounts, mount)
-		}
-	}
-	sort.Sort(byMountSource(newMounts))
-	*mounts = newMounts
-	return nil
-}
-
-func updateGroups(flags *pflag.FlagSet, groups *[]string) error {
-	if flags.Changed(flagGroupAdd) {
-		values := flags.Lookup(flagGroupAdd).Value.(*opts.ListOpts).GetAll()
-		*groups = append(*groups, values...)
-	}
-	toRemove := buildToRemoveSet(flags, flagGroupRemove)
-
-	newGroups := []string{}
-	for _, group := range *groups {
-		if _, exists := toRemove[group]; !exists {
-			newGroups = append(newGroups, group)
-		}
-	}
-	// Sort so that result is predictable.
-	sort.Strings(newGroups)
-
-	*groups = newGroups
-	return nil
-}
-
-func removeDuplicates(entries []string) []string {
-	hit := map[string]bool{}
-	newEntries := []string{}
-	for _, v := range entries {
-		if !hit[v] {
-			newEntries = append(newEntries, v)
-			hit[v] = true
-		}
-	}
-	return newEntries
-}
-
-func updateDNSConfig(flags *pflag.FlagSet, config **swarm.DNSConfig) error {
-	newConfig := &swarm.DNSConfig{}
-
-	nameservers := (*config).Nameservers
-	if flags.Changed(flagDNSAdd) {
-		values := flags.Lookup(flagDNSAdd).Value.(*opts.ListOpts).GetAll()
-		nameservers = append(nameservers, values...)
-	}
-	nameservers = removeDuplicates(nameservers)
-	toRemove := buildToRemoveSet(flags, flagDNSRemove)
-	for _, nameserver := range nameservers {
-		if _, exists := toRemove[nameserver]; !exists {
-			newConfig.Nameservers = append(newConfig.Nameservers, nameserver)
-
-		}
-	}
-	// Sort so that result is predictable.
-	sort.Strings(newConfig.Nameservers)
-
-	search := (*config).Search
-	if flags.Changed(flagDNSSearchAdd) {
-		values := flags.Lookup(flagDNSSearchAdd).Value.(*opts.ListOpts).GetAll()
-		search = append(search, values...)
-	}
-	search = removeDuplicates(search)
-	toRemove = buildToRemoveSet(flags, flagDNSSearchRemove)
-	for _, entry := range search {
-		if _, exists := toRemove[entry]; !exists {
-			newConfig.Search = append(newConfig.Search, entry)
-		}
-	}
-	// Sort so that result is predictable.
-	sort.Strings(newConfig.Search)
-
-	options := (*config).Options
-	if flags.Changed(flagDNSOptionAdd) {
-		values := flags.Lookup(flagDNSOptionAdd).Value.(*opts.ListOpts).GetAll()
-		options = append(options, values...)
-	}
-	options = removeDuplicates(options)
-	toRemove = buildToRemoveSet(flags, flagDNSOptionRemove)
-	for _, option := range options {
-		if _, exists := toRemove[option]; !exists {
-			newConfig.Options = append(newConfig.Options, option)
-		}
-	}
-	// Sort so that result is predictable.
-	sort.Strings(newConfig.Options)
-
-	*config = newConfig
-	return nil
-}
-
-type byPortConfig []swarm.PortConfig
-
-func (r byPortConfig) Len() int      { return len(r) }
-func (r byPortConfig) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r byPortConfig) Less(i, j int) bool {
-	// We convert PortConfig into `port/protocol`, e.g., `80/tcp`
-	// In updatePorts we already filter out with map so there is duplicate entries
-	return portConfigToString(&r[i]) < portConfigToString(&r[j])
-}
-
-func portConfigToString(portConfig *swarm.PortConfig) string {
-	protocol := portConfig.Protocol
-	mode := portConfig.PublishMode
-	return fmt.Sprintf("%v:%v/%s/%s", portConfig.PublishedPort, portConfig.TargetPort, protocol, mode)
-}
-
-// FIXME(vdemeester) port to opts.PortOpt
-// This validation is only used for `--publish-rm`.
-// The `--publish-rm` takes:
-// <TargetPort>[/<Protocol>] (e.g., 80, 80/tcp, 53/udp)
-func validatePublishRemove(val string) (string, error) {
-	proto, port := nat.SplitProtoPort(val)
-	if proto != "tcp" && proto != "udp" {
-		return "", fmt.Errorf("invalid protocol '%s' for %s", proto, val)
-	}
-	if strings.Contains(port, ":") {
-		return "", fmt.Errorf("invalid port format: '%s', should be <TargetPort>[/<Protocol>] (e.g., 80, 80/tcp, 53/udp)", port)
-	}
-	if _, err := nat.ParsePort(port); err != nil {
-		return "", err
-	}
-	return val, nil
-}
-
-func updatePorts(flags *pflag.FlagSet, portConfig *[]swarm.PortConfig) error {
-	// The key of the map is `port/protocol`, e.g., `80/tcp`
-	portSet := map[string]swarm.PortConfig{}
-
-	// Build the current list of portConfig
-	for _, entry := range *portConfig {
-		if _, ok := portSet[portConfigToString(&entry)]; !ok {
-			portSet[portConfigToString(&entry)] = entry
-		}
-	}
-
-	newPorts := []swarm.PortConfig{}
-
-	// Clean current ports
-	toRemove := flags.Lookup(flagPublishRemove).Value.(*opts.PortOpt).Value()
-portLoop:
-	for _, port := range portSet {
-		for _, pConfig := range toRemove {
-			if equalProtocol(port.Protocol, pConfig.Protocol) &&
-				port.TargetPort == pConfig.TargetPort &&
-				equalPublishMode(port.PublishMode, pConfig.PublishMode) {
-				continue portLoop
-			}
-		}
-
-		newPorts = append(newPorts, port)
-	}
-
-	// Check to see if there are any conflict in flags.
-	if flags.Changed(flagPublishAdd) {
-		ports := flags.Lookup(flagPublishAdd).Value.(*opts.PortOpt).Value()
-
-		for _, port := range ports {
-			if v, ok := portSet[portConfigToString(&port)]; ok {
-				if v != port {
-					fmt.Println("v", v)
-					return fmt.Errorf("conflicting port mapping between %v:%v/%s and %v:%v/%s", port.PublishedPort, port.TargetPort, port.Protocol, v.PublishedPort, v.TargetPort, v.Protocol)
-				}
-				continue
-			}
-			//portSet[portConfigToString(&port)] = port
-			newPorts = append(newPorts, port)
-		}
-	}
-
-	// Sort the PortConfig to avoid unnecessary updates
-	sort.Sort(byPortConfig(newPorts))
-	*portConfig = newPorts
-	return nil
-}
-
-func equalProtocol(prot1, prot2 swarm.PortConfigProtocol) bool {
-	return prot1 == prot2 ||
-		(prot1 == swarm.PortConfigProtocol("") && prot2 == swarm.PortConfigProtocolTCP) ||
-		(prot2 == swarm.PortConfigProtocol("") && prot1 == swarm.PortConfigProtocolTCP)
-}
-
-func equalPublishMode(mode1, mode2 swarm.PortConfigPublishMode) bool {
-	return mode1 == mode2 ||
-		(mode1 == swarm.PortConfigPublishMode("") && mode2 == swarm.PortConfigPublishModeIngress) ||
-		(mode2 == swarm.PortConfigPublishMode("") && mode1 == swarm.PortConfigPublishModeIngress)
-}
-
-func equalPort(targetPort nat.Port, port swarm.PortConfig) bool {
-	return (string(port.Protocol) == targetPort.Proto() &&
-		port.TargetPort == uint32(targetPort.Int()))
-}
-
-func updateReplicas(flags *pflag.FlagSet, serviceMode *swarm.ServiceMode) error {
-	if !flags.Changed(flagReplicas) {
-		return nil
-	}
-
-	if serviceMode == nil || serviceMode.Replicated == nil {
-		return fmt.Errorf("replicas can only be used with replicated mode")
-	}
-	serviceMode.Replicated.Replicas = flags.Lookup(flagReplicas).Value.(*Uint64Opt).Value()
-	return nil
-}
-
-func updateHosts(flags *pflag.FlagSet, hosts *[]string) error {
-	// Combine existing Hosts (in swarmkit format) with the host to add (convert to swarmkit format)
-	if flags.Changed(flagHostAdd) {
-		values := convertExtraHostsToSwarmHosts(flags.Lookup(flagHostAdd).Value.(*opts.ListOpts).GetAll())
-		*hosts = append(*hosts, values...)
-	}
-	// Remove duplicate
-	*hosts = removeDuplicates(*hosts)
-
-	keysToRemove := make(map[string]struct{})
-	if flags.Changed(flagHostRemove) {
-		var empty struct{}
-		extraHostsToRemove := flags.Lookup(flagHostRemove).Value.(*opts.ListOpts).GetAll()
-		for _, entry := range extraHostsToRemove {
-			key := strings.SplitN(entry, ":", 2)[0]
-			keysToRemove[key] = empty
-		}
-	}
-
-	newHosts := []string{}
-	for _, entry := range *hosts {
-		// Since this is in swarmkit format, we need to find the key, which is canonical_hostname of:
-		// IP_address canonical_hostname [aliases...]
-		parts := strings.Fields(entry)
-		if len(parts) > 1 {
-			key := parts[1]
-			if _, exists := keysToRemove[key]; !exists {
-				newHosts = append(newHosts, entry)
-			}
-		} else {
-			newHosts = append(newHosts, entry)
-		}
-	}
-
-	// Sort so that result is predictable.
-	sort.Strings(newHosts)
-
-	*hosts = newHosts
-	return nil
-}
-
-// updateLogDriver updates the log driver only if the log driver flag is set.
-// All options will be replaced with those provided on the command line.
-func updateLogDriver(flags *pflag.FlagSet, taskTemplate *swarm.TaskSpec) error {
-	if !flags.Changed(flagLogDriver) {
-		return nil
-	}
-
-	name, err := flags.GetString(flagLogDriver)
-	if err != nil {
-		return err
-	}
-
-	if name == "" {
-		return nil
-	}
-
-	taskTemplate.LogDriver = &swarm.Driver{
-		Name:    name,
-		Options: runconfigopts.ConvertKVStringsToMap(flags.Lookup(flagLogOpt).Value.(*opts.ListOpts).GetAll()),
-	}
-
-	return nil
-}
-
-func updateHealthcheck(flags *pflag.FlagSet, containerSpec *swarm.ContainerSpec) error {
-	if !anyChanged(flags, flagNoHealthcheck, flagHealthCmd, flagHealthInterval, flagHealthRetries, flagHealthTimeout) {
-		return nil
-	}
-	if containerSpec.Healthcheck == nil {
-		containerSpec.Healthcheck = &container.HealthConfig{}
-	}
-	noHealthcheck, err := flags.GetBool(flagNoHealthcheck)
-	if err != nil {
-		return err
-	}
-	if noHealthcheck {
-		if !anyChanged(flags, flagHealthCmd, flagHealthInterval, flagHealthRetries, flagHealthTimeout) {
-			containerSpec.Healthcheck = &container.HealthConfig{
-				Test: []string{"NONE"},
-			}
-			return nil
-		}
-		return fmt.Errorf("--%s conflicts with --health-* options", flagNoHealthcheck)
-	}
-	if len(containerSpec.Healthcheck.Test) > 0 && containerSpec.Healthcheck.Test[0] == "NONE" {
-		containerSpec.Healthcheck.Test = nil
-	}
-	if flags.Changed(flagHealthInterval) {
-		val := *flags.Lookup(flagHealthInterval).Value.(*PositiveDurationOpt).Value()
-		containerSpec.Healthcheck.Interval = val
-	}
-	if flags.Changed(flagHealthTimeout) {
-		val := *flags.Lookup(flagHealthTimeout).Value.(*PositiveDurationOpt).Value()
-		containerSpec.Healthcheck.Timeout = val
-	}
-	if flags.Changed(flagHealthRetries) {
-		containerSpec.Healthcheck.Retries, _ = flags.GetInt(flagHealthRetries)
-	}
-	if flags.Changed(flagHealthCmd) {
-		cmd, _ := flags.GetString(flagHealthCmd)
-		if cmd != "" {
-			containerSpec.Healthcheck.Test = []string{"CMD-SHELL", cmd}
-		} else {
-			containerSpec.Healthcheck.Test = nil
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/service/update_test.go b/installer/vendor/github.com/docker/docker/cli/command/service/update_test.go
deleted file mode 100644
index 08fe248769..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/service/update_test.go
+++ /dev/null
@@ -1,384 +0,0 @@
-package service
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestUpdateServiceArgs(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("args", "the \"new args\"")
-
-	spec := &swarm.ServiceSpec{}
-	cspec := &spec.TaskTemplate.ContainerSpec
-	cspec.Args = []string{"old", "args"}
-
-	updateService(flags, spec)
-	assert.EqualStringSlice(t, cspec.Args, []string{"the", "new args"})
-}
-
-func TestUpdateLabels(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("label-add", "toadd=newlabel")
-	flags.Set("label-rm", "toremove")
-
-	labels := map[string]string{
-		"toremove": "thelabeltoremove",
-		"tokeep":   "value",
-	}
-
-	updateLabels(flags, &labels)
-	assert.Equal(t, len(labels), 2)
-	assert.Equal(t, labels["tokeep"], "value")
-	assert.Equal(t, labels["toadd"], "newlabel")
-}
-
-func TestUpdateLabelsRemoveALabelThatDoesNotExist(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("label-rm", "dne")
-
-	labels := map[string]string{"foo": "theoldlabel"}
-	updateLabels(flags, &labels)
-	assert.Equal(t, len(labels), 1)
-}
-
-func TestUpdatePlacement(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("constraint-add", "node=toadd")
-	flags.Set("constraint-rm", "node!=toremove")
-
-	placement := &swarm.Placement{
-		Constraints: []string{"node!=toremove", "container=tokeep"},
-	}
-
-	updatePlacement(flags, placement)
-	assert.Equal(t, len(placement.Constraints), 2)
-	assert.Equal(t, placement.Constraints[0], "container=tokeep")
-	assert.Equal(t, placement.Constraints[1], "node=toadd")
-}
-
-func TestUpdateEnvironment(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("env-add", "toadd=newenv")
-	flags.Set("env-rm", "toremove")
-
-	envs := []string{"toremove=theenvtoremove", "tokeep=value"}
-
-	updateEnvironment(flags, &envs)
-	assert.Equal(t, len(envs), 2)
-	// Order has been removed in updateEnvironment (map)
-	sort.Strings(envs)
-	assert.Equal(t, envs[0], "toadd=newenv")
-	assert.Equal(t, envs[1], "tokeep=value")
-}
-
-func TestUpdateEnvironmentWithDuplicateValues(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("env-add", "foo=newenv")
-	flags.Set("env-add", "foo=dupe")
-	flags.Set("env-rm", "foo")
-
-	envs := []string{"foo=value"}
-
-	updateEnvironment(flags, &envs)
-	assert.Equal(t, len(envs), 0)
-}
-
-func TestUpdateEnvironmentWithDuplicateKeys(t *testing.T) {
-	// Test case for #25404
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("env-add", "A=b")
-
-	envs := []string{"A=c"}
-
-	updateEnvironment(flags, &envs)
-	assert.Equal(t, len(envs), 1)
-	assert.Equal(t, envs[0], "A=b")
-}
-
-func TestUpdateGroups(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("group-add", "wheel")
-	flags.Set("group-add", "docker")
-	flags.Set("group-rm", "root")
-	flags.Set("group-add", "foo")
-	flags.Set("group-rm", "docker")
-
-	groups := []string{"bar", "root"}
-
-	updateGroups(flags, &groups)
-	assert.Equal(t, len(groups), 3)
-	assert.Equal(t, groups[0], "bar")
-	assert.Equal(t, groups[1], "foo")
-	assert.Equal(t, groups[2], "wheel")
-}
-
-func TestUpdateDNSConfig(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-
-	// IPv4, with duplicates
-	flags.Set("dns-add", "1.1.1.1")
-	flags.Set("dns-add", "1.1.1.1")
-	flags.Set("dns-add", "2.2.2.2")
-	flags.Set("dns-rm", "3.3.3.3")
-	flags.Set("dns-rm", "2.2.2.2")
-	// IPv6
-	flags.Set("dns-add", "2001:db8:abc8::1")
-	// Invalid dns record
-	assert.Error(t, flags.Set("dns-add", "x.y.z.w"), "x.y.z.w is not an ip address")
-
-	// domains with duplicates
-	flags.Set("dns-search-add", "example.com")
-	flags.Set("dns-search-add", "example.com")
-	flags.Set("dns-search-add", "example.org")
-	flags.Set("dns-search-rm", "example.org")
-	// Invalid dns search domain
-	assert.Error(t, flags.Set("dns-search-add", "example$com"), "example$com is not a valid domain")
-
-	flags.Set("dns-option-add", "ndots:9")
-	flags.Set("dns-option-rm", "timeout:3")
-
-	config := &swarm.DNSConfig{
-		Nameservers: []string{"3.3.3.3", "5.5.5.5"},
-		Search:      []string{"localdomain"},
-		Options:     []string{"timeout:3"},
-	}
-
-	updateDNSConfig(flags, &config)
-
-	assert.Equal(t, len(config.Nameservers), 3)
-	assert.Equal(t, config.Nameservers[0], "1.1.1.1")
-	assert.Equal(t, config.Nameservers[1], "2001:db8:abc8::1")
-	assert.Equal(t, config.Nameservers[2], "5.5.5.5")
-
-	assert.Equal(t, len(config.Search), 2)
-	assert.Equal(t, config.Search[0], "example.com")
-	assert.Equal(t, config.Search[1], "localdomain")
-
-	assert.Equal(t, len(config.Options), 1)
-	assert.Equal(t, config.Options[0], "ndots:9")
-}
-
-func TestUpdateMounts(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("mount-add", "type=volume,source=vol2,target=/toadd")
-	flags.Set("mount-rm", "/toremove")
-
-	mounts := []mounttypes.Mount{
-		{Target: "/toremove", Source: "vol1", Type: mounttypes.TypeBind},
-		{Target: "/tokeep", Source: "vol3", Type: mounttypes.TypeBind},
-	}
-
-	updateMounts(flags, &mounts)
-	assert.Equal(t, len(mounts), 2)
-	assert.Equal(t, mounts[0].Target, "/toadd")
-	assert.Equal(t, mounts[1].Target, "/tokeep")
-
-}
-
-func TestUpdateMountsWithDuplicateMounts(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("mount-add", "type=volume,source=vol4,target=/toadd")
-
-	mounts := []mounttypes.Mount{
-		{Target: "/tokeep1", Source: "vol1", Type: mounttypes.TypeBind},
-		{Target: "/toadd", Source: "vol2", Type: mounttypes.TypeBind},
-		{Target: "/tokeep2", Source: "vol3", Type: mounttypes.TypeBind},
-	}
-
-	updateMounts(flags, &mounts)
-	assert.Equal(t, len(mounts), 3)
-	assert.Equal(t, mounts[0].Target, "/tokeep1")
-	assert.Equal(t, mounts[1].Target, "/tokeep2")
-	assert.Equal(t, mounts[2].Target, "/toadd")
-}
-
-func TestUpdatePorts(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("publish-add", "1000:1000")
-	flags.Set("publish-rm", "333/udp")
-
-	portConfigs := []swarm.PortConfig{
-		{TargetPort: 333, Protocol: swarm.PortConfigProtocolUDP},
-		{TargetPort: 555},
-	}
-
-	err := updatePorts(flags, &portConfigs)
-	assert.Equal(t, err, nil)
-	assert.Equal(t, len(portConfigs), 2)
-	// Do a sort to have the order (might have changed by map)
-	targetPorts := []int{int(portConfigs[0].TargetPort), int(portConfigs[1].TargetPort)}
-	sort.Ints(targetPorts)
-	assert.Equal(t, targetPorts[0], 555)
-	assert.Equal(t, targetPorts[1], 1000)
-}
-
-func TestUpdatePortsDuplicate(t *testing.T) {
-	// Test case for #25375
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("publish-add", "80:80")
-
-	portConfigs := []swarm.PortConfig{
-		{
-			TargetPort:    80,
-			PublishedPort: 80,
-			Protocol:      swarm.PortConfigProtocolTCP,
-			PublishMode:   swarm.PortConfigPublishModeIngress,
-		},
-	}
-
-	err := updatePorts(flags, &portConfigs)
-	assert.Equal(t, err, nil)
-	assert.Equal(t, len(portConfigs), 1)
-	assert.Equal(t, portConfigs[0].TargetPort, uint32(80))
-}
-
-func TestUpdateHealthcheckTable(t *testing.T) {
-	type test struct {
-		flags    [][2]string
-		initial  *container.HealthConfig
-		expected *container.HealthConfig
-		err      string
-	}
-	testCases := []test{
-		{
-			flags:    [][2]string{{"no-healthcheck", "true"}},
-			initial:  &container.HealthConfig{Test: []string{"CMD-SHELL", "cmd1"}, Retries: 10},
-			expected: &container.HealthConfig{Test: []string{"NONE"}},
-		},
-		{
-			flags:    [][2]string{{"health-cmd", "cmd1"}},
-			initial:  &container.HealthConfig{Test: []string{"NONE"}},
-			expected: &container.HealthConfig{Test: []string{"CMD-SHELL", "cmd1"}},
-		},
-		{
-			flags:    [][2]string{{"health-retries", "10"}},
-			initial:  &container.HealthConfig{Test: []string{"NONE"}},
-			expected: &container.HealthConfig{Retries: 10},
-		},
-		{
-			flags:    [][2]string{{"health-retries", "10"}},
-			initial:  &container.HealthConfig{Test: []string{"CMD", "cmd1"}},
-			expected: &container.HealthConfig{Test: []string{"CMD", "cmd1"}, Retries: 10},
-		},
-		{
-			flags:    [][2]string{{"health-interval", "1m"}},
-			initial:  &container.HealthConfig{Test: []string{"CMD", "cmd1"}},
-			expected: &container.HealthConfig{Test: []string{"CMD", "cmd1"}, Interval: time.Minute},
-		},
-		{
-			flags:    [][2]string{{"health-cmd", ""}},
-			initial:  &container.HealthConfig{Test: []string{"CMD", "cmd1"}, Retries: 10},
-			expected: &container.HealthConfig{Retries: 10},
-		},
-		{
-			flags:    [][2]string{{"health-retries", "0"}},
-			initial:  &container.HealthConfig{Test: []string{"CMD", "cmd1"}, Retries: 10},
-			expected: &container.HealthConfig{Test: []string{"CMD", "cmd1"}},
-		},
-		{
-			flags: [][2]string{{"health-cmd", "cmd1"}, {"no-healthcheck", "true"}},
-			err:   "--no-healthcheck conflicts with --health-* options",
-		},
-		{
-			flags: [][2]string{{"health-interval", "10m"}, {"no-healthcheck", "true"}},
-			err:   "--no-healthcheck conflicts with --health-* options",
-		},
-		{
-			flags: [][2]string{{"health-timeout", "1m"}, {"no-healthcheck", "true"}},
-			err:   "--no-healthcheck conflicts with --health-* options",
-		},
-	}
-	for i, c := range testCases {
-		flags := newUpdateCommand(nil).Flags()
-		for _, flag := range c.flags {
-			flags.Set(flag[0], flag[1])
-		}
-		cspec := &swarm.ContainerSpec{
-			Healthcheck: c.initial,
-		}
-		err := updateHealthcheck(flags, cspec)
-		if c.err != "" {
-			assert.Error(t, err, c.err)
-		} else {
-			assert.NilError(t, err)
-			if !reflect.DeepEqual(cspec.Healthcheck, c.expected) {
-				t.Errorf("incorrect result for test %d, expected health config:\n\t%#v\ngot:\n\t%#v", i, c.expected, cspec.Healthcheck)
-			}
-		}
-	}
-}
-
-func TestUpdateHosts(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("host-add", "example.net:2.2.2.2")
-	flags.Set("host-add", "ipv6.net:2001:db8:abc8::1")
-	// remove with ipv6 should work
-	flags.Set("host-rm", "example.net:2001:db8:abc8::1")
-	// just hostname should work as well
-	flags.Set("host-rm", "example.net")
-	// bad format error
-	assert.Error(t, flags.Set("host-add", "$example.com$"), "bad format for add-host:")
-
-	hosts := []string{"1.2.3.4 example.com", "4.3.2.1 example.org", "2001:db8:abc8::1 example.net"}
-
-	updateHosts(flags, &hosts)
-	assert.Equal(t, len(hosts), 3)
-	assert.Equal(t, hosts[0], "1.2.3.4 example.com")
-	assert.Equal(t, hosts[1], "2001:db8:abc8::1 ipv6.net")
-	assert.Equal(t, hosts[2], "4.3.2.1 example.org")
-}
-
-func TestUpdatePortsRmWithProtocol(t *testing.T) {
-	flags := newUpdateCommand(nil).Flags()
-	flags.Set("publish-add", "8081:81")
-	flags.Set("publish-add", "8082:82")
-	flags.Set("publish-rm", "80")
-	flags.Set("publish-rm", "81/tcp")
-	flags.Set("publish-rm", "82/udp")
-
-	portConfigs := []swarm.PortConfig{
-		{
-			TargetPort:    80,
-			PublishedPort: 8080,
-			Protocol:      swarm.PortConfigProtocolTCP,
-			PublishMode:   swarm.PortConfigPublishModeIngress,
-		},
-	}
-
-	err := updatePorts(flags, &portConfigs)
-	assert.Equal(t, err, nil)
-	assert.Equal(t, len(portConfigs), 2)
-	assert.Equal(t, portConfigs[0].TargetPort, uint32(81))
-	assert.Equal(t, portConfigs[1].TargetPort, uint32(82))
-}
-
-// FIXME(vdemeester) port to opts.PortOpt
-func TestValidatePort(t *testing.T) {
-	validPorts := []string{"80/tcp", "80", "80/udp"}
-	invalidPorts := map[string]string{
-		"9999999":   "out of range",
-		"80:80/tcp": "invalid port format",
-		"53:53/udp": "invalid port format",
-		"80:80":     "invalid port format",
-		"80/xyz":    "invalid protocol",
-		"tcp":       "invalid syntax",
-		"udp":       "invalid syntax",
-		"":          "invalid protocol",
-	}
-	for _, port := range validPorts {
-		_, err := validatePublishRemove(port)
-		assert.Equal(t, err, nil)
-	}
-	for port, e := range invalidPorts {
-		_, err := validatePublishRemove(port)
-		assert.Error(t, err, e)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/stack/cmd.go
deleted file mode 100644
index 860bfedd1a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/cmd.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package stack
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-// NewStackCommand returns a cobra command for `stack` subcommands
-func NewStackCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "stack",
-		Short: "Manage Docker stacks",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-		Tags:  map[string]string{"version": "1.25"},
-	}
-	cmd.AddCommand(
-		newDeployCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		newServicesCommand(dockerCli),
-		newPsCommand(dockerCli),
-	)
-	return cmd
-}
-
-// NewTopLevelDeployCommand returns a command for `docker deploy`
-func NewTopLevelDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := newDeployCommand(dockerCli)
-	// Remove the aliases at the top level
-	cmd.Aliases = []string{}
-	cmd.Tags = map[string]string{"experimental": "", "version": "1.25"}
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/common.go b/installer/vendor/github.com/docker/docker/cli/command/stack/common.go
deleted file mode 100644
index 72719f94fc..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/common.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package stack
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/compose/convert"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/opts"
-)
-
-func getStackFilter(namespace string) filters.Args {
-	filter := filters.NewArgs()
-	filter.Add("label", convert.LabelNamespace+"="+namespace)
-	return filter
-}
-
-func getStackFilterFromOpt(namespace string, opt opts.FilterOpt) filters.Args {
-	filter := opt.Value()
-	filter.Add("label", convert.LabelNamespace+"="+namespace)
-	return filter
-}
-
-func getAllStacksFilter() filters.Args {
-	filter := filters.NewArgs()
-	filter.Add("label", convert.LabelNamespace)
-	return filter
-}
-
-func getServices(
-	ctx context.Context,
-	apiclient client.APIClient,
-	namespace string,
-) ([]swarm.Service, error) {
-	return apiclient.ServiceList(
-		ctx,
-		types.ServiceListOptions{Filters: getStackFilter(namespace)})
-}
-
-func getStackNetworks(
-	ctx context.Context,
-	apiclient client.APIClient,
-	namespace string,
-) ([]types.NetworkResource, error) {
-	return apiclient.NetworkList(
-		ctx,
-		types.NetworkListOptions{Filters: getStackFilter(namespace)})
-}
-
-func getStackSecrets(
-	ctx context.Context,
-	apiclient client.APIClient,
-	namespace string,
-) ([]swarm.Secret, error) {
-	return apiclient.SecretList(
-		ctx,
-		types.SecretListOptions{Filters: getStackFilter(namespace)})
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/deploy.go b/installer/vendor/github.com/docker/docker/cli/command/stack/deploy.go
deleted file mode 100644
index 980876a6a1..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/deploy.go
+++ /dev/null
@@ -1,357 +0,0 @@
-package stack
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	secretcli "github.com/docker/docker/cli/command/secret"
-	"github.com/docker/docker/cli/compose/convert"
-	"github.com/docker/docker/cli/compose/loader"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	dockerclient "github.com/docker/docker/client"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-const (
-	defaultNetworkDriver = "overlay"
-)
-
-type deployOptions struct {
-	bundlefile       string
-	composefile      string
-	namespace        string
-	sendRegistryAuth bool
-}
-
-func newDeployCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts deployOptions
-
-	cmd := &cobra.Command{
-		Use:     "deploy [OPTIONS] STACK",
-		Aliases: []string{"up"},
-		Short:   "Deploy a new stack or update an existing stack",
-		Args:    cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.namespace = args[0]
-			return runDeploy(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	addBundlefileFlag(&opts.bundlefile, flags)
-	addComposefileFlag(&opts.composefile, flags)
-	addRegistryAuthFlag(&opts.sendRegistryAuth, flags)
-	return cmd
-}
-
-func runDeploy(dockerCli *command.DockerCli, opts deployOptions) error {
-	ctx := context.Background()
-
-	switch {
-	case opts.bundlefile == "" && opts.composefile == "":
-		return fmt.Errorf("Please specify either a bundle file (with --bundle-file) or a Compose file (with --compose-file).")
-	case opts.bundlefile != "" && opts.composefile != "":
-		return fmt.Errorf("You cannot specify both a bundle file and a Compose file.")
-	case opts.bundlefile != "":
-		return deployBundle(ctx, dockerCli, opts)
-	default:
-		return deployCompose(ctx, dockerCli, opts)
-	}
-}
-
-// checkDaemonIsSwarmManager does an Info API call to verify that the daemon is
-// a swarm manager. This is necessary because we must create networks before we
-// create services, but the API call for creating a network does not return a
-// proper status code when it can't create a network in the "global" scope.
-func checkDaemonIsSwarmManager(ctx context.Context, dockerCli *command.DockerCli) error {
-	info, err := dockerCli.Client().Info(ctx)
-	if err != nil {
-		return err
-	}
-	if !info.Swarm.ControlAvailable {
-		return errors.New("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again.")
-	}
-	return nil
-}
-
-func deployCompose(ctx context.Context, dockerCli *command.DockerCli, opts deployOptions) error {
-	configDetails, err := getConfigDetails(opts)
-	if err != nil {
-		return err
-	}
-
-	config, err := loader.Load(configDetails)
-	if err != nil {
-		if fpe, ok := err.(*loader.ForbiddenPropertiesError); ok {
-			return fmt.Errorf("Compose file contains unsupported options:\n\n%s\n",
-				propertyWarnings(fpe.Properties))
-		}
-
-		return err
-	}
-
-	unsupportedProperties := loader.GetUnsupportedProperties(configDetails)
-	if len(unsupportedProperties) > 0 {
-		fmt.Fprintf(dockerCli.Err(), "Ignoring unsupported options: %s\n\n",
-			strings.Join(unsupportedProperties, ", "))
-	}
-
-	deprecatedProperties := loader.GetDeprecatedProperties(configDetails)
-	if len(deprecatedProperties) > 0 {
-		fmt.Fprintf(dockerCli.Err(), "Ignoring deprecated options:\n\n%s\n\n",
-			propertyWarnings(deprecatedProperties))
-	}
-
-	if err := checkDaemonIsSwarmManager(ctx, dockerCli); err != nil {
-		return err
-	}
-
-	namespace := convert.NewNamespace(opts.namespace)
-
-	serviceNetworks := getServicesDeclaredNetworks(config.Services)
-	networks, externalNetworks := convert.Networks(namespace, config.Networks, serviceNetworks)
-	if err := validateExternalNetworks(ctx, dockerCli, externalNetworks); err != nil {
-		return err
-	}
-	if err := createNetworks(ctx, dockerCli, namespace, networks); err != nil {
-		return err
-	}
-
-	secrets, err := convert.Secrets(namespace, config.Secrets)
-	if err != nil {
-		return err
-	}
-	if err := createSecrets(ctx, dockerCli, namespace, secrets); err != nil {
-		return err
-	}
-
-	services, err := convert.Services(namespace, config, dockerCli.Client())
-	if err != nil {
-		return err
-	}
-	return deployServices(ctx, dockerCli, services, namespace, opts.sendRegistryAuth)
-}
-func getServicesDeclaredNetworks(serviceConfigs []composetypes.ServiceConfig) map[string]struct{} {
-	serviceNetworks := map[string]struct{}{}
-	for _, serviceConfig := range serviceConfigs {
-		if len(serviceConfig.Networks) == 0 {
-			serviceNetworks["default"] = struct{}{}
-			continue
-		}
-		for network := range serviceConfig.Networks {
-			serviceNetworks[network] = struct{}{}
-		}
-	}
-	return serviceNetworks
-}
-
-func propertyWarnings(properties map[string]string) string {
-	var msgs []string
-	for name, description := range properties {
-		msgs = append(msgs, fmt.Sprintf("%s: %s", name, description))
-	}
-	sort.Strings(msgs)
-	return strings.Join(msgs, "\n\n")
-}
-
-func getConfigDetails(opts deployOptions) (composetypes.ConfigDetails, error) {
-	var details composetypes.ConfigDetails
-	var err error
-
-	details.WorkingDir, err = os.Getwd()
-	if err != nil {
-		return details, err
-	}
-
-	configFile, err := getConfigFile(opts.composefile)
-	if err != nil {
-		return details, err
-	}
-	// TODO: support multiple files
-	details.ConfigFiles = []composetypes.ConfigFile{*configFile}
-	return details, nil
-}
-
-func getConfigFile(filename string) (*composetypes.ConfigFile, error) {
-	bytes, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, err
-	}
-	config, err := loader.ParseYAML(bytes)
-	if err != nil {
-		return nil, err
-	}
-	return &composetypes.ConfigFile{
-		Filename: filename,
-		Config:   config,
-	}, nil
-}
-
-func validateExternalNetworks(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	externalNetworks []string) error {
-	client := dockerCli.Client()
-
-	for _, networkName := range externalNetworks {
-		network, err := client.NetworkInspect(ctx, networkName)
-		if err != nil {
-			if dockerclient.IsErrNetworkNotFound(err) {
-				return fmt.Errorf("network %q is declared as external, but could not be found. You need to create the network before the stack is deployed (with overlay driver)", networkName)
-			}
-			return err
-		}
-		if network.Scope != "swarm" {
-			return fmt.Errorf("network %q is declared as external, but it is not in the right scope: %q instead of %q", networkName, network.Scope, "swarm")
-		}
-	}
-
-	return nil
-}
-
-func createSecrets(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	namespace convert.Namespace,
-	secrets []swarm.SecretSpec,
-) error {
-	client := dockerCli.Client()
-
-	for _, secretSpec := range secrets {
-		// TODO: fix this after https://github.com/docker/docker/pull/29218
-		secrets, err := secretcli.GetSecretsByNameOrIDPrefixes(ctx, client, []string{secretSpec.Name})
-		switch {
-		case err != nil:
-			return err
-		case len(secrets) > 1:
-			return errors.Errorf("ambiguous secret name: %s", secretSpec.Name)
-		case len(secrets) == 0:
-			fmt.Fprintf(dockerCli.Out(), "Creating secret %s\n", secretSpec.Name)
-			_, err = client.SecretCreate(ctx, secretSpec)
-		default:
-			secret := secrets[0]
-			// Update secret to ensure that the local data hasn't changed
-			err = client.SecretUpdate(ctx, secret.ID, secret.Meta.Version, secretSpec)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func createNetworks(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	namespace convert.Namespace,
-	networks map[string]types.NetworkCreate,
-) error {
-	client := dockerCli.Client()
-
-	existingNetworks, err := getStackNetworks(ctx, client, namespace.Name())
-	if err != nil {
-		return err
-	}
-
-	existingNetworkMap := make(map[string]types.NetworkResource)
-	for _, network := range existingNetworks {
-		existingNetworkMap[network.Name] = network
-	}
-
-	for internalName, createOpts := range networks {
-		name := namespace.Scope(internalName)
-		if _, exists := existingNetworkMap[name]; exists {
-			continue
-		}
-
-		if createOpts.Driver == "" {
-			createOpts.Driver = defaultNetworkDriver
-		}
-
-		fmt.Fprintf(dockerCli.Out(), "Creating network %s\n", name)
-		if _, err := client.NetworkCreate(ctx, name, createOpts); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func deployServices(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	services map[string]swarm.ServiceSpec,
-	namespace convert.Namespace,
-	sendAuth bool,
-) error {
-	apiClient := dockerCli.Client()
-	out := dockerCli.Out()
-
-	existingServices, err := getServices(ctx, apiClient, namespace.Name())
-	if err != nil {
-		return err
-	}
-
-	existingServiceMap := make(map[string]swarm.Service)
-	for _, service := range existingServices {
-		existingServiceMap[service.Spec.Name] = service
-	}
-
-	for internalName, serviceSpec := range services {
-		name := namespace.Scope(internalName)
-
-		encodedAuth := ""
-		if sendAuth {
-			// Retrieve encoded auth token from the image reference
-			image := serviceSpec.TaskTemplate.ContainerSpec.Image
-			encodedAuth, err = command.RetrieveAuthTokenFromImage(ctx, dockerCli, image)
-			if err != nil {
-				return err
-			}
-		}
-
-		if service, exists := existingServiceMap[name]; exists {
-			fmt.Fprintf(out, "Updating service %s (id: %s)\n", name, service.ID)
-
-			updateOpts := types.ServiceUpdateOptions{}
-			if sendAuth {
-				updateOpts.EncodedRegistryAuth = encodedAuth
-			}
-			response, err := apiClient.ServiceUpdate(
-				ctx,
-				service.ID,
-				service.Version,
-				serviceSpec,
-				updateOpts,
-			)
-			if err != nil {
-				return err
-			}
-
-			for _, warning := range response.Warnings {
-				fmt.Fprintln(dockerCli.Err(), warning)
-			}
-		} else {
-			fmt.Fprintf(out, "Creating service %s\n", name)
-
-			createOpts := types.ServiceCreateOptions{}
-			if sendAuth {
-				createOpts.EncodedRegistryAuth = encodedAuth
-			}
-			if _, err := apiClient.ServiceCreate(ctx, serviceSpec, createOpts); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/deploy_bundlefile.go b/installer/vendor/github.com/docker/docker/cli/command/stack/deploy_bundlefile.go
deleted file mode 100644
index 5a178c4ab6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/deploy_bundlefile.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package stack
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/compose/convert"
-)
-
-func deployBundle(ctx context.Context, dockerCli *command.DockerCli, opts deployOptions) error {
-	bundle, err := loadBundlefile(dockerCli.Err(), opts.namespace, opts.bundlefile)
-	if err != nil {
-		return err
-	}
-
-	if err := checkDaemonIsSwarmManager(ctx, dockerCli); err != nil {
-		return err
-	}
-
-	namespace := convert.NewNamespace(opts.namespace)
-
-	networks := make(map[string]types.NetworkCreate)
-	for _, service := range bundle.Services {
-		for _, networkName := range service.Networks {
-			networks[networkName] = types.NetworkCreate{
-				Labels: convert.AddStackLabel(namespace, nil),
-			}
-		}
-	}
-
-	services := make(map[string]swarm.ServiceSpec)
-	for internalName, service := range bundle.Services {
-		name := namespace.Scope(internalName)
-
-		var ports []swarm.PortConfig
-		for _, portSpec := range service.Ports {
-			ports = append(ports, swarm.PortConfig{
-				Protocol:   swarm.PortConfigProtocol(portSpec.Protocol),
-				TargetPort: portSpec.Port,
-			})
-		}
-
-		nets := []swarm.NetworkAttachmentConfig{}
-		for _, networkName := range service.Networks {
-			nets = append(nets, swarm.NetworkAttachmentConfig{
-				Target:  namespace.Scope(networkName),
-				Aliases: []string{networkName},
-			})
-		}
-
-		serviceSpec := swarm.ServiceSpec{
-			Annotations: swarm.Annotations{
-				Name:   name,
-				Labels: convert.AddStackLabel(namespace, service.Labels),
-			},
-			TaskTemplate: swarm.TaskSpec{
-				ContainerSpec: swarm.ContainerSpec{
-					Image:   service.Image,
-					Command: service.Command,
-					Args:    service.Args,
-					Env:     service.Env,
-					// Service Labels will not be copied to Containers
-					// automatically during the deployment so we apply
-					// it here.
-					Labels: convert.AddStackLabel(namespace, nil),
-				},
-			},
-			EndpointSpec: &swarm.EndpointSpec{
-				Ports: ports,
-			},
-			Networks: nets,
-		}
-
-		services[internalName] = serviceSpec
-	}
-
-	if err := createNetworks(ctx, dockerCli, namespace, networks); err != nil {
-		return err
-	}
-	return deployServices(ctx, dockerCli, services, namespace, opts.sendRegistryAuth)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/list.go b/installer/vendor/github.com/docker/docker/cli/command/stack/list.go
deleted file mode 100644
index 9b6c645e29..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/list.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package stack
-
-import (
-	"fmt"
-	"io"
-	"strconv"
-	"text/tabwriter"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/compose/convert"
-	"github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-)
-
-const (
-	listItemFmt = "%s\t%s\n"
-)
-
-type listOptions struct {
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{}
-
-	cmd := &cobra.Command{
-		Use:     "ls",
-		Aliases: []string{"list"},
-		Short:   "List stacks",
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	stacks, err := getStacks(ctx, client)
-	if err != nil {
-		return err
-	}
-
-	out := dockerCli.Out()
-	printTable(out, stacks)
-	return nil
-}
-
-func printTable(out io.Writer, stacks []*stack) {
-	writer := tabwriter.NewWriter(out, 0, 4, 2, ' ', 0)
-
-	// Ignore flushing errors
-	defer writer.Flush()
-
-	fmt.Fprintf(writer, listItemFmt, "NAME", "SERVICES")
-	for _, stack := range stacks {
-		fmt.Fprintf(
-			writer,
-			listItemFmt,
-			stack.Name,
-			strconv.Itoa(stack.Services),
-		)
-	}
-}
-
-type stack struct {
-	// Name is the name of the stack
-	Name string
-	// Services is the number of the services
-	Services int
-}
-
-func getStacks(
-	ctx context.Context,
-	apiclient client.APIClient,
-) ([]*stack, error) {
-	services, err := apiclient.ServiceList(
-		ctx,
-		types.ServiceListOptions{Filters: getAllStacksFilter()})
-	if err != nil {
-		return nil, err
-	}
-	m := make(map[string]*stack, 0)
-	for _, service := range services {
-		labels := service.Spec.Labels
-		name, ok := labels[convert.LabelNamespace]
-		if !ok {
-			return nil, fmt.Errorf("cannot get label %s for service %s",
-				convert.LabelNamespace, service.ID)
-		}
-		ztack, ok := m[name]
-		if !ok {
-			m[name] = &stack{
-				Name:     name,
-				Services: 1,
-			}
-		} else {
-			ztack.Services++
-		}
-	}
-	var stacks []*stack
-	for _, stack := range m {
-		stacks = append(stacks, stack)
-	}
-	return stacks, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/opts.go b/installer/vendor/github.com/docker/docker/cli/command/stack/opts.go
deleted file mode 100644
index 74fe4f5343..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/opts.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package stack
-
-import (
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/docker/docker/cli/command/bundlefile"
-	"github.com/spf13/pflag"
-)
-
-func addComposefileFlag(opt *string, flags *pflag.FlagSet) {
-	flags.StringVarP(opt, "compose-file", "c", "", "Path to a Compose file")
-}
-
-func addBundlefileFlag(opt *string, flags *pflag.FlagSet) {
-	flags.StringVar(opt, "bundle-file", "", "Path to a Distributed Application Bundle file")
-	flags.SetAnnotation("bundle-file", "experimental", nil)
-}
-
-func addRegistryAuthFlag(opt *bool, flags *pflag.FlagSet) {
-	flags.BoolVar(opt, "with-registry-auth", false, "Send registry authentication details to Swarm agents")
-}
-
-func loadBundlefile(stderr io.Writer, namespace string, path string) (*bundlefile.Bundlefile, error) {
-	defaultPath := fmt.Sprintf("%s.dab", namespace)
-
-	if path == "" {
-		path = defaultPath
-	}
-	if _, err := os.Stat(path); err != nil {
-		return nil, fmt.Errorf(
-			"Bundle %s not found. Specify the path with --file",
-			path)
-	}
-
-	fmt.Fprintf(stderr, "Loading bundle from %s\n", path)
-	reader, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer reader.Close()
-
-	bundle, err := bundlefile.LoadFile(reader)
-	if err != nil {
-		return nil, fmt.Errorf("Error reading %s: %v\n", path, err)
-	}
-	return bundle, err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/ps.go b/installer/vendor/github.com/docker/docker/cli/command/stack/ps.go
deleted file mode 100644
index e4351bfc7c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/ps.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package stack
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/cli/command/task"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type psOptions struct {
-	filter    opts.FilterOpt
-	noTrunc   bool
-	namespace string
-	noResolve bool
-}
-
-func newPsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := psOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "ps [OPTIONS] STACK",
-		Short: "List the tasks in the stack",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.namespace = args[0]
-			return runPS(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVar(&opts.noTrunc, "no-trunc", false, "Do not truncate output")
-	flags.BoolVar(&opts.noResolve, "no-resolve", false, "Do not map IDs to Names")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runPS(dockerCli *command.DockerCli, opts psOptions) error {
-	namespace := opts.namespace
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	filter := getStackFilterFromOpt(opts.namespace, opts.filter)
-	tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: filter})
-	if err != nil {
-		return err
-	}
-
-	if len(tasks) == 0 {
-		fmt.Fprintf(dockerCli.Out(), "Nothing found in stack: %s\n", namespace)
-		return nil
-	}
-
-	return task.Print(dockerCli, ctx, tasks, idresolver.New(client, opts.noResolve), opts.noTrunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/remove.go b/installer/vendor/github.com/docker/docker/cli/command/stack/remove.go
deleted file mode 100644
index 966c1aa6bf..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/remove.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package stack
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type removeOptions struct {
-	namespace string
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts removeOptions
-
-	cmd := &cobra.Command{
-		Use:     "rm STACK",
-		Aliases: []string{"remove", "down"},
-		Short:   "Remove the stack",
-		Args:    cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.namespace = args[0]
-			return runRemove(dockerCli, opts)
-		},
-	}
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, opts removeOptions) error {
-	namespace := opts.namespace
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	services, err := getServices(ctx, client, namespace)
-	if err != nil {
-		return err
-	}
-
-	networks, err := getStackNetworks(ctx, client, namespace)
-	if err != nil {
-		return err
-	}
-
-	secrets, err := getStackSecrets(ctx, client, namespace)
-	if err != nil {
-		return err
-	}
-
-	if len(services)+len(networks)+len(secrets) == 0 {
-		fmt.Fprintf(dockerCli.Out(), "Nothing found in stack: %s\n", namespace)
-		return nil
-	}
-
-	hasError := removeServices(ctx, dockerCli, services)
-	hasError = removeSecrets(ctx, dockerCli, secrets) || hasError
-	hasError = removeNetworks(ctx, dockerCli, networks) || hasError
-
-	if hasError {
-		return fmt.Errorf("Failed to remove some resources")
-	}
-	return nil
-}
-
-func removeServices(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	services []swarm.Service,
-) bool {
-	var err error
-	for _, service := range services {
-		fmt.Fprintf(dockerCli.Err(), "Removing service %s\n", service.Spec.Name)
-		if err = dockerCli.Client().ServiceRemove(ctx, service.ID); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "Failed to remove service %s: %s", service.ID, err)
-		}
-	}
-	return err != nil
-}
-
-func removeNetworks(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	networks []types.NetworkResource,
-) bool {
-	var err error
-	for _, network := range networks {
-		fmt.Fprintf(dockerCli.Err(), "Removing network %s\n", network.Name)
-		if err = dockerCli.Client().NetworkRemove(ctx, network.ID); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "Failed to remove network %s: %s", network.ID, err)
-		}
-	}
-	return err != nil
-}
-
-func removeSecrets(
-	ctx context.Context,
-	dockerCli *command.DockerCli,
-	secrets []swarm.Secret,
-) bool {
-	var err error
-	for _, secret := range secrets {
-		fmt.Fprintf(dockerCli.Err(), "Removing secret %s\n", secret.Spec.Name)
-		if err = dockerCli.Client().SecretRemove(ctx, secret.ID); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "Failed to remove secret %s: %s", secret.ID, err)
-		}
-	}
-	return err != nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/stack/services.go b/installer/vendor/github.com/docker/docker/cli/command/stack/services.go
deleted file mode 100644
index a46652df7c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/stack/services.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package stack
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/service"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type servicesOptions struct {
-	quiet     bool
-	filter    opts.FilterOpt
-	namespace string
-}
-
-func newServicesCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := servicesOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "services [OPTIONS] STACK",
-		Short: "List the services in the stack",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.namespace = args[0]
-			return runServices(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display IDs")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-
-	return cmd
-}
-
-func runServices(dockerCli *command.DockerCli, opts servicesOptions) error {
-	ctx := context.Background()
-	client := dockerCli.Client()
-
-	filter := getStackFilterFromOpt(opts.namespace, opts.filter)
-	services, err := client.ServiceList(ctx, types.ServiceListOptions{Filters: filter})
-	if err != nil {
-		return err
-	}
-
-	out := dockerCli.Out()
-
-	// if no services in this stack, print message and exit 0
-	if len(services) == 0 {
-		fmt.Fprintf(out, "Nothing found in stack: %s\n", opts.namespace)
-		return nil
-	}
-
-	if opts.quiet {
-		service.PrintQuiet(out, services)
-	} else {
-		taskFilter := filters.NewArgs()
-		for _, service := range services {
-			taskFilter.Add("service", service.ID)
-		}
-
-		tasks, err := client.TaskList(ctx, types.TaskListOptions{Filters: taskFilter})
-		if err != nil {
-			return err
-		}
-		nodes, err := client.NodeList(ctx, types.NodeListOptions{})
-		if err != nil {
-			return err
-		}
-		service.PrintNotQuiet(out, services, nodes, tasks)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/cmd.go
deleted file mode 100644
index 632679c4b6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/cmd.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package swarm
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewSwarmCommand returns a cobra command for `swarm` subcommands
-func NewSwarmCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "swarm",
-		Short: "Manage Swarm",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newInitCommand(dockerCli),
-		newJoinCommand(dockerCli),
-		newJoinTokenCommand(dockerCli),
-		newUnlockKeyCommand(dockerCli),
-		newUpdateCommand(dockerCli),
-		newLeaveCommand(dockerCli),
-		newUnlockCommand(dockerCli),
-	)
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/init.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/init.go
deleted file mode 100644
index 2550feeb47..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/init.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package swarm
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-type initOptions struct {
-	swarmOptions
-	listenAddr NodeAddrOption
-	// Not a NodeAddrOption because it has no default port.
-	advertiseAddr   string
-	forceNewCluster bool
-}
-
-func newInitCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := initOptions{
-		listenAddr: NewListenAddrOption(),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "init [OPTIONS]",
-		Short: "Initialize a swarm",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runInit(dockerCli, cmd.Flags(), opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.Var(&opts.listenAddr, flagListenAddr, "Listen address (format: <ip|interface>[:port])")
-	flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", "Advertised address (format: <ip|interface>[:port])")
-	flags.BoolVar(&opts.forceNewCluster, "force-new-cluster", false, "Force create a new cluster from current state")
-	flags.BoolVar(&opts.autolock, flagAutolock, false, "Enable manager autolocking (requiring an unlock key to start a stopped manager)")
-	addSwarmFlags(flags, &opts.swarmOptions)
-	return cmd
-}
-
-func runInit(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts initOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	req := swarm.InitRequest{
-		ListenAddr:       opts.listenAddr.String(),
-		AdvertiseAddr:    opts.advertiseAddr,
-		ForceNewCluster:  opts.forceNewCluster,
-		Spec:             opts.swarmOptions.ToSpec(flags),
-		AutoLockManagers: opts.swarmOptions.autolock,
-	}
-
-	nodeID, err := client.SwarmInit(ctx, req)
-	if err != nil {
-		if strings.Contains(err.Error(), "could not choose an IP address to advertise") || strings.Contains(err.Error(), "could not find the system's IP address") {
-			return errors.New(err.Error() + " - specify one with --advertise-addr")
-		}
-		return err
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "Swarm initialized: current node (%s) is now a manager.\n\n", nodeID)
-
-	if err := printJoinCommand(ctx, dockerCli, nodeID, true, false); err != nil {
-		return err
-	}
-
-	fmt.Fprint(dockerCli.Out(), "To add a manager to this swarm, run 'docker swarm join-token manager' and follow the instructions.\n\n")
-
-	if req.AutoLockManagers {
-		unlockKeyResp, err := client.SwarmGetUnlockKey(ctx)
-		if err != nil {
-			return errors.Wrap(err, "could not fetch unlock key")
-		}
-		printUnlockCommand(ctx, dockerCli, unlockKeyResp.UnlockKey)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/join.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/join.go
deleted file mode 100644
index 004313b4c6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/join.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package swarm
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type joinOptions struct {
-	remote     string
-	listenAddr NodeAddrOption
-	// Not a NodeAddrOption because it has no default port.
-	advertiseAddr string
-	token         string
-}
-
-func newJoinCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := joinOptions{
-		listenAddr: NewListenAddrOption(),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "join [OPTIONS] HOST:PORT",
-		Short: "Join a swarm as a node and/or manager",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.remote = args[0]
-			return runJoin(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.Var(&opts.listenAddr, flagListenAddr, "Listen address (format: <ip|interface>[:port])")
-	flags.StringVar(&opts.advertiseAddr, flagAdvertiseAddr, "", "Advertised address (format: <ip|interface>[:port])")
-	flags.StringVar(&opts.token, flagToken, "", "Token for entry into the swarm")
-	return cmd
-}
-
-func runJoin(dockerCli *command.DockerCli, opts joinOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	req := swarm.JoinRequest{
-		JoinToken:     opts.token,
-		ListenAddr:    opts.listenAddr.String(),
-		AdvertiseAddr: opts.advertiseAddr,
-		RemoteAddrs:   []string{opts.remote},
-	}
-	err := client.SwarmJoin(ctx, req)
-	if err != nil {
-		return err
-	}
-
-	info, err := client.Info(ctx)
-	if err != nil {
-		return err
-	}
-
-	if info.Swarm.ControlAvailable {
-		fmt.Fprintln(dockerCli.Out(), "This node joined a swarm as a manager.")
-	} else {
-		fmt.Fprintln(dockerCli.Out(), "This node joined a swarm as a worker.")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/join_token.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/join_token.go
deleted file mode 100644
index 3a17a8020f..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/join_token.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package swarm
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"golang.org/x/net/context"
-)
-
-func newJoinTokenCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var rotate, quiet bool
-
-	cmd := &cobra.Command{
-		Use:   "join-token [OPTIONS] (worker|manager)",
-		Short: "Manage join tokens",
-		Args:  cli.ExactArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			worker := args[0] == "worker"
-			manager := args[0] == "manager"
-
-			if !worker && !manager {
-				return errors.New("unknown role " + args[0])
-			}
-
-			client := dockerCli.Client()
-			ctx := context.Background()
-
-			if rotate {
-				var flags swarm.UpdateFlags
-
-				swarm, err := client.SwarmInspect(ctx)
-				if err != nil {
-					return err
-				}
-
-				flags.RotateWorkerToken = worker
-				flags.RotateManagerToken = manager
-
-				err = client.SwarmUpdate(ctx, swarm.Version, swarm.Spec, flags)
-				if err != nil {
-					return err
-				}
-				if !quiet {
-					fmt.Fprintf(dockerCli.Out(), "Successfully rotated %s join token.\n\n", args[0])
-				}
-			}
-
-			swarm, err := client.SwarmInspect(ctx)
-			if err != nil {
-				return err
-			}
-
-			if quiet {
-				if worker {
-					fmt.Fprintln(dockerCli.Out(), swarm.JoinTokens.Worker)
-				} else {
-					fmt.Fprintln(dockerCli.Out(), swarm.JoinTokens.Manager)
-				}
-			} else {
-				info, err := client.Info(ctx)
-				if err != nil {
-					return err
-				}
-				return printJoinCommand(ctx, dockerCli, info.Swarm.NodeID, worker, manager)
-			}
-			return nil
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVar(&rotate, flagRotate, false, "Rotate join token")
-	flags.BoolVarP(&quiet, flagQuiet, "q", false, "Only display token")
-
-	return cmd
-}
-
-func printJoinCommand(ctx context.Context, dockerCli *command.DockerCli, nodeID string, worker bool, manager bool) error {
-	client := dockerCli.Client()
-
-	swarm, err := client.SwarmInspect(ctx)
-	if err != nil {
-		return err
-	}
-
-	node, _, err := client.NodeInspectWithRaw(ctx, nodeID)
-	if err != nil {
-		return err
-	}
-
-	if node.ManagerStatus != nil {
-		if worker {
-			fmt.Fprintf(dockerCli.Out(), "To add a worker to this swarm, run the following command:\n\n    docker swarm join \\\n    --token %s \\\n    %s\n\n", swarm.JoinTokens.Worker, node.ManagerStatus.Addr)
-		}
-		if manager {
-			fmt.Fprintf(dockerCli.Out(), "To add a manager to this swarm, run the following command:\n\n    docker swarm join \\\n    --token %s \\\n    %s\n\n", swarm.JoinTokens.Manager, node.ManagerStatus.Addr)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/leave.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/leave.go
deleted file mode 100644
index e2cfa0a045..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/leave.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package swarm
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type leaveOptions struct {
-	force bool
-}
-
-func newLeaveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := leaveOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "leave [OPTIONS]",
-		Short: "Leave the swarm",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runLeave(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force this node to leave the swarm, ignoring warnings")
-	return cmd
-}
-
-func runLeave(dockerCli *command.DockerCli, opts leaveOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	if err := client.SwarmLeave(ctx, opts.force); err != nil {
-		return err
-	}
-
-	fmt.Fprintln(dockerCli.Out(), "Node left the swarm.")
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/opts.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/opts.go
deleted file mode 100644
index 9db46dcf55..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/opts.go
+++ /dev/null
@@ -1,209 +0,0 @@
-package swarm
-
-import (
-	"encoding/csv"
-	"errors"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/pflag"
-)
-
-const (
-	defaultListenAddr = "0.0.0.0:2377"
-
-	flagCertExpiry          = "cert-expiry"
-	flagDispatcherHeartbeat = "dispatcher-heartbeat"
-	flagListenAddr          = "listen-addr"
-	flagAdvertiseAddr       = "advertise-addr"
-	flagQuiet               = "quiet"
-	flagRotate              = "rotate"
-	flagToken               = "token"
-	flagTaskHistoryLimit    = "task-history-limit"
-	flagExternalCA          = "external-ca"
-	flagMaxSnapshots        = "max-snapshots"
-	flagSnapshotInterval    = "snapshot-interval"
-	flagLockKey             = "lock-key"
-	flagAutolock            = "autolock"
-)
-
-type swarmOptions struct {
-	taskHistoryLimit    int64
-	dispatcherHeartbeat time.Duration
-	nodeCertExpiry      time.Duration
-	externalCA          ExternalCAOption
-	maxSnapshots        uint64
-	snapshotInterval    uint64
-	autolock            bool
-}
-
-// NodeAddrOption is a pflag.Value for listening addresses
-type NodeAddrOption struct {
-	addr string
-}
-
-// String prints the representation of this flag
-func (a *NodeAddrOption) String() string {
-	return a.Value()
-}
-
-// Set the value for this flag
-func (a *NodeAddrOption) Set(value string) error {
-	addr, err := opts.ParseTCPAddr(value, a.addr)
-	if err != nil {
-		return err
-	}
-	a.addr = addr
-	return nil
-}
-
-// Type returns the type of this flag
-func (a *NodeAddrOption) Type() string {
-	return "node-addr"
-}
-
-// Value returns the value of this option as addr:port
-func (a *NodeAddrOption) Value() string {
-	return strings.TrimPrefix(a.addr, "tcp://")
-}
-
-// NewNodeAddrOption returns a new node address option
-func NewNodeAddrOption(addr string) NodeAddrOption {
-	return NodeAddrOption{addr}
-}
-
-// NewListenAddrOption returns a NodeAddrOption with default values
-func NewListenAddrOption() NodeAddrOption {
-	return NewNodeAddrOption(defaultListenAddr)
-}
-
-// ExternalCAOption is a Value type for parsing external CA specifications.
-type ExternalCAOption struct {
-	values []*swarm.ExternalCA
-}
-
-// Set parses an external CA option.
-func (m *ExternalCAOption) Set(value string) error {
-	parsed, err := parseExternalCA(value)
-	if err != nil {
-		return err
-	}
-
-	m.values = append(m.values, parsed)
-	return nil
-}
-
-// Type returns the type of this option.
-func (m *ExternalCAOption) Type() string {
-	return "external-ca"
-}
-
-// String returns a string repr of this option.
-func (m *ExternalCAOption) String() string {
-	externalCAs := []string{}
-	for _, externalCA := range m.values {
-		repr := fmt.Sprintf("%s: %s", externalCA.Protocol, externalCA.URL)
-		externalCAs = append(externalCAs, repr)
-	}
-	return strings.Join(externalCAs, ", ")
-}
-
-// Value returns the external CAs
-func (m *ExternalCAOption) Value() []*swarm.ExternalCA {
-	return m.values
-}
-
-// parseExternalCA parses an external CA specification from the command line,
-// such as protocol=cfssl,url=https://example.com.
-func parseExternalCA(caSpec string) (*swarm.ExternalCA, error) {
-	csvReader := csv.NewReader(strings.NewReader(caSpec))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return nil, err
-	}
-
-	externalCA := swarm.ExternalCA{
-		Options: make(map[string]string),
-	}
-
-	var (
-		hasProtocol bool
-		hasURL      bool
-	)
-
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("invalid field '%s' must be a key=value pair", field)
-		}
-
-		key, value := parts[0], parts[1]
-
-		switch strings.ToLower(key) {
-		case "protocol":
-			hasProtocol = true
-			if strings.ToLower(value) == string(swarm.ExternalCAProtocolCFSSL) {
-				externalCA.Protocol = swarm.ExternalCAProtocolCFSSL
-			} else {
-				return nil, fmt.Errorf("unrecognized external CA protocol %s", value)
-			}
-		case "url":
-			hasURL = true
-			externalCA.URL = value
-		default:
-			externalCA.Options[key] = value
-		}
-	}
-
-	if !hasProtocol {
-		return nil, errors.New("the external-ca option needs a protocol= parameter")
-	}
-	if !hasURL {
-		return nil, errors.New("the external-ca option needs a url= parameter")
-	}
-
-	return &externalCA, nil
-}
-
-func addSwarmFlags(flags *pflag.FlagSet, opts *swarmOptions) {
-	flags.Int64Var(&opts.taskHistoryLimit, flagTaskHistoryLimit, 5, "Task history retention limit")
-	flags.DurationVar(&opts.dispatcherHeartbeat, flagDispatcherHeartbeat, time.Duration(5*time.Second), "Dispatcher heartbeat period (ns|us|ms|s|m|h)")
-	flags.DurationVar(&opts.nodeCertExpiry, flagCertExpiry, time.Duration(90*24*time.Hour), "Validity period for node certificates (ns|us|ms|s|m|h)")
-	flags.Var(&opts.externalCA, flagExternalCA, "Specifications of one or more certificate signing endpoints")
-	flags.Uint64Var(&opts.maxSnapshots, flagMaxSnapshots, 0, "Number of additional Raft snapshots to retain")
-	flags.Uint64Var(&opts.snapshotInterval, flagSnapshotInterval, 10000, "Number of log entries between Raft snapshots")
-}
-
-func (opts *swarmOptions) mergeSwarmSpec(spec *swarm.Spec, flags *pflag.FlagSet) {
-	if flags.Changed(flagTaskHistoryLimit) {
-		spec.Orchestration.TaskHistoryRetentionLimit = &opts.taskHistoryLimit
-	}
-	if flags.Changed(flagDispatcherHeartbeat) {
-		spec.Dispatcher.HeartbeatPeriod = opts.dispatcherHeartbeat
-	}
-	if flags.Changed(flagCertExpiry) {
-		spec.CAConfig.NodeCertExpiry = opts.nodeCertExpiry
-	}
-	if flags.Changed(flagExternalCA) {
-		spec.CAConfig.ExternalCAs = opts.externalCA.Value()
-	}
-	if flags.Changed(flagMaxSnapshots) {
-		spec.Raft.KeepOldSnapshots = &opts.maxSnapshots
-	}
-	if flags.Changed(flagSnapshotInterval) {
-		spec.Raft.SnapshotInterval = opts.snapshotInterval
-	}
-	if flags.Changed(flagAutolock) {
-		spec.EncryptionConfig.AutoLockManagers = opts.autolock
-	}
-}
-
-func (opts *swarmOptions) ToSpec(flags *pflag.FlagSet) swarm.Spec {
-	var spec swarm.Spec
-	opts.mergeSwarmSpec(&spec, flags)
-	return spec
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/opts_test.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/opts_test.go
deleted file mode 100644
index 568dc87302..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/opts_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package swarm
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestNodeAddrOptionSetHostAndPort(t *testing.T) {
-	opt := NewNodeAddrOption("old:123")
-	addr := "newhost:5555"
-	assert.NilError(t, opt.Set(addr))
-	assert.Equal(t, opt.Value(), addr)
-}
-
-func TestNodeAddrOptionSetHostOnly(t *testing.T) {
-	opt := NewListenAddrOption()
-	assert.NilError(t, opt.Set("newhost"))
-	assert.Equal(t, opt.Value(), "newhost:2377")
-}
-
-func TestNodeAddrOptionSetHostOnlyIPv6(t *testing.T) {
-	opt := NewListenAddrOption()
-	assert.NilError(t, opt.Set("::1"))
-	assert.Equal(t, opt.Value(), "[::1]:2377")
-}
-
-func TestNodeAddrOptionSetPortOnly(t *testing.T) {
-	opt := NewListenAddrOption()
-	assert.NilError(t, opt.Set(":4545"))
-	assert.Equal(t, opt.Value(), "0.0.0.0:4545")
-}
-
-func TestNodeAddrOptionSetInvalidFormat(t *testing.T) {
-	opt := NewListenAddrOption()
-	assert.Error(t, opt.Set("http://localhost:4545"), "Invalid")
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock.go
deleted file mode 100644
index 048fb56e3d..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package swarm
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/spf13/cobra"
-	"golang.org/x/crypto/ssh/terminal"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"golang.org/x/net/context"
-)
-
-func newUnlockCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "unlock",
-		Short: "Unlock swarm",
-		Args:  cli.ExactArgs(0),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			client := dockerCli.Client()
-			ctx := context.Background()
-
-			key, err := readKey(dockerCli.In(), "Please enter unlock key: ")
-			if err != nil {
-				return err
-			}
-			req := swarm.UnlockRequest{
-				UnlockKey: key,
-			}
-
-			return client.SwarmUnlock(ctx, req)
-		},
-	}
-
-	return cmd
-}
-
-func readKey(in *command.InStream, prompt string) (string, error) {
-	if in.IsTerminal() {
-		fmt.Print(prompt)
-		dt, err := terminal.ReadPassword(int(in.FD()))
-		fmt.Println()
-		return string(dt), err
-	}
-	key, err := bufio.NewReader(in).ReadString('\n')
-	if err == io.EOF {
-		err = nil
-	}
-	return strings.TrimSpace(key), err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock_key.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock_key.go
deleted file mode 100644
index 96450f55b8..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/unlock_key.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package swarm
-
-import (
-	"fmt"
-
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-func newUnlockKeyCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var rotate, quiet bool
-
-	cmd := &cobra.Command{
-		Use:   "unlock-key [OPTIONS]",
-		Short: "Manage the unlock key",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			client := dockerCli.Client()
-			ctx := context.Background()
-
-			if rotate {
-				flags := swarm.UpdateFlags{RotateManagerUnlockKey: true}
-
-				swarm, err := client.SwarmInspect(ctx)
-				if err != nil {
-					return err
-				}
-
-				if !swarm.Spec.EncryptionConfig.AutoLockManagers {
-					return errors.New("cannot rotate because autolock is not turned on")
-				}
-
-				err = client.SwarmUpdate(ctx, swarm.Version, swarm.Spec, flags)
-				if err != nil {
-					return err
-				}
-				if !quiet {
-					fmt.Fprintf(dockerCli.Out(), "Successfully rotated manager unlock key.\n\n")
-				}
-			}
-
-			unlockKeyResp, err := client.SwarmGetUnlockKey(ctx)
-			if err != nil {
-				return errors.Wrap(err, "could not fetch unlock key")
-			}
-
-			if unlockKeyResp.UnlockKey == "" {
-				return errors.New("no unlock key is set")
-			}
-
-			if quiet {
-				fmt.Fprintln(dockerCli.Out(), unlockKeyResp.UnlockKey)
-			} else {
-				printUnlockCommand(ctx, dockerCli, unlockKeyResp.UnlockKey)
-			}
-			return nil
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVar(&rotate, flagRotate, false, "Rotate unlock key")
-	flags.BoolVarP(&quiet, flagQuiet, "q", false, "Only display token")
-
-	return cmd
-}
-
-func printUnlockCommand(ctx context.Context, dockerCli *command.DockerCli, unlockKey string) {
-	if len(unlockKey) == 0 {
-		return
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "To unlock a swarm manager after it restarts, run the `docker swarm unlock`\ncommand and provide the following key:\n\n    %s\n\nPlease remember to store this key in a password manager, since without it you\nwill not be able to restart the manager.\n", unlockKey)
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/swarm/update.go b/installer/vendor/github.com/docker/docker/cli/command/swarm/update.go
deleted file mode 100644
index dbbd268725..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/swarm/update.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package swarm
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/pkg/errors"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func newUpdateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := swarmOptions{}
-
-	cmd := &cobra.Command{
-		Use:   "update [OPTIONS]",
-		Short: "Update the swarm",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runUpdate(dockerCli, cmd.Flags(), opts)
-		},
-		PreRunE: func(cmd *cobra.Command, args []string) error {
-			if cmd.Flags().NFlag() == 0 {
-				return pflag.ErrHelp
-			}
-			return nil
-		},
-	}
-
-	cmd.Flags().BoolVar(&opts.autolock, flagAutolock, false, "Change manager autolocking setting (true|false)")
-	addSwarmFlags(cmd.Flags(), &opts)
-	return cmd
-}
-
-func runUpdate(dockerCli *command.DockerCli, flags *pflag.FlagSet, opts swarmOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-
-	var updateFlags swarm.UpdateFlags
-
-	swarm, err := client.SwarmInspect(ctx)
-	if err != nil {
-		return err
-	}
-
-	prevAutoLock := swarm.Spec.EncryptionConfig.AutoLockManagers
-
-	opts.mergeSwarmSpec(&swarm.Spec, flags)
-
-	curAutoLock := swarm.Spec.EncryptionConfig.AutoLockManagers
-
-	err = client.SwarmUpdate(ctx, swarm.Version, swarm.Spec, updateFlags)
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintln(dockerCli.Out(), "Swarm updated.")
-
-	if curAutoLock && !prevAutoLock {
-		unlockKeyResp, err := client.SwarmGetUnlockKey(ctx)
-		if err != nil {
-			return errors.Wrap(err, "could not fetch unlock key")
-		}
-		printUnlockCommand(ctx, dockerCli, unlockKeyResp.UnlockKey)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/system/cmd.go
deleted file mode 100644
index ab3beb895a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/cmd.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package system
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewSystemCommand returns a cobra command for `system` subcommands
-func NewSystemCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "system",
-		Short: "Manage Docker",
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		NewEventsCommand(dockerCli),
-		NewInfoCommand(dockerCli),
-		NewDiskUsageCommand(dockerCli),
-		NewPruneCommand(dockerCli),
-	)
-
-	return cmd
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/df.go b/installer/vendor/github.com/docker/docker/cli/command/system/df.go
deleted file mode 100644
index 9f712484aa..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/df.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package system
-
-import (
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/spf13/cobra"
-	"golang.org/x/net/context"
-)
-
-type diskUsageOptions struct {
-	verbose bool
-}
-
-// NewDiskUsageCommand creates a new cobra.Command for `docker df`
-func NewDiskUsageCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts diskUsageOptions
-
-	cmd := &cobra.Command{
-		Use:   "df [OPTIONS]",
-		Short: "Show docker disk usage",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDiskUsage(dockerCli, opts)
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-
-	flags.BoolVarP(&opts.verbose, "verbose", "v", false, "Show detailed information on space usage")
-
-	return cmd
-}
-
-func runDiskUsage(dockerCli *command.DockerCli, opts diskUsageOptions) error {
-	du, err := dockerCli.Client().DiskUsage(context.Background())
-	if err != nil {
-		return err
-	}
-
-	duCtx := formatter.DiskUsageContext{
-		Context: formatter.Context{
-			Output: dockerCli.Out(),
-		},
-		LayersSize: du.LayersSize,
-		Images:     du.Images,
-		Containers: du.Containers,
-		Volumes:    du.Volumes,
-		Verbose:    opts.verbose,
-	}
-
-	duCtx.Write()
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/events.go b/installer/vendor/github.com/docker/docker/cli/command/system/events.go
deleted file mode 100644
index 087523051a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/events.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"sort"
-	"strings"
-	"text/template"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/utils/templates"
-	"github.com/spf13/cobra"
-)
-
-type eventsOptions struct {
-	since  string
-	until  string
-	filter opts.FilterOpt
-	format string
-}
-
-// NewEventsCommand creates a new cobra.Command for `docker events`
-func NewEventsCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := eventsOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:   "events [OPTIONS]",
-		Short: "Get real time events from the server",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runEvents(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVar(&opts.since, "since", "", "Show all events created since timestamp")
-	flags.StringVar(&opts.until, "until", "", "Stream events until this timestamp")
-	flags.VarP(&opts.filter, "filter", "f", "Filter output based on conditions provided")
-	flags.StringVar(&opts.format, "format", "", "Format the output using the given Go template")
-
-	return cmd
-}
-
-func runEvents(dockerCli *command.DockerCli, opts *eventsOptions) error {
-	tmpl, err := makeTemplate(opts.format)
-	if err != nil {
-		return cli.StatusError{
-			StatusCode: 64,
-			Status:     "Error parsing format: " + err.Error()}
-	}
-	options := types.EventsOptions{
-		Since:   opts.since,
-		Until:   opts.until,
-		Filters: opts.filter.Value(),
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	events, errs := dockerCli.Client().Events(ctx, options)
-	defer cancel()
-
-	out := dockerCli.Out()
-
-	for {
-		select {
-		case event := <-events:
-			if err := handleEvent(out, event, tmpl); err != nil {
-				return err
-			}
-		case err := <-errs:
-			if err == io.EOF {
-				return nil
-			}
-			return err
-		}
-	}
-}
-
-func handleEvent(out io.Writer, event eventtypes.Message, tmpl *template.Template) error {
-	if tmpl == nil {
-		return prettyPrintEvent(out, event)
-	}
-
-	return formatEvent(out, event, tmpl)
-}
-
-func makeTemplate(format string) (*template.Template, error) {
-	if format == "" {
-		return nil, nil
-	}
-	tmpl, err := templates.Parse(format)
-	if err != nil {
-		return tmpl, err
-	}
-	// we execute the template for an empty message, so as to validate
-	// a bad template like "{{.badFieldString}}"
-	return tmpl, tmpl.Execute(ioutil.Discard, &eventtypes.Message{})
-}
-
-// prettyPrintEvent prints all types of event information.
-// Each output includes the event type, actor id, name and action.
-// Actor attributes are printed at the end if the actor has any.
-func prettyPrintEvent(out io.Writer, event eventtypes.Message) error {
-	if event.TimeNano != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(0, event.TimeNano).Format(jsonlog.RFC3339NanoFixed))
-	} else if event.Time != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(event.Time, 0).Format(jsonlog.RFC3339NanoFixed))
-	}
-
-	fmt.Fprintf(out, "%s %s %s", event.Type, event.Action, event.Actor.ID)
-
-	if len(event.Actor.Attributes) > 0 {
-		var attrs []string
-		var keys []string
-		for k := range event.Actor.Attributes {
-			keys = append(keys, k)
-		}
-		sort.Strings(keys)
-		for _, k := range keys {
-			v := event.Actor.Attributes[k]
-			attrs = append(attrs, fmt.Sprintf("%s=%s", k, v))
-		}
-		fmt.Fprintf(out, " (%s)", strings.Join(attrs, ", "))
-	}
-	fmt.Fprint(out, "\n")
-	return nil
-}
-
-func formatEvent(out io.Writer, event eventtypes.Message, tmpl *template.Template) error {
-	defer out.Write([]byte{'\n'})
-	return tmpl.Execute(out, event)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/info.go b/installer/vendor/github.com/docker/docker/cli/command/system/info.go
deleted file mode 100644
index e0b8767377..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/info.go
+++ /dev/null
@@ -1,334 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"sort"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/utils"
-	"github.com/docker/docker/utils/templates"
-	"github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type infoOptions struct {
-	format string
-}
-
-// NewInfoCommand creates a new cobra.Command for `docker info`
-func NewInfoCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts infoOptions
-
-	cmd := &cobra.Command{
-		Use:   "info [OPTIONS]",
-		Short: "Display system-wide information",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runInfo(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-
-	return cmd
-}
-
-func runInfo(dockerCli *command.DockerCli, opts *infoOptions) error {
-	ctx := context.Background()
-	info, err := dockerCli.Client().Info(ctx)
-	if err != nil {
-		return err
-	}
-	if opts.format == "" {
-		return prettyPrintInfo(dockerCli, info)
-	}
-	return formatInfo(dockerCli, info, opts.format)
-}
-
-func prettyPrintInfo(dockerCli *command.DockerCli, info types.Info) error {
-	fmt.Fprintf(dockerCli.Out(), "Containers: %d\n", info.Containers)
-	fmt.Fprintf(dockerCli.Out(), " Running: %d\n", info.ContainersRunning)
-	fmt.Fprintf(dockerCli.Out(), " Paused: %d\n", info.ContainersPaused)
-	fmt.Fprintf(dockerCli.Out(), " Stopped: %d\n", info.ContainersStopped)
-	fmt.Fprintf(dockerCli.Out(), "Images: %d\n", info.Images)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Server Version: %s\n", info.ServerVersion)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Storage Driver: %s\n", info.Driver)
-	if info.DriverStatus != nil {
-		for _, pair := range info.DriverStatus {
-			fmt.Fprintf(dockerCli.Out(), " %s: %s\n", pair[0], pair[1])
-
-			// print a warning if devicemapper is using a loopback file
-			if pair[0] == "Data loop file" {
-				fmt.Fprintln(dockerCli.Err(), " WARNING: Usage of loopback devices is strongly discouraged for production use. Use `--storage-opt dm.thinpooldev` to specify a custom block storage device.")
-			}
-		}
-
-	}
-	if info.SystemStatus != nil {
-		for _, pair := range info.SystemStatus {
-			fmt.Fprintf(dockerCli.Out(), "%s: %s\n", pair[0], pair[1])
-		}
-	}
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Logging Driver: %s\n", info.LoggingDriver)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Cgroup Driver: %s\n", info.CgroupDriver)
-
-	fmt.Fprintf(dockerCli.Out(), "Plugins: \n")
-	fmt.Fprintf(dockerCli.Out(), " Volume:")
-	fmt.Fprintf(dockerCli.Out(), " %s", strings.Join(info.Plugins.Volume, " "))
-	fmt.Fprintf(dockerCli.Out(), "\n")
-	fmt.Fprintf(dockerCli.Out(), " Network:")
-	fmt.Fprintf(dockerCli.Out(), " %s", strings.Join(info.Plugins.Network, " "))
-	fmt.Fprintf(dockerCli.Out(), "\n")
-
-	if len(info.Plugins.Authorization) != 0 {
-		fmt.Fprintf(dockerCli.Out(), " Authorization:")
-		fmt.Fprintf(dockerCli.Out(), " %s", strings.Join(info.Plugins.Authorization, " "))
-		fmt.Fprintf(dockerCli.Out(), "\n")
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "Swarm: %v\n", info.Swarm.LocalNodeState)
-	if info.Swarm.LocalNodeState != swarm.LocalNodeStateInactive && info.Swarm.LocalNodeState != swarm.LocalNodeStateLocked {
-		fmt.Fprintf(dockerCli.Out(), " NodeID: %s\n", info.Swarm.NodeID)
-		if info.Swarm.Error != "" {
-			fmt.Fprintf(dockerCli.Out(), " Error: %v\n", info.Swarm.Error)
-		}
-		fmt.Fprintf(dockerCli.Out(), " Is Manager: %v\n", info.Swarm.ControlAvailable)
-		if info.Swarm.ControlAvailable {
-			fmt.Fprintf(dockerCli.Out(), " ClusterID: %s\n", info.Swarm.Cluster.ID)
-			fmt.Fprintf(dockerCli.Out(), " Managers: %d\n", info.Swarm.Managers)
-			fmt.Fprintf(dockerCli.Out(), " Nodes: %d\n", info.Swarm.Nodes)
-			fmt.Fprintf(dockerCli.Out(), " Orchestration:\n")
-			taskHistoryRetentionLimit := int64(0)
-			if info.Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit != nil {
-				taskHistoryRetentionLimit = *info.Swarm.Cluster.Spec.Orchestration.TaskHistoryRetentionLimit
-			}
-			fmt.Fprintf(dockerCli.Out(), "  Task History Retention Limit: %d\n", taskHistoryRetentionLimit)
-			fmt.Fprintf(dockerCli.Out(), " Raft:\n")
-			fmt.Fprintf(dockerCli.Out(), "  Snapshot Interval: %d\n", info.Swarm.Cluster.Spec.Raft.SnapshotInterval)
-			if info.Swarm.Cluster.Spec.Raft.KeepOldSnapshots != nil {
-				fmt.Fprintf(dockerCli.Out(), "  Number of Old Snapshots to Retain: %d\n", *info.Swarm.Cluster.Spec.Raft.KeepOldSnapshots)
-			}
-			fmt.Fprintf(dockerCli.Out(), "  Heartbeat Tick: %d\n", info.Swarm.Cluster.Spec.Raft.HeartbeatTick)
-			fmt.Fprintf(dockerCli.Out(), "  Election Tick: %d\n", info.Swarm.Cluster.Spec.Raft.ElectionTick)
-			fmt.Fprintf(dockerCli.Out(), " Dispatcher:\n")
-			fmt.Fprintf(dockerCli.Out(), "  Heartbeat Period: %s\n", units.HumanDuration(time.Duration(info.Swarm.Cluster.Spec.Dispatcher.HeartbeatPeriod)))
-			fmt.Fprintf(dockerCli.Out(), " CA Configuration:\n")
-			fmt.Fprintf(dockerCli.Out(), "  Expiry Duration: %s\n", units.HumanDuration(info.Swarm.Cluster.Spec.CAConfig.NodeCertExpiry))
-			if len(info.Swarm.Cluster.Spec.CAConfig.ExternalCAs) > 0 {
-				fmt.Fprintf(dockerCli.Out(), "  External CAs:\n")
-				for _, entry := range info.Swarm.Cluster.Spec.CAConfig.ExternalCAs {
-					fmt.Fprintf(dockerCli.Out(), "    %s: %s\n", entry.Protocol, entry.URL)
-				}
-			}
-		}
-		fmt.Fprintf(dockerCli.Out(), " Node Address: %s\n", info.Swarm.NodeAddr)
-		managers := []string{}
-		for _, entry := range info.Swarm.RemoteManagers {
-			managers = append(managers, entry.Addr)
-		}
-		if len(managers) > 0 {
-			sort.Strings(managers)
-			fmt.Fprintf(dockerCli.Out(), " Manager Addresses:\n")
-			for _, entry := range managers {
-				fmt.Fprintf(dockerCli.Out(), "  %s\n", entry)
-			}
-		}
-	}
-
-	if len(info.Runtimes) > 0 {
-		fmt.Fprintf(dockerCli.Out(), "Runtimes:")
-		for name := range info.Runtimes {
-			fmt.Fprintf(dockerCli.Out(), " %s", name)
-		}
-		fmt.Fprint(dockerCli.Out(), "\n")
-		fmt.Fprintf(dockerCli.Out(), "Default Runtime: %s\n", info.DefaultRuntime)
-	}
-
-	if info.OSType == "linux" {
-		fmt.Fprintf(dockerCli.Out(), "Init Binary: %v\n", info.InitBinary)
-
-		for _, ci := range []struct {
-			Name   string
-			Commit types.Commit
-		}{
-			{"containerd", info.ContainerdCommit},
-			{"runc", info.RuncCommit},
-			{"init", info.InitCommit},
-		} {
-			fmt.Fprintf(dockerCli.Out(), "%s version: %s", ci.Name, ci.Commit.ID)
-			if ci.Commit.ID != ci.Commit.Expected {
-				fmt.Fprintf(dockerCli.Out(), " (expected: %s)", ci.Commit.Expected)
-			}
-			fmt.Fprintf(dockerCli.Out(), "\n")
-		}
-		if len(info.SecurityOptions) != 0 {
-			kvs, err := types.DecodeSecurityOptions(info.SecurityOptions)
-			if err != nil {
-				return err
-			}
-			fmt.Fprintf(dockerCli.Out(), "Security Options:\n")
-			for _, so := range kvs {
-				fmt.Fprintf(dockerCli.Out(), " %s\n", so.Name)
-				for _, o := range so.Options {
-					switch o.Key {
-					case "profile":
-						if o.Value != "default" {
-							fmt.Fprintf(dockerCli.Err(), "  WARNING: You're not using the default seccomp profile\n")
-						}
-						fmt.Fprintf(dockerCli.Out(), "  Profile: %s\n", o.Value)
-					}
-				}
-			}
-		}
-	}
-
-	// Isolation only has meaning on a Windows daemon.
-	if info.OSType == "windows" {
-		fmt.Fprintf(dockerCli.Out(), "Default Isolation: %v\n", info.Isolation)
-	}
-
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Kernel Version: %s\n", info.KernelVersion)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Operating System: %s\n", info.OperatingSystem)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "OSType: %s\n", info.OSType)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Architecture: %s\n", info.Architecture)
-	fmt.Fprintf(dockerCli.Out(), "CPUs: %d\n", info.NCPU)
-	fmt.Fprintf(dockerCli.Out(), "Total Memory: %s\n", units.BytesSize(float64(info.MemTotal)))
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Name: %s\n", info.Name)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "ID: %s\n", info.ID)
-	fmt.Fprintf(dockerCli.Out(), "Docker Root Dir: %s\n", info.DockerRootDir)
-	fmt.Fprintf(dockerCli.Out(), "Debug Mode (client): %v\n", utils.IsDebugEnabled())
-	fmt.Fprintf(dockerCli.Out(), "Debug Mode (server): %v\n", info.Debug)
-
-	if info.Debug {
-		fmt.Fprintf(dockerCli.Out(), " File Descriptors: %d\n", info.NFd)
-		fmt.Fprintf(dockerCli.Out(), " Goroutines: %d\n", info.NGoroutines)
-		fmt.Fprintf(dockerCli.Out(), " System Time: %s\n", info.SystemTime)
-		fmt.Fprintf(dockerCli.Out(), " EventsListeners: %d\n", info.NEventsListener)
-	}
-
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Http Proxy: %s\n", info.HTTPProxy)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "Https Proxy: %s\n", info.HTTPSProxy)
-	ioutils.FprintfIfNotEmpty(dockerCli.Out(), "No Proxy: %s\n", info.NoProxy)
-
-	if info.IndexServerAddress != "" {
-		u := dockerCli.ConfigFile().AuthConfigs[info.IndexServerAddress].Username
-		if len(u) > 0 {
-			fmt.Fprintf(dockerCli.Out(), "Username: %v\n", u)
-		}
-		fmt.Fprintf(dockerCli.Out(), "Registry: %v\n", info.IndexServerAddress)
-	}
-
-	// Only output these warnings if the server does not support these features
-	if info.OSType != "windows" {
-		if !info.MemoryLimit {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No memory limit support")
-		}
-		if !info.SwapLimit {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No swap limit support")
-		}
-		if !info.KernelMemory {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No kernel memory limit support")
-		}
-		if !info.OomKillDisable {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No oom kill disable support")
-		}
-		if !info.CPUCfsQuota {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No cpu cfs quota support")
-		}
-		if !info.CPUCfsPeriod {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No cpu cfs period support")
-		}
-		if !info.CPUShares {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No cpu shares support")
-		}
-		if !info.CPUSet {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: No cpuset support")
-		}
-		if !info.IPv4Forwarding {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: IPv4 forwarding is disabled")
-		}
-		if !info.BridgeNfIptables {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: bridge-nf-call-iptables is disabled")
-		}
-		if !info.BridgeNfIP6tables {
-			fmt.Fprintln(dockerCli.Err(), "WARNING: bridge-nf-call-ip6tables is disabled")
-		}
-	}
-
-	if info.Labels != nil {
-		fmt.Fprintln(dockerCli.Out(), "Labels:")
-		for _, attribute := range info.Labels {
-			fmt.Fprintf(dockerCli.Out(), " %s\n", attribute)
-		}
-		// TODO: Engine labels with duplicate keys has been deprecated in 1.13 and will be error out
-		// after 3 release cycles (1.16). For now, a WARNING will be generated. The following will
-		// be removed eventually.
-		labelMap := map[string]string{}
-		for _, label := range info.Labels {
-			stringSlice := strings.SplitN(label, "=", 2)
-			if len(stringSlice) > 1 {
-				// If there is a conflict we will throw out an warning
-				if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] {
-					fmt.Fprintln(dockerCli.Err(), "WARNING: labels with duplicate keys and conflicting values have been deprecated")
-					break
-				}
-				labelMap[stringSlice[0]] = stringSlice[1]
-			}
-		}
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "Experimental: %v\n", info.ExperimentalBuild)
-	if info.ClusterStore != "" {
-		fmt.Fprintf(dockerCli.Out(), "Cluster Store: %s\n", info.ClusterStore)
-	}
-
-	if info.ClusterAdvertise != "" {
-		fmt.Fprintf(dockerCli.Out(), "Cluster Advertise: %s\n", info.ClusterAdvertise)
-	}
-
-	if info.RegistryConfig != nil && (len(info.RegistryConfig.InsecureRegistryCIDRs) > 0 || len(info.RegistryConfig.IndexConfigs) > 0) {
-		fmt.Fprintln(dockerCli.Out(), "Insecure Registries:")
-		for _, registry := range info.RegistryConfig.IndexConfigs {
-			if registry.Secure == false {
-				fmt.Fprintf(dockerCli.Out(), " %s\n", registry.Name)
-			}
-		}
-
-		for _, registry := range info.RegistryConfig.InsecureRegistryCIDRs {
-			mask, _ := registry.Mask.Size()
-			fmt.Fprintf(dockerCli.Out(), " %s/%d\n", registry.IP.String(), mask)
-		}
-	}
-
-	if info.RegistryConfig != nil && len(info.RegistryConfig.Mirrors) > 0 {
-		fmt.Fprintln(dockerCli.Out(), "Registry Mirrors:")
-		for _, mirror := range info.RegistryConfig.Mirrors {
-			fmt.Fprintf(dockerCli.Out(), " %s\n", mirror)
-		}
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "Live Restore Enabled: %v\n", info.LiveRestoreEnabled)
-
-	return nil
-}
-
-func formatInfo(dockerCli *command.DockerCli, info types.Info, format string) error {
-	tmpl, err := templates.Parse(format)
-	if err != nil {
-		return cli.StatusError{StatusCode: 64,
-			Status: "Template parsing error: " + err.Error()}
-	}
-	err = tmpl.Execute(dockerCli.Out(), info)
-	dockerCli.Out().Write([]byte{'\n'})
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/system/inspect.go
deleted file mode 100644
index c86e858a29..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/inspect.go
+++ /dev/null
@@ -1,203 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	apiclient "github.com/docker/docker/client"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	format      string
-	inspectType string
-	size        bool
-	ids         []string
-}
-
-// NewInspectCommand creates a new cobra.Command for `docker inspect`
-func NewInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] NAME|ID [NAME|ID...]",
-		Short: "Return low-level information on Docker objects",
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.ids = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-	flags.StringVar(&opts.inspectType, "type", "", "Return JSON for specified type")
-	flags.BoolVarP(&opts.size, "size", "s", false, "Display total file sizes if the type is container")
-
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	var elementSearcher inspect.GetRefFunc
-	switch opts.inspectType {
-	case "", "container", "image", "node", "network", "service", "volume", "task", "plugin":
-		elementSearcher = inspectAll(context.Background(), dockerCli, opts.size, opts.inspectType)
-	default:
-		return fmt.Errorf("%q is not a valid value for --type", opts.inspectType)
-	}
-	return inspect.Inspect(dockerCli.Out(), opts.ids, opts.format, elementSearcher)
-}
-
-func inspectContainers(ctx context.Context, dockerCli *command.DockerCli, getSize bool) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().ContainerInspectWithRaw(ctx, ref, getSize)
-	}
-}
-
-func inspectImages(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().ImageInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectNetwork(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().NetworkInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectNode(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().NodeInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectService(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().ServiceInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectTasks(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().TaskInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectVolume(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().VolumeInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectPlugin(ctx context.Context, dockerCli *command.DockerCli) inspect.GetRefFunc {
-	return func(ref string) (interface{}, []byte, error) {
-		return dockerCli.Client().PluginInspectWithRaw(ctx, ref)
-	}
-}
-
-func inspectAll(ctx context.Context, dockerCli *command.DockerCli, getSize bool, typeConstraint string) inspect.GetRefFunc {
-	var inspectAutodetect = []struct {
-		objectType      string
-		isSizeSupported bool
-		isSwarmObject   bool
-		objectInspector func(string) (interface{}, []byte, error)
-	}{
-		{
-			objectType:      "container",
-			isSizeSupported: true,
-			objectInspector: inspectContainers(ctx, dockerCli, getSize),
-		},
-		{
-			objectType:      "image",
-			objectInspector: inspectImages(ctx, dockerCli),
-		},
-		{
-			objectType:      "network",
-			objectInspector: inspectNetwork(ctx, dockerCli),
-		},
-		{
-			objectType:      "volume",
-			objectInspector: inspectVolume(ctx, dockerCli),
-		},
-		{
-			objectType:      "service",
-			isSwarmObject:   true,
-			objectInspector: inspectService(ctx, dockerCli),
-		},
-		{
-			objectType:      "task",
-			isSwarmObject:   true,
-			objectInspector: inspectTasks(ctx, dockerCli),
-		},
-		{
-			objectType:      "node",
-			isSwarmObject:   true,
-			objectInspector: inspectNode(ctx, dockerCli),
-		},
-		{
-			objectType:      "plugin",
-			objectInspector: inspectPlugin(ctx, dockerCli),
-		},
-	}
-
-	// isSwarmManager does an Info API call to verify that the daemon is
-	// a swarm manager.
-	isSwarmManager := func() bool {
-		info, err := dockerCli.Client().Info(ctx)
-		if err != nil {
-			fmt.Fprintln(dockerCli.Err(), err)
-			return false
-		}
-		return info.Swarm.ControlAvailable
-	}
-
-	isErrNotSupported := func(err error) bool {
-		return strings.Contains(err.Error(), "not supported")
-	}
-
-	return func(ref string) (interface{}, []byte, error) {
-		const (
-			swarmSupportUnknown = iota
-			swarmSupported
-			swarmUnsupported
-		)
-
-		isSwarmSupported := swarmSupportUnknown
-
-		for _, inspectData := range inspectAutodetect {
-			if typeConstraint != "" && inspectData.objectType != typeConstraint {
-				continue
-			}
-			if typeConstraint == "" && inspectData.isSwarmObject {
-				if isSwarmSupported == swarmSupportUnknown {
-					if isSwarmManager() {
-						isSwarmSupported = swarmSupported
-					} else {
-						isSwarmSupported = swarmUnsupported
-					}
-				}
-				if isSwarmSupported == swarmUnsupported {
-					continue
-				}
-			}
-			v, raw, err := inspectData.objectInspector(ref)
-			if err != nil {
-				if typeConstraint == "" && (apiclient.IsErrNotFound(err) || isErrNotSupported(err)) {
-					continue
-				}
-				return v, raw, err
-			}
-			if getSize && !inspectData.isSizeSupported {
-				fmt.Fprintf(dockerCli.Err(), "WARNING: --size ignored for %s\n", inspectData.objectType)
-			}
-			return v, raw, err
-		}
-		return nil, nil, fmt.Errorf("Error: No such object: %s", ref)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/prune.go b/installer/vendor/github.com/docker/docker/cli/command/system/prune.go
deleted file mode 100644
index 92dddbdca6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/prune.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package system
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/prune"
-	units "github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type pruneOptions struct {
-	force bool
-	all   bool
-}
-
-// NewPruneCommand creates a new cobra.Command for `docker prune`
-func NewPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pruneOptions
-
-	cmd := &cobra.Command{
-		Use:   "prune [OPTIONS]",
-		Short: "Remove unused data",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runPrune(dockerCli, opts)
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Do not prompt for confirmation")
-	flags.BoolVarP(&opts.all, "all", "a", false, "Remove all unused images not just dangling ones")
-
-	return cmd
-}
-
-const (
-	warning = `WARNING! This will remove:
-	- all stopped containers
-	- all volumes not used by at least one container
-	- all networks not used by at least one container
-	%s
-Are you sure you want to continue?`
-
-	danglingImageDesc = "- all dangling images"
-	allImageDesc      = `- all images without at least one container associated to them`
-)
-
-func runPrune(dockerCli *command.DockerCli, opts pruneOptions) error {
-	var message string
-
-	if opts.all {
-		message = fmt.Sprintf(warning, allImageDesc)
-	} else {
-		message = fmt.Sprintf(warning, danglingImageDesc)
-	}
-
-	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), message) {
-		return nil
-	}
-
-	var spaceReclaimed uint64
-
-	for _, pruneFn := range []func(dockerCli *command.DockerCli) (uint64, string, error){
-		prune.RunContainerPrune,
-		prune.RunVolumePrune,
-		prune.RunNetworkPrune,
-	} {
-		spc, output, err := pruneFn(dockerCli)
-		if err != nil {
-			return err
-		}
-		spaceReclaimed += spc
-		if output != "" {
-			fmt.Fprintln(dockerCli.Out(), output)
-		}
-	}
-
-	spc, output, err := prune.RunImagePrune(dockerCli, opts.all)
-	if err != nil {
-		return err
-	}
-	if spc > 0 {
-		spaceReclaimed += spc
-		fmt.Fprintln(dockerCli.Out(), output)
-	}
-
-	fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed)))
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/system/version.go b/installer/vendor/github.com/docker/docker/cli/command/system/version.go
deleted file mode 100644
index ded4f4d118..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/system/version.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"runtime"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/utils/templates"
-	"github.com/spf13/cobra"
-)
-
-var versionTemplate = `Client:
- Version:      {{.Client.Version}}
- API version:  {{.Client.APIVersion}}
- Go version:   {{.Client.GoVersion}}
- Git commit:   {{.Client.GitCommit}}
- Built:        {{.Client.BuildTime}}
- OS/Arch:      {{.Client.Os}}/{{.Client.Arch}}{{if .ServerOK}}
-
-Server:
- Version:      {{.Server.Version}}
- API version:  {{.Server.APIVersion}} (minimum version {{.Server.MinAPIVersion}})
- Go version:   {{.Server.GoVersion}}
- Git commit:   {{.Server.GitCommit}}
- Built:        {{.Server.BuildTime}}
- OS/Arch:      {{.Server.Os}}/{{.Server.Arch}}
- Experimental: {{.Server.Experimental}}{{end}}`
-
-type versionOptions struct {
-	format string
-}
-
-// NewVersionCommand creates a new cobra.Command for `docker version`
-func NewVersionCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts versionOptions
-
-	cmd := &cobra.Command{
-		Use:   "version [OPTIONS]",
-		Short: "Show the Docker version information",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runVersion(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-
-	flags.StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-
-	return cmd
-}
-
-func runVersion(dockerCli *command.DockerCli, opts *versionOptions) error {
-	ctx := context.Background()
-
-	templateFormat := versionTemplate
-	if opts.format != "" {
-		templateFormat = opts.format
-	}
-
-	tmpl, err := templates.Parse(templateFormat)
-	if err != nil {
-		return cli.StatusError{StatusCode: 64,
-			Status: "Template parsing error: " + err.Error()}
-	}
-
-	APIVersion := dockerCli.Client().ClientVersion()
-	if defaultAPIVersion := dockerCli.DefaultVersion(); APIVersion != defaultAPIVersion {
-		APIVersion = fmt.Sprintf("%s (downgraded from %s)", APIVersion, defaultAPIVersion)
-	}
-
-	vd := types.VersionResponse{
-		Client: &types.Version{
-			Version:    dockerversion.Version,
-			APIVersion: APIVersion,
-			GoVersion:  runtime.Version(),
-			GitCommit:  dockerversion.GitCommit,
-			BuildTime:  dockerversion.BuildTime,
-			Os:         runtime.GOOS,
-			Arch:       runtime.GOARCH,
-		},
-	}
-
-	serverVersion, err := dockerCli.Client().ServerVersion(ctx)
-	if err == nil {
-		vd.Server = &serverVersion
-	}
-
-	// first we need to make BuildTime more human friendly
-	t, errTime := time.Parse(time.RFC3339Nano, vd.Client.BuildTime)
-	if errTime == nil {
-		vd.Client.BuildTime = t.Format(time.ANSIC)
-	}
-
-	if vd.ServerOK() {
-		t, errTime = time.Parse(time.RFC3339Nano, vd.Server.BuildTime)
-		if errTime == nil {
-			vd.Server.BuildTime = t.Format(time.ANSIC)
-		}
-	}
-
-	if err2 := tmpl.Execute(dockerCli.Out(), vd); err2 != nil && err == nil {
-		err = err2
-	}
-	dockerCli.Out().Write([]byte{'\n'})
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/task/print.go b/installer/vendor/github.com/docker/docker/cli/command/task/print.go
deleted file mode 100644
index 0f1c2cf724..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/task/print.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package task
-
-import (
-	"fmt"
-	"io"
-	"sort"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"golang.org/x/net/context"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/idresolver"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/go-units"
-)
-
-const (
-	psTaskItemFmt = "%s\t%s\t%s\t%s\t%s\t%s %s ago\t%s\t%s\n"
-	maxErrLength  = 30
-)
-
-type portStatus swarm.PortStatus
-
-func (ps portStatus) String() string {
-	if len(ps.Ports) == 0 {
-		return ""
-	}
-
-	str := fmt.Sprintf("*:%d->%d/%s", ps.Ports[0].PublishedPort, ps.Ports[0].TargetPort, ps.Ports[0].Protocol)
-	for _, pConfig := range ps.Ports[1:] {
-		str += fmt.Sprintf(",*:%d->%d/%s", pConfig.PublishedPort, pConfig.TargetPort, pConfig.Protocol)
-	}
-
-	return str
-}
-
-type tasksBySlot []swarm.Task
-
-func (t tasksBySlot) Len() int {
-	return len(t)
-}
-
-func (t tasksBySlot) Swap(i, j int) {
-	t[i], t[j] = t[j], t[i]
-}
-
-func (t tasksBySlot) Less(i, j int) bool {
-	// Sort by slot.
-	if t[i].Slot != t[j].Slot {
-		return t[i].Slot < t[j].Slot
-	}
-
-	// If same slot, sort by most recent.
-	return t[j].Meta.CreatedAt.Before(t[i].CreatedAt)
-}
-
-// Print task information in a table format.
-// Besides this, command `docker node ps <node>`
-// and `docker stack ps` will call this, too.
-func Print(dockerCli *command.DockerCli, ctx context.Context, tasks []swarm.Task, resolver *idresolver.IDResolver, noTrunc bool) error {
-	sort.Stable(tasksBySlot(tasks))
-
-	writer := tabwriter.NewWriter(dockerCli.Out(), 0, 4, 2, ' ', 0)
-
-	// Ignore flushing errors
-	defer writer.Flush()
-	fmt.Fprintln(writer, strings.Join([]string{"ID", "NAME", "IMAGE", "NODE", "DESIRED STATE", "CURRENT STATE", "ERROR", "PORTS"}, "\t"))
-
-	if err := print(writer, ctx, tasks, resolver, noTrunc); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// PrintQuiet shows task list in a quiet way.
-func PrintQuiet(dockerCli *command.DockerCli, tasks []swarm.Task) error {
-	sort.Stable(tasksBySlot(tasks))
-
-	out := dockerCli.Out()
-
-	for _, task := range tasks {
-		fmt.Fprintln(out, task.ID)
-	}
-
-	return nil
-}
-
-func print(out io.Writer, ctx context.Context, tasks []swarm.Task, resolver *idresolver.IDResolver, noTrunc bool) error {
-	prevName := ""
-	for _, task := range tasks {
-		id := task.ID
-		if !noTrunc {
-			id = stringid.TruncateID(id)
-		}
-
-		serviceName, err := resolver.Resolve(ctx, swarm.Service{}, task.ServiceID)
-		if err != nil {
-			return err
-		}
-
-		nodeValue, err := resolver.Resolve(ctx, swarm.Node{}, task.NodeID)
-		if err != nil {
-			return err
-		}
-
-		name := ""
-		if task.Slot != 0 {
-			name = fmt.Sprintf("%v.%v", serviceName, task.Slot)
-		} else {
-			name = fmt.Sprintf("%v.%v", serviceName, task.NodeID)
-		}
-
-		// Indent the name if necessary
-		indentedName := name
-		if name == prevName {
-			indentedName = fmt.Sprintf(" \\_ %s", indentedName)
-		}
-		prevName = name
-
-		// Trim and quote the error message.
-		taskErr := task.Status.Err
-		if !noTrunc && len(taskErr) > maxErrLength {
-			taskErr = fmt.Sprintf("%s…", taskErr[:maxErrLength-1])
-		}
-		if len(taskErr) > 0 {
-			taskErr = fmt.Sprintf("\"%s\"", taskErr)
-		}
-
-		image := task.Spec.ContainerSpec.Image
-		if !noTrunc {
-			ref, err := distreference.ParseNamed(image)
-			if err == nil {
-				// update image string for display
-				namedTagged, ok := ref.(distreference.NamedTagged)
-				if ok {
-					image = namedTagged.Name() + ":" + namedTagged.Tag()
-				}
-			}
-		}
-
-		fmt.Fprintf(
-			out,
-			psTaskItemFmt,
-			id,
-			indentedName,
-			image,
-			nodeValue,
-			command.PrettyPrint(task.DesiredState),
-			command.PrettyPrint(task.Status.State),
-			strings.ToLower(units.HumanDuration(time.Since(task.Status.Timestamp))),
-			taskErr,
-			portStatus(task.Status.PortStatus),
-		)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/trust.go b/installer/vendor/github.com/docker/docker/cli/command/trust.go
deleted file mode 100644
index b4c8a84ee5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/trust.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package command
-
-import (
-	"os"
-	"strconv"
-
-	"github.com/spf13/pflag"
-)
-
-var (
-	// TODO: make this not global
-	untrusted bool
-)
-
-// AddTrustedFlags adds content trust flags to the current command flagset
-func AddTrustedFlags(fs *pflag.FlagSet, verify bool) {
-	trusted, message := setupTrustedFlag(verify)
-	fs.BoolVar(&untrusted, "disable-content-trust", !trusted, message)
-}
-
-func setupTrustedFlag(verify bool) (bool, string) {
-	var trusted bool
-	if e := os.Getenv("DOCKER_CONTENT_TRUST"); e != "" {
-		if t, err := strconv.ParseBool(e); t || err != nil {
-			// treat any other value as true
-			trusted = true
-		}
-	}
-	message := "Skip image signing"
-	if verify {
-		message = "Skip image verification"
-	}
-	return trusted, message
-}
-
-// IsTrusted returns true if content trust is enabled
-func IsTrusted() bool {
-	return !untrusted
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/utils.go b/installer/vendor/github.com/docker/docker/cli/command/utils.go
deleted file mode 100644
index 1837ca41f0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/utils.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package command
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-// CopyToFile writes the content of the reader to the specified file
-func CopyToFile(outfile string, r io.Reader) error {
-	tmpFile, err := ioutil.TempFile(filepath.Dir(outfile), ".docker_temp_")
-	if err != nil {
-		return err
-	}
-
-	tmpPath := tmpFile.Name()
-
-	_, err = io.Copy(tmpFile, r)
-	tmpFile.Close()
-
-	if err != nil {
-		os.Remove(tmpPath)
-		return err
-	}
-
-	if err = os.Rename(tmpPath, outfile); err != nil {
-		os.Remove(tmpPath)
-		return err
-	}
-
-	return nil
-}
-
-// capitalizeFirst capitalizes the first character of string
-func capitalizeFirst(s string) string {
-	switch l := len(s); l {
-	case 0:
-		return s
-	case 1:
-		return strings.ToLower(s)
-	default:
-		return strings.ToUpper(string(s[0])) + strings.ToLower(s[1:])
-	}
-}
-
-// PrettyPrint outputs arbitrary data for human formatted output by uppercasing the first letter.
-func PrettyPrint(i interface{}) string {
-	switch t := i.(type) {
-	case nil:
-		return "None"
-	case string:
-		return capitalizeFirst(t)
-	default:
-		return capitalizeFirst(fmt.Sprintf("%s", t))
-	}
-}
-
-// PromptForConfirmation requests and checks confirmation from user.
-// This will display the provided message followed by ' [y/N] '. If
-// the user input 'y' or 'Y' it returns true other false.  If no
-// message is provided "Are you sure you want to proceed? [y/N] "
-// will be used instead.
-func PromptForConfirmation(ins *InStream, outs *OutStream, message string) bool {
-	if message == "" {
-		message = "Are you sure you want to proceed?"
-	}
-	message += " [y/N] "
-
-	fmt.Fprintf(outs, message)
-
-	// On Windows, force the use of the regular OS stdin stream.
-	if runtime.GOOS == "windows" {
-		ins = NewInStream(os.Stdin)
-	}
-
-	answer := ""
-	n, _ := fmt.Fscan(ins, &answer)
-	if n != 1 || (answer != "y" && answer != "Y") {
-		return false
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/cmd.go b/installer/vendor/github.com/docker/docker/cli/command/volume/cmd.go
deleted file mode 100644
index 40862f29d1..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/cmd.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package volume
-
-import (
-	"github.com/spf13/cobra"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-)
-
-// NewVolumeCommand returns a cobra command for `volume` subcommands
-func NewVolumeCommand(dockerCli *command.DockerCli) *cobra.Command {
-	cmd := &cobra.Command{
-		Use:   "volume COMMAND",
-		Short: "Manage volumes",
-		Long:  volumeDescription,
-		Args:  cli.NoArgs,
-		RunE:  dockerCli.ShowHelp,
-	}
-	cmd.AddCommand(
-		newCreateCommand(dockerCli),
-		newInspectCommand(dockerCli),
-		newListCommand(dockerCli),
-		newRemoveCommand(dockerCli),
-		NewPruneCommand(dockerCli),
-	)
-	return cmd
-}
-
-var volumeDescription = `
-The **docker volume** command has subcommands for managing data volumes. A data
-volume is a specially-designated directory that by-passes storage driver
-management.
-
-Data volumes persist data independent of a container's life cycle. When you
-delete a container, the Docker daemon does not delete any data volumes. You can
-share volumes across multiple containers. Moreover, you can share data volumes
-with other computing resources in your system.
-
-To see help for a subcommand, use:
-
-    docker volume COMMAND --help
-
-For full details on using docker volume visit Docker's online documentation.
-
-`
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/create.go b/installer/vendor/github.com/docker/docker/cli/command/volume/create.go
deleted file mode 100644
index 7b2a7e3318..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/create.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package volume
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/cobra"
-)
-
-type createOptions struct {
-	name       string
-	driver     string
-	driverOpts opts.MapOpts
-	labels     opts.ListOpts
-}
-
-func newCreateCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := createOptions{
-		driverOpts: *opts.NewMapOpts(nil, nil),
-		labels:     opts.NewListOpts(runconfigopts.ValidateEnv),
-	}
-
-	cmd := &cobra.Command{
-		Use:   "create [OPTIONS] [VOLUME]",
-		Short: "Create a volume",
-		Long:  createDescription,
-		Args:  cli.RequiresMaxArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if len(args) == 1 {
-				if opts.name != "" {
-					fmt.Fprint(dockerCli.Err(), "Conflicting options: either specify --name or provide positional arg, not both\n")
-					return cli.StatusError{StatusCode: 1}
-				}
-				opts.name = args[0]
-			}
-			return runCreate(dockerCli, opts)
-		},
-	}
-	flags := cmd.Flags()
-	flags.StringVarP(&opts.driver, "driver", "d", "local", "Specify volume driver name")
-	flags.StringVar(&opts.name, "name", "", "Specify volume name")
-	flags.Lookup("name").Hidden = true
-	flags.VarP(&opts.driverOpts, "opt", "o", "Set driver specific options")
-	flags.Var(&opts.labels, "label", "Set metadata for a volume")
-
-	return cmd
-}
-
-func runCreate(dockerCli *command.DockerCli, opts createOptions) error {
-	client := dockerCli.Client()
-
-	volReq := volumetypes.VolumesCreateBody{
-		Driver:     opts.driver,
-		DriverOpts: opts.driverOpts.GetAll(),
-		Name:       opts.name,
-		Labels:     runconfigopts.ConvertKVStringsToMap(opts.labels.GetAll()),
-	}
-
-	vol, err := client.VolumeCreate(context.Background(), volReq)
-	if err != nil {
-		return err
-	}
-
-	fmt.Fprintf(dockerCli.Out(), "%s\n", vol.Name)
-	return nil
-}
-
-var createDescription = `
-Creates a new volume that containers can consume and store data in. If a name
-is not specified, Docker generates a random name. You create a volume and then
-configure the container to use it, for example:
-
-    $ docker volume create hello
-    hello
-    $ docker run -d -v hello:/world busybox ls /world
-
-The mount is created inside the container's **/src** directory. Docker doesn't
-not support relative paths for mount points inside the container.
-
-Multiple containers can use the same volume in the same time period. This is
-useful if two containers need access to shared data. For example, if one
-container writes and the other reads the data.
-
-## Driver specific options
-
-Some volume drivers may take options to customize the volume creation. Use the
-**-o** or **--opt** flags to pass driver options:
-
-    $ docker volume create --driver fake --opt tardis=blue --opt timey=wimey
-
-These options are passed directly to the volume driver. Options for different
-volume drivers may do different things (or nothing at all).
-
-The built-in **local** driver on Windows does not support any options.
-
-The built-in **local** driver on Linux accepts options similar to the linux
-**mount** command:
-
-    $ docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000
-
-Another example:
-
-    $ docker volume create --driver local --opt type=btrfs --opt device=/dev/sda2
-
-`
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/inspect.go b/installer/vendor/github.com/docker/docker/cli/command/volume/inspect.go
deleted file mode 100644
index 5eb8ad2516..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/inspect.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package volume
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/inspect"
-	"github.com/spf13/cobra"
-)
-
-type inspectOptions struct {
-	format string
-	names  []string
-}
-
-func newInspectCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts inspectOptions
-
-	cmd := &cobra.Command{
-		Use:   "inspect [OPTIONS] VOLUME [VOLUME...]",
-		Short: "Display detailed information on one or more volumes",
-		Long:  inspectDescription,
-		Args:  cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.names = args
-			return runInspect(dockerCli, opts)
-		},
-	}
-
-	cmd.Flags().StringVarP(&opts.format, "format", "f", "", "Format the output using the given Go template")
-
-	return cmd
-}
-
-func runInspect(dockerCli *command.DockerCli, opts inspectOptions) error {
-	client := dockerCli.Client()
-
-	ctx := context.Background()
-
-	getVolFunc := func(name string) (interface{}, []byte, error) {
-		i, err := client.VolumeInspect(ctx, name)
-		return i, nil, err
-	}
-
-	return inspect.Inspect(dockerCli.Out(), opts.names, opts.format, getVolFunc)
-}
-
-var inspectDescription = `
-Returns information about one or more volumes. By default, this command renders
-all results in a JSON array. You can specify an alternate format to execute a
-given template is executed for each result. Go's https://golang.org/pkg/text/template/
-package describes all the details of the format.
-
-`
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/list.go b/installer/vendor/github.com/docker/docker/cli/command/volume/list.go
deleted file mode 100644
index d76006a1b2..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/list.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package volume
-
-import (
-	"sort"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/formatter"
-	"github.com/docker/docker/opts"
-	"github.com/spf13/cobra"
-)
-
-type byVolumeName []*types.Volume
-
-func (r byVolumeName) Len() int      { return len(r) }
-func (r byVolumeName) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r byVolumeName) Less(i, j int) bool {
-	return r[i].Name < r[j].Name
-}
-
-type listOptions struct {
-	quiet  bool
-	format string
-	filter opts.FilterOpt
-}
-
-func newListCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := listOptions{filter: opts.NewFilterOpt()}
-
-	cmd := &cobra.Command{
-		Use:     "ls [OPTIONS]",
-		Aliases: []string{"list"},
-		Short:   "List volumes",
-		Long:    listDescription,
-		Args:    cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runList(dockerCli, opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.quiet, "quiet", "q", false, "Only display volume names")
-	flags.StringVar(&opts.format, "format", "", "Pretty-print volumes using a Go template")
-	flags.VarP(&opts.filter, "filter", "f", "Provide filter values (e.g. 'dangling=true')")
-
-	return cmd
-}
-
-func runList(dockerCli *command.DockerCli, opts listOptions) error {
-	client := dockerCli.Client()
-	volumes, err := client.VolumeList(context.Background(), opts.filter.Value())
-	if err != nil {
-		return err
-	}
-
-	format := opts.format
-	if len(format) == 0 {
-		if len(dockerCli.ConfigFile().VolumesFormat) > 0 && !opts.quiet {
-			format = dockerCli.ConfigFile().VolumesFormat
-		} else {
-			format = formatter.TableFormatKey
-		}
-	}
-
-	sort.Sort(byVolumeName(volumes.Volumes))
-
-	volumeCtx := formatter.Context{
-		Output: dockerCli.Out(),
-		Format: formatter.NewVolumeFormat(format, opts.quiet),
-	}
-	return formatter.VolumeWrite(volumeCtx, volumes.Volumes)
-}
-
-var listDescription = `
-
-Lists all the volumes Docker manages. You can filter using the **-f** or
-**--filter** flag. The filtering format is a **key=value** pair. To specify
-more than one filter,  pass multiple flags (for example,
-**--filter "foo=bar" --filter "bif=baz"**)
-
-The currently supported filters are:
-
-* **dangling** (boolean - **true** or **false**, **1** or **0**)
-* **driver** (a volume driver's name)
-* **label** (**label=<key>** or **label=<key>=<value>**)
-* **name** (a volume's name)
-
-`
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/prune.go b/installer/vendor/github.com/docker/docker/cli/command/volume/prune.go
deleted file mode 100644
index 405fbeb295..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/prune.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package volume
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	units "github.com/docker/go-units"
-	"github.com/spf13/cobra"
-)
-
-type pruneOptions struct {
-	force bool
-}
-
-// NewPruneCommand returns a new cobra prune command for volumes
-func NewPruneCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts pruneOptions
-
-	cmd := &cobra.Command{
-		Use:   "prune [OPTIONS]",
-		Short: "Remove all unused volumes",
-		Args:  cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			spaceReclaimed, output, err := runPrune(dockerCli, opts)
-			if err != nil {
-				return err
-			}
-			if output != "" {
-				fmt.Fprintln(dockerCli.Out(), output)
-			}
-			fmt.Fprintln(dockerCli.Out(), "Total reclaimed space:", units.HumanSize(float64(spaceReclaimed)))
-			return nil
-		},
-		Tags: map[string]string{"version": "1.25"},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Do not prompt for confirmation")
-
-	return cmd
-}
-
-const warning = `WARNING! This will remove all volumes not used by at least one container.
-Are you sure you want to continue?`
-
-func runPrune(dockerCli *command.DockerCli, opts pruneOptions) (spaceReclaimed uint64, output string, err error) {
-	if !opts.force && !command.PromptForConfirmation(dockerCli.In(), dockerCli.Out(), warning) {
-		return
-	}
-
-	report, err := dockerCli.Client().VolumesPrune(context.Background(), filters.Args{})
-	if err != nil {
-		return
-	}
-
-	if len(report.VolumesDeleted) > 0 {
-		output = "Deleted Volumes:\n"
-		for _, id := range report.VolumesDeleted {
-			output += id + "\n"
-		}
-		spaceReclaimed = report.SpaceReclaimed
-	}
-
-	return
-}
-
-// RunPrune calls the Volume Prune API
-// This returns the amount of space reclaimed and a detailed output string
-func RunPrune(dockerCli *command.DockerCli) (uint64, string, error) {
-	return runPrune(dockerCli, pruneOptions{force: true})
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/command/volume/remove.go b/installer/vendor/github.com/docker/docker/cli/command/volume/remove.go
deleted file mode 100644
index f464bb3e1a..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/command/volume/remove.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package volume
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/spf13/cobra"
-)
-
-type removeOptions struct {
-	force bool
-
-	volumes []string
-}
-
-func newRemoveCommand(dockerCli *command.DockerCli) *cobra.Command {
-	var opts removeOptions
-
-	cmd := &cobra.Command{
-		Use:     "rm [OPTIONS] VOLUME [VOLUME...]",
-		Aliases: []string{"remove"},
-		Short:   "Remove one or more volumes",
-		Long:    removeDescription,
-		Example: removeExample,
-		Args:    cli.RequiresMinArgs(1),
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.volumes = args
-			return runRemove(dockerCli, &opts)
-		},
-	}
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.force, "force", "f", false, "Force the removal of one or more volumes")
-	flags.SetAnnotation("force", "version", []string{"1.25"})
-	return cmd
-}
-
-func runRemove(dockerCli *command.DockerCli, opts *removeOptions) error {
-	client := dockerCli.Client()
-	ctx := context.Background()
-	status := 0
-
-	for _, name := range opts.volumes {
-		if err := client.VolumeRemove(ctx, name, opts.force); err != nil {
-			fmt.Fprintf(dockerCli.Err(), "%s\n", err)
-			status = 1
-			continue
-		}
-		fmt.Fprintf(dockerCli.Out(), "%s\n", name)
-	}
-
-	if status != 0 {
-		return cli.StatusError{StatusCode: status}
-	}
-	return nil
-}
-
-var removeDescription = `
-Remove one or more volumes. You cannot remove a volume that is in use by a container.
-`
-
-var removeExample = `
-$ docker volume rm hello
-hello
-`
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/compose.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/compose.go
deleted file mode 100644
index 8122326aa5..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/compose.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package convert
-
-import (
-	"io/ioutil"
-
-	"github.com/docker/docker/api/types"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/swarm"
-	composetypes "github.com/docker/docker/cli/compose/types"
-)
-
-const (
-	// LabelNamespace is the label used to track stack resources
-	LabelNamespace = "com.docker.stack.namespace"
-)
-
-// Namespace mangles names by prepending the name
-type Namespace struct {
-	name string
-}
-
-// Scope prepends the namespace to a name
-func (n Namespace) Scope(name string) string {
-	return n.name + "_" + name
-}
-
-// Name returns the name of the namespace
-func (n Namespace) Name() string {
-	return n.name
-}
-
-// NewNamespace returns a new Namespace for scoping of names
-func NewNamespace(name string) Namespace {
-	return Namespace{name: name}
-}
-
-// AddStackLabel returns labels with the namespace label added
-func AddStackLabel(namespace Namespace, labels map[string]string) map[string]string {
-	if labels == nil {
-		labels = make(map[string]string)
-	}
-	labels[LabelNamespace] = namespace.name
-	return labels
-}
-
-type networkMap map[string]composetypes.NetworkConfig
-
-// Networks converts networks from the compose-file type to the engine API type
-func Networks(
-	namespace Namespace,
-	networks networkMap,
-	servicesNetworks map[string]struct{},
-) (map[string]types.NetworkCreate, []string) {
-	if networks == nil {
-		networks = make(map[string]composetypes.NetworkConfig)
-	}
-
-	externalNetworks := []string{}
-	result := make(map[string]types.NetworkCreate)
-
-	for internalName := range servicesNetworks {
-		network := networks[internalName]
-		if network.External.External {
-			externalNetworks = append(externalNetworks, network.External.Name)
-			continue
-		}
-
-		createOpts := types.NetworkCreate{
-			Labels:   AddStackLabel(namespace, network.Labels),
-			Driver:   network.Driver,
-			Options:  network.DriverOpts,
-			Internal: network.Internal,
-		}
-
-		if network.Ipam.Driver != "" || len(network.Ipam.Config) > 0 {
-			createOpts.IPAM = &networktypes.IPAM{}
-		}
-
-		if network.Ipam.Driver != "" {
-			createOpts.IPAM.Driver = network.Ipam.Driver
-		}
-		for _, ipamConfig := range network.Ipam.Config {
-			config := networktypes.IPAMConfig{
-				Subnet: ipamConfig.Subnet,
-			}
-			createOpts.IPAM.Config = append(createOpts.IPAM.Config, config)
-		}
-		result[internalName] = createOpts
-	}
-
-	return result, externalNetworks
-}
-
-// Secrets converts secrets from the Compose type to the engine API type
-func Secrets(namespace Namespace, secrets map[string]composetypes.SecretConfig) ([]swarm.SecretSpec, error) {
-	result := []swarm.SecretSpec{}
-	for name, secret := range secrets {
-		if secret.External.External {
-			continue
-		}
-
-		data, err := ioutil.ReadFile(secret.File)
-		if err != nil {
-			return nil, err
-		}
-
-		result = append(result, swarm.SecretSpec{
-			Annotations: swarm.Annotations{
-				Name:   namespace.Scope(name),
-				Labels: AddStackLabel(namespace, secret.Labels),
-			},
-			Data: data,
-		})
-	}
-	return result, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/compose_test.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/compose_test.go
deleted file mode 100644
index f333d73fda..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/compose_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package convert
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/docker/docker/pkg/testutil/tempfile"
-)
-
-func TestNamespaceScope(t *testing.T) {
-	scoped := Namespace{name: "foo"}.Scope("bar")
-	assert.Equal(t, scoped, "foo_bar")
-}
-
-func TestAddStackLabel(t *testing.T) {
-	labels := map[string]string{
-		"something": "labeled",
-	}
-	actual := AddStackLabel(Namespace{name: "foo"}, labels)
-	expected := map[string]string{
-		"something":    "labeled",
-		LabelNamespace: "foo",
-	}
-	assert.DeepEqual(t, actual, expected)
-}
-
-func TestNetworks(t *testing.T) {
-	namespace := Namespace{name: "foo"}
-	source := networkMap{
-		"normal": composetypes.NetworkConfig{
-			Driver: "overlay",
-			DriverOpts: map[string]string{
-				"opt": "value",
-			},
-			Ipam: composetypes.IPAMConfig{
-				Driver: "driver",
-				Config: []*composetypes.IPAMPool{
-					{
-						Subnet: "10.0.0.0",
-					},
-				},
-			},
-			Labels: map[string]string{
-				"something": "labeled",
-			},
-		},
-		"outside": composetypes.NetworkConfig{
-			External: composetypes.External{
-				External: true,
-				Name:     "special",
-			},
-		},
-	}
-	expected := map[string]types.NetworkCreate{
-		"default": {
-			Labels: map[string]string{
-				LabelNamespace: "foo",
-			},
-		},
-		"normal": {
-			Driver: "overlay",
-			IPAM: &network.IPAM{
-				Driver: "driver",
-				Config: []network.IPAMConfig{
-					{
-						Subnet: "10.0.0.0",
-					},
-				},
-			},
-			Options: map[string]string{
-				"opt": "value",
-			},
-			Labels: map[string]string{
-				LabelNamespace: "foo",
-				"something":    "labeled",
-			},
-		},
-	}
-
-	serviceNetworks := map[string]struct{}{
-		"default": {},
-		"normal":  {},
-		"outside": {},
-	}
-	networks, externals := Networks(namespace, source, serviceNetworks)
-	assert.DeepEqual(t, networks, expected)
-	assert.DeepEqual(t, externals, []string{"special"})
-}
-
-func TestSecrets(t *testing.T) {
-	namespace := Namespace{name: "foo"}
-
-	secretText := "this is the first secret"
-	secretFile := tempfile.NewTempFile(t, "convert-secrets", secretText)
-	defer secretFile.Remove()
-
-	source := map[string]composetypes.SecretConfig{
-		"one": {
-			File:   secretFile.Name(),
-			Labels: map[string]string{"monster": "mash"},
-		},
-		"ext": {
-			External: composetypes.External{
-				External: true,
-			},
-		},
-	}
-
-	specs, err := Secrets(namespace, source)
-	assert.NilError(t, err)
-	assert.Equal(t, len(specs), 1)
-	secret := specs[0]
-	assert.Equal(t, secret.Name, "foo_one")
-	assert.DeepEqual(t, secret.Labels, map[string]string{
-		"monster":      "mash",
-		LabelNamespace: "foo",
-	})
-	assert.DeepEqual(t, secret.Data, []byte(secretText))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/service.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/service.go
deleted file mode 100644
index 4a5489562c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/service.go
+++ /dev/null
@@ -1,416 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"os"
-	"sort"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/swarm"
-	servicecli "github.com/docker/docker/cli/command/service"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-connections/nat"
-)
-
-// Services from compose-file types to engine API types
-// TODO: fix secrets API so that SecretAPIClient is not required here
-func Services(
-	namespace Namespace,
-	config *composetypes.Config,
-	client client.SecretAPIClient,
-) (map[string]swarm.ServiceSpec, error) {
-	result := make(map[string]swarm.ServiceSpec)
-
-	services := config.Services
-	volumes := config.Volumes
-	networks := config.Networks
-
-	for _, service := range services {
-
-		secrets, err := convertServiceSecrets(client, namespace, service.Secrets, config.Secrets)
-		if err != nil {
-			return nil, err
-		}
-		serviceSpec, err := convertService(namespace, service, networks, volumes, secrets)
-		if err != nil {
-			return nil, err
-		}
-		result[service.Name] = serviceSpec
-	}
-
-	return result, nil
-}
-
-func convertService(
-	namespace Namespace,
-	service composetypes.ServiceConfig,
-	networkConfigs map[string]composetypes.NetworkConfig,
-	volumes map[string]composetypes.VolumeConfig,
-	secrets []*swarm.SecretReference,
-) (swarm.ServiceSpec, error) {
-	name := namespace.Scope(service.Name)
-
-	endpoint, err := convertEndpointSpec(service.Ports)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	mode, err := convertDeployMode(service.Deploy.Mode, service.Deploy.Replicas)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	mounts, err := Volumes(service.Volumes, volumes, namespace)
-	if err != nil {
-		// TODO: better error message (include service name)
-		return swarm.ServiceSpec{}, err
-	}
-
-	resources, err := convertResources(service.Deploy.Resources)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	restartPolicy, err := convertRestartPolicy(
-		service.Restart, service.Deploy.RestartPolicy)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	healthcheck, err := convertHealthcheck(service.HealthCheck)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	networks, err := convertServiceNetworks(service.Networks, networkConfigs, namespace, service.Name)
-	if err != nil {
-		return swarm.ServiceSpec{}, err
-	}
-
-	var logDriver *swarm.Driver
-	if service.Logging != nil {
-		logDriver = &swarm.Driver{
-			Name:    service.Logging.Driver,
-			Options: service.Logging.Options,
-		}
-	}
-
-	serviceSpec := swarm.ServiceSpec{
-		Annotations: swarm.Annotations{
-			Name:   name,
-			Labels: AddStackLabel(namespace, service.Deploy.Labels),
-		},
-		TaskTemplate: swarm.TaskSpec{
-			ContainerSpec: swarm.ContainerSpec{
-				Image:           service.Image,
-				Command:         service.Entrypoint,
-				Args:            service.Command,
-				Hostname:        service.Hostname,
-				Hosts:           sortStrings(convertExtraHosts(service.ExtraHosts)),
-				Healthcheck:     healthcheck,
-				Env:             sortStrings(convertEnvironment(service.Environment)),
-				Labels:          AddStackLabel(namespace, service.Labels),
-				Dir:             service.WorkingDir,
-				User:            service.User,
-				Mounts:          mounts,
-				StopGracePeriod: service.StopGracePeriod,
-				TTY:             service.Tty,
-				OpenStdin:       service.StdinOpen,
-				Secrets:         secrets,
-			},
-			LogDriver:     logDriver,
-			Resources:     resources,
-			RestartPolicy: restartPolicy,
-			Placement: &swarm.Placement{
-				Constraints: service.Deploy.Placement.Constraints,
-			},
-		},
-		EndpointSpec: endpoint,
-		Mode:         mode,
-		Networks:     networks,
-		UpdateConfig: convertUpdateConfig(service.Deploy.UpdateConfig),
-	}
-
-	return serviceSpec, nil
-}
-
-func sortStrings(strs []string) []string {
-	sort.Strings(strs)
-	return strs
-}
-
-type byNetworkTarget []swarm.NetworkAttachmentConfig
-
-func (a byNetworkTarget) Len() int           { return len(a) }
-func (a byNetworkTarget) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byNetworkTarget) Less(i, j int) bool { return a[i].Target < a[j].Target }
-
-func convertServiceNetworks(
-	networks map[string]*composetypes.ServiceNetworkConfig,
-	networkConfigs networkMap,
-	namespace Namespace,
-	name string,
-) ([]swarm.NetworkAttachmentConfig, error) {
-	if len(networks) == 0 {
-		return []swarm.NetworkAttachmentConfig{
-			{
-				Target:  namespace.Scope("default"),
-				Aliases: []string{name},
-			},
-		}, nil
-	}
-
-	nets := []swarm.NetworkAttachmentConfig{}
-	for networkName, network := range networks {
-		networkConfig, ok := networkConfigs[networkName]
-		if !ok {
-			return []swarm.NetworkAttachmentConfig{}, fmt.Errorf(
-				"service %q references network %q, which is not declared", name, networkName)
-		}
-		var aliases []string
-		if network != nil {
-			aliases = network.Aliases
-		}
-		target := namespace.Scope(networkName)
-		if networkConfig.External.External {
-			target = networkConfig.External.Name
-		}
-		nets = append(nets, swarm.NetworkAttachmentConfig{
-			Target:  target,
-			Aliases: append(aliases, name),
-		})
-	}
-
-	sort.Sort(byNetworkTarget(nets))
-
-	return nets, nil
-}
-
-// TODO: fix secrets API so that SecretAPIClient is not required here
-func convertServiceSecrets(
-	client client.SecretAPIClient,
-	namespace Namespace,
-	secrets []composetypes.ServiceSecretConfig,
-	secretSpecs map[string]composetypes.SecretConfig,
-) ([]*swarm.SecretReference, error) {
-	opts := []*types.SecretRequestOption{}
-	for _, secret := range secrets {
-		target := secret.Target
-		if target == "" {
-			target = secret.Source
-		}
-
-		source := namespace.Scope(secret.Source)
-		secretSpec := secretSpecs[secret.Source]
-		if secretSpec.External.External {
-			source = secretSpec.External.Name
-		}
-
-		uid := secret.UID
-		gid := secret.GID
-		if uid == "" {
-			uid = "0"
-		}
-		if gid == "" {
-			gid = "0"
-		}
-
-		opts = append(opts, &types.SecretRequestOption{
-			Source: source,
-			Target: target,
-			UID:    uid,
-			GID:    gid,
-			Mode:   os.FileMode(secret.Mode),
-		})
-	}
-
-	return servicecli.ParseSecrets(client, opts)
-}
-
-func convertExtraHosts(extraHosts map[string]string) []string {
-	hosts := []string{}
-	for host, ip := range extraHosts {
-		hosts = append(hosts, fmt.Sprintf("%s %s", ip, host))
-	}
-	return hosts
-}
-
-func convertHealthcheck(healthcheck *composetypes.HealthCheckConfig) (*container.HealthConfig, error) {
-	if healthcheck == nil {
-		return nil, nil
-	}
-	var (
-		err               error
-		timeout, interval time.Duration
-		retries           int
-	)
-	if healthcheck.Disable {
-		if len(healthcheck.Test) != 0 {
-			return nil, fmt.Errorf("test and disable can't be set at the same time")
-		}
-		return &container.HealthConfig{
-			Test: []string{"NONE"},
-		}, nil
-
-	}
-	if healthcheck.Timeout != "" {
-		timeout, err = time.ParseDuration(healthcheck.Timeout)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if healthcheck.Interval != "" {
-		interval, err = time.ParseDuration(healthcheck.Interval)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if healthcheck.Retries != nil {
-		retries = int(*healthcheck.Retries)
-	}
-	return &container.HealthConfig{
-		Test:     healthcheck.Test,
-		Timeout:  timeout,
-		Interval: interval,
-		Retries:  retries,
-	}, nil
-}
-
-func convertRestartPolicy(restart string, source *composetypes.RestartPolicy) (*swarm.RestartPolicy, error) {
-	// TODO: log if restart is being ignored
-	if source == nil {
-		policy, err := runconfigopts.ParseRestartPolicy(restart)
-		if err != nil {
-			return nil, err
-		}
-		switch {
-		case policy.IsNone():
-			return nil, nil
-		case policy.IsAlways(), policy.IsUnlessStopped():
-			return &swarm.RestartPolicy{
-				Condition: swarm.RestartPolicyConditionAny,
-			}, nil
-		case policy.IsOnFailure():
-			attempts := uint64(policy.MaximumRetryCount)
-			return &swarm.RestartPolicy{
-				Condition:   swarm.RestartPolicyConditionOnFailure,
-				MaxAttempts: &attempts,
-			}, nil
-		default:
-			return nil, fmt.Errorf("unknown restart policy: %s", restart)
-		}
-	}
-	return &swarm.RestartPolicy{
-		Condition:   swarm.RestartPolicyCondition(source.Condition),
-		Delay:       source.Delay,
-		MaxAttempts: source.MaxAttempts,
-		Window:      source.Window,
-	}, nil
-}
-
-func convertUpdateConfig(source *composetypes.UpdateConfig) *swarm.UpdateConfig {
-	if source == nil {
-		return nil
-	}
-	parallel := uint64(1)
-	if source.Parallelism != nil {
-		parallel = *source.Parallelism
-	}
-	return &swarm.UpdateConfig{
-		Parallelism:     parallel,
-		Delay:           source.Delay,
-		FailureAction:   source.FailureAction,
-		Monitor:         source.Monitor,
-		MaxFailureRatio: source.MaxFailureRatio,
-	}
-}
-
-func convertResources(source composetypes.Resources) (*swarm.ResourceRequirements, error) {
-	resources := &swarm.ResourceRequirements{}
-	var err error
-	if source.Limits != nil {
-		var cpus int64
-		if source.Limits.NanoCPUs != "" {
-			cpus, err = opts.ParseCPUs(source.Limits.NanoCPUs)
-			if err != nil {
-				return nil, err
-			}
-		}
-		resources.Limits = &swarm.Resources{
-			NanoCPUs:    cpus,
-			MemoryBytes: int64(source.Limits.MemoryBytes),
-		}
-	}
-	if source.Reservations != nil {
-		var cpus int64
-		if source.Reservations.NanoCPUs != "" {
-			cpus, err = opts.ParseCPUs(source.Reservations.NanoCPUs)
-			if err != nil {
-				return nil, err
-			}
-		}
-		resources.Reservations = &swarm.Resources{
-			NanoCPUs:    cpus,
-			MemoryBytes: int64(source.Reservations.MemoryBytes),
-		}
-	}
-	return resources, nil
-
-}
-
-type byPublishedPort []swarm.PortConfig
-
-func (a byPublishedPort) Len() int           { return len(a) }
-func (a byPublishedPort) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byPublishedPort) Less(i, j int) bool { return a[i].PublishedPort < a[j].PublishedPort }
-
-func convertEndpointSpec(source []string) (*swarm.EndpointSpec, error) {
-	portConfigs := []swarm.PortConfig{}
-	ports, portBindings, err := nat.ParsePortSpecs(source)
-	if err != nil {
-		return nil, err
-	}
-
-	for port := range ports {
-		portConfigs = append(
-			portConfigs,
-			opts.ConvertPortToPortConfig(port, portBindings)...)
-	}
-
-	// Sorting to make sure these are always in the same order
-	sort.Sort(byPublishedPort(portConfigs))
-
-	return &swarm.EndpointSpec{Ports: portConfigs}, nil
-}
-
-func convertEnvironment(source map[string]string) []string {
-	var output []string
-
-	for name, value := range source {
-		output = append(output, fmt.Sprintf("%s=%s", name, value))
-	}
-
-	return output
-}
-
-func convertDeployMode(mode string, replicas *uint64) (swarm.ServiceMode, error) {
-	serviceMode := swarm.ServiceMode{}
-
-	switch mode {
-	case "global":
-		if replicas != nil {
-			return serviceMode, fmt.Errorf("replicas can only be used with replicated mode")
-		}
-		serviceMode.Global = &swarm.GlobalService{}
-	case "replicated", "":
-		serviceMode.Replicated = &swarm.ReplicatedService{Replicas: replicas}
-	default:
-		return serviceMode, fmt.Errorf("Unknown mode: %s", mode)
-	}
-	return serviceMode, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/service_test.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/service_test.go
deleted file mode 100644
index 2e614d730c..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/service_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package convert
-
-import (
-	"sort"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/swarm"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestConvertRestartPolicyFromNone(t *testing.T) {
-	policy, err := convertRestartPolicy("no", nil)
-	assert.NilError(t, err)
-	assert.Equal(t, policy, (*swarm.RestartPolicy)(nil))
-}
-
-func TestConvertRestartPolicyFromUnknown(t *testing.T) {
-	_, err := convertRestartPolicy("unknown", nil)
-	assert.Error(t, err, "unknown restart policy: unknown")
-}
-
-func TestConvertRestartPolicyFromAlways(t *testing.T) {
-	policy, err := convertRestartPolicy("always", nil)
-	expected := &swarm.RestartPolicy{
-		Condition: swarm.RestartPolicyConditionAny,
-	}
-	assert.NilError(t, err)
-	assert.DeepEqual(t, policy, expected)
-}
-
-func TestConvertRestartPolicyFromFailure(t *testing.T) {
-	policy, err := convertRestartPolicy("on-failure:4", nil)
-	attempts := uint64(4)
-	expected := &swarm.RestartPolicy{
-		Condition:   swarm.RestartPolicyConditionOnFailure,
-		MaxAttempts: &attempts,
-	}
-	assert.NilError(t, err)
-	assert.DeepEqual(t, policy, expected)
-}
-
-func TestConvertEnvironment(t *testing.T) {
-	source := map[string]string{
-		"foo": "bar",
-		"key": "value",
-	}
-	env := convertEnvironment(source)
-	sort.Strings(env)
-	assert.DeepEqual(t, env, []string{"foo=bar", "key=value"})
-}
-
-func TestConvertResourcesFull(t *testing.T) {
-	source := composetypes.Resources{
-		Limits: &composetypes.Resource{
-			NanoCPUs:    "0.003",
-			MemoryBytes: composetypes.UnitBytes(300000000),
-		},
-		Reservations: &composetypes.Resource{
-			NanoCPUs:    "0.002",
-			MemoryBytes: composetypes.UnitBytes(200000000),
-		},
-	}
-	resources, err := convertResources(source)
-	assert.NilError(t, err)
-
-	expected := &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
-			NanoCPUs:    3000000,
-			MemoryBytes: 300000000,
-		},
-		Reservations: &swarm.Resources{
-			NanoCPUs:    2000000,
-			MemoryBytes: 200000000,
-		},
-	}
-	assert.DeepEqual(t, resources, expected)
-}
-
-func TestConvertResourcesOnlyMemory(t *testing.T) {
-	source := composetypes.Resources{
-		Limits: &composetypes.Resource{
-			MemoryBytes: composetypes.UnitBytes(300000000),
-		},
-		Reservations: &composetypes.Resource{
-			MemoryBytes: composetypes.UnitBytes(200000000),
-		},
-	}
-	resources, err := convertResources(source)
-	assert.NilError(t, err)
-
-	expected := &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
-			MemoryBytes: 300000000,
-		},
-		Reservations: &swarm.Resources{
-			MemoryBytes: 200000000,
-		},
-	}
-	assert.DeepEqual(t, resources, expected)
-}
-
-func TestConvertHealthcheck(t *testing.T) {
-	retries := uint64(10)
-	source := &composetypes.HealthCheckConfig{
-		Test:     []string{"EXEC", "touch", "/foo"},
-		Timeout:  "30s",
-		Interval: "2ms",
-		Retries:  &retries,
-	}
-	expected := &container.HealthConfig{
-		Test:     source.Test,
-		Timeout:  30 * time.Second,
-		Interval: 2 * time.Millisecond,
-		Retries:  10,
-	}
-
-	healthcheck, err := convertHealthcheck(source)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, healthcheck, expected)
-}
-
-func TestConvertHealthcheckDisable(t *testing.T) {
-	source := &composetypes.HealthCheckConfig{Disable: true}
-	expected := &container.HealthConfig{
-		Test: []string{"NONE"},
-	}
-
-	healthcheck, err := convertHealthcheck(source)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, healthcheck, expected)
-}
-
-func TestConvertHealthcheckDisableWithTest(t *testing.T) {
-	source := &composetypes.HealthCheckConfig{
-		Disable: true,
-		Test:    []string{"EXEC", "touch"},
-	}
-	_, err := convertHealthcheck(source)
-	assert.Error(t, err, "test and disable can't be set")
-}
-
-func TestConvertServiceNetworksOnlyDefault(t *testing.T) {
-	networkConfigs := networkMap{}
-	networks := map[string]*composetypes.ServiceNetworkConfig{}
-
-	configs, err := convertServiceNetworks(
-		networks, networkConfigs, NewNamespace("foo"), "service")
-
-	expected := []swarm.NetworkAttachmentConfig{
-		{
-			Target:  "foo_default",
-			Aliases: []string{"service"},
-		},
-	}
-
-	assert.NilError(t, err)
-	assert.DeepEqual(t, configs, expected)
-}
-
-func TestConvertServiceNetworks(t *testing.T) {
-	networkConfigs := networkMap{
-		"front": composetypes.NetworkConfig{
-			External: composetypes.External{
-				External: true,
-				Name:     "fronttier",
-			},
-		},
-		"back": composetypes.NetworkConfig{},
-	}
-	networks := map[string]*composetypes.ServiceNetworkConfig{
-		"front": {
-			Aliases: []string{"something"},
-		},
-		"back": {
-			Aliases: []string{"other"},
-		},
-	}
-
-	configs, err := convertServiceNetworks(
-		networks, networkConfigs, NewNamespace("foo"), "service")
-
-	expected := []swarm.NetworkAttachmentConfig{
-		{
-			Target:  "foo_back",
-			Aliases: []string{"other", "service"},
-		},
-		{
-			Target:  "fronttier",
-			Aliases: []string{"something", "service"},
-		},
-	}
-
-	sortedConfigs := byTargetSort(configs)
-	sort.Sort(&sortedConfigs)
-
-	assert.NilError(t, err)
-	assert.DeepEqual(t, []swarm.NetworkAttachmentConfig(sortedConfigs), expected)
-}
-
-type byTargetSort []swarm.NetworkAttachmentConfig
-
-func (s byTargetSort) Len() int {
-	return len(s)
-}
-
-func (s byTargetSort) Less(i, j int) bool {
-	return strings.Compare(s[i].Target, s[j].Target) < 0
-}
-
-func (s byTargetSort) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/volume.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/volume.go
deleted file mode 100644
index 24442d4dc7..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/volume.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types/mount"
-	composetypes "github.com/docker/docker/cli/compose/types"
-)
-
-type volumes map[string]composetypes.VolumeConfig
-
-// Volumes from compose-file types to engine api types
-func Volumes(serviceVolumes []string, stackVolumes volumes, namespace Namespace) ([]mount.Mount, error) {
-	var mounts []mount.Mount
-
-	for _, volumeSpec := range serviceVolumes {
-		mount, err := convertVolumeToMount(volumeSpec, stackVolumes, namespace)
-		if err != nil {
-			return nil, err
-		}
-		mounts = append(mounts, mount)
-	}
-	return mounts, nil
-}
-
-func convertVolumeToMount(volumeSpec string, stackVolumes volumes, namespace Namespace) (mount.Mount, error) {
-	var source, target string
-	var mode []string
-
-	// TODO: split Windows path mappings properly
-	parts := strings.SplitN(volumeSpec, ":", 3)
-
-	for _, part := range parts {
-		if strings.TrimSpace(part) == "" {
-			return mount.Mount{}, fmt.Errorf("invalid volume: %s", volumeSpec)
-		}
-	}
-
-	switch len(parts) {
-	case 3:
-		source = parts[0]
-		target = parts[1]
-		mode = strings.Split(parts[2], ",")
-	case 2:
-		source = parts[0]
-		target = parts[1]
-	case 1:
-		target = parts[0]
-	}
-
-	if source == "" {
-		// Anonymous volume
-		return mount.Mount{
-			Type:   mount.TypeVolume,
-			Target: target,
-		}, nil
-	}
-
-	// TODO: catch Windows paths here
-	if strings.HasPrefix(source, "/") {
-		return mount.Mount{
-			Type:        mount.TypeBind,
-			Source:      source,
-			Target:      target,
-			ReadOnly:    isReadOnly(mode),
-			BindOptions: getBindOptions(mode),
-		}, nil
-	}
-
-	stackVolume, exists := stackVolumes[source]
-	if !exists {
-		return mount.Mount{}, fmt.Errorf("undefined volume: %s", source)
-	}
-
-	var volumeOptions *mount.VolumeOptions
-	if stackVolume.External.Name != "" {
-		source = stackVolume.External.Name
-	} else {
-		volumeOptions = &mount.VolumeOptions{
-			Labels: AddStackLabel(namespace, stackVolume.Labels),
-			NoCopy: isNoCopy(mode),
-		}
-
-		if stackVolume.Driver != "" {
-			volumeOptions.DriverConfig = &mount.Driver{
-				Name:    stackVolume.Driver,
-				Options: stackVolume.DriverOpts,
-			}
-		}
-		source = namespace.Scope(source)
-	}
-	return mount.Mount{
-		Type:          mount.TypeVolume,
-		Source:        source,
-		Target:        target,
-		ReadOnly:      isReadOnly(mode),
-		VolumeOptions: volumeOptions,
-	}, nil
-}
-
-func modeHas(mode []string, field string) bool {
-	for _, item := range mode {
-		if item == field {
-			return true
-		}
-	}
-	return false
-}
-
-func isReadOnly(mode []string) bool {
-	return modeHas(mode, "ro")
-}
-
-func isNoCopy(mode []string) bool {
-	return modeHas(mode, "nocopy")
-}
-
-func getBindOptions(mode []string) *mount.BindOptions {
-	for _, item := range mode {
-		for _, propagation := range mount.Propagations {
-			if mount.Propagation(item) == propagation {
-				return &mount.BindOptions{Propagation: mount.Propagation(item)}
-			}
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/convert/volume_test.go b/installer/vendor/github.com/docker/docker/cli/compose/convert/volume_test.go
deleted file mode 100644
index 113ab1e1b6..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/convert/volume_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package convert
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/mount"
-	composetypes "github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestIsReadOnly(t *testing.T) {
-	assert.Equal(t, isReadOnly([]string{"foo", "bar", "ro"}), true)
-	assert.Equal(t, isReadOnly([]string{"ro"}), true)
-	assert.Equal(t, isReadOnly([]string{}), false)
-	assert.Equal(t, isReadOnly([]string{"foo", "rw"}), false)
-	assert.Equal(t, isReadOnly([]string{"foo"}), false)
-}
-
-func TestIsNoCopy(t *testing.T) {
-	assert.Equal(t, isNoCopy([]string{"foo", "bar", "nocopy"}), true)
-	assert.Equal(t, isNoCopy([]string{"nocopy"}), true)
-	assert.Equal(t, isNoCopy([]string{}), false)
-	assert.Equal(t, isNoCopy([]string{"foo", "rw"}), false)
-}
-
-func TestGetBindOptions(t *testing.T) {
-	opts := getBindOptions([]string{"slave"})
-	expected := mount.BindOptions{Propagation: mount.PropagationSlave}
-	assert.Equal(t, *opts, expected)
-}
-
-func TestGetBindOptionsNone(t *testing.T) {
-	opts := getBindOptions([]string{"ro"})
-	assert.Equal(t, opts, (*mount.BindOptions)(nil))
-}
-
-func TestConvertVolumeToMountNamedVolume(t *testing.T) {
-	stackVolumes := volumes{
-		"normal": composetypes.VolumeConfig{
-			Driver: "glusterfs",
-			DriverOpts: map[string]string{
-				"opt": "value",
-			},
-			Labels: map[string]string{
-				"something": "labeled",
-			},
-		},
-	}
-	namespace := NewNamespace("foo")
-	expected := mount.Mount{
-		Type:     mount.TypeVolume,
-		Source:   "foo_normal",
-		Target:   "/foo",
-		ReadOnly: true,
-		VolumeOptions: &mount.VolumeOptions{
-			Labels: map[string]string{
-				LabelNamespace: "foo",
-				"something":    "labeled",
-			},
-			DriverConfig: &mount.Driver{
-				Name: "glusterfs",
-				Options: map[string]string{
-					"opt": "value",
-				},
-			},
-		},
-	}
-	mount, err := convertVolumeToMount("normal:/foo:ro", stackVolumes, namespace)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, mount, expected)
-}
-
-func TestConvertVolumeToMountNamedVolumeExternal(t *testing.T) {
-	stackVolumes := volumes{
-		"outside": composetypes.VolumeConfig{
-			External: composetypes.External{
-				External: true,
-				Name:     "special",
-			},
-		},
-	}
-	namespace := NewNamespace("foo")
-	expected := mount.Mount{
-		Type:   mount.TypeVolume,
-		Source: "special",
-		Target: "/foo",
-	}
-	mount, err := convertVolumeToMount("outside:/foo", stackVolumes, namespace)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, mount, expected)
-}
-
-func TestConvertVolumeToMountBind(t *testing.T) {
-	stackVolumes := volumes{}
-	namespace := NewNamespace("foo")
-	expected := mount.Mount{
-		Type:        mount.TypeBind,
-		Source:      "/bar",
-		Target:      "/foo",
-		ReadOnly:    true,
-		BindOptions: &mount.BindOptions{Propagation: mount.PropagationShared},
-	}
-	mount, err := convertVolumeToMount("/bar:/foo:ro,shared", stackVolumes, namespace)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, mount, expected)
-}
-
-func TestConvertVolumeToMountVolumeDoesNotExist(t *testing.T) {
-	namespace := NewNamespace("foo")
-	_, err := convertVolumeToMount("unknown:/foo:ro", volumes{}, namespace)
-	assert.Error(t, err, "undefined volume: unknown")
-}
-
-func TestConvertVolumeToMountAnonymousVolume(t *testing.T) {
-	stackVolumes := map[string]composetypes.VolumeConfig{}
-	namespace := NewNamespace("foo")
-	expected := mount.Mount{
-		Type:   mount.TypeVolume,
-		Target: "/foo/bar",
-	}
-	mnt, err := convertVolumeToMount("/foo/bar", stackVolumes, namespace)
-	assert.NilError(t, err)
-	assert.DeepEqual(t, mnt, expected)
-}
-
-func TestConvertVolumeToMountInvalidFormat(t *testing.T) {
-	namespace := NewNamespace("foo")
-	invalids := []string{"::", "::cc", ":bb:", "aa::", "aa::cc", "aa:bb:", " : : ", " : :cc", " :bb: ", "aa: : ", "aa: :cc", "aa:bb: "}
-	for _, vol := range invalids {
-		_, err := convertVolumeToMount(vol, map[string]composetypes.VolumeConfig{}, namespace)
-		assert.Error(t, err, "invalid volume: "+vol)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation.go b/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation.go
deleted file mode 100644
index 734f28ec9d..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package interpolation
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/cli/compose/template"
-	"github.com/docker/docker/cli/compose/types"
-)
-
-// Interpolate replaces variables in a string with the values from a mapping
-func Interpolate(config types.Dict, section string, mapping template.Mapping) (types.Dict, error) {
-	out := types.Dict{}
-
-	for name, item := range config {
-		if item == nil {
-			out[name] = nil
-			continue
-		}
-		interpolatedItem, err := interpolateSectionItem(name, item.(types.Dict), section, mapping)
-		if err != nil {
-			return nil, err
-		}
-		out[name] = interpolatedItem
-	}
-
-	return out, nil
-}
-
-func interpolateSectionItem(
-	name string,
-	item types.Dict,
-	section string,
-	mapping template.Mapping,
-) (types.Dict, error) {
-
-	out := types.Dict{}
-
-	for key, value := range item {
-		interpolatedValue, err := recursiveInterpolate(value, mapping)
-		if err != nil {
-			return nil, fmt.Errorf(
-				"Invalid interpolation format for %#v option in %s %#v: %#v",
-				key, section, name, err.Template,
-			)
-		}
-		out[key] = interpolatedValue
-	}
-
-	return out, nil
-
-}
-
-func recursiveInterpolate(
-	value interface{},
-	mapping template.Mapping,
-) (interface{}, *template.InvalidTemplateError) {
-
-	switch value := value.(type) {
-
-	case string:
-		return template.Substitute(value, mapping)
-
-	case types.Dict:
-		out := types.Dict{}
-		for key, elem := range value {
-			interpolatedElem, err := recursiveInterpolate(elem, mapping)
-			if err != nil {
-				return nil, err
-			}
-			out[key] = interpolatedElem
-		}
-		return out, nil
-
-	case []interface{}:
-		out := make([]interface{}, len(value))
-		for i, elem := range value {
-			interpolatedElem, err := recursiveInterpolate(elem, mapping)
-			if err != nil {
-				return nil, err
-			}
-			out[i] = interpolatedElem
-		}
-		return out, nil
-
-	default:
-		return value, nil
-
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation_test.go b/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation_test.go
deleted file mode 100644
index c3921701b3..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/interpolation/interpolation_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package interpolation
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/docker/docker/cli/compose/types"
-)
-
-var defaults = map[string]string{
-	"USER": "jenny",
-	"FOO":  "bar",
-}
-
-func defaultMapping(name string) (string, bool) {
-	val, ok := defaults[name]
-	return val, ok
-}
-
-func TestInterpolate(t *testing.T) {
-	services := types.Dict{
-		"servicea": types.Dict{
-			"image":   "example:${USER}",
-			"volumes": []interface{}{"$FOO:/target"},
-			"logging": types.Dict{
-				"driver": "${FOO}",
-				"options": types.Dict{
-					"user": "$USER",
-				},
-			},
-		},
-	}
-	expected := types.Dict{
-		"servicea": types.Dict{
-			"image":   "example:jenny",
-			"volumes": []interface{}{"bar:/target"},
-			"logging": types.Dict{
-				"driver": "bar",
-				"options": types.Dict{
-					"user": "jenny",
-				},
-			},
-		},
-	}
-	result, err := Interpolate(services, "service", defaultMapping)
-	assert.NoError(t, err)
-	assert.Equal(t, expected, result)
-}
-
-func TestInvalidInterpolation(t *testing.T) {
-	services := types.Dict{
-		"servicea": types.Dict{
-			"image": "${",
-		},
-	}
-	_, err := Interpolate(services, "service", defaultMapping)
-	assert.EqualError(t, err, `Invalid interpolation format for "image" option in service "servicea": "${"`)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/loader/example1.env b/installer/vendor/github.com/docker/docker/cli/compose/loader/example1.env
deleted file mode 100644
index 3e7a059613..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/loader/example1.env
+++ /dev/null
@@ -1,8 +0,0 @@
-# passed through
-FOO=1
-
-# overridden in example2.env
-BAR=1
-
-# overridden in full-example.yml
-BAZ=1
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/loader/example2.env b/installer/vendor/github.com/docker/docker/cli/compose/loader/example2.env
deleted file mode 100644
index 0920d5ab05..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/loader/example2.env
+++ /dev/null
@@ -1 +0,0 @@
-BAR=2
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/loader/full-example.yml b/installer/vendor/github.com/docker/docker/cli/compose/loader/full-example.yml
deleted file mode 100644
index fb5686a380..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/loader/full-example.yml
+++ /dev/null
@@ -1,287 +0,0 @@
-version: "3"
-
-services:
-  foo:
-    cap_add:
-      - ALL
-
-    cap_drop:
-      - NET_ADMIN
-      - SYS_ADMIN
-
-    cgroup_parent: m-executor-abcd
-
-    # String or list
-    command: bundle exec thin -p 3000
-    # command: ["bundle", "exec", "thin", "-p", "3000"]
-
-    container_name: my-web-container
-
-    depends_on:
-      - db
-      - redis
-
-    deploy:
-      mode: replicated
-      replicas: 6
-      labels: [FOO=BAR]
-      update_config:
-        parallelism: 3
-        delay: 10s
-        failure_action: continue
-        monitor: 60s
-        max_failure_ratio: 0.3
-      resources:
-        limits:
-          cpus: '0.001'
-          memory: 50M
-        reservations:
-          cpus: '0.0001'
-          memory: 20M
-      restart_policy:
-        condition: on_failure
-        delay: 5s
-        max_attempts: 3
-        window: 120s
-      placement:
-        constraints: [node=foo]
-
-    devices:
-      - "/dev/ttyUSB0:/dev/ttyUSB0"
-
-    # String or list
-    # dns: 8.8.8.8
-    dns:
-      - 8.8.8.8
-      - 9.9.9.9
-
-    # String or list
-    # dns_search: example.com
-    dns_search:
-      - dc1.example.com
-      - dc2.example.com
-
-    domainname: foo.com
-
-    # String or list
-    # entrypoint: /code/entrypoint.sh -p 3000
-    entrypoint: ["/code/entrypoint.sh", "-p", "3000"]
-
-    # String or list
-    # env_file: .env
-    env_file:
-      - ./example1.env
-      - ./example2.env
-
-    # Mapping or list
-    # Mapping values can be strings, numbers or null
-    # Booleans are not allowed - must be quoted
-    environment:
-      RACK_ENV: development
-      SHOW: 'true'
-      SESSION_SECRET:
-      BAZ: 3
-    # environment:
-    #   - RACK_ENV=development
-    #   - SHOW=true
-    #   - SESSION_SECRET
-
-    # Items can be strings or numbers
-    expose:
-     - "3000"
-     - 8000
-
-    external_links:
-      - redis_1
-      - project_db_1:mysql
-      - project_db_1:postgresql
-
-    # Mapping or list
-    # Mapping values must be strings
-    # extra_hosts:
-    #   somehost: "162.242.195.82"
-    #   otherhost: "50.31.209.229"
-    extra_hosts:
-      - "somehost:162.242.195.82"
-      - "otherhost:50.31.209.229"
-
-    hostname: foo
-
-    healthcheck:
-      test: echo "hello world"
-      interval: 10s
-      timeout: 1s
-      retries: 5
-
-    # Any valid image reference - repo, tag, id, sha
-    image: redis
-    # image: ubuntu:14.04
-    # image: tutum/influxdb
-    # image: example-registry.com:4000/postgresql
-    # image: a4bc65fd
-    # image: busybox@sha256:38a203e1986cf79639cfb9b2e1d6e773de84002feea2d4eb006b52004ee8502d
-
-    ipc: host
-
-    # Mapping or list
-    # Mapping values can be strings, numbers or null
-    labels:
-      com.example.description: "Accounting webapp"
-      com.example.number: 42
-      com.example.empty-label:
-    # labels:
-    #   - "com.example.description=Accounting webapp"
-    #   - "com.example.number=42"
-    #   - "com.example.empty-label"
-
-    links:
-     - db
-     - db:database
-     - redis
-
-    logging:
-      driver: syslog
-      options:
-        syslog-address: "tcp://192.168.0.42:123"
-
-    mac_address: 02:42:ac:11:65:43
-
-    # network_mode: "bridge"
-    # network_mode: "host"
-    # network_mode: "none"
-    # Use the network mode of an arbitrary container from another service
-    # network_mode: "service:db"
-    # Use the network mode of another container, specified by name or id
-    # network_mode: "container:some-container"
-    network_mode: "container:0cfeab0f748b9a743dc3da582046357c6ef497631c1a016d28d2bf9b4f899f7b"
-
-    networks:
-      some-network:
-        aliases:
-         - alias1
-         - alias3
-      other-network:
-        ipv4_address: 172.16.238.10
-        ipv6_address: 2001:3984:3989::10
-      other-other-network:
-
-    pid: "host"
-
-    ports:
-      - 3000
-      - "3000-3005"
-      - "8000:8000"
-      - "9090-9091:8080-8081"
-      - "49100:22"
-      - "127.0.0.1:8001:8001"
-      - "127.0.0.1:5000-5010:5000-5010"
-
-    privileged: true
-
-    read_only: true
-
-    restart: always
-
-    security_opt:
-      - label=level:s0:c100,c200
-      - label=type:svirt_apache_t
-
-    stdin_open: true
-
-    stop_grace_period: 20s
-
-    stop_signal: SIGUSR1
-
-    # String or list
-    # tmpfs: /run
-    tmpfs:
-      - /run
-      - /tmp
-
-    tty: true
-
-    ulimits:
-      # Single number or mapping with soft + hard limits
-      nproc: 65535
-      nofile:
-        soft: 20000
-        hard: 40000
-
-    user: someone
-
-    volumes:
-      # Just specify a path and let the Engine create a volume
-      - /var/lib/mysql
-      # Specify an absolute path mapping
-      - /opt/data:/var/lib/mysql
-      # Path on the host, relative to the Compose file
-      - .:/code
-      - ./static:/var/www/html
-      # User-relative path
-      - ~/configs:/etc/configs/:ro
-      # Named volume
-      - datavolume:/var/lib/mysql
-
-    working_dir: /code
-
-networks:
-  # Entries can be null, which specifies simply that a network
-  # called "{project name}_some-network" should be created and
-  # use the default driver
-  some-network:
-
-  other-network:
-    driver: overlay
-
-    driver_opts:
-      # Values can be strings or numbers
-      foo: "bar"
-      baz: 1
-
-    ipam:
-      driver: overlay
-      # driver_opts:
-      #   # Values can be strings or numbers
-      #   com.docker.network.enable_ipv6: "true"
-      #   com.docker.network.numeric_value: 1
-      config:
-      - subnet: 172.16.238.0/24
-        # gateway: 172.16.238.1
-      - subnet: 2001:3984:3989::/64
-        # gateway: 2001:3984:3989::1
-
-  external-network:
-    # Specifies that a pre-existing network called "external-network"
-    # can be referred to within this file as "external-network"
-    external: true
-
-  other-external-network:
-    # Specifies that a pre-existing network called "my-cool-network"
-    # can be referred to within this file as "other-external-network"
-    external:
-      name: my-cool-network
-
-volumes:
-  # Entries can be null, which specifies simply that a volume
-  # called "{project name}_some-volume" should be created and
-  # use the default driver
-  some-volume:
-
-  other-volume:
-    driver: flocker
-
-    driver_opts:
-      # Values can be strings or numbers
-      foo: "bar"
-      baz: 1
-
-  external-volume:
-    # Specifies that a pre-existing volume called "external-volume"
-    # can be referred to within this file as "external-volume"
-    external: true
-
-  other-external-volume:
-    # Specifies that a pre-existing volume called "my-cool-volume"
-    # can be referred to within this file as "other-external-volume"
-    external:
-      name: my-cool-volume
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/loader/loader.go b/installer/vendor/github.com/docker/docker/cli/compose/loader/loader.go
deleted file mode 100644
index 39f69a03ff..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/loader/loader.go
+++ /dev/null
@@ -1,653 +0,0 @@
-package loader
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/cli/compose/interpolation"
-	"github.com/docker/docker/cli/compose/schema"
-	"github.com/docker/docker/cli/compose/types"
-	"github.com/docker/docker/runconfig/opts"
-	units "github.com/docker/go-units"
-	shellwords "github.com/mattn/go-shellwords"
-	"github.com/mitchellh/mapstructure"
-	yaml "gopkg.in/yaml.v2"
-)
-
-var (
-	fieldNameRegexp = regexp.MustCompile("[A-Z][a-z0-9]+")
-)
-
-// ParseYAML reads the bytes from a file, parses the bytes into a mapping
-// structure, and returns it.
-func ParseYAML(source []byte) (types.Dict, error) {
-	var cfg interface{}
-	if err := yaml.Unmarshal(source, &cfg); err != nil {
-		return nil, err
-	}
-	cfgMap, ok := cfg.(map[interface{}]interface{})
-	if !ok {
-		return nil, fmt.Errorf("Top-level object must be a mapping")
-	}
-	converted, err := convertToStringKeysRecursive(cfgMap, "")
-	if err != nil {
-		return nil, err
-	}
-	return converted.(types.Dict), nil
-}
-
-// Load reads a ConfigDetails and returns a fully loaded configuration
-func Load(configDetails types.ConfigDetails) (*types.Config, error) {
-	if len(configDetails.ConfigFiles) < 1 {
-		return nil, fmt.Errorf("No files specified")
-	}
-	if len(configDetails.ConfigFiles) > 1 {
-		return nil, fmt.Errorf("Multiple files are not yet supported")
-	}
-
-	configDict := getConfigDict(configDetails)
-
-	if services, ok := configDict["services"]; ok {
-		if servicesDict, ok := services.(types.Dict); ok {
-			forbidden := getProperties(servicesDict, types.ForbiddenProperties)
-
-			if len(forbidden) > 0 {
-				return nil, &ForbiddenPropertiesError{Properties: forbidden}
-			}
-		}
-	}
-
-	if err := schema.Validate(configDict, schema.Version(configDict)); err != nil {
-		return nil, err
-	}
-
-	cfg := types.Config{}
-	if services, ok := configDict["services"]; ok {
-		servicesConfig, err := interpolation.Interpolate(services.(types.Dict), "service", os.LookupEnv)
-		if err != nil {
-			return nil, err
-		}
-
-		servicesList, err := loadServices(servicesConfig, configDetails.WorkingDir)
-		if err != nil {
-			return nil, err
-		}
-
-		cfg.Services = servicesList
-	}
-
-	if networks, ok := configDict["networks"]; ok {
-		networksConfig, err := interpolation.Interpolate(networks.(types.Dict), "network", os.LookupEnv)
-		if err != nil {
-			return nil, err
-		}
-
-		networksMapping, err := loadNetworks(networksConfig)
-		if err != nil {
-			return nil, err
-		}
-
-		cfg.Networks = networksMapping
-	}
-
-	if volumes, ok := configDict["volumes"]; ok {
-		volumesConfig, err := interpolation.Interpolate(volumes.(types.Dict), "volume", os.LookupEnv)
-		if err != nil {
-			return nil, err
-		}
-
-		volumesMapping, err := loadVolumes(volumesConfig)
-		if err != nil {
-			return nil, err
-		}
-
-		cfg.Volumes = volumesMapping
-	}
-
-	if secrets, ok := configDict["secrets"]; ok {
-		secretsConfig, err := interpolation.Interpolate(secrets.(types.Dict), "secret", os.LookupEnv)
-		if err != nil {
-			return nil, err
-		}
-
-		secretsMapping, err := loadSecrets(secretsConfig, configDetails.WorkingDir)
-		if err != nil {
-			return nil, err
-		}
-
-		cfg.Secrets = secretsMapping
-	}
-
-	return &cfg, nil
-}
-
-// GetUnsupportedProperties returns the list of any unsupported properties that are
-// used in the Compose files.
-func GetUnsupportedProperties(configDetails types.ConfigDetails) []string {
-	unsupported := map[string]bool{}
-
-	for _, service := range getServices(getConfigDict(configDetails)) {
-		serviceDict := service.(types.Dict)
-		for _, property := range types.UnsupportedProperties {
-			if _, isSet := serviceDict[property]; isSet {
-				unsupported[property] = true
-			}
-		}
-	}
-
-	return sortedKeys(unsupported)
-}
-
-func sortedKeys(set map[string]bool) []string {
-	var keys []string
-	for key := range set {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	return keys
-}
-
-// GetDeprecatedProperties returns the list of any deprecated properties that
-// are used in the compose files.
-func GetDeprecatedProperties(configDetails types.ConfigDetails) map[string]string {
-	return getProperties(getServices(getConfigDict(configDetails)), types.DeprecatedProperties)
-}
-
-func getProperties(services types.Dict, propertyMap map[string]string) map[string]string {
-	output := map[string]string{}
-
-	for _, service := range services {
-		if serviceDict, ok := service.(types.Dict); ok {
-			for property, description := range propertyMap {
-				if _, isSet := serviceDict[property]; isSet {
-					output[property] = description
-				}
-			}
-		}
-	}
-
-	return output
-}
-
-// ForbiddenPropertiesError is returned when there are properties in the Compose
-// file that are forbidden.
-type ForbiddenPropertiesError struct {
-	Properties map[string]string
-}
-
-func (e *ForbiddenPropertiesError) Error() string {
-	return "Configuration contains forbidden properties"
-}
-
-// TODO: resolve multiple files into a single config
-func getConfigDict(configDetails types.ConfigDetails) types.Dict {
-	return configDetails.ConfigFiles[0].Config
-}
-
-func getServices(configDict types.Dict) types.Dict {
-	if services, ok := configDict["services"]; ok {
-		if servicesDict, ok := services.(types.Dict); ok {
-			return servicesDict
-		}
-	}
-
-	return types.Dict{}
-}
-
-func transform(source map[string]interface{}, target interface{}) error {
-	data := mapstructure.Metadata{}
-	config := &mapstructure.DecoderConfig{
-		DecodeHook: mapstructure.ComposeDecodeHookFunc(
-			transformHook,
-			mapstructure.StringToTimeDurationHookFunc()),
-		Result:   target,
-		Metadata: &data,
-	}
-	decoder, err := mapstructure.NewDecoder(config)
-	if err != nil {
-		return err
-	}
-	err = decoder.Decode(source)
-	// TODO: log unused keys
-	return err
-}
-
-func transformHook(
-	source reflect.Type,
-	target reflect.Type,
-	data interface{},
-) (interface{}, error) {
-	switch target {
-	case reflect.TypeOf(types.External{}):
-		return transformExternal(data)
-	case reflect.TypeOf(make(map[string]string, 0)):
-		return transformMapStringString(source, target, data)
-	case reflect.TypeOf(types.UlimitsConfig{}):
-		return transformUlimits(data)
-	case reflect.TypeOf(types.UnitBytes(0)):
-		return loadSize(data)
-	case reflect.TypeOf(types.ServiceSecretConfig{}):
-		return transformServiceSecret(data)
-	}
-	switch target.Kind() {
-	case reflect.Struct:
-		return transformStruct(source, target, data)
-	}
-	return data, nil
-}
-
-// keys needs to be converted to strings for jsonschema
-// TODO: don't use types.Dict
-func convertToStringKeysRecursive(value interface{}, keyPrefix string) (interface{}, error) {
-	if mapping, ok := value.(map[interface{}]interface{}); ok {
-		dict := make(types.Dict)
-		for key, entry := range mapping {
-			str, ok := key.(string)
-			if !ok {
-				var location string
-				if keyPrefix == "" {
-					location = "at top level"
-				} else {
-					location = fmt.Sprintf("in %s", keyPrefix)
-				}
-				return nil, fmt.Errorf("Non-string key %s: %#v", location, key)
-			}
-			var newKeyPrefix string
-			if keyPrefix == "" {
-				newKeyPrefix = str
-			} else {
-				newKeyPrefix = fmt.Sprintf("%s.%s", keyPrefix, str)
-			}
-			convertedEntry, err := convertToStringKeysRecursive(entry, newKeyPrefix)
-			if err != nil {
-				return nil, err
-			}
-			dict[str] = convertedEntry
-		}
-		return dict, nil
-	}
-	if list, ok := value.([]interface{}); ok {
-		var convertedList []interface{}
-		for index, entry := range list {
-			newKeyPrefix := fmt.Sprintf("%s[%d]", keyPrefix, index)
-			convertedEntry, err := convertToStringKeysRecursive(entry, newKeyPrefix)
-			if err != nil {
-				return nil, err
-			}
-			convertedList = append(convertedList, convertedEntry)
-		}
-		return convertedList, nil
-	}
-	return value, nil
-}
-
-func loadServices(servicesDict types.Dict, workingDir string) ([]types.ServiceConfig, error) {
-	var services []types.ServiceConfig
-
-	for name, serviceDef := range servicesDict {
-		serviceConfig, err := loadService(name, serviceDef.(types.Dict), workingDir)
-		if err != nil {
-			return nil, err
-		}
-		services = append(services, *serviceConfig)
-	}
-
-	return services, nil
-}
-
-func loadService(name string, serviceDict types.Dict, workingDir string) (*types.ServiceConfig, error) {
-	serviceConfig := &types.ServiceConfig{}
-	if err := transform(serviceDict, serviceConfig); err != nil {
-		return nil, err
-	}
-	serviceConfig.Name = name
-
-	if err := resolveEnvironment(serviceConfig, serviceDict, workingDir); err != nil {
-		return nil, err
-	}
-
-	if err := resolveVolumePaths(serviceConfig.Volumes, workingDir); err != nil {
-		return nil, err
-	}
-
-	return serviceConfig, nil
-}
-
-func resolveEnvironment(serviceConfig *types.ServiceConfig, serviceDict types.Dict, workingDir string) error {
-	environment := make(map[string]string)
-
-	if envFileVal, ok := serviceDict["env_file"]; ok {
-		envFiles := loadStringOrListOfStrings(envFileVal)
-
-		var envVars []string
-
-		for _, file := range envFiles {
-			filePath := absPath(workingDir, file)
-			fileVars, err := opts.ParseEnvFile(filePath)
-			if err != nil {
-				return err
-			}
-			envVars = append(envVars, fileVars...)
-		}
-
-		for k, v := range opts.ConvertKVStringsToMap(envVars) {
-			environment[k] = v
-		}
-	}
-
-	for k, v := range serviceConfig.Environment {
-		environment[k] = v
-	}
-
-	serviceConfig.Environment = environment
-
-	return nil
-}
-
-func resolveVolumePaths(volumes []string, workingDir string) error {
-	for i, mapping := range volumes {
-		parts := strings.SplitN(mapping, ":", 2)
-		if len(parts) == 1 {
-			continue
-		}
-
-		if strings.HasPrefix(parts[0], ".") {
-			parts[0] = absPath(workingDir, parts[0])
-		}
-		parts[0] = expandUser(parts[0])
-
-		volumes[i] = strings.Join(parts, ":")
-	}
-
-	return nil
-}
-
-// TODO: make this more robust
-func expandUser(path string) string {
-	if strings.HasPrefix(path, "~") {
-		return strings.Replace(path, "~", os.Getenv("HOME"), 1)
-	}
-	return path
-}
-
-func transformUlimits(data interface{}) (interface{}, error) {
-	switch value := data.(type) {
-	case int:
-		return types.UlimitsConfig{Single: value}, nil
-	case types.Dict:
-		ulimit := types.UlimitsConfig{}
-		ulimit.Soft = value["soft"].(int)
-		ulimit.Hard = value["hard"].(int)
-		return ulimit, nil
-	default:
-		return data, fmt.Errorf("invalid type %T for ulimits", value)
-	}
-}
-
-func loadNetworks(source types.Dict) (map[string]types.NetworkConfig, error) {
-	networks := make(map[string]types.NetworkConfig)
-	err := transform(source, &networks)
-	if err != nil {
-		return networks, err
-	}
-	for name, network := range networks {
-		if network.External.External && network.External.Name == "" {
-			network.External.Name = name
-			networks[name] = network
-		}
-	}
-	return networks, nil
-}
-
-func loadVolumes(source types.Dict) (map[string]types.VolumeConfig, error) {
-	volumes := make(map[string]types.VolumeConfig)
-	err := transform(source, &volumes)
-	if err != nil {
-		return volumes, err
-	}
-	for name, volume := range volumes {
-		if volume.External.External && volume.External.Name == "" {
-			volume.External.Name = name
-			volumes[name] = volume
-		}
-	}
-	return volumes, nil
-}
-
-// TODO: remove duplicate with networks/volumes
-func loadSecrets(source types.Dict, workingDir string) (map[string]types.SecretConfig, error) {
-	secrets := make(map[string]types.SecretConfig)
-	if err := transform(source, &secrets); err != nil {
-		return secrets, err
-	}
-	for name, secret := range secrets {
-		if secret.External.External && secret.External.Name == "" {
-			secret.External.Name = name
-			secrets[name] = secret
-		}
-		if secret.File != "" {
-			secret.File = absPath(workingDir, secret.File)
-		}
-	}
-	return secrets, nil
-}
-
-func absPath(workingDir string, filepath string) string {
-	if path.IsAbs(filepath) {
-		return filepath
-	}
-	return path.Join(workingDir, filepath)
-}
-
-func transformStruct(
-	source reflect.Type,
-	target reflect.Type,
-	data interface{},
-) (interface{}, error) {
-	structValue, ok := data.(map[string]interface{})
-	if !ok {
-		// FIXME: this is necessary because of convertToStringKeysRecursive
-		structValue, ok = data.(types.Dict)
-		if !ok {
-			panic(fmt.Sprintf(
-				"transformStruct called with non-map type: %T, %s", data, data))
-		}
-	}
-
-	var err error
-	for i := 0; i < target.NumField(); i++ {
-		field := target.Field(i)
-		fieldTag := field.Tag.Get("compose")
-
-		yamlName := toYAMLName(field.Name)
-		value, ok := structValue[yamlName]
-		if !ok {
-			continue
-		}
-
-		structValue[yamlName], err = convertField(
-			fieldTag, reflect.TypeOf(value), field.Type, value)
-		if err != nil {
-			return nil, fmt.Errorf("field %s: %s", yamlName, err.Error())
-		}
-	}
-	return structValue, nil
-}
-
-func transformMapStringString(
-	source reflect.Type,
-	target reflect.Type,
-	data interface{},
-) (interface{}, error) {
-	switch value := data.(type) {
-	case map[string]interface{}:
-		return toMapStringString(value), nil
-	case types.Dict:
-		return toMapStringString(value), nil
-	case map[string]string:
-		return value, nil
-	default:
-		return data, fmt.Errorf("invalid type %T for map[string]string", value)
-	}
-}
-
-func convertField(
-	fieldTag string,
-	source reflect.Type,
-	target reflect.Type,
-	data interface{},
-) (interface{}, error) {
-	switch fieldTag {
-	case "":
-		return data, nil
-	case "healthcheck":
-		return loadHealthcheck(data)
-	case "list_or_dict_equals":
-		return loadMappingOrList(data, "="), nil
-	case "list_or_dict_colon":
-		return loadMappingOrList(data, ":"), nil
-	case "list_or_struct_map":
-		return loadListOrStructMap(data, target)
-	case "string_or_list":
-		return loadStringOrListOfStrings(data), nil
-	case "list_of_strings_or_numbers":
-		return loadListOfStringsOrNumbers(data), nil
-	case "shell_command":
-		return loadShellCommand(data)
-	case "size":
-		return loadSize(data)
-	case "-":
-		return nil, nil
-	}
-	return data, nil
-}
-
-func transformExternal(data interface{}) (interface{}, error) {
-	switch value := data.(type) {
-	case bool:
-		return map[string]interface{}{"external": value}, nil
-	case types.Dict:
-		return map[string]interface{}{"external": true, "name": value["name"]}, nil
-	case map[string]interface{}:
-		return map[string]interface{}{"external": true, "name": value["name"]}, nil
-	default:
-		return data, fmt.Errorf("invalid type %T for external", value)
-	}
-}
-
-func transformServiceSecret(data interface{}) (interface{}, error) {
-	switch value := data.(type) {
-	case string:
-		return map[string]interface{}{"source": value}, nil
-	case types.Dict:
-		return data, nil
-	case map[string]interface{}:
-		return data, nil
-	default:
-		return data, fmt.Errorf("invalid type %T for external", value)
-	}
-
-}
-
-func toYAMLName(name string) string {
-	nameParts := fieldNameRegexp.FindAllString(name, -1)
-	for i, p := range nameParts {
-		nameParts[i] = strings.ToLower(p)
-	}
-	return strings.Join(nameParts, "_")
-}
-
-func loadListOrStructMap(value interface{}, target reflect.Type) (interface{}, error) {
-	if list, ok := value.([]interface{}); ok {
-		mapValue := map[interface{}]interface{}{}
-		for _, name := range list {
-			mapValue[name] = nil
-		}
-		return mapValue, nil
-	}
-
-	return value, nil
-}
-
-func loadListOfStringsOrNumbers(value interface{}) []string {
-	list := value.([]interface{})
-	result := make([]string, len(list))
-	for i, item := range list {
-		result[i] = fmt.Sprint(item)
-	}
-	return result
-}
-
-func loadStringOrListOfStrings(value interface{}) []string {
-	if list, ok := value.([]interface{}); ok {
-		result := make([]string, len(list))
-		for i, item := range list {
-			result[i] = fmt.Sprint(item)
-		}
-		return result
-	}
-	return []string{value.(string)}
-}
-
-func loadMappingOrList(mappingOrList interface{}, sep string) map[string]string {
-	if mapping, ok := mappingOrList.(types.Dict); ok {
-		return toMapStringString(mapping)
-	}
-	if list, ok := mappingOrList.([]interface{}); ok {
-		result := make(map[string]string)
-		for _, value := range list {
-			parts := strings.SplitN(value.(string), sep, 2)
-			if len(parts) == 1 {
-				result[parts[0]] = ""
-			} else {
-				result[parts[0]] = parts[1]
-			}
-		}
-		return result
-	}
-	panic(fmt.Errorf("expected a map or a slice, got: %#v", mappingOrList))
-}
-
-func loadShellCommand(value interface{}) (interface{}, error) {
-	if str, ok := value.(string); ok {
-		return shellwords.Parse(str)
-	}
-	return value, nil
-}
-
-func loadHealthcheck(value interface{}) (interface{}, error) {
-	if str, ok := value.(string); ok {
-		return append([]string{"CMD-SHELL"}, str), nil
-	}
-	return value, nil
-}
-
-func loadSize(value interface{}) (int64, error) {
-	switch value := value.(type) {
-	case int:
-		return int64(value), nil
-	case string:
-		return units.RAMInBytes(value)
-	}
-	panic(fmt.Errorf("invalid type for size %T", value))
-}
-
-func toMapStringString(value map[string]interface{}) map[string]string {
-	output := make(map[string]string)
-	for key, value := range value {
-		output[key] = toString(value)
-	}
-	return output
-}
-
-func toString(value interface{}) string {
-	if value == nil {
-		return ""
-	}
-	return fmt.Sprint(value)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/loader/loader_test.go b/installer/vendor/github.com/docker/docker/cli/compose/loader/loader_test.go
deleted file mode 100644
index f7fee89ede..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/loader/loader_test.go
+++ /dev/null
@@ -1,800 +0,0 @@
-package loader
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/cli/compose/types"
-	"github.com/stretchr/testify/assert"
-)
-
-func buildConfigDetails(source types.Dict) types.ConfigDetails {
-	workingDir, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-
-	return types.ConfigDetails{
-		WorkingDir: workingDir,
-		ConfigFiles: []types.ConfigFile{
-			{Filename: "filename.yml", Config: source},
-		},
-		Environment: nil,
-	}
-}
-
-var sampleYAML = `
-version: "3"
-services:
-  foo:
-    image: busybox
-    networks:
-      with_me:
-  bar:
-    image: busybox
-    environment:
-      - FOO=1
-    networks:
-      - with_ipam
-volumes:
-  hello:
-    driver: default
-    driver_opts:
-      beep: boop
-networks:
-  default:
-    driver: bridge
-    driver_opts:
-      beep: boop
-  with_ipam:
-    ipam:
-      driver: default
-      config:
-        - subnet: 172.28.0.0/16
-`
-
-var sampleDict = types.Dict{
-	"version": "3",
-	"services": types.Dict{
-		"foo": types.Dict{
-			"image":    "busybox",
-			"networks": types.Dict{"with_me": nil},
-		},
-		"bar": types.Dict{
-			"image":       "busybox",
-			"environment": []interface{}{"FOO=1"},
-			"networks":    []interface{}{"with_ipam"},
-		},
-	},
-	"volumes": types.Dict{
-		"hello": types.Dict{
-			"driver": "default",
-			"driver_opts": types.Dict{
-				"beep": "boop",
-			},
-		},
-	},
-	"networks": types.Dict{
-		"default": types.Dict{
-			"driver": "bridge",
-			"driver_opts": types.Dict{
-				"beep": "boop",
-			},
-		},
-		"with_ipam": types.Dict{
-			"ipam": types.Dict{
-				"driver": "default",
-				"config": []interface{}{
-					types.Dict{
-						"subnet": "172.28.0.0/16",
-					},
-				},
-			},
-		},
-	},
-}
-
-var sampleConfig = types.Config{
-	Services: []types.ServiceConfig{
-		{
-			Name:        "foo",
-			Image:       "busybox",
-			Environment: map[string]string{},
-			Networks: map[string]*types.ServiceNetworkConfig{
-				"with_me": nil,
-			},
-		},
-		{
-			Name:        "bar",
-			Image:       "busybox",
-			Environment: map[string]string{"FOO": "1"},
-			Networks: map[string]*types.ServiceNetworkConfig{
-				"with_ipam": nil,
-			},
-		},
-	},
-	Networks: map[string]types.NetworkConfig{
-		"default": {
-			Driver: "bridge",
-			DriverOpts: map[string]string{
-				"beep": "boop",
-			},
-		},
-		"with_ipam": {
-			Ipam: types.IPAMConfig{
-				Driver: "default",
-				Config: []*types.IPAMPool{
-					{
-						Subnet: "172.28.0.0/16",
-					},
-				},
-			},
-		},
-	},
-	Volumes: map[string]types.VolumeConfig{
-		"hello": {
-			Driver: "default",
-			DriverOpts: map[string]string{
-				"beep": "boop",
-			},
-		},
-	},
-}
-
-func TestParseYAML(t *testing.T) {
-	dict, err := ParseYAML([]byte(sampleYAML))
-	if !assert.NoError(t, err) {
-		return
-	}
-	assert.Equal(t, sampleDict, dict)
-}
-
-func TestLoad(t *testing.T) {
-	actual, err := Load(buildConfigDetails(sampleDict))
-	if !assert.NoError(t, err) {
-		return
-	}
-	assert.Equal(t, serviceSort(sampleConfig.Services), serviceSort(actual.Services))
-	assert.Equal(t, sampleConfig.Networks, actual.Networks)
-	assert.Equal(t, sampleConfig.Volumes, actual.Volumes)
-}
-
-func TestLoadV31(t *testing.T) {
-	actual, err := loadYAML(`
-version: "3.1"
-services:
-  foo:
-    image: busybox
-    secrets: [super]
-secrets:
-  super:
-    external: true
-`)
-	if !assert.NoError(t, err) {
-		return
-	}
-	assert.Equal(t, len(actual.Services), 1)
-	assert.Equal(t, len(actual.Secrets), 1)
-}
-
-func TestParseAndLoad(t *testing.T) {
-	actual, err := loadYAML(sampleYAML)
-	if !assert.NoError(t, err) {
-		return
-	}
-	assert.Equal(t, serviceSort(sampleConfig.Services), serviceSort(actual.Services))
-	assert.Equal(t, sampleConfig.Networks, actual.Networks)
-	assert.Equal(t, sampleConfig.Volumes, actual.Volumes)
-}
-
-func TestInvalidTopLevelObjectType(t *testing.T) {
-	_, err := loadYAML("1")
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Top-level object must be a mapping")
-
-	_, err = loadYAML("\"hello\"")
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Top-level object must be a mapping")
-
-	_, err = loadYAML("[\"hello\"]")
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Top-level object must be a mapping")
-}
-
-func TestNonStringKeys(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-123:
-  foo:
-    image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Non-string key at top level: 123")
-
-	_, err = loadYAML(`
-version: "3"
-services:
-  foo:
-    image: busybox
-  123:
-    image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Non-string key in services: 123")
-
-	_, err = loadYAML(`
-version: "3"
-services:
-  foo:
-    image: busybox
-networks:
-  default:
-    ipam:
-      config:
-        - 123: oh dear
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Non-string key in networks.default.ipam.config[0]: 123")
-
-	_, err = loadYAML(`
-version: "3"
-services:
-  dict-env:
-    image: busybox
-    environment:
-      1: FOO
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Non-string key in services.dict-env.environment: 1")
-}
-
-func TestSupportedVersion(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  foo:
-    image: busybox
-`)
-	assert.NoError(t, err)
-
-	_, err = loadYAML(`
-version: "3.0"
-services:
-  foo:
-    image: busybox
-`)
-	assert.NoError(t, err)
-}
-
-func TestUnsupportedVersion(t *testing.T) {
-	_, err := loadYAML(`
-version: "2"
-services:
-  foo:
-    image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "version")
-
-	_, err = loadYAML(`
-version: "2.0"
-services:
-  foo:
-    image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "version")
-}
-
-func TestInvalidVersion(t *testing.T) {
-	_, err := loadYAML(`
-version: 3
-services:
-  foo:
-    image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "version must be a string")
-}
-
-func TestV1Unsupported(t *testing.T) {
-	_, err := loadYAML(`
-foo:
-  image: busybox
-`)
-	assert.Error(t, err)
-}
-
-func TestNonMappingObject(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  - foo:
-      image: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "services must be a mapping")
-
-	_, err = loadYAML(`
-version: "3"
-services:
-  foo: busybox
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "services.foo must be a mapping")
-
-	_, err = loadYAML(`
-version: "3"
-networks:
-  - default:
-      driver: bridge
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "networks must be a mapping")
-
-	_, err = loadYAML(`
-version: "3"
-networks:
-  default: bridge
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "networks.default must be a mapping")
-
-	_, err = loadYAML(`
-version: "3"
-volumes:
-  - data:
-      driver: local
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "volumes must be a mapping")
-
-	_, err = loadYAML(`
-version: "3"
-volumes:
-  data: local
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "volumes.data must be a mapping")
-}
-
-func TestNonStringImage(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  foo:
-    image: ["busybox", "latest"]
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "services.foo.image must be a string")
-}
-
-func TestValidEnvironment(t *testing.T) {
-	config, err := loadYAML(`
-version: "3"
-services:
-  dict-env:
-    image: busybox
-    environment:
-      FOO: "1"
-      BAR: 2
-      BAZ: 2.5
-      QUUX:
-  list-env:
-    image: busybox
-    environment:
-      - FOO=1
-      - BAR=2
-      - BAZ=2.5
-      - QUUX=
-`)
-	assert.NoError(t, err)
-
-	expected := map[string]string{
-		"FOO":  "1",
-		"BAR":  "2",
-		"BAZ":  "2.5",
-		"QUUX": "",
-	}
-
-	assert.Equal(t, 2, len(config.Services))
-
-	for _, service := range config.Services {
-		assert.Equal(t, expected, service.Environment)
-	}
-}
-
-func TestInvalidEnvironmentValue(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  dict-env:
-    image: busybox
-    environment:
-      FOO: ["1"]
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "services.dict-env.environment.FOO must be a string, number or null")
-}
-
-func TestInvalidEnvironmentObject(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  dict-env:
-    image: busybox
-    environment: "FOO=1"
-`)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "services.dict-env.environment must be a mapping")
-}
-
-func TestEnvironmentInterpolation(t *testing.T) {
-	config, err := loadYAML(`
-version: "3"
-services:
-  test:
-    image: busybox
-    labels:
-      - home1=$HOME
-      - home2=${HOME}
-      - nonexistent=$NONEXISTENT
-      - default=${NONEXISTENT-default}
-networks:
-  test:
-    driver: $HOME
-volumes:
-  test:
-    driver: $HOME
-`)
-
-	assert.NoError(t, err)
-
-	home := os.Getenv("HOME")
-
-	expectedLabels := map[string]string{
-		"home1":       home,
-		"home2":       home,
-		"nonexistent": "",
-		"default":     "default",
-	}
-
-	assert.Equal(t, expectedLabels, config.Services[0].Labels)
-	assert.Equal(t, home, config.Networks["test"].Driver)
-	assert.Equal(t, home, config.Volumes["test"].Driver)
-}
-
-func TestUnsupportedProperties(t *testing.T) {
-	dict, err := ParseYAML([]byte(`
-version: "3"
-services:
-  web:
-    image: web
-    build: ./web
-    links:
-      - bar
-  db:
-    image: db
-    build: ./db
-`))
-	assert.NoError(t, err)
-
-	configDetails := buildConfigDetails(dict)
-
-	_, err = Load(configDetails)
-	assert.NoError(t, err)
-
-	unsupported := GetUnsupportedProperties(configDetails)
-	assert.Equal(t, []string{"build", "links"}, unsupported)
-}
-
-func TestDeprecatedProperties(t *testing.T) {
-	dict, err := ParseYAML([]byte(`
-version: "3"
-services:
-  web:
-    image: web
-    container_name: web
-  db:
-    image: db
-    container_name: db
-    expose: ["5434"]
-`))
-	assert.NoError(t, err)
-
-	configDetails := buildConfigDetails(dict)
-
-	_, err = Load(configDetails)
-	assert.NoError(t, err)
-
-	deprecated := GetDeprecatedProperties(configDetails)
-	assert.Equal(t, 2, len(deprecated))
-	assert.Contains(t, deprecated, "container_name")
-	assert.Contains(t, deprecated, "expose")
-}
-
-func TestForbiddenProperties(t *testing.T) {
-	_, err := loadYAML(`
-version: "3"
-services:
-  foo:
-    image: busybox
-    volumes:
-      - /data
-    volume_driver: some-driver
-  bar:
-    extends:
-      service: foo
-`)
-
-	assert.Error(t, err)
-	assert.IsType(t, &ForbiddenPropertiesError{}, err)
-	fmt.Println(err)
-	forbidden := err.(*ForbiddenPropertiesError).Properties
-
-	assert.Equal(t, 2, len(forbidden))
-	assert.Contains(t, forbidden, "volume_driver")
-	assert.Contains(t, forbidden, "extends")
-}
-
-func durationPtr(value time.Duration) *time.Duration {
-	return &value
-}
-
-func int64Ptr(value int64) *int64 {
-	return &value
-}
-
-func uint64Ptr(value uint64) *uint64 {
-	return &value
-}
-
-func TestFullExample(t *testing.T) {
-	bytes, err := ioutil.ReadFile("full-example.yml")
-	assert.NoError(t, err)
-
-	config, err := loadYAML(string(bytes))
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	workingDir, err := os.Getwd()
-	assert.NoError(t, err)
-
-	homeDir := os.Getenv("HOME")
-	stopGracePeriod := time.Duration(20 * time.Second)
-
-	expectedServiceConfig := types.ServiceConfig{
-		Name: "foo",
-
-		CapAdd:        []string{"ALL"},
-		CapDrop:       []string{"NET_ADMIN", "SYS_ADMIN"},
-		CgroupParent:  "m-executor-abcd",
-		Command:       []string{"bundle", "exec", "thin", "-p", "3000"},
-		ContainerName: "my-web-container",
-		DependsOn:     []string{"db", "redis"},
-		Deploy: types.DeployConfig{
-			Mode:     "replicated",
-			Replicas: uint64Ptr(6),
-			Labels:   map[string]string{"FOO": "BAR"},
-			UpdateConfig: &types.UpdateConfig{
-				Parallelism:     uint64Ptr(3),
-				Delay:           time.Duration(10 * time.Second),
-				FailureAction:   "continue",
-				Monitor:         time.Duration(60 * time.Second),
-				MaxFailureRatio: 0.3,
-			},
-			Resources: types.Resources{
-				Limits: &types.Resource{
-					NanoCPUs:    "0.001",
-					MemoryBytes: 50 * 1024 * 1024,
-				},
-				Reservations: &types.Resource{
-					NanoCPUs:    "0.0001",
-					MemoryBytes: 20 * 1024 * 1024,
-				},
-			},
-			RestartPolicy: &types.RestartPolicy{
-				Condition:   "on_failure",
-				Delay:       durationPtr(5 * time.Second),
-				MaxAttempts: uint64Ptr(3),
-				Window:      durationPtr(2 * time.Minute),
-			},
-			Placement: types.Placement{
-				Constraints: []string{"node=foo"},
-			},
-		},
-		Devices:    []string{"/dev/ttyUSB0:/dev/ttyUSB0"},
-		DNS:        []string{"8.8.8.8", "9.9.9.9"},
-		DNSSearch:  []string{"dc1.example.com", "dc2.example.com"},
-		DomainName: "foo.com",
-		Entrypoint: []string{"/code/entrypoint.sh", "-p", "3000"},
-		Environment: map[string]string{
-			"RACK_ENV":       "development",
-			"SHOW":           "true",
-			"SESSION_SECRET": "",
-			"FOO":            "1",
-			"BAR":            "2",
-			"BAZ":            "3",
-		},
-		Expose: []string{"3000", "8000"},
-		ExternalLinks: []string{
-			"redis_1",
-			"project_db_1:mysql",
-			"project_db_1:postgresql",
-		},
-		ExtraHosts: map[string]string{
-			"otherhost": "50.31.209.229",
-			"somehost":  "162.242.195.82",
-		},
-		HealthCheck: &types.HealthCheckConfig{
-			Test: []string{
-				"CMD-SHELL",
-				"echo \"hello world\"",
-			},
-			Interval: "10s",
-			Timeout:  "1s",
-			Retries:  uint64Ptr(5),
-		},
-		Hostname: "foo",
-		Image:    "redis",
-		Ipc:      "host",
-		Labels: map[string]string{
-			"com.example.description": "Accounting webapp",
-			"com.example.number":      "42",
-			"com.example.empty-label": "",
-		},
-		Links: []string{
-			"db",
-			"db:database",
-			"redis",
-		},
-		Logging: &types.LoggingConfig{
-			Driver: "syslog",
-			Options: map[string]string{
-				"syslog-address": "tcp://192.168.0.42:123",
-			},
-		},
-		MacAddress:  "02:42:ac:11:65:43",
-		NetworkMode: "container:0cfeab0f748b9a743dc3da582046357c6ef497631c1a016d28d2bf9b4f899f7b",
-		Networks: map[string]*types.ServiceNetworkConfig{
-			"some-network": {
-				Aliases:     []string{"alias1", "alias3"},
-				Ipv4Address: "",
-				Ipv6Address: "",
-			},
-			"other-network": {
-				Ipv4Address: "172.16.238.10",
-				Ipv6Address: "2001:3984:3989::10",
-			},
-			"other-other-network": nil,
-		},
-		Pid: "host",
-		Ports: []string{
-			"3000",
-			"3000-3005",
-			"8000:8000",
-			"9090-9091:8080-8081",
-			"49100:22",
-			"127.0.0.1:8001:8001",
-			"127.0.0.1:5000-5010:5000-5010",
-		},
-		Privileged: true,
-		ReadOnly:   true,
-		Restart:    "always",
-		SecurityOpt: []string{
-			"label=level:s0:c100,c200",
-			"label=type:svirt_apache_t",
-		},
-		StdinOpen:       true,
-		StopSignal:      "SIGUSR1",
-		StopGracePeriod: &stopGracePeriod,
-		Tmpfs:           []string{"/run", "/tmp"},
-		Tty:             true,
-		Ulimits: map[string]*types.UlimitsConfig{
-			"nproc": {
-				Single: 65535,
-			},
-			"nofile": {
-				Soft: 20000,
-				Hard: 40000,
-			},
-		},
-		User: "someone",
-		Volumes: []string{
-			"/var/lib/mysql",
-			"/opt/data:/var/lib/mysql",
-			fmt.Sprintf("%s:/code", workingDir),
-			fmt.Sprintf("%s/static:/var/www/html", workingDir),
-			fmt.Sprintf("%s/configs:/etc/configs/:ro", homeDir),
-			"datavolume:/var/lib/mysql",
-		},
-		WorkingDir: "/code",
-	}
-
-	assert.Equal(t, []types.ServiceConfig{expectedServiceConfig}, config.Services)
-
-	expectedNetworkConfig := map[string]types.NetworkConfig{
-		"some-network": {},
-
-		"other-network": {
-			Driver: "overlay",
-			DriverOpts: map[string]string{
-				"foo": "bar",
-				"baz": "1",
-			},
-			Ipam: types.IPAMConfig{
-				Driver: "overlay",
-				Config: []*types.IPAMPool{
-					{Subnet: "172.16.238.0/24"},
-					{Subnet: "2001:3984:3989::/64"},
-				},
-			},
-		},
-
-		"external-network": {
-			External: types.External{
-				Name:     "external-network",
-				External: true,
-			},
-		},
-
-		"other-external-network": {
-			External: types.External{
-				Name:     "my-cool-network",
-				External: true,
-			},
-		},
-	}
-
-	assert.Equal(t, expectedNetworkConfig, config.Networks)
-
-	expectedVolumeConfig := map[string]types.VolumeConfig{
-		"some-volume": {},
-		"other-volume": {
-			Driver: "flocker",
-			DriverOpts: map[string]string{
-				"foo": "bar",
-				"baz": "1",
-			},
-		},
-		"external-volume": {
-			External: types.External{
-				Name:     "external-volume",
-				External: true,
-			},
-		},
-		"other-external-volume": {
-			External: types.External{
-				Name:     "my-cool-volume",
-				External: true,
-			},
-		},
-	}
-
-	assert.Equal(t, expectedVolumeConfig, config.Volumes)
-}
-
-func loadYAML(yaml string) (*types.Config, error) {
-	dict, err := ParseYAML([]byte(yaml))
-	if err != nil {
-		return nil, err
-	}
-
-	return Load(buildConfigDetails(dict))
-}
-
-func serviceSort(services []types.ServiceConfig) []types.ServiceConfig {
-	sort.Sort(servicesByName(services))
-	return services
-}
-
-type servicesByName []types.ServiceConfig
-
-func (sbn servicesByName) Len() int           { return len(sbn) }
-func (sbn servicesByName) Swap(i, j int)      { sbn[i], sbn[j] = sbn[j], sbn[i] }
-func (sbn servicesByName) Less(i, j int) bool { return sbn[i].Name < sbn[j].Name }
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/schema/bindata.go b/installer/vendor/github.com/docker/docker/cli/compose/schema/bindata.go
deleted file mode 100644
index 9486e91ae0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/schema/bindata.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Code generated by go-bindata.
-// sources:
-// data/config_schema_v3.0.json
-// data/config_schema_v3.1.json
-// DO NOT EDIT!
-
-package schema
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-)
-
-func bindataRead(data []byte, name string) ([]byte, error) {
-	gz, err := gzip.NewReader(bytes.NewBuffer(data))
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-
-	var buf bytes.Buffer
-	_, err = io.Copy(&buf, gz)
-	clErr := gz.Close()
-
-	if err != nil {
-		return nil, fmt.Errorf("Read %q: %v", name, err)
-	}
-	if clErr != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-type asset struct {
-	bytes []byte
-	info  os.FileInfo
-}
-
-type bindataFileInfo struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-}
-
-func (fi bindataFileInfo) Name() string {
-	return fi.name
-}
-func (fi bindataFileInfo) Size() int64 {
-	return fi.size
-}
-func (fi bindataFileInfo) Mode() os.FileMode {
-	return fi.mode
-}
-func (fi bindataFileInfo) ModTime() time.Time {
-	return fi.modTime
-}
-func (fi bindataFileInfo) IsDir() bool {
-	return false
-}
-func (fi bindataFileInfo) Sys() interface{} {
-	return nil
-}
-
-var _dataConfig_schema_v30Json = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x5a\x4f\x8f\xdb\xb8\x0e\xbf\xe7\x53\x18\x6e\x6f\xcd\xcc\x14\x78\xc5\x03\x5e\x6f\xef\xb8\xa7\xdd\xf3\x0e\x5c\x43\xb1\x99\x44\x1d\x59\x52\x29\x39\x9d\xb4\xc8\x77\x5f\xc8\xff\x22\x2b\x92\xe5\x24\xee\xb6\x87\x9e\x66\x62\x91\x14\xff\xe9\x47\x8a\xf6\xf7\x55\x92\xa4\x6f\x55\xb1\x87\x8a\xa4\x1f\x93\x74\xaf\xb5\xfc\xf8\xf4\xf4\x59\x09\xfe\xd0\x3e\x7d\x14\xb8\x7b\x2a\x91\x6c\xf5\xc3\xfb\x0f\x4f\xed\xb3\x37\xe9\xda\xf0\xd1\xd2\xb0\x14\x82\x6f\xe9\x2e\x6f\x57\xf2\xc3\x7f\x1e\xdf\x3f\x1a\xf6\x96\x44\x1f\x25\x18\x22\xb1\xf9\x0c\x85\x6e\x9f\x21\x7c\xa9\x29\x82\x61\x7e\x4e\x0f\x80\x8a\x0a\x9e\x66\xeb\x95\x59\x93\x28\x24\xa0\xa6\xa0\xd2\x8f\x89\x51\x2e\x49\x06\x92\xfe\x81\x25\x56\x69\xa4\x7c\x97\x36\x8f\x4f\x8d\x84\x24\x49\x15\xe0\x81\x16\x96\x84\x41\xd5\x37\x4f\x67\xf9\x4f\x03\xd9\xda\x95\x6a\x29\xdb\x3c\x97\x44\x6b\x40\xfe\xd7\xa5\x6e\xcd\xf2\xa7\x67\xf2\xf0\xed\xff\x0f\x7f\xbf\x7f\xf8\xdf\x63\xfe\x90\xbd\x7b\x3b\x5a\x36\xfe\x45\xd8\xb6\xdb\x97\xb0\xa5\x9c\x6a\x2a\xf8\xb0\x7f\x3a\x50\x9e\xba\xff\x4e\xc3\xc6\xa4\x2c\x1b\x62\xc2\x46\x7b\x6f\x09\x53\x30\xb6\x99\x83\xfe\x2a\xf0\x25\x66\xf3\x40\xf6\x93\x6c\xee\xf6\xf7\xd8\x3c\x36\xe7\x20\x58\x5d\x45\x23\xd8\x53\xfd\x24\x63\xda\xed\xef\x8b\xdf\xaa\x37\x7a\x92\xb6\xa5\xb0\xf6\x6e\x14\x1c\x65\xbb\xcf\x55\xbe\x6c\x0b\xfb\x6a\x70\x56\xc0\x4b\x25\x48\x26\x8e\xe6\x59\xc0\x1f\x2d\x41\x05\x5c\xa7\x83\x0b\x92\x24\xdd\xd4\x94\x95\xae\x47\x05\x87\x3f\x8d\x88\x67\xeb\x61\x92\x7c\x77\x0f\xb6\x25\xa7\x59\x1f\xfd\x0a\x07\x7c\x58\x0f\xd8\x32\xac\x17\x82\x6b\x78\xd5\x8d\x51\xd3\x5b\xb7\x2e\x10\xc5\x0b\xe0\x96\x32\x98\xcb\x41\x70\xa7\x26\x5c\xc6\xa8\xd2\xb9\xc0\xbc\xa4\x85\x4e\x4f\x0e\xfb\x85\xbc\x78\x3e\x0d\xac\xd6\xaf\x6c\xe5\x11\x98\x16\x44\xe6\xa4\x2c\x47\x76\x10\x44\x72\x4c\xd7\x49\x4a\x35\x54\xca\x6f\x62\x92\xd6\x9c\x7e\xa9\xe1\x8f\x8e\x44\x63\x0d\xae\xdc\x12\x85\x5c\x5e\xf0\x0e\x45\x2d\x73\x49\xd0\x24\xd8\xb4\xfb\xd3\x42\x54\x15\xe1\x4b\x65\xdd\x35\x76\xcc\xf0\xbc\xe0\x9a\x50\x0e\x98\x73\x52\xc5\x12\xc9\x9c\x3a\xe0\xa5\xca\xdb\xfa\x37\x99\x46\xdb\xbc\xe5\x57\x8e\x80\xa1\x18\x2e\x1a\x8f\x92\x4f\x25\x76\x2b\xc6\xa4\xb6\xd1\x2d\x75\x18\x73\x05\x04\x8b\xfd\x8d\xfc\xa2\x22\x94\xcf\xf1\x1d\x70\x8d\x47\x29\x68\x9b\x2f\xbf\x5c\x22\x00\x3f\xe4\x03\x96\x5c\xed\x06\xe0\x07\x8a\x82\x57\xfd\x69\x98\x03\x30\x03\xc8\x1b\xfe\x57\x29\x14\xb8\x8e\x71\x0c\xb4\x97\x06\x53\x47\x3e\xe9\x39\x9e\x7b\xc3\xd7\x49\xca\xeb\x6a\x03\x68\x5a\xba\x11\xe5\x56\x60\x45\x8c\xb2\xfd\xde\xd6\xf2\xc8\xd3\x9e\xcc\xb3\x1d\x68\xdb\x60\xca\x3a\x61\x39\xa3\xfc\x65\xf9\x14\x87\x57\x8d\x24\xdf\x0b\xa5\xe7\x63\xb8\xc5\xbe\x07\xc2\xf4\xbe\xd8\x43\xf1\x32\xc1\x6e\x53\x8d\xb8\x85\xd2\x73\x92\x9c\x56\x64\x17\x27\x92\x45\x8c\x84\x91\x0d\xb0\x9b\xec\x5c\xd4\xf9\x96\x58\xb1\xdb\x19\xd2\x50\xc6\x5d\x74\x2e\xdd\x72\xac\xe6\x97\x48\x0f\x80\x73\x0b\xb8\x90\xe7\x86\xcb\x5d\x8c\x37\x20\x49\xbc\xfb\x1c\x91\x7e\x7a\x6c\x9b\xcf\x89\x53\xd5\xfc\xc7\x58\x9a\xb9\xed\x42\xe2\xd4\x7d\xdf\x13\xc7\xc2\x79\x0d\xc5\x28\x2a\x15\x29\x4c\xdf\x80\xa0\x02\x71\x3d\x93\x76\xcd\x7e\x5e\x89\x32\x94\xa0\x17\xc4\xae\x6f\x82\x48\x7d\x75\x21\x4c\x6e\xea\x1f\x67\x85\x2e\x7a\x81\x88\x58\x13\x52\x6f\xae\x9a\x67\x75\xe3\x29\xd6\xd0\x11\x46\x89\x82\xf8\x61\x0f\x3a\x72\x24\x8d\xca\xc3\x87\x99\x39\xe1\xe3\xfd\xef\x24\x6f\x80\x35\x28\x73\x7e\x8f\x1c\x11\x75\x56\xa5\x39\x6e\x3e\x45\xb2\xc8\x69\xfb\xc1\x2d\xbc\xa4\x65\x18\x2b\x1a\x84\xb0\x0f\x98\x14\xa8\x2f\x4e\xd7\xbf\x53\xee\xdb\xad\xef\xae\xf6\x12\xe9\x81\x32\xd8\xc1\xf8\xd6\xb2\x11\x82\x01\xe1\x23\xe8\x41\x20\x65\x2e\x38\x3b\xce\xa0\x54\x9a\x60\xf4\x42\xa1\xa0\xa8\x91\xea\x63\x2e\xa4\x5e\xbc\xcf\x50\xfb\x2a\x57\xf4\x1b\x8c\xa3\x79\xc6\xfb\x4e\x50\x36\xe2\x39\xaa\x42\xdf\x56\xaf\x95\x2e\x29\xcf\x85\x04\x1e\xf5\x8e\xd2\x42\xe6\x3b\x24\x05\xe4\x12\x90\x8a\xd2\x67\xe0\xda\x8e\x75\x59\x23\x31\xfb\x5f\x8a\x51\x74\xc7\x09\x8b\x39\x5a\x57\x72\x7b\xe3\xc5\x42\xeb\x78\xb8\x6b\x46\x2b\x1a\x3e\x07\x1e\x80\x9d\x51\x03\x5a\xfc\xf7\xc3\xfe\x04\xe4\x9f\x35\xa5\x5c\xc3\x0e\xd0\x87\x94\x13\x5d\xc7\x74\xd3\x31\xa3\xdb\xd8\x13\x1c\x07\x74\x42\x8f\x86\x41\x89\xad\xf6\x33\xf8\x7a\x11\xaf\x5e\xa3\xe1\x6f\x23\x6f\xdd\x29\x92\x79\xe9\xaf\x82\x73\x57\x8d\x2c\x88\xa8\x27\x2f\xa2\xd6\x2a\xda\x18\x36\x34\x5c\x4d\x35\x35\x03\xa9\x35\xc5\x5c\x14\x2f\x4c\xa3\x64\x0e\x41\x49\xfd\xda\xae\x1c\xcb\xae\x98\x23\x3b\x77\x96\x5e\x80\x6f\xa2\x68\x93\x46\x27\xb0\xd3\xd3\xcd\x8e\x28\x38\x79\xa4\x8a\x6c\x9c\x99\x9b\xef\x70\x9b\x6c\xc4\x43\x1c\x63\x10\x34\x52\x27\x2e\x1d\xda\x8e\xf0\x04\xd4\xaf\x39\x38\xd0\xb4\x02\x51\xfb\x6b\xd6\xca\xce\xef\x8e\x29\xb5\x26\xb3\x91\xa0\x5a\x94\x6e\x4c\x9f\x87\xa0\xf6\xfd\x45\x34\x70\x73\x0e\x09\x82\x64\xb4\x20\x2a\x06\x44\x77\x5c\x50\x6b\x59\x12\x0d\x79\xfb\xa2\xea\x2a\xe8\x9f\xc0\x7c\x49\x90\x30\x06\x8c\xaa\x6a\x0e\x86\xa6\x25\x30\x72\xbc\xa9\x7c\x36\xec\x5b\x42\x59\x8d\x90\x93\x42\x77\xef\xc2\x22\x39\x97\x56\x82\x53\x2d\xbc\x08\x31\x6f\xcb\x8a\xbc\xe6\xfd\xb6\x0d\x89\xf7\xc0\x04\xdb\xba\xb9\x77\x4b\x2b\x13\x94\xa8\xb1\xb8\x70\xf6\xcd\x21\x3a\xd7\xfa\x40\xc6\xf4\x3b\x5e\x98\x8e\xa0\x0c\x92\x0c\x57\xff\x28\x7f\xb4\xb4\x74\x7d\x66\x2e\x05\xa3\xc5\x71\x29\x0b\x0b\xc1\x5b\x27\xcf\x49\x88\x3b\x33\xd0\xa4\x83\x69\x85\x2a\xa9\xa3\x87\xb5\x61\xf8\x4a\x79\x29\xbe\x5e\xb1\xe1\x72\xa9\x24\x19\x29\xc0\xc1\xbb\x7b\x1d\xad\x34\x12\xca\xf5\xd5\xe5\xfc\x5e\xb3\xee\xa8\xe6\x43\x7e\x46\x50\x7f\xa0\x8b\xbf\x49\x0d\x20\x7d\x21\xeb\xe8\x3c\xa8\x82\x4a\xa0\x37\x01\x17\x78\xf3\x1d\x33\xb1\x27\x5b\xa0\xaa\xcd\x1a\x20\x76\x54\xe6\xbe\xb8\xf8\x6d\x23\x3e\x24\xcc\xe2\x80\x44\x25\xa9\x96\x3a\x1d\xb3\x47\xaa\xa9\xb7\x06\x27\xd3\xa3\x88\x24\x3c\x8e\x88\x69\x1d\xd7\xbd\xa3\x50\xf5\x86\xc3\x64\x47\x65\xf9\xd3\xf7\x9e\x77\xfe\x35\xe5\x14\xbe\x94\xdc\x07\x7a\xfd\xdb\x90\x40\x54\x9f\x87\x9e\x79\x3d\xf8\x2a\x9b\x1d\xe2\xe0\xab\x88\xe5\xf4\xbf\xb2\xc1\xbb\x03\x33\xba\x2f\x37\x22\x90\xd1\x51\xfd\x46\x8c\xdf\xf9\x75\x65\x7e\x39\x43\x2a\x2b\xcf\x2e\xef\x8f\x53\x29\x31\x7b\x3a\xdf\x71\x64\x63\x35\x5c\x32\xcf\x07\x74\x63\xb4\x9d\x1a\x4a\xf4\x24\x81\x69\xad\xb3\x69\xe7\xc4\x69\xcb\x17\xcc\xf0\xc7\x77\x13\x35\x65\xea\x2d\xda\x0f\x02\xe3\x05\x06\x3e\xfe\x98\x3a\x8d\x68\xef\xdd\xcb\xaf\xc0\x02\xa0\x66\xf1\x5f\x7c\x13\x66\xec\xe4\xc7\x8b\xf9\xc6\xf7\xf1\xd0\xae\xfd\x9e\x2b\x1b\xf9\xc7\x21\x69\xdf\x49\x5b\x90\x92\xd9\xbd\x79\x28\x8c\xde\x2f\xc5\xdc\x91\x61\xff\xc5\x56\xe6\x87\xab\x95\xfd\xb7\xf9\xba\x6e\x75\x5a\xfd\x13\x00\x00\xff\xff\x46\xf7\x7b\x23\xe5\x2a\x00\x00")
-
-func dataConfig_schema_v30JsonBytes() ([]byte, error) {
-	return bindataRead(
-		_dataConfig_schema_v30Json,
-		"data/config_schema_v3.0.json",
-	)
-}
-
-func dataConfig_schema_v30Json() (*asset, error) {
-	bytes, err := dataConfig_schema_v30JsonBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "data/config_schema_v3.0.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-var _dataConfig_schema_v31Json = []byte("\x1f\x8b\x08\x00\x00\x09\x6e\x88\x00\xff\xec\x1a\xcb\x8e\xdb\x36\xf0\xee\xaf\x10\x94\xdc\xe2\xdd\x4d\xd1\xa0\x40\x73\xeb\xb1\xa7\xf6\xdc\x85\x23\xd0\xd2\x58\x66\x96\x22\x19\x92\x72\xd6\x09\xfc\xef\x05\xf5\x32\x45\x91\x22\x6d\x2b\xd9\x45\xd1\xd3\xae\xc5\x99\xe1\xbc\x67\x38\xe4\xf7\x55\x92\xa4\x6f\x65\xbe\x87\x0a\xa5\x1f\x93\x74\xaf\x14\xff\xf8\xf0\xf0\x59\x32\x7a\xd7\x7e\xbd\x67\xa2\x7c\x28\x04\xda\xa9\xbb\xf7\x1f\x1e\xda\x6f\x6f\xd2\xb5\xc6\xc3\x85\x46\xc9\x19\xdd\xe1\x32\x6b\x57\xb2\xc3\xaf\xf7\xbf\xdc\x6b\xf4\x16\x44\x1d\x39\x68\x20\xb6\xfd\x0c\xb9\x6a\xbf\x09\xf8\x52\x63\x01\x1a\xf9\x31\x3d\x80\x90\x98\xd1\x74\xb3\x5e\xe9\x35\x2e\x18\x07\xa1\x30\xc8\xf4\x63\xa2\x99\x4b\x92\x01\xa4\xff\x60\x90\x95\x4a\x60\x5a\xa6\xcd\xe7\x53\x43\x21\x49\x52\x09\xe2\x80\x73\x83\xc2\xc0\xea\x9b\x87\x33\xfd\x87\x01\x6c\x6d\x53\x35\x98\x6d\xbe\x73\xa4\x14\x08\xfa\xf7\x94\xb7\x66\xf9\xd3\x23\xba\xfb\xf6\xc7\xdd\x3f\xef\xef\x7e\xbf\xcf\xee\x36\xef\xde\x8e\x96\xb5\x7e\x05\xec\xda\xed\x0b\xd8\x61\x8a\x15\x66\x74\xd8\x3f\x1d\x20\x4f\xdd\x7f\xa7\x61\x63\x54\x14\x0d\x30\x22\xa3\xbd\x77\x88\x48\x18\xcb\x4c\x41\x7d\x65\xe2\x29\x24\xf3\x00\xf6\x42\x32\x77\xfb\x3b\x64\x1e\x8b\x73\x60\xa4\xae\x82\x16\xec\xa1\x5e\x48\x98\x76\xfb\x65\xec\x27\x21\x17\xa0\xc2\x2e\xdb\x42\xbd\x98\xc7\xea\xed\x6f\x13\x78\xd5\x0b\x3d\x0b\xdb\x42\x18\x7b\x37\x0c\x8e\xc2\xdb\xa5\x2a\x57\x78\xf9\x75\x35\x28\xcb\xa3\xa5\x02\x38\x61\x47\xfd\xcd\xa3\x8f\x16\xa0\x02\xaa\xd2\x41\x05\x49\x92\x6e\x6b\x4c\x0a\x5b\xa3\x8c\xc2\x5f\x9a\xc4\xa3\xf1\x31\x49\xbe\xdb\x99\xcc\xa0\xd3\xac\x8f\x7e\xf9\x0d\x3e\xac\x7b\x64\x19\xd6\x73\x46\x15\x3c\xab\x46\xa8\xf9\xad\x5b\x15\xb0\xfc\x09\xc4\x0e\x13\x88\xc5\x40\xa2\x94\x33\x2a\x23\x58\xaa\x8c\x89\xac\xc0\xb9\x4a\x4f\x16\xfa\x84\x5e\xd8\x9f\x06\x54\xe3\xd7\x66\xe5\x20\x98\xe6\x88\x67\xa8\x28\x46\x72\x20\x21\xd0\x31\x5d\x27\x29\x56\x50\x49\xb7\x88\x49\x5a\x53\xfc\xa5\x86\x3f\x3b\x10\x25\x6a\xb0\xe9\x16\x82\xf1\xe5\x09\x97\x82\xd5\x3c\xe3\x48\x68\x07\x9b\x57\x7f\x9a\xb3\xaa\x42\x74\x29\xaf\xbb\x44\x8e\x08\xcd\x33\xaa\x10\xa6\x20\x32\x8a\xaa\x90\x23\xe9\xa8\x03\x5a\xc8\xac\x2d\xf8\xb3\x6e\xb4\xcb\x5a\x7c\x69\x11\x18\xaa\xff\xa2\xf6\x28\xe8\x9c\x63\xb7\x64\xb4\x6b\x6b\xde\x52\x0b\x31\x93\x80\x44\xbe\xbf\x12\x9f\x55\x08\xd3\x18\xdd\x01\x55\xe2\xc8\x19\x6e\xfd\xe5\xd5\x39\x02\xd0\x43\x36\xe4\x92\x8b\xd5\x00\xf4\x80\x05\xa3\x55\x1f\x0d\x31\x09\x66\x48\xf2\x1a\xff\x99\x33\x09\xb6\x62\x2c\x01\xcd\xa5\x41\xd4\x91\x4e\x7a\x8c\xc7\x5e\xf0\x75\x92\xd2\xba\xda\x82\xd0\x3d\xec\x08\x72\xc7\x44\x85\x34\xb3\xfd\xde\xc6\xf2\x48\xd3\x0e\xcf\x33\x15\x68\xca\xa0\xcb\x3a\x22\x19\xc1\xf4\x69\x79\x17\x87\x67\x25\x50\xb6\x67\x52\xc5\xe7\x70\x03\x7d\x0f\x88\xa8\x7d\xbe\x87\xfc\x69\x06\xdd\x84\x1a\x61\x33\xa9\x62\x9c\x1c\x57\xa8\x0c\x03\xf1\x3c\x04\x42\xd0\x16\xc8\x55\x72\x2e\xaa\x7c\x83\x2c\x2b\x4b\x0d\xea\xf3\xb8\x49\xe7\xd2\x2d\x87\x6a\x7e\x21\xf0\x01\x44\x6c\x01\x67\xfc\xdc\x70\xd9\x8b\xe1\x06\x24\x09\x77\x9f\x23\xd0\x4f\xf7\x6d\xf3\x39\x13\x55\xcd\x7f\x84\xa4\x1b\xbb\x5d\x48\xac\xba\xef\xfa\x62\x49\x18\xd7\x50\x8c\xac\x52\xa1\x5c\xf7\x0d\x02\xa4\xc7\xae\x67\xd0\xee\x74\x93\x55\xac\xf0\x39\xe8\x04\xd8\xd6\x8d\x37\x53\x5f\x5c\x08\x93\xab\xfa\xc7\x28\xd3\x05\x0f\x10\x01\x69\x7c\xec\xc5\xb2\x79\x66\x37\xec\x62\x0d\x1c\x22\x18\x49\x08\x07\xbb\x57\x91\x23\x6a\x98\x1f\x3e\x44\xfa\x84\x0b\xf7\xb7\x59\x5c\x0f\xaa\x97\x66\x7c\x8f\x1c\x20\x75\x66\xa5\x09\x37\x17\x23\x9b\x40\xb4\xfd\xe0\x16\x9e\xe3\xc2\x9f\x2b\x9a\x0c\x61\x06\x18\x67\x42\x4d\xa2\xeb\xe7\x94\xfb\x76\xeb\x9b\xab\x3d\x17\xf8\x80\x09\x94\x30\x3e\xb5\x6c\x19\x23\x80\xe8\x28\xf5\x08\x40\x45\xc6\x28\x39\x46\x40\x4a\x85\x44\xf0\x40\x21\x21\xaf\x05\x56\xc7\x8c\x71\xb5\x78\x9f\x21\xf7\x55\x26\xf1\x37\x18\x5b\xf3\x9c\xef\x3b\x42\x1b\x8b\x21\x6b\x42\x72\xa5\x41\x7d\x29\x29\x1c\xc6\x8e\x44\x18\x4c\x54\xe1\x14\x95\x4a\x56\x8b\x3c\xf6\x80\xad\xf7\x44\xa2\x84\xd8\x23\xbc\x76\xb7\x71\xd8\xcc\x03\x97\x97\x00\x4f\x0a\x5d\x67\xc2\x50\x55\xb6\x7f\x9b\x79\xe5\xe4\x0c\x7d\x79\x94\xb9\xba\xae\x5b\x93\xaa\xc0\x34\x63\x1c\x68\x30\x36\xa4\x62\x3c\x2b\x05\xca\x21\xe3\x20\x30\x73\xaa\x62\x6d\x46\x7a\x51\x0b\xa4\xf7\x9f\x92\x91\xb8\xa4\x88\x84\xc2\x4c\x55\x7c\x77\xe5\xb1\x52\xa9\x70\xb0\xd7\x04\x57\xd8\x1f\x34\x0e\xaf\x8d\xe8\x00\xda\xea\xef\x2e\xfa\x33\x05\xff\xcc\x29\xa6\x0a\x4a\xed\x26\x53\xa7\x9a\xe9\x39\xe7\x5b\xce\x88\x5e\x73\x8f\xc4\xd8\xa0\x33\x7c\x24\x6d\x60\xee\x94\x1b\xc1\xd5\x89\x3a\xf9\x1a\xdd\x75\x34\xf4\xd6\x1d\x23\x1b\x27\xfc\x45\xc5\xdc\x66\x63\xe3\xad\xa7\xee\xa0\xaa\x65\xf0\x58\xd0\xc0\x50\x39\xd7\xd2\x0e\xa0\xc6\xd0\x7e\xd1\x6a\xa1\xdb\x64\x1d\x04\x05\x76\x73\xbb\xb2\x24\xbb\x60\xec\x6e\x9d\x58\x7b\x02\xae\x79\xb2\x09\x1a\x9c\xbf\xcf\xcf\xb6\x3b\x20\xef\xdc\x19\x4b\xb4\xb5\x26\xae\xae\xe0\xd6\xde\x28\x0e\xe1\x1c\x23\x40\x09\x6c\xd9\xa5\x4f\xd4\x66\x3e\x01\xf9\x3a\xc7\x46\x0a\x57\xc0\x6a\x77\xc1\x5b\x99\xfe\xdd\x21\xa5\xc6\x5c\x3e\x60\x54\x03\xd2\xb6\xe9\xe3\x60\xd4\xbe\xbb\x0c\x1a\x2e\x26\x48\x04\x70\x82\x73\x24\x43\x89\xe8\x86\xf1\x44\xcd\x0b\xa4\x20\x6b\xef\x65\x2f\x4a\xfd\x33\x39\x9f\x23\x81\x08\x01\x82\x65\x15\x93\x43\xd3\x02\x08\x3a\x5e\x55\x3e\x1b\xf4\x1d\xc2\xa4\x16\x90\xa1\x5c\x75\x57\xbf\x01\x9f\x4b\x2b\x46\xb1\x62\xce\x0c\x11\xb7\x65\x85\x9e\xb3\x7e\xdb\x06\x24\xd4\xd9\x8c\x9b\xfa\xd8\xc9\x82\xe1\x09\x6d\xe3\x77\x59\x75\x9e\x31\xd1\xb9\xd6\x7b\x3c\xa6\xdf\x71\x22\xba\x00\xa9\x33\xc9\x30\xf8\x09\xe2\x07\x4b\x4b\x77\xca\xc8\x38\x23\x38\x3f\x2e\x25\x61\xce\x68\xab\xe4\x18\x87\xb8\xd1\x03\xb5\x3b\xe8\x56\xa8\xe2\x2a\x18\xac\x0d\xc2\x57\x4c\x0b\xf6\xf5\x82\x0d\x97\x73\x25\x4e\x50\x0e\x56\xbe\xbb\x55\xd1\x52\x09\x84\xa9\xba\xb8\x9c\xdf\x2a\xd6\x0d\xd5\x7c\xf0\xcf\x40\xd6\x1f\xe0\xc2\xf7\xe8\x9e\x4c\x9f\xf3\x3a\x38\x0d\xac\xa0\x62\xc2\xe9\x80\x0b\x3c\xf4\x08\x89\xd8\x83\x2d\x50\xd5\xa2\xc6\xc7\x1d\x54\xc6\xf8\xf2\xa7\x8d\xf0\x88\x78\x13\x4e\x48\x98\xa3\x6a\xa9\xe8\x88\x1e\xa8\xa7\xce\x1a\x9c\xcc\xcf\x2d\x12\xff\xec\x22\xc4\x75\x98\xf7\x0e\x42\xd6\x5b\xea\x19\x21\x4c\x4f\x19\xae\x5b\xfe\xf8\x63\xca\xc9\x7f\x28\xb9\x2d\xe9\xf5\x77\x61\x1e\xab\x3e\x0e\x3d\xf3\x7a\xd0\xd5\x26\xda\xc4\xde\x8b\xa8\xe5\xf8\x6f\xda\x77\x7b\x44\xe0\xea\xf3\x2f\xec\x04\x6f\x48\x2e\xdd\x8b\xa6\x40\x6e\xe9\xa0\xfe\x4f\x2d\xff\x11\x47\xfc\x79\xfe\xd5\x3d\x20\x0b\xbe\xdc\x6a\xa0\xae\x2e\xce\x11\xcf\x95\x5e\x81\xcd\x5e\xda\x14\xe3\xc1\xa2\x61\x92\xe9\x99\x7f\x4e\x93\xd1\xf7\x69\x1d\xc6\x66\xcc\x86\x0d\xe6\x78\xe3\x3b\xae\x90\x73\x83\xa4\x1e\xc4\x73\xbf\x62\x6d\xda\x29\x71\x5e\xf2\x05\x93\xcd\xfd\xbb\x99\x3e\x60\xee\xde\xfb\x07\x15\xd0\x05\x86\x74\x6e\x9b\x5a\x87\x87\x5e\xbb\xd3\x77\x9b\x9e\xf8\x37\xf0\x27\xaf\x38\xb5\x9c\xf4\x38\x99\x49\x7d\x1f\x0f\x5a\xdb\x17\x98\x9b\x91\x7e\x2c\x90\xf6\x15\x89\x91\xdd\x37\xe6\x79\xca\x67\x46\xe7\xdb\x4e\x7b\xcc\xdb\xbf\xb1\xf4\xdc\x6a\xac\xcc\xbf\xcd\x7b\xd8\xd5\x69\xf5\x6f\x00\x00\x00\xff\xff\xfc\xf3\x11\x6a\x88\x2f\x00\x00")
-
-func dataConfig_schema_v31JsonBytes() ([]byte, error) {
-	return bindataRead(
-		_dataConfig_schema_v31Json,
-		"data/config_schema_v3.1.json",
-	)
-}
-
-func dataConfig_schema_v31Json() (*asset, error) {
-	bytes, err := dataConfig_schema_v31JsonBytes()
-	if err != nil {
-		return nil, err
-	}
-
-	info := bindataFileInfo{name: "data/config_schema_v3.1.json", size: 0, mode: os.FileMode(0), modTime: time.Unix(0, 0)}
-	a := &asset{bytes: bytes, info: info}
-	return a, nil
-}
-
-// Asset loads and returns the asset for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func Asset(name string) ([]byte, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("Asset %s can't read by error: %v", name, err)
-		}
-		return a.bytes, nil
-	}
-	return nil, fmt.Errorf("Asset %s not found", name)
-}
-
-// MustAsset is like Asset but panics when Asset would return an error.
-// It simplifies safe initialization of global variables.
-func MustAsset(name string) []byte {
-	a, err := Asset(name)
-	if err != nil {
-		panic("asset: Asset(" + name + "): " + err.Error())
-	}
-
-	return a
-}
-
-// AssetInfo loads and returns the asset info for the given name.
-// It returns an error if the asset could not be found or
-// could not be loaded.
-func AssetInfo(name string) (os.FileInfo, error) {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	if f, ok := _bindata[cannonicalName]; ok {
-		a, err := f()
-		if err != nil {
-			return nil, fmt.Errorf("AssetInfo %s can't read by error: %v", name, err)
-		}
-		return a.info, nil
-	}
-	return nil, fmt.Errorf("AssetInfo %s not found", name)
-}
-
-// AssetNames returns the names of the assets.
-func AssetNames() []string {
-	names := make([]string, 0, len(_bindata))
-	for name := range _bindata {
-		names = append(names, name)
-	}
-	return names
-}
-
-// _bindata is a table, holding each asset generator, mapped to its name.
-var _bindata = map[string]func() (*asset, error){
-	"data/config_schema_v3.0.json": dataConfig_schema_v30Json,
-	"data/config_schema_v3.1.json": dataConfig_schema_v31Json,
-}
-
-// AssetDir returns the file names below a certain
-// directory embedded in the file by go-bindata.
-// For example if you run go-bindata on data/... and data contains the
-// following hierarchy:
-//     data/
-//       foo.txt
-//       img/
-//         a.png
-//         b.png
-// then AssetDir("data") would return []string{"foo.txt", "img"}
-// AssetDir("data/img") would return []string{"a.png", "b.png"}
-// AssetDir("foo.txt") and AssetDir("notexist") would return an error
-// AssetDir("") will return []string{"data"}.
-func AssetDir(name string) ([]string, error) {
-	node := _bintree
-	if len(name) != 0 {
-		cannonicalName := strings.Replace(name, "\\", "/", -1)
-		pathList := strings.Split(cannonicalName, "/")
-		for _, p := range pathList {
-			node = node.Children[p]
-			if node == nil {
-				return nil, fmt.Errorf("Asset %s not found", name)
-			}
-		}
-	}
-	if node.Func != nil {
-		return nil, fmt.Errorf("Asset %s not found", name)
-	}
-	rv := make([]string, 0, len(node.Children))
-	for childName := range node.Children {
-		rv = append(rv, childName)
-	}
-	return rv, nil
-}
-
-type bintree struct {
-	Func     func() (*asset, error)
-	Children map[string]*bintree
-}
-var _bintree = &bintree{nil, map[string]*bintree{
-	"data": &bintree{nil, map[string]*bintree{
-		"config_schema_v3.0.json": &bintree{dataConfig_schema_v30Json, map[string]*bintree{}},
-		"config_schema_v3.1.json": &bintree{dataConfig_schema_v31Json, map[string]*bintree{}},
-	}},
-}}
-
-// RestoreAsset restores an asset under the given directory
-func RestoreAsset(dir, name string) error {
-	data, err := Asset(name)
-	if err != nil {
-		return err
-	}
-	info, err := AssetInfo(name)
-	if err != nil {
-		return err
-	}
-	err = os.MkdirAll(_filePath(dir, filepath.Dir(name)), os.FileMode(0755))
-	if err != nil {
-		return err
-	}
-	err = ioutil.WriteFile(_filePath(dir, name), data, info.Mode())
-	if err != nil {
-		return err
-	}
-	err = os.Chtimes(_filePath(dir, name), info.ModTime(), info.ModTime())
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// RestoreAssets restores an asset under the given directory recursively
-func RestoreAssets(dir, name string) error {
-	children, err := AssetDir(name)
-	// File
-	if err != nil {
-		return RestoreAsset(dir, name)
-	}
-	// Dir
-	for _, child := range children {
-		err = RestoreAssets(dir, filepath.Join(name, child))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func _filePath(dir, name string) string {
-	cannonicalName := strings.Replace(name, "\\", "/", -1)
-	return filepath.Join(append([]string{dir}, strings.Split(cannonicalName, "/")...)...)
-}
-
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.0.json b/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.0.json
deleted file mode 100644
index fbcd8bb859..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.0.json
+++ /dev/null
@@ -1,383 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "config_schema_v3.0.json",
-  "type": "object",
-  "required": ["version"],
-
-  "properties": {
-    "version": {
-      "type": "string"
-    },
-
-    "services": {
-      "id": "#/properties/services",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/service"
-        }
-      },
-      "additionalProperties": false
-    },
-
-    "networks": {
-      "id": "#/properties/networks",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/network"
-        }
-      }
-    },
-
-    "volumes": {
-      "id": "#/properties/volumes",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/volume"
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-
-  "additionalProperties": false,
-
-  "definitions": {
-
-    "service": {
-      "id": "#/definitions/service",
-      "type": "object",
-
-      "properties": {
-        "deploy": {"$ref": "#/definitions/deployment"},
-        "build": {
-          "oneOf": [
-            {"type": "string"},
-            {
-              "type": "object",
-              "properties": {
-                "context": {"type": "string"},
-                "dockerfile": {"type": "string"},
-                "args": {"$ref": "#/definitions/list_or_dict"}
-              },
-              "additionalProperties": false
-            }
-          ]
-        },
-        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cgroup_parent": {"type": "string"},
-        "command": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "container_name": {"type": "string"},
-        "depends_on": {"$ref": "#/definitions/list_of_strings"},
-        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "dns": {"$ref": "#/definitions/string_or_list"},
-        "dns_search": {"$ref": "#/definitions/string_or_list"},
-        "domainname": {"type": "string"},
-        "entrypoint": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "env_file": {"$ref": "#/definitions/string_or_list"},
-        "environment": {"$ref": "#/definitions/list_or_dict"},
-
-        "expose": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "expose"
-          },
-          "uniqueItems": true
-        },
-
-        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
-        "healthcheck": {"$ref": "#/definitions/healthcheck"},
-        "hostname": {"type": "string"},
-        "image": {"type": "string"},
-        "ipc": {"type": "string"},
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-
-        "logging": {
-            "type": "object",
-
-            "properties": {
-                "driver": {"type": "string"},
-                "options": {
-                  "type": "object",
-                  "patternProperties": {
-                    "^.+$": {"type": ["string", "number", "null"]}
-                  }
-                }
-            },
-            "additionalProperties": false
-        },
-
-        "mac_address": {"type": "string"},
-        "network_mode": {"type": "string"},
-
-        "networks": {
-          "oneOf": [
-            {"$ref": "#/definitions/list_of_strings"},
-            {
-              "type": "object",
-              "patternProperties": {
-                "^[a-zA-Z0-9._-]+$": {
-                  "oneOf": [
-                    {
-                      "type": "object",
-                      "properties": {
-                        "aliases": {"$ref": "#/definitions/list_of_strings"},
-                        "ipv4_address": {"type": "string"},
-                        "ipv6_address": {"type": "string"}
-                      },
-                      "additionalProperties": false
-                    },
-                    {"type": "null"}
-                  ]
-                }
-              },
-              "additionalProperties": false
-            }
-          ]
-        },
-        "pid": {"type": ["string", "null"]},
-
-        "ports": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "ports"
-          },
-          "uniqueItems": true
-        },
-
-        "privileged": {"type": "boolean"},
-        "read_only": {"type": "boolean"},
-        "restart": {"type": "string"},
-        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "shm_size": {"type": ["number", "string"]},
-        "sysctls": {"$ref": "#/definitions/list_or_dict"},
-        "stdin_open": {"type": "boolean"},
-        "stop_grace_period": {"type": "string", "format": "duration"},
-        "stop_signal": {"type": "string"},
-        "tmpfs": {"$ref": "#/definitions/string_or_list"},
-        "tty": {"type": "boolean"},
-        "ulimits": {
-          "type": "object",
-          "patternProperties": {
-            "^[a-z]+$": {
-              "oneOf": [
-                {"type": "integer"},
-                {
-                  "type":"object",
-                  "properties": {
-                    "hard": {"type": "integer"},
-                    "soft": {"type": "integer"}
-                  },
-                  "required": ["soft", "hard"],
-                  "additionalProperties": false
-                }
-              ]
-            }
-          }
-        },
-        "user": {"type": "string"},
-        "userns_mode": {"type": "string"},
-        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "working_dir": {"type": "string"}
-      },
-      "additionalProperties": false
-    },
-
-    "healthcheck": {
-      "id": "#/definitions/healthcheck",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "disable": {"type": "boolean"},
-        "interval": {"type": "string"},
-        "retries": {"type": "number"},
-        "test": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "timeout": {"type": "string"}
-      }
-    },
-    "deployment": {
-      "id": "#/definitions/deployment",
-      "type": ["object", "null"],
-      "properties": {
-        "mode": {"type": "string"},
-        "replicas": {"type": "integer"},
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "update_config": {
-          "type": "object",
-          "properties": {
-            "parallelism": {"type": "integer"},
-            "delay": {"type": "string", "format": "duration"},
-            "failure_action": {"type": "string"},
-            "monitor": {"type": "string", "format": "duration"},
-            "max_failure_ratio": {"type": "number"}
-          },
-          "additionalProperties": false
-        },
-        "resources": {
-          "type": "object",
-          "properties": {
-            "limits": {"$ref": "#/definitions/resource"},
-            "reservations": {"$ref": "#/definitions/resource"}
-          }
-        },
-        "restart_policy": {
-          "type": "object",
-          "properties": {
-            "condition": {"type": "string"},
-            "delay": {"type": "string", "format": "duration"},
-            "max_attempts": {"type": "integer"},
-            "window": {"type": "string", "format": "duration"}
-          },
-          "additionalProperties": false
-        },
-        "placement": {
-          "type": "object",
-          "properties": {
-            "constraints": {"type": "array", "items": {"type": "string"}}
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-
-    "resource": {
-      "id": "#/definitions/resource",
-      "type": "object",
-      "properties": {
-        "cpus": {"type": "string"},
-        "memory": {"type": "string"}
-      },
-      "additionalProperties": false
-    },
-
-    "network": {
-      "id": "#/definitions/network",
-      "type": ["object", "null"],
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "ipam": {
-          "type": "object",
-          "properties": {
-            "driver": {"type": "string"},
-            "config": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "subnet": {"type": "string"}
-                },
-                "additionalProperties": false
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        },
-        "internal": {"type": "boolean"},
-        "labels": {"$ref": "#/definitions/list_or_dict"}
-      },
-      "additionalProperties": false
-    },
-
-    "volume": {
-      "id": "#/definitions/volume",
-      "type": ["object", "null"],
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        },
-        "labels": {"$ref": "#/definitions/list_or_dict"}
-      },
-      "additionalProperties": false
-    },
-
-    "string_or_list": {
-      "oneOf": [
-        {"type": "string"},
-        {"$ref": "#/definitions/list_of_strings"}
-      ]
-    },
-
-    "list_of_strings": {
-      "type": "array",
-      "items": {"type": "string"},
-      "uniqueItems": true
-    },
-
-    "list_or_dict": {
-      "oneOf": [
-        {
-          "type": "object",
-          "patternProperties": {
-            ".+": {
-              "type": ["string", "number", "null"]
-            }
-          },
-          "additionalProperties": false
-        },
-        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
-      ]
-    },
-
-    "constraints": {
-      "service": {
-        "id": "#/definitions/constraints/service",
-        "anyOf": [
-          {"required": ["build"]},
-          {"required": ["image"]}
-        ],
-        "properties": {
-          "build": {
-            "required": ["context"]
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.1.json b/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.1.json
deleted file mode 100644
index b7037485f9..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/schema/data/config_schema_v3.1.json
+++ /dev/null
@@ -1,428 +0,0 @@
-{
-  "$schema": "http://json-schema.org/draft-04/schema#",
-  "id": "config_schema_v3.1.json",
-  "type": "object",
-  "required": ["version"],
-
-  "properties": {
-    "version": {
-      "type": "string"
-    },
-
-    "services": {
-      "id": "#/properties/services",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/service"
-        }
-      },
-      "additionalProperties": false
-    },
-
-    "networks": {
-      "id": "#/properties/networks",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/network"
-        }
-      }
-    },
-
-    "volumes": {
-      "id": "#/properties/volumes",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/volume"
-        }
-      },
-      "additionalProperties": false
-    },
-
-    "secrets": {
-      "id": "#/properties/secrets",
-      "type": "object",
-      "patternProperties": {
-        "^[a-zA-Z0-9._-]+$": {
-          "$ref": "#/definitions/secret"
-        }
-      },
-      "additionalProperties": false
-    }
-  },
-
-  "additionalProperties": false,
-
-  "definitions": {
-
-    "service": {
-      "id": "#/definitions/service",
-      "type": "object",
-
-      "properties": {
-        "deploy": {"$ref": "#/definitions/deployment"},
-        "build": {
-          "oneOf": [
-            {"type": "string"},
-            {
-              "type": "object",
-              "properties": {
-                "context": {"type": "string"},
-                "dockerfile": {"type": "string"},
-                "args": {"$ref": "#/definitions/list_or_dict"}
-              },
-              "additionalProperties": false
-            }
-          ]
-        },
-        "cap_add": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cap_drop": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "cgroup_parent": {"type": "string"},
-        "command": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "container_name": {"type": "string"},
-        "depends_on": {"$ref": "#/definitions/list_of_strings"},
-        "devices": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "dns": {"$ref": "#/definitions/string_or_list"},
-        "dns_search": {"$ref": "#/definitions/string_or_list"},
-        "domainname": {"type": "string"},
-        "entrypoint": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "env_file": {"$ref": "#/definitions/string_or_list"},
-        "environment": {"$ref": "#/definitions/list_or_dict"},
-
-        "expose": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "expose"
-          },
-          "uniqueItems": true
-        },
-
-        "external_links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "extra_hosts": {"$ref": "#/definitions/list_or_dict"},
-        "healthcheck": {"$ref": "#/definitions/healthcheck"},
-        "hostname": {"type": "string"},
-        "image": {"type": "string"},
-        "ipc": {"type": "string"},
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "links": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-
-        "logging": {
-            "type": "object",
-
-            "properties": {
-                "driver": {"type": "string"},
-                "options": {
-                  "type": "object",
-                  "patternProperties": {
-                    "^.+$": {"type": ["string", "number", "null"]}
-                  }
-                }
-            },
-            "additionalProperties": false
-        },
-
-        "mac_address": {"type": "string"},
-        "network_mode": {"type": "string"},
-
-        "networks": {
-          "oneOf": [
-            {"$ref": "#/definitions/list_of_strings"},
-            {
-              "type": "object",
-              "patternProperties": {
-                "^[a-zA-Z0-9._-]+$": {
-                  "oneOf": [
-                    {
-                      "type": "object",
-                      "properties": {
-                        "aliases": {"$ref": "#/definitions/list_of_strings"},
-                        "ipv4_address": {"type": "string"},
-                        "ipv6_address": {"type": "string"}
-                      },
-                      "additionalProperties": false
-                    },
-                    {"type": "null"}
-                  ]
-                }
-              },
-              "additionalProperties": false
-            }
-          ]
-        },
-        "pid": {"type": ["string", "null"]},
-
-        "ports": {
-          "type": "array",
-          "items": {
-            "type": ["string", "number"],
-            "format": "ports"
-          },
-          "uniqueItems": true
-        },
-
-        "privileged": {"type": "boolean"},
-        "read_only": {"type": "boolean"},
-        "restart": {"type": "string"},
-        "security_opt": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "shm_size": {"type": ["number", "string"]},
-        "secrets": {
-          "type": "array",
-          "items": {
-            "oneOf": [
-              {"type": "string"},
-              {
-                "type": "object",
-                "properties": {
-                  "source": {"type": "string"},
-                  "target": {"type": "string"},
-                  "uid": {"type": "string"},
-                  "gid": {"type": "string"},
-                  "mode": {"type": "number"}
-                }
-              }
-            ]
-          }
-        },
-        "sysctls": {"$ref": "#/definitions/list_or_dict"},
-        "stdin_open": {"type": "boolean"},
-        "stop_grace_period": {"type": "string", "format": "duration"},
-        "stop_signal": {"type": "string"},
-        "tmpfs": {"$ref": "#/definitions/string_or_list"},
-        "tty": {"type": "boolean"},
-        "ulimits": {
-          "type": "object",
-          "patternProperties": {
-            "^[a-z]+$": {
-              "oneOf": [
-                {"type": "integer"},
-                {
-                  "type":"object",
-                  "properties": {
-                    "hard": {"type": "integer"},
-                    "soft": {"type": "integer"}
-                  },
-                  "required": ["soft", "hard"],
-                  "additionalProperties": false
-                }
-              ]
-            }
-          }
-        },
-        "user": {"type": "string"},
-        "userns_mode": {"type": "string"},
-        "volumes": {"type": "array", "items": {"type": "string"}, "uniqueItems": true},
-        "working_dir": {"type": "string"}
-      },
-      "additionalProperties": false
-    },
-
-    "healthcheck": {
-      "id": "#/definitions/healthcheck",
-      "type": "object",
-      "additionalProperties": false,
-      "properties": {
-        "disable": {"type": "boolean"},
-        "interval": {"type": "string"},
-        "retries": {"type": "number"},
-        "test": {
-          "oneOf": [
-            {"type": "string"},
-            {"type": "array", "items": {"type": "string"}}
-          ]
-        },
-        "timeout": {"type": "string"}
-      }
-    },
-    "deployment": {
-      "id": "#/definitions/deployment",
-      "type": ["object", "null"],
-      "properties": {
-        "mode": {"type": "string"},
-        "replicas": {"type": "integer"},
-        "labels": {"$ref": "#/definitions/list_or_dict"},
-        "update_config": {
-          "type": "object",
-          "properties": {
-            "parallelism": {"type": "integer"},
-            "delay": {"type": "string", "format": "duration"},
-            "failure_action": {"type": "string"},
-            "monitor": {"type": "string", "format": "duration"},
-            "max_failure_ratio": {"type": "number"}
-          },
-          "additionalProperties": false
-        },
-        "resources": {
-          "type": "object",
-          "properties": {
-            "limits": {"$ref": "#/definitions/resource"},
-            "reservations": {"$ref": "#/definitions/resource"}
-          }
-        },
-        "restart_policy": {
-          "type": "object",
-          "properties": {
-            "condition": {"type": "string"},
-            "delay": {"type": "string", "format": "duration"},
-            "max_attempts": {"type": "integer"},
-            "window": {"type": "string", "format": "duration"}
-          },
-          "additionalProperties": false
-        },
-        "placement": {
-          "type": "object",
-          "properties": {
-            "constraints": {"type": "array", "items": {"type": "string"}}
-          },
-          "additionalProperties": false
-        }
-      },
-      "additionalProperties": false
-    },
-
-    "resource": {
-      "id": "#/definitions/resource",
-      "type": "object",
-      "properties": {
-        "cpus": {"type": "string"},
-        "memory": {"type": "string"}
-      },
-      "additionalProperties": false
-    },
-
-    "network": {
-      "id": "#/definitions/network",
-      "type": ["object", "null"],
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "ipam": {
-          "type": "object",
-          "properties": {
-            "driver": {"type": "string"},
-            "config": {
-              "type": "array",
-              "items": {
-                "type": "object",
-                "properties": {
-                  "subnet": {"type": "string"}
-                },
-                "additionalProperties": false
-              }
-            }
-          },
-          "additionalProperties": false
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        },
-        "internal": {"type": "boolean"},
-        "labels": {"$ref": "#/definitions/list_or_dict"}
-      },
-      "additionalProperties": false
-    },
-
-    "volume": {
-      "id": "#/definitions/volume",
-      "type": ["object", "null"],
-      "properties": {
-        "driver": {"type": "string"},
-        "driver_opts": {
-          "type": "object",
-          "patternProperties": {
-            "^.+$": {"type": ["string", "number"]}
-          }
-        },
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          },
-          "additionalProperties": false
-        },
-        "labels": {"$ref": "#/definitions/list_or_dict"}
-      },
-      "additionalProperties": false
-    },
-
-    "secret": {
-      "id": "#/definitions/secret",
-      "type": "object",
-      "properties": {
-        "file": {"type": "string"},
-        "external": {
-          "type": ["boolean", "object"],
-          "properties": {
-            "name": {"type": "string"}
-          }
-        },
-        "labels": {"$ref": "#/definitions/list_or_dict"}
-      },
-      "additionalProperties": false
-    },
-
-    "string_or_list": {
-      "oneOf": [
-        {"type": "string"},
-        {"$ref": "#/definitions/list_of_strings"}
-      ]
-    },
-
-    "list_of_strings": {
-      "type": "array",
-      "items": {"type": "string"},
-      "uniqueItems": true
-    },
-
-    "list_or_dict": {
-      "oneOf": [
-        {
-          "type": "object",
-          "patternProperties": {
-            ".+": {
-              "type": ["string", "number", "null"]
-            }
-          },
-          "additionalProperties": false
-        },
-        {"type": "array", "items": {"type": "string"}, "uniqueItems": true}
-      ]
-    },
-
-    "constraints": {
-      "service": {
-        "id": "#/definitions/constraints/service",
-        "anyOf": [
-          {"required": ["build"]},
-          {"required": ["image"]}
-        ],
-        "properties": {
-          "build": {
-            "required": ["context"]
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/schema/schema.go b/installer/vendor/github.com/docker/docker/cli/compose/schema/schema.go
deleted file mode 100644
index ae33c77fbe..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/schema/schema.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package schema
-
-//go:generate go-bindata -pkg schema -nometadata data
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/pkg/errors"
-	"github.com/xeipuuv/gojsonschema"
-)
-
-const (
-	defaultVersion = "1.0"
-	versionField   = "version"
-)
-
-type portsFormatChecker struct{}
-
-func (checker portsFormatChecker) IsFormat(input string) bool {
-	// TODO: implement this
-	return true
-}
-
-type durationFormatChecker struct{}
-
-func (checker durationFormatChecker) IsFormat(input string) bool {
-	_, err := time.ParseDuration(input)
-	return err == nil
-}
-
-func init() {
-	gojsonschema.FormatCheckers.Add("expose", portsFormatChecker{})
-	gojsonschema.FormatCheckers.Add("ports", portsFormatChecker{})
-	gojsonschema.FormatCheckers.Add("duration", durationFormatChecker{})
-}
-
-// Version returns the version of the config, defaulting to version 1.0
-func Version(config map[string]interface{}) string {
-	version, ok := config[versionField]
-	if !ok {
-		return defaultVersion
-	}
-	return normalizeVersion(fmt.Sprintf("%v", version))
-}
-
-func normalizeVersion(version string) string {
-	switch version {
-	case "3":
-		return "3.0"
-	default:
-		return version
-	}
-}
-
-// Validate uses the jsonschema to validate the configuration
-func Validate(config map[string]interface{}, version string) error {
-	schemaData, err := Asset(fmt.Sprintf("data/config_schema_v%s.json", version))
-	if err != nil {
-		return errors.Errorf("unsupported Compose file version: %s", version)
-	}
-
-	schemaLoader := gojsonschema.NewStringLoader(string(schemaData))
-	dataLoader := gojsonschema.NewGoLoader(config)
-
-	result, err := gojsonschema.Validate(schemaLoader, dataLoader)
-	if err != nil {
-		return err
-	}
-
-	if !result.Valid() {
-		return toError(result)
-	}
-
-	return nil
-}
-
-func toError(result *gojsonschema.Result) error {
-	err := getMostSpecificError(result.Errors())
-	description := getDescription(err)
-	return fmt.Errorf("%s %s", err.Field(), description)
-}
-
-func getDescription(err gojsonschema.ResultError) string {
-	if err.Type() == "invalid_type" {
-		if expectedType, ok := err.Details()["expected"].(string); ok {
-			return fmt.Sprintf("must be a %s", humanReadableType(expectedType))
-		}
-	}
-
-	return err.Description()
-}
-
-func humanReadableType(definition string) string {
-	if definition[0:1] == "[" {
-		allTypes := strings.Split(definition[1:len(definition)-1], ",")
-		for i, t := range allTypes {
-			allTypes[i] = humanReadableType(t)
-		}
-		return fmt.Sprintf(
-			"%s or %s",
-			strings.Join(allTypes[0:len(allTypes)-1], ", "),
-			allTypes[len(allTypes)-1],
-		)
-	}
-	if definition == "object" {
-		return "mapping"
-	}
-	if definition == "array" {
-		return "list"
-	}
-	return definition
-}
-
-func getMostSpecificError(errors []gojsonschema.ResultError) gojsonschema.ResultError {
-	var mostSpecificError gojsonschema.ResultError
-
-	for _, err := range errors {
-		if mostSpecificError == nil {
-			mostSpecificError = err
-		} else if specificity(err) > specificity(mostSpecificError) {
-			mostSpecificError = err
-		} else if specificity(err) == specificity(mostSpecificError) {
-			// Invalid type errors win in a tie-breaker for most specific field name
-			if err.Type() == "invalid_type" && mostSpecificError.Type() != "invalid_type" {
-				mostSpecificError = err
-			}
-		}
-	}
-
-	return mostSpecificError
-}
-
-func specificity(err gojsonschema.ResultError) int {
-	return len(strings.Split(err.Field(), "."))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/schema/schema_test.go b/installer/vendor/github.com/docker/docker/cli/compose/schema/schema_test.go
deleted file mode 100644
index 0935d4022e..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/schema/schema_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package schema
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type dict map[string]interface{}
-
-func TestValidate(t *testing.T) {
-	config := dict{
-		"version": "3.0",
-		"services": dict{
-			"foo": dict{
-				"image": "busybox",
-			},
-		},
-	}
-
-	assert.NoError(t, Validate(config, "3.0"))
-}
-
-func TestValidateUndefinedTopLevelOption(t *testing.T) {
-	config := dict{
-		"version": "3.0",
-		"helicopters": dict{
-			"foo": dict{
-				"image": "busybox",
-			},
-		},
-	}
-
-	err := Validate(config, "3.0")
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "Additional property helicopters is not allowed")
-}
-
-func TestValidateInvalidVersion(t *testing.T) {
-	config := dict{
-		"version": "2.1",
-		"services": dict{
-			"foo": dict{
-				"image": "busybox",
-			},
-		},
-	}
-
-	err := Validate(config, "2.1")
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "unsupported Compose file version: 2.1")
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/template/template.go b/installer/vendor/github.com/docker/docker/cli/compose/template/template.go
deleted file mode 100644
index 28495baf50..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/template/template.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package template
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-)
-
-var delimiter = "\\$"
-var substitution = "[_a-z][_a-z0-9]*(?::?-[^}]+)?"
-
-var patternString = fmt.Sprintf(
-	"%s(?i:(?P<escaped>%s)|(?P<named>%s)|{(?P<braced>%s)}|(?P<invalid>))",
-	delimiter, delimiter, substitution, substitution,
-)
-
-var pattern = regexp.MustCompile(patternString)
-
-// InvalidTemplateError is returned when a variable template is not in a valid
-// format
-type InvalidTemplateError struct {
-	Template string
-}
-
-func (e InvalidTemplateError) Error() string {
-	return fmt.Sprintf("Invalid template: %#v", e.Template)
-}
-
-// Mapping is a user-supplied function which maps from variable names to values.
-// Returns the value as a string and a bool indicating whether
-// the value is present, to distinguish between an empty string
-// and the absence of a value.
-type Mapping func(string) (string, bool)
-
-// Substitute variables in the string with their values
-func Substitute(template string, mapping Mapping) (result string, err *InvalidTemplateError) {
-	result = pattern.ReplaceAllStringFunc(template, func(substring string) string {
-		matches := pattern.FindStringSubmatch(substring)
-		groups := make(map[string]string)
-		for i, name := range pattern.SubexpNames() {
-			if i != 0 {
-				groups[name] = matches[i]
-			}
-		}
-
-		substitution := groups["named"]
-		if substitution == "" {
-			substitution = groups["braced"]
-		}
-		if substitution != "" {
-			// Soft default (fall back if unset or empty)
-			if strings.Contains(substitution, ":-") {
-				name, defaultValue := partition(substitution, ":-")
-				value, ok := mapping(name)
-				if !ok || value == "" {
-					return defaultValue
-				}
-				return value
-			}
-
-			// Hard default (fall back if-and-only-if empty)
-			if strings.Contains(substitution, "-") {
-				name, defaultValue := partition(substitution, "-")
-				value, ok := mapping(name)
-				if !ok {
-					return defaultValue
-				}
-				return value
-			}
-
-			// No default (fall back to empty string)
-			value, ok := mapping(substitution)
-			if !ok {
-				return ""
-			}
-			return value
-		}
-
-		if escaped := groups["escaped"]; escaped != "" {
-			return escaped
-		}
-
-		err = &InvalidTemplateError{Template: template}
-		return ""
-	})
-
-	return result, err
-}
-
-// Split the string at the first occurrence of sep, and return the part before the separator,
-// and the part after the separator.
-//
-// If the separator is not found, return the string itself, followed by an empty string.
-func partition(s, sep string) (string, string) {
-	if strings.Contains(s, sep) {
-		parts := strings.SplitN(s, sep, 2)
-		return parts[0], parts[1]
-	}
-	return s, ""
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/template/template_test.go b/installer/vendor/github.com/docker/docker/cli/compose/template/template_test.go
deleted file mode 100644
index 6b81bf0a39..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/template/template_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package template
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-var defaults = map[string]string{
-	"FOO": "first",
-	"BAR": "",
-}
-
-func defaultMapping(name string) (string, bool) {
-	val, ok := defaults[name]
-	return val, ok
-}
-
-func TestEscaped(t *testing.T) {
-	result, err := Substitute("$${foo}", defaultMapping)
-	assert.NoError(t, err)
-	assert.Equal(t, "${foo}", result)
-}
-
-func TestInvalid(t *testing.T) {
-	invalidTemplates := []string{
-		"${",
-		"$}",
-		"${}",
-		"${ }",
-		"${ foo}",
-		"${foo }",
-		"${foo!}",
-	}
-
-	for _, template := range invalidTemplates {
-		_, err := Substitute(template, defaultMapping)
-		assert.Error(t, err)
-		assert.IsType(t, &InvalidTemplateError{}, err)
-	}
-}
-
-func TestNoValueNoDefault(t *testing.T) {
-	for _, template := range []string{"This ${missing} var", "This ${BAR} var"} {
-		result, err := Substitute(template, defaultMapping)
-		assert.NoError(t, err)
-		assert.Equal(t, "This  var", result)
-	}
-}
-
-func TestValueNoDefault(t *testing.T) {
-	for _, template := range []string{"This $FOO var", "This ${FOO} var"} {
-		result, err := Substitute(template, defaultMapping)
-		assert.NoError(t, err)
-		assert.Equal(t, "This first var", result)
-	}
-}
-
-func TestNoValueWithDefault(t *testing.T) {
-	for _, template := range []string{"ok ${missing:-def}", "ok ${missing-def}"} {
-		result, err := Substitute(template, defaultMapping)
-		assert.NoError(t, err)
-		assert.Equal(t, "ok def", result)
-	}
-}
-
-func TestEmptyValueWithSoftDefault(t *testing.T) {
-	result, err := Substitute("ok ${BAR:-def}", defaultMapping)
-	assert.NoError(t, err)
-	assert.Equal(t, "ok def", result)
-}
-
-func TestEmptyValueWithHardDefault(t *testing.T) {
-	result, err := Substitute("ok ${BAR-def}", defaultMapping)
-	assert.NoError(t, err)
-	assert.Equal(t, "ok ", result)
-}
-
-func TestNonAlphanumericDefault(t *testing.T) {
-	result, err := Substitute("ok ${BAR:-/non:-alphanumeric}", defaultMapping)
-	assert.NoError(t, err)
-	assert.Equal(t, "ok /non:-alphanumeric", result)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/compose/types/types.go b/installer/vendor/github.com/docker/docker/cli/compose/types/types.go
deleted file mode 100644
index cae7b4af26..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/compose/types/types.go
+++ /dev/null
@@ -1,253 +0,0 @@
-package types
-
-import (
-	"time"
-)
-
-// UnsupportedProperties not yet supported by this implementation of the compose file
-var UnsupportedProperties = []string{
-	"build",
-	"cap_add",
-	"cap_drop",
-	"cgroup_parent",
-	"devices",
-	"dns",
-	"dns_search",
-	"domainname",
-	"external_links",
-	"ipc",
-	"links",
-	"mac_address",
-	"network_mode",
-	"privileged",
-	"read_only",
-	"restart",
-	"security_opt",
-	"shm_size",
-	"stop_signal",
-	"sysctls",
-	"tmpfs",
-	"userns_mode",
-}
-
-// DeprecatedProperties that were removed from the v3 format, but their
-// use should not impact the behaviour of the application.
-var DeprecatedProperties = map[string]string{
-	"container_name": "Setting the container name is not supported.",
-	"expose":         "Exposing ports is unnecessary - services on the same network can access each other's containers on any port.",
-}
-
-// ForbiddenProperties that are not supported in this implementation of the
-// compose file.
-var ForbiddenProperties = map[string]string{
-	"extends":       "Support for `extends` is not implemented yet. Use `docker-compose config` to generate a configuration with all `extends` options resolved, and deploy from that.",
-	"volume_driver": "Instead of setting the volume driver on the service, define a volume using the top-level `volumes` option and specify the driver there.",
-	"volumes_from":  "To share a volume between services, define it using the top-level `volumes` option and reference it from each service that shares it using the service-level `volumes` option.",
-	"cpu_quota":     "Set resource limits using deploy.resources",
-	"cpu_shares":    "Set resource limits using deploy.resources",
-	"cpuset":        "Set resource limits using deploy.resources",
-	"mem_limit":     "Set resource limits using deploy.resources",
-	"memswap_limit": "Set resource limits using deploy.resources",
-}
-
-// Dict is a mapping of strings to interface{}
-type Dict map[string]interface{}
-
-// ConfigFile is a filename and the contents of the file as a Dict
-type ConfigFile struct {
-	Filename string
-	Config   Dict
-}
-
-// ConfigDetails are the details about a group of ConfigFiles
-type ConfigDetails struct {
-	WorkingDir  string
-	ConfigFiles []ConfigFile
-	Environment map[string]string
-}
-
-// Config is a full compose file configuration
-type Config struct {
-	Services []ServiceConfig
-	Networks map[string]NetworkConfig
-	Volumes  map[string]VolumeConfig
-	Secrets  map[string]SecretConfig
-}
-
-// ServiceConfig is the configuration of one service
-type ServiceConfig struct {
-	Name string
-
-	CapAdd          []string `mapstructure:"cap_add"`
-	CapDrop         []string `mapstructure:"cap_drop"`
-	CgroupParent    string   `mapstructure:"cgroup_parent"`
-	Command         []string `compose:"shell_command"`
-	ContainerName   string   `mapstructure:"container_name"`
-	DependsOn       []string `mapstructure:"depends_on"`
-	Deploy          DeployConfig
-	Devices         []string
-	DNS             []string          `compose:"string_or_list"`
-	DNSSearch       []string          `mapstructure:"dns_search" compose:"string_or_list"`
-	DomainName      string            `mapstructure:"domainname"`
-	Entrypoint      []string          `compose:"shell_command"`
-	Environment     map[string]string `compose:"list_or_dict_equals"`
-	Expose          []string          `compose:"list_of_strings_or_numbers"`
-	ExternalLinks   []string          `mapstructure:"external_links"`
-	ExtraHosts      map[string]string `mapstructure:"extra_hosts" compose:"list_or_dict_colon"`
-	Hostname        string
-	HealthCheck     *HealthCheckConfig
-	Image           string
-	Ipc             string
-	Labels          map[string]string `compose:"list_or_dict_equals"`
-	Links           []string
-	Logging         *LoggingConfig
-	MacAddress      string                           `mapstructure:"mac_address"`
-	NetworkMode     string                           `mapstructure:"network_mode"`
-	Networks        map[string]*ServiceNetworkConfig `compose:"list_or_struct_map"`
-	Pid             string
-	Ports           []string `compose:"list_of_strings_or_numbers"`
-	Privileged      bool
-	ReadOnly        bool `mapstructure:"read_only"`
-	Restart         string
-	Secrets         []ServiceSecretConfig
-	SecurityOpt     []string       `mapstructure:"security_opt"`
-	StdinOpen       bool           `mapstructure:"stdin_open"`
-	StopGracePeriod *time.Duration `mapstructure:"stop_grace_period"`
-	StopSignal      string         `mapstructure:"stop_signal"`
-	Tmpfs           []string       `compose:"string_or_list"`
-	Tty             bool           `mapstructure:"tty"`
-	Ulimits         map[string]*UlimitsConfig
-	User            string
-	Volumes         []string
-	WorkingDir      string `mapstructure:"working_dir"`
-}
-
-// LoggingConfig the logging configuration for a service
-type LoggingConfig struct {
-	Driver  string
-	Options map[string]string
-}
-
-// DeployConfig the deployment configuration for a service
-type DeployConfig struct {
-	Mode          string
-	Replicas      *uint64
-	Labels        map[string]string `compose:"list_or_dict_equals"`
-	UpdateConfig  *UpdateConfig     `mapstructure:"update_config"`
-	Resources     Resources
-	RestartPolicy *RestartPolicy `mapstructure:"restart_policy"`
-	Placement     Placement
-}
-
-// HealthCheckConfig the healthcheck configuration for a service
-type HealthCheckConfig struct {
-	Test     []string `compose:"healthcheck"`
-	Timeout  string
-	Interval string
-	Retries  *uint64
-	Disable  bool
-}
-
-// UpdateConfig the service update configuration
-type UpdateConfig struct {
-	Parallelism     *uint64
-	Delay           time.Duration
-	FailureAction   string `mapstructure:"failure_action"`
-	Monitor         time.Duration
-	MaxFailureRatio float32 `mapstructure:"max_failure_ratio"`
-}
-
-// Resources the resource limits and reservations
-type Resources struct {
-	Limits       *Resource
-	Reservations *Resource
-}
-
-// Resource is a resource to be limited or reserved
-type Resource struct {
-	// TODO: types to convert from units and ratios
-	NanoCPUs    string    `mapstructure:"cpus"`
-	MemoryBytes UnitBytes `mapstructure:"memory"`
-}
-
-// UnitBytes is the bytes type
-type UnitBytes int64
-
-// RestartPolicy the service restart policy
-type RestartPolicy struct {
-	Condition   string
-	Delay       *time.Duration
-	MaxAttempts *uint64 `mapstructure:"max_attempts"`
-	Window      *time.Duration
-}
-
-// Placement constraints for the service
-type Placement struct {
-	Constraints []string
-}
-
-// ServiceNetworkConfig is the network configuration for a service
-type ServiceNetworkConfig struct {
-	Aliases     []string
-	Ipv4Address string `mapstructure:"ipv4_address"`
-	Ipv6Address string `mapstructure:"ipv6_address"`
-}
-
-// ServiceSecretConfig is the secret configuration for a service
-type ServiceSecretConfig struct {
-	Source string
-	Target string
-	UID    string
-	GID    string
-	Mode   uint32
-}
-
-// UlimitsConfig the ulimit configuration
-type UlimitsConfig struct {
-	Single int
-	Soft   int
-	Hard   int
-}
-
-// NetworkConfig for a network
-type NetworkConfig struct {
-	Driver     string
-	DriverOpts map[string]string `mapstructure:"driver_opts"`
-	Ipam       IPAMConfig
-	External   External
-	Internal   bool
-	Labels     map[string]string `compose:"list_or_dict_equals"`
-}
-
-// IPAMConfig for a network
-type IPAMConfig struct {
-	Driver string
-	Config []*IPAMPool
-}
-
-// IPAMPool for a network
-type IPAMPool struct {
-	Subnet string
-}
-
-// VolumeConfig for a volume
-type VolumeConfig struct {
-	Driver     string
-	DriverOpts map[string]string `mapstructure:"driver_opts"`
-	External   External
-	Labels     map[string]string `compose:"list_or_dict_equals"`
-}
-
-// External identifies a Volume or Network as a reference to a resource that is
-// not managed, and should already exist.
-type External struct {
-	Name     string
-	External bool
-}
-
-// SecretConfig for a secret
-type SecretConfig struct {
-	File     string
-	External External
-	Labels   map[string]string `compose:"list_or_dict_equals"`
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/error.go b/installer/vendor/github.com/docker/docker/cli/error.go
deleted file mode 100644
index 62f62433b8..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/error.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"strings"
-)
-
-// Errors is a list of errors.
-// Useful in a loop if you don't want to return the error right away and you want to display after the loop,
-// all the errors that happened during the loop.
-type Errors []error
-
-func (errList Errors) Error() string {
-	if len(errList) < 1 {
-		return ""
-	}
-
-	out := make([]string, len(errList))
-	for i := range errList {
-		out[i] = errList[i].Error()
-	}
-	return strings.Join(out, ", ")
-}
-
-// StatusError reports an unsuccessful exit by a command.
-type StatusError struct {
-	Status     string
-	StatusCode int
-}
-
-func (e StatusError) Error() string {
-	return fmt.Sprintf("Status: %s, Code: %d", e.Status, e.StatusCode)
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/flags/client.go b/installer/vendor/github.com/docker/docker/cli/flags/client.go
deleted file mode 100644
index 9b6940f6bd..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/flags/client.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package flags
-
-// ClientOptions are the options used to configure the client cli
-type ClientOptions struct {
-	Common    *CommonOptions
-	ConfigDir string
-	Version   bool
-}
-
-// NewClientOptions returns a new ClientOptions
-func NewClientOptions() *ClientOptions {
-	return &ClientOptions{Common: NewCommonOptions()}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/flags/common.go b/installer/vendor/github.com/docker/docker/cli/flags/common.go
deleted file mode 100644
index e2f9da0732..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/flags/common.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package flags
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/opts"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/spf13/pflag"
-)
-
-const (
-	// DefaultTrustKeyFile is the default filename for the trust key
-	DefaultTrustKeyFile = "key.json"
-	// DefaultCaFile is the default filename for the CA pem file
-	DefaultCaFile = "ca.pem"
-	// DefaultKeyFile is the default filename for the key pem file
-	DefaultKeyFile = "key.pem"
-	// DefaultCertFile is the default filename for the cert pem file
-	DefaultCertFile = "cert.pem"
-	// FlagTLSVerify is the flag name for the tls verification option
-	FlagTLSVerify = "tlsverify"
-)
-
-var (
-	dockerCertPath  = os.Getenv("DOCKER_CERT_PATH")
-	dockerTLSVerify = os.Getenv("DOCKER_TLS_VERIFY") != ""
-)
-
-// CommonOptions are options common to both the client and the daemon.
-type CommonOptions struct {
-	Debug      bool
-	Hosts      []string
-	LogLevel   string
-	TLS        bool
-	TLSVerify  bool
-	TLSOptions *tlsconfig.Options
-	TrustKey   string
-}
-
-// NewCommonOptions returns a new CommonOptions
-func NewCommonOptions() *CommonOptions {
-	return &CommonOptions{}
-}
-
-// InstallFlags adds flags for the common options on the FlagSet
-func (commonOpts *CommonOptions) InstallFlags(flags *pflag.FlagSet) {
-	if dockerCertPath == "" {
-		dockerCertPath = cliconfig.ConfigDir()
-	}
-
-	flags.BoolVarP(&commonOpts.Debug, "debug", "D", false, "Enable debug mode")
-	flags.StringVarP(&commonOpts.LogLevel, "log-level", "l", "info", "Set the logging level (\"debug\", \"info\", \"warn\", \"error\", \"fatal\")")
-	flags.BoolVar(&commonOpts.TLS, "tls", false, "Use TLS; implied by --tlsverify")
-	flags.BoolVar(&commonOpts.TLSVerify, FlagTLSVerify, dockerTLSVerify, "Use TLS and verify the remote")
-
-	// TODO use flag flags.String("identity"}, "i", "", "Path to libtrust key file")
-
-	commonOpts.TLSOptions = &tlsconfig.Options{
-		CAFile:   filepath.Join(dockerCertPath, DefaultCaFile),
-		CertFile: filepath.Join(dockerCertPath, DefaultCertFile),
-		KeyFile:  filepath.Join(dockerCertPath, DefaultKeyFile),
-	}
-	tlsOptions := commonOpts.TLSOptions
-	flags.Var(opts.NewQuotedString(&tlsOptions.CAFile), "tlscacert", "Trust certs signed only by this CA")
-	flags.Var(opts.NewQuotedString(&tlsOptions.CertFile), "tlscert", "Path to TLS certificate file")
-	flags.Var(opts.NewQuotedString(&tlsOptions.KeyFile), "tlskey", "Path to TLS key file")
-
-	hostOpt := opts.NewNamedListOptsRef("hosts", &commonOpts.Hosts, opts.ValidateHost)
-	flags.VarP(hostOpt, "host", "H", "Daemon socket(s) to connect to")
-}
-
-// SetDefaultOptions sets default values for options after flag parsing is
-// complete
-func (commonOpts *CommonOptions) SetDefaultOptions(flags *pflag.FlagSet) {
-	// Regardless of whether the user sets it to true or false, if they
-	// specify --tlsverify at all then we need to turn on tls
-	// TLSVerify can be true even if not set due to DOCKER_TLS_VERIFY env var, so we need
-	// to check that here as well
-	if flags.Changed(FlagTLSVerify) || commonOpts.TLSVerify {
-		commonOpts.TLS = true
-	}
-
-	if !commonOpts.TLS {
-		commonOpts.TLSOptions = nil
-	} else {
-		tlsOptions := commonOpts.TLSOptions
-		tlsOptions.InsecureSkipVerify = !commonOpts.TLSVerify
-
-		// Reset CertFile and KeyFile to empty string if the user did not specify
-		// the respective flags and the respective default files were not found.
-		if !flags.Changed("tlscert") {
-			if _, err := os.Stat(tlsOptions.CertFile); os.IsNotExist(err) {
-				tlsOptions.CertFile = ""
-			}
-		}
-		if !flags.Changed("tlskey") {
-			if _, err := os.Stat(tlsOptions.KeyFile); os.IsNotExist(err) {
-				tlsOptions.KeyFile = ""
-			}
-		}
-	}
-}
-
-// SetLogLevel sets the logrus logging level
-func SetLogLevel(logLevel string) {
-	if logLevel != "" {
-		lvl, err := logrus.ParseLevel(logLevel)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Unable to parse logging level: %s\n", logLevel)
-			os.Exit(1)
-		}
-		logrus.SetLevel(lvl)
-	} else {
-		logrus.SetLevel(logrus.InfoLevel)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/flags/common_test.go b/installer/vendor/github.com/docker/docker/cli/flags/common_test.go
deleted file mode 100644
index 81eaa38f43..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/flags/common_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package flags
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/spf13/pflag"
-)
-
-func TestCommonOptionsInstallFlags(t *testing.T) {
-	flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
-	opts := NewCommonOptions()
-	opts.InstallFlags(flags)
-
-	err := flags.Parse([]string{
-		"--tlscacert=\"/foo/cafile\"",
-		"--tlscert=\"/foo/cert\"",
-		"--tlskey=\"/foo/key\"",
-	})
-	assert.NilError(t, err)
-	assert.Equal(t, opts.TLSOptions.CAFile, "/foo/cafile")
-	assert.Equal(t, opts.TLSOptions.CertFile, "/foo/cert")
-	assert.Equal(t, opts.TLSOptions.KeyFile, "/foo/key")
-}
-
-func defaultPath(filename string) string {
-	return filepath.Join(cliconfig.ConfigDir(), filename)
-}
-
-func TestCommonOptionsInstallFlagsWithDefaults(t *testing.T) {
-	flags := pflag.NewFlagSet("testing", pflag.ContinueOnError)
-	opts := NewCommonOptions()
-	opts.InstallFlags(flags)
-
-	err := flags.Parse([]string{})
-	assert.NilError(t, err)
-	assert.Equal(t, opts.TLSOptions.CAFile, defaultPath("ca.pem"))
-	assert.Equal(t, opts.TLSOptions.CertFile, defaultPath("cert.pem"))
-	assert.Equal(t, opts.TLSOptions.KeyFile, defaultPath("key.pem"))
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/required.go b/installer/vendor/github.com/docker/docker/cli/required.go
deleted file mode 100644
index 8ee02c8429..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/required.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-// NoArgs validates args and returns an error if there are any args
-func NoArgs(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
-		return nil
-	}
-
-	if cmd.HasSubCommands() {
-		return fmt.Errorf("\n" + strings.TrimRight(cmd.UsageString(), "\n"))
-	}
-
-	return fmt.Errorf(
-		"\"%s\" accepts no argument(s).\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-		cmd.CommandPath(),
-		cmd.CommandPath(),
-		cmd.UseLine(),
-		cmd.Short,
-	)
-}
-
-// RequiresMinArgs returns an error if there is not at least min args
-func RequiresMinArgs(min int) cobra.PositionalArgs {
-	return func(cmd *cobra.Command, args []string) error {
-		if len(args) >= min {
-			return nil
-		}
-		return fmt.Errorf(
-			"\"%s\" requires at least %d argument(s).\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-			cmd.CommandPath(),
-			min,
-			cmd.CommandPath(),
-			cmd.UseLine(),
-			cmd.Short,
-		)
-	}
-}
-
-// RequiresMaxArgs returns an error if there is not at most max args
-func RequiresMaxArgs(max int) cobra.PositionalArgs {
-	return func(cmd *cobra.Command, args []string) error {
-		if len(args) <= max {
-			return nil
-		}
-		return fmt.Errorf(
-			"\"%s\" requires at most %d argument(s).\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-			cmd.CommandPath(),
-			max,
-			cmd.CommandPath(),
-			cmd.UseLine(),
-			cmd.Short,
-		)
-	}
-}
-
-// RequiresRangeArgs returns an error if there is not at least min args and at most max args
-func RequiresRangeArgs(min int, max int) cobra.PositionalArgs {
-	return func(cmd *cobra.Command, args []string) error {
-		if len(args) >= min && len(args) <= max {
-			return nil
-		}
-		return fmt.Errorf(
-			"\"%s\" requires at least %d and at most %d argument(s).\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-			cmd.CommandPath(),
-			min,
-			max,
-			cmd.CommandPath(),
-			cmd.UseLine(),
-			cmd.Short,
-		)
-	}
-}
-
-// ExactArgs returns an error if there is not the exact number of args
-func ExactArgs(number int) cobra.PositionalArgs {
-	return func(cmd *cobra.Command, args []string) error {
-		if len(args) == number {
-			return nil
-		}
-		return fmt.Errorf(
-			"\"%s\" requires exactly %d argument(s).\nSee '%s --help'.\n\nUsage:  %s\n\n%s",
-			cmd.CommandPath(),
-			number,
-			cmd.CommandPath(),
-			cmd.UseLine(),
-			cmd.Short,
-		)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cli/trust/trust.go b/installer/vendor/github.com/docker/docker/cli/trust/trust.go
deleted file mode 100644
index 51914f74b0..0000000000
--- a/installer/vendor/github.com/docker/docker/cli/trust/trust.go
+++ /dev/null
@@ -1,232 +0,0 @@
-package trust
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/distribution/registry/client/auth/challenge"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/registry"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/docker/notary"
-	"github.com/docker/notary/client"
-	"github.com/docker/notary/passphrase"
-	"github.com/docker/notary/storage"
-	"github.com/docker/notary/trustmanager"
-	"github.com/docker/notary/trustpinning"
-	"github.com/docker/notary/tuf/data"
-	"github.com/docker/notary/tuf/signed"
-)
-
-var (
-	// ReleasesRole is the role named "releases"
-	ReleasesRole = path.Join(data.CanonicalTargetsRole, "releases")
-)
-
-func trustDirectory() string {
-	return filepath.Join(cliconfig.ConfigDir(), "trust")
-}
-
-// certificateDirectory returns the directory containing
-// TLS certificates for the given server. An error is
-// returned if there was an error parsing the server string.
-func certificateDirectory(server string) (string, error) {
-	u, err := url.Parse(server)
-	if err != nil {
-		return "", err
-	}
-
-	return filepath.Join(cliconfig.ConfigDir(), "tls", u.Host), nil
-}
-
-// Server returns the base URL for the trust server.
-func Server(index *registrytypes.IndexInfo) (string, error) {
-	if s := os.Getenv("DOCKER_CONTENT_TRUST_SERVER"); s != "" {
-		urlObj, err := url.Parse(s)
-		if err != nil || urlObj.Scheme != "https" {
-			return "", fmt.Errorf("valid https URL required for trust server, got %s", s)
-		}
-
-		return s, nil
-	}
-	if index.Official {
-		return registry.NotaryServer, nil
-	}
-	return "https://" + index.Name, nil
-}
-
-type simpleCredentialStore struct {
-	auth types.AuthConfig
-}
-
-func (scs simpleCredentialStore) Basic(u *url.URL) (string, string) {
-	return scs.auth.Username, scs.auth.Password
-}
-
-func (scs simpleCredentialStore) RefreshToken(u *url.URL, service string) string {
-	return scs.auth.IdentityToken
-}
-
-func (scs simpleCredentialStore) SetRefreshToken(*url.URL, string, string) {
-}
-
-// GetNotaryRepository returns a NotaryRepository which stores all the
-// information needed to operate on a notary repository.
-// It creates an HTTP transport providing authentication support.
-func GetNotaryRepository(streams command.Streams, repoInfo *registry.RepositoryInfo, authConfig types.AuthConfig, actions ...string) (*client.NotaryRepository, error) {
-	server, err := Server(repoInfo.Index)
-	if err != nil {
-		return nil, err
-	}
-
-	var cfg = tlsconfig.ClientDefault()
-	cfg.InsecureSkipVerify = !repoInfo.Index.Secure
-
-	// Get certificate base directory
-	certDir, err := certificateDirectory(server)
-	if err != nil {
-		return nil, err
-	}
-	logrus.Debugf("reading certificate directory: %s", certDir)
-
-	if err := registry.ReadCertsDirectory(cfg, certDir); err != nil {
-		return nil, err
-	}
-
-	base := &http.Transport{
-		Proxy: http.ProxyFromEnvironment,
-		Dial: (&net.Dialer{
-			Timeout:   30 * time.Second,
-			KeepAlive: 30 * time.Second,
-			DualStack: true,
-		}).Dial,
-		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig:     cfg,
-		DisableKeepAlives:   true,
-	}
-
-	// Skip configuration headers since request is not going to Docker daemon
-	modifiers := registry.DockerHeaders(command.UserAgent(), http.Header{})
-	authTransport := transport.NewTransport(base, modifiers...)
-	pingClient := &http.Client{
-		Transport: authTransport,
-		Timeout:   5 * time.Second,
-	}
-	endpointStr := server + "/v2/"
-	req, err := http.NewRequest("GET", endpointStr, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	challengeManager := challenge.NewSimpleManager()
-
-	resp, err := pingClient.Do(req)
-	if err != nil {
-		// Ignore error on ping to operate in offline mode
-		logrus.Debugf("Error pinging notary server %q: %s", endpointStr, err)
-	} else {
-		defer resp.Body.Close()
-
-		// Add response to the challenge manager to parse out
-		// authentication header and register authentication method
-		if err := challengeManager.AddResponse(resp); err != nil {
-			return nil, err
-		}
-	}
-
-	scope := auth.RepositoryScope{
-		Repository: repoInfo.FullName(),
-		Actions:    actions,
-		Class:      repoInfo.Class,
-	}
-	creds := simpleCredentialStore{auth: authConfig}
-	tokenHandlerOptions := auth.TokenHandlerOptions{
-		Transport:   authTransport,
-		Credentials: creds,
-		Scopes:      []auth.Scope{scope},
-		ClientID:    registry.AuthClientID,
-	}
-	tokenHandler := auth.NewTokenHandlerWithOptions(tokenHandlerOptions)
-	basicHandler := auth.NewBasicHandler(creds)
-	modifiers = append(modifiers, transport.RequestModifier(auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler)))
-	tr := transport.NewTransport(base, modifiers...)
-
-	return client.NewNotaryRepository(
-		trustDirectory(),
-		repoInfo.FullName(),
-		server,
-		tr,
-		getPassphraseRetriever(streams),
-		trustpinning.TrustPinConfig{})
-}
-
-func getPassphraseRetriever(streams command.Streams) notary.PassRetriever {
-	aliasMap := map[string]string{
-		"root":     "root",
-		"snapshot": "repository",
-		"targets":  "repository",
-		"default":  "repository",
-	}
-	baseRetriever := passphrase.PromptRetrieverWithInOut(streams.In(), streams.Out(), aliasMap)
-	env := map[string]string{
-		"root":     os.Getenv("DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE"),
-		"snapshot": os.Getenv("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE"),
-		"targets":  os.Getenv("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE"),
-		"default":  os.Getenv("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE"),
-	}
-
-	return func(keyName string, alias string, createNew bool, numAttempts int) (string, bool, error) {
-		if v := env[alias]; v != "" {
-			return v, numAttempts > 1, nil
-		}
-		// For non-root roles, we can also try the "default" alias if it is specified
-		if v := env["default"]; v != "" && alias != data.CanonicalRootRole {
-			return v, numAttempts > 1, nil
-		}
-		return baseRetriever(keyName, alias, createNew, numAttempts)
-	}
-}
-
-// NotaryError formats an error message received from the notary service
-func NotaryError(repoName string, err error) error {
-	switch err.(type) {
-	case *json.SyntaxError:
-		logrus.Debugf("Notary syntax error: %s", err)
-		return fmt.Errorf("Error: no trust data available for remote repository %s. Try running notary server and setting DOCKER_CONTENT_TRUST_SERVER to its HTTPS address?", repoName)
-	case signed.ErrExpired:
-		return fmt.Errorf("Error: remote repository %s out-of-date: %v", repoName, err)
-	case trustmanager.ErrKeyNotFound:
-		return fmt.Errorf("Error: signing keys for remote repository %s not found: %v", repoName, err)
-	case storage.NetworkError:
-		return fmt.Errorf("Error: error contacting notary server: %v", err)
-	case storage.ErrMetaNotFound:
-		return fmt.Errorf("Error: trust data missing for remote repository %s or remote repository not found: %v", repoName, err)
-	case trustpinning.ErrRootRotationFail, trustpinning.ErrValidationFail, signed.ErrInvalidKeyType:
-		return fmt.Errorf("Warning: potential malicious behavior - trust data mismatch for remote repository %s: %v", repoName, err)
-	case signed.ErrNoKeys:
-		return fmt.Errorf("Error: could not find signing keys for remote repository %s, or could not decrypt signing key: %v", repoName, err)
-	case signed.ErrLowVersion:
-		return fmt.Errorf("Warning: potential malicious behavior - trust data version is lower than expected for remote repository %s: %v", repoName, err)
-	case signed.ErrRoleThreshold:
-		return fmt.Errorf("Warning: potential malicious behavior - trust data has insufficient signatures for remote repository %s: %v", repoName, err)
-	case client.ErrRepositoryNotExist:
-		return fmt.Errorf("Error: remote trust data does not exist for %s: %v", repoName, err)
-	case signed.ErrInsufficientSignatures:
-		return fmt.Errorf("Error: could not produce valid signature for %s.  If Yubikey was used, was touch input provided?: %v", repoName, err)
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/config.go b/installer/vendor/github.com/docker/docker/cliconfig/config.go
deleted file mode 100644
index d81bf86b7a..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/config.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package cliconfig
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cliconfig/configfile"
-	"github.com/docker/docker/pkg/homedir"
-)
-
-const (
-	// ConfigFileName is the name of config file
-	ConfigFileName = "config.json"
-	configFileDir  = ".docker"
-	oldConfigfile  = ".dockercfg"
-)
-
-var (
-	configDir = os.Getenv("DOCKER_CONFIG")
-)
-
-func init() {
-	if configDir == "" {
-		configDir = filepath.Join(homedir.Get(), configFileDir)
-	}
-}
-
-// ConfigDir returns the directory the configuration file is stored in
-func ConfigDir() string {
-	return configDir
-}
-
-// SetConfigDir sets the directory the configuration file is stored in
-func SetConfigDir(dir string) {
-	configDir = dir
-}
-
-// NewConfigFile initializes an empty configuration file for the given filename 'fn'
-func NewConfigFile(fn string) *configfile.ConfigFile {
-	return &configfile.ConfigFile{
-		AuthConfigs: make(map[string]types.AuthConfig),
-		HTTPHeaders: make(map[string]string),
-		Filename:    fn,
-	}
-}
-
-// LegacyLoadFromReader is a convenience function that creates a ConfigFile object from
-// a non-nested reader
-func LegacyLoadFromReader(configData io.Reader) (*configfile.ConfigFile, error) {
-	configFile := configfile.ConfigFile{
-		AuthConfigs: make(map[string]types.AuthConfig),
-	}
-	err := configFile.LegacyLoadFromReader(configData)
-	return &configFile, err
-}
-
-// LoadFromReader is a convenience function that creates a ConfigFile object from
-// a reader
-func LoadFromReader(configData io.Reader) (*configfile.ConfigFile, error) {
-	configFile := configfile.ConfigFile{
-		AuthConfigs: make(map[string]types.AuthConfig),
-	}
-	err := configFile.LoadFromReader(configData)
-	return &configFile, err
-}
-
-// Load reads the configuration files in the given directory, and sets up
-// the auth config information and returns values.
-// FIXME: use the internal golang config parser
-func Load(configDir string) (*configfile.ConfigFile, error) {
-	if configDir == "" {
-		configDir = ConfigDir()
-	}
-
-	configFile := configfile.ConfigFile{
-		AuthConfigs: make(map[string]types.AuthConfig),
-		Filename:    filepath.Join(configDir, ConfigFileName),
-	}
-
-	// Try happy path first - latest config file
-	if _, err := os.Stat(configFile.Filename); err == nil {
-		file, err := os.Open(configFile.Filename)
-		if err != nil {
-			return &configFile, fmt.Errorf("%s - %v", configFile.Filename, err)
-		}
-		defer file.Close()
-		err = configFile.LoadFromReader(file)
-		if err != nil {
-			err = fmt.Errorf("%s - %v", configFile.Filename, err)
-		}
-		return &configFile, err
-	} else if !os.IsNotExist(err) {
-		// if file is there but we can't stat it for any reason other
-		// than it doesn't exist then stop
-		return &configFile, fmt.Errorf("%s - %v", configFile.Filename, err)
-	}
-
-	// Can't find latest config file so check for the old one
-	confFile := filepath.Join(homedir.Get(), oldConfigfile)
-	if _, err := os.Stat(confFile); err != nil {
-		return &configFile, nil //missing file is not an error
-	}
-	file, err := os.Open(confFile)
-	if err != nil {
-		return &configFile, fmt.Errorf("%s - %v", confFile, err)
-	}
-	defer file.Close()
-	err = configFile.LegacyLoadFromReader(file)
-	if err != nil {
-		return &configFile, fmt.Errorf("%s - %v", confFile, err)
-	}
-
-	if configFile.HTTPHeaders == nil {
-		configFile.HTTPHeaders = map[string]string{}
-	}
-	return &configFile, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/config_test.go b/installer/vendor/github.com/docker/docker/cliconfig/config_test.go
deleted file mode 100644
index d8a099ab58..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/config_test.go
+++ /dev/null
@@ -1,621 +0,0 @@
-package cliconfig
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/cliconfig/configfile"
-	"github.com/docker/docker/pkg/homedir"
-)
-
-func TestEmptyConfigDir(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	SetConfigDir(tmpHome)
-
-	config, err := Load("")
-	if err != nil {
-		t.Fatalf("Failed loading on empty config dir: %q", err)
-	}
-
-	expectedConfigFilename := filepath.Join(tmpHome, ConfigFileName)
-	if config.Filename != expectedConfigFilename {
-		t.Fatalf("Expected config filename %s, got %s", expectedConfigFilename, config.Filename)
-	}
-
-	// Now save it and make sure it shows up in new form
-	saveConfigAndValidateNewFormat(t, config, tmpHome)
-}
-
-func TestMissingFile(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on missing file: %q", err)
-	}
-
-	// Now save it and make sure it shows up in new form
-	saveConfigAndValidateNewFormat(t, config, tmpHome)
-}
-
-func TestSaveFileToDirs(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	tmpHome += "/.docker"
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on missing file: %q", err)
-	}
-
-	// Now save it and make sure it shows up in new form
-	saveConfigAndValidateNewFormat(t, config, tmpHome)
-}
-
-func TestEmptyFile(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	if err := ioutil.WriteFile(fn, []byte(""), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = Load(tmpHome)
-	if err == nil {
-		t.Fatalf("Was supposed to fail")
-	}
-}
-
-func TestEmptyJSON(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	if err := ioutil.WriteFile(fn, []byte("{}"), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	// Now save it and make sure it shows up in new form
-	saveConfigAndValidateNewFormat(t, config, tmpHome)
-}
-
-func TestOldInvalidsAuth(t *testing.T) {
-	invalids := map[string]string{
-		`username = test`: "The Auth config file is empty",
-		`username
-password`: "Invalid Auth config file",
-		`username = test
-email`: "Invalid auth configuration file",
-	}
-
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpHome)
-
-	for content, expectedError := range invalids {
-		fn := filepath.Join(tmpHome, oldConfigfile)
-		if err := ioutil.WriteFile(fn, []byte(content), 0600); err != nil {
-			t.Fatal(err)
-		}
-
-		config, err := Load(tmpHome)
-		// Use Contains instead of == since the file name will change each time
-		if err == nil || !strings.Contains(err.Error(), expectedError) {
-			t.Fatalf("Should have failed\nConfig: %v\nGot: %v\nExpected: %v", config, err, expectedError)
-		}
-
-	}
-}
-
-func TestOldValidAuth(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpHome)
-
-	fn := filepath.Join(tmpHome, oldConfigfile)
-	js := `username = am9lam9lOmhlbGxv
-	email = user@example.com`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// defaultIndexserver is https://index.docker.io/v1/
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv"
-		}
-	}
-}`
-
-	if configStr != expConfStr {
-		t.Fatalf("Should have save in new form: \n%s\n not \n%s", configStr, expConfStr)
-	}
-}
-
-func TestOldJSONInvalid(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpHome)
-
-	fn := filepath.Join(tmpHome, oldConfigfile)
-	js := `{"https://index.docker.io/v1/":{"auth":"test","email":"user@example.com"}}`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	// Use Contains instead of == since the file name will change each time
-	if err == nil || !strings.Contains(err.Error(), "Invalid auth configuration file") {
-		t.Fatalf("Expected an error got : %v, %v", config, err)
-	}
-}
-
-func TestOldJSON(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpHome)
-
-	fn := filepath.Join(tmpHome, oldConfigfile)
-	js := `{"https://index.docker.io/v1/":{"auth":"am9lam9lOmhlbGxv","email":"user@example.com"}}`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv",
-			"email": "user@example.com"
-		}
-	}
-}`
-
-	if configStr != expConfStr {
-		t.Fatalf("Should have save in new form: \n'%s'\n not \n'%s'\n", configStr, expConfStr)
-	}
-}
-
-func TestNewJSON(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv"
-		}
-	}
-}`
-
-	if configStr != expConfStr {
-		t.Fatalf("Should have save in new form: \n%s\n not \n%s", configStr, expConfStr)
-	}
-}
-
-func TestNewJSONNoEmail(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } } }`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv"
-		}
-	}
-}`
-
-	if configStr != expConfStr {
-		t.Fatalf("Should have save in new form: \n%s\n not \n%s", configStr, expConfStr)
-	}
-}
-
-func TestJSONWithPsFormat(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	js := `{
-		"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
-		"psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}"
-}`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	if config.PsFormat != `table {{.ID}}\t{{.Label "com.docker.label.cpu"}}` {
-		t.Fatalf("Unknown ps format: %s\n", config.PsFormat)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-	if !strings.Contains(configStr, `"psFormat":`) ||
-		!strings.Contains(configStr, "{{.ID}}") {
-		t.Fatalf("Should have save in new form: %s", configStr)
-	}
-}
-
-func TestJSONWithCredentialStore(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	js := `{
-		"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
-		"credsStore": "crazy-secure-storage"
-}`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	if config.CredentialsStore != "crazy-secure-storage" {
-		t.Fatalf("Unknown credential store: %s\n", config.CredentialsStore)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-	if !strings.Contains(configStr, `"credsStore":`) ||
-		!strings.Contains(configStr, "crazy-secure-storage") {
-		t.Fatalf("Should have save in new form: %s", configStr)
-	}
-}
-
-func TestJSONWithCredentialHelpers(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	js := `{
-		"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
-		"credHelpers": { "images.io": "images-io", "containers.com": "crazy-secure-storage" }
-}`
-	if err := ioutil.WriteFile(fn, []byte(js), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	config, err := Load(tmpHome)
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	if config.CredentialHelpers == nil {
-		t.Fatal("config.CredentialHelpers was nil")
-	} else if config.CredentialHelpers["images.io"] != "images-io" ||
-		config.CredentialHelpers["containers.com"] != "crazy-secure-storage" {
-		t.Fatalf("Credential helpers not deserialized properly: %v\n", config.CredentialHelpers)
-	}
-
-	// Now save it and make sure it shows up in new form
-	configStr := saveConfigAndValidateNewFormat(t, config, tmpHome)
-	if !strings.Contains(configStr, `"credHelpers":`) ||
-		!strings.Contains(configStr, "images.io") ||
-		!strings.Contains(configStr, "images-io") ||
-		!strings.Contains(configStr, "containers.com") ||
-		!strings.Contains(configStr, "crazy-secure-storage") {
-		t.Fatalf("Should have save in new form: %s", configStr)
-	}
-}
-
-// Save it and make sure it shows up in new form
-func saveConfigAndValidateNewFormat(t *testing.T, config *configfile.ConfigFile, homeFolder string) string {
-	if err := config.Save(); err != nil {
-		t.Fatalf("Failed to save: %q", err)
-	}
-
-	buf, err := ioutil.ReadFile(filepath.Join(homeFolder, ConfigFileName))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !strings.Contains(string(buf), `"auths":`) {
-		t.Fatalf("Should have save in new form: %s", string(buf))
-	}
-	return string(buf)
-}
-
-func TestConfigDir(t *testing.T) {
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	if ConfigDir() == tmpHome {
-		t.Fatalf("Expected ConfigDir to be different than %s by default, but was the same", tmpHome)
-	}
-
-	// Update configDir
-	SetConfigDir(tmpHome)
-
-	if ConfigDir() != tmpHome {
-		t.Fatalf("Expected ConfigDir to %s, but was %s", tmpHome, ConfigDir())
-	}
-}
-
-func TestConfigFile(t *testing.T) {
-	configFilename := "configFilename"
-	configFile := NewConfigFile(configFilename)
-
-	if configFile.Filename != configFilename {
-		t.Fatalf("Expected %s, got %s", configFilename, configFile.Filename)
-	}
-}
-
-func TestJSONReaderNoFile(t *testing.T) {
-	js := ` { "auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } } }`
-
-	config, err := LoadFromReader(strings.NewReader(js))
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-
-}
-
-func TestOldJSONReaderNoFile(t *testing.T) {
-	js := `{"https://index.docker.io/v1/":{"auth":"am9lam9lOmhlbGxv","email":"user@example.com"}}`
-
-	config, err := LegacyLoadFromReader(strings.NewReader(js))
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	ac := config.AuthConfigs["https://index.docker.io/v1/"]
-	if ac.Username != "joejoe" || ac.Password != "hello" {
-		t.Fatalf("Missing data from parsing:\n%q", config)
-	}
-}
-
-func TestJSONWithPsFormatNoFile(t *testing.T) {
-	js := `{
-		"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv", "email": "user@example.com" } },
-		"psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}"
-}`
-	config, err := LoadFromReader(strings.NewReader(js))
-	if err != nil {
-		t.Fatalf("Failed loading on empty json file: %q", err)
-	}
-
-	if config.PsFormat != `table {{.ID}}\t{{.Label "com.docker.label.cpu"}}` {
-		t.Fatalf("Unknown ps format: %s\n", config.PsFormat)
-	}
-
-}
-
-func TestJSONSaveWithNoFile(t *testing.T) {
-	js := `{
-		"auths": { "https://index.docker.io/v1/": { "auth": "am9lam9lOmhlbGxv" } },
-		"psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}"
-}`
-	config, err := LoadFromReader(strings.NewReader(js))
-	err = config.Save()
-	if err == nil {
-		t.Fatalf("Expected error. File should not have been able to save with no file name.")
-	}
-
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatalf("Failed to create a temp dir: %q", err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	f, _ := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	defer f.Close()
-
-	err = config.SaveToWriter(f)
-	if err != nil {
-		t.Fatalf("Failed saving to file: %q", err)
-	}
-	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, ConfigFileName))
-	if err != nil {
-		t.Fatal(err)
-	}
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv"
-		}
-	},
-	"psFormat": "table {{.ID}}\\t{{.Label \"com.docker.label.cpu\"}}"
-}`
-	if string(buf) != expConfStr {
-		t.Fatalf("Should have save in new form: \n%s\nnot \n%s", string(buf), expConfStr)
-	}
-}
-
-func TestLegacyJSONSaveWithNoFile(t *testing.T) {
-
-	js := `{"https://index.docker.io/v1/":{"auth":"am9lam9lOmhlbGxv","email":"user@example.com"}}`
-	config, err := LegacyLoadFromReader(strings.NewReader(js))
-	err = config.Save()
-	if err == nil {
-		t.Fatalf("Expected error. File should not have been able to save with no file name.")
-	}
-
-	tmpHome, err := ioutil.TempDir("", "config-test")
-	if err != nil {
-		t.Fatalf("Failed to create a temp dir: %q", err)
-	}
-	defer os.RemoveAll(tmpHome)
-
-	fn := filepath.Join(tmpHome, ConfigFileName)
-	f, _ := os.OpenFile(fn, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	defer f.Close()
-
-	if err = config.SaveToWriter(f); err != nil {
-		t.Fatalf("Failed saving to file: %q", err)
-	}
-	buf, err := ioutil.ReadFile(filepath.Join(tmpHome, ConfigFileName))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expConfStr := `{
-	"auths": {
-		"https://index.docker.io/v1/": {
-			"auth": "am9lam9lOmhlbGxv",
-			"email": "user@example.com"
-		}
-	}
-}`
-
-	if string(buf) != expConfStr {
-		t.Fatalf("Should have save in new form: \n%s\n not \n%s", string(buf), expConfStr)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/configfile/file.go b/installer/vendor/github.com/docker/docker/cliconfig/configfile/file.go
deleted file mode 100644
index 39097133a4..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/configfile/file.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package configfile
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-)
-
-const (
-	// This constant is only used for really old config files when the
-	// URL wasn't saved as part of the config file and it was just
-	// assumed to be this value.
-	defaultIndexserver = "https://index.docker.io/v1/"
-)
-
-// ConfigFile ~/.docker/config.json file info
-type ConfigFile struct {
-	AuthConfigs          map[string]types.AuthConfig `json:"auths"`
-	HTTPHeaders          map[string]string           `json:"HttpHeaders,omitempty"`
-	PsFormat             string                      `json:"psFormat,omitempty"`
-	ImagesFormat         string                      `json:"imagesFormat,omitempty"`
-	NetworksFormat       string                      `json:"networksFormat,omitempty"`
-	VolumesFormat        string                      `json:"volumesFormat,omitempty"`
-	StatsFormat          string                      `json:"statsFormat,omitempty"`
-	DetachKeys           string                      `json:"detachKeys,omitempty"`
-	CredentialsStore     string                      `json:"credsStore,omitempty"`
-	CredentialHelpers    map[string]string           `json:"credHelpers,omitempty"`
-	Filename             string                      `json:"-"` // Note: for internal use only
-	ServiceInspectFormat string                      `json:"serviceInspectFormat,omitempty"`
-}
-
-// LegacyLoadFromReader reads the non-nested configuration data given and sets up the
-// auth config information with given directory and populates the receiver object
-func (configFile *ConfigFile) LegacyLoadFromReader(configData io.Reader) error {
-	b, err := ioutil.ReadAll(configData)
-	if err != nil {
-		return err
-	}
-
-	if err := json.Unmarshal(b, &configFile.AuthConfigs); err != nil {
-		arr := strings.Split(string(b), "\n")
-		if len(arr) < 2 {
-			return fmt.Errorf("The Auth config file is empty")
-		}
-		authConfig := types.AuthConfig{}
-		origAuth := strings.Split(arr[0], " = ")
-		if len(origAuth) != 2 {
-			return fmt.Errorf("Invalid Auth config file")
-		}
-		authConfig.Username, authConfig.Password, err = decodeAuth(origAuth[1])
-		if err != nil {
-			return err
-		}
-		authConfig.ServerAddress = defaultIndexserver
-		configFile.AuthConfigs[defaultIndexserver] = authConfig
-	} else {
-		for k, authConfig := range configFile.AuthConfigs {
-			authConfig.Username, authConfig.Password, err = decodeAuth(authConfig.Auth)
-			if err != nil {
-				return err
-			}
-			authConfig.Auth = ""
-			authConfig.ServerAddress = k
-			configFile.AuthConfigs[k] = authConfig
-		}
-	}
-	return nil
-}
-
-// LoadFromReader reads the configuration data given and sets up the auth config
-// information with given directory and populates the receiver object
-func (configFile *ConfigFile) LoadFromReader(configData io.Reader) error {
-	if err := json.NewDecoder(configData).Decode(&configFile); err != nil {
-		return err
-	}
-	var err error
-	for addr, ac := range configFile.AuthConfigs {
-		ac.Username, ac.Password, err = decodeAuth(ac.Auth)
-		if err != nil {
-			return err
-		}
-		ac.Auth = ""
-		ac.ServerAddress = addr
-		configFile.AuthConfigs[addr] = ac
-	}
-	return nil
-}
-
-// ContainsAuth returns whether there is authentication configured
-// in this file or not.
-func (configFile *ConfigFile) ContainsAuth() bool {
-	return configFile.CredentialsStore != "" ||
-		len(configFile.CredentialHelpers) > 0 ||
-		len(configFile.AuthConfigs) > 0
-}
-
-// SaveToWriter encodes and writes out all the authorization information to
-// the given writer
-func (configFile *ConfigFile) SaveToWriter(writer io.Writer) error {
-	// Encode sensitive data into a new/temp struct
-	tmpAuthConfigs := make(map[string]types.AuthConfig, len(configFile.AuthConfigs))
-	for k, authConfig := range configFile.AuthConfigs {
-		authCopy := authConfig
-		// encode and save the authstring, while blanking out the original fields
-		authCopy.Auth = encodeAuth(&authCopy)
-		authCopy.Username = ""
-		authCopy.Password = ""
-		authCopy.ServerAddress = ""
-		tmpAuthConfigs[k] = authCopy
-	}
-
-	saveAuthConfigs := configFile.AuthConfigs
-	configFile.AuthConfigs = tmpAuthConfigs
-	defer func() { configFile.AuthConfigs = saveAuthConfigs }()
-
-	data, err := json.MarshalIndent(configFile, "", "\t")
-	if err != nil {
-		return err
-	}
-	_, err = writer.Write(data)
-	return err
-}
-
-// Save encodes and writes out all the authorization information
-func (configFile *ConfigFile) Save() error {
-	if configFile.Filename == "" {
-		return fmt.Errorf("Can't save config with empty filename")
-	}
-
-	if err := os.MkdirAll(filepath.Dir(configFile.Filename), 0700); err != nil {
-		return err
-	}
-	f, err := os.OpenFile(configFile.Filename, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	return configFile.SaveToWriter(f)
-}
-
-// encodeAuth creates a base64 encoded string to containing authorization information
-func encodeAuth(authConfig *types.AuthConfig) string {
-	if authConfig.Username == "" && authConfig.Password == "" {
-		return ""
-	}
-
-	authStr := authConfig.Username + ":" + authConfig.Password
-	msg := []byte(authStr)
-	encoded := make([]byte, base64.StdEncoding.EncodedLen(len(msg)))
-	base64.StdEncoding.Encode(encoded, msg)
-	return string(encoded)
-}
-
-// decodeAuth decodes a base64 encoded string and returns username and password
-func decodeAuth(authStr string) (string, string, error) {
-	if authStr == "" {
-		return "", "", nil
-	}
-
-	decLen := base64.StdEncoding.DecodedLen(len(authStr))
-	decoded := make([]byte, decLen)
-	authByte := []byte(authStr)
-	n, err := base64.StdEncoding.Decode(decoded, authByte)
-	if err != nil {
-		return "", "", err
-	}
-	if n > decLen {
-		return "", "", fmt.Errorf("Something went wrong decoding auth config")
-	}
-	arr := strings.SplitN(string(decoded), ":", 2)
-	if len(arr) != 2 {
-		return "", "", fmt.Errorf("Invalid auth configuration file")
-	}
-	password := strings.Trim(arr[1], "\x00")
-	return arr[0], password, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/configfile/file_test.go b/installer/vendor/github.com/docker/docker/cliconfig/configfile/file_test.go
deleted file mode 100644
index 435797f681..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/configfile/file_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package configfile
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestEncodeAuth(t *testing.T) {
-	newAuthConfig := &types.AuthConfig{Username: "ken", Password: "test"}
-	authStr := encodeAuth(newAuthConfig)
-	decAuthConfig := &types.AuthConfig{}
-	var err error
-	decAuthConfig.Username, decAuthConfig.Password, err = decodeAuth(authStr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if newAuthConfig.Username != decAuthConfig.Username {
-		t.Fatal("Encode Username doesn't match decoded Username")
-	}
-	if newAuthConfig.Password != decAuthConfig.Password {
-		t.Fatal("Encode Password doesn't match decoded Password")
-	}
-	if authStr != "a2VuOnRlc3Q=" {
-		t.Fatal("AuthString encoding isn't correct.")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/credentials.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/credentials.go
deleted file mode 100644
index ca874cac51..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/credentials.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package credentials
-
-import (
-	"github.com/docker/docker/api/types"
-)
-
-// Store is the interface that any credentials store must implement.
-type Store interface {
-	// Erase removes credentials from the store for a given server.
-	Erase(serverAddress string) error
-	// Get retrieves credentials from the store for a given server.
-	Get(serverAddress string) (types.AuthConfig, error)
-	// GetAll retrieves all the credentials from the store.
-	GetAll() (map[string]types.AuthConfig, error)
-	// Store saves credentials in the store.
-	Store(authConfig types.AuthConfig) error
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store.go
deleted file mode 100644
index b4733709b1..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package credentials
-
-import (
-	"os/exec"
-
-	"github.com/docker/docker/cliconfig/configfile"
-)
-
-// DetectDefaultStore sets the default credentials store
-// if the host includes the default store helper program.
-func DetectDefaultStore(c *configfile.ConfigFile) {
-	if c.CredentialsStore != "" {
-		// user defined
-		return
-	}
-
-	if defaultCredentialsStore != "" {
-		if _, err := exec.LookPath(remoteCredentialsPrefix + defaultCredentialsStore); err == nil {
-			c.CredentialsStore = defaultCredentialsStore
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_darwin.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_darwin.go
deleted file mode 100644
index 63e8ed4010..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_darwin.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package credentials
-
-const defaultCredentialsStore = "osxkeychain"
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_linux.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_linux.go
deleted file mode 100644
index 864c540f6c..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_linux.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package credentials
-
-const defaultCredentialsStore = "secretservice"
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_unsupported.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_unsupported.go
deleted file mode 100644
index 519ef53dcd..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_unsupported.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !windows,!darwin,!linux
-
-package credentials
-
-const defaultCredentialsStore = ""
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_windows.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_windows.go
deleted file mode 100644
index fb6a9745cf..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/default_store_windows.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package credentials
-
-const defaultCredentialsStore = "wincred"
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store.go
deleted file mode 100644
index ca73a384d4..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package credentials
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cliconfig/configfile"
-	"github.com/docker/docker/registry"
-)
-
-// fileStore implements a credentials store using
-// the docker configuration file to keep the credentials in plain text.
-type fileStore struct {
-	file *configfile.ConfigFile
-}
-
-// NewFileStore creates a new file credentials store.
-func NewFileStore(file *configfile.ConfigFile) Store {
-	return &fileStore{
-		file: file,
-	}
-}
-
-// Erase removes the given credentials from the file store.
-func (c *fileStore) Erase(serverAddress string) error {
-	delete(c.file.AuthConfigs, serverAddress)
-	return c.file.Save()
-}
-
-// Get retrieves credentials for a specific server from the file store.
-func (c *fileStore) Get(serverAddress string) (types.AuthConfig, error) {
-	authConfig, ok := c.file.AuthConfigs[serverAddress]
-	if !ok {
-		// Maybe they have a legacy config file, we will iterate the keys converting
-		// them to the new format and testing
-		for r, ac := range c.file.AuthConfigs {
-			if serverAddress == registry.ConvertToHostname(r) {
-				return ac, nil
-			}
-		}
-
-		authConfig = types.AuthConfig{}
-	}
-	return authConfig, nil
-}
-
-func (c *fileStore) GetAll() (map[string]types.AuthConfig, error) {
-	return c.file.AuthConfigs, nil
-}
-
-// Store saves the given credentials in the file store.
-func (c *fileStore) Store(authConfig types.AuthConfig) error {
-	c.file.AuthConfigs[authConfig.ServerAddress] = authConfig
-	return c.file.Save()
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store_test.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store_test.go
deleted file mode 100644
index efed4e9040..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/file_store_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package credentials
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/cliconfig/configfile"
-)
-
-func newConfigFile(auths map[string]types.AuthConfig) *configfile.ConfigFile {
-	tmp, _ := ioutil.TempFile("", "docker-test")
-	name := tmp.Name()
-	tmp.Close()
-
-	c := cliconfig.NewConfigFile(name)
-	c.AuthConfigs = auths
-	return c
-}
-
-func TestFileStoreAddCredentials(t *testing.T) {
-	f := newConfigFile(make(map[string]types.AuthConfig))
-
-	s := NewFileStore(f)
-	err := s.Store(types.AuthConfig{
-		Auth:          "super_secret_token",
-		Email:         "foo@example.com",
-		ServerAddress: "https://example.com",
-	})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(f.AuthConfigs) != 1 {
-		t.Fatalf("expected 1 auth config, got %d", len(f.AuthConfigs))
-	}
-
-	a, ok := f.AuthConfigs["https://example.com"]
-	if !ok {
-		t.Fatalf("expected auth for https://example.com, got %v", f.AuthConfigs)
-	}
-	if a.Auth != "super_secret_token" {
-		t.Fatalf("expected auth `super_secret_token`, got %s", a.Auth)
-	}
-	if a.Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com`, got %s", a.Email)
-	}
-}
-
-func TestFileStoreGet(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		"https://example.com": {
-			Auth:          "super_secret_token",
-			Email:         "foo@example.com",
-			ServerAddress: "https://example.com",
-		},
-	})
-
-	s := NewFileStore(f)
-	a, err := s.Get("https://example.com")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a.Auth != "super_secret_token" {
-		t.Fatalf("expected auth `super_secret_token`, got %s", a.Auth)
-	}
-	if a.Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com`, got %s", a.Email)
-	}
-}
-
-func TestFileStoreGetAll(t *testing.T) {
-	s1 := "https://example.com"
-	s2 := "https://example2.com"
-	f := newConfigFile(map[string]types.AuthConfig{
-		s1: {
-			Auth:          "super_secret_token",
-			Email:         "foo@example.com",
-			ServerAddress: "https://example.com",
-		},
-		s2: {
-			Auth:          "super_secret_token2",
-			Email:         "foo@example2.com",
-			ServerAddress: "https://example2.com",
-		},
-	})
-
-	s := NewFileStore(f)
-	as, err := s.GetAll()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(as) != 2 {
-		t.Fatalf("wanted 2, got %d", len(as))
-	}
-	if as[s1].Auth != "super_secret_token" {
-		t.Fatalf("expected auth `super_secret_token`, got %s", as[s1].Auth)
-	}
-	if as[s1].Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com`, got %s", as[s1].Email)
-	}
-	if as[s2].Auth != "super_secret_token2" {
-		t.Fatalf("expected auth `super_secret_token2`, got %s", as[s2].Auth)
-	}
-	if as[s2].Email != "foo@example2.com" {
-		t.Fatalf("expected email `foo@example2.com`, got %s", as[s2].Email)
-	}
-}
-
-func TestFileStoreErase(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		"https://example.com": {
-			Auth:          "super_secret_token",
-			Email:         "foo@example.com",
-			ServerAddress: "https://example.com",
-		},
-	})
-
-	s := NewFileStore(f)
-	err := s.Erase("https://example.com")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// file store never returns errors, check that the auth config is empty
-	a, err := s.Get("https://example.com")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if a.Auth != "" {
-		t.Fatalf("expected empty auth token, got %s", a.Auth)
-	}
-	if a.Email != "" {
-		t.Fatalf("expected empty email, got %s", a.Email)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store.go
deleted file mode 100644
index dec2dbcb82..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package credentials
-
-import (
-	"github.com/docker/docker-credential-helpers/client"
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/cliconfig/configfile"
-)
-
-const (
-	remoteCredentialsPrefix = "docker-credential-"
-	tokenUsername           = "<token>"
-)
-
-// nativeStore implements a credentials store
-// using native keychain to keep credentials secure.
-// It piggybacks into a file store to keep users' emails.
-type nativeStore struct {
-	programFunc client.ProgramFunc
-	fileStore   Store
-}
-
-// NewNativeStore creates a new native store that
-// uses a remote helper program to manage credentials.
-func NewNativeStore(file *configfile.ConfigFile, helperSuffix string) Store {
-	name := remoteCredentialsPrefix + helperSuffix
-	return &nativeStore{
-		programFunc: client.NewShellProgramFunc(name),
-		fileStore:   NewFileStore(file),
-	}
-}
-
-// Erase removes the given credentials from the native store.
-func (c *nativeStore) Erase(serverAddress string) error {
-	if err := client.Erase(c.programFunc, serverAddress); err != nil {
-		return err
-	}
-
-	// Fallback to plain text store to remove email
-	return c.fileStore.Erase(serverAddress)
-}
-
-// Get retrieves credentials for a specific server from the native store.
-func (c *nativeStore) Get(serverAddress string) (types.AuthConfig, error) {
-	// load user email if it exist or an empty auth config.
-	auth, _ := c.fileStore.Get(serverAddress)
-
-	creds, err := c.getCredentialsFromStore(serverAddress)
-	if err != nil {
-		return auth, err
-	}
-	auth.Username = creds.Username
-	auth.IdentityToken = creds.IdentityToken
-	auth.Password = creds.Password
-
-	return auth, nil
-}
-
-// GetAll retrieves all the credentials from the native store.
-func (c *nativeStore) GetAll() (map[string]types.AuthConfig, error) {
-	auths, err := c.listCredentialsInStore()
-	if err != nil {
-		return nil, err
-	}
-
-	// Emails are only stored in the file store.
-	// This call can be safely eliminated when emails are removed.
-	fileConfigs, _ := c.fileStore.GetAll()
-
-	authConfigs := make(map[string]types.AuthConfig)
-	for registry := range auths {
-		creds, err := c.getCredentialsFromStore(registry)
-		if err != nil {
-			return nil, err
-		}
-		ac, _ := fileConfigs[registry] // might contain Email
-		ac.Username = creds.Username
-		ac.Password = creds.Password
-		ac.IdentityToken = creds.IdentityToken
-		authConfigs[registry] = ac
-	}
-
-	return authConfigs, nil
-}
-
-// Store saves the given credentials in the file store.
-func (c *nativeStore) Store(authConfig types.AuthConfig) error {
-	if err := c.storeCredentialsInStore(authConfig); err != nil {
-		return err
-	}
-	authConfig.Username = ""
-	authConfig.Password = ""
-	authConfig.IdentityToken = ""
-
-	// Fallback to old credential in plain text to save only the email
-	return c.fileStore.Store(authConfig)
-}
-
-// storeCredentialsInStore executes the command to store the credentials in the native store.
-func (c *nativeStore) storeCredentialsInStore(config types.AuthConfig) error {
-	creds := &credentials.Credentials{
-		ServerURL: config.ServerAddress,
-		Username:  config.Username,
-		Secret:    config.Password,
-	}
-
-	if config.IdentityToken != "" {
-		creds.Username = tokenUsername
-		creds.Secret = config.IdentityToken
-	}
-
-	return client.Store(c.programFunc, creds)
-}
-
-// getCredentialsFromStore executes the command to get the credentials from the native store.
-func (c *nativeStore) getCredentialsFromStore(serverAddress string) (types.AuthConfig, error) {
-	var ret types.AuthConfig
-
-	creds, err := client.Get(c.programFunc, serverAddress)
-	if err != nil {
-		if credentials.IsErrCredentialsNotFound(err) {
-			// do not return an error if the credentials are not
-			// in the keyckain. Let docker ask for new credentials.
-			return ret, nil
-		}
-		return ret, err
-	}
-
-	if creds.Username == tokenUsername {
-		ret.IdentityToken = creds.Secret
-	} else {
-		ret.Password = creds.Secret
-		ret.Username = creds.Username
-	}
-
-	ret.ServerAddress = serverAddress
-	return ret, nil
-}
-
-// listCredentialsInStore returns a listing of stored credentials as a map of
-// URL -> username.
-func (c *nativeStore) listCredentialsInStore() (map[string]string, error) {
-	return client.List(c.programFunc)
-}
diff --git a/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store_test.go b/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store_test.go
deleted file mode 100644
index 7664faf9e1..0000000000
--- a/installer/vendor/github.com/docker/docker/cliconfig/credentials/native_store_test.go
+++ /dev/null
@@ -1,355 +0,0 @@
-package credentials
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker-credential-helpers/client"
-	"github.com/docker/docker-credential-helpers/credentials"
-	"github.com/docker/docker/api/types"
-)
-
-const (
-	validServerAddress   = "https://index.docker.io/v1"
-	validServerAddress2  = "https://example.com:5002"
-	invalidServerAddress = "https://foobar.example.com"
-	missingCredsAddress  = "https://missing.docker.io/v1"
-)
-
-var errCommandExited = fmt.Errorf("exited 1")
-
-// mockCommand simulates interactions between the docker client and a remote
-// credentials helper.
-// Unit tests inject this mocked command into the remote to control execution.
-type mockCommand struct {
-	arg   string
-	input io.Reader
-}
-
-// Output returns responses from the remote credentials helper.
-// It mocks those responses based in the input in the mock.
-func (m *mockCommand) Output() ([]byte, error) {
-	in, err := ioutil.ReadAll(m.input)
-	if err != nil {
-		return nil, err
-	}
-	inS := string(in)
-
-	switch m.arg {
-	case "erase":
-		switch inS {
-		case validServerAddress:
-			return nil, nil
-		default:
-			return []byte("program failed"), errCommandExited
-		}
-	case "get":
-		switch inS {
-		case validServerAddress:
-			return []byte(`{"Username": "foo", "Secret": "bar"}`), nil
-		case validServerAddress2:
-			return []byte(`{"Username": "<token>", "Secret": "abcd1234"}`), nil
-		case missingCredsAddress:
-			return []byte(credentials.NewErrCredentialsNotFound().Error()), errCommandExited
-		case invalidServerAddress:
-			return []byte("program failed"), errCommandExited
-		}
-	case "store":
-		var c credentials.Credentials
-		err := json.NewDecoder(strings.NewReader(inS)).Decode(&c)
-		if err != nil {
-			return []byte("program failed"), errCommandExited
-		}
-		switch c.ServerURL {
-		case validServerAddress:
-			return nil, nil
-		default:
-			return []byte("program failed"), errCommandExited
-		}
-	case "list":
-		return []byte(fmt.Sprintf(`{"%s": "%s", "%s": "%s"}`, validServerAddress, "foo", validServerAddress2, "<token>")), nil
-	}
-
-	return []byte(fmt.Sprintf("unknown argument %q with %q", m.arg, inS)), errCommandExited
-}
-
-// Input sets the input to send to a remote credentials helper.
-func (m *mockCommand) Input(in io.Reader) {
-	m.input = in
-}
-
-func mockCommandFn(args ...string) client.Program {
-	return &mockCommand{
-		arg: args[0],
-	}
-}
-
-func TestNativeStoreAddCredentials(t *testing.T) {
-	f := newConfigFile(make(map[string]types.AuthConfig))
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	err := s.Store(types.AuthConfig{
-		Username:      "foo",
-		Password:      "bar",
-		Email:         "foo@example.com",
-		ServerAddress: validServerAddress,
-	})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(f.AuthConfigs) != 1 {
-		t.Fatalf("expected 1 auth config, got %d", len(f.AuthConfigs))
-	}
-
-	a, ok := f.AuthConfigs[validServerAddress]
-	if !ok {
-		t.Fatalf("expected auth for %s, got %v", validServerAddress, f.AuthConfigs)
-	}
-	if a.Auth != "" {
-		t.Fatalf("expected auth to be empty, got %s", a.Auth)
-	}
-	if a.Username != "" {
-		t.Fatalf("expected username to be empty, got %s", a.Username)
-	}
-	if a.Password != "" {
-		t.Fatalf("expected password to be empty, got %s", a.Password)
-	}
-	if a.IdentityToken != "" {
-		t.Fatalf("expected identity token to be empty, got %s", a.IdentityToken)
-	}
-	if a.Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com`, got %s", a.Email)
-	}
-}
-
-func TestNativeStoreAddInvalidCredentials(t *testing.T) {
-	f := newConfigFile(make(map[string]types.AuthConfig))
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	err := s.Store(types.AuthConfig{
-		Username:      "foo",
-		Password:      "bar",
-		Email:         "foo@example.com",
-		ServerAddress: invalidServerAddress,
-	})
-
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-
-	if !strings.Contains(err.Error(), "program failed") {
-		t.Fatalf("expected `program failed`, got %v", err)
-	}
-
-	if len(f.AuthConfigs) != 0 {
-		t.Fatalf("expected 0 auth config, got %d", len(f.AuthConfigs))
-	}
-}
-
-func TestNativeStoreGet(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	a, err := s.Get(validServerAddress)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if a.Username != "foo" {
-		t.Fatalf("expected username `foo`, got %s", a.Username)
-	}
-	if a.Password != "bar" {
-		t.Fatalf("expected password `bar`, got %s", a.Password)
-	}
-	if a.IdentityToken != "" {
-		t.Fatalf("expected identity token to be empty, got %s", a.IdentityToken)
-	}
-	if a.Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com`, got %s", a.Email)
-	}
-}
-
-func TestNativeStoreGetIdentityToken(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress2: {
-			Email: "foo@example2.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	a, err := s.Get(validServerAddress2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if a.Username != "" {
-		t.Fatalf("expected username to be empty, got %s", a.Username)
-	}
-	if a.Password != "" {
-		t.Fatalf("expected password to be empty, got %s", a.Password)
-	}
-	if a.IdentityToken != "abcd1234" {
-		t.Fatalf("expected identity token `abcd1234`, got %s", a.IdentityToken)
-	}
-	if a.Email != "foo@example2.com" {
-		t.Fatalf("expected email `foo@example2.com`, got %s", a.Email)
-	}
-}
-
-func TestNativeStoreGetAll(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	as, err := s.GetAll()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(as) != 2 {
-		t.Fatalf("wanted 2, got %d", len(as))
-	}
-
-	if as[validServerAddress].Username != "foo" {
-		t.Fatalf("expected username `foo` for %s, got %s", validServerAddress, as[validServerAddress].Username)
-	}
-	if as[validServerAddress].Password != "bar" {
-		t.Fatalf("expected password `bar` for %s, got %s", validServerAddress, as[validServerAddress].Password)
-	}
-	if as[validServerAddress].IdentityToken != "" {
-		t.Fatalf("expected identity to be empty for %s, got %s", validServerAddress, as[validServerAddress].IdentityToken)
-	}
-	if as[validServerAddress].Email != "foo@example.com" {
-		t.Fatalf("expected email `foo@example.com` for %s, got %s", validServerAddress, as[validServerAddress].Email)
-	}
-	if as[validServerAddress2].Username != "" {
-		t.Fatalf("expected username to be empty for %s, got %s", validServerAddress2, as[validServerAddress2].Username)
-	}
-	if as[validServerAddress2].Password != "" {
-		t.Fatalf("expected password to be empty for %s, got %s", validServerAddress2, as[validServerAddress2].Password)
-	}
-	if as[validServerAddress2].IdentityToken != "abcd1234" {
-		t.Fatalf("expected identity token `abcd1324` for %s, got %s", validServerAddress2, as[validServerAddress2].IdentityToken)
-	}
-	if as[validServerAddress2].Email != "" {
-		t.Fatalf("expected no email for %s, got %s", validServerAddress2, as[validServerAddress2].Email)
-	}
-}
-
-func TestNativeStoreGetMissingCredentials(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	_, err := s.Get(missingCredsAddress)
-	if err != nil {
-		// missing credentials do not produce an error
-		t.Fatal(err)
-	}
-}
-
-func TestNativeStoreGetInvalidAddress(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	_, err := s.Get(invalidServerAddress)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-
-	if !strings.Contains(err.Error(), "program failed") {
-		t.Fatalf("expected `program failed`, got %v", err)
-	}
-}
-
-func TestNativeStoreErase(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	err := s.Erase(validServerAddress)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(f.AuthConfigs) != 0 {
-		t.Fatalf("expected 0 auth configs, got %d", len(f.AuthConfigs))
-	}
-}
-
-func TestNativeStoreEraseInvalidAddress(t *testing.T) {
-	f := newConfigFile(map[string]types.AuthConfig{
-		validServerAddress: {
-			Email: "foo@example.com",
-		},
-	})
-	f.CredentialsStore = "mock"
-
-	s := &nativeStore{
-		programFunc: mockCommandFn,
-		fileStore:   NewFileStore(f),
-	}
-	err := s.Erase(invalidServerAddress)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-
-	if !strings.Contains(err.Error(), "program failed") {
-		t.Fatalf("expected `program failed`, got %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/README.md b/installer/vendor/github.com/docker/docker/client/README.md
deleted file mode 100644
index 059dfb3ce7..0000000000
--- a/installer/vendor/github.com/docker/docker/client/README.md
+++ /dev/null
@@ -1,35 +0,0 @@
-# Go client for the Docker Engine API
-
-The `docker` command uses this package to communicate with the daemon. It can also be used by your own Go applications to do anything the command-line interface does – running containers, pulling images, managing swarms, etc.
-
-For example, to list running containers (the equivalent of `docker ps`):
-
-```go
-package main
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/client"
-)
-
-func main() {
-	cli, err := client.NewEnvClient()
-	if err != nil {
-		panic(err)
-	}
-
-	containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
-	if err != nil {
-		panic(err)
-	}
-
-	for _, container := range containers {
-		fmt.Printf("%s %s\n", container.ID[:10], container.Image)
-	}
-}
-```
-
-[Full documentation is available on GoDoc.](https://godoc.org/github.com/docker/docker/client)
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_create.go b/installer/vendor/github.com/docker/docker/client/checkpoint_create.go
deleted file mode 100644
index 0effe498be..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_create.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointCreate creates a checkpoint from the given container with the given name
-func (cli *Client) CheckpointCreate(ctx context.Context, container string, options types.CheckpointCreateOptions) error {
-	resp, err := cli.post(ctx, "/containers/"+container+"/checkpoints", nil, options, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_create_test.go b/installer/vendor/github.com/docker/docker/client/checkpoint_create_test.go
deleted file mode 100644
index 96e5187618..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_create_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestCheckpointCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.CheckpointCreate(context.Background(), "nothing", types.CheckpointCreateOptions{
-		CheckpointID: "noting",
-		Exit:         true,
-	})
-
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestCheckpointCreate(t *testing.T) {
-	expectedContainerID := "container_id"
-	expectedCheckpointID := "checkpoint_id"
-	expectedURL := "/containers/container_id/checkpoints"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			createOptions := &types.CheckpointCreateOptions{}
-			if err := json.NewDecoder(req.Body).Decode(createOptions); err != nil {
-				return nil, err
-			}
-
-			if createOptions.CheckpointID != expectedCheckpointID {
-				return nil, fmt.Errorf("expected CheckpointID to be 'checkpoint_id', got %v", createOptions.CheckpointID)
-			}
-
-			if !createOptions.Exit {
-				return nil, fmt.Errorf("expected Exit to be true")
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.CheckpointCreate(context.Background(), expectedContainerID, types.CheckpointCreateOptions{
-		CheckpointID: expectedCheckpointID,
-		Exit:         true,
-	})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_delete.go b/installer/vendor/github.com/docker/docker/client/checkpoint_delete.go
deleted file mode 100644
index e6e75588b1..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_delete.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointDelete deletes the checkpoint with the given name from the given container
-func (cli *Client) CheckpointDelete(ctx context.Context, containerID string, options types.CheckpointDeleteOptions) error {
-	query := url.Values{}
-	if options.CheckpointDir != "" {
-		query.Set("dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.delete(ctx, "/containers/"+containerID+"/checkpoints/"+options.CheckpointID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_delete_test.go b/installer/vendor/github.com/docker/docker/client/checkpoint_delete_test.go
deleted file mode 100644
index a78b050487..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_delete_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestCheckpointDeleteError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.CheckpointDelete(context.Background(), "container_id", types.CheckpointDeleteOptions{
-		CheckpointID: "checkpoint_id",
-	})
-
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestCheckpointDelete(t *testing.T) {
-	expectedURL := "/containers/container_id/checkpoints/checkpoint_id"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.CheckpointDelete(context.Background(), "container_id", types.CheckpointDeleteOptions{
-		CheckpointID: "checkpoint_id",
-	})
-
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_list.go b/installer/vendor/github.com/docker/docker/client/checkpoint_list.go
deleted file mode 100644
index 8eb720a6b2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_list.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// CheckpointList returns the volumes configured in the docker host.
-func (cli *Client) CheckpointList(ctx context.Context, container string, options types.CheckpointListOptions) ([]types.Checkpoint, error) {
-	var checkpoints []types.Checkpoint
-
-	query := url.Values{}
-	if options.CheckpointDir != "" {
-		query.Set("dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+container+"/checkpoints", query, nil)
-	if err != nil {
-		return checkpoints, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&checkpoints)
-	ensureReaderClosed(resp)
-	return checkpoints, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/checkpoint_list_test.go b/installer/vendor/github.com/docker/docker/client/checkpoint_list_test.go
deleted file mode 100644
index 6c90f61e8c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/checkpoint_list_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestCheckpointListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.CheckpointList(context.Background(), "container_id", types.CheckpointListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestCheckpointList(t *testing.T) {
-	expectedURL := "/containers/container_id/checkpoints"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal([]types.Checkpoint{
-				{
-					Name: "checkpoint",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	checkpoints, err := client.CheckpointList(context.Background(), "container_id", types.CheckpointListOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(checkpoints) != 1 {
-		t.Fatalf("expected 1 checkpoint, got %v", checkpoints)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/client.go b/installer/vendor/github.com/docker/docker/client/client.go
deleted file mode 100644
index a9bdab6bb6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/client.go
+++ /dev/null
@@ -1,246 +0,0 @@
-/*
-Package client is a Go client for the Docker Engine API.
-
-The "docker" command uses this package to communicate with the daemon. It can also
-be used by your own Go applications to do anything the command-line interface does
-– running containers, pulling images, managing swarms, etc.
-
-For more information about the Engine API, see the documentation:
-https://docs.docker.com/engine/reference/api/
-
-Usage
-
-You use the library by creating a client object and calling methods on it. The
-client can be created either from environment variables with NewEnvClient, or
-configured manually with NewClient.
-
-For example, to list running containers (the equivalent of "docker ps"):
-
-	package main
-
-	import (
-		"context"
-		"fmt"
-
-		"github.com/docker/docker/api/types"
-		"github.com/docker/docker/client"
-	)
-
-	func main() {
-		cli, err := client.NewEnvClient()
-		if err != nil {
-			panic(err)
-		}
-
-		containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{})
-		if err != nil {
-			panic(err)
-		}
-
-		for _, container := range containers {
-			fmt.Printf("%s %s\n", container.ID[:10], container.Image)
-		}
-	}
-
-*/
-package client
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-// DefaultVersion is the version of the current stable API
-const DefaultVersion string = "1.25"
-
-// Client is the API client that performs all operations
-// against a docker server.
-type Client struct {
-	// scheme sets the scheme for the client
-	scheme string
-	// host holds the server address to connect to
-	host string
-	// proto holds the client protocol i.e. unix.
-	proto string
-	// addr holds the client address.
-	addr string
-	// basePath holds the path to prepend to the requests.
-	basePath string
-	// client used to send and receive http requests.
-	client *http.Client
-	// version of the server to talk to.
-	version string
-	// custom http headers configured by users.
-	customHTTPHeaders map[string]string
-	// manualOverride is set to true when the version was set by users.
-	manualOverride bool
-}
-
-// NewEnvClient initializes a new API client based on environment variables.
-// Use DOCKER_HOST to set the url to the docker server.
-// Use DOCKER_API_VERSION to set the version of the API to reach, leave empty for latest.
-// Use DOCKER_CERT_PATH to load the tls certificates from.
-// Use DOCKER_TLS_VERIFY to enable or disable TLS verification, off by default.
-func NewEnvClient() (*Client, error) {
-	var client *http.Client
-	if dockerCertPath := os.Getenv("DOCKER_CERT_PATH"); dockerCertPath != "" {
-		options := tlsconfig.Options{
-			CAFile:             filepath.Join(dockerCertPath, "ca.pem"),
-			CertFile:           filepath.Join(dockerCertPath, "cert.pem"),
-			KeyFile:            filepath.Join(dockerCertPath, "key.pem"),
-			InsecureSkipVerify: os.Getenv("DOCKER_TLS_VERIFY") == "",
-		}
-		tlsc, err := tlsconfig.Client(options)
-		if err != nil {
-			return nil, err
-		}
-
-		client = &http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: tlsc,
-			},
-		}
-	}
-
-	host := os.Getenv("DOCKER_HOST")
-	if host == "" {
-		host = DefaultDockerHost
-	}
-	version := os.Getenv("DOCKER_API_VERSION")
-	if version == "" {
-		version = DefaultVersion
-	}
-
-	cli, err := NewClient(host, version, client, nil)
-	if err != nil {
-		return cli, err
-	}
-	if os.Getenv("DOCKER_API_VERSION") != "" {
-		cli.manualOverride = true
-	}
-	return cli, nil
-}
-
-// NewClient initializes a new API client for the given host and API version.
-// It uses the given http client as transport.
-// It also initializes the custom http headers to add to each request.
-//
-// It won't send any version information if the version number is empty. It is
-// highly recommended that you set a version or your client may break if the
-// server is upgraded.
-func NewClient(host string, version string, client *http.Client, httpHeaders map[string]string) (*Client, error) {
-	proto, addr, basePath, err := ParseHost(host)
-	if err != nil {
-		return nil, err
-	}
-
-	if client != nil {
-		if _, ok := client.Transport.(*http.Transport); !ok {
-			return nil, fmt.Errorf("unable to verify TLS configuration, invalid transport %v", client.Transport)
-		}
-	} else {
-		transport := new(http.Transport)
-		sockets.ConfigureTransport(transport, proto, addr)
-		client = &http.Client{
-			Transport: transport,
-		}
-	}
-
-	scheme := "http"
-	tlsConfig := resolveTLSConfig(client.Transport)
-	if tlsConfig != nil {
-		// TODO(stevvooe): This isn't really the right way to write clients in Go.
-		// `NewClient` should probably only take an `*http.Client` and work from there.
-		// Unfortunately, the model of having a host-ish/url-thingy as the connection
-		// string has us confusing protocol and transport layers. We continue doing
-		// this to avoid breaking existing clients but this should be addressed.
-		scheme = "https"
-	}
-
-	return &Client{
-		scheme:            scheme,
-		host:              host,
-		proto:             proto,
-		addr:              addr,
-		basePath:          basePath,
-		client:            client,
-		version:           version,
-		customHTTPHeaders: httpHeaders,
-	}, nil
-}
-
-// Close ensures that transport.Client is closed
-// especially needed while using NewClient with *http.Client = nil
-// for example
-// client.NewClient("unix:///var/run/docker.sock", nil, "v1.18", map[string]string{"User-Agent": "engine-api-cli-1.0"})
-func (cli *Client) Close() error {
-
-	if t, ok := cli.client.Transport.(*http.Transport); ok {
-		t.CloseIdleConnections()
-	}
-
-	return nil
-}
-
-// getAPIPath returns the versioned request path to call the api.
-// It appends the query parameters to the path if they are not empty.
-func (cli *Client) getAPIPath(p string, query url.Values) string {
-	var apiPath string
-	if cli.version != "" {
-		v := strings.TrimPrefix(cli.version, "v")
-		apiPath = fmt.Sprintf("%s/v%s%s", cli.basePath, v, p)
-	} else {
-		apiPath = fmt.Sprintf("%s%s", cli.basePath, p)
-	}
-
-	u := &url.URL{
-		Path: apiPath,
-	}
-	if len(query) > 0 {
-		u.RawQuery = query.Encode()
-	}
-	return u.String()
-}
-
-// ClientVersion returns the version string associated with this
-// instance of the Client. Note that this value can be changed
-// via the DOCKER_API_VERSION env var.
-func (cli *Client) ClientVersion() string {
-	return cli.version
-}
-
-// UpdateClientVersion updates the version string associated with this
-// instance of the Client.
-func (cli *Client) UpdateClientVersion(v string) {
-	if !cli.manualOverride {
-		cli.version = v
-	}
-
-}
-
-// ParseHost verifies that the given host strings is valid.
-func ParseHost(host string) (string, string, string, error) {
-	protoAddrParts := strings.SplitN(host, "://", 2)
-	if len(protoAddrParts) == 1 {
-		return "", "", "", fmt.Errorf("unable to parse docker host `%s`", host)
-	}
-
-	var basePath string
-	proto, addr := protoAddrParts[0], protoAddrParts[1]
-	if proto == "tcp" {
-		parsed, err := url.Parse("tcp://" + addr)
-		if err != nil {
-			return "", "", "", err
-		}
-		addr = parsed.Host
-		basePath = parsed.Path
-	}
-	return proto, addr, basePath, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/client_mock_test.go b/installer/vendor/github.com/docker/docker/client/client_mock_test.go
deleted file mode 100644
index 0ab935d536..0000000000
--- a/installer/vendor/github.com/docker/docker/client/client_mock_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-)
-
-func newMockClient(doer func(*http.Request) (*http.Response, error)) *http.Client {
-	return &http.Client{
-		Transport: transportFunc(doer),
-	}
-}
-
-func errorMock(statusCode int, message string) func(req *http.Request) (*http.Response, error) {
-	return func(req *http.Request) (*http.Response, error) {
-		header := http.Header{}
-		header.Set("Content-Type", "application/json")
-
-		body, err := json.Marshal(&types.ErrorResponse{
-			Message: message,
-		})
-		if err != nil {
-			return nil, err
-		}
-
-		return &http.Response{
-			StatusCode: statusCode,
-			Body:       ioutil.NopCloser(bytes.NewReader(body)),
-			Header:     header,
-		}, nil
-	}
-}
-
-func plainTextErrorMock(statusCode int, message string) func(req *http.Request) (*http.Response, error) {
-	return func(req *http.Request) (*http.Response, error) {
-		return &http.Response{
-			StatusCode: statusCode,
-			Body:       ioutil.NopCloser(bytes.NewReader([]byte(message))),
-		}, nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/client_test.go b/installer/vendor/github.com/docker/docker/client/client_test.go
deleted file mode 100644
index ee199c2bec..0000000000
--- a/installer/vendor/github.com/docker/docker/client/client_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestNewEnvClient(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("skipping unix only test for windows")
-	}
-	cases := []struct {
-		envs            map[string]string
-		expectedError   string
-		expectedVersion string
-	}{
-		{
-			envs:            map[string]string{},
-			expectedVersion: DefaultVersion,
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_CERT_PATH": "invalid/path",
-			},
-			expectedError: "Could not load X509 key pair: open invalid/path/cert.pem: no such file or directory. Make sure the key is not encrypted",
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_CERT_PATH": "testdata/",
-			},
-			expectedVersion: DefaultVersion,
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_CERT_PATH":  "testdata/",
-				"DOCKER_TLS_VERIFY": "1",
-			},
-			expectedVersion: DefaultVersion,
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_CERT_PATH": "testdata/",
-				"DOCKER_HOST":      "https://notaunixsocket",
-			},
-			expectedVersion: DefaultVersion,
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_HOST": "host",
-			},
-			expectedError: "unable to parse docker host `host`",
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_HOST": "invalid://url",
-			},
-			expectedVersion: DefaultVersion,
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_API_VERSION": "anything",
-			},
-			expectedVersion: "anything",
-		},
-		{
-			envs: map[string]string{
-				"DOCKER_API_VERSION": "1.22",
-			},
-			expectedVersion: "1.22",
-		},
-	}
-	for _, c := range cases {
-		recoverEnvs := setupEnvs(t, c.envs)
-		apiclient, err := NewEnvClient()
-		if c.expectedError != "" {
-			if err == nil {
-				t.Errorf("expected an error for %v", c)
-			} else if err.Error() != c.expectedError {
-				t.Errorf("expected an error %s, got %s, for %v", c.expectedError, err.Error(), c)
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-			version := apiclient.ClientVersion()
-			if version != c.expectedVersion {
-				t.Errorf("expected %s, got %s, for %v", c.expectedVersion, version, c)
-			}
-		}
-
-		if c.envs["DOCKER_TLS_VERIFY"] != "" {
-			// pedantic checking that this is handled correctly
-			tr := apiclient.client.Transport.(*http.Transport)
-			if tr.TLSClientConfig == nil {
-				t.Errorf("no tls config found when DOCKER_TLS_VERIFY enabled")
-			}
-
-			if tr.TLSClientConfig.InsecureSkipVerify {
-				t.Errorf("tls verification should be enabled")
-			}
-		}
-
-		recoverEnvs(t)
-	}
-}
-
-func setupEnvs(t *testing.T, envs map[string]string) func(*testing.T) {
-	oldEnvs := map[string]string{}
-	for key, value := range envs {
-		oldEnv := os.Getenv(key)
-		oldEnvs[key] = oldEnv
-		err := os.Setenv(key, value)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-	return func(t *testing.T) {
-		for key, value := range oldEnvs {
-			err := os.Setenv(key, value)
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
-
-func TestGetAPIPath(t *testing.T) {
-	cases := []struct {
-		v string
-		p string
-		q url.Values
-		e string
-	}{
-		{"", "/containers/json", nil, "/containers/json"},
-		{"", "/containers/json", url.Values{}, "/containers/json"},
-		{"", "/containers/json", url.Values{"s": []string{"c"}}, "/containers/json?s=c"},
-		{"1.22", "/containers/json", nil, "/v1.22/containers/json"},
-		{"1.22", "/containers/json", url.Values{}, "/v1.22/containers/json"},
-		{"1.22", "/containers/json", url.Values{"s": []string{"c"}}, "/v1.22/containers/json?s=c"},
-		{"v1.22", "/containers/json", nil, "/v1.22/containers/json"},
-		{"v1.22", "/containers/json", url.Values{}, "/v1.22/containers/json"},
-		{"v1.22", "/containers/json", url.Values{"s": []string{"c"}}, "/v1.22/containers/json?s=c"},
-		{"v1.22", "/networks/kiwl$%^", nil, "/v1.22/networks/kiwl$%25%5E"},
-	}
-
-	for _, cs := range cases {
-		c, err := NewClient("unix:///var/run/docker.sock", cs.v, nil, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		g := c.getAPIPath(cs.p, cs.q)
-		if g != cs.e {
-			t.Fatalf("Expected %s, got %s", cs.e, g)
-		}
-
-		err = c.Close()
-		if nil != err {
-			t.Fatalf("close client failed, error message: %s", err)
-		}
-	}
-}
-
-func TestParseHost(t *testing.T) {
-	cases := []struct {
-		host  string
-		proto string
-		addr  string
-		base  string
-		err   bool
-	}{
-		{"", "", "", "", true},
-		{"foobar", "", "", "", true},
-		{"foo://bar", "foo", "bar", "", false},
-		{"tcp://localhost:2476", "tcp", "localhost:2476", "", false},
-		{"tcp://localhost:2476/path", "tcp", "localhost:2476", "/path", false},
-	}
-
-	for _, cs := range cases {
-		p, a, b, e := ParseHost(cs.host)
-		if cs.err && e == nil {
-			t.Fatalf("expected error, got nil")
-		}
-		if !cs.err && e != nil {
-			t.Fatal(e)
-		}
-		if cs.proto != p {
-			t.Fatalf("expected proto %s, got %s", cs.proto, p)
-		}
-		if cs.addr != a {
-			t.Fatalf("expected addr %s, got %s", cs.addr, a)
-		}
-		if cs.base != b {
-			t.Fatalf("expected base %s, got %s", cs.base, b)
-		}
-	}
-}
-
-func TestUpdateClientVersion(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			splitQuery := strings.Split(req.URL.Path, "/")
-			queryVersion := splitQuery[1]
-			b, err := json.Marshal(types.Version{
-				APIVersion: queryVersion,
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	cases := []struct {
-		v string
-	}{
-		{"1.20"},
-		{"v1.21"},
-		{"1.22"},
-		{"v1.22"},
-	}
-
-	for _, cs := range cases {
-		client.UpdateClientVersion(cs.v)
-		r, err := client.ServerVersion(context.Background())
-		if err != nil {
-			t.Fatal(err)
-		}
-		if strings.TrimPrefix(r.APIVersion, "v") != strings.TrimPrefix(cs.v, "v") {
-			t.Fatalf("Expected %s, got %s", cs.v, r.APIVersion)
-		}
-	}
-}
-
-func TestNewEnvClientSetsDefaultVersion(t *testing.T) {
-	// Unset environment variables
-	envVarKeys := []string{
-		"DOCKER_HOST",
-		"DOCKER_API_VERSION",
-		"DOCKER_TLS_VERIFY",
-		"DOCKER_CERT_PATH",
-	}
-	envVarValues := make(map[string]string)
-	for _, key := range envVarKeys {
-		envVarValues[key] = os.Getenv(key)
-		os.Setenv(key, "")
-	}
-
-	client, err := NewEnvClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if client.version != DefaultVersion {
-		t.Fatalf("Expected %s, got %s", DefaultVersion, client.version)
-	}
-
-	expected := "1.22"
-	os.Setenv("DOCKER_API_VERSION", expected)
-	client, err = NewEnvClient()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if client.version != expected {
-		t.Fatalf("Expected %s, got %s", expected, client.version)
-	}
-
-	// Restore environment variables
-	for _, key := range envVarKeys {
-		os.Setenv(key, envVarValues[key])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/client_unix.go b/installer/vendor/github.com/docker/docker/client/client_unix.go
deleted file mode 100644
index 89de892c85..0000000000
--- a/installer/vendor/github.com/docker/docker/client/client_unix.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build linux freebsd solaris openbsd darwin
-
-package client
-
-// DefaultDockerHost defines os specific default if DOCKER_HOST is unset
-const DefaultDockerHost = "unix:///var/run/docker.sock"
diff --git a/installer/vendor/github.com/docker/docker/client/client_windows.go b/installer/vendor/github.com/docker/docker/client/client_windows.go
deleted file mode 100644
index 07c0c7a774..0000000000
--- a/installer/vendor/github.com/docker/docker/client/client_windows.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package client
-
-// DefaultDockerHost defines os specific default if DOCKER_HOST is unset
-const DefaultDockerHost = "npipe:////./pipe/docker_engine"
diff --git a/installer/vendor/github.com/docker/docker/client/container_attach.go b/installer/vendor/github.com/docker/docker/client/container_attach.go
deleted file mode 100644
index eea4682158..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_attach.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerAttach attaches a connection to a container in the server.
-// It returns a types.HijackedConnection with the hijacked connection
-// and the a reader to get output. It's up to the called to close
-// the hijacked connection by calling types.HijackedResponse.Close.
-func (cli *Client) ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error) {
-	query := url.Values{}
-	if options.Stream {
-		query.Set("stream", "1")
-	}
-	if options.Stdin {
-		query.Set("stdin", "1")
-	}
-	if options.Stdout {
-		query.Set("stdout", "1")
-	}
-	if options.Stderr {
-		query.Set("stderr", "1")
-	}
-	if options.DetachKeys != "" {
-		query.Set("detachKeys", options.DetachKeys)
-	}
-	if options.Logs {
-		query.Set("logs", "1")
-	}
-
-	headers := map[string][]string{"Content-Type": {"text/plain"}}
-	return cli.postHijacked(ctx, "/containers/"+container+"/attach", query, nil, headers)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_commit.go b/installer/vendor/github.com/docker/docker/client/container_commit.go
deleted file mode 100644
index c766d62e40..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_commit.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"errors"
-	"net/url"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/reference"
-	"golang.org/x/net/context"
-)
-
-// ContainerCommit applies changes into a container and creates a new tagged image.
-func (cli *Client) ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error) {
-	var repository, tag string
-	if options.Reference != "" {
-		distributionRef, err := distreference.ParseNamed(options.Reference)
-		if err != nil {
-			return types.IDResponse{}, err
-		}
-
-		if _, isCanonical := distributionRef.(distreference.Canonical); isCanonical {
-			return types.IDResponse{}, errors.New("refusing to create a tag with a digest reference")
-		}
-
-		tag = reference.GetTagFromNamedRef(distributionRef)
-		repository = distributionRef.Name()
-	}
-
-	query := url.Values{}
-	query.Set("container", container)
-	query.Set("repo", repository)
-	query.Set("tag", tag)
-	query.Set("comment", options.Comment)
-	query.Set("author", options.Author)
-	for _, change := range options.Changes {
-		query.Add("changes", change)
-	}
-	if options.Pause != true {
-		query.Set("pause", "0")
-	}
-
-	var response types.IDResponse
-	resp, err := cli.post(ctx, "/commit", query, options.Config, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_commit_test.go b/installer/vendor/github.com/docker/docker/client/container_commit_test.go
deleted file mode 100644
index a844675368..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_commit_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerCommitError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerCommit(context.Background(), "nothing", types.ContainerCommitOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerCommit(t *testing.T) {
-	expectedURL := "/commit"
-	expectedContainerID := "container_id"
-	specifiedReference := "repository_name:tag"
-	expectedRepositoryName := "repository_name"
-	expectedTag := "tag"
-	expectedComment := "comment"
-	expectedAuthor := "author"
-	expectedChanges := []string{"change1", "change2"}
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			query := req.URL.Query()
-			containerID := query.Get("container")
-			if containerID != expectedContainerID {
-				return nil, fmt.Errorf("container id not set in URL query properly. Expected '%s', got %s", expectedContainerID, containerID)
-			}
-			repo := query.Get("repo")
-			if repo != expectedRepositoryName {
-				return nil, fmt.Errorf("container repo not set in URL query properly. Expected '%s', got %s", expectedRepositoryName, repo)
-			}
-			tag := query.Get("tag")
-			if tag != expectedTag {
-				return nil, fmt.Errorf("container tag not set in URL query properly. Expected '%s', got %s'", expectedTag, tag)
-			}
-			comment := query.Get("comment")
-			if comment != expectedComment {
-				return nil, fmt.Errorf("container comment not set in URL query properly. Expected '%s', got %s'", expectedComment, comment)
-			}
-			author := query.Get("author")
-			if author != expectedAuthor {
-				return nil, fmt.Errorf("container author not set in URL query properly. Expected '%s', got %s'", expectedAuthor, author)
-			}
-			pause := query.Get("pause")
-			if pause != "0" {
-				return nil, fmt.Errorf("container pause not set in URL query properly. Expected 'true', got %v'", pause)
-			}
-			changes := query["changes"]
-			if len(changes) != len(expectedChanges) {
-				return nil, fmt.Errorf("expected container changes size to be '%d', got %d", len(expectedChanges), len(changes))
-			}
-			b, err := json.Marshal(types.IDResponse{
-				ID: "new_container_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ContainerCommit(context.Background(), expectedContainerID, types.ContainerCommitOptions{
-		Reference: specifiedReference,
-		Comment:   expectedComment,
-		Author:    expectedAuthor,
-		Changes:   expectedChanges,
-		Pause:     false,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "new_container_id" {
-		t.Fatalf("expected `container_id`, got %s", r.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_copy.go b/installer/vendor/github.com/docker/docker/client/container_copy.go
deleted file mode 100644
index 8380eeabc9..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_copy.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package client
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"path/filepath"
-	"strings"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ContainerStatPath returns Stat information about a path inside the container filesystem.
-func (cli *Client) ContainerStatPath(ctx context.Context, containerID, path string) (types.ContainerPathStat, error) {
-	query := url.Values{}
-	query.Set("path", filepath.ToSlash(path)) // Normalize the paths used in the API.
-
-	urlStr := fmt.Sprintf("/containers/%s/archive", containerID)
-	response, err := cli.head(ctx, urlStr, query, nil)
-	if err != nil {
-		return types.ContainerPathStat{}, err
-	}
-	defer ensureReaderClosed(response)
-	return getContainerPathStatFromHeader(response.header)
-}
-
-// CopyToContainer copies content into the container filesystem.
-func (cli *Client) CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error {
-	query := url.Values{}
-	query.Set("path", filepath.ToSlash(path)) // Normalize the paths used in the API.
-	// Do not allow for an existing directory to be overwritten by a non-directory and vice versa.
-	if !options.AllowOverwriteDirWithFile {
-		query.Set("noOverwriteDirNonDir", "true")
-	}
-
-	apiPath := fmt.Sprintf("/containers/%s/archive", container)
-
-	response, err := cli.putRaw(ctx, apiPath, query, content, nil)
-	if err != nil {
-		return err
-	}
-	defer ensureReaderClosed(response)
-
-	if response.statusCode != http.StatusOK {
-		return fmt.Errorf("unexpected status code from daemon: %d", response.statusCode)
-	}
-
-	return nil
-}
-
-// CopyFromContainer gets the content from the container and returns it as a Reader
-// to manipulate it in the host. It's up to the caller to close the reader.
-func (cli *Client) CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error) {
-	query := make(url.Values, 1)
-	query.Set("path", filepath.ToSlash(srcPath)) // Normalize the paths used in the API.
-
-	apiPath := fmt.Sprintf("/containers/%s/archive", container)
-	response, err := cli.get(ctx, apiPath, query, nil)
-	if err != nil {
-		return nil, types.ContainerPathStat{}, err
-	}
-
-	if response.statusCode != http.StatusOK {
-		return nil, types.ContainerPathStat{}, fmt.Errorf("unexpected status code from daemon: %d", response.statusCode)
-	}
-
-	// In order to get the copy behavior right, we need to know information
-	// about both the source and the destination. The response headers include
-	// stat info about the source that we can use in deciding exactly how to
-	// copy it locally. Along with the stat info about the local destination,
-	// we have everything we need to handle the multiple possibilities there
-	// can be when copying a file/dir from one location to another file/dir.
-	stat, err := getContainerPathStatFromHeader(response.header)
-	if err != nil {
-		return nil, stat, fmt.Errorf("unable to get resource stat from response: %s", err)
-	}
-	return response.body, stat, err
-}
-
-func getContainerPathStatFromHeader(header http.Header) (types.ContainerPathStat, error) {
-	var stat types.ContainerPathStat
-
-	encodedStat := header.Get("X-Docker-Container-Path-Stat")
-	statDecoder := base64.NewDecoder(base64.StdEncoding, strings.NewReader(encodedStat))
-
-	err := json.NewDecoder(statDecoder).Decode(&stat)
-	if err != nil {
-		err = fmt.Errorf("unable to decode container path stat header: %s", err)
-	}
-
-	return stat, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_copy_test.go b/installer/vendor/github.com/docker/docker/client/container_copy_test.go
deleted file mode 100644
index 706a20c818..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_copy_test.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestContainerStatPathError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerStatPath(context.Background(), "container_id", "path")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestContainerStatPathNoHeaderError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	_, err := client.ContainerStatPath(context.Background(), "container_id", "path/to/file")
-	if err == nil {
-		t.Fatalf("expected an error, got nothing")
-	}
-}
-
-func TestContainerStatPath(t *testing.T) {
-	expectedURL := "/containers/container_id/archive"
-	expectedPath := "path/to/file"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "HEAD" {
-				return nil, fmt.Errorf("expected HEAD method, got %s", req.Method)
-			}
-			query := req.URL.Query()
-			path := query.Get("path")
-			if path != expectedPath {
-				return nil, fmt.Errorf("path not set in URL query properly")
-			}
-			content, err := json.Marshal(types.ContainerPathStat{
-				Name: "name",
-				Mode: 0700,
-			})
-			if err != nil {
-				return nil, err
-			}
-			base64PathStat := base64.StdEncoding.EncodeToString(content)
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-				Header: http.Header{
-					"X-Docker-Container-Path-Stat": []string{base64PathStat},
-				},
-			}, nil
-		}),
-	}
-	stat, err := client.ContainerStatPath(context.Background(), "container_id", expectedPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stat.Name != "name" {
-		t.Fatalf("expected container path stat name to be 'name', got '%s'", stat.Name)
-	}
-	if stat.Mode != 0700 {
-		t.Fatalf("expected container path stat mode to be 0700, got '%v'", stat.Mode)
-	}
-}
-
-func TestCopyToContainerError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.CopyToContainer(context.Background(), "container_id", "path/to/file", bytes.NewReader([]byte("")), types.CopyToContainerOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestCopyToContainerNotStatusOKError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNoContent, "No content")),
-	}
-	err := client.CopyToContainer(context.Background(), "container_id", "path/to/file", bytes.NewReader([]byte("")), types.CopyToContainerOptions{})
-	if err == nil || err.Error() != "unexpected status code from daemon: 204" {
-		t.Fatalf("expected an unexpected status code error, got %v", err)
-	}
-}
-
-func TestCopyToContainer(t *testing.T) {
-	expectedURL := "/containers/container_id/archive"
-	expectedPath := "path/to/file"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "PUT" {
-				return nil, fmt.Errorf("expected PUT method, got %s", req.Method)
-			}
-			query := req.URL.Query()
-			path := query.Get("path")
-			if path != expectedPath {
-				return nil, fmt.Errorf("path not set in URL query properly, expected '%s', got %s", expectedPath, path)
-			}
-			noOverwriteDirNonDir := query.Get("noOverwriteDirNonDir")
-			if noOverwriteDirNonDir != "true" {
-				return nil, fmt.Errorf("noOverwriteDirNonDir not set in URL query properly, expected true, got %s", noOverwriteDirNonDir)
-			}
-
-			content, err := ioutil.ReadAll(req.Body)
-			if err != nil {
-				return nil, err
-			}
-			if err := req.Body.Close(); err != nil {
-				return nil, err
-			}
-			if string(content) != "content" {
-				return nil, fmt.Errorf("expected content to be 'content', got %s", string(content))
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	err := client.CopyToContainer(context.Background(), "container_id", expectedPath, bytes.NewReader([]byte("content")), types.CopyToContainerOptions{
-		AllowOverwriteDirWithFile: false,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCopyFromContainerError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, _, err := client.CopyFromContainer(context.Background(), "container_id", "path/to/file")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestCopyFromContainerNotStatusOKError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNoContent, "No content")),
-	}
-	_, _, err := client.CopyFromContainer(context.Background(), "container_id", "path/to/file")
-	if err == nil || err.Error() != "unexpected status code from daemon: 204" {
-		t.Fatalf("expected an unexpected status code error, got %v", err)
-	}
-}
-
-func TestCopyFromContainerNoHeaderError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	_, _, err := client.CopyFromContainer(context.Background(), "container_id", "path/to/file")
-	if err == nil {
-		t.Fatalf("expected an error, got nothing")
-	}
-}
-
-func TestCopyFromContainer(t *testing.T) {
-	expectedURL := "/containers/container_id/archive"
-	expectedPath := "path/to/file"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "GET" {
-				return nil, fmt.Errorf("expected PUT method, got %s", req.Method)
-			}
-			query := req.URL.Query()
-			path := query.Get("path")
-			if path != expectedPath {
-				return nil, fmt.Errorf("path not set in URL query properly, expected '%s', got %s", expectedPath, path)
-			}
-
-			headercontent, err := json.Marshal(types.ContainerPathStat{
-				Name: "name",
-				Mode: 0700,
-			})
-			if err != nil {
-				return nil, err
-			}
-			base64PathStat := base64.StdEncoding.EncodeToString(headercontent)
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("content"))),
-				Header: http.Header{
-					"X-Docker-Container-Path-Stat": []string{base64PathStat},
-				},
-			}, nil
-		}),
-	}
-	r, stat, err := client.CopyFromContainer(context.Background(), "container_id", expectedPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stat.Name != "name" {
-		t.Fatalf("expected container path stat name to be 'name', got '%s'", stat.Name)
-	}
-	if stat.Mode != 0700 {
-		t.Fatalf("expected container path stat mode to be 0700, got '%v'", stat.Mode)
-	}
-	content, err := ioutil.ReadAll(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := r.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if string(content) != "content" {
-		t.Fatalf("expected content to be 'content', got %s", string(content))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_create.go b/installer/vendor/github.com/docker/docker/client/container_create.go
deleted file mode 100644
index 9f627aafa6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_create.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/network"
-	"golang.org/x/net/context"
-)
-
-type configWrapper struct {
-	*container.Config
-	HostConfig       *container.HostConfig
-	NetworkingConfig *network.NetworkingConfig
-}
-
-// ContainerCreate creates a new container based in the given configuration.
-// It can be associated with a name, but it's not mandatory.
-func (cli *Client) ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error) {
-	var response container.ContainerCreateCreatedBody
-
-	if err := cli.NewVersionError("1.25", "stop timeout"); config != nil && config.StopTimeout != nil && err != nil {
-		return response, err
-	}
-
-	query := url.Values{}
-	if containerName != "" {
-		query.Set("name", containerName)
-	}
-
-	body := configWrapper{
-		Config:           config,
-		HostConfig:       hostConfig,
-		NetworkingConfig: networkingConfig,
-	}
-
-	serverResp, err := cli.post(ctx, "/containers/create", query, body, nil)
-	if err != nil {
-		if serverResp.statusCode == 404 && strings.Contains(err.Error(), "No such image") {
-			return response, imageNotFoundError{config.Image}
-		}
-		return response, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_create_test.go b/installer/vendor/github.com/docker/docker/client/container_create_test.go
deleted file mode 100644
index 15dbd5ea01..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_create_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-func TestContainerCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error while testing StatusInternalServerError, got %v", err)
-	}
-
-	// 404 doesn't automagitally means an unknown image
-	client = &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-	_, err = client.ContainerCreate(context.Background(), nil, nil, nil, "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error while testing StatusNotFound, got %v", err)
-	}
-}
-
-func TestContainerCreateImageNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "No such image")),
-	}
-	_, err := client.ContainerCreate(context.Background(), &container.Config{Image: "unknown_image"}, nil, nil, "unknown")
-	if err == nil || !IsErrImageNotFound(err) {
-		t.Fatalf("expected an imageNotFound error, got %v", err)
-	}
-}
-
-func TestContainerCreateWithName(t *testing.T) {
-	expectedURL := "/containers/create"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			name := req.URL.Query().Get("name")
-			if name != "container_name" {
-				return nil, fmt.Errorf("container name not set in URL query properly. Expected `container_name`, got %s", name)
-			}
-			b, err := json.Marshal(container.ContainerCreateCreatedBody{
-				ID: "container_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ContainerCreate(context.Background(), nil, nil, nil, "container_name")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "container_id" {
-		t.Fatalf("expected `container_id`, got %s", r.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_diff.go b/installer/vendor/github.com/docker/docker/client/container_diff.go
deleted file mode 100644
index 1e3e554fc5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_diff.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerDiff shows differences in a container filesystem since it was started.
-func (cli *Client) ContainerDiff(ctx context.Context, containerID string) ([]types.ContainerChange, error) {
-	var changes []types.ContainerChange
-
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/changes", url.Values{}, nil)
-	if err != nil {
-		return changes, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&changes)
-	ensureReaderClosed(serverResp)
-	return changes, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_diff_test.go b/installer/vendor/github.com/docker/docker/client/container_diff_test.go
deleted file mode 100644
index 1ce1117684..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_diff_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerDiffError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerDiff(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-
-}
-
-func TestContainerDiff(t *testing.T) {
-	expectedURL := "/containers/container_id/changes"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			b, err := json.Marshal([]types.ContainerChange{
-				{
-					Kind: 0,
-					Path: "/path/1",
-				},
-				{
-					Kind: 1,
-					Path: "/path/2",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	changes, err := client.ContainerDiff(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(changes) != 2 {
-		t.Fatalf("expected an array of 2 changes, got %v", changes)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_exec.go b/installer/vendor/github.com/docker/docker/client/container_exec.go
deleted file mode 100644
index 0665c54fbd..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_exec.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerExecCreate creates a new exec configuration to run an exec process.
-func (cli *Client) ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error) {
-	var response types.IDResponse
-
-	if err := cli.NewVersionError("1.25", "env"); len(config.Env) != 0 && err != nil {
-		return response, err
-	}
-
-	resp, err := cli.post(ctx, "/containers/"+container+"/exec", nil, config, nil)
-	if err != nil {
-		return response, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
-
-// ContainerExecStart starts an exec process already created in the docker host.
-func (cli *Client) ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error {
-	resp, err := cli.post(ctx, "/exec/"+execID+"/start", nil, config, nil)
-	ensureReaderClosed(resp)
-	return err
-}
-
-// ContainerExecAttach attaches a connection to an exec process in the server.
-// It returns a types.HijackedConnection with the hijacked connection
-// and the a reader to get output. It's up to the called to close
-// the hijacked connection by calling types.HijackedResponse.Close.
-func (cli *Client) ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error) {
-	headers := map[string][]string{"Content-Type": {"application/json"}}
-	return cli.postHijacked(ctx, "/exec/"+execID+"/start", nil, config, headers)
-}
-
-// ContainerExecInspect returns information about a specific exec process on the docker host.
-func (cli *Client) ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error) {
-	var response types.ContainerExecInspect
-	resp, err := cli.get(ctx, "/exec/"+execID+"/json", nil, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_exec_test.go b/installer/vendor/github.com/docker/docker/client/container_exec_test.go
deleted file mode 100644
index 0e296a50ad..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_exec_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestContainerExecCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerExecCreate(context.Background(), "container_id", types.ExecConfig{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerExecCreate(t *testing.T) {
-	expectedURL := "/containers/container_id/exec"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			// FIXME validate the content is the given ExecConfig ?
-			if err := req.ParseForm(); err != nil {
-				return nil, err
-			}
-			execConfig := &types.ExecConfig{}
-			if err := json.NewDecoder(req.Body).Decode(execConfig); err != nil {
-				return nil, err
-			}
-			if execConfig.User != "user" {
-				return nil, fmt.Errorf("expected an execConfig with User == 'user', got %v", execConfig)
-			}
-			b, err := json.Marshal(types.IDResponse{
-				ID: "exec_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ContainerExecCreate(context.Background(), "container_id", types.ExecConfig{
-		User: "user",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "exec_id" {
-		t.Fatalf("expected `exec_id`, got %s", r.ID)
-	}
-}
-
-func TestContainerExecStartError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerExecStart(context.Background(), "nothing", types.ExecStartCheck{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerExecStart(t *testing.T) {
-	expectedURL := "/exec/exec_id/start"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if err := req.ParseForm(); err != nil {
-				return nil, err
-			}
-			execStartCheck := &types.ExecStartCheck{}
-			if err := json.NewDecoder(req.Body).Decode(execStartCheck); err != nil {
-				return nil, err
-			}
-			if execStartCheck.Tty || !execStartCheck.Detach {
-				return nil, fmt.Errorf("expected execStartCheck{Detach:true,Tty:false}, got %v", execStartCheck)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.ContainerExecStart(context.Background(), "exec_id", types.ExecStartCheck{
-		Detach: true,
-		Tty:    false,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestContainerExecInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerExecInspect(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerExecInspect(t *testing.T) {
-	expectedURL := "/exec/exec_id/json"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			b, err := json.Marshal(types.ContainerExecInspect{
-				ExecID:      "exec_id",
-				ContainerID: "container_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	inspect, err := client.ContainerExecInspect(context.Background(), "exec_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if inspect.ExecID != "exec_id" {
-		t.Fatalf("expected ExecID to be `exec_id`, got %s", inspect.ExecID)
-	}
-	if inspect.ContainerID != "container_id" {
-		t.Fatalf("expected ContainerID `container_id`, got %s", inspect.ContainerID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_export.go b/installer/vendor/github.com/docker/docker/client/container_export.go
deleted file mode 100644
index 52194f3d34..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_export.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerExport retrieves the raw contents of a container
-// and returns them as an io.ReadCloser. It's up to the caller
-// to close the stream.
-func (cli *Client) ContainerExport(ctx context.Context, containerID string) (io.ReadCloser, error) {
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/export", url.Values{}, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return serverResp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_export_test.go b/installer/vendor/github.com/docker/docker/client/container_export_test.go
deleted file mode 100644
index 5849fe9252..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_export_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerExportError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerExport(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerExport(t *testing.T) {
-	expectedURL := "/containers/container_id/export"
-	client := &Client{
-		client: newMockClient(func(r *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(r.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-			}, nil
-		}),
-	}
-	body, err := client.ContainerExport(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer body.Close()
-	content, err := ioutil.ReadAll(body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(content) != "response" {
-		t.Fatalf("expected response to contain 'response', got %s", string(content))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_inspect.go b/installer/vendor/github.com/docker/docker/client/container_inspect.go
deleted file mode 100644
index 17f1809747..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_inspect.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerInspect returns the container information.
-func (cli *Client) ContainerInspect(ctx context.Context, containerID string) (types.ContainerJSON, error) {
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ContainerJSON{}, containerNotFoundError{containerID}
-		}
-		return types.ContainerJSON{}, err
-	}
-
-	var response types.ContainerJSON
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
-
-// ContainerInspectWithRaw returns the container information and its raw representation.
-func (cli *Client) ContainerInspectWithRaw(ctx context.Context, containerID string, getSize bool) (types.ContainerJSON, []byte, error) {
-	query := url.Values{}
-	if getSize {
-		query.Set("size", "1")
-	}
-	serverResp, err := cli.get(ctx, "/containers/"+containerID+"/json", query, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ContainerJSON{}, nil, containerNotFoundError{containerID}
-		}
-		return types.ContainerJSON{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return types.ContainerJSON{}, nil, err
-	}
-
-	var response types.ContainerJSON
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_inspect_test.go b/installer/vendor/github.com/docker/docker/client/container_inspect_test.go
deleted file mode 100644
index f1a6f4ac7d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_inspect_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ContainerInspect(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerInspectContainerNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, err := client.ContainerInspect(context.Background(), "unknown")
-	if err == nil || !IsErrContainerNotFound(err) {
-		t.Fatalf("expected a containerNotFound error, got %v", err)
-	}
-}
-
-func TestContainerInspect(t *testing.T) {
-	expectedURL := "/containers/container_id/json"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(types.ContainerJSON{
-				ContainerJSONBase: &types.ContainerJSONBase{
-					ID:    "container_id",
-					Image: "image",
-					Name:  "name",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ContainerInspect(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "container_id" {
-		t.Fatalf("expected `container_id`, got %s", r.ID)
-	}
-	if r.Image != "image" {
-		t.Fatalf("expected `image`, got %s", r.ID)
-	}
-	if r.Name != "name" {
-		t.Fatalf("expected `name`, got %s", r.ID)
-	}
-}
-
-func TestContainerInspectNode(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			content, err := json.Marshal(types.ContainerJSON{
-				ContainerJSONBase: &types.ContainerJSONBase{
-					ID:    "container_id",
-					Image: "image",
-					Name:  "name",
-					Node: &types.ContainerNode{
-						ID:     "container_node_id",
-						Addr:   "container_node",
-						Labels: map[string]string{"foo": "bar"},
-					},
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ContainerInspect(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "container_id" {
-		t.Fatalf("expected `container_id`, got %s", r.ID)
-	}
-	if r.Image != "image" {
-		t.Fatalf("expected `image`, got %s", r.ID)
-	}
-	if r.Name != "name" {
-		t.Fatalf("expected `name`, got %s", r.ID)
-	}
-	if r.Node.ID != "container_node_id" {
-		t.Fatalf("expected `container_node_id`, got %s", r.Node.ID)
-	}
-	if r.Node.Addr != "container_node" {
-		t.Fatalf("expected `container_node`, got %s", r.Node.Addr)
-	}
-	foo, ok := r.Node.Labels["foo"]
-	if foo != "bar" || !ok {
-		t.Fatalf("expected `bar` for label `foo`")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_kill.go b/installer/vendor/github.com/docker/docker/client/container_kill.go
deleted file mode 100644
index 29f80c73ad..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_kill.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerKill terminates the container process but does not remove the container from the docker host.
-func (cli *Client) ContainerKill(ctx context.Context, containerID, signal string) error {
-	query := url.Values{}
-	query.Set("signal", signal)
-
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/kill", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_kill_test.go b/installer/vendor/github.com/docker/docker/client/container_kill_test.go
deleted file mode 100644
index 9477b0abd2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_kill_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerKillError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerKill(context.Background(), "nothing", "SIGKILL")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerKill(t *testing.T) {
-	expectedURL := "/containers/container_id/kill"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			signal := req.URL.Query().Get("signal")
-			if signal != "SIGKILL" {
-				return nil, fmt.Errorf("signal not set in URL query properly. Expected 'SIGKILL', got %s", signal)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.ContainerKill(context.Background(), "container_id", "SIGKILL")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_list.go b/installer/vendor/github.com/docker/docker/client/container_list.go
deleted file mode 100644
index 4398912197..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_list.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ContainerList returns the list of containers in the docker host.
-func (cli *Client) ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error) {
-	query := url.Values{}
-
-	if options.All {
-		query.Set("all", "1")
-	}
-
-	if options.Limit != -1 {
-		query.Set("limit", strconv.Itoa(options.Limit))
-	}
-
-	if options.Since != "" {
-		query.Set("since", options.Since)
-	}
-
-	if options.Before != "" {
-		query.Set("before", options.Before)
-	}
-
-	if options.Size {
-		query.Set("size", "1")
-	}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
-
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/containers/json", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var containers []types.Container
-	err = json.NewDecoder(resp.body).Decode(&containers)
-	ensureReaderClosed(resp)
-	return containers, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_list_test.go b/installer/vendor/github.com/docker/docker/client/container_list_test.go
deleted file mode 100644
index e41c6874b5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_list_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-func TestContainerListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerList(context.Background(), types.ContainerListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerList(t *testing.T) {
-	expectedURL := "/containers/json"
-	expectedFilters := `{"before":{"container":true},"label":{"label1":true,"label2":true}}`
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			query := req.URL.Query()
-			all := query.Get("all")
-			if all != "1" {
-				return nil, fmt.Errorf("all not set in URL query properly. Expected '1', got %s", all)
-			}
-			limit := query.Get("limit")
-			if limit != "0" {
-				return nil, fmt.Errorf("limit should have not be present in query. Expected '0', got %s", limit)
-			}
-			since := query.Get("since")
-			if since != "container" {
-				return nil, fmt.Errorf("since not set in URL query properly. Expected 'container', got %s", since)
-			}
-			before := query.Get("before")
-			if before != "" {
-				return nil, fmt.Errorf("before should have not be present in query, go %s", before)
-			}
-			size := query.Get("size")
-			if size != "1" {
-				return nil, fmt.Errorf("size not set in URL query properly. Expected '1', got %s", size)
-			}
-			filters := query.Get("filters")
-			if filters != expectedFilters {
-				return nil, fmt.Errorf("expected filters incoherent '%v' with actual filters %v", expectedFilters, filters)
-			}
-
-			b, err := json.Marshal([]types.Container{
-				{
-					ID: "container_id1",
-				},
-				{
-					ID: "container_id2",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-	filters.Add("before", "container")
-	containers, err := client.ContainerList(context.Background(), types.ContainerListOptions{
-		Size:    true,
-		All:     true,
-		Since:   "container",
-		Filters: filters,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(containers) != 2 {
-		t.Fatalf("expected 2 containers, got %v", containers)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_logs.go b/installer/vendor/github.com/docker/docker/client/container_logs.go
deleted file mode 100644
index 69056b6321..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_logs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// ContainerLogs returns the logs generated by a container in an io.ReadCloser.
-// It's up to the caller to close the stream.
-func (cli *Client) ContainerLogs(ctx context.Context, container string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
-	query := url.Values{}
-	if options.ShowStdout {
-		query.Set("stdout", "1")
-	}
-
-	if options.ShowStderr {
-		query.Set("stderr", "1")
-	}
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, time.Now())
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Timestamps {
-		query.Set("timestamps", "1")
-	}
-
-	if options.Details {
-		query.Set("details", "1")
-	}
-
-	if options.Follow {
-		query.Set("follow", "1")
-	}
-	query.Set("tail", options.Tail)
-
-	resp, err := cli.get(ctx, "/containers/"+container+"/logs", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_logs_test.go b/installer/vendor/github.com/docker/docker/client/container_logs_test.go
deleted file mode 100644
index 99e31842c9..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_logs_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerLogsError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerLogs(context.Background(), "container_id", types.ContainerLogsOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-	_, err = client.ContainerLogs(context.Background(), "container_id", types.ContainerLogsOptions{
-		Since: "2006-01-02TZ",
-	})
-	if err == nil || !strings.Contains(err.Error(), `parsing time "2006-01-02TZ"`) {
-		t.Fatalf("expected a 'parsing time' error, got %v", err)
-	}
-}
-
-func TestContainerLogs(t *testing.T) {
-	expectedURL := "/containers/container_id/logs"
-	cases := []struct {
-		options             types.ContainerLogsOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			expectedQueryParams: map[string]string{
-				"tail": "",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				Tail: "any",
-			},
-			expectedQueryParams: map[string]string{
-				"tail": "any",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				ShowStdout: true,
-				ShowStderr: true,
-				Timestamps: true,
-				Details:    true,
-				Follow:     true,
-			},
-			expectedQueryParams: map[string]string{
-				"tail":       "",
-				"stdout":     "1",
-				"stderr":     "1",
-				"timestamps": "1",
-				"details":    "1",
-				"follow":     "1",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				// An complete invalid date, timestamp or go duration will be
-				// passed as is
-				Since: "invalid but valid",
-			},
-			expectedQueryParams: map[string]string{
-				"tail":  "",
-				"since": "invalid but valid",
-			},
-		},
-	}
-	for _, logCase := range cases {
-		client := &Client{
-			client: newMockClient(func(r *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(r.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-				}
-				// Check query parameters
-				query := r.URL.Query()
-				for key, expected := range logCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-				}, nil
-			}),
-		}
-		body, err := client.ContainerLogs(context.Background(), "container_id", logCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer body.Close()
-		content, err := ioutil.ReadAll(body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(content) != "response" {
-			t.Fatalf("expected response to contain 'response', got %s", string(content))
-		}
-	}
-}
-
-func ExampleClient_ContainerLogs_withTimeout() {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	client, _ := NewEnvClient()
-	reader, err := client.ContainerLogs(ctx, "container_id", types.ContainerLogsOptions{})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = io.Copy(os.Stdout, reader)
-	if err != nil && err != io.EOF {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_pause.go b/installer/vendor/github.com/docker/docker/client/container_pause.go
deleted file mode 100644
index 412067a782..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_pause.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ContainerPause pauses the main process of a given container without terminating it.
-func (cli *Client) ContainerPause(ctx context.Context, containerID string) error {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/pause", nil, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_pause_test.go b/installer/vendor/github.com/docker/docker/client/container_pause_test.go
deleted file mode 100644
index 0ee2f05d7e..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_pause_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerPauseError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerPause(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerPause(t *testing.T) {
-	expectedURL := "/containers/container_id/pause"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	err := client.ContainerPause(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_prune.go b/installer/vendor/github.com/docker/docker/client/container_prune.go
deleted file mode 100644
index b582170867..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ContainersPrune requests the daemon to delete unused data
-func (cli *Client) ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error) {
-	var report types.ContainersPruneReport
-
-	if err := cli.NewVersionError("1.25", "container prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/containers/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_remove.go b/installer/vendor/github.com/docker/docker/client/container_remove.go
deleted file mode 100644
index 3a79590ced..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_remove.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerRemove kills and removes a container from the docker host.
-func (cli *Client) ContainerRemove(ctx context.Context, containerID string, options types.ContainerRemoveOptions) error {
-	query := url.Values{}
-	if options.RemoveVolumes {
-		query.Set("v", "1")
-	}
-	if options.RemoveLinks {
-		query.Set("link", "1")
-	}
-
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/containers/"+containerID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_remove_test.go b/installer/vendor/github.com/docker/docker/client/container_remove_test.go
deleted file mode 100644
index 798c08b333..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_remove_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerRemove(context.Background(), "container_id", types.ContainerRemoveOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerRemove(t *testing.T) {
-	expectedURL := "/containers/container_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			query := req.URL.Query()
-			volume := query.Get("v")
-			if volume != "1" {
-				return nil, fmt.Errorf("v (volume) not set in URL query properly. Expected '1', got %s", volume)
-			}
-			force := query.Get("force")
-			if force != "1" {
-				return nil, fmt.Errorf("force not set in URL query properly. Expected '1', got %s", force)
-			}
-			link := query.Get("link")
-			if link != "" {
-				return nil, fmt.Errorf("link should have not be present in query, go %s", link)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.ContainerRemove(context.Background(), "container_id", types.ContainerRemoveOptions{
-		RemoveVolumes: true,
-		Force:         true,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_rename.go b/installer/vendor/github.com/docker/docker/client/container_rename.go
deleted file mode 100644
index 0e718da7c6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_rename.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerRename changes the name of a given container.
-func (cli *Client) ContainerRename(ctx context.Context, containerID, newContainerName string) error {
-	query := url.Values{}
-	query.Set("name", newContainerName)
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/rename", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_rename_test.go b/installer/vendor/github.com/docker/docker/client/container_rename_test.go
deleted file mode 100644
index 732ebff5f7..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_rename_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerRenameError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerRename(context.Background(), "nothing", "newNothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerRename(t *testing.T) {
-	expectedURL := "/containers/container_id/rename"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			name := req.URL.Query().Get("name")
-			if name != "newName" {
-				return nil, fmt.Errorf("name not set in URL query properly. Expected 'newName', got %s", name)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.ContainerRename(context.Background(), "container_id", "newName")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_resize.go b/installer/vendor/github.com/docker/docker/client/container_resize.go
deleted file mode 100644
index 66c3cc1940..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_resize.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerResize changes the size of the tty for a container.
-func (cli *Client) ContainerResize(ctx context.Context, containerID string, options types.ResizeOptions) error {
-	return cli.resize(ctx, "/containers/"+containerID, options.Height, options.Width)
-}
-
-// ContainerExecResize changes the size of the tty for an exec process running inside a container.
-func (cli *Client) ContainerExecResize(ctx context.Context, execID string, options types.ResizeOptions) error {
-	return cli.resize(ctx, "/exec/"+execID, options.Height, options.Width)
-}
-
-func (cli *Client) resize(ctx context.Context, basePath string, height, width uint) error {
-	query := url.Values{}
-	query.Set("h", strconv.Itoa(int(height)))
-	query.Set("w", strconv.Itoa(int(width)))
-
-	resp, err := cli.post(ctx, basePath+"/resize", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_resize_test.go b/installer/vendor/github.com/docker/docker/client/container_resize_test.go
deleted file mode 100644
index 5b2efecdce..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_resize_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerResizeError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerResize(context.Background(), "container_id", types.ResizeOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerExecResizeError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerExecResize(context.Background(), "exec_id", types.ResizeOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerResize(t *testing.T) {
-	client := &Client{
-		client: newMockClient(resizeTransport("/containers/container_id/resize")),
-	}
-
-	err := client.ContainerResize(context.Background(), "container_id", types.ResizeOptions{
-		Height: 500,
-		Width:  600,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestContainerExecResize(t *testing.T) {
-	client := &Client{
-		client: newMockClient(resizeTransport("/exec/exec_id/resize")),
-	}
-
-	err := client.ContainerExecResize(context.Background(), "exec_id", types.ResizeOptions{
-		Height: 500,
-		Width:  600,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func resizeTransport(expectedURL string) func(req *http.Request) (*http.Response, error) {
-	return func(req *http.Request) (*http.Response, error) {
-		if !strings.HasPrefix(req.URL.Path, expectedURL) {
-			return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-		}
-		query := req.URL.Query()
-		h := query.Get("h")
-		if h != "500" {
-			return nil, fmt.Errorf("h not set in URL query properly. Expected '500', got %s", h)
-		}
-		w := query.Get("w")
-		if w != "600" {
-			return nil, fmt.Errorf("w not set in URL query properly. Expected '600', got %s", w)
-		}
-		return &http.Response{
-			StatusCode: http.StatusOK,
-			Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-		}, nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_restart.go b/installer/vendor/github.com/docker/docker/client/container_restart.go
deleted file mode 100644
index 74d7455f02..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_restart.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"time"
-
-	timetypes "github.com/docker/docker/api/types/time"
-	"golang.org/x/net/context"
-)
-
-// ContainerRestart stops and starts a container again.
-// It makes the daemon to wait for the container to be up again for
-// a specific amount of time, given the timeout.
-func (cli *Client) ContainerRestart(ctx context.Context, containerID string, timeout *time.Duration) error {
-	query := url.Values{}
-	if timeout != nil {
-		query.Set("t", timetypes.DurationToSecondsString(*timeout))
-	}
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/restart", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_restart_test.go b/installer/vendor/github.com/docker/docker/client/container_restart_test.go
deleted file mode 100644
index 8c3cfd6a6f..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_restart_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerRestartError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	timeout := 0 * time.Second
-	err := client.ContainerRestart(context.Background(), "nothing", &timeout)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerRestart(t *testing.T) {
-	expectedURL := "/containers/container_id/restart"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			t := req.URL.Query().Get("t")
-			if t != "100" {
-				return nil, fmt.Errorf("t (timeout) not set in URL query properly. Expected '100', got %s", t)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	timeout := 100 * time.Second
-	err := client.ContainerRestart(context.Background(), "container_id", &timeout)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_start.go b/installer/vendor/github.com/docker/docker/client/container_start.go
deleted file mode 100644
index b1f08de416..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_start.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ContainerStart sends a request to the docker daemon to start a container.
-func (cli *Client) ContainerStart(ctx context.Context, containerID string, options types.ContainerStartOptions) error {
-	query := url.Values{}
-	if len(options.CheckpointID) != 0 {
-		query.Set("checkpoint", options.CheckpointID)
-	}
-	if len(options.CheckpointDir) != 0 {
-		query.Set("checkpoint-dir", options.CheckpointDir)
-	}
-
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/start", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_start_test.go b/installer/vendor/github.com/docker/docker/client/container_start_test.go
deleted file mode 100644
index 5826fa8bc7..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_start_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestContainerStartError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerStart(context.Background(), "nothing", types.ContainerStartOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerStart(t *testing.T) {
-	expectedURL := "/containers/container_id/start"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			// we're not expecting any payload, but if one is supplied, check it is valid.
-			if req.Header.Get("Content-Type") == "application/json" {
-				var startConfig interface{}
-				if err := json.NewDecoder(req.Body).Decode(&startConfig); err != nil {
-					return nil, fmt.Errorf("Unable to parse json: %s", err)
-				}
-			}
-
-			checkpoint := req.URL.Query().Get("checkpoint")
-			if checkpoint != "checkpoint_id" {
-				return nil, fmt.Errorf("checkpoint not set in URL query properly. Expected 'checkpoint_id', got %s", checkpoint)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.ContainerStart(context.Background(), "container_id", types.ContainerStartOptions{CheckpointID: "checkpoint_id"})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_stats.go b/installer/vendor/github.com/docker/docker/client/container_stats.go
deleted file mode 100644
index 4758c66e32..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_stats.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerStats returns near realtime stats for a given container.
-// It's up to the caller to close the io.ReadCloser returned.
-func (cli *Client) ContainerStats(ctx context.Context, containerID string, stream bool) (types.ContainerStats, error) {
-	query := url.Values{}
-	query.Set("stream", "0")
-	if stream {
-		query.Set("stream", "1")
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+containerID+"/stats", query, nil)
-	if err != nil {
-		return types.ContainerStats{}, err
-	}
-
-	osType := getDockerOS(resp.header.Get("Server"))
-	return types.ContainerStats{Body: resp.body, OSType: osType}, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_stats_test.go b/installer/vendor/github.com/docker/docker/client/container_stats_test.go
deleted file mode 100644
index 7414f135c3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_stats_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerStatsError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerStats(context.Background(), "nothing", false)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerStats(t *testing.T) {
-	expectedURL := "/containers/container_id/stats"
-	cases := []struct {
-		stream         bool
-		expectedStream string
-	}{
-		{
-			expectedStream: "0",
-		},
-		{
-			stream:         true,
-			expectedStream: "1",
-		},
-	}
-	for _, c := range cases {
-		client := &Client{
-			client: newMockClient(func(r *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(r.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-				}
-
-				query := r.URL.Query()
-				stream := query.Get("stream")
-				if stream != c.expectedStream {
-					return nil, fmt.Errorf("stream not set in URL query properly. Expected '%s', got %s", c.expectedStream, stream)
-				}
-
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-				}, nil
-			}),
-		}
-		resp, err := client.ContainerStats(context.Background(), "container_id", c.stream)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer resp.Body.Close()
-		content, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(content) != "response" {
-			t.Fatalf("expected response to contain 'response', got %s", string(content))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_stop.go b/installer/vendor/github.com/docker/docker/client/container_stop.go
deleted file mode 100644
index b5418ae8c8..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_stop.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"time"
-
-	timetypes "github.com/docker/docker/api/types/time"
-	"golang.org/x/net/context"
-)
-
-// ContainerStop stops a container without terminating the process.
-// The process is blocked until the container stops or the timeout expires.
-func (cli *Client) ContainerStop(ctx context.Context, containerID string, timeout *time.Duration) error {
-	query := url.Values{}
-	if timeout != nil {
-		query.Set("t", timetypes.DurationToSecondsString(*timeout))
-	}
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/stop", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_stop_test.go b/installer/vendor/github.com/docker/docker/client/container_stop_test.go
deleted file mode 100644
index c32cd691c4..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_stop_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerStopError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	timeout := 0 * time.Second
-	err := client.ContainerStop(context.Background(), "nothing", &timeout)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerStop(t *testing.T) {
-	expectedURL := "/containers/container_id/stop"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			t := req.URL.Query().Get("t")
-			if t != "100" {
-				return nil, fmt.Errorf("t (timeout) not set in URL query properly. Expected '100', got %s", t)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	timeout := 100 * time.Second
-	err := client.ContainerStop(context.Background(), "container_id", &timeout)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_top.go b/installer/vendor/github.com/docker/docker/client/container_top.go
deleted file mode 100644
index 4e7270ea22..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_top.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ContainerTop shows process information from within a container.
-func (cli *Client) ContainerTop(ctx context.Context, containerID string, arguments []string) (types.ContainerProcessList, error) {
-	var response types.ContainerProcessList
-	query := url.Values{}
-	if len(arguments) > 0 {
-		query.Set("ps_args", strings.Join(arguments, " "))
-	}
-
-	resp, err := cli.get(ctx, "/containers/"+containerID+"/top", query, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_top_test.go b/installer/vendor/github.com/docker/docker/client/container_top_test.go
deleted file mode 100644
index 7802be063e..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_top_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestContainerTopError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerTop(context.Background(), "nothing", []string{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerTop(t *testing.T) {
-	expectedURL := "/containers/container_id/top"
-	expectedProcesses := [][]string{
-		{"p1", "p2"},
-		{"p3"},
-	}
-	expectedTitles := []string{"title1", "title2"}
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			query := req.URL.Query()
-			args := query.Get("ps_args")
-			if args != "arg1 arg2" {
-				return nil, fmt.Errorf("args not set in URL query properly. Expected 'arg1 arg2', got %v", args)
-			}
-
-			b, err := json.Marshal(types.ContainerProcessList{
-				Processes: [][]string{
-					{"p1", "p2"},
-					{"p3"},
-				},
-				Titles: []string{"title1", "title2"},
-			})
-			if err != nil {
-				return nil, err
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	processList, err := client.ContainerTop(context.Background(), "container_id", []string{"arg1", "arg2"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expectedProcesses, processList.Processes) {
-		t.Fatalf("Processes: expected %v, got %v", expectedProcesses, processList.Processes)
-	}
-	if !reflect.DeepEqual(expectedTitles, processList.Titles) {
-		t.Fatalf("Titles: expected %v, got %v", expectedTitles, processList.Titles)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_unpause.go b/installer/vendor/github.com/docker/docker/client/container_unpause.go
deleted file mode 100644
index 5c76211256..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_unpause.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ContainerUnpause resumes the process execution within a container
-func (cli *Client) ContainerUnpause(ctx context.Context, containerID string) error {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/unpause", nil, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_unpause_test.go b/installer/vendor/github.com/docker/docker/client/container_unpause_test.go
deleted file mode 100644
index 2c42727191..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_unpause_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerUnpauseError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	err := client.ContainerUnpause(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerUnpause(t *testing.T) {
-	expectedURL := "/containers/container_id/unpause"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-	err := client.ContainerUnpause(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_update.go b/installer/vendor/github.com/docker/docker/client/container_update.go
deleted file mode 100644
index 5082f22dfa..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_update.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-// ContainerUpdate updates resources of a container
-func (cli *Client) ContainerUpdate(ctx context.Context, containerID string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error) {
-	var response container.ContainerUpdateOKBody
-	serverResp, err := cli.post(ctx, "/containers/"+containerID+"/update", nil, updateConfig, nil)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_update_test.go b/installer/vendor/github.com/docker/docker/client/container_update_test.go
deleted file mode 100644
index 715bb7ca23..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_update_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	"golang.org/x/net/context"
-)
-
-func TestContainerUpdateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerUpdate(context.Background(), "nothing", container.UpdateConfig{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestContainerUpdate(t *testing.T) {
-	expectedURL := "/containers/container_id/update"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			b, err := json.Marshal(container.ContainerUpdateOKBody{})
-			if err != nil {
-				return nil, err
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	_, err := client.ContainerUpdate(context.Background(), "container_id", container.UpdateConfig{
-		Resources: container.Resources{
-			CPUPeriod: 1,
-		},
-		RestartPolicy: container.RestartPolicy{
-			Name: "always",
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_wait.go b/installer/vendor/github.com/docker/docker/client/container_wait.go
deleted file mode 100644
index 93212c70ee..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_wait.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-// ContainerWait pauses execution until a container exits.
-// It returns the API status code as response of its readiness.
-func (cli *Client) ContainerWait(ctx context.Context, containerID string) (int64, error) {
-	resp, err := cli.post(ctx, "/containers/"+containerID+"/wait", nil, nil, nil)
-	if err != nil {
-		return -1, err
-	}
-	defer ensureReaderClosed(resp)
-
-	var res container.ContainerWaitOKBody
-	if err := json.NewDecoder(resp.body).Decode(&res); err != nil {
-		return -1, err
-	}
-
-	return res.StatusCode, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/container_wait_test.go b/installer/vendor/github.com/docker/docker/client/container_wait_test.go
deleted file mode 100644
index 9300bc0a54..0000000000
--- a/installer/vendor/github.com/docker/docker/client/container_wait_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-
-	"golang.org/x/net/context"
-)
-
-func TestContainerWaitError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	code, err := client.ContainerWait(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-	if code != -1 {
-		t.Fatalf("expected a status code equal to '-1', got %d", code)
-	}
-}
-
-func TestContainerWait(t *testing.T) {
-	expectedURL := "/containers/container_id/wait"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			b, err := json.Marshal(container.ContainerWaitOKBody{
-				StatusCode: 15,
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	code, err := client.ContainerWait(context.Background(), "container_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if code != 15 {
-		t.Fatalf("expected a status code equal to '15', got %d", code)
-	}
-}
-
-func ExampleClient_ContainerWait_withTimeout() {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	client, _ := NewEnvClient()
-	_, err := client.ContainerWait(ctx, "container_id")
-	if err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/disk_usage.go b/installer/vendor/github.com/docker/docker/client/disk_usage.go
deleted file mode 100644
index 03c80b39af..0000000000
--- a/installer/vendor/github.com/docker/docker/client/disk_usage.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// DiskUsage requests the current data usage from the daemon
-func (cli *Client) DiskUsage(ctx context.Context) (types.DiskUsage, error) {
-	var du types.DiskUsage
-
-	serverResp, err := cli.get(ctx, "/system/df", nil, nil)
-	if err != nil {
-		return du, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&du); err != nil {
-		return du, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return du, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/errors.go b/installer/vendor/github.com/docker/docker/client/errors.go
deleted file mode 100644
index bf6923f134..0000000000
--- a/installer/vendor/github.com/docker/docker/client/errors.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/versions"
-	"github.com/pkg/errors"
-)
-
-// errConnectionFailed implements an error returned when connection failed.
-type errConnectionFailed struct {
-	host string
-}
-
-// Error returns a string representation of an errConnectionFailed
-func (err errConnectionFailed) Error() string {
-	if err.host == "" {
-		return "Cannot connect to the Docker daemon. Is the docker daemon running on this host?"
-	}
-	return fmt.Sprintf("Cannot connect to the Docker daemon at %s. Is the docker daemon running?", err.host)
-}
-
-// IsErrConnectionFailed returns true if the error is caused by connection failed.
-func IsErrConnectionFailed(err error) bool {
-	_, ok := errors.Cause(err).(errConnectionFailed)
-	return ok
-}
-
-// ErrorConnectionFailed returns an error with host in the error message when connection to docker daemon failed.
-func ErrorConnectionFailed(host string) error {
-	return errConnectionFailed{host: host}
-}
-
-type notFound interface {
-	error
-	NotFound() bool // Is the error a NotFound error
-}
-
-// IsErrNotFound returns true if the error is caused with an
-// object (image, container, network, volume, …) is not found in the docker host.
-func IsErrNotFound(err error) bool {
-	te, ok := err.(notFound)
-	return ok && te.NotFound()
-}
-
-// imageNotFoundError implements an error returned when an image is not in the docker host.
-type imageNotFoundError struct {
-	imageID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e imageNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of an imageNotFoundError
-func (e imageNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such image: %s", e.imageID)
-}
-
-// IsErrImageNotFound returns true if the error is caused
-// when an image is not found in the docker host.
-func IsErrImageNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// containerNotFoundError implements an error returned when a container is not in the docker host.
-type containerNotFoundError struct {
-	containerID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e containerNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a containerNotFoundError
-func (e containerNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such container: %s", e.containerID)
-}
-
-// IsErrContainerNotFound returns true if the error is caused
-// when a container is not found in the docker host.
-func IsErrContainerNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// networkNotFoundError implements an error returned when a network is not in the docker host.
-type networkNotFoundError struct {
-	networkID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e networkNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a networkNotFoundError
-func (e networkNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such network: %s", e.networkID)
-}
-
-// IsErrNetworkNotFound returns true if the error is caused
-// when a network is not found in the docker host.
-func IsErrNetworkNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// volumeNotFoundError implements an error returned when a volume is not in the docker host.
-type volumeNotFoundError struct {
-	volumeID string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e volumeNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a volumeNotFoundError
-func (e volumeNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such volume: %s", e.volumeID)
-}
-
-// IsErrVolumeNotFound returns true if the error is caused
-// when a volume is not found in the docker host.
-func IsErrVolumeNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
-
-// unauthorizedError represents an authorization error in a remote registry.
-type unauthorizedError struct {
-	cause error
-}
-
-// Error returns a string representation of an unauthorizedError
-func (u unauthorizedError) Error() string {
-	return u.cause.Error()
-}
-
-// IsErrUnauthorized returns true if the error is caused
-// when a remote registry authentication fails
-func IsErrUnauthorized(err error) bool {
-	_, ok := err.(unauthorizedError)
-	return ok
-}
-
-// nodeNotFoundError implements an error returned when a node is not found.
-type nodeNotFoundError struct {
-	nodeID string
-}
-
-// Error returns a string representation of a nodeNotFoundError
-func (e nodeNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such node: %s", e.nodeID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e nodeNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrNodeNotFound returns true if the error is caused
-// when a node is not found.
-func IsErrNodeNotFound(err error) bool {
-	_, ok := err.(nodeNotFoundError)
-	return ok
-}
-
-// serviceNotFoundError implements an error returned when a service is not found.
-type serviceNotFoundError struct {
-	serviceID string
-}
-
-// Error returns a string representation of a serviceNotFoundError
-func (e serviceNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such service: %s", e.serviceID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e serviceNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrServiceNotFound returns true if the error is caused
-// when a service is not found.
-func IsErrServiceNotFound(err error) bool {
-	_, ok := err.(serviceNotFoundError)
-	return ok
-}
-
-// taskNotFoundError implements an error returned when a task is not found.
-type taskNotFoundError struct {
-	taskID string
-}
-
-// Error returns a string representation of a taskNotFoundError
-func (e taskNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such task: %s", e.taskID)
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e taskNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrTaskNotFound returns true if the error is caused
-// when a task is not found.
-func IsErrTaskNotFound(err error) bool {
-	_, ok := err.(taskNotFoundError)
-	return ok
-}
-
-type pluginPermissionDenied struct {
-	name string
-}
-
-func (e pluginPermissionDenied) Error() string {
-	return "Permission denied while installing plugin " + e.name
-}
-
-// IsErrPluginPermissionDenied returns true if the error is caused
-// when a user denies a plugin's permissions
-func IsErrPluginPermissionDenied(err error) bool {
-	_, ok := err.(pluginPermissionDenied)
-	return ok
-}
-
-// NewVersionError returns an error if the APIVersion required
-// if less than the current supported version
-func (cli *Client) NewVersionError(APIrequired, feature string) error {
-	if versions.LessThan(cli.version, APIrequired) {
-		return fmt.Errorf("%q requires API version %s, but the Docker server is version %s", feature, APIrequired, cli.version)
-	}
-	return nil
-}
-
-// secretNotFoundError implements an error returned when a secret is not found.
-type secretNotFoundError struct {
-	name string
-}
-
-// Error returns a string representation of a secretNotFoundError
-func (e secretNotFoundError) Error() string {
-	return fmt.Sprintf("Error: no such secret: %s", e.name)
-}
-
-// NoFound indicates that this error type is of NotFound
-func (e secretNotFoundError) NotFound() bool {
-	return true
-}
-
-// IsErrSecretNotFound returns true if the error is caused
-// when a secret is not found.
-func IsErrSecretNotFound(err error) bool {
-	_, ok := err.(secretNotFoundError)
-	return ok
-}
-
-// pluginNotFoundError implements an error returned when a plugin is not in the docker host.
-type pluginNotFoundError struct {
-	name string
-}
-
-// NotFound indicates that this error type is of NotFound
-func (e pluginNotFoundError) NotFound() bool {
-	return true
-}
-
-// Error returns a string representation of a pluginNotFoundError
-func (e pluginNotFoundError) Error() string {
-	return fmt.Sprintf("Error: No such plugin: %s", e.name)
-}
-
-// IsErrPluginNotFound returns true if the error is caused
-// when a plugin is not found in the docker host.
-func IsErrPluginNotFound(err error) bool {
-	return IsErrNotFound(err)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/events.go b/installer/vendor/github.com/docker/docker/client/events.go
deleted file mode 100644
index af47aefa74..0000000000
--- a/installer/vendor/github.com/docker/docker/client/events.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// Events returns a stream of events in the daemon. It's up to the caller to close the stream
-// by cancelling the context. Once the stream has been completely read an io.EOF error will
-// be sent over the error channel. If an error is sent all processing will be stopped. It's up
-// to the caller to reopen the stream in the event of an error by reinvoking this method.
-func (cli *Client) Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error) {
-
-	messages := make(chan events.Message)
-	errs := make(chan error, 1)
-
-	started := make(chan struct{})
-	go func() {
-		defer close(errs)
-
-		query, err := buildEventsQueryParams(cli.version, options)
-		if err != nil {
-			close(started)
-			errs <- err
-			return
-		}
-
-		resp, err := cli.get(ctx, "/events", query, nil)
-		if err != nil {
-			close(started)
-			errs <- err
-			return
-		}
-		defer resp.body.Close()
-
-		decoder := json.NewDecoder(resp.body)
-
-		close(started)
-		for {
-			select {
-			case <-ctx.Done():
-				errs <- ctx.Err()
-				return
-			default:
-				var event events.Message
-				if err := decoder.Decode(&event); err != nil {
-					errs <- err
-					return
-				}
-
-				select {
-				case messages <- event:
-				case <-ctx.Done():
-					errs <- ctx.Err()
-					return
-				}
-			}
-		}
-	}()
-	<-started
-
-	return messages, errs
-}
-
-func buildEventsQueryParams(cliVersion string, options types.EventsOptions) (url.Values, error) {
-	query := url.Values{}
-	ref := time.Now()
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, ref)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Until != "" {
-		ts, err := timetypes.GetTimestamp(options.Until, ref)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("until", ts)
-	}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cliVersion, options.Filters)
-		if err != nil {
-			return nil, err
-		}
-		query.Set("filters", filterJSON)
-	}
-
-	return query, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/events_test.go b/installer/vendor/github.com/docker/docker/client/events_test.go
deleted file mode 100644
index ba82d2f542..0000000000
--- a/installer/vendor/github.com/docker/docker/client/events_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-)
-
-func TestEventsErrorInOptions(t *testing.T) {
-	errorCases := []struct {
-		options       types.EventsOptions
-		expectedError string
-	}{
-		{
-			options: types.EventsOptions{
-				Since: "2006-01-02TZ",
-			},
-			expectedError: `parsing time "2006-01-02TZ"`,
-		},
-		{
-			options: types.EventsOptions{
-				Until: "2006-01-02TZ",
-			},
-			expectedError: `parsing time "2006-01-02TZ"`,
-		},
-	}
-	for _, e := range errorCases {
-		client := &Client{
-			client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-		}
-		_, errs := client.Events(context.Background(), e.options)
-		err := <-errs
-		if err == nil || !strings.Contains(err.Error(), e.expectedError) {
-			t.Fatalf("expected an error %q, got %v", e.expectedError, err)
-		}
-	}
-}
-
-func TestEventsErrorFromServer(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, errs := client.Events(context.Background(), types.EventsOptions{})
-	err := <-errs
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestEvents(t *testing.T) {
-
-	expectedURL := "/events"
-
-	filters := filters.NewArgs()
-	filters.Add("type", events.ContainerEventType)
-	expectedFiltersJSON := fmt.Sprintf(`{"type":{"%s":true}}`, events.ContainerEventType)
-
-	eventsCases := []struct {
-		options             types.EventsOptions
-		events              []events.Message
-		expectedEvents      map[string]bool
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.EventsOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": expectedFiltersJSON,
-			},
-			events:         []events.Message{},
-			expectedEvents: make(map[string]bool),
-		},
-		{
-			options: types.EventsOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": expectedFiltersJSON,
-			},
-			events: []events.Message{
-				{
-					Type:   "container",
-					ID:     "1",
-					Action: "create",
-				},
-				{
-					Type:   "container",
-					ID:     "2",
-					Action: "die",
-				},
-				{
-					Type:   "container",
-					ID:     "3",
-					Action: "create",
-				},
-			},
-			expectedEvents: map[string]bool{
-				"1": true,
-				"2": true,
-				"3": true,
-			},
-		},
-	}
-
-	for _, eventsCase := range eventsCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-
-				for key, expected := range eventsCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-
-				buffer := new(bytes.Buffer)
-
-				for _, e := range eventsCase.events {
-					b, _ := json.Marshal(e)
-					buffer.Write(b)
-				}
-
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(buffer),
-				}, nil
-			}),
-		}
-
-		messages, errs := client.Events(context.Background(), eventsCase.options)
-
-	loop:
-		for {
-			select {
-			case err := <-errs:
-				if err != nil && err != io.EOF {
-					t.Fatal(err)
-				}
-
-				break loop
-			case e := <-messages:
-				_, ok := eventsCase.expectedEvents[e.ID]
-				if !ok {
-					t.Fatalf("event received not expected with action %s & id %s", e.Action, e.ID)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/hijack.go b/installer/vendor/github.com/docker/docker/client/hijack.go
deleted file mode 100644
index 74c53f52b3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/hijack.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/tlsconfig"
-	"github.com/docker/go-connections/sockets"
-	"golang.org/x/net/context"
-)
-
-// tlsClientCon holds tls information and a dialed connection.
-type tlsClientCon struct {
-	*tls.Conn
-	rawConn net.Conn
-}
-
-func (c *tlsClientCon) CloseWrite() error {
-	// Go standard tls.Conn doesn't provide the CloseWrite() method so we do it
-	// on its underlying connection.
-	if conn, ok := c.rawConn.(types.CloseWriter); ok {
-		return conn.CloseWrite()
-	}
-	return nil
-}
-
-// postHijacked sends a POST request and hijacks the connection.
-func (cli *Client) postHijacked(ctx context.Context, path string, query url.Values, body interface{}, headers map[string][]string) (types.HijackedResponse, error) {
-	bodyEncoded, err := encodeData(body)
-	if err != nil {
-		return types.HijackedResponse{}, err
-	}
-
-	apiPath := cli.getAPIPath(path, query)
-	req, err := http.NewRequest("POST", apiPath, bodyEncoded)
-	if err != nil {
-		return types.HijackedResponse{}, err
-	}
-	req = cli.addHeaders(req, headers)
-
-	req.Host = cli.addr
-	req.Header.Set("Connection", "Upgrade")
-	req.Header.Set("Upgrade", "tcp")
-
-	conn, err := dial(cli.proto, cli.addr, resolveTLSConfig(cli.client.Transport))
-	if err != nil {
-		if strings.Contains(err.Error(), "connection refused") {
-			return types.HijackedResponse{}, fmt.Errorf("Cannot connect to the Docker daemon. Is 'docker daemon' running on this host?")
-		}
-		return types.HijackedResponse{}, err
-	}
-
-	// When we set up a TCP connection for hijack, there could be long periods
-	// of inactivity (a long running command with no output) that in certain
-	// network setups may cause ECONNTIMEOUT, leaving the client in an unknown
-	// state. Setting TCP KeepAlive on the socket connection will prohibit
-	// ECONNTIMEOUT unless the socket connection truly is broken
-	if tcpConn, ok := conn.(*net.TCPConn); ok {
-		tcpConn.SetKeepAlive(true)
-		tcpConn.SetKeepAlivePeriod(30 * time.Second)
-	}
-
-	clientconn := httputil.NewClientConn(conn, nil)
-	defer clientconn.Close()
-
-	// Server hijacks the connection, error 'connection closed' expected
-	_, err = clientconn.Do(req)
-
-	rwc, br := clientconn.Hijack()
-
-	return types.HijackedResponse{Conn: rwc, Reader: br}, err
-}
-
-func tlsDial(network, addr string, config *tls.Config) (net.Conn, error) {
-	return tlsDialWithDialer(new(net.Dialer), network, addr, config)
-}
-
-// We need to copy Go's implementation of tls.Dial (pkg/cryptor/tls/tls.go) in
-// order to return our custom tlsClientCon struct which holds both the tls.Conn
-// object _and_ its underlying raw connection. The rationale for this is that
-// we need to be able to close the write end of the connection when attaching,
-// which tls.Conn does not provide.
-func tlsDialWithDialer(dialer *net.Dialer, network, addr string, config *tls.Config) (net.Conn, error) {
-	// We want the Timeout and Deadline values from dialer to cover the
-	// whole process: TCP connection and TLS handshake. This means that we
-	// also need to start our own timers now.
-	timeout := dialer.Timeout
-
-	if !dialer.Deadline.IsZero() {
-		deadlineTimeout := dialer.Deadline.Sub(time.Now())
-		if timeout == 0 || deadlineTimeout < timeout {
-			timeout = deadlineTimeout
-		}
-	}
-
-	var errChannel chan error
-
-	if timeout != 0 {
-		errChannel = make(chan error, 2)
-		time.AfterFunc(timeout, func() {
-			errChannel <- errors.New("")
-		})
-	}
-
-	proxyDialer, err := sockets.DialerFromEnvironment(dialer)
-	if err != nil {
-		return nil, err
-	}
-
-	rawConn, err := proxyDialer.Dial(network, addr)
-	if err != nil {
-		return nil, err
-	}
-	// When we set up a TCP connection for hijack, there could be long periods
-	// of inactivity (a long running command with no output) that in certain
-	// network setups may cause ECONNTIMEOUT, leaving the client in an unknown
-	// state. Setting TCP KeepAlive on the socket connection will prohibit
-	// ECONNTIMEOUT unless the socket connection truly is broken
-	if tcpConn, ok := rawConn.(*net.TCPConn); ok {
-		tcpConn.SetKeepAlive(true)
-		tcpConn.SetKeepAlivePeriod(30 * time.Second)
-	}
-
-	colonPos := strings.LastIndex(addr, ":")
-	if colonPos == -1 {
-		colonPos = len(addr)
-	}
-	hostname := addr[:colonPos]
-
-	// If no ServerName is set, infer the ServerName
-	// from the hostname we're connecting to.
-	if config.ServerName == "" {
-		// Make a copy to avoid polluting argument or default.
-		config = tlsconfig.Clone(config)
-		config.ServerName = hostname
-	}
-
-	conn := tls.Client(rawConn, config)
-
-	if timeout == 0 {
-		err = conn.Handshake()
-	} else {
-		go func() {
-			errChannel <- conn.Handshake()
-		}()
-
-		err = <-errChannel
-	}
-
-	if err != nil {
-		rawConn.Close()
-		return nil, err
-	}
-
-	// This is Docker difference with standard's crypto/tls package: returned a
-	// wrapper which holds both the TLS and raw connections.
-	return &tlsClientCon{conn, rawConn}, nil
-}
-
-func dial(proto, addr string, tlsConfig *tls.Config) (net.Conn, error) {
-	if tlsConfig != nil && proto != "unix" && proto != "npipe" {
-		// Notice this isn't Go standard's tls.Dial function
-		return tlsDial(proto, addr, tlsConfig)
-	}
-	if proto == "npipe" {
-		return sockets.DialPipe(addr, 32*time.Second)
-	}
-	return net.Dial(proto, addr)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_build.go b/installer/vendor/github.com/docker/docker/client/image_build.go
deleted file mode 100644
index 6fde75dcfd..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_build.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package client
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-)
-
-// ImageBuild sends request to the daemon to build images.
-// The Body in the response implement an io.ReadCloser and it's up to the caller to
-// close it.
-func (cli *Client) ImageBuild(ctx context.Context, buildContext io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error) {
-	query, err := cli.imageBuildOptionsToQuery(options)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-
-	headers := http.Header(make(map[string][]string))
-	buf, err := json.Marshal(options.AuthConfigs)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-	headers.Add("X-Registry-Config", base64.URLEncoding.EncodeToString(buf))
-	headers.Set("Content-Type", "application/tar")
-
-	serverResp, err := cli.postRaw(ctx, "/build", query, buildContext, headers)
-	if err != nil {
-		return types.ImageBuildResponse{}, err
-	}
-
-	osType := getDockerOS(serverResp.header.Get("Server"))
-
-	return types.ImageBuildResponse{
-		Body:   serverResp.body,
-		OSType: osType,
-	}, nil
-}
-
-func (cli *Client) imageBuildOptionsToQuery(options types.ImageBuildOptions) (url.Values, error) {
-	query := url.Values{
-		"t":           options.Tags,
-		"securityopt": options.SecurityOpt,
-	}
-	if options.SuppressOutput {
-		query.Set("q", "1")
-	}
-	if options.RemoteContext != "" {
-		query.Set("remote", options.RemoteContext)
-	}
-	if options.NoCache {
-		query.Set("nocache", "1")
-	}
-	if options.Remove {
-		query.Set("rm", "1")
-	} else {
-		query.Set("rm", "0")
-	}
-
-	if options.ForceRemove {
-		query.Set("forcerm", "1")
-	}
-
-	if options.PullParent {
-		query.Set("pull", "1")
-	}
-
-	if options.Squash {
-		if err := cli.NewVersionError("1.25", "squash"); err != nil {
-			return query, err
-		}
-		query.Set("squash", "1")
-	}
-
-	if !container.Isolation.IsDefault(options.Isolation) {
-		query.Set("isolation", string(options.Isolation))
-	}
-
-	query.Set("cpusetcpus", options.CPUSetCPUs)
-	query.Set("networkmode", options.NetworkMode)
-	query.Set("cpusetmems", options.CPUSetMems)
-	query.Set("cpushares", strconv.FormatInt(options.CPUShares, 10))
-	query.Set("cpuquota", strconv.FormatInt(options.CPUQuota, 10))
-	query.Set("cpuperiod", strconv.FormatInt(options.CPUPeriod, 10))
-	query.Set("memory", strconv.FormatInt(options.Memory, 10))
-	query.Set("memswap", strconv.FormatInt(options.MemorySwap, 10))
-	query.Set("cgroupparent", options.CgroupParent)
-	query.Set("shmsize", strconv.FormatInt(options.ShmSize, 10))
-	query.Set("dockerfile", options.Dockerfile)
-
-	ulimitsJSON, err := json.Marshal(options.Ulimits)
-	if err != nil {
-		return query, err
-	}
-	query.Set("ulimits", string(ulimitsJSON))
-
-	buildArgsJSON, err := json.Marshal(options.BuildArgs)
-	if err != nil {
-		return query, err
-	}
-	query.Set("buildargs", string(buildArgsJSON))
-
-	labelsJSON, err := json.Marshal(options.Labels)
-	if err != nil {
-		return query, err
-	}
-	query.Set("labels", string(labelsJSON))
-
-	cacheFromJSON, err := json.Marshal(options.CacheFrom)
-	if err != nil {
-		return query, err
-	}
-	query.Set("cachefrom", string(cacheFromJSON))
-
-	return query, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_build_test.go b/installer/vendor/github.com/docker/docker/client/image_build_test.go
deleted file mode 100644
index b9d04f817a..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_build_test.go
+++ /dev/null
@@ -1,233 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/go-units"
-)
-
-func TestImageBuildError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageBuild(context.Background(), nil, types.ImageBuildOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageBuild(t *testing.T) {
-	v1 := "value1"
-	v2 := "value2"
-	emptyRegistryConfig := "bnVsbA=="
-	buildCases := []struct {
-		buildOptions           types.ImageBuildOptions
-		expectedQueryParams    map[string]string
-		expectedTags           []string
-		expectedRegistryConfig string
-	}{
-		{
-			buildOptions: types.ImageBuildOptions{
-				SuppressOutput: true,
-				NoCache:        true,
-				Remove:         true,
-				ForceRemove:    true,
-				PullParent:     true,
-			},
-			expectedQueryParams: map[string]string{
-				"q":       "1",
-				"nocache": "1",
-				"rm":      "1",
-				"forcerm": "1",
-				"pull":    "1",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: emptyRegistryConfig,
-		},
-		{
-			buildOptions: types.ImageBuildOptions{
-				SuppressOutput: false,
-				NoCache:        false,
-				Remove:         false,
-				ForceRemove:    false,
-				PullParent:     false,
-			},
-			expectedQueryParams: map[string]string{
-				"q":       "",
-				"nocache": "",
-				"rm":      "0",
-				"forcerm": "",
-				"pull":    "",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: emptyRegistryConfig,
-		},
-		{
-			buildOptions: types.ImageBuildOptions{
-				RemoteContext: "remoteContext",
-				Isolation:     container.Isolation("isolation"),
-				CPUSetCPUs:    "2",
-				CPUSetMems:    "12",
-				CPUShares:     20,
-				CPUQuota:      10,
-				CPUPeriod:     30,
-				Memory:        256,
-				MemorySwap:    512,
-				ShmSize:       10,
-				CgroupParent:  "cgroup_parent",
-				Dockerfile:    "Dockerfile",
-			},
-			expectedQueryParams: map[string]string{
-				"remote":       "remoteContext",
-				"isolation":    "isolation",
-				"cpusetcpus":   "2",
-				"cpusetmems":   "12",
-				"cpushares":    "20",
-				"cpuquota":     "10",
-				"cpuperiod":    "30",
-				"memory":       "256",
-				"memswap":      "512",
-				"shmsize":      "10",
-				"cgroupparent": "cgroup_parent",
-				"dockerfile":   "Dockerfile",
-				"rm":           "0",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: emptyRegistryConfig,
-		},
-		{
-			buildOptions: types.ImageBuildOptions{
-				BuildArgs: map[string]*string{
-					"ARG1": &v1,
-					"ARG2": &v2,
-					"ARG3": nil,
-				},
-			},
-			expectedQueryParams: map[string]string{
-				"buildargs": `{"ARG1":"value1","ARG2":"value2","ARG3":null}`,
-				"rm":        "0",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: emptyRegistryConfig,
-		},
-		{
-			buildOptions: types.ImageBuildOptions{
-				Ulimits: []*units.Ulimit{
-					{
-						Name: "nproc",
-						Hard: 65557,
-						Soft: 65557,
-					},
-					{
-						Name: "nofile",
-						Hard: 20000,
-						Soft: 40000,
-					},
-				},
-			},
-			expectedQueryParams: map[string]string{
-				"ulimits": `[{"Name":"nproc","Hard":65557,"Soft":65557},{"Name":"nofile","Hard":20000,"Soft":40000}]`,
-				"rm":      "0",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: emptyRegistryConfig,
-		},
-		{
-			buildOptions: types.ImageBuildOptions{
-				AuthConfigs: map[string]types.AuthConfig{
-					"https://index.docker.io/v1/": {
-						Auth: "dG90bwo=",
-					},
-				},
-			},
-			expectedQueryParams: map[string]string{
-				"rm": "0",
-			},
-			expectedTags:           []string{},
-			expectedRegistryConfig: "eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsiYXV0aCI6ImRHOTBid289In19",
-		},
-	}
-	for _, buildCase := range buildCases {
-		expectedURL := "/build"
-		client := &Client{
-			client: newMockClient(func(r *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(r.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-				}
-				// Check request headers
-				registryConfig := r.Header.Get("X-Registry-Config")
-				if registryConfig != buildCase.expectedRegistryConfig {
-					return nil, fmt.Errorf("X-Registry-Config header not properly set in the request. Expected '%s', got %s", buildCase.expectedRegistryConfig, registryConfig)
-				}
-				contentType := r.Header.Get("Content-Type")
-				if contentType != "application/tar" {
-					return nil, fmt.Errorf("Content-type header not properly set in the request. Expected 'application/tar', got %s", contentType)
-				}
-
-				// Check query parameters
-				query := r.URL.Query()
-				for key, expected := range buildCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-
-				// Check tags
-				if len(buildCase.expectedTags) > 0 {
-					tags := query["t"]
-					if !reflect.DeepEqual(tags, buildCase.expectedTags) {
-						return nil, fmt.Errorf("t (tags) not set in URL query properly. Expected '%s', got %s", buildCase.expectedTags, tags)
-					}
-				}
-
-				headers := http.Header{}
-				headers.Add("Server", "Docker/v1.23 (MyOS)")
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-					Header:     headers,
-				}, nil
-			}),
-		}
-		buildResponse, err := client.ImageBuild(context.Background(), nil, buildCase.buildOptions)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if buildResponse.OSType != "MyOS" {
-			t.Fatalf("expected OSType to be 'MyOS', got %s", buildResponse.OSType)
-		}
-		response, err := ioutil.ReadAll(buildResponse.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		buildResponse.Body.Close()
-		if string(response) != "body" {
-			t.Fatalf("expected Body to contain 'body' string, got %s", response)
-		}
-	}
-}
-
-func TestGetDockerOS(t *testing.T) {
-	cases := map[string]string{
-		"Docker/v1.22 (linux)":   "linux",
-		"Docker/v1.22 (windows)": "windows",
-		"Foo/v1.22 (bar)":        "",
-	}
-	for header, os := range cases {
-		g := getDockerOS(header)
-		if g != os {
-			t.Fatalf("Expected %s, got %s", os, g)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_create.go b/installer/vendor/github.com/docker/docker/client/image_create.go
deleted file mode 100644
index cf023a7186..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_create.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/reference"
-)
-
-// ImageCreate creates a new image based in the parent options.
-// It returns the JSON content in the response body.
-func (cli *Client) ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error) {
-	repository, tag, err := reference.Parse(parentReference)
-	if err != nil {
-		return nil, err
-	}
-
-	query := url.Values{}
-	query.Set("fromImage", repository)
-	query.Set("tag", tag)
-	resp, err := cli.tryImageCreate(ctx, query, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryImageCreate(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/images/create", query, nil, headers)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_create_test.go b/installer/vendor/github.com/docker/docker/client/image_create_test.go
deleted file mode 100644
index 5c2edd2ad5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_create_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestImageCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageCreate(context.Background(), "reference", types.ImageCreateOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestImageCreate(t *testing.T) {
-	expectedURL := "/images/create"
-	expectedImage := "test:5000/my_image"
-	expectedTag := "sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff"
-	expectedReference := fmt.Sprintf("%s@%s", expectedImage, expectedTag)
-	expectedRegistryAuth := "eyJodHRwczovL2luZGV4LmRvY2tlci5pby92MS8iOnsiYXV0aCI6ImRHOTBid289IiwiZW1haWwiOiJqb2huQGRvZS5jb20ifX0="
-	client := &Client{
-		client: newMockClient(func(r *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(r.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-			}
-			registryAuth := r.Header.Get("X-Registry-Auth")
-			if registryAuth != expectedRegistryAuth {
-				return nil, fmt.Errorf("X-Registry-Auth header not properly set in the request. Expected '%s', got %s", expectedRegistryAuth, registryAuth)
-			}
-
-			query := r.URL.Query()
-			fromImage := query.Get("fromImage")
-			if fromImage != expectedImage {
-				return nil, fmt.Errorf("fromImage not set in URL query properly. Expected '%s', got %s", expectedImage, fromImage)
-			}
-
-			tag := query.Get("tag")
-			if tag != expectedTag {
-				return nil, fmt.Errorf("tag not set in URL query properly. Expected '%s', got %s", expectedTag, tag)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	createResponse, err := client.ImageCreate(context.Background(), expectedReference, types.ImageCreateOptions{
-		RegistryAuth: expectedRegistryAuth,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	response, err := ioutil.ReadAll(createResponse)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = createResponse.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if string(response) != "body" {
-		t.Fatalf("expected Body to contain 'body' string, got %s", response)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_history.go b/installer/vendor/github.com/docker/docker/client/image_history.go
deleted file mode 100644
index acb1ee9278..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_history.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ImageHistory returns the changes in an image in history format.
-func (cli *Client) ImageHistory(ctx context.Context, imageID string) ([]types.ImageHistory, error) {
-	var history []types.ImageHistory
-	serverResp, err := cli.get(ctx, "/images/"+imageID+"/history", url.Values{}, nil)
-	if err != nil {
-		return history, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&history)
-	ensureReaderClosed(serverResp)
-	return history, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_history_test.go b/installer/vendor/github.com/docker/docker/client/image_history_test.go
deleted file mode 100644
index 729edb1ad5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_history_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestImageHistoryError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageHistory(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestImageHistory(t *testing.T) {
-	expectedURL := "/images/image_id/history"
-	client := &Client{
-		client: newMockClient(func(r *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(r.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-			}
-			b, err := json.Marshal([]types.ImageHistory{
-				{
-					ID:   "image_id1",
-					Tags: []string{"tag1", "tag2"},
-				},
-				{
-					ID:   "image_id2",
-					Tags: []string{"tag1", "tag2"},
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-	imageHistories, err := client.ImageHistory(context.Background(), "image_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(imageHistories) != 2 {
-		t.Fatalf("expected 2 containers, got %v", imageHistories)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_import.go b/installer/vendor/github.com/docker/docker/client/image_import.go
deleted file mode 100644
index c6f154b249..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_import.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImageImport creates a new image based in the source options.
-// It returns the JSON content in the response body.
-func (cli *Client) ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options types.ImageImportOptions) (io.ReadCloser, error) {
-	if ref != "" {
-		//Check if the given image name can be resolved
-		if _, err := reference.ParseNamed(ref); err != nil {
-			return nil, err
-		}
-	}
-
-	query := url.Values{}
-	query.Set("fromSrc", source.SourceName)
-	query.Set("repo", ref)
-	query.Set("tag", options.Tag)
-	query.Set("message", options.Message)
-	for _, change := range options.Changes {
-		query.Add("changes", change)
-	}
-
-	resp, err := cli.postRaw(ctx, "/images/create", query, source.Source, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_import_test.go b/installer/vendor/github.com/docker/docker/client/image_import_test.go
deleted file mode 100644
index e309be74e6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_import_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestImageImportError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageImport(context.Background(), types.ImageImportSource{}, "image:tag", types.ImageImportOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestImageImport(t *testing.T) {
-	expectedURL := "/images/create"
-	client := &Client{
-		client: newMockClient(func(r *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(r.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-			}
-			query := r.URL.Query()
-			fromSrc := query.Get("fromSrc")
-			if fromSrc != "image_source" {
-				return nil, fmt.Errorf("fromSrc not set in URL query properly. Expected 'image_source', got %s", fromSrc)
-			}
-			repo := query.Get("repo")
-			if repo != "repository_name:imported" {
-				return nil, fmt.Errorf("repo not set in URL query properly. Expected 'repository_name', got %s", repo)
-			}
-			tag := query.Get("tag")
-			if tag != "imported" {
-				return nil, fmt.Errorf("tag not set in URL query properly. Expected 'imported', got %s", tag)
-			}
-			message := query.Get("message")
-			if message != "A message" {
-				return nil, fmt.Errorf("message not set in URL query properly. Expected 'A message', got %s", message)
-			}
-			changes := query["changes"]
-			expectedChanges := []string{"change1", "change2"}
-			if !reflect.DeepEqual(expectedChanges, changes) {
-				return nil, fmt.Errorf("changes not set in URL query properly. Expected %v, got %v", expectedChanges, changes)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-			}, nil
-		}),
-	}
-	importResponse, err := client.ImageImport(context.Background(), types.ImageImportSource{
-		Source:     strings.NewReader("source"),
-		SourceName: "image_source",
-	}, "repository_name:imported", types.ImageImportOptions{
-		Tag:     "imported",
-		Message: "A message",
-		Changes: []string{"change1", "change2"},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	response, err := ioutil.ReadAll(importResponse)
-	if err != nil {
-		t.Fatal(err)
-	}
-	importResponse.Close()
-	if string(response) != "response" {
-		t.Fatalf("expected response to contain 'response', got %s", string(response))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_inspect.go b/installer/vendor/github.com/docker/docker/client/image_inspect.go
deleted file mode 100644
index b3a64ce2f8..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_inspect.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ImageInspectWithRaw returns the image information and its raw representation.
-func (cli *Client) ImageInspectWithRaw(ctx context.Context, imageID string) (types.ImageInspect, []byte, error) {
-	serverResp, err := cli.get(ctx, "/images/"+imageID+"/json", nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return types.ImageInspect{}, nil, imageNotFoundError{imageID}
-		}
-		return types.ImageInspect{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return types.ImageInspect{}, nil, err
-	}
-
-	var response types.ImageInspect
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_inspect_test.go b/installer/vendor/github.com/docker/docker/client/image_inspect_test.go
deleted file mode 100644
index 74a4e49805..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_inspect_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestImageInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.ImageInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageInspectImageNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, _, err := client.ImageInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrImageNotFound(err) {
-		t.Fatalf("expected an imageNotFound error, got %v", err)
-	}
-}
-
-func TestImageInspect(t *testing.T) {
-	expectedURL := "/images/image_id/json"
-	expectedTags := []string{"tag1", "tag2"}
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(types.ImageInspect{
-				ID:       "image_id",
-				RepoTags: expectedTags,
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	imageInspect, _, err := client.ImageInspectWithRaw(context.Background(), "image_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if imageInspect.ID != "image_id" {
-		t.Fatalf("expected `image_id`, got %s", imageInspect.ID)
-	}
-	if !reflect.DeepEqual(imageInspect.RepoTags, expectedTags) {
-		t.Fatalf("expected `%v`, got %v", expectedTags, imageInspect.RepoTags)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_list.go b/installer/vendor/github.com/docker/docker/client/image_list.go
deleted file mode 100644
index f26464f67c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_list.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// ImageList returns a list of images in the docker host.
-func (cli *Client) ImageList(ctx context.Context, options types.ImageListOptions) ([]types.ImageSummary, error) {
-	var images []types.ImageSummary
-	query := url.Values{}
-
-	optionFilters := options.Filters
-	referenceFilters := optionFilters.Get("reference")
-	if versions.LessThan(cli.version, "1.25") && len(referenceFilters) > 0 {
-		query.Set("filter", referenceFilters[0])
-		for _, filterValue := range referenceFilters {
-			optionFilters.Del("reference", filterValue)
-		}
-	}
-	if optionFilters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, optionFilters)
-		if err != nil {
-			return images, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	if options.All {
-		query.Set("all", "1")
-	}
-
-	serverResp, err := cli.get(ctx, "/images/json", query, nil)
-	if err != nil {
-		return images, err
-	}
-
-	err = json.NewDecoder(serverResp.body).Decode(&images)
-	ensureReaderClosed(serverResp)
-	return images, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_list_test.go b/installer/vendor/github.com/docker/docker/client/image_list_test.go
deleted file mode 100644
index 7c4a46414d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_list_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-func TestImageListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ImageList(context.Background(), types.ImageListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageList(t *testing.T) {
-	expectedURL := "/images/json"
-
-	noDanglingfilters := filters.NewArgs()
-	noDanglingfilters.Add("dangling", "false")
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-	filters.Add("dangling", "true")
-
-	listCases := []struct {
-		options             types.ImageListOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.ImageListOptions{},
-			expectedQueryParams: map[string]string{
-				"all":     "",
-				"filter":  "",
-				"filters": "",
-			},
-		},
-		{
-			options: types.ImageListOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"all":     "",
-				"filter":  "",
-				"filters": `{"dangling":{"true":true},"label":{"label1":true,"label2":true}}`,
-			},
-		},
-		{
-			options: types.ImageListOptions{
-				Filters: noDanglingfilters,
-			},
-			expectedQueryParams: map[string]string{
-				"all":     "",
-				"filter":  "",
-				"filters": `{"dangling":{"false":true}}`,
-			},
-		},
-	}
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				for key, expected := range listCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				content, err := json.Marshal([]types.ImageSummary{
-					{
-						ID: "image_id2",
-					},
-					{
-						ID: "image_id2",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		images, err := client.ImageList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(images) != 2 {
-			t.Fatalf("expected 2 images, got %v", images)
-		}
-	}
-}
-
-func TestImageListApiBefore125(t *testing.T) {
-	expectedFilter := "image:tag"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			query := req.URL.Query()
-			actualFilter := query.Get("filter")
-			if actualFilter != expectedFilter {
-				return nil, fmt.Errorf("filter not set in URL query properly. Expected '%s', got %s", expectedFilter, actualFilter)
-			}
-			actualFilters := query.Get("filters")
-			if actualFilters != "" {
-				return nil, fmt.Errorf("filters should have not been present, were with value: %s", actualFilters)
-			}
-			content, err := json.Marshal([]types.ImageSummary{
-				{
-					ID: "image_id2",
-				},
-				{
-					ID: "image_id2",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-		version: "1.24",
-	}
-
-	filters := filters.NewArgs()
-	filters.Add("reference", "image:tag")
-
-	options := types.ImageListOptions{
-		Filters: filters,
-	}
-
-	images, err := client.ImageList(context.Background(), options)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(images) != 2 {
-		t.Fatalf("expected 2 images, got %v", images)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_load.go b/installer/vendor/github.com/docker/docker/client/image_load.go
deleted file mode 100644
index 77aaf1af36..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_load.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-// ImageLoad loads an image in the docker host from the client host.
-// It's up to the caller to close the io.ReadCloser in the
-// ImageLoadResponse returned by this function.
-func (cli *Client) ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error) {
-	v := url.Values{}
-	v.Set("quiet", "0")
-	if quiet {
-		v.Set("quiet", "1")
-	}
-	headers := map[string][]string{"Content-Type": {"application/x-tar"}}
-	resp, err := cli.postRaw(ctx, "/images/load", v, input, headers)
-	if err != nil {
-		return types.ImageLoadResponse{}, err
-	}
-	return types.ImageLoadResponse{
-		Body: resp.body,
-		JSON: resp.header.Get("Content-Type") == "application/json",
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_load_test.go b/installer/vendor/github.com/docker/docker/client/image_load_test.go
deleted file mode 100644
index 68dc14ff22..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_load_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestImageLoadError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ImageLoad(context.Background(), nil, true)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageLoad(t *testing.T) {
-	expectedURL := "/images/load"
-	expectedInput := "inputBody"
-	expectedOutput := "outputBody"
-	loadCases := []struct {
-		quiet                bool
-		responseContentType  string
-		expectedResponseJSON bool
-		expectedQueryParams  map[string]string
-	}{
-		{
-			quiet:                false,
-			responseContentType:  "text/plain",
-			expectedResponseJSON: false,
-			expectedQueryParams: map[string]string{
-				"quiet": "0",
-			},
-		},
-		{
-			quiet:                true,
-			responseContentType:  "application/json",
-			expectedResponseJSON: true,
-			expectedQueryParams: map[string]string{
-				"quiet": "1",
-			},
-		},
-	}
-	for _, loadCase := range loadCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				contentType := req.Header.Get("Content-Type")
-				if contentType != "application/x-tar" {
-					return nil, fmt.Errorf("content-type not set in URL headers properly. Expected 'application/x-tar', got %s", contentType)
-				}
-				query := req.URL.Query()
-				for key, expected := range loadCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				headers := http.Header{}
-				headers.Add("Content-Type", loadCase.responseContentType)
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte(expectedOutput))),
-					Header:     headers,
-				}, nil
-			}),
-		}
-
-		input := bytes.NewReader([]byte(expectedInput))
-		imageLoadResponse, err := client.ImageLoad(context.Background(), input, loadCase.quiet)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if imageLoadResponse.JSON != loadCase.expectedResponseJSON {
-			t.Fatalf("expected a JSON response, was not.")
-		}
-		body, err := ioutil.ReadAll(imageLoadResponse.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(body) != expectedOutput {
-			t.Fatalf("expected %s, got %s", expectedOutput, string(body))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_prune.go b/installer/vendor/github.com/docker/docker/client/image_prune.go
deleted file mode 100644
index 5ef98b7f02..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// ImagesPrune requests the daemon to delete unused data
-func (cli *Client) ImagesPrune(ctx context.Context, pruneFilters filters.Args) (types.ImagesPruneReport, error) {
-	var report types.ImagesPruneReport
-
-	if err := cli.NewVersionError("1.25", "image prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/images/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_pull.go b/installer/vendor/github.com/docker/docker/client/image_pull.go
deleted file mode 100644
index 3bffdb70e8..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_pull.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/reference"
-)
-
-// ImagePull requests the docker host to pull an image from a remote registry.
-// It executes the privileged function if the operation is unauthorized
-// and it tries one more time.
-// It's up to the caller to handle the io.ReadCloser and close it properly.
-//
-// FIXME(vdemeester): there is currently used in a few way in docker/docker
-// - if not in trusted content, ref is used to pass the whole reference, and tag is empty
-// - if in trusted content, ref is used to pass the reference name, and tag for the digest
-func (cli *Client) ImagePull(ctx context.Context, ref string, options types.ImagePullOptions) (io.ReadCloser, error) {
-	repository, tag, err := reference.Parse(ref)
-	if err != nil {
-		return nil, err
-	}
-
-	query := url.Values{}
-	query.Set("fromImage", repository)
-	if tag != "" && !options.All {
-		query.Set("tag", tag)
-	}
-
-	resp, err := cli.tryImageCreate(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return nil, privilegeErr
-		}
-		resp, err = cli.tryImageCreate(ctx, query, newAuthHeader)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_pull_test.go b/installer/vendor/github.com/docker/docker/client/image_pull_test.go
deleted file mode 100644
index fe6bafed97..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_pull_test.go
+++ /dev/null
@@ -1,199 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestImagePullReferenceParseError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			return nil, nil
-		}),
-	}
-	// An empty reference is an invalid reference
-	_, err := client.ImagePull(context.Background(), "", types.ImagePullOptions{})
-	if err == nil || err.Error() != "repository name must have at least one component" {
-		t.Fatalf("expected an error, got %v", err)
-	}
-}
-
-func TestImagePullAnyError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImagePullStatusUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImagePullWithUnauthorizedErrorAndPrivilegeFuncError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "", fmt.Errorf("Error requesting privilege")
-	}
-	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error requesting privilege" {
-		t.Fatalf("expected an error requesting privilege, got %v", err)
-	}
-}
-
-func TestImagePullWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "a-auth-header", nil
-	}
-	_, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImagePullWithPrivilegedFuncNoError(t *testing.T) {
-	expectedURL := "/images/create"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			auth := req.Header.Get("X-Registry-Auth")
-			if auth == "NotValid" {
-				return &http.Response{
-					StatusCode: http.StatusUnauthorized,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("Invalid credentials"))),
-				}, nil
-			}
-			if auth != "IAmValid" {
-				return nil, fmt.Errorf("Invalid auth header : expected %s, got %s", "IAmValid", auth)
-			}
-			query := req.URL.Query()
-			fromImage := query.Get("fromImage")
-			if fromImage != "myimage" {
-				return nil, fmt.Errorf("fromimage not set in URL query properly. Expected '%s', got %s", "myimage", fromImage)
-			}
-			tag := query.Get("tag")
-			if tag != "latest" {
-				return nil, fmt.Errorf("tag not set in URL query properly. Expected '%s', got %s", "latest", tag)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("hello world"))),
-			}, nil
-		}),
-	}
-	privilegeFunc := func() (string, error) {
-		return "IAmValid", nil
-	}
-	resp, err := client.ImagePull(context.Background(), "myimage", types.ImagePullOptions{
-		RegistryAuth:  "NotValid",
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	body, err := ioutil.ReadAll(resp)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(body) != "hello world" {
-		t.Fatalf("expected 'hello world', got %s", string(body))
-	}
-}
-
-func TestImagePullWithoutErrors(t *testing.T) {
-	expectedURL := "/images/create"
-	expectedOutput := "hello world"
-	pullCases := []struct {
-		all           bool
-		reference     string
-		expectedImage string
-		expectedTag   string
-	}{
-		{
-			all:           false,
-			reference:     "myimage",
-			expectedImage: "myimage",
-			expectedTag:   "latest",
-		},
-		{
-			all:           false,
-			reference:     "myimage:tag",
-			expectedImage: "myimage",
-			expectedTag:   "tag",
-		},
-		{
-			all:           true,
-			reference:     "myimage",
-			expectedImage: "myimage",
-			expectedTag:   "",
-		},
-		{
-			all:           true,
-			reference:     "myimage:anything",
-			expectedImage: "myimage",
-			expectedTag:   "",
-		},
-	}
-	for _, pullCase := range pullCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				fromImage := query.Get("fromImage")
-				if fromImage != pullCase.expectedImage {
-					return nil, fmt.Errorf("fromimage not set in URL query properly. Expected '%s', got %s", pullCase.expectedImage, fromImage)
-				}
-				tag := query.Get("tag")
-				if tag != pullCase.expectedTag {
-					return nil, fmt.Errorf("tag not set in URL query properly. Expected '%s', got %s", pullCase.expectedTag, tag)
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte(expectedOutput))),
-				}, nil
-			}),
-		}
-		resp, err := client.ImagePull(context.Background(), pullCase.reference, types.ImagePullOptions{
-			All: pullCase.all,
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-		body, err := ioutil.ReadAll(resp)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(body) != expectedOutput {
-			t.Fatalf("expected '%s', got %s", expectedOutput, string(body))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_push.go b/installer/vendor/github.com/docker/docker/client/image_push.go
deleted file mode 100644
index 8e73d28f56..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_push.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"errors"
-	"io"
-	"net/http"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-)
-
-// ImagePush requests the docker host to push an image to a remote registry.
-// It executes the privileged function if the operation is unauthorized
-// and it tries one more time.
-// It's up to the caller to handle the io.ReadCloser and close it properly.
-func (cli *Client) ImagePush(ctx context.Context, ref string, options types.ImagePushOptions) (io.ReadCloser, error) {
-	distributionRef, err := distreference.ParseNamed(ref)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, isCanonical := distributionRef.(distreference.Canonical); isCanonical {
-		return nil, errors.New("cannot push a digest reference")
-	}
-
-	var tag = ""
-	if nameTaggedRef, isNamedTagged := distributionRef.(distreference.NamedTagged); isNamedTagged {
-		tag = nameTaggedRef.Tag()
-	}
-
-	query := url.Values{}
-	query.Set("tag", tag)
-
-	resp, err := cli.tryImagePush(ctx, distributionRef.Name(), query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return nil, privilegeErr
-		}
-		resp, err = cli.tryImagePush(ctx, distributionRef.Name(), query, newAuthHeader)
-	}
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryImagePush(ctx context.Context, imageID string, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/images/"+imageID+"/push", query, nil, headers)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_push_test.go b/installer/vendor/github.com/docker/docker/client/image_push_test.go
deleted file mode 100644
index b52da8b8dc..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_push_test.go
+++ /dev/null
@@ -1,180 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestImagePushReferenceError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			return nil, nil
-		}),
-	}
-	// An empty reference is an invalid reference
-	_, err := client.ImagePush(context.Background(), "", types.ImagePushOptions{})
-	if err == nil || err.Error() != "repository name must have at least one component" {
-		t.Fatalf("expected an error, got %v", err)
-	}
-	// An canonical reference cannot be pushed
-	_, err = client.ImagePush(context.Background(), "repo@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", types.ImagePushOptions{})
-	if err == nil || err.Error() != "cannot push a digest reference" {
-		t.Fatalf("expected an error, got %v", err)
-	}
-}
-
-func TestImagePushAnyError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImagePushStatusUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImagePushWithUnauthorizedErrorAndPrivilegeFuncError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "", fmt.Errorf("Error requesting privilege")
-	}
-	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error requesting privilege" {
-		t.Fatalf("expected an error requesting privilege, got %v", err)
-	}
-}
-
-func TestImagePushWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "a-auth-header", nil
-	}
-	_, err := client.ImagePush(context.Background(), "myimage", types.ImagePushOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImagePushWithPrivilegedFuncNoError(t *testing.T) {
-	expectedURL := "/images/myimage/push"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			auth := req.Header.Get("X-Registry-Auth")
-			if auth == "NotValid" {
-				return &http.Response{
-					StatusCode: http.StatusUnauthorized,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("Invalid credentials"))),
-				}, nil
-			}
-			if auth != "IAmValid" {
-				return nil, fmt.Errorf("Invalid auth header : expected %s, got %s", "IAmValid", auth)
-			}
-			query := req.URL.Query()
-			tag := query.Get("tag")
-			if tag != "tag" {
-				return nil, fmt.Errorf("tag not set in URL query properly. Expected '%s', got %s", "tag", tag)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("hello world"))),
-			}, nil
-		}),
-	}
-	privilegeFunc := func() (string, error) {
-		return "IAmValid", nil
-	}
-	resp, err := client.ImagePush(context.Background(), "myimage:tag", types.ImagePushOptions{
-		RegistryAuth:  "NotValid",
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	body, err := ioutil.ReadAll(resp)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(body) != "hello world" {
-		t.Fatalf("expected 'hello world', got %s", string(body))
-	}
-}
-
-func TestImagePushWithoutErrors(t *testing.T) {
-	expectedOutput := "hello world"
-	expectedURLFormat := "/images/%s/push"
-	pullCases := []struct {
-		reference     string
-		expectedImage string
-		expectedTag   string
-	}{
-		{
-			reference:     "myimage",
-			expectedImage: "myimage",
-			expectedTag:   "",
-		},
-		{
-			reference:     "myimage:tag",
-			expectedImage: "myimage",
-			expectedTag:   "tag",
-		},
-	}
-	for _, pullCase := range pullCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				expectedURL := fmt.Sprintf(expectedURLFormat, pullCase.expectedImage)
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				tag := query.Get("tag")
-				if tag != pullCase.expectedTag {
-					return nil, fmt.Errorf("tag not set in URL query properly. Expected '%s', got %s", pullCase.expectedTag, tag)
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte(expectedOutput))),
-				}, nil
-			}),
-		}
-		resp, err := client.ImagePush(context.Background(), pullCase.reference, types.ImagePushOptions{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		body, err := ioutil.ReadAll(resp)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(body) != expectedOutput {
-			t.Fatalf("expected '%s', got %s", expectedOutput, string(body))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_remove.go b/installer/vendor/github.com/docker/docker/client/image_remove.go
deleted file mode 100644
index 839e5311c4..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_remove.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ImageRemove removes an image from the docker host.
-func (cli *Client) ImageRemove(ctx context.Context, imageID string, options types.ImageRemoveOptions) ([]types.ImageDelete, error) {
-	query := url.Values{}
-
-	if options.Force {
-		query.Set("force", "1")
-	}
-	if !options.PruneChildren {
-		query.Set("noprune", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/images/"+imageID, query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var dels []types.ImageDelete
-	err = json.NewDecoder(resp.body).Decode(&dels)
-	ensureReaderClosed(resp)
-	return dels, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_remove_test.go b/installer/vendor/github.com/docker/docker/client/image_remove_test.go
deleted file mode 100644
index 7b004f70e6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_remove_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestImageRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ImageRemove(context.Background(), "image_id", types.ImageRemoveOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageRemove(t *testing.T) {
-	expectedURL := "/images/image_id"
-	removeCases := []struct {
-		force               bool
-		pruneChildren       bool
-		expectedQueryParams map[string]string
-	}{
-		{
-			force:         false,
-			pruneChildren: false,
-			expectedQueryParams: map[string]string{
-				"force":   "",
-				"noprune": "1",
-			},
-		}, {
-			force:         true,
-			pruneChildren: true,
-			expectedQueryParams: map[string]string{
-				"force":   "1",
-				"noprune": "",
-			},
-		},
-	}
-	for _, removeCase := range removeCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "DELETE" {
-					return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-				}
-				query := req.URL.Query()
-				for key, expected := range removeCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				b, err := json.Marshal([]types.ImageDelete{
-					{
-						Untagged: "image_id1",
-					},
-					{
-						Deleted: "image_id",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(b)),
-				}, nil
-			}),
-		}
-		imageDeletes, err := client.ImageRemove(context.Background(), "image_id", types.ImageRemoveOptions{
-			Force:         removeCase.force,
-			PruneChildren: removeCase.pruneChildren,
-		})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(imageDeletes) != 2 {
-			t.Fatalf("expected 2 deleted images, got %v", imageDeletes)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_save.go b/installer/vendor/github.com/docker/docker/client/image_save.go
deleted file mode 100644
index ecac880a32..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_save.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// ImageSave retrieves one or more images from the docker host as an io.ReadCloser.
-// It's up to the caller to store the images and close the stream.
-func (cli *Client) ImageSave(ctx context.Context, imageIDs []string) (io.ReadCloser, error) {
-	query := url.Values{
-		"names": imageIDs,
-	}
-
-	resp, err := cli.get(ctx, "/images/get", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_save_test.go b/installer/vendor/github.com/docker/docker/client/image_save_test.go
deleted file mode 100644
index 8f0cf88640..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_save_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"strings"
-)
-
-func TestImageSaveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageSave(context.Background(), []string{"nothing"})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server error, got %v", err)
-	}
-}
-
-func TestImageSave(t *testing.T) {
-	expectedURL := "/images/get"
-	client := &Client{
-		client: newMockClient(func(r *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(r.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-			}
-			query := r.URL.Query()
-			names := query["names"]
-			expectedNames := []string{"image_id1", "image_id2"}
-			if !reflect.DeepEqual(names, expectedNames) {
-				return nil, fmt.Errorf("names not set in URL query properly. Expected %v, got %v", names, expectedNames)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-			}, nil
-		}),
-	}
-	saveResponse, err := client.ImageSave(context.Background(), []string{"image_id1", "image_id2"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	response, err := ioutil.ReadAll(saveResponse)
-	if err != nil {
-		t.Fatal(err)
-	}
-	saveResponse.Close()
-	if string(response) != "response" {
-		t.Fatalf("expected response to contain 'response', got %s", string(response))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_search.go b/installer/vendor/github.com/docker/docker/client/image_search.go
deleted file mode 100644
index b0fcd5c23d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_search.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
-)
-
-// ImageSearch makes the docker host to search by a term in a remote registry.
-// The list of results is not sorted in any fashion.
-func (cli *Client) ImageSearch(ctx context.Context, term string, options types.ImageSearchOptions) ([]registry.SearchResult, error) {
-	var results []registry.SearchResult
-	query := url.Values{}
-	query.Set("term", term)
-	query.Set("limit", fmt.Sprintf("%d", options.Limit))
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return results, err
-		}
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.tryImageSearch(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			return results, privilegeErr
-		}
-		resp, err = cli.tryImageSearch(ctx, query, newAuthHeader)
-	}
-	if err != nil {
-		return results, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&results)
-	ensureReaderClosed(resp)
-	return results, err
-}
-
-func (cli *Client) tryImageSearch(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.get(ctx, "/images/search", query, headers)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_search_test.go b/installer/vendor/github.com/docker/docker/client/image_search_test.go
deleted file mode 100644
index b17bbd8343..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_search_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"encoding/json"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-)
-
-func TestImageSearchAnyError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestImageSearchStatusUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImageSearchWithUnauthorizedErrorAndPrivilegeFuncError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "", fmt.Errorf("Error requesting privilege")
-	}
-	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error requesting privilege" {
-		t.Fatalf("expected an error requesting privilege, got %v", err)
-	}
-}
-
-func TestImageSearchWithUnauthorizedErrorAndAnotherUnauthorizedError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusUnauthorized, "Unauthorized error")),
-	}
-	privilegeFunc := func() (string, error) {
-		return "a-auth-header", nil
-	}
-	_, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err == nil || err.Error() != "Error response from daemon: Unauthorized error" {
-		t.Fatalf("expected an Unauthorized Error, got %v", err)
-	}
-}
-
-func TestImageSearchWithPrivilegedFuncNoError(t *testing.T) {
-	expectedURL := "/images/search"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			auth := req.Header.Get("X-Registry-Auth")
-			if auth == "NotValid" {
-				return &http.Response{
-					StatusCode: http.StatusUnauthorized,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("Invalid credentials"))),
-				}, nil
-			}
-			if auth != "IAmValid" {
-				return nil, fmt.Errorf("Invalid auth header : expected 'IAmValid', got %s", auth)
-			}
-			query := req.URL.Query()
-			term := query.Get("term")
-			if term != "some-image" {
-				return nil, fmt.Errorf("term not set in URL query properly. Expected 'some-image', got %s", term)
-			}
-			content, err := json.Marshal([]registry.SearchResult{
-				{
-					Name: "anything",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-	privilegeFunc := func() (string, error) {
-		return "IAmValid", nil
-	}
-	results, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
-		RegistryAuth:  "NotValid",
-		PrivilegeFunc: privilegeFunc,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(results) != 1 {
-		t.Fatalf("expected 1 result, got %v", results)
-	}
-}
-
-func TestImageSearchWithoutErrors(t *testing.T) {
-	expectedURL := "/images/search"
-	filterArgs := filters.NewArgs()
-	filterArgs.Add("is-automated", "true")
-	filterArgs.Add("stars", "3")
-
-	expectedFilters := `{"is-automated":{"true":true},"stars":{"3":true}}`
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			query := req.URL.Query()
-			term := query.Get("term")
-			if term != "some-image" {
-				return nil, fmt.Errorf("term not set in URL query properly. Expected 'some-image', got %s", term)
-			}
-			filters := query.Get("filters")
-			if filters != expectedFilters {
-				return nil, fmt.Errorf("filters not set in URL query properly. Expected '%s', got %s", expectedFilters, filters)
-			}
-			content, err := json.Marshal([]registry.SearchResult{
-				{
-					Name: "anything",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-	results, err := client.ImageSearch(context.Background(), "some-image", types.ImageSearchOptions{
-		Filters: filterArgs,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(results) != 1 {
-		t.Fatalf("expected a result, got %v", results)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_tag.go b/installer/vendor/github.com/docker/docker/client/image_tag.go
deleted file mode 100644
index bdbf94add2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_tag.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-
-	"golang.org/x/net/context"
-
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types/reference"
-)
-
-// ImageTag tags an image in the docker host
-func (cli *Client) ImageTag(ctx context.Context, imageID, ref string) error {
-	distributionRef, err := distreference.ParseNamed(ref)
-	if err != nil {
-		return fmt.Errorf("Error parsing reference: %q is not a valid repository/tag", ref)
-	}
-
-	if _, isCanonical := distributionRef.(distreference.Canonical); isCanonical {
-		return errors.New("refusing to create a tag with a digest reference")
-	}
-
-	tag := reference.GetTagFromNamedRef(distributionRef)
-
-	query := url.Values{}
-	query.Set("repo", distributionRef.Name())
-	query.Set("tag", tag)
-
-	resp, err := cli.post(ctx, "/images/"+imageID+"/tag", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/image_tag_test.go b/installer/vendor/github.com/docker/docker/client/image_tag_test.go
deleted file mode 100644
index 7925db9f1b..0000000000
--- a/installer/vendor/github.com/docker/docker/client/image_tag_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestImageTagError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.ImageTag(context.Background(), "image_id", "repo:tag")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-// Note: this is not testing all the InvalidReference as it's the reponsability
-// of distribution/reference package.
-func TestImageTagInvalidReference(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.ImageTag(context.Background(), "image_id", "aa/asdf$$^/aa")
-	if err == nil || err.Error() != `Error parsing reference: "aa/asdf$$^/aa" is not a valid repository/tag` {
-		t.Fatalf("expected ErrReferenceInvalidFormat, got %v", err)
-	}
-}
-
-func TestImageTag(t *testing.T) {
-	expectedURL := "/images/image_id/tag"
-	tagCases := []struct {
-		reference           string
-		expectedQueryParams map[string]string
-	}{
-		{
-			reference: "repository:tag1",
-			expectedQueryParams: map[string]string{
-				"repo": "repository",
-				"tag":  "tag1",
-			},
-		}, {
-			reference: "another_repository:latest",
-			expectedQueryParams: map[string]string{
-				"repo": "another_repository",
-				"tag":  "latest",
-			},
-		}, {
-			reference: "another_repository",
-			expectedQueryParams: map[string]string{
-				"repo": "another_repository",
-				"tag":  "latest",
-			},
-		}, {
-			reference: "test/another_repository",
-			expectedQueryParams: map[string]string{
-				"repo": "test/another_repository",
-				"tag":  "latest",
-			},
-		}, {
-			reference: "test/another_repository:tag1",
-			expectedQueryParams: map[string]string{
-				"repo": "test/another_repository",
-				"tag":  "tag1",
-			},
-		}, {
-			reference: "test/test/another_repository:tag1",
-			expectedQueryParams: map[string]string{
-				"repo": "test/test/another_repository",
-				"tag":  "tag1",
-			},
-		}, {
-			reference: "test:5000/test/another_repository:tag1",
-			expectedQueryParams: map[string]string{
-				"repo": "test:5000/test/another_repository",
-				"tag":  "tag1",
-			},
-		}, {
-			reference: "test:5000/test/another_repository",
-			expectedQueryParams: map[string]string{
-				"repo": "test:5000/test/another_repository",
-				"tag":  "latest",
-			},
-		},
-	}
-	for _, tagCase := range tagCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "POST" {
-					return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-				}
-				query := req.URL.Query()
-				for key, expected := range tagCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-				}, nil
-			}),
-		}
-		err := client.ImageTag(context.Background(), "image_id", tagCase.reference)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/info.go b/installer/vendor/github.com/docker/docker/client/info.go
deleted file mode 100644
index ac07961224..0000000000
--- a/installer/vendor/github.com/docker/docker/client/info.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// Info returns information about the docker server.
-func (cli *Client) Info(ctx context.Context) (types.Info, error) {
-	var info types.Info
-	serverResp, err := cli.get(ctx, "/info", url.Values{}, nil)
-	if err != nil {
-		return info, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&info); err != nil {
-		return info, fmt.Errorf("Error reading remote info: %v", err)
-	}
-
-	return info, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/info_test.go b/installer/vendor/github.com/docker/docker/client/info_test.go
deleted file mode 100644
index 79f23c8af2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/info_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestInfoServerError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.Info(context.Background())
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestInfoInvalidResponseJSONError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("invalid json"))),
-			}, nil
-		}),
-	}
-	_, err := client.Info(context.Background())
-	if err == nil || !strings.Contains(err.Error(), "invalid character") {
-		t.Fatalf("expected a 'invalid character' error, got %v", err)
-	}
-}
-
-func TestInfo(t *testing.T) {
-	expectedURL := "/info"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			info := &types.Info{
-				ID:         "daemonID",
-				Containers: 3,
-			}
-			b, err := json.Marshal(info)
-			if err != nil {
-				return nil, err
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	info, err := client.Info(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if info.ID != "daemonID" {
-		t.Fatalf("expected daemonID, got %s", info.ID)
-	}
-
-	if info.Containers != 3 {
-		t.Fatalf("expected 3 containers, got %d", info.Containers)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/interface.go b/installer/vendor/github.com/docker/docker/client/interface.go
deleted file mode 100644
index 05978039b7..0000000000
--- a/installer/vendor/github.com/docker/docker/client/interface.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package client
-
-import (
-	"io"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/api/types/swarm"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// CommonAPIClient is the common methods between stable and experimental versions of APIClient.
-type CommonAPIClient interface {
-	ContainerAPIClient
-	ImageAPIClient
-	NodeAPIClient
-	NetworkAPIClient
-	PluginAPIClient
-	ServiceAPIClient
-	SwarmAPIClient
-	SecretAPIClient
-	SystemAPIClient
-	VolumeAPIClient
-	ClientVersion() string
-	ServerVersion(ctx context.Context) (types.Version, error)
-	UpdateClientVersion(v string)
-}
-
-// ContainerAPIClient defines API client methods for the containers
-type ContainerAPIClient interface {
-	ContainerAttach(ctx context.Context, container string, options types.ContainerAttachOptions) (types.HijackedResponse, error)
-	ContainerCommit(ctx context.Context, container string, options types.ContainerCommitOptions) (types.IDResponse, error)
-	ContainerCreate(ctx context.Context, config *container.Config, hostConfig *container.HostConfig, networkingConfig *network.NetworkingConfig, containerName string) (container.ContainerCreateCreatedBody, error)
-	ContainerDiff(ctx context.Context, container string) ([]types.ContainerChange, error)
-	ContainerExecAttach(ctx context.Context, execID string, config types.ExecConfig) (types.HijackedResponse, error)
-	ContainerExecCreate(ctx context.Context, container string, config types.ExecConfig) (types.IDResponse, error)
-	ContainerExecInspect(ctx context.Context, execID string) (types.ContainerExecInspect, error)
-	ContainerExecResize(ctx context.Context, execID string, options types.ResizeOptions) error
-	ContainerExecStart(ctx context.Context, execID string, config types.ExecStartCheck) error
-	ContainerExport(ctx context.Context, container string) (io.ReadCloser, error)
-	ContainerInspect(ctx context.Context, container string) (types.ContainerJSON, error)
-	ContainerInspectWithRaw(ctx context.Context, container string, getSize bool) (types.ContainerJSON, []byte, error)
-	ContainerKill(ctx context.Context, container, signal string) error
-	ContainerList(ctx context.Context, options types.ContainerListOptions) ([]types.Container, error)
-	ContainerLogs(ctx context.Context, container string, options types.ContainerLogsOptions) (io.ReadCloser, error)
-	ContainerPause(ctx context.Context, container string) error
-	ContainerRemove(ctx context.Context, container string, options types.ContainerRemoveOptions) error
-	ContainerRename(ctx context.Context, container, newContainerName string) error
-	ContainerResize(ctx context.Context, container string, options types.ResizeOptions) error
-	ContainerRestart(ctx context.Context, container string, timeout *time.Duration) error
-	ContainerStatPath(ctx context.Context, container, path string) (types.ContainerPathStat, error)
-	ContainerStats(ctx context.Context, container string, stream bool) (types.ContainerStats, error)
-	ContainerStart(ctx context.Context, container string, options types.ContainerStartOptions) error
-	ContainerStop(ctx context.Context, container string, timeout *time.Duration) error
-	ContainerTop(ctx context.Context, container string, arguments []string) (types.ContainerProcessList, error)
-	ContainerUnpause(ctx context.Context, container string) error
-	ContainerUpdate(ctx context.Context, container string, updateConfig container.UpdateConfig) (container.ContainerUpdateOKBody, error)
-	ContainerWait(ctx context.Context, container string) (int64, error)
-	CopyFromContainer(ctx context.Context, container, srcPath string) (io.ReadCloser, types.ContainerPathStat, error)
-	CopyToContainer(ctx context.Context, container, path string, content io.Reader, options types.CopyToContainerOptions) error
-	ContainersPrune(ctx context.Context, pruneFilters filters.Args) (types.ContainersPruneReport, error)
-}
-
-// ImageAPIClient defines API client methods for the images
-type ImageAPIClient interface {
-	ImageBuild(ctx context.Context, context io.Reader, options types.ImageBuildOptions) (types.ImageBuildResponse, error)
-	ImageCreate(ctx context.Context, parentReference string, options types.ImageCreateOptions) (io.ReadCloser, error)
-	ImageHistory(ctx context.Context, image string) ([]types.ImageHistory, error)
-	ImageImport(ctx context.Context, source types.ImageImportSource, ref string, options types.ImageImportOptions) (io.ReadCloser, error)
-	ImageInspectWithRaw(ctx context.Context, image string) (types.ImageInspect, []byte, error)
-	ImageList(ctx context.Context, options types.ImageListOptions) ([]types.ImageSummary, error)
-	ImageLoad(ctx context.Context, input io.Reader, quiet bool) (types.ImageLoadResponse, error)
-	ImagePull(ctx context.Context, ref string, options types.ImagePullOptions) (io.ReadCloser, error)
-	ImagePush(ctx context.Context, ref string, options types.ImagePushOptions) (io.ReadCloser, error)
-	ImageRemove(ctx context.Context, image string, options types.ImageRemoveOptions) ([]types.ImageDelete, error)
-	ImageSearch(ctx context.Context, term string, options types.ImageSearchOptions) ([]registry.SearchResult, error)
-	ImageSave(ctx context.Context, images []string) (io.ReadCloser, error)
-	ImageTag(ctx context.Context, image, ref string) error
-	ImagesPrune(ctx context.Context, pruneFilter filters.Args) (types.ImagesPruneReport, error)
-}
-
-// NetworkAPIClient defines API client methods for the networks
-type NetworkAPIClient interface {
-	NetworkConnect(ctx context.Context, networkID, container string, config *network.EndpointSettings) error
-	NetworkCreate(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error)
-	NetworkDisconnect(ctx context.Context, networkID, container string, force bool) error
-	NetworkInspect(ctx context.Context, networkID string) (types.NetworkResource, error)
-	NetworkInspectWithRaw(ctx context.Context, networkID string) (types.NetworkResource, []byte, error)
-	NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error)
-	NetworkRemove(ctx context.Context, networkID string) error
-	NetworksPrune(ctx context.Context, pruneFilter filters.Args) (types.NetworksPruneReport, error)
-}
-
-// NodeAPIClient defines API client methods for the nodes
-type NodeAPIClient interface {
-	NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error)
-	NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error)
-	NodeRemove(ctx context.Context, nodeID string, options types.NodeRemoveOptions) error
-	NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error
-}
-
-// PluginAPIClient defines API client methods for the plugins
-type PluginAPIClient interface {
-	PluginList(ctx context.Context) (types.PluginsListResponse, error)
-	PluginRemove(ctx context.Context, name string, options types.PluginRemoveOptions) error
-	PluginEnable(ctx context.Context, name string, options types.PluginEnableOptions) error
-	PluginDisable(ctx context.Context, name string, options types.PluginDisableOptions) error
-	PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) (io.ReadCloser, error)
-	PluginUpgrade(ctx context.Context, name string, options types.PluginInstallOptions) (io.ReadCloser, error)
-	PluginPush(ctx context.Context, name string, registryAuth string) (io.ReadCloser, error)
-	PluginSet(ctx context.Context, name string, args []string) error
-	PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error)
-	PluginCreate(ctx context.Context, createContext io.Reader, options types.PluginCreateOptions) error
-}
-
-// ServiceAPIClient defines API client methods for the services
-type ServiceAPIClient interface {
-	ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options types.ServiceCreateOptions) (types.ServiceCreateResponse, error)
-	ServiceInspectWithRaw(ctx context.Context, serviceID string) (swarm.Service, []byte, error)
-	ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error)
-	ServiceRemove(ctx context.Context, serviceID string) error
-	ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (types.ServiceUpdateResponse, error)
-	ServiceLogs(ctx context.Context, serviceID string, options types.ContainerLogsOptions) (io.ReadCloser, error)
-	TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error)
-	TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error)
-}
-
-// SwarmAPIClient defines API client methods for the swarm
-type SwarmAPIClient interface {
-	SwarmInit(ctx context.Context, req swarm.InitRequest) (string, error)
-	SwarmJoin(ctx context.Context, req swarm.JoinRequest) error
-	SwarmGetUnlockKey(ctx context.Context) (types.SwarmUnlockKeyResponse, error)
-	SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error
-	SwarmLeave(ctx context.Context, force bool) error
-	SwarmInspect(ctx context.Context) (swarm.Swarm, error)
-	SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error
-}
-
-// SystemAPIClient defines API client methods for the system
-type SystemAPIClient interface {
-	Events(ctx context.Context, options types.EventsOptions) (<-chan events.Message, <-chan error)
-	Info(ctx context.Context) (types.Info, error)
-	RegistryLogin(ctx context.Context, auth types.AuthConfig) (registry.AuthenticateOKBody, error)
-	DiskUsage(ctx context.Context) (types.DiskUsage, error)
-	Ping(ctx context.Context) (types.Ping, error)
-}
-
-// VolumeAPIClient defines API client methods for the volumes
-type VolumeAPIClient interface {
-	VolumeCreate(ctx context.Context, options volumetypes.VolumesCreateBody) (types.Volume, error)
-	VolumeInspect(ctx context.Context, volumeID string) (types.Volume, error)
-	VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error)
-	VolumeList(ctx context.Context, filter filters.Args) (volumetypes.VolumesListOKBody, error)
-	VolumeRemove(ctx context.Context, volumeID string, force bool) error
-	VolumesPrune(ctx context.Context, pruneFilter filters.Args) (types.VolumesPruneReport, error)
-}
-
-// SecretAPIClient defines API client methods for secrets
-type SecretAPIClient interface {
-	SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error)
-	SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error)
-	SecretRemove(ctx context.Context, id string) error
-	SecretInspectWithRaw(ctx context.Context, name string) (swarm.Secret, []byte, error)
-	SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error
-}
diff --git a/installer/vendor/github.com/docker/docker/client/interface_experimental.go b/installer/vendor/github.com/docker/docker/client/interface_experimental.go
deleted file mode 100644
index 51da98ecdd..0000000000
--- a/installer/vendor/github.com/docker/docker/client/interface_experimental.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-type apiClientExperimental interface {
-	CheckpointAPIClient
-}
-
-// CheckpointAPIClient defines API client methods for the checkpoints
-type CheckpointAPIClient interface {
-	CheckpointCreate(ctx context.Context, container string, options types.CheckpointCreateOptions) error
-	CheckpointDelete(ctx context.Context, container string, options types.CheckpointDeleteOptions) error
-	CheckpointList(ctx context.Context, container string, options types.CheckpointListOptions) ([]types.Checkpoint, error)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/interface_stable.go b/installer/vendor/github.com/docker/docker/client/interface_stable.go
deleted file mode 100644
index cc90a3cbb9..0000000000
--- a/installer/vendor/github.com/docker/docker/client/interface_stable.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-// APIClient is an interface that clients that talk with a docker server must implement.
-type APIClient interface {
-	CommonAPIClient
-	apiClientExperimental
-}
-
-// Ensure that Client always implements APIClient.
-var _ APIClient = &Client{}
diff --git a/installer/vendor/github.com/docker/docker/client/login.go b/installer/vendor/github.com/docker/docker/client/login.go
deleted file mode 100644
index 600dc7196f..0000000000
--- a/installer/vendor/github.com/docker/docker/client/login.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/registry"
-	"golang.org/x/net/context"
-)
-
-// RegistryLogin authenticates the docker server with a given docker registry.
-// It returns UnauthorizerError when the authentication fails.
-func (cli *Client) RegistryLogin(ctx context.Context, auth types.AuthConfig) (registry.AuthenticateOKBody, error) {
-	resp, err := cli.post(ctx, "/auth", url.Values{}, auth, nil)
-
-	if resp.statusCode == http.StatusUnauthorized {
-		return registry.AuthenticateOKBody{}, unauthorizedError{err}
-	}
-	if err != nil {
-		return registry.AuthenticateOKBody{}, err
-	}
-
-	var response registry.AuthenticateOKBody
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_connect.go b/installer/vendor/github.com/docker/docker/client/network_connect.go
deleted file mode 100644
index c022c17b5b..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_connect.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	"golang.org/x/net/context"
-)
-
-// NetworkConnect connects a container to an existent network in the docker host.
-func (cli *Client) NetworkConnect(ctx context.Context, networkID, containerID string, config *network.EndpointSettings) error {
-	nc := types.NetworkConnect{
-		Container:      containerID,
-		EndpointConfig: config,
-	}
-	resp, err := cli.post(ctx, "/networks/"+networkID+"/connect", nil, nc, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_connect_test.go b/installer/vendor/github.com/docker/docker/client/network_connect_test.go
deleted file mode 100644
index d472f4520c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_connect_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-)
-
-func TestNetworkConnectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.NetworkConnect(context.Background(), "network_id", "container_id", nil)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkConnectEmptyNilEndpointSettings(t *testing.T) {
-	expectedURL := "/networks/network_id/connect"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			var connect types.NetworkConnect
-			if err := json.NewDecoder(req.Body).Decode(&connect); err != nil {
-				return nil, err
-			}
-
-			if connect.Container != "container_id" {
-				return nil, fmt.Errorf("expected 'container_id', got %s", connect.Container)
-			}
-
-			if connect.EndpointConfig != nil {
-				return nil, fmt.Errorf("expected connect.EndpointConfig to be nil, got %v", connect.EndpointConfig)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.NetworkConnect(context.Background(), "network_id", "container_id", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestNetworkConnect(t *testing.T) {
-	expectedURL := "/networks/network_id/connect"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			var connect types.NetworkConnect
-			if err := json.NewDecoder(req.Body).Decode(&connect); err != nil {
-				return nil, err
-			}
-
-			if connect.Container != "container_id" {
-				return nil, fmt.Errorf("expected 'container_id', got %s", connect.Container)
-			}
-
-			if connect.EndpointConfig.NetworkID != "NetworkID" {
-				return nil, fmt.Errorf("expected 'NetworkID', got %s", connect.EndpointConfig.NetworkID)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.NetworkConnect(context.Background(), "network_id", "container_id", &network.EndpointSettings{
-		NetworkID: "NetworkID",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_create.go b/installer/vendor/github.com/docker/docker/client/network_create.go
deleted file mode 100644
index 4067a541ff..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_create.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkCreate creates a new network in the docker host.
-func (cli *Client) NetworkCreate(ctx context.Context, name string, options types.NetworkCreate) (types.NetworkCreateResponse, error) {
-	networkCreateRequest := types.NetworkCreateRequest{
-		NetworkCreate: options,
-		Name:          name,
-	}
-	var response types.NetworkCreateResponse
-	serverResp, err := cli.post(ctx, "/networks/create", nil, networkCreateRequest, nil)
-	if err != nil {
-		return response, err
-	}
-
-	json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_create_test.go b/installer/vendor/github.com/docker/docker/client/network_create_test.go
deleted file mode 100644
index 0e2457f89c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_create_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestNetworkCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.NetworkCreate(context.Background(), "mynetwork", types.NetworkCreate{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkCreate(t *testing.T) {
-	expectedURL := "/networks/create"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			content, err := json.Marshal(types.NetworkCreateResponse{
-				ID:      "network_id",
-				Warning: "warning",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	networkResponse, err := client.NetworkCreate(context.Background(), "mynetwork", types.NetworkCreate{
-		CheckDuplicate: true,
-		Driver:         "mydriver",
-		EnableIPv6:     true,
-		Internal:       true,
-		Options: map[string]string{
-			"opt-key": "opt-value",
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if networkResponse.ID != "network_id" {
-		t.Fatalf("expected networkResponse.ID to be 'network_id', got %s", networkResponse.ID)
-	}
-	if networkResponse.Warning != "warning" {
-		t.Fatalf("expected networkResponse.Warning to be 'warning', got %s", networkResponse.Warning)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_disconnect.go b/installer/vendor/github.com/docker/docker/client/network_disconnect.go
deleted file mode 100644
index 24b58e3c12..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_disconnect.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkDisconnect disconnects a container from an existent network in the docker host.
-func (cli *Client) NetworkDisconnect(ctx context.Context, networkID, containerID string, force bool) error {
-	nd := types.NetworkDisconnect{Container: containerID, Force: force}
-	resp, err := cli.post(ctx, "/networks/"+networkID+"/disconnect", nil, nd, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_disconnect_test.go b/installer/vendor/github.com/docker/docker/client/network_disconnect_test.go
deleted file mode 100644
index b54a2b1ccf..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_disconnect_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestNetworkDisconnectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.NetworkDisconnect(context.Background(), "network_id", "container_id", false)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkDisconnect(t *testing.T) {
-	expectedURL := "/networks/network_id/disconnect"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			var disconnect types.NetworkDisconnect
-			if err := json.NewDecoder(req.Body).Decode(&disconnect); err != nil {
-				return nil, err
-			}
-
-			if disconnect.Container != "container_id" {
-				return nil, fmt.Errorf("expected 'container_id', got %s", disconnect.Container)
-			}
-
-			if !disconnect.Force {
-				return nil, fmt.Errorf("expected Force to be true, got %v", disconnect.Force)
-			}
-
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.NetworkDisconnect(context.Background(), "network_id", "container_id", true)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_inspect.go b/installer/vendor/github.com/docker/docker/client/network_inspect.go
deleted file mode 100644
index 5ad4ea5bf3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_inspect.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// NetworkInspect returns the information for a specific network configured in the docker host.
-func (cli *Client) NetworkInspect(ctx context.Context, networkID string) (types.NetworkResource, error) {
-	networkResource, _, err := cli.NetworkInspectWithRaw(ctx, networkID)
-	return networkResource, err
-}
-
-// NetworkInspectWithRaw returns the information for a specific network configured in the docker host and its raw representation.
-func (cli *Client) NetworkInspectWithRaw(ctx context.Context, networkID string) (types.NetworkResource, []byte, error) {
-	var networkResource types.NetworkResource
-	resp, err := cli.get(ctx, "/networks/"+networkID, nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return networkResource, nil, networkNotFoundError{networkID}
-		}
-		return networkResource, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return networkResource, nil, err
-	}
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&networkResource)
-	return networkResource, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_inspect_test.go b/installer/vendor/github.com/docker/docker/client/network_inspect_test.go
deleted file mode 100644
index 1f926d66ba..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_inspect_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestNetworkInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.NetworkInspect(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkInspectContainerNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, err := client.NetworkInspect(context.Background(), "unknown")
-	if err == nil || !IsErrNetworkNotFound(err) {
-		t.Fatalf("expected a containerNotFound error, got %v", err)
-	}
-}
-
-func TestNetworkInspect(t *testing.T) {
-	expectedURL := "/networks/network_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "GET" {
-				return nil, fmt.Errorf("expected GET method, got %s", req.Method)
-			}
-
-			content, err := json.Marshal(types.NetworkResource{
-				Name: "mynetwork",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	r, err := client.NetworkInspect(context.Background(), "network_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.Name != "mynetwork" {
-		t.Fatalf("expected `mynetwork`, got %s", r.Name)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_list.go b/installer/vendor/github.com/docker/docker/client/network_list.go
deleted file mode 100644
index e566a93e23..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_list.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// NetworkList returns the list of networks configured in the docker host.
-func (cli *Client) NetworkList(ctx context.Context, options types.NetworkListOptions) ([]types.NetworkResource, error) {
-	query := url.Values{}
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-	var networkResources []types.NetworkResource
-	resp, err := cli.get(ctx, "/networks", query, nil)
-	if err != nil {
-		return networkResources, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&networkResources)
-	ensureReaderClosed(resp)
-	return networkResources, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_list_test.go b/installer/vendor/github.com/docker/docker/client/network_list_test.go
deleted file mode 100644
index 4d443496ac..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_list_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-func TestNetworkListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.NetworkList(context.Background(), types.NetworkListOptions{
-		Filters: filters.NewArgs(),
-	})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkList(t *testing.T) {
-	expectedURL := "/networks"
-
-	noDanglingFilters := filters.NewArgs()
-	noDanglingFilters.Add("dangling", "false")
-
-	danglingFilters := filters.NewArgs()
-	danglingFilters.Add("dangling", "true")
-
-	labelFilters := filters.NewArgs()
-	labelFilters.Add("label", "label1")
-	labelFilters.Add("label", "label2")
-
-	listCases := []struct {
-		options         types.NetworkListOptions
-		expectedFilters string
-	}{
-		{
-			options: types.NetworkListOptions{
-				Filters: filters.NewArgs(),
-			},
-			expectedFilters: "",
-		}, {
-			options: types.NetworkListOptions{
-				Filters: noDanglingFilters,
-			},
-			expectedFilters: `{"dangling":{"false":true}}`,
-		}, {
-			options: types.NetworkListOptions{
-				Filters: danglingFilters,
-			},
-			expectedFilters: `{"dangling":{"true":true}}`,
-		}, {
-			options: types.NetworkListOptions{
-				Filters: labelFilters,
-			},
-			expectedFilters: `{"label":{"label1":true,"label2":true}}`,
-		},
-	}
-
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "GET" {
-					return nil, fmt.Errorf("expected GET method, got %s", req.Method)
-				}
-				query := req.URL.Query()
-				actualFilters := query.Get("filters")
-				if actualFilters != listCase.expectedFilters {
-					return nil, fmt.Errorf("filters not set in URL query properly. Expected '%s', got %s", listCase.expectedFilters, actualFilters)
-				}
-				content, err := json.Marshal([]types.NetworkResource{
-					{
-						Name:   "network",
-						Driver: "bridge",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		networkResources, err := client.NetworkList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(networkResources) != 1 {
-			t.Fatalf("expected 1 network resource, got %v", networkResources)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_prune.go b/installer/vendor/github.com/docker/docker/client/network_prune.go
deleted file mode 100644
index 7352a7f0c5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// NetworksPrune requests the daemon to delete unused networks
-func (cli *Client) NetworksPrune(ctx context.Context, pruneFilters filters.Args) (types.NetworksPruneReport, error) {
-	var report types.NetworksPruneReport
-
-	if err := cli.NewVersionError("1.25", "network prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/networks/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving network prune report: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_remove.go b/installer/vendor/github.com/docker/docker/client/network_remove.go
deleted file mode 100644
index 6bd6748924..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// NetworkRemove removes an existent network from the docker host.
-func (cli *Client) NetworkRemove(ctx context.Context, networkID string) error {
-	resp, err := cli.delete(ctx, "/networks/"+networkID, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/network_remove_test.go b/installer/vendor/github.com/docker/docker/client/network_remove_test.go
deleted file mode 100644
index 2a7b9640c1..0000000000
--- a/installer/vendor/github.com/docker/docker/client/network_remove_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestNetworkRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.NetworkRemove(context.Background(), "network_id")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNetworkRemove(t *testing.T) {
-	expectedURL := "/networks/network_id"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.NetworkRemove(context.Background(), "network_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_inspect.go b/installer/vendor/github.com/docker/docker/client/node_inspect.go
deleted file mode 100644
index abf505d29c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_inspect.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeInspectWithRaw returns the node information.
-func (cli *Client) NodeInspectWithRaw(ctx context.Context, nodeID string) (swarm.Node, []byte, error) {
-	serverResp, err := cli.get(ctx, "/nodes/"+nodeID, nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Node{}, nil, nodeNotFoundError{nodeID}
-		}
-		return swarm.Node{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Node{}, nil, err
-	}
-
-	var response swarm.Node
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_inspect_test.go b/installer/vendor/github.com/docker/docker/client/node_inspect_test.go
deleted file mode 100644
index fc13283084..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_inspect_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestNodeInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.NodeInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNodeInspectNodeNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, _, err := client.NodeInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrNodeNotFound(err) {
-		t.Fatalf("expected an nodeNotFoundError error, got %v", err)
-	}
-}
-
-func TestNodeInspect(t *testing.T) {
-	expectedURL := "/nodes/node_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(swarm.Node{
-				ID: "node_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	nodeInspect, _, err := client.NodeInspectWithRaw(context.Background(), "node_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if nodeInspect.ID != "node_id" {
-		t.Fatalf("expected `node_id`, got %s", nodeInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_list.go b/installer/vendor/github.com/docker/docker/client/node_list.go
deleted file mode 100644
index 3e8440f08e..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_list.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeList returns the list of nodes.
-func (cli *Client) NodeList(ctx context.Context, options types.NodeListOptions) ([]swarm.Node, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/nodes", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var nodes []swarm.Node
-	err = json.NewDecoder(resp.body).Decode(&nodes)
-	ensureReaderClosed(resp)
-	return nodes, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_list_test.go b/installer/vendor/github.com/docker/docker/client/node_list_test.go
deleted file mode 100644
index 0251b5cce4..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_list_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestNodeListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.NodeList(context.Background(), types.NodeListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNodeList(t *testing.T) {
-	expectedURL := "/nodes"
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-
-	listCases := []struct {
-		options             types.NodeListOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.NodeListOptions{},
-			expectedQueryParams: map[string]string{
-				"filters": "",
-			},
-		},
-		{
-			options: types.NodeListOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": `{"label":{"label1":true,"label2":true}}`,
-			},
-		},
-	}
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				for key, expected := range listCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				content, err := json.Marshal([]swarm.Node{
-					{
-						ID: "node_id1",
-					},
-					{
-						ID: "node_id2",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		nodes, err := client.NodeList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(nodes) != 2 {
-			t.Fatalf("expected 2 nodes, got %v", nodes)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_remove.go b/installer/vendor/github.com/docker/docker/client/node_remove.go
deleted file mode 100644
index 0a77f3d578..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_remove.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-// NodeRemove removes a Node.
-func (cli *Client) NodeRemove(ctx context.Context, nodeID string, options types.NodeRemoveOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/nodes/"+nodeID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_remove_test.go b/installer/vendor/github.com/docker/docker/client/node_remove_test.go
deleted file mode 100644
index f2f8adc4a3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_remove_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-func TestNodeRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.NodeRemove(context.Background(), "node_id", types.NodeRemoveOptions{Force: false})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNodeRemove(t *testing.T) {
-	expectedURL := "/nodes/node_id"
-
-	removeCases := []struct {
-		force         bool
-		expectedForce string
-	}{
-		{
-			expectedForce: "",
-		},
-		{
-			force:         true,
-			expectedForce: "1",
-		},
-	}
-
-	for _, removeCase := range removeCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "DELETE" {
-					return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-				}
-				force := req.URL.Query().Get("force")
-				if force != removeCase.expectedForce {
-					return nil, fmt.Errorf("force not set in URL query properly. expected '%s', got %s", removeCase.expectedForce, force)
-				}
-
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-				}, nil
-			}),
-		}
-
-		err := client.NodeRemove(context.Background(), "node_id", types.NodeRemoveOptions{Force: removeCase.force})
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_update.go b/installer/vendor/github.com/docker/docker/client/node_update.go
deleted file mode 100644
index 3ca9760282..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_update.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// NodeUpdate updates a Node.
-func (cli *Client) NodeUpdate(ctx context.Context, nodeID string, version swarm.Version, node swarm.NodeSpec) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	resp, err := cli.post(ctx, "/nodes/"+nodeID+"/update", query, node, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/node_update_test.go b/installer/vendor/github.com/docker/docker/client/node_update_test.go
deleted file mode 100644
index 613ff104eb..0000000000
--- a/installer/vendor/github.com/docker/docker/client/node_update_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestNodeUpdateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.NodeUpdate(context.Background(), "node_id", swarm.Version{}, swarm.NodeSpec{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestNodeUpdate(t *testing.T) {
-	expectedURL := "/nodes/node_id/update"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.NodeUpdate(context.Background(), "node_id", swarm.Version{}, swarm.NodeSpec{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/ping.go b/installer/vendor/github.com/docker/docker/client/ping.go
deleted file mode 100644
index 22dcda24fd..0000000000
--- a/installer/vendor/github.com/docker/docker/client/ping.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// Ping pings the server and return the value of the "Docker-Experimental" & "API-Version" headers
-func (cli *Client) Ping(ctx context.Context) (types.Ping, error) {
-	var ping types.Ping
-	req, err := cli.buildRequest("GET", fmt.Sprintf("%s/_ping", cli.basePath), nil, nil)
-	if err != nil {
-		return ping, err
-	}
-	serverResp, err := cli.doRequest(ctx, req)
-	if err != nil {
-		return ping, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	ping.APIVersion = serverResp.header.Get("API-Version")
-
-	if serverResp.header.Get("Docker-Experimental") == "true" {
-		ping.Experimental = true
-	}
-
-	return ping, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_create.go b/installer/vendor/github.com/docker/docker/client/plugin_create.go
deleted file mode 100644
index a660ba5733..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_create.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginCreate creates a plugin
-func (cli *Client) PluginCreate(ctx context.Context, createContext io.Reader, createOptions types.PluginCreateOptions) error {
-	headers := http.Header(make(map[string][]string))
-	headers.Set("Content-Type", "application/tar")
-
-	query := url.Values{}
-	query.Set("name", createOptions.RepoName)
-
-	resp, err := cli.postRaw(ctx, "/plugins/create", query, createContext, headers)
-	if err != nil {
-		return err
-	}
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_disable.go b/installer/vendor/github.com/docker/docker/client/plugin_disable.go
deleted file mode 100644
index 30467db742..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_disable.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginDisable disables a plugin
-func (cli *Client) PluginDisable(ctx context.Context, name string, options types.PluginDisableOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-	resp, err := cli.post(ctx, "/plugins/"+name+"/disable", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_disable_test.go b/installer/vendor/github.com/docker/docker/client/plugin_disable_test.go
deleted file mode 100644
index a4de45be2d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_disable_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestPluginDisableError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.PluginDisable(context.Background(), "plugin_name", types.PluginDisableOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginDisable(t *testing.T) {
-	expectedURL := "/plugins/plugin_name/disable"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.PluginDisable(context.Background(), "plugin_name", types.PluginDisableOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_enable.go b/installer/vendor/github.com/docker/docker/client/plugin_enable.go
deleted file mode 100644
index 95517c4b80..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_enable.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginEnable enables a plugin
-func (cli *Client) PluginEnable(ctx context.Context, name string, options types.PluginEnableOptions) error {
-	query := url.Values{}
-	query.Set("timeout", strconv.Itoa(options.Timeout))
-
-	resp, err := cli.post(ctx, "/plugins/"+name+"/enable", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_enable_test.go b/installer/vendor/github.com/docker/docker/client/plugin_enable_test.go
deleted file mode 100644
index b27681348f..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_enable_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestPluginEnableError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.PluginEnable(context.Background(), "plugin_name", types.PluginEnableOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginEnable(t *testing.T) {
-	expectedURL := "/plugins/plugin_name/enable"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.PluginEnable(context.Background(), "plugin_name", types.PluginEnableOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_inspect.go b/installer/vendor/github.com/docker/docker/client/plugin_inspect.go
deleted file mode 100644
index 89f39ee2c6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_inspect.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginInspectWithRaw inspects an existing plugin
-func (cli *Client) PluginInspectWithRaw(ctx context.Context, name string) (*types.Plugin, []byte, error) {
-	resp, err := cli.get(ctx, "/plugins/"+name+"/json", nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return nil, nil, pluginNotFoundError{name}
-		}
-		return nil, nil, err
-	}
-
-	defer ensureReaderClosed(resp)
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return nil, nil, err
-	}
-	var p types.Plugin
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&p)
-	return &p, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_inspect_test.go b/installer/vendor/github.com/docker/docker/client/plugin_inspect_test.go
deleted file mode 100644
index fae407eb9b..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_inspect_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestPluginInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.PluginInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginInspect(t *testing.T) {
-	expectedURL := "/plugins/plugin_name"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(types.Plugin{
-				ID: "plugin_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	pluginInspect, _, err := client.PluginInspectWithRaw(context.Background(), "plugin_name")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pluginInspect.ID != "plugin_id" {
-		t.Fatalf("expected `plugin_id`, got %s", pluginInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_install.go b/installer/vendor/github.com/docker/docker/client/plugin_install.go
deleted file mode 100644
index 3217c4cf39..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_install.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// PluginInstall installs a plugin
-func (cli *Client) PluginInstall(ctx context.Context, name string, options types.PluginInstallOptions) (rc io.ReadCloser, err error) {
-	query := url.Values{}
-	if _, err := reference.ParseNamed(options.RemoteRef); err != nil {
-		return nil, errors.Wrap(err, "invalid remote reference")
-	}
-	query.Set("remote", options.RemoteRef)
-
-	privileges, err := cli.checkPluginPermissions(ctx, query, options)
-	if err != nil {
-		return nil, err
-	}
-
-	// set name for plugin pull, if empty should default to remote reference
-	query.Set("name", name)
-
-	resp, err := cli.tryPluginPull(ctx, query, privileges, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-
-	name = resp.header.Get("Docker-Plugin-Name")
-
-	pr, pw := io.Pipe()
-	go func() { // todo: the client should probably be designed more around the actual api
-		_, err := io.Copy(pw, resp.body)
-		if err != nil {
-			pw.CloseWithError(err)
-			return
-		}
-		defer func() {
-			if err != nil {
-				delResp, _ := cli.delete(ctx, "/plugins/"+name, nil, nil)
-				ensureReaderClosed(delResp)
-			}
-		}()
-		if len(options.Args) > 0 {
-			if err := cli.PluginSet(ctx, name, options.Args); err != nil {
-				pw.CloseWithError(err)
-				return
-			}
-		}
-
-		if options.Disabled {
-			pw.Close()
-			return
-		}
-
-		err = cli.PluginEnable(ctx, name, types.PluginEnableOptions{Timeout: 0})
-		pw.CloseWithError(err)
-	}()
-	return pr, nil
-}
-
-func (cli *Client) tryPluginPrivileges(ctx context.Context, query url.Values, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.get(ctx, "/plugins/privileges", query, headers)
-}
-
-func (cli *Client) tryPluginPull(ctx context.Context, query url.Values, privileges types.PluginPrivileges, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, "/plugins/pull", query, privileges, headers)
-}
-
-func (cli *Client) checkPluginPermissions(ctx context.Context, query url.Values, options types.PluginInstallOptions) (types.PluginPrivileges, error) {
-	resp, err := cli.tryPluginPrivileges(ctx, query, options.RegistryAuth)
-	if resp.statusCode == http.StatusUnauthorized && options.PrivilegeFunc != nil {
-		// todo: do inspect before to check existing name before checking privileges
-		newAuthHeader, privilegeErr := options.PrivilegeFunc()
-		if privilegeErr != nil {
-			ensureReaderClosed(resp)
-			return nil, privilegeErr
-		}
-		options.RegistryAuth = newAuthHeader
-		resp, err = cli.tryPluginPrivileges(ctx, query, options.RegistryAuth)
-	}
-	if err != nil {
-		ensureReaderClosed(resp)
-		return nil, err
-	}
-
-	var privileges types.PluginPrivileges
-	if err := json.NewDecoder(resp.body).Decode(&privileges); err != nil {
-		ensureReaderClosed(resp)
-		return nil, err
-	}
-	ensureReaderClosed(resp)
-
-	if !options.AcceptAllPermissions && options.AcceptPermissionsFunc != nil && len(privileges) > 0 {
-		accept, err := options.AcceptPermissionsFunc(privileges)
-		if err != nil {
-			return nil, err
-		}
-		if !accept {
-			return nil, pluginPermissionDenied{options.RemoteRef}
-		}
-	}
-	return privileges, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_list.go b/installer/vendor/github.com/docker/docker/client/plugin_list.go
deleted file mode 100644
index 88c480a3e1..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_list.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginList returns the installed plugins
-func (cli *Client) PluginList(ctx context.Context) (types.PluginsListResponse, error) {
-	var plugins types.PluginsListResponse
-	resp, err := cli.get(ctx, "/plugins", nil, nil)
-	if err != nil {
-		return plugins, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&plugins)
-	ensureReaderClosed(resp)
-	return plugins, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_list_test.go b/installer/vendor/github.com/docker/docker/client/plugin_list_test.go
deleted file mode 100644
index 173e4b87f5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_list_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestPluginListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.PluginList(context.Background())
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginList(t *testing.T) {
-	expectedURL := "/plugins"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal([]*types.Plugin{
-				{
-					ID: "plugin_id1",
-				},
-				{
-					ID: "plugin_id2",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	plugins, err := client.PluginList(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(plugins) != 2 {
-		t.Fatalf("expected 2 plugins, got %v", plugins)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_push.go b/installer/vendor/github.com/docker/docker/client/plugin_push.go
deleted file mode 100644
index 1e5f963251..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_push.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"io"
-
-	"golang.org/x/net/context"
-)
-
-// PluginPush pushes a plugin to a registry
-func (cli *Client) PluginPush(ctx context.Context, name string, registryAuth string) (io.ReadCloser, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	resp, err := cli.post(ctx, "/plugins/"+name+"/push", nil, nil, headers)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_push_test.go b/installer/vendor/github.com/docker/docker/client/plugin_push_test.go
deleted file mode 100644
index d9f70cdff8..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_push_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestPluginPushError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.PluginPush(context.Background(), "plugin_name", "")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginPush(t *testing.T) {
-	expectedURL := "/plugins/plugin_name"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			auth := req.Header.Get("X-Registry-Auth")
-			if auth != "authtoken" {
-				return nil, fmt.Errorf("Invalid auth header : expected 'authtoken', got %s", auth)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	_, err := client.PluginPush(context.Background(), "plugin_name", "authtoken")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_remove.go b/installer/vendor/github.com/docker/docker/client/plugin_remove.go
deleted file mode 100644
index b017e4d348..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_remove.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// PluginRemove removes a plugin
-func (cli *Client) PluginRemove(ctx context.Context, name string, options types.PluginRemoveOptions) error {
-	query := url.Values{}
-	if options.Force {
-		query.Set("force", "1")
-	}
-
-	resp, err := cli.delete(ctx, "/plugins/"+name, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_remove_test.go b/installer/vendor/github.com/docker/docker/client/plugin_remove_test.go
deleted file mode 100644
index a15f1661f6..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_remove_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-func TestPluginRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.PluginRemove(context.Background(), "plugin_name", types.PluginRemoveOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginRemove(t *testing.T) {
-	expectedURL := "/plugins/plugin_name"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.PluginRemove(context.Background(), "plugin_name", types.PluginRemoveOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_set.go b/installer/vendor/github.com/docker/docker/client/plugin_set.go
deleted file mode 100644
index 3260d2a90d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_set.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package client
-
-import (
-	"golang.org/x/net/context"
-)
-
-// PluginSet modifies settings for an existing plugin
-func (cli *Client) PluginSet(ctx context.Context, name string, args []string) error {
-	resp, err := cli.post(ctx, "/plugins/"+name+"/set", nil, args, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_set_test.go b/installer/vendor/github.com/docker/docker/client/plugin_set_test.go
deleted file mode 100644
index 2450254463..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_set_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestPluginSetError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.PluginSet(context.Background(), "plugin_name", []string{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestPluginSet(t *testing.T) {
-	expectedURL := "/plugins/plugin_name/set"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.PluginSet(context.Background(), "plugin_name", []string{"arg1"})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/plugin_upgrade.go b/installer/vendor/github.com/docker/docker/client/plugin_upgrade.go
deleted file mode 100644
index 95a4356b97..0000000000
--- a/installer/vendor/github.com/docker/docker/client/plugin_upgrade.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// PluginUpgrade upgrades a plugin
-func (cli *Client) PluginUpgrade(ctx context.Context, name string, options types.PluginInstallOptions) (rc io.ReadCloser, err error) {
-	query := url.Values{}
-	if _, err := reference.ParseNamed(options.RemoteRef); err != nil {
-		return nil, errors.Wrap(err, "invalid remote reference")
-	}
-	query.Set("remote", options.RemoteRef)
-
-	privileges, err := cli.checkPluginPermissions(ctx, query, options)
-	if err != nil {
-		return nil, err
-	}
-
-	resp, err := cli.tryPluginUpgrade(ctx, query, privileges, name, options.RegistryAuth)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
-
-func (cli *Client) tryPluginUpgrade(ctx context.Context, query url.Values, privileges types.PluginPrivileges, name, registryAuth string) (serverResponse, error) {
-	headers := map[string][]string{"X-Registry-Auth": {registryAuth}}
-	return cli.post(ctx, fmt.Sprintf("/plugins/%s/upgrade", name), query, privileges, headers)
-}
diff --git a/installer/vendor/github.com/docker/docker/client/request.go b/installer/vendor/github.com/docker/docker/client/request.go
deleted file mode 100644
index ac05363655..0000000000
--- a/installer/vendor/github.com/docker/docker/client/request.go
+++ /dev/null
@@ -1,247 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"golang.org/x/net/context/ctxhttp"
-)
-
-// serverResponse is a wrapper for http API responses.
-type serverResponse struct {
-	body       io.ReadCloser
-	header     http.Header
-	statusCode int
-}
-
-// head sends an http request to the docker API using the method HEAD.
-func (cli *Client) head(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "HEAD", path, query, nil, headers)
-}
-
-// getWithContext sends an http request to the docker API using the method GET with a specific go context.
-func (cli *Client) get(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "GET", path, query, nil, headers)
-}
-
-// postWithContext sends an http request to the docker API using the method POST with a specific go context.
-func (cli *Client) post(ctx context.Context, path string, query url.Values, obj interface{}, headers map[string][]string) (serverResponse, error) {
-	body, headers, err := encodeBody(obj, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.sendRequest(ctx, "POST", path, query, body, headers)
-}
-
-func (cli *Client) postRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "POST", path, query, body, headers)
-}
-
-// put sends an http request to the docker API using the method PUT.
-func (cli *Client) put(ctx context.Context, path string, query url.Values, obj interface{}, headers map[string][]string) (serverResponse, error) {
-	body, headers, err := encodeBody(obj, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.sendRequest(ctx, "PUT", path, query, body, headers)
-}
-
-// put sends an http request to the docker API using the method PUT.
-func (cli *Client) putRaw(ctx context.Context, path string, query url.Values, body io.Reader, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "PUT", path, query, body, headers)
-}
-
-// delete sends an http request to the docker API using the method DELETE.
-func (cli *Client) delete(ctx context.Context, path string, query url.Values, headers map[string][]string) (serverResponse, error) {
-	return cli.sendRequest(ctx, "DELETE", path, query, nil, headers)
-}
-
-type headers map[string][]string
-
-func encodeBody(obj interface{}, headers headers) (io.Reader, headers, error) {
-	if obj == nil {
-		return nil, headers, nil
-	}
-
-	body, err := encodeData(obj)
-	if err != nil {
-		return nil, headers, err
-	}
-	if headers == nil {
-		headers = make(map[string][]string)
-	}
-	headers["Content-Type"] = []string{"application/json"}
-	return body, headers, nil
-}
-
-func (cli *Client) buildRequest(method, path string, body io.Reader, headers headers) (*http.Request, error) {
-	expectedPayload := (method == "POST" || method == "PUT")
-	if expectedPayload && body == nil {
-		body = bytes.NewReader([]byte{})
-	}
-
-	req, err := http.NewRequest(method, path, body)
-	if err != nil {
-		return nil, err
-	}
-	req = cli.addHeaders(req, headers)
-
-	if cli.proto == "unix" || cli.proto == "npipe" {
-		// For local communications, it doesn't matter what the host is. We just
-		// need a valid and meaningful host name. (See #189)
-		req.Host = "docker"
-	}
-
-	req.URL.Host = cli.addr
-	req.URL.Scheme = cli.scheme
-
-	if expectedPayload && req.Header.Get("Content-Type") == "" {
-		req.Header.Set("Content-Type", "text/plain")
-	}
-	return req, nil
-}
-
-func (cli *Client) sendRequest(ctx context.Context, method, path string, query url.Values, body io.Reader, headers headers) (serverResponse, error) {
-	req, err := cli.buildRequest(method, cli.getAPIPath(path, query), body, headers)
-	if err != nil {
-		return serverResponse{}, err
-	}
-	return cli.doRequest(ctx, req)
-}
-
-func (cli *Client) doRequest(ctx context.Context, req *http.Request) (serverResponse, error) {
-	serverResp := serverResponse{statusCode: -1}
-
-	resp, err := ctxhttp.Do(ctx, cli.client, req)
-	if err != nil {
-		if cli.scheme != "https" && strings.Contains(err.Error(), "malformed HTTP response") {
-			return serverResp, fmt.Errorf("%v.\n* Are you trying to connect to a TLS-enabled daemon without TLS?", err)
-		}
-
-		if cli.scheme == "https" && strings.Contains(err.Error(), "bad certificate") {
-			return serverResp, fmt.Errorf("The server probably has client authentication (--tlsverify) enabled. Please check your TLS client certification settings: %v", err)
-		}
-
-		// Don't decorate context sentinel errors; users may be comparing to
-		// them directly.
-		switch err {
-		case context.Canceled, context.DeadlineExceeded:
-			return serverResp, err
-		}
-
-		if nErr, ok := err.(*url.Error); ok {
-			if nErr, ok := nErr.Err.(*net.OpError); ok {
-				if os.IsPermission(nErr.Err) {
-					return serverResp, errors.Wrapf(err, "Got permission denied while trying to connect to the Docker daemon socket at %v", cli.host)
-				}
-			}
-		}
-
-		if err, ok := err.(net.Error); ok {
-			if err.Timeout() {
-				return serverResp, ErrorConnectionFailed(cli.host)
-			}
-			if !err.Temporary() {
-				if strings.Contains(err.Error(), "connection refused") || strings.Contains(err.Error(), "dial unix") {
-					return serverResp, ErrorConnectionFailed(cli.host)
-				}
-			}
-		}
-
-		// Although there's not a strongly typed error for this in go-winio,
-		// lots of people are using the default configuration for the docker
-		// daemon on Windows where the daemon is listening on a named pipe
-		// `//./pipe/docker_engine, and the client must be running elevated.
-		// Give users a clue rather than the not-overly useful message
-		// such as `error during connect: Get http://%2F%2F.%2Fpipe%2Fdocker_engine/v1.25/info:
-		// open //./pipe/docker_engine: The system cannot find the file specified.`.
-		// Note we can't string compare "The system cannot find the file specified" as
-		// this is localised - for example in French the error would be
-		// `open //./pipe/docker_engine: Le fichier spécifié est introuvable.`
-		if strings.Contains(err.Error(), `open //./pipe/docker_engine`) {
-			err = errors.New(err.Error() + " In the default daemon configuration on Windows, the docker client must be run elevated to connect. This error may also indicate that the docker daemon is not running.")
-		}
-
-		return serverResp, errors.Wrap(err, "error during connect")
-	}
-
-	if resp != nil {
-		serverResp.statusCode = resp.StatusCode
-	}
-
-	if serverResp.statusCode < 200 || serverResp.statusCode >= 400 {
-		body, err := ioutil.ReadAll(resp.Body)
-		if err != nil {
-			return serverResp, err
-		}
-		if len(body) == 0 {
-			return serverResp, fmt.Errorf("Error: request returned %s for API route and version %s, check if the server supports the requested API version", http.StatusText(serverResp.statusCode), req.URL)
-		}
-
-		var errorMessage string
-		if (cli.version == "" || versions.GreaterThan(cli.version, "1.23")) &&
-			resp.Header.Get("Content-Type") == "application/json" {
-			var errorResponse types.ErrorResponse
-			if err := json.Unmarshal(body, &errorResponse); err != nil {
-				return serverResp, fmt.Errorf("Error reading JSON: %v", err)
-			}
-			errorMessage = errorResponse.Message
-		} else {
-			errorMessage = string(body)
-		}
-
-		return serverResp, fmt.Errorf("Error response from daemon: %s", strings.TrimSpace(errorMessage))
-	}
-
-	serverResp.body = resp.Body
-	serverResp.header = resp.Header
-	return serverResp, nil
-}
-
-func (cli *Client) addHeaders(req *http.Request, headers headers) *http.Request {
-	// Add CLI Config's HTTP Headers BEFORE we set the Docker headers
-	// then the user can't change OUR headers
-	for k, v := range cli.customHTTPHeaders {
-		if versions.LessThan(cli.version, "1.25") && k == "User-Agent" {
-			continue
-		}
-		req.Header.Set(k, v)
-	}
-
-	if headers != nil {
-		for k, v := range headers {
-			req.Header[k] = v
-		}
-	}
-	return req
-}
-
-func encodeData(data interface{}) (*bytes.Buffer, error) {
-	params := bytes.NewBuffer(nil)
-	if data != nil {
-		if err := json.NewEncoder(params).Encode(data); err != nil {
-			return nil, err
-		}
-	}
-	return params, nil
-}
-
-func ensureReaderClosed(response serverResponse) {
-	if body := response.body; body != nil {
-		// Drain up to 512 bytes and close the body to let the Transport reuse the connection
-		io.CopyN(ioutil.Discard, body, 512)
-		response.body.Close()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/request_test.go b/installer/vendor/github.com/docker/docker/client/request_test.go
deleted file mode 100644
index 63908aec4b..0000000000
--- a/installer/vendor/github.com/docker/docker/client/request_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// TestSetHostHeader should set fake host for local communications, set real host
-// for normal communications.
-func TestSetHostHeader(t *testing.T) {
-	testURL := "/test"
-	testCases := []struct {
-		host            string
-		expectedHost    string
-		expectedURLHost string
-	}{
-		{
-			"unix:///var/run/docker.sock",
-			"docker",
-			"/var/run/docker.sock",
-		},
-		{
-			"npipe:////./pipe/docker_engine",
-			"docker",
-			"//./pipe/docker_engine",
-		},
-		{
-			"tcp://0.0.0.0:4243",
-			"",
-			"0.0.0.0:4243",
-		},
-		{
-			"tcp://localhost:4243",
-			"",
-			"localhost:4243",
-		},
-	}
-
-	for c, test := range testCases {
-		proto, addr, basePath, err := ParseHost(test.host)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, testURL) {
-					return nil, fmt.Errorf("Test Case #%d: Expected URL %q, got %q", c, testURL, req.URL)
-				}
-				if req.Host != test.expectedHost {
-					return nil, fmt.Errorf("Test Case #%d: Expected host %q, got %q", c, test.expectedHost, req.Host)
-				}
-				if req.URL.Host != test.expectedURLHost {
-					return nil, fmt.Errorf("Test Case #%d: Expected URL host %q, got %q", c, test.expectedURLHost, req.URL.Host)
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(([]byte("")))),
-				}, nil
-			}),
-
-			proto:    proto,
-			addr:     addr,
-			basePath: basePath,
-		}
-
-		_, err = client.sendRequest(context.Background(), "GET", testURL, nil, nil, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-// TestPlainTextError tests the server returning an error in plain text for
-// backwards compatibility with API versions <1.24. All other tests use
-// errors returned as JSON
-func TestPlainTextError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(plainTextErrorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ContainerList(context.Background(), types.ContainerListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_create.go b/installer/vendor/github.com/docker/docker/client/secret_create.go
deleted file mode 100644
index de8b041567..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_create.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretCreate creates a new Secret.
-func (cli *Client) SecretCreate(ctx context.Context, secret swarm.SecretSpec) (types.SecretCreateResponse, error) {
-	var headers map[string][]string
-
-	var response types.SecretCreateResponse
-	resp, err := cli.post(ctx, "/secrets/create", nil, secret, headers)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_create_test.go b/installer/vendor/github.com/docker/docker/client/secret_create_test.go
deleted file mode 100644
index cb378c77ff..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_create_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestSecretCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.SecretCreate(context.Background(), swarm.SecretSpec{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSecretCreate(t *testing.T) {
-	expectedURL := "/secrets/create"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			b, err := json.Marshal(types.SecretCreateResponse{
-				ID: "test_secret",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusCreated,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	r, err := client.SecretCreate(context.Background(), swarm.SecretSpec{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "test_secret" {
-		t.Fatalf("expected `test_secret`, got %s", r.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_inspect.go b/installer/vendor/github.com/docker/docker/client/secret_inspect.go
deleted file mode 100644
index f774576118..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_inspect.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretInspectWithRaw returns the secret information with raw data
-func (cli *Client) SecretInspectWithRaw(ctx context.Context, id string) (swarm.Secret, []byte, error) {
-	resp, err := cli.get(ctx, "/secrets/"+id, nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return swarm.Secret{}, nil, secretNotFoundError{id}
-		}
-		return swarm.Secret{}, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return swarm.Secret{}, nil, err
-	}
-
-	var secret swarm.Secret
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&secret)
-
-	return secret, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_inspect_test.go b/installer/vendor/github.com/docker/docker/client/secret_inspect_test.go
deleted file mode 100644
index 423d986968..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_inspect_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestSecretInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.SecretInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSecretInspectSecretNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, _, err := client.SecretInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrSecretNotFound(err) {
-		t.Fatalf("expected an secretNotFoundError error, got %v", err)
-	}
-}
-
-func TestSecretInspect(t *testing.T) {
-	expectedURL := "/secrets/secret_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(swarm.Secret{
-				ID: "secret_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	secretInspect, _, err := client.SecretInspectWithRaw(context.Background(), "secret_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if secretInspect.ID != "secret_id" {
-		t.Fatalf("expected `secret_id`, got %s", secretInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_list.go b/installer/vendor/github.com/docker/docker/client/secret_list.go
deleted file mode 100644
index 7e9d5ec167..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretList returns the list of secrets.
-func (cli *Client) SecretList(ctx context.Context, options types.SecretListOptions) ([]swarm.Secret, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/secrets", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var secrets []swarm.Secret
-	err = json.NewDecoder(resp.body).Decode(&secrets)
-	ensureReaderClosed(resp)
-	return secrets, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_list_test.go b/installer/vendor/github.com/docker/docker/client/secret_list_test.go
deleted file mode 100644
index 1ac11cddb3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_list_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestSecretListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.SecretList(context.Background(), types.SecretListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSecretList(t *testing.T) {
-	expectedURL := "/secrets"
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-
-	listCases := []struct {
-		options             types.SecretListOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.SecretListOptions{},
-			expectedQueryParams: map[string]string{
-				"filters": "",
-			},
-		},
-		{
-			options: types.SecretListOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": `{"label":{"label1":true,"label2":true}}`,
-			},
-		},
-	}
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				for key, expected := range listCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				content, err := json.Marshal([]swarm.Secret{
-					{
-						ID: "secret_id1",
-					},
-					{
-						ID: "secret_id2",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		secrets, err := client.SecretList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(secrets) != 2 {
-			t.Fatalf("expected 2 secrets, got %v", secrets)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_remove.go b/installer/vendor/github.com/docker/docker/client/secret_remove.go
deleted file mode 100644
index 1955b988a9..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// SecretRemove removes a Secret.
-func (cli *Client) SecretRemove(ctx context.Context, id string) error {
-	resp, err := cli.delete(ctx, "/secrets/"+id, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_remove_test.go b/installer/vendor/github.com/docker/docker/client/secret_remove_test.go
deleted file mode 100644
index f269f787d2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_remove_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestSecretRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.SecretRemove(context.Background(), "secret_id")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSecretRemove(t *testing.T) {
-	expectedURL := "/secrets/secret_id"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.SecretRemove(context.Background(), "secret_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_update.go b/installer/vendor/github.com/docker/docker/client/secret_update.go
deleted file mode 100644
index b94e24aab0..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_update.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package client
-
-import (
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SecretUpdate updates a Secret. Currently, the only part of a secret spec
-// which can be updated is Labels.
-func (cli *Client) SecretUpdate(ctx context.Context, id string, version swarm.Version, secret swarm.SecretSpec) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	resp, err := cli.post(ctx, "/secrets/"+id+"/update", query, secret, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/secret_update_test.go b/installer/vendor/github.com/docker/docker/client/secret_update_test.go
deleted file mode 100644
index c620985bd5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/secret_update_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestSecretUpdateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.SecretUpdate(context.Background(), "secret_id", swarm.Version{}, swarm.SecretSpec{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSecretUpdate(t *testing.T) {
-	expectedURL := "/secrets/secret_id/update"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.SecretUpdate(context.Background(), "secret_id", swarm.Version{}, swarm.SecretSpec{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_create.go b/installer/vendor/github.com/docker/docker/client/service_create.go
deleted file mode 100644
index 3d1be225bd..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_create.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceCreate creates a new Service.
-func (cli *Client) ServiceCreate(ctx context.Context, service swarm.ServiceSpec, options types.ServiceCreateOptions) (types.ServiceCreateResponse, error) {
-	var headers map[string][]string
-
-	if options.EncodedRegistryAuth != "" {
-		headers = map[string][]string{
-			"X-Registry-Auth": {options.EncodedRegistryAuth},
-		}
-	}
-
-	var response types.ServiceCreateResponse
-	resp, err := cli.post(ctx, "/services/create", nil, service, headers)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_create_test.go b/installer/vendor/github.com/docker/docker/client/service_create_test.go
deleted file mode 100644
index 1e07382870..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_create_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestServiceCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, types.ServiceCreateOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestServiceCreate(t *testing.T) {
-	expectedURL := "/services/create"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			b, err := json.Marshal(types.ServiceCreateResponse{
-				ID: "service_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(b)),
-			}, nil
-		}),
-	}
-
-	r, err := client.ServiceCreate(context.Background(), swarm.ServiceSpec{}, types.ServiceCreateOptions{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.ID != "service_id" {
-		t.Fatalf("expected `service_id`, got %s", r.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_inspect.go b/installer/vendor/github.com/docker/docker/client/service_inspect.go
deleted file mode 100644
index ca71cbde1a..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_inspect.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceInspectWithRaw returns the service information and the raw data.
-func (cli *Client) ServiceInspectWithRaw(ctx context.Context, serviceID string) (swarm.Service, []byte, error) {
-	serverResp, err := cli.get(ctx, "/services/"+serviceID, nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Service{}, nil, serviceNotFoundError{serviceID}
-		}
-		return swarm.Service{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Service{}, nil, err
-	}
-
-	var response swarm.Service
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_inspect_test.go b/installer/vendor/github.com/docker/docker/client/service_inspect_test.go
deleted file mode 100644
index e235cf0fef..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_inspect_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestServiceInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.ServiceInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestServiceInspectServiceNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, _, err := client.ServiceInspectWithRaw(context.Background(), "unknown")
-	if err == nil || !IsErrServiceNotFound(err) {
-		t.Fatalf("expected an serviceNotFoundError error, got %v", err)
-	}
-}
-
-func TestServiceInspect(t *testing.T) {
-	expectedURL := "/services/service_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(swarm.Service{
-				ID: "service_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	serviceInspect, _, err := client.ServiceInspectWithRaw(context.Background(), "service_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if serviceInspect.ID != "service_id" {
-		t.Fatalf("expected `service_id`, got %s", serviceInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_list.go b/installer/vendor/github.com/docker/docker/client/service_list.go
deleted file mode 100644
index c29e6d407d..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceList returns the list of services.
-func (cli *Client) ServiceList(ctx context.Context, options types.ServiceListOptions) ([]swarm.Service, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/services", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var services []swarm.Service
-	err = json.NewDecoder(resp.body).Decode(&services)
-	ensureReaderClosed(resp)
-	return services, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_list_test.go b/installer/vendor/github.com/docker/docker/client/service_list_test.go
deleted file mode 100644
index 213981ef70..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_list_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestServiceListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ServiceList(context.Background(), types.ServiceListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestServiceList(t *testing.T) {
-	expectedURL := "/services"
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-
-	listCases := []struct {
-		options             types.ServiceListOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.ServiceListOptions{},
-			expectedQueryParams: map[string]string{
-				"filters": "",
-			},
-		},
-		{
-			options: types.ServiceListOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": `{"label":{"label1":true,"label2":true}}`,
-			},
-		},
-	}
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				for key, expected := range listCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				content, err := json.Marshal([]swarm.Service{
-					{
-						ID: "service_id1",
-					},
-					{
-						ID: "service_id2",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		services, err := client.ServiceList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(services) != 2 {
-			t.Fatalf("expected 2 services, got %v", services)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_logs.go b/installer/vendor/github.com/docker/docker/client/service_logs.go
deleted file mode 100644
index 24384e3ec0..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_logs.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package client
-
-import (
-	"io"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-// ServiceLogs returns the logs generated by a service in an io.ReadCloser.
-// It's up to the caller to close the stream.
-func (cli *Client) ServiceLogs(ctx context.Context, serviceID string, options types.ContainerLogsOptions) (io.ReadCloser, error) {
-	query := url.Values{}
-	if options.ShowStdout {
-		query.Set("stdout", "1")
-	}
-
-	if options.ShowStderr {
-		query.Set("stderr", "1")
-	}
-
-	if options.Since != "" {
-		ts, err := timetypes.GetTimestamp(options.Since, time.Now())
-		if err != nil {
-			return nil, err
-		}
-		query.Set("since", ts)
-	}
-
-	if options.Timestamps {
-		query.Set("timestamps", "1")
-	}
-
-	if options.Details {
-		query.Set("details", "1")
-	}
-
-	if options.Follow {
-		query.Set("follow", "1")
-	}
-	query.Set("tail", options.Tail)
-
-	resp, err := cli.get(ctx, "/services/"+serviceID+"/logs", query, nil)
-	if err != nil {
-		return nil, err
-	}
-	return resp.body, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_logs_test.go b/installer/vendor/github.com/docker/docker/client/service_logs_test.go
deleted file mode 100644
index a6d002ba75..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_logs_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-
-	"golang.org/x/net/context"
-)
-
-func TestServiceLogsError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-	_, err := client.ServiceLogs(context.Background(), "service_id", types.ContainerLogsOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-	_, err = client.ServiceLogs(context.Background(), "service_id", types.ContainerLogsOptions{
-		Since: "2006-01-02TZ",
-	})
-	if err == nil || !strings.Contains(err.Error(), `parsing time "2006-01-02TZ"`) {
-		t.Fatalf("expected a 'parsing time' error, got %v", err)
-	}
-}
-
-func TestServiceLogs(t *testing.T) {
-	expectedURL := "/services/service_id/logs"
-	cases := []struct {
-		options             types.ContainerLogsOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			expectedQueryParams: map[string]string{
-				"tail": "",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				Tail: "any",
-			},
-			expectedQueryParams: map[string]string{
-				"tail": "any",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				ShowStdout: true,
-				ShowStderr: true,
-				Timestamps: true,
-				Details:    true,
-				Follow:     true,
-			},
-			expectedQueryParams: map[string]string{
-				"tail":       "",
-				"stdout":     "1",
-				"stderr":     "1",
-				"timestamps": "1",
-				"details":    "1",
-				"follow":     "1",
-			},
-		},
-		{
-			options: types.ContainerLogsOptions{
-				// An complete invalid date, timestamp or go duration will be
-				// passed as is
-				Since: "invalid but valid",
-			},
-			expectedQueryParams: map[string]string{
-				"tail":  "",
-				"since": "invalid but valid",
-			},
-		},
-	}
-	for _, logCase := range cases {
-		client := &Client{
-			client: newMockClient(func(r *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(r.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, r.URL)
-				}
-				// Check query parameters
-				query := r.URL.Query()
-				for key, expected := range logCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("response"))),
-				}, nil
-			}),
-		}
-		body, err := client.ServiceLogs(context.Background(), "service_id", logCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer body.Close()
-		content, err := ioutil.ReadAll(body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(content) != "response" {
-			t.Fatalf("expected response to contain 'response', got %s", string(content))
-		}
-	}
-}
-
-func ExampleClient_ServiceLogs_withTimeout() {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-
-	client, _ := NewEnvClient()
-	reader, err := client.ServiceLogs(ctx, "service_id", types.ContainerLogsOptions{})
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	_, err = io.Copy(os.Stdout, reader)
-	if err != nil && err != io.EOF {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_remove.go b/installer/vendor/github.com/docker/docker/client/service_remove.go
deleted file mode 100644
index a9331f92c2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_remove.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package client
-
-import "golang.org/x/net/context"
-
-// ServiceRemove kills and removes a service.
-func (cli *Client) ServiceRemove(ctx context.Context, serviceID string) error {
-	resp, err := cli.delete(ctx, "/services/"+serviceID, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_remove_test.go b/installer/vendor/github.com/docker/docker/client/service_remove_test.go
deleted file mode 100644
index 8e2ac259c1..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_remove_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestServiceRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.ServiceRemove(context.Background(), "service_id")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestServiceRemove(t *testing.T) {
-	expectedURL := "/services/service_id"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.ServiceRemove(context.Background(), "service_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_update.go b/installer/vendor/github.com/docker/docker/client/service_update.go
deleted file mode 100644
index afa94d47e2..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_update.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// ServiceUpdate updates a Service.
-func (cli *Client) ServiceUpdate(ctx context.Context, serviceID string, version swarm.Version, service swarm.ServiceSpec, options types.ServiceUpdateOptions) (types.ServiceUpdateResponse, error) {
-	var (
-		headers map[string][]string
-		query   = url.Values{}
-	)
-
-	if options.EncodedRegistryAuth != "" {
-		headers = map[string][]string{
-			"X-Registry-Auth": {options.EncodedRegistryAuth},
-		}
-	}
-
-	if options.RegistryAuthFrom != "" {
-		query.Set("registryAuthFrom", options.RegistryAuthFrom)
-	}
-
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-
-	var response types.ServiceUpdateResponse
-	resp, err := cli.post(ctx, "/services/"+serviceID+"/update", query, service, headers)
-	if err != nil {
-		return response, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&response)
-	ensureReaderClosed(resp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/service_update_test.go b/installer/vendor/github.com/docker/docker/client/service_update_test.go
deleted file mode 100644
index 76bea176bf..0000000000
--- a/installer/vendor/github.com/docker/docker/client/service_update_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestServiceUpdateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.ServiceUpdate(context.Background(), "service_id", swarm.Version{}, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestServiceUpdate(t *testing.T) {
-	expectedURL := "/services/service_id/update"
-
-	updateCases := []struct {
-		swarmVersion    swarm.Version
-		expectedVersion string
-	}{
-		{
-			expectedVersion: "0",
-		},
-		{
-			swarmVersion: swarm.Version{
-				Index: 0,
-			},
-			expectedVersion: "0",
-		},
-		{
-			swarmVersion: swarm.Version{
-				Index: 10,
-			},
-			expectedVersion: "10",
-		},
-	}
-
-	for _, updateCase := range updateCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "POST" {
-					return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-				}
-				version := req.URL.Query().Get("version")
-				if version != updateCase.expectedVersion {
-					return nil, fmt.Errorf("version not set in URL query properly, expected '%s', got %s", updateCase.expectedVersion, version)
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte("{}"))),
-				}, nil
-			}),
-		}
-
-		_, err := client.ServiceUpdate(context.Background(), "service_id", updateCase.swarmVersion, swarm.ServiceSpec{}, types.ServiceUpdateOptions{})
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go b/installer/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
deleted file mode 100644
index be28d32628..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// SwarmGetUnlockKey retrieves the swarm's unlock key.
-func (cli *Client) SwarmGetUnlockKey(ctx context.Context) (types.SwarmUnlockKeyResponse, error) {
-	serverResp, err := cli.get(ctx, "/swarm/unlockkey", nil, nil)
-	if err != nil {
-		return types.SwarmUnlockKeyResponse{}, err
-	}
-
-	var response types.SwarmUnlockKeyResponse
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_init.go b/installer/vendor/github.com/docker/docker/client/swarm_init.go
deleted file mode 100644
index fd45d066e3..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_init.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmInit initializes the Swarm.
-func (cli *Client) SwarmInit(ctx context.Context, req swarm.InitRequest) (string, error) {
-	serverResp, err := cli.post(ctx, "/swarm/init", nil, req, nil)
-	if err != nil {
-		return "", err
-	}
-
-	var response string
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_init_test.go b/installer/vendor/github.com/docker/docker/client/swarm_init_test.go
deleted file mode 100644
index 811155aff4..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_init_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestSwarmInitError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.SwarmInit(context.Background(), swarm.InitRequest{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSwarmInit(t *testing.T) {
-	expectedURL := "/swarm/init"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(`"body"`))),
-			}, nil
-		}),
-	}
-
-	resp, err := client.SwarmInit(context.Background(), swarm.InitRequest{
-		ListenAddr: "0.0.0.0:2377",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if resp != "body" {
-		t.Fatalf("Expected 'body', got %s", resp)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_inspect.go b/installer/vendor/github.com/docker/docker/client/swarm_inspect.go
deleted file mode 100644
index 6d95cfc05e..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_inspect.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmInspect inspects the Swarm.
-func (cli *Client) SwarmInspect(ctx context.Context) (swarm.Swarm, error) {
-	serverResp, err := cli.get(ctx, "/swarm", nil, nil)
-	if err != nil {
-		return swarm.Swarm{}, err
-	}
-
-	var response swarm.Swarm
-	err = json.NewDecoder(serverResp.body).Decode(&response)
-	ensureReaderClosed(serverResp)
-	return response, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_inspect_test.go b/installer/vendor/github.com/docker/docker/client/swarm_inspect_test.go
deleted file mode 100644
index 6432d172b4..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_inspect_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestSwarmInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.SwarmInspect(context.Background())
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSwarmInspect(t *testing.T) {
-	expectedURL := "/swarm"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(swarm.Swarm{
-				ClusterInfo: swarm.ClusterInfo{
-					ID: "swarm_id",
-				},
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	swarmInspect, err := client.SwarmInspect(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if swarmInspect.ID != "swarm_id" {
-		t.Fatalf("expected `swarm_id`, got %s", swarmInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_join.go b/installer/vendor/github.com/docker/docker/client/swarm_join.go
deleted file mode 100644
index cda99930eb..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_join.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmJoin joins the Swarm.
-func (cli *Client) SwarmJoin(ctx context.Context, req swarm.JoinRequest) error {
-	resp, err := cli.post(ctx, "/swarm/join", nil, req, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_join_test.go b/installer/vendor/github.com/docker/docker/client/swarm_join_test.go
deleted file mode 100644
index 31ef2a76ee..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_join_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestSwarmJoinError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.SwarmJoin(context.Background(), swarm.JoinRequest{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSwarmJoin(t *testing.T) {
-	expectedURL := "/swarm/join"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.SwarmJoin(context.Background(), swarm.JoinRequest{
-		ListenAddr: "0.0.0.0:2377",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_leave.go b/installer/vendor/github.com/docker/docker/client/swarm_leave.go
deleted file mode 100644
index a4df732174..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_leave.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"golang.org/x/net/context"
-)
-
-// SwarmLeave leaves the Swarm.
-func (cli *Client) SwarmLeave(ctx context.Context, force bool) error {
-	query := url.Values{}
-	if force {
-		query.Set("force", "1")
-	}
-	resp, err := cli.post(ctx, "/swarm/leave", query, nil, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_leave_test.go b/installer/vendor/github.com/docker/docker/client/swarm_leave_test.go
deleted file mode 100644
index c96dac8120..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_leave_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestSwarmLeaveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.SwarmLeave(context.Background(), false)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSwarmLeave(t *testing.T) {
-	expectedURL := "/swarm/leave"
-
-	leaveCases := []struct {
-		force         bool
-		expectedForce string
-	}{
-		{
-			expectedForce: "",
-		},
-		{
-			force:         true,
-			expectedForce: "1",
-		},
-	}
-
-	for _, leaveCase := range leaveCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				if req.Method != "POST" {
-					return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-				}
-				force := req.URL.Query().Get("force")
-				if force != leaveCase.expectedForce {
-					return nil, fmt.Errorf("force not set in URL query properly. expected '%s', got %s", leaveCase.expectedForce, force)
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-				}, nil
-			}),
-		}
-
-		err := client.SwarmLeave(context.Background(), leaveCase.force)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_unlock.go b/installer/vendor/github.com/docker/docker/client/swarm_unlock.go
deleted file mode 100644
index addfb59f0a..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_unlock.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmUnlock unlockes locked swarm.
-func (cli *Client) SwarmUnlock(ctx context.Context, req swarm.UnlockRequest) error {
-	serverResp, err := cli.post(ctx, "/swarm/unlock", nil, req, nil)
-	if err != nil {
-		return err
-	}
-
-	ensureReaderClosed(serverResp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_update.go b/installer/vendor/github.com/docker/docker/client/swarm_update.go
deleted file mode 100644
index cc8eeb6554..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_update.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package client
-
-import (
-	"fmt"
-	"net/url"
-	"strconv"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// SwarmUpdate updates the Swarm.
-func (cli *Client) SwarmUpdate(ctx context.Context, version swarm.Version, swarm swarm.Spec, flags swarm.UpdateFlags) error {
-	query := url.Values{}
-	query.Set("version", strconv.FormatUint(version.Index, 10))
-	query.Set("rotateWorkerToken", fmt.Sprintf("%v", flags.RotateWorkerToken))
-	query.Set("rotateManagerToken", fmt.Sprintf("%v", flags.RotateManagerToken))
-	query.Set("rotateManagerUnlockKey", fmt.Sprintf("%v", flags.RotateManagerUnlockKey))
-	resp, err := cli.post(ctx, "/swarm/update", query, swarm, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/swarm_update_test.go b/installer/vendor/github.com/docker/docker/client/swarm_update_test.go
deleted file mode 100644
index 3b23db078f..0000000000
--- a/installer/vendor/github.com/docker/docker/client/swarm_update_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types/swarm"
-)
-
-func TestSwarmUpdateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.SwarmUpdate(context.Background(), swarm.Version{}, swarm.Spec{}, swarm.UpdateFlags{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestSwarmUpdate(t *testing.T) {
-	expectedURL := "/swarm/update"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte(""))),
-			}, nil
-		}),
-	}
-
-	err := client.SwarmUpdate(context.Background(), swarm.Version{}, swarm.Spec{}, swarm.UpdateFlags{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/task_inspect.go b/installer/vendor/github.com/docker/docker/client/task_inspect.go
deleted file mode 100644
index bc8058fc32..0000000000
--- a/installer/vendor/github.com/docker/docker/client/task_inspect.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types/swarm"
-
-	"golang.org/x/net/context"
-)
-
-// TaskInspectWithRaw returns the task information and its raw representation..
-func (cli *Client) TaskInspectWithRaw(ctx context.Context, taskID string) (swarm.Task, []byte, error) {
-	serverResp, err := cli.get(ctx, "/tasks/"+taskID, nil, nil)
-	if err != nil {
-		if serverResp.statusCode == http.StatusNotFound {
-			return swarm.Task{}, nil, taskNotFoundError{taskID}
-		}
-		return swarm.Task{}, nil, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	body, err := ioutil.ReadAll(serverResp.body)
-	if err != nil {
-		return swarm.Task{}, nil, err
-	}
-
-	var response swarm.Task
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&response)
-	return response, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/task_inspect_test.go b/installer/vendor/github.com/docker/docker/client/task_inspect_test.go
deleted file mode 100644
index 148cdad3a7..0000000000
--- a/installer/vendor/github.com/docker/docker/client/task_inspect_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestTaskInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, _, err := client.TaskInspectWithRaw(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestTaskInspect(t *testing.T) {
-	expectedURL := "/tasks/task_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			content, err := json.Marshal(swarm.Task{
-				ID: "task_id",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	taskInspect, _, err := client.TaskInspectWithRaw(context.Background(), "task_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if taskInspect.ID != "task_id" {
-		t.Fatalf("expected `task_id`, got %s", taskInspect.ID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/task_list.go b/installer/vendor/github.com/docker/docker/client/task_list.go
deleted file mode 100644
index 66324da959..0000000000
--- a/installer/vendor/github.com/docker/docker/client/task_list.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-// TaskList returns the list of tasks.
-func (cli *Client) TaskList(ctx context.Context, options types.TaskListOptions) ([]swarm.Task, error) {
-	query := url.Values{}
-
-	if options.Filters.Len() > 0 {
-		filterJSON, err := filters.ToParam(options.Filters)
-		if err != nil {
-			return nil, err
-		}
-
-		query.Set("filters", filterJSON)
-	}
-
-	resp, err := cli.get(ctx, "/tasks", query, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	var tasks []swarm.Task
-	err = json.NewDecoder(resp.body).Decode(&tasks)
-	ensureReaderClosed(resp)
-	return tasks, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/task_list_test.go b/installer/vendor/github.com/docker/docker/client/task_list_test.go
deleted file mode 100644
index 2a9a4c4346..0000000000
--- a/installer/vendor/github.com/docker/docker/client/task_list_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"golang.org/x/net/context"
-)
-
-func TestTaskListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.TaskList(context.Background(), types.TaskListOptions{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestTaskList(t *testing.T) {
-	expectedURL := "/tasks"
-
-	filters := filters.NewArgs()
-	filters.Add("label", "label1")
-	filters.Add("label", "label2")
-
-	listCases := []struct {
-		options             types.TaskListOptions
-		expectedQueryParams map[string]string
-	}{
-		{
-			options: types.TaskListOptions{},
-			expectedQueryParams: map[string]string{
-				"filters": "",
-			},
-		},
-		{
-			options: types.TaskListOptions{
-				Filters: filters,
-			},
-			expectedQueryParams: map[string]string{
-				"filters": `{"label":{"label1":true,"label2":true}}`,
-			},
-		},
-	}
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				for key, expected := range listCase.expectedQueryParams {
-					actual := query.Get(key)
-					if actual != expected {
-						return nil, fmt.Errorf("%s not set in URL query properly. Expected '%s', got %s", key, expected, actual)
-					}
-				}
-				content, err := json.Marshal([]swarm.Task{
-					{
-						ID: "task_id1",
-					},
-					{
-						ID: "task_id2",
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		tasks, err := client.TaskList(context.Background(), listCase.options)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(tasks) != 2 {
-			t.Fatalf("expected 2 tasks, got %v", tasks)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/testdata/ca.pem b/installer/vendor/github.com/docker/docker/client/testdata/ca.pem
deleted file mode 100644
index ad14d47065..0000000000
--- a/installer/vendor/github.com/docker/docker/client/testdata/ca.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC0jCCAbqgAwIBAgIRAILlP5WWLaHkQ/m2ASHP7SowDQYJKoZIhvcNAQELBQAw
-EjEQMA4GA1UEChMHdmluY2VudDAeFw0xNjAzMjQxMDE5MDBaFw0xOTAzMDkxMDE5
-MDBaMBIxEDAOBgNVBAoTB3ZpbmNlbnQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw
-ggEKAoIBAQD0yZPKAGncoaxaU/QW9tWEHbrvDoGVF/65L8Si/jBrlAgLjhmmV1di
-vKG9QPzuU8snxHro3/uCwyA6kTqw0U8bGwHxJq2Bpa6JBYj8N2jMJ+M+sjXgSo2t
-E0zIzjTW2Pir3C8qwfrVL6NFp9xClwMD23SFZ0UsEH36NkfyrKBVeM8IOjJd4Wjs
-xIcuvF3BTVkji84IJBW2JIKf9ZrzJwUlSCPgptRp4Evdbyp5d+UPxtwxD7qjW4lM
-yQQ8vfcC4lKkVx5s/RNJ4fzd5uEgLdEbZ20qt7Zt/bLcxFHpUhH2teA0QjmrOWFh
-gbL83s95/+hbSVhsO4hoFW7vTeiCCY4xAgMBAAGjIzAhMA4GA1UdDwEB/wQEAwIC
-rDAPBgNVHRMBAf8EBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQBY51RHajuDuhO2
-tcm26jeNROzfffnjhvbOVPjSEdo9vI3JpMU/RuQw+nbNcLwJrdjL6UH7tD/36Y+q
-NXH+xSIjWFH0zXGxrIUsVrvt6f8CbOvw7vD+gygOG+849PDQMbL6czP8rvXY7vZV
-9pdpQfrENk4b5kePRW/6HaGSTvtgN7XOrYD9fp3pm/G534T2e3IxgYMRNwdB9Ul9
-bLwMqQqf4eiqqMs6x4IVmZUkGVMKiFKcvkNg9a+Ozx5pMizHeAezWMcZ5V+QJZVT
-8lElSCKZ2Yy2xkcl7aeQMLwcAeZwfTp+Yu9dVzlqXiiBTLd1+LtAQCuKHzmw4Q8k
-EvD5m49l
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/client/testdata/cert.pem b/installer/vendor/github.com/docker/docker/client/testdata/cert.pem
deleted file mode 100644
index 9000ffb32b..0000000000
--- a/installer/vendor/github.com/docker/docker/client/testdata/cert.pem
+++ /dev/null
@@ -1,18 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIC8DCCAdigAwIBAgIRAJAS1glgcke4q7eCaretwgUwDQYJKoZIhvcNAQELBQAw
-EjEQMA4GA1UEChMHdmluY2VudDAeFw0xNjAzMjQxMDE5MDBaFw0xOTAzMDkxMDE5
-MDBaMB4xHDAaBgNVBAoME3ZpbmNlbnQuPGJvb3RzdHJhcD4wggEiMA0GCSqGSIb3
-DQEBAQUAA4IBDwAwggEKAoIBAQClpvG442dGEvrRgmCrqY4kBml1LVlw2Y7ZDn6B
-TKa52+MuGDmfXbO1UhclNqTXjLgAwKjPz/OvnPRxNEUoQEDbBd+Xev7rxTY5TvYI
-27YH3fMH2LL2j62jum649abfhZ6ekD5eD8tCn3mnrEOgqRIlK7efPIVixq/ZqU1H
-7ez0ggB7dmWHlhnUaxyQOCSnAX/7nKYQXqZgVvGhDeR2jp7GcnhbK/qPrZ/mOm83
-2IjCeYN145opYlzTSp64GYIZz7uqMNcnDKK37ZbS8MYcTjrRaHEiqZVVdIC+ghbx
-qYqzbZRVfgztI9jwmifn0mYrN4yt+nhNYwBcRJ4Pv3uLFbo7AgMBAAGjNTAzMA4G
-A1UdDwEB/wQEAwIHgDATBgNVHSUEDDAKBggrBgEFBQcDAjAMBgNVHRMBAf8EAjAA
-MA0GCSqGSIb3DQEBCwUAA4IBAQDg1r7nksjYgDFYEcBbrRrRHddIoK+RVmSBTTrq
-8giC77m0srKdh9XTVWK1PUbGfODV1oD8m9QhPE8zPDyYQ8jeXNRSU5wXdkrTRmmY
-w/T3SREqmE7CObMtusokHidjYFuqqCR07sJzqBKRlzr3o0EGe3tuEhUlF5ARY028
-eipaDcVlT5ChGcDa6LeJ4e05u4cVap0dd6Rp1w3Rx1AYAecdgtgBMnw1iWdl/nrC
-sp26ZXNaAhFOUovlY9VY257AMd9hQV7WvAK4yNEHcckVu3uXTBmDgNSOPtl0QLsL
-Kjlj75ksCx8nCln/hCut/0+kGTsGZqdV5c6ktgcGYRir/5Hs
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/client/testdata/key.pem b/installer/vendor/github.com/docker/docker/client/testdata/key.pem
deleted file mode 100644
index c0869dfc1a..0000000000
--- a/installer/vendor/github.com/docker/docker/client/testdata/key.pem
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEApabxuONnRhL60YJgq6mOJAZpdS1ZcNmO2Q5+gUymudvjLhg5
-n12ztVIXJTak14y4AMCoz8/zr5z0cTRFKEBA2wXfl3r+68U2OU72CNu2B93zB9iy
-9o+to7puuPWm34WenpA+Xg/LQp95p6xDoKkSJSu3nzyFYsav2alNR+3s9IIAe3Zl
-h5YZ1GsckDgkpwF/+5ymEF6mYFbxoQ3kdo6exnJ4Wyv6j62f5jpvN9iIwnmDdeOa
-KWJc00qeuBmCGc+7qjDXJwyit+2W0vDGHE460WhxIqmVVXSAvoIW8amKs22UVX4M
-7SPY8Jon59JmKzeMrfp4TWMAXESeD797ixW6OwIDAQABAoIBAHfyAAleL8NfrtnR
-S+pApbmUIvxD0AWUooispBE/zWG6xC72P5MTqDJctIGvpYCmVf3Fgvamns7EGYN2
-07Sngc6V3Ca1WqyhaffpIuGbJZ1gqr89u6gotRRexBmNVj13ZTlvPJmjWgxtqQsu
-AvHsOkVL+HOGwRaaw24Z1umEcBVCepl7PGTqsLeJUtBUZBiqdJTu4JYLAB6BggBI
-OxhHoTWvlNWwzezo2C/IXkXcXD/tp3i5vTn5rAXHSMQkdMAUh7/xJ73Fl36gxZhp
-W7NoPKaS9qNh8jhs6p54S7tInb6+mrKtvRFKl5XAR3istXrXteT5UaukpuBbQ/5d
-qf4BXuECgYEAzoOKxMee5tG/G9iC6ImNq5xGAZm0OnmteNgIEQj49If1Q68av525
-FioqdC9zV+blfHQqXEIUeum4JAou4xqmB8Lw2H0lYwOJ1IkpUy3QJjU1IrI+U5Qy
-ryZuA9cxSTLf1AJFbROsoZDpjaBh0uUQkD/4PHpwXMgHu/3CaJ4nTEkCgYEAzVjE
-VWgczWJGyRxmHSeR51ft1jrlChZHEd3HwgLfo854JIj+MGUH4KPLSMIkYNuyiwNQ
-W7zdXCB47U8afSL/lPTv1M5+ZsWY6sZAT6gtp/IeU0Va943h9cj10fAOBJaz1H6M
-jnZS4jjWhVInE7wpCDVCwDRoHHJ84kb6JeflamMCgYBDQDcKie9HP3q6uLE4xMKr
-5gIuNz2n5UQGnGNUGNXp2/SVDArr55MEksqsd19aesi01KeOz74XoNDke6R1NJJo
-6KTB+08XhWl3GwuoGL02FBGvsNf3I8W1oBAnlAZqzfRx+CNfuA55ttU318jDgvD3
-6L0QBNdef411PNf4dbhacQKBgAd/e0PHFm4lbYJAaDYeUMSKwGN3KQ/SOmwblgSu
-iC36BwcGfYmU1tHMCUsx05Q50W4kA9Ylskt/4AqCPexdz8lHnE4/7/uesXO5I3YF
-JQ2h2Jufx6+MXbjUyq0Mv+ZI/m3+5PD6vxIFk0ew9T5SO4lSMIrGHxsSzx6QCuhB
-bG4TAoGBAJ5PWG7d2CyCjLtfF8J4NxykRvIQ8l/3kDvDdNrXiXbgonojo2lgRYaM
-5LoK9ApN8KHdedpTRipBaDA22Sp5SjMcUE7A6q42PJCL9r+BRYF0foFQx/rqpCff
-pVWKgwIPoKnfxDqN1RUgyFcx1jbA3XVJZCuT+wbMuDQ9nlvulD1W
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/client/transport.go b/installer/vendor/github.com/docker/docker/client/transport.go
deleted file mode 100644
index f04e601649..0000000000
--- a/installer/vendor/github.com/docker/docker/client/transport.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package client
-
-import (
-	"crypto/tls"
-	"errors"
-	"net/http"
-)
-
-var errTLSConfigUnavailable = errors.New("TLSConfig unavailable")
-
-// transportFunc allows us to inject a mock transport for testing. We define it
-// here so we can detect the tlsconfig and return nil for only this type.
-type transportFunc func(*http.Request) (*http.Response, error)
-
-func (tf transportFunc) RoundTrip(req *http.Request) (*http.Response, error) {
-	return tf(req)
-}
-
-// resolveTLSConfig attempts to resolve the tls configuration from the
-// RoundTripper.
-func resolveTLSConfig(transport http.RoundTripper) *tls.Config {
-	switch tr := transport.(type) {
-	case *http.Transport:
-		return tr.TLSClientConfig
-	default:
-		return nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/utils.go b/installer/vendor/github.com/docker/docker/client/utils.go
deleted file mode 100644
index 23d520ecb8..0000000000
--- a/installer/vendor/github.com/docker/docker/client/utils.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package client
-
-import (
-	"github.com/docker/docker/api/types/filters"
-	"net/url"
-	"regexp"
-)
-
-var headerRegexp = regexp.MustCompile(`\ADocker/.+\s\((.+)\)\z`)
-
-// getDockerOS returns the operating system based on the server header from the daemon.
-func getDockerOS(serverHeader string) string {
-	var osType string
-	matches := headerRegexp.FindStringSubmatch(serverHeader)
-	if len(matches) > 0 {
-		osType = matches[1]
-	}
-	return osType
-}
-
-// getFiltersQuery returns a url query with "filters" query term, based on the
-// filters provided.
-func getFiltersQuery(f filters.Args) (url.Values, error) {
-	query := url.Values{}
-	if f.Len() > 0 {
-		filterJSON, err := filters.ToParam(f)
-		if err != nil {
-			return query, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	return query, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/version.go b/installer/vendor/github.com/docker/docker/client/version.go
deleted file mode 100644
index 933ceb4a49..0000000000
--- a/installer/vendor/github.com/docker/docker/client/version.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// ServerVersion returns information of the docker client and server host.
-func (cli *Client) ServerVersion(ctx context.Context) (types.Version, error) {
-	resp, err := cli.get(ctx, "/version", nil, nil)
-	if err != nil {
-		return types.Version{}, err
-	}
-
-	var server types.Version
-	err = json.NewDecoder(resp.body).Decode(&server)
-	ensureReaderClosed(resp)
-	return server, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_create.go b/installer/vendor/github.com/docker/docker/client/volume_create.go
deleted file mode 100644
index 9620c87cbf..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_create.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// VolumeCreate creates a volume in the docker host.
-func (cli *Client) VolumeCreate(ctx context.Context, options volumetypes.VolumesCreateBody) (types.Volume, error) {
-	var volume types.Volume
-	resp, err := cli.post(ctx, "/volumes/create", nil, options, nil)
-	if err != nil {
-		return volume, err
-	}
-	err = json.NewDecoder(resp.body).Decode(&volume)
-	ensureReaderClosed(resp)
-	return volume, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_create_test.go b/installer/vendor/github.com/docker/docker/client/volume_create_test.go
deleted file mode 100644
index 9f1b2540b5..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_create_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-func TestVolumeCreateError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.VolumeCreate(context.Background(), volumetypes.VolumesCreateBody{})
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestVolumeCreate(t *testing.T) {
-	expectedURL := "/volumes/create"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-
-			if req.Method != "POST" {
-				return nil, fmt.Errorf("expected POST method, got %s", req.Method)
-			}
-
-			content, err := json.Marshal(types.Volume{
-				Name:       "volume",
-				Driver:     "local",
-				Mountpoint: "mountpoint",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	volume, err := client.VolumeCreate(context.Background(), volumetypes.VolumesCreateBody{
-		Name:   "myvolume",
-		Driver: "mydriver",
-		DriverOpts: map[string]string{
-			"opt-key": "opt-value",
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if volume.Name != "volume" {
-		t.Fatalf("expected volume.Name to be 'volume', got %s", volume.Name)
-	}
-	if volume.Driver != "local" {
-		t.Fatalf("expected volume.Driver to be 'local', got %s", volume.Driver)
-	}
-	if volume.Mountpoint != "mountpoint" {
-		t.Fatalf("expected volume.Mountpoint to be 'mountpoint', got %s", volume.Mountpoint)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_inspect.go b/installer/vendor/github.com/docker/docker/client/volume_inspect.go
deleted file mode 100644
index 3860e9b22c..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_inspect.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-// VolumeInspect returns the information about a specific volume in the docker host.
-func (cli *Client) VolumeInspect(ctx context.Context, volumeID string) (types.Volume, error) {
-	volume, _, err := cli.VolumeInspectWithRaw(ctx, volumeID)
-	return volume, err
-}
-
-// VolumeInspectWithRaw returns the information about a specific volume in the docker host and its raw representation
-func (cli *Client) VolumeInspectWithRaw(ctx context.Context, volumeID string) (types.Volume, []byte, error) {
-	var volume types.Volume
-	resp, err := cli.get(ctx, "/volumes/"+volumeID, nil, nil)
-	if err != nil {
-		if resp.statusCode == http.StatusNotFound {
-			return volume, nil, volumeNotFoundError{volumeID}
-		}
-		return volume, nil, err
-	}
-	defer ensureReaderClosed(resp)
-
-	body, err := ioutil.ReadAll(resp.body)
-	if err != nil {
-		return volume, nil, err
-	}
-	rdr := bytes.NewReader(body)
-	err = json.NewDecoder(rdr).Decode(&volume)
-	return volume, body, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_inspect_test.go b/installer/vendor/github.com/docker/docker/client/volume_inspect_test.go
deleted file mode 100644
index 0d1d118828..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_inspect_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"golang.org/x/net/context"
-)
-
-func TestVolumeInspectError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.VolumeInspect(context.Background(), "nothing")
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestVolumeInspectNotFound(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusNotFound, "Server error")),
-	}
-
-	_, err := client.VolumeInspect(context.Background(), "unknown")
-	if err == nil || !IsErrVolumeNotFound(err) {
-		t.Fatalf("expected a volumeNotFound error, got %v", err)
-	}
-}
-
-func TestVolumeInspect(t *testing.T) {
-	expectedURL := "/volumes/volume_id"
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "GET" {
-				return nil, fmt.Errorf("expected GET method, got %s", req.Method)
-			}
-			content, err := json.Marshal(types.Volume{
-				Name:       "name",
-				Driver:     "driver",
-				Mountpoint: "mountpoint",
-			})
-			if err != nil {
-				return nil, err
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader(content)),
-			}, nil
-		}),
-	}
-
-	v, err := client.VolumeInspect(context.Background(), "volume_id")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v.Name != "name" {
-		t.Fatalf("expected `name`, got %s", v.Name)
-	}
-	if v.Driver != "driver" {
-		t.Fatalf("expected `driver`, got %s", v.Driver)
-	}
-	if v.Mountpoint != "mountpoint" {
-		t.Fatalf("expected `mountpoint`, got %s", v.Mountpoint)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_list.go b/installer/vendor/github.com/docker/docker/client/volume_list.go
deleted file mode 100644
index 32247ce115..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_list.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"net/url"
-
-	"github.com/docker/docker/api/types/filters"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-// VolumeList returns the volumes configured in the docker host.
-func (cli *Client) VolumeList(ctx context.Context, filter filters.Args) (volumetypes.VolumesListOKBody, error) {
-	var volumes volumetypes.VolumesListOKBody
-	query := url.Values{}
-
-	if filter.Len() > 0 {
-		filterJSON, err := filters.ToParamWithVersion(cli.version, filter)
-		if err != nil {
-			return volumes, err
-		}
-		query.Set("filters", filterJSON)
-	}
-	resp, err := cli.get(ctx, "/volumes", query, nil)
-	if err != nil {
-		return volumes, err
-	}
-
-	err = json.NewDecoder(resp.body).Decode(&volumes)
-	ensureReaderClosed(resp)
-	return volumes, err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_list_test.go b/installer/vendor/github.com/docker/docker/client/volume_list_test.go
deleted file mode 100644
index f29639be23..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_list_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"golang.org/x/net/context"
-)
-
-func TestVolumeListError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	_, err := client.VolumeList(context.Background(), filters.NewArgs())
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestVolumeList(t *testing.T) {
-	expectedURL := "/volumes"
-
-	noDanglingFilters := filters.NewArgs()
-	noDanglingFilters.Add("dangling", "false")
-
-	danglingFilters := filters.NewArgs()
-	danglingFilters.Add("dangling", "true")
-
-	labelFilters := filters.NewArgs()
-	labelFilters.Add("label", "label1")
-	labelFilters.Add("label", "label2")
-
-	listCases := []struct {
-		filters         filters.Args
-		expectedFilters string
-	}{
-		{
-			filters:         filters.NewArgs(),
-			expectedFilters: "",
-		}, {
-			filters:         noDanglingFilters,
-			expectedFilters: `{"dangling":{"false":true}}`,
-		}, {
-			filters:         danglingFilters,
-			expectedFilters: `{"dangling":{"true":true}}`,
-		}, {
-			filters:         labelFilters,
-			expectedFilters: `{"label":{"label1":true,"label2":true}}`,
-		},
-	}
-
-	for _, listCase := range listCases {
-		client := &Client{
-			client: newMockClient(func(req *http.Request) (*http.Response, error) {
-				if !strings.HasPrefix(req.URL.Path, expectedURL) {
-					return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-				}
-				query := req.URL.Query()
-				actualFilters := query.Get("filters")
-				if actualFilters != listCase.expectedFilters {
-					return nil, fmt.Errorf("filters not set in URL query properly. Expected '%s', got %s", listCase.expectedFilters, actualFilters)
-				}
-				content, err := json.Marshal(volumetypes.VolumesListOKBody{
-					Volumes: []*types.Volume{
-						{
-							Name:   "volume",
-							Driver: "local",
-						},
-					},
-				})
-				if err != nil {
-					return nil, err
-				}
-				return &http.Response{
-					StatusCode: http.StatusOK,
-					Body:       ioutil.NopCloser(bytes.NewReader(content)),
-				}, nil
-			}),
-		}
-
-		volumeResponse, err := client.VolumeList(context.Background(), listCase.filters)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(volumeResponse.Volumes) != 1 {
-			t.Fatalf("expected 1 volume, got %v", volumeResponse.Volumes)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_prune.go b/installer/vendor/github.com/docker/docker/client/volume_prune.go
deleted file mode 100644
index a07e4ce637..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_prune.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package client
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"golang.org/x/net/context"
-)
-
-// VolumesPrune requests the daemon to delete unused data
-func (cli *Client) VolumesPrune(ctx context.Context, pruneFilters filters.Args) (types.VolumesPruneReport, error) {
-	var report types.VolumesPruneReport
-
-	if err := cli.NewVersionError("1.25", "volume prune"); err != nil {
-		return report, err
-	}
-
-	query, err := getFiltersQuery(pruneFilters)
-	if err != nil {
-		return report, err
-	}
-
-	serverResp, err := cli.post(ctx, "/volumes/prune", query, nil, nil)
-	if err != nil {
-		return report, err
-	}
-	defer ensureReaderClosed(serverResp)
-
-	if err := json.NewDecoder(serverResp.body).Decode(&report); err != nil {
-		return report, fmt.Errorf("Error retrieving disk usage: %v", err)
-	}
-
-	return report, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_remove.go b/installer/vendor/github.com/docker/docker/client/volume_remove.go
deleted file mode 100644
index 6c26575b49..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_remove.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package client
-
-import (
-	"net/url"
-
-	"github.com/docker/docker/api/types/versions"
-	"golang.org/x/net/context"
-)
-
-// VolumeRemove removes a volume from the docker host.
-func (cli *Client) VolumeRemove(ctx context.Context, volumeID string, force bool) error {
-	query := url.Values{}
-	if versions.GreaterThanOrEqualTo(cli.version, "1.25") {
-		if force {
-			query.Set("force", "1")
-		}
-	}
-	resp, err := cli.delete(ctx, "/volumes/"+volumeID, query, nil)
-	ensureReaderClosed(resp)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/client/volume_remove_test.go b/installer/vendor/github.com/docker/docker/client/volume_remove_test.go
deleted file mode 100644
index 1fe657349a..0000000000
--- a/installer/vendor/github.com/docker/docker/client/volume_remove_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestVolumeRemoveError(t *testing.T) {
-	client := &Client{
-		client: newMockClient(errorMock(http.StatusInternalServerError, "Server error")),
-	}
-
-	err := client.VolumeRemove(context.Background(), "volume_id", false)
-	if err == nil || err.Error() != "Error response from daemon: Server error" {
-		t.Fatalf("expected a Server Error, got %v", err)
-	}
-}
-
-func TestVolumeRemove(t *testing.T) {
-	expectedURL := "/volumes/volume_id"
-
-	client := &Client{
-		client: newMockClient(func(req *http.Request) (*http.Response, error) {
-			if !strings.HasPrefix(req.URL.Path, expectedURL) {
-				return nil, fmt.Errorf("Expected URL '%s', got '%s'", expectedURL, req.URL)
-			}
-			if req.Method != "DELETE" {
-				return nil, fmt.Errorf("expected DELETE method, got %s", req.Method)
-			}
-			return &http.Response{
-				StatusCode: http.StatusOK,
-				Body:       ioutil.NopCloser(bytes.NewReader([]byte("body"))),
-			}, nil
-		}),
-	}
-
-	err := client.VolumeRemove(context.Background(), "volume_id", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none.go b/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none.go
deleted file mode 100644
index 65f9f37be2..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build !daemon
-
-package main
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/spf13/cobra"
-)
-
-func newDaemonCommand() *cobra.Command {
-	return &cobra.Command{
-		Use:    "daemon",
-		Hidden: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDaemon()
-		},
-	}
-}
-
-func runDaemon() error {
-	return fmt.Errorf(
-		"`docker daemon` is not supported on %s. Please run `dockerd` directly",
-		strings.Title(runtime.GOOS))
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none_test.go b/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none_test.go
deleted file mode 100644
index 32032fe1b3..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_none_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build !daemon
-
-package main
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestDaemonCommand(t *testing.T) {
-	cmd := newDaemonCommand()
-	cmd.SetArgs([]string{"--help"})
-	err := cmd.Execute()
-
-	assert.Error(t, err, "Please run `dockerd`")
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unit_test.go b/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unit_test.go
deleted file mode 100644
index 26348a8843..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unit_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build daemon
-
-package main
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/spf13/cobra"
-)
-
-func stubRun(cmd *cobra.Command, args []string) error {
-	return nil
-}
-
-func TestDaemonCommandHelp(t *testing.T) {
-	cmd := newDaemonCommand()
-	cmd.RunE = stubRun
-	cmd.SetArgs([]string{"--help"})
-	err := cmd.Execute()
-	assert.NilError(t, err)
-}
-
-func TestDaemonCommand(t *testing.T) {
-	cmd := newDaemonCommand()
-	cmd.RunE = stubRun
-	cmd.SetArgs([]string{"--containerd", "/foo"})
-	err := cmd.Execute()
-	assert.NilError(t, err)
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unix.go b/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unix.go
deleted file mode 100644
index f68d220c2f..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/daemon_unix.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// +build daemon
-
-package main
-
-import (
-	"fmt"
-
-	"os"
-	"os/exec"
-	"path/filepath"
-	"syscall"
-
-	"github.com/spf13/cobra"
-)
-
-const daemonBinary = "dockerd"
-
-func newDaemonCommand() *cobra.Command {
-	cmd := &cobra.Command{
-		Use:                "daemon",
-		Hidden:             true,
-		Args:               cobra.ArbitraryArgs,
-		DisableFlagParsing: true,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			return runDaemon()
-		},
-		Deprecated: "and will be removed in Docker 1.16. Please run `dockerd` directly.",
-	}
-	cmd.SetHelpFunc(helpFunc)
-	return cmd
-}
-
-// CmdDaemon execs dockerd with the same flags
-func runDaemon() error {
-	// Use os.Args[1:] so that "global" args are passed to dockerd
-	return execDaemon(stripDaemonArg(os.Args[1:]))
-}
-
-func execDaemon(args []string) error {
-	binaryPath, err := findDaemonBinary()
-	if err != nil {
-		return err
-	}
-
-	return syscall.Exec(
-		binaryPath,
-		append([]string{daemonBinary}, args...),
-		os.Environ())
-}
-
-func helpFunc(cmd *cobra.Command, args []string) {
-	if err := execDaemon([]string{"--help"}); err != nil {
-		fmt.Fprintf(os.Stderr, "%s\n", err.Error())
-	}
-}
-
-// findDaemonBinary looks for the path to the dockerd binary starting with
-// the directory of the current executable (if one exists) and followed by $PATH
-func findDaemonBinary() (string, error) {
-	execDirname := filepath.Dir(os.Args[0])
-	if execDirname != "" {
-		binaryPath := filepath.Join(execDirname, daemonBinary)
-		if _, err := os.Stat(binaryPath); err == nil {
-			return binaryPath, nil
-		}
-	}
-
-	return exec.LookPath(daemonBinary)
-}
-
-// stripDaemonArg removes the `daemon` argument from the list
-func stripDaemonArg(args []string) []string {
-	for i, arg := range args {
-		if arg == "daemon" {
-			return append(args[:i], args[i+1:]...)
-		}
-	}
-	return args
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/docker.go b/installer/vendor/github.com/docker/docker/cmd/docker/docker.go
deleted file mode 100644
index d4847a90ee..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/docker.go
+++ /dev/null
@@ -1,180 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/cli"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/commands"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/utils"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-func newDockerCommand(dockerCli *command.DockerCli) *cobra.Command {
-	opts := cliflags.NewClientOptions()
-	var flags *pflag.FlagSet
-
-	cmd := &cobra.Command{
-		Use:              "docker [OPTIONS] COMMAND [ARG...]",
-		Short:            "A self-sufficient runtime for containers",
-		SilenceUsage:     true,
-		SilenceErrors:    true,
-		TraverseChildren: true,
-		Args:             noArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			if opts.Version {
-				showVersion()
-				return nil
-			}
-			return dockerCli.ShowHelp(cmd, args)
-		},
-		PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
-			// daemon command is special, we redirect directly to another binary
-			if cmd.Name() == "daemon" {
-				return nil
-			}
-			// flags must be the top-level command flags, not cmd.Flags()
-			opts.Common.SetDefaultOptions(flags)
-			dockerPreRun(opts)
-			if err := dockerCli.Initialize(opts); err != nil {
-				return err
-			}
-			return isSupported(cmd, dockerCli.Client().ClientVersion(), dockerCli.HasExperimental())
-		},
-	}
-	cli.SetupRootCommand(cmd)
-
-	cmd.SetHelpFunc(func(ccmd *cobra.Command, args []string) {
-		if dockerCli.Client() == nil { // when using --help, PersistenPreRun is not called, so initialization is needed.
-			// flags must be the top-level command flags, not cmd.Flags()
-			opts.Common.SetDefaultOptions(flags)
-			dockerPreRun(opts)
-			dockerCli.Initialize(opts)
-		}
-
-		if err := isSupported(ccmd, dockerCli.Client().ClientVersion(), dockerCli.HasExperimental()); err != nil {
-			ccmd.Println(err)
-			return
-		}
-
-		hideUnsupportedFeatures(ccmd, dockerCli.Client().ClientVersion(), dockerCli.HasExperimental())
-
-		if err := ccmd.Help(); err != nil {
-			ccmd.Println(err)
-		}
-	})
-
-	flags = cmd.Flags()
-	flags.BoolVarP(&opts.Version, "version", "v", false, "Print version information and quit")
-	flags.StringVar(&opts.ConfigDir, "config", cliconfig.ConfigDir(), "Location of client config files")
-	opts.Common.InstallFlags(flags)
-
-	cmd.SetOutput(dockerCli.Out())
-	cmd.AddCommand(newDaemonCommand())
-	commands.AddCommands(cmd, dockerCli)
-
-	return cmd
-}
-
-func noArgs(cmd *cobra.Command, args []string) error {
-	if len(args) == 0 {
-		return nil
-	}
-	return fmt.Errorf(
-		"docker: '%s' is not a docker command.\nSee 'docker --help'", args[0])
-}
-
-func main() {
-	// Set terminal emulation based on platform as required.
-	stdin, stdout, stderr := term.StdStreams()
-	logrus.SetOutput(stderr)
-
-	dockerCli := command.NewDockerCli(stdin, stdout, stderr)
-	cmd := newDockerCommand(dockerCli)
-
-	if err := cmd.Execute(); err != nil {
-		if sterr, ok := err.(cli.StatusError); ok {
-			if sterr.Status != "" {
-				fmt.Fprintln(stderr, sterr.Status)
-			}
-			// StatusError should only be used for errors, and all errors should
-			// have a non-zero exit status, so never exit with 0
-			if sterr.StatusCode == 0 {
-				os.Exit(1)
-			}
-			os.Exit(sterr.StatusCode)
-		}
-		fmt.Fprintln(stderr, err)
-		os.Exit(1)
-	}
-}
-
-func showVersion() {
-	fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
-}
-
-func dockerPreRun(opts *cliflags.ClientOptions) {
-	cliflags.SetLogLevel(opts.Common.LogLevel)
-
-	if opts.ConfigDir != "" {
-		cliconfig.SetConfigDir(opts.ConfigDir)
-	}
-
-	if opts.Common.Debug {
-		utils.EnableDebug()
-	}
-}
-
-func hideUnsupportedFeatures(cmd *cobra.Command, clientVersion string, hasExperimental bool) {
-	cmd.Flags().VisitAll(func(f *pflag.Flag) {
-		// hide experimental flags
-		if !hasExperimental {
-			if _, ok := f.Annotations["experimental"]; ok {
-				f.Hidden = true
-			}
-		}
-
-		// hide flags not supported by the server
-		if flagVersion, ok := f.Annotations["version"]; ok && len(flagVersion) == 1 && versions.LessThan(clientVersion, flagVersion[0]) {
-			f.Hidden = true
-		}
-
-	})
-
-	for _, subcmd := range cmd.Commands() {
-		// hide experimental subcommands
-		if !hasExperimental {
-			if _, ok := subcmd.Tags["experimental"]; ok {
-				subcmd.Hidden = true
-			}
-		}
-
-		// hide subcommands not supported by the server
-		if subcmdVersion, ok := subcmd.Tags["version"]; ok && versions.LessThan(clientVersion, subcmdVersion) {
-			subcmd.Hidden = true
-		}
-	}
-}
-
-func isSupported(cmd *cobra.Command, clientVersion string, hasExperimental bool) error {
-	if !hasExperimental {
-		if _, ok := cmd.Tags["experimental"]; ok {
-			return errors.New("only supported with experimental daemon")
-		}
-	}
-
-	if cmdVersion, ok := cmd.Tags["version"]; ok && versions.LessThan(clientVersion, cmdVersion) {
-		return fmt.Errorf("only supported with daemon version >= %s", cmdVersion)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/docker_test.go b/installer/vendor/github.com/docker/docker/cmd/docker/docker_test.go
deleted file mode 100644
index 8738f6005d..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/docker_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/docker/docker/utils"
-)
-
-func TestClientDebugEnabled(t *testing.T) {
-	defer utils.DisableDebug()
-
-	cmd := newDockerCommand(&command.DockerCli{})
-	cmd.Flags().Set("debug", "true")
-
-	err := cmd.PersistentPreRunE(cmd, []string{})
-	assert.NilError(t, err)
-	assert.Equal(t, os.Getenv("DEBUG"), "1")
-	assert.Equal(t, logrus.GetLevel(), logrus.DebugLevel)
-}
-
-func TestExitStatusForInvalidSubcommandWithHelpFlag(t *testing.T) {
-	discard := ioutil.Discard
-	cmd := newDockerCommand(command.NewDockerCli(os.Stdin, discard, discard))
-	cmd.SetArgs([]string{"help", "invalid"})
-	err := cmd.Execute()
-	assert.Error(t, err, "unknown help topic: invalid")
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/docker/docker_windows.go b/installer/vendor/github.com/docker/docker/cmd/docker/docker_windows.go
deleted file mode 100644
index 9bc507e20c..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/docker/docker_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package main
-
-import (
-	"sync/atomic"
-
-	_ "github.com/docker/docker/autogen/winresources/docker"
-)
-
-//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
-
-var dummy uintptr
-
-func init() {
-	// Ensure that this import is not removed by the linker. This is used to
-	// ensure that shell32.dll is loaded by the system loader, preventing
-	// go#15286 from triggering on Nano Server TP5.
-	atomic.LoadUintptr(&dummy)
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/README.md b/installer/vendor/github.com/docker/docker/cmd/dockerd/README.md
deleted file mode 100644
index a8c20b3549..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-docker.go contains Docker daemon's main function.
-
-This file provides first line CLI argument parsing and environment variable setting.
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon.go
deleted file mode 100644
index 2f099e0199..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon.go
+++ /dev/null
@@ -1,524 +0,0 @@
-package main
-
-import (
-	"crypto/tls"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/uuid"
-	"github.com/docker/docker/api"
-	apiserver "github.com/docker/docker/api/server"
-	"github.com/docker/docker/api/server/middleware"
-	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/api/server/router/build"
-	checkpointrouter "github.com/docker/docker/api/server/router/checkpoint"
-	"github.com/docker/docker/api/server/router/container"
-	"github.com/docker/docker/api/server/router/image"
-	"github.com/docker/docker/api/server/router/network"
-	pluginrouter "github.com/docker/docker/api/server/router/plugin"
-	swarmrouter "github.com/docker/docker/api/server/router/swarm"
-	systemrouter "github.com/docker/docker/api/server/router/system"
-	"github.com/docker/docker/api/server/router/volume"
-	"github.com/docker/docker/builder/dockerfile"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/cluster"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/libcontainerd"
-	dopts "github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/authorization"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/listeners"
-	"github.com/docker/docker/pkg/pidfile"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/registry"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/docker/utils"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/spf13/pflag"
-)
-
-const (
-	flagDaemonConfigFile = "config-file"
-)
-
-// DaemonCli represents the daemon CLI.
-type DaemonCli struct {
-	*daemon.Config
-	configFile *string
-	flags      *pflag.FlagSet
-
-	api             *apiserver.Server
-	d               *daemon.Daemon
-	authzMiddleware *authorization.Middleware // authzMiddleware enables to dynamically reload the authorization plugins
-}
-
-// NewDaemonCli returns a daemon CLI
-func NewDaemonCli() *DaemonCli {
-	return &DaemonCli{}
-}
-
-func migrateKey(config *daemon.Config) (err error) {
-	// No migration necessary on Windows
-	if runtime.GOOS == "windows" {
-		return nil
-	}
-
-	// Migrate trust key if exists at ~/.docker/key.json and owned by current user
-	oldPath := filepath.Join(cliconfig.ConfigDir(), cliflags.DefaultTrustKeyFile)
-	newPath := filepath.Join(getDaemonConfDir(config.Root), cliflags.DefaultTrustKeyFile)
-	if _, statErr := os.Stat(newPath); os.IsNotExist(statErr) && currentUserIsOwner(oldPath) {
-		defer func() {
-			// Ensure old path is removed if no error occurred
-			if err == nil {
-				err = os.Remove(oldPath)
-			} else {
-				logrus.Warnf("Key migration failed, key file not removed at %s", oldPath)
-				os.Remove(newPath)
-			}
-		}()
-
-		if err := system.MkdirAll(getDaemonConfDir(config.Root), os.FileMode(0644)); err != nil {
-			return fmt.Errorf("Unable to create daemon configuration directory: %s", err)
-		}
-
-		newFile, err := os.OpenFile(newPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0600)
-		if err != nil {
-			return fmt.Errorf("error creating key file %q: %s", newPath, err)
-		}
-		defer newFile.Close()
-
-		oldFile, err := os.Open(oldPath)
-		if err != nil {
-			return fmt.Errorf("error opening key file %q: %s", oldPath, err)
-		}
-		defer oldFile.Close()
-
-		if _, err := io.Copy(newFile, oldFile); err != nil {
-			return fmt.Errorf("error copying key: %s", err)
-		}
-
-		logrus.Infof("Migrated key from %s to %s", oldPath, newPath)
-	}
-
-	return nil
-}
-
-func (cli *DaemonCli) start(opts daemonOptions) (err error) {
-	stopc := make(chan bool)
-	defer close(stopc)
-
-	// warn from uuid package when running the daemon
-	uuid.Loggerf = logrus.Warnf
-
-	opts.common.SetDefaultOptions(opts.flags)
-
-	if cli.Config, err = loadDaemonCliConfig(opts); err != nil {
-		return err
-	}
-	cli.configFile = &opts.configFile
-	cli.flags = opts.flags
-
-	if opts.common.TrustKey == "" {
-		opts.common.TrustKey = filepath.Join(
-			getDaemonConfDir(cli.Config.Root),
-			cliflags.DefaultTrustKeyFile)
-	}
-
-	if cli.Config.Debug {
-		utils.EnableDebug()
-	}
-
-	if cli.Config.Experimental {
-		logrus.Warn("Running experimental build")
-	}
-
-	logrus.SetFormatter(&logrus.TextFormatter{
-		TimestampFormat: jsonlog.RFC3339NanoFixed,
-		DisableColors:   cli.Config.RawLogs,
-	})
-
-	if err := setDefaultUmask(); err != nil {
-		return fmt.Errorf("Failed to set umask: %v", err)
-	}
-
-	if len(cli.LogConfig.Config) > 0 {
-		if err := logger.ValidateLogOpts(cli.LogConfig.Type, cli.LogConfig.Config); err != nil {
-			return fmt.Errorf("Failed to set log opts: %v", err)
-		}
-	}
-
-	// Create the daemon root before we create ANY other files (PID, or migrate keys)
-	// to ensure the appropriate ACL is set (particularly relevant on Windows)
-	if err := daemon.CreateDaemonRoot(cli.Config); err != nil {
-		return err
-	}
-
-	if cli.Pidfile != "" {
-		pf, err := pidfile.New(cli.Pidfile)
-		if err != nil {
-			return fmt.Errorf("Error starting daemon: %v", err)
-		}
-		defer func() {
-			if err := pf.Remove(); err != nil {
-				logrus.Error(err)
-			}
-		}()
-	}
-
-	serverConfig := &apiserver.Config{
-		Logging:     true,
-		SocketGroup: cli.Config.SocketGroup,
-		Version:     dockerversion.Version,
-		EnableCors:  cli.Config.EnableCors,
-		CorsHeaders: cli.Config.CorsHeaders,
-	}
-
-	if cli.Config.TLS {
-		tlsOptions := tlsconfig.Options{
-			CAFile:   cli.Config.CommonTLSOptions.CAFile,
-			CertFile: cli.Config.CommonTLSOptions.CertFile,
-			KeyFile:  cli.Config.CommonTLSOptions.KeyFile,
-		}
-
-		if cli.Config.TLSVerify {
-			// server requires and verifies client's certificate
-			tlsOptions.ClientAuth = tls.RequireAndVerifyClientCert
-		}
-		tlsConfig, err := tlsconfig.Server(tlsOptions)
-		if err != nil {
-			return err
-		}
-		serverConfig.TLSConfig = tlsConfig
-	}
-
-	if len(cli.Config.Hosts) == 0 {
-		cli.Config.Hosts = make([]string, 1)
-	}
-
-	api := apiserver.New(serverConfig)
-	cli.api = api
-
-	for i := 0; i < len(cli.Config.Hosts); i++ {
-		var err error
-		if cli.Config.Hosts[i], err = dopts.ParseHost(cli.Config.TLS, cli.Config.Hosts[i]); err != nil {
-			return fmt.Errorf("error parsing -H %s : %v", cli.Config.Hosts[i], err)
-		}
-
-		protoAddr := cli.Config.Hosts[i]
-		protoAddrParts := strings.SplitN(protoAddr, "://", 2)
-		if len(protoAddrParts) != 2 {
-			return fmt.Errorf("bad format %s, expected PROTO://ADDR", protoAddr)
-		}
-
-		proto := protoAddrParts[0]
-		addr := protoAddrParts[1]
-
-		// It's a bad idea to bind to TCP without tlsverify.
-		if proto == "tcp" && (serverConfig.TLSConfig == nil || serverConfig.TLSConfig.ClientAuth != tls.RequireAndVerifyClientCert) {
-			logrus.Warn("[!] DON'T BIND ON ANY IP ADDRESS WITHOUT setting -tlsverify IF YOU DON'T KNOW WHAT YOU'RE DOING [!]")
-		}
-		ls, err := listeners.Init(proto, addr, serverConfig.SocketGroup, serverConfig.TLSConfig)
-		if err != nil {
-			return err
-		}
-		ls = wrapListeners(proto, ls)
-		// If we're binding to a TCP port, make sure that a container doesn't try to use it.
-		if proto == "tcp" {
-			if err := allocateDaemonPort(addr); err != nil {
-				return err
-			}
-		}
-		logrus.Debugf("Listener created for HTTP on %s (%s)", proto, addr)
-		api.Accept(addr, ls...)
-	}
-
-	if err := migrateKey(cli.Config); err != nil {
-		return err
-	}
-
-	// FIXME: why is this down here instead of with the other TrustKey logic above?
-	cli.TrustKeyPath = opts.common.TrustKey
-
-	registryService := registry.NewService(cli.Config.ServiceOptions)
-	containerdRemote, err := libcontainerd.New(cli.getLibcontainerdRoot(), cli.getPlatformRemoteOptions()...)
-	if err != nil {
-		return err
-	}
-	signal.Trap(func() {
-		cli.stop()
-		<-stopc // wait for daemonCli.start() to return
-	})
-
-	d, err := daemon.NewDaemon(cli.Config, registryService, containerdRemote)
-	if err != nil {
-		return fmt.Errorf("Error starting daemon: %v", err)
-	}
-
-	if cli.Config.MetricsAddress != "" {
-		if !d.HasExperimental() {
-			return fmt.Errorf("metrics-addr is only supported when experimental is enabled")
-		}
-		if err := startMetricsServer(cli.Config.MetricsAddress); err != nil {
-			return err
-		}
-	}
-
-	name, _ := os.Hostname()
-
-	c, err := cluster.New(cluster.Config{
-		Root:                   cli.Config.Root,
-		Name:                   name,
-		Backend:                d,
-		NetworkSubnetsProvider: d,
-		DefaultAdvertiseAddr:   cli.Config.SwarmDefaultAdvertiseAddr,
-		RuntimeRoot:            cli.getSwarmRunRoot(),
-	})
-	if err != nil {
-		logrus.Fatalf("Error creating cluster component: %v", err)
-	}
-
-	// Restart all autostart containers which has a swarm endpoint
-	// and is not yet running now that we have successfully
-	// initialized the cluster.
-	d.RestartSwarmContainers()
-
-	logrus.Info("Daemon has completed initialization")
-
-	logrus.WithFields(logrus.Fields{
-		"version":     dockerversion.Version,
-		"commit":      dockerversion.GitCommit,
-		"graphdriver": d.GraphDriverName(),
-	}).Info("Docker daemon")
-
-	cli.d = d
-
-	// initMiddlewares needs cli.d to be populated. Dont change this init order.
-	if err := cli.initMiddlewares(api, serverConfig); err != nil {
-		logrus.Fatalf("Error creating middlewares: %v", err)
-	}
-	d.SetCluster(c)
-	initRouter(api, d, c)
-
-	cli.setupConfigReloadTrap()
-
-	// The serve API routine never exits unless an error occurs
-	// We need to start it as a goroutine and wait on it so
-	// daemon doesn't exit
-	serveAPIWait := make(chan error)
-	go api.Wait(serveAPIWait)
-
-	// after the daemon is done setting up we can notify systemd api
-	notifySystem()
-
-	// Daemon is fully initialized and handling API traffic
-	// Wait for serve API to complete
-	errAPI := <-serveAPIWait
-	c.Cleanup()
-	shutdownDaemon(d)
-	containerdRemote.Cleanup()
-	if errAPI != nil {
-		return fmt.Errorf("Shutting down due to ServeAPI error: %v", errAPI)
-	}
-
-	return nil
-}
-
-func (cli *DaemonCli) reloadConfig() {
-	reload := func(config *daemon.Config) {
-
-		// Revalidate and reload the authorization plugins
-		if err := validateAuthzPlugins(config.AuthorizationPlugins, cli.d.PluginStore); err != nil {
-			logrus.Fatalf("Error validating authorization plugin: %v", err)
-			return
-		}
-		cli.authzMiddleware.SetPlugins(config.AuthorizationPlugins)
-
-		if err := cli.d.Reload(config); err != nil {
-			logrus.Errorf("Error reconfiguring the daemon: %v", err)
-			return
-		}
-
-		if config.IsValueSet("debug") {
-			debugEnabled := utils.IsDebugEnabled()
-			switch {
-			case debugEnabled && !config.Debug: // disable debug
-				utils.DisableDebug()
-				cli.api.DisableProfiler()
-			case config.Debug && !debugEnabled: // enable debug
-				utils.EnableDebug()
-				cli.api.EnableProfiler()
-			}
-
-		}
-	}
-
-	if err := daemon.ReloadConfiguration(*cli.configFile, cli.flags, reload); err != nil {
-		logrus.Error(err)
-	}
-}
-
-func (cli *DaemonCli) stop() {
-	cli.api.Close()
-}
-
-// shutdownDaemon just wraps daemon.Shutdown() to handle a timeout in case
-// d.Shutdown() is waiting too long to kill container or worst it's
-// blocked there
-func shutdownDaemon(d *daemon.Daemon) {
-	shutdownTimeout := d.ShutdownTimeout()
-	ch := make(chan struct{})
-	go func() {
-		d.Shutdown()
-		close(ch)
-	}()
-	if shutdownTimeout < 0 {
-		<-ch
-		logrus.Debug("Clean shutdown succeeded")
-		return
-	}
-	select {
-	case <-ch:
-		logrus.Debug("Clean shutdown succeeded")
-	case <-time.After(time.Duration(shutdownTimeout) * time.Second):
-		logrus.Error("Force shutdown daemon")
-	}
-}
-
-func loadDaemonCliConfig(opts daemonOptions) (*daemon.Config, error) {
-	config := opts.daemonConfig
-	flags := opts.flags
-	config.Debug = opts.common.Debug
-	config.Hosts = opts.common.Hosts
-	config.LogLevel = opts.common.LogLevel
-	config.TLS = opts.common.TLS
-	config.TLSVerify = opts.common.TLSVerify
-	config.CommonTLSOptions = daemon.CommonTLSOptions{}
-
-	if opts.common.TLSOptions != nil {
-		config.CommonTLSOptions.CAFile = opts.common.TLSOptions.CAFile
-		config.CommonTLSOptions.CertFile = opts.common.TLSOptions.CertFile
-		config.CommonTLSOptions.KeyFile = opts.common.TLSOptions.KeyFile
-	}
-
-	if opts.configFile != "" {
-		c, err := daemon.MergeDaemonConfigurations(config, flags, opts.configFile)
-		if err != nil {
-			if flags.Changed(flagDaemonConfigFile) || !os.IsNotExist(err) {
-				return nil, fmt.Errorf("unable to configure the Docker daemon with file %s: %v\n", opts.configFile, err)
-			}
-		}
-		// the merged configuration can be nil if the config file didn't exist.
-		// leave the current configuration as it is if when that happens.
-		if c != nil {
-			config = c
-		}
-	}
-
-	if err := daemon.ValidateConfiguration(config); err != nil {
-		return nil, err
-	}
-
-	// Labels of the docker engine used to allow multiple values associated with the same key.
-	// This is deprecated in 1.13, and, be removed after 3 release cycles.
-	// The following will check the conflict of labels, and report a warning for deprecation.
-	//
-	// TODO: After 3 release cycles (1.16) an error will be returned, and labels will be
-	// sanitized to consolidate duplicate key-value pairs (config.Labels = newLabels):
-	//
-	// newLabels, err := daemon.GetConflictFreeLabels(config.Labels)
-	// if err != nil {
-	//	return nil, err
-	// }
-	// config.Labels = newLabels
-	//
-	if _, err := daemon.GetConflictFreeLabels(config.Labels); err != nil {
-		logrus.Warnf("Engine labels with duplicate keys and conflicting values have been deprecated: %s", err)
-	}
-
-	// Regardless of whether the user sets it to true or false, if they
-	// specify TLSVerify at all then we need to turn on TLS
-	if config.IsValueSet(cliflags.FlagTLSVerify) {
-		config.TLS = true
-	}
-
-	// ensure that the log level is the one set after merging configurations
-	cliflags.SetLogLevel(config.LogLevel)
-
-	return config, nil
-}
-
-func initRouter(s *apiserver.Server, d *daemon.Daemon, c *cluster.Cluster) {
-	decoder := runconfig.ContainerDecoder{}
-
-	routers := []router.Router{
-		// we need to add the checkpoint router before the container router or the DELETE gets masked
-		checkpointrouter.NewRouter(d, decoder),
-		container.NewRouter(d, decoder),
-		image.NewRouter(d, decoder),
-		systemrouter.NewRouter(d, c),
-		volume.NewRouter(d),
-		build.NewRouter(dockerfile.NewBuildManager(d)),
-		swarmrouter.NewRouter(c),
-		pluginrouter.NewRouter(d.PluginManager()),
-	}
-
-	if d.NetworkControllerEnabled() {
-		routers = append(routers, network.NewRouter(d, c))
-	}
-
-	if d.HasExperimental() {
-		for _, r := range routers {
-			for _, route := range r.Routes() {
-				if experimental, ok := route.(router.ExperimentalRoute); ok {
-					experimental.Enable()
-				}
-			}
-		}
-	}
-
-	s.InitRouter(utils.IsDebugEnabled(), routers...)
-}
-
-func (cli *DaemonCli) initMiddlewares(s *apiserver.Server, cfg *apiserver.Config) error {
-	v := cfg.Version
-
-	exp := middleware.NewExperimentalMiddleware(cli.d.HasExperimental())
-	s.UseMiddleware(exp)
-
-	vm := middleware.NewVersionMiddleware(v, api.DefaultVersion, api.MinVersion)
-	s.UseMiddleware(vm)
-
-	if cfg.EnableCors {
-		c := middleware.NewCORSMiddleware(cfg.CorsHeaders)
-		s.UseMiddleware(c)
-	}
-
-	if err := validateAuthzPlugins(cli.Config.AuthorizationPlugins, cli.d.PluginStore); err != nil {
-		return fmt.Errorf("Error validating authorization plugin: %v", err)
-	}
-	cli.authzMiddleware = authorization.NewMiddleware(cli.Config.AuthorizationPlugins, cli.d.PluginStore)
-	s.UseMiddleware(cli.authzMiddleware)
-	return nil
-}
-
-// validates that the plugins requested with the --authorization-plugin flag are valid AuthzDriver
-// plugins present on the host and available to the daemon
-func validateAuthzPlugins(requestedPlugins []string, pg plugingetter.PluginGetter) error {
-	for _, reqPlugin := range requestedPlugins {
-		if _, err := pg.Get(reqPlugin, authorization.AuthZApiImplements, plugingetter.LOOKUP); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_freebsd.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_freebsd.go
deleted file mode 100644
index 623aaf4b09..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_freebsd.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package main
-
-// notifySystem sends a message to the host when the server is ready to be used
-func notifySystem() {
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_linux.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_linux.go
deleted file mode 100644
index a556daa187..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_linux.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build linux
-
-package main
-
-import systemdDaemon "github.com/coreos/go-systemd/daemon"
-
-// notifySystem sends a message to the host when the server is ready to be used
-func notifySystem() {
-	// Tell the init daemon we are accepting requests
-	go systemdDaemon.SdNotify("READY=1")
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_solaris.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_solaris.go
deleted file mode 100644
index 974ba16345..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_solaris.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// +build solaris
-
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/system"
-)
-
-const defaultDaemonConfigFile = ""
-
-// currentUserIsOwner checks whether the current user is the owner of the given
-// file.
-func currentUserIsOwner(f string) bool {
-	if fileInfo, err := system.Stat(f); err == nil && fileInfo != nil {
-		if int(fileInfo.UID()) == os.Getuid() {
-			return true
-		}
-	}
-	return false
-}
-
-// setDefaultUmask sets the umask to 0022 to avoid problems
-// caused by custom umask
-func setDefaultUmask() error {
-	desiredUmask := 0022
-	syscall.Umask(desiredUmask)
-	if umask := syscall.Umask(desiredUmask); umask != desiredUmask {
-		return fmt.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask)
-	}
-
-	return nil
-}
-
-func getDaemonConfDir(_ string) string {
-	return "/etc/docker"
-}
-
-// setupConfigReloadTrap configures the USR2 signal to reload the configuration.
-func (cli *DaemonCli) setupConfigReloadTrap() {
-}
-
-// notifySystem sends a message to the host when the server is ready to be used
-func notifySystem() {
-}
-
-func (cli *DaemonCli) getPlatformRemoteOptions() []libcontainerd.RemoteOption {
-	opts := []libcontainerd.RemoteOption{}
-	if cli.Config.ContainerdAddr != "" {
-		opts = append(opts, libcontainerd.WithRemoteAddr(cli.Config.ContainerdAddr))
-	} else {
-		opts = append(opts, libcontainerd.WithStartDaemon(true))
-	}
-	return opts
-}
-
-// getLibcontainerdRoot gets the root directory for libcontainerd/containerd to
-// store their state.
-func (cli *DaemonCli) getLibcontainerdRoot() string {
-	return filepath.Join(cli.Config.ExecRoot, "libcontainerd")
-}
-
-// getSwarmRunRoot gets the root directory for swarm to store runtime state
-// For example, the control socket
-func (cli *DaemonCli) getSwarmRunRoot() string {
-	return filepath.Join(cli.Config.ExecRoot, "swarm")
-}
-
-func allocateDaemonPort(addr string) error {
-	return nil
-}
-
-// notifyShutdown is called after the daemon shuts down but before the process exits.
-func notifyShutdown(err error) {
-}
-
-func wrapListeners(proto string, ls []net.Listener) []net.Listener {
-	return ls
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_test.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_test.go
deleted file mode 100644
index b364f87843..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package main
-
-import (
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/docker/docker/pkg/testutil/tempfile"
-	"github.com/spf13/pflag"
-)
-
-func defaultOptions(configFile string) daemonOptions {
-	opts := daemonOptions{
-		daemonConfig: &daemon.Config{},
-		flags:        &pflag.FlagSet{},
-		common:       cliflags.NewCommonOptions(),
-	}
-	opts.common.InstallFlags(opts.flags)
-	opts.daemonConfig.InstallFlags(opts.flags)
-	opts.flags.StringVar(&opts.configFile, flagDaemonConfigFile, defaultDaemonConfigFile, "")
-	opts.configFile = configFile
-	return opts
-}
-
-func TestLoadDaemonCliConfigWithoutOverriding(t *testing.T) {
-	opts := defaultOptions("")
-	opts.common.Debug = true
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	if !loadedConfig.Debug {
-		t.Fatalf("expected debug to be copied from the common flags, got false")
-	}
-}
-
-func TestLoadDaemonCliConfigWithTLS(t *testing.T) {
-	opts := defaultOptions("")
-	opts.common.TLSOptions.CAFile = "/tmp/ca.pem"
-	opts.common.TLS = true
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.CommonTLSOptions.CAFile, "/tmp/ca.pem")
-}
-
-func TestLoadDaemonCliConfigWithConflicts(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{"labels": ["l3=foo"]}`)
-	defer tempFile.Remove()
-	configFile := tempFile.Name()
-
-	opts := defaultOptions(configFile)
-	flags := opts.flags
-
-	assert.NilError(t, flags.Set(flagDaemonConfigFile, configFile))
-	assert.NilError(t, flags.Set("label", "l1=bar"))
-	assert.NilError(t, flags.Set("label", "l2=baz"))
-
-	_, err := loadDaemonCliConfig(opts)
-	assert.Error(t, err, "as a flag and in the configuration file: labels")
-}
-
-func TestLoadDaemonCliConfigWithTLSVerify(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{"tlsverify": true}`)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	opts.common.TLSOptions.CAFile = "/tmp/ca.pem"
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.TLS, true)
-}
-
-func TestLoadDaemonCliConfigWithExplicitTLSVerifyFalse(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{"tlsverify": false}`)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	opts.common.TLSOptions.CAFile = "/tmp/ca.pem"
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.TLS, true)
-}
-
-func TestLoadDaemonCliConfigWithoutTLSVerify(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{}`)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	opts.common.TLSOptions.CAFile = "/tmp/ca.pem"
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.TLS, false)
-}
-
-func TestLoadDaemonCliConfigWithLogLevel(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{"log-level": "warn"}`)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.LogLevel, "warn")
-	assert.Equal(t, logrus.GetLevel(), logrus.WarnLevel)
-}
-
-func TestLoadDaemonConfigWithEmbeddedOptions(t *testing.T) {
-	content := `{"tlscacert": "/etc/certs/ca.pem", "log-driver": "syslog"}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.CommonTLSOptions.CAFile, "/etc/certs/ca.pem")
-	assert.Equal(t, loadedConfig.LogConfig.Type, "syslog")
-}
-
-func TestLoadDaemonConfigWithRegistryOptions(t *testing.T) {
-	content := `{
-		"registry-mirrors": ["https://mirrors.docker.com"],
-		"insecure-registries": ["https://insecure.docker.com"]
-	}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-
-	assert.Equal(t, len(loadedConfig.Mirrors), 1)
-	assert.Equal(t, len(loadedConfig.InsecureRegistries), 1)
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix.go
deleted file mode 100644
index bdce98bd26..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// +build !windows,!solaris
-
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"os/signal"
-	"path/filepath"
-	"strconv"
-	"syscall"
-
-	"github.com/docker/docker/cmd/dockerd/hack"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/libnetwork/portallocator"
-)
-
-const defaultDaemonConfigFile = "/etc/docker/daemon.json"
-
-// currentUserIsOwner checks whether the current user is the owner of the given
-// file.
-func currentUserIsOwner(f string) bool {
-	if fileInfo, err := system.Stat(f); err == nil && fileInfo != nil {
-		if int(fileInfo.UID()) == os.Getuid() {
-			return true
-		}
-	}
-	return false
-}
-
-// setDefaultUmask sets the umask to 0022 to avoid problems
-// caused by custom umask
-func setDefaultUmask() error {
-	desiredUmask := 0022
-	syscall.Umask(desiredUmask)
-	if umask := syscall.Umask(desiredUmask); umask != desiredUmask {
-		return fmt.Errorf("failed to set umask: expected %#o, got %#o", desiredUmask, umask)
-	}
-
-	return nil
-}
-
-func getDaemonConfDir(_ string) string {
-	return "/etc/docker"
-}
-
-// setupConfigReloadTrap configures the USR2 signal to reload the configuration.
-func (cli *DaemonCli) setupConfigReloadTrap() {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGHUP)
-	go func() {
-		for range c {
-			cli.reloadConfig()
-		}
-	}()
-}
-
-func (cli *DaemonCli) getPlatformRemoteOptions() []libcontainerd.RemoteOption {
-	opts := []libcontainerd.RemoteOption{
-		libcontainerd.WithDebugLog(cli.Config.Debug),
-		libcontainerd.WithOOMScore(cli.Config.OOMScoreAdjust),
-	}
-	if cli.Config.ContainerdAddr != "" {
-		opts = append(opts, libcontainerd.WithRemoteAddr(cli.Config.ContainerdAddr))
-	} else {
-		opts = append(opts, libcontainerd.WithStartDaemon(true))
-	}
-	if daemon.UsingSystemd(cli.Config) {
-		args := []string{"--systemd-cgroup=true"}
-		opts = append(opts, libcontainerd.WithRuntimeArgs(args))
-	}
-	if cli.Config.LiveRestoreEnabled {
-		opts = append(opts, libcontainerd.WithLiveRestore(true))
-	}
-	opts = append(opts, libcontainerd.WithRuntimePath(daemon.DefaultRuntimeBinary))
-	return opts
-}
-
-// getLibcontainerdRoot gets the root directory for libcontainerd/containerd to
-// store their state.
-func (cli *DaemonCli) getLibcontainerdRoot() string {
-	return filepath.Join(cli.Config.ExecRoot, "libcontainerd")
-}
-
-// getSwarmRunRoot gets the root directory for swarm to store runtime state
-// For example, the control socket
-func (cli *DaemonCli) getSwarmRunRoot() string {
-	return filepath.Join(cli.Config.ExecRoot, "swarm")
-}
-
-// allocateDaemonPort ensures that there are no containers
-// that try to use any port allocated for the docker server.
-func allocateDaemonPort(addr string) error {
-	host, port, err := net.SplitHostPort(addr)
-	if err != nil {
-		return err
-	}
-
-	intPort, err := strconv.Atoi(port)
-	if err != nil {
-		return err
-	}
-
-	var hostIPs []net.IP
-	if parsedIP := net.ParseIP(host); parsedIP != nil {
-		hostIPs = append(hostIPs, parsedIP)
-	} else if hostIPs, err = net.LookupIP(host); err != nil {
-		return fmt.Errorf("failed to lookup %s address in host specification", host)
-	}
-
-	pa := portallocator.Get()
-	for _, hostIP := range hostIPs {
-		if _, err := pa.RequestPort(hostIP, "tcp", intPort); err != nil {
-			return fmt.Errorf("failed to allocate daemon listening port %d (err: %v)", intPort, err)
-		}
-	}
-	return nil
-}
-
-// notifyShutdown is called after the daemon shuts down but before the process exits.
-func notifyShutdown(err error) {
-}
-
-func wrapListeners(proto string, ls []net.Listener) []net.Listener {
-	switch proto {
-	case "unix":
-		ls[0] = &hack.MalformedHostHeaderOverride{ls[0]}
-	case "fd":
-		for i := range ls {
-			ls[i] = &hack.MalformedHostHeaderOverride{ls[i]}
-		}
-	}
-	return ls
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix_test.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix_test.go
deleted file mode 100644
index d66dba77e1..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_unix_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// +build !windows,!solaris
-
-// TODO: Create new file for Solaris which tests config parameters
-// as described in daemon/config_solaris.go
-
-package main
-
-import (
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/docker/docker/pkg/testutil/tempfile"
-	"testing"
-)
-
-func TestLoadDaemonCliConfigWithDaemonFlags(t *testing.T) {
-	content := `{"log-opts": {"max-size": "1k"}}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	opts.common.Debug = true
-	opts.common.LogLevel = "info"
-	assert.NilError(t, opts.flags.Set("selinux-enabled", "true"))
-
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-
-	assert.Equal(t, loadedConfig.Debug, true)
-	assert.Equal(t, loadedConfig.LogLevel, "info")
-	assert.Equal(t, loadedConfig.EnableSelinuxSupport, true)
-	assert.Equal(t, loadedConfig.LogConfig.Type, "json-file")
-	assert.Equal(t, loadedConfig.LogConfig.Config["max-size"], "1k")
-}
-
-func TestLoadDaemonConfigWithNetwork(t *testing.T) {
-	content := `{"bip": "127.0.0.2", "ip": "127.0.0.1"}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-
-	assert.Equal(t, loadedConfig.IP, "127.0.0.2")
-	assert.Equal(t, loadedConfig.DefaultIP.String(), "127.0.0.1")
-}
-
-func TestLoadDaemonConfigWithMapOptions(t *testing.T) {
-	content := `{
-		"cluster-store-opts": {"kv.cacertfile": "/var/lib/docker/discovery_certs/ca.pem"},
-		"log-opts": {"tag": "test"}
-}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.NotNil(t, loadedConfig.ClusterOpts)
-
-	expectedPath := "/var/lib/docker/discovery_certs/ca.pem"
-	assert.Equal(t, loadedConfig.ClusterOpts["kv.cacertfile"], expectedPath)
-	assert.NotNil(t, loadedConfig.LogConfig.Config)
-	assert.Equal(t, loadedConfig.LogConfig.Config["tag"], "test")
-}
-
-func TestLoadDaemonConfigWithTrueDefaultValues(t *testing.T) {
-	content := `{ "userland-proxy": false }`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.NotNil(t, loadedConfig.ClusterOpts)
-
-	assert.Equal(t, loadedConfig.EnableUserlandProxy, false)
-
-	// make sure reloading doesn't generate configuration
-	// conflicts after normalizing boolean values.
-	reload := func(reloadedConfig *daemon.Config) {
-		assert.Equal(t, reloadedConfig.EnableUserlandProxy, false)
-	}
-	assert.NilError(t, daemon.ReloadConfiguration(opts.configFile, opts.flags, reload))
-}
-
-func TestLoadDaemonConfigWithTrueDefaultValuesLeaveDefaults(t *testing.T) {
-	tempFile := tempfile.NewTempFile(t, "config", `{}`)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.NotNil(t, loadedConfig.ClusterOpts)
-
-	assert.Equal(t, loadedConfig.EnableUserlandProxy, true)
-}
-
-func TestLoadDaemonConfigWithLegacyRegistryOptions(t *testing.T) {
-	content := `{"disable-legacy-registry": true}`
-	tempFile := tempfile.NewTempFile(t, "config", content)
-	defer tempFile.Remove()
-
-	opts := defaultOptions(tempFile.Name())
-	loadedConfig, err := loadDaemonCliConfig(opts)
-	assert.NilError(t, err)
-	assert.NotNil(t, loadedConfig)
-	assert.Equal(t, loadedConfig.V2Only, true)
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_windows.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_windows.go
deleted file mode 100644
index 4cccd32688..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/daemon_windows.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/system"
-)
-
-var defaultDaemonConfigFile = ""
-
-// currentUserIsOwner checks whether the current user is the owner of the given
-// file.
-func currentUserIsOwner(f string) bool {
-	return false
-}
-
-// setDefaultUmask doesn't do anything on windows
-func setDefaultUmask() error {
-	return nil
-}
-
-func getDaemonConfDir(root string) string {
-	return filepath.Join(root, `\config`)
-}
-
-// notifySystem sends a message to the host when the server is ready to be used
-func notifySystem() {
-	if service != nil {
-		err := service.started()
-		if err != nil {
-			logrus.Fatal(err)
-		}
-	}
-}
-
-// notifyShutdown is called after the daemon shuts down but before the process exits.
-func notifyShutdown(err error) {
-	if service != nil {
-		if err != nil {
-			logrus.Fatal(err)
-		}
-		service.stopped(err)
-	}
-}
-
-// setupConfigReloadTrap configures a Win32 event to reload the configuration.
-func (cli *DaemonCli) setupConfigReloadTrap() {
-	go func() {
-		sa := syscall.SecurityAttributes{
-			Length: 0,
-		}
-		ev := "Global\\docker-daemon-config-" + fmt.Sprint(os.Getpid())
-		if h, _ := system.CreateEvent(&sa, false, false, ev); h != 0 {
-			logrus.Debugf("Config reload - waiting signal at %s", ev)
-			for {
-				syscall.WaitForSingleObject(h, syscall.INFINITE)
-				cli.reloadConfig()
-			}
-		}
-	}()
-}
-
-func (cli *DaemonCli) getPlatformRemoteOptions() []libcontainerd.RemoteOption {
-	return nil
-}
-
-// getLibcontainerdRoot gets the root directory for libcontainerd to store its
-// state. The Windows libcontainerd implementation does not need to write a spec
-// or state to disk, so this is a no-op.
-func (cli *DaemonCli) getLibcontainerdRoot() string {
-	return ""
-}
-
-// getSwarmRunRoot gets the root directory for swarm to store runtime state
-// For example, the control socket
-func (cli *DaemonCli) getSwarmRunRoot() string {
-	return ""
-}
-
-func allocateDaemonPort(addr string) error {
-	return nil
-}
-
-func wrapListeners(proto string, ls []net.Listener) []net.Listener {
-	return ls
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/docker.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/docker.go
deleted file mode 100644
index 60742ae927..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/docker.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/cli"
-	cliflags "github.com/docker/docker/cli/flags"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/docker/pkg/term"
-	"github.com/spf13/cobra"
-	"github.com/spf13/pflag"
-)
-
-type daemonOptions struct {
-	version      bool
-	configFile   string
-	daemonConfig *daemon.Config
-	common       *cliflags.CommonOptions
-	flags        *pflag.FlagSet
-}
-
-func newDaemonCommand() *cobra.Command {
-	opts := daemonOptions{
-		daemonConfig: daemon.NewConfig(),
-		common:       cliflags.NewCommonOptions(),
-	}
-
-	cmd := &cobra.Command{
-		Use:           "dockerd [OPTIONS]",
-		Short:         "A self-sufficient runtime for containers.",
-		SilenceUsage:  true,
-		SilenceErrors: true,
-		Args:          cli.NoArgs,
-		RunE: func(cmd *cobra.Command, args []string) error {
-			opts.flags = cmd.Flags()
-			return runDaemon(opts)
-		},
-	}
-	cli.SetupRootCommand(cmd)
-
-	flags := cmd.Flags()
-	flags.BoolVarP(&opts.version, "version", "v", false, "Print version information and quit")
-	flags.StringVar(&opts.configFile, flagDaemonConfigFile, defaultDaemonConfigFile, "Daemon configuration file")
-	opts.common.InstallFlags(flags)
-	opts.daemonConfig.InstallFlags(flags)
-	installServiceFlags(flags)
-
-	return cmd
-}
-
-func runDaemon(opts daemonOptions) error {
-	if opts.version {
-		showVersion()
-		return nil
-	}
-
-	daemonCli := NewDaemonCli()
-
-	// Windows specific settings as these are not defaulted.
-	if runtime.GOOS == "windows" {
-		if opts.daemonConfig.Pidfile == "" {
-			opts.daemonConfig.Pidfile = filepath.Join(opts.daemonConfig.Root, "docker.pid")
-		}
-		if opts.configFile == "" {
-			opts.configFile = filepath.Join(opts.daemonConfig.Root, `config\daemon.json`)
-		}
-	}
-
-	// On Windows, this may be launching as a service or with an option to
-	// register the service.
-	stop, err := initService(daemonCli)
-	if err != nil {
-		logrus.Fatal(err)
-	}
-
-	if stop {
-		return nil
-	}
-
-	err = daemonCli.start(opts)
-	notifyShutdown(err)
-	return err
-}
-
-func showVersion() {
-	fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
-}
-
-func main() {
-	if reexec.Init() {
-		return
-	}
-
-	// Set terminal emulation based on platform as required.
-	_, stdout, stderr := term.StdStreams()
-	logrus.SetOutput(stderr)
-
-	cmd := newDaemonCommand()
-	cmd.SetOutput(stdout)
-	if err := cmd.Execute(); err != nil {
-		fmt.Fprintf(stderr, "%s\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/docker_windows.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/docker_windows.go
deleted file mode 100644
index 19c5587cb6..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/docker_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package main
-
-import (
-	"sync/atomic"
-
-	_ "github.com/docker/docker/autogen/winresources/dockerd"
-)
-
-//go:cgo_import_dynamic main.dummy CommandLineToArgvW%2 "shell32.dll"
-
-var dummy uintptr
-
-func init() {
-	// Ensure that this import is not removed by the linker. This is used to
-	// ensure that shell32.dll is loaded by the system loader, preventing
-	// go#15286 from triggering on Nano Server TP5.
-	atomic.LoadUintptr(&dummy)
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override.go
deleted file mode 100644
index d4aa3ddd73..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// +build !windows
-
-package hack
-
-import "net"
-
-// MalformedHostHeaderOverride is a wrapper to be able
-// to overcome the 400 Bad request coming from old docker
-// clients that send an invalid Host header.
-type MalformedHostHeaderOverride struct {
-	net.Listener
-}
-
-// MalformedHostHeaderOverrideConn wraps the underlying unix
-// connection and keeps track of the first read from http.Server
-// which just reads the headers.
-type MalformedHostHeaderOverrideConn struct {
-	net.Conn
-	first bool
-}
-
-var closeConnHeader = []byte("\r\nConnection: close\r")
-
-// Read reads the first *read* request from http.Server to inspect
-// the Host header. If the Host starts with / then we're talking to
-// an old docker client which send an invalid Host header. To not
-// error out in http.Server we rewrite the first bytes of the request
-// to sanitize the Host header itself.
-// In case we're not dealing with old docker clients the data is just passed
-// to the server w/o modification.
-func (l *MalformedHostHeaderOverrideConn) Read(b []byte) (n int, err error) {
-	// http.Server uses a 4k buffer
-	if l.first && len(b) == 4096 {
-		// This keeps track of the first read from http.Server which just reads
-		// the headers
-		l.first = false
-		// The first read of the connection by http.Server is done limited to
-		// DefaultMaxHeaderBytes (usually 1 << 20) + 4096.
-		// Here we do the first read which gets us all the http headers to
-		// be inspected and modified below.
-		c, err := l.Conn.Read(b)
-		if err != nil {
-			return c, err
-		}
-
-		var (
-			start, end    int
-			firstLineFeed = -1
-			buf           []byte
-		)
-		for i := 0; i <= c-1-7; i++ {
-			if b[i] == '\n' && firstLineFeed == -1 {
-				firstLineFeed = i
-			}
-			if b[i] != '\n' {
-				continue
-			}
-
-			if b[i+1] == '\r' && b[i+2] == '\n' {
-				return c, nil
-			}
-
-			if b[i+1] != 'H' {
-				continue
-			}
-			if b[i+2] != 'o' {
-				continue
-			}
-			if b[i+3] != 's' {
-				continue
-			}
-			if b[i+4] != 't' {
-				continue
-			}
-			if b[i+5] != ':' {
-				continue
-			}
-			if b[i+6] != ' ' {
-				continue
-			}
-			if b[i+7] != '/' {
-				continue
-			}
-			// ensure clients other than the docker clients do not get this hack
-			if i != firstLineFeed {
-				return c, nil
-			}
-			start = i + 7
-			// now find where the value ends
-			for ii, bbb := range b[start:c] {
-				if bbb == '\n' {
-					end = start + ii
-					break
-				}
-			}
-			buf = make([]byte, 0, c+len(closeConnHeader)-(end-start))
-			// strip the value of the host header and
-			// inject `Connection: close` to ensure we don't reuse this connection
-			buf = append(buf, b[:start]...)
-			buf = append(buf, closeConnHeader...)
-			buf = append(buf, b[end:c]...)
-			copy(b, buf)
-			break
-		}
-		if len(buf) == 0 {
-			return c, nil
-		}
-		return len(buf), nil
-	}
-	return l.Conn.Read(b)
-}
-
-// Accept makes the listener accepts connections and wraps the connection
-// in a MalformedHostHeaderOverrideConn initilizing first to true.
-func (l *MalformedHostHeaderOverride) Accept() (net.Conn, error) {
-	c, err := l.Listener.Accept()
-	if err != nil {
-		return c, err
-	}
-	return &MalformedHostHeaderOverrideConn{c, true}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override_test.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override_test.go
deleted file mode 100644
index 1a0a60baf3..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/hack/malformed_host_override_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// +build !windows
-
-package hack
-
-import (
-	"bytes"
-	"io"
-	"net"
-	"strings"
-	"testing"
-)
-
-type bufConn struct {
-	net.Conn
-	buf *bytes.Buffer
-}
-
-func (bc *bufConn) Read(b []byte) (int, error) {
-	return bc.buf.Read(b)
-}
-
-func TestHeaderOverrideHack(t *testing.T) {
-	tests := [][2][]byte{
-		{
-			[]byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\r\n\r\n"),
-			[]byte("GET /foo\nHost: \r\nConnection: close\r\nUser-Agent: Docker\r\n\r\n"),
-		},
-		{
-			[]byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\nFoo: Bar\r\n"),
-			[]byte("GET /foo\nHost: \r\nConnection: close\r\nUser-Agent: Docker\nFoo: Bar\r\n"),
-		},
-		{
-			[]byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\r\n\r\ntest something!"),
-			[]byte("GET /foo\nHost: \r\nConnection: close\r\nUser-Agent: Docker\r\n\r\ntest something!"),
-		},
-		{
-			[]byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\r\n\r\ntest something! " + strings.Repeat("test", 15000)),
-			[]byte("GET /foo\nHost: \r\nConnection: close\r\nUser-Agent: Docker\r\n\r\ntest something! " + strings.Repeat("test", 15000)),
-		},
-		{
-			[]byte("GET /foo\nFoo: Bar\nHost: /var/run/docker.sock\nUser-Agent: Docker\r\n\r\n"),
-			[]byte("GET /foo\nFoo: Bar\nHost: /var/run/docker.sock\nUser-Agent: Docker\r\n\r\n"),
-		},
-	}
-
-	// Test for https://github.com/docker/docker/issues/23045
-	h0 := "GET /foo\nUser-Agent: Docker\r\n\r\n"
-	h0 = h0 + strings.Repeat("a", 4096-len(h0)-1) + "\n"
-	tests = append(tests, [2][]byte{[]byte(h0), []byte(h0)})
-
-	for _, pair := range tests {
-		read := make([]byte, 4096)
-		client := &bufConn{
-			buf: bytes.NewBuffer(pair[0]),
-		}
-		l := MalformedHostHeaderOverrideConn{client, true}
-
-		n, err := l.Read(read)
-		if err != nil && err != io.EOF {
-			t.Fatalf("read: %d - %d, err: %v\n%s", n, len(pair[0]), err, string(read[:n]))
-		}
-		if !bytes.Equal(read[:n], pair[1][:n]) {
-			t.Fatalf("\n%s\n%s\n", read[:n], pair[1][:n])
-		}
-	}
-}
-
-func BenchmarkWithHack(b *testing.B) {
-	client, srv := net.Pipe()
-	done := make(chan struct{})
-	req := []byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\n")
-	read := make([]byte, 4096)
-	b.SetBytes(int64(len(req) * 30))
-
-	l := MalformedHostHeaderOverrideConn{client, true}
-	go func() {
-		for {
-			if _, err := srv.Write(req); err != nil {
-				srv.Close()
-				break
-			}
-			l.first = true // make sure each subsequent run uses the hack parsing
-		}
-		close(done)
-	}()
-
-	for i := 0; i < b.N; i++ {
-		for i := 0; i < 30; i++ {
-			if n, err := l.Read(read); err != nil && err != io.EOF {
-				b.Fatalf("read: %d - %d, err: %v\n%s", n, len(req), err, string(read[:n]))
-			}
-		}
-	}
-	l.Close()
-	<-done
-}
-
-func BenchmarkNoHack(b *testing.B) {
-	client, srv := net.Pipe()
-	done := make(chan struct{})
-	req := []byte("GET /foo\nHost: /var/run/docker.sock\nUser-Agent: Docker\n")
-	read := make([]byte, 4096)
-	b.SetBytes(int64(len(req) * 30))
-
-	go func() {
-		for {
-			if _, err := srv.Write(req); err != nil {
-				srv.Close()
-				break
-			}
-		}
-		close(done)
-	}()
-
-	for i := 0; i < b.N; i++ {
-		for i := 0; i < 30; i++ {
-			if _, err := client.Read(read); err != nil && err != io.EOF {
-				b.Fatal(err)
-			}
-		}
-	}
-	client.Close()
-	<-done
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/metrics.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/metrics.go
deleted file mode 100644
index 0c8860408b..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/metrics.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-import (
-	"net"
-	"net/http"
-
-	"github.com/Sirupsen/logrus"
-	metrics "github.com/docker/go-metrics"
-)
-
-func startMetricsServer(addr string) error {
-	if err := allocateDaemonPort(addr); err != nil {
-		return err
-	}
-	l, err := net.Listen("tcp", addr)
-	if err != nil {
-		return err
-	}
-	mux := http.NewServeMux()
-	mux.Handle("/metrics", metrics.Handler())
-	go func() {
-		if err := http.Serve(l, mux); err != nil {
-			logrus.Errorf("serve metrics api: %s", err)
-		}
-	}()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/service_unsupported.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/service_unsupported.go
deleted file mode 100644
index 64ad7fcaa0..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/service_unsupported.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"github.com/spf13/pflag"
-)
-
-func initService(daemonCli *DaemonCli) (bool, error) {
-	return false, nil
-}
-
-func installServiceFlags(flags *pflag.FlagSet) {
-}
diff --git a/installer/vendor/github.com/docker/docker/cmd/dockerd/service_windows.go b/installer/vendor/github.com/docker/docker/cmd/dockerd/service_windows.go
deleted file mode 100644
index dd37abcf3c..0000000000
--- a/installer/vendor/github.com/docker/docker/cmd/dockerd/service_windows.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/system"
-	"github.com/spf13/pflag"
-	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/debug"
-	"golang.org/x/sys/windows/svc/eventlog"
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-var (
-	flServiceName       *string
-	flRegisterService   *bool
-	flUnregisterService *bool
-	flRunService        *bool
-
-	setStdHandle = windows.NewLazySystemDLL("kernel32.dll").NewProc("SetStdHandle")
-	oldStderr    syscall.Handle
-	panicFile    *os.File
-
-	service *handler
-)
-
-const (
-	// These should match the values in event_messages.mc.
-	eventInfo  = 1
-	eventWarn  = 1
-	eventError = 1
-	eventDebug = 2
-	eventPanic = 3
-	eventFatal = 4
-
-	eventExtraOffset = 10 // Add this to any event to get a string that supports extended data
-)
-
-func installServiceFlags(flags *pflag.FlagSet) {
-	flServiceName = flags.String("service-name", "docker", "Set the Windows service name")
-	flRegisterService = flags.Bool("register-service", false, "Register the service and exit")
-	flUnregisterService = flags.Bool("unregister-service", false, "Unregister the service and exit")
-	flRunService = flags.Bool("run-service", false, "")
-	flags.MarkHidden("run-service")
-}
-
-type handler struct {
-	tosvc     chan bool
-	fromsvc   chan error
-	daemonCli *DaemonCli
-}
-
-type etwHook struct {
-	log *eventlog.Log
-}
-
-func (h *etwHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.PanicLevel,
-		logrus.FatalLevel,
-		logrus.ErrorLevel,
-		logrus.WarnLevel,
-		logrus.InfoLevel,
-		logrus.DebugLevel,
-	}
-}
-
-func (h *etwHook) Fire(e *logrus.Entry) error {
-	var (
-		etype uint16
-		eid   uint32
-	)
-
-	switch e.Level {
-	case logrus.PanicLevel:
-		etype = windows.EVENTLOG_ERROR_TYPE
-		eid = eventPanic
-	case logrus.FatalLevel:
-		etype = windows.EVENTLOG_ERROR_TYPE
-		eid = eventFatal
-	case logrus.ErrorLevel:
-		etype = windows.EVENTLOG_ERROR_TYPE
-		eid = eventError
-	case logrus.WarnLevel:
-		etype = windows.EVENTLOG_WARNING_TYPE
-		eid = eventWarn
-	case logrus.InfoLevel:
-		etype = windows.EVENTLOG_INFORMATION_TYPE
-		eid = eventInfo
-	case logrus.DebugLevel:
-		etype = windows.EVENTLOG_INFORMATION_TYPE
-		eid = eventDebug
-	default:
-		return errors.New("unknown level")
-	}
-
-	// If there is additional data, include it as a second string.
-	exts := ""
-	if len(e.Data) > 0 {
-		fs := bytes.Buffer{}
-		for k, v := range e.Data {
-			fs.WriteString(k)
-			fs.WriteByte('=')
-			fmt.Fprint(&fs, v)
-			fs.WriteByte(' ')
-		}
-
-		exts = fs.String()[:fs.Len()-1]
-		eid += eventExtraOffset
-	}
-
-	if h.log == nil {
-		fmt.Fprintf(os.Stderr, "%s [%s]\n", e.Message, exts)
-		return nil
-	}
-
-	var (
-		ss  [2]*uint16
-		err error
-	)
-
-	ss[0], err = syscall.UTF16PtrFromString(e.Message)
-	if err != nil {
-		return err
-	}
-
-	count := uint16(1)
-	if exts != "" {
-		ss[1], err = syscall.UTF16PtrFromString(exts)
-		if err != nil {
-			return err
-		}
-
-		count++
-	}
-
-	return windows.ReportEvent(h.log.Handle, etype, 0, eid, 0, count, 0, &ss[0], nil)
-}
-
-func getServicePath() (string, error) {
-	p, err := exec.LookPath(os.Args[0])
-	if err != nil {
-		return "", err
-	}
-	return filepath.Abs(p)
-}
-
-func registerService() error {
-	p, err := getServicePath()
-	if err != nil {
-		return err
-	}
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-
-	depends := []string{}
-
-	// This dependency is required on build 14393 (RS1)
-	// it is added to the platform in newer builds
-	if system.GetOSVersion().Build == 14393 {
-		depends = append(depends, "ConDrv")
-	}
-
-	c := mgr.Config{
-		ServiceType:  windows.SERVICE_WIN32_OWN_PROCESS,
-		StartType:    mgr.StartAutomatic,
-		ErrorControl: mgr.ErrorNormal,
-		Dependencies: depends,
-		DisplayName:  "Docker Engine",
-	}
-
-	// Configure the service to launch with the arguments that were just passed.
-	args := []string{"--run-service"}
-	for _, a := range os.Args[1:] {
-		if a != "--register-service" && a != "--unregister-service" {
-			args = append(args, a)
-		}
-	}
-
-	s, err := m.CreateService(*flServiceName, p, c, args...)
-	if err != nil {
-		return err
-	}
-	defer s.Close()
-
-	// See http://stackoverflow.com/questions/35151052/how-do-i-configure-failure-actions-of-a-windows-service-written-in-go
-	const (
-		scActionNone       = 0
-		scActionRestart    = 1
-		scActionReboot     = 2
-		scActionRunCommand = 3
-
-		serviceConfigFailureActions = 2
-	)
-
-	type serviceFailureActions struct {
-		ResetPeriod  uint32
-		RebootMsg    *uint16
-		Command      *uint16
-		ActionsCount uint32
-		Actions      uintptr
-	}
-
-	type scAction struct {
-		Type  uint32
-		Delay uint32
-	}
-	t := []scAction{
-		{Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},
-		{Type: scActionRestart, Delay: uint32(60 * time.Second / time.Millisecond)},
-		{Type: scActionNone},
-	}
-	lpInfo := serviceFailureActions{ResetPeriod: uint32(24 * time.Hour / time.Second), ActionsCount: uint32(3), Actions: uintptr(unsafe.Pointer(&t[0]))}
-	err = windows.ChangeServiceConfig2(s.Handle, serviceConfigFailureActions, (*byte)(unsafe.Pointer(&lpInfo)))
-	if err != nil {
-		return err
-	}
-
-	err = eventlog.Install(*flServiceName, p, false, eventlog.Info|eventlog.Warning|eventlog.Error)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func unregisterService() error {
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-
-	s, err := m.OpenService(*flServiceName)
-	if err != nil {
-		return err
-	}
-	defer s.Close()
-
-	eventlog.Remove(*flServiceName)
-	err = s.Delete()
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func initService(daemonCli *DaemonCli) (bool, error) {
-	if *flUnregisterService {
-		if *flRegisterService {
-			return true, errors.New("--register-service and --unregister-service cannot be used together")
-		}
-		return true, unregisterService()
-	}
-
-	if *flRegisterService {
-		return true, registerService()
-	}
-
-	if !*flRunService {
-		return false, nil
-	}
-
-	interactive, err := svc.IsAnInteractiveSession()
-	if err != nil {
-		return false, err
-	}
-
-	h := &handler{
-		tosvc:     make(chan bool),
-		fromsvc:   make(chan error),
-		daemonCli: daemonCli,
-	}
-
-	var log *eventlog.Log
-	if !interactive {
-		log, err = eventlog.Open(*flServiceName)
-		if err != nil {
-			return false, err
-		}
-	}
-
-	logrus.AddHook(&etwHook{log})
-	logrus.SetOutput(ioutil.Discard)
-
-	service = h
-	go func() {
-		if interactive {
-			err = debug.Run(*flServiceName, h)
-		} else {
-			err = svc.Run(*flServiceName, h)
-		}
-
-		h.fromsvc <- err
-	}()
-
-	// Wait for the first signal from the service handler.
-	err = <-h.fromsvc
-	if err != nil {
-		return false, err
-	}
-	return false, nil
-}
-
-func (h *handler) started() error {
-	// This must be delayed until daemonCli initializes Config.Root
-	err := initPanicFile(filepath.Join(h.daemonCli.Config.Root, "panic.log"))
-	if err != nil {
-		return err
-	}
-
-	h.tosvc <- false
-	return nil
-}
-
-func (h *handler) stopped(err error) {
-	logrus.Debugf("Stopping service: %v", err)
-	h.tosvc <- err != nil
-	<-h.fromsvc
-}
-
-func (h *handler) Execute(_ []string, r <-chan svc.ChangeRequest, s chan<- svc.Status) (bool, uint32) {
-	s <- svc.Status{State: svc.StartPending, Accepts: 0}
-	// Unblock initService()
-	h.fromsvc <- nil
-
-	// Wait for initialization to complete.
-	failed := <-h.tosvc
-	if failed {
-		logrus.Debug("Aborting service start due to failure during initialization")
-		return true, 1
-	}
-
-	s <- svc.Status{State: svc.Running, Accepts: svc.AcceptStop | svc.AcceptShutdown | svc.Accepted(windows.SERVICE_ACCEPT_PARAMCHANGE)}
-	logrus.Debug("Service running")
-Loop:
-	for {
-		select {
-		case failed = <-h.tosvc:
-			break Loop
-		case c := <-r:
-			switch c.Cmd {
-			case svc.Cmd(windows.SERVICE_CONTROL_PARAMCHANGE):
-				h.daemonCli.reloadConfig()
-			case svc.Interrogate:
-				s <- c.CurrentStatus
-			case svc.Stop, svc.Shutdown:
-				s <- svc.Status{State: svc.StopPending, Accepts: 0}
-				h.daemonCli.stop()
-			}
-		}
-	}
-
-	removePanicFile()
-	if failed {
-		return true, 1
-	}
-	return false, 0
-}
-
-func initPanicFile(path string) error {
-	var err error
-	panicFile, err = os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND, 0)
-	if err != nil {
-		return err
-	}
-
-	st, err := panicFile.Stat()
-	if err != nil {
-		return err
-	}
-
-	// If there are contents in the file already, move the file out of the way
-	// and replace it.
-	if st.Size() > 0 {
-		panicFile.Close()
-		os.Rename(path, path+".old")
-		panicFile, err = os.Create(path)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Update STD_ERROR_HANDLE to point to the panic file so that Go writes to
-	// it when it panics. Remember the old stderr to restore it before removing
-	// the panic file.
-	sh := syscall.STD_ERROR_HANDLE
-	h, err := syscall.GetStdHandle(sh)
-	if err != nil {
-		return err
-	}
-
-	oldStderr = h
-
-	r, _, err := setStdHandle.Call(uintptr(sh), uintptr(panicFile.Fd()))
-	if r == 0 && err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func removePanicFile() {
-	if st, err := panicFile.Stat(); err == nil {
-		if st.Size() == 0 {
-			sh := syscall.STD_ERROR_HANDLE
-			setStdHandle.Call(uintptr(sh), uintptr(oldStderr))
-			panicFile.Close()
-			os.Remove(panicFile.Name())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/container/archive.go b/installer/vendor/github.com/docker/docker/container/archive.go
deleted file mode 100644
index 56e6598b9c..0000000000
--- a/installer/vendor/github.com/docker/docker/container/archive.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package container
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/system"
-)
-
-// ResolvePath resolves the given path in the container to a resource on the
-// host. Returns a resolved path (absolute path to the resource on the host),
-// the absolute path to the resource relative to the container's rootfs, and
-// an error if the path points to outside the container's rootfs.
-func (container *Container) ResolvePath(path string) (resolvedPath, absPath string, err error) {
-	// Check if a drive letter supplied, it must be the system drive. No-op except on Windows
-	path, err = system.CheckSystemDriveAndRemoveDriveLetter(path)
-	if err != nil {
-		return "", "", err
-	}
-
-	// Consider the given path as an absolute path in the container.
-	absPath = archive.PreserveTrailingDotOrSeparator(filepath.Join(string(filepath.Separator), path), path)
-
-	// Split the absPath into its Directory and Base components. We will
-	// resolve the dir in the scope of the container then append the base.
-	dirPath, basePath := filepath.Split(absPath)
-
-	resolvedDirPath, err := container.GetResourcePath(dirPath)
-	if err != nil {
-		return "", "", err
-	}
-
-	// resolvedDirPath will have been cleaned (no trailing path separators) so
-	// we can manually join it with the base path element.
-	resolvedPath = resolvedDirPath + string(filepath.Separator) + basePath
-
-	return resolvedPath, absPath, nil
-}
-
-// StatPath is the unexported version of StatPath. Locks and mounts should
-// be acquired before calling this method and the given path should be fully
-// resolved to a path on the host corresponding to the given absolute path
-// inside the container.
-func (container *Container) StatPath(resolvedPath, absPath string) (stat *types.ContainerPathStat, err error) {
-	lstat, err := os.Lstat(resolvedPath)
-	if err != nil {
-		return nil, err
-	}
-
-	var linkTarget string
-	if lstat.Mode()&os.ModeSymlink != 0 {
-		// Fully evaluate the symlink in the scope of the container rootfs.
-		hostPath, err := container.GetResourcePath(absPath)
-		if err != nil {
-			return nil, err
-		}
-
-		linkTarget, err = filepath.Rel(container.BaseFS, hostPath)
-		if err != nil {
-			return nil, err
-		}
-
-		// Make it an absolute path.
-		linkTarget = filepath.Join(string(filepath.Separator), linkTarget)
-	}
-
-	return &types.ContainerPathStat{
-		Name:       filepath.Base(absPath),
-		Size:       lstat.Size(),
-		Mode:       lstat.Mode(),
-		Mtime:      lstat.ModTime(),
-		LinkTarget: linkTarget,
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container.go b/installer/vendor/github.com/docker/docker/container/container.go
deleted file mode 100644
index fc4fe2717f..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container.go
+++ /dev/null
@@ -1,1103 +0,0 @@
-package container
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	networktypes "github.com/docker/docker/api/types/network"
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/container/stream"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/jsonfilelog"
-	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/promise"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/restartmanager"
-	"github.com/docker/docker/runconfig"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/docker/volume"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
-	"github.com/docker/libnetwork/types"
-	agentexec "github.com/docker/swarmkit/agent/exec"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-const configFileName = "config.v2.json"
-
-const (
-	// DefaultStopTimeout is the timeout (in seconds) for the syscall signal used to stop a container.
-	DefaultStopTimeout = 10
-)
-
-var (
-	errInvalidEndpoint = fmt.Errorf("invalid endpoint while building port map info")
-	errInvalidNetwork  = fmt.Errorf("invalid network settings while building port map info")
-)
-
-// DetachError is special error which returned in case of container detach.
-type DetachError struct{}
-
-func (DetachError) Error() string {
-	return "detached from container"
-}
-
-// CommonContainer holds the fields for a container which are
-// applicable across all platforms supported by the daemon.
-type CommonContainer struct {
-	StreamConfig *stream.Config
-	// embed for Container to support states directly.
-	*State          `json:"State"` // Needed for Engine API version <= 1.11
-	Root            string         `json:"-"` // Path to the "home" of the container, including metadata.
-	BaseFS          string         `json:"-"` // Path to the graphdriver mountpoint
-	RWLayer         layer.RWLayer  `json:"-"`
-	ID              string
-	Created         time.Time
-	Managed         bool
-	Path            string
-	Args            []string
-	Config          *containertypes.Config
-	ImageID         image.ID `json:"Image"`
-	NetworkSettings *network.Settings
-	LogPath         string
-	Name            string
-	Driver          string
-	// MountLabel contains the options for the 'mount' command
-	MountLabel             string
-	ProcessLabel           string
-	RestartCount           int
-	HasBeenStartedBefore   bool
-	HasBeenManuallyStopped bool // used for unless-stopped restart policy
-	MountPoints            map[string]*volume.MountPoint
-	HostConfig             *containertypes.HostConfig `json:"-"` // do not serialize the host config in the json, otherwise we'll make the container unportable
-	ExecCommands           *exec.Store                `json:"-"`
-	SecretStore            agentexec.SecretGetter     `json:"-"`
-	SecretReferences       []*swarmtypes.SecretReference
-	// logDriver for closing
-	LogDriver      logger.Logger  `json:"-"`
-	LogCopier      *logger.Copier `json:"-"`
-	restartManager restartmanager.RestartManager
-	attachContext  *attachContext
-}
-
-// NewBaseContainer creates a new container with its
-// basic configuration.
-func NewBaseContainer(id, root string) *Container {
-	return &Container{
-		CommonContainer: CommonContainer{
-			ID:            id,
-			State:         NewState(),
-			ExecCommands:  exec.NewStore(),
-			Root:          root,
-			MountPoints:   make(map[string]*volume.MountPoint),
-			StreamConfig:  stream.NewConfig(),
-			attachContext: &attachContext{},
-		},
-	}
-}
-
-// FromDisk loads the container configuration stored in the host.
-func (container *Container) FromDisk() error {
-	pth, err := container.ConfigPath()
-	if err != nil {
-		return err
-	}
-
-	jsonSource, err := os.Open(pth)
-	if err != nil {
-		return err
-	}
-	defer jsonSource.Close()
-
-	dec := json.NewDecoder(jsonSource)
-
-	// Load container settings
-	if err := dec.Decode(container); err != nil {
-		return err
-	}
-
-	if err := label.ReserveLabel(container.ProcessLabel); err != nil {
-		return err
-	}
-	return container.readHostConfig()
-}
-
-// ToDisk saves the container configuration on disk.
-func (container *Container) ToDisk() error {
-	pth, err := container.ConfigPath()
-	if err != nil {
-		return err
-	}
-
-	jsonSource, err := ioutils.NewAtomicFileWriter(pth, 0644)
-	if err != nil {
-		return err
-	}
-	defer jsonSource.Close()
-
-	enc := json.NewEncoder(jsonSource)
-
-	// Save container settings
-	if err := enc.Encode(container); err != nil {
-		return err
-	}
-
-	return container.WriteHostConfig()
-}
-
-// ToDiskLocking saves the container configuration on disk in a thread safe way.
-func (container *Container) ToDiskLocking() error {
-	container.Lock()
-	err := container.ToDisk()
-	container.Unlock()
-	return err
-}
-
-// readHostConfig reads the host configuration from disk for the container.
-func (container *Container) readHostConfig() error {
-	container.HostConfig = &containertypes.HostConfig{}
-	// If the hostconfig file does not exist, do not read it.
-	// (We still have to initialize container.HostConfig,
-	// but that's OK, since we just did that above.)
-	pth, err := container.HostConfigPath()
-	if err != nil {
-		return err
-	}
-
-	f, err := os.Open(pth)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	defer f.Close()
-
-	if err := json.NewDecoder(f).Decode(&container.HostConfig); err != nil {
-		return err
-	}
-
-	container.InitDNSHostConfig()
-
-	return nil
-}
-
-// WriteHostConfig saves the host configuration on disk for the container.
-func (container *Container) WriteHostConfig() error {
-	pth, err := container.HostConfigPath()
-	if err != nil {
-		return err
-	}
-
-	f, err := ioutils.NewAtomicFileWriter(pth, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	return json.NewEncoder(f).Encode(&container.HostConfig)
-}
-
-// SetupWorkingDirectory sets up the container's working directory as set in container.Config.WorkingDir
-func (container *Container) SetupWorkingDirectory(rootUID, rootGID int) error {
-	if container.Config.WorkingDir == "" {
-		return nil
-	}
-
-	container.Config.WorkingDir = filepath.Clean(container.Config.WorkingDir)
-
-	pth, err := container.GetResourcePath(container.Config.WorkingDir)
-	if err != nil {
-		return err
-	}
-
-	if err := idtools.MkdirAllNewAs(pth, 0755, rootUID, rootGID); err != nil {
-		pthInfo, err2 := os.Stat(pth)
-		if err2 == nil && pthInfo != nil && !pthInfo.IsDir() {
-			return fmt.Errorf("Cannot mkdir: %s is not a directory", container.Config.WorkingDir)
-		}
-
-		return err
-	}
-
-	return nil
-}
-
-// GetResourcePath evaluates `path` in the scope of the container's BaseFS, with proper path
-// sanitisation. Symlinks are all scoped to the BaseFS of the container, as
-// though the container's BaseFS was `/`.
-//
-// The BaseFS of a container is the host-facing path which is bind-mounted as
-// `/` inside the container. This method is essentially used to access a
-// particular path inside the container as though you were a process in that
-// container.
-//
-// NOTE: The returned path is *only* safely scoped inside the container's BaseFS
-//       if no component of the returned path changes (such as a component
-//       symlinking to a different path) between using this method and using the
-//       path. See symlink.FollowSymlinkInScope for more details.
-func (container *Container) GetResourcePath(path string) (string, error) {
-	// IMPORTANT - These are paths on the OS where the daemon is running, hence
-	// any filepath operations must be done in an OS agnostic way.
-
-	cleanPath := cleanResourcePath(path)
-	r, e := symlink.FollowSymlinkInScope(filepath.Join(container.BaseFS, cleanPath), container.BaseFS)
-
-	// Log this here on the daemon side as there's otherwise no indication apart
-	// from the error being propagated all the way back to the client. This makes
-	// debugging significantly easier and clearly indicates the error comes from the daemon.
-	if e != nil {
-		logrus.Errorf("Failed to FollowSymlinkInScope BaseFS %s cleanPath %s path %s %s\n", container.BaseFS, cleanPath, path, e)
-	}
-	return r, e
-}
-
-// GetRootResourcePath evaluates `path` in the scope of the container's root, with proper path
-// sanitisation. Symlinks are all scoped to the root of the container, as
-// though the container's root was `/`.
-//
-// The root of a container is the host-facing configuration metadata directory.
-// Only use this method to safely access the container's `container.json` or
-// other metadata files. If in doubt, use container.GetResourcePath.
-//
-// NOTE: The returned path is *only* safely scoped inside the container's root
-//       if no component of the returned path changes (such as a component
-//       symlinking to a different path) between using this method and using the
-//       path. See symlink.FollowSymlinkInScope for more details.
-func (container *Container) GetRootResourcePath(path string) (string, error) {
-	// IMPORTANT - These are paths on the OS where the daemon is running, hence
-	// any filepath operations must be done in an OS agnostic way.
-	cleanPath := filepath.Join(string(os.PathSeparator), path)
-	return symlink.FollowSymlinkInScope(filepath.Join(container.Root, cleanPath), container.Root)
-}
-
-// ExitOnNext signals to the monitor that it should not restart the container
-// after we send the kill signal.
-func (container *Container) ExitOnNext() {
-	container.RestartManager().Cancel()
-}
-
-// HostConfigPath returns the path to the container's JSON hostconfig
-func (container *Container) HostConfigPath() (string, error) {
-	return container.GetRootResourcePath("hostconfig.json")
-}
-
-// ConfigPath returns the path to the container's JSON config
-func (container *Container) ConfigPath() (string, error) {
-	return container.GetRootResourcePath(configFileName)
-}
-
-// CheckpointDir returns the directory checkpoints are stored in
-func (container *Container) CheckpointDir() string {
-	return filepath.Join(container.Root, "checkpoints")
-}
-
-// StartLogger starts a new logger driver for the container.
-func (container *Container) StartLogger(cfg containertypes.LogConfig) (logger.Logger, error) {
-	c, err := logger.GetLogDriver(cfg.Type)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get logging factory: %v", err)
-	}
-	ctx := logger.Context{
-		Config:              cfg.Config,
-		ContainerID:         container.ID,
-		ContainerName:       container.Name,
-		ContainerEntrypoint: container.Path,
-		ContainerArgs:       container.Args,
-		ContainerImageID:    container.ImageID.String(),
-		ContainerImageName:  container.Config.Image,
-		ContainerCreated:    container.Created,
-		ContainerEnv:        container.Config.Env,
-		ContainerLabels:     container.Config.Labels,
-		DaemonName:          "docker",
-	}
-
-	// Set logging file for "json-logger"
-	if cfg.Type == jsonfilelog.Name {
-		ctx.LogPath, err = container.GetRootResourcePath(fmt.Sprintf("%s-json.log", container.ID))
-		if err != nil {
-			return nil, err
-		}
-	}
-	return c(ctx)
-}
-
-// GetProcessLabel returns the process label for the container.
-func (container *Container) GetProcessLabel() string {
-	// even if we have a process label return "" if we are running
-	// in privileged mode
-	if container.HostConfig.Privileged {
-		return ""
-	}
-	return container.ProcessLabel
-}
-
-// GetMountLabel returns the mounting label for the container.
-// This label is empty if the container is privileged.
-func (container *Container) GetMountLabel() string {
-	return container.MountLabel
-}
-
-// GetExecIDs returns the list of exec commands running on the container.
-func (container *Container) GetExecIDs() []string {
-	return container.ExecCommands.List()
-}
-
-// Attach connects to the container's TTY, delegating to standard
-// streams or websockets depending on the configuration.
-func (container *Container) Attach(stdin io.ReadCloser, stdout io.Writer, stderr io.Writer, keys []byte) chan error {
-	ctx := container.InitAttachContext()
-	return AttachStreams(ctx, container.StreamConfig, container.Config.OpenStdin, container.Config.StdinOnce, container.Config.Tty, stdin, stdout, stderr, keys)
-}
-
-// AttachStreams connects streams to a TTY.
-// Used by exec too. Should this move somewhere else?
-func AttachStreams(ctx context.Context, streamConfig *stream.Config, openStdin, stdinOnce, tty bool, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer, keys []byte) chan error {
-	var (
-		cStdout, cStderr io.ReadCloser
-		cStdin           io.WriteCloser
-		wg               sync.WaitGroup
-		errors           = make(chan error, 3)
-	)
-
-	if stdin != nil && openStdin {
-		cStdin = streamConfig.StdinPipe()
-		wg.Add(1)
-	}
-
-	if stdout != nil {
-		cStdout = streamConfig.StdoutPipe()
-		wg.Add(1)
-	}
-
-	if stderr != nil {
-		cStderr = streamConfig.StderrPipe()
-		wg.Add(1)
-	}
-
-	// Connect stdin of container to the http conn.
-	go func() {
-		if stdin == nil || !openStdin {
-			return
-		}
-		logrus.Debug("attach: stdin: begin")
-
-		var err error
-		if tty {
-			_, err = copyEscapable(cStdin, stdin, keys)
-		} else {
-			_, err = io.Copy(cStdin, stdin)
-		}
-		if err == io.ErrClosedPipe {
-			err = nil
-		}
-		if err != nil {
-			logrus.Errorf("attach: stdin: %s", err)
-			errors <- err
-		}
-		if stdinOnce && !tty {
-			cStdin.Close()
-		} else {
-			// No matter what, when stdin is closed (io.Copy unblock), close stdout and stderr
-			if cStdout != nil {
-				cStdout.Close()
-			}
-			if cStderr != nil {
-				cStderr.Close()
-			}
-		}
-		logrus.Debug("attach: stdin: end")
-		wg.Done()
-	}()
-
-	attachStream := func(name string, stream io.Writer, streamPipe io.ReadCloser) {
-		if stream == nil {
-			return
-		}
-
-		logrus.Debugf("attach: %s: begin", name)
-		_, err := io.Copy(stream, streamPipe)
-		if err == io.ErrClosedPipe {
-			err = nil
-		}
-		if err != nil {
-			logrus.Errorf("attach: %s: %v", name, err)
-			errors <- err
-		}
-		// Make sure stdin gets closed
-		if stdin != nil {
-			stdin.Close()
-		}
-		streamPipe.Close()
-		logrus.Debugf("attach: %s: end", name)
-		wg.Done()
-	}
-
-	go attachStream("stdout", stdout, cStdout)
-	go attachStream("stderr", stderr, cStderr)
-
-	return promise.Go(func() error {
-		done := make(chan struct{})
-		go func() {
-			wg.Wait()
-			close(done)
-		}()
-		select {
-		case <-done:
-		case <-ctx.Done():
-			// close all pipes
-			if cStdin != nil {
-				cStdin.Close()
-			}
-			if cStdout != nil {
-				cStdout.Close()
-			}
-			if cStderr != nil {
-				cStderr.Close()
-			}
-			<-done
-		}
-		close(errors)
-		for err := range errors {
-			if err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-}
-
-// Code c/c from io.Copy() modified to handle escape sequence
-func copyEscapable(dst io.Writer, src io.ReadCloser, keys []byte) (written int64, err error) {
-	if len(keys) == 0 {
-		// Default keys : ctrl-p ctrl-q
-		keys = []byte{16, 17}
-	}
-	buf := make([]byte, 32*1024)
-	for {
-		nr, er := src.Read(buf)
-		if nr > 0 {
-			// ---- Docker addition
-			preservBuf := []byte{}
-			for i, key := range keys {
-				preservBuf = append(preservBuf, buf[0:nr]...)
-				if nr != 1 || buf[0] != key {
-					break
-				}
-				if i == len(keys)-1 {
-					src.Close()
-					return 0, DetachError{}
-				}
-				nr, er = src.Read(buf)
-			}
-			var nw int
-			var ew error
-			if len(preservBuf) > 0 {
-				nw, ew = dst.Write(preservBuf)
-				nr = len(preservBuf)
-			} else {
-				// ---- End of docker
-				nw, ew = dst.Write(buf[0:nr])
-			}
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		if er == io.EOF {
-			break
-		}
-		if er != nil {
-			err = er
-			break
-		}
-	}
-	return written, err
-}
-
-// ShouldRestart decides whether the daemon should restart the container or not.
-// This is based on the container's restart policy.
-func (container *Container) ShouldRestart() bool {
-	shouldRestart, _, _ := container.RestartManager().ShouldRestart(uint32(container.ExitCode()), container.HasBeenManuallyStopped, container.FinishedAt.Sub(container.StartedAt))
-	return shouldRestart
-}
-
-// AddMountPointWithVolume adds a new mount point configured with a volume to the container.
-func (container *Container) AddMountPointWithVolume(destination string, vol volume.Volume, rw bool) {
-	container.MountPoints[destination] = &volume.MountPoint{
-		Type:        mounttypes.TypeVolume,
-		Name:        vol.Name(),
-		Driver:      vol.DriverName(),
-		Destination: destination,
-		RW:          rw,
-		Volume:      vol,
-		CopyData:    volume.DefaultCopyMode,
-	}
-}
-
-// UnmountVolumes unmounts all volumes
-func (container *Container) UnmountVolumes(volumeEventLog func(name, action string, attributes map[string]string)) error {
-	var errors []string
-	for _, volumeMount := range container.MountPoints {
-		// Check if the mounpoint has an ID, this is currently the best way to tell if it's actually mounted
-		// TODO(cpuguyh83): there should be a better way to handle this
-		if volumeMount.Volume != nil && volumeMount.ID != "" {
-			if err := volumeMount.Volume.Unmount(volumeMount.ID); err != nil {
-				errors = append(errors, err.Error())
-				continue
-			}
-			volumeMount.ID = ""
-
-			attributes := map[string]string{
-				"driver":    volumeMount.Volume.DriverName(),
-				"container": container.ID,
-			}
-			volumeEventLog(volumeMount.Volume.Name(), "unmount", attributes)
-		}
-	}
-	if len(errors) > 0 {
-		return fmt.Errorf("error while unmounting volumes for container %s: %s", container.ID, strings.Join(errors, "; "))
-	}
-	return nil
-}
-
-// IsDestinationMounted checks whether a path is mounted on the container or not.
-func (container *Container) IsDestinationMounted(destination string) bool {
-	return container.MountPoints[destination] != nil
-}
-
-// StopSignal returns the signal used to stop the container.
-func (container *Container) StopSignal() int {
-	var stopSignal syscall.Signal
-	if container.Config.StopSignal != "" {
-		stopSignal, _ = signal.ParseSignal(container.Config.StopSignal)
-	}
-
-	if int(stopSignal) == 0 {
-		stopSignal, _ = signal.ParseSignal(signal.DefaultStopSignal)
-	}
-	return int(stopSignal)
-}
-
-// StopTimeout returns the timeout (in seconds) used to stop the container.
-func (container *Container) StopTimeout() int {
-	if container.Config.StopTimeout != nil {
-		return *container.Config.StopTimeout
-	}
-	return DefaultStopTimeout
-}
-
-// InitDNSHostConfig ensures that the dns fields are never nil.
-// New containers don't ever have those fields nil,
-// but pre created containers can still have those nil values.
-// The non-recommended host configuration in the start api can
-// make these fields nil again, this corrects that issue until
-// we remove that behavior for good.
-// See https://github.com/docker/docker/pull/17779
-// for a more detailed explanation on why we don't want that.
-func (container *Container) InitDNSHostConfig() {
-	container.Lock()
-	defer container.Unlock()
-	if container.HostConfig.DNS == nil {
-		container.HostConfig.DNS = make([]string, 0)
-	}
-
-	if container.HostConfig.DNSSearch == nil {
-		container.HostConfig.DNSSearch = make([]string, 0)
-	}
-
-	if container.HostConfig.DNSOptions == nil {
-		container.HostConfig.DNSOptions = make([]string, 0)
-	}
-}
-
-// GetEndpointInNetwork returns the container's endpoint to the provided network.
-func (container *Container) GetEndpointInNetwork(n libnetwork.Network) (libnetwork.Endpoint, error) {
-	endpointName := strings.TrimPrefix(container.Name, "/")
-	return n.EndpointByName(endpointName)
-}
-
-func (container *Container) buildPortMapInfo(ep libnetwork.Endpoint) error {
-	if ep == nil {
-		return errInvalidEndpoint
-	}
-
-	networkSettings := container.NetworkSettings
-	if networkSettings == nil {
-		return errInvalidNetwork
-	}
-
-	if len(networkSettings.Ports) == 0 {
-		pm, err := getEndpointPortMapInfo(ep)
-		if err != nil {
-			return err
-		}
-		networkSettings.Ports = pm
-	}
-	return nil
-}
-
-func getEndpointPortMapInfo(ep libnetwork.Endpoint) (nat.PortMap, error) {
-	pm := nat.PortMap{}
-	driverInfo, err := ep.DriverInfo()
-	if err != nil {
-		return pm, err
-	}
-
-	if driverInfo == nil {
-		// It is not an error for epInfo to be nil
-		return pm, nil
-	}
-
-	if expData, ok := driverInfo[netlabel.ExposedPorts]; ok {
-		if exposedPorts, ok := expData.([]types.TransportPort); ok {
-			for _, tp := range exposedPorts {
-				natPort, err := nat.NewPort(tp.Proto.String(), strconv.Itoa(int(tp.Port)))
-				if err != nil {
-					return pm, fmt.Errorf("Error parsing Port value(%v):%v", tp.Port, err)
-				}
-				pm[natPort] = nil
-			}
-		}
-	}
-
-	mapData, ok := driverInfo[netlabel.PortMap]
-	if !ok {
-		return pm, nil
-	}
-
-	if portMapping, ok := mapData.([]types.PortBinding); ok {
-		for _, pp := range portMapping {
-			natPort, err := nat.NewPort(pp.Proto.String(), strconv.Itoa(int(pp.Port)))
-			if err != nil {
-				return pm, err
-			}
-			natBndg := nat.PortBinding{HostIP: pp.HostIP.String(), HostPort: strconv.Itoa(int(pp.HostPort))}
-			pm[natPort] = append(pm[natPort], natBndg)
-		}
-	}
-
-	return pm, nil
-}
-
-// GetSandboxPortMapInfo retrieves the current port-mapping programmed for the given sandbox
-func GetSandboxPortMapInfo(sb libnetwork.Sandbox) nat.PortMap {
-	pm := nat.PortMap{}
-	if sb == nil {
-		return pm
-	}
-
-	for _, ep := range sb.Endpoints() {
-		pm, _ = getEndpointPortMapInfo(ep)
-		if len(pm) > 0 {
-			break
-		}
-	}
-	return pm
-}
-
-// BuildEndpointInfo sets endpoint-related fields on container.NetworkSettings based on the provided network and endpoint.
-func (container *Container) BuildEndpointInfo(n libnetwork.Network, ep libnetwork.Endpoint) error {
-	if ep == nil {
-		return errInvalidEndpoint
-	}
-
-	networkSettings := container.NetworkSettings
-	if networkSettings == nil {
-		return errInvalidNetwork
-	}
-
-	epInfo := ep.Info()
-	if epInfo == nil {
-		// It is not an error to get an empty endpoint info
-		return nil
-	}
-
-	if _, ok := networkSettings.Networks[n.Name()]; !ok {
-		networkSettings.Networks[n.Name()] = &network.EndpointSettings{
-			EndpointSettings: &networktypes.EndpointSettings{},
-		}
-	}
-	networkSettings.Networks[n.Name()].NetworkID = n.ID()
-	networkSettings.Networks[n.Name()].EndpointID = ep.ID()
-
-	iface := epInfo.Iface()
-	if iface == nil {
-		return nil
-	}
-
-	if iface.MacAddress() != nil {
-		networkSettings.Networks[n.Name()].MacAddress = iface.MacAddress().String()
-	}
-
-	if iface.Address() != nil {
-		ones, _ := iface.Address().Mask.Size()
-		networkSettings.Networks[n.Name()].IPAddress = iface.Address().IP.String()
-		networkSettings.Networks[n.Name()].IPPrefixLen = ones
-	}
-
-	if iface.AddressIPv6() != nil && iface.AddressIPv6().IP.To16() != nil {
-		onesv6, _ := iface.AddressIPv6().Mask.Size()
-		networkSettings.Networks[n.Name()].GlobalIPv6Address = iface.AddressIPv6().IP.String()
-		networkSettings.Networks[n.Name()].GlobalIPv6PrefixLen = onesv6
-	}
-
-	return nil
-}
-
-// UpdateJoinInfo updates network settings when container joins network n with endpoint ep.
-func (container *Container) UpdateJoinInfo(n libnetwork.Network, ep libnetwork.Endpoint) error {
-	if err := container.buildPortMapInfo(ep); err != nil {
-		return err
-	}
-
-	epInfo := ep.Info()
-	if epInfo == nil {
-		// It is not an error to get an empty endpoint info
-		return nil
-	}
-	if epInfo.Gateway() != nil {
-		container.NetworkSettings.Networks[n.Name()].Gateway = epInfo.Gateway().String()
-	}
-	if epInfo.GatewayIPv6().To16() != nil {
-		container.NetworkSettings.Networks[n.Name()].IPv6Gateway = epInfo.GatewayIPv6().String()
-	}
-
-	return nil
-}
-
-// UpdateSandboxNetworkSettings updates the sandbox ID and Key.
-func (container *Container) UpdateSandboxNetworkSettings(sb libnetwork.Sandbox) error {
-	container.NetworkSettings.SandboxID = sb.ID()
-	container.NetworkSettings.SandboxKey = sb.Key()
-	return nil
-}
-
-// BuildJoinOptions builds endpoint Join options from a given network.
-func (container *Container) BuildJoinOptions(n libnetwork.Network) ([]libnetwork.EndpointOption, error) {
-	var joinOptions []libnetwork.EndpointOption
-	if epConfig, ok := container.NetworkSettings.Networks[n.Name()]; ok {
-		for _, str := range epConfig.Links {
-			name, alias, err := runconfigopts.ParseLink(str)
-			if err != nil {
-				return nil, err
-			}
-			joinOptions = append(joinOptions, libnetwork.CreateOptionAlias(name, alias))
-		}
-	}
-	return joinOptions, nil
-}
-
-// BuildCreateEndpointOptions builds endpoint options from a given network.
-func (container *Container) BuildCreateEndpointOptions(n libnetwork.Network, epConfig *networktypes.EndpointSettings, sb libnetwork.Sandbox, daemonDNS []string) ([]libnetwork.EndpointOption, error) {
-	var (
-		bindings      = make(nat.PortMap)
-		pbList        []types.PortBinding
-		exposeList    []types.TransportPort
-		createOptions []libnetwork.EndpointOption
-	)
-
-	defaultNetName := runconfig.DefaultDaemonNetworkMode().NetworkName()
-
-	if (!container.EnableServiceDiscoveryOnDefaultNetwork() && n.Name() == defaultNetName) ||
-		container.NetworkSettings.IsAnonymousEndpoint {
-		createOptions = append(createOptions, libnetwork.CreateOptionAnonymous())
-	}
-
-	if epConfig != nil {
-		ipam := epConfig.IPAMConfig
-		if ipam != nil && (ipam.IPv4Address != "" || ipam.IPv6Address != "" || len(ipam.LinkLocalIPs) > 0) {
-			var ipList []net.IP
-			for _, ips := range ipam.LinkLocalIPs {
-				if ip := net.ParseIP(ips); ip != nil {
-					ipList = append(ipList, ip)
-				}
-			}
-			createOptions = append(createOptions,
-				libnetwork.CreateOptionIpam(net.ParseIP(ipam.IPv4Address), net.ParseIP(ipam.IPv6Address), ipList, nil))
-		}
-
-		for _, alias := range epConfig.Aliases {
-			createOptions = append(createOptions, libnetwork.CreateOptionMyAlias(alias))
-		}
-	}
-
-	if container.NetworkSettings.Service != nil {
-		svcCfg := container.NetworkSettings.Service
-
-		var vip string
-		if svcCfg.VirtualAddresses[n.ID()] != nil {
-			vip = svcCfg.VirtualAddresses[n.ID()].IPv4
-		}
-
-		var portConfigs []*libnetwork.PortConfig
-		for _, portConfig := range svcCfg.ExposedPorts {
-			portConfigs = append(portConfigs, &libnetwork.PortConfig{
-				Name:          portConfig.Name,
-				Protocol:      libnetwork.PortConfig_Protocol(portConfig.Protocol),
-				TargetPort:    portConfig.TargetPort,
-				PublishedPort: portConfig.PublishedPort,
-			})
-		}
-
-		createOptions = append(createOptions, libnetwork.CreateOptionService(svcCfg.Name, svcCfg.ID, net.ParseIP(vip), portConfigs, svcCfg.Aliases[n.ID()]))
-	}
-
-	if !containertypes.NetworkMode(n.Name()).IsUserDefined() {
-		createOptions = append(createOptions, libnetwork.CreateOptionDisableResolution())
-	}
-
-	// configs that are applicable only for the endpoint in the network
-	// to which container was connected to on docker run.
-	// Ideally all these network-specific endpoint configurations must be moved under
-	// container.NetworkSettings.Networks[n.Name()]
-	if n.Name() == container.HostConfig.NetworkMode.NetworkName() ||
-		(n.Name() == defaultNetName && container.HostConfig.NetworkMode.IsDefault()) {
-		if container.Config.MacAddress != "" {
-			mac, err := net.ParseMAC(container.Config.MacAddress)
-			if err != nil {
-				return nil, err
-			}
-
-			genericOption := options.Generic{
-				netlabel.MacAddress: mac,
-			}
-
-			createOptions = append(createOptions, libnetwork.EndpointOptionGeneric(genericOption))
-		}
-	}
-
-	// Port-mapping rules belong to the container & applicable only to non-internal networks
-	portmaps := GetSandboxPortMapInfo(sb)
-	if n.Info().Internal() || len(portmaps) > 0 {
-		return createOptions, nil
-	}
-
-	if container.HostConfig.PortBindings != nil {
-		for p, b := range container.HostConfig.PortBindings {
-			bindings[p] = []nat.PortBinding{}
-			for _, bb := range b {
-				bindings[p] = append(bindings[p], nat.PortBinding{
-					HostIP:   bb.HostIP,
-					HostPort: bb.HostPort,
-				})
-			}
-		}
-	}
-
-	portSpecs := container.Config.ExposedPorts
-	ports := make([]nat.Port, len(portSpecs))
-	var i int
-	for p := range portSpecs {
-		ports[i] = p
-		i++
-	}
-	nat.SortPortMap(ports, bindings)
-	for _, port := range ports {
-		expose := types.TransportPort{}
-		expose.Proto = types.ParseProtocol(port.Proto())
-		expose.Port = uint16(port.Int())
-		exposeList = append(exposeList, expose)
-
-		pb := types.PortBinding{Port: expose.Port, Proto: expose.Proto}
-		binding := bindings[port]
-		for i := 0; i < len(binding); i++ {
-			pbCopy := pb.GetCopy()
-			newP, err := nat.NewPort(nat.SplitProtoPort(binding[i].HostPort))
-			var portStart, portEnd int
-			if err == nil {
-				portStart, portEnd, err = newP.Range()
-			}
-			if err != nil {
-				return nil, fmt.Errorf("Error parsing HostPort value(%s):%v", binding[i].HostPort, err)
-			}
-			pbCopy.HostPort = uint16(portStart)
-			pbCopy.HostPortEnd = uint16(portEnd)
-			pbCopy.HostIP = net.ParseIP(binding[i].HostIP)
-			pbList = append(pbList, pbCopy)
-		}
-
-		if container.HostConfig.PublishAllPorts && len(binding) == 0 {
-			pbList = append(pbList, pb)
-		}
-	}
-
-	var dns []string
-
-	if len(container.HostConfig.DNS) > 0 {
-		dns = container.HostConfig.DNS
-	} else if len(daemonDNS) > 0 {
-		dns = daemonDNS
-	}
-
-	if len(dns) > 0 {
-		createOptions = append(createOptions,
-			libnetwork.CreateOptionDNS(dns))
-	}
-
-	createOptions = append(createOptions,
-		libnetwork.CreateOptionPortMapping(pbList),
-		libnetwork.CreateOptionExposedPorts(exposeList))
-
-	return createOptions, nil
-}
-
-// UpdateMonitor updates monitor configure for running container
-func (container *Container) UpdateMonitor(restartPolicy containertypes.RestartPolicy) {
-	type policySetter interface {
-		SetPolicy(containertypes.RestartPolicy)
-	}
-
-	if rm, ok := container.RestartManager().(policySetter); ok {
-		rm.SetPolicy(restartPolicy)
-	}
-}
-
-// FullHostname returns hostname and optional domain appended to it.
-func (container *Container) FullHostname() string {
-	fullHostname := container.Config.Hostname
-	if container.Config.Domainname != "" {
-		fullHostname = fmt.Sprintf("%s.%s", fullHostname, container.Config.Domainname)
-	}
-	return fullHostname
-}
-
-// RestartManager returns the current restartmanager instance connected to container.
-func (container *Container) RestartManager() restartmanager.RestartManager {
-	if container.restartManager == nil {
-		container.restartManager = restartmanager.New(container.HostConfig.RestartPolicy, container.RestartCount)
-	}
-	return container.restartManager
-}
-
-// ResetRestartManager initializes new restartmanager based on container config
-func (container *Container) ResetRestartManager(resetCount bool) {
-	if container.restartManager != nil {
-		container.restartManager.Cancel()
-	}
-	if resetCount {
-		container.RestartCount = 0
-	}
-	container.restartManager = nil
-}
-
-type attachContext struct {
-	ctx    context.Context
-	cancel context.CancelFunc
-	mu     sync.Mutex
-}
-
-// InitAttachContext initializes or returns existing context for attach calls to
-// track container liveness.
-func (container *Container) InitAttachContext() context.Context {
-	container.attachContext.mu.Lock()
-	defer container.attachContext.mu.Unlock()
-	if container.attachContext.ctx == nil {
-		container.attachContext.ctx, container.attachContext.cancel = context.WithCancel(context.Background())
-	}
-	return container.attachContext.ctx
-}
-
-// CancelAttachContext cancels attach context. All attach calls should detach
-// after this call.
-func (container *Container) CancelAttachContext() {
-	container.attachContext.mu.Lock()
-	if container.attachContext.ctx != nil {
-		container.attachContext.cancel()
-		container.attachContext.ctx = nil
-	}
-	container.attachContext.mu.Unlock()
-}
-
-func (container *Container) startLogging() error {
-	if container.HostConfig.LogConfig.Type == "none" {
-		return nil // do not start logging routines
-	}
-
-	l, err := container.StartLogger(container.HostConfig.LogConfig)
-	if err != nil {
-		return fmt.Errorf("Failed to initialize logging driver: %v", err)
-	}
-
-	copier := logger.NewCopier(map[string]io.Reader{"stdout": container.StdoutPipe(), "stderr": container.StderrPipe()}, l)
-	container.LogCopier = copier
-	copier.Run()
-	container.LogDriver = l
-
-	// set LogPath field only for json-file logdriver
-	if jl, ok := l.(*jsonfilelog.JSONFileLogger); ok {
-		container.LogPath = jl.LogPath()
-	}
-
-	return nil
-}
-
-// StdinPipe gets the stdin stream of the container
-func (container *Container) StdinPipe() io.WriteCloser {
-	return container.StreamConfig.StdinPipe()
-}
-
-// StdoutPipe gets the stdout stream of the container
-func (container *Container) StdoutPipe() io.ReadCloser {
-	return container.StreamConfig.StdoutPipe()
-}
-
-// StderrPipe gets the stderr stream of the container
-func (container *Container) StderrPipe() io.ReadCloser {
-	return container.StreamConfig.StderrPipe()
-}
-
-// CloseStreams closes the container's stdio streams
-func (container *Container) CloseStreams() error {
-	return container.StreamConfig.CloseStreams()
-}
-
-// InitializeStdio is called by libcontainerd to connect the stdio.
-func (container *Container) InitializeStdio(iop libcontainerd.IOPipe) error {
-	if err := container.startLogging(); err != nil {
-		container.Reset(false)
-		return err
-	}
-
-	container.StreamConfig.CopyToPipe(iop)
-
-	if container.StreamConfig.Stdin() == nil && !container.Config.Tty {
-		if iop.Stdin != nil {
-			if err := iop.Stdin.Close(); err != nil {
-				logrus.Warnf("error closing stdin: %+v", err)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container_linux.go b/installer/vendor/github.com/docker/docker/container/container_linux.go
deleted file mode 100644
index 4d4c16b563..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container_linux.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package container
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-func detachMounted(path string) error {
-	return unix.Unmount(path, unix.MNT_DETACH)
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container_notlinux.go b/installer/vendor/github.com/docker/docker/container/container_notlinux.go
deleted file mode 100644
index f65653e992..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container_notlinux.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build solaris freebsd
-
-package container
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-func detachMounted(path string) error {
-	//Solaris and FreeBSD do not support the lazy unmount or MNT_DETACH feature.
-	// Therefore there are separate definitions for this.
-	return unix.Unmount(path, 0)
-}
-
-// SecretMount returns the mount for the secret path
-func (container *Container) SecretMount() *Mount {
-	return nil
-}
-
-// UnmountSecrets unmounts the fs for secrets
-func (container *Container) UnmountSecrets() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container_unit_test.go b/installer/vendor/github.com/docker/docker/container/container_unit_test.go
deleted file mode 100644
index f301f25bbe..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container_unit_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package container
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/signal"
-)
-
-func TestContainerStopSignal(t *testing.T) {
-	c := &Container{
-		CommonContainer: CommonContainer{
-			Config: &container.Config{},
-		},
-	}
-
-	def, err := signal.ParseSignal(signal.DefaultStopSignal)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := c.StopSignal()
-	if s != int(def) {
-		t.Fatalf("Expected %v, got %v", def, s)
-	}
-
-	c = &Container{
-		CommonContainer: CommonContainer{
-			Config: &container.Config{StopSignal: "SIGKILL"},
-		},
-	}
-	s = c.StopSignal()
-	if s != 9 {
-		t.Fatalf("Expected 9, got %v", s)
-	}
-}
-
-func TestContainerStopTimeout(t *testing.T) {
-	c := &Container{
-		CommonContainer: CommonContainer{
-			Config: &container.Config{},
-		},
-	}
-
-	s := c.StopTimeout()
-	if s != DefaultStopTimeout {
-		t.Fatalf("Expected %v, got %v", DefaultStopTimeout, s)
-	}
-
-	stopTimeout := 15
-	c = &Container{
-		CommonContainer: CommonContainer{
-			Config: &container.Config{StopTimeout: &stopTimeout},
-		},
-	}
-	s = c.StopSignal()
-	if s != 15 {
-		t.Fatalf("Expected 15, got %v", s)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container_unix.go b/installer/vendor/github.com/docker/docker/container/container_unix.go
deleted file mode 100644
index 4f6b795d2c..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container_unix.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// +build linux freebsd solaris
-
-package container
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/utils"
-	"github.com/docker/docker/volume"
-	"github.com/opencontainers/runc/libcontainer/label"
-	"golang.org/x/sys/unix"
-)
-
-const (
-	// DefaultSHMSize is the default size (64MB) of the SHM which will be mounted in the container
-	DefaultSHMSize           int64 = 67108864
-	containerSecretMountPath       = "/run/secrets"
-)
-
-// Container holds the fields specific to unixen implementations.
-// See CommonContainer for standard fields common to all containers.
-type Container struct {
-	CommonContainer
-
-	// Fields below here are platform specific.
-	AppArmorProfile string
-	HostnamePath    string
-	HostsPath       string
-	ShmPath         string
-	ResolvConfPath  string
-	SeccompProfile  string
-	NoNewPrivileges bool
-}
-
-// ExitStatus provides exit reasons for a container.
-type ExitStatus struct {
-	// The exit code with which the container exited.
-	ExitCode int
-
-	// Whether the container encountered an OOM.
-	OOMKilled bool
-}
-
-// CreateDaemonEnvironment returns the list of all environment variables given the list of
-// environment variables related to links.
-// Sets PATH, HOSTNAME and if container.Config.Tty is set: TERM.
-// The defaults set here do not override the values in container.Config.Env
-func (container *Container) CreateDaemonEnvironment(tty bool, linkedEnv []string) []string {
-	// Setup environment
-	env := []string{
-		"PATH=" + system.DefaultPathEnv,
-		"HOSTNAME=" + container.Config.Hostname,
-	}
-	if tty {
-		env = append(env, "TERM=xterm")
-	}
-	env = append(env, linkedEnv...)
-	// because the env on the container can override certain default values
-	// we need to replace the 'env' keys where they match and append anything
-	// else.
-	env = utils.ReplaceOrAppendEnvValues(env, container.Config.Env)
-	return env
-}
-
-// TrySetNetworkMount attempts to set the network mounts given a provided destination and
-// the path to use for it; return true if the given destination was a network mount file
-func (container *Container) TrySetNetworkMount(destination string, path string) bool {
-	if destination == "/etc/resolv.conf" {
-		container.ResolvConfPath = path
-		return true
-	}
-	if destination == "/etc/hostname" {
-		container.HostnamePath = path
-		return true
-	}
-	if destination == "/etc/hosts" {
-		container.HostsPath = path
-		return true
-	}
-
-	return false
-}
-
-// BuildHostnameFile writes the container's hostname file.
-func (container *Container) BuildHostnameFile() error {
-	hostnamePath, err := container.GetRootResourcePath("hostname")
-	if err != nil {
-		return err
-	}
-	container.HostnamePath = hostnamePath
-	return ioutil.WriteFile(container.HostnamePath, []byte(container.Config.Hostname+"\n"), 0644)
-}
-
-// NetworkMounts returns the list of network mounts.
-func (container *Container) NetworkMounts() []Mount {
-	var mounts []Mount
-	shared := container.HostConfig.NetworkMode.IsContainer()
-	if container.ResolvConfPath != "" {
-		if _, err := os.Stat(container.ResolvConfPath); err != nil {
-			logrus.Warnf("ResolvConfPath set to %q, but can't stat this filename (err = %v); skipping", container.ResolvConfPath, err)
-		} else {
-			if !container.HasMountFor("/etc/resolv.conf") {
-				label.Relabel(container.ResolvConfPath, container.MountLabel, shared)
-			}
-			writable := !container.HostConfig.ReadonlyRootfs
-			if m, exists := container.MountPoints["/etc/resolv.conf"]; exists {
-				writable = m.RW
-			}
-			mounts = append(mounts, Mount{
-				Source:      container.ResolvConfPath,
-				Destination: "/etc/resolv.conf",
-				Writable:    writable,
-				Propagation: string(volume.DefaultPropagationMode),
-			})
-		}
-	}
-	if container.HostnamePath != "" {
-		if _, err := os.Stat(container.HostnamePath); err != nil {
-			logrus.Warnf("HostnamePath set to %q, but can't stat this filename (err = %v); skipping", container.HostnamePath, err)
-		} else {
-			if !container.HasMountFor("/etc/hostname") {
-				label.Relabel(container.HostnamePath, container.MountLabel, shared)
-			}
-			writable := !container.HostConfig.ReadonlyRootfs
-			if m, exists := container.MountPoints["/etc/hostname"]; exists {
-				writable = m.RW
-			}
-			mounts = append(mounts, Mount{
-				Source:      container.HostnamePath,
-				Destination: "/etc/hostname",
-				Writable:    writable,
-				Propagation: string(volume.DefaultPropagationMode),
-			})
-		}
-	}
-	if container.HostsPath != "" {
-		if _, err := os.Stat(container.HostsPath); err != nil {
-			logrus.Warnf("HostsPath set to %q, but can't stat this filename (err = %v); skipping", container.HostsPath, err)
-		} else {
-			if !container.HasMountFor("/etc/hosts") {
-				label.Relabel(container.HostsPath, container.MountLabel, shared)
-			}
-			writable := !container.HostConfig.ReadonlyRootfs
-			if m, exists := container.MountPoints["/etc/hosts"]; exists {
-				writable = m.RW
-			}
-			mounts = append(mounts, Mount{
-				Source:      container.HostsPath,
-				Destination: "/etc/hosts",
-				Writable:    writable,
-				Propagation: string(volume.DefaultPropagationMode),
-			})
-		}
-	}
-	return mounts
-}
-
-// SecretMountPath returns the path of the secret mount for the container
-func (container *Container) SecretMountPath() string {
-	return filepath.Join(container.Root, "secrets")
-}
-
-// CopyImagePathContent copies files in destination to the volume.
-func (container *Container) CopyImagePathContent(v volume.Volume, destination string) error {
-	rootfs, err := symlink.FollowSymlinkInScope(filepath.Join(container.BaseFS, destination), container.BaseFS)
-	if err != nil {
-		return err
-	}
-
-	if _, err = ioutil.ReadDir(rootfs); err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	id := stringid.GenerateNonCryptoID()
-	path, err := v.Mount(id)
-	if err != nil {
-		return err
-	}
-
-	defer func() {
-		if err := v.Unmount(id); err != nil {
-			logrus.Warnf("error while unmounting volume %s: %v", v.Name(), err)
-		}
-	}()
-	if err := label.Relabel(path, container.MountLabel, true); err != nil && err != unix.ENOTSUP {
-		return err
-	}
-	return copyExistingContents(rootfs, path)
-}
-
-// ShmResourcePath returns path to shm
-func (container *Container) ShmResourcePath() (string, error) {
-	return container.GetRootResourcePath("shm")
-}
-
-// HasMountFor checks if path is a mountpoint
-func (container *Container) HasMountFor(path string) bool {
-	_, exists := container.MountPoints[path]
-	return exists
-}
-
-// UnmountIpcMounts uses the provided unmount function to unmount shm and mqueue if they were mounted
-func (container *Container) UnmountIpcMounts(unmount func(pth string) error) {
-	if container.HostConfig.IpcMode.IsContainer() || container.HostConfig.IpcMode.IsHost() {
-		return
-	}
-
-	var warnings []string
-
-	if !container.HasMountFor("/dev/shm") {
-		shmPath, err := container.ShmResourcePath()
-		if err != nil {
-			logrus.Error(err)
-			warnings = append(warnings, err.Error())
-		} else if shmPath != "" {
-			if err := unmount(shmPath); err != nil && !os.IsNotExist(err) {
-				warnings = append(warnings, fmt.Sprintf("failed to umount %s: %v", shmPath, err))
-			}
-
-		}
-	}
-
-	if len(warnings) > 0 {
-		logrus.Warnf("failed to cleanup ipc mounts:\n%v", strings.Join(warnings, "\n"))
-	}
-}
-
-// IpcMounts returns the list of IPC mounts
-func (container *Container) IpcMounts() []Mount {
-	var mounts []Mount
-
-	if !container.HasMountFor("/dev/shm") {
-		label.SetFileLabel(container.ShmPath, container.MountLabel)
-		mounts = append(mounts, Mount{
-			Source:      container.ShmPath,
-			Destination: "/dev/shm",
-			Writable:    true,
-			Propagation: string(volume.DefaultPropagationMode),
-		})
-	}
-
-	return mounts
-}
-
-// SecretMount returns the mount for the secret path
-func (container *Container) SecretMount() *Mount {
-	if len(container.SecretReferences) > 0 {
-		return &Mount{
-			Source:      container.SecretMountPath(),
-			Destination: containerSecretMountPath,
-			Writable:    false,
-		}
-	}
-
-	return nil
-}
-
-// UnmountSecrets unmounts the local tmpfs for secrets
-func (container *Container) UnmountSecrets() error {
-	if _, err := os.Stat(container.SecretMountPath()); err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	return detachMounted(container.SecretMountPath())
-}
-
-// UpdateContainer updates configuration of a container.
-func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfig) error {
-	container.Lock()
-	defer container.Unlock()
-
-	// update resources of container
-	resources := hostConfig.Resources
-	cResources := &container.HostConfig.Resources
-	if resources.BlkioWeight != 0 {
-		cResources.BlkioWeight = resources.BlkioWeight
-	}
-	if resources.CPUShares != 0 {
-		cResources.CPUShares = resources.CPUShares
-	}
-	if resources.CPUPeriod != 0 {
-		cResources.CPUPeriod = resources.CPUPeriod
-	}
-	if resources.CPUQuota != 0 {
-		cResources.CPUQuota = resources.CPUQuota
-	}
-	if resources.CpusetCpus != "" {
-		cResources.CpusetCpus = resources.CpusetCpus
-	}
-	if resources.CpusetMems != "" {
-		cResources.CpusetMems = resources.CpusetMems
-	}
-	if resources.Memory != 0 {
-		// if memory limit smaller than already set memoryswap limit and doesn't
-		// update the memoryswap limit, then error out.
-		if resources.Memory > cResources.MemorySwap && resources.MemorySwap == 0 {
-			return fmt.Errorf("Memory limit should be smaller than already set memoryswap limit, update the memoryswap at the same time")
-		}
-		cResources.Memory = resources.Memory
-	}
-	if resources.MemorySwap != 0 {
-		cResources.MemorySwap = resources.MemorySwap
-	}
-	if resources.MemoryReservation != 0 {
-		cResources.MemoryReservation = resources.MemoryReservation
-	}
-	if resources.KernelMemory != 0 {
-		cResources.KernelMemory = resources.KernelMemory
-	}
-
-	// update HostConfig of container
-	if hostConfig.RestartPolicy.Name != "" {
-		if container.HostConfig.AutoRemove && !hostConfig.RestartPolicy.IsNone() {
-			return fmt.Errorf("Restart policy cannot be updated because AutoRemove is enabled for the container")
-		}
-		container.HostConfig.RestartPolicy = hostConfig.RestartPolicy
-	}
-
-	if err := container.ToDisk(); err != nil {
-		logrus.Errorf("Error saving updated container: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-// DetachAndUnmount uses a detached mount on all mount destinations, then
-// unmounts each volume normally.
-// This is used from daemon/archive for `docker cp`
-func (container *Container) DetachAndUnmount(volumeEventLog func(name, action string, attributes map[string]string)) error {
-	networkMounts := container.NetworkMounts()
-	mountPaths := make([]string, 0, len(container.MountPoints)+len(networkMounts))
-
-	for _, mntPoint := range container.MountPoints {
-		dest, err := container.GetResourcePath(mntPoint.Destination)
-		if err != nil {
-			logrus.Warnf("Failed to get volume destination path for container '%s' at '%s' while lazily unmounting: %v", container.ID, mntPoint.Destination, err)
-			continue
-		}
-		mountPaths = append(mountPaths, dest)
-	}
-
-	for _, m := range networkMounts {
-		dest, err := container.GetResourcePath(m.Destination)
-		if err != nil {
-			logrus.Warnf("Failed to get volume destination path for container '%s' at '%s' while lazily unmounting: %v", container.ID, m.Destination, err)
-			continue
-		}
-		mountPaths = append(mountPaths, dest)
-	}
-
-	for _, mountPath := range mountPaths {
-		if err := detachMounted(mountPath); err != nil {
-			logrus.Warnf("%s unmountVolumes: Failed to do lazy umount fo volume '%s': %v", container.ID, mountPath, err)
-		}
-	}
-	return container.UnmountVolumes(volumeEventLog)
-}
-
-// copyExistingContents copies from the source to the destination and
-// ensures the ownership is appropriately set.
-func copyExistingContents(source, destination string) error {
-	volList, err := ioutil.ReadDir(source)
-	if err != nil {
-		return err
-	}
-	if len(volList) > 0 {
-		srcList, err := ioutil.ReadDir(destination)
-		if err != nil {
-			return err
-		}
-		if len(srcList) == 0 {
-			// If the source volume is empty, copies files from the root into the volume
-			if err := chrootarchive.CopyWithTar(source, destination); err != nil {
-				return err
-			}
-		}
-	}
-	return copyOwnership(source, destination)
-}
-
-// copyOwnership copies the permissions and uid:gid of the source file
-// to the destination file
-func copyOwnership(source, destination string) error {
-	stat, err := system.Stat(source)
-	if err != nil {
-		return err
-	}
-
-	if err := os.Chown(destination, int(stat.UID()), int(stat.GID())); err != nil {
-		return err
-	}
-
-	return os.Chmod(destination, os.FileMode(stat.Mode()))
-}
-
-// TmpfsMounts returns the list of tmpfs mounts
-func (container *Container) TmpfsMounts() ([]Mount, error) {
-	var mounts []Mount
-	for dest, data := range container.HostConfig.Tmpfs {
-		mounts = append(mounts, Mount{
-			Source:      "tmpfs",
-			Destination: dest,
-			Data:        data,
-		})
-	}
-	for dest, mnt := range container.MountPoints {
-		if mnt.Type == mounttypes.TypeTmpfs {
-			data, err := volume.ConvertTmpfsOptions(mnt.Spec.TmpfsOptions, mnt.Spec.ReadOnly)
-			if err != nil {
-				return nil, err
-			}
-			mounts = append(mounts, Mount{
-				Source:      "tmpfs",
-				Destination: dest,
-				Data:        data,
-			})
-		}
-	}
-	return mounts, nil
-}
-
-// cleanResourcePath cleans a resource path and prepares to combine with mnt path
-func cleanResourcePath(path string) string {
-	return filepath.Join(string(os.PathSeparator), path)
-}
-
-// EnableServiceDiscoveryOnDefaultNetwork Enable service discovery on default network
-func (container *Container) EnableServiceDiscoveryOnDefaultNetwork() bool {
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/container/container_windows.go b/installer/vendor/github.com/docker/docker/container/container_windows.go
deleted file mode 100644
index 1025836f1f..0000000000
--- a/installer/vendor/github.com/docker/docker/container/container_windows.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// +build windows
-
-package container
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/utils"
-)
-
-// Container holds fields specific to the Windows implementation. See
-// CommonContainer for standard fields common to all containers.
-type Container struct {
-	CommonContainer
-
-	// Fields below here are platform specific.
-}
-
-// ExitStatus provides exit reasons for a container.
-type ExitStatus struct {
-	// The exit code with which the container exited.
-	ExitCode int
-}
-
-// CreateDaemonEnvironment creates a new environment variable slice for this container.
-func (container *Container) CreateDaemonEnvironment(_ bool, linkedEnv []string) []string {
-	// because the env on the container can override certain default values
-	// we need to replace the 'env' keys where they match and append anything
-	// else.
-	return utils.ReplaceOrAppendEnvValues(linkedEnv, container.Config.Env)
-}
-
-// UnmountIpcMounts unmounts Ipc related mounts.
-// This is a NOOP on windows.
-func (container *Container) UnmountIpcMounts(unmount func(pth string) error) {
-}
-
-// IpcMounts returns the list of Ipc related mounts.
-func (container *Container) IpcMounts() []Mount {
-	return nil
-}
-
-// SecretMount returns the mount for the secret path
-func (container *Container) SecretMount() *Mount {
-	return nil
-}
-
-// UnmountSecrets unmounts the fs for secrets
-func (container *Container) UnmountSecrets() error {
-	return nil
-}
-
-// DetachAndUnmount unmounts all volumes.
-// On Windows it only delegates to `UnmountVolumes` since there is nothing to
-// force unmount.
-func (container *Container) DetachAndUnmount(volumeEventLog func(name, action string, attributes map[string]string)) error {
-	return container.UnmountVolumes(volumeEventLog)
-}
-
-// TmpfsMounts returns the list of tmpfs mounts
-func (container *Container) TmpfsMounts() ([]Mount, error) {
-	var mounts []Mount
-	return mounts, nil
-}
-
-// UpdateContainer updates configuration of a container
-func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfig) error {
-	container.Lock()
-	defer container.Unlock()
-	resources := hostConfig.Resources
-	if resources.BlkioWeight != 0 || resources.CPUShares != 0 ||
-		resources.CPUPeriod != 0 || resources.CPUQuota != 0 ||
-		resources.CpusetCpus != "" || resources.CpusetMems != "" ||
-		resources.Memory != 0 || resources.MemorySwap != 0 ||
-		resources.MemoryReservation != 0 || resources.KernelMemory != 0 {
-		return fmt.Errorf("Resource updating isn't supported on Windows")
-	}
-	// update HostConfig of container
-	if hostConfig.RestartPolicy.Name != "" {
-		if container.HostConfig.AutoRemove && !hostConfig.RestartPolicy.IsNone() {
-			return fmt.Errorf("Restart policy cannot be updated because AutoRemove is enabled for the container")
-		}
-		container.HostConfig.RestartPolicy = hostConfig.RestartPolicy
-	}
-	return nil
-}
-
-// cleanResourcePath cleans a resource path by removing C:\ syntax, and prepares
-// to combine with a volume path
-func cleanResourcePath(path string) string {
-	if len(path) >= 2 {
-		c := path[0]
-		if path[1] == ':' && ('a' <= c && c <= 'z' || 'A' <= c && c <= 'Z') {
-			path = path[2:]
-		}
-	}
-	return filepath.Join(string(os.PathSeparator), path)
-}
-
-// BuildHostnameFile writes the container's hostname file.
-func (container *Container) BuildHostnameFile() error {
-	return nil
-}
-
-// EnableServiceDiscoveryOnDefaultNetwork Enable service discovery on default network
-func (container *Container) EnableServiceDiscoveryOnDefaultNetwork() bool {
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/container/health.go b/installer/vendor/github.com/docker/docker/container/health.go
deleted file mode 100644
index 6e3cd12f3b..0000000000
--- a/installer/vendor/github.com/docker/docker/container/health.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package container
-
-import (
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-)
-
-// Health holds the current container health-check state
-type Health struct {
-	types.Health
-	stop chan struct{} // Write struct{} to stop the monitor
-}
-
-// String returns a human-readable description of the health-check state
-func (s *Health) String() string {
-	// This happens when the container is being shutdown and the monitor has stopped
-	// or the monitor has yet to be setup.
-	if s.stop == nil {
-		return types.Unhealthy
-	}
-
-	switch s.Status {
-	case types.Starting:
-		return "health: starting"
-	default: // Healthy and Unhealthy are clear on their own
-		return s.Status
-	}
-}
-
-// OpenMonitorChannel creates and returns a new monitor channel. If there already is one,
-// it returns nil.
-func (s *Health) OpenMonitorChannel() chan struct{} {
-	if s.stop == nil {
-		logrus.Debug("OpenMonitorChannel")
-		s.stop = make(chan struct{})
-		return s.stop
-	}
-	return nil
-}
-
-// CloseMonitorChannel closes any existing monitor channel.
-func (s *Health) CloseMonitorChannel() {
-	if s.stop != nil {
-		logrus.Debug("CloseMonitorChannel: waiting for probe to stop")
-		close(s.stop)
-		s.stop = nil
-		logrus.Debug("CloseMonitorChannel done")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/container/history.go b/installer/vendor/github.com/docker/docker/container/history.go
deleted file mode 100644
index c80c2aa0cc..0000000000
--- a/installer/vendor/github.com/docker/docker/container/history.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package container
-
-import "sort"
-
-// History is a convenience type for storing a list of containers,
-// sorted by creation date in descendant order.
-type History []*Container
-
-// Len returns the number of containers in the history.
-func (history *History) Len() int {
-	return len(*history)
-}
-
-// Less compares two containers and returns true if the second one
-// was created before the first one.
-func (history *History) Less(i, j int) bool {
-	containers := *history
-	return containers[j].Created.Before(containers[i].Created)
-}
-
-// Swap switches containers i and j positions in the history.
-func (history *History) Swap(i, j int) {
-	containers := *history
-	containers[i], containers[j] = containers[j], containers[i]
-}
-
-// sort orders the history by creation date in descendant order.
-func (history *History) sort() {
-	sort.Sort(history)
-}
diff --git a/installer/vendor/github.com/docker/docker/container/memory_store.go b/installer/vendor/github.com/docker/docker/container/memory_store.go
deleted file mode 100644
index 706407a71c..0000000000
--- a/installer/vendor/github.com/docker/docker/container/memory_store.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package container
-
-import (
-	"sync"
-)
-
-// memoryStore implements a Store in memory.
-type memoryStore struct {
-	s map[string]*Container
-	sync.RWMutex
-}
-
-// NewMemoryStore initializes a new memory store.
-func NewMemoryStore() Store {
-	return &memoryStore{
-		s: make(map[string]*Container),
-	}
-}
-
-// Add appends a new container to the memory store.
-// It overrides the id if it existed before.
-func (c *memoryStore) Add(id string, cont *Container) {
-	c.Lock()
-	c.s[id] = cont
-	c.Unlock()
-}
-
-// Get returns a container from the store by id.
-func (c *memoryStore) Get(id string) *Container {
-	var res *Container
-	c.RLock()
-	res = c.s[id]
-	c.RUnlock()
-	return res
-}
-
-// Delete removes a container from the store by id.
-func (c *memoryStore) Delete(id string) {
-	c.Lock()
-	delete(c.s, id)
-	c.Unlock()
-}
-
-// List returns a sorted list of containers from the store.
-// The containers are ordered by creation date.
-func (c *memoryStore) List() []*Container {
-	containers := History(c.all())
-	containers.sort()
-	return containers
-}
-
-// Size returns the number of containers in the store.
-func (c *memoryStore) Size() int {
-	c.RLock()
-	defer c.RUnlock()
-	return len(c.s)
-}
-
-// First returns the first container found in the store by a given filter.
-func (c *memoryStore) First(filter StoreFilter) *Container {
-	for _, cont := range c.all() {
-		if filter(cont) {
-			return cont
-		}
-	}
-	return nil
-}
-
-// ApplyAll calls the reducer function with every container in the store.
-// This operation is asynchronous in the memory store.
-// NOTE: Modifications to the store MUST NOT be done by the StoreReducer.
-func (c *memoryStore) ApplyAll(apply StoreReducer) {
-	wg := new(sync.WaitGroup)
-	for _, cont := range c.all() {
-		wg.Add(1)
-		go func(container *Container) {
-			apply(container)
-			wg.Done()
-		}(cont)
-	}
-
-	wg.Wait()
-}
-
-func (c *memoryStore) all() []*Container {
-	c.RLock()
-	containers := make([]*Container, 0, len(c.s))
-	for _, cont := range c.s {
-		containers = append(containers, cont)
-	}
-	c.RUnlock()
-	return containers
-}
-
-var _ Store = &memoryStore{}
diff --git a/installer/vendor/github.com/docker/docker/container/memory_store_test.go b/installer/vendor/github.com/docker/docker/container/memory_store_test.go
deleted file mode 100644
index f81738fae1..0000000000
--- a/installer/vendor/github.com/docker/docker/container/memory_store_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package container
-
-import (
-	"testing"
-	"time"
-)
-
-func TestNewMemoryStore(t *testing.T) {
-	s := NewMemoryStore()
-	m, ok := s.(*memoryStore)
-	if !ok {
-		t.Fatalf("store is not a memory store %v", s)
-	}
-	if m.s == nil {
-		t.Fatal("expected store map to not be nil")
-	}
-}
-
-func TestAddContainers(t *testing.T) {
-	s := NewMemoryStore()
-	s.Add("id", NewBaseContainer("id", "root"))
-	if s.Size() != 1 {
-		t.Fatalf("expected store size 1, got %v", s.Size())
-	}
-}
-
-func TestGetContainer(t *testing.T) {
-	s := NewMemoryStore()
-	s.Add("id", NewBaseContainer("id", "root"))
-	c := s.Get("id")
-	if c == nil {
-		t.Fatal("expected container to not be nil")
-	}
-}
-
-func TestDeleteContainer(t *testing.T) {
-	s := NewMemoryStore()
-	s.Add("id", NewBaseContainer("id", "root"))
-	s.Delete("id")
-	if c := s.Get("id"); c != nil {
-		t.Fatalf("expected container to be nil after removal, got %v", c)
-	}
-
-	if s.Size() != 0 {
-		t.Fatalf("expected store size to be 0, got %v", s.Size())
-	}
-}
-
-func TestListContainers(t *testing.T) {
-	s := NewMemoryStore()
-
-	cont := NewBaseContainer("id", "root")
-	cont.Created = time.Now()
-	cont2 := NewBaseContainer("id2", "root")
-	cont2.Created = time.Now().Add(24 * time.Hour)
-
-	s.Add("id", cont)
-	s.Add("id2", cont2)
-
-	list := s.List()
-	if len(list) != 2 {
-		t.Fatalf("expected list size 2, got %v", len(list))
-	}
-	if list[0].ID != "id2" {
-		t.Fatalf("expected older container to be first, got %v", list[0].ID)
-	}
-}
-
-func TestFirstContainer(t *testing.T) {
-	s := NewMemoryStore()
-
-	s.Add("id", NewBaseContainer("id", "root"))
-	s.Add("id2", NewBaseContainer("id2", "root"))
-
-	first := s.First(func(cont *Container) bool {
-		return cont.ID == "id2"
-	})
-
-	if first == nil {
-		t.Fatal("expected container to not be nil")
-	}
-	if first.ID != "id2" {
-		t.Fatalf("expected id2, got %v", first)
-	}
-}
-
-func TestApplyAllContainer(t *testing.T) {
-	s := NewMemoryStore()
-
-	s.Add("id", NewBaseContainer("id", "root"))
-	s.Add("id2", NewBaseContainer("id2", "root"))
-
-	s.ApplyAll(func(cont *Container) {
-		if cont.ID == "id2" {
-			cont.ID = "newID"
-		}
-	})
-
-	cont := s.Get("id2")
-	if cont == nil {
-		t.Fatal("expected container to not be nil")
-	}
-	if cont.ID != "newID" {
-		t.Fatalf("expected newID, got %v", cont)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/container/monitor.go b/installer/vendor/github.com/docker/docker/container/monitor.go
deleted file mode 100644
index f05e72b25f..0000000000
--- a/installer/vendor/github.com/docker/docker/container/monitor.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package container
-
-import (
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-const (
-	loggerCloseTimeout = 10 * time.Second
-)
-
-// Reset puts a container into a state where it can be restarted again.
-func (container *Container) Reset(lock bool) {
-	if lock {
-		container.Lock()
-		defer container.Unlock()
-	}
-
-	if err := container.CloseStreams(); err != nil {
-		logrus.Errorf("%s: %s", container.ID, err)
-	}
-
-	// Re-create a brand new stdin pipe once the container exited
-	if container.Config.OpenStdin {
-		container.StreamConfig.NewInputPipes()
-	}
-
-	if container.LogDriver != nil {
-		if container.LogCopier != nil {
-			exit := make(chan struct{})
-			go func() {
-				container.LogCopier.Wait()
-				close(exit)
-			}()
-			select {
-			case <-time.After(loggerCloseTimeout):
-				logrus.Warn("Logger didn't exit in time: logs may be truncated")
-			case <-exit:
-			}
-		}
-		container.LogDriver.Close()
-		container.LogCopier = nil
-		container.LogDriver = nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/container/mounts_unix.go b/installer/vendor/github.com/docker/docker/container/mounts_unix.go
deleted file mode 100644
index c52abed2dc..0000000000
--- a/installer/vendor/github.com/docker/docker/container/mounts_unix.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !windows
-
-package container
-
-// Mount contains information for a mount operation.
-type Mount struct {
-	Source      string `json:"source"`
-	Destination string `json:"destination"`
-	Writable    bool   `json:"writable"`
-	Data        string `json:"data"`
-	Propagation string `json:"mountpropagation"`
-}
diff --git a/installer/vendor/github.com/docker/docker/container/mounts_windows.go b/installer/vendor/github.com/docker/docker/container/mounts_windows.go
deleted file mode 100644
index 01b327f788..0000000000
--- a/installer/vendor/github.com/docker/docker/container/mounts_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package container
-
-// Mount contains information for a mount operation.
-type Mount struct {
-	Source      string `json:"source"`
-	Destination string `json:"destination"`
-	Writable    bool   `json:"writable"`
-}
diff --git a/installer/vendor/github.com/docker/docker/container/state.go b/installer/vendor/github.com/docker/docker/container/state.go
deleted file mode 100644
index 4dd2ecec69..0000000000
--- a/installer/vendor/github.com/docker/docker/container/state.go
+++ /dev/null
@@ -1,343 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/go-units"
-)
-
-// State holds the current container state, and has methods to get and
-// set the state. Container has an embed, which allows all of the
-// functions defined against State to run against Container.
-type State struct {
-	sync.Mutex
-	// FIXME: Why do we have both paused and running if a
-	// container cannot be paused and running at the same time?
-	Running           bool
-	Paused            bool
-	Restarting        bool
-	OOMKilled         bool
-	RemovalInProgress bool // Not need for this to be persistent on disk.
-	Dead              bool
-	Pid               int
-	ExitCodeValue     int    `json:"ExitCode"`
-	ErrorMsg          string `json:"Error"` // contains last known error when starting the container
-	StartedAt         time.Time
-	FinishedAt        time.Time
-	waitChan          chan struct{}
-	Health            *Health
-}
-
-// StateStatus is used to return an error type implementing both
-// exec.ExitCode and error.
-// This type is needed as State include a sync.Mutex field which make
-// copying it unsafe.
-type StateStatus struct {
-	exitCode int
-	error    string
-}
-
-func newStateStatus(ec int, err string) *StateStatus {
-	return &StateStatus{
-		exitCode: ec,
-		error:    err,
-	}
-}
-
-// ExitCode returns current exitcode for the state.
-func (ss *StateStatus) ExitCode() int {
-	return ss.exitCode
-}
-
-// Error returns current error for the state.
-func (ss *StateStatus) Error() string {
-	return ss.error
-}
-
-// NewState creates a default state object with a fresh channel for state changes.
-func NewState() *State {
-	return &State{
-		waitChan: make(chan struct{}),
-	}
-}
-
-// String returns a human-readable description of the state
-func (s *State) String() string {
-	if s.Running {
-		if s.Paused {
-			return fmt.Sprintf("Up %s (Paused)", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
-		}
-		if s.Restarting {
-			return fmt.Sprintf("Restarting (%d) %s ago", s.ExitCodeValue, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
-		}
-
-		if h := s.Health; h != nil {
-			return fmt.Sprintf("Up %s (%s)", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)), h.String())
-		}
-
-		return fmt.Sprintf("Up %s", units.HumanDuration(time.Now().UTC().Sub(s.StartedAt)))
-	}
-
-	if s.RemovalInProgress {
-		return "Removal In Progress"
-	}
-
-	if s.Dead {
-		return "Dead"
-	}
-
-	if s.StartedAt.IsZero() {
-		return "Created"
-	}
-
-	if s.FinishedAt.IsZero() {
-		return ""
-	}
-
-	return fmt.Sprintf("Exited (%d) %s ago", s.ExitCodeValue, units.HumanDuration(time.Now().UTC().Sub(s.FinishedAt)))
-}
-
-// HealthString returns a single string to describe health status.
-func (s *State) HealthString() string {
-	if s.Health == nil {
-		return types.NoHealthcheck
-	}
-
-	return s.Health.String()
-}
-
-// IsValidHealthString checks if the provided string is a valid container health status or not.
-func IsValidHealthString(s string) bool {
-	return s == types.Starting ||
-		s == types.Healthy ||
-		s == types.Unhealthy ||
-		s == types.NoHealthcheck
-}
-
-// StateString returns a single string to describe state
-func (s *State) StateString() string {
-	if s.Running {
-		if s.Paused {
-			return "paused"
-		}
-		if s.Restarting {
-			return "restarting"
-		}
-		return "running"
-	}
-
-	if s.RemovalInProgress {
-		return "removing"
-	}
-
-	if s.Dead {
-		return "dead"
-	}
-
-	if s.StartedAt.IsZero() {
-		return "created"
-	}
-
-	return "exited"
-}
-
-// IsValidStateString checks if the provided string is a valid container state or not.
-func IsValidStateString(s string) bool {
-	if s != "paused" &&
-		s != "restarting" &&
-		s != "removing" &&
-		s != "running" &&
-		s != "dead" &&
-		s != "created" &&
-		s != "exited" {
-		return false
-	}
-	return true
-}
-
-func wait(waitChan <-chan struct{}, timeout time.Duration) error {
-	if timeout < 0 {
-		<-waitChan
-		return nil
-	}
-	select {
-	case <-time.After(timeout):
-		return fmt.Errorf("Timed out: %v", timeout)
-	case <-waitChan:
-		return nil
-	}
-}
-
-// WaitStop waits until state is stopped. If state already stopped it returns
-// immediately. If you want wait forever you must supply negative timeout.
-// Returns exit code, that was passed to SetStopped
-func (s *State) WaitStop(timeout time.Duration) (int, error) {
-	s.Lock()
-	if !s.Running {
-		exitCode := s.ExitCodeValue
-		s.Unlock()
-		return exitCode, nil
-	}
-	waitChan := s.waitChan
-	s.Unlock()
-	if err := wait(waitChan, timeout); err != nil {
-		return -1, err
-	}
-	s.Lock()
-	defer s.Unlock()
-	return s.ExitCode(), nil
-}
-
-// WaitWithContext waits for the container to stop. Optional context can be
-// passed for canceling the request.
-func (s *State) WaitWithContext(ctx context.Context) error {
-	// todo(tonistiigi): make other wait functions use this
-	s.Lock()
-	if !s.Running {
-		state := newStateStatus(s.ExitCode(), s.Error())
-		defer s.Unlock()
-		if state.ExitCode() == 0 {
-			return nil
-		}
-		return state
-	}
-	waitChan := s.waitChan
-	s.Unlock()
-	select {
-	case <-waitChan:
-		s.Lock()
-		state := newStateStatus(s.ExitCode(), s.Error())
-		s.Unlock()
-		if state.ExitCode() == 0 {
-			return nil
-		}
-		return state
-	case <-ctx.Done():
-		return ctx.Err()
-	}
-}
-
-// IsRunning returns whether the running flag is set. Used by Container to check whether a container is running.
-func (s *State) IsRunning() bool {
-	s.Lock()
-	res := s.Running
-	s.Unlock()
-	return res
-}
-
-// GetPID holds the process id of a container.
-func (s *State) GetPID() int {
-	s.Lock()
-	res := s.Pid
-	s.Unlock()
-	return res
-}
-
-// ExitCode returns current exitcode for the state. Take lock before if state
-// may be shared.
-func (s *State) ExitCode() int {
-	return s.ExitCodeValue
-}
-
-// SetExitCode sets current exitcode for the state. Take lock before if state
-// may be shared.
-func (s *State) SetExitCode(ec int) {
-	s.ExitCodeValue = ec
-}
-
-// SetRunning sets the state of the container to "running".
-func (s *State) SetRunning(pid int, initial bool) {
-	s.ErrorMsg = ""
-	s.Running = true
-	s.Restarting = false
-	s.ExitCodeValue = 0
-	s.Pid = pid
-	if initial {
-		s.StartedAt = time.Now().UTC()
-	}
-}
-
-// SetStopped sets the container state to "stopped" without locking.
-func (s *State) SetStopped(exitStatus *ExitStatus) {
-	s.Running = false
-	s.Paused = false
-	s.Restarting = false
-	s.Pid = 0
-	s.FinishedAt = time.Now().UTC()
-	s.setFromExitStatus(exitStatus)
-	close(s.waitChan) // fire waiters for stop
-	s.waitChan = make(chan struct{})
-}
-
-// SetRestarting sets the container state to "restarting" without locking.
-// It also sets the container PID to 0.
-func (s *State) SetRestarting(exitStatus *ExitStatus) {
-	// we should consider the container running when it is restarting because of
-	// all the checks in docker around rm/stop/etc
-	s.Running = true
-	s.Restarting = true
-	s.Pid = 0
-	s.FinishedAt = time.Now().UTC()
-	s.setFromExitStatus(exitStatus)
-	close(s.waitChan) // fire waiters for stop
-	s.waitChan = make(chan struct{})
-}
-
-// SetError sets the container's error state. This is useful when we want to
-// know the error that occurred when container transits to another state
-// when inspecting it
-func (s *State) SetError(err error) {
-	s.ErrorMsg = err.Error()
-}
-
-// IsPaused returns whether the container is paused or not.
-func (s *State) IsPaused() bool {
-	s.Lock()
-	res := s.Paused
-	s.Unlock()
-	return res
-}
-
-// IsRestarting returns whether the container is restarting or not.
-func (s *State) IsRestarting() bool {
-	s.Lock()
-	res := s.Restarting
-	s.Unlock()
-	return res
-}
-
-// SetRemovalInProgress sets the container state as being removed.
-// It returns true if the container was already in that state.
-func (s *State) SetRemovalInProgress() bool {
-	s.Lock()
-	defer s.Unlock()
-	if s.RemovalInProgress {
-		return true
-	}
-	s.RemovalInProgress = true
-	return false
-}
-
-// ResetRemovalInProgress makes the RemovalInProgress state to false.
-func (s *State) ResetRemovalInProgress() {
-	s.Lock()
-	s.RemovalInProgress = false
-	s.Unlock()
-}
-
-// SetDead sets the container state to "dead"
-func (s *State) SetDead() {
-	s.Lock()
-	s.Dead = true
-	s.Unlock()
-}
-
-// Error returns current error for the state.
-func (s *State) Error() string {
-	return s.ErrorMsg
-}
diff --git a/installer/vendor/github.com/docker/docker/container/state_solaris.go b/installer/vendor/github.com/docker/docker/container/state_solaris.go
deleted file mode 100644
index 1229650efa..0000000000
--- a/installer/vendor/github.com/docker/docker/container/state_solaris.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package container
-
-// setFromExitStatus is a platform specific helper function to set the state
-// based on the ExitStatus structure.
-func (s *State) setFromExitStatus(exitStatus *ExitStatus) {
-	s.ExitCodeValue = exitStatus.ExitCode
-}
diff --git a/installer/vendor/github.com/docker/docker/container/state_test.go b/installer/vendor/github.com/docker/docker/container/state_test.go
deleted file mode 100644
index c9a7bb4b7b..0000000000
--- a/installer/vendor/github.com/docker/docker/container/state_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package container
-
-import (
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-)
-
-func TestIsValidHealthString(t *testing.T) {
-	contexts := []struct {
-		Health   string
-		Expected bool
-	}{
-		{types.Healthy, true},
-		{types.Unhealthy, true},
-		{types.Starting, true},
-		{types.NoHealthcheck, true},
-		{"fail", false},
-	}
-
-	for _, c := range contexts {
-		v := IsValidHealthString(c.Health)
-		if v != c.Expected {
-			t.Fatalf("Expected %t, but got %t", c.Expected, v)
-		}
-	}
-}
-
-func TestStateRunStop(t *testing.T) {
-	s := NewState()
-	for i := 1; i < 3; i++ { // full lifecycle two times
-		s.Lock()
-		s.SetRunning(i+100, false)
-		s.Unlock()
-
-		if !s.IsRunning() {
-			t.Fatal("State not running")
-		}
-		if s.Pid != i+100 {
-			t.Fatalf("Pid %v, expected %v", s.Pid, i+100)
-		}
-		if s.ExitCode() != 0 {
-			t.Fatalf("ExitCode %v, expected 0", s.ExitCode())
-		}
-
-		stopped := make(chan struct{})
-		var exit int64
-		go func() {
-			exitCode, _ := s.WaitStop(-1 * time.Second)
-			atomic.StoreInt64(&exit, int64(exitCode))
-			close(stopped)
-		}()
-		s.Lock()
-		s.SetStopped(&ExitStatus{ExitCode: i})
-		s.Unlock()
-		if s.IsRunning() {
-			t.Fatal("State is running")
-		}
-		if s.ExitCode() != i {
-			t.Fatalf("ExitCode %v, expected %v", s.ExitCode(), i)
-		}
-		if s.Pid != 0 {
-			t.Fatalf("Pid %v, expected 0", s.Pid)
-		}
-		select {
-		case <-time.After(100 * time.Millisecond):
-			t.Fatal("Stop callback doesn't fire in 100 milliseconds")
-		case <-stopped:
-			t.Log("Stop callback fired")
-		}
-		exitCode := int(atomic.LoadInt64(&exit))
-		if exitCode != i {
-			t.Fatalf("ExitCode %v, expected %v", exitCode, i)
-		}
-		if exitCode, err := s.WaitStop(-1 * time.Second); err != nil || exitCode != i {
-			t.Fatalf("WaitStop returned exitCode: %v, err: %v, expected exitCode: %v, err: %v", exitCode, err, i, nil)
-		}
-	}
-}
-
-func TestStateTimeoutWait(t *testing.T) {
-	s := NewState()
-	stopped := make(chan struct{})
-	go func() {
-		s.WaitStop(100 * time.Millisecond)
-		close(stopped)
-	}()
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("Stop callback doesn't fire in 200 milliseconds")
-	case <-stopped:
-		t.Log("Stop callback fired")
-	}
-
-	s.Lock()
-	s.SetStopped(&ExitStatus{ExitCode: 1})
-	s.Unlock()
-
-	stopped = make(chan struct{})
-	go func() {
-		s.WaitStop(100 * time.Millisecond)
-		close(stopped)
-	}()
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatal("Stop callback doesn't fire in 100 milliseconds")
-	case <-stopped:
-		t.Log("Stop callback fired")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/container/state_unix.go b/installer/vendor/github.com/docker/docker/container/state_unix.go
deleted file mode 100644
index a2fa5afc28..0000000000
--- a/installer/vendor/github.com/docker/docker/container/state_unix.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build linux freebsd
-
-package container
-
-// setFromExitStatus is a platform specific helper function to set the state
-// based on the ExitStatus structure.
-func (s *State) setFromExitStatus(exitStatus *ExitStatus) {
-	s.ExitCodeValue = exitStatus.ExitCode
-	s.OOMKilled = exitStatus.OOMKilled
-}
diff --git a/installer/vendor/github.com/docker/docker/container/state_windows.go b/installer/vendor/github.com/docker/docker/container/state_windows.go
deleted file mode 100644
index 1229650efa..0000000000
--- a/installer/vendor/github.com/docker/docker/container/state_windows.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package container
-
-// setFromExitStatus is a platform specific helper function to set the state
-// based on the ExitStatus structure.
-func (s *State) setFromExitStatus(exitStatus *ExitStatus) {
-	s.ExitCodeValue = exitStatus.ExitCode
-}
diff --git a/installer/vendor/github.com/docker/docker/container/store.go b/installer/vendor/github.com/docker/docker/container/store.go
deleted file mode 100644
index 042fb1a349..0000000000
--- a/installer/vendor/github.com/docker/docker/container/store.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package container
-
-// StoreFilter defines a function to filter
-// container in the store.
-type StoreFilter func(*Container) bool
-
-// StoreReducer defines a function to
-// manipulate containers in the store
-type StoreReducer func(*Container)
-
-// Store defines an interface that
-// any container store must implement.
-type Store interface {
-	// Add appends a new container to the store.
-	Add(string, *Container)
-	// Get returns a container from the store by the identifier it was stored with.
-	Get(string) *Container
-	// Delete removes a container from the store by the identifier it was stored with.
-	Delete(string)
-	// List returns a list of containers from the store.
-	List() []*Container
-	// Size returns the number of containers in the store.
-	Size() int
-	// First returns the first container found in the store by a given filter.
-	First(StoreFilter) *Container
-	// ApplyAll calls the reducer function with every container in the store.
-	ApplyAll(StoreReducer)
-}
diff --git a/installer/vendor/github.com/docker/docker/container/stream/streams.go b/installer/vendor/github.com/docker/docker/container/stream/streams.go
deleted file mode 100644
index 79f366afda..0000000000
--- a/installer/vendor/github.com/docker/docker/container/stream/streams.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package stream
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strings"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/broadcaster"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/pools"
-)
-
-// Config holds information about I/O streams managed together.
-//
-// config.StdinPipe returns a WriteCloser which can be used to feed data
-// to the standard input of the streamConfig's active process.
-// config.StdoutPipe and streamConfig.StderrPipe each return a ReadCloser
-// which can be used to retrieve the standard output (and error) generated
-// by the container's active process. The output (and error) are actually
-// copied and delivered to all StdoutPipe and StderrPipe consumers, using
-// a kind of "broadcaster".
-type Config struct {
-	sync.WaitGroup
-	stdout    *broadcaster.Unbuffered
-	stderr    *broadcaster.Unbuffered
-	stdin     io.ReadCloser
-	stdinPipe io.WriteCloser
-}
-
-// NewConfig creates a stream config and initializes
-// the standard err and standard out to new unbuffered broadcasters.
-func NewConfig() *Config {
-	return &Config{
-		stderr: new(broadcaster.Unbuffered),
-		stdout: new(broadcaster.Unbuffered),
-	}
-}
-
-// Stdout returns the standard output in the configuration.
-func (c *Config) Stdout() *broadcaster.Unbuffered {
-	return c.stdout
-}
-
-// Stderr returns the standard error in the configuration.
-func (c *Config) Stderr() *broadcaster.Unbuffered {
-	return c.stderr
-}
-
-// Stdin returns the standard input in the configuration.
-func (c *Config) Stdin() io.ReadCloser {
-	return c.stdin
-}
-
-// StdinPipe returns an input writer pipe as an io.WriteCloser.
-func (c *Config) StdinPipe() io.WriteCloser {
-	return c.stdinPipe
-}
-
-// StdoutPipe creates a new io.ReadCloser with an empty bytes pipe.
-// It adds this new out pipe to the Stdout broadcaster.
-func (c *Config) StdoutPipe() io.ReadCloser {
-	bytesPipe := ioutils.NewBytesPipe()
-	c.stdout.Add(bytesPipe)
-	return bytesPipe
-}
-
-// StderrPipe creates a new io.ReadCloser with an empty bytes pipe.
-// It adds this new err pipe to the Stderr broadcaster.
-func (c *Config) StderrPipe() io.ReadCloser {
-	bytesPipe := ioutils.NewBytesPipe()
-	c.stderr.Add(bytesPipe)
-	return bytesPipe
-}
-
-// NewInputPipes creates new pipes for both standard inputs, Stdin and StdinPipe.
-func (c *Config) NewInputPipes() {
-	c.stdin, c.stdinPipe = io.Pipe()
-}
-
-// NewNopInputPipe creates a new input pipe that will silently drop all messages in the input.
-func (c *Config) NewNopInputPipe() {
-	c.stdinPipe = ioutils.NopWriteCloser(ioutil.Discard)
-}
-
-// CloseStreams ensures that the configured streams are properly closed.
-func (c *Config) CloseStreams() error {
-	var errors []string
-
-	if c.stdin != nil {
-		if err := c.stdin.Close(); err != nil {
-			errors = append(errors, fmt.Sprintf("error close stdin: %s", err))
-		}
-	}
-
-	if err := c.stdout.Clean(); err != nil {
-		errors = append(errors, fmt.Sprintf("error close stdout: %s", err))
-	}
-
-	if err := c.stderr.Clean(); err != nil {
-		errors = append(errors, fmt.Sprintf("error close stderr: %s", err))
-	}
-
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, "\n"))
-	}
-
-	return nil
-}
-
-// CopyToPipe connects streamconfig with a libcontainerd.IOPipe
-func (c *Config) CopyToPipe(iop libcontainerd.IOPipe) {
-	copyFunc := func(w io.Writer, r io.Reader) {
-		c.Add(1)
-		go func() {
-			if _, err := pools.Copy(w, r); err != nil {
-				logrus.Errorf("stream copy error: %+v", err)
-			}
-			c.Done()
-		}()
-	}
-
-	if iop.Stdout != nil {
-		copyFunc(c.Stdout(), iop.Stdout)
-	}
-	if iop.Stderr != nil {
-		copyFunc(c.Stderr(), iop.Stderr)
-	}
-
-	if stdin := c.Stdin(); stdin != nil {
-		if iop.Stdin != nil {
-			go func() {
-				pools.Copy(iop.Stdin, stdin)
-				if err := iop.Stdin.Close(); err != nil {
-					logrus.Warnf("failed to close stdin: %+v", err)
-				}
-			}()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/README.md b/installer/vendor/github.com/docker/docker/contrib/README.md
deleted file mode 100644
index 92b1d94433..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/README.md
+++ /dev/null
@@ -1,4 +0,0 @@
-The `contrib` directory contains scripts, images, and other helpful things
-which are not part of the core docker distribution. Please note that they
-could be out of date, since they do not receive the same attention as the
-rest of the repository.
diff --git a/installer/vendor/github.com/docker/docker/contrib/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/REVIEWERS
deleted file mode 100644
index 18e05a3070..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/REVIEWERS
+++ /dev/null
@@ -1 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
diff --git a/installer/vendor/github.com/docker/docker/contrib/apparmor/main.go b/installer/vendor/github.com/docker/docker/contrib/apparmor/main.go
deleted file mode 100644
index f4a2978b86..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/apparmor/main.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"path"
-	"text/template"
-
-	"github.com/docker/docker/pkg/aaparser"
-)
-
-type profileData struct {
-	Version int
-}
-
-func main() {
-	if len(os.Args) < 2 {
-		log.Fatal("pass a filename to save the profile in.")
-	}
-
-	// parse the arg
-	apparmorProfilePath := os.Args[1]
-
-	version, err := aaparser.GetVersion()
-	if err != nil {
-		log.Fatal(err)
-	}
-	data := profileData{
-		Version: version,
-	}
-	fmt.Printf("apparmor_parser is of version %+v\n", data)
-
-	// parse the template
-	compiled, err := template.New("apparmor_profile").Parse(dockerProfileTemplate)
-	if err != nil {
-		log.Fatalf("parsing template failed: %v", err)
-	}
-
-	// make sure /etc/apparmor.d exists
-	if err := os.MkdirAll(path.Dir(apparmorProfilePath), 0755); err != nil {
-		log.Fatal(err)
-	}
-
-	f, err := os.OpenFile(apparmorProfilePath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f.Close()
-
-	if err := compiled.Execute(f, data); err != nil {
-		log.Fatalf("executing template failed: %v", err)
-	}
-
-	fmt.Printf("created apparmor profile for version %+v at %q\n", data, apparmorProfilePath)
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/apparmor/template.go b/installer/vendor/github.com/docker/docker/contrib/apparmor/template.go
deleted file mode 100644
index e5e1c8bed6..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/apparmor/template.go
+++ /dev/null
@@ -1,268 +0,0 @@
-package main
-
-const dockerProfileTemplate = `@{DOCKER_GRAPH_PATH}=/var/lib/docker
-
-profile /usr/bin/docker (attach_disconnected, complain) {
-  # Prevent following links to these files during container setup.
-  deny /etc/** mkl,
-  deny /dev/** kl,
-  deny /sys/** mkl,
-  deny /proc/** mkl,
-
-  mount -> @{DOCKER_GRAPH_PATH}/**,
-  mount -> /,
-  mount -> /proc/**,
-  mount -> /sys/**,
-  mount -> /run/docker/netns/**,
-  mount -> /.pivot_root[0-9]*/,
-
-  / r,
-
-  umount,
-  pivot_root,
-{{if ge .Version 209000}}
-  signal (receive) peer=@{profile_name},
-  signal (receive) peer=unconfined,
-  signal (send),
-{{end}}
-  network,
-  capability,
-  owner /** rw,
-  @{DOCKER_GRAPH_PATH}/** rwl,
-  @{DOCKER_GRAPH_PATH}/linkgraph.db k,
-  @{DOCKER_GRAPH_PATH}/network/files/boltdb.db k,
-  @{DOCKER_GRAPH_PATH}/network/files/local-kv.db k,
-  @{DOCKER_GRAPH_PATH}/[0-9]*.[0-9]*/linkgraph.db k,
-
-  # For non-root client use:
-  /dev/urandom r,
-  /dev/null rw,
-  /dev/pts/[0-9]* rw,
-  /run/docker.sock rw,
-  /proc/** r,
-  /proc/[0-9]*/attr/exec w,
-  /sys/kernel/mm/hugepages/ r,
-  /etc/localtime r,
-  /etc/ld.so.cache r,
-  /etc/passwd r,
-
-{{if ge .Version 209000}}
-  ptrace peer=@{profile_name},
-  ptrace (read) peer=docker-default,
-  deny ptrace (trace) peer=docker-default,
-  deny ptrace peer=/usr/bin/docker///bin/ps,
-{{end}}
-
-  /usr/lib/** rm,
-  /lib/** rm,
-
-  /usr/bin/docker pix,
-  /sbin/xtables-multi rCx,
-  /sbin/iptables rCx,
-  /sbin/modprobe rCx,
-  /sbin/auplink rCx,
-  /sbin/mke2fs rCx,
-  /sbin/tune2fs rCx,
-  /sbin/blkid rCx,
-  /bin/kmod rCx,
-  /usr/bin/xz rCx,
-  /bin/ps rCx,
-  /bin/tar rCx,
-  /bin/cat rCx,
-  /sbin/zfs rCx,
-  /sbin/apparmor_parser rCx,
-
-{{if ge .Version 209000}}
-  # Transitions
-  change_profile -> docker-*,
-  change_profile -> unconfined,
-{{end}}
-
-  profile /bin/cat (complain) {
-    /etc/ld.so.cache r,
-    /lib/** rm,
-    /dev/null rw,
-    /proc r,
-    /bin/cat mr,
-
-    # For reading in 'docker stats':
-    /proc/[0-9]*/net/dev r,
-  }
-  profile /bin/ps (complain) {
-    /etc/ld.so.cache r,
-    /etc/localtime r,
-    /etc/passwd r,
-    /etc/nsswitch.conf r,
-    /lib/** rm,
-    /proc/[0-9]*/** r,
-    /dev/null rw,
-    /bin/ps mr,
-
-{{if ge .Version 209000}}
-    # We don't need ptrace so we'll deny and ignore the error.
-    deny ptrace (read, trace),
-{{end}}
-
-    # Quiet dac_override denials
-    deny capability dac_override,
-    deny capability dac_read_search,
-    deny capability sys_ptrace,
-
-    /dev/tty r,
-    /proc/stat r,
-    /proc/cpuinfo r,
-    /proc/meminfo r,
-    /proc/uptime r,
-    /sys/devices/system/cpu/online r,
-    /proc/sys/kernel/pid_max r,
-    /proc/ r,
-    /proc/tty/drivers r,
-  }
-  profile /sbin/iptables (complain) {
-{{if ge .Version 209000}}
-    signal (receive) peer=/usr/bin/docker,
-{{end}}
-    capability net_admin,
-  }
-  profile /sbin/auplink flags=(attach_disconnected, complain) {
-{{if ge .Version 209000}}
-    signal (receive) peer=/usr/bin/docker,
-{{end}}
-    capability sys_admin,
-    capability dac_override,
-
-    @{DOCKER_GRAPH_PATH}/aufs/** rw,
-    @{DOCKER_GRAPH_PATH}/tmp/** rw,
-    # For user namespaces:
-    @{DOCKER_GRAPH_PATH}/[0-9]*.[0-9]*/** rw,
-
-    /sys/fs/aufs/** r,
-    /lib/** rm,
-    /apparmor/.null r,
-    /dev/null rw,
-    /etc/ld.so.cache r,
-    /sbin/auplink rm,
-    /proc/fs/aufs/** rw,
-    /proc/[0-9]*/mounts rw,
-  }
-  profile /sbin/modprobe /bin/kmod (complain) {
-{{if ge .Version 209000}}
-    signal (receive) peer=/usr/bin/docker,
-{{end}}
-    capability sys_module,
-    /etc/ld.so.cache r,
-    /lib/** rm,
-    /dev/null rw,
-    /apparmor/.null rw,
-    /sbin/modprobe rm,
-    /bin/kmod rm,
-    /proc/cmdline r,
-    /sys/module/** r,
-    /etc/modprobe.d{/,/**} r,
-  }
-  # xz works via pipes, so we do not need access to the filesystem.
-  profile /usr/bin/xz (complain) {
-{{if ge .Version 209000}}
-    signal (receive) peer=/usr/bin/docker,
-{{end}}
-    /etc/ld.so.cache r,
-    /lib/** rm,
-    /usr/bin/xz rm,
-    deny /proc/** rw,
-    deny /sys/** rw,
-  }
-  profile /sbin/xtables-multi (attach_disconnected, complain) {
-    /etc/ld.so.cache r,
-    /lib/** rm,
-    /sbin/xtables-multi rm,
-    /apparmor/.null w,
-    /dev/null rw,
-
-    /proc r,
-
-    capability net_raw,
-    capability net_admin,
-    network raw,
-  }
-  profile /sbin/zfs (attach_disconnected, complain) {
-    file,
-    capability,
-  }
-  profile /sbin/mke2fs (complain) {
-    /sbin/mke2fs rm,
-
-    /lib/** rm,
-
-    /apparmor/.null w,
-
-    /etc/ld.so.cache r,
-    /etc/mke2fs.conf r,
-    /etc/mtab r,
-
-    /dev/dm-* rw,
-    /dev/urandom r,
-    /dev/null rw,
-
-    /proc/swaps r,
-    /proc/[0-9]*/mounts r,
-  }
-  profile /sbin/tune2fs (complain) {
-    /sbin/tune2fs rm,
-
-    /lib/** rm,
-
-    /apparmor/.null w,
-
-    /etc/blkid.conf r,
-    /etc/mtab r,
-    /etc/ld.so.cache r,
-
-    /dev/null rw,
-    /dev/.blkid.tab r,
-    /dev/dm-* rw,
-
-    /proc/swaps r,
-    /proc/[0-9]*/mounts r,
-  }
-  profile /sbin/blkid (complain) {
-    /sbin/blkid rm,
-
-    /lib/** rm,
-    /apparmor/.null w,
-
-    /etc/ld.so.cache r,
-    /etc/blkid.conf r,
-
-    /dev/null rw,
-    /dev/.blkid.tab rl,
-    /dev/.blkid.tab* rwl,
-    /dev/dm-* r,
-
-    /sys/devices/virtual/block/** r,
-
-    capability mknod,
-
-    mount -> @{DOCKER_GRAPH_PATH}/**,
-  }
-  profile /sbin/apparmor_parser (complain) {
-    /sbin/apparmor_parser rm,
-
-    /lib/** rm,
-
-    /etc/ld.so.cache r,
-    /etc/apparmor/** r,
-    /etc/apparmor.d/** r,
-    /etc/apparmor.d/cache/** w,
-
-    /dev/null rw,
-
-    /sys/kernel/security/apparmor/** r,
-    /sys/kernel/security/apparmor/.replace w,
-
-    /proc/[0-9]*/mounts r,
-    /proc/sys/kernel/osrelease r,
-    /proc r,
-
-    capability mac_admin,
-  }
-}`
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/build.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/build.sh
deleted file mode 100755
index 8271d9dc47..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-set -x
-./generate.sh
-for d in */; do
-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/generate.sh
deleted file mode 100755
index b5040b709a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/generate.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-set -e
-
-# This file is used to auto-generate Dockerfiles for making debs via 'make deb'
-#
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh ubuntu-trusty
-#        to only update ubuntu-trusty/Dockerfile
-#    or: ./generate.sh ubuntu-newversion
-#        to create a new folder and a Dockerfile within it
-#
-# Note: non-LTS versions are not guaranteed to work.
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	echo "${versions[@]}"
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="aarch64/${distro}:${suite}"
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/aarch64/generate.sh"!
-		#
-
-		FROM $from
-
-	EOF
-
-	dockerBuildTags='apparmor pkcs11 selinux'
-	runcBuildTags='apparmor selinux'
-
-	# this list is sorted alphabetically; please keep it that way
-	packages=(
-		apparmor # for apparmor_parser for testing the profile
-		bash-completion # for bash-completion debhelper integration
-		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)
-		build-essential # "essential for building Debian packages"
-		cmake # tini dep
-		curl ca-certificates # for downloading Go
-		debhelper # for easy ".deb" building
-		dh-apparmor # for apparmor debhelper
-		dh-systemd # for systemd debhelper integration
-		git # for "git commit" info in "docker -v"
-		libapparmor-dev # for "sys/apparmor.h"
-		libdevmapper-dev # for "libdevmapper.h"
-		libltdl-dev # for pkcs11 "ltdl.h"
-		libsqlite3-dev # for "sqlite3.h"
-		pkg-config # for detecting things like libsystemd-journal dynamically
-		vim-common # tini dep
-	)
-
-	case "$suite" in
-		trusty)
-			packages+=( libsystemd-journal-dev )
-			# aarch64 doesn't have an official downloadable binary for go.
-			# And gccgo for trusty only includes Go 1.2 implementation which
-			# is too old to build current go source, fortunately trusty has
-			# golang-1.6-go package can be used as bootstrap.
-			packages+=( golang-1.6-go )
-			;;
-		xenial)
-			packages+=( libsystemd-dev )
-			packages+=( golang-go libseccomp-dev)
-
-			dockerBuildTags="$dockerBuildTags seccomp"
-			runcBuildTags="$runcBuildTags seccomp"
-			;;
-		*)
-			echo "Unsupported distro:" $distro:$suite
-			rm -fr "$version"
-			exit 1
-			;;
-	esac
-
-	# update and install packages
-	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	case "$suite" in
-		trusty)
-			echo 'RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100' >> "$version/Dockerfile"
-			echo >> "$version/Dockerfile"
-			;;
-		*)
-			;;
-	esac
-
-	echo "# Install Go" >> "$version/Dockerfile"
-	echo "# aarch64 doesn't have official go binaries, so use the version of go installed from" >> "$version/Dockerfile"
-	echo "# the image to build go from source." >> "$version/Dockerfile"
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile.aarch64 >> "$version/Dockerfile"
-	echo 'RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \' >> "$version/Dockerfile"
-	echo '	&& cd /usr/src/go/src \' >> "$version/Dockerfile"
-	echo '	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash' >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV PATH $PATH:/usr/src/go/bin' >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	echo "ENV AUTO_GOPATH 1" >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	echo "ENV DOCKER_BUILDTAGS $dockerBuildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile
deleted file mode 100644
index d04860ccd7..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-trusty/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/aarch64/generate.sh"!
-#
-
-FROM aarch64/ubuntu:trusty
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev golang-1.6-go --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-RUN update-alternatives --install /usr/bin/go go /usr/lib/go-1.6/bin/go 100
-
-# Install Go
-# aarch64 doesn't have official go binaries, so use the version of go installed from
-# the image to build go from source.
-ENV GO_VERSION 1.7.5
-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \
-	&& cd /usr/src/go/src \
-	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
-
-ENV PATH $PATH:/usr/src/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile
deleted file mode 100644
index 3cd8442eca..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/aarch64/ubuntu-xenial/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/aarch64/generate.sh"!
-#
-
-FROM aarch64/ubuntu:xenial
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-dev golang-go libseccomp-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-# Install Go
-# aarch64 doesn't have official go binaries, so use the version of go installed from
-# the image to build go from source.
-ENV GO_VERSION 1.7.5
-RUN mkdir /usr/src/go && curl -fsSL https://golang.org/dl/go${GO_VERSION}.src.tar.gz | tar -v -C /usr/src/go -xz --strip-components=1 \
-	&& cd /usr/src/go/src \
-	&& GOOS=linux GOARCH=arm64 GOROOT_BOOTSTRAP="$(go env GOROOT)" ./make.bash
-
-ENV PATH $PATH:/usr/src/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux seccomp
-ENV RUNC_BUILDTAGS apparmor selinux seccomp
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/README.md b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/README.md
deleted file mode 100644
index 20a0ff1006..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# `dockercore/builder-deb`
-
-This image's tags contain the dependencies for building Docker `.deb`s for each of the Debian-based platforms Docker targets.
-
-To add new tags, see [`contrib/builder/deb/amd64` in https://github.com/docker/docker](https://github.com/docker/docker/tree/master/contrib/builder/deb/amd64), specifically the `generate.sh` script, whose usage is described in a comment at the top of the file.
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/build.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/build.sh
deleted file mode 100755
index 8271d9dc47..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-set -x
-./generate.sh
-for d in */; do
-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-jessie/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-jessie/Dockerfile
deleted file mode 100644
index 42aaa56c01..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-jessie/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-stretch/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-stretch/Dockerfile
deleted file mode 100644
index c052be56ce..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-stretch/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM debian:stretch
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-wheezy/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-wheezy/Dockerfile
deleted file mode 100644
index bcedb47b94..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/debian-wheezy/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM debian:wheezy-backports
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list
-
-RUN apt-get update && apt-get install -y -t wheezy-backports btrfs-tools --no-install-recommends && rm -rf /var/lib/apt/lists/*
-RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/generate.sh
deleted file mode 100755
index 765db5d8e9..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/generate.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/bash
-set -e
-
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh debian-jessie
-#        to only update debian-jessie/Dockerfile
-#    or: ./generate.sh debian-newversion
-#        to create a new folder and a Dockerfile within it
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="${distro}:${suite}"
-
-	case "$from" in
-		debian:wheezy)
-			# add -backports, like our users have to
-			from+='-backports'
-			;;
-	esac
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-		#
-
-		FROM $from
-	EOF
-
-	echo >> "$version/Dockerfile"
-
-	if [ "$distro" = "debian" ]; then
-		cat >> "$version/Dockerfile" <<-'EOF'
-			# allow replacing httpredir or deb mirror
-			ARG APT_MIRROR=deb.debian.org
-			RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-		EOF
-
-		if [ "$suite" = "wheezy" ]; then
-			cat >> "$version/Dockerfile" <<-'EOF'
-				RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list
-			EOF
-		fi
-
-		echo "" >> "$version/Dockerfile"
-	fi
-
-	extraBuildTags='pkcs11'
-	runcBuildTags=
-
-	# this list is sorted alphabetically; please keep it that way
-	packages=(
-		apparmor # for apparmor_parser for testing the profile
-		bash-completion # for bash-completion debhelper integration
-		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)
-		build-essential # "essential for building Debian packages"
-		cmake # tini dep
-		curl ca-certificates # for downloading Go
-		debhelper # for easy ".deb" building
-		dh-apparmor # for apparmor debhelper
-		dh-systemd # for systemd debhelper integration
-		git # for "git commit" info in "docker -v"
-		libapparmor-dev # for "sys/apparmor.h"
-		libdevmapper-dev # for "libdevmapper.h"
-		libltdl-dev # for pkcs11 "ltdl.h"
-		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"
-		libsqlite3-dev # for "sqlite3.h"
-		pkg-config # for detecting things like libsystemd-journal dynamically
-		vim-common # tini dep
-	)
-	# packaging for "sd-journal.h" and libraries varies
-	case "$suite" in
-		precise|wheezy) ;;
-		jessie|trusty) packages+=( libsystemd-journal-dev );;
-		*) packages+=( libsystemd-dev );;
-	esac
-
-	# debian wheezy & ubuntu precise do not have the right libseccomp libs
-	# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :(
-	case "$suite" in
-		precise|wheezy|jessie|trusty)
-			packages=( "${packages[@]/libseccomp-dev}" )
-			runcBuildTags="apparmor selinux"
-			;;
-		*)
-			extraBuildTags+=' seccomp'
-			runcBuildTags="apparmor seccomp selinux"
-			;;
-	esac
-
-
-	if [ "$suite" = 'precise' ]; then
-		# precise has a few package issues
-
-		# - dh-systemd doesn't exist at all
-		packages=( "${packages[@]/dh-systemd}" )
-
-		# - libdevmapper-dev is missing critical structs (too old)
-		packages=( "${packages[@]/libdevmapper-dev}" )
-		extraBuildTags+=' exclude_graphdriver_devicemapper'
-
-		# - btrfs-tools is missing "ioctl.h" (too old), so it's useless
-		#   (since kernels on precise are old too, just skip btrfs entirely)
-		packages=( "${packages[@]/btrfs-tools}" )
-		extraBuildTags+=' exclude_graphdriver_btrfs'
-	fi
-
-	if [ "$suite" = 'wheezy' ]; then
-		# pull a couple packages from backports explicitly
-		# (build failures otherwise)
-		backportsPackages=( btrfs-tools )
-		for pkg in "${backportsPackages[@]}"; do
-			packages=( "${packages[@]/$pkg}" )
-		done
-		echo "RUN apt-get update && apt-get install -y -t $suite-backports ${backportsPackages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-	fi
-
-	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"
-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
-	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	# print build tags in alphabetical order
-	buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
-
-	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
deleted file mode 100644
index aa027f83b3..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-precise/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM ubuntu:precise
-
-RUN apt-get update && apt-get install -y apparmor bash-completion  build-essential cmake curl ca-certificates debhelper dh-apparmor  git libapparmor-dev  libltdl-dev  libsqlite3-dev pkg-config vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor exclude_graphdriver_btrfs exclude_graphdriver_devicemapper pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
deleted file mode 100644
index b03a853ed6..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-trusty/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM ubuntu:trusty
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
deleted file mode 100644
index af03f6226f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-xenial/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM ubuntu:xenial
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile
deleted file mode 100644
index 5ac1edf1a4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/amd64/ubuntu-yakkety/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/amd64/generate.sh"!
-#
-
-FROM ubuntu:yakkety
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/debian-jessie/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/debian-jessie/Dockerfile
deleted file mode 100644
index a4ac781eb9..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/debian-jessie/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-#
-
-FROM armhf/debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/generate.sh
deleted file mode 100755
index e110a219ab..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/generate.sh
+++ /dev/null
@@ -1,158 +0,0 @@
-#!/bin/bash
-set -e
-
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh debian-jessie
-#        to only update debian-jessie/Dockerfile
-#    or: ./generate.sh debian-newversion
-#        to create a new folder and a Dockerfile within it
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="${distro}:${suite}"
-
-	case "$from" in
-		raspbian:jessie)
-			from="resin/rpi-raspbian:jessie"
-			;;
-		*)
-			from="armhf/$from"
-			;;
-	esac
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-		#
-
-		FROM $from
-	EOF
-
-	echo >> "$version/Dockerfile"
-
-	if [[ "$distro" = "debian" || "$distro" = "raspbian" ]]; then
-		cat >> "$version/Dockerfile" <<-'EOF'
-			# allow replacing httpredir or deb mirror
-			ARG APT_MIRROR=deb.debian.org
-			RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-		EOF
-
-		if [ "$suite" = "wheezy" ]; then
-			cat >> "$version/Dockerfile" <<-'EOF'
-				RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list.d/backports.list
-			EOF
-		fi
-
-		echo "" >> "$version/Dockerfile"
-	fi
-
-	extraBuildTags='pkcs11'
-	runcBuildTags=
-
-	# this list is sorted alphabetically; please keep it that way
-	packages=(
-		apparmor # for apparmor_parser for testing the profile
-		bash-completion # for bash-completion debhelper integration
-		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)
-		build-essential # "essential for building Debian packages"
-		cmake # tini dep
-		curl ca-certificates # for downloading Go
-		debhelper # for easy ".deb" building
-		dh-apparmor # for apparmor debhelper
-		dh-systemd # for systemd debhelper integration
-		git # for "git commit" info in "docker -v"
-		libapparmor-dev # for "sys/apparmor.h"
-		libdevmapper-dev # for "libdevmapper.h"
-		libltdl-dev # for pkcs11 "ltdl.h"
-		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"
-		libsqlite3-dev # for "sqlite3.h"
-		pkg-config # for detecting things like libsystemd-journal dynamically
-		vim-common # tini dep
-	)
-	# packaging for "sd-journal.h" and libraries varies
-	case "$suite" in
-		precise|wheezy) ;;
-		jessie|trusty) packages+=( libsystemd-journal-dev );;
-		*) packages+=( libsystemd-dev );;
-	esac
-
-	# debian wheezy & ubuntu precise do not have the right libseccomp libs
-	# debian jessie & ubuntu trusty have a libseccomp < 2.2.1 :(
-	case "$suite" in
-		precise|wheezy|jessie|trusty)
-			packages=( "${packages[@]/libseccomp-dev}" )
-			runcBuildTags="apparmor selinux"
-			;;
-		*)
-			extraBuildTags+=' seccomp'
-			runcBuildTags="apparmor seccomp selinux"
-			;;
-	esac
-
-
-	if [ "$suite" = 'precise' ]; then
-		# precise has a few package issues
-
-		# - dh-systemd doesn't exist at all
-		packages=( "${packages[@]/dh-systemd}" )
-
-		# - libdevmapper-dev is missing critical structs (too old)
-		packages=( "${packages[@]/libdevmapper-dev}" )
-		extraBuildTags+=' exclude_graphdriver_devicemapper'
-
-		# - btrfs-tools is missing "ioctl.h" (too old), so it's useless
-		#   (since kernels on precise are old too, just skip btrfs entirely)
-		packages=( "${packages[@]/btrfs-tools}" )
-		extraBuildTags+=' exclude_graphdriver_btrfs'
-	fi
-
-	if [ "$suite" = 'wheezy' ]; then
-		# pull a couple packages from backports explicitly
-		# (build failures otherwise)
-		backportsPackages=( btrfs-tools )
-		for pkg in "${backportsPackages[@]}"; do
-			packages=( "${packages[@]/$pkg}" )
-		done
-		echo "RUN apt-get update && apt-get install -y -t $suite-backports ${backportsPackages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-	fi
-
-	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"
-	if [ "$distro" == 'raspbian' ];
-	then
-		cat <<EOF >> "$version/Dockerfile"
-# GOARM is the ARM architecture version which is unrelated to the above Golang version
-ENV GOARM 6
-EOF
-	fi
-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
-	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	# print build tags in alphabetical order
-	buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
-
-	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile
deleted file mode 100644
index 4dbfd093d8..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/raspbian-jessie/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-#
-
-FROM resin/rpi-raspbian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-# GOARM is the ARM architecture version which is unrelated to the above Golang version
-ENV GOARM 6
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile
deleted file mode 100644
index b36c1dac71..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-trusty/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-#
-
-FROM armhf/ubuntu:trusty
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev  libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile
deleted file mode 100644
index b5e55ad2dd..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-xenial/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-#
-
-FROM armhf/ubuntu:xenial
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile
deleted file mode 100644
index 69c2e7f2d4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/armhf/ubuntu-yakkety/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/armhf/generate.sh"!
-#
-
-FROM armhf/ubuntu:yakkety
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/build.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/build.sh
deleted file mode 100755
index 7d22e8c47f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e 
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-set -x
-./generate.sh
-for d in */; do
-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/generate.sh
deleted file mode 100755
index 0e20b9c4b5..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/generate.sh
+++ /dev/null
@@ -1,103 +0,0 @@
-#!/bin/bash
-set -e
-
-# This file is used to auto-generate Dockerfiles for making debs via 'make deb'
-#
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh ubuntu-xenial
-#        to only update ubuntu-xenial/Dockerfile
-#    or: ./generate.sh ubuntu-newversion
-#        to create a new folder and a Dockerfile within it
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	echo "${versions[@]}"
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="ppc64le/${distro}:${suite}"
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/ppc64le/generate.sh"!
-		#
-
-		FROM $from
-
-	EOF
-
-	extraBuildTags='pkcs11'
-	runcBuildTags=
-
-	# this list is sorted alphabetically; please keep it that way
-	packages=(
-		apparmor # for apparmor_parser for testing the profile
-		bash-completion # for bash-completion debhelper integration
-		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)
-		build-essential # "essential for building Debian packages"
-		cmake # tini dep
-		curl ca-certificates # for downloading Go
-		debhelper # for easy ".deb" building
-		dh-apparmor # for apparmor debhelper
-		dh-systemd # for systemd debhelper integration
-		git # for "git commit" info in "docker -v"
-		libapparmor-dev # for "sys/apparmor.h"
-		libdevmapper-dev # for "libdevmapper.h"
-		libltdl-dev # for pkcs11 "ltdl.h"
-		libsqlite3-dev # for "sqlite3.h"
-		pkg-config # for detecting things like libsystemd-journal dynamically
-		vim-common # tini dep
-	)
-
-	case "$suite" in
-		trusty) 
-			packages+=( libsystemd-journal-dev )
-			;;
-		*)
-			# libseccomp isn't available until ubuntu xenial and is required for "seccomp.h" & "libseccomp.so"
-			packages+=( libseccomp-dev )
-			packages+=( libsystemd-dev )
-			;;
-	esac
-
-	# buildtags
-	case "$suite" in
-		# trusty has no seccomp package
-		trusty)
-			runcBuildTags="apparmor selinux"
-		;;
-		# ppc64le support was backported into libseccomp 2.2.3-2,
-		# so enable seccomp by default
-		*)
-			extraBuildTags+=' seccomp'
-			runcBuildTags="apparmor seccomp selinux"
-			;;
-	esac
-	
-	# update and install packages
-	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile.ppc64le >> "$version/Dockerfile"
-	echo 'RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
-	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	# print build tags in alphabetical order
-	buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
-	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile
deleted file mode 100644
index 4182d683b0..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-trusty/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/ppc64le/generate.sh"!
-#
-
-FROM ppc64le/ubuntu:trusty
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libsystemd-journal-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile
deleted file mode 100644
index f1521db72f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-xenial/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/ppc64le/generate.sh"!
-#
-
-FROM ppc64le/ubuntu:xenial
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile
deleted file mode 100644
index 4f8cc66769..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/ppc64le/ubuntu-yakkety/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/ppc64le/generate.sh"!
-#
-
-FROM ppc64le/ubuntu:yakkety
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libsqlite3-dev pkg-config vim-common libseccomp-dev libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS apparmor seccomp selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/build.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/build.sh
deleted file mode 100755
index 8271d9dc47..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-set -x
-./generate.sh
-for d in */; do
-	docker build -t "dockercore/builder-deb:$(basename "$d")" "$d"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/generate.sh
deleted file mode 100755
index b8f5860844..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/generate.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-set -e
-
-# This file is used to auto-generate Dockerfiles for making debs via 'make deb'
-#
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh ubuntu-xenial
-#        to only update ubuntu-xenial/Dockerfile
-#    or: ./generate.sh ubuntu-newversion
-#        to create a new folder and a Dockerfile within it
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	echo "${versions[@]}"
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="s390x/${distro}:${suite}"
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/s390x/generate.sh"!
-		#
-
-		FROM $from
-
-	EOF
-
-	extraBuildTags='pkcs11'
-	runcBuildTags=
-
-	# this list is sorted alphabetically; please keep it that way
-	packages=(
-		apparmor # for apparmor_parser for testing the profile
-		bash-completion # for bash-completion debhelper integration
-		btrfs-tools # for "btrfs/ioctl.h" (and "version.h" if possible)
-		build-essential # "essential for building Debian packages"
-		cmake # tini dep
-		curl ca-certificates # for downloading Go
-		debhelper # for easy ".deb" building
-		dh-apparmor # for apparmor debhelper
-		dh-systemd # for systemd debhelper integration
-		git # for "git commit" info in "docker -v"
-		libapparmor-dev # for "sys/apparmor.h"
-		libdevmapper-dev # for "libdevmapper.h"
-		libltdl-dev # for pkcs11 "ltdl.h"
-		libseccomp-dev  # for "seccomp.h" & "libseccomp.so"
-		libsqlite3-dev # for "sqlite3.h"
-		pkg-config # for detecting things like libsystemd-journal dynamically
-		libsystemd-dev
-		vim-common # tini dep
-	)
-
-	case "$suite" in
-		# s390x needs libseccomp 2.3.1
-		xenial)
-			# Ubuntu Xenial has libseccomp 2.2.3
-			runcBuildTags="apparmor selinux"
-			;;
-		*)
-			extraBuildTags+=' seccomp'
-			runcBuildTags="apparmor selinux seccomp"
-			;;
-	esac
-
-	# update and install packages
-	echo "RUN apt-get update && apt-get install -y ${packages[*]} --no-install-recommends && rm -rf /var/lib/apt/lists/*" >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"
-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
-	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	# print build tags in alphabetical order
-	buildTags=$( echo "apparmor selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
-
-	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile
deleted file mode 100644
index 6d7e4c574b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/deb/s390x/ubuntu-xenial/Dockerfile
+++ /dev/null
@@ -1,16 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/deb/s390x/generate.sh"!
-#
-
-FROM s390x/ubuntu:xenial
-
-RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-tools build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev libsqlite3-dev pkg-config libsystemd-dev vim-common --no-install-recommends && rm -rf /var/lib/apt/lists/*
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS apparmor pkcs11 selinux
-ENV RUNC_BUILDTAGS apparmor selinux
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/README.md b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/README.md
deleted file mode 100644
index 5f2e888c7a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# `dockercore/builder-rpm`
-
-This image's tags contain the dependencies for building Docker `.rpm`s for each of the RPM-based platforms Docker targets.
-
-To add new tags, see [`contrib/builder/rpm/amd64` in https://github.com/docker/docker](https://github.com/docker/docker/tree/master/contrib/builder/rpm/amd64), specifically the `generate.sh` script, whose usage is described in a comment at the top of the file.
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/build.sh b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/build.sh
deleted file mode 100755
index 558f7ee0db..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/build.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -e
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-set -x
-./generate.sh
-for d in */; do
-	docker build -t "dockercore/builder-rpm:$(basename "$d")" "$d"
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/centos-7/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/centos-7/Dockerfile
deleted file mode 100644
index 1f841631ca..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/centos-7/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM centos:7
-
-RUN yum groupinstall -y "Development Tools"
-RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-24/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-24/Dockerfile
deleted file mode 100644
index af040c5c9f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-24/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM fedora:24
-
-RUN dnf -y upgrade
-RUN dnf install -y @development-tools fedora-packager
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-25/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-25/Dockerfile
deleted file mode 100644
index 98e57a9c4b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/fedora-25/Dockerfile
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM fedora:25
-
-RUN dnf -y upgrade
-RUN dnf install -y @development-tools fedora-packager
-RUN dnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/generate.sh b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/generate.sh
deleted file mode 100755
index 6f93afafa3..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/generate.sh
+++ /dev/null
@@ -1,189 +0,0 @@
-#!/bin/bash
-set -e
-
-# usage: ./generate.sh [versions]
-#    ie: ./generate.sh
-#        to update all Dockerfiles in this directory
-#    or: ./generate.sh centos-7
-#        to only update centos-7/Dockerfile
-#    or: ./generate.sh fedora-newversion
-#        to create a new folder and a Dockerfile within it
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-versions=( "$@" )
-if [ ${#versions[@]} -eq 0 ]; then
-	versions=( */ )
-fi
-versions=( "${versions[@]%/}" )
-
-for version in "${versions[@]}"; do
-	distro="${version%-*}"
-	suite="${version##*-}"
-	from="${distro}:${suite}"
-	installer=yum
-
-	if [[ "$distro" == "fedora" ]]; then
-		installer=dnf
-	fi
-	if [[ "$distro" == "photon" ]]; then
-		installer=tdnf
-	fi
-
-	mkdir -p "$version"
-	echo "$version -> FROM $from"
-	cat > "$version/Dockerfile" <<-EOF
-		#
-		# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-		#
-
-		FROM $from
-	EOF
-
-	echo >> "$version/Dockerfile"
-
-	extraBuildTags='pkcs11'
-	runcBuildTags=
-
-	case "$from" in
-		oraclelinux:6)
-			# We need a known version of the kernel-uek-devel headers to set CGO_CPPFLAGS, so grab the UEKR4 GA version
-			# This requires using yum-config-manager from yum-utils to enable the UEKR4 yum repo
-			echo "RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4"  >> "$version/Dockerfile"
-			echo "RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek"  >> "$version/Dockerfile"
-			echo >> "$version/Dockerfile"
-			;;
-		fedora:*)
-			echo "RUN ${installer} -y upgrade" >> "$version/Dockerfile"
-			;;
-		*) ;;
-	esac
-
-	case "$from" in
-		centos:*)
-			# get "Development Tools" packages dependencies
-			echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile"
-
-			if [[ "$version" == "centos-7" ]]; then
-				echo 'RUN yum -y swap -- remove systemd-container systemd-container-libs -- install systemd systemd-libs' >> "$version/Dockerfile"
-			fi
-			;;
-		oraclelinux:*)
-			# get "Development Tools" packages and dependencies
-			# we also need yum-utils for yum-config-manager to pull the latest repo file
-			echo 'RUN yum groupinstall -y "Development Tools"' >> "$version/Dockerfile"
-			;;
-		opensuse:*)
-			# get rpm-build and curl packages and dependencies
-			echo 'RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build' >> "$version/Dockerfile"
-			;;
-		photon:*)
-			echo "RUN ${installer} install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils" >> "$version/Dockerfile"
-			;;
-		*)
-			echo "RUN ${installer} install -y @development-tools fedora-packager" >> "$version/Dockerfile"
-			;;
-	esac
-
-	packages=(
-		btrfs-progs-devel # for "btrfs/ioctl.h" (and "version.h" if possible)
-		device-mapper-devel # for "libdevmapper.h"
-		glibc-static
-		libseccomp-devel # for "seccomp.h" & "libseccomp.so"
-		libselinux-devel # for "libselinux.so"
-		libtool-ltdl-devel # for pkcs11 "ltdl.h"
-		pkgconfig # for the pkg-config command
-		selinux-policy
-		selinux-policy-devel
-		sqlite-devel # for "sqlite3.h"
-		systemd-devel # for "sd-journal.h" and libraries
-		tar # older versions of dev-tools do not have tar
-		git # required for containerd and runc clone
-		cmake # tini build
-		vim-common # tini build
-	)
-
-	case "$from" in
-		oraclelinux:7)
-			# Enable the optional repository
-			packages=( --enablerepo=ol7_optional_latest "${packages[*]}" )
-			;;
-	esac
-
-	case "$from" in
-		oraclelinux:6)
-			# doesn't use systemd, doesn't have a devel package for it
-			packages=( "${packages[@]/systemd-devel}" )
-			;;
-	esac
-
-	# opensuse & oraclelinx:6 do not have the right libseccomp libs
-	case "$from" in
-		opensuse:*|oraclelinux:6)
-			packages=( "${packages[@]/libseccomp-devel}" )
-			runcBuildTags="selinux"
-			;;
-		*)
-			extraBuildTags+=' seccomp'
-			runcBuildTags="seccomp selinux"
-			;;
-	esac
-
-	case "$from" in
-		opensuse:*)
-			packages=( "${packages[@]/btrfs-progs-devel/libbtrfs-devel}" )
-			packages=( "${packages[@]/pkgconfig/pkg-config}" )
-			packages=( "${packages[@]/vim-common/vim}" )
-			if [[ "$from" == "opensuse:13."* ]]; then
-				packages+=( systemd-rpm-macros )
-			fi
-
-			# use zypper
-			echo "RUN zypper --non-interactive install ${packages[*]}" >> "$version/Dockerfile"
-			;;
-		photon:*)
-			packages=( "${packages[@]/pkgconfig/pkg-config}" )
-			echo "RUN ${installer} install -y ${packages[*]}" >> "$version/Dockerfile"
-			;;
-		*)
-			echo "RUN ${installer} install -y ${packages[*]}" >> "$version/Dockerfile"
-			;;
-	esac
-
-	echo >> "$version/Dockerfile"
-
-
-	awk '$1 == "ENV" && $2 == "GO_VERSION" { print; exit }' ../../../../Dockerfile >> "$version/Dockerfile"
-	echo 'RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local' >> "$version/Dockerfile"
-	echo 'ENV PATH $PATH:/usr/local/go/bin' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	echo 'ENV AUTO_GOPATH 1' >> "$version/Dockerfile"
-
-	echo >> "$version/Dockerfile"
-
-	# print build tags in alphabetical order
-	buildTags=$( echo "selinux $extraBuildTags" | xargs -n1 | sort -n | tr '\n' ' ' | sed -e 's/[[:space:]]*$//' )
-
-	echo "ENV DOCKER_BUILDTAGS $buildTags" >> "$version/Dockerfile"
-	echo "ENV RUNC_BUILDTAGS $runcBuildTags" >> "$version/Dockerfile"
-	echo >> "$version/Dockerfile"
-
-	case "$from" in
-                oraclelinux:6)
-                        # We need to set the CGO_CPPFLAGS environment to use the updated UEKR4 headers with all the userns stuff.
-                        # The ordering is very important and should not be changed.
-                        echo 'ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \'  >> "$version/Dockerfile"
-                        echo '                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/arch/x86/include/generated/uapi \'  >> "$version/Dockerfile"
-                        echo '                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/arch/x86/include/uapi \'  >> "$version/Dockerfile"
-                        echo '                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include/generated/uapi \'  >> "$version/Dockerfile"
-                        echo '                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include/uapi \'  >> "$version/Dockerfile"
-                        echo '                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include'  >> "$version/Dockerfile"
-                        echo >> "$version/Dockerfile"
-                        ;;
-                *) ;;
-        esac
-
-
-done
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
deleted file mode 100644
index addd431508..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/opensuse-13.2/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM opensuse:13.2
-
-RUN zypper --non-interactive install ca-certificates* curl gzip rpm-build
-RUN zypper --non-interactive install libbtrfs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim systemd-rpm-macros
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 selinux
-ENV RUNC_BUILDTAGS selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
deleted file mode 100644
index c34d3046dd..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-6/Dockerfile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM oraclelinux:6
-
-RUN yum install -y yum-utils && curl -o /etc/yum.repos.d/public-yum-ol6.repo http://yum.oracle.com/public-yum-ol6.repo && yum-config-manager -q --enable ol6_UEKR4
-RUN yum install -y kernel-uek-devel-4.1.12-32.el6uek
-
-RUN yum groupinstall -y "Development Tools"
-RUN yum install -y btrfs-progs-devel device-mapper-devel glibc-static  libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel  tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 selinux
-ENV RUNC_BUILDTAGS selinux
-
-ENV CGO_CPPFLAGS -D__EXPORTED_HEADERS__ \
-                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/arch/x86/include/generated/uapi \
-                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/arch/x86/include/uapi \
-                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include/generated/uapi \
-                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include/uapi \
-                 -I/usr/src/kernels/4.1.12-32.el6uek.x86_64/include
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
deleted file mode 100644
index 378536b647..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/oraclelinux-7/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM oraclelinux:7
-
-RUN yum groupinstall -y "Development Tools"
-RUN yum install -y --enablerepo=ol7_optional_latest btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkgconfig selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/photon-1.0/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/photon-1.0/Dockerfile
deleted file mode 100644
index b77d573d9f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/builder/rpm/amd64/photon-1.0/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# THIS FILE IS AUTOGENERATED; SEE "contrib/builder/rpm/amd64/generate.sh"!
-#
-
-FROM photon:1.0
-
-RUN tdnf install -y wget curl ca-certificates gzip make rpm-build sed gcc linux-api-headers glibc-devel binutils libseccomp libltdl-devel elfutils
-RUN tdnf install -y btrfs-progs-devel device-mapper-devel glibc-static libseccomp-devel libselinux-devel libtool-ltdl-devel pkg-config selinux-policy selinux-policy-devel sqlite-devel systemd-devel tar git cmake vim-common
-
-ENV GO_VERSION 1.7.5
-RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local
-ENV PATH $PATH:/usr/local/go/bin
-
-ENV AUTO_GOPATH 1
-
-ENV DOCKER_BUILDTAGS pkcs11 seccomp selinux
-ENV RUNC_BUILDTAGS seccomp selinux
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/check-config.sh b/installer/vendor/github.com/docker/docker/contrib/check-config.sh
deleted file mode 100755
index d07e4ce368..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/check-config.sh
+++ /dev/null
@@ -1,354 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-EXITCODE=0
-
-# bits of this were adapted from lxc-checkconfig
-# see also https://github.com/lxc/lxc/blob/lxc-1.0.2/src/lxc/lxc-checkconfig.in
-
-possibleConfigs=(
-	'/proc/config.gz'
-	"/boot/config-$(uname -r)"
-	"/usr/src/linux-$(uname -r)/.config"
-	'/usr/src/linux/.config'
-)
-
-if [ $# -gt 0 ]; then
-	CONFIG="$1"
-else
-	: ${CONFIG:="${possibleConfigs[0]}"}
-fi
-
-if ! command -v zgrep &> /dev/null; then
-	zgrep() {
-		zcat "$2" | grep "$1"
-	}
-fi
-
-kernelVersion="$(uname -r)"
-kernelMajor="${kernelVersion%%.*}"
-kernelMinor="${kernelVersion#$kernelMajor.}"
-kernelMinor="${kernelMinor%%.*}"
-
-is_set() {
-	zgrep "CONFIG_$1=[y|m]" "$CONFIG" > /dev/null
-}
-is_set_in_kernel() {
-	zgrep "CONFIG_$1=y" "$CONFIG" > /dev/null
-}
-is_set_as_module() {
-	zgrep "CONFIG_$1=m" "$CONFIG" > /dev/null
-}
-
-color() {
-	local codes=()
-	if [ "$1" = 'bold' ]; then
-		codes=( "${codes[@]}" '1' )
-		shift
-	fi
-	if [ "$#" -gt 0 ]; then
-		local code=
-		case "$1" in
-			# see https://en.wikipedia.org/wiki/ANSI_escape_code#Colors
-			black) code=30 ;;
-			red) code=31 ;;
-			green) code=32 ;;
-			yellow) code=33 ;;
-			blue) code=34 ;;
-			magenta) code=35 ;;
-			cyan) code=36 ;;
-			white) code=37 ;;
-		esac
-		if [ "$code" ]; then
-			codes=( "${codes[@]}" "$code" )
-		fi
-	fi
-	local IFS=';'
-	echo -en '\033['"${codes[*]}"'m'
-}
-wrap_color() {
-	text="$1"
-	shift
-	color "$@"
-	echo -n "$text"
-	color reset
-	echo
-}
-
-wrap_good() {
-	echo "$(wrap_color "$1" white): $(wrap_color "$2" green)"
-}
-wrap_bad() {
-	echo "$(wrap_color "$1" bold): $(wrap_color "$2" bold red)"
-}
-wrap_warning() {
-	wrap_color >&2 "$*" red
-}
-
-check_flag() {
-	if is_set_in_kernel "$1"; then
-		wrap_good "CONFIG_$1" 'enabled'
-	elif is_set_as_module "$1"; then
-		wrap_good "CONFIG_$1" 'enabled (as module)'
-	else
-		wrap_bad "CONFIG_$1" 'missing'
-		EXITCODE=1
-	fi
-}
-
-check_flags() {
-	for flag in "$@"; do
-		echo -n "- "; check_flag "$flag"
-	done
-}
-
-check_command() {
-	if command -v "$1" >/dev/null 2>&1; then
-		wrap_good "$1 command" 'available'
-	else
-		wrap_bad "$1 command" 'missing'
-		EXITCODE=1
-	fi
-}
-
-check_device() {
-	if [ -c "$1" ]; then
-		wrap_good "$1" 'present'
-	else
-		wrap_bad "$1" 'missing'
-		EXITCODE=1
-	fi
-}
-
-check_distro_userns() {
-	source /etc/os-release 2>/dev/null || /bin/true
-	if [[ "${ID}" =~ ^(centos|rhel)$ && "${VERSION_ID}" =~ ^7 ]]; then
-		# this is a CentOS7 or RHEL7 system
-		grep -q "user_namespace.enable=1" /proc/cmdline || {
-			# no user namespace support enabled
-			wrap_bad "  (RHEL7/CentOS7" "User namespaces disabled; add 'user_namespace.enable=1' to boot command line)"
-			EXITCODE=1
-		}
-	fi
-}
-
-if [ ! -e "$CONFIG" ]; then
-	wrap_warning "warning: $CONFIG does not exist, searching other paths for kernel config ..."
-	for tryConfig in "${possibleConfigs[@]}"; do
-		if [ -e "$tryConfig" ]; then
-			CONFIG="$tryConfig"
-			break
-		fi
-	done
-	if [ ! -e "$CONFIG" ]; then
-		wrap_warning "error: cannot find kernel config"
-		wrap_warning "  try running this script again, specifying the kernel config:"
-		wrap_warning "    CONFIG=/path/to/kernel/.config $0 or $0 /path/to/kernel/.config"
-		exit 1
-	fi
-fi
-
-wrap_color "info: reading kernel config from $CONFIG ..." white
-echo
-
-echo 'Generally Necessary:'
-
-echo -n '- '
-cgroupSubsystemDir="$(awk '/[, ](cpu|cpuacct|cpuset|devices|freezer|memory)[, ]/ && $3 == "cgroup" { print $2 }' /proc/mounts | head -n1)"
-cgroupDir="$(dirname "$cgroupSubsystemDir")"
-if [ -d "$cgroupDir/cpu" -o -d "$cgroupDir/cpuacct" -o -d "$cgroupDir/cpuset" -o -d "$cgroupDir/devices" -o -d "$cgroupDir/freezer" -o -d "$cgroupDir/memory" ]; then
-	echo "$(wrap_good 'cgroup hierarchy' 'properly mounted') [$cgroupDir]"
-else
-	if [ "$cgroupSubsystemDir" ]; then
-		echo "$(wrap_bad 'cgroup hierarchy' 'single mountpoint!') [$cgroupSubsystemDir]"
-	else
-		echo "$(wrap_bad 'cgroup hierarchy' 'nonexistent??')"
-	fi
-	EXITCODE=1
-	echo "    $(wrap_color '(see https://github.com/tianon/cgroupfs-mount)' yellow)"
-fi
-
-if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then
-	echo -n '- '
-	if command -v apparmor_parser &> /dev/null; then
-		echo "$(wrap_good 'apparmor' 'enabled and tools installed')"
-	else
-		echo "$(wrap_bad 'apparmor' 'enabled, but apparmor_parser missing')"
-		echo -n '    '
-		if command -v apt-get &> /dev/null; then
-			echo "$(wrap_color '(use "apt-get install apparmor" to fix this)')"
-		elif command -v yum &> /dev/null; then
-			echo "$(wrap_color '(your best bet is "yum install apparmor-parser")')"
-		else
-			echo "$(wrap_color '(look for an "apparmor" package for your distribution)')"
-		fi
-		EXITCODE=1
-	fi
-fi
-
-flags=(
-	NAMESPACES {NET,PID,IPC,UTS}_NS
-	CGROUPS CGROUP_CPUACCT CGROUP_DEVICE CGROUP_FREEZER CGROUP_SCHED CPUSETS MEMCG
-	KEYS
-	VETH BRIDGE BRIDGE_NETFILTER
-	NF_NAT_IPV4 IP_NF_FILTER IP_NF_TARGET_MASQUERADE
-	NETFILTER_XT_MATCH_{ADDRTYPE,CONNTRACK,IPVS}
-	IP_NF_NAT NF_NAT NF_NAT_NEEDED
-
-	# required for bind-mounting /dev/mqueue into containers
-	POSIX_MQUEUE
-)
-check_flags "${flags[@]}"
-if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -lt 8 ]; then
-        check_flags DEVPTS_MULTIPLE_INSTANCES
-fi
-
-echo
-
-echo 'Optional Features:'
-{
-	check_flags USER_NS
-	check_distro_userns
-}
-{
-	check_flags SECCOMP
-}
-{
-	check_flags CGROUP_PIDS
-}
-{
-	check_flags MEMCG_SWAP MEMCG_SWAP_ENABLED
-	if  is_set MEMCG_SWAP && ! is_set MEMCG_SWAP_ENABLED; then
-		echo "    $(wrap_color '(note that cgroup swap accounting is not enabled in your kernel config, you can enable it by setting boot option "swapaccount=1")' bold black)"
-	fi
-}
-{
-	if is_set LEGACY_VSYSCALL_NATIVE; then
-		echo -n "- "; wrap_bad "CONFIG_LEGACY_VSYSCALL_NATIVE" 'enabled'
-		echo "    $(wrap_color '(dangerous, provides an ASLR-bypassing target with usable ROP gadgets.)' bold black)"
-	elif is_set LEGACY_VSYSCALL_EMULATE; then
-		echo -n "- "; wrap_good "CONFIG_LEGACY_VSYSCALL_EMULATE" 'enabled'
-	elif is_set LEGACY_VSYSCALL_NONE; then
-		echo -n "- "; wrap_bad "CONFIG_LEGACY_VSYSCALL_NONE" 'enabled'
-		echo "    $(wrap_color '(containers using eglibc <= 2.13 will not work. Switch to' bold black)"
-		echo "    $(wrap_color ' "CONFIG_VSYSCALL_[NATIVE|EMULATE]" or use "vsyscall=[native|emulate]"' bold black)"
-		echo "    $(wrap_color ' on kernel command line. Note that this will disable ASLR for the,' bold black)"
-		echo "    $(wrap_color ' VDSO which may assist in exploiting security vulnerabilities.)' bold black)"
-	# else Older kernels (prior to 3dc33bd30f3e, released in v4.40-rc1) do
-	#      not have these LEGACY_VSYSCALL options and are effectively
-	#      LEGACY_VSYSCALL_EMULATE. Even older kernels are presumably
-	#      effectively LEGACY_VSYSCALL_NATIVE.
-	fi
-}
-
-if [ "$kernelMajor" -lt 4 ] || [ "$kernelMajor" -eq 4 -a "$kernelMinor" -le 5 ]; then
-	check_flags MEMCG_KMEM
-fi
-
-if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 18 ]; then
-	check_flags RESOURCE_COUNTERS
-fi
-
-if [ "$kernelMajor" -lt 3 ] || [ "$kernelMajor" -eq 3 -a "$kernelMinor" -le 13 ]; then
-	netprio=NETPRIO_CGROUP
-else
-	netprio=CGROUP_NET_PRIO
-fi
-
-flags=(
-	BLK_CGROUP BLK_DEV_THROTTLING IOSCHED_CFQ CFQ_GROUP_IOSCHED
-	CGROUP_PERF
-	CGROUP_HUGETLB
-	NET_CLS_CGROUP $netprio
-	CFS_BANDWIDTH FAIR_GROUP_SCHED RT_GROUP_SCHED
-	IP_VS
-	IP_VS_NFCT
- 	IP_VS_RR
-)
-check_flags "${flags[@]}"
-
-if ! is_set EXT4_USE_FOR_EXT2; then
-	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
-	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
-		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
-	fi
-fi
-
-check_flags EXT4_FS EXT4_FS_POSIX_ACL EXT4_FS_SECURITY
-if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
-	if is_set EXT4_USE_FOR_EXT2; then
-		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
-	else
-		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
-	fi
-fi
-
-echo '- Network Drivers:'
-echo '  - "'$(wrap_color 'overlay' blue)'":'
-check_flags VXLAN | sed 's/^/    /'
-echo '      Optional (for encrypted networks):'
-check_flags CRYPTO CRYPTO_AEAD CRYPTO_GCM CRYPTO_SEQIV CRYPTO_GHASH \
-            XFRM XFRM_USER XFRM_ALGO INET_ESP INET_XFRM_MODE_TRANSPORT | sed 's/^/      /'
-echo '  - "'$(wrap_color 'ipvlan' blue)'":'
-check_flags IPVLAN | sed 's/^/    /'
-echo '  - "'$(wrap_color 'macvlan' blue)'":'
-check_flags MACVLAN DUMMY | sed 's/^/    /'
-
-# only fail if no storage drivers available
-CODE=${EXITCODE}
-EXITCODE=0
-STORAGE=1
-
-echo '- Storage Drivers:'
-echo '  - "'$(wrap_color 'aufs' blue)'":'
-check_flags AUFS_FS | sed 's/^/    /'
-if ! is_set AUFS_FS && grep -q aufs /proc/filesystems; then
-	echo "      $(wrap_color '(note that some kernels include AUFS patches but not the AUFS_FS flag)' bold black)"
-fi
-[ "$EXITCODE" = 0 ] && STORAGE=0
-EXITCODE=0
-
-echo '  - "'$(wrap_color 'btrfs' blue)'":'
-check_flags BTRFS_FS | sed 's/^/    /'
-check_flags BTRFS_FS_POSIX_ACL | sed 's/^/    /'
-[ "$EXITCODE" = 0 ] && STORAGE=0
-EXITCODE=0
-
-echo '  - "'$(wrap_color 'devicemapper' blue)'":'
-check_flags BLK_DEV_DM DM_THIN_PROVISIONING | sed 's/^/    /'
-[ "$EXITCODE" = 0 ] && STORAGE=0
-EXITCODE=0
-
-echo '  - "'$(wrap_color 'overlay' blue)'":'
-check_flags OVERLAY_FS | sed 's/^/    /'
-[ "$EXITCODE" = 0 ] && STORAGE=0
-EXITCODE=0
-
-echo '  - "'$(wrap_color 'zfs' blue)'":'
-echo -n "    - "; check_device /dev/zfs
-echo -n "    - "; check_command zfs
-echo -n "    - "; check_command zpool
-[ "$EXITCODE" = 0 ] && STORAGE=0
-EXITCODE=0
-
-EXITCODE=$CODE
-[ "$STORAGE" = 1 ] && EXITCODE=1
-
-echo
-
-check_limit_over()
-{
-	if [ $(cat "$1") -le "$2" ]; then
-		wrap_bad "- $1" "$(cat $1)"
-		wrap_color "    This should be set to at least $2, for example set: sysctl -w kernel/keys/root_maxkeys=1000000" bold black
-		EXITCODE=1
-	else
-		wrap_good "- $1" "$(cat $1)"
-	fi
-}
-
-echo 'Limits:'
-check_limit_over /proc/sys/kernel/keys/root_maxkeys 10000
-echo
-
-exit $EXITCODE
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/completion/REVIEWERS
deleted file mode 100644
index 03ee2dde3d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/REVIEWERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/bash/docker b/installer/vendor/github.com/docker/docker/contrib/completion/bash/docker
deleted file mode 100644
index 7ea5d9a9f4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/bash/docker
+++ /dev/null
@@ -1,4282 +0,0 @@
-#!/bin/bash
-#
-# bash completion file for core docker commands
-#
-# This script provides completion of:
-#  - commands and their options
-#  - container ids and names
-#  - image repos and tags
-#  - filepaths
-#
-# To enable the completions either:
-#  - place this file in /etc/bash_completion.d
-#  or
-#  - copy this file to e.g. ~/.docker-completion.sh and add the line
-#    below to your .bashrc after bash completion features are loaded
-#    . ~/.docker-completion.sh
-#
-# Configuration:
-#
-# For several commands, the amount of completions can be configured by
-# setting environment variables.
-#
-# DOCKER_COMPLETION_SHOW_CONTAINER_IDS
-# DOCKER_COMPLETION_SHOW_NETWORK_IDS
-# DOCKER_COMPLETION_SHOW_NODE_IDS
-# DOCKER_COMPLETION_SHOW_PLUGIN_IDS
-# DOCKER_COMPLETION_SHOW_SECRET_IDS
-# DOCKER_COMPLETION_SHOW_SERVICE_IDS
-#   "no"  - Show names only (default)
-#   "yes" - Show names and ids
-#
-# You can tailor completion for the "events", "history", "inspect", "run",
-# "rmi" and "save" commands by settings the following environment
-# variables:
-#
-# DOCKER_COMPLETION_SHOW_IMAGE_IDS
-#   "none" - Show names only (default)
-#   "non-intermediate" - Show names and ids, but omit intermediate image IDs
-#   "all" - Show names and ids, including intermediate image IDs
-#
-# DOCKER_COMPLETION_SHOW_TAGS
-#   "yes" - include tags in completion options (default)
-#   "no"  - don't include tags in completion options
-
-#
-# Note:
-# Currently, the completions will not work if the docker daemon is not
-# bound to the default communication port/socket
-# If the docker daemon is using a unix socket for communication your user
-# must have access to the socket for the completions to function correctly
-#
-# Note for developers:
-# Please arrange options sorted alphabetically by long name with the short
-# options immediately following their corresponding long form.
-# This order should be applied to lists, alternatives and code blocks.
-
-__docker_previous_extglob_setting=$(shopt -p extglob)
-shopt -s extglob
-
-__docker_q() {
-	docker ${host:+-H "$host"} ${config:+--config "$config"} 2>/dev/null "$@"
-}
-
-# __docker_containers returns a list of containers. Additional options to
-# `docker ps` may be specified in order to filter the list, e.g.
-# `__docker_containers --filter status=running`
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_CONTAINER_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_containers() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Names}}'
-		shift
-	elif [ "${DOCKER_COMPLETION_SHOW_CONTAINER_IDS}" = yes ] ; then
-		format='{{.ID}} {{.Names}}'
-	else
-		format='{{.Names}}'
-	fi
-	__docker_q ps --format "$format" "$@"
-}
-
-# __docker_complete_containers applies completion of containers based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_containers`.
-__docker_complete_containers() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_containers "$@")" -- "$current") )
-}
-
-__docker_complete_containers_all() {
-	__docker_complete_containers "$@" --all
-}
-
-__docker_complete_containers_running() {
-	__docker_complete_containers "$@" --filter status=running
-}
-
-__docker_complete_containers_stopped() {
-	__docker_complete_containers "$@" --filter status=exited
-}
-
-__docker_complete_containers_unpauseable() {
-	__docker_complete_containers "$@" --filter status=paused
-}
-
-__docker_complete_container_names() {
-	local containers=( $(__docker_q ps -aq --no-trunc) )
-	local names=( $(__docker_q inspect --format '{{.Name}}' "${containers[@]}") )
-	names=( "${names[@]#/}" ) # trim off the leading "/" from the container names
-	COMPREPLY=( $(compgen -W "${names[*]}" -- "$cur") )
-}
-
-__docker_complete_container_ids() {
-	local containers=( $(__docker_q ps -aq) )
-	COMPREPLY=( $(compgen -W "${containers[*]}" -- "$cur") )
-}
-
-__docker_images() {
-	local images_args=""
-
-	case "$DOCKER_COMPLETION_SHOW_IMAGE_IDS" in
-		all)
-			images_args="--no-trunc -a"
-			;;
-		non-intermediate)
-			images_args="--no-trunc"
-			;;
-	esac
-
-	local repo_print_command
-	if [ "${DOCKER_COMPLETION_SHOW_TAGS:-yes}" = "yes" ]; then
-		repo_print_command='print $1; print $1":"$2'
-	else
-		repo_print_command='print $1'
-	fi
-
-	local awk_script
-	case "$DOCKER_COMPLETION_SHOW_IMAGE_IDS" in
-		all|non-intermediate)
-			awk_script='NR>1 { print $3; if ($1 != "<none>") { '"$repo_print_command"' } }'
-			;;
-		none|*)
-			awk_script='NR>1 && $1 != "<none>" { '"$repo_print_command"' }'
-			;;
-	esac
-
-	__docker_q images $images_args | awk "$awk_script" | grep -v '<none>$'
-}
-
-__docker_complete_images() {
-	COMPREPLY=( $(compgen -W "$(__docker_images)" -- "$cur") )
-	__ltrim_colon_completions "$cur"
-}
-
-__docker_complete_image_repos() {
-	local repos="$(__docker_q images | awk 'NR>1 && $1 != "<none>" { print $1 }')"
-	COMPREPLY=( $(compgen -W "$repos" -- "$cur") )
-}
-
-__docker_complete_image_repos_and_tags() {
-	local reposAndTags="$(__docker_q images | awk 'NR>1 && $1 != "<none>" { print $1; print $1":"$2 }')"
-	COMPREPLY=( $(compgen -W "$reposAndTags" -- "$cur") )
-	__ltrim_colon_completions "$cur"
-}
-
-# __docker_networks returns a list of all networks. Additional options to
-# `docker network ls` may be specified in order to filter the list, e.g.
-# `__docker_networks --filter type=custom`
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_NETWORK_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_networks() {
-	local format
-	if [ "$1" = "--id" ] ; then
-		format='{{.ID}}'
-		shift
-	elif [ "$1" = "--name" ] ; then
-		format='{{.Name}}'
-		shift
-	elif [ "${DOCKER_COMPLETION_SHOW_NETWORK_IDS}" = yes ] ; then
-		format='{{.ID}} {{.Name}}'
-	else
-		format='{{.Name}}'
-	fi
-	__docker_q network ls --format "$format" "$@"
-}
-
-# __docker_complete_networks applies completion of networks based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_networks`.
-__docker_complete_networks() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_networks "$@")" -- "$current") )
-}
-
-__docker_complete_containers_in_network() {
-	local containers=$(__docker_q network inspect -f '{{range $i, $c := .Containers}}{{$i}} {{$c.Name}} {{end}}' "$1")
-	COMPREPLY=( $(compgen -W "$containers" -- "$cur") )
-}
-
-# __docker_volumes returns a list of all volumes. Additional options to
-# `docker volume ls` may be specified in order to filter the list, e.g.
-# `__docker_volumes --filter dangling=true`
-# Because volumes do not have IDs, this function does not distinguish between
-# IDs and names.
-__docker_volumes() {
-	__docker_q volume ls -q "$@"
-}
-
-# __docker_complete_volumes applies completion of volumes based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_volumes`.
-__docker_complete_volumes() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_volumes "$@")" -- "$current") )
-}
-
-# __docker_plugins_bundled returns a list of all plugins of a given type.
-# The type has to be specified with the mandatory option `--type`.
-# Valid types are: Network, Volume, Authorization.
-# Completions may be added or removed with `--add` and `--remove`
-# This function only deals with plugins that come bundled with Docker.
-# For plugins managed by `docker plugin`, see `__docker_plugins_installed`.
-__docker_plugins_bundled() {
-	local type add=() remove=()
-	while true ; do
-		case "$1" in
-			--type)
-				type="$2"
-				shift 2
-				;;
-			--add)
-				add+=("$2")
-				shift 2
-				;;
-			--remove)
-				remove+=("$2")
-				shift 2
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	local plugins=($(__docker_q info | sed -n "/^Plugins/,/^[^ ]/s/ $type: //p"))
-	for del in "${remove[@]}" ; do
-		plugins=(${plugins[@]/$del/})
-	done
-	echo "${plugins[@]} ${add[@]}"
-}
-
-# __docker_complete_plugins_bundled applies completion of plugins based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# The plugin type has to be specified with the next option `--type`.
-# This function only deals with plugins that come bundled with Docker.
-# For completion of plugins managed by `docker plugin`, see
-# `__docker_complete_plugins_installed`.
-__docker_complete_plugins_bundled() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_plugins_bundled "$@")" -- "$current") )
-}
-
-# __docker_plugins_installed returns a list of all plugins that were installed with
-# the Docker plugin API.
-# By default, only names are returned.
-# Set DOCKER_COMPLETION_SHOW_PLUGIN_IDS=yes to also complete IDs.
-# For built-in pugins, see `__docker_plugins_bundled`.
-__docker_plugins_installed() {
-	local fields
-	if [ "$DOCKER_COMPLETION_SHOW_PLUGIN_IDS" = yes ] ; then
-		fields='$1,$2'
-	else
-		fields='$2'
-	fi
-	__docker_q plugin ls | awk "NR>1 {print $fields}"
-}
-
-# __docker_complete_plugins_installed applies completion of plugins that were installed
-# with the Docker plugin API, based on the current value of `$cur` or the value of
-# the optional first option `--cur`, if given.
-# For completion of built-in pugins, see `__docker_complete_plugins_bundled`.
-__docker_complete_plugins_installed() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_plugins_installed "$@")" -- "$current") )
-}
-
-__docker_runtimes() {
-	__docker_q info | sed -n 's/^Runtimes: \(.*\)/\1/p'
-}
-
-__docker_complete_runtimes() {
-	COMPREPLY=( $(compgen -W "$(__docker_runtimes)" -- "$cur") )
-}
-
-# __docker_secrets returns a list of all secrets.
-# By default, only names of secrets are returned.
-# Set DOCKER_COMPLETION_SHOW_SECRET_IDS=yes to also complete IDs of secrets.
-__docker_secrets() {
-	local fields='$2'  # default: name only
-	[ "${DOCKER_COMPLETION_SHOW_SECRET_IDS}" = yes ] && fields='$1,$2' # ID and name
-
-	__docker_q secret ls | awk "NR>1 {print $fields}"
-}
-
-# __docker_complete_secrets applies completion of secrets based on the current value
-# of `$cur`.
-__docker_complete_secrets() {
-	COMPREPLY=( $(compgen -W "$(__docker_secrets)" -- "$cur") )
-}
-
-# __docker_stacks returns a list of all stacks.
-__docker_stacks() {
-	__docker_q stack ls | awk 'NR>1 {print $1}'
-}
-
-# __docker_complete_stacks applies completion of stacks based on the current value
-# of `$cur` or the value of the optional first option `--cur`, if given.
-__docker_complete_stacks() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_stacks "$@")" -- "$current") )
-}
-
-# __docker_nodes returns a list of all nodes. Additional options to
-# `docker node ls` may be specified in order to filter the list, e.g.
-# `__docker_nodes --filter role=manager`
-# By default, only node names are returned.
-# Set DOCKER_COMPLETION_SHOW_NODE_IDS=yes to also complete node IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-# Completions may be added with `--add`, e.g. `--add self`.
-__docker_nodes() {
-	local add=()
-	local fields='$2'  # default: node name only
-	[ "${DOCKER_COMPLETION_SHOW_NODE_IDS}" = yes ] && fields='$1,$2' # ID and name
-
-	while true ; do
-		case "$1" in
-			--id)
-				fields='$1' # IDs only
-				shift
-				;;
-			--name)
-				fields='$2' # names only
-				shift
-				;;
-			--add)
-				add+=("$2")
-				shift 2
-				;;
-			*)
-				break
-				;;
-		esac
-	done
-
-	echo $(__docker_q node ls "$@" | tr -d '*' | awk "NR>1 {print $fields}") "${add[@]}"
-}
-
-# __docker_complete_nodes applies completion of nodes based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_nodes`.
-__docker_complete_nodes() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_nodes "$@")" -- "$current") )
-}
-
-__docker_complete_nodes_plus_self() {
-	__docker_complete_nodes --add self "$@"
-}
-
-# __docker_services returns a list of all services. Additional options to
-# `docker service ls` may be specified in order to filter the list, e.g.
-# `__docker_services --filter name=xxx`
-# By default, only node names are returned.
-# Set DOCKER_COMPLETION_SHOW_SERVICE_IDS=yes to also complete IDs.
-# An optional first option `--id|--name` may be used to limit the
-# output to the IDs or names of matching items. This setting takes
-# precedence over the environment setting.
-__docker_services() {
-	local fields='$2'  # default: service name only
-	[ "${DOCKER_COMPLETION_SHOW_SERVICE_IDS}" = yes ] && fields='$1,$2' # ID & name
-
-	if [ "$1" = "--id" ] ; then
-		fields='$1' # IDs only
-		shift
-	elif [ "$1" = "--name" ] ; then
-		fields='$2' # names only
-		shift
-	fi
-        __docker_q service ls "$@" | awk "NR>1 {print $fields}"
-}
-
-# __docker_complete_services applies completion of services based on the current
-# value of `$cur` or the value of the optional first option `--cur`, if given.
-# Additional filters may be appended, see `__docker_services`.
-__docker_complete_services() {
-	local current="$cur"
-	if [ "$1" = "--cur" ] ; then
-		current="$2"
-		shift 2
-	fi
-	COMPREPLY=( $(compgen -W "$(__docker_services "$@")" -- "$current") )
-}
-
-# __docker_append_to_completions appends the word passed as an argument to every
-# word in `$COMPREPLY`.
-# Normally you do this with `compgen -S` while generating the completions.
-# This function allows you to append a suffix later. It allows you to use
-# the __docker_complete_XXX functions in cases where you need a suffix.
-__docker_append_to_completions() {
-	COMPREPLY=( ${COMPREPLY[@]/%/"$1"} )
-}
-
-# __docker_is_experimental tests whether the currently configured Docker daemon
-# runs in experimental mode. If so, the function exits with 0 (true).
-# Otherwise, or if the result cannot be determined, the exit value is 1 (false).
-__docker_is_experimental() {
-	[ "$(__docker_q version -f '{{.Server.Experimental}}')" = "true" ]
-}
-
-# __docker_pos_first_nonflag finds the position of the first word that is neither
-# option nor an option's argument. If there are options that require arguments,
-# you should pass a glob describing those options, e.g. "--option1|-o|--option2"
-# Use this function to restrict completions to exact positions after the argument list.
-__docker_pos_first_nonflag() {
-	local argument_flags=$1
-
-	local counter=$((${subcommand_pos:-${command_pos}} + 1))
-	while [ $counter -le $cword ]; do
-		if [ -n "$argument_flags" ] && eval "case '${words[$counter]}' in $argument_flags) true ;; *) false ;; esac"; then
-			(( counter++ ))
-			# eat "=" in case of --option=arg syntax
-			[ "${words[$counter]}" = "=" ] && (( counter++ ))
-		else
-			case "${words[$counter]}" in
-				-*)
-					;;
-				*)
-					break
-					;;
-			esac
-		fi
-
-		# Bash splits words at "=", retaining "=" as a word, examples:
-		# "--debug=false" => 3 words, "--log-opt syslog-facility=daemon" => 4 words
-		while [ "${words[$counter + 1]}" = "=" ] ; do
-			counter=$(( counter + 2))
-		done
-
-		(( counter++ ))
-	done
-
-	echo $counter
-}
-
-# __docker_map_key_of_current_option returns `key` if we are currently completing the
-# value of a map option (`key=value`) which matches the extglob given as an argument.
-# This function is needed for key-specific completions.
-__docker_map_key_of_current_option() {
-	local glob="$1"
-
-	local key glob_pos
-	if [ "$cur" = "=" ] ; then        # key= case
-		key="$prev"
-		glob_pos=$((cword - 2))
-	elif [[ $cur == *=* ]] ; then     # key=value case (OSX)
-		key=${cur%=*}
-		glob_pos=$((cword - 1))
-	elif [ "$prev" = "=" ] ; then
-		key=${words[$cword - 2]}  # key=value case
-		glob_pos=$((cword - 3))
-	else
-		return
-	fi
-
-	[ "${words[$glob_pos]}" = "=" ] && ((glob_pos--))  # --option=key=value syntax
-
-	[[ ${words[$glob_pos]} == @($glob) ]] && echo "$key"
-}
-
-# __docker_value_of_option returns the value of the first option matching `option_glob`.
-# Valid values for `option_glob` are option names like `--log-level` and globs like
-# `--log-level|-l`
-# Only positions between the command and the current word are considered.
-__docker_value_of_option() {
-	local option_extglob=$(__docker_to_extglob "$1")
-
-	local counter=$((command_pos + 1))
-	while [ $counter -lt $cword ]; do
-		case ${words[$counter]} in
-			$option_extglob )
-				echo ${words[$counter + 1]}
-				break
-				;;
-		esac
-		(( counter++ ))
-	done
-}
-
-# __docker_to_alternatives transforms a multiline list of strings into a single line
-# string with the words separated by `|`.
-# This is used to prepare arguments to __docker_pos_first_nonflag().
-__docker_to_alternatives() {
-	local parts=( $1 )
-	local IFS='|'
-	echo "${parts[*]}"
-}
-
-# __docker_to_extglob transforms a multiline list of options into an extglob pattern
-# suitable for use in case statements.
-__docker_to_extglob() {
-	local extglob=$( __docker_to_alternatives "$1" )
-	echo "@($extglob)"
-}
-
-# __docker_subcommands processes subcommands
-# Locates the first occurrence of any of the subcommands contained in the
-# first argument. In case of a match, calls the corresponding completion
-# function and returns 0.
-# If no match is found, 1 is returned. The calling function can then
-# continue processing its completion.
-#
-# TODO if the preceding command has options that accept arguments and an
-# argument is equal ot one of the subcommands, this is falsely detected as
-# a match.
-__docker_subcommands() {
-	local subcommands="$1"
-
-	local counter=$(($command_pos + 1))
-	while [ $counter -lt $cword ]; do
-		case "${words[$counter]}" in
-			$(__docker_to_extglob "$subcommands") )
-				subcommand_pos=$counter
-				local subcommand=${words[$counter]}
-				local completions_func=_docker_${command}_${subcommand}
-				declare -F $completions_func >/dev/null && $completions_func
-				return 0
-				;;
-		esac
-		(( counter++ ))
-	done
-	return 1
-}
-
-# __docker_nospace suppresses trailing whitespace
-__docker_nospace() {
-	# compopt is not available in ancient bash versions
-	type compopt &>/dev/null && compopt -o nospace
-}
-
-__docker_complete_resolved_hostname() {
-	command -v host >/dev/null 2>&1 || return
-	COMPREPLY=( $(host 2>/dev/null "${cur%:}" | awk '/has address/ {print $4}') )
-}
-
-__docker_local_interfaces() {
-	command -v ip >/dev/null 2>&1 || return
-	ip addr show scope global 2>/dev/null | sed -n 's| \+inet \([0-9.]\+\).* \([^ ]\+\)|\1 \2|p'
-}
-
-__docker_complete_local_interfaces() {
-	local additional_interface
-	if [ "$1" = "--add" ] ; then
-		additional_interface="$2"
-	fi
-
-	COMPREPLY=( $( compgen -W "$(__docker_local_interfaces) $additional_interface" -- "$cur" ) )
-}
-
-__docker_complete_capabilities() {
-	# The list of capabilities is defined in types.go, ALL was added manually.
-	COMPREPLY=( $( compgen -W "
-		ALL
-		AUDIT_CONTROL
-		AUDIT_WRITE
-		AUDIT_READ
-		BLOCK_SUSPEND
-		CHOWN
-		DAC_OVERRIDE
-		DAC_READ_SEARCH
-		FOWNER
-		FSETID
-		IPC_LOCK
-		IPC_OWNER
-		KILL
-		LEASE
-		LINUX_IMMUTABLE
-		MAC_ADMIN
-		MAC_OVERRIDE
-		MKNOD
-		NET_ADMIN
-		NET_BIND_SERVICE
-		NET_BROADCAST
-		NET_RAW
-		SETFCAP
-		SETGID
-		SETPCAP
-		SETUID
-		SYS_ADMIN
-		SYS_BOOT
-		SYS_CHROOT
-		SYSLOG
-		SYS_MODULE
-		SYS_NICE
-		SYS_PACCT
-		SYS_PTRACE
-		SYS_RAWIO
-		SYS_RESOURCE
-		SYS_TIME
-		SYS_TTY_CONFIG
-		WAKE_ALARM
-	" -- "$cur" ) )
-}
-
-__docker_complete_detach-keys() {
-	case "$prev" in
-		--detach-keys)
-			case "$cur" in
-				*,)
-					COMPREPLY=( $( compgen -W "${cur}ctrl-" -- "$cur" ) )
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "ctrl-" -- "$cur" ) )
-					;;
-			esac
-
-			__docker_nospace
-			return
-			;;
-	esac
-	return 1
-}
-
-__docker_complete_isolation() {
-	COMPREPLY=( $( compgen -W "default hyperv process" -- "$cur" ) )
-}
-
-__docker_complete_log_drivers() {
-	COMPREPLY=( $( compgen -W "
-		awslogs
-		etwlogs
-		fluentd
-		gcplogs
-		gelf
-		journald
-		json-file
-		logentries
-		none
-		splunk
-		syslog
-	" -- "$cur" ) )
-}
-
-__docker_complete_log_options() {
-	# see docs/reference/logging/index.md
-	local awslogs_options="awslogs-region awslogs-group awslogs-stream"
-	local fluentd_options="env fluentd-address fluentd-async-connect fluentd-buffer-limit fluentd-retry-wait fluentd-max-retries labels tag"
-	local gcplogs_options="env gcp-log-cmd gcp-project labels"
-	local gelf_options="env gelf-address gelf-compression-level gelf-compression-type labels tag"
-	local journald_options="env labels tag"
-	local json_file_options="env labels max-file max-size"
-	local logentries_options="logentries-token"
-	local syslog_options="env labels syslog-address syslog-facility syslog-format syslog-tls-ca-cert syslog-tls-cert syslog-tls-key syslog-tls-skip-verify tag"
-	local splunk_options="env labels splunk-caname splunk-capath splunk-format splunk-gzip splunk-gzip-level splunk-index splunk-insecureskipverify splunk-source splunk-sourcetype splunk-token splunk-url splunk-verify-connection tag"
-
-	local all_options="$fluentd_options $gcplogs_options $gelf_options $journald_options $logentries_options $json_file_options $syslog_options $splunk_options"
-
-	case $(__docker_value_of_option --log-driver) in
-		'')
-			COMPREPLY=( $( compgen -W "$all_options" -S = -- "$cur" ) )
-			;;
-		awslogs)
-			COMPREPLY=( $( compgen -W "$awslogs_options" -S = -- "$cur" ) )
-			;;
-		fluentd)
-			COMPREPLY=( $( compgen -W "$fluentd_options" -S = -- "$cur" ) )
-			;;
-		gcplogs)
-			COMPREPLY=( $( compgen -W "$gcplogs_options" -S = -- "$cur" ) )
-			;;
-		gelf)
-			COMPREPLY=( $( compgen -W "$gelf_options" -S = -- "$cur" ) )
-			;;
-		journald)
-			COMPREPLY=( $( compgen -W "$journald_options" -S = -- "$cur" ) )
-			;;
-		json-file)
-			COMPREPLY=( $( compgen -W "$json_file_options" -S = -- "$cur" ) )
-			;;
-		logentries)
-			COMPREPLY=( $( compgen -W "$logentries_options" -S = -- "$cur" ) )
-			;;
-		syslog)
-			COMPREPLY=( $( compgen -W "$syslog_options" -S = -- "$cur" ) )
-			;;
-		splunk)
-			COMPREPLY=( $( compgen -W "$splunk_options" -S = -- "$cur" ) )
-			;;
-		*)
-			return
-			;;
-	esac
-
-	__docker_nospace
-}
-
-__docker_complete_log_driver_options() {
-	local key=$(__docker_map_key_of_current_option '--log-opt')
-	case "$key" in
-		fluentd-async-connect)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		gelf-address)
-			COMPREPLY=( $( compgen -W "udp" -S "://" -- "${cur##*=}" ) )
-			__docker_nospace
-			return
-			;;
-		gelf-compression-level)
-			COMPREPLY=( $( compgen -W "1 2 3 4 5 6 7 8 9" -- "${cur##*=}" ) )
-			return
-			;;
-		gelf-compression-type)
-			COMPREPLY=( $( compgen -W "gzip none zlib" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-address)
-			COMPREPLY=( $( compgen -W "tcp:// tcp+tls:// udp:// unix://" -- "${cur##*=}" ) )
-			__docker_nospace
-			__ltrim_colon_completions "${cur}"
-			return
-			;;
-		syslog-facility)
-			COMPREPLY=( $( compgen -W "
-				auth
-				authpriv
-				cron
-				daemon
-				ftp
-				kern
-				local0
-				local1
-				local2
-				local3
-				local4
-				local5
-				local6
-				local7
-				lpr
-				mail
-				news
-				syslog
-				user
-				uucp
-			" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-format)
-			COMPREPLY=( $( compgen -W "rfc3164 rfc5424 rfc5424micro" -- "${cur##*=}" ) )
-			return
-			;;
-		syslog-tls-ca-cert|syslog-tls-cert|syslog-tls-key)
-			_filedir
-			return
-			;;
-		syslog-tls-skip-verify)
-			COMPREPLY=( $( compgen -W "true" -- "${cur##*=}" ) )
-			return
-			;;
-		splunk-url)
-			COMPREPLY=( $( compgen -W "http:// https://" -- "${cur##*=}" ) )
-			__docker_nospace
-			__ltrim_colon_completions "${cur}"
-			return
-			;;
-		splunk-gzip|splunk-insecureskipverify|splunk-verify-connection)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		splunk-format)
-			COMPREPLY=( $( compgen -W "inline json raw" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-	return 1
-}
-
-__docker_complete_log_levels() {
-	COMPREPLY=( $( compgen -W "debug info warn error fatal" -- "$cur" ) )
-}
-
-__docker_complete_restart() {
-	case "$prev" in
-		--restart)
-			case "$cur" in
-				on-failure:*)
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "always no on-failure on-failure: unless-stopped" -- "$cur") )
-					;;
-			esac
-			return
-			;;
-	esac
-	return 1
-}
-
-# __docker_complete_signals returns a subset of the available signals that is most likely
-# relevant in the context of docker containers
-__docker_complete_signals() {
-	local signals=(
-		SIGCONT
-		SIGHUP
-		SIGINT
-		SIGKILL
-		SIGQUIT
-		SIGSTOP
-		SIGTERM
-		SIGUSR1
-		SIGUSR2
-	)
-	COMPREPLY=( $( compgen -W "${signals[*]} ${signals[*]#SIG}" -- "$( echo $cur | tr '[:lower:]' '[:upper:]')" ) )
-}
-
-__docker_complete_user_group() {
-	if [[ $cur == *:* ]] ; then
-		COMPREPLY=( $(compgen -g -- "${cur#*:}") )
-	else
-		COMPREPLY=( $(compgen -u -S : -- "$cur") )
-		__docker_nospace
-	fi
-}
-
-_docker_docker() {
-	# global options that may appear after the docker command
-	local boolean_options="
-		$global_boolean_options
-		--help
-		--version -v
-	"
-
-	case "$prev" in
-		--config)
-			_filedir -d
-			return
-			;;
-		--log-level|-l)
-			__docker_complete_log_levels
-			return
-			;;
-		$(__docker_to_extglob "$global_options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $global_options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag "$(__docker_to_extglob "$global_options_with_args")" )
-			if [ $cword -eq $counter ]; then
-				__docker_is_experimental && commands+=(${experimental_commands[*]})
-				COMPREPLY=( $( compgen -W "${commands[*]} help" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-_docker_attach() {
-	_docker_container_attach
-}
-
-_docker_build() {
-	_docker_image_build
-}
-
-
-_docker_checkpoint() {
-	local subcommands="
-		create
-		ls
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_checkpoint_create() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help --leave-running" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_checkpoint_ls() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_checkpoint_rm() {
-	case "$prev" in
-		--checkpoint-dir)
-			_filedir -d
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--checkpoint-dir --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--checkpoint-dir')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			elif [ $cword -eq $(($counter + 1)) ]; then
-				COMPREPLY=( $( compgen -W "$(__docker_q checkpoint ls "$prev" | sed 1d)" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-
-_docker_container() {
-	local subcommands="
-		attach
-		commit
-		cp
-		create
-		diff
-		exec
-		export
-		inspect
-		kill
-		logs
-		ls
-		pause
-		port
-		prune
-		rename
-		restart
-		rm
-		run
-		start
-		stats
-		stop
-		top
-		unpause
-		update
-		wait
-	"
-	local aliases="
-		list
-		ps
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_attach() {
-	__docker_complete_detach-keys && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach-keys --help --no-stdin --sig-proxy=false" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--detach-keys')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_container_commit() {
-	case "$prev" in
-		--author|-a|--change|-c|--message|-m)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--author -a --change -c --help --message -m --pause=false -p=false" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--author|-a|--change|-c|--message|-m')
-
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-				return
-			fi
-			(( counter++ ))
-
-			if [ $cword -eq $counter ]; then
-				__docker_complete_image_repos_and_tags
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_container_cp() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--follow-link -L --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				case "$cur" in
-					*:)
-						return
-						;;
-					*)
-						# combined container and filename completion
-						_filedir
-						local files=( ${COMPREPLY[@]} )
-
-						__docker_complete_containers_all
-						COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-						local containers=( ${COMPREPLY[@]} )
-
-						COMPREPLY=( $( compgen -W "${files[*]} ${containers[*]}" -- "$cur" ) )
-						if [[ "$COMPREPLY" == *: ]]; then
-							__docker_nospace
-						fi
-						return
-						;;
-				esac
-			fi
-			(( counter++ ))
-
-			if [ $cword -eq $counter ]; then
-				if [ -e "$prev" ]; then
-					__docker_complete_containers_all
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-				else
-					_filedir
-				fi
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_container_create() {
-	_docker_container_run
-}
-
-_docker_container_diff() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_exec() {
-	__docker_complete_detach-keys && return
-
-	case "$prev" in
-		--env|-e)
-			# we do not append a "=" here because "-e VARNAME" is legal systax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--detach -d --detach-keys --env -e --help --interactive -i --privileged -t --tty -u --user" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_export() {
-	case "$prev" in
-		--output|-o)
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_inspect() {
-	_docker_inspect --type container
-}
-
-_docker_container_kill() {
-	case "$prev" in
-		--signal|-s)
-			__docker_complete_signals
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --signal -s" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_logs() {
-	case "$prev" in
-		--since|--tail)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--details --follow -f --help --since --tail --timestamps -t" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--since|--tail')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_list() {
-	_docker_container_ls
-}
-
-_docker_container_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		ancestor)
-			cur="${cur##*=}"
-			__docker_complete_images
-			return
-			;;
-		before)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		id)
-			__docker_complete_containers_all --cur "${cur##*=}" --id
-			return
-			;;
-		health)
-			COMPREPLY=( $( compgen -W "healthy starting none unhealthy" -- "${cur##*=}" ) )
-			return
-			;;
-		is-task)
-			COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_containers_all --cur "${cur##*=}" --name
-			return
-			;;
-		network)
-			__docker_complete_networks --cur "${cur##*=}"
-			return
-			;;
-		since)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		status)
-			COMPREPLY=( $( compgen -W "created dead exited paused restarting running removing" -- "${cur##*=}" ) )
-			return
-			;;
-		volume)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "ancestor before exited health id is-task label name network since status volume" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format|--last|-n)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter -f --format --help --last -n --latest -l --no-trunc --quiet -q --size -s" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_pause() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_port() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_prune() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_container_ps() {
-	_docker_container_ls
-}
-
-_docker_container_rename() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_container_restart() {
-	case "$prev" in
-		--time|-t)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --time -t" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-_docker_container_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help --link -l --volumes -v" -- "$cur" ) )
-			;;
-		*)
-			for arg in "${COMP_WORDS[@]}"; do
-				case "$arg" in
-					--force|-f)
-						__docker_complete_containers_all
-						return
-						;;
-				esac
-			done
-			__docker_complete_containers_stopped
-			;;
-	esac
-}
-
-_docker_container_run() {
-	local options_with_args="
-		--add-host
-		--attach -a
-		--blkio-weight
-		--blkio-weight-device
-		--cap-add
-		--cap-drop
-		--cgroup-parent
-		--cidfile
-		--cpu-period
-		--cpu-quota
-		--cpu-rt-period
-		--cpu-rt-runtime
-		--cpuset-cpus
-		--cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--device
-		--device-read-bps
-		--device-read-iops
-		--device-write-bps
-		--device-write-iops
-		--dns
-		--dns-option
-		--dns-search
-		--entrypoint
-		--env -e
-		--env-file
-		--expose
-		--group-add
-		--hostname -h
-		--init-path
-		--ip
-		--ip6
-		--ipc
-		--isolation
-		--kernel-memory
-		--label-file
-		--label -l
-		--link
-		--link-local-ip
-		--log-driver
-		--log-opt
-		--mac-address
-		--memory -m
-		--memory-swap
-		--memory-swappiness
-		--memory-reservation
-		--name
-		--network
-		--network-alias
-		--oom-score-adj
-		--pid
-		--pids-limit
-		--publish -p
-		--restart
-		--runtime
-		--security-opt
-		--shm-size
-		--stop-signal
-		--stop-timeout
-		--storage-opt
-		--tmpfs
-		--sysctl
-		--ulimit
-		--user -u
-		--userns
-		--uts
-		--volume-driver
-		--volumes-from
-		--volume -v
-		--workdir -w
-	"
-
-	local boolean_options="
-		--disable-content-trust=false
-		--help
-		--init
-		--interactive -i
-		--oom-kill-disable
-		--privileged
-		--publish-all -P
-		--read-only
-		--tty -t
-	"
-
-	if [ "$command" = "run" -o "$subcommand" = "run" ] ; then
-		options_with_args="$options_with_args
-			--detach-keys
-			--health-cmd
-			--health-interval
-			--health-retries
-			--health-timeout
-		"
-		boolean_options="$boolean_options
-			--detach -d
-			--no-healthcheck
-			--rm
-			--sig-proxy=false
-		"
-		__docker_complete_detach-keys && return
-	fi
-
-	local all_options="$options_with_args $boolean_options"
-
-
-	__docker_complete_log_driver_options && return
-	__docker_complete_restart && return
-
-	local key=$(__docker_map_key_of_current_option '--security-opt')
-	case "$key" in
-		label)
-			[[ $cur == *: ]] && return
-			COMPREPLY=( $( compgen -W "user: role: type: level: disable" -- "${cur##*=}") )
-			if [ "${COMPREPLY[*]}" != "disable" ] ; then
-				__docker_nospace
-			fi
-			return
-			;;
-		seccomp)
-			local cur=${cur##*=}
-			_filedir
-			COMPREPLY+=( $( compgen -W "unconfined" -- "$cur" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--add-host)
-			case "$cur" in
-				*:)
-					__docker_complete_resolved_hostname
-					return
-					;;
-			esac
-			;;
-		--attach|-a)
-			COMPREPLY=( $( compgen -W 'stdin stdout stderr' -- "$cur" ) )
-			return
-			;;
-		--cap-add|--cap-drop)
-			__docker_complete_capabilities
-			return
-			;;
-		--cidfile|--env-file|--init-path|--label-file)
-			_filedir
-			return
-			;;
-		--device|--tmpfs|--volume|-v)
-			case "$cur" in
-				*:*)
-					# TODO somehow do _filedir for stuff inside the image, if it's already specified (which is also somewhat difficult to determine)
-					;;
-				'')
-					COMPREPLY=( $( compgen -W '/' -- "$cur" ) )
-					__docker_nospace
-					;;
-				/*)
-					_filedir
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		--env|-e)
-			# we do not append a "=" here because "-e VARNAME" is legal systax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--ipc)
-			case "$cur" in
-				*:*)
-					cur="${cur#*:}"
-					__docker_complete_containers_running
-					;;
-				*)
-					COMPREPLY=( $( compgen -W 'host container:' -- "$cur" ) )
-					if [ "$COMPREPLY" = "container:" ]; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--isolation)
-			__docker_complete_isolation
-			return
-			;;
-		--link)
-			case "$cur" in
-				*:*)
-					;;
-				*)
-					__docker_complete_containers_running
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--network)
-			case "$cur" in
-				container:*)
-					__docker_complete_containers_all --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "$(__docker_plugins_bundled --type Network) $(__docker_networks) container:" -- "$cur") )
-					if [ "${COMPREPLY[*]}" = "container:" ] ; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--pid)
-			case "$cur" in
-				*:*)
-					__docker_complete_containers_running --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W 'host container:' -- "$cur" ) )
-					if [ "$COMPREPLY" = "container:" ]; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--runtime)
-			__docker_complete_runtimes
-			return
-			;;
-		--security-opt)
-			COMPREPLY=( $( compgen -W "apparmor= label= no-new-privileges seccomp=" -- "$cur") )
-			if [ "${COMPREPLY[*]}" != "no-new-privileges" ] ; then
-				__docker_nospace
-			fi
-			return
-			;;
-		--storage-opt)
-			COMPREPLY=( $( compgen -W "size" -S = -- "$cur") )
-			__docker_nospace
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-		--userns)
-			COMPREPLY=( $( compgen -W "host" -- "$cur" ) )
-			return
-			;;
-		--volume-driver)
-			__docker_complete_plugins_bundled --type Volume
-			return
-			;;
-		--volumes-from)
-			__docker_complete_containers_all
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag $( __docker_to_alternatives "$options_with_args" ) )
-			if [ $cword -eq $counter ]; then
-				__docker_complete_images
-			fi
-			;;
-	esac
-}
-
-_docker_container_start() {
-	__docker_complete_detach-keys && return
-
-	case "$prev" in
-		--checkpoint)
-			if [ __docker_is_experimental ] ; then
-				return
-			fi
-			;;
-		--checkpoint-dir)
-			if [ __docker_is_experimental ] ; then
-				_filedir -d
-				return
-			fi
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--attach -a --detach-keys --help --interactive -i"
-			__docker_is_experimental && options+=" --checkpoint --checkpoint-dir"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_stopped
-			;;
-	esac
-}
-
-_docker_container_stats() {
-	case "$prev" in
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --format --help --no-stream" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_stop() {
-	case "$prev" in
-		--time|-t)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --time -t" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_running
-			;;
-	esac
-}
-
-_docker_container_top() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_running
-			fi
-			;;
-	esac
-}
-
-_docker_container_unpause() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_containers_unpauseable
-			fi
-			;;
-	esac
-}
-
-_docker_container_update() {
-	local options_with_args="
-		--blkio-weight
-		--cpu-period
-		--cpu-quota
-		--cpu-rt-period
-		--cpu-rt-runtime
-		--cpuset-cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--kernel-memory
-		--memory -m
-		--memory-reservation
-		--memory-swap
-		--restart
-	"
-
-	local boolean_options="
-		--help
-	"
-
-	local all_options="$options_with_args $boolean_options"
-
-	__docker_complete_restart && return
-
-	case "$prev" in
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-_docker_container_wait() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_containers_all
-			;;
-	esac
-}
-
-
-_docker_commit() {
-	_docker_container_commit
-}
-
-_docker_cp() {
-	_docker_container_cp
-}
-
-_docker_create() {
-	_docker_container_run
-}
-
-_docker_daemon() {
-	local boolean_options="
-		$global_boolean_options
-		--disable-legacy-registry
-		--experimental
-		--help
-		--icc=false
-		--init
-		--ip-forward=false
-		--ip-masq=false
-		--iptables=false
-		--ipv6
-		--live-restore
-		--raw-logs
-		--selinux-enabled
-		--userland-proxy=false
-	"
-	local options_with_args="
-		$global_options_with_args
-		--add-runtime
-		--api-cors-header
-		--authorization-plugin
-		--bip
-		--bridge -b
-		--cgroup-parent
-		--cluster-advertise
-		--cluster-store
-		--cluster-store-opt
-		--config-file
-		--containerd
-		--default-gateway
-		--default-gateway-v6
-		--default-ulimit
-		--dns
-		--dns-search
-		--dns-opt
-		--exec-opt
-		--exec-root
-		--fixed-cidr
-		--fixed-cidr-v6
-		--graph -g
-		--group -G
-		--init-path
-		--insecure-registry
-		--ip
-		--label
-		--log-driver
-		--log-opt
-		--max-concurrent-downloads
-		--max-concurrent-uploads
-		--mtu
-		--oom-score-adjust
-		--pidfile -p
-		--registry-mirror
-		--seccomp-profile
-		--shutdown-timeout
-		--storage-driver -s
-		--storage-opt
-		--userland-proxy-path
-		--userns-remap
-	"
-
-	__docker_complete_log_driver_options && return
-
- 	key=$(__docker_map_key_of_current_option '--cluster-store-opt')
- 	case "$key" in
- 		kv.*file)
-			cur=${cur##*=}
- 			_filedir
- 			return
- 			;;
- 	esac
-
- 	local key=$(__docker_map_key_of_current_option '--storage-opt')
- 	case "$key" in
- 		dm.blkdiscard|dm.override_udev_sync_check|dm.use_deferred_removal|dm.use_deferred_deletion)
- 			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
- 			return
- 			;;
- 		dm.fs)
- 			COMPREPLY=( $( compgen -W "ext4 xfs" -- "${cur##*=}" ) )
- 			return
- 			;;
- 		dm.thinpooldev)
-			cur=${cur##*=}
- 			_filedir
- 			return
- 			;;
- 	esac
-
-	case "$prev" in
-		--authorization-plugin)
-			__docker_complete_plugins_bundled --type Authorization
-			return
-			;;
-		--cluster-store)
-			COMPREPLY=( $( compgen -W "consul etcd zk" -S "://" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--cluster-store-opt)
-			COMPREPLY=( $( compgen -W "discovery.heartbeat discovery.ttl kv.cacertfile kv.certfile kv.keyfile kv.path" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--config-file|--containerd|--init-path|--pidfile|-p|--tlscacert|--tlscert|--tlskey|--userland-proxy-path)
-			_filedir
-			return
-			;;
-		--exec-root|--graph|-g)
-			_filedir -d
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--storage-driver|-s)
-			COMPREPLY=( $( compgen -W "aufs btrfs devicemapper overlay  overlay2 vfs zfs" -- "$(echo $cur | tr '[:upper:]' '[:lower:]')" ) )
-			return
-			;;
-		--storage-opt)
-			local btrfs_options="btrfs.min_space"
-			local devicemapper_options="
-				dm.basesize
-				dm.blkdiscard
-				dm.blocksize
-				dm.fs
-				dm.loopdatasize
-				dm.loopmetadatasize
-				dm.min_free_space
-				dm.mkfsarg
-				dm.mountopt
-				dm.override_udev_sync_check
-				dm.thinpooldev
-				dm.use_deferred_deletion
-				dm.use_deferred_removal
-			"
-			local zfs_options="zfs.fsname"
-
-			case $(__docker_value_of_option '--storage-driver|-s') in
-				'')
-					COMPREPLY=( $( compgen -W "$btrfs_options $devicemapper_options $zfs_options" -S = -- "$cur" ) )
-					;;
-				btrfs)
-					COMPREPLY=( $( compgen -W "$btrfs_options" -S = -- "$cur" ) )
-					;;
-				devicemapper)
-					COMPREPLY=( $( compgen -W "$devicemapper_options" -S = -- "$cur" ) )
-					;;
-				zfs)
-					COMPREPLY=( $( compgen -W "$zfs_options" -S = -- "$cur" ) )
-					;;
-				*)
-					return
-					;;
-			esac
-			__docker_nospace
-			return
-			;;
-		--log-level|-l)
-			__docker_complete_log_levels
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--seccomp-profile)
-			_filedir json
-			return
-			;;
-		--userns-remap)
-			__docker_complete_user_group
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_deploy() {
-	__docker_is_experimental && _docker_stack_deploy
-}
-
-_docker_diff() {
-	_docker_container_diff
-}
-
-_docker_events() {
-	_docker_system_events
-}
-
-_docker_exec() {
-	_docker_container_exec
-}
-
-_docker_export() {
-	_docker_container_export
-}
-
-_docker_help() {
-	local counter=$(__docker_pos_first_nonflag)
-	if [ $cword -eq $counter ]; then
-		COMPREPLY=( $( compgen -W "${commands[*]}" -- "$cur" ) )
-	fi
-}
-
-_docker_history() {
-	_docker_image_history
-}
-
-
-_docker_image() {
-	local subcommands="
-		build
-		history
-		import
-		inspect
-		load
-		ls
-		prune
-		pull
-		push
-		rm
-		save
-		tag
-	"
-	local aliases="
-		images
-		list
-		remove
-		rmi
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_build() {
-	local options_with_args="
-		--build-arg
-		--cache-from
-		--cgroup-parent
-		--cpuset-cpus
-		--cpuset-mems
-		--cpu-shares -c
-		--cpu-period
-		--cpu-quota
-		--file -f
-		--isolation
-		--label
-		--memory -m
-		--memory-swap
-		--network
-		--shm-size
-		--tag -t
-		--ulimit
-	"
-
-	local boolean_options="
-		--compress
-		--disable-content-trust=false
-		--force-rm
-		--help
-		--no-cache
-		--pull
-		--quiet -q
-		--rm
-	"
-	__docker_is_experimental && boolean_options+="--squash"
-
-	local all_options="$options_with_args $boolean_options"
-
-	case "$prev" in
-		--build-arg)
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--cache-from)
-			__docker_complete_image_repos_and_tags
-			return
-			;;
-		--file|-f)
-			_filedir
-			return
-			;;
-		--isolation)
-			__docker_complete_isolation
-			return
-			;;
-		--network)
-			case "$cur" in
-				container:*)
-					__docker_complete_containers_all --cur "${cur#*:}"
-					;;
-				*)
-					COMPREPLY=( $( compgen -W "$(__docker_plugins --type Network) $(__docker_networks) container:" -- "$cur") )
-					if [ "${COMPREPLY[*]}" = "container:" ] ; then
-						__docker_nospace
-					fi
-					;;
-			esac
-			return
-			;;
-		--tag|-t)
-			__docker_complete_image_repos_and_tags
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$all_options" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag $( __docker_to_alternatives "$options_with_args" ) )
-			if [ $cword -eq $counter ]; then
-				_filedir -d
-			fi
-			;;
-	esac
-}
-
-_docker_image_history() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --human=false -H=false --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_images
-			fi
-			;;
-	esac
-}
-
-_docker_image_images() {
-	_docker_image_ls
-}
-
-_docker_image_import() {
-	case "$prev" in
-		--change|-c|--message|-m)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--change -c --help --message -m" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--change|-c|--message|-m')
-			if [ $cword -eq $counter ]; then
-				return
-			fi
-			(( counter++ ))
-
-			if [ $cword -eq $counter ]; then
-				__docker_complete_image_repos_and_tags
-				return
-			fi
-			;;
-	esac
-}
-
-_docker_image_inspect() {
-	_docker_inspect --type image
-}
-
-_docker_image_load() {
-	case "$prev" in
-		--input|-i)
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --input -i --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_list() {
-	_docker_image_ls
-}
-
-_docker_image_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		before|since|reference)
-			cur="${cur##*=}"
-			__docker_complete_images
-			return
-			;;
-		dangling)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		label)
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "before dangling label reference since" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-                --format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --digests --filter -f --format --help --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		=)
-			return
-			;;
-		*)
-			__docker_complete_image_repos
-			;;
-	esac
-}
-
-_docker_image_prune() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_image_pull() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all-tags -a --disable-content-trust=false --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				for arg in "${COMP_WORDS[@]}"; do
-					case "$arg" in
-						--all-tags|-a)
-							__docker_complete_image_repos
-							return
-							;;
-					esac
-				done
-				__docker_complete_image_repos_and_tags
-			fi
-			;;
-	esac
-}
-
-_docker_image_push() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--disable-content-trust=false --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_image_repos_and_tags
-			fi
-			;;
-	esac
-}
-
-_docker_image_remove() {
-	_docker_image_rm
-}
-
-_docker_image_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help --no-prune" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_images
-			;;
-	esac
-}
-
-_docker_image_rmi() {
-	_docker_image_rm
-}
-
-_docker_image_save() {
-	case "$prev" in
-		--output|-o)
-			_filedir
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --output -o" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_images
-			;;
-	esac
-}
-
-_docker_image_tag() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-
-			if [ $cword -eq $counter ]; then
-				__docker_complete_image_repos_and_tags
-				return
-			fi
-			(( counter++ ))
-
-			if [ $cword -eq $counter ]; then
-				__docker_complete_image_repos_and_tags
-				return
-			fi
-			;;
-	esac
-}
-
-
-_docker_images() {
-	_docker_image_ls
-}
-
-_docker_import() {
-	_docker_image_import
-}
-
-_docker_info() {
-	_docker_system_info
-}
-
-_docker_inspect() {
-	local preselected_type
-	local type
-
-	if [ "$1" = "--type" ] ; then
-		preselected_type=yes
-		type="$2"
-	else
-		type=$(__docker_value_of_option --type)
-	fi
-
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-		--type)
-			if [ -z "$preselected_type" ] ; then
-				COMPREPLY=( $( compgen -W "container image network node plugin service volume" -- "$cur" ) )
-				return
-			fi
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--format -f --help --size -s"
-			if [ -z "$preselected_type" ] ; then
-				options+=" --type"
-			fi
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-		*)
-			case "$type" in
-				'')
-					COMPREPLY=( $( compgen -W "
-						$(__docker_containers --all)
-						$(__docker_images)
-						$(__docker_networks)
-						$(__docker_nodes)
-						$(__docker_plugins_installed)
-						$(__docker_services)
-						$(__docker_volumes)
-					" -- "$cur" ) )
-					;;
-				container)
-					__docker_complete_containers_all
-					;;
-				image)
-					__docker_complete_images
-					;;
-				network)
-					__docker_complete_networks
-					;;
-				node)
-					__docker_complete_nodes
-					;;
-				plugin)
-					__docker_complete_plugins_installed
-					;;
-				service)
-					__docker_complete_services
-					;;
-				volume)
-					__docker_complete_volumes
-					;;
-			esac
-	esac
-}
-
-_docker_kill() {
-	_docker_container_kill
-}
-
-_docker_load() {
-	_docker_image_load
-}
-
-_docker_login() {
-	case "$prev" in
-		--password|-p|--username|-u)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --password -p --username -u" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_logout() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_logs() {
-	_docker_container_logs
-}
-
-_docker_network_connect() {
-	local options_with_args="
-		--alias
-		--ip
-		--ip6
-		--link
-		--link-local-ip
-	"
-
-	local boolean_options="
-		--help
-	"
-
-	case "$prev" in
-		--link)
-			case "$cur" in
-				*:*)
-					;;
-				*)
-					__docker_complete_containers_running
-					COMPREPLY=( $( compgen -W "${COMPREPLY[*]}" -S ':' ) )
-					__docker_nospace
-					;;
-			esac
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag $( __docker_to_alternatives "$options_with_args" ) )
-			if [ $cword -eq $counter ]; then
-				__docker_complete_networks
-			elif [ $cword -eq $(($counter + 1)) ]; then
-				__docker_complete_containers_all
-			fi
-			;;
-	esac
-}
-
-_docker_network_create() {
-	case "$prev" in
-		--aux-address|--gateway|--internal|--ip-range|--ipam-opt|--ipv6|--opt|-o|--subnet)
-			return
-			;;
-		--ipam-driver)
-			COMPREPLY=( $( compgen -W "default" -- "$cur" ) )
-			return
-			;;
-		--driver|-d)
-			# remove drivers that allow one instance only, add drivers missing in `docker info`
-			__docker_complete_plugins_bundled --type Network --remove host --remove null --add macvlan
-			return
-			;;
-		--label)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--attachable --aux-address --driver -d --gateway --help --internal --ip-range --ipam-driver --ipam-opt --ipv6 --label --opt -o --subnet" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_disconnect() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_networks
-			elif [ $cword -eq $(($counter + 1)) ]; then
-				__docker_complete_containers_in_network "$prev"
-			fi
-			;;
-	esac
-}
-
-_docker_network_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_networks
-	esac
-}
-
-_docker_network_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		driver)
-			__docker_complete_plugins_bundled --cur "${cur##*=}" --type Network --add macvlan
-			return
-			;;
-		id)
-			__docker_complete_networks --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_networks --cur "${cur##*=}" --name
-			return
-			;;
-		type)
-			COMPREPLY=( $( compgen -W "builtin custom" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "driver id label name type" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_prune() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_network_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_networks --filter type=custom
-	esac
-}
-
-_docker_network() {
-	local subcommands="
-		connect
-		create
-		disconnect
-		inspect
-		ls
-		prune
-		rm
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service() {
-	local subcommands="
-		create
-		inspect
-		ls list
-		rm remove
-		scale
-		ps
-		update
-	"
-	__docker_daemon_is_experimental && subcommands+="logs"
-
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service_create() {
-	_docker_service_update
-}
-
-_docker_service_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-	esac
-}
-
-_docker_service_logs() {
-	case "$prev" in
-		--since|--tail)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--details --follow -f --help --no-resolve --since --tail --timestamps -t" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--since|--tail')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_services
-			fi
-			;;
-	esac
-}
-
-_docker_service_list() {
-	_docker_service_ls
-}
-
-_docker_service_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_services --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "id label name" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_service_remove() {
-	_docker_service_rm
-}
-
-_docker_service_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-	esac
-}
-
-_docker_service_scale() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_services
-			__docker_append_to_completions "="
-			__docker_nospace
-			;;
-	esac
-}
-
-_docker_service_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-		node)
-			__docker_complete_nodes_plus_self --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "desired-state id name node" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --no-resolve --no-trunc --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--filter|-f')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_services
-			fi
-			;;
-	esac
-}
-
-_docker_service_update() {
-	local $subcommand="${words[$subcommand_pos]}"
-
-	local options_with_args="
-		--constraint
-		--endpoint-mode
-		--env -e
-		--force
-		--health-cmd
-		--health-interval
-		--health-retries
-		--health-timeout
-		--hostname
-		--label -l
-		--limit-cpu
-		--limit-memory
-		--log-driver
-		--log-opt
-		--mount
-		--network
-		--no-healthcheck
-		--replicas
-		--reserve-cpu
-		--reserve-memory
-		--restart-condition
-		--restart-delay
-		--restart-max-attempts
-		--restart-window
-		--rollback
-		--stop-grace-period
-		--update-delay
-		--update-failure-action
-		--update-max-failure-ratio
-		--update-monitor
-		--update-parallelism
-		--user -u
-		--workdir -w
-	"
-
-	local boolean_options="
-		--help
-		--tty -t
-		--with-registry-auth
-	"
-
-	__docker_complete_log_driver_options && return
-
-	if [ "$subcommand" = "create" ] ; then
-		options_with_args="$options_with_args
-			--container-label
-			--dns
-			--dns-option
-			--dns-search
-			--env-file
-			--group
-			--host
-			--mode
-			--name
-			--publish -p
-			--secret
-		"
-
-		case "$prev" in
-			--env-file)
-				_filedir
-				return
-				;;
-			--host)
-				case "$cur" in
-					*:)
-						__docker_complete_resolved_hostname
-						return
-						;;
-				esac
-				;;
-			--mode)
-				COMPREPLY=( $( compgen -W "global replicated" -- "$cur" ) )
-				return
-				;;
-			--secret)
-				__docker_complete_secrets
-				return
-				;;
-			--group)
-			COMPREPLY=( $(compgen -g -- "$cur") )
-			return
-			;;
-		esac
-	fi
-	if [ "$subcommand" = "update" ] ; then
-		options_with_args="$options_with_args
-			--arg
-			--container-label-add
-			--container-label-rm
-			--dns-add
-			--dns-option-add
-			--dns-option-rm
-			--dns-rm
-			--dns-search-add
-			--dns-search-rm
-			--group-add
-			--group-rm
-			--host-add
-			--host-rm
-			--image
-			--publish-add
-			--publish-rm
-			--secret-add
-			--secret-rm
-		"
-
-		case "$prev" in
-			--group-add)
-				COMPREPLY=( $(compgen -g -- "$cur") )
-				return
-				;;
-			--group-rm)
-				COMPREPLY=( $(compgen -g -- "$cur") )
-				return
-				;;
-			--host-add|--host-rm)
-				case "$cur" in
-					*:)
-						__docker_complete_resolved_hostname
-						return
-						;;
-				esac
-				;;
-			--image)
-				__docker_complete_image_repos_and_tags
-				return
-				;;
-			--secret-add|--secret-rm)
-				__docker_complete_secrets
-				return
-				;;
-		esac
-	fi
-
-	case "$prev" in
-		--endpoint-mode)
-			COMPREPLY=( $( compgen -W "dnsrr vip" -- "$cur" ) )
-			return
-			;;
-		--env|-e)
-			# we do not append a "=" here because "-e VARNAME" is legal systax, too
-			COMPREPLY=( $( compgen -e -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--log-driver)
-			__docker_complete_log_drivers
-			return
-			;;
-		--log-opt)
-			__docker_complete_log_options
-			return
-			;;
-		--network)
-			__docker_complete_networks
-			return
-			;;
-		--restart-condition)
-			COMPREPLY=( $( compgen -W "any none on-failure" -- "$cur" ) )
-			return
-			;;
-		--user|-u)
-			__docker_complete_user_group
-			return
-			;;
-		$(__docker_to_extglob "$options_with_args") )
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "$boolean_options $options_with_args" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag $( __docker_to_alternatives "$options_with_args" ) )
-			if [ "$subcommand" = "update" ] ; then
-				if [ $cword -eq $counter ]; then
-					__docker_complete_services
-				fi
-			else
-				if [ $cword -eq $counter ]; then
-					__docker_complete_images
-				fi
-			fi
-			;;
-	esac
-}
-
-_docker_swarm() {
-	local subcommands="
-		init
-		join
-		join-token
-		leave
-		unlock
-		unlock-key
-		update
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_init() {
-	case "$prev" in
-		--advertise-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces
-				__docker_nospace
-			fi
-			return
-			;;
-		--availability)
-			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
-			return
-			;;
-		--cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit)
-			return
-			;;
-		--listen-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces --add 0.0.0.0
-				__docker_nospace
-			fi
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--advertise-addr --autolock --availability --cert-expiry --dispatcher-heartbeat --external-ca --force-new-cluster --help --listen-addr --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_join() {
-	case "$prev" in
-		--advertise-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces
-				__docker_nospace
-			fi
-			return
-			;;
-		--listen-addr)
-			if [[ $cur == *: ]] ; then
-				COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			else
-				__docker_complete_local_interfaces --add 0.0.0.0
-				__docker_nospace
-			fi
-			return
-			;;
-		--token)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--advertise-addr --help --listen-addr --token" -- "$cur" ) )
-			;;
-		*:)
-			COMPREPLY=( $( compgen -W "2377" -- "${cur##*:}" ) )
-			;;
-	esac
-}
-
-_docker_swarm_join-token() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
-			;;
-		*)
-			local counter=$( __docker_pos_first_nonflag )
-			if [ $cword -eq $counter ]; then
-				COMPREPLY=( $( compgen -W "manager worker" -- "$cur" ) )
-			fi
-			;;
-	esac
-}
-
-_docker_swarm_leave() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_unlock() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_unlock-key() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --quiet -q --rotate" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_swarm_update() {
-	case "$prev" in
-		--cert-expiry|--dispatcher-heartbeat|--external-ca|--max-snapshots|--snapshot-interval|--task-history-limit)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--autolock --cert-expiry --dispatcher-heartbeat --external-ca --help --max-snapshots --snapshot-interval --task-history-limit" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_node() {
-	local subcommands="
-		demote
-		inspect
-		ls list
-		promote
-		rm remove
-		ps
-		update
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_node_demote() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --filter role=manager
-	esac
-}
-
-_docker_node_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help --pretty" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes_plus_self
-	esac
-}
-
-_docker_node_list() {
-	_docker_node_ls
-}
-
-_docker_node_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_nodes --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_nodes --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "id label name" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_node_promote() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes --filter role=worker
-	esac
-}
-
-_docker_node_remove() {
-	_docker_node_rm
-}
-
-_docker_node_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes
-	esac
-}
-
-_docker_node_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running" -- "${cur##*=}" ) )
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -W "desired-state id label name" -S = -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --no-resolve --no-trunc" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes_plus_self
-			;;
-	esac
-}
-
-_docker_node_update() {
-	case "$prev" in
-		--availability)
-			COMPREPLY=( $( compgen -W "active drain pause" -- "$cur" ) )
-			return
-			;;
-		--role)
-			COMPREPLY=( $( compgen -W "manager worker" -- "$cur" ) )
-			return
-			;;
-		--label-add|--label-rm)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--availability --help --label-add --label-rm --role" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_nodes
-	esac
-}
-
-_docker_pause() {
-	_docker_container_pause
-}
-
-_docker_plugin() {
-	local subcommands="
-		create
-		disable
-		enable
-		inspect
-		install
-		ls
-		push
-		rm
-		set
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_create() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--compress --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				# reponame
-				return
-			elif [ $cword -eq  $((counter + 1)) ]; then
-				_filedir -d
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_disable() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_enable() {
-	case "$prev" in
-		--timeout)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --timeout" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--timeout')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_inspect() {
-	case "$prev" in
-		--format|f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_plugins_installed
-			;;
-	esac
-}
-
-_docker_plugin_install() {
-	case "$prev" in
-		--alias)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--alias --disable --disable-content-trust=false --grant-all-permissions --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_list() {
-	_docker_plugin_ls
-}
-
-_docker_plugin_ls() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --no-trunc" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_plugin_push() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-_docker_plugin_remove() {
-	_docker_plugin_rm
-}
-
-_docker_plugin_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_plugins_installed
-			;;
-	esac
-}
-
-_docker_plugin_set() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_plugins_installed
-			fi
-			;;
-	esac
-}
-
-
-_docker_port() {
-	_docker_container_port
-}
-
-_docker_ps() {
-	_docker_container_ls
-}
-
-_docker_pull() {
-	_docker_image_pull
-}
-
-_docker_push() {
-	_docker_image_push
-}
-
-_docker_rename() {
-	_docker_container_rename
-}
-
-_docker_restart() {
-	_docker_container_restart
-}
-
-_docker_rm() {
-	_docker_container_rm
-}
-
-_docker_rmi() {
-	_docker_image_rm
-}
-
-_docker_run() {
-	_docker_container_run
-}
-
-_docker_save() {
-	_docker_image_save
-}
-
-
-_docker_secret() {
-	local subcommands="
-		create
-		inspect
-		ls
-		rm
-	"
-	local aliases="
-		list
-		remove
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_secret_create() {
-	case "$prev" in
-		--label|-l)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --label -l" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_secret_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_secrets
-			;;
-	esac
-}
-
-_docker_secret_list() {
-	_docker_secret_ls
-}
-
-_docker_secret_ls() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_secret_remove() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_secrets
-			;;
-	esac
-}
-
-_docker_secret_rm() {
-	_docker_secret_remove
-}
-
-
-
-_docker_search() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		is-automated)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-		is-official)
-			COMPREPLY=( $( compgen -W "false true" -- "${cur##*=}" ) )
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "is-automated is-official stars" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--limit)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter --help --limit --no-trunc" -- "$cur" ) )
-			;;
-	esac
-}
-
-
-_docker_stack() {
-	local subcommands="
-		deploy
-		ls
-		ps
-		rm
-		services
-	"
-	local aliases="
-		down
-		list
-		remove
-		up
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_stack_deploy() {
-	case "$prev" in
-		--bundle-file)
-			if __docker_is_experimental ; then
-				_filedir dab
-				return
-			fi
-			;;
-		--compose-file|-c)
-			_filedir yml
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			local options="--compose-file -c --help --with-registry-auth"
-			__docker_is_experimental && options+=" --bundle-file"
-			COMPREPLY=( $( compgen -W "$options" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_stack_down() {
-	_docker_stack_rm
-}
-
-_docker_stack_list() {
-	_docker_stack_ls
-}
-
-_docker_stack_ls() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_stack_ps() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		desired-state)
-			COMPREPLY=( $( compgen -W "accepted running" -- "${cur##*=}" ) )
-			return
-			;;
-		id)
-			__docker_complete_stacks --cur "${cur##*=}" --id
-			return
-			;;
-		name)
-			__docker_complete_stacks --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id name desired-state" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --filter -f --help --no-resolve --no-trunc" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--filter|-f')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_remove() {
-	_docker_stack_rm
-}
-
-_docker_stack_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag)
-			if [ $cword -eq $counter ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_services() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		id)
-			__docker_complete_services --cur "${cur##*=}" --id
-			return
-			;;
-		label)
-			return
-			;;
-		name)
-			__docker_complete_services --cur "${cur##*=}" --name
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "id label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --quiet -q" -- "$cur" ) )
-			;;
-		*)
-			local counter=$(__docker_pos_first_nonflag '--filter|-f')
-			if [ $cword -eq $counter ]; then
-				__docker_complete_stacks
-			fi
-			;;
-	esac
-}
-
-_docker_stack_up() {
-	_docker_stack_deploy
-}
-
-
-_docker_start() {
-	_docker_container_start
-}
-
-_docker_stats() {
-	_docker_container_stats
-}
-
-_docker_stop() {
-	_docker_container_stop
-}
-
-
-_docker_system() {
-	local subcommands="
-		df
-		events
-		info
-		prune
-	"
-	__docker_subcommands "$subcommands $aliases" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_df() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help --verbose -v" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_events() {
-	local key=$(__docker_map_key_of_current_option '-f|--filter')
-	case "$key" in
-		container)
-			__docker_complete_containers_all --cur "${cur##*=}"
-			return
-			;;
-		daemon)
-			local name=$(__docker_q info | sed -n 's/^\(ID\|Name\): //p')
-			COMPREPLY=( $( compgen -W "$name" -- "${cur##*=}" ) )
-			return
-			;;
-		event)
-			COMPREPLY=( $( compgen -W "
-				attach
-				commit
-				connect
-				copy
-				create
-				delete
-				destroy
-				detach
-				die
-				disconnect
-				exec_create
-				exec_detach
-				exec_start
-				export
-				health_status
-				import
-				kill
-				load
-				mount
-				oom
-				pause
-				pull
-				push
-				reload
-				rename
-				resize
-				restart
-				save
-				start
-				stop
-				tag
-				top
-				unmount
-				unpause
-				untag
-				update
-			" -- "${cur##*=}" ) )
-			return
-			;;
-		image)
-			cur="${cur##*=}"
-			__docker_complete_images
-			return
-			;;
-		network)
-			__docker_complete_networks --cur "${cur##*=}"
-			return
-			;;
-		type)
-			COMPREPLY=( $( compgen -W "container daemon image network volume" -- "${cur##*=}" ) )
-			return
-			;;
-		volume)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "container daemon event image label network type volume" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--since|--until)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --help --since --until --format" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_info() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_system_prune() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--all -a --force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-
-_docker_tag() {
-	_docker_image_tag
-}
-
-_docker_unpause() {
-	_docker_container_unpause
-}
-
-_docker_update() {
-	_docker_container_update
-}
-
-_docker_top() {
-	_docker_container_top
-}
-
-_docker_version() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_create() {
-	case "$prev" in
-		--driver|-d)
-			__docker_complete_plugins_bundled --type Volume
-			return
-			;;
-		--label|--opt|-o)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--driver -d --help --label --opt -o" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_inspect() {
-	case "$prev" in
-		--format|-f)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--format -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_volumes
-			;;
-	esac
-}
-
-_docker_volume_ls() {
-	local key=$(__docker_map_key_of_current_option '--filter|-f')
-	case "$key" in
-		dangling)
-			COMPREPLY=( $( compgen -W "true false" -- "${cur##*=}" ) )
-			return
-			;;
-		driver)
-			__docker_complete_plugins_bundled --cur "${cur##*=}" --type Volume
-			return
-			;;
-		name)
-			__docker_complete_volumes --cur "${cur##*=}"
-			return
-			;;
-	esac
-
-	case "$prev" in
-		--filter|-f)
-			COMPREPLY=( $( compgen -S = -W "dangling driver label name" -- "$cur" ) )
-			__docker_nospace
-			return
-			;;
-		--format)
-			return
-			;;
-	esac
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--filter -f --format --help --quiet -q" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_prune() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_volume_rm() {
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--force -f --help" -- "$cur" ) )
-			;;
-		*)
-			__docker_complete_volumes
-			;;
-	esac
-}
-
-_docker_volume() {
-	local subcommands="
-		create
-		inspect
-		ls
-		prune
-		rm
-	"
-	__docker_subcommands "$subcommands" && return
-
-	case "$cur" in
-		-*)
-			COMPREPLY=( $( compgen -W "--help" -- "$cur" ) )
-			;;
-		*)
-			COMPREPLY=( $( compgen -W "$subcommands" -- "$cur" ) )
-			;;
-	esac
-}
-
-_docker_wait() {
-	_docker_container_wait
-}
-
-_docker() {
-	local previous_extglob_setting=$(shopt -p extglob)
-	shopt -s extglob
-
-	local management_commands=(
-		container
-		image
-		network
-		node
-		plugin
-		secret
-		service
-		stack
-		system
-		volume
-	)
-
-	local top_level_commands=(
-		build
-		login
-		logout
-		run
-		search
-		version
-	)
-
-	local legacy_commands=(
-		commit
-		cp
-		create
-		diff
-		events
-		exec
-		export
-		history
-		images
-		import
-		info
-		inspect
-		kill
-		load
-		logs
-		pause
-		port
-		ps
-		pull
-		push
-		rename
-		restart
-		rm
-		rmi
-		save
-		start
-		stats
-		stop
-		swarm
-		tag
-		top
-		unpause
-		update
-		wait
-	)
-
-	local experimental_commands=(
-		checkpoint
-		deploy
-	)
-
-	local commands=(${management_commands[*]} ${top_level_commands[*]})
-	[ -z "$DOCKER_HIDE_LEGACY_COMMANDS" ] && commands+=(${legacy_commands[*]})
-
-	# These options are valid as global options for all client commands
-	# and valid as command options for `docker daemon`
-	local global_boolean_options="
-		--debug -D
-		--tls
-		--tlsverify
-	"
-	local global_options_with_args="
-		--config
-		--host -H
-		--log-level -l
-		--tlscacert
-		--tlscert
-		--tlskey
-	"
-
-	local host config
-
-	COMPREPLY=()
-	local cur prev words cword
-	_get_comp_words_by_ref -n : cur prev words cword
-
-	local command='docker' command_pos=0 subcommand_pos
-	local counter=1
-	while [ $counter -lt $cword ]; do
-		case "${words[$counter]}" in
-			# save host so that completion can use custom daemon
-			--host|-H)
-				(( counter++ ))
-				host="${words[$counter]}"
-				;;
-			# save config so that completion can use custom configuration directories
-			--config)
-				(( counter++ ))
-				config="${words[$counter]}"
-				;;
-			$(__docker_to_extglob "$global_options_with_args") )
-				(( counter++ ))
-				;;
-			-*)
-				;;
-			=)
-				(( counter++ ))
-				;;
-			*)
-				command="${words[$counter]}"
-				command_pos=$counter
-				break
-				;;
-		esac
-		(( counter++ ))
-	done
-
-	local binary="${words[0]}"
-	if [[ $binary == ?(*/)dockerd ]] ; then
-		# for the dockerd binary, we reuse completion of `docker daemon`.
-		# dockerd does not have subcommands and global options.
-		command=daemon
-		command_pos=0
-	fi
-
-	local completions_func=_docker_${command}
-	declare -F $completions_func >/dev/null && $completions_func
-
-	eval "$previous_extglob_setting"
-	return 0
-}
-
-eval "$__docker_previous_extglob_setting"
-unset __docker_previous_extglob_setting
-
-complete -F _docker docker dockerd
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/fish/docker.fish b/installer/vendor/github.com/docker/docker/contrib/completion/fish/docker.fish
deleted file mode 100644
index 2715cb1aa6..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/fish/docker.fish
+++ /dev/null
@@ -1,405 +0,0 @@
-# docker.fish - docker completions for fish shell
-#
-# This file is generated by gen_docker_fish_completions.py from:
-# https://github.com/barnybug/docker-fish-completion
-#
-# To install the completions:
-# mkdir -p ~/.config/fish/completions
-# cp docker.fish ~/.config/fish/completions
-#
-# Completion supported:
-# - parameters
-# - commands
-# - containers
-# - images
-# - repositories
-
-function __fish_docker_no_subcommand --description 'Test if docker has yet to be given the subcommand'
-    for i in (commandline -opc)
-        if contains -- $i attach build commit cp create diff events exec export history images import info inspect kill load login logout logs pause port ps pull push rename restart rm rmi run save search start stop tag top unpause version wait stats
-            return 1
-        end
-    end
-    return 0
-end
-
-function __fish_print_docker_containers --description 'Print a list of docker containers' -a select
-    switch $select
-        case running
-            docker ps -a --no-trunc | command awk 'NR>1' | command awk 'BEGIN {FS="  +"}; $5 ~ "^Up" {print $1 "\n" $(NF)}' | tr ',' '\n'
-        case stopped
-            docker ps -a --no-trunc | command awk 'NR>1' | command awk 'BEGIN {FS="  +"}; $5 ~ "^Exit" {print $1 "\n" $(NF)}' | tr ',' '\n'
-        case all
-            docker ps -a --no-trunc | command awk 'NR>1' | command awk 'BEGIN {FS="  +"}; {print $1 "\n" $(NF)}' | tr ',' '\n'
-    end
-end
-
-function __fish_print_docker_images --description 'Print a list of docker images'
-    docker images | command awk 'NR>1' | command grep -v '<none>' | command awk '{print $1":"$2}'
-end
-
-function __fish_print_docker_repositories --description 'Print a list of docker repositories'
-    docker images | command awk 'NR>1' | command grep -v '<none>' | command awk '{print $1}' | command sort | command uniq
-end
-
-# common options
-complete -c docker -f -n '__fish_docker_no_subcommand' -l api-cors-header -d "Set CORS headers in the Engine API. Default is cors disabled"
-complete -c docker -f -n '__fish_docker_no_subcommand' -s b -l bridge -d 'Attach containers to a pre-existing network bridge'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l bip -d "Use this CIDR notation address for the network bridge's IP, not compatible with -b"
-complete -c docker -f -n '__fish_docker_no_subcommand' -s D -l debug -d 'Enable debug mode'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s d -l daemon -d 'Enable daemon mode'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l dns -d 'Force Docker to use specific DNS servers'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-opt -d 'Force Docker to use specific DNS options'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l dns-search -d 'Force Docker to use specific DNS search domains'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l exec-opt -d 'Set runtime execution options'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr -d 'IPv4 subnet for fixed IPs (e.g. 10.20.0.0/16)'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l fixed-cidr-v6 -d 'IPv6 subnet for fixed IPs (e.g.: 2001:a02b/48)'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s G -l group -d 'Group to assign the unix socket specified by -H when running in daemon mode'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s g -l graph -d 'Path to use as the root of the Docker runtime'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s H -l host -d 'The socket(s) to bind to in daemon mode or connect to in client mode, specified using one or more tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s h -l help -d 'Print usage'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l icc -d 'Allow unrestricted inter-container and Docker daemon host communication'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l insecure-registry -d 'Enable insecure communication with specified registries (no certificate verification for HTTPS and enable HTTP fallback) (e.g., localhost:5000 or 10.20.0.0/16)'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l ip -d 'Default IP address to use when binding container ports'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-forward -d 'Enable net.ipv4.ip_forward and IPv6 forwarding if --fixed-cidr-v6 is defined. IPv6 forwarding may interfere with your existing IPv6 configuration when using Router Advertisement.'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l ip-masq -d "Enable IP masquerading for bridge's IP range"
-complete -c docker -f -n '__fish_docker_no_subcommand' -l iptables -d "Enable Docker's addition of iptables rules"
-complete -c docker -f -n '__fish_docker_no_subcommand' -l ipv6 -d 'Enable IPv6 networking'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s l -l log-level -d 'Set the logging level ("debug", "info", "warn", "error", "fatal")'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l label -d 'Set key=value labels to the daemon (displayed in `docker info`)'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l mtu -d 'Set the containers network MTU'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s p -l pidfile -d 'Path to use for daemon PID file'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l registry-mirror -d 'Specify a preferred Docker registry mirror'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s s -l storage-driver -d 'Force the Docker runtime to use a specific storage driver'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l selinux-enabled -d 'Enable selinux support. SELinux does not presently support the BTRFS storage driver'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l storage-opt -d 'Set storage driver options'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l tls -d 'Use TLS; implied by --tlsverify'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscacert -d 'Trust only remotes providing a certificate signed by the CA given here'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l tlscert -d 'Path to TLS certificate file'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l tlskey -d 'Path to TLS key file'
-complete -c docker -f -n '__fish_docker_no_subcommand' -l tlsverify -d 'Use TLS and verify the remote (daemon: verify client, client: verify daemon)'
-complete -c docker -f -n '__fish_docker_no_subcommand' -s v -l version -d 'Print version information and quit'
-
-# subcommands
-# attach
-complete -c docker -f -n '__fish_docker_no_subcommand' -a attach -d 'Attach to a running container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l no-stdin -d 'Do not attach STDIN'
-complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -l sig-proxy -d 'Proxy all received signals to the process (non-TTY mode only). SIGCHLD, SIGKILL, and SIGSTOP are not proxied.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from attach' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# build
-complete -c docker -f -n '__fish_docker_no_subcommand' -a build -d 'Build an image from a Dockerfile'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s f -l file -d "Name of the Dockerfile(Default is 'Dockerfile' at context root)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l force-rm -d 'Always remove intermediate containers, even after unsuccessful builds'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l no-cache -d 'Do not use cache when building the image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l pull -d 'Always attempt to pull a newer version of the image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s q -l quiet -d 'Suppress the build output and print image ID on success'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -l rm -d 'Remove intermediate containers after a successful build'
-complete -c docker -A -f -n '__fish_seen_subcommand_from build' -s t -l tag -d 'Repository name (and optionally a tag) to be applied to the resulting image in case of success'
-
-# commit
-complete -c docker -f -n '__fish_docker_no_subcommand' -a commit -d "Create a new image from a container's changes"
-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s a -l author -d 'Author (e.g., "John Hannibal Smith <hannibal@a-team.com>")'
-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s m -l message -d 'Commit message'
-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -s p -l pause -d 'Pause container during commit'
-complete -c docker -A -f -n '__fish_seen_subcommand_from commit' -a '(__fish_print_docker_containers all)' -d "Container"
-
-# cp
-complete -c docker -f -n '__fish_docker_no_subcommand' -a cp -d "Copy files/folders between a container and the local filesystem"
-complete -c docker -A -f -n '__fish_seen_subcommand_from cp' -l help -d 'Print usage'
-
-# create
-complete -c docker -f -n '__fish_docker_no_subcommand' -a create -d 'Create a new container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpu-shares -d 'CPU shares (relative weight)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-add -d 'Add Linux capabilities'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cap-drop -d 'Drop Linux capabilities'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cidfile -d 'Write the container ID to the file'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l cpuset -d 'CPUs in which to allow execution (0-3, 0,1)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns -d 'Set custom DNS servers'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-opt -d "Set custom DNS options (Use --dns-opt='' if you don't wish to set options)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l dns-search -d "Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s e -l env -d 'Set environment variables'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l env-file -d 'Read in a line delimited file of environment variables'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l expose -d 'Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to run as'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s h -l hostname -d 'Container host name'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s i -l interactive -d 'Keep STDIN open even if not attached'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l link -d 'Add link to another container in the form of <name|id>:alias'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l mac-address -d 'Container MAC address (e.g. 92:d0:c6:0a:29:33)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l name -d 'Assign a name to the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l net -d 'Set the Network mode for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s p -l publish -d "Publish a container's port to the host"
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l pid -d 'Default is to create a private PID namespace for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l privileged -d 'Give extended privileges to this container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l read-only -d "Mount the container's root filesystem as read only"
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l security-opt -d 'Security Options'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s t -l tty -d 'Allocate a pseudo-TTY'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s u -l user -d 'Username or UID'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s v -l volume -d 'Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l volumes-from -d 'Mount volumes from the specified container(s)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -s w -l workdir -d 'Working directory inside the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -a '(__fish_print_docker_images)' -d "Image"
-
-# diff
-complete -c docker -f -n '__fish_docker_no_subcommand' -a diff -d "Inspect changes on a container's filesystem"
-complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from diff' -a '(__fish_print_docker_containers all)' -d "Container"
-
-# events
-complete -c docker -f -n '__fish_docker_no_subcommand' -a events -d 'Get real time events from the server'
-complete -c docker -A -f -n '__fish_seen_subcommand_from events' -s f -l filter -d "Provide filter values (i.e., 'event=stop')"
-complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l since -d 'Show all events created since timestamp'
-complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l until -d 'Stream events until this timestamp'
-complete -c docker -A -f -n '__fish_seen_subcommand_from events' -l format -d 'Format the output using the given go template'
-
-# exec
-complete -c docker -f -n '__fish_docker_no_subcommand' -a exec -d 'Run a command in a running container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s d -l detach -d 'Detached mode: run command in the background'
-complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s i -l interactive -d 'Keep STDIN open even if not attached'
-complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -s t -l tty -d 'Allocate a pseudo-TTY'
-complete -c docker -A -f -n '__fish_seen_subcommand_from exec' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# export
-complete -c docker -f -n '__fish_docker_no_subcommand' -a export -d 'Stream the contents of a container as a tar archive'
-complete -c docker -A -f -n '__fish_seen_subcommand_from export' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from export' -a '(__fish_print_docker_containers all)' -d "Container"
-
-# history
-complete -c docker -f -n '__fish_docker_no_subcommand' -a history -d 'Show the history of an image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from history' -l no-trunc -d "Don't truncate output"
-complete -c docker -A -f -n '__fish_seen_subcommand_from history' -s q -l quiet -d 'Only show numeric IDs'
-complete -c docker -A -f -n '__fish_seen_subcommand_from history' -a '(__fish_print_docker_images)' -d "Image"
-
-# images
-complete -c docker -f -n '__fish_docker_no_subcommand' -a images -d 'List images'
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s a -l all -d 'Show all images (by default filter out the intermediate image layers)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s f -l filter -d "Provide filter values (i.e., 'dangling=true')"
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -l no-trunc -d "Don't truncate output"
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -s q -l quiet -d 'Only show numeric IDs'
-complete -c docker -A -f -n '__fish_seen_subcommand_from images' -a '(__fish_print_docker_repositories)' -d "Repository"
-
-# import
-complete -c docker -f -n '__fish_docker_no_subcommand' -a import -d 'Create a new filesystem image from the contents of a tarball'
-complete -c docker -A -f -n '__fish_seen_subcommand_from import' -l help -d 'Print usage'
-
-# info
-complete -c docker -f -n '__fish_docker_no_subcommand' -a info -d 'Display system-wide information'
-complete -c docker -A -f -n '__fish_seen_subcommand_from info' -s f -l format  -d 'Format the output using the given go template'
-complete -c docker -A -f -n '__fish_seen_subcommand_from info' -l help -d 'Print usage'
-
-# inspect
-complete -c docker -f -n '__fish_docker_no_subcommand' -a inspect -d 'Return low-level information on a container or image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s f -l format -d 'Format the output using the given go template.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -s s -l size -d 'Display total file sizes if the type is container.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_images)' -d "Image"
-complete -c docker -A -f -n '__fish_seen_subcommand_from inspect' -a '(__fish_print_docker_containers all)' -d "Container"
-
-# kill
-complete -c docker -f -n '__fish_docker_no_subcommand' -a kill -d 'Kill a running container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -s s -l signal -d 'Signal to send to the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from kill' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# load
-complete -c docker -f -n '__fish_docker_no_subcommand' -a load -d 'Load an image from a tar archive'
-complete -c docker -A -f -n '__fish_seen_subcommand_from load' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from load' -s i -l input -d 'Read from a tar archive file, instead of STDIN'
-
-# login
-complete -c docker -f -n '__fish_docker_no_subcommand' -a login -d 'Log in to a Docker registry server'
-complete -c docker -A -f -n '__fish_seen_subcommand_from login' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s p -l password -d 'Password'
-complete -c docker -A -f -n '__fish_seen_subcommand_from login' -s u -l username -d 'Username'
-
-# logout
-complete -c docker -f -n '__fish_docker_no_subcommand' -a logout -d 'Log out from a Docker registry server'
-
-# logs
-complete -c docker -f -n '__fish_docker_no_subcommand' -a logs -d 'Fetch the logs of a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s f -l follow -d 'Follow log output'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -s t -l timestamps -d 'Show timestamps'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l since -d 'Show logs since timestamp'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -l tail -d 'Output the specified number of lines at the end of logs (defaults to all logs)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from logs' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# port
-complete -c docker -f -n '__fish_docker_no_subcommand' -a port -d 'Lookup the public-facing port that is NAT-ed to PRIVATE_PORT'
-complete -c docker -A -f -n '__fish_seen_subcommand_from port' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from port' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# pause
-complete -c docker -f -n '__fish_docker_no_subcommand' -a pause -d 'Pause all processes within a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from pause' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# ps
-complete -c docker -f -n '__fish_docker_no_subcommand' -a ps -d 'List containers'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s a -l all -d 'Show all containers. Only running containers are shown by default.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l before -d 'Show only container created before Id or Name, include non-running ones.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s f -l filter -d 'Provide filter values. Valid filters:'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s l -l latest -d 'Show only the latest created container, include non-running ones.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s n -d 'Show n last created containers, include non-running ones.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l no-trunc -d "Don't truncate output"
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s q -l quiet -d 'Only display numeric IDs'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -s s -l size -d 'Display total file sizes'
-complete -c docker -A -f -n '__fish_seen_subcommand_from ps' -l since -d 'Show only containers created since Id or Name, include non-running ones.'
-
-# pull
-complete -c docker -f -n '__fish_docker_no_subcommand' -a pull -d 'Pull an image or a repository from a Docker registry server'
-complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -s a -l all-tags -d 'Download all tagged images in the repository'
-complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_images)' -d "Image"
-complete -c docker -A -f -n '__fish_seen_subcommand_from pull' -a '(__fish_print_docker_repositories)' -d "Repository"
-
-# push
-complete -c docker -f -n '__fish_docker_no_subcommand' -a push -d 'Push an image or a repository to a Docker registry server'
-complete -c docker -A -f -n '__fish_seen_subcommand_from push' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_images)' -d "Image"
-complete -c docker -A -f -n '__fish_seen_subcommand_from push' -a '(__fish_print_docker_repositories)' -d "Repository"
-
-# rename
-complete -c docker -f -n '__fish_docker_no_subcommand' -a rename -d 'Rename an existing container'
-
-# restart
-complete -c docker -f -n '__fish_docker_no_subcommand' -a restart -d 'Restart a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -s t -l time -d 'Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from restart' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# rm
-complete -c docker -f -n '__fish_docker_no_subcommand' -a rm -d 'Remove one or more containers'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -d 'Force the removal of a running container (uses SIGKILL)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s l -l link -d 'Remove the specified link and not the underlying container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s v -l volumes -d 'Remove the volumes associated with the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -a '(__fish_print_docker_containers stopped)' -d "Container"
-complete -c docker -A -f -n '__fish_seen_subcommand_from rm' -s f -l force -a '(__fish_print_docker_containers all)' -d "Container"
-
-# rmi
-complete -c docker -f -n '__fish_docker_no_subcommand' -a rmi -d 'Remove one or more images'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -s f -l force -d 'Force removal of the image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -l no-prune -d 'Do not delete untagged parents'
-complete -c docker -A -f -n '__fish_seen_subcommand_from rmi' -a '(__fish_print_docker_images)' -d "Image"
-
-# run
-complete -c docker -f -n '__fish_docker_no_subcommand' -a run -d 'Run a command in a new container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s a -l attach -d 'Attach to STDIN, STDOUT or STDERR.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l add-host -d 'Add a custom host-to-IP mapping (host:ip)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s c -l cpu-shares -d 'CPU shares (relative weight)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-add -d 'Add Linux capabilities'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cap-drop -d 'Drop Linux capabilities'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cidfile -d 'Write the container ID to the file'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l cpuset -d 'CPUs in which to allow execution (0-3, 0,1)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s d -l detach -d 'Detached mode: run the container in the background and print the new container ID'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l device -d 'Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns -d 'Set custom DNS servers'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-opt -d "Set custom DNS options (Use --dns-opt='' if you don't wish to set options)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l dns-search -d "Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s e -l env -d 'Set environment variables'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l entrypoint -d 'Overwrite the default ENTRYPOINT of the image'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l env-file -d 'Read in a line delimited file of environment variables'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l expose -d 'Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host'
-complete -c docker -A -f -n '__fish_seen_subcommand_from create' -l group-add -d 'Add additional groups to run as'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s h -l hostname -d 'Container host name'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s i -l interactive -d 'Keep STDIN open even if not attached'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l ipc -d 'Default is to create a private IPC namespace (POSIX SysV IPC) for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l link -d 'Add link to another container in the form of <name|id>:alias'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s m -l memory -d 'Memory limit (format: <number>[<unit>], where unit = b, k, m or g)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l mac-address -d 'Container MAC address (e.g. 92:d0:c6:0a:29:33)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l memory-swap -d "Total memory usage (memory + swap), set '-1' to disable swap (format: <number>[<unit>], where unit = b, k, m or g)"
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l name -d 'Assign a name to the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l net -d 'Set the Network mode for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s P -l publish-all -d 'Publish all exposed ports to random ports on the host interfaces'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s p -l publish -d "Publish a container's port to the host"
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l pid -d 'Default is to create a private PID namespace for the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l privileged -d 'Give extended privileges to this container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l read-only -d "Mount the container's root filesystem as read only"
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l restart -d 'Restart policy to apply when a container exits (no, on-failure[:max-retry], always)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l rm -d 'Automatically remove the container when it exits (incompatible with -d)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l security-opt -d 'Security Options'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l sig-proxy -d 'Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l stop-signal -d 'Signal to kill a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s t -l tty -d 'Allocate a pseudo-TTY'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s u -l user -d 'Username or UID'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l tmpfs -d 'Mount tmpfs on a directory'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s v -l volume -d 'Bind mount a volume (e.g., from the host: -v /host:/container, from Docker: -v /container)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -l volumes-from -d 'Mount volumes from the specified container(s)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -s w -l workdir -d 'Working directory inside the container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from run' -a '(__fish_print_docker_images)' -d "Image"
-
-# save
-complete -c docker -f -n '__fish_docker_no_subcommand' -a save -d 'Save an image to a tar archive'
-complete -c docker -A -f -n '__fish_seen_subcommand_from save' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from save' -s o -l output -d 'Write to an file, instead of STDOUT'
-complete -c docker -A -f -n '__fish_seen_subcommand_from save' -a '(__fish_print_docker_images)' -d "Image"
-
-# search
-complete -c docker -f -n '__fish_docker_no_subcommand' -a search -d 'Search for an image on the registry (defaults to the Docker Hub)'
-complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l automated -d 'Only show automated builds'
-complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from search' -l no-trunc -d "Don't truncate output"
-complete -c docker -A -f -n '__fish_seen_subcommand_from search' -s s -l stars -d 'Only displays with at least x stars'
-
-# start
-complete -c docker -f -n '__fish_docker_no_subcommand' -a start -d 'Start a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s a -l attach -d "Attach container's STDOUT and STDERR and forward all signals to the process"
-complete -c docker -A -f -n '__fish_seen_subcommand_from start' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from start' -s i -l interactive -d "Attach container's STDIN"
-complete -c docker -A -f -n '__fish_seen_subcommand_from start' -a '(__fish_print_docker_containers stopped)' -d "Container"
-
-# stats
-complete -c docker -f -n '__fish_docker_no_subcommand' -a stats -d "Display a live stream of one or more containers' resource usage statistics"
-complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -l no-stream -d 'Disable streaming stats and only pull the first result'
-complete -c docker -A -f -n '__fish_seen_subcommand_from stats' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# stop
-complete -c docker -f -n '__fish_docker_no_subcommand' -a stop -d 'Stop a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -s t -l time -d 'Number of seconds to wait for the container to stop before killing it. Default is 10 seconds.'
-complete -c docker -A -f -n '__fish_seen_subcommand_from stop' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# tag
-complete -c docker -f -n '__fish_docker_no_subcommand' -a tag -d 'Tag an image into a repository'
-complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -s f -l force -d 'Force'
-complete -c docker -A -f -n '__fish_seen_subcommand_from tag' -l help -d 'Print usage'
-
-# top
-complete -c docker -f -n '__fish_docker_no_subcommand' -a top -d 'Lookup the running processes of a container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from top' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from top' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# unpause
-complete -c docker -f -n '__fish_docker_no_subcommand' -a unpause -d 'Unpause a paused container'
-complete -c docker -A -f -n '__fish_seen_subcommand_from unpause' -a '(__fish_print_docker_containers running)' -d "Container"
-
-# version
-complete -c docker -f -n '__fish_docker_no_subcommand' -a version -d 'Show the Docker version information'
-complete -c docker -A -f -n '__fish_seen_subcommand_from version' -s f -l format  -d 'Format the output using the given go template'
-complete -c docker -A -f -n '__fish_seen_subcommand_from version' -l help -d 'Print usage'
-
-# wait
-complete -c docker -f -n '__fish_docker_no_subcommand' -a wait -d 'Block until a container stops, then print its exit code'
-complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -l help -d 'Print usage'
-complete -c docker -A -f -n '__fish_seen_subcommand_from wait' -a '(__fish_print_docker_containers running)' -d "Container"
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/powershell/readme.txt b/installer/vendor/github.com/docker/docker/contrib/completion/powershell/readme.txt
deleted file mode 100644
index 18e1b53c13..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/powershell/readme.txt
+++ /dev/null
@@ -1 +0,0 @@
-See https://github.com/samneirinck/posh-docker
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/zsh/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/completion/zsh/REVIEWERS
deleted file mode 100644
index 03ee2dde3d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/zsh/REVIEWERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)
diff --git a/installer/vendor/github.com/docker/docker/contrib/completion/zsh/_docker b/installer/vendor/github.com/docker/docker/contrib/completion/zsh/_docker
deleted file mode 100644
index ecae826a4a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/completion/zsh/_docker
+++ /dev/null
@@ -1,2787 +0,0 @@
-#compdef docker dockerd
-#
-# zsh completion for docker (http://docker.com)
-#
-# version:  0.3.0
-# github:   https://github.com/felixr/docker-zsh-completion
-#
-# contributors:
-#   - Felix Riedel
-#   - Steve Durrheimer
-#   - Vincent Bernat
-#
-# license:
-#
-# Copyright (c) 2013, Felix Riedel
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the <organization> nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL <COPYRIGHT HOLDER> BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-
-# Short-option stacking can be enabled with:
-#  zstyle ':completion:*:*:docker:*' option-stacking yes
-#  zstyle ':completion:*:*:docker-*:*' option-stacking yes
-__docker_arguments() {
-    if zstyle -t ":completion:${curcontext}:" option-stacking; then
-        print -- -s
-    fi
-}
-
-__docker_get_containers() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local kind type line s
-    declare -a running stopped lines args names
-
-    kind=$1; shift
-    type=$1; shift
-    [[ $kind = (stopped|all) ]] && args=($args -a)
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options ps --format 'table' --no-trunc $args)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1 # Last column, should go to the end of the line
-    lines=(${lines[2,-1]})
-
-    # Container ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${${line[${begin[CONTAINER ID]},${end[CONTAINER ID]}]%% ##}[0,12]}"
-            s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
-            s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
-                stopped=($stopped $s)
-            else
-                running=($running $s)
-            fi
-        done
-    fi
-
-    # Names: we only display the one without slash. All other names
-    # are generated and may clutter the completion. However, with
-    # Swarm, all names may be prefixed by the swarm node name.
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            names=(${(ps:,:)${${line[${begin[NAMES]},${end[NAMES]}]}%% *}})
-            # First step: find a common prefix and strip it (swarm node case)
-            (( ${#${(u)names%%/*}} == 1 )) && names=${names#${names[1]%%/*}/}
-            # Second step: only keep the first name without a /
-            s=${${names:#*/*}[1]}
-            # If no name, well give up.
-            (( $#s != 0 )) || continue
-            s="$s:${(l:15:: :::)${${line[${begin[CREATED]},${end[CREATED]}]/ ago/}%% ##}}"
-            s="$s, ${${${line[${begin[IMAGE]},${end[IMAGE]}]}/:/\\:}%% ##}"
-            if [[ ${line[${begin[STATUS]},${end[STATUS]}]} = Exit* ]]; then
-                stopped=($stopped $s)
-            else
-                running=($running $s)
-            fi
-        done
-    fi
-
-    [[ $kind = (running|all) ]] && _describe -t containers-running "running containers" running "$@" && ret=0
-    [[ $kind = (stopped|all) ]] && _describe -t containers-stopped "stopped containers" stopped "$@" && ret=0
-    return ret
-}
-
-__docker_complete_stopped_containers() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_containers stopped all "$@"
-}
-
-__docker_complete_running_containers() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_containers running all "$@"
-}
-
-__docker_complete_containers() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_containers all all "$@"
-}
-
-__docker_complete_containers_ids() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_containers all ids "$@"
-}
-
-__docker_complete_containers_names() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_containers all names "$@"
-}
-
-__docker_complete_info_plugins() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    emulate -L zsh
-    setopt extendedglob
-    local -a plugins
-    plugins=(${(ps: :)${(M)${(f)${${"$(_call_program commands docker $docker_options info)"##*$'\n'Plugins:}%%$'\n'^ *}}:# $1: *}## $1: })
-    _describe -t plugins "$1 plugins" plugins && ret=0
-    return ret
-}
-
-__docker_complete_images() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a images
-    images=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/(#b)([^ ]##) ##([^ ]##) ##([^ ]##)*/${match[3]}:${(r:15:: :::)match[2]} in ${match[1]}})
-    _describe -t docker-images "images" images && ret=0
-    __docker_complete_repositories_with_tags && ret=0
-    return ret
-}
-
-__docker_complete_repositories() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a repos
-    repos=(${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}%% *}[2,-1]})
-    repos=(${repos#<none>})
-    _describe -t docker-repos "repositories" repos && ret=0
-    return ret
-}
-
-__docker_complete_repositories_with_tags() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a repos onlyrepos matched
-    declare m
-    repos=(${${${${(f)${:-"$(_call_program commands docker $docker_options images)"$'\n'}}[2,-1]}/ ##/:::}%% *})
-    repos=(${${repos%:::<none>}#<none>})
-    # Check if we have a prefix-match for the current prefix.
-    onlyrepos=(${repos%::*})
-    for m in $onlyrepos; do
-        [[ ${PREFIX##${~~m}} != ${PREFIX} ]] && {
-            # Yes, complete with tags
-            repos=(${${repos/:::/:}/:/\\:})
-            _describe -t docker-repos-with-tags "repositories with tags" repos && ret=0
-            return ret
-        }
-    done
-    # No, only complete repositories
-    onlyrepos=(${${repos%:::*}/:/\\:})
-    _describe -t docker-repos "repositories" onlyrepos -qS : && ret=0
-
-    return ret
-}
-
-__docker_search() {
-    [[ $PREFIX = -* ]] && return 1
-    local cache_policy
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy
-    fi
-
-    local searchterm cachename
-    searchterm="${words[$CURRENT]%/}"
-    cachename=_docker-search-$searchterm
-
-    local expl
-    local -a result
-    if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
-        && ! _retrieve_cache ${cachename#_}; then
-        _message "Searching for ${searchterm}..."
-        result=(${${${(f)${:-"$(_call_program commands docker $docker_options search $searchterm)"$'\n'}}%% *}[2,-1]})
-        _store_cache ${cachename#_} result
-    fi
-    _wanted dockersearch expl 'available images' compadd -a result
-}
-
-__docker_get_log_options() {
-    [[ $PREFIX = -* ]] && return 1
-
-    integer ret=1
-    local log_driver=${opt_args[--log-driver]:-"all"}
-    local -a awslogs_options fluentd_options gelf_options journald_options json_file_options logentries_options syslog_options splunk_options
-
-    awslogs_options=("awslogs-region" "awslogs-group" "awslogs-stream")
-    fluentd_options=("env" "fluentd-address" "fluentd-async-connect" "fluentd-buffer-limit" "fluentd-retry-wait" "fluentd-max-retries" "labels" "tag")
-    gcplogs_options=("env" "gcp-log-cmd" "gcp-project" "labels")
-    gelf_options=("env" "gelf-address" "gelf-compression-level" "gelf-compression-type" "labels" "tag")
-    journald_options=("env" "labels" "tag")
-    json_file_options=("env" "labels" "max-file" "max-size")
-    logentries_options=("logentries-token")
-    syslog_options=("env" "labels" "syslog-address" "syslog-facility" "syslog-format" "syslog-tls-ca-cert" "syslog-tls-cert" "syslog-tls-key" "syslog-tls-skip-verify" "tag")
-    splunk_options=("env" "labels" "splunk-caname" "splunk-capath" "splunk-format" "splunk-gzip" "splunk-gzip-level" "splunk-index" "splunk-insecureskipverify" "splunk-source" "splunk-sourcetype" "splunk-token" "splunk-url" "splunk-verify-connection" "tag")
-
-    [[ $log_driver = (awslogs|all) ]] && _describe -t awslogs-options "awslogs options" awslogs_options "$@" && ret=0
-    [[ $log_driver = (fluentd|all) ]] && _describe -t fluentd-options "fluentd options" fluentd_options "$@" && ret=0
-    [[ $log_driver = (gcplogs|all) ]] && _describe -t gcplogs-options "gcplogs options" gcplogs_options "$@" && ret=0
-    [[ $log_driver = (gelf|all) ]] && _describe -t gelf-options "gelf options" gelf_options "$@" && ret=0
-    [[ $log_driver = (journald|all) ]] && _describe -t journald-options "journald options" journald_options "$@" && ret=0
-    [[ $log_driver = (json-file|all) ]] && _describe -t json-file-options "json-file options" json_file_options "$@" && ret=0
-    [[ $log_driver = (logentries|all) ]] && _describe -t logentries-options "logentries options" logentries_options "$@" && ret=0
-    [[ $log_driver = (syslog|all) ]] && _describe -t syslog-options "syslog options" syslog_options "$@" && ret=0
-    [[ $log_driver = (splunk|all) ]] && _describe -t splunk-options "splunk options" splunk_options "$@" && ret=0
-
-    return ret
-}
-
-__docker_complete_log_drivers() {
-    [[ $PREFIX = -*  ]] && return 1
-    integer ret=1
-    drivers=(awslogs etwlogs fluentd gcplogs gelf journald json-file none splunk syslog)
-    _describe -t log-drivers "log drivers" drivers && ret=0
-    return ret
-}
-
-__docker_complete_log_options() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (syslog-format)
-                syslog_format_opts=('rfc3164' 'rfc5424' 'rfc5424micro')
-                _describe -t syslog-format-opts "Syslog format Options" syslog_format_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        __docker_get_log_options -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_detach_keys() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    compset -P "*,"
-    keys=(${:-{a-z}})
-    ctrl_keys=(${:-ctrl-{{a-z},{@,'[','\\','^',']',_}}})
-    _describe -t detach_keys "[a-z]" keys -qS "," && ret=0
-    _describe -t detach_keys-ctrl "'ctrl-' + 'a-z @ [ \\\\ ] ^ _'" ctrl_keys -qS "," && ret=0
-}
-
-__docker_complete_pid() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local -a opts vopts
-
-    opts=('host')
-    vopts=('container')
-
-    if compset -P '*:'; then
-        case "${${words[-1]%:*}#*=}" in
-            (container)
-                __docker_complete_running_containers && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        _describe -t pid-value-opts "PID Options with value" vopts -qS ":" && ret=0
-        _describe -t pid-opts "PID Options" opts && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_runtimes() {
-    [[ $PREFIX = -*  ]] && return 1
-    integer ret=1
-
-    emulate -L zsh
-    setopt extendedglob
-    local -a runtimes_opts
-    runtimes_opts=(${(ps: :)${(f)${${"$(_call_program commands docker $docker_options info)"##*$'\n'Runtimes: }%%$'\n'^ *}}})
-    _describe -t runtimes-opts "runtimes options" runtimes_opts && ret=0
-}
-
-__docker_complete_ps_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (ancestor)
-                __docker_complete_images && ret=0
-                ;;
-            (before|since)
-                __docker_complete_containers && ret=0
-                ;;
-            (health)
-                health_opts=('healthy' 'none' 'starting' 'unhealthy')
-                _describe -t health-filter-opts "health filter options" health_opts && ret=0
-                ;;
-            (id)
-                __docker_complete_containers_ids && ret=0
-                ;;
-            (is-task)
-                _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
-                ;;
-            (name)
-                __docker_complete_containers_names && ret=0
-                ;;
-            (network)
-                __docker_complete_networks && ret=0
-                ;;
-            (status)
-                status_opts=('created' 'dead' 'exited' 'paused' 'restarting' 'running' 'removing')
-                _describe -t status-filter-opts "status filter options" status_opts && ret=0
-                ;;
-            (volume)
-                __docker_complete_volumes && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('ancestor' 'before' 'exited' 'health' 'id' 'label' 'name' 'network' 'since' 'status' 'volume')
-        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_search_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a boolean_opts opts
-
-    boolean_opts=('true' 'false')
-    opts=('is-automated' 'is-official' 'stars')
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (is-automated|is-official)
-                _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_images_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a boolean_opts opts
-
-    boolean_opts=('true' 'false')
-    opts=('before' 'dangling' 'label' 'reference' 'since')
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (before|reference|since)
-                __docker_complete_images && ret=0
-                ;;
-            (dangling)
-                _describe -t boolean-filter-opts "filter options" boolean_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_events_filter() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a opts
-
-    opts=('container' 'daemon' 'event' 'image' 'label' 'network' 'type' 'volume')
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (container)
-                __docker_complete_containers && ret=0
-                ;;
-            (daemon)
-                emulate -L zsh
-                setopt extendedglob
-                local -a daemon_opts
-                daemon_opts=(
-                    ${(f)${${"$(_call_program commands docker $docker_options info)"##*$'\n'Name: }%%$'\n'^ *}}
-                    ${${(f)${${"$(_call_program commands docker $docker_options info)"##*$'\n'ID: }%%$'\n'^ *}}//:/\\:}
-                )
-                _describe -t daemon-filter-opts "daemon filter options" daemon_opts && ret=0
-                ;;
-            (event)
-                local -a event_opts
-                event_opts=('attach' 'commit' 'connect' 'copy' 'create' 'delete' 'destroy' 'detach' 'die' 'disconnect' 'exec_create' 'exec_detach'
-                'exec_start' 'export' 'health_status' 'import' 'kill' 'load'  'mount' 'oom' 'pause' 'pull' 'push' 'reload' 'rename' 'resize' 'restart' 'save' 'start'
-                'stop' 'tag' 'top' 'unmount' 'unpause' 'untag' 'update')
-                _describe -t event-filter-opts "event filter options" event_opts && ret=0
-                ;;
-            (image)
-                __docker_complete_images && ret=0
-                ;;
-            (network)
-                __docker_complete_networks && ret=0
-                ;;
-            (type)
-                local -a type_opts
-                type_opts=('container' 'daemon' 'image' 'network' 'volume')
-                _describe -t type-filter-opts "type filter options" type_opts && ret=0
-                ;;
-            (volume)
-                __docker_complete_volumes && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_prune_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a opts
-
-    opts=('until')
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-# BO container
-
-__docker_container_commands() {
-    local -a _docker_container_subcommands
-    _docker_container_subcommands=(
-        "attach:Attach to a running container"
-        "commit:Create a new image from a container's changes"
-        "cp:Copy files/folders between a container and the local filesystem"
-        "create:Create a new container"
-        "diff:Inspect changes on a container's filesystem"
-        "exec:Run a command in a running container"
-        "export:Export a container's filesystem as a tar archive"
-        "inspect:Display detailed information on one or more containers"
-        "kill:Kill one or more running containers"
-        "logs:Fetch the logs of a container"
-        "ls:List containers"
-        "pause:Pause all processes within one or more containers"
-        "port:List port mappings or a specific mapping for the container"
-        "prune:Remove all stopped containers"
-        "rename:Rename a container"
-        "restart:Restart one or more containers"
-        "rm:Remove one or more containers"
-        "run:Run a command in a new container"
-        "start:Start one or more stopped containers"
-        "stats:Display a live stream of container(s) resource usage statistics"
-        "stop:Stop one or more running containers"
-        "top:Display the running processes of a container"
-        "unpause:Unpause all processes within one or more containers"
-        "update:Update configuration of one or more containers"
-        "wait:Block until one or more containers stop, then print their exit codes"
-    )
-    _describe -t docker-container-commands "docker container command" _docker_container_subcommands
-}
-
-__docker_container_subcommand() {
-    local -a _command_args opts_help opts_attach_exec_run_start opts_create_run opts_create_run_update
-    local expl help="--help"
-    integer ret=1
-
-    opts_attach_exec_run_start=(
-        "($help)--detach-keys=[Escape key sequence used to detach a container]:sequence:__docker_complete_detach_keys"
-    )
-    opts_create_run=(
-        "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
-        "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
-        "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: "
-        "($help)*--cap-add=[Add Linux capabilities]:capability: "
-        "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
-        "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: "
-        "($help)--cidfile=[Write the container ID to the file]:CID file:_files"
-        "($help)--cpus=[Number of CPUs (default 0.000)]:cpus: "
-        "($help)*--device=[Add a host device to the container]:device:_files"
-        "($help)*--device-read-bps=[Limit the read rate (bytes per second) from a device]:device:IO rate: "
-        "($help)*--device-read-iops=[Limit the read rate (IO per second) from a device]:device:IO rate: "
-        "($help)*--device-write-bps=[Limit the write rate (bytes per second) to a device]:device:IO rate: "
-        "($help)*--device-write-iops=[Limit the write rate (IO per second) to a device]:device:IO rate: "
-        "($help)--disable-content-trust[Skip image verification]"
-        "($help)*--dns=[Custom DNS servers]:DNS server: "
-        "($help)*--dns-option=[Custom DNS options]:DNS option: "
-        "($help)*--dns-search=[Custom DNS search domains]:DNS domains: "
-        "($help)*"{-e=,--env=}"[Environment variables]:environment variable: "
-        "($help)--entrypoint=[Overwrite the default entrypoint of the image]:entry point: "
-        "($help)*--env-file=[Read environment variables from a file]:environment file:_files"
-        "($help)*--expose=[Expose a port from the container without publishing it]: "
-        "($help)*--group=[Set one or more supplementary user groups for the container]:group:_groups"
-        "($help -h --hostname)"{-h=,--hostname=}"[Container host name]:hostname:_hosts"
-        "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]"
-        "($help)--init[Run an init inside the container that forwards signals and reaps processes]"
-        "($help)--ip=[Container IPv4 address]:IPv4: "
-        "($help)--ip6=[Container IPv6 address]:IPv6: "
-        "($help)--ipc=[IPC namespace to use]:IPC namespace: "
-        "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)"
-        "($help)*--link=[Add link to another container]:link:->link"
-        "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: "
-        "($help)*"{-l=,--label=}"[Container metadata]:label: "
-        "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers"
-        "($help)*--log-opt=[Log driver specific options]:log driver options:__docker_complete_log_options"
-        "($help)--mac-address=[Container MAC address]:MAC address: "
-        "($help)--name=[Container name]:name: "
-        "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)"
-        "($help)*--network-alias=[Add network-scoped alias for the container]:alias: "
-        "($help)--oom-kill-disable[Disable OOM Killer]"
-        "($help)--oom-score-adj[Tune the host's OOM preferences for containers (accepts -1000 to 1000)]"
-        "($help)--pids-limit[Tune container pids limit (set -1 for unlimited)]"
-        "($help -P --publish-all)"{-P,--publish-all}"[Publish all exposed ports]"
-        "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports"
-        "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid"
-        "($help)--privileged[Give extended privileges to this container]"
-        "($help)--read-only[Mount the container's root filesystem as read only]"
-        "($help)*--security-opt=[Security options]:security option: "
-        "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: "
-        "($help)--stop-timeout=[Timeout (in seconds) to stop a container]:time: "
-        "($help)*--sysctl=-[sysctl options]:sysctl: "
-        "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]"
-        "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
-        "($help)*--ulimit=[ulimit options]:ulimit: "
-        "($help)--userns=[Container user namespace]:user namespace:(host)"
-        "($help)--tmpfs[mount tmpfs]"
-        "($help)*-v[Bind mount a volume]:volume: "
-        "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)"
-        "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
-        "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
-    )
-    opts_create_run_update=(
-        "($help)--blkio-weight=[Block IO (relative weight), between 10 and 1000]:Block IO weight:(10 100 500 1000)"
-        "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)"
-        "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: "
-        "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: "
-        "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: "
-        "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: "
-        "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: "
-        "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: "
-        "($help)--kernel-memory=[Kernel memory limit in bytes]:Memory limit: "
-        "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: "
-        "($help)--memory-reservation=[Memory soft limit]:Memory limit: "
-        "($help)--memory-swap=[Total memory limit with swap]:Memory limit: "
-        "($help)--restart=[Restart policy]:restart policy:(no on-failure always unless-stopped)"
-    )
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (attach)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_attach_exec_run_start \
-                "($help)--no-stdin[Do not attach stdin]" \
-                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help -):containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (commit)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --author)"{-a=,--author=}"[Author]:author: " \
-                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m=,--message=}"[Commit message]:message: " \
-                "($help -p --pause)"{-p,--pause}"[Pause container during commit]" \
-                "($help -):container:__docker_complete_containers" \
-                "($help -): :__docker_complete_repositories_with_tags" && ret=0
-            ;;
-        (cp)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -L --follow-link)"{-L,--follow-link}"[Always follow symbol link]" \
-                "($help -)1:container:->container" \
-                "($help -)2:hostpath:_files" && ret=0
-            case $state in
-                (container)
-                    if compset -P "*:"; then
-                        _files && ret=0
-                    else
-                        __docker_complete_containers -qS ":" && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (create)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_create_run \
-                $opts_create_run_update \
-                "($help -): :__docker_complete_images" \
-                "($help -):command: _command_names -e" \
-                "($help -)*::arguments: _normal" && ret=0
-            case $state in
-                (link)
-                    if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
-                    else
-                        __docker_complete_running_containers -qS ":" && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (diff)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_complete_containers" && ret=0
-            ;;
-        (exec)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_attach_exec_run_start \
-                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
-                "($help)*"{-e=,--env=}"[Set environment variables]:environment variable: " \
-                "($help -i --interactive)"{-i,--interactive}"[Keep stdin open even if not attached]" \
-                "($help)--privileged[Give extended Linux capabilities to the command]" \
-                "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-tty]" \
-                "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users" \
-                "($help -):containers:__docker_complete_running_containers" \
-                "($help -)*::command:->anycommand" && ret=0
-            case $state in
-                (anycommand)
-                    shift 1 words
-                    (( CURRENT-- ))
-                    _normal && ret=0
-                    ;;
-            esac
-            ;;
-        (export)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -o --output)"{-o=,--output=}"[Write to a file, instead of stdout]:output file:_files" \
-                "($help -)*:containers:__docker_complete_containers" && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -s --size)"{-s,--size}"[Display total file sizes]" \
-                "($help -)*:containers:__docker_complete_containers" && ret=0
-            ;;
-        (kill)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -s --signal)"{-s=,--signal=}"[Signal to send]:signal:_signals" \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (logs)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--details[Show extra details provided to logs]" \
-                "($help -f --follow)"{-f,--follow}"[Follow log output]" \
-                "($help -s --since)"{-s=,--since=}"[Show logs since this timestamp]:timestamp: " \
-                "($help -t --timestamps)"{-t,--timestamps}"[Show timestamps]" \
-                "($help)--tail=[Output the last K lines]:lines:(1 10 20 50 all)" \
-                "($help -)*:containers:__docker_complete_containers" && ret=0
-            ;;
-        (ls|list)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all containers]" \
-                "($help)--before=[Show only container created before...]:containers:__docker_complete_containers" \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
-                "($help)--format=[Pretty-print containers using a Go template]:template: " \
-                "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
-                "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -s --size)"{-s,--size}"[Display total file sizes]" \
-                "($help)--since=[Show only containers created since...]:containers:__docker_complete_containers" && ret=0
-            ;;
-        (pause|unpause)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (port)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:containers:__docker_complete_running_containers" \
-                "($help -)2:port:_ports" && ret=0
-            ;;
-        (prune)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
-            ;;
-        (rename)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):old name:__docker_complete_containers" \
-                "($help -):new name: " && ret=0
-            ;;
-        (restart)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
-                "($help -)*:containers:__docker_complete_containers_ids" && ret=0
-            ;;
-        (rm)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force removal]" \
-                "($help -l --link)"{-l,--link}"[Remove the specified link and not the underlying container]" \
-                "($help -v --volumes)"{-v,--volumes}"[Remove the volumes associated to the container]" \
-                "($help -)*:containers:->values" && ret=0
-            case $state in
-                (values)
-                    if [[ ${words[(r)-f]} == -f || ${words[(r)--force]} == --force ]]; then
-                        __docker_complete_containers && ret=0
-                    else
-                        __docker_complete_stopped_containers && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (run)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_create_run \
-                $opts_create_run_update \
-                $opts_attach_exec_run_start \
-                "($help -d --detach)"{-d,--detach}"[Detached mode: leave the container running in the background]" \
-                "($help)--health-cmd=[Command to run to check health]:command: " \
-                "($help)--health-interval=[Time between running the check]:time: " \
-                "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)" \
-                "($help)--health-timeout=[Maximum time to allow one check to run]:time: " \
-                "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]" \
-                "($help)--rm[Remove intermediate containers when it exits]" \
-                "($help)--runtime=[Name of the runtime to be used for that container]:runtime:__docker_complete_runtimes" \
-                "($help)--sig-proxy[Proxy all received signals to the process (non-TTY mode only)]" \
-                "($help)--stop-signal=[Signal to kill a container]:signal:_signals" \
-                "($help)--storage-opt=[Storage driver options for the container]:storage options:->storage-opt" \
-                "($help -): :__docker_complete_images" \
-                "($help -):command: _command_names -e" \
-                "($help -)*::arguments: _normal" && ret=0
-            case $state in
-                (link)
-                    if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
-                    else
-                        __docker_complete_running_containers -qS ":" && ret=0
-                    fi
-                    ;;
-                (storage-opt)
-                    if compset -P "*="; then
-                        _message "value" && ret=0
-                    else
-                        opts=('size')
-                        _describe -t filter-opts "storage options" opts -qS "=" && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (start)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_attach_exec_run_start \
-                "($help -a --attach)"{-a,--attach}"[Attach container's stdout/stderr and forward all signals]" \
-                "($help -i --interactive)"{-i,--interactive}"[Attach container's stding]" \
-                "($help -)*:containers:__docker_complete_stopped_containers" && ret=0
-            ;;
-        (stats)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
-                "($help)--no-stream[Disable streaming stats and only pull the first result]" \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (stop)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -t --time)"{-t=,--time=}"[Number of seconds to try to stop for before killing the container]:seconds to before killing:(1 5 10 30 60)" \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (top)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:containers:__docker_complete_running_containers" \
-                "($help -)*:: :->ps-arguments" && ret=0
-            case $state in
-                (ps-arguments)
-                    _ps && ret=0
-                    ;;
-            esac
-            ;;
-        (update)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                opts_create_run_update \
-                "($help -)*: :->values" && ret=0
-            case $state in
-                (values)
-                    if [[ ${words[(r)--kernel-memory*]} = (--kernel-memory*) ]]; then
-                        __docker_complete_stopped_containers && ret=0
-                    else
-                        __docker_complete_containers && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (wait)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:containers:__docker_complete_running_containers" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO container
-
-# BO image
-
-__docker_image_commands() {
-    local -a _docker_image_subcommands
-    _docker_image_subcommands=(
-        "build:Build an image from a Dockerfile"
-        "history:Show the history of an image"
-        "import:Import the contents from a tarball to create a filesystem image"
-        "inspect:Display detailed information on one or more images"
-        "load:Load an image from a tar archive or STDIN"
-        "ls:List images"
-        "prune:Remove unused images"
-        "pull:Pull an image or a repository from a registry"
-        "push:Push an image or a repository to a registry"
-        "rm:Remove one or more images"
-        "save:Save one or more images to a tar archive (streamed to STDOUT by default)"
-        "tag:Tag an image into a repository"
-    )
-    _describe -t docker-image-commands "docker image command" _docker_image_subcommands
-}
-
-__docker_image_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (build)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*--build-arg=[Build-time variables]:<varname>=<value>: " \
-                "($help)*--cache-from=[Images to consider as cache sources]: :__docker_complete_repositories_with_tags" \
-                "($help -c --cpu-shares)"{-c=,--cpu-shares=}"[CPU shares (relative weight)]:CPU shares:(0 10 100 200 500 800 1000)" \
-                "($help)--cgroup-parent=[Parent cgroup for the container]:cgroup: " \
-                "($help)--compress[Compress the build context using gzip]" \
-                "($help)--cpu-period=[Limit the CPU CFS (Completely Fair Scheduler) period]:CPU period: " \
-                "($help)--cpu-quota=[Limit the CPU CFS (Completely Fair Scheduler) quota]:CPU quota: " \
-                "($help)--cpu-rt-period=[Limit the CPU real-time period]:CPU real-time period in microseconds: " \
-                "($help)--cpu-rt-runtime=[Limit the CPU real-time runtime]:CPU real-time runtime in microseconds: " \
-                "($help)--cpuset-cpus=[CPUs in which to allow execution]:CPUs: " \
-                "($help)--cpuset-mems=[MEMs in which to allow execution]:MEMs: " \
-                "($help)--disable-content-trust[Skip image verification]" \
-                "($help -f --file)"{-f=,--file=}"[Name of the Dockerfile]:Dockerfile:_files" \
-                "($help)--force-rm[Always remove intermediate containers]" \
-                "($help)--isolation=[Container isolation technology]:isolation:(default hyperv process)" \
-                "($help)*--label=[Set metadata for an image]:label=value: " \
-                "($help -m --memory)"{-m=,--memory=}"[Memory limit]:Memory limit: " \
-                "($help)--memory-swap=[Total memory limit with swap]:Memory limit: " \
-                "($help)--network=[Connect a container to a network]:network mode:(bridge none container host)" \
-                "($help)--no-cache[Do not use cache when building the image]" \
-                "($help)--pull[Attempt to pull a newer version of the image]" \
-                "($help -q --quiet)"{-q,--quiet}"[Suppress verbose build output]" \
-                "($help)--rm[Remove intermediate containers after a successful build]" \
-                "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: " \
-                "($help -t --tag)*"{-t=,--tag=}"[Repository, name and tag for the image]: :__docker_complete_repositories_with_tags" \
-                "($help)*--ulimit=[ulimit options]:ulimit: " \
-                "($help)--userns=[Container user namespace]:user namespace:(host)" \
-                "($help -):path or URL:_directories" && ret=0
-            ;;
-        (history)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -H --human)"{-H,--human}"[Print sizes and dates in human readable format]" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -)*: :__docker_complete_images" && ret=0
-            ;;
-        (import)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-c=,--change=}"[Apply Dockerfile instruction to the created image]:Dockerfile:_files" \
-                "($help -m --message)"{-m=,--message=}"[Commit message for imported image]:message: " \
-                "($help -):URL:(- http:// file://)" \
-                "($help -): :__docker_complete_repositories_with_tags" && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -)*:images:__docker_complete_images" && ret=0
-            ;;
-        (load)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -i --input)"{-i=,--input=}"[Read from tar archive file]:archive file:_files -g \"*.((tar|TAR)(.gz|.GZ|.Z|.bz2|.lzma|.xz|)|(tbz|tgz|txz))(-.)\"" \
-                "($help -q --quiet)"{-q,--quiet}"[Suppress the load output]" && ret=0
-            ;;
-        (ls|list)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Show all images]" \
-                "($help)--digests[Show digests]" \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only show numeric IDs]" \
-                "($help -): :__docker_complete_repositories" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_complete_images_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (prune)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Remove all unused images, not just dangling ones]" \
-                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
-            ;;
-        (pull)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all-tags)"{-a,--all-tags}"[Download all tagged images]" \
-                "($help)--disable-content-trust[Skip image verification]" \
-                "($help -):name:__docker_search" && ret=0
-            ;;
-        (push)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--disable-content-trust[Skip image signing]" \
-                "($help -): :__docker_complete_images" && ret=0
-            ;;
-        (rm)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force removal]" \
-                "($help)--no-prune[Do not delete untagged parents]" \
-                "($help -)*: :__docker_complete_images" && ret=0
-            ;;
-        (save)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -o --output)"{-o=,--output=}"[Write to file]:file:_files" \
-                "($help -)*: :__docker_complete_images" && ret=0
-            ;;
-        (tag)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):source:__docker_complete_images"\
-                "($help -):destination:__docker_complete_repositories_with_tags" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_container_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO image
-
-# BO network
-
-__docker_network_complete_ls_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (driver)
-                __docker_complete_info_plugins Network && ret=0
-                ;;
-            (id)
-                __docker_complete_networks_ids && ret=0
-                ;;
-            (name)
-                __docker_complete_networks_names && ret=0
-                ;;
-            (type)
-                type_opts=('builtin' 'custom')
-                _describe -t type-filter-opts "Type Filter Options" type_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('driver' 'id' 'label' 'name' 'type')
-        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_get_networks() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines networks
-
-    type=$1; shift
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options network ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Network ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NETWORK ID]},${end[NETWORK ID]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
-            s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}"
-            networks=($networks $s)
-        done
-    fi
-
-    # Names
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
-            s="$s, ${${line[${begin[SCOPE]},${end[SCOPE]}]}%% ##}"
-            networks=($networks $s)
-        done
-    fi
-
-    _describe -t networks-list "networks" networks "$@" && ret=0
-    return ret
-}
-
-__docker_complete_networks() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks all "$@"
-}
-
-__docker_complete_networks_ids() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks ids "$@"
-}
-
-__docker_complete_networks_names() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_get_networks names "$@"
-}
-
-__docker_network_commands() {
-    local -a _docker_network_subcommands
-    _docker_network_subcommands=(
-        "connect:Connect a container to a network"
-        "create:Creates a new network with a name specified by the user"
-        "disconnect:Disconnects a container from a network"
-        "inspect:Displays detailed information on a network"
-        "ls:Lists all the networks created by the user"
-        "prune:Remove all unused networks"
-        "rm:Deletes one or more networks"
-    )
-    _describe -t docker-network-commands "docker network command" _docker_network_subcommands
-}
-
-__docker_network_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (connect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*--alias=[Add network-scoped alias for the container]:alias: " \
-                "($help)--ip=[Container IPv4 address]:IPv4: " \
-                "($help)--ip6=[Container IPv6 address]:IPv6: " \
-                "($help)*--link=[Add a link to another container]:link:->link" \
-                "($help)*--link-local-ip=[Add a link-local address for the container]:IPv4/IPv6: " \
-                "($help -)1:network:__docker_complete_networks" \
-                "($help -)2:containers:__docker_complete_containers" && ret=0
-
-            case $state in
-                (link)
-                    if compset -P "*:"; then
-                        _wanted alias expl "Alias" compadd -E "" && ret=0
-                    else
-                        __docker_complete_running_containers -qS ":" && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (create)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help)--attachable[Enable manual container attachment]" \
-                "($help)*--aux-address[Auxiliary IPv4 or IPv6 addresses used by network driver]:key=IP: " \
-                "($help -d --driver)"{-d=,--driver=}"[Driver to manage the Network]:driver:(null host bridge overlay)" \
-                "($help)*--gateway=[IPv4 or IPv6 Gateway for the master subnet]:IP: " \
-                "($help)--internal[Restricts external access to the network]" \
-                "($help)*--ip-range=[Allocate container ip from a sub-range]:IP/mask: " \
-                "($help)--ipam-driver=[IP Address Management Driver]:driver:(default)" \
-                "($help)*--ipam-opt=[Custom IPAM plugin options]:opt=value: " \
-                "($help)--ipv6[Enable IPv6 networking]" \
-                "($help)*--label=[Set metadata on a network]:label=value: " \
-                "($help)*"{-o=,--opt=}"[Driver specific options]:opt=value: " \
-                "($help)*--subnet=[Subnet in CIDR format that represents a network segment]:IP/mask: " \
-                "($help -)1:Network Name: " && ret=0
-            ;;
-        (disconnect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:network:__docker_complete_networks" \
-                "($help -)2:containers:__docker_complete_containers" && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -)*:network:__docker_complete_networks" && ret=0
-            ;;
-        (ls)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--no-trunc[Do not truncate the output]" \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help)--format=[Pretty-print networks using a Go template]:template: " \
-                "($help -q --quiet)"{-q,--quiet}"[Only display numeric IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_network_complete_ls_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (prune)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
-            ;;
-        (rm)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:network:__docker_complete_networks" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_network_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO network
-
-# BO node
-
-__docker_node_complete_ls_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (id)
-                __docker_complete_nodes_ids && ret=0
-                ;;
-            (membership)
-                membership_opts=('accepted' 'pending' 'rejected')
-                _describe -t membership-opts "membership options" membership_opts && ret=0
-                ;;
-            (name)
-                __docker_complete_nodes_names && ret=0
-                ;;
-            (role)
-                role_opts=('manager' 'worker')
-                _describe -t role-opts "role options" role_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('id' 'label' 'membership' 'name' 'role')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_node_complete_ps_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (desired-state)
-                state_opts=('accepted' 'running')
-                _describe -t state-opts "desired state options" state_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('desired-state' 'id' 'label' 'name')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_nodes() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines nodes args
-
-    type=$1; shift
-    filter=$1; shift
-    [[ $filter != "none" ]] && args=("-f $filter")
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options node ls $args)"$'\n'}})
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Node ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[ID]},${end[ID]}]%% ##}"
-            nodes=($nodes $s)
-        done
-    fi
-
-    # Names
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-            nodes=($nodes $s)
-        done
-    fi
-
-    _describe -t nodes-list "nodes" nodes "$@" && ret=0
-    return ret
-}
-
-__docker_complete_nodes() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes all none "$@"
-}
-
-__docker_complete_nodes_ids() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes ids none "$@"
-}
-
-__docker_complete_nodes_names() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes names none "$@"
-}
-
-__docker_complete_pending_nodes() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes all "membership=pending" "$@"
-}
-
-__docker_complete_manager_nodes() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes all "role=manager" "$@"
-}
-
-__docker_complete_worker_nodes() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_nodes all "role=worker" "$@"
-}
-
-__docker_node_commands() {
-    local -a _docker_node_subcommands
-    _docker_node_subcommands=(
-        "demote:Demote a node as manager in the swarm"
-        "inspect:Display detailed information on one or more nodes"
-        "ls:List nodes in the swarm"
-        "promote:Promote a node as manager in the swarm"
-        "rm:Remove one or more nodes from the swarm"
-        "ps:List tasks running on one or more nodes, defaults to current node"
-        "update:Update a node"
-    )
-    _describe -t docker-node-commands "docker node command" _docker_node_subcommands
-}
-
-__docker_node_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (rm|remove)
-             _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force remove a node from the swarm]" \
-                "($help -)*:node:__docker_complete_pending_nodes" && ret=0
-            ;;
-        (demote)
-             _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:node:__docker_complete_manager_nodes" && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help)--pretty[Print the information in a human friendly format]" \
-                "($help -)*:node:__docker_complete_nodes" && ret=0
-            ;;
-        (ls|list)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_node_complete_ls_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (promote)
-             _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:node:__docker_complete_worker_nodes" && ret=0
-            ;;
-        (ps)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Display all instances]" \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help)--no-resolve[Do not map IDs to Names]" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -)*:node:__docker_complete_nodes" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_node_complete_ps_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (update)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--availability=[Availability of the node]:availability:(active pause drain)" \
-                "($help)*--label-add=[Add or update a node label]:key=value: " \
-                "($help)*--label-rm=[Remove a node label if exists]:label: " \
-                "($help)--role=[Role of the node]:role:(manager worker)" \
-                "($help -)1:node:__docker_complete_nodes" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_node_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO node
-
-# BO plugin
-
-__docker_complete_plugins() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines plugins
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options plugin ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Name
-    for line in $lines; do
-        s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-        s="$s:${(l:7:: :::)${${line[${begin[TAG]},${end[TAG]}]}%% ##}}"
-        plugins=($plugins $s)
-    done
-
-    _describe -t plugins-list "plugins" plugins "$@" && ret=0
-    return ret
-}
-
-__docker_plugin_commands() {
-    local -a _docker_plugin_subcommands
-    _docker_plugin_subcommands=(
-        "disable:Disable a plugin"
-        "enable:Enable a plugin"
-        "inspect:Return low-level information about a plugin"
-        "install:Install a plugin"
-        "ls:List plugins"
-        "push:Push a plugin"
-        "rm:Remove a plugin"
-        "set:Change settings for a plugin"
-    )
-    _describe -t docker-plugin-commands "docker plugin command" _docker_plugin_subcommands
-}
-
-__docker_plugin_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (disable|enable|inspect|ls|push|rm)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:plugin:__docker_complete_plugins" && ret=0
-            ;;
-        (install)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--alias=[Local name for plugin]:alias: " \
-                "($help -)1:plugin:__docker_complete_plugins" && ret=0
-            ;;
-        (set)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)1:plugin:__docker_complete_plugins" \
-                "($help-)*:key=value: " && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_plugin_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO plugin
-
-# BO secret
-
-__docker_secrets() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines secrets
-
-    type=$1; shift
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options secret ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[ID]},${end[ID]}]%% ##}"
-            secrets=($secrets $s)
-        done
-    fi
-
-    # Names
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-            secrets=($secrets $s)
-        done
-    fi
-
-    _describe -t secrets-list "secrets" secrets "$@" && ret=0
-    return ret
-}
-
-__docker_complete_secrets() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_secrets all "$@"
-}
-
-__docker_secret_commands() {
-    local -a _docker_secret_subcommands
-    _docker_secret_subcommands=(
-        "create:Create a secret using stdin as content"
-        "inspect:Display detailed information on one or more secrets"
-        "ls:List secrets"
-        "rm:Remove one or more secrets"
-    )
-    _describe -t docker-secret-commands "docker secret command" _docker_secret_subcommands
-}
-
-__docker_secret_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (create)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help)*"{-l=,--label=}"[Secret labels]:label: " \
-                "($help -):secret: " && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given Go template]:template: " \
-                "($help -)*:secret:__docker_complete_secrets" && ret=0
-            ;;
-        (ls|list)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
-            ;;
-        (rm|remove)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:secret:__docker_complete_secrets" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_secret_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO secret
-
-# BO service
-
-__docker_service_complete_ls_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (id)
-                __docker_complete_services_ids && ret=0
-                ;;
-            (name)
-                __docker_complete_services_names && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('id' 'label' 'name')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_service_complete_ps_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (desired-state)
-                state_opts=('accepted' 'running')
-                _describe -t state-opts "desired state options" state_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('desired-state' 'id' 'label' 'name')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_services() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines services
-
-    type=$1; shift
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options service ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Service ID
-    if [[ $type = (ids|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[ID]},${end[ID]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[IMAGE]},${end[IMAGE]}]}%% ##}}"
-            services=($services $s)
-        done
-    fi
-
-    # Names
-    if [[ $type = (names|all) ]]; then
-        for line in $lines; do
-            s="${line[${begin[NAME]},${end[NAME]}]%% ##}"
-            s="$s:${(l:7:: :::)${${line[${begin[IMAGE]},${end[IMAGE]}]}%% ##}}"
-            services=($services $s)
-        done
-    fi
-
-    _describe -t services-list "services" services "$@" && ret=0
-    return ret
-}
-
-__docker_complete_services() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_services all "$@"
-}
-
-__docker_complete_services_ids() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_services ids "$@"
-}
-
-__docker_complete_services_names() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_services names "$@"
-}
-
-__docker_service_commands() {
-    local -a _docker_service_subcommands
-    _docker_service_subcommands=(
-        "create:Create a new service"
-        "inspect:Display detailed information on one or more services"
-        "ls:List services"
-        "rm:Remove one or more services"
-        "scale:Scale one or multiple replicated services"
-        "ps:List the tasks of a service"
-        "update:Update a service"
-    )
-    _describe -t docker-service-commands "docker service command" _docker_service_subcommands
-}
-
-__docker_service_subcommand() {
-    local -a _command_args opts_help opts_create_update
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-    opts_create_update=(
-        "($help)*--constraint=[Placement constraints]:constraint: "
-        "($help)--endpoint-mode=[Placement constraints]:mode:(dnsrr vip)"
-        "($help)*"{-e=,--env=}"[Set environment variables]:env: "
-        "($help)--health-cmd=[Command to run to check health]:command: "
-        "($help)--health-interval=[Time between running the check]:time: "
-        "($help)--health-retries=[Consecutive failures needed to report unhealthy]:retries:(1 2 3 4 5)"
-        "($help)--health-timeout=[Maximum time to allow one check to run]:time: "
-        "($help)--hostname=[Service container hostname]:hostname: " \
-        "($help)*--label=[Service labels]:label: "
-        "($help)--limit-cpu=[Limit CPUs]:value: "
-        "($help)--limit-memory=[Limit Memory]:value: "
-        "($help)--log-driver=[Logging driver for service]:logging driver:__docker_complete_log_drivers"
-        "($help)*--log-opt=[Logging driver options]:log driver options:__docker_complete_log_options"
-        "($help)*--mount=[Attach a filesystem mount to the service]:mount: "
-        "($help)*--network=[Network attachments]:network: "
-        "($help)--no-healthcheck[Disable any container-specified HEALTHCHECK]"
-        "($help)*"{-p=,--publish=}"[Publish a port as a node port]:port: "
-        "($help)--replicas=[Number of tasks]:replicas: "
-        "($help)--reserve-cpu=[Reserve CPUs]:value: "
-        "($help)--reserve-memory=[Reserve Memory]:value: "
-        "($help)--restart-condition=[Restart when condition is met]:mode:(any none on-failure)"
-        "($help)--restart-delay=[Delay between restart attempts]:delay: "
-        "($help)--restart-max-attempts=[Maximum number of restarts before giving up]:max-attempts: "
-        "($help)--restart-window=[Window used to evaluate the restart policy]:window: "
-        "($help)*--secret=[Specify secrets to expose to the service]:secret:__docker_complete_secrets"
-        "($help)--stop-grace-period=[Time to wait before force killing a container]:grace period: "
-        "($help -t --tty)"{-t,--tty}"[Allocate a pseudo-TTY]"
-        "($help)--update-delay=[Delay between updates]:delay: "
-        "($help)--update-failure-action=[Action on update failure]:mode:(pause continue)"
-        "($help)--update-max-failure-ratio=[Failure rate to tolerate during an update]:fraction: "
-        "($help)--update-monitor=[Duration after each task update to monitor for failure]:window: "
-        "($help)--update-parallelism=[Maximum number of tasks updated simultaneously]:number: "
-        "($help -u --user)"{-u=,--user=}"[Username or UID]:user:_users"
-        "($help)--with-registry-auth[Send registry authentication details to swarm agents]"
-        "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
-    )
-
-    case "$words[1]" in
-        (create)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_create_update \
-                "($help)*--container-label=[Container labels]:label: " \
-                "($help)*--dns=[Set custom DNS servers]:DNS: " \
-                "($help)*--dns-option=[Set DNS options]:DNS option: " \
-                "($help)*--dns-search=[Set custom DNS search domains]:DNS search: " \
-                "($help)*--env-file=[Read environment variables from a file]:environment file:_files" \
-                "($help)--mode=[Service Mode]:mode:(global replicated)" \
-                "($help)--name=[Service name]:name: " \
-                "($help)*--publish=[Publish a port]:port: " \
-                "($help -): :__docker_complete_images" \
-                "($help -):command: _command_names -e" \
-                "($help -)*::arguments: _normal" && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help)--pretty[Print the information in a human friendly format]" \
-                "($help -)*:service:__docker_complete_services" && ret=0
-            ;;
-        (ls|list)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:->filter-options" \
-                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_service_complete_ls_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (rm|remove)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:service:__docker_complete_services" && ret=0
-            ;;
-        (scale)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -)*:service:->values" && ret=0
-            case $state in
-                (values)
-                    if compset -P '*='; then
-                        _message 'replicas' && ret=0
-                    else
-                        __docker_complete_services -qS "="
-                    fi
-                    ;;
-            esac
-            ;;
-        (ps)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help)--no-resolve[Do not map IDs to Names]" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -q --quiet)"{-q,--quiet}"[Only display task IDs]" \
-                "($help -)1:service:__docker_complete_services" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_service_complete_ps_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (update)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                $opts_create_update \
-                "($help)--arg=[Service command args]:arguments: _normal" \
-                "($help)*--container-label-add=[Add or update container labels]:label: " \
-                "($help)*--container-label-rm=[Remove a container label by its key]:label: " \
-                "($help)*--dns-add=[Add or update custom DNS servers]:DNS: " \
-                "($help)*--dns-rm=[Remove custom DNS servers]:DNS: " \
-                "($help)*--dns-option-add=[Add or update DNS options]:DNS option: " \
-                "($help)*--dns-option-rm=[Remove DNS options]:DNS option: " \
-                "($help)*--dns-search-add=[Add or update custom DNS search domains]:DNS search: " \
-                "($help)*--dns-search-rm=[Remove DNS search domains]:DNS search: " \
-                "($help)--force[Force update]" \
-                "($help)*--group-add=[Add additional supplementary user groups to the container]:group:_groups" \
-                "($help)*--group-rm=[Remove previously added supplementary user groups from the container]:group:_groups" \
-                "($help)--image=[Service image tag]:image:__docker_complete_repositories" \
-                "($help)*--publish-add=[Add or update a port]:port: " \
-                "($help)*--publish-rm=[Remove a port(target-port mandatory)]:port: " \
-                "($help)--rollback[Rollback to previous specification]" \
-                "($help -)1:service:__docker_complete_services" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_service_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO service
-
-# BO stack
-
-__docker_stack_complete_ps_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (desired-state)
-                state_opts=('accepted' 'running')
-                _describe -t state-opts "desired state options" state_opts && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('desired-state' 'id' 'name')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_stack_complete_services_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('id' 'label' 'name')
-        _describe -t filter-opts "filter options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_stacks() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    local line s
-    declare -a lines stacks
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options stack ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Service ID
-    for line in $lines; do
-        s="${line[${begin[ID]},${end[ID]}]%% ##}"
-        stacks=($stacks $s)
-    done
-
-    _describe -t stacks-list "stacks" stacks "$@" && ret=0
-    return ret
-}
-
-__docker_complete_stacks() {
-    [[ $PREFIX = -* ]] && return 1
-    __docker_stacks "$@"
-}
-
-__docker_stack_commands() {
-    local -a _docker_stack_subcommands
-    _docker_stack_subcommands=(
-        "deploy:Deploy a new stack or update an existing stack"
-        "ls:List stacks"
-        "ps:List the tasks in the stack"
-        "rm:Remove the stack"
-        "services:List the services in the stack"
-    )
-    _describe -t docker-stack-commands "docker stack command" _docker_stack_subcommands
-}
-
-__docker_stack_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (deploy|up)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--bundle-file=[Path to a Distributed Application Bundle file]:dab:_files -g \"*.dab\"" \
-                "($help -c --compose-file)"{-c=,--compose-file=}"[Path to a Compose file]:compose file:_files -g \"*.(yml|yaml)\"" \
-                "($help)--with-registry-auth[Send registry authentication details to Swarm agents]" \
-                "($help -):stack:__docker_complete_stacks" && ret=0
-            ;;
-        (ls|list)
-            _arguments $(__docker_arguments) \
-                $opts_help && ret=0
-            ;;
-        (ps)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Display all tasks]" \
-                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_ps_filters" \
-                "($help)--no-resolve[Do not map IDs to Names]" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -):stack:__docker_complete_stacks" && ret=0
-            ;;
-        (rm|remove|down)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -):stack:__docker_complete_stacks" && ret=0
-            ;;
-        (services)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \
-                "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
-                "($help -):stack:__docker_complete_stacks" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_stack_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO stack
-
-# BO swarm
-
-__docker_swarm_commands() {
-    local -a _docker_swarm_subcommands
-    _docker_swarm_subcommands=(
-        "init:Initialize a swarm"
-        "join:Join a swarm as a node and/or manager"
-        "join-token:Manage join tokens"
-        "leave:Leave a swarm"
-        "update:Update the swarm"
-    )
-    _describe -t docker-swarm-commands "docker swarm command" _docker_swarm_subcommands
-}
-
-__docker_swarm_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (init)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--advertise-addr[Advertised address]:ip\:port: " \
-                "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
-                "($help)--force-new-cluster[Force create a new cluster from current state]" \
-                "($help)--listen-addr=[Listen address]:ip\:port: " \
-                "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \
-                "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \
-                "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
-            ;;
-        (join)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help)--advertise-addr=[Advertised address]:ip\:port: " \
-                "($help)--availability=[Availability of the node]:availability:(active drain pause)" \
-                "($help)--listen-addr=[Listen address]:ip\:port: " \
-                "($help)--token=[Token for entry into the swarm]:secret: " \
-                "($help -):host\:port: " && ret=0
-            ;;
-        (join-token)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -q --quiet)"{-q,--quiet}"[Only display token]" \
-                "($help)--rotate[Rotate join token]" \
-                "($help -):role:(manager worker)" && ret=0
-            ;;
-        (leave)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force this node to leave the swarm, ignoring warnings]" && ret=0
-            ;;
-        (update)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)--cert-expiry=[Validity period for node certificates]:duration: " \
-                "($help)*--external-ca=[Specifications of one or more certificate signing endpoints]:endpoint: " \
-                "($help)--dispatcher-heartbeat=[Dispatcher heartbeat period]:duration: " \
-                "($help)--max-snapshots[Number of additional Raft snapshots to retain]" \
-                "($help)--snapshot-interval[Number of log entries between Raft snapshots]" \
-                "($help)--task-history-limit=[Task history retention limit]:limit: " && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_network_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO swarm
-
-# BO system
-
-__docker_system_commands() {
-    local -a _docker_system_subcommands
-    _docker_system_subcommands=(
-        "df:Show docker filesystem usage"
-        "events:Get real time events from the server"
-        "info:Display system-wide information"
-        "prune:Remove unused data"
-    )
-    _describe -t docker-system-commands "docker system command" _docker_system_subcommands
-}
-
-__docker_system_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (df)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -v --verbose)"{-v,--verbose}"[Show detailed information on space usage]" && ret=0
-            ;;
-        (events)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_events_filter" \
-                "($help)--since=[Events created since this timestamp]:timestamp: " \
-                "($help)--until=[Events created until this timestamp]:timestamp: " \
-                "($help)--format=[Format the output using the given go template]:template: " && ret=0
-            ;;
-        (info)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
-            ;;
-        (prune)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -a --all)"{-a,--all}"[Remove all unused data, not just dangling ones]" \
-                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO system
-
-# BO volume
-
-__docker_volume_complete_ls_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (dangling)
-                dangling_opts=('true' 'false')
-                _describe -t dangling-filter-opts "Dangling Filter Options" dangling_opts && ret=0
-                ;;
-            (driver)
-                __docker_complete_info_plugins Volume && ret=0
-                ;;
-            (name)
-                __docker_complete_volumes && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('dangling' 'driver' 'label' 'name')
-        _describe -t filter-opts "Filter Options" opts -qS "=" && ret=0
-    fi
-
-    return ret
-}
-
-__docker_complete_volumes() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-    declare -a lines volumes
-
-    lines=(${(f)${:-"$(_call_program commands docker $docker_options volume ls)"$'\n'}})
-
-    # Parse header line to find columns
-    local i=1 j=1 k header=${lines[1]}
-    declare -A begin end
-    while (( j < ${#header} - 1 )); do
-        i=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 1 ))
-        j=$(( i + ${${header[$i,-1]}[(i)  ]} - 1 ))
-        k=$(( j + ${${header[$j,-1]}[(i)[^ ]]} - 2 ))
-        begin[${header[$i,$((j-1))]}]=$i
-        end[${header[$i,$((j-1))]}]=$k
-    done
-    end[${header[$i,$((j-1))]}]=-1
-    lines=(${lines[2,-1]})
-
-    # Names
-    local line s
-    for line in $lines; do
-        s="${line[${begin[VOLUME NAME]},${end[VOLUME NAME]}]%% ##}"
-        s="$s:${(l:7:: :::)${${line[${begin[DRIVER]},${end[DRIVER]}]}%% ##}}"
-        volumes=($volumes $s)
-    done
-
-    _describe -t volumes-list "volumes" volumes && ret=0
-    return ret
-}
-
-__docker_volume_commands() {
-    local -a _docker_volume_subcommands
-    _docker_volume_subcommands=(
-        "create:Create a volume"
-        "inspect:Display detailed information on one or more volumes"
-        "ls:List volumes"
-        "prune:Remove all unused volumes"
-        "rm:Remove one or more volumes"
-    )
-    _describe -t docker-volume-commands "docker volume command" _docker_volume_subcommands
-}
-
-__docker_volume_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (create)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help -d --driver)"{-d=,--driver=}"[Volume driver name]:Driver name:(local)" \
-                "($help)*--label=[Set metadata for a volume]:label=value: " \
-                "($help)*"{-o=,--opt=}"[Driver specific options]:Driver option: " \
-                "($help -)1:Volume name: " && ret=0
-            ;;
-        (inspect)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -)1:volume:__docker_complete_volumes" && ret=0
-            ;;
-        (ls)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Provide filter values]:filter:->filter-options" \
-                "($help)--format=[Pretty-print volumes using a Go template]:template: " \
-                "($help -q --quiet)"{-q,--quiet}"[Only display volume names]" && ret=0
-            case $state in
-                (filter-options)
-                    __docker_volume_complete_ls_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (prune)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
-            ;;
-        (rm)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --force)"{-f,--force}"[Force the removal of one or more volumes]" \
-                "($help -):volume:__docker_complete_volumes" && ret=0
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_volume_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-# EO volume
-
-__docker_caching_policy() {
-  oldp=( "$1"(Nmh+1) )     # 1 hour
-  (( $#oldp ))
-}
-
-__docker_commands() {
-    local cache_policy
-
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __docker_caching_policy
-    fi
-
-    if ( [[ ${+_docker_subcommands} -eq 0 ]] || _cache_invalid docker_subcommands) \
-        && ! _retrieve_cache docker_subcommands;
-    then
-        local -a lines
-        lines=(${(f)"$(_call_program commands docker 2>&1)"})
-        _docker_subcommands=(${${${(M)${lines[$((${lines[(i)*Commands:]} + 1)),-1]}:# *}## #}/ ##/:})
-        _docker_subcommands=($_docker_subcommands 'daemon:Enable daemon mode' 'help:Show help for a command')
-        (( $#_docker_subcommands > 2 )) && _store_cache docker_subcommands _docker_subcommands
-    fi
-    _describe -t docker-commands "docker command" _docker_subcommands
-}
-
-__docker_subcommand() {
-    local -a _command_args opts_help
-    local expl help="--help"
-    integer ret=1
-
-    opts_help=("(: -)--help[Print usage]")
-
-    case "$words[1]" in
-        (attach|commit|cp|create|diff|exec|export|kill|logs|pause|unpause|port|rename|restart|rm|run|start|stats|stop|top|update|wait)
-            __docker_container_subcommand && ret=0
-            ;;
-        (build|history|import|load|pull|push|save|tag)
-            __docker_image_subcommand && ret=0
-            ;;
-        (container)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_container_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_container_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (daemon)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help)*--add-runtime=[Register an additional OCI compatible runtime]:runtime:__docker_complete_runtimes" \
-                "($help)--api-cors-header=[CORS headers in the Engine API]:CORS headers: " \
-                "($help)*--authorization-plugin=[Authorization plugins to load]" \
-                "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
-                "($help)--bip=[Network bridge IP]:IP address: " \
-                "($help)--cgroup-parent=[Parent cgroup for all containers]:cgroup: " \
-                "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \
-                "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
-                "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
-                "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
-                "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
-                "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
-                "($help)--default-gateway[Container default gateway IPv4 address]:IPv4 address: " \
-                "($help)--default-gateway-v6[Container default gateway IPv6 address]:IPv6 address: " \
-                "($help)*--default-ulimit=[Default ulimits for containers]:ulimit: " \
-                "($help)--disable-legacy-registry[Disable contacting legacy registries]" \
-                "($help)*--dns=[DNS server to use]:DNS: " \
-                "($help)*--dns-opt=[DNS options to use]:DNS option: " \
-                "($help)*--dns-search=[DNS search domains to use]:DNS search: " \
-                "($help)*--exec-opt=[Runtime execution options]:runtime execution options: " \
-                "($help)--exec-root=[Root directory for execution state files]:path:_directories" \
-                "($help)--experimental[Enable experimental features]" \
-                "($help)--fixed-cidr=[IPv4 subnet for fixed IPs]:IPv4 subnet: " \
-                "($help)--fixed-cidr-v6=[IPv6 subnet for fixed IPs]:IPv6 subnet: " \
-                "($help -G --group)"{-G=,--group=}"[Group for the unix socket]:group:_groups" \
-                "($help -g --graph)"{-g=,--graph=}"[Root of the Docker runtime]:path:_directories" \
-                "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \
-                "($help)--icc[Enable inter-container communication]" \
-                "($help)--init[Run an init inside containers to forward signals and reap processes]" \
-                "($help)--init-path=[Path to the docker-init binary]:docker-init binary:_files" \
-                "($help)*--insecure-registry=[Enable insecure registry communication]:registry: " \
-                "($help)--ip=[Default IP when binding container ports]" \
-                "($help)--ip-forward[Enable net.ipv4.ip_forward]" \
-                "($help)--ip-masq[Enable IP masquerading]" \
-                "($help)--iptables[Enable addition of iptables rules]" \
-                "($help)--ipv6[Enable IPv6 networking]" \
-                "($help -l --log-level)"{-l=,--log-level=}"[Logging level]:level:(debug info warn error fatal)" \
-                "($help)*--label=[Key=value labels]:label: " \
-                "($help)--live-restore[Enable live restore of docker when containers are still running]" \
-                "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" \
-                "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_complete_log_options" \
-                "($help)--max-concurrent-downloads[Set the max concurrent downloads for each pull]" \
-                "($help)--max-concurrent-uploads[Set the max concurrent uploads for each push]" \
-                "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \
-                "($help)--oom-score-adjust=[Set the oom_score_adj for the daemon]:oom-score:(-500)" \
-                "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
-                "($help)--raw-logs[Full timestamps without ANSI coloring]" \
-                "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \
-                "($help)--seccomp-profile=[Path to seccomp profile]:path:_files -g \"*.json\"" \
-                "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs btrfs devicemapper overlay overlay2 vfs zfs)" \
-                "($help)--selinux-enabled[Enable selinux support]" \
-                "($help)--shutdown-timeout=[Set the shutdown timeout value in seconds]:time: " \
-                "($help)*--storage-opt=[Storage driver options]:storage driver options: " \
-                "($help)--tls[Use TLS]" \
-                "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g \"*.(pem|crt)\"" \
-                "($help)--tlscert=[Path to TLS certificate file]:PEM file:_files -g \"*.(pem|crt)\"" \
-                "($help)--tlskey=[Path to TLS key file]:Key file:_files -g \"*.(pem|key)\"" \
-                "($help)--tlsverify[Use TLS and verify the remote]" \
-                "($help)--userns-remap=[User/Group setting for user namespaces]:user\:group:->users-groups" \
-                "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
-                "($help)--userland-proxy-path=[Path to the userland proxy binary]:binary:_files" && ret=0
-
-            case $state in
-                (cluster-store)
-                    if compset -P '*://'; then
-                        _message 'host:port' && ret=0
-                    else
-                        store=('consul' 'etcd' 'zk')
-                        _describe -t cluster-store "Cluster Store" store -qS "://" && ret=0
-                    fi
-                    ;;
-                (cluster-store-options)
-                    if compset -P '*='; then
-                        _files && ret=0
-                    else
-                        opts=('discovery.heartbeat' 'discovery.ttl' 'kv.cacertfile' 'kv.certfile' 'kv.keyfile' 'kv.path')
-                        _describe -t cluster-store-opts "Cluster Store Options" opts -qS "=" && ret=0
-                    fi
-                    ;;
-                (users-groups)
-                    if compset -P '*:'; then
-                        _groups && ret=0
-                    else
-                        _describe -t userns-default "default Docker user management" '(default)' && ret=0
-                        _users && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (events|info)
-            __docker_system_subcommand && ret=0
-            ;;
-        (image)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_image_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_image_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (images)
-            words[1]='ls'
-            __docker_image_subcommand && ret=0
-            ;;
-        (inspect)
-            local state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " \
-                "($help -s --size)"{-s,--size}"[Display total file sizes if the type is container]" \
-                "($help)--type=[Return JSON for specified type]:type:(container image network node plugin service volume)" \
-                "($help -)*: :->values" && ret=0
-
-            case $state in
-                (values)
-                    if [[ ${words[(r)--type=container]} == --type=container ]]; then
-                        __docker_complete_containers && ret=0
-                    elif [[ ${words[(r)--type=image]} == --type=image ]]; then
-                        __docker_complete_images && ret=0
-                    elif [[ ${words[(r)--type=network]} == --type=network ]]; then
-                        __docker_complete_networks && ret=0
-                    elif [[ ${words[(r)--type=node]} == --type=node ]]; then
-                        __docker_complete_nodes && ret=0
-                    elif [[ ${words[(r)--type=plugin]} == --type=plugin ]]; then
-                        __docker_complete_plugins && ret=0
-                    elif [[ ${words[(r)--type=service]} == --type=service ]]; then
-                        __docker_complete_services && ret=0
-                    elif [[ ${words[(r)--type=volume]} == --type=volume ]]; then
-                        __docker_complete_volumes && ret=0
-                    else
-                        __docker_complete_containers
-                        __docker_complete_images
-                        __docker_complete_networks
-                        __docker_complete_nodes
-                        __docker_complete_plugins
-                        __docker_complete_services
-                        __docker_complete_volumes && ret=0
-                    fi
-                    ;;
-            esac
-            ;;
-        (login)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help -p --password)"{-p=,--password=}"[Password]:password: " \
-                "($help -u --user)"{-u=,--user=}"[Username]:username: " \
-                "($help -)1:server: " && ret=0
-            ;;
-        (logout)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help -)1:server: " && ret=0
-            ;;
-        (network)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_network_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_network_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (node)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_node_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_node_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (plugin)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_plugin_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_plugin_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (ps)
-            words[1]='ls'
-            __docker_container_subcommand && ret=0
-            ;;
-        (rmi)
-            words[1]='rm'
-            __docker_image_subcommand && ret=0
-            ;;
-        (search)
-            _arguments $(__docker_arguments) -A '-*' \
-                $opts_help \
-                "($help)*"{-f=,--filter=}"[Filter values]:filter:->filter-options" \
-                "($help)--limit=[Maximum returned search results]:limit:(1 5 10 25 50)" \
-                "($help)--no-trunc[Do not truncate output]" \
-                "($help -):term: " && ret=0
-
-            case $state in
-                (filter-options)
-                    __docker_complete_search_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (secret)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_secret_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_secret_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (service)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_service_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_service_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (stack)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_stack_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_stack_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (swarm)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_swarm_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_swarm_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (system)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_system_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_system_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (version)
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -f --format)"{-f=,--format=}"[Format the output using the given go template]:template: " && ret=0
-            ;;
-        (volume)
-            local curcontext="$curcontext" state
-            _arguments $(__docker_arguments) \
-                $opts_help \
-                "($help -): :->command" \
-                "($help -)*:: :->option-or-argument" && ret=0
-
-            case $state in
-                (command)
-                    __docker_volume_commands && ret=0
-                    ;;
-                (option-or-argument)
-                    curcontext=${curcontext%:*:*}:docker-${words[-1]}:
-                    __docker_volume_subcommand && ret=0
-                    ;;
-            esac
-            ;;
-        (help)
-            _arguments $(__docker_arguments) ":subcommand:__docker_commands" && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-_docker() {
-    # Support for subservices, which allows for `compdef _docker docker-shell=_docker_containers`.
-    # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
-    if [[ $service != docker ]]; then
-        _call_function - _$service
-        return
-    fi
-
-    local curcontext="$curcontext" state line help="-h --help"
-    integer ret=1
-    typeset -A opt_args
-
-    _arguments $(__docker_arguments) -C \
-        "(: -)"{-h,--help}"[Print usage]" \
-        "($help)--config[Location of client config files]:path:_directories" \
-        "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
-        "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \
-        "($help -l --log-level)"{-l=,--log-level=}"[Logging level]:level:(debug info warn error fatal)" \
-        "($help)--tls[Use TLS]" \
-        "($help)--tlscacert=[Trust certs signed only by this CA]:PEM file:_files -g "*.(pem|crt)"" \
-        "($help)--tlscert=[Path to TLS certificate file]:PEM file:_files -g "*.(pem|crt)"" \
-        "($help)--tlskey=[Path to TLS key file]:Key file:_files -g "*.(pem|key)"" \
-        "($help)--tlsverify[Use TLS and verify the remote]" \
-        "($help)--userland-proxy[Use userland proxy for loopback traffic]" \
-        "($help -v --version)"{-v,--version}"[Print version information and quit]" \
-        "($help -): :->command" \
-        "($help -)*:: :->option-or-argument" && ret=0
-
-    local host=${opt_args[-H]}${opt_args[--host]}
-    local config=${opt_args[--config]}
-    local docker_options="${host:+--host $host} ${config:+--config $config}"
-
-    case $state in
-        (command)
-            __docker_commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*:*}:docker-$words[1]:
-            __docker_subcommand && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-_dockerd() {
-    integer ret=1
-    words[1]='daemon'
-    __docker_subcommand && ret=0
-    return ret
-}
-
-_docker "$@"
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 4
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
-# vim: ft=zsh sw=4 ts=4 et
diff --git a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/README.md b/installer/vendor/github.com/docker/docker/contrib/desktop-integration/README.md
deleted file mode 100644
index 85a01b9ee9..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-Desktop Integration
-===================
-
-The ./contrib/desktop-integration contains examples of typical dockerized
-desktop applications.
-
-Examples
-========
-
-* Chromium: ./chromium/Dockerfile shows a way to dockerize a common application
-* Gparted: ./gparted/Dockerfile shows a way to dockerize a common application w devices
diff --git a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/chromium/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/desktop-integration/chromium/Dockerfile
deleted file mode 100644
index 5cacd1f999..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/chromium/Dockerfile
+++ /dev/null
@@ -1,36 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create chromium container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
-# COMMENTS:
-#   This file describes how to build a Chromium container with all
-#   dependencies installed. It uses native X11 unix socket.
-#   Tested on Debian Jessie
-# USAGE:
-#   # Download Chromium Dockerfile
-#   wget http://raw.githubusercontent.com/docker/docker/master/contrib/desktop-integration/chromium/Dockerfile
-#
-#   # Build chromium image
-#   docker build -t chromium .
-#
-#   # Run stateful data-on-host chromium. For ephemeral, remove -v /data/chromium:/data
-#   docker run -v /data/chromium:/data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
-
-#   # To run stateful dockerized data containers
-#   docker run --volumes-from chromium-data -v /tmp/.X11-unix:/tmp/.X11-unix \
-#   -e DISPLAY=unix$DISPLAY chromium
-
-# Base docker image
-FROM debian:jessie
-MAINTAINER Jessica Frazelle <jess@docker.com>
-
-# Install Chromium
-RUN apt-get update && apt-get install -y \
-    chromium \
-    chromium-l10n \
-    libcanberra-gtk-module \
-    libexif-dev \
-    --no-install-recommends
-
-# Autorun chromium
-CMD ["/usr/bin/chromium", "--no-sandbox", "--user-data-dir=/data"]
diff --git a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/gparted/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/desktop-integration/gparted/Dockerfile
deleted file mode 100644
index 3ddb23208d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/desktop-integration/gparted/Dockerfile
+++ /dev/null
@@ -1,31 +0,0 @@
-# VERSION:        0.1
-# DESCRIPTION:    Create gparted container with its dependencies
-# AUTHOR:         Jessica Frazelle <jess@docker.com>
-# COMMENTS:
-#   This file describes how to build a gparted container with all
-#   dependencies installed. It uses native X11 unix socket.
-#   Tested on Debian Jessie
-# USAGE:
-#   # Download gparted Dockerfile
-#   wget http://raw.githubusercontent.com/docker/docker/master/contrib/desktop-integration/gparted/Dockerfile
-#
-#   # Build gparted image
-#   docker build -t gparted .
-#
-#   docker run -v /tmp/.X11-unix:/tmp/.X11-unix \
-#     --device=/dev/sda:/dev/sda \
-#     -e DISPLAY=unix$DISPLAY gparted
-#
-
-# Base docker image
-FROM debian:jessie
-MAINTAINER Jessica Frazelle <jess@docker.com>
-
-# Install Gparted and its dependencies
-RUN apt-get update && apt-get install -y \
-    gparted \
-    libcanberra-gtk-module \
-    --no-install-recommends
-
-# Autorun gparted
-CMD ["/usr/sbin/gparted"]
diff --git a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/README.md b/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/README.md
deleted file mode 100644
index 6c54d5995f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Docker device tool for devicemapper storage driver backend
-===================
-
-The ./contrib/docker-device-tool contains a tool to manipulate devicemapper thin-pool.
-
-Compile
-========
-
-    $ make shell
-    ## inside build container
-    $ go build contrib/docker-device-tool/device_tool.go
-
-    # if devicemapper version is old and compilation fails, compile with `libdm_no_deferred_remove` tag
-    $ go build -tags libdm_no_deferred_remove contrib/docker-device-tool/device_tool.go
diff --git a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool.go b/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool.go
deleted file mode 100644
index 906d064df6..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// +build !windows,!solaris
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"path"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver/devmapper"
-	"github.com/docker/docker/pkg/devicemapper"
-)
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "Usage: %s <flags>  [status] | [list] | [device id]  | [resize new-pool-size] | [snap new-id base-id] | [remove id] | [mount id mountpoint]\n", os.Args[0])
-	flag.PrintDefaults()
-	os.Exit(1)
-}
-
-func byteSizeFromString(arg string) (int64, error) {
-	digits := ""
-	rest := ""
-	last := strings.LastIndexAny(arg, "0123456789")
-	if last >= 0 {
-		digits = arg[:last+1]
-		rest = arg[last+1:]
-	}
-
-	val, err := strconv.ParseInt(digits, 10, 64)
-	if err != nil {
-		return val, err
-	}
-
-	rest = strings.ToLower(strings.TrimSpace(rest))
-
-	var multiplier int64 = 1
-	switch rest {
-	case "":
-		multiplier = 1
-	case "k", "kb":
-		multiplier = 1024
-	case "m", "mb":
-		multiplier = 1024 * 1024
-	case "g", "gb":
-		multiplier = 1024 * 1024 * 1024
-	case "t", "tb":
-		multiplier = 1024 * 1024 * 1024 * 1024
-	default:
-		return 0, fmt.Errorf("Unknown size unit: %s", rest)
-	}
-
-	return val * multiplier, nil
-}
-
-func main() {
-	root := flag.String("r", "/var/lib/docker", "Docker root dir")
-	flDebug := flag.Bool("D", false, "Debug mode")
-
-	flag.Parse()
-
-	if *flDebug {
-		os.Setenv("DEBUG", "1")
-		logrus.SetLevel(logrus.DebugLevel)
-	}
-
-	if flag.NArg() < 1 {
-		usage()
-	}
-
-	args := flag.Args()
-
-	home := path.Join(*root, "devicemapper")
-	devices, err := devmapper.NewDeviceSet(home, false, nil, nil, nil)
-	if err != nil {
-		fmt.Println("Can't initialize device mapper: ", err)
-		os.Exit(1)
-	}
-
-	switch args[0] {
-	case "status":
-		status := devices.Status()
-		fmt.Printf("Pool name: %s\n", status.PoolName)
-		fmt.Printf("Data Loopback file: %s\n", status.DataLoopback)
-		fmt.Printf("Metadata Loopback file: %s\n", status.MetadataLoopback)
-		fmt.Printf("Sector size: %d\n", status.SectorSize)
-		fmt.Printf("Data use: %d of %d (%.1f %%)\n", status.Data.Used, status.Data.Total, 100.0*float64(status.Data.Used)/float64(status.Data.Total))
-		fmt.Printf("Metadata use: %d of %d (%.1f %%)\n", status.Metadata.Used, status.Metadata.Total, 100.0*float64(status.Metadata.Used)/float64(status.Metadata.Total))
-		break
-	case "list":
-		ids := devices.List()
-		sort.Strings(ids)
-		for _, id := range ids {
-			fmt.Println(id)
-		}
-		break
-	case "device":
-		if flag.NArg() < 2 {
-			usage()
-		}
-		status, err := devices.GetDeviceStatus(args[1])
-		if err != nil {
-			fmt.Println("Can't get device info: ", err)
-			os.Exit(1)
-		}
-		fmt.Printf("Id: %d\n", status.DeviceID)
-		fmt.Printf("Size: %d\n", status.Size)
-		fmt.Printf("Transaction Id: %d\n", status.TransactionID)
-		fmt.Printf("Size in Sectors: %d\n", status.SizeInSectors)
-		fmt.Printf("Mapped Sectors: %d\n", status.MappedSectors)
-		fmt.Printf("Highest Mapped Sector: %d\n", status.HighestMappedSector)
-		break
-	case "resize":
-		if flag.NArg() < 2 {
-			usage()
-		}
-
-		size, err := byteSizeFromString(args[1])
-		if err != nil {
-			fmt.Println("Invalid size: ", err)
-			os.Exit(1)
-		}
-
-		err = devices.ResizePool(size)
-		if err != nil {
-			fmt.Println("Error resizing pool: ", err)
-			os.Exit(1)
-		}
-
-		break
-	case "snap":
-		if flag.NArg() < 3 {
-			usage()
-		}
-
-		err := devices.AddDevice(args[1], args[2], nil)
-		if err != nil {
-			fmt.Println("Can't create snap device: ", err)
-			os.Exit(1)
-		}
-		break
-	case "remove":
-		if flag.NArg() < 2 {
-			usage()
-		}
-
-		err := devicemapper.RemoveDevice(args[1])
-		if err != nil {
-			fmt.Println("Can't remove device: ", err)
-			os.Exit(1)
-		}
-		break
-	case "mount":
-		if flag.NArg() < 3 {
-			usage()
-		}
-
-		err := devices.MountDevice(args[1], args[2], "")
-		if err != nil {
-			fmt.Println("Can't create snap device: ", err)
-			os.Exit(1)
-		}
-		break
-	default:
-		fmt.Printf("Unknown command %s\n", args[0])
-		usage()
-
-		os.Exit(1)
-	}
-
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool_windows.go b/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool_windows.go
deleted file mode 100644
index da29a2cadf..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/docker-device-tool/device_tool_windows.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package main
-
-func main() {
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/dockerize-disk.sh b/installer/vendor/github.com/docker/docker/contrib/dockerize-disk.sh
deleted file mode 100755
index 444e243abe..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/dockerize-disk.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-if ! command -v qemu-nbd &> /dev/null; then
-  echo >&2 'error: "qemu-nbd" not found!'
-  exit 1
-fi
-
-usage() {
-  echo "Convert disk image to docker image"
-  echo ""
-  echo "usage: $0 image-name disk-image-file [ base-image ]"
-  echo "   ie: $0 cirros:0.3.3 cirros-0.3.3-x86_64-disk.img"
-  echo "       $0 ubuntu:cloud ubuntu-14.04-server-cloudimg-amd64-disk1.img ubuntu:14.04"
-}
-
-if [ "$#" -lt 2 ]; then
-  usage
-  exit 1
-fi
-
-CURDIR=$(pwd)
-
-image_name="${1%:*}"
-image_tag="${1#*:}"
-if [ "$image_tag" == "$1" ]; then
-  image_tag="latest"
-fi
-
-disk_image_file="$2"
-docker_base_image="$3"
-
-block_device=/dev/nbd0
-
-builddir=$(mktemp -d)
-
-cleanup() {
-  umount "$builddir/disk_image" || true
-  umount "$builddir/workdir" || true
-  qemu-nbd -d $block_device &> /dev/null || true
-  rm -rf $builddir
-}
-trap cleanup EXIT
-
-# Mount disk image
-modprobe nbd max_part=63
-qemu-nbd -rc ${block_device} -P 1 "$disk_image_file"
-mkdir "$builddir/disk_image"
-mount -o ro ${block_device} "$builddir/disk_image"
-
-mkdir "$builddir/workdir"
-mkdir "$builddir/diff"
-
-base_image_mounts=""
-
-# Unpack base image
-if [ -n "$docker_base_image" ]; then
-  mkdir -p "$builddir/base"
-  docker pull "$docker_base_image"
-  docker save "$docker_base_image" | tar -xC "$builddir/base"
-
-  image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")
-  while [ -n "$image_id" ]; do
-    mkdir -p "$builddir/base/$image_id/layer"
-    tar -xf "$builddir/base/$image_id/layer.tar" -C "$builddir/base/$image_id/layer"
-
-    base_image_mounts="${base_image_mounts}:$builddir/base/$image_id/layer=ro+wh"
-    image_id=$(docker inspect -f "{{.Parent}}" "$image_id")
-  done
-fi
-
-# Mount work directory
-mount -t aufs -o "br=$builddir/diff=rw${base_image_mounts},dio,xino=/dev/shm/aufs.xino" none "$builddir/workdir"
-
-# Update files
-cd $builddir
-LC_ALL=C diff -rq disk_image workdir \
-  | sed -re "s|Only in workdir(.*?): |DEL \1/|g;s|Only in disk_image(.*?): |ADD \1/|g;s|Files disk_image/(.+) and workdir/(.+) differ|UPDATE /\1|g" \
-  | while read action entry; do
-      case "$action" in
-        ADD|UPDATE)
-          cp -a "disk_image$entry" "workdir$entry"
-          ;;
-        DEL)
-          rm -rf "workdir$entry"
-          ;;
-        *)
-          echo "Error: unknown diff line: $action $entry" >&2
-          ;;
-      esac
-    done
-
-# Pack new image
-new_image_id="$(for i in $(seq 1 32); do printf "%02x" $(($RANDOM % 256)); done)"
-mkdir -p $builddir/result/$new_image_id
-cd diff
-tar -cf $builddir/result/$new_image_id/layer.tar *
-echo "1.0" > $builddir/result/$new_image_id/VERSION
-cat > $builddir/result/$new_image_id/json <<-EOS
-{ "docker_version": "1.4.1"
-, "id": "$new_image_id"
-, "created": "$(date -u +%Y-%m-%dT%H:%M:%S.%NZ)"
-EOS
-
-if [ -n "$docker_base_image" ]; then
-  image_id=$(docker inspect -f "{{.Id}}" "$docker_base_image")
-  echo ", \"parent\": \"$image_id\"" >> $builddir/result/$new_image_id/json
-fi
-
-echo "}" >> $builddir/result/$new_image_id/json
-
-echo "{\"$image_name\":{\"$image_tag\":\"$new_image_id\"}}" > $builddir/result/repositories
-
-cd $builddir/result
-
-# mkdir -p $CURDIR/$image_name
-# cp -r * $CURDIR/$image_name
-tar -c * | docker load
diff --git a/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v1.sh b/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v1.sh
deleted file mode 100755
index 29d7ff59fd..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v1.sh
+++ /dev/null
@@ -1,108 +0,0 @@
-#!/bin/bash
-set -e
-
-# hello-world                      latest              ef872312fe1b        3 months ago        910 B
-# hello-world                      latest              ef872312fe1bbc5e05aae626791a47ee9b032efa8f3bda39cc0be7b56bfe59b9   3 months ago        910 B
-
-# debian                           latest              f6fab3b798be        10 weeks ago        85.1 MB
-# debian                           latest              f6fab3b798be3174f45aa1eb731f8182705555f89c9026d8c1ef230cbf8301dd   10 weeks ago        85.1 MB
-
-if ! command -v curl &> /dev/null; then
-	echo >&2 'error: "curl" not found!'
-	exit 1
-fi
-
-usage() {
-	echo "usage: $0 dir image[:tag][@image-id] ..."
-	echo "   ie: $0 /tmp/hello-world hello-world"
-	echo "       $0 /tmp/debian-jessie debian:jessie"
-	echo "       $0 /tmp/old-hello-world hello-world@ef872312fe1bbc5e05aae626791a47ee9b032efa8f3bda39cc0be7b56bfe59b9"
-	echo "       $0 /tmp/old-debian debian:latest@f6fab3b798be3174f45aa1eb731f8182705555f89c9026d8c1ef230cbf8301dd"
-	[ -z "$1" ] || exit "$1"
-}
-
-dir="$1" # dir for building tar in
-shift || usage 1 >&2
-
-[ $# -gt 0 -a "$dir" ] || usage 2 >&2
-mkdir -p "$dir"
-
-# hacky workarounds for Bash 3 support (no associative arrays)
-images=()
-rm -f "$dir"/tags-*.tmp
-# repositories[busybox]='"latest": "...", "ubuntu-14.04": "..."'
-
-while [ $# -gt 0 ]; do
-	imageTag="$1"
-	shift
-	image="${imageTag%%[:@]*}"
-	tag="${imageTag#*:}"
-	imageId="${tag##*@}"
-	[ "$imageId" != "$tag" ] || imageId=
-	[ "$tag" != "$imageTag" ] || tag='latest'
-	tag="${tag%@*}"
-
-	imageFile="${image//\//_}" # "/" can't be in filenames :)
-
-	token="$(curl -sSL -o /dev/null -D- -H 'X-Docker-Token: true' "https://index.docker.io/v1/repositories/$image/images" | tr -d '\r' | awk -F ': *' '$1 == "X-Docker-Token" { print $2 }')"
-
-	if [ -z "$imageId" ]; then
-		imageId="$(curl -sSL -H "Authorization: Token $token" "https://registry-1.docker.io/v1/repositories/$image/tags/$tag")"
-		imageId="${imageId//\"/}"
-	fi
-
-	ancestryJson="$(curl -sSL -H "Authorization: Token $token" "https://registry-1.docker.io/v1/images/$imageId/ancestry")"
-	if [ "${ancestryJson:0:1}" != '[' ]; then
-		echo >&2 "error: /v1/images/$imageId/ancestry returned something unexpected:"
-		echo >&2 "  $ancestryJson"
-		exit 1
-	fi
-
-	IFS=','
-	ancestry=( ${ancestryJson//[\[\] \"]/} )
-	unset IFS
-
-	if [ -s "$dir/tags-$imageFile.tmp" ]; then
-		echo -n ', ' >> "$dir/tags-$imageFile.tmp"
-	else
-		images=( "${images[@]}" "$image" )
-	fi
-	echo -n '"'"$tag"'": "'"$imageId"'"' >> "$dir/tags-$imageFile.tmp"
-
-	echo "Downloading '$imageTag' (${#ancestry[@]} layers)..."
-	for imageId in "${ancestry[@]}"; do
-		mkdir -p "$dir/$imageId"
-		echo '1.0' > "$dir/$imageId/VERSION"
-
-		curl -sSL -H "Authorization: Token $token" "https://registry-1.docker.io/v1/images/$imageId/json" -o "$dir/$imageId/json"
-
-		# TODO figure out why "-C -" doesn't work here
-		# "curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume."
-		# "HTTP/1.1 416 Requested Range Not Satisfiable"
-		if [ -f "$dir/$imageId/layer.tar" ]; then
-			# TODO hackpatch for no -C support :'(
-			echo "skipping existing ${imageId:0:12}"
-			continue
-		fi
-		curl -SL --progress -H "Authorization: Token $token" "https://registry-1.docker.io/v1/images/$imageId/layer" -o "$dir/$imageId/layer.tar" # -C -
-	done
-	echo
-done
-
-echo -n '{' > "$dir/repositories"
-firstImage=1
-for image in "${images[@]}"; do
-	imageFile="${image//\//_}" # "/" can't be in filenames :)
-
-	[ "$firstImage" ] || echo -n ',' >> "$dir/repositories"
-	firstImage=
-	echo -n $'\n\t' >> "$dir/repositories"
-	echo -n '"'"$image"'": { '"$(cat "$dir/tags-$imageFile.tmp")"' }' >> "$dir/repositories"
-done
-echo -n $'\n}\n' >> "$dir/repositories"
-
-rm -f "$dir"/tags-*.tmp
-
-echo "Download of images into '$dir' complete."
-echo "Use something like the following to load the result into a Docker daemon:"
-echo "  tar -cC '$dir' . | docker load"
diff --git a/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v2.sh b/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v2.sh
deleted file mode 100755
index 111e3fa2ba..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/download-frozen-image-v2.sh
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/bin/bash
-set -e
-
-# hello-world                      latest              ef872312fe1b        3 months ago        910 B
-# hello-world                      latest              ef872312fe1bbc5e05aae626791a47ee9b032efa8f3bda39cc0be7b56bfe59b9   3 months ago        910 B
-
-# debian                           latest              f6fab3b798be        10 weeks ago        85.1 MB
-# debian                           latest              f6fab3b798be3174f45aa1eb731f8182705555f89c9026d8c1ef230cbf8301dd   10 weeks ago        85.1 MB
-
-if ! command -v curl &> /dev/null; then
-	echo >&2 'error: "curl" not found!'
-	exit 1
-fi
-
-usage() {
-	echo "usage: $0 dir image[:tag][@digest] ..."
-	echo "       $0 /tmp/old-hello-world hello-world:latest@sha256:8be990ef2aeb16dbcb9271ddfe2610fa6658d13f6dfb8bc72074cc1ca36966a7"
-	[ -z "$1" ] || exit "$1"
-}
-
-dir="$1" # dir for building tar in
-shift || usage 1 >&2
-
-[ $# -gt 0 -a "$dir" ] || usage 2 >&2
-mkdir -p "$dir"
-
-# hacky workarounds for Bash 3 support (no associative arrays)
-images=()
-rm -f "$dir"/tags-*.tmp
-# repositories[busybox]='"latest": "...", "ubuntu-14.04": "..."'
-
-while [ $# -gt 0 ]; do
-	imageTag="$1"
-	shift
-	image="${imageTag%%[:@]*}"
-	imageTag="${imageTag#*:}"
-	digest="${imageTag##*@}"
-	tag="${imageTag%%@*}"
-
-	# add prefix library if passed official image
-	if [[ "$image" != *"/"* ]]; then
-		image="library/$image"
-	fi
-
-	imageFile="${image//\//_}" # "/" can't be in filenames :)
-
-	token="$(curl -sSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$image:pull" | jq --raw-output .token)"
-
-	manifestJson="$(curl -sSL -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/$image/manifests/$digest")"
-	if [ "${manifestJson:0:1}" != '{' ]; then
-		echo >&2 "error: /v2/$image/manifests/$digest returned something unexpected:"
-		echo >&2 "  $manifestJson"
-		exit 1
-	fi
-
-	layersFs=$(echo "$manifestJson" | jq --raw-output '.fsLayers | .[] | .blobSum')
-
-	IFS=$'\n'
-	# bash v4 on Windows CI requires CRLF separator
-	if [ "$(go env GOHOSTOS)" = 'windows' ]; then
-		major=$(echo ${BASH_VERSION%%[^0.9]} | cut -d. -f1)
-		if [ "$major" -ge 4 ]; then
-			IFS=$'\r\n'
-		fi
-	fi
-	layers=( ${layersFs} )
-	unset IFS
-
-	history=$(echo "$manifestJson" | jq '.history | [.[] | .v1Compatibility]')
-	imageId=$(echo "$history" | jq --raw-output .[0] | jq --raw-output .id)
-
-	if [ -s "$dir/tags-$imageFile.tmp" ]; then
-		echo -n ', ' >> "$dir/tags-$imageFile.tmp"
-	else
-		images=( "${images[@]}" "$image" )
-	fi
-	echo -n '"'"$tag"'": "'"$imageId"'"' >> "$dir/tags-$imageFile.tmp"
-
-	echo "Downloading '${image}:${tag}@${digest}' (${#layers[@]} layers)..."
-	for i in "${!layers[@]}"; do
-		imageJson=$(echo "$history" | jq --raw-output .[${i}])
-		imageId=$(echo "$imageJson" | jq --raw-output .id)
-		imageLayer=${layers[$i]}
-
-		mkdir -p "$dir/$imageId"
-		echo '1.0' > "$dir/$imageId/VERSION"
-
-		echo "$imageJson" > "$dir/$imageId/json"
-
-		# TODO figure out why "-C -" doesn't work here
-		# "curl: (33) HTTP server doesn't seem to support byte ranges. Cannot resume."
-		# "HTTP/1.1 416 Requested Range Not Satisfiable"
-		if [ -f "$dir/$imageId/layer.tar" ]; then
-			# TODO hackpatch for no -C support :'(
-			echo "skipping existing ${imageId:0:12}"
-			continue
-		fi
-		token="$(curl -sSL "https://auth.docker.io/token?service=registry.docker.io&scope=repository:$image:pull" | jq --raw-output .token)"
-		curl -SL --progress -H "Authorization: Bearer $token" "https://registry-1.docker.io/v2/$image/blobs/$imageLayer" -o "$dir/$imageId/layer.tar" # -C -
-	done
-	echo
-done
-
-echo -n '{' > "$dir/repositories"
-firstImage=1
-for image in "${images[@]}"; do
-	imageFile="${image//\//_}" # "/" can't be in filenames :)
-	image="${image#library\/}"
-
-	[ "$firstImage" ] || echo -n ',' >> "$dir/repositories"
-	firstImage=
-	echo -n $'\n\t' >> "$dir/repositories"
-	echo -n '"'"$image"'": { '"$(cat "$dir/tags-$imageFile.tmp")"' }' >> "$dir/repositories"
-done
-echo -n $'\n}\n' >> "$dir/repositories"
-
-rm -f "$dir"/tags-*.tmp
-
-echo "Download of images into '$dir' complete."
-echo "Use something like the following to load the result into a Docker daemon:"
-echo "  tar -cC '$dir' . | docker load"
diff --git a/installer/vendor/github.com/docker/docker/contrib/editorconfig b/installer/vendor/github.com/docker/docker/contrib/editorconfig
deleted file mode 100644
index 97eda89a4b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/editorconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-insert_final_newline = true
-charset = utf-8
-indent_style = tab
-indent_size = 4
-trim_trailing_whitespace = true
-
-[*.md]
-indent_size = 2
-indent_style = space
diff --git a/installer/vendor/github.com/docker/docker/contrib/gitdm/aliases b/installer/vendor/github.com/docker/docker/contrib/gitdm/aliases
deleted file mode 100644
index dd5dd34335..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/gitdm/aliases
+++ /dev/null
@@ -1,148 +0,0 @@
-Danny.Yates@mailonline.co.uk danny@codeaholics.org
-KenCochrane@gmail.com kencochrane@gmail.com
-LÉVEIL thomasleveil@gmail.com
-Vincent.Bernat@exoscale.ch bernat@luffy.cx
-acidburn@docker.com jess@docker.com
-admin@jtlebi.fr jt@yadutaf.fr
-ahmetalpbalkan@gmail.com ahmetb@microsoft.com
-aj@gandi.net aj@gandi.net
-albers@users.noreply.github.com github@albersweb.de
-alexander.larsson@gmail.com alexl@redhat.com
-amurdaca@redhat.com antonio.murdaca@gmail.com
-amy@gandi.net aj@gandi.net
-andrew.weiss@microsoft.com andrew.weiss@outlook.com
-angt@users.noreply.github.com adrien@gallouet.fr
-ankushagarwal@users.noreply.github.com ankushagarwal11@gmail.com
-anonymouse2048@gmail.com lheckemann@twig-world.com
-anusha@docker.com anusha.ragunathan@docker.com
-asarai@suse.com asarai@suse.de
-avi.miller@gmail.com avi.miller@oracle.com
-bernat@luffy.cx Vincent.Bernat@exoscale.ch
-bgoff@cpuguy83-mbp.home cpuguy83@gmail.com
-brandon@ifup.co brandon@ifup.org
-brent@docker.com brent.salisbury@docker.com
-charmes.guillaume@gmail.com guillaume.charmes@docker.com
-chenchun.feed@gmail.com ramichen@tencent.com
-chooper@plumata.com charles.hooper@dotcloud.com
-crosby.michael@gmail.com michael@docker.com
-crosbymichael@gmail.com michael@docker.com
-cyphar@cyphar.com asarai@suse.de
-daehyeok@daehyeok-ui-MacBook-Air.local daehyeok@gmail.com
-daehyeok@daehyeokui-MacBook-Air.local daehyeok@gmail.com
-daniel.norberg@gmail.com dano@spotify.com
-daniel@dotcloud.com daniel.mizyrycki@dotcloud.com
-darren@rancher.com darren.s.shepherd@gmail.com
-dave@dtucker.co.uk dt@docker.com
-dev@vvieux.com victor.vieux@docker.com
-dgasienica@zynga.com daniel@gasienica.ch
-dnephin@gmail.com dnephin@docker.com
-dominikh@fork-bomb.org dominik@honnef.co
-dqminh89@gmail.com dqminh@cloudflare.com
-dsxiao@dataman-inc.com dxiao@redhat.com
-duglin@users.noreply.github.com dug@us.ibm.com
-eric.hanchrow@gmail.com ehanchrow@ine.com
-erik+github@hollensbe.org github@hollensbe.org
-estesp@gmail.com estesp@linux.vnet.ibm.com
-ewindisch@docker.com eric@windisch.us
-f.joffrey@gmail.com joffrey@docker.com
-fkautz@alumni.cmu.edu fkautz@redhat.com
-frank.rosquin@gmail.com frank.rosquin+github@gmail.com
-gh@mattyw.net mattyw@me.com
-git@julienbordellier.com julienbordellier@gmail.com
-github@metaliveblog.com github@developersupport.net
-github@srid.name sridharr@activestate.com
-guillaume.charmes@dotcloud.com guillaume.charmes@docker.com
-guillaume@charmes.net guillaume.charmes@docker.com
-guillaume@docker.com guillaume.charmes@docker.com
-guillaume@dotcloud.com guillaume.charmes@docker.com
-haoshuwei24@gmail.com haosw@cn.ibm.com
-hollie.teal@docker.com hollie@docker.com
-hollietealok@users.noreply.github.com hollie@docker.com
-hsinko@users.noreply.github.com 21551195@zju.edu.cn
-iamironbob@gmail.com altsysrq@gmail.com
-icecrime@gmail.com arnaud.porterie@docker.com
-jatzen@gmail.com jacob@jacobatzen.dk
-jeff@allingeek.com jeff.nickoloff@gmail.com
-jefferya@programmerq.net jeff@docker.com
-jerome.petazzoni@dotcloud.com jerome.petazzoni@dotcloud.com
-jfrazelle@users.noreply.github.com jess@docker.com
-jhoward@microsoft.com John.Howard@microsoft.com
-jlhawn@berkeley.edu josh.hawn@docker.com
-joffrey@dotcloud.com joffrey@docker.com
-john.howard@microsoft.com John.Howard@microsoft.com
-jp@enix.org jerome.petazzoni@dotcloud.com
-justin.cormack@unikernel.com justin.cormack@docker.com
-justin.simonelis@PTS-JSIMON2.toronto.exclamation.com justin.p.simonelis@gmail.com
-justin@specialbusservice.com justin.cormack@docker.com
-katsuta_soshi@cyberagent.co.jp soshi.katsuta@gmail.com
-kuehnle@online.de git.nivoc@neverbox.com
-kwk@users.noreply.github.com konrad.wilhelm.kleine@gmail.com
-leijitang@gmail.com leijitang@huawei.com
-liubin0329@gmail.com liubin0329@users.noreply.github.com
-lk4d4math@gmail.com lk4d4@docker.com
-louis@dotcloud.com kalessin@kalessin.fr
-lsm5@redhat.com lsm5@fedoraproject.org
-lyndaoleary@hotmail.com lyndaoleary29@gmail.com
-madhu@socketplane.io madhu@docker.com
-martins@noironetworks.com aanm90@gmail.com
-mary@docker.com mary.anthony@docker.com
-mastahyeti@users.noreply.github.com mastahyeti@gmail.com
-maztaim@users.noreply.github.com taim@bosboot.org
-me@runcom.ninja antonio.murdaca@gmail.com
-mheon@mheonlaptop.redhat.com mheon@redhat.com
-michael@crosbymichael.com michael@docker.com
-mohitsoni1989@gmail.com mosoni@ebay.com
-moxieandmore@gmail.com mary.anthony@docker.com
-moyses.furtado@wplex.com.br moysesb@gmail.com
-msabramo@gmail.com marc@marc-abramowitz.com
-mzdaniel@glidelink.net daniel.mizyrycki@dotcloud.com
-nathan.leclaire@gmail.com nathan.leclaire@docker.com
-nathanleclaire@gmail.com nathan.leclaire@docker.com
-ostezer@users.noreply.github.com ostezer@gmail.com
-peter@scraperwiki.com p@pwaller.net
-princess@docker.com jess@docker.com
-proppy@aminche.com proppy@google.com
-qhuang@10.0.2.15 h.huangqiang@huawei.com
-resouer@gmail.com resouer@163.com
-roberto_hashioka@hotmail.com roberto.hashioka@docker.com
-root@vagrant-ubuntu-12.10.vagrantup.com daniel.mizyrycki@dotcloud.com
-runcom@linux.com antonio.murdaca@gmail.com
-runcom@redhat.com antonio.murdaca@gmail.com
-runcom@users.noreply.github.com antonio.murdaca@gmail.com
-s@docker.com solomon@docker.com
-shawnlandden@gmail.com shawn@churchofgit.com
-singh.gurjeet@gmail.com gurjeet@singh.im
-sjoerd@byte.nl sjoerd-github@linuxonly.nl
-smahajan@redhat.com shishir.mahajan@redhat.com
-solomon.hykes@dotcloud.com solomon@docker.com
-solomon@dotcloud.com solomon@docker.com
-stefanb@us.ibm.com stefanb@linux.vnet.ibm.com
-stevvooe@users.noreply.github.com stephen.day@docker.com
-superbaloo+registrations.github@superbaloo.net baloo@gandi.net
-tangicolin@gmail.com tangicolin@gmail.com
-thaJeztah@users.noreply.github.com github@gone.nl
-thatcher@dotcloud.com thatcher@docker.com
-thatcher@gmx.net thatcher@docker.com
-tibor@docker.com teabee89@gmail.com
-tiborvass@users.noreply.github.com teabee89@gmail.com
-timruffles@googlemail.com oi@truffles.me.uk
-tintypemolly@Ohui-MacBook-Pro.local tintypemolly@gmail.com
-tj@init.me tejesh.mehta@gmail.com
-tristan.carel@gmail.com tristan@cogniteev.com
-unclejack@users.noreply.github.com cristian.staretu@gmail.com
-unclejacksons@gmail.com cristian.staretu@gmail.com
-vbatts@hashbangbash.com vbatts@redhat.com
-victor.vieux@dotcloud.com victor.vieux@docker.com
-victor@docker.com victor.vieux@docker.com
-victor@dotcloud.com victor.vieux@docker.com
-victorvieux@gmail.com victor.vieux@docker.com
-vieux@docker.com victor.vieux@docker.com
-vincent+github@demeester.fr vincent@sbr.pm
-vincent@bernat.im bernat@luffy.cx
-vojnovski@gmail.com viktor.vojnovski@amadeus.com
-whoshuu@gmail.com huu@prismskylabs.com
-xiaods@gmail.com dxiao@redhat.com
-xlgao@zju.edu.cn xlgao@zju.edu.cn
-yestin.sun@polyera.com sunyi0804@gmail.com
-yuchangchun1@huawei.com yuchangchun1@huawei.com
-zjaffee@us.ibm.com zij@case.edu
diff --git a/installer/vendor/github.com/docker/docker/contrib/gitdm/domain-map b/installer/vendor/github.com/docker/docker/contrib/gitdm/domain-map
deleted file mode 100644
index 1f1849e4f6..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/gitdm/domain-map
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Docker
-#
-
-docker.com                      Docker
-dotcloud.com                    Docker
-
-aluzzardi@gmail.com             Docker
-cpuguy83@gmail.com              Docker
-derek@mcgstyle.net              Docker
-github@gone.nl                  Docker
-kencochrane@gmail.com           Docker
-mickael.laventure@gmail.com     Docker
-sam.alba@gmail.com              Docker
-svendowideit@fosiki.com         Docker
-svendowideit@home.org.au        Docker
-tonistiigi@gmail.com            Docker
-
-cristian.staretu@gmail.com      Docker      < 2015-01-01
-cristian.staretu@gmail.com      Cisco
-
-github@hollensbe.org            Docker      < 2015-01-01
-github@hollensbe.org            Cisco
-
-david.calavera@gmail.com        Docker      < 2016-04-01
-david.calavera@gmail.com        Netlify
-
-#
-# Others
-#
-
-cisco.com                       Cisco
-google.com                      Google
-ibm.com                         IBM
-huawei.com                      Huawei
-microsoft.com                   Microsoft
-
-redhat.com                      Red Hat
-mrunalp@gmail.com               Red Hat
diff --git a/installer/vendor/github.com/docker/docker/contrib/gitdm/generate_aliases.sh b/installer/vendor/github.com/docker/docker/contrib/gitdm/generate_aliases.sh
deleted file mode 100755
index dd6a564995..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/gitdm/generate_aliases.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-#
-# This script generates a gitdm compatible email aliases file from a git
-# formatted .mailmap file.
-#
-# Usage:
-#  $> ./generate_aliases <mailmap_file> > aliases
-#
-
-cat $1 | \
-    grep -v '^#' | \
-    sed 's/^[^<]*<\([^>]*\)>/\1/' | \
-    grep '<.*>' | sed -e 's/[<>]/ /g' | \
-    awk '{if ($3 != "") { print $3" "$1 } else {print $2" "$1}}' | \
-    sort | uniq
diff --git a/installer/vendor/github.com/docker/docker/contrib/gitdm/gitdm.config b/installer/vendor/github.com/docker/docker/contrib/gitdm/gitdm.config
deleted file mode 100644
index d9b62b0b43..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/gitdm/gitdm.config
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# EmailAliases lets us cope with developers who use more
-# than one address.
-#
-EmailAliases aliases
-
-#
-# EmailMap does the main work of mapping addresses onto 
-# employers.
-#
-EmailMap domain-map
-
-#
-# Use GroupMap to map a file full of addresses to the 
-# same employer
-#
-# GroupMap company-Docker  Docker
diff --git a/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile
deleted file mode 100644
index 747dc91bcf..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM busybox
-EXPOSE 80/tcp
-COPY httpserver .
-CMD ["./httpserver"]
diff --git a/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile.solaris b/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile.solaris
deleted file mode 100644
index 3d0d691c17..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/httpserver/Dockerfile.solaris
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM solaris
-EXPOSE 80/tcp
-COPY httpserver .
-CMD ["./httpserver"]
diff --git a/installer/vendor/github.com/docker/docker/contrib/httpserver/server.go b/installer/vendor/github.com/docker/docker/contrib/httpserver/server.go
deleted file mode 100644
index a75d5abb3d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/httpserver/server.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package main
-
-import (
-	"log"
-	"net/http"
-)
-
-func main() {
-	fs := http.FileServer(http.Dir("/static"))
-	http.Handle("/", fs)
-	log.Panic(http.ListenAndServe(":80", nil))
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.confd b/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.confd
deleted file mode 100644
index 244403113e..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.confd
+++ /dev/null
@@ -1,13 +0,0 @@
-# /etc/conf.d/docker: config file for /etc/init.d/docker
-
-# where the docker daemon output gets piped
-#DOCKER_LOGFILE="/var/log/docker.log"
-
-# where docker's pid get stored
-#DOCKER_PIDFILE="/run/docker.pid"
-
-# where the docker daemon itself is run from
-#DOCKERD_BINARY="/usr/bin/dockerd"
-
-# any other random options you want to pass to docker
-DOCKER_OPTS=""
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.initd b/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.initd
deleted file mode 100644
index 5d3160338a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/openrc/docker.initd
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-command="${DOCKERD_BINARY:-/usr/bin/dockerd}"
-pidfile="${DOCKER_PIDFILE:-/run/${RC_SVCNAME}.pid}"
-command_args="-p \"${pidfile}\" ${DOCKER_OPTS}"
-DOCKER_LOGFILE="${DOCKER_LOGFILE:-/var/log/${RC_SVCNAME}.log}"
-start_stop_daemon_args="--background \
-	--stderr \"${DOCKER_LOGFILE}\" --stdout \"${DOCKER_LOGFILE}\""
-
-start_pre() {
-	checkpath -f -m 0644 -o root:docker "$DOCKER_LOGFILE"
-
-	ulimit -n 1048576
-
-	# Having non-zero limits causes performance problems due to accounting overhead
-	# in the kernel. We recommend using cgroups to do container-local accounting.
-	ulimit -u unlimited
-
-	return 0
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/systemd/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/init/systemd/REVIEWERS
deleted file mode 100644
index b9ba55b3fb..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/systemd/REVIEWERS
+++ /dev/null
@@ -1,3 +0,0 @@
-Lokesh Mandvekar <lsm5@fedoraproject.org> (@lsm5)
-Brandon Philips <brandon.philips@coreos.com> (@philips)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service b/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service
deleted file mode 100644
index 8bfed93c75..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service
+++ /dev/null
@@ -1,29 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=https://docs.docker.com
-After=network.target docker.socket firewalld.service
-Requires=docker.socket
-
-[Service]
-Type=notify
-# the default is not to use systemd for cgroups because the delegate issues still
-# exists and systemd currently does not support the cgroup feature set required
-# for containers run by docker
-ExecStart=/usr/bin/dockerd -H fd://
-ExecReload=/bin/kill -s HUP $MAINPID
-LimitNOFILE=1048576
-# Having non-zero Limit*s causes performance problems due to accounting overhead
-# in the kernel. We recommend using cgroups to do container-local accounting.
-LimitNPROC=infinity
-LimitCORE=infinity
-# Uncomment TasksMax if your systemd version supports it.
-# Only systemd 226 and above support this version.
-#TasksMax=infinity
-TimeoutStartSec=0
-# set delegate yes so that systemd does not reset the cgroups of docker containers
-Delegate=yes
-# kill only the docker process, not all processes in the cgroup
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service.rpm b/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service.rpm
deleted file mode 100644
index 6e41892399..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.service.rpm
+++ /dev/null
@@ -1,28 +0,0 @@
-[Unit]
-Description=Docker Application Container Engine
-Documentation=https://docs.docker.com
-After=network.target firewalld.service
-
-[Service]
-Type=notify
-# the default is not to use systemd for cgroups because the delegate issues still
-# exists and systemd currently does not support the cgroup feature set required
-# for containers run by docker
-ExecStart=/usr/bin/dockerd
-ExecReload=/bin/kill -s HUP $MAINPID
-# Having non-zero Limit*s causes performance problems due to accounting overhead
-# in the kernel. We recommend using cgroups to do container-local accounting.
-LimitNOFILE=infinity
-LimitNPROC=infinity
-LimitCORE=infinity
-# Uncomment TasksMax if your systemd version supports it.
-# Only systemd 226 and above support this version.
-#TasksMax=infinity
-TimeoutStartSec=0
-# set delegate yes so that systemd does not reset the cgroups of docker containers
-Delegate=yes
-# kill only the docker process, not all processes in the cgroup
-KillMode=process
-
-[Install]
-WantedBy=multi-user.target
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.socket b/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.socket
deleted file mode 100644
index 7dd95098e4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/systemd/docker.socket
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Docker Socket for the API
-PartOf=docker.service
-
-[Socket]
-ListenStream=/var/run/docker.sock
-SocketMode=0660
-SocketUser=root
-SocketGroup=docker
-
-[Install]
-WantedBy=sockets.target
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker b/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker
deleted file mode 100755
index 4f9d38dda5..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker
+++ /dev/null
@@ -1,152 +0,0 @@
-#!/bin/sh
-set -e
-
-### BEGIN INIT INFO
-# Provides:           docker
-# Required-Start:     $syslog $remote_fs
-# Required-Stop:      $syslog $remote_fs
-# Should-Start:       cgroupfs-mount cgroup-lite
-# Should-Stop:        cgroupfs-mount cgroup-lite
-# Default-Start:      2 3 4 5
-# Default-Stop:       0 1 6
-# Short-Description:  Create lightweight, portable, self-sufficient containers.
-# Description:
-#  Docker is an open-source project to easily create lightweight, portable,
-#  self-sufficient containers from any application. The same container that a
-#  developer builds and tests on a laptop can run at scale, in production, on
-#  VMs, bare metal, OpenStack clusters, public clouds and more.
-### END INIT INFO
-
-export PATH=/sbin:/bin:/usr/sbin:/usr/bin:/usr/local/sbin:/usr/local/bin
-
-BASE=docker
-
-# modify these in /etc/default/$BASE (/etc/default/docker)
-DOCKERD=/usr/bin/dockerd
-# This is the pid file managed by docker itself
-DOCKER_PIDFILE=/var/run/$BASE.pid
-# This is the pid file created/managed by start-stop-daemon
-DOCKER_SSD_PIDFILE=/var/run/$BASE-ssd.pid
-DOCKER_LOGFILE=/var/log/$BASE.log
-DOCKER_OPTS=
-DOCKER_DESC="Docker"
-
-# Get lsb functions
-. /lib/lsb/init-functions
-
-if [ -f /etc/default/$BASE ]; then
-	. /etc/default/$BASE
-fi
-
-# Check docker is present
-if [ ! -x $DOCKERD ]; then
-	log_failure_msg "$DOCKERD not present or not executable"
-	exit 1
-fi
-
-check_init() {
-	# see also init_is_upstart in /lib/lsb/init-functions (which isn't available in Ubuntu 12.04, or we'd use it directly)
-	if [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; then
-		log_failure_msg "$DOCKER_DESC is managed via upstart, try using service $BASE $1"
-		exit 1
-	fi
-}
-
-fail_unless_root() {
-	if [ "$(id -u)" != '0' ]; then
-		log_failure_msg "$DOCKER_DESC must be run as root"
-		exit 1
-	fi
-}
-
-cgroupfs_mount() {
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		return
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
-}
-
-case "$1" in
-	start)
-		check_init
-		
-		fail_unless_root
-
-		cgroupfs_mount
-
-		touch "$DOCKER_LOGFILE"
-		chgrp docker "$DOCKER_LOGFILE"
-
-		ulimit -n 1048576
-
-		# Having non-zero limits causes performance problems due to accounting overhead
-		# in the kernel. We recommend using cgroups to do container-local accounting.
-		if [ "$BASH" ]; then
-			ulimit -u unlimited
-		else
-			ulimit -p unlimited
-		fi
-
-		log_begin_msg "Starting $DOCKER_DESC: $BASE"
-		start-stop-daemon --start --background \
-			--no-close \
-			--exec "$DOCKERD" \
-			--pidfile "$DOCKER_SSD_PIDFILE" \
-			--make-pidfile \
-			-- \
-				-p "$DOCKER_PIDFILE" \
-				$DOCKER_OPTS \
-					>> "$DOCKER_LOGFILE" 2>&1
-		log_end_msg $?
-		;;
-
-	stop)
-		check_init
-		fail_unless_root
-		log_begin_msg "Stopping $DOCKER_DESC: $BASE"
-		start-stop-daemon --stop --pidfile "$DOCKER_SSD_PIDFILE" --retry 10
-		log_end_msg $?
-		;;
-
-	restart)
-		check_init
-		fail_unless_root
-		docker_pid=`cat "$DOCKER_SSD_PIDFILE" 2>/dev/null`
-		[ -n "$docker_pid" ] \
-			&& ps -p $docker_pid > /dev/null 2>&1 \
-			&& $0 stop
-		$0 start
-		;;
-
-	force-reload)
-		check_init
-		fail_unless_root
-		$0 restart
-		;;
-
-	status)
-		check_init
-		status_of_proc -p "$DOCKER_SSD_PIDFILE" "$DOCKERD" "$DOCKER_DESC"
-		;;
-
-	*)
-		echo "Usage: service docker {start|stop|restart|status}"
-		exit 1
-		;;
-esac
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker.default b/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker.default
deleted file mode 100644
index c4e93199b4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-debian/docker.default
+++ /dev/null
@@ -1,20 +0,0 @@
-# Docker Upstart and SysVinit configuration file
-
-#
-# THIS FILE DOES NOT APPLY TO SYSTEMD
-#
-#   Please see the documentation for "systemd drop-ins":
-#   https://docs.docker.com/engine/admin/systemd/
-#
-
-# Customize location of Docker binary (especially for development testing).
-#DOCKERD="/usr/local/bin/dockerd"
-
-# Use DOCKER_OPTS to modify the daemon startup options.
-#DOCKER_OPTS="--dns 8.8.8.8 --dns 8.8.4.4"
-
-# If you need Docker to use an HTTP proxy, it can also be specified here.
-#export http_proxy="http://127.0.0.1:3128/"
-
-# This is also a handy place to tweak where Docker's temporary files go.
-#export DOCKER_TMPDIR="/mnt/bigdrive/docker-tmp"
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker b/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker
deleted file mode 100755
index df9b02a2a4..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker
+++ /dev/null
@@ -1,153 +0,0 @@
-#!/bin/sh
-#
-#       /etc/rc.d/init.d/docker
-#
-#       Daemon for docker.com
-#
-# chkconfig:   2345 95 95
-# description: Daemon for docker.com
-
-### BEGIN INIT INFO
-# Provides:       docker
-# Required-Start: $network cgconfig
-# Required-Stop:
-# Should-Start:
-# Should-Stop:
-# Default-Start: 2 3 4 5
-# Default-Stop:  0 1 6
-# Short-Description: start and stop docker
-# Description: Daemon for docker.com
-### END INIT INFO
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-prog="docker"
-unshare=/usr/bin/unshare
-exec="/usr/bin/dockerd"
-pidfile="/var/run/$prog.pid"
-lockfile="/var/lock/subsys/$prog"
-logfile="/var/log/$prog"
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-prestart() {
-	service cgconfig status > /dev/null
-
-	if [[ $? != 0 ]]; then
-		service cgconfig start
-	fi
-
-}
-
-start() {
-	if [ ! -x $exec ]; then
-		if [ ! -e $exec ]; then
-			echo "Docker executable $exec not found"
-		else
-			echo "You do not have permission to execute the Docker executable $exec"
-		fi
-		exit 5
-	fi
-
-	check_for_cleanup
-
-	if ! [ -f $pidfile ]; then
-		prestart
-		printf "Starting $prog:\t"
-		echo "\n$(date)\n" >> $logfile
-		"$unshare" -m -- $exec $other_args >> $logfile 2>&1 &
-		pid=$!
-		touch $lockfile
-		# wait up to 10 seconds for the pidfile to exist.  see
-		# https://github.com/docker/docker/issues/5359
-		tries=0
-		while [ ! -f $pidfile -a $tries -lt 10 ]; do
-			sleep 1
-			tries=$((tries + 1))
-			echo -n '.'
-		done
-		if [ ! -f $pidfile ]; then
-			failure
-			echo
-			exit 1
-		fi
-		success
-		echo
-	else
-		failure
-		echo
-		printf "$pidfile still exists...\n"
-		exit 7
-	fi
-}
-
-stop() {
-	echo -n $"Stopping $prog: "
-	killproc -p $pidfile -d 300 $prog
-	retval=$?
-	echo
-	[ $retval -eq 0 ] && rm -f $lockfile
-	return $retval
-}
-
-restart() {
-	stop
-	start
-}
-
-reload() {
-	restart
-}
-
-force_reload() {
-	restart
-}
-
-rh_status() {
-	status -p $pidfile $prog
-}
-
-rh_status_q() {
-	rh_status >/dev/null 2>&1
-}
-
-
-check_for_cleanup() {
-	if [ -f ${pidfile} ]; then
-		/bin/ps -fp $(cat ${pidfile}) > /dev/null || rm ${pidfile}
-	fi
-}
-
-case "$1" in
-	start)
-		rh_status_q && exit 0
-		$1
-		;;
-	stop)
-		rh_status_q || exit 0
-		$1
-		;;
-	restart)
-		$1
-		;;
-	reload)
-		rh_status_q || exit 7
-		$1
-		;;
-	force-reload)
-		force_reload
-		;;
-	status)
-		rh_status
-		;;
-	condrestart|try-restart)
-		rh_status_q || exit 0
-		restart
-		;;
-	*)
-		echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-		exit 2
-esac
-
-exit $?
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker.sysconfig b/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker.sysconfig
deleted file mode 100644
index 0864b3d77f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/sysvinit-redhat/docker.sysconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# /etc/sysconfig/docker
-#
-# Other arguments to pass to the docker daemon process
-# These will be parsed by the sysv initscript and appended
-# to the arguments list passed to docker daemon
-
-other_args=""
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/upstart/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/init/upstart/REVIEWERS
deleted file mode 100644
index 03ee2dde3d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/upstart/REVIEWERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Tianon Gravi <admwiggin@gmail.com> (@tianon)
-Jessie Frazelle <jess@docker.com> (@jfrazelle)
diff --git a/installer/vendor/github.com/docker/docker/contrib/init/upstart/docker.conf b/installer/vendor/github.com/docker/docker/contrib/init/upstart/docker.conf
deleted file mode 100644
index d58f7d6ac8..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/init/upstart/docker.conf
+++ /dev/null
@@ -1,72 +0,0 @@
-description "Docker daemon"
-
-start on (filesystem and net-device-up IFACE!=lo)
-stop on runlevel [!2345]
-
-limit nofile 524288 1048576
-
-# Having non-zero limits causes performance problems due to accounting overhead
-# in the kernel. We recommend using cgroups to do container-local accounting.
-limit nproc unlimited unlimited
-
-respawn
-
-kill timeout 20
-
-pre-start script
-	# see also https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount
-	if grep -v '^#' /etc/fstab | grep -q cgroup \
-		|| [ ! -e /proc/cgroups ] \
-		|| [ ! -d /sys/fs/cgroup ]; then
-		exit 0
-	fi
-	if ! mountpoint -q /sys/fs/cgroup; then
-		mount -t tmpfs -o uid=0,gid=0,mode=0755 cgroup /sys/fs/cgroup
-	fi
-	(
-		cd /sys/fs/cgroup
-		for sys in $(awk '!/^#/ { if ($4 == 1) print $1 }' /proc/cgroups); do
-			mkdir -p $sys
-			if ! mountpoint -q $sys; then
-				if ! mount -n -t cgroup -o $sys cgroup $sys; then
-					rmdir $sys || true
-				fi
-			fi
-		done
-	)
-end script
-
-script
-	# modify these in /etc/default/$UPSTART_JOB (/etc/default/docker)
-	DOCKERD=/usr/bin/dockerd
-	DOCKER_OPTS=
-	if [ -f /etc/default/$UPSTART_JOB ]; then
-		. /etc/default/$UPSTART_JOB
-	fi
-	exec "$DOCKERD" $DOCKER_OPTS --raw-logs
-end script
-
-# Don't emit "started" event until docker.sock is ready.
-# See https://github.com/docker/docker/issues/6647
-post-start script
-	DOCKER_OPTS=
-	DOCKER_SOCKET=
-	if [ -f /etc/default/$UPSTART_JOB ]; then
-		. /etc/default/$UPSTART_JOB
-	fi
-
-	if ! printf "%s" "$DOCKER_OPTS" | grep -qE -e '-H|--host'; then
-		DOCKER_SOCKET=/var/run/docker.sock
-	else
-		DOCKER_SOCKET=$(printf "%s" "$DOCKER_OPTS" | grep -oP -e '(-H|--host)\W*unix://\K(\S+)' | sed 1q)
-	fi
-
-	if [ -n "$DOCKER_SOCKET" ]; then
-		while ! [ -e "$DOCKER_SOCKET" ]; do
-			initctl status $UPSTART_JOB | grep -qE "(stop|respawn)/" && exit 1
-			echo "Waiting for $DOCKER_SOCKET"
-			sleep 0.1
-		done
-		echo "$DOCKER_SOCKET is up"
-	fi
-end script
diff --git a/installer/vendor/github.com/docker/docker/contrib/mac-install-bundle.sh b/installer/vendor/github.com/docker/docker/contrib/mac-install-bundle.sh
deleted file mode 100755
index 2110d044d0..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mac-install-bundle.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-
-set -e
-
-errexit() {
-	echo "$1"
-	exit 1
-}
-
-[ "$(uname -s)" == "Darwin" ] || errexit "This script can only be used on a Mac"
-
-[ $# -eq 1 ] || errexit "Usage: $0 install|undo"
-
-BUNDLE="bundles/$(cat VERSION)"
-BUNDLE_PATH="$PWD/$BUNDLE"
-CLIENT_PATH="$BUNDLE_PATH/cross/darwin/amd64/docker"
-DATABASE="$HOME/Library/Containers/com.docker.docker/Data/database"
-DATABASE_KEY="$DATABASE/com.docker.driver.amd64-linux/bundle"
-
-[ -d "$DATABASE" ] || errexit "Docker for Mac must be installed for this script"
-
-case "$1" in
-"install")
-	[ -d "$BUNDLE" ] || errexit "cannot find bundle $BUNDLE"
-	[ -e "$CLIENT_PATH" ] || errexit "you need to run make cross first"
-	[ -e "$BUNDLE/binary-daemon/dockerd" ] || errexit "you need to build binaries first"
-	[ -f "$BUNDLE/binary-client/docker" ] || errexit "you need to build binaries first"
-	git -C "$DATABASE" reset --hard >/dev/null
-	echo "$BUNDLE_PATH" > "$DATABASE_KEY"
-	git -C "$DATABASE" add "$DATABASE_KEY"
-	git -C "$DATABASE" commit -m "update bundle to $BUNDLE_PATH"
-	rm -f /usr/local/bin/docker
-	cp "$CLIENT_PATH" /usr/local/bin
-	echo "Bundle installed. Restart Docker to use. To uninstall, reset Docker to factory defaults."
-	;;
-"undo")
-	git -C "$DATABASE" reset --hard >/dev/null
-	[ -f "$DATABASE_KEY" ] || errexit "bundle not set"
-	git -C "$DATABASE" rm "$DATABASE_KEY"
-	git -C "$DATABASE" commit -m "remove bundle"
-	rm -f /usr/local/bin/docker
-	ln -s "$HOME/Library/Group Containers/group.com.docker/bin/docker" /usr/local/bin
-	echo "Bundle removed. Using dev versions may cause issues, a reset to factory defaults is recommended."
-	;;
-esac
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-alpine.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-alpine.sh
deleted file mode 100755
index 47cd35ce62..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-alpine.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-set -e
-
-[ $(id -u) -eq 0 ] || {
-	printf >&2 '%s requires root\n' "$0"
-	exit 1
-}
-
-usage() {
-	printf >&2 '%s: [-r release] [-m mirror] [-s]  [-c additional repository]\n' "$0"
-	exit 1
-}
-
-tmp() {
-	TMP=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-XXXXXXXXXX)
-	ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/alpine-docker-rootfs-XXXXXXXXXX)
-	trap "rm -rf $TMP $ROOTFS" EXIT TERM INT
-}
-
-apkv() {
-	curl -sSL $MAINREPO/$ARCH/APKINDEX.tar.gz | tar -Oxz |
-		grep --text '^P:apk-tools-static$' -A1 | tail -n1 | cut -d: -f2
-}
-
-getapk() {
-	curl -sSL $MAINREPO/$ARCH/apk-tools-static-$(apkv).apk |
-		tar -xz -C $TMP sbin/apk.static
-}
-
-mkbase() {
-	$TMP/sbin/apk.static --repository $MAINREPO --update-cache --allow-untrusted \
-		--root $ROOTFS --initdb add alpine-base
-}
-
-conf() {
-	printf '%s\n' $MAINREPO > $ROOTFS/etc/apk/repositories
-	printf '%s\n' $ADDITIONALREPO >> $ROOTFS/etc/apk/repositories
-}
-
-pack() {
-	local id
-	id=$(tar --numeric-owner -C $ROOTFS -c . | docker import - alpine:$REL)
-
-	docker tag $id alpine:latest
-	docker run -i -t --rm alpine printf 'alpine:%s with id=%s created!\n' $REL $id
-}
-
-save() {
-	[ $SAVE -eq 1 ] || return
-
-	tar --numeric-owner -C $ROOTFS -c . | xz > rootfs.tar.xz
-}
-
-while getopts "hr:m:s" opt; do
-	case $opt in
-		r)
-			REL=$OPTARG
-			;;
-		m)
-			MIRROR=$OPTARG
-			;;
-		s)
-			SAVE=1
-			;;
-		c)
-			ADDITIONALREPO=community
-			;;
-		*)
-			usage
-			;;
-	esac
-done
-
-REL=${REL:-edge}
-MIRROR=${MIRROR:-http://nl.alpinelinux.org/alpine}
-SAVE=${SAVE:-0}
-MAINREPO=$MIRROR/$REL/main
-ADDITIONALREPO=$MIRROR/$REL/community
-ARCH=${ARCH:-$(uname -m)}
-
-tmp
-getapk
-mkbase
-conf
-pack
-save
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-arch-pacman.conf b/installer/vendor/github.com/docker/docker/contrib/mkimage-arch-pacman.conf
deleted file mode 100644
index 45fe03dc96..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-arch-pacman.conf
+++ /dev/null
@@ -1,92 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = auto
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-arch.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-arch.sh
deleted file mode 100755
index f941177122..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-arch.sh
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/usr/bin/env bash
-# Generate a minimal filesystem for archlinux and load it into the local
-# docker as "archlinux"
-# requires root
-set -e
-
-hash pacstrap &>/dev/null || {
-	echo "Could not find pacstrap. Run pacman -S arch-install-scripts"
-	exit 1
-}
-
-hash expect &>/dev/null || {
-	echo "Could not find expect. Run pacman -S expect"
-	exit 1
-}
-
-
-export LANG="C.UTF-8"
-
-ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-archlinux-XXXXXXXXXX)
-chmod 755 $ROOTFS
-
-# packages to ignore for space savings
-PKGIGNORE=(
-    cryptsetup
-    device-mapper
-    dhcpcd
-    iproute2
-    jfsutils
-    linux
-    lvm2
-    man-db
-    man-pages
-    mdadm
-    nano
-    netctl
-    openresolv
-    pciutils
-    pcmciautils
-    reiserfsprogs
-    s-nail
-    systemd-sysvcompat
-    usbutils
-    vi
-    xfsprogs
-)
-IFS=','
-PKGIGNORE="${PKGIGNORE[*]}"
-unset IFS
-
-arch="$(uname -m)"
-case "$arch" in
-	armv*)
-		if pacman -Q archlinuxarm-keyring >/dev/null 2>&1; then
-			pacman-key --init
-			pacman-key --populate archlinuxarm
-		else
-			echo "Could not find archlinuxarm-keyring. Please, install it and run pacman-key --populate archlinuxarm"
-			exit 1
-		fi
-		PACMAN_CONF=$(mktemp ${TMPDIR:-/var/tmp}/pacman-conf-archlinux-XXXXXXXXX)
-		version="$(echo $arch | cut -c 5)"
-		sed "s/Architecture = armv/Architecture = armv${version}h/g" './mkimage-archarm-pacman.conf' > "${PACMAN_CONF}"
-		PACMAN_MIRRORLIST='Server = http://mirror.archlinuxarm.org/$arch/$repo'
-		PACMAN_EXTRA_PKGS='archlinuxarm-keyring'
-		EXPECT_TIMEOUT=1800 # Most armv* based devices can be very slow (e.g. RPiv1)
-		ARCH_KEYRING=archlinuxarm
-		DOCKER_IMAGE_NAME="armv${version}h/archlinux"
-		;;
-	*)
-		PACMAN_CONF='./mkimage-arch-pacman.conf'
-		PACMAN_MIRRORLIST='Server = https://mirrors.kernel.org/archlinux/$repo/os/$arch'
-		PACMAN_EXTRA_PKGS=''
-		EXPECT_TIMEOUT=60
-		ARCH_KEYRING=archlinux
-		DOCKER_IMAGE_NAME=archlinux
-		;;
-esac
-
-export PACMAN_MIRRORLIST
-
-expect <<EOF
-	set send_slow {1 .1}
-	proc send {ignore arg} {
-		sleep .1
-		exp_send -s -- \$arg
-	}
-	set timeout $EXPECT_TIMEOUT
-
-	spawn pacstrap -C $PACMAN_CONF -c -d -G -i $ROOTFS base haveged $PACMAN_EXTRA_PKGS --ignore $PKGIGNORE
-	expect {
-		-exact "anyway? \[Y/n\] " { send -- "n\r"; exp_continue }
-		-exact "(default=all): " { send -- "\r"; exp_continue }
-		-exact "installation? \[Y/n\]" { send -- "y\r"; exp_continue }
-		-exact "delete it? \[Y/n\]" { send -- "y\r"; exp_continue }
-	}
-EOF
-
-arch-chroot $ROOTFS /bin/sh -c 'rm -r /usr/share/man/*'
-arch-chroot $ROOTFS /bin/sh -c "haveged -w 1024; pacman-key --init; pkill haveged; pacman -Rs --noconfirm haveged; pacman-key --populate $ARCH_KEYRING; pkill gpg-agent"
-arch-chroot $ROOTFS /bin/sh -c "ln -s /usr/share/zoneinfo/UTC /etc/localtime"
-echo 'en_US.UTF-8 UTF-8' > $ROOTFS/etc/locale.gen
-arch-chroot $ROOTFS locale-gen
-arch-chroot $ROOTFS /bin/sh -c 'echo $PACMAN_MIRRORLIST > /etc/pacman.d/mirrorlist'
-
-# udev doesn't work in containers, rebuild /dev
-DEV=$ROOTFS/dev
-rm -rf $DEV
-mkdir -p $DEV
-mknod -m 666 $DEV/null c 1 3
-mknod -m 666 $DEV/zero c 1 5
-mknod -m 666 $DEV/random c 1 8
-mknod -m 666 $DEV/urandom c 1 9
-mkdir -m 755 $DEV/pts
-mkdir -m 1777 $DEV/shm
-mknod -m 666 $DEV/tty c 5 0
-mknod -m 600 $DEV/console c 5 1
-mknod -m 666 $DEV/tty0 c 4 0
-mknod -m 666 $DEV/full c 1 7
-mknod -m 600 $DEV/initctl p
-mknod -m 666 $DEV/ptmx c 5 2
-ln -sf /proc/self/fd $DEV/fd
-
-tar --numeric-owner --xattrs --acls -C $ROOTFS -c . | docker import - $DOCKER_IMAGE_NAME
-docker run --rm -t $DOCKER_IMAGE_NAME echo Success.
-rm -rf $ROOTFS
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-archarm-pacman.conf b/installer/vendor/github.com/docker/docker/contrib/mkimage-archarm-pacman.conf
deleted file mode 100644
index f4b45f54d7..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-archarm-pacman.conf
+++ /dev/null
@@ -1,98 +0,0 @@
-#
-# /etc/pacman.conf
-#
-# See the pacman.conf(5) manpage for option and repository directives
-
-#
-# GENERAL OPTIONS
-#
-[options]
-# The following paths are commented out with their default values listed.
-# If you wish to use different paths, uncomment and update the paths.
-#RootDir     = /
-#DBPath      = /var/lib/pacman/
-#CacheDir    = /var/cache/pacman/pkg/
-#LogFile     = /var/log/pacman.log
-#GPGDir      = /etc/pacman.d/gnupg/
-HoldPkg     = pacman glibc
-#XferCommand = /usr/bin/curl -C - -f %u > %o
-#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
-#CleanMethod = KeepInstalled
-#UseDelta    = 0.7
-Architecture = armv
-
-# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
-#IgnorePkg   =
-#IgnoreGroup =
-
-#NoUpgrade   =
-#NoExtract   =
-
-# Misc options
-#UseSyslog
-#Color
-#TotalDownload
-# We cannot check disk space from within a chroot environment
-#CheckSpace
-#VerbosePkgLists
-
-# By default, pacman accepts packages signed by keys that its local keyring
-# trusts (see pacman-key and its man page), as well as unsigned packages.
-SigLevel    = Required DatabaseOptional
-LocalFileSigLevel = Optional
-#RemoteFileSigLevel = Required
-
-# NOTE: You must run `pacman-key --init` before first using pacman; the local
-# keyring can then be populated with the keys of all official Arch Linux
-# packagers with `pacman-key --populate archlinux`.
-
-#
-# REPOSITORIES
-#   - can be defined here or included from another file
-#   - pacman will search repositories in the order defined here
-#   - local/custom mirrors can be added here or in separate files
-#   - repositories listed first will take precedence when packages
-#     have identical names, regardless of version number
-#   - URLs will have $repo replaced by the name of the current repo
-#   - URLs will have $arch replaced by the name of the architecture
-#
-# Repository entries are of the format:
-#       [repo-name]
-#       Server = ServerName
-#       Include = IncludePath
-#
-# The header [repo-name] is crucial - it must be present and
-# uncommented to enable the repo.
-#
-
-# The testing repositories are disabled by default. To enable, uncomment the
-# repo name header and Include lines. You can add preferred servers immediately
-# after the header, and they will be used before the default mirrors.
-
-#[testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[core]
-Include = /etc/pacman.d/mirrorlist
-
-[extra]
-Include = /etc/pacman.d/mirrorlist
-
-#[community-testing]
-#Include = /etc/pacman.d/mirrorlist
-
-[community]
-Include = /etc/pacman.d/mirrorlist
-
-[alarm]
-Include = /etc/pacman.d/mirrorlist
-
-[aur]
-Include = /etc/pacman.d/mirrorlist
-
-# An example of a custom package repository.  See the pacman manpage for
-# tips on creating your own repositories.
-#[custom]
-#SigLevel = Optional TrustAll
-#Server = file:///home/custompkgs
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-busybox.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-busybox.sh
deleted file mode 100755
index b11a6bb265..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-busybox.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-# Generate a very minimal filesystem based on busybox-static,
-# and load it into the local docker under the name "busybox".
-
-echo >&2
-echo >&2 'warning: this script is deprecated - see mkimage.sh and mkimage/busybox-static'
-echo >&2
-
-BUSYBOX=$(which busybox)
-[ "$BUSYBOX" ] || {
-    echo "Sorry, I could not locate busybox."
-    echo "Try 'apt-get install busybox-static'?"
-    exit 1
-}
-
-set -e
-ROOTFS=${TMPDIR:-/var/tmp}/rootfs-busybox-$$-$RANDOM
-mkdir $ROOTFS
-cd $ROOTFS
-
-mkdir bin etc dev dev/pts lib proc sys tmp
-touch etc/resolv.conf
-cp /etc/nsswitch.conf etc/nsswitch.conf
-echo root:x:0:0:root:/:/bin/sh > etc/passwd
-echo root:x:0: > etc/group
-ln -s lib lib64
-ln -s bin sbin
-cp $BUSYBOX bin
-for X in $(busybox --list)
-do
-    ln -s busybox bin/$X
-done
-rm bin/init
-ln bin/busybox bin/init
-cp /lib/x86_64-linux-gnu/lib{pthread,c,dl,nsl,nss_*}.so.* lib
-cp /lib/x86_64-linux-gnu/ld-linux-x86-64.so.2 lib
-for X in console null ptmx random stdin stdout stderr tty urandom zero
-do
-    cp -a /dev/$X dev
-done
-
-tar --numeric-owner -cf- . | docker import - busybox
-docker run -i -u root busybox /bin/echo Success.
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-crux.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-crux.sh
deleted file mode 100755
index 3f0bdcae3c..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-crux.sh
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/usr/bin/env bash
-# Generate a minimal filesystem for CRUX/Linux and load it into the local
-# docker as "cruxlinux"
-# requires root and the crux iso (http://crux.nu)
-
-set -e
-
-die () {
-    echo >&2 "$@"
-    exit 1
-}
-
-[ "$#" -eq 1 ] || die "1 argument(s) required, $# provided. Usage: ./mkimage-crux.sh /path/to/iso"
-
-ISO=${1}
-
-ROOTFS=$(mktemp -d ${TMPDIR:-/var/tmp}/rootfs-crux-XXXXXXXXXX)
-CRUX=$(mktemp -d ${TMPDIR:-/var/tmp}/crux-XXXXXXXXXX)
-TMP=$(mktemp -d ${TMPDIR:-/var/tmp}/XXXXXXXXXX)
-
-VERSION=$(basename --suffix=.iso $ISO | sed 's/[^0-9.]*\([0-9.]*\).*/\1/')
-
-# Mount the ISO
-mount -o ro,loop $ISO $CRUX
-
-# Extract pkgutils
-tar -C $TMP -xf $CRUX/tools/pkgutils#*.pkg.tar.gz
-
-# Put pkgadd in the $PATH
-export PATH="$TMP/usr/bin:$PATH"
-
-# Install core packages
-mkdir -p $ROOTFS/var/lib/pkg
-touch $ROOTFS/var/lib/pkg/db
-for pkg in $CRUX/crux/core/*; do
-    pkgadd -r $ROOTFS $pkg
-done
-
-# Remove agetty and inittab config
-if (grep agetty ${ROOTFS}/etc/inittab 2>&1 > /dev/null); then
-    echo "Removing agetty from /etc/inittab ..."
-    chroot ${ROOTFS} sed -i -e "/agetty/d" /etc/inittab
-    chroot ${ROOTFS} sed -i -e "/shutdown/d" /etc/inittab
-    chroot ${ROOTFS} sed -i -e "/^$/N;/^\n$/d" /etc/inittab
-fi
-
-# Remove kernel source
-rm -rf $ROOTFS/usr/src/*
-
-# udev doesn't work in containers, rebuild /dev
-DEV=$ROOTFS/dev
-rm -rf $DEV
-mkdir -p $DEV
-mknod -m 666 $DEV/null c 1 3
-mknod -m 666 $DEV/zero c 1 5
-mknod -m 666 $DEV/random c 1 8
-mknod -m 666 $DEV/urandom c 1 9
-mkdir -m 755 $DEV/pts
-mkdir -m 1777 $DEV/shm
-mknod -m 666 $DEV/tty c 5 0
-mknod -m 600 $DEV/console c 5 1
-mknod -m 666 $DEV/tty0 c 4 0
-mknod -m 666 $DEV/full c 1 7
-mknod -m 600 $DEV/initctl p
-mknod -m 666 $DEV/ptmx c 5 2
-
-IMAGE_ID=$(tar --numeric-owner -C $ROOTFS -c . | docker import - crux:$VERSION)
-docker tag $IMAGE_ID crux:latest
-docker run -i -t crux echo Success.
-
-# Cleanup
-umount $CRUX
-rm -rf $ROOTFS
-rm -rf $CRUX
-rm -rf $TMP
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-debootstrap.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-debootstrap.sh
deleted file mode 100755
index 412a5ce0a7..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-debootstrap.sh
+++ /dev/null
@@ -1,297 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-echo >&2
-echo >&2 'warning: this script is deprecated - see mkimage.sh and mkimage/debootstrap'
-echo >&2
-
-variant='minbase'
-include='iproute,iputils-ping'
-arch='amd64' # intentionally undocumented for now
-skipDetection=
-strictDebootstrap=
-justTar=
-
-usage() {
-	echo >&2
-
-	echo >&2 "usage: $0 [options] repo suite [mirror]"
-
-	echo >&2
-	echo >&2 'options: (not recommended)'
-	echo >&2 "  -p set an http_proxy for debootstrap"
-	echo >&2 "  -v $variant # change default debootstrap variant"
-	echo >&2 "  -i $include # change default package includes"
-	echo >&2 "  -d # strict debootstrap (do not apply any docker-specific tweaks)"
-	echo >&2 "  -s # skip version detection and tagging (ie, precise also tagged as 12.04)"
-	echo >&2 "     # note that this will also skip adding universe and/or security/updates to sources.list"
-	echo >&2 "  -t # just create a tarball, especially for dockerbrew (uses repo as tarball name)"
-
-	echo >&2
-	echo >&2 "   ie: $0 username/debian squeeze"
-	echo >&2 "       $0 username/debian squeeze http://ftp.uk.debian.org/debian/"
-
-	echo >&2
-	echo >&2 "   ie: $0 username/ubuntu precise"
-	echo >&2 "       $0 username/ubuntu precise http://mirrors.melbourne.co.uk/ubuntu/"
-
-	echo >&2
-	echo >&2 "   ie: $0 -t precise.tar.bz2 precise"
-	echo >&2 "       $0 -t wheezy.tgz wheezy"
-	echo >&2 "       $0 -t wheezy-uk.tar.xz wheezy http://ftp.uk.debian.org/debian/"
-
-	echo >&2
-}
-
-# these should match the names found at http://www.debian.org/releases/
-debianStable=wheezy
-debianUnstable=sid
-# this should match the name found at http://releases.ubuntu.com/
-ubuntuLatestLTS=trusty
-# this should match the name found at http://releases.tanglu.org/
-tangluLatest=aequorea
-
-while getopts v:i:a:p:dst name; do
-	case "$name" in
-		p)
-			http_proxy="$OPTARG"
-			;;
-		v)
-			variant="$OPTARG"
-			;;
-		i)
-			include="$OPTARG"
-			;;
-		a)
-			arch="$OPTARG"
-			;;
-		d)
-			strictDebootstrap=1
-			;;
-		s)
-			skipDetection=1
-			;;
-		t)
-			justTar=1
-			;;
-		?)
-			usage
-			exit 0
-			;;
-	esac
-done
-shift $(($OPTIND - 1))
-
-repo="$1"
-suite="$2"
-mirror="${3:-}" # stick to the default debootstrap mirror if one is not provided
-
-if [ ! "$repo" ] || [ ! "$suite" ]; then
-	usage
-	exit 1
-fi
-
-# some rudimentary detection for whether we need to "sudo" our docker calls
-docker=''
-if docker version > /dev/null 2>&1; then
-	docker='docker'
-elif sudo docker version > /dev/null 2>&1; then
-	docker='sudo docker'
-elif command -v docker > /dev/null 2>&1; then
-	docker='docker'
-else
-	echo >&2 "warning: either docker isn't installed, or your current user cannot run it;"
-	echo >&2 "         this script is not likely to work as expected"
-	sleep 3
-	docker='docker' # give us a command-not-found later
-fi
-
-# make sure we have an absolute path to our final tarball so we can still reference it properly after we change directory
-if [ "$justTar" ]; then
-	if [ ! -d "$(dirname "$repo")" ]; then
-		echo >&2 "error: $(dirname "$repo") does not exist"
-		exit 1
-	fi
-	repo="$(cd "$(dirname "$repo")" && pwd -P)/$(basename "$repo")"
-fi
-
-# will be filled in later, if [ -z "$skipDetection" ]
-lsbDist=''
-
-target="${TMPDIR:-/var/tmp}/docker-rootfs-debootstrap-$suite-$$-$RANDOM"
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-returnTo="$(pwd -P)"
-
-if [ "$suite" = 'lucid' ]; then
-	# lucid fails and doesn't include gpgv in minbase; "apt-get update" fails
-	include+=',gpgv'
-fi
-
-set -x
-
-# bootstrap
-mkdir -p "$target"
-sudo http_proxy=$http_proxy debootstrap --verbose --variant="$variant" --include="$include" --arch="$arch" "$suite" "$target" "$mirror"
-
-cd "$target"
-
-if [ -z "$strictDebootstrap" ]; then
-	# prevent init scripts from running during install/update
-	#  policy-rc.d (for most scripts)
-	echo $'#!/bin/sh\nexit 101' | sudo tee usr/sbin/policy-rc.d > /dev/null
-	sudo chmod +x usr/sbin/policy-rc.d
-	#  initctl (for some pesky upstart scripts)
-	sudo chroot . dpkg-divert --local --rename --add /sbin/initctl
-	sudo ln -sf /bin/true sbin/initctl
-	# see https://github.com/docker/docker/issues/446#issuecomment-16953173
-
-	# shrink the image, since apt makes us fat (wheezy: ~157.5MB vs ~120MB)
-	sudo chroot . apt-get clean
-
-	if strings usr/bin/dpkg | grep -q unsafe-io; then
-		# while we're at it, apt is unnecessarily slow inside containers
-		#  this forces dpkg not to call sync() after package extraction and speeds up install
-		#    the benefit is huge on spinning disks, and the penalty is nonexistent on SSD or decent server virtualization
-		echo 'force-unsafe-io' | sudo tee etc/dpkg/dpkg.cfg.d/02apt-speedup > /dev/null
-		# we have this wrapped up in an "if" because the "force-unsafe-io"
-		# option was added in dpkg 1.15.8.6
-		# (see http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=584254#82),
-		# and ubuntu lucid/10.04 only has 1.15.5.6
-	fi
-
-	# we want to effectively run "apt-get clean" after every install to keep images small (see output of "apt-get clean -s" for context)
-	{
-		aptGetClean='"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true";'
-		echo "DPkg::Post-Invoke { ${aptGetClean} };"
-		echo "APT::Update::Post-Invoke { ${aptGetClean} };"
-		echo 'Dir::Cache::pkgcache ""; Dir::Cache::srcpkgcache "";'
-	} | sudo tee etc/apt/apt.conf.d/no-cache > /dev/null
-
-	# and remove the translations, too
-	echo 'Acquire::Languages "none";' | sudo tee etc/apt/apt.conf.d/no-languages > /dev/null
-
-	# helpful undo lines for each the above tweaks (for lack of a better home to keep track of them):
-	#  rm /usr/sbin/policy-rc.d
-	#  rm /sbin/initctl; dpkg-divert --rename --remove /sbin/initctl
-	#  rm /etc/dpkg/dpkg.cfg.d/02apt-speedup
-	#  rm /etc/apt/apt.conf.d/no-cache
-	#  rm /etc/apt/apt.conf.d/no-languages
-
-	if [ -z "$skipDetection" ]; then
-		# see also rudimentary platform detection in hack/install.sh
-		lsbDist=''
-		if [ -r etc/lsb-release ]; then
-			lsbDist="$(. etc/lsb-release && echo "$DISTRIB_ID")"
-		fi
-		if [ -z "$lsbDist" ] && [ -r etc/debian_version ]; then
-			lsbDist='Debian'
-		fi
-
-		case "$lsbDist" in
-			Debian)
-				# add the updates and security repositories
-				if [ "$suite" != "$debianUnstable" -a "$suite" != 'unstable' ]; then
-					# ${suite}-updates only applies to non-unstable
-					sudo sed -i "p; s/ $suite main$/ ${suite}-updates main/" etc/apt/sources.list
-
-					# same for security updates
-					echo "deb http://security.debian.org/ $suite/updates main" | sudo tee -a etc/apt/sources.list > /dev/null
-				fi
-				;;
-			Ubuntu)
-				# add the universe, updates, and security repositories
-				sudo sed -i "
-					s/ $suite main$/ $suite main universe/; p;
-					s/ $suite main/ ${suite}-updates main/; p;
-					s/ $suite-updates main/ ${suite}-security main/
-				" etc/apt/sources.list
-				;;
-			Tanglu)
-				# add the updates repository
-				if [ "$suite" = "$tangluLatest" ]; then
-					# ${suite}-updates only applies to stable Tanglu versions
-					sudo sed -i "p; s/ $suite main$/ ${suite}-updates main/" etc/apt/sources.list
-				fi
-				;;
-			SteamOS)
-				# add contrib and non-free
-				sudo sed -i "s/ $suite main$/ $suite main contrib non-free/" etc/apt/sources.list
-				;;
-		esac
-	fi
-
-	# make sure our packages lists are as up to date as we can get them
-	sudo chroot . apt-get update
-	sudo chroot . apt-get dist-upgrade -y
-fi
-
-if [ "$justTar" ]; then
-	# create the tarball file so it has the right permissions (ie, not root)
-	touch "$repo"
-
-	# fill the tarball
-	sudo tar --numeric-owner -caf "$repo" .
-else
-	# create the image (and tag $repo:$suite)
-	sudo tar --numeric-owner -c . | $docker import - $repo:$suite
-
-	# test the image
-	$docker run -i -t $repo:$suite echo success
-
-	if [ -z "$skipDetection" ]; then
-		case "$lsbDist" in
-			Debian)
-				if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
-					# tag latest
-					$docker tag $repo:$suite $repo:latest
-
-					if [ -r etc/debian_version ]; then
-						# tag the specific debian release version (which is only reasonable to tag on debian stable)
-						ver=$(cat etc/debian_version)
-						$docker tag $repo:$suite $repo:$ver
-					fi
-				fi
-				;;
-			Ubuntu)
-				if [ "$suite" = "$ubuntuLatestLTS" ]; then
-					# tag latest
-					$docker tag $repo:$suite $repo:latest
-				fi
-				if [ -r etc/lsb-release ]; then
-					lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
-					if [ "$lsbRelease" ]; then
-						# tag specific Ubuntu version number, if available (12.04, etc.)
-						$docker tag $repo:$suite $repo:$lsbRelease
-					fi
-				fi
-				;;
-			Tanglu)
-				if [ "$suite" = "$tangluLatest" ]; then
-					# tag latest
-					$docker tag $repo:$suite $repo:latest
-				fi
-				if [ -r etc/lsb-release ]; then
-					lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
-					if [ "$lsbRelease" ]; then
-						# tag specific Tanglu version number, if available (1.0, 2.0, etc.)
-						$docker tag $repo:$suite $repo:$lsbRelease
-					fi
-				fi
-				;;
-			SteamOS)
-				if [ -r etc/lsb-release ]; then
-					lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
-					if [ "$lsbRelease" ]; then
-						# tag specific SteamOS version number, if available (1.0, 2.0, etc.)
-						$docker tag $repo:$suite $repo:$lsbRelease
-					fi
-				fi
-				;;
-		esac
-	fi
-fi
-
-# cleanup
-cd "$returnTo"
-sudo rm -rf "$target"
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-pld.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-pld.sh
deleted file mode 100755
index 615c2030a3..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-pld.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-#
-# Generate a minimal filesystem for PLD Linux and load it into the local docker as "pld".
-# https://www.pld-linux.org/packages/docker
-#
-set -e
-
-if [ "$(id -u)" != "0" ]; then
-	echo >&2 "$0: requires root"
-	exit 1
-fi
-
-image_name=pld
-
-tmpdir=$(mktemp -d ${TMPDIR:-/var/tmp}/pld-docker-XXXXXX)
-root=$tmpdir/rootfs
-install -d -m 755 $root
-
-# to clean up:
-docker rmi $image_name || :
-
-# build
-rpm -r $root --initdb
-
-set +e
-install -d $root/dev/pts
-mknod $root/dev/random c 1 8 -m 644
-mknod $root/dev/urandom c 1 9 -m 644
-mknod $root/dev/full c 1 7 -m 666
-mknod $root/dev/null c 1 3 -m 666
-mknod $root/dev/zero c 1 5 -m 666
-mknod $root/dev/console c 5 1 -m 660
-set -e
-
-poldek -r $root --up --noask -u \
-	--noignore \
-	-O 'rpmdef=_install_langs C' \
-	-O 'rpmdef=_excludedocs 1' \
-	vserver-packages \
-	bash iproute2 coreutils grep poldek
-
-# fix netsharedpath, so containers would be able to install when some paths are mounted
-sed -i -e 's;^#%_netsharedpath.*;%_netsharedpath /dev/shm:/sys:/proc:/dev:/etc/hostname;' $root/etc/rpm/macros
-
-# no need for alternatives
-poldek-config -c $root/etc/poldek/poldek.conf ignore systemd-init
-
-# this makes initscripts to believe network is up
-touch $root/var/lock/subsys/network
-
-# cleanup large optional packages
-remove_packages="ca-certificates"
-for pkg in $remove_packages; do
-	rpm -r $root -q $pkg && rpm -r $root -e $pkg --nodeps
-done
-
-# cleanup more
-rm -v $root/etc/ld.so.cache
-rm -rfv $root/var/cache/hrmib/*
-rm -rfv $root/usr/share/man/man?/*
-rm -rfv $root/usr/share/locale/*/
-rm -rfv $root/usr/share/help/*/
-rm -rfv $root/usr/share/doc/*
-rm -rfv $root/usr/src/examples/*
-rm -rfv $root/usr/share/pixmaps/*
-
-# and import
-tar --numeric-owner --xattrs --acls -C $root -c . | docker import - $image_name
-
-# and test
-docker run -i -u root $image_name /bin/echo Success.
-
-rm -r $tmpdir
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-rinse.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-rinse.sh
deleted file mode 100755
index 7e0935062f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-rinse.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/usr/bin/env bash
-#
-# Create a base CentOS Docker image.
-
-# This script is useful on systems with rinse available (e.g.,
-# building a CentOS image on Debian).  See contrib/mkimage-yum.sh for
-# a way to build CentOS images on systems with yum installed.
-
-set -e
-
-echo >&2
-echo >&2 'warning: this script is deprecated - see mkimage.sh and mkimage/rinse'
-echo >&2
-
-repo="$1"
-distro="$2"
-mirror="$3"
-
-if [ ! "$repo" ] || [ ! "$distro" ]; then
-	self="$(basename $0)"
-	echo >&2 "usage: $self repo distro [mirror]"
-	echo >&2
-	echo >&2 "   ie: $self username/centos centos-5"
-	echo >&2 "       $self username/centos centos-6"
-	echo >&2
-	echo >&2 "   ie: $self username/slc slc-5"
-	echo >&2 "       $self username/slc slc-6"
-	echo >&2
-	echo >&2 "   ie: $self username/centos centos-5 http://vault.centos.org/5.8/os/x86_64/CentOS/"
-	echo >&2 "       $self username/centos centos-6 http://vault.centos.org/6.3/os/x86_64/Packages/"
-	echo >&2
-	echo >&2 'See /etc/rinse for supported values of "distro" and for examples of'
-	echo >&2 '  expected values of "mirror".'
-	echo >&2
-	echo >&2 'This script is tested to work with the original upstream version of rinse,'
-	echo >&2 '  found at http://www.steve.org.uk/Software/rinse/ and also in Debian at'
-	echo >&2 '  http://packages.debian.org/wheezy/rinse -- as always, YMMV.'
-	echo >&2
-	exit 1
-fi
-
-target="${TMPDIR:-/var/tmp}/docker-rootfs-rinse-$distro-$$-$RANDOM"
-
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-returnTo="$(pwd -P)"
-
-rinseArgs=( --arch amd64 --distribution "$distro" --directory "$target" )
-if [ "$mirror" ]; then
-	rinseArgs+=( --mirror "$mirror" )
-fi
-
-set -x
-
-mkdir -p "$target"
-
-sudo rinse "${rinseArgs[@]}"
-
-cd "$target"
-
-# rinse fails a little at setting up /dev, so we'll just wipe it out and create our own
-sudo rm -rf dev
-sudo mkdir -m 755 dev
-(
-	cd dev
-	sudo ln -sf /proc/self/fd ./
-	sudo mkdir -m 755 pts
-	sudo mkdir -m 1777 shm
-	sudo mknod -m 600 console c 5 1
-	sudo mknod -m 600 initctl p
-	sudo mknod -m 666 full c 1 7
-	sudo mknod -m 666 null c 1 3
-	sudo mknod -m 666 ptmx c 5 2
-	sudo mknod -m 666 random c 1 8
-	sudo mknod -m 666 tty c 5 0
-	sudo mknod -m 666 tty0 c 4 0
-	sudo mknod -m 666 urandom c 1 9
-	sudo mknod -m 666 zero c 1 5
-)
-
-# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
-#  locales
-sudo rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
-#  docs and man pages
-sudo rm -rf usr/share/{man,doc,info,gnome/help}
-#  cracklib
-sudo rm -rf usr/share/cracklib
-#  i18n
-sudo rm -rf usr/share/i18n
-#  yum cache
-sudo rm -rf var/cache/yum
-sudo mkdir -p --mode=0755 var/cache/yum
-#  sln
-sudo rm -rf sbin/sln
-#  ldconfig
-#sudo rm -rf sbin/ldconfig
-sudo rm -rf etc/ld.so.cache var/cache/ldconfig
-sudo mkdir -p --mode=0755 var/cache/ldconfig
-
-# allow networking init scripts inside the container to work without extra steps
-echo 'NETWORKING=yes' | sudo tee etc/sysconfig/network > /dev/null
-
-# to restore locales later:
-#  yum reinstall glibc-common
-
-version=
-if [ -r etc/redhat-release ]; then
-	version="$(sed -E 's/^[^0-9.]*([0-9.]+).*$/\1/' etc/redhat-release)"
-elif [ -r etc/SuSE-release ]; then
-	version="$(awk '/^VERSION/ { print $3 }' etc/SuSE-release)"
-fi
-
-if [ -z "$version" ]; then
-	echo >&2 "warning: cannot autodetect OS version, using $distro as tag"
-	sleep 20
-	version="$distro"
-fi
-
-sudo tar --numeric-owner -c . | docker import - $repo:$version
-
-docker run -i -t $repo:$version echo success
-
-cd "$returnTo"
-sudo rm -rf "$target"
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage-yum.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage-yum.sh
deleted file mode 100755
index 29da170480..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage-yum.sh
+++ /dev/null
@@ -1,136 +0,0 @@
-#!/usr/bin/env bash
-#
-# Create a base CentOS Docker image.
-#
-# This script is useful on systems with yum installed (e.g., building
-# a CentOS image on CentOS).  See contrib/mkimage-rinse.sh for a way
-# to build CentOS images on other systems.
-
-set -e
-
-usage() {
-    cat <<EOOPTS
-$(basename $0) [OPTIONS] <name>
-OPTIONS:
-  -p "<packages>"  The list of packages to install in the container.
-                   The default is blank.
-  -g "<groups>"    The groups of packages to install in the container.
-                   The default is "Core".
-  -y <yumconf>     The path to the yum config to install packages from. The
-                   default is /etc/yum.conf for Centos/RHEL and /etc/dnf/dnf.conf for Fedora
-EOOPTS
-    exit 1
-}
-
-# option defaults
-yum_config=/etc/yum.conf
-if [ -f /etc/dnf/dnf.conf ] && command -v dnf &> /dev/null; then
-	yum_config=/etc/dnf/dnf.conf
-	alias yum=dnf
-fi
-install_groups="Core"
-while getopts ":y:p:g:h" opt; do
-    case $opt in
-        y)
-            yum_config=$OPTARG
-            ;;
-        h)
-            usage
-            ;;
-        p)
-            install_packages="$OPTARG"
-            ;;
-        g)
-            install_groups="$OPTARG"
-            ;;
-        \?)
-            echo "Invalid option: -$OPTARG"
-            usage
-            ;;
-    esac
-done
-shift $((OPTIND - 1))
-name=$1
-
-if [[ -z $name ]]; then
-    usage
-fi
-
-target=$(mktemp -d --tmpdir $(basename $0).XXXXXX)
-
-set -x
-
-mkdir -m 755 "$target"/dev
-mknod -m 600 "$target"/dev/console c 5 1
-mknod -m 600 "$target"/dev/initctl p
-mknod -m 666 "$target"/dev/full c 1 7
-mknod -m 666 "$target"/dev/null c 1 3
-mknod -m 666 "$target"/dev/ptmx c 5 2
-mknod -m 666 "$target"/dev/random c 1 8
-mknod -m 666 "$target"/dev/tty c 5 0
-mknod -m 666 "$target"/dev/tty0 c 4 0
-mknod -m 666 "$target"/dev/urandom c 1 9
-mknod -m 666 "$target"/dev/zero c 1 5
-
-# amazon linux yum will fail without vars set
-if [ -d /etc/yum/vars ]; then
-	mkdir -p -m 755 "$target"/etc/yum
-	cp -a /etc/yum/vars "$target"/etc/yum/
-fi
-
-if [[ -n "$install_groups" ]];
-then
-    yum -c "$yum_config" --installroot="$target" --releasever=/ --setopt=tsflags=nodocs \
-        --setopt=group_package_types=mandatory -y groupinstall $install_groups
-fi
-
-if [[ -n "$install_packages" ]];
-then
-    yum -c "$yum_config" --installroot="$target" --releasever=/ --setopt=tsflags=nodocs \
-        --setopt=group_package_types=mandatory -y install $install_packages
-fi
-
-yum -c "$yum_config" --installroot="$target" -y clean all
-
-cat > "$target"/etc/sysconfig/network <<EOF
-NETWORKING=yes
-HOSTNAME=localhost.localdomain
-EOF
-
-# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target".
-#  locales
-rm -rf "$target"/usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
-#  docs and man pages
-rm -rf "$target"/usr/share/{man,doc,info,gnome/help}
-#  cracklib
-rm -rf "$target"/usr/share/cracklib
-#  i18n
-rm -rf "$target"/usr/share/i18n
-#  yum cache
-rm -rf "$target"/var/cache/yum
-mkdir -p --mode=0755 "$target"/var/cache/yum
-#  sln
-rm -rf "$target"/sbin/sln
-#  ldconfig
-rm -rf "$target"/etc/ld.so.cache "$target"/var/cache/ldconfig
-mkdir -p --mode=0755 "$target"/var/cache/ldconfig
-
-version=
-for file in "$target"/etc/{redhat,system}-release
-do
-    if [ -r "$file" ]; then
-        version="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' "$file")"
-        break
-    fi
-done
-
-if [ -z "$version" ]; then
-    echo >&2 "warning: cannot autodetect OS version, using '$name' as tag"
-    version=$name
-fi
-
-tar --numeric-owner -c -C "$target" . | docker import - $name:$version
-
-docker run -i -t --rm $name:$version /bin/bash -c 'echo success'
-
-rm -rf "$target"
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage.sh b/installer/vendor/github.com/docker/docker/contrib/mkimage.sh
deleted file mode 100755
index 13298c8036..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-mkimg="$(basename "$0")"
-
-usage() {
-	echo >&2 "usage: $mkimg [-d dir] [-t tag] [--compression algo| --no-compression] script [script-args]"
-	echo >&2 "   ie: $mkimg -t someuser/debian debootstrap --variant=minbase jessie"
-	echo >&2 "       $mkimg -t someuser/ubuntu debootstrap --include=ubuntu-minimal --components=main,universe trusty"
-	echo >&2 "       $mkimg -t someuser/busybox busybox-static"
-	echo >&2 "       $mkimg -t someuser/centos:5 rinse --distribution centos-5"
-	echo >&2 "       $mkimg -t someuser/mageia:4 mageia-urpmi --version=4"
-	echo >&2 "       $mkimg -t someuser/mageia:4 mageia-urpmi --version=4 --mirror=http://somemirror/"
-	echo >&2 "       $mkimg -t someuser/solaris solaris" 
-	exit 1
-}
-
-scriptDir="$(dirname "$(readlink -f "$BASH_SOURCE")")/mkimage"
-
-os=
-os=$(uname -o)
-
-# set up path to gnu tools if solaris
-[[ $os == "Solaris" ]] && export PATH=/usr/gnu/bin:$PATH 
-# TODO check for gnu-tar, gnu-getopt
-
-# TODO requires root/sudo due to some pkg operations. sigh.
-[[ $os == "Solaris" && $EUID != "0" ]] && echo >&2 "image create on Solaris requires superuser privilege"
-
-optTemp=$(getopt --options '+d:t:c:hC' --longoptions 'dir:,tag:,compression:,no-compression,help' --name "$mkimg" -- "$@")
-eval set -- "$optTemp"
-unset optTemp
-
-dir=
-tag=
-compression="auto"
-while true; do
-	case "$1" in
-		-d|--dir) dir="$2" ; shift 2 ;;
-		-t|--tag) tag="$2" ; shift 2 ;;
-		--compression)    compression="$2"   ; shift 2 ;;
-		--no-compression) compression="none" ; shift 1 ;;
-		-h|--help) usage ;;
-		--) shift ; break ;;
-	esac
-done
-
-script="$1"
-[ "$script" ] || usage
-shift
-
-if [ "$compression" == 'auto' ] || [ -z "$compression" ]
-then
-    compression='xz'
-fi
-
-[ "$compression" == 'none' ] && compression=''
-
-if [ ! -x "$scriptDir/$script" ]; then
-	echo >&2 "error: $script does not exist or is not executable"
-	echo >&2 "  see $scriptDir for possible scripts"
-	exit 1
-fi
-
-# don't mistake common scripts like .febootstrap-minimize as image-creators
-if [[ "$script" == .* ]]; then
-	echo >&2 "error: $script is a script helper, not a script"
-	echo >&2 "  see $scriptDir for possible scripts"
-	exit 1
-fi
-
-delDir=
-if [ -z "$dir" ]; then
-	dir="$(mktemp -d ${TMPDIR:-/var/tmp}/docker-mkimage.XXXXXXXXXX)"
-	delDir=1
-fi
-
-rootfsDir="$dir/rootfs"
-( set -x; mkdir -p "$rootfsDir" )
-
-# pass all remaining arguments to $script
-"$scriptDir/$script" "$rootfsDir" "$@"
-
-# Docker mounts tmpfs at /dev and procfs at /proc so we can remove them
-rm -rf "$rootfsDir/dev" "$rootfsDir/proc"
-mkdir -p "$rootfsDir/dev" "$rootfsDir/proc"
-
-# make sure /etc/resolv.conf has something useful in it
-mkdir -p "$rootfsDir/etc"
-cat > "$rootfsDir/etc/resolv.conf" <<'EOF'
-nameserver 8.8.8.8
-nameserver 8.8.4.4
-EOF
-
-tarFile="$dir/rootfs.tar${compression:+.$compression}"
-touch "$tarFile"
-
-(
-	set -x
-	tar --numeric-owner --create --auto-compress --file "$tarFile" --directory "$rootfsDir" --transform='s,^./,,' .
-)
-
-echo >&2 "+ cat > '$dir/Dockerfile'"
-cat > "$dir/Dockerfile" <<EOF
-FROM scratch
-ADD $(basename "$tarFile") /
-EOF
-
-# if our generated image has a decent shell, let's set a default command
-for shell in /bin/bash /usr/bin/fish /usr/bin/zsh /bin/sh; do
-	if [ -x "$rootfsDir/$shell" ]; then
-		( set -x; echo 'CMD ["'"$shell"'"]' >> "$dir/Dockerfile" )
-		break
-	fi
-done
-
-( set -x; rm -rf "$rootfsDir" )
-
-if [ "$tag" ]; then
-	( set -x; docker build -t "$tag" "$dir" )
-elif [ "$delDir" ]; then
-	# if we didn't specify a tag and we're going to delete our dir, let's just build an untagged image so that we did _something_
-	( set -x; docker build "$dir" )
-fi
-
-if [ "$delDir" ]; then
-	( set -x; rm -rf "$dir" )
-fi
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/.febootstrap-minimize b/installer/vendor/github.com/docker/docker/contrib/mkimage/.febootstrap-minimize
deleted file mode 100755
index 7749e63fb0..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/.febootstrap-minimize
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-rootfsDir="$1"
-shift
-
-(
-	cd "$rootfsDir"
-
-	# effectively: febootstrap-minimize --keep-zoneinfo --keep-rpmdb --keep-services "$target"
-	#  locales
-	rm -rf usr/{{lib,share}/locale,{lib,lib64}/gconv,bin/localedef,sbin/build-locale-archive}
-	#  docs and man pages
-	rm -rf usr/share/{man,doc,info,gnome/help}
-	#  cracklib
-	rm -rf usr/share/cracklib
-	#  i18n
-	rm -rf usr/share/i18n
-	#  yum cache
-	rm -rf var/cache/yum
-	mkdir -p --mode=0755 var/cache/yum
-	#  sln
-	rm -rf sbin/sln
-	#  ldconfig
-	#rm -rf sbin/ldconfig
-	rm -rf etc/ld.so.cache var/cache/ldconfig
-	mkdir -p --mode=0755 var/cache/ldconfig
-)
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/busybox-static b/installer/vendor/github.com/docker/docker/contrib/mkimage/busybox-static
deleted file mode 100755
index e15322b49d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/busybox-static
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-rootfsDir="$1"
-shift
-
-busybox="$(which busybox 2>/dev/null || true)"
-if [ -z "$busybox" ]; then
-	echo >&2 'error: busybox: not found'
-	echo >&2 '  install it with your distribution "busybox-static" package'
-	exit 1
-fi
-if ! ldd "$busybox" 2>&1 | grep -q 'not a dynamic executable'; then
-	echo >&2 "error: '$busybox' appears to be a dynamic executable"
-	echo >&2 '  you should install your distribution "busybox-static" package instead'
-	exit 1
-fi
-
-mkdir -p "$rootfsDir/bin"
-rm -f "$rootfsDir/bin/busybox" # just in case
-cp "$busybox" "$rootfsDir/bin/busybox"
-
-(
-	cd "$rootfsDir"
-
-	IFS=$'\n'
-	modules=( $(bin/busybox --list-modules) )
-	unset IFS
-
-	for module in "${modules[@]}"; do
-		mkdir -p "$(dirname "$module")"
-		ln -sf /bin/busybox "$module"
-	done
-)
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/debootstrap b/installer/vendor/github.com/docker/docker/contrib/mkimage/debootstrap
deleted file mode 100755
index 7d56d8ea9f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/debootstrap
+++ /dev/null
@@ -1,226 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-rootfsDir="$1"
-shift
-
-# we have to do a little fancy footwork to make sure "rootfsDir" becomes the second non-option argument to debootstrap
-
-before=()
-while [ $# -gt 0 ] && [[ "$1" == -* ]]; do
-	before+=( "$1" )
-	shift
-done
-
-suite="$1"
-shift
-
-# get path to "chroot" in our current PATH
-chrootPath="$(type -P chroot)"
-rootfs_chroot() {
-	# "chroot" doesn't set PATH, so we need to set it explicitly to something our new debootstrap chroot can use appropriately!
-
-	# set PATH and chroot away!
-	PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin' \
-		"$chrootPath" "$rootfsDir" "$@"
-}
-
-# allow for DEBOOTSTRAP=qemu-debootstrap ./mkimage.sh ...
-: ${DEBOOTSTRAP:=debootstrap}
-
-(
-	set -x
-	$DEBOOTSTRAP "${before[@]}" "$suite" "$rootfsDir" "$@"
-)
-
-# now for some Docker-specific tweaks
-
-# prevent init scripts from running during install/update
-echo >&2 "+ echo exit 101 > '$rootfsDir/usr/sbin/policy-rc.d'"
-cat > "$rootfsDir/usr/sbin/policy-rc.d" <<-'EOF'
-	#!/bin/sh
-
-	# For most Docker users, "apt-get install" only happens during "docker build",
-	# where starting services doesn't work and often fails in humorous ways. This
-	# prevents those failures by stopping the services from attempting to start.
-
-	exit 101
-EOF
-chmod +x "$rootfsDir/usr/sbin/policy-rc.d"
-
-# prevent upstart scripts from running during install/update
-(
-	set -x
-	rootfs_chroot dpkg-divert --local --rename --add /sbin/initctl
-	cp -a "$rootfsDir/usr/sbin/policy-rc.d" "$rootfsDir/sbin/initctl"
-	sed -i 's/^exit.*/exit 0/' "$rootfsDir/sbin/initctl"
-)
-
-# shrink a little, since apt makes us cache-fat (wheezy: ~157.5MB vs ~120MB)
-( set -x; rootfs_chroot apt-get clean )
-
-# this file is one APT creates to make sure we don't "autoremove" our currently
-# in-use kernel, which doesn't really apply to debootstraps/Docker images that
-# don't even have kernels installed
-rm -f "$rootfsDir/etc/apt/apt.conf.d/01autoremove-kernels"
-
-# Ubuntu 10.04 sucks... :)
-if strings "$rootfsDir/usr/bin/dpkg" | grep -q unsafe-io; then
-	# force dpkg not to call sync() after package extraction (speeding up installs)
-	echo >&2 "+ echo force-unsafe-io > '$rootfsDir/etc/dpkg/dpkg.cfg.d/docker-apt-speedup'"
-	cat > "$rootfsDir/etc/dpkg/dpkg.cfg.d/docker-apt-speedup" <<-'EOF'
-		# For most Docker users, package installs happen during "docker build", which
-		# doesn't survive power loss and gets restarted clean afterwards anyhow, so
-		# this minor tweak gives us a nice speedup (much nicer on spinning disks,
-		# obviously).
-
-		force-unsafe-io
-	EOF
-fi
-
-if [ -d "$rootfsDir/etc/apt/apt.conf.d" ]; then
-	# _keep_ us lean by effectively running "apt-get clean" after every install
-	aptGetClean='"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true";'
-	echo >&2 "+ cat > '$rootfsDir/etc/apt/apt.conf.d/docker-clean'"
-	cat > "$rootfsDir/etc/apt/apt.conf.d/docker-clean" <<-EOF
-		# Since for most Docker users, package installs happen in "docker build" steps,
-		# they essentially become individual layers due to the way Docker handles
-		# layering, especially using CoW filesystems.  What this means for us is that
-		# the caches that APT keeps end up just wasting space in those layers, making
-		# our layers unnecessarily large (especially since we'll normally never use
-		# these caches again and will instead just "docker build" again and make a brand
-		# new image).
-
-		# Ideally, these would just be invoking "apt-get clean", but in our testing,
-		# that ended up being cyclic and we got stuck on APT's lock, so we get this fun
-		# creation that's essentially just "apt-get clean".
-		DPkg::Post-Invoke { ${aptGetClean} };
-		APT::Update::Post-Invoke { ${aptGetClean} };
-
-		Dir::Cache::pkgcache "";
-		Dir::Cache::srcpkgcache "";
-
-		# Note that we do realize this isn't the ideal way to do this, and are always
-		# open to better suggestions (https://github.com/docker/docker/issues).
-	EOF
-
-	# remove apt-cache translations for fast "apt-get update"
-	echo >&2 "+ echo Acquire::Languages 'none' > '$rootfsDir/etc/apt/apt.conf.d/docker-no-languages'"
-	cat > "$rootfsDir/etc/apt/apt.conf.d/docker-no-languages" <<-'EOF'
-		# In Docker, we don't often need the "Translations" files, so we're just wasting
-		# time and space by downloading them, and this inhibits that.  For users that do
-		# need them, it's a simple matter to delete this file and "apt-get update". :)
-
-		Acquire::Languages "none";
-	EOF
-
-	echo >&2 "+ echo Acquire::GzipIndexes 'true' > '$rootfsDir/etc/apt/apt.conf.d/docker-gzip-indexes'"
-	cat > "$rootfsDir/etc/apt/apt.conf.d/docker-gzip-indexes" <<-'EOF'
-		# Since Docker users using "RUN apt-get update && apt-get install -y ..." in
-		# their Dockerfiles don't go delete the lists files afterwards, we want them to
-		# be as small as possible on-disk, so we explicitly request "gz" versions and
-		# tell Apt to keep them gzipped on-disk.
-
-		# For comparison, an "apt-get update" layer without this on a pristine
-		# "debian:wheezy" base image was "29.88 MB", where with this it was only
-		# "8.273 MB".
-
-		Acquire::GzipIndexes "true";
-		Acquire::CompressionTypes::Order:: "gz";
-	EOF
-
-	# update "autoremove" configuration to be aggressive about removing suggests deps that weren't manually installed
-	echo >&2 "+ echo Apt::AutoRemove::SuggestsImportant 'false' > '$rootfsDir/etc/apt/apt.conf.d/docker-autoremove-suggests'"
-	cat > "$rootfsDir/etc/apt/apt.conf.d/docker-autoremove-suggests" <<-'EOF'
-		# Since Docker users are looking for the smallest possible final images, the
-		# following emerges as a very common pattern:
-
-		#   RUN apt-get update \
-		#       && apt-get install -y <packages> \
-		#       && <do some compilation work> \
-		#       && apt-get purge -y --auto-remove <packages>
-
-		# By default, APT will actually _keep_ packages installed via Recommends or
-		# Depends if another package Suggests them, even and including if the package
-		# that originally caused them to be installed is removed.  Setting this to
-		# "false" ensures that APT is appropriately aggressive about removing the
-		# packages it added.
-
-		# https://aptitude.alioth.debian.org/doc/en/ch02s05s05.html#configApt-AutoRemove-SuggestsImportant
-		Apt::AutoRemove::SuggestsImportant "false";
-	EOF
-fi
-
-if [ -z "$DONT_TOUCH_SOURCES_LIST" ]; then
-	# tweak sources.list, where appropriate
-	lsbDist=
-	if [ -z "$lsbDist" -a -r "$rootfsDir/etc/os-release" ]; then
-		lsbDist="$(. "$rootfsDir/etc/os-release" && echo "$ID")"
-	fi
-	if [ -z "$lsbDist" -a -r "$rootfsDir/etc/lsb-release" ]; then
-		lsbDist="$(. "$rootfsDir/etc/lsb-release" && echo "$DISTRIB_ID")"
-	fi
-	if [ -z "$lsbDist" -a -r "$rootfsDir/etc/debian_version" ]; then
-		lsbDist='Debian'
-	fi
-	# normalize to lowercase for easier matching
-	lsbDist="$(echo "$lsbDist" | tr '[:upper:]' '[:lower:]')"
-	case "$lsbDist" in
-		debian)
-			# updates and security!
-			if [ "$suite" != 'sid' -a "$suite" != 'unstable' ]; then
-				(
-					set -x
-					sed -i "
-						p;
-						s/ $suite / ${suite}-updates /
-					" "$rootfsDir/etc/apt/sources.list"
-					echo "deb http://security.debian.org $suite/updates main" >> "$rootfsDir/etc/apt/sources.list"
-				)
-			fi
-			;;
-		ubuntu)
-			# add the updates and security repositories
-			(
-				set -x
-				sed -i "
-					p;
-					s/ $suite / ${suite}-updates /; p;
-					s/ $suite-updates / ${suite}-security /
-				" "$rootfsDir/etc/apt/sources.list"
-			)
-			;;
-		tanglu)
-			# add the updates repository
-			if [ "$suite" != 'devel' ]; then
-				(
-					set -x
-					sed -i "
-						p;
-						s/ $suite / ${suite}-updates /
-					" "$rootfsDir/etc/apt/sources.list"
-				)
-			fi
-			;;
-		steamos)
-			# add contrib and non-free if "main" is the only component
-			(
-				set -x
-				sed -i "s/ $suite main$/ $suite main contrib non-free/" "$rootfsDir/etc/apt/sources.list"
-			)
-			;;
-	esac
-fi
-
-(
-	set -x
-
-	# make sure we're fully up-to-date
-	rootfs_chroot sh -xc 'apt-get update && apt-get dist-upgrade -y'
-
-	# delete all the apt list files since they're big and get stale quickly
-	rm -rf "$rootfsDir/var/lib/apt/lists"/*
-	# this forces "apt-get update" in dependent images, which is also good
-
-	mkdir "$rootfsDir/var/lib/apt/lists/partial" # Lucid... "E: Lists directory /var/lib/apt/lists/partial is missing."
-)
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/mageia-urpmi b/installer/vendor/github.com/docker/docker/contrib/mkimage/mageia-urpmi
deleted file mode 100755
index 93fb289cac..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/mageia-urpmi
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-#
-# Needs to be run from Mageia 4 or greater for kernel support for docker.
-#
-# Mageia 4 does not have docker available in official repos, so please
-# install and run the docker binary manually.
-#
-# Tested working versions are for Mageia 2 onwards (inc. cauldron).
-#
-set -e
-
-rootfsDir="$1"
-shift
-
-optTemp=$(getopt --options '+v:,m:' --longoptions 'version:,mirror:' --name mageia-urpmi -- "$@")
-eval set -- "$optTemp"
-unset optTemp
-
-installversion=
-mirror=
-while true; do
-	case "$1" in
-		-v|--version) installversion="$2" ; shift 2 ;;
-		-m|--mirror) mirror="$2" ; shift 2 ;;
-		--) shift ; break ;;
-	esac
-done
-
-if [ -z $installversion ]; then
-	# Attempt to match host version
-	if [ -r /etc/mageia-release ]; then
-		installversion="$(sed 's/^[^0-9\]*\([0-9.]\+\).*$/\1/' /etc/mageia-release)"
-	else
-		echo "Error: no version supplied and unable to detect host mageia version"
-		exit 1
-	fi
-fi
-
-if [ -z $mirror ]; then
-	# No mirror provided, default to mirrorlist
-	mirror="--mirrorlist https://mirrors.mageia.org/api/mageia.$installversion.x86_64.list"
-fi
-
-(
-	set -x
-	urpmi.addmedia --distrib \
-		$mirror \
-		--urpmi-root "$rootfsDir"
-	urpmi basesystem-minimal urpmi \
-		--auto \
-		--no-suggests \
-		--urpmi-root "$rootfsDir" \
-		--root "$rootfsDir"
-)
-
-"$(dirname "$BASH_SOURCE")/.febootstrap-minimize" "$rootfsDir"
-
-if [ -d "$rootfsDir/etc/sysconfig" ]; then
-	# allow networking init scripts inside the container to work without extra steps
-	echo 'NETWORKING=yes' > "$rootfsDir/etc/sysconfig/network"
-fi
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/rinse b/installer/vendor/github.com/docker/docker/contrib/mkimage/rinse
deleted file mode 100755
index 75eb4f0d9d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/rinse
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-rootfsDir="$1"
-shift
-
-# specifying --arch below is safe because "$@" can override it and the "latest" one wins :)
-
-(
-	set -x
-	rinse --directory "$rootfsDir" --arch amd64 "$@"
-)
-
-"$(dirname "$BASH_SOURCE")/.febootstrap-minimize" "$rootfsDir"
-
-if [ -d "$rootfsDir/etc/sysconfig" ]; then
-	# allow networking init scripts inside the container to work without extra steps
-	echo 'NETWORKING=yes' > "$rootfsDir/etc/sysconfig/network"
-fi
-
-# make sure we're fully up-to-date, too
-(
-	set -x
-	chroot "$rootfsDir" yum update -y
-)
diff --git a/installer/vendor/github.com/docker/docker/contrib/mkimage/solaris b/installer/vendor/github.com/docker/docker/contrib/mkimage/solaris
deleted file mode 100755
index 158970e69e..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/mkimage/solaris
+++ /dev/null
@@ -1,89 +0,0 @@
-#!/usr/bin/env bash
-#
-# Solaris 12 base image build script. 
-#
-set -e
-
-# TODO add optional package publisher origin
-
-rootfsDir="$1"
-shift
-
-# base install
-(
-	set -x
-
-	pkg image-create --full --zone \
-		--facet facet.locale.*=false \
-		--facet facet.locale.POSIX=true \
-		--facet facet.doc=false \
-		--facet facet.doc.*=false \
-		"$rootfsDir"
-
-	pkg -R "$rootfsDir" set-property use-system-repo true
-
-	pkg -R "$rootfsDir" set-property flush-content-cache-on-success true
-
-	pkg -R "$rootfsDir" install core-os
-)
-
-# Lay in stock configuration, set up milestone
-# XXX This all may become optional in a base image
-(
-	# faster to build repository database on tmpfs
-	REPO_DB=/system/volatile/repository.$$
-	export SVCCFG_REPOSITORY=${REPO_DB}
-	export SVCCFG_DOOR_PATH=$rootfsDir/system/volatile/tmp_repo_door
-
-	# Import base manifests. NOTE These are a combination of basic requirement
-	# and gleaned from container milestone manifest. They may change.
-	for m in $rootfsDir/lib/svc/manifest/system/environment.xml \
-		$rootfsDir/lib/svc/manifest/system/svc/global.xml \
-		$rootfsDir/lib/svc/manifest/system/svc/restarter.xml \
-		$rootfsDir/lib/svc/manifest/network/dns/client.xml \
-		$rootfsDir/lib/svc/manifest/system/name-service/switch.xml \
-		$rootfsDir/lib/svc/manifest/system/name-service/cache.xml \
-		$rootfsDir/lib/svc/manifest/milestone/container.xml ; do
-		svccfg import $m
-	done
-
-	# Apply system layer profile, deleting unnecessary dependencies
-	svccfg apply $rootfsDir/etc/svc/profile/generic_container.xml 
-
-	# XXX Even if we keep a repo in the base image, this is definitely optional
-	svccfg apply $rootfsDir/etc/svc/profile/sysconfig/container_sc.xml
-
-	for s in svc:/system/svc/restarter \
-		svc:/system/environment \
-		svc:/network/dns/client \
-		svc:/system/name-service/switch \
-		svc:/system/name-service/cache \
-		svc:/system/svc/global \
-		svc:/milestone/container ;do
-		svccfg -s $s refresh
-	done
-
-	# now copy the built up repository into the base rootfs
-	mv $REPO_DB $rootfsDir/etc/svc/repository.db
-)
-
-# pkg(1) needs the zoneproxy-client running in the container.
-# use a simple wrapper to run it as needed.
-# XXX maybe we go back to running this in SMF?
-mv "$rootfsDir/usr/bin/pkg" "$rootfsDir/usr/bin/wrapped_pkg"
-cat > "$rootfsDir/usr/bin/pkg" <<-'EOF'
-#!/bin/sh
-#
-# THIS FILE CREATED DURING DOCKER BASE IMAGE CREATION
-# 
-# The Solaris base image uses the sysrepo proxy mechanism. The
-# IPS client pkg(1) requires the zoneproxy-client to reach the
-# remote publisher origins through the host. This wrapper script
-# enables and disables the proxy client as needed. This is a
-# temporary solution.
-
-/usr/lib/zones/zoneproxy-client -s localhost:1008
-PKG_SYSREPO_URL=http://localhost:1008 /usr/bin/wrapped_pkg "$@"
-pkill -9 zoneproxy-client
-EOF
-chmod +x "$rootfsDir/usr/bin/pkg"
diff --git a/installer/vendor/github.com/docker/docker/contrib/nnp-test/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/nnp-test/Dockerfile
deleted file mode 100644
index 026d86954f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/nnp-test/Dockerfile
+++ /dev/null
@@ -1,9 +0,0 @@
-FROM buildpack-deps:jessie
-
-COPY . /usr/src/
-
-WORKDIR /usr/src/
-
-RUN gcc -g -Wall -static nnp-test.c -o /usr/bin/nnp-test
-
-RUN chmod +s /usr/bin/nnp-test
diff --git a/installer/vendor/github.com/docker/docker/contrib/nnp-test/nnp-test.c b/installer/vendor/github.com/docker/docker/contrib/nnp-test/nnp-test.c
deleted file mode 100644
index b767da7e1a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/nnp-test/nnp-test.c
+++ /dev/null
@@ -1,10 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-
-int main(int argc, char *argv[])
-{
-        printf("EUID=%d\n", geteuid());
-        return 0;
-}
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/nuke-graph-directory.sh b/installer/vendor/github.com/docker/docker/contrib/nuke-graph-directory.sh
deleted file mode 100755
index 5eeb45c8bd..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/nuke-graph-directory.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/sh
-set -e
-
-dir="$1"
-
-if [ -z "$dir" ]; then
-	{
-		echo 'This script is for destroying old /var/lib/docker directories more safely than'
-		echo '  "rm -rf", which can cause data loss or other serious issues.'
-		echo
-		echo "usage: $0 directory"
-		echo "   ie: $0 /var/lib/docker"
-	} >&2
-	exit 1
-fi
-
-if [ "$(id -u)" != 0 ]; then
-	echo >&2 "error: $0 must be run as root"
-	exit 1
-fi
-
-if [ ! -d "$dir" ]; then
-	echo >&2 "error: $dir is not a directory"
-	exit 1
-fi
-
-dir="$(readlink -f "$dir")"
-
-echo
-echo "Nuking $dir ..."
-echo '  (if this is wrong, press Ctrl+C NOW!)'
-echo
-
-( set -x; sleep 10 )
-echo
-
-dir_in_dir() {
-	inner="$1"
-	outer="$2"
-	[ "${inner#$outer}" != "$inner" ]
-}
-
-# let's start by unmounting any submounts in $dir
-#   (like -v /home:... for example - DON'T DELETE MY HOME DIRECTORY BRU!)
-for mount in $(awk '{ print $5 }' /proc/self/mountinfo); do
-	mount="$(readlink -f "$mount" || true)"
-	if [ "$dir" != "$mount" ] && dir_in_dir "$mount" "$dir"; then
-		( set -x; umount -f "$mount" )
-	fi
-done
-
-# now, let's go destroy individual btrfs subvolumes, if any exist
-if command -v btrfs > /dev/null 2>&1; then
-	# Find btrfs subvolumes under $dir checking for inode 256
-	# Source: http://stackoverflow.com/a/32865333
-	for subvol in $(find "$dir" -type d -inum 256 | sort -r); do
-		if [ "$dir" != "$subvol" ]; then
-			( set -x; btrfs subvolume delete "$subvol" )
-		fi
-	done
-fi
-
-# finally, DESTROY ALL THINGS
-( shopt -s dotglob; set -x; rm -rf "$dir"/* )
diff --git a/installer/vendor/github.com/docker/docker/contrib/project-stats.sh b/installer/vendor/github.com/docker/docker/contrib/project-stats.sh
deleted file mode 100755
index 2691c72ffb..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/project-stats.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-## Run this script from the root of the docker repository
-## to query project stats useful to the maintainers.
-## You will need to install `pulls` and `issues` from
-## https://github.com/crosbymichael/pulls
-
-set -e
-
-echo -n "Open pulls: "
-PULLS=$(pulls | wc -l); let PULLS=$PULLS-1
-echo $PULLS
-
-echo -n "Pulls alru: "
-pulls alru
-
-echo -n "Open issues: "
-ISSUES=$(issues list | wc -l); let ISSUES=$ISSUES-1
-echo $ISSUES
-
-echo -n "Issues alru: "
-issues alru
diff --git a/installer/vendor/github.com/docker/docker/contrib/report-issue.sh b/installer/vendor/github.com/docker/docker/contrib/report-issue.sh
deleted file mode 100755
index cb54f1a5bc..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/report-issue.sh
+++ /dev/null
@@ -1,105 +0,0 @@
-#!/bin/sh
-
-# This is a convenience script for reporting issues that include a base
-# template of information. See https://github.com/docker/docker/pull/8845
-
-set -e
-
-DOCKER_ISSUE_URL=${DOCKER_ISSUE_URL:-"https://github.com/docker/docker/issues/new"}
-DOCKER_ISSUE_NAME_PREFIX=${DOCKER_ISSUE_NAME_PREFIX:-"Report: "}
-DOCKER=${DOCKER:-"docker"}
-DOCKER_COMMAND="${DOCKER}"
-export DOCKER_COMMAND
-
-# pulled from https://gist.github.com/cdown/1163649
-function urlencode() {
-	# urlencode <string>
-
-	local length="${#1}"
-	for (( i = 0; i < length; i++ )); do
-			local c="${1:i:1}"
-			case $c in
-					[a-zA-Z0-9.~_-]) printf "$c" ;;
-					*) printf '%%%02X' "'$c"
-			esac
-	done
-}
-
-function template() {
-# this should always match the template from CONTRIBUTING.md
-	cat <<- EOM
-	Description of problem:
-
-
-	\`docker version\`:
-	`${DOCKER_COMMAND} -D version`
-
-
-	\`docker info\`:
-	`${DOCKER_COMMAND} -D info`
-
-
-	\`uname -a\`:
-	`uname -a`
-
-
-	Environment details (AWS, VirtualBox, physical, etc.):
-
-
-	How reproducible:
-
-
-	Steps to Reproduce:
-	1.
-	2.
-	3.
-
-
-	Actual Results:
-
-
-	Expected Results:
-
-
-	Additional info:
-
-
-	EOM
-}
-
-function format_issue_url() {
-	if [ ${#@} -ne 2 ] ; then
-		return 1
-	fi
-	local issue_name=$(urlencode "${DOCKER_ISSUE_NAME_PREFIX}${1}")
-	local issue_body=$(urlencode "${2}")
-	echo "${DOCKER_ISSUE_URL}?title=${issue_name}&body=${issue_body}"
-}
-
-
-echo -ne "Do you use \`sudo\` to call docker? [y|N]: "
-read -r -n 1 use_sudo
-echo ""
-
-if [ "x${use_sudo}" = "xy" -o "x${use_sudo}" = "xY" ]; then
-	export DOCKER_COMMAND="sudo ${DOCKER}"
-fi
-
-echo -ne "Title of new issue?: "
-read -r issue_title
-echo ""
-
-issue_url=$(format_issue_url "${issue_title}" "$(template)")
-
-if which xdg-open 2>/dev/null >/dev/null ; then
-	echo -ne "Would like to launch this report in your browser? [Y|n]: "
-	read -r -n 1 launch_now
-	echo ""
-
-	if [ "${launch_now}" != "n" -a "${launch_now}" != "N" ]; then
-		xdg-open "${issue_url}"
-	fi
-fi
-
-echo "If you would like to manually open the url, you can open this link if your browser: ${issue_url}"
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/reprepro/suites.sh b/installer/vendor/github.com/docker/docker/contrib/reprepro/suites.sh
deleted file mode 100755
index 9ecf99d465..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/reprepro/suites.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-cd "$(dirname "$BASH_SOURCE")/../.."
-
-targets_from() {
-       git fetch -q https://github.com/docker/docker.git "$1"
-       git ls-tree -r --name-only "$(git rev-parse FETCH_HEAD)" contrib/builder/deb/ | grep '/Dockerfile$' | sed -r 's!^contrib/builder/deb/|^contrib/builder/deb/amd64/|-debootstrap|/Dockerfile$!!g' | grep -v /
-}
-
-release_branch=$(git ls-remote --heads https://github.com/docker/docker.git | awk -F 'refs/heads/' '$2 ~ /^release/ { print $2 }' | sort -V | tail -1)
-{ targets_from master; targets_from "$release_branch"; } | sort -u
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/Makefile b/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/Makefile
deleted file mode 100644
index 16df33ef32..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TARGETS?=docker
-MODULES?=${TARGETS:=.pp.bz2}
-SHAREDIR?=/usr/share
-
-all: ${TARGETS:=.pp.bz2}
-
-%.pp.bz2: %.pp
-	@echo Compressing $^ -\> $@
-	bzip2 -9 $^
-
-%.pp: %.te
-	make -f ${SHAREDIR}/selinux/devel/Makefile $@
-
-clean:
-	rm -f *~  *.tc *.pp *.pp.bz2
-	rm -rf tmp *.tar.gz
-
-man: install
-	sepolicy manpage --domain ${TARGETS}_t
-
-install:
-	semodule -i ${TARGETS}
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/README.md b/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/README.md
deleted file mode 100644
index 7ea3117a89..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/README.md
+++ /dev/null
@@ -1 +0,0 @@
-SELinux policy for docker
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.fc b/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.fc
deleted file mode 100644
index d6cb0e5792..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.fc
+++ /dev/null
@@ -1,29 +0,0 @@
-/root/\.docker	gen_context(system_u:object_r:docker_home_t,s0)
-
-/usr/bin/docker			--	gen_context(system_u:object_r:docker_exec_t,s0)
-/usr/bin/docker-novolume-plugin		--	gen_context(system_u:object_r:docker_auth_exec_t,s0)
-/usr/lib/docker/docker-novolume-plugin	--	gen_context(system_u:object_r:docker_auth_exec_t,s0)
-
-/usr/lib/systemd/system/docker.service		--	gen_context(system_u:object_r:docker_unit_file_t,s0)
-/usr/lib/systemd/system/docker-novolume-plugin.service	--	gen_context(system_u:object_r:docker_unit_file_t,s0)
-
-/etc/docker(/.*)?		gen_context(system_u:object_r:docker_config_t,s0)
-
-/var/lib/docker(/.*)?		gen_context(system_u:object_r:docker_var_lib_t,s0)
-/var/lib/kublet(/.*)?		gen_context(system_u:object_r:docker_var_lib_t,s0)
-/var/lib/docker/vfs(/.*)?	gen_context(system_u:object_r:svirt_sandbox_file_t,s0)
-
-/var/run/docker(/.*)?		gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker\.pid		--	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker\.sock		-s	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker-client(/.*)?		gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker/plugins(/.*)?		gen_context(system_u:object_r:docker_plugin_var_run_t,s0)
-
-/var/lock/lxc(/.*)?		gen_context(system_u:object_r:docker_lock_t,s0)
-
-/var/log/lxc(/.*)?		gen_context(system_u:object_r:docker_log_t,s0)
-
-/var/lib/docker/init(/.*)?		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hosts		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hostname		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/.*/config\.env	gen_context(system_u:object_r:docker_share_t,s0)
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.if b/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.if
deleted file mode 100644
index e087e8b98b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.if
+++ /dev/null
@@ -1,523 +0,0 @@
-
-## <summary>The open-source application container engine.</summary>
-
-########################################
-## <summary>
-##	Execute docker in the docker domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_domtrans',`
-	gen_require(`
-		type docker_t, docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, docker_exec_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Execute docker in the caller domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_exec',`
-	gen_require(`
-		type docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, docker_exec_t)
-')
-
-########################################
-## <summary>
-##	Search docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_search_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	files_search_var_lib($1)
-')
-
-########################################
-## <summary>
-##	Execute docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_exec_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	can_exec($1, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	read_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker share files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_share_files',`
-	gen_require(`
-		type docker_share_t;
-	')
-
-	files_search_var_lib($1)
-	list_dirs_pattern($1, docker_share_t, docker_share_t)
-	read_files_pattern($1, docker_share_t, docker_share_t)
-	read_lnk_files_pattern($1, docker_share_t, docker_share_t)
-')
-
-######################################
-## <summary>
-##	Allow the specified domain to execute apache
-##	in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`apache_exec',`
-	gen_require(`
-		type httpd_exec_t;
-	')
-
-	can_exec($1, httpd_exec_t)
-')
-
-######################################
-## <summary>
-##	Allow the specified domain to execute docker shared files
-##	in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_exec_share_files',`
-	gen_require(`
-		type docker_share_t;
-	')
-
-	can_exec($1, docker_share_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-	manage_lnk_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_dirs',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_dirs_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Create objects in a docker var lib directory
-##	with an automatic type transition to
-##	a specified private type.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="private_type">
-##	<summary>
-##	The type of the object to create.
-##	</summary>
-## </param>
-## <param name="object_class">
-##	<summary>
-##	The class of the object to be created.
-##	</summary>
-## </param>
-## <param name="name" optional="true">
-##	<summary>
-##	The name of the object being created.
-##	</summary>
-## </param>
-#
-interface(`docker_lib_filetrans',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	filetrans_pattern($1, docker_var_lib_t, $2, $3, $4)
-')
-
-########################################
-## <summary>
-##	Read docker PID files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_pid_files',`
-	gen_require(`
-		type docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	read_files_pattern($1, docker_var_run_t, docker_var_run_t)
-')
-
-########################################
-## <summary>
-##	Execute docker server in the docker domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`docker_systemctl',`
-	gen_require(`
-		type docker_t;
-		type docker_unit_file_t;
-	')
-
-	systemd_exec_systemctl($1)
-	init_reload_services($1)
-        systemd_read_fifo_file_passwd_run($1)
-	allow $1 docker_unit_file_t:file read_file_perms;
-	allow $1 docker_unit_file_t:service manage_service_perms;
-
-	ps_process_pattern($1, docker_t)
-')
-
-########################################
-## <summary>
-##	Read and write docker shared memory.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_rw_sem',`
-	gen_require(`
-		type docker_t;
-	')
-
-	allow $1 docker_t:sem rw_sem_perms;
-')
-
-#######################################
-## <summary>
-##  Read and write the docker pty type.
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`docker_use_ptys',`
-    gen_require(`
-        type docker_devpts_t;
-    ')
-
-    allow $1 docker_devpts_t:chr_file rw_term_perms;
-')
-
-#######################################
-## <summary>
-##      Allow domain to create docker content
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`docker_filetrans_named_content',`
-
-    gen_require(`
-        type docker_var_lib_t;
-        type docker_share_t;
-    	type docker_log_t;
-	    type docker_var_run_t;
-        type docker_home_t;
-    ')
-
-    files_pid_filetrans($1, docker_var_run_t, file, "docker.pid")
-    files_pid_filetrans($1, docker_var_run_t, sock_file, "docker.sock")
-    files_pid_filetrans($1, docker_var_run_t, dir, "docker-client")
-    logging_log_filetrans($1, docker_log_t, dir, "lxc")
-    files_var_lib_filetrans($1, docker_var_lib_t, dir, "docker")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "config.env")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hosts")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hostname")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "resolv.conf")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, dir, "init")
-    userdom_admin_home_dir_filetrans($1, docker_home_t, dir, ".docker")
-')
-
-########################################
-## <summary>
-##	Connect to docker over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_stream_connect',`
-	gen_require(`
-		type docker_t, docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	stream_connect_pattern($1, docker_var_run_t, docker_var_run_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Connect to SPC containers over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_spc_stream_connect',`
-	gen_require(`
-		type spc_t, spc_var_run_t;
-	')
-
-	files_search_pids($1)
-	files_write_all_pid_sockets($1)
-	allow $1 spc_t:unix_stream_socket connectto;
-')
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an docker environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_admin',`
-	gen_require(`
-		type docker_t;
-		type docker_var_lib_t, docker_var_run_t;
-		type docker_unit_file_t;
-		type docker_lock_t;
-		type docker_log_t;
-		type docker_config_t;
-	')
-
-	allow $1 docker_t:process { ptrace signal_perms };
-	ps_process_pattern($1, docker_t)
-
-	admin_pattern($1, docker_config_t)
-
-	files_search_var_lib($1)
-	admin_pattern($1, docker_var_lib_t)
-
-	files_search_pids($1)
-	admin_pattern($1, docker_var_run_t)
-
-	files_search_locks($1)
-	admin_pattern($1, docker_lock_t)
-
-	logging_search_logs($1)
-	admin_pattern($1, docker_log_t)
-
-	docker_systemctl($1)
-	admin_pattern($1, docker_unit_file_t)
-	allow $1 docker_unit_file_t:service all_service_perms;
-
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')
-
-########################################
-## <summary>
-##	Execute docker_auth_exec_t in the docker_auth domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_auth_domtrans',`
-	gen_require(`
-		type docker_auth_t, docker_auth_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, docker_auth_exec_t, docker_auth_t)
-')
-
-######################################
-## <summary>
-##	Execute docker_auth in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_auth_exec',`
-	gen_require(`
-		type docker_auth_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, docker_auth_exec_t)
-')
-
-########################################
-## <summary>
-##	Connect to docker_auth over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_auth_stream_connect',`
-	gen_require(`
-		type docker_auth_t, docker_plugin_var_run_t;
-	')
-
-	files_search_pids($1)
-	stream_connect_pattern($1, docker_plugin_var_run_t, docker_plugin_var_run_t, docker_auth_t)
-')
-
-########################################
-## <summary>
-##	docker domain typebounds calling domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain to be typebound.
-## </summary>
-## </param>
-#
-interface(`docker_typebounds',`
-	gen_require(`
-		type docker_t;
-	')
-
-	typebounds docker_t $1;
-')
-
-########################################
-## <summary>
-##	Allow any docker_exec_t to be an entrypoint of this domain
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`docker_entrypoint',`
-	gen_require(`
-		type docker_exec_t;
-	')
-	allow $1 docker_exec_t:file entrypoint;
-')
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.te b/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.te
deleted file mode 100644
index 4231688382..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-fedora-24/docker-engine-selinux/docker.te
+++ /dev/null
@@ -1,399 +0,0 @@
-policy_module(docker, 1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-## <desc>
-##  <p>
-##  Determine whether docker can
-##  connect to all TCP ports.
-##  </p>
-## </desc>
-gen_tunable(docker_connect_any, false)
-
-type docker_t;
-type docker_exec_t;
-init_daemon_domain(docker_t, docker_exec_t)
-domain_subj_id_change_exemption(docker_t)
-domain_role_change_exemption(docker_t)
-
-type spc_t;
-domain_type(spc_t)
-role system_r types spc_t;
-
-type docker_auth_t;
-type docker_auth_exec_t;
-init_daemon_domain(docker_auth_t, docker_auth_exec_t)
-
-type spc_var_run_t;
-files_pid_file(spc_var_run_t)
-
-type docker_var_lib_t;
-files_type(docker_var_lib_t)
-
-type docker_home_t;
-userdom_user_home_content(docker_home_t)
-
-type docker_config_t;
-files_config_file(docker_config_t)
-
-type docker_lock_t;
-files_lock_file(docker_lock_t)
-
-type docker_log_t;
-logging_log_file(docker_log_t)
-
-type docker_tmp_t;
-files_tmp_file(docker_tmp_t)
-
-type docker_tmpfs_t;
-files_tmpfs_file(docker_tmpfs_t)
-
-type docker_var_run_t;
-files_pid_file(docker_var_run_t)
-
-type docker_plugin_var_run_t;
-files_pid_file(docker_plugin_var_run_t)
-
-type docker_unit_file_t;
-systemd_unit_file(docker_unit_file_t)
-
-type docker_devpts_t;
-term_pty(docker_devpts_t)
-
-type docker_share_t;
-files_type(docker_share_t)
-
-########################################
-#
-# docker local policy
-#
-allow docker_t self:capability { chown kill fowner fsetid mknod net_admin net_bind_service net_raw setfcap };
-allow docker_t self:tun_socket relabelto;
-allow docker_t self:process { getattr signal_perms setrlimit setfscreate };
-allow docker_t self:fifo_file rw_fifo_file_perms;
-allow docker_t self:unix_stream_socket create_stream_socket_perms;
-allow docker_t self:tcp_socket create_stream_socket_perms;
-allow docker_t self:udp_socket create_socket_perms;
-allow docker_t self:capability2 block_suspend;
-
-docker_auth_stream_connect(docker_t)
-
-manage_files_pattern(docker_t, docker_home_t, docker_home_t)
-manage_dirs_pattern(docker_t, docker_home_t, docker_home_t)
-manage_lnk_files_pattern(docker_t, docker_home_t, docker_home_t)
-userdom_admin_home_dir_filetrans(docker_t, docker_home_t, dir, ".docker")
-
-manage_dirs_pattern(docker_t, docker_config_t, docker_config_t)
-manage_files_pattern(docker_t, docker_config_t, docker_config_t)
-files_etc_filetrans(docker_t, docker_config_t, dir, "docker")
-
-manage_dirs_pattern(docker_t, docker_lock_t, docker_lock_t)
-manage_files_pattern(docker_t, docker_lock_t, docker_lock_t)
-files_lock_filetrans(docker_t, docker_lock_t, { dir file }, "lxc")
-
-manage_dirs_pattern(docker_t, docker_log_t, docker_log_t)
-manage_files_pattern(docker_t, docker_log_t, docker_log_t)
-manage_lnk_files_pattern(docker_t, docker_log_t, docker_log_t)
-logging_log_filetrans(docker_t, docker_log_t, { dir file lnk_file })
-allow docker_t docker_log_t:dir_file_class_set { relabelfrom relabelto };
-
-manage_dirs_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_lnk_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-files_tmp_filetrans(docker_t, docker_tmp_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_lnk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_fifo_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_chr_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_blk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-allow docker_t docker_tmpfs_t:dir relabelfrom;
-can_exec(docker_t, docker_tmpfs_t)
-fs_tmpfs_filetrans(docker_t, docker_tmpfs_t, { dir file })
-allow docker_t docker_tmpfs_t:chr_file mounton;
-
-manage_dirs_pattern(docker_t, docker_share_t, docker_share_t)
-manage_files_pattern(docker_t, docker_share_t, docker_share_t)
-manage_lnk_files_pattern(docker_t, docker_share_t, docker_share_t)
-allow docker_t docker_share_t:dir_file_class_set { relabelfrom relabelto };
-
-can_exec(docker_t, docker_share_t)
-#docker_filetrans_named_content(docker_t)
-
-manage_dirs_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_chr_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_blk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_lnk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-allow docker_t docker_var_lib_t:dir_file_class_set { relabelfrom relabelto };
-files_var_lib_filetrans(docker_t, docker_var_lib_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_sock_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_lnk_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-files_pid_filetrans(docker_t, docker_var_run_t, { dir file lnk_file sock_file })
-
-allow docker_t docker_devpts_t:chr_file { relabelfrom rw_chr_file_perms setattr_chr_file_perms };
-term_create_pty(docker_t, docker_devpts_t)
-
-kernel_read_system_state(docker_t)
-kernel_read_network_state(docker_t)
-kernel_read_all_sysctls(docker_t)
-kernel_rw_net_sysctls(docker_t)
-kernel_setsched(docker_t)
-kernel_read_all_proc(docker_t)
-
-domain_use_interactive_fds(docker_t)
-domain_dontaudit_read_all_domains_state(docker_t)
-
-corecmd_exec_bin(docker_t)
-corecmd_exec_shell(docker_t)
-
-corenet_tcp_bind_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_if(docker_t)
-corenet_tcp_sendrecv_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_port(docker_t)
-corenet_tcp_bind_all_ports(docker_t)
-corenet_tcp_connect_http_port(docker_t)
-corenet_tcp_connect_commplex_main_port(docker_t)
-corenet_udp_sendrecv_generic_if(docker_t)
-corenet_udp_sendrecv_generic_node(docker_t)
-corenet_udp_sendrecv_all_ports(docker_t)
-corenet_udp_bind_generic_node(docker_t)
-corenet_udp_bind_all_ports(docker_t)
-
-files_read_config_files(docker_t)
-files_dontaudit_getattr_all_dirs(docker_t)
-files_dontaudit_getattr_all_files(docker_t)
-
-fs_read_cgroup_files(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_search_all(docker_t)
-fs_getattr_all_fs(docker_t)
-
-storage_raw_rw_fixed_disk(docker_t)
-
-auth_use_nsswitch(docker_t)
-auth_dontaudit_getattr_shadow(docker_t)
-
-init_read_state(docker_t)
-init_status(docker_t)
-
-logging_send_audit_msgs(docker_t)
-logging_send_syslog_msg(docker_t)
-
-miscfiles_read_localization(docker_t)
-
-mount_domtrans(docker_t)
-
-seutil_read_default_contexts(docker_t)
-seutil_read_config(docker_t)
-
-sysnet_dns_name_resolve(docker_t)
-sysnet_exec_ifconfig(docker_t)
-
-optional_policy(`
-	rpm_exec(docker_t)
-	rpm_read_db(docker_t)
-	rpm_exec(docker_t)
-')
-
-optional_policy(`
-	fstools_domtrans(docker_t)
-')
-
-optional_policy(`
-	iptables_domtrans(docker_t)
-')
-
-optional_policy(`
-	openvswitch_stream_connect(docker_t)
-')
-
-#
-# lxc rules
-#
-
-allow docker_t self:capability { dac_override setgid setpcap setuid sys_admin sys_boot sys_chroot sys_ptrace };
-
-allow docker_t self:process { getcap setcap setexec setpgid setsched signal_perms };
-
-allow docker_t self:netlink_route_socket rw_netlink_socket_perms;;
-allow docker_t self:netlink_audit_socket create_netlink_socket_perms;
-allow docker_t self:unix_dgram_socket { create_socket_perms sendto };
-allow docker_t self:unix_stream_socket { create_stream_socket_perms connectto };
-
-allow docker_t docker_var_lib_t:dir mounton;
-allow docker_t docker_var_lib_t:chr_file mounton;
-can_exec(docker_t, docker_var_lib_t)
-
-kernel_dontaudit_setsched(docker_t)
-kernel_get_sysvipc_info(docker_t)
-kernel_request_load_module(docker_t)
-kernel_mounton_messages(docker_t)
-kernel_mounton_all_proc(docker_t)
-kernel_mounton_all_sysctls(docker_t)
-kernel_unlabeled_entry_type(spc_t)
-kernel_unlabeled_domtrans(docker_t, spc_t)
-
-dev_getattr_all(docker_t)
-dev_getattr_sysfs_fs(docker_t)
-dev_read_urand(docker_t)
-dev_read_lvm_control(docker_t)
-dev_rw_sysfs(docker_t)
-dev_rw_loop_control(docker_t)
-dev_rw_lvm_control(docker_t)
-
-files_getattr_isid_type_dirs(docker_t)
-files_manage_isid_type_dirs(docker_t)
-files_manage_isid_type_files(docker_t)
-files_manage_isid_type_symlinks(docker_t)
-files_manage_isid_type_chr_files(docker_t)
-files_manage_isid_type_blk_files(docker_t)
-files_exec_isid_files(docker_t)
-files_mounton_isid(docker_t)
-files_mounton_non_security(docker_t)
-files_mounton_isid_type_chr_file(docker_t)
-
-fs_mount_all_fs(docker_t)
-fs_unmount_all_fs(docker_t)
-fs_remount_all_fs(docker_t)
-files_mounton_isid(docker_t)
-fs_manage_cgroup_dirs(docker_t)
-fs_manage_cgroup_files(docker_t)
-fs_relabelfrom_xattr_fs(docker_t)
-fs_relabelfrom_tmpfs(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_list_hugetlbfs(docker_t)
-
-term_use_generic_ptys(docker_t)
-term_use_ptmx(docker_t)
-term_getattr_pty_fs(docker_t)
-term_relabel_pty_fs(docker_t)
-term_mounton_unallocated_ttys(docker_t)
-
-modutils_domtrans_insmod(docker_t)
-
-systemd_status_all_unit_files(docker_t)
-systemd_start_systemd_services(docker_t)
-
-userdom_stream_connect(docker_t)
-userdom_search_user_home_content(docker_t)
-userdom_read_all_users_state(docker_t)
-userdom_relabel_user_home_files(docker_t)
-userdom_relabel_user_tmp_files(docker_t)
-userdom_relabel_user_tmp_dirs(docker_t)
-
-optional_policy(`
-	gpm_getattr_gpmctl(docker_t)
-')
-
-optional_policy(`
-	dbus_system_bus_client(docker_t)
-	init_dbus_chat(docker_t)
-	init_start_transient_unit(docker_t)
-
-	optional_policy(`
-		systemd_dbus_chat_logind(docker_t)
-		systemd_dbus_chat_machined(docker_t)
-	')
-
-	optional_policy(`
-		firewalld_dbus_chat(docker_t)
-	')
-')
-
-optional_policy(`
-	udev_read_db(docker_t)
-')
-
-optional_policy(`
-	unconfined_domain(docker_t)
-	unconfined_typebounds(docker_t)
-')
-
-optional_policy(`
-	virt_read_config(docker_t)
-	virt_exec(docker_t)
-	virt_stream_connect(docker_t)
-	virt_stream_connect_sandbox(docker_t)
-	virt_exec_sandbox_files(docker_t)
-	virt_manage_sandbox_files(docker_t)
-	virt_relabel_sandbox_filesystem(docker_t)
-	# for lxc
-	virt_transition_svirt_sandbox(docker_t, system_r)
-	virt_mounton_sandbox_file(docker_t)
-#	virt_attach_sandbox_tun_iface(docker_t)
-	allow docker_t svirt_sandbox_domain:tun_socket relabelfrom;
-	virt_sandbox_entrypoint(docker_t)	
-')
-
-tunable_policy(`docker_connect_any',`
-    corenet_tcp_connect_all_ports(docker_t)
-    corenet_sendrecv_all_packets(docker_t)
-    corenet_tcp_sendrecv_all_ports(docker_t)
-')
-
-########################################
-#
-# spc local policy
-#
-allow spc_t { docker_var_lib_t docker_share_t }:file entrypoint;
-role system_r types spc_t;
-
-domtrans_pattern(docker_t, docker_share_t, spc_t)
-domtrans_pattern(docker_t, docker_var_lib_t, spc_t)
-allow docker_t spc_t:process { setsched signal_perms };
-ps_process_pattern(docker_t, spc_t)
-allow docker_t spc_t:socket_class_set { relabelto relabelfrom };
-filetrans_pattern(docker_t, docker_var_lib_t, docker_share_t, dir, "overlay")
-
-optional_policy(`
-	systemd_dbus_chat_machined(spc_t)
-')
-
-optional_policy(`
-	dbus_chat_system_bus(spc_t)
-')
-
-optional_policy(`
-	unconfined_domain_noaudit(spc_t)
-')
-
-optional_policy(`
-	virt_transition_svirt_sandbox(spc_t, system_r)
-	virt_sandbox_entrypoint(spc_t)	
-')
-
-########################################
-#
-# docker_auth local policy
-#
-allow docker_auth_t self:fifo_file rw_fifo_file_perms;
-allow docker_auth_t self:unix_stream_socket create_stream_socket_perms;
-dontaudit docker_auth_t self:capability net_admin;
-
-docker_stream_connect(docker_auth_t)
-
-manage_dirs_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_sock_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_lnk_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-files_pid_filetrans(docker_auth_t, docker_plugin_var_run_t, { dir file lnk_file sock_file })
-
-domain_use_interactive_fds(docker_auth_t)
-
-kernel_read_net_sysctls(docker_auth_t)
-
-auth_use_nsswitch(docker_auth_t)
-
-files_read_etc_files(docker_auth_t)
-
-miscfiles_read_localization(docker_auth_t)
-
-sysnet_dns_name_resolve(docker_auth_t)
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/Makefile b/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/Makefile
deleted file mode 100644
index 16df33ef32..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/Makefile
+++ /dev/null
@@ -1,23 +0,0 @@
-TARGETS?=docker
-MODULES?=${TARGETS:=.pp.bz2}
-SHAREDIR?=/usr/share
-
-all: ${TARGETS:=.pp.bz2}
-
-%.pp.bz2: %.pp
-	@echo Compressing $^ -\> $@
-	bzip2 -9 $^
-
-%.pp: %.te
-	make -f ${SHAREDIR}/selinux/devel/Makefile $@
-
-clean:
-	rm -f *~  *.tc *.pp *.pp.bz2
-	rm -rf tmp *.tar.gz
-
-man: install
-	sepolicy manpage --domain ${TARGETS}_t
-
-install:
-	semodule -i ${TARGETS}
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/README.md b/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/README.md
deleted file mode 100644
index 7ea3117a89..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/README.md
+++ /dev/null
@@ -1 +0,0 @@
-SELinux policy for docker
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.fc b/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.fc
deleted file mode 100644
index 10b7d52a8b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.fc
+++ /dev/null
@@ -1,33 +0,0 @@
-/root/\.docker	gen_context(system_u:object_r:docker_home_t,s0)
-
-/usr/bin/docker			--	gen_context(system_u:object_r:docker_exec_t,s0)
-/usr/bin/docker-novolume-plugin		--	gen_context(system_u:object_r:docker_auth_exec_t,s0)
-/usr/lib/docker/docker-novolume-plugin	--	gen_context(system_u:object_r:docker_auth_exec_t,s0)
-
-/usr/lib/systemd/system/docker.service		--	gen_context(system_u:object_r:docker_unit_file_t,s0)
-/usr/lib/systemd/system/docker-novolume-plugin.service	--	gen_context(system_u:object_r:docker_unit_file_t,s0)
-
-/etc/docker(/.*)?		gen_context(system_u:object_r:docker_config_t,s0)
-
-/var/lib/docker(/.*)?		gen_context(system_u:object_r:docker_var_lib_t,s0)
-/var/lib/kublet(/.*)?		gen_context(system_u:object_r:docker_var_lib_t,s0)
-/var/lib/docker/vfs(/.*)?	gen_context(system_u:object_r:svirt_sandbox_file_t,s0)
-
-/var/run/docker(/.*)?		gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker\.pid		--	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker\.sock		-s	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker-client(/.*)?		gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker/plugins(/.*)?		gen_context(system_u:object_r:docker_plugin_var_run_t,s0)
-
-/var/lock/lxc(/.*)?		gen_context(system_u:object_r:docker_lock_t,s0)
-
-/var/log/lxc(/.*)?		gen_context(system_u:object_r:docker_log_t,s0)
-
-/var/lib/docker/init(/.*)?		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hosts		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hostname		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/.*/config\.env	gen_context(system_u:object_r:docker_share_t,s0)
-
-# OL7.2 systemd selinux update
-/var/run/systemd/machines(/.*)?        gen_context(system_u:object_r:systemd_machined_var_run_t,s0)
-/var/lib/machines(/.*)?                        gen_context(system_u:object_r:systemd_machined_var_lib_t,s0)
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.if b/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.if
deleted file mode 100644
index 4780af05f7..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.if
+++ /dev/null
@@ -1,659 +0,0 @@
-
-## <summary>The open-source application container engine.</summary>
-
-########################################
-## <summary>
-##	Execute docker in the docker domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_domtrans',`
-	gen_require(`
-		type docker_t, docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, docker_exec_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Execute docker in the caller domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_exec',`
-	gen_require(`
-		type docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, docker_exec_t)
-')
-
-########################################
-## <summary>
-##	Search docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_search_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	files_search_var_lib($1)
-')
-
-########################################
-## <summary>
-##	Execute docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_exec_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	can_exec($1, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	read_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker share files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_share_files',`
-	gen_require(`
-		type docker_share_t;
-	')
-
-	files_search_var_lib($1)
-	list_dirs_pattern($1, docker_share_t, docker_share_t)
-	read_files_pattern($1, docker_share_t, docker_share_t)
-	read_lnk_files_pattern($1, docker_share_t, docker_share_t)
-')
-
-######################################
-## <summary>
-##	Allow the specified domain to execute docker shared files
-##	in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_exec_share_files',`
-	gen_require(`
-		type docker_share_t;
-	')
-
-	can_exec($1, docker_share_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-	manage_lnk_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_dirs',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_dirs_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Create objects in a docker var lib directory
-##	with an automatic type transition to
-##	a specified private type.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="private_type">
-##	<summary>
-##	The type of the object to create.
-##	</summary>
-## </param>
-## <param name="object_class">
-##	<summary>
-##	The class of the object to be created.
-##	</summary>
-## </param>
-## <param name="name" optional="true">
-##	<summary>
-##	The name of the object being created.
-##	</summary>
-## </param>
-#
-interface(`docker_lib_filetrans',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	filetrans_pattern($1, docker_var_lib_t, $2, $3, $4)
-')
-
-########################################
-## <summary>
-##	Read docker PID files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_pid_files',`
-	gen_require(`
-		type docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	read_files_pattern($1, docker_var_run_t, docker_var_run_t)
-')
-
-########################################
-## <summary>
-##	Execute docker server in the docker domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`docker_systemctl',`
-	gen_require(`
-		type docker_t;
-		type docker_unit_file_t;
-	')
-
-	systemd_exec_systemctl($1)
-	init_reload_services($1)
-        systemd_read_fifo_file_passwd_run($1)
-	allow $1 docker_unit_file_t:file read_file_perms;
-	allow $1 docker_unit_file_t:service manage_service_perms;
-
-	ps_process_pattern($1, docker_t)
-')
-
-########################################
-## <summary>
-##	Read and write docker shared memory.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_rw_sem',`
-	gen_require(`
-		type docker_t;
-	')
-
-	allow $1 docker_t:sem rw_sem_perms;
-')
-
-#######################################
-## <summary>
-##  Read and write the docker pty type.
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`docker_use_ptys',`
-    gen_require(`
-        type docker_devpts_t;
-    ')
-
-    allow $1 docker_devpts_t:chr_file rw_term_perms;
-')
-
-#######################################
-## <summary>
-##      Allow domain to create docker content
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`docker_filetrans_named_content',`
-
-    gen_require(`
-        type docker_var_lib_t;
-        type docker_share_t;
-    	type docker_log_t;
-	    type docker_var_run_t;
-        type docker_home_t;
-    ')
-
-    files_pid_filetrans($1, docker_var_run_t, file, "docker.pid")
-    files_pid_filetrans($1, docker_var_run_t, sock_file, "docker.sock")
-    files_pid_filetrans($1, docker_var_run_t, dir, "docker-client")
-    logging_log_filetrans($1, docker_log_t, dir, "lxc")
-    files_var_lib_filetrans($1, docker_var_lib_t, dir, "docker")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "config.env")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hosts")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hostname")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "resolv.conf")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, dir, "init")
-    userdom_admin_home_dir_filetrans($1, docker_home_t, dir, ".docker")
-')
-
-########################################
-## <summary>
-##	Connect to docker over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_stream_connect',`
-	gen_require(`
-		type docker_t, docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	stream_connect_pattern($1, docker_var_run_t, docker_var_run_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Connect to SPC containers over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_spc_stream_connect',`
-	gen_require(`
-		type spc_t, spc_var_run_t;
-	')
-
-	files_search_pids($1)
-	files_write_all_pid_sockets($1)
-	allow $1 spc_t:unix_stream_socket connectto;
-')
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an docker environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_admin',`
-	gen_require(`
-		type docker_t;
-		type docker_var_lib_t, docker_var_run_t;
-		type docker_unit_file_t;
-		type docker_lock_t;
-		type docker_log_t;
-		type docker_config_t;
-	')
-
-	allow $1 docker_t:process { ptrace signal_perms };
-	ps_process_pattern($1, docker_t)
-
-	admin_pattern($1, docker_config_t)
-
-	files_search_var_lib($1)
-	admin_pattern($1, docker_var_lib_t)
-
-	files_search_pids($1)
-	admin_pattern($1, docker_var_run_t)
-
-	files_search_locks($1)
-	admin_pattern($1, docker_lock_t)
-
-	logging_search_logs($1)
-	admin_pattern($1, docker_log_t)
-
-	docker_systemctl($1)
-	admin_pattern($1, docker_unit_file_t)
-	allow $1 docker_unit_file_t:service all_service_perms;
-
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')
-
-########################################
-## <summary>
-##	Execute docker_auth_exec_t in the docker_auth domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_auth_domtrans',`
-	gen_require(`
-		type docker_auth_t, docker_auth_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, docker_auth_exec_t, docker_auth_t)
-')
-
-######################################
-## <summary>
-##	Execute docker_auth in the caller domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_auth_exec',`
-	gen_require(`
-		type docker_auth_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, docker_auth_exec_t)
-')
-
-########################################
-## <summary>
-##	Connect to docker_auth over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_auth_stream_connect',`
-	gen_require(`
-		type docker_auth_t, docker_plugin_var_run_t;
-	')
-
-	files_search_pids($1)
-	stream_connect_pattern($1, docker_plugin_var_run_t, docker_plugin_var_run_t, docker_auth_t)
-')
-
-########################################
-## <summary>
-##	docker domain typebounds calling domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain to be typebound.
-## </summary>
-## </param>
-#
-interface(`docker_typebounds',`
-	gen_require(`
-		type docker_t;
-	')
-
-	typebounds docker_t $1;
-')
-
-########################################
-## <summary>
-##	Allow any docker_exec_t to be an entrypoint of this domain
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <rolecap/>
-#
-interface(`docker_entrypoint',`
-	gen_require(`
-		type docker_exec_t;
-	')
-	allow $1 docker_exec_t:file entrypoint;
-')
-
-########################################
-## <summary>
-##     Send and receive messages from
-##     systemd machined over dbus.
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`systemd_dbus_chat_machined',`
-       gen_require(`
-               type systemd_machined_t;
-               class dbus send_msg;
-       ')
-
-       allow $1 systemd_machined_t:dbus send_msg;
-       allow systemd_machined_t $1:dbus send_msg;
-       ps_process_pattern(systemd_machined_t, $1)
-')
-
-########################################
-## <summary>
-##     Allow any svirt_sandbox_file_t to be an entrypoint of this domain
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-## <rolecap/>
-#
-interface(`virt_sandbox_entrypoint',`
-       gen_require(`
-               type svirt_sandbox_file_t;
-       ')
-       allow $1 svirt_sandbox_file_t:file entrypoint;
-')
-
-########################################
-## <summary>
-##      Send and receive messages from
-##      virt over dbus.
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`virt_dbus_chat',`
-        gen_require(`
-                type virtd_t;
-                class dbus send_msg;
-        ')
-
-        allow $1 virtd_t:dbus send_msg;
-        allow virtd_t $1:dbus send_msg;
-        ps_process_pattern(virtd_t, $1)
-')
-
-#######################################
-## <summary>
-##      Read the process state of virt sandbox containers
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`virt_sandbox_read_state',`
-       gen_require(`
-               attribute svirt_sandbox_domain;
-       ')
-
-       ps_process_pattern($1, svirt_sandbox_domain)
-')
-
-######################################
-## <summary>
-##     Send a signal to sandbox domains
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`virt_signal_sandbox',`
-       gen_require(`
-               attribute svirt_sandbox_domain;
-       ')
-
-       allow $1 svirt_sandbox_domain:process signal;
-')
-
-#######################################
-## <summary>
-##     Getattr Sandbox File systems
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`virt_getattr_sandbox_filesystem',`
-       gen_require(`
-              type svirt_sandbox_file_t;
-       ')
-
-       allow $1 svirt_sandbox_file_t:filesystem getattr;
-')
-
-#######################################
-## <summary>
-##     Read Sandbox Files
-## </summary>
-## <param name="domain">
-##     <summary>
-##     Domain allowed access.
-##     </summary>
-## </param>
-#
-interface(`virt_read_sandbox_files',`
-       gen_require(`
-               type svirt_sandbox_file_t;
-       ')
-
-       list_dirs_pattern($1, svirt_sandbox_file_t, svirt_sandbox_file_t)
-       read_files_pattern($1, svirt_sandbox_file_t, svirt_sandbox_file_t)
-       read_lnk_files_pattern($1, svirt_sandbox_file_t, svirt_sandbox_file_t)
-')
-
-#######################################
-## <summary>
-##      Read the process state of spc containers
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`docker_spc_read_state',`
-        gen_require(`
-                type spc_t;
-        ')
-
-        ps_process_pattern($1, spc_t)
-')
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.te b/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.te
deleted file mode 100644
index d4de36fe46..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux-oraclelinux-7/docker-engine-selinux/docker.te
+++ /dev/null
@@ -1,465 +0,0 @@
-policy_module(docker, 1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-## <desc>
-##  <p>
-##  Determine whether docker can
-##  connect to all TCP ports.
-##  </p>
-## </desc>
-gen_tunable(docker_connect_any, false)
-
-type docker_t;
-type docker_exec_t;
-init_daemon_domain(docker_t, docker_exec_t)
-domain_subj_id_change_exemption(docker_t)
-domain_role_change_exemption(docker_t)
-
-type spc_t;
-domain_type(spc_t)
-role system_r types spc_t;
-
-type docker_auth_t;
-type docker_auth_exec_t;
-init_daemon_domain(docker_auth_t, docker_auth_exec_t)
-
-type spc_var_run_t;
-files_pid_file(spc_var_run_t)
-
-type docker_var_lib_t;
-files_type(docker_var_lib_t)
-
-type docker_home_t;
-userdom_user_home_content(docker_home_t)
-
-type docker_config_t;
-files_config_file(docker_config_t)
-
-type docker_lock_t;
-files_lock_file(docker_lock_t)
-
-type docker_log_t;
-logging_log_file(docker_log_t)
-
-type docker_tmp_t;
-files_tmp_file(docker_tmp_t)
-
-type docker_tmpfs_t;
-files_tmpfs_file(docker_tmpfs_t)
-
-type docker_var_run_t;
-files_pid_file(docker_var_run_t)
-
-type docker_plugin_var_run_t;
-files_pid_file(docker_plugin_var_run_t)
-
-type docker_unit_file_t;
-systemd_unit_file(docker_unit_file_t)
-
-type docker_devpts_t;
-term_pty(docker_devpts_t)
-
-type docker_share_t;
-files_type(docker_share_t)
-
-# OL7 systemd selinux update
-type systemd_machined_t;
-type systemd_machined_exec_t;
-init_daemon_domain(systemd_machined_t, systemd_machined_exec_t)
-
-# /run/systemd/machines
-type systemd_machined_var_run_t;
-files_pid_file(systemd_machined_var_run_t)
-
-# /var/lib/machines
-type systemd_machined_var_lib_t;
-files_type(systemd_machined_var_lib_t)
-
-
-########################################
-#
-# docker local policy
-#
-allow docker_t self:capability { chown kill fowner fsetid mknod net_admin net_bind_service net_raw setfcap };
-allow docker_t self:tun_socket relabelto;
-allow docker_t self:process { getattr signal_perms setrlimit setfscreate };
-allow docker_t self:fifo_file rw_fifo_file_perms;
-allow docker_t self:unix_stream_socket create_stream_socket_perms;
-allow docker_t self:tcp_socket create_stream_socket_perms;
-allow docker_t self:udp_socket create_socket_perms;
-allow docker_t self:capability2 block_suspend;
-
-docker_auth_stream_connect(docker_t)
-
-manage_files_pattern(docker_t, docker_home_t, docker_home_t)
-manage_dirs_pattern(docker_t, docker_home_t, docker_home_t)
-manage_lnk_files_pattern(docker_t, docker_home_t, docker_home_t)
-userdom_admin_home_dir_filetrans(docker_t, docker_home_t, dir, ".docker")
-
-manage_dirs_pattern(docker_t, docker_config_t, docker_config_t)
-manage_files_pattern(docker_t, docker_config_t, docker_config_t)
-files_etc_filetrans(docker_t, docker_config_t, dir, "docker")
-
-manage_dirs_pattern(docker_t, docker_lock_t, docker_lock_t)
-manage_files_pattern(docker_t, docker_lock_t, docker_lock_t)
-files_lock_filetrans(docker_t, docker_lock_t, { dir file }, "lxc")
-
-manage_dirs_pattern(docker_t, docker_log_t, docker_log_t)
-manage_files_pattern(docker_t, docker_log_t, docker_log_t)
-manage_lnk_files_pattern(docker_t, docker_log_t, docker_log_t)
-logging_log_filetrans(docker_t, docker_log_t, { dir file lnk_file })
-allow docker_t docker_log_t:dir_file_class_set { relabelfrom relabelto };
-
-manage_dirs_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_lnk_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-files_tmp_filetrans(docker_t, docker_tmp_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_lnk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_fifo_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_chr_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_blk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-allow docker_t docker_tmpfs_t:dir relabelfrom;
-can_exec(docker_t, docker_tmpfs_t)
-fs_tmpfs_filetrans(docker_t, docker_tmpfs_t, { dir file })
-allow docker_t docker_tmpfs_t:chr_file mounton;
-
-manage_dirs_pattern(docker_t, docker_share_t, docker_share_t)
-manage_files_pattern(docker_t, docker_share_t, docker_share_t)
-manage_lnk_files_pattern(docker_t, docker_share_t, docker_share_t)
-allow docker_t docker_share_t:dir_file_class_set { relabelfrom relabelto };
-
-can_exec(docker_t, docker_share_t)
-#docker_filetrans_named_content(docker_t)
-
-manage_dirs_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_chr_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_blk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_lnk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-allow docker_t docker_var_lib_t:dir_file_class_set { relabelfrom relabelto };
-files_var_lib_filetrans(docker_t, docker_var_lib_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_sock_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_lnk_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-files_pid_filetrans(docker_t, docker_var_run_t, { dir file lnk_file sock_file })
-
-allow docker_t docker_devpts_t:chr_file { relabelfrom rw_chr_file_perms setattr_chr_file_perms };
-term_create_pty(docker_t, docker_devpts_t)
-
-kernel_read_system_state(docker_t)
-kernel_read_network_state(docker_t)
-kernel_read_all_sysctls(docker_t)
-kernel_rw_net_sysctls(docker_t)
-kernel_setsched(docker_t)
-kernel_read_all_proc(docker_t)
-
-domain_use_interactive_fds(docker_t)
-domain_dontaudit_read_all_domains_state(docker_t)
-
-corecmd_exec_bin(docker_t)
-corecmd_exec_shell(docker_t)
-
-corenet_tcp_bind_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_if(docker_t)
-corenet_tcp_sendrecv_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_port(docker_t)
-corenet_tcp_bind_all_ports(docker_t)
-corenet_tcp_connect_http_port(docker_t)
-corenet_tcp_connect_commplex_main_port(docker_t)
-corenet_udp_sendrecv_generic_if(docker_t)
-corenet_udp_sendrecv_generic_node(docker_t)
-corenet_udp_sendrecv_all_ports(docker_t)
-corenet_udp_bind_generic_node(docker_t)
-corenet_udp_bind_all_ports(docker_t)
-
-files_read_config_files(docker_t)
-files_dontaudit_getattr_all_dirs(docker_t)
-files_dontaudit_getattr_all_files(docker_t)
-
-fs_read_cgroup_files(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_search_all(docker_t)
-fs_getattr_all_fs(docker_t)
-
-storage_raw_rw_fixed_disk(docker_t)
-
-auth_use_nsswitch(docker_t)
-auth_dontaudit_getattr_shadow(docker_t)
-
-init_read_state(docker_t)
-init_status(docker_t)
-
-logging_send_audit_msgs(docker_t)
-logging_send_syslog_msg(docker_t)
-
-miscfiles_read_localization(docker_t)
-
-mount_domtrans(docker_t)
-
-seutil_read_default_contexts(docker_t)
-seutil_read_config(docker_t)
-
-sysnet_dns_name_resolve(docker_t)
-sysnet_exec_ifconfig(docker_t)
-
-optional_policy(`
-	rpm_exec(docker_t)
-	rpm_read_db(docker_t)
-	rpm_exec(docker_t)
-')
-
-optional_policy(`
-	fstools_domtrans(docker_t)
-')
-
-optional_policy(`
-	iptables_domtrans(docker_t)
-')
-
-optional_policy(`
-	openvswitch_stream_connect(docker_t)
-')
-
-#
-# lxc rules
-#
-
-allow docker_t self:capability { dac_override setgid setpcap setuid sys_admin sys_boot sys_chroot sys_ptrace };
-
-allow docker_t self:process { getcap setcap setexec setpgid setsched signal_perms };
-
-allow docker_t self:netlink_route_socket rw_netlink_socket_perms;;
-allow docker_t self:netlink_audit_socket create_netlink_socket_perms;
-allow docker_t self:unix_dgram_socket { create_socket_perms sendto };
-allow docker_t self:unix_stream_socket { create_stream_socket_perms connectto };
-
-allow docker_t docker_var_lib_t:dir mounton;
-allow docker_t docker_var_lib_t:chr_file mounton;
-can_exec(docker_t, docker_var_lib_t)
-
-kernel_dontaudit_setsched(docker_t)
-kernel_get_sysvipc_info(docker_t)
-kernel_request_load_module(docker_t)
-kernel_mounton_messages(docker_t)
-kernel_mounton_all_proc(docker_t)
-kernel_mounton_all_sysctls(docker_t)
-kernel_unlabeled_entry_type(spc_t)
-kernel_unlabeled_domtrans(docker_t, spc_t)
-
-dev_getattr_all(docker_t)
-dev_getattr_sysfs_fs(docker_t)
-dev_read_urand(docker_t)
-dev_read_lvm_control(docker_t)
-dev_rw_sysfs(docker_t)
-dev_rw_loop_control(docker_t)
-dev_rw_lvm_control(docker_t)
-
-files_getattr_isid_type_dirs(docker_t)
-files_manage_isid_type_dirs(docker_t)
-files_manage_isid_type_files(docker_t)
-files_manage_isid_type_symlinks(docker_t)
-files_manage_isid_type_chr_files(docker_t)
-files_manage_isid_type_blk_files(docker_t)
-files_exec_isid_files(docker_t)
-files_mounton_isid(docker_t)
-files_mounton_non_security(docker_t)
-files_mounton_isid_type_chr_file(docker_t)
-
-fs_mount_all_fs(docker_t)
-fs_unmount_all_fs(docker_t)
-fs_remount_all_fs(docker_t)
-files_mounton_isid(docker_t)
-fs_manage_cgroup_dirs(docker_t)
-fs_manage_cgroup_files(docker_t)
-fs_relabelfrom_xattr_fs(docker_t)
-fs_relabelfrom_tmpfs(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_list_hugetlbfs(docker_t)
-
-term_use_generic_ptys(docker_t)
-term_use_ptmx(docker_t)
-term_getattr_pty_fs(docker_t)
-term_relabel_pty_fs(docker_t)
-term_mounton_unallocated_ttys(docker_t)
-
-modutils_domtrans_insmod(docker_t)
-
-systemd_status_all_unit_files(docker_t)
-systemd_start_systemd_services(docker_t)
-
-userdom_stream_connect(docker_t)
-userdom_search_user_home_content(docker_t)
-userdom_read_all_users_state(docker_t)
-userdom_relabel_user_home_files(docker_t)
-userdom_relabel_user_tmp_files(docker_t)
-userdom_relabel_user_tmp_dirs(docker_t)
-
-optional_policy(`
-	gpm_getattr_gpmctl(docker_t)
-')
-
-optional_policy(`
-	dbus_system_bus_client(docker_t)
-	init_dbus_chat(docker_t)
-	init_start_transient_unit(docker_t)
-
-	optional_policy(`
-		systemd_dbus_chat_logind(docker_t)
-		systemd_dbus_chat_machined(docker_t)
-	')
-
-	optional_policy(`
-		firewalld_dbus_chat(docker_t)
-	')
-')
-
-optional_policy(`
-	udev_read_db(docker_t)
-')
-
-optional_policy(`
-	unconfined_domain(docker_t)
-	# unconfined_typebounds(docker_t)
-')
-
-optional_policy(`
-	virt_read_config(docker_t)
-	virt_exec(docker_t)
-	virt_stream_connect(docker_t)
-	virt_stream_connect_sandbox(docker_t)
-	virt_exec_sandbox_files(docker_t)
-	virt_manage_sandbox_files(docker_t)
-	virt_relabel_sandbox_filesystem(docker_t)
-	# for lxc
-	virt_transition_svirt_sandbox(docker_t, system_r)
-	virt_mounton_sandbox_file(docker_t)
-#	virt_attach_sandbox_tun_iface(docker_t)
-	allow docker_t svirt_sandbox_domain:tun_socket relabelfrom;
-	virt_sandbox_entrypoint(docker_t)
-')
-
-tunable_policy(`docker_connect_any',`
-    corenet_tcp_connect_all_ports(docker_t)
-    corenet_sendrecv_all_packets(docker_t)
-    corenet_tcp_sendrecv_all_ports(docker_t)
-')
-
-########################################
-#
-# spc local policy
-#
-allow spc_t { docker_var_lib_t docker_share_t }:file entrypoint;
-role system_r types spc_t;
-
-domtrans_pattern(docker_t, docker_share_t, spc_t)
-domtrans_pattern(docker_t, docker_var_lib_t, spc_t)
-allow docker_t spc_t:process { setsched signal_perms };
-ps_process_pattern(docker_t, spc_t)
-allow docker_t spc_t:socket_class_set { relabelto relabelfrom };
-filetrans_pattern(docker_t, docker_var_lib_t, docker_share_t, dir, "overlay")
-
-optional_policy(`
-	systemd_dbus_chat_machined(spc_t)
-')
-
-optional_policy(`
-	dbus_chat_system_bus(spc_t)
-')
-
-optional_policy(`
-	unconfined_domain_noaudit(spc_t)
-')
-
-optional_policy(`
-	virt_transition_svirt_sandbox(spc_t, system_r)
-	virt_sandbox_entrypoint(spc_t)
-')
-
-########################################
-#
-# docker_auth local policy
-#
-allow docker_auth_t self:fifo_file rw_fifo_file_perms;
-allow docker_auth_t self:unix_stream_socket create_stream_socket_perms;
-dontaudit docker_auth_t self:capability net_admin;
-
-docker_stream_connect(docker_auth_t)
-
-manage_dirs_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_sock_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-manage_lnk_files_pattern(docker_auth_t, docker_plugin_var_run_t, docker_plugin_var_run_t)
-files_pid_filetrans(docker_auth_t, docker_plugin_var_run_t, { dir file lnk_file sock_file })
-
-domain_use_interactive_fds(docker_auth_t)
-
-kernel_read_net_sysctls(docker_auth_t)
-
-auth_use_nsswitch(docker_auth_t)
-
-files_read_etc_files(docker_auth_t)
-
-miscfiles_read_localization(docker_auth_t)
-
-sysnet_dns_name_resolve(docker_auth_t)
-
-########################################
-#
-# OL7.2 systemd selinux update
-# systemd_machined local policy
-#
-allow systemd_machined_t self:capability { dac_override setgid sys_admin sys_chroot sys_ptrace };
-allow systemd_machined_t systemd_unit_file_t:service { status start };
-allow systemd_machined_t self:unix_dgram_socket create_socket_perms;
-
-manage_dirs_pattern(systemd_machined_t, systemd_machined_var_run_t, systemd_machined_var_run_t)
-manage_files_pattern(systemd_machined_t, systemd_machined_var_run_t, systemd_machined_var_run_t)
-manage_lnk_files_pattern(systemd_machined_t, systemd_machined_var_run_t, systemd_machined_var_run_t)
-init_pid_filetrans(systemd_machined_t, systemd_machined_var_run_t, dir, "machines")
-
-manage_dirs_pattern(systemd_machined_t, systemd_machined_var_lib_t, systemd_machined_var_lib_t)
-manage_files_pattern(systemd_machined_t, systemd_machined_var_lib_t, systemd_machined_var_lib_t)
-manage_lnk_files_pattern(systemd_machined_t, systemd_machined_var_lib_t, systemd_machined_var_lib_t)
-init_var_lib_filetrans(systemd_machined_t, systemd_machined_var_lib_t, dir, "machines")
-
-kernel_dgram_send(systemd_machined_t)
-# This is a bug, but need for now.
-kernel_read_unlabeled_state(systemd_machined_t)
-
-init_dbus_chat(systemd_machined_t)
-init_status(systemd_machined_t)
-
-userdom_dbus_send_all_users(systemd_machined_t)
-
-term_use_ptmx(systemd_machined_t)
-
-optional_policy(`
-       dbus_connect_system_bus(systemd_machined_t)
-       dbus_system_bus_client(systemd_machined_t)
-')
-
-optional_policy(`
-       docker_read_share_files(systemd_machined_t)
-       docker_spc_read_state(systemd_machined_t)
-')
-
-optional_policy(`
-       virt_dbus_chat(systemd_machined_t)
-       virt_sandbox_read_state(systemd_machined_t)
-       virt_signal_sandbox(systemd_machined_t)
-       virt_stream_connect_sandbox(systemd_machined_t)
-       virt_rw_svirt_dev(systemd_machined_t)
-       virt_getattr_sandbox_filesystem(systemd_machined_t)
-       virt_read_sandbox_files(systemd_machined_t)
-')
-
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/Makefile b/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/Makefile
deleted file mode 100644
index 1bdc695afe..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-TARGETS?=docker
-MODULES?=${TARGETS:=.pp.bz2}
-SHAREDIR?=/usr/share
-
-all: ${TARGETS:=.pp.bz2}
-
-%.pp.bz2: %.pp
-	@echo Compressing $^ -\> $@
-	bzip2 -9 $^
-
-%.pp: %.te
-	make -f ${SHAREDIR}/selinux/devel/Makefile $@
-
-clean:
-	rm -f *~  *.tc *.pp *.pp.bz2
-	rm -rf tmp *.tar.gz
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.fc b/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.fc
deleted file mode 100644
index 467d659604..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.fc
+++ /dev/null
@@ -1,18 +0,0 @@
-/root/\.docker	gen_context(system_u:object_r:docker_home_t,s0)
-
-/usr/bin/dockerd			--	gen_context(system_u:object_r:docker_exec_t,s0)
-
-/usr/lib/systemd/system/docker.service		--	gen_context(system_u:object_r:docker_unit_file_t,s0)
-
-/etc/docker(/.*)?		gen_context(system_u:object_r:docker_config_t,s0)
-
-/var/lib/docker(/.*)?		gen_context(system_u:object_r:docker_var_lib_t,s0)
-
-/var/run/docker\.pid		--	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker\.sock		-s	gen_context(system_u:object_r:docker_var_run_t,s0)
-/var/run/docker-client(/.*)?		gen_context(system_u:object_r:docker_var_run_t,s0)
-
-/var/lib/docker/init(/.*)?		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hosts		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/containers/.*/hostname		gen_context(system_u:object_r:docker_share_t,s0)
-/var/lib/docker/.*/config\.env	gen_context(system_u:object_r:docker_share_t,s0)
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.if b/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.if
deleted file mode 100644
index ca075c05c5..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.if
+++ /dev/null
@@ -1,461 +0,0 @@
-
-## <summary>The open-source application container engine.</summary>
-
-########################################
-## <summary>
-##	Execute docker in the docker domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_domtrans',`
-	gen_require(`
-		type docker_t, docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	domtrans_pattern($1, docker_exec_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Execute docker in the caller domain.
-## </summary>
-## <param name="domain">
-## <summary>
-##	Domain allowed to transition.
-## </summary>
-## </param>
-#
-interface(`docker_exec',`
-	gen_require(`
-		type docker_exec_t;
-	')
-
-	corecmd_search_bin($1)
-	can_exec($1, docker_exec_t)
-')
-
-########################################
-## <summary>
-##	Search docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_search_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	files_search_var_lib($1)
-')
-
-########################################
-## <summary>
-##	Execute docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_exec_lib',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	allow $1 docker_var_lib_t:dir search_dir_perms;
-	can_exec($1, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	read_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Read docker share files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_share_files',`
-	gen_require(`
-		type docker_share_t;
-	')
-
-	files_search_var_lib($1)
-	read_files_pattern($1, docker_share_t, docker_share_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_files',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-	manage_lnk_files_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Manage docker lib directories.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_manage_lib_dirs',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	files_search_var_lib($1)
-	manage_dirs_pattern($1, docker_var_lib_t, docker_var_lib_t)
-')
-
-########################################
-## <summary>
-##	Create objects in a docker var lib directory
-##	with an automatic type transition to
-##	a specified private type.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-## <param name="private_type">
-##	<summary>
-##	The type of the object to create.
-##	</summary>
-## </param>
-## <param name="object_class">
-##	<summary>
-##	The class of the object to be created.
-##	</summary>
-## </param>
-## <param name="name" optional="true">
-##	<summary>
-##	The name of the object being created.
-##	</summary>
-## </param>
-#
-interface(`docker_lib_filetrans',`
-	gen_require(`
-		type docker_var_lib_t;
-	')
-
-	filetrans_pattern($1, docker_var_lib_t, $2, $3, $4)
-')
-
-########################################
-## <summary>
-##	Read docker PID files.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_read_pid_files',`
-	gen_require(`
-		type docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	read_files_pattern($1, docker_var_run_t, docker_var_run_t)
-')
-
-########################################
-## <summary>
-##	Execute docker server in the docker domain.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed to transition.
-##	</summary>
-## </param>
-#
-interface(`docker_systemctl',`
-	gen_require(`
-		type docker_t;
-		type docker_unit_file_t;
-	')
-
-	systemd_exec_systemctl($1)
-	init_reload_services($1)
-        systemd_read_fifo_file_passwd_run($1)
-	allow $1 docker_unit_file_t:file read_file_perms;
-	allow $1 docker_unit_file_t:service manage_service_perms;
-
-	ps_process_pattern($1, docker_t)
-')
-
-########################################
-## <summary>
-##	Read and write docker shared memory.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_rw_sem',`
-	gen_require(`
-		type docker_t;
-	')
-
-	allow $1 docker_t:sem rw_sem_perms;
-')
-
-#######################################
-## <summary>
-##  Read and write the docker pty type.
-## </summary>
-## <param name="domain">
-##  <summary>
-##  Domain allowed access.
-##  </summary>
-## </param>
-#
-interface(`docker_use_ptys',`
-    gen_require(`
-        type docker_devpts_t;
-    ')
-
-    allow $1 docker_devpts_t:chr_file rw_term_perms;
-')
-
-#######################################
-## <summary>
-##      Allow domain to create docker content
-## </summary>
-## <param name="domain">
-##      <summary>
-##      Domain allowed access.
-##      </summary>
-## </param>
-#
-interface(`docker_filetrans_named_content',`
-
-    gen_require(`
-        type docker_var_lib_t;
-        type docker_share_t;
-	type docker_log_t;
-	    type docker_var_run_t;
-        type docker_home_t;
-    ')
-
-    files_pid_filetrans($1, docker_var_run_t, file, "docker.pid")
-    files_pid_filetrans($1, docker_var_run_t, sock_file, "docker.sock")
-    files_pid_filetrans($1, docker_var_run_t, dir, "docker-client")
-    files_var_lib_filetrans($1, docker_var_lib_t, dir, "docker")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "config.env")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hosts")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "hostname")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, file, "resolv.conf")
-    filetrans_pattern($1, docker_var_lib_t, docker_share_t, dir, "init")
-    userdom_admin_home_dir_filetrans($1, docker_home_t, dir, ".docker")
-')
-
-########################################
-## <summary>
-##	Connect to docker over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_stream_connect',`
-	gen_require(`
-		type docker_t, docker_var_run_t;
-	')
-
-	files_search_pids($1)
-	stream_connect_pattern($1, docker_var_run_t, docker_var_run_t, docker_t)
-')
-
-########################################
-## <summary>
-##	Connect to SPC containers over a unix stream socket.
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_spc_stream_connect',`
-	gen_require(`
-		type spc_t, spc_var_run_t;
-	')
-
-	files_search_pids($1)
-	files_write_all_pid_sockets($1)
-	allow $1 spc_t:unix_stream_socket connectto;
-')
-
-
-########################################
-## <summary>
-##	All of the rules required to administrate
-##	an docker environment
-## </summary>
-## <param name="domain">
-##	<summary>
-##	Domain allowed access.
-##	</summary>
-## </param>
-#
-interface(`docker_admin',`
-	gen_require(`
-		type docker_t;
-		type docker_var_lib_t, docker_var_run_t;
-		type docker_unit_file_t;
-		type docker_lock_t;
-		type docker_log_t;
-		type docker_config_t;
-	')
-
-	allow $1 docker_t:process { ptrace signal_perms };
-	ps_process_pattern($1, docker_t)
-
-	admin_pattern($1, docker_config_t)
-
-	files_search_var_lib($1)
-	admin_pattern($1, docker_var_lib_t)
-
-	files_search_pids($1)
-	admin_pattern($1, docker_var_run_t)
-
-	files_search_locks($1)
-	admin_pattern($1, docker_lock_t)
-
-	logging_search_logs($1)
-	admin_pattern($1, docker_log_t)
-
-	docker_systemctl($1)
-	admin_pattern($1, docker_unit_file_t)
-	allow $1 docker_unit_file_t:service all_service_perms;
-
-	optional_policy(`
-		systemd_passwd_agent_exec($1)
-		systemd_read_fifo_file_passwd_run($1)
-	')
-')
-
-interface(`domain_stub_named_filetrans_domain',`
-    gen_require(`
-        attribute named_filetrans_domain;
-    ')
-')
-
-interface(`lvm_stub',`
-    gen_require(`
-        type lvm_t;
-    ')
-')
-interface(`staff_stub',`
-    gen_require(`
-        type staff_t;
-    ')
-')
-interface(`virt_stub_svirt_sandbox_domain',`
-	gen_require(`
-		attribute svirt_sandbox_domain;
-	')
-')
-interface(`virt_stub_svirt_sandbox_file',`
-	gen_require(`
-		type svirt_sandbox_file_t;
-	')
-')
-interface(`fs_dontaudit_remount_tmpfs',`
-	gen_require(`
-		type tmpfs_t;
-	')
-
-	dontaudit $1 tmpfs_t:filesystem remount;
-')
-interface(`dev_dontaudit_list_all_dev_nodes',`
-	gen_require(`
-		type device_t;
-	')
-
-	dontaudit $1 device_t:dir list_dir_perms;
-')
-interface(`kernel_unlabeled_entry_type',`
-	gen_require(`
-		type unlabeled_t;
-	')
-
-	domain_entry_file($1, unlabeled_t)
-')
-interface(`kernel_unlabeled_domtrans',`
-	gen_require(`
-		type unlabeled_t;
-	')
-
-	read_lnk_files_pattern($1, unlabeled_t, unlabeled_t)
-	domain_transition_pattern($1, unlabeled_t, $2)
-	type_transition $1 unlabeled_t:process $2;
-')
-interface(`files_write_all_pid_sockets',`
-	gen_require(`
-		attribute pidfile;
-	')
-
-	allow $1 pidfile:sock_file write_sock_file_perms;
-')
-interface(`dev_dontaudit_mounton_sysfs',`
-	gen_require(`
-		type sysfs_t;
-	')
-
-	dontaudit $1 sysfs_t:dir mounton;
-')
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.te b/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.te
deleted file mode 100644
index bad0bb6e4c..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker.te
+++ /dev/null
@@ -1,407 +0,0 @@
-policy_module(docker, 1.0.0)
-
-########################################
-#
-# Declarations
-#
-
-## <desc>
-##  <p>
-##  Determine whether docker can
-##  connect to all TCP ports.
-##  </p>
-## </desc>
-gen_tunable(docker_connect_any, false)
-
-type docker_t;
-type docker_exec_t;
-init_daemon_domain(docker_t, docker_exec_t)
-domain_subj_id_change_exemption(docker_t)
-domain_role_change_exemption(docker_t)
-
-type spc_t;
-domain_type(spc_t)
-role system_r types spc_t;
-
-type spc_var_run_t;
-files_pid_file(spc_var_run_t)
-
-type docker_var_lib_t;
-files_type(docker_var_lib_t)
-
-type docker_home_t;
-userdom_user_home_content(docker_home_t)
-
-type docker_config_t;
-files_config_file(docker_config_t)
-
-type docker_lock_t;
-files_lock_file(docker_lock_t)
-
-type docker_log_t;
-logging_log_file(docker_log_t)
-
-type docker_tmp_t;
-files_tmp_file(docker_tmp_t)
-
-type docker_tmpfs_t;
-files_tmpfs_file(docker_tmpfs_t)
-
-type docker_var_run_t;
-files_pid_file(docker_var_run_t)
-
-type docker_unit_file_t;
-systemd_unit_file(docker_unit_file_t)
-
-type docker_devpts_t;
-term_pty(docker_devpts_t)
-
-type docker_share_t;
-files_type(docker_share_t)
-
-########################################
-#
-# docker local policy
-#
-allow docker_t self:capability { chown kill fowner fsetid mknod net_admin net_bind_service net_raw setfcap };
-allow docker_t self:tun_socket relabelto;
-allow docker_t self:process { getattr signal_perms setrlimit setfscreate };
-allow docker_t self:fifo_file rw_fifo_file_perms;
-allow docker_t self:unix_stream_socket create_stream_socket_perms;
-allow docker_t self:tcp_socket create_stream_socket_perms;
-allow docker_t self:udp_socket create_socket_perms;
-allow docker_t self:capability2 block_suspend;
-
-manage_files_pattern(docker_t, docker_home_t, docker_home_t)
-manage_dirs_pattern(docker_t, docker_home_t, docker_home_t)
-manage_lnk_files_pattern(docker_t, docker_home_t, docker_home_t)
-userdom_admin_home_dir_filetrans(docker_t, docker_home_t, dir, ".docker")
-
-manage_dirs_pattern(docker_t, docker_config_t, docker_config_t)
-manage_files_pattern(docker_t, docker_config_t, docker_config_t)
-files_etc_filetrans(docker_t, docker_config_t, dir, "docker")
-
-manage_dirs_pattern(docker_t, docker_lock_t, docker_lock_t)
-manage_files_pattern(docker_t, docker_lock_t, docker_lock_t)
-
-manage_dirs_pattern(docker_t, docker_log_t, docker_log_t)
-manage_files_pattern(docker_t, docker_log_t, docker_log_t)
-manage_lnk_files_pattern(docker_t, docker_log_t, docker_log_t)
-logging_log_filetrans(docker_t, docker_log_t, { dir file lnk_file })
-allow docker_t docker_log_t:dir_file_class_set { relabelfrom relabelto };
-
-manage_dirs_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-manage_lnk_files_pattern(docker_t, docker_tmp_t, docker_tmp_t)
-files_tmp_filetrans(docker_t, docker_tmp_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_lnk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_fifo_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_chr_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-manage_blk_files_pattern(docker_t, docker_tmpfs_t, docker_tmpfs_t)
-allow docker_t docker_tmpfs_t:dir relabelfrom;
-can_exec(docker_t, docker_tmpfs_t)
-fs_tmpfs_filetrans(docker_t, docker_tmpfs_t, { dir file })
-allow docker_t docker_tmpfs_t:chr_file mounton;
-
-manage_dirs_pattern(docker_t, docker_share_t, docker_share_t)
-manage_files_pattern(docker_t, docker_share_t, docker_share_t)
-manage_lnk_files_pattern(docker_t, docker_share_t, docker_share_t)
-allow docker_t docker_share_t:dir_file_class_set { relabelfrom relabelto };
-
-can_exec(docker_t, docker_share_t)
-#docker_filetrans_named_content(docker_t)
-
-manage_dirs_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_chr_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_blk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-manage_lnk_files_pattern(docker_t, docker_var_lib_t, docker_var_lib_t)
-allow docker_t docker_var_lib_t:dir_file_class_set { relabelfrom relabelto };
-files_var_lib_filetrans(docker_t, docker_var_lib_t, { dir file lnk_file })
-
-manage_dirs_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_sock_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-manage_lnk_files_pattern(docker_t, docker_var_run_t, docker_var_run_t)
-files_pid_filetrans(docker_t, docker_var_run_t, { dir file lnk_file sock_file })
-
-allow docker_t docker_devpts_t:chr_file { relabelfrom rw_chr_file_perms setattr_chr_file_perms };
-term_create_pty(docker_t, docker_devpts_t)
-
-kernel_read_system_state(docker_t)
-kernel_read_network_state(docker_t)
-kernel_read_all_sysctls(docker_t)
-kernel_rw_net_sysctls(docker_t)
-kernel_setsched(docker_t)
-kernel_read_all_proc(docker_t)
-
-domain_use_interactive_fds(docker_t)
-domain_dontaudit_read_all_domains_state(docker_t)
-
-corecmd_exec_bin(docker_t)
-corecmd_exec_shell(docker_t)
-
-corenet_tcp_bind_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_if(docker_t)
-corenet_tcp_sendrecv_generic_node(docker_t)
-corenet_tcp_sendrecv_generic_port(docker_t)
-corenet_tcp_bind_all_ports(docker_t)
-corenet_tcp_connect_http_port(docker_t)
-corenet_tcp_connect_commplex_main_port(docker_t)
-corenet_udp_sendrecv_generic_if(docker_t)
-corenet_udp_sendrecv_generic_node(docker_t)
-corenet_udp_sendrecv_all_ports(docker_t)
-corenet_udp_bind_generic_node(docker_t)
-corenet_udp_bind_all_ports(docker_t)
-
-files_read_config_files(docker_t)
-files_dontaudit_getattr_all_dirs(docker_t)
-files_dontaudit_getattr_all_files(docker_t)
-
-fs_read_cgroup_files(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_search_all(docker_t)
-fs_getattr_all_fs(docker_t)
-
-storage_raw_rw_fixed_disk(docker_t)
-
-auth_use_nsswitch(docker_t)
-auth_dontaudit_getattr_shadow(docker_t)
-
-init_read_state(docker_t)
-init_status(docker_t)
-
-logging_send_audit_msgs(docker_t)
-logging_send_syslog_msg(docker_t)
-
-miscfiles_read_localization(docker_t)
-
-mount_domtrans(docker_t)
-
-seutil_read_default_contexts(docker_t)
-seutil_read_config(docker_t)
-
-sysnet_dns_name_resolve(docker_t)
-sysnet_exec_ifconfig(docker_t)
-
-optional_policy(`
-	rpm_exec(docker_t)
-	rpm_read_db(docker_t)
-	rpm_exec(docker_t)
-')
-
-optional_policy(`
-	fstools_domtrans(docker_t)
-')
-
-optional_policy(`
-	iptables_domtrans(docker_t)
-')
-
-optional_policy(`
-	openvswitch_stream_connect(docker_t)
-')
-
-allow docker_t self:capability { dac_override setgid setpcap setuid sys_admin sys_boot sys_chroot sys_ptrace };
-
-allow docker_t self:process { getcap setcap setexec setpgid setsched signal_perms };
-
-allow docker_t self:netlink_route_socket rw_netlink_socket_perms;;
-allow docker_t self:netlink_audit_socket create_netlink_socket_perms;
-allow docker_t self:unix_dgram_socket { create_socket_perms sendto };
-allow docker_t self:unix_stream_socket { create_stream_socket_perms connectto };
-
-allow docker_t docker_var_lib_t:dir mounton;
-allow docker_t docker_var_lib_t:chr_file mounton;
-can_exec(docker_t, docker_var_lib_t)
-
-kernel_dontaudit_setsched(docker_t)
-kernel_get_sysvipc_info(docker_t)
-kernel_request_load_module(docker_t)
-kernel_mounton_messages(docker_t)
-kernel_mounton_all_proc(docker_t)
-kernel_mounton_all_sysctls(docker_t)
-kernel_unlabeled_entry_type(spc_t)
-kernel_unlabeled_domtrans(docker_t, spc_t)
-
-dev_getattr_all(docker_t)
-dev_getattr_sysfs_fs(docker_t)
-dev_read_urand(docker_t)
-dev_read_lvm_control(docker_t)
-dev_rw_sysfs(docker_t)
-dev_rw_loop_control(docker_t)
-dev_rw_lvm_control(docker_t)
-
-files_getattr_isid_type_dirs(docker_t)
-files_manage_isid_type_dirs(docker_t)
-files_manage_isid_type_files(docker_t)
-files_manage_isid_type_symlinks(docker_t)
-files_manage_isid_type_chr_files(docker_t)
-files_manage_isid_type_blk_files(docker_t)
-files_exec_isid_files(docker_t)
-files_mounton_isid(docker_t)
-files_mounton_non_security(docker_t)
-files_mounton_isid_type_chr_file(docker_t)
-
-fs_mount_all_fs(docker_t)
-fs_unmount_all_fs(docker_t)
-fs_remount_all_fs(docker_t)
-files_mounton_isid(docker_t)
-fs_manage_cgroup_dirs(docker_t)
-fs_manage_cgroup_files(docker_t)
-fs_relabelfrom_xattr_fs(docker_t)
-fs_relabelfrom_tmpfs(docker_t)
-fs_read_tmpfs_symlinks(docker_t)
-fs_list_hugetlbfs(docker_t)
-
-term_use_generic_ptys(docker_t)
-term_use_ptmx(docker_t)
-term_getattr_pty_fs(docker_t)
-term_relabel_pty_fs(docker_t)
-term_mounton_unallocated_ttys(docker_t)
-
-modutils_domtrans_insmod(docker_t)
-
-systemd_status_all_unit_files(docker_t)
-systemd_start_systemd_services(docker_t)
-
-userdom_stream_connect(docker_t)
-userdom_search_user_home_content(docker_t)
-userdom_read_all_users_state(docker_t)
-userdom_relabel_user_home_files(docker_t)
-userdom_relabel_user_tmp_files(docker_t)
-userdom_relabel_user_tmp_dirs(docker_t)
-
-optional_policy(`
-	gpm_getattr_gpmctl(docker_t)
-')
-
-optional_policy(`
-	dbus_system_bus_client(docker_t)
-	init_dbus_chat(docker_t)
-	init_start_transient_unit(docker_t)
-
-	optional_policy(`
-		systemd_dbus_chat_logind(docker_t)
-	')
-
-	optional_policy(`
-		firewalld_dbus_chat(docker_t)
-	')
-')
-
-optional_policy(`
-	udev_read_db(docker_t)
-')
-
-optional_policy(`
-	virt_read_config(docker_t)
-	virt_exec(docker_t)
-	virt_stream_connect(docker_t)
-	virt_stream_connect_sandbox(docker_t)
-	virt_exec_sandbox_files(docker_t)
-	virt_manage_sandbox_files(docker_t)
-	virt_relabel_sandbox_filesystem(docker_t)
-	virt_transition_svirt_sandbox(docker_t, system_r)
-	virt_mounton_sandbox_file(docker_t)
-#	virt_attach_sandbox_tun_iface(docker_t)
-	allow docker_t svirt_sandbox_domain:tun_socket relabelfrom;
-')
-
-tunable_policy(`docker_connect_any',`
-    corenet_tcp_connect_all_ports(docker_t)
-    corenet_sendrecv_all_packets(docker_t)
-    corenet_tcp_sendrecv_all_ports(docker_t)
-')
-
-########################################
-#
-# spc local policy
-#
-domain_entry_file(spc_t, docker_share_t)
-domain_entry_file(spc_t, docker_var_lib_t)
-role system_r types spc_t;
-
-domain_entry_file(spc_t, docker_share_t)
-domain_entry_file(spc_t, docker_var_lib_t)
-domtrans_pattern(docker_t, docker_share_t, spc_t)
-domtrans_pattern(docker_t, docker_var_lib_t, spc_t)
-allow docker_t spc_t:process { setsched signal_perms };
-ps_process_pattern(docker_t, spc_t)
-allow docker_t spc_t:socket_class_set { relabelto relabelfrom };
-
-optional_policy(`
-	dbus_chat_system_bus(spc_t)
-')
-
-optional_policy(`
-	unconfined_domain_noaudit(spc_t)
-')
-
-optional_policy(`
-	unconfined_domain(docker_t)
-')
-
-optional_policy(`
-	virt_transition_svirt_sandbox(spc_t, system_r)
-')
-
-########################################
-#
-# docker upstream policy
-#
-
-optional_policy(`
-#    domain_stub_named_filetrans_domain()
-     gen_require(`
-        attribute named_filetrans_domain;
-     ')
-
-      docker_filetrans_named_content(named_filetrans_domain)
-')
-
-optional_policy(`
-    lvm_stub()
-    docker_rw_sem(lvm_t)
-')
-
-optional_policy(`
-    staff_stub()
-    docker_stream_connect(staff_t)
-    docker_exec(staff_t)
-')
-
-optional_policy(`
-    virt_stub_svirt_sandbox_domain()
-    virt_stub_svirt_sandbox_file()
-    allow svirt_sandbox_domain self:netlink_kobject_uevent_socket create_socket_perms;
-    docker_read_share_files(svirt_sandbox_domain)
-    docker_lib_filetrans(svirt_sandbox_domain,svirt_sandbox_file_t, sock_file)
-    docker_use_ptys(svirt_sandbox_domain)
-    docker_spc_stream_connect(svirt_sandbox_domain)
-    fs_list_tmpfs(svirt_sandbox_domain)
-    fs_rw_hugetlbfs_files(svirt_sandbox_domain)
-    fs_dontaudit_remount_tmpfs(svirt_sandbox_domain)
-    dev_dontaudit_mounton_sysfs(svirt_sandbox_domain)
-
-    tunable_policy(`virt_sandbox_use_fusefs',`
-	fs_manage_fusefs_dirs(svirt_sandbox_domain)
-	fs_manage_fusefs_files(svirt_sandbox_domain)
-	fs_manage_fusefs_symlinks(svirt_sandbox_domain)
-    ')
-     gen_require(`
-        attribute domain;
-     ')
-
-     dontaudit svirt_sandbox_domain domain:key {search link};
-')
-
-optional_policy(`
-	gen_require(`
-		type pcp_pmcd_t;
-	')
-	docker_manage_lib_files(pcp_pmcd_t)
-')
diff --git a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker_selinux.8.gz b/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker_selinux.8.gz
deleted file mode 100644
index ab5d59445a..0000000000
Binary files a/installer/vendor/github.com/docker/docker/contrib/selinux/docker-engine-selinux/docker_selinux.8.gz and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/nano/Dockerfile.nanorc b/installer/vendor/github.com/docker/docker/contrib/syntax/nano/Dockerfile.nanorc
deleted file mode 100644
index 8b63dae945..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/nano/Dockerfile.nanorc
+++ /dev/null
@@ -1,26 +0,0 @@
-## Syntax highlighting for Dockerfiles
-syntax "Dockerfile" "Dockerfile[^/]*$"
-
-## Keywords
-icolor red "^(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)[[:space:]]"
-
-## Brackets & parenthesis
-color brightgreen "(\(|\)|\[|\])"
-
-## Double ampersand
-color brightmagenta "&&"
-
-## Comments
-icolor cyan "^[[:space:]]*#.*$"
-
-## Blank space at EOL
-color ,green "[[:space:]]+$"
-
-## Strings, single-quoted
-color brightwhite "'([^']|(\\'))*'" "%[qw]\{[^}]*\}" "%[qw]\([^)]*\)" "%[qw]<[^>]*>" "%[qw]\[[^]]*\]" "%[qw]\$[^$]*\$" "%[qw]\^[^^]*\^" "%[qw]![^!]*!"
-
-## Strings, double-quoted
-color brightwhite ""([^"]|(\\"))*"" "%[QW]?\{[^}]*\}" "%[QW]?\([^)]*\)" "%[QW]?<[^>]*>" "%[QW]?\[[^]]*\]" "%[QW]?\$[^$]*\$" "%[QW]?\^[^^]*\^" "%[QW]?![^!]*!"
-
-## Single and double quotes
-color brightyellow "('|\")"
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/nano/README.md b/installer/vendor/github.com/docker/docker/contrib/syntax/nano/README.md
deleted file mode 100644
index 5985208b09..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/nano/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Dockerfile.nanorc
-=================
-
-Dockerfile syntax highlighting for nano
-
-Single User Installation
-------------------------
-1. Create a nano syntax directory in your home directory:
- * `mkdir -p ~/.nano/syntax`
-
-2. Copy `Dockerfile.nanorc` to` ~/.nano/syntax/`
- * `cp Dockerfile.nanorc ~/.nano/syntax/`
-
-3. Add the following to your `~/.nanorc` to tell nano where to find the `Dockerfile.nanorc` file
-  ```
-## Dockerfile files
-include "~/.nano/syntax/Dockerfile.nanorc"
-  ```
-
-System Wide Installation
-------------------------
-1. Create a nano syntax directory: 
-  * `mkdir /usr/local/share/nano`
-
-2. Copy `Dockerfile.nanorc` to `/usr/local/share/nano`
-  * `cp Dockerfile.nanorc /usr/local/share/nano/`
-
-3. Add the following to your `/etc/nanorc`:
-  ```
-## Dockerfile files
-include "/usr/local/share/nano/Dockerfile.nanorc"
-  ```
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences b/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences
deleted file mode 100644
index 20f0d04ca8..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Preferences/Dockerfile.tmPreferences
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>name</key>
-	<string>Comments</string>
-	<key>scope</key>
-	<string>source.dockerfile</string>
-	<key>settings</key>
-	<dict>
-		<key>shellVariables</key>
-		<array>
-			<dict>
-				<key>name</key>
-				<string>TM_COMMENT_START</string>
-				<key>value</key>
-				<string># </string>
-			</dict>
-		</array>
-	</dict>
-	<key>uuid</key>
-	<string>2B215AC0-A7F3-4090-9FF6-F4842BD56CA7</string>
-</dict>
-</plist>
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage b/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage
deleted file mode 100644
index 948a9bfc20..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/Syntaxes/Dockerfile.tmLanguage
+++ /dev/null
@@ -1,143 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>fileTypes</key>
-	<array>
-		<string>Dockerfile</string>
-	</array>
-	<key>name</key>
-	<string>Dockerfile</string>
-	<key>patterns</key>
-	<array>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.control.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?:(ONBUILD)\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s</string>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.operator.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>keyword.other.special-method.dockerfile</string>
-				</dict>
-			</dict>
-			<key>match</key>
-			<string>^\s*(?:(ONBUILD)\s+)?(CMD|ENTRYPOINT)\s</string>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>"</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.dockerfile</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>"</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.dockerfile</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.double.dockerfile</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.dockerfile</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>begin</key>
-			<string>'</string>
-			<key>beginCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.begin.dockerfile</string>
-				</dict>
-			</dict>
-			<key>end</key>
-			<string>'</string>
-			<key>endCaptures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.string.end.dockerfile</string>
-				</dict>
-			</dict>
-			<key>name</key>
-			<string>string.quoted.single.dockerfile</string>
-			<key>patterns</key>
-			<array>
-				<dict>
-					<key>match</key>
-					<string>\\.</string>
-					<key>name</key>
-					<string>constant.character.escaped.dockerfile</string>
-				</dict>
-			</array>
-		</dict>
-		<dict>
-			<key>captures</key>
-			<dict>
-				<key>1</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.whitespace.comment.leading.dockerfile</string>
-				</dict>
-				<key>2</key>
-				<dict>
-					<key>name</key>
-					<string>comment.line.number-sign.dockerfile</string>
-				</dict>
-				<key>3</key>
-				<dict>
-					<key>name</key>
-					<string>punctuation.definition.comment.dockerfile</string>
-				</dict>
-			</dict>
-			<key>comment</key>
-			<string>comment.line</string>
-			<key>match</key>
-			<string>^(\s*)((#).*$\n?)</string>
-		</dict>
-	</array>
-	<key>scopeName</key>
-	<string>source.dockerfile</string>
-	<key>uuid</key>
-	<string>a39d8795-59d2-49af-aa00-fe74ee29576e</string>
-</dict>
-</plist>
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/info.plist b/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/info.plist
deleted file mode 100644
index 239f4b0a9b..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/Docker.tmbundle/info.plist
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>contactEmailRot13</key>
-	<string>germ@andz.com.ar</string>
-	<key>contactName</key>
-	<string>GermanDZ</string>
-	<key>description</key>
-	<string>Helpers for Docker.</string>
-	<key>name</key>
-	<string>Docker</string>
-	<key>uuid</key>
-	<string>8B9DDBAF-E65C-4E12-FFA7-467D4AA535B1</string>
-</dict>
-</plist>
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/README.md b/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/README.md
deleted file mode 100644
index ce611018e5..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Docker.tmbundle
-
-Dockerfile syntax highlighting for TextMate and Sublime Text.
-
-## Install
-
-### Sublime Text
-
-Available for Sublime Text under [package control](https://sublime.wbond.net/packages/Dockerfile%20Syntax%20Highlighting).
-Search for *Dockerfile Syntax Highlighting*
-
-### TextMate 2
-
-You can install this bundle in TextMate by opening the preferences and going to the bundles tab. After installation it will be automatically updated for you.
-
-enjoy.
-
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/REVIEWERS b/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/REVIEWERS
deleted file mode 100644
index 965743df64..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/textmate/REVIEWERS
+++ /dev/null
@@ -1 +0,0 @@
-Asbjorn Enge <asbjorn@hanafjedle.net> (@asbjornenge)
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/README.md b/installer/vendor/github.com/docker/docker/contrib/syntax/vim/README.md
deleted file mode 100644
index 5aa9bd825d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/README.md
+++ /dev/null
@@ -1,26 +0,0 @@
-dockerfile.vim
-==============
-
-Syntax highlighting for Dockerfiles
-
-Installation
-------------
-With [pathogen](https://github.com/tpope/vim-pathogen), the usual way...
-
-With [Vundle](https://github.com/gmarik/Vundle.vim)
-  
-    Plugin 'docker/docker' , {'rtp': '/contrib/syntax/vim/'}
-
-Features
---------
-
-The syntax highlighting includes:
-
-* The directives (e.g. `FROM`)
-* Strings
-* Comments
-
-License
--------
-
-BSD, short and sweet
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/doc/dockerfile.txt b/installer/vendor/github.com/docker/docker/contrib/syntax/vim/doc/dockerfile.txt
deleted file mode 100644
index e69e2b7b30..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/doc/dockerfile.txt
+++ /dev/null
@@ -1,18 +0,0 @@
-*dockerfile.txt*  Syntax highlighting for Dockerfiles
-
-Author: Honza Pokorny <https://honza.ca>
-License: BSD
-
-INSTALLATION                                                     *installation*
-
-Drop it on your Pathogen path and you're all set.
-
-FEATURES                                                             *features*
-
-The syntax highlighting includes:
-
-* The directives (e.g. FROM)
-* Strings
-* Comments
-
- vim:tw=78:et:ft=help:norl:
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/ftdetect/dockerfile.vim b/installer/vendor/github.com/docker/docker/contrib/syntax/vim/ftdetect/dockerfile.vim
deleted file mode 100644
index ee10e5d6a0..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/ftdetect/dockerfile.vim
+++ /dev/null
@@ -1 +0,0 @@
-au BufNewFile,BufRead [Dd]ockerfile,Dockerfile.* set filetype=dockerfile
diff --git a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/syntax/dockerfile.vim b/installer/vendor/github.com/docker/docker/contrib/syntax/vim/syntax/dockerfile.vim
deleted file mode 100644
index a067e6ad4c..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syntax/vim/syntax/dockerfile.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" dockerfile.vim - Syntax highlighting for Dockerfiles
-" Maintainer:   Honza Pokorny <https://honza.ca>
-" Version:      0.5
-
-
-if exists("b:current_syntax")
-    finish
-endif
-
-let b:current_syntax = "dockerfile"
-
-syntax case ignore
-
-syntax match dockerfileKeyword /\v^\s*(ONBUILD\s+)?(ADD|ARG|CMD|COPY|ENTRYPOINT|ENV|EXPOSE|FROM|HEALTHCHECK|LABEL|MAINTAINER|RUN|SHELL|STOPSIGNAL|USER|VOLUME|WORKDIR)\s/
-highlight link dockerfileKeyword Keyword
-
-syntax region dockerfileString start=/\v"/ skip=/\v\\./ end=/\v"/
-highlight link dockerfileString String
-
-syntax match dockerfileComment "\v^\s*#.*$"
-highlight link dockerfileComment Comment
-
-set commentstring=#\ %s
-
-" match "RUN", "CMD", and "ENTRYPOINT" lines, and parse them as shell
-let s:current_syntax = b:current_syntax
-unlet b:current_syntax
-syntax include @SH syntax/sh.vim
-let b:current_syntax = s:current_syntax
-syntax region shLine matchgroup=dockerfileKeyword start=/\v^\s*(RUN|CMD|ENTRYPOINT)\s/ end=/\v$/ contains=@SH
-" since @SH will handle "\" as part of the same line automatically, this "just works" for line continuation too, but with the caveat that it will highlight "RUN echo '" followed by a newline as if it were a block because the "'" is shell line continuation...  not sure how to fix that just yet (TODO)
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/Dockerfile b/installer/vendor/github.com/docker/docker/contrib/syscall-test/Dockerfile
deleted file mode 100644
index f95f1758c0..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/Dockerfile
+++ /dev/null
@@ -1,15 +0,0 @@
-FROM buildpack-deps:jessie
-
-COPY . /usr/src/
-
-WORKDIR /usr/src/
-
-RUN gcc -g -Wall -static userns.c -o /usr/bin/userns-test \
-	&& gcc -g -Wall -static ns.c -o /usr/bin/ns-test \
-	&& gcc -g -Wall -static acct.c -o /usr/bin/acct-test \
-	&& gcc -g -Wall -static setuid.c -o /usr/bin/setuid-test \
-	&& gcc -g -Wall -static setgid.c -o /usr/bin/setgid-test \
-	&& gcc -g -Wall -static socket.c -o /usr/bin/socket-test \
-	&& gcc -g -Wall -static raw.c -o /usr/bin/raw-test
-
-RUN [ "$(uname -m)" = "x86_64" ] && gcc -s -m32 -nostdlib exit32.s -o /usr/bin/exit32-test || true
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/acct.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/acct.c
deleted file mode 100644
index 88ac287966..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/acct.c
+++ /dev/null
@@ -1,16 +0,0 @@
-#define _GNU_SOURCE
-#include <unistd.h>
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include <errno.h>
-
-int main(int argc, char **argv)
-{
-	int err = acct("/tmp/t");
-	if (err == -1) {
-		fprintf(stderr, "acct failed: %s\n", strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	exit(EXIT_SUCCESS);
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/exit32.s b/installer/vendor/github.com/docker/docker/contrib/syscall-test/exit32.s
deleted file mode 100644
index 8bbb5c58b3..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/exit32.s
+++ /dev/null
@@ -1,7 +0,0 @@
-.globl _start
-.text
-_start:
-	xorl	%eax, %eax
-	incl	%eax
-	movb	$0, %bl
-	int	$0x80
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/ns.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/ns.c
deleted file mode 100644
index 33684e1c3d..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/ns.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#define _GNU_SOURCE
-#include <errno.h>
-#include <sched.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#define STACK_SIZE (1024 * 1024)	/* Stack size for cloned child */
-
-struct clone_args {
-	char **argv;
-};
-
-// child_exec is the func that will be executed as the result of clone
-static int child_exec(void *stuff)
-{
-	struct clone_args *args = (struct clone_args *)stuff;
-	if (execvp(args->argv[0], args->argv) != 0) {
-		fprintf(stderr, "failed to execvp argments %s\n",
-			strerror(errno));
-		exit(-1);
-	}
-	// we should never reach here!
-	exit(EXIT_FAILURE);
-}
-
-int main(int argc, char **argv)
-{
-	struct clone_args args;
-	args.argv = &argv[1];
-
-	int clone_flags = CLONE_NEWNS | CLONE_NEWPID | SIGCHLD;
-
-	// allocate stack for child
-	char *stack;		/* Start of stack buffer */
-	char *child_stack;	/* End of stack buffer */
-	stack =
-	    mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
-		 MAP_SHARED | MAP_ANON | MAP_STACK, -1, 0);
-	if (stack == MAP_FAILED) {
-		fprintf(stderr, "mmap failed: %s\n", strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	child_stack = stack + STACK_SIZE;	/* Assume stack grows downward */
-
-	// the result of this call is that our child_exec will be run in another
-	// process returning its pid
-	pid_t pid = clone(child_exec, child_stack, clone_flags, &args);
-	if (pid < 0) {
-		fprintf(stderr, "clone failed: %s\n", strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	// lets wait on our child process here before we, the parent, exits
-	if (waitpid(pid, NULL, 0) == -1) {
-		fprintf(stderr, "failed to wait pid %d\n", pid);
-		exit(EXIT_FAILURE);
-	}
-	exit(EXIT_SUCCESS);
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/raw.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/raw.c
deleted file mode 100644
index 7995a0d3a5..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/raw.c
+++ /dev/null
@@ -1,14 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/socket.h>
-#include <netinet/ip.h>
-#include <netinet/udp.h>
-
-int main() {
-	if (socket(PF_INET, SOCK_RAW, IPPROTO_UDP) == -1) {
-		perror("socket");
-		return 1;
-	}
-
-	return 0;
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/setgid.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/setgid.c
deleted file mode 100644
index df9680c869..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/setgid.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-
-int main() {
-	if (setgid(1) == -1) {
-		perror("setgid");
-		return 1;
-	}
-	return 0;
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/setuid.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/setuid.c
deleted file mode 100644
index 5b939677e9..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/setuid.c
+++ /dev/null
@@ -1,11 +0,0 @@
-#include <sys/types.h>
-#include <unistd.h>
-#include <stdio.h>
-
-int main() {
-	if (setuid(1) == -1) {
-		perror("setuid");
-		return 1;
-	}
-	return 0;
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/socket.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/socket.c
deleted file mode 100644
index d26c82f00f..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/socket.c
+++ /dev/null
@@ -1,30 +0,0 @@
-#include <stdio.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <arpa/inet.h>
-
-int main() {
-	int s;
-	struct sockaddr_in sin;
-
-	s = socket(AF_INET, SOCK_STREAM, 0);
-	if (s == -1) {
-		perror("socket");
-		return 1;
-	}
-
-	sin.sin_family = AF_INET;
-	sin.sin_addr.s_addr = INADDR_ANY;
-	sin.sin_port = htons(80);
-
-	if (bind(s, (struct sockaddr *)&sin, sizeof(sin)) == -1) {
-		perror("bind");
-		return 1;
-	}
-
-	close(s);
-
-	return 0;
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/syscall-test/userns.c b/installer/vendor/github.com/docker/docker/contrib/syscall-test/userns.c
deleted file mode 100644
index 2af36f4228..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/syscall-test/userns.c
+++ /dev/null
@@ -1,63 +0,0 @@
-#define _GNU_SOURCE
-#include <errno.h>
-#include <sched.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <unistd.h>
-
-#define STACK_SIZE (1024 * 1024)	/* Stack size for cloned child */
-
-struct clone_args {
-	char **argv;
-};
-
-// child_exec is the func that will be executed as the result of clone
-static int child_exec(void *stuff)
-{
-	struct clone_args *args = (struct clone_args *)stuff;
-	if (execvp(args->argv[0], args->argv) != 0) {
-		fprintf(stderr, "failed to execvp argments %s\n",
-			strerror(errno));
-		exit(-1);
-	}
-	// we should never reach here!
-	exit(EXIT_FAILURE);
-}
-
-int main(int argc, char **argv)
-{
-	struct clone_args args;
-	args.argv = &argv[1];
-
-	int clone_flags = CLONE_NEWUSER | SIGCHLD;
-
-	// allocate stack for child
-	char *stack;		/* Start of stack buffer */
-	char *child_stack;	/* End of stack buffer */
-	stack =
-	    mmap(NULL, STACK_SIZE, PROT_READ | PROT_WRITE,
-		 MAP_SHARED | MAP_ANON | MAP_STACK, -1, 0);
-	if (stack == MAP_FAILED) {
-		fprintf(stderr, "mmap failed: %s\n", strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	child_stack = stack + STACK_SIZE;	/* Assume stack grows downward */
-
-	// the result of this call is that our child_exec will be run in another
-	// process returning its pid
-	pid_t pid = clone(child_exec, child_stack, clone_flags, &args);
-	if (pid < 0) {
-		fprintf(stderr, "clone failed: %s\n", strerror(errno));
-		exit(EXIT_FAILURE);
-	}
-	// lets wait on our child process here before we, the parent, exits
-	if (waitpid(pid, NULL, 0) == -1) {
-		fprintf(stderr, "failed to wait pid %d\n", pid);
-		exit(EXIT_FAILURE);
-	}
-	exit(EXIT_SUCCESS);
-}
diff --git a/installer/vendor/github.com/docker/docker/contrib/udev/80-docker.rules b/installer/vendor/github.com/docker/docker/contrib/udev/80-docker.rules
deleted file mode 100644
index f934c01757..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/udev/80-docker.rules
+++ /dev/null
@@ -1,3 +0,0 @@
-# hide docker's loopback devices from udisks, and thus from user desktops
-SUBSYSTEM=="block", ENV{DM_NAME}=="docker-*", ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1"
-SUBSYSTEM=="block", DEVPATH=="/devices/virtual/block/loop*", ATTR{loop/backing_file}=="/var/lib/docker/*", ENV{UDISKS_PRESENTATION_HIDE}="1", ENV{UDISKS_IGNORE}="1"
diff --git a/installer/vendor/github.com/docker/docker/contrib/vagrant-docker/README.md b/installer/vendor/github.com/docker/docker/contrib/vagrant-docker/README.md
deleted file mode 100644
index 286a98504a..0000000000
--- a/installer/vendor/github.com/docker/docker/contrib/vagrant-docker/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-# Vagrant integration
-
-Currently there are at least 4 different projects that we are aware of that deals
-with integration with [Vagrant](http://vagrantup.com/) at different levels. One
-approach is to use Docker as a [provisioner](http://docs.vagrantup.com/v2/provisioning/index.html)
-which means you can create containers and pull base images on VMs using Docker's
-CLI and the other is to use Docker as a [provider](http://docs.vagrantup.com/v2/providers/index.html),
-meaning you can use Vagrant to control Docker containers.
-
-
-### Provisioners
-
-* [Vocker](https://github.com/fgrehm/vocker)
-* [Ventriloquist](https://github.com/fgrehm/ventriloquist)
-
-### Providers
-
-* [docker-provider](https://github.com/fgrehm/docker-provider)
-* [vagrant-shell](https://github.com/destructuring/vagrant-shell)
-
-## Setting up Vagrant-docker with the Engine API
-
-The initial Docker upstart script will not work because it runs on `127.0.0.1`, which is not accessible to the host machine. Instead, we need to change the script to connect to `0.0.0.0`. To do this, modify `/etc/init/docker.conf` to look like this:
-
-```
-description     "Docker daemon"
-
-start on filesystem
-stop on runlevel [!2345]
-
-respawn
-
-script
-    /usr/bin/docker daemon -H=tcp://0.0.0.0:2375
-end script
-```
-
-Once that's done, you need to set up a SSH tunnel between your host machine and the vagrant machine that's running Docker. This can be done by running the following command in a host terminal:
-
-```
-ssh -L 2375:localhost:2375 -p 2222 vagrant@localhost
-```
-
-(The first 2375 is what your host can connect to, the second 2375 is what port Docker is running on in the vagrant machine, and the 2222 is the port Vagrant is providing for SSH. If VirtualBox is the VM you're using, you can see what value "2222" should be by going to: Network > Adapter 1 > Advanced > Port Forwarding in the VirtualBox GUI.)
-
-Note that because the port has been changed, to run docker commands from within the command line you must run them like this:
-
-```
-sudo docker -H 0.0.0.0:2375 < commands for docker >
-```
diff --git a/installer/vendor/github.com/docker/docker/daemon/apparmor_default.go b/installer/vendor/github.com/docker/docker/daemon/apparmor_default.go
deleted file mode 100644
index 09dd0541b8..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/apparmor_default.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build linux
-
-package daemon
-
-import (
-	"fmt"
-
-	aaprofile "github.com/docker/docker/profiles/apparmor"
-	"github.com/opencontainers/runc/libcontainer/apparmor"
-)
-
-// Define constants for native driver
-const (
-	defaultApparmorProfile = "docker-default"
-)
-
-func ensureDefaultAppArmorProfile() error {
-	if apparmor.IsEnabled() {
-		loaded, err := aaprofile.IsLoaded(defaultApparmorProfile)
-		if err != nil {
-			return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultApparmorProfile, err)
-		}
-
-		// Nothing to do.
-		if loaded {
-			return nil
-		}
-
-		// Load the profile.
-		if err := aaprofile.InstallDefault(defaultApparmorProfile); err != nil {
-			return fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", defaultApparmorProfile)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/apparmor_default_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/apparmor_default_unsupported.go
deleted file mode 100644
index cd2dd9702e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/apparmor_default_unsupported.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !linux
-
-package daemon
-
-func ensureDefaultAppArmorProfile() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/archive.go b/installer/vendor/github.com/docker/docker/daemon/archive.go
deleted file mode 100644
index 1999f1243b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/archive.go
+++ /dev/null
@@ -1,436 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/system"
-)
-
-// ErrExtractPointNotDirectory is used to convey that the operation to extract
-// a tar archive to a directory in a container has failed because the specified
-// path does not refer to a directory.
-var ErrExtractPointNotDirectory = errors.New("extraction point is not a directory")
-
-// ContainerCopy performs a deprecated operation of archiving the resource at
-// the specified path in the container identified by the given name.
-func (daemon *Daemon) ContainerCopy(name string, res string) (io.ReadCloser, error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if res[0] == '/' || res[0] == '\\' {
-		res = res[1:]
-	}
-
-	return daemon.containerCopy(container, res)
-}
-
-// ContainerStatPath stats the filesystem resource at the specified path in the
-// container identified by the given name.
-func (daemon *Daemon) ContainerStatPath(name string, path string) (stat *types.ContainerPathStat, err error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return daemon.containerStatPath(container, path)
-}
-
-// ContainerArchivePath creates an archive of the filesystem resource at the
-// specified path in the container identified by the given name. Returns a
-// tar archive of the resource and whether it was a directory or a single file.
-func (daemon *Daemon) ContainerArchivePath(name string, path string) (content io.ReadCloser, stat *types.ContainerPathStat, err error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return daemon.containerArchivePath(container, path)
-}
-
-// ContainerExtractToDir extracts the given archive to the specified location
-// in the filesystem of the container identified by the given name. The given
-// path must be of a directory in the container. If it is not, the error will
-// be ErrExtractPointNotDirectory. If noOverwriteDirNonDir is true then it will
-// be an error if unpacking the given content would cause an existing directory
-// to be replaced with a non-directory and vice versa.
-func (daemon *Daemon) ContainerExtractToDir(name, path string, noOverwriteDirNonDir bool, content io.Reader) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	return daemon.containerExtractToDir(container, path, noOverwriteDirNonDir, content)
-}
-
-// containerStatPath stats the filesystem resource at the specified path in this
-// container. Returns stat info about the resource.
-func (daemon *Daemon) containerStatPath(container *container.Container, path string) (stat *types.ContainerPathStat, err error) {
-	container.Lock()
-	defer container.Unlock()
-
-	if err = daemon.Mount(container); err != nil {
-		return nil, err
-	}
-	defer daemon.Unmount(container)
-
-	err = daemon.mountVolumes(container)
-	defer container.DetachAndUnmount(daemon.LogVolumeEvent)
-	if err != nil {
-		return nil, err
-	}
-
-	resolvedPath, absPath, err := container.ResolvePath(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return container.StatPath(resolvedPath, absPath)
-}
-
-// containerArchivePath creates an archive of the filesystem resource at the specified
-// path in this container. Returns a tar archive of the resource and stat info
-// about the resource.
-func (daemon *Daemon) containerArchivePath(container *container.Container, path string) (content io.ReadCloser, stat *types.ContainerPathStat, err error) {
-	container.Lock()
-
-	defer func() {
-		if err != nil {
-			// Wait to unlock the container until the archive is fully read
-			// (see the ReadCloseWrapper func below) or if there is an error
-			// before that occurs.
-			container.Unlock()
-		}
-	}()
-
-	if err = daemon.Mount(container); err != nil {
-		return nil, nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			// unmount any volumes
-			container.DetachAndUnmount(daemon.LogVolumeEvent)
-			// unmount the container's rootfs
-			daemon.Unmount(container)
-		}
-	}()
-
-	if err = daemon.mountVolumes(container); err != nil {
-		return nil, nil, err
-	}
-
-	resolvedPath, absPath, err := container.ResolvePath(path)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	stat, err = container.StatPath(resolvedPath, absPath)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	// We need to rebase the archive entries if the last element of the
-	// resolved path was a symlink that was evaluated and is now different
-	// than the requested path. For example, if the given path was "/foo/bar/",
-	// but it resolved to "/var/lib/docker/containers/{id}/foo/baz/", we want
-	// to ensure that the archive entries start with "bar" and not "baz". This
-	// also catches the case when the root directory of the container is
-	// requested: we want the archive entries to start with "/" and not the
-	// container ID.
-	data, err := archive.TarResourceRebase(resolvedPath, filepath.Base(absPath))
-	if err != nil {
-		return nil, nil, err
-	}
-
-	content = ioutils.NewReadCloserWrapper(data, func() error {
-		err := data.Close()
-		container.DetachAndUnmount(daemon.LogVolumeEvent)
-		daemon.Unmount(container)
-		container.Unlock()
-		return err
-	})
-
-	daemon.LogContainerEvent(container, "archive-path")
-
-	return content, stat, nil
-}
-
-// containerExtractToDir extracts the given tar archive to the specified location in the
-// filesystem of this container. The given path must be of a directory in the
-// container. If it is not, the error will be ErrExtractPointNotDirectory. If
-// noOverwriteDirNonDir is true then it will be an error if unpacking the
-// given content would cause an existing directory to be replaced with a non-
-// directory and vice versa.
-func (daemon *Daemon) containerExtractToDir(container *container.Container, path string, noOverwriteDirNonDir bool, content io.Reader) (err error) {
-	container.Lock()
-	defer container.Unlock()
-
-	if err = daemon.Mount(container); err != nil {
-		return err
-	}
-	defer daemon.Unmount(container)
-
-	err = daemon.mountVolumes(container)
-	defer container.DetachAndUnmount(daemon.LogVolumeEvent)
-	if err != nil {
-		return err
-	}
-
-	// Check if a drive letter supplied, it must be the system drive. No-op except on Windows
-	path, err = system.CheckSystemDriveAndRemoveDriveLetter(path)
-	if err != nil {
-		return err
-	}
-
-	// The destination path needs to be resolved to a host path, with all
-	// symbolic links followed in the scope of the container's rootfs. Note
-	// that we do not use `container.ResolvePath(path)` here because we need
-	// to also evaluate the last path element if it is a symlink. This is so
-	// that you can extract an archive to a symlink that points to a directory.
-
-	// Consider the given path as an absolute path in the container.
-	absPath := archive.PreserveTrailingDotOrSeparator(filepath.Join(string(filepath.Separator), path), path)
-
-	// This will evaluate the last path element if it is a symlink.
-	resolvedPath, err := container.GetResourcePath(absPath)
-	if err != nil {
-		return err
-	}
-
-	stat, err := os.Lstat(resolvedPath)
-	if err != nil {
-		return err
-	}
-
-	if !stat.IsDir() {
-		return ErrExtractPointNotDirectory
-	}
-
-	// Need to check if the path is in a volume. If it is, it cannot be in a
-	// read-only volume. If it is not in a volume, the container cannot be
-	// configured with a read-only rootfs.
-
-	// Use the resolved path relative to the container rootfs as the new
-	// absPath. This way we fully follow any symlinks in a volume that may
-	// lead back outside the volume.
-	//
-	// The Windows implementation of filepath.Rel in golang 1.4 does not
-	// support volume style file path semantics. On Windows when using the
-	// filter driver, we are guaranteed that the path will always be
-	// a volume file path.
-	var baseRel string
-	if strings.HasPrefix(resolvedPath, `\\?\Volume{`) {
-		if strings.HasPrefix(resolvedPath, container.BaseFS) {
-			baseRel = resolvedPath[len(container.BaseFS):]
-			if baseRel[:1] == `\` {
-				baseRel = baseRel[1:]
-			}
-		}
-	} else {
-		baseRel, err = filepath.Rel(container.BaseFS, resolvedPath)
-	}
-	if err != nil {
-		return err
-	}
-	// Make it an absolute path.
-	absPath = filepath.Join(string(filepath.Separator), baseRel)
-
-	toVolume, err := checkIfPathIsInAVolume(container, absPath)
-	if err != nil {
-		return err
-	}
-
-	if !toVolume && container.HostConfig.ReadonlyRootfs {
-		return ErrRootFSReadOnly
-	}
-
-	uid, gid := daemon.GetRemappedUIDGID()
-	options := &archive.TarOptions{
-		NoOverwriteDirNonDir: noOverwriteDirNonDir,
-		ChownOpts: &archive.TarChownOptions{
-			UID: uid, GID: gid, // TODO: should all ownership be set to root (either real or remapped)?
-		},
-	}
-	if err := chrootarchive.Untar(content, resolvedPath, options); err != nil {
-		return err
-	}
-
-	daemon.LogContainerEvent(container, "extract-to-dir")
-
-	return nil
-}
-
-func (daemon *Daemon) containerCopy(container *container.Container, resource string) (rc io.ReadCloser, err error) {
-	container.Lock()
-
-	defer func() {
-		if err != nil {
-			// Wait to unlock the container until the archive is fully read
-			// (see the ReadCloseWrapper func below) or if there is an error
-			// before that occurs.
-			container.Unlock()
-		}
-	}()
-
-	if err := daemon.Mount(container); err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			// unmount any volumes
-			container.DetachAndUnmount(daemon.LogVolumeEvent)
-			// unmount the container's rootfs
-			daemon.Unmount(container)
-		}
-	}()
-
-	if err := daemon.mountVolumes(container); err != nil {
-		return nil, err
-	}
-
-	basePath, err := container.GetResourcePath(resource)
-	if err != nil {
-		return nil, err
-	}
-	stat, err := os.Stat(basePath)
-	if err != nil {
-		return nil, err
-	}
-	var filter []string
-	if !stat.IsDir() {
-		d, f := filepath.Split(basePath)
-		basePath = d
-		filter = []string{f}
-	} else {
-		filter = []string{filepath.Base(basePath)}
-		basePath = filepath.Dir(basePath)
-	}
-	archive, err := archive.TarWithOptions(basePath, &archive.TarOptions{
-		Compression:  archive.Uncompressed,
-		IncludeFiles: filter,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	reader := ioutils.NewReadCloserWrapper(archive, func() error {
-		err := archive.Close()
-		container.DetachAndUnmount(daemon.LogVolumeEvent)
-		daemon.Unmount(container)
-		container.Unlock()
-		return err
-	})
-	daemon.LogContainerEvent(container, "copy")
-	return reader, nil
-}
-
-// CopyOnBuild copies/extracts a source FileInfo to a destination path inside a container
-// specified by a container object.
-// TODO: make sure callers don't unnecessarily convert destPath with filepath.FromSlash (Copy does it already).
-// CopyOnBuild should take in abstract paths (with slashes) and the implementation should convert it to OS-specific paths.
-func (daemon *Daemon) CopyOnBuild(cID string, destPath string, src builder.FileInfo, decompress bool) error {
-	srcPath := src.Path()
-	destExists := true
-	destDir := false
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-
-	// Work in daemon-local OS specific file paths
-	destPath = filepath.FromSlash(destPath)
-
-	c, err := daemon.GetContainer(cID)
-	if err != nil {
-		return err
-	}
-	err = daemon.Mount(c)
-	if err != nil {
-		return err
-	}
-	defer daemon.Unmount(c)
-
-	dest, err := c.GetResourcePath(destPath)
-	if err != nil {
-		return err
-	}
-
-	// Preserve the trailing slash
-	// TODO: why are we appending another path separator if there was already one?
-	if strings.HasSuffix(destPath, string(os.PathSeparator)) || destPath == "." {
-		destDir = true
-		dest += string(os.PathSeparator)
-	}
-
-	destPath = dest
-
-	destStat, err := os.Stat(destPath)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			//logrus.Errorf("Error performing os.Stat on %s. %s", destPath, err)
-			return err
-		}
-		destExists = false
-	}
-
-	uidMaps, gidMaps := daemon.GetUIDGIDMaps()
-	archiver := &archive.Archiver{
-		Untar:   chrootarchive.Untar,
-		UIDMaps: uidMaps,
-		GIDMaps: gidMaps,
-	}
-
-	if src.IsDir() {
-		// copy as directory
-		if err := archiver.CopyWithTar(srcPath, destPath); err != nil {
-			return err
-		}
-		return fixPermissions(srcPath, destPath, rootUID, rootGID, destExists)
-	}
-	if decompress && archive.IsArchivePath(srcPath) {
-		// Only try to untar if it is a file and that we've been told to decompress (when ADD-ing a remote file)
-
-		// First try to unpack the source as an archive
-		// to support the untar feature we need to clean up the path a little bit
-		// because tar is very forgiving.  First we need to strip off the archive's
-		// filename from the path but this is only added if it does not end in slash
-		tarDest := destPath
-		if strings.HasSuffix(tarDest, string(os.PathSeparator)) {
-			tarDest = filepath.Dir(destPath)
-		}
-
-		// try to successfully untar the orig
-		err := archiver.UntarPath(srcPath, tarDest)
-		/*
-			if err != nil {
-				logrus.Errorf("Couldn't untar to %s: %v", tarDest, err)
-			}
-		*/
-		return err
-	}
-
-	// only needed for fixPermissions, but might as well put it before CopyFileWithTar
-	if destDir || (destExists && destStat.IsDir()) {
-		destPath = filepath.Join(destPath, src.Name())
-	}
-
-	if err := idtools.MkdirAllNewAs(filepath.Dir(destPath), 0755, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := archiver.CopyFileWithTar(srcPath, destPath); err != nil {
-		return err
-	}
-
-	return fixPermissions(srcPath, destPath, rootUID, rootGID, destExists)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/archive_unix.go b/installer/vendor/github.com/docker/docker/daemon/archive_unix.go
deleted file mode 100644
index 47666fe5e8..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/archive_unix.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/container"
-)
-
-// checkIfPathIsInAVolume checks if the path is in a volume. If it is, it
-// cannot be in a read-only volume. If it  is not in a volume, the container
-// cannot be configured with a read-only rootfs.
-func checkIfPathIsInAVolume(container *container.Container, absPath string) (bool, error) {
-	var toVolume bool
-	for _, mnt := range container.MountPoints {
-		if toVolume = mnt.HasResource(absPath); toVolume {
-			if mnt.RW {
-				break
-			}
-			return false, ErrVolumeReadonly
-		}
-	}
-	return toVolume, nil
-}
-
-func fixPermissions(source, destination string, uid, gid int, destExisted bool) error {
-	// If the destination didn't already exist, or the destination isn't a
-	// directory, then we should Lchown the destination. Otherwise, we shouldn't
-	// Lchown the destination.
-	destStat, err := os.Stat(destination)
-	if err != nil {
-		// This should *never* be reached, because the destination must've already
-		// been created while untar-ing the context.
-		return err
-	}
-	doChownDestination := !destExisted || !destStat.IsDir()
-
-	// We Walk on the source rather than on the destination because we don't
-	// want to change permissions on things we haven't created or modified.
-	return filepath.Walk(source, func(fullpath string, info os.FileInfo, err error) error {
-		// Do not alter the walk root iff. it existed before, as it doesn't fall under
-		// the domain of "things we should chown".
-		if !doChownDestination && (source == fullpath) {
-			return nil
-		}
-
-		// Path is prefixed by source: substitute with destination instead.
-		cleaned, err := filepath.Rel(source, fullpath)
-		if err != nil {
-			return err
-		}
-
-		fullpath = filepath.Join(destination, cleaned)
-		return os.Lchown(fullpath, uid, gid)
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/archive_windows.go b/installer/vendor/github.com/docker/docker/daemon/archive_windows.go
deleted file mode 100644
index b3a1045341..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/archive_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package daemon
-
-import "github.com/docker/docker/container"
-
-// checkIfPathIsInAVolume checks if the path is in a volume. If it is, it
-// cannot be in a read-only volume. If it  is not in a volume, the container
-// cannot be configured with a read-only rootfs.
-//
-// This is a no-op on Windows which does not support read-only volumes, or
-// extracting to a mount point inside a volume. TODO Windows: FIXME Post-TP5
-func checkIfPathIsInAVolume(container *container.Container, absPath string) (bool, error) {
-	return false, nil
-}
-
-func fixPermissions(source, destination string, uid, gid int, destExisted bool) error {
-	// chown is not supported on Windows
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/attach.go b/installer/vendor/github.com/docker/docker/daemon/attach.go
deleted file mode 100644
index 917237dd89..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/attach.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/docker/pkg/term"
-)
-
-// ContainerAttach attaches to logs according to the config passed in. See ContainerAttachConfig.
-func (daemon *Daemon) ContainerAttach(prefixOrName string, c *backend.ContainerAttachConfig) error {
-	keys := []byte{}
-	var err error
-	if c.DetachKeys != "" {
-		keys, err = term.ToBytes(c.DetachKeys)
-		if err != nil {
-			return fmt.Errorf("Invalid escape keys (%s) provided", c.DetachKeys)
-		}
-	}
-
-	container, err := daemon.GetContainer(prefixOrName)
-	if err != nil {
-		return err
-	}
-	if container.IsPaused() {
-		err := fmt.Errorf("Container %s is paused. Unpause the container before attach", prefixOrName)
-		return errors.NewRequestConflictError(err)
-	}
-
-	inStream, outStream, errStream, err := c.GetStreams()
-	if err != nil {
-		return err
-	}
-	defer inStream.Close()
-
-	if !container.Config.Tty && c.MuxStreams {
-		errStream = stdcopy.NewStdWriter(errStream, stdcopy.Stderr)
-		outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
-	}
-
-	var stdin io.ReadCloser
-	var stdout, stderr io.Writer
-
-	if c.UseStdin {
-		stdin = inStream
-	}
-	if c.UseStdout {
-		stdout = outStream
-	}
-	if c.UseStderr {
-		stderr = errStream
-	}
-
-	if err := daemon.containerAttach(container, stdin, stdout, stderr, c.Logs, c.Stream, keys); err != nil {
-		fmt.Fprintf(outStream, "Error attaching: %s\n", err)
-	}
-	return nil
-}
-
-// ContainerAttachRaw attaches the provided streams to the container's stdio
-func (daemon *Daemon) ContainerAttachRaw(prefixOrName string, stdin io.ReadCloser, stdout, stderr io.Writer, stream bool) error {
-	container, err := daemon.GetContainer(prefixOrName)
-	if err != nil {
-		return err
-	}
-	return daemon.containerAttach(container, stdin, stdout, stderr, false, stream, nil)
-}
-
-func (daemon *Daemon) containerAttach(c *container.Container, stdin io.ReadCloser, stdout, stderr io.Writer, logs, stream bool, keys []byte) error {
-	if logs {
-		logDriver, err := daemon.getLogger(c)
-		if err != nil {
-			return err
-		}
-		cLog, ok := logDriver.(logger.LogReader)
-		if !ok {
-			return logger.ErrReadLogsNotSupported
-		}
-		logs := cLog.ReadLogs(logger.ReadConfig{Tail: -1})
-
-	LogLoop:
-		for {
-			select {
-			case msg, ok := <-logs.Msg:
-				if !ok {
-					break LogLoop
-				}
-				if msg.Source == "stdout" && stdout != nil {
-					stdout.Write(msg.Line)
-				}
-				if msg.Source == "stderr" && stderr != nil {
-					stderr.Write(msg.Line)
-				}
-			case err := <-logs.Err:
-				logrus.Errorf("Error streaming logs: %v", err)
-				break LogLoop
-			}
-		}
-	}
-
-	daemon.LogContainerEvent(c, "attach")
-
-	//stream
-	if stream {
-		var stdinPipe io.ReadCloser
-		if stdin != nil {
-			r, w := io.Pipe()
-			go func() {
-				defer w.Close()
-				defer logrus.Debug("Closing buffered stdin pipe")
-				io.Copy(w, stdin)
-			}()
-			stdinPipe = r
-		}
-
-		waitChan := make(chan struct{})
-		if c.Config.StdinOnce && !c.Config.Tty {
-			go func() {
-				c.WaitStop(-1 * time.Second)
-				close(waitChan)
-			}()
-		}
-
-		err := <-c.Attach(stdinPipe, stdout, stderr, keys)
-		if err != nil {
-			if _, ok := err.(container.DetachError); ok {
-				daemon.LogContainerEvent(c, "detach")
-			} else {
-				logrus.Errorf("attach failed with error: %v", err)
-			}
-		}
-
-		// If we are in stdinonce mode, wait for the process to end
-		// otherwise, simply return
-		if c.Config.StdinOnce && !c.Config.Tty {
-			<-waitChan
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/auth.go b/installer/vendor/github.com/docker/docker/daemon/auth.go
deleted file mode 100644
index f5f4d7bf24..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/auth.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package daemon
-
-import (
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/dockerversion"
-)
-
-// AuthenticateToRegistry checks the validity of credentials in authConfig
-func (daemon *Daemon) AuthenticateToRegistry(ctx context.Context, authConfig *types.AuthConfig) (string, string, error) {
-	return daemon.RegistryService.Auth(ctx, authConfig, dockerversion.DockerUserAgent(ctx))
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/bindmount_solaris.go b/installer/vendor/github.com/docker/docker/daemon/bindmount_solaris.go
deleted file mode 100644
index 87bf3ef72e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/bindmount_solaris.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build solaris
-
-package daemon
-
-const bindMountType = "lofs"
diff --git a/installer/vendor/github.com/docker/docker/daemon/bindmount_unix.go b/installer/vendor/github.com/docker/docker/daemon/bindmount_unix.go
deleted file mode 100644
index 3966babb41..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/bindmount_unix.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build linux freebsd
-
-package daemon
-
-const bindMountType = "bind"
diff --git a/installer/vendor/github.com/docker/docker/daemon/cache.go b/installer/vendor/github.com/docker/docker/daemon/cache.go
deleted file mode 100644
index a2c2c137f5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cache.go
+++ /dev/null
@@ -1,254 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/runconfig"
-	"github.com/pkg/errors"
-)
-
-// getLocalCachedImage returns the most recent created image that is a child
-// of the image with imgID, that had the same config when it was
-// created. nil is returned if a child cannot be found. An error is
-// returned if the parent image cannot be found.
-func (daemon *Daemon) getLocalCachedImage(imgID image.ID, config *containertypes.Config) (*image.Image, error) {
-	// Loop on the children of the given image and check the config
-	getMatch := func(siblings []image.ID) (*image.Image, error) {
-		var match *image.Image
-		for _, id := range siblings {
-			img, err := daemon.imageStore.Get(id)
-			if err != nil {
-				return nil, fmt.Errorf("unable to find image %q", id)
-			}
-
-			if runconfig.Compare(&img.ContainerConfig, config) {
-				// check for the most up to date match
-				if match == nil || match.Created.Before(img.Created) {
-					match = img
-				}
-			}
-		}
-		return match, nil
-	}
-
-	// In this case, this is `FROM scratch`, which isn't an actual image.
-	if imgID == "" {
-		images := daemon.imageStore.Map()
-		var siblings []image.ID
-		for id, img := range images {
-			if img.Parent == imgID {
-				siblings = append(siblings, id)
-			}
-		}
-		return getMatch(siblings)
-	}
-
-	// find match from child images
-	siblings := daemon.imageStore.Children(imgID)
-	return getMatch(siblings)
-}
-
-// MakeImageCache creates a stateful image cache.
-func (daemon *Daemon) MakeImageCache(sourceRefs []string) builder.ImageCache {
-	if len(sourceRefs) == 0 {
-		return &localImageCache{daemon}
-	}
-
-	cache := &imageCache{daemon: daemon, localImageCache: &localImageCache{daemon}}
-
-	for _, ref := range sourceRefs {
-		img, err := daemon.GetImage(ref)
-		if err != nil {
-			logrus.Warnf("Could not look up %s for cache resolution, skipping: %+v", ref, err)
-			continue
-		}
-		cache.sources = append(cache.sources, img)
-	}
-
-	return cache
-}
-
-// localImageCache is cache based on parent chain.
-type localImageCache struct {
-	daemon *Daemon
-}
-
-func (lic *localImageCache) GetCache(imgID string, config *containertypes.Config) (string, error) {
-	return getImageIDAndError(lic.daemon.getLocalCachedImage(image.ID(imgID), config))
-}
-
-// imageCache is cache based on history objects. Requires initial set of images.
-type imageCache struct {
-	sources         []*image.Image
-	daemon          *Daemon
-	localImageCache *localImageCache
-}
-
-func (ic *imageCache) restoreCachedImage(parent, target *image.Image, cfg *containertypes.Config) (image.ID, error) {
-	var history []image.History
-	rootFS := image.NewRootFS()
-	lenHistory := 0
-	if parent != nil {
-		history = parent.History
-		rootFS = parent.RootFS
-		lenHistory = len(parent.History)
-	}
-	history = append(history, target.History[lenHistory])
-	if layer := getLayerForHistoryIndex(target, lenHistory); layer != "" {
-		rootFS.Append(layer)
-	}
-
-	config, err := json.Marshal(&image.Image{
-		V1Image: image.V1Image{
-			DockerVersion: dockerversion.Version,
-			Config:        cfg,
-			Architecture:  target.Architecture,
-			OS:            target.OS,
-			Author:        target.Author,
-			Created:       history[len(history)-1].Created,
-		},
-		RootFS:     rootFS,
-		History:    history,
-		OSFeatures: target.OSFeatures,
-		OSVersion:  target.OSVersion,
-	})
-	if err != nil {
-		return "", errors.Wrap(err, "failed to marshal image config")
-	}
-
-	imgID, err := ic.daemon.imageStore.Create(config)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to create cache image")
-	}
-
-	if parent != nil {
-		if err := ic.daemon.imageStore.SetParent(imgID, parent.ID()); err != nil {
-			return "", errors.Wrapf(err, "failed to set parent for %v to %v", target.ID(), parent.ID())
-		}
-	}
-	return imgID, nil
-}
-
-func (ic *imageCache) isParent(imgID, parentID image.ID) bool {
-	nextParent, err := ic.daemon.imageStore.GetParent(imgID)
-	if err != nil {
-		return false
-	}
-	if nextParent == parentID {
-		return true
-	}
-	return ic.isParent(nextParent, parentID)
-}
-
-func (ic *imageCache) GetCache(parentID string, cfg *containertypes.Config) (string, error) {
-	imgID, err := ic.localImageCache.GetCache(parentID, cfg)
-	if err != nil {
-		return "", err
-	}
-	if imgID != "" {
-		for _, s := range ic.sources {
-			if ic.isParent(s.ID(), image.ID(imgID)) {
-				return imgID, nil
-			}
-		}
-	}
-
-	var parent *image.Image
-	lenHistory := 0
-	if parentID != "" {
-		parent, err = ic.daemon.imageStore.Get(image.ID(parentID))
-		if err != nil {
-			return "", errors.Wrapf(err, "unable to find image %v", parentID)
-		}
-		lenHistory = len(parent.History)
-	}
-
-	for _, target := range ic.sources {
-		if !isValidParent(target, parent) || !isValidConfig(cfg, target.History[lenHistory]) {
-			continue
-		}
-
-		if len(target.History)-1 == lenHistory { // last
-			if parent != nil {
-				if err := ic.daemon.imageStore.SetParent(target.ID(), parent.ID()); err != nil {
-					return "", errors.Wrapf(err, "failed to set parent for %v to %v", target.ID(), parent.ID())
-				}
-			}
-			return target.ID().String(), nil
-		}
-
-		imgID, err := ic.restoreCachedImage(parent, target, cfg)
-		if err != nil {
-			return "", errors.Wrapf(err, "failed to restore cached image from %q to %v", parentID, target.ID())
-		}
-
-		ic.sources = []*image.Image{target} // avoid jumping to different target, tuned for safety atm
-		return imgID.String(), nil
-	}
-
-	return "", nil
-}
-
-func getImageIDAndError(img *image.Image, err error) (string, error) {
-	if img == nil || err != nil {
-		return "", err
-	}
-	return img.ID().String(), nil
-}
-
-func isValidParent(img, parent *image.Image) bool {
-	if len(img.History) == 0 {
-		return false
-	}
-	if parent == nil || len(parent.History) == 0 && len(parent.RootFS.DiffIDs) == 0 {
-		return true
-	}
-	if len(parent.History) >= len(img.History) {
-		return false
-	}
-	if len(parent.RootFS.DiffIDs) >= len(img.RootFS.DiffIDs) {
-		return false
-	}
-
-	for i, h := range parent.History {
-		if !reflect.DeepEqual(h, img.History[i]) {
-			return false
-		}
-	}
-	for i, d := range parent.RootFS.DiffIDs {
-		if d != img.RootFS.DiffIDs[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func getLayerForHistoryIndex(image *image.Image, index int) layer.DiffID {
-	layerIndex := 0
-	for i, h := range image.History {
-		if i == index {
-			if h.EmptyLayer {
-				return ""
-			}
-			break
-		}
-		if !h.EmptyLayer {
-			layerIndex++
-		}
-	}
-	return image.RootFS.DiffIDs[layerIndex] // validate?
-}
-
-func isValidConfig(cfg *containertypes.Config, h image.History) bool {
-	// todo: make this format better than join that loses data
-	return strings.Join(cfg.Cmd, " ") == h.CreatedBy
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/caps/utils_unix.go b/installer/vendor/github.com/docker/docker/daemon/caps/utils_unix.go
deleted file mode 100644
index c99485f51d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/caps/utils_unix.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// +build !windows
-
-package caps
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/syndtr/gocapability/capability"
-)
-
-var capabilityList Capabilities
-
-func init() {
-	last := capability.CAP_LAST_CAP
-	// hack for RHEL6 which has no /proc/sys/kernel/cap_last_cap
-	if last == capability.Cap(63) {
-		last = capability.CAP_BLOCK_SUSPEND
-	}
-	for _, cap := range capability.List() {
-		if cap > last {
-			continue
-		}
-		capabilityList = append(capabilityList,
-			&CapabilityMapping{
-				Key:   "CAP_" + strings.ToUpper(cap.String()),
-				Value: cap,
-			},
-		)
-	}
-}
-
-type (
-	// CapabilityMapping maps linux capability name to its value of capability.Cap type
-	// Capabilities is one of the security systems in Linux Security Module (LSM)
-	// framework provided by the kernel.
-	// For more details on capabilities, see http://man7.org/linux/man-pages/man7/capabilities.7.html
-	CapabilityMapping struct {
-		Key   string         `json:"key,omitempty"`
-		Value capability.Cap `json:"value,omitempty"`
-	}
-	// Capabilities contains all CapabilityMapping
-	Capabilities []*CapabilityMapping
-)
-
-// String returns <key> of CapabilityMapping
-func (c *CapabilityMapping) String() string {
-	return c.Key
-}
-
-// GetCapability returns CapabilityMapping which contains specific key
-func GetCapability(key string) *CapabilityMapping {
-	for _, capp := range capabilityList {
-		if capp.Key == key {
-			cpy := *capp
-			return &cpy
-		}
-	}
-	return nil
-}
-
-// GetAllCapabilities returns all of the capabilities
-func GetAllCapabilities() []string {
-	output := make([]string, len(capabilityList))
-	for i, capability := range capabilityList {
-		output[i] = capability.String()
-	}
-	return output
-}
-
-// TweakCapabilities can tweak capabilities by adding or dropping capabilities
-// based on the basics capabilities.
-func TweakCapabilities(basics, adds, drops []string) ([]string, error) {
-	var (
-		newCaps []string
-		allCaps = GetAllCapabilities()
-	)
-
-	// FIXME(tonistiigi): docker format is without CAP_ prefix, oci is with prefix
-	// Currently they are mixed in here. We should do conversion in one place.
-
-	// look for invalid cap in the drop list
-	for _, cap := range drops {
-		if strings.ToLower(cap) == "all" {
-			continue
-		}
-
-		if !stringutils.InSlice(allCaps, "CAP_"+cap) {
-			return nil, fmt.Errorf("Unknown capability drop: %q", cap)
-		}
-	}
-
-	// handle --cap-add=all
-	if stringutils.InSlice(adds, "all") {
-		basics = allCaps
-	}
-
-	if !stringutils.InSlice(drops, "all") {
-		for _, cap := range basics {
-			// skip `all` already handled above
-			if strings.ToLower(cap) == "all" {
-				continue
-			}
-
-			// if we don't drop `all`, add back all the non-dropped caps
-			if !stringutils.InSlice(drops, cap[4:]) {
-				newCaps = append(newCaps, strings.ToUpper(cap))
-			}
-		}
-	}
-
-	for _, cap := range adds {
-		// skip `all` already handled above
-		if strings.ToLower(cap) == "all" {
-			continue
-		}
-
-		cap = "CAP_" + cap
-
-		if !stringutils.InSlice(allCaps, cap) {
-			return nil, fmt.Errorf("Unknown capability to add: %q", cap)
-		}
-
-		// add cap if not already in the list
-		if !stringutils.InSlice(newCaps, cap) {
-			newCaps = append(newCaps, strings.ToUpper(cap))
-		}
-	}
-	return newCaps, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/changes.go b/installer/vendor/github.com/docker/docker/daemon/changes.go
deleted file mode 100644
index fc8cd2752c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/changes.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"runtime"
-	"time"
-
-	"github.com/docker/docker/pkg/archive"
-)
-
-// ContainerChanges returns a list of container fs changes
-func (daemon *Daemon) ContainerChanges(name string) ([]archive.Change, error) {
-	start := time.Now()
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if runtime.GOOS == "windows" && container.IsRunning() {
-		return nil, errors.New("Windows does not support diff of a running container")
-	}
-
-	container.Lock()
-	defer container.Unlock()
-	c, err := container.RWLayer.Changes()
-	if err != nil {
-		return nil, err
-	}
-	containerActions.WithValues("changes").UpdateSince(start)
-	return c, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/checkpoint.go b/installer/vendor/github.com/docker/docker/daemon/checkpoint.go
deleted file mode 100644
index 27181743f5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/checkpoint.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/utils"
-)
-
-var (
-	validCheckpointNameChars   = utils.RestrictedNameChars
-	validCheckpointNamePattern = utils.RestrictedNamePattern
-)
-
-// CheckpointCreate checkpoints the process running in a container with CRIU
-func (daemon *Daemon) CheckpointCreate(name string, config types.CheckpointCreateOptions) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if !container.IsRunning() {
-		return fmt.Errorf("Container %s not running", name)
-	}
-
-	var checkpointDir string
-	if config.CheckpointDir != "" {
-		checkpointDir = config.CheckpointDir
-	} else {
-		checkpointDir = container.CheckpointDir()
-	}
-
-	if !validCheckpointNamePattern.MatchString(config.CheckpointID) {
-		return fmt.Errorf("Invalid checkpoint ID (%s), only %s are allowed", config.CheckpointID, validCheckpointNameChars)
-	}
-
-	err = daemon.containerd.CreateCheckpoint(container.ID, config.CheckpointID, checkpointDir, config.Exit)
-	if err != nil {
-		return fmt.Errorf("Cannot checkpoint container %s: %s", name, err)
-	}
-
-	daemon.LogContainerEvent(container, "checkpoint")
-
-	return nil
-}
-
-// CheckpointDelete deletes the specified checkpoint
-func (daemon *Daemon) CheckpointDelete(name string, config types.CheckpointDeleteOptions) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	var checkpointDir string
-	if config.CheckpointDir != "" {
-		checkpointDir = config.CheckpointDir
-	} else {
-		checkpointDir = container.CheckpointDir()
-	}
-
-	return os.RemoveAll(filepath.Join(checkpointDir, config.CheckpointID))
-}
-
-// CheckpointList lists all checkpoints of the specified container
-func (daemon *Daemon) CheckpointList(name string, config types.CheckpointListOptions) ([]types.Checkpoint, error) {
-	var out []types.Checkpoint
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	var checkpointDir string
-	if config.CheckpointDir != "" {
-		checkpointDir = config.CheckpointDir
-	} else {
-		checkpointDir = container.CheckpointDir()
-	}
-
-	if err := os.MkdirAll(checkpointDir, 0755); err != nil {
-		return nil, err
-	}
-
-	dirs, err := ioutil.ReadDir(checkpointDir)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, d := range dirs {
-		if !d.IsDir() {
-			continue
-		}
-		path := filepath.Join(checkpointDir, d.Name(), "config.json")
-		data, err := ioutil.ReadFile(path)
-		if err != nil {
-			return nil, err
-		}
-		var cpt types.Checkpoint
-		if err := json.Unmarshal(data, &cpt); err != nil {
-			return nil, err
-		}
-		out = append(out, cpt)
-	}
-
-	return out, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster.go b/installer/vendor/github.com/docker/docker/daemon/cluster.go
deleted file mode 100644
index 98b2aa1e04..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package daemon
-
-import (
-	apitypes "github.com/docker/docker/api/types"
-)
-
-// Cluster is the interface for github.com/docker/docker/daemon/cluster.(*Cluster).
-type Cluster interface {
-	GetNetwork(input string) (apitypes.NetworkResource, error)
-	GetNetworks() ([]apitypes.NetworkResource, error)
-	RemoveNetwork(input string) error
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/cluster.go b/installer/vendor/github.com/docker/docker/daemon/cluster/cluster.go
deleted file mode 100644
index 4af035b523..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/cluster.go
+++ /dev/null
@@ -1,1973 +0,0 @@
-package cluster
-
-import (
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	distreference "github.com/docker/distribution/reference"
-	apierrors "github.com/docker/docker/api/errors"
-	apitypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	types "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/daemon/cluster/convert"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/docker/daemon/cluster/executor/container"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/runconfig"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/manager/encryption"
-	swarmnode "github.com/docker/swarmkit/node"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-)
-
-const swarmDirName = "swarm"
-const controlSocket = "control.sock"
-const swarmConnectTimeout = 20 * time.Second
-const swarmRequestTimeout = 20 * time.Second
-const stateFile = "docker-state.json"
-const defaultAddr = "0.0.0.0:2377"
-
-const (
-	initialReconnectDelay = 100 * time.Millisecond
-	maxReconnectDelay     = 30 * time.Second
-	contextPrefix         = "com.docker.swarm"
-)
-
-// ErrNoSwarm is returned on leaving a cluster that was never initialized
-var ErrNoSwarm = fmt.Errorf("This node is not part of a swarm")
-
-// ErrSwarmExists is returned on initialize or join request for a cluster that has already been activated
-var ErrSwarmExists = fmt.Errorf("This node is already part of a swarm. Use \"docker swarm leave\" to leave this swarm and join another one.")
-
-// ErrPendingSwarmExists is returned on initialize or join request for a cluster that is already processing a similar request but has not succeeded yet.
-var ErrPendingSwarmExists = fmt.Errorf("This node is processing an existing join request that has not succeeded yet. Use \"docker swarm leave\" to cancel the current request.")
-
-// ErrSwarmJoinTimeoutReached is returned when cluster join could not complete before timeout was reached.
-var ErrSwarmJoinTimeoutReached = fmt.Errorf("Timeout was reached before node was joined. The attempt to join the swarm will continue in the background. Use the \"docker info\" command to see the current swarm status of your node.")
-
-// ErrSwarmLocked is returned if the swarm is encrypted and needs a key to unlock it.
-var ErrSwarmLocked = fmt.Errorf("Swarm is encrypted and needs to be unlocked before it can be used. Please use \"docker swarm unlock\" to unlock it.")
-
-// ErrSwarmCertificatesExpired is returned if docker was not started for the whole validity period and they had no chance to renew automatically.
-var ErrSwarmCertificatesExpired = errors.New("Swarm certificates have expired. To replace them, leave the swarm and join again.")
-
-// NetworkSubnetsProvider exposes functions for retrieving the subnets
-// of networks managed by Docker, so they can be filtered.
-type NetworkSubnetsProvider interface {
-	V4Subnets() []net.IPNet
-	V6Subnets() []net.IPNet
-}
-
-// Config provides values for Cluster.
-type Config struct {
-	Root                   string
-	Name                   string
-	Backend                executorpkg.Backend
-	NetworkSubnetsProvider NetworkSubnetsProvider
-
-	// DefaultAdvertiseAddr is the default host/IP or network interface to use
-	// if no AdvertiseAddr value is specified.
-	DefaultAdvertiseAddr string
-
-	// path to store runtime state, such as the swarm control socket
-	RuntimeRoot string
-}
-
-// Cluster provides capabilities to participate in a cluster as a worker or a
-// manager.
-type Cluster struct {
-	sync.RWMutex
-	*node
-	root            string
-	runtimeRoot     string
-	config          Config
-	configEvent     chan struct{} // todo: make this array and goroutine safe
-	actualLocalAddr string        // after resolution, not persisted
-	stop            bool
-	err             error
-	cancelDelay     func()
-	attachers       map[string]*attacher
-	locked          bool
-	lastNodeConfig  *nodeStartConfig
-}
-
-// attacher manages the in-memory attachment state of a container
-// attachment to a global scope network managed by swarm manager. It
-// helps in identifying the attachment ID via the taskID and the
-// corresponding attachment configuration obtained from the manager.
-type attacher struct {
-	taskID           string
-	config           *network.NetworkingConfig
-	attachWaitCh     chan *network.NetworkingConfig
-	attachCompleteCh chan struct{}
-	detachWaitCh     chan struct{}
-}
-
-type node struct {
-	*swarmnode.Node
-	done           chan struct{}
-	ready          bool
-	conn           *grpc.ClientConn
-	client         swarmapi.ControlClient
-	logs           swarmapi.LogsClient
-	reconnectDelay time.Duration
-	config         nodeStartConfig
-}
-
-// nodeStartConfig holds configuration needed to start a new node. Exported
-// fields of this structure are saved to disk in json. Unexported fields
-// contain data that shouldn't be persisted between daemon reloads.
-type nodeStartConfig struct {
-	// LocalAddr is this machine's local IP or hostname, if specified.
-	LocalAddr string
-	// RemoteAddr is the address that was given to "swarm join". It is used
-	// to find LocalAddr if necessary.
-	RemoteAddr string
-	// ListenAddr is the address we bind to, including a port.
-	ListenAddr string
-	// AdvertiseAddr is the address other nodes should connect to,
-	// including a port.
-	AdvertiseAddr   string
-	joinAddr        string
-	forceNewCluster bool
-	joinToken       string
-	lockKey         []byte
-	autolock        bool
-}
-
-// New creates a new Cluster instance using provided config.
-func New(config Config) (*Cluster, error) {
-	root := filepath.Join(config.Root, swarmDirName)
-	if err := os.MkdirAll(root, 0700); err != nil {
-		return nil, err
-	}
-	if config.RuntimeRoot == "" {
-		config.RuntimeRoot = root
-	}
-	if err := os.MkdirAll(config.RuntimeRoot, 0700); err != nil {
-		return nil, err
-	}
-	c := &Cluster{
-		root:        root,
-		config:      config,
-		configEvent: make(chan struct{}, 10),
-		runtimeRoot: config.RuntimeRoot,
-		attachers:   make(map[string]*attacher),
-	}
-
-	nodeConfig, err := c.loadState()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return c, nil
-		}
-		return nil, err
-	}
-
-	n, err := c.startNewNode(*nodeConfig)
-	if err != nil {
-		return nil, err
-	}
-
-	select {
-	case <-time.After(swarmConnectTimeout):
-		logrus.Error("swarm component could not be started before timeout was reached")
-	case <-n.Ready():
-	case <-n.done:
-		if errors.Cause(c.err) == ErrSwarmLocked {
-			return c, nil
-		}
-		if err, ok := errors.Cause(c.err).(x509.CertificateInvalidError); ok && err.Reason == x509.Expired {
-			c.err = ErrSwarmCertificatesExpired
-			return c, nil
-		}
-		return nil, fmt.Errorf("swarm component could not be started: %v", c.err)
-	}
-	go c.reconnectOnFailure(n)
-	return c, nil
-}
-
-func (c *Cluster) loadState() (*nodeStartConfig, error) {
-	dt, err := ioutil.ReadFile(filepath.Join(c.root, stateFile))
-	if err != nil {
-		return nil, err
-	}
-	// missing certificate means no actual state to restore from
-	if _, err := os.Stat(filepath.Join(c.root, "certificates/swarm-node.crt")); err != nil {
-		if os.IsNotExist(err) {
-			c.clearState()
-		}
-		return nil, err
-	}
-	var st nodeStartConfig
-	if err := json.Unmarshal(dt, &st); err != nil {
-		return nil, err
-	}
-	return &st, nil
-}
-
-func (c *Cluster) saveState(config nodeStartConfig) error {
-	dt, err := json.Marshal(config)
-	if err != nil {
-		return err
-	}
-	return ioutils.AtomicWriteFile(filepath.Join(c.root, stateFile), dt, 0600)
-}
-
-func (c *Cluster) reconnectOnFailure(n *node) {
-	for {
-		<-n.done
-		c.Lock()
-		if c.stop || c.node != nil {
-			c.Unlock()
-			return
-		}
-		n.reconnectDelay *= 2
-		if n.reconnectDelay > maxReconnectDelay {
-			n.reconnectDelay = maxReconnectDelay
-		}
-		logrus.Warnf("Restarting swarm in %.2f seconds", n.reconnectDelay.Seconds())
-		delayCtx, cancel := context.WithTimeout(context.Background(), n.reconnectDelay)
-		c.cancelDelay = cancel
-		c.Unlock()
-		<-delayCtx.Done()
-		if delayCtx.Err() != context.DeadlineExceeded {
-			return
-		}
-		c.Lock()
-		if c.node != nil {
-			c.Unlock()
-			return
-		}
-		var err error
-		config := n.config
-		config.RemoteAddr = c.getRemoteAddress()
-		config.joinAddr = config.RemoteAddr
-		n, err = c.startNewNode(config)
-		if err != nil {
-			c.err = err
-			close(n.done)
-		}
-		c.Unlock()
-	}
-}
-
-func (c *Cluster) startNewNode(conf nodeStartConfig) (*node, error) {
-	if err := c.config.Backend.IsSwarmCompatible(); err != nil {
-		return nil, err
-	}
-
-	actualLocalAddr := conf.LocalAddr
-	if actualLocalAddr == "" {
-		// If localAddr was not specified, resolve it automatically
-		// based on the route to joinAddr. localAddr can only be left
-		// empty on "join".
-		listenHost, _, err := net.SplitHostPort(conf.ListenAddr)
-		if err != nil {
-			return nil, fmt.Errorf("could not parse listen address: %v", err)
-		}
-
-		listenAddrIP := net.ParseIP(listenHost)
-		if listenAddrIP == nil || !listenAddrIP.IsUnspecified() {
-			actualLocalAddr = listenHost
-		} else {
-			if conf.RemoteAddr == "" {
-				// Should never happen except using swarms created by
-				// old versions that didn't save remoteAddr.
-				conf.RemoteAddr = "8.8.8.8:53"
-			}
-			conn, err := net.Dial("udp", conf.RemoteAddr)
-			if err != nil {
-				return nil, fmt.Errorf("could not find local IP address: %v", err)
-			}
-			localHostPort := conn.LocalAddr().String()
-			actualLocalAddr, _, _ = net.SplitHostPort(localHostPort)
-			conn.Close()
-		}
-	}
-
-	var control string
-	if runtime.GOOS == "windows" {
-		control = `\\.\pipe\` + controlSocket
-	} else {
-		control = filepath.Join(c.runtimeRoot, controlSocket)
-	}
-
-	c.node = nil
-	c.cancelDelay = nil
-	c.stop = false
-	n, err := swarmnode.New(&swarmnode.Config{
-		Hostname:           c.config.Name,
-		ForceNewCluster:    conf.forceNewCluster,
-		ListenControlAPI:   control,
-		ListenRemoteAPI:    conf.ListenAddr,
-		AdvertiseRemoteAPI: conf.AdvertiseAddr,
-		JoinAddr:           conf.joinAddr,
-		StateDir:           c.root,
-		JoinToken:          conf.joinToken,
-		Executor:           container.NewExecutor(c.config.Backend),
-		HeartbeatTick:      1,
-		ElectionTick:       3,
-		UnlockKey:          conf.lockKey,
-		AutoLockManagers:   conf.autolock,
-		PluginGetter:       c.config.Backend.PluginGetter(),
-	})
-
-	if err != nil {
-		return nil, err
-	}
-	ctx := context.Background()
-	if err := n.Start(ctx); err != nil {
-		return nil, err
-	}
-	node := &node{
-		Node:           n,
-		done:           make(chan struct{}),
-		reconnectDelay: initialReconnectDelay,
-		config:         conf,
-	}
-	c.node = node
-	c.actualLocalAddr = actualLocalAddr // not saved
-	c.saveState(conf)
-
-	c.config.Backend.DaemonJoinsCluster(c)
-	go func() {
-		err := detectLockedError(n.Err(ctx))
-		if err != nil {
-			logrus.Errorf("cluster exited with error: %v", err)
-		}
-		c.Lock()
-		c.node = nil
-		c.err = err
-		if errors.Cause(err) == ErrSwarmLocked {
-			c.locked = true
-			confClone := conf
-			c.lastNodeConfig = &confClone
-		}
-		c.Unlock()
-		close(node.done)
-	}()
-
-	go func() {
-		select {
-		case <-n.Ready():
-			c.Lock()
-			node.ready = true
-			c.err = nil
-			c.Unlock()
-		case <-ctx.Done():
-		}
-		c.configEvent <- struct{}{}
-	}()
-
-	go func() {
-		for conn := range n.ListenControlSocket(ctx) {
-			c.Lock()
-			if node.conn != conn {
-				if conn == nil {
-					node.client = nil
-					node.logs = nil
-				} else {
-					node.client = swarmapi.NewControlClient(conn)
-					node.logs = swarmapi.NewLogsClient(conn)
-				}
-			}
-			node.conn = conn
-			c.Unlock()
-			c.configEvent <- struct{}{}
-		}
-	}()
-
-	return node, nil
-}
-
-// Init initializes new cluster from user provided request.
-func (c *Cluster) Init(req types.InitRequest) (string, error) {
-	c.Lock()
-	if c.swarmExists() {
-		if !req.ForceNewCluster {
-			c.Unlock()
-			return "", ErrSwarmExists
-		}
-		if err := c.stopNode(); err != nil {
-			c.Unlock()
-			return "", err
-		}
-	}
-
-	if err := validateAndSanitizeInitRequest(&req); err != nil {
-		c.Unlock()
-		return "", err
-	}
-
-	listenHost, listenPort, err := resolveListenAddr(req.ListenAddr)
-	if err != nil {
-		c.Unlock()
-		return "", err
-	}
-
-	advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
-	if err != nil {
-		c.Unlock()
-		return "", err
-	}
-
-	localAddr := listenHost
-
-	// If the local address is undetermined, the advertise address
-	// will be used as local address, if it belongs to this system.
-	// If the advertise address is not local, then we try to find
-	// a system address to use as local address. If this fails,
-	// we give up and ask user to pass the listen address.
-	if net.ParseIP(localAddr).IsUnspecified() {
-		advertiseIP := net.ParseIP(advertiseHost)
-
-		found := false
-		for _, systemIP := range listSystemIPs() {
-			if systemIP.Equal(advertiseIP) {
-				localAddr = advertiseIP.String()
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			ip, err := c.resolveSystemAddr()
-			if err != nil {
-				c.Unlock()
-				logrus.Warnf("Could not find a local address: %v", err)
-				return "", errMustSpecifyListenAddr
-			}
-			localAddr = ip.String()
-		}
-	}
-
-	// todo: check current state existing
-	n, err := c.startNewNode(nodeStartConfig{
-		forceNewCluster: req.ForceNewCluster,
-		autolock:        req.AutoLockManagers,
-		LocalAddr:       localAddr,
-		ListenAddr:      net.JoinHostPort(listenHost, listenPort),
-		AdvertiseAddr:   net.JoinHostPort(advertiseHost, advertisePort),
-	})
-	if err != nil {
-		c.Unlock()
-		return "", err
-	}
-	c.Unlock()
-
-	select {
-	case <-n.Ready():
-		if err := initClusterSpec(n, req.Spec); err != nil {
-			return "", err
-		}
-		go c.reconnectOnFailure(n)
-		return n.NodeID(), nil
-	case <-n.done:
-		c.RLock()
-		defer c.RUnlock()
-		if !req.ForceNewCluster { // if failure on first attempt don't keep state
-			if err := c.clearState(); err != nil {
-				return "", err
-			}
-		}
-		return "", c.err
-	}
-}
-
-// Join makes current Cluster part of an existing swarm cluster.
-func (c *Cluster) Join(req types.JoinRequest) error {
-	c.Lock()
-	if c.swarmExists() {
-		c.Unlock()
-		return ErrSwarmExists
-	}
-	if err := validateAndSanitizeJoinRequest(&req); err != nil {
-		c.Unlock()
-		return err
-	}
-
-	listenHost, listenPort, err := resolveListenAddr(req.ListenAddr)
-	if err != nil {
-		c.Unlock()
-		return err
-	}
-
-	var advertiseAddr string
-	if req.AdvertiseAddr != "" {
-		advertiseHost, advertisePort, err := c.resolveAdvertiseAddr(req.AdvertiseAddr, listenPort)
-		// For joining, we don't need to provide an advertise address,
-		// since the remote side can detect it.
-		if err == nil {
-			advertiseAddr = net.JoinHostPort(advertiseHost, advertisePort)
-		}
-	}
-
-	// todo: check current state existing
-	n, err := c.startNewNode(nodeStartConfig{
-		RemoteAddr:    req.RemoteAddrs[0],
-		ListenAddr:    net.JoinHostPort(listenHost, listenPort),
-		AdvertiseAddr: advertiseAddr,
-		joinAddr:      req.RemoteAddrs[0],
-		joinToken:     req.JoinToken,
-	})
-	if err != nil {
-		c.Unlock()
-		return err
-	}
-	c.Unlock()
-
-	select {
-	case <-time.After(swarmConnectTimeout):
-		// attempt to connect will continue in background, but reconnect only if it didn't fail
-		go func() {
-			select {
-			case <-n.Ready():
-				c.reconnectOnFailure(n)
-			case <-n.done:
-				logrus.Errorf("failed to join the cluster: %+v", c.err)
-			}
-		}()
-		return ErrSwarmJoinTimeoutReached
-	case <-n.Ready():
-		go c.reconnectOnFailure(n)
-		return nil
-	case <-n.done:
-		c.RLock()
-		defer c.RUnlock()
-		return c.err
-	}
-}
-
-// GetUnlockKey returns the unlock key for the swarm.
-func (c *Cluster) GetUnlockKey() (string, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return "", c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	client := swarmapi.NewCAClient(c.conn)
-
-	r, err := client.GetUnlockKey(ctx, &swarmapi.GetUnlockKeyRequest{})
-	if err != nil {
-		return "", err
-	}
-
-	if len(r.UnlockKey) == 0 {
-		// no key
-		return "", nil
-	}
-
-	return encryption.HumanReadableKey(r.UnlockKey), nil
-}
-
-// UnlockSwarm provides a key to decrypt data that is encrypted at rest.
-func (c *Cluster) UnlockSwarm(req types.UnlockRequest) error {
-	c.RLock()
-	if !c.isActiveManager() {
-		if err := c.errNoManager(); err != ErrSwarmLocked {
-			c.RUnlock()
-			return err
-		}
-	}
-
-	if c.node != nil || c.locked != true {
-		c.RUnlock()
-		return errors.New("swarm is not locked")
-	}
-	c.RUnlock()
-
-	key, err := encryption.ParseHumanReadableKey(req.UnlockKey)
-	if err != nil {
-		return err
-	}
-
-	c.Lock()
-	config := *c.lastNodeConfig
-	config.lockKey = key
-	n, err := c.startNewNode(config)
-	if err != nil {
-		c.Unlock()
-		return err
-	}
-	c.Unlock()
-	select {
-	case <-n.Ready():
-	case <-n.done:
-		if errors.Cause(c.err) == ErrSwarmLocked {
-			return errors.New("swarm could not be unlocked: invalid key provided")
-		}
-		return fmt.Errorf("swarm component could not be started: %v", c.err)
-	}
-	go c.reconnectOnFailure(n)
-	return nil
-}
-
-// stopNode is a helper that stops the active c.node and waits until it has
-// shut down. Call while keeping the cluster lock.
-func (c *Cluster) stopNode() error {
-	if c.node == nil {
-		return nil
-	}
-	c.stop = true
-	if c.cancelDelay != nil {
-		c.cancelDelay()
-		c.cancelDelay = nil
-	}
-	node := c.node
-	ctx, cancel := context.WithTimeout(context.Background(), 15*time.Second)
-	defer cancel()
-	// TODO: can't hold lock on stop because it calls back to network
-	c.Unlock()
-	defer c.Lock()
-	if err := node.Stop(ctx); err != nil && !strings.Contains(err.Error(), "context canceled") {
-		return err
-	}
-	<-node.done
-	return nil
-}
-
-func removingManagerCausesLossOfQuorum(reachable, unreachable int) bool {
-	return reachable-2 <= unreachable
-}
-
-func isLastManager(reachable, unreachable int) bool {
-	return reachable == 1 && unreachable == 0
-}
-
-// Leave shuts down Cluster and removes current state.
-func (c *Cluster) Leave(force bool) error {
-	c.Lock()
-	node := c.node
-	if node == nil {
-		if c.locked {
-			c.locked = false
-			c.lastNodeConfig = nil
-			c.Unlock()
-		} else if c.err == ErrSwarmCertificatesExpired {
-			c.err = nil
-			c.Unlock()
-		} else {
-			c.Unlock()
-			return ErrNoSwarm
-		}
-	} else {
-		if node.Manager() != nil && !force {
-			msg := "You are attempting to leave the swarm on a node that is participating as a manager. "
-			if c.isActiveManager() {
-				active, reachable, unreachable, err := c.managerStats()
-				if err == nil {
-					if active && removingManagerCausesLossOfQuorum(reachable, unreachable) {
-						if isLastManager(reachable, unreachable) {
-							msg += "Removing the last manager erases all current state of the swarm. Use `--force` to ignore this message. "
-							c.Unlock()
-							return fmt.Errorf(msg)
-						}
-						msg += fmt.Sprintf("Removing this node leaves %v managers out of %v. Without a Raft quorum your swarm will be inaccessible. ", reachable-1, reachable+unreachable)
-					}
-				}
-			} else {
-				msg += "Doing so may lose the consensus of your cluster. "
-			}
-
-			msg += "The only way to restore a swarm that has lost consensus is to reinitialize it with `--force-new-cluster`. Use `--force` to suppress this message."
-			c.Unlock()
-			return fmt.Errorf(msg)
-		}
-		if err := c.stopNode(); err != nil {
-			logrus.Errorf("failed to shut down cluster node: %v", err)
-			signal.DumpStacks("")
-			c.Unlock()
-			return err
-		}
-		c.Unlock()
-		if nodeID := node.NodeID(); nodeID != "" {
-			nodeContainers, err := c.listContainerForNode(nodeID)
-			if err != nil {
-				return err
-			}
-			for _, id := range nodeContainers {
-				if err := c.config.Backend.ContainerRm(id, &apitypes.ContainerRmConfig{ForceRemove: true}); err != nil {
-					logrus.Errorf("error removing %v: %v", id, err)
-				}
-			}
-		}
-	}
-	c.configEvent <- struct{}{}
-	// todo: cleanup optional?
-	if err := c.clearState(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Cluster) listContainerForNode(nodeID string) ([]string, error) {
-	var ids []string
-	filters := filters.NewArgs()
-	filters.Add("label", fmt.Sprintf("com.docker.swarm.node.id=%s", nodeID))
-	containers, err := c.config.Backend.Containers(&apitypes.ContainerListOptions{
-		Filters: filters,
-	})
-	if err != nil {
-		return []string{}, err
-	}
-	for _, c := range containers {
-		ids = append(ids, c.ID)
-	}
-	return ids, nil
-}
-
-func (c *Cluster) clearState() error {
-	// todo: backup this data instead of removing?
-	if err := os.RemoveAll(c.root); err != nil {
-		return err
-	}
-	if err := os.MkdirAll(c.root, 0700); err != nil {
-		return err
-	}
-	c.config.Backend.DaemonLeavesCluster()
-	return nil
-}
-
-func (c *Cluster) getRequestContext() (context.Context, func()) { // TODO: not needed when requests don't block on qourum lost
-	return context.WithTimeout(context.Background(), swarmRequestTimeout)
-}
-
-// Inspect retrieves the configuration properties of a managed swarm cluster.
-func (c *Cluster) Inspect() (types.Swarm, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return types.Swarm{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	swarm, err := getSwarm(ctx, c.client)
-	if err != nil {
-		return types.Swarm{}, err
-	}
-
-	return convert.SwarmFromGRPC(*swarm), nil
-}
-
-// Update updates configuration of a managed swarm cluster.
-func (c *Cluster) Update(version uint64, spec types.Spec, flags types.UpdateFlags) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	swarm, err := getSwarm(ctx, c.client)
-	if err != nil {
-		return err
-	}
-
-	// In update, client should provide the complete spec of the swarm, including
-	// Name and Labels. If a field is specified with 0 or nil, then the default value
-	// will be used to swarmkit.
-	clusterSpec, err := convert.SwarmSpecToGRPC(spec)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.client.UpdateCluster(
-		ctx,
-		&swarmapi.UpdateClusterRequest{
-			ClusterID: swarm.ID,
-			Spec:      &clusterSpec,
-			ClusterVersion: &swarmapi.Version{
-				Index: version,
-			},
-			Rotation: swarmapi.KeyRotation{
-				WorkerJoinToken:  flags.RotateWorkerToken,
-				ManagerJoinToken: flags.RotateManagerToken,
-				ManagerUnlockKey: flags.RotateManagerUnlockKey,
-			},
-		},
-	)
-	return err
-}
-
-// IsManager returns true if Cluster is participating as a manager.
-func (c *Cluster) IsManager() bool {
-	c.RLock()
-	defer c.RUnlock()
-	return c.isActiveManager()
-}
-
-// IsAgent returns true if Cluster is participating as a worker/agent.
-func (c *Cluster) IsAgent() bool {
-	c.RLock()
-	defer c.RUnlock()
-	return c.node != nil && c.ready
-}
-
-// GetLocalAddress returns the local address.
-func (c *Cluster) GetLocalAddress() string {
-	c.RLock()
-	defer c.RUnlock()
-	return c.actualLocalAddr
-}
-
-// GetListenAddress returns the listen address.
-func (c *Cluster) GetListenAddress() string {
-	c.RLock()
-	defer c.RUnlock()
-	if c.node != nil {
-		return c.node.config.ListenAddr
-	}
-	return ""
-}
-
-// GetAdvertiseAddress returns the remotely reachable address of this node.
-func (c *Cluster) GetAdvertiseAddress() string {
-	c.RLock()
-	defer c.RUnlock()
-	if c.node != nil && c.node.config.AdvertiseAddr != "" {
-		advertiseHost, _, _ := net.SplitHostPort(c.node.config.AdvertiseAddr)
-		return advertiseHost
-	}
-	return c.actualLocalAddr
-}
-
-// GetRemoteAddress returns a known advertise address of a remote manager if
-// available.
-// todo: change to array/connect with info
-func (c *Cluster) GetRemoteAddress() string {
-	c.RLock()
-	defer c.RUnlock()
-	return c.getRemoteAddress()
-}
-
-func (c *Cluster) getRemoteAddress() string {
-	if c.node == nil {
-		return ""
-	}
-	nodeID := c.node.NodeID()
-	for _, r := range c.node.Remotes() {
-		if r.NodeID != nodeID {
-			return r.Addr
-		}
-	}
-	return ""
-}
-
-// ListenClusterEvents returns a channel that receives messages on cluster
-// participation changes.
-// todo: make cancelable and accessible to multiple callers
-func (c *Cluster) ListenClusterEvents() <-chan struct{} {
-	return c.configEvent
-}
-
-// Info returns information about the current cluster state.
-func (c *Cluster) Info() types.Info {
-	info := types.Info{
-		NodeAddr: c.GetAdvertiseAddress(),
-	}
-
-	c.RLock()
-	defer c.RUnlock()
-
-	if c.node == nil {
-		info.LocalNodeState = types.LocalNodeStateInactive
-		if c.cancelDelay != nil {
-			info.LocalNodeState = types.LocalNodeStateError
-		}
-		if c.locked {
-			info.LocalNodeState = types.LocalNodeStateLocked
-		} else if c.err == ErrSwarmCertificatesExpired {
-			info.LocalNodeState = types.LocalNodeStateError
-		}
-	} else {
-		info.LocalNodeState = types.LocalNodeStatePending
-		if c.ready == true {
-			info.LocalNodeState = types.LocalNodeStateActive
-		} else if c.locked {
-			info.LocalNodeState = types.LocalNodeStateLocked
-		}
-	}
-	if c.err != nil {
-		info.Error = c.err.Error()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	if c.isActiveManager() {
-		info.ControlAvailable = true
-		swarm, err := c.Inspect()
-		if err != nil {
-			info.Error = err.Error()
-		}
-
-		// Strip JoinTokens
-		info.Cluster = swarm.ClusterInfo
-
-		if r, err := c.client.ListNodes(ctx, &swarmapi.ListNodesRequest{}); err == nil {
-			info.Nodes = len(r.Nodes)
-			for _, n := range r.Nodes {
-				if n.ManagerStatus != nil {
-					info.Managers = info.Managers + 1
-				}
-			}
-		}
-	}
-
-	if c.node != nil {
-		for _, r := range c.node.Remotes() {
-			info.RemoteManagers = append(info.RemoteManagers, types.Peer{NodeID: r.NodeID, Addr: r.Addr})
-		}
-		info.NodeID = c.node.NodeID()
-	}
-
-	return info
-}
-
-// isActiveManager should not be called without a read lock
-func (c *Cluster) isActiveManager() bool {
-	return c.node != nil && c.conn != nil
-}
-
-// swarmExists should not be called without a read lock
-func (c *Cluster) swarmExists() bool {
-	return c.node != nil || c.locked || c.err == ErrSwarmCertificatesExpired
-}
-
-// errNoManager returns error describing why manager commands can't be used.
-// Call with read lock.
-func (c *Cluster) errNoManager() error {
-	if c.node == nil {
-		if c.locked {
-			return ErrSwarmLocked
-		}
-		if c.err == ErrSwarmCertificatesExpired {
-			return ErrSwarmCertificatesExpired
-		}
-		return fmt.Errorf("This node is not a swarm manager. Use \"docker swarm init\" or \"docker swarm join\" to connect this node to swarm and try again.")
-	}
-	if c.node.Manager() != nil {
-		return fmt.Errorf("This node is not a swarm manager. Manager is being prepared or has trouble connecting to the cluster.")
-	}
-	return fmt.Errorf("This node is not a swarm manager. Worker nodes can't be used to view or modify cluster state. Please run this command on a manager node or promote the current node to a manager.")
-}
-
-// GetServices returns all services of a managed swarm cluster.
-func (c *Cluster) GetServices(options apitypes.ServiceListOptions) ([]types.Service, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	filters, err := newListServicesFilters(options.Filters)
-	if err != nil {
-		return nil, err
-	}
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.client.ListServices(
-		ctx,
-		&swarmapi.ListServicesRequest{Filters: filters})
-	if err != nil {
-		return nil, err
-	}
-
-	services := []types.Service{}
-
-	for _, service := range r.Services {
-		services = append(services, convert.ServiceFromGRPC(*service))
-	}
-
-	return services, nil
-}
-
-// imageWithDigestString takes an image such as name or name:tag
-// and returns the image pinned to a digest, such as name@sha256:34234...
-// Due to the difference between the docker/docker/reference, and the
-// docker/distribution/reference packages, we're parsing the image twice.
-// As the two packages converge, this function should be simplified.
-// TODO(nishanttotla): After the packages converge, the function must
-// convert distreference.Named -> distreference.Canonical, and the logic simplified.
-func (c *Cluster) imageWithDigestString(ctx context.Context, image string, authConfig *apitypes.AuthConfig) (string, error) {
-	if _, err := digest.ParseDigest(image); err == nil {
-		return "", errors.New("image reference is an image ID")
-	}
-	ref, err := distreference.ParseNamed(image)
-	if err != nil {
-		return "", err
-	}
-	// only query registry if not a canonical reference (i.e. with digest)
-	if _, ok := ref.(distreference.Canonical); !ok {
-		// create a docker/docker/reference Named object because GetRepository needs it
-		dockerRef, err := reference.ParseNamed(image)
-		if err != nil {
-			return "", err
-		}
-		dockerRef = reference.WithDefaultTag(dockerRef)
-		namedTaggedRef, ok := dockerRef.(reference.NamedTagged)
-		if !ok {
-			return "", fmt.Errorf("unable to cast image to NamedTagged reference object")
-		}
-
-		repo, _, err := c.config.Backend.GetRepository(ctx, namedTaggedRef, authConfig)
-		if err != nil {
-			return "", err
-		}
-		dscrptr, err := repo.Tags(ctx).Get(ctx, namedTaggedRef.Tag())
-		if err != nil {
-			return "", err
-		}
-
-		namedDigestedRef, err := distreference.WithDigest(distreference.EnsureTagged(ref), dscrptr.Digest)
-		if err != nil {
-			return "", err
-		}
-		return namedDigestedRef.String(), nil
-	}
-	// reference already contains a digest, so just return it
-	return ref.String(), nil
-}
-
-// CreateService creates a new service in a managed swarm cluster.
-func (c *Cluster) CreateService(s types.ServiceSpec, encodedAuth string) (*apitypes.ServiceCreateResponse, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	err := c.populateNetworkID(ctx, c.client, &s)
-	if err != nil {
-		return nil, err
-	}
-
-	serviceSpec, err := convert.ServiceSpecToGRPC(s)
-	if err != nil {
-		return nil, err
-	}
-
-	ctnr := serviceSpec.Task.GetContainer()
-	if ctnr == nil {
-		return nil, fmt.Errorf("service does not use container tasks")
-	}
-
-	if encodedAuth != "" {
-		ctnr.PullOptions = &swarmapi.ContainerSpec_PullOptions{RegistryAuth: encodedAuth}
-	}
-
-	// retrieve auth config from encoded auth
-	authConfig := &apitypes.AuthConfig{}
-	if encodedAuth != "" {
-		if err := json.NewDecoder(base64.NewDecoder(base64.URLEncoding, strings.NewReader(encodedAuth))).Decode(authConfig); err != nil {
-			logrus.Warnf("invalid authconfig: %v", err)
-		}
-	}
-
-	resp := &apitypes.ServiceCreateResponse{}
-
-	// pin image by digest
-	if os.Getenv("DOCKER_SERVICE_PREFER_OFFLINE_IMAGE") != "1" {
-		digestImage, err := c.imageWithDigestString(ctx, ctnr.Image, authConfig)
-		if err != nil {
-			logrus.Warnf("unable to pin image %s to digest: %s", ctnr.Image, err.Error())
-			resp.Warnings = append(resp.Warnings, fmt.Sprintf("unable to pin image %s to digest: %s", ctnr.Image, err.Error()))
-		} else if ctnr.Image != digestImage {
-			logrus.Debugf("pinning image %s by digest: %s", ctnr.Image, digestImage)
-			ctnr.Image = digestImage
-		} else {
-			logrus.Debugf("creating service using supplied digest reference %s", ctnr.Image)
-		}
-	}
-
-	r, err := c.client.CreateService(ctx, &swarmapi.CreateServiceRequest{Spec: &serviceSpec})
-	if err != nil {
-		return nil, err
-	}
-
-	resp.ID = r.Service.ID
-	return resp, nil
-}
-
-// GetService returns a service based on an ID or name.
-func (c *Cluster) GetService(input string) (types.Service, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return types.Service{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	service, err := getService(ctx, c.client, input)
-	if err != nil {
-		return types.Service{}, err
-	}
-	return convert.ServiceFromGRPC(*service), nil
-}
-
-// UpdateService updates existing service to match new properties.
-func (c *Cluster) UpdateService(serviceIDOrName string, version uint64, spec types.ServiceSpec, encodedAuth string, registryAuthFrom string) (*apitypes.ServiceUpdateResponse, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	err := c.populateNetworkID(ctx, c.client, &spec)
-	if err != nil {
-		return nil, err
-	}
-
-	serviceSpec, err := convert.ServiceSpecToGRPC(spec)
-	if err != nil {
-		return nil, err
-	}
-
-	currentService, err := getService(ctx, c.client, serviceIDOrName)
-	if err != nil {
-		return nil, err
-	}
-
-	newCtnr := serviceSpec.Task.GetContainer()
-	if newCtnr == nil {
-		return nil, fmt.Errorf("service does not use container tasks")
-	}
-
-	if encodedAuth != "" {
-		newCtnr.PullOptions = &swarmapi.ContainerSpec_PullOptions{RegistryAuth: encodedAuth}
-	} else {
-		// this is needed because if the encodedAuth isn't being updated then we
-		// shouldn't lose it, and continue to use the one that was already present
-		var ctnr *swarmapi.ContainerSpec
-		switch registryAuthFrom {
-		case apitypes.RegistryAuthFromSpec, "":
-			ctnr = currentService.Spec.Task.GetContainer()
-		case apitypes.RegistryAuthFromPreviousSpec:
-			if currentService.PreviousSpec == nil {
-				return nil, fmt.Errorf("service does not have a previous spec")
-			}
-			ctnr = currentService.PreviousSpec.Task.GetContainer()
-		default:
-			return nil, fmt.Errorf("unsupported registryAuthFromValue")
-		}
-		if ctnr == nil {
-			return nil, fmt.Errorf("service does not use container tasks")
-		}
-		newCtnr.PullOptions = ctnr.PullOptions
-		// update encodedAuth so it can be used to pin image by digest
-		if ctnr.PullOptions != nil {
-			encodedAuth = ctnr.PullOptions.RegistryAuth
-		}
-	}
-
-	// retrieve auth config from encoded auth
-	authConfig := &apitypes.AuthConfig{}
-	if encodedAuth != "" {
-		if err := json.NewDecoder(base64.NewDecoder(base64.URLEncoding, strings.NewReader(encodedAuth))).Decode(authConfig); err != nil {
-			logrus.Warnf("invalid authconfig: %v", err)
-		}
-	}
-
-	resp := &apitypes.ServiceUpdateResponse{}
-
-	// pin image by digest
-	if os.Getenv("DOCKER_SERVICE_PREFER_OFFLINE_IMAGE") != "1" {
-		digestImage, err := c.imageWithDigestString(ctx, newCtnr.Image, authConfig)
-		if err != nil {
-			logrus.Warnf("unable to pin image %s to digest: %s", newCtnr.Image, err.Error())
-			resp.Warnings = append(resp.Warnings, fmt.Sprintf("unable to pin image %s to digest: %s", newCtnr.Image, err.Error()))
-		} else if newCtnr.Image != digestImage {
-			logrus.Debugf("pinning image %s by digest: %s", newCtnr.Image, digestImage)
-			newCtnr.Image = digestImage
-		} else {
-			logrus.Debugf("updating service using supplied digest reference %s", newCtnr.Image)
-		}
-	}
-
-	_, err = c.client.UpdateService(
-		ctx,
-		&swarmapi.UpdateServiceRequest{
-			ServiceID: currentService.ID,
-			Spec:      &serviceSpec,
-			ServiceVersion: &swarmapi.Version{
-				Index: version,
-			},
-		},
-	)
-
-	return resp, err
-}
-
-// RemoveService removes a service from a managed swarm cluster.
-func (c *Cluster) RemoveService(input string) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	service, err := getService(ctx, c.client, input)
-	if err != nil {
-		return err
-	}
-
-	if _, err := c.client.RemoveService(ctx, &swarmapi.RemoveServiceRequest{ServiceID: service.ID}); err != nil {
-		return err
-	}
-	return nil
-}
-
-// ServiceLogs collects service logs and writes them back to `config.OutStream`
-func (c *Cluster) ServiceLogs(ctx context.Context, input string, config *backend.ContainerLogsConfig, started chan struct{}) error {
-	c.RLock()
-	if !c.isActiveManager() {
-		c.RUnlock()
-		return c.errNoManager()
-	}
-
-	service, err := getService(ctx, c.client, input)
-	if err != nil {
-		c.RUnlock()
-		return err
-	}
-
-	stream, err := c.logs.SubscribeLogs(ctx, &swarmapi.SubscribeLogsRequest{
-		Selector: &swarmapi.LogSelector{
-			ServiceIDs: []string{service.ID},
-		},
-		Options: &swarmapi.LogSubscriptionOptions{
-			Follow: config.Follow,
-		},
-	})
-	if err != nil {
-		c.RUnlock()
-		return err
-	}
-
-	wf := ioutils.NewWriteFlusher(config.OutStream)
-	defer wf.Close()
-	close(started)
-	wf.Flush()
-
-	outStream := stdcopy.NewStdWriter(wf, stdcopy.Stdout)
-	errStream := stdcopy.NewStdWriter(wf, stdcopy.Stderr)
-
-	// Release the lock before starting the stream.
-	c.RUnlock()
-	for {
-		// Check the context before doing anything.
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		default:
-		}
-
-		subscribeMsg, err := stream.Recv()
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-
-		for _, msg := range subscribeMsg.Messages {
-			data := []byte{}
-
-			if config.Timestamps {
-				ts, err := ptypes.Timestamp(msg.Timestamp)
-				if err != nil {
-					return err
-				}
-				data = append(data, []byte(ts.Format(logger.TimeFormat)+" ")...)
-			}
-
-			data = append(data, []byte(fmt.Sprintf("%s.node.id=%s,%s.service.id=%s,%s.task.id=%s ",
-				contextPrefix, msg.Context.NodeID,
-				contextPrefix, msg.Context.ServiceID,
-				contextPrefix, msg.Context.TaskID,
-			))...)
-
-			data = append(data, msg.Data...)
-
-			switch msg.Stream {
-			case swarmapi.LogStreamStdout:
-				outStream.Write(data)
-			case swarmapi.LogStreamStderr:
-				errStream.Write(data)
-			}
-		}
-	}
-}
-
-// GetNodes returns a list of all nodes known to a cluster.
-func (c *Cluster) GetNodes(options apitypes.NodeListOptions) ([]types.Node, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	filters, err := newListNodesFilters(options.Filters)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.client.ListNodes(
-		ctx,
-		&swarmapi.ListNodesRequest{Filters: filters})
-	if err != nil {
-		return nil, err
-	}
-
-	nodes := []types.Node{}
-
-	for _, node := range r.Nodes {
-		nodes = append(nodes, convert.NodeFromGRPC(*node))
-	}
-	return nodes, nil
-}
-
-// GetNode returns a node based on an ID or name.
-func (c *Cluster) GetNode(input string) (types.Node, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return types.Node{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	node, err := getNode(ctx, c.client, input)
-	if err != nil {
-		return types.Node{}, err
-	}
-	return convert.NodeFromGRPC(*node), nil
-}
-
-// UpdateNode updates existing nodes properties.
-func (c *Cluster) UpdateNode(input string, version uint64, spec types.NodeSpec) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	nodeSpec, err := convert.NodeSpecToGRPC(spec)
-	if err != nil {
-		return err
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	currentNode, err := getNode(ctx, c.client, input)
-	if err != nil {
-		return err
-	}
-
-	_, err = c.client.UpdateNode(
-		ctx,
-		&swarmapi.UpdateNodeRequest{
-			NodeID: currentNode.ID,
-			Spec:   &nodeSpec,
-			NodeVersion: &swarmapi.Version{
-				Index: version,
-			},
-		},
-	)
-	return err
-}
-
-// RemoveNode removes a node from a cluster
-func (c *Cluster) RemoveNode(input string, force bool) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	node, err := getNode(ctx, c.client, input)
-	if err != nil {
-		return err
-	}
-
-	if _, err := c.client.RemoveNode(ctx, &swarmapi.RemoveNodeRequest{NodeID: node.ID, Force: force}); err != nil {
-		return err
-	}
-	return nil
-}
-
-// GetTasks returns a list of tasks matching the filter options.
-func (c *Cluster) GetTasks(options apitypes.TaskListOptions) ([]types.Task, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	byName := func(filter filters.Args) error {
-		if filter.Include("service") {
-			serviceFilters := filter.Get("service")
-			for _, serviceFilter := range serviceFilters {
-				service, err := c.GetService(serviceFilter)
-				if err != nil {
-					return err
-				}
-				filter.Del("service", serviceFilter)
-				filter.Add("service", service.ID)
-			}
-		}
-		if filter.Include("node") {
-			nodeFilters := filter.Get("node")
-			for _, nodeFilter := range nodeFilters {
-				node, err := c.GetNode(nodeFilter)
-				if err != nil {
-					return err
-				}
-				filter.Del("node", nodeFilter)
-				filter.Add("node", node.ID)
-			}
-		}
-		return nil
-	}
-
-	filters, err := newListTasksFilters(options.Filters, byName)
-	if err != nil {
-		return nil, err
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.client.ListTasks(
-		ctx,
-		&swarmapi.ListTasksRequest{Filters: filters})
-	if err != nil {
-		return nil, err
-	}
-
-	tasks := []types.Task{}
-
-	for _, task := range r.Tasks {
-		if task.Spec.GetContainer() != nil {
-			tasks = append(tasks, convert.TaskFromGRPC(*task))
-		}
-	}
-	return tasks, nil
-}
-
-// GetTask returns a task by an ID.
-func (c *Cluster) GetTask(input string) (types.Task, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return types.Task{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	task, err := getTask(ctx, c.client, input)
-	if err != nil {
-		return types.Task{}, err
-	}
-	return convert.TaskFromGRPC(*task), nil
-}
-
-// GetNetwork returns a cluster network by an ID.
-func (c *Cluster) GetNetwork(input string) (apitypes.NetworkResource, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return apitypes.NetworkResource{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	network, err := getNetwork(ctx, c.client, input)
-	if err != nil {
-		return apitypes.NetworkResource{}, err
-	}
-	return convert.BasicNetworkFromGRPC(*network), nil
-}
-
-func (c *Cluster) getNetworks(filters *swarmapi.ListNetworksRequest_Filters) ([]apitypes.NetworkResource, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.client.ListNetworks(ctx, &swarmapi.ListNetworksRequest{Filters: filters})
-	if err != nil {
-		return nil, err
-	}
-
-	var networks []apitypes.NetworkResource
-
-	for _, network := range r.Networks {
-		networks = append(networks, convert.BasicNetworkFromGRPC(*network))
-	}
-
-	return networks, nil
-}
-
-// GetNetworks returns all current cluster managed networks.
-func (c *Cluster) GetNetworks() ([]apitypes.NetworkResource, error) {
-	return c.getNetworks(nil)
-}
-
-// GetNetworksByName returns cluster managed networks by name.
-// It is ok to have multiple networks here. #18864
-func (c *Cluster) GetNetworksByName(name string) ([]apitypes.NetworkResource, error) {
-	// Note that swarmapi.GetNetworkRequest.Name is not functional.
-	// So we cannot just use that with c.GetNetwork.
-	return c.getNetworks(&swarmapi.ListNetworksRequest_Filters{
-		Names: []string{name},
-	})
-}
-
-func attacherKey(target, containerID string) string {
-	return containerID + ":" + target
-}
-
-// UpdateAttachment signals the attachment config to the attachment
-// waiter who is trying to start or attach the container to the
-// network.
-func (c *Cluster) UpdateAttachment(target, containerID string, config *network.NetworkingConfig) error {
-	c.RLock()
-	attacher, ok := c.attachers[attacherKey(target, containerID)]
-	c.RUnlock()
-	if !ok || attacher == nil {
-		return fmt.Errorf("could not find attacher for container %s to network %s", containerID, target)
-	}
-
-	attacher.attachWaitCh <- config
-	close(attacher.attachWaitCh)
-	return nil
-}
-
-// WaitForDetachment waits for the container to stop or detach from
-// the network.
-func (c *Cluster) WaitForDetachment(ctx context.Context, networkName, networkID, taskID, containerID string) error {
-	c.RLock()
-	attacher, ok := c.attachers[attacherKey(networkName, containerID)]
-	if !ok {
-		attacher, ok = c.attachers[attacherKey(networkID, containerID)]
-	}
-	if c.node == nil || c.node.Agent() == nil {
-		c.RUnlock()
-		return fmt.Errorf("invalid cluster node while waiting for detachment")
-	}
-
-	agent := c.node.Agent()
-	c.RUnlock()
-
-	if ok && attacher != nil &&
-		attacher.detachWaitCh != nil &&
-		attacher.attachCompleteCh != nil {
-		// Attachment may be in progress still so wait for
-		// attachment to complete.
-		select {
-		case <-attacher.attachCompleteCh:
-		case <-ctx.Done():
-			return ctx.Err()
-		}
-
-		if attacher.taskID == taskID {
-			select {
-			case <-attacher.detachWaitCh:
-			case <-ctx.Done():
-				return ctx.Err()
-			}
-		}
-	}
-
-	return agent.ResourceAllocator().DetachNetwork(ctx, taskID)
-}
-
-// AttachNetwork generates an attachment request towards the manager.
-func (c *Cluster) AttachNetwork(target string, containerID string, addresses []string) (*network.NetworkingConfig, error) {
-	aKey := attacherKey(target, containerID)
-	c.Lock()
-	if c.node == nil || c.node.Agent() == nil {
-		c.Unlock()
-		return nil, fmt.Errorf("invalid cluster node while attaching to network")
-	}
-	if attacher, ok := c.attachers[aKey]; ok {
-		c.Unlock()
-		return attacher.config, nil
-	}
-
-	agent := c.node.Agent()
-	attachWaitCh := make(chan *network.NetworkingConfig)
-	detachWaitCh := make(chan struct{})
-	attachCompleteCh := make(chan struct{})
-	c.attachers[aKey] = &attacher{
-		attachWaitCh:     attachWaitCh,
-		attachCompleteCh: attachCompleteCh,
-		detachWaitCh:     detachWaitCh,
-	}
-	c.Unlock()
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	taskID, err := agent.ResourceAllocator().AttachNetwork(ctx, containerID, target, addresses)
-	if err != nil {
-		c.Lock()
-		delete(c.attachers, aKey)
-		c.Unlock()
-		return nil, fmt.Errorf("Could not attach to network %s: %v", target, err)
-	}
-
-	c.Lock()
-	c.attachers[aKey].taskID = taskID
-	close(attachCompleteCh)
-	c.Unlock()
-
-	logrus.Debugf("Successfully attached to network %s with tid %s", target, taskID)
-
-	var config *network.NetworkingConfig
-	select {
-	case config = <-attachWaitCh:
-	case <-ctx.Done():
-		return nil, fmt.Errorf("attaching to network failed, make sure your network options are correct and check manager logs: %v", ctx.Err())
-	}
-
-	c.Lock()
-	c.attachers[aKey].config = config
-	c.Unlock()
-	return config, nil
-}
-
-// DetachNetwork unblocks the waiters waiting on WaitForDetachment so
-// that a request to detach can be generated towards the manager.
-func (c *Cluster) DetachNetwork(target string, containerID string) error {
-	aKey := attacherKey(target, containerID)
-
-	c.Lock()
-	attacher, ok := c.attachers[aKey]
-	delete(c.attachers, aKey)
-	c.Unlock()
-
-	if !ok {
-		return fmt.Errorf("could not find network attachment for container %s to network %s", containerID, target)
-	}
-
-	close(attacher.detachWaitCh)
-	return nil
-}
-
-// CreateNetwork creates a new cluster managed network.
-func (c *Cluster) CreateNetwork(s apitypes.NetworkCreateRequest) (string, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return "", c.errNoManager()
-	}
-
-	if runconfig.IsPreDefinedNetwork(s.Name) {
-		err := fmt.Errorf("%s is a pre-defined network and cannot be created", s.Name)
-		return "", apierrors.NewRequestForbiddenError(err)
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	networkSpec := convert.BasicNetworkCreateToGRPC(s)
-	r, err := c.client.CreateNetwork(ctx, &swarmapi.CreateNetworkRequest{Spec: &networkSpec})
-	if err != nil {
-		return "", err
-	}
-
-	return r.Network.ID, nil
-}
-
-// RemoveNetwork removes a cluster network.
-func (c *Cluster) RemoveNetwork(input string) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	network, err := getNetwork(ctx, c.client, input)
-	if err != nil {
-		return err
-	}
-
-	if _, err := c.client.RemoveNetwork(ctx, &swarmapi.RemoveNetworkRequest{NetworkID: network.ID}); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *Cluster) populateNetworkID(ctx context.Context, client swarmapi.ControlClient, s *types.ServiceSpec) error {
-	// Always prefer NetworkAttachmentConfigs from TaskTemplate
-	// but fallback to service spec for backward compatibility
-	networks := s.TaskTemplate.Networks
-	if len(networks) == 0 {
-		networks = s.Networks
-	}
-
-	for i, n := range networks {
-		apiNetwork, err := getNetwork(ctx, client, n.Target)
-		if err != nil {
-			if ln, _ := c.config.Backend.FindNetwork(n.Target); ln != nil && !ln.Info().Dynamic() {
-				err = fmt.Errorf("The network %s cannot be used with services. Only networks scoped to the swarm can be used, such as those created with the overlay driver.", ln.Name())
-				return apierrors.NewRequestForbiddenError(err)
-			}
-			return err
-		}
-		networks[i].Target = apiNetwork.ID
-	}
-	return nil
-}
-
-func getNetwork(ctx context.Context, c swarmapi.ControlClient, input string) (*swarmapi.Network, error) {
-	// GetNetwork to match via full ID.
-	rg, err := c.GetNetwork(ctx, &swarmapi.GetNetworkRequest{NetworkID: input})
-	if err != nil {
-		// If any error (including NotFound), ListNetworks to match via ID prefix and full name.
-		rl, err := c.ListNetworks(ctx, &swarmapi.ListNetworksRequest{Filters: &swarmapi.ListNetworksRequest_Filters{Names: []string{input}}})
-		if err != nil || len(rl.Networks) == 0 {
-			rl, err = c.ListNetworks(ctx, &swarmapi.ListNetworksRequest{Filters: &swarmapi.ListNetworksRequest_Filters{IDPrefixes: []string{input}}})
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rl.Networks) == 0 {
-			return nil, fmt.Errorf("network %s not found", input)
-		}
-
-		if l := len(rl.Networks); l > 1 {
-			return nil, fmt.Errorf("network %s is ambiguous (%d matches found)", input, l)
-		}
-
-		return rl.Networks[0], nil
-	}
-	return rg.Network, nil
-}
-
-// Cleanup stops active swarm node. This is run before daemon shutdown.
-func (c *Cluster) Cleanup() {
-	c.Lock()
-	node := c.node
-	if node == nil {
-		c.Unlock()
-		return
-	}
-	defer c.Unlock()
-	if c.isActiveManager() {
-		active, reachable, unreachable, err := c.managerStats()
-		if err == nil {
-			singlenode := active && isLastManager(reachable, unreachable)
-			if active && !singlenode && removingManagerCausesLossOfQuorum(reachable, unreachable) {
-				logrus.Errorf("Leaving cluster with %v managers left out of %v. Raft quorum will be lost.", reachable-1, reachable+unreachable)
-			}
-		}
-	}
-	c.stopNode()
-}
-
-func (c *Cluster) managerStats() (current bool, reachable int, unreachable int, err error) {
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	nodes, err := c.client.ListNodes(ctx, &swarmapi.ListNodesRequest{})
-	if err != nil {
-		return false, 0, 0, err
-	}
-	for _, n := range nodes.Nodes {
-		if n.ManagerStatus != nil {
-			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_REACHABLE {
-				reachable++
-				if n.ID == c.node.NodeID() {
-					current = true
-				}
-			}
-			if n.ManagerStatus.Reachability == swarmapi.RaftMemberStatus_UNREACHABLE {
-				unreachable++
-			}
-		}
-	}
-	return
-}
-
-func validateAndSanitizeInitRequest(req *types.InitRequest) error {
-	var err error
-	req.ListenAddr, err = validateAddr(req.ListenAddr)
-	if err != nil {
-		return fmt.Errorf("invalid ListenAddr %q: %v", req.ListenAddr, err)
-	}
-
-	if req.Spec.Annotations.Name == "" {
-		req.Spec.Annotations.Name = "default"
-	} else if req.Spec.Annotations.Name != "default" {
-		return errors.New(`swarm spec must be named "default"`)
-	}
-
-	return nil
-}
-
-func validateAndSanitizeJoinRequest(req *types.JoinRequest) error {
-	var err error
-	req.ListenAddr, err = validateAddr(req.ListenAddr)
-	if err != nil {
-		return fmt.Errorf("invalid ListenAddr %q: %v", req.ListenAddr, err)
-	}
-	if len(req.RemoteAddrs) == 0 {
-		return fmt.Errorf("at least 1 RemoteAddr is required to join")
-	}
-	for i := range req.RemoteAddrs {
-		req.RemoteAddrs[i], err = validateAddr(req.RemoteAddrs[i])
-		if err != nil {
-			return fmt.Errorf("invalid remoteAddr %q: %v", req.RemoteAddrs[i], err)
-		}
-	}
-	return nil
-}
-
-func validateAddr(addr string) (string, error) {
-	if addr == "" {
-		return addr, fmt.Errorf("invalid empty address")
-	}
-	newaddr, err := opts.ParseTCPAddr(addr, defaultAddr)
-	if err != nil {
-		return addr, nil
-	}
-	return strings.TrimPrefix(newaddr, "tcp://"), nil
-}
-
-func initClusterSpec(node *node, spec types.Spec) error {
-	ctx, _ := context.WithTimeout(context.Background(), 5*time.Second)
-	for conn := range node.ListenControlSocket(ctx) {
-		if ctx.Err() != nil {
-			return ctx.Err()
-		}
-		if conn != nil {
-			client := swarmapi.NewControlClient(conn)
-			var cluster *swarmapi.Cluster
-			for i := 0; ; i++ {
-				lcr, err := client.ListClusters(ctx, &swarmapi.ListClustersRequest{})
-				if err != nil {
-					return fmt.Errorf("error on listing clusters: %v", err)
-				}
-				if len(lcr.Clusters) == 0 {
-					if i < 10 {
-						time.Sleep(200 * time.Millisecond)
-						continue
-					}
-					return fmt.Errorf("empty list of clusters was returned")
-				}
-				cluster = lcr.Clusters[0]
-				break
-			}
-			// In init, we take the initial default values from swarmkit, and merge
-			// any non nil or 0 value from spec to GRPC spec. This will leave the
-			// default value alone.
-			// Note that this is different from Update(), as in Update() we expect
-			// user to specify the complete spec of the cluster (as they already know
-			// the existing one and knows which field to update)
-			clusterSpec, err := convert.MergeSwarmSpecToGRPC(spec, cluster.Spec)
-			if err != nil {
-				return fmt.Errorf("error updating cluster settings: %v", err)
-			}
-			_, err = client.UpdateCluster(ctx, &swarmapi.UpdateClusterRequest{
-				ClusterID:      cluster.ID,
-				ClusterVersion: &cluster.Meta.Version,
-				Spec:           &clusterSpec,
-			})
-			if err != nil {
-				return fmt.Errorf("error updating cluster settings: %v", err)
-			}
-			return nil
-		}
-	}
-	return ctx.Err()
-}
-
-func detectLockedError(err error) error {
-	if err == swarmnode.ErrInvalidUnlockKey {
-		return errors.WithStack(ErrSwarmLocked)
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/container.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/container.go
deleted file mode 100644
index 10383f749b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/container.go
+++ /dev/null
@@ -1,235 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	container "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	types "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-func containerSpecFromGRPC(c *swarmapi.ContainerSpec) types.ContainerSpec {
-	containerSpec := types.ContainerSpec{
-		Image:     c.Image,
-		Labels:    c.Labels,
-		Command:   c.Command,
-		Args:      c.Args,
-		Hostname:  c.Hostname,
-		Env:       c.Env,
-		Dir:       c.Dir,
-		User:      c.User,
-		Groups:    c.Groups,
-		TTY:       c.TTY,
-		OpenStdin: c.OpenStdin,
-		Hosts:     c.Hosts,
-		Secrets:   secretReferencesFromGRPC(c.Secrets),
-	}
-
-	if c.DNSConfig != nil {
-		containerSpec.DNSConfig = &types.DNSConfig{
-			Nameservers: c.DNSConfig.Nameservers,
-			Search:      c.DNSConfig.Search,
-			Options:     c.DNSConfig.Options,
-		}
-	}
-
-	// Mounts
-	for _, m := range c.Mounts {
-		mount := mounttypes.Mount{
-			Target:   m.Target,
-			Source:   m.Source,
-			Type:     mounttypes.Type(strings.ToLower(swarmapi.Mount_MountType_name[int32(m.Type)])),
-			ReadOnly: m.ReadOnly,
-		}
-
-		if m.BindOptions != nil {
-			mount.BindOptions = &mounttypes.BindOptions{
-				Propagation: mounttypes.Propagation(strings.ToLower(swarmapi.Mount_BindOptions_MountPropagation_name[int32(m.BindOptions.Propagation)])),
-			}
-		}
-
-		if m.VolumeOptions != nil {
-			mount.VolumeOptions = &mounttypes.VolumeOptions{
-				NoCopy: m.VolumeOptions.NoCopy,
-				Labels: m.VolumeOptions.Labels,
-			}
-			if m.VolumeOptions.DriverConfig != nil {
-				mount.VolumeOptions.DriverConfig = &mounttypes.Driver{
-					Name:    m.VolumeOptions.DriverConfig.Name,
-					Options: m.VolumeOptions.DriverConfig.Options,
-				}
-			}
-		}
-
-		if m.TmpfsOptions != nil {
-			mount.TmpfsOptions = &mounttypes.TmpfsOptions{
-				SizeBytes: m.TmpfsOptions.SizeBytes,
-				Mode:      m.TmpfsOptions.Mode,
-			}
-		}
-		containerSpec.Mounts = append(containerSpec.Mounts, mount)
-	}
-
-	if c.StopGracePeriod != nil {
-		grace, _ := ptypes.Duration(c.StopGracePeriod)
-		containerSpec.StopGracePeriod = &grace
-	}
-
-	if c.Healthcheck != nil {
-		containerSpec.Healthcheck = healthConfigFromGRPC(c.Healthcheck)
-	}
-
-	return containerSpec
-}
-
-func secretReferencesToGRPC(sr []*types.SecretReference) []*swarmapi.SecretReference {
-	refs := make([]*swarmapi.SecretReference, 0, len(sr))
-	for _, s := range sr {
-		ref := &swarmapi.SecretReference{
-			SecretID:   s.SecretID,
-			SecretName: s.SecretName,
-		}
-		if s.File != nil {
-			ref.Target = &swarmapi.SecretReference_File{
-				File: &swarmapi.SecretReference_FileTarget{
-					Name: s.File.Name,
-					UID:  s.File.UID,
-					GID:  s.File.GID,
-					Mode: s.File.Mode,
-				},
-			}
-		}
-
-		refs = append(refs, ref)
-	}
-
-	return refs
-}
-func secretReferencesFromGRPC(sr []*swarmapi.SecretReference) []*types.SecretReference {
-	refs := make([]*types.SecretReference, 0, len(sr))
-	for _, s := range sr {
-		target := s.GetFile()
-		if target == nil {
-			// not a file target
-			logrus.Warnf("secret target not a file: secret=%s", s.SecretID)
-			continue
-		}
-		refs = append(refs, &types.SecretReference{
-			File: &types.SecretReferenceFileTarget{
-				Name: target.Name,
-				UID:  target.UID,
-				GID:  target.GID,
-				Mode: target.Mode,
-			},
-			SecretID:   s.SecretID,
-			SecretName: s.SecretName,
-		})
-	}
-
-	return refs
-}
-
-func containerToGRPC(c types.ContainerSpec) (*swarmapi.ContainerSpec, error) {
-	containerSpec := &swarmapi.ContainerSpec{
-		Image:     c.Image,
-		Labels:    c.Labels,
-		Command:   c.Command,
-		Args:      c.Args,
-		Hostname:  c.Hostname,
-		Env:       c.Env,
-		Dir:       c.Dir,
-		User:      c.User,
-		Groups:    c.Groups,
-		TTY:       c.TTY,
-		OpenStdin: c.OpenStdin,
-		Hosts:     c.Hosts,
-		Secrets:   secretReferencesToGRPC(c.Secrets),
-	}
-
-	if c.DNSConfig != nil {
-		containerSpec.DNSConfig = &swarmapi.ContainerSpec_DNSConfig{
-			Nameservers: c.DNSConfig.Nameservers,
-			Search:      c.DNSConfig.Search,
-			Options:     c.DNSConfig.Options,
-		}
-	}
-
-	if c.StopGracePeriod != nil {
-		containerSpec.StopGracePeriod = ptypes.DurationProto(*c.StopGracePeriod)
-	}
-
-	// Mounts
-	for _, m := range c.Mounts {
-		mount := swarmapi.Mount{
-			Target:   m.Target,
-			Source:   m.Source,
-			ReadOnly: m.ReadOnly,
-		}
-
-		if mountType, ok := swarmapi.Mount_MountType_value[strings.ToUpper(string(m.Type))]; ok {
-			mount.Type = swarmapi.Mount_MountType(mountType)
-		} else if string(m.Type) != "" {
-			return nil, fmt.Errorf("invalid MountType: %q", m.Type)
-		}
-
-		if m.BindOptions != nil {
-			if mountPropagation, ok := swarmapi.Mount_BindOptions_MountPropagation_value[strings.ToUpper(string(m.BindOptions.Propagation))]; ok {
-				mount.BindOptions = &swarmapi.Mount_BindOptions{Propagation: swarmapi.Mount_BindOptions_MountPropagation(mountPropagation)}
-			} else if string(m.BindOptions.Propagation) != "" {
-				return nil, fmt.Errorf("invalid MountPropagation: %q", m.BindOptions.Propagation)
-			}
-		}
-
-		if m.VolumeOptions != nil {
-			mount.VolumeOptions = &swarmapi.Mount_VolumeOptions{
-				NoCopy: m.VolumeOptions.NoCopy,
-				Labels: m.VolumeOptions.Labels,
-			}
-			if m.VolumeOptions.DriverConfig != nil {
-				mount.VolumeOptions.DriverConfig = &swarmapi.Driver{
-					Name:    m.VolumeOptions.DriverConfig.Name,
-					Options: m.VolumeOptions.DriverConfig.Options,
-				}
-			}
-		}
-
-		if m.TmpfsOptions != nil {
-			mount.TmpfsOptions = &swarmapi.Mount_TmpfsOptions{
-				SizeBytes: m.TmpfsOptions.SizeBytes,
-				Mode:      m.TmpfsOptions.Mode,
-			}
-		}
-
-		containerSpec.Mounts = append(containerSpec.Mounts, mount)
-	}
-
-	if c.Healthcheck != nil {
-		containerSpec.Healthcheck = healthConfigToGRPC(c.Healthcheck)
-	}
-
-	return containerSpec, nil
-}
-
-func healthConfigFromGRPC(h *swarmapi.HealthConfig) *container.HealthConfig {
-	interval, _ := ptypes.Duration(h.Interval)
-	timeout, _ := ptypes.Duration(h.Timeout)
-	return &container.HealthConfig{
-		Test:     h.Test,
-		Interval: interval,
-		Timeout:  timeout,
-		Retries:  int(h.Retries),
-	}
-}
-
-func healthConfigToGRPC(h *container.HealthConfig) *swarmapi.HealthConfig {
-	return &swarmapi.HealthConfig{
-		Test:     h.Test,
-		Interval: ptypes.DurationProto(h.Interval),
-		Timeout:  ptypes.DurationProto(h.Timeout),
-		Retries:  int32(h.Retries),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/network.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/network.go
deleted file mode 100644
index 4d21b4df0a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/network.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package convert
-
-import (
-	"strings"
-
-	basictypes "github.com/docker/docker/api/types"
-	networktypes "github.com/docker/docker/api/types/network"
-	types "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-func networkAttachementFromGRPC(na *swarmapi.NetworkAttachment) types.NetworkAttachment {
-	if na != nil {
-		return types.NetworkAttachment{
-			Network:   networkFromGRPC(na.Network),
-			Addresses: na.Addresses,
-		}
-	}
-	return types.NetworkAttachment{}
-}
-
-func networkFromGRPC(n *swarmapi.Network) types.Network {
-	if n != nil {
-		network := types.Network{
-			ID: n.ID,
-			Spec: types.NetworkSpec{
-				IPv6Enabled: n.Spec.Ipv6Enabled,
-				Internal:    n.Spec.Internal,
-				Attachable:  n.Spec.Attachable,
-				IPAMOptions: ipamFromGRPC(n.Spec.IPAM),
-			},
-			IPAMOptions: ipamFromGRPC(n.IPAM),
-		}
-
-		// Meta
-		network.Version.Index = n.Meta.Version.Index
-		network.CreatedAt, _ = ptypes.Timestamp(n.Meta.CreatedAt)
-		network.UpdatedAt, _ = ptypes.Timestamp(n.Meta.UpdatedAt)
-
-		//Annotations
-		network.Spec.Name = n.Spec.Annotations.Name
-		network.Spec.Labels = n.Spec.Annotations.Labels
-
-		//DriverConfiguration
-		if n.Spec.DriverConfig != nil {
-			network.Spec.DriverConfiguration = &types.Driver{
-				Name:    n.Spec.DriverConfig.Name,
-				Options: n.Spec.DriverConfig.Options,
-			}
-		}
-
-		//DriverState
-		if n.DriverState != nil {
-			network.DriverState = types.Driver{
-				Name:    n.DriverState.Name,
-				Options: n.DriverState.Options,
-			}
-		}
-
-		return network
-	}
-	return types.Network{}
-}
-
-func ipamFromGRPC(i *swarmapi.IPAMOptions) *types.IPAMOptions {
-	var ipam *types.IPAMOptions
-	if i != nil {
-		ipam = &types.IPAMOptions{}
-		if i.Driver != nil {
-			ipam.Driver.Name = i.Driver.Name
-			ipam.Driver.Options = i.Driver.Options
-		}
-
-		for _, config := range i.Configs {
-			ipam.Configs = append(ipam.Configs, types.IPAMConfig{
-				Subnet:  config.Subnet,
-				Range:   config.Range,
-				Gateway: config.Gateway,
-			})
-		}
-	}
-	return ipam
-}
-
-func endpointSpecFromGRPC(es *swarmapi.EndpointSpec) *types.EndpointSpec {
-	var endpointSpec *types.EndpointSpec
-	if es != nil {
-		endpointSpec = &types.EndpointSpec{}
-		endpointSpec.Mode = types.ResolutionMode(strings.ToLower(es.Mode.String()))
-
-		for _, portState := range es.Ports {
-			endpointSpec.Ports = append(endpointSpec.Ports, types.PortConfig{
-				Name:          portState.Name,
-				Protocol:      types.PortConfigProtocol(strings.ToLower(swarmapi.PortConfig_Protocol_name[int32(portState.Protocol)])),
-				PublishMode:   types.PortConfigPublishMode(strings.ToLower(swarmapi.PortConfig_PublishMode_name[int32(portState.PublishMode)])),
-				TargetPort:    portState.TargetPort,
-				PublishedPort: portState.PublishedPort,
-			})
-		}
-	}
-	return endpointSpec
-}
-
-func endpointFromGRPC(e *swarmapi.Endpoint) types.Endpoint {
-	endpoint := types.Endpoint{}
-	if e != nil {
-		if espec := endpointSpecFromGRPC(e.Spec); espec != nil {
-			endpoint.Spec = *espec
-		}
-
-		for _, portState := range e.Ports {
-			endpoint.Ports = append(endpoint.Ports, types.PortConfig{
-				Name:          portState.Name,
-				Protocol:      types.PortConfigProtocol(strings.ToLower(swarmapi.PortConfig_Protocol_name[int32(portState.Protocol)])),
-				PublishMode:   types.PortConfigPublishMode(strings.ToLower(swarmapi.PortConfig_PublishMode_name[int32(portState.PublishMode)])),
-				TargetPort:    portState.TargetPort,
-				PublishedPort: portState.PublishedPort,
-			})
-		}
-
-		for _, v := range e.VirtualIPs {
-			endpoint.VirtualIPs = append(endpoint.VirtualIPs, types.EndpointVirtualIP{
-				NetworkID: v.NetworkID,
-				Addr:      v.Addr})
-		}
-
-	}
-
-	return endpoint
-}
-
-// BasicNetworkFromGRPC converts a grpc Network to a NetworkResource.
-func BasicNetworkFromGRPC(n swarmapi.Network) basictypes.NetworkResource {
-	spec := n.Spec
-	var ipam networktypes.IPAM
-	if spec.IPAM != nil {
-		if spec.IPAM.Driver != nil {
-			ipam.Driver = spec.IPAM.Driver.Name
-			ipam.Options = spec.IPAM.Driver.Options
-		}
-		ipam.Config = make([]networktypes.IPAMConfig, 0, len(spec.IPAM.Configs))
-		for _, ic := range spec.IPAM.Configs {
-			ipamConfig := networktypes.IPAMConfig{
-				Subnet:     ic.Subnet,
-				IPRange:    ic.Range,
-				Gateway:    ic.Gateway,
-				AuxAddress: ic.Reserved,
-			}
-			ipam.Config = append(ipam.Config, ipamConfig)
-		}
-	}
-
-	nr := basictypes.NetworkResource{
-		ID:         n.ID,
-		Name:       n.Spec.Annotations.Name,
-		Scope:      "swarm",
-		EnableIPv6: spec.Ipv6Enabled,
-		IPAM:       ipam,
-		Internal:   spec.Internal,
-		Attachable: spec.Attachable,
-		Labels:     n.Spec.Annotations.Labels,
-	}
-
-	if n.DriverState != nil {
-		nr.Driver = n.DriverState.Name
-		nr.Options = n.DriverState.Options
-	}
-
-	return nr
-}
-
-// BasicNetworkCreateToGRPC converts a NetworkCreateRequest to a grpc NetworkSpec.
-func BasicNetworkCreateToGRPC(create basictypes.NetworkCreateRequest) swarmapi.NetworkSpec {
-	ns := swarmapi.NetworkSpec{
-		Annotations: swarmapi.Annotations{
-			Name:   create.Name,
-			Labels: create.Labels,
-		},
-		DriverConfig: &swarmapi.Driver{
-			Name:    create.Driver,
-			Options: create.Options,
-		},
-		Ipv6Enabled: create.EnableIPv6,
-		Internal:    create.Internal,
-		Attachable:  create.Attachable,
-	}
-	if create.IPAM != nil {
-		driver := create.IPAM.Driver
-		if driver == "" {
-			driver = "default"
-		}
-		ns.IPAM = &swarmapi.IPAMOptions{
-			Driver: &swarmapi.Driver{
-				Name:    driver,
-				Options: create.IPAM.Options,
-			},
-		}
-		ipamSpec := make([]*swarmapi.IPAMConfig, 0, len(create.IPAM.Config))
-		for _, ipamConfig := range create.IPAM.Config {
-			ipamSpec = append(ipamSpec, &swarmapi.IPAMConfig{
-				Subnet:  ipamConfig.Subnet,
-				Range:   ipamConfig.IPRange,
-				Gateway: ipamConfig.Gateway,
-			})
-		}
-		ns.IPAM.Configs = ipamSpec
-	}
-	return ns
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/node.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/node.go
deleted file mode 100644
index 306f34e0b2..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/node.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"strings"
-
-	types "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-// NodeFromGRPC converts a grpc Node to a Node.
-func NodeFromGRPC(n swarmapi.Node) types.Node {
-	node := types.Node{
-		ID: n.ID,
-		Spec: types.NodeSpec{
-			Role:         types.NodeRole(strings.ToLower(n.Spec.Role.String())),
-			Availability: types.NodeAvailability(strings.ToLower(n.Spec.Availability.String())),
-		},
-		Status: types.NodeStatus{
-			State:   types.NodeState(strings.ToLower(n.Status.State.String())),
-			Message: n.Status.Message,
-			Addr:    n.Status.Addr,
-		},
-	}
-
-	// Meta
-	node.Version.Index = n.Meta.Version.Index
-	node.CreatedAt, _ = ptypes.Timestamp(n.Meta.CreatedAt)
-	node.UpdatedAt, _ = ptypes.Timestamp(n.Meta.UpdatedAt)
-
-	//Annotations
-	node.Spec.Name = n.Spec.Annotations.Name
-	node.Spec.Labels = n.Spec.Annotations.Labels
-
-	//Description
-	if n.Description != nil {
-		node.Description.Hostname = n.Description.Hostname
-		if n.Description.Platform != nil {
-			node.Description.Platform.Architecture = n.Description.Platform.Architecture
-			node.Description.Platform.OS = n.Description.Platform.OS
-		}
-		if n.Description.Resources != nil {
-			node.Description.Resources.NanoCPUs = n.Description.Resources.NanoCPUs
-			node.Description.Resources.MemoryBytes = n.Description.Resources.MemoryBytes
-		}
-		if n.Description.Engine != nil {
-			node.Description.Engine.EngineVersion = n.Description.Engine.EngineVersion
-			node.Description.Engine.Labels = n.Description.Engine.Labels
-			for _, plugin := range n.Description.Engine.Plugins {
-				node.Description.Engine.Plugins = append(node.Description.Engine.Plugins, types.PluginDescription{Type: plugin.Type, Name: plugin.Name})
-			}
-		}
-	}
-
-	//Manager
-	if n.ManagerStatus != nil {
-		node.ManagerStatus = &types.ManagerStatus{
-			Leader:       n.ManagerStatus.Leader,
-			Reachability: types.Reachability(strings.ToLower(n.ManagerStatus.Reachability.String())),
-			Addr:         n.ManagerStatus.Addr,
-		}
-	}
-
-	return node
-}
-
-// NodeSpecToGRPC converts a NodeSpec to a grpc NodeSpec.
-func NodeSpecToGRPC(s types.NodeSpec) (swarmapi.NodeSpec, error) {
-	spec := swarmapi.NodeSpec{
-		Annotations: swarmapi.Annotations{
-			Name:   s.Name,
-			Labels: s.Labels,
-		},
-	}
-	if role, ok := swarmapi.NodeRole_value[strings.ToUpper(string(s.Role))]; ok {
-		spec.Role = swarmapi.NodeRole(role)
-	} else {
-		return swarmapi.NodeSpec{}, fmt.Errorf("invalid Role: %q", s.Role)
-	}
-
-	if availability, ok := swarmapi.NodeSpec_Availability_value[strings.ToUpper(string(s.Availability))]; ok {
-		spec.Availability = swarmapi.NodeSpec_Availability(availability)
-	} else {
-		return swarmapi.NodeSpec{}, fmt.Errorf("invalid Availability: %q", s.Availability)
-	}
-
-	return spec, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/secret.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/secret.go
deleted file mode 100644
index 3e966873f4..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/secret.go
+++ /dev/null
@@ -1,64 +0,0 @@
-package convert
-
-import (
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-// SecretFromGRPC converts a grpc Secret to a Secret.
-func SecretFromGRPC(s *swarmapi.Secret) swarmtypes.Secret {
-	secret := swarmtypes.Secret{
-		ID: s.ID,
-		Spec: swarmtypes.SecretSpec{
-			Annotations: swarmtypes.Annotations{
-				Name:   s.Spec.Annotations.Name,
-				Labels: s.Spec.Annotations.Labels,
-			},
-			Data: s.Spec.Data,
-		},
-	}
-
-	secret.Version.Index = s.Meta.Version.Index
-	// Meta
-	secret.CreatedAt, _ = ptypes.Timestamp(s.Meta.CreatedAt)
-	secret.UpdatedAt, _ = ptypes.Timestamp(s.Meta.UpdatedAt)
-
-	return secret
-}
-
-// SecretSpecToGRPC converts Secret to a grpc Secret.
-func SecretSpecToGRPC(s swarmtypes.SecretSpec) swarmapi.SecretSpec {
-	return swarmapi.SecretSpec{
-		Annotations: swarmapi.Annotations{
-			Name:   s.Name,
-			Labels: s.Labels,
-		},
-		Data: s.Data,
-	}
-}
-
-// SecretReferencesFromGRPC converts a slice of grpc SecretReference to SecretReference
-func SecretReferencesFromGRPC(s []*swarmapi.SecretReference) []*swarmtypes.SecretReference {
-	refs := []*swarmtypes.SecretReference{}
-
-	for _, r := range s {
-		ref := &swarmtypes.SecretReference{
-			SecretID:   r.SecretID,
-			SecretName: r.SecretName,
-		}
-
-		if t, ok := r.Target.(*swarmapi.SecretReference_File); ok {
-			ref.File = &swarmtypes.SecretReferenceFileTarget{
-				Name: t.File.Name,
-				UID:  t.File.UID,
-				GID:  t.File.GID,
-				Mode: t.File.Mode,
-			}
-		}
-
-		refs = append(refs, ref)
-	}
-
-	return refs
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/service.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/service.go
deleted file mode 100644
index aa68e01f44..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/service.go
+++ /dev/null
@@ -1,366 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"strings"
-
-	types "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/namesgenerator"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-// ServiceFromGRPC converts a grpc Service to a Service.
-func ServiceFromGRPC(s swarmapi.Service) types.Service {
-	service := types.Service{
-		ID:           s.ID,
-		Spec:         *serviceSpecFromGRPC(&s.Spec),
-		PreviousSpec: serviceSpecFromGRPC(s.PreviousSpec),
-
-		Endpoint: endpointFromGRPC(s.Endpoint),
-	}
-
-	// Meta
-	service.Version.Index = s.Meta.Version.Index
-	service.CreatedAt, _ = ptypes.Timestamp(s.Meta.CreatedAt)
-	service.UpdatedAt, _ = ptypes.Timestamp(s.Meta.UpdatedAt)
-
-	// UpdateStatus
-	service.UpdateStatus = types.UpdateStatus{}
-	if s.UpdateStatus != nil {
-		switch s.UpdateStatus.State {
-		case swarmapi.UpdateStatus_UPDATING:
-			service.UpdateStatus.State = types.UpdateStateUpdating
-		case swarmapi.UpdateStatus_PAUSED:
-			service.UpdateStatus.State = types.UpdateStatePaused
-		case swarmapi.UpdateStatus_COMPLETED:
-			service.UpdateStatus.State = types.UpdateStateCompleted
-		}
-
-		service.UpdateStatus.StartedAt, _ = ptypes.Timestamp(s.UpdateStatus.StartedAt)
-		service.UpdateStatus.CompletedAt, _ = ptypes.Timestamp(s.UpdateStatus.CompletedAt)
-		service.UpdateStatus.Message = s.UpdateStatus.Message
-	}
-
-	return service
-}
-
-func serviceSpecFromGRPC(spec *swarmapi.ServiceSpec) *types.ServiceSpec {
-	if spec == nil {
-		return nil
-	}
-
-	serviceNetworks := make([]types.NetworkAttachmentConfig, 0, len(spec.Networks))
-	for _, n := range spec.Networks {
-		serviceNetworks = append(serviceNetworks, types.NetworkAttachmentConfig{Target: n.Target, Aliases: n.Aliases})
-	}
-
-	taskNetworks := make([]types.NetworkAttachmentConfig, 0, len(spec.Task.Networks))
-	for _, n := range spec.Task.Networks {
-		taskNetworks = append(taskNetworks, types.NetworkAttachmentConfig{Target: n.Target, Aliases: n.Aliases})
-	}
-
-	containerConfig := spec.Task.Runtime.(*swarmapi.TaskSpec_Container).Container
-	convertedSpec := &types.ServiceSpec{
-		Annotations: types.Annotations{
-			Name:   spec.Annotations.Name,
-			Labels: spec.Annotations.Labels,
-		},
-
-		TaskTemplate: types.TaskSpec{
-			ContainerSpec: containerSpecFromGRPC(containerConfig),
-			Resources:     resourcesFromGRPC(spec.Task.Resources),
-			RestartPolicy: restartPolicyFromGRPC(spec.Task.Restart),
-			Placement:     placementFromGRPC(spec.Task.Placement),
-			LogDriver:     driverFromGRPC(spec.Task.LogDriver),
-			Networks:      taskNetworks,
-			ForceUpdate:   spec.Task.ForceUpdate,
-		},
-
-		Networks:     serviceNetworks,
-		EndpointSpec: endpointSpecFromGRPC(spec.Endpoint),
-	}
-
-	// UpdateConfig
-	if spec.Update != nil {
-		convertedSpec.UpdateConfig = &types.UpdateConfig{
-			Parallelism:     spec.Update.Parallelism,
-			MaxFailureRatio: spec.Update.MaxFailureRatio,
-		}
-
-		convertedSpec.UpdateConfig.Delay, _ = ptypes.Duration(&spec.Update.Delay)
-		if spec.Update.Monitor != nil {
-			convertedSpec.UpdateConfig.Monitor, _ = ptypes.Duration(spec.Update.Monitor)
-		}
-
-		switch spec.Update.FailureAction {
-		case swarmapi.UpdateConfig_PAUSE:
-			convertedSpec.UpdateConfig.FailureAction = types.UpdateFailureActionPause
-		case swarmapi.UpdateConfig_CONTINUE:
-			convertedSpec.UpdateConfig.FailureAction = types.UpdateFailureActionContinue
-		}
-	}
-
-	// Mode
-	switch t := spec.GetMode().(type) {
-	case *swarmapi.ServiceSpec_Global:
-		convertedSpec.Mode.Global = &types.GlobalService{}
-	case *swarmapi.ServiceSpec_Replicated:
-		convertedSpec.Mode.Replicated = &types.ReplicatedService{
-			Replicas: &t.Replicated.Replicas,
-		}
-	}
-
-	return convertedSpec
-}
-
-// ServiceSpecToGRPC converts a ServiceSpec to a grpc ServiceSpec.
-func ServiceSpecToGRPC(s types.ServiceSpec) (swarmapi.ServiceSpec, error) {
-	name := s.Name
-	if name == "" {
-		name = namesgenerator.GetRandomName(0)
-	}
-
-	serviceNetworks := make([]*swarmapi.NetworkAttachmentConfig, 0, len(s.Networks))
-	for _, n := range s.Networks {
-		serviceNetworks = append(serviceNetworks, &swarmapi.NetworkAttachmentConfig{Target: n.Target, Aliases: n.Aliases})
-	}
-
-	taskNetworks := make([]*swarmapi.NetworkAttachmentConfig, 0, len(s.TaskTemplate.Networks))
-	for _, n := range s.TaskTemplate.Networks {
-		taskNetworks = append(taskNetworks, &swarmapi.NetworkAttachmentConfig{Target: n.Target, Aliases: n.Aliases})
-	}
-
-	spec := swarmapi.ServiceSpec{
-		Annotations: swarmapi.Annotations{
-			Name:   name,
-			Labels: s.Labels,
-		},
-		Task: swarmapi.TaskSpec{
-			Resources:   resourcesToGRPC(s.TaskTemplate.Resources),
-			LogDriver:   driverToGRPC(s.TaskTemplate.LogDriver),
-			Networks:    taskNetworks,
-			ForceUpdate: s.TaskTemplate.ForceUpdate,
-		},
-		Networks: serviceNetworks,
-	}
-
-	containerSpec, err := containerToGRPC(s.TaskTemplate.ContainerSpec)
-	if err != nil {
-		return swarmapi.ServiceSpec{}, err
-	}
-	spec.Task.Runtime = &swarmapi.TaskSpec_Container{Container: containerSpec}
-
-	restartPolicy, err := restartPolicyToGRPC(s.TaskTemplate.RestartPolicy)
-	if err != nil {
-		return swarmapi.ServiceSpec{}, err
-	}
-	spec.Task.Restart = restartPolicy
-
-	if s.TaskTemplate.Placement != nil {
-		spec.Task.Placement = &swarmapi.Placement{
-			Constraints: s.TaskTemplate.Placement.Constraints,
-		}
-	}
-
-	if s.UpdateConfig != nil {
-		var failureAction swarmapi.UpdateConfig_FailureAction
-		switch s.UpdateConfig.FailureAction {
-		case types.UpdateFailureActionPause, "":
-			failureAction = swarmapi.UpdateConfig_PAUSE
-		case types.UpdateFailureActionContinue:
-			failureAction = swarmapi.UpdateConfig_CONTINUE
-		default:
-			return swarmapi.ServiceSpec{}, fmt.Errorf("unrecongized update failure action %s", s.UpdateConfig.FailureAction)
-		}
-		spec.Update = &swarmapi.UpdateConfig{
-			Parallelism:     s.UpdateConfig.Parallelism,
-			Delay:           *ptypes.DurationProto(s.UpdateConfig.Delay),
-			FailureAction:   failureAction,
-			MaxFailureRatio: s.UpdateConfig.MaxFailureRatio,
-		}
-		if s.UpdateConfig.Monitor != 0 {
-			spec.Update.Monitor = ptypes.DurationProto(s.UpdateConfig.Monitor)
-		}
-	}
-
-	if s.EndpointSpec != nil {
-		if s.EndpointSpec.Mode != "" &&
-			s.EndpointSpec.Mode != types.ResolutionModeVIP &&
-			s.EndpointSpec.Mode != types.ResolutionModeDNSRR {
-			return swarmapi.ServiceSpec{}, fmt.Errorf("invalid resolution mode: %q", s.EndpointSpec.Mode)
-		}
-
-		spec.Endpoint = &swarmapi.EndpointSpec{}
-
-		spec.Endpoint.Mode = swarmapi.EndpointSpec_ResolutionMode(swarmapi.EndpointSpec_ResolutionMode_value[strings.ToUpper(string(s.EndpointSpec.Mode))])
-
-		for _, portConfig := range s.EndpointSpec.Ports {
-			spec.Endpoint.Ports = append(spec.Endpoint.Ports, &swarmapi.PortConfig{
-				Name:          portConfig.Name,
-				Protocol:      swarmapi.PortConfig_Protocol(swarmapi.PortConfig_Protocol_value[strings.ToUpper(string(portConfig.Protocol))]),
-				PublishMode:   swarmapi.PortConfig_PublishMode(swarmapi.PortConfig_PublishMode_value[strings.ToUpper(string(portConfig.PublishMode))]),
-				TargetPort:    portConfig.TargetPort,
-				PublishedPort: portConfig.PublishedPort,
-			})
-		}
-	}
-
-	// Mode
-	if s.Mode.Global != nil && s.Mode.Replicated != nil {
-		return swarmapi.ServiceSpec{}, fmt.Errorf("cannot specify both replicated mode and global mode")
-	}
-
-	if s.Mode.Global != nil {
-		spec.Mode = &swarmapi.ServiceSpec_Global{
-			Global: &swarmapi.GlobalService{},
-		}
-	} else if s.Mode.Replicated != nil && s.Mode.Replicated.Replicas != nil {
-		spec.Mode = &swarmapi.ServiceSpec_Replicated{
-			Replicated: &swarmapi.ReplicatedService{Replicas: *s.Mode.Replicated.Replicas},
-		}
-	} else {
-		spec.Mode = &swarmapi.ServiceSpec_Replicated{
-			Replicated: &swarmapi.ReplicatedService{Replicas: 1},
-		}
-	}
-
-	return spec, nil
-}
-
-func resourcesFromGRPC(res *swarmapi.ResourceRequirements) *types.ResourceRequirements {
-	var resources *types.ResourceRequirements
-	if res != nil {
-		resources = &types.ResourceRequirements{}
-		if res.Limits != nil {
-			resources.Limits = &types.Resources{
-				NanoCPUs:    res.Limits.NanoCPUs,
-				MemoryBytes: res.Limits.MemoryBytes,
-			}
-		}
-		if res.Reservations != nil {
-			resources.Reservations = &types.Resources{
-				NanoCPUs:    res.Reservations.NanoCPUs,
-				MemoryBytes: res.Reservations.MemoryBytes,
-			}
-		}
-	}
-
-	return resources
-}
-
-func resourcesToGRPC(res *types.ResourceRequirements) *swarmapi.ResourceRequirements {
-	var reqs *swarmapi.ResourceRequirements
-	if res != nil {
-		reqs = &swarmapi.ResourceRequirements{}
-		if res.Limits != nil {
-			reqs.Limits = &swarmapi.Resources{
-				NanoCPUs:    res.Limits.NanoCPUs,
-				MemoryBytes: res.Limits.MemoryBytes,
-			}
-		}
-		if res.Reservations != nil {
-			reqs.Reservations = &swarmapi.Resources{
-				NanoCPUs:    res.Reservations.NanoCPUs,
-				MemoryBytes: res.Reservations.MemoryBytes,
-			}
-
-		}
-	}
-	return reqs
-}
-
-func restartPolicyFromGRPC(p *swarmapi.RestartPolicy) *types.RestartPolicy {
-	var rp *types.RestartPolicy
-	if p != nil {
-		rp = &types.RestartPolicy{}
-
-		switch p.Condition {
-		case swarmapi.RestartOnNone:
-			rp.Condition = types.RestartPolicyConditionNone
-		case swarmapi.RestartOnFailure:
-			rp.Condition = types.RestartPolicyConditionOnFailure
-		case swarmapi.RestartOnAny:
-			rp.Condition = types.RestartPolicyConditionAny
-		default:
-			rp.Condition = types.RestartPolicyConditionAny
-		}
-
-		if p.Delay != nil {
-			delay, _ := ptypes.Duration(p.Delay)
-			rp.Delay = &delay
-		}
-		if p.Window != nil {
-			window, _ := ptypes.Duration(p.Window)
-			rp.Window = &window
-		}
-
-		rp.MaxAttempts = &p.MaxAttempts
-	}
-	return rp
-}
-
-func restartPolicyToGRPC(p *types.RestartPolicy) (*swarmapi.RestartPolicy, error) {
-	var rp *swarmapi.RestartPolicy
-	if p != nil {
-		rp = &swarmapi.RestartPolicy{}
-
-		switch p.Condition {
-		case types.RestartPolicyConditionNone:
-			rp.Condition = swarmapi.RestartOnNone
-		case types.RestartPolicyConditionOnFailure:
-			rp.Condition = swarmapi.RestartOnFailure
-		case types.RestartPolicyConditionAny:
-			rp.Condition = swarmapi.RestartOnAny
-		default:
-			if string(p.Condition) != "" {
-				return nil, fmt.Errorf("invalid RestartCondition: %q", p.Condition)
-			}
-			rp.Condition = swarmapi.RestartOnAny
-		}
-
-		if p.Delay != nil {
-			rp.Delay = ptypes.DurationProto(*p.Delay)
-		}
-		if p.Window != nil {
-			rp.Window = ptypes.DurationProto(*p.Window)
-		}
-		if p.MaxAttempts != nil {
-			rp.MaxAttempts = *p.MaxAttempts
-
-		}
-	}
-	return rp, nil
-}
-
-func placementFromGRPC(p *swarmapi.Placement) *types.Placement {
-	var r *types.Placement
-	if p != nil {
-		r = &types.Placement{}
-		r.Constraints = p.Constraints
-	}
-
-	return r
-}
-
-func driverFromGRPC(p *swarmapi.Driver) *types.Driver {
-	if p == nil {
-		return nil
-	}
-
-	return &types.Driver{
-		Name:    p.Name,
-		Options: p.Options,
-	}
-}
-
-func driverToGRPC(p *types.Driver) *swarmapi.Driver {
-	if p == nil {
-		return nil
-	}
-
-	return &swarmapi.Driver{
-		Name:    p.Name,
-		Options: p.Options,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/swarm.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/swarm.go
deleted file mode 100644
index 606e00a69b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/swarm.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package convert
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	types "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-// SwarmFromGRPC converts a grpc Cluster to a Swarm.
-func SwarmFromGRPC(c swarmapi.Cluster) types.Swarm {
-	swarm := types.Swarm{
-		ClusterInfo: types.ClusterInfo{
-			ID: c.ID,
-			Spec: types.Spec{
-				Orchestration: types.OrchestrationConfig{
-					TaskHistoryRetentionLimit: &c.Spec.Orchestration.TaskHistoryRetentionLimit,
-				},
-				Raft: types.RaftConfig{
-					SnapshotInterval:           c.Spec.Raft.SnapshotInterval,
-					KeepOldSnapshots:           &c.Spec.Raft.KeepOldSnapshots,
-					LogEntriesForSlowFollowers: c.Spec.Raft.LogEntriesForSlowFollowers,
-					HeartbeatTick:              int(c.Spec.Raft.HeartbeatTick),
-					ElectionTick:               int(c.Spec.Raft.ElectionTick),
-				},
-				EncryptionConfig: types.EncryptionConfig{
-					AutoLockManagers: c.Spec.EncryptionConfig.AutoLockManagers,
-				},
-			},
-		},
-		JoinTokens: types.JoinTokens{
-			Worker:  c.RootCA.JoinTokens.Worker,
-			Manager: c.RootCA.JoinTokens.Manager,
-		},
-	}
-
-	heartbeatPeriod, _ := ptypes.Duration(c.Spec.Dispatcher.HeartbeatPeriod)
-	swarm.Spec.Dispatcher.HeartbeatPeriod = heartbeatPeriod
-
-	swarm.Spec.CAConfig.NodeCertExpiry, _ = ptypes.Duration(c.Spec.CAConfig.NodeCertExpiry)
-
-	for _, ca := range c.Spec.CAConfig.ExternalCAs {
-		swarm.Spec.CAConfig.ExternalCAs = append(swarm.Spec.CAConfig.ExternalCAs, &types.ExternalCA{
-			Protocol: types.ExternalCAProtocol(strings.ToLower(ca.Protocol.String())),
-			URL:      ca.URL,
-			Options:  ca.Options,
-		})
-	}
-
-	// Meta
-	swarm.Version.Index = c.Meta.Version.Index
-	swarm.CreatedAt, _ = ptypes.Timestamp(c.Meta.CreatedAt)
-	swarm.UpdatedAt, _ = ptypes.Timestamp(c.Meta.UpdatedAt)
-
-	// Annotations
-	swarm.Spec.Name = c.Spec.Annotations.Name
-	swarm.Spec.Labels = c.Spec.Annotations.Labels
-
-	return swarm
-}
-
-// SwarmSpecToGRPC converts a Spec to a grpc ClusterSpec.
-func SwarmSpecToGRPC(s types.Spec) (swarmapi.ClusterSpec, error) {
-	return MergeSwarmSpecToGRPC(s, swarmapi.ClusterSpec{})
-}
-
-// MergeSwarmSpecToGRPC merges a Spec with an initial grpc ClusterSpec
-func MergeSwarmSpecToGRPC(s types.Spec, spec swarmapi.ClusterSpec) (swarmapi.ClusterSpec, error) {
-	// We take the initSpec (either created from scratch, or returned by swarmkit),
-	// and will only change the value if the one taken from types.Spec is not nil or 0.
-	// In other words, if the value taken from types.Spec is nil or 0, we will maintain the status quo.
-	if s.Annotations.Name != "" {
-		spec.Annotations.Name = s.Annotations.Name
-	}
-	if len(s.Annotations.Labels) != 0 {
-		spec.Annotations.Labels = s.Annotations.Labels
-	}
-
-	if s.Orchestration.TaskHistoryRetentionLimit != nil {
-		spec.Orchestration.TaskHistoryRetentionLimit = *s.Orchestration.TaskHistoryRetentionLimit
-	}
-	if s.Raft.SnapshotInterval != 0 {
-		spec.Raft.SnapshotInterval = s.Raft.SnapshotInterval
-	}
-	if s.Raft.KeepOldSnapshots != nil {
-		spec.Raft.KeepOldSnapshots = *s.Raft.KeepOldSnapshots
-	}
-	if s.Raft.LogEntriesForSlowFollowers != 0 {
-		spec.Raft.LogEntriesForSlowFollowers = s.Raft.LogEntriesForSlowFollowers
-	}
-	if s.Raft.HeartbeatTick != 0 {
-		spec.Raft.HeartbeatTick = uint32(s.Raft.HeartbeatTick)
-	}
-	if s.Raft.ElectionTick != 0 {
-		spec.Raft.ElectionTick = uint32(s.Raft.ElectionTick)
-	}
-	if s.Dispatcher.HeartbeatPeriod != 0 {
-		spec.Dispatcher.HeartbeatPeriod = ptypes.DurationProto(time.Duration(s.Dispatcher.HeartbeatPeriod))
-	}
-	if s.CAConfig.NodeCertExpiry != 0 {
-		spec.CAConfig.NodeCertExpiry = ptypes.DurationProto(s.CAConfig.NodeCertExpiry)
-	}
-
-	for _, ca := range s.CAConfig.ExternalCAs {
-		protocol, ok := swarmapi.ExternalCA_CAProtocol_value[strings.ToUpper(string(ca.Protocol))]
-		if !ok {
-			return swarmapi.ClusterSpec{}, fmt.Errorf("invalid protocol: %q", ca.Protocol)
-		}
-		spec.CAConfig.ExternalCAs = append(spec.CAConfig.ExternalCAs, &swarmapi.ExternalCA{
-			Protocol: swarmapi.ExternalCA_CAProtocol(protocol),
-			URL:      ca.URL,
-			Options:  ca.Options,
-		})
-	}
-
-	spec.EncryptionConfig.AutoLockManagers = s.EncryptionConfig.AutoLockManagers
-
-	return spec, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/task.go b/installer/vendor/github.com/docker/docker/daemon/cluster/convert/task.go
deleted file mode 100644
index d0cf89c288..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/convert/task.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package convert
-
-import (
-	"strings"
-
-	types "github.com/docker/docker/api/types/swarm"
-	swarmapi "github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-)
-
-// TaskFromGRPC converts a grpc Task to a Task.
-func TaskFromGRPC(t swarmapi.Task) types.Task {
-	if t.Spec.GetAttachment() != nil {
-		return types.Task{}
-	}
-	containerConfig := t.Spec.Runtime.(*swarmapi.TaskSpec_Container).Container
-	containerStatus := t.Status.GetContainer()
-	networks := make([]types.NetworkAttachmentConfig, 0, len(t.Spec.Networks))
-	for _, n := range t.Spec.Networks {
-		networks = append(networks, types.NetworkAttachmentConfig{Target: n.Target, Aliases: n.Aliases})
-	}
-
-	task := types.Task{
-		ID: t.ID,
-		Annotations: types.Annotations{
-			Name:   t.Annotations.Name,
-			Labels: t.Annotations.Labels,
-		},
-		ServiceID: t.ServiceID,
-		Slot:      int(t.Slot),
-		NodeID:    t.NodeID,
-		Spec: types.TaskSpec{
-			ContainerSpec: containerSpecFromGRPC(containerConfig),
-			Resources:     resourcesFromGRPC(t.Spec.Resources),
-			RestartPolicy: restartPolicyFromGRPC(t.Spec.Restart),
-			Placement:     placementFromGRPC(t.Spec.Placement),
-			LogDriver:     driverFromGRPC(t.Spec.LogDriver),
-			Networks:      networks,
-		},
-		Status: types.TaskStatus{
-			State:   types.TaskState(strings.ToLower(t.Status.State.String())),
-			Message: t.Status.Message,
-			Err:     t.Status.Err,
-		},
-		DesiredState: types.TaskState(strings.ToLower(t.DesiredState.String())),
-	}
-
-	// Meta
-	task.Version.Index = t.Meta.Version.Index
-	task.CreatedAt, _ = ptypes.Timestamp(t.Meta.CreatedAt)
-	task.UpdatedAt, _ = ptypes.Timestamp(t.Meta.UpdatedAt)
-
-	task.Status.Timestamp, _ = ptypes.Timestamp(t.Status.Timestamp)
-
-	if containerStatus != nil {
-		task.Status.ContainerStatus.ContainerID = containerStatus.ContainerID
-		task.Status.ContainerStatus.PID = int(containerStatus.PID)
-		task.Status.ContainerStatus.ExitCode = int(containerStatus.ExitCode)
-	}
-
-	// NetworksAttachments
-	for _, na := range t.Networks {
-		task.NetworksAttachments = append(task.NetworksAttachments, networkAttachementFromGRPC(na))
-	}
-
-	if t.Status.PortStatus == nil {
-		return task
-	}
-
-	for _, p := range t.Status.PortStatus.Ports {
-		task.Status.PortStatus.Ports = append(task.Status.PortStatus.Ports, types.PortConfig{
-			Name:          p.Name,
-			Protocol:      types.PortConfigProtocol(strings.ToLower(swarmapi.PortConfig_Protocol_name[int32(p.Protocol)])),
-			PublishMode:   types.PortConfigPublishMode(strings.ToLower(swarmapi.PortConfig_PublishMode_name[int32(p.PublishMode)])),
-			TargetPort:    p.TargetPort,
-			PublishedPort: p.PublishedPort,
-		})
-	}
-
-	return task
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/backend.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/backend.go
deleted file mode 100644
index 0f1da38558..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/backend.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package executor
-
-import (
-	"io"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/plugin"
-	"github.com/docker/docker/reference"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/cluster"
-	networktypes "github.com/docker/libnetwork/types"
-	"github.com/docker/swarmkit/agent/exec"
-	"golang.org/x/net/context"
-)
-
-// Backend defines the executor component for a swarm agent.
-type Backend interface {
-	CreateManagedNetwork(clustertypes.NetworkCreateRequest) error
-	DeleteManagedNetwork(name string) error
-	FindNetwork(idName string) (libnetwork.Network, error)
-	SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error
-	PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error
-	CreateManagedContainer(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error)
-	ContainerStart(name string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error
-	ContainerStop(name string, seconds *int) error
-	ContainerLogs(context.Context, string, *backend.ContainerLogsConfig, chan struct{}) error
-	ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error
-	ActivateContainerServiceBinding(containerName string) error
-	DeactivateContainerServiceBinding(containerName string) error
-	UpdateContainerServiceConfig(containerName string, serviceConfig *clustertypes.ServiceConfig) error
-	ContainerInspectCurrent(name string, size bool) (*types.ContainerJSON, error)
-	ContainerWaitWithContext(ctx context.Context, name string) error
-	ContainerRm(name string, config *types.ContainerRmConfig) error
-	ContainerKill(name string, sig uint64) error
-	SetContainerSecretStore(name string, store exec.SecretGetter) error
-	SetContainerSecretReferences(name string, refs []*swarmtypes.SecretReference) error
-	SystemInfo() (*types.Info, error)
-	VolumeCreate(name, driverName string, opts, labels map[string]string) (*types.Volume, error)
-	Containers(config *types.ContainerListOptions) ([]*types.Container, error)
-	SetNetworkBootstrapKeys([]*networktypes.EncryptionKey) error
-	DaemonJoinsCluster(provider cluster.Provider)
-	DaemonLeavesCluster()
-	IsSwarmCompatible() error
-	SubscribeToEvents(since, until time.Time, filter filters.Args) ([]events.Message, chan interface{})
-	UnsubscribeFromEvents(listener chan interface{})
-	UpdateAttachment(string, string, string, *network.NetworkingConfig) error
-	WaitForDetachment(context.Context, string, string, string, string) error
-	GetRepository(context.Context, reference.NamedTagged, *types.AuthConfig) (distribution.Repository, bool, error)
-	LookupImage(name string) (*types.ImageInspect, error)
-	PluginManager() *plugin.Manager
-	PluginGetter() *plugin.Store
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/adapter.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/adapter.go
deleted file mode 100644
index f82f8b54d3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/adapter.go
+++ /dev/null
@@ -1,463 +0,0 @@
-package container
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/daemon/cluster/convert"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/docker/reference"
-	"github.com/docker/libnetwork"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-	"golang.org/x/net/context"
-	"golang.org/x/time/rate"
-)
-
-// containerAdapter conducts remote operations for a container. All calls
-// are mostly naked calls to the client API, seeded with information from
-// containerConfig.
-type containerAdapter struct {
-	backend   executorpkg.Backend
-	container *containerConfig
-	secrets   exec.SecretGetter
-}
-
-func newContainerAdapter(b executorpkg.Backend, task *api.Task, secrets exec.SecretGetter) (*containerAdapter, error) {
-	ctnr, err := newContainerConfig(task)
-	if err != nil {
-		return nil, err
-	}
-
-	return &containerAdapter{
-		container: ctnr,
-		backend:   b,
-		secrets:   secrets,
-	}, nil
-}
-
-func (c *containerAdapter) pullImage(ctx context.Context) error {
-	spec := c.container.spec()
-
-	// Skip pulling if the image is referenced by image ID.
-	if _, err := digest.ParseDigest(spec.Image); err == nil {
-		return nil
-	}
-
-	// Skip pulling if the image is referenced by digest and already
-	// exists locally.
-	named, err := reference.ParseNamed(spec.Image)
-	if err == nil {
-		if _, ok := named.(reference.Canonical); ok {
-			_, err := c.backend.LookupImage(spec.Image)
-			if err == nil {
-				return nil
-			}
-		}
-	}
-
-	// if the image needs to be pulled, the auth config will be retrieved and updated
-	var encodedAuthConfig string
-	if spec.PullOptions != nil {
-		encodedAuthConfig = spec.PullOptions.RegistryAuth
-	}
-
-	authConfig := &types.AuthConfig{}
-	if encodedAuthConfig != "" {
-		if err := json.NewDecoder(base64.NewDecoder(base64.URLEncoding, strings.NewReader(encodedAuthConfig))).Decode(authConfig); err != nil {
-			logrus.Warnf("invalid authconfig: %v", err)
-		}
-	}
-
-	pr, pw := io.Pipe()
-	metaHeaders := map[string][]string{}
-	go func() {
-		err := c.backend.PullImage(ctx, c.container.image(), "", metaHeaders, authConfig, pw)
-		pw.CloseWithError(err)
-	}()
-
-	dec := json.NewDecoder(pr)
-	dec.UseNumber()
-	m := map[string]interface{}{}
-	spamLimiter := rate.NewLimiter(rate.Every(time.Second), 1)
-
-	lastStatus := ""
-	for {
-		if err := dec.Decode(&m); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-		l := log.G(ctx)
-		// limit pull progress logs unless the status changes
-		if spamLimiter.Allow() || lastStatus != m["status"] {
-			// if we have progress details, we have everything we need
-			if progress, ok := m["progressDetail"].(map[string]interface{}); ok {
-				// first, log the image and status
-				l = l.WithFields(logrus.Fields{
-					"image":  c.container.image(),
-					"status": m["status"],
-				})
-				// then, if we have progress, log the progress
-				if progress["current"] != nil && progress["total"] != nil {
-					l = l.WithFields(logrus.Fields{
-						"current": progress["current"],
-						"total":   progress["total"],
-					})
-				}
-			}
-			l.Debug("pull in progress")
-		}
-		// sometimes, we get no useful information at all, and add no fields
-		if status, ok := m["status"].(string); ok {
-			lastStatus = status
-		}
-	}
-
-	// if the final stream object contained an error, return it
-	if errMsg, ok := m["error"]; ok {
-		return fmt.Errorf("%v", errMsg)
-	}
-	return nil
-}
-
-func (c *containerAdapter) createNetworks(ctx context.Context) error {
-	for _, network := range c.container.networks() {
-		ncr, err := c.container.networkCreateRequest(network)
-		if err != nil {
-			return err
-		}
-
-		if err := c.backend.CreateManagedNetwork(ncr); err != nil { // todo name missing
-			if _, ok := err.(libnetwork.NetworkNameError); ok {
-				continue
-			}
-
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (c *containerAdapter) removeNetworks(ctx context.Context) error {
-	for _, nid := range c.container.networks() {
-		if err := c.backend.DeleteManagedNetwork(nid); err != nil {
-			switch err.(type) {
-			case *libnetwork.ActiveEndpointsError:
-				continue
-			case libnetwork.ErrNoSuchNetwork:
-				continue
-			default:
-				log.G(ctx).Errorf("network %s remove failed: %v", nid, err)
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (c *containerAdapter) networkAttach(ctx context.Context) error {
-	config := c.container.createNetworkingConfig()
-
-	var (
-		networkName string
-		networkID   string
-	)
-
-	if config != nil {
-		for n, epConfig := range config.EndpointsConfig {
-			networkName = n
-			networkID = epConfig.NetworkID
-			break
-		}
-	}
-
-	return c.backend.UpdateAttachment(networkName, networkID, c.container.id(), config)
-}
-
-func (c *containerAdapter) waitForDetach(ctx context.Context) error {
-	config := c.container.createNetworkingConfig()
-
-	var (
-		networkName string
-		networkID   string
-	)
-
-	if config != nil {
-		for n, epConfig := range config.EndpointsConfig {
-			networkName = n
-			networkID = epConfig.NetworkID
-			break
-		}
-	}
-
-	return c.backend.WaitForDetachment(ctx, networkName, networkID, c.container.taskID(), c.container.id())
-}
-
-func (c *containerAdapter) create(ctx context.Context) error {
-	var cr containertypes.ContainerCreateCreatedBody
-	var err error
-
-	if cr, err = c.backend.CreateManagedContainer(types.ContainerCreateConfig{
-		Name:       c.container.name(),
-		Config:     c.container.config(),
-		HostConfig: c.container.hostConfig(),
-		// Use the first network in container create
-		NetworkingConfig: c.container.createNetworkingConfig(),
-	}); err != nil {
-		return err
-	}
-
-	// Docker daemon currently doesn't support multiple networks in container create
-	// Connect to all other networks
-	nc := c.container.connectNetworkingConfig()
-
-	if nc != nil {
-		for n, ep := range nc.EndpointsConfig {
-			if err := c.backend.ConnectContainerToNetwork(cr.ID, n, ep); err != nil {
-				return err
-			}
-		}
-	}
-
-	container := c.container.task.Spec.GetContainer()
-	if container == nil {
-		return fmt.Errorf("unable to get container from task spec")
-	}
-
-	// configure secrets
-	if err := c.backend.SetContainerSecretStore(cr.ID, c.secrets); err != nil {
-		return err
-	}
-
-	refs := convert.SecretReferencesFromGRPC(container.Secrets)
-	if err := c.backend.SetContainerSecretReferences(cr.ID, refs); err != nil {
-		return err
-	}
-
-	if err := c.backend.UpdateContainerServiceConfig(cr.ID, c.container.serviceConfig()); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// checkMounts ensures that the provided mounts won't have any host-specific
-// problems at start up. For example, we disallow bind mounts without an
-// existing path, which slightly different from the container API.
-func (c *containerAdapter) checkMounts() error {
-	spec := c.container.spec()
-	for _, mount := range spec.Mounts {
-		switch mount.Type {
-		case api.MountTypeBind:
-			if _, err := os.Stat(mount.Source); os.IsNotExist(err) {
-				return fmt.Errorf("invalid bind mount source, source path not found: %s", mount.Source)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (c *containerAdapter) start(ctx context.Context) error {
-	if err := c.checkMounts(); err != nil {
-		return err
-	}
-
-	return c.backend.ContainerStart(c.container.name(), nil, "", "")
-}
-
-func (c *containerAdapter) inspect(ctx context.Context) (types.ContainerJSON, error) {
-	cs, err := c.backend.ContainerInspectCurrent(c.container.name(), false)
-	if ctx.Err() != nil {
-		return types.ContainerJSON{}, ctx.Err()
-	}
-	if err != nil {
-		return types.ContainerJSON{}, err
-	}
-	return *cs, nil
-}
-
-// events issues a call to the events API and returns a channel with all
-// events. The stream of events can be shutdown by cancelling the context.
-func (c *containerAdapter) events(ctx context.Context) <-chan events.Message {
-	log.G(ctx).Debugf("waiting on events")
-	buffer, l := c.backend.SubscribeToEvents(time.Time{}, time.Time{}, c.container.eventFilter())
-	eventsq := make(chan events.Message, len(buffer))
-
-	for _, event := range buffer {
-		eventsq <- event
-	}
-
-	go func() {
-		defer c.backend.UnsubscribeFromEvents(l)
-
-		for {
-			select {
-			case ev := <-l:
-				jev, ok := ev.(events.Message)
-				if !ok {
-					log.G(ctx).Warnf("unexpected event message: %q", ev)
-					continue
-				}
-				select {
-				case eventsq <- jev:
-				case <-ctx.Done():
-					return
-				}
-			case <-ctx.Done():
-				return
-			}
-		}
-	}()
-
-	return eventsq
-}
-
-func (c *containerAdapter) wait(ctx context.Context) error {
-	return c.backend.ContainerWaitWithContext(ctx, c.container.nameOrID())
-}
-
-func (c *containerAdapter) shutdown(ctx context.Context) error {
-	// Default stop grace period to nil (daemon will use the stopTimeout of the container)
-	var stopgrace *int
-	spec := c.container.spec()
-	if spec.StopGracePeriod != nil {
-		stopgraceValue := int(spec.StopGracePeriod.Seconds)
-		stopgrace = &stopgraceValue
-	}
-	return c.backend.ContainerStop(c.container.name(), stopgrace)
-}
-
-func (c *containerAdapter) terminate(ctx context.Context) error {
-	return c.backend.ContainerKill(c.container.name(), uint64(syscall.SIGKILL))
-}
-
-func (c *containerAdapter) remove(ctx context.Context) error {
-	return c.backend.ContainerRm(c.container.name(), &types.ContainerRmConfig{
-		RemoveVolume: true,
-		ForceRemove:  true,
-	})
-}
-
-func (c *containerAdapter) createVolumes(ctx context.Context) error {
-	// Create plugin volumes that are embedded inside a Mount
-	for _, mount := range c.container.task.Spec.GetContainer().Mounts {
-		if mount.Type != api.MountTypeVolume {
-			continue
-		}
-
-		if mount.VolumeOptions == nil {
-			continue
-		}
-
-		if mount.VolumeOptions.DriverConfig == nil {
-			continue
-		}
-
-		req := c.container.volumeCreateRequest(&mount)
-
-		// Check if this volume exists on the engine
-		if _, err := c.backend.VolumeCreate(req.Name, req.Driver, req.DriverOpts, req.Labels); err != nil {
-			// TODO(amitshukla): Today, volume create through the engine api does not return an error
-			// when the named volume with the same parameters already exists.
-			// It returns an error if the driver name is different - that is a valid error
-			return err
-		}
-
-	}
-
-	return nil
-}
-
-func (c *containerAdapter) activateServiceBinding() error {
-	return c.backend.ActivateContainerServiceBinding(c.container.name())
-}
-
-func (c *containerAdapter) deactivateServiceBinding() error {
-	return c.backend.DeactivateContainerServiceBinding(c.container.name())
-}
-
-func (c *containerAdapter) logs(ctx context.Context, options api.LogSubscriptionOptions) (io.ReadCloser, error) {
-	reader, writer := io.Pipe()
-
-	apiOptions := &backend.ContainerLogsConfig{
-		ContainerLogsOptions: types.ContainerLogsOptions{
-			Follow: options.Follow,
-
-			// TODO(stevvooe): Parse timestamp out of message. This
-			// absolutely needs to be done before going to production with
-			// this, at it is completely redundant.
-			Timestamps: true,
-			Details:    false, // no clue what to do with this, let's just deprecate it.
-		},
-		OutStream: writer,
-	}
-
-	if options.Since != nil {
-		since, err := ptypes.Timestamp(options.Since)
-		if err != nil {
-			return nil, err
-		}
-		apiOptions.Since = since.Format(time.RFC3339Nano)
-	}
-
-	if options.Tail < 0 {
-		// See protobuf documentation for details of how this works.
-		apiOptions.Tail = fmt.Sprint(-options.Tail - 1)
-	} else if options.Tail > 0 {
-		return nil, fmt.Errorf("tail relative to start of logs not supported via docker API")
-	}
-
-	if len(options.Streams) == 0 {
-		// empty == all
-		apiOptions.ShowStdout, apiOptions.ShowStderr = true, true
-	} else {
-		for _, stream := range options.Streams {
-			switch stream {
-			case api.LogStreamStdout:
-				apiOptions.ShowStdout = true
-			case api.LogStreamStderr:
-				apiOptions.ShowStderr = true
-			}
-		}
-	}
-
-	chStarted := make(chan struct{})
-	go func() {
-		defer writer.Close()
-		c.backend.ContainerLogs(ctx, c.container.name(), apiOptions, chStarted)
-	}()
-
-	return reader, nil
-}
-
-// todo: typed/wrapped errors
-func isContainerCreateNameConflict(err error) bool {
-	return strings.Contains(err.Error(), "Conflict. The name")
-}
-
-func isUnknownContainer(err error) bool {
-	return strings.Contains(err.Error(), "No such container:")
-}
-
-func isStoppedContainer(err error) bool {
-	return strings.Contains(err.Error(), "is already stopped")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/attachment.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/attachment.go
deleted file mode 100644
index e0ee81a8b9..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/attachment.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package container
-
-import (
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"golang.org/x/net/context"
-)
-
-// networkAttacherController implements agent.Controller against docker's API.
-//
-// networkAttacherController manages the lifecycle of network
-// attachment of a docker unmanaged container managed as a task from
-// agent point of view. It provides network attachment information to
-// the unmanaged container for it to attach to the network and run.
-type networkAttacherController struct {
-	backend executorpkg.Backend
-	task    *api.Task
-	adapter *containerAdapter
-	closed  chan struct{}
-}
-
-func newNetworkAttacherController(b executorpkg.Backend, task *api.Task, secrets exec.SecretGetter) (*networkAttacherController, error) {
-	adapter, err := newContainerAdapter(b, task, secrets)
-	if err != nil {
-		return nil, err
-	}
-
-	return &networkAttacherController{
-		backend: b,
-		task:    task,
-		adapter: adapter,
-		closed:  make(chan struct{}),
-	}, nil
-}
-
-func (nc *networkAttacherController) Update(ctx context.Context, t *api.Task) error {
-	return nil
-}
-
-func (nc *networkAttacherController) Prepare(ctx context.Context) error {
-	// Make sure all the networks that the task needs are created.
-	if err := nc.adapter.createNetworks(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (nc *networkAttacherController) Start(ctx context.Context) error {
-	return nc.adapter.networkAttach(ctx)
-}
-
-func (nc *networkAttacherController) Wait(pctx context.Context) error {
-	ctx, cancel := context.WithCancel(pctx)
-	defer cancel()
-
-	return nc.adapter.waitForDetach(ctx)
-}
-
-func (nc *networkAttacherController) Shutdown(ctx context.Context) error {
-	return nil
-}
-
-func (nc *networkAttacherController) Terminate(ctx context.Context) error {
-	return nil
-}
-
-func (nc *networkAttacherController) Remove(ctx context.Context) error {
-	// Try removing the network referenced in this task in case this
-	// task is the last one referencing it
-	if err := nc.adapter.removeNetworks(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (nc *networkAttacherController) Close() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/container.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/container.go
deleted file mode 100644
index f033ad545e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/container.go
+++ /dev/null
@@ -1,598 +0,0 @@
-package container
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/api/types"
-	enginecontainer "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	enginemount "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/network"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/reference"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-	"github.com/docker/swarmkit/template"
-)
-
-const (
-	// Explicitly use the kernel's default setting for CPU quota of 100ms.
-	// https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
-	cpuQuotaPeriod = 100 * time.Millisecond
-
-	// systemLabelPrefix represents the reserved namespace for system labels.
-	systemLabelPrefix = "com.docker.swarm"
-)
-
-// containerConfig converts task properties into docker container compatible
-// components.
-type containerConfig struct {
-	task                *api.Task
-	networksAttachments map[string]*api.NetworkAttachment
-}
-
-// newContainerConfig returns a validated container config. No methods should
-// return an error if this function returns without error.
-func newContainerConfig(t *api.Task) (*containerConfig, error) {
-	var c containerConfig
-	return &c, c.setTask(t)
-}
-
-func (c *containerConfig) setTask(t *api.Task) error {
-	if t.Spec.GetContainer() == nil && t.Spec.GetAttachment() == nil {
-		return exec.ErrRuntimeUnsupported
-	}
-
-	container := t.Spec.GetContainer()
-	if container != nil {
-		if container.Image == "" {
-			return ErrImageRequired
-		}
-
-		if err := validateMounts(container.Mounts); err != nil {
-			return err
-		}
-	}
-
-	// index the networks by name
-	c.networksAttachments = make(map[string]*api.NetworkAttachment, len(t.Networks))
-	for _, attachment := range t.Networks {
-		c.networksAttachments[attachment.Network.Spec.Annotations.Name] = attachment
-	}
-
-	c.task = t
-
-	if t.Spec.GetContainer() != nil {
-		preparedSpec, err := template.ExpandContainerSpec(t)
-		if err != nil {
-			return err
-		}
-		c.task.Spec.Runtime = &api.TaskSpec_Container{
-			Container: preparedSpec,
-		}
-	}
-
-	return nil
-}
-
-func (c *containerConfig) id() string {
-	attachment := c.task.Spec.GetAttachment()
-	if attachment == nil {
-		return ""
-	}
-
-	return attachment.ContainerID
-}
-
-func (c *containerConfig) taskID() string {
-	return c.task.ID
-}
-
-func (c *containerConfig) endpoint() *api.Endpoint {
-	return c.task.Endpoint
-}
-
-func (c *containerConfig) spec() *api.ContainerSpec {
-	return c.task.Spec.GetContainer()
-}
-
-func (c *containerConfig) nameOrID() string {
-	if c.task.Spec.GetContainer() != nil {
-		return c.name()
-	}
-
-	return c.id()
-}
-
-func (c *containerConfig) name() string {
-	if c.task.Annotations.Name != "" {
-		// if set, use the container Annotations.Name field, set in the orchestrator.
-		return c.task.Annotations.Name
-	}
-
-	slot := fmt.Sprint(c.task.Slot)
-	if slot == "" || c.task.Slot == 0 {
-		slot = c.task.NodeID
-	}
-
-	// fallback to service.slot.id.
-	return fmt.Sprintf("%s.%s.%s", c.task.ServiceAnnotations.Name, slot, c.task.ID)
-}
-
-func (c *containerConfig) image() string {
-	raw := c.spec().Image
-	ref, err := reference.ParseNamed(raw)
-	if err != nil {
-		return raw
-	}
-	return reference.WithDefaultTag(ref).String()
-}
-
-func (c *containerConfig) portBindings() nat.PortMap {
-	portBindings := nat.PortMap{}
-	if c.task.Endpoint == nil {
-		return portBindings
-	}
-
-	for _, portConfig := range c.task.Endpoint.Ports {
-		if portConfig.PublishMode != api.PublishModeHost {
-			continue
-		}
-
-		port := nat.Port(fmt.Sprintf("%d/%s", portConfig.TargetPort, strings.ToLower(portConfig.Protocol.String())))
-		binding := []nat.PortBinding{
-			{},
-		}
-
-		if portConfig.PublishedPort != 0 {
-			binding[0].HostPort = strconv.Itoa(int(portConfig.PublishedPort))
-		}
-		portBindings[port] = binding
-	}
-
-	return portBindings
-}
-
-func (c *containerConfig) exposedPorts() map[nat.Port]struct{} {
-	exposedPorts := make(map[nat.Port]struct{})
-	if c.task.Endpoint == nil {
-		return exposedPorts
-	}
-
-	for _, portConfig := range c.task.Endpoint.Ports {
-		if portConfig.PublishMode != api.PublishModeHost {
-			continue
-		}
-
-		port := nat.Port(fmt.Sprintf("%d/%s", portConfig.TargetPort, strings.ToLower(portConfig.Protocol.String())))
-		exposedPorts[port] = struct{}{}
-	}
-
-	return exposedPorts
-}
-
-func (c *containerConfig) config() *enginecontainer.Config {
-	config := &enginecontainer.Config{
-		Labels:       c.labels(),
-		Tty:          c.spec().TTY,
-		OpenStdin:    c.spec().OpenStdin,
-		User:         c.spec().User,
-		Env:          c.spec().Env,
-		Hostname:     c.spec().Hostname,
-		WorkingDir:   c.spec().Dir,
-		Image:        c.image(),
-		ExposedPorts: c.exposedPorts(),
-		Healthcheck:  c.healthcheck(),
-	}
-
-	if len(c.spec().Command) > 0 {
-		// If Command is provided, we replace the whole invocation with Command
-		// by replacing Entrypoint and specifying Cmd. Args is ignored in this
-		// case.
-		config.Entrypoint = append(config.Entrypoint, c.spec().Command...)
-		config.Cmd = append(config.Cmd, c.spec().Args...)
-	} else if len(c.spec().Args) > 0 {
-		// In this case, we assume the image has an Entrypoint and Args
-		// specifies the arguments for that entrypoint.
-		config.Cmd = c.spec().Args
-	}
-
-	return config
-}
-
-func (c *containerConfig) labels() map[string]string {
-	var (
-		system = map[string]string{
-			"task":         "", // mark as cluster task
-			"task.id":      c.task.ID,
-			"task.name":    c.name(),
-			"node.id":      c.task.NodeID,
-			"service.id":   c.task.ServiceID,
-			"service.name": c.task.ServiceAnnotations.Name,
-		}
-		labels = make(map[string]string)
-	)
-
-	// base labels are those defined in the spec.
-	for k, v := range c.spec().Labels {
-		labels[k] = v
-	}
-
-	// we then apply the overrides from the task, which may be set via the
-	// orchestrator.
-	for k, v := range c.task.Annotations.Labels {
-		labels[k] = v
-	}
-
-	// finally, we apply the system labels, which override all labels.
-	for k, v := range system {
-		labels[strings.Join([]string{systemLabelPrefix, k}, ".")] = v
-	}
-
-	return labels
-}
-
-func (c *containerConfig) mounts() []enginemount.Mount {
-	var r []enginemount.Mount
-	for _, mount := range c.spec().Mounts {
-		r = append(r, convertMount(mount))
-	}
-	return r
-}
-
-func convertMount(m api.Mount) enginemount.Mount {
-	mount := enginemount.Mount{
-		Source:   m.Source,
-		Target:   m.Target,
-		ReadOnly: m.ReadOnly,
-	}
-
-	switch m.Type {
-	case api.MountTypeBind:
-		mount.Type = enginemount.TypeBind
-	case api.MountTypeVolume:
-		mount.Type = enginemount.TypeVolume
-	case api.MountTypeTmpfs:
-		mount.Type = enginemount.TypeTmpfs
-	}
-
-	if m.BindOptions != nil {
-		mount.BindOptions = &enginemount.BindOptions{}
-		switch m.BindOptions.Propagation {
-		case api.MountPropagationRPrivate:
-			mount.BindOptions.Propagation = enginemount.PropagationRPrivate
-		case api.MountPropagationPrivate:
-			mount.BindOptions.Propagation = enginemount.PropagationPrivate
-		case api.MountPropagationRSlave:
-			mount.BindOptions.Propagation = enginemount.PropagationRSlave
-		case api.MountPropagationSlave:
-			mount.BindOptions.Propagation = enginemount.PropagationSlave
-		case api.MountPropagationRShared:
-			mount.BindOptions.Propagation = enginemount.PropagationRShared
-		case api.MountPropagationShared:
-			mount.BindOptions.Propagation = enginemount.PropagationShared
-		}
-	}
-
-	if m.VolumeOptions != nil {
-		mount.VolumeOptions = &enginemount.VolumeOptions{
-			NoCopy: m.VolumeOptions.NoCopy,
-		}
-		if m.VolumeOptions.Labels != nil {
-			mount.VolumeOptions.Labels = make(map[string]string, len(m.VolumeOptions.Labels))
-			for k, v := range m.VolumeOptions.Labels {
-				mount.VolumeOptions.Labels[k] = v
-			}
-		}
-		if m.VolumeOptions.DriverConfig != nil {
-			mount.VolumeOptions.DriverConfig = &enginemount.Driver{
-				Name: m.VolumeOptions.DriverConfig.Name,
-			}
-			if m.VolumeOptions.DriverConfig.Options != nil {
-				mount.VolumeOptions.DriverConfig.Options = make(map[string]string, len(m.VolumeOptions.DriverConfig.Options))
-				for k, v := range m.VolumeOptions.DriverConfig.Options {
-					mount.VolumeOptions.DriverConfig.Options[k] = v
-				}
-			}
-		}
-	}
-
-	if m.TmpfsOptions != nil {
-		mount.TmpfsOptions = &enginemount.TmpfsOptions{
-			SizeBytes: m.TmpfsOptions.SizeBytes,
-			Mode:      m.TmpfsOptions.Mode,
-		}
-	}
-
-	return mount
-}
-
-func (c *containerConfig) healthcheck() *enginecontainer.HealthConfig {
-	hcSpec := c.spec().Healthcheck
-	if hcSpec == nil {
-		return nil
-	}
-	interval, _ := ptypes.Duration(hcSpec.Interval)
-	timeout, _ := ptypes.Duration(hcSpec.Timeout)
-	return &enginecontainer.HealthConfig{
-		Test:     hcSpec.Test,
-		Interval: interval,
-		Timeout:  timeout,
-		Retries:  int(hcSpec.Retries),
-	}
-}
-
-func (c *containerConfig) hostConfig() *enginecontainer.HostConfig {
-	hc := &enginecontainer.HostConfig{
-		Resources:    c.resources(),
-		GroupAdd:     c.spec().Groups,
-		PortBindings: c.portBindings(),
-		Mounts:       c.mounts(),
-	}
-
-	if c.spec().DNSConfig != nil {
-		hc.DNS = c.spec().DNSConfig.Nameservers
-		hc.DNSSearch = c.spec().DNSConfig.Search
-		hc.DNSOptions = c.spec().DNSConfig.Options
-	}
-
-	// The format of extra hosts on swarmkit is specified in:
-	// http://man7.org/linux/man-pages/man5/hosts.5.html
-	//    IP_address canonical_hostname [aliases...]
-	// However, the format of ExtraHosts in HostConfig is
-	//    <host>:<ip>
-	// We need to do the conversion here
-	// (Alias is ignored for now)
-	for _, entry := range c.spec().Hosts {
-		parts := strings.Fields(entry)
-		if len(parts) > 1 {
-			hc.ExtraHosts = append(hc.ExtraHosts, fmt.Sprintf("%s:%s", parts[1], parts[0]))
-		}
-	}
-
-	if c.task.LogDriver != nil {
-		hc.LogConfig = enginecontainer.LogConfig{
-			Type:   c.task.LogDriver.Name,
-			Config: c.task.LogDriver.Options,
-		}
-	}
-
-	return hc
-}
-
-// This handles the case of volumes that are defined inside a service Mount
-func (c *containerConfig) volumeCreateRequest(mount *api.Mount) *volumetypes.VolumesCreateBody {
-	var (
-		driverName string
-		driverOpts map[string]string
-		labels     map[string]string
-	)
-
-	if mount.VolumeOptions != nil && mount.VolumeOptions.DriverConfig != nil {
-		driverName = mount.VolumeOptions.DriverConfig.Name
-		driverOpts = mount.VolumeOptions.DriverConfig.Options
-		labels = mount.VolumeOptions.Labels
-	}
-
-	if mount.VolumeOptions != nil {
-		return &volumetypes.VolumesCreateBody{
-			Name:       mount.Source,
-			Driver:     driverName,
-			DriverOpts: driverOpts,
-			Labels:     labels,
-		}
-	}
-	return nil
-}
-
-func (c *containerConfig) resources() enginecontainer.Resources {
-	resources := enginecontainer.Resources{}
-
-	// If no limits are specified let the engine use its defaults.
-	//
-	// TODO(aluzzardi): We might want to set some limits anyway otherwise
-	// "unlimited" tasks will step over the reservation of other tasks.
-	r := c.task.Spec.Resources
-	if r == nil || r.Limits == nil {
-		return resources
-	}
-
-	if r.Limits.MemoryBytes > 0 {
-		resources.Memory = r.Limits.MemoryBytes
-	}
-
-	if r.Limits.NanoCPUs > 0 {
-		// CPU Period must be set in microseconds.
-		resources.CPUPeriod = int64(cpuQuotaPeriod / time.Microsecond)
-		resources.CPUQuota = r.Limits.NanoCPUs * resources.CPUPeriod / 1e9
-	}
-
-	return resources
-}
-
-// Docker daemon supports just 1 network during container create.
-func (c *containerConfig) createNetworkingConfig() *network.NetworkingConfig {
-	var networks []*api.NetworkAttachment
-	if c.task.Spec.GetContainer() != nil || c.task.Spec.GetAttachment() != nil {
-		networks = c.task.Networks
-	}
-
-	epConfig := make(map[string]*network.EndpointSettings)
-	if len(networks) > 0 {
-		epConfig[networks[0].Network.Spec.Annotations.Name] = getEndpointConfig(networks[0])
-	}
-
-	return &network.NetworkingConfig{EndpointsConfig: epConfig}
-}
-
-// TODO: Merge this function with createNetworkingConfig after daemon supports multiple networks in container create
-func (c *containerConfig) connectNetworkingConfig() *network.NetworkingConfig {
-	var networks []*api.NetworkAttachment
-	if c.task.Spec.GetContainer() != nil {
-		networks = c.task.Networks
-	}
-
-	// First network is used during container create. Other networks are used in "docker network connect"
-	if len(networks) < 2 {
-		return nil
-	}
-
-	epConfig := make(map[string]*network.EndpointSettings)
-	for _, na := range networks[1:] {
-		epConfig[na.Network.Spec.Annotations.Name] = getEndpointConfig(na)
-	}
-	return &network.NetworkingConfig{EndpointsConfig: epConfig}
-}
-
-func getEndpointConfig(na *api.NetworkAttachment) *network.EndpointSettings {
-	var ipv4, ipv6 string
-	for _, addr := range na.Addresses {
-		ip, _, err := net.ParseCIDR(addr)
-		if err != nil {
-			continue
-		}
-
-		if ip.To4() != nil {
-			ipv4 = ip.String()
-			continue
-		}
-
-		if ip.To16() != nil {
-			ipv6 = ip.String()
-		}
-	}
-
-	return &network.EndpointSettings{
-		NetworkID: na.Network.ID,
-		IPAMConfig: &network.EndpointIPAMConfig{
-			IPv4Address: ipv4,
-			IPv6Address: ipv6,
-		},
-	}
-}
-
-func (c *containerConfig) virtualIP(networkID string) string {
-	if c.task.Endpoint == nil {
-		return ""
-	}
-
-	for _, eVip := range c.task.Endpoint.VirtualIPs {
-		// We only support IPv4 VIPs for now.
-		if eVip.NetworkID == networkID {
-			vip, _, err := net.ParseCIDR(eVip.Addr)
-			if err != nil {
-				return ""
-			}
-
-			return vip.String()
-		}
-	}
-
-	return ""
-}
-
-func (c *containerConfig) serviceConfig() *clustertypes.ServiceConfig {
-	if len(c.task.Networks) == 0 {
-		return nil
-	}
-
-	logrus.Debugf("Creating service config in agent for t = %+v", c.task)
-	svcCfg := &clustertypes.ServiceConfig{
-		Name:             c.task.ServiceAnnotations.Name,
-		Aliases:          make(map[string][]string),
-		ID:               c.task.ServiceID,
-		VirtualAddresses: make(map[string]*clustertypes.VirtualAddress),
-	}
-
-	for _, na := range c.task.Networks {
-		svcCfg.VirtualAddresses[na.Network.ID] = &clustertypes.VirtualAddress{
-			// We support only IPv4 virtual IP for now.
-			IPv4: c.virtualIP(na.Network.ID),
-		}
-		if len(na.Aliases) > 0 {
-			svcCfg.Aliases[na.Network.ID] = na.Aliases
-		}
-	}
-
-	if c.task.Endpoint != nil {
-		for _, ePort := range c.task.Endpoint.Ports {
-			if ePort.PublishMode != api.PublishModeIngress {
-				continue
-			}
-
-			svcCfg.ExposedPorts = append(svcCfg.ExposedPorts, &clustertypes.PortConfig{
-				Name:          ePort.Name,
-				Protocol:      int32(ePort.Protocol),
-				TargetPort:    ePort.TargetPort,
-				PublishedPort: ePort.PublishedPort,
-			})
-		}
-	}
-
-	return svcCfg
-}
-
-// networks returns a list of network names attached to the container. The
-// returned name can be used to lookup the corresponding network create
-// options.
-func (c *containerConfig) networks() []string {
-	var networks []string
-
-	for name := range c.networksAttachments {
-		networks = append(networks, name)
-	}
-
-	return networks
-}
-
-func (c *containerConfig) networkCreateRequest(name string) (clustertypes.NetworkCreateRequest, error) {
-	na, ok := c.networksAttachments[name]
-	if !ok {
-		return clustertypes.NetworkCreateRequest{}, errors.New("container: unknown network referenced")
-	}
-
-	options := types.NetworkCreate{
-		// ID:     na.Network.ID,
-		Driver: na.Network.DriverState.Name,
-		IPAM: &network.IPAM{
-			Driver:  na.Network.IPAM.Driver.Name,
-			Options: na.Network.IPAM.Driver.Options,
-		},
-		Options:        na.Network.DriverState.Options,
-		Labels:         na.Network.Spec.Annotations.Labels,
-		Internal:       na.Network.Spec.Internal,
-		Attachable:     na.Network.Spec.Attachable,
-		EnableIPv6:     na.Network.Spec.Ipv6Enabled,
-		CheckDuplicate: true,
-	}
-
-	for _, ic := range na.Network.IPAM.Configs {
-		c := network.IPAMConfig{
-			Subnet:  ic.Subnet,
-			IPRange: ic.Range,
-			Gateway: ic.Gateway,
-		}
-		options.IPAM.Config = append(options.IPAM.Config, c)
-	}
-
-	return clustertypes.NetworkCreateRequest{na.Network.ID, types.NetworkCreateRequest{Name: name, NetworkCreate: options}}, nil
-}
-
-func (c containerConfig) eventFilter() filters.Args {
-	filter := filters.NewArgs()
-	filter.Add("type", events.ContainerEventType)
-	filter.Add("name", c.name())
-	filter.Add("label", fmt.Sprintf("%v.task.id=%v", systemLabelPrefix, c.task.ID))
-	return filter
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/controller.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/controller.go
deleted file mode 100644
index 75f286a217..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/controller.go
+++ /dev/null
@@ -1,672 +0,0 @@
-package container
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/events"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/api"
-	"github.com/docker/swarmkit/log"
-	"github.com/docker/swarmkit/protobuf/ptypes"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-	"golang.org/x/time/rate"
-)
-
-// controller implements agent.Controller against docker's API.
-//
-// Most operations against docker's API are done through the container name,
-// which is unique to the task.
-type controller struct {
-	task    *api.Task
-	adapter *containerAdapter
-	closed  chan struct{}
-	err     error
-
-	pulled     chan struct{} // closed after pull
-	cancelPull func()        // cancels pull context if not nil
-	pullErr    error         // pull error, only read after pulled closed
-}
-
-var _ exec.Controller = &controller{}
-
-// NewController returns a docker exec runner for the provided task.
-func newController(b executorpkg.Backend, task *api.Task, secrets exec.SecretGetter) (*controller, error) {
-	adapter, err := newContainerAdapter(b, task, secrets)
-	if err != nil {
-		return nil, err
-	}
-
-	return &controller{
-		task:    task,
-		adapter: adapter,
-		closed:  make(chan struct{}),
-	}, nil
-}
-
-func (r *controller) Task() (*api.Task, error) {
-	return r.task, nil
-}
-
-// ContainerStatus returns the container-specific status for the task.
-func (r *controller) ContainerStatus(ctx context.Context) (*api.ContainerStatus, error) {
-	ctnr, err := r.adapter.inspect(ctx)
-	if err != nil {
-		if isUnknownContainer(err) {
-			return nil, nil
-		}
-		return nil, err
-	}
-	return parseContainerStatus(ctnr)
-}
-
-func (r *controller) PortStatus(ctx context.Context) (*api.PortStatus, error) {
-	ctnr, err := r.adapter.inspect(ctx)
-	if err != nil {
-		if isUnknownContainer(err) {
-			return nil, nil
-		}
-
-		return nil, err
-	}
-
-	return parsePortStatus(ctnr)
-}
-
-// Update tasks a recent task update and applies it to the container.
-func (r *controller) Update(ctx context.Context, t *api.Task) error {
-	// TODO(stevvooe): While assignment of tasks is idempotent, we do allow
-	// updates of metadata, such as labelling, as well as any other properties
-	// that make sense.
-	return nil
-}
-
-// Prepare creates a container and ensures the image is pulled.
-//
-// If the container has already be created, exec.ErrTaskPrepared is returned.
-func (r *controller) Prepare(ctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	// Make sure all the networks that the task needs are created.
-	if err := r.adapter.createNetworks(ctx); err != nil {
-		return err
-	}
-
-	// Make sure all the volumes that the task needs are created.
-	if err := r.adapter.createVolumes(ctx); err != nil {
-		return err
-	}
-
-	if os.Getenv("DOCKER_SERVICE_PREFER_OFFLINE_IMAGE") != "1" {
-		if r.pulled == nil {
-			// Fork the pull to a different context to allow pull to continue
-			// on re-entrant calls to Prepare. This ensures that Prepare can be
-			// idempotent and not incur the extra cost of pulling when
-			// cancelled on updates.
-			var pctx context.Context
-
-			r.pulled = make(chan struct{})
-			pctx, r.cancelPull = context.WithCancel(context.Background()) // TODO(stevvooe): Bind a context to the entire controller.
-
-			go func() {
-				defer close(r.pulled)
-				r.pullErr = r.adapter.pullImage(pctx) // protected by closing r.pulled
-			}()
-		}
-
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-r.pulled:
-			if r.pullErr != nil {
-				// NOTE(stevvooe): We always try to pull the image to make sure we have
-				// the most up to date version. This will return an error, but we only
-				// log it. If the image truly doesn't exist, the create below will
-				// error out.
-				//
-				// This gives us some nice behavior where we use up to date versions of
-				// mutable tags, but will still run if the old image is available but a
-				// registry is down.
-				//
-				// If you don't want this behavior, lock down your image to an
-				// immutable tag or digest.
-				log.G(ctx).WithError(r.pullErr).Error("pulling image failed")
-			}
-		}
-	}
-
-	if err := r.adapter.create(ctx); err != nil {
-		if isContainerCreateNameConflict(err) {
-			if _, err := r.adapter.inspect(ctx); err != nil {
-				return err
-			}
-
-			// container is already created. success!
-			return exec.ErrTaskPrepared
-		}
-
-		return err
-	}
-
-	return nil
-}
-
-// Start the container. An error will be returned if the container is already started.
-func (r *controller) Start(ctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	ctnr, err := r.adapter.inspect(ctx)
-	if err != nil {
-		return err
-	}
-
-	// Detect whether the container has *ever* been started. If so, we don't
-	// issue the start.
-	//
-	// TODO(stevvooe): This is very racy. While reading inspect, another could
-	// start the process and we could end up starting it twice.
-	if ctnr.State.Status != "created" {
-		return exec.ErrTaskStarted
-	}
-
-	for {
-		if err := r.adapter.start(ctx); err != nil {
-			if _, ok := err.(libnetwork.ErrNoSuchNetwork); ok {
-				// Retry network creation again if we
-				// failed because some of the networks
-				// were not found.
-				if err := r.adapter.createNetworks(ctx); err != nil {
-					return err
-				}
-
-				continue
-			}
-
-			return errors.Wrap(err, "starting container failed")
-		}
-
-		break
-	}
-
-	// no health check
-	if ctnr.Config == nil || ctnr.Config.Healthcheck == nil {
-		if err := r.adapter.activateServiceBinding(); err != nil {
-			log.G(ctx).WithError(err).Errorf("failed to activate service binding for container %s which has no healthcheck config", r.adapter.container.name())
-			return err
-		}
-		return nil
-	}
-
-	healthCmd := ctnr.Config.Healthcheck.Test
-
-	if len(healthCmd) == 0 || healthCmd[0] == "NONE" {
-		return nil
-	}
-
-	// wait for container to be healthy
-	eventq := r.adapter.events(ctx)
-
-	var healthErr error
-	for {
-		select {
-		case event := <-eventq:
-			if !r.matchevent(event) {
-				continue
-			}
-
-			switch event.Action {
-			case "die": // exit on terminal events
-				ctnr, err := r.adapter.inspect(ctx)
-				if err != nil {
-					return errors.Wrap(err, "die event received")
-				} else if ctnr.State.ExitCode != 0 {
-					return &exitError{code: ctnr.State.ExitCode, cause: healthErr}
-				}
-
-				return nil
-			case "destroy":
-				// If we get here, something has gone wrong but we want to exit
-				// and report anyways.
-				return ErrContainerDestroyed
-			case "health_status: unhealthy":
-				// in this case, we stop the container and report unhealthy status
-				if err := r.Shutdown(ctx); err != nil {
-					return errors.Wrap(err, "unhealthy container shutdown failed")
-				}
-				// set health check error, and wait for container to fully exit ("die" event)
-				healthErr = ErrContainerUnhealthy
-			case "health_status: healthy":
-				if err := r.adapter.activateServiceBinding(); err != nil {
-					log.G(ctx).WithError(err).Errorf("failed to activate service binding for container %s after healthy event", r.adapter.container.name())
-					return err
-				}
-				return nil
-			}
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-r.closed:
-			return r.err
-		}
-	}
-}
-
-// Wait on the container to exit.
-func (r *controller) Wait(pctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithCancel(pctx)
-	defer cancel()
-
-	healthErr := make(chan error, 1)
-	go func() {
-		ectx, cancel := context.WithCancel(ctx) // cancel event context on first event
-		defer cancel()
-		if err := r.checkHealth(ectx); err == ErrContainerUnhealthy {
-			healthErr <- ErrContainerUnhealthy
-			if err := r.Shutdown(ectx); err != nil {
-				log.G(ectx).WithError(err).Debug("shutdown failed on unhealthy")
-			}
-		}
-	}()
-
-	err := r.adapter.wait(ctx)
-	if ctx.Err() != nil {
-		return ctx.Err()
-	}
-
-	if err != nil {
-		ee := &exitError{}
-		if ec, ok := err.(exec.ExitCoder); ok {
-			ee.code = ec.ExitCode()
-		}
-		select {
-		case e := <-healthErr:
-			ee.cause = e
-		default:
-			if err.Error() != "" {
-				ee.cause = err
-			}
-		}
-		return ee
-	}
-
-	return nil
-}
-
-// Shutdown the container cleanly.
-func (r *controller) Shutdown(ctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	if r.cancelPull != nil {
-		r.cancelPull()
-	}
-
-	// remove container from service binding
-	if err := r.adapter.deactivateServiceBinding(); err != nil {
-		log.G(ctx).WithError(err).Errorf("failed to deactivate service binding for container %s", r.adapter.container.name())
-		return err
-	}
-
-	if err := r.adapter.shutdown(ctx); err != nil {
-		if isUnknownContainer(err) || isStoppedContainer(err) {
-			return nil
-		}
-
-		return err
-	}
-
-	return nil
-}
-
-// Terminate the container, with force.
-func (r *controller) Terminate(ctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	if r.cancelPull != nil {
-		r.cancelPull()
-	}
-
-	if err := r.adapter.terminate(ctx); err != nil {
-		if isUnknownContainer(err) {
-			return nil
-		}
-
-		return err
-	}
-
-	return nil
-}
-
-// Remove the container and its resources.
-func (r *controller) Remove(ctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	if r.cancelPull != nil {
-		r.cancelPull()
-	}
-
-	// It may be necessary to shut down the task before removing it.
-	if err := r.Shutdown(ctx); err != nil {
-		if isUnknownContainer(err) {
-			return nil
-		}
-		// This may fail if the task was already shut down.
-		log.G(ctx).WithError(err).Debug("shutdown failed on removal")
-	}
-
-	// Try removing networks referenced in this task in case this
-	// task is the last one referencing it
-	if err := r.adapter.removeNetworks(ctx); err != nil {
-		if isUnknownContainer(err) {
-			return nil
-		}
-		return err
-	}
-
-	if err := r.adapter.remove(ctx); err != nil {
-		if isUnknownContainer(err) {
-			return nil
-		}
-
-		return err
-	}
-	return nil
-}
-
-// waitReady waits for a container to be "ready".
-// Ready means it's past the started state.
-func (r *controller) waitReady(pctx context.Context) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithCancel(pctx)
-	defer cancel()
-
-	eventq := r.adapter.events(ctx)
-
-	ctnr, err := r.adapter.inspect(ctx)
-	if err != nil {
-		if !isUnknownContainer(err) {
-			return errors.Wrap(err, "inspect container failed")
-		}
-	} else {
-		switch ctnr.State.Status {
-		case "running", "exited", "dead":
-			return nil
-		}
-	}
-
-	for {
-		select {
-		case event := <-eventq:
-			if !r.matchevent(event) {
-				continue
-			}
-
-			switch event.Action {
-			case "start":
-				return nil
-			}
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-r.closed:
-			return r.err
-		}
-	}
-}
-
-func (r *controller) Logs(ctx context.Context, publisher exec.LogPublisher, options api.LogSubscriptionOptions) error {
-	if err := r.checkClosed(); err != nil {
-		return err
-	}
-
-	if err := r.waitReady(ctx); err != nil {
-		return errors.Wrap(err, "container not ready for logs")
-	}
-
-	rc, err := r.adapter.logs(ctx, options)
-	if err != nil {
-		return errors.Wrap(err, "failed getting container logs")
-	}
-	defer rc.Close()
-
-	var (
-		// use a rate limiter to keep things under control but also provides some
-		// ability coalesce messages.
-		limiter = rate.NewLimiter(rate.Every(time.Second), 10<<20) // 10 MB/s
-		msgctx  = api.LogContext{
-			NodeID:    r.task.NodeID,
-			ServiceID: r.task.ServiceID,
-			TaskID:    r.task.ID,
-		}
-	)
-
-	brd := bufio.NewReader(rc)
-	for {
-		// so, message header is 8 bytes, treat as uint64, pull stream off MSB
-		var header uint64
-		if err := binary.Read(brd, binary.BigEndian, &header); err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return errors.Wrap(err, "failed reading log header")
-		}
-
-		stream, size := (header>>(7<<3))&0xFF, header & ^(uint64(0xFF)<<(7<<3))
-
-		// limit here to decrease allocation back pressure.
-		if err := limiter.WaitN(ctx, int(size)); err != nil {
-			return errors.Wrap(err, "failed rate limiter")
-		}
-
-		buf := make([]byte, size)
-		_, err := io.ReadFull(brd, buf)
-		if err != nil {
-			return errors.Wrap(err, "failed reading buffer")
-		}
-
-		// Timestamp is RFC3339Nano with 1 space after. Lop, parse, publish
-		parts := bytes.SplitN(buf, []byte(" "), 2)
-		if len(parts) != 2 {
-			return fmt.Errorf("invalid timestamp in log message: %v", buf)
-		}
-
-		ts, err := time.Parse(time.RFC3339Nano, string(parts[0]))
-		if err != nil {
-			return errors.Wrap(err, "failed to parse timestamp")
-		}
-
-		tsp, err := ptypes.TimestampProto(ts)
-		if err != nil {
-			return errors.Wrap(err, "failed to convert timestamp")
-		}
-
-		if err := publisher.Publish(ctx, api.LogMessage{
-			Context:   msgctx,
-			Timestamp: tsp,
-			Stream:    api.LogStream(stream),
-
-			Data: parts[1],
-		}); err != nil {
-			return errors.Wrap(err, "failed to publish log message")
-		}
-	}
-}
-
-// Close the runner and clean up any ephemeral resources.
-func (r *controller) Close() error {
-	select {
-	case <-r.closed:
-		return r.err
-	default:
-		if r.cancelPull != nil {
-			r.cancelPull()
-		}
-
-		r.err = exec.ErrControllerClosed
-		close(r.closed)
-	}
-	return nil
-}
-
-func (r *controller) matchevent(event events.Message) bool {
-	if event.Type != events.ContainerEventType {
-		return false
-	}
-
-	// TODO(stevvooe): Filter based on ID matching, in addition to name.
-
-	// Make sure the events are for this container.
-	if event.Actor.Attributes["name"] != r.adapter.container.name() {
-		return false
-	}
-
-	return true
-}
-
-func (r *controller) checkClosed() error {
-	select {
-	case <-r.closed:
-		return r.err
-	default:
-		return nil
-	}
-}
-
-func parseContainerStatus(ctnr types.ContainerJSON) (*api.ContainerStatus, error) {
-	status := &api.ContainerStatus{
-		ContainerID: ctnr.ID,
-		PID:         int32(ctnr.State.Pid),
-		ExitCode:    int32(ctnr.State.ExitCode),
-	}
-
-	return status, nil
-}
-
-func parsePortStatus(ctnr types.ContainerJSON) (*api.PortStatus, error) {
-	status := &api.PortStatus{}
-
-	if ctnr.NetworkSettings != nil && len(ctnr.NetworkSettings.Ports) > 0 {
-		exposedPorts, err := parsePortMap(ctnr.NetworkSettings.Ports)
-		if err != nil {
-			return nil, err
-		}
-		status.Ports = exposedPorts
-	}
-
-	return status, nil
-}
-
-func parsePortMap(portMap nat.PortMap) ([]*api.PortConfig, error) {
-	exposedPorts := make([]*api.PortConfig, 0, len(portMap))
-
-	for portProtocol, mapping := range portMap {
-		parts := strings.SplitN(string(portProtocol), "/", 2)
-		if len(parts) != 2 {
-			return nil, fmt.Errorf("invalid port mapping: %s", portProtocol)
-		}
-
-		port, err := strconv.ParseUint(parts[0], 10, 16)
-		if err != nil {
-			return nil, err
-		}
-
-		protocol := api.ProtocolTCP
-		switch strings.ToLower(parts[1]) {
-		case "tcp":
-			protocol = api.ProtocolTCP
-		case "udp":
-			protocol = api.ProtocolUDP
-		default:
-			return nil, fmt.Errorf("invalid protocol: %s", parts[1])
-		}
-
-		for _, binding := range mapping {
-			hostPort, err := strconv.ParseUint(binding.HostPort, 10, 16)
-			if err != nil {
-				return nil, err
-			}
-
-			// TODO(aluzzardi): We're losing the port `name` here since
-			// there's no way to retrieve it back from the Engine.
-			exposedPorts = append(exposedPorts, &api.PortConfig{
-				PublishMode:   api.PublishModeHost,
-				Protocol:      protocol,
-				TargetPort:    uint32(port),
-				PublishedPort: uint32(hostPort),
-			})
-		}
-	}
-
-	return exposedPorts, nil
-}
-
-type exitError struct {
-	code  int
-	cause error
-}
-
-func (e *exitError) Error() string {
-	if e.cause != nil {
-		return fmt.Sprintf("task: non-zero exit (%v): %v", e.code, e.cause)
-	}
-
-	return fmt.Sprintf("task: non-zero exit (%v)", e.code)
-}
-
-func (e *exitError) ExitCode() int {
-	return int(e.code)
-}
-
-func (e *exitError) Cause() error {
-	return e.cause
-}
-
-// checkHealth blocks until unhealthy container is detected or ctx exits
-func (r *controller) checkHealth(ctx context.Context) error {
-	eventq := r.adapter.events(ctx)
-
-	for {
-		select {
-		case <-ctx.Done():
-			return nil
-		case <-r.closed:
-			return nil
-		case event := <-eventq:
-			if !r.matchevent(event) {
-				continue
-			}
-
-			switch event.Action {
-			case "health_status: unhealthy":
-				return ErrContainerUnhealthy
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/errors.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/errors.go
deleted file mode 100644
index 63e1233566..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/errors.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package container
-
-import "fmt"
-
-var (
-	// ErrImageRequired returned if a task is missing the image definition.
-	ErrImageRequired = fmt.Errorf("dockerexec: image required")
-
-	// ErrContainerDestroyed returned when a container is prematurely destroyed
-	// during a wait call.
-	ErrContainerDestroyed = fmt.Errorf("dockerexec: container destroyed")
-
-	// ErrContainerUnhealthy returned if controller detects the health check failure
-	ErrContainerUnhealthy = fmt.Errorf("dockerexec: unhealthy container")
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/executor.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/executor.go
deleted file mode 100644
index f0dedd4530..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/executor.go
+++ /dev/null
@@ -1,194 +0,0 @@
-package container
-
-import (
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	executorpkg "github.com/docker/docker/daemon/cluster/executor"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	networktypes "github.com/docker/libnetwork/types"
-	"github.com/docker/swarmkit/agent/exec"
-	"github.com/docker/swarmkit/agent/secrets"
-	"github.com/docker/swarmkit/api"
-	"golang.org/x/net/context"
-)
-
-type executor struct {
-	backend executorpkg.Backend
-	secrets exec.SecretsManager
-}
-
-// NewExecutor returns an executor from the docker client.
-func NewExecutor(b executorpkg.Backend) exec.Executor {
-	return &executor{
-		backend: b,
-		secrets: secrets.NewManager(),
-	}
-}
-
-// Describe returns the underlying node description from the docker client.
-func (e *executor) Describe(ctx context.Context) (*api.NodeDescription, error) {
-	info, err := e.backend.SystemInfo()
-	if err != nil {
-		return nil, err
-	}
-
-	plugins := map[api.PluginDescription]struct{}{}
-	addPlugins := func(typ string, names []string) {
-		for _, name := range names {
-			plugins[api.PluginDescription{
-				Type: typ,
-				Name: name,
-			}] = struct{}{}
-		}
-	}
-
-	// add v1 plugins
-	addPlugins("Volume", info.Plugins.Volume)
-	// Add builtin driver "overlay" (the only builtin multi-host driver) to
-	// the plugin list by default.
-	addPlugins("Network", append([]string{"overlay"}, info.Plugins.Network...))
-	addPlugins("Authorization", info.Plugins.Authorization)
-
-	// add v2 plugins
-	v2Plugins, err := e.backend.PluginManager().List()
-	if err == nil {
-		for _, plgn := range v2Plugins {
-			for _, typ := range plgn.Config.Interface.Types {
-				if typ.Prefix != "docker" || !plgn.Enabled {
-					continue
-				}
-				plgnTyp := typ.Capability
-				if typ.Capability == "volumedriver" {
-					plgnTyp = "Volume"
-				} else if typ.Capability == "networkdriver" {
-					plgnTyp = "Network"
-				}
-				plugins[api.PluginDescription{
-					Type: plgnTyp,
-					Name: plgn.Name,
-				}] = struct{}{}
-			}
-		}
-	}
-
-	pluginFields := make([]api.PluginDescription, 0, len(plugins))
-	for k := range plugins {
-		pluginFields = append(pluginFields, k)
-	}
-
-	sort.Sort(sortedPlugins(pluginFields))
-
-	// parse []string labels into a map[string]string
-	labels := map[string]string{}
-	for _, l := range info.Labels {
-		stringSlice := strings.SplitN(l, "=", 2)
-		// this will take the last value in the list for a given key
-		// ideally, one shouldn't assign multiple values to the same key
-		if len(stringSlice) > 1 {
-			labels[stringSlice[0]] = stringSlice[1]
-		}
-	}
-
-	description := &api.NodeDescription{
-		Hostname: info.Name,
-		Platform: &api.Platform{
-			Architecture: info.Architecture,
-			OS:           info.OSType,
-		},
-		Engine: &api.EngineDescription{
-			EngineVersion: info.ServerVersion,
-			Labels:        labels,
-			Plugins:       pluginFields,
-		},
-		Resources: &api.Resources{
-			NanoCPUs:    int64(info.NCPU) * 1e9,
-			MemoryBytes: info.MemTotal,
-		},
-	}
-
-	return description, nil
-}
-
-func (e *executor) Configure(ctx context.Context, node *api.Node) error {
-	na := node.Attachment
-	if na == nil {
-		return nil
-	}
-
-	options := types.NetworkCreate{
-		Driver: na.Network.DriverState.Name,
-		IPAM: &network.IPAM{
-			Driver: na.Network.IPAM.Driver.Name,
-		},
-		Options:        na.Network.DriverState.Options,
-		CheckDuplicate: true,
-	}
-
-	for _, ic := range na.Network.IPAM.Configs {
-		c := network.IPAMConfig{
-			Subnet:  ic.Subnet,
-			IPRange: ic.Range,
-			Gateway: ic.Gateway,
-		}
-		options.IPAM.Config = append(options.IPAM.Config, c)
-	}
-
-	return e.backend.SetupIngress(clustertypes.NetworkCreateRequest{
-		na.Network.ID,
-		types.NetworkCreateRequest{
-			Name:          na.Network.Spec.Annotations.Name,
-			NetworkCreate: options,
-		},
-	}, na.Addresses[0])
-}
-
-// Controller returns a docker container runner.
-func (e *executor) Controller(t *api.Task) (exec.Controller, error) {
-	if t.Spec.GetAttachment() != nil {
-		return newNetworkAttacherController(e.backend, t, e.secrets)
-	}
-
-	ctlr, err := newController(e.backend, t, e.secrets)
-	if err != nil {
-		return nil, err
-	}
-
-	return ctlr, nil
-}
-
-func (e *executor) SetNetworkBootstrapKeys(keys []*api.EncryptionKey) error {
-	nwKeys := []*networktypes.EncryptionKey{}
-	for _, key := range keys {
-		nwKey := &networktypes.EncryptionKey{
-			Subsystem:   key.Subsystem,
-			Algorithm:   int32(key.Algorithm),
-			Key:         make([]byte, len(key.Key)),
-			LamportTime: key.LamportTime,
-		}
-		copy(nwKey.Key, key.Key)
-		nwKeys = append(nwKeys, nwKey)
-	}
-	e.backend.SetNetworkBootstrapKeys(nwKeys)
-
-	return nil
-}
-
-func (e *executor) Secrets() exec.SecretsManager {
-	return e.secrets
-}
-
-type sortedPlugins []api.PluginDescription
-
-func (sp sortedPlugins) Len() int { return len(sp) }
-
-func (sp sortedPlugins) Swap(i, j int) { sp[i], sp[j] = sp[j], sp[i] }
-
-func (sp sortedPlugins) Less(i, j int) bool {
-	if sp[i].Type != sp[j].Type {
-		return sp[i].Type < sp[j].Type
-	}
-	return sp[i].Name < sp[j].Name
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/health_test.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/health_test.go
deleted file mode 100644
index 99cf7502af..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/health_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// +build !windows
-
-package container
-
-import (
-	"testing"
-	"time"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/daemon/events"
-	"github.com/docker/swarmkit/api"
-	"golang.org/x/net/context"
-)
-
-func TestHealthStates(t *testing.T) {
-
-	// set up environment: events, task, container ....
-	e := events.New()
-	_, l, _ := e.Subscribe()
-	defer e.Evict(l)
-
-	task := &api.Task{
-		ID:        "id",
-		ServiceID: "sid",
-		Spec: api.TaskSpec{
-			Runtime: &api.TaskSpec_Container{
-				Container: &api.ContainerSpec{
-					Image: "image_name",
-					Labels: map[string]string{
-						"com.docker.swarm.task.id": "id",
-					},
-				},
-			},
-		},
-		Annotations: api.Annotations{Name: "name"},
-	}
-
-	c := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "id",
-			Name: "name",
-			Config: &containertypes.Config{
-				Image: "image_name",
-				Labels: map[string]string{
-					"com.docker.swarm.task.id": "id",
-				},
-			},
-		},
-	}
-
-	daemon := &daemon.Daemon{
-		EventsService: e,
-	}
-
-	controller, err := newController(daemon, task, nil)
-	if err != nil {
-		t.Fatalf("create controller fail %v", err)
-	}
-
-	errChan := make(chan error, 1)
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// fire checkHealth
-	go func() {
-		err := controller.checkHealth(ctx)
-		select {
-		case errChan <- err:
-		case <-ctx.Done():
-		}
-	}()
-
-	// send an event and expect to get expectedErr
-	// if expectedErr is nil, shouldn't get any error
-	logAndExpect := func(msg string, expectedErr error) {
-		daemon.LogContainerEvent(c, msg)
-
-		timer := time.NewTimer(1 * time.Second)
-		defer timer.Stop()
-
-		select {
-		case err := <-errChan:
-			if err != expectedErr {
-				t.Fatalf("expect error %v, but get %v", expectedErr, err)
-			}
-		case <-timer.C:
-			if expectedErr != nil {
-				t.Fatalf("time limit exceeded, didn't get expected error")
-			}
-		}
-	}
-
-	// events that are ignored by checkHealth
-	logAndExpect("health_status: running", nil)
-	logAndExpect("health_status: healthy", nil)
-	logAndExpect("die", nil)
-
-	// unhealthy event will be caught by checkHealth
-	logAndExpect("health_status: unhealthy", ErrContainerUnhealthy)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate.go
deleted file mode 100644
index 5fda1f2edb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package container
-
-import (
-	"fmt"
-	"path/filepath"
-
-	"github.com/docker/swarmkit/api"
-)
-
-func validateMounts(mounts []api.Mount) error {
-	for _, mount := range mounts {
-		// Target must always be absolute
-		if !filepath.IsAbs(mount.Target) {
-			return fmt.Errorf("invalid mount target, must be an absolute path: %s", mount.Target)
-		}
-
-		switch mount.Type {
-		// The checks on abs paths are required due to the container API confusing
-		// volume mounts as bind mounts when the source is absolute (and vice-versa)
-		// See #25253
-		// TODO: This is probably not necessary once #22373 is merged
-		case api.MountTypeBind:
-			if !filepath.IsAbs(mount.Source) {
-				return fmt.Errorf("invalid bind mount source, must be an absolute path: %s", mount.Source)
-			}
-		case api.MountTypeVolume:
-			if filepath.IsAbs(mount.Source) {
-				return fmt.Errorf("invalid volume mount source, must not be an absolute path: %s", mount.Source)
-			}
-		case api.MountTypeTmpfs:
-			if mount.Source != "" {
-				return fmt.Errorf("invalid tmpfs source, source must be empty")
-			}
-		default:
-			return fmt.Errorf("invalid mount type: %s", mount.Type)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_test.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_test.go
deleted file mode 100644
index 9d98e2c008..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package container
-
-import (
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/daemon"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/swarmkit/api"
-)
-
-func newTestControllerWithMount(m api.Mount) (*controller, error) {
-	return newController(&daemon.Daemon{}, &api.Task{
-		ID:        stringid.GenerateRandomID(),
-		ServiceID: stringid.GenerateRandomID(),
-		Spec: api.TaskSpec{
-			Runtime: &api.TaskSpec_Container{
-				Container: &api.ContainerSpec{
-					Image: "image_name",
-					Labels: map[string]string{
-						"com.docker.swarm.task.id": "id",
-					},
-					Mounts: []api.Mount{m},
-				},
-			},
-		},
-	}, nil)
-}
-
-func TestControllerValidateMountBind(t *testing.T) {
-	// with improper source
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeBind,
-		Source: "foo",
-		Target: testAbsPath,
-	}); err == nil || !strings.Contains(err.Error(), "invalid bind mount source") {
-		t.Fatalf("expected  error, got: %v", err)
-	}
-
-	// with non-existing source
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeBind,
-		Source: testAbsNonExistent,
-		Target: testAbsPath,
-	}); err != nil {
-		t.Fatalf("controller should not error at creation: %v", err)
-	}
-
-	// with proper source
-	tmpdir, err := ioutil.TempDir("", "TestControllerValidateMountBind")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.Remove(tmpdir)
-
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeBind,
-		Source: tmpdir,
-		Target: testAbsPath,
-	}); err != nil {
-		t.Fatalf("expected  error, got: %v", err)
-	}
-}
-
-func TestControllerValidateMountVolume(t *testing.T) {
-	// with improper source
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeVolume,
-		Source: testAbsPath,
-		Target: testAbsPath,
-	}); err == nil || !strings.Contains(err.Error(), "invalid volume mount source") {
-		t.Fatalf("expected error, got: %v", err)
-	}
-
-	// with proper source
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeVolume,
-		Source: "foo",
-		Target: testAbsPath,
-	}); err != nil {
-		t.Fatalf("expected error, got: %v", err)
-	}
-}
-
-func TestControllerValidateMountTarget(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestControllerValidateMountTarget")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %v", err)
-	}
-	defer os.Remove(tmpdir)
-
-	// with improper target
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeBind,
-		Source: testAbsPath,
-		Target: "foo",
-	}); err == nil || !strings.Contains(err.Error(), "invalid mount target") {
-		t.Fatalf("expected error, got: %v", err)
-	}
-
-	// with proper target
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeBind,
-		Source: tmpdir,
-		Target: testAbsPath,
-	}); err != nil {
-		t.Fatalf("expected no error, got: %v", err)
-	}
-}
-
-func TestControllerValidateMountTmpfs(t *testing.T) {
-	// with improper target
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeTmpfs,
-		Source: "foo",
-		Target: testAbsPath,
-	}); err == nil || !strings.Contains(err.Error(), "invalid tmpfs source") {
-		t.Fatalf("expected error, got: %v", err)
-	}
-
-	// with proper target
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.MountTypeTmpfs,
-		Target: testAbsPath,
-	}); err != nil {
-		t.Fatalf("expected no error, got: %v", err)
-	}
-}
-
-func TestControllerValidateMountInvalidType(t *testing.T) {
-	// with improper target
-	if _, err := newTestControllerWithMount(api.Mount{
-		Type:   api.Mount_MountType(9999),
-		Source: "foo",
-		Target: testAbsPath,
-	}); err == nil || !strings.Contains(err.Error(), "invalid mount type") {
-		t.Fatalf("expected error, got: %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_unix_test.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_unix_test.go
deleted file mode 100644
index c616eeef93..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_unix_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package container
-
-const (
-	testAbsPath        = "/foo"
-	testAbsNonExistent = "/some-non-existing-host-path/"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_windows_test.go b/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_windows_test.go
deleted file mode 100644
index c346451d3d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/executor/container/validate_windows_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build windows
-
-package container
-
-const (
-	testAbsPath        = `c:\foo`
-	testAbsNonExistent = `c:\some-non-existing-host-path\`
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/filters.go b/installer/vendor/github.com/docker/docker/daemon/cluster/filters.go
deleted file mode 100644
index 88668edaac..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/filters.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package cluster
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types/filters"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	swarmapi "github.com/docker/swarmkit/api"
-)
-
-func newListNodesFilters(filter filters.Args) (*swarmapi.ListNodesRequest_Filters, error) {
-	accepted := map[string]bool{
-		"name":       true,
-		"id":         true,
-		"label":      true,
-		"role":       true,
-		"membership": true,
-	}
-	if err := filter.Validate(accepted); err != nil {
-		return nil, err
-	}
-	f := &swarmapi.ListNodesRequest_Filters{
-		NamePrefixes: filter.Get("name"),
-		IDPrefixes:   filter.Get("id"),
-		Labels:       runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
-	}
-
-	for _, r := range filter.Get("role") {
-		if role, ok := swarmapi.NodeRole_value[strings.ToUpper(r)]; ok {
-			f.Roles = append(f.Roles, swarmapi.NodeRole(role))
-		} else if r != "" {
-			return nil, fmt.Errorf("Invalid role filter: '%s'", r)
-		}
-	}
-
-	for _, a := range filter.Get("membership") {
-		if membership, ok := swarmapi.NodeSpec_Membership_value[strings.ToUpper(a)]; ok {
-			f.Memberships = append(f.Memberships, swarmapi.NodeSpec_Membership(membership))
-		} else if a != "" {
-			return nil, fmt.Errorf("Invalid membership filter: '%s'", a)
-		}
-	}
-
-	return f, nil
-}
-
-func newListServicesFilters(filter filters.Args) (*swarmapi.ListServicesRequest_Filters, error) {
-	accepted := map[string]bool{
-		"name":  true,
-		"id":    true,
-		"label": true,
-	}
-	if err := filter.Validate(accepted); err != nil {
-		return nil, err
-	}
-	return &swarmapi.ListServicesRequest_Filters{
-		NamePrefixes: filter.Get("name"),
-		IDPrefixes:   filter.Get("id"),
-		Labels:       runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
-	}, nil
-}
-
-func newListTasksFilters(filter filters.Args, transformFunc func(filters.Args) error) (*swarmapi.ListTasksRequest_Filters, error) {
-	accepted := map[string]bool{
-		"name":          true,
-		"id":            true,
-		"label":         true,
-		"service":       true,
-		"node":          true,
-		"desired-state": true,
-	}
-	if err := filter.Validate(accepted); err != nil {
-		return nil, err
-	}
-	if transformFunc != nil {
-		if err := transformFunc(filter); err != nil {
-			return nil, err
-		}
-	}
-	f := &swarmapi.ListTasksRequest_Filters{
-		NamePrefixes: filter.Get("name"),
-		IDPrefixes:   filter.Get("id"),
-		Labels:       runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
-		ServiceIDs:   filter.Get("service"),
-		NodeIDs:      filter.Get("node"),
-	}
-
-	for _, s := range filter.Get("desired-state") {
-		if state, ok := swarmapi.TaskState_value[strings.ToUpper(s)]; ok {
-			f.DesiredStates = append(f.DesiredStates, swarmapi.TaskState(state))
-		} else if s != "" {
-			return nil, fmt.Errorf("Invalid desired-state filter: '%s'", s)
-		}
-	}
-
-	return f, nil
-}
-
-func newListSecretsFilters(filter filters.Args) (*swarmapi.ListSecretsRequest_Filters, error) {
-	accepted := map[string]bool{
-		"names": true,
-		"name":  true,
-		"id":    true,
-		"label": true,
-	}
-	if err := filter.Validate(accepted); err != nil {
-		return nil, err
-	}
-	return &swarmapi.ListSecretsRequest_Filters{
-		Names:        filter.Get("names"),
-		NamePrefixes: filter.Get("name"),
-		IDPrefixes:   filter.Get("id"),
-		Labels:       runconfigopts.ConvertKVStringsToMap(filter.Get("label")),
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/helpers.go b/installer/vendor/github.com/docker/docker/daemon/cluster/helpers.go
deleted file mode 100644
index be5bf56e87..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/helpers.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package cluster
-
-import (
-	"fmt"
-
-	swarmapi "github.com/docker/swarmkit/api"
-	"golang.org/x/net/context"
-)
-
-func getSwarm(ctx context.Context, c swarmapi.ControlClient) (*swarmapi.Cluster, error) {
-	rl, err := c.ListClusters(ctx, &swarmapi.ListClustersRequest{})
-	if err != nil {
-		return nil, err
-	}
-
-	if len(rl.Clusters) == 0 {
-		return nil, fmt.Errorf("swarm not found")
-	}
-
-	// TODO: assume one cluster only
-	return rl.Clusters[0], nil
-}
-
-func getNode(ctx context.Context, c swarmapi.ControlClient, input string) (*swarmapi.Node, error) {
-	// GetNode to match via full ID.
-	rg, err := c.GetNode(ctx, &swarmapi.GetNodeRequest{NodeID: input})
-	if err != nil {
-		// If any error (including NotFound), ListNodes to match via full name.
-		rl, err := c.ListNodes(ctx, &swarmapi.ListNodesRequest{Filters: &swarmapi.ListNodesRequest_Filters{Names: []string{input}}})
-
-		if err != nil || len(rl.Nodes) == 0 {
-			// If any error or 0 result, ListNodes to match via ID prefix.
-			rl, err = c.ListNodes(ctx, &swarmapi.ListNodesRequest{Filters: &swarmapi.ListNodesRequest_Filters{IDPrefixes: []string{input}}})
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rl.Nodes) == 0 {
-			return nil, fmt.Errorf("node %s not found", input)
-		}
-
-		if l := len(rl.Nodes); l > 1 {
-			return nil, fmt.Errorf("node %s is ambiguous (%d matches found)", input, l)
-		}
-
-		return rl.Nodes[0], nil
-	}
-	return rg.Node, nil
-}
-
-func getService(ctx context.Context, c swarmapi.ControlClient, input string) (*swarmapi.Service, error) {
-	// GetService to match via full ID.
-	rg, err := c.GetService(ctx, &swarmapi.GetServiceRequest{ServiceID: input})
-	if err != nil {
-		// If any error (including NotFound), ListServices to match via full name.
-		rl, err := c.ListServices(ctx, &swarmapi.ListServicesRequest{Filters: &swarmapi.ListServicesRequest_Filters{Names: []string{input}}})
-		if err != nil || len(rl.Services) == 0 {
-			// If any error or 0 result, ListServices to match via ID prefix.
-			rl, err = c.ListServices(ctx, &swarmapi.ListServicesRequest{Filters: &swarmapi.ListServicesRequest_Filters{IDPrefixes: []string{input}}})
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rl.Services) == 0 {
-			return nil, fmt.Errorf("service %s not found", input)
-		}
-
-		if l := len(rl.Services); l > 1 {
-			return nil, fmt.Errorf("service %s is ambiguous (%d matches found)", input, l)
-		}
-
-		return rl.Services[0], nil
-	}
-	return rg.Service, nil
-}
-
-func getTask(ctx context.Context, c swarmapi.ControlClient, input string) (*swarmapi.Task, error) {
-	// GetTask to match via full ID.
-	rg, err := c.GetTask(ctx, &swarmapi.GetTaskRequest{TaskID: input})
-	if err != nil {
-		// If any error (including NotFound), ListTasks to match via full name.
-		rl, err := c.ListTasks(ctx, &swarmapi.ListTasksRequest{Filters: &swarmapi.ListTasksRequest_Filters{Names: []string{input}}})
-
-		if err != nil || len(rl.Tasks) == 0 {
-			// If any error or 0 result, ListTasks to match via ID prefix.
-			rl, err = c.ListTasks(ctx, &swarmapi.ListTasksRequest{Filters: &swarmapi.ListTasksRequest_Filters{IDPrefixes: []string{input}}})
-		}
-
-		if err != nil {
-			return nil, err
-		}
-
-		if len(rl.Tasks) == 0 {
-			return nil, fmt.Errorf("task %s not found", input)
-		}
-
-		if l := len(rl.Tasks); l > 1 {
-			return nil, fmt.Errorf("task %s is ambiguous (%d matches found)", input, l)
-		}
-
-		return rl.Tasks[0], nil
-	}
-	return rg.Task, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr.go b/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr.go
deleted file mode 100644
index c24d4865b3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package cluster
-
-import (
-	"errors"
-	"fmt"
-	"net"
-)
-
-var (
-	errNoSuchInterface         = errors.New("no such interface")
-	errNoIP                    = errors.New("could not find the system's IP address")
-	errMustSpecifyListenAddr   = errors.New("must specify a listening address because the address to advertise is not recognized as a system address, and a system's IP address to use could not be uniquely identified")
-	errBadListenAddr           = errors.New("listen address must be an IP address or network interface (with optional port number)")
-	errBadAdvertiseAddr        = errors.New("advertise address must be a non-zero IP address or network interface (with optional port number)")
-	errBadDefaultAdvertiseAddr = errors.New("default advertise address must be a non-zero IP address or network interface (without a port number)")
-)
-
-func resolveListenAddr(specifiedAddr string) (string, string, error) {
-	specifiedHost, specifiedPort, err := net.SplitHostPort(specifiedAddr)
-	if err != nil {
-		return "", "", fmt.Errorf("could not parse listen address %s", specifiedAddr)
-	}
-
-	// Does the host component match any of the interface names on the
-	// system? If so, use the address from that interface.
-	interfaceAddr, err := resolveInterfaceAddr(specifiedHost)
-	if err == nil {
-		return interfaceAddr.String(), specifiedPort, nil
-	}
-	if err != errNoSuchInterface {
-		return "", "", err
-	}
-
-	// If it's not an interface, it must be an IP (for now)
-	if net.ParseIP(specifiedHost) == nil {
-		return "", "", errBadListenAddr
-	}
-
-	return specifiedHost, specifiedPort, nil
-}
-
-func (c *Cluster) resolveAdvertiseAddr(advertiseAddr, listenAddrPort string) (string, string, error) {
-	// Approach:
-	// - If an advertise address is specified, use that. Resolve the
-	//   interface's address if an interface was specified in
-	//   advertiseAddr. Fill in the port from listenAddrPort if necessary.
-	// - If DefaultAdvertiseAddr is not empty, use that with the port from
-	//   listenAddrPort. Resolve the interface's address from
-	//   if an interface name was specified in DefaultAdvertiseAddr.
-	// - Otherwise, try to autodetect the system's address. Use the port in
-	//   listenAddrPort with this address if autodetection succeeds.
-
-	if advertiseAddr != "" {
-		advertiseHost, advertisePort, err := net.SplitHostPort(advertiseAddr)
-		if err != nil {
-			// Not a host:port specification
-			advertiseHost = advertiseAddr
-			advertisePort = listenAddrPort
-		}
-
-		// Does the host component match any of the interface names on the
-		// system? If so, use the address from that interface.
-		interfaceAddr, err := resolveInterfaceAddr(advertiseHost)
-		if err == nil {
-			return interfaceAddr.String(), advertisePort, nil
-		}
-		if err != errNoSuchInterface {
-			return "", "", err
-		}
-
-		// If it's not an interface, it must be an IP (for now)
-		if ip := net.ParseIP(advertiseHost); ip == nil || ip.IsUnspecified() {
-			return "", "", errBadAdvertiseAddr
-		}
-
-		return advertiseHost, advertisePort, nil
-	}
-
-	if c.config.DefaultAdvertiseAddr != "" {
-		// Does the default advertise address component match any of the
-		// interface names on the system? If so, use the address from
-		// that interface.
-		interfaceAddr, err := resolveInterfaceAddr(c.config.DefaultAdvertiseAddr)
-		if err == nil {
-			return interfaceAddr.String(), listenAddrPort, nil
-		}
-		if err != errNoSuchInterface {
-			return "", "", err
-		}
-
-		// If it's not an interface, it must be an IP (for now)
-		if ip := net.ParseIP(c.config.DefaultAdvertiseAddr); ip == nil || ip.IsUnspecified() {
-			return "", "", errBadDefaultAdvertiseAddr
-		}
-
-		return c.config.DefaultAdvertiseAddr, listenAddrPort, nil
-	}
-
-	systemAddr, err := c.resolveSystemAddr()
-	if err != nil {
-		return "", "", err
-	}
-	return systemAddr.String(), listenAddrPort, nil
-}
-
-func resolveInterfaceAddr(specifiedInterface string) (net.IP, error) {
-	// Use a specific interface's IP address.
-	intf, err := net.InterfaceByName(specifiedInterface)
-	if err != nil {
-		return nil, errNoSuchInterface
-	}
-
-	addrs, err := intf.Addrs()
-	if err != nil {
-		return nil, err
-	}
-
-	var interfaceAddr4, interfaceAddr6 net.IP
-
-	for _, addr := range addrs {
-		ipAddr, ok := addr.(*net.IPNet)
-
-		if ok {
-			if ipAddr.IP.To4() != nil {
-				// IPv4
-				if interfaceAddr4 != nil {
-					return nil, fmt.Errorf("interface %s has more than one IPv4 address (%s and %s)", specifiedInterface, interfaceAddr4, ipAddr.IP)
-				}
-				interfaceAddr4 = ipAddr.IP
-			} else {
-				// IPv6
-				if interfaceAddr6 != nil {
-					return nil, fmt.Errorf("interface %s has more than one IPv6 address (%s and %s)", specifiedInterface, interfaceAddr6, ipAddr.IP)
-				}
-				interfaceAddr6 = ipAddr.IP
-			}
-		}
-	}
-
-	if interfaceAddr4 == nil && interfaceAddr6 == nil {
-		return nil, fmt.Errorf("interface %s has no usable IPv4 or IPv6 address", specifiedInterface)
-	}
-
-	// In the case that there's exactly one IPv4 address
-	// and exactly one IPv6 address, favor IPv4 over IPv6.
-	if interfaceAddr4 != nil {
-		return interfaceAddr4, nil
-	}
-	return interfaceAddr6, nil
-}
-
-func (c *Cluster) resolveSystemAddrViaSubnetCheck() (net.IP, error) {
-	// Use the system's only IP address, or fail if there are
-	// multiple addresses to choose from. Skip interfaces which
-	// are managed by docker via subnet check.
-	interfaces, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-
-	var systemAddr net.IP
-	var systemInterface string
-
-	// List Docker-managed subnets
-	v4Subnets := c.config.NetworkSubnetsProvider.V4Subnets()
-	v6Subnets := c.config.NetworkSubnetsProvider.V6Subnets()
-
-ifaceLoop:
-	for _, intf := range interfaces {
-		// Skip inactive interfaces and loopback interfaces
-		if (intf.Flags&net.FlagUp == 0) || (intf.Flags&net.FlagLoopback) != 0 {
-			continue
-		}
-
-		addrs, err := intf.Addrs()
-		if err != nil {
-			continue
-		}
-
-		var interfaceAddr4, interfaceAddr6 net.IP
-
-		for _, addr := range addrs {
-			ipAddr, ok := addr.(*net.IPNet)
-
-			// Skip loopback and link-local addresses
-			if !ok || !ipAddr.IP.IsGlobalUnicast() {
-				continue
-			}
-
-			if ipAddr.IP.To4() != nil {
-				// IPv4
-
-				// Ignore addresses in subnets that are managed by Docker.
-				for _, subnet := range v4Subnets {
-					if subnet.Contains(ipAddr.IP) {
-						continue ifaceLoop
-					}
-				}
-
-				if interfaceAddr4 != nil {
-					return nil, errMultipleIPs(intf.Name, intf.Name, interfaceAddr4, ipAddr.IP)
-				}
-
-				interfaceAddr4 = ipAddr.IP
-			} else {
-				// IPv6
-
-				// Ignore addresses in subnets that are managed by Docker.
-				for _, subnet := range v6Subnets {
-					if subnet.Contains(ipAddr.IP) {
-						continue ifaceLoop
-					}
-				}
-
-				if interfaceAddr6 != nil {
-					return nil, errMultipleIPs(intf.Name, intf.Name, interfaceAddr6, ipAddr.IP)
-				}
-
-				interfaceAddr6 = ipAddr.IP
-			}
-		}
-
-		// In the case that this interface has exactly one IPv4 address
-		// and exactly one IPv6 address, favor IPv4 over IPv6.
-		if interfaceAddr4 != nil {
-			if systemAddr != nil {
-				return nil, errMultipleIPs(systemInterface, intf.Name, systemAddr, interfaceAddr4)
-			}
-			systemAddr = interfaceAddr4
-			systemInterface = intf.Name
-		} else if interfaceAddr6 != nil {
-			if systemAddr != nil {
-				return nil, errMultipleIPs(systemInterface, intf.Name, systemAddr, interfaceAddr6)
-			}
-			systemAddr = interfaceAddr6
-			systemInterface = intf.Name
-		}
-	}
-
-	if systemAddr == nil {
-		return nil, errNoIP
-	}
-
-	return systemAddr, nil
-}
-
-func listSystemIPs() []net.IP {
-	interfaces, err := net.Interfaces()
-	if err != nil {
-		return nil
-	}
-
-	var systemAddrs []net.IP
-
-	for _, intf := range interfaces {
-		addrs, err := intf.Addrs()
-		if err != nil {
-			continue
-		}
-
-		for _, addr := range addrs {
-			ipAddr, ok := addr.(*net.IPNet)
-
-			if ok {
-				systemAddrs = append(systemAddrs, ipAddr.IP)
-			}
-		}
-	}
-
-	return systemAddrs
-}
-
-func errMultipleIPs(interfaceA, interfaceB string, addrA, addrB net.IP) error {
-	if interfaceA == interfaceB {
-		return fmt.Errorf("could not choose an IP address to advertise since this system has multiple addresses on interface %s (%s and %s)", interfaceA, addrA, addrB)
-	}
-	return fmt.Errorf("could not choose an IP address to advertise since this system has multiple addresses on different interfaces (%s on %s and %s on %s)", addrA, interfaceA, addrB, interfaceB)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_linux.go b/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_linux.go
deleted file mode 100644
index 3d4f239bda..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_linux.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// +build linux
-
-package cluster
-
-import (
-	"net"
-
-	"github.com/vishvananda/netlink"
-)
-
-func (c *Cluster) resolveSystemAddr() (net.IP, error) {
-	// Use the system's only device IP address, or fail if there are
-	// multiple addresses to choose from.
-	interfaces, err := netlink.LinkList()
-	if err != nil {
-		return nil, err
-	}
-
-	var (
-		systemAddr      net.IP
-		systemInterface string
-		deviceFound     bool
-	)
-
-	for _, intf := range interfaces {
-		// Skip non device or inactive interfaces
-		if intf.Type() != "device" || intf.Attrs().Flags&net.FlagUp == 0 {
-			continue
-		}
-
-		addrs, err := netlink.AddrList(intf, netlink.FAMILY_ALL)
-		if err != nil {
-			continue
-		}
-
-		var interfaceAddr4, interfaceAddr6 net.IP
-
-		for _, addr := range addrs {
-			ipAddr := addr.IPNet.IP
-
-			// Skip loopback and link-local addresses
-			if !ipAddr.IsGlobalUnicast() {
-				continue
-			}
-
-			// At least one non-loopback device is found and it is administratively up
-			deviceFound = true
-
-			if ipAddr.To4() != nil {
-				if interfaceAddr4 != nil {
-					return nil, errMultipleIPs(intf.Attrs().Name, intf.Attrs().Name, interfaceAddr4, ipAddr)
-				}
-				interfaceAddr4 = ipAddr
-			} else {
-				if interfaceAddr6 != nil {
-					return nil, errMultipleIPs(intf.Attrs().Name, intf.Attrs().Name, interfaceAddr6, ipAddr)
-				}
-				interfaceAddr6 = ipAddr
-			}
-		}
-
-		// In the case that this interface has exactly one IPv4 address
-		// and exactly one IPv6 address, favor IPv4 over IPv6.
-		if interfaceAddr4 != nil {
-			if systemAddr != nil {
-				return nil, errMultipleIPs(systemInterface, intf.Attrs().Name, systemAddr, interfaceAddr4)
-			}
-			systemAddr = interfaceAddr4
-			systemInterface = intf.Attrs().Name
-		} else if interfaceAddr6 != nil {
-			if systemAddr != nil {
-				return nil, errMultipleIPs(systemInterface, intf.Attrs().Name, systemAddr, interfaceAddr6)
-			}
-			systemAddr = interfaceAddr6
-			systemInterface = intf.Attrs().Name
-		}
-	}
-
-	if systemAddr == nil {
-		if !deviceFound {
-			// If no non-loopback device type interface is found,
-			// fall back to the regular auto-detection mechanism.
-			// This is to cover the case where docker is running
-			// inside a container (eths are in fact veths).
-			return c.resolveSystemAddrViaSubnetCheck()
-		}
-		return nil, errNoIP
-	}
-
-	return systemAddr, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_others.go b/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_others.go
deleted file mode 100644
index 4e845f5c8f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_others.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !linux,!solaris
-
-package cluster
-
-import "net"
-
-func (c *Cluster) resolveSystemAddr() (net.IP, error) {
-	return c.resolveSystemAddrViaSubnetCheck()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_solaris.go b/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_solaris.go
deleted file mode 100644
index 57a894b251..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/listen_addr_solaris.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package cluster
-
-import (
-	"bufio"
-	"fmt"
-	"net"
-	"os/exec"
-	"strings"
-)
-
-func (c *Cluster) resolveSystemAddr() (net.IP, error) {
-	defRouteCmd := "/usr/sbin/ipadm show-addr -p -o addr " +
-		"`/usr/sbin/route get default | /usr/bin/grep interface | " +
-		"/usr/bin/awk '{print $2}'`"
-	out, err := exec.Command("/usr/bin/bash", "-c", defRouteCmd).Output()
-	if err != nil {
-		return nil, fmt.Errorf("cannot get default route: %v", err)
-	}
-
-	defInterface := strings.SplitN(string(out), "/", 2)
-	defInterfaceIP := net.ParseIP(defInterface[0])
-
-	return defInterfaceIP, nil
-}
-
-func listSystemIPs() []net.IP {
-	var systemAddrs []net.IP
-	cmd := exec.Command("/usr/sbin/ipadm", "show-addr", "-p", "-o", "addr")
-	cmdReader, err := cmd.StdoutPipe()
-	if err != nil {
-		return nil
-	}
-
-	if err := cmd.Start(); err != nil {
-		return nil
-	}
-
-	scanner := bufio.NewScanner(cmdReader)
-	go func() {
-		for scanner.Scan() {
-			text := scanner.Text()
-			nameAddrPair := strings.SplitN(text, "/", 2)
-			// Let go of loopback interfaces and docker interfaces
-			systemAddrs = append(systemAddrs, net.ParseIP(nameAddrPair[0]))
-		}
-	}()
-
-	if err := scanner.Err(); err != nil {
-		fmt.Printf("scan underwent err: %+v\n", err)
-	}
-
-	if err := cmd.Wait(); err != nil {
-		fmt.Printf("run command wait: %+v\n", err)
-	}
-
-	return systemAddrs
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/provider/network.go b/installer/vendor/github.com/docker/docker/daemon/cluster/provider/network.go
deleted file mode 100644
index f4c72ae13b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/provider/network.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package provider
-
-import "github.com/docker/docker/api/types"
-
-// NetworkCreateRequest is a request when creating a network.
-type NetworkCreateRequest struct {
-	ID string
-	types.NetworkCreateRequest
-}
-
-// NetworkCreateResponse is a response when creating a network.
-type NetworkCreateResponse struct {
-	ID string `json:"Id"`
-}
-
-// VirtualAddress represents a virtual address.
-type VirtualAddress struct {
-	IPv4 string
-	IPv6 string
-}
-
-// PortConfig represents a port configuration.
-type PortConfig struct {
-	Name          string
-	Protocol      int32
-	TargetPort    uint32
-	PublishedPort uint32
-}
-
-// ServiceConfig represents a service configuration.
-type ServiceConfig struct {
-	ID               string
-	Name             string
-	Aliases          map[string][]string
-	VirtualAddresses map[string]*VirtualAddress
-	ExposedPorts     []*PortConfig
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/cluster/secrets.go b/installer/vendor/github.com/docker/docker/daemon/cluster/secrets.go
deleted file mode 100644
index 2b9eb5da1d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/cluster/secrets.go
+++ /dev/null
@@ -1,133 +0,0 @@
-package cluster
-
-import (
-	apitypes "github.com/docker/docker/api/types"
-	types "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/daemon/cluster/convert"
-	swarmapi "github.com/docker/swarmkit/api"
-)
-
-// GetSecret returns a secret from a managed swarm cluster
-func (c *Cluster) GetSecret(id string) (types.Secret, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return types.Secret{}, c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.node.client.GetSecret(ctx, &swarmapi.GetSecretRequest{SecretID: id})
-	if err != nil {
-		return types.Secret{}, err
-	}
-
-	return convert.SecretFromGRPC(r.Secret), nil
-}
-
-// GetSecrets returns all secrets of a managed swarm cluster.
-func (c *Cluster) GetSecrets(options apitypes.SecretListOptions) ([]types.Secret, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return nil, c.errNoManager()
-	}
-
-	filters, err := newListSecretsFilters(options.Filters)
-	if err != nil {
-		return nil, err
-	}
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	r, err := c.node.client.ListSecrets(ctx,
-		&swarmapi.ListSecretsRequest{Filters: filters})
-	if err != nil {
-		return nil, err
-	}
-
-	secrets := []types.Secret{}
-
-	for _, secret := range r.Secrets {
-		secrets = append(secrets, convert.SecretFromGRPC(secret))
-	}
-
-	return secrets, nil
-}
-
-// CreateSecret creates a new secret in a managed swarm cluster.
-func (c *Cluster) CreateSecret(s types.SecretSpec) (string, error) {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return "", c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	secretSpec := convert.SecretSpecToGRPC(s)
-
-	r, err := c.node.client.CreateSecret(ctx,
-		&swarmapi.CreateSecretRequest{Spec: &secretSpec})
-	if err != nil {
-		return "", err
-	}
-
-	return r.Secret.ID, nil
-}
-
-// RemoveSecret removes a secret from a managed swarm cluster.
-func (c *Cluster) RemoveSecret(id string) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	req := &swarmapi.RemoveSecretRequest{
-		SecretID: id,
-	}
-
-	if _, err := c.node.client.RemoveSecret(ctx, req); err != nil {
-		return err
-	}
-	return nil
-}
-
-// UpdateSecret updates a secret in a managed swarm cluster.
-// Note: this is not exposed to the CLI but is available from the API only
-func (c *Cluster) UpdateSecret(id string, version uint64, spec types.SecretSpec) error {
-	c.RLock()
-	defer c.RUnlock()
-
-	if !c.isActiveManager() {
-		return c.errNoManager()
-	}
-
-	ctx, cancel := c.getRequestContext()
-	defer cancel()
-
-	secretSpec := convert.SecretSpecToGRPC(spec)
-
-	if _, err := c.client.UpdateSecret(ctx,
-		&swarmapi.UpdateSecretRequest{
-			SecretID: id,
-			SecretVersion: &swarmapi.Version{
-				Index: version,
-			},
-			Spec: &secretSpec,
-		}); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/commit.go b/installer/vendor/github.com/docker/docker/daemon/commit.go
deleted file mode 100644
index 1e7bffb1dc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/commit.go
+++ /dev/null
@@ -1,271 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/backend"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder/dockerfile"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/reference"
-)
-
-// merge merges two Config, the image container configuration (defaults values),
-// and the user container configuration, either passed by the API or generated
-// by the cli.
-// It will mutate the specified user configuration (userConf) with the image
-// configuration where the user configuration is incomplete.
-func merge(userConf, imageConf *containertypes.Config) error {
-	if userConf.User == "" {
-		userConf.User = imageConf.User
-	}
-	if len(userConf.ExposedPorts) == 0 {
-		userConf.ExposedPorts = imageConf.ExposedPorts
-	} else if imageConf.ExposedPorts != nil {
-		for port := range imageConf.ExposedPorts {
-			if _, exists := userConf.ExposedPorts[port]; !exists {
-				userConf.ExposedPorts[port] = struct{}{}
-			}
-		}
-	}
-
-	if len(userConf.Env) == 0 {
-		userConf.Env = imageConf.Env
-	} else {
-		for _, imageEnv := range imageConf.Env {
-			found := false
-			imageEnvKey := strings.Split(imageEnv, "=")[0]
-			for _, userEnv := range userConf.Env {
-				userEnvKey := strings.Split(userEnv, "=")[0]
-				if runtime.GOOS == "windows" {
-					// Case insensitive environment variables on Windows
-					imageEnvKey = strings.ToUpper(imageEnvKey)
-					userEnvKey = strings.ToUpper(userEnvKey)
-				}
-				if imageEnvKey == userEnvKey {
-					found = true
-					break
-				}
-			}
-			if !found {
-				userConf.Env = append(userConf.Env, imageEnv)
-			}
-		}
-	}
-
-	if userConf.Labels == nil {
-		userConf.Labels = map[string]string{}
-	}
-	for l, v := range imageConf.Labels {
-		if _, ok := userConf.Labels[l]; !ok {
-			userConf.Labels[l] = v
-		}
-	}
-
-	if len(userConf.Entrypoint) == 0 {
-		if len(userConf.Cmd) == 0 {
-			userConf.Cmd = imageConf.Cmd
-			userConf.ArgsEscaped = imageConf.ArgsEscaped
-		}
-
-		if userConf.Entrypoint == nil {
-			userConf.Entrypoint = imageConf.Entrypoint
-		}
-	}
-	if imageConf.Healthcheck != nil {
-		if userConf.Healthcheck == nil {
-			userConf.Healthcheck = imageConf.Healthcheck
-		} else {
-			if len(userConf.Healthcheck.Test) == 0 {
-				userConf.Healthcheck.Test = imageConf.Healthcheck.Test
-			}
-			if userConf.Healthcheck.Interval == 0 {
-				userConf.Healthcheck.Interval = imageConf.Healthcheck.Interval
-			}
-			if userConf.Healthcheck.Timeout == 0 {
-				userConf.Healthcheck.Timeout = imageConf.Healthcheck.Timeout
-			}
-			if userConf.Healthcheck.Retries == 0 {
-				userConf.Healthcheck.Retries = imageConf.Healthcheck.Retries
-			}
-		}
-	}
-
-	if userConf.WorkingDir == "" {
-		userConf.WorkingDir = imageConf.WorkingDir
-	}
-	if len(userConf.Volumes) == 0 {
-		userConf.Volumes = imageConf.Volumes
-	} else {
-		for k, v := range imageConf.Volumes {
-			userConf.Volumes[k] = v
-		}
-	}
-
-	if userConf.StopSignal == "" {
-		userConf.StopSignal = imageConf.StopSignal
-	}
-	return nil
-}
-
-// Commit creates a new filesystem image from the current state of a container.
-// The image can optionally be tagged into a repository.
-func (daemon *Daemon) Commit(name string, c *backend.ContainerCommitConfig) (string, error) {
-	start := time.Now()
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return "", err
-	}
-
-	// It is not possible to commit a running container on Windows and on Solaris.
-	if (runtime.GOOS == "windows" || runtime.GOOS == "solaris") && container.IsRunning() {
-		return "", fmt.Errorf("%+v does not support commit of a running container", runtime.GOOS)
-	}
-
-	if c.Pause && !container.IsPaused() {
-		daemon.containerPause(container)
-		defer daemon.containerUnpause(container)
-	}
-
-	newConfig, err := dockerfile.BuildFromConfig(c.Config, c.Changes)
-	if err != nil {
-		return "", err
-	}
-
-	if c.MergeConfigs {
-		if err := merge(newConfig, container.Config); err != nil {
-			return "", err
-		}
-	}
-
-	rwTar, err := daemon.exportContainerRw(container)
-	if err != nil {
-		return "", err
-	}
-	defer func() {
-		if rwTar != nil {
-			rwTar.Close()
-		}
-	}()
-
-	var history []image.History
-	rootFS := image.NewRootFS()
-	osVersion := ""
-	var osFeatures []string
-
-	if container.ImageID != "" {
-		img, err := daemon.imageStore.Get(container.ImageID)
-		if err != nil {
-			return "", err
-		}
-		history = img.History
-		rootFS = img.RootFS
-		osVersion = img.OSVersion
-		osFeatures = img.OSFeatures
-	}
-
-	l, err := daemon.layerStore.Register(rwTar, rootFS.ChainID())
-	if err != nil {
-		return "", err
-	}
-	defer layer.ReleaseAndLog(daemon.layerStore, l)
-
-	h := image.History{
-		Author:     c.Author,
-		Created:    time.Now().UTC(),
-		CreatedBy:  strings.Join(container.Config.Cmd, " "),
-		Comment:    c.Comment,
-		EmptyLayer: true,
-	}
-
-	if diffID := l.DiffID(); layer.DigestSHA256EmptyTar != diffID {
-		h.EmptyLayer = false
-		rootFS.Append(diffID)
-	}
-
-	history = append(history, h)
-
-	config, err := json.Marshal(&image.Image{
-		V1Image: image.V1Image{
-			DockerVersion:   dockerversion.Version,
-			Config:          newConfig,
-			Architecture:    runtime.GOARCH,
-			OS:              runtime.GOOS,
-			Container:       container.ID,
-			ContainerConfig: *container.Config,
-			Author:          c.Author,
-			Created:         h.Created,
-		},
-		RootFS:     rootFS,
-		History:    history,
-		OSFeatures: osFeatures,
-		OSVersion:  osVersion,
-	})
-
-	if err != nil {
-		return "", err
-	}
-
-	id, err := daemon.imageStore.Create(config)
-	if err != nil {
-		return "", err
-	}
-
-	if container.ImageID != "" {
-		if err := daemon.imageStore.SetParent(id, container.ImageID); err != nil {
-			return "", err
-		}
-	}
-
-	imageRef := ""
-	if c.Repo != "" {
-		newTag, err := reference.WithName(c.Repo) // todo: should move this to API layer
-		if err != nil {
-			return "", err
-		}
-		if c.Tag != "" {
-			if newTag, err = reference.WithTag(newTag, c.Tag); err != nil {
-				return "", err
-			}
-		}
-		if err := daemon.TagImageWithReference(id, newTag); err != nil {
-			return "", err
-		}
-		imageRef = newTag.String()
-	}
-
-	attributes := map[string]string{
-		"comment":  c.Comment,
-		"imageID":  id.String(),
-		"imageRef": imageRef,
-	}
-	daemon.LogContainerEventWithAttributes(container, "commit", attributes)
-	containerActions.WithValues("commit").UpdateSince(start)
-	return id.String(), nil
-}
-
-func (daemon *Daemon) exportContainerRw(container *container.Container) (io.ReadCloser, error) {
-	if err := daemon.Mount(container); err != nil {
-		return nil, err
-	}
-
-	archive, err := container.RWLayer.TarStream()
-	if err != nil {
-		daemon.Unmount(container) // logging is already handled in the `Unmount` function
-		return nil, err
-	}
-	return ioutils.NewReadCloserWrapper(archive, func() error {
-			archive.Close()
-			return container.RWLayer.Unmount()
-		}),
-		nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config.go b/installer/vendor/github.com/docker/docker/daemon/config.go
deleted file mode 100644
index 42ef18f74a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config.go
+++ /dev/null
@@ -1,525 +0,0 @@
-package daemon
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"runtime"
-	"strings"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/discovery"
-	"github.com/docker/docker/registry"
-	"github.com/imdario/mergo"
-	"github.com/spf13/pflag"
-)
-
-const (
-	// defaultMaxConcurrentDownloads is the default value for
-	// maximum number of downloads that
-	// may take place at a time for each pull.
-	defaultMaxConcurrentDownloads = 3
-	// defaultMaxConcurrentUploads is the default value for
-	// maximum number of uploads that
-	// may take place at a time for each push.
-	defaultMaxConcurrentUploads = 5
-	// stockRuntimeName is the reserved name/alias used to represent the
-	// OCI runtime being shipped with the docker daemon package.
-	stockRuntimeName = "runc"
-)
-
-const (
-	defaultNetworkMtu    = 1500
-	disableNetworkBridge = "none"
-)
-
-const (
-	defaultShutdownTimeout = 15
-)
-
-// flatOptions contains configuration keys
-// that MUST NOT be parsed as deep structures.
-// Use this to differentiate these options
-// with others like the ones in CommonTLSOptions.
-var flatOptions = map[string]bool{
-	"cluster-store-opts": true,
-	"log-opts":           true,
-	"runtimes":           true,
-	"default-ulimits":    true,
-}
-
-// LogConfig represents the default log configuration.
-// It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line use.
-type LogConfig struct {
-	Type   string            `json:"log-driver,omitempty"`
-	Config map[string]string `json:"log-opts,omitempty"`
-}
-
-// commonBridgeConfig stores all the platform-common bridge driver specific
-// configuration.
-type commonBridgeConfig struct {
-	Iface     string `json:"bridge,omitempty"`
-	FixedCIDR string `json:"fixed-cidr,omitempty"`
-}
-
-// CommonTLSOptions defines TLS configuration for the daemon server.
-// It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line use.
-type CommonTLSOptions struct {
-	CAFile   string `json:"tlscacert,omitempty"`
-	CertFile string `json:"tlscert,omitempty"`
-	KeyFile  string `json:"tlskey,omitempty"`
-}
-
-// CommonConfig defines the configuration of a docker daemon which is
-// common across platforms.
-// It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line use.
-type CommonConfig struct {
-	AuthorizationPlugins []string            `json:"authorization-plugins,omitempty"` // AuthorizationPlugins holds list of authorization plugins
-	AutoRestart          bool                `json:"-"`
-	Context              map[string][]string `json:"-"`
-	DisableBridge        bool                `json:"-"`
-	DNS                  []string            `json:"dns,omitempty"`
-	DNSOptions           []string            `json:"dns-opts,omitempty"`
-	DNSSearch            []string            `json:"dns-search,omitempty"`
-	ExecOptions          []string            `json:"exec-opts,omitempty"`
-	GraphDriver          string              `json:"storage-driver,omitempty"`
-	GraphOptions         []string            `json:"storage-opts,omitempty"`
-	Labels               []string            `json:"labels,omitempty"`
-	Mtu                  int                 `json:"mtu,omitempty"`
-	Pidfile              string              `json:"pidfile,omitempty"`
-	RawLogs              bool                `json:"raw-logs,omitempty"`
-	Root                 string              `json:"graph,omitempty"`
-	SocketGroup          string              `json:"group,omitempty"`
-	TrustKeyPath         string              `json:"-"`
-	CorsHeaders          string              `json:"api-cors-header,omitempty"`
-	EnableCors           bool                `json:"api-enable-cors,omitempty"`
-
-	// LiveRestoreEnabled determines whether we should keep containers
-	// alive upon daemon shutdown/start
-	LiveRestoreEnabled bool `json:"live-restore,omitempty"`
-
-	// ClusterStore is the storage backend used for the cluster information. It is used by both
-	// multihost networking (to store networks and endpoints information) and by the node discovery
-	// mechanism.
-	ClusterStore string `json:"cluster-store,omitempty"`
-
-	// ClusterOpts is used to pass options to the discovery package for tuning libkv settings, such
-	// as TLS configuration settings.
-	ClusterOpts map[string]string `json:"cluster-store-opts,omitempty"`
-
-	// ClusterAdvertise is the network endpoint that the Engine advertises for the purpose of node
-	// discovery. This should be a 'host:port' combination on which that daemon instance is
-	// reachable by other hosts.
-	ClusterAdvertise string `json:"cluster-advertise,omitempty"`
-
-	// MaxConcurrentDownloads is the maximum number of downloads that
-	// may take place at a time for each pull.
-	MaxConcurrentDownloads *int `json:"max-concurrent-downloads,omitempty"`
-
-	// MaxConcurrentUploads is the maximum number of uploads that
-	// may take place at a time for each push.
-	MaxConcurrentUploads *int `json:"max-concurrent-uploads,omitempty"`
-
-	// ShutdownTimeout is the timeout value (in seconds) the daemon will wait for the container
-	// to stop when daemon is being shutdown
-	ShutdownTimeout int `json:"shutdown-timeout,omitempty"`
-
-	Debug     bool     `json:"debug,omitempty"`
-	Hosts     []string `json:"hosts,omitempty"`
-	LogLevel  string   `json:"log-level,omitempty"`
-	TLS       bool     `json:"tls,omitempty"`
-	TLSVerify bool     `json:"tlsverify,omitempty"`
-
-	// Embedded structs that allow config
-	// deserialization without the full struct.
-	CommonTLSOptions
-
-	// SwarmDefaultAdvertiseAddr is the default host/IP or network interface
-	// to use if a wildcard address is specified in the ListenAddr value
-	// given to the /swarm/init endpoint and no advertise address is
-	// specified.
-	SwarmDefaultAdvertiseAddr string `json:"swarm-default-advertise-addr"`
-	MetricsAddress            string `json:"metrics-addr"`
-
-	LogConfig
-	bridgeConfig // bridgeConfig holds bridge network specific configuration.
-	registry.ServiceOptions
-
-	reloadLock sync.Mutex
-	valuesSet  map[string]interface{}
-
-	Experimental bool `json:"experimental"` // Experimental indicates whether experimental features should be exposed or not
-}
-
-// InstallCommonFlags adds flags to the pflag.FlagSet to configure the daemon
-func (config *Config) InstallCommonFlags(flags *pflag.FlagSet) {
-	var maxConcurrentDownloads, maxConcurrentUploads int
-
-	config.ServiceOptions.InstallCliFlags(flags)
-
-	flags.Var(opts.NewNamedListOptsRef("storage-opts", &config.GraphOptions, nil), "storage-opt", "Storage driver options")
-	flags.Var(opts.NewNamedListOptsRef("authorization-plugins", &config.AuthorizationPlugins, nil), "authorization-plugin", "Authorization plugins to load")
-	flags.Var(opts.NewNamedListOptsRef("exec-opts", &config.ExecOptions, nil), "exec-opt", "Runtime execution options")
-	flags.StringVarP(&config.Pidfile, "pidfile", "p", defaultPidFile, "Path to use for daemon PID file")
-	flags.StringVarP(&config.Root, "graph", "g", defaultGraph, "Root of the Docker runtime")
-	flags.BoolVarP(&config.AutoRestart, "restart", "r", true, "--restart on the daemon has been deprecated in favor of --restart policies on docker run")
-	flags.MarkDeprecated("restart", "Please use a restart policy on docker run")
-	flags.StringVarP(&config.GraphDriver, "storage-driver", "s", "", "Storage driver to use")
-	flags.IntVar(&config.Mtu, "mtu", 0, "Set the containers network MTU")
-	flags.BoolVar(&config.RawLogs, "raw-logs", false, "Full timestamps without ANSI coloring")
-	// FIXME: why the inconsistency between "hosts" and "sockets"?
-	flags.Var(opts.NewListOptsRef(&config.DNS, opts.ValidateIPAddress), "dns", "DNS server to use")
-	flags.Var(opts.NewNamedListOptsRef("dns-opts", &config.DNSOptions, nil), "dns-opt", "DNS options to use")
-	flags.Var(opts.NewListOptsRef(&config.DNSSearch, opts.ValidateDNSSearch), "dns-search", "DNS search domains to use")
-	flags.Var(opts.NewNamedListOptsRef("labels", &config.Labels, opts.ValidateLabel), "label", "Set key=value labels to the daemon")
-	flags.StringVar(&config.LogConfig.Type, "log-driver", "json-file", "Default driver for container logs")
-	flags.Var(opts.NewNamedMapOpts("log-opts", config.LogConfig.Config, nil), "log-opt", "Default log driver options for containers")
-	flags.StringVar(&config.ClusterAdvertise, "cluster-advertise", "", "Address or interface name to advertise")
-	flags.StringVar(&config.ClusterStore, "cluster-store", "", "URL of the distributed storage backend")
-	flags.Var(opts.NewNamedMapOpts("cluster-store-opts", config.ClusterOpts, nil), "cluster-store-opt", "Set cluster store options")
-	flags.StringVar(&config.CorsHeaders, "api-cors-header", "", "Set CORS headers in the Engine API")
-	flags.IntVar(&maxConcurrentDownloads, "max-concurrent-downloads", defaultMaxConcurrentDownloads, "Set the max concurrent downloads for each pull")
-	flags.IntVar(&maxConcurrentUploads, "max-concurrent-uploads", defaultMaxConcurrentUploads, "Set the max concurrent uploads for each push")
-	flags.IntVar(&config.ShutdownTimeout, "shutdown-timeout", defaultShutdownTimeout, "Set the default shutdown timeout")
-
-	flags.StringVar(&config.SwarmDefaultAdvertiseAddr, "swarm-default-advertise-addr", "", "Set default address or interface for swarm advertised address")
-	flags.BoolVar(&config.Experimental, "experimental", false, "Enable experimental features")
-
-	flags.StringVar(&config.MetricsAddress, "metrics-addr", "", "Set default address and port to serve the metrics api on")
-
-	config.MaxConcurrentDownloads = &maxConcurrentDownloads
-	config.MaxConcurrentUploads = &maxConcurrentUploads
-}
-
-// IsValueSet returns true if a configuration value
-// was explicitly set in the configuration file.
-func (config *Config) IsValueSet(name string) bool {
-	if config.valuesSet == nil {
-		return false
-	}
-	_, ok := config.valuesSet[name]
-	return ok
-}
-
-// NewConfig returns a new fully initialized Config struct
-func NewConfig() *Config {
-	config := Config{}
-	config.LogConfig.Config = make(map[string]string)
-	config.ClusterOpts = make(map[string]string)
-
-	if runtime.GOOS != "linux" {
-		config.V2Only = true
-	}
-	return &config
-}
-
-func parseClusterAdvertiseSettings(clusterStore, clusterAdvertise string) (string, error) {
-	if runtime.GOOS == "solaris" && (clusterAdvertise != "" || clusterStore != "") {
-		return "", errors.New("Cluster Advertise Settings not supported on Solaris")
-	}
-	if clusterAdvertise == "" {
-		return "", errDiscoveryDisabled
-	}
-	if clusterStore == "" {
-		return "", fmt.Errorf("invalid cluster configuration. --cluster-advertise must be accompanied by --cluster-store configuration")
-	}
-
-	advertise, err := discovery.ParseAdvertise(clusterAdvertise)
-	if err != nil {
-		return "", fmt.Errorf("discovery advertise parsing failed (%v)", err)
-	}
-	return advertise, nil
-}
-
-// GetConflictFreeLabels validate Labels for conflict
-// In swarm the duplicates for labels are removed
-// so we only take same values here, no conflict values
-// If the key-value is the same we will only take the last label
-func GetConflictFreeLabels(labels []string) ([]string, error) {
-	labelMap := map[string]string{}
-	for _, label := range labels {
-		stringSlice := strings.SplitN(label, "=", 2)
-		if len(stringSlice) > 1 {
-			// If there is a conflict we will return an error
-			if v, ok := labelMap[stringSlice[0]]; ok && v != stringSlice[1] {
-				return nil, fmt.Errorf("conflict labels for %s=%s and %s=%s", stringSlice[0], stringSlice[1], stringSlice[0], v)
-			}
-			labelMap[stringSlice[0]] = stringSlice[1]
-		}
-	}
-
-	newLabels := []string{}
-	for k, v := range labelMap {
-		newLabels = append(newLabels, fmt.Sprintf("%s=%s", k, v))
-	}
-	return newLabels, nil
-}
-
-// ReloadConfiguration reads the configuration in the host and reloads the daemon and server.
-func ReloadConfiguration(configFile string, flags *pflag.FlagSet, reload func(*Config)) error {
-	logrus.Infof("Got signal to reload configuration, reloading from: %s", configFile)
-	newConfig, err := getConflictFreeConfiguration(configFile, flags)
-	if err != nil {
-		return err
-	}
-
-	if err := ValidateConfiguration(newConfig); err != nil {
-		return fmt.Errorf("file configuration validation failed (%v)", err)
-	}
-
-	// Labels of the docker engine used to allow multiple values associated with the same key.
-	// This is deprecated in 1.13, and, be removed after 3 release cycles.
-	// The following will check the conflict of labels, and report a warning for deprecation.
-	//
-	// TODO: After 3 release cycles (1.16) an error will be returned, and labels will be
-	// sanitized to consolidate duplicate key-value pairs (config.Labels = newLabels):
-	//
-	// newLabels, err := GetConflictFreeLabels(newConfig.Labels)
-	// if err != nil {
-	//      return err
-	// }
-	// newConfig.Labels = newLabels
-	//
-	if _, err := GetConflictFreeLabels(newConfig.Labels); err != nil {
-		logrus.Warnf("Engine labels with duplicate keys and conflicting values have been deprecated: %s", err)
-	}
-
-	reload(newConfig)
-	return nil
-}
-
-// boolValue is an interface that boolean value flags implement
-// to tell the command line how to make -name equivalent to -name=true.
-type boolValue interface {
-	IsBoolFlag() bool
-}
-
-// MergeDaemonConfigurations reads a configuration file,
-// loads the file configuration in an isolated structure,
-// and merges the configuration provided from flags on top
-// if there are no conflicts.
-func MergeDaemonConfigurations(flagsConfig *Config, flags *pflag.FlagSet, configFile string) (*Config, error) {
-	fileConfig, err := getConflictFreeConfiguration(configFile, flags)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := ValidateConfiguration(fileConfig); err != nil {
-		return nil, fmt.Errorf("file configuration validation failed (%v)", err)
-	}
-
-	// merge flags configuration on top of the file configuration
-	if err := mergo.Merge(fileConfig, flagsConfig); err != nil {
-		return nil, err
-	}
-
-	// We need to validate again once both fileConfig and flagsConfig
-	// have been merged
-	if err := ValidateConfiguration(fileConfig); err != nil {
-		return nil, fmt.Errorf("file configuration validation failed (%v)", err)
-	}
-
-	return fileConfig, nil
-}
-
-// getConflictFreeConfiguration loads the configuration from a JSON file.
-// It compares that configuration with the one provided by the flags,
-// and returns an error if there are conflicts.
-func getConflictFreeConfiguration(configFile string, flags *pflag.FlagSet) (*Config, error) {
-	b, err := ioutil.ReadFile(configFile)
-	if err != nil {
-		return nil, err
-	}
-
-	var config Config
-	var reader io.Reader
-	if flags != nil {
-		var jsonConfig map[string]interface{}
-		reader = bytes.NewReader(b)
-		if err := json.NewDecoder(reader).Decode(&jsonConfig); err != nil {
-			return nil, err
-		}
-
-		configSet := configValuesSet(jsonConfig)
-
-		if err := findConfigurationConflicts(configSet, flags); err != nil {
-			return nil, err
-		}
-
-		// Override flag values to make sure the values set in the config file with nullable values, like `false`,
-		// are not overridden by default truthy values from the flags that were not explicitly set.
-		// See https://github.com/docker/docker/issues/20289 for an example.
-		//
-		// TODO: Rewrite configuration logic to avoid same issue with other nullable values, like numbers.
-		namedOptions := make(map[string]interface{})
-		for key, value := range configSet {
-			f := flags.Lookup(key)
-			if f == nil { // ignore named flags that don't match
-				namedOptions[key] = value
-				continue
-			}
-
-			if _, ok := f.Value.(boolValue); ok {
-				f.Value.Set(fmt.Sprintf("%v", value))
-			}
-		}
-		if len(namedOptions) > 0 {
-			// set also default for mergeVal flags that are boolValue at the same time.
-			flags.VisitAll(func(f *pflag.Flag) {
-				if opt, named := f.Value.(opts.NamedOption); named {
-					v, set := namedOptions[opt.Name()]
-					_, boolean := f.Value.(boolValue)
-					if set && boolean {
-						f.Value.Set(fmt.Sprintf("%v", v))
-					}
-				}
-			})
-		}
-
-		config.valuesSet = configSet
-	}
-
-	reader = bytes.NewReader(b)
-	err = json.NewDecoder(reader).Decode(&config)
-	return &config, err
-}
-
-// configValuesSet returns the configuration values explicitly set in the file.
-func configValuesSet(config map[string]interface{}) map[string]interface{} {
-	flatten := make(map[string]interface{})
-	for k, v := range config {
-		if m, isMap := v.(map[string]interface{}); isMap && !flatOptions[k] {
-			for km, vm := range m {
-				flatten[km] = vm
-			}
-			continue
-		}
-
-		flatten[k] = v
-	}
-	return flatten
-}
-
-// findConfigurationConflicts iterates over the provided flags searching for
-// duplicated configurations and unknown keys. It returns an error with all the conflicts if
-// it finds any.
-func findConfigurationConflicts(config map[string]interface{}, flags *pflag.FlagSet) error {
-	// 1. Search keys from the file that we don't recognize as flags.
-	unknownKeys := make(map[string]interface{})
-	for key, value := range config {
-		if flag := flags.Lookup(key); flag == nil {
-			unknownKeys[key] = value
-		}
-	}
-
-	// 2. Discard values that implement NamedOption.
-	// Their configuration name differs from their flag name, like `labels` and `label`.
-	if len(unknownKeys) > 0 {
-		unknownNamedConflicts := func(f *pflag.Flag) {
-			if namedOption, ok := f.Value.(opts.NamedOption); ok {
-				if _, valid := unknownKeys[namedOption.Name()]; valid {
-					delete(unknownKeys, namedOption.Name())
-				}
-			}
-		}
-		flags.VisitAll(unknownNamedConflicts)
-	}
-
-	if len(unknownKeys) > 0 {
-		var unknown []string
-		for key := range unknownKeys {
-			unknown = append(unknown, key)
-		}
-		return fmt.Errorf("the following directives don't match any configuration option: %s", strings.Join(unknown, ", "))
-	}
-
-	var conflicts []string
-	printConflict := func(name string, flagValue, fileValue interface{}) string {
-		return fmt.Sprintf("%s: (from flag: %v, from file: %v)", name, flagValue, fileValue)
-	}
-
-	// 3. Search keys that are present as a flag and as a file option.
-	duplicatedConflicts := func(f *pflag.Flag) {
-		// search option name in the json configuration payload if the value is a named option
-		if namedOption, ok := f.Value.(opts.NamedOption); ok {
-			if optsValue, ok := config[namedOption.Name()]; ok {
-				conflicts = append(conflicts, printConflict(namedOption.Name(), f.Value.String(), optsValue))
-			}
-		} else {
-			// search flag name in the json configuration payload
-			for _, name := range []string{f.Name, f.Shorthand} {
-				if value, ok := config[name]; ok {
-					conflicts = append(conflicts, printConflict(name, f.Value.String(), value))
-					break
-				}
-			}
-		}
-	}
-
-	flags.Visit(duplicatedConflicts)
-
-	if len(conflicts) > 0 {
-		return fmt.Errorf("the following directives are specified both as a flag and in the configuration file: %s", strings.Join(conflicts, ", "))
-	}
-	return nil
-}
-
-// ValidateConfiguration validates some specific configs.
-// such as config.DNS, config.Labels, config.DNSSearch,
-// as well as config.MaxConcurrentDownloads, config.MaxConcurrentUploads.
-func ValidateConfiguration(config *Config) error {
-	// validate DNS
-	for _, dns := range config.DNS {
-		if _, err := opts.ValidateIPAddress(dns); err != nil {
-			return err
-		}
-	}
-
-	// validate DNSSearch
-	for _, dnsSearch := range config.DNSSearch {
-		if _, err := opts.ValidateDNSSearch(dnsSearch); err != nil {
-			return err
-		}
-	}
-
-	// validate Labels
-	for _, label := range config.Labels {
-		if _, err := opts.ValidateLabel(label); err != nil {
-			return err
-		}
-	}
-
-	// validate MaxConcurrentDownloads
-	if config.IsValueSet("max-concurrent-downloads") && config.MaxConcurrentDownloads != nil && *config.MaxConcurrentDownloads < 0 {
-		return fmt.Errorf("invalid max concurrent downloads: %d", *config.MaxConcurrentDownloads)
-	}
-
-	// validate MaxConcurrentUploads
-	if config.IsValueSet("max-concurrent-uploads") && config.MaxConcurrentUploads != nil && *config.MaxConcurrentUploads < 0 {
-		return fmt.Errorf("invalid max concurrent uploads: %d", *config.MaxConcurrentUploads)
-	}
-
-	// validate that "default" runtime is not reset
-	if runtimes := config.GetAllRuntimes(); len(runtimes) > 0 {
-		if _, ok := runtimes[stockRuntimeName]; ok {
-			return fmt.Errorf("runtime name '%s' is reserved", stockRuntimeName)
-		}
-	}
-
-	if defaultRuntime := config.GetDefaultRuntimeName(); defaultRuntime != "" && defaultRuntime != stockRuntimeName {
-		runtimes := config.GetAllRuntimes()
-		if _, ok := runtimes[defaultRuntime]; !ok {
-			return fmt.Errorf("specified default runtime '%s' does not exist", defaultRuntime)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_common_unix.go b/installer/vendor/github.com/docker/docker/daemon/config_common_unix.go
deleted file mode 100644
index ab76fe7b1b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_common_unix.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// +build solaris linux freebsd
-
-package daemon
-
-import (
-	"net"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/opts"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/spf13/pflag"
-)
-
-// CommonUnixConfig defines configuration of a docker daemon that is
-// common across Unix platforms.
-type CommonUnixConfig struct {
-	ExecRoot       string                   `json:"exec-root,omitempty"`
-	ContainerdAddr string                   `json:"containerd,omitempty"`
-	Runtimes       map[string]types.Runtime `json:"runtimes,omitempty"`
-	DefaultRuntime string                   `json:"default-runtime,omitempty"`
-}
-
-type commonUnixBridgeConfig struct {
-	DefaultIP                   net.IP `json:"ip,omitempty"`
-	IP                          string `json:"bip,omitempty"`
-	DefaultGatewayIPv4          net.IP `json:"default-gateway,omitempty"`
-	DefaultGatewayIPv6          net.IP `json:"default-gateway-v6,omitempty"`
-	InterContainerCommunication bool   `json:"icc,omitempty"`
-}
-
-// InstallCommonUnixFlags adds command-line options to the top-level flag parser for
-// the current process that are common across Unix platforms.
-func (config *Config) InstallCommonUnixFlags(flags *pflag.FlagSet) {
-	config.Runtimes = make(map[string]types.Runtime)
-
-	flags.StringVarP(&config.SocketGroup, "group", "G", "docker", "Group for the unix socket")
-	flags.StringVar(&config.bridgeConfig.IP, "bip", "", "Specify network bridge IP")
-	flags.StringVarP(&config.bridgeConfig.Iface, "bridge", "b", "", "Attach containers to a network bridge")
-	flags.StringVar(&config.bridgeConfig.FixedCIDR, "fixed-cidr", "", "IPv4 subnet for fixed IPs")
-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv4, ""), "default-gateway", "Container default gateway IPv4 address")
-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultGatewayIPv6, ""), "default-gateway-v6", "Container default gateway IPv6 address")
-	flags.BoolVar(&config.bridgeConfig.InterContainerCommunication, "icc", true, "Enable inter-container communication")
-	flags.Var(opts.NewIPOpt(&config.bridgeConfig.DefaultIP, "0.0.0.0"), "ip", "Default IP when binding container ports")
-	flags.Var(runconfigopts.NewNamedRuntimeOpt("runtimes", &config.Runtimes, stockRuntimeName), "add-runtime", "Register an additional OCI compatible runtime")
-	flags.StringVar(&config.DefaultRuntime, "default-runtime", stockRuntimeName, "Default OCI runtime for containers")
-
-}
-
-// GetRuntime returns the runtime path and arguments for a given
-// runtime name
-func (config *Config) GetRuntime(name string) *types.Runtime {
-	config.reloadLock.Lock()
-	defer config.reloadLock.Unlock()
-	if rt, ok := config.Runtimes[name]; ok {
-		return &rt
-	}
-	return nil
-}
-
-// GetDefaultRuntimeName returns the current default runtime
-func (config *Config) GetDefaultRuntimeName() string {
-	config.reloadLock.Lock()
-	rt := config.DefaultRuntime
-	config.reloadLock.Unlock()
-
-	return rt
-}
-
-// GetAllRuntimes returns a copy of the runtimes map
-func (config *Config) GetAllRuntimes() map[string]types.Runtime {
-	config.reloadLock.Lock()
-	rts := config.Runtimes
-	config.reloadLock.Unlock()
-	return rts
-}
-
-// GetExecRoot returns the user configured Exec-root
-func (config *Config) GetExecRoot() string {
-	return config.ExecRoot
-}
-
-// GetInitPath returns the configure docker-init path
-func (config *Config) GetInitPath() string {
-	config.reloadLock.Lock()
-	defer config.reloadLock.Unlock()
-	if config.InitPath != "" {
-		return config.InitPath
-	}
-	return DefaultInitBinary
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_experimental.go b/installer/vendor/github.com/docker/docker/daemon/config_experimental.go
deleted file mode 100644
index 963a51e5a3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_experimental.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package daemon
-
-import (
-	"github.com/spf13/pflag"
-)
-
-func (config *Config) attachExperimentalFlags(cmd *pflag.FlagSet) {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_solaris.go b/installer/vendor/github.com/docker/docker/daemon/config_solaris.go
deleted file mode 100644
index bc18ccd7e4..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_solaris.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package daemon
-
-import (
-	"github.com/spf13/pflag"
-)
-
-var (
-	defaultPidFile = "/system/volatile/docker/docker.pid"
-	defaultGraph   = "/var/lib/docker"
-	defaultExec    = "zones"
-)
-
-// Config defines the configuration of a docker daemon.
-// These are the configuration settings that you pass
-// to the docker daemon when you launch it with say: `docker -d -e lxc`
-type Config struct {
-	CommonConfig
-
-	// These fields are common to all unix platforms.
-	CommonUnixConfig
-}
-
-// bridgeConfig stores all the bridge driver specific
-// configuration.
-type bridgeConfig struct {
-	commonBridgeConfig
-
-	// Fields below here are platform specific.
-	commonUnixBridgeConfig
-}
-
-// InstallFlags adds command-line options to the top-level flag parser for
-// the current process.
-func (config *Config) InstallFlags(flags *pflag.FlagSet) {
-	// First handle install flags which are consistent cross-platform
-	config.InstallCommonFlags(flags)
-
-	// Then install flags common to unix platforms
-	config.InstallCommonUnixFlags(flags)
-
-	// Then platform-specific install flags
-	config.attachExperimentalFlags(flags)
-}
-
-func (config *Config) isSwarmCompatible() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_test.go b/installer/vendor/github.com/docker/docker/daemon/config_test.go
deleted file mode 100644
index 90f6a1277f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_test.go
+++ /dev/null
@@ -1,229 +0,0 @@
-package daemon
-
-import (
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/testutil/assert"
-	"github.com/spf13/pflag"
-)
-
-func TestDaemonConfigurationNotFound(t *testing.T) {
-	_, err := MergeDaemonConfigurations(&Config{}, nil, "/tmp/foo-bar-baz-docker")
-	if err == nil || !os.IsNotExist(err) {
-		t.Fatalf("expected does not exist error, got %v", err)
-	}
-}
-
-func TestDaemonBrokenConfiguration(t *testing.T) {
-	f, err := ioutil.TempFile("", "docker-config-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	configFile := f.Name()
-	f.Write([]byte(`{"Debug": tru`))
-	f.Close()
-
-	_, err = MergeDaemonConfigurations(&Config{}, nil, configFile)
-	if err == nil {
-		t.Fatalf("expected error, got %v", err)
-	}
-}
-
-func TestParseClusterAdvertiseSettings(t *testing.T) {
-	if runtime.GOOS == "solaris" {
-		t.Skip("ClusterSettings not supported on Solaris\n")
-	}
-	_, err := parseClusterAdvertiseSettings("something", "")
-	if err != errDiscoveryDisabled {
-		t.Fatalf("expected discovery disabled error, got %v\n", err)
-	}
-
-	_, err = parseClusterAdvertiseSettings("", "something")
-	if err == nil {
-		t.Fatalf("expected discovery store error, got %v\n", err)
-	}
-
-	_, err = parseClusterAdvertiseSettings("etcd", "127.0.0.1:8080")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFindConfigurationConflicts(t *testing.T) {
-	config := map[string]interface{}{"authorization-plugins": "foobar"}
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
-
-	flags.String("authorization-plugins", "", "")
-	assert.NilError(t, flags.Set("authorization-plugins", "asdf"))
-
-	assert.Error(t,
-		findConfigurationConflicts(config, flags),
-		"authorization-plugins: (from flag: asdf, from file: foobar)")
-}
-
-func TestFindConfigurationConflictsWithNamedOptions(t *testing.T) {
-	config := map[string]interface{}{"hosts": []string{"qwer"}}
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
-
-	var hosts []string
-	flags.VarP(opts.NewNamedListOptsRef("hosts", &hosts, opts.ValidateHost), "host", "H", "Daemon socket(s) to connect to")
-	assert.NilError(t, flags.Set("host", "tcp://127.0.0.1:4444"))
-	assert.NilError(t, flags.Set("host", "unix:///var/run/docker.sock"))
-
-	assert.Error(t, findConfigurationConflicts(config, flags), "hosts")
-}
-
-func TestDaemonConfigurationMergeConflicts(t *testing.T) {
-	f, err := ioutil.TempFile("", "docker-config-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	configFile := f.Name()
-	f.Write([]byte(`{"debug": true}`))
-	f.Close()
-
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
-	flags.Bool("debug", false, "")
-	flags.Set("debug", "false")
-
-	_, err = MergeDaemonConfigurations(&Config{}, flags, configFile)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if !strings.Contains(err.Error(), "debug") {
-		t.Fatalf("expected debug conflict, got %v", err)
-	}
-}
-
-func TestDaemonConfigurationMergeConflictsWithInnerStructs(t *testing.T) {
-	f, err := ioutil.TempFile("", "docker-config-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	configFile := f.Name()
-	f.Write([]byte(`{"tlscacert": "/etc/certificates/ca.pem"}`))
-	f.Close()
-
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
-	flags.String("tlscacert", "", "")
-	flags.Set("tlscacert", "~/.docker/ca.pem")
-
-	_, err = MergeDaemonConfigurations(&Config{}, flags, configFile)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if !strings.Contains(err.Error(), "tlscacert") {
-		t.Fatalf("expected tlscacert conflict, got %v", err)
-	}
-}
-
-func TestFindConfigurationConflictsWithUnknownKeys(t *testing.T) {
-	config := map[string]interface{}{"tls-verify": "true"}
-	flags := pflag.NewFlagSet("test", pflag.ContinueOnError)
-
-	flags.Bool("tlsverify", false, "")
-	err := findConfigurationConflicts(config, flags)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if !strings.Contains(err.Error(), "the following directives don't match any configuration option: tls-verify") {
-		t.Fatalf("expected tls-verify conflict, got %v", err)
-	}
-}
-
-func TestFindConfigurationConflictsWithMergedValues(t *testing.T) {
-	var hosts []string
-	config := map[string]interface{}{"hosts": "tcp://127.0.0.1:2345"}
-	flags := pflag.NewFlagSet("base", pflag.ContinueOnError)
-	flags.VarP(opts.NewNamedListOptsRef("hosts", &hosts, nil), "host", "H", "")
-
-	err := findConfigurationConflicts(config, flags)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	flags.Set("host", "unix:///var/run/docker.sock")
-	err = findConfigurationConflicts(config, flags)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-	if !strings.Contains(err.Error(), "hosts: (from flag: [unix:///var/run/docker.sock], from file: tcp://127.0.0.1:2345)") {
-		t.Fatalf("expected hosts conflict, got %v", err)
-	}
-}
-
-func TestValidateConfiguration(t *testing.T) {
-	c1 := &Config{
-		CommonConfig: CommonConfig{
-			Labels: []string{"one"},
-		},
-	}
-
-	err := ValidateConfiguration(c1)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-
-	c2 := &Config{
-		CommonConfig: CommonConfig{
-			Labels: []string{"one=two"},
-		},
-	}
-
-	err = ValidateConfiguration(c2)
-	if err != nil {
-		t.Fatalf("expected no error, got error %v", err)
-	}
-
-	c3 := &Config{
-		CommonConfig: CommonConfig{
-			DNS: []string{"1.1.1.1"},
-		},
-	}
-
-	err = ValidateConfiguration(c3)
-	if err != nil {
-		t.Fatalf("expected no error, got error %v", err)
-	}
-
-	c4 := &Config{
-		CommonConfig: CommonConfig{
-			DNS: []string{"1.1.1.1o"},
-		},
-	}
-
-	err = ValidateConfiguration(c4)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-
-	c5 := &Config{
-		CommonConfig: CommonConfig{
-			DNSSearch: []string{"a.b.c"},
-		},
-	}
-
-	err = ValidateConfiguration(c5)
-	if err != nil {
-		t.Fatalf("expected no error, got error %v", err)
-	}
-
-	c6 := &Config{
-		CommonConfig: CommonConfig{
-			DNSSearch: []string{"123456"},
-		},
-	}
-
-	err = ValidateConfiguration(c6)
-	if err == nil {
-		t.Fatal("expected error, got nil")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_unix.go b/installer/vendor/github.com/docker/docker/daemon/config_unix.go
deleted file mode 100644
index d0957884b3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_unix.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// +build linux freebsd
-
-package daemon
-
-import (
-	"fmt"
-
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	units "github.com/docker/go-units"
-	"github.com/spf13/pflag"
-)
-
-var (
-	defaultPidFile  = "/var/run/docker.pid"
-	defaultGraph    = "/var/lib/docker"
-	defaultExecRoot = "/var/run/docker"
-)
-
-// Config defines the configuration of a docker daemon.
-// It includes json tags to deserialize configuration from a file
-// using the same names that the flags in the command line uses.
-type Config struct {
-	CommonConfig
-
-	// These fields are common to all unix platforms.
-	CommonUnixConfig
-
-	// Fields below here are platform specific.
-	CgroupParent         string                   `json:"cgroup-parent,omitempty"`
-	EnableSelinuxSupport bool                     `json:"selinux-enabled,omitempty"`
-	RemappedRoot         string                   `json:"userns-remap,omitempty"`
-	Ulimits              map[string]*units.Ulimit `json:"default-ulimits,omitempty"`
-	CPURealtimePeriod    int64                    `json:"cpu-rt-period,omitempty"`
-	CPURealtimeRuntime   int64                    `json:"cpu-rt-runtime,omitempty"`
-	OOMScoreAdjust       int                      `json:"oom-score-adjust,omitempty"`
-	Init                 bool                     `json:"init,omitempty"`
-	InitPath             string                   `json:"init-path,omitempty"`
-	SeccompProfile       string                   `json:"seccomp-profile,omitempty"`
-}
-
-// bridgeConfig stores all the bridge driver specific
-// configuration.
-type bridgeConfig struct {
-	commonBridgeConfig
-
-	// These fields are common to all unix platforms.
-	commonUnixBridgeConfig
-
-	// Fields below here are platform specific.
-	EnableIPv6          bool   `json:"ipv6,omitempty"`
-	EnableIPTables      bool   `json:"iptables,omitempty"`
-	EnableIPForward     bool   `json:"ip-forward,omitempty"`
-	EnableIPMasq        bool   `json:"ip-masq,omitempty"`
-	EnableUserlandProxy bool   `json:"userland-proxy,omitempty"`
-	UserlandProxyPath   string `json:"userland-proxy-path,omitempty"`
-	FixedCIDRv6         string `json:"fixed-cidr-v6,omitempty"`
-}
-
-// InstallFlags adds flags to the pflag.FlagSet to configure the daemon
-func (config *Config) InstallFlags(flags *pflag.FlagSet) {
-	// First handle install flags which are consistent cross-platform
-	config.InstallCommonFlags(flags)
-
-	// Then install flags common to unix platforms
-	config.InstallCommonUnixFlags(flags)
-
-	config.Ulimits = make(map[string]*units.Ulimit)
-
-	// Then platform-specific install flags
-	flags.BoolVar(&config.EnableSelinuxSupport, "selinux-enabled", false, "Enable selinux support")
-	flags.Var(runconfigopts.NewUlimitOpt(&config.Ulimits), "default-ulimit", "Default ulimits for containers")
-	flags.BoolVar(&config.bridgeConfig.EnableIPTables, "iptables", true, "Enable addition of iptables rules")
-	flags.BoolVar(&config.bridgeConfig.EnableIPForward, "ip-forward", true, "Enable net.ipv4.ip_forward")
-	flags.BoolVar(&config.bridgeConfig.EnableIPMasq, "ip-masq", true, "Enable IP masquerading")
-	flags.BoolVar(&config.bridgeConfig.EnableIPv6, "ipv6", false, "Enable IPv6 networking")
-	flags.StringVar(&config.ExecRoot, "exec-root", defaultExecRoot, "Root directory for execution state files")
-	flags.StringVar(&config.bridgeConfig.FixedCIDRv6, "fixed-cidr-v6", "", "IPv6 subnet for fixed IPs")
-	flags.BoolVar(&config.bridgeConfig.EnableUserlandProxy, "userland-proxy", true, "Use userland proxy for loopback traffic")
-	flags.StringVar(&config.bridgeConfig.UserlandProxyPath, "userland-proxy-path", "", "Path to the userland proxy binary")
-	flags.BoolVar(&config.EnableCors, "api-enable-cors", false, "Enable CORS headers in the Engine API, this is deprecated by --api-cors-header")
-	flags.MarkDeprecated("api-enable-cors", "Please use --api-cors-header")
-	flags.StringVar(&config.CgroupParent, "cgroup-parent", "", "Set parent cgroup for all containers")
-	flags.StringVar(&config.RemappedRoot, "userns-remap", "", "User/Group setting for user namespaces")
-	flags.StringVar(&config.ContainerdAddr, "containerd", "", "Path to containerd socket")
-	flags.BoolVar(&config.LiveRestoreEnabled, "live-restore", false, "Enable live restore of docker when containers are still running")
-	flags.IntVar(&config.OOMScoreAdjust, "oom-score-adjust", -500, "Set the oom_score_adj for the daemon")
-	flags.BoolVar(&config.Init, "init", false, "Run an init in the container to forward signals and reap processes")
-	flags.StringVar(&config.InitPath, "init-path", "", "Path to the docker-init binary")
-	flags.Int64Var(&config.CPURealtimePeriod, "cpu-rt-period", 0, "Limit the CPU real-time period in microseconds")
-	flags.Int64Var(&config.CPURealtimeRuntime, "cpu-rt-runtime", 0, "Limit the CPU real-time runtime in microseconds")
-	flags.StringVar(&config.SeccompProfile, "seccomp-profile", "", "Path to seccomp profile")
-
-	config.attachExperimentalFlags(flags)
-}
-
-func (config *Config) isSwarmCompatible() error {
-	if config.ClusterStore != "" || config.ClusterAdvertise != "" {
-		return fmt.Errorf("--cluster-store and --cluster-advertise daemon configurations are incompatible with swarm mode")
-	}
-	if config.LiveRestoreEnabled {
-		return fmt.Errorf("--live-restore daemon configuration is incompatible with swarm mode")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_unix_test.go b/installer/vendor/github.com/docker/docker/daemon/config_unix_test.go
deleted file mode 100644
index 86c16f57ba..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_unix_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"io/ioutil"
-	"testing"
-)
-
-func TestDaemonConfigurationMerge(t *testing.T) {
-	f, err := ioutil.TempFile("", "docker-config-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	configFile := f.Name()
-
-	f.Write([]byte(`
-		{
-			"debug": true,
-			"default-ulimits": {
-				"nofile": {
-					"Name": "nofile",
-					"Hard": 2048,
-					"Soft": 1024
-				}
-			},
-			"log-opts": {
-				"tag": "test_tag"
-			}
-		}`))
-
-	f.Close()
-
-	c := &Config{
-		CommonConfig: CommonConfig{
-			AutoRestart: true,
-			LogConfig: LogConfig{
-				Type:   "syslog",
-				Config: map[string]string{"tag": "test"},
-			},
-		},
-	}
-
-	cc, err := MergeDaemonConfigurations(c, nil, configFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !cc.Debug {
-		t.Fatalf("expected %v, got %v\n", true, cc.Debug)
-	}
-	if !cc.AutoRestart {
-		t.Fatalf("expected %v, got %v\n", true, cc.AutoRestart)
-	}
-	if cc.LogConfig.Type != "syslog" {
-		t.Fatalf("expected syslog config, got %q\n", cc.LogConfig)
-	}
-
-	if configValue, OK := cc.LogConfig.Config["tag"]; !OK {
-		t.Fatal("expected syslog config attributes, got nil\n")
-	} else {
-		if configValue != "test_tag" {
-			t.Fatalf("expected syslog config attributes 'tag=test_tag', got 'tag=%s'\n", configValue)
-		}
-	}
-
-	if cc.Ulimits == nil {
-		t.Fatal("expected default ulimit config, got nil\n")
-	} else {
-		if _, OK := cc.Ulimits["nofile"]; OK {
-			if cc.Ulimits["nofile"].Name != "nofile" ||
-				cc.Ulimits["nofile"].Hard != 2048 ||
-				cc.Ulimits["nofile"].Soft != 1024 {
-				t.Fatalf("expected default ulimit name, hard and soft are nofile, 2048, 1024, got %s, %d, %d\n", cc.Ulimits["nofile"].Name, cc.Ulimits["nofile"].Hard, cc.Ulimits["nofile"].Soft)
-			}
-		} else {
-			t.Fatal("expected default ulimit name nofile, got nil\n")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_windows.go b/installer/vendor/github.com/docker/docker/daemon/config_windows.go
deleted file mode 100644
index df59dcf302..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_windows.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package daemon
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types"
-	"github.com/spf13/pflag"
-)
-
-var (
-	defaultPidFile string
-	defaultGraph   = filepath.Join(os.Getenv("programdata"), "docker")
-)
-
-// bridgeConfig stores all the bridge driver specific
-// configuration.
-type bridgeConfig struct {
-	commonBridgeConfig
-}
-
-// Config defines the configuration of a docker daemon.
-// These are the configuration settings that you pass
-// to the docker daemon when you launch it with say: `docker daemon -e windows`
-type Config struct {
-	CommonConfig
-
-	// Fields below here are platform specific. (There are none presently
-	// for the Windows daemon.)
-}
-
-// InstallFlags adds flags to the pflag.FlagSet to configure the daemon
-func (config *Config) InstallFlags(flags *pflag.FlagSet) {
-	// First handle install flags which are consistent cross-platform
-	config.InstallCommonFlags(flags)
-
-	// Then platform-specific install flags.
-	flags.StringVar(&config.bridgeConfig.FixedCIDR, "fixed-cidr", "", "IPv4 subnet for fixed IPs")
-	flags.StringVarP(&config.bridgeConfig.Iface, "bridge", "b", "", "Attach containers to a virtual switch")
-	flags.StringVarP(&config.SocketGroup, "group", "G", "", "Users or groups that can access the named pipe")
-}
-
-// GetRuntime returns the runtime path and arguments for a given
-// runtime name
-func (config *Config) GetRuntime(name string) *types.Runtime {
-	return nil
-}
-
-// GetInitPath returns the configure docker-init path
-func (config *Config) GetInitPath() string {
-	return ""
-}
-
-// GetDefaultRuntimeName returns the current default runtime
-func (config *Config) GetDefaultRuntimeName() string {
-	return stockRuntimeName
-}
-
-// GetAllRuntimes returns a copy of the runtimes map
-func (config *Config) GetAllRuntimes() map[string]types.Runtime {
-	return map[string]types.Runtime{}
-}
-
-// GetExecRoot returns the user configured Exec-root
-func (config *Config) GetExecRoot() string {
-	return ""
-}
-
-func (config *Config) isSwarmCompatible() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/config_windows_test.go b/installer/vendor/github.com/docker/docker/daemon/config_windows_test.go
deleted file mode 100644
index 4a7b95c17d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/config_windows_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build windows
-
-package daemon
-
-import (
-	"io/ioutil"
-	"testing"
-)
-
-func TestDaemonConfigurationMerge(t *testing.T) {
-	f, err := ioutil.TempFile("", "docker-config-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	configFile := f.Name()
-
-	f.Write([]byte(`
-		{
-			"debug": true,
-			"log-opts": {
-				"tag": "test_tag"
-			}
-		}`))
-
-	f.Close()
-
-	c := &Config{
-		CommonConfig: CommonConfig{
-			AutoRestart: true,
-			LogConfig: LogConfig{
-				Type:   "syslog",
-				Config: map[string]string{"tag": "test"},
-			},
-		},
-	}
-
-	cc, err := MergeDaemonConfigurations(c, nil, configFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !cc.Debug {
-		t.Fatalf("expected %v, got %v\n", true, cc.Debug)
-	}
-	if !cc.AutoRestart {
-		t.Fatalf("expected %v, got %v\n", true, cc.AutoRestart)
-	}
-	if cc.LogConfig.Type != "syslog" {
-		t.Fatalf("expected syslog config, got %q\n", cc.LogConfig)
-	}
-
-	if configValue, OK := cc.LogConfig.Config["tag"]; !OK {
-		t.Fatal("expected syslog config attributes, got nil\n")
-	} else {
-		if configValue != "test_tag" {
-			t.Fatalf("expected syslog config attributes 'tag=test_tag', got 'tag=%s'\n", configValue)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/container.go b/installer/vendor/github.com/docker/docker/daemon/container.go
deleted file mode 100644
index 2a44800098..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/container.go
+++ /dev/null
@@ -1,282 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/docker/docker/api/errors"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/pkg/truncindex"
-	"github.com/docker/docker/runconfig/opts"
-	"github.com/docker/go-connections/nat"
-)
-
-// GetContainer looks for a container using the provided information, which could be
-// one of the following inputs from the caller:
-//  - A full container ID, which will exact match a container in daemon's list
-//  - A container name, which will only exact match via the GetByName() function
-//  - A partial container ID prefix (e.g. short ID) of any length that is
-//    unique enough to only return a single container object
-//  If none of these searches succeed, an error is returned
-func (daemon *Daemon) GetContainer(prefixOrName string) (*container.Container, error) {
-	if len(prefixOrName) == 0 {
-		return nil, errors.NewBadRequestError(fmt.Errorf("No container name or ID supplied"))
-	}
-
-	if containerByID := daemon.containers.Get(prefixOrName); containerByID != nil {
-		// prefix is an exact match to a full container ID
-		return containerByID, nil
-	}
-
-	// GetByName will match only an exact name provided; we ignore errors
-	if containerByName, _ := daemon.GetByName(prefixOrName); containerByName != nil {
-		// prefix is an exact match to a full container Name
-		return containerByName, nil
-	}
-
-	containerID, indexError := daemon.idIndex.Get(prefixOrName)
-	if indexError != nil {
-		// When truncindex defines an error type, use that instead
-		if indexError == truncindex.ErrNotExist {
-			err := fmt.Errorf("No such container: %s", prefixOrName)
-			return nil, errors.NewRequestNotFoundError(err)
-		}
-		return nil, indexError
-	}
-	return daemon.containers.Get(containerID), nil
-}
-
-// Exists returns a true if a container of the specified ID or name exists,
-// false otherwise.
-func (daemon *Daemon) Exists(id string) bool {
-	c, _ := daemon.GetContainer(id)
-	return c != nil
-}
-
-// IsPaused returns a bool indicating if the specified container is paused.
-func (daemon *Daemon) IsPaused(id string) bool {
-	c, _ := daemon.GetContainer(id)
-	return c.State.IsPaused()
-}
-
-func (daemon *Daemon) containerRoot(id string) string {
-	return filepath.Join(daemon.repository, id)
-}
-
-// Load reads the contents of a container from disk
-// This is typically done at startup.
-func (daemon *Daemon) load(id string) (*container.Container, error) {
-	container := daemon.newBaseContainer(id)
-
-	if err := container.FromDisk(); err != nil {
-		return nil, err
-	}
-
-	if container.ID != id {
-		return container, fmt.Errorf("Container %s is stored at %s", container.ID, id)
-	}
-
-	return container, nil
-}
-
-// Register makes a container object usable by the daemon as <container.ID>
-func (daemon *Daemon) Register(c *container.Container) error {
-	// Attach to stdout and stderr
-	if c.Config.OpenStdin {
-		c.StreamConfig.NewInputPipes()
-	} else {
-		c.StreamConfig.NewNopInputPipe()
-	}
-
-	daemon.containers.Add(c.ID, c)
-	daemon.idIndex.Add(c.ID)
-
-	return nil
-}
-
-func (daemon *Daemon) newContainer(name string, config *containertypes.Config, hostConfig *containertypes.HostConfig, imgID image.ID, managed bool) (*container.Container, error) {
-	var (
-		id             string
-		err            error
-		noExplicitName = name == ""
-	)
-	id, name, err = daemon.generateIDAndName(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if hostConfig.NetworkMode.IsHost() {
-		if config.Hostname == "" {
-			config.Hostname, err = os.Hostname()
-			if err != nil {
-				return nil, err
-			}
-		}
-	} else {
-		daemon.generateHostname(id, config)
-	}
-	entrypoint, args := daemon.getEntrypointAndArgs(config.Entrypoint, config.Cmd)
-
-	base := daemon.newBaseContainer(id)
-	base.Created = time.Now().UTC()
-	base.Managed = managed
-	base.Path = entrypoint
-	base.Args = args //FIXME: de-duplicate from config
-	base.Config = config
-	base.HostConfig = &containertypes.HostConfig{}
-	base.ImageID = imgID
-	base.NetworkSettings = &network.Settings{IsAnonymousEndpoint: noExplicitName}
-	base.Name = name
-	base.Driver = daemon.GraphDriverName()
-
-	return base, err
-}
-
-// GetByName returns a container given a name.
-func (daemon *Daemon) GetByName(name string) (*container.Container, error) {
-	if len(name) == 0 {
-		return nil, fmt.Errorf("No container name supplied")
-	}
-	fullName := name
-	if name[0] != '/' {
-		fullName = "/" + name
-	}
-	id, err := daemon.nameIndex.Get(fullName)
-	if err != nil {
-		return nil, fmt.Errorf("Could not find entity for %s", name)
-	}
-	e := daemon.containers.Get(id)
-	if e == nil {
-		return nil, fmt.Errorf("Could not find container for entity id %s", id)
-	}
-	return e, nil
-}
-
-// newBaseContainer creates a new container with its initial
-// configuration based on the root storage from the daemon.
-func (daemon *Daemon) newBaseContainer(id string) *container.Container {
-	return container.NewBaseContainer(id, daemon.containerRoot(id))
-}
-
-func (daemon *Daemon) getEntrypointAndArgs(configEntrypoint strslice.StrSlice, configCmd strslice.StrSlice) (string, []string) {
-	if len(configEntrypoint) != 0 {
-		return configEntrypoint[0], append(configEntrypoint[1:], configCmd...)
-	}
-	return configCmd[0], configCmd[1:]
-}
-
-func (daemon *Daemon) generateHostname(id string, config *containertypes.Config) {
-	// Generate default hostname
-	if config.Hostname == "" {
-		config.Hostname = id[:12]
-	}
-}
-
-func (daemon *Daemon) setSecurityOptions(container *container.Container, hostConfig *containertypes.HostConfig) error {
-	container.Lock()
-	defer container.Unlock()
-	return parseSecurityOpt(container, hostConfig)
-}
-
-func (daemon *Daemon) setHostConfig(container *container.Container, hostConfig *containertypes.HostConfig) error {
-	// Do not lock while creating volumes since this could be calling out to external plugins
-	// Don't want to block other actions, like `docker ps` because we're waiting on an external plugin
-	if err := daemon.registerMountPoints(container, hostConfig); err != nil {
-		return err
-	}
-
-	container.Lock()
-	defer container.Unlock()
-
-	// Register any links from the host config before starting the container
-	if err := daemon.registerLinks(container, hostConfig); err != nil {
-		return err
-	}
-
-	// make sure links is not nil
-	// this ensures that on the next daemon restart we don't try to migrate from legacy sqlite links
-	if hostConfig.Links == nil {
-		hostConfig.Links = []string{}
-	}
-
-	container.HostConfig = hostConfig
-	return container.ToDisk()
-}
-
-// verifyContainerSettings performs validation of the hostconfig and config
-// structures.
-func (daemon *Daemon) verifyContainerSettings(hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {
-
-	// First perform verification of settings common across all platforms.
-	if config != nil {
-		if config.WorkingDir != "" {
-			config.WorkingDir = filepath.FromSlash(config.WorkingDir) // Ensure in platform semantics
-			if !system.IsAbs(config.WorkingDir) {
-				return nil, fmt.Errorf("the working directory '%s' is invalid, it needs to be an absolute path", config.WorkingDir)
-			}
-		}
-
-		if len(config.StopSignal) > 0 {
-			_, err := signal.ParseSignal(config.StopSignal)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		// Validate if Env contains empty variable or not (e.g., ``, `=foo`)
-		for _, env := range config.Env {
-			if _, err := opts.ValidateEnv(env); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	if hostConfig == nil {
-		return nil, nil
-	}
-
-	if hostConfig.AutoRemove && !hostConfig.RestartPolicy.IsNone() {
-		return nil, fmt.Errorf("can't create 'AutoRemove' container with restart policy")
-	}
-
-	for port := range hostConfig.PortBindings {
-		_, portStr := nat.SplitProtoPort(string(port))
-		if _, err := nat.ParsePort(portStr); err != nil {
-			return nil, fmt.Errorf("invalid port specification: %q", portStr)
-		}
-		for _, pb := range hostConfig.PortBindings[port] {
-			_, err := nat.NewPort(nat.SplitProtoPort(pb.HostPort))
-			if err != nil {
-				return nil, fmt.Errorf("invalid port specification: %q", pb.HostPort)
-			}
-		}
-	}
-
-	p := hostConfig.RestartPolicy
-
-	switch p.Name {
-	case "always", "unless-stopped", "no":
-		if p.MaximumRetryCount != 0 {
-			return nil, fmt.Errorf("maximum retry count cannot be used with restart policy '%s'", p.Name)
-		}
-	case "on-failure":
-		if p.MaximumRetryCount < 0 {
-			return nil, fmt.Errorf("maximum retry count cannot be negative")
-		}
-	case "":
-	// do nothing
-	default:
-		return nil, fmt.Errorf("invalid restart policy '%s'", p.Name)
-	}
-
-	// Now do platform-specific verification
-	return verifyPlatformContainerSettings(daemon, hostConfig, config, update)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/container_operations.go b/installer/vendor/github.com/docker/docker/daemon/container_operations.go
deleted file mode 100644
index c30250622d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/container_operations.go
+++ /dev/null
@@ -1,1049 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"path"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	derr "github.com/docker/docker/api/errors"
-	containertypes "github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/network"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
-	"github.com/docker/libnetwork/types"
-)
-
-var (
-	// ErrRootFSReadOnly is returned when a container
-	// rootfs is marked readonly.
-	ErrRootFSReadOnly = errors.New("container rootfs is marked read-only")
-	getPortMapInfo    = container.GetSandboxPortMapInfo
-)
-
-func (daemon *Daemon) buildSandboxOptions(container *container.Container) ([]libnetwork.SandboxOption, error) {
-	var (
-		sboxOptions []libnetwork.SandboxOption
-		err         error
-		dns         []string
-		dnsSearch   []string
-		dnsOptions  []string
-		bindings    = make(nat.PortMap)
-		pbList      []types.PortBinding
-		exposeList  []types.TransportPort
-	)
-
-	defaultNetName := runconfig.DefaultDaemonNetworkMode().NetworkName()
-	sboxOptions = append(sboxOptions, libnetwork.OptionHostname(container.Config.Hostname),
-		libnetwork.OptionDomainname(container.Config.Domainname))
-
-	if container.HostConfig.NetworkMode.IsHost() {
-		sboxOptions = append(sboxOptions, libnetwork.OptionUseDefaultSandbox())
-		if len(container.HostConfig.ExtraHosts) == 0 {
-			sboxOptions = append(sboxOptions, libnetwork.OptionOriginHostsPath("/etc/hosts"))
-		}
-		if len(container.HostConfig.DNS) == 0 && len(daemon.configStore.DNS) == 0 &&
-			len(container.HostConfig.DNSSearch) == 0 && len(daemon.configStore.DNSSearch) == 0 &&
-			len(container.HostConfig.DNSOptions) == 0 && len(daemon.configStore.DNSOptions) == 0 {
-			sboxOptions = append(sboxOptions, libnetwork.OptionOriginResolvConfPath("/etc/resolv.conf"))
-		}
-	} else {
-		// OptionUseExternalKey is mandatory for userns support.
-		// But optional for non-userns support
-		sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
-	}
-
-	if err = setupPathsAndSandboxOptions(container, &sboxOptions); err != nil {
-		return nil, err
-	}
-
-	if len(container.HostConfig.DNS) > 0 {
-		dns = container.HostConfig.DNS
-	} else if len(daemon.configStore.DNS) > 0 {
-		dns = daemon.configStore.DNS
-	}
-
-	for _, d := range dns {
-		sboxOptions = append(sboxOptions, libnetwork.OptionDNS(d))
-	}
-
-	if len(container.HostConfig.DNSSearch) > 0 {
-		dnsSearch = container.HostConfig.DNSSearch
-	} else if len(daemon.configStore.DNSSearch) > 0 {
-		dnsSearch = daemon.configStore.DNSSearch
-	}
-
-	for _, ds := range dnsSearch {
-		sboxOptions = append(sboxOptions, libnetwork.OptionDNSSearch(ds))
-	}
-
-	if len(container.HostConfig.DNSOptions) > 0 {
-		dnsOptions = container.HostConfig.DNSOptions
-	} else if len(daemon.configStore.DNSOptions) > 0 {
-		dnsOptions = daemon.configStore.DNSOptions
-	}
-
-	for _, ds := range dnsOptions {
-		sboxOptions = append(sboxOptions, libnetwork.OptionDNSOptions(ds))
-	}
-
-	if container.NetworkSettings.SecondaryIPAddresses != nil {
-		name := container.Config.Hostname
-		if container.Config.Domainname != "" {
-			name = name + "." + container.Config.Domainname
-		}
-
-		for _, a := range container.NetworkSettings.SecondaryIPAddresses {
-			sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(name, a.Addr))
-		}
-	}
-
-	for _, extraHost := range container.HostConfig.ExtraHosts {
-		// allow IPv6 addresses in extra hosts; only split on first ":"
-		parts := strings.SplitN(extraHost, ":", 2)
-		sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(parts[0], parts[1]))
-	}
-
-	if container.HostConfig.PortBindings != nil {
-		for p, b := range container.HostConfig.PortBindings {
-			bindings[p] = []nat.PortBinding{}
-			for _, bb := range b {
-				bindings[p] = append(bindings[p], nat.PortBinding{
-					HostIP:   bb.HostIP,
-					HostPort: bb.HostPort,
-				})
-			}
-		}
-	}
-
-	portSpecs := container.Config.ExposedPorts
-	ports := make([]nat.Port, len(portSpecs))
-	var i int
-	for p := range portSpecs {
-		ports[i] = p
-		i++
-	}
-	nat.SortPortMap(ports, bindings)
-	for _, port := range ports {
-		expose := types.TransportPort{}
-		expose.Proto = types.ParseProtocol(port.Proto())
-		expose.Port = uint16(port.Int())
-		exposeList = append(exposeList, expose)
-
-		pb := types.PortBinding{Port: expose.Port, Proto: expose.Proto}
-		binding := bindings[port]
-		for i := 0; i < len(binding); i++ {
-			pbCopy := pb.GetCopy()
-			newP, err := nat.NewPort(nat.SplitProtoPort(binding[i].HostPort))
-			var portStart, portEnd int
-			if err == nil {
-				portStart, portEnd, err = newP.Range()
-			}
-			if err != nil {
-				return nil, fmt.Errorf("Error parsing HostPort value(%s):%v", binding[i].HostPort, err)
-			}
-			pbCopy.HostPort = uint16(portStart)
-			pbCopy.HostPortEnd = uint16(portEnd)
-			pbCopy.HostIP = net.ParseIP(binding[i].HostIP)
-			pbList = append(pbList, pbCopy)
-		}
-
-		if container.HostConfig.PublishAllPorts && len(binding) == 0 {
-			pbList = append(pbList, pb)
-		}
-	}
-
-	sboxOptions = append(sboxOptions,
-		libnetwork.OptionPortMapping(pbList),
-		libnetwork.OptionExposedPorts(exposeList))
-
-	// Legacy Link feature is supported only for the default bridge network.
-	// return if this call to build join options is not for default bridge network
-	// Legacy Link is only supported by docker run --link
-	bridgeSettings, ok := container.NetworkSettings.Networks[defaultNetName]
-	if !ok || bridgeSettings.EndpointSettings == nil {
-		return sboxOptions, nil
-	}
-
-	if bridgeSettings.EndpointID == "" {
-		return sboxOptions, nil
-	}
-
-	var (
-		childEndpoints, parentEndpoints []string
-		cEndpointID                     string
-	)
-
-	children := daemon.children(container)
-	for linkAlias, child := range children {
-		if !isLinkable(child) {
-			return nil, fmt.Errorf("Cannot link to %s, as it does not belong to the default network", child.Name)
-		}
-		_, alias := path.Split(linkAlias)
-		// allow access to the linked container via the alias, real name, and container hostname
-		aliasList := alias + " " + child.Config.Hostname
-		// only add the name if alias isn't equal to the name
-		if alias != child.Name[1:] {
-			aliasList = aliasList + " " + child.Name[1:]
-		}
-		sboxOptions = append(sboxOptions, libnetwork.OptionExtraHost(aliasList, child.NetworkSettings.Networks[defaultNetName].IPAddress))
-		cEndpointID = child.NetworkSettings.Networks[defaultNetName].EndpointID
-		if cEndpointID != "" {
-			childEndpoints = append(childEndpoints, cEndpointID)
-		}
-	}
-
-	for alias, parent := range daemon.parents(container) {
-		if daemon.configStore.DisableBridge || !container.HostConfig.NetworkMode.IsPrivate() {
-			continue
-		}
-
-		_, alias = path.Split(alias)
-		logrus.Debugf("Update /etc/hosts of %s for alias %s with ip %s", parent.ID, alias, bridgeSettings.IPAddress)
-		sboxOptions = append(sboxOptions, libnetwork.OptionParentUpdate(
-			parent.ID,
-			alias,
-			bridgeSettings.IPAddress,
-		))
-		if cEndpointID != "" {
-			parentEndpoints = append(parentEndpoints, cEndpointID)
-		}
-	}
-
-	linkOptions := options.Generic{
-		netlabel.GenericData: options.Generic{
-			"ParentEndpoints": parentEndpoints,
-			"ChildEndpoints":  childEndpoints,
-		},
-	}
-
-	sboxOptions = append(sboxOptions, libnetwork.OptionGeneric(linkOptions))
-	return sboxOptions, nil
-}
-
-func (daemon *Daemon) updateNetworkSettings(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings) error {
-	if container.NetworkSettings == nil {
-		container.NetworkSettings = &network.Settings{Networks: make(map[string]*network.EndpointSettings)}
-	}
-
-	if !container.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() {
-		return runconfig.ErrConflictHostNetwork
-	}
-
-	for s := range container.NetworkSettings.Networks {
-		sn, err := daemon.FindNetwork(s)
-		if err != nil {
-			continue
-		}
-
-		if sn.Name() == n.Name() {
-			// Avoid duplicate config
-			return nil
-		}
-		if !containertypes.NetworkMode(sn.Type()).IsPrivate() ||
-			!containertypes.NetworkMode(n.Type()).IsPrivate() {
-			return runconfig.ErrConflictSharedNetwork
-		}
-		if containertypes.NetworkMode(sn.Name()).IsNone() ||
-			containertypes.NetworkMode(n.Name()).IsNone() {
-			return runconfig.ErrConflictNoNetwork
-		}
-	}
-
-	if _, ok := container.NetworkSettings.Networks[n.Name()]; !ok {
-		container.NetworkSettings.Networks[n.Name()] = &network.EndpointSettings{
-			EndpointSettings: endpointConfig,
-		}
-	}
-
-	return nil
-}
-
-func (daemon *Daemon) updateEndpointNetworkSettings(container *container.Container, n libnetwork.Network, ep libnetwork.Endpoint) error {
-	if err := container.BuildEndpointInfo(n, ep); err != nil {
-		return err
-	}
-
-	if container.HostConfig.NetworkMode == runconfig.DefaultDaemonNetworkMode() {
-		container.NetworkSettings.Bridge = daemon.configStore.bridgeConfig.Iface
-	}
-
-	return nil
-}
-
-// UpdateNetwork is used to update the container's network (e.g. when linked containers
-// get removed/unlinked).
-func (daemon *Daemon) updateNetwork(container *container.Container) error {
-	var (
-		start = time.Now()
-		ctrl  = daemon.netController
-		sid   = container.NetworkSettings.SandboxID
-	)
-
-	sb, err := ctrl.SandboxByID(sid)
-	if err != nil {
-		return fmt.Errorf("error locating sandbox id %s: %v", sid, err)
-	}
-
-	// Find if container is connected to the default bridge network
-	var n libnetwork.Network
-	for name := range container.NetworkSettings.Networks {
-		sn, err := daemon.FindNetwork(name)
-		if err != nil {
-			continue
-		}
-		if sn.Name() == runconfig.DefaultDaemonNetworkMode().NetworkName() {
-			n = sn
-			break
-		}
-	}
-
-	if n == nil {
-		// Not connected to the default bridge network; Nothing to do
-		return nil
-	}
-
-	options, err := daemon.buildSandboxOptions(container)
-	if err != nil {
-		return fmt.Errorf("Update network failed: %v", err)
-	}
-
-	if err := sb.Refresh(options...); err != nil {
-		return fmt.Errorf("Update network failed: Failure in refresh sandbox %s: %v", sid, err)
-	}
-
-	networkActions.WithValues("update").UpdateSince(start)
-
-	return nil
-}
-
-func (daemon *Daemon) findAndAttachNetwork(container *container.Container, idOrName string, epConfig *networktypes.EndpointSettings) (libnetwork.Network, *networktypes.NetworkingConfig, error) {
-	n, err := daemon.FindNetwork(idOrName)
-	if err != nil {
-		// We should always be able to find the network for a
-		// managed container.
-		if container.Managed {
-			return nil, nil, err
-		}
-	}
-
-	// If we found a network and if it is not dynamically created
-	// we should never attempt to attach to that network here.
-	if n != nil {
-		if container.Managed || !n.Info().Dynamic() {
-			return n, nil, nil
-		}
-	}
-
-	var addresses []string
-	if epConfig != nil && epConfig.IPAMConfig != nil {
-		if epConfig.IPAMConfig.IPv4Address != "" {
-			addresses = append(addresses, epConfig.IPAMConfig.IPv4Address)
-		}
-
-		if epConfig.IPAMConfig.IPv6Address != "" {
-			addresses = append(addresses, epConfig.IPAMConfig.IPv6Address)
-		}
-	}
-
-	var (
-		config     *networktypes.NetworkingConfig
-		retryCount int
-	)
-
-	for {
-		// In all other cases, attempt to attach to the network to
-		// trigger attachment in the swarm cluster manager.
-		if daemon.clusterProvider != nil {
-			var err error
-			config, err = daemon.clusterProvider.AttachNetwork(idOrName, container.ID, addresses)
-			if err != nil {
-				return nil, nil, err
-			}
-		}
-
-		n, err = daemon.FindNetwork(idOrName)
-		if err != nil {
-			if daemon.clusterProvider != nil {
-				if err := daemon.clusterProvider.DetachNetwork(idOrName, container.ID); err != nil {
-					logrus.Warnf("Could not rollback attachment for container %s to network %s: %v", container.ID, idOrName, err)
-				}
-			}
-
-			// Retry network attach again if we failed to
-			// find the network after successfull
-			// attachment because the only reason that
-			// would happen is if some other container
-			// attached to the swarm scope network went down
-			// and removed the network while we were in
-			// the process of attaching.
-			if config != nil {
-				if _, ok := err.(libnetwork.ErrNoSuchNetwork); ok {
-					if retryCount >= 5 {
-						return nil, nil, fmt.Errorf("could not find network %s after successful attachment", idOrName)
-					}
-					retryCount++
-					continue
-				}
-			}
-
-			return nil, nil, err
-		}
-
-		break
-	}
-
-	// This container has attachment to a swarm scope
-	// network. Update the container network settings accordingly.
-	container.NetworkSettings.HasSwarmEndpoint = true
-	return n, config, nil
-}
-
-// updateContainerNetworkSettings update the network settings
-func (daemon *Daemon) updateContainerNetworkSettings(container *container.Container, endpointsConfig map[string]*networktypes.EndpointSettings) {
-	var n libnetwork.Network
-
-	mode := container.HostConfig.NetworkMode
-	if container.Config.NetworkDisabled || mode.IsContainer() {
-		return
-	}
-
-	networkName := mode.NetworkName()
-	if mode.IsDefault() {
-		networkName = daemon.netController.Config().Daemon.DefaultNetwork
-	}
-
-	if mode.IsUserDefined() {
-		var err error
-
-		n, err = daemon.FindNetwork(networkName)
-		if err == nil {
-			networkName = n.Name()
-		}
-	}
-
-	if container.NetworkSettings == nil {
-		container.NetworkSettings = &network.Settings{}
-	}
-
-	if len(endpointsConfig) > 0 {
-		if container.NetworkSettings.Networks == nil {
-			container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings)
-		}
-
-		for name, epConfig := range endpointsConfig {
-			container.NetworkSettings.Networks[name] = &network.EndpointSettings{
-				EndpointSettings: epConfig,
-			}
-		}
-	}
-
-	if container.NetworkSettings.Networks == nil {
-		container.NetworkSettings.Networks = make(map[string]*network.EndpointSettings)
-		container.NetworkSettings.Networks[networkName] = &network.EndpointSettings{
-			EndpointSettings: &networktypes.EndpointSettings{},
-		}
-	}
-
-	// Convert any settings added by client in default name to
-	// engine's default network name key
-	if mode.IsDefault() {
-		if nConf, ok := container.NetworkSettings.Networks[mode.NetworkName()]; ok {
-			container.NetworkSettings.Networks[networkName] = nConf
-			delete(container.NetworkSettings.Networks, mode.NetworkName())
-		}
-	}
-
-	if !mode.IsUserDefined() {
-		return
-	}
-	// Make sure to internally store the per network endpoint config by network name
-	if _, ok := container.NetworkSettings.Networks[networkName]; ok {
-		return
-	}
-
-	if n != nil {
-		if nwConfig, ok := container.NetworkSettings.Networks[n.ID()]; ok {
-			container.NetworkSettings.Networks[networkName] = nwConfig
-			delete(container.NetworkSettings.Networks, n.ID())
-			return
-		}
-	}
-}
-
-func (daemon *Daemon) allocateNetwork(container *container.Container) error {
-	start := time.Now()
-	controller := daemon.netController
-
-	if daemon.netController == nil {
-		return nil
-	}
-
-	// Cleanup any stale sandbox left over due to ungraceful daemon shutdown
-	if err := controller.SandboxDestroy(container.ID); err != nil {
-		logrus.Errorf("failed to cleanup up stale network sandbox for container %s", container.ID)
-	}
-
-	updateSettings := false
-	if len(container.NetworkSettings.Networks) == 0 {
-		if container.Config.NetworkDisabled || container.HostConfig.NetworkMode.IsContainer() {
-			return nil
-		}
-
-		daemon.updateContainerNetworkSettings(container, nil)
-		updateSettings = true
-	}
-
-	// always connect default network first since only default
-	// network mode support link and we need do some setting
-	// on sandbox initialize for link, but the sandbox only be initialized
-	// on first network connecting.
-	defaultNetName := runconfig.DefaultDaemonNetworkMode().NetworkName()
-	if nConf, ok := container.NetworkSettings.Networks[defaultNetName]; ok {
-		cleanOperationalData(nConf)
-		if err := daemon.connectToNetwork(container, defaultNetName, nConf.EndpointSettings, updateSettings); err != nil {
-			return err
-		}
-
-	}
-
-	// the intermediate map is necessary because "connectToNetwork" modifies "container.NetworkSettings.Networks"
-	networks := make(map[string]*network.EndpointSettings)
-	for n, epConf := range container.NetworkSettings.Networks {
-		if n == defaultNetName {
-			continue
-		}
-
-		networks[n] = epConf
-	}
-
-	for netName, epConf := range networks {
-		cleanOperationalData(epConf)
-		if err := daemon.connectToNetwork(container, netName, epConf.EndpointSettings, updateSettings); err != nil {
-			return err
-		}
-	}
-
-	if err := container.WriteHostConfig(); err != nil {
-		return err
-	}
-	networkActions.WithValues("allocate").UpdateSince(start)
-	return nil
-}
-
-func (daemon *Daemon) getNetworkSandbox(container *container.Container) libnetwork.Sandbox {
-	var sb libnetwork.Sandbox
-	daemon.netController.WalkSandboxes(func(s libnetwork.Sandbox) bool {
-		if s.ContainerID() == container.ID {
-			sb = s
-			return true
-		}
-		return false
-	})
-	return sb
-}
-
-// hasUserDefinedIPAddress returns whether the passed endpoint configuration contains IP address configuration
-func hasUserDefinedIPAddress(epConfig *networktypes.EndpointSettings) bool {
-	return epConfig != nil && epConfig.IPAMConfig != nil && (len(epConfig.IPAMConfig.IPv4Address) > 0 || len(epConfig.IPAMConfig.IPv6Address) > 0)
-}
-
-// User specified ip address is acceptable only for networks with user specified subnets.
-func validateNetworkingConfig(n libnetwork.Network, epConfig *networktypes.EndpointSettings) error {
-	if n == nil || epConfig == nil {
-		return nil
-	}
-	if !hasUserDefinedIPAddress(epConfig) {
-		return nil
-	}
-	_, _, nwIPv4Configs, nwIPv6Configs := n.Info().IpamConfig()
-	for _, s := range []struct {
-		ipConfigured  bool
-		subnetConfigs []*libnetwork.IpamConf
-	}{
-		{
-			ipConfigured:  len(epConfig.IPAMConfig.IPv4Address) > 0,
-			subnetConfigs: nwIPv4Configs,
-		},
-		{
-			ipConfigured:  len(epConfig.IPAMConfig.IPv6Address) > 0,
-			subnetConfigs: nwIPv6Configs,
-		},
-	} {
-		if s.ipConfigured {
-			foundSubnet := false
-			for _, cfg := range s.subnetConfigs {
-				if len(cfg.PreferredPool) > 0 {
-					foundSubnet = true
-					break
-				}
-			}
-			if !foundSubnet {
-				return runconfig.ErrUnsupportedNetworkNoSubnetAndIP
-			}
-		}
-	}
-
-	return nil
-}
-
-// cleanOperationalData resets the operational data from the passed endpoint settings
-func cleanOperationalData(es *network.EndpointSettings) {
-	es.EndpointID = ""
-	es.Gateway = ""
-	es.IPAddress = ""
-	es.IPPrefixLen = 0
-	es.IPv6Gateway = ""
-	es.GlobalIPv6Address = ""
-	es.GlobalIPv6PrefixLen = 0
-	es.MacAddress = ""
-	if es.IPAMOperational {
-		es.IPAMConfig = nil
-	}
-}
-
-func (daemon *Daemon) updateNetworkConfig(container *container.Container, n libnetwork.Network, endpointConfig *networktypes.EndpointSettings, updateSettings bool) error {
-
-	if !containertypes.NetworkMode(n.Name()).IsUserDefined() {
-		if hasUserDefinedIPAddress(endpointConfig) && !enableIPOnPredefinedNetwork() {
-			return runconfig.ErrUnsupportedNetworkAndIP
-		}
-		if endpointConfig != nil && len(endpointConfig.Aliases) > 0 && !container.EnableServiceDiscoveryOnDefaultNetwork() {
-			return runconfig.ErrUnsupportedNetworkAndAlias
-		}
-	} else {
-		addShortID := true
-		shortID := stringid.TruncateID(container.ID)
-		for _, alias := range endpointConfig.Aliases {
-			if alias == shortID {
-				addShortID = false
-				break
-			}
-		}
-		if addShortID {
-			endpointConfig.Aliases = append(endpointConfig.Aliases, shortID)
-		}
-	}
-
-	if err := validateNetworkingConfig(n, endpointConfig); err != nil {
-		return err
-	}
-
-	if updateSettings {
-		if err := daemon.updateNetworkSettings(container, n, endpointConfig); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (daemon *Daemon) connectToNetwork(container *container.Container, idOrName string, endpointConfig *networktypes.EndpointSettings, updateSettings bool) (err error) {
-	start := time.Now()
-	if container.HostConfig.NetworkMode.IsContainer() {
-		return runconfig.ErrConflictSharedNetwork
-	}
-	if containertypes.NetworkMode(idOrName).IsBridge() &&
-		daemon.configStore.DisableBridge {
-		container.Config.NetworkDisabled = true
-		return nil
-	}
-	if endpointConfig == nil {
-		endpointConfig = &networktypes.EndpointSettings{}
-	}
-
-	n, config, err := daemon.findAndAttachNetwork(container, idOrName, endpointConfig)
-	if err != nil {
-		return err
-	}
-	if n == nil {
-		return nil
-	}
-
-	var operIPAM bool
-	if config != nil {
-		if epConfig, ok := config.EndpointsConfig[n.Name()]; ok {
-			if endpointConfig.IPAMConfig == nil ||
-				(endpointConfig.IPAMConfig.IPv4Address == "" &&
-					endpointConfig.IPAMConfig.IPv6Address == "" &&
-					len(endpointConfig.IPAMConfig.LinkLocalIPs) == 0) {
-				operIPAM = true
-			}
-
-			// copy IPAMConfig and NetworkID from epConfig via AttachNetwork
-			endpointConfig.IPAMConfig = epConfig.IPAMConfig
-			endpointConfig.NetworkID = epConfig.NetworkID
-		}
-	}
-
-	err = daemon.updateNetworkConfig(container, n, endpointConfig, updateSettings)
-	if err != nil {
-		return err
-	}
-
-	controller := daemon.netController
-	sb := daemon.getNetworkSandbox(container)
-	createOptions, err := container.BuildCreateEndpointOptions(n, endpointConfig, sb, daemon.configStore.DNS)
-	if err != nil {
-		return err
-	}
-
-	endpointName := strings.TrimPrefix(container.Name, "/")
-	ep, err := n.CreateEndpoint(endpointName, createOptions...)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			if e := ep.Delete(false); e != nil {
-				logrus.Warnf("Could not rollback container connection to network %s", idOrName)
-			}
-		}
-	}()
-	container.NetworkSettings.Networks[n.Name()] = &network.EndpointSettings{
-		EndpointSettings: endpointConfig,
-		IPAMOperational:  operIPAM,
-	}
-	if _, ok := container.NetworkSettings.Networks[n.ID()]; ok {
-		delete(container.NetworkSettings.Networks, n.ID())
-	}
-
-	if err := daemon.updateEndpointNetworkSettings(container, n, ep); err != nil {
-		return err
-	}
-
-	if sb == nil {
-		options, err := daemon.buildSandboxOptions(container)
-		if err != nil {
-			return err
-		}
-		sb, err = controller.NewSandbox(container.ID, options...)
-		if err != nil {
-			return err
-		}
-
-		container.UpdateSandboxNetworkSettings(sb)
-	}
-
-	joinOptions, err := container.BuildJoinOptions(n)
-	if err != nil {
-		return err
-	}
-
-	if err := ep.Join(sb, joinOptions...); err != nil {
-		return err
-	}
-
-	if !container.Managed {
-		// add container name/alias to DNS
-		if err := daemon.ActivateContainerServiceBinding(container.Name); err != nil {
-			return fmt.Errorf("Activate container service binding for %s failed: %v", container.Name, err)
-		}
-	}
-
-	if err := container.UpdateJoinInfo(n, ep); err != nil {
-		return fmt.Errorf("Updating join info failed: %v", err)
-	}
-
-	container.NetworkSettings.Ports = getPortMapInfo(sb)
-
-	daemon.LogNetworkEventWithAttributes(n, "connect", map[string]string{"container": container.ID})
-	networkActions.WithValues("connect").UpdateSince(start)
-	return nil
-}
-
-// ForceEndpointDelete deletes an endpoint from a network forcefully
-func (daemon *Daemon) ForceEndpointDelete(name string, networkName string) error {
-	n, err := daemon.FindNetwork(networkName)
-	if err != nil {
-		return err
-	}
-
-	ep, err := n.EndpointByName(name)
-	if err != nil {
-		return err
-	}
-	return ep.Delete(true)
-}
-
-func (daemon *Daemon) disconnectFromNetwork(container *container.Container, n libnetwork.Network, force bool) error {
-	var (
-		ep   libnetwork.Endpoint
-		sbox libnetwork.Sandbox
-	)
-
-	s := func(current libnetwork.Endpoint) bool {
-		epInfo := current.Info()
-		if epInfo == nil {
-			return false
-		}
-		if sb := epInfo.Sandbox(); sb != nil {
-			if sb.ContainerID() == container.ID {
-				ep = current
-				sbox = sb
-				return true
-			}
-		}
-		return false
-	}
-	n.WalkEndpoints(s)
-
-	if ep == nil && force {
-		epName := strings.TrimPrefix(container.Name, "/")
-		ep, err := n.EndpointByName(epName)
-		if err != nil {
-			return err
-		}
-		return ep.Delete(force)
-	}
-
-	if ep == nil {
-		return fmt.Errorf("container %s is not connected to the network", container.ID)
-	}
-
-	if err := ep.Leave(sbox); err != nil {
-		return fmt.Errorf("container %s failed to leave network %s: %v", container.ID, n.Name(), err)
-	}
-
-	container.NetworkSettings.Ports = getPortMapInfo(sbox)
-
-	if err := ep.Delete(false); err != nil {
-		return fmt.Errorf("endpoint delete failed for container %s on network %s: %v", container.ID, n.Name(), err)
-	}
-
-	delete(container.NetworkSettings.Networks, n.Name())
-
-	if daemon.clusterProvider != nil && n.Info().Dynamic() && !container.Managed {
-		if err := daemon.clusterProvider.DetachNetwork(n.Name(), container.ID); err != nil {
-			logrus.Warnf("error detaching from network %s: %v", n.Name(), err)
-			if err := daemon.clusterProvider.DetachNetwork(n.ID(), container.ID); err != nil {
-				logrus.Warnf("error detaching from network %s: %v", n.ID(), err)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (daemon *Daemon) initializeNetworking(container *container.Container) error {
-	var err error
-
-	if container.HostConfig.NetworkMode.IsContainer() {
-		// we need to get the hosts files from the container to join
-		nc, err := daemon.getNetworkedContainer(container.ID, container.HostConfig.NetworkMode.ConnectedContainer())
-		if err != nil {
-			return err
-		}
-		initializeNetworkingPaths(container, nc)
-		container.Config.Hostname = nc.Config.Hostname
-		container.Config.Domainname = nc.Config.Domainname
-		return nil
-	}
-
-	if container.HostConfig.NetworkMode.IsHost() {
-		if container.Config.Hostname == "" {
-			container.Config.Hostname, err = os.Hostname()
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	if err := daemon.allocateNetwork(container); err != nil {
-		return err
-	}
-
-	return container.BuildHostnameFile()
-}
-
-func (daemon *Daemon) getNetworkedContainer(containerID, connectedContainerID string) (*container.Container, error) {
-	nc, err := daemon.GetContainer(connectedContainerID)
-	if err != nil {
-		return nil, err
-	}
-	if containerID == nc.ID {
-		return nil, fmt.Errorf("cannot join own network")
-	}
-	if !nc.IsRunning() {
-		err := fmt.Errorf("cannot join network of a non running container: %s", connectedContainerID)
-		return nil, derr.NewRequestConflictError(err)
-	}
-	if nc.IsRestarting() {
-		return nil, errContainerIsRestarting(connectedContainerID)
-	}
-	return nc, nil
-}
-
-func (daemon *Daemon) releaseNetwork(container *container.Container) {
-	start := time.Now()
-	if daemon.netController == nil {
-		return
-	}
-	if container.HostConfig.NetworkMode.IsContainer() || container.Config.NetworkDisabled {
-		return
-	}
-
-	sid := container.NetworkSettings.SandboxID
-	settings := container.NetworkSettings.Networks
-	container.NetworkSettings.Ports = nil
-
-	if sid == "" || len(settings) == 0 {
-		return
-	}
-
-	var networks []libnetwork.Network
-	for n, epSettings := range settings {
-		if nw, err := daemon.FindNetwork(n); err == nil {
-			networks = append(networks, nw)
-		}
-
-		if epSettings.EndpointSettings == nil {
-			continue
-		}
-
-		cleanOperationalData(epSettings)
-	}
-
-	sb, err := daemon.netController.SandboxByID(sid)
-	if err != nil {
-		logrus.Warnf("error locating sandbox id %s: %v", sid, err)
-		return
-	}
-
-	if err := sb.Delete(); err != nil {
-		logrus.Errorf("Error deleting sandbox id %s for container %s: %v", sid, container.ID, err)
-	}
-
-	for _, nw := range networks {
-		if daemon.clusterProvider != nil && nw.Info().Dynamic() && !container.Managed {
-			if err := daemon.clusterProvider.DetachNetwork(nw.Name(), container.ID); err != nil {
-				logrus.Warnf("error detaching from network %s: %v", nw.Name(), err)
-				if err := daemon.clusterProvider.DetachNetwork(nw.ID(), container.ID); err != nil {
-					logrus.Warnf("error detaching from network %s: %v", nw.ID(), err)
-				}
-			}
-		}
-
-		attributes := map[string]string{
-			"container": container.ID,
-		}
-		daemon.LogNetworkEventWithAttributes(nw, "disconnect", attributes)
-	}
-	networkActions.WithValues("release").UpdateSince(start)
-}
-
-func errRemovalContainer(containerID string) error {
-	return fmt.Errorf("Container %s is marked for removal and cannot be connected or disconnected to the network", containerID)
-}
-
-// ConnectToNetwork connects a container to a network
-func (daemon *Daemon) ConnectToNetwork(container *container.Container, idOrName string, endpointConfig *networktypes.EndpointSettings) error {
-	if endpointConfig == nil {
-		endpointConfig = &networktypes.EndpointSettings{}
-	}
-	if !container.Running {
-		if container.RemovalInProgress || container.Dead {
-			return errRemovalContainer(container.ID)
-		}
-
-		n, err := daemon.FindNetwork(idOrName)
-		if err == nil && n != nil {
-			if err := daemon.updateNetworkConfig(container, n, endpointConfig, true); err != nil {
-				return err
-			}
-		} else {
-			container.NetworkSettings.Networks[idOrName] = &network.EndpointSettings{
-				EndpointSettings: endpointConfig,
-			}
-		}
-	} else if !daemon.isNetworkHotPluggable() {
-		return fmt.Errorf(runtime.GOOS + " does not support connecting a running container to a network")
-	} else {
-		if err := daemon.connectToNetwork(container, idOrName, endpointConfig, true); err != nil {
-			return err
-		}
-	}
-	if err := container.ToDiskLocking(); err != nil {
-		return fmt.Errorf("Error saving container to disk: %v", err)
-	}
-	return nil
-}
-
-// DisconnectFromNetwork disconnects container from network n.
-func (daemon *Daemon) DisconnectFromNetwork(container *container.Container, networkName string, force bool) error {
-	n, err := daemon.FindNetwork(networkName)
-	if !container.Running || (err != nil && force) {
-		if container.RemovalInProgress || container.Dead {
-			return errRemovalContainer(container.ID)
-		}
-		// In case networkName is resolved we will use n.Name()
-		// this will cover the case where network id is passed.
-		if n != nil {
-			networkName = n.Name()
-		}
-		if _, ok := container.NetworkSettings.Networks[networkName]; !ok {
-			return fmt.Errorf("container %s is not connected to the network %s", container.ID, networkName)
-		}
-		delete(container.NetworkSettings.Networks, networkName)
-	} else if err == nil && !daemon.isNetworkHotPluggable() {
-		return fmt.Errorf(runtime.GOOS + " does not support connecting a running container to a network")
-	} else if err == nil {
-		if container.HostConfig.NetworkMode.IsHost() && containertypes.NetworkMode(n.Type()).IsHost() {
-			return runconfig.ErrConflictHostNetwork
-		}
-
-		if err := daemon.disconnectFromNetwork(container, n, false); err != nil {
-			return err
-		}
-	} else {
-		return err
-	}
-
-	if err := container.ToDiskLocking(); err != nil {
-		return fmt.Errorf("Error saving container to disk: %v", err)
-	}
-
-	if n != nil {
-		attributes := map[string]string{
-			"container": container.ID,
-		}
-		daemon.LogNetworkEventWithAttributes(n, "disconnect", attributes)
-	}
-	return nil
-}
-
-// ActivateContainerServiceBinding puts this container into load balancer active rotation and DNS response
-func (daemon *Daemon) ActivateContainerServiceBinding(containerName string) error {
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		return err
-	}
-	sb := daemon.getNetworkSandbox(container)
-	if sb == nil {
-		return fmt.Errorf("network sandbox does not exist for container %s", containerName)
-	}
-	return sb.EnableService()
-}
-
-// DeactivateContainerServiceBinding remove this container fromload balancer active rotation, and DNS response
-func (daemon *Daemon) DeactivateContainerServiceBinding(containerName string) error {
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		return err
-	}
-	sb := daemon.getNetworkSandbox(container)
-	if sb == nil {
-		return fmt.Errorf("network sandbox does not exist for container %s", containerName)
-	}
-	return sb.DisableService()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/container_operations_solaris.go b/installer/vendor/github.com/docker/docker/daemon/container_operations_solaris.go
deleted file mode 100644
index 1653948de1..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/container_operations_solaris.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build solaris
-
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
-)
-
-func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {
-	return nil, nil
-}
-
-func (daemon *Daemon) setupIpcDirs(container *container.Container) error {
-	return nil
-}
-
-func killProcessDirectly(container *container.Container) error {
-	return nil
-}
-
-func detachMounted(path string) error {
-	return nil
-}
-
-func isLinkable(child *container.Container) bool {
-	// A container is linkable only if it belongs to the default network
-	_, ok := child.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
-	return ok
-}
-
-func enableIPOnPredefinedNetwork() bool {
-	return false
-}
-
-func (daemon *Daemon) isNetworkHotPluggable() bool {
-	return false
-}
-
-func setupPathsAndSandboxOptions(container *container.Container, sboxOptions *[]libnetwork.SandboxOption) error {
-	return nil
-}
-
-func initializeNetworkingPaths(container *container.Container, nc *container.Container) {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/container_operations_unix.go b/installer/vendor/github.com/docker/docker/daemon/container_operations_unix.go
deleted file mode 100644
index 2296045765..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/container_operations_unix.go
+++ /dev/null
@@ -1,281 +0,0 @@
-// +build linux freebsd
-
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/cloudflare/cfssl/log"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/links"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
-	"github.com/opencontainers/runc/libcontainer/label"
-	"github.com/pkg/errors"
-)
-
-func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {
-	var env []string
-	children := daemon.children(container)
-
-	bridgeSettings := container.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
-	if bridgeSettings == nil || bridgeSettings.EndpointSettings == nil {
-		return nil, nil
-	}
-
-	for linkAlias, child := range children {
-		if !child.IsRunning() {
-			return nil, fmt.Errorf("Cannot link to a non running container: %s AS %s", child.Name, linkAlias)
-		}
-
-		childBridgeSettings := child.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
-		if childBridgeSettings == nil || childBridgeSettings.EndpointSettings == nil {
-			return nil, fmt.Errorf("container %s not attached to default bridge network", child.ID)
-		}
-
-		link := links.NewLink(
-			bridgeSettings.IPAddress,
-			childBridgeSettings.IPAddress,
-			linkAlias,
-			child.Config.Env,
-			child.Config.ExposedPorts,
-		)
-
-		env = append(env, link.ToEnv()...)
-	}
-
-	return env, nil
-}
-
-func (daemon *Daemon) getIpcContainer(container *container.Container) (*container.Container, error) {
-	containerID := container.HostConfig.IpcMode.Container()
-	c, err := daemon.GetContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-	if !c.IsRunning() {
-		return nil, fmt.Errorf("cannot join IPC of a non running container: %s", containerID)
-	}
-	if c.IsRestarting() {
-		return nil, errContainerIsRestarting(container.ID)
-	}
-	return c, nil
-}
-
-func (daemon *Daemon) getPidContainer(container *container.Container) (*container.Container, error) {
-	containerID := container.HostConfig.PidMode.Container()
-	c, err := daemon.GetContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-	if !c.IsRunning() {
-		return nil, fmt.Errorf("cannot join PID of a non running container: %s", containerID)
-	}
-	if c.IsRestarting() {
-		return nil, errContainerIsRestarting(container.ID)
-	}
-	return c, nil
-}
-
-func (daemon *Daemon) setupIpcDirs(c *container.Container) error {
-	var err error
-
-	c.ShmPath, err = c.ShmResourcePath()
-	if err != nil {
-		return err
-	}
-
-	if c.HostConfig.IpcMode.IsContainer() {
-		ic, err := daemon.getIpcContainer(c)
-		if err != nil {
-			return err
-		}
-		c.ShmPath = ic.ShmPath
-	} else if c.HostConfig.IpcMode.IsHost() {
-		if _, err := os.Stat("/dev/shm"); err != nil {
-			return fmt.Errorf("/dev/shm is not mounted, but must be for --ipc=host")
-		}
-		c.ShmPath = "/dev/shm"
-	} else {
-		rootUID, rootGID := daemon.GetRemappedUIDGID()
-		if !c.HasMountFor("/dev/shm") {
-			shmPath, err := c.ShmResourcePath()
-			if err != nil {
-				return err
-			}
-
-			if err := idtools.MkdirAllAs(shmPath, 0700, rootUID, rootGID); err != nil {
-				return err
-			}
-
-			shmSize := container.DefaultSHMSize
-			if c.HostConfig.ShmSize != 0 {
-				shmSize = c.HostConfig.ShmSize
-			}
-			shmproperty := "mode=1777,size=" + strconv.FormatInt(shmSize, 10)
-			if err := syscall.Mount("shm", shmPath, "tmpfs", uintptr(syscall.MS_NOEXEC|syscall.MS_NOSUID|syscall.MS_NODEV), label.FormatMountLabel(shmproperty, c.GetMountLabel())); err != nil {
-				return fmt.Errorf("mounting shm tmpfs: %s", err)
-			}
-			if err := os.Chown(shmPath, rootUID, rootGID); err != nil {
-				return err
-			}
-		}
-
-	}
-
-	return nil
-}
-
-func (daemon *Daemon) setupSecretDir(c *container.Container) (setupErr error) {
-	if len(c.SecretReferences) == 0 {
-		return nil
-	}
-
-	localMountPath := c.SecretMountPath()
-	logrus.Debugf("secrets: setting up secret dir: %s", localMountPath)
-
-	defer func() {
-		if setupErr != nil {
-			// cleanup
-			_ = detachMounted(localMountPath)
-
-			if err := os.RemoveAll(localMountPath); err != nil {
-				log.Errorf("error cleaning up secret mount: %s", err)
-			}
-		}
-	}()
-
-	// retrieve possible remapped range start for root UID, GID
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	// create tmpfs
-	if err := idtools.MkdirAllAs(localMountPath, 0700, rootUID, rootGID); err != nil {
-		return errors.Wrap(err, "error creating secret local mount path")
-	}
-	tmpfsOwnership := fmt.Sprintf("uid=%d,gid=%d", rootUID, rootGID)
-	if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "nodev,nosuid,noexec,"+tmpfsOwnership); err != nil {
-		return errors.Wrap(err, "unable to setup secret mount")
-	}
-
-	for _, s := range c.SecretReferences {
-		if c.SecretStore == nil {
-			return fmt.Errorf("secret store is not initialized")
-		}
-
-		// TODO (ehazlett): use type switch when more are supported
-		if s.File == nil {
-			return fmt.Errorf("secret target type is not a file target")
-		}
-
-		targetPath := filepath.Clean(s.File.Name)
-		// ensure that the target is a filename only; no paths allowed
-		if targetPath != filepath.Base(targetPath) {
-			return fmt.Errorf("error creating secret: secret must not be a path")
-		}
-
-		fPath := filepath.Join(localMountPath, targetPath)
-		if err := idtools.MkdirAllAs(filepath.Dir(fPath), 0700, rootUID, rootGID); err != nil {
-			return errors.Wrap(err, "error creating secret mount path")
-		}
-
-		logrus.WithFields(logrus.Fields{
-			"name": s.File.Name,
-			"path": fPath,
-		}).Debug("injecting secret")
-		secret := c.SecretStore.Get(s.SecretID)
-		if secret == nil {
-			return fmt.Errorf("unable to get secret from secret store")
-		}
-		if err := ioutil.WriteFile(fPath, secret.Spec.Data, s.File.Mode); err != nil {
-			return errors.Wrap(err, "error injecting secret")
-		}
-
-		uid, err := strconv.Atoi(s.File.UID)
-		if err != nil {
-			return err
-		}
-		gid, err := strconv.Atoi(s.File.GID)
-		if err != nil {
-			return err
-		}
-
-		if err := os.Chown(fPath, rootUID+uid, rootGID+gid); err != nil {
-			return errors.Wrap(err, "error setting ownership for secret")
-		}
-	}
-
-	// remount secrets ro
-	if err := mount.Mount("tmpfs", localMountPath, "tmpfs", "remount,ro,"+tmpfsOwnership); err != nil {
-		return errors.Wrap(err, "unable to remount secret dir as readonly")
-	}
-
-	return nil
-}
-
-func killProcessDirectly(container *container.Container) error {
-	if _, err := container.WaitStop(10 * time.Second); err != nil {
-		// Ensure that we don't kill ourselves
-		if pid := container.GetPID(); pid != 0 {
-			logrus.Infof("Container %s failed to exit within 10 seconds of kill - trying direct SIGKILL", stringid.TruncateID(container.ID))
-			if err := syscall.Kill(pid, 9); err != nil {
-				if err != syscall.ESRCH {
-					return err
-				}
-				e := errNoSuchProcess{pid, 9}
-				logrus.Debug(e)
-				return e
-			}
-		}
-	}
-	return nil
-}
-
-func detachMounted(path string) error {
-	return syscall.Unmount(path, syscall.MNT_DETACH)
-}
-
-func isLinkable(child *container.Container) bool {
-	// A container is linkable only if it belongs to the default network
-	_, ok := child.NetworkSettings.Networks[runconfig.DefaultDaemonNetworkMode().NetworkName()]
-	return ok
-}
-
-func enableIPOnPredefinedNetwork() bool {
-	return false
-}
-
-func (daemon *Daemon) isNetworkHotPluggable() bool {
-	return true
-}
-
-func setupPathsAndSandboxOptions(container *container.Container, sboxOptions *[]libnetwork.SandboxOption) error {
-	var err error
-
-	container.HostsPath, err = container.GetRootResourcePath("hosts")
-	if err != nil {
-		return err
-	}
-	*sboxOptions = append(*sboxOptions, libnetwork.OptionHostsPath(container.HostsPath))
-
-	container.ResolvConfPath, err = container.GetRootResourcePath("resolv.conf")
-	if err != nil {
-		return err
-	}
-	*sboxOptions = append(*sboxOptions, libnetwork.OptionResolvConfPath(container.ResolvConfPath))
-	return nil
-}
-
-func initializeNetworkingPaths(container *container.Container, nc *container.Container) {
-	container.HostnamePath = nc.HostnamePath
-	container.HostsPath = nc.HostsPath
-	container.ResolvConfPath = nc.ResolvConfPath
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/container_operations_windows.go b/installer/vendor/github.com/docker/docker/daemon/container_operations_windows.go
deleted file mode 100644
index d05f251e05..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/container_operations_windows.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build windows
-
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/libnetwork"
-)
-
-func (daemon *Daemon) setupLinkedContainers(container *container.Container) ([]string, error) {
-	return nil, nil
-}
-
-// getSize returns real size & virtual size
-func (daemon *Daemon) getSize(container *container.Container) (int64, int64) {
-	// TODO Windows
-	return 0, 0
-}
-
-func (daemon *Daemon) setupIpcDirs(container *container.Container) error {
-	return nil
-}
-
-// TODO Windows: Fix Post-TP5. This is a hack to allow docker cp to work
-// against containers which have volumes. You will still be able to cp
-// to somewhere on the container drive, but not to any mounted volumes
-// inside the container. Without this fix, docker cp is broken to any
-// container which has a volume, regardless of where the file is inside the
-// container.
-func (daemon *Daemon) mountVolumes(container *container.Container) error {
-	return nil
-}
-
-func detachMounted(path string) error {
-	return nil
-}
-
-func killProcessDirectly(container *container.Container) error {
-	return nil
-}
-
-func isLinkable(child *container.Container) bool {
-	return false
-}
-
-func enableIPOnPredefinedNetwork() bool {
-	return true
-}
-
-func (daemon *Daemon) isNetworkHotPluggable() bool {
-	return false
-}
-
-func setupPathsAndSandboxOptions(container *container.Container, sboxOptions *[]libnetwork.SandboxOption) error {
-	return nil
-}
-
-func initializeNetworkingPaths(container *container.Container, nc *container.Container) {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/create.go b/installer/vendor/github.com/docker/docker/daemon/create.go
deleted file mode 100644
index c71d14e5fc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/create.go
+++ /dev/null
@@ -1,290 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"net"
-	"runtime"
-	"strings"
-	"time"
-
-	"github.com/pkg/errors"
-
-	"github.com/Sirupsen/logrus"
-	apierrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/runconfig"
-	volumestore "github.com/docker/docker/volume/store"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-// CreateManagedContainer creates a container that is managed by a Service
-func (daemon *Daemon) CreateManagedContainer(params types.ContainerCreateConfig) (containertypes.ContainerCreateCreatedBody, error) {
-	return daemon.containerCreate(params, true)
-}
-
-// ContainerCreate creates a regular container
-func (daemon *Daemon) ContainerCreate(params types.ContainerCreateConfig) (containertypes.ContainerCreateCreatedBody, error) {
-	return daemon.containerCreate(params, false)
-}
-
-func (daemon *Daemon) containerCreate(params types.ContainerCreateConfig, managed bool) (containertypes.ContainerCreateCreatedBody, error) {
-	start := time.Now()
-	if params.Config == nil {
-		return containertypes.ContainerCreateCreatedBody{}, fmt.Errorf("Config cannot be empty in order to create a container")
-	}
-
-	warnings, err := daemon.verifyContainerSettings(params.HostConfig, params.Config, false)
-	if err != nil {
-		return containertypes.ContainerCreateCreatedBody{Warnings: warnings}, err
-	}
-
-	err = daemon.verifyNetworkingConfig(params.NetworkingConfig)
-	if err != nil {
-		return containertypes.ContainerCreateCreatedBody{Warnings: warnings}, err
-	}
-
-	if params.HostConfig == nil {
-		params.HostConfig = &containertypes.HostConfig{}
-	}
-	err = daemon.adaptContainerSettings(params.HostConfig, params.AdjustCPUShares)
-	if err != nil {
-		return containertypes.ContainerCreateCreatedBody{Warnings: warnings}, err
-	}
-
-	container, err := daemon.create(params, managed)
-	if err != nil {
-		return containertypes.ContainerCreateCreatedBody{Warnings: warnings}, daemon.imageNotExistToErrcode(err)
-	}
-	containerActions.WithValues("create").UpdateSince(start)
-
-	return containertypes.ContainerCreateCreatedBody{ID: container.ID, Warnings: warnings}, nil
-}
-
-// Create creates a new container from the given configuration with a given name.
-func (daemon *Daemon) create(params types.ContainerCreateConfig, managed bool) (retC *container.Container, retErr error) {
-	var (
-		container *container.Container
-		img       *image.Image
-		imgID     image.ID
-		err       error
-	)
-
-	if params.Config.Image != "" {
-		img, err = daemon.GetImage(params.Config.Image)
-		if err != nil {
-			return nil, err
-		}
-
-		if runtime.GOOS == "solaris" && img.OS != "solaris " {
-			return nil, errors.New("Platform on which parent image was created is not Solaris")
-		}
-		imgID = img.ID()
-	}
-
-	if err := daemon.mergeAndVerifyConfig(params.Config, img); err != nil {
-		return nil, err
-	}
-
-	if err := daemon.mergeAndVerifyLogConfig(&params.HostConfig.LogConfig); err != nil {
-		return nil, err
-	}
-
-	if container, err = daemon.newContainer(params.Name, params.Config, params.HostConfig, imgID, managed); err != nil {
-		return nil, err
-	}
-	defer func() {
-		if retErr != nil {
-			if err := daemon.cleanupContainer(container, true, true); err != nil {
-				logrus.Errorf("failed to cleanup container on create error: %v", err)
-			}
-		}
-	}()
-
-	if err := daemon.setSecurityOptions(container, params.HostConfig); err != nil {
-		return nil, err
-	}
-
-	container.HostConfig.StorageOpt = params.HostConfig.StorageOpt
-
-	// Set RWLayer for container after mount labels have been set
-	if err := daemon.setRWLayer(container); err != nil {
-		return nil, err
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(daemon.uidMaps, daemon.gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	if err := idtools.MkdirAs(container.Root, 0700, rootUID, rootGID); err != nil {
-		return nil, err
-	}
-	if err := idtools.MkdirAs(container.CheckpointDir(), 0700, rootUID, rootGID); err != nil {
-		return nil, err
-	}
-
-	if err := daemon.setHostConfig(container, params.HostConfig); err != nil {
-		return nil, err
-	}
-
-	if err := daemon.createContainerPlatformSpecificSettings(container, params.Config, params.HostConfig); err != nil {
-		return nil, err
-	}
-
-	var endpointsConfigs map[string]*networktypes.EndpointSettings
-	if params.NetworkingConfig != nil {
-		endpointsConfigs = params.NetworkingConfig.EndpointsConfig
-	}
-	// Make sure NetworkMode has an acceptable value. We do this to ensure
-	// backwards API compatibility.
-	container.HostConfig = runconfig.SetDefaultNetModeIfBlank(container.HostConfig)
-
-	daemon.updateContainerNetworkSettings(container, endpointsConfigs)
-
-	if err := container.ToDisk(); err != nil {
-		logrus.Errorf("Error saving new container to disk: %v", err)
-		return nil, err
-	}
-	if err := daemon.Register(container); err != nil {
-		return nil, err
-	}
-	daemon.LogContainerEvent(container, "create")
-	return container, nil
-}
-
-func (daemon *Daemon) generateSecurityOpt(ipcMode containertypes.IpcMode, pidMode containertypes.PidMode, privileged bool) ([]string, error) {
-	if ipcMode.IsHost() || pidMode.IsHost() || privileged {
-		return label.DisableSecOpt(), nil
-	}
-
-	var ipcLabel []string
-	var pidLabel []string
-	ipcContainer := ipcMode.Container()
-	pidContainer := pidMode.Container()
-	if ipcContainer != "" {
-		c, err := daemon.GetContainer(ipcContainer)
-		if err != nil {
-			return nil, err
-		}
-		ipcLabel = label.DupSecOpt(c.ProcessLabel)
-		if pidContainer == "" {
-			return ipcLabel, err
-		}
-	}
-	if pidContainer != "" {
-		c, err := daemon.GetContainer(pidContainer)
-		if err != nil {
-			return nil, err
-		}
-
-		pidLabel = label.DupSecOpt(c.ProcessLabel)
-		if ipcContainer == "" {
-			return pidLabel, err
-		}
-	}
-
-	if pidLabel != nil && ipcLabel != nil {
-		for i := 0; i < len(pidLabel); i++ {
-			if pidLabel[i] != ipcLabel[i] {
-				return nil, fmt.Errorf("--ipc and --pid containers SELinux labels aren't the same")
-			}
-		}
-		return pidLabel, nil
-	}
-	return nil, nil
-}
-
-func (daemon *Daemon) setRWLayer(container *container.Container) error {
-	var layerID layer.ChainID
-	if container.ImageID != "" {
-		img, err := daemon.imageStore.Get(container.ImageID)
-		if err != nil {
-			return err
-		}
-		layerID = img.RootFS.ChainID()
-	}
-
-	rwLayer, err := daemon.layerStore.CreateRWLayer(container.ID, layerID, container.MountLabel, daemon.getLayerInit(), container.HostConfig.StorageOpt)
-
-	if err != nil {
-		return err
-	}
-	container.RWLayer = rwLayer
-
-	return nil
-}
-
-// VolumeCreate creates a volume with the specified name, driver, and opts
-// This is called directly from the Engine API
-func (daemon *Daemon) VolumeCreate(name, driverName string, opts, labels map[string]string) (*types.Volume, error) {
-	if name == "" {
-		name = stringid.GenerateNonCryptoID()
-	}
-
-	v, err := daemon.volumes.Create(name, driverName, opts, labels)
-	if err != nil {
-		if volumestore.IsNameConflict(err) {
-			return nil, fmt.Errorf("A volume named %s already exists. Choose a different volume name.", name)
-		}
-		return nil, err
-	}
-
-	daemon.LogVolumeEvent(v.Name(), "create", map[string]string{"driver": v.DriverName()})
-	apiV := volumeToAPIType(v)
-	apiV.Mountpoint = v.Path()
-	return apiV, nil
-}
-
-func (daemon *Daemon) mergeAndVerifyConfig(config *containertypes.Config, img *image.Image) error {
-	if img != nil && img.Config != nil {
-		if err := merge(config, img.Config); err != nil {
-			return err
-		}
-	}
-	// Reset the Entrypoint if it is [""]
-	if len(config.Entrypoint) == 1 && config.Entrypoint[0] == "" {
-		config.Entrypoint = nil
-	}
-	if len(config.Entrypoint) == 0 && len(config.Cmd) == 0 {
-		return fmt.Errorf("No command specified")
-	}
-	return nil
-}
-
-// Checks if the client set configurations for more than one network while creating a container
-// Also checks if the IPAMConfig is valid
-func (daemon *Daemon) verifyNetworkingConfig(nwConfig *networktypes.NetworkingConfig) error {
-	if nwConfig == nil || len(nwConfig.EndpointsConfig) == 0 {
-		return nil
-	}
-	if len(nwConfig.EndpointsConfig) == 1 {
-		for _, v := range nwConfig.EndpointsConfig {
-			if v != nil && v.IPAMConfig != nil {
-				if v.IPAMConfig.IPv4Address != "" && net.ParseIP(v.IPAMConfig.IPv4Address).To4() == nil {
-					return apierrors.NewBadRequestError(fmt.Errorf("invalid IPv4 address: %s", v.IPAMConfig.IPv4Address))
-				}
-				if v.IPAMConfig.IPv6Address != "" {
-					n := net.ParseIP(v.IPAMConfig.IPv6Address)
-					// if the address is an invalid network address (ParseIP == nil) or if it is
-					// an IPv4 address (To4() != nil), then it is an invalid IPv6 address
-					if n == nil || n.To4() != nil {
-						return apierrors.NewBadRequestError(fmt.Errorf("invalid IPv6 address: %s", v.IPAMConfig.IPv6Address))
-					}
-				}
-			}
-		}
-		return nil
-	}
-	l := make([]string, 0, len(nwConfig.EndpointsConfig))
-	for k := range nwConfig.EndpointsConfig {
-		l = append(l, k)
-	}
-	err := fmt.Errorf("Container cannot be connected to network endpoints: %s", strings.Join(l, ", "))
-	return apierrors.NewBadRequestError(err)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/create_unix.go b/installer/vendor/github.com/docker/docker/daemon/create_unix.go
deleted file mode 100644
index 2fe5c98a79..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/create_unix.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-// createContainerPlatformSpecificSettings performs platform specific container create functionality
-func (daemon *Daemon) createContainerPlatformSpecificSettings(container *container.Container, config *containertypes.Config, hostConfig *containertypes.HostConfig) error {
-	if err := daemon.Mount(container); err != nil {
-		return err
-	}
-	defer daemon.Unmount(container)
-
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	if err := container.SetupWorkingDirectory(rootUID, rootGID); err != nil {
-		return err
-	}
-
-	for spec := range config.Volumes {
-		name := stringid.GenerateNonCryptoID()
-		destination := filepath.Clean(spec)
-
-		// Skip volumes for which we already have something mounted on that
-		// destination because of a --volume-from.
-		if container.IsDestinationMounted(destination) {
-			continue
-		}
-		path, err := container.GetResourcePath(destination)
-		if err != nil {
-			return err
-		}
-
-		stat, err := os.Stat(path)
-		if err == nil && !stat.IsDir() {
-			return fmt.Errorf("cannot mount volume over existing file, file exists %s", path)
-		}
-
-		v, err := daemon.volumes.CreateWithRef(name, hostConfig.VolumeDriver, container.ID, nil, nil)
-		if err != nil {
-			return err
-		}
-
-		if err := label.Relabel(v.Path(), container.MountLabel, true); err != nil {
-			return err
-		}
-
-		container.AddMountPointWithVolume(destination, v, true)
-	}
-	return daemon.populateVolumes(container)
-}
-
-// populateVolumes copies data from the container's rootfs into the volume for non-binds.
-// this is only called when the container is created.
-func (daemon *Daemon) populateVolumes(c *container.Container) error {
-	for _, mnt := range c.MountPoints {
-		if mnt.Volume == nil {
-			continue
-		}
-
-		if mnt.Type != mounttypes.TypeVolume || !mnt.CopyData {
-			continue
-		}
-
-		logrus.Debugf("copying image data from %s:%s, to %s", c.ID, mnt.Destination, mnt.Name)
-		if err := c.CopyImagePathContent(mnt.Volume, mnt.Destination); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/create_windows.go b/installer/vendor/github.com/docker/docker/daemon/create_windows.go
deleted file mode 100644
index bbf0dbe7b9..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/create_windows.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/volume"
-)
-
-// createContainerPlatformSpecificSettings performs platform specific container create functionality
-func (daemon *Daemon) createContainerPlatformSpecificSettings(container *container.Container, config *containertypes.Config, hostConfig *containertypes.HostConfig) error {
-	// Make sure the host config has the default daemon isolation if not specified by caller.
-	if containertypes.Isolation.IsDefault(containertypes.Isolation(hostConfig.Isolation)) {
-		hostConfig.Isolation = daemon.defaultIsolation
-	}
-
-	for spec := range config.Volumes {
-
-		mp, err := volume.ParseMountRaw(spec, hostConfig.VolumeDriver)
-		if err != nil {
-			return fmt.Errorf("Unrecognised volume spec: %v", err)
-		}
-
-		// If the mountpoint doesn't have a name, generate one.
-		if len(mp.Name) == 0 {
-			mp.Name = stringid.GenerateNonCryptoID()
-		}
-
-		// Skip volumes for which we already have something mounted on that
-		// destination because of a --volume-from.
-		if container.IsDestinationMounted(mp.Destination) {
-			continue
-		}
-
-		volumeDriver := hostConfig.VolumeDriver
-
-		// Create the volume in the volume driver. If it doesn't exist,
-		// a new one will be created.
-		v, err := daemon.volumes.CreateWithRef(mp.Name, volumeDriver, container.ID, nil, nil)
-		if err != nil {
-			return err
-		}
-
-		// FIXME Windows: This code block is present in the Linux version and
-		// allows the contents to be copied to the container FS prior to it
-		// being started. However, the function utilizes the FollowSymLinkInScope
-		// path which does not cope with Windows volume-style file paths. There
-		// is a separate effort to resolve this (@swernli), so this processing
-		// is deferred for now. A case where this would be useful is when
-		// a dockerfile includes a VOLUME statement, but something is created
-		// in that directory during the dockerfile processing. What this means
-		// on Windows for TP5 is that in that scenario, the contents will not
-		// copied, but that's (somewhat) OK as HCS will bomb out soon after
-		// at it doesn't support mapped directories which have contents in the
-		// destination path anyway.
-		//
-		// Example for repro later:
-		//   FROM windowsservercore
-		//   RUN mkdir c:\myvol
-		//   RUN copy c:\windows\system32\ntdll.dll c:\myvol
-		//   VOLUME "c:\myvol"
-		//
-		// Then
-		//   docker build -t vol .
-		//   docker run -it --rm vol cmd  <-- This is where HCS will error out.
-		//
-		//	// never attempt to copy existing content in a container FS to a shared volume
-		//	if v.DriverName() == volume.DefaultDriverName {
-		//		if err := container.CopyImagePathContent(v, mp.Destination); err != nil {
-		//			return err
-		//		}
-		//	}
-
-		// Add it to container.MountPoints
-		container.AddMountPointWithVolume(mp.Destination, v, mp.RW)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon.go b/installer/vendor/github.com/docker/docker/daemon/daemon.go
deleted file mode 100644
index 55a66aec92..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon.go
+++ /dev/null
@@ -1,1321 +0,0 @@
-// Package daemon exposes the functions that occur on the host server
-// that the Docker daemon is running.
-//
-// In implementing the various functions of the daemon, there is often
-// a method-specific struct for configuring the runtime behavior.
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"path"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/events"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/daemon/initlayer"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/plugin"
-	"github.com/docker/libnetwork/cluster"
-	// register graph drivers
-	_ "github.com/docker/docker/daemon/graphdriver/register"
-	dmetadata "github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/migrate/v1"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/registrar"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/pkg/truncindex"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/docker/docker/runconfig"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
-	"github.com/docker/docker/volume/store"
-	"github.com/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
-	"github.com/docker/libtrust"
-	"github.com/pkg/errors"
-)
-
-var (
-	// DefaultRuntimeBinary is the default runtime to be used by
-	// containerd if none is specified
-	DefaultRuntimeBinary = "docker-runc"
-
-	// DefaultInitBinary is the name of the default init binary
-	DefaultInitBinary = "docker-init"
-
-	errSystemNotSupported = fmt.Errorf("The Docker daemon is not supported on this platform.")
-)
-
-// Daemon holds information about the Docker daemon.
-type Daemon struct {
-	ID                        string
-	repository                string
-	containers                container.Store
-	execCommands              *exec.Store
-	referenceStore            reference.Store
-	downloadManager           *xfer.LayerDownloadManager
-	uploadManager             *xfer.LayerUploadManager
-	distributionMetadataStore dmetadata.Store
-	trustKey                  libtrust.PrivateKey
-	idIndex                   *truncindex.TruncIndex
-	configStore               *Config
-	statsCollector            *statsCollector
-	defaultLogConfig          containertypes.LogConfig
-	RegistryService           registry.Service
-	EventsService             *events.Events
-	netController             libnetwork.NetworkController
-	volumes                   *store.VolumeStore
-	discoveryWatcher          discoveryReloader
-	root                      string
-	seccompEnabled            bool
-	shutdown                  bool
-	uidMaps                   []idtools.IDMap
-	gidMaps                   []idtools.IDMap
-	layerStore                layer.Store
-	imageStore                image.Store
-	PluginStore               *plugin.Store // todo: remove
-	pluginManager             *plugin.Manager
-	nameIndex                 *registrar.Registrar
-	linkIndex                 *linkIndex
-	containerd                libcontainerd.Client
-	containerdRemote          libcontainerd.Remote
-	defaultIsolation          containertypes.Isolation // Default isolation mode on Windows
-	clusterProvider           cluster.Provider
-	cluster                   Cluster
-
-	seccompProfile     []byte
-	seccompProfilePath string
-}
-
-// HasExperimental returns whether the experimental features of the daemon are enabled or not
-func (daemon *Daemon) HasExperimental() bool {
-	if daemon.configStore != nil && daemon.configStore.Experimental {
-		return true
-	}
-	return false
-}
-
-func (daemon *Daemon) restore() error {
-	var (
-		currentDriver = daemon.GraphDriverName()
-		containers    = make(map[string]*container.Container)
-	)
-
-	logrus.Info("Loading containers: start.")
-
-	dir, err := ioutil.ReadDir(daemon.repository)
-	if err != nil {
-		return err
-	}
-
-	for _, v := range dir {
-		id := v.Name()
-		container, err := daemon.load(id)
-		if err != nil {
-			logrus.Errorf("Failed to load container %v: %v", id, err)
-			continue
-		}
-
-		// Ignore the container if it does not support the current driver being used by the graph
-		if (container.Driver == "" && currentDriver == "aufs") || container.Driver == currentDriver {
-			rwlayer, err := daemon.layerStore.GetRWLayer(container.ID)
-			if err != nil {
-				logrus.Errorf("Failed to load container mount %v: %v", id, err)
-				continue
-			}
-			container.RWLayer = rwlayer
-			logrus.Debugf("Loaded container %v", container.ID)
-
-			containers[container.ID] = container
-		} else {
-			logrus.Debugf("Cannot load container %s because it was created with another graph driver.", container.ID)
-		}
-	}
-
-	removeContainers := make(map[string]*container.Container)
-	restartContainers := make(map[*container.Container]chan struct{})
-	activeSandboxes := make(map[string]interface{})
-	for id, c := range containers {
-		if err := daemon.registerName(c); err != nil {
-			logrus.Errorf("Failed to register container %s: %s", c.ID, err)
-			delete(containers, id)
-			continue
-		}
-		if err := daemon.Register(c); err != nil {
-			logrus.Errorf("Failed to register container %s: %s", c.ID, err)
-			delete(containers, id)
-			continue
-		}
-
-		// verify that all volumes valid and have been migrated from the pre-1.7 layout
-		if err := daemon.verifyVolumesInfo(c); err != nil {
-			// don't skip the container due to error
-			logrus.Errorf("Failed to verify volumes for container '%s': %v", c.ID, err)
-		}
-
-		// The LogConfig.Type is empty if the container was created before docker 1.12 with default log driver.
-		// We should rewrite it to use the daemon defaults.
-		// Fixes https://github.com/docker/docker/issues/22536
-		if c.HostConfig.LogConfig.Type == "" {
-			if err := daemon.mergeAndVerifyLogConfig(&c.HostConfig.LogConfig); err != nil {
-				logrus.Errorf("Failed to verify log config for container %s: %q", c.ID, err)
-				continue
-			}
-		}
-	}
-
-	var migrateLegacyLinks bool // Not relevant on Windows
-	var wg sync.WaitGroup
-	var mapLock sync.Mutex
-	for _, c := range containers {
-		wg.Add(1)
-		go func(c *container.Container) {
-			defer wg.Done()
-			if err := backportMountSpec(c); err != nil {
-				logrus.Error("Failed to migrate old mounts to use new spec format")
-			}
-
-			if c.IsRunning() || c.IsPaused() {
-				c.RestartManager().Cancel() // manually start containers because some need to wait for swarm networking
-				if err := daemon.containerd.Restore(c.ID, c.InitializeStdio); err != nil {
-					logrus.Errorf("Failed to restore %s with containerd: %s", c.ID, err)
-					return
-				}
-
-				// we call Mount and then Unmount to get BaseFs of the container
-				if err := daemon.Mount(c); err != nil {
-					// The mount is unlikely to fail. However, in case mount fails
-					// the container should be allowed to restore here. Some functionalities
-					// (like docker exec -u user) might be missing but container is able to be
-					// stopped/restarted/removed.
-					// See #29365 for related information.
-					// The error is only logged here.
-					logrus.Warnf("Failed to mount container on getting BaseFs path %v: %v", c.ID, err)
-				} else {
-					// if mount success, then unmount it
-					if err := daemon.Unmount(c); err != nil {
-						logrus.Warnf("Failed to umount container on getting BaseFs path %v: %v", c.ID, err)
-					}
-				}
-
-				c.ResetRestartManager(false)
-				if !c.HostConfig.NetworkMode.IsContainer() && c.IsRunning() {
-					options, err := daemon.buildSandboxOptions(c)
-					if err != nil {
-						logrus.Warnf("Failed build sandbox option to restore container %s: %v", c.ID, err)
-					}
-					mapLock.Lock()
-					activeSandboxes[c.NetworkSettings.SandboxID] = options
-					mapLock.Unlock()
-				}
-
-			}
-			// fixme: only if not running
-			// get list of containers we need to restart
-			if !c.IsRunning() && !c.IsPaused() {
-				// Do not autostart containers which
-				// has endpoints in a swarm scope
-				// network yet since the cluster is
-				// not initialized yet. We will start
-				// it after the cluster is
-				// initialized.
-				if daemon.configStore.AutoRestart && c.ShouldRestart() && !c.NetworkSettings.HasSwarmEndpoint {
-					mapLock.Lock()
-					restartContainers[c] = make(chan struct{})
-					mapLock.Unlock()
-				} else if c.HostConfig != nil && c.HostConfig.AutoRemove {
-					mapLock.Lock()
-					removeContainers[c.ID] = c
-					mapLock.Unlock()
-				}
-			}
-
-			if c.RemovalInProgress {
-				// We probably crashed in the middle of a removal, reset
-				// the flag.
-				//
-				// We DO NOT remove the container here as we do not
-				// know if the user had requested for either the
-				// associated volumes, network links or both to also
-				// be removed. So we put the container in the "dead"
-				// state and leave further processing up to them.
-				logrus.Debugf("Resetting RemovalInProgress flag from %v", c.ID)
-				c.ResetRemovalInProgress()
-				c.SetDead()
-				c.ToDisk()
-			}
-
-			// if c.hostConfig.Links is nil (not just empty), then it is using the old sqlite links and needs to be migrated
-			if c.HostConfig != nil && c.HostConfig.Links == nil {
-				migrateLegacyLinks = true
-			}
-		}(c)
-	}
-	wg.Wait()
-	daemon.netController, err = daemon.initNetworkController(daemon.configStore, activeSandboxes)
-	if err != nil {
-		return fmt.Errorf("Error initializing network controller: %v", err)
-	}
-
-	// Perform migration of legacy sqlite links (no-op on Windows)
-	if migrateLegacyLinks {
-		if err := daemon.sqliteMigration(containers); err != nil {
-			return err
-		}
-	}
-
-	// Now that all the containers are registered, register the links
-	for _, c := range containers {
-		if err := daemon.registerLinks(c, c.HostConfig); err != nil {
-			logrus.Errorf("failed to register link for container %s: %v", c.ID, err)
-		}
-	}
-
-	group := sync.WaitGroup{}
-	for c, notifier := range restartContainers {
-		group.Add(1)
-
-		go func(c *container.Container, chNotify chan struct{}) {
-			defer group.Done()
-
-			logrus.Debugf("Starting container %s", c.ID)
-
-			// ignore errors here as this is a best effort to wait for children to be
-			//   running before we try to start the container
-			children := daemon.children(c)
-			timeout := time.After(5 * time.Second)
-			for _, child := range children {
-				if notifier, exists := restartContainers[child]; exists {
-					select {
-					case <-notifier:
-					case <-timeout:
-					}
-				}
-			}
-
-			// Make sure networks are available before starting
-			daemon.waitForNetworks(c)
-			if err := daemon.containerStart(c, "", "", true); err != nil {
-				logrus.Errorf("Failed to start container %s: %s", c.ID, err)
-			}
-			close(chNotify)
-		}(c, notifier)
-
-	}
-	group.Wait()
-
-	removeGroup := sync.WaitGroup{}
-	for id := range removeContainers {
-		removeGroup.Add(1)
-		go func(cid string) {
-			if err := daemon.ContainerRm(cid, &types.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil {
-				logrus.Errorf("Failed to remove container %s: %s", cid, err)
-			}
-			removeGroup.Done()
-		}(id)
-	}
-	removeGroup.Wait()
-
-	// any containers that were started above would already have had this done,
-	// however we need to now prepare the mountpoints for the rest of the containers as well.
-	// This shouldn't cause any issue running on the containers that already had this run.
-	// This must be run after any containers with a restart policy so that containerized plugins
-	// can have a chance to be running before we try to initialize them.
-	for _, c := range containers {
-		// if the container has restart policy, do not
-		// prepare the mountpoints since it has been done on restarting.
-		// This is to speed up the daemon start when a restart container
-		// has a volume and the volume dirver is not available.
-		if _, ok := restartContainers[c]; ok {
-			continue
-		} else if _, ok := removeContainers[c.ID]; ok {
-			// container is automatically removed, skip it.
-			continue
-		}
-
-		group.Add(1)
-		go func(c *container.Container) {
-			defer group.Done()
-			if err := daemon.prepareMountPoints(c); err != nil {
-				logrus.Error(err)
-			}
-		}(c)
-	}
-
-	group.Wait()
-
-	logrus.Info("Loading containers: done.")
-
-	return nil
-}
-
-// RestartSwarmContainers restarts any autostart container which has a
-// swarm endpoint.
-func (daemon *Daemon) RestartSwarmContainers() {
-	group := sync.WaitGroup{}
-	for _, c := range daemon.List() {
-		if !c.IsRunning() && !c.IsPaused() {
-			// Autostart all the containers which has a
-			// swarm endpoint now that the cluster is
-			// initialized.
-			if daemon.configStore.AutoRestart && c.ShouldRestart() && c.NetworkSettings.HasSwarmEndpoint {
-				group.Add(1)
-				go func(c *container.Container) {
-					defer group.Done()
-					if err := daemon.containerStart(c, "", "", true); err != nil {
-						logrus.Error(err)
-					}
-				}(c)
-			}
-		}
-
-	}
-	group.Wait()
-}
-
-// waitForNetworks is used during daemon initialization when starting up containers
-// It ensures that all of a container's networks are available before the daemon tries to start the container.
-// In practice it just makes sure the discovery service is available for containers which use a network that require discovery.
-func (daemon *Daemon) waitForNetworks(c *container.Container) {
-	if daemon.discoveryWatcher == nil {
-		return
-	}
-	// Make sure if the container has a network that requires discovery that the discovery service is available before starting
-	for netName := range c.NetworkSettings.Networks {
-		// If we get `ErrNoSuchNetwork` here, we can assume that it is due to discovery not being ready
-		// Most likely this is because the K/V store used for discovery is in a container and needs to be started
-		if _, err := daemon.netController.NetworkByName(netName); err != nil {
-			if _, ok := err.(libnetwork.ErrNoSuchNetwork); !ok {
-				continue
-			}
-			// use a longish timeout here due to some slowdowns in libnetwork if the k/v store is on anything other than --net=host
-			// FIXME: why is this slow???
-			logrus.Debugf("Container %s waiting for network to be ready", c.Name)
-			select {
-			case <-daemon.discoveryWatcher.ReadyCh():
-			case <-time.After(60 * time.Second):
-			}
-			return
-		}
-	}
-}
-
-func (daemon *Daemon) children(c *container.Container) map[string]*container.Container {
-	return daemon.linkIndex.children(c)
-}
-
-// parents returns the names of the parent containers of the container
-// with the given name.
-func (daemon *Daemon) parents(c *container.Container) map[string]*container.Container {
-	return daemon.linkIndex.parents(c)
-}
-
-func (daemon *Daemon) registerLink(parent, child *container.Container, alias string) error {
-	fullName := path.Join(parent.Name, alias)
-	if err := daemon.nameIndex.Reserve(fullName, child.ID); err != nil {
-		if err == registrar.ErrNameReserved {
-			logrus.Warnf("error registering link for %s, to %s, as alias %s, ignoring: %v", parent.ID, child.ID, alias, err)
-			return nil
-		}
-		return err
-	}
-	daemon.linkIndex.link(parent, child, fullName)
-	return nil
-}
-
-// DaemonJoinsCluster informs the daemon has joined the cluster and provides
-// the handler to query the cluster component
-func (daemon *Daemon) DaemonJoinsCluster(clusterProvider cluster.Provider) {
-	daemon.setClusterProvider(clusterProvider)
-}
-
-// DaemonLeavesCluster informs the daemon has left the cluster
-func (daemon *Daemon) DaemonLeavesCluster() {
-	// Daemon is in charge of removing the attachable networks with
-	// connected containers when the node leaves the swarm
-	daemon.clearAttachableNetworks()
-	daemon.setClusterProvider(nil)
-}
-
-// setClusterProvider sets a component for querying the current cluster state.
-func (daemon *Daemon) setClusterProvider(clusterProvider cluster.Provider) {
-	daemon.clusterProvider = clusterProvider
-	// call this in a goroutine to allow netcontroller handle this event async
-	// and not block if it is in the middle of talking with cluster
-	go daemon.netController.SetClusterProvider(clusterProvider)
-}
-
-// IsSwarmCompatible verifies if the current daemon
-// configuration is compatible with the swarm mode
-func (daemon *Daemon) IsSwarmCompatible() error {
-	if daemon.configStore == nil {
-		return nil
-	}
-	return daemon.configStore.isSwarmCompatible()
-}
-
-// NewDaemon sets up everything for the daemon to be able to service
-// requests from the webserver.
-func NewDaemon(config *Config, registryService registry.Service, containerdRemote libcontainerd.Remote) (daemon *Daemon, err error) {
-	setDefaultMtu(config)
-
-	// Ensure that we have a correct root key limit for launching containers.
-	if err := ModifyRootKeyLimit(); err != nil {
-		logrus.Warnf("unable to modify root key limit, number of containers could be limited by this quota: %v", err)
-	}
-
-	// Ensure we have compatible and valid configuration options
-	if err := verifyDaemonSettings(config); err != nil {
-		return nil, err
-	}
-
-	// Do we have a disabled network?
-	config.DisableBridge = isBridgeNetworkDisabled(config)
-
-	// Verify the platform is supported as a daemon
-	if !platformSupported {
-		return nil, errSystemNotSupported
-	}
-
-	// Validate platform-specific requirements
-	if err := checkSystem(); err != nil {
-		return nil, err
-	}
-
-	uidMaps, gidMaps, err := setupRemappedRoot(config)
-	if err != nil {
-		return nil, err
-	}
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := setupDaemonProcess(config); err != nil {
-		return nil, err
-	}
-
-	// set up the tmpDir to use a canonical path
-	tmp, err := tempDir(config.Root, rootUID, rootGID)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to get the TempDir under %s: %s", config.Root, err)
-	}
-	realTmp, err := fileutils.ReadSymlinkedDirectory(tmp)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to get the full path to the TempDir (%s): %s", tmp, err)
-	}
-	os.Setenv("TMPDIR", realTmp)
-
-	d := &Daemon{configStore: config}
-	// Ensure the daemon is properly shutdown if there is a failure during
-	// initialization
-	defer func() {
-		if err != nil {
-			if err := d.Shutdown(); err != nil {
-				logrus.Error(err)
-			}
-		}
-	}()
-
-	if err := d.setupSeccompProfile(); err != nil {
-		return nil, err
-	}
-
-	// Set the default isolation mode (only applicable on Windows)
-	if err := d.setDefaultIsolation(); err != nil {
-		return nil, fmt.Errorf("error setting default isolation mode: %v", err)
-	}
-
-	logrus.Debugf("Using default logging driver %s", config.LogConfig.Type)
-
-	if err := configureMaxThreads(config); err != nil {
-		logrus.Warnf("Failed to configure golang's threads limit: %v", err)
-	}
-
-	if err := ensureDefaultAppArmorProfile(); err != nil {
-		logrus.Errorf(err.Error())
-	}
-
-	daemonRepo := filepath.Join(config.Root, "containers")
-	if err := idtools.MkdirAllAs(daemonRepo, 0700, rootUID, rootGID); err != nil && !os.IsExist(err) {
-		return nil, err
-	}
-
-	if runtime.GOOS == "windows" {
-		if err := system.MkdirAll(filepath.Join(config.Root, "credentialspecs"), 0); err != nil && !os.IsExist(err) {
-			return nil, err
-		}
-	}
-
-	driverName := os.Getenv("DOCKER_DRIVER")
-	if driverName == "" {
-		driverName = config.GraphDriver
-	}
-
-	d.RegistryService = registryService
-	d.PluginStore = plugin.NewStore(config.Root) // todo: remove
-	// Plugin system initialization should happen before restore. Do not change order.
-	d.pluginManager, err = plugin.NewManager(plugin.ManagerConfig{
-		Root:               filepath.Join(config.Root, "plugins"),
-		ExecRoot:           "/run/docker/plugins", // possibly needs fixing
-		Store:              d.PluginStore,
-		Executor:           containerdRemote,
-		RegistryService:    registryService,
-		LiveRestoreEnabled: config.LiveRestoreEnabled,
-		LogPluginEvent:     d.LogPluginEvent, // todo: make private
-	})
-	if err != nil {
-		return nil, errors.Wrap(err, "couldn't create plugin manager")
-	}
-
-	d.layerStore, err = layer.NewStoreFromOptions(layer.StoreOptions{
-		StorePath:                 config.Root,
-		MetadataStorePathTemplate: filepath.Join(config.Root, "image", "%s", "layerdb"),
-		GraphDriver:               driverName,
-		GraphDriverOptions:        config.GraphOptions,
-		UIDMaps:                   uidMaps,
-		GIDMaps:                   gidMaps,
-		PluginGetter:              d.PluginStore,
-		ExperimentalEnabled:       config.Experimental,
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	graphDriver := d.layerStore.DriverName()
-	imageRoot := filepath.Join(config.Root, "image", graphDriver)
-
-	// Configure and validate the kernels security support
-	if err := configureKernelSecuritySupport(config, graphDriver); err != nil {
-		return nil, err
-	}
-
-	logrus.Debugf("Max Concurrent Downloads: %d", *config.MaxConcurrentDownloads)
-	d.downloadManager = xfer.NewLayerDownloadManager(d.layerStore, *config.MaxConcurrentDownloads)
-	logrus.Debugf("Max Concurrent Uploads: %d", *config.MaxConcurrentUploads)
-	d.uploadManager = xfer.NewLayerUploadManager(*config.MaxConcurrentUploads)
-
-	ifs, err := image.NewFSStoreBackend(filepath.Join(imageRoot, "imagedb"))
-	if err != nil {
-		return nil, err
-	}
-
-	d.imageStore, err = image.NewImageStore(ifs, d.layerStore)
-	if err != nil {
-		return nil, err
-	}
-
-	// Configure the volumes driver
-	volStore, err := d.configureVolumes(rootUID, rootGID)
-	if err != nil {
-		return nil, err
-	}
-
-	trustKey, err := api.LoadOrCreateTrustKey(config.TrustKeyPath)
-	if err != nil {
-		return nil, err
-	}
-
-	trustDir := filepath.Join(config.Root, "trust")
-
-	if err := system.MkdirAll(trustDir, 0700); err != nil {
-		return nil, err
-	}
-
-	distributionMetadataStore, err := dmetadata.NewFSMetadataStore(filepath.Join(imageRoot, "distribution"))
-	if err != nil {
-		return nil, err
-	}
-
-	eventsService := events.New()
-
-	referenceStore, err := reference.NewReferenceStore(filepath.Join(imageRoot, "repositories.json"))
-	if err != nil {
-		return nil, fmt.Errorf("Couldn't create Tag store repositories: %s", err)
-	}
-
-	migrationStart := time.Now()
-	if err := v1.Migrate(config.Root, graphDriver, d.layerStore, d.imageStore, referenceStore, distributionMetadataStore); err != nil {
-		logrus.Errorf("Graph migration failed: %q. Your old graph data was found to be too inconsistent for upgrading to content-addressable storage. Some of the old data was probably not upgraded. We recommend starting over with a clean storage directory if possible.", err)
-	}
-	logrus.Infof("Graph migration to content-addressability took %.2f seconds", time.Since(migrationStart).Seconds())
-
-	// Discovery is only enabled when the daemon is launched with an address to advertise.  When
-	// initialized, the daemon is registered and we can store the discovery backend as its read-only
-	if err := d.initDiscovery(config); err != nil {
-		return nil, err
-	}
-
-	sysInfo := sysinfo.New(false)
-	// Check if Devices cgroup is mounted, it is hard requirement for container security,
-	// on Linux.
-	if runtime.GOOS == "linux" && !sysInfo.CgroupDevicesEnabled {
-		return nil, fmt.Errorf("Devices cgroup isn't mounted")
-	}
-
-	d.ID = trustKey.PublicKey().KeyID()
-	d.repository = daemonRepo
-	d.containers = container.NewMemoryStore()
-	d.execCommands = exec.NewStore()
-	d.referenceStore = referenceStore
-	d.distributionMetadataStore = distributionMetadataStore
-	d.trustKey = trustKey
-	d.idIndex = truncindex.NewTruncIndex([]string{})
-	d.statsCollector = d.newStatsCollector(1 * time.Second)
-	d.defaultLogConfig = containertypes.LogConfig{
-		Type:   config.LogConfig.Type,
-		Config: config.LogConfig.Config,
-	}
-	d.EventsService = eventsService
-	d.volumes = volStore
-	d.root = config.Root
-	d.uidMaps = uidMaps
-	d.gidMaps = gidMaps
-	d.seccompEnabled = sysInfo.Seccomp
-
-	d.nameIndex = registrar.NewRegistrar()
-	d.linkIndex = newLinkIndex()
-	d.containerdRemote = containerdRemote
-
-	go d.execCommandGC()
-
-	d.containerd, err = containerdRemote.Client(d)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := d.restore(); err != nil {
-		return nil, err
-	}
-
-	// FIXME: this method never returns an error
-	info, _ := d.SystemInfo()
-
-	engineVersion.WithValues(
-		dockerversion.Version,
-		dockerversion.GitCommit,
-		info.Architecture,
-		info.Driver,
-		info.KernelVersion,
-		info.OperatingSystem,
-	).Set(1)
-	engineCpus.Set(float64(info.NCPU))
-	engineMemory.Set(float64(info.MemTotal))
-
-	// set up SIGUSR1 handler on Unix-like systems, or a Win32 global event
-	// on Windows to dump Go routine stacks
-	stackDumpDir := config.Root
-	if execRoot := config.GetExecRoot(); execRoot != "" {
-		stackDumpDir = execRoot
-	}
-	d.setupDumpStackTrap(stackDumpDir)
-
-	return d, nil
-}
-
-func (daemon *Daemon) shutdownContainer(c *container.Container) error {
-	stopTimeout := c.StopTimeout()
-	// TODO(windows): Handle docker restart with paused containers
-	if c.IsPaused() {
-		// To terminate a process in freezer cgroup, we should send
-		// SIGTERM to this process then unfreeze it, and the process will
-		// force to terminate immediately.
-		logrus.Debugf("Found container %s is paused, sending SIGTERM before unpausing it", c.ID)
-		sig, ok := signal.SignalMap["TERM"]
-		if !ok {
-			return fmt.Errorf("System does not support SIGTERM")
-		}
-		if err := daemon.kill(c, int(sig)); err != nil {
-			return fmt.Errorf("sending SIGTERM to container %s with error: %v", c.ID, err)
-		}
-		if err := daemon.containerUnpause(c); err != nil {
-			return fmt.Errorf("Failed to unpause container %s with error: %v", c.ID, err)
-		}
-		if _, err := c.WaitStop(time.Duration(stopTimeout) * time.Second); err != nil {
-			logrus.Debugf("container %s failed to exit in %d second of SIGTERM, sending SIGKILL to force", c.ID, stopTimeout)
-			sig, ok := signal.SignalMap["KILL"]
-			if !ok {
-				return fmt.Errorf("System does not support SIGKILL")
-			}
-			if err := daemon.kill(c, int(sig)); err != nil {
-				logrus.Errorf("Failed to SIGKILL container %s", c.ID)
-			}
-			c.WaitStop(-1 * time.Second)
-			return err
-		}
-	}
-	// If container failed to exit in stopTimeout seconds of SIGTERM, then using the force
-	if err := daemon.containerStop(c, stopTimeout); err != nil {
-		return fmt.Errorf("Failed to stop container %s with error: %v", c.ID, err)
-	}
-
-	c.WaitStop(-1 * time.Second)
-	return nil
-}
-
-// ShutdownTimeout returns the shutdown timeout based on the max stopTimeout of the containers,
-// and is limited by daemon's ShutdownTimeout.
-func (daemon *Daemon) ShutdownTimeout() int {
-	// By default we use daemon's ShutdownTimeout.
-	shutdownTimeout := daemon.configStore.ShutdownTimeout
-
-	graceTimeout := 5
-	if daemon.containers != nil {
-		for _, c := range daemon.containers.List() {
-			if shutdownTimeout >= 0 {
-				stopTimeout := c.StopTimeout()
-				if stopTimeout < 0 {
-					shutdownTimeout = -1
-				} else {
-					if stopTimeout+graceTimeout > shutdownTimeout {
-						shutdownTimeout = stopTimeout + graceTimeout
-					}
-				}
-			}
-		}
-	}
-	return shutdownTimeout
-}
-
-// Shutdown stops the daemon.
-func (daemon *Daemon) Shutdown() error {
-	daemon.shutdown = true
-	// Keep mounts and networking running on daemon shutdown if
-	// we are to keep containers running and restore them.
-
-	if daemon.configStore.LiveRestoreEnabled && daemon.containers != nil {
-		// check if there are any running containers, if none we should do some cleanup
-		if ls, err := daemon.Containers(&types.ContainerListOptions{}); len(ls) != 0 || err != nil {
-			return nil
-		}
-	}
-
-	if daemon.containers != nil {
-		logrus.Debugf("start clean shutdown of all containers with a %d seconds timeout...", daemon.configStore.ShutdownTimeout)
-		daemon.containers.ApplyAll(func(c *container.Container) {
-			if !c.IsRunning() {
-				return
-			}
-			logrus.Debugf("stopping %s", c.ID)
-			if err := daemon.shutdownContainer(c); err != nil {
-				logrus.Errorf("Stop container error: %v", err)
-				return
-			}
-			if mountid, err := daemon.layerStore.GetMountID(c.ID); err == nil {
-				daemon.cleanupMountsByID(mountid)
-			}
-			logrus.Debugf("container stopped %s", c.ID)
-		})
-	}
-
-	if daemon.volumes != nil {
-		if err := daemon.volumes.Shutdown(); err != nil {
-			logrus.Errorf("Error shutting down volume store: %v", err)
-		}
-	}
-
-	if daemon.layerStore != nil {
-		if err := daemon.layerStore.Cleanup(); err != nil {
-			logrus.Errorf("Error during layer Store.Cleanup(): %v", err)
-		}
-	}
-
-	// Shutdown plugins after containers and layerstore. Don't change the order.
-	daemon.pluginShutdown()
-
-	// trigger libnetwork Stop only if it's initialized
-	if daemon.netController != nil {
-		daemon.netController.Stop()
-	}
-
-	if err := daemon.cleanupMounts(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Mount sets container.BaseFS
-// (is it not set coming in? why is it unset?)
-func (daemon *Daemon) Mount(container *container.Container) error {
-	dir, err := container.RWLayer.Mount(container.GetMountLabel())
-	if err != nil {
-		return err
-	}
-	logrus.Debugf("container mounted via layerStore: %v", dir)
-
-	if container.BaseFS != dir {
-		// The mount path reported by the graph driver should always be trusted on Windows, since the
-		// volume path for a given mounted layer may change over time.  This should only be an error
-		// on non-Windows operating systems.
-		if container.BaseFS != "" && runtime.GOOS != "windows" {
-			daemon.Unmount(container)
-			return fmt.Errorf("Error: driver %s is returning inconsistent paths for container %s ('%s' then '%s')",
-				daemon.GraphDriverName(), container.ID, container.BaseFS, dir)
-		}
-	}
-	container.BaseFS = dir // TODO: combine these fields
-	return nil
-}
-
-// Unmount unsets the container base filesystem
-func (daemon *Daemon) Unmount(container *container.Container) error {
-	if err := container.RWLayer.Unmount(); err != nil {
-		logrus.Errorf("Error unmounting container %s: %s", container.ID, err)
-		return err
-	}
-
-	return nil
-}
-
-// V4Subnets returns the IPv4 subnets of networks that are managed by Docker.
-func (daemon *Daemon) V4Subnets() []net.IPNet {
-	var subnets []net.IPNet
-
-	managedNetworks := daemon.netController.Networks()
-
-	for _, managedNetwork := range managedNetworks {
-		v4Infos, _ := managedNetwork.Info().IpamInfo()
-		for _, v4Info := range v4Infos {
-			if v4Info.IPAMData.Pool != nil {
-				subnets = append(subnets, *v4Info.IPAMData.Pool)
-			}
-		}
-	}
-
-	return subnets
-}
-
-// V6Subnets returns the IPv6 subnets of networks that are managed by Docker.
-func (daemon *Daemon) V6Subnets() []net.IPNet {
-	var subnets []net.IPNet
-
-	managedNetworks := daemon.netController.Networks()
-
-	for _, managedNetwork := range managedNetworks {
-		_, v6Infos := managedNetwork.Info().IpamInfo()
-		for _, v6Info := range v6Infos {
-			if v6Info.IPAMData.Pool != nil {
-				subnets = append(subnets, *v6Info.IPAMData.Pool)
-			}
-		}
-	}
-
-	return subnets
-}
-
-// GraphDriverName returns the name of the graph driver used by the layer.Store
-func (daemon *Daemon) GraphDriverName() string {
-	return daemon.layerStore.DriverName()
-}
-
-// GetUIDGIDMaps returns the current daemon's user namespace settings
-// for the full uid and gid maps which will be applied to containers
-// started in this instance.
-func (daemon *Daemon) GetUIDGIDMaps() ([]idtools.IDMap, []idtools.IDMap) {
-	return daemon.uidMaps, daemon.gidMaps
-}
-
-// GetRemappedUIDGID returns the current daemon's uid and gid values
-// if user namespaces are in use for this daemon instance.  If not
-// this function will return "real" root values of 0, 0.
-func (daemon *Daemon) GetRemappedUIDGID() (int, int) {
-	uid, gid, _ := idtools.GetRootUIDGID(daemon.uidMaps, daemon.gidMaps)
-	return uid, gid
-}
-
-// tempDir returns the default directory to use for temporary files.
-func tempDir(rootDir string, rootUID, rootGID int) (string, error) {
-	var tmpDir string
-	if tmpDir = os.Getenv("DOCKER_TMPDIR"); tmpDir == "" {
-		tmpDir = filepath.Join(rootDir, "tmp")
-	}
-	return tmpDir, idtools.MkdirAllAs(tmpDir, 0700, rootUID, rootGID)
-}
-
-func (daemon *Daemon) setupInitLayer(initPath string) error {
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	return initlayer.Setup(initPath, rootUID, rootGID)
-}
-
-func setDefaultMtu(config *Config) {
-	// do nothing if the config does not have the default 0 value.
-	if config.Mtu != 0 {
-		return
-	}
-	config.Mtu = defaultNetworkMtu
-}
-
-func (daemon *Daemon) configureVolumes(rootUID, rootGID int) (*store.VolumeStore, error) {
-	volumesDriver, err := local.New(daemon.configStore.Root, rootUID, rootGID)
-	if err != nil {
-		return nil, err
-	}
-
-	volumedrivers.RegisterPluginGetter(daemon.PluginStore)
-
-	if !volumedrivers.Register(volumesDriver, volumesDriver.Name()) {
-		return nil, fmt.Errorf("local volume driver could not be registered")
-	}
-	return store.New(daemon.configStore.Root)
-}
-
-// IsShuttingDown tells whether the daemon is shutting down or not
-func (daemon *Daemon) IsShuttingDown() bool {
-	return daemon.shutdown
-}
-
-// initDiscovery initializes the discovery watcher for this daemon.
-func (daemon *Daemon) initDiscovery(config *Config) error {
-	advertise, err := parseClusterAdvertiseSettings(config.ClusterStore, config.ClusterAdvertise)
-	if err != nil {
-		if err == errDiscoveryDisabled {
-			return nil
-		}
-		return err
-	}
-
-	config.ClusterAdvertise = advertise
-	discoveryWatcher, err := initDiscovery(config.ClusterStore, config.ClusterAdvertise, config.ClusterOpts)
-	if err != nil {
-		return fmt.Errorf("discovery initialization failed (%v)", err)
-	}
-
-	daemon.discoveryWatcher = discoveryWatcher
-	return nil
-}
-
-// Reload reads configuration changes and modifies the
-// daemon according to those changes.
-// These are the settings that Reload changes:
-// - Daemon labels.
-// - Daemon debug log level.
-// - Daemon insecure registries.
-// - Daemon max concurrent downloads
-// - Daemon max concurrent uploads
-// - Cluster discovery (reconfigure and restart).
-// - Daemon live restore
-// - Daemon shutdown timeout (in seconds).
-func (daemon *Daemon) Reload(config *Config) (err error) {
-
-	daemon.configStore.reloadLock.Lock()
-
-	attributes := daemon.platformReload(config)
-
-	defer func() {
-		// we're unlocking here, because
-		// LogDaemonEventWithAttributes() -> SystemInfo() -> GetAllRuntimes()
-		// holds that lock too.
-		daemon.configStore.reloadLock.Unlock()
-		if err == nil {
-			daemon.LogDaemonEventWithAttributes("reload", attributes)
-		}
-	}()
-
-	if err := daemon.reloadClusterDiscovery(config); err != nil {
-		return err
-	}
-
-	if config.IsValueSet("labels") {
-		daemon.configStore.Labels = config.Labels
-	}
-	if config.IsValueSet("debug") {
-		daemon.configStore.Debug = config.Debug
-	}
-	if config.IsValueSet("insecure-registries") {
-		daemon.configStore.InsecureRegistries = config.InsecureRegistries
-		if err := daemon.RegistryService.LoadInsecureRegistries(config.InsecureRegistries); err != nil {
-			return err
-		}
-	}
-	if config.IsValueSet("live-restore") {
-		daemon.configStore.LiveRestoreEnabled = config.LiveRestoreEnabled
-		if err := daemon.containerdRemote.UpdateOptions(libcontainerd.WithLiveRestore(config.LiveRestoreEnabled)); err != nil {
-			return err
-		}
-	}
-
-	// If no value is set for max-concurrent-downloads we assume it is the default value
-	// We always "reset" as the cost is lightweight and easy to maintain.
-	if config.IsValueSet("max-concurrent-downloads") && config.MaxConcurrentDownloads != nil {
-		*daemon.configStore.MaxConcurrentDownloads = *config.MaxConcurrentDownloads
-	} else {
-		maxConcurrentDownloads := defaultMaxConcurrentDownloads
-		daemon.configStore.MaxConcurrentDownloads = &maxConcurrentDownloads
-	}
-	logrus.Debugf("Reset Max Concurrent Downloads: %d", *daemon.configStore.MaxConcurrentDownloads)
-	if daemon.downloadManager != nil {
-		daemon.downloadManager.SetConcurrency(*daemon.configStore.MaxConcurrentDownloads)
-	}
-
-	// If no value is set for max-concurrent-upload we assume it is the default value
-	// We always "reset" as the cost is lightweight and easy to maintain.
-	if config.IsValueSet("max-concurrent-uploads") && config.MaxConcurrentUploads != nil {
-		*daemon.configStore.MaxConcurrentUploads = *config.MaxConcurrentUploads
-	} else {
-		maxConcurrentUploads := defaultMaxConcurrentUploads
-		daemon.configStore.MaxConcurrentUploads = &maxConcurrentUploads
-	}
-	logrus.Debugf("Reset Max Concurrent Uploads: %d", *daemon.configStore.MaxConcurrentUploads)
-	if daemon.uploadManager != nil {
-		daemon.uploadManager.SetConcurrency(*daemon.configStore.MaxConcurrentUploads)
-	}
-
-	if config.IsValueSet("shutdown-timeout") {
-		daemon.configStore.ShutdownTimeout = config.ShutdownTimeout
-		logrus.Debugf("Reset Shutdown Timeout: %d", daemon.configStore.ShutdownTimeout)
-	}
-
-	// We emit daemon reload event here with updatable configurations
-	attributes["debug"] = fmt.Sprintf("%t", daemon.configStore.Debug)
-	attributes["live-restore"] = fmt.Sprintf("%t", daemon.configStore.LiveRestoreEnabled)
-
-	if daemon.configStore.InsecureRegistries != nil {
-		insecureRegistries, err := json.Marshal(daemon.configStore.InsecureRegistries)
-		if err != nil {
-			return err
-		}
-		attributes["insecure-registries"] = string(insecureRegistries)
-	} else {
-		attributes["insecure-registries"] = "[]"
-	}
-
-	attributes["cluster-store"] = daemon.configStore.ClusterStore
-	if daemon.configStore.ClusterOpts != nil {
-		opts, err := json.Marshal(daemon.configStore.ClusterOpts)
-		if err != nil {
-			return err
-		}
-		attributes["cluster-store-opts"] = string(opts)
-	} else {
-		attributes["cluster-store-opts"] = "{}"
-	}
-	attributes["cluster-advertise"] = daemon.configStore.ClusterAdvertise
-
-	if daemon.configStore.Labels != nil {
-		labels, err := json.Marshal(daemon.configStore.Labels)
-		if err != nil {
-			return err
-		}
-		attributes["labels"] = string(labels)
-	} else {
-		attributes["labels"] = "[]"
-	}
-
-	attributes["max-concurrent-downloads"] = fmt.Sprintf("%d", *daemon.configStore.MaxConcurrentDownloads)
-	attributes["max-concurrent-uploads"] = fmt.Sprintf("%d", *daemon.configStore.MaxConcurrentUploads)
-	attributes["shutdown-timeout"] = fmt.Sprintf("%d", daemon.configStore.ShutdownTimeout)
-
-	return nil
-}
-
-func (daemon *Daemon) reloadClusterDiscovery(config *Config) error {
-	var err error
-	newAdvertise := daemon.configStore.ClusterAdvertise
-	newClusterStore := daemon.configStore.ClusterStore
-	if config.IsValueSet("cluster-advertise") {
-		if config.IsValueSet("cluster-store") {
-			newClusterStore = config.ClusterStore
-		}
-		newAdvertise, err = parseClusterAdvertiseSettings(newClusterStore, config.ClusterAdvertise)
-		if err != nil && err != errDiscoveryDisabled {
-			return err
-		}
-	}
-
-	if daemon.clusterProvider != nil {
-		if err := config.isSwarmCompatible(); err != nil {
-			return err
-		}
-	}
-
-	// check discovery modifications
-	if !modifiedDiscoverySettings(daemon.configStore, newAdvertise, newClusterStore, config.ClusterOpts) {
-		return nil
-	}
-
-	// enable discovery for the first time if it was not previously enabled
-	if daemon.discoveryWatcher == nil {
-		discoveryWatcher, err := initDiscovery(newClusterStore, newAdvertise, config.ClusterOpts)
-		if err != nil {
-			return fmt.Errorf("discovery initialization failed (%v)", err)
-		}
-		daemon.discoveryWatcher = discoveryWatcher
-	} else {
-		if err == errDiscoveryDisabled {
-			// disable discovery if it was previously enabled and it's disabled now
-			daemon.discoveryWatcher.Stop()
-		} else {
-			// reload discovery
-			if err = daemon.discoveryWatcher.Reload(config.ClusterStore, newAdvertise, config.ClusterOpts); err != nil {
-				return err
-			}
-		}
-	}
-
-	daemon.configStore.ClusterStore = newClusterStore
-	daemon.configStore.ClusterOpts = config.ClusterOpts
-	daemon.configStore.ClusterAdvertise = newAdvertise
-
-	if daemon.netController == nil {
-		return nil
-	}
-	netOptions, err := daemon.networkOptions(daemon.configStore, daemon.PluginStore, nil)
-	if err != nil {
-		logrus.WithError(err).Warnf("failed to get options with network controller")
-		return nil
-	}
-	err = daemon.netController.ReloadConfiguration(netOptions...)
-	if err != nil {
-		logrus.Warnf("Failed to reload configuration with network controller: %v", err)
-	}
-
-	return nil
-}
-
-func isBridgeNetworkDisabled(config *Config) bool {
-	return config.bridgeConfig.Iface == disableNetworkBridge
-}
-
-func (daemon *Daemon) networkOptions(dconfig *Config, pg plugingetter.PluginGetter, activeSandboxes map[string]interface{}) ([]nwconfig.Option, error) {
-	options := []nwconfig.Option{}
-	if dconfig == nil {
-		return options, nil
-	}
-
-	options = append(options, nwconfig.OptionExperimental(dconfig.Experimental))
-	options = append(options, nwconfig.OptionDataDir(dconfig.Root))
-	options = append(options, nwconfig.OptionExecRoot(dconfig.GetExecRoot()))
-
-	dd := runconfig.DefaultDaemonNetworkMode()
-	dn := runconfig.DefaultDaemonNetworkMode().NetworkName()
-	options = append(options, nwconfig.OptionDefaultDriver(string(dd)))
-	options = append(options, nwconfig.OptionDefaultNetwork(dn))
-
-	if strings.TrimSpace(dconfig.ClusterStore) != "" {
-		kv := strings.Split(dconfig.ClusterStore, "://")
-		if len(kv) != 2 {
-			return nil, fmt.Errorf("kv store daemon config must be of the form KV-PROVIDER://KV-URL")
-		}
-		options = append(options, nwconfig.OptionKVProvider(kv[0]))
-		options = append(options, nwconfig.OptionKVProviderURL(kv[1]))
-	}
-	if len(dconfig.ClusterOpts) > 0 {
-		options = append(options, nwconfig.OptionKVOpts(dconfig.ClusterOpts))
-	}
-
-	if daemon.discoveryWatcher != nil {
-		options = append(options, nwconfig.OptionDiscoveryWatcher(daemon.discoveryWatcher))
-	}
-
-	if dconfig.ClusterAdvertise != "" {
-		options = append(options, nwconfig.OptionDiscoveryAddress(dconfig.ClusterAdvertise))
-	}
-
-	options = append(options, nwconfig.OptionLabels(dconfig.Labels))
-	options = append(options, driverOptions(dconfig)...)
-
-	if daemon.configStore != nil && daemon.configStore.LiveRestoreEnabled && len(activeSandboxes) != 0 {
-		options = append(options, nwconfig.OptionActiveSandboxes(activeSandboxes))
-	}
-
-	if pg != nil {
-		options = append(options, nwconfig.OptionPluginGetter(pg))
-	}
-
-	return options, nil
-}
-
-func copyBlkioEntry(entries []*containerd.BlkioStatsEntry) []types.BlkioStatEntry {
-	out := make([]types.BlkioStatEntry, len(entries))
-	for i, re := range entries {
-		out[i] = types.BlkioStatEntry{
-			Major: re.Major,
-			Minor: re.Minor,
-			Op:    re.Op,
-			Value: re.Value,
-		}
-	}
-	return out
-}
-
-// GetCluster returns the cluster
-func (daemon *Daemon) GetCluster() Cluster {
-	return daemon.cluster
-}
-
-// SetCluster sets the cluster
-func (daemon *Daemon) SetCluster(cluster Cluster) {
-	daemon.cluster = cluster
-}
-
-func (daemon *Daemon) pluginShutdown() {
-	manager := daemon.pluginManager
-	// Check for a valid manager object. In error conditions, daemon init can fail
-	// and shutdown called, before plugin manager is initialized.
-	if manager != nil {
-		manager.Shutdown()
-	}
-}
-
-// PluginManager returns current pluginManager associated with the daemon
-func (daemon *Daemon) PluginManager() *plugin.Manager { // set up before daemon to avoid this method
-	return daemon.pluginManager
-}
-
-// PluginGetter returns current pluginStore associated with the daemon
-func (daemon *Daemon) PluginGetter() *plugin.Store {
-	return daemon.PluginStore
-}
-
-// CreateDaemonRoot creates the root for the daemon
-func CreateDaemonRoot(config *Config) error {
-	// get the canonical path to the Docker root directory
-	var realRoot string
-	if _, err := os.Stat(config.Root); err != nil && os.IsNotExist(err) {
-		realRoot = config.Root
-	} else {
-		realRoot, err = fileutils.ReadSymlinkedDirectory(config.Root)
-		if err != nil {
-			return fmt.Errorf("Unable to get the full path to root (%s): %s", config.Root, err)
-		}
-	}
-
-	uidMaps, gidMaps, err := setupRemappedRoot(config)
-	if err != nil {
-		return err
-	}
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return err
-	}
-
-	if err := setupDaemonRoot(config, realRoot, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_experimental.go b/installer/vendor/github.com/docker/docker/daemon/daemon_experimental.go
deleted file mode 100644
index fb0251d4af..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_experimental.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package daemon
-
-import "github.com/docker/docker/api/types/container"
-
-func (daemon *Daemon) verifyExperimentalContainerSettings(hostConfig *container.HostConfig, config *container.Config) ([]string, error) {
-	return nil, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_linux.go b/installer/vendor/github.com/docker/docker/daemon/daemon_linux.go
deleted file mode 100644
index 9bdf6e2b79..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_linux.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package daemon
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os"
-	"regexp"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
-)
-
-func (daemon *Daemon) cleanupMountsByID(id string) error {
-	logrus.Debugf("Cleaning up old mountid %s: start.", id)
-	f, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	return daemon.cleanupMountsFromReaderByID(f, id, mount.Unmount)
-}
-
-func (daemon *Daemon) cleanupMountsFromReaderByID(reader io.Reader, id string, unmount func(target string) error) error {
-	if daemon.root == "" {
-		return nil
-	}
-	var errors []string
-
-	regexps := getCleanPatterns(id)
-	sc := bufio.NewScanner(reader)
-	for sc.Scan() {
-		if fields := strings.Fields(sc.Text()); len(fields) >= 4 {
-			if mnt := fields[4]; strings.HasPrefix(mnt, daemon.root) {
-				for _, p := range regexps {
-					if p.MatchString(mnt) {
-						if err := unmount(mnt); err != nil {
-							logrus.Error(err)
-							errors = append(errors, err.Error())
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if err := sc.Err(); err != nil {
-		return err
-	}
-
-	if len(errors) > 0 {
-		return fmt.Errorf("Error cleaning up mounts:\n%v", strings.Join(errors, "\n"))
-	}
-
-	logrus.Debugf("Cleaning up old mountid %v: done.", id)
-	return nil
-}
-
-// cleanupMounts umounts shm/mqueue mounts for old containers
-func (daemon *Daemon) cleanupMounts() error {
-	return daemon.cleanupMountsByID("")
-}
-
-func getCleanPatterns(id string) (regexps []*regexp.Regexp) {
-	var patterns []string
-	if id == "" {
-		id = "[0-9a-f]{64}"
-		patterns = append(patterns, "containers/"+id+"/shm")
-	}
-	patterns = append(patterns, "aufs/mnt/"+id+"$", "overlay/"+id+"/merged$", "zfs/graph/"+id+"$")
-	for _, p := range patterns {
-		r, err := regexp.Compile(p)
-		if err == nil {
-			regexps = append(regexps, r)
-		}
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_linux_test.go b/installer/vendor/github.com/docker/docker/daemon/daemon_linux_test.go
deleted file mode 100644
index c40b13ba4c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_linux_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// +build linux
-
-package daemon
-
-import (
-	"strings"
-	"testing"
-)
-
-const mountsFixture = `142 78 0:38 / / rw,relatime - aufs none rw,si=573b861da0b3a05b,dio
-143 142 0:60 / /proc rw,nosuid,nodev,noexec,relatime - proc proc rw
-144 142 0:67 / /dev rw,nosuid - tmpfs tmpfs rw,mode=755
-145 144 0:78 / /dev/pts rw,nosuid,noexec,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=666
-146 144 0:49 / /dev/mqueue rw,nosuid,nodev,noexec,relatime - mqueue mqueue rw
-147 142 0:84 / /sys rw,nosuid,nodev,noexec,relatime - sysfs sysfs rw
-148 147 0:86 / /sys/fs/cgroup rw,nosuid,nodev,noexec,relatime - tmpfs tmpfs rw,mode=755
-149 148 0:22 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,cpuset
-150 148 0:25 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/cpu rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,cpu
-151 148 0:27 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/cpuacct rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,cpuacct
-152 148 0:28 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,memory
-153 148 0:29 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,devices
-154 148 0:30 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,freezer
-155 148 0:31 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,blkio
-156 148 0:32 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,perf_event
-157 148 0:33 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime - cgroup cgroup rw,hugetlb
-158 148 0:35 /docker/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime - cgroup systemd rw,name=systemd
-159 142 8:4 /home/mlaventure/gopath /home/mlaventure/gopath rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-160 142 8:4 /var/lib/docker/volumes/9a428b651ee4c538130143cad8d87f603a4bf31b928afe7ff3ecd65480692b35/_data /var/lib/docker rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-164 142 8:4 /home/mlaventure/gopath/src/github.com/docker/docker /go/src/github.com/docker/docker rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-165 142 8:4 /var/lib/docker/containers/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a/resolv.conf /etc/resolv.conf rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-166 142 8:4 /var/lib/docker/containers/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a/hostname /etc/hostname rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-167 142 8:4 /var/lib/docker/containers/5425782a95e643181d8a485a2bab3c0bb21f51d7dfc03511f0e6fbf3f3aa356a/hosts /etc/hosts rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-168 144 0:39 / /dev/shm rw,nosuid,nodev,noexec,relatime - tmpfs shm rw,size=65536k
-169 144 0:12 /14 /dev/console rw,nosuid,noexec,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=000
-83 147 0:10 / /sys/kernel/security rw,relatime - securityfs none rw
-89 142 0:87 / /tmp rw,relatime - tmpfs none rw
-97 142 0:60 / /run/docker/netns/default rw,nosuid,nodev,noexec,relatime - proc proc rw
-100 160 8:4 /var/lib/docker/volumes/9a428b651ee4c538130143cad8d87f603a4bf31b928afe7ff3ecd65480692b35/_data/aufs /var/lib/docker/aufs rw,relatime - ext4 /dev/disk/by-uuid/d99e196c-1fc4-4b4f-bab9-9962b2b34e99 rw,errors=remount-ro,data=ordered
-115 100 0:102 / /var/lib/docker/aufs/mnt/0ecda1c63e5b58b3d89ff380bf646c95cc980252cf0b52466d43619aec7c8432 rw,relatime - aufs none rw,si=573b861dbc01905b,dio
-116 160 0:107 / /var/lib/docker/containers/d045dc441d2e2e1d5b3e328d47e5943811a40819fb47497c5f5a5df2d6d13c37/shm rw,nosuid,nodev,noexec,relatime - tmpfs shm rw,size=65536k
-118 142 0:102 / /run/docker/libcontainerd/d045dc441d2e2e1d5b3e328d47e5943811a40819fb47497c5f5a5df2d6d13c37/rootfs rw,relatime - aufs none rw,si=573b861dbc01905b,dio
-242 142 0:60 / /run/docker/netns/c3664df2a0f7 rw,nosuid,nodev,noexec,relatime - proc proc rw
-120 100 0:122 / /var/lib/docker/aufs/mnt/03ca4b49e71f1e49a41108829f4d5c70ac95934526e2af8984a1f65f1de0715d rw,relatime - aufs none rw,si=573b861eb147805b,dio
-171 142 0:122 / /run/docker/libcontainerd/e406ff6f3e18516d50e03dbca4de54767a69a403a6f7ec1edc2762812824521e/rootfs rw,relatime - aufs none rw,si=573b861eb147805b,dio
-310 142 0:60 / /run/docker/netns/71a18572176b rw,nosuid,nodev,noexec,relatime - proc proc rw
-`
-
-func TestCleanupMounts(t *testing.T) {
-	d := &Daemon{
-		root: "/var/lib/docker/",
-	}
-
-	expected := "/var/lib/docker/containers/d045dc441d2e2e1d5b3e328d47e5943811a40819fb47497c5f5a5df2d6d13c37/shm"
-	var unmounted int
-	unmount := func(target string) error {
-		if target == expected {
-			unmounted++
-		}
-		return nil
-	}
-
-	d.cleanupMountsFromReaderByID(strings.NewReader(mountsFixture), "", unmount)
-
-	if unmounted != 1 {
-		t.Fatalf("Expected to unmount the shm (and the shm only)")
-	}
-}
-
-func TestCleanupMountsByID(t *testing.T) {
-	d := &Daemon{
-		root: "/var/lib/docker/",
-	}
-
-	expected := "/var/lib/docker/aufs/mnt/03ca4b49e71f1e49a41108829f4d5c70ac95934526e2af8984a1f65f1de0715d"
-	var unmounted int
-	unmount := func(target string) error {
-		if target == expected {
-			unmounted++
-		}
-		return nil
-	}
-
-	d.cleanupMountsFromReaderByID(strings.NewReader(mountsFixture), "03ca4b49e71f1e49a41108829f4d5c70ac95934526e2af8984a1f65f1de0715d", unmount)
-
-	if unmounted != 1 {
-		t.Fatalf("Expected to unmount the auf root (and that only)")
-	}
-}
-
-func TestNotCleanupMounts(t *testing.T) {
-	d := &Daemon{
-		repository: "",
-	}
-	var unmounted bool
-	unmount := func(target string) error {
-		unmounted = true
-		return nil
-	}
-	mountInfo := `234 232 0:59 / /dev/shm rw,nosuid,nodev,noexec,relatime - tmpfs shm rw,size=65536k`
-	d.cleanupMountsFromReaderByID(strings.NewReader(mountInfo), "", unmount)
-	if unmounted {
-		t.Fatalf("Expected not to clean up /dev/shm")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_solaris.go b/installer/vendor/github.com/docker/docker/daemon/daemon_solaris.go
deleted file mode 100644
index 2b4d8d0216..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_solaris.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// +build solaris,cgo
-
-package daemon
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/reference"
-	"github.com/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
-	"github.com/docker/libnetwork/drivers/solaris/bridge"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
-	lntypes "github.com/docker/libnetwork/types"
-	"github.com/opencontainers/runc/libcontainer/label"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
-)
-
-//#include <zone.h>
-import "C"
-
-const (
-	defaultVirtualSwitch = "Virtual Switch"
-	platformSupported    = true
-	solarisMinCPUShares  = 1
-	solarisMaxCPUShares  = 65535
-)
-
-func getMemoryResources(config containertypes.Resources) specs.CappedMemory {
-	memory := specs.CappedMemory{}
-
-	if config.Memory > 0 {
-		memory.Physical = strconv.FormatInt(config.Memory, 10)
-	}
-
-	if config.MemorySwap != 0 {
-		memory.Swap = strconv.FormatInt(config.MemorySwap, 10)
-	}
-
-	return memory
-}
-
-func getCPUResources(config containertypes.Resources) specs.CappedCPU {
-	cpu := specs.CappedCPU{}
-
-	if config.CpusetCpus != "" {
-		cpu.Ncpus = config.CpusetCpus
-	}
-
-	return cpu
-}
-
-func (daemon *Daemon) cleanupMountsByID(id string) error {
-	return nil
-}
-
-func parseSecurityOpt(container *container.Container, config *containertypes.HostConfig) error {
-	//Since config.SecurityOpt is specifically defined as a "List of string values to
-	//customize labels for MLs systems, such as SELinux"
-	//until we figure out how to map to Trusted Extensions
-	//this is being disabled for now on Solaris
-	var (
-		labelOpts []string
-		err       error
-	)
-
-	if len(config.SecurityOpt) > 0 {
-		return errors.New("Security options are not supported on Solaris")
-	}
-
-	container.ProcessLabel, container.MountLabel, err = label.InitLabels(labelOpts)
-	return err
-}
-
-func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
-	return nil, nil, nil
-}
-
-func setupDaemonRoot(config *Config, rootDir string, rootUID, rootGID int) error {
-	return nil
-}
-
-func (daemon *Daemon) getLayerInit() func(string) error {
-	return nil
-}
-
-func checkKernel() error {
-	// solaris can rely upon checkSystem() below, we don't skew kernel versions
-	return nil
-}
-
-func (daemon *Daemon) getCgroupDriver() string {
-	return ""
-}
-
-func (daemon *Daemon) adaptContainerSettings(hostConfig *containertypes.HostConfig, adjustCPUShares bool) error {
-	if hostConfig.CPUShares < 0 {
-		logrus.Warnf("Changing requested CPUShares of %d to minimum allowed of %d", hostConfig.CPUShares, solarisMinCPUShares)
-		hostConfig.CPUShares = solarisMinCPUShares
-	} else if hostConfig.CPUShares > solarisMaxCPUShares {
-		logrus.Warnf("Changing requested CPUShares of %d to maximum allowed of %d", hostConfig.CPUShares, solarisMaxCPUShares)
-		hostConfig.CPUShares = solarisMaxCPUShares
-	}
-
-	if hostConfig.Memory > 0 && hostConfig.MemorySwap == 0 {
-		// By default, MemorySwap is set to twice the size of Memory.
-		hostConfig.MemorySwap = hostConfig.Memory * 2
-	}
-
-	if hostConfig.ShmSize != 0 {
-		hostConfig.ShmSize = container.DefaultSHMSize
-	}
-	if hostConfig.OomKillDisable == nil {
-		defaultOomKillDisable := false
-		hostConfig.OomKillDisable = &defaultOomKillDisable
-	}
-
-	return nil
-}
-
-// UsingSystemd returns true if cli option includes native.cgroupdriver=systemd
-func UsingSystemd(config *Config) bool {
-	return false
-}
-
-// verifyPlatformContainerSettings performs platform-specific validation of the
-// hostconfig and config structures.
-func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {
-	warnings := []string{}
-	sysInfo := sysinfo.New(true)
-	// NOTE: We do not enforce a minimum value for swap limits for zones on Solaris and
-	// therefore we will not do that for Docker container either.
-	if hostConfig.Memory > 0 && !sysInfo.MemoryLimit {
-		warnings = append(warnings, "Your kernel does not support memory limit capabilities. Limitation discarded.")
-		logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
-		hostConfig.Memory = 0
-		hostConfig.MemorySwap = -1
-	}
-	if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !sysInfo.SwapLimit {
-		warnings = append(warnings, "Your kernel does not support swap limit capabilities, memory limited without swap.")
-		logrus.Warnf("Your kernel does not support swap limit capabilities, memory limited without swap.")
-		hostConfig.MemorySwap = -1
-	}
-	if hostConfig.Memory > 0 && hostConfig.MemorySwap > 0 && hostConfig.MemorySwap < hostConfig.Memory {
-		return warnings, fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage.")
-	}
-	// Solaris NOTE: We allow and encourage setting the swap without setting the memory limit.
-
-	if hostConfig.MemorySwappiness != nil && *hostConfig.MemorySwappiness != -1 && !sysInfo.MemorySwappiness {
-		warnings = append(warnings, "Your kernel does not support memory swappiness capabilities, memory swappiness discarded.")
-		logrus.Warnf("Your kernel does not support memory swappiness capabilities, memory swappiness discarded.")
-		hostConfig.MemorySwappiness = nil
-	}
-	if hostConfig.MemoryReservation > 0 && !sysInfo.MemoryReservation {
-		warnings = append(warnings, "Your kernel does not support memory soft limit capabilities. Limitation discarded.")
-		logrus.Warnf("Your kernel does not support memory soft limit capabilities. Limitation discarded.")
-		hostConfig.MemoryReservation = 0
-	}
-	if hostConfig.Memory > 0 && hostConfig.MemoryReservation > 0 && hostConfig.Memory < hostConfig.MemoryReservation {
-		return warnings, fmt.Errorf("Minimum memory limit should be larger than memory reservation limit, see usage.")
-	}
-	if hostConfig.KernelMemory > 0 && !sysInfo.KernelMemory {
-		warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities. Limitation discarded.")
-		logrus.Warnf("Your kernel does not support kernel memory limit capabilities. Limitation discarded.")
-		hostConfig.KernelMemory = 0
-	}
-	if hostConfig.CPUShares != 0 && !sysInfo.CPUShares {
-		warnings = append(warnings, "Your kernel does not support CPU shares. Shares discarded.")
-		logrus.Warnf("Your kernel does not support CPU shares. Shares discarded.")
-		hostConfig.CPUShares = 0
-	}
-	if hostConfig.CPUShares < 0 {
-		warnings = append(warnings, "Invalid CPUShares value. Must be positive. Discarding.")
-		logrus.Warnf("Invalid CPUShares value. Must be positive. Discarding.")
-		hostConfig.CPUQuota = 0
-	}
-	if hostConfig.CPUShares > 0 && !sysinfo.IsCPUSharesAvailable() {
-		warnings = append(warnings, "Global zone default scheduling class not FSS. Discarding shares.")
-		logrus.Warnf("Global zone default scheduling class not FSS. Discarding shares.")
-		hostConfig.CPUShares = 0
-	}
-
-	// Solaris NOTE: Linux does not do negative checking for CPUShares and Quota here. But it makes sense to.
-	if hostConfig.CPUPeriod > 0 && !sysInfo.CPUCfsPeriod {
-		warnings = append(warnings, "Your kernel does not support CPU cfs period. Period discarded.")
-		logrus.Warnf("Your kernel does not support CPU cfs period. Period discarded.")
-		if hostConfig.CPUQuota > 0 {
-			warnings = append(warnings, "Quota will be applied on default period, not period specified.")
-			logrus.Warnf("Quota will be applied on default period, not period specified.")
-		}
-		hostConfig.CPUPeriod = 0
-	}
-	if hostConfig.CPUQuota != 0 && !sysInfo.CPUCfsQuota {
-		warnings = append(warnings, "Your kernel does not support CPU cfs quota. Quota discarded.")
-		logrus.Warnf("Your kernel does not support CPU cfs quota. Quota discarded.")
-		hostConfig.CPUQuota = 0
-	}
-	if hostConfig.CPUQuota < 0 {
-		warnings = append(warnings, "Invalid CPUQuota value. Must be positive. Discarding.")
-		logrus.Warnf("Invalid CPUQuota value. Must be positive. Discarding.")
-		hostConfig.CPUQuota = 0
-	}
-	if (hostConfig.CpusetCpus != "" || hostConfig.CpusetMems != "") && !sysInfo.Cpuset {
-		warnings = append(warnings, "Your kernel does not support cpuset. Cpuset discarded.")
-		logrus.Warnf("Your kernel does not support cpuset. Cpuset discarded.")
-		hostConfig.CpusetCpus = ""
-		hostConfig.CpusetMems = ""
-	}
-	cpusAvailable, err := sysInfo.IsCpusetCpusAvailable(hostConfig.CpusetCpus)
-	if err != nil {
-		return warnings, fmt.Errorf("Invalid value %s for cpuset cpus.", hostConfig.CpusetCpus)
-	}
-	if !cpusAvailable {
-		return warnings, fmt.Errorf("Requested CPUs are not available - requested %s, available: %s.", hostConfig.CpusetCpus, sysInfo.Cpus)
-	}
-	memsAvailable, err := sysInfo.IsCpusetMemsAvailable(hostConfig.CpusetMems)
-	if err != nil {
-		return warnings, fmt.Errorf("Invalid value %s for cpuset mems.", hostConfig.CpusetMems)
-	}
-	if !memsAvailable {
-		return warnings, fmt.Errorf("Requested memory nodes are not available - requested %s, available: %s.", hostConfig.CpusetMems, sysInfo.Mems)
-	}
-	if hostConfig.BlkioWeight > 0 && !sysInfo.BlkioWeight {
-		warnings = append(warnings, "Your kernel does not support Block I/O weight. Weight discarded.")
-		logrus.Warnf("Your kernel does not support Block I/O weight. Weight discarded.")
-		hostConfig.BlkioWeight = 0
-	}
-	if hostConfig.OomKillDisable != nil && !sysInfo.OomKillDisable {
-		*hostConfig.OomKillDisable = false
-		// Don't warn; this is the default setting but only applicable to Linux
-	}
-
-	if sysInfo.IPv4ForwardingDisabled {
-		warnings = append(warnings, "IPv4 forwarding is disabled. Networking will not work.")
-		logrus.Warnf("IPv4 forwarding is disabled. Networking will not work")
-	}
-
-	// Solaris NOTE: We do not allow setting Linux specific options, so check and warn for all of them.
-
-	if hostConfig.CapAdd != nil || hostConfig.CapDrop != nil {
-		warnings = append(warnings, "Adding or dropping kernel capabilities unsupported on Solaris.Discarding capabilities lists.")
-		logrus.Warnf("Adding or dropping kernel capabilities unsupported on Solaris.Discarding capabilities lists.")
-		hostConfig.CapAdd = nil
-		hostConfig.CapDrop = nil
-	}
-
-	if hostConfig.GroupAdd != nil {
-		warnings = append(warnings, "Additional groups unsupported on Solaris.Discarding groups lists.")
-		logrus.Warnf("Additional groups unsupported on Solaris.Discarding groups lists.")
-		hostConfig.GroupAdd = nil
-	}
-
-	if hostConfig.IpcMode != "" {
-		warnings = append(warnings, "IPC namespace assignment unsupported on Solaris.Discarding IPC setting.")
-		logrus.Warnf("IPC namespace assignment unsupported on Solaris.Discarding IPC setting.")
-		hostConfig.IpcMode = ""
-	}
-
-	if hostConfig.PidMode != "" {
-		warnings = append(warnings, "PID namespace setting  unsupported on Solaris. Running container in host PID namespace.")
-		logrus.Warnf("PID namespace setting  unsupported on Solaris. Running container in host PID namespace.")
-		hostConfig.PidMode = ""
-	}
-
-	if hostConfig.Privileged {
-		warnings = append(warnings, "Privileged mode unsupported on Solaris. Discarding privileged mode setting.")
-		logrus.Warnf("Privileged mode unsupported on Solaris. Discarding privileged mode setting.")
-		hostConfig.Privileged = false
-	}
-
-	if hostConfig.UTSMode != "" {
-		warnings = append(warnings, "UTS namespace assignment unsupported on Solaris.Discarding UTS setting.")
-		logrus.Warnf("UTS namespace assignment unsupported on Solaris.Discarding UTS setting.")
-		hostConfig.UTSMode = ""
-	}
-
-	if hostConfig.CgroupParent != "" {
-		warnings = append(warnings, "Specifying Cgroup parent unsupported on Solaris. Discarding cgroup parent setting.")
-		logrus.Warnf("Specifying Cgroup parent unsupported on Solaris. Discarding cgroup parent setting.")
-		hostConfig.CgroupParent = ""
-	}
-
-	if hostConfig.Ulimits != nil {
-		warnings = append(warnings, "Specifying ulimits unsupported on Solaris. Discarding ulimits setting.")
-		logrus.Warnf("Specifying ulimits unsupported on Solaris. Discarding ulimits setting.")
-		hostConfig.Ulimits = nil
-	}
-
-	return warnings, nil
-}
-
-// platformReload update configuration with platform specific options
-func (daemon *Daemon) platformReload(config *Config) map[string]string {
-	return map[string]string{}
-}
-
-// verifyDaemonSettings performs validation of daemon config struct
-func verifyDaemonSettings(config *Config) error {
-
-	if config.DefaultRuntime == "" {
-		config.DefaultRuntime = stockRuntimeName
-	}
-	if config.Runtimes == nil {
-		config.Runtimes = make(map[string]types.Runtime)
-	}
-	stockRuntimeOpts := []string{}
-	config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary, Args: stockRuntimeOpts}
-
-	// checkSystem validates platform-specific requirements
-	return nil
-}
-
-func checkSystem() error {
-	// check OS version for compatibility, ensure running in global zone
-	var err error
-	var id C.zoneid_t
-
-	if id, err = C.getzoneid(); err != nil {
-		return fmt.Errorf("Exiting. Error getting zone id: %+v", err)
-	}
-	if int(id) != 0 {
-		return fmt.Errorf("Exiting because the Docker daemon is not running in the global zone")
-	}
-
-	v, err := kernel.GetKernelVersion()
-	if kernel.CompareKernelVersion(*v, kernel.VersionInfo{Kernel: 5, Major: 12, Minor: 0}) < 0 {
-		return fmt.Errorf("Your Solaris kernel version: %s doesn't support Docker. Please upgrade to 5.12.0", v.String())
-	}
-	return err
-}
-
-// configureMaxThreads sets the Go runtime max threads threshold
-// which is 90% of the kernel setting from /proc/sys/kernel/threads-max
-func configureMaxThreads(config *Config) error {
-	return nil
-}
-
-// configureKernelSecuritySupport configures and validate security support for the kernel
-func configureKernelSecuritySupport(config *Config, driverName string) error {
-	return nil
-}
-
-func (daemon *Daemon) initNetworkController(config *Config, activeSandboxes map[string]interface{}) (libnetwork.NetworkController, error) {
-	netOptions, err := daemon.networkOptions(config, daemon.PluginStore, activeSandboxes)
-	if err != nil {
-		return nil, err
-	}
-
-	controller, err := libnetwork.New(netOptions...)
-	if err != nil {
-		return nil, fmt.Errorf("error obtaining controller instance: %v", err)
-	}
-
-	// Initialize default network on "null"
-	if _, err := controller.NewNetwork("null", "none", "", libnetwork.NetworkOptionPersist(false)); err != nil {
-		return nil, fmt.Errorf("Error creating default 'null' network: %v", err)
-	}
-
-	if !config.DisableBridge {
-		// Initialize default driver "bridge"
-		if err := initBridgeDriver(controller, config); err != nil {
-			return nil, err
-		}
-	}
-
-	return controller, nil
-}
-
-func initBridgeDriver(controller libnetwork.NetworkController, config *Config) error {
-	if n, err := controller.NetworkByName("bridge"); err == nil {
-		if err = n.Delete(); err != nil {
-			return fmt.Errorf("could not delete the default bridge network: %v", err)
-		}
-	}
-
-	bridgeName := bridge.DefaultBridgeName
-	if config.bridgeConfig.Iface != "" {
-		bridgeName = config.bridgeConfig.Iface
-	}
-	netOption := map[string]string{
-		bridge.BridgeName:    bridgeName,
-		bridge.DefaultBridge: strconv.FormatBool(true),
-		netlabel.DriverMTU:   strconv.Itoa(config.Mtu),
-		bridge.EnableICC:     strconv.FormatBool(config.bridgeConfig.InterContainerCommunication),
-	}
-
-	// --ip processing
-	if config.bridgeConfig.DefaultIP != nil {
-		netOption[bridge.DefaultBindingIP] = config.bridgeConfig.DefaultIP.String()
-	}
-
-	var ipamV4Conf *libnetwork.IpamConf
-
-	ipamV4Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
-
-	nwList, _, err := netutils.ElectInterfaceAddresses(bridgeName)
-	if err != nil {
-		return errors.Wrap(err, "list bridge addresses failed")
-	}
-
-	nw := nwList[0]
-	if len(nwList) > 1 && config.bridgeConfig.FixedCIDR != "" {
-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)
-		if err != nil {
-			return errors.Wrap(err, "parse CIDR failed")
-		}
-		// Iterate through in case there are multiple addresses for the bridge
-		for _, entry := range nwList {
-			if fCIDR.Contains(entry.IP) {
-				nw = entry
-				break
-			}
-		}
-	}
-
-	ipamV4Conf.PreferredPool = lntypes.GetIPNetCanonical(nw).String()
-	hip, _ := lntypes.GetHostPartIP(nw.IP, nw.Mask)
-	if hip.IsGlobalUnicast() {
-		ipamV4Conf.Gateway = nw.IP.String()
-	}
-
-	if config.bridgeConfig.IP != "" {
-		ipamV4Conf.PreferredPool = config.bridgeConfig.IP
-		ip, _, err := net.ParseCIDR(config.bridgeConfig.IP)
-		if err != nil {
-			return err
-		}
-		ipamV4Conf.Gateway = ip.String()
-	} else if bridgeName == bridge.DefaultBridgeName && ipamV4Conf.PreferredPool != "" {
-		logrus.Infof("Default bridge (%s) is assigned with an IP address %s. Daemon option --bip can be used to set a preferred IP address", bridgeName, ipamV4Conf.PreferredPool)
-	}
-
-	if config.bridgeConfig.FixedCIDR != "" {
-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)
-		if err != nil {
-			return err
-		}
-
-		ipamV4Conf.SubPool = fCIDR.String()
-	}
-
-	if config.bridgeConfig.DefaultGatewayIPv4 != nil {
-		ipamV4Conf.AuxAddresses["DefaultGatewayIPv4"] = config.bridgeConfig.DefaultGatewayIPv4.String()
-	}
-
-	v4Conf := []*libnetwork.IpamConf{ipamV4Conf}
-	v6Conf := []*libnetwork.IpamConf{}
-
-	// Initialize default network on "bridge" with the same name
-	_, err = controller.NewNetwork("bridge", "bridge", "",
-		libnetwork.NetworkOptionDriverOpts(netOption),
-		libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
-		libnetwork.NetworkOptionDeferIPv6Alloc(false))
-	if err != nil {
-		return fmt.Errorf("Error creating default 'bridge' network: %v", err)
-	}
-	return nil
-}
-
-// registerLinks sets up links between containers and writes the
-// configuration out for persistence.
-func (daemon *Daemon) registerLinks(container *container.Container, hostConfig *containertypes.HostConfig) error {
-	return nil
-}
-
-func (daemon *Daemon) cleanupMounts() error {
-	return nil
-}
-
-// conditionalMountOnStart is a platform specific helper function during the
-// container start to call mount.
-func (daemon *Daemon) conditionalMountOnStart(container *container.Container) error {
-	return daemon.Mount(container)
-}
-
-// conditionalUnmountOnCleanup is a platform specific helper function called
-// during the cleanup of a container to unmount.
-func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container) error {
-	return daemon.Unmount(container)
-}
-
-func restoreCustomImage(is image.Store, ls layer.Store, rs reference.Store) error {
-	// Solaris has no custom images to register
-	return nil
-}
-
-func driverOptions(config *Config) []nwconfig.Option {
-	return []nwconfig.Option{}
-}
-
-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {
-	return nil, nil
-}
-
-// setDefaultIsolation determine the default isolation mode for the
-// daemon to run in. This is only applicable on Windows
-func (daemon *Daemon) setDefaultIsolation() error {
-	return nil
-}
-
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
-	return types.RootFS{}
-}
-
-func setupDaemonProcess(config *Config) error {
-	return nil
-}
-
-func (daemon *Daemon) setupSeccompProfile() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_test.go b/installer/vendor/github.com/docker/docker/daemon/daemon_test.go
deleted file mode 100644
index 00817bd1b6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_test.go
+++ /dev/null
@@ -1,627 +0,0 @@
-// +build !solaris
-
-package daemon
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-	"time"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/discovery"
-	_ "github.com/docker/docker/pkg/discovery/memory"
-	"github.com/docker/docker/pkg/registrar"
-	"github.com/docker/docker/pkg/truncindex"
-	"github.com/docker/docker/registry"
-	"github.com/docker/docker/volume"
-	volumedrivers "github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
-	"github.com/docker/docker/volume/store"
-	"github.com/docker/go-connections/nat"
-)
-
-//
-// https://github.com/docker/docker/issues/8069
-//
-
-func TestGetContainer(t *testing.T) {
-	c1 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
-			Name: "tender_bardeen",
-		},
-	}
-
-	c2 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de",
-			Name: "drunk_hawking",
-		},
-	}
-
-	c3 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "3cdbd1aa394fd68559fd1441d6eff2abfafdcba06e72d2febdba229008b0bf57",
-			Name: "3cdbd1aa",
-		},
-	}
-
-	c4 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "75fb0b800922abdbef2d27e60abcdfaf7fb0698b2a96d22d3354da361a6ff4a5",
-			Name: "5a4ff6a163ad4533d22d69a2b8960bf7fafdcba06e72d2febdba229008b0bf57",
-		},
-	}
-
-	c5 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "d22d69a2b8960bf7fafdcba06e72d2febdba960bf7fafdcba06e72d2f9008b060b",
-			Name: "d22d69a2b896",
-		},
-	}
-
-	store := container.NewMemoryStore()
-	store.Add(c1.ID, c1)
-	store.Add(c2.ID, c2)
-	store.Add(c3.ID, c3)
-	store.Add(c4.ID, c4)
-	store.Add(c5.ID, c5)
-
-	index := truncindex.NewTruncIndex([]string{})
-	index.Add(c1.ID)
-	index.Add(c2.ID)
-	index.Add(c3.ID)
-	index.Add(c4.ID)
-	index.Add(c5.ID)
-
-	daemon := &Daemon{
-		containers: store,
-		idIndex:    index,
-		nameIndex:  registrar.NewRegistrar(),
-	}
-
-	daemon.reserveName(c1.ID, c1.Name)
-	daemon.reserveName(c2.ID, c2.Name)
-	daemon.reserveName(c3.ID, c3.Name)
-	daemon.reserveName(c4.ID, c4.Name)
-	daemon.reserveName(c5.ID, c5.Name)
-
-	if container, _ := daemon.GetContainer("3cdbd1aa394fd68559fd1441d6eff2ab7c1e6363582c82febfaa8045df3bd8de"); container != c2 {
-		t.Fatal("Should explicitly match full container IDs")
-	}
-
-	if container, _ := daemon.GetContainer("75fb0b8009"); container != c4 {
-		t.Fatal("Should match a partial ID")
-	}
-
-	if container, _ := daemon.GetContainer("drunk_hawking"); container != c2 {
-		t.Fatal("Should match a full name")
-	}
-
-	// c3.Name is a partial match for both c3.ID and c2.ID
-	if c, _ := daemon.GetContainer("3cdbd1aa"); c != c3 {
-		t.Fatal("Should match a full name even though it collides with another container's ID")
-	}
-
-	if container, _ := daemon.GetContainer("d22d69a2b896"); container != c5 {
-		t.Fatal("Should match a container where the provided prefix is an exact match to the its name, and is also a prefix for its ID")
-	}
-
-	if _, err := daemon.GetContainer("3cdbd1"); err == nil {
-		t.Fatal("Should return an error when provided a prefix that partially matches multiple container ID's")
-	}
-
-	if _, err := daemon.GetContainer("nothing"); err == nil {
-		t.Fatal("Should return an error when provided a prefix that is neither a name or a partial match to an ID")
-	}
-}
-
-func initDaemonWithVolumeStore(tmp string) (*Daemon, error) {
-	var err error
-	daemon := &Daemon{
-		repository: tmp,
-		root:       tmp,
-	}
-	daemon.volumes, err = store.New(tmp)
-	if err != nil {
-		return nil, err
-	}
-
-	volumesDriver, err := local.New(tmp, 0, 0)
-	if err != nil {
-		return nil, err
-	}
-	volumedrivers.Register(volumesDriver, volumesDriver.Name())
-
-	return daemon, nil
-}
-
-func TestValidContainerNames(t *testing.T) {
-	invalidNames := []string{"-rm", "&sdfsfd", "safd%sd"}
-	validNames := []string{"word-word", "word_word", "1weoid"}
-
-	for _, name := range invalidNames {
-		if validContainerNamePattern.MatchString(name) {
-			t.Fatalf("%q is not a valid container name and was returned as valid.", name)
-		}
-	}
-
-	for _, name := range validNames {
-		if !validContainerNamePattern.MatchString(name) {
-			t.Fatalf("%q is a valid container name and was returned as invalid.", name)
-		}
-	}
-}
-
-func TestContainerInitDNS(t *testing.T) {
-	tmp, err := ioutil.TempDir("", "docker-container-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	containerID := "d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e"
-	containerPath := filepath.Join(tmp, containerID)
-	if err := os.MkdirAll(containerPath, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	config := `{"State":{"Running":true,"Paused":false,"Restarting":false,"OOMKilled":false,"Dead":false,"Pid":2464,"ExitCode":0,
-"Error":"","StartedAt":"2015-05-26T16:48:53.869308965Z","FinishedAt":"0001-01-01T00:00:00Z"},
-"ID":"d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e","Created":"2015-05-26T16:48:53.7987917Z","Path":"top",
-"Args":[],"Config":{"Hostname":"d59df5276e7b","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"Cpuset":"",
-"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"PortSpecs":null,"ExposedPorts":null,"Tty":true,"OpenStdin":true,
-"StdinOnce":false,"Env":null,"Cmd":["top"],"Image":"ubuntu:latest","Volumes":null,"WorkingDir":"","Entrypoint":null,
-"NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":{}},"Image":"07f8e8c5e66084bef8f848877857537ffe1c47edd01a93af27e7161672ad0e95",
-"NetworkSettings":{"IPAddress":"172.17.0.1","IPPrefixLen":16,"MacAddress":"02:42:ac:11:00:01","LinkLocalIPv6Address":"fe80::42:acff:fe11:1",
-"LinkLocalIPv6PrefixLen":64,"GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"Gateway":"172.17.42.1","IPv6Gateway":"","Bridge":"docker0","Ports":{}},
-"ResolvConfPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/resolv.conf",
-"HostnamePath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hostname",
-"HostsPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/hosts",
-"LogPath":"/var/lib/docker/containers/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e/d59df5276e7b219d510fe70565e0404bc06350e0d4b43fe961f22f339980170e-json.log",
-"Name":"/ubuntu","Driver":"aufs","MountLabel":"","ProcessLabel":"","AppArmorProfile":"","RestartCount":0,
-"UpdateDns":false,"Volumes":{},"VolumesRW":{},"AppliedVolumesFrom":null}`
-
-	// Container struct only used to retrieve path to config file
-	container := &container.Container{CommonContainer: container.CommonContainer{Root: containerPath}}
-	configPath, err := container.ConfigPath()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = ioutil.WriteFile(configPath, []byte(config), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	hostConfig := `{"Binds":[],"ContainerIDFile":"","Memory":0,"MemorySwap":0,"CpuShares":0,"CpusetCpus":"",
-"Privileged":false,"PortBindings":{},"Links":null,"PublishAllPorts":false,"Dns":null,"DnsOptions":null,"DnsSearch":null,"ExtraHosts":null,"VolumesFrom":null,
-"Devices":[],"NetworkMode":"bridge","IpcMode":"","PidMode":"","CapAdd":null,"CapDrop":null,"RestartPolicy":{"Name":"no","MaximumRetryCount":0},
-"SecurityOpt":null,"ReadonlyRootfs":false,"Ulimits":null,"LogConfig":{"Type":"","Config":null},"CgroupParent":""}`
-
-	hostConfigPath, err := container.HostConfigPath()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = ioutil.WriteFile(hostConfigPath, []byte(hostConfig), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	daemon, err := initDaemonWithVolumeStore(tmp)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer volumedrivers.Unregister(volume.DefaultDriverName)
-
-	c, err := daemon.load(containerID)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if c.HostConfig.DNS == nil {
-		t.Fatal("Expected container DNS to not be nil")
-	}
-
-	if c.HostConfig.DNSSearch == nil {
-		t.Fatal("Expected container DNSSearch to not be nil")
-	}
-
-	if c.HostConfig.DNSOptions == nil {
-		t.Fatal("Expected container DNSOptions to not be nil")
-	}
-}
-
-func newPortNoError(proto, port string) nat.Port {
-	p, _ := nat.NewPort(proto, port)
-	return p
-}
-
-func TestMerge(t *testing.T) {
-	volumesImage := make(map[string]struct{})
-	volumesImage["/test1"] = struct{}{}
-	volumesImage["/test2"] = struct{}{}
-	portsImage := make(nat.PortSet)
-	portsImage[newPortNoError("tcp", "1111")] = struct{}{}
-	portsImage[newPortNoError("tcp", "2222")] = struct{}{}
-	configImage := &containertypes.Config{
-		ExposedPorts: portsImage,
-		Env:          []string{"VAR1=1", "VAR2=2"},
-		Volumes:      volumesImage,
-	}
-
-	portsUser := make(nat.PortSet)
-	portsUser[newPortNoError("tcp", "2222")] = struct{}{}
-	portsUser[newPortNoError("tcp", "3333")] = struct{}{}
-	volumesUser := make(map[string]struct{})
-	volumesUser["/test3"] = struct{}{}
-	configUser := &containertypes.Config{
-		ExposedPorts: portsUser,
-		Env:          []string{"VAR2=3", "VAR3=3"},
-		Volumes:      volumesUser,
-	}
-
-	if err := merge(configUser, configImage); err != nil {
-		t.Error(err)
-	}
-
-	if len(configUser.ExposedPorts) != 3 {
-		t.Fatalf("Expected 3 ExposedPorts, 1111, 2222 and 3333, found %d", len(configUser.ExposedPorts))
-	}
-	for portSpecs := range configUser.ExposedPorts {
-		if portSpecs.Port() != "1111" && portSpecs.Port() != "2222" && portSpecs.Port() != "3333" {
-			t.Fatalf("Expected 1111 or 2222 or 3333, found %s", portSpecs)
-		}
-	}
-	if len(configUser.Env) != 3 {
-		t.Fatalf("Expected 3 env var, VAR1=1, VAR2=3 and VAR3=3, found %d", len(configUser.Env))
-	}
-	for _, env := range configUser.Env {
-		if env != "VAR1=1" && env != "VAR2=3" && env != "VAR3=3" {
-			t.Fatalf("Expected VAR1=1 or VAR2=3 or VAR3=3, found %s", env)
-		}
-	}
-
-	if len(configUser.Volumes) != 3 {
-		t.Fatalf("Expected 3 volumes, /test1, /test2 and /test3, found %d", len(configUser.Volumes))
-	}
-	for v := range configUser.Volumes {
-		if v != "/test1" && v != "/test2" && v != "/test3" {
-			t.Fatalf("Expected /test1 or /test2 or /test3, found %s", v)
-		}
-	}
-
-	ports, _, err := nat.ParsePortSpecs([]string{"0000"})
-	if err != nil {
-		t.Error(err)
-	}
-	configImage2 := &containertypes.Config{
-		ExposedPorts: ports,
-	}
-
-	if err := merge(configUser, configImage2); err != nil {
-		t.Error(err)
-	}
-
-	if len(configUser.ExposedPorts) != 4 {
-		t.Fatalf("Expected 4 ExposedPorts, 0000, 1111, 2222 and 3333, found %d", len(configUser.ExposedPorts))
-	}
-	for portSpecs := range configUser.ExposedPorts {
-		if portSpecs.Port() != "0" && portSpecs.Port() != "1111" && portSpecs.Port() != "2222" && portSpecs.Port() != "3333" {
-			t.Fatalf("Expected %q or %q or %q or %q, found %s", 0, 1111, 2222, 3333, portSpecs)
-		}
-	}
-}
-
-func TestDaemonReloadLabels(t *testing.T) {
-	daemon := &Daemon{}
-	daemon.configStore = &Config{
-		CommonConfig: CommonConfig{
-			Labels: []string{"foo:bar"},
-		},
-	}
-
-	valuesSets := make(map[string]interface{})
-	valuesSets["labels"] = "foo:baz"
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			Labels:    []string{"foo:baz"},
-			valuesSet: valuesSets,
-		},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	label := daemon.configStore.Labels[0]
-	if label != "foo:baz" {
-		t.Fatalf("Expected daemon label `foo:baz`, got %s", label)
-	}
-}
-
-func TestDaemonReloadInsecureRegistries(t *testing.T) {
-	daemon := &Daemon{}
-	// initialize daemon with existing insecure registries: "127.0.0.0/8", "10.10.1.11:5000", "10.10.1.22:5000"
-	daemon.RegistryService = registry.NewService(registry.ServiceOptions{
-		InsecureRegistries: []string{
-			"127.0.0.0/8",
-			"10.10.1.11:5000",
-			"10.10.1.22:5000", // this will be removed when reloading
-			"docker1.com",
-			"docker2.com", // this will be removed when reloading
-		},
-	})
-
-	daemon.configStore = &Config{}
-
-	insecureRegistries := []string{
-		"127.0.0.0/8",     // this will be kept
-		"10.10.1.11:5000", // this will be kept
-		"10.10.1.33:5000", // this will be newly added
-		"docker1.com",     // this will be kept
-		"docker3.com",     // this will be newly added
-	}
-
-	valuesSets := make(map[string]interface{})
-	valuesSets["insecure-registries"] = insecureRegistries
-
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			ServiceOptions: registry.ServiceOptions{
-				InsecureRegistries: insecureRegistries,
-			},
-			valuesSet: valuesSets,
-		},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	// After Reload, daemon.RegistryService will be changed which is useful
-	// for registry communication in daemon.
-	registries := daemon.RegistryService.ServiceConfig()
-
-	// After Reload(), newConfig has come to registries.InsecureRegistryCIDRs and registries.IndexConfigs in daemon.
-	// Then collect registries.InsecureRegistryCIDRs in dataMap.
-	// When collecting, we need to convert CIDRS into string as a key,
-	// while the times of key appears as value.
-	dataMap := map[string]int{}
-	for _, value := range registries.InsecureRegistryCIDRs {
-		if _, ok := dataMap[value.String()]; !ok {
-			dataMap[value.String()] = 1
-		} else {
-			dataMap[value.String()]++
-		}
-	}
-
-	for _, value := range registries.IndexConfigs {
-		if _, ok := dataMap[value.Name]; !ok {
-			dataMap[value.Name] = 1
-		} else {
-			dataMap[value.Name]++
-		}
-	}
-
-	// Finally compare dataMap with the original insecureRegistries.
-	// Each value in insecureRegistries should appear in daemon's insecure registries,
-	// and each can only appear exactly ONCE.
-	for _, r := range insecureRegistries {
-		if value, ok := dataMap[r]; !ok {
-			t.Fatalf("Expected daemon insecure registry %s, got none", r)
-		} else if value != 1 {
-			t.Fatalf("Expected only 1 daemon insecure registry %s, got %d", r, value)
-		}
-	}
-
-	// assert if "10.10.1.22:5000" is removed when reloading
-	if value, ok := dataMap["10.10.1.22:5000"]; ok {
-		t.Fatalf("Expected no insecure registry of 10.10.1.22:5000, got %d", value)
-	}
-
-	// assert if "docker2.com" is removed when reloading
-	if value, ok := dataMap["docker2.com"]; ok {
-		t.Fatalf("Expected no insecure registry of docker2.com, got %d", value)
-	}
-}
-
-func TestDaemonReloadNotAffectOthers(t *testing.T) {
-	daemon := &Daemon{}
-	daemon.configStore = &Config{
-		CommonConfig: CommonConfig{
-			Labels: []string{"foo:bar"},
-			Debug:  true,
-		},
-	}
-
-	valuesSets := make(map[string]interface{})
-	valuesSets["labels"] = "foo:baz"
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			Labels:    []string{"foo:baz"},
-			valuesSet: valuesSets,
-		},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	label := daemon.configStore.Labels[0]
-	if label != "foo:baz" {
-		t.Fatalf("Expected daemon label `foo:baz`, got %s", label)
-	}
-	debug := daemon.configStore.Debug
-	if !debug {
-		t.Fatalf("Expected debug 'enabled', got 'disabled'")
-	}
-}
-
-func TestDaemonDiscoveryReload(t *testing.T) {
-	daemon := &Daemon{}
-	daemon.configStore = &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore:     "memory://127.0.0.1",
-			ClusterAdvertise: "127.0.0.1:3333",
-		},
-	}
-
-	if err := daemon.initDiscovery(daemon.configStore); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "127.0.0.1", Port: "3333"},
-	}
-
-	select {
-	case <-time.After(10 * time.Second):
-		t.Fatal("timeout waiting for discovery")
-	case <-daemon.discoveryWatcher.ReadyCh():
-	}
-
-	stopCh := make(chan struct{})
-	defer close(stopCh)
-	ch, errCh := daemon.discoveryWatcher.Watch(stopCh)
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("failed to get discovery advertisements in time")
-	case e := <-ch:
-		if !reflect.DeepEqual(e, expected) {
-			t.Fatalf("expected %v, got %v\n", expected, e)
-		}
-	case e := <-errCh:
-		t.Fatal(e)
-	}
-
-	valuesSets := make(map[string]interface{})
-	valuesSets["cluster-store"] = "memory://127.0.0.1:2222"
-	valuesSets["cluster-advertise"] = "127.0.0.1:5555"
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore:     "memory://127.0.0.1:2222",
-			ClusterAdvertise: "127.0.0.1:5555",
-			valuesSet:        valuesSets,
-		},
-	}
-
-	expected = discovery.Entries{
-		&discovery.Entry{Host: "127.0.0.1", Port: "5555"},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-time.After(10 * time.Second):
-		t.Fatal("timeout waiting for discovery")
-	case <-daemon.discoveryWatcher.ReadyCh():
-	}
-
-	ch, errCh = daemon.discoveryWatcher.Watch(stopCh)
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("failed to get discovery advertisements in time")
-	case e := <-ch:
-		if !reflect.DeepEqual(e, expected) {
-			t.Fatalf("expected %v, got %v\n", expected, e)
-		}
-	case e := <-errCh:
-		t.Fatal(e)
-	}
-}
-
-func TestDaemonDiscoveryReloadFromEmptyDiscovery(t *testing.T) {
-	daemon := &Daemon{}
-	daemon.configStore = &Config{}
-
-	valuesSet := make(map[string]interface{})
-	valuesSet["cluster-store"] = "memory://127.0.0.1:2222"
-	valuesSet["cluster-advertise"] = "127.0.0.1:5555"
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore:     "memory://127.0.0.1:2222",
-			ClusterAdvertise: "127.0.0.1:5555",
-			valuesSet:        valuesSet,
-		},
-	}
-
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "127.0.0.1", Port: "5555"},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-time.After(10 * time.Second):
-		t.Fatal("timeout waiting for discovery")
-	case <-daemon.discoveryWatcher.ReadyCh():
-	}
-
-	stopCh := make(chan struct{})
-	defer close(stopCh)
-	ch, errCh := daemon.discoveryWatcher.Watch(stopCh)
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("failed to get discovery advertisements in time")
-	case e := <-ch:
-		if !reflect.DeepEqual(e, expected) {
-			t.Fatalf("expected %v, got %v\n", expected, e)
-		}
-	case e := <-errCh:
-		t.Fatal(e)
-	}
-}
-
-func TestDaemonDiscoveryReloadOnlyClusterAdvertise(t *testing.T) {
-	daemon := &Daemon{}
-	daemon.configStore = &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore: "memory://127.0.0.1",
-		},
-	}
-	valuesSets := make(map[string]interface{})
-	valuesSets["cluster-advertise"] = "127.0.0.1:5555"
-	newConfig := &Config{
-		CommonConfig: CommonConfig{
-			ClusterAdvertise: "127.0.0.1:5555",
-			valuesSet:        valuesSets,
-		},
-	}
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "127.0.0.1", Port: "5555"},
-	}
-
-	if err := daemon.Reload(newConfig); err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-daemon.discoveryWatcher.ReadyCh():
-	case <-time.After(10 * time.Second):
-		t.Fatal("Timeout waiting for discovery")
-	}
-	stopCh := make(chan struct{})
-	defer close(stopCh)
-	ch, errCh := daemon.discoveryWatcher.Watch(stopCh)
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("failed to get discovery advertisements in time")
-	case e := <-ch:
-		if !reflect.DeepEqual(e, expected) {
-			t.Fatalf("expected %v, got %v\n", expected, e)
-		}
-	case e := <-errCh:
-		t.Fatal(e)
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_unix.go b/installer/vendor/github.com/docker/docker/daemon/daemon_unix.go
deleted file mode 100644
index 5b3ffeb72d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_unix.go
+++ /dev/null
@@ -1,1237 +0,0 @@
-// +build linux freebsd
-
-package daemon
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"path/filepath"
-	"runtime"
-	"runtime/debug"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/blkiodev"
-	pblkiodev "github.com/docker/docker/api/types/blkiodev"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/runconfig"
-	runconfigopts "github.com/docker/docker/runconfig/opts"
-	"github.com/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
-	"github.com/docker/libnetwork/drivers/bridge"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/netutils"
-	"github.com/docker/libnetwork/options"
-	lntypes "github.com/docker/libnetwork/types"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"github.com/opencontainers/runc/libcontainer/label"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
-	"github.com/vishvananda/netlink"
-)
-
-const (
-	// See https://git.kernel.org/cgit/linux/kernel/git/tip/tip.git/tree/kernel/sched/sched.h?id=8cd9234c64c584432f6992fe944ca9e46ca8ea76#n269
-	linuxMinCPUShares = 2
-	linuxMaxCPUShares = 262144
-	platformSupported = true
-	// It's not kernel limit, we want this 4M limit to supply a reasonable functional container
-	linuxMinMemory = 4194304
-	// constants for remapped root settings
-	defaultIDSpecifier string = "default"
-	defaultRemappedID  string = "dockremap"
-
-	// constant for cgroup drivers
-	cgroupFsDriver      = "cgroupfs"
-	cgroupSystemdDriver = "systemd"
-)
-
-func getMemoryResources(config containertypes.Resources) *specs.Memory {
-	memory := specs.Memory{}
-
-	if config.Memory > 0 {
-		limit := uint64(config.Memory)
-		memory.Limit = &limit
-	}
-
-	if config.MemoryReservation > 0 {
-		reservation := uint64(config.MemoryReservation)
-		memory.Reservation = &reservation
-	}
-
-	if config.MemorySwap != 0 {
-		swap := uint64(config.MemorySwap)
-		memory.Swap = &swap
-	}
-
-	if config.MemorySwappiness != nil {
-		swappiness := uint64(*config.MemorySwappiness)
-		memory.Swappiness = &swappiness
-	}
-
-	if config.KernelMemory != 0 {
-		kernelMemory := uint64(config.KernelMemory)
-		memory.Kernel = &kernelMemory
-	}
-
-	return &memory
-}
-
-func getCPUResources(config containertypes.Resources) *specs.CPU {
-	cpu := specs.CPU{}
-
-	if config.CPUShares != 0 {
-		shares := uint64(config.CPUShares)
-		cpu.Shares = &shares
-	}
-
-	if config.CpusetCpus != "" {
-		cpuset := config.CpusetCpus
-		cpu.Cpus = &cpuset
-	}
-
-	if config.CpusetMems != "" {
-		cpuset := config.CpusetMems
-		cpu.Mems = &cpuset
-	}
-
-	if config.NanoCPUs > 0 {
-		// https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
-		period := uint64(100 * time.Millisecond / time.Microsecond)
-		quota := uint64(config.NanoCPUs) * period / 1e9
-		cpu.Period = &period
-		cpu.Quota = &quota
-	}
-
-	if config.CPUPeriod != 0 {
-		period := uint64(config.CPUPeriod)
-		cpu.Period = &period
-	}
-
-	if config.CPUQuota != 0 {
-		quota := uint64(config.CPUQuota)
-		cpu.Quota = &quota
-	}
-
-	if config.CPURealtimePeriod != 0 {
-		period := uint64(config.CPURealtimePeriod)
-		cpu.RealtimePeriod = &period
-	}
-
-	if config.CPURealtimeRuntime != 0 {
-		runtime := uint64(config.CPURealtimeRuntime)
-		cpu.RealtimeRuntime = &runtime
-	}
-
-	return &cpu
-}
-
-func getBlkioWeightDevices(config containertypes.Resources) ([]specs.WeightDevice, error) {
-	var stat syscall.Stat_t
-	var blkioWeightDevices []specs.WeightDevice
-
-	for _, weightDevice := range config.BlkioWeightDevice {
-		if err := syscall.Stat(weightDevice.Path, &stat); err != nil {
-			return nil, err
-		}
-		weight := weightDevice.Weight
-		d := specs.WeightDevice{Weight: &weight}
-		d.Major = int64(stat.Rdev / 256)
-		d.Minor = int64(stat.Rdev % 256)
-		blkioWeightDevices = append(blkioWeightDevices, d)
-	}
-
-	return blkioWeightDevices, nil
-}
-
-func parseSecurityOpt(container *container.Container, config *containertypes.HostConfig) error {
-	var (
-		labelOpts []string
-		err       error
-	)
-
-	for _, opt := range config.SecurityOpt {
-		if opt == "no-new-privileges" {
-			container.NoNewPrivileges = true
-			continue
-		}
-
-		var con []string
-		if strings.Contains(opt, "=") {
-			con = strings.SplitN(opt, "=", 2)
-		} else if strings.Contains(opt, ":") {
-			con = strings.SplitN(opt, ":", 2)
-			logrus.Warn("Security options with `:` as a separator are deprecated and will be completely unsupported in 1.14, use `=` instead.")
-		}
-
-		if len(con) != 2 {
-			return fmt.Errorf("invalid --security-opt 1: %q", opt)
-		}
-
-		switch con[0] {
-		case "label":
-			labelOpts = append(labelOpts, con[1])
-		case "apparmor":
-			container.AppArmorProfile = con[1]
-		case "seccomp":
-			container.SeccompProfile = con[1]
-		default:
-			return fmt.Errorf("invalid --security-opt 2: %q", opt)
-		}
-	}
-
-	container.ProcessLabel, container.MountLabel, err = label.InitLabels(labelOpts)
-	return err
-}
-
-func getBlkioThrottleDevices(devs []*blkiodev.ThrottleDevice) ([]specs.ThrottleDevice, error) {
-	var throttleDevices []specs.ThrottleDevice
-	var stat syscall.Stat_t
-
-	for _, d := range devs {
-		if err := syscall.Stat(d.Path, &stat); err != nil {
-			return nil, err
-		}
-		rate := d.Rate
-		d := specs.ThrottleDevice{Rate: &rate}
-		d.Major = int64(stat.Rdev / 256)
-		d.Minor = int64(stat.Rdev % 256)
-		throttleDevices = append(throttleDevices, d)
-	}
-
-	return throttleDevices, nil
-}
-
-func checkKernel() error {
-	// Check for unsupported kernel versions
-	// FIXME: it would be cleaner to not test for specific versions, but rather
-	// test for specific functionalities.
-	// Unfortunately we can't test for the feature "does not cause a kernel panic"
-	// without actually causing a kernel panic, so we need this workaround until
-	// the circumstances of pre-3.10 crashes are clearer.
-	// For details see https://github.com/docker/docker/issues/407
-	// Docker 1.11 and above doesn't actually run on kernels older than 3.4,
-	// due to containerd-shim usage of PR_SET_CHILD_SUBREAPER (introduced in 3.4).
-	if !kernel.CheckKernelVersion(3, 10, 0) {
-		v, _ := kernel.GetKernelVersion()
-		if os.Getenv("DOCKER_NOWARN_KERNEL_VERSION") == "" {
-			logrus.Fatalf("Your Linux kernel version %s is not supported for running docker. Please upgrade your kernel to 3.10.0 or newer.", v.String())
-		}
-	}
-	return nil
-}
-
-// adaptContainerSettings is called during container creation to modify any
-// settings necessary in the HostConfig structure.
-func (daemon *Daemon) adaptContainerSettings(hostConfig *containertypes.HostConfig, adjustCPUShares bool) error {
-	if adjustCPUShares && hostConfig.CPUShares > 0 {
-		// Handle unsupported CPUShares
-		if hostConfig.CPUShares < linuxMinCPUShares {
-			logrus.Warnf("Changing requested CPUShares of %d to minimum allowed of %d", hostConfig.CPUShares, linuxMinCPUShares)
-			hostConfig.CPUShares = linuxMinCPUShares
-		} else if hostConfig.CPUShares > linuxMaxCPUShares {
-			logrus.Warnf("Changing requested CPUShares of %d to maximum allowed of %d", hostConfig.CPUShares, linuxMaxCPUShares)
-			hostConfig.CPUShares = linuxMaxCPUShares
-		}
-	}
-	if hostConfig.Memory > 0 && hostConfig.MemorySwap == 0 {
-		// By default, MemorySwap is set to twice the size of Memory.
-		hostConfig.MemorySwap = hostConfig.Memory * 2
-	}
-	if hostConfig.ShmSize == 0 {
-		hostConfig.ShmSize = container.DefaultSHMSize
-	}
-	var err error
-	opts, err := daemon.generateSecurityOpt(hostConfig.IpcMode, hostConfig.PidMode, hostConfig.Privileged)
-	if err != nil {
-		return err
-	}
-	hostConfig.SecurityOpt = append(hostConfig.SecurityOpt, opts...)
-	if hostConfig.MemorySwappiness == nil {
-		defaultSwappiness := int64(-1)
-		hostConfig.MemorySwappiness = &defaultSwappiness
-	}
-	if hostConfig.OomKillDisable == nil {
-		defaultOomKillDisable := false
-		hostConfig.OomKillDisable = &defaultOomKillDisable
-	}
-
-	return nil
-}
-
-func verifyContainerResources(resources *containertypes.Resources, sysInfo *sysinfo.SysInfo, update bool) ([]string, error) {
-	warnings := []string{}
-
-	// memory subsystem checks and adjustments
-	if resources.Memory != 0 && resources.Memory < linuxMinMemory {
-		return warnings, fmt.Errorf("Minimum memory limit allowed is 4MB")
-	}
-	if resources.Memory > 0 && !sysInfo.MemoryLimit {
-		warnings = append(warnings, "Your kernel does not support memory limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		logrus.Warn("Your kernel does not support memory limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		resources.Memory = 0
-		resources.MemorySwap = -1
-	}
-	if resources.Memory > 0 && resources.MemorySwap != -1 && !sysInfo.SwapLimit {
-		warnings = append(warnings, "Your kernel does not support swap limit capabilities or the cgroup is not mounted. Memory limited without swap.")
-		logrus.Warn("Your kernel does not support swap limit capabilities,or the cgroup is not mounted. Memory limited without swap.")
-		resources.MemorySwap = -1
-	}
-	if resources.Memory > 0 && resources.MemorySwap > 0 && resources.MemorySwap < resources.Memory {
-		return warnings, fmt.Errorf("Minimum memoryswap limit should be larger than memory limit, see usage")
-	}
-	if resources.Memory == 0 && resources.MemorySwap > 0 && !update {
-		return warnings, fmt.Errorf("You should always set the Memory limit when using Memoryswap limit, see usage")
-	}
-	if resources.MemorySwappiness != nil && *resources.MemorySwappiness != -1 && !sysInfo.MemorySwappiness {
-		warnings = append(warnings, "Your kernel does not support memory swappiness capabilities or the cgroup is not mounted. Memory swappiness discarded.")
-		logrus.Warn("Your kernel does not support memory swappiness capabilities, or the cgroup is not mounted. Memory swappiness discarded.")
-		resources.MemorySwappiness = nil
-	}
-	if resources.MemorySwappiness != nil {
-		swappiness := *resources.MemorySwappiness
-		if swappiness < -1 || swappiness > 100 {
-			return warnings, fmt.Errorf("Invalid value: %v, valid memory swappiness range is 0-100", swappiness)
-		}
-	}
-	if resources.MemoryReservation > 0 && !sysInfo.MemoryReservation {
-		warnings = append(warnings, "Your kernel does not support memory soft limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		logrus.Warn("Your kernel does not support memory soft limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		resources.MemoryReservation = 0
-	}
-	if resources.MemoryReservation > 0 && resources.MemoryReservation < linuxMinMemory {
-		return warnings, fmt.Errorf("Minimum memory reservation allowed is 4MB")
-	}
-	if resources.Memory > 0 && resources.MemoryReservation > 0 && resources.Memory < resources.MemoryReservation {
-		return warnings, fmt.Errorf("Minimum memory limit can not be less than memory reservation limit, see usage")
-	}
-	if resources.KernelMemory > 0 && !sysInfo.KernelMemory {
-		warnings = append(warnings, "Your kernel does not support kernel memory limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		logrus.Warn("Your kernel does not support kernel memory limit capabilities or the cgroup is not mounted. Limitation discarded.")
-		resources.KernelMemory = 0
-	}
-	if resources.KernelMemory > 0 && resources.KernelMemory < linuxMinMemory {
-		return warnings, fmt.Errorf("Minimum kernel memory limit allowed is 4MB")
-	}
-	if resources.KernelMemory > 0 && !kernel.CheckKernelVersion(4, 0, 0) {
-		warnings = append(warnings, "You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.")
-		logrus.Warn("You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.")
-	}
-	if resources.OomKillDisable != nil && !sysInfo.OomKillDisable {
-		// only produce warnings if the setting wasn't to *disable* the OOM Kill; no point
-		// warning the caller if they already wanted the feature to be off
-		if *resources.OomKillDisable {
-			warnings = append(warnings, "Your kernel does not support OomKillDisable. OomKillDisable discarded.")
-			logrus.Warn("Your kernel does not support OomKillDisable. OomKillDisable discarded.")
-		}
-		resources.OomKillDisable = nil
-	}
-
-	if resources.PidsLimit != 0 && !sysInfo.PidsLimit {
-		warnings = append(warnings, "Your kernel does not support pids limit capabilities or the cgroup is not mounted. PIDs limit discarded.")
-		logrus.Warn("Your kernel does not support pids limit capabilities or the cgroup is not mounted. PIDs limit discarded.")
-		resources.PidsLimit = 0
-	}
-
-	// cpu subsystem checks and adjustments
-	if resources.NanoCPUs > 0 && resources.CPUPeriod > 0 {
-		return warnings, fmt.Errorf("Conflicting options: Nano CPUs and CPU Period cannot both be set")
-	}
-	if resources.NanoCPUs > 0 && resources.CPUQuota > 0 {
-		return warnings, fmt.Errorf("Conflicting options: Nano CPUs and CPU Quota cannot both be set")
-	}
-	if resources.NanoCPUs > 0 && (!sysInfo.CPUCfsPeriod || !sysInfo.CPUCfsQuota) {
-		return warnings, fmt.Errorf("NanoCPUs can not be set, as your kernel does not support CPU cfs period/quota or the cgroup is not mounted")
-	}
-	// The highest precision we could get on Linux is 0.001, by setting
-	//   cpu.cfs_period_us=1000ms
-	//   cpu.cfs_quota=1ms
-	// See the following link for details:
-	// https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
-	// Here we don't set the lower limit and it is up to the underlying platform (e.g., Linux) to return an error.
-	// The error message is 0.01 so that this is consistent with Windows
-	if resources.NanoCPUs < 0 || resources.NanoCPUs > int64(sysinfo.NumCPU())*1e9 {
-		return warnings, fmt.Errorf("Range of CPUs is from 0.01 to %d.00, as there are only %d CPUs available", sysinfo.NumCPU(), sysinfo.NumCPU())
-	}
-
-	if resources.CPUShares > 0 && !sysInfo.CPUShares {
-		warnings = append(warnings, "Your kernel does not support CPU shares or the cgroup is not mounted. Shares discarded.")
-		logrus.Warn("Your kernel does not support CPU shares or the cgroup is not mounted. Shares discarded.")
-		resources.CPUShares = 0
-	}
-	if resources.CPUPeriod > 0 && !sysInfo.CPUCfsPeriod {
-		warnings = append(warnings, "Your kernel does not support CPU cfs period or the cgroup is not mounted. Period discarded.")
-		logrus.Warn("Your kernel does not support CPU cfs period or the cgroup is not mounted. Period discarded.")
-		resources.CPUPeriod = 0
-	}
-	if resources.CPUPeriod != 0 && (resources.CPUPeriod < 1000 || resources.CPUPeriod > 1000000) {
-		return warnings, fmt.Errorf("CPU cfs period can not be less than 1ms (i.e. 1000) or larger than 1s (i.e. 1000000)")
-	}
-	if resources.CPUQuota > 0 && !sysInfo.CPUCfsQuota {
-		warnings = append(warnings, "Your kernel does not support CPU cfs quota or the cgroup is not mounted. Quota discarded.")
-		logrus.Warn("Your kernel does not support CPU cfs quota or the cgroup is not mounted. Quota discarded.")
-		resources.CPUQuota = 0
-	}
-	if resources.CPUQuota > 0 && resources.CPUQuota < 1000 {
-		return warnings, fmt.Errorf("CPU cfs quota can not be less than 1ms (i.e. 1000)")
-	}
-	if resources.CPUPercent > 0 {
-		warnings = append(warnings, fmt.Sprintf("%s does not support CPU percent. Percent discarded.", runtime.GOOS))
-		logrus.Warnf("%s does not support CPU percent. Percent discarded.", runtime.GOOS)
-		resources.CPUPercent = 0
-	}
-
-	// cpuset subsystem checks and adjustments
-	if (resources.CpusetCpus != "" || resources.CpusetMems != "") && !sysInfo.Cpuset {
-		warnings = append(warnings, "Your kernel does not support cpuset or the cgroup is not mounted. Cpuset discarded.")
-		logrus.Warn("Your kernel does not support cpuset or the cgroup is not mounted. Cpuset discarded.")
-		resources.CpusetCpus = ""
-		resources.CpusetMems = ""
-	}
-	cpusAvailable, err := sysInfo.IsCpusetCpusAvailable(resources.CpusetCpus)
-	if err != nil {
-		return warnings, fmt.Errorf("Invalid value %s for cpuset cpus", resources.CpusetCpus)
-	}
-	if !cpusAvailable {
-		return warnings, fmt.Errorf("Requested CPUs are not available - requested %s, available: %s", resources.CpusetCpus, sysInfo.Cpus)
-	}
-	memsAvailable, err := sysInfo.IsCpusetMemsAvailable(resources.CpusetMems)
-	if err != nil {
-		return warnings, fmt.Errorf("Invalid value %s for cpuset mems", resources.CpusetMems)
-	}
-	if !memsAvailable {
-		return warnings, fmt.Errorf("Requested memory nodes are not available - requested %s, available: %s", resources.CpusetMems, sysInfo.Mems)
-	}
-
-	// blkio subsystem checks and adjustments
-	if resources.BlkioWeight > 0 && !sysInfo.BlkioWeight {
-		warnings = append(warnings, "Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.")
-		logrus.Warn("Your kernel does not support Block I/O weight or the cgroup is not mounted. Weight discarded.")
-		resources.BlkioWeight = 0
-	}
-	if resources.BlkioWeight > 0 && (resources.BlkioWeight < 10 || resources.BlkioWeight > 1000) {
-		return warnings, fmt.Errorf("Range of blkio weight is from 10 to 1000")
-	}
-	if resources.IOMaximumBandwidth != 0 || resources.IOMaximumIOps != 0 {
-		return warnings, fmt.Errorf("Invalid QoS settings: %s does not support Maximum IO Bandwidth or Maximum IO IOps", runtime.GOOS)
-	}
-	if len(resources.BlkioWeightDevice) > 0 && !sysInfo.BlkioWeightDevice {
-		warnings = append(warnings, "Your kernel does not support Block I/O weight_device or the cgroup is not mounted. Weight-device discarded.")
-		logrus.Warn("Your kernel does not support Block I/O weight_device or the cgroup is not mounted. Weight-device discarded.")
-		resources.BlkioWeightDevice = []*pblkiodev.WeightDevice{}
-	}
-	if len(resources.BlkioDeviceReadBps) > 0 && !sysInfo.BlkioReadBpsDevice {
-		warnings = append(warnings, "Your kernel does not support BPS Block I/O read limit or the cgroup is not mounted. Block I/O BPS read limit discarded.")
-		logrus.Warn("Your kernel does not support BPS Block I/O read limit or the cgroup is not mounted. Block I/O BPS read limit discarded")
-		resources.BlkioDeviceReadBps = []*pblkiodev.ThrottleDevice{}
-	}
-	if len(resources.BlkioDeviceWriteBps) > 0 && !sysInfo.BlkioWriteBpsDevice {
-		warnings = append(warnings, "Your kernel does not support BPS Block I/O write limit or the cgroup is not mounted. Block I/O BPS write limit discarded.")
-		logrus.Warn("Your kernel does not support BPS Block I/O write limit or the cgroup is not mounted. Block I/O BPS write limit discarded.")
-		resources.BlkioDeviceWriteBps = []*pblkiodev.ThrottleDevice{}
-	}
-	if len(resources.BlkioDeviceReadIOps) > 0 && !sysInfo.BlkioReadIOpsDevice {
-		warnings = append(warnings, "Your kernel does not support IOPS Block read limit or the cgroup is not mounted. Block I/O IOPS read limit discarded.")
-		logrus.Warn("Your kernel does not support IOPS Block I/O read limit in IO or the cgroup is not mounted. Block I/O IOPS read limit discarded.")
-		resources.BlkioDeviceReadIOps = []*pblkiodev.ThrottleDevice{}
-	}
-	if len(resources.BlkioDeviceWriteIOps) > 0 && !sysInfo.BlkioWriteIOpsDevice {
-		warnings = append(warnings, "Your kernel does not support IOPS Block write limit or the cgroup is not mounted. Block I/O IOPS write limit discarded.")
-		logrus.Warn("Your kernel does not support IOPS Block I/O write limit or the cgroup is not mounted. Block I/O IOPS write limit discarded.")
-		resources.BlkioDeviceWriteIOps = []*pblkiodev.ThrottleDevice{}
-	}
-
-	return warnings, nil
-}
-
-func (daemon *Daemon) getCgroupDriver() string {
-	cgroupDriver := cgroupFsDriver
-
-	if UsingSystemd(daemon.configStore) {
-		cgroupDriver = cgroupSystemdDriver
-	}
-	return cgroupDriver
-}
-
-// getCD gets the raw value of the native.cgroupdriver option, if set.
-func getCD(config *Config) string {
-	for _, option := range config.ExecOptions {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil || !strings.EqualFold(key, "native.cgroupdriver") {
-			continue
-		}
-		return val
-	}
-	return ""
-}
-
-// VerifyCgroupDriver validates native.cgroupdriver
-func VerifyCgroupDriver(config *Config) error {
-	cd := getCD(config)
-	if cd == "" || cd == cgroupFsDriver || cd == cgroupSystemdDriver {
-		return nil
-	}
-	return fmt.Errorf("native.cgroupdriver option %s not supported", cd)
-}
-
-// UsingSystemd returns true if cli option includes native.cgroupdriver=systemd
-func UsingSystemd(config *Config) bool {
-	return getCD(config) == cgroupSystemdDriver
-}
-
-// verifyPlatformContainerSettings performs platform-specific validation of the
-// hostconfig and config structures.
-func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {
-	warnings := []string{}
-	sysInfo := sysinfo.New(true)
-
-	warnings, err := daemon.verifyExperimentalContainerSettings(hostConfig, config)
-	if err != nil {
-		return warnings, err
-	}
-
-	w, err := verifyContainerResources(&hostConfig.Resources, sysInfo, update)
-
-	// no matter err is nil or not, w could have data in itself.
-	warnings = append(warnings, w...)
-
-	if err != nil {
-		return warnings, err
-	}
-
-	if hostConfig.ShmSize < 0 {
-		return warnings, fmt.Errorf("SHM size can not be less than 0")
-	}
-
-	if hostConfig.OomScoreAdj < -1000 || hostConfig.OomScoreAdj > 1000 {
-		return warnings, fmt.Errorf("Invalid value %d, range for oom score adj is [-1000, 1000]", hostConfig.OomScoreAdj)
-	}
-
-	// ip-forwarding does not affect container with '--net=host' (or '--net=none')
-	if sysInfo.IPv4ForwardingDisabled && !(hostConfig.NetworkMode.IsHost() || hostConfig.NetworkMode.IsNone()) {
-		warnings = append(warnings, "IPv4 forwarding is disabled. Networking will not work.")
-		logrus.Warn("IPv4 forwarding is disabled. Networking will not work")
-	}
-	// check for various conflicting options with user namespaces
-	if daemon.configStore.RemappedRoot != "" && hostConfig.UsernsMode.IsPrivate() {
-		if hostConfig.Privileged {
-			return warnings, fmt.Errorf("Privileged mode is incompatible with user namespaces")
-		}
-		if hostConfig.NetworkMode.IsHost() && !hostConfig.UsernsMode.IsHost() {
-			return warnings, fmt.Errorf("Cannot share the host's network namespace when user namespaces are enabled")
-		}
-		if hostConfig.PidMode.IsHost() && !hostConfig.UsernsMode.IsHost() {
-			return warnings, fmt.Errorf("Cannot share the host PID namespace when user namespaces are enabled")
-		}
-	}
-	if hostConfig.CgroupParent != "" && UsingSystemd(daemon.configStore) {
-		// CgroupParent for systemd cgroup should be named as "xxx.slice"
-		if len(hostConfig.CgroupParent) <= 6 || !strings.HasSuffix(hostConfig.CgroupParent, ".slice") {
-			return warnings, fmt.Errorf("cgroup-parent for systemd cgroup should be a valid slice named as \"xxx.slice\"")
-		}
-	}
-	if hostConfig.Runtime == "" {
-		hostConfig.Runtime = daemon.configStore.GetDefaultRuntimeName()
-	}
-
-	if rt := daemon.configStore.GetRuntime(hostConfig.Runtime); rt == nil {
-		return warnings, fmt.Errorf("Unknown runtime specified %s", hostConfig.Runtime)
-	}
-
-	return warnings, nil
-}
-
-// platformReload update configuration with platform specific options
-func (daemon *Daemon) platformReload(config *Config) map[string]string {
-	if config.IsValueSet("runtimes") {
-		daemon.configStore.Runtimes = config.Runtimes
-		// Always set the default one
-		daemon.configStore.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary}
-	}
-
-	if config.DefaultRuntime != "" {
-		daemon.configStore.DefaultRuntime = config.DefaultRuntime
-	}
-
-	// Update attributes
-	var runtimeList bytes.Buffer
-	for name, rt := range daemon.configStore.Runtimes {
-		if runtimeList.Len() > 0 {
-			runtimeList.WriteRune(' ')
-		}
-		runtimeList.WriteString(fmt.Sprintf("%s:%s", name, rt))
-	}
-
-	return map[string]string{
-		"runtimes":        runtimeList.String(),
-		"default-runtime": daemon.configStore.DefaultRuntime,
-	}
-}
-
-// verifyDaemonSettings performs validation of daemon config struct
-func verifyDaemonSettings(config *Config) error {
-	// Check for mutually incompatible config options
-	if config.bridgeConfig.Iface != "" && config.bridgeConfig.IP != "" {
-		return fmt.Errorf("You specified -b & --bip, mutually exclusive options. Please specify only one")
-	}
-	if !config.bridgeConfig.EnableIPTables && !config.bridgeConfig.InterContainerCommunication {
-		return fmt.Errorf("You specified --iptables=false with --icc=false. ICC=false uses iptables to function. Please set --icc or --iptables to true")
-	}
-	if !config.bridgeConfig.EnableIPTables && config.bridgeConfig.EnableIPMasq {
-		config.bridgeConfig.EnableIPMasq = false
-	}
-	if err := VerifyCgroupDriver(config); err != nil {
-		return err
-	}
-	if config.CgroupParent != "" && UsingSystemd(config) {
-		if len(config.CgroupParent) <= 6 || !strings.HasSuffix(config.CgroupParent, ".slice") {
-			return fmt.Errorf("cgroup-parent for systemd cgroup should be a valid slice named as \"xxx.slice\"")
-		}
-	}
-
-	if config.DefaultRuntime == "" {
-		config.DefaultRuntime = stockRuntimeName
-	}
-	if config.Runtimes == nil {
-		config.Runtimes = make(map[string]types.Runtime)
-	}
-	config.Runtimes[stockRuntimeName] = types.Runtime{Path: DefaultRuntimeBinary}
-
-	return nil
-}
-
-// checkSystem validates platform-specific requirements
-func checkSystem() error {
-	if os.Geteuid() != 0 {
-		return fmt.Errorf("The Docker daemon needs to be run as root")
-	}
-	return checkKernel()
-}
-
-// configureMaxThreads sets the Go runtime max threads threshold
-// which is 90% of the kernel setting from /proc/sys/kernel/threads-max
-func configureMaxThreads(config *Config) error {
-	mt, err := ioutil.ReadFile("/proc/sys/kernel/threads-max")
-	if err != nil {
-		return err
-	}
-	mtint, err := strconv.Atoi(strings.TrimSpace(string(mt)))
-	if err != nil {
-		return err
-	}
-	maxThreads := (mtint / 100) * 90
-	debug.SetMaxThreads(maxThreads)
-	logrus.Debugf("Golang's threads limit set to %d", maxThreads)
-	return nil
-}
-
-// configureKernelSecuritySupport configures and validates security support for the kernel
-func configureKernelSecuritySupport(config *Config, driverName string) error {
-	if config.EnableSelinuxSupport {
-		if !selinuxEnabled() {
-			logrus.Warn("Docker could not enable SELinux on the host system")
-		}
-	} else {
-		selinuxSetDisabled()
-	}
-	return nil
-}
-
-func (daemon *Daemon) initNetworkController(config *Config, activeSandboxes map[string]interface{}) (libnetwork.NetworkController, error) {
-	netOptions, err := daemon.networkOptions(config, daemon.PluginStore, activeSandboxes)
-	if err != nil {
-		return nil, err
-	}
-
-	controller, err := libnetwork.New(netOptions...)
-	if err != nil {
-		return nil, fmt.Errorf("error obtaining controller instance: %v", err)
-	}
-
-	if len(activeSandboxes) > 0 {
-		logrus.Info("There are old running containers, the network config will not take affect")
-		return controller, nil
-	}
-
-	// Initialize default network on "null"
-	if n, _ := controller.NetworkByName("none"); n == nil {
-		if _, err := controller.NewNetwork("null", "none", "", libnetwork.NetworkOptionPersist(true)); err != nil {
-			return nil, fmt.Errorf("Error creating default \"null\" network: %v", err)
-		}
-	}
-
-	// Initialize default network on "host"
-	if n, _ := controller.NetworkByName("host"); n == nil {
-		if _, err := controller.NewNetwork("host", "host", "", libnetwork.NetworkOptionPersist(true)); err != nil {
-			return nil, fmt.Errorf("Error creating default \"host\" network: %v", err)
-		}
-	}
-
-	// Clear stale bridge network
-	if n, err := controller.NetworkByName("bridge"); err == nil {
-		if err = n.Delete(); err != nil {
-			return nil, fmt.Errorf("could not delete the default bridge network: %v", err)
-		}
-	}
-
-	if !config.DisableBridge {
-		// Initialize default driver "bridge"
-		if err := initBridgeDriver(controller, config); err != nil {
-			return nil, err
-		}
-	} else {
-		removeDefaultBridgeInterface()
-	}
-
-	return controller, nil
-}
-
-func driverOptions(config *Config) []nwconfig.Option {
-	bridgeConfig := options.Generic{
-		"EnableIPForwarding":  config.bridgeConfig.EnableIPForward,
-		"EnableIPTables":      config.bridgeConfig.EnableIPTables,
-		"EnableUserlandProxy": config.bridgeConfig.EnableUserlandProxy,
-		"UserlandProxyPath":   config.bridgeConfig.UserlandProxyPath}
-	bridgeOption := options.Generic{netlabel.GenericData: bridgeConfig}
-
-	dOptions := []nwconfig.Option{}
-	dOptions = append(dOptions, nwconfig.OptionDriverConfig("bridge", bridgeOption))
-	return dOptions
-}
-
-func initBridgeDriver(controller libnetwork.NetworkController, config *Config) error {
-	bridgeName := bridge.DefaultBridgeName
-	if config.bridgeConfig.Iface != "" {
-		bridgeName = config.bridgeConfig.Iface
-	}
-	netOption := map[string]string{
-		bridge.BridgeName:         bridgeName,
-		bridge.DefaultBridge:      strconv.FormatBool(true),
-		netlabel.DriverMTU:        strconv.Itoa(config.Mtu),
-		bridge.EnableIPMasquerade: strconv.FormatBool(config.bridgeConfig.EnableIPMasq),
-		bridge.EnableICC:          strconv.FormatBool(config.bridgeConfig.InterContainerCommunication),
-	}
-
-	// --ip processing
-	if config.bridgeConfig.DefaultIP != nil {
-		netOption[bridge.DefaultBindingIP] = config.bridgeConfig.DefaultIP.String()
-	}
-
-	var (
-		ipamV4Conf *libnetwork.IpamConf
-		ipamV6Conf *libnetwork.IpamConf
-	)
-
-	ipamV4Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
-
-	nwList, nw6List, err := netutils.ElectInterfaceAddresses(bridgeName)
-	if err != nil {
-		return errors.Wrap(err, "list bridge addresses failed")
-	}
-
-	nw := nwList[0]
-	if len(nwList) > 1 && config.bridgeConfig.FixedCIDR != "" {
-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)
-		if err != nil {
-			return errors.Wrap(err, "parse CIDR failed")
-		}
-		// Iterate through in case there are multiple addresses for the bridge
-		for _, entry := range nwList {
-			if fCIDR.Contains(entry.IP) {
-				nw = entry
-				break
-			}
-		}
-	}
-
-	ipamV4Conf.PreferredPool = lntypes.GetIPNetCanonical(nw).String()
-	hip, _ := lntypes.GetHostPartIP(nw.IP, nw.Mask)
-	if hip.IsGlobalUnicast() {
-		ipamV4Conf.Gateway = nw.IP.String()
-	}
-
-	if config.bridgeConfig.IP != "" {
-		ipamV4Conf.PreferredPool = config.bridgeConfig.IP
-		ip, _, err := net.ParseCIDR(config.bridgeConfig.IP)
-		if err != nil {
-			return err
-		}
-		ipamV4Conf.Gateway = ip.String()
-	} else if bridgeName == bridge.DefaultBridgeName && ipamV4Conf.PreferredPool != "" {
-		logrus.Infof("Default bridge (%s) is assigned with an IP address %s. Daemon option --bip can be used to set a preferred IP address", bridgeName, ipamV4Conf.PreferredPool)
-	}
-
-	if config.bridgeConfig.FixedCIDR != "" {
-		_, fCIDR, err := net.ParseCIDR(config.bridgeConfig.FixedCIDR)
-		if err != nil {
-			return err
-		}
-
-		ipamV4Conf.SubPool = fCIDR.String()
-	}
-
-	if config.bridgeConfig.DefaultGatewayIPv4 != nil {
-		ipamV4Conf.AuxAddresses["DefaultGatewayIPv4"] = config.bridgeConfig.DefaultGatewayIPv4.String()
-	}
-
-	var deferIPv6Alloc bool
-	if config.bridgeConfig.FixedCIDRv6 != "" {
-		_, fCIDRv6, err := net.ParseCIDR(config.bridgeConfig.FixedCIDRv6)
-		if err != nil {
-			return err
-		}
-
-		// In case user has specified the daemon flag --fixed-cidr-v6 and the passed network has
-		// at least 48 host bits, we need to guarantee the current behavior where the containers'
-		// IPv6 addresses will be constructed based on the containers' interface MAC address.
-		// We do so by telling libnetwork to defer the IPv6 address allocation for the endpoints
-		// on this network until after the driver has created the endpoint and returned the
-		// constructed address. Libnetwork will then reserve this address with the ipam driver.
-		ones, _ := fCIDRv6.Mask.Size()
-		deferIPv6Alloc = ones <= 80
-
-		if ipamV6Conf == nil {
-			ipamV6Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
-		}
-		ipamV6Conf.PreferredPool = fCIDRv6.String()
-
-		// In case the --fixed-cidr-v6 is specified and the current docker0 bridge IPv6
-		// address belongs to the same network, we need to inform libnetwork about it, so
-		// that it can be reserved with IPAM and it will not be given away to somebody else
-		for _, nw6 := range nw6List {
-			if fCIDRv6.Contains(nw6.IP) {
-				ipamV6Conf.Gateway = nw6.IP.String()
-				break
-			}
-		}
-	}
-
-	if config.bridgeConfig.DefaultGatewayIPv6 != nil {
-		if ipamV6Conf == nil {
-			ipamV6Conf = &libnetwork.IpamConf{AuxAddresses: make(map[string]string)}
-		}
-		ipamV6Conf.AuxAddresses["DefaultGatewayIPv6"] = config.bridgeConfig.DefaultGatewayIPv6.String()
-	}
-
-	v4Conf := []*libnetwork.IpamConf{ipamV4Conf}
-	v6Conf := []*libnetwork.IpamConf{}
-	if ipamV6Conf != nil {
-		v6Conf = append(v6Conf, ipamV6Conf)
-	}
-	// Initialize default network on "bridge" with the same name
-	_, err = controller.NewNetwork("bridge", "bridge", "",
-		libnetwork.NetworkOptionEnableIPv6(config.bridgeConfig.EnableIPv6),
-		libnetwork.NetworkOptionDriverOpts(netOption),
-		libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
-		libnetwork.NetworkOptionDeferIPv6Alloc(deferIPv6Alloc))
-	if err != nil {
-		return fmt.Errorf("Error creating default \"bridge\" network: %v", err)
-	}
-	return nil
-}
-
-// Remove default bridge interface if present (--bridge=none use case)
-func removeDefaultBridgeInterface() {
-	if lnk, err := netlink.LinkByName(bridge.DefaultBridgeName); err == nil {
-		if err := netlink.LinkDel(lnk); err != nil {
-			logrus.Warnf("Failed to remove bridge interface (%s): %v", bridge.DefaultBridgeName, err)
-		}
-	}
-}
-
-func (daemon *Daemon) getLayerInit() func(string) error {
-	return daemon.setupInitLayer
-}
-
-// Parse the remapped root (user namespace) option, which can be one of:
-//   username            - valid username from /etc/passwd
-//   username:groupname  - valid username; valid groupname from /etc/group
-//   uid                 - 32-bit unsigned int valid Linux UID value
-//   uid:gid             - uid value; 32-bit unsigned int Linux GID value
-//
-//  If no groupname is specified, and a username is specified, an attempt
-//  will be made to lookup a gid for that username as a groupname
-//
-//  If names are used, they are verified to exist in passwd/group
-func parseRemappedRoot(usergrp string) (string, string, error) {
-
-	var (
-		userID, groupID     int
-		username, groupname string
-	)
-
-	idparts := strings.Split(usergrp, ":")
-	if len(idparts) > 2 {
-		return "", "", fmt.Errorf("Invalid user/group specification in --userns-remap: %q", usergrp)
-	}
-
-	if uid, err := strconv.ParseInt(idparts[0], 10, 32); err == nil {
-		// must be a uid; take it as valid
-		userID = int(uid)
-		luser, err := idtools.LookupUID(userID)
-		if err != nil {
-			return "", "", fmt.Errorf("Uid %d has no entry in /etc/passwd: %v", userID, err)
-		}
-		username = luser.Name
-		if len(idparts) == 1 {
-			// if the uid was numeric and no gid was specified, take the uid as the gid
-			groupID = userID
-			lgrp, err := idtools.LookupGID(groupID)
-			if err != nil {
-				return "", "", fmt.Errorf("Gid %d has no entry in /etc/group: %v", groupID, err)
-			}
-			groupname = lgrp.Name
-		}
-	} else {
-		lookupName := idparts[0]
-		// special case: if the user specified "default", they want Docker to create or
-		// use (after creation) the "dockremap" user/group for root remapping
-		if lookupName == defaultIDSpecifier {
-			lookupName = defaultRemappedID
-		}
-		luser, err := idtools.LookupUser(lookupName)
-		if err != nil && idparts[0] != defaultIDSpecifier {
-			// error if the name requested isn't the special "dockremap" ID
-			return "", "", fmt.Errorf("Error during uid lookup for %q: %v", lookupName, err)
-		} else if err != nil {
-			// special case-- if the username == "default", then we have been asked
-			// to create a new entry pair in /etc/{passwd,group} for which the /etc/sub{uid,gid}
-			// ranges will be used for the user and group mappings in user namespaced containers
-			_, _, err := idtools.AddNamespaceRangesUser(defaultRemappedID)
-			if err == nil {
-				return defaultRemappedID, defaultRemappedID, nil
-			}
-			return "", "", fmt.Errorf("Error during %q user creation: %v", defaultRemappedID, err)
-		}
-		username = luser.Name
-		if len(idparts) == 1 {
-			// we only have a string username, and no group specified; look up gid from username as group
-			group, err := idtools.LookupGroup(lookupName)
-			if err != nil {
-				return "", "", fmt.Errorf("Error during gid lookup for %q: %v", lookupName, err)
-			}
-			groupID = group.Gid
-			groupname = group.Name
-		}
-	}
-
-	if len(idparts) == 2 {
-		// groupname or gid is separately specified and must be resolved
-		// to an unsigned 32-bit gid
-		if gid, err := strconv.ParseInt(idparts[1], 10, 32); err == nil {
-			// must be a gid, take it as valid
-			groupID = int(gid)
-			lgrp, err := idtools.LookupGID(groupID)
-			if err != nil {
-				return "", "", fmt.Errorf("Gid %d has no entry in /etc/passwd: %v", groupID, err)
-			}
-			groupname = lgrp.Name
-		} else {
-			// not a number; attempt a lookup
-			if _, err := idtools.LookupGroup(idparts[1]); err != nil {
-				return "", "", fmt.Errorf("Error during groupname lookup for %q: %v", idparts[1], err)
-			}
-			groupname = idparts[1]
-		}
-	}
-	return username, groupname, nil
-}
-
-func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
-	if runtime.GOOS != "linux" && config.RemappedRoot != "" {
-		return nil, nil, fmt.Errorf("User namespaces are only supported on Linux")
-	}
-
-	// if the daemon was started with remapped root option, parse
-	// the config option to the int uid,gid values
-	var (
-		uidMaps, gidMaps []idtools.IDMap
-	)
-	if config.RemappedRoot != "" {
-		username, groupname, err := parseRemappedRoot(config.RemappedRoot)
-		if err != nil {
-			return nil, nil, err
-		}
-		if username == "root" {
-			// Cannot setup user namespaces with a 1-to-1 mapping; "--root=0:0" is a no-op
-			// effectively
-			logrus.Warn("User namespaces: root cannot be remapped with itself; user namespaces are OFF")
-			return uidMaps, gidMaps, nil
-		}
-		logrus.Infof("User namespaces: ID ranges will be mapped to subuid/subgid ranges of: %s:%s", username, groupname)
-		// update remapped root setting now that we have resolved them to actual names
-		config.RemappedRoot = fmt.Sprintf("%s:%s", username, groupname)
-
-		uidMaps, gidMaps, err = idtools.CreateIDMappings(username, groupname)
-		if err != nil {
-			return nil, nil, fmt.Errorf("Can't create ID mappings: %v", err)
-		}
-	}
-	return uidMaps, gidMaps, nil
-}
-
-func setupDaemonRoot(config *Config, rootDir string, rootUID, rootGID int) error {
-	config.Root = rootDir
-	// the docker root metadata directory needs to have execute permissions for all users (g+x,o+x)
-	// so that syscalls executing as non-root, operating on subdirectories of the graph root
-	// (e.g. mounted layers of a container) can traverse this path.
-	// The user namespace support will create subdirectories for the remapped root host uid:gid
-	// pair owned by that same uid:gid pair for proper write access to those needed metadata and
-	// layer content subtrees.
-	if _, err := os.Stat(rootDir); err == nil {
-		// root current exists; verify the access bits are correct by setting them
-		if err = os.Chmod(rootDir, 0711); err != nil {
-			return err
-		}
-	} else if os.IsNotExist(err) {
-		// no root exists yet, create it 0711 with root:root ownership
-		if err := os.MkdirAll(rootDir, 0711); err != nil {
-			return err
-		}
-	}
-
-	// if user namespaces are enabled we will create a subtree underneath the specified root
-	// with any/all specified remapped root uid/gid options on the daemon creating
-	// a new subdirectory with ownership set to the remapped uid/gid (so as to allow
-	// `chdir()` to work for containers namespaced to that uid/gid)
-	if config.RemappedRoot != "" {
-		config.Root = filepath.Join(rootDir, fmt.Sprintf("%d.%d", rootUID, rootGID))
-		logrus.Debugf("Creating user namespaced daemon root: %s", config.Root)
-		// Create the root directory if it doesn't exist
-		if err := idtools.MkdirAllAs(config.Root, 0700, rootUID, rootGID); err != nil {
-			return fmt.Errorf("Cannot create daemon root: %s: %v", config.Root, err)
-		}
-		// we also need to verify that any pre-existing directories in the path to
-		// the graphroot won't block access to remapped root--if any pre-existing directory
-		// has strict permissions that don't allow "x", container start will fail, so
-		// better to warn and fail now
-		dirPath := config.Root
-		for {
-			dirPath = filepath.Dir(dirPath)
-			if dirPath == "/" {
-				break
-			}
-			if !idtools.CanAccess(dirPath, rootUID, rootGID) {
-				return fmt.Errorf("A subdirectory in your graphroot path (%s) restricts access to the remapped root uid/gid; please fix by allowing 'o+x' permissions on existing directories.", config.Root)
-			}
-		}
-	}
-	return nil
-}
-
-// registerLinks writes the links to a file.
-func (daemon *Daemon) registerLinks(container *container.Container, hostConfig *containertypes.HostConfig) error {
-	if hostConfig == nil || hostConfig.NetworkMode.IsUserDefined() {
-		return nil
-	}
-
-	for _, l := range hostConfig.Links {
-		name, alias, err := runconfigopts.ParseLink(l)
-		if err != nil {
-			return err
-		}
-		child, err := daemon.GetContainer(name)
-		if err != nil {
-			return fmt.Errorf("Could not get container for %s", name)
-		}
-		for child.HostConfig.NetworkMode.IsContainer() {
-			parts := strings.SplitN(string(child.HostConfig.NetworkMode), ":", 2)
-			child, err = daemon.GetContainer(parts[1])
-			if err != nil {
-				return fmt.Errorf("Could not get container for %s", parts[1])
-			}
-		}
-		if child.HostConfig.NetworkMode.IsHost() {
-			return runconfig.ErrConflictHostNetworkAndLinks
-		}
-		if err := daemon.registerLink(container, child, alias); err != nil {
-			return err
-		}
-	}
-
-	// After we load all the links into the daemon
-	// set them to nil on the hostconfig
-	return container.WriteHostConfig()
-}
-
-// conditionalMountOnStart is a platform specific helper function during the
-// container start to call mount.
-func (daemon *Daemon) conditionalMountOnStart(container *container.Container) error {
-	return daemon.Mount(container)
-}
-
-// conditionalUnmountOnCleanup is a platform specific helper function called
-// during the cleanup of a container to unmount.
-func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container) error {
-	return daemon.Unmount(container)
-}
-
-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {
-	if !c.IsRunning() {
-		return nil, errNotRunning{c.ID}
-	}
-	stats, err := daemon.containerd.Stats(c.ID)
-	if err != nil {
-		return nil, err
-	}
-	s := &types.StatsJSON{}
-	cgs := stats.CgroupStats
-	if cgs != nil {
-		s.BlkioStats = types.BlkioStats{
-			IoServiceBytesRecursive: copyBlkioEntry(cgs.BlkioStats.IoServiceBytesRecursive),
-			IoServicedRecursive:     copyBlkioEntry(cgs.BlkioStats.IoServicedRecursive),
-			IoQueuedRecursive:       copyBlkioEntry(cgs.BlkioStats.IoQueuedRecursive),
-			IoServiceTimeRecursive:  copyBlkioEntry(cgs.BlkioStats.IoServiceTimeRecursive),
-			IoWaitTimeRecursive:     copyBlkioEntry(cgs.BlkioStats.IoWaitTimeRecursive),
-			IoMergedRecursive:       copyBlkioEntry(cgs.BlkioStats.IoMergedRecursive),
-			IoTimeRecursive:         copyBlkioEntry(cgs.BlkioStats.IoTimeRecursive),
-			SectorsRecursive:        copyBlkioEntry(cgs.BlkioStats.SectorsRecursive),
-		}
-		cpu := cgs.CpuStats
-		s.CPUStats = types.CPUStats{
-			CPUUsage: types.CPUUsage{
-				TotalUsage:        cpu.CpuUsage.TotalUsage,
-				PercpuUsage:       cpu.CpuUsage.PercpuUsage,
-				UsageInKernelmode: cpu.CpuUsage.UsageInKernelmode,
-				UsageInUsermode:   cpu.CpuUsage.UsageInUsermode,
-			},
-			ThrottlingData: types.ThrottlingData{
-				Periods:          cpu.ThrottlingData.Periods,
-				ThrottledPeriods: cpu.ThrottlingData.ThrottledPeriods,
-				ThrottledTime:    cpu.ThrottlingData.ThrottledTime,
-			},
-		}
-		mem := cgs.MemoryStats.Usage
-		s.MemoryStats = types.MemoryStats{
-			Usage:    mem.Usage,
-			MaxUsage: mem.MaxUsage,
-			Stats:    cgs.MemoryStats.Stats,
-			Failcnt:  mem.Failcnt,
-			Limit:    mem.Limit,
-		}
-		// if the container does not set memory limit, use the machineMemory
-		if mem.Limit > daemon.statsCollector.machineMemory && daemon.statsCollector.machineMemory > 0 {
-			s.MemoryStats.Limit = daemon.statsCollector.machineMemory
-		}
-		if cgs.PidsStats != nil {
-			s.PidsStats = types.PidsStats{
-				Current: cgs.PidsStats.Current,
-			}
-		}
-	}
-	s.Read, err = ptypes.Timestamp(stats.Timestamp)
-	if err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-// setDefaultIsolation determines the default isolation mode for the
-// daemon to run in. This is only applicable on Windows
-func (daemon *Daemon) setDefaultIsolation() error {
-	return nil
-}
-
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
-	var layers []string
-	for _, l := range rootfs.DiffIDs {
-		layers = append(layers, l.String())
-	}
-	return types.RootFS{
-		Type:   rootfs.Type,
-		Layers: layers,
-	}
-}
-
-// setupDaemonProcess sets various settings for the daemon's process
-func setupDaemonProcess(config *Config) error {
-	// setup the daemons oom_score_adj
-	return setupOOMScoreAdj(config.OOMScoreAdjust)
-}
-
-func setupOOMScoreAdj(score int) error {
-	f, err := os.OpenFile("/proc/self/oom_score_adj", os.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-
-	stringScore := strconv.Itoa(score)
-	_, err = f.WriteString(stringScore)
-	if os.IsPermission(err) {
-		// Setting oom_score_adj does not work in an
-		// unprivileged container. Ignore the error, but log
-		// it if we appear not to be in that situation.
-		if !rsystem.RunningInUserNS() {
-			logrus.Debugf("Permission denied writing %q to /proc/self/oom_score_adj", stringScore)
-		}
-		return nil
-	}
-	f.Close()
-	return err
-}
-
-func (daemon *Daemon) initCgroupsPath(path string) error {
-	if path == "/" || path == "." {
-		return nil
-	}
-
-	if daemon.configStore.CPURealtimePeriod == 0 && daemon.configStore.CPURealtimeRuntime == 0 {
-		return nil
-	}
-
-	// Recursively create cgroup to ensure that the system and all parent cgroups have values set
-	// for the period and runtime as this limits what the children can be set to.
-	daemon.initCgroupsPath(filepath.Dir(path))
-
-	_, root, err := cgroups.FindCgroupMountpointAndRoot("cpu")
-	if err != nil {
-		return err
-	}
-
-	path = filepath.Join(root, path)
-	sysinfo := sysinfo.New(true)
-	if sysinfo.CPURealtimePeriod && daemon.configStore.CPURealtimePeriod != 0 {
-		if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
-			return err
-		}
-		if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_period_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimePeriod, 10)), 0700); err != nil {
-			return err
-		}
-	}
-	if sysinfo.CPURealtimeRuntime && daemon.configStore.CPURealtimeRuntime != 0 {
-		if err := os.MkdirAll(path, 0755); err != nil && !os.IsExist(err) {
-			return err
-		}
-		if err := ioutil.WriteFile(filepath.Join(path, "cpu.rt_runtime_us"), []byte(strconv.FormatInt(daemon.configStore.CPURealtimeRuntime, 10)), 0700); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (daemon *Daemon) setupSeccompProfile() error {
-	if daemon.configStore.SeccompProfile != "" {
-		daemon.seccompProfilePath = daemon.configStore.SeccompProfile
-		b, err := ioutil.ReadFile(daemon.configStore.SeccompProfile)
-		if err != nil {
-			return fmt.Errorf("opening seccomp profile (%s) failed: %v", daemon.configStore.SeccompProfile, err)
-		}
-		daemon.seccompProfile = b
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_unix_test.go b/installer/vendor/github.com/docker/docker/daemon/daemon_unix_test.go
deleted file mode 100644
index 6250d359e3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_unix_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// +build !windows,!solaris
-
-package daemon
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
-	"github.com/docker/docker/volume/store"
-)
-
-// Unix test as uses settings which are not available on Windows
-func TestAdjustCPUShares(t *testing.T) {
-	tmp, err := ioutil.TempDir("", "docker-daemon-unix-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	daemon := &Daemon{
-		repository: tmp,
-		root:       tmp,
-	}
-
-	hostConfig := &containertypes.HostConfig{
-		Resources: containertypes.Resources{CPUShares: linuxMinCPUShares - 1},
-	}
-	daemon.adaptContainerSettings(hostConfig, true)
-	if hostConfig.CPUShares != linuxMinCPUShares {
-		t.Errorf("Expected CPUShares to be %d", linuxMinCPUShares)
-	}
-
-	hostConfig.CPUShares = linuxMaxCPUShares + 1
-	daemon.adaptContainerSettings(hostConfig, true)
-	if hostConfig.CPUShares != linuxMaxCPUShares {
-		t.Errorf("Expected CPUShares to be %d", linuxMaxCPUShares)
-	}
-
-	hostConfig.CPUShares = 0
-	daemon.adaptContainerSettings(hostConfig, true)
-	if hostConfig.CPUShares != 0 {
-		t.Error("Expected CPUShares to be unchanged")
-	}
-
-	hostConfig.CPUShares = 1024
-	daemon.adaptContainerSettings(hostConfig, true)
-	if hostConfig.CPUShares != 1024 {
-		t.Error("Expected CPUShares to be unchanged")
-	}
-}
-
-// Unix test as uses settings which are not available on Windows
-func TestAdjustCPUSharesNoAdjustment(t *testing.T) {
-	tmp, err := ioutil.TempDir("", "docker-daemon-unix-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	daemon := &Daemon{
-		repository: tmp,
-		root:       tmp,
-	}
-
-	hostConfig := &containertypes.HostConfig{
-		Resources: containertypes.Resources{CPUShares: linuxMinCPUShares - 1},
-	}
-	daemon.adaptContainerSettings(hostConfig, false)
-	if hostConfig.CPUShares != linuxMinCPUShares-1 {
-		t.Errorf("Expected CPUShares to be %d", linuxMinCPUShares-1)
-	}
-
-	hostConfig.CPUShares = linuxMaxCPUShares + 1
-	daemon.adaptContainerSettings(hostConfig, false)
-	if hostConfig.CPUShares != linuxMaxCPUShares+1 {
-		t.Errorf("Expected CPUShares to be %d", linuxMaxCPUShares+1)
-	}
-
-	hostConfig.CPUShares = 0
-	daemon.adaptContainerSettings(hostConfig, false)
-	if hostConfig.CPUShares != 0 {
-		t.Error("Expected CPUShares to be unchanged")
-	}
-
-	hostConfig.CPUShares = 1024
-	daemon.adaptContainerSettings(hostConfig, false)
-	if hostConfig.CPUShares != 1024 {
-		t.Error("Expected CPUShares to be unchanged")
-	}
-}
-
-// Unix test as uses settings which are not available on Windows
-func TestParseSecurityOptWithDeprecatedColon(t *testing.T) {
-	container := &container.Container{}
-	config := &containertypes.HostConfig{}
-
-	// test apparmor
-	config.SecurityOpt = []string{"apparmor=test_profile"}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-	if container.AppArmorProfile != "test_profile" {
-		t.Fatalf("Unexpected AppArmorProfile, expected: \"test_profile\", got %q", container.AppArmorProfile)
-	}
-
-	// test seccomp
-	sp := "/path/to/seccomp_test.json"
-	config.SecurityOpt = []string{"seccomp=" + sp}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-	if container.SeccompProfile != sp {
-		t.Fatalf("Unexpected AppArmorProfile, expected: %q, got %q", sp, container.SeccompProfile)
-	}
-
-	// test valid label
-	config.SecurityOpt = []string{"label=user:USER"}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-
-	// test invalid label
-	config.SecurityOpt = []string{"label"}
-	if err := parseSecurityOpt(container, config); err == nil {
-		t.Fatal("Expected parseSecurityOpt error, got nil")
-	}
-
-	// test invalid opt
-	config.SecurityOpt = []string{"test"}
-	if err := parseSecurityOpt(container, config); err == nil {
-		t.Fatal("Expected parseSecurityOpt error, got nil")
-	}
-}
-
-func TestParseSecurityOpt(t *testing.T) {
-	container := &container.Container{}
-	config := &containertypes.HostConfig{}
-
-	// test apparmor
-	config.SecurityOpt = []string{"apparmor=test_profile"}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-	if container.AppArmorProfile != "test_profile" {
-		t.Fatalf("Unexpected AppArmorProfile, expected: \"test_profile\", got %q", container.AppArmorProfile)
-	}
-
-	// test seccomp
-	sp := "/path/to/seccomp_test.json"
-	config.SecurityOpt = []string{"seccomp=" + sp}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-	if container.SeccompProfile != sp {
-		t.Fatalf("Unexpected SeccompProfile, expected: %q, got %q", sp, container.SeccompProfile)
-	}
-
-	// test valid label
-	config.SecurityOpt = []string{"label=user:USER"}
-	if err := parseSecurityOpt(container, config); err != nil {
-		t.Fatalf("Unexpected parseSecurityOpt error: %v", err)
-	}
-
-	// test invalid label
-	config.SecurityOpt = []string{"label"}
-	if err := parseSecurityOpt(container, config); err == nil {
-		t.Fatal("Expected parseSecurityOpt error, got nil")
-	}
-
-	// test invalid opt
-	config.SecurityOpt = []string{"test"}
-	if err := parseSecurityOpt(container, config); err == nil {
-		t.Fatal("Expected parseSecurityOpt error, got nil")
-	}
-}
-
-func TestNetworkOptions(t *testing.T) {
-	daemon := &Daemon{}
-	dconfigCorrect := &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore:     "consul://localhost:8500",
-			ClusterAdvertise: "192.168.0.1:8000",
-		},
-	}
-
-	if _, err := daemon.networkOptions(dconfigCorrect, nil, nil); err != nil {
-		t.Fatalf("Expect networkOptions success, got error: %v", err)
-	}
-
-	dconfigWrong := &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore: "consul://localhost:8500://test://bbb",
-		},
-	}
-
-	if _, err := daemon.networkOptions(dconfigWrong, nil, nil); err == nil {
-		t.Fatalf("Expected networkOptions error, got nil")
-	}
-}
-
-func TestMigratePre17Volumes(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "test-daemon-volumes")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	volumeRoot := filepath.Join(rootDir, "volumes")
-	err = os.MkdirAll(volumeRoot, 0755)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	containerRoot := filepath.Join(rootDir, "containers")
-	cid := "1234"
-	err = os.MkdirAll(filepath.Join(containerRoot, cid), 0755)
-
-	vid := "5678"
-	vfsPath := filepath.Join(rootDir, "vfs", "dir", vid)
-	err = os.MkdirAll(vfsPath, 0755)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	config := []byte(`
-		{
-			"ID": "` + cid + `",
-			"Volumes": {
-				"/foo": "` + vfsPath + `",
-				"/bar": "/foo",
-				"/quux": "/quux"
-			},
-			"VolumesRW": {
-				"/foo": true,
-				"/bar": true,
-				"/quux": false
-			}
-		}
-	`)
-
-	volStore, err := store.New(volumeRoot)
-	if err != nil {
-		t.Fatal(err)
-	}
-	drv, err := local.New(volumeRoot, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	volumedrivers.Register(drv, volume.DefaultDriverName)
-
-	daemon := &Daemon{root: rootDir, repository: containerRoot, volumes: volStore}
-	err = ioutil.WriteFile(filepath.Join(containerRoot, cid, "config.v2.json"), config, 600)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c, err := daemon.load(cid)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := daemon.verifyVolumesInfo(c); err != nil {
-		t.Fatal(err)
-	}
-
-	expected := map[string]volume.MountPoint{
-		"/foo":  {Destination: "/foo", RW: true, Name: vid},
-		"/bar":  {Source: "/foo", Destination: "/bar", RW: true},
-		"/quux": {Source: "/quux", Destination: "/quux", RW: false},
-	}
-	for id, mp := range c.MountPoints {
-		x, exists := expected[id]
-		if !exists {
-			t.Fatal("volume not migrated")
-		}
-		if mp.Source != x.Source || mp.Destination != x.Destination || mp.RW != x.RW || mp.Name != x.Name {
-			t.Fatalf("got unexpected mountpoint, expected: %+v, got: %+v", x, mp)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/daemon_unsupported.go
deleted file mode 100644
index cb1acf63d6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_unsupported.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !linux,!freebsd,!windows,!solaris
-
-package daemon
-
-const platformSupported = false
diff --git a/installer/vendor/github.com/docker/docker/daemon/daemon_windows.go b/installer/vendor/github.com/docker/docker/daemon/daemon_windows.go
deleted file mode 100644
index 51ad68b357..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/daemon_windows.go
+++ /dev/null
@@ -1,604 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/platform"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
-	nwconfig "github.com/docker/libnetwork/config"
-	"github.com/docker/libnetwork/datastore"
-	winlibnetwork "github.com/docker/libnetwork/drivers/windows"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/docker/libnetwork/options"
-	blkiodev "github.com/opencontainers/runc/libcontainer/configs"
-	"golang.org/x/sys/windows"
-)
-
-const (
-	defaultNetworkSpace  = "172.16.0.0/12"
-	platformSupported    = true
-	windowsMinCPUShares  = 1
-	windowsMaxCPUShares  = 10000
-	windowsMinCPUPercent = 1
-	windowsMaxCPUPercent = 100
-	windowsMinCPUCount   = 1
-)
-
-func getBlkioWeightDevices(config *containertypes.HostConfig) ([]blkiodev.WeightDevice, error) {
-	return nil, nil
-}
-
-func parseSecurityOpt(container *container.Container, config *containertypes.HostConfig) error {
-	return nil
-}
-
-func getBlkioReadIOpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioWriteIOpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioReadBpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func getBlkioWriteBpsDevices(config *containertypes.HostConfig) ([]blkiodev.ThrottleDevice, error) {
-	return nil, nil
-}
-
-func (daemon *Daemon) getLayerInit() func(string) error {
-	return nil
-}
-
-func checkKernel() error {
-	return nil
-}
-
-func (daemon *Daemon) getCgroupDriver() string {
-	return ""
-}
-
-// adaptContainerSettings is called during container creation to modify any
-// settings necessary in the HostConfig structure.
-func (daemon *Daemon) adaptContainerSettings(hostConfig *containertypes.HostConfig, adjustCPUShares bool) error {
-	if hostConfig == nil {
-		return nil
-	}
-
-	return nil
-}
-
-func verifyContainerResources(resources *containertypes.Resources, isHyperv bool) ([]string, error) {
-	warnings := []string{}
-
-	if !isHyperv {
-		// The processor resource controls are mutually exclusive on
-		// Windows Server Containers, the order of precedence is
-		// CPUCount first, then CPUShares, and CPUPercent last.
-		if resources.CPUCount > 0 {
-			if resources.CPUShares > 0 {
-				warnings = append(warnings, "Conflicting options: CPU count takes priority over CPU shares on Windows Server Containers. CPU shares discarded")
-				logrus.Warn("Conflicting options: CPU count takes priority over CPU shares on Windows Server Containers. CPU shares discarded")
-				resources.CPUShares = 0
-			}
-			if resources.CPUPercent > 0 {
-				warnings = append(warnings, "Conflicting options: CPU count takes priority over CPU percent on Windows Server Containers. CPU percent discarded")
-				logrus.Warn("Conflicting options: CPU count takes priority over CPU percent on Windows Server Containers. CPU percent discarded")
-				resources.CPUPercent = 0
-			}
-		} else if resources.CPUShares > 0 {
-			if resources.CPUPercent > 0 {
-				warnings = append(warnings, "Conflicting options: CPU shares takes priority over CPU percent on Windows Server Containers. CPU percent discarded")
-				logrus.Warn("Conflicting options: CPU shares takes priority over CPU percent on Windows Server Containers. CPU percent discarded")
-				resources.CPUPercent = 0
-			}
-		}
-	}
-
-	if resources.CPUShares < 0 || resources.CPUShares > windowsMaxCPUShares {
-		return warnings, fmt.Errorf("range of CPUShares is from %d to %d", windowsMinCPUShares, windowsMaxCPUShares)
-	}
-	if resources.CPUPercent < 0 || resources.CPUPercent > windowsMaxCPUPercent {
-		return warnings, fmt.Errorf("range of CPUPercent is from %d to %d", windowsMinCPUPercent, windowsMaxCPUPercent)
-	}
-	if resources.CPUCount < 0 {
-		return warnings, fmt.Errorf("invalid CPUCount: CPUCount cannot be negative")
-	}
-
-	if resources.NanoCPUs > 0 && resources.CPUPercent > 0 {
-		return warnings, fmt.Errorf("conflicting options: Nano CPUs and CPU Percent cannot both be set")
-	}
-	if resources.NanoCPUs > 0 && resources.CPUShares > 0 {
-		return warnings, fmt.Errorf("conflicting options: Nano CPUs and CPU Shares cannot both be set")
-	}
-	// The precision we could get is 0.01, because on Windows we have to convert to CPUPercent.
-	// We don't set the lower limit here and it is up to the underlying platform (e.g., Windows) to return an error.
-	if resources.NanoCPUs < 0 || resources.NanoCPUs > int64(sysinfo.NumCPU())*1e9 {
-		return warnings, fmt.Errorf("range of CPUs is from 0.01 to %d.00, as there are only %d CPUs available", sysinfo.NumCPU(), sysinfo.NumCPU())
-	}
-
-	if len(resources.BlkioDeviceReadBps) > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioDeviceReadBps")
-	}
-	if len(resources.BlkioDeviceReadIOps) > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioDeviceReadIOps")
-	}
-	if len(resources.BlkioDeviceWriteBps) > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioDeviceWriteBps")
-	}
-	if len(resources.BlkioDeviceWriteIOps) > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioDeviceWriteIOps")
-	}
-	if resources.BlkioWeight > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioWeight")
-	}
-	if len(resources.BlkioWeightDevice) > 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support BlkioWeightDevice")
-	}
-	if resources.CgroupParent != "" {
-		return warnings, fmt.Errorf("invalid option: Windows does not support CgroupParent")
-	}
-	if resources.CPUPeriod != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support CPUPeriod")
-	}
-	if resources.CpusetCpus != "" {
-		return warnings, fmt.Errorf("invalid option: Windows does not support CpusetCpus")
-	}
-	if resources.CpusetMems != "" {
-		return warnings, fmt.Errorf("invalid option: Windows does not support CpusetMems")
-	}
-	if resources.KernelMemory != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support KernelMemory")
-	}
-	if resources.MemoryReservation != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support MemoryReservation")
-	}
-	if resources.MemorySwap != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support MemorySwap")
-	}
-	if resources.MemorySwappiness != nil && *resources.MemorySwappiness != -1 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support MemorySwappiness")
-	}
-	if resources.OomKillDisable != nil && *resources.OomKillDisable {
-		return warnings, fmt.Errorf("invalid option: Windows does not support OomKillDisable")
-	}
-	if resources.PidsLimit != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support PidsLimit")
-	}
-	if len(resources.Ulimits) != 0 {
-		return warnings, fmt.Errorf("invalid option: Windows does not support Ulimits")
-	}
-	return warnings, nil
-}
-
-// verifyPlatformContainerSettings performs platform-specific validation of the
-// hostconfig and config structures.
-func verifyPlatformContainerSettings(daemon *Daemon, hostConfig *containertypes.HostConfig, config *containertypes.Config, update bool) ([]string, error) {
-	warnings := []string{}
-
-	hyperv := daemon.runAsHyperVContainer(hostConfig)
-	if !hyperv && system.IsWindowsClient() {
-		// @engine maintainers. This block should not be removed. It partially enforces licensing
-		// restrictions on Windows. Ping @jhowardmsft if there are concerns or PRs to change this.
-		return warnings, fmt.Errorf("Windows client operating systems only support Hyper-V containers")
-	}
-
-	w, err := verifyContainerResources(&hostConfig.Resources, hyperv)
-	warnings = append(warnings, w...)
-	if err != nil {
-		return warnings, err
-	}
-	return warnings, nil
-}
-
-// platformReload update configuration with platform specific options
-func (daemon *Daemon) platformReload(config *Config) map[string]string {
-	return map[string]string{}
-}
-
-// verifyDaemonSettings performs validation of daemon config struct
-func verifyDaemonSettings(config *Config) error {
-	return nil
-}
-
-// checkSystem validates platform-specific requirements
-func checkSystem() error {
-	// Validate the OS version. Note that docker.exe must be manifested for this
-	// call to return the correct version.
-	osv := system.GetOSVersion()
-	if osv.MajorVersion < 10 {
-		return fmt.Errorf("This version of Windows does not support the docker daemon")
-	}
-	if osv.Build < 14393 {
-		return fmt.Errorf("The docker daemon requires build 14393 or later of Windows Server 2016 or Windows 10")
-	}
-
-	vmcompute := windows.NewLazySystemDLL("vmcompute.dll")
-	if vmcompute.Load() != nil {
-		return fmt.Errorf("Failed to load vmcompute.dll. Ensure that the Containers role is installed.")
-	}
-	return nil
-}
-
-// configureKernelSecuritySupport configures and validate security support for the kernel
-func configureKernelSecuritySupport(config *Config, driverName string) error {
-	return nil
-}
-
-// configureMaxThreads sets the Go runtime max threads threshold
-func configureMaxThreads(config *Config) error {
-	return nil
-}
-
-func (daemon *Daemon) initNetworkController(config *Config, activeSandboxes map[string]interface{}) (libnetwork.NetworkController, error) {
-	netOptions, err := daemon.networkOptions(config, nil, nil)
-	if err != nil {
-		return nil, err
-	}
-	controller, err := libnetwork.New(netOptions...)
-	if err != nil {
-		return nil, fmt.Errorf("error obtaining controller instance: %v", err)
-	}
-
-	hnsresponse, err := hcsshim.HNSListNetworkRequest("GET", "", "")
-	if err != nil {
-		return nil, err
-	}
-
-	// Remove networks not present in HNS
-	for _, v := range controller.Networks() {
-		options := v.Info().DriverOptions()
-		hnsid := options[winlibnetwork.HNSID]
-		found := false
-
-		for _, v := range hnsresponse {
-			if v.Id == hnsid {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			// global networks should not be deleted by local HNS
-			if v.Info().Scope() != datastore.GlobalScope {
-				err = v.Delete()
-				if err != nil {
-					logrus.Errorf("Error occurred when removing network %v", err)
-				}
-			}
-		}
-	}
-
-	_, err = controller.NewNetwork("null", "none", "", libnetwork.NetworkOptionPersist(false))
-	if err != nil {
-		return nil, err
-	}
-
-	defaultNetworkExists := false
-
-	if network, err := controller.NetworkByName(runconfig.DefaultDaemonNetworkMode().NetworkName()); err == nil {
-		options := network.Info().DriverOptions()
-		for _, v := range hnsresponse {
-			if options[winlibnetwork.HNSID] == v.Id {
-				defaultNetworkExists = true
-				break
-			}
-		}
-	}
-
-	// discover and add HNS networks to windows
-	// network that exist are removed and added again
-	for _, v := range hnsresponse {
-		var n libnetwork.Network
-		s := func(current libnetwork.Network) bool {
-			options := current.Info().DriverOptions()
-			if options[winlibnetwork.HNSID] == v.Id {
-				n = current
-				return true
-			}
-			return false
-		}
-
-		controller.WalkNetworks(s)
-		if n != nil {
-			// global networks should not be deleted by local HNS
-			if n.Info().Scope() == datastore.GlobalScope {
-				continue
-			}
-			v.Name = n.Name()
-			// This will not cause network delete from HNS as the network
-			// is not yet populated in the libnetwork windows driver
-			n.Delete()
-		}
-
-		netOption := map[string]string{
-			winlibnetwork.NetworkName: v.Name,
-			winlibnetwork.HNSID:       v.Id,
-		}
-
-		v4Conf := []*libnetwork.IpamConf{}
-		for _, subnet := range v.Subnets {
-			ipamV4Conf := libnetwork.IpamConf{}
-			ipamV4Conf.PreferredPool = subnet.AddressPrefix
-			ipamV4Conf.Gateway = subnet.GatewayAddress
-			v4Conf = append(v4Conf, &ipamV4Conf)
-		}
-
-		name := v.Name
-
-		// If there is no nat network create one from the first NAT network
-		// encountered
-		if !defaultNetworkExists && runconfig.DefaultDaemonNetworkMode() == containertypes.NetworkMode(strings.ToLower(v.Type)) {
-			name = runconfig.DefaultDaemonNetworkMode().NetworkName()
-			defaultNetworkExists = true
-		}
-
-		v6Conf := []*libnetwork.IpamConf{}
-		_, err := controller.NewNetwork(strings.ToLower(v.Type), name, "",
-			libnetwork.NetworkOptionGeneric(options.Generic{
-				netlabel.GenericData: netOption,
-			}),
-			libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil),
-		)
-
-		if err != nil {
-			logrus.Errorf("Error occurred when creating network %v", err)
-		}
-	}
-
-	if !config.DisableBridge {
-		// Initialize default driver "bridge"
-		if err := initBridgeDriver(controller, config); err != nil {
-			return nil, err
-		}
-	}
-
-	return controller, nil
-}
-
-func initBridgeDriver(controller libnetwork.NetworkController, config *Config) error {
-	if _, err := controller.NetworkByName(runconfig.DefaultDaemonNetworkMode().NetworkName()); err == nil {
-		return nil
-	}
-
-	netOption := map[string]string{
-		winlibnetwork.NetworkName: runconfig.DefaultDaemonNetworkMode().NetworkName(),
-	}
-
-	var ipamOption libnetwork.NetworkOption
-	var subnetPrefix string
-
-	if config.bridgeConfig.FixedCIDR != "" {
-		subnetPrefix = config.bridgeConfig.FixedCIDR
-	} else {
-		// TP5 doesn't support properly detecting subnet
-		osv := system.GetOSVersion()
-		if osv.Build < 14360 {
-			subnetPrefix = defaultNetworkSpace
-		}
-	}
-
-	if subnetPrefix != "" {
-		ipamV4Conf := libnetwork.IpamConf{}
-		ipamV4Conf.PreferredPool = subnetPrefix
-		v4Conf := []*libnetwork.IpamConf{&ipamV4Conf}
-		v6Conf := []*libnetwork.IpamConf{}
-		ipamOption = libnetwork.NetworkOptionIpam("default", "", v4Conf, v6Conf, nil)
-	}
-
-	_, err := controller.NewNetwork(string(runconfig.DefaultDaemonNetworkMode()), runconfig.DefaultDaemonNetworkMode().NetworkName(), "",
-		libnetwork.NetworkOptionGeneric(options.Generic{
-			netlabel.GenericData: netOption,
-		}),
-		ipamOption,
-	)
-
-	if err != nil {
-		return fmt.Errorf("Error creating default network: %v", err)
-	}
-
-	return nil
-}
-
-// registerLinks sets up links between containers and writes the
-// configuration out for persistence. As of Windows TP4, links are not supported.
-func (daemon *Daemon) registerLinks(container *container.Container, hostConfig *containertypes.HostConfig) error {
-	return nil
-}
-
-func (daemon *Daemon) cleanupMountsByID(in string) error {
-	return nil
-}
-
-func (daemon *Daemon) cleanupMounts() error {
-	return nil
-}
-
-func setupRemappedRoot(config *Config) ([]idtools.IDMap, []idtools.IDMap, error) {
-	return nil, nil, nil
-}
-
-func setupDaemonRoot(config *Config, rootDir string, rootUID, rootGID int) error {
-	config.Root = rootDir
-	// Create the root directory if it doesn't exists
-	if err := system.MkdirAllWithACL(config.Root, 0); err != nil && !os.IsExist(err) {
-		return err
-	}
-	return nil
-}
-
-// runasHyperVContainer returns true if we are going to run as a Hyper-V container
-func (daemon *Daemon) runAsHyperVContainer(hostConfig *containertypes.HostConfig) bool {
-	if hostConfig.Isolation.IsDefault() {
-		// Container is set to use the default, so take the default from the daemon configuration
-		return daemon.defaultIsolation.IsHyperV()
-	}
-
-	// Container is requesting an isolation mode. Honour it.
-	return hostConfig.Isolation.IsHyperV()
-
-}
-
-// conditionalMountOnStart is a platform specific helper function during the
-// container start to call mount.
-func (daemon *Daemon) conditionalMountOnStart(container *container.Container) error {
-	// We do not mount if a Hyper-V container
-	if !daemon.runAsHyperVContainer(container.HostConfig) {
-		return daemon.Mount(container)
-	}
-	return nil
-}
-
-// conditionalUnmountOnCleanup is a platform specific helper function called
-// during the cleanup of a container to unmount.
-func (daemon *Daemon) conditionalUnmountOnCleanup(container *container.Container) error {
-	// We do not unmount if a Hyper-V container
-	if !daemon.runAsHyperVContainer(container.HostConfig) {
-		return daemon.Unmount(container)
-	}
-	return nil
-}
-
-func driverOptions(config *Config) []nwconfig.Option {
-	return []nwconfig.Option{}
-}
-
-func (daemon *Daemon) stats(c *container.Container) (*types.StatsJSON, error) {
-	if !c.IsRunning() {
-		return nil, errNotRunning{c.ID}
-	}
-
-	// Obtain the stats from HCS via libcontainerd
-	stats, err := daemon.containerd.Stats(c.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Start with an empty structure
-	s := &types.StatsJSON{}
-
-	// Populate the CPU/processor statistics
-	s.CPUStats = types.CPUStats{
-		CPUUsage: types.CPUUsage{
-			TotalUsage:        stats.Processor.TotalRuntime100ns,
-			UsageInKernelmode: stats.Processor.RuntimeKernel100ns,
-			UsageInUsermode:   stats.Processor.RuntimeKernel100ns,
-		},
-	}
-
-	// Populate the memory statistics
-	s.MemoryStats = types.MemoryStats{
-		Commit:            stats.Memory.UsageCommitBytes,
-		CommitPeak:        stats.Memory.UsageCommitPeakBytes,
-		PrivateWorkingSet: stats.Memory.UsagePrivateWorkingSetBytes,
-	}
-
-	// Populate the storage statistics
-	s.StorageStats = types.StorageStats{
-		ReadCountNormalized:  stats.Storage.ReadCountNormalized,
-		ReadSizeBytes:        stats.Storage.ReadSizeBytes,
-		WriteCountNormalized: stats.Storage.WriteCountNormalized,
-		WriteSizeBytes:       stats.Storage.WriteSizeBytes,
-	}
-
-	// Populate the network statistics
-	s.Networks = make(map[string]types.NetworkStats)
-
-	for _, nstats := range stats.Network {
-		s.Networks[nstats.EndpointId] = types.NetworkStats{
-			RxBytes:   nstats.BytesReceived,
-			RxPackets: nstats.PacketsReceived,
-			RxDropped: nstats.DroppedPacketsIncoming,
-			TxBytes:   nstats.BytesSent,
-			TxPackets: nstats.PacketsSent,
-			TxDropped: nstats.DroppedPacketsOutgoing,
-		}
-	}
-
-	// Set the timestamp
-	s.Stats.Read = stats.Timestamp
-	s.Stats.NumProcs = platform.NumProcs()
-
-	return s, nil
-}
-
-// setDefaultIsolation determine the default isolation mode for the
-// daemon to run in. This is only applicable on Windows
-func (daemon *Daemon) setDefaultIsolation() error {
-	daemon.defaultIsolation = containertypes.Isolation("process")
-	// On client SKUs, default to Hyper-V
-	if system.IsWindowsClient() {
-		daemon.defaultIsolation = containertypes.Isolation("hyperv")
-	}
-	for _, option := range daemon.configStore.ExecOptions {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil {
-			return err
-		}
-		key = strings.ToLower(key)
-		switch key {
-
-		case "isolation":
-			if !containertypes.Isolation(val).IsValid() {
-				return fmt.Errorf("Invalid exec-opt value for 'isolation':'%s'", val)
-			}
-			if containertypes.Isolation(val).IsHyperV() {
-				daemon.defaultIsolation = containertypes.Isolation("hyperv")
-			}
-			if containertypes.Isolation(val).IsProcess() {
-				if system.IsWindowsClient() {
-					// @engine maintainers. This block should not be removed. It partially enforces licensing
-					// restrictions on Windows. Ping @jhowardmsft if there are concerns or PRs to change this.
-					return fmt.Errorf("Windows client operating systems only support Hyper-V containers")
-				}
-				daemon.defaultIsolation = containertypes.Isolation("process")
-			}
-		default:
-			return fmt.Errorf("Unrecognised exec-opt '%s'\n", key)
-		}
-	}
-
-	logrus.Infof("Windows default isolation mode: %s", daemon.defaultIsolation)
-	return nil
-}
-
-func rootFSToAPIType(rootfs *image.RootFS) types.RootFS {
-	var layers []string
-	for _, l := range rootfs.DiffIDs {
-		layers = append(layers, l.String())
-	}
-	return types.RootFS{
-		Type:   rootfs.Type,
-		Layers: layers,
-	}
-}
-
-func setupDaemonProcess(config *Config) error {
-	return nil
-}
-
-// verifyVolumesInfo is a no-op on windows.
-// This is called during daemon initialization to migrate volumes from pre-1.7.
-// volumes were not supported on windows pre-1.7
-func (daemon *Daemon) verifyVolumesInfo(container *container.Container) error {
-	return nil
-}
-
-func (daemon *Daemon) setupSeccompProfile() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/debugtrap.go b/installer/vendor/github.com/docker/docker/daemon/debugtrap.go
deleted file mode 100644
index 209048b589..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/debugtrap.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/pkg/errors"
-)
-
-const dataStructuresLogNameTemplate = "daemon-data-%s.log"
-
-// dumpDaemon appends the daemon datastructures into file in dir and returns full path
-// to that file.
-func (d *Daemon) dumpDaemon(dir string) (string, error) {
-	// Ensure we recover from a panic as we are doing this without any locking
-	defer func() {
-		recover()
-	}()
-
-	path := filepath.Join(dir, fmt.Sprintf(dataStructuresLogNameTemplate, strings.Replace(time.Now().Format(time.RFC3339), ":", "", -1)))
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0666)
-	if err != nil {
-		return "", errors.Wrap(err, "failed to open file to write the daemon datastructure dump")
-	}
-	defer f.Close()
-
-	dump := struct {
-		containers      interface{}
-		names           interface{}
-		links           interface{}
-		execs           interface{}
-		volumes         interface{}
-		images          interface{}
-		layers          interface{}
-		imageReferences interface{}
-		downloads       interface{}
-		uploads         interface{}
-		registry        interface{}
-		plugins         interface{}
-	}{
-		containers:      d.containers,
-		execs:           d.execCommands,
-		volumes:         d.volumes,
-		images:          d.imageStore,
-		layers:          d.layerStore,
-		imageReferences: d.referenceStore,
-		downloads:       d.downloadManager,
-		uploads:         d.uploadManager,
-		registry:        d.RegistryService,
-		plugins:         d.PluginStore,
-		names:           d.nameIndex,
-		links:           d.linkIndex,
-	}
-
-	spew.Fdump(f, dump) // Does not return an error
-	f.Sync()
-	return path, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/debugtrap_unix.go b/installer/vendor/github.com/docker/docker/daemon/debugtrap_unix.go
deleted file mode 100644
index d650eb7f8c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/debugtrap_unix.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	stackdump "github.com/docker/docker/pkg/signal"
-)
-
-func (d *Daemon) setupDumpStackTrap(root string) {
-	c := make(chan os.Signal, 1)
-	signal.Notify(c, syscall.SIGUSR1)
-	go func() {
-		for range c {
-			path, err := stackdump.DumpStacks(root)
-			if err != nil {
-				logrus.WithError(err).Error("failed to write goroutines dump")
-			} else {
-				logrus.Infof("goroutine stacks written to %s", path)
-			}
-			path, err = d.dumpDaemon(root)
-			if err != nil {
-				logrus.WithError(err).Error("failed to write daemon datastructure dump")
-			} else {
-				logrus.Infof("daemon datastructure dump written to %s", path)
-			}
-		}
-	}()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/debugtrap_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/debugtrap_unsupported.go
deleted file mode 100644
index f5b9170907..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/debugtrap_unsupported.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !linux,!darwin,!freebsd,!windows,!solaris
-
-package daemon
-
-func (d *Daemon) setupDumpStackTrap(_ string) {
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/debugtrap_windows.go b/installer/vendor/github.com/docker/docker/daemon/debugtrap_windows.go
deleted file mode 100644
index fb20c9d2c5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/debugtrap_windows.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"syscall"
-	"unsafe"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/system"
-)
-
-func (d *Daemon) setupDumpStackTrap(root string) {
-	// Windows does not support signals like *nix systems. So instead of
-	// trapping on SIGUSR1 to dump stacks, we wait on a Win32 event to be
-	// signaled. ACL'd to builtin administrators and local system
-	ev := "Global\\docker-daemon-" + fmt.Sprint(os.Getpid())
-	sd, err := winio.SddlToSecurityDescriptor("D:P(A;;GA;;;BA)(A;;GA;;;SY)")
-	if err != nil {
-		logrus.Errorf("failed to get security descriptor for debug stackdump event %s: %s", ev, err.Error())
-		return
-	}
-	var sa syscall.SecurityAttributes
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0]))
-	h, err := system.CreateEvent(&sa, false, false, ev)
-	if h == 0 || err != nil {
-		logrus.Errorf("failed to create debug stackdump event %s: %s", ev, err.Error())
-		return
-	}
-	go func() {
-		logrus.Debugf("Stackdump - waiting signal at %s", ev)
-		for {
-			syscall.WaitForSingleObject(h, syscall.INFINITE)
-			path, err := signal.DumpStacks(root)
-			if err != nil {
-				logrus.WithError(err).Error("failed to write goroutines dump")
-			} else {
-				logrus.Infof("goroutine stacks written to %s", path)
-			}
-			path, err = d.dumpDaemon(root)
-			if err != nil {
-				logrus.WithError(err).Error("failed to write daemon datastructure dump")
-			} else {
-				logrus.Infof("daemon datastructure dump written to %s", path)
-			}
-		}
-	}()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/delete.go b/installer/vendor/github.com/docker/docker/daemon/delete.go
deleted file mode 100644
index 6b622bde37..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/delete.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/layer"
-	volumestore "github.com/docker/docker/volume/store"
-)
-
-// ContainerRm removes the container id from the filesystem. An error
-// is returned if the container is not found, or if the remove
-// fails. If the remove succeeds, the container name is released, and
-// network links are removed.
-func (daemon *Daemon) ContainerRm(name string, config *types.ContainerRmConfig) error {
-	start := time.Now()
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	// Container state RemovalInProgress should be used to avoid races.
-	if inProgress := container.SetRemovalInProgress(); inProgress {
-		err := fmt.Errorf("removal of container %s is already in progress", name)
-		return errors.NewBadRequestError(err)
-	}
-	defer container.ResetRemovalInProgress()
-
-	// check if container wasn't deregistered by previous rm since Get
-	if c := daemon.containers.Get(container.ID); c == nil {
-		return nil
-	}
-
-	if config.RemoveLink {
-		return daemon.rmLink(container, name)
-	}
-
-	err = daemon.cleanupContainer(container, config.ForceRemove, config.RemoveVolume)
-	containerActions.WithValues("delete").UpdateSince(start)
-
-	return err
-}
-
-func (daemon *Daemon) rmLink(container *container.Container, name string) error {
-	if name[0] != '/' {
-		name = "/" + name
-	}
-	parent, n := path.Split(name)
-	if parent == "/" {
-		return fmt.Errorf("Conflict, cannot remove the default name of the container")
-	}
-
-	parent = strings.TrimSuffix(parent, "/")
-	pe, err := daemon.nameIndex.Get(parent)
-	if err != nil {
-		return fmt.Errorf("Cannot get parent %s for name %s", parent, name)
-	}
-
-	daemon.releaseName(name)
-	parentContainer, _ := daemon.GetContainer(pe)
-	if parentContainer != nil {
-		daemon.linkIndex.unlink(name, container, parentContainer)
-		if err := daemon.updateNetwork(parentContainer); err != nil {
-			logrus.Debugf("Could not update network to remove link %s: %v", n, err)
-		}
-	}
-	return nil
-}
-
-// cleanupContainer unregisters a container from the daemon, stops stats
-// collection and cleanly removes contents and metadata from the filesystem.
-func (daemon *Daemon) cleanupContainer(container *container.Container, forceRemove, removeVolume bool) (err error) {
-	if container.IsRunning() {
-		if !forceRemove {
-			err := fmt.Errorf("You cannot remove a running container %s. Stop the container before attempting removal or use -f", container.ID)
-			return errors.NewRequestConflictError(err)
-		}
-		if err := daemon.Kill(container); err != nil {
-			return fmt.Errorf("Could not kill running container %s, cannot remove - %v", container.ID, err)
-		}
-	}
-
-	// stop collection of stats for the container regardless
-	// if stats are currently getting collected.
-	daemon.statsCollector.stopCollection(container)
-
-	if err = daemon.containerStop(container, 3); err != nil {
-		return err
-	}
-
-	// Mark container dead. We don't want anybody to be restarting it.
-	container.SetDead()
-
-	// Save container state to disk. So that if error happens before
-	// container meta file got removed from disk, then a restart of
-	// docker should not make a dead container alive.
-	if err := container.ToDiskLocking(); err != nil && !os.IsNotExist(err) {
-		logrus.Errorf("Error saving dying container to disk: %v", err)
-	}
-
-	// If force removal is required, delete container from various
-	// indexes even if removal failed.
-	defer func() {
-		if err == nil || forceRemove {
-			daemon.nameIndex.Delete(container.ID)
-			daemon.linkIndex.delete(container)
-			selinuxFreeLxcContexts(container.ProcessLabel)
-			daemon.idIndex.Delete(container.ID)
-			daemon.containers.Delete(container.ID)
-			if e := daemon.removeMountPoints(container, removeVolume); e != nil {
-				logrus.Error(e)
-			}
-			daemon.LogContainerEvent(container, "destroy")
-		}
-	}()
-
-	if err = os.RemoveAll(container.Root); err != nil {
-		return fmt.Errorf("Unable to remove filesystem for %v: %v", container.ID, err)
-	}
-
-	// When container creation fails and `RWLayer` has not been created yet, we
-	// do not call `ReleaseRWLayer`
-	if container.RWLayer != nil {
-		metadata, err := daemon.layerStore.ReleaseRWLayer(container.RWLayer)
-		layer.LogReleaseMetadata(metadata)
-		if err != nil && err != layer.ErrMountDoesNotExist {
-			return fmt.Errorf("Driver %s failed to remove root filesystem %s: %s", daemon.GraphDriverName(), container.ID, err)
-		}
-	}
-
-	return nil
-}
-
-// VolumeRm removes the volume with the given name.
-// If the volume is referenced by a container it is not removed
-// This is called directly from the Engine API
-func (daemon *Daemon) VolumeRm(name string, force bool) error {
-	err := daemon.volumeRm(name)
-	if err == nil || force {
-		daemon.volumes.Purge(name)
-		return nil
-	}
-	return err
-}
-
-func (daemon *Daemon) volumeRm(name string) error {
-	v, err := daemon.volumes.Get(name)
-	if err != nil {
-		return err
-	}
-
-	if err := daemon.volumes.Remove(v); err != nil {
-		if volumestore.IsInUse(err) {
-			err := fmt.Errorf("Unable to remove volume, volume still in use: %v", err)
-			return errors.NewRequestConflictError(err)
-		}
-		return fmt.Errorf("Error while removing volume %s: %v", name, err)
-	}
-	daemon.LogVolumeEvent(v.Name(), "destroy", map[string]string{"driver": v.DriverName()})
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/delete_test.go b/installer/vendor/github.com/docker/docker/daemon/delete_test.go
deleted file mode 100644
index 1fd27e1ffa..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/delete_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-)
-
-func TestContainerDoubleDelete(t *testing.T) {
-	tmp, err := ioutil.TempDir("", "docker-daemon-unix-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	daemon := &Daemon{
-		repository: tmp,
-		root:       tmp,
-	}
-	daemon.containers = container.NewMemoryStore()
-
-	container := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:     "test",
-			State:  container.NewState(),
-			Config: &containertypes.Config{},
-		},
-	}
-	daemon.containers.Add(container.ID, container)
-
-	// Mark the container as having a delete in progress
-	container.SetRemovalInProgress()
-
-	// Try to remove the container when its state is removalInProgress.
-	// It should return an error indicating it is under removal progress.
-	if err := daemon.ContainerRm(container.ID, &types.ContainerRmConfig{ForceRemove: true}); err == nil {
-		t.Fatalf("expected err: %v, got nil", fmt.Sprintf("removal of container %s is already in progress", container.ID))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/discovery.go b/installer/vendor/github.com/docker/docker/daemon/discovery.go
deleted file mode 100644
index ee4ea875b7..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/discovery.go
+++ /dev/null
@@ -1,215 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/discovery"
-
-	// Register the libkv backends for discovery.
-	_ "github.com/docker/docker/pkg/discovery/kv"
-)
-
-const (
-	// defaultDiscoveryHeartbeat is the default value for discovery heartbeat interval.
-	defaultDiscoveryHeartbeat = 20 * time.Second
-	// defaultDiscoveryTTLFactor is the default TTL factor for discovery
-	defaultDiscoveryTTLFactor = 3
-)
-
-var errDiscoveryDisabled = errors.New("discovery is disabled")
-
-type discoveryReloader interface {
-	discovery.Watcher
-	Stop()
-	Reload(backend, address string, clusterOpts map[string]string) error
-	ReadyCh() <-chan struct{}
-}
-
-type daemonDiscoveryReloader struct {
-	backend discovery.Backend
-	ticker  *time.Ticker
-	term    chan bool
-	readyCh chan struct{}
-}
-
-func (d *daemonDiscoveryReloader) Watch(stopCh <-chan struct{}) (<-chan discovery.Entries, <-chan error) {
-	return d.backend.Watch(stopCh)
-}
-
-func (d *daemonDiscoveryReloader) ReadyCh() <-chan struct{} {
-	return d.readyCh
-}
-
-func discoveryOpts(clusterOpts map[string]string) (time.Duration, time.Duration, error) {
-	var (
-		heartbeat = defaultDiscoveryHeartbeat
-		ttl       = defaultDiscoveryTTLFactor * defaultDiscoveryHeartbeat
-	)
-
-	if hb, ok := clusterOpts["discovery.heartbeat"]; ok {
-		h, err := strconv.Atoi(hb)
-		if err != nil {
-			return time.Duration(0), time.Duration(0), err
-		}
-
-		if h <= 0 {
-			return time.Duration(0), time.Duration(0),
-				fmt.Errorf("discovery.heartbeat must be positive")
-		}
-
-		heartbeat = time.Duration(h) * time.Second
-		ttl = defaultDiscoveryTTLFactor * heartbeat
-	}
-
-	if tstr, ok := clusterOpts["discovery.ttl"]; ok {
-		t, err := strconv.Atoi(tstr)
-		if err != nil {
-			return time.Duration(0), time.Duration(0), err
-		}
-
-		if t <= 0 {
-			return time.Duration(0), time.Duration(0),
-				fmt.Errorf("discovery.ttl must be positive")
-		}
-
-		ttl = time.Duration(t) * time.Second
-
-		if _, ok := clusterOpts["discovery.heartbeat"]; !ok {
-			h := int(t / defaultDiscoveryTTLFactor)
-			heartbeat = time.Duration(h) * time.Second
-		}
-
-		if ttl <= heartbeat {
-			return time.Duration(0), time.Duration(0),
-				fmt.Errorf("discovery.ttl timer must be greater than discovery.heartbeat")
-		}
-	}
-
-	return heartbeat, ttl, nil
-}
-
-// initDiscovery initializes the nodes discovery subsystem by connecting to the specified backend
-// and starts a registration loop to advertise the current node under the specified address.
-func initDiscovery(backendAddress, advertiseAddress string, clusterOpts map[string]string) (discoveryReloader, error) {
-	heartbeat, backend, err := parseDiscoveryOptions(backendAddress, clusterOpts)
-	if err != nil {
-		return nil, err
-	}
-
-	reloader := &daemonDiscoveryReloader{
-		backend: backend,
-		ticker:  time.NewTicker(heartbeat),
-		term:    make(chan bool),
-		readyCh: make(chan struct{}),
-	}
-	// We call Register() on the discovery backend in a loop for the whole lifetime of the daemon,
-	// but we never actually Watch() for nodes appearing and disappearing for the moment.
-	go reloader.advertiseHeartbeat(advertiseAddress)
-	return reloader, nil
-}
-
-// advertiseHeartbeat registers the current node against the discovery backend using the specified
-// address. The function never returns, as registration against the backend comes with a TTL and
-// requires regular heartbeats.
-func (d *daemonDiscoveryReloader) advertiseHeartbeat(address string) {
-	var ready bool
-	if err := d.initHeartbeat(address); err == nil {
-		ready = true
-		close(d.readyCh)
-	}
-
-	for {
-		select {
-		case <-d.ticker.C:
-			if err := d.backend.Register(address); err != nil {
-				logrus.Warnf("Registering as %q in discovery failed: %v", address, err)
-			} else {
-				if !ready {
-					close(d.readyCh)
-					ready = true
-				}
-			}
-		case <-d.term:
-			return
-		}
-	}
-}
-
-// initHeartbeat is used to do the first heartbeat. It uses a tight loop until
-// either the timeout period is reached or the heartbeat is successful and returns.
-func (d *daemonDiscoveryReloader) initHeartbeat(address string) error {
-	// Setup a short ticker until the first heartbeat has succeeded
-	t := time.NewTicker(500 * time.Millisecond)
-	defer t.Stop()
-	// timeout makes sure that after a period of time we stop being so aggressive trying to reach the discovery service
-	timeout := time.After(60 * time.Second)
-
-	for {
-		select {
-		case <-timeout:
-			return errors.New("timeout waiting for initial discovery")
-		case <-d.term:
-			return errors.New("terminated")
-		case <-t.C:
-			if err := d.backend.Register(address); err == nil {
-				return nil
-			}
-		}
-	}
-}
-
-// Reload makes the watcher to stop advertising and reconfigures it to advertise in a new address.
-func (d *daemonDiscoveryReloader) Reload(backendAddress, advertiseAddress string, clusterOpts map[string]string) error {
-	d.Stop()
-
-	heartbeat, backend, err := parseDiscoveryOptions(backendAddress, clusterOpts)
-	if err != nil {
-		return err
-	}
-
-	d.backend = backend
-	d.ticker = time.NewTicker(heartbeat)
-	d.readyCh = make(chan struct{})
-
-	go d.advertiseHeartbeat(advertiseAddress)
-	return nil
-}
-
-// Stop terminates the discovery advertising.
-func (d *daemonDiscoveryReloader) Stop() {
-	d.ticker.Stop()
-	d.term <- true
-}
-
-func parseDiscoveryOptions(backendAddress string, clusterOpts map[string]string) (time.Duration, discovery.Backend, error) {
-	heartbeat, ttl, err := discoveryOpts(clusterOpts)
-	if err != nil {
-		return 0, nil, err
-	}
-
-	backend, err := discovery.New(backendAddress, heartbeat, ttl, clusterOpts)
-	if err != nil {
-		return 0, nil, err
-	}
-	return heartbeat, backend, nil
-}
-
-// modifiedDiscoverySettings returns whether the discovery configuration has been modified or not.
-func modifiedDiscoverySettings(config *Config, backendType, advertise string, clusterOpts map[string]string) bool {
-	if config.ClusterStore != backendType || config.ClusterAdvertise != advertise {
-		return true
-	}
-
-	if (config.ClusterOpts == nil && clusterOpts == nil) ||
-		(config.ClusterOpts == nil && len(clusterOpts) == 0) ||
-		(len(config.ClusterOpts) == 0 && clusterOpts == nil) {
-		return false
-	}
-
-	return !reflect.DeepEqual(config.ClusterOpts, clusterOpts)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/discovery_test.go b/installer/vendor/github.com/docker/docker/daemon/discovery_test.go
deleted file mode 100644
index 336973c516..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/discovery_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package daemon
-
-import (
-	"testing"
-	"time"
-)
-
-func TestDiscoveryOpts(t *testing.T) {
-	clusterOpts := map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "5"}
-	heartbeat, ttl, err := discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("discovery.ttl < discovery.heartbeat must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "10"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("discovery.ttl == discovery.heartbeat must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "-10", "discovery.ttl": "10"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("negative discovery.heartbeat must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "-10"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("negative discovery.ttl must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "invalid"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("invalid discovery.heartbeat must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.ttl": "invalid"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err == nil {
-		t.Fatalf("invalid discovery.ttl must fail")
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "10", "discovery.ttl": "20"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if heartbeat != 10*time.Second {
-		t.Fatalf("Heartbeat - Expected : %v, Actual : %v", 10*time.Second, heartbeat)
-	}
-
-	if ttl != 20*time.Second {
-		t.Fatalf("TTL - Expected : %v, Actual : %v", 20*time.Second, ttl)
-	}
-
-	clusterOpts = map[string]string{"discovery.heartbeat": "10"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if heartbeat != 10*time.Second {
-		t.Fatalf("Heartbeat - Expected : %v, Actual : %v", 10*time.Second, heartbeat)
-	}
-
-	expected := 10 * defaultDiscoveryTTLFactor * time.Second
-	if ttl != expected {
-		t.Fatalf("TTL - Expected : %v, Actual : %v", expected, ttl)
-	}
-
-	clusterOpts = map[string]string{"discovery.ttl": "30"}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if ttl != 30*time.Second {
-		t.Fatalf("TTL - Expected : %v, Actual : %v", 30*time.Second, ttl)
-	}
-
-	expected = 30 * time.Second / defaultDiscoveryTTLFactor
-	if heartbeat != expected {
-		t.Fatalf("Heartbeat - Expected : %v, Actual : %v", expected, heartbeat)
-	}
-
-	clusterOpts = map[string]string{}
-	heartbeat, ttl, err = discoveryOpts(clusterOpts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if heartbeat != defaultDiscoveryHeartbeat {
-		t.Fatalf("Heartbeat - Expected : %v, Actual : %v", defaultDiscoveryHeartbeat, heartbeat)
-	}
-
-	expected = defaultDiscoveryHeartbeat * defaultDiscoveryTTLFactor
-	if ttl != expected {
-		t.Fatalf("TTL - Expected : %v, Actual : %v", expected, ttl)
-	}
-}
-
-func TestModifiedDiscoverySettings(t *testing.T) {
-	cases := []struct {
-		current  *Config
-		modified *Config
-		expected bool
-	}{
-		{
-			current:  discoveryConfig("foo", "bar", map[string]string{}),
-			modified: discoveryConfig("foo", "bar", map[string]string{}),
-			expected: false,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", map[string]string{"foo": "bar"}),
-			modified: discoveryConfig("foo", "bar", map[string]string{"foo": "bar"}),
-			expected: false,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", map[string]string{}),
-			modified: discoveryConfig("foo", "bar", nil),
-			expected: false,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", nil),
-			modified: discoveryConfig("foo", "bar", map[string]string{}),
-			expected: false,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", nil),
-			modified: discoveryConfig("baz", "bar", nil),
-			expected: true,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", nil),
-			modified: discoveryConfig("foo", "baz", nil),
-			expected: true,
-		},
-		{
-			current:  discoveryConfig("foo", "bar", nil),
-			modified: discoveryConfig("foo", "bar", map[string]string{"foo": "bar"}),
-			expected: true,
-		},
-	}
-
-	for _, c := range cases {
-		got := modifiedDiscoverySettings(c.current, c.modified.ClusterStore, c.modified.ClusterAdvertise, c.modified.ClusterOpts)
-		if c.expected != got {
-			t.Fatalf("expected %v, got %v: current config %v, new config %v", c.expected, got, c.current, c.modified)
-		}
-	}
-}
-
-func discoveryConfig(backendAddr, advertiseAddr string, opts map[string]string) *Config {
-	return &Config{
-		CommonConfig: CommonConfig{
-			ClusterStore:     backendAddr,
-			ClusterAdvertise: advertiseAddr,
-			ClusterOpts:      opts,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/disk_usage.go b/installer/vendor/github.com/docker/docker/daemon/disk_usage.go
deleted file mode 100644
index c3b918660d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/disk_usage.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/directory"
-	"github.com/docker/docker/volume"
-)
-
-func (daemon *Daemon) getLayerRefs() map[layer.ChainID]int {
-	tmpImages := daemon.imageStore.Map()
-	layerRefs := map[layer.ChainID]int{}
-	for id, img := range tmpImages {
-		dgst := digest.Digest(id)
-		if len(daemon.referenceStore.References(dgst)) == 0 && len(daemon.imageStore.Children(id)) != 0 {
-			continue
-		}
-
-		rootFS := *img.RootFS
-		rootFS.DiffIDs = nil
-		for _, id := range img.RootFS.DiffIDs {
-			rootFS.Append(id)
-			chid := rootFS.ChainID()
-			layerRefs[chid]++
-		}
-	}
-
-	return layerRefs
-}
-
-// SystemDiskUsage returns information about the daemon data disk usage
-func (daemon *Daemon) SystemDiskUsage() (*types.DiskUsage, error) {
-	// Retrieve container list
-	allContainers, err := daemon.Containers(&types.ContainerListOptions{
-		Size: true,
-		All:  true,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("failed to retrieve container list: %v", err)
-	}
-
-	// Get all top images with extra attributes
-	allImages, err := daemon.Images(filters.NewArgs(), false, true)
-	if err != nil {
-		return nil, fmt.Errorf("failed to retrieve image list: %v", err)
-	}
-
-	// Get all local volumes
-	allVolumes := []*types.Volume{}
-	getLocalVols := func(v volume.Volume) error {
-		name := v.Name()
-		refs := daemon.volumes.Refs(v)
-
-		tv := volumeToAPIType(v)
-		sz, err := directory.Size(v.Path())
-		if err != nil {
-			logrus.Warnf("failed to determine size of volume %v", name)
-			sz = -1
-		}
-		tv.UsageData = &types.VolumeUsageData{Size: sz, RefCount: int64(len(refs))}
-		allVolumes = append(allVolumes, tv)
-
-		return nil
-	}
-
-	err = daemon.traverseLocalVolumes(getLocalVols)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get total layers size on disk
-	layerRefs := daemon.getLayerRefs()
-	allLayers := daemon.layerStore.Map()
-	var allLayersSize int64
-	for _, l := range allLayers {
-		size, err := l.DiffSize()
-		if err == nil {
-			if _, ok := layerRefs[l.ChainID()]; ok {
-				allLayersSize += size
-			} else {
-				logrus.Warnf("found leaked image layer %v", l.ChainID())
-			}
-		} else {
-			logrus.Warnf("failed to get diff size for layer %v", l.ChainID())
-		}
-
-	}
-
-	return &types.DiskUsage{
-		LayersSize: allLayersSize,
-		Containers: allContainers,
-		Volumes:    allVolumes,
-		Images:     allImages,
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/errors.go b/installer/vendor/github.com/docker/docker/daemon/errors.go
deleted file mode 100644
index 566a32f175..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/errors.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/reference"
-)
-
-func (d *Daemon) imageNotExistToErrcode(err error) error {
-	if dne, isDNE := err.(ErrImageDoesNotExist); isDNE {
-		if strings.Contains(dne.RefOrID, "@") {
-			e := fmt.Errorf("No such image: %s", dne.RefOrID)
-			return errors.NewRequestNotFoundError(e)
-		}
-		tag := reference.DefaultTag
-		ref, err := reference.ParseNamed(dne.RefOrID)
-		if err != nil {
-			e := fmt.Errorf("No such image: %s:%s", dne.RefOrID, tag)
-			return errors.NewRequestNotFoundError(e)
-		}
-		if tagged, isTagged := ref.(reference.NamedTagged); isTagged {
-			tag = tagged.Tag()
-		}
-		e := fmt.Errorf("No such image: %s:%s", ref.Name(), tag)
-		return errors.NewRequestNotFoundError(e)
-	}
-	return err
-}
-
-type errNotRunning struct {
-	containerID string
-}
-
-func (e errNotRunning) Error() string {
-	return fmt.Sprintf("Container %s is not running", e.containerID)
-}
-
-func (e errNotRunning) ContainerIsRunning() bool {
-	return false
-}
-
-func errContainerIsRestarting(containerID string) error {
-	err := fmt.Errorf("Container %s is restarting, wait until the container is running", containerID)
-	return errors.NewRequestConflictError(err)
-}
-
-func errExecNotFound(id string) error {
-	err := fmt.Errorf("No such exec instance '%s' found in daemon", id)
-	return errors.NewRequestNotFoundError(err)
-}
-
-func errExecPaused(id string) error {
-	err := fmt.Errorf("Container %s is paused, unpause the container before exec", id)
-	return errors.NewRequestConflictError(err)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events.go b/installer/vendor/github.com/docker/docker/daemon/events.go
deleted file mode 100644
index 8fe8e1b640..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package daemon
-
-import (
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/container"
-	daemonevents "github.com/docker/docker/daemon/events"
-	"github.com/docker/libnetwork"
-)
-
-// LogContainerEvent generates an event related to a container with only the default attributes.
-func (daemon *Daemon) LogContainerEvent(container *container.Container, action string) {
-	daemon.LogContainerEventWithAttributes(container, action, map[string]string{})
-}
-
-// LogContainerEventWithAttributes generates an event related to a container with specific given attributes.
-func (daemon *Daemon) LogContainerEventWithAttributes(container *container.Container, action string, attributes map[string]string) {
-	copyAttributes(attributes, container.Config.Labels)
-	if container.Config.Image != "" {
-		attributes["image"] = container.Config.Image
-	}
-	attributes["name"] = strings.TrimLeft(container.Name, "/")
-
-	actor := events.Actor{
-		ID:         container.ID,
-		Attributes: attributes,
-	}
-	daemon.EventsService.Log(action, events.ContainerEventType, actor)
-}
-
-// LogImageEvent generates an event related to an image with only the default attributes.
-func (daemon *Daemon) LogImageEvent(imageID, refName, action string) {
-	daemon.LogImageEventWithAttributes(imageID, refName, action, map[string]string{})
-}
-
-// LogImageEventWithAttributes generates an event related to an image with specific given attributes.
-func (daemon *Daemon) LogImageEventWithAttributes(imageID, refName, action string, attributes map[string]string) {
-	img, err := daemon.GetImage(imageID)
-	if err == nil && img.Config != nil {
-		// image has not been removed yet.
-		// it could be missing if the event is `delete`.
-		copyAttributes(attributes, img.Config.Labels)
-	}
-	if refName != "" {
-		attributes["name"] = refName
-	}
-	actor := events.Actor{
-		ID:         imageID,
-		Attributes: attributes,
-	}
-
-	daemon.EventsService.Log(action, events.ImageEventType, actor)
-}
-
-// LogPluginEvent generates an event related to a plugin with only the default attributes.
-func (daemon *Daemon) LogPluginEvent(pluginID, refName, action string) {
-	daemon.LogPluginEventWithAttributes(pluginID, refName, action, map[string]string{})
-}
-
-// LogPluginEventWithAttributes generates an event related to a plugin with specific given attributes.
-func (daemon *Daemon) LogPluginEventWithAttributes(pluginID, refName, action string, attributes map[string]string) {
-	attributes["name"] = refName
-	actor := events.Actor{
-		ID:         pluginID,
-		Attributes: attributes,
-	}
-	daemon.EventsService.Log(action, events.PluginEventType, actor)
-}
-
-// LogVolumeEvent generates an event related to a volume.
-func (daemon *Daemon) LogVolumeEvent(volumeID, action string, attributes map[string]string) {
-	actor := events.Actor{
-		ID:         volumeID,
-		Attributes: attributes,
-	}
-	daemon.EventsService.Log(action, events.VolumeEventType, actor)
-}
-
-// LogNetworkEvent generates an event related to a network with only the default attributes.
-func (daemon *Daemon) LogNetworkEvent(nw libnetwork.Network, action string) {
-	daemon.LogNetworkEventWithAttributes(nw, action, map[string]string{})
-}
-
-// LogNetworkEventWithAttributes generates an event related to a network with specific given attributes.
-func (daemon *Daemon) LogNetworkEventWithAttributes(nw libnetwork.Network, action string, attributes map[string]string) {
-	attributes["name"] = nw.Name()
-	attributes["type"] = nw.Type()
-	actor := events.Actor{
-		ID:         nw.ID(),
-		Attributes: attributes,
-	}
-	daemon.EventsService.Log(action, events.NetworkEventType, actor)
-}
-
-// LogDaemonEventWithAttributes generates an event related to the daemon itself with specific given attributes.
-func (daemon *Daemon) LogDaemonEventWithAttributes(action string, attributes map[string]string) {
-	if daemon.EventsService != nil {
-		if info, err := daemon.SystemInfo(); err == nil && info.Name != "" {
-			attributes["name"] = info.Name
-		}
-		actor := events.Actor{
-			ID:         daemon.ID,
-			Attributes: attributes,
-		}
-		daemon.EventsService.Log(action, events.DaemonEventType, actor)
-	}
-}
-
-// SubscribeToEvents returns the currently record of events, a channel to stream new events from, and a function to cancel the stream of events.
-func (daemon *Daemon) SubscribeToEvents(since, until time.Time, filter filters.Args) ([]events.Message, chan interface{}) {
-	ef := daemonevents.NewFilter(filter)
-	return daemon.EventsService.SubscribeTopic(since, until, ef)
-}
-
-// UnsubscribeFromEvents stops the event subscription for a client by closing the
-// channel where the daemon sends events to.
-func (daemon *Daemon) UnsubscribeFromEvents(listener chan interface{}) {
-	daemon.EventsService.Evict(listener)
-}
-
-// copyAttributes guarantees that labels are not mutated by event triggers.
-func copyAttributes(attributes, labels map[string]string) {
-	if labels == nil {
-		return
-	}
-	for k, v := range labels {
-		attributes[k] = v
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events/events.go b/installer/vendor/github.com/docker/docker/daemon/events/events.go
deleted file mode 100644
index 0bf105f54d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events/events.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package events
-
-import (
-	"sync"
-	"time"
-
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/pkg/pubsub"
-)
-
-const (
-	eventsLimit = 64
-	bufferSize  = 1024
-)
-
-// Events is pubsub channel for events generated by the engine.
-type Events struct {
-	mu     sync.Mutex
-	events []eventtypes.Message
-	pub    *pubsub.Publisher
-}
-
-// New returns new *Events instance
-func New() *Events {
-	return &Events{
-		events: make([]eventtypes.Message, 0, eventsLimit),
-		pub:    pubsub.NewPublisher(100*time.Millisecond, bufferSize),
-	}
-}
-
-// Subscribe adds new listener to events, returns slice of 64 stored
-// last events, a channel in which you can expect new events (in form
-// of interface{}, so you need type assertion), and a function to call
-// to stop the stream of events.
-func (e *Events) Subscribe() ([]eventtypes.Message, chan interface{}, func()) {
-	eventSubscribers.Inc()
-	e.mu.Lock()
-	current := make([]eventtypes.Message, len(e.events))
-	copy(current, e.events)
-	l := e.pub.Subscribe()
-	e.mu.Unlock()
-
-	cancel := func() {
-		e.Evict(l)
-	}
-	return current, l, cancel
-}
-
-// SubscribeTopic adds new listener to events, returns slice of 64 stored
-// last events, a channel in which you can expect new events (in form
-// of interface{}, so you need type assertion).
-func (e *Events) SubscribeTopic(since, until time.Time, ef *Filter) ([]eventtypes.Message, chan interface{}) {
-	eventSubscribers.Inc()
-	e.mu.Lock()
-
-	var topic func(m interface{}) bool
-	if ef != nil && ef.filter.Len() > 0 {
-		topic = func(m interface{}) bool { return ef.Include(m.(eventtypes.Message)) }
-	}
-
-	buffered := e.loadBufferedEvents(since, until, topic)
-
-	var ch chan interface{}
-	if topic != nil {
-		ch = e.pub.SubscribeTopic(topic)
-	} else {
-		// Subscribe to all events if there are no filters
-		ch = e.pub.Subscribe()
-	}
-
-	e.mu.Unlock()
-	return buffered, ch
-}
-
-// Evict evicts listener from pubsub
-func (e *Events) Evict(l chan interface{}) {
-	eventSubscribers.Dec()
-	e.pub.Evict(l)
-}
-
-// Log broadcasts event to listeners. Each listener has 100 millisecond for
-// receiving event or it will be skipped.
-func (e *Events) Log(action, eventType string, actor eventtypes.Actor) {
-	eventsCounter.Inc()
-	now := time.Now().UTC()
-	jm := eventtypes.Message{
-		Action:   action,
-		Type:     eventType,
-		Actor:    actor,
-		Time:     now.Unix(),
-		TimeNano: now.UnixNano(),
-	}
-
-	// fill deprecated fields for container and images
-	switch eventType {
-	case eventtypes.ContainerEventType:
-		jm.ID = actor.ID
-		jm.Status = action
-		jm.From = actor.Attributes["image"]
-	case eventtypes.ImageEventType:
-		jm.ID = actor.ID
-		jm.Status = action
-	}
-
-	e.mu.Lock()
-	if len(e.events) == cap(e.events) {
-		// discard oldest event
-		copy(e.events, e.events[1:])
-		e.events[len(e.events)-1] = jm
-	} else {
-		e.events = append(e.events, jm)
-	}
-	e.mu.Unlock()
-	e.pub.Publish(jm)
-}
-
-// SubscribersCount returns number of event listeners
-func (e *Events) SubscribersCount() int {
-	return e.pub.Len()
-}
-
-// loadBufferedEvents iterates over the cached events in the buffer
-// and returns those that were emitted between two specific dates.
-// It uses `time.Unix(seconds, nanoseconds)` to generate valid dates with those arguments.
-// It filters those buffered messages with a topic function if it's not nil, otherwise it adds all messages.
-func (e *Events) loadBufferedEvents(since, until time.Time, topic func(interface{}) bool) []eventtypes.Message {
-	var buffered []eventtypes.Message
-	if since.IsZero() && until.IsZero() {
-		return buffered
-	}
-
-	var sinceNanoUnix int64
-	if !since.IsZero() {
-		sinceNanoUnix = since.UnixNano()
-	}
-
-	var untilNanoUnix int64
-	if !until.IsZero() {
-		untilNanoUnix = until.UnixNano()
-	}
-
-	for i := len(e.events) - 1; i >= 0; i-- {
-		ev := e.events[i]
-
-		if ev.TimeNano < sinceNanoUnix {
-			break
-		}
-
-		if untilNanoUnix > 0 && ev.TimeNano > untilNanoUnix {
-			continue
-		}
-
-		if topic == nil || topic(ev) {
-			buffered = append([]eventtypes.Message{ev}, buffered...)
-		}
-	}
-	return buffered
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events/events_test.go b/installer/vendor/github.com/docker/docker/daemon/events/events_test.go
deleted file mode 100644
index bbd160f901..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events/events_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package events
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/events"
-	timetypes "github.com/docker/docker/api/types/time"
-	eventstestutils "github.com/docker/docker/daemon/events/testutils"
-)
-
-func TestEventsLog(t *testing.T) {
-	e := New()
-	_, l1, _ := e.Subscribe()
-	_, l2, _ := e.Subscribe()
-	defer e.Evict(l1)
-	defer e.Evict(l2)
-	count := e.SubscribersCount()
-	if count != 2 {
-		t.Fatalf("Must be 2 subscribers, got %d", count)
-	}
-	actor := events.Actor{
-		ID:         "cont",
-		Attributes: map[string]string{"image": "image"},
-	}
-	e.Log("test", events.ContainerEventType, actor)
-	select {
-	case msg := <-l1:
-		jmsg, ok := msg.(events.Message)
-		if !ok {
-			t.Fatalf("Unexpected type %T", msg)
-		}
-		if len(e.events) != 1 {
-			t.Fatalf("Must be only one event, got %d", len(e.events))
-		}
-		if jmsg.Status != "test" {
-			t.Fatalf("Status should be test, got %s", jmsg.Status)
-		}
-		if jmsg.ID != "cont" {
-			t.Fatalf("ID should be cont, got %s", jmsg.ID)
-		}
-		if jmsg.From != "image" {
-			t.Fatalf("From should be image, got %s", jmsg.From)
-		}
-	case <-time.After(1 * time.Second):
-		t.Fatal("Timeout waiting for broadcasted message")
-	}
-	select {
-	case msg := <-l2:
-		jmsg, ok := msg.(events.Message)
-		if !ok {
-			t.Fatalf("Unexpected type %T", msg)
-		}
-		if len(e.events) != 1 {
-			t.Fatalf("Must be only one event, got %d", len(e.events))
-		}
-		if jmsg.Status != "test" {
-			t.Fatalf("Status should be test, got %s", jmsg.Status)
-		}
-		if jmsg.ID != "cont" {
-			t.Fatalf("ID should be cont, got %s", jmsg.ID)
-		}
-		if jmsg.From != "image" {
-			t.Fatalf("From should be image, got %s", jmsg.From)
-		}
-	case <-time.After(1 * time.Second):
-		t.Fatal("Timeout waiting for broadcasted message")
-	}
-}
-
-func TestEventsLogTimeout(t *testing.T) {
-	e := New()
-	_, l, _ := e.Subscribe()
-	defer e.Evict(l)
-
-	c := make(chan struct{})
-	go func() {
-		actor := events.Actor{
-			ID: "image",
-		}
-		e.Log("test", events.ImageEventType, actor)
-		close(c)
-	}()
-
-	select {
-	case <-c:
-	case <-time.After(time.Second):
-		t.Fatal("Timeout publishing message")
-	}
-}
-
-func TestLogEvents(t *testing.T) {
-	e := New()
-
-	for i := 0; i < eventsLimit+16; i++ {
-		action := fmt.Sprintf("action_%d", i)
-		id := fmt.Sprintf("cont_%d", i)
-		from := fmt.Sprintf("image_%d", i)
-
-		actor := events.Actor{
-			ID:         id,
-			Attributes: map[string]string{"image": from},
-		}
-		e.Log(action, events.ContainerEventType, actor)
-	}
-	time.Sleep(50 * time.Millisecond)
-	current, l, _ := e.Subscribe()
-	for i := 0; i < 10; i++ {
-		num := i + eventsLimit + 16
-		action := fmt.Sprintf("action_%d", num)
-		id := fmt.Sprintf("cont_%d", num)
-		from := fmt.Sprintf("image_%d", num)
-
-		actor := events.Actor{
-			ID:         id,
-			Attributes: map[string]string{"image": from},
-		}
-		e.Log(action, events.ContainerEventType, actor)
-	}
-	if len(e.events) != eventsLimit {
-		t.Fatalf("Must be %d events, got %d", eventsLimit, len(e.events))
-	}
-
-	var msgs []events.Message
-	for len(msgs) < 10 {
-		m := <-l
-		jm, ok := (m).(events.Message)
-		if !ok {
-			t.Fatalf("Unexpected type %T", m)
-		}
-		msgs = append(msgs, jm)
-	}
-	if len(current) != eventsLimit {
-		t.Fatalf("Must be %d events, got %d", eventsLimit, len(current))
-	}
-	first := current[0]
-	if first.Status != "action_16" {
-		t.Fatalf("First action is %s, must be action_16", first.Status)
-	}
-	last := current[len(current)-1]
-	if last.Status != "action_79" {
-		t.Fatalf("Last action is %s, must be action_79", last.Status)
-	}
-
-	firstC := msgs[0]
-	if firstC.Status != "action_80" {
-		t.Fatalf("First action is %s, must be action_80", firstC.Status)
-	}
-	lastC := msgs[len(msgs)-1]
-	if lastC.Status != "action_89" {
-		t.Fatalf("Last action is %s, must be action_89", lastC.Status)
-	}
-}
-
-// https://github.com/docker/docker/issues/20999
-// Fixtures:
-//
-//2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)
-//2016-03-07T17:28:03.091719377+02:00 network disconnect 19c5ed41acb798f26b751e0035cd7821741ab79e2bbd59a66b5fd8abf954eaa0 (type=bridge, container=0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079, name=bridge)
-//2016-03-07T17:28:03.129014751+02:00 container destroy 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)
-func TestLoadBufferedEvents(t *testing.T) {
-	now := time.Now()
-	f, err := timetypes.GetTimestamp("2016-03-07T17:28:03.100000000+02:00", now)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s, sNano, err := timetypes.ParseTimestamps(f, -1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m1, err := eventstestutils.Scan("2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m2, err := eventstestutils.Scan("2016-03-07T17:28:03.091719377+02:00 network disconnect 19c5ed41acb798f26b751e0035cd7821741ab79e2bbd59a66b5fd8abf954eaa0 (type=bridge, container=0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079, name=bridge)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m3, err := eventstestutils.Scan("2016-03-07T17:28:03.129014751+02:00 container destroy 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	events := &Events{
-		events: []events.Message{*m1, *m2, *m3},
-	}
-
-	since := time.Unix(s, sNano)
-	until := time.Time{}
-
-	out := events.loadBufferedEvents(since, until, nil)
-	if len(out) != 1 {
-		t.Fatalf("expected 1 message, got %d: %v", len(out), out)
-	}
-}
-
-func TestLoadBufferedEventsOnlyFromPast(t *testing.T) {
-	now := time.Now()
-	f, err := timetypes.GetTimestamp("2016-03-07T17:28:03.090000000+02:00", now)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s, sNano, err := timetypes.ParseTimestamps(f, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err = timetypes.GetTimestamp("2016-03-07T17:28:03.100000000+02:00", now)
-	if err != nil {
-		t.Fatal(err)
-	}
-	u, uNano, err := timetypes.ParseTimestamps(f, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m1, err := eventstestutils.Scan("2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m2, err := eventstestutils.Scan("2016-03-07T17:28:03.091719377+02:00 network disconnect 19c5ed41acb798f26b751e0035cd7821741ab79e2bbd59a66b5fd8abf954eaa0 (type=bridge, container=0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079, name=bridge)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m3, err := eventstestutils.Scan("2016-03-07T17:28:03.129014751+02:00 container destroy 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	events := &Events{
-		events: []events.Message{*m1, *m2, *m3},
-	}
-
-	since := time.Unix(s, sNano)
-	until := time.Unix(u, uNano)
-
-	out := events.loadBufferedEvents(since, until, nil)
-	if len(out) != 1 {
-		t.Fatalf("expected 1 message, got %d: %v", len(out), out)
-	}
-
-	if out[0].Type != "network" {
-		t.Fatalf("expected network event, got %s", out[0].Type)
-	}
-}
-
-// #13753
-func TestIngoreBufferedWhenNoTimes(t *testing.T) {
-	m1, err := eventstestutils.Scan("2016-03-07T17:28:03.022433271+02:00 container die 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m2, err := eventstestutils.Scan("2016-03-07T17:28:03.091719377+02:00 network disconnect 19c5ed41acb798f26b751e0035cd7821741ab79e2bbd59a66b5fd8abf954eaa0 (type=bridge, container=0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079, name=bridge)")
-	if err != nil {
-		t.Fatal(err)
-	}
-	m3, err := eventstestutils.Scan("2016-03-07T17:28:03.129014751+02:00 container destroy 0b863f2a26c18557fc6cdadda007c459f9ec81b874780808138aea78a3595079 (image=ubuntu, name=small_hoover)")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	events := &Events{
-		events: []events.Message{*m1, *m2, *m3},
-	}
-
-	since := time.Time{}
-	until := time.Time{}
-
-	out := events.loadBufferedEvents(since, until, nil)
-	if len(out) != 0 {
-		t.Fatalf("expected 0 buffered events, got %q", out)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events/filter.go b/installer/vendor/github.com/docker/docker/daemon/events/filter.go
deleted file mode 100644
index 5c9c527692..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events/filter.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package events
-
-import (
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/reference"
-)
-
-// Filter can filter out docker events from a stream
-type Filter struct {
-	filter filters.Args
-}
-
-// NewFilter creates a new Filter
-func NewFilter(filter filters.Args) *Filter {
-	return &Filter{filter: filter}
-}
-
-// Include returns true when the event ev is included by the filters
-func (ef *Filter) Include(ev events.Message) bool {
-	return ef.matchEvent(ev) &&
-		ef.filter.ExactMatch("type", ev.Type) &&
-		ef.matchDaemon(ev) &&
-		ef.matchContainer(ev) &&
-		ef.matchPlugin(ev) &&
-		ef.matchVolume(ev) &&
-		ef.matchNetwork(ev) &&
-		ef.matchImage(ev) &&
-		ef.matchLabels(ev.Actor.Attributes)
-}
-
-func (ef *Filter) matchEvent(ev events.Message) bool {
-	// #25798 if an event filter contains either health_status, exec_create or exec_start without a colon
-	// Let's to a FuzzyMatch instead of an ExactMatch.
-	if ef.filterContains("event", map[string]struct{}{"health_status": {}, "exec_create": {}, "exec_start": {}}) {
-		return ef.filter.FuzzyMatch("event", ev.Action)
-	}
-	return ef.filter.ExactMatch("event", ev.Action)
-}
-
-func (ef *Filter) filterContains(field string, values map[string]struct{}) bool {
-	for _, v := range ef.filter.Get(field) {
-		if _, ok := values[v]; ok {
-			return true
-		}
-	}
-	return false
-}
-
-func (ef *Filter) matchLabels(attributes map[string]string) bool {
-	if !ef.filter.Include("label") {
-		return true
-	}
-	return ef.filter.MatchKVList("label", attributes)
-}
-
-func (ef *Filter) matchDaemon(ev events.Message) bool {
-	return ef.fuzzyMatchName(ev, events.DaemonEventType)
-}
-
-func (ef *Filter) matchContainer(ev events.Message) bool {
-	return ef.fuzzyMatchName(ev, events.ContainerEventType)
-}
-
-func (ef *Filter) matchPlugin(ev events.Message) bool {
-	return ef.fuzzyMatchName(ev, events.PluginEventType)
-}
-
-func (ef *Filter) matchVolume(ev events.Message) bool {
-	return ef.fuzzyMatchName(ev, events.VolumeEventType)
-}
-
-func (ef *Filter) matchNetwork(ev events.Message) bool {
-	return ef.fuzzyMatchName(ev, events.NetworkEventType)
-}
-
-func (ef *Filter) fuzzyMatchName(ev events.Message, eventType string) bool {
-	return ef.filter.FuzzyMatch(eventType, ev.Actor.ID) ||
-		ef.filter.FuzzyMatch(eventType, ev.Actor.Attributes["name"])
-}
-
-// matchImage matches against both event.Actor.ID (for image events)
-// and event.Actor.Attributes["image"] (for container events), so that any container that was created
-// from an image will be included in the image events. Also compare both
-// against the stripped repo name without any tags.
-func (ef *Filter) matchImage(ev events.Message) bool {
-	id := ev.Actor.ID
-	nameAttr := "image"
-	var imageName string
-
-	if ev.Type == events.ImageEventType {
-		nameAttr = "name"
-	}
-
-	if n, ok := ev.Actor.Attributes[nameAttr]; ok {
-		imageName = n
-	}
-	return ef.filter.ExactMatch("image", id) ||
-		ef.filter.ExactMatch("image", imageName) ||
-		ef.filter.ExactMatch("image", stripTag(id)) ||
-		ef.filter.ExactMatch("image", stripTag(imageName))
-}
-
-func stripTag(image string) string {
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return image
-	}
-	return ref.Name()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events/metrics.go b/installer/vendor/github.com/docker/docker/daemon/events/metrics.go
deleted file mode 100644
index c9a89ec0ed..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events/metrics.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package events
-
-import "github.com/docker/go-metrics"
-
-var (
-	eventsCounter    metrics.Counter
-	eventSubscribers metrics.Gauge
-)
-
-func init() {
-	ns := metrics.NewNamespace("engine", "daemon", nil)
-	eventsCounter = ns.NewCounter("events", "The number of events logged")
-	eventSubscribers = ns.NewGauge("events_subscribers", "The number of current subscribers to events", metrics.Total)
-	metrics.Register(ns)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events/testutils/testutils.go b/installer/vendor/github.com/docker/docker/daemon/events/testutils/testutils.go
deleted file mode 100644
index 3544446e18..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events/testutils/testutils.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package testutils
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/events"
-	timetypes "github.com/docker/docker/api/types/time"
-)
-
-var (
-	reTimestamp  = `(?P<timestamp>\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}.\d{9}(:?(:?(:?-|\+)\d{2}:\d{2})|Z))`
-	reEventType  = `(?P<eventType>\w+)`
-	reAction     = `(?P<action>\w+)`
-	reID         = `(?P<id>[^\s]+)`
-	reAttributes = `(\s\((?P<attributes>[^\)]+)\))?`
-	reString     = fmt.Sprintf(`\A%s\s%s\s%s\s%s%s\z`, reTimestamp, reEventType, reAction, reID, reAttributes)
-
-	// eventCliRegexp is a regular expression that matches all possible event outputs in the cli
-	eventCliRegexp = regexp.MustCompile(reString)
-)
-
-// ScanMap turns an event string like the default ones formatted in the cli output
-// and turns it into map.
-func ScanMap(text string) map[string]string {
-	matches := eventCliRegexp.FindAllStringSubmatch(text, -1)
-	md := map[string]string{}
-	if len(matches) == 0 {
-		return md
-	}
-
-	names := eventCliRegexp.SubexpNames()
-	for i, n := range matches[0] {
-		md[names[i]] = n
-	}
-	return md
-}
-
-// Scan turns an event string like the default ones formatted in the cli output
-// and turns it into an event message.
-func Scan(text string) (*events.Message, error) {
-	md := ScanMap(text)
-	if len(md) == 0 {
-		return nil, fmt.Errorf("text is not an event: %s", text)
-	}
-
-	f, err := timetypes.GetTimestamp(md["timestamp"], time.Now())
-	if err != nil {
-		return nil, err
-	}
-
-	t, tn, err := timetypes.ParseTimestamps(f, -1)
-	if err != nil {
-		return nil, err
-	}
-
-	attrs := make(map[string]string)
-	for _, a := range strings.SplitN(md["attributes"], ", ", -1) {
-		kv := strings.SplitN(a, "=", 2)
-		attrs[kv[0]] = kv[1]
-	}
-
-	tu := time.Unix(t, tn)
-	return &events.Message{
-		Time:     t,
-		TimeNano: tu.UnixNano(),
-		Type:     md["eventType"],
-		Action:   md["action"],
-		Actor: events.Actor{
-			ID:         md["id"],
-			Attributes: attrs,
-		},
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/events_test.go b/installer/vendor/github.com/docker/docker/daemon/events_test.go
deleted file mode 100644
index 2dbcc27dfc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/events_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package daemon
-
-import (
-	"testing"
-	"time"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/events"
-)
-
-func TestLogContainerEventCopyLabels(t *testing.T) {
-	e := events.New()
-	_, l, _ := e.Subscribe()
-	defer e.Evict(l)
-
-	container := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "container_id",
-			Name: "container_name",
-			Config: &containertypes.Config{
-				Image: "image_name",
-				Labels: map[string]string{
-					"node": "1",
-					"os":   "alpine",
-				},
-			},
-		},
-	}
-	daemon := &Daemon{
-		EventsService: e,
-	}
-	daemon.LogContainerEvent(container, "create")
-
-	if _, mutated := container.Config.Labels["image"]; mutated {
-		t.Fatalf("Expected to not mutate the container labels, got %q", container.Config.Labels)
-	}
-
-	validateTestAttributes(t, l, map[string]string{
-		"node": "1",
-		"os":   "alpine",
-	})
-}
-
-func TestLogContainerEventWithAttributes(t *testing.T) {
-	e := events.New()
-	_, l, _ := e.Subscribe()
-	defer e.Evict(l)
-
-	container := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "container_id",
-			Name: "container_name",
-			Config: &containertypes.Config{
-				Labels: map[string]string{
-					"node": "1",
-					"os":   "alpine",
-				},
-			},
-		},
-	}
-	daemon := &Daemon{
-		EventsService: e,
-	}
-	attributes := map[string]string{
-		"node": "2",
-		"foo":  "bar",
-	}
-	daemon.LogContainerEventWithAttributes(container, "create", attributes)
-
-	validateTestAttributes(t, l, map[string]string{
-		"node": "1",
-		"foo":  "bar",
-	})
-}
-
-func validateTestAttributes(t *testing.T, l chan interface{}, expectedAttributesToTest map[string]string) {
-	select {
-	case ev := <-l:
-		event, ok := ev.(eventtypes.Message)
-		if !ok {
-			t.Fatalf("Unexpected event message: %q", ev)
-		}
-		for key, expected := range expectedAttributesToTest {
-			actual, ok := event.Actor.Attributes[key]
-			if !ok || actual != expected {
-				t.Fatalf("Expected value for key %s to be %s, but was %s (event:%v)", key, expected, actual, event)
-			}
-		}
-	case <-time.After(10 * time.Second):
-		t.Fatalf("LogEvent test timed out")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/exec.go b/installer/vendor/github.com/docker/docker/daemon/exec.go
deleted file mode 100644
index 8197426a33..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/exec.go
+++ /dev/null
@@ -1,280 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/docker/utils"
-)
-
-// Seconds to wait after sending TERM before trying KILL
-const termProcessTimeout = 10
-
-func (d *Daemon) registerExecCommand(container *container.Container, config *exec.Config) {
-	// Storing execs in container in order to kill them gracefully whenever the container is stopped or removed.
-	container.ExecCommands.Add(config.ID, config)
-	// Storing execs in daemon for easy access via Engine API.
-	d.execCommands.Add(config.ID, config)
-}
-
-// ExecExists looks up the exec instance and returns a bool if it exists or not.
-// It will also return the error produced by `getConfig`
-func (d *Daemon) ExecExists(name string) (bool, error) {
-	if _, err := d.getExecConfig(name); err != nil {
-		return false, err
-	}
-	return true, nil
-}
-
-// getExecConfig looks up the exec instance by name. If the container associated
-// with the exec instance is stopped or paused, it will return an error.
-func (d *Daemon) getExecConfig(name string) (*exec.Config, error) {
-	ec := d.execCommands.Get(name)
-
-	// If the exec is found but its container is not in the daemon's list of
-	// containers then it must have been deleted, in which case instead of
-	// saying the container isn't running, we should return a 404 so that
-	// the user sees the same error now that they will after the
-	// 5 minute clean-up loop is run which erases old/dead execs.
-
-	if ec != nil {
-		if container := d.containers.Get(ec.ContainerID); container != nil {
-			if !container.IsRunning() {
-				return nil, fmt.Errorf("Container %s is not running: %s", container.ID, container.State.String())
-			}
-			if container.IsPaused() {
-				return nil, errExecPaused(container.ID)
-			}
-			if container.IsRestarting() {
-				return nil, errContainerIsRestarting(container.ID)
-			}
-			return ec, nil
-		}
-	}
-
-	return nil, errExecNotFound(name)
-}
-
-func (d *Daemon) unregisterExecCommand(container *container.Container, execConfig *exec.Config) {
-	container.ExecCommands.Delete(execConfig.ID)
-	d.execCommands.Delete(execConfig.ID)
-}
-
-func (d *Daemon) getActiveContainer(name string) (*container.Container, error) {
-	container, err := d.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if !container.IsRunning() {
-		return nil, errNotRunning{container.ID}
-	}
-	if container.IsPaused() {
-		return nil, errExecPaused(name)
-	}
-	if container.IsRestarting() {
-		return nil, errContainerIsRestarting(container.ID)
-	}
-	return container, nil
-}
-
-// ContainerExecCreate sets up an exec in a running container.
-func (d *Daemon) ContainerExecCreate(name string, config *types.ExecConfig) (string, error) {
-	container, err := d.getActiveContainer(name)
-	if err != nil {
-		return "", err
-	}
-
-	cmd := strslice.StrSlice(config.Cmd)
-	entrypoint, args := d.getEntrypointAndArgs(strslice.StrSlice{}, cmd)
-
-	keys := []byte{}
-	if config.DetachKeys != "" {
-		keys, err = term.ToBytes(config.DetachKeys)
-		if err != nil {
-			err = fmt.Errorf("Invalid escape keys (%s) provided", config.DetachKeys)
-			return "", err
-		}
-	}
-
-	execConfig := exec.NewConfig()
-	execConfig.OpenStdin = config.AttachStdin
-	execConfig.OpenStdout = config.AttachStdout
-	execConfig.OpenStderr = config.AttachStderr
-	execConfig.ContainerID = container.ID
-	execConfig.DetachKeys = keys
-	execConfig.Entrypoint = entrypoint
-	execConfig.Args = args
-	execConfig.Tty = config.Tty
-	execConfig.Privileged = config.Privileged
-	execConfig.User = config.User
-
-	linkedEnv, err := d.setupLinkedContainers(container)
-	if err != nil {
-		return "", err
-	}
-	execConfig.Env = utils.ReplaceOrAppendEnvValues(container.CreateDaemonEnvironment(config.Tty, linkedEnv), config.Env)
-	if len(execConfig.User) == 0 {
-		execConfig.User = container.Config.User
-	}
-
-	d.registerExecCommand(container, execConfig)
-
-	d.LogContainerEvent(container, "exec_create: "+execConfig.Entrypoint+" "+strings.Join(execConfig.Args, " "))
-
-	return execConfig.ID, nil
-}
-
-// ContainerExecStart starts a previously set up exec instance. The
-// std streams are set up.
-// If ctx is cancelled, the process is terminated.
-func (d *Daemon) ContainerExecStart(ctx context.Context, name string, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer) (err error) {
-	var (
-		cStdin           io.ReadCloser
-		cStdout, cStderr io.Writer
-	)
-
-	ec, err := d.getExecConfig(name)
-	if err != nil {
-		return errExecNotFound(name)
-	}
-
-	ec.Lock()
-	if ec.ExitCode != nil {
-		ec.Unlock()
-		err := fmt.Errorf("Error: Exec command %s has already run", ec.ID)
-		return errors.NewRequestConflictError(err)
-	}
-
-	if ec.Running {
-		ec.Unlock()
-		return fmt.Errorf("Error: Exec command %s is already running", ec.ID)
-	}
-	ec.Running = true
-	defer func() {
-		if err != nil {
-			ec.Running = false
-			exitCode := 126
-			ec.ExitCode = &exitCode
-		}
-	}()
-	ec.Unlock()
-
-	c := d.containers.Get(ec.ContainerID)
-	logrus.Debugf("starting exec command %s in container %s", ec.ID, c.ID)
-	d.LogContainerEvent(c, "exec_start: "+ec.Entrypoint+" "+strings.Join(ec.Args, " "))
-
-	if ec.OpenStdin && stdin != nil {
-		r, w := io.Pipe()
-		go func() {
-			defer w.Close()
-			defer logrus.Debug("Closing buffered stdin pipe")
-			pools.Copy(w, stdin)
-		}()
-		cStdin = r
-	}
-	if ec.OpenStdout {
-		cStdout = stdout
-	}
-	if ec.OpenStderr {
-		cStderr = stderr
-	}
-
-	if ec.OpenStdin {
-		ec.StreamConfig.NewInputPipes()
-	} else {
-		ec.StreamConfig.NewNopInputPipe()
-	}
-
-	p := libcontainerd.Process{
-		Args:     append([]string{ec.Entrypoint}, ec.Args...),
-		Env:      ec.Env,
-		Terminal: ec.Tty,
-	}
-
-	if err := execSetPlatformOpt(c, ec, &p); err != nil {
-		return err
-	}
-
-	attachErr := container.AttachStreams(ctx, ec.StreamConfig, ec.OpenStdin, true, ec.Tty, cStdin, cStdout, cStderr, ec.DetachKeys)
-
-	systemPid, err := d.containerd.AddProcess(ctx, c.ID, name, p, ec.InitializeStdio)
-	if err != nil {
-		return err
-	}
-	ec.Lock()
-	ec.Pid = systemPid
-	ec.Unlock()
-
-	select {
-	case <-ctx.Done():
-		logrus.Debugf("Sending TERM signal to process %v in container %v", name, c.ID)
-		d.containerd.SignalProcess(c.ID, name, int(signal.SignalMap["TERM"]))
-		select {
-		case <-time.After(termProcessTimeout * time.Second):
-			logrus.Infof("Container %v, process %v failed to exit within %d seconds of signal TERM - using the force", c.ID, name, termProcessTimeout)
-			d.containerd.SignalProcess(c.ID, name, int(signal.SignalMap["KILL"]))
-		case <-attachErr:
-			// TERM signal worked
-		}
-		return fmt.Errorf("context cancelled")
-	case err := <-attachErr:
-		if err != nil {
-			if _, ok := err.(container.DetachError); !ok {
-				return fmt.Errorf("exec attach failed with error: %v", err)
-			}
-			d.LogContainerEvent(c, "exec_detach")
-		}
-	}
-	return nil
-}
-
-// execCommandGC runs a ticker to clean up the daemon references
-// of exec configs that are no longer part of the container.
-func (d *Daemon) execCommandGC() {
-	for range time.Tick(5 * time.Minute) {
-		var (
-			cleaned          int
-			liveExecCommands = d.containerExecIds()
-		)
-		for id, config := range d.execCommands.Commands() {
-			if config.CanRemove {
-				cleaned++
-				d.execCommands.Delete(id)
-			} else {
-				if _, exists := liveExecCommands[id]; !exists {
-					config.CanRemove = true
-				}
-			}
-		}
-		if cleaned > 0 {
-			logrus.Debugf("clean %d unused exec commands", cleaned)
-		}
-	}
-}
-
-// containerExecIds returns a list of all the current exec ids that are in use
-// and running inside a container.
-func (d *Daemon) containerExecIds() map[string]struct{} {
-	ids := map[string]struct{}{}
-	for _, c := range d.containers.List() {
-		for _, id := range c.ExecCommands.List() {
-			ids[id] = struct{}{}
-		}
-	}
-	return ids
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/exec/exec.go b/installer/vendor/github.com/docker/docker/daemon/exec/exec.go
deleted file mode 100644
index 933136f965..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/exec/exec.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package exec
-
-import (
-	"runtime"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container/stream"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-// Config holds the configurations for execs. The Daemon keeps
-// track of both running and finished execs so that they can be
-// examined both during and after completion.
-type Config struct {
-	sync.Mutex
-	StreamConfig *stream.Config
-	ID           string
-	Running      bool
-	ExitCode     *int
-	OpenStdin    bool
-	OpenStderr   bool
-	OpenStdout   bool
-	CanRemove    bool
-	ContainerID  string
-	DetachKeys   []byte
-	Entrypoint   string
-	Args         []string
-	Tty          bool
-	Privileged   bool
-	User         string
-	Env          []string
-	Pid          int
-}
-
-// NewConfig initializes the a new exec configuration
-func NewConfig() *Config {
-	return &Config{
-		ID:           stringid.GenerateNonCryptoID(),
-		StreamConfig: stream.NewConfig(),
-	}
-}
-
-// InitializeStdio is called by libcontainerd to connect the stdio.
-func (c *Config) InitializeStdio(iop libcontainerd.IOPipe) error {
-	c.StreamConfig.CopyToPipe(iop)
-
-	if c.StreamConfig.Stdin() == nil && !c.Tty && runtime.GOOS == "windows" {
-		if iop.Stdin != nil {
-			if err := iop.Stdin.Close(); err != nil {
-				logrus.Errorf("error closing exec stdin: %+v", err)
-			}
-		}
-	}
-
-	return nil
-}
-
-// CloseStreams closes the stdio streams for the exec
-func (c *Config) CloseStreams() error {
-	return c.StreamConfig.CloseStreams()
-}
-
-// Store keeps track of the exec configurations.
-type Store struct {
-	commands map[string]*Config
-	sync.RWMutex
-}
-
-// NewStore initializes a new exec store.
-func NewStore() *Store {
-	return &Store{commands: make(map[string]*Config, 0)}
-}
-
-// Commands returns the exec configurations in the store.
-func (e *Store) Commands() map[string]*Config {
-	e.RLock()
-	commands := make(map[string]*Config, len(e.commands))
-	for id, config := range e.commands {
-		commands[id] = config
-	}
-	e.RUnlock()
-	return commands
-}
-
-// Add adds a new exec configuration to the store.
-func (e *Store) Add(id string, Config *Config) {
-	e.Lock()
-	e.commands[id] = Config
-	e.Unlock()
-}
-
-// Get returns an exec configuration by its id.
-func (e *Store) Get(id string) *Config {
-	e.RLock()
-	res := e.commands[id]
-	e.RUnlock()
-	return res
-}
-
-// Delete removes an exec configuration from the store.
-func (e *Store) Delete(id string) {
-	e.Lock()
-	delete(e.commands, id)
-	e.Unlock()
-}
-
-// List returns the list of exec ids in the store.
-func (e *Store) List() []string {
-	var IDs []string
-	e.RLock()
-	for id := range e.commands {
-		IDs = append(IDs, id)
-	}
-	e.RUnlock()
-	return IDs
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/exec_linux.go b/installer/vendor/github.com/docker/docker/daemon/exec_linux.go
deleted file mode 100644
index 5aeedc3470..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/exec_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/caps"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainerd.Process) error {
-	if len(ec.User) > 0 {
-		uid, gid, additionalGids, err := getUser(c, ec.User)
-		if err != nil {
-			return err
-		}
-		p.User = &specs.User{
-			UID:            uid,
-			GID:            gid,
-			AdditionalGids: additionalGids,
-		}
-	}
-	if ec.Privileged {
-		p.Capabilities = caps.GetAllCapabilities()
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/exec_solaris.go b/installer/vendor/github.com/docker/docker/daemon/exec_solaris.go
deleted file mode 100644
index 7003355d91..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/exec_solaris.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainerd.Process) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/exec_windows.go b/installer/vendor/github.com/docker/docker/daemon/exec_windows.go
deleted file mode 100644
index 1d6974cda9..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/exec_windows.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func execSetPlatformOpt(c *container.Container, ec *exec.Config, p *libcontainerd.Process) error {
-	// Process arguments need to be escaped before sending to OCI.
-	p.Args = escapeArgs(p.Args)
-	p.User.Username = ec.User
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/export.go b/installer/vendor/github.com/docker/docker/daemon/export.go
deleted file mode 100644
index 5ef6dbb0e5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/export.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io"
-	"runtime"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-// ContainerExport writes the contents of the container to the given
-// writer. An error is returned if the container cannot be found.
-func (daemon *Daemon) ContainerExport(name string, out io.Writer) error {
-	if runtime.GOOS == "windows" {
-		return fmt.Errorf("the daemon on this platform does not support export of a container")
-	}
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	data, err := daemon.containerExport(container)
-	if err != nil {
-		return fmt.Errorf("Error exporting container %s: %v", name, err)
-	}
-	defer data.Close()
-
-	// Stream the entire contents of the container (basically a volatile snapshot)
-	if _, err := io.Copy(out, data); err != nil {
-		return fmt.Errorf("Error exporting container %s: %v", name, err)
-	}
-	return nil
-}
-
-func (daemon *Daemon) containerExport(container *container.Container) (io.ReadCloser, error) {
-	if err := daemon.Mount(container); err != nil {
-		return nil, err
-	}
-
-	uidMaps, gidMaps := daemon.GetUIDGIDMaps()
-	archive, err := archive.TarWithOptions(container.BaseFS, &archive.TarOptions{
-		Compression: archive.Uncompressed,
-		UIDMaps:     uidMaps,
-		GIDMaps:     gidMaps,
-	})
-	if err != nil {
-		daemon.Unmount(container)
-		return nil, err
-	}
-	arch := ioutils.NewReadCloserWrapper(archive, func() error {
-		err := archive.Close()
-		daemon.Unmount(container)
-		return err
-	})
-	daemon.LogContainerEvent(container, "export")
-	return arch, err
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/getsize_unix.go b/installer/vendor/github.com/docker/docker/daemon/getsize_unix.go
deleted file mode 100644
index 707323a4bf..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/getsize_unix.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build linux freebsd solaris
-
-package daemon
-
-import (
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-)
-
-// getSize returns the real size & virtual size of the container.
-func (daemon *Daemon) getSize(container *container.Container) (int64, int64) {
-	var (
-		sizeRw, sizeRootfs int64
-		err                error
-	)
-
-	if err := daemon.Mount(container); err != nil {
-		logrus.Errorf("Failed to compute size of container rootfs %s: %s", container.ID, err)
-		return sizeRw, sizeRootfs
-	}
-	defer daemon.Unmount(container)
-
-	sizeRw, err = container.RWLayer.Size()
-	if err != nil {
-		logrus.Errorf("Driver %s couldn't return diff size of container %s: %s",
-			daemon.GraphDriverName(), container.ID, err)
-		// FIXME: GetSize should return an error. Not changing it now in case
-		// there is a side-effect.
-		sizeRw = -1
-	}
-
-	if parent := container.RWLayer.Parent(); parent != nil {
-		sizeRootfs, err = parent.Size()
-		if err != nil {
-			sizeRootfs = -1
-		} else if sizeRw != -1 {
-			sizeRootfs += sizeRw
-		}
-	}
-	return sizeRw, sizeRootfs
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go
deleted file mode 100644
index ec55ea4cde..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs.go
+++ /dev/null
@@ -1,669 +0,0 @@
-// +build linux
-
-/*
-
-aufs driver directory structure
-
-  .
-  ├── layers // Metadata of layers
-  │   ├── 1
-  │   ├── 2
-  │   └── 3
-  ├── diff  // Content of the layer
-  │   ├── 1  // Contains layers that need to be mounted for the id
-  │   ├── 2
-  │   └── 3
-  └── mnt    // Mount points for the rw layers to be mounted
-      ├── 1
-      ├── 2
-      └── 3
-
-*/
-
-package aufs
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/vbatts/tar-split/tar/storage"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/directory"
-	"github.com/docker/docker/pkg/idtools"
-	mountpk "github.com/docker/docker/pkg/mount"
-
-	"github.com/opencontainers/runc/libcontainer/label"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-)
-
-var (
-	// ErrAufsNotSupported is returned if aufs is not supported by the host.
-	ErrAufsNotSupported = fmt.Errorf("AUFS was not found in /proc/filesystems")
-	// ErrAufsNested means aufs cannot be used bc we are in a user namespace
-	ErrAufsNested = fmt.Errorf("AUFS cannot be used in non-init user namespace")
-	backingFs     = "<unknown>"
-
-	enableDirpermLock sync.Once
-	enableDirperm     bool
-)
-
-func init() {
-	graphdriver.Register("aufs", Init)
-}
-
-// Driver contains information about the filesystem mounted.
-type Driver struct {
-	sync.Mutex
-	root          string
-	uidMaps       []idtools.IDMap
-	gidMaps       []idtools.IDMap
-	ctr           *graphdriver.RefCounter
-	pathCacheLock sync.Mutex
-	pathCache     map[string]string
-	naiveDiff     graphdriver.DiffDriver
-}
-
-// Init returns a new AUFS driver.
-// An error is returned if AUFS is not supported.
-func Init(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-
-	// Try to load the aufs kernel module
-	if err := supportsAufs(); err != nil {
-		return nil, graphdriver.ErrNotSupported
-	}
-
-	fsMagic, err := graphdriver.GetFSMagic(root)
-	if err != nil {
-		return nil, err
-	}
-	if fsName, ok := graphdriver.FsNames[fsMagic]; ok {
-		backingFs = fsName
-	}
-
-	switch fsMagic {
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicEcryptfs:
-		logrus.Errorf("AUFS is not supported over %s", backingFs)
-		return nil, graphdriver.ErrIncompatibleFS
-	}
-
-	paths := []string{
-		"mnt",
-		"diff",
-		"layers",
-	}
-
-	a := &Driver{
-		root:      root,
-		uidMaps:   uidMaps,
-		gidMaps:   gidMaps,
-		pathCache: make(map[string]string),
-		ctr:       graphdriver.NewRefCounter(graphdriver.NewFsChecker(graphdriver.FsMagicAufs)),
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	// Create the root aufs driver dir and return
-	// if it already exists
-	// If not populate the dir structure
-	if err := idtools.MkdirAllAs(root, 0700, rootUID, rootGID); err != nil {
-		if os.IsExist(err) {
-			return a, nil
-		}
-		return nil, err
-	}
-
-	if err := mountpk.MakePrivate(root); err != nil {
-		return nil, err
-	}
-
-	// Populate the dir structure
-	for _, p := range paths {
-		if err := idtools.MkdirAllAs(path.Join(root, p), 0700, rootUID, rootGID); err != nil {
-			return nil, err
-		}
-	}
-
-	a.naiveDiff = graphdriver.NewNaiveDiffDriver(a, uidMaps, gidMaps)
-	return a, nil
-}
-
-// Return a nil error if the kernel supports aufs
-// We cannot modprobe because inside dind modprobe fails
-// to run
-func supportsAufs() error {
-	// We can try to modprobe aufs first before looking at
-	// proc/filesystems for when aufs is supported
-	exec.Command("modprobe", "aufs").Run()
-
-	if rsystem.RunningInUserNS() {
-		return ErrAufsNested
-	}
-
-	f, err := os.Open("/proc/filesystems")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		if strings.Contains(s.Text(), "aufs") {
-			return nil
-		}
-	}
-	return ErrAufsNotSupported
-}
-
-func (a *Driver) rootPath() string {
-	return a.root
-}
-
-func (*Driver) String() string {
-	return "aufs"
-}
-
-// Status returns current information about the filesystem such as root directory, number of directories mounted, etc.
-func (a *Driver) Status() [][2]string {
-	ids, _ := loadIds(path.Join(a.rootPath(), "layers"))
-	return [][2]string{
-		{"Root Dir", a.rootPath()},
-		{"Backing Filesystem", backingFs},
-		{"Dirs", fmt.Sprintf("%d", len(ids))},
-		{"Dirperm1 Supported", fmt.Sprintf("%v", useDirperm())},
-	}
-}
-
-// GetMetadata not implemented
-func (a *Driver) GetMetadata(id string) (map[string]string, error) {
-	return nil, nil
-}
-
-// Exists returns true if the given id is registered with
-// this driver
-func (a *Driver) Exists(id string) bool {
-	if _, err := os.Lstat(path.Join(a.rootPath(), "layers", id)); err != nil {
-		return false
-	}
-	return true
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (a *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return a.Create(id, parent, opts)
-}
-
-// Create three folders for each id
-// mnt, layers, and diff
-func (a *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-
-	if opts != nil && len(opts.StorageOpt) != 0 {
-		return fmt.Errorf("--storage-opt is not supported for aufs")
-	}
-
-	if err := a.createDirsFor(id); err != nil {
-		return err
-	}
-	// Write the layers metadata
-	f, err := os.Create(path.Join(a.rootPath(), "layers", id))
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	if parent != "" {
-		ids, err := getParentIDs(a.rootPath(), parent)
-		if err != nil {
-			return err
-		}
-
-		if _, err := fmt.Fprintln(f, parent); err != nil {
-			return err
-		}
-		for _, i := range ids {
-			if _, err := fmt.Fprintln(f, i); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// createDirsFor creates two directories for the given id.
-// mnt and diff
-func (a *Driver) createDirsFor(id string) error {
-	paths := []string{
-		"mnt",
-		"diff",
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(a.uidMaps, a.gidMaps)
-	if err != nil {
-		return err
-	}
-	// Directory permission is 0755.
-	// The path of directories are <aufs_root_path>/mnt/<image_id>
-	// and <aufs_root_path>/diff/<image_id>
-	for _, p := range paths {
-		if err := idtools.MkdirAllAs(path.Join(a.rootPath(), p, id), 0755, rootUID, rootGID); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Helper function to debug EBUSY errors on remove.
-func debugEBusy(mountPath string) (out []string, err error) {
-	// lsof is not part of GNU coreutils. This is a best effort
-	// attempt to detect offending processes.
-	c := exec.Command("lsof")
-
-	r, err := c.StdoutPipe()
-	if err != nil {
-		return nil, fmt.Errorf("Assigning pipes failed with %v", err)
-	}
-
-	if err := c.Start(); err != nil {
-		return nil, fmt.Errorf("Starting %s failed with %v", c.Path, err)
-	}
-
-	defer func() {
-		waiterr := c.Wait()
-		if waiterr != nil && err == nil {
-			err = fmt.Errorf("Waiting for %s failed with %v", c.Path, waiterr)
-		}
-	}()
-
-	sc := bufio.NewScanner(r)
-	for sc.Scan() {
-		entry := sc.Text()
-		if strings.Contains(entry, mountPath) {
-			out = append(out, entry, "\n")
-		}
-	}
-
-	return out, nil
-}
-
-// Remove will unmount and remove the given id.
-func (a *Driver) Remove(id string) error {
-	a.pathCacheLock.Lock()
-	mountpoint, exists := a.pathCache[id]
-	a.pathCacheLock.Unlock()
-	if !exists {
-		mountpoint = a.getMountpoint(id)
-	}
-
-	var retries int
-	for {
-		mounted, err := a.mounted(mountpoint)
-		if err != nil {
-			return err
-		}
-		if !mounted {
-			break
-		}
-
-		if err := a.unmount(mountpoint); err != nil {
-			if err != syscall.EBUSY {
-				return fmt.Errorf("aufs: unmount error: %s: %v", mountpoint, err)
-			}
-			if retries >= 5 {
-				out, debugErr := debugEBusy(mountpoint)
-				if debugErr == nil {
-					logrus.Warnf("debugEBusy returned %v", out)
-				}
-				return fmt.Errorf("aufs: unmount error after retries: %s: %v", mountpoint, err)
-			}
-			// If unmount returns EBUSY, it could be a transient error. Sleep and retry.
-			retries++
-			logrus.Warnf("unmount failed due to EBUSY: retry count: %d", retries)
-			time.Sleep(100 * time.Millisecond)
-			continue
-		}
-		break
-	}
-
-	// Atomically remove each directory in turn by first moving it out of the
-	// way (so that docker doesn't find it anymore) before doing removal of
-	// the whole tree.
-	tmpMntPath := path.Join(a.mntPath(), fmt.Sprintf("%s-removing", id))
-	if err := os.Rename(mountpoint, tmpMntPath); err != nil && !os.IsNotExist(err) {
-		if err == syscall.EBUSY {
-			logrus.Warn("os.Rename err due to EBUSY")
-			out, debugErr := debugEBusy(mountpoint)
-			if debugErr == nil {
-				logrus.Warnf("debugEBusy returned %v", out)
-			}
-		}
-		return err
-	}
-	defer os.RemoveAll(tmpMntPath)
-
-	tmpDiffpath := path.Join(a.diffPath(), fmt.Sprintf("%s-removing", id))
-	if err := os.Rename(a.getDiffPath(id), tmpDiffpath); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	defer os.RemoveAll(tmpDiffpath)
-
-	// Remove the layers file for the id
-	if err := os.Remove(path.Join(a.rootPath(), "layers", id)); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	a.pathCacheLock.Lock()
-	delete(a.pathCache, id)
-	a.pathCacheLock.Unlock()
-	return nil
-}
-
-// Get returns the rootfs path for the id.
-// This will mount the dir at its given path
-func (a *Driver) Get(id, mountLabel string) (string, error) {
-	parents, err := a.getParentLayerPaths(id)
-	if err != nil && !os.IsNotExist(err) {
-		return "", err
-	}
-
-	a.pathCacheLock.Lock()
-	m, exists := a.pathCache[id]
-	a.pathCacheLock.Unlock()
-
-	if !exists {
-		m = a.getDiffPath(id)
-		if len(parents) > 0 {
-			m = a.getMountpoint(id)
-		}
-	}
-	if count := a.ctr.Increment(m); count > 1 {
-		return m, nil
-	}
-
-	// If a dir does not have a parent ( no layers )do not try to mount
-	// just return the diff path to the data
-	if len(parents) > 0 {
-		if err := a.mount(id, m, mountLabel, parents); err != nil {
-			return "", err
-		}
-	}
-
-	a.pathCacheLock.Lock()
-	a.pathCache[id] = m
-	a.pathCacheLock.Unlock()
-	return m, nil
-}
-
-// Put unmounts and updates list of active mounts.
-func (a *Driver) Put(id string) error {
-	a.pathCacheLock.Lock()
-	m, exists := a.pathCache[id]
-	if !exists {
-		m = a.getMountpoint(id)
-		a.pathCache[id] = m
-	}
-	a.pathCacheLock.Unlock()
-	if count := a.ctr.Decrement(m); count > 0 {
-		return nil
-	}
-
-	err := a.unmount(m)
-	if err != nil {
-		logrus.Debugf("Failed to unmount %s aufs: %v", id, err)
-	}
-	return err
-}
-
-// isParent returns if the passed in parent is the direct parent of the passed in layer
-func (a *Driver) isParent(id, parent string) bool {
-	parents, _ := getParentIDs(a.rootPath(), id)
-	if parent == "" && len(parents) > 0 {
-		return false
-	}
-	return !(len(parents) > 0 && parent != parents[0])
-}
-
-// Diff produces an archive of the changes between the specified
-// layer and its parent layer which may be "".
-func (a *Driver) Diff(id, parent string) (io.ReadCloser, error) {
-	if !a.isParent(id, parent) {
-		return a.naiveDiff.Diff(id, parent)
-	}
-
-	// AUFS doesn't need the parent layer to produce a diff.
-	return archive.TarWithOptions(path.Join(a.rootPath(), "diff", id), &archive.TarOptions{
-		Compression:     archive.Uncompressed,
-		ExcludePatterns: []string{archive.WhiteoutMetaPrefix + "*", "!" + archive.WhiteoutOpaqueDir},
-		UIDMaps:         a.uidMaps,
-		GIDMaps:         a.gidMaps,
-	})
-}
-
-type fileGetNilCloser struct {
-	storage.FileGetter
-}
-
-func (f fileGetNilCloser) Close() error {
-	return nil
-}
-
-// DiffGetter returns a FileGetCloser that can read files from the directory that
-// contains files for the layer differences. Used for direct access for tar-split.
-func (a *Driver) DiffGetter(id string) (graphdriver.FileGetCloser, error) {
-	p := path.Join(a.rootPath(), "diff", id)
-	return fileGetNilCloser{storage.NewPathFileGetter(p)}, nil
-}
-
-func (a *Driver) applyDiff(id string, diff io.Reader) error {
-	return chrootarchive.UntarUncompressed(diff, path.Join(a.rootPath(), "diff", id), &archive.TarOptions{
-		UIDMaps: a.uidMaps,
-		GIDMaps: a.gidMaps,
-	})
-}
-
-// DiffSize calculates the changes between the specified id
-// and its parent and returns the size in bytes of the changes
-// relative to its base filesystem directory.
-func (a *Driver) DiffSize(id, parent string) (size int64, err error) {
-	if !a.isParent(id, parent) {
-		return a.naiveDiff.DiffSize(id, parent)
-	}
-	// AUFS doesn't need the parent layer to calculate the diff size.
-	return directory.Size(path.Join(a.rootPath(), "diff", id))
-}
-
-// ApplyDiff extracts the changeset from the given diff into the
-// layer with the specified id and parent, returning the size of the
-// new layer in bytes.
-func (a *Driver) ApplyDiff(id, parent string, diff io.Reader) (size int64, err error) {
-	if !a.isParent(id, parent) {
-		return a.naiveDiff.ApplyDiff(id, parent, diff)
-	}
-
-	// AUFS doesn't need the parent id to apply the diff if it is the direct parent.
-	if err = a.applyDiff(id, diff); err != nil {
-		return
-	}
-
-	return a.DiffSize(id, parent)
-}
-
-// Changes produces a list of changes between the specified layer
-// and its parent layer. If parent is "", then all changes will be ADD changes.
-func (a *Driver) Changes(id, parent string) ([]archive.Change, error) {
-	if !a.isParent(id, parent) {
-		return a.naiveDiff.Changes(id, parent)
-	}
-
-	// AUFS doesn't have snapshots, so we need to get changes from all parent
-	// layers.
-	layers, err := a.getParentLayerPaths(id)
-	if err != nil {
-		return nil, err
-	}
-	return archive.Changes(layers, path.Join(a.rootPath(), "diff", id))
-}
-
-func (a *Driver) getParentLayerPaths(id string) ([]string, error) {
-	parentIds, err := getParentIDs(a.rootPath(), id)
-	if err != nil {
-		return nil, err
-	}
-	layers := make([]string, len(parentIds))
-
-	// Get the diff paths for all the parent ids
-	for i, p := range parentIds {
-		layers[i] = path.Join(a.rootPath(), "diff", p)
-	}
-	return layers, nil
-}
-
-func (a *Driver) mount(id string, target string, mountLabel string, layers []string) error {
-	a.Lock()
-	defer a.Unlock()
-
-	// If the id is mounted or we get an error return
-	if mounted, err := a.mounted(target); err != nil || mounted {
-		return err
-	}
-
-	rw := a.getDiffPath(id)
-
-	if err := a.aufsMount(layers, rw, target, mountLabel); err != nil {
-		return fmt.Errorf("error creating aufs mount to %s: %v", target, err)
-	}
-	return nil
-}
-
-func (a *Driver) unmount(mountPath string) error {
-	a.Lock()
-	defer a.Unlock()
-
-	if mounted, err := a.mounted(mountPath); err != nil || !mounted {
-		return err
-	}
-	if err := Unmount(mountPath); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (a *Driver) mounted(mountpoint string) (bool, error) {
-	return graphdriver.Mounted(graphdriver.FsMagicAufs, mountpoint)
-}
-
-// Cleanup aufs and unmount all mountpoints
-func (a *Driver) Cleanup() error {
-	var dirs []string
-	if err := filepath.Walk(a.mntPath(), func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() {
-			return nil
-		}
-		dirs = append(dirs, path)
-		return nil
-	}); err != nil {
-		return err
-	}
-
-	for _, m := range dirs {
-		if err := a.unmount(m); err != nil {
-			logrus.Debugf("aufs error unmounting %s: %s", m, err)
-		}
-	}
-	return mountpk.Unmount(a.root)
-}
-
-func (a *Driver) aufsMount(ro []string, rw, target, mountLabel string) (err error) {
-	defer func() {
-		if err != nil {
-			Unmount(target)
-		}
-	}()
-
-	// Mount options are clipped to page size(4096 bytes). If there are more
-	// layers then these are remounted individually using append.
-
-	offset := 54
-	if useDirperm() {
-		offset += len("dirperm1")
-	}
-	b := make([]byte, syscall.Getpagesize()-len(mountLabel)-offset) // room for xino & mountLabel
-	bp := copy(b, fmt.Sprintf("br:%s=rw", rw))
-
-	index := 0
-	for ; index < len(ro); index++ {
-		layer := fmt.Sprintf(":%s=ro+wh", ro[index])
-		if bp+len(layer) > len(b) {
-			break
-		}
-		bp += copy(b[bp:], layer)
-	}
-
-	opts := "dio,xino=/dev/shm/aufs.xino"
-	if useDirperm() {
-		opts += ",dirperm1"
-	}
-	data := label.FormatMountLabel(fmt.Sprintf("%s,%s", string(b[:bp]), opts), mountLabel)
-	if err = mount("none", target, "aufs", 0, data); err != nil {
-		return
-	}
-
-	for ; index < len(ro); index++ {
-		layer := fmt.Sprintf(":%s=ro+wh", ro[index])
-		data := label.FormatMountLabel(fmt.Sprintf("append%s", layer), mountLabel)
-		if err = mount("none", target, "aufs", syscall.MS_REMOUNT, data); err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-// useDirperm checks dirperm1 mount option can be used with the current
-// version of aufs.
-func useDirperm() bool {
-	enableDirpermLock.Do(func() {
-		base, err := ioutil.TempDir("", "docker-aufs-base")
-		if err != nil {
-			logrus.Errorf("error checking dirperm1: %v", err)
-			return
-		}
-		defer os.RemoveAll(base)
-
-		union, err := ioutil.TempDir("", "docker-aufs-union")
-		if err != nil {
-			logrus.Errorf("error checking dirperm1: %v", err)
-			return
-		}
-		defer os.RemoveAll(union)
-
-		opts := fmt.Sprintf("br:%s,dirperm1,xino=/dev/shm/aufs.xino", base)
-		if err := mount("none", union, "aufs", 0, opts); err != nil {
-			return
-		}
-		enableDirperm = true
-		if err := Unmount(union); err != nil {
-			logrus.Errorf("error checking dirperm1: failed to unmount %v", err)
-		}
-	})
-	return enableDirperm
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go
deleted file mode 100644
index dc3c6a392b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/aufs_test.go
+++ /dev/null
@@ -1,802 +0,0 @@
-// +build linux
-
-package aufs
-
-import (
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"sync"
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-var (
-	tmpOuter = path.Join(os.TempDir(), "aufs-tests")
-	tmp      = path.Join(tmpOuter, "aufs")
-)
-
-func init() {
-	reexec.Init()
-}
-
-func testInit(dir string, t testing.TB) graphdriver.Driver {
-	d, err := Init(dir, nil, nil, nil)
-	if err != nil {
-		if err == graphdriver.ErrNotSupported {
-			t.Skip(err)
-		} else {
-			t.Fatal(err)
-		}
-	}
-	return d
-}
-
-func newDriver(t testing.TB) *Driver {
-	if err := os.MkdirAll(tmp, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	d := testInit(tmp, t)
-	return d.(*Driver)
-}
-
-func TestNewDriver(t *testing.T) {
-	if err := os.MkdirAll(tmp, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	d := testInit(tmp, t)
-	defer os.RemoveAll(tmp)
-	if d == nil {
-		t.Fatalf("Driver should not be nil")
-	}
-}
-
-func TestAufsString(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if d.String() != "aufs" {
-		t.Fatalf("Expected aufs got %s", d.String())
-	}
-}
-
-func TestCreateDirStructure(t *testing.T) {
-	newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	paths := []string{
-		"mnt",
-		"layers",
-		"diff",
-	}
-
-	for _, p := range paths {
-		if _, err := os.Stat(path.Join(tmp, p)); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-// We should be able to create two drivers with the same dir structure
-func TestNewDriverFromExistingDir(t *testing.T) {
-	if err := os.MkdirAll(tmp, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	testInit(tmp, t)
-	testInit(tmp, t)
-	os.RemoveAll(tmp)
-}
-
-func TestCreateNewDir(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCreateNewDirStructure(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	paths := []string{
-		"mnt",
-		"diff",
-		"layers",
-	}
-
-	for _, p := range paths {
-		if _, err := os.Stat(path.Join(tmp, p, "1")); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestRemoveImage(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.Remove("1"); err != nil {
-		t.Fatal(err)
-	}
-
-	paths := []string{
-		"mnt",
-		"diff",
-		"layers",
-	}
-
-	for _, p := range paths {
-		if _, err := os.Stat(path.Join(tmp, p, "1")); err == nil {
-			t.Fatalf("Error should not be nil because dirs with id 1 should be delted: %s", p)
-		}
-	}
-}
-
-func TestGetWithoutParent(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffPath, err := d.Get("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := path.Join(tmp, "diff", "1")
-	if diffPath != expected {
-		t.Fatalf("Expected path %s got %s", expected, diffPath)
-	}
-}
-
-func TestCleanupWithNoDirs(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Cleanup(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCleanupWithDir(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.Cleanup(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestMountedFalseResponse(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	response, err := d.mounted(d.getDiffPath("1"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if response != false {
-		t.Fatalf("Response if dir id 1 is mounted should be false")
-	}
-}
-
-func TestMountedTrueReponse(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.Create("2", "1", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err := d.Get("2", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	response, err := d.mounted(d.pathCache["2"])
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if response != true {
-		t.Fatalf("Response if dir id 2 is mounted should be true")
-	}
-}
-
-func TestMountWithParent(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.Create("2", "1", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := d.Cleanup(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	mntPath, err := d.Get("2", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if mntPath == "" {
-		t.Fatal("mntPath should not be empty string")
-	}
-
-	expected := path.Join(tmp, "mnt", "2")
-	if mntPath != expected {
-		t.Fatalf("Expected %s got %s", expected, mntPath)
-	}
-}
-
-func TestRemoveMountedDir(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.Create("2", "1", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := d.Cleanup(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	mntPath, err := d.Get("2", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if mntPath == "" {
-		t.Fatal("mntPath should not be empty string")
-	}
-
-	mounted, err := d.mounted(d.pathCache["2"])
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !mounted {
-		t.Fatalf("Dir id 2 should be mounted")
-	}
-
-	if err := d.Remove("2"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCreateWithInvalidParent(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "docker", nil); err == nil {
-		t.Fatalf("Error should not be nil with parent does not exist")
-	}
-}
-
-func TestGetDiff(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.CreateReadWrite("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffPath, err := d.Get("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a file to the diff path with a fixed size
-	size := int64(1024)
-
-	f, err := os.Create(path.Join(diffPath, "test_file"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Truncate(size); err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	a, err := d.Diff("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a == nil {
-		t.Fatalf("Archive should not be nil")
-	}
-}
-
-func TestChanges(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.CreateReadWrite("2", "1", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := d.Cleanup(); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	mntPoint, err := d.Get("2", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a file to save in the mountpoint
-	f, err := os.Create(path.Join(mntPoint, "test.txt"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := f.WriteString("testline"); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := d.Changes("2", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(changes) != 1 {
-		t.Fatalf("Dir 2 should have one change from parent got %d", len(changes))
-	}
-	change := changes[0]
-
-	expectedPath := "/test.txt"
-	if change.Path != expectedPath {
-		t.Fatalf("Expected path %s got %s", expectedPath, change.Path)
-	}
-
-	if change.Kind != archive.ChangeAdd {
-		t.Fatalf("Change kind should be ChangeAdd got %s", change.Kind)
-	}
-
-	if err := d.CreateReadWrite("3", "2", nil); err != nil {
-		t.Fatal(err)
-	}
-	mntPoint, err = d.Get("3", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a file to save in the mountpoint
-	f, err = os.Create(path.Join(mntPoint, "test2.txt"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := f.WriteString("testline"); err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err = d.Changes("3", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(changes) != 1 {
-		t.Fatalf("Dir 2 should have one change from parent got %d", len(changes))
-	}
-	change = changes[0]
-
-	expectedPath = "/test2.txt"
-	if change.Path != expectedPath {
-		t.Fatalf("Expected path %s got %s", expectedPath, change.Path)
-	}
-
-	if change.Kind != archive.ChangeAdd {
-		t.Fatalf("Change kind should be ChangeAdd got %s", change.Kind)
-	}
-}
-
-func TestDiffSize(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-
-	if err := d.CreateReadWrite("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffPath, err := d.Get("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a file to the diff path with a fixed size
-	size := int64(1024)
-
-	f, err := os.Create(path.Join(diffPath, "test_file"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Truncate(size); err != nil {
-		t.Fatal(err)
-	}
-	s, err := f.Stat()
-	if err != nil {
-		t.Fatal(err)
-	}
-	size = s.Size()
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	diffSize, err := d.DiffSize("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if diffSize != size {
-		t.Fatalf("Expected size to be %d got %d", size, diffSize)
-	}
-}
-
-func TestChildDiffSize(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	if err := d.CreateReadWrite("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffPath, err := d.Get("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a file to the diff path with a fixed size
-	size := int64(1024)
-
-	f, err := os.Create(path.Join(diffPath, "test_file"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Truncate(size); err != nil {
-		t.Fatal(err)
-	}
-	s, err := f.Stat()
-	if err != nil {
-		t.Fatal(err)
-	}
-	size = s.Size()
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	diffSize, err := d.DiffSize("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if diffSize != size {
-		t.Fatalf("Expected size to be %d got %d", size, diffSize)
-	}
-
-	if err := d.Create("2", "1", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffSize, err = d.DiffSize("2", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	// The diff size for the child should be zero
-	if diffSize != 0 {
-		t.Fatalf("Expected size to be %d got %d", 0, diffSize)
-	}
-}
-
-func TestExists(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if d.Exists("none") {
-		t.Fatal("id none should not exist in the driver")
-	}
-
-	if !d.Exists("1") {
-		t.Fatal("id 1 should exist in the driver")
-	}
-}
-
-func TestStatus(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	if err := d.Create("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	status := d.Status()
-	if status == nil || len(status) == 0 {
-		t.Fatal("Status should not be nil or empty")
-	}
-	rootDir := status[0]
-	dirs := status[2]
-	if rootDir[0] != "Root Dir" {
-		t.Fatalf("Expected Root Dir got %s", rootDir[0])
-	}
-	if rootDir[1] != d.rootPath() {
-		t.Fatalf("Expected %s got %s", d.rootPath(), rootDir[1])
-	}
-	if dirs[0] != "Dirs" {
-		t.Fatalf("Expected Dirs got %s", dirs[0])
-	}
-	if dirs[1] != "1" {
-		t.Fatalf("Expected 1 got %s", dirs[1])
-	}
-}
-
-func TestApplyDiff(t *testing.T) {
-	d := newDriver(t)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	if err := d.CreateReadWrite("1", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	diffPath, err := d.Get("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a file to the diff path with a fixed size
-	size := int64(1024)
-
-	f, err := os.Create(path.Join(diffPath, "test_file"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Truncate(size); err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	diff, err := d.Diff("1", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.Create("2", "", nil); err != nil {
-		t.Fatal(err)
-	}
-	if err := d.Create("3", "2", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.applyDiff("3", diff); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure that the file is in the mount point for id 3
-
-	mountPoint, err := d.Get("3", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := os.Stat(path.Join(mountPoint, "test_file")); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func hash(c string) string {
-	h := sha256.New()
-	fmt.Fprint(h, c)
-	return hex.EncodeToString(h.Sum(nil))
-}
-
-func testMountMoreThan42Layers(t *testing.T, mountPath string) {
-	if err := os.MkdirAll(mountPath, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	defer os.RemoveAll(mountPath)
-	d := testInit(mountPath, t).(*Driver)
-	defer d.Cleanup()
-	var last string
-	var expected int
-
-	for i := 1; i < 127; i++ {
-		expected++
-		var (
-			parent  = fmt.Sprintf("%d", i-1)
-			current = fmt.Sprintf("%d", i)
-		)
-
-		if parent == "0" {
-			parent = ""
-		} else {
-			parent = hash(parent)
-		}
-		current = hash(current)
-
-		if err := d.CreateReadWrite(current, parent, nil); err != nil {
-			t.Logf("Current layer %d", i)
-			t.Error(err)
-		}
-		point, err := d.Get(current, "")
-		if err != nil {
-			t.Logf("Current layer %d", i)
-			t.Error(err)
-		}
-		f, err := os.Create(path.Join(point, current))
-		if err != nil {
-			t.Logf("Current layer %d", i)
-			t.Error(err)
-		}
-		f.Close()
-
-		if i%10 == 0 {
-			if err := os.Remove(path.Join(point, parent)); err != nil {
-				t.Logf("Current layer %d", i)
-				t.Error(err)
-			}
-			expected--
-		}
-		last = current
-	}
-
-	// Perform the actual mount for the top most image
-	point, err := d.Get(last, "")
-	if err != nil {
-		t.Error(err)
-	}
-	files, err := ioutil.ReadDir(point)
-	if err != nil {
-		t.Error(err)
-	}
-	if len(files) != expected {
-		t.Errorf("Expected %d got %d", expected, len(files))
-	}
-}
-
-func TestMountMoreThan42Layers(t *testing.T) {
-	os.RemoveAll(tmpOuter)
-	testMountMoreThan42Layers(t, tmp)
-}
-
-func TestMountMoreThan42LayersMatchingPathLength(t *testing.T) {
-	defer os.RemoveAll(tmpOuter)
-	zeroes := "0"
-	for {
-		// This finds a mount path so that when combined into aufs mount options
-		// 4096 byte boundary would be in between the paths or in permission
-		// section. For '/tmp' it will use '/tmp/aufs-tests/00000000/aufs'
-		mountPath := path.Join(tmpOuter, zeroes, "aufs")
-		pathLength := 77 + len(mountPath)
-
-		if mod := 4095 % pathLength; mod == 0 || mod > pathLength-2 {
-			t.Logf("Using path: %s", mountPath)
-			testMountMoreThan42Layers(t, mountPath)
-			return
-		}
-		zeroes += "0"
-	}
-}
-
-func BenchmarkConcurrentAccess(b *testing.B) {
-	b.StopTimer()
-	b.ResetTimer()
-
-	d := newDriver(b)
-	defer os.RemoveAll(tmp)
-	defer d.Cleanup()
-
-	numConcurent := 256
-	// create a bunch of ids
-	var ids []string
-	for i := 0; i < numConcurent; i++ {
-		ids = append(ids, stringid.GenerateNonCryptoID())
-	}
-
-	if err := d.Create(ids[0], "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := d.Create(ids[1], ids[0], nil); err != nil {
-		b.Fatal(err)
-	}
-
-	parent := ids[1]
-	ids = append(ids[2:])
-
-	chErr := make(chan error, numConcurent)
-	var outerGroup sync.WaitGroup
-	outerGroup.Add(len(ids))
-	b.StartTimer()
-
-	// here's the actual bench
-	for _, id := range ids {
-		go func(id string) {
-			defer outerGroup.Done()
-			if err := d.Create(id, parent, nil); err != nil {
-				b.Logf("Create %s failed", id)
-				chErr <- err
-				return
-			}
-			var innerGroup sync.WaitGroup
-			for i := 0; i < b.N; i++ {
-				innerGroup.Add(1)
-				go func() {
-					d.Get(id, "")
-					d.Put(id)
-					innerGroup.Done()
-				}()
-			}
-			innerGroup.Wait()
-			d.Remove(id)
-		}(id)
-	}
-
-	outerGroup.Wait()
-	b.StopTimer()
-	close(chErr)
-	for err := range chErr {
-		if err != nil {
-			b.Log(err)
-			b.Fail()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/dirs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/dirs.go
deleted file mode 100644
index d2325fc46c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/dirs.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// +build linux
-
-package aufs
-
-import (
-	"bufio"
-	"io/ioutil"
-	"os"
-	"path"
-)
-
-// Return all the directories
-func loadIds(root string) ([]string, error) {
-	dirs, err := ioutil.ReadDir(root)
-	if err != nil {
-		return nil, err
-	}
-	out := []string{}
-	for _, d := range dirs {
-		if !d.IsDir() {
-			out = append(out, d.Name())
-		}
-	}
-	return out, nil
-}
-
-// Read the layers file for the current id and return all the
-// layers represented by new lines in the file
-//
-// If there are no lines in the file then the id has no parent
-// and an empty slice is returned.
-func getParentIDs(root, id string) ([]string, error) {
-	f, err := os.Open(path.Join(root, "layers", id))
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	out := []string{}
-	s := bufio.NewScanner(f)
-
-	for s.Scan() {
-		if t := s.Text(); t != "" {
-			out = append(out, s.Text())
-		}
-	}
-	return out, s.Err()
-}
-
-func (a *Driver) getMountpoint(id string) string {
-	return path.Join(a.mntPath(), id)
-}
-
-func (a *Driver) mntPath() string {
-	return path.Join(a.rootPath(), "mnt")
-}
-
-func (a *Driver) getDiffPath(id string) string {
-	return path.Join(a.diffPath(), id)
-}
-
-func (a *Driver) diffPath() string {
-	return path.Join(a.rootPath(), "diff")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount.go
deleted file mode 100644
index da1e892f44..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build linux
-
-package aufs
-
-import (
-	"os/exec"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// Unmount the target specified.
-func Unmount(target string) error {
-	if err := exec.Command("auplink", target, "flush").Run(); err != nil {
-		logrus.Warnf("Couldn't run auplink before unmount %s: %s", target, err)
-	}
-	if err := syscall.Unmount(target, 0); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_linux.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_linux.go
deleted file mode 100644
index 8062bae420..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_linux.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package aufs
-
-import "syscall"
-
-func mount(source string, target string, fstype string, flags uintptr, data string) error {
-	return syscall.Mount(source, target, fstype, flags, data)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_unsupported.go
deleted file mode 100644
index d030b06637..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/aufs/mount_unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux
-
-package aufs
-
-import "errors"
-
-// MsRemount declared to specify a non-linux system mount.
-const MsRemount = 0
-
-func mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
-	return errors.New("mount is not implemented on this platform")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go
deleted file mode 100644
index 44420f11a7..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs.go
+++ /dev/null
@@ -1,530 +0,0 @@
-// +build linux
-
-package btrfs
-
-/*
-#include <stdlib.h>
-#include <dirent.h>
-#include <btrfs/ioctl.h>
-#include <btrfs/ctree.h>
-
-static void set_name_btrfs_ioctl_vol_args_v2(struct btrfs_ioctl_vol_args_v2* btrfs_struct, const char* value) {
-    snprintf(btrfs_struct->name, BTRFS_SUBVOL_NAME_MAX, "%s", value);
-}
-*/
-import "C"
-
-import (
-	"fmt"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/go-units"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-func init() {
-	graphdriver.Register("btrfs", Init)
-}
-
-var (
-	quotaEnabled  = false
-	userDiskQuota = false
-)
-
-type btrfsOptions struct {
-	minSpace uint64
-	size     uint64
-}
-
-// Init returns a new BTRFS driver.
-// An error is returned if BTRFS is not supported.
-func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-
-	fsMagic, err := graphdriver.GetFSMagic(home)
-	if err != nil {
-		return nil, err
-	}
-
-	if fsMagic != graphdriver.FsMagicBtrfs {
-		return nil, graphdriver.ErrPrerequisites
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	if err := idtools.MkdirAllAs(home, 0700, rootUID, rootGID); err != nil {
-		return nil, err
-	}
-
-	if err := mount.MakePrivate(home); err != nil {
-		return nil, err
-	}
-
-	opt, err := parseOptions(options)
-	if err != nil {
-		return nil, err
-	}
-
-	if userDiskQuota {
-		if err := subvolEnableQuota(home); err != nil {
-			return nil, err
-		}
-		quotaEnabled = true
-	}
-
-	driver := &Driver{
-		home:    home,
-		uidMaps: uidMaps,
-		gidMaps: gidMaps,
-		options: opt,
-	}
-
-	return graphdriver.NewNaiveDiffDriver(driver, uidMaps, gidMaps), nil
-}
-
-func parseOptions(opt []string) (btrfsOptions, error) {
-	var options btrfsOptions
-	for _, option := range opt {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil {
-			return options, err
-		}
-		key = strings.ToLower(key)
-		switch key {
-		case "btrfs.min_space":
-			minSpace, err := units.RAMInBytes(val)
-			if err != nil {
-				return options, err
-			}
-			userDiskQuota = true
-			options.minSpace = uint64(minSpace)
-		default:
-			return options, fmt.Errorf("Unknown option %s", key)
-		}
-	}
-	return options, nil
-}
-
-// Driver contains information about the filesystem mounted.
-type Driver struct {
-	//root of the file system
-	home    string
-	uidMaps []idtools.IDMap
-	gidMaps []idtools.IDMap
-	options btrfsOptions
-}
-
-// String prints the name of the driver (btrfs).
-func (d *Driver) String() string {
-	return "btrfs"
-}
-
-// Status returns current driver information in a two dimensional string array.
-// Output contains "Build Version" and "Library Version" of the btrfs libraries used.
-// Version information can be used to check compatibility with your kernel.
-func (d *Driver) Status() [][2]string {
-	status := [][2]string{}
-	if bv := btrfsBuildVersion(); bv != "-" {
-		status = append(status, [2]string{"Build Version", bv})
-	}
-	if lv := btrfsLibVersion(); lv != -1 {
-		status = append(status, [2]string{"Library Version", fmt.Sprintf("%d", lv)})
-	}
-	return status
-}
-
-// GetMetadata returns empty metadata for this driver.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	return nil, nil
-}
-
-// Cleanup unmounts the home directory.
-func (d *Driver) Cleanup() error {
-	if quotaEnabled {
-		if err := subvolDisableQuota(d.home); err != nil {
-			return err
-		}
-	}
-
-	return mount.Unmount(d.home)
-}
-
-func free(p *C.char) {
-	C.free(unsafe.Pointer(p))
-}
-
-func openDir(path string) (*C.DIR, error) {
-	Cpath := C.CString(path)
-	defer free(Cpath)
-
-	dir := C.opendir(Cpath)
-	if dir == nil {
-		return nil, fmt.Errorf("Can't open dir")
-	}
-	return dir, nil
-}
-
-func closeDir(dir *C.DIR) {
-	if dir != nil {
-		C.closedir(dir)
-	}
-}
-
-func getDirFd(dir *C.DIR) uintptr {
-	return uintptr(C.dirfd(dir))
-}
-
-func subvolCreate(path, name string) error {
-	dir, err := openDir(path)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var args C.struct_btrfs_ioctl_vol_args
-	for i, c := range []byte(name) {
-		args.name[i] = C.char(c)
-	}
-
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_SUBVOL_CREATE,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to create btrfs subvolume: %v", errno.Error())
-	}
-	return nil
-}
-
-func subvolSnapshot(src, dest, name string) error {
-	srcDir, err := openDir(src)
-	if err != nil {
-		return err
-	}
-	defer closeDir(srcDir)
-
-	destDir, err := openDir(dest)
-	if err != nil {
-		return err
-	}
-	defer closeDir(destDir)
-
-	var args C.struct_btrfs_ioctl_vol_args_v2
-	args.fd = C.__s64(getDirFd(srcDir))
-
-	var cs = C.CString(name)
-	C.set_name_btrfs_ioctl_vol_args_v2(&args, cs)
-	C.free(unsafe.Pointer(cs))
-
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(destDir), C.BTRFS_IOC_SNAP_CREATE_V2,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to create btrfs snapshot: %v", errno.Error())
-	}
-	return nil
-}
-
-func isSubvolume(p string) (bool, error) {
-	var bufStat syscall.Stat_t
-	if err := syscall.Lstat(p, &bufStat); err != nil {
-		return false, err
-	}
-
-	// return true if it is a btrfs subvolume
-	return bufStat.Ino == C.BTRFS_FIRST_FREE_OBJECTID, nil
-}
-
-func subvolDelete(dirpath, name string) error {
-	dir, err := openDir(dirpath)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-	fullPath := path.Join(dirpath, name)
-
-	var args C.struct_btrfs_ioctl_vol_args
-
-	// walk the btrfs subvolumes
-	walkSubvolumes := func(p string, f os.FileInfo, err error) error {
-		if err != nil {
-			if os.IsNotExist(err) && p != fullPath {
-				// missing most likely because the path was a subvolume that got removed in the previous iteration
-				// since it's gone anyway, we don't care
-				return nil
-			}
-			return fmt.Errorf("error walking subvolumes: %v", err)
-		}
-		// we want to check children only so skip itself
-		// it will be removed after the filepath walk anyways
-		if f.IsDir() && p != fullPath {
-			sv, err := isSubvolume(p)
-			if err != nil {
-				return fmt.Errorf("Failed to test if %s is a btrfs subvolume: %v", p, err)
-			}
-			if sv {
-				if err := subvolDelete(path.Dir(p), f.Name()); err != nil {
-					return fmt.Errorf("Failed to destroy btrfs child subvolume (%s) of parent (%s): %v", p, dirpath, err)
-				}
-			}
-		}
-		return nil
-	}
-	if err := filepath.Walk(path.Join(dirpath, name), walkSubvolumes); err != nil {
-		return fmt.Errorf("Recursively walking subvolumes for %s failed: %v", dirpath, err)
-	}
-
-	// all subvolumes have been removed
-	// now remove the one originally passed in
-	for i, c := range []byte(name) {
-		args.name[i] = C.char(c)
-	}
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_SNAP_DESTROY,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to destroy btrfs snapshot %s for %s: %v", dirpath, name, errno.Error())
-	}
-	return nil
-}
-
-func subvolEnableQuota(path string) error {
-	dir, err := openDir(path)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var args C.struct_btrfs_ioctl_quota_ctl_args
-	args.cmd = C.BTRFS_QUOTA_CTL_ENABLE
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QUOTA_CTL,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to enable btrfs quota for %s: %v", dir, errno.Error())
-	}
-
-	return nil
-}
-
-func subvolDisableQuota(path string) error {
-	dir, err := openDir(path)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var args C.struct_btrfs_ioctl_quota_ctl_args
-	args.cmd = C.BTRFS_QUOTA_CTL_DISABLE
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QUOTA_CTL,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to disable btrfs quota for %s: %v", dir, errno.Error())
-	}
-
-	return nil
-}
-
-func subvolRescanQuota(path string) error {
-	dir, err := openDir(path)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var args C.struct_btrfs_ioctl_quota_rescan_args
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QUOTA_RESCAN_WAIT,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to rescan btrfs quota for %s: %v", dir, errno.Error())
-	}
-
-	return nil
-}
-
-func subvolLimitQgroup(path string, size uint64) error {
-	dir, err := openDir(path)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var args C.struct_btrfs_ioctl_qgroup_limit_args
-	args.lim.max_referenced = C.__u64(size)
-	args.lim.flags = C.BTRFS_QGROUP_LIMIT_MAX_RFER
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.BTRFS_IOC_QGROUP_LIMIT,
-		uintptr(unsafe.Pointer(&args)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to limit qgroup for %s: %v", dir, errno.Error())
-	}
-
-	return nil
-}
-
-func (d *Driver) subvolumesDir() string {
-	return path.Join(d.home, "subvolumes")
-}
-
-func (d *Driver) subvolumesDirID(id string) string {
-	return path.Join(d.subvolumesDir(), id)
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create the filesystem with given id.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-	subvolumes := path.Join(d.home, "subvolumes")
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return err
-	}
-	if err := idtools.MkdirAllAs(subvolumes, 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if parent == "" {
-		if err := subvolCreate(subvolumes, id); err != nil {
-			return err
-		}
-	} else {
-		parentDir := d.subvolumesDirID(parent)
-		st, err := os.Stat(parentDir)
-		if err != nil {
-			return err
-		}
-		if !st.IsDir() {
-			return fmt.Errorf("%s: not a directory", parentDir)
-		}
-		if err := subvolSnapshot(parentDir, subvolumes, id); err != nil {
-			return err
-		}
-	}
-
-	var storageOpt map[string]string
-	if opts != nil {
-		storageOpt = opts.StorageOpt
-	}
-
-	if _, ok := storageOpt["size"]; ok {
-		driver := &Driver{}
-		if err := d.parseStorageOpt(storageOpt, driver); err != nil {
-			return err
-		}
-		if err := d.setStorageSize(path.Join(subvolumes, id), driver); err != nil {
-			return err
-		}
-	}
-
-	// if we have a remapped root (user namespaces enabled), change the created snapshot
-	// dir ownership to match
-	if rootUID != 0 || rootGID != 0 {
-		if err := os.Chown(path.Join(subvolumes, id), rootUID, rootGID); err != nil {
-			return err
-		}
-	}
-
-	mountLabel := ""
-	if opts != nil {
-		mountLabel = opts.MountLabel
-	}
-
-	return label.Relabel(path.Join(subvolumes, id), mountLabel, false)
-}
-
-// Parse btrfs storage options
-func (d *Driver) parseStorageOpt(storageOpt map[string]string, driver *Driver) error {
-	// Read size to change the subvolume disk quota per container
-	for key, val := range storageOpt {
-		key := strings.ToLower(key)
-		switch key {
-		case "size":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return err
-			}
-			driver.options.size = uint64(size)
-		default:
-			return fmt.Errorf("Unknown option %s", key)
-		}
-	}
-
-	return nil
-}
-
-// Set btrfs storage size
-func (d *Driver) setStorageSize(dir string, driver *Driver) error {
-	if driver.options.size <= 0 {
-		return fmt.Errorf("btrfs: invalid storage size: %s", units.HumanSize(float64(driver.options.size)))
-	}
-	if d.options.minSpace > 0 && driver.options.size < d.options.minSpace {
-		return fmt.Errorf("btrfs: storage size cannot be less than %s", units.HumanSize(float64(d.options.minSpace)))
-	}
-
-	if !quotaEnabled {
-		if err := subvolEnableQuota(d.home); err != nil {
-			return err
-		}
-		quotaEnabled = true
-	}
-
-	if err := subvolLimitQgroup(dir, driver.options.size); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Remove the filesystem with given id.
-func (d *Driver) Remove(id string) error {
-	dir := d.subvolumesDirID(id)
-	if _, err := os.Stat(dir); err != nil {
-		return err
-	}
-	if err := subvolDelete(d.subvolumesDir(), id); err != nil {
-		return err
-	}
-	if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	if err := subvolRescanQuota(d.home); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Get the requested filesystem id.
-func (d *Driver) Get(id, mountLabel string) (string, error) {
-	dir := d.subvolumesDirID(id)
-	st, err := os.Stat(dir)
-	if err != nil {
-		return "", err
-	}
-
-	if !st.IsDir() {
-		return "", fmt.Errorf("%s: not a directory", dir)
-	}
-
-	return dir, nil
-}
-
-// Put is not implemented for BTRFS as there is no cleanup required for the id.
-func (d *Driver) Put(id string) error {
-	// Get() creates no runtime resources (like e.g. mounts)
-	// so this doesn't need to do anything.
-	return nil
-}
-
-// Exists checks if the id exists in the filesystem.
-func (d *Driver) Exists(id string) bool {
-	dir := d.subvolumesDirID(id)
-	_, err := os.Stat(dir)
-	return err == nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go
deleted file mode 100644
index 0038dbcdcd..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/btrfs_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build linux
-
-package btrfs
-
-import (
-	"os"
-	"path"
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-)
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestBtrfsSetup and TestBtrfsTeardown
-func TestBtrfsSetup(t *testing.T) {
-	graphtest.GetDriver(t, "btrfs")
-}
-
-func TestBtrfsCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, "btrfs")
-}
-
-func TestBtrfsCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, "btrfs")
-}
-
-func TestBtrfsCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, "btrfs")
-}
-
-func TestBtrfsSubvolDelete(t *testing.T) {
-	d := graphtest.GetDriver(t, "btrfs")
-	if err := d.CreateReadWrite("test", "", nil); err != nil {
-		t.Fatal(err)
-	}
-	defer graphtest.PutDriver(t)
-
-	dir, err := d.Get("test", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer d.Put("test")
-
-	if err := subvolCreate(dir, "subvoltest"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := os.Stat(path.Join(dir, "subvoltest")); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.Remove("test"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := os.Stat(path.Join(dir, "subvoltest")); !os.IsNotExist(err) {
-		t.Fatalf("expected not exist error on nested subvol, got: %v", err)
-	}
-}
-
-func TestBtrfsTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/dummy_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/dummy_unsupported.go
deleted file mode 100644
index f07088887a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/dummy_unsupported.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux !cgo
-
-package btrfs
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version.go
deleted file mode 100644
index 73d90cdd71..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build linux,!btrfs_noversion
-
-package btrfs
-
-/*
-#include <btrfs/version.h>
-
-// around version 3.16, they did not define lib version yet
-#ifndef BTRFS_LIB_VERSION
-#define BTRFS_LIB_VERSION -1
-#endif
-
-// upstream had removed it, but now it will be coming back
-#ifndef BTRFS_BUILD_VERSION
-#define BTRFS_BUILD_VERSION "-"
-#endif
-*/
-import "C"
-
-func btrfsBuildVersion() string {
-	return string(C.BTRFS_BUILD_VERSION)
-}
-
-func btrfsLibVersion() int {
-	return int(C.BTRFS_LIB_VERSION)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_none.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_none.go
deleted file mode 100644
index f802fbc629..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_none.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build linux,btrfs_noversion
-
-package btrfs
-
-// TODO(vbatts) remove this work-around once supported linux distros are on
-// btrfs utilities of >= 3.16.1
-
-func btrfsBuildVersion() string {
-	return "-"
-}
-
-func btrfsLibVersion() int {
-	return -1
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_test.go
deleted file mode 100644
index 15a6e75cb3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/btrfs/version_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build linux,!btrfs_noversion
-
-package btrfs
-
-import (
-	"testing"
-)
-
-func TestLibVersion(t *testing.T) {
-	if btrfsLibVersion() <= 0 {
-		t.Errorf("expected output from btrfs lib version > 0")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/counter.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/counter.go
deleted file mode 100644
index 5ea604f5b6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/counter.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package graphdriver
-
-import "sync"
-
-type minfo struct {
-	check bool
-	count int
-}
-
-// RefCounter is a generic counter for use by graphdriver Get/Put calls
-type RefCounter struct {
-	counts  map[string]*minfo
-	mu      sync.Mutex
-	checker Checker
-}
-
-// NewRefCounter returns a new RefCounter
-func NewRefCounter(c Checker) *RefCounter {
-	return &RefCounter{
-		checker: c,
-		counts:  make(map[string]*minfo),
-	}
-}
-
-// Increment increaes the ref count for the given id and returns the current count
-func (c *RefCounter) Increment(path string) int {
-	c.mu.Lock()
-	m := c.counts[path]
-	if m == nil {
-		m = &minfo{}
-		c.counts[path] = m
-	}
-	// if we are checking this path for the first time check to make sure
-	// if it was already mounted on the system and make sure we have a correct ref
-	// count if it is mounted as it is in use.
-	if !m.check {
-		m.check = true
-		if c.checker.IsMounted(path) {
-			m.count++
-		}
-	}
-	m.count++
-	c.mu.Unlock()
-	return m.count
-}
-
-// Decrement decreases the ref count for the given id and returns the current count
-func (c *RefCounter) Decrement(path string) int {
-	c.mu.Lock()
-	m := c.counts[path]
-	if m == nil {
-		m = &minfo{}
-		c.counts[path] = m
-	}
-	// if we are checking this path for the first time check to make sure
-	// if it was already mounted on the system and make sure we have a correct ref
-	// count if it is mounted as it is in use.
-	if !m.check {
-		m.check = true
-		if c.checker.IsMounted(path) {
-			m.count++
-		}
-	}
-	m.count--
-	c.mu.Unlock()
-	return m.count
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/README.md b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/README.md
deleted file mode 100644
index b23bbb107a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/README.md
+++ /dev/null
@@ -1,96 +0,0 @@
-## devicemapper - a storage backend based on Device Mapper
-
-### Theory of operation
-
-The device mapper graphdriver uses the device mapper thin provisioning
-module (dm-thinp) to implement CoW snapshots. The preferred model is
-to have a thin pool reserved outside of Docker and passed to the
-daemon via the `--storage-opt dm.thinpooldev` option.
-
-As a fallback if no thin pool is provided, loopback files will be
-created.  Loopback is very slow, but can be used without any
-pre-configuration of storage.  It is strongly recommended that you do
-not use loopback in production.  Ensure your Docker daemon has a
-`--storage-opt dm.thinpooldev` argument provided.
-
-In loopback, a thin pool is created at `/var/lib/docker/devicemapper`
-(devicemapper graph location) based on two block devices, one for
-data and one for metadata. By default these block devices are created
-automatically by using loopback mounts of automatically created sparse
-files.
-
-The default loopback files used are
-`/var/lib/docker/devicemapper/devicemapper/data` and
-`/var/lib/docker/devicemapper/devicemapper/metadata`. Additional metadata
-required to map from docker entities to the corresponding devicemapper
-volumes is stored in the `/var/lib/docker/devicemapper/devicemapper/json`
-file (encoded as Json).
-
-In order to support multiple devicemapper graphs on a system, the thin
-pool will be named something like: `docker-0:33-19478248-pool`, where
-the `0:33` part is the minor/major device nr and `19478248` is the
-inode number of the `/var/lib/docker/devicemapper` directory.
-
-On the thin pool, docker automatically creates a base thin device,
-called something like `docker-0:33-19478248-base` of a fixed
-size. This is automatically formatted with an empty filesystem on
-creation. This device is the base of all docker images and
-containers. All base images are snapshots of this device and those
-images are then in turn used as snapshots for other images and
-eventually containers.
-
-### Information on `docker info`
-
-As of docker-1.4.1, `docker info` when using the `devicemapper` storage driver
-will display something like:
-
-	$ sudo docker info
-	[...]
-	Storage Driver: devicemapper
-	 Pool Name: docker-253:1-17538953-pool
-	 Pool Blocksize: 65.54 kB
-	 Base Device Size: 107.4 GB
-	 Data file: /dev/loop4
-	 Metadata file: /dev/loop4
-	 Data Space Used: 2.536 GB
-	 Data Space Total: 107.4 GB
-	 Data Space Available: 104.8 GB
-	 Metadata Space Used: 7.93 MB
-	 Metadata Space Total: 2.147 GB
-	 Metadata Space Available: 2.14 GB
-	 Udev Sync Supported: true
-	 Data loop file: /home/docker/devicemapper/devicemapper/data
-	 Metadata loop file: /home/docker/devicemapper/devicemapper/metadata
-	 Library Version: 1.02.82-git (2013-10-04)
-	[...]
-
-#### status items
-
-Each item in the indented section under `Storage Driver: devicemapper` are
-status information about the driver.
- *  `Pool Name` name of the devicemapper pool for this driver.
- *  `Pool Blocksize` tells the blocksize the thin pool was initialized with. This only changes on creation.
- *  `Base Device Size` tells the maximum size of a container and image
- *  `Data file` blockdevice file used for the devicemapper data
- *  `Metadata file` blockdevice file used for the devicemapper metadata
- *  `Data Space Used` tells how much of `Data file` is currently used
- *  `Data Space Total` tells max size the `Data file`
- *  `Data Space Available` tells how much free space there is in the `Data file`. If you are using a loop device this will report the actual space available to the loop device on the underlying filesystem.
- *  `Metadata Space Used` tells how much of `Metadata file` is currently used
- *  `Metadata Space Total` tells max size the `Metadata file`
- *  `Metadata Space Available` tells how much free space there is in the `Metadata file`. If you are using a loop device this will report the actual space available to the loop device on the underlying filesystem.
- *  `Udev Sync Supported` tells whether devicemapper is able to sync with Udev. Should be `true`.
- *  `Data loop file` file attached to `Data file`, if loopback device is used
- *  `Metadata loop file` file attached to `Metadata file`, if loopback device is used
- *  `Library Version` from the libdevmapper used
-
-### About the devicemapper options
-
-The devicemapper backend supports some options that you can specify
-when starting the docker daemon using the `--storage-opt` flags.
-This uses the `dm` prefix and would be used something like `docker daemon --storage-opt dm.foo=bar`.
-
-These options are currently documented both in [the man
-page](../../../man/docker.1.md) and in [the online
-documentation](https://docs.docker.com/engine/reference/commandline/dockerd/#/storage-driver-options).
-If you add an options, update both the `man` page and the documentation.
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go
deleted file mode 100644
index b8e762592c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/deviceset.go
+++ /dev/null
@@ -1,2727 +0,0 @@
-// +build linux
-
-package devmapper
-
-import (
-	"bufio"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/devicemapper"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/loopback"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/go-units"
-
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-var (
-	defaultDataLoopbackSize     int64  = 100 * 1024 * 1024 * 1024
-	defaultMetaDataLoopbackSize int64  = 2 * 1024 * 1024 * 1024
-	defaultBaseFsSize           uint64 = 10 * 1024 * 1024 * 1024
-	defaultThinpBlockSize       uint32 = 128 // 64K = 128 512b sectors
-	defaultUdevSyncOverride            = false
-	maxDeviceID                        = 0xffffff // 24 bit, pool limit
-	deviceIDMapSz                      = (maxDeviceID + 1) / 8
-	// We retry device removal so many a times that even error messages
-	// will fill up console during normal operation. So only log Fatal
-	// messages by default.
-	logLevel                            = devicemapper.LogLevelFatal
-	driverDeferredRemovalSupport        = false
-	enableDeferredRemoval               = false
-	enableDeferredDeletion              = false
-	userBaseSize                        = false
-	defaultMinFreeSpacePercent   uint32 = 10
-)
-
-const deviceSetMetaFile string = "deviceset-metadata"
-const transactionMetaFile string = "transaction-metadata"
-
-type transaction struct {
-	OpenTransactionID uint64 `json:"open_transaction_id"`
-	DeviceIDHash      string `json:"device_hash"`
-	DeviceID          int    `json:"device_id"`
-}
-
-type devInfo struct {
-	Hash          string `json:"-"`
-	DeviceID      int    `json:"device_id"`
-	Size          uint64 `json:"size"`
-	TransactionID uint64 `json:"transaction_id"`
-	Initialized   bool   `json:"initialized"`
-	Deleted       bool   `json:"deleted"`
-	devices       *DeviceSet
-
-	// The global DeviceSet lock guarantees that we serialize all
-	// the calls to libdevmapper (which is not threadsafe), but we
-	// sometimes release that lock while sleeping. In that case
-	// this per-device lock is still held, protecting against
-	// other accesses to the device that we're doing the wait on.
-	//
-	// WARNING: In order to avoid AB-BA deadlocks when releasing
-	// the global lock while holding the per-device locks all
-	// device locks must be acquired *before* the device lock, and
-	// multiple device locks should be acquired parent before child.
-	lock sync.Mutex
-}
-
-type metaData struct {
-	Devices map[string]*devInfo `json:"Devices"`
-}
-
-// DeviceSet holds information about list of devices
-type DeviceSet struct {
-	metaData      `json:"-"`
-	sync.Mutex    `json:"-"` // Protects all fields of DeviceSet and serializes calls into libdevmapper
-	root          string
-	devicePrefix  string
-	TransactionID uint64 `json:"-"`
-	NextDeviceID  int    `json:"next_device_id"`
-	deviceIDMap   []byte
-
-	// Options
-	dataLoopbackSize      int64
-	metaDataLoopbackSize  int64
-	baseFsSize            uint64
-	filesystem            string
-	mountOptions          string
-	mkfsArgs              []string
-	dataDevice            string // block or loop dev
-	dataLoopFile          string // loopback file, if used
-	metadataDevice        string // block or loop dev
-	metadataLoopFile      string // loopback file, if used
-	doBlkDiscard          bool
-	thinpBlockSize        uint32
-	thinPoolDevice        string
-	transaction           `json:"-"`
-	overrideUdevSyncCheck bool
-	deferredRemove        bool   // use deferred removal
-	deferredDelete        bool   // use deferred deletion
-	BaseDeviceUUID        string // save UUID of base device
-	BaseDeviceFilesystem  string // save filesystem of base device
-	nrDeletedDevices      uint   // number of deleted devices
-	deletionWorkerTicker  *time.Ticker
-	uidMaps               []idtools.IDMap
-	gidMaps               []idtools.IDMap
-	minFreeSpacePercent   uint32 //min free space percentage in thinpool
-	xfsNospaceRetries     string // max retries when xfs receives ENOSPC
-}
-
-// DiskUsage contains information about disk usage and is used when reporting Status of a device.
-type DiskUsage struct {
-	// Used bytes on the disk.
-	Used uint64
-	// Total bytes on the disk.
-	Total uint64
-	// Available bytes on the disk.
-	Available uint64
-}
-
-// Status returns the information about the device.
-type Status struct {
-	// PoolName is the name of the data pool.
-	PoolName string
-	// DataFile is the actual block device for data.
-	DataFile string
-	// DataLoopback loopback file, if used.
-	DataLoopback string
-	// MetadataFile is the actual block device for metadata.
-	MetadataFile string
-	// MetadataLoopback is the loopback file, if used.
-	MetadataLoopback string
-	// Data is the disk used for data.
-	Data DiskUsage
-	// Metadata is the disk used for meta data.
-	Metadata DiskUsage
-	// BaseDeviceSize is base size of container and image
-	BaseDeviceSize uint64
-	// BaseDeviceFS is backing filesystem.
-	BaseDeviceFS string
-	// SectorSize size of the vector.
-	SectorSize uint64
-	// UdevSyncSupported is true if sync is supported.
-	UdevSyncSupported bool
-	// DeferredRemoveEnabled is true then the device is not unmounted.
-	DeferredRemoveEnabled bool
-	// True if deferred deletion is enabled. This is different from
-	// deferred removal. "removal" means that device mapper device is
-	// deactivated. Thin device is still in thin pool and can be activated
-	// again. But "deletion" means that thin device will be deleted from
-	// thin pool and it can't be activated again.
-	DeferredDeleteEnabled      bool
-	DeferredDeletedDeviceCount uint
-	MinFreeSpace               uint64
-}
-
-// Structure used to export image/container metadata in docker inspect.
-type deviceMetadata struct {
-	deviceID   int
-	deviceSize uint64 // size in bytes
-	deviceName string // Device name as used during activation
-}
-
-// DevStatus returns information about device mounted containing its id, size and sector information.
-type DevStatus struct {
-	// DeviceID is the id of the device.
-	DeviceID int
-	// Size is the size of the filesystem.
-	Size uint64
-	// TransactionID is a unique integer per device set used to identify an operation on the file system, this number is incremental.
-	TransactionID uint64
-	// SizeInSectors indicates the size of the sectors allocated.
-	SizeInSectors uint64
-	// MappedSectors indicates number of mapped sectors.
-	MappedSectors uint64
-	// HighestMappedSector is the pointer to the highest mapped sector.
-	HighestMappedSector uint64
-}
-
-func getDevName(name string) string {
-	return "/dev/mapper/" + name
-}
-
-func (info *devInfo) Name() string {
-	hash := info.Hash
-	if hash == "" {
-		hash = "base"
-	}
-	return fmt.Sprintf("%s-%s", info.devices.devicePrefix, hash)
-}
-
-func (info *devInfo) DevName() string {
-	return getDevName(info.Name())
-}
-
-func (devices *DeviceSet) loopbackDir() string {
-	return path.Join(devices.root, "devicemapper")
-}
-
-func (devices *DeviceSet) metadataDir() string {
-	return path.Join(devices.root, "metadata")
-}
-
-func (devices *DeviceSet) metadataFile(info *devInfo) string {
-	file := info.Hash
-	if file == "" {
-		file = "base"
-	}
-	return path.Join(devices.metadataDir(), file)
-}
-
-func (devices *DeviceSet) transactionMetaFile() string {
-	return path.Join(devices.metadataDir(), transactionMetaFile)
-}
-
-func (devices *DeviceSet) deviceSetMetaFile() string {
-	return path.Join(devices.metadataDir(), deviceSetMetaFile)
-}
-
-func (devices *DeviceSet) oldMetadataFile() string {
-	return path.Join(devices.loopbackDir(), "json")
-}
-
-func (devices *DeviceSet) getPoolName() string {
-	if devices.thinPoolDevice == "" {
-		return devices.devicePrefix + "-pool"
-	}
-	return devices.thinPoolDevice
-}
-
-func (devices *DeviceSet) getPoolDevName() string {
-	return getDevName(devices.getPoolName())
-}
-
-func (devices *DeviceSet) hasImage(name string) bool {
-	dirname := devices.loopbackDir()
-	filename := path.Join(dirname, name)
-
-	_, err := os.Stat(filename)
-	return err == nil
-}
-
-// ensureImage creates a sparse file of <size> bytes at the path
-// <root>/devicemapper/<name>.
-// If the file already exists and new size is larger than its current size, it grows to the new size.
-// Either way it returns the full path.
-func (devices *DeviceSet) ensureImage(name string, size int64) (string, error) {
-	dirname := devices.loopbackDir()
-	filename := path.Join(dirname, name)
-
-	uid, gid, err := idtools.GetRootUIDGID(devices.uidMaps, devices.gidMaps)
-	if err != nil {
-		return "", err
-	}
-	if err := idtools.MkdirAllAs(dirname, 0700, uid, gid); err != nil && !os.IsExist(err) {
-		return "", err
-	}
-
-	if fi, err := os.Stat(filename); err != nil {
-		if !os.IsNotExist(err) {
-			return "", err
-		}
-		logrus.Debugf("devmapper: Creating loopback file %s for device-manage use", filename)
-		file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0600)
-		if err != nil {
-			return "", err
-		}
-		defer file.Close()
-
-		if err := file.Truncate(size); err != nil {
-			return "", err
-		}
-	} else {
-		if fi.Size() < size {
-			file, err := os.OpenFile(filename, os.O_RDWR|os.O_CREATE, 0600)
-			if err != nil {
-				return "", err
-			}
-			defer file.Close()
-			if err := file.Truncate(size); err != nil {
-				return "", fmt.Errorf("devmapper: Unable to grow loopback file %s: %v", filename, err)
-			}
-		} else if fi.Size() > size {
-			logrus.Warnf("devmapper: Can't shrink loopback file %s", filename)
-		}
-	}
-	return filename, nil
-}
-
-func (devices *DeviceSet) allocateTransactionID() uint64 {
-	devices.OpenTransactionID = devices.TransactionID + 1
-	return devices.OpenTransactionID
-}
-
-func (devices *DeviceSet) updatePoolTransactionID() error {
-	if err := devicemapper.SetTransactionID(devices.getPoolDevName(), devices.TransactionID, devices.OpenTransactionID); err != nil {
-		return fmt.Errorf("devmapper: Error setting devmapper transaction ID: %s", err)
-	}
-	devices.TransactionID = devices.OpenTransactionID
-	return nil
-}
-
-func (devices *DeviceSet) removeMetadata(info *devInfo) error {
-	if err := os.RemoveAll(devices.metadataFile(info)); err != nil {
-		return fmt.Errorf("devmapper: Error removing metadata file %s: %s", devices.metadataFile(info), err)
-	}
-	return nil
-}
-
-// Given json data and file path, write it to disk
-func (devices *DeviceSet) writeMetaFile(jsonData []byte, filePath string) error {
-	tmpFile, err := ioutil.TempFile(devices.metadataDir(), ".tmp")
-	if err != nil {
-		return fmt.Errorf("devmapper: Error creating metadata file: %s", err)
-	}
-
-	n, err := tmpFile.Write(jsonData)
-	if err != nil {
-		return fmt.Errorf("devmapper: Error writing metadata to %s: %s", tmpFile.Name(), err)
-	}
-	if n < len(jsonData) {
-		return io.ErrShortWrite
-	}
-	if err := tmpFile.Sync(); err != nil {
-		return fmt.Errorf("devmapper: Error syncing metadata file %s: %s", tmpFile.Name(), err)
-	}
-	if err := tmpFile.Close(); err != nil {
-		return fmt.Errorf("devmapper: Error closing metadata file %s: %s", tmpFile.Name(), err)
-	}
-	if err := os.Rename(tmpFile.Name(), filePath); err != nil {
-		return fmt.Errorf("devmapper: Error committing metadata file %s: %s", tmpFile.Name(), err)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) saveMetadata(info *devInfo) error {
-	jsonData, err := json.Marshal(info)
-	if err != nil {
-		return fmt.Errorf("devmapper: Error encoding metadata to json: %s", err)
-	}
-	if err := devices.writeMetaFile(jsonData, devices.metadataFile(info)); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (devices *DeviceSet) markDeviceIDUsed(deviceID int) {
-	var mask byte
-	i := deviceID % 8
-	mask = 1 << uint(i)
-	devices.deviceIDMap[deviceID/8] = devices.deviceIDMap[deviceID/8] | mask
-}
-
-func (devices *DeviceSet) markDeviceIDFree(deviceID int) {
-	var mask byte
-	i := deviceID % 8
-	mask = ^(1 << uint(i))
-	devices.deviceIDMap[deviceID/8] = devices.deviceIDMap[deviceID/8] & mask
-}
-
-func (devices *DeviceSet) isDeviceIDFree(deviceID int) bool {
-	var mask byte
-	i := deviceID % 8
-	mask = (1 << uint(i))
-	if (devices.deviceIDMap[deviceID/8] & mask) != 0 {
-		return false
-	}
-	return true
-}
-
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) lookupDevice(hash string) (*devInfo, error) {
-	info := devices.Devices[hash]
-	if info == nil {
-		info = devices.loadMetadata(hash)
-		if info == nil {
-			return nil, fmt.Errorf("devmapper: Unknown device %s", hash)
-		}
-
-		devices.Devices[hash] = info
-	}
-	return info, nil
-}
-
-func (devices *DeviceSet) lookupDeviceWithLock(hash string) (*devInfo, error) {
-	devices.Lock()
-	defer devices.Unlock()
-	info, err := devices.lookupDevice(hash)
-	return info, err
-}
-
-// This function relies on that device hash map has been loaded in advance.
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) constructDeviceIDMap() {
-	logrus.Debug("devmapper: constructDeviceIDMap()")
-	defer logrus.Debug("devmapper: constructDeviceIDMap() END")
-
-	for _, info := range devices.Devices {
-		devices.markDeviceIDUsed(info.DeviceID)
-		logrus.Debugf("devmapper: Added deviceId=%d to DeviceIdMap", info.DeviceID)
-	}
-}
-
-func (devices *DeviceSet) deviceFileWalkFunction(path string, finfo os.FileInfo) error {
-
-	// Skip some of the meta files which are not device files.
-	if strings.HasSuffix(finfo.Name(), ".migrated") {
-		logrus.Debugf("devmapper: Skipping file %s", path)
-		return nil
-	}
-
-	if strings.HasPrefix(finfo.Name(), ".") {
-		logrus.Debugf("devmapper: Skipping file %s", path)
-		return nil
-	}
-
-	if finfo.Name() == deviceSetMetaFile {
-		logrus.Debugf("devmapper: Skipping file %s", path)
-		return nil
-	}
-
-	if finfo.Name() == transactionMetaFile {
-		logrus.Debugf("devmapper: Skipping file %s", path)
-		return nil
-	}
-
-	logrus.Debugf("devmapper: Loading data for file %s", path)
-
-	hash := finfo.Name()
-	if hash == "base" {
-		hash = ""
-	}
-
-	// Include deleted devices also as cleanup delete device logic
-	// will go through it and see if there are any deleted devices.
-	if _, err := devices.lookupDevice(hash); err != nil {
-		return fmt.Errorf("devmapper: Error looking up device %s:%v", hash, err)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) loadDeviceFilesOnStart() error {
-	logrus.Debug("devmapper: loadDeviceFilesOnStart()")
-	defer logrus.Debug("devmapper: loadDeviceFilesOnStart() END")
-
-	var scan = func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			logrus.Debugf("devmapper: Can't walk the file %s", path)
-			return nil
-		}
-
-		// Skip any directories
-		if info.IsDir() {
-			return nil
-		}
-
-		return devices.deviceFileWalkFunction(path, info)
-	}
-
-	return filepath.Walk(devices.metadataDir(), scan)
-}
-
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) unregisterDevice(id int, hash string) error {
-	logrus.Debugf("devmapper: unregisterDevice(%v, %v)", id, hash)
-	info := &devInfo{
-		Hash:     hash,
-		DeviceID: id,
-	}
-
-	delete(devices.Devices, hash)
-
-	if err := devices.removeMetadata(info); err != nil {
-		logrus.Debugf("devmapper: Error removing metadata: %s", err)
-		return err
-	}
-
-	return nil
-}
-
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) registerDevice(id int, hash string, size uint64, transactionID uint64) (*devInfo, error) {
-	logrus.Debugf("devmapper: registerDevice(%v, %v)", id, hash)
-	info := &devInfo{
-		Hash:          hash,
-		DeviceID:      id,
-		Size:          size,
-		TransactionID: transactionID,
-		Initialized:   false,
-		devices:       devices,
-	}
-
-	devices.Devices[hash] = info
-
-	if err := devices.saveMetadata(info); err != nil {
-		// Try to remove unused device
-		delete(devices.Devices, hash)
-		return nil, err
-	}
-
-	return info, nil
-}
-
-func (devices *DeviceSet) activateDeviceIfNeeded(info *devInfo, ignoreDeleted bool) error {
-	logrus.Debugf("devmapper: activateDeviceIfNeeded(%v)", info.Hash)
-
-	if info.Deleted && !ignoreDeleted {
-		return fmt.Errorf("devmapper: Can't activate device %v as it is marked for deletion", info.Hash)
-	}
-
-	// Make sure deferred removal on device is canceled, if one was
-	// scheduled.
-	if err := devices.cancelDeferredRemovalIfNeeded(info); err != nil {
-		return fmt.Errorf("devmapper: Device Deferred Removal Cancellation Failed: %s", err)
-	}
-
-	if devinfo, _ := devicemapper.GetInfo(info.Name()); devinfo != nil && devinfo.Exists != 0 {
-		return nil
-	}
-
-	return devicemapper.ActivateDevice(devices.getPoolDevName(), info.Name(), info.DeviceID, info.Size)
-}
-
-// Return true only if kernel supports xfs and mkfs.xfs is available
-func xfsSupported() bool {
-	// Make sure mkfs.xfs is available
-	if _, err := exec.LookPath("mkfs.xfs"); err != nil {
-		return false
-	}
-
-	// Check if kernel supports xfs filesystem or not.
-	exec.Command("modprobe", "xfs").Run()
-
-	f, err := os.Open("/proc/filesystems")
-	if err != nil {
-		logrus.Warnf("devmapper: Could not check if xfs is supported: %v", err)
-		return false
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		if strings.HasSuffix(s.Text(), "\txfs") {
-			return true
-		}
-	}
-
-	if err := s.Err(); err != nil {
-		logrus.Warnf("devmapper: Could not check if xfs is supported: %v", err)
-	}
-	return false
-}
-
-func determineDefaultFS() string {
-	if xfsSupported() {
-		return "xfs"
-	}
-
-	logrus.Warn("devmapper: XFS is not supported in your system. Either the kernel doesn't support it or mkfs.xfs is not in your PATH. Defaulting to ext4 filesystem")
-	return "ext4"
-}
-
-func (devices *DeviceSet) createFilesystem(info *devInfo) (err error) {
-	devname := info.DevName()
-
-	args := []string{}
-	args = append(args, devices.mkfsArgs...)
-
-	args = append(args, devname)
-
-	if devices.filesystem == "" {
-		devices.filesystem = determineDefaultFS()
-	}
-	if err := devices.saveBaseDeviceFilesystem(devices.filesystem); err != nil {
-		return err
-	}
-
-	logrus.Infof("devmapper: Creating filesystem %s on device %s", devices.filesystem, info.Name())
-	defer func() {
-		if err != nil {
-			logrus.Infof("devmapper: Error while creating filesystem %s on device %s: %v", devices.filesystem, info.Name(), err)
-		} else {
-			logrus.Infof("devmapper: Successfully created filesystem %s on device %s", devices.filesystem, info.Name())
-		}
-	}()
-
-	switch devices.filesystem {
-	case "xfs":
-		err = exec.Command("mkfs.xfs", args...).Run()
-	case "ext4":
-		err = exec.Command("mkfs.ext4", append([]string{"-E", "nodiscard,lazy_itable_init=0,lazy_journal_init=0"}, args...)...).Run()
-		if err != nil {
-			err = exec.Command("mkfs.ext4", append([]string{"-E", "nodiscard,lazy_itable_init=0"}, args...)...).Run()
-		}
-		if err != nil {
-			return err
-		}
-		err = exec.Command("tune2fs", append([]string{"-c", "-1", "-i", "0"}, devname)...).Run()
-	default:
-		err = fmt.Errorf("devmapper: Unsupported filesystem type %s", devices.filesystem)
-	}
-	return
-}
-
-func (devices *DeviceSet) migrateOldMetaData() error {
-	// Migrate old metadata file
-	jsonData, err := ioutil.ReadFile(devices.oldMetadataFile())
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	if jsonData != nil {
-		m := metaData{Devices: make(map[string]*devInfo)}
-
-		if err := json.Unmarshal(jsonData, &m); err != nil {
-			return err
-		}
-
-		for hash, info := range m.Devices {
-			info.Hash = hash
-			devices.saveMetadata(info)
-		}
-		if err := os.Rename(devices.oldMetadataFile(), devices.oldMetadataFile()+".migrated"); err != nil {
-			return err
-		}
-
-	}
-
-	return nil
-}
-
-// Cleanup deleted devices. It assumes that all the devices have been
-// loaded in the hash table.
-func (devices *DeviceSet) cleanupDeletedDevices() error {
-	devices.Lock()
-
-	// If there are no deleted devices, there is nothing to do.
-	if devices.nrDeletedDevices == 0 {
-		devices.Unlock()
-		return nil
-	}
-
-	var deletedDevices []*devInfo
-
-	for _, info := range devices.Devices {
-		if !info.Deleted {
-			continue
-		}
-		logrus.Debugf("devmapper: Found deleted device %s.", info.Hash)
-		deletedDevices = append(deletedDevices, info)
-	}
-
-	// Delete the deleted devices. DeleteDevice() first takes the info lock
-	// and then devices.Lock(). So drop it to avoid deadlock.
-	devices.Unlock()
-
-	for _, info := range deletedDevices {
-		// This will again try deferred deletion.
-		if err := devices.DeleteDevice(info.Hash, false); err != nil {
-			logrus.Warnf("devmapper: Deletion of device %s, device_id=%v failed:%v", info.Hash, info.DeviceID, err)
-		}
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) countDeletedDevices() {
-	for _, info := range devices.Devices {
-		if !info.Deleted {
-			continue
-		}
-		devices.nrDeletedDevices++
-	}
-}
-
-func (devices *DeviceSet) startDeviceDeletionWorker() {
-	// Deferred deletion is not enabled. Don't do anything.
-	if !devices.deferredDelete {
-		return
-	}
-
-	logrus.Debug("devmapper: Worker to cleanup deleted devices started")
-	for range devices.deletionWorkerTicker.C {
-		devices.cleanupDeletedDevices()
-	}
-}
-
-func (devices *DeviceSet) initMetaData() error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.migrateOldMetaData(); err != nil {
-		return err
-	}
-
-	_, transactionID, _, _, _, _, err := devices.poolStatus()
-	if err != nil {
-		return err
-	}
-
-	devices.TransactionID = transactionID
-
-	if err := devices.loadDeviceFilesOnStart(); err != nil {
-		return fmt.Errorf("devmapper: Failed to load device files:%v", err)
-	}
-
-	devices.constructDeviceIDMap()
-	devices.countDeletedDevices()
-
-	if err := devices.processPendingTransaction(); err != nil {
-		return err
-	}
-
-	// Start a goroutine to cleanup Deleted Devices
-	go devices.startDeviceDeletionWorker()
-	return nil
-}
-
-func (devices *DeviceSet) incNextDeviceID() {
-	// IDs are 24bit, so wrap around
-	devices.NextDeviceID = (devices.NextDeviceID + 1) & maxDeviceID
-}
-
-func (devices *DeviceSet) getNextFreeDeviceID() (int, error) {
-	devices.incNextDeviceID()
-	for i := 0; i <= maxDeviceID; i++ {
-		if devices.isDeviceIDFree(devices.NextDeviceID) {
-			devices.markDeviceIDUsed(devices.NextDeviceID)
-			return devices.NextDeviceID, nil
-		}
-		devices.incNextDeviceID()
-	}
-
-	return 0, fmt.Errorf("devmapper: Unable to find a free device ID")
-}
-
-func (devices *DeviceSet) poolHasFreeSpace() error {
-	if devices.minFreeSpacePercent == 0 {
-		return nil
-	}
-
-	_, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus()
-	if err != nil {
-		return err
-	}
-
-	minFreeData := (dataTotal * uint64(devices.minFreeSpacePercent)) / 100
-	if minFreeData < 1 {
-		minFreeData = 1
-	}
-	dataFree := dataTotal - dataUsed
-	if dataFree < minFreeData {
-		return fmt.Errorf("devmapper: Thin Pool has %v free data blocks which is less than minimum required %v free data blocks. Create more free space in thin pool or use dm.min_free_space option to change behavior", (dataTotal - dataUsed), minFreeData)
-	}
-
-	minFreeMetadata := (metadataTotal * uint64(devices.minFreeSpacePercent)) / 100
-	if minFreeMetadata < 1 {
-		minFreeMetadata = 1
-	}
-
-	metadataFree := metadataTotal - metadataUsed
-	if metadataFree < minFreeMetadata {
-		return fmt.Errorf("devmapper: Thin Pool has %v free metadata blocks which is less than minimum required %v free metadata blocks. Create more free metadata space in thin pool or use dm.min_free_space option to change behavior", (metadataTotal - metadataUsed), minFreeMetadata)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) createRegisterDevice(hash string) (*devInfo, error) {
-	devices.Lock()
-	defer devices.Unlock()
-
-	deviceID, err := devices.getNextFreeDeviceID()
-	if err != nil {
-		return nil, err
-	}
-
-	if err := devices.openTransaction(hash, deviceID); err != nil {
-		logrus.Debugf("devmapper: Error opening transaction hash = %s deviceID = %d", hash, deviceID)
-		devices.markDeviceIDFree(deviceID)
-		return nil, err
-	}
-
-	for {
-		if err := devicemapper.CreateDevice(devices.getPoolDevName(), deviceID); err != nil {
-			if devicemapper.DeviceIDExists(err) {
-				// Device ID already exists. This should not
-				// happen. Now we have a mechanism to find
-				// a free device ID. So something is not right.
-				// Give a warning and continue.
-				logrus.Errorf("devmapper: Device ID %d exists in pool but it is supposed to be unused", deviceID)
-				deviceID, err = devices.getNextFreeDeviceID()
-				if err != nil {
-					return nil, err
-				}
-				// Save new device id into transaction
-				devices.refreshTransaction(deviceID)
-				continue
-			}
-			logrus.Debugf("devmapper: Error creating device: %s", err)
-			devices.markDeviceIDFree(deviceID)
-			return nil, err
-		}
-		break
-	}
-
-	logrus.Debugf("devmapper: Registering device (id %v) with FS size %v", deviceID, devices.baseFsSize)
-	info, err := devices.registerDevice(deviceID, hash, devices.baseFsSize, devices.OpenTransactionID)
-	if err != nil {
-		_ = devicemapper.DeleteDevice(devices.getPoolDevName(), deviceID)
-		devices.markDeviceIDFree(deviceID)
-		return nil, err
-	}
-
-	if err := devices.closeTransaction(); err != nil {
-		devices.unregisterDevice(deviceID, hash)
-		devicemapper.DeleteDevice(devices.getPoolDevName(), deviceID)
-		devices.markDeviceIDFree(deviceID)
-		return nil, err
-	}
-	return info, nil
-}
-
-func (devices *DeviceSet) takeSnapshot(hash string, baseInfo *devInfo, size uint64) error {
-	var (
-		devinfo *devicemapper.Info
-		err     error
-	)
-
-	if err = devices.poolHasFreeSpace(); err != nil {
-		return err
-	}
-
-	if devices.deferredRemove {
-		devinfo, err = devicemapper.GetInfoWithDeferred(baseInfo.Name())
-		if err != nil {
-			return err
-		}
-		if devinfo != nil && devinfo.DeferredRemove != 0 {
-			err = devices.cancelDeferredRemoval(baseInfo)
-			if err != nil {
-				// If Error is ErrEnxio. Device is probably already gone. Continue.
-				if err != devicemapper.ErrEnxio {
-					return err
-				}
-			} else {
-				defer devices.deactivateDevice(baseInfo)
-			}
-		}
-	} else {
-		devinfo, err = devicemapper.GetInfo(baseInfo.Name())
-		if err != nil {
-			return err
-		}
-	}
-
-	doSuspend := devinfo != nil && devinfo.Exists != 0
-
-	if doSuspend {
-		if err = devicemapper.SuspendDevice(baseInfo.Name()); err != nil {
-			return err
-		}
-		defer devicemapper.ResumeDevice(baseInfo.Name())
-	}
-
-	if err = devices.createRegisterSnapDevice(hash, baseInfo, size); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) createRegisterSnapDevice(hash string, baseInfo *devInfo, size uint64) error {
-	deviceID, err := devices.getNextFreeDeviceID()
-	if err != nil {
-		return err
-	}
-
-	if err := devices.openTransaction(hash, deviceID); err != nil {
-		logrus.Debugf("devmapper: Error opening transaction hash = %s deviceID = %d", hash, deviceID)
-		devices.markDeviceIDFree(deviceID)
-		return err
-	}
-
-	for {
-		if err := devicemapper.CreateSnapDeviceRaw(devices.getPoolDevName(), deviceID, baseInfo.DeviceID); err != nil {
-			if devicemapper.DeviceIDExists(err) {
-				// Device ID already exists. This should not
-				// happen. Now we have a mechanism to find
-				// a free device ID. So something is not right.
-				// Give a warning and continue.
-				logrus.Errorf("devmapper: Device ID %d exists in pool but it is supposed to be unused", deviceID)
-				deviceID, err = devices.getNextFreeDeviceID()
-				if err != nil {
-					return err
-				}
-				// Save new device id into transaction
-				devices.refreshTransaction(deviceID)
-				continue
-			}
-			logrus.Debugf("devmapper: Error creating snap device: %s", err)
-			devices.markDeviceIDFree(deviceID)
-			return err
-		}
-		break
-	}
-
-	if _, err := devices.registerDevice(deviceID, hash, size, devices.OpenTransactionID); err != nil {
-		devicemapper.DeleteDevice(devices.getPoolDevName(), deviceID)
-		devices.markDeviceIDFree(deviceID)
-		logrus.Debugf("devmapper: Error registering device: %s", err)
-		return err
-	}
-
-	if err := devices.closeTransaction(); err != nil {
-		devices.unregisterDevice(deviceID, hash)
-		devicemapper.DeleteDevice(devices.getPoolDevName(), deviceID)
-		devices.markDeviceIDFree(deviceID)
-		return err
-	}
-	return nil
-}
-
-func (devices *DeviceSet) loadMetadata(hash string) *devInfo {
-	info := &devInfo{Hash: hash, devices: devices}
-
-	jsonData, err := ioutil.ReadFile(devices.metadataFile(info))
-	if err != nil {
-		logrus.Debugf("devmapper: Failed to read %s with err: %v", devices.metadataFile(info), err)
-		return nil
-	}
-
-	if err := json.Unmarshal(jsonData, &info); err != nil {
-		logrus.Debugf("devmapper: Failed to unmarshal devInfo from %s with err: %v", devices.metadataFile(info), err)
-		return nil
-	}
-
-	if info.DeviceID > maxDeviceID {
-		logrus.Errorf("devmapper: Ignoring Invalid DeviceId=%d", info.DeviceID)
-		return nil
-	}
-
-	return info
-}
-
-func getDeviceUUID(device string) (string, error) {
-	out, err := exec.Command("blkid", "-s", "UUID", "-o", "value", device).Output()
-	if err != nil {
-		return "", fmt.Errorf("devmapper: Failed to find uuid for device %s:%v", device, err)
-	}
-
-	uuid := strings.TrimSuffix(string(out), "\n")
-	uuid = strings.TrimSpace(uuid)
-	logrus.Debugf("devmapper: UUID for device: %s is:%s", device, uuid)
-	return uuid, nil
-}
-
-func (devices *DeviceSet) getBaseDeviceSize() uint64 {
-	info, _ := devices.lookupDevice("")
-	if info == nil {
-		return 0
-	}
-	return info.Size
-}
-
-func (devices *DeviceSet) getBaseDeviceFS() string {
-	return devices.BaseDeviceFilesystem
-}
-
-func (devices *DeviceSet) verifyBaseDeviceUUIDFS(baseInfo *devInfo) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.activateDeviceIfNeeded(baseInfo, false); err != nil {
-		return err
-	}
-	defer devices.deactivateDevice(baseInfo)
-
-	uuid, err := getDeviceUUID(baseInfo.DevName())
-	if err != nil {
-		return err
-	}
-
-	if devices.BaseDeviceUUID != uuid {
-		return fmt.Errorf("devmapper: Current Base Device UUID:%s does not match with stored UUID:%s. Possibly using a different thin pool than last invocation", uuid, devices.BaseDeviceUUID)
-	}
-
-	if devices.BaseDeviceFilesystem == "" {
-		fsType, err := ProbeFsType(baseInfo.DevName())
-		if err != nil {
-			return err
-		}
-		if err := devices.saveBaseDeviceFilesystem(fsType); err != nil {
-			return err
-		}
-	}
-
-	// If user specified a filesystem using dm.fs option and current
-	// file system of base image is not same, warn user that dm.fs
-	// will be ignored.
-	if devices.BaseDeviceFilesystem != devices.filesystem {
-		logrus.Warnf("devmapper: Base device already exists and has filesystem %s on it. User specified filesystem %s will be ignored.", devices.BaseDeviceFilesystem, devices.filesystem)
-		devices.filesystem = devices.BaseDeviceFilesystem
-	}
-	return nil
-}
-
-func (devices *DeviceSet) saveBaseDeviceFilesystem(fs string) error {
-	devices.BaseDeviceFilesystem = fs
-	return devices.saveDeviceSetMetaData()
-}
-
-func (devices *DeviceSet) saveBaseDeviceUUID(baseInfo *devInfo) error {
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.activateDeviceIfNeeded(baseInfo, false); err != nil {
-		return err
-	}
-	defer devices.deactivateDevice(baseInfo)
-
-	uuid, err := getDeviceUUID(baseInfo.DevName())
-	if err != nil {
-		return err
-	}
-
-	devices.BaseDeviceUUID = uuid
-	return devices.saveDeviceSetMetaData()
-}
-
-func (devices *DeviceSet) createBaseImage() error {
-	logrus.Debug("devmapper: Initializing base device-mapper thin volume")
-
-	// Create initial device
-	info, err := devices.createRegisterDevice("")
-	if err != nil {
-		return err
-	}
-
-	logrus.Debug("devmapper: Creating filesystem on base device-mapper thin volume")
-
-	if err := devices.activateDeviceIfNeeded(info, false); err != nil {
-		return err
-	}
-
-	if err := devices.createFilesystem(info); err != nil {
-		return err
-	}
-
-	info.Initialized = true
-	if err := devices.saveMetadata(info); err != nil {
-		info.Initialized = false
-		return err
-	}
-
-	if err := devices.saveBaseDeviceUUID(info); err != nil {
-		return fmt.Errorf("devmapper: Could not query and save base device UUID:%v", err)
-	}
-
-	return nil
-}
-
-// Returns if thin pool device exists or not. If device exists, also makes
-// sure it is a thin pool device and not some other type of device.
-func (devices *DeviceSet) thinPoolExists(thinPoolDevice string) (bool, error) {
-	logrus.Debugf("devmapper: Checking for existence of the pool %s", thinPoolDevice)
-
-	info, err := devicemapper.GetInfo(thinPoolDevice)
-	if err != nil {
-		return false, fmt.Errorf("devmapper: GetInfo() on device %s failed: %v", thinPoolDevice, err)
-	}
-
-	// Device does not exist.
-	if info.Exists == 0 {
-		return false, nil
-	}
-
-	_, _, deviceType, _, err := devicemapper.GetStatus(thinPoolDevice)
-	if err != nil {
-		return false, fmt.Errorf("devmapper: GetStatus() on device %s failed: %v", thinPoolDevice, err)
-	}
-
-	if deviceType != "thin-pool" {
-		return false, fmt.Errorf("devmapper: Device %s is not a thin pool", thinPoolDevice)
-	}
-
-	return true, nil
-}
-
-func (devices *DeviceSet) checkThinPool() error {
-	_, transactionID, dataUsed, _, _, _, err := devices.poolStatus()
-	if err != nil {
-		return err
-	}
-	if dataUsed != 0 {
-		return fmt.Errorf("devmapper: Unable to take ownership of thin-pool (%s) that already has used data blocks",
-			devices.thinPoolDevice)
-	}
-	if transactionID != 0 {
-		return fmt.Errorf("devmapper: Unable to take ownership of thin-pool (%s) with non-zero transaction ID",
-			devices.thinPoolDevice)
-	}
-	return nil
-}
-
-// Base image is initialized properly. Either save UUID for first time (for
-// upgrade case or verify UUID.
-func (devices *DeviceSet) setupVerifyBaseImageUUIDFS(baseInfo *devInfo) error {
-	// If BaseDeviceUUID is nil (upgrade case), save it and return success.
-	if devices.BaseDeviceUUID == "" {
-		if err := devices.saveBaseDeviceUUID(baseInfo); err != nil {
-			return fmt.Errorf("devmapper: Could not query and save base device UUID:%v", err)
-		}
-		return nil
-	}
-
-	if err := devices.verifyBaseDeviceUUIDFS(baseInfo); err != nil {
-		return fmt.Errorf("devmapper: Base Device UUID and Filesystem verification failed: %v", err)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) checkGrowBaseDeviceFS(info *devInfo) error {
-
-	if !userBaseSize {
-		return nil
-	}
-
-	if devices.baseFsSize < devices.getBaseDeviceSize() {
-		return fmt.Errorf("devmapper: Base device size cannot be smaller than %s", units.HumanSize(float64(devices.getBaseDeviceSize())))
-	}
-
-	if devices.baseFsSize == devices.getBaseDeviceSize() {
-		return nil
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	info.Size = devices.baseFsSize
-
-	if err := devices.saveMetadata(info); err != nil {
-		// Try to remove unused device
-		delete(devices.Devices, info.Hash)
-		return err
-	}
-
-	return devices.growFS(info)
-}
-
-func (devices *DeviceSet) growFS(info *devInfo) error {
-	if err := devices.activateDeviceIfNeeded(info, false); err != nil {
-		return fmt.Errorf("Error activating devmapper device: %s", err)
-	}
-
-	defer devices.deactivateDevice(info)
-
-	fsMountPoint := "/run/docker/mnt"
-	if _, err := os.Stat(fsMountPoint); os.IsNotExist(err) {
-		if err := os.MkdirAll(fsMountPoint, 0700); err != nil {
-			return err
-		}
-		defer os.RemoveAll(fsMountPoint)
-	}
-
-	options := ""
-	if devices.BaseDeviceFilesystem == "xfs" {
-		// XFS needs nouuid or it can't mount filesystems with the same fs
-		options = joinMountOptions(options, "nouuid")
-	}
-	options = joinMountOptions(options, devices.mountOptions)
-
-	if err := mount.Mount(info.DevName(), fsMountPoint, devices.BaseDeviceFilesystem, options); err != nil {
-		return fmt.Errorf("Error mounting '%s' on '%s': %s", info.DevName(), fsMountPoint, err)
-	}
-
-	defer syscall.Unmount(fsMountPoint, syscall.MNT_DETACH)
-
-	switch devices.BaseDeviceFilesystem {
-	case "ext4":
-		if out, err := exec.Command("resize2fs", info.DevName()).CombinedOutput(); err != nil {
-			return fmt.Errorf("Failed to grow rootfs:%v:%s", err, string(out))
-		}
-	case "xfs":
-		if out, err := exec.Command("xfs_growfs", info.DevName()).CombinedOutput(); err != nil {
-			return fmt.Errorf("Failed to grow rootfs:%v:%s", err, string(out))
-		}
-	default:
-		return fmt.Errorf("Unsupported filesystem type %s", devices.BaseDeviceFilesystem)
-	}
-	return nil
-}
-
-func (devices *DeviceSet) setupBaseImage() error {
-	oldInfo, _ := devices.lookupDeviceWithLock("")
-
-	// base image already exists. If it is initialized properly, do UUID
-	// verification and return. Otherwise remove image and set it up
-	// fresh.
-
-	if oldInfo != nil {
-		if oldInfo.Initialized && !oldInfo.Deleted {
-			if err := devices.setupVerifyBaseImageUUIDFS(oldInfo); err != nil {
-				return err
-			}
-
-			if err := devices.checkGrowBaseDeviceFS(oldInfo); err != nil {
-				return err
-			}
-
-			return nil
-		}
-
-		logrus.Debug("devmapper: Removing uninitialized base image")
-		// If previous base device is in deferred delete state,
-		// that needs to be cleaned up first. So don't try
-		// deferred deletion.
-		if err := devices.DeleteDevice("", true); err != nil {
-			return err
-		}
-	}
-
-	// If we are setting up base image for the first time, make sure
-	// thin pool is empty.
-	if devices.thinPoolDevice != "" && oldInfo == nil {
-		if err := devices.checkThinPool(); err != nil {
-			return err
-		}
-	}
-
-	// Create new base image device
-	if err := devices.createBaseImage(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func setCloseOnExec(name string) {
-	if fileInfos, _ := ioutil.ReadDir("/proc/self/fd"); fileInfos != nil {
-		for _, i := range fileInfos {
-			link, _ := os.Readlink(filepath.Join("/proc/self/fd", i.Name()))
-			if link == name {
-				fd, err := strconv.Atoi(i.Name())
-				if err == nil {
-					syscall.CloseOnExec(fd)
-				}
-			}
-		}
-	}
-}
-
-// DMLog implements logging using DevMapperLogger interface.
-func (devices *DeviceSet) DMLog(level int, file string, line int, dmError int, message string) {
-	// By default libdm sends us all the messages including debug ones.
-	// We need to filter out messages here and figure out which one
-	// should be printed.
-	if level > logLevel {
-		return
-	}
-
-	// FIXME(vbatts) push this back into ./pkg/devicemapper/
-	if level <= devicemapper.LogLevelErr {
-		logrus.Errorf("libdevmapper(%d): %s:%d (%d) %s", level, file, line, dmError, message)
-	} else if level <= devicemapper.LogLevelInfo {
-		logrus.Infof("libdevmapper(%d): %s:%d (%d) %s", level, file, line, dmError, message)
-	} else {
-		// FIXME(vbatts) push this back into ./pkg/devicemapper/
-		logrus.Debugf("libdevmapper(%d): %s:%d (%d) %s", level, file, line, dmError, message)
-	}
-}
-
-func major(device uint64) uint64 {
-	return (device >> 8) & 0xfff
-}
-
-func minor(device uint64) uint64 {
-	return (device & 0xff) | ((device >> 12) & 0xfff00)
-}
-
-// ResizePool increases the size of the pool.
-func (devices *DeviceSet) ResizePool(size int64) error {
-	dirname := devices.loopbackDir()
-	datafilename := path.Join(dirname, "data")
-	if len(devices.dataDevice) > 0 {
-		datafilename = devices.dataDevice
-	}
-	metadatafilename := path.Join(dirname, "metadata")
-	if len(devices.metadataDevice) > 0 {
-		metadatafilename = devices.metadataDevice
-	}
-
-	datafile, err := os.OpenFile(datafilename, os.O_RDWR, 0)
-	if datafile == nil {
-		return err
-	}
-	defer datafile.Close()
-
-	fi, err := datafile.Stat()
-	if fi == nil {
-		return err
-	}
-
-	if fi.Size() > size {
-		return fmt.Errorf("devmapper: Can't shrink file")
-	}
-
-	dataloopback := loopback.FindLoopDeviceFor(datafile)
-	if dataloopback == nil {
-		return fmt.Errorf("devmapper: Unable to find loopback mount for: %s", datafilename)
-	}
-	defer dataloopback.Close()
-
-	metadatafile, err := os.OpenFile(metadatafilename, os.O_RDWR, 0)
-	if metadatafile == nil {
-		return err
-	}
-	defer metadatafile.Close()
-
-	metadataloopback := loopback.FindLoopDeviceFor(metadatafile)
-	if metadataloopback == nil {
-		return fmt.Errorf("devmapper: Unable to find loopback mount for: %s", metadatafilename)
-	}
-	defer metadataloopback.Close()
-
-	// Grow loopback file
-	if err := datafile.Truncate(size); err != nil {
-		return fmt.Errorf("devmapper: Unable to grow loopback file: %s", err)
-	}
-
-	// Reload size for loopback device
-	if err := loopback.SetCapacity(dataloopback); err != nil {
-		return fmt.Errorf("Unable to update loopback capacity: %s", err)
-	}
-
-	// Suspend the pool
-	if err := devicemapper.SuspendDevice(devices.getPoolName()); err != nil {
-		return fmt.Errorf("devmapper: Unable to suspend pool: %s", err)
-	}
-
-	// Reload with the new block sizes
-	if err := devicemapper.ReloadPool(devices.getPoolName(), dataloopback, metadataloopback, devices.thinpBlockSize); err != nil {
-		return fmt.Errorf("devmapper: Unable to reload pool: %s", err)
-	}
-
-	// Resume the pool
-	if err := devicemapper.ResumeDevice(devices.getPoolName()); err != nil {
-		return fmt.Errorf("devmapper: Unable to resume pool: %s", err)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) loadTransactionMetaData() error {
-	jsonData, err := ioutil.ReadFile(devices.transactionMetaFile())
-	if err != nil {
-		// There is no active transaction. This will be the case
-		// during upgrade.
-		if os.IsNotExist(err) {
-			devices.OpenTransactionID = devices.TransactionID
-			return nil
-		}
-		return err
-	}
-
-	json.Unmarshal(jsonData, &devices.transaction)
-	return nil
-}
-
-func (devices *DeviceSet) saveTransactionMetaData() error {
-	jsonData, err := json.Marshal(&devices.transaction)
-	if err != nil {
-		return fmt.Errorf("devmapper: Error encoding metadata to json: %s", err)
-	}
-
-	return devices.writeMetaFile(jsonData, devices.transactionMetaFile())
-}
-
-func (devices *DeviceSet) removeTransactionMetaData() error {
-	if err := os.RemoveAll(devices.transactionMetaFile()); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (devices *DeviceSet) rollbackTransaction() error {
-	logrus.Debugf("devmapper: Rolling back open transaction: TransactionID=%d hash=%s device_id=%d", devices.OpenTransactionID, devices.DeviceIDHash, devices.DeviceID)
-
-	// A device id might have already been deleted before transaction
-	// closed. In that case this call will fail. Just leave a message
-	// in case of failure.
-	if err := devicemapper.DeleteDevice(devices.getPoolDevName(), devices.DeviceID); err != nil {
-		logrus.Errorf("devmapper: Unable to delete device: %s", err)
-	}
-
-	dinfo := &devInfo{Hash: devices.DeviceIDHash}
-	if err := devices.removeMetadata(dinfo); err != nil {
-		logrus.Errorf("devmapper: Unable to remove metadata: %s", err)
-	} else {
-		devices.markDeviceIDFree(devices.DeviceID)
-	}
-
-	if err := devices.removeTransactionMetaData(); err != nil {
-		logrus.Errorf("devmapper: Unable to remove transaction meta file %s: %s", devices.transactionMetaFile(), err)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) processPendingTransaction() error {
-	if err := devices.loadTransactionMetaData(); err != nil {
-		return err
-	}
-
-	// If there was open transaction but pool transaction ID is same
-	// as open transaction ID, nothing to roll back.
-	if devices.TransactionID == devices.OpenTransactionID {
-		return nil
-	}
-
-	// If open transaction ID is less than pool transaction ID, something
-	// is wrong. Bail out.
-	if devices.OpenTransactionID < devices.TransactionID {
-		logrus.Errorf("devmapper: Open Transaction id %d is less than pool transaction id %d", devices.OpenTransactionID, devices.TransactionID)
-		return nil
-	}
-
-	// Pool transaction ID is not same as open transaction. There is
-	// a transaction which was not completed.
-	if err := devices.rollbackTransaction(); err != nil {
-		return fmt.Errorf("devmapper: Rolling back open transaction failed: %s", err)
-	}
-
-	devices.OpenTransactionID = devices.TransactionID
-	return nil
-}
-
-func (devices *DeviceSet) loadDeviceSetMetaData() error {
-	jsonData, err := ioutil.ReadFile(devices.deviceSetMetaFile())
-	if err != nil {
-		// For backward compatibility return success if file does
-		// not exist.
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	return json.Unmarshal(jsonData, devices)
-}
-
-func (devices *DeviceSet) saveDeviceSetMetaData() error {
-	jsonData, err := json.Marshal(devices)
-	if err != nil {
-		return fmt.Errorf("devmapper: Error encoding metadata to json: %s", err)
-	}
-
-	return devices.writeMetaFile(jsonData, devices.deviceSetMetaFile())
-}
-
-func (devices *DeviceSet) openTransaction(hash string, DeviceID int) error {
-	devices.allocateTransactionID()
-	devices.DeviceIDHash = hash
-	devices.DeviceID = DeviceID
-	if err := devices.saveTransactionMetaData(); err != nil {
-		return fmt.Errorf("devmapper: Error saving transaction metadata: %s", err)
-	}
-	return nil
-}
-
-func (devices *DeviceSet) refreshTransaction(DeviceID int) error {
-	devices.DeviceID = DeviceID
-	if err := devices.saveTransactionMetaData(); err != nil {
-		return fmt.Errorf("devmapper: Error saving transaction metadata: %s", err)
-	}
-	return nil
-}
-
-func (devices *DeviceSet) closeTransaction() error {
-	if err := devices.updatePoolTransactionID(); err != nil {
-		logrus.Debug("devmapper: Failed to close Transaction")
-		return err
-	}
-	return nil
-}
-
-func determineDriverCapabilities(version string) error {
-	/*
-	 * Driver version 4.27.0 and greater support deferred activation
-	 * feature.
-	 */
-
-	logrus.Debugf("devicemapper: driver version is %s", version)
-
-	versionSplit := strings.Split(version, ".")
-	major, err := strconv.Atoi(versionSplit[0])
-	if err != nil {
-		return graphdriver.ErrNotSupported
-	}
-
-	if major > 4 {
-		driverDeferredRemovalSupport = true
-		return nil
-	}
-
-	if major < 4 {
-		return nil
-	}
-
-	minor, err := strconv.Atoi(versionSplit[1])
-	if err != nil {
-		return graphdriver.ErrNotSupported
-	}
-
-	/*
-	 * If major is 4 and minor is 27, then there is no need to
-	 * check for patch level as it can not be less than 0.
-	 */
-	if minor >= 27 {
-		driverDeferredRemovalSupport = true
-		return nil
-	}
-
-	return nil
-}
-
-// Determine the major and minor number of loopback device
-func getDeviceMajorMinor(file *os.File) (uint64, uint64, error) {
-	stat, err := file.Stat()
-	if err != nil {
-		return 0, 0, err
-	}
-
-	dev := stat.Sys().(*syscall.Stat_t).Rdev
-	majorNum := major(dev)
-	minorNum := minor(dev)
-
-	logrus.Debugf("devmapper: Major:Minor for device: %s is:%v:%v", file.Name(), majorNum, minorNum)
-	return majorNum, minorNum, nil
-}
-
-// Given a file which is backing file of a loop back device, find the
-// loopback device name and its major/minor number.
-func getLoopFileDeviceMajMin(filename string) (string, uint64, uint64, error) {
-	file, err := os.Open(filename)
-	if err != nil {
-		logrus.Debugf("devmapper: Failed to open file %s", filename)
-		return "", 0, 0, err
-	}
-
-	defer file.Close()
-	loopbackDevice := loopback.FindLoopDeviceFor(file)
-	if loopbackDevice == nil {
-		return "", 0, 0, fmt.Errorf("devmapper: Unable to find loopback mount for: %s", filename)
-	}
-	defer loopbackDevice.Close()
-
-	Major, Minor, err := getDeviceMajorMinor(loopbackDevice)
-	if err != nil {
-		return "", 0, 0, err
-	}
-	return loopbackDevice.Name(), Major, Minor, nil
-}
-
-// Get the major/minor numbers of thin pool data and metadata devices
-func (devices *DeviceSet) getThinPoolDataMetaMajMin() (uint64, uint64, uint64, uint64, error) {
-	var params, poolDataMajMin, poolMetadataMajMin string
-
-	_, _, _, params, err := devicemapper.GetTable(devices.getPoolName())
-	if err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	if _, err = fmt.Sscanf(params, "%s %s", &poolMetadataMajMin, &poolDataMajMin); err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	logrus.Debugf("devmapper: poolDataMajMin=%s poolMetaMajMin=%s\n", poolDataMajMin, poolMetadataMajMin)
-
-	poolDataMajMinorSplit := strings.Split(poolDataMajMin, ":")
-	poolDataMajor, err := strconv.ParseUint(poolDataMajMinorSplit[0], 10, 32)
-	if err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	poolDataMinor, err := strconv.ParseUint(poolDataMajMinorSplit[1], 10, 32)
-	if err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	poolMetadataMajMinorSplit := strings.Split(poolMetadataMajMin, ":")
-	poolMetadataMajor, err := strconv.ParseUint(poolMetadataMajMinorSplit[0], 10, 32)
-	if err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	poolMetadataMinor, err := strconv.ParseUint(poolMetadataMajMinorSplit[1], 10, 32)
-	if err != nil {
-		return 0, 0, 0, 0, err
-	}
-
-	return poolDataMajor, poolDataMinor, poolMetadataMajor, poolMetadataMinor, nil
-}
-
-func (devices *DeviceSet) loadThinPoolLoopBackInfo() error {
-	poolDataMajor, poolDataMinor, poolMetadataMajor, poolMetadataMinor, err := devices.getThinPoolDataMetaMajMin()
-	if err != nil {
-		return err
-	}
-
-	dirname := devices.loopbackDir()
-
-	// data device has not been passed in. So there should be a data file
-	// which is being mounted as loop device.
-	if devices.dataDevice == "" {
-		datafilename := path.Join(dirname, "data")
-		dataLoopDevice, dataMajor, dataMinor, err := getLoopFileDeviceMajMin(datafilename)
-		if err != nil {
-			return err
-		}
-
-		// Compare the two
-		if poolDataMajor == dataMajor && poolDataMinor == dataMinor {
-			devices.dataDevice = dataLoopDevice
-			devices.dataLoopFile = datafilename
-		}
-
-	}
-
-	// metadata device has not been passed in. So there should be a
-	// metadata file which is being mounted as loop device.
-	if devices.metadataDevice == "" {
-		metadatafilename := path.Join(dirname, "metadata")
-		metadataLoopDevice, metadataMajor, metadataMinor, err := getLoopFileDeviceMajMin(metadatafilename)
-		if err != nil {
-			return err
-		}
-		if poolMetadataMajor == metadataMajor && poolMetadataMinor == metadataMinor {
-			devices.metadataDevice = metadataLoopDevice
-			devices.metadataLoopFile = metadatafilename
-		}
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) enableDeferredRemovalDeletion() error {
-
-	// If user asked for deferred removal then check both libdm library
-	// and kernel driver support deferred removal otherwise error out.
-	if enableDeferredRemoval {
-		if !driverDeferredRemovalSupport {
-			return fmt.Errorf("devmapper: Deferred removal can not be enabled as kernel does not support it")
-		}
-		if !devicemapper.LibraryDeferredRemovalSupport {
-			return fmt.Errorf("devmapper: Deferred removal can not be enabled as libdm does not support it")
-		}
-		logrus.Debug("devmapper: Deferred removal support enabled.")
-		devices.deferredRemove = true
-	}
-
-	if enableDeferredDeletion {
-		if !devices.deferredRemove {
-			return fmt.Errorf("devmapper: Deferred deletion can not be enabled as deferred removal is not enabled. Enable deferred removal using --storage-opt dm.use_deferred_removal=true parameter")
-		}
-		logrus.Debug("devmapper: Deferred deletion support enabled.")
-		devices.deferredDelete = true
-	}
-	return nil
-}
-
-func (devices *DeviceSet) initDevmapper(doInit bool) error {
-	// give ourselves to libdm as a log handler
-	devicemapper.LogInit(devices)
-
-	version, err := devicemapper.GetDriverVersion()
-	if err != nil {
-		// Can't even get driver version, assume not supported
-		return graphdriver.ErrNotSupported
-	}
-
-	if err := determineDriverCapabilities(version); err != nil {
-		return graphdriver.ErrNotSupported
-	}
-
-	if err := devices.enableDeferredRemovalDeletion(); err != nil {
-		return err
-	}
-
-	// https://github.com/docker/docker/issues/4036
-	if supported := devicemapper.UdevSetSyncSupport(true); !supported {
-		if dockerversion.IAmStatic == "true" {
-			logrus.Error("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a dynamic binary to use devicemapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option")
-		} else {
-			logrus.Error("devmapper: Udev sync is not supported. This will lead to data loss and unexpected behavior. Install a more recent version of libdevmapper or select a different storage driver. For more information, see https://docs.docker.com/engine/reference/commandline/daemon/#daemon-storage-driver-option")
-		}
-
-		if !devices.overrideUdevSyncCheck {
-			return graphdriver.ErrNotSupported
-		}
-	}
-
-	//create the root dir of the devmapper driver ownership to match this
-	//daemon's remapped root uid/gid so containers can start properly
-	uid, gid, err := idtools.GetRootUIDGID(devices.uidMaps, devices.gidMaps)
-	if err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(devices.root, 0700, uid, gid); err != nil && !os.IsExist(err) {
-		return err
-	}
-	if err := os.MkdirAll(devices.metadataDir(), 0700); err != nil && !os.IsExist(err) {
-		return err
-	}
-
-	// Set the device prefix from the device id and inode of the docker root dir
-
-	st, err := os.Stat(devices.root)
-	if err != nil {
-		return fmt.Errorf("devmapper: Error looking up dir %s: %s", devices.root, err)
-	}
-	sysSt := st.Sys().(*syscall.Stat_t)
-	// "reg-" stands for "regular file".
-	// In the future we might use "dev-" for "device file", etc.
-	// docker-maj,min[-inode] stands for:
-	//	- Managed by docker
-	//	- The target of this device is at major <maj> and minor <min>
-	//	- If <inode> is defined, use that file inside the device as a loopback image. Otherwise use the device itself.
-	devices.devicePrefix = fmt.Sprintf("docker-%d:%d-%d", major(sysSt.Dev), minor(sysSt.Dev), sysSt.Ino)
-	logrus.Debugf("devmapper: Generated prefix: %s", devices.devicePrefix)
-
-	// Check for the existence of the thin-pool device
-	poolExists, err := devices.thinPoolExists(devices.getPoolName())
-	if err != nil {
-		return err
-	}
-
-	// It seems libdevmapper opens this without O_CLOEXEC, and go exec will not close files
-	// that are not Close-on-exec,
-	// so we add this badhack to make sure it closes itself
-	setCloseOnExec("/dev/mapper/control")
-
-	// Make sure the sparse images exist in <root>/devicemapper/data and
-	// <root>/devicemapper/metadata
-
-	createdLoopback := false
-
-	// If the pool doesn't exist, create it
-	if !poolExists && devices.thinPoolDevice == "" {
-		logrus.Debug("devmapper: Pool doesn't exist. Creating it.")
-
-		var (
-			dataFile     *os.File
-			metadataFile *os.File
-		)
-
-		if devices.dataDevice == "" {
-			// Make sure the sparse images exist in <root>/devicemapper/data
-
-			hasData := devices.hasImage("data")
-
-			if !doInit && !hasData {
-				return errors.New("loopback data file not found")
-			}
-
-			if !hasData {
-				createdLoopback = true
-			}
-
-			data, err := devices.ensureImage("data", devices.dataLoopbackSize)
-			if err != nil {
-				logrus.Debugf("devmapper: Error device ensureImage (data): %s", err)
-				return err
-			}
-
-			dataFile, err = loopback.AttachLoopDevice(data)
-			if err != nil {
-				return err
-			}
-			devices.dataLoopFile = data
-			devices.dataDevice = dataFile.Name()
-		} else {
-			dataFile, err = os.OpenFile(devices.dataDevice, os.O_RDWR, 0600)
-			if err != nil {
-				return err
-			}
-		}
-		defer dataFile.Close()
-
-		if devices.metadataDevice == "" {
-			// Make sure the sparse images exist in <root>/devicemapper/metadata
-
-			hasMetadata := devices.hasImage("metadata")
-
-			if !doInit && !hasMetadata {
-				return errors.New("loopback metadata file not found")
-			}
-
-			if !hasMetadata {
-				createdLoopback = true
-			}
-
-			metadata, err := devices.ensureImage("metadata", devices.metaDataLoopbackSize)
-			if err != nil {
-				logrus.Debugf("devmapper: Error device ensureImage (metadata): %s", err)
-				return err
-			}
-
-			metadataFile, err = loopback.AttachLoopDevice(metadata)
-			if err != nil {
-				return err
-			}
-			devices.metadataLoopFile = metadata
-			devices.metadataDevice = metadataFile.Name()
-		} else {
-			metadataFile, err = os.OpenFile(devices.metadataDevice, os.O_RDWR, 0600)
-			if err != nil {
-				return err
-			}
-		}
-		defer metadataFile.Close()
-
-		if err := devicemapper.CreatePool(devices.getPoolName(), dataFile, metadataFile, devices.thinpBlockSize); err != nil {
-			return err
-		}
-	}
-
-	// Pool already exists and caller did not pass us a pool. That means
-	// we probably created pool earlier and could not remove it as some
-	// containers were still using it. Detect some of the properties of
-	// pool, like is it using loop devices.
-	if poolExists && devices.thinPoolDevice == "" {
-		if err := devices.loadThinPoolLoopBackInfo(); err != nil {
-			logrus.Debugf("devmapper: Failed to load thin pool loopback device information:%v", err)
-			return err
-		}
-	}
-
-	// If we didn't just create the data or metadata image, we need to
-	// load the transaction id and migrate old metadata
-	if !createdLoopback {
-		if err := devices.initMetaData(); err != nil {
-			return err
-		}
-	}
-
-	if devices.thinPoolDevice == "" {
-		if devices.metadataLoopFile != "" || devices.dataLoopFile != "" {
-			logrus.Warn("devmapper: Usage of loopback devices is strongly discouraged for production use. Please use `--storage-opt dm.thinpooldev` or use `man docker` to refer to dm.thinpooldev section.")
-		}
-	}
-
-	// Right now this loads only NextDeviceID. If there is more metadata
-	// down the line, we might have to move it earlier.
-	if err := devices.loadDeviceSetMetaData(); err != nil {
-		return err
-	}
-
-	// Setup the base image
-	if doInit {
-		if err := devices.setupBaseImage(); err != nil {
-			logrus.Debugf("devmapper: Error device setupBaseImage: %s", err)
-			return err
-		}
-	}
-
-	return nil
-}
-
-// AddDevice adds a device and registers in the hash.
-func (devices *DeviceSet) AddDevice(hash, baseHash string, storageOpt map[string]string) error {
-	logrus.Debugf("devmapper: AddDevice START(hash=%s basehash=%s)", hash, baseHash)
-	defer logrus.Debugf("devmapper: AddDevice END(hash=%s basehash=%s)", hash, baseHash)
-
-	// If a deleted device exists, return error.
-	baseInfo, err := devices.lookupDeviceWithLock(baseHash)
-	if err != nil {
-		return err
-	}
-
-	if baseInfo.Deleted {
-		return fmt.Errorf("devmapper: Base device %v has been marked for deferred deletion", baseInfo.Hash)
-	}
-
-	baseInfo.lock.Lock()
-	defer baseInfo.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	// Also include deleted devices in case hash of new device is
-	// same as one of the deleted devices.
-	if info, _ := devices.lookupDevice(hash); info != nil {
-		return fmt.Errorf("devmapper: device %s already exists. Deleted=%v", hash, info.Deleted)
-	}
-
-	size, err := devices.parseStorageOpt(storageOpt)
-	if err != nil {
-		return err
-	}
-
-	if size == 0 {
-		size = baseInfo.Size
-	}
-
-	if size < baseInfo.Size {
-		return fmt.Errorf("devmapper: Container size cannot be smaller than %s", units.HumanSize(float64(baseInfo.Size)))
-	}
-
-	if err := devices.takeSnapshot(hash, baseInfo, size); err != nil {
-		return err
-	}
-
-	// Grow the container rootfs.
-	if size > baseInfo.Size {
-		info, err := devices.lookupDevice(hash)
-		if err != nil {
-			return err
-		}
-
-		if err := devices.growFS(info); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) parseStorageOpt(storageOpt map[string]string) (uint64, error) {
-
-	// Read size to change the block device size per container.
-	for key, val := range storageOpt {
-		key := strings.ToLower(key)
-		switch key {
-		case "size":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return 0, err
-			}
-			return uint64(size), nil
-		default:
-			return 0, fmt.Errorf("Unknown option %s", key)
-		}
-	}
-
-	return 0, nil
-}
-
-func (devices *DeviceSet) markForDeferredDeletion(info *devInfo) error {
-	// If device is already in deleted state, there is nothing to be done.
-	if info.Deleted {
-		return nil
-	}
-
-	logrus.Debugf("devmapper: Marking device %s for deferred deletion.", info.Hash)
-
-	info.Deleted = true
-
-	// save device metadata to reflect deleted state.
-	if err := devices.saveMetadata(info); err != nil {
-		info.Deleted = false
-		return err
-	}
-
-	devices.nrDeletedDevices++
-	return nil
-}
-
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) deleteTransaction(info *devInfo, syncDelete bool) error {
-	if err := devices.openTransaction(info.Hash, info.DeviceID); err != nil {
-		logrus.Debugf("devmapper: Error opening transaction hash = %s deviceId = %d", "", info.DeviceID)
-		return err
-	}
-
-	defer devices.closeTransaction()
-
-	err := devicemapper.DeleteDevice(devices.getPoolDevName(), info.DeviceID)
-	if err != nil {
-		// If syncDelete is true, we want to return error. If deferred
-		// deletion is not enabled, we return an error. If error is
-		// something other then EBUSY, return an error.
-		if syncDelete || !devices.deferredDelete || err != devicemapper.ErrBusy {
-			logrus.Debugf("devmapper: Error deleting device: %s", err)
-			return err
-		}
-	}
-
-	if err == nil {
-		if err := devices.unregisterDevice(info.DeviceID, info.Hash); err != nil {
-			return err
-		}
-		// If device was already in deferred delete state that means
-		// deletion was being tried again later. Reduce the deleted
-		// device count.
-		if info.Deleted {
-			devices.nrDeletedDevices--
-		}
-		devices.markDeviceIDFree(info.DeviceID)
-	} else {
-		if err := devices.markForDeferredDeletion(info); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Issue discard only if device open count is zero.
-func (devices *DeviceSet) issueDiscard(info *devInfo) error {
-	logrus.Debugf("devmapper: issueDiscard START(device: %s).", info.Hash)
-	defer logrus.Debugf("devmapper: issueDiscard END(device: %s).", info.Hash)
-	// This is a workaround for the kernel not discarding block so
-	// on the thin pool when we remove a thinp device, so we do it
-	// manually.
-	// Even if device is deferred deleted, activate it and issue
-	// discards.
-	if err := devices.activateDeviceIfNeeded(info, true); err != nil {
-		return err
-	}
-
-	devinfo, err := devicemapper.GetInfo(info.Name())
-	if err != nil {
-		return err
-	}
-
-	if devinfo.OpenCount != 0 {
-		logrus.Debugf("devmapper: Device: %s is in use. OpenCount=%d. Not issuing discards.", info.Hash, devinfo.OpenCount)
-		return nil
-	}
-
-	if err := devicemapper.BlockDeviceDiscard(info.DevName()); err != nil {
-		logrus.Debugf("devmapper: Error discarding block on device: %s (ignoring)", err)
-	}
-	return nil
-}
-
-// Should be called with devices.Lock() held.
-func (devices *DeviceSet) deleteDevice(info *devInfo, syncDelete bool) error {
-	if devices.doBlkDiscard {
-		devices.issueDiscard(info)
-	}
-
-	// Try to deactivate device in case it is active.
-	if err := devices.deactivateDevice(info); err != nil {
-		logrus.Debugf("devmapper: Error deactivating device: %s", err)
-		return err
-	}
-
-	if err := devices.deleteTransaction(info, syncDelete); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// DeleteDevice will return success if device has been marked for deferred
-// removal. If one wants to override that and want DeleteDevice() to fail if
-// device was busy and could not be deleted, set syncDelete=true.
-func (devices *DeviceSet) DeleteDevice(hash string, syncDelete bool) error {
-	logrus.Debugf("devmapper: DeleteDevice START(hash=%v syncDelete=%v)", hash, syncDelete)
-	defer logrus.Debugf("devmapper: DeleteDevice END(hash=%v syncDelete=%v)", hash, syncDelete)
-	info, err := devices.lookupDeviceWithLock(hash)
-	if err != nil {
-		return err
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	return devices.deleteDevice(info, syncDelete)
-}
-
-func (devices *DeviceSet) deactivatePool() error {
-	logrus.Debug("devmapper: deactivatePool() START")
-	defer logrus.Debug("devmapper: deactivatePool() END")
-	devname := devices.getPoolDevName()
-
-	devinfo, err := devicemapper.GetInfo(devname)
-	if err != nil {
-		return err
-	}
-
-	if devinfo.Exists == 0 {
-		return nil
-	}
-	if err := devicemapper.RemoveDevice(devname); err != nil {
-		return err
-	}
-
-	if d, err := devicemapper.GetDeps(devname); err == nil {
-		logrus.Warnf("devmapper: device %s still has %d active dependents", devname, d.Count)
-	}
-
-	return nil
-}
-
-func (devices *DeviceSet) deactivateDevice(info *devInfo) error {
-	logrus.Debugf("devmapper: deactivateDevice START(%s)", info.Hash)
-	defer logrus.Debugf("devmapper: deactivateDevice END(%s)", info.Hash)
-
-	devinfo, err := devicemapper.GetInfo(info.Name())
-	if err != nil {
-		return err
-	}
-
-	if devinfo.Exists == 0 {
-		return nil
-	}
-
-	if devices.deferredRemove {
-		if err := devicemapper.RemoveDeviceDeferred(info.Name()); err != nil {
-			return err
-		}
-	} else {
-		if err := devices.removeDevice(info.Name()); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Issues the underlying dm remove operation.
-func (devices *DeviceSet) removeDevice(devname string) error {
-	var err error
-
-	logrus.Debugf("devmapper: removeDevice START(%s)", devname)
-	defer logrus.Debugf("devmapper: removeDevice END(%s)", devname)
-
-	for i := 0; i < 200; i++ {
-		err = devicemapper.RemoveDevice(devname)
-		if err == nil {
-			break
-		}
-		if err != devicemapper.ErrBusy {
-			return err
-		}
-
-		// If we see EBUSY it may be a transient error,
-		// sleep a bit a retry a few times.
-		devices.Unlock()
-		time.Sleep(100 * time.Millisecond)
-		devices.Lock()
-	}
-
-	return err
-}
-
-func (devices *DeviceSet) cancelDeferredRemovalIfNeeded(info *devInfo) error {
-	if !devices.deferredRemove {
-		return nil
-	}
-
-	logrus.Debugf("devmapper: cancelDeferredRemovalIfNeeded START(%s)", info.Name())
-	defer logrus.Debugf("devmapper: cancelDeferredRemovalIfNeeded END(%s)", info.Name())
-
-	devinfo, err := devicemapper.GetInfoWithDeferred(info.Name())
-	if err != nil {
-		return err
-	}
-
-	if devinfo != nil && devinfo.DeferredRemove == 0 {
-		return nil
-	}
-
-	// Cancel deferred remove
-	if err := devices.cancelDeferredRemoval(info); err != nil {
-		// If Error is ErrEnxio. Device is probably already gone. Continue.
-		if err != devicemapper.ErrEnxio {
-			return err
-		}
-	}
-	return nil
-}
-
-func (devices *DeviceSet) cancelDeferredRemoval(info *devInfo) error {
-	logrus.Debugf("devmapper: cancelDeferredRemoval START(%s)", info.Name())
-	defer logrus.Debugf("devmapper: cancelDeferredRemoval END(%s)", info.Name())
-
-	var err error
-
-	// Cancel deferred remove
-	for i := 0; i < 100; i++ {
-		err = devicemapper.CancelDeferredRemove(info.Name())
-		if err != nil {
-			if err == devicemapper.ErrBusy {
-				// If we see EBUSY it may be a transient error,
-				// sleep a bit a retry a few times.
-				devices.Unlock()
-				time.Sleep(100 * time.Millisecond)
-				devices.Lock()
-				continue
-			}
-		}
-		break
-	}
-	return err
-}
-
-// Shutdown shuts down the device by unmounting the root.
-func (devices *DeviceSet) Shutdown(home string) error {
-	logrus.Debugf("devmapper: [deviceset %s] Shutdown()", devices.devicePrefix)
-	logrus.Debugf("devmapper: Shutting down DeviceSet: %s", devices.root)
-	defer logrus.Debugf("devmapper: [deviceset %s] Shutdown() END", devices.devicePrefix)
-
-	// Stop deletion worker. This should start delivering new events to
-	// ticker channel. That means no new instance of cleanupDeletedDevice()
-	// will run after this call. If one instance is already running at
-	// the time of the call, it must be holding devices.Lock() and
-	// we will block on this lock till cleanup function exits.
-	devices.deletionWorkerTicker.Stop()
-
-	devices.Lock()
-	// Save DeviceSet Metadata first. Docker kills all threads if they
-	// don't finish in certain time. It is possible that Shutdown()
-	// routine does not finish in time as we loop trying to deactivate
-	// some devices while these are busy. In that case shutdown() routine
-	// will be killed and we will not get a chance to save deviceset
-	// metadata. Hence save this early before trying to deactivate devices.
-	devices.saveDeviceSetMetaData()
-
-	// ignore the error since it's just a best effort to not try to unmount something that's mounted
-	mounts, _ := mount.GetMounts()
-	mounted := make(map[string]bool, len(mounts))
-	for _, mnt := range mounts {
-		mounted[mnt.Mountpoint] = true
-	}
-
-	if err := filepath.Walk(path.Join(home, "mnt"), func(p string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() {
-			return nil
-		}
-
-		if mounted[p] {
-			// We use MNT_DETACH here in case it is still busy in some running
-			// container. This means it'll go away from the global scope directly,
-			// and the device will be released when that container dies.
-			if err := syscall.Unmount(p, syscall.MNT_DETACH); err != nil {
-				logrus.Debugf("devmapper: Shutdown unmounting %s, error: %s", p, err)
-			}
-		}
-
-		if devInfo, err := devices.lookupDevice(path.Base(p)); err != nil {
-			logrus.Debugf("devmapper: Shutdown lookup device %s, error: %s", path.Base(p), err)
-		} else {
-			if err := devices.deactivateDevice(devInfo); err != nil {
-				logrus.Debugf("devmapper: Shutdown deactivate %s , error: %s", devInfo.Hash, err)
-			}
-		}
-
-		return nil
-	}); err != nil && !os.IsNotExist(err) {
-		devices.Unlock()
-		return err
-	}
-
-	devices.Unlock()
-
-	info, _ := devices.lookupDeviceWithLock("")
-	if info != nil {
-		info.lock.Lock()
-		devices.Lock()
-		if err := devices.deactivateDevice(info); err != nil {
-			logrus.Debugf("devmapper: Shutdown deactivate base , error: %s", err)
-		}
-		devices.Unlock()
-		info.lock.Unlock()
-	}
-
-	devices.Lock()
-	if devices.thinPoolDevice == "" {
-		if err := devices.deactivatePool(); err != nil {
-			logrus.Debugf("devmapper: Shutdown deactivate pool , error: %s", err)
-		}
-	}
-	devices.Unlock()
-
-	return nil
-}
-
-// Recent XFS changes allow changing behavior of filesystem in case of errors.
-// When thin pool gets full and XFS gets ENOSPC error, currently it tries
-// IO infinitely and sometimes it can block the container process
-// and process can't be killWith 0 value, XFS will not retry upon error
-// and instead will shutdown filesystem.
-
-func (devices *DeviceSet) xfsSetNospaceRetries(info *devInfo) error {
-	dmDevicePath, err := os.Readlink(info.DevName())
-	if err != nil {
-		return fmt.Errorf("devmapper: readlink failed for device %v:%v", info.DevName(), err)
-	}
-
-	dmDeviceName := path.Base(dmDevicePath)
-	filePath := "/sys/fs/xfs/" + dmDeviceName + "/error/metadata/ENOSPC/max_retries"
-	maxRetriesFile, err := os.OpenFile(filePath, os.O_WRONLY, 0)
-	if err != nil {
-		return fmt.Errorf("devmapper: user specified daemon option dm.xfs_nospace_max_retries but it does not seem to be supported on this system :%v", err)
-	}
-	defer maxRetriesFile.Close()
-
-	// Set max retries to 0
-	_, err = maxRetriesFile.WriteString(devices.xfsNospaceRetries)
-	if err != nil {
-		return fmt.Errorf("devmapper: Failed to write string %v to file %v:%v", devices.xfsNospaceRetries, filePath, err)
-	}
-	return nil
-}
-
-// MountDevice mounts the device if not already mounted.
-func (devices *DeviceSet) MountDevice(hash, path, mountLabel string) error {
-	info, err := devices.lookupDeviceWithLock(hash)
-	if err != nil {
-		return err
-	}
-
-	if info.Deleted {
-		return fmt.Errorf("devmapper: Can't mount device %v as it has been marked for deferred deletion", info.Hash)
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	if err := devices.activateDeviceIfNeeded(info, false); err != nil {
-		return fmt.Errorf("devmapper: Error activating devmapper device for '%s': %s", hash, err)
-	}
-
-	fstype, err := ProbeFsType(info.DevName())
-	if err != nil {
-		return err
-	}
-
-	options := ""
-
-	if fstype == "xfs" {
-		// XFS needs nouuid or it can't mount filesystems with the same fs
-		options = joinMountOptions(options, "nouuid")
-	}
-
-	options = joinMountOptions(options, devices.mountOptions)
-	options = joinMountOptions(options, label.FormatMountLabel("", mountLabel))
-
-	if err := mount.Mount(info.DevName(), path, fstype, options); err != nil {
-		return fmt.Errorf("devmapper: Error mounting '%s' on '%s': %s", info.DevName(), path, err)
-	}
-
-	if fstype == "xfs" && devices.xfsNospaceRetries != "" {
-		if err := devices.xfsSetNospaceRetries(info); err != nil {
-			syscall.Unmount(path, syscall.MNT_DETACH)
-			devices.deactivateDevice(info)
-			return err
-		}
-	}
-
-	return nil
-}
-
-// UnmountDevice unmounts the device and removes it from hash.
-func (devices *DeviceSet) UnmountDevice(hash, mountPath string) error {
-	logrus.Debugf("devmapper: UnmountDevice START(hash=%s)", hash)
-	defer logrus.Debugf("devmapper: UnmountDevice END(hash=%s)", hash)
-
-	info, err := devices.lookupDeviceWithLock(hash)
-	if err != nil {
-		return err
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	logrus.Debugf("devmapper: Unmount(%s)", mountPath)
-	if err := syscall.Unmount(mountPath, syscall.MNT_DETACH); err != nil {
-		return err
-	}
-	logrus.Debug("devmapper: Unmount done")
-
-	if err := devices.deactivateDevice(info); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// HasDevice returns true if the device metadata exists.
-func (devices *DeviceSet) HasDevice(hash string) bool {
-	info, _ := devices.lookupDeviceWithLock(hash)
-	return info != nil
-}
-
-// List returns a list of device ids.
-func (devices *DeviceSet) List() []string {
-	devices.Lock()
-	defer devices.Unlock()
-
-	ids := make([]string, len(devices.Devices))
-	i := 0
-	for k := range devices.Devices {
-		ids[i] = k
-		i++
-	}
-	return ids
-}
-
-func (devices *DeviceSet) deviceStatus(devName string) (sizeInSectors, mappedSectors, highestMappedSector uint64, err error) {
-	var params string
-	_, sizeInSectors, _, params, err = devicemapper.GetStatus(devName)
-	if err != nil {
-		return
-	}
-	if _, err = fmt.Sscanf(params, "%d %d", &mappedSectors, &highestMappedSector); err == nil {
-		return
-	}
-	return
-}
-
-// GetDeviceStatus provides size, mapped sectors
-func (devices *DeviceSet) GetDeviceStatus(hash string) (*DevStatus, error) {
-	info, err := devices.lookupDeviceWithLock(hash)
-	if err != nil {
-		return nil, err
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	devices.Lock()
-	defer devices.Unlock()
-
-	status := &DevStatus{
-		DeviceID:      info.DeviceID,
-		Size:          info.Size,
-		TransactionID: info.TransactionID,
-	}
-
-	if err := devices.activateDeviceIfNeeded(info, false); err != nil {
-		return nil, fmt.Errorf("devmapper: Error activating devmapper device for '%s': %s", hash, err)
-	}
-
-	sizeInSectors, mappedSectors, highestMappedSector, err := devices.deviceStatus(info.DevName())
-
-	if err != nil {
-		return nil, err
-	}
-
-	status.SizeInSectors = sizeInSectors
-	status.MappedSectors = mappedSectors
-	status.HighestMappedSector = highestMappedSector
-
-	return status, nil
-}
-
-func (devices *DeviceSet) poolStatus() (totalSizeInSectors, transactionID, dataUsed, dataTotal, metadataUsed, metadataTotal uint64, err error) {
-	var params string
-	if _, totalSizeInSectors, _, params, err = devicemapper.GetStatus(devices.getPoolName()); err == nil {
-		_, err = fmt.Sscanf(params, "%d %d/%d %d/%d", &transactionID, &metadataUsed, &metadataTotal, &dataUsed, &dataTotal)
-	}
-	return
-}
-
-// DataDevicePath returns the path to the data storage for this deviceset,
-// regardless of loopback or block device
-func (devices *DeviceSet) DataDevicePath() string {
-	return devices.dataDevice
-}
-
-// MetadataDevicePath returns the path to the metadata storage for this deviceset,
-// regardless of loopback or block device
-func (devices *DeviceSet) MetadataDevicePath() string {
-	return devices.metadataDevice
-}
-
-func (devices *DeviceSet) getUnderlyingAvailableSpace(loopFile string) (uint64, error) {
-	buf := new(syscall.Statfs_t)
-	if err := syscall.Statfs(loopFile, buf); err != nil {
-		logrus.Warnf("devmapper: Couldn't stat loopfile filesystem %v: %v", loopFile, err)
-		return 0, err
-	}
-	return buf.Bfree * uint64(buf.Bsize), nil
-}
-
-func (devices *DeviceSet) isRealFile(loopFile string) (bool, error) {
-	if loopFile != "" {
-		fi, err := os.Stat(loopFile)
-		if err != nil {
-			logrus.Warnf("devmapper: Couldn't stat loopfile %v: %v", loopFile, err)
-			return false, err
-		}
-		return fi.Mode().IsRegular(), nil
-	}
-	return false, nil
-}
-
-// Status returns the current status of this deviceset
-func (devices *DeviceSet) Status() *Status {
-	devices.Lock()
-	defer devices.Unlock()
-
-	status := &Status{}
-
-	status.PoolName = devices.getPoolName()
-	status.DataFile = devices.DataDevicePath()
-	status.DataLoopback = devices.dataLoopFile
-	status.MetadataFile = devices.MetadataDevicePath()
-	status.MetadataLoopback = devices.metadataLoopFile
-	status.UdevSyncSupported = devicemapper.UdevSyncSupported()
-	status.DeferredRemoveEnabled = devices.deferredRemove
-	status.DeferredDeleteEnabled = devices.deferredDelete
-	status.DeferredDeletedDeviceCount = devices.nrDeletedDevices
-	status.BaseDeviceSize = devices.getBaseDeviceSize()
-	status.BaseDeviceFS = devices.getBaseDeviceFS()
-
-	totalSizeInSectors, _, dataUsed, dataTotal, metadataUsed, metadataTotal, err := devices.poolStatus()
-	if err == nil {
-		// Convert from blocks to bytes
-		blockSizeInSectors := totalSizeInSectors / dataTotal
-
-		status.Data.Used = dataUsed * blockSizeInSectors * 512
-		status.Data.Total = dataTotal * blockSizeInSectors * 512
-		status.Data.Available = status.Data.Total - status.Data.Used
-
-		// metadata blocks are always 4k
-		status.Metadata.Used = metadataUsed * 4096
-		status.Metadata.Total = metadataTotal * 4096
-		status.Metadata.Available = status.Metadata.Total - status.Metadata.Used
-
-		status.SectorSize = blockSizeInSectors * 512
-
-		if check, _ := devices.isRealFile(devices.dataLoopFile); check {
-			actualSpace, err := devices.getUnderlyingAvailableSpace(devices.dataLoopFile)
-			if err == nil && actualSpace < status.Data.Available {
-				status.Data.Available = actualSpace
-			}
-		}
-
-		if check, _ := devices.isRealFile(devices.metadataLoopFile); check {
-			actualSpace, err := devices.getUnderlyingAvailableSpace(devices.metadataLoopFile)
-			if err == nil && actualSpace < status.Metadata.Available {
-				status.Metadata.Available = actualSpace
-			}
-		}
-
-		minFreeData := (dataTotal * uint64(devices.minFreeSpacePercent)) / 100
-		status.MinFreeSpace = minFreeData * blockSizeInSectors * 512
-	}
-
-	return status
-}
-
-// Status returns the current status of this deviceset
-func (devices *DeviceSet) exportDeviceMetadata(hash string) (*deviceMetadata, error) {
-	info, err := devices.lookupDeviceWithLock(hash)
-	if err != nil {
-		return nil, err
-	}
-
-	info.lock.Lock()
-	defer info.lock.Unlock()
-
-	metadata := &deviceMetadata{info.DeviceID, info.Size, info.Name()}
-	return metadata, nil
-}
-
-// NewDeviceSet creates the device set based on the options provided.
-func NewDeviceSet(root string, doInit bool, options []string, uidMaps, gidMaps []idtools.IDMap) (*DeviceSet, error) {
-	devicemapper.SetDevDir("/dev")
-
-	devices := &DeviceSet{
-		root:                  root,
-		metaData:              metaData{Devices: make(map[string]*devInfo)},
-		dataLoopbackSize:      defaultDataLoopbackSize,
-		metaDataLoopbackSize:  defaultMetaDataLoopbackSize,
-		baseFsSize:            defaultBaseFsSize,
-		overrideUdevSyncCheck: defaultUdevSyncOverride,
-		doBlkDiscard:          true,
-		thinpBlockSize:        defaultThinpBlockSize,
-		deviceIDMap:           make([]byte, deviceIDMapSz),
-		deletionWorkerTicker:  time.NewTicker(time.Second * 30),
-		uidMaps:               uidMaps,
-		gidMaps:               gidMaps,
-		minFreeSpacePercent:   defaultMinFreeSpacePercent,
-	}
-
-	foundBlkDiscard := false
-	for _, option := range options {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil {
-			return nil, err
-		}
-		key = strings.ToLower(key)
-		switch key {
-		case "dm.basesize":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return nil, err
-			}
-			userBaseSize = true
-			devices.baseFsSize = uint64(size)
-		case "dm.loopdatasize":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return nil, err
-			}
-			devices.dataLoopbackSize = size
-		case "dm.loopmetadatasize":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return nil, err
-			}
-			devices.metaDataLoopbackSize = size
-		case "dm.fs":
-			if val != "ext4" && val != "xfs" {
-				return nil, fmt.Errorf("devmapper: Unsupported filesystem %s\n", val)
-			}
-			devices.filesystem = val
-		case "dm.mkfsarg":
-			devices.mkfsArgs = append(devices.mkfsArgs, val)
-		case "dm.mountopt":
-			devices.mountOptions = joinMountOptions(devices.mountOptions, val)
-		case "dm.metadatadev":
-			devices.metadataDevice = val
-		case "dm.datadev":
-			devices.dataDevice = val
-		case "dm.thinpooldev":
-			devices.thinPoolDevice = strings.TrimPrefix(val, "/dev/mapper/")
-		case "dm.blkdiscard":
-			foundBlkDiscard = true
-			devices.doBlkDiscard, err = strconv.ParseBool(val)
-			if err != nil {
-				return nil, err
-			}
-		case "dm.blocksize":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return nil, err
-			}
-			// convert to 512b sectors
-			devices.thinpBlockSize = uint32(size) >> 9
-		case "dm.override_udev_sync_check":
-			devices.overrideUdevSyncCheck, err = strconv.ParseBool(val)
-			if err != nil {
-				return nil, err
-			}
-
-		case "dm.use_deferred_removal":
-			enableDeferredRemoval, err = strconv.ParseBool(val)
-			if err != nil {
-				return nil, err
-			}
-
-		case "dm.use_deferred_deletion":
-			enableDeferredDeletion, err = strconv.ParseBool(val)
-			if err != nil {
-				return nil, err
-			}
-
-		case "dm.min_free_space":
-			if !strings.HasSuffix(val, "%") {
-				return nil, fmt.Errorf("devmapper: Option dm.min_free_space requires %% suffix")
-			}
-
-			valstring := strings.TrimSuffix(val, "%")
-			minFreeSpacePercent, err := strconv.ParseUint(valstring, 10, 32)
-			if err != nil {
-				return nil, err
-			}
-
-			if minFreeSpacePercent >= 100 {
-				return nil, fmt.Errorf("devmapper: Invalid value %v for option dm.min_free_space", val)
-			}
-
-			devices.minFreeSpacePercent = uint32(minFreeSpacePercent)
-		case "dm.xfs_nospace_max_retries":
-			_, err := strconv.ParseUint(val, 10, 64)
-			if err != nil {
-				return nil, err
-			}
-			devices.xfsNospaceRetries = val
-		default:
-			return nil, fmt.Errorf("devmapper: Unknown option %s\n", key)
-		}
-	}
-
-	// By default, don't do blk discard hack on raw devices, its rarely useful and is expensive
-	if !foundBlkDiscard && (devices.dataDevice != "" || devices.thinPoolDevice != "") {
-		devices.doBlkDiscard = false
-	}
-
-	if err := devices.initDevmapper(doInit); err != nil {
-		return nil, err
-	}
-
-	return devices, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_doc.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_doc.go
deleted file mode 100644
index 9ab3e4f864..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_doc.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package devmapper
-
-// Definition of struct dm_task and sub structures (from lvm2)
-//
-// struct dm_ioctl {
-// 	/*
-// 	 * The version number is made up of three parts:
-// 	 * major - no backward or forward compatibility,
-// 	 * minor - only backwards compatible,
-// 	 * patch - both backwards and forwards compatible.
-// 	 *
-// 	 * All clients of the ioctl interface should fill in the
-// 	 * version number of the interface that they were
-// 	 * compiled with.
-// 	 *
-// 	 * All recognized ioctl commands (ie. those that don't
-// 	 * return -ENOTTY) fill out this field, even if the
-// 	 * command failed.
-// 	 */
-// 	uint32_t version[3];	/* in/out */
-// 	uint32_t data_size;	/* total size of data passed in
-// 				 * including this struct */
-
-// 	uint32_t data_start;	/* offset to start of data
-// 				 * relative to start of this struct */
-
-// 	uint32_t target_count;	/* in/out */
-// 	int32_t open_count;	/* out */
-// 	uint32_t flags;		/* in/out */
-
-// 	/*
-// 	 * event_nr holds either the event number (input and output) or the
-// 	 * udev cookie value (input only).
-// 	 * The DM_DEV_WAIT ioctl takes an event number as input.
-// 	 * The DM_SUSPEND, DM_DEV_REMOVE and DM_DEV_RENAME ioctls
-// 	 * use the field as a cookie to return in the DM_COOKIE
-// 	 * variable with the uevents they issue.
-// 	 * For output, the ioctls return the event number, not the cookie.
-// 	 */
-// 	uint32_t event_nr;      	/* in/out */
-// 	uint32_t padding;
-
-// 	uint64_t dev;		/* in/out */
-
-// 	char name[DM_NAME_LEN];	/* device name */
-// 	char uuid[DM_UUID_LEN];	/* unique identifier for
-// 				 * the block device */
-// 	char data[7];		/* padding or data */
-// };
-
-// struct target {
-// 	uint64_t start;
-// 	uint64_t length;
-// 	char *type;
-// 	char *params;
-
-// 	struct target *next;
-// };
-
-// typedef enum {
-// 	DM_ADD_NODE_ON_RESUME, /* add /dev/mapper node with dmsetup resume */
-// 	DM_ADD_NODE_ON_CREATE  /* add /dev/mapper node with dmsetup create */
-// } dm_add_node_t;
-
-// struct dm_task {
-// 	int type;
-// 	char *dev_name;
-// 	char *mangled_dev_name;
-
-// 	struct target *head, *tail;
-
-// 	int read_only;
-// 	uint32_t event_nr;
-// 	int major;
-// 	int minor;
-// 	int allow_default_major_fallback;
-// 	uid_t uid;
-// 	gid_t gid;
-// 	mode_t mode;
-// 	uint32_t read_ahead;
-// 	uint32_t read_ahead_flags;
-// 	union {
-// 		struct dm_ioctl *v4;
-// 	} dmi;
-// 	char *newname;
-// 	char *message;
-// 	char *geometry;
-// 	uint64_t sector;
-// 	int no_flush;
-// 	int no_open_count;
-// 	int skip_lockfs;
-// 	int query_inactive_table;
-// 	int suppress_identical_reload;
-// 	dm_add_node_t add_node;
-// 	uint64_t existing_table_size;
-// 	int cookie_set;
-// 	int new_uuid;
-// 	int secure_data;
-// 	int retry_remove;
-// 	int enable_checks;
-// 	int expected_errno;
-
-// 	char *uuid;
-// 	char *mangled_uuid;
-// };
-//
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go
deleted file mode 100644
index 5c2abcefcb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/devmapper_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// +build linux
-
-package devmapper
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-)
-
-func init() {
-	// Reduce the size the the base fs and loopback for the tests
-	defaultDataLoopbackSize = 300 * 1024 * 1024
-	defaultMetaDataLoopbackSize = 200 * 1024 * 1024
-	defaultBaseFsSize = 300 * 1024 * 1024
-	defaultUdevSyncOverride = true
-	if err := graphtest.InitLoopbacks(); err != nil {
-		panic(err)
-	}
-}
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestDevmapperSetup and TestDevmapperTeardown
-func TestDevmapperSetup(t *testing.T) {
-	graphtest.GetDriver(t, "devicemapper")
-}
-
-func TestDevmapperCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, "devicemapper")
-}
-
-func TestDevmapperCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, "devicemapper")
-}
-
-func TestDevmapperCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, "devicemapper")
-}
-
-func TestDevmapperTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
-
-func TestDevmapperReduceLoopBackSize(t *testing.T) {
-	tenMB := int64(10 * 1024 * 1024)
-	testChangeLoopBackSize(t, -tenMB, defaultDataLoopbackSize, defaultMetaDataLoopbackSize)
-}
-
-func TestDevmapperIncreaseLoopBackSize(t *testing.T) {
-	tenMB := int64(10 * 1024 * 1024)
-	testChangeLoopBackSize(t, tenMB, defaultDataLoopbackSize+tenMB, defaultMetaDataLoopbackSize+tenMB)
-}
-
-func testChangeLoopBackSize(t *testing.T, delta, expectDataSize, expectMetaDataSize int64) {
-	driver := graphtest.GetDriver(t, "devicemapper").(*graphtest.Driver).Driver.(*graphdriver.NaiveDiffDriver).ProtoDriver.(*Driver)
-	defer graphtest.PutDriver(t)
-	// make sure data or metadata loopback size are the default size
-	if s := driver.DeviceSet.Status(); s.Data.Total != uint64(defaultDataLoopbackSize) || s.Metadata.Total != uint64(defaultMetaDataLoopbackSize) {
-		t.Fatalf("data or metadata loop back size is incorrect")
-	}
-	if err := driver.Cleanup(); err != nil {
-		t.Fatal(err)
-	}
-	//Reload
-	d, err := Init(driver.home, []string{
-		fmt.Sprintf("dm.loopdatasize=%d", defaultDataLoopbackSize+delta),
-		fmt.Sprintf("dm.loopmetadatasize=%d", defaultMetaDataLoopbackSize+delta),
-	}, nil, nil)
-	if err != nil {
-		t.Fatalf("error creating devicemapper driver: %v", err)
-	}
-	driver = d.(*graphdriver.NaiveDiffDriver).ProtoDriver.(*Driver)
-	if s := driver.DeviceSet.Status(); s.Data.Total != uint64(expectDataSize) || s.Metadata.Total != uint64(expectMetaDataSize) {
-		t.Fatalf("data or metadata loop back size is incorrect")
-	}
-	if err := driver.Cleanup(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Make sure devices.Lock() has been release upon return from cleanupDeletedDevices() function
-func TestDevmapperLockReleasedDeviceDeletion(t *testing.T) {
-	driver := graphtest.GetDriver(t, "devicemapper").(*graphtest.Driver).Driver.(*graphdriver.NaiveDiffDriver).ProtoDriver.(*Driver)
-	defer graphtest.PutDriver(t)
-
-	// Call cleanupDeletedDevices() and after the call take and release
-	// DeviceSet Lock. If lock has not been released, this will hang.
-	driver.DeviceSet.cleanupDeletedDevices()
-
-	doneChan := make(chan bool)
-
-	go func() {
-		driver.DeviceSet.Lock()
-		defer driver.DeviceSet.Unlock()
-		doneChan <- true
-	}()
-
-	select {
-	case <-time.After(time.Second * 5):
-		// Timer expired. That means lock was not released upon
-		// function return and we are deadlocked. Release lock
-		// here so that cleanup could succeed and fail the test.
-		driver.DeviceSet.Unlock()
-		t.Fatalf("Could not acquire devices lock after call to cleanupDeletedDevices()")
-	case <-doneChan:
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go
deleted file mode 100644
index 7cf422ce6a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/driver.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// +build linux
-
-package devmapper
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/devicemapper"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/go-units"
-)
-
-func init() {
-	graphdriver.Register("devicemapper", Init)
-}
-
-// Driver contains the device set mounted and the home directory
-type Driver struct {
-	*DeviceSet
-	home    string
-	uidMaps []idtools.IDMap
-	gidMaps []idtools.IDMap
-	ctr     *graphdriver.RefCounter
-}
-
-// Init creates a driver with the given home and the set of options.
-func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	deviceSet, err := NewDeviceSet(home, true, options, uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := mount.MakePrivate(home); err != nil {
-		return nil, err
-	}
-
-	d := &Driver{
-		DeviceSet: deviceSet,
-		home:      home,
-		uidMaps:   uidMaps,
-		gidMaps:   gidMaps,
-		ctr:       graphdriver.NewRefCounter(graphdriver.NewDefaultChecker()),
-	}
-
-	return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil
-}
-
-func (d *Driver) String() string {
-	return "devicemapper"
-}
-
-// Status returns the status about the driver in a printable format.
-// Information returned contains Pool Name, Data File, Metadata file, disk usage by
-// the data and metadata, etc.
-func (d *Driver) Status() [][2]string {
-	s := d.DeviceSet.Status()
-
-	status := [][2]string{
-		{"Pool Name", s.PoolName},
-		{"Pool Blocksize", fmt.Sprintf("%s", units.HumanSize(float64(s.SectorSize)))},
-		{"Base Device Size", fmt.Sprintf("%s", units.HumanSize(float64(s.BaseDeviceSize)))},
-		{"Backing Filesystem", s.BaseDeviceFS},
-		{"Data file", s.DataFile},
-		{"Metadata file", s.MetadataFile},
-		{"Data Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Used)))},
-		{"Data Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Total)))},
-		{"Data Space Available", fmt.Sprintf("%s", units.HumanSize(float64(s.Data.Available)))},
-		{"Metadata Space Used", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Used)))},
-		{"Metadata Space Total", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Total)))},
-		{"Metadata Space Available", fmt.Sprintf("%s", units.HumanSize(float64(s.Metadata.Available)))},
-		{"Thin Pool Minimum Free Space", fmt.Sprintf("%s", units.HumanSize(float64(s.MinFreeSpace)))},
-		{"Udev Sync Supported", fmt.Sprintf("%v", s.UdevSyncSupported)},
-		{"Deferred Removal Enabled", fmt.Sprintf("%v", s.DeferredRemoveEnabled)},
-		{"Deferred Deletion Enabled", fmt.Sprintf("%v", s.DeferredDeleteEnabled)},
-		{"Deferred Deleted Device Count", fmt.Sprintf("%v", s.DeferredDeletedDeviceCount)},
-	}
-	if len(s.DataLoopback) > 0 {
-		status = append(status, [2]string{"Data loop file", s.DataLoopback})
-	}
-	if len(s.MetadataLoopback) > 0 {
-		status = append(status, [2]string{"Metadata loop file", s.MetadataLoopback})
-	}
-	if vStr, err := devicemapper.GetLibraryVersion(); err == nil {
-		status = append(status, [2]string{"Library Version", vStr})
-	}
-	return status
-}
-
-// GetMetadata returns a map of information about the device.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	m, err := d.DeviceSet.exportDeviceMetadata(id)
-
-	if err != nil {
-		return nil, err
-	}
-
-	metadata := make(map[string]string)
-	metadata["DeviceId"] = strconv.Itoa(m.deviceID)
-	metadata["DeviceSize"] = strconv.FormatUint(m.deviceSize, 10)
-	metadata["DeviceName"] = m.deviceName
-	return metadata, nil
-}
-
-// Cleanup unmounts a device.
-func (d *Driver) Cleanup() error {
-	err := d.DeviceSet.Shutdown(d.home)
-
-	if err2 := mount.Unmount(d.home); err == nil {
-		err = err2
-	}
-
-	return err
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create adds a device with a given id and the parent.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-	var storageOpt map[string]string
-	if opts != nil {
-		storageOpt = opts.StorageOpt
-	}
-
-	if err := d.DeviceSet.AddDevice(id, parent, storageOpt); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Remove removes a device with a given id, unmounts the filesystem.
-func (d *Driver) Remove(id string) error {
-	if !d.DeviceSet.HasDevice(id) {
-		// Consider removing a non-existing device a no-op
-		// This is useful to be able to progress on container removal
-		// if the underlying device has gone away due to earlier errors
-		return nil
-	}
-
-	// This assumes the device has been properly Get/Put:ed and thus is unmounted
-	if err := d.DeviceSet.DeleteDevice(id, false); err != nil {
-		return err
-	}
-
-	mp := path.Join(d.home, "mnt", id)
-	if err := os.RemoveAll(mp); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	return nil
-}
-
-// Get mounts a device with given id into the root filesystem
-func (d *Driver) Get(id, mountLabel string) (string, error) {
-	mp := path.Join(d.home, "mnt", id)
-	rootFs := path.Join(mp, "rootfs")
-	if count := d.ctr.Increment(mp); count > 1 {
-		return rootFs, nil
-	}
-
-	uid, gid, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		d.ctr.Decrement(mp)
-		return "", err
-	}
-
-	// Create the target directories if they don't exist
-	if err := idtools.MkdirAllAs(path.Join(d.home, "mnt"), 0755, uid, gid); err != nil && !os.IsExist(err) {
-		d.ctr.Decrement(mp)
-		return "", err
-	}
-	if err := idtools.MkdirAs(mp, 0755, uid, gid); err != nil && !os.IsExist(err) {
-		d.ctr.Decrement(mp)
-		return "", err
-	}
-
-	// Mount the device
-	if err := d.DeviceSet.MountDevice(id, mp, mountLabel); err != nil {
-		d.ctr.Decrement(mp)
-		return "", err
-	}
-
-	if err := idtools.MkdirAllAs(rootFs, 0755, uid, gid); err != nil && !os.IsExist(err) {
-		d.ctr.Decrement(mp)
-		d.DeviceSet.UnmountDevice(id, mp)
-		return "", err
-	}
-
-	idFile := path.Join(mp, "id")
-	if _, err := os.Stat(idFile); err != nil && os.IsNotExist(err) {
-		// Create an "id" file with the container/image id in it to help reconstruct this in case
-		// of later problems
-		if err := ioutil.WriteFile(idFile, []byte(id), 0600); err != nil {
-			d.ctr.Decrement(mp)
-			d.DeviceSet.UnmountDevice(id, mp)
-			return "", err
-		}
-	}
-
-	return rootFs, nil
-}
-
-// Put unmounts a device and removes it.
-func (d *Driver) Put(id string) error {
-	mp := path.Join(d.home, "mnt", id)
-	if count := d.ctr.Decrement(mp); count > 0 {
-		return nil
-	}
-	err := d.DeviceSet.UnmountDevice(id, mp)
-	if err != nil {
-		logrus.Errorf("devmapper: Error unmounting device %s: %s", id, err)
-	}
-	return err
-}
-
-// Exists checks to see if the device exists.
-func (d *Driver) Exists(id string) bool {
-	return d.DeviceSet.HasDevice(id)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/mount.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/mount.go
deleted file mode 100644
index cca1fe1b38..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/devmapper/mount.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// +build linux
-
-package devmapper
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-// FIXME: this is copy-pasted from the aufs driver.
-// It should be moved into the core.
-
-// Mounted returns true if a mount point exists.
-func Mounted(mountpoint string) (bool, error) {
-	mntpoint, err := os.Stat(mountpoint)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	parent, err := os.Stat(filepath.Join(mountpoint, ".."))
-	if err != nil {
-		return false, err
-	}
-	mntpointSt := mntpoint.Sys().(*syscall.Stat_t)
-	parentSt := parent.Sys().(*syscall.Stat_t)
-	return mntpointSt.Dev != parentSt.Dev, nil
-}
-
-type probeData struct {
-	fsName string
-	magic  string
-	offset uint64
-}
-
-// ProbeFsType returns the filesystem name for the given device id.
-func ProbeFsType(device string) (string, error) {
-	probes := []probeData{
-		{"btrfs", "_BHRfS_M", 0x10040},
-		{"ext4", "\123\357", 0x438},
-		{"xfs", "XFSB", 0},
-	}
-
-	maxLen := uint64(0)
-	for _, p := range probes {
-		l := p.offset + uint64(len(p.magic))
-		if l > maxLen {
-			maxLen = l
-		}
-	}
-
-	file, err := os.Open(device)
-	if err != nil {
-		return "", err
-	}
-	defer file.Close()
-
-	buffer := make([]byte, maxLen)
-	l, err := file.Read(buffer)
-	if err != nil {
-		return "", err
-	}
-
-	if uint64(l) != maxLen {
-		return "", fmt.Errorf("devmapper: unable to detect filesystem type of %s, short read", device)
-	}
-
-	for _, p := range probes {
-		if bytes.Equal([]byte(p.magic), buffer[p.offset:p.offset+uint64(len(p.magic))]) {
-			return p.fsName, nil
-		}
-	}
-
-	return "", fmt.Errorf("devmapper: Unknown filesystem type on %s", device)
-}
-
-func joinMountOptions(a, b string) string {
-	if a == "" {
-		return b
-	}
-	if b == "" {
-		return a
-	}
-	return a + "," + b
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver.go
deleted file mode 100644
index f0bce562b7..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver.go
+++ /dev/null
@@ -1,270 +0,0 @@
-package graphdriver
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/vbatts/tar-split/tar/storage"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/plugingetter"
-)
-
-// FsMagic unsigned id of the filesystem in use.
-type FsMagic uint32
-
-const (
-	// FsMagicUnsupported is a predefined constant value other than a valid filesystem id.
-	FsMagicUnsupported = FsMagic(0x00000000)
-)
-
-var (
-	// All registered drivers
-	drivers map[string]InitFunc
-
-	// ErrNotSupported returned when driver is not supported.
-	ErrNotSupported = errors.New("driver not supported")
-	// ErrPrerequisites retuned when driver does not meet prerequisites.
-	ErrPrerequisites = errors.New("prerequisites for driver not satisfied (wrong filesystem?)")
-	// ErrIncompatibleFS returned when file system is not supported.
-	ErrIncompatibleFS = fmt.Errorf("backing file system is unsupported for this graph driver")
-)
-
-//CreateOpts contains optional arguments for Create() and CreateReadWrite()
-// methods.
-type CreateOpts struct {
-	MountLabel string
-	StorageOpt map[string]string
-}
-
-// InitFunc initializes the storage driver.
-type InitFunc func(root string, options []string, uidMaps, gidMaps []idtools.IDMap) (Driver, error)
-
-// ProtoDriver defines the basic capabilities of a driver.
-// This interface exists solely to be a minimum set of methods
-// for client code which choose not to implement the entire Driver
-// interface and use the NaiveDiffDriver wrapper constructor.
-//
-// Use of ProtoDriver directly by client code is not recommended.
-type ProtoDriver interface {
-	// String returns a string representation of this driver.
-	String() string
-	// CreateReadWrite creates a new, empty filesystem layer that is ready
-	// to be used as the storage for a container. Additional options can
-	// be passed in opts. parent may be "" and opts may be nil.
-	CreateReadWrite(id, parent string, opts *CreateOpts) error
-	// Create creates a new, empty, filesystem layer with the
-	// specified id and parent and options passed in opts. Parent
-	// may be "" and opts may be nil.
-	Create(id, parent string, opts *CreateOpts) error
-	// Remove attempts to remove the filesystem layer with this id.
-	Remove(id string) error
-	// Get returns the mountpoint for the layered filesystem referred
-	// to by this id. You can optionally specify a mountLabel or "".
-	// Returns the absolute path to the mounted layered filesystem.
-	Get(id, mountLabel string) (dir string, err error)
-	// Put releases the system resources for the specified id,
-	// e.g, unmounting layered filesystem.
-	Put(id string) error
-	// Exists returns whether a filesystem layer with the specified
-	// ID exists on this driver.
-	Exists(id string) bool
-	// Status returns a set of key-value pairs which give low
-	// level diagnostic status about this driver.
-	Status() [][2]string
-	// Returns a set of key-value pairs which give low level information
-	// about the image/container driver is managing.
-	GetMetadata(id string) (map[string]string, error)
-	// Cleanup performs necessary tasks to release resources
-	// held by the driver, e.g., unmounting all layered filesystems
-	// known to this driver.
-	Cleanup() error
-}
-
-// DiffDriver is the interface to use to implement graph diffs
-type DiffDriver interface {
-	// Diff produces an archive of the changes between the specified
-	// layer and its parent layer which may be "".
-	Diff(id, parent string) (io.ReadCloser, error)
-	// Changes produces a list of changes between the specified layer
-	// and its parent layer. If parent is "", then all changes will be ADD changes.
-	Changes(id, parent string) ([]archive.Change, error)
-	// ApplyDiff extracts the changeset from the given diff into the
-	// layer with the specified id and parent, returning the size of the
-	// new layer in bytes.
-	// The archive.Reader must be an uncompressed stream.
-	ApplyDiff(id, parent string, diff io.Reader) (size int64, err error)
-	// DiffSize calculates the changes between the specified id
-	// and its parent and returns the size in bytes of the changes
-	// relative to its base filesystem directory.
-	DiffSize(id, parent string) (size int64, err error)
-}
-
-// Driver is the interface for layered/snapshot file system drivers.
-type Driver interface {
-	ProtoDriver
-	DiffDriver
-}
-
-// DiffGetterDriver is the interface for layered file system drivers that
-// provide a specialized function for getting file contents for tar-split.
-type DiffGetterDriver interface {
-	Driver
-	// DiffGetter returns an interface to efficiently retrieve the contents
-	// of files in a layer.
-	DiffGetter(id string) (FileGetCloser, error)
-}
-
-// FileGetCloser extends the storage.FileGetter interface with a Close method
-// for cleaning up.
-type FileGetCloser interface {
-	storage.FileGetter
-	// Close cleans up any resources associated with the FileGetCloser.
-	Close() error
-}
-
-// Checker makes checks on specified filesystems.
-type Checker interface {
-	// IsMounted returns true if the provided path is mounted for the specific checker
-	IsMounted(path string) bool
-}
-
-func init() {
-	drivers = make(map[string]InitFunc)
-}
-
-// Register registers an InitFunc for the driver.
-func Register(name string, initFunc InitFunc) error {
-	if _, exists := drivers[name]; exists {
-		return fmt.Errorf("Name already registered %s", name)
-	}
-	drivers[name] = initFunc
-
-	return nil
-}
-
-// GetDriver initializes and returns the registered driver
-func GetDriver(name string, pg plugingetter.PluginGetter, config Options) (Driver, error) {
-	if initFunc, exists := drivers[name]; exists {
-		return initFunc(filepath.Join(config.Root, name), config.DriverOptions, config.UIDMaps, config.GIDMaps)
-	}
-
-	pluginDriver, err := lookupPlugin(name, pg, config)
-	if err == nil {
-		return pluginDriver, nil
-	}
-	logrus.WithError(err).WithField("driver", name).WithField("home-dir", config.Root).Error("Failed to GetDriver graph")
-	return nil, ErrNotSupported
-}
-
-// getBuiltinDriver initializes and returns the registered driver, but does not try to load from plugins
-func getBuiltinDriver(name, home string, options []string, uidMaps, gidMaps []idtools.IDMap) (Driver, error) {
-	if initFunc, exists := drivers[name]; exists {
-		return initFunc(filepath.Join(home, name), options, uidMaps, gidMaps)
-	}
-	logrus.Errorf("Failed to built-in GetDriver graph %s %s", name, home)
-	return nil, ErrNotSupported
-}
-
-// Options is used to initialize a graphdriver
-type Options struct {
-	Root                string
-	DriverOptions       []string
-	UIDMaps             []idtools.IDMap
-	GIDMaps             []idtools.IDMap
-	ExperimentalEnabled bool
-}
-
-// New creates the driver and initializes it at the specified root.
-func New(name string, pg plugingetter.PluginGetter, config Options) (Driver, error) {
-	if name != "" {
-		logrus.Debugf("[graphdriver] trying provided driver: %s", name) // so the logs show specified driver
-		return GetDriver(name, pg, config)
-	}
-
-	// Guess for prior driver
-	driversMap := scanPriorDrivers(config.Root)
-	for _, name := range priority {
-		if name == "vfs" {
-			// don't use vfs even if there is state present.
-			continue
-		}
-		if _, prior := driversMap[name]; prior {
-			// of the state found from prior drivers, check in order of our priority
-			// which we would prefer
-			driver, err := getBuiltinDriver(name, config.Root, config.DriverOptions, config.UIDMaps, config.GIDMaps)
-			if err != nil {
-				// unlike below, we will return error here, because there is prior
-				// state, and now it is no longer supported/prereq/compatible, so
-				// something changed and needs attention. Otherwise the daemon's
-				// images would just "disappear".
-				logrus.Errorf("[graphdriver] prior storage driver %s failed: %s", name, err)
-				return nil, err
-			}
-
-			// abort starting when there are other prior configured drivers
-			// to ensure the user explicitly selects the driver to load
-			if len(driversMap)-1 > 0 {
-				var driversSlice []string
-				for name := range driversMap {
-					driversSlice = append(driversSlice, name)
-				}
-
-				return nil, fmt.Errorf("%s contains several valid graphdrivers: %s; Please cleanup or explicitly choose storage driver (-s <DRIVER>)", config.Root, strings.Join(driversSlice, ", "))
-			}
-
-			logrus.Infof("[graphdriver] using prior storage driver: %s", name)
-			return driver, nil
-		}
-	}
-
-	// Check for priority drivers first
-	for _, name := range priority {
-		driver, err := getBuiltinDriver(name, config.Root, config.DriverOptions, config.UIDMaps, config.GIDMaps)
-		if err != nil {
-			if isDriverNotSupported(err) {
-				continue
-			}
-			return nil, err
-		}
-		return driver, nil
-	}
-
-	// Check all registered drivers if no priority driver is found
-	for name, initFunc := range drivers {
-		driver, err := initFunc(filepath.Join(config.Root, name), config.DriverOptions, config.UIDMaps, config.GIDMaps)
-		if err != nil {
-			if isDriverNotSupported(err) {
-				continue
-			}
-			return nil, err
-		}
-		return driver, nil
-	}
-	return nil, fmt.Errorf("No supported storage backend found")
-}
-
-// isDriverNotSupported returns true if the error initializing
-// the graph driver is a non-supported error.
-func isDriverNotSupported(err error) bool {
-	return err == ErrNotSupported || err == ErrPrerequisites || err == ErrIncompatibleFS
-}
-
-// scanPriorDrivers returns an un-ordered scan of directories of prior storage drivers
-func scanPriorDrivers(root string) map[string]bool {
-	driversMap := make(map[string]bool)
-
-	for driver := range drivers {
-		p := filepath.Join(root, driver)
-		if _, err := os.Stat(p); err == nil && driver != "vfs" {
-			driversMap[driver] = true
-		}
-	}
-	return driversMap
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go
deleted file mode 100644
index 2891a84f3a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_freebsd.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package graphdriver
-
-import "syscall"
-
-var (
-	// Slice of drivers that should be used in an order
-	priority = []string{
-		"zfs",
-	}
-)
-
-// Mounted checks if the given path is mounted as the fs type
-func Mounted(fsType FsMagic, mountPath string) (bool, error) {
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(mountPath, &buf); err != nil {
-		return false, err
-	}
-	return FsMagic(buf.Type) == fsType, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_linux.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_linux.go
deleted file mode 100644
index 5c8d0e2301..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_linux.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// +build linux
-
-package graphdriver
-
-import (
-	"path/filepath"
-	"syscall"
-
-	"github.com/docker/docker/pkg/mount"
-)
-
-const (
-	// FsMagicAufs filesystem id for Aufs
-	FsMagicAufs = FsMagic(0x61756673)
-	// FsMagicBtrfs filesystem id for Btrfs
-	FsMagicBtrfs = FsMagic(0x9123683E)
-	// FsMagicCramfs filesystem id for Cramfs
-	FsMagicCramfs = FsMagic(0x28cd3d45)
-	// FsMagicEcryptfs filesystem id for eCryptfs
-	FsMagicEcryptfs = FsMagic(0xf15f)
-	// FsMagicExtfs filesystem id for Extfs
-	FsMagicExtfs = FsMagic(0x0000EF53)
-	// FsMagicF2fs filesystem id for F2fs
-	FsMagicF2fs = FsMagic(0xF2F52010)
-	// FsMagicGPFS filesystem id for GPFS
-	FsMagicGPFS = FsMagic(0x47504653)
-	// FsMagicJffs2Fs filesystem if for Jffs2Fs
-	FsMagicJffs2Fs = FsMagic(0x000072b6)
-	// FsMagicJfs filesystem id for Jfs
-	FsMagicJfs = FsMagic(0x3153464a)
-	// FsMagicNfsFs filesystem id for NfsFs
-	FsMagicNfsFs = FsMagic(0x00006969)
-	// FsMagicRAMFs filesystem id for RamFs
-	FsMagicRAMFs = FsMagic(0x858458f6)
-	// FsMagicReiserFs filesystem id for ReiserFs
-	FsMagicReiserFs = FsMagic(0x52654973)
-	// FsMagicSmbFs filesystem id for SmbFs
-	FsMagicSmbFs = FsMagic(0x0000517B)
-	// FsMagicSquashFs filesystem id for SquashFs
-	FsMagicSquashFs = FsMagic(0x73717368)
-	// FsMagicTmpFs filesystem id for TmpFs
-	FsMagicTmpFs = FsMagic(0x01021994)
-	// FsMagicVxFS filesystem id for VxFs
-	FsMagicVxFS = FsMagic(0xa501fcf5)
-	// FsMagicXfs filesystem id for Xfs
-	FsMagicXfs = FsMagic(0x58465342)
-	// FsMagicZfs filesystem id for Zfs
-	FsMagicZfs = FsMagic(0x2fc12fc1)
-	// FsMagicOverlay filesystem id for overlay
-	FsMagicOverlay = FsMagic(0x794C7630)
-)
-
-var (
-	// Slice of drivers that should be used in an order
-	priority = []string{
-		"aufs",
-		"btrfs",
-		"zfs",
-		"overlay2",
-		"overlay",
-		"devicemapper",
-		"vfs",
-	}
-
-	// FsNames maps filesystem id to name of the filesystem.
-	FsNames = map[FsMagic]string{
-		FsMagicAufs:        "aufs",
-		FsMagicBtrfs:       "btrfs",
-		FsMagicCramfs:      "cramfs",
-		FsMagicExtfs:       "extfs",
-		FsMagicF2fs:        "f2fs",
-		FsMagicGPFS:        "gpfs",
-		FsMagicJffs2Fs:     "jffs2",
-		FsMagicJfs:         "jfs",
-		FsMagicNfsFs:       "nfs",
-		FsMagicOverlay:     "overlayfs",
-		FsMagicRAMFs:       "ramfs",
-		FsMagicReiserFs:    "reiserfs",
-		FsMagicSmbFs:       "smb",
-		FsMagicSquashFs:    "squashfs",
-		FsMagicTmpFs:       "tmpfs",
-		FsMagicUnsupported: "unsupported",
-		FsMagicVxFS:        "vxfs",
-		FsMagicXfs:         "xfs",
-		FsMagicZfs:         "zfs",
-	}
-)
-
-// GetFSMagic returns the filesystem id given the path.
-func GetFSMagic(rootpath string) (FsMagic, error) {
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(filepath.Dir(rootpath), &buf); err != nil {
-		return 0, err
-	}
-	return FsMagic(buf.Type), nil
-}
-
-// NewFsChecker returns a checker configured for the provied FsMagic
-func NewFsChecker(t FsMagic) Checker {
-	return &fsChecker{
-		t: t,
-	}
-}
-
-type fsChecker struct {
-	t FsMagic
-}
-
-func (c *fsChecker) IsMounted(path string) bool {
-	m, _ := Mounted(c.t, path)
-	return m
-}
-
-// NewDefaultChecker returns a check that parses /proc/mountinfo to check
-// if the specified path is mounted.
-func NewDefaultChecker() Checker {
-	return &defaultChecker{}
-}
-
-type defaultChecker struct {
-}
-
-func (c *defaultChecker) IsMounted(path string) bool {
-	m, _ := mount.Mounted(path)
-	return m
-}
-
-// Mounted checks if the given path is mounted as the fs type
-func Mounted(fsType FsMagic, mountPath string) (bool, error) {
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(mountPath, &buf); err != nil {
-		return false, err
-	}
-	return FsMagic(buf.Type) == fsType, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_solaris.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_solaris.go
deleted file mode 100644
index 7daf01c32d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_solaris.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build solaris,cgo
-
-package graphdriver
-
-/*
-#include <sys/statvfs.h>
-#include <stdlib.h>
-
-static inline struct statvfs *getstatfs(char *s) {
-        struct statvfs *buf;
-        int err;
-        buf = (struct statvfs *)malloc(sizeof(struct statvfs));
-        err = statvfs(s, buf);
-        return buf;
-}
-*/
-import "C"
-import (
-	"path/filepath"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
-)
-
-const (
-	// FsMagicZfs filesystem id for Zfs
-	FsMagicZfs = FsMagic(0x2fc12fc1)
-)
-
-var (
-	// Slice of drivers that should be used in an order
-	priority = []string{
-		"zfs",
-	}
-
-	// FsNames maps filesystem id to name of the filesystem.
-	FsNames = map[FsMagic]string{
-		FsMagicZfs: "zfs",
-	}
-)
-
-// GetFSMagic returns the filesystem id given the path.
-func GetFSMagic(rootpath string) (FsMagic, error) {
-	return 0, nil
-}
-
-type fsChecker struct {
-	t FsMagic
-}
-
-func (c *fsChecker) IsMounted(path string) bool {
-	m, _ := Mounted(c.t, path)
-	return m
-}
-
-// NewFsChecker returns a checker configured for the provied FsMagic
-func NewFsChecker(t FsMagic) Checker {
-	return &fsChecker{
-		t: t,
-	}
-}
-
-// NewDefaultChecker returns a check that parses /proc/mountinfo to check
-// if the specified path is mounted.
-// No-op on Solaris.
-func NewDefaultChecker() Checker {
-	return &defaultChecker{}
-}
-
-type defaultChecker struct {
-}
-
-func (c *defaultChecker) IsMounted(path string) bool {
-	m, _ := mount.Mounted(path)
-	return m
-}
-
-// Mounted checks if the given path is mounted as the fs type
-//Solaris supports only ZFS for now
-func Mounted(fsType FsMagic, mountPath string) (bool, error) {
-
-	cs := C.CString(filepath.Dir(mountPath))
-	buf := C.getstatfs(cs)
-
-	// on Solaris buf.f_basetype contains ['z', 'f', 's', 0 ... ]
-	if (buf.f_basetype[0] != 122) || (buf.f_basetype[1] != 102) || (buf.f_basetype[2] != 115) ||
-		(buf.f_basetype[3] != 0) {
-		logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", mountPath)
-		C.free(unsafe.Pointer(buf))
-		return false, ErrPrerequisites
-	}
-
-	C.free(unsafe.Pointer(buf))
-	C.free(unsafe.Pointer(cs))
-	return true, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go
deleted file mode 100644
index 4a875608b0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_unsupported.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !linux,!windows,!freebsd,!solaris
-
-package graphdriver
-
-var (
-	// Slice of drivers that should be used in an order
-	priority = []string{
-		"unsupported",
-	}
-)
-
-// GetFSMagic returns the filesystem id given the path.
-func GetFSMagic(rootpath string) (FsMagic, error) {
-	return FsMagicUnsupported, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_windows.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_windows.go
deleted file mode 100644
index ffd30c2950..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/driver_windows.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package graphdriver
-
-var (
-	// Slice of drivers that should be used in order
-	priority = []string{
-		"windowsfilter",
-	}
-)
-
-// GetFSMagic returns the filesystem id given the path.
-func GetFSMagic(rootpath string) (FsMagic, error) {
-	// Note it is OK to return FsMagicUnsupported on Windows.
-	return FsMagicUnsupported, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/fsdiff.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/fsdiff.go
deleted file mode 100644
index 20826cd7d2..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/fsdiff.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package graphdriver
-
-import (
-	"io"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-var (
-	// ApplyUncompressedLayer defines the unpack method used by the graph
-	// driver.
-	ApplyUncompressedLayer = chrootarchive.ApplyUncompressedLayer
-)
-
-// NaiveDiffDriver takes a ProtoDriver and adds the
-// capability of the Diffing methods which it may or may not
-// support on its own. See the comment on the exported
-// NewNaiveDiffDriver function below.
-// Notably, the AUFS driver doesn't need to be wrapped like this.
-type NaiveDiffDriver struct {
-	ProtoDriver
-	uidMaps []idtools.IDMap
-	gidMaps []idtools.IDMap
-}
-
-// NewNaiveDiffDriver returns a fully functional driver that wraps the
-// given ProtoDriver and adds the capability of the following methods which
-// it may or may not support on its own:
-//     Diff(id, parent string) (archive.Archive, error)
-//     Changes(id, parent string) ([]archive.Change, error)
-//     ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error)
-//     DiffSize(id, parent string) (size int64, err error)
-func NewNaiveDiffDriver(driver ProtoDriver, uidMaps, gidMaps []idtools.IDMap) Driver {
-	return &NaiveDiffDriver{ProtoDriver: driver,
-		uidMaps: uidMaps,
-		gidMaps: gidMaps}
-}
-
-// Diff produces an archive of the changes between the specified
-// layer and its parent layer which may be "".
-func (gdw *NaiveDiffDriver) Diff(id, parent string) (arch io.ReadCloser, err error) {
-	startTime := time.Now()
-	driver := gdw.ProtoDriver
-
-	layerFs, err := driver.Get(id, "")
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			driver.Put(id)
-		}
-	}()
-
-	if parent == "" {
-		archive, err := archive.Tar(layerFs, archive.Uncompressed)
-		if err != nil {
-			return nil, err
-		}
-		return ioutils.NewReadCloserWrapper(archive, func() error {
-			err := archive.Close()
-			driver.Put(id)
-			return err
-		}), nil
-	}
-
-	parentFs, err := driver.Get(parent, "")
-	if err != nil {
-		return nil, err
-	}
-	defer driver.Put(parent)
-
-	changes, err := archive.ChangesDirs(layerFs, parentFs)
-	if err != nil {
-		return nil, err
-	}
-
-	archive, err := archive.ExportChanges(layerFs, changes, gdw.uidMaps, gdw.gidMaps)
-	if err != nil {
-		return nil, err
-	}
-
-	return ioutils.NewReadCloserWrapper(archive, func() error {
-		err := archive.Close()
-		driver.Put(id)
-
-		// NaiveDiffDriver compares file metadata with parent layers. Parent layers
-		// are extracted from tar's with full second precision on modified time.
-		// We need this hack here to make sure calls within same second receive
-		// correct result.
-		time.Sleep(startTime.Truncate(time.Second).Add(time.Second).Sub(time.Now()))
-		return err
-	}), nil
-}
-
-// Changes produces a list of changes between the specified layer
-// and its parent layer. If parent is "", then all changes will be ADD changes.
-func (gdw *NaiveDiffDriver) Changes(id, parent string) ([]archive.Change, error) {
-	driver := gdw.ProtoDriver
-
-	layerFs, err := driver.Get(id, "")
-	if err != nil {
-		return nil, err
-	}
-	defer driver.Put(id)
-
-	parentFs := ""
-
-	if parent != "" {
-		parentFs, err = driver.Get(parent, "")
-		if err != nil {
-			return nil, err
-		}
-		defer driver.Put(parent)
-	}
-
-	return archive.ChangesDirs(layerFs, parentFs)
-}
-
-// ApplyDiff extracts the changeset from the given diff into the
-// layer with the specified id and parent, returning the size of the
-// new layer in bytes.
-func (gdw *NaiveDiffDriver) ApplyDiff(id, parent string, diff io.Reader) (size int64, err error) {
-	driver := gdw.ProtoDriver
-
-	// Mount the root filesystem so we can apply the diff/layer.
-	layerFs, err := driver.Get(id, "")
-	if err != nil {
-		return
-	}
-	defer driver.Put(id)
-
-	options := &archive.TarOptions{UIDMaps: gdw.uidMaps,
-		GIDMaps: gdw.gidMaps}
-	start := time.Now().UTC()
-	logrus.Debug("Start untar layer")
-	if size, err = ApplyUncompressedLayer(layerFs, diff, options); err != nil {
-		return
-	}
-	logrus.Debugf("Untar time: %vs", time.Now().UTC().Sub(start).Seconds())
-
-	return
-}
-
-// DiffSize calculates the changes between the specified layer
-// and its parent and returns the size in bytes of the changes
-// relative to its base filesystem directory.
-func (gdw *NaiveDiffDriver) DiffSize(id, parent string) (size int64, err error) {
-	driver := gdw.ProtoDriver
-
-	changes, err := gdw.Changes(id, parent)
-	if err != nil {
-		return
-	}
-
-	layerFs, err := driver.Get(id, "")
-	if err != nil {
-		return
-	}
-	defer driver.Put(id)
-
-	return archive.ChangesSize(layerFs, changes), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphbench_unix.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphbench_unix.go
deleted file mode 100644
index def822b9a1..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphbench_unix.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// +build linux freebsd
-
-package graphtest
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"path/filepath"
-	"testing"
-
-	"github.com/docker/docker/pkg/stringid"
-)
-
-// DriverBenchExists benchmarks calls to exist
-func DriverBenchExists(b *testing.B, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-
-	base := stringid.GenerateRandomID()
-
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		if !driver.Exists(base) {
-			b.Fatal("Newly created image doesn't exist")
-		}
-	}
-}
-
-// DriverBenchGetEmpty benchmarks calls to get on an empty layer
-func DriverBenchGetEmpty(b *testing.B, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-
-	base := stringid.GenerateRandomID()
-
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, err := driver.Get(base, "")
-		b.StopTimer()
-		if err != nil {
-			b.Fatalf("Error getting mount: %s", err)
-		}
-		if err := driver.Put(base); err != nil {
-			b.Fatalf("Error putting mount: %s", err)
-		}
-		b.StartTimer()
-	}
-}
-
-// DriverBenchDiffBase benchmarks calls to diff on a root layer
-func DriverBenchDiffBase(b *testing.B, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-
-	base := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addFiles(driver, base, 3); err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		arch, err := driver.Diff(base, "")
-		if err != nil {
-			b.Fatal(err)
-		}
-		_, err = io.Copy(ioutil.Discard, arch)
-		if err != nil {
-			b.Fatalf("Error copying archive: %s", err)
-		}
-		arch.Close()
-	}
-}
-
-// DriverBenchDiffN benchmarks calls to diff on two layers with
-// a provided number of files on the lower and upper layers.
-func DriverBenchDiffN(b *testing.B, bottom, top int, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-	base := stringid.GenerateRandomID()
-	upper := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, base, bottom, 3); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := driver.Create(upper, base, nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, upper, top, 6); err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		arch, err := driver.Diff(upper, "")
-		if err != nil {
-			b.Fatal(err)
-		}
-		_, err = io.Copy(ioutil.Discard, arch)
-		if err != nil {
-			b.Fatalf("Error copying archive: %s", err)
-		}
-		arch.Close()
-	}
-}
-
-// DriverBenchDiffApplyN benchmarks calls to diff and apply together
-func DriverBenchDiffApplyN(b *testing.B, fileCount int, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-	base := stringid.GenerateRandomID()
-	upper := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, base, fileCount, 3); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := driver.Create(upper, base, nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, upper, fileCount, 6); err != nil {
-		b.Fatal(err)
-	}
-	diffSize, err := driver.DiffSize(upper, "")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	b.StopTimer()
-	for i := 0; i < b.N; i++ {
-		diff := stringid.GenerateRandomID()
-		if err := driver.Create(diff, base, nil); err != nil {
-			b.Fatal(err)
-		}
-
-		if err := checkManyFiles(driver, diff, fileCount, 3); err != nil {
-			b.Fatal(err)
-		}
-
-		b.StartTimer()
-
-		arch, err := driver.Diff(upper, "")
-		if err != nil {
-			b.Fatal(err)
-		}
-
-		applyDiffSize, err := driver.ApplyDiff(diff, "", arch)
-		if err != nil {
-			b.Fatal(err)
-		}
-
-		b.StopTimer()
-		arch.Close()
-
-		if applyDiffSize != diffSize {
-			// TODO: enforce this
-			//b.Fatalf("Apply diff size different, got %d, expected %s", applyDiffSize, diffSize)
-		}
-		if err := checkManyFiles(driver, diff, fileCount, 6); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-// DriverBenchDeepLayerDiff benchmarks calls to diff on top of a given number of layers.
-func DriverBenchDeepLayerDiff(b *testing.B, layerCount int, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-
-	base := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	if err := addFiles(driver, base, 50); err != nil {
-		b.Fatal(err)
-	}
-
-	topLayer, err := addManyLayers(driver, base, layerCount)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		arch, err := driver.Diff(topLayer, "")
-		if err != nil {
-			b.Fatal(err)
-		}
-		_, err = io.Copy(ioutil.Discard, arch)
-		if err != nil {
-			b.Fatalf("Error copying archive: %s", err)
-		}
-		arch.Close()
-	}
-}
-
-// DriverBenchDeepLayerRead benchmarks calls to read a file under a given number of layers.
-func DriverBenchDeepLayerRead(b *testing.B, layerCount int, drivername string, driveroptions ...string) {
-	driver := GetDriver(b, drivername, driveroptions...)
-	defer PutDriver(b)
-
-	base := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		b.Fatal(err)
-	}
-
-	content := []byte("test content")
-	if err := addFile(driver, base, "testfile.txt", content); err != nil {
-		b.Fatal(err)
-	}
-
-	topLayer, err := addManyLayers(driver, base, layerCount)
-	if err != nil {
-		b.Fatal(err)
-	}
-
-	root, err := driver.Get(topLayer, "")
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer driver.Put(topLayer)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-
-		// Read content
-		c, err := ioutil.ReadFile(filepath.Join(root, "testfile.txt"))
-		if err != nil {
-			b.Fatal(err)
-		}
-
-		b.StopTimer()
-		if bytes.Compare(c, content) != 0 {
-			b.Fatalf("Wrong content in file %v, expected %v", c, content)
-		}
-		b.StartTimer()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_unix.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_unix.go
deleted file mode 100644
index 6e952de78b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_unix.go
+++ /dev/null
@@ -1,358 +0,0 @@
-// +build linux freebsd solaris
-
-package graphtest
-
-import (
-	"bytes"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path"
-	"reflect"
-	"syscall"
-	"testing"
-	"unsafe"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/go-units"
-)
-
-var (
-	drv *Driver
-)
-
-// Driver conforms to graphdriver.Driver interface and
-// contains information such as root and reference count of the number of clients using it.
-// This helps in testing drivers added into the framework.
-type Driver struct {
-	graphdriver.Driver
-	root     string
-	refCount int
-}
-
-func newDriver(t testing.TB, name string, options []string) *Driver {
-	root, err := ioutil.TempDir("", "docker-graphtest-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.MkdirAll(root, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	d, err := graphdriver.GetDriver(name, nil, graphdriver.Options{DriverOptions: options, Root: root})
-	if err != nil {
-		t.Logf("graphdriver: %v\n", err)
-		if err == graphdriver.ErrNotSupported || err == graphdriver.ErrPrerequisites || err == graphdriver.ErrIncompatibleFS {
-			t.Skipf("Driver %s not supported", name)
-		}
-		t.Fatal(err)
-	}
-	return &Driver{d, root, 1}
-}
-
-func cleanup(t testing.TB, d *Driver) {
-	if err := drv.Cleanup(); err != nil {
-		t.Fatal(err)
-	}
-	os.RemoveAll(d.root)
-}
-
-// GetDriver create a new driver with given name or return an existing driver with the name updating the reference count.
-func GetDriver(t testing.TB, name string, options ...string) graphdriver.Driver {
-	if drv == nil {
-		drv = newDriver(t, name, options)
-	} else {
-		drv.refCount++
-	}
-	return drv
-}
-
-// PutDriver removes the driver if it is no longer used and updates the reference count.
-func PutDriver(t testing.TB) {
-	if drv == nil {
-		t.Skip("No driver to put!")
-	}
-	drv.refCount--
-	if drv.refCount == 0 {
-		cleanup(t, drv)
-		drv = nil
-	}
-}
-
-// DriverTestCreateEmpty creates a new image and verifies it is empty and the right metadata
-func DriverTestCreateEmpty(t testing.TB, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-
-	if err := driver.Create("empty", "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := driver.Remove("empty"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	if !driver.Exists("empty") {
-		t.Fatal("Newly created image doesn't exist")
-	}
-
-	dir, err := driver.Get("empty", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	verifyFile(t, dir, 0755|os.ModeDir, 0, 0)
-
-	// Verify that the directory is empty
-	fis, err := readDir(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(fis) != 0 {
-		t.Fatal("New directory not empty")
-	}
-
-	driver.Put("empty")
-}
-
-// DriverTestCreateBase create a base driver and verify.
-func DriverTestCreateBase(t testing.TB, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-
-	createBase(t, driver, "Base")
-	defer func() {
-		if err := driver.Remove("Base"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-	verifyBase(t, driver, "Base")
-}
-
-// DriverTestCreateSnap Create a driver and snap and verify.
-func DriverTestCreateSnap(t testing.TB, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-
-	createBase(t, driver, "Base")
-
-	defer func() {
-		if err := driver.Remove("Base"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	if err := driver.Create("Snap", "Base", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if err := driver.Remove("Snap"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	verifyBase(t, driver, "Snap")
-}
-
-// DriverTestDeepLayerRead reads a file from a lower layer under a given number of layers
-func DriverTestDeepLayerRead(t testing.TB, layerCount int, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-
-	base := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	content := []byte("test content")
-	if err := addFile(driver, base, "testfile.txt", content); err != nil {
-		t.Fatal(err)
-	}
-
-	topLayer, err := addManyLayers(driver, base, layerCount)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = checkManyLayers(driver, topLayer, layerCount)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := checkFile(driver, topLayer, "testfile.txt", content); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// DriverTestDiffApply tests diffing and applying produces the same layer
-func DriverTestDiffApply(t testing.TB, fileCount int, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-	base := stringid.GenerateRandomID()
-	upper := stringid.GenerateRandomID()
-	deleteFile := "file-remove.txt"
-	deleteFileContent := []byte("This file should get removed in upper!")
-	deleteDir := "var/lib"
-
-	if err := driver.Create(base, "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, base, fileCount, 3); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addFile(driver, base, deleteFile, deleteFileContent); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addDirectory(driver, base, deleteDir); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := driver.Create(upper, base, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, upper, fileCount, 6); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := removeAll(driver, upper, deleteFile, deleteDir); err != nil {
-		t.Fatal(err)
-	}
-
-	diffSize, err := driver.DiffSize(upper, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	diff := stringid.GenerateRandomID()
-	if err := driver.Create(diff, base, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := checkManyFiles(driver, diff, fileCount, 3); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := checkFile(driver, diff, deleteFile, deleteFileContent); err != nil {
-		t.Fatal(err)
-	}
-
-	arch, err := driver.Diff(upper, base)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	buf := bytes.NewBuffer(nil)
-	if _, err := buf.ReadFrom(arch); err != nil {
-		t.Fatal(err)
-	}
-	if err := arch.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	applyDiffSize, err := driver.ApplyDiff(diff, base, bytes.NewReader(buf.Bytes()))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if applyDiffSize != diffSize {
-		t.Fatalf("Apply diff size different, got %d, expected %d", applyDiffSize, diffSize)
-	}
-
-	if err := checkManyFiles(driver, diff, fileCount, 6); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := checkFileRemoved(driver, diff, deleteFile); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := checkFileRemoved(driver, diff, deleteDir); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// DriverTestChanges tests computed changes on a layer matches changes made
-func DriverTestChanges(t testing.TB, drivername string, driverOptions ...string) {
-	driver := GetDriver(t, drivername, driverOptions...)
-	defer PutDriver(t)
-	base := stringid.GenerateRandomID()
-	upper := stringid.GenerateRandomID()
-	if err := driver.Create(base, "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addManyFiles(driver, base, 20, 3); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := driver.Create(upper, base, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	expectedChanges, err := changeManyFiles(driver, upper, 20, 6)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := driver.Changes(upper, base)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err = checkChanges(expectedChanges, changes); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func writeRandomFile(path string, size uint64) error {
-	buf := make([]int64, size/8)
-
-	r := rand.NewSource(0)
-	for i := range buf {
-		buf[i] = r.Int63()
-	}
-
-	// Cast to []byte
-	header := *(*reflect.SliceHeader)(unsafe.Pointer(&buf))
-	header.Len *= 8
-	header.Cap *= 8
-	data := *(*[]byte)(unsafe.Pointer(&header))
-
-	return ioutil.WriteFile(path, data, 0700)
-}
-
-// DriverTestSetQuota Create a driver and test setting quota.
-func DriverTestSetQuota(t *testing.T, drivername string) {
-	driver := GetDriver(t, drivername)
-	defer PutDriver(t)
-
-	createBase(t, driver, "Base")
-	createOpts := &graphdriver.CreateOpts{}
-	createOpts.StorageOpt = make(map[string]string, 1)
-	createOpts.StorageOpt["size"] = "50M"
-	if err := driver.Create("zfsTest", "Base", createOpts); err != nil {
-		t.Fatal(err)
-	}
-
-	mountPath, err := driver.Get("zfsTest", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	quota := uint64(50 * units.MiB)
-	err = writeRandomFile(path.Join(mountPath, "file"), quota*2)
-	if pathError, ok := err.(*os.PathError); ok && pathError.Err != syscall.EDQUOT {
-		t.Fatalf("expect write() to fail with %v, got %v", syscall.EDQUOT, err)
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_windows.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_windows.go
deleted file mode 100644
index a50c5211e3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/graphtest_windows.go
+++ /dev/null
@@ -1 +0,0 @@
-package graphtest
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil.go
deleted file mode 100644
index 35bf6d17ba..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil.go
+++ /dev/null
@@ -1,342 +0,0 @@
-package graphtest
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path"
-	"sort"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-func randomContent(size int, seed int64) []byte {
-	s := rand.NewSource(seed)
-	content := make([]byte, size)
-
-	for i := 0; i < len(content); i += 7 {
-		val := s.Int63()
-		for j := 0; i+j < len(content) && j < 7; j++ {
-			content[i+j] = byte(val)
-			val >>= 8
-		}
-	}
-
-	return content
-}
-
-func addFiles(drv graphdriver.Driver, layer string, seed int64) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	if err := ioutil.WriteFile(path.Join(root, "file-a"), randomContent(64, seed), 0755); err != nil {
-		return err
-	}
-	if err := os.MkdirAll(path.Join(root, "dir-b"), 0755); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(root, "dir-b", "file-b"), randomContent(128, seed+1), 0755); err != nil {
-		return err
-	}
-
-	return ioutil.WriteFile(path.Join(root, "file-c"), randomContent(128*128, seed+2), 0755)
-}
-
-func checkFile(drv graphdriver.Driver, layer, filename string, content []byte) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	fileContent, err := ioutil.ReadFile(path.Join(root, filename))
-	if err != nil {
-		return err
-	}
-
-	if bytes.Compare(fileContent, content) != 0 {
-		return fmt.Errorf("mismatched file content %v, expecting %v", fileContent, content)
-	}
-
-	return nil
-}
-
-func addFile(drv graphdriver.Driver, layer, filename string, content []byte) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	return ioutil.WriteFile(path.Join(root, filename), content, 0755)
-}
-
-func addDirectory(drv graphdriver.Driver, layer, dir string) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	return os.MkdirAll(path.Join(root, dir), 0755)
-}
-
-func removeAll(drv graphdriver.Driver, layer string, names ...string) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	for _, filename := range names {
-		if err := os.RemoveAll(path.Join(root, filename)); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func checkFileRemoved(drv graphdriver.Driver, layer, filename string) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	if _, err := os.Stat(path.Join(root, filename)); err == nil {
-		return fmt.Errorf("file still exists: %s", path.Join(root, filename))
-	} else if !os.IsNotExist(err) {
-		return err
-	}
-
-	return nil
-}
-
-func addManyFiles(drv graphdriver.Driver, layer string, count int, seed int64) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	for i := 0; i < count; i += 100 {
-		dir := path.Join(root, fmt.Sprintf("directory-%d", i))
-		if err := os.MkdirAll(dir, 0755); err != nil {
-			return err
-		}
-		for j := 0; i+j < count && j < 100; j++ {
-			file := path.Join(dir, fmt.Sprintf("file-%d", i+j))
-			if err := ioutil.WriteFile(file, randomContent(64, seed+int64(i+j)), 0755); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func changeManyFiles(drv graphdriver.Driver, layer string, count int, seed int64) ([]archive.Change, error) {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return nil, err
-	}
-	defer drv.Put(layer)
-
-	changes := []archive.Change{}
-	for i := 0; i < count; i += 100 {
-		archiveRoot := fmt.Sprintf("/directory-%d", i)
-		if err := os.MkdirAll(path.Join(root, archiveRoot), 0755); err != nil {
-			return nil, err
-		}
-		for j := 0; i+j < count && j < 100; j++ {
-			if j == 0 {
-				changes = append(changes, archive.Change{
-					Path: archiveRoot,
-					Kind: archive.ChangeModify,
-				})
-			}
-			var change archive.Change
-			switch j % 3 {
-			// Update file
-			case 0:
-				change.Path = path.Join(archiveRoot, fmt.Sprintf("file-%d", i+j))
-				change.Kind = archive.ChangeModify
-				if err := ioutil.WriteFile(path.Join(root, change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {
-					return nil, err
-				}
-			// Add file
-			case 1:
-				change.Path = path.Join(archiveRoot, fmt.Sprintf("file-%d-%d", seed, i+j))
-				change.Kind = archive.ChangeAdd
-				if err := ioutil.WriteFile(path.Join(root, change.Path), randomContent(64, seed+int64(i+j)), 0755); err != nil {
-					return nil, err
-				}
-			// Remove file
-			case 2:
-				change.Path = path.Join(archiveRoot, fmt.Sprintf("file-%d", i+j))
-				change.Kind = archive.ChangeDelete
-				if err := os.Remove(path.Join(root, change.Path)); err != nil {
-					return nil, err
-				}
-			}
-			changes = append(changes, change)
-		}
-	}
-
-	return changes, nil
-}
-
-func checkManyFiles(drv graphdriver.Driver, layer string, count int, seed int64) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	for i := 0; i < count; i += 100 {
-		dir := path.Join(root, fmt.Sprintf("directory-%d", i))
-		for j := 0; i+j < count && j < 100; j++ {
-			file := path.Join(dir, fmt.Sprintf("file-%d", i+j))
-			fileContent, err := ioutil.ReadFile(file)
-			if err != nil {
-				return err
-			}
-
-			content := randomContent(64, seed+int64(i+j))
-
-			if bytes.Compare(fileContent, content) != 0 {
-				return fmt.Errorf("mismatched file content %v, expecting %v", fileContent, content)
-			}
-		}
-	}
-
-	return nil
-}
-
-type changeList []archive.Change
-
-func (c changeList) Less(i, j int) bool {
-	if c[i].Path == c[j].Path {
-		return c[i].Kind < c[j].Kind
-	}
-	return c[i].Path < c[j].Path
-}
-func (c changeList) Len() int      { return len(c) }
-func (c changeList) Swap(i, j int) { c[j], c[i] = c[i], c[j] }
-
-func checkChanges(expected, actual []archive.Change) error {
-	if len(expected) != len(actual) {
-		return fmt.Errorf("unexpected number of changes, expected %d, got %d", len(expected), len(actual))
-	}
-	sort.Sort(changeList(expected))
-	sort.Sort(changeList(actual))
-
-	for i := range expected {
-		if expected[i] != actual[i] {
-			return fmt.Errorf("unexpected change, expecting %v, got %v", expected[i], actual[i])
-		}
-	}
-
-	return nil
-}
-
-func addLayerFiles(drv graphdriver.Driver, layer, parent string, i int) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	if err := ioutil.WriteFile(path.Join(root, "top-id"), []byte(layer), 0755); err != nil {
-		return err
-	}
-	layerDir := path.Join(root, fmt.Sprintf("layer-%d", i))
-	if err := os.MkdirAll(layerDir, 0755); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(layerDir, "layer-id"), []byte(layer), 0755); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(path.Join(layerDir, "parent-id"), []byte(parent), 0755); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func addManyLayers(drv graphdriver.Driver, baseLayer string, count int) (string, error) {
-	lastLayer := baseLayer
-	for i := 1; i <= count; i++ {
-		nextLayer := stringid.GenerateRandomID()
-		if err := drv.Create(nextLayer, lastLayer, nil); err != nil {
-			return "", err
-		}
-		if err := addLayerFiles(drv, nextLayer, lastLayer, i); err != nil {
-			return "", err
-		}
-
-		lastLayer = nextLayer
-
-	}
-	return lastLayer, nil
-}
-
-func checkManyLayers(drv graphdriver.Driver, layer string, count int) error {
-	root, err := drv.Get(layer, "")
-	if err != nil {
-		return err
-	}
-	defer drv.Put(layer)
-
-	layerIDBytes, err := ioutil.ReadFile(path.Join(root, "top-id"))
-	if err != nil {
-		return err
-	}
-
-	if bytes.Compare(layerIDBytes, []byte(layer)) != 0 {
-		return fmt.Errorf("mismatched file content %v, expecting %v", layerIDBytes, []byte(layer))
-	}
-
-	for i := count; i > 0; i-- {
-		layerDir := path.Join(root, fmt.Sprintf("layer-%d", i))
-
-		thisLayerIDBytes, err := ioutil.ReadFile(path.Join(layerDir, "layer-id"))
-		if err != nil {
-			return err
-		}
-		if bytes.Compare(thisLayerIDBytes, layerIDBytes) != 0 {
-			return fmt.Errorf("mismatched file content %v, expecting %v", thisLayerIDBytes, layerIDBytes)
-		}
-		layerIDBytes, err = ioutil.ReadFile(path.Join(layerDir, "parent-id"))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// readDir reads a directory just like ioutil.ReadDir()
-// then hides specific files (currently "lost+found")
-// so the tests don't "see" it
-func readDir(dir string) ([]os.FileInfo, error) {
-	a, err := ioutil.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	b := a[:0]
-	for _, x := range a {
-		if x.Name() != "lost+found" { // ext4 always have this dir
-			b = append(b, x)
-		}
-	}
-
-	return b, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil_unix.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil_unix.go
deleted file mode 100644
index 49b0c2cc35..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/graphtest/testutil_unix.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// +build linux freebsd
-
-package graphtest
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"syscall"
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-// InitLoopbacks ensures that the loopback devices are properly created within
-// the system running the device mapper tests.
-func InitLoopbacks() error {
-	statT, err := getBaseLoopStats()
-	if err != nil {
-		return err
-	}
-	// create at least 8 loopback files, ya, that is a good number
-	for i := 0; i < 8; i++ {
-		loopPath := fmt.Sprintf("/dev/loop%d", i)
-		// only create new loopback files if they don't exist
-		if _, err := os.Stat(loopPath); err != nil {
-			if mkerr := syscall.Mknod(loopPath,
-				uint32(statT.Mode|syscall.S_IFBLK), int((7<<8)|(i&0xff)|((i&0xfff00)<<12))); mkerr != nil {
-				return mkerr
-			}
-			os.Chown(loopPath, int(statT.Uid), int(statT.Gid))
-		}
-	}
-	return nil
-}
-
-// getBaseLoopStats inspects /dev/loop0 to collect uid,gid, and mode for the
-// loop0 device on the system.  If it does not exist we assume 0,0,0660 for the
-// stat data
-func getBaseLoopStats() (*syscall.Stat_t, error) {
-	loop0, err := os.Stat("/dev/loop0")
-	if err != nil {
-		if os.IsNotExist(err) {
-			return &syscall.Stat_t{
-				Uid:  0,
-				Gid:  0,
-				Mode: 0660,
-			}, nil
-		}
-		return nil, err
-	}
-	return loop0.Sys().(*syscall.Stat_t), nil
-}
-
-func verifyFile(t testing.TB, path string, mode os.FileMode, uid, gid uint32) {
-	fi, err := os.Stat(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if fi.Mode()&os.ModeType != mode&os.ModeType {
-		t.Fatalf("Expected %s type 0x%x, got 0x%x", path, mode&os.ModeType, fi.Mode()&os.ModeType)
-	}
-
-	if fi.Mode()&os.ModePerm != mode&os.ModePerm {
-		t.Fatalf("Expected %s mode %o, got %o", path, mode&os.ModePerm, fi.Mode()&os.ModePerm)
-	}
-
-	if fi.Mode()&os.ModeSticky != mode&os.ModeSticky {
-		t.Fatalf("Expected %s sticky 0x%x, got 0x%x", path, mode&os.ModeSticky, fi.Mode()&os.ModeSticky)
-	}
-
-	if fi.Mode()&os.ModeSetuid != mode&os.ModeSetuid {
-		t.Fatalf("Expected %s setuid 0x%x, got 0x%x", path, mode&os.ModeSetuid, fi.Mode()&os.ModeSetuid)
-	}
-
-	if fi.Mode()&os.ModeSetgid != mode&os.ModeSetgid {
-		t.Fatalf("Expected %s setgid 0x%x, got 0x%x", path, mode&os.ModeSetgid, fi.Mode()&os.ModeSetgid)
-	}
-
-	if stat, ok := fi.Sys().(*syscall.Stat_t); ok {
-		if stat.Uid != uid {
-			t.Fatalf("%s no owned by uid %d", path, uid)
-		}
-		if stat.Gid != gid {
-			t.Fatalf("%s not owned by gid %d", path, gid)
-		}
-	}
-}
-
-func createBase(t testing.TB, driver graphdriver.Driver, name string) {
-	// We need to be able to set any perms
-	oldmask := syscall.Umask(0)
-	defer syscall.Umask(oldmask)
-
-	if err := driver.CreateReadWrite(name, "", nil); err != nil {
-		t.Fatal(err)
-	}
-
-	dir, err := driver.Get(name, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer driver.Put(name)
-
-	subdir := path.Join(dir, "a subdir")
-	if err := os.Mkdir(subdir, 0705|os.ModeSticky); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Chown(subdir, 1, 2); err != nil {
-		t.Fatal(err)
-	}
-
-	file := path.Join(dir, "a file")
-	if err := ioutil.WriteFile(file, []byte("Some data"), 0222|os.ModeSetuid); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func verifyBase(t testing.TB, driver graphdriver.Driver, name string) {
-	dir, err := driver.Get(name, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer driver.Put(name)
-
-	subdir := path.Join(dir, "a subdir")
-	verifyFile(t, subdir, 0705|os.ModeDir|os.ModeSticky, 1, 2)
-
-	file := path.Join(dir, "a file")
-	verifyFile(t, file, 0222|os.ModeSetuid, 0, 0)
-
-	fis, err := readDir(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(fis) != 2 {
-		t.Fatal("Unexpected files in base image")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/copy.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/copy.go
deleted file mode 100644
index 666a5c0e04..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/copy.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// +build linux
-
-package overlay
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"syscall"
-	"time"
-
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/system"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-)
-
-type copyFlags int
-
-const (
-	copyHardlink copyFlags = 1 << iota
-)
-
-func copyRegular(srcPath, dstPath string, mode os.FileMode) error {
-	srcFile, err := os.Open(srcPath)
-	if err != nil {
-		return err
-	}
-	defer srcFile.Close()
-
-	dstFile, err := os.OpenFile(dstPath, os.O_WRONLY|os.O_CREATE, mode)
-	if err != nil {
-		return err
-	}
-	defer dstFile.Close()
-
-	_, err = pools.Copy(dstFile, srcFile)
-
-	return err
-}
-
-func copyXattr(srcPath, dstPath, attr string) error {
-	data, err := system.Lgetxattr(srcPath, attr)
-	if err != nil {
-		return err
-	}
-	if data != nil {
-		if err := system.Lsetxattr(dstPath, attr, data, 0); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func copyDir(srcDir, dstDir string, flags copyFlags) error {
-	err := filepath.Walk(srcDir, func(srcPath string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Rebase path
-		relPath, err := filepath.Rel(srcDir, srcPath)
-		if err != nil {
-			return err
-		}
-
-		dstPath := filepath.Join(dstDir, relPath)
-		if err != nil {
-			return err
-		}
-
-		stat, ok := f.Sys().(*syscall.Stat_t)
-		if !ok {
-			return fmt.Errorf("Unable to get raw syscall.Stat_t data for %s", srcPath)
-		}
-
-		isHardlink := false
-
-		switch f.Mode() & os.ModeType {
-		case 0: // Regular file
-			if flags&copyHardlink != 0 {
-				isHardlink = true
-				if err := os.Link(srcPath, dstPath); err != nil {
-					return err
-				}
-			} else {
-				if err := copyRegular(srcPath, dstPath, f.Mode()); err != nil {
-					return err
-				}
-			}
-
-		case os.ModeDir:
-			if err := os.Mkdir(dstPath, f.Mode()); err != nil && !os.IsExist(err) {
-				return err
-			}
-
-		case os.ModeSymlink:
-			link, err := os.Readlink(srcPath)
-			if err != nil {
-				return err
-			}
-
-			if err := os.Symlink(link, dstPath); err != nil {
-				return err
-			}
-
-		case os.ModeNamedPipe:
-			fallthrough
-		case os.ModeSocket:
-			if rsystem.RunningInUserNS() {
-				// cannot create a device if running in user namespace
-				return nil
-			}
-			if err := syscall.Mkfifo(dstPath, stat.Mode); err != nil {
-				return err
-			}
-
-		case os.ModeDevice:
-			if err := syscall.Mknod(dstPath, stat.Mode, int(stat.Rdev)); err != nil {
-				return err
-			}
-
-		default:
-			return fmt.Errorf("Unknown file type for %s\n", srcPath)
-		}
-
-		// Everything below is copying metadata from src to dst. All this metadata
-		// already shares an inode for hardlinks.
-		if isHardlink {
-			return nil
-		}
-
-		if err := os.Lchown(dstPath, int(stat.Uid), int(stat.Gid)); err != nil {
-			return err
-		}
-
-		if err := copyXattr(srcPath, dstPath, "security.capability"); err != nil {
-			return err
-		}
-
-		// We need to copy this attribute if it appears in an overlay upper layer, as
-		// this function is used to copy those. It is set by overlay if a directory
-		// is removed and then re-created and should not inherit anything from the
-		// same dir in the lower dir.
-		if err := copyXattr(srcPath, dstPath, "trusted.overlay.opaque"); err != nil {
-			return err
-		}
-
-		isSymlink := f.Mode()&os.ModeSymlink != 0
-
-		// There is no LChmod, so ignore mode for symlink. Also, this
-		// must happen after chown, as that can modify the file mode
-		if !isSymlink {
-			if err := os.Chmod(dstPath, f.Mode()); err != nil {
-				return err
-			}
-		}
-
-		// system.Chtimes doesn't support a NOFOLLOW flag atm
-		if !isSymlink {
-			aTime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-			mTime := time.Unix(int64(stat.Mtim.Sec), int64(stat.Mtim.Nsec))
-			if err := system.Chtimes(dstPath, aTime, mTime); err != nil {
-				return err
-			}
-		} else {
-			ts := []syscall.Timespec{stat.Atim, stat.Mtim}
-			if err := system.LUtimesNano(dstPath, ts); err != nil {
-				return err
-			}
-		}
-		return nil
-	})
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay.go
deleted file mode 100644
index 121b72e2c3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay.go
+++ /dev/null
@@ -1,462 +0,0 @@
-// +build linux
-
-package overlay
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"strconv"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/overlayutils"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/fsutils"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-// This is a small wrapper over the NaiveDiffWriter that lets us have a custom
-// implementation of ApplyDiff()
-
-var (
-	// ErrApplyDiffFallback is returned to indicate that a normal ApplyDiff is applied as a fallback from Naive diff writer.
-	ErrApplyDiffFallback = fmt.Errorf("Fall back to normal ApplyDiff")
-	backingFs            = "<unknown>"
-)
-
-// ApplyDiffProtoDriver wraps the ProtoDriver by extending the interface with ApplyDiff method.
-type ApplyDiffProtoDriver interface {
-	graphdriver.ProtoDriver
-	// ApplyDiff writes the diff to the archive for the given id and parent id.
-	// It returns the size in bytes written if successful, an error ErrApplyDiffFallback is returned otherwise.
-	ApplyDiff(id, parent string, diff io.Reader) (size int64, err error)
-}
-
-type naiveDiffDriverWithApply struct {
-	graphdriver.Driver
-	applyDiff ApplyDiffProtoDriver
-}
-
-// NaiveDiffDriverWithApply returns a NaiveDiff driver with custom ApplyDiff.
-func NaiveDiffDriverWithApply(driver ApplyDiffProtoDriver, uidMaps, gidMaps []idtools.IDMap) graphdriver.Driver {
-	return &naiveDiffDriverWithApply{
-		Driver:    graphdriver.NewNaiveDiffDriver(driver, uidMaps, gidMaps),
-		applyDiff: driver,
-	}
-}
-
-// ApplyDiff creates a diff layer with either the NaiveDiffDriver or with a fallback.
-func (d *naiveDiffDriverWithApply) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
-	b, err := d.applyDiff.ApplyDiff(id, parent, diff)
-	if err == ErrApplyDiffFallback {
-		return d.Driver.ApplyDiff(id, parent, diff)
-	}
-	return b, err
-}
-
-// This backend uses the overlay union filesystem for containers
-// plus hard link file sharing for images.
-
-// Each container/image can have a "root" subdirectory which is a plain
-// filesystem hierarchy, or they can use overlay.
-
-// If they use overlay there is a "upper" directory and a "lower-id"
-// file, as well as "merged" and "work" directories. The "upper"
-// directory has the upper layer of the overlay, and "lower-id" contains
-// the id of the parent whose "root" directory shall be used as the lower
-// layer in the overlay. The overlay itself is mounted in the "merged"
-// directory, and the "work" dir is needed for overlay to work.
-
-// When an overlay layer is created there are two cases, either the
-// parent has a "root" dir, then we start out with an empty "upper"
-// directory overlaid on the parents root. This is typically the
-// case with the init layer of a container which is based on an image.
-// If there is no "root" in the parent, we inherit the lower-id from
-// the parent and start by making a copy in the parent's "upper" dir.
-// This is typically the case for a container layer which copies
-// its parent -init upper layer.
-
-// Additionally we also have a custom implementation of ApplyLayer
-// which makes a recursive copy of the parent "root" layer using
-// hardlinks to share file data, and then applies the layer on top
-// of that. This means all child images share file (but not directory)
-// data with the parent.
-
-// Driver contains information about the home directory and the list of active mounts that are created using this driver.
-type Driver struct {
-	home          string
-	uidMaps       []idtools.IDMap
-	gidMaps       []idtools.IDMap
-	ctr           *graphdriver.RefCounter
-	supportsDType bool
-}
-
-func init() {
-	graphdriver.Register("overlay", Init)
-}
-
-// Init returns the NaiveDiffDriver, a native diff driver for overlay filesystem.
-// If overlay filesystem is not supported on the host, graphdriver.ErrNotSupported is returned as error.
-// If an overlay filesystem is not supported over an existing filesystem then error graphdriver.ErrIncompatibleFS is returned.
-func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-
-	if err := supportsOverlay(); err != nil {
-		return nil, graphdriver.ErrNotSupported
-	}
-
-	fsMagic, err := graphdriver.GetFSMagic(home)
-	if err != nil {
-		return nil, err
-	}
-	if fsName, ok := graphdriver.FsNames[fsMagic]; ok {
-		backingFs = fsName
-	}
-
-	switch fsMagic {
-	case graphdriver.FsMagicAufs, graphdriver.FsMagicBtrfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicZfs, graphdriver.FsMagicEcryptfs:
-		logrus.Errorf("'overlay' is not supported over %s", backingFs)
-		return nil, graphdriver.ErrIncompatibleFS
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	// Create the driver home dir
-	if err := idtools.MkdirAllAs(home, 0700, rootUID, rootGID); err != nil && !os.IsExist(err) {
-		return nil, err
-	}
-
-	if err := mount.MakePrivate(home); err != nil {
-		return nil, err
-	}
-
-	supportsDType, err := fsutils.SupportsDType(home)
-	if err != nil {
-		return nil, err
-	}
-	if !supportsDType {
-		// not a fatal error until v1.16 (#27443)
-		logrus.Warn(overlayutils.ErrDTypeNotSupported("overlay", backingFs))
-	}
-
-	d := &Driver{
-		home:          home,
-		uidMaps:       uidMaps,
-		gidMaps:       gidMaps,
-		ctr:           graphdriver.NewRefCounter(graphdriver.NewFsChecker(graphdriver.FsMagicOverlay)),
-		supportsDType: supportsDType,
-	}
-
-	return NaiveDiffDriverWithApply(d, uidMaps, gidMaps), nil
-}
-
-func supportsOverlay() error {
-	// We can try to modprobe overlay first before looking at
-	// proc/filesystems for when overlay is supported
-	exec.Command("modprobe", "overlay").Run()
-
-	f, err := os.Open("/proc/filesystems")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		if s.Text() == "nodev\toverlay" {
-			return nil
-		}
-	}
-	logrus.Error("'overlay' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlay support loaded.")
-	return graphdriver.ErrNotSupported
-}
-
-func (d *Driver) String() string {
-	return "overlay"
-}
-
-// Status returns current driver information in a two dimensional string array.
-// Output contains "Backing Filesystem" used in this implementation.
-func (d *Driver) Status() [][2]string {
-	return [][2]string{
-		{"Backing Filesystem", backingFs},
-		{"Supports d_type", strconv.FormatBool(d.supportsDType)},
-	}
-}
-
-// GetMetadata returns meta data about the overlay driver such as root, LowerDir, UpperDir, WorkDir and MergeDir used to store data.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	dir := d.dir(id)
-	if _, err := os.Stat(dir); err != nil {
-		return nil, err
-	}
-
-	metadata := make(map[string]string)
-
-	// If id has a root, it is an image
-	rootDir := path.Join(dir, "root")
-	if _, err := os.Stat(rootDir); err == nil {
-		metadata["RootDir"] = rootDir
-		return metadata, nil
-	}
-
-	lowerID, err := ioutil.ReadFile(path.Join(dir, "lower-id"))
-	if err != nil {
-		return nil, err
-	}
-
-	metadata["LowerDir"] = path.Join(d.dir(string(lowerID)), "root")
-	metadata["UpperDir"] = path.Join(dir, "upper")
-	metadata["WorkDir"] = path.Join(dir, "work")
-	metadata["MergedDir"] = path.Join(dir, "merged")
-
-	return metadata, nil
-}
-
-// Cleanup any state created by overlay which should be cleaned when daemon
-// is being shutdown. For now, we just have to unmount the bind mounted
-// we had created.
-func (d *Driver) Cleanup() error {
-	return mount.Unmount(d.home)
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create is used to create the upper, lower, and merge directories required for overlay fs for a given id.
-// The parent filesystem is used to configure these directories for the overlay.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr error) {
-
-	if opts != nil && len(opts.StorageOpt) != 0 {
-		return fmt.Errorf("--storage-opt is not supported for overlay")
-	}
-
-	dir := d.dir(id)
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return err
-	}
-	if err := idtools.MkdirAllAs(path.Dir(dir), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(dir, 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	defer func() {
-		// Clean up on failure
-		if retErr != nil {
-			os.RemoveAll(dir)
-		}
-	}()
-
-	// Toplevel images are just a "root" dir
-	if parent == "" {
-		if err := idtools.MkdirAs(path.Join(dir, "root"), 0755, rootUID, rootGID); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	parentDir := d.dir(parent)
-
-	// Ensure parent exists
-	if _, err := os.Lstat(parentDir); err != nil {
-		return err
-	}
-
-	// If parent has a root, just do an overlay to it
-	parentRoot := path.Join(parentDir, "root")
-
-	if s, err := os.Lstat(parentRoot); err == nil {
-		if err := idtools.MkdirAs(path.Join(dir, "upper"), s.Mode(), rootUID, rootGID); err != nil {
-			return err
-		}
-		if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil {
-			return err
-		}
-		if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil {
-			return err
-		}
-		if err := ioutil.WriteFile(path.Join(dir, "lower-id"), []byte(parent), 0666); err != nil {
-			return err
-		}
-		return nil
-	}
-
-	// Otherwise, copy the upper and the lower-id from the parent
-
-	lowerID, err := ioutil.ReadFile(path.Join(parentDir, "lower-id"))
-	if err != nil {
-		return err
-	}
-
-	if err := ioutil.WriteFile(path.Join(dir, "lower-id"), lowerID, 0666); err != nil {
-		return err
-	}
-
-	parentUpperDir := path.Join(parentDir, "upper")
-	s, err := os.Lstat(parentUpperDir)
-	if err != nil {
-		return err
-	}
-
-	upperDir := path.Join(dir, "upper")
-	if err := idtools.MkdirAs(upperDir, s.Mode(), rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	return copyDir(parentUpperDir, upperDir, 0)
-}
-
-func (d *Driver) dir(id string) string {
-	return path.Join(d.home, id)
-}
-
-// Remove cleans the directories that are created for this id.
-func (d *Driver) Remove(id string) error {
-	if err := os.RemoveAll(d.dir(id)); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// Get creates and mounts the required file system for the given id and returns the mount path.
-func (d *Driver) Get(id string, mountLabel string) (s string, err error) {
-	dir := d.dir(id)
-	if _, err := os.Stat(dir); err != nil {
-		return "", err
-	}
-	// If id has a root, just return it
-	rootDir := path.Join(dir, "root")
-	if _, err := os.Stat(rootDir); err == nil {
-		return rootDir, nil
-	}
-	mergedDir := path.Join(dir, "merged")
-	if count := d.ctr.Increment(mergedDir); count > 1 {
-		return mergedDir, nil
-	}
-	defer func() {
-		if err != nil {
-			if c := d.ctr.Decrement(mergedDir); c <= 0 {
-				syscall.Unmount(mergedDir, 0)
-			}
-		}
-	}()
-	lowerID, err := ioutil.ReadFile(path.Join(dir, "lower-id"))
-	if err != nil {
-		return "", err
-	}
-	var (
-		lowerDir = path.Join(d.dir(string(lowerID)), "root")
-		upperDir = path.Join(dir, "upper")
-		workDir  = path.Join(dir, "work")
-		opts     = fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", lowerDir, upperDir, workDir)
-	)
-	if err := syscall.Mount("overlay", mergedDir, "overlay", 0, label.FormatMountLabel(opts, mountLabel)); err != nil {
-		return "", fmt.Errorf("error creating overlay mount to %s: %v", mergedDir, err)
-	}
-	// chown "workdir/work" to the remapped root UID/GID. Overlay fs inside a
-	// user namespace requires this to move a directory from lower to upper.
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return "", err
-	}
-	if err := os.Chown(path.Join(workDir, "work"), rootUID, rootGID); err != nil {
-		return "", err
-	}
-	return mergedDir, nil
-}
-
-// Put unmounts the mount path created for the give id.
-func (d *Driver) Put(id string) error {
-	// If id has a root, just return
-	if _, err := os.Stat(path.Join(d.dir(id), "root")); err == nil {
-		return nil
-	}
-	mountpoint := path.Join(d.dir(id), "merged")
-	if count := d.ctr.Decrement(mountpoint); count > 0 {
-		return nil
-	}
-	if err := syscall.Unmount(mountpoint, 0); err != nil {
-		logrus.Debugf("Failed to unmount %s overlay: %v", id, err)
-	}
-	return nil
-}
-
-// ApplyDiff applies the new layer on top of the root, if parent does not exist with will return an ErrApplyDiffFallback error.
-func (d *Driver) ApplyDiff(id string, parent string, diff io.Reader) (size int64, err error) {
-	dir := d.dir(id)
-
-	if parent == "" {
-		return 0, ErrApplyDiffFallback
-	}
-
-	parentRootDir := path.Join(d.dir(parent), "root")
-	if _, err := os.Stat(parentRootDir); err != nil {
-		return 0, ErrApplyDiffFallback
-	}
-
-	// We now know there is a parent, and it has a "root" directory containing
-	// the full root filesystem. We can just hardlink it and apply the
-	// layer. This relies on two things:
-	// 1) ApplyDiff is only run once on a clean (no writes to upper layer) container
-	// 2) ApplyDiff doesn't do any in-place writes to files (would break hardlinks)
-	// These are all currently true and are not expected to break
-
-	tmpRootDir, err := ioutil.TempDir(dir, "tmproot")
-	if err != nil {
-		return 0, err
-	}
-	defer func() {
-		if err != nil {
-			os.RemoveAll(tmpRootDir)
-		} else {
-			os.RemoveAll(path.Join(dir, "upper"))
-			os.RemoveAll(path.Join(dir, "work"))
-			os.RemoveAll(path.Join(dir, "merged"))
-			os.RemoveAll(path.Join(dir, "lower-id"))
-		}
-	}()
-
-	if err = copyDir(parentRootDir, tmpRootDir, copyHardlink); err != nil {
-		return 0, err
-	}
-
-	options := &archive.TarOptions{UIDMaps: d.uidMaps, GIDMaps: d.gidMaps}
-	if size, err = graphdriver.ApplyUncompressedLayer(tmpRootDir, diff, options); err != nil {
-		return 0, err
-	}
-
-	rootDir := path.Join(dir, "root")
-	if err := os.Rename(tmpRootDir, rootDir); err != nil {
-		return 0, err
-	}
-
-	return
-}
-
-// Exists checks to see if the id is already mounted.
-func (d *Driver) Exists(id string) bool {
-	_, err := os.Stat(d.dir(id))
-	return err == nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_test.go
deleted file mode 100644
index 34b6d801fd..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// +build linux
-
-package overlay
-
-import (
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-	"github.com/docker/docker/pkg/archive"
-)
-
-func init() {
-	// Do not sure chroot to speed run time and allow archive
-	// errors or hangs to be debugged directly from the test process.
-	graphdriver.ApplyUncompressedLayer = archive.ApplyUncompressedLayer
-}
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestOverlaySetup and TestOverlayTeardown
-func TestOverlaySetup(t *testing.T) {
-	graphtest.GetDriver(t, "overlay")
-}
-
-func TestOverlayCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, "overlay")
-}
-
-func TestOverlayCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, "overlay")
-}
-
-func TestOverlayCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, "overlay")
-}
-
-func TestOverlay50LayerRead(t *testing.T) {
-	graphtest.DriverTestDeepLayerRead(t, 50, "overlay")
-}
-
-// Fails due to bug in calculating changes after apply
-// likely related to https://github.com/docker/docker/issues/21555
-func TestOverlayDiffApply10Files(t *testing.T) {
-	t.Skipf("Fails to compute changes after apply intermittently")
-	graphtest.DriverTestDiffApply(t, 10, "overlay")
-}
-
-func TestOverlayChanges(t *testing.T) {
-	t.Skipf("Fails to compute changes intermittently")
-	graphtest.DriverTestChanges(t, "overlay")
-}
-
-func TestOverlayTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
-
-// Benchmarks should always setup new driver
-
-func BenchmarkExists(b *testing.B) {
-	graphtest.DriverBenchExists(b, "overlay")
-}
-
-func BenchmarkGetEmpty(b *testing.B) {
-	graphtest.DriverBenchGetEmpty(b, "overlay")
-}
-
-func BenchmarkDiffBase(b *testing.B) {
-	graphtest.DriverBenchDiffBase(b, "overlay")
-}
-
-func BenchmarkDiffSmallUpper(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10, 10, "overlay")
-}
-
-func BenchmarkDiff10KFileUpper(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10, 10000, "overlay")
-}
-
-func BenchmarkDiff10KFilesBottom(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10000, 10, "overlay")
-}
-
-func BenchmarkDiffApply100(b *testing.B) {
-	graphtest.DriverBenchDiffApplyN(b, 100, "overlay")
-}
-
-func BenchmarkDiff20Layers(b *testing.B) {
-	graphtest.DriverBenchDeepLayerDiff(b, 20, "overlay")
-}
-
-func BenchmarkRead20Layers(b *testing.B) {
-	graphtest.DriverBenchDeepLayerRead(b, 20, "overlay")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_unsupported.go
deleted file mode 100644
index 3dbb4de44e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay/overlay_unsupported.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package overlay
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/check.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/check.go
deleted file mode 100644
index 53a7199292..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/check.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// +build linux
-
-package overlay2
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/system"
-	"github.com/pkg/errors"
-)
-
-// hasOpaqueCopyUpBug checks whether the filesystem has a bug
-// which copies up the opaque flag when copying up an opaque
-// directory. When this bug exists naive diff should be used.
-func hasOpaqueCopyUpBug(d string) error {
-	td, err := ioutil.TempDir(d, "opaque-bug-check")
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err := os.RemoveAll(td); err != nil {
-			logrus.Warnf("Failed to remove check directory %v: %v", td, err)
-		}
-	}()
-
-	// Make directories l1/d, l2/d, l3, work, merged
-	if err := os.MkdirAll(filepath.Join(td, "l1", "d"), 0755); err != nil {
-		return err
-	}
-	if err := os.MkdirAll(filepath.Join(td, "l2", "d"), 0755); err != nil {
-		return err
-	}
-	if err := os.Mkdir(filepath.Join(td, "l3"), 0755); err != nil {
-		return err
-	}
-	if err := os.Mkdir(filepath.Join(td, "work"), 0755); err != nil {
-		return err
-	}
-	if err := os.Mkdir(filepath.Join(td, "merged"), 0755); err != nil {
-		return err
-	}
-
-	// Mark l2/d as opaque
-	if err := system.Lsetxattr(filepath.Join(td, "l2", "d"), "trusted.overlay.opaque", []byte("y"), 0); err != nil {
-		return errors.Wrap(err, "failed to set opaque flag on middle layer")
-	}
-
-	opts := fmt.Sprintf("lowerdir=%s:%s,upperdir=%s,workdir=%s", path.Join(td, "l2"), path.Join(td, "l1"), path.Join(td, "l3"), path.Join(td, "work"))
-	if err := syscall.Mount("overlay", filepath.Join(td, "merged"), "overlay", 0, opts); err != nil {
-		return errors.Wrap(err, "failed to mount overlay")
-	}
-	defer func() {
-		if err := syscall.Unmount(filepath.Join(td, "merged"), 0); err != nil {
-			logrus.Warnf("Failed to unmount check directory %v: %v", filepath.Join(td, "merged"), err)
-		}
-	}()
-
-	// Touch file in d to force copy up of opaque directory "d" from "l2" to "l3"
-	if err := ioutil.WriteFile(filepath.Join(td, "merged", "d", "f"), []byte{}, 0644); err != nil {
-		return errors.Wrap(err, "failed to write to merged directory")
-	}
-
-	// Check l3/d does not have opaque flag
-	xattrOpaque, err := system.Lgetxattr(filepath.Join(td, "l3", "d"), "trusted.overlay.opaque")
-	if err != nil {
-		return errors.Wrap(err, "failed to read opaque flag on upper layer")
-	}
-	if string(xattrOpaque) == "y" {
-		return errors.New("opaque flag erroneously copied up, consider update to kernel 4.8 or later to fix")
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/mount.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/mount.go
deleted file mode 100644
index 60e248b6d7..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/mount.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// +build linux
-
-package overlay2
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"os"
-	"runtime"
-	"syscall"
-
-	"github.com/docker/docker/pkg/reexec"
-)
-
-func init() {
-	reexec.Register("docker-mountfrom", mountFromMain)
-}
-
-func fatal(err error) {
-	fmt.Fprint(os.Stderr, err)
-	os.Exit(1)
-}
-
-type mountOptions struct {
-	Device string
-	Target string
-	Type   string
-	Label  string
-	Flag   uint32
-}
-
-func mountFrom(dir, device, target, mType string, flags uintptr, label string) error {
-	options := &mountOptions{
-		Device: device,
-		Target: target,
-		Type:   mType,
-		Flag:   uint32(flags),
-		Label:  label,
-	}
-
-	cmd := reexec.Command("docker-mountfrom", dir)
-	w, err := cmd.StdinPipe()
-	if err != nil {
-		return fmt.Errorf("mountfrom error on pipe creation: %v", err)
-	}
-
-	output := bytes.NewBuffer(nil)
-	cmd.Stdout = output
-	cmd.Stderr = output
-
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("mountfrom error on re-exec cmd: %v", err)
-	}
-	//write the options to the pipe for the untar exec to read
-	if err := json.NewEncoder(w).Encode(options); err != nil {
-		return fmt.Errorf("mountfrom json encode to pipe failed: %v", err)
-	}
-	w.Close()
-
-	if err := cmd.Wait(); err != nil {
-		return fmt.Errorf("mountfrom re-exec error: %v: output: %s", err, output)
-	}
-	return nil
-}
-
-// mountfromMain is the entry-point for docker-mountfrom on re-exec.
-func mountFromMain() {
-	runtime.LockOSThread()
-	flag.Parse()
-
-	var options *mountOptions
-
-	if err := json.NewDecoder(os.Stdin).Decode(&options); err != nil {
-		fatal(err)
-	}
-
-	if err := os.Chdir(flag.Arg(0)); err != nil {
-		fatal(err)
-	}
-
-	if err := syscall.Mount(options.Device, options.Target, options.Type, uintptr(options.Flag), options.Label); err != nil {
-		fatal(err)
-	}
-
-	os.Exit(0)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay.go
deleted file mode 100644
index 65ac6bfaeb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay.go
+++ /dev/null
@@ -1,662 +0,0 @@
-// +build linux
-
-package overlay2
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/overlayutils"
-	"github.com/docker/docker/daemon/graphdriver/quota"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/directory"
-	"github.com/docker/docker/pkg/fsutils"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/go-units"
-
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-var (
-	// untar defines the untar method
-	untar = chrootarchive.UntarUncompressed
-)
-
-// This backend uses the overlay union filesystem for containers
-// with diff directories for each layer.
-
-// This version of the overlay driver requires at least kernel
-// 4.0.0 in order to support mounting multiple diff directories.
-
-// Each container/image has at least a "diff" directory and "link" file.
-// If there is also a "lower" file when there are diff layers
-// below as well as "merged" and "work" directories. The "diff" directory
-// has the upper layer of the overlay and is used to capture any
-// changes to the layer. The "lower" file contains all the lower layer
-// mounts separated by ":" and ordered from uppermost to lowermost
-// layers. The overlay itself is mounted in the "merged" directory,
-// and the "work" dir is needed for overlay to work.
-
-// The "link" file for each layer contains a unique string for the layer.
-// Under the "l" directory at the root there will be a symbolic link
-// with that unique string pointing the "diff" directory for the layer.
-// The symbolic links are used to reference lower layers in the "lower"
-// file and on mount. The links are used to shorten the total length
-// of a layer reference without requiring changes to the layer identifier
-// or root directory. Mounts are always done relative to root and
-// referencing the symbolic links in order to ensure the number of
-// lower directories can fit in a single page for making the mount
-// syscall. A hard upper limit of 128 lower layers is enforced to ensure
-// that mounts do not fail due to length.
-
-const (
-	driverName = "overlay2"
-	linkDir    = "l"
-	lowerFile  = "lower"
-	maxDepth   = 128
-
-	// idLength represents the number of random characters
-	// which can be used to create the unique link identifer
-	// for every layer. If this value is too long then the
-	// page size limit for the mount command may be exceeded.
-	// The idLength should be selected such that following equation
-	// is true (512 is a buffer for label metadata).
-	// ((idLength + len(linkDir) + 1) * maxDepth) <= (pageSize - 512)
-	idLength = 26
-)
-
-type overlayOptions struct {
-	overrideKernelCheck bool
-	quota               quota.Quota
-}
-
-// Driver contains information about the home directory and the list of active mounts that are created using this driver.
-type Driver struct {
-	home          string
-	uidMaps       []idtools.IDMap
-	gidMaps       []idtools.IDMap
-	ctr           *graphdriver.RefCounter
-	quotaCtl      *quota.Control
-	options       overlayOptions
-	naiveDiff     graphdriver.DiffDriver
-	supportsDType bool
-}
-
-var (
-	backingFs             = "<unknown>"
-	projectQuotaSupported = false
-
-	useNaiveDiffLock sync.Once
-	useNaiveDiffOnly bool
-)
-
-func init() {
-	graphdriver.Register(driverName, Init)
-}
-
-// Init returns the a native diff driver for overlay filesystem.
-// If overlay filesystem is not supported on the host, graphdriver.ErrNotSupported is returned as error.
-// If an overlay filesystem is not supported over an existing filesystem then error graphdriver.ErrIncompatibleFS is returned.
-func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	opts, err := parseOptions(options)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := supportsOverlay(); err != nil {
-		return nil, graphdriver.ErrNotSupported
-	}
-
-	// require kernel 4.0.0 to ensure multiple lower dirs are supported
-	v, err := kernel.GetKernelVersion()
-	if err != nil {
-		return nil, err
-	}
-	if kernel.CompareKernelVersion(*v, kernel.VersionInfo{Kernel: 4, Major: 0, Minor: 0}) < 0 {
-		if !opts.overrideKernelCheck {
-			return nil, graphdriver.ErrNotSupported
-		}
-		logrus.Warn("Using pre-4.0.0 kernel for overlay2, mount failures may require kernel update")
-	}
-
-	fsMagic, err := graphdriver.GetFSMagic(home)
-	if err != nil {
-		return nil, err
-	}
-	if fsName, ok := graphdriver.FsNames[fsMagic]; ok {
-		backingFs = fsName
-	}
-
-	// check if they are running over btrfs, aufs, zfs, overlay, or ecryptfs
-	switch fsMagic {
-	case graphdriver.FsMagicBtrfs, graphdriver.FsMagicAufs, graphdriver.FsMagicZfs, graphdriver.FsMagicOverlay, graphdriver.FsMagicEcryptfs:
-		logrus.Errorf("'overlay2' is not supported over %s", backingFs)
-		return nil, graphdriver.ErrIncompatibleFS
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	// Create the driver home dir
-	if err := idtools.MkdirAllAs(path.Join(home, linkDir), 0700, rootUID, rootGID); err != nil && !os.IsExist(err) {
-		return nil, err
-	}
-
-	if err := mount.MakePrivate(home); err != nil {
-		return nil, err
-	}
-
-	supportsDType, err := fsutils.SupportsDType(home)
-	if err != nil {
-		return nil, err
-	}
-	if !supportsDType {
-		// not a fatal error until v1.16 (#27443)
-		logrus.Warn(overlayutils.ErrDTypeNotSupported("overlay2", backingFs))
-	}
-
-	d := &Driver{
-		home:          home,
-		uidMaps:       uidMaps,
-		gidMaps:       gidMaps,
-		ctr:           graphdriver.NewRefCounter(graphdriver.NewFsChecker(graphdriver.FsMagicOverlay)),
-		supportsDType: supportsDType,
-	}
-
-	d.naiveDiff = graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps)
-
-	if backingFs == "xfs" {
-		// Try to enable project quota support over xfs.
-		if d.quotaCtl, err = quota.NewControl(home); err == nil {
-			projectQuotaSupported = true
-		}
-	}
-
-	logrus.Debugf("backingFs=%s,  projectQuotaSupported=%v", backingFs, projectQuotaSupported)
-
-	return d, nil
-}
-
-func parseOptions(options []string) (*overlayOptions, error) {
-	o := &overlayOptions{}
-	for _, option := range options {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil {
-			return nil, err
-		}
-		key = strings.ToLower(key)
-		switch key {
-		case "overlay2.override_kernel_check":
-			o.overrideKernelCheck, err = strconv.ParseBool(val)
-			if err != nil {
-				return nil, err
-			}
-
-		default:
-			return nil, fmt.Errorf("overlay2: Unknown option %s\n", key)
-		}
-	}
-	return o, nil
-}
-
-func supportsOverlay() error {
-	// We can try to modprobe overlay first before looking at
-	// proc/filesystems for when overlay is supported
-	exec.Command("modprobe", "overlay").Run()
-
-	f, err := os.Open("/proc/filesystems")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		if s.Text() == "nodev\toverlay" {
-			return nil
-		}
-	}
-	logrus.Error("'overlay' not found as a supported filesystem on this host. Please ensure kernel is new enough and has overlay support loaded.")
-	return graphdriver.ErrNotSupported
-}
-
-func useNaiveDiff(home string) bool {
-	useNaiveDiffLock.Do(func() {
-		if err := hasOpaqueCopyUpBug(home); err != nil {
-			logrus.Warnf("Not using native diff for overlay2: %v", err)
-			useNaiveDiffOnly = true
-		}
-	})
-	return useNaiveDiffOnly
-}
-
-func (d *Driver) String() string {
-	return driverName
-}
-
-// Status returns current driver information in a two dimensional string array.
-// Output contains "Backing Filesystem" used in this implementation.
-func (d *Driver) Status() [][2]string {
-	return [][2]string{
-		{"Backing Filesystem", backingFs},
-		{"Supports d_type", strconv.FormatBool(d.supportsDType)},
-		{"Native Overlay Diff", strconv.FormatBool(!useNaiveDiff(d.home))},
-	}
-}
-
-// GetMetadata returns meta data about the overlay driver such as
-// LowerDir, UpperDir, WorkDir and MergeDir used to store data.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	dir := d.dir(id)
-	if _, err := os.Stat(dir); err != nil {
-		return nil, err
-	}
-
-	metadata := map[string]string{
-		"WorkDir":   path.Join(dir, "work"),
-		"MergedDir": path.Join(dir, "merged"),
-		"UpperDir":  path.Join(dir, "diff"),
-	}
-
-	lowerDirs, err := d.getLowerDirs(id)
-	if err != nil {
-		return nil, err
-	}
-	if len(lowerDirs) > 0 {
-		metadata["LowerDir"] = strings.Join(lowerDirs, ":")
-	}
-
-	return metadata, nil
-}
-
-// Cleanup any state created by overlay which should be cleaned when daemon
-// is being shutdown. For now, we just have to unmount the bind mounted
-// we had created.
-func (d *Driver) Cleanup() error {
-	return mount.Unmount(d.home)
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create is used to create the upper, lower, and merge directories required for overlay fs for a given id.
-// The parent filesystem is used to configure these directories for the overlay.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) (retErr error) {
-
-	if opts != nil && len(opts.StorageOpt) != 0 && !projectQuotaSupported {
-		return fmt.Errorf("--storage-opt is supported only for overlay over xfs with 'pquota' mount option")
-	}
-
-	dir := d.dir(id)
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return err
-	}
-	if err := idtools.MkdirAllAs(path.Dir(dir), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(dir, 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	defer func() {
-		// Clean up on failure
-		if retErr != nil {
-			os.RemoveAll(dir)
-		}
-	}()
-
-	if opts != nil && len(opts.StorageOpt) > 0 {
-		driver := &Driver{}
-		if err := d.parseStorageOpt(opts.StorageOpt, driver); err != nil {
-			return err
-		}
-
-		if driver.options.quota.Size > 0 {
-			// Set container disk quota limit
-			if err := d.quotaCtl.SetQuota(dir, driver.options.quota); err != nil {
-				return err
-			}
-		}
-	}
-
-	if err := idtools.MkdirAs(path.Join(dir, "diff"), 0755, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	lid := generateID(idLength)
-	if err := os.Symlink(path.Join("..", id, "diff"), path.Join(d.home, linkDir, lid)); err != nil {
-		return err
-	}
-
-	// Write link id to link file
-	if err := ioutil.WriteFile(path.Join(dir, "link"), []byte(lid), 0644); err != nil {
-		return err
-	}
-
-	// if no parent directory, done
-	if parent == "" {
-		return nil
-	}
-
-	if err := idtools.MkdirAs(path.Join(dir, "work"), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(path.Join(dir, "merged"), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-
-	lower, err := d.getLower(parent)
-	if err != nil {
-		return err
-	}
-	if lower != "" {
-		if err := ioutil.WriteFile(path.Join(dir, lowerFile), []byte(lower), 0666); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Parse overlay storage options
-func (d *Driver) parseStorageOpt(storageOpt map[string]string, driver *Driver) error {
-	// Read size to set the disk project quota per container
-	for key, val := range storageOpt {
-		key := strings.ToLower(key)
-		switch key {
-		case "size":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return err
-			}
-			driver.options.quota.Size = uint64(size)
-		default:
-			return fmt.Errorf("Unknown option %s", key)
-		}
-	}
-
-	return nil
-}
-
-func (d *Driver) getLower(parent string) (string, error) {
-	parentDir := d.dir(parent)
-
-	// Ensure parent exists
-	if _, err := os.Lstat(parentDir); err != nil {
-		return "", err
-	}
-
-	// Read Parent link fileA
-	parentLink, err := ioutil.ReadFile(path.Join(parentDir, "link"))
-	if err != nil {
-		return "", err
-	}
-	lowers := []string{path.Join(linkDir, string(parentLink))}
-
-	parentLower, err := ioutil.ReadFile(path.Join(parentDir, lowerFile))
-	if err == nil {
-		parentLowers := strings.Split(string(parentLower), ":")
-		lowers = append(lowers, parentLowers...)
-	}
-	if len(lowers) > maxDepth {
-		return "", errors.New("max depth exceeded")
-	}
-	return strings.Join(lowers, ":"), nil
-}
-
-func (d *Driver) dir(id string) string {
-	return path.Join(d.home, id)
-}
-
-func (d *Driver) getLowerDirs(id string) ([]string, error) {
-	var lowersArray []string
-	lowers, err := ioutil.ReadFile(path.Join(d.dir(id), lowerFile))
-	if err == nil {
-		for _, s := range strings.Split(string(lowers), ":") {
-			lp, err := os.Readlink(path.Join(d.home, s))
-			if err != nil {
-				return nil, err
-			}
-			lowersArray = append(lowersArray, path.Clean(path.Join(d.home, linkDir, lp)))
-		}
-	} else if !os.IsNotExist(err) {
-		return nil, err
-	}
-	return lowersArray, nil
-}
-
-// Remove cleans the directories that are created for this id.
-func (d *Driver) Remove(id string) error {
-	dir := d.dir(id)
-	lid, err := ioutil.ReadFile(path.Join(dir, "link"))
-	if err == nil {
-		if err := os.RemoveAll(path.Join(d.home, linkDir, string(lid))); err != nil {
-			logrus.Debugf("Failed to remove link: %v", err)
-		}
-	}
-
-	if err := os.RemoveAll(dir); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// Get creates and mounts the required file system for the given id and returns the mount path.
-func (d *Driver) Get(id string, mountLabel string) (s string, err error) {
-	dir := d.dir(id)
-	if _, err := os.Stat(dir); err != nil {
-		return "", err
-	}
-
-	diffDir := path.Join(dir, "diff")
-	lowers, err := ioutil.ReadFile(path.Join(dir, lowerFile))
-	if err != nil {
-		// If no lower, just return diff directory
-		if os.IsNotExist(err) {
-			return diffDir, nil
-		}
-		return "", err
-	}
-
-	mergedDir := path.Join(dir, "merged")
-	if count := d.ctr.Increment(mergedDir); count > 1 {
-		return mergedDir, nil
-	}
-	defer func() {
-		if err != nil {
-			if c := d.ctr.Decrement(mergedDir); c <= 0 {
-				syscall.Unmount(mergedDir, 0)
-			}
-		}
-	}()
-
-	workDir := path.Join(dir, "work")
-	splitLowers := strings.Split(string(lowers), ":")
-	absLowers := make([]string, len(splitLowers))
-	for i, s := range splitLowers {
-		absLowers[i] = path.Join(d.home, s)
-	}
-	opts := fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", strings.Join(absLowers, ":"), path.Join(dir, "diff"), path.Join(dir, "work"))
-	mountData := label.FormatMountLabel(opts, mountLabel)
-	mount := syscall.Mount
-	mountTarget := mergedDir
-
-	pageSize := syscall.Getpagesize()
-
-	// Go can return a larger page size than supported by the system
-	// as of go 1.7. This will be fixed in 1.8 and this block can be
-	// removed when building with 1.8.
-	// See https://github.com/golang/go/commit/1b9499b06989d2831e5b156161d6c07642926ee1
-	// See https://github.com/docker/docker/issues/27384
-	if pageSize > 4096 {
-		pageSize = 4096
-	}
-
-	// Use relative paths and mountFrom when the mount data has exceeded
-	// the page size. The mount syscall fails if the mount data cannot
-	// fit within a page and relative links make the mount data much
-	// smaller at the expense of requiring a fork exec to chroot.
-	if len(mountData) > pageSize {
-		opts = fmt.Sprintf("lowerdir=%s,upperdir=%s,workdir=%s", string(lowers), path.Join(id, "diff"), path.Join(id, "work"))
-		mountData = label.FormatMountLabel(opts, mountLabel)
-		if len(mountData) > pageSize {
-			return "", fmt.Errorf("cannot mount layer, mount label too large %d", len(mountData))
-		}
-
-		mount = func(source string, target string, mType string, flags uintptr, label string) error {
-			return mountFrom(d.home, source, target, mType, flags, label)
-		}
-		mountTarget = path.Join(id, "merged")
-	}
-
-	if err := mount("overlay", mountTarget, "overlay", 0, mountData); err != nil {
-		return "", fmt.Errorf("error creating overlay mount to %s: %v", mergedDir, err)
-	}
-
-	// chown "workdir/work" to the remapped root UID/GID. Overlay fs inside a
-	// user namespace requires this to move a directory from lower to upper.
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return "", err
-	}
-
-	if err := os.Chown(path.Join(workDir, "work"), rootUID, rootGID); err != nil {
-		return "", err
-	}
-
-	return mergedDir, nil
-}
-
-// Put unmounts the mount path created for the give id.
-func (d *Driver) Put(id string) error {
-	mountpoint := path.Join(d.dir(id), "merged")
-	if count := d.ctr.Decrement(mountpoint); count > 0 {
-		return nil
-	}
-	if err := syscall.Unmount(mountpoint, 0); err != nil {
-		logrus.Debugf("Failed to unmount %s overlay: %s - %v", id, mountpoint, err)
-	}
-	return nil
-}
-
-// Exists checks to see if the id is already mounted.
-func (d *Driver) Exists(id string) bool {
-	_, err := os.Stat(d.dir(id))
-	return err == nil
-}
-
-// isParent returns if the passed in parent is the direct parent of the passed in layer
-func (d *Driver) isParent(id, parent string) bool {
-	lowers, err := d.getLowerDirs(id)
-	if err != nil {
-		return false
-	}
-	if parent == "" && len(lowers) > 0 {
-		return false
-	}
-
-	parentDir := d.dir(parent)
-	var ld string
-	if len(lowers) > 0 {
-		ld = filepath.Dir(lowers[0])
-	}
-	if ld == "" && parent == "" {
-		return true
-	}
-	return ld == parentDir
-}
-
-// ApplyDiff applies the new layer into a root
-func (d *Driver) ApplyDiff(id string, parent string, diff io.Reader) (size int64, err error) {
-	if !d.isParent(id, parent) {
-		return d.naiveDiff.ApplyDiff(id, parent, diff)
-	}
-
-	applyDir := d.getDiffPath(id)
-
-	logrus.Debugf("Applying tar in %s", applyDir)
-	// Overlay doesn't need the parent id to apply the diff
-	if err := untar(diff, applyDir, &archive.TarOptions{
-		UIDMaps:        d.uidMaps,
-		GIDMaps:        d.gidMaps,
-		WhiteoutFormat: archive.OverlayWhiteoutFormat,
-	}); err != nil {
-		return 0, err
-	}
-
-	return directory.Size(applyDir)
-}
-
-func (d *Driver) getDiffPath(id string) string {
-	dir := d.dir(id)
-
-	return path.Join(dir, "diff")
-}
-
-// DiffSize calculates the changes between the specified id
-// and its parent and returns the size in bytes of the changes
-// relative to its base filesystem directory.
-func (d *Driver) DiffSize(id, parent string) (size int64, err error) {
-	if useNaiveDiff(d.home) || !d.isParent(id, parent) {
-		return d.naiveDiff.DiffSize(id, parent)
-	}
-	return directory.Size(d.getDiffPath(id))
-}
-
-// Diff produces an archive of the changes between the specified
-// layer and its parent layer which may be "".
-func (d *Driver) Diff(id, parent string) (io.ReadCloser, error) {
-	if useNaiveDiff(d.home) || !d.isParent(id, parent) {
-		return d.naiveDiff.Diff(id, parent)
-	}
-
-	diffPath := d.getDiffPath(id)
-	logrus.Debugf("Tar with options on %s", diffPath)
-	return archive.TarWithOptions(diffPath, &archive.TarOptions{
-		Compression:    archive.Uncompressed,
-		UIDMaps:        d.uidMaps,
-		GIDMaps:        d.gidMaps,
-		WhiteoutFormat: archive.OverlayWhiteoutFormat,
-	})
-}
-
-// Changes produces a list of changes between the specified layer
-// and its parent layer. If parent is "", then all changes will be ADD changes.
-func (d *Driver) Changes(id, parent string) ([]archive.Change, error) {
-	if useNaiveDiff(d.home) || !d.isParent(id, parent) {
-		return d.naiveDiff.Changes(id, parent)
-	}
-	// Overlay doesn't have snapshots, so we need to get changes from all parent
-	// layers.
-	diffPath := d.getDiffPath(id)
-	layers, err := d.getLowerDirs(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return archive.OverlayChanges(layers, diffPath)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_test.go
deleted file mode 100644
index cf77ff22be..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// +build linux
-
-package overlay2
-
-import (
-	"io/ioutil"
-	"os"
-	"syscall"
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-)
-
-func init() {
-	// Do not sure chroot to speed run time and allow archive
-	// errors or hangs to be debugged directly from the test process.
-	untar = archive.UntarUncompressed
-	graphdriver.ApplyUncompressedLayer = archive.ApplyUncompressedLayer
-
-	reexec.Init()
-}
-
-func cdMountFrom(dir, device, target, mType, label string) error {
-	wd, err := os.Getwd()
-	if err != nil {
-		return err
-	}
-	os.Chdir(dir)
-	defer os.Chdir(wd)
-
-	return syscall.Mount(device, target, mType, 0, label)
-}
-
-func skipIfNaive(t *testing.T) {
-	td, err := ioutil.TempDir("", "naive-check-")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %v", err)
-	}
-	defer os.RemoveAll(td)
-
-	if useNaiveDiff(td) {
-		t.Skipf("Cannot run test with naive diff")
-	}
-}
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestOverlaySetup and TestOverlayTeardown
-func TestOverlaySetup(t *testing.T) {
-	graphtest.GetDriver(t, driverName)
-}
-
-func TestOverlayCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, driverName)
-}
-
-func TestOverlayCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, driverName)
-}
-
-func TestOverlayCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, driverName)
-}
-
-func TestOverlay128LayerRead(t *testing.T) {
-	graphtest.DriverTestDeepLayerRead(t, 128, driverName)
-}
-
-func TestOverlayDiffApply10Files(t *testing.T) {
-	skipIfNaive(t)
-	graphtest.DriverTestDiffApply(t, 10, driverName)
-}
-
-func TestOverlayChanges(t *testing.T) {
-	skipIfNaive(t)
-	graphtest.DriverTestChanges(t, driverName)
-}
-
-func TestOverlayTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
-
-// Benchmarks should always setup new driver
-
-func BenchmarkExists(b *testing.B) {
-	graphtest.DriverBenchExists(b, driverName)
-}
-
-func BenchmarkGetEmpty(b *testing.B) {
-	graphtest.DriverBenchGetEmpty(b, driverName)
-}
-
-func BenchmarkDiffBase(b *testing.B) {
-	graphtest.DriverBenchDiffBase(b, driverName)
-}
-
-func BenchmarkDiffSmallUpper(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10, 10, driverName)
-}
-
-func BenchmarkDiff10KFileUpper(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10, 10000, driverName)
-}
-
-func BenchmarkDiff10KFilesBottom(b *testing.B) {
-	graphtest.DriverBenchDiffN(b, 10000, 10, driverName)
-}
-
-func BenchmarkDiffApply100(b *testing.B) {
-	graphtest.DriverBenchDiffApplyN(b, 100, driverName)
-}
-
-func BenchmarkDiff20Layers(b *testing.B) {
-	graphtest.DriverBenchDeepLayerDiff(b, 20, driverName)
-}
-
-func BenchmarkRead20Layers(b *testing.B) {
-	graphtest.DriverBenchDeepLayerRead(b, 20, driverName)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_unsupported.go
deleted file mode 100644
index e5ac4ca8c6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/overlay_unsupported.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package overlay2
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/randomid.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/randomid.go
deleted file mode 100644
index af5cb659d5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlay2/randomid.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// +build linux
-
-package overlay2
-
-import (
-	"crypto/rand"
-	"encoding/base32"
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// generateID creates a new random string identifier with the given length
-func generateID(l int) string {
-	const (
-		// ensures we backoff for less than 450ms total. Use the following to
-		// select new value, in units of 10ms:
-		// 	n*(n+1)/2 = d -> n^2 + n - 2d -> n = (sqrt(8d + 1) - 1)/2
-		maxretries = 9
-		backoff    = time.Millisecond * 10
-	)
-
-	var (
-		totalBackoff time.Duration
-		count        int
-		retries      int
-		size         = (l*5 + 7) / 8
-		u            = make([]byte, size)
-	)
-	// TODO: Include time component, counter component, random component
-
-	for {
-		// This should never block but the read may fail. Because of this,
-		// we just try to read the random number generator until we get
-		// something. This is a very rare condition but may happen.
-		b := time.Duration(retries) * backoff
-		time.Sleep(b)
-		totalBackoff += b
-
-		n, err := io.ReadFull(rand.Reader, u[count:])
-		if err != nil {
-			if retryOnError(err) && retries < maxretries {
-				count += n
-				retries++
-				logrus.Errorf("error generating version 4 uuid, retrying: %v", err)
-				continue
-			}
-
-			// Any other errors represent a system problem. What did someone
-			// do to /dev/urandom?
-			panic(fmt.Errorf("error reading random number generator, retried for %v: %v", totalBackoff.String(), err))
-		}
-
-		break
-	}
-
-	s := base32.StdEncoding.EncodeToString(u)
-
-	return s[:l]
-}
-
-// retryOnError tries to detect whether or not retrying would be fruitful.
-func retryOnError(err error) bool {
-	switch err := err.(type) {
-	case *os.PathError:
-		return retryOnError(err.Err) // unpack the target error
-	case syscall.Errno:
-		if err == syscall.EPERM {
-			// EPERM represents an entropy pool exhaustion, a condition under
-			// which we backoff and retry.
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlayutils/overlayutils.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlayutils/overlayutils.go
deleted file mode 100644
index 67c6640b4b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/overlayutils/overlayutils.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux
-
-package overlayutils
-
-import (
-	"errors"
-	"fmt"
-)
-
-// ErrDTypeNotSupported denotes that the backing filesystem doesn't support d_type.
-func ErrDTypeNotSupported(driver, backingFs string) error {
-	msg := fmt.Sprintf("%s: the backing %s filesystem is formatted without d_type support, which leads to incorrect behavior.", driver, backingFs)
-	if backingFs == "xfs" {
-		msg += " Reformat the filesystem with ftype=1 to enable d_type support."
-	}
-	msg += " Running without d_type support will no longer be supported in Docker 1.16."
-	return errors.New(msg)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/plugin.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/plugin.go
deleted file mode 100644
index 7294bcc5f6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/plugin.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package graphdriver
-
-import (
-	"fmt"
-	"io"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/plugin/v2"
-)
-
-type pluginClient interface {
-	// Call calls the specified method with the specified arguments for the plugin.
-	Call(string, interface{}, interface{}) error
-	// Stream calls the specified method with the specified arguments for the plugin and returns the response IO stream
-	Stream(string, interface{}) (io.ReadCloser, error)
-	// SendFile calls the specified method, and passes through the IO stream
-	SendFile(string, io.Reader, interface{}) error
-}
-
-func lookupPlugin(name string, pg plugingetter.PluginGetter, config Options) (Driver, error) {
-	if !config.ExperimentalEnabled {
-		return nil, fmt.Errorf("graphdriver plugins are only supported with experimental mode")
-	}
-	pl, err := pg.Get(name, "GraphDriver", plugingetter.ACQUIRE)
-	if err != nil {
-		return nil, fmt.Errorf("Error looking up graphdriver plugin %s: %v", name, err)
-	}
-	return newPluginDriver(name, pl, config)
-}
-
-func newPluginDriver(name string, pl plugingetter.CompatPlugin, config Options) (Driver, error) {
-	home := config.Root
-	if !pl.IsV1() {
-		if p, ok := pl.(*v2.Plugin); ok {
-			if p.PropagatedMount != "" {
-				home = p.PluginObj.Config.PropagatedMount
-			}
-		}
-	}
-	proxy := &graphDriverProxy{name, pl}
-	return proxy, proxy.Init(filepath.Join(home, name), config.DriverOptions, config.UIDMaps, config.GIDMaps)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/proxy.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/proxy.go
deleted file mode 100644
index bfe74cc6f9..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/proxy.go
+++ /dev/null
@@ -1,252 +0,0 @@
-package graphdriver
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/plugingetter"
-)
-
-type graphDriverProxy struct {
-	name string
-	p    plugingetter.CompatPlugin
-}
-
-type graphDriverRequest struct {
-	ID         string            `json:",omitempty"`
-	Parent     string            `json:",omitempty"`
-	MountLabel string            `json:",omitempty"`
-	StorageOpt map[string]string `json:",omitempty"`
-}
-
-type graphDriverResponse struct {
-	Err      string            `json:",omitempty"`
-	Dir      string            `json:",omitempty"`
-	Exists   bool              `json:",omitempty"`
-	Status   [][2]string       `json:",omitempty"`
-	Changes  []archive.Change  `json:",omitempty"`
-	Size     int64             `json:",omitempty"`
-	Metadata map[string]string `json:",omitempty"`
-}
-
-type graphDriverInitRequest struct {
-	Home    string
-	Opts    []string        `json:"Opts"`
-	UIDMaps []idtools.IDMap `json:"UIDMaps"`
-	GIDMaps []idtools.IDMap `json:"GIDMaps"`
-}
-
-func (d *graphDriverProxy) Init(home string, opts []string, uidMaps, gidMaps []idtools.IDMap) error {
-	if !d.p.IsV1() {
-		if cp, ok := d.p.(plugingetter.CountedPlugin); ok {
-			// always acquire here, it will be cleaned up on daemon shutdown
-			cp.Acquire()
-		}
-	}
-	args := &graphDriverInitRequest{
-		Home:    home,
-		Opts:    opts,
-		UIDMaps: uidMaps,
-		GIDMaps: gidMaps,
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Init", args, &ret); err != nil {
-		return err
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) String() string {
-	return d.name
-}
-
-func (d *graphDriverProxy) CreateReadWrite(id, parent string, opts *CreateOpts) error {
-	args := &graphDriverRequest{
-		ID:     id,
-		Parent: parent,
-	}
-	if opts != nil {
-		args.MountLabel = opts.MountLabel
-		args.StorageOpt = opts.StorageOpt
-	}
-
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.CreateReadWrite", args, &ret); err != nil {
-		return err
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) Create(id, parent string, opts *CreateOpts) error {
-	args := &graphDriverRequest{
-		ID:     id,
-		Parent: parent,
-	}
-	if opts != nil {
-		args.MountLabel = opts.MountLabel
-		args.StorageOpt = opts.StorageOpt
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Create", args, &ret); err != nil {
-		return err
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) Remove(id string) error {
-	args := &graphDriverRequest{ID: id}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Remove", args, &ret); err != nil {
-		return err
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) Get(id, mountLabel string) (string, error) {
-	args := &graphDriverRequest{
-		ID:         id,
-		MountLabel: mountLabel,
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Get", args, &ret); err != nil {
-		return "", err
-	}
-	var err error
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-	return filepath.Join(d.p.BasePath(), ret.Dir), err
-}
-
-func (d *graphDriverProxy) Put(id string) error {
-	args := &graphDriverRequest{ID: id}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Put", args, &ret); err != nil {
-		return err
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) Exists(id string) bool {
-	args := &graphDriverRequest{ID: id}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Exists", args, &ret); err != nil {
-		return false
-	}
-	return ret.Exists
-}
-
-func (d *graphDriverProxy) Status() [][2]string {
-	args := &graphDriverRequest{}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Status", args, &ret); err != nil {
-		return nil
-	}
-	return ret.Status
-}
-
-func (d *graphDriverProxy) GetMetadata(id string) (map[string]string, error) {
-	args := &graphDriverRequest{
-		ID: id,
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.GetMetadata", args, &ret); err != nil {
-		return nil, err
-	}
-	if ret.Err != "" {
-		return nil, errors.New(ret.Err)
-	}
-	return ret.Metadata, nil
-}
-
-func (d *graphDriverProxy) Cleanup() error {
-	if !d.p.IsV1() {
-		if cp, ok := d.p.(plugingetter.CountedPlugin); ok {
-			// always release
-			defer cp.Release()
-		}
-	}
-
-	args := &graphDriverRequest{}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Cleanup", args, &ret); err != nil {
-		return nil
-	}
-	if ret.Err != "" {
-		return errors.New(ret.Err)
-	}
-	return nil
-}
-
-func (d *graphDriverProxy) Diff(id, parent string) (io.ReadCloser, error) {
-	args := &graphDriverRequest{
-		ID:     id,
-		Parent: parent,
-	}
-	body, err := d.p.Client().Stream("GraphDriver.Diff", args)
-	if err != nil {
-		return nil, err
-	}
-	return body, nil
-}
-
-func (d *graphDriverProxy) Changes(id, parent string) ([]archive.Change, error) {
-	args := &graphDriverRequest{
-		ID:     id,
-		Parent: parent,
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.Changes", args, &ret); err != nil {
-		return nil, err
-	}
-	if ret.Err != "" {
-		return nil, errors.New(ret.Err)
-	}
-
-	return ret.Changes, nil
-}
-
-func (d *graphDriverProxy) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
-	var ret graphDriverResponse
-	if err := d.p.Client().SendFile(fmt.Sprintf("GraphDriver.ApplyDiff?id=%s&parent=%s", id, parent), diff, &ret); err != nil {
-		return -1, err
-	}
-	if ret.Err != "" {
-		return -1, errors.New(ret.Err)
-	}
-	return ret.Size, nil
-}
-
-func (d *graphDriverProxy) DiffSize(id, parent string) (int64, error) {
-	args := &graphDriverRequest{
-		ID:     id,
-		Parent: parent,
-	}
-	var ret graphDriverResponse
-	if err := d.p.Client().Call("GraphDriver.DiffSize", args, &ret); err != nil {
-		return -1, err
-	}
-	if ret.Err != "" {
-		return -1, errors.New(ret.Err)
-	}
-	return ret.Size, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/quota/projectquota.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/quota/projectquota.go
deleted file mode 100644
index e408d5f906..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/quota/projectquota.go
+++ /dev/null
@@ -1,339 +0,0 @@
-// +build linux
-
-//
-// projectquota.go - implements XFS project quota controls
-// for setting quota limits on a newly created directory.
-// It currently supports the legacy XFS specific ioctls.
-//
-// TODO: use generic quota control ioctl FS_IOC_FS{GET,SET}XATTR
-//       for both xfs/ext4 for kernel version >= v4.5
-//
-
-package quota
-
-/*
-#include <stdlib.h>
-#include <dirent.h>
-#include <linux/fs.h>
-#include <linux/quota.h>
-#include <linux/dqblk_xfs.h>
-
-#ifndef FS_XFLAG_PROJINHERIT
-struct fsxattr {
-	__u32		fsx_xflags;
-	__u32		fsx_extsize;
-	__u32		fsx_nextents;
-	__u32		fsx_projid;
-	unsigned char	fsx_pad[12];
-};
-#define FS_XFLAG_PROJINHERIT	0x00000200
-#endif
-#ifndef FS_IOC_FSGETXATTR
-#define FS_IOC_FSGETXATTR		_IOR ('X', 31, struct fsxattr)
-#endif
-#ifndef FS_IOC_FSSETXATTR
-#define FS_IOC_FSSETXATTR		_IOW ('X', 32, struct fsxattr)
-#endif
-
-#ifndef PRJQUOTA
-#define PRJQUOTA	2
-#endif
-#ifndef XFS_PROJ_QUOTA
-#define XFS_PROJ_QUOTA	2
-#endif
-#ifndef Q_XSETPQLIM
-#define Q_XSETPQLIM QCMD(Q_XSETQLIM, PRJQUOTA)
-#endif
-#ifndef Q_XGETPQUOTA
-#define Q_XGETPQUOTA QCMD(Q_XGETQUOTA, PRJQUOTA)
-#endif
-*/
-import "C"
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"syscall"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// Quota limit params - currently we only control blocks hard limit
-type Quota struct {
-	Size uint64
-}
-
-// Control - Context to be used by storage driver (e.g. overlay)
-// who wants to apply project quotas to container dirs
-type Control struct {
-	backingFsBlockDev string
-	nextProjectID     uint32
-	quotas            map[string]uint32
-}
-
-// NewControl - initialize project quota support.
-// Test to make sure that quota can be set on a test dir and find
-// the first project id to be used for the next container create.
-//
-// Returns nil (and error) if project quota is not supported.
-//
-// First get the project id of the home directory.
-// This test will fail if the backing fs is not xfs.
-//
-// xfs_quota tool can be used to assign a project id to the driver home directory, e.g.:
-//    echo 999:/var/lib/docker/overlay2 >> /etc/projects
-//    echo docker:999 >> /etc/projid
-//    xfs_quota -x -c 'project -s docker' /<xfs mount point>
-//
-// In that case, the home directory project id will be used as a "start offset"
-// and all containers will be assigned larger project ids (e.g. >= 1000).
-// This is a way to prevent xfs_quota management from conflicting with docker.
-//
-// Then try to create a test directory with the next project id and set a quota
-// on it. If that works, continue to scan existing containers to map allocated
-// project ids.
-//
-func NewControl(basePath string) (*Control, error) {
-	//
-	// Get project id of parent dir as minimal id to be used by driver
-	//
-	minProjectID, err := getProjectID(basePath)
-	if err != nil {
-		return nil, err
-	}
-	minProjectID++
-
-	//
-	// create backing filesystem device node
-	//
-	backingFsBlockDev, err := makeBackingFsDev(basePath)
-	if err != nil {
-		return nil, err
-	}
-
-	//
-	// Test if filesystem supports project quotas by trying to set
-	// a quota on the first available project id
-	//
-	quota := Quota{
-		Size: 0,
-	}
-	if err := setProjectQuota(backingFsBlockDev, minProjectID, quota); err != nil {
-		return nil, err
-	}
-
-	q := Control{
-		backingFsBlockDev: backingFsBlockDev,
-		nextProjectID:     minProjectID + 1,
-		quotas:            make(map[string]uint32),
-	}
-
-	//
-	// get first project id to be used for next container
-	//
-	err = q.findNextProjectID(basePath)
-	if err != nil {
-		return nil, err
-	}
-
-	logrus.Debugf("NewControl(%s): nextProjectID = %d", basePath, q.nextProjectID)
-	return &q, nil
-}
-
-// SetQuota - assign a unique project id to directory and set the quota limits
-// for that project id
-func (q *Control) SetQuota(targetPath string, quota Quota) error {
-
-	projectID, ok := q.quotas[targetPath]
-	if !ok {
-		projectID = q.nextProjectID
-
-		//
-		// assign project id to new container directory
-		//
-		err := setProjectID(targetPath, projectID)
-		if err != nil {
-			return err
-		}
-
-		q.quotas[targetPath] = projectID
-		q.nextProjectID++
-	}
-
-	//
-	// set the quota limit for the container's project id
-	//
-	logrus.Debugf("SetQuota(%s, %d): projectID=%d", targetPath, quota.Size, projectID)
-	return setProjectQuota(q.backingFsBlockDev, projectID, quota)
-}
-
-// setProjectQuota - set the quota for project id on xfs block device
-func setProjectQuota(backingFsBlockDev string, projectID uint32, quota Quota) error {
-	var d C.fs_disk_quota_t
-	d.d_version = C.FS_DQUOT_VERSION
-	d.d_id = C.__u32(projectID)
-	d.d_flags = C.XFS_PROJ_QUOTA
-
-	d.d_fieldmask = C.FS_DQ_BHARD | C.FS_DQ_BSOFT
-	d.d_blk_hardlimit = C.__u64(quota.Size / 512)
-	d.d_blk_softlimit = d.d_blk_hardlimit
-
-	var cs = C.CString(backingFsBlockDev)
-	defer C.free(unsafe.Pointer(cs))
-
-	_, _, errno := syscall.Syscall6(syscall.SYS_QUOTACTL, C.Q_XSETPQLIM,
-		uintptr(unsafe.Pointer(cs)), uintptr(d.d_id),
-		uintptr(unsafe.Pointer(&d)), 0, 0)
-	if errno != 0 {
-		return fmt.Errorf("Failed to set quota limit for projid %d on %s: %v",
-			projectID, backingFsBlockDev, errno.Error())
-	}
-
-	return nil
-}
-
-// GetQuota - get the quota limits of a directory that was configured with SetQuota
-func (q *Control) GetQuota(targetPath string, quota *Quota) error {
-
-	projectID, ok := q.quotas[targetPath]
-	if !ok {
-		return fmt.Errorf("quota not found for path : %s", targetPath)
-	}
-
-	//
-	// get the quota limit for the container's project id
-	//
-	var d C.fs_disk_quota_t
-
-	var cs = C.CString(q.backingFsBlockDev)
-	defer C.free(unsafe.Pointer(cs))
-
-	_, _, errno := syscall.Syscall6(syscall.SYS_QUOTACTL, C.Q_XGETPQUOTA,
-		uintptr(unsafe.Pointer(cs)), uintptr(C.__u32(projectID)),
-		uintptr(unsafe.Pointer(&d)), 0, 0)
-	if errno != 0 {
-		return fmt.Errorf("Failed to get quota limit for projid %d on %s: %v",
-			projectID, q.backingFsBlockDev, errno.Error())
-	}
-	quota.Size = uint64(d.d_blk_hardlimit) * 512
-
-	return nil
-}
-
-// getProjectID - get the project id of path on xfs
-func getProjectID(targetPath string) (uint32, error) {
-	dir, err := openDir(targetPath)
-	if err != nil {
-		return 0, err
-	}
-	defer closeDir(dir)
-
-	var fsx C.struct_fsxattr
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.FS_IOC_FSGETXATTR,
-		uintptr(unsafe.Pointer(&fsx)))
-	if errno != 0 {
-		return 0, fmt.Errorf("Failed to get projid for %s: %v", targetPath, errno.Error())
-	}
-
-	return uint32(fsx.fsx_projid), nil
-}
-
-// setProjectID - set the project id of path on xfs
-func setProjectID(targetPath string, projectID uint32) error {
-	dir, err := openDir(targetPath)
-	if err != nil {
-		return err
-	}
-	defer closeDir(dir)
-
-	var fsx C.struct_fsxattr
-	_, _, errno := syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.FS_IOC_FSGETXATTR,
-		uintptr(unsafe.Pointer(&fsx)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to get projid for %s: %v", targetPath, errno.Error())
-	}
-	fsx.fsx_projid = C.__u32(projectID)
-	fsx.fsx_xflags |= C.FS_XFLAG_PROJINHERIT
-	_, _, errno = syscall.Syscall(syscall.SYS_IOCTL, getDirFd(dir), C.FS_IOC_FSSETXATTR,
-		uintptr(unsafe.Pointer(&fsx)))
-	if errno != 0 {
-		return fmt.Errorf("Failed to set projid for %s: %v", targetPath, errno.Error())
-	}
-
-	return nil
-}
-
-// findNextProjectID - find the next project id to be used for containers
-// by scanning driver home directory to find used project ids
-func (q *Control) findNextProjectID(home string) error {
-	files, err := ioutil.ReadDir(home)
-	if err != nil {
-		return fmt.Errorf("read directory failed : %s", home)
-	}
-	for _, file := range files {
-		if !file.IsDir() {
-			continue
-		}
-		path := filepath.Join(home, file.Name())
-		projid, err := getProjectID(path)
-		if err != nil {
-			return err
-		}
-		if projid > 0 {
-			q.quotas[path] = projid
-		}
-		if q.nextProjectID <= projid {
-			q.nextProjectID = projid + 1
-		}
-	}
-
-	return nil
-}
-
-func free(p *C.char) {
-	C.free(unsafe.Pointer(p))
-}
-
-func openDir(path string) (*C.DIR, error) {
-	Cpath := C.CString(path)
-	defer free(Cpath)
-
-	dir := C.opendir(Cpath)
-	if dir == nil {
-		return nil, fmt.Errorf("Can't open dir")
-	}
-	return dir, nil
-}
-
-func closeDir(dir *C.DIR) {
-	if dir != nil {
-		C.closedir(dir)
-	}
-}
-
-func getDirFd(dir *C.DIR) uintptr {
-	return uintptr(C.dirfd(dir))
-}
-
-// Get the backing block device of the driver home directory
-// and create a block device node under the home directory
-// to be used by quotactl commands
-func makeBackingFsDev(home string) (string, error) {
-	fileinfo, err := os.Stat(home)
-	if err != nil {
-		return "", err
-	}
-
-	backingFsBlockDev := path.Join(home, "backingFsBlockDev")
-	// Re-create just in case comeone copied the home directory over to a new device
-	syscall.Unlink(backingFsBlockDev)
-	stat := fileinfo.Sys().(*syscall.Stat_t)
-	if err := syscall.Mknod(backingFsBlockDev, syscall.S_IFBLK|0600, int(stat.Dev)); err != nil {
-		return "", fmt.Errorf("Failed to mknod %s: %v", backingFsBlockDev, err)
-	}
-
-	return backingFsBlockDev, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_aufs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_aufs.go
deleted file mode 100644
index 262954d6e3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_aufs.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !exclude_graphdriver_aufs,linux
-
-package register
-
-import (
-	// register the aufs graphdriver
-	_ "github.com/docker/docker/daemon/graphdriver/aufs"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_btrfs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_btrfs.go
deleted file mode 100644
index f456cc5ce5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_btrfs.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !exclude_graphdriver_btrfs,linux
-
-package register
-
-import (
-	// register the btrfs graphdriver
-	_ "github.com/docker/docker/daemon/graphdriver/btrfs"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_devicemapper.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_devicemapper.go
deleted file mode 100644
index bb2e9ef541..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_devicemapper.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !exclude_graphdriver_devicemapper,linux
-
-package register
-
-import (
-	// register the devmapper graphdriver
-	_ "github.com/docker/docker/daemon/graphdriver/devmapper"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_overlay.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_overlay.go
deleted file mode 100644
index 9ba849cedc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_overlay.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !exclude_graphdriver_overlay,linux
-
-package register
-
-import (
-	// register the overlay graphdriver
-	_ "github.com/docker/docker/daemon/graphdriver/overlay"
-	_ "github.com/docker/docker/daemon/graphdriver/overlay2"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_vfs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_vfs.go
deleted file mode 100644
index 98fad23b20..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_vfs.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package register
-
-import (
-	// register vfs
-	_ "github.com/docker/docker/daemon/graphdriver/vfs"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_windows.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_windows.go
deleted file mode 100644
index efaa5005ed..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package register
-
-import (
-	// register the windows graph driver
-	_ "github.com/docker/docker/daemon/graphdriver/windows"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_zfs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_zfs.go
deleted file mode 100644
index 8f34e35537..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/register/register_zfs.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !exclude_graphdriver_zfs,linux !exclude_graphdriver_zfs,freebsd, solaris
-
-package register
-
-import (
-	// register the zfs driver
-	_ "github.com/docker/docker/daemon/graphdriver/zfs"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/driver.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/driver.go
deleted file mode 100644
index 8832d11531..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/driver.go
+++ /dev/null
@@ -1,145 +0,0 @@
-package vfs
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/idtools"
-
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-var (
-	// CopyWithTar defines the copy method to use.
-	CopyWithTar = chrootarchive.CopyWithTar
-)
-
-func init() {
-	graphdriver.Register("vfs", Init)
-}
-
-// Init returns a new VFS driver.
-// This sets the home directory for the driver and returns NaiveDiffDriver.
-func Init(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	d := &Driver{
-		home:    home,
-		uidMaps: uidMaps,
-		gidMaps: gidMaps,
-	}
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, err
-	}
-	if err := idtools.MkdirAllAs(home, 0700, rootUID, rootGID); err != nil {
-		return nil, err
-	}
-	return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil
-}
-
-// Driver holds information about the driver, home directory of the driver.
-// Driver implements graphdriver.ProtoDriver. It uses only basic vfs operations.
-// In order to support layering, files are copied from the parent layer into the new layer. There is no copy-on-write support.
-// Driver must be wrapped in NaiveDiffDriver to be used as a graphdriver.Driver
-type Driver struct {
-	home    string
-	uidMaps []idtools.IDMap
-	gidMaps []idtools.IDMap
-}
-
-func (d *Driver) String() string {
-	return "vfs"
-}
-
-// Status is used for implementing the graphdriver.ProtoDriver interface. VFS does not currently have any status information.
-func (d *Driver) Status() [][2]string {
-	return nil
-}
-
-// GetMetadata is used for implementing the graphdriver.ProtoDriver interface. VFS does not currently have any meta data.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	return nil, nil
-}
-
-// Cleanup is used to implement graphdriver.ProtoDriver. There is no cleanup required for this driver.
-func (d *Driver) Cleanup() error {
-	return nil
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create prepares the filesystem for the VFS driver and copies the directory for the given id under the parent.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-	if opts != nil && len(opts.StorageOpt) != 0 {
-		return fmt.Errorf("--storage-opt is not supported for vfs")
-	}
-
-	dir := d.dir(id)
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		return err
-	}
-	if err := idtools.MkdirAllAs(filepath.Dir(dir), 0700, rootUID, rootGID); err != nil {
-		return err
-	}
-	if err := idtools.MkdirAs(dir, 0755, rootUID, rootGID); err != nil {
-		return err
-	}
-	labelOpts := []string{"level:s0"}
-	if _, mountLabel, err := label.InitLabels(labelOpts); err == nil {
-		label.SetFileLabel(dir, mountLabel)
-	}
-	if parent == "" {
-		return nil
-	}
-	parentDir, err := d.Get(parent, "")
-	if err != nil {
-		return fmt.Errorf("%s: %s", parent, err)
-	}
-	if err := CopyWithTar(parentDir, dir); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Driver) dir(id string) string {
-	return filepath.Join(d.home, "dir", filepath.Base(id))
-}
-
-// Remove deletes the content from the directory for a given id.
-func (d *Driver) Remove(id string) error {
-	if err := os.RemoveAll(d.dir(id)); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// Get returns the directory for the given id.
-func (d *Driver) Get(id, mountLabel string) (string, error) {
-	dir := d.dir(id)
-	if st, err := os.Stat(dir); err != nil {
-		return "", err
-	} else if !st.IsDir() {
-		return "", fmt.Errorf("%s: not a directory", dir)
-	}
-	return dir, nil
-}
-
-// Put is a noop for vfs that return nil for the error, since this driver has no runtime resources to clean up.
-func (d *Driver) Put(id string) error {
-	// The vfs driver has no runtime resources (e.g. mounts)
-	// to clean up, so we don't need anything here
-	return nil
-}
-
-// Exists checks to see if the directory exists for the given id.
-func (d *Driver) Exists(id string) bool {
-	_, err := os.Stat(d.dir(id))
-	return err == nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go
deleted file mode 100644
index 9ecf21dbaa..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/vfs/vfs_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build linux
-
-package vfs
-
-import (
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-
-	"github.com/docker/docker/pkg/reexec"
-)
-
-func init() {
-	reexec.Init()
-}
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestVfsSetup and TestVfsTeardown
-func TestVfsSetup(t *testing.T) {
-	graphtest.GetDriver(t, "vfs")
-}
-
-func TestVfsCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, "vfs")
-}
-
-func TestVfsCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, "vfs")
-}
-
-func TestVfsCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, "vfs")
-}
-
-func TestVfsTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/windows/windows.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/windows/windows.go
deleted file mode 100644
index beac93ae75..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/windows/windows.go
+++ /dev/null
@@ -1,886 +0,0 @@
-//+build windows
-
-package windows
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-	"unsafe"
-
-	"github.com/Microsoft/go-winio"
-	"github.com/Microsoft/go-winio/archive/tar"
-	"github.com/Microsoft/go-winio/backuptar"
-	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/longpath"
-	"github.com/docker/docker/pkg/reexec"
-	units "github.com/docker/go-units"
-	"golang.org/x/sys/windows"
-)
-
-// filterDriver is an HCSShim driver type for the Windows Filter driver.
-const filterDriver = 1
-
-var (
-	// mutatedFiles is a list of files that are mutated by the import process
-	// and must be backed up and restored.
-	mutatedFiles = map[string]string{
-		"UtilityVM/Files/EFI/Microsoft/Boot/BCD":      "bcd.bak",
-		"UtilityVM/Files/EFI/Microsoft/Boot/BCD.LOG":  "bcd.log.bak",
-		"UtilityVM/Files/EFI/Microsoft/Boot/BCD.LOG1": "bcd.log1.bak",
-		"UtilityVM/Files/EFI/Microsoft/Boot/BCD.LOG2": "bcd.log2.bak",
-	}
-	noreexec = false
-)
-
-// init registers the windows graph drivers to the register.
-func init() {
-	graphdriver.Register("windowsfilter", InitFilter)
-	// DOCKER_WINDOWSFILTER_NOREEXEC allows for inline processing which makes
-	// debugging issues in the re-exec codepath significantly easier.
-	if os.Getenv("DOCKER_WINDOWSFILTER_NOREEXEC") != "" {
-		logrus.Warnf("WindowsGraphDriver is set to not re-exec. This is intended for debugging purposes only.")
-		noreexec = true
-	} else {
-		reexec.Register("docker-windows-write-layer", writeLayerReexec)
-	}
-}
-
-type checker struct {
-}
-
-func (c *checker) IsMounted(path string) bool {
-	return false
-}
-
-// Driver represents a windows graph driver.
-type Driver struct {
-	// info stores the shim driver information
-	info hcsshim.DriverInfo
-	ctr  *graphdriver.RefCounter
-	// it is safe for windows to use a cache here because it does not support
-	// restoring containers when the daemon dies.
-	cacheMu sync.Mutex
-	cache   map[string]string
-}
-
-// InitFilter returns a new Windows storage filter driver.
-func InitFilter(home string, options []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	logrus.Debugf("WindowsGraphDriver InitFilter at %s", home)
-
-	fsType, err := getFileSystemType(string(home[0]))
-	if err != nil {
-		return nil, err
-	}
-	if strings.ToLower(fsType) == "refs" {
-		return nil, fmt.Errorf("%s is on an ReFS volume - ReFS volumes are not supported", home)
-	}
-
-	d := &Driver{
-		info: hcsshim.DriverInfo{
-			HomeDir: home,
-			Flavour: filterDriver,
-		},
-		cache: make(map[string]string),
-		ctr:   graphdriver.NewRefCounter(&checker{}),
-	}
-	return d, nil
-}
-
-// win32FromHresult is a helper function to get the win32 error code from an HRESULT
-func win32FromHresult(hr uintptr) uintptr {
-	if hr&0x1fff0000 == 0x00070000 {
-		return hr & 0xffff
-	}
-	return hr
-}
-
-// getFileSystemType obtains the type of a file system through GetVolumeInformation
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa364993(v=vs.85).aspx
-func getFileSystemType(drive string) (fsType string, hr error) {
-	var (
-		modkernel32              = windows.NewLazySystemDLL("kernel32.dll")
-		procGetVolumeInformation = modkernel32.NewProc("GetVolumeInformationW")
-		buf                      = make([]uint16, 255)
-		size                     = syscall.MAX_PATH + 1
-	)
-	if len(drive) != 1 {
-		hr = errors.New("getFileSystemType must be called with a drive letter")
-		return
-	}
-	drive += `:\`
-	n := uintptr(unsafe.Pointer(nil))
-	r0, _, _ := syscall.Syscall9(procGetVolumeInformation.Addr(), 8, uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(drive))), n, n, n, n, n, uintptr(unsafe.Pointer(&buf[0])), uintptr(size), 0)
-	if int32(r0) < 0 {
-		hr = syscall.Errno(win32FromHresult(r0))
-	}
-	fsType = syscall.UTF16ToString(buf)
-	return
-}
-
-// String returns the string representation of a driver. This should match
-// the name the graph driver has been registered with.
-func (d *Driver) String() string {
-	return "windowsfilter"
-}
-
-// Status returns the status of the driver.
-func (d *Driver) Status() [][2]string {
-	return [][2]string{
-		{"Windows", ""},
-	}
-}
-
-// Exists returns true if the given id is registered with this driver.
-func (d *Driver) Exists(id string) bool {
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return false
-	}
-	result, err := hcsshim.LayerExists(d.info, rID)
-	if err != nil {
-		return false
-	}
-	return result
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	if opts != nil {
-		return d.create(id, parent, opts.MountLabel, false, opts.StorageOpt)
-	}
-	return d.create(id, parent, "", false, nil)
-}
-
-// Create creates a new read-only layer with the given id.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-	if opts != nil {
-		return d.create(id, parent, opts.MountLabel, true, opts.StorageOpt)
-	}
-	return d.create(id, parent, "", true, nil)
-}
-
-func (d *Driver) create(id, parent, mountLabel string, readOnly bool, storageOpt map[string]string) error {
-	rPId, err := d.resolveID(parent)
-	if err != nil {
-		return err
-	}
-
-	parentChain, err := d.getLayerChain(rPId)
-	if err != nil {
-		return err
-	}
-
-	var layerChain []string
-
-	if rPId != "" {
-		parentPath, err := hcsshim.GetLayerMountPath(d.info, rPId)
-		if err != nil {
-			return err
-		}
-		if _, err := os.Stat(filepath.Join(parentPath, "Files")); err == nil {
-			// This is a legitimate parent layer (not the empty "-init" layer),
-			// so include it in the layer chain.
-			layerChain = []string{parentPath}
-		}
-	}
-
-	layerChain = append(layerChain, parentChain...)
-
-	if readOnly {
-		if err := hcsshim.CreateLayer(d.info, id, rPId); err != nil {
-			return err
-		}
-	} else {
-		var parentPath string
-		if len(layerChain) != 0 {
-			parentPath = layerChain[0]
-		}
-
-		if err := hcsshim.CreateSandboxLayer(d.info, id, parentPath, layerChain); err != nil {
-			return err
-		}
-
-		storageOptions, err := parseStorageOpt(storageOpt)
-		if err != nil {
-			return fmt.Errorf("Failed to parse storage options - %s", err)
-		}
-
-		if storageOptions.size != 0 {
-			if err := hcsshim.ExpandSandboxSize(d.info, id, storageOptions.size); err != nil {
-				return err
-			}
-		}
-	}
-
-	if _, err := os.Lstat(d.dir(parent)); err != nil {
-		if err2 := hcsshim.DestroyLayer(d.info, id); err2 != nil {
-			logrus.Warnf("Failed to DestroyLayer %s: %s", id, err2)
-		}
-		return fmt.Errorf("Cannot create layer with missing parent %s: %s", parent, err)
-	}
-
-	if err := d.setLayerChain(id, layerChain); err != nil {
-		if err2 := hcsshim.DestroyLayer(d.info, id); err2 != nil {
-			logrus.Warnf("Failed to DestroyLayer %s: %s", id, err2)
-		}
-		return err
-	}
-
-	return nil
-}
-
-// dir returns the absolute path to the layer.
-func (d *Driver) dir(id string) string {
-	return filepath.Join(d.info.HomeDir, filepath.Base(id))
-}
-
-// Remove unmounts and removes the dir information.
-func (d *Driver) Remove(id string) error {
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return err
-	}
-
-	// This retry loop is due to a bug in Windows (Internal bug #9432268)
-	// if GetContainers fails with ErrVmcomputeOperationInvalidState
-	// it is a transient error. Retry until it succeeds.
-	var computeSystems []hcsshim.ContainerProperties
-	retryCount := 0
-	for {
-		// Get and terminate any template VMs that are currently using the layer
-		computeSystems, err = hcsshim.GetContainers(hcsshim.ComputeSystemQuery{})
-		if err != nil {
-			if err == hcsshim.ErrVmcomputeOperationInvalidState {
-				if retryCount >= 5 {
-					// If we are unable to get the list of containers
-					// go ahead and attempt to delete the layer anyway
-					// as it will most likely work.
-					break
-				}
-				retryCount++
-				time.Sleep(2 * time.Second)
-				continue
-			}
-			return err
-		}
-		break
-	}
-
-	for _, computeSystem := range computeSystems {
-		if strings.Contains(computeSystem.RuntimeImagePath, id) && computeSystem.IsRuntimeTemplate {
-			container, err := hcsshim.OpenContainer(computeSystem.ID)
-			if err != nil {
-				return err
-			}
-			defer container.Close()
-			err = container.Terminate()
-			if hcsshim.IsPending(err) {
-				err = container.Wait()
-			} else if hcsshim.IsAlreadyStopped(err) {
-				err = nil
-			}
-
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	layerPath := filepath.Join(d.info.HomeDir, rID)
-	tmpID := fmt.Sprintf("%s-removing", rID)
-	tmpLayerPath := filepath.Join(d.info.HomeDir, tmpID)
-	if err := os.Rename(layerPath, tmpLayerPath); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	if err := hcsshim.DestroyLayer(d.info, tmpID); err != nil {
-		logrus.Errorf("Failed to DestroyLayer %s: %s", id, err)
-	}
-
-	return nil
-}
-
-// Get returns the rootfs path for the id. This will mount the dir at its given path.
-func (d *Driver) Get(id, mountLabel string) (string, error) {
-	logrus.Debugf("WindowsGraphDriver Get() id %s mountLabel %s", id, mountLabel)
-	var dir string
-
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return "", err
-	}
-	if count := d.ctr.Increment(rID); count > 1 {
-		return d.cache[rID], nil
-	}
-
-	// Getting the layer paths must be done outside of the lock.
-	layerChain, err := d.getLayerChain(rID)
-	if err != nil {
-		d.ctr.Decrement(rID)
-		return "", err
-	}
-
-	if err := hcsshim.ActivateLayer(d.info, rID); err != nil {
-		d.ctr.Decrement(rID)
-		return "", err
-	}
-	if err := hcsshim.PrepareLayer(d.info, rID, layerChain); err != nil {
-		d.ctr.Decrement(rID)
-		if err2 := hcsshim.DeactivateLayer(d.info, rID); err2 != nil {
-			logrus.Warnf("Failed to Deactivate %s: %s", id, err)
-		}
-		return "", err
-	}
-
-	mountPath, err := hcsshim.GetLayerMountPath(d.info, rID)
-	if err != nil {
-		d.ctr.Decrement(rID)
-		if err2 := hcsshim.DeactivateLayer(d.info, rID); err2 != nil {
-			logrus.Warnf("Failed to Deactivate %s: %s", id, err)
-		}
-		return "", err
-	}
-	d.cacheMu.Lock()
-	d.cache[rID] = mountPath
-	d.cacheMu.Unlock()
-
-	// If the layer has a mount path, use that. Otherwise, use the
-	// folder path.
-	if mountPath != "" {
-		dir = mountPath
-	} else {
-		dir = d.dir(id)
-	}
-
-	return dir, nil
-}
-
-// Put adds a new layer to the driver.
-func (d *Driver) Put(id string) error {
-	logrus.Debugf("WindowsGraphDriver Put() id %s", id)
-
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return err
-	}
-	if count := d.ctr.Decrement(rID); count > 0 {
-		return nil
-	}
-	d.cacheMu.Lock()
-	delete(d.cache, rID)
-	d.cacheMu.Unlock()
-
-	if err := hcsshim.UnprepareLayer(d.info, rID); err != nil {
-		return err
-	}
-	return hcsshim.DeactivateLayer(d.info, rID)
-}
-
-// Cleanup ensures the information the driver stores is properly removed.
-func (d *Driver) Cleanup() error {
-	return nil
-}
-
-// Diff produces an archive of the changes between the specified
-// layer and its parent layer which may be "".
-// The layer should be mounted when calling this function
-func (d *Driver) Diff(id, parent string) (_ io.ReadCloser, err error) {
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return
-	}
-
-	layerChain, err := d.getLayerChain(rID)
-	if err != nil {
-		return
-	}
-
-	// this is assuming that the layer is unmounted
-	if err := hcsshim.UnprepareLayer(d.info, rID); err != nil {
-		return nil, err
-	}
-	prepare := func() {
-		if err := hcsshim.PrepareLayer(d.info, rID, layerChain); err != nil {
-			logrus.Warnf("Failed to Deactivate %s: %s", rID, err)
-		}
-	}
-
-	arch, err := d.exportLayer(rID, layerChain)
-	if err != nil {
-		prepare()
-		return
-	}
-	return ioutils.NewReadCloserWrapper(arch, func() error {
-		err := arch.Close()
-		prepare()
-		return err
-	}), nil
-}
-
-// Changes produces a list of changes between the specified layer
-// and its parent layer. If parent is "", then all changes will be ADD changes.
-// The layer should not be mounted when calling this function.
-func (d *Driver) Changes(id, parent string) ([]archive.Change, error) {
-	rID, err := d.resolveID(id)
-	if err != nil {
-		return nil, err
-	}
-	parentChain, err := d.getLayerChain(rID)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := hcsshim.ActivateLayer(d.info, rID); err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err2 := hcsshim.DeactivateLayer(d.info, rID); err2 != nil {
-			logrus.Errorf("changes() failed to DeactivateLayer %s %s: %s", id, rID, err2)
-		}
-	}()
-
-	var changes []archive.Change
-	err = winio.RunWithPrivilege(winio.SeBackupPrivilege, func() error {
-		r, err := hcsshim.NewLayerReader(d.info, id, parentChain)
-		if err != nil {
-			return err
-		}
-		defer r.Close()
-
-		for {
-			name, _, fileInfo, err := r.Next()
-			if err == io.EOF {
-				return nil
-			}
-			if err != nil {
-				return err
-			}
-			name = filepath.ToSlash(name)
-			if fileInfo == nil {
-				changes = append(changes, archive.Change{Path: name, Kind: archive.ChangeDelete})
-			} else {
-				// Currently there is no way to tell between an add and a modify.
-				changes = append(changes, archive.Change{Path: name, Kind: archive.ChangeModify})
-			}
-		}
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return changes, nil
-}
-
-// ApplyDiff extracts the changeset from the given diff into the
-// layer with the specified id and parent, returning the size of the
-// new layer in bytes.
-// The layer should not be mounted when calling this function
-func (d *Driver) ApplyDiff(id, parent string, diff io.Reader) (int64, error) {
-	var layerChain []string
-	if parent != "" {
-		rPId, err := d.resolveID(parent)
-		if err != nil {
-			return 0, err
-		}
-		parentChain, err := d.getLayerChain(rPId)
-		if err != nil {
-			return 0, err
-		}
-		parentPath, err := hcsshim.GetLayerMountPath(d.info, rPId)
-		if err != nil {
-			return 0, err
-		}
-		layerChain = append(layerChain, parentPath)
-		layerChain = append(layerChain, parentChain...)
-	}
-
-	size, err := d.importLayer(id, diff, layerChain)
-	if err != nil {
-		return 0, err
-	}
-
-	if err = d.setLayerChain(id, layerChain); err != nil {
-		return 0, err
-	}
-
-	return size, nil
-}
-
-// DiffSize calculates the changes between the specified layer
-// and its parent and returns the size in bytes of the changes
-// relative to its base filesystem directory.
-func (d *Driver) DiffSize(id, parent string) (size int64, err error) {
-	rPId, err := d.resolveID(parent)
-	if err != nil {
-		return
-	}
-
-	changes, err := d.Changes(id, rPId)
-	if err != nil {
-		return
-	}
-
-	layerFs, err := d.Get(id, "")
-	if err != nil {
-		return
-	}
-	defer d.Put(id)
-
-	return archive.ChangesSize(layerFs, changes), nil
-}
-
-// GetMetadata returns custom driver information.
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	m := make(map[string]string)
-	m["dir"] = d.dir(id)
-	return m, nil
-}
-
-func writeTarFromLayer(r hcsshim.LayerReader, w io.Writer) error {
-	t := tar.NewWriter(w)
-	for {
-		name, size, fileInfo, err := r.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-		if fileInfo == nil {
-			// Write a whiteout file.
-			hdr := &tar.Header{
-				Name: filepath.ToSlash(filepath.Join(filepath.Dir(name), archive.WhiteoutPrefix+filepath.Base(name))),
-			}
-			err := t.WriteHeader(hdr)
-			if err != nil {
-				return err
-			}
-		} else {
-			err = backuptar.WriteTarFileFromBackupStream(t, r, name, size, fileInfo)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	return t.Close()
-}
-
-// exportLayer generates an archive from a layer based on the given ID.
-func (d *Driver) exportLayer(id string, parentLayerPaths []string) (io.ReadCloser, error) {
-	archive, w := io.Pipe()
-	go func() {
-		err := winio.RunWithPrivilege(winio.SeBackupPrivilege, func() error {
-			r, err := hcsshim.NewLayerReader(d.info, id, parentLayerPaths)
-			if err != nil {
-				return err
-			}
-
-			err = writeTarFromLayer(r, w)
-			cerr := r.Close()
-			if err == nil {
-				err = cerr
-			}
-			return err
-		})
-		w.CloseWithError(err)
-	}()
-
-	return archive, nil
-}
-
-// writeBackupStreamFromTarAndSaveMutatedFiles reads data from a tar stream and
-// writes it to a backup stream, and also saves any files that will be mutated
-// by the import layer process to a backup location.
-func writeBackupStreamFromTarAndSaveMutatedFiles(buf *bufio.Writer, w io.Writer, t *tar.Reader, hdr *tar.Header, root string) (nextHdr *tar.Header, err error) {
-	var bcdBackup *os.File
-	var bcdBackupWriter *winio.BackupFileWriter
-	if backupPath, ok := mutatedFiles[hdr.Name]; ok {
-		bcdBackup, err = os.Create(filepath.Join(root, backupPath))
-		if err != nil {
-			return nil, err
-		}
-		defer func() {
-			cerr := bcdBackup.Close()
-			if err == nil {
-				err = cerr
-			}
-		}()
-
-		bcdBackupWriter = winio.NewBackupFileWriter(bcdBackup, false)
-		defer func() {
-			cerr := bcdBackupWriter.Close()
-			if err == nil {
-				err = cerr
-			}
-		}()
-
-		buf.Reset(io.MultiWriter(w, bcdBackupWriter))
-	} else {
-		buf.Reset(w)
-	}
-
-	defer func() {
-		ferr := buf.Flush()
-		if err == nil {
-			err = ferr
-		}
-	}()
-
-	return backuptar.WriteBackupStreamFromTarFile(buf, t, hdr)
-}
-
-func writeLayerFromTar(r io.Reader, w hcsshim.LayerWriter, root string) (int64, error) {
-	t := tar.NewReader(r)
-	hdr, err := t.Next()
-	totalSize := int64(0)
-	buf := bufio.NewWriter(nil)
-	for err == nil {
-		base := path.Base(hdr.Name)
-		if strings.HasPrefix(base, archive.WhiteoutPrefix) {
-			name := path.Join(path.Dir(hdr.Name), base[len(archive.WhiteoutPrefix):])
-			err = w.Remove(filepath.FromSlash(name))
-			if err != nil {
-				return 0, err
-			}
-			hdr, err = t.Next()
-		} else if hdr.Typeflag == tar.TypeLink {
-			err = w.AddLink(filepath.FromSlash(hdr.Name), filepath.FromSlash(hdr.Linkname))
-			if err != nil {
-				return 0, err
-			}
-			hdr, err = t.Next()
-		} else {
-			var (
-				name     string
-				size     int64
-				fileInfo *winio.FileBasicInfo
-			)
-			name, size, fileInfo, err = backuptar.FileInfoFromHeader(hdr)
-			if err != nil {
-				return 0, err
-			}
-			err = w.Add(filepath.FromSlash(name), fileInfo)
-			if err != nil {
-				return 0, err
-			}
-			hdr, err = writeBackupStreamFromTarAndSaveMutatedFiles(buf, w, t, hdr, root)
-			totalSize += size
-		}
-	}
-	if err != io.EOF {
-		return 0, err
-	}
-	return totalSize, nil
-}
-
-// importLayer adds a new layer to the tag and graph store based on the given data.
-func (d *Driver) importLayer(id string, layerData io.Reader, parentLayerPaths []string) (size int64, err error) {
-	if !noreexec {
-		cmd := reexec.Command(append([]string{"docker-windows-write-layer", d.info.HomeDir, id}, parentLayerPaths...)...)
-		output := bytes.NewBuffer(nil)
-		cmd.Stdin = layerData
-		cmd.Stdout = output
-		cmd.Stderr = output
-
-		if err = cmd.Start(); err != nil {
-			return
-		}
-
-		if err = cmd.Wait(); err != nil {
-			return 0, fmt.Errorf("re-exec error: %v: output: %s", err, output)
-		}
-
-		return strconv.ParseInt(output.String(), 10, 64)
-	}
-	return writeLayer(layerData, d.info.HomeDir, id, parentLayerPaths...)
-}
-
-// writeLayerReexec is the re-exec entry point for writing a layer from a tar file
-func writeLayerReexec() {
-	size, err := writeLayer(os.Stdin, os.Args[1], os.Args[2], os.Args[3:]...)
-	if err != nil {
-		fmt.Fprint(os.Stderr, err)
-		os.Exit(1)
-	}
-	fmt.Fprint(os.Stdout, size)
-}
-
-// writeLayer writes a layer from a tar file.
-func writeLayer(layerData io.Reader, home string, id string, parentLayerPaths ...string) (int64, error) {
-	err := winio.EnableProcessPrivileges([]string{winio.SeBackupPrivilege, winio.SeRestorePrivilege})
-	if err != nil {
-		return 0, err
-	}
-	if noreexec {
-		defer func() {
-			if err := winio.DisableProcessPrivileges([]string{winio.SeBackupPrivilege, winio.SeRestorePrivilege}); err != nil {
-				// This should never happen, but just in case when in debugging mode.
-				// See https://github.com/docker/docker/pull/28002#discussion_r86259241 for rationale.
-				panic("Failed to disabled process privileges while in non re-exec mode")
-			}
-		}()
-	}
-
-	info := hcsshim.DriverInfo{
-		Flavour: filterDriver,
-		HomeDir: home,
-	}
-
-	w, err := hcsshim.NewLayerWriter(info, id, parentLayerPaths)
-	if err != nil {
-		return 0, err
-	}
-
-	size, err := writeLayerFromTar(layerData, w, filepath.Join(home, id))
-	if err != nil {
-		return 0, err
-	}
-
-	err = w.Close()
-	if err != nil {
-		return 0, err
-	}
-
-	return size, nil
-}
-
-// resolveID computes the layerID information based on the given id.
-func (d *Driver) resolveID(id string) (string, error) {
-	content, err := ioutil.ReadFile(filepath.Join(d.dir(id), "layerID"))
-	if os.IsNotExist(err) {
-		return id, nil
-	} else if err != nil {
-		return "", err
-	}
-	return string(content), nil
-}
-
-// setID stores the layerId in disk.
-func (d *Driver) setID(id, altID string) error {
-	err := ioutil.WriteFile(filepath.Join(d.dir(id), "layerId"), []byte(altID), 0600)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// getLayerChain returns the layer chain information.
-func (d *Driver) getLayerChain(id string) ([]string, error) {
-	jPath := filepath.Join(d.dir(id), "layerchain.json")
-	content, err := ioutil.ReadFile(jPath)
-	if os.IsNotExist(err) {
-		return nil, nil
-	} else if err != nil {
-		return nil, fmt.Errorf("Unable to read layerchain file - %s", err)
-	}
-
-	var layerChain []string
-	err = json.Unmarshal(content, &layerChain)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to unmarshall layerchain json - %s", err)
-	}
-
-	return layerChain, nil
-}
-
-// setLayerChain stores the layer chain information in disk.
-func (d *Driver) setLayerChain(id string, chain []string) error {
-	content, err := json.Marshal(&chain)
-	if err != nil {
-		return fmt.Errorf("Failed to marshall layerchain json - %s", err)
-	}
-
-	jPath := filepath.Join(d.dir(id), "layerchain.json")
-	err = ioutil.WriteFile(jPath, content, 0600)
-	if err != nil {
-		return fmt.Errorf("Unable to write layerchain file - %s", err)
-	}
-
-	return nil
-}
-
-type fileGetCloserWithBackupPrivileges struct {
-	path string
-}
-
-func (fg *fileGetCloserWithBackupPrivileges) Get(filename string) (io.ReadCloser, error) {
-	if backupPath, ok := mutatedFiles[filename]; ok {
-		return os.Open(filepath.Join(fg.path, backupPath))
-	}
-
-	var f *os.File
-	// Open the file while holding the Windows backup privilege. This ensures that the
-	// file can be opened even if the caller does not actually have access to it according
-	// to the security descriptor.
-	err := winio.RunWithPrivilege(winio.SeBackupPrivilege, func() error {
-		path := longpath.AddPrefix(filepath.Join(fg.path, filename))
-		p, err := syscall.UTF16FromString(path)
-		if err != nil {
-			return err
-		}
-		h, err := syscall.CreateFile(&p[0], syscall.GENERIC_READ, syscall.FILE_SHARE_READ, nil, syscall.OPEN_EXISTING, syscall.FILE_FLAG_BACKUP_SEMANTICS, 0)
-		if err != nil {
-			return &os.PathError{Op: "open", Path: path, Err: err}
-		}
-		f = os.NewFile(uintptr(h), path)
-		return nil
-	})
-	return f, err
-}
-
-func (fg *fileGetCloserWithBackupPrivileges) Close() error {
-	return nil
-}
-
-// DiffGetter returns a FileGetCloser that can read files from the directory that
-// contains files for the layer differences. Used for direct access for tar-split.
-func (d *Driver) DiffGetter(id string) (graphdriver.FileGetCloser, error) {
-	id, err := d.resolveID(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return &fileGetCloserWithBackupPrivileges{d.dir(id)}, nil
-}
-
-type storageOptions struct {
-	size uint64
-}
-
-func parseStorageOpt(storageOpt map[string]string) (*storageOptions, error) {
-	options := storageOptions{}
-
-	// Read size to change the block device size per container.
-	for key, val := range storageOpt {
-		key := strings.ToLower(key)
-		switch key {
-		case "size":
-			size, err := units.RAMInBytes(val)
-			if err != nil {
-				return nil, err
-			}
-			options.size = uint64(size)
-		default:
-			return nil, fmt.Errorf("Unknown storage option: %s", key)
-		}
-	}
-	return &options, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/MAINTAINERS b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/MAINTAINERS
deleted file mode 100644
index 9c270c541f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/MAINTAINERS
+++ /dev/null
@@ -1,2 +0,0 @@
-Jörg Thalheim <joerg@higgsboson.tk> (@Mic92)
-Arthur Gautier <baloo@gandi.net> (@baloose)
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs.go
deleted file mode 100644
index 8e283ccf40..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs.go
+++ /dev/null
@@ -1,417 +0,0 @@
-// +build linux freebsd solaris
-
-package zfs
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/parsers"
-	zfs "github.com/mistifyio/go-zfs"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-type zfsOptions struct {
-	fsName    string
-	mountPath string
-}
-
-func init() {
-	graphdriver.Register("zfs", Init)
-}
-
-// Logger returns a zfs logger implementation.
-type Logger struct{}
-
-// Log wraps log message from ZFS driver with a prefix '[zfs]'.
-func (*Logger) Log(cmd []string) {
-	logrus.Debugf("[zfs] %s", strings.Join(cmd, " "))
-}
-
-// Init returns a new ZFS driver.
-// It takes base mount path and an array of options which are represented as key value pairs.
-// Each option is in the for key=value. 'zfs.fsname' is expected to be a valid key in the options.
-func Init(base string, opt []string, uidMaps, gidMaps []idtools.IDMap) (graphdriver.Driver, error) {
-	var err error
-
-	if _, err := exec.LookPath("zfs"); err != nil {
-		logrus.Debugf("[zfs] zfs command is not available: %v", err)
-		return nil, graphdriver.ErrPrerequisites
-	}
-
-	file, err := os.OpenFile("/dev/zfs", os.O_RDWR, 600)
-	if err != nil {
-		logrus.Debugf("[zfs] cannot open /dev/zfs: %v", err)
-		return nil, graphdriver.ErrPrerequisites
-	}
-	defer file.Close()
-
-	options, err := parseOptions(opt)
-	if err != nil {
-		return nil, err
-	}
-	options.mountPath = base
-
-	rootdir := path.Dir(base)
-
-	if options.fsName == "" {
-		err = checkRootdirFs(rootdir)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if options.fsName == "" {
-		options.fsName, err = lookupZfsDataset(rootdir)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	zfs.SetLogger(new(Logger))
-
-	filesystems, err := zfs.Filesystems(options.fsName)
-	if err != nil {
-		return nil, fmt.Errorf("Cannot find root filesystem %s: %v", options.fsName, err)
-	}
-
-	filesystemsCache := make(map[string]bool, len(filesystems))
-	var rootDataset *zfs.Dataset
-	for _, fs := range filesystems {
-		if fs.Name == options.fsName {
-			rootDataset = fs
-		}
-		filesystemsCache[fs.Name] = true
-	}
-
-	if rootDataset == nil {
-		return nil, fmt.Errorf("BUG: zfs get all -t filesystem -rHp '%s' should contain '%s'", options.fsName, options.fsName)
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(uidMaps, gidMaps)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get root uid/guid: %v", err)
-	}
-	if err := idtools.MkdirAllAs(base, 0700, rootUID, rootGID); err != nil {
-		return nil, fmt.Errorf("Failed to create '%s': %v", base, err)
-	}
-
-	if err := mount.MakePrivate(base); err != nil {
-		return nil, err
-	}
-	d := &Driver{
-		dataset:          rootDataset,
-		options:          options,
-		filesystemsCache: filesystemsCache,
-		uidMaps:          uidMaps,
-		gidMaps:          gidMaps,
-		ctr:              graphdriver.NewRefCounter(graphdriver.NewDefaultChecker()),
-	}
-	return graphdriver.NewNaiveDiffDriver(d, uidMaps, gidMaps), nil
-}
-
-func parseOptions(opt []string) (zfsOptions, error) {
-	var options zfsOptions
-	options.fsName = ""
-	for _, option := range opt {
-		key, val, err := parsers.ParseKeyValueOpt(option)
-		if err != nil {
-			return options, err
-		}
-		key = strings.ToLower(key)
-		switch key {
-		case "zfs.fsname":
-			options.fsName = val
-		default:
-			return options, fmt.Errorf("Unknown option %s", key)
-		}
-	}
-	return options, nil
-}
-
-func lookupZfsDataset(rootdir string) (string, error) {
-	var stat syscall.Stat_t
-	if err := syscall.Stat(rootdir, &stat); err != nil {
-		return "", fmt.Errorf("Failed to access '%s': %s", rootdir, err)
-	}
-	wantedDev := stat.Dev
-
-	mounts, err := mount.GetMounts()
-	if err != nil {
-		return "", err
-	}
-	for _, m := range mounts {
-		if err := syscall.Stat(m.Mountpoint, &stat); err != nil {
-			logrus.Debugf("[zfs] failed to stat '%s' while scanning for zfs mount: %v", m.Mountpoint, err)
-			continue // may fail on fuse file systems
-		}
-
-		if stat.Dev == wantedDev && m.Fstype == "zfs" {
-			return m.Source, nil
-		}
-	}
-
-	return "", fmt.Errorf("Failed to find zfs dataset mounted on '%s' in /proc/mounts", rootdir)
-}
-
-// Driver holds information about the driver, such as zfs dataset, options and cache.
-type Driver struct {
-	dataset          *zfs.Dataset
-	options          zfsOptions
-	sync.Mutex       // protects filesystem cache against concurrent access
-	filesystemsCache map[string]bool
-	uidMaps          []idtools.IDMap
-	gidMaps          []idtools.IDMap
-	ctr              *graphdriver.RefCounter
-}
-
-func (d *Driver) String() string {
-	return "zfs"
-}
-
-// Cleanup is used to implement graphdriver.ProtoDriver. There is no cleanup required for this driver.
-func (d *Driver) Cleanup() error {
-	return nil
-}
-
-// Status returns information about the ZFS filesystem. It returns a two dimensional array of information
-// such as pool name, dataset name, disk usage, parent quota and compression used.
-// Currently it return 'Zpool', 'Zpool Health', 'Parent Dataset', 'Space Used By Parent',
-// 'Space Available', 'Parent Quota' and 'Compression'.
-func (d *Driver) Status() [][2]string {
-	parts := strings.Split(d.dataset.Name, "/")
-	pool, err := zfs.GetZpool(parts[0])
-
-	var poolName, poolHealth string
-	if err == nil {
-		poolName = pool.Name
-		poolHealth = pool.Health
-	} else {
-		poolName = fmt.Sprintf("error while getting pool information %v", err)
-		poolHealth = "not available"
-	}
-
-	quota := "no"
-	if d.dataset.Quota != 0 {
-		quota = strconv.FormatUint(d.dataset.Quota, 10)
-	}
-
-	return [][2]string{
-		{"Zpool", poolName},
-		{"Zpool Health", poolHealth},
-		{"Parent Dataset", d.dataset.Name},
-		{"Space Used By Parent", strconv.FormatUint(d.dataset.Used, 10)},
-		{"Space Available", strconv.FormatUint(d.dataset.Avail, 10)},
-		{"Parent Quota", quota},
-		{"Compression", d.dataset.Compression},
-	}
-}
-
-// GetMetadata returns image/container metadata related to graph driver
-func (d *Driver) GetMetadata(id string) (map[string]string, error) {
-	return nil, nil
-}
-
-func (d *Driver) cloneFilesystem(name, parentName string) error {
-	snapshotName := fmt.Sprintf("%d", time.Now().Nanosecond())
-	parentDataset := zfs.Dataset{Name: parentName}
-	snapshot, err := parentDataset.Snapshot(snapshotName /*recursive */, false)
-	if err != nil {
-		return err
-	}
-
-	_, err = snapshot.Clone(name, map[string]string{"mountpoint": "legacy"})
-	if err == nil {
-		d.Lock()
-		d.filesystemsCache[name] = true
-		d.Unlock()
-	}
-
-	if err != nil {
-		snapshot.Destroy(zfs.DestroyDeferDeletion)
-		return err
-	}
-	return snapshot.Destroy(zfs.DestroyDeferDeletion)
-}
-
-func (d *Driver) zfsPath(id string) string {
-	return d.options.fsName + "/" + id
-}
-
-func (d *Driver) mountPath(id string) string {
-	return path.Join(d.options.mountPath, "graph", getMountpoint(id))
-}
-
-// CreateReadWrite creates a layer that is writable for use as a container
-// file system.
-func (d *Driver) CreateReadWrite(id, parent string, opts *graphdriver.CreateOpts) error {
-	return d.Create(id, parent, opts)
-}
-
-// Create prepares the dataset and filesystem for the ZFS driver for the given id under the parent.
-func (d *Driver) Create(id, parent string, opts *graphdriver.CreateOpts) error {
-	var storageOpt map[string]string
-	if opts != nil {
-		storageOpt = opts.StorageOpt
-	}
-
-	err := d.create(id, parent, storageOpt)
-	if err == nil {
-		return nil
-	}
-	if zfsError, ok := err.(*zfs.Error); ok {
-		if !strings.HasSuffix(zfsError.Stderr, "dataset already exists\n") {
-			return err
-		}
-		// aborted build -> cleanup
-	} else {
-		return err
-	}
-
-	dataset := zfs.Dataset{Name: d.zfsPath(id)}
-	if err := dataset.Destroy(zfs.DestroyRecursiveClones); err != nil {
-		return err
-	}
-
-	// retry
-	return d.create(id, parent, storageOpt)
-}
-
-func (d *Driver) create(id, parent string, storageOpt map[string]string) error {
-	name := d.zfsPath(id)
-	quota, err := parseStorageOpt(storageOpt)
-	if err != nil {
-		return err
-	}
-	if parent == "" {
-		mountoptions := map[string]string{"mountpoint": "legacy"}
-		fs, err := zfs.CreateFilesystem(name, mountoptions)
-		if err == nil {
-			err = setQuota(name, quota)
-			if err == nil {
-				d.Lock()
-				d.filesystemsCache[fs.Name] = true
-				d.Unlock()
-			}
-		}
-		return err
-	}
-	err = d.cloneFilesystem(name, d.zfsPath(parent))
-	if err == nil {
-		err = setQuota(name, quota)
-	}
-	return err
-}
-
-func parseStorageOpt(storageOpt map[string]string) (string, error) {
-	// Read size to change the disk quota per container
-	for k, v := range storageOpt {
-		key := strings.ToLower(k)
-		switch key {
-		case "size":
-			return v, nil
-		default:
-			return "0", fmt.Errorf("Unknown option %s", key)
-		}
-	}
-	return "0", nil
-}
-
-func setQuota(name string, quota string) error {
-	if quota == "0" {
-		return nil
-	}
-	fs, err := zfs.GetDataset(name)
-	if err != nil {
-		return err
-	}
-	return fs.SetProperty("quota", quota)
-}
-
-// Remove deletes the dataset, filesystem and the cache for the given id.
-func (d *Driver) Remove(id string) error {
-	name := d.zfsPath(id)
-	dataset := zfs.Dataset{Name: name}
-	err := dataset.Destroy(zfs.DestroyRecursive)
-	if err == nil {
-		d.Lock()
-		delete(d.filesystemsCache, name)
-		d.Unlock()
-	}
-	return err
-}
-
-// Get returns the mountpoint for the given id after creating the target directories if necessary.
-func (d *Driver) Get(id, mountLabel string) (string, error) {
-	mountpoint := d.mountPath(id)
-	if count := d.ctr.Increment(mountpoint); count > 1 {
-		return mountpoint, nil
-	}
-
-	filesystem := d.zfsPath(id)
-	options := label.FormatMountLabel("", mountLabel)
-	logrus.Debugf(`[zfs] mount("%s", "%s", "%s")`, filesystem, mountpoint, options)
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(d.uidMaps, d.gidMaps)
-	if err != nil {
-		d.ctr.Decrement(mountpoint)
-		return "", err
-	}
-	// Create the target directories if they don't exist
-	if err := idtools.MkdirAllAs(mountpoint, 0755, rootUID, rootGID); err != nil {
-		d.ctr.Decrement(mountpoint)
-		return "", err
-	}
-
-	if err := mount.Mount(filesystem, mountpoint, "zfs", options); err != nil {
-		d.ctr.Decrement(mountpoint)
-		return "", fmt.Errorf("error creating zfs mount of %s to %s: %v", filesystem, mountpoint, err)
-	}
-
-	// this could be our first mount after creation of the filesystem, and the root dir may still have root
-	// permissions instead of the remapped root uid:gid (if user namespaces are enabled):
-	if err := os.Chown(mountpoint, rootUID, rootGID); err != nil {
-		mount.Unmount(mountpoint)
-		d.ctr.Decrement(mountpoint)
-		return "", fmt.Errorf("error modifying zfs mountpoint (%s) directory ownership: %v", mountpoint, err)
-	}
-
-	return mountpoint, nil
-}
-
-// Put removes the existing mountpoint for the given id if it exists.
-func (d *Driver) Put(id string) error {
-	mountpoint := d.mountPath(id)
-	if count := d.ctr.Decrement(mountpoint); count > 0 {
-		return nil
-	}
-	mounted, err := graphdriver.Mounted(graphdriver.FsMagicZfs, mountpoint)
-	if err != nil || !mounted {
-		return err
-	}
-
-	logrus.Debugf(`[zfs] unmount("%s")`, mountpoint)
-
-	if err := mount.Unmount(mountpoint); err != nil {
-		return fmt.Errorf("error unmounting to %s: %v", mountpoint, err)
-	}
-	return nil
-}
-
-// Exists checks to see if the cache entry exists for the given id.
-func (d *Driver) Exists(id string) bool {
-	d.Lock()
-	defer d.Unlock()
-	return d.filesystemsCache[d.zfsPath(id)] == true
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_freebsd.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_freebsd.go
deleted file mode 100644
index 1c05fa794c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_freebsd.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package zfs
-
-import (
-	"fmt"
-	"strings"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-func checkRootdirFs(rootdir string) error {
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(rootdir, &buf); err != nil {
-		return fmt.Errorf("Failed to access '%s': %s", rootdir, err)
-	}
-
-	// on FreeBSD buf.Fstypename contains ['z', 'f', 's', 0 ... ]
-	if (buf.Fstypename[0] != 122) || (buf.Fstypename[1] != 102) || (buf.Fstypename[2] != 115) || (buf.Fstypename[3] != 0) {
-		logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir)
-		return graphdriver.ErrPrerequisites
-	}
-
-	return nil
-}
-
-func getMountpoint(id string) string {
-	maxlen := 12
-
-	// we need to preserve filesystem suffix
-	suffix := strings.SplitN(id, "-", 2)
-
-	if len(suffix) > 1 {
-		return id[:maxlen] + "-" + suffix[1]
-	}
-
-	return id[:maxlen]
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_linux.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_linux.go
deleted file mode 100644
index 52ed516049..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package zfs
-
-import (
-	"fmt"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-func checkRootdirFs(rootdir string) error {
-	var buf syscall.Statfs_t
-	if err := syscall.Statfs(rootdir, &buf); err != nil {
-		return fmt.Errorf("Failed to access '%s': %s", rootdir, err)
-	}
-
-	if graphdriver.FsMagic(buf.Type) != graphdriver.FsMagicZfs {
-		logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir)
-		return graphdriver.ErrPrerequisites
-	}
-
-	return nil
-}
-
-func getMountpoint(id string) string {
-	return id
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_solaris.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_solaris.go
deleted file mode 100644
index bb4a85bd64..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_solaris.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build solaris,cgo
-
-package zfs
-
-/*
-#include <sys/statvfs.h>
-#include <stdlib.h>
-
-static inline struct statvfs *getstatfs(char *s) {
-        struct statvfs *buf;
-        int err;
-        buf = (struct statvfs *)malloc(sizeof(struct statvfs));
-        err = statvfs(s, buf);
-        return buf;
-}
-*/
-import "C"
-import (
-	"path/filepath"
-	"strings"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-func checkRootdirFs(rootdir string) error {
-
-	cs := C.CString(filepath.Dir(rootdir))
-	buf := C.getstatfs(cs)
-
-	// on Solaris buf.f_basetype contains ['z', 'f', 's', 0 ... ]
-	if (buf.f_basetype[0] != 122) || (buf.f_basetype[1] != 102) || (buf.f_basetype[2] != 115) ||
-		(buf.f_basetype[3] != 0) {
-		logrus.Debugf("[zfs] no zfs dataset found for rootdir '%s'", rootdir)
-		C.free(unsafe.Pointer(buf))
-		return graphdriver.ErrPrerequisites
-	}
-
-	C.free(unsafe.Pointer(buf))
-	C.free(unsafe.Pointer(cs))
-	return nil
-}
-
-/* rootfs is introduced to comply with the OCI spec
-which states that root filesystem must be mounted at <CID>/rootfs/ instead of <CID>/
-*/
-func getMountpoint(id string) string {
-	maxlen := 12
-
-	// we need to preserve filesystem suffix
-	suffix := strings.SplitN(id, "-", 2)
-
-	if len(suffix) > 1 {
-		return filepath.Join(id[:maxlen]+"-"+suffix[1], "rootfs", "root")
-	}
-
-	return filepath.Join(id[:maxlen], "rootfs", "root")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_test.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_test.go
deleted file mode 100644
index 3e22928438..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build linux
-
-package zfs
-
-import (
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver/graphtest"
-)
-
-// This avoids creating a new driver for each test if all tests are run
-// Make sure to put new tests between TestZfsSetup and TestZfsTeardown
-func TestZfsSetup(t *testing.T) {
-	graphtest.GetDriver(t, "zfs")
-}
-
-func TestZfsCreateEmpty(t *testing.T) {
-	graphtest.DriverTestCreateEmpty(t, "zfs")
-}
-
-func TestZfsCreateBase(t *testing.T) {
-	graphtest.DriverTestCreateBase(t, "zfs")
-}
-
-func TestZfsCreateSnap(t *testing.T) {
-	graphtest.DriverTestCreateSnap(t, "zfs")
-}
-
-func TestZfsSetQuota(t *testing.T) {
-	graphtest.DriverTestSetQuota(t, "zfs")
-}
-
-func TestZfsTeardown(t *testing.T) {
-	graphtest.PutDriver(t)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_unsupported.go
deleted file mode 100644
index ce8daadaf6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/graphdriver/zfs/zfs_unsupported.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !linux,!freebsd,!solaris
-
-package zfs
-
-func checkRootdirFs(rootdir string) error {
-	return nil
-}
-
-func getMountpoint(id string) string {
-	return id
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/health.go b/installer/vendor/github.com/docker/docker/daemon/health.go
deleted file mode 100644
index 5b01dc0f40..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/health.go
+++ /dev/null
@@ -1,341 +0,0 @@
-package daemon
-
-import (
-	"bytes"
-	"fmt"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-)
-
-const (
-	// Longest healthcheck probe output message to store. Longer messages will be truncated.
-	maxOutputLen = 4096
-
-	// Default interval between probe runs (from the end of the first to the start of the second).
-	// Also the time before the first probe.
-	defaultProbeInterval = 30 * time.Second
-
-	// The maximum length of time a single probe run should take. If the probe takes longer
-	// than this, the check is considered to have failed.
-	defaultProbeTimeout = 30 * time.Second
-
-	// Default number of consecutive failures of the health check
-	// for the container to be considered unhealthy.
-	defaultProbeRetries = 3
-
-	// Maximum number of entries to record
-	maxLogEntries = 5
-)
-
-const (
-	// Exit status codes that can be returned by the probe command.
-
-	exitStatusHealthy   = 0 // Container is healthy
-	exitStatusUnhealthy = 1 // Container is unhealthy
-)
-
-// probe implementations know how to run a particular type of probe.
-type probe interface {
-	// Perform one run of the check. Returns the exit code and an optional
-	// short diagnostic string.
-	run(context.Context, *Daemon, *container.Container) (*types.HealthcheckResult, error)
-}
-
-// cmdProbe implements the "CMD" probe type.
-type cmdProbe struct {
-	// Run the command with the system's default shell instead of execing it directly.
-	shell bool
-}
-
-// exec the healthcheck command in the container.
-// Returns the exit code and probe output (if any)
-func (p *cmdProbe) run(ctx context.Context, d *Daemon, container *container.Container) (*types.HealthcheckResult, error) {
-
-	cmdSlice := strslice.StrSlice(container.Config.Healthcheck.Test)[1:]
-	if p.shell {
-		cmdSlice = append(getShell(container.Config), cmdSlice...)
-	}
-	entrypoint, args := d.getEntrypointAndArgs(strslice.StrSlice{}, cmdSlice)
-	execConfig := exec.NewConfig()
-	execConfig.OpenStdin = false
-	execConfig.OpenStdout = true
-	execConfig.OpenStderr = true
-	execConfig.ContainerID = container.ID
-	execConfig.DetachKeys = []byte{}
-	execConfig.Entrypoint = entrypoint
-	execConfig.Args = args
-	execConfig.Tty = false
-	execConfig.Privileged = false
-	execConfig.User = container.Config.User
-
-	d.registerExecCommand(container, execConfig)
-	d.LogContainerEvent(container, "exec_create: "+execConfig.Entrypoint+" "+strings.Join(execConfig.Args, " "))
-
-	output := &limitedBuffer{}
-	err := d.ContainerExecStart(ctx, execConfig.ID, nil, output, output)
-	if err != nil {
-		return nil, err
-	}
-	info, err := d.getExecConfig(execConfig.ID)
-	if err != nil {
-		return nil, err
-	}
-	if info.ExitCode == nil {
-		return nil, fmt.Errorf("Healthcheck for container %s has no exit code!", container.ID)
-	}
-	// Note: Go's json package will handle invalid UTF-8 for us
-	out := output.String()
-	return &types.HealthcheckResult{
-		End:      time.Now(),
-		ExitCode: *info.ExitCode,
-		Output:   out,
-	}, nil
-}
-
-// Update the container's Status.Health struct based on the latest probe's result.
-func handleProbeResult(d *Daemon, c *container.Container, result *types.HealthcheckResult, done chan struct{}) {
-	c.Lock()
-	defer c.Unlock()
-
-	// probe may have been cancelled while waiting on lock. Ignore result then
-	select {
-	case <-done:
-		return
-	default:
-	}
-
-	retries := c.Config.Healthcheck.Retries
-	if retries <= 0 {
-		retries = defaultProbeRetries
-	}
-
-	h := c.State.Health
-	oldStatus := h.Status
-
-	if len(h.Log) >= maxLogEntries {
-		h.Log = append(h.Log[len(h.Log)+1-maxLogEntries:], result)
-	} else {
-		h.Log = append(h.Log, result)
-	}
-
-	if result.ExitCode == exitStatusHealthy {
-		h.FailingStreak = 0
-		h.Status = types.Healthy
-	} else {
-		// Failure (including invalid exit code)
-		h.FailingStreak++
-		if h.FailingStreak >= retries {
-			h.Status = types.Unhealthy
-		}
-		// Else we're starting or healthy. Stay in that state.
-	}
-
-	if oldStatus != h.Status {
-		d.LogContainerEvent(c, "health_status: "+h.Status)
-	}
-}
-
-// Run the container's monitoring thread until notified via "stop".
-// There is never more than one monitor thread running per container at a time.
-func monitor(d *Daemon, c *container.Container, stop chan struct{}, probe probe) {
-	probeTimeout := timeoutWithDefault(c.Config.Healthcheck.Timeout, defaultProbeTimeout)
-	probeInterval := timeoutWithDefault(c.Config.Healthcheck.Interval, defaultProbeInterval)
-	for {
-		select {
-		case <-stop:
-			logrus.Debugf("Stop healthcheck monitoring for container %s (received while idle)", c.ID)
-			return
-		case <-time.After(probeInterval):
-			logrus.Debugf("Running health check for container %s ...", c.ID)
-			startTime := time.Now()
-			ctx, cancelProbe := context.WithTimeout(context.Background(), probeTimeout)
-			results := make(chan *types.HealthcheckResult)
-			go func() {
-				healthChecksCounter.Inc()
-				result, err := probe.run(ctx, d, c)
-				if err != nil {
-					healthChecksFailedCounter.Inc()
-					logrus.Warnf("Health check for container %s error: %v", c.ID, err)
-					results <- &types.HealthcheckResult{
-						ExitCode: -1,
-						Output:   err.Error(),
-						Start:    startTime,
-						End:      time.Now(),
-					}
-				} else {
-					result.Start = startTime
-					logrus.Debugf("Health check for container %s done (exitCode=%d)", c.ID, result.ExitCode)
-					results <- result
-				}
-				close(results)
-			}()
-			select {
-			case <-stop:
-				logrus.Debugf("Stop healthcheck monitoring for container %s (received while probing)", c.ID)
-				// Stop timeout and kill probe, but don't wait for probe to exit.
-				cancelProbe()
-				return
-			case result := <-results:
-				handleProbeResult(d, c, result, stop)
-				// Stop timeout
-				cancelProbe()
-			case <-ctx.Done():
-				logrus.Debugf("Health check for container %s taking too long", c.ID)
-				handleProbeResult(d, c, &types.HealthcheckResult{
-					ExitCode: -1,
-					Output:   fmt.Sprintf("Health check exceeded timeout (%v)", probeTimeout),
-					Start:    startTime,
-					End:      time.Now(),
-				}, stop)
-				cancelProbe()
-				// Wait for probe to exit (it might take a while to respond to the TERM
-				// signal and we don't want dying probes to pile up).
-				<-results
-			}
-		}
-	}
-}
-
-// Get a suitable probe implementation for the container's healthcheck configuration.
-// Nil will be returned if no healthcheck was configured or NONE was set.
-func getProbe(c *container.Container) probe {
-	config := c.Config.Healthcheck
-	if config == nil || len(config.Test) == 0 {
-		return nil
-	}
-	switch config.Test[0] {
-	case "CMD":
-		return &cmdProbe{shell: false}
-	case "CMD-SHELL":
-		return &cmdProbe{shell: true}
-	default:
-		logrus.Warnf("Unknown healthcheck type '%s' (expected 'CMD') in container %s", config.Test[0], c.ID)
-		return nil
-	}
-}
-
-// Ensure the health-check monitor is running or not, depending on the current
-// state of the container.
-// Called from monitor.go, with c locked.
-func (d *Daemon) updateHealthMonitor(c *container.Container) {
-	h := c.State.Health
-	if h == nil {
-		return // No healthcheck configured
-	}
-
-	probe := getProbe(c)
-	wantRunning := c.Running && !c.Paused && probe != nil
-	if wantRunning {
-		if stop := h.OpenMonitorChannel(); stop != nil {
-			go monitor(d, c, stop, probe)
-		}
-	} else {
-		h.CloseMonitorChannel()
-	}
-}
-
-// Reset the health state for a newly-started, restarted or restored container.
-// initHealthMonitor is called from monitor.go and we should never be running
-// two instances at once.
-// Called with c locked.
-func (d *Daemon) initHealthMonitor(c *container.Container) {
-	// If no healthcheck is setup then don't init the monitor
-	if getProbe(c) == nil {
-		return
-	}
-
-	// This is needed in case we're auto-restarting
-	d.stopHealthchecks(c)
-
-	if h := c.State.Health; h != nil {
-		h.Status = types.Starting
-		h.FailingStreak = 0
-	} else {
-		h := &container.Health{}
-		h.Status = types.Starting
-		c.State.Health = h
-	}
-
-	d.updateHealthMonitor(c)
-}
-
-// Called when the container is being stopped (whether because the health check is
-// failing or for any other reason).
-func (d *Daemon) stopHealthchecks(c *container.Container) {
-	h := c.State.Health
-	if h != nil {
-		h.CloseMonitorChannel()
-	}
-}
-
-// Buffer up to maxOutputLen bytes. Further data is discarded.
-type limitedBuffer struct {
-	buf       bytes.Buffer
-	mu        sync.Mutex
-	truncated bool // indicates that data has been lost
-}
-
-// Append to limitedBuffer while there is room.
-func (b *limitedBuffer) Write(data []byte) (int, error) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	bufLen := b.buf.Len()
-	dataLen := len(data)
-	keep := min(maxOutputLen-bufLen, dataLen)
-	if keep > 0 {
-		b.buf.Write(data[:keep])
-	}
-	if keep < dataLen {
-		b.truncated = true
-	}
-	return dataLen, nil
-}
-
-// The contents of the buffer, with "..." appended if it overflowed.
-func (b *limitedBuffer) String() string {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	out := b.buf.String()
-	if b.truncated {
-		out = out + "..."
-	}
-	return out
-}
-
-// If configuredValue is zero, use defaultValue instead.
-func timeoutWithDefault(configuredValue time.Duration, defaultValue time.Duration) time.Duration {
-	if configuredValue == 0 {
-		return defaultValue
-	}
-	return configuredValue
-}
-
-func min(x, y int) int {
-	if x < y {
-		return x
-	}
-	return y
-}
-
-func getShell(config *containertypes.Config) []string {
-	if len(config.Shell) != 0 {
-		return config.Shell
-	}
-	if runtime.GOOS != "windows" {
-		return []string{"/bin/sh", "-c"}
-	}
-	return []string{"cmd", "/S", "/C"}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/health_test.go b/installer/vendor/github.com/docker/docker/daemon/health_test.go
deleted file mode 100644
index 7e82115d43..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/health_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package daemon
-
-import (
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/events"
-)
-
-func reset(c *container.Container) {
-	c.State = &container.State{}
-	c.State.Health = &container.Health{}
-	c.State.Health.Status = types.Starting
-}
-
-func TestNoneHealthcheck(t *testing.T) {
-	c := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "container_id",
-			Name: "container_name",
-			Config: &containertypes.Config{
-				Image: "image_name",
-				Healthcheck: &containertypes.HealthConfig{
-					Test: []string{"NONE"},
-				},
-			},
-			State: &container.State{},
-		},
-	}
-	daemon := &Daemon{}
-
-	daemon.initHealthMonitor(c)
-	if c.State.Health != nil {
-		t.Errorf("Expecting Health to be nil, but was not")
-	}
-}
-
-func TestHealthStates(t *testing.T) {
-	e := events.New()
-	_, l, _ := e.Subscribe()
-	defer e.Evict(l)
-
-	expect := func(expected string) {
-		select {
-		case event := <-l:
-			ev := event.(eventtypes.Message)
-			if ev.Status != expected {
-				t.Errorf("Expecting event %#v, but got %#v\n", expected, ev.Status)
-			}
-		case <-time.After(1 * time.Second):
-			t.Errorf("Expecting event %#v, but got nothing\n", expected)
-		}
-	}
-
-	c := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   "container_id",
-			Name: "container_name",
-			Config: &containertypes.Config{
-				Image: "image_name",
-			},
-		},
-	}
-	daemon := &Daemon{
-		EventsService: e,
-	}
-
-	c.Config.Healthcheck = &containertypes.HealthConfig{
-		Retries: 1,
-	}
-
-	reset(c)
-
-	handleResult := func(startTime time.Time, exitCode int) {
-		handleProbeResult(daemon, c, &types.HealthcheckResult{
-			Start:    startTime,
-			End:      startTime,
-			ExitCode: exitCode,
-		}, nil)
-	}
-
-	// starting -> failed -> success -> failed
-
-	handleResult(c.State.StartedAt.Add(1*time.Second), 1)
-	expect("health_status: unhealthy")
-
-	handleResult(c.State.StartedAt.Add(2*time.Second), 0)
-	expect("health_status: healthy")
-
-	handleResult(c.State.StartedAt.Add(3*time.Second), 1)
-	expect("health_status: unhealthy")
-
-	// Test retries
-
-	reset(c)
-	c.Config.Healthcheck.Retries = 3
-
-	handleResult(c.State.StartedAt.Add(20*time.Second), 1)
-	handleResult(c.State.StartedAt.Add(40*time.Second), 1)
-	if c.State.Health.Status != types.Starting {
-		t.Errorf("Expecting starting, but got %#v\n", c.State.Health.Status)
-	}
-	if c.State.Health.FailingStreak != 2 {
-		t.Errorf("Expecting FailingStreak=2, but got %d\n", c.State.Health.FailingStreak)
-	}
-	handleResult(c.State.StartedAt.Add(60*time.Second), 1)
-	expect("health_status: unhealthy")
-
-	handleResult(c.State.StartedAt.Add(80*time.Second), 0)
-	expect("health_status: healthy")
-	if c.State.Health.FailingStreak != 0 {
-		t.Errorf("Expecting FailingStreak=0, but got %d\n", c.State.Health.FailingStreak)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image.go b/installer/vendor/github.com/docker/docker/daemon/image.go
deleted file mode 100644
index 32a8d77432..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-)
-
-// ErrImageDoesNotExist is error returned when no image can be found for a reference.
-type ErrImageDoesNotExist struct {
-	RefOrID string
-}
-
-func (e ErrImageDoesNotExist) Error() string {
-	return fmt.Sprintf("no such id: %s", e.RefOrID)
-}
-
-// GetImageID returns an image ID corresponding to the image referred to by
-// refOrID.
-func (daemon *Daemon) GetImageID(refOrID string) (image.ID, error) {
-	id, ref, err := reference.ParseIDOrReference(refOrID)
-	if err != nil {
-		return "", err
-	}
-	if id != "" {
-		if _, err := daemon.imageStore.Get(image.IDFromDigest(id)); err != nil {
-			return "", ErrImageDoesNotExist{refOrID}
-		}
-		return image.IDFromDigest(id), nil
-	}
-
-	if id, err := daemon.referenceStore.Get(ref); err == nil {
-		return image.IDFromDigest(id), nil
-	}
-
-	// deprecated: repo:shortid https://github.com/docker/docker/pull/799
-	if tagged, ok := ref.(reference.NamedTagged); ok {
-		if tag := tagged.Tag(); stringid.IsShortID(stringid.TruncateID(tag)) {
-			if id, err := daemon.imageStore.Search(tag); err == nil {
-				for _, namedRef := range daemon.referenceStore.References(id.Digest()) {
-					if namedRef.Name() == ref.Name() {
-						return id, nil
-					}
-				}
-			}
-		}
-	}
-
-	// Search based on ID
-	if id, err := daemon.imageStore.Search(refOrID); err == nil {
-		return id, nil
-	}
-
-	return "", ErrImageDoesNotExist{refOrID}
-}
-
-// GetImage returns an image corresponding to the image referred to by refOrID.
-func (daemon *Daemon) GetImage(refOrID string) (*image.Image, error) {
-	imgID, err := daemon.GetImageID(refOrID)
-	if err != nil {
-		return nil, err
-	}
-	return daemon.imageStore.Get(imgID)
-}
-
-// GetImageOnBuild looks up a Docker image referenced by `name`.
-func (daemon *Daemon) GetImageOnBuild(name string) (builder.Image, error) {
-	img, err := daemon.GetImage(name)
-	if err != nil {
-		return nil, err
-	}
-	return img, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_delete.go b/installer/vendor/github.com/docker/docker/daemon/image_delete.go
deleted file mode 100644
index 3e3c142e9c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_delete.go
+++ /dev/null
@@ -1,412 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-)
-
-type conflictType int
-
-const (
-	conflictDependentChild conflictType = (1 << iota)
-	conflictRunningContainer
-	conflictActiveReference
-	conflictStoppedContainer
-	conflictHard = conflictDependentChild | conflictRunningContainer
-	conflictSoft = conflictActiveReference | conflictStoppedContainer
-)
-
-// ImageDelete deletes the image referenced by the given imageRef from this
-// daemon. The given imageRef can be an image ID, ID prefix, or a repository
-// reference (with an optional tag or digest, defaulting to the tag name
-// "latest"). There is differing behavior depending on whether the given
-// imageRef is a repository reference or not.
-//
-// If the given imageRef is a repository reference then that repository
-// reference will be removed. However, if there exists any containers which
-// were created using the same image reference then the repository reference
-// cannot be removed unless either there are other repository references to the
-// same image or force is true. Following removal of the repository reference,
-// the referenced image itself will attempt to be deleted as described below
-// but quietly, meaning any image delete conflicts will cause the image to not
-// be deleted and the conflict will not be reported.
-//
-// There may be conflicts preventing deletion of an image and these conflicts
-// are divided into two categories grouped by their severity:
-//
-// Hard Conflict:
-// 	- a pull or build using the image.
-// 	- any descendant image.
-// 	- any running container using the image.
-//
-// Soft Conflict:
-// 	- any stopped container using the image.
-// 	- any repository tag or digest references to the image.
-//
-// The image cannot be removed if there are any hard conflicts and can be
-// removed if there are soft conflicts only if force is true.
-//
-// If prune is true, ancestor images will each attempt to be deleted quietly,
-// meaning any delete conflicts will cause the image to not be deleted and the
-// conflict will not be reported.
-//
-// FIXME: remove ImageDelete's dependency on Daemon, then move to the graph
-// package. This would require that we no longer need the daemon to determine
-// whether images are being used by a stopped or running container.
-func (daemon *Daemon) ImageDelete(imageRef string, force, prune bool) ([]types.ImageDelete, error) {
-	start := time.Now()
-	records := []types.ImageDelete{}
-
-	imgID, err := daemon.GetImageID(imageRef)
-	if err != nil {
-		return nil, daemon.imageNotExistToErrcode(err)
-	}
-
-	repoRefs := daemon.referenceStore.References(imgID.Digest())
-
-	var removedRepositoryRef bool
-	if !isImageIDPrefix(imgID.String(), imageRef) {
-		// A repository reference was given and should be removed
-		// first. We can only remove this reference if either force is
-		// true, there are multiple repository references to this
-		// image, or there are no containers using the given reference.
-		if !force && isSingleReference(repoRefs) {
-			if container := daemon.getContainerUsingImage(imgID); container != nil {
-				// If we removed the repository reference then
-				// this image would remain "dangling" and since
-				// we really want to avoid that the client must
-				// explicitly force its removal.
-				err := fmt.Errorf("conflict: unable to remove repository reference %q (must force) - container %s is using its referenced image %s", imageRef, stringid.TruncateID(container.ID), stringid.TruncateID(imgID.String()))
-				return nil, errors.NewRequestConflictError(err)
-			}
-		}
-
-		parsedRef, err := reference.ParseNamed(imageRef)
-		if err != nil {
-			return nil, err
-		}
-
-		parsedRef, err = daemon.removeImageRef(parsedRef)
-		if err != nil {
-			return nil, err
-		}
-
-		untaggedRecord := types.ImageDelete{Untagged: parsedRef.String()}
-
-		daemon.LogImageEvent(imgID.String(), imgID.String(), "untag")
-		records = append(records, untaggedRecord)
-
-		repoRefs = daemon.referenceStore.References(imgID.Digest())
-
-		// If a tag reference was removed and the only remaining
-		// references to the same repository are digest references,
-		// then clean up those digest references.
-		if _, isCanonical := parsedRef.(reference.Canonical); !isCanonical {
-			foundRepoTagRef := false
-			for _, repoRef := range repoRefs {
-				if _, repoRefIsCanonical := repoRef.(reference.Canonical); !repoRefIsCanonical && parsedRef.Name() == repoRef.Name() {
-					foundRepoTagRef = true
-					break
-				}
-			}
-			if !foundRepoTagRef {
-				// Remove canonical references from same repository
-				remainingRefs := []reference.Named{}
-				for _, repoRef := range repoRefs {
-					if _, repoRefIsCanonical := repoRef.(reference.Canonical); repoRefIsCanonical && parsedRef.Name() == repoRef.Name() {
-						if _, err := daemon.removeImageRef(repoRef); err != nil {
-							return records, err
-						}
-
-						untaggedRecord := types.ImageDelete{Untagged: repoRef.String()}
-						records = append(records, untaggedRecord)
-					} else {
-						remainingRefs = append(remainingRefs, repoRef)
-
-					}
-				}
-				repoRefs = remainingRefs
-			}
-		}
-
-		// If it has remaining references then the untag finished the remove
-		if len(repoRefs) > 0 {
-			return records, nil
-		}
-
-		removedRepositoryRef = true
-	} else {
-		// If an ID reference was given AND there is at most one tag
-		// reference to the image AND all references are within one
-		// repository, then remove all references.
-		if isSingleReference(repoRefs) {
-			c := conflictHard
-			if !force {
-				c |= conflictSoft &^ conflictActiveReference
-			}
-			if conflict := daemon.checkImageDeleteConflict(imgID, c); conflict != nil {
-				return nil, conflict
-			}
-
-			for _, repoRef := range repoRefs {
-				parsedRef, err := daemon.removeImageRef(repoRef)
-				if err != nil {
-					return nil, err
-				}
-
-				untaggedRecord := types.ImageDelete{Untagged: parsedRef.String()}
-
-				daemon.LogImageEvent(imgID.String(), imgID.String(), "untag")
-				records = append(records, untaggedRecord)
-			}
-		}
-	}
-
-	if err := daemon.imageDeleteHelper(imgID, &records, force, prune, removedRepositoryRef); err != nil {
-		return nil, err
-	}
-
-	imageActions.WithValues("delete").UpdateSince(start)
-
-	return records, nil
-}
-
-// isSingleReference returns true when all references are from one repository
-// and there is at most one tag. Returns false for empty input.
-func isSingleReference(repoRefs []reference.Named) bool {
-	if len(repoRefs) <= 1 {
-		return len(repoRefs) == 1
-	}
-	var singleRef reference.Named
-	canonicalRefs := map[string]struct{}{}
-	for _, repoRef := range repoRefs {
-		if _, isCanonical := repoRef.(reference.Canonical); isCanonical {
-			canonicalRefs[repoRef.Name()] = struct{}{}
-		} else if singleRef == nil {
-			singleRef = repoRef
-		} else {
-			return false
-		}
-	}
-	if singleRef == nil {
-		// Just use first canonical ref
-		singleRef = repoRefs[0]
-	}
-	_, ok := canonicalRefs[singleRef.Name()]
-	return len(canonicalRefs) == 1 && ok
-}
-
-// isImageIDPrefix returns whether the given possiblePrefix is a prefix of the
-// given imageID.
-func isImageIDPrefix(imageID, possiblePrefix string) bool {
-	if strings.HasPrefix(imageID, possiblePrefix) {
-		return true
-	}
-
-	if i := strings.IndexRune(imageID, ':'); i >= 0 {
-		return strings.HasPrefix(imageID[i+1:], possiblePrefix)
-	}
-
-	return false
-}
-
-// getContainerUsingImage returns a container that was created using the given
-// imageID. Returns nil if there is no such container.
-func (daemon *Daemon) getContainerUsingImage(imageID image.ID) *container.Container {
-	return daemon.containers.First(func(c *container.Container) bool {
-		return c.ImageID == imageID
-	})
-}
-
-// removeImageRef attempts to parse and remove the given image reference from
-// this daemon's store of repository tag/digest references. The given
-// repositoryRef must not be an image ID but a repository name followed by an
-// optional tag or digest reference. If tag or digest is omitted, the default
-// tag is used. Returns the resolved image reference and an error.
-func (daemon *Daemon) removeImageRef(ref reference.Named) (reference.Named, error) {
-	ref = reference.WithDefaultTag(ref)
-	// Ignore the boolean value returned, as far as we're concerned, this
-	// is an idempotent operation and it's okay if the reference didn't
-	// exist in the first place.
-	_, err := daemon.referenceStore.Delete(ref)
-
-	return ref, err
-}
-
-// removeAllReferencesToImageID attempts to remove every reference to the given
-// imgID from this daemon's store of repository tag/digest references. Returns
-// on the first encountered error. Removed references are logged to this
-// daemon's event service. An "Untagged" types.ImageDelete is added to the
-// given list of records.
-func (daemon *Daemon) removeAllReferencesToImageID(imgID image.ID, records *[]types.ImageDelete) error {
-	imageRefs := daemon.referenceStore.References(imgID.Digest())
-
-	for _, imageRef := range imageRefs {
-		parsedRef, err := daemon.removeImageRef(imageRef)
-		if err != nil {
-			return err
-		}
-
-		untaggedRecord := types.ImageDelete{Untagged: parsedRef.String()}
-
-		daemon.LogImageEvent(imgID.String(), imgID.String(), "untag")
-		*records = append(*records, untaggedRecord)
-	}
-
-	return nil
-}
-
-// ImageDeleteConflict holds a soft or hard conflict and an associated error.
-// Implements the error interface.
-type imageDeleteConflict struct {
-	hard    bool
-	used    bool
-	imgID   image.ID
-	message string
-}
-
-func (idc *imageDeleteConflict) Error() string {
-	var forceMsg string
-	if idc.hard {
-		forceMsg = "cannot be forced"
-	} else {
-		forceMsg = "must be forced"
-	}
-
-	return fmt.Sprintf("conflict: unable to delete %s (%s) - %s", stringid.TruncateID(idc.imgID.String()), forceMsg, idc.message)
-}
-
-// imageDeleteHelper attempts to delete the given image from this daemon. If
-// the image has any hard delete conflicts (child images or running containers
-// using the image) then it cannot be deleted. If the image has any soft delete
-// conflicts (any tags/digests referencing the image or any stopped container
-// using the image) then it can only be deleted if force is true. If the delete
-// succeeds and prune is true, the parent images are also deleted if they do
-// not have any soft or hard delete conflicts themselves. Any deleted images
-// and untagged references are appended to the given records. If any error or
-// conflict is encountered, it will be returned immediately without deleting
-// the image. If quiet is true, any encountered conflicts will be ignored and
-// the function will return nil immediately without deleting the image.
-func (daemon *Daemon) imageDeleteHelper(imgID image.ID, records *[]types.ImageDelete, force, prune, quiet bool) error {
-	// First, determine if this image has any conflicts. Ignore soft conflicts
-	// if force is true.
-	c := conflictHard
-	if !force {
-		c |= conflictSoft
-	}
-	if conflict := daemon.checkImageDeleteConflict(imgID, c); conflict != nil {
-		if quiet && (!daemon.imageIsDangling(imgID) || conflict.used) {
-			// Ignore conflicts UNLESS the image is "dangling" or not being used in
-			// which case we want the user to know.
-			return nil
-		}
-
-		// There was a conflict and it's either a hard conflict OR we are not
-		// forcing deletion on soft conflicts.
-		return conflict
-	}
-
-	parent, err := daemon.imageStore.GetParent(imgID)
-	if err != nil {
-		// There may be no parent
-		parent = ""
-	}
-
-	// Delete all repository tag/digest references to this image.
-	if err := daemon.removeAllReferencesToImageID(imgID, records); err != nil {
-		return err
-	}
-
-	removedLayers, err := daemon.imageStore.Delete(imgID)
-	if err != nil {
-		return err
-	}
-
-	daemon.LogImageEvent(imgID.String(), imgID.String(), "delete")
-	*records = append(*records, types.ImageDelete{Deleted: imgID.String()})
-	for _, removedLayer := range removedLayers {
-		*records = append(*records, types.ImageDelete{Deleted: removedLayer.ChainID.String()})
-	}
-
-	if !prune || parent == "" {
-		return nil
-	}
-
-	// We need to prune the parent image. This means delete it if there are
-	// no tags/digests referencing it and there are no containers using it (
-	// either running or stopped).
-	// Do not force prunings, but do so quietly (stopping on any encountered
-	// conflicts).
-	return daemon.imageDeleteHelper(parent, records, false, true, true)
-}
-
-// checkImageDeleteConflict determines whether there are any conflicts
-// preventing deletion of the given image from this daemon. A hard conflict is
-// any image which has the given image as a parent or any running container
-// using the image. A soft conflict is any tags/digest referencing the given
-// image or any stopped container using the image. If ignoreSoftConflicts is
-// true, this function will not check for soft conflict conditions.
-func (daemon *Daemon) checkImageDeleteConflict(imgID image.ID, mask conflictType) *imageDeleteConflict {
-	// Check if the image has any descendant images.
-	if mask&conflictDependentChild != 0 && len(daemon.imageStore.Children(imgID)) > 0 {
-		return &imageDeleteConflict{
-			hard:    true,
-			imgID:   imgID,
-			message: "image has dependent child images",
-		}
-	}
-
-	if mask&conflictRunningContainer != 0 {
-		// Check if any running container is using the image.
-		running := func(c *container.Container) bool {
-			return c.IsRunning() && c.ImageID == imgID
-		}
-		if container := daemon.containers.First(running); container != nil {
-			return &imageDeleteConflict{
-				imgID:   imgID,
-				hard:    true,
-				used:    true,
-				message: fmt.Sprintf("image is being used by running container %s", stringid.TruncateID(container.ID)),
-			}
-		}
-	}
-
-	// Check if any repository tags/digest reference this image.
-	if mask&conflictActiveReference != 0 && len(daemon.referenceStore.References(imgID.Digest())) > 0 {
-		return &imageDeleteConflict{
-			imgID:   imgID,
-			message: "image is referenced in multiple repositories",
-		}
-	}
-
-	if mask&conflictStoppedContainer != 0 {
-		// Check if any stopped containers reference this image.
-		stopped := func(c *container.Container) bool {
-			return !c.IsRunning() && c.ImageID == imgID
-		}
-		if container := daemon.containers.First(stopped); container != nil {
-			return &imageDeleteConflict{
-				imgID:   imgID,
-				used:    true,
-				message: fmt.Sprintf("image is being used by stopped container %s", stringid.TruncateID(container.ID)),
-			}
-		}
-	}
-
-	return nil
-}
-
-// imageIsDangling returns whether the given image is "dangling" which means
-// that there are no repository references to the given image and it has no
-// child images.
-func (daemon *Daemon) imageIsDangling(imgID image.ID) bool {
-	return !(len(daemon.referenceStore.References(imgID.Digest())) > 0 || len(daemon.imageStore.Children(imgID)) > 0)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_exporter.go b/installer/vendor/github.com/docker/docker/daemon/image_exporter.go
deleted file mode 100644
index 95d1d3dcdb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_exporter.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package daemon
-
-import (
-	"io"
-
-	"github.com/docker/docker/image/tarexport"
-)
-
-// ExportImage exports a list of images to the given output stream. The
-// exported images are archived into a tar when written to the output
-// stream. All images with the given tag and all versions containing
-// the same tag are exported. names is the set of tags to export, and
-// outStream is the writer which the images are written to.
-func (daemon *Daemon) ExportImage(names []string, outStream io.Writer) error {
-	imageExporter := tarexport.NewTarExporter(daemon.imageStore, daemon.layerStore, daemon.referenceStore, daemon)
-	return imageExporter.Save(names, outStream)
-}
-
-// LoadImage uploads a set of images into the repository. This is the
-// complement of ImageExport.  The input stream is an uncompressed tar
-// ball containing images and metadata.
-func (daemon *Daemon) LoadImage(inTar io.ReadCloser, outStream io.Writer, quiet bool) error {
-	imageExporter := tarexport.NewTarExporter(daemon.imageStore, daemon.layerStore, daemon.referenceStore, daemon)
-	return imageExporter.Load(inTar, outStream, quiet)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_history.go b/installer/vendor/github.com/docker/docker/daemon/image_history.go
deleted file mode 100644
index 839dd1283b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_history.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/reference"
-)
-
-// ImageHistory returns a slice of ImageHistory structures for the specified image
-// name by walking the image lineage.
-func (daemon *Daemon) ImageHistory(name string) ([]*types.ImageHistory, error) {
-	start := time.Now()
-	img, err := daemon.GetImage(name)
-	if err != nil {
-		return nil, err
-	}
-
-	history := []*types.ImageHistory{}
-
-	layerCounter := 0
-	rootFS := *img.RootFS
-	rootFS.DiffIDs = nil
-
-	for _, h := range img.History {
-		var layerSize int64
-
-		if !h.EmptyLayer {
-			if len(img.RootFS.DiffIDs) <= layerCounter {
-				return nil, fmt.Errorf("too many non-empty layers in History section")
-			}
-
-			rootFS.Append(img.RootFS.DiffIDs[layerCounter])
-			l, err := daemon.layerStore.Get(rootFS.ChainID())
-			if err != nil {
-				return nil, err
-			}
-			layerSize, err = l.DiffSize()
-			layer.ReleaseAndLog(daemon.layerStore, l)
-			if err != nil {
-				return nil, err
-			}
-
-			layerCounter++
-		}
-
-		history = append([]*types.ImageHistory{{
-			ID:        "<missing>",
-			Created:   h.Created.Unix(),
-			CreatedBy: h.CreatedBy,
-			Comment:   h.Comment,
-			Size:      layerSize,
-		}}, history...)
-	}
-
-	// Fill in image IDs and tags
-	histImg := img
-	id := img.ID()
-	for _, h := range history {
-		h.ID = id.String()
-
-		var tags []string
-		for _, r := range daemon.referenceStore.References(id.Digest()) {
-			if _, ok := r.(reference.NamedTagged); ok {
-				tags = append(tags, r.String())
-			}
-		}
-
-		h.Tags = tags
-
-		id = histImg.Parent
-		if id == "" {
-			break
-		}
-		histImg, err = daemon.GetImage(id.String())
-		if err != nil {
-			break
-		}
-	}
-	imageActions.WithValues("history").UpdateSince(start)
-	return history, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_inspect.go b/installer/vendor/github.com/docker/docker/daemon/image_inspect.go
deleted file mode 100644
index ebf912469c..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_inspect.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/reference"
-)
-
-// LookupImage looks up an image by name and returns it as an ImageInspect
-// structure.
-func (daemon *Daemon) LookupImage(name string) (*types.ImageInspect, error) {
-	img, err := daemon.GetImage(name)
-	if err != nil {
-		return nil, fmt.Errorf("No such image: %s", name)
-	}
-
-	refs := daemon.referenceStore.References(img.ID().Digest())
-	repoTags := []string{}
-	repoDigests := []string{}
-	for _, ref := range refs {
-		switch ref.(type) {
-		case reference.NamedTagged:
-			repoTags = append(repoTags, ref.String())
-		case reference.Canonical:
-			repoDigests = append(repoDigests, ref.String())
-		}
-	}
-
-	var size int64
-	var layerMetadata map[string]string
-	layerID := img.RootFS.ChainID()
-	if layerID != "" {
-		l, err := daemon.layerStore.Get(layerID)
-		if err != nil {
-			return nil, err
-		}
-		defer layer.ReleaseAndLog(daemon.layerStore, l)
-		size, err = l.Size()
-		if err != nil {
-			return nil, err
-		}
-
-		layerMetadata, err = l.Metadata()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	comment := img.Comment
-	if len(comment) == 0 && len(img.History) > 0 {
-		comment = img.History[len(img.History)-1].Comment
-	}
-
-	imageInspect := &types.ImageInspect{
-		ID:              img.ID().String(),
-		RepoTags:        repoTags,
-		RepoDigests:     repoDigests,
-		Parent:          img.Parent.String(),
-		Comment:         comment,
-		Created:         img.Created.Format(time.RFC3339Nano),
-		Container:       img.Container,
-		ContainerConfig: &img.ContainerConfig,
-		DockerVersion:   img.DockerVersion,
-		Author:          img.Author,
-		Config:          img.Config,
-		Architecture:    img.Architecture,
-		Os:              img.OS,
-		OsVersion:       img.OSVersion,
-		Size:            size,
-		VirtualSize:     size, // TODO: field unused, deprecate
-		RootFS:          rootFSToAPIType(img.RootFS),
-	}
-
-	imageInspect.GraphDriver.Name = daemon.GraphDriverName()
-
-	imageInspect.GraphDriver.Data = layerMetadata
-
-	return imageInspect, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_pull.go b/installer/vendor/github.com/docker/docker/daemon/image_pull.go
deleted file mode 100644
index 2157d15974..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_pull.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package daemon
-
-import (
-	"io"
-	"strings"
-
-	dist "github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/builder"
-	"github.com/docker/docker/distribution"
-	progressutils "github.com/docker/docker/distribution/utils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-// PullImage initiates a pull operation. image is the repository name to pull, and
-// tag may be either empty, or indicate a specific tag to pull.
-func (daemon *Daemon) PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	// Special case: "pull -a" may send an image name with a
-	// trailing :. This is ugly, but let's not break API
-	// compatibility.
-	image = strings.TrimSuffix(image, ":")
-
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return err
-	}
-
-	if tag != "" {
-		// The "tag" could actually be a digest.
-		var dgst digest.Digest
-		dgst, err = digest.ParseDigest(tag)
-		if err == nil {
-			ref, err = reference.WithDigest(reference.TrimNamed(ref), dgst)
-		} else {
-			ref, err = reference.WithTag(ref, tag)
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return daemon.pullImageWithReference(ctx, ref, metaHeaders, authConfig, outStream)
-}
-
-// PullOnBuild tells Docker to pull image referenced by `name`.
-func (daemon *Daemon) PullOnBuild(ctx context.Context, name string, authConfigs map[string]types.AuthConfig, output io.Writer) (builder.Image, error) {
-	ref, err := reference.ParseNamed(name)
-	if err != nil {
-		return nil, err
-	}
-	ref = reference.WithDefaultTag(ref)
-
-	pullRegistryAuth := &types.AuthConfig{}
-	if len(authConfigs) > 0 {
-		// The request came with a full auth config file, we prefer to use that
-		repoInfo, err := daemon.RegistryService.ResolveRepository(ref)
-		if err != nil {
-			return nil, err
-		}
-
-		resolvedConfig := registry.ResolveAuthConfig(
-			authConfigs,
-			repoInfo.Index,
-		)
-		pullRegistryAuth = &resolvedConfig
-	}
-
-	if err := daemon.pullImageWithReference(ctx, ref, nil, pullRegistryAuth, output); err != nil {
-		return nil, err
-	}
-	return daemon.GetImage(name)
-}
-
-func (daemon *Daemon) pullImageWithReference(ctx context.Context, ref reference.Named, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	// Include a buffer so that slow client connections don't affect
-	// transfer performance.
-	progressChan := make(chan progress.Progress, 100)
-
-	writesDone := make(chan struct{})
-
-	ctx, cancelFunc := context.WithCancel(ctx)
-
-	go func() {
-		progressutils.WriteDistributionProgress(cancelFunc, outStream, progressChan)
-		close(writesDone)
-	}()
-
-	imagePullConfig := &distribution.ImagePullConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeaders,
-			AuthConfig:       authConfig,
-			ProgressOutput:   progress.ChanOutput(progressChan),
-			RegistryService:  daemon.RegistryService,
-			ImageEventLogger: daemon.LogImageEvent,
-			MetadataStore:    daemon.distributionMetadataStore,
-			ImageStore:       distribution.NewImageConfigStoreFromStore(daemon.imageStore),
-			ReferenceStore:   daemon.referenceStore,
-		},
-		DownloadManager: daemon.downloadManager,
-		Schema2Types:    distribution.ImageTypes,
-	}
-
-	err := distribution.Pull(ctx, ref, imagePullConfig)
-	close(progressChan)
-	<-writesDone
-	return err
-}
-
-// GetRepository returns a repository from the registry.
-func (daemon *Daemon) GetRepository(ctx context.Context, ref reference.NamedTagged, authConfig *types.AuthConfig) (dist.Repository, bool, error) {
-	// get repository info
-	repoInfo, err := daemon.RegistryService.ResolveRepository(ref)
-	if err != nil {
-		return nil, false, err
-	}
-	// makes sure name is not empty or `scratch`
-	if err := distribution.ValidateRepoName(repoInfo.Name()); err != nil {
-		return nil, false, err
-	}
-
-	// get endpoints
-	endpoints, err := daemon.RegistryService.LookupPullEndpoints(repoInfo.Hostname())
-	if err != nil {
-		return nil, false, err
-	}
-
-	// retrieve repository
-	var (
-		confirmedV2 bool
-		repository  dist.Repository
-		lastError   error
-	)
-
-	for _, endpoint := range endpoints {
-		if endpoint.Version == registry.APIVersion1 {
-			continue
-		}
-
-		repository, confirmedV2, lastError = distribution.NewV2Repository(ctx, repoInfo, endpoint, nil, authConfig, "pull")
-		if lastError == nil && confirmedV2 {
-			break
-		}
-	}
-	return repository, confirmedV2, lastError
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_push.go b/installer/vendor/github.com/docker/docker/daemon/image_push.go
deleted file mode 100644
index e6382c7f27..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_push.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package daemon
-
-import (
-	"io"
-
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/distribution"
-	progressutils "github.com/docker/docker/distribution/utils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"golang.org/x/net/context"
-)
-
-// PushImage initiates a push operation on the repository named localName.
-func (daemon *Daemon) PushImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return err
-	}
-	if tag != "" {
-		// Push by digest is not supported, so only tags are supported.
-		ref, err = reference.WithTag(ref, tag)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Include a buffer so that slow client connections don't affect
-	// transfer performance.
-	progressChan := make(chan progress.Progress, 100)
-
-	writesDone := make(chan struct{})
-
-	ctx, cancelFunc := context.WithCancel(ctx)
-
-	go func() {
-		progressutils.WriteDistributionProgress(cancelFunc, outStream, progressChan)
-		close(writesDone)
-	}()
-
-	imagePushConfig := &distribution.ImagePushConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeaders,
-			AuthConfig:       authConfig,
-			ProgressOutput:   progress.ChanOutput(progressChan),
-			RegistryService:  daemon.RegistryService,
-			ImageEventLogger: daemon.LogImageEvent,
-			MetadataStore:    daemon.distributionMetadataStore,
-			ImageStore:       distribution.NewImageConfigStoreFromStore(daemon.imageStore),
-			ReferenceStore:   daemon.referenceStore,
-		},
-		ConfigMediaType: schema2.MediaTypeImageConfig,
-		LayerStore:      distribution.NewLayerProviderFromStore(daemon.layerStore),
-		TrustKey:        daemon.trustKey,
-		UploadManager:   daemon.uploadManager,
-	}
-
-	err = distribution.Push(ctx, ref, imagePushConfig)
-	close(progressChan)
-	<-writesDone
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/image_tag.go b/installer/vendor/github.com/docker/docker/daemon/image_tag.go
deleted file mode 100644
index 36fa3b462e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/image_tag.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/reference"
-)
-
-// TagImage creates the tag specified by newTag, pointing to the image named
-// imageName (alternatively, imageName can also be an image ID).
-func (daemon *Daemon) TagImage(imageName, repository, tag string) error {
-	imageID, err := daemon.GetImageID(imageName)
-	if err != nil {
-		return err
-	}
-
-	newTag, err := reference.WithName(repository)
-	if err != nil {
-		return err
-	}
-	if tag != "" {
-		if newTag, err = reference.WithTag(newTag, tag); err != nil {
-			return err
-		}
-	}
-
-	return daemon.TagImageWithReference(imageID, newTag)
-}
-
-// TagImageWithReference adds the given reference to the image ID provided.
-func (daemon *Daemon) TagImageWithReference(imageID image.ID, newTag reference.Named) error {
-	if err := daemon.referenceStore.AddTag(newTag, imageID.Digest(), true); err != nil {
-		return err
-	}
-
-	daemon.LogImageEvent(imageID.String(), newTag.String(), "tag")
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/images.go b/installer/vendor/github.com/docker/docker/daemon/images.go
deleted file mode 100644
index 88fb8f8e91..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/images.go
+++ /dev/null
@@ -1,331 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"fmt"
-	"sort"
-	"time"
-
-	"github.com/pkg/errors"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-)
-
-var acceptedImageFilterTags = map[string]bool{
-	"dangling":  true,
-	"label":     true,
-	"before":    true,
-	"since":     true,
-	"reference": true,
-}
-
-// byCreated is a temporary type used to sort a list of images by creation
-// time.
-type byCreated []*types.ImageSummary
-
-func (r byCreated) Len() int           { return len(r) }
-func (r byCreated) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-func (r byCreated) Less(i, j int) bool { return r[i].Created < r[j].Created }
-
-// Map returns a map of all images in the ImageStore
-func (daemon *Daemon) Map() map[image.ID]*image.Image {
-	return daemon.imageStore.Map()
-}
-
-// Images returns a filtered list of images. filterArgs is a JSON-encoded set
-// of filter arguments which will be interpreted by api/types/filters.
-// filter is a shell glob string applied to repository names. The argument
-// named all controls whether all images in the graph are filtered, or just
-// the heads.
-func (daemon *Daemon) Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error) {
-	var (
-		allImages    map[image.ID]*image.Image
-		err          error
-		danglingOnly = false
-	)
-
-	if err := imageFilters.Validate(acceptedImageFilterTags); err != nil {
-		return nil, err
-	}
-
-	if imageFilters.Include("dangling") {
-		if imageFilters.ExactMatch("dangling", "true") {
-			danglingOnly = true
-		} else if !imageFilters.ExactMatch("dangling", "false") {
-			return nil, fmt.Errorf("Invalid filter 'dangling=%s'", imageFilters.Get("dangling"))
-		}
-	}
-	if danglingOnly {
-		allImages = daemon.imageStore.Heads()
-	} else {
-		allImages = daemon.imageStore.Map()
-	}
-
-	var beforeFilter, sinceFilter *image.Image
-	err = imageFilters.WalkValues("before", func(value string) error {
-		beforeFilter, err = daemon.GetImage(value)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = imageFilters.WalkValues("since", func(value string) error {
-		sinceFilter, err = daemon.GetImage(value)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	images := []*types.ImageSummary{}
-	var imagesMap map[*image.Image]*types.ImageSummary
-	var layerRefs map[layer.ChainID]int
-	var allLayers map[layer.ChainID]layer.Layer
-	var allContainers []*container.Container
-
-	for id, img := range allImages {
-		if beforeFilter != nil {
-			if img.Created.Equal(beforeFilter.Created) || img.Created.After(beforeFilter.Created) {
-				continue
-			}
-		}
-
-		if sinceFilter != nil {
-			if img.Created.Equal(sinceFilter.Created) || img.Created.Before(sinceFilter.Created) {
-				continue
-			}
-		}
-
-		if imageFilters.Include("label") {
-			// Very old image that do not have image.Config (or even labels)
-			if img.Config == nil {
-				continue
-			}
-			// We are now sure image.Config is not nil
-			if !imageFilters.MatchKVList("label", img.Config.Labels) {
-				continue
-			}
-		}
-
-		layerID := img.RootFS.ChainID()
-		var size int64
-		if layerID != "" {
-			l, err := daemon.layerStore.Get(layerID)
-			if err != nil {
-				return nil, err
-			}
-
-			size, err = l.Size()
-			layer.ReleaseAndLog(daemon.layerStore, l)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		newImage := newImage(img, size)
-
-		for _, ref := range daemon.referenceStore.References(id.Digest()) {
-			if imageFilters.Include("reference") {
-				var found bool
-				var matchErr error
-				for _, pattern := range imageFilters.Get("reference") {
-					found, matchErr = reference.Match(pattern, ref)
-					if matchErr != nil {
-						return nil, matchErr
-					}
-				}
-				if !found {
-					continue
-				}
-			}
-			if _, ok := ref.(reference.Canonical); ok {
-				newImage.RepoDigests = append(newImage.RepoDigests, ref.String())
-			}
-			if _, ok := ref.(reference.NamedTagged); ok {
-				newImage.RepoTags = append(newImage.RepoTags, ref.String())
-			}
-		}
-		if newImage.RepoDigests == nil && newImage.RepoTags == nil {
-			if all || len(daemon.imageStore.Children(id)) == 0 {
-
-				if imageFilters.Include("dangling") && !danglingOnly {
-					//dangling=false case, so dangling image is not needed
-					continue
-				}
-				if imageFilters.Include("reference") { // skip images with no references if filtering by reference
-					continue
-				}
-				newImage.RepoDigests = []string{"<none>@<none>"}
-				newImage.RepoTags = []string{"<none>:<none>"}
-			} else {
-				continue
-			}
-		} else if danglingOnly && len(newImage.RepoTags) > 0 {
-			continue
-		}
-
-		if withExtraAttrs {
-			// lazyly init variables
-			if imagesMap == nil {
-				allContainers = daemon.List()
-				allLayers = daemon.layerStore.Map()
-				imagesMap = make(map[*image.Image]*types.ImageSummary)
-				layerRefs = make(map[layer.ChainID]int)
-			}
-
-			// Get container count
-			newImage.Containers = 0
-			for _, c := range allContainers {
-				if c.ImageID == id {
-					newImage.Containers++
-				}
-			}
-
-			// count layer references
-			rootFS := *img.RootFS
-			rootFS.DiffIDs = nil
-			for _, id := range img.RootFS.DiffIDs {
-				rootFS.Append(id)
-				chid := rootFS.ChainID()
-				layerRefs[chid]++
-				if _, ok := allLayers[chid]; !ok {
-					return nil, fmt.Errorf("layer %v was not found (corruption?)", chid)
-				}
-			}
-			imagesMap[img] = newImage
-		}
-
-		images = append(images, newImage)
-	}
-
-	if withExtraAttrs {
-		// Get Shared sizes
-		for img, newImage := range imagesMap {
-			rootFS := *img.RootFS
-			rootFS.DiffIDs = nil
-
-			newImage.SharedSize = 0
-			for _, id := range img.RootFS.DiffIDs {
-				rootFS.Append(id)
-				chid := rootFS.ChainID()
-
-				diffSize, err := allLayers[chid].DiffSize()
-				if err != nil {
-					return nil, err
-				}
-
-				if layerRefs[chid] > 1 {
-					newImage.SharedSize += diffSize
-				}
-			}
-		}
-	}
-
-	sort.Sort(sort.Reverse(byCreated(images)))
-
-	return images, nil
-}
-
-// SquashImage creates a new image with the diff of the specified image and the specified parent.
-// This new image contains only the layers from it's parent + 1 extra layer which contains the diff of all the layers in between.
-// The existing image(s) is not destroyed.
-// If no parent is specified, a new image with the diff of all the specified image's layers merged into a new layer that has no parents.
-func (daemon *Daemon) SquashImage(id, parent string) (string, error) {
-	img, err := daemon.imageStore.Get(image.ID(id))
-	if err != nil {
-		return "", err
-	}
-
-	var parentImg *image.Image
-	var parentChainID layer.ChainID
-	if len(parent) != 0 {
-		parentImg, err = daemon.imageStore.Get(image.ID(parent))
-		if err != nil {
-			return "", errors.Wrap(err, "error getting specified parent layer")
-		}
-		parentChainID = parentImg.RootFS.ChainID()
-	} else {
-		rootFS := image.NewRootFS()
-		parentImg = &image.Image{RootFS: rootFS}
-	}
-
-	l, err := daemon.layerStore.Get(img.RootFS.ChainID())
-	if err != nil {
-		return "", errors.Wrap(err, "error getting image layer")
-	}
-	defer daemon.layerStore.Release(l)
-
-	ts, err := l.TarStreamFrom(parentChainID)
-	if err != nil {
-		return "", errors.Wrapf(err, "error getting tar stream to parent")
-	}
-	defer ts.Close()
-
-	newL, err := daemon.layerStore.Register(ts, parentChainID)
-	if err != nil {
-		return "", errors.Wrap(err, "error registering layer")
-	}
-	defer daemon.layerStore.Release(newL)
-
-	var newImage image.Image
-	newImage = *img
-	newImage.RootFS = nil
-
-	var rootFS image.RootFS
-	rootFS = *parentImg.RootFS
-	rootFS.DiffIDs = append(rootFS.DiffIDs, newL.DiffID())
-	newImage.RootFS = &rootFS
-
-	for i, hi := range newImage.History {
-		if i >= len(parentImg.History) {
-			hi.EmptyLayer = true
-		}
-		newImage.History[i] = hi
-	}
-
-	now := time.Now()
-	var historyComment string
-	if len(parent) > 0 {
-		historyComment = fmt.Sprintf("merge %s to %s", id, parent)
-	} else {
-		historyComment = fmt.Sprintf("create new from %s", id)
-	}
-
-	newImage.History = append(newImage.History, image.History{
-		Created: now,
-		Comment: historyComment,
-	})
-	newImage.Created = now
-
-	b, err := json.Marshal(&newImage)
-	if err != nil {
-		return "", errors.Wrap(err, "error marshalling image config")
-	}
-
-	newImgID, err := daemon.imageStore.Create(b)
-	if err != nil {
-		return "", errors.Wrap(err, "error creating new image after squash")
-	}
-	return string(newImgID), nil
-}
-
-func newImage(image *image.Image, virtualSize int64) *types.ImageSummary {
-	newImage := new(types.ImageSummary)
-	newImage.ParentID = image.Parent.String()
-	newImage.ID = image.ID().String()
-	newImage.Created = image.Created.Unix()
-	newImage.Size = virtualSize
-	newImage.VirtualSize = virtualSize
-	newImage.SharedSize = -1
-	newImage.Containers = -1
-	if image.Config != nil {
-		newImage.Labels = image.Config.Labels
-	}
-	return newImage
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/import.go b/installer/vendor/github.com/docker/docker/daemon/import.go
deleted file mode 100644
index c93322b92e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/import.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"net/http"
-	"net/url"
-	"runtime"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/builder/dockerfile"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/httputils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/reference"
-)
-
-// ImportImage imports an image, getting the archived layer data either from
-// inConfig (if src is "-"), or from a URI specified in src. Progress output is
-// written to outStream. Repository and tag names can optionally be given in
-// the repo and tag arguments, respectively.
-func (daemon *Daemon) ImportImage(src string, repository, tag string, msg string, inConfig io.ReadCloser, outStream io.Writer, changes []string) error {
-	var (
-		sf     = streamformatter.NewJSONStreamFormatter()
-		rc     io.ReadCloser
-		resp   *http.Response
-		newRef reference.Named
-	)
-
-	if repository != "" {
-		var err error
-		newRef, err = reference.ParseNamed(repository)
-		if err != nil {
-			return err
-		}
-
-		if _, isCanonical := newRef.(reference.Canonical); isCanonical {
-			return errors.New("cannot import digest reference")
-		}
-
-		if tag != "" {
-			newRef, err = reference.WithTag(newRef, tag)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	config, err := dockerfile.BuildFromConfig(&container.Config{}, changes)
-	if err != nil {
-		return err
-	}
-	if src == "-" {
-		rc = inConfig
-	} else {
-		inConfig.Close()
-		u, err := url.Parse(src)
-		if err != nil {
-			return err
-		}
-		if u.Scheme == "" {
-			u.Scheme = "http"
-			u.Host = src
-			u.Path = ""
-		}
-		outStream.Write(sf.FormatStatus("", "Downloading from %s", u))
-		resp, err = httputils.Download(u.String())
-		if err != nil {
-			return err
-		}
-		progressOutput := sf.NewProgressOutput(outStream, true)
-		rc = progress.NewProgressReader(resp.Body, progressOutput, resp.ContentLength, "", "Importing")
-	}
-
-	defer rc.Close()
-	if len(msg) == 0 {
-		msg = "Imported from " + src
-	}
-
-	inflatedLayerData, err := archive.DecompressStream(rc)
-	if err != nil {
-		return err
-	}
-	// TODO: support windows baselayer?
-	l, err := daemon.layerStore.Register(inflatedLayerData, "")
-	if err != nil {
-		return err
-	}
-	defer layer.ReleaseAndLog(daemon.layerStore, l)
-
-	created := time.Now().UTC()
-	imgConfig, err := json.Marshal(&image.Image{
-		V1Image: image.V1Image{
-			DockerVersion: dockerversion.Version,
-			Config:        config,
-			Architecture:  runtime.GOARCH,
-			OS:            runtime.GOOS,
-			Created:       created,
-			Comment:       msg,
-		},
-		RootFS: &image.RootFS{
-			Type:    "layers",
-			DiffIDs: []layer.DiffID{l.DiffID()},
-		},
-		History: []image.History{{
-			Created: created,
-			Comment: msg,
-		}},
-	})
-	if err != nil {
-		return err
-	}
-
-	id, err := daemon.imageStore.Create(imgConfig)
-	if err != nil {
-		return err
-	}
-
-	// FIXME: connect with commit code and call refstore directly
-	if newRef != nil {
-		if err := daemon.TagImageWithReference(id, newRef); err != nil {
-			return err
-		}
-	}
-
-	daemon.LogImageEvent(id.String(), id.String(), "import")
-	outStream.Write(sf.FormatStatus("", id.String()))
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/info.go b/installer/vendor/github.com/docker/docker/daemon/info.go
deleted file mode 100644
index 1ab9f29592..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/info.go
+++ /dev/null
@@ -1,180 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"sync/atomic"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/pkg/parsers/operatingsystem"
-	"github.com/docker/docker/pkg/platform"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/registry"
-	"github.com/docker/docker/utils"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/docker/go-connections/sockets"
-)
-
-// SystemInfo returns information about the host server the daemon is running on.
-func (daemon *Daemon) SystemInfo() (*types.Info, error) {
-	kernelVersion := "<unknown>"
-	if kv, err := kernel.GetKernelVersion(); err != nil {
-		logrus.Warnf("Could not get kernel version: %v", err)
-	} else {
-		kernelVersion = kv.String()
-	}
-
-	operatingSystem := "<unknown>"
-	if s, err := operatingsystem.GetOperatingSystem(); err != nil {
-		logrus.Warnf("Could not get operating system name: %v", err)
-	} else {
-		operatingSystem = s
-	}
-
-	// Don't do containerized check on Windows
-	if runtime.GOOS != "windows" {
-		if inContainer, err := operatingsystem.IsContainerized(); err != nil {
-			logrus.Errorf("Could not determine if daemon is containerized: %v", err)
-			operatingSystem += " (error determining if containerized)"
-		} else if inContainer {
-			operatingSystem += " (containerized)"
-		}
-	}
-
-	meminfo, err := system.ReadMemInfo()
-	if err != nil {
-		logrus.Errorf("Could not read system memory info: %v", err)
-		meminfo = &system.MemInfo{}
-	}
-
-	sysInfo := sysinfo.New(true)
-
-	var cRunning, cPaused, cStopped int32
-	daemon.containers.ApplyAll(func(c *container.Container) {
-		switch c.StateString() {
-		case "paused":
-			atomic.AddInt32(&cPaused, 1)
-		case "running":
-			atomic.AddInt32(&cRunning, 1)
-		default:
-			atomic.AddInt32(&cStopped, 1)
-		}
-	})
-
-	securityOptions := []string{}
-	if sysInfo.AppArmor {
-		securityOptions = append(securityOptions, "name=apparmor")
-	}
-	if sysInfo.Seccomp && supportsSeccomp {
-		profile := daemon.seccompProfilePath
-		if profile == "" {
-			profile = "default"
-		}
-		securityOptions = append(securityOptions, fmt.Sprintf("name=seccomp,profile=%s", profile))
-	}
-	if selinuxEnabled() {
-		securityOptions = append(securityOptions, "name=selinux")
-	}
-	uid, gid := daemon.GetRemappedUIDGID()
-	if uid != 0 || gid != 0 {
-		securityOptions = append(securityOptions, "name=userns")
-	}
-
-	v := &types.Info{
-		ID:                 daemon.ID,
-		Containers:         int(cRunning + cPaused + cStopped),
-		ContainersRunning:  int(cRunning),
-		ContainersPaused:   int(cPaused),
-		ContainersStopped:  int(cStopped),
-		Images:             len(daemon.imageStore.Map()),
-		Driver:             daemon.GraphDriverName(),
-		DriverStatus:       daemon.layerStore.DriverStatus(),
-		Plugins:            daemon.showPluginsInfo(),
-		IPv4Forwarding:     !sysInfo.IPv4ForwardingDisabled,
-		BridgeNfIptables:   !sysInfo.BridgeNFCallIPTablesDisabled,
-		BridgeNfIP6tables:  !sysInfo.BridgeNFCallIP6TablesDisabled,
-		Debug:              utils.IsDebugEnabled(),
-		NFd:                fileutils.GetTotalUsedFds(),
-		NGoroutines:        runtime.NumGoroutine(),
-		SystemTime:         time.Now().Format(time.RFC3339Nano),
-		LoggingDriver:      daemon.defaultLogConfig.Type,
-		CgroupDriver:       daemon.getCgroupDriver(),
-		NEventsListener:    daemon.EventsService.SubscribersCount(),
-		KernelVersion:      kernelVersion,
-		OperatingSystem:    operatingSystem,
-		IndexServerAddress: registry.IndexServer,
-		OSType:             platform.OSType,
-		Architecture:       platform.Architecture,
-		RegistryConfig:     daemon.RegistryService.ServiceConfig(),
-		NCPU:               sysinfo.NumCPU(),
-		MemTotal:           meminfo.MemTotal,
-		DockerRootDir:      daemon.configStore.Root,
-		Labels:             daemon.configStore.Labels,
-		ExperimentalBuild:  daemon.configStore.Experimental,
-		ServerVersion:      dockerversion.Version,
-		ClusterStore:       daemon.configStore.ClusterStore,
-		ClusterAdvertise:   daemon.configStore.ClusterAdvertise,
-		HTTPProxy:          sockets.GetProxyEnv("http_proxy"),
-		HTTPSProxy:         sockets.GetProxyEnv("https_proxy"),
-		NoProxy:            sockets.GetProxyEnv("no_proxy"),
-		LiveRestoreEnabled: daemon.configStore.LiveRestoreEnabled,
-		SecurityOptions:    securityOptions,
-		Isolation:          daemon.defaultIsolation,
-	}
-
-	// Retrieve platform specific info
-	daemon.FillPlatformInfo(v, sysInfo)
-
-	hostname := ""
-	if hn, err := os.Hostname(); err != nil {
-		logrus.Warnf("Could not get hostname: %v", err)
-	} else {
-		hostname = hn
-	}
-	v.Name = hostname
-
-	return v, nil
-}
-
-// SystemVersion returns version information about the daemon.
-func (daemon *Daemon) SystemVersion() types.Version {
-	v := types.Version{
-		Version:       dockerversion.Version,
-		GitCommit:     dockerversion.GitCommit,
-		MinAPIVersion: api.MinVersion,
-		GoVersion:     runtime.Version(),
-		Os:            runtime.GOOS,
-		Arch:          runtime.GOARCH,
-		BuildTime:     dockerversion.BuildTime,
-		Experimental:  daemon.configStore.Experimental,
-	}
-
-	kernelVersion := "<unknown>"
-	if kv, err := kernel.GetKernelVersion(); err != nil {
-		logrus.Warnf("Could not get kernel version: %v", err)
-	} else {
-		kernelVersion = kv.String()
-	}
-	v.KernelVersion = kernelVersion
-
-	return v
-}
-
-func (daemon *Daemon) showPluginsInfo() types.PluginsInfo {
-	var pluginsInfo types.PluginsInfo
-
-	pluginsInfo.Volume = volumedrivers.GetDriverList()
-	pluginsInfo.Network = daemon.GetNetworkDriverList()
-	pluginsInfo.Authorization = daemon.configStore.AuthorizationPlugins
-
-	return pluginsInfo
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/info_unix.go b/installer/vendor/github.com/docker/docker/daemon/info_unix.go
deleted file mode 100644
index 9c41c0e4cd..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/info_unix.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"context"
-	"os/exec"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// FillPlatformInfo fills the platform related info.
-func (daemon *Daemon) FillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) {
-	v.MemoryLimit = sysInfo.MemoryLimit
-	v.SwapLimit = sysInfo.SwapLimit
-	v.KernelMemory = sysInfo.KernelMemory
-	v.OomKillDisable = sysInfo.OomKillDisable
-	v.CPUCfsPeriod = sysInfo.CPUCfsPeriod
-	v.CPUCfsQuota = sysInfo.CPUCfsQuota
-	v.CPUShares = sysInfo.CPUShares
-	v.CPUSet = sysInfo.Cpuset
-	v.Runtimes = daemon.configStore.GetAllRuntimes()
-	v.DefaultRuntime = daemon.configStore.GetDefaultRuntimeName()
-	v.InitBinary = daemon.configStore.GetInitPath()
-
-	v.ContainerdCommit.Expected = dockerversion.ContainerdCommitID
-	if sv, err := daemon.containerd.GetServerVersion(context.Background()); err == nil {
-		v.ContainerdCommit.ID = sv.Revision
-	} else {
-		logrus.Warnf("failed to retrieve containerd version: %v", err)
-		v.ContainerdCommit.ID = "N/A"
-	}
-
-	v.RuncCommit.Expected = dockerversion.RuncCommitID
-	if rv, err := exec.Command(DefaultRuntimeBinary, "--version").Output(); err == nil {
-		parts := strings.Split(strings.TrimSpace(string(rv)), "\n")
-		if len(parts) == 3 {
-			parts = strings.Split(parts[1], ": ")
-			if len(parts) == 2 {
-				v.RuncCommit.ID = strings.TrimSpace(parts[1])
-			}
-		}
-
-		if v.RuncCommit.ID == "" {
-			logrus.Warnf("failed to retrieve %s version: unknown output format: %s", DefaultRuntimeBinary, string(rv))
-			v.RuncCommit.ID = "N/A"
-		}
-	} else {
-		logrus.Warnf("failed to retrieve %s version: %v", DefaultRuntimeBinary, err)
-		v.RuncCommit.ID = "N/A"
-	}
-
-	v.InitCommit.Expected = dockerversion.InitCommitID
-	if rv, err := exec.Command(DefaultInitBinary, "--version").Output(); err == nil {
-		parts := strings.Split(strings.TrimSpace(string(rv)), " - ")
-		if len(parts) == 2 {
-			if dockerversion.InitCommitID[0] == 'v' {
-				vs := strings.TrimPrefix(parts[0], "tini version ")
-				v.InitCommit.ID = "v" + vs
-			} else {
-				// Get the sha1
-				gitParts := strings.Split(parts[1], ".")
-				if len(gitParts) == 2 && gitParts[0] == "git" {
-					v.InitCommit.ID = gitParts[1]
-					v.InitCommit.Expected = dockerversion.InitCommitID[0:len(gitParts[1])]
-				}
-			}
-		}
-
-		if v.InitCommit.ID == "" {
-			logrus.Warnf("failed to retrieve %s version: unknown output format: %s", DefaultInitBinary, string(rv))
-			v.InitCommit.ID = "N/A"
-		}
-	} else {
-		logrus.Warnf("failed to retrieve %s version", DefaultInitBinary)
-		v.InitCommit.ID = "N/A"
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/info_windows.go b/installer/vendor/github.com/docker/docker/daemon/info_windows.go
deleted file mode 100644
index c700911eb0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/info_windows.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// FillPlatformInfo fills the platform related info.
-func (daemon *Daemon) FillPlatformInfo(v *types.Info, sysInfo *sysinfo.SysInfo) {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_solaris.go b/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_solaris.go
deleted file mode 100644
index 66d53f0eef..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_solaris.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build solaris,cgo
-
-package initlayer
-
-// Setup populates a directory with mountpoints suitable
-// for bind-mounting dockerinit into the container. The mountpoint is simply an
-// empty file at /.dockerinit
-//
-// This extra layer is used by all containers as the top-most ro layer. It protects
-// the container from unwanted side-effects on the rw layer.
-func Setup(initLayer string, rootUID, rootGID int) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_unix.go b/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_unix.go
deleted file mode 100644
index e83c2751ed..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_unix.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// +build linux freebsd
-
-package initlayer
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"github.com/docker/docker/pkg/idtools"
-)
-
-// Setup populates a directory with mountpoints suitable
-// for bind-mounting things into the container.
-//
-// This extra layer is used by all containers as the top-most ro layer. It protects
-// the container from unwanted side-effects on the rw layer.
-func Setup(initLayer string, rootUID, rootGID int) error {
-	for pth, typ := range map[string]string{
-		"/dev/pts":         "dir",
-		"/dev/shm":         "dir",
-		"/proc":            "dir",
-		"/sys":             "dir",
-		"/.dockerenv":      "file",
-		"/etc/resolv.conf": "file",
-		"/etc/hosts":       "file",
-		"/etc/hostname":    "file",
-		"/dev/console":     "file",
-		"/etc/mtab":        "/proc/mounts",
-	} {
-		parts := strings.Split(pth, "/")
-		prev := "/"
-		for _, p := range parts[1:] {
-			prev = filepath.Join(prev, p)
-			syscall.Unlink(filepath.Join(initLayer, prev))
-		}
-
-		if _, err := os.Stat(filepath.Join(initLayer, pth)); err != nil {
-			if os.IsNotExist(err) {
-				if err := idtools.MkdirAllNewAs(filepath.Join(initLayer, filepath.Dir(pth)), 0755, rootUID, rootGID); err != nil {
-					return err
-				}
-				switch typ {
-				case "dir":
-					if err := idtools.MkdirAllNewAs(filepath.Join(initLayer, pth), 0755, rootUID, rootGID); err != nil {
-						return err
-					}
-				case "file":
-					f, err := os.OpenFile(filepath.Join(initLayer, pth), os.O_CREATE, 0755)
-					if err != nil {
-						return err
-					}
-					f.Chown(rootUID, rootGID)
-					f.Close()
-				default:
-					if err := os.Symlink(typ, filepath.Join(initLayer, pth)); err != nil {
-						return err
-					}
-				}
-			} else {
-				return err
-			}
-		}
-	}
-
-	// Layer is ready to use, if it wasn't before.
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_windows.go b/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_windows.go
deleted file mode 100644
index 48a9d71aa5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/initlayer/setup_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package initlayer
-
-// Setup populates a directory with mountpoints suitable
-// for bind-mounting dockerinit into the container. The mountpoint is simply an
-// empty file at /.dockerinit
-//
-// This extra layer is used by all containers as the top-most ro layer. It protects
-// the container from unwanted side-effects on the rw layer.
-func Setup(initLayer string, rootUID, rootGID int) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/inspect.go b/installer/vendor/github.com/docker/docker/daemon/inspect.go
deleted file mode 100644
index 557f639de1..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/inspect.go
+++ /dev/null
@@ -1,264 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/api/types/versions/v1p20"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/network"
-)
-
-// ContainerInspect returns low-level information about a
-// container. Returns an error if the container cannot be found, or if
-// there is an error getting the data.
-func (daemon *Daemon) ContainerInspect(name string, size bool, version string) (interface{}, error) {
-	switch {
-	case versions.LessThan(version, "1.20"):
-		return daemon.containerInspectPre120(name)
-	case versions.Equal(version, "1.20"):
-		return daemon.containerInspect120(name)
-	}
-	return daemon.ContainerInspectCurrent(name, size)
-}
-
-// ContainerInspectCurrent returns low-level information about a
-// container in a most recent api version.
-func (daemon *Daemon) ContainerInspectCurrent(name string, size bool) (*types.ContainerJSON, error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	container.Lock()
-	defer container.Unlock()
-
-	base, err := daemon.getInspectData(container, size)
-	if err != nil {
-		return nil, err
-	}
-
-	apiNetworks := make(map[string]*networktypes.EndpointSettings)
-	for name, epConf := range container.NetworkSettings.Networks {
-		if epConf.EndpointSettings != nil {
-			apiNetworks[name] = epConf.EndpointSettings
-		}
-	}
-
-	mountPoints := addMountPoints(container)
-	networkSettings := &types.NetworkSettings{
-		NetworkSettingsBase: types.NetworkSettingsBase{
-			Bridge:                 container.NetworkSettings.Bridge,
-			SandboxID:              container.NetworkSettings.SandboxID,
-			HairpinMode:            container.NetworkSettings.HairpinMode,
-			LinkLocalIPv6Address:   container.NetworkSettings.LinkLocalIPv6Address,
-			LinkLocalIPv6PrefixLen: container.NetworkSettings.LinkLocalIPv6PrefixLen,
-			Ports:                  container.NetworkSettings.Ports,
-			SandboxKey:             container.NetworkSettings.SandboxKey,
-			SecondaryIPAddresses:   container.NetworkSettings.SecondaryIPAddresses,
-			SecondaryIPv6Addresses: container.NetworkSettings.SecondaryIPv6Addresses,
-		},
-		DefaultNetworkSettings: daemon.getDefaultNetworkSettings(container.NetworkSettings.Networks),
-		Networks:               apiNetworks,
-	}
-
-	return &types.ContainerJSON{
-		ContainerJSONBase: base,
-		Mounts:            mountPoints,
-		Config:            container.Config,
-		NetworkSettings:   networkSettings,
-	}, nil
-}
-
-// containerInspect120 serializes the master version of a container into a json type.
-func (daemon *Daemon) containerInspect120(name string) (*v1p20.ContainerJSON, error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	container.Lock()
-	defer container.Unlock()
-
-	base, err := daemon.getInspectData(container, false)
-	if err != nil {
-		return nil, err
-	}
-
-	mountPoints := addMountPoints(container)
-	config := &v1p20.ContainerConfig{
-		Config:          container.Config,
-		MacAddress:      container.Config.MacAddress,
-		NetworkDisabled: container.Config.NetworkDisabled,
-		ExposedPorts:    container.Config.ExposedPorts,
-		VolumeDriver:    container.HostConfig.VolumeDriver,
-	}
-	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(container.NetworkSettings)
-
-	return &v1p20.ContainerJSON{
-		ContainerJSONBase: base,
-		Mounts:            mountPoints,
-		Config:            config,
-		NetworkSettings:   networkSettings,
-	}, nil
-}
-
-func (daemon *Daemon) getInspectData(container *container.Container, size bool) (*types.ContainerJSONBase, error) {
-	// make a copy to play with
-	hostConfig := *container.HostConfig
-
-	children := daemon.children(container)
-	hostConfig.Links = nil // do not expose the internal structure
-	for linkAlias, child := range children {
-		hostConfig.Links = append(hostConfig.Links, fmt.Sprintf("%s:%s", child.Name, linkAlias))
-	}
-
-	// We merge the Ulimits from hostConfig with daemon default
-	daemon.mergeUlimits(&hostConfig)
-
-	var containerHealth *types.Health
-	if container.State.Health != nil {
-		containerHealth = &types.Health{
-			Status:        container.State.Health.Status,
-			FailingStreak: container.State.Health.FailingStreak,
-			Log:           append([]*types.HealthcheckResult{}, container.State.Health.Log...),
-		}
-	}
-
-	containerState := &types.ContainerState{
-		Status:     container.State.StateString(),
-		Running:    container.State.Running,
-		Paused:     container.State.Paused,
-		Restarting: container.State.Restarting,
-		OOMKilled:  container.State.OOMKilled,
-		Dead:       container.State.Dead,
-		Pid:        container.State.Pid,
-		ExitCode:   container.State.ExitCode(),
-		Error:      container.State.Error(),
-		StartedAt:  container.State.StartedAt.Format(time.RFC3339Nano),
-		FinishedAt: container.State.FinishedAt.Format(time.RFC3339Nano),
-		Health:     containerHealth,
-	}
-
-	contJSONBase := &types.ContainerJSONBase{
-		ID:           container.ID,
-		Created:      container.Created.Format(time.RFC3339Nano),
-		Path:         container.Path,
-		Args:         container.Args,
-		State:        containerState,
-		Image:        container.ImageID.String(),
-		LogPath:      container.LogPath,
-		Name:         container.Name,
-		RestartCount: container.RestartCount,
-		Driver:       container.Driver,
-		MountLabel:   container.MountLabel,
-		ProcessLabel: container.ProcessLabel,
-		ExecIDs:      container.GetExecIDs(),
-		HostConfig:   &hostConfig,
-	}
-
-	var (
-		sizeRw     int64
-		sizeRootFs int64
-	)
-	if size {
-		sizeRw, sizeRootFs = daemon.getSize(container)
-		contJSONBase.SizeRw = &sizeRw
-		contJSONBase.SizeRootFs = &sizeRootFs
-	}
-
-	// Now set any platform-specific fields
-	contJSONBase = setPlatformSpecificContainerFields(container, contJSONBase)
-
-	contJSONBase.GraphDriver.Name = container.Driver
-
-	graphDriverData, err := container.RWLayer.Metadata()
-	// If container is marked as Dead, the container's graphdriver metadata
-	// could have been removed, it will cause error if we try to get the metadata,
-	// we can ignore the error if the container is dead.
-	if err != nil && !container.Dead {
-		return nil, err
-	}
-	contJSONBase.GraphDriver.Data = graphDriverData
-
-	return contJSONBase, nil
-}
-
-// ContainerExecInspect returns low-level information about the exec
-// command. An error is returned if the exec cannot be found.
-func (daemon *Daemon) ContainerExecInspect(id string) (*backend.ExecInspect, error) {
-	e, err := daemon.getExecConfig(id)
-	if err != nil {
-		return nil, err
-	}
-
-	pc := inspectExecProcessConfig(e)
-
-	return &backend.ExecInspect{
-		ID:            e.ID,
-		Running:       e.Running,
-		ExitCode:      e.ExitCode,
-		ProcessConfig: pc,
-		OpenStdin:     e.OpenStdin,
-		OpenStdout:    e.OpenStdout,
-		OpenStderr:    e.OpenStderr,
-		CanRemove:     e.CanRemove,
-		ContainerID:   e.ContainerID,
-		DetachKeys:    e.DetachKeys,
-		Pid:           e.Pid,
-	}, nil
-}
-
-// VolumeInspect looks up a volume by name. An error is returned if
-// the volume cannot be found.
-func (daemon *Daemon) VolumeInspect(name string) (*types.Volume, error) {
-	v, err := daemon.volumes.Get(name)
-	if err != nil {
-		return nil, err
-	}
-	apiV := volumeToAPIType(v)
-	apiV.Mountpoint = v.Path()
-	apiV.Status = v.Status()
-	return apiV, nil
-}
-
-func (daemon *Daemon) getBackwardsCompatibleNetworkSettings(settings *network.Settings) *v1p20.NetworkSettings {
-	result := &v1p20.NetworkSettings{
-		NetworkSettingsBase: types.NetworkSettingsBase{
-			Bridge:                 settings.Bridge,
-			SandboxID:              settings.SandboxID,
-			HairpinMode:            settings.HairpinMode,
-			LinkLocalIPv6Address:   settings.LinkLocalIPv6Address,
-			LinkLocalIPv6PrefixLen: settings.LinkLocalIPv6PrefixLen,
-			Ports:                  settings.Ports,
-			SandboxKey:             settings.SandboxKey,
-			SecondaryIPAddresses:   settings.SecondaryIPAddresses,
-			SecondaryIPv6Addresses: settings.SecondaryIPv6Addresses,
-		},
-		DefaultNetworkSettings: daemon.getDefaultNetworkSettings(settings.Networks),
-	}
-
-	return result
-}
-
-// getDefaultNetworkSettings creates the deprecated structure that holds the information
-// about the bridge network for a container.
-func (daemon *Daemon) getDefaultNetworkSettings(networks map[string]*network.EndpointSettings) types.DefaultNetworkSettings {
-	var settings types.DefaultNetworkSettings
-
-	if defaultNetwork, ok := networks["bridge"]; ok && defaultNetwork.EndpointSettings != nil {
-		settings.EndpointID = defaultNetwork.EndpointID
-		settings.Gateway = defaultNetwork.Gateway
-		settings.GlobalIPv6Address = defaultNetwork.GlobalIPv6Address
-		settings.GlobalIPv6PrefixLen = defaultNetwork.GlobalIPv6PrefixLen
-		settings.IPAddress = defaultNetwork.IPAddress
-		settings.IPPrefixLen = defaultNetwork.IPPrefixLen
-		settings.IPv6Gateway = defaultNetwork.IPv6Gateway
-		settings.MacAddress = defaultNetwork.MacAddress
-	}
-	return settings
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/inspect_solaris.go b/installer/vendor/github.com/docker/docker/daemon/inspect_solaris.go
deleted file mode 100644
index 0e3dcc1119..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/inspect_solaris.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/versions/v1p19"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-)
-
-// This sets platform-specific fields
-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
-	return contJSONBase
-}
-
-// containerInspectPre120 get containers for pre 1.20 APIs.
-func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {
-	return &v1p19.ContainerJSON{}, nil
-}
-
-func addMountPoints(container *container.Container) []types.MountPoint {
-	mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
-	for _, m := range container.MountPoints {
-		mountPoints = append(mountPoints, types.MountPoint{
-			Name:        m.Name,
-			Source:      m.Path(),
-			Destination: m.Destination,
-			Driver:      m.Driver,
-			RW:          m.RW,
-		})
-	}
-	return mountPoints
-}
-
-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {
-	return &backend.ExecProcessConfig{
-		Tty:        e.Tty,
-		Entrypoint: e.Entrypoint,
-		Arguments:  e.Args,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/inspect_unix.go b/installer/vendor/github.com/docker/docker/daemon/inspect_unix.go
deleted file mode 100644
index 08a82235ad..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/inspect_unix.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// +build !windows,!solaris
-
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/versions/v1p19"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-)
-
-// This sets platform-specific fields
-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
-	contJSONBase.AppArmorProfile = container.AppArmorProfile
-	contJSONBase.ResolvConfPath = container.ResolvConfPath
-	contJSONBase.HostnamePath = container.HostnamePath
-	contJSONBase.HostsPath = container.HostsPath
-
-	return contJSONBase
-}
-
-// containerInspectPre120 gets containers for pre 1.20 APIs.
-func (daemon *Daemon) containerInspectPre120(name string) (*v1p19.ContainerJSON, error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	container.Lock()
-	defer container.Unlock()
-
-	base, err := daemon.getInspectData(container, false)
-	if err != nil {
-		return nil, err
-	}
-
-	volumes := make(map[string]string)
-	volumesRW := make(map[string]bool)
-	for _, m := range container.MountPoints {
-		volumes[m.Destination] = m.Path()
-		volumesRW[m.Destination] = m.RW
-	}
-
-	config := &v1p19.ContainerConfig{
-		Config:          container.Config,
-		MacAddress:      container.Config.MacAddress,
-		NetworkDisabled: container.Config.NetworkDisabled,
-		ExposedPorts:    container.Config.ExposedPorts,
-		VolumeDriver:    container.HostConfig.VolumeDriver,
-		Memory:          container.HostConfig.Memory,
-		MemorySwap:      container.HostConfig.MemorySwap,
-		CPUShares:       container.HostConfig.CPUShares,
-		CPUSet:          container.HostConfig.CpusetCpus,
-	}
-	networkSettings := daemon.getBackwardsCompatibleNetworkSettings(container.NetworkSettings)
-
-	return &v1p19.ContainerJSON{
-		ContainerJSONBase: base,
-		Volumes:           volumes,
-		VolumesRW:         volumesRW,
-		Config:            config,
-		NetworkSettings:   networkSettings,
-	}, nil
-}
-
-func addMountPoints(container *container.Container) []types.MountPoint {
-	mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
-	for _, m := range container.MountPoints {
-		mountPoints = append(mountPoints, types.MountPoint{
-			Type:        m.Type,
-			Name:        m.Name,
-			Source:      m.Path(),
-			Destination: m.Destination,
-			Driver:      m.Driver,
-			Mode:        m.Mode,
-			RW:          m.RW,
-			Propagation: m.Propagation,
-		})
-	}
-	return mountPoints
-}
-
-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {
-	return &backend.ExecProcessConfig{
-		Tty:        e.Tty,
-		Entrypoint: e.Entrypoint,
-		Arguments:  e.Args,
-		Privileged: &e.Privileged,
-		User:       e.User,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/inspect_windows.go b/installer/vendor/github.com/docker/docker/daemon/inspect_windows.go
deleted file mode 100644
index b331c83ca3..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/inspect_windows.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/exec"
-)
-
-// This sets platform-specific fields
-func setPlatformSpecificContainerFields(container *container.Container, contJSONBase *types.ContainerJSONBase) *types.ContainerJSONBase {
-	return contJSONBase
-}
-
-func addMountPoints(container *container.Container) []types.MountPoint {
-	mountPoints := make([]types.MountPoint, 0, len(container.MountPoints))
-	for _, m := range container.MountPoints {
-		mountPoints = append(mountPoints, types.MountPoint{
-			Type:        m.Type,
-			Name:        m.Name,
-			Source:      m.Path(),
-			Destination: m.Destination,
-			Driver:      m.Driver,
-			RW:          m.RW,
-		})
-	}
-	return mountPoints
-}
-
-// containerInspectPre120 get containers for pre 1.20 APIs.
-func (daemon *Daemon) containerInspectPre120(name string) (*types.ContainerJSON, error) {
-	return daemon.ContainerInspectCurrent(name, false)
-}
-
-func inspectExecProcessConfig(e *exec.Config) *backend.ExecProcessConfig {
-	return &backend.ExecProcessConfig{
-		Tty:        e.Tty,
-		Entrypoint: e.Entrypoint,
-		Arguments:  e.Args,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/keys.go b/installer/vendor/github.com/docker/docker/daemon/keys.go
deleted file mode 100644
index 055d488a5d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/keys.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build linux
-
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"strings"
-)
-
-const (
-	rootKeyFile   = "/proc/sys/kernel/keys/root_maxkeys"
-	rootBytesFile = "/proc/sys/kernel/keys/root_maxbytes"
-	rootKeyLimit  = 1000000
-	// it is standard configuration to allocate 25 bytes per key
-	rootKeyByteMultiplier = 25
-)
-
-// ModifyRootKeyLimit checks to see if the root key limit is set to
-// at least 1000000 and changes it to that limit along with the maxbytes
-// allocated to the keys at a 25 to 1 multiplier.
-func ModifyRootKeyLimit() error {
-	value, err := readRootKeyLimit(rootKeyFile)
-	if err != nil {
-		return err
-	}
-	if value < rootKeyLimit {
-		return setRootKeyLimit(rootKeyLimit)
-	}
-	return nil
-}
-
-func setRootKeyLimit(limit int) error {
-	keys, err := os.OpenFile(rootKeyFile, os.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-	defer keys.Close()
-	if _, err := fmt.Fprintf(keys, "%d", limit); err != nil {
-		return err
-	}
-	bytes, err := os.OpenFile(rootBytesFile, os.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-	defer bytes.Close()
-	_, err = fmt.Fprintf(bytes, "%d", limit*rootKeyByteMultiplier)
-	return err
-}
-
-func readRootKeyLimit(path string) (int, error) {
-	data, err := ioutil.ReadFile(path)
-	if err != nil {
-		return -1, err
-	}
-	return strconv.Atoi(strings.Trim(string(data), "\n"))
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/keys_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/keys_unsupported.go
deleted file mode 100644
index b17255940a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/keys_unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !linux
-
-package daemon
-
-// ModifyRootKeyLimit is an noop on unsupported platforms.
-func ModifyRootKeyLimit() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/kill.go b/installer/vendor/github.com/docker/docker/daemon/kill.go
deleted file mode 100644
index 18d5bbb4e5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/kill.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/signal"
-)
-
-type errNoSuchProcess struct {
-	pid    int
-	signal int
-}
-
-func (e errNoSuchProcess) Error() string {
-	return fmt.Sprintf("Cannot kill process (pid=%d) with signal %d: no such process.", e.pid, e.signal)
-}
-
-// isErrNoSuchProcess returns true if the error
-// is an instance of errNoSuchProcess.
-func isErrNoSuchProcess(err error) bool {
-	_, ok := err.(errNoSuchProcess)
-	return ok
-}
-
-// ContainerKill sends signal to the container
-// If no signal is given (sig 0), then Kill with SIGKILL and wait
-// for the container to exit.
-// If a signal is given, then just send it to the container and return.
-func (daemon *Daemon) ContainerKill(name string, sig uint64) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if sig != 0 && !signal.ValidSignalForPlatform(syscall.Signal(sig)) {
-		return fmt.Errorf("The %s daemon does not support signal %d", runtime.GOOS, sig)
-	}
-
-	// If no signal is passed, or SIGKILL, perform regular Kill (SIGKILL + wait())
-	if sig == 0 || syscall.Signal(sig) == syscall.SIGKILL {
-		return daemon.Kill(container)
-	}
-	return daemon.killWithSignal(container, int(sig))
-}
-
-// killWithSignal sends the container the given signal. This wrapper for the
-// host specific kill command prepares the container before attempting
-// to send the signal. An error is returned if the container is paused
-// or not running, or if there is a problem returned from the
-// underlying kill command.
-func (daemon *Daemon) killWithSignal(container *container.Container, sig int) error {
-	logrus.Debugf("Sending kill signal %d to container %s", sig, container.ID)
-	container.Lock()
-	defer container.Unlock()
-
-	// We could unpause the container for them rather than returning this error
-	if container.Paused {
-		return fmt.Errorf("Container %s is paused. Unpause the container before stopping", container.ID)
-	}
-
-	if !container.Running {
-		return errNotRunning{container.ID}
-	}
-
-	if container.Config.StopSignal != "" {
-		containerStopSignal, err := signal.ParseSignal(container.Config.StopSignal)
-		if err != nil {
-			return err
-		}
-		if containerStopSignal == syscall.Signal(sig) {
-			container.ExitOnNext()
-		}
-	} else {
-		container.ExitOnNext()
-	}
-
-	if !daemon.IsShuttingDown() {
-		container.HasBeenManuallyStopped = true
-	}
-
-	// if the container is currently restarting we do not need to send the signal
-	// to the process. Telling the monitor that it should exit on its next event
-	// loop is enough
-	if container.Restarting {
-		return nil
-	}
-
-	if err := daemon.kill(container, sig); err != nil {
-		err = fmt.Errorf("Cannot kill container %s: %s", container.ID, err)
-		// if container or process not exists, ignore the error
-		if strings.Contains(err.Error(), "container not found") ||
-			strings.Contains(err.Error(), "no such process") {
-			logrus.Warnf("container kill failed because of 'container not found' or 'no such process': %s", err.Error())
-		} else {
-			return err
-		}
-	}
-
-	attributes := map[string]string{
-		"signal": fmt.Sprintf("%d", sig),
-	}
-	daemon.LogContainerEventWithAttributes(container, "kill", attributes)
-	return nil
-}
-
-// Kill forcefully terminates a container.
-func (daemon *Daemon) Kill(container *container.Container) error {
-	if !container.IsRunning() {
-		return errNotRunning{container.ID}
-	}
-
-	// 1. Send SIGKILL
-	if err := daemon.killPossiblyDeadProcess(container, int(syscall.SIGKILL)); err != nil {
-		// While normally we might "return err" here we're not going to
-		// because if we can't stop the container by this point then
-		// its probably because its already stopped. Meaning, between
-		// the time of the IsRunning() call above and now it stopped.
-		// Also, since the err return will be environment specific we can't
-		// look for any particular (common) error that would indicate
-		// that the process is already dead vs something else going wrong.
-		// So, instead we'll give it up to 2 more seconds to complete and if
-		// by that time the container is still running, then the error
-		// we got is probably valid and so we return it to the caller.
-		if isErrNoSuchProcess(err) {
-			return nil
-		}
-
-		if _, err2 := container.WaitStop(2 * time.Second); err2 != nil {
-			return err
-		}
-	}
-
-	// 2. Wait for the process to die, in last resort, try to kill the process directly
-	if err := killProcessDirectly(container); err != nil {
-		if isErrNoSuchProcess(err) {
-			return nil
-		}
-		return err
-	}
-
-	container.WaitStop(-1 * time.Second)
-	return nil
-}
-
-// killPossibleDeadProcess is a wrapper around killSig() suppressing "no such process" error.
-func (daemon *Daemon) killPossiblyDeadProcess(container *container.Container, sig int) error {
-	err := daemon.killWithSignal(container, sig)
-	if err == syscall.ESRCH {
-		e := errNoSuchProcess{container.GetPID(), sig}
-		logrus.Debug(e)
-		return e
-	}
-	return err
-}
-
-func (daemon *Daemon) kill(c *container.Container, sig int) error {
-	return daemon.containerd.Signal(c.ID, sig)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links.go b/installer/vendor/github.com/docker/docker/daemon/links.go
deleted file mode 100644
index 7f691d4f16..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package daemon
-
-import (
-	"sync"
-
-	"github.com/docker/docker/container"
-)
-
-// linkIndex stores link relationships between containers, including their specified alias
-// The alias is the name the parent uses to reference the child
-type linkIndex struct {
-	// idx maps a parent->alias->child relationship
-	idx map[*container.Container]map[string]*container.Container
-	// childIdx maps  child->parent->aliases
-	childIdx map[*container.Container]map[*container.Container]map[string]struct{}
-	mu       sync.Mutex
-}
-
-func newLinkIndex() *linkIndex {
-	return &linkIndex{
-		idx:      make(map[*container.Container]map[string]*container.Container),
-		childIdx: make(map[*container.Container]map[*container.Container]map[string]struct{}),
-	}
-}
-
-// link adds indexes for the passed in parent/child/alias relationships
-func (l *linkIndex) link(parent, child *container.Container, alias string) {
-	l.mu.Lock()
-
-	if l.idx[parent] == nil {
-		l.idx[parent] = make(map[string]*container.Container)
-	}
-	l.idx[parent][alias] = child
-	if l.childIdx[child] == nil {
-		l.childIdx[child] = make(map[*container.Container]map[string]struct{})
-	}
-	if l.childIdx[child][parent] == nil {
-		l.childIdx[child][parent] = make(map[string]struct{})
-	}
-	l.childIdx[child][parent][alias] = struct{}{}
-
-	l.mu.Unlock()
-}
-
-// unlink removes the requested alias for the given parent/child
-func (l *linkIndex) unlink(alias string, child, parent *container.Container) {
-	l.mu.Lock()
-	delete(l.idx[parent], alias)
-	delete(l.childIdx[child], parent)
-	l.mu.Unlock()
-}
-
-// children maps all the aliases-> children for the passed in parent
-// aliases here are the aliases the parent uses to refer to the child
-func (l *linkIndex) children(parent *container.Container) map[string]*container.Container {
-	l.mu.Lock()
-	children := l.idx[parent]
-	l.mu.Unlock()
-	return children
-}
-
-// parents maps all the aliases->parent for the passed in child
-// aliases here are the aliases the parents use to refer to the child
-func (l *linkIndex) parents(child *container.Container) map[string]*container.Container {
-	l.mu.Lock()
-
-	parents := make(map[string]*container.Container)
-	for parent, aliases := range l.childIdx[child] {
-		for alias := range aliases {
-			parents[alias] = parent
-		}
-	}
-
-	l.mu.Unlock()
-	return parents
-}
-
-// delete deletes all link relationships referencing this container
-func (l *linkIndex) delete(container *container.Container) {
-	l.mu.Lock()
-	for _, child := range l.idx[container] {
-		delete(l.childIdx[child], container)
-	}
-	delete(l.idx, container)
-	delete(l.childIdx, container)
-	l.mu.Unlock()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links/links.go b/installer/vendor/github.com/docker/docker/daemon/links/links.go
deleted file mode 100644
index af15de046d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links/links.go
+++ /dev/null
@@ -1,141 +0,0 @@
-package links
-
-import (
-	"fmt"
-	"path"
-	"strings"
-
-	"github.com/docker/go-connections/nat"
-)
-
-// Link struct holds informations about parent/child linked container
-type Link struct {
-	// Parent container IP address
-	ParentIP string
-	// Child container IP address
-	ChildIP string
-	// Link name
-	Name string
-	// Child environments variables
-	ChildEnvironment []string
-	// Child exposed ports
-	Ports []nat.Port
-}
-
-// NewLink initializes a new Link struct with the provided options.
-func NewLink(parentIP, childIP, name string, env []string, exposedPorts map[nat.Port]struct{}) *Link {
-	var (
-		i     int
-		ports = make([]nat.Port, len(exposedPorts))
-	)
-
-	for p := range exposedPorts {
-		ports[i] = p
-		i++
-	}
-
-	return &Link{
-		Name:             name,
-		ChildIP:          childIP,
-		ParentIP:         parentIP,
-		ChildEnvironment: env,
-		Ports:            ports,
-	}
-}
-
-// ToEnv creates a string's slice containing child container informations in
-// the form of environment variables which will be later exported on container
-// startup.
-func (l *Link) ToEnv() []string {
-	env := []string{}
-
-	_, n := path.Split(l.Name)
-	alias := strings.Replace(strings.ToUpper(n), "-", "_", -1)
-
-	if p := l.getDefaultPort(); p != nil {
-		env = append(env, fmt.Sprintf("%s_PORT=%s://%s:%s", alias, p.Proto(), l.ChildIP, p.Port()))
-	}
-
-	//sort the ports so that we can bulk the continuous ports together
-	nat.Sort(l.Ports, func(ip, jp nat.Port) bool {
-		// If the two ports have the same number, tcp takes priority
-		// Sort in desc order
-		return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && strings.ToLower(ip.Proto()) == "tcp")
-	})
-
-	for i := 0; i < len(l.Ports); {
-		p := l.Ports[i]
-		j := nextContiguous(l.Ports, p.Int(), i)
-		if j > i+1 {
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_START=%s://%s:%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto(), l.ChildIP, p.Port()))
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_ADDR=%s", alias, p.Port(), strings.ToUpper(p.Proto()), l.ChildIP))
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PROTO=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto()))
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PORT_START=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Port()))
-
-			q := l.Ports[j]
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_END=%s://%s:%s", alias, p.Port(), strings.ToUpper(q.Proto()), q.Proto(), l.ChildIP, q.Port()))
-			env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PORT_END=%s", alias, p.Port(), strings.ToUpper(q.Proto()), q.Port()))
-
-			i = j + 1
-			continue
-		} else {
-			i++
-		}
-	}
-	for _, p := range l.Ports {
-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s=%s://%s:%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto(), l.ChildIP, p.Port()))
-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_ADDR=%s", alias, p.Port(), strings.ToUpper(p.Proto()), l.ChildIP))
-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PORT=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Port()))
-		env = append(env, fmt.Sprintf("%s_PORT_%s_%s_PROTO=%s", alias, p.Port(), strings.ToUpper(p.Proto()), p.Proto()))
-	}
-
-	// Load the linked container's name into the environment
-	env = append(env, fmt.Sprintf("%s_NAME=%s", alias, l.Name))
-
-	if l.ChildEnvironment != nil {
-		for _, v := range l.ChildEnvironment {
-			parts := strings.SplitN(v, "=", 2)
-			if len(parts) < 2 {
-				continue
-			}
-			// Ignore a few variables that are added during docker build (and not really relevant to linked containers)
-			if parts[0] == "HOME" || parts[0] == "PATH" {
-				continue
-			}
-			env = append(env, fmt.Sprintf("%s_ENV_%s=%s", alias, parts[0], parts[1]))
-		}
-	}
-	return env
-}
-
-func nextContiguous(ports []nat.Port, value int, index int) int {
-	if index+1 == len(ports) {
-		return index
-	}
-	for i := index + 1; i < len(ports); i++ {
-		if ports[i].Int() > value+1 {
-			return i - 1
-		}
-
-		value++
-	}
-	return len(ports) - 1
-}
-
-// Default port rules
-func (l *Link) getDefaultPort() *nat.Port {
-	var p nat.Port
-	i := len(l.Ports)
-
-	if i == 0 {
-		return nil
-	} else if i > 1 {
-		nat.Sort(l.Ports, func(ip, jp nat.Port) bool {
-			// If the two ports have the same number, tcp takes priority
-			// Sort in desc order
-			return ip.Int() < jp.Int() || (ip.Int() == jp.Int() && strings.ToLower(ip.Proto()) == "tcp")
-		})
-	}
-	p = l.Ports[0]
-	return &p
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links/links_test.go b/installer/vendor/github.com/docker/docker/daemon/links/links_test.go
deleted file mode 100644
index 0273f13cf0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links/links_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package links
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"github.com/docker/go-connections/nat"
-)
-
-// Just to make life easier
-func newPortNoError(proto, port string) nat.Port {
-	p, _ := nat.NewPort(proto, port)
-	return p
-}
-
-func TestLinkNaming(t *testing.T) {
-	ports := make(nat.PortSet)
-	ports[newPortNoError("tcp", "6379")] = struct{}{}
-
-	link := NewLink("172.0.17.3", "172.0.17.2", "/db/docker-1", nil, ports)
-
-	rawEnv := link.ToEnv()
-	env := make(map[string]string, len(rawEnv))
-	for _, e := range rawEnv {
-		parts := strings.Split(e, "=")
-		if len(parts) != 2 {
-			t.FailNow()
-		}
-		env[parts[0]] = parts[1]
-	}
-
-	value, ok := env["DOCKER_1_PORT"]
-
-	if !ok {
-		t.Fatalf("DOCKER_1_PORT not found in env")
-	}
-
-	if value != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_1_PORT"])
-	}
-}
-
-func TestLinkNew(t *testing.T) {
-	ports := make(nat.PortSet)
-	ports[newPortNoError("tcp", "6379")] = struct{}{}
-
-	link := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", nil, ports)
-
-	if link.Name != "/db/docker" {
-		t.Fail()
-	}
-	if link.ParentIP != "172.0.17.3" {
-		t.Fail()
-	}
-	if link.ChildIP != "172.0.17.2" {
-		t.Fail()
-	}
-	for _, p := range link.Ports {
-		if p != newPortNoError("tcp", "6379") {
-			t.Fail()
-		}
-	}
-}
-
-func TestLinkEnv(t *testing.T) {
-	ports := make(nat.PortSet)
-	ports[newPortNoError("tcp", "6379")] = struct{}{}
-
-	link := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, ports)
-
-	rawEnv := link.ToEnv()
-	env := make(map[string]string, len(rawEnv))
-	for _, e := range rawEnv {
-		parts := strings.Split(e, "=")
-		if len(parts) != 2 {
-			t.FailNow()
-		}
-		env[parts[0]] = parts[1]
-	}
-	if env["DOCKER_PORT"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_PORT"])
-	}
-	if env["DOCKER_PORT_6379_TCP"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected tcp://172.0.17.2:6379, got %s", env["DOCKER_PORT_6379_TCP"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PROTO"] != "tcp" {
-		t.Fatalf("Expected tcp, got %s", env["DOCKER_PORT_6379_TCP_PROTO"])
-	}
-	if env["DOCKER_PORT_6379_TCP_ADDR"] != "172.0.17.2" {
-		t.Fatalf("Expected 172.0.17.2, got %s", env["DOCKER_PORT_6379_TCP_ADDR"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PORT"] != "6379" {
-		t.Fatalf("Expected 6379, got %s", env["DOCKER_PORT_6379_TCP_PORT"])
-	}
-	if env["DOCKER_NAME"] != "/db/docker" {
-		t.Fatalf("Expected /db/docker, got %s", env["DOCKER_NAME"])
-	}
-	if env["DOCKER_ENV_PASSWORD"] != "gordon" {
-		t.Fatalf("Expected gordon, got %s", env["DOCKER_ENV_PASSWORD"])
-	}
-}
-
-func TestLinkMultipleEnv(t *testing.T) {
-	ports := make(nat.PortSet)
-	ports[newPortNoError("tcp", "6379")] = struct{}{}
-	ports[newPortNoError("tcp", "6380")] = struct{}{}
-	ports[newPortNoError("tcp", "6381")] = struct{}{}
-
-	link := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, ports)
-
-	rawEnv := link.ToEnv()
-	env := make(map[string]string, len(rawEnv))
-	for _, e := range rawEnv {
-		parts := strings.Split(e, "=")
-		if len(parts) != 2 {
-			t.FailNow()
-		}
-		env[parts[0]] = parts[1]
-	}
-	if env["DOCKER_PORT"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_PORT"])
-	}
-	if env["DOCKER_PORT_6379_TCP_START"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected tcp://172.0.17.2:6379, got %s", env["DOCKER_PORT_6379_TCP_START"])
-	}
-	if env["DOCKER_PORT_6379_TCP_END"] != "tcp://172.0.17.2:6381" {
-		t.Fatalf("Expected tcp://172.0.17.2:6381, got %s", env["DOCKER_PORT_6379_TCP_END"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PROTO"] != "tcp" {
-		t.Fatalf("Expected tcp, got %s", env["DOCKER_PORT_6379_TCP_PROTO"])
-	}
-	if env["DOCKER_PORT_6379_TCP_ADDR"] != "172.0.17.2" {
-		t.Fatalf("Expected 172.0.17.2, got %s", env["DOCKER_PORT_6379_TCP_ADDR"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PORT_START"] != "6379" {
-		t.Fatalf("Expected 6379, got %s", env["DOCKER_PORT_6379_TCP_PORT_START"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PORT_END"] != "6381" {
-		t.Fatalf("Expected 6381, got %s", env["DOCKER_PORT_6379_TCP_PORT_END"])
-	}
-	if env["DOCKER_NAME"] != "/db/docker" {
-		t.Fatalf("Expected /db/docker, got %s", env["DOCKER_NAME"])
-	}
-	if env["DOCKER_ENV_PASSWORD"] != "gordon" {
-		t.Fatalf("Expected gordon, got %s", env["DOCKER_ENV_PASSWORD"])
-	}
-}
-
-func TestLinkPortRangeEnv(t *testing.T) {
-	ports := make(nat.PortSet)
-	ports[newPortNoError("tcp", "6379")] = struct{}{}
-	ports[newPortNoError("tcp", "6380")] = struct{}{}
-	ports[newPortNoError("tcp", "6381")] = struct{}{}
-
-	link := NewLink("172.0.17.3", "172.0.17.2", "/db/docker", []string{"PASSWORD=gordon"}, ports)
-
-	rawEnv := link.ToEnv()
-	env := make(map[string]string, len(rawEnv))
-	for _, e := range rawEnv {
-		parts := strings.Split(e, "=")
-		if len(parts) != 2 {
-			t.FailNow()
-		}
-		env[parts[0]] = parts[1]
-	}
-
-	if env["DOCKER_PORT"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected 172.0.17.2:6379, got %s", env["DOCKER_PORT"])
-	}
-	if env["DOCKER_PORT_6379_TCP_START"] != "tcp://172.0.17.2:6379" {
-		t.Fatalf("Expected tcp://172.0.17.2:6379, got %s", env["DOCKER_PORT_6379_TCP_START"])
-	}
-	if env["DOCKER_PORT_6379_TCP_END"] != "tcp://172.0.17.2:6381" {
-		t.Fatalf("Expected tcp://172.0.17.2:6381, got %s", env["DOCKER_PORT_6379_TCP_END"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PROTO"] != "tcp" {
-		t.Fatalf("Expected tcp, got %s", env["DOCKER_PORT_6379_TCP_PROTO"])
-	}
-	if env["DOCKER_PORT_6379_TCP_ADDR"] != "172.0.17.2" {
-		t.Fatalf("Expected 172.0.17.2, got %s", env["DOCKER_PORT_6379_TCP_ADDR"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PORT_START"] != "6379" {
-		t.Fatalf("Expected 6379, got %s", env["DOCKER_PORT_6379_TCP_PORT_START"])
-	}
-	if env["DOCKER_PORT_6379_TCP_PORT_END"] != "6381" {
-		t.Fatalf("Expected 6381, got %s", env["DOCKER_PORT_6379_TCP_PORT_END"])
-	}
-	if env["DOCKER_NAME"] != "/db/docker" {
-		t.Fatalf("Expected /db/docker, got %s", env["DOCKER_NAME"])
-	}
-	if env["DOCKER_ENV_PASSWORD"] != "gordon" {
-		t.Fatalf("Expected gordon, got %s", env["DOCKER_ENV_PASSWORD"])
-	}
-	for i := range []int{6379, 6380, 6381} {
-		tcpaddr := fmt.Sprintf("DOCKER_PORT_%d_TCP_ADDR", i)
-		tcpport := fmt.Sprintf("DOCKER_PORT_%d_TCP+PORT", i)
-		tcpproto := fmt.Sprintf("DOCKER_PORT_%d_TCP+PROTO", i)
-		tcp := fmt.Sprintf("DOCKER_PORT_%d_TCP", i)
-		if env[tcpaddr] == "172.0.17.2" {
-			t.Fatalf("Expected env %s  = 172.0.17.2, got %s", tcpaddr, env[tcpaddr])
-		}
-		if env[tcpport] == fmt.Sprintf("%d", i) {
-			t.Fatalf("Expected env %s  = %d, got %s", tcpport, i, env[tcpport])
-		}
-		if env[tcpproto] == "tcp" {
-			t.Fatalf("Expected env %s  = tcp, got %s", tcpproto, env[tcpproto])
-		}
-		if env[tcp] == fmt.Sprintf("tcp://172.0.17.2:%d", i) {
-			t.Fatalf("Expected env %s  = tcp://172.0.17.2:%d, got %s", tcp, i, env[tcp])
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links_linux.go b/installer/vendor/github.com/docker/docker/daemon/links_linux.go
deleted file mode 100644
index 2ea40d9e51..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links_linux.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/graphdb"
-)
-
-// migrateLegacySqliteLinks migrates sqlite links to use links from HostConfig
-// when sqlite links were used, hostConfig.Links was set to nil
-func (daemon *Daemon) migrateLegacySqliteLinks(db *graphdb.Database, container *container.Container) error {
-	// if links is populated (or an empty slice), then this isn't using sqlite links and can be skipped
-	if container.HostConfig == nil || container.HostConfig.Links != nil {
-		return nil
-	}
-
-	logrus.Debugf("migrating legacy sqlite link info for container: %s", container.ID)
-
-	fullName := container.Name
-	if fullName[0] != '/' {
-		fullName = "/" + fullName
-	}
-
-	// don't use a nil slice, this ensures that the check above will skip once the migration has completed
-	links := []string{}
-	children, err := db.Children(fullName, 0)
-	if err != nil {
-		if !strings.Contains(err.Error(), "Cannot find child for") {
-			return err
-		}
-		// else continue... it's ok if we didn't find any children, it'll just be nil and we can continue the migration
-	}
-
-	for _, child := range children {
-		c, err := daemon.GetContainer(child.Entity.ID())
-		if err != nil {
-			return err
-		}
-
-		links = append(links, c.Name+":"+child.Edge.Name)
-	}
-
-	container.HostConfig.Links = links
-	return container.WriteHostConfig()
-}
-
-// sqliteMigration performs the link graph DB migration.
-func (daemon *Daemon) sqliteMigration(containers map[string]*container.Container) error {
-	// migrate any legacy links from sqlite
-	linkdbFile := filepath.Join(daemon.root, "linkgraph.db")
-	var (
-		legacyLinkDB *graphdb.Database
-		err          error
-	)
-
-	legacyLinkDB, err = graphdb.NewSqliteConn(linkdbFile)
-	if err != nil {
-		return fmt.Errorf("error connecting to legacy link graph DB %s, container links may be lost: %v", linkdbFile, err)
-	}
-	defer legacyLinkDB.Close()
-
-	for _, c := range containers {
-		if err := daemon.migrateLegacySqliteLinks(legacyLinkDB, c); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links_linux_test.go b/installer/vendor/github.com/docker/docker/daemon/links_linux_test.go
deleted file mode 100644
index e2dbff2d25..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links_linux_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/graphdb"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-func TestMigrateLegacySqliteLinks(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "legacy-qlite-links-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	name1 := "test1"
-	c1 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:         stringid.GenerateNonCryptoID(),
-			Name:       name1,
-			HostConfig: &containertypes.HostConfig{},
-		},
-	}
-	c1.Root = tmpDir
-
-	name2 := "test2"
-	c2 := &container.Container{
-		CommonContainer: container.CommonContainer{
-			ID:   stringid.GenerateNonCryptoID(),
-			Name: name2,
-		},
-	}
-
-	store := container.NewMemoryStore()
-	store.Add(c1.ID, c1)
-	store.Add(c2.ID, c2)
-
-	d := &Daemon{root: tmpDir, containers: store}
-	db, err := graphdb.NewSqliteConn(filepath.Join(d.root, "linkgraph.db"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := db.Set("/"+name1, c1.ID); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := db.Set("/"+name2, c2.ID); err != nil {
-		t.Fatal(err)
-	}
-
-	alias := "hello"
-	if _, err := db.Set(path.Join(c1.Name, alias), c2.ID); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := d.migrateLegacySqliteLinks(db, c1); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(c1.HostConfig.Links) != 1 {
-		t.Fatal("expected links to be populated but is empty")
-	}
-
-	expected := name2 + ":" + alias
-	actual := c1.HostConfig.Links[0]
-	if actual != expected {
-		t.Fatalf("got wrong link value, expected: %q, got: %q", expected, actual)
-	}
-
-	// ensure this is persisted
-	b, err := ioutil.ReadFile(filepath.Join(c1.Root, "hostconfig.json"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	type hc struct {
-		Links []string
-	}
-	var cfg hc
-	if err := json.Unmarshal(b, &cfg); err != nil {
-		t.Fatal(err)
-	}
-
-	if len(cfg.Links) != 1 {
-		t.Fatalf("expected one entry in links, got: %d", len(cfg.Links))
-	}
-	if cfg.Links[0] != expected { // same expected as above
-		t.Fatalf("got wrong link value, expected: %q, got: %q", expected, cfg.Links[0])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/links_notlinux.go b/installer/vendor/github.com/docker/docker/daemon/links_notlinux.go
deleted file mode 100644
index 12c226cfac..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/links_notlinux.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !linux
-
-package daemon
-
-import "github.com/docker/docker/container"
-
-// sqliteMigration performs the link graph DB migration. No-op on platforms other than Linux
-func (daemon *Daemon) sqliteMigration(_ map[string]*container.Container) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/list.go b/installer/vendor/github.com/docker/docker/daemon/list.go
deleted file mode 100644
index 02805ea62b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/list.go
+++ /dev/null
@@ -1,660 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/volume"
-	"github.com/docker/go-connections/nat"
-)
-
-var acceptedVolumeFilterTags = map[string]bool{
-	"dangling": true,
-	"name":     true,
-	"driver":   true,
-	"label":    true,
-}
-
-var acceptedPsFilterTags = map[string]bool{
-	"ancestor":  true,
-	"before":    true,
-	"exited":    true,
-	"id":        true,
-	"isolation": true,
-	"label":     true,
-	"name":      true,
-	"status":    true,
-	"health":    true,
-	"since":     true,
-	"volume":    true,
-	"network":   true,
-	"is-task":   true,
-}
-
-// iterationAction represents possible outcomes happening during the container iteration.
-type iterationAction int
-
-// containerReducer represents a reducer for a container.
-// Returns the object to serialize by the api.
-type containerReducer func(*container.Container, *listContext) (*types.Container, error)
-
-const (
-	// includeContainer is the action to include a container in the reducer.
-	includeContainer iterationAction = iota
-	// excludeContainer is the action to exclude a container in the reducer.
-	excludeContainer
-	// stopIteration is the action to stop iterating over the list of containers.
-	stopIteration
-)
-
-// errStopIteration makes the iterator to stop without returning an error.
-var errStopIteration = errors.New("container list iteration stopped")
-
-// List returns an array of all containers registered in the daemon.
-func (daemon *Daemon) List() []*container.Container {
-	return daemon.containers.List()
-}
-
-// listContext is the daemon generated filtering to iterate over containers.
-// This is created based on the user specification from types.ContainerListOptions.
-type listContext struct {
-	// idx is the container iteration index for this context
-	idx int
-	// ancestorFilter tells whether it should check ancestors or not
-	ancestorFilter bool
-	// names is a list of container names to filter with
-	names map[string][]string
-	// images is a list of images to filter with
-	images map[image.ID]bool
-	// filters is a collection of arguments to filter with, specified by the user
-	filters filters.Args
-	// exitAllowed is a list of exit codes allowed to filter with
-	exitAllowed []int
-
-	// beforeFilter is a filter to ignore containers that appear before the one given
-	beforeFilter *container.Container
-	// sinceFilter is a filter to stop the filtering when the iterator arrive to the given container
-	sinceFilter *container.Container
-
-	// taskFilter tells if we should filter based on wether a container is part of a task
-	taskFilter bool
-	// isTask tells us if the we should filter container that are a task (true) or not (false)
-	isTask bool
-	// ContainerListOptions is the filters set by the user
-	*types.ContainerListOptions
-}
-
-// byContainerCreated is a temporary type used to sort a list of containers by creation time.
-type byContainerCreated []*container.Container
-
-func (r byContainerCreated) Len() int      { return len(r) }
-func (r byContainerCreated) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r byContainerCreated) Less(i, j int) bool {
-	return r[i].Created.UnixNano() < r[j].Created.UnixNano()
-}
-
-// Containers returns the list of containers to show given the user's filtering.
-func (daemon *Daemon) Containers(config *types.ContainerListOptions) ([]*types.Container, error) {
-	return daemon.reduceContainers(config, daemon.transformContainer)
-}
-
-func (daemon *Daemon) filterByNameIDMatches(ctx *listContext) []*container.Container {
-	idSearch := false
-	names := ctx.filters.Get("name")
-	ids := ctx.filters.Get("id")
-	if len(names)+len(ids) == 0 {
-		// if name or ID filters are not in use, return to
-		// standard behavior of walking the entire container
-		// list from the daemon's in-memory store
-		return daemon.List()
-	}
-
-	// idSearch will determine if we limit name matching to the IDs
-	// matched from any IDs which were specified as filters
-	if len(ids) > 0 {
-		idSearch = true
-	}
-
-	matches := make(map[string]bool)
-	// find ID matches; errors represent "not found" and can be ignored
-	for _, id := range ids {
-		if fullID, err := daemon.idIndex.Get(id); err == nil {
-			matches[fullID] = true
-		}
-	}
-
-	// look for name matches; if ID filtering was used, then limit the
-	// search space to the matches map only; errors represent "not found"
-	// and can be ignored
-	if len(names) > 0 {
-		for id, idNames := range ctx.names {
-			// if ID filters were used and no matches on that ID were
-			// found, continue to next ID in the list
-			if idSearch && !matches[id] {
-				continue
-			}
-			for _, eachName := range idNames {
-				if ctx.filters.Match("name", eachName) {
-					matches[id] = true
-				}
-			}
-		}
-	}
-
-	cntrs := make([]*container.Container, 0, len(matches))
-	for id := range matches {
-		if c := daemon.containers.Get(id); c != nil {
-			cntrs = append(cntrs, c)
-		}
-	}
-
-	// Restore sort-order after filtering
-	// Created gives us nanosec resolution for sorting
-	sort.Sort(sort.Reverse(byContainerCreated(cntrs)))
-
-	return cntrs
-}
-
-// reduceContainers parses the user's filtering options and generates the list of containers to return based on a reducer.
-func (daemon *Daemon) reduceContainers(config *types.ContainerListOptions, reducer containerReducer) ([]*types.Container, error) {
-	var (
-		containers = []*types.Container{}
-	)
-
-	ctx, err := daemon.foldFilter(config)
-	if err != nil {
-		return nil, err
-	}
-
-	// fastpath to only look at a subset of containers if specific name
-	// or ID matches were provided by the user--otherwise we potentially
-	// end up locking and querying many more containers than intended
-	containerList := daemon.filterByNameIDMatches(ctx)
-
-	for _, container := range containerList {
-		t, err := daemon.reducePsContainer(container, ctx, reducer)
-		if err != nil {
-			if err != errStopIteration {
-				return nil, err
-			}
-			break
-		}
-		if t != nil {
-			containers = append(containers, t)
-			ctx.idx++
-		}
-	}
-
-	return containers, nil
-}
-
-// reducePsContainer is the basic representation for a container as expected by the ps command.
-func (daemon *Daemon) reducePsContainer(container *container.Container, ctx *listContext, reducer containerReducer) (*types.Container, error) {
-	container.Lock()
-	defer container.Unlock()
-
-	// filter containers to return
-	action := includeContainerInList(container, ctx)
-	switch action {
-	case excludeContainer:
-		return nil, nil
-	case stopIteration:
-		return nil, errStopIteration
-	}
-
-	// transform internal container struct into api structs
-	return reducer(container, ctx)
-}
-
-// foldFilter generates the container filter based on the user's filtering options.
-func (daemon *Daemon) foldFilter(config *types.ContainerListOptions) (*listContext, error) {
-	psFilters := config.Filters
-
-	if err := psFilters.Validate(acceptedPsFilterTags); err != nil {
-		return nil, err
-	}
-
-	var filtExited []int
-
-	err := psFilters.WalkValues("exited", func(value string) error {
-		code, err := strconv.Atoi(value)
-		if err != nil {
-			return err
-		}
-		filtExited = append(filtExited, code)
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = psFilters.WalkValues("status", func(value string) error {
-		if !container.IsValidStateString(value) {
-			return fmt.Errorf("Unrecognised filter value for status: %s", value)
-		}
-
-		config.All = true
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	var taskFilter, isTask bool
-	if psFilters.Include("is-task") {
-		if psFilters.ExactMatch("is-task", "true") {
-			taskFilter = true
-			isTask = true
-		} else if psFilters.ExactMatch("is-task", "false") {
-			taskFilter = true
-			isTask = false
-		} else {
-			return nil, fmt.Errorf("Invalid filter 'is-task=%s'", psFilters.Get("is-task"))
-		}
-	}
-
-	err = psFilters.WalkValues("health", func(value string) error {
-		if !container.IsValidHealthString(value) {
-			return fmt.Errorf("Unrecognised filter value for health: %s", value)
-		}
-
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	var beforeContFilter, sinceContFilter *container.Container
-
-	err = psFilters.WalkValues("before", func(value string) error {
-		beforeContFilter, err = daemon.GetContainer(value)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = psFilters.WalkValues("since", func(value string) error {
-		sinceContFilter, err = daemon.GetContainer(value)
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	imagesFilter := map[image.ID]bool{}
-	var ancestorFilter bool
-	if psFilters.Include("ancestor") {
-		ancestorFilter = true
-		psFilters.WalkValues("ancestor", func(ancestor string) error {
-			id, err := daemon.GetImageID(ancestor)
-			if err != nil {
-				logrus.Warnf("Error while looking up for image %v", ancestor)
-				return nil
-			}
-			if imagesFilter[id] {
-				// Already seen this ancestor, skip it
-				return nil
-			}
-			// Then walk down the graph and put the imageIds in imagesFilter
-			populateImageFilterByParents(imagesFilter, id, daemon.imageStore.Children)
-			return nil
-		})
-	}
-
-	return &listContext{
-		filters:              psFilters,
-		ancestorFilter:       ancestorFilter,
-		images:               imagesFilter,
-		exitAllowed:          filtExited,
-		beforeFilter:         beforeContFilter,
-		sinceFilter:          sinceContFilter,
-		taskFilter:           taskFilter,
-		isTask:               isTask,
-		ContainerListOptions: config,
-		names:                daemon.nameIndex.GetAll(),
-	}, nil
-}
-
-// includeContainerInList decides whether a container should be included in the output or not based in the filter.
-// It also decides if the iteration should be stopped or not.
-func includeContainerInList(container *container.Container, ctx *listContext) iterationAction {
-	// Do not include container if it's in the list before the filter container.
-	// Set the filter container to nil to include the rest of containers after this one.
-	if ctx.beforeFilter != nil {
-		if container.ID == ctx.beforeFilter.ID {
-			ctx.beforeFilter = nil
-		}
-		return excludeContainer
-	}
-
-	// Stop iteration when the container arrives to the filter container
-	if ctx.sinceFilter != nil {
-		if container.ID == ctx.sinceFilter.ID {
-			return stopIteration
-		}
-	}
-
-	// Do not include container if it's stopped and we're not filters
-	if !container.Running && !ctx.All && ctx.Limit <= 0 {
-		return excludeContainer
-	}
-
-	// Do not include container if the name doesn't match
-	if !ctx.filters.Match("name", container.Name) {
-		return excludeContainer
-	}
-
-	// Do not include container if the id doesn't match
-	if !ctx.filters.Match("id", container.ID) {
-		return excludeContainer
-	}
-
-	if ctx.taskFilter {
-		if ctx.isTask != container.Managed {
-			return excludeContainer
-		}
-	}
-
-	// Do not include container if any of the labels don't match
-	if !ctx.filters.MatchKVList("label", container.Config.Labels) {
-		return excludeContainer
-	}
-
-	// Do not include container if isolation doesn't match
-	if excludeContainer == excludeByIsolation(container, ctx) {
-		return excludeContainer
-	}
-
-	// Stop iteration when the index is over the limit
-	if ctx.Limit > 0 && ctx.idx == ctx.Limit {
-		return stopIteration
-	}
-
-	// Do not include container if its exit code is not in the filter
-	if len(ctx.exitAllowed) > 0 {
-		shouldSkip := true
-		for _, code := range ctx.exitAllowed {
-			if code == container.ExitCode() && !container.Running && !container.StartedAt.IsZero() {
-				shouldSkip = false
-				break
-			}
-		}
-		if shouldSkip {
-			return excludeContainer
-		}
-	}
-
-	// Do not include container if its status doesn't match the filter
-	if !ctx.filters.Match("status", container.State.StateString()) {
-		return excludeContainer
-	}
-
-	// Do not include container if its health doesn't match the filter
-	if !ctx.filters.ExactMatch("health", container.State.HealthString()) {
-		return excludeContainer
-	}
-
-	if ctx.filters.Include("volume") {
-		volumesByName := make(map[string]*volume.MountPoint)
-		for _, m := range container.MountPoints {
-			if m.Name != "" {
-				volumesByName[m.Name] = m
-			} else {
-				volumesByName[m.Source] = m
-			}
-		}
-
-		volumeExist := fmt.Errorf("volume mounted in container")
-		err := ctx.filters.WalkValues("volume", func(value string) error {
-			if _, exist := container.MountPoints[value]; exist {
-				return volumeExist
-			}
-			if _, exist := volumesByName[value]; exist {
-				return volumeExist
-			}
-			return nil
-		})
-		if err != volumeExist {
-			return excludeContainer
-		}
-	}
-
-	if ctx.ancestorFilter {
-		if len(ctx.images) == 0 {
-			return excludeContainer
-		}
-		if !ctx.images[container.ImageID] {
-			return excludeContainer
-		}
-	}
-
-	networkExist := fmt.Errorf("container part of network")
-	if ctx.filters.Include("network") {
-		err := ctx.filters.WalkValues("network", func(value string) error {
-			if _, ok := container.NetworkSettings.Networks[value]; ok {
-				return networkExist
-			}
-			for _, nw := range container.NetworkSettings.Networks {
-				if nw.EndpointSettings == nil {
-					continue
-				}
-				if nw.NetworkID == value {
-					return networkExist
-				}
-			}
-			return nil
-		})
-		if err != networkExist {
-			return excludeContainer
-		}
-	}
-
-	return includeContainer
-}
-
-// transformContainer generates the container type expected by the docker ps command.
-func (daemon *Daemon) transformContainer(container *container.Container, ctx *listContext) (*types.Container, error) {
-	newC := &types.Container{
-		ID:      container.ID,
-		Names:   ctx.names[container.ID],
-		ImageID: container.ImageID.String(),
-	}
-	if newC.Names == nil {
-		// Dead containers will often have no name, so make sure the response isn't null
-		newC.Names = []string{}
-	}
-
-	image := container.Config.Image // if possible keep the original ref
-	if image != container.ImageID.String() {
-		id, err := daemon.GetImageID(image)
-		if _, isDNE := err.(ErrImageDoesNotExist); err != nil && !isDNE {
-			return nil, err
-		}
-		if err != nil || id != container.ImageID {
-			image = container.ImageID.String()
-		}
-	}
-	newC.Image = image
-
-	if len(container.Args) > 0 {
-		args := []string{}
-		for _, arg := range container.Args {
-			if strings.Contains(arg, " ") {
-				args = append(args, fmt.Sprintf("'%s'", arg))
-			} else {
-				args = append(args, arg)
-			}
-		}
-		argsAsString := strings.Join(args, " ")
-
-		newC.Command = fmt.Sprintf("%s %s", container.Path, argsAsString)
-	} else {
-		newC.Command = container.Path
-	}
-	newC.Created = container.Created.Unix()
-	newC.State = container.State.StateString()
-	newC.Status = container.State.String()
-	newC.HostConfig.NetworkMode = string(container.HostConfig.NetworkMode)
-	// copy networks to avoid races
-	networks := make(map[string]*networktypes.EndpointSettings)
-	for name, network := range container.NetworkSettings.Networks {
-		if network == nil || network.EndpointSettings == nil {
-			continue
-		}
-		networks[name] = &networktypes.EndpointSettings{
-			EndpointID:          network.EndpointID,
-			Gateway:             network.Gateway,
-			IPAddress:           network.IPAddress,
-			IPPrefixLen:         network.IPPrefixLen,
-			IPv6Gateway:         network.IPv6Gateway,
-			GlobalIPv6Address:   network.GlobalIPv6Address,
-			GlobalIPv6PrefixLen: network.GlobalIPv6PrefixLen,
-			MacAddress:          network.MacAddress,
-			NetworkID:           network.NetworkID,
-		}
-		if network.IPAMConfig != nil {
-			networks[name].IPAMConfig = &networktypes.EndpointIPAMConfig{
-				IPv4Address: network.IPAMConfig.IPv4Address,
-				IPv6Address: network.IPAMConfig.IPv6Address,
-			}
-		}
-	}
-	newC.NetworkSettings = &types.SummaryNetworkSettings{Networks: networks}
-
-	newC.Ports = []types.Port{}
-	for port, bindings := range container.NetworkSettings.Ports {
-		p, err := nat.ParsePort(port.Port())
-		if err != nil {
-			return nil, err
-		}
-		if len(bindings) == 0 {
-			newC.Ports = append(newC.Ports, types.Port{
-				PrivatePort: uint16(p),
-				Type:        port.Proto(),
-			})
-			continue
-		}
-		for _, binding := range bindings {
-			h, err := nat.ParsePort(binding.HostPort)
-			if err != nil {
-				return nil, err
-			}
-			newC.Ports = append(newC.Ports, types.Port{
-				PrivatePort: uint16(p),
-				PublicPort:  uint16(h),
-				Type:        port.Proto(),
-				IP:          binding.HostIP,
-			})
-		}
-	}
-
-	if ctx.Size {
-		sizeRw, sizeRootFs := daemon.getSize(container)
-		newC.SizeRw = sizeRw
-		newC.SizeRootFs = sizeRootFs
-	}
-	newC.Labels = container.Config.Labels
-	newC.Mounts = addMountPoints(container)
-
-	return newC, nil
-}
-
-// Volumes lists known volumes, using the filter to restrict the range
-// of volumes returned.
-func (daemon *Daemon) Volumes(filter string) ([]*types.Volume, []string, error) {
-	var (
-		volumesOut []*types.Volume
-	)
-	volFilters, err := filters.FromParam(filter)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if err := volFilters.Validate(acceptedVolumeFilterTags); err != nil {
-		return nil, nil, err
-	}
-
-	volumes, warnings, err := daemon.volumes.List()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	filterVolumes, err := daemon.filterVolumes(volumes, volFilters)
-	if err != nil {
-		return nil, nil, err
-	}
-	for _, v := range filterVolumes {
-		apiV := volumeToAPIType(v)
-		if vv, ok := v.(interface {
-			CachedPath() string
-		}); ok {
-			apiV.Mountpoint = vv.CachedPath()
-		} else {
-			apiV.Mountpoint = v.Path()
-		}
-		volumesOut = append(volumesOut, apiV)
-	}
-	return volumesOut, warnings, nil
-}
-
-// filterVolumes filters volume list according to user specified filter
-// and returns user chosen volumes
-func (daemon *Daemon) filterVolumes(vols []volume.Volume, filter filters.Args) ([]volume.Volume, error) {
-	// if filter is empty, return original volume list
-	if filter.Len() == 0 {
-		return vols, nil
-	}
-
-	var retVols []volume.Volume
-	for _, vol := range vols {
-		if filter.Include("name") {
-			if !filter.Match("name", vol.Name()) {
-				continue
-			}
-		}
-		if filter.Include("driver") {
-			if !filter.Match("driver", vol.DriverName()) {
-				continue
-			}
-		}
-		if filter.Include("label") {
-			v, ok := vol.(volume.DetailedVolume)
-			if !ok {
-				continue
-			}
-			if !filter.MatchKVList("label", v.Labels()) {
-				continue
-			}
-		}
-		retVols = append(retVols, vol)
-	}
-	danglingOnly := false
-	if filter.Include("dangling") {
-		if filter.ExactMatch("dangling", "true") || filter.ExactMatch("dangling", "1") {
-			danglingOnly = true
-		} else if !filter.ExactMatch("dangling", "false") && !filter.ExactMatch("dangling", "0") {
-			return nil, fmt.Errorf("Invalid filter 'dangling=%s'", filter.Get("dangling"))
-		}
-		retVols = daemon.volumes.FilterByUsed(retVols, !danglingOnly)
-	}
-	return retVols, nil
-}
-
-func populateImageFilterByParents(ancestorMap map[image.ID]bool, imageID image.ID, getChildren func(image.ID) []image.ID) {
-	if !ancestorMap[imageID] {
-		for _, id := range getChildren(imageID) {
-			populateImageFilterByParents(ancestorMap, id, getChildren)
-		}
-		ancestorMap[imageID] = true
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/list_unix.go b/installer/vendor/github.com/docker/docker/daemon/list_unix.go
deleted file mode 100644
index 91c9caccf4..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/list_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build linux freebsd solaris
-
-package daemon
-
-import "github.com/docker/docker/container"
-
-// excludeByIsolation is a platform specific helper function to support PS
-// filtering by Isolation. This is a Windows-only concept, so is a no-op on Unix.
-func excludeByIsolation(container *container.Container, ctx *listContext) iterationAction {
-	return includeContainer
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/list_windows.go b/installer/vendor/github.com/docker/docker/daemon/list_windows.go
deleted file mode 100644
index 7fbcd3af26..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/list_windows.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package daemon
-
-import (
-	"strings"
-
-	"github.com/docker/docker/container"
-)
-
-// excludeByIsolation is a platform specific helper function to support PS
-// filtering by Isolation. This is a Windows-only concept, so is a no-op on Unix.
-func excludeByIsolation(container *container.Container, ctx *listContext) iterationAction {
-	i := strings.ToLower(string(container.HostConfig.Isolation))
-	if i == "" {
-		i = "default"
-	}
-	if !ctx.filters.Match("isolation", i) {
-		return excludeContainer
-	}
-	return includeContainer
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logdrivers_linux.go b/installer/vendor/github.com/docker/docker/daemon/logdrivers_linux.go
deleted file mode 100644
index ad343c1e8e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logdrivers_linux.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package daemon
-
-import (
-	// Importing packages here only to make sure their init gets called and
-	// therefore they register themselves to the logdriver factory.
-	_ "github.com/docker/docker/daemon/logger/awslogs"
-	_ "github.com/docker/docker/daemon/logger/fluentd"
-	_ "github.com/docker/docker/daemon/logger/gcplogs"
-	_ "github.com/docker/docker/daemon/logger/gelf"
-	_ "github.com/docker/docker/daemon/logger/journald"
-	_ "github.com/docker/docker/daemon/logger/jsonfilelog"
-	_ "github.com/docker/docker/daemon/logger/logentries"
-	_ "github.com/docker/docker/daemon/logger/splunk"
-	_ "github.com/docker/docker/daemon/logger/syslog"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/logdrivers_windows.go b/installer/vendor/github.com/docker/docker/daemon/logdrivers_windows.go
deleted file mode 100644
index f3002b97e2..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logdrivers_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package daemon
-
-import (
-	// Importing packages here only to make sure their init gets called and
-	// therefore they register themselves to the logdriver factory.
-	_ "github.com/docker/docker/daemon/logger/awslogs"
-	_ "github.com/docker/docker/daemon/logger/etwlogs"
-	_ "github.com/docker/docker/daemon/logger/fluentd"
-	_ "github.com/docker/docker/daemon/logger/jsonfilelog"
-	_ "github.com/docker/docker/daemon/logger/logentries"
-	_ "github.com/docker/docker/daemon/logger/splunk"
-	_ "github.com/docker/docker/daemon/logger/syslog"
-)
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs.go b/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs.go
deleted file mode 100644
index fee518db4b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs.go
+++ /dev/null
@@ -1,404 +0,0 @@
-// Package awslogs provides the logdriver for forwarding container logs to Amazon CloudWatch Logs
-package awslogs
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/ec2metadata"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/aws/session"
-	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/dockerversion"
-)
-
-const (
-	name                  = "awslogs"
-	regionKey             = "awslogs-region"
-	regionEnvKey          = "AWS_REGION"
-	logGroupKey           = "awslogs-group"
-	logStreamKey          = "awslogs-stream"
-	tagKey                = "tag"
-	batchPublishFrequency = 5 * time.Second
-
-	// See: http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html
-	perEventBytes          = 26
-	maximumBytesPerPut     = 1048576
-	maximumLogEventsPerPut = 10000
-
-	// See: http://docs.aws.amazon.com/AmazonCloudWatch/latest/DeveloperGuide/cloudwatch_limits.html
-	maximumBytesPerEvent = 262144 - perEventBytes
-
-	resourceAlreadyExistsCode = "ResourceAlreadyExistsException"
-	dataAlreadyAcceptedCode   = "DataAlreadyAcceptedException"
-	invalidSequenceTokenCode  = "InvalidSequenceTokenException"
-
-	userAgentHeader = "User-Agent"
-)
-
-type logStream struct {
-	logStreamName string
-	logGroupName  string
-	client        api
-	messages      chan *logger.Message
-	lock          sync.RWMutex
-	closed        bool
-	sequenceToken *string
-}
-
-type api interface {
-	CreateLogStream(*cloudwatchlogs.CreateLogStreamInput) (*cloudwatchlogs.CreateLogStreamOutput, error)
-	PutLogEvents(*cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error)
-}
-
-type regionFinder interface {
-	Region() (string, error)
-}
-
-type wrappedEvent struct {
-	inputLogEvent *cloudwatchlogs.InputLogEvent
-	insertOrder   int
-}
-type byTimestamp []wrappedEvent
-
-// init registers the awslogs driver
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates an awslogs logger using the configuration passed in on the
-// context.  Supported context configuration variables are awslogs-region,
-// awslogs-group, and awslogs-stream.  When available, configuration is
-// also taken from environment variables AWS_REGION, AWS_ACCESS_KEY_ID,
-// AWS_SECRET_ACCESS_KEY, the shared credentials file (~/.aws/credentials), and
-// the EC2 Instance Metadata Service.
-func New(ctx logger.Context) (logger.Logger, error) {
-	logGroupName := ctx.Config[logGroupKey]
-	logStreamName, err := loggerutils.ParseLogTag(ctx, "{{.FullID}}")
-	if err != nil {
-		return nil, err
-	}
-
-	if ctx.Config[logStreamKey] != "" {
-		logStreamName = ctx.Config[logStreamKey]
-	}
-	client, err := newAWSLogsClient(ctx)
-	if err != nil {
-		return nil, err
-	}
-	containerStream := &logStream{
-		logStreamName: logStreamName,
-		logGroupName:  logGroupName,
-		client:        client,
-		messages:      make(chan *logger.Message, 4096),
-	}
-	err = containerStream.create()
-	if err != nil {
-		return nil, err
-	}
-	go containerStream.collectBatch()
-
-	return containerStream, nil
-}
-
-// newRegionFinder is a variable such that the implementation
-// can be swapped out for unit tests.
-var newRegionFinder = func() regionFinder {
-	return ec2metadata.New(session.New())
-}
-
-// newAWSLogsClient creates the service client for Amazon CloudWatch Logs.
-// Customizations to the default client from the SDK include a Docker-specific
-// User-Agent string and automatic region detection using the EC2 Instance
-// Metadata Service when region is otherwise unspecified.
-func newAWSLogsClient(ctx logger.Context) (api, error) {
-	var region *string
-	if os.Getenv(regionEnvKey) != "" {
-		region = aws.String(os.Getenv(regionEnvKey))
-	}
-	if ctx.Config[regionKey] != "" {
-		region = aws.String(ctx.Config[regionKey])
-	}
-	if region == nil || *region == "" {
-		logrus.Info("Trying to get region from EC2 Metadata")
-		ec2MetadataClient := newRegionFinder()
-		r, err := ec2MetadataClient.Region()
-		if err != nil {
-			logrus.WithFields(logrus.Fields{
-				"error": err,
-			}).Error("Could not get region from EC2 metadata, environment, or log option")
-			return nil, errors.New("Cannot determine region for awslogs driver")
-		}
-		region = &r
-	}
-	logrus.WithFields(logrus.Fields{
-		"region": *region,
-	}).Debug("Created awslogs client")
-
-	client := cloudwatchlogs.New(session.New(), aws.NewConfig().WithRegion(*region))
-
-	client.Handlers.Build.PushBackNamed(request.NamedHandler{
-		Name: "DockerUserAgentHandler",
-		Fn: func(r *request.Request) {
-			currentAgent := r.HTTPRequest.Header.Get(userAgentHeader)
-			r.HTTPRequest.Header.Set(userAgentHeader,
-				fmt.Sprintf("Docker %s (%s) %s",
-					dockerversion.Version, runtime.GOOS, currentAgent))
-		},
-	})
-	return client, nil
-}
-
-// Name returns the name of the awslogs logging driver
-func (l *logStream) Name() string {
-	return name
-}
-
-// Log submits messages for logging by an instance of the awslogs logging driver
-func (l *logStream) Log(msg *logger.Message) error {
-	l.lock.RLock()
-	defer l.lock.RUnlock()
-	if !l.closed {
-		// buffer up the data, making sure to copy the Line data
-		l.messages <- logger.CopyMessage(msg)
-	}
-	return nil
-}
-
-// Close closes the instance of the awslogs logging driver
-func (l *logStream) Close() error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-	if !l.closed {
-		close(l.messages)
-	}
-	l.closed = true
-	return nil
-}
-
-// create creates a log stream for the instance of the awslogs logging driver
-func (l *logStream) create() error {
-	input := &cloudwatchlogs.CreateLogStreamInput{
-		LogGroupName:  aws.String(l.logGroupName),
-		LogStreamName: aws.String(l.logStreamName),
-	}
-
-	_, err := l.client.CreateLogStream(input)
-
-	if err != nil {
-		if awsErr, ok := err.(awserr.Error); ok {
-			fields := logrus.Fields{
-				"errorCode":     awsErr.Code(),
-				"message":       awsErr.Message(),
-				"origError":     awsErr.OrigErr(),
-				"logGroupName":  l.logGroupName,
-				"logStreamName": l.logStreamName,
-			}
-			if awsErr.Code() == resourceAlreadyExistsCode {
-				// Allow creation to succeed
-				logrus.WithFields(fields).Info("Log stream already exists")
-				return nil
-			}
-			logrus.WithFields(fields).Error("Failed to create log stream")
-		}
-	}
-	return err
-}
-
-// newTicker is used for time-based batching.  newTicker is a variable such
-// that the implementation can be swapped out for unit tests.
-var newTicker = func(freq time.Duration) *time.Ticker {
-	return time.NewTicker(freq)
-}
-
-// collectBatch executes as a goroutine to perform batching of log events for
-// submission to the log stream.  Batching is performed on time- and size-
-// bases.  Time-based batching occurs at a 5 second interval (defined in the
-// batchPublishFrequency const).  Size-based batching is performed on the
-// maximum number of events per batch (defined in maximumLogEventsPerPut) and
-// the maximum number of total bytes in a batch (defined in
-// maximumBytesPerPut).  Log messages are split by the maximum bytes per event
-// (defined in maximumBytesPerEvent).  There is a fixed per-event byte overhead
-// (defined in perEventBytes) which is accounted for in split- and batch-
-// calculations.
-func (l *logStream) collectBatch() {
-	timer := newTicker(batchPublishFrequency)
-	var events []wrappedEvent
-	bytes := 0
-	for {
-		select {
-		case <-timer.C:
-			l.publishBatch(events)
-			events = events[:0]
-			bytes = 0
-		case msg, more := <-l.messages:
-			if !more {
-				l.publishBatch(events)
-				return
-			}
-			unprocessedLine := msg.Line
-			for len(unprocessedLine) > 0 {
-				// Split line length so it does not exceed the maximum
-				lineBytes := len(unprocessedLine)
-				if lineBytes > maximumBytesPerEvent {
-					lineBytes = maximumBytesPerEvent
-				}
-				line := unprocessedLine[:lineBytes]
-				unprocessedLine = unprocessedLine[lineBytes:]
-				if (len(events) >= maximumLogEventsPerPut) || (bytes+lineBytes+perEventBytes > maximumBytesPerPut) {
-					// Publish an existing batch if it's already over the maximum number of events or if adding this
-					// event would push it over the maximum number of total bytes.
-					l.publishBatch(events)
-					events = events[:0]
-					bytes = 0
-				}
-				events = append(events, wrappedEvent{
-					inputLogEvent: &cloudwatchlogs.InputLogEvent{
-						Message:   aws.String(string(line)),
-						Timestamp: aws.Int64(msg.Timestamp.UnixNano() / int64(time.Millisecond)),
-					},
-					insertOrder: len(events),
-				})
-				bytes += (lineBytes + perEventBytes)
-			}
-		}
-	}
-}
-
-// publishBatch calls PutLogEvents for a given set of InputLogEvents,
-// accounting for sequencing requirements (each request must reference the
-// sequence token returned by the previous request).
-func (l *logStream) publishBatch(events []wrappedEvent) {
-	if len(events) == 0 {
-		return
-	}
-
-	// events in a batch must be sorted by timestamp
-	// see http://docs.aws.amazon.com/AmazonCloudWatchLogs/latest/APIReference/API_PutLogEvents.html
-	sort.Sort(byTimestamp(events))
-	cwEvents := unwrapEvents(events)
-
-	nextSequenceToken, err := l.putLogEvents(cwEvents, l.sequenceToken)
-
-	if err != nil {
-		if awsErr, ok := err.(awserr.Error); ok {
-			if awsErr.Code() == dataAlreadyAcceptedCode {
-				// already submitted, just grab the correct sequence token
-				parts := strings.Split(awsErr.Message(), " ")
-				nextSequenceToken = &parts[len(parts)-1]
-				logrus.WithFields(logrus.Fields{
-					"errorCode":     awsErr.Code(),
-					"message":       awsErr.Message(),
-					"logGroupName":  l.logGroupName,
-					"logStreamName": l.logStreamName,
-				}).Info("Data already accepted, ignoring error")
-				err = nil
-			} else if awsErr.Code() == invalidSequenceTokenCode {
-				// sequence code is bad, grab the correct one and retry
-				parts := strings.Split(awsErr.Message(), " ")
-				token := parts[len(parts)-1]
-				nextSequenceToken, err = l.putLogEvents(cwEvents, &token)
-			}
-		}
-	}
-	if err != nil {
-		logrus.Error(err)
-	} else {
-		l.sequenceToken = nextSequenceToken
-	}
-}
-
-// putLogEvents wraps the PutLogEvents API
-func (l *logStream) putLogEvents(events []*cloudwatchlogs.InputLogEvent, sequenceToken *string) (*string, error) {
-	input := &cloudwatchlogs.PutLogEventsInput{
-		LogEvents:     events,
-		SequenceToken: sequenceToken,
-		LogGroupName:  aws.String(l.logGroupName),
-		LogStreamName: aws.String(l.logStreamName),
-	}
-	resp, err := l.client.PutLogEvents(input)
-	if err != nil {
-		if awsErr, ok := err.(awserr.Error); ok {
-			logrus.WithFields(logrus.Fields{
-				"errorCode":     awsErr.Code(),
-				"message":       awsErr.Message(),
-				"origError":     awsErr.OrigErr(),
-				"logGroupName":  l.logGroupName,
-				"logStreamName": l.logStreamName,
-			}).Error("Failed to put log events")
-		}
-		return nil, err
-	}
-	return resp.NextSequenceToken, nil
-}
-
-// ValidateLogOpt looks for awslogs-specific log options awslogs-region,
-// awslogs-group, and awslogs-stream
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case logGroupKey:
-		case logStreamKey:
-		case regionKey:
-		case tagKey:
-		default:
-			return fmt.Errorf("unknown log opt '%s' for %s log driver", key, name)
-		}
-	}
-	if cfg[logGroupKey] == "" {
-		return fmt.Errorf("must specify a value for log opt '%s'", logGroupKey)
-	}
-	return nil
-}
-
-// Len returns the length of a byTimestamp slice.  Len is required by the
-// sort.Interface interface.
-func (slice byTimestamp) Len() int {
-	return len(slice)
-}
-
-// Less compares two values in a byTimestamp slice by Timestamp.  Less is
-// required by the sort.Interface interface.
-func (slice byTimestamp) Less(i, j int) bool {
-	iTimestamp, jTimestamp := int64(0), int64(0)
-	if slice != nil && slice[i].inputLogEvent.Timestamp != nil {
-		iTimestamp = *slice[i].inputLogEvent.Timestamp
-	}
-	if slice != nil && slice[j].inputLogEvent.Timestamp != nil {
-		jTimestamp = *slice[j].inputLogEvent.Timestamp
-	}
-	if iTimestamp == jTimestamp {
-		return slice[i].insertOrder < slice[j].insertOrder
-	}
-	return iTimestamp < jTimestamp
-}
-
-// Swap swaps two values in a byTimestamp slice with each other.  Swap is
-// required by the sort.Interface interface.
-func (slice byTimestamp) Swap(i, j int) {
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-func unwrapEvents(events []wrappedEvent) []*cloudwatchlogs.InputLogEvent {
-	cwEvents := []*cloudwatchlogs.InputLogEvent{}
-	for _, input := range events {
-		cwEvents = append(cwEvents, input.inputLogEvent)
-	}
-	return cwEvents
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs_test.go
deleted file mode 100644
index d5b1aaef52..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cloudwatchlogs_test.go
+++ /dev/null
@@ -1,724 +0,0 @@
-package awslogs
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/aws/aws-sdk-go/aws"
-	"github.com/aws/aws-sdk-go/aws/awserr"
-	"github.com/aws/aws-sdk-go/aws/request"
-	"github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/dockerversion"
-)
-
-const (
-	groupName         = "groupName"
-	streamName        = "streamName"
-	sequenceToken     = "sequenceToken"
-	nextSequenceToken = "nextSequenceToken"
-	logline           = "this is a log line"
-)
-
-func TestNewAWSLogsClientUserAgentHandler(t *testing.T) {
-	ctx := logger.Context{
-		Config: map[string]string{
-			regionKey: "us-east-1",
-		},
-	}
-
-	client, err := newAWSLogsClient(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	realClient, ok := client.(*cloudwatchlogs.CloudWatchLogs)
-	if !ok {
-		t.Fatal("Could not cast client to cloudwatchlogs.CloudWatchLogs")
-	}
-	buildHandlerList := realClient.Handlers.Build
-	request := &request.Request{
-		HTTPRequest: &http.Request{
-			Header: http.Header{},
-		},
-	}
-	buildHandlerList.Run(request)
-	expectedUserAgentString := fmt.Sprintf("Docker %s (%s) %s/%s (%s; %s; %s)",
-		dockerversion.Version, runtime.GOOS, aws.SDKName, aws.SDKVersion, runtime.Version(), runtime.GOOS, runtime.GOARCH)
-	userAgent := request.HTTPRequest.Header.Get("User-Agent")
-	if userAgent != expectedUserAgentString {
-		t.Errorf("Wrong User-Agent string, expected \"%s\" but was \"%s\"",
-			expectedUserAgentString, userAgent)
-	}
-}
-
-func TestNewAWSLogsClientRegionDetect(t *testing.T) {
-	ctx := logger.Context{
-		Config: map[string]string{},
-	}
-
-	mockMetadata := newMockMetadataClient()
-	newRegionFinder = func() regionFinder {
-		return mockMetadata
-	}
-	mockMetadata.regionResult <- &regionResult{
-		successResult: "us-east-1",
-	}
-
-	_, err := newAWSLogsClient(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCreateSuccess(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-	}
-	mockClient.createLogStreamResult <- &createLogStreamResult{}
-
-	err := stream.create()
-
-	if err != nil {
-		t.Errorf("Received unexpected err: %v\n", err)
-	}
-	argument := <-mockClient.createLogStreamArgument
-	if argument.LogGroupName == nil {
-		t.Fatal("Expected non-nil LogGroupName")
-	}
-	if *argument.LogGroupName != groupName {
-		t.Errorf("Expected LogGroupName to be %s", groupName)
-	}
-	if argument.LogStreamName == nil {
-		t.Fatal("Expected non-nil LogGroupName")
-	}
-	if *argument.LogStreamName != streamName {
-		t.Errorf("Expected LogStreamName to be %s", streamName)
-	}
-}
-
-func TestCreateError(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client: mockClient,
-	}
-	mockClient.createLogStreamResult <- &createLogStreamResult{
-		errorResult: errors.New("Error!"),
-	}
-
-	err := stream.create()
-
-	if err == nil {
-		t.Fatal("Expected non-nil err")
-	}
-}
-
-func TestCreateAlreadyExists(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client: mockClient,
-	}
-	mockClient.createLogStreamResult <- &createLogStreamResult{
-		errorResult: awserr.New(resourceAlreadyExistsCode, "", nil),
-	}
-
-	err := stream.create()
-
-	if err != nil {
-		t.Fatal("Expected nil err")
-	}
-}
-
-func TestPublishBatchSuccess(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	events := []wrappedEvent{
-		{
-			inputLogEvent: &cloudwatchlogs.InputLogEvent{
-				Message: aws.String(logline),
-			},
-		},
-	}
-
-	stream.publishBatch(events)
-	if stream.sequenceToken == nil {
-		t.Fatal("Expected non-nil sequenceToken")
-	}
-	if *stream.sequenceToken != nextSequenceToken {
-		t.Errorf("Expected sequenceToken to be %s, but was %s", nextSequenceToken, *stream.sequenceToken)
-	}
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if argument.SequenceToken == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput.SequenceToken")
-	}
-	if *argument.SequenceToken != sequenceToken {
-		t.Errorf("Expected PutLogEventsInput.SequenceToken to be %s, but was %s", sequenceToken, *argument.SequenceToken)
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if argument.LogEvents[0] != events[0].inputLogEvent {
-		t.Error("Expected event to equal input")
-	}
-}
-
-func TestPublishBatchError(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		errorResult: errors.New("Error!"),
-	}
-
-	events := []wrappedEvent{
-		{
-			inputLogEvent: &cloudwatchlogs.InputLogEvent{
-				Message: aws.String(logline),
-			},
-		},
-	}
-
-	stream.publishBatch(events)
-	if stream.sequenceToken == nil {
-		t.Fatal("Expected non-nil sequenceToken")
-	}
-	if *stream.sequenceToken != sequenceToken {
-		t.Errorf("Expected sequenceToken to be %s, but was %s", sequenceToken, *stream.sequenceToken)
-	}
-}
-
-func TestPublishBatchInvalidSeqSuccess(t *testing.T) {
-	mockClient := newMockClientBuffered(2)
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		errorResult: awserr.New(invalidSequenceTokenCode, "use token token", nil),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-
-	events := []wrappedEvent{
-		{
-			inputLogEvent: &cloudwatchlogs.InputLogEvent{
-				Message: aws.String(logline),
-			},
-		},
-	}
-
-	stream.publishBatch(events)
-	if stream.sequenceToken == nil {
-		t.Fatal("Expected non-nil sequenceToken")
-	}
-	if *stream.sequenceToken != nextSequenceToken {
-		t.Errorf("Expected sequenceToken to be %s, but was %s", nextSequenceToken, *stream.sequenceToken)
-	}
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if argument.SequenceToken == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput.SequenceToken")
-	}
-	if *argument.SequenceToken != sequenceToken {
-		t.Errorf("Expected PutLogEventsInput.SequenceToken to be %s, but was %s", sequenceToken, *argument.SequenceToken)
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if argument.LogEvents[0] != events[0].inputLogEvent {
-		t.Error("Expected event to equal input")
-	}
-
-	argument = <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if argument.SequenceToken == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput.SequenceToken")
-	}
-	if *argument.SequenceToken != "token" {
-		t.Errorf("Expected PutLogEventsInput.SequenceToken to be %s, but was %s", "token", *argument.SequenceToken)
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if argument.LogEvents[0] != events[0].inputLogEvent {
-		t.Error("Expected event to equal input")
-	}
-}
-
-func TestPublishBatchAlreadyAccepted(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		errorResult: awserr.New(dataAlreadyAcceptedCode, "use token token", nil),
-	}
-
-	events := []wrappedEvent{
-		{
-			inputLogEvent: &cloudwatchlogs.InputLogEvent{
-				Message: aws.String(logline),
-			},
-		},
-	}
-
-	stream.publishBatch(events)
-	if stream.sequenceToken == nil {
-		t.Fatal("Expected non-nil sequenceToken")
-	}
-	if *stream.sequenceToken != "token" {
-		t.Errorf("Expected sequenceToken to be %s, but was %s", "token", *stream.sequenceToken)
-	}
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if argument.SequenceToken == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput.SequenceToken")
-	}
-	if *argument.SequenceToken != sequenceToken {
-		t.Errorf("Expected PutLogEventsInput.SequenceToken to be %s, but was %s", sequenceToken, *argument.SequenceToken)
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if argument.LogEvents[0] != events[0].inputLogEvent {
-		t.Error("Expected event to equal input")
-	}
-}
-
-func TestCollectBatchSimple(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	ticks := make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	stream.Log(&logger.Message{
-		Line:      []byte(logline),
-		Timestamp: time.Time{},
-	})
-
-	ticks <- time.Time{}
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if *argument.LogEvents[0].Message != logline {
-		t.Errorf("Expected message to be %s but was %s", logline, *argument.LogEvents[0].Message)
-	}
-}
-
-func TestCollectBatchTicker(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	ticks := make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	stream.Log(&logger.Message{
-		Line:      []byte(logline + " 1"),
-		Timestamp: time.Time{},
-	})
-	stream.Log(&logger.Message{
-		Line:      []byte(logline + " 2"),
-		Timestamp: time.Time{},
-	})
-
-	ticks <- time.Time{}
-
-	// Verify first batch
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 2 {
-		t.Errorf("Expected LogEvents to contain 2 elements, but contains %d", len(argument.LogEvents))
-	}
-	if *argument.LogEvents[0].Message != logline+" 1" {
-		t.Errorf("Expected message to be %s but was %s", logline+" 1", *argument.LogEvents[0].Message)
-	}
-	if *argument.LogEvents[1].Message != logline+" 2" {
-		t.Errorf("Expected message to be %s but was %s", logline+" 2", *argument.LogEvents[0].Message)
-	}
-
-	stream.Log(&logger.Message{
-		Line:      []byte(logline + " 3"),
-		Timestamp: time.Time{},
-	})
-
-	ticks <- time.Time{}
-	argument = <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 elements, but contains %d", len(argument.LogEvents))
-	}
-	if *argument.LogEvents[0].Message != logline+" 3" {
-		t.Errorf("Expected message to be %s but was %s", logline+" 3", *argument.LogEvents[0].Message)
-	}
-
-	stream.Close()
-
-}
-
-func TestCollectBatchClose(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	var ticks = make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	stream.Log(&logger.Message{
-		Line:      []byte(logline),
-		Timestamp: time.Time{},
-	})
-
-	// no ticks
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 element, but contains %d", len(argument.LogEvents))
-	}
-	if *argument.LogEvents[0].Message != logline {
-		t.Errorf("Expected message to be %s but was %s", logline, *argument.LogEvents[0].Message)
-	}
-}
-
-func TestCollectBatchLineSplit(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	var ticks = make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	longline := strings.Repeat("A", maximumBytesPerEvent)
-	stream.Log(&logger.Message{
-		Line:      []byte(longline + "B"),
-		Timestamp: time.Time{},
-	})
-
-	// no ticks
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 2 {
-		t.Errorf("Expected LogEvents to contain 2 elements, but contains %d", len(argument.LogEvents))
-	}
-	if *argument.LogEvents[0].Message != longline {
-		t.Errorf("Expected message to be %s but was %s", longline, *argument.LogEvents[0].Message)
-	}
-	if *argument.LogEvents[1].Message != "B" {
-		t.Errorf("Expected message to be %s but was %s", "B", *argument.LogEvents[1].Message)
-	}
-}
-
-func TestCollectBatchMaxEvents(t *testing.T) {
-	mockClient := newMockClientBuffered(1)
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	var ticks = make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	line := "A"
-	for i := 0; i <= maximumLogEventsPerPut; i++ {
-		stream.Log(&logger.Message{
-			Line:      []byte(line),
-			Timestamp: time.Time{},
-		})
-	}
-
-	// no ticks
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != maximumLogEventsPerPut {
-		t.Errorf("Expected LogEvents to contain %d elements, but contains %d", maximumLogEventsPerPut, len(argument.LogEvents))
-	}
-
-	argument = <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain %d elements, but contains %d", 1, len(argument.LogEvents))
-	}
-}
-
-func TestCollectBatchMaxTotalBytes(t *testing.T) {
-	mockClient := newMockClientBuffered(1)
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	var ticks = make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	longline := strings.Repeat("A", maximumBytesPerPut)
-	stream.Log(&logger.Message{
-		Line:      []byte(longline + "B"),
-		Timestamp: time.Time{},
-	})
-
-	// no ticks
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	bytes := 0
-	for _, event := range argument.LogEvents {
-		bytes += len(*event.Message)
-	}
-	if bytes > maximumBytesPerPut {
-		t.Errorf("Expected <= %d bytes but was %d", maximumBytesPerPut, bytes)
-	}
-
-	argument = <-mockClient.putLogEventsArgument
-	if len(argument.LogEvents) != 1 {
-		t.Errorf("Expected LogEvents to contain 1 elements, but contains %d", len(argument.LogEvents))
-	}
-	message := *argument.LogEvents[0].Message
-	if message[len(message)-1:] != "B" {
-		t.Errorf("Expected message to be %s but was %s", "B", message[len(message)-1:])
-	}
-}
-
-func TestCollectBatchWithDuplicateTimestamps(t *testing.T) {
-	mockClient := newMockClient()
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: streamName,
-		sequenceToken: aws.String(sequenceToken),
-		messages:      make(chan *logger.Message),
-	}
-	mockClient.putLogEventsResult <- &putLogEventsResult{
-		successResult: &cloudwatchlogs.PutLogEventsOutput{
-			NextSequenceToken: aws.String(nextSequenceToken),
-		},
-	}
-	ticks := make(chan time.Time)
-	newTicker = func(_ time.Duration) *time.Ticker {
-		return &time.Ticker{
-			C: ticks,
-		}
-	}
-
-	go stream.collectBatch()
-
-	times := maximumLogEventsPerPut
-	expectedEvents := []*cloudwatchlogs.InputLogEvent{}
-	timestamp := time.Now()
-	for i := 0; i < times; i++ {
-		line := fmt.Sprintf("%d", i)
-		if i%2 == 0 {
-			timestamp.Add(1 * time.Nanosecond)
-		}
-		stream.Log(&logger.Message{
-			Line:      []byte(line),
-			Timestamp: timestamp,
-		})
-		expectedEvents = append(expectedEvents, &cloudwatchlogs.InputLogEvent{
-			Message:   aws.String(line),
-			Timestamp: aws.Int64(timestamp.UnixNano() / int64(time.Millisecond)),
-		})
-	}
-
-	ticks <- time.Time{}
-	stream.Close()
-
-	argument := <-mockClient.putLogEventsArgument
-	if argument == nil {
-		t.Fatal("Expected non-nil PutLogEventsInput")
-	}
-	if len(argument.LogEvents) != times {
-		t.Errorf("Expected LogEvents to contain %d elements, but contains %d", times, len(argument.LogEvents))
-	}
-	for i := 0; i < times; i++ {
-		if !reflect.DeepEqual(*argument.LogEvents[i], *expectedEvents[i]) {
-			t.Errorf("Expected event to be %v but was %v", *expectedEvents[i], *argument.LogEvents[i])
-		}
-	}
-}
-
-func TestCreateTagSuccess(t *testing.T) {
-	mockClient := newMockClient()
-	ctx := logger.Context{
-		ContainerName: "/test-container",
-		ContainerID:   "container-abcdefghijklmnopqrstuvwxyz01234567890",
-		Config:        map[string]string{"tag": "{{.Name}}/{{.FullID}}"},
-	}
-	logStreamName, e := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-	if e != nil {
-		t.Errorf("Error generating tag: %q", e)
-	}
-	stream := &logStream{
-		client:        mockClient,
-		logGroupName:  groupName,
-		logStreamName: logStreamName,
-	}
-	mockClient.createLogStreamResult <- &createLogStreamResult{}
-
-	err := stream.create()
-
-	if err != nil {
-		t.Errorf("Received unexpected err: %v\n", err)
-	}
-	argument := <-mockClient.createLogStreamArgument
-
-	if *argument.LogStreamName != "test-container/container-abcdefghijklmnopqrstuvwxyz01234567890" {
-		t.Errorf("Expected LogStreamName to be %s", "test-container/container-abcdefghijklmnopqrstuvwxyz01234567890")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cwlogsiface_mock_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cwlogsiface_mock_test.go
deleted file mode 100644
index b768a3d7ec..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/awslogs/cwlogsiface_mock_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-package awslogs
-
-import "github.com/aws/aws-sdk-go/service/cloudwatchlogs"
-
-type mockcwlogsclient struct {
-	createLogStreamArgument chan *cloudwatchlogs.CreateLogStreamInput
-	createLogStreamResult   chan *createLogStreamResult
-	putLogEventsArgument    chan *cloudwatchlogs.PutLogEventsInput
-	putLogEventsResult      chan *putLogEventsResult
-}
-
-type createLogStreamResult struct {
-	successResult *cloudwatchlogs.CreateLogStreamOutput
-	errorResult   error
-}
-
-type putLogEventsResult struct {
-	successResult *cloudwatchlogs.PutLogEventsOutput
-	errorResult   error
-}
-
-func newMockClient() *mockcwlogsclient {
-	return &mockcwlogsclient{
-		createLogStreamArgument: make(chan *cloudwatchlogs.CreateLogStreamInput, 1),
-		createLogStreamResult:   make(chan *createLogStreamResult, 1),
-		putLogEventsArgument:    make(chan *cloudwatchlogs.PutLogEventsInput, 1),
-		putLogEventsResult:      make(chan *putLogEventsResult, 1),
-	}
-}
-
-func newMockClientBuffered(buflen int) *mockcwlogsclient {
-	return &mockcwlogsclient{
-		createLogStreamArgument: make(chan *cloudwatchlogs.CreateLogStreamInput, buflen),
-		createLogStreamResult:   make(chan *createLogStreamResult, buflen),
-		putLogEventsArgument:    make(chan *cloudwatchlogs.PutLogEventsInput, buflen),
-		putLogEventsResult:      make(chan *putLogEventsResult, buflen),
-	}
-}
-
-func (m *mockcwlogsclient) CreateLogStream(input *cloudwatchlogs.CreateLogStreamInput) (*cloudwatchlogs.CreateLogStreamOutput, error) {
-	m.createLogStreamArgument <- input
-	output := <-m.createLogStreamResult
-	return output.successResult, output.errorResult
-}
-
-func (m *mockcwlogsclient) PutLogEvents(input *cloudwatchlogs.PutLogEventsInput) (*cloudwatchlogs.PutLogEventsOutput, error) {
-	events := make([]*cloudwatchlogs.InputLogEvent, len(input.LogEvents))
-	copy(events, input.LogEvents)
-	m.putLogEventsArgument <- &cloudwatchlogs.PutLogEventsInput{
-		LogEvents:     events,
-		SequenceToken: input.SequenceToken,
-		LogGroupName:  input.LogGroupName,
-		LogStreamName: input.LogStreamName,
-	}
-	output := <-m.putLogEventsResult
-	return output.successResult, output.errorResult
-}
-
-type mockmetadataclient struct {
-	regionResult chan *regionResult
-}
-
-type regionResult struct {
-	successResult string
-	errorResult   error
-}
-
-func newMockMetadataClient() *mockmetadataclient {
-	return &mockmetadataclient{
-		regionResult: make(chan *regionResult, 1),
-	}
-}
-
-func (m *mockmetadataclient) Region() (string, error) {
-	output := <-m.regionResult
-	return output.successResult, output.errorResult
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/context.go b/installer/vendor/github.com/docker/docker/daemon/logger/context.go
deleted file mode 100644
index 085ab01a18..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/context.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"time"
-)
-
-// Context provides enough information for a logging driver to do its function.
-type Context struct {
-	Config              map[string]string
-	ContainerID         string
-	ContainerName       string
-	ContainerEntrypoint string
-	ContainerArgs       []string
-	ContainerImageID    string
-	ContainerImageName  string
-	ContainerCreated    time.Time
-	ContainerEnv        []string
-	ContainerLabels     map[string]string
-	LogPath             string
-	DaemonName          string
-}
-
-// ExtraAttributes returns the user-defined extra attributes (labels,
-// environment variables) in key-value format. This can be used by log drivers
-// that support metadata to add more context to a log.
-func (ctx *Context) ExtraAttributes(keyMod func(string) string) map[string]string {
-	extra := make(map[string]string)
-	labels, ok := ctx.Config["labels"]
-	if ok && len(labels) > 0 {
-		for _, l := range strings.Split(labels, ",") {
-			if v, ok := ctx.ContainerLabels[l]; ok {
-				if keyMod != nil {
-					l = keyMod(l)
-				}
-				extra[l] = v
-			}
-		}
-	}
-
-	env, ok := ctx.Config["env"]
-	if ok && len(env) > 0 {
-		envMapping := make(map[string]string)
-		for _, e := range ctx.ContainerEnv {
-			if kv := strings.SplitN(e, "=", 2); len(kv) == 2 {
-				envMapping[kv[0]] = kv[1]
-			}
-		}
-		for _, l := range strings.Split(env, ",") {
-			if v, ok := envMapping[l]; ok {
-				if keyMod != nil {
-					l = keyMod(l)
-				}
-				extra[l] = v
-			}
-		}
-	}
-
-	return extra
-}
-
-// Hostname returns the hostname from the underlying OS.
-func (ctx *Context) Hostname() (string, error) {
-	hostname, err := os.Hostname()
-	if err != nil {
-		return "", fmt.Errorf("logger: can not resolve hostname: %v", err)
-	}
-	return hostname, nil
-}
-
-// Command returns the command that the container being logged was
-// started with. The Entrypoint is prepended to the container
-// arguments.
-func (ctx *Context) Command() string {
-	terms := []string{ctx.ContainerEntrypoint}
-	terms = append(terms, ctx.ContainerArgs...)
-	command := strings.Join(terms, " ")
-	return command
-}
-
-// ID Returns the Container ID shortened to 12 characters.
-func (ctx *Context) ID() string {
-	return ctx.ContainerID[:12]
-}
-
-// FullID is an alias of ContainerID.
-func (ctx *Context) FullID() string {
-	return ctx.ContainerID
-}
-
-// Name returns the ContainerName without a preceding '/'.
-func (ctx *Context) Name() string {
-	return ctx.ContainerName[1:]
-}
-
-// ImageID returns the ContainerImageID shortened to 12 characters.
-func (ctx *Context) ImageID() string {
-	return ctx.ContainerImageID[:12]
-}
-
-// ImageFullID is an alias of ContainerImageID.
-func (ctx *Context) ImageFullID() string {
-	return ctx.ContainerImageID
-}
-
-// ImageName is an alias of ContainerImageName
-func (ctx *Context) ImageName() string {
-	return ctx.ContainerImageName
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/copier.go b/installer/vendor/github.com/docker/docker/daemon/logger/copier.go
deleted file mode 100644
index 10ab46e162..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/copier.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package logger
-
-import (
-	"bytes"
-	"io"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-const (
-	bufSize  = 16 * 1024
-	readSize = 2 * 1024
-)
-
-// Copier can copy logs from specified sources to Logger and attach Timestamp.
-// Writes are concurrent, so you need implement some sync in your logger.
-type Copier struct {
-	// srcs is map of name -> reader pairs, for example "stdout", "stderr"
-	srcs      map[string]io.Reader
-	dst       Logger
-	copyJobs  sync.WaitGroup
-	closeOnce sync.Once
-	closed    chan struct{}
-}
-
-// NewCopier creates a new Copier
-func NewCopier(srcs map[string]io.Reader, dst Logger) *Copier {
-	return &Copier{
-		srcs:   srcs,
-		dst:    dst,
-		closed: make(chan struct{}),
-	}
-}
-
-// Run starts logs copying
-func (c *Copier) Run() {
-	for src, w := range c.srcs {
-		c.copyJobs.Add(1)
-		go c.copySrc(src, w)
-	}
-}
-
-func (c *Copier) copySrc(name string, src io.Reader) {
-	defer c.copyJobs.Done()
-	buf := make([]byte, bufSize)
-	n := 0
-	eof := false
-	msg := &Message{Source: name}
-
-	for {
-		select {
-		case <-c.closed:
-			return
-		default:
-			// Work out how much more data we are okay with reading this time.
-			upto := n + readSize
-			if upto > cap(buf) {
-				upto = cap(buf)
-			}
-			// Try to read that data.
-			if upto > n {
-				read, err := src.Read(buf[n:upto])
-				if err != nil {
-					if err != io.EOF {
-						logrus.Errorf("Error scanning log stream: %s", err)
-						return
-					}
-					eof = true
-				}
-				n += read
-			}
-			// If we have no data to log, and there's no more coming, we're done.
-			if n == 0 && eof {
-				return
-			}
-			// Break up the data that we've buffered up into lines, and log each in turn.
-			p := 0
-			for q := bytes.Index(buf[p:n], []byte{'\n'}); q >= 0; q = bytes.Index(buf[p:n], []byte{'\n'}) {
-				msg.Line = buf[p : p+q]
-				msg.Timestamp = time.Now().UTC()
-				msg.Partial = false
-				select {
-				case <-c.closed:
-					return
-				default:
-					if logErr := c.dst.Log(msg); logErr != nil {
-						logrus.Errorf("Failed to log msg %q for logger %s: %s", msg.Line, c.dst.Name(), logErr)
-					}
-				}
-				p += q + 1
-			}
-			// If there's no more coming, or the buffer is full but
-			// has no newlines, log whatever we haven't logged yet,
-			// noting that it's a partial log line.
-			if eof || (p == 0 && n == len(buf)) {
-				if p < n {
-					msg.Line = buf[p:n]
-					msg.Timestamp = time.Now().UTC()
-					msg.Partial = true
-					if logErr := c.dst.Log(msg); logErr != nil {
-						logrus.Errorf("Failed to log msg %q for logger %s: %s", msg.Line, c.dst.Name(), logErr)
-					}
-					p = 0
-					n = 0
-				}
-				if eof {
-					return
-				}
-			}
-			// Move any unlogged data to the front of the buffer in preparation for another read.
-			if p > 0 {
-				copy(buf[0:], buf[p:n])
-				n -= p
-			}
-		}
-	}
-}
-
-// Wait waits until all copying is done
-func (c *Copier) Wait() {
-	c.copyJobs.Wait()
-}
-
-// Close closes the copier
-func (c *Copier) Close() {
-	c.closeOnce.Do(func() {
-		close(c.closed)
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/copier_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/copier_test.go
deleted file mode 100644
index cfd816a6eb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/copier_test.go
+++ /dev/null
@@ -1,296 +0,0 @@
-package logger
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-type TestLoggerJSON struct {
-	*json.Encoder
-	mu    sync.Mutex
-	delay time.Duration
-}
-
-func (l *TestLoggerJSON) Log(m *Message) error {
-	if l.delay > 0 {
-		time.Sleep(l.delay)
-	}
-	l.mu.Lock()
-	defer l.mu.Unlock()
-	return l.Encode(m)
-}
-
-func (l *TestLoggerJSON) Close() error { return nil }
-
-func (l *TestLoggerJSON) Name() string { return "json" }
-
-func TestCopier(t *testing.T) {
-	stdoutLine := "Line that thinks that it is log line from docker stdout"
-	stderrLine := "Line that thinks that it is log line from docker stderr"
-	stdoutTrailingLine := "stdout trailing line"
-	stderrTrailingLine := "stderr trailing line"
-
-	var stdout bytes.Buffer
-	var stderr bytes.Buffer
-	for i := 0; i < 30; i++ {
-		if _, err := stdout.WriteString(stdoutLine + "\n"); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := stderr.WriteString(stderrLine + "\n"); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Test remaining lines without line-endings
-	if _, err := stdout.WriteString(stdoutTrailingLine); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := stderr.WriteString(stderrTrailingLine); err != nil {
-		t.Fatal(err)
-	}
-
-	var jsonBuf bytes.Buffer
-
-	jsonLog := &TestLoggerJSON{Encoder: json.NewEncoder(&jsonBuf)}
-
-	c := NewCopier(
-		map[string]io.Reader{
-			"stdout": &stdout,
-			"stderr": &stderr,
-		},
-		jsonLog)
-	c.Run()
-	wait := make(chan struct{})
-	go func() {
-		c.Wait()
-		close(wait)
-	}()
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("Copier failed to do its work in 1 second")
-	case <-wait:
-	}
-	dec := json.NewDecoder(&jsonBuf)
-	for {
-		var msg Message
-		if err := dec.Decode(&msg); err != nil {
-			if err == io.EOF {
-				break
-			}
-			t.Fatal(err)
-		}
-		if msg.Source != "stdout" && msg.Source != "stderr" {
-			t.Fatalf("Wrong Source: %q, should be %q or %q", msg.Source, "stdout", "stderr")
-		}
-		if msg.Source == "stdout" {
-			if string(msg.Line) != stdoutLine && string(msg.Line) != stdoutTrailingLine {
-				t.Fatalf("Wrong Line: %q, expected %q or %q", msg.Line, stdoutLine, stdoutTrailingLine)
-			}
-		}
-		if msg.Source == "stderr" {
-			if string(msg.Line) != stderrLine && string(msg.Line) != stderrTrailingLine {
-				t.Fatalf("Wrong Line: %q, expected %q or %q", msg.Line, stderrLine, stderrTrailingLine)
-			}
-		}
-	}
-}
-
-// TestCopierLongLines tests long lines without line breaks
-func TestCopierLongLines(t *testing.T) {
-	// Long lines (should be split at "bufSize")
-	const bufSize = 16 * 1024
-	stdoutLongLine := strings.Repeat("a", bufSize)
-	stderrLongLine := strings.Repeat("b", bufSize)
-	stdoutTrailingLine := "stdout trailing line"
-	stderrTrailingLine := "stderr trailing line"
-
-	var stdout bytes.Buffer
-	var stderr bytes.Buffer
-
-	for i := 0; i < 3; i++ {
-		if _, err := stdout.WriteString(stdoutLongLine); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := stderr.WriteString(stderrLongLine); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if _, err := stdout.WriteString(stdoutTrailingLine); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := stderr.WriteString(stderrTrailingLine); err != nil {
-		t.Fatal(err)
-	}
-
-	var jsonBuf bytes.Buffer
-
-	jsonLog := &TestLoggerJSON{Encoder: json.NewEncoder(&jsonBuf)}
-
-	c := NewCopier(
-		map[string]io.Reader{
-			"stdout": &stdout,
-			"stderr": &stderr,
-		},
-		jsonLog)
-	c.Run()
-	wait := make(chan struct{})
-	go func() {
-		c.Wait()
-		close(wait)
-	}()
-	select {
-	case <-time.After(1 * time.Second):
-		t.Fatal("Copier failed to do its work in 1 second")
-	case <-wait:
-	}
-	dec := json.NewDecoder(&jsonBuf)
-	for {
-		var msg Message
-		if err := dec.Decode(&msg); err != nil {
-			if err == io.EOF {
-				break
-			}
-			t.Fatal(err)
-		}
-		if msg.Source != "stdout" && msg.Source != "stderr" {
-			t.Fatalf("Wrong Source: %q, should be %q or %q", msg.Source, "stdout", "stderr")
-		}
-		if msg.Source == "stdout" {
-			if string(msg.Line) != stdoutLongLine && string(msg.Line) != stdoutTrailingLine {
-				t.Fatalf("Wrong Line: %q, expected 'stdoutLongLine' or 'stdoutTrailingLine'", msg.Line)
-			}
-		}
-		if msg.Source == "stderr" {
-			if string(msg.Line) != stderrLongLine && string(msg.Line) != stderrTrailingLine {
-				t.Fatalf("Wrong Line: %q, expected 'stderrLongLine' or 'stderrTrailingLine'", msg.Line)
-			}
-		}
-	}
-}
-
-func TestCopierSlow(t *testing.T) {
-	stdoutLine := "Line that thinks that it is log line from docker stdout"
-	var stdout bytes.Buffer
-	for i := 0; i < 30; i++ {
-		if _, err := stdout.WriteString(stdoutLine + "\n"); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	var jsonBuf bytes.Buffer
-	//encoder := &encodeCloser{Encoder: json.NewEncoder(&jsonBuf)}
-	jsonLog := &TestLoggerJSON{Encoder: json.NewEncoder(&jsonBuf), delay: 100 * time.Millisecond}
-
-	c := NewCopier(map[string]io.Reader{"stdout": &stdout}, jsonLog)
-	c.Run()
-	wait := make(chan struct{})
-	go func() {
-		c.Wait()
-		close(wait)
-	}()
-	<-time.After(150 * time.Millisecond)
-	c.Close()
-	select {
-	case <-time.After(200 * time.Millisecond):
-		t.Fatalf("failed to exit in time after the copier is closed")
-	case <-wait:
-	}
-}
-
-type BenchmarkLoggerDummy struct {
-}
-
-func (l *BenchmarkLoggerDummy) Log(m *Message) error { return nil }
-
-func (l *BenchmarkLoggerDummy) Close() error { return nil }
-
-func (l *BenchmarkLoggerDummy) Name() string { return "dummy" }
-
-func BenchmarkCopier64(b *testing.B) {
-	benchmarkCopier(b, 1<<6)
-}
-func BenchmarkCopier128(b *testing.B) {
-	benchmarkCopier(b, 1<<7)
-}
-func BenchmarkCopier256(b *testing.B) {
-	benchmarkCopier(b, 1<<8)
-}
-func BenchmarkCopier512(b *testing.B) {
-	benchmarkCopier(b, 1<<9)
-}
-func BenchmarkCopier1K(b *testing.B) {
-	benchmarkCopier(b, 1<<10)
-}
-func BenchmarkCopier2K(b *testing.B) {
-	benchmarkCopier(b, 1<<11)
-}
-func BenchmarkCopier4K(b *testing.B) {
-	benchmarkCopier(b, 1<<12)
-}
-func BenchmarkCopier8K(b *testing.B) {
-	benchmarkCopier(b, 1<<13)
-}
-func BenchmarkCopier16K(b *testing.B) {
-	benchmarkCopier(b, 1<<14)
-}
-func BenchmarkCopier32K(b *testing.B) {
-	benchmarkCopier(b, 1<<15)
-}
-func BenchmarkCopier64K(b *testing.B) {
-	benchmarkCopier(b, 1<<16)
-}
-func BenchmarkCopier128K(b *testing.B) {
-	benchmarkCopier(b, 1<<17)
-}
-func BenchmarkCopier256K(b *testing.B) {
-	benchmarkCopier(b, 1<<18)
-}
-
-func piped(b *testing.B, iterations int, delay time.Duration, buf []byte) io.Reader {
-	r, w, err := os.Pipe()
-	if err != nil {
-		b.Fatal(err)
-		return nil
-	}
-	go func() {
-		for i := 0; i < iterations; i++ {
-			time.Sleep(delay)
-			if n, err := w.Write(buf); err != nil || n != len(buf) {
-				if err != nil {
-					b.Fatal(err)
-				}
-				b.Fatal(fmt.Errorf("short write"))
-			}
-		}
-		w.Close()
-	}()
-	return r
-}
-
-func benchmarkCopier(b *testing.B, length int) {
-	b.StopTimer()
-	buf := []byte{'A'}
-	for len(buf) < length {
-		buf = append(buf, buf...)
-	}
-	buf = append(buf[:length-1], []byte{'\n'}...)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		c := NewCopier(
-			map[string]io.Reader{
-				"buffer": piped(b, 10, time.Nanosecond, buf),
-			},
-			&BenchmarkLoggerDummy{})
-		c.Run()
-		c.Wait()
-		c.Close()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/etwlogs/etwlogs_windows.go b/installer/vendor/github.com/docker/docker/daemon/logger/etwlogs/etwlogs_windows.go
deleted file mode 100644
index f296d7f165..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/etwlogs/etwlogs_windows.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Package etwlogs provides a log driver for forwarding container logs
-// as ETW events.(ETW stands for Event Tracing for Windows)
-// A client can then create an ETW listener to listen for events that are sent
-// by the ETW provider that we register, using the provider's GUID "a3693192-9ed6-46d2-a981-f8226c8363bd".
-// Here is an example of how to do this using the logman utility:
-// 1. logman start -ets DockerContainerLogs -p {a3693192-9ed6-46d2-a981-f8226c8363bd} 0 0 -o trace.etl
-// 2. Run container(s) and generate log messages
-// 3. logman stop -ets DockerContainerLogs
-// 4. You can then convert the etl log file to XML using: tracerpt -y trace.etl
-//
-// Each container log message generates an ETW event that also contains:
-// the container name and ID, the timestamp, and the stream type.
-package etwlogs
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"syscall"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"golang.org/x/sys/windows"
-)
-
-type etwLogs struct {
-	containerName string
-	imageName     string
-	containerID   string
-	imageID       string
-}
-
-const (
-	name             = "etwlogs"
-	win32CallSuccess = 0
-)
-
-var (
-	modAdvapi32          = windows.NewLazySystemDLL("Advapi32.dll")
-	procEventRegister    = modAdvapi32.NewProc("EventRegister")
-	procEventWriteString = modAdvapi32.NewProc("EventWriteString")
-	procEventUnregister  = modAdvapi32.NewProc("EventUnregister")
-)
-var providerHandle syscall.Handle
-var refCount int
-var mu sync.Mutex
-
-func init() {
-	providerHandle = syscall.InvalidHandle
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates a new etwLogs logger for the given container and registers the EWT provider.
-func New(ctx logger.Context) (logger.Logger, error) {
-	if err := registerETWProvider(); err != nil {
-		return nil, err
-	}
-	logrus.Debugf("logging driver etwLogs configured for container: %s.", ctx.ContainerID)
-
-	return &etwLogs{
-		containerName: fixContainerName(ctx.ContainerName),
-		imageName:     ctx.ContainerImageName,
-		containerID:   ctx.ContainerID,
-		imageID:       ctx.ContainerImageID,
-	}, nil
-}
-
-// Log logs the message to the ETW stream.
-func (etwLogger *etwLogs) Log(msg *logger.Message) error {
-	if providerHandle == syscall.InvalidHandle {
-		// This should never be hit, if it is, it indicates a programming error.
-		errorMessage := "ETWLogs cannot log the message, because the event provider has not been registered."
-		logrus.Error(errorMessage)
-		return errors.New(errorMessage)
-	}
-	return callEventWriteString(createLogMessage(etwLogger, msg))
-}
-
-// Close closes the logger by unregistering the ETW provider.
-func (etwLogger *etwLogs) Close() error {
-	unregisterETWProvider()
-	return nil
-}
-
-func (etwLogger *etwLogs) Name() string {
-	return name
-}
-
-func createLogMessage(etwLogger *etwLogs, msg *logger.Message) string {
-	return fmt.Sprintf("container_name: %s, image_name: %s, container_id: %s, image_id: %s, source: %s, log: %s",
-		etwLogger.containerName,
-		etwLogger.imageName,
-		etwLogger.containerID,
-		etwLogger.imageID,
-		msg.Source,
-		msg.Line)
-}
-
-// fixContainerName removes the initial '/' from the container name.
-func fixContainerName(cntName string) string {
-	if len(cntName) > 0 && cntName[0] == '/' {
-		cntName = cntName[1:]
-	}
-	return cntName
-}
-
-func registerETWProvider() error {
-	mu.Lock()
-	defer mu.Unlock()
-	if refCount == 0 {
-		var err error
-		if err = callEventRegister(); err != nil {
-			return err
-		}
-	}
-
-	refCount++
-	return nil
-}
-
-func unregisterETWProvider() {
-	mu.Lock()
-	defer mu.Unlock()
-	if refCount == 1 {
-		if callEventUnregister() {
-			refCount--
-			providerHandle = syscall.InvalidHandle
-		}
-		// Not returning an error if EventUnregister fails, because etwLogs will continue to work
-	} else {
-		refCount--
-	}
-}
-
-func callEventRegister() error {
-	// The provider's GUID is {a3693192-9ed6-46d2-a981-f8226c8363bd}
-	guid := syscall.GUID{
-		0xa3693192, 0x9ed6, 0x46d2,
-		[8]byte{0xa9, 0x81, 0xf8, 0x22, 0x6c, 0x83, 0x63, 0xbd},
-	}
-
-	ret, _, _ := procEventRegister.Call(uintptr(unsafe.Pointer(&guid)), 0, 0, uintptr(unsafe.Pointer(&providerHandle)))
-	if ret != win32CallSuccess {
-		errorMessage := fmt.Sprintf("Failed to register ETW provider. Error: %d", ret)
-		logrus.Error(errorMessage)
-		return errors.New(errorMessage)
-	}
-	return nil
-}
-
-func callEventWriteString(message string) error {
-	ret, _, _ := procEventWriteString.Call(uintptr(providerHandle), 0, 0, uintptr(unsafe.Pointer(syscall.StringToUTF16Ptr(message))))
-	if ret != win32CallSuccess {
-		errorMessage := fmt.Sprintf("ETWLogs provider failed to log message. Error: %d", ret)
-		logrus.Error(errorMessage)
-		return errors.New(errorMessage)
-	}
-	return nil
-}
-
-func callEventUnregister() bool {
-	ret, _, _ := procEventUnregister.Call(uintptr(providerHandle))
-	if ret != win32CallSuccess {
-		return false
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/factory.go b/installer/vendor/github.com/docker/docker/daemon/logger/factory.go
deleted file mode 100644
index 9cf716b09a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/factory.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package logger
-
-import (
-	"fmt"
-	"sync"
-)
-
-// Creator builds a logging driver instance with given context.
-type Creator func(Context) (Logger, error)
-
-// LogOptValidator checks the options specific to the underlying
-// logging implementation.
-type LogOptValidator func(cfg map[string]string) error
-
-type logdriverFactory struct {
-	registry     map[string]Creator
-	optValidator map[string]LogOptValidator
-	m            sync.Mutex
-}
-
-func (lf *logdriverFactory) register(name string, c Creator) error {
-	if lf.driverRegistered(name) {
-		return fmt.Errorf("logger: log driver named '%s' is already registered", name)
-	}
-
-	lf.m.Lock()
-	lf.registry[name] = c
-	lf.m.Unlock()
-	return nil
-}
-
-func (lf *logdriverFactory) driverRegistered(name string) bool {
-	lf.m.Lock()
-	_, ok := lf.registry[name]
-	lf.m.Unlock()
-	return ok
-}
-
-func (lf *logdriverFactory) registerLogOptValidator(name string, l LogOptValidator) error {
-	lf.m.Lock()
-	defer lf.m.Unlock()
-
-	if _, ok := lf.optValidator[name]; ok {
-		return fmt.Errorf("logger: log validator named '%s' is already registered", name)
-	}
-	lf.optValidator[name] = l
-	return nil
-}
-
-func (lf *logdriverFactory) get(name string) (Creator, error) {
-	lf.m.Lock()
-	defer lf.m.Unlock()
-
-	c, ok := lf.registry[name]
-	if !ok {
-		return c, fmt.Errorf("logger: no log driver named '%s' is registered", name)
-	}
-	return c, nil
-}
-
-func (lf *logdriverFactory) getLogOptValidator(name string) LogOptValidator {
-	lf.m.Lock()
-	defer lf.m.Unlock()
-
-	c, _ := lf.optValidator[name]
-	return c
-}
-
-var factory = &logdriverFactory{registry: make(map[string]Creator), optValidator: make(map[string]LogOptValidator)} // global factory instance
-
-// RegisterLogDriver registers the given logging driver builder with given logging
-// driver name.
-func RegisterLogDriver(name string, c Creator) error {
-	return factory.register(name, c)
-}
-
-// RegisterLogOptValidator registers the logging option validator with
-// the given logging driver name.
-func RegisterLogOptValidator(name string, l LogOptValidator) error {
-	return factory.registerLogOptValidator(name, l)
-}
-
-// GetLogDriver provides the logging driver builder for a logging driver name.
-func GetLogDriver(name string) (Creator, error) {
-	return factory.get(name)
-}
-
-// ValidateLogOpts checks the options for the given log driver. The
-// options supported are specific to the LogDriver implementation.
-func ValidateLogOpts(name string, cfg map[string]string) error {
-	if name == "none" {
-		return nil
-	}
-
-	if !factory.driverRegistered(name) {
-		return fmt.Errorf("logger: no log driver named '%s' is registered", name)
-	}
-
-	validator := factory.getLogOptValidator(name)
-	if validator != nil {
-		return validator(cfg)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/fluentd/fluentd.go b/installer/vendor/github.com/docker/docker/daemon/logger/fluentd/fluentd.go
deleted file mode 100644
index a8303cf97b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/fluentd/fluentd.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Package fluentd provides the log driver for forwarding server logs
-// to fluentd endpoints.
-package fluentd
-
-import (
-	"fmt"
-	"math"
-	"net"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/pkg/urlutil"
-	"github.com/docker/go-units"
-	"github.com/fluent/fluent-logger-golang/fluent"
-	"github.com/pkg/errors"
-)
-
-type fluentd struct {
-	tag           string
-	containerID   string
-	containerName string
-	writer        *fluent.Fluent
-	extra         map[string]string
-}
-
-type location struct {
-	protocol string
-	host     string
-	port     int
-	path     string
-}
-
-const (
-	name = "fluentd"
-
-	defaultProtocol    = "tcp"
-	defaultHost        = "127.0.0.1"
-	defaultPort        = 24224
-	defaultBufferLimit = 1024 * 1024
-
-	// logger tries to reconnect 2**32 - 1 times
-	// failed (and panic) after 204 years [ 1.5 ** (2**32 - 1) - 1 seconds]
-	defaultRetryWait  = 1000
-	defaultMaxRetries = math.MaxInt32
-
-	addressKey      = "fluentd-address"
-	bufferLimitKey  = "fluentd-buffer-limit"
-	retryWaitKey    = "fluentd-retry-wait"
-	maxRetriesKey   = "fluentd-max-retries"
-	asyncConnectKey = "fluentd-async-connect"
-)
-
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates a fluentd logger using the configuration passed in on
-// the context. The supported context configuration variable is
-// fluentd-address.
-func New(ctx logger.Context) (logger.Logger, error) {
-	loc, err := parseAddress(ctx.Config[addressKey])
-	if err != nil {
-		return nil, err
-	}
-
-	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-	if err != nil {
-		return nil, err
-	}
-
-	extra := ctx.ExtraAttributes(nil)
-
-	bufferLimit := defaultBufferLimit
-	if ctx.Config[bufferLimitKey] != "" {
-		bl64, err := units.RAMInBytes(ctx.Config[bufferLimitKey])
-		if err != nil {
-			return nil, err
-		}
-		bufferLimit = int(bl64)
-	}
-
-	retryWait := defaultRetryWait
-	if ctx.Config[retryWaitKey] != "" {
-		rwd, err := time.ParseDuration(ctx.Config[retryWaitKey])
-		if err != nil {
-			return nil, err
-		}
-		retryWait = int(rwd.Seconds() * 1000)
-	}
-
-	maxRetries := defaultMaxRetries
-	if ctx.Config[maxRetriesKey] != "" {
-		mr64, err := strconv.ParseUint(ctx.Config[maxRetriesKey], 10, strconv.IntSize)
-		if err != nil {
-			return nil, err
-		}
-		maxRetries = int(mr64)
-	}
-
-	asyncConnect := false
-	if ctx.Config[asyncConnectKey] != "" {
-		if asyncConnect, err = strconv.ParseBool(ctx.Config[asyncConnectKey]); err != nil {
-			return nil, err
-		}
-	}
-
-	fluentConfig := fluent.Config{
-		FluentPort:       loc.port,
-		FluentHost:       loc.host,
-		FluentNetwork:    loc.protocol,
-		FluentSocketPath: loc.path,
-		BufferLimit:      bufferLimit,
-		RetryWait:        retryWait,
-		MaxRetry:         maxRetries,
-		AsyncConnect:     asyncConnect,
-	}
-
-	logrus.WithField("container", ctx.ContainerID).WithField("config", fluentConfig).
-		Debug("logging driver fluentd configured")
-
-	log, err := fluent.New(fluentConfig)
-	if err != nil {
-		return nil, err
-	}
-	return &fluentd{
-		tag:           tag,
-		containerID:   ctx.ContainerID,
-		containerName: ctx.ContainerName,
-		writer:        log,
-		extra:         extra,
-	}, nil
-}
-
-func (f *fluentd) Log(msg *logger.Message) error {
-	data := map[string]string{
-		"container_id":   f.containerID,
-		"container_name": f.containerName,
-		"source":         msg.Source,
-		"log":            string(msg.Line),
-	}
-	for k, v := range f.extra {
-		data[k] = v
-	}
-	// fluent-logger-golang buffers logs from failures and disconnections,
-	// and these are transferred again automatically.
-	return f.writer.PostWithTime(f.tag, msg.Timestamp, data)
-}
-
-func (f *fluentd) Close() error {
-	return f.writer.Close()
-}
-
-func (f *fluentd) Name() string {
-	return name
-}
-
-// ValidateLogOpt looks for fluentd specific log option fluentd-address.
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case "env":
-		case "labels":
-		case "tag":
-		case addressKey:
-		case bufferLimitKey:
-		case retryWaitKey:
-		case maxRetriesKey:
-		case asyncConnectKey:
-			// Accepted
-		default:
-			return fmt.Errorf("unknown log opt '%s' for fluentd log driver", key)
-		}
-	}
-
-	if _, err := parseAddress(cfg["fluentd-address"]); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func parseAddress(address string) (*location, error) {
-	if address == "" {
-		return &location{
-			protocol: defaultProtocol,
-			host:     defaultHost,
-			port:     defaultPort,
-			path:     "",
-		}, nil
-	}
-
-	protocol := defaultProtocol
-	givenAddress := address
-	if urlutil.IsTransportURL(address) {
-		url, err := url.Parse(address)
-		if err != nil {
-			return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
-		}
-		// unix and unixgram socket
-		if url.Scheme == "unix" || url.Scheme == "unixgram" {
-			return &location{
-				protocol: url.Scheme,
-				host:     "",
-				port:     0,
-				path:     url.Path,
-			}, nil
-		}
-		// tcp|udp
-		protocol = url.Scheme
-		address = url.Host
-	}
-
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		if !strings.Contains(err.Error(), "missing port in address") {
-			return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
-		}
-		return &location{
-			protocol: protocol,
-			host:     host,
-			port:     defaultPort,
-			path:     "",
-		}, nil
-	}
-
-	portnum, err := strconv.Atoi(port)
-	if err != nil {
-		return nil, errors.Wrapf(err, "invalid fluentd-address %s", givenAddress)
-	}
-	return &location{
-		protocol: protocol,
-		host:     host,
-		port:     portnum,
-		path:     "",
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/gcplogs/gcplogging.go b/installer/vendor/github.com/docker/docker/daemon/logger/gcplogs/gcplogging.go
deleted file mode 100644
index 9a8c1c903f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/gcplogs/gcplogging.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package gcplogs
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"github.com/docker/docker/daemon/logger"
-
-	"github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
-	"google.golang.org/cloud/compute/metadata"
-	"google.golang.org/cloud/logging"
-)
-
-const (
-	name = "gcplogs"
-
-	projectOptKey = "gcp-project"
-	logLabelsKey  = "labels"
-	logEnvKey     = "env"
-	logCmdKey     = "gcp-log-cmd"
-	logZoneKey    = "gcp-meta-zone"
-	logNameKey    = "gcp-meta-name"
-	logIDKey      = "gcp-meta-id"
-)
-
-var (
-	// The number of logs the gcplogs driver has dropped.
-	droppedLogs uint64
-
-	onGCE bool
-
-	// instance metadata populated from the metadata server if available
-	projectID    string
-	zone         string
-	instanceName string
-	instanceID   string
-)
-
-func init() {
-
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpts); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-type gcplogs struct {
-	client    *logging.Client
-	instance  *instanceInfo
-	container *containerInfo
-}
-
-type dockerLogEntry struct {
-	Instance  *instanceInfo  `json:"instance,omitempty"`
-	Container *containerInfo `json:"container,omitempty"`
-	Data      string         `json:"data,omitempty"`
-}
-
-type instanceInfo struct {
-	Zone string `json:"zone,omitempty"`
-	Name string `json:"name,omitempty"`
-	ID   string `json:"id,omitempty"`
-}
-
-type containerInfo struct {
-	Name      string            `json:"name,omitempty"`
-	ID        string            `json:"id,omitempty"`
-	ImageName string            `json:"imageName,omitempty"`
-	ImageID   string            `json:"imageId,omitempty"`
-	Created   time.Time         `json:"created,omitempty"`
-	Command   string            `json:"command,omitempty"`
-	Metadata  map[string]string `json:"metadata,omitempty"`
-}
-
-var initGCPOnce sync.Once
-
-func initGCP() {
-	initGCPOnce.Do(func() {
-		onGCE = metadata.OnGCE()
-		if onGCE {
-			// These will fail on instances if the metadata service is
-			// down or the client is compiled with an API version that
-			// has been removed. Since these are not vital, let's ignore
-			// them and make their fields in the dockeLogEntry ,omitempty
-			projectID, _ = metadata.ProjectID()
-			zone, _ = metadata.Zone()
-			instanceName, _ = metadata.InstanceName()
-			instanceID, _ = metadata.InstanceID()
-		}
-	})
-}
-
-// New creates a new logger that logs to Google Cloud Logging using the application
-// default credentials.
-//
-// See https://developers.google.com/identity/protocols/application-default-credentials
-func New(ctx logger.Context) (logger.Logger, error) {
-	initGCP()
-
-	var project string
-	if projectID != "" {
-		project = projectID
-	}
-	if projectID, found := ctx.Config[projectOptKey]; found {
-		project = projectID
-	}
-	if project == "" {
-		return nil, fmt.Errorf("No project was specified and couldn't read project from the meatadata server. Please specify a project")
-	}
-
-	c, err := logging.NewClient(context.Background(), project, "gcplogs-docker-driver")
-	if err != nil {
-		return nil, err
-	}
-
-	if err := c.Ping(); err != nil {
-		return nil, fmt.Errorf("unable to connect or authenticate with Google Cloud Logging: %v", err)
-	}
-
-	l := &gcplogs{
-		client: c,
-		container: &containerInfo{
-			Name:      ctx.ContainerName,
-			ID:        ctx.ContainerID,
-			ImageName: ctx.ContainerImageName,
-			ImageID:   ctx.ContainerImageID,
-			Created:   ctx.ContainerCreated,
-			Metadata:  ctx.ExtraAttributes(nil),
-		},
-	}
-
-	if ctx.Config[logCmdKey] == "true" {
-		l.container.Command = ctx.Command()
-	}
-
-	if onGCE {
-		l.instance = &instanceInfo{
-			Zone: zone,
-			Name: instanceName,
-			ID:   instanceID,
-		}
-	} else if ctx.Config[logZoneKey] != "" || ctx.Config[logNameKey] != "" || ctx.Config[logIDKey] != "" {
-		l.instance = &instanceInfo{
-			Zone: ctx.Config[logZoneKey],
-			Name: ctx.Config[logNameKey],
-			ID:   ctx.Config[logIDKey],
-		}
-	}
-
-	// The logger "overflows" at a rate of 10,000 logs per second and this
-	// overflow func is called. We want to surface the error to the user
-	// without overly spamming /var/log/docker.log so we log the first time
-	// we overflow and every 1000th time after.
-	c.Overflow = func(_ *logging.Client, _ logging.Entry) error {
-		if i := atomic.AddUint64(&droppedLogs, 1); i%1000 == 1 {
-			logrus.Errorf("gcplogs driver has dropped %v logs", i)
-		}
-		return nil
-	}
-
-	return l, nil
-}
-
-// ValidateLogOpts validates the opts passed to the gcplogs driver. Currently, the gcplogs
-// driver doesn't take any arguments.
-func ValidateLogOpts(cfg map[string]string) error {
-	for k := range cfg {
-		switch k {
-		case projectOptKey, logLabelsKey, logEnvKey, logCmdKey, logZoneKey, logNameKey, logIDKey:
-		default:
-			return fmt.Errorf("%q is not a valid option for the gcplogs driver", k)
-		}
-	}
-	return nil
-}
-
-func (l *gcplogs) Log(m *logger.Message) error {
-	return l.client.Log(logging.Entry{
-		Time: m.Timestamp,
-		Payload: &dockerLogEntry{
-			Instance:  l.instance,
-			Container: l.container,
-			Data:      string(m.Line),
-		},
-	})
-}
-
-func (l *gcplogs) Close() error {
-	return l.client.Flush()
-}
-
-func (l *gcplogs) Name() string {
-	return name
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf.go b/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf.go
deleted file mode 100644
index 95860ac083..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// +build linux
-
-// Package gelf provides the log driver for forwarding server logs to
-// endpoints that support the Graylog Extended Log Format.
-package gelf
-
-import (
-	"bytes"
-	"compress/flate"
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/url"
-	"strconv"
-	"time"
-
-	"github.com/Graylog2/go-gelf/gelf"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/pkg/urlutil"
-)
-
-const name = "gelf"
-
-type gelfLogger struct {
-	writer   *gelf.Writer
-	ctx      logger.Context
-	hostname string
-	rawExtra json.RawMessage
-}
-
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates a gelf logger using the configuration passed in on the
-// context. The supported context configuration variable is gelf-address.
-func New(ctx logger.Context) (logger.Logger, error) {
-	// parse gelf address
-	address, err := parseAddress(ctx.Config["gelf-address"])
-	if err != nil {
-		return nil, err
-	}
-
-	// collect extra data for GELF message
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		return nil, fmt.Errorf("gelf: cannot access hostname to set source field")
-	}
-
-	// remove trailing slash from container name
-	containerName := bytes.TrimLeft([]byte(ctx.ContainerName), "/")
-
-	// parse log tag
-	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-	if err != nil {
-		return nil, err
-	}
-
-	extra := map[string]interface{}{
-		"_container_id":   ctx.ContainerID,
-		"_container_name": string(containerName),
-		"_image_id":       ctx.ContainerImageID,
-		"_image_name":     ctx.ContainerImageName,
-		"_command":        ctx.Command(),
-		"_tag":            tag,
-		"_created":        ctx.ContainerCreated,
-	}
-
-	extraAttrs := ctx.ExtraAttributes(func(key string) string {
-		if key[0] == '_' {
-			return key
-		}
-		return "_" + key
-	})
-	for k, v := range extraAttrs {
-		extra[k] = v
-	}
-
-	rawExtra, err := json.Marshal(extra)
-	if err != nil {
-		return nil, err
-	}
-
-	// create new gelfWriter
-	gelfWriter, err := gelf.NewWriter(address)
-	if err != nil {
-		return nil, fmt.Errorf("gelf: cannot connect to GELF endpoint: %s %v", address, err)
-	}
-
-	if v, ok := ctx.Config["gelf-compression-type"]; ok {
-		switch v {
-		case "gzip":
-			gelfWriter.CompressionType = gelf.CompressGzip
-		case "zlib":
-			gelfWriter.CompressionType = gelf.CompressZlib
-		case "none":
-			gelfWriter.CompressionType = gelf.CompressNone
-		default:
-			return nil, fmt.Errorf("gelf: invalid compression type %q", v)
-		}
-	}
-
-	if v, ok := ctx.Config["gelf-compression-level"]; ok {
-		val, err := strconv.Atoi(v)
-		if err != nil {
-			return nil, fmt.Errorf("gelf: invalid compression level %s, err %v", v, err)
-		}
-		gelfWriter.CompressionLevel = val
-	}
-
-	return &gelfLogger{
-		writer:   gelfWriter,
-		ctx:      ctx,
-		hostname: hostname,
-		rawExtra: rawExtra,
-	}, nil
-}
-
-func (s *gelfLogger) Log(msg *logger.Message) error {
-	level := gelf.LOG_INFO
-	if msg.Source == "stderr" {
-		level = gelf.LOG_ERR
-	}
-
-	m := gelf.Message{
-		Version:  "1.1",
-		Host:     s.hostname,
-		Short:    string(msg.Line),
-		TimeUnix: float64(msg.Timestamp.UnixNano()/int64(time.Millisecond)) / 1000.0,
-		Level:    level,
-		RawExtra: s.rawExtra,
-	}
-
-	if err := s.writer.WriteMessage(&m); err != nil {
-		return fmt.Errorf("gelf: cannot send GELF message: %v", err)
-	}
-	return nil
-}
-
-func (s *gelfLogger) Close() error {
-	return s.writer.Close()
-}
-
-func (s *gelfLogger) Name() string {
-	return name
-}
-
-// ValidateLogOpt looks for gelf specific log option gelf-address.
-func ValidateLogOpt(cfg map[string]string) error {
-	for key, val := range cfg {
-		switch key {
-		case "gelf-address":
-		case "tag":
-		case "labels":
-		case "env":
-		case "gelf-compression-level":
-			i, err := strconv.Atoi(val)
-			if err != nil || i < flate.DefaultCompression || i > flate.BestCompression {
-				return fmt.Errorf("unknown value %q for log opt %q for gelf log driver", val, key)
-			}
-		case "gelf-compression-type":
-			switch val {
-			case "gzip", "zlib", "none":
-			default:
-				return fmt.Errorf("unknown value %q for log opt %q for gelf log driver", val, key)
-			}
-		default:
-			return fmt.Errorf("unknown log opt %q for gelf log driver", key)
-		}
-	}
-
-	if _, err := parseAddress(cfg["gelf-address"]); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func parseAddress(address string) (string, error) {
-	if address == "" {
-		return "", nil
-	}
-	if !urlutil.IsTransportURL(address) {
-		return "", fmt.Errorf("gelf-address should be in form proto://address, got %v", address)
-	}
-	url, err := url.Parse(address)
-	if err != nil {
-		return "", err
-	}
-
-	// we support only udp
-	if url.Scheme != "udp" {
-		return "", fmt.Errorf("gelf: endpoint needs to be UDP")
-	}
-
-	// get host and port
-	if _, _, err = net.SplitHostPort(url.Host); err != nil {
-		return "", fmt.Errorf("gelf: please provide gelf-address as udp://host:port")
-	}
-
-	return url.Host, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf_unsupported.go
deleted file mode 100644
index 266f73b18b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/gelf/gelf_unsupported.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !linux
-
-package gelf
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald.go
deleted file mode 100644
index 9569859121..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// +build linux
-
-// Package journald provides the log driver for forwarding server logs
-// to endpoints that receive the systemd format.
-package journald
-
-import (
-	"fmt"
-	"sync"
-	"unicode"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/coreos/go-systemd/journal"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-)
-
-const name = "journald"
-
-type journald struct {
-	vars    map[string]string // additional variables and values to send to the journal along with the log message
-	readers readerList
-}
-
-type readerList struct {
-	mu      sync.Mutex
-	readers map[*logger.LogWatcher]*logger.LogWatcher
-}
-
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, validateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// sanitizeKeyMode returns the sanitized string so that it could be used in journald.
-// In journald log, there are special requirements for fields.
-// Fields must be composed of uppercase letters, numbers, and underscores, but must
-// not start with an underscore.
-func sanitizeKeyMod(s string) string {
-	n := ""
-	for _, v := range s {
-		if 'a' <= v && v <= 'z' {
-			v = unicode.ToUpper(v)
-		} else if ('Z' < v || v < 'A') && ('9' < v || v < '0') {
-			v = '_'
-		}
-		// If (n == "" && v == '_'), then we will skip as this is the beginning with '_'
-		if !(n == "" && v == '_') {
-			n += string(v)
-		}
-	}
-	return n
-}
-
-// New creates a journald logger using the configuration passed in on
-// the context.
-func New(ctx logger.Context) (logger.Logger, error) {
-	if !journal.Enabled() {
-		return nil, fmt.Errorf("journald is not enabled on this host")
-	}
-	// Strip a leading slash so that people can search for
-	// CONTAINER_NAME=foo rather than CONTAINER_NAME=/foo.
-	name := ctx.ContainerName
-	if name[0] == '/' {
-		name = name[1:]
-	}
-
-	// parse log tag
-	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-	if err != nil {
-		return nil, err
-	}
-
-	vars := map[string]string{
-		"CONTAINER_ID":      ctx.ContainerID[:12],
-		"CONTAINER_ID_FULL": ctx.ContainerID,
-		"CONTAINER_NAME":    name,
-		"CONTAINER_TAG":     tag,
-	}
-	extraAttrs := ctx.ExtraAttributes(sanitizeKeyMod)
-	for k, v := range extraAttrs {
-		vars[k] = v
-	}
-	return &journald{vars: vars, readers: readerList{readers: make(map[*logger.LogWatcher]*logger.LogWatcher)}}, nil
-}
-
-// We don't actually accept any options, but we have to supply a callback for
-// the factory to pass the (probably empty) configuration map to.
-func validateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case "labels":
-		case "env":
-		case "tag":
-		default:
-			return fmt.Errorf("unknown log opt '%s' for journald log driver", key)
-		}
-	}
-	return nil
-}
-
-func (s *journald) Log(msg *logger.Message) error {
-	vars := map[string]string{}
-	for k, v := range s.vars {
-		vars[k] = v
-	}
-	if msg.Partial {
-		vars["CONTAINER_PARTIAL_MESSAGE"] = "true"
-	}
-	if msg.Source == "stderr" {
-		return journal.Send(string(msg.Line), journal.PriErr, vars)
-	}
-	return journal.Send(string(msg.Line), journal.PriInfo, vars)
-}
-
-func (s *journald) Name() string {
-	return name
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_test.go
deleted file mode 100644
index 224423fd07..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build linux
-
-package journald
-
-import (
-	"testing"
-)
-
-func TestSanitizeKeyMod(t *testing.T) {
-	entries := map[string]string{
-		"io.kubernetes.pod.name":      "IO_KUBERNETES_POD_NAME",
-		"io?.kubernetes.pod.name":     "IO__KUBERNETES_POD_NAME",
-		"?io.kubernetes.pod.name":     "IO_KUBERNETES_POD_NAME",
-		"io123.kubernetes.pod.name":   "IO123_KUBERNETES_POD_NAME",
-		"_io123.kubernetes.pod.name":  "IO123_KUBERNETES_POD_NAME",
-		"__io123_kubernetes.pod.name": "IO123_KUBERNETES_POD_NAME",
-	}
-	for k, v := range entries {
-		if sanitizeKeyMod(k) != v {
-			t.Fatalf("Failed to sanitize %s, got %s, expected %s", k, sanitizeKeyMod(k), v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_unsupported.go
deleted file mode 100644
index d52ca92e4f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/journald_unsupported.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !linux
-
-package journald
-
-type journald struct {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/read.go
deleted file mode 100644
index d91eb809bc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read.go
+++ /dev/null
@@ -1,401 +0,0 @@
-// +build linux,cgo,!static_build,journald
-
-package journald
-
-// #include <sys/types.h>
-// #include <sys/poll.h>
-// #include <systemd/sd-journal.h>
-// #include <errno.h>
-// #include <stdio.h>
-// #include <stdlib.h>
-// #include <string.h>
-// #include <time.h>
-// #include <unistd.h>
-//
-//static int get_message(sd_journal *j, const char **msg, size_t *length, int *partial)
-//{
-//	int rc;
-//	size_t plength;
-//	*msg = NULL;
-//	*length = 0;
-//	plength = strlen("CONTAINER_PARTIAL_MESSAGE=true");
-//	rc = sd_journal_get_data(j, "CONTAINER_PARTIAL_MESSAGE", (const void **) msg, length);
-//	*partial = ((rc == 0) && (*length == plength) && (memcmp(*msg, "CONTAINER_PARTIAL_MESSAGE=true", plength) == 0));
-//	rc = sd_journal_get_data(j, "MESSAGE", (const void **) msg, length);
-//	if (rc == 0) {
-//		if (*length > 8) {
-//			(*msg) += 8;
-//			*length -= 8;
-//		} else {
-//			*msg = NULL;
-//			*length = 0;
-//			rc = -ENOENT;
-//		}
-//	}
-//	return rc;
-//}
-//static int get_priority(sd_journal *j, int *priority)
-//{
-//	const void *data;
-//	size_t i, length;
-//	int rc;
-//	*priority = -1;
-//	rc = sd_journal_get_data(j, "PRIORITY", &data, &length);
-//	if (rc == 0) {
-//		if ((length > 9) && (strncmp(data, "PRIORITY=", 9) == 0)) {
-//			*priority = 0;
-//			for (i = 9; i < length; i++) {
-//				*priority = *priority * 10 + ((const char *)data)[i] - '0';
-//			}
-//			if (length > 9) {
-//				rc = 0;
-//			}
-//		}
-//	}
-//	return rc;
-//}
-//static int is_attribute_field(const char *msg, size_t length)
-//{
-//	static const struct known_field {
-//		const char *name;
-//		size_t length;
-//	} fields[] = {
-//		{"MESSAGE", sizeof("MESSAGE") - 1},
-//		{"MESSAGE_ID", sizeof("MESSAGE_ID") - 1},
-//		{"PRIORITY", sizeof("PRIORITY") - 1},
-//		{"CODE_FILE", sizeof("CODE_FILE") - 1},
-//		{"CODE_LINE", sizeof("CODE_LINE") - 1},
-//		{"CODE_FUNC", sizeof("CODE_FUNC") - 1},
-//		{"ERRNO", sizeof("ERRNO") - 1},
-//		{"SYSLOG_FACILITY", sizeof("SYSLOG_FACILITY") - 1},
-//		{"SYSLOG_IDENTIFIER", sizeof("SYSLOG_IDENTIFIER") - 1},
-//		{"SYSLOG_PID", sizeof("SYSLOG_PID") - 1},
-//		{"CONTAINER_NAME", sizeof("CONTAINER_NAME") - 1},
-//		{"CONTAINER_ID", sizeof("CONTAINER_ID") - 1},
-//		{"CONTAINER_ID_FULL", sizeof("CONTAINER_ID_FULL") - 1},
-//		{"CONTAINER_TAG", sizeof("CONTAINER_TAG") - 1},
-//	};
-//	unsigned int i;
-//	void *p;
-//	if ((length < 1) || (msg[0] == '_') || ((p = memchr(msg, '=', length)) == NULL)) {
-//		return -1;
-//	}
-//	length = ((const char *) p) - msg;
-//	for (i = 0; i < sizeof(fields) / sizeof(fields[0]); i++) {
-//		if ((fields[i].length == length) && (memcmp(fields[i].name, msg, length) == 0)) {
-//			return -1;
-//		}
-//	}
-//	return 0;
-//}
-//static int get_attribute_field(sd_journal *j, const char **msg, size_t *length)
-//{
-//	int rc;
-//	*msg = NULL;
-//	*length = 0;
-//	while ((rc = sd_journal_enumerate_data(j, (const void **) msg, length)) > 0) {
-//		if (is_attribute_field(*msg, *length) == 0) {
-//			break;
-//		}
-//		rc = -ENOENT;
-//	}
-//	return rc;
-//}
-//static int wait_for_data_cancelable(sd_journal *j, int pipefd)
-//{
-//	struct pollfd fds[2];
-//	uint64_t when = 0;
-//	int timeout, jevents, i;
-//	struct timespec ts;
-//	uint64_t now;
-//
-//	memset(&fds, 0, sizeof(fds));
-//	fds[0].fd = pipefd;
-//	fds[0].events = POLLHUP;
-//	fds[1].fd = sd_journal_get_fd(j);
-//	if (fds[1].fd < 0) {
-//		return fds[1].fd;
-//	}
-//
-//	do {
-//		jevents = sd_journal_get_events(j);
-//		if (jevents < 0) {
-//			return jevents;
-//		}
-//		fds[1].events = jevents;
-//		sd_journal_get_timeout(j, &when);
-//		if (when == -1) {
-//			timeout = -1;
-//		} else {
-//			clock_gettime(CLOCK_MONOTONIC, &ts);
-//			now = (uint64_t) ts.tv_sec * 1000000 + ts.tv_nsec / 1000;
-//			timeout = when > now ? (int) ((when - now + 999) / 1000) : 0;
-//		}
-//		i = poll(fds, 2, timeout);
-//		if ((i == -1) && (errno != EINTR)) {
-//			/* An unexpected error. */
-//			return (errno != 0) ? -errno : -EINTR;
-//		}
-//		if (fds[0].revents & POLLHUP) {
-//			/* The close notification pipe was closed. */
-//			return 0;
-//		}
-//		if (sd_journal_process(j) == SD_JOURNAL_APPEND) {
-//			/* Data, which we might care about, was appended. */
-//			return 1;
-//		}
-//	} while ((fds[0].revents & POLLHUP) == 0);
-//	return 0;
-//}
-import "C"
-
-import (
-	"fmt"
-	"strings"
-	"time"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/coreos/go-systemd/journal"
-	"github.com/docker/docker/daemon/logger"
-)
-
-func (s *journald) Close() error {
-	s.readers.mu.Lock()
-	for reader := range s.readers.readers {
-		reader.Close()
-	}
-	s.readers.mu.Unlock()
-	return nil
-}
-
-func (s *journald) drainJournal(logWatcher *logger.LogWatcher, config logger.ReadConfig, j *C.sd_journal, oldCursor *C.char) *C.char {
-	var msg, data, cursor *C.char
-	var length C.size_t
-	var stamp C.uint64_t
-	var priority, partial C.int
-
-	// Walk the journal from here forward until we run out of new entries.
-drain:
-	for {
-		// Try not to send a given entry twice.
-		if oldCursor != nil {
-			for C.sd_journal_test_cursor(j, oldCursor) > 0 {
-				if C.sd_journal_next(j) <= 0 {
-					break drain
-				}
-			}
-		}
-		// Read and send the logged message, if there is one to read.
-		i := C.get_message(j, &msg, &length, &partial)
-		if i != -C.ENOENT && i != -C.EADDRNOTAVAIL {
-			// Read the entry's timestamp.
-			if C.sd_journal_get_realtime_usec(j, &stamp) != 0 {
-				break
-			}
-			// Set up the time and text of the entry.
-			timestamp := time.Unix(int64(stamp)/1000000, (int64(stamp)%1000000)*1000)
-			line := C.GoBytes(unsafe.Pointer(msg), C.int(length))
-			if partial == 0 {
-				line = append(line, "\n"...)
-			}
-			// Recover the stream name by mapping
-			// from the journal priority back to
-			// the stream that we would have
-			// assigned that value.
-			source := ""
-			if C.get_priority(j, &priority) != 0 {
-				source = ""
-			} else if priority == C.int(journal.PriErr) {
-				source = "stderr"
-			} else if priority == C.int(journal.PriInfo) {
-				source = "stdout"
-			}
-			// Retrieve the values of any variables we're adding to the journal.
-			attrs := make(map[string]string)
-			C.sd_journal_restart_data(j)
-			for C.get_attribute_field(j, &data, &length) > C.int(0) {
-				kv := strings.SplitN(C.GoStringN(data, C.int(length)), "=", 2)
-				attrs[kv[0]] = kv[1]
-			}
-			if len(attrs) == 0 {
-				attrs = nil
-			}
-			// Send the log message.
-			logWatcher.Msg <- &logger.Message{
-				Line:      line,
-				Source:    source,
-				Timestamp: timestamp.In(time.UTC),
-				Attrs:     attrs,
-			}
-		}
-		// If we're at the end of the journal, we're done (for now).
-		if C.sd_journal_next(j) <= 0 {
-			break
-		}
-	}
-
-	// free(NULL) is safe
-	C.free(unsafe.Pointer(oldCursor))
-	C.sd_journal_get_cursor(j, &cursor)
-	return cursor
-}
-
-func (s *journald) followJournal(logWatcher *logger.LogWatcher, config logger.ReadConfig, j *C.sd_journal, pfd [2]C.int, cursor *C.char) *C.char {
-	s.readers.mu.Lock()
-	s.readers.readers[logWatcher] = logWatcher
-	s.readers.mu.Unlock()
-	go func() {
-		// Keep copying journal data out until we're notified to stop
-		// or we hit an error.
-		status := C.wait_for_data_cancelable(j, pfd[0])
-		for status == 1 {
-			cursor = s.drainJournal(logWatcher, config, j, cursor)
-			status = C.wait_for_data_cancelable(j, pfd[0])
-		}
-		if status < 0 {
-			cerrstr := C.strerror(C.int(-status))
-			errstr := C.GoString(cerrstr)
-			fmtstr := "error %q while attempting to follow journal for container %q"
-			logrus.Errorf(fmtstr, errstr, s.vars["CONTAINER_ID_FULL"])
-		}
-		// Clean up.
-		C.close(pfd[0])
-		s.readers.mu.Lock()
-		delete(s.readers.readers, logWatcher)
-		s.readers.mu.Unlock()
-		C.sd_journal_close(j)
-		close(logWatcher.Msg)
-	}()
-	// Wait until we're told to stop.
-	select {
-	case <-logWatcher.WatchClose():
-		// Notify the other goroutine that its work is done.
-		C.close(pfd[1])
-	}
-
-	return cursor
-}
-
-func (s *journald) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) {
-	var j *C.sd_journal
-	var cmatch, cursor *C.char
-	var stamp C.uint64_t
-	var sinceUnixMicro uint64
-	var pipes [2]C.int
-
-	// Get a handle to the journal.
-	rc := C.sd_journal_open(&j, C.int(0))
-	if rc != 0 {
-		logWatcher.Err <- fmt.Errorf("error opening journal")
-		close(logWatcher.Msg)
-		return
-	}
-	// If we end up following the log, we can set the journal context
-	// pointer and the channel pointer to nil so that we won't close them
-	// here, potentially while the goroutine that uses them is still
-	// running.  Otherwise, close them when we return from this function.
-	following := false
-	defer func(pfollowing *bool) {
-		if !*pfollowing {
-			C.sd_journal_close(j)
-			close(logWatcher.Msg)
-		}
-	}(&following)
-	// Remove limits on the size of data items that we'll retrieve.
-	rc = C.sd_journal_set_data_threshold(j, C.size_t(0))
-	if rc != 0 {
-		logWatcher.Err <- fmt.Errorf("error setting journal data threshold")
-		return
-	}
-	// Add a match to have the library do the searching for us.
-	cmatch = C.CString("CONTAINER_ID_FULL=" + s.vars["CONTAINER_ID_FULL"])
-	defer C.free(unsafe.Pointer(cmatch))
-	rc = C.sd_journal_add_match(j, unsafe.Pointer(cmatch), C.strlen(cmatch))
-	if rc != 0 {
-		logWatcher.Err <- fmt.Errorf("error setting journal match")
-		return
-	}
-	// If we have a cutoff time, convert it to Unix time once.
-	if !config.Since.IsZero() {
-		nano := config.Since.UnixNano()
-		sinceUnixMicro = uint64(nano / 1000)
-	}
-	if config.Tail > 0 {
-		lines := config.Tail
-		// Start at the end of the journal.
-		if C.sd_journal_seek_tail(j) < 0 {
-			logWatcher.Err <- fmt.Errorf("error seeking to end of journal")
-			return
-		}
-		if C.sd_journal_previous(j) < 0 {
-			logWatcher.Err <- fmt.Errorf("error backtracking to previous journal entry")
-			return
-		}
-		// Walk backward.
-		for lines > 0 {
-			// Stop if the entry time is before our cutoff.
-			// We'll need the entry time if it isn't, so go
-			// ahead and parse it now.
-			if C.sd_journal_get_realtime_usec(j, &stamp) != 0 {
-				break
-			} else {
-				// Compare the timestamp on the entry
-				// to our threshold value.
-				if sinceUnixMicro != 0 && sinceUnixMicro > uint64(stamp) {
-					break
-				}
-			}
-			lines--
-			// If we're at the start of the journal, or
-			// don't need to back up past any more entries,
-			// stop.
-			if lines == 0 || C.sd_journal_previous(j) <= 0 {
-				break
-			}
-		}
-	} else {
-		// Start at the beginning of the journal.
-		if C.sd_journal_seek_head(j) < 0 {
-			logWatcher.Err <- fmt.Errorf("error seeking to start of journal")
-			return
-		}
-		// If we have a cutoff date, fast-forward to it.
-		if sinceUnixMicro != 0 && C.sd_journal_seek_realtime_usec(j, C.uint64_t(sinceUnixMicro)) != 0 {
-			logWatcher.Err <- fmt.Errorf("error seeking to start time in journal")
-			return
-		}
-		if C.sd_journal_next(j) < 0 {
-			logWatcher.Err <- fmt.Errorf("error skipping to next journal entry")
-			return
-		}
-	}
-	cursor = s.drainJournal(logWatcher, config, j, nil)
-	if config.Follow {
-		// Allocate a descriptor for following the journal, if we'll
-		// need one.  Do it here so that we can report if it fails.
-		if fd := C.sd_journal_get_fd(j); fd < C.int(0) {
-			logWatcher.Err <- fmt.Errorf("error opening journald follow descriptor: %q", C.GoString(C.strerror(-fd)))
-		} else {
-			// Create a pipe that we can poll at the same time as
-			// the journald descriptor.
-			if C.pipe(&pipes[0]) == C.int(-1) {
-				logWatcher.Err <- fmt.Errorf("error opening journald close notification pipe")
-			} else {
-				cursor = s.followJournal(logWatcher, config, j, pipes, cursor)
-				// Let followJournal handle freeing the journal context
-				// object and closing the channel.
-				following = true
-			}
-		}
-	}
-
-	C.free(unsafe.Pointer(cursor))
-	return
-}
-
-func (s *journald) ReadLogs(config logger.ReadConfig) *logger.LogWatcher {
-	logWatcher := logger.NewLogWatcher()
-	go s.readLogs(logWatcher, config)
-	return logWatcher
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native.go
deleted file mode 100644
index bba6de55be..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build linux,cgo,!static_build,journald,!journald_compat
-
-package journald
-
-// #cgo pkg-config: libsystemd
-import "C"
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native_compat.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native_compat.go
deleted file mode 100644
index 3f7a43c59e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_native_compat.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build linux,cgo,!static_build,journald,journald_compat
-
-package journald
-
-// #cgo pkg-config: libsystemd-journal
-import "C"
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_unsupported.go
deleted file mode 100644
index b43abdcaf7..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/journald/read_unsupported.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !linux !cgo static_build !journald
-
-package journald
-
-func (s *journald) Close() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog.go b/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog.go
deleted file mode 100644
index a429a08a4f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Package jsonfilelog provides the default Logger implementation for
-// Docker logging. This logger logs to files on the host server in the
-// JSON format.
-package jsonfilelog
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"strconv"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/go-units"
-)
-
-// Name is the name of the file that the jsonlogger logs to.
-const Name = "json-file"
-
-// JSONFileLogger is Logger implementation for default Docker logging.
-type JSONFileLogger struct {
-	buf     *bytes.Buffer
-	writer  *loggerutils.RotateFileWriter
-	mu      sync.Mutex
-	readers map[*logger.LogWatcher]struct{} // stores the active log followers
-	extra   []byte                          // json-encoded extra attributes
-}
-
-func init() {
-	if err := logger.RegisterLogDriver(Name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(Name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates new JSONFileLogger which writes to filename passed in
-// on given context.
-func New(ctx logger.Context) (logger.Logger, error) {
-	var capval int64 = -1
-	if capacity, ok := ctx.Config["max-size"]; ok {
-		var err error
-		capval, err = units.FromHumanSize(capacity)
-		if err != nil {
-			return nil, err
-		}
-	}
-	var maxFiles = 1
-	if maxFileString, ok := ctx.Config["max-file"]; ok {
-		var err error
-		maxFiles, err = strconv.Atoi(maxFileString)
-		if err != nil {
-			return nil, err
-		}
-		if maxFiles < 1 {
-			return nil, fmt.Errorf("max-file cannot be less than 1")
-		}
-	}
-
-	writer, err := loggerutils.NewRotateFileWriter(ctx.LogPath, capval, maxFiles)
-	if err != nil {
-		return nil, err
-	}
-
-	var extra []byte
-	if attrs := ctx.ExtraAttributes(nil); len(attrs) > 0 {
-		var err error
-		extra, err = json.Marshal(attrs)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &JSONFileLogger{
-		buf:     bytes.NewBuffer(nil),
-		writer:  writer,
-		readers: make(map[*logger.LogWatcher]struct{}),
-		extra:   extra,
-	}, nil
-}
-
-// Log converts logger.Message to jsonlog.JSONLog and serializes it to file.
-func (l *JSONFileLogger) Log(msg *logger.Message) error {
-	timestamp, err := jsonlog.FastTimeMarshalJSON(msg.Timestamp)
-	if err != nil {
-		return err
-	}
-	l.mu.Lock()
-	logline := msg.Line
-	if !msg.Partial {
-		logline = append(msg.Line, '\n')
-	}
-	err = (&jsonlog.JSONLogs{
-		Log:      logline,
-		Stream:   msg.Source,
-		Created:  timestamp,
-		RawAttrs: l.extra,
-	}).MarshalJSONBuf(l.buf)
-	if err != nil {
-		l.mu.Unlock()
-		return err
-	}
-
-	l.buf.WriteByte('\n')
-	_, err = l.writer.Write(l.buf.Bytes())
-	l.buf.Reset()
-	l.mu.Unlock()
-
-	return err
-}
-
-// ValidateLogOpt looks for json specific log options max-file & max-size.
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case "max-file":
-		case "max-size":
-		case "labels":
-		case "env":
-		default:
-			return fmt.Errorf("unknown log opt '%s' for json-file log driver", key)
-		}
-	}
-	return nil
-}
-
-// LogPath returns the location the given json logger logs to.
-func (l *JSONFileLogger) LogPath() string {
-	return l.writer.LogPath()
-}
-
-// Close closes underlying file and signals all readers to stop.
-func (l *JSONFileLogger) Close() error {
-	l.mu.Lock()
-	err := l.writer.Close()
-	for r := range l.readers {
-		r.Close()
-		delete(l.readers, r)
-	}
-	l.mu.Unlock()
-	return err
-}
-
-// Name returns name of this logger.
-func (l *JSONFileLogger) Name() string {
-	return Name
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog_test.go
deleted file mode 100644
index b5b818a8ba..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/jsonfilelog_test.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package jsonfilelog
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/pkg/jsonlog"
-)
-
-func TestJSONFileLogger(t *testing.T) {
-	cid := "a7317399f3f857173c6179d44823594f8294678dea9999662e5c625b5a1c7657"
-	tmp, err := ioutil.TempDir("", "docker-logger-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	filename := filepath.Join(tmp, "container.log")
-	l, err := New(logger.Context{
-		ContainerID: cid,
-		LogPath:     filename,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-
-	if err := l.Log(&logger.Message{Line: []byte("line1"), Source: "src1"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := l.Log(&logger.Message{Line: []byte("line2"), Source: "src2"}); err != nil {
-		t.Fatal(err)
-	}
-	if err := l.Log(&logger.Message{Line: []byte("line3"), Source: "src3"}); err != nil {
-		t.Fatal(err)
-	}
-	res, err := ioutil.ReadFile(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := `{"log":"line1\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line2\n","stream":"src2","time":"0001-01-01T00:00:00Z"}
-{"log":"line3\n","stream":"src3","time":"0001-01-01T00:00:00Z"}
-`
-
-	if string(res) != expected {
-		t.Fatalf("Wrong log content: %q, expected %q", res, expected)
-	}
-}
-
-func BenchmarkJSONFileLogger(b *testing.B) {
-	cid := "a7317399f3f857173c6179d44823594f8294678dea9999662e5c625b5a1c7657"
-	tmp, err := ioutil.TempDir("", "docker-logger-")
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	filename := filepath.Join(tmp, "container.log")
-	l, err := New(logger.Context{
-		ContainerID: cid,
-		LogPath:     filename,
-	})
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer l.Close()
-
-	testLine := "Line that thinks that it is log line from docker\n"
-	msg := &logger.Message{Line: []byte(testLine), Source: "stderr", Timestamp: time.Now().UTC()}
-	jsonlog, err := (&jsonlog.JSONLog{Log: string(msg.Line) + "\n", Stream: msg.Source, Created: msg.Timestamp}).MarshalJSON()
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.SetBytes(int64(len(jsonlog)+1) * 30)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < 30; j++ {
-			if err := l.Log(msg); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestJSONFileLoggerWithOpts(t *testing.T) {
-	cid := "a7317399f3f857173c6179d44823594f8294678dea9999662e5c625b5a1c7657"
-	tmp, err := ioutil.TempDir("", "docker-logger-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	filename := filepath.Join(tmp, "container.log")
-	config := map[string]string{"max-file": "2", "max-size": "1k"}
-	l, err := New(logger.Context{
-		ContainerID: cid,
-		LogPath:     filename,
-		Config:      config,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-	for i := 0; i < 20; i++ {
-		if err := l.Log(&logger.Message{Line: []byte("line" + strconv.Itoa(i)), Source: "src1"}); err != nil {
-			t.Fatal(err)
-		}
-	}
-	res, err := ioutil.ReadFile(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	penUlt, err := ioutil.ReadFile(filename + ".1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedPenultimate := `{"log":"line0\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line1\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line2\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line3\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line4\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line5\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line6\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line7\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line8\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line9\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line10\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line11\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line12\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line13\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line14\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line15\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-`
-	expected := `{"log":"line16\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line17\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line18\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-{"log":"line19\n","stream":"src1","time":"0001-01-01T00:00:00Z"}
-`
-
-	if string(res) != expected {
-		t.Fatalf("Wrong log content: %q, expected %q", res, expected)
-	}
-	if string(penUlt) != expectedPenultimate {
-		t.Fatalf("Wrong log content: %q, expected %q", penUlt, expectedPenultimate)
-	}
-
-}
-
-func TestJSONFileLoggerWithLabelsEnv(t *testing.T) {
-	cid := "a7317399f3f857173c6179d44823594f8294678dea9999662e5c625b5a1c7657"
-	tmp, err := ioutil.TempDir("", "docker-logger-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-	filename := filepath.Join(tmp, "container.log")
-	config := map[string]string{"labels": "rack,dc", "env": "environ,debug,ssl"}
-	l, err := New(logger.Context{
-		ContainerID:     cid,
-		LogPath:         filename,
-		Config:          config,
-		ContainerLabels: map[string]string{"rack": "101", "dc": "lhr"},
-		ContainerEnv:    []string{"environ=production", "debug=false", "port=10001", "ssl=true"},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-	if err := l.Log(&logger.Message{Line: []byte("line"), Source: "src1"}); err != nil {
-		t.Fatal(err)
-	}
-	res, err := ioutil.ReadFile(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var jsonLog jsonlog.JSONLogs
-	if err := json.Unmarshal(res, &jsonLog); err != nil {
-		t.Fatal(err)
-	}
-	extra := make(map[string]string)
-	if err := json.Unmarshal(jsonLog.RawAttrs, &extra); err != nil {
-		t.Fatal(err)
-	}
-	expected := map[string]string{
-		"rack":    "101",
-		"dc":      "lhr",
-		"environ": "production",
-		"debug":   "false",
-		"ssl":     "true",
-	}
-	if !reflect.DeepEqual(extra, expected) {
-		t.Fatalf("Wrong log attrs: %q, expected %q", extra, expected)
-	}
-}
-
-func BenchmarkJSONFileLoggerWithReader(b *testing.B) {
-	b.StopTimer()
-	b.ResetTimer()
-	cid := "a7317399f3f857173c6179d44823594f8294678dea9999662e5c625b5a1c7657"
-	dir, err := ioutil.TempDir("", "json-logger-bench")
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	l, err := New(logger.Context{
-		ContainerID: cid,
-		LogPath:     filepath.Join(dir, "container.log"),
-	})
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer l.Close()
-	msg := &logger.Message{Line: []byte("line"), Source: "src1"}
-	jsonlog, err := (&jsonlog.JSONLog{Log: string(msg.Line) + "\n", Stream: msg.Source, Created: msg.Timestamp}).MarshalJSON()
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.SetBytes(int64(len(jsonlog)+1) * 30)
-
-	b.StartTimer()
-
-	go func() {
-		for i := 0; i < b.N; i++ {
-			for j := 0; j < 30; j++ {
-				l.Log(msg)
-			}
-		}
-		l.Close()
-	}()
-
-	lw := l.(logger.LogReader).ReadLogs(logger.ReadConfig{Follow: true})
-	watchClose := lw.WatchClose()
-	for {
-		select {
-		case <-lw.Msg:
-		case <-watchClose:
-			return
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/read.go b/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/read.go
deleted file mode 100644
index f2f9df1887..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/jsonfilelog/read.go
+++ /dev/null
@@ -1,319 +0,0 @@
-package jsonfilelog
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"time"
-
-	"github.com/fsnotify/fsnotify"
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/pkg/filenotify"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/tailfile"
-)
-
-const maxJSONDecodeRetry = 20000
-
-func decodeLogLine(dec *json.Decoder, l *jsonlog.JSONLog) (*logger.Message, error) {
-	l.Reset()
-	if err := dec.Decode(l); err != nil {
-		return nil, err
-	}
-	msg := &logger.Message{
-		Source:    l.Stream,
-		Timestamp: l.Created,
-		Line:      []byte(l.Log),
-		Attrs:     l.Attrs,
-	}
-	return msg, nil
-}
-
-// ReadLogs implements the logger's LogReader interface for the logs
-// created by this driver.
-func (l *JSONFileLogger) ReadLogs(config logger.ReadConfig) *logger.LogWatcher {
-	logWatcher := logger.NewLogWatcher()
-
-	go l.readLogs(logWatcher, config)
-	return logWatcher
-}
-
-func (l *JSONFileLogger) readLogs(logWatcher *logger.LogWatcher, config logger.ReadConfig) {
-	defer close(logWatcher.Msg)
-
-	// lock so the read stream doesn't get corrupted due to rotations or other log data written while we read
-	// This will block writes!!!
-	l.mu.Lock()
-
-	pth := l.writer.LogPath()
-	var files []io.ReadSeeker
-	for i := l.writer.MaxFiles(); i > 1; i-- {
-		f, err := os.Open(fmt.Sprintf("%s.%d", pth, i-1))
-		if err != nil {
-			if !os.IsNotExist(err) {
-				logWatcher.Err <- err
-				break
-			}
-			continue
-		}
-		defer f.Close()
-
-		files = append(files, f)
-	}
-
-	latestFile, err := os.Open(pth)
-	if err != nil {
-		logWatcher.Err <- err
-		l.mu.Unlock()
-		return
-	}
-	defer latestFile.Close()
-
-	if config.Tail != 0 {
-		tailer := ioutils.MultiReadSeeker(append(files, latestFile)...)
-		tailFile(tailer, logWatcher, config.Tail, config.Since)
-	}
-
-	// close all the rotated files
-	for _, f := range files {
-		if err := f.(io.Closer).Close(); err != nil {
-			logrus.WithField("logger", "json-file").Warnf("error closing tailed log file: %v", err)
-		}
-	}
-
-	if !config.Follow {
-		if err := latestFile.Close(); err != nil {
-			logrus.Errorf("Error closing file: %v", err)
-		}
-		l.mu.Unlock()
-		return
-	}
-
-	if config.Tail >= 0 {
-		latestFile.Seek(0, os.SEEK_END)
-	}
-
-	l.readers[logWatcher] = struct{}{}
-	l.mu.Unlock()
-
-	notifyRotate := l.writer.NotifyRotate()
-	followLogs(latestFile, logWatcher, notifyRotate, config.Since)
-
-	l.mu.Lock()
-	delete(l.readers, logWatcher)
-	l.mu.Unlock()
-
-	l.writer.NotifyRotateEvict(notifyRotate)
-}
-
-func tailFile(f io.ReadSeeker, logWatcher *logger.LogWatcher, tail int, since time.Time) {
-	var rdr io.Reader
-	rdr = f
-	if tail > 0 {
-		ls, err := tailfile.TailFile(f, tail)
-		if err != nil {
-			logWatcher.Err <- err
-			return
-		}
-		rdr = bytes.NewBuffer(bytes.Join(ls, []byte("\n")))
-	}
-	dec := json.NewDecoder(rdr)
-	l := &jsonlog.JSONLog{}
-	for {
-		msg, err := decodeLogLine(dec, l)
-		if err != nil {
-			if err != io.EOF {
-				logWatcher.Err <- err
-			}
-			return
-		}
-		if !since.IsZero() && msg.Timestamp.Before(since) {
-			continue
-		}
-		logWatcher.Msg <- msg
-	}
-}
-
-func watchFile(name string) (filenotify.FileWatcher, error) {
-	fileWatcher, err := filenotify.New()
-	if err != nil {
-		return nil, err
-	}
-
-	if err := fileWatcher.Add(name); err != nil {
-		logrus.WithField("logger", "json-file").Warnf("falling back to file poller due to error: %v", err)
-		fileWatcher.Close()
-		fileWatcher = filenotify.NewPollingWatcher()
-
-		if err := fileWatcher.Add(name); err != nil {
-			fileWatcher.Close()
-			logrus.Debugf("error watching log file for modifications: %v", err)
-			return nil, err
-		}
-	}
-	return fileWatcher, nil
-}
-
-func followLogs(f *os.File, logWatcher *logger.LogWatcher, notifyRotate chan interface{}, since time.Time) {
-	dec := json.NewDecoder(f)
-	l := &jsonlog.JSONLog{}
-
-	name := f.Name()
-	fileWatcher, err := watchFile(name)
-	if err != nil {
-		logWatcher.Err <- err
-		return
-	}
-	defer func() {
-		f.Close()
-		fileWatcher.Remove(name)
-		fileWatcher.Close()
-	}()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	go func() {
-		select {
-		case <-logWatcher.WatchClose():
-			fileWatcher.Remove(name)
-			cancel()
-		case <-ctx.Done():
-			return
-		}
-	}()
-
-	var retries int
-	handleRotate := func() error {
-		f.Close()
-		fileWatcher.Remove(name)
-
-		// retry when the file doesn't exist
-		for retries := 0; retries <= 5; retries++ {
-			f, err = os.Open(name)
-			if err == nil || !os.IsNotExist(err) {
-				break
-			}
-		}
-		if err != nil {
-			return err
-		}
-		if err := fileWatcher.Add(name); err != nil {
-			return err
-		}
-		dec = json.NewDecoder(f)
-		return nil
-	}
-
-	errRetry := errors.New("retry")
-	errDone := errors.New("done")
-	waitRead := func() error {
-		select {
-		case e := <-fileWatcher.Events():
-			switch e.Op {
-			case fsnotify.Write:
-				dec = json.NewDecoder(f)
-				return nil
-			case fsnotify.Rename, fsnotify.Remove:
-				select {
-				case <-notifyRotate:
-				case <-ctx.Done():
-					return errDone
-				}
-				if err := handleRotate(); err != nil {
-					return err
-				}
-				return nil
-			}
-			return errRetry
-		case err := <-fileWatcher.Errors():
-			logrus.Debug("logger got error watching file: %v", err)
-			// Something happened, let's try and stay alive and create a new watcher
-			if retries <= 5 {
-				fileWatcher.Close()
-				fileWatcher, err = watchFile(name)
-				if err != nil {
-					return err
-				}
-				retries++
-				return errRetry
-			}
-			return err
-		case <-ctx.Done():
-			return errDone
-		}
-	}
-
-	handleDecodeErr := func(err error) error {
-		if err == io.EOF {
-			for err := waitRead(); err != nil; {
-				if err == errRetry {
-					// retry the waitRead
-					continue
-				}
-				return err
-			}
-			return nil
-		}
-		// try again because this shouldn't happen
-		if _, ok := err.(*json.SyntaxError); ok && retries <= maxJSONDecodeRetry {
-			dec = json.NewDecoder(f)
-			retries++
-			return nil
-		}
-		// io.ErrUnexpectedEOF is returned from json.Decoder when there is
-		// remaining data in the parser's buffer while an io.EOF occurs.
-		// If the json logger writes a partial json log entry to the disk
-		// while at the same time the decoder tries to decode it, the race condition happens.
-		if err == io.ErrUnexpectedEOF && retries <= maxJSONDecodeRetry {
-			reader := io.MultiReader(dec.Buffered(), f)
-			dec = json.NewDecoder(reader)
-			retries++
-			return nil
-		}
-		return err
-	}
-
-	// main loop
-	for {
-		msg, err := decodeLogLine(dec, l)
-		if err != nil {
-			if err := handleDecodeErr(err); err != nil {
-				if err == errDone {
-					return
-				}
-				// we got an unrecoverable error, so return
-				logWatcher.Err <- err
-				return
-			}
-			// ready to try again
-			continue
-		}
-
-		retries = 0 // reset retries since we've succeeded
-		if !since.IsZero() && msg.Timestamp.Before(since) {
-			continue
-		}
-		select {
-		case logWatcher.Msg <- msg:
-		case <-ctx.Done():
-			logWatcher.Msg <- msg
-			for {
-				msg, err := decodeLogLine(dec, l)
-				if err != nil {
-					return
-				}
-				if !since.IsZero() && msg.Timestamp.Before(since) {
-					continue
-				}
-				logWatcher.Msg <- msg
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/logentries/logentries.go b/installer/vendor/github.com/docker/docker/daemon/logger/logentries/logentries.go
deleted file mode 100644
index e794b1ed08..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/logentries/logentries.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Package logentries provides the log driver for forwarding server logs
-// to logentries endpoints.
-package logentries
-
-import (
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/bsphere/le_go"
-	"github.com/docker/docker/daemon/logger"
-)
-
-type logentries struct {
-	tag           string
-	containerID   string
-	containerName string
-	writer        *le_go.Logger
-	extra         map[string]string
-}
-
-const (
-	name  = "logentries"
-	token = "logentries-token"
-)
-
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates a logentries logger using the configuration passed in on
-// the context. The supported context configuration variable is
-// logentries-token.
-func New(ctx logger.Context) (logger.Logger, error) {
-	logrus.WithField("container", ctx.ContainerID).
-		WithField("token", ctx.Config[token]).
-		Debug("logging driver logentries configured")
-
-	log, err := le_go.Connect(ctx.Config[token])
-	if err != nil {
-		return nil, err
-	}
-	return &logentries{
-		containerID:   ctx.ContainerID,
-		containerName: ctx.ContainerName,
-		writer:        log,
-	}, nil
-}
-
-func (f *logentries) Log(msg *logger.Message) error {
-	data := map[string]string{
-		"container_id":   f.containerID,
-		"container_name": f.containerName,
-		"source":         msg.Source,
-		"log":            string(msg.Line),
-	}
-	for k, v := range f.extra {
-		data[k] = v
-	}
-	f.writer.Println(f.tag, msg.Timestamp, data)
-	return nil
-}
-
-func (f *logentries) Close() error {
-	return f.writer.Close()
-}
-
-func (f *logentries) Name() string {
-	return name
-}
-
-// ValidateLogOpt looks for logentries specific log option logentries-address.
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case "env":
-		case "labels":
-		case "tag":
-		case key:
-		default:
-			return fmt.Errorf("unknown log opt '%s' for logentries log driver", key)
-		}
-	}
-
-	if cfg[token] == "" {
-		return fmt.Errorf("Missing logentries token")
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/logger.go b/installer/vendor/github.com/docker/docker/daemon/logger/logger.go
deleted file mode 100644
index d091997358..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/logger.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Package logger defines interfaces that logger drivers implement to
-// log messages.
-//
-// The other half of a logger driver is the implementation of the
-// factory, which holds the contextual instance information that
-// allows multiple loggers of the same type to perform different
-// actions, such as logging to different locations.
-package logger
-
-import (
-	"errors"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/jsonlog"
-)
-
-// ErrReadLogsNotSupported is returned when the logger does not support reading logs.
-var ErrReadLogsNotSupported = errors.New("configured logging reader does not support reading")
-
-const (
-	// TimeFormat is the time format used for timestamps sent to log readers.
-	TimeFormat           = jsonlog.RFC3339NanoFixed
-	logWatcherBufferSize = 4096
-)
-
-// Message is datastructure that represents piece of output produced by some
-// container.  The Line member is a slice of an array whose contents can be
-// changed after a log driver's Log() method returns.
-type Message struct {
-	Line      []byte
-	Source    string
-	Timestamp time.Time
-	Attrs     LogAttributes
-	Partial   bool
-}
-
-// CopyMessage creates a copy of the passed-in Message which will remain
-// unchanged if the original is changed.  Log drivers which buffer Messages
-// rather than dispatching them during their Log() method should use this
-// function to obtain a Message whose Line member's contents won't change.
-func CopyMessage(msg *Message) *Message {
-	m := new(Message)
-	m.Line = make([]byte, len(msg.Line))
-	copy(m.Line, msg.Line)
-	m.Source = msg.Source
-	m.Timestamp = msg.Timestamp
-	m.Partial = msg.Partial
-	m.Attrs = make(LogAttributes)
-	for k, v := range msg.Attrs {
-		m.Attrs[k] = v
-	}
-	return m
-}
-
-// LogAttributes is used to hold the extra attributes available in the log message
-// Primarily used for converting the map type to string and sorting.
-type LogAttributes map[string]string
-type byKey []string
-
-func (s byKey) Len() int { return len(s) }
-func (s byKey) Less(i, j int) bool {
-	keyI := strings.Split(s[i], "=")
-	keyJ := strings.Split(s[j], "=")
-	return keyI[0] < keyJ[0]
-}
-func (s byKey) Swap(i, j int) {
-	s[i], s[j] = s[j], s[i]
-}
-
-func (a LogAttributes) String() string {
-	var ss byKey
-	for k, v := range a {
-		ss = append(ss, k+"="+v)
-	}
-	sort.Sort(ss)
-	return strings.Join(ss, ",")
-}
-
-// Logger is the interface for docker logging drivers.
-type Logger interface {
-	Log(*Message) error
-	Name() string
-	Close() error
-}
-
-// ReadConfig is the configuration passed into ReadLogs.
-type ReadConfig struct {
-	Since  time.Time
-	Tail   int
-	Follow bool
-}
-
-// LogReader is the interface for reading log messages for loggers that support reading.
-type LogReader interface {
-	// Read logs from underlying logging backend
-	ReadLogs(ReadConfig) *LogWatcher
-}
-
-// LogWatcher is used when consuming logs read from the LogReader interface.
-type LogWatcher struct {
-	// For sending log messages to a reader.
-	Msg chan *Message
-	// For sending error messages that occur while while reading logs.
-	Err           chan error
-	closeOnce     sync.Once
-	closeNotifier chan struct{}
-}
-
-// NewLogWatcher returns a new LogWatcher.
-func NewLogWatcher() *LogWatcher {
-	return &LogWatcher{
-		Msg:           make(chan *Message, logWatcherBufferSize),
-		Err:           make(chan error, 1),
-		closeNotifier: make(chan struct{}),
-	}
-}
-
-// Close notifies the underlying log reader to stop.
-func (w *LogWatcher) Close() {
-	// only close if not already closed
-	w.closeOnce.Do(func() {
-		close(w.closeNotifier)
-	})
-}
-
-// WatchClose returns a channel receiver that receives notification
-// when the watcher has been closed. This should only be called from
-// one goroutine.
-func (w *LogWatcher) WatchClose() <-chan struct{} {
-	return w.closeNotifier
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/logger_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/logger_test.go
deleted file mode 100644
index 16e1514d2d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/logger_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package logger
-
-import (
-	"reflect"
-	"testing"
-	"time"
-)
-
-func TestCopyMessage(t *testing.T) {
-	msg := &Message{
-		Line:      []byte("test line."),
-		Source:    "stdout",
-		Timestamp: time.Now(),
-		Attrs: LogAttributes{
-			"key1": "val1",
-			"key2": "val2",
-			"key3": "val3",
-		},
-		Partial: true,
-	}
-
-	m := CopyMessage(msg)
-	if !reflect.DeepEqual(m, msg) {
-		t.Fatalf("CopyMessage failed to copy message")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag.go b/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag.go
deleted file mode 100644
index 4752679c72..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package loggerutils
-
-import (
-	"bytes"
-
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/utils/templates"
-)
-
-// DefaultTemplate defines the defaults template logger should use.
-const DefaultTemplate = "{{.ID}}"
-
-// ParseLogTag generates a context aware tag for consistency across different
-// log drivers based on the context of the running container.
-func ParseLogTag(ctx logger.Context, defaultTemplate string) (string, error) {
-	tagTemplate := ctx.Config["tag"]
-	if tagTemplate == "" {
-		tagTemplate = defaultTemplate
-	}
-
-	tmpl, err := templates.NewParse("log-tag", tagTemplate)
-	if err != nil {
-		return "", err
-	}
-	buf := new(bytes.Buffer)
-	if err := tmpl.Execute(buf, &ctx); err != nil {
-		return "", err
-	}
-
-	return buf.String(), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag_test.go
deleted file mode 100644
index e2aa4358aa..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/log_tag_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package loggerutils
-
-import (
-	"testing"
-
-	"github.com/docker/docker/daemon/logger"
-)
-
-func TestParseLogTagDefaultTag(t *testing.T) {
-	ctx := buildContext(map[string]string{})
-	tag, e := ParseLogTag(ctx, "{{.ID}}")
-	assertTag(t, e, tag, ctx.ID())
-}
-
-func TestParseLogTag(t *testing.T) {
-	ctx := buildContext(map[string]string{"tag": "{{.ImageName}}/{{.Name}}/{{.ID}}"})
-	tag, e := ParseLogTag(ctx, "{{.ID}}")
-	assertTag(t, e, tag, "test-image/test-container/container-ab")
-}
-
-func TestParseLogTagEmptyTag(t *testing.T) {
-	ctx := buildContext(map[string]string{})
-	tag, e := ParseLogTag(ctx, "{{.DaemonName}}/{{.ID}}")
-	assertTag(t, e, tag, "test-dockerd/container-ab")
-}
-
-// Helpers
-
-func buildContext(cfg map[string]string) logger.Context {
-	return logger.Context{
-		ContainerID:        "container-abcdefghijklmnopqrstuvwxyz01234567890",
-		ContainerName:      "/test-container",
-		ContainerImageID:   "image-abcdefghijklmnopqrstuvwxyz01234567890",
-		ContainerImageName: "test-image",
-		Config:             cfg,
-		DaemonName:         "test-dockerd",
-	}
-}
-
-func assertTag(t *testing.T, e error, tag string, expected string) {
-	if e != nil {
-		t.Fatalf("Error generating tag: %q", e)
-	}
-	if tag != expected {
-		t.Fatalf("Wrong tag: %q, should be %q", tag, expected)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/rotatefilewriter.go b/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/rotatefilewriter.go
deleted file mode 100644
index 99e0964aea..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/loggerutils/rotatefilewriter.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package loggerutils
-
-import (
-	"os"
-	"strconv"
-	"sync"
-
-	"github.com/docker/docker/pkg/pubsub"
-)
-
-// RotateFileWriter is Logger implementation for default Docker logging.
-type RotateFileWriter struct {
-	f            *os.File // store for closing
-	mu           sync.Mutex
-	capacity     int64 //maximum size of each file
-	currentSize  int64 // current size of the latest file
-	maxFiles     int   //maximum number of files
-	notifyRotate *pubsub.Publisher
-}
-
-//NewRotateFileWriter creates new RotateFileWriter
-func NewRotateFileWriter(logPath string, capacity int64, maxFiles int) (*RotateFileWriter, error) {
-	log, err := os.OpenFile(logPath, os.O_WRONLY|os.O_APPEND|os.O_CREATE, 0640)
-	if err != nil {
-		return nil, err
-	}
-
-	size, err := log.Seek(0, os.SEEK_END)
-	if err != nil {
-		return nil, err
-	}
-
-	return &RotateFileWriter{
-		f:            log,
-		capacity:     capacity,
-		currentSize:  size,
-		maxFiles:     maxFiles,
-		notifyRotate: pubsub.NewPublisher(0, 1),
-	}, nil
-}
-
-//WriteLog write log message to File
-func (w *RotateFileWriter) Write(message []byte) (int, error) {
-	w.mu.Lock()
-	if err := w.checkCapacityAndRotate(); err != nil {
-		w.mu.Unlock()
-		return -1, err
-	}
-
-	n, err := w.f.Write(message)
-	if err == nil {
-		w.currentSize += int64(n)
-	}
-	w.mu.Unlock()
-	return n, err
-}
-
-func (w *RotateFileWriter) checkCapacityAndRotate() error {
-	if w.capacity == -1 {
-		return nil
-	}
-
-	if w.currentSize >= w.capacity {
-		name := w.f.Name()
-		if err := w.f.Close(); err != nil {
-			return err
-		}
-		if err := rotate(name, w.maxFiles); err != nil {
-			return err
-		}
-		file, err := os.OpenFile(name, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 06400)
-		if err != nil {
-			return err
-		}
-		w.f = file
-		w.currentSize = 0
-		w.notifyRotate.Publish(struct{}{})
-	}
-
-	return nil
-}
-
-func rotate(name string, maxFiles int) error {
-	if maxFiles < 2 {
-		return nil
-	}
-	for i := maxFiles - 1; i > 1; i-- {
-		toPath := name + "." + strconv.Itoa(i)
-		fromPath := name + "." + strconv.Itoa(i-1)
-		if err := os.Rename(fromPath, toPath); err != nil && !os.IsNotExist(err) {
-			return err
-		}
-	}
-
-	if err := os.Rename(name, name+".1"); err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// LogPath returns the location the given writer logs to.
-func (w *RotateFileWriter) LogPath() string {
-	return w.f.Name()
-}
-
-// MaxFiles return maximum number of files
-func (w *RotateFileWriter) MaxFiles() int {
-	return w.maxFiles
-}
-
-//NotifyRotate returns the new subscriber
-func (w *RotateFileWriter) NotifyRotate() chan interface{} {
-	return w.notifyRotate.Subscribe()
-}
-
-//NotifyRotateEvict removes the specified subscriber from receiving any more messages.
-func (w *RotateFileWriter) NotifyRotateEvict(sub chan interface{}) {
-	w.notifyRotate.Evict(sub)
-}
-
-// Close closes underlying file and signals all readers to stop.
-func (w *RotateFileWriter) Close() error {
-	return w.f.Close()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk.go b/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk.go
deleted file mode 100644
index f85832681a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk.go
+++ /dev/null
@@ -1,621 +0,0 @@
-// Package splunk provides the log driver for forwarding server logs to
-// Splunk HTTP Event Collector endpoint.
-package splunk
-
-import (
-	"bytes"
-	"compress/gzip"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/pkg/urlutil"
-)
-
-const (
-	driverName                    = "splunk"
-	splunkURLKey                  = "splunk-url"
-	splunkTokenKey                = "splunk-token"
-	splunkSourceKey               = "splunk-source"
-	splunkSourceTypeKey           = "splunk-sourcetype"
-	splunkIndexKey                = "splunk-index"
-	splunkCAPathKey               = "splunk-capath"
-	splunkCANameKey               = "splunk-caname"
-	splunkInsecureSkipVerifyKey   = "splunk-insecureskipverify"
-	splunkFormatKey               = "splunk-format"
-	splunkVerifyConnectionKey     = "splunk-verify-connection"
-	splunkGzipCompressionKey      = "splunk-gzip"
-	splunkGzipCompressionLevelKey = "splunk-gzip-level"
-	envKey                        = "env"
-	labelsKey                     = "labels"
-	tagKey                        = "tag"
-)
-
-const (
-	// How often do we send messages (if we are not reaching batch size)
-	defaultPostMessagesFrequency = 5 * time.Second
-	// How big can be batch of messages
-	defaultPostMessagesBatchSize = 1000
-	// Maximum number of messages we can store in buffer
-	defaultBufferMaximum = 10 * defaultPostMessagesBatchSize
-	// Number of messages allowed to be queued in the channel
-	defaultStreamChannelSize = 4 * defaultPostMessagesBatchSize
-)
-
-const (
-	envVarPostMessagesFrequency = "SPLUNK_LOGGING_DRIVER_POST_MESSAGES_FREQUENCY"
-	envVarPostMessagesBatchSize = "SPLUNK_LOGGING_DRIVER_POST_MESSAGES_BATCH_SIZE"
-	envVarBufferMaximum         = "SPLUNK_LOGGING_DRIVER_BUFFER_MAX"
-	envVarStreamChannelSize     = "SPLUNK_LOGGING_DRIVER_CHANNEL_SIZE"
-)
-
-type splunkLoggerInterface interface {
-	logger.Logger
-	worker()
-}
-
-type splunkLogger struct {
-	client    *http.Client
-	transport *http.Transport
-
-	url         string
-	auth        string
-	nullMessage *splunkMessage
-
-	// http compression
-	gzipCompression      bool
-	gzipCompressionLevel int
-
-	// Advanced options
-	postMessagesFrequency time.Duration
-	postMessagesBatchSize int
-	bufferMaximum         int
-
-	// For synchronization between background worker and logger.
-	// We use channel to send messages to worker go routine.
-	// All other variables for blocking Close call before we flush all messages to HEC
-	stream     chan *splunkMessage
-	lock       sync.RWMutex
-	closed     bool
-	closedCond *sync.Cond
-}
-
-type splunkLoggerInline struct {
-	*splunkLogger
-
-	nullEvent *splunkMessageEvent
-}
-
-type splunkLoggerJSON struct {
-	*splunkLoggerInline
-}
-
-type splunkLoggerRaw struct {
-	*splunkLogger
-
-	prefix []byte
-}
-
-type splunkMessage struct {
-	Event      interface{} `json:"event"`
-	Time       string      `json:"time"`
-	Host       string      `json:"host"`
-	Source     string      `json:"source,omitempty"`
-	SourceType string      `json:"sourcetype,omitempty"`
-	Index      string      `json:"index,omitempty"`
-}
-
-type splunkMessageEvent struct {
-	Line   interface{}       `json:"line"`
-	Source string            `json:"source"`
-	Tag    string            `json:"tag,omitempty"`
-	Attrs  map[string]string `json:"attrs,omitempty"`
-}
-
-const (
-	splunkFormatRaw    = "raw"
-	splunkFormatJSON   = "json"
-	splunkFormatInline = "inline"
-)
-
-func init() {
-	if err := logger.RegisterLogDriver(driverName, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(driverName, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// New creates splunk logger driver using configuration passed in context
-func New(ctx logger.Context) (logger.Logger, error) {
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		return nil, fmt.Errorf("%s: cannot access hostname to set source field", driverName)
-	}
-
-	// Parse and validate Splunk URL
-	splunkURL, err := parseURL(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// Splunk Token is required parameter
-	splunkToken, ok := ctx.Config[splunkTokenKey]
-	if !ok {
-		return nil, fmt.Errorf("%s: %s is expected", driverName, splunkTokenKey)
-	}
-
-	tlsConfig := &tls.Config{}
-
-	// Splunk is using autogenerated certificates by default,
-	// allow users to trust them with skipping verification
-	if insecureSkipVerifyStr, ok := ctx.Config[splunkInsecureSkipVerifyKey]; ok {
-		insecureSkipVerify, err := strconv.ParseBool(insecureSkipVerifyStr)
-		if err != nil {
-			return nil, err
-		}
-		tlsConfig.InsecureSkipVerify = insecureSkipVerify
-	}
-
-	// If path to the root certificate is provided - load it
-	if caPath, ok := ctx.Config[splunkCAPathKey]; ok {
-		caCert, err := ioutil.ReadFile(caPath)
-		if err != nil {
-			return nil, err
-		}
-		caPool := x509.NewCertPool()
-		caPool.AppendCertsFromPEM(caCert)
-		tlsConfig.RootCAs = caPool
-	}
-
-	if caName, ok := ctx.Config[splunkCANameKey]; ok {
-		tlsConfig.ServerName = caName
-	}
-
-	gzipCompression := false
-	if gzipCompressionStr, ok := ctx.Config[splunkGzipCompressionKey]; ok {
-		gzipCompression, err = strconv.ParseBool(gzipCompressionStr)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	gzipCompressionLevel := gzip.DefaultCompression
-	if gzipCompressionLevelStr, ok := ctx.Config[splunkGzipCompressionLevelKey]; ok {
-		var err error
-		gzipCompressionLevel64, err := strconv.ParseInt(gzipCompressionLevelStr, 10, 32)
-		if err != nil {
-			return nil, err
-		}
-		gzipCompressionLevel = int(gzipCompressionLevel64)
-		if gzipCompressionLevel < gzip.DefaultCompression || gzipCompressionLevel > gzip.BestCompression {
-			err := fmt.Errorf("Not supported level '%s' for %s (supported values between %d and %d).",
-				gzipCompressionLevelStr, splunkGzipCompressionLevelKey, gzip.DefaultCompression, gzip.BestCompression)
-			return nil, err
-		}
-	}
-
-	transport := &http.Transport{
-		TLSClientConfig: tlsConfig,
-	}
-	client := &http.Client{
-		Transport: transport,
-	}
-
-	source := ctx.Config[splunkSourceKey]
-	sourceType := ctx.Config[splunkSourceTypeKey]
-	index := ctx.Config[splunkIndexKey]
-
-	var nullMessage = &splunkMessage{
-		Host:       hostname,
-		Source:     source,
-		SourceType: sourceType,
-		Index:      index,
-	}
-
-	// Allow user to remove tag from the messages by setting tag to empty string
-	tag := ""
-	if tagTemplate, ok := ctx.Config[tagKey]; !ok || tagTemplate != "" {
-		tag, err = loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	attrs := ctx.ExtraAttributes(nil)
-
-	var (
-		postMessagesFrequency = getAdvancedOptionDuration(envVarPostMessagesFrequency, defaultPostMessagesFrequency)
-		postMessagesBatchSize = getAdvancedOptionInt(envVarPostMessagesBatchSize, defaultPostMessagesBatchSize)
-		bufferMaximum         = getAdvancedOptionInt(envVarBufferMaximum, defaultBufferMaximum)
-		streamChannelSize     = getAdvancedOptionInt(envVarStreamChannelSize, defaultStreamChannelSize)
-	)
-
-	logger := &splunkLogger{
-		client:                client,
-		transport:             transport,
-		url:                   splunkURL.String(),
-		auth:                  "Splunk " + splunkToken,
-		nullMessage:           nullMessage,
-		gzipCompression:       gzipCompression,
-		gzipCompressionLevel:  gzipCompressionLevel,
-		stream:                make(chan *splunkMessage, streamChannelSize),
-		postMessagesFrequency: postMessagesFrequency,
-		postMessagesBatchSize: postMessagesBatchSize,
-		bufferMaximum:         bufferMaximum,
-	}
-
-	// By default we verify connection, but we allow use to skip that
-	verifyConnection := true
-	if verifyConnectionStr, ok := ctx.Config[splunkVerifyConnectionKey]; ok {
-		var err error
-		verifyConnection, err = strconv.ParseBool(verifyConnectionStr)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if verifyConnection {
-		err = verifySplunkConnection(logger)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	var splunkFormat string
-	if splunkFormatParsed, ok := ctx.Config[splunkFormatKey]; ok {
-		switch splunkFormatParsed {
-		case splunkFormatInline:
-		case splunkFormatJSON:
-		case splunkFormatRaw:
-		default:
-			return nil, fmt.Errorf("Unknown format specified %s, supported formats are inline, json and raw", splunkFormat)
-		}
-		splunkFormat = splunkFormatParsed
-	} else {
-		splunkFormat = splunkFormatInline
-	}
-
-	var loggerWrapper splunkLoggerInterface
-
-	switch splunkFormat {
-	case splunkFormatInline:
-		nullEvent := &splunkMessageEvent{
-			Tag:   tag,
-			Attrs: attrs,
-		}
-
-		loggerWrapper = &splunkLoggerInline{logger, nullEvent}
-	case splunkFormatJSON:
-		nullEvent := &splunkMessageEvent{
-			Tag:   tag,
-			Attrs: attrs,
-		}
-
-		loggerWrapper = &splunkLoggerJSON{&splunkLoggerInline{logger, nullEvent}}
-	case splunkFormatRaw:
-		var prefix bytes.Buffer
-		if tag != "" {
-			prefix.WriteString(tag)
-			prefix.WriteString(" ")
-		}
-		for key, value := range attrs {
-			prefix.WriteString(key)
-			prefix.WriteString("=")
-			prefix.WriteString(value)
-			prefix.WriteString(" ")
-		}
-
-		loggerWrapper = &splunkLoggerRaw{logger, prefix.Bytes()}
-	default:
-		return nil, fmt.Errorf("Unexpected format %s", splunkFormat)
-	}
-
-	go loggerWrapper.worker()
-
-	return loggerWrapper, nil
-}
-
-func (l *splunkLoggerInline) Log(msg *logger.Message) error {
-	message := l.createSplunkMessage(msg)
-
-	event := *l.nullEvent
-	event.Line = string(msg.Line)
-	event.Source = msg.Source
-
-	message.Event = &event
-
-	return l.queueMessageAsync(message)
-}
-
-func (l *splunkLoggerJSON) Log(msg *logger.Message) error {
-	message := l.createSplunkMessage(msg)
-	event := *l.nullEvent
-
-	var rawJSONMessage json.RawMessage
-	if err := json.Unmarshal(msg.Line, &rawJSONMessage); err == nil {
-		event.Line = &rawJSONMessage
-	} else {
-		event.Line = string(msg.Line)
-	}
-
-	event.Source = msg.Source
-
-	message.Event = &event
-
-	return l.queueMessageAsync(message)
-}
-
-func (l *splunkLoggerRaw) Log(msg *logger.Message) error {
-	message := l.createSplunkMessage(msg)
-
-	message.Event = string(append(l.prefix, msg.Line...))
-
-	return l.queueMessageAsync(message)
-}
-
-func (l *splunkLogger) queueMessageAsync(message *splunkMessage) error {
-	l.lock.RLock()
-	defer l.lock.RUnlock()
-	if l.closedCond != nil {
-		return fmt.Errorf("%s: driver is closed", driverName)
-	}
-	l.stream <- message
-	return nil
-}
-
-func (l *splunkLogger) worker() {
-	timer := time.NewTicker(l.postMessagesFrequency)
-	var messages []*splunkMessage
-	for {
-		select {
-		case message, open := <-l.stream:
-			if !open {
-				l.postMessages(messages, true)
-				l.lock.Lock()
-				defer l.lock.Unlock()
-				l.transport.CloseIdleConnections()
-				l.closed = true
-				l.closedCond.Signal()
-				return
-			}
-			messages = append(messages, message)
-			// Only sending when we get exactly to the batch size,
-			// This also helps not to fire postMessages on every new message,
-			// when previous try failed.
-			if len(messages)%l.postMessagesBatchSize == 0 {
-				messages = l.postMessages(messages, false)
-			}
-		case <-timer.C:
-			messages = l.postMessages(messages, false)
-		}
-	}
-}
-
-func (l *splunkLogger) postMessages(messages []*splunkMessage, lastChance bool) []*splunkMessage {
-	messagesLen := len(messages)
-	for i := 0; i < messagesLen; i += l.postMessagesBatchSize {
-		upperBound := i + l.postMessagesBatchSize
-		if upperBound > messagesLen {
-			upperBound = messagesLen
-		}
-		if err := l.tryPostMessages(messages[i:upperBound]); err != nil {
-			logrus.Error(err)
-			if messagesLen-i >= l.bufferMaximum || lastChance {
-				// If this is last chance - print them all to the daemon log
-				if lastChance {
-					upperBound = messagesLen
-				}
-				// Not all sent, but buffer has got to its maximum, let's log all messages
-				// we could not send and return buffer minus one batch size
-				for j := i; j < upperBound; j++ {
-					if jsonEvent, err := json.Marshal(messages[j]); err != nil {
-						logrus.Error(err)
-					} else {
-						logrus.Error(fmt.Errorf("Failed to send a message '%s'", string(jsonEvent)))
-					}
-				}
-				return messages[upperBound:messagesLen]
-			}
-			// Not all sent, returning buffer from where we have not sent messages
-			return messages[i:messagesLen]
-		}
-	}
-	// All sent, return empty buffer
-	return messages[:0]
-}
-
-func (l *splunkLogger) tryPostMessages(messages []*splunkMessage) error {
-	if len(messages) == 0 {
-		return nil
-	}
-	var buffer bytes.Buffer
-	var writer io.Writer
-	var gzipWriter *gzip.Writer
-	var err error
-	// If gzip compression is enabled - create gzip writer with specified compression
-	// level. If gzip compression is disabled, use standard buffer as a writer
-	if l.gzipCompression {
-		gzipWriter, err = gzip.NewWriterLevel(&buffer, l.gzipCompressionLevel)
-		if err != nil {
-			return err
-		}
-		writer = gzipWriter
-	} else {
-		writer = &buffer
-	}
-	for _, message := range messages {
-		jsonEvent, err := json.Marshal(message)
-		if err != nil {
-			return err
-		}
-		if _, err := writer.Write(jsonEvent); err != nil {
-			return err
-		}
-	}
-	// If gzip compression is enabled, tell it, that we are done
-	if l.gzipCompression {
-		err = gzipWriter.Close()
-		if err != nil {
-			return err
-		}
-	}
-	req, err := http.NewRequest("POST", l.url, bytes.NewBuffer(buffer.Bytes()))
-	if err != nil {
-		return err
-	}
-	req.Header.Set("Authorization", l.auth)
-	// Tell if we are sending gzip compressed body
-	if l.gzipCompression {
-		req.Header.Set("Content-Encoding", "gzip")
-	}
-	res, err := l.client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		var body []byte
-		body, err = ioutil.ReadAll(res.Body)
-		if err != nil {
-			return err
-		}
-		return fmt.Errorf("%s: failed to send event - %s - %s", driverName, res.Status, body)
-	}
-	io.Copy(ioutil.Discard, res.Body)
-	return nil
-}
-
-func (l *splunkLogger) Close() error {
-	l.lock.Lock()
-	defer l.lock.Unlock()
-	if l.closedCond == nil {
-		l.closedCond = sync.NewCond(&l.lock)
-		close(l.stream)
-		for !l.closed {
-			l.closedCond.Wait()
-		}
-	}
-	return nil
-}
-
-func (l *splunkLogger) Name() string {
-	return driverName
-}
-
-func (l *splunkLogger) createSplunkMessage(msg *logger.Message) *splunkMessage {
-	message := *l.nullMessage
-	message.Time = fmt.Sprintf("%f", float64(msg.Timestamp.UnixNano())/float64(time.Second))
-	return &message
-}
-
-// ValidateLogOpt looks for all supported by splunk driver options
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case splunkURLKey:
-		case splunkTokenKey:
-		case splunkSourceKey:
-		case splunkSourceTypeKey:
-		case splunkIndexKey:
-		case splunkCAPathKey:
-		case splunkCANameKey:
-		case splunkInsecureSkipVerifyKey:
-		case splunkFormatKey:
-		case splunkVerifyConnectionKey:
-		case splunkGzipCompressionKey:
-		case splunkGzipCompressionLevelKey:
-		case envKey:
-		case labelsKey:
-		case tagKey:
-		default:
-			return fmt.Errorf("unknown log opt '%s' for %s log driver", key, driverName)
-		}
-	}
-	return nil
-}
-
-func parseURL(ctx logger.Context) (*url.URL, error) {
-	splunkURLStr, ok := ctx.Config[splunkURLKey]
-	if !ok {
-		return nil, fmt.Errorf("%s: %s is expected", driverName, splunkURLKey)
-	}
-
-	splunkURL, err := url.Parse(splunkURLStr)
-	if err != nil {
-		return nil, fmt.Errorf("%s: failed to parse %s as url value in %s", driverName, splunkURLStr, splunkURLKey)
-	}
-
-	if !urlutil.IsURL(splunkURLStr) ||
-		!splunkURL.IsAbs() ||
-		(splunkURL.Path != "" && splunkURL.Path != "/") ||
-		splunkURL.RawQuery != "" ||
-		splunkURL.Fragment != "" {
-		return nil, fmt.Errorf("%s: expected format scheme://dns_name_or_ip:port for %s", driverName, splunkURLKey)
-	}
-
-	splunkURL.Path = "/services/collector/event/1.0"
-
-	return splunkURL, nil
-}
-
-func verifySplunkConnection(l *splunkLogger) error {
-	req, err := http.NewRequest(http.MethodOptions, l.url, nil)
-	if err != nil {
-		return err
-	}
-	res, err := l.client.Do(req)
-	if err != nil {
-		return err
-	}
-	if res.Body != nil {
-		defer res.Body.Close()
-	}
-	if res.StatusCode != http.StatusOK {
-		var body []byte
-		body, err = ioutil.ReadAll(res.Body)
-		if err != nil {
-			return err
-		}
-		return fmt.Errorf("%s: failed to verify connection - %s - %s", driverName, res.Status, body)
-	}
-	return nil
-}
-
-func getAdvancedOptionDuration(envName string, defaultValue time.Duration) time.Duration {
-	valueStr := os.Getenv(envName)
-	if valueStr == "" {
-		return defaultValue
-	}
-	parsedValue, err := time.ParseDuration(valueStr)
-	if err != nil {
-		logrus.Error(fmt.Sprintf("Failed to parse value of %s as duration. Using default %v. %v", envName, defaultValue, err))
-		return defaultValue
-	}
-	return parsedValue
-}
-
-func getAdvancedOptionInt(envName string, defaultValue int) int {
-	valueStr := os.Getenv(envName)
-	if valueStr == "" {
-		return defaultValue
-	}
-	parsedValue, err := strconv.ParseInt(valueStr, 10, 32)
-	if err != nil {
-		logrus.Error(fmt.Sprintf("Failed to parse value of %s as integer. Using default %d. %v", envName, defaultValue, err))
-		return defaultValue
-	}
-	return int(parsedValue)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk_test.go
deleted file mode 100644
index df74cbad5f..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunk_test.go
+++ /dev/null
@@ -1,1302 +0,0 @@
-package splunk
-
-import (
-	"compress/gzip"
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/daemon/logger"
-)
-
-// Validate options
-func TestValidateLogOpt(t *testing.T) {
-	err := ValidateLogOpt(map[string]string{
-		splunkURLKey:                  "http://127.0.0.1",
-		splunkTokenKey:                "2160C7EF-2CE9-4307-A180-F852B99CF417",
-		splunkSourceKey:               "mysource",
-		splunkSourceTypeKey:           "mysourcetype",
-		splunkIndexKey:                "myindex",
-		splunkCAPathKey:               "/usr/cert.pem",
-		splunkCANameKey:               "ca_name",
-		splunkInsecureSkipVerifyKey:   "true",
-		splunkFormatKey:               "json",
-		splunkVerifyConnectionKey:     "true",
-		splunkGzipCompressionKey:      "true",
-		splunkGzipCompressionLevelKey: "1",
-		envKey:    "a",
-		labelsKey: "b",
-		tagKey:    "c",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = ValidateLogOpt(map[string]string{
-		"not-supported-option": "a",
-	})
-	if err == nil {
-		t.Fatal("Expecting error on unsupported options")
-	}
-}
-
-// Driver require user to specify required options
-func TestNewMissedConfig(t *testing.T) {
-	ctx := logger.Context{
-		Config: map[string]string{},
-	}
-	_, err := New(ctx)
-	if err == nil {
-		t.Fatal("Logger driver should fail when no required parameters specified")
-	}
-}
-
-// Driver require user to specify splunk-url
-func TestNewMissedUrl(t *testing.T) {
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkTokenKey: "4642492F-D8BD-47F1-A005-0C08AE4657DF",
-		},
-	}
-	_, err := New(ctx)
-	if err.Error() != "splunk: splunk-url is expected" {
-		t.Fatal("Logger driver should fail when no required parameters specified")
-	}
-}
-
-// Driver require user to specify splunk-token
-func TestNewMissedToken(t *testing.T) {
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey: "http://127.0.0.1:8088",
-		},
-	}
-	_, err := New(ctx)
-	if err.Error() != "splunk: splunk-token is expected" {
-		t.Fatal("Logger driver should fail when no required parameters specified")
-	}
-}
-
-// Test default settings
-func TestDefault(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if loggerDriver.Name() != driverName {
-		t.Fatal("Unexpected logger driver name")
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerInline)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "" ||
-		splunkLoggerDriver.nullMessage.SourceType != "" ||
-		splunkLoggerDriver.nullMessage.Index != "" ||
-		splunkLoggerDriver.gzipCompression != false ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize {
-		t.Fatal("Found not default values setup in Splunk Logging Driver.")
-	}
-
-	message1Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("{\"a\":\"b\"}"), "stdout", message1Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-	message2Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("notajson"), "stdout", message2Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 2 {
-		t.Fatal("Expected two messages")
-	}
-
-	if *hec.gzipEnabled {
-		t.Fatal("Gzip should not be used")
-	}
-
-	message1 := hec.messages[0]
-	if message1.Time != fmt.Sprintf("%f", float64(message1Time.UnixNano())/float64(time.Second)) ||
-		message1.Host != hostname ||
-		message1.Source != "" ||
-		message1.SourceType != "" ||
-		message1.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message1)
-	}
-
-	if event, err := message1.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"] != "{\"a\":\"b\"}" ||
-			event["source"] != "stdout" ||
-			event["tag"] != "containeriid" ||
-			len(event) != 3 {
-			t.Fatalf("Unexpected event in message %v", event)
-		}
-	}
-
-	message2 := hec.messages[1]
-	if message2.Time != fmt.Sprintf("%f", float64(message2Time.UnixNano())/float64(time.Second)) ||
-		message2.Host != hostname ||
-		message2.Source != "" ||
-		message2.SourceType != "" ||
-		message2.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message2)
-	}
-
-	if event, err := message2.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"] != "notajson" ||
-			event["source"] != "stdout" ||
-			event["tag"] != "containeriid" ||
-			len(event) != 3 {
-			t.Fatalf("Unexpected event in message %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify inline format with a not default settings for most of options
-func TestInlineFormatWithNonDefaultOptions(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:             hec.URL(),
-			splunkTokenKey:           hec.token,
-			splunkSourceKey:          "mysource",
-			splunkSourceTypeKey:      "mysourcetype",
-			splunkIndexKey:           "myindex",
-			splunkFormatKey:          splunkFormatInline,
-			splunkGzipCompressionKey: "true",
-			tagKey:    "{{.ImageName}}/{{.Name}}",
-			labelsKey: "a",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-		ContainerLabels: map[string]string{
-			"a": "b",
-		},
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerInline)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "mysource" ||
-		splunkLoggerDriver.nullMessage.SourceType != "mysourcetype" ||
-		splunkLoggerDriver.nullMessage.Index != "myindex" ||
-		splunkLoggerDriver.gzipCompression != true ||
-		splunkLoggerDriver.gzipCompressionLevel != gzip.DefaultCompression ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize {
-		t.Fatal("Values do not match configuration.")
-	}
-
-	messageTime := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("1"), "stdout", messageTime, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 1 {
-		t.Fatal("Expected one message")
-	}
-
-	if !*hec.gzipEnabled {
-		t.Fatal("Gzip should be used")
-	}
-
-	message := hec.messages[0]
-	if message.Time != fmt.Sprintf("%f", float64(messageTime.UnixNano())/float64(time.Second)) ||
-		message.Host != hostname ||
-		message.Source != "mysource" ||
-		message.SourceType != "mysourcetype" ||
-		message.Index != "myindex" {
-		t.Fatalf("Unexpected values of message %v", message)
-	}
-
-	if event, err := message.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"] != "1" ||
-			event["source"] != "stdout" ||
-			event["tag"] != "container_image_name/container_name" ||
-			event["attrs"].(map[string]interface{})["a"] != "b" ||
-			len(event) != 4 {
-			t.Fatalf("Unexpected event in message %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify JSON format
-func TestJsonFormat(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:                  hec.URL(),
-			splunkTokenKey:                hec.token,
-			splunkFormatKey:               splunkFormatJSON,
-			splunkGzipCompressionKey:      "true",
-			splunkGzipCompressionLevelKey: "1",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerJSON)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "" ||
-		splunkLoggerDriver.nullMessage.SourceType != "" ||
-		splunkLoggerDriver.nullMessage.Index != "" ||
-		splunkLoggerDriver.gzipCompression != true ||
-		splunkLoggerDriver.gzipCompressionLevel != gzip.BestSpeed ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize {
-		t.Fatal("Values do not match configuration.")
-	}
-
-	message1Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("{\"a\":\"b\"}"), "stdout", message1Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-	message2Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("notjson"), "stdout", message2Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 2 {
-		t.Fatal("Expected two messages")
-	}
-
-	message1 := hec.messages[0]
-	if message1.Time != fmt.Sprintf("%f", float64(message1Time.UnixNano())/float64(time.Second)) ||
-		message1.Host != hostname ||
-		message1.Source != "" ||
-		message1.SourceType != "" ||
-		message1.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message1)
-	}
-
-	if event, err := message1.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"].(map[string]interface{})["a"] != "b" ||
-			event["source"] != "stdout" ||
-			event["tag"] != "containeriid" ||
-			len(event) != 3 {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	message2 := hec.messages[1]
-	if message2.Time != fmt.Sprintf("%f", float64(message2Time.UnixNano())/float64(time.Second)) ||
-		message2.Host != hostname ||
-		message2.Source != "" ||
-		message2.SourceType != "" ||
-		message2.Index != "" {
-		t.Fatalf("Unexpected values of message 2 %v", message2)
-	}
-
-	// If message cannot be parsed as JSON - it should be sent as a line
-	if event, err := message2.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"] != "notjson" ||
-			event["source"] != "stdout" ||
-			event["tag"] != "containeriid" ||
-			len(event) != 3 {
-			t.Fatalf("Unexpected event in message 2 %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify raw format
-func TestRawFormat(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:    hec.URL(),
-			splunkTokenKey:  hec.token,
-			splunkFormatKey: splunkFormatRaw,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerRaw)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "" ||
-		splunkLoggerDriver.nullMessage.SourceType != "" ||
-		splunkLoggerDriver.nullMessage.Index != "" ||
-		splunkLoggerDriver.gzipCompression != false ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize ||
-		string(splunkLoggerDriver.prefix) != "containeriid " {
-		t.Fatal("Values do not match configuration.")
-	}
-
-	message1Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("{\"a\":\"b\"}"), "stdout", message1Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-	message2Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("notjson"), "stdout", message2Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 2 {
-		t.Fatal("Expected two messages")
-	}
-
-	message1 := hec.messages[0]
-	if message1.Time != fmt.Sprintf("%f", float64(message1Time.UnixNano())/float64(time.Second)) ||
-		message1.Host != hostname ||
-		message1.Source != "" ||
-		message1.SourceType != "" ||
-		message1.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message1)
-	}
-
-	if event, err := message1.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "containeriid {\"a\":\"b\"}" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	message2 := hec.messages[1]
-	if message2.Time != fmt.Sprintf("%f", float64(message2Time.UnixNano())/float64(time.Second)) ||
-		message2.Host != hostname ||
-		message2.Source != "" ||
-		message2.SourceType != "" ||
-		message2.Index != "" {
-		t.Fatalf("Unexpected values of message 2 %v", message2)
-	}
-
-	if event, err := message2.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "containeriid notjson" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify raw format with labels
-func TestRawFormatWithLabels(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:    hec.URL(),
-			splunkTokenKey:  hec.token,
-			splunkFormatKey: splunkFormatRaw,
-			labelsKey:       "a",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-		ContainerLabels: map[string]string{
-			"a": "b",
-		},
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerRaw)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "" ||
-		splunkLoggerDriver.nullMessage.SourceType != "" ||
-		splunkLoggerDriver.nullMessage.Index != "" ||
-		splunkLoggerDriver.gzipCompression != false ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize ||
-		string(splunkLoggerDriver.prefix) != "containeriid a=b " {
-		t.Fatal("Values do not match configuration.")
-	}
-
-	message1Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("{\"a\":\"b\"}"), "stdout", message1Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-	message2Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("notjson"), "stdout", message2Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 2 {
-		t.Fatal("Expected two messages")
-	}
-
-	message1 := hec.messages[0]
-	if message1.Time != fmt.Sprintf("%f", float64(message1Time.UnixNano())/float64(time.Second)) ||
-		message1.Host != hostname ||
-		message1.Source != "" ||
-		message1.SourceType != "" ||
-		message1.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message1)
-	}
-
-	if event, err := message1.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "containeriid a=b {\"a\":\"b\"}" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	message2 := hec.messages[1]
-	if message2.Time != fmt.Sprintf("%f", float64(message2Time.UnixNano())/float64(time.Second)) ||
-		message2.Host != hostname ||
-		message2.Source != "" ||
-		message2.SourceType != "" ||
-		message2.Index != "" {
-		t.Fatalf("Unexpected values of message 2 %v", message2)
-	}
-
-	if event, err := message2.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "containeriid a=b notjson" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify that Splunk Logging Driver can accept tag="" which will allow to send raw messages
-// in the same way we get them in stdout/stderr
-func TestRawFormatWithoutTag(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:    hec.URL(),
-			splunkTokenKey:  hec.token,
-			splunkFormatKey: splunkFormatRaw,
-			tagKey:          "",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	hostname, err := ctx.Hostname()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !hec.connectionVerified {
-		t.Fatal("By default connection should be verified")
-	}
-
-	splunkLoggerDriver, ok := loggerDriver.(*splunkLoggerRaw)
-	if !ok {
-		t.Fatal("Unexpected Splunk Logging Driver type")
-	}
-
-	if splunkLoggerDriver.url != hec.URL()+"/services/collector/event/1.0" ||
-		splunkLoggerDriver.auth != "Splunk "+hec.token ||
-		splunkLoggerDriver.nullMessage.Host != hostname ||
-		splunkLoggerDriver.nullMessage.Source != "" ||
-		splunkLoggerDriver.nullMessage.SourceType != "" ||
-		splunkLoggerDriver.nullMessage.Index != "" ||
-		splunkLoggerDriver.gzipCompression != false ||
-		splunkLoggerDriver.postMessagesFrequency != defaultPostMessagesFrequency ||
-		splunkLoggerDriver.postMessagesBatchSize != defaultPostMessagesBatchSize ||
-		splunkLoggerDriver.bufferMaximum != defaultBufferMaximum ||
-		cap(splunkLoggerDriver.stream) != defaultStreamChannelSize ||
-		string(splunkLoggerDriver.prefix) != "" {
-		t.Log(string(splunkLoggerDriver.prefix) + "a")
-		t.Fatal("Values do not match configuration.")
-	}
-
-	message1Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("{\"a\":\"b\"}"), "stdout", message1Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-	message2Time := time.Now()
-	if err := loggerDriver.Log(&logger.Message{[]byte("notjson"), "stdout", message2Time, nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 2 {
-		t.Fatal("Expected two messages")
-	}
-
-	message1 := hec.messages[0]
-	if message1.Time != fmt.Sprintf("%f", float64(message1Time.UnixNano())/float64(time.Second)) ||
-		message1.Host != hostname ||
-		message1.Source != "" ||
-		message1.SourceType != "" ||
-		message1.Index != "" {
-		t.Fatalf("Unexpected values of message 1 %v", message1)
-	}
-
-	if event, err := message1.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "{\"a\":\"b\"}" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	message2 := hec.messages[1]
-	if message2.Time != fmt.Sprintf("%f", float64(message2Time.UnixNano())/float64(time.Second)) ||
-		message2.Host != hostname ||
-		message2.Source != "" ||
-		message2.SourceType != "" ||
-		message2.Index != "" {
-		t.Fatalf("Unexpected values of message 2 %v", message2)
-	}
-
-	if event, err := message2.EventAsString(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event != "notjson" {
-			t.Fatalf("Unexpected event in message 1 %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify that we will send messages in batches with default batching parameters,
-// but change frequency to be sure that numOfRequests will match expected 17 requests
-func TestBatching(t *testing.T) {
-	if err := os.Setenv(envVarPostMessagesFrequency, "10h"); err != nil {
-		t.Fatal(err)
-	}
-
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < defaultStreamChannelSize*4; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != defaultStreamChannelSize*4 {
-		t.Fatal("Not all messages delivered")
-	}
-
-	for i, message := range hec.messages {
-		if event, err := message.EventAsMap(); err != nil {
-			t.Fatal(err)
-		} else {
-			if event["line"] != fmt.Sprintf("%d", i) {
-				t.Fatalf("Unexpected event in message %v", event)
-			}
-		}
-	}
-
-	// 1 to verify connection and 16 batches
-	if hec.numOfRequests != 17 {
-		t.Fatalf("Unexpected number of requests %d", hec.numOfRequests)
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesFrequency, ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify that test is using time to fire events not rare than specified frequency
-func TestFrequency(t *testing.T) {
-	if err := os.Setenv(envVarPostMessagesFrequency, "5ms"); err != nil {
-		t.Fatal(err)
-	}
-
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-		time.Sleep(15 * time.Millisecond)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 10 {
-		t.Fatal("Not all messages delivered")
-	}
-
-	for i, message := range hec.messages {
-		if event, err := message.EventAsMap(); err != nil {
-			t.Fatal(err)
-		} else {
-			if event["line"] != fmt.Sprintf("%d", i) {
-				t.Fatalf("Unexpected event in message %v", event)
-			}
-		}
-	}
-
-	// 1 to verify connection and 10 to verify that we have sent messages with required frequency,
-	// but because frequency is too small (to keep test quick), instead of 11, use 9 if context switches will be slow
-	if hec.numOfRequests < 9 {
-		t.Fatalf("Unexpected number of requests %d", hec.numOfRequests)
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesFrequency, ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Simulate behavior similar to first version of Splunk Logging Driver, when we were sending one message
-// per request
-func TestOneMessagePerRequest(t *testing.T) {
-	if err := os.Setenv(envVarPostMessagesFrequency, "10h"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesBatchSize, "1"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, "1"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, "0"); err != nil {
-		t.Fatal(err)
-	}
-
-	hec := NewHTTPEventCollectorMock(t)
-
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := 0; i < 10; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 10 {
-		t.Fatal("Not all messages delivered")
-	}
-
-	for i, message := range hec.messages {
-		if event, err := message.EventAsMap(); err != nil {
-			t.Fatal(err)
-		} else {
-			if event["line"] != fmt.Sprintf("%d", i) {
-				t.Fatalf("Unexpected event in message %v", event)
-			}
-		}
-	}
-
-	// 1 to verify connection and 10 messages
-	if hec.numOfRequests != 11 {
-		t.Fatalf("Unexpected number of requests %d", hec.numOfRequests)
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesFrequency, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesBatchSize, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Driver should not be created when HEC is unresponsive
-func TestVerify(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-	hec.simulateServerError = true
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	_, err := New(ctx)
-	if err == nil {
-		t.Fatal("Expecting driver to fail, when server is unresponsive")
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify that user can specify to skip verification that Splunk HEC is working.
-// Also in this test we verify retry logic.
-func TestSkipVerify(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-	hec.simulateServerError = true
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:              hec.URL(),
-			splunkTokenKey:            hec.token,
-			splunkVerifyConnectionKey: "false",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hec.connectionVerified {
-		t.Fatal("Connection should not be verified")
-	}
-
-	for i := 0; i < defaultStreamChannelSize*2; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if len(hec.messages) != 0 {
-		t.Fatal("No messages should be accepted at this point")
-	}
-
-	hec.simulateServerError = false
-
-	for i := defaultStreamChannelSize * 2; i < defaultStreamChannelSize*4; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != defaultStreamChannelSize*4 {
-		t.Fatal("Not all messages delivered")
-	}
-
-	for i, message := range hec.messages {
-		if event, err := message.EventAsMap(); err != nil {
-			t.Fatal(err)
-		} else {
-			if event["line"] != fmt.Sprintf("%d", i) {
-				t.Fatalf("Unexpected event in message %v", event)
-			}
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify logic for when we filled whole buffer
-func TestBufferMaximum(t *testing.T) {
-	if err := os.Setenv(envVarPostMessagesBatchSize, "2"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, "10"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, "0"); err != nil {
-		t.Fatal(err)
-	}
-
-	hec := NewHTTPEventCollectorMock(t)
-	hec.simulateServerError = true
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:              hec.URL(),
-			splunkTokenKey:            hec.token,
-			splunkVerifyConnectionKey: "false",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hec.connectionVerified {
-		t.Fatal("Connection should not be verified")
-	}
-
-	for i := 0; i < 11; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if len(hec.messages) != 0 {
-		t.Fatal("No messages should be accepted at this point")
-	}
-
-	hec.simulateServerError = false
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 9 {
-		t.Fatalf("Expected # of messages %d, got %d", 9, len(hec.messages))
-	}
-
-	// First 1000 messages are written to daemon log when buffer was full
-	for i, message := range hec.messages {
-		if event, err := message.EventAsMap(); err != nil {
-			t.Fatal(err)
-		} else {
-			if event["line"] != fmt.Sprintf("%d", i+2) {
-				t.Fatalf("Unexpected event in message %v", event)
-			}
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesBatchSize, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Verify that we are not blocking close when HEC is down for the whole time
-func TestServerAlwaysDown(t *testing.T) {
-	if err := os.Setenv(envVarPostMessagesBatchSize, "2"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, "4"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, "0"); err != nil {
-		t.Fatal(err)
-	}
-
-	hec := NewHTTPEventCollectorMock(t)
-	hec.simulateServerError = true
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:              hec.URL(),
-			splunkTokenKey:            hec.token,
-			splunkVerifyConnectionKey: "false",
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hec.connectionVerified {
-		t.Fatal("Connection should not be verified")
-	}
-
-	for i := 0; i < 5; i++ {
-		if err := loggerDriver.Log(&logger.Message{[]byte(fmt.Sprintf("%d", i)), "stdout", time.Now(), nil, false}); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(hec.messages) != 0 {
-		t.Fatal("No messages should be sent")
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarPostMessagesBatchSize, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarBufferMaximum, ""); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Setenv(envVarStreamChannelSize, ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Cannot send messages after we close driver
-func TestCannotSendAfterClose(t *testing.T) {
-	hec := NewHTTPEventCollectorMock(t)
-	go hec.Serve()
-
-	ctx := logger.Context{
-		Config: map[string]string{
-			splunkURLKey:   hec.URL(),
-			splunkTokenKey: hec.token,
-		},
-		ContainerID:        "containeriid",
-		ContainerName:      "/container_name",
-		ContainerImageID:   "contaimageid",
-		ContainerImageName: "container_image_name",
-	}
-
-	loggerDriver, err := New(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := loggerDriver.Log(&logger.Message{[]byte("message1"), "stdout", time.Now(), nil, false}); err != nil {
-		t.Fatal(err)
-	}
-
-	err = loggerDriver.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := loggerDriver.Log(&logger.Message{[]byte("message2"), "stdout", time.Now(), nil, false}); err == nil {
-		t.Fatal("Driver should not allow to send messages after close")
-	}
-
-	if len(hec.messages) != 1 {
-		t.Fatal("Only one message should be sent")
-	}
-
-	message := hec.messages[0]
-	if event, err := message.EventAsMap(); err != nil {
-		t.Fatal(err)
-	} else {
-		if event["line"] != "message1" {
-			t.Fatalf("Unexpected event in message %v", event)
-		}
-	}
-
-	err = hec.Close()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunkhecmock_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunkhecmock_test.go
deleted file mode 100644
index e508948280..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/splunk/splunkhecmock_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package splunk
-
-import (
-	"compress/gzip"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"testing"
-)
-
-func (message *splunkMessage) EventAsString() (string, error) {
-	if val, ok := message.Event.(string); ok {
-		return val, nil
-	}
-	return "", fmt.Errorf("Cannot cast Event %v to string", message.Event)
-}
-
-func (message *splunkMessage) EventAsMap() (map[string]interface{}, error) {
-	if val, ok := message.Event.(map[string]interface{}); ok {
-		return val, nil
-	}
-	return nil, fmt.Errorf("Cannot cast Event %v to map", message.Event)
-}
-
-type HTTPEventCollectorMock struct {
-	tcpAddr     *net.TCPAddr
-	tcpListener *net.TCPListener
-
-	token               string
-	simulateServerError bool
-
-	test *testing.T
-
-	connectionVerified bool
-	gzipEnabled        *bool
-	messages           []*splunkMessage
-	numOfRequests      int
-}
-
-func NewHTTPEventCollectorMock(t *testing.T) *HTTPEventCollectorMock {
-	tcpAddr := &net.TCPAddr{IP: []byte{127, 0, 0, 1}, Port: 0, Zone: ""}
-	tcpListener, err := net.ListenTCP("tcp", tcpAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return &HTTPEventCollectorMock{
-		tcpAddr:             tcpAddr,
-		tcpListener:         tcpListener,
-		token:               "4642492F-D8BD-47F1-A005-0C08AE4657DF",
-		simulateServerError: false,
-		test:                t,
-		connectionVerified:  false}
-}
-
-func (hec *HTTPEventCollectorMock) URL() string {
-	return "http://" + hec.tcpListener.Addr().String()
-}
-
-func (hec *HTTPEventCollectorMock) Serve() error {
-	return http.Serve(hec.tcpListener, hec)
-}
-
-func (hec *HTTPEventCollectorMock) Close() error {
-	return hec.tcpListener.Close()
-}
-
-func (hec *HTTPEventCollectorMock) ServeHTTP(writer http.ResponseWriter, request *http.Request) {
-	var err error
-
-	hec.numOfRequests++
-
-	if hec.simulateServerError {
-		if request.Body != nil {
-			defer request.Body.Close()
-		}
-		writer.WriteHeader(http.StatusInternalServerError)
-		return
-	}
-
-	switch request.Method {
-	case http.MethodOptions:
-		// Verify that options method is getting called only once
-		if hec.connectionVerified {
-			hec.test.Errorf("Connection should not be verified more than once. Got second request with %s method.", request.Method)
-		}
-		hec.connectionVerified = true
-		writer.WriteHeader(http.StatusOK)
-	case http.MethodPost:
-		// Always verify that Driver is using correct path to HEC
-		if request.URL.String() != "/services/collector/event/1.0" {
-			hec.test.Errorf("Unexpected path %v", request.URL)
-		}
-		defer request.Body.Close()
-
-		if authorization, ok := request.Header["Authorization"]; !ok || authorization[0] != ("Splunk "+hec.token) {
-			hec.test.Error("Authorization header is invalid.")
-		}
-
-		gzipEnabled := false
-		if contentEncoding, ok := request.Header["Content-Encoding"]; ok && contentEncoding[0] == "gzip" {
-			gzipEnabled = true
-		}
-
-		if hec.gzipEnabled == nil {
-			hec.gzipEnabled = &gzipEnabled
-		} else if gzipEnabled != *hec.gzipEnabled {
-			// Nothing wrong with that, but we just know that Splunk Logging Driver does not do that
-			hec.test.Error("Driver should not change Content Encoding.")
-		}
-
-		var gzipReader *gzip.Reader
-		var reader io.Reader
-		if gzipEnabled {
-			gzipReader, err = gzip.NewReader(request.Body)
-			if err != nil {
-				hec.test.Fatal(err)
-			}
-			reader = gzipReader
-		} else {
-			reader = request.Body
-		}
-
-		// Read body
-		var body []byte
-		body, err = ioutil.ReadAll(reader)
-		if err != nil {
-			hec.test.Fatal(err)
-		}
-
-		// Parse message
-		messageStart := 0
-		for i := 0; i < len(body); i++ {
-			if i == len(body)-1 || (body[i] == '}' && body[i+1] == '{') {
-				var message splunkMessage
-				err = json.Unmarshal(body[messageStart:i+1], &message)
-				if err != nil {
-					hec.test.Log(string(body[messageStart : i+1]))
-					hec.test.Fatal(err)
-				}
-				hec.messages = append(hec.messages, &message)
-				messageStart = i + 1
-			}
-		}
-
-		if gzipEnabled {
-			gzipReader.Close()
-		}
-
-		writer.WriteHeader(http.StatusOK)
-	default:
-		hec.test.Errorf("Unexpected HTTP method %s", http.MethodOptions)
-		writer.WriteHeader(http.StatusBadRequest)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog.go b/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog.go
deleted file mode 100644
index fb9e867ff5..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Package syslog provides the logdriver for forwarding server logs to syslog endpoints.
-package syslog
-
-import (
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	syslog "github.com/RackSec/srslog"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/daemon/logger/loggerutils"
-	"github.com/docker/docker/pkg/urlutil"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-const (
-	name        = "syslog"
-	secureProto = "tcp+tls"
-)
-
-var facilities = map[string]syslog.Priority{
-	"kern":     syslog.LOG_KERN,
-	"user":     syslog.LOG_USER,
-	"mail":     syslog.LOG_MAIL,
-	"daemon":   syslog.LOG_DAEMON,
-	"auth":     syslog.LOG_AUTH,
-	"syslog":   syslog.LOG_SYSLOG,
-	"lpr":      syslog.LOG_LPR,
-	"news":     syslog.LOG_NEWS,
-	"uucp":     syslog.LOG_UUCP,
-	"cron":     syslog.LOG_CRON,
-	"authpriv": syslog.LOG_AUTHPRIV,
-	"ftp":      syslog.LOG_FTP,
-	"local0":   syslog.LOG_LOCAL0,
-	"local1":   syslog.LOG_LOCAL1,
-	"local2":   syslog.LOG_LOCAL2,
-	"local3":   syslog.LOG_LOCAL3,
-	"local4":   syslog.LOG_LOCAL4,
-	"local5":   syslog.LOG_LOCAL5,
-	"local6":   syslog.LOG_LOCAL6,
-	"local7":   syslog.LOG_LOCAL7,
-}
-
-type syslogger struct {
-	writer *syslog.Writer
-}
-
-func init() {
-	if err := logger.RegisterLogDriver(name, New); err != nil {
-		logrus.Fatal(err)
-	}
-	if err := logger.RegisterLogOptValidator(name, ValidateLogOpt); err != nil {
-		logrus.Fatal(err)
-	}
-}
-
-// rsyslog uses appname part of syslog message to fill in an %syslogtag% template
-// attribute in rsyslog.conf. In order to be backward compatible to rfc3164
-// tag will be also used as an appname
-func rfc5424formatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string {
-	timestamp := time.Now().Format(time.RFC3339)
-	pid := os.Getpid()
-	msg := fmt.Sprintf("<%d>%d %s %s %s %d %s %s",
-		p, 1, timestamp, hostname, tag, pid, tag, content)
-	return msg
-}
-
-// The timestamp field in rfc5424 is derived from rfc3339. Whereas rfc3339 makes allowances
-// for multiple syntaxes, there are further restrictions in rfc5424, i.e., the maximium
-// resolution is limited to "TIME-SECFRAC" which is 6 (microsecond resolution)
-func rfc5424microformatterWithAppNameAsTag(p syslog.Priority, hostname, tag, content string) string {
-	timestamp := time.Now().Format("2006-01-02T15:04:05.999999Z07:00")
-	pid := os.Getpid()
-	msg := fmt.Sprintf("<%d>%d %s %s %s %d %s %s",
-		p, 1, timestamp, hostname, tag, pid, tag, content)
-	return msg
-}
-
-// New creates a syslog logger using the configuration passed in on
-// the context. Supported context configuration variables are
-// syslog-address, syslog-facility, syslog-format.
-func New(ctx logger.Context) (logger.Logger, error) {
-	tag, err := loggerutils.ParseLogTag(ctx, loggerutils.DefaultTemplate)
-	if err != nil {
-		return nil, err
-	}
-
-	proto, address, err := parseAddress(ctx.Config["syslog-address"])
-	if err != nil {
-		return nil, err
-	}
-
-	facility, err := parseFacility(ctx.Config["syslog-facility"])
-	if err != nil {
-		return nil, err
-	}
-
-	syslogFormatter, syslogFramer, err := parseLogFormat(ctx.Config["syslog-format"], proto)
-	if err != nil {
-		return nil, err
-	}
-
-	var log *syslog.Writer
-	if proto == secureProto {
-		tlsConfig, tlsErr := parseTLSConfig(ctx.Config)
-		if tlsErr != nil {
-			return nil, tlsErr
-		}
-		log, err = syslog.DialWithTLSConfig(proto, address, facility, tag, tlsConfig)
-	} else {
-		log, err = syslog.Dial(proto, address, facility, tag)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	log.SetFormatter(syslogFormatter)
-	log.SetFramer(syslogFramer)
-
-	return &syslogger{
-		writer: log,
-	}, nil
-}
-
-func (s *syslogger) Log(msg *logger.Message) error {
-	if msg.Source == "stderr" {
-		return s.writer.Err(string(msg.Line))
-	}
-	return s.writer.Info(string(msg.Line))
-}
-
-func (s *syslogger) Close() error {
-	return s.writer.Close()
-}
-
-func (s *syslogger) Name() string {
-	return name
-}
-
-func parseAddress(address string) (string, string, error) {
-	if address == "" {
-		return "", "", nil
-	}
-	if !urlutil.IsTransportURL(address) {
-		return "", "", fmt.Errorf("syslog-address should be in form proto://address, got %v", address)
-	}
-	url, err := url.Parse(address)
-	if err != nil {
-		return "", "", err
-	}
-
-	// unix and unixgram socket validation
-	if url.Scheme == "unix" || url.Scheme == "unixgram" {
-		if _, err := os.Stat(url.Path); err != nil {
-			return "", "", err
-		}
-		return url.Scheme, url.Path, nil
-	}
-
-	// here we process tcp|udp
-	host := url.Host
-	if _, _, err := net.SplitHostPort(host); err != nil {
-		if !strings.Contains(err.Error(), "missing port in address") {
-			return "", "", err
-		}
-		host = host + ":514"
-	}
-
-	return url.Scheme, host, nil
-}
-
-// ValidateLogOpt looks for syslog specific log options
-// syslog-address, syslog-facility.
-func ValidateLogOpt(cfg map[string]string) error {
-	for key := range cfg {
-		switch key {
-		case "env":
-		case "labels":
-		case "syslog-address":
-		case "syslog-facility":
-		case "syslog-tls-ca-cert":
-		case "syslog-tls-cert":
-		case "syslog-tls-key":
-		case "syslog-tls-skip-verify":
-		case "tag":
-		case "syslog-format":
-		default:
-			return fmt.Errorf("unknown log opt '%s' for syslog log driver", key)
-		}
-	}
-	if _, _, err := parseAddress(cfg["syslog-address"]); err != nil {
-		return err
-	}
-	if _, err := parseFacility(cfg["syslog-facility"]); err != nil {
-		return err
-	}
-	if _, _, err := parseLogFormat(cfg["syslog-format"], ""); err != nil {
-		return err
-	}
-	return nil
-}
-
-func parseFacility(facility string) (syslog.Priority, error) {
-	if facility == "" {
-		return syslog.LOG_DAEMON, nil
-	}
-
-	if syslogFacility, valid := facilities[facility]; valid {
-		return syslogFacility, nil
-	}
-
-	fInt, err := strconv.Atoi(facility)
-	if err == nil && 0 <= fInt && fInt <= 23 {
-		return syslog.Priority(fInt << 3), nil
-	}
-
-	return syslog.Priority(0), errors.New("invalid syslog facility")
-}
-
-func parseTLSConfig(cfg map[string]string) (*tls.Config, error) {
-	_, skipVerify := cfg["syslog-tls-skip-verify"]
-
-	opts := tlsconfig.Options{
-		CAFile:             cfg["syslog-tls-ca-cert"],
-		CertFile:           cfg["syslog-tls-cert"],
-		KeyFile:            cfg["syslog-tls-key"],
-		InsecureSkipVerify: skipVerify,
-	}
-
-	return tlsconfig.Client(opts)
-}
-
-func parseLogFormat(logFormat, proto string) (syslog.Formatter, syslog.Framer, error) {
-	switch logFormat {
-	case "":
-		return syslog.UnixFormatter, syslog.DefaultFramer, nil
-	case "rfc3164":
-		return syslog.RFC3164Formatter, syslog.DefaultFramer, nil
-	case "rfc5424":
-		if proto == secureProto {
-			return rfc5424formatterWithAppNameAsTag, syslog.RFC5425MessageLengthFramer, nil
-		}
-		return rfc5424formatterWithAppNameAsTag, syslog.DefaultFramer, nil
-	case "rfc5424micro":
-		if proto == secureProto {
-			return rfc5424microformatterWithAppNameAsTag, syslog.RFC5425MessageLengthFramer, nil
-		}
-		return rfc5424microformatterWithAppNameAsTag, syslog.DefaultFramer, nil
-	default:
-		return nil, nil, errors.New("Invalid syslog format")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog_test.go b/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog_test.go
deleted file mode 100644
index 501561064b..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logger/syslog/syslog_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package syslog
-
-import (
-	"reflect"
-	"testing"
-
-	syslog "github.com/RackSec/srslog"
-)
-
-func functionMatches(expectedFun interface{}, actualFun interface{}) bool {
-	return reflect.ValueOf(expectedFun).Pointer() == reflect.ValueOf(actualFun).Pointer()
-}
-
-func TestParseLogFormat(t *testing.T) {
-	formatter, framer, err := parseLogFormat("rfc5424", "udp")
-	if err != nil || !functionMatches(rfc5424formatterWithAppNameAsTag, formatter) ||
-		!functionMatches(syslog.DefaultFramer, framer) {
-		t.Fatal("Failed to parse rfc5424 format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("rfc5424", "tcp+tls")
-	if err != nil || !functionMatches(rfc5424formatterWithAppNameAsTag, formatter) ||
-		!functionMatches(syslog.RFC5425MessageLengthFramer, framer) {
-		t.Fatal("Failed to parse rfc5424 format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("rfc5424micro", "udp")
-	if err != nil || !functionMatches(rfc5424microformatterWithAppNameAsTag, formatter) ||
-		!functionMatches(syslog.DefaultFramer, framer) {
-		t.Fatal("Failed to parse rfc5424 (microsecond) format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("rfc5424micro", "tcp+tls")
-	if err != nil || !functionMatches(rfc5424microformatterWithAppNameAsTag, formatter) ||
-		!functionMatches(syslog.RFC5425MessageLengthFramer, framer) {
-		t.Fatal("Failed to parse rfc5424 (microsecond) format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("rfc3164", "")
-	if err != nil || !functionMatches(syslog.RFC3164Formatter, formatter) ||
-		!functionMatches(syslog.DefaultFramer, framer) {
-		t.Fatal("Failed to parse rfc3164 format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("", "")
-	if err != nil || !functionMatches(syslog.UnixFormatter, formatter) ||
-		!functionMatches(syslog.DefaultFramer, framer) {
-		t.Fatal("Failed to parse empty format", err, formatter, framer)
-	}
-
-	formatter, framer, err = parseLogFormat("invalid", "")
-	if err == nil {
-		t.Fatal("Failed to parse invalid format", err, formatter, framer)
-	}
-}
-
-func TestValidateLogOptEmpty(t *testing.T) {
-	emptyConfig := make(map[string]string)
-	if err := ValidateLogOpt(emptyConfig); err != nil {
-		t.Fatal("Failed to parse empty config", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logs.go b/installer/vendor/github.com/docker/docker/daemon/logs.go
deleted file mode 100644
index cc34b82083..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logs.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/backend"
-	containertypes "github.com/docker/docker/api/types/container"
-	timetypes "github.com/docker/docker/api/types/time"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/logger"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/stdcopy"
-)
-
-// ContainerLogs hooks up a container's stdout and stderr streams
-// configured with the given struct.
-func (daemon *Daemon) ContainerLogs(ctx context.Context, containerName string, config *backend.ContainerLogsConfig, started chan struct{}) error {
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		return err
-	}
-
-	if !(config.ShowStdout || config.ShowStderr) {
-		return fmt.Errorf("You must choose at least one stream")
-	}
-
-	cLog, err := daemon.getLogger(container)
-	if err != nil {
-		return err
-	}
-	logReader, ok := cLog.(logger.LogReader)
-	if !ok {
-		return logger.ErrReadLogsNotSupported
-	}
-
-	follow := config.Follow && container.IsRunning()
-	tailLines, err := strconv.Atoi(config.Tail)
-	if err != nil {
-		tailLines = -1
-	}
-
-	logrus.Debug("logs: begin stream")
-
-	var since time.Time
-	if config.Since != "" {
-		s, n, err := timetypes.ParseTimestamps(config.Since, 0)
-		if err != nil {
-			return err
-		}
-		since = time.Unix(s, n)
-	}
-	readConfig := logger.ReadConfig{
-		Since:  since,
-		Tail:   tailLines,
-		Follow: follow,
-	}
-	logs := logReader.ReadLogs(readConfig)
-
-	wf := ioutils.NewWriteFlusher(config.OutStream)
-	defer wf.Close()
-	close(started)
-	wf.Flush()
-
-	var outStream io.Writer
-	outStream = wf
-	errStream := outStream
-	if !container.Config.Tty {
-		errStream = stdcopy.NewStdWriter(outStream, stdcopy.Stderr)
-		outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
-	}
-
-	for {
-		select {
-		case err := <-logs.Err:
-			logrus.Errorf("Error streaming logs: %v", err)
-			return nil
-		case <-ctx.Done():
-			logs.Close()
-			return nil
-		case msg, ok := <-logs.Msg:
-			if !ok {
-				logrus.Debug("logs: end stream")
-				logs.Close()
-				if cLog != container.LogDriver {
-					// Since the logger isn't cached in the container, which occurs if it is running, it
-					// must get explicitly closed here to avoid leaking it and any file handles it has.
-					if err := cLog.Close(); err != nil {
-						logrus.Errorf("Error closing logger: %v", err)
-					}
-				}
-				return nil
-			}
-			logLine := msg.Line
-			if config.Details {
-				logLine = append([]byte(msg.Attrs.String()+" "), logLine...)
-			}
-			if config.Timestamps {
-				logLine = append([]byte(msg.Timestamp.Format(logger.TimeFormat)+" "), logLine...)
-			}
-			if msg.Source == "stdout" && config.ShowStdout {
-				outStream.Write(logLine)
-			}
-			if msg.Source == "stderr" && config.ShowStderr {
-				errStream.Write(logLine)
-			}
-		}
-	}
-}
-
-func (daemon *Daemon) getLogger(container *container.Container) (logger.Logger, error) {
-	if container.LogDriver != nil && container.IsRunning() {
-		return container.LogDriver, nil
-	}
-	return container.StartLogger(container.HostConfig.LogConfig)
-}
-
-// mergeLogConfig merges the daemon log config to the container's log config if the container's log driver is not specified.
-func (daemon *Daemon) mergeAndVerifyLogConfig(cfg *containertypes.LogConfig) error {
-	if cfg.Type == "" {
-		cfg.Type = daemon.defaultLogConfig.Type
-	}
-
-	if cfg.Config == nil {
-		cfg.Config = make(map[string]string)
-	}
-
-	if cfg.Type == daemon.defaultLogConfig.Type {
-		for k, v := range daemon.defaultLogConfig.Config {
-			if _, ok := cfg.Config[k]; !ok {
-				cfg.Config[k] = v
-			}
-		}
-	}
-
-	return logger.ValidateLogOpts(cfg.Type, cfg.Config)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/logs_test.go b/installer/vendor/github.com/docker/docker/daemon/logs_test.go
deleted file mode 100644
index 0c36299e09..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/logs_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package daemon
-
-import (
-	"testing"
-
-	containertypes "github.com/docker/docker/api/types/container"
-)
-
-func TestMergeAndVerifyLogConfigNilConfig(t *testing.T) {
-	d := &Daemon{defaultLogConfig: containertypes.LogConfig{Type: "json-file", Config: map[string]string{"max-file": "1"}}}
-	cfg := containertypes.LogConfig{Type: d.defaultLogConfig.Type}
-	if err := d.mergeAndVerifyLogConfig(&cfg); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/metrics.go b/installer/vendor/github.com/docker/docker/daemon/metrics.go
deleted file mode 100644
index 69dbfd9378..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/metrics.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package daemon
-
-import "github.com/docker/go-metrics"
-
-var (
-	containerActions          metrics.LabeledTimer
-	imageActions              metrics.LabeledTimer
-	networkActions            metrics.LabeledTimer
-	engineVersion             metrics.LabeledGauge
-	engineCpus                metrics.Gauge
-	engineMemory              metrics.Gauge
-	healthChecksCounter       metrics.Counter
-	healthChecksFailedCounter metrics.Counter
-)
-
-func init() {
-	ns := metrics.NewNamespace("engine", "daemon", nil)
-	containerActions = ns.NewLabeledTimer("container_actions", "The number of seconds it takes to process each container action", "action")
-	for _, a := range []string{
-		"start",
-		"changes",
-		"commit",
-		"create",
-		"delete",
-	} {
-		containerActions.WithValues(a).Update(0)
-	}
-	networkActions = ns.NewLabeledTimer("network_actions", "The number of seconds it takes to process each network action", "action")
-	engineVersion = ns.NewLabeledGauge("engine", "The version and commit information for the engine process", metrics.Unit("info"),
-		"version",
-		"commit",
-		"architecture",
-		"graph_driver", "kernel",
-		"os",
-	)
-	engineCpus = ns.NewGauge("engine_cpus", "The number of cpus that the host system of the engine has", metrics.Unit("cpus"))
-	engineMemory = ns.NewGauge("engine_memory", "The number of bytes of memory that the host system of the engine has", metrics.Bytes)
-	healthChecksCounter = ns.NewCounter("health_checks", "The total number of health checks")
-	healthChecksFailedCounter = ns.NewCounter("health_checks_failed", "The total number of failed health checks")
-	imageActions = ns.NewLabeledTimer("image_actions", "The number of seconds it takes to process each image action", "action")
-	metrics.Register(ns)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/monitor.go b/installer/vendor/github.com/docker/docker/daemon/monitor.go
deleted file mode 100644
index ee0d1fcce0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/monitor.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"runtime"
-	"strconv"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/restartmanager"
-)
-
-// StateChanged updates daemon state changes from containerd
-func (daemon *Daemon) StateChanged(id string, e libcontainerd.StateInfo) error {
-	c := daemon.containers.Get(id)
-	if c == nil {
-		return fmt.Errorf("no such container: %s", id)
-	}
-
-	switch e.State {
-	case libcontainerd.StateOOM:
-		// StateOOM is Linux specific and should never be hit on Windows
-		if runtime.GOOS == "windows" {
-			return errors.New("Received StateOOM from libcontainerd on Windows. This should never happen.")
-		}
-		daemon.updateHealthMonitor(c)
-		daemon.LogContainerEvent(c, "oom")
-	case libcontainerd.StateExit:
-		// if container's AutoRemove flag is set, remove it after clean up
-		autoRemove := func() {
-			if c.HostConfig.AutoRemove {
-				if err := daemon.ContainerRm(c.ID, &types.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil {
-					logrus.Errorf("can't remove container %s: %v", c.ID, err)
-				}
-			}
-		}
-
-		c.Lock()
-		c.StreamConfig.Wait()
-		c.Reset(false)
-
-		restart, wait, err := c.RestartManager().ShouldRestart(e.ExitCode, false, time.Since(c.StartedAt))
-		if err == nil && restart {
-			c.RestartCount++
-			c.SetRestarting(platformConstructExitStatus(e))
-		} else {
-			c.SetStopped(platformConstructExitStatus(e))
-			defer autoRemove()
-		}
-
-		daemon.updateHealthMonitor(c)
-		attributes := map[string]string{
-			"exitCode": strconv.Itoa(int(e.ExitCode)),
-		}
-		daemon.LogContainerEventWithAttributes(c, "die", attributes)
-		daemon.Cleanup(c)
-
-		if err == nil && restart {
-			go func() {
-				err := <-wait
-				if err == nil {
-					if err = daemon.containerStart(c, "", "", false); err != nil {
-						logrus.Debugf("failed to restart container: %+v", err)
-					}
-				}
-				if err != nil {
-					c.SetStopped(platformConstructExitStatus(e))
-					defer autoRemove()
-					if err != restartmanager.ErrRestartCanceled {
-						logrus.Errorf("restartmanger wait error: %+v", err)
-					}
-				}
-			}()
-		}
-
-		defer c.Unlock()
-		if err := c.ToDisk(); err != nil {
-			return err
-		}
-		return daemon.postRunProcessing(c, e)
-	case libcontainerd.StateExitProcess:
-		if execConfig := c.ExecCommands.Get(e.ProcessID); execConfig != nil {
-			ec := int(e.ExitCode)
-			execConfig.Lock()
-			defer execConfig.Unlock()
-			execConfig.ExitCode = &ec
-			execConfig.Running = false
-			execConfig.StreamConfig.Wait()
-			if err := execConfig.CloseStreams(); err != nil {
-				logrus.Errorf("%s: %s", c.ID, err)
-			}
-
-			// remove the exec command from the container's store only and not the
-			// daemon's store so that the exec command can be inspected.
-			c.ExecCommands.Delete(execConfig.ID)
-		} else {
-			logrus.Warnf("Ignoring StateExitProcess for %v but no exec command found", e)
-		}
-	case libcontainerd.StateStart, libcontainerd.StateRestore:
-		// Container is already locked in this case
-		c.SetRunning(int(e.Pid), e.State == libcontainerd.StateStart)
-		c.HasBeenManuallyStopped = false
-		c.HasBeenStartedBefore = true
-		if err := c.ToDisk(); err != nil {
-			c.Reset(false)
-			return err
-		}
-		daemon.initHealthMonitor(c)
-		daemon.LogContainerEvent(c, "start")
-	case libcontainerd.StatePause:
-		// Container is already locked in this case
-		c.Paused = true
-		if err := c.ToDisk(); err != nil {
-			return err
-		}
-		daemon.updateHealthMonitor(c)
-		daemon.LogContainerEvent(c, "pause")
-	case libcontainerd.StateResume:
-		// Container is already locked in this case
-		c.Paused = false
-		if err := c.ToDisk(); err != nil {
-			return err
-		}
-		daemon.updateHealthMonitor(c)
-		daemon.LogContainerEvent(c, "unpause")
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/monitor_linux.go b/installer/vendor/github.com/docker/docker/daemon/monitor_linux.go
deleted file mode 100644
index 09f5af50c6..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/monitor_linux.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-// platformConstructExitStatus returns a platform specific exit status structure
-func platformConstructExitStatus(e libcontainerd.StateInfo) *container.ExitStatus {
-	return &container.ExitStatus{
-		ExitCode:  int(e.ExitCode),
-		OOMKilled: e.OOMKilled,
-	}
-}
-
-// postRunProcessing perfoms any processing needed on the container after it has stopped.
-func (daemon *Daemon) postRunProcessing(container *container.Container, e libcontainerd.StateInfo) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/monitor_solaris.go b/installer/vendor/github.com/docker/docker/daemon/monitor_solaris.go
deleted file mode 100644
index 5ccfada76a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/monitor_solaris.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-// platformConstructExitStatus returns a platform specific exit status structure
-func platformConstructExitStatus(e libcontainerd.StateInfo) *container.ExitStatus {
-	return &container.ExitStatus{
-		ExitCode: int(e.ExitCode),
-	}
-}
-
-// postRunProcessing perfoms any processing needed on the container after it has stopped.
-func (daemon *Daemon) postRunProcessing(container *container.Container, e libcontainerd.StateInfo) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/monitor_windows.go b/installer/vendor/github.com/docker/docker/daemon/monitor_windows.go
deleted file mode 100644
index 9648b1b415..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/monitor_windows.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-// platformConstructExitStatus returns a platform specific exit status structure
-func platformConstructExitStatus(e libcontainerd.StateInfo) *container.ExitStatus {
-	return &container.ExitStatus{
-		ExitCode: int(e.ExitCode),
-	}
-}
-
-// postRunProcessing perfoms any processing needed on the container after it has stopped.
-func (daemon *Daemon) postRunProcessing(container *container.Container, e libcontainerd.StateInfo) error {
-	if e.ExitCode == 0 && e.UpdatePending {
-		spec, err := daemon.createSpec(container)
-		if err != nil {
-			return err
-		}
-
-		newOpts := []libcontainerd.CreateOption{&libcontainerd.ServicingOption{
-			IsServicing: true,
-		}}
-
-		copts, err := daemon.getLibcontainerdCreateOptions(container)
-		if err != nil {
-			return err
-		}
-
-		if copts != nil {
-			newOpts = append(newOpts, copts...)
-		}
-
-		// Create a new servicing container, which will start, complete the update, and merge back the
-		// results if it succeeded, all as part of the below function call.
-		if err := daemon.containerd.Create((container.ID + "_servicing"), "", "", *spec, container.InitializeStdio, newOpts...); err != nil {
-			container.SetExitCode(-1)
-			return fmt.Errorf("Post-run update servicing failed: %s", err)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/mounts.go b/installer/vendor/github.com/docker/docker/daemon/mounts.go
deleted file mode 100644
index 1c11f86a80..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/mounts.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/container"
-	volumestore "github.com/docker/docker/volume/store"
-)
-
-func (daemon *Daemon) prepareMountPoints(container *container.Container) error {
-	for _, config := range container.MountPoints {
-		if err := daemon.lazyInitializeVolume(container.ID, config); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (daemon *Daemon) removeMountPoints(container *container.Container, rm bool) error {
-	var rmErrors []string
-	for _, m := range container.MountPoints {
-		if m.Volume == nil {
-			continue
-		}
-		daemon.volumes.Dereference(m.Volume, container.ID)
-		if rm {
-			// Do not remove named mountpoints
-			// these are mountpoints specified like `docker run -v <name>:/foo`
-			if m.Spec.Source != "" {
-				continue
-			}
-			err := daemon.volumes.Remove(m.Volume)
-			// Ignore volume in use errors because having this
-			// volume being referenced by other container is
-			// not an error, but an implementation detail.
-			// This prevents docker from logging "ERROR: Volume in use"
-			// where there is another container using the volume.
-			if err != nil && !volumestore.IsInUse(err) {
-				rmErrors = append(rmErrors, err.Error())
-			}
-		}
-	}
-	if len(rmErrors) > 0 {
-		return fmt.Errorf("Error removing volumes:\n%v", strings.Join(rmErrors, "\n"))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/names.go b/installer/vendor/github.com/docker/docker/daemon/names.go
deleted file mode 100644
index 273d551513..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/names.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/namesgenerator"
-	"github.com/docker/docker/pkg/registrar"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/utils"
-)
-
-var (
-	validContainerNameChars   = utils.RestrictedNameChars
-	validContainerNamePattern = utils.RestrictedNamePattern
-)
-
-func (daemon *Daemon) registerName(container *container.Container) error {
-	if daemon.Exists(container.ID) {
-		return fmt.Errorf("Container is already loaded")
-	}
-	if err := validateID(container.ID); err != nil {
-		return err
-	}
-	if container.Name == "" {
-		name, err := daemon.generateNewName(container.ID)
-		if err != nil {
-			return err
-		}
-		container.Name = name
-
-		if err := container.ToDiskLocking(); err != nil {
-			logrus.Errorf("Error saving container name to disk: %v", err)
-		}
-	}
-	return daemon.nameIndex.Reserve(container.Name, container.ID)
-}
-
-func (daemon *Daemon) generateIDAndName(name string) (string, string, error) {
-	var (
-		err error
-		id  = stringid.GenerateNonCryptoID()
-	)
-
-	if name == "" {
-		if name, err = daemon.generateNewName(id); err != nil {
-			return "", "", err
-		}
-		return id, name, nil
-	}
-
-	if name, err = daemon.reserveName(id, name); err != nil {
-		return "", "", err
-	}
-
-	return id, name, nil
-}
-
-func (daemon *Daemon) reserveName(id, name string) (string, error) {
-	if !validContainerNamePattern.MatchString(strings.TrimPrefix(name, "/")) {
-		return "", fmt.Errorf("Invalid container name (%s), only %s are allowed", name, validContainerNameChars)
-	}
-	if name[0] != '/' {
-		name = "/" + name
-	}
-
-	if err := daemon.nameIndex.Reserve(name, id); err != nil {
-		if err == registrar.ErrNameReserved {
-			id, err := daemon.nameIndex.Get(name)
-			if err != nil {
-				logrus.Errorf("got unexpected error while looking up reserved name: %v", err)
-				return "", err
-			}
-			return "", fmt.Errorf("Conflict. The container name %q is already in use by container %s. You have to remove (or rename) that container to be able to reuse that name.", name, id)
-		}
-		return "", fmt.Errorf("error reserving name: %s, error: %v", name, err)
-	}
-	return name, nil
-}
-
-func (daemon *Daemon) releaseName(name string) {
-	daemon.nameIndex.Release(name)
-}
-
-func (daemon *Daemon) generateNewName(id string) (string, error) {
-	var name string
-	for i := 0; i < 6; i++ {
-		name = namesgenerator.GetRandomName(i)
-		if name[0] != '/' {
-			name = "/" + name
-		}
-
-		if err := daemon.nameIndex.Reserve(name, id); err != nil {
-			if err == registrar.ErrNameReserved {
-				continue
-			}
-			return "", err
-		}
-		return name, nil
-	}
-
-	name = "/" + stringid.TruncateID(id)
-	if err := daemon.nameIndex.Reserve(name, id); err != nil {
-		return "", err
-	}
-	return name, nil
-}
-
-func validateID(id string) error {
-	if id == "" {
-		return fmt.Errorf("Invalid empty id")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/network.go b/installer/vendor/github.com/docker/docker/daemon/network.go
deleted file mode 100644
index ab8fd88da8..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/network.go
+++ /dev/null
@@ -1,498 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"net"
-	"runtime"
-	"sort"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	apierrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/network"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/ipamapi"
-	networktypes "github.com/docker/libnetwork/types"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// NetworkControllerEnabled checks if the networking stack is enabled.
-// This feature depends on OS primitives and it's disabled in systems like Windows.
-func (daemon *Daemon) NetworkControllerEnabled() bool {
-	return daemon.netController != nil
-}
-
-// FindNetwork function finds a network for a given string that can represent network name or id
-func (daemon *Daemon) FindNetwork(idName string) (libnetwork.Network, error) {
-	// Find by Name
-	n, err := daemon.GetNetworkByName(idName)
-	if err != nil && !isNoSuchNetworkError(err) {
-		return nil, err
-	}
-
-	if n != nil {
-		return n, nil
-	}
-
-	// Find by id
-	return daemon.GetNetworkByID(idName)
-}
-
-func isNoSuchNetworkError(err error) bool {
-	_, ok := err.(libnetwork.ErrNoSuchNetwork)
-	return ok
-}
-
-// GetNetworkByID function returns a network whose ID begins with the given prefix.
-// It fails with an error if no matching, or more than one matching, networks are found.
-func (daemon *Daemon) GetNetworkByID(partialID string) (libnetwork.Network, error) {
-	list := daemon.GetNetworksByID(partialID)
-
-	if len(list) == 0 {
-		return nil, libnetwork.ErrNoSuchNetwork(partialID)
-	}
-	if len(list) > 1 {
-		return nil, libnetwork.ErrInvalidID(partialID)
-	}
-	return list[0], nil
-}
-
-// GetNetworkByName function returns a network for a given network name.
-// If no network name is given, the default network is returned.
-func (daemon *Daemon) GetNetworkByName(name string) (libnetwork.Network, error) {
-	c := daemon.netController
-	if c == nil {
-		return nil, libnetwork.ErrNoSuchNetwork(name)
-	}
-	if name == "" {
-		name = c.Config().Daemon.DefaultNetwork
-	}
-	return c.NetworkByName(name)
-}
-
-// GetNetworksByID returns a list of networks whose ID partially matches zero or more networks
-func (daemon *Daemon) GetNetworksByID(partialID string) []libnetwork.Network {
-	c := daemon.netController
-	if c == nil {
-		return nil
-	}
-	list := []libnetwork.Network{}
-	l := func(nw libnetwork.Network) bool {
-		if strings.HasPrefix(nw.ID(), partialID) {
-			list = append(list, nw)
-		}
-		return false
-	}
-	c.WalkNetworks(l)
-
-	return list
-}
-
-// getAllNetworks returns a list containing all networks
-func (daemon *Daemon) getAllNetworks() []libnetwork.Network {
-	c := daemon.netController
-	list := []libnetwork.Network{}
-	l := func(nw libnetwork.Network) bool {
-		list = append(list, nw)
-		return false
-	}
-	c.WalkNetworks(l)
-
-	return list
-}
-
-func isIngressNetwork(name string) bool {
-	return name == "ingress"
-}
-
-var ingressChan = make(chan struct{}, 1)
-
-func ingressWait() func() {
-	ingressChan <- struct{}{}
-	return func() { <-ingressChan }
-}
-
-// SetupIngress setups ingress networking.
-func (daemon *Daemon) SetupIngress(create clustertypes.NetworkCreateRequest, nodeIP string) error {
-	ip, _, err := net.ParseCIDR(nodeIP)
-	if err != nil {
-		return err
-	}
-
-	go func() {
-		controller := daemon.netController
-		controller.AgentInitWait()
-
-		if n, err := daemon.GetNetworkByName(create.Name); err == nil && n != nil && n.ID() != create.ID {
-			if err := controller.SandboxDestroy("ingress-sbox"); err != nil {
-				logrus.Errorf("Failed to delete stale ingress sandbox: %v", err)
-				return
-			}
-
-			// Cleanup any stale endpoints that might be left over during previous iterations
-			epList := n.Endpoints()
-			for _, ep := range epList {
-				if err := ep.Delete(true); err != nil {
-					logrus.Errorf("Failed to delete endpoint %s (%s): %v", ep.Name(), ep.ID(), err)
-				}
-			}
-
-			if err := n.Delete(); err != nil {
-				logrus.Errorf("Failed to delete stale ingress network %s: %v", n.ID(), err)
-				return
-			}
-		}
-
-		if _, err := daemon.createNetwork(create.NetworkCreateRequest, create.ID, true); err != nil {
-			// If it is any other error other than already
-			// exists error log error and return.
-			if _, ok := err.(libnetwork.NetworkNameError); !ok {
-				logrus.Errorf("Failed creating ingress network: %v", err)
-				return
-			}
-
-			// Otherwise continue down the call to create or recreate sandbox.
-		}
-
-		n, err := daemon.GetNetworkByID(create.ID)
-		if err != nil {
-			logrus.Errorf("Failed getting ingress network by id after creating: %v", err)
-			return
-		}
-
-		sb, err := controller.NewSandbox("ingress-sbox", libnetwork.OptionIngress())
-		if err != nil {
-			if _, ok := err.(networktypes.ForbiddenError); !ok {
-				logrus.Errorf("Failed creating ingress sandbox: %v", err)
-			}
-			return
-		}
-
-		ep, err := n.CreateEndpoint("ingress-endpoint", libnetwork.CreateOptionIpam(ip, nil, nil, nil))
-		if err != nil {
-			logrus.Errorf("Failed creating ingress endpoint: %v", err)
-			return
-		}
-
-		if err := ep.Join(sb, nil); err != nil {
-			logrus.Errorf("Failed joining ingress sandbox to ingress endpoint: %v", err)
-		}
-
-		if err := sb.EnableService(); err != nil {
-			logrus.WithError(err).Error("Failed enabling service for ingress sandbox")
-		}
-	}()
-
-	return nil
-}
-
-// SetNetworkBootstrapKeys sets the bootstrap keys.
-func (daemon *Daemon) SetNetworkBootstrapKeys(keys []*networktypes.EncryptionKey) error {
-	return daemon.netController.SetKeys(keys)
-}
-
-// UpdateAttachment notifies the attacher about the attachment config.
-func (daemon *Daemon) UpdateAttachment(networkName, networkID, containerID string, config *network.NetworkingConfig) error {
-	if daemon.clusterProvider == nil {
-		return fmt.Errorf("cluster provider is not initialized")
-	}
-
-	if err := daemon.clusterProvider.UpdateAttachment(networkName, containerID, config); err != nil {
-		return daemon.clusterProvider.UpdateAttachment(networkID, containerID, config)
-	}
-
-	return nil
-}
-
-// WaitForDetachment makes the cluster manager wait for detachment of
-// the container from the network.
-func (daemon *Daemon) WaitForDetachment(ctx context.Context, networkName, networkID, taskID, containerID string) error {
-	if daemon.clusterProvider == nil {
-		return fmt.Errorf("cluster provider is not initialized")
-	}
-
-	return daemon.clusterProvider.WaitForDetachment(ctx, networkName, networkID, taskID, containerID)
-}
-
-// CreateManagedNetwork creates an agent network.
-func (daemon *Daemon) CreateManagedNetwork(create clustertypes.NetworkCreateRequest) error {
-	_, err := daemon.createNetwork(create.NetworkCreateRequest, create.ID, true)
-	return err
-}
-
-// CreateNetwork creates a network with the given name, driver and other optional parameters
-func (daemon *Daemon) CreateNetwork(create types.NetworkCreateRequest) (*types.NetworkCreateResponse, error) {
-	resp, err := daemon.createNetwork(create, "", false)
-	if err != nil {
-		return nil, err
-	}
-	return resp, err
-}
-
-func (daemon *Daemon) createNetwork(create types.NetworkCreateRequest, id string, agent bool) (*types.NetworkCreateResponse, error) {
-	// If there is a pending ingress network creation wait here
-	// since ingress network creation can happen via node download
-	// from manager or task download.
-	if isIngressNetwork(create.Name) {
-		defer ingressWait()()
-	}
-
-	if runconfig.IsPreDefinedNetwork(create.Name) && !agent {
-		err := fmt.Errorf("%s is a pre-defined network and cannot be created", create.Name)
-		return nil, apierrors.NewRequestForbiddenError(err)
-	}
-
-	var warning string
-	nw, err := daemon.GetNetworkByName(create.Name)
-	if err != nil {
-		if _, ok := err.(libnetwork.ErrNoSuchNetwork); !ok {
-			return nil, err
-		}
-	}
-	if nw != nil {
-		if create.CheckDuplicate {
-			return nil, libnetwork.NetworkNameError(create.Name)
-		}
-		warning = fmt.Sprintf("Network with name %s (id : %s) already exists", nw.Name(), nw.ID())
-	}
-
-	c := daemon.netController
-	driver := create.Driver
-	if driver == "" {
-		driver = c.Config().Daemon.DefaultDriver
-	}
-
-	nwOptions := []libnetwork.NetworkOption{
-		libnetwork.NetworkOptionEnableIPv6(create.EnableIPv6),
-		libnetwork.NetworkOptionDriverOpts(create.Options),
-		libnetwork.NetworkOptionLabels(create.Labels),
-		libnetwork.NetworkOptionAttachable(create.Attachable),
-	}
-
-	if create.IPAM != nil {
-		ipam := create.IPAM
-		v4Conf, v6Conf, err := getIpamConfig(ipam.Config)
-		if err != nil {
-			return nil, err
-		}
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionIpam(ipam.Driver, "", v4Conf, v6Conf, ipam.Options))
-	}
-
-	if create.Internal {
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionInternalNetwork())
-	}
-	if agent {
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionDynamic())
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionPersist(false))
-	}
-
-	if isIngressNetwork(create.Name) {
-		nwOptions = append(nwOptions, libnetwork.NetworkOptionIngress())
-	}
-
-	n, err := c.NewNetwork(driver, create.Name, id, nwOptions...)
-	if err != nil {
-		return nil, err
-	}
-
-	daemon.pluginRefCount(driver, driverapi.NetworkPluginEndpointType, plugingetter.ACQUIRE)
-	if create.IPAM != nil {
-		daemon.pluginRefCount(create.IPAM.Driver, ipamapi.PluginEndpointType, plugingetter.ACQUIRE)
-	}
-	daemon.LogNetworkEvent(n, "create")
-
-	return &types.NetworkCreateResponse{
-		ID:      n.ID(),
-		Warning: warning,
-	}, nil
-}
-
-func (daemon *Daemon) pluginRefCount(driver, capability string, mode int) {
-	var builtinDrivers []string
-
-	if capability == driverapi.NetworkPluginEndpointType {
-		builtinDrivers = daemon.netController.BuiltinDrivers()
-	} else if capability == ipamapi.PluginEndpointType {
-		builtinDrivers = daemon.netController.BuiltinIPAMDrivers()
-	}
-
-	for _, d := range builtinDrivers {
-		if d == driver {
-			return
-		}
-	}
-
-	if daemon.PluginStore != nil {
-		_, err := daemon.PluginStore.Get(driver, capability, mode)
-		if err != nil {
-			logrus.WithError(err).WithFields(logrus.Fields{"mode": mode, "driver": driver}).Error("Error handling plugin refcount operation")
-		}
-	}
-}
-
-func getIpamConfig(data []network.IPAMConfig) ([]*libnetwork.IpamConf, []*libnetwork.IpamConf, error) {
-	ipamV4Cfg := []*libnetwork.IpamConf{}
-	ipamV6Cfg := []*libnetwork.IpamConf{}
-	for _, d := range data {
-		iCfg := libnetwork.IpamConf{}
-		iCfg.PreferredPool = d.Subnet
-		iCfg.SubPool = d.IPRange
-		iCfg.Gateway = d.Gateway
-		iCfg.AuxAddresses = d.AuxAddress
-		ip, _, err := net.ParseCIDR(d.Subnet)
-		if err != nil {
-			return nil, nil, fmt.Errorf("Invalid subnet %s : %v", d.Subnet, err)
-		}
-		if ip.To4() != nil {
-			ipamV4Cfg = append(ipamV4Cfg, &iCfg)
-		} else {
-			ipamV6Cfg = append(ipamV6Cfg, &iCfg)
-		}
-	}
-	return ipamV4Cfg, ipamV6Cfg, nil
-}
-
-// UpdateContainerServiceConfig updates a service configuration.
-func (daemon *Daemon) UpdateContainerServiceConfig(containerName string, serviceConfig *clustertypes.ServiceConfig) error {
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		return err
-	}
-
-	container.NetworkSettings.Service = serviceConfig
-	return nil
-}
-
-// ConnectContainerToNetwork connects the given container to the given
-// network. If either cannot be found, an err is returned. If the
-// network cannot be set up, an err is returned.
-func (daemon *Daemon) ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error {
-	if runtime.GOOS == "solaris" {
-		return errors.New("docker network connect is unsupported on Solaris platform")
-	}
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		return err
-	}
-	return daemon.ConnectToNetwork(container, networkName, endpointConfig)
-}
-
-// DisconnectContainerFromNetwork disconnects the given container from
-// the given network. If either cannot be found, an err is returned.
-func (daemon *Daemon) DisconnectContainerFromNetwork(containerName string, networkName string, force bool) error {
-	if runtime.GOOS == "solaris" {
-		return errors.New("docker network disconnect is unsupported on Solaris platform")
-	}
-	container, err := daemon.GetContainer(containerName)
-	if err != nil {
-		if force {
-			return daemon.ForceEndpointDelete(containerName, networkName)
-		}
-		return err
-	}
-	return daemon.DisconnectFromNetwork(container, networkName, force)
-}
-
-// GetNetworkDriverList returns the list of plugins drivers
-// registered for network.
-func (daemon *Daemon) GetNetworkDriverList() []string {
-	if !daemon.NetworkControllerEnabled() {
-		return nil
-	}
-
-	pluginList := daemon.netController.BuiltinDrivers()
-
-	managedPlugins := daemon.PluginStore.GetAllManagedPluginsByCap(driverapi.NetworkPluginEndpointType)
-
-	for _, plugin := range managedPlugins {
-		pluginList = append(pluginList, plugin.Name())
-	}
-
-	pluginMap := make(map[string]bool)
-	for _, plugin := range pluginList {
-		pluginMap[plugin] = true
-	}
-
-	networks := daemon.netController.Networks()
-
-	for _, network := range networks {
-		if !pluginMap[network.Type()] {
-			pluginList = append(pluginList, network.Type())
-			pluginMap[network.Type()] = true
-		}
-	}
-
-	sort.Strings(pluginList)
-
-	return pluginList
-}
-
-// DeleteManagedNetwork deletes an agent network.
-func (daemon *Daemon) DeleteManagedNetwork(networkID string) error {
-	return daemon.deleteNetwork(networkID, true)
-}
-
-// DeleteNetwork destroys a network unless it's one of docker's predefined networks.
-func (daemon *Daemon) DeleteNetwork(networkID string) error {
-	return daemon.deleteNetwork(networkID, false)
-}
-
-func (daemon *Daemon) deleteNetwork(networkID string, dynamic bool) error {
-	nw, err := daemon.FindNetwork(networkID)
-	if err != nil {
-		return err
-	}
-
-	if runconfig.IsPreDefinedNetwork(nw.Name()) && !dynamic {
-		err := fmt.Errorf("%s is a pre-defined network and cannot be removed", nw.Name())
-		return apierrors.NewRequestForbiddenError(err)
-	}
-
-	if err := nw.Delete(); err != nil {
-		return err
-	}
-	daemon.pluginRefCount(nw.Type(), driverapi.NetworkPluginEndpointType, plugingetter.RELEASE)
-	ipamType, _, _, _ := nw.Info().IpamConfig()
-	daemon.pluginRefCount(ipamType, ipamapi.PluginEndpointType, plugingetter.RELEASE)
-	daemon.LogNetworkEvent(nw, "destroy")
-	return nil
-}
-
-// GetNetworks returns a list of all networks
-func (daemon *Daemon) GetNetworks() []libnetwork.Network {
-	return daemon.getAllNetworks()
-}
-
-// clearAttachableNetworks removes the attachable networks
-// after disconnecting any connected container
-func (daemon *Daemon) clearAttachableNetworks() {
-	for _, n := range daemon.GetNetworks() {
-		if !n.Info().Attachable() {
-			continue
-		}
-		for _, ep := range n.Endpoints() {
-			epInfo := ep.Info()
-			if epInfo == nil {
-				continue
-			}
-			sb := epInfo.Sandbox()
-			if sb == nil {
-				continue
-			}
-			containerID := sb.ContainerID()
-			if err := daemon.DisconnectContainerFromNetwork(containerID, n.ID(), true); err != nil {
-				logrus.Warnf("Failed to disconnect container %s from swarm network %s on cluster leave: %v",
-					containerID, n.Name(), err)
-			}
-		}
-		if err := daemon.DeleteManagedNetwork(n.ID()); err != nil {
-			logrus.Warnf("Failed to remove swarm network %s on cluster leave: %v", n.Name(), err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/network/settings.go b/installer/vendor/github.com/docker/docker/daemon/network/settings.go
deleted file mode 100644
index 8f6b7dd59e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/network/settings.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package network
-
-import (
-	networktypes "github.com/docker/docker/api/types/network"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/go-connections/nat"
-)
-
-// Settings stores configuration details about the daemon network config
-// TODO Windows. Many of these fields can be factored out.,
-type Settings struct {
-	Bridge                 string
-	SandboxID              string
-	HairpinMode            bool
-	LinkLocalIPv6Address   string
-	LinkLocalIPv6PrefixLen int
-	Networks               map[string]*EndpointSettings
-	Service                *clustertypes.ServiceConfig
-	Ports                  nat.PortMap
-	SandboxKey             string
-	SecondaryIPAddresses   []networktypes.Address
-	SecondaryIPv6Addresses []networktypes.Address
-	IsAnonymousEndpoint    bool
-	HasSwarmEndpoint       bool
-}
-
-// EndpointSettings is a package local wrapper for
-// networktypes.EndpointSettings which stores Endpoint state that
-// needs to be persisted to disk but not exposed in the api.
-type EndpointSettings struct {
-	*networktypes.EndpointSettings
-	IPAMOperational bool
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/oci_linux.go b/installer/vendor/github.com/docker/docker/daemon/oci_linux.go
deleted file mode 100644
index a72b0b873d..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/oci_linux.go
+++ /dev/null
@@ -1,790 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/daemon/caps"
-	"github.com/docker/docker/oci"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/volume"
-	"github.com/opencontainers/runc/libcontainer/apparmor"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
-	"github.com/opencontainers/runc/libcontainer/devices"
-	"github.com/opencontainers/runc/libcontainer/user"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func setResources(s *specs.Spec, r containertypes.Resources) error {
-	weightDevices, err := getBlkioWeightDevices(r)
-	if err != nil {
-		return err
-	}
-	readBpsDevice, err := getBlkioThrottleDevices(r.BlkioDeviceReadBps)
-	if err != nil {
-		return err
-	}
-	writeBpsDevice, err := getBlkioThrottleDevices(r.BlkioDeviceWriteBps)
-	if err != nil {
-		return err
-	}
-	readIOpsDevice, err := getBlkioThrottleDevices(r.BlkioDeviceReadIOps)
-	if err != nil {
-		return err
-	}
-	writeIOpsDevice, err := getBlkioThrottleDevices(r.BlkioDeviceWriteIOps)
-	if err != nil {
-		return err
-	}
-
-	memoryRes := getMemoryResources(r)
-	cpuRes := getCPUResources(r)
-	blkioWeight := r.BlkioWeight
-
-	specResources := &specs.Resources{
-		Memory: memoryRes,
-		CPU:    cpuRes,
-		BlockIO: &specs.BlockIO{
-			Weight:                  &blkioWeight,
-			WeightDevice:            weightDevices,
-			ThrottleReadBpsDevice:   readBpsDevice,
-			ThrottleWriteBpsDevice:  writeBpsDevice,
-			ThrottleReadIOPSDevice:  readIOpsDevice,
-			ThrottleWriteIOPSDevice: writeIOpsDevice,
-		},
-		DisableOOMKiller: r.OomKillDisable,
-		Pids: &specs.Pids{
-			Limit: &r.PidsLimit,
-		},
-	}
-
-	if s.Linux.Resources != nil && len(s.Linux.Resources.Devices) > 0 {
-		specResources.Devices = s.Linux.Resources.Devices
-	}
-
-	s.Linux.Resources = specResources
-	return nil
-}
-
-func setDevices(s *specs.Spec, c *container.Container) error {
-	// Build lists of devices allowed and created within the container.
-	var devs []specs.Device
-	devPermissions := s.Linux.Resources.Devices
-	if c.HostConfig.Privileged {
-		hostDevices, err := devices.HostDevices()
-		if err != nil {
-			return err
-		}
-		for _, d := range hostDevices {
-			devs = append(devs, oci.Device(d))
-		}
-		rwm := "rwm"
-		devPermissions = []specs.DeviceCgroup{
-			{
-				Allow:  true,
-				Access: &rwm,
-			},
-		}
-	} else {
-		for _, deviceMapping := range c.HostConfig.Devices {
-			d, dPermissions, err := oci.DevicesFromPath(deviceMapping.PathOnHost, deviceMapping.PathInContainer, deviceMapping.CgroupPermissions)
-			if err != nil {
-				return err
-			}
-			devs = append(devs, d...)
-			devPermissions = append(devPermissions, dPermissions...)
-		}
-	}
-
-	s.Linux.Devices = append(s.Linux.Devices, devs...)
-	s.Linux.Resources.Devices = devPermissions
-	return nil
-}
-
-func setRlimits(daemon *Daemon, s *specs.Spec, c *container.Container) error {
-	var rlimits []specs.Rlimit
-
-	// We want to leave the original HostConfig alone so make a copy here
-	hostConfig := *c.HostConfig
-	// Merge with the daemon defaults
-	daemon.mergeUlimits(&hostConfig)
-	for _, ul := range hostConfig.Ulimits {
-		rlimits = append(rlimits, specs.Rlimit{
-			Type: "RLIMIT_" + strings.ToUpper(ul.Name),
-			Soft: uint64(ul.Soft),
-			Hard: uint64(ul.Hard),
-		})
-	}
-
-	s.Process.Rlimits = rlimits
-	return nil
-}
-
-func setUser(s *specs.Spec, c *container.Container) error {
-	uid, gid, additionalGids, err := getUser(c, c.Config.User)
-	if err != nil {
-		return err
-	}
-	s.Process.User.UID = uid
-	s.Process.User.GID = gid
-	s.Process.User.AdditionalGids = additionalGids
-	return nil
-}
-
-func readUserFile(c *container.Container, p string) (io.ReadCloser, error) {
-	fp, err := symlink.FollowSymlinkInScope(filepath.Join(c.BaseFS, p), c.BaseFS)
-	if err != nil {
-		return nil, err
-	}
-	return os.Open(fp)
-}
-
-func getUser(c *container.Container, username string) (uint32, uint32, []uint32, error) {
-	passwdPath, err := user.GetPasswdPath()
-	if err != nil {
-		return 0, 0, nil, err
-	}
-	groupPath, err := user.GetGroupPath()
-	if err != nil {
-		return 0, 0, nil, err
-	}
-	passwdFile, err := readUserFile(c, passwdPath)
-	if err == nil {
-		defer passwdFile.Close()
-	}
-	groupFile, err := readUserFile(c, groupPath)
-	if err == nil {
-		defer groupFile.Close()
-	}
-
-	execUser, err := user.GetExecUser(username, nil, passwdFile, groupFile)
-	if err != nil {
-		return 0, 0, nil, err
-	}
-
-	// todo: fix this double read by a change to libcontainer/user pkg
-	groupFile, err = readUserFile(c, groupPath)
-	if err == nil {
-		defer groupFile.Close()
-	}
-	var addGroups []int
-	if len(c.HostConfig.GroupAdd) > 0 {
-		addGroups, err = user.GetAdditionalGroups(c.HostConfig.GroupAdd, groupFile)
-		if err != nil {
-			return 0, 0, nil, err
-		}
-	}
-	uid := uint32(execUser.Uid)
-	gid := uint32(execUser.Gid)
-	sgids := append(execUser.Sgids, addGroups...)
-	var additionalGids []uint32
-	for _, g := range sgids {
-		additionalGids = append(additionalGids, uint32(g))
-	}
-	return uid, gid, additionalGids, nil
-}
-
-func setNamespace(s *specs.Spec, ns specs.Namespace) {
-	for i, n := range s.Linux.Namespaces {
-		if n.Type == ns.Type {
-			s.Linux.Namespaces[i] = ns
-			return
-		}
-	}
-	s.Linux.Namespaces = append(s.Linux.Namespaces, ns)
-}
-
-func setCapabilities(s *specs.Spec, c *container.Container) error {
-	var caplist []string
-	var err error
-	if c.HostConfig.Privileged {
-		caplist = caps.GetAllCapabilities()
-	} else {
-		caplist, err = caps.TweakCapabilities(s.Process.Capabilities, c.HostConfig.CapAdd, c.HostConfig.CapDrop)
-		if err != nil {
-			return err
-		}
-	}
-	s.Process.Capabilities = caplist
-	return nil
-}
-
-func setNamespaces(daemon *Daemon, s *specs.Spec, c *container.Container) error {
-	userNS := false
-	// user
-	if c.HostConfig.UsernsMode.IsPrivate() {
-		uidMap, gidMap := daemon.GetUIDGIDMaps()
-		if uidMap != nil {
-			userNS = true
-			ns := specs.Namespace{Type: "user"}
-			setNamespace(s, ns)
-			s.Linux.UIDMappings = specMapping(uidMap)
-			s.Linux.GIDMappings = specMapping(gidMap)
-		}
-	}
-	// network
-	if !c.Config.NetworkDisabled {
-		ns := specs.Namespace{Type: "network"}
-		parts := strings.SplitN(string(c.HostConfig.NetworkMode), ":", 2)
-		if parts[0] == "container" {
-			nc, err := daemon.getNetworkedContainer(c.ID, c.HostConfig.NetworkMode.ConnectedContainer())
-			if err != nil {
-				return err
-			}
-			ns.Path = fmt.Sprintf("/proc/%d/ns/net", nc.State.GetPID())
-			if userNS {
-				// to share a net namespace, they must also share a user namespace
-				nsUser := specs.Namespace{Type: "user"}
-				nsUser.Path = fmt.Sprintf("/proc/%d/ns/user", nc.State.GetPID())
-				setNamespace(s, nsUser)
-			}
-		} else if c.HostConfig.NetworkMode.IsHost() {
-			ns.Path = c.NetworkSettings.SandboxKey
-		}
-		setNamespace(s, ns)
-	}
-	// ipc
-	if c.HostConfig.IpcMode.IsContainer() {
-		ns := specs.Namespace{Type: "ipc"}
-		ic, err := daemon.getIpcContainer(c)
-		if err != nil {
-			return err
-		}
-		ns.Path = fmt.Sprintf("/proc/%d/ns/ipc", ic.State.GetPID())
-		setNamespace(s, ns)
-		if userNS {
-			// to share an IPC namespace, they must also share a user namespace
-			nsUser := specs.Namespace{Type: "user"}
-			nsUser.Path = fmt.Sprintf("/proc/%d/ns/user", ic.State.GetPID())
-			setNamespace(s, nsUser)
-		}
-	} else if c.HostConfig.IpcMode.IsHost() {
-		oci.RemoveNamespace(s, specs.NamespaceType("ipc"))
-	} else {
-		ns := specs.Namespace{Type: "ipc"}
-		setNamespace(s, ns)
-	}
-	// pid
-	if c.HostConfig.PidMode.IsContainer() {
-		ns := specs.Namespace{Type: "pid"}
-		pc, err := daemon.getPidContainer(c)
-		if err != nil {
-			return err
-		}
-		ns.Path = fmt.Sprintf("/proc/%d/ns/pid", pc.State.GetPID())
-		setNamespace(s, ns)
-		if userNS {
-			// to share a PID namespace, they must also share a user namespace
-			nsUser := specs.Namespace{Type: "user"}
-			nsUser.Path = fmt.Sprintf("/proc/%d/ns/user", pc.State.GetPID())
-			setNamespace(s, nsUser)
-		}
-	} else if c.HostConfig.PidMode.IsHost() {
-		oci.RemoveNamespace(s, specs.NamespaceType("pid"))
-	} else {
-		ns := specs.Namespace{Type: "pid"}
-		setNamespace(s, ns)
-	}
-	// uts
-	if c.HostConfig.UTSMode.IsHost() {
-		oci.RemoveNamespace(s, specs.NamespaceType("uts"))
-		s.Hostname = ""
-	}
-
-	return nil
-}
-
-func specMapping(s []idtools.IDMap) []specs.IDMapping {
-	var ids []specs.IDMapping
-	for _, item := range s {
-		ids = append(ids, specs.IDMapping{
-			HostID:      uint32(item.HostID),
-			ContainerID: uint32(item.ContainerID),
-			Size:        uint32(item.Size),
-		})
-	}
-	return ids
-}
-
-func getMountInfo(mountinfo []*mount.Info, dir string) *mount.Info {
-	for _, m := range mountinfo {
-		if m.Mountpoint == dir {
-			return m
-		}
-	}
-	return nil
-}
-
-// Get the source mount point of directory passed in as argument. Also return
-// optional fields.
-func getSourceMount(source string) (string, string, error) {
-	// Ensure any symlinks are resolved.
-	sourcePath, err := filepath.EvalSymlinks(source)
-	if err != nil {
-		return "", "", err
-	}
-
-	mountinfos, err := mount.GetMounts()
-	if err != nil {
-		return "", "", err
-	}
-
-	mountinfo := getMountInfo(mountinfos, sourcePath)
-	if mountinfo != nil {
-		return sourcePath, mountinfo.Optional, nil
-	}
-
-	path := sourcePath
-	for {
-		path = filepath.Dir(path)
-
-		mountinfo = getMountInfo(mountinfos, path)
-		if mountinfo != nil {
-			return path, mountinfo.Optional, nil
-		}
-
-		if path == "/" {
-			break
-		}
-	}
-
-	// If we are here, we did not find parent mount. Something is wrong.
-	return "", "", fmt.Errorf("Could not find source mount of %s", source)
-}
-
-// Ensure mount point on which path is mounted, is shared.
-func ensureShared(path string) error {
-	sharedMount := false
-
-	sourceMount, optionalOpts, err := getSourceMount(path)
-	if err != nil {
-		return err
-	}
-	// Make sure source mount point is shared.
-	optsSplit := strings.Split(optionalOpts, " ")
-	for _, opt := range optsSplit {
-		if strings.HasPrefix(opt, "shared:") {
-			sharedMount = true
-			break
-		}
-	}
-
-	if !sharedMount {
-		return fmt.Errorf("Path %s is mounted on %s but it is not a shared mount.", path, sourceMount)
-	}
-	return nil
-}
-
-// Ensure mount point on which path is mounted, is either shared or slave.
-func ensureSharedOrSlave(path string) error {
-	sharedMount := false
-	slaveMount := false
-
-	sourceMount, optionalOpts, err := getSourceMount(path)
-	if err != nil {
-		return err
-	}
-	// Make sure source mount point is shared.
-	optsSplit := strings.Split(optionalOpts, " ")
-	for _, opt := range optsSplit {
-		if strings.HasPrefix(opt, "shared:") {
-			sharedMount = true
-			break
-		} else if strings.HasPrefix(opt, "master:") {
-			slaveMount = true
-			break
-		}
-	}
-
-	if !sharedMount && !slaveMount {
-		return fmt.Errorf("Path %s is mounted on %s but it is not a shared or slave mount.", path, sourceMount)
-	}
-	return nil
-}
-
-var (
-	mountPropagationMap = map[string]int{
-		"private":  mount.PRIVATE,
-		"rprivate": mount.RPRIVATE,
-		"shared":   mount.SHARED,
-		"rshared":  mount.RSHARED,
-		"slave":    mount.SLAVE,
-		"rslave":   mount.RSLAVE,
-	}
-
-	mountPropagationReverseMap = map[int]string{
-		mount.PRIVATE:  "private",
-		mount.RPRIVATE: "rprivate",
-		mount.SHARED:   "shared",
-		mount.RSHARED:  "rshared",
-		mount.SLAVE:    "slave",
-		mount.RSLAVE:   "rslave",
-	}
-)
-
-func setMounts(daemon *Daemon, s *specs.Spec, c *container.Container, mounts []container.Mount) error {
-	userMounts := make(map[string]struct{})
-	for _, m := range mounts {
-		userMounts[m.Destination] = struct{}{}
-	}
-
-	// Filter out mounts that are overridden by user supplied mounts
-	var defaultMounts []specs.Mount
-	_, mountDev := userMounts["/dev"]
-	for _, m := range s.Mounts {
-		if _, ok := userMounts[m.Destination]; !ok {
-			if mountDev && strings.HasPrefix(m.Destination, "/dev/") {
-				continue
-			}
-			defaultMounts = append(defaultMounts, m)
-		}
-	}
-
-	s.Mounts = defaultMounts
-	for _, m := range mounts {
-		for _, cm := range s.Mounts {
-			if cm.Destination == m.Destination {
-				return fmt.Errorf("Duplicate mount point '%s'", m.Destination)
-			}
-		}
-
-		if m.Source == "tmpfs" {
-			data := m.Data
-			options := []string{"noexec", "nosuid", "nodev", string(volume.DefaultPropagationMode)}
-			if data != "" {
-				options = append(options, strings.Split(data, ",")...)
-			}
-
-			merged, err := mount.MergeTmpfsOptions(options)
-			if err != nil {
-				return err
-			}
-
-			s.Mounts = append(s.Mounts, specs.Mount{Destination: m.Destination, Source: m.Source, Type: "tmpfs", Options: merged})
-			continue
-		}
-
-		mt := specs.Mount{Destination: m.Destination, Source: m.Source, Type: "bind"}
-
-		// Determine property of RootPropagation based on volume
-		// properties. If a volume is shared, then keep root propagation
-		// shared. This should work for slave and private volumes too.
-		//
-		// For slave volumes, it can be either [r]shared/[r]slave.
-		//
-		// For private volumes any root propagation value should work.
-		pFlag := mountPropagationMap[m.Propagation]
-		if pFlag == mount.SHARED || pFlag == mount.RSHARED {
-			if err := ensureShared(m.Source); err != nil {
-				return err
-			}
-			rootpg := mountPropagationMap[s.Linux.RootfsPropagation]
-			if rootpg != mount.SHARED && rootpg != mount.RSHARED {
-				s.Linux.RootfsPropagation = mountPropagationReverseMap[mount.SHARED]
-			}
-		} else if pFlag == mount.SLAVE || pFlag == mount.RSLAVE {
-			if err := ensureSharedOrSlave(m.Source); err != nil {
-				return err
-			}
-			rootpg := mountPropagationMap[s.Linux.RootfsPropagation]
-			if rootpg != mount.SHARED && rootpg != mount.RSHARED && rootpg != mount.SLAVE && rootpg != mount.RSLAVE {
-				s.Linux.RootfsPropagation = mountPropagationReverseMap[mount.RSLAVE]
-			}
-		}
-
-		opts := []string{"rbind"}
-		if !m.Writable {
-			opts = append(opts, "ro")
-		}
-		if pFlag != 0 {
-			opts = append(opts, mountPropagationReverseMap[pFlag])
-		}
-
-		mt.Options = opts
-		s.Mounts = append(s.Mounts, mt)
-	}
-
-	if s.Root.Readonly {
-		for i, m := range s.Mounts {
-			switch m.Destination {
-			case "/proc", "/dev/pts", "/dev/mqueue": // /dev is remounted by runc
-				continue
-			}
-			if _, ok := userMounts[m.Destination]; !ok {
-				if !stringutils.InSlice(m.Options, "ro") {
-					s.Mounts[i].Options = append(s.Mounts[i].Options, "ro")
-				}
-			}
-		}
-	}
-
-	if c.HostConfig.Privileged {
-		if !s.Root.Readonly {
-			// clear readonly for /sys
-			for i := range s.Mounts {
-				if s.Mounts[i].Destination == "/sys" {
-					clearReadOnly(&s.Mounts[i])
-				}
-			}
-		}
-		s.Linux.ReadonlyPaths = nil
-		s.Linux.MaskedPaths = nil
-	}
-
-	// TODO: until a kernel/mount solution exists for handling remount in a user namespace,
-	// we must clear the readonly flag for the cgroups mount (@mrunalp concurs)
-	if uidMap, _ := daemon.GetUIDGIDMaps(); uidMap != nil || c.HostConfig.Privileged {
-		for i, m := range s.Mounts {
-			if m.Type == "cgroup" {
-				clearReadOnly(&s.Mounts[i])
-			}
-		}
-	}
-
-	return nil
-}
-
-func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container) error {
-	linkedEnv, err := daemon.setupLinkedContainers(c)
-	if err != nil {
-		return err
-	}
-	s.Root = specs.Root{
-		Path:     c.BaseFS,
-		Readonly: c.HostConfig.ReadonlyRootfs,
-	}
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	if err := c.SetupWorkingDirectory(rootUID, rootGID); err != nil {
-		return err
-	}
-	cwd := c.Config.WorkingDir
-	if len(cwd) == 0 {
-		cwd = "/"
-	}
-	s.Process.Args = append([]string{c.Path}, c.Args...)
-
-	// only add the custom init if it is specified and the container is running in its
-	// own private pid namespace.  It does not make sense to add if it is running in the
-	// host namespace or another container's pid namespace where we already have an init
-	if c.HostConfig.PidMode.IsPrivate() {
-		if (c.HostConfig.Init != nil && *c.HostConfig.Init) ||
-			(c.HostConfig.Init == nil && daemon.configStore.Init) {
-			s.Process.Args = append([]string{"/dev/init", "--", c.Path}, c.Args...)
-			var path string
-			if daemon.configStore.InitPath == "" && c.HostConfig.InitPath == "" {
-				path, err = exec.LookPath(DefaultInitBinary)
-				if err != nil {
-					return err
-				}
-			}
-			if daemon.configStore.InitPath != "" {
-				path = daemon.configStore.InitPath
-			}
-			if c.HostConfig.InitPath != "" {
-				path = c.HostConfig.InitPath
-			}
-			s.Mounts = append(s.Mounts, specs.Mount{
-				Destination: "/dev/init",
-				Type:        "bind",
-				Source:      path,
-				Options:     []string{"bind", "ro"},
-			})
-		}
-	}
-	s.Process.Cwd = cwd
-	s.Process.Env = c.CreateDaemonEnvironment(c.Config.Tty, linkedEnv)
-	s.Process.Terminal = c.Config.Tty
-	s.Hostname = c.FullHostname()
-
-	return nil
-}
-
-func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
-	s := oci.DefaultSpec()
-	if err := daemon.populateCommonSpec(&s, c); err != nil {
-		return nil, err
-	}
-
-	var cgroupsPath string
-	scopePrefix := "docker"
-	parent := "/docker"
-	useSystemd := UsingSystemd(daemon.configStore)
-	if useSystemd {
-		parent = "system.slice"
-	}
-
-	if c.HostConfig.CgroupParent != "" {
-		parent = c.HostConfig.CgroupParent
-	} else if daemon.configStore.CgroupParent != "" {
-		parent = daemon.configStore.CgroupParent
-	}
-
-	if useSystemd {
-		cgroupsPath = parent + ":" + scopePrefix + ":" + c.ID
-		logrus.Debugf("createSpec: cgroupsPath: %s", cgroupsPath)
-	} else {
-		cgroupsPath = filepath.Join(parent, c.ID)
-	}
-	s.Linux.CgroupsPath = &cgroupsPath
-
-	if err := setResources(&s, c.HostConfig.Resources); err != nil {
-		return nil, fmt.Errorf("linux runtime spec resources: %v", err)
-	}
-	s.Linux.Resources.OOMScoreAdj = &c.HostConfig.OomScoreAdj
-	s.Linux.Sysctl = c.HostConfig.Sysctls
-
-	p := *s.Linux.CgroupsPath
-	if useSystemd {
-		initPath, err := cgroups.GetInitCgroupDir("cpu")
-		if err != nil {
-			return nil, err
-		}
-		p, _ = cgroups.GetThisCgroupDir("cpu")
-		if err != nil {
-			return nil, err
-		}
-		p = filepath.Join(initPath, p)
-	}
-
-	// Clean path to guard against things like ../../../BAD
-	parentPath := filepath.Dir(p)
-	if !filepath.IsAbs(parentPath) {
-		parentPath = filepath.Clean("/" + parentPath)
-	}
-
-	if err := daemon.initCgroupsPath(parentPath); err != nil {
-		return nil, fmt.Errorf("linux init cgroups path: %v", err)
-	}
-	if err := setDevices(&s, c); err != nil {
-		return nil, fmt.Errorf("linux runtime spec devices: %v", err)
-	}
-	if err := setRlimits(daemon, &s, c); err != nil {
-		return nil, fmt.Errorf("linux runtime spec rlimits: %v", err)
-	}
-	if err := setUser(&s, c); err != nil {
-		return nil, fmt.Errorf("linux spec user: %v", err)
-	}
-	if err := setNamespaces(daemon, &s, c); err != nil {
-		return nil, fmt.Errorf("linux spec namespaces: %v", err)
-	}
-	if err := setCapabilities(&s, c); err != nil {
-		return nil, fmt.Errorf("linux spec capabilities: %v", err)
-	}
-	if err := setSeccomp(daemon, &s, c); err != nil {
-		return nil, fmt.Errorf("linux seccomp: %v", err)
-	}
-
-	if err := daemon.setupIpcDirs(c); err != nil {
-		return nil, err
-	}
-
-	if err := daemon.setupSecretDir(c); err != nil {
-		return nil, err
-	}
-
-	ms, err := daemon.setupMounts(c)
-	if err != nil {
-		return nil, err
-	}
-
-	ms = append(ms, c.IpcMounts()...)
-
-	tmpfsMounts, err := c.TmpfsMounts()
-	if err != nil {
-		return nil, err
-	}
-	ms = append(ms, tmpfsMounts...)
-
-	if m := c.SecretMount(); m != nil {
-		ms = append(ms, *m)
-	}
-
-	sort.Sort(mounts(ms))
-	if err := setMounts(daemon, &s, c, ms); err != nil {
-		return nil, fmt.Errorf("linux mounts: %v", err)
-	}
-
-	for _, ns := range s.Linux.Namespaces {
-		if ns.Type == "network" && ns.Path == "" && !c.Config.NetworkDisabled {
-			target, err := os.Readlink(filepath.Join("/proc", strconv.Itoa(os.Getpid()), "exe"))
-			if err != nil {
-				return nil, err
-			}
-
-			s.Hooks = specs.Hooks{
-				Prestart: []specs.Hook{{
-					Path: target, // FIXME: cross-platform
-					Args: []string{"libnetwork-setkey", c.ID, daemon.netController.ID()},
-				}},
-			}
-		}
-	}
-
-	if apparmor.IsEnabled() {
-		var appArmorProfile string
-		if c.AppArmorProfile != "" {
-			appArmorProfile = c.AppArmorProfile
-		} else if c.HostConfig.Privileged {
-			appArmorProfile = "unconfined"
-		} else {
-			appArmorProfile = "docker-default"
-		}
-
-		if appArmorProfile == "docker-default" {
-			// Unattended upgrades and other fun services can unload AppArmor
-			// profiles inadvertently. Since we cannot store our profile in
-			// /etc/apparmor.d, nor can we practically add other ways of
-			// telling the system to keep our profile loaded, in order to make
-			// sure that we keep the default profile enabled we dynamically
-			// reload it if necessary.
-			if err := ensureDefaultAppArmorProfile(); err != nil {
-				return nil, err
-			}
-		}
-
-		s.Process.ApparmorProfile = appArmorProfile
-	}
-	s.Process.SelinuxLabel = c.GetProcessLabel()
-	s.Process.NoNewPrivileges = c.NoNewPrivileges
-	s.Linux.MountLabel = c.MountLabel
-
-	return (*specs.Spec)(&s), nil
-}
-
-func clearReadOnly(m *specs.Mount) {
-	var opt []string
-	for _, o := range m.Options {
-		if o != "ro" {
-			opt = append(opt, o)
-		}
-	}
-	m.Options = opt
-}
-
-// mergeUlimits merge the Ulimits from HostConfig with daemon defaults, and update HostConfig
-func (daemon *Daemon) mergeUlimits(c *containertypes.HostConfig) {
-	ulimits := c.Ulimits
-	// Merge ulimits with daemon defaults
-	ulIdx := make(map[string]struct{})
-	for _, ul := range ulimits {
-		ulIdx[ul.Name] = struct{}{}
-	}
-	for name, ul := range daemon.configStore.Ulimits {
-		if _, exists := ulIdx[name]; !exists {
-			ulimits = append(ulimits, ul)
-		}
-	}
-	c.Ulimits = ulimits
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/oci_solaris.go b/installer/vendor/github.com/docker/docker/daemon/oci_solaris.go
deleted file mode 100644
index 0c757f9196..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/oci_solaris.go
+++ /dev/null
@@ -1,188 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"path/filepath"
-	"sort"
-	"strconv"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/oci"
-	"github.com/docker/libnetwork"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func setResources(s *specs.Spec, r containertypes.Resources) error {
-	mem := getMemoryResources(r)
-	s.Solaris.CappedMemory = &mem
-
-	capCPU := getCPUResources(r)
-	s.Solaris.CappedCPU = &capCPU
-
-	return nil
-}
-
-func setUser(s *specs.Spec, c *container.Container) error {
-	uid, gid, additionalGids, err := getUser(c, c.Config.User)
-	if err != nil {
-		return err
-	}
-	s.Process.User.UID = uid
-	s.Process.User.GID = gid
-	s.Process.User.AdditionalGids = additionalGids
-	return nil
-}
-
-func getUser(c *container.Container, username string) (uint32, uint32, []uint32, error) {
-	return 0, 0, nil, nil
-}
-
-func (daemon *Daemon) getRunzAnet(ep libnetwork.Endpoint) (specs.Anet, error) {
-	var (
-		linkName  string
-		lowerLink string
-		defRouter string
-	)
-
-	epInfo := ep.Info()
-	if epInfo == nil {
-		return specs.Anet{}, fmt.Errorf("invalid endpoint")
-	}
-
-	nw, err := daemon.GetNetworkByName(ep.Network())
-	if err != nil {
-		return specs.Anet{}, fmt.Errorf("Failed to get network %s: %v", ep.Network(), err)
-	}
-
-	// Evaluate default router, linkname and lowerlink for interface endpoint
-	switch nw.Type() {
-	case "bridge":
-		defRouter = epInfo.Gateway().String()
-		linkName = "net0" // Should always be net0 for a container
-
-		// TODO We construct lowerlink here exactly as done for solaris bridge
-		// initialization. Need modular code to reuse.
-		options := nw.Info().DriverOptions()
-		nwName := options["com.docker.network.bridge.name"]
-		lastChar := nwName[len(nwName)-1:]
-		if _, err = strconv.Atoi(lastChar); err != nil {
-			lowerLink = nwName + "_0"
-		} else {
-			lowerLink = nwName
-		}
-
-	case "overlay":
-		defRouter = ""
-		linkName = "net1"
-
-		// TODO Follows generateVxlanName() in solaris overlay.
-		id := nw.ID()
-		if len(nw.ID()) > 12 {
-			id = nw.ID()[:12]
-		}
-		lowerLink = "vx_" + id + "_0"
-	}
-
-	runzanet := specs.Anet{
-		Linkname:          linkName,
-		Lowerlink:         lowerLink,
-		Allowedaddr:       epInfo.Iface().Address().String(),
-		Configallowedaddr: "true",
-		Defrouter:         defRouter,
-		Linkprotection:    "mac-nospoof, ip-nospoof",
-		Macaddress:        epInfo.Iface().MacAddress().String(),
-	}
-
-	return runzanet, nil
-}
-
-func (daemon *Daemon) setNetworkInterface(s *specs.Spec, c *container.Container) error {
-	var anets []specs.Anet
-
-	sb, err := daemon.netController.SandboxByID(c.NetworkSettings.SandboxID)
-	if err != nil {
-		return fmt.Errorf("Could not obtain sandbox for container")
-	}
-
-	// Populate interfaces required for each endpoint
-	for _, ep := range sb.Endpoints() {
-		runzanet, err := daemon.getRunzAnet(ep)
-		if err != nil {
-			return fmt.Errorf("Failed to get interface information for endpoint %d: %v", ep.ID(), err)
-		}
-		anets = append(anets, runzanet)
-	}
-
-	s.Solaris.Anet = anets
-	if anets != nil {
-		s.Solaris.Milestone = "svc:/milestone/container:default"
-	}
-	return nil
-}
-
-func (daemon *Daemon) populateCommonSpec(s *specs.Spec, c *container.Container) error {
-	linkedEnv, err := daemon.setupLinkedContainers(c)
-	if err != nil {
-		return err
-	}
-	s.Root = specs.Root{
-		Path:     filepath.Dir(c.BaseFS),
-		Readonly: c.HostConfig.ReadonlyRootfs,
-	}
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	if err := c.SetupWorkingDirectory(rootUID, rootGID); err != nil {
-		return err
-	}
-	cwd := c.Config.WorkingDir
-	s.Process.Args = append([]string{c.Path}, c.Args...)
-	s.Process.Cwd = cwd
-	s.Process.Env = c.CreateDaemonEnvironment(c.Config.Tty, linkedEnv)
-	s.Process.Terminal = c.Config.Tty
-	s.Hostname = c.FullHostname()
-
-	return nil
-}
-
-func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
-	s := oci.DefaultSpec()
-	if err := daemon.populateCommonSpec(&s, c); err != nil {
-		return nil, err
-	}
-
-	if err := setResources(&s, c.HostConfig.Resources); err != nil {
-		return nil, fmt.Errorf("runtime spec resources: %v", err)
-	}
-
-	if err := setUser(&s, c); err != nil {
-		return nil, fmt.Errorf("spec user: %v", err)
-	}
-
-	if err := daemon.setNetworkInterface(&s, c); err != nil {
-		return nil, err
-	}
-
-	if err := daemon.setupIpcDirs(c); err != nil {
-		return nil, err
-	}
-
-	ms, err := daemon.setupMounts(c)
-	if err != nil {
-		return nil, err
-	}
-	ms = append(ms, c.IpcMounts()...)
-	tmpfsMounts, err := c.TmpfsMounts()
-	if err != nil {
-		return nil, err
-	}
-	ms = append(ms, tmpfsMounts...)
-	sort.Sort(mounts(ms))
-
-	return (*specs.Spec)(&s), nil
-}
-
-// mergeUlimits merge the Ulimits from HostConfig with daemon defaults, and update HostConfig
-// It will do nothing on non-Linux platform
-func (daemon *Daemon) mergeUlimits(c *containertypes.HostConfig) {
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/oci_windows.go b/installer/vendor/github.com/docker/docker/daemon/oci_windows.go
deleted file mode 100644
index 6e264243b4..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/oci_windows.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package daemon
-
-import (
-	"syscall"
-
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/oci"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
-	s := oci.DefaultSpec()
-
-	linkedEnv, err := daemon.setupLinkedContainers(c)
-	if err != nil {
-		return nil, err
-	}
-
-	// Note, unlike Unix, we do NOT call into SetupWorkingDirectory as
-	// this is done in VMCompute. Further, we couldn't do it for Hyper-V
-	// containers anyway.
-
-	// In base spec
-	s.Hostname = c.FullHostname()
-
-	// In s.Mounts
-	mounts, err := daemon.setupMounts(c)
-	if err != nil {
-		return nil, err
-	}
-	for _, mount := range mounts {
-		m := specs.Mount{
-			Source:      mount.Source,
-			Destination: mount.Destination,
-		}
-		if !mount.Writable {
-			m.Options = append(m.Options, "ro")
-		}
-		s.Mounts = append(s.Mounts, m)
-	}
-
-	// In s.Process
-	s.Process.Args = append([]string{c.Path}, c.Args...)
-	if !c.Config.ArgsEscaped {
-		s.Process.Args = escapeArgs(s.Process.Args)
-	}
-	s.Process.Cwd = c.Config.WorkingDir
-	if len(s.Process.Cwd) == 0 {
-		// We default to C:\ to workaround the oddity of the case that the
-		// default directory for cmd running as LocalSystem (or
-		// ContainerAdministrator) is c:\windows\system32. Hence docker run
-		// <image> cmd will by default end in c:\windows\system32, rather
-		// than 'root' (/) on Linux. The oddity is that if you have a dockerfile
-		// which has no WORKDIR and has a COPY file ., . will be interpreted
-		// as c:\. Hence, setting it to default of c:\ makes for consistency.
-		s.Process.Cwd = `C:\`
-	}
-	s.Process.Env = c.CreateDaemonEnvironment(c.Config.Tty, linkedEnv)
-	s.Process.ConsoleSize.Height = c.HostConfig.ConsoleSize[0]
-	s.Process.ConsoleSize.Width = c.HostConfig.ConsoleSize[1]
-	s.Process.Terminal = c.Config.Tty
-	s.Process.User.Username = c.Config.User
-
-	// In spec.Root. This is not set for Hyper-V containers
-	isHyperV := false
-	if c.HostConfig.Isolation.IsDefault() {
-		// Container using default isolation, so take the default from the daemon configuration
-		isHyperV = daemon.defaultIsolation.IsHyperV()
-	} else {
-		// Container may be requesting an explicit isolation mode.
-		isHyperV = c.HostConfig.Isolation.IsHyperV()
-	}
-	if !isHyperV {
-		s.Root.Path = c.BaseFS
-	}
-	s.Root.Readonly = false // Windows does not support a read-only root filesystem
-
-	// In s.Windows.Resources
-	// @darrenstahlmsft implement these resources
-	cpuShares := uint16(c.HostConfig.CPUShares)
-	cpuPercent := uint8(c.HostConfig.CPUPercent)
-	if c.HostConfig.NanoCPUs > 0 {
-		cpuPercent = uint8(c.HostConfig.NanoCPUs * 100 / int64(sysinfo.NumCPU()) / 1e9)
-	}
-	cpuCount := uint64(c.HostConfig.CPUCount)
-	memoryLimit := uint64(c.HostConfig.Memory)
-	s.Windows.Resources = &specs.WindowsResources{
-		CPU: &specs.WindowsCPUResources{
-			Percent: &cpuPercent,
-			Shares:  &cpuShares,
-			Count:   &cpuCount,
-		},
-		Memory: &specs.WindowsMemoryResources{
-			Limit: &memoryLimit,
-			//TODO Reservation: ...,
-		},
-		Network: &specs.WindowsNetworkResources{
-		//TODO Bandwidth: ...,
-		},
-		Storage: &specs.WindowsStorageResources{
-			Bps:  &c.HostConfig.IOMaximumBandwidth,
-			Iops: &c.HostConfig.IOMaximumIOps,
-		},
-	}
-	return (*specs.Spec)(&s), nil
-}
-
-func escapeArgs(args []string) []string {
-	escapedArgs := make([]string, len(args))
-	for i, a := range args {
-		escapedArgs[i] = syscall.EscapeArg(a)
-	}
-	return escapedArgs
-}
-
-// mergeUlimits merge the Ulimits from HostConfig with daemon defaults, and update HostConfig
-// It will do nothing on non-Linux platform
-func (daemon *Daemon) mergeUlimits(c *containertypes.HostConfig) {
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/pause.go b/installer/vendor/github.com/docker/docker/daemon/pause.go
deleted file mode 100644
index dbfafbc5fd..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/pause.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/container"
-)
-
-// ContainerPause pauses a container
-func (daemon *Daemon) ContainerPause(name string) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if err := daemon.containerPause(container); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// containerPause pauses the container execution without stopping the process.
-// The execution can be resumed by calling containerUnpause.
-func (daemon *Daemon) containerPause(container *container.Container) error {
-	container.Lock()
-	defer container.Unlock()
-
-	// We cannot Pause the container which is not running
-	if !container.Running {
-		return errNotRunning{container.ID}
-	}
-
-	// We cannot Pause the container which is already paused
-	if container.Paused {
-		return fmt.Errorf("Container %s is already paused", container.ID)
-	}
-
-	// We cannot Pause the container which is restarting
-	if container.Restarting {
-		return errContainerIsRestarting(container.ID)
-	}
-
-	if err := daemon.containerd.Pause(container.ID); err != nil {
-		return fmt.Errorf("Cannot pause container %s: %s", container.ID, err)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/prune.go b/installer/vendor/github.com/docker/docker/daemon/prune.go
deleted file mode 100644
index a693beb4e1..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/prune.go
+++ /dev/null
@@ -1,236 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"regexp"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/directory"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/docker/volume"
-	"github.com/docker/libnetwork"
-)
-
-// ContainersPrune removes unused containers
-func (daemon *Daemon) ContainersPrune(pruneFilters filters.Args) (*types.ContainersPruneReport, error) {
-	rep := &types.ContainersPruneReport{}
-
-	allContainers := daemon.List()
-	for _, c := range allContainers {
-		if !c.IsRunning() {
-			cSize, _ := daemon.getSize(c)
-			// TODO: sets RmLink to true?
-			err := daemon.ContainerRm(c.ID, &types.ContainerRmConfig{})
-			if err != nil {
-				logrus.Warnf("failed to prune container %s: %v", c.ID, err)
-				continue
-			}
-			if cSize > 0 {
-				rep.SpaceReclaimed += uint64(cSize)
-			}
-			rep.ContainersDeleted = append(rep.ContainersDeleted, c.ID)
-		}
-	}
-
-	return rep, nil
-}
-
-// VolumesPrune removes unused local volumes
-func (daemon *Daemon) VolumesPrune(pruneFilters filters.Args) (*types.VolumesPruneReport, error) {
-	rep := &types.VolumesPruneReport{}
-
-	pruneVols := func(v volume.Volume) error {
-		name := v.Name()
-		refs := daemon.volumes.Refs(v)
-
-		if len(refs) == 0 {
-			vSize, err := directory.Size(v.Path())
-			if err != nil {
-				logrus.Warnf("could not determine size of volume %s: %v", name, err)
-			}
-			err = daemon.volumes.Remove(v)
-			if err != nil {
-				logrus.Warnf("could not remove volume %s: %v", name, err)
-				return nil
-			}
-			rep.SpaceReclaimed += uint64(vSize)
-			rep.VolumesDeleted = append(rep.VolumesDeleted, name)
-		}
-
-		return nil
-	}
-
-	err := daemon.traverseLocalVolumes(pruneVols)
-
-	return rep, err
-}
-
-// ImagesPrune removes unused images
-func (daemon *Daemon) ImagesPrune(pruneFilters filters.Args) (*types.ImagesPruneReport, error) {
-	rep := &types.ImagesPruneReport{}
-
-	danglingOnly := true
-	if pruneFilters.Include("dangling") {
-		if pruneFilters.ExactMatch("dangling", "false") || pruneFilters.ExactMatch("dangling", "0") {
-			danglingOnly = false
-		} else if !pruneFilters.ExactMatch("dangling", "true") && !pruneFilters.ExactMatch("dangling", "1") {
-			return nil, fmt.Errorf("Invalid filter 'dangling=%s'", pruneFilters.Get("dangling"))
-		}
-	}
-
-	var allImages map[image.ID]*image.Image
-	if danglingOnly {
-		allImages = daemon.imageStore.Heads()
-	} else {
-		allImages = daemon.imageStore.Map()
-	}
-	allContainers := daemon.List()
-	imageRefs := map[string]bool{}
-	for _, c := range allContainers {
-		imageRefs[c.ID] = true
-	}
-
-	// Filter intermediary images and get their unique size
-	allLayers := daemon.layerStore.Map()
-	topImages := map[image.ID]*image.Image{}
-	for id, img := range allImages {
-		dgst := digest.Digest(id)
-		if len(daemon.referenceStore.References(dgst)) == 0 && len(daemon.imageStore.Children(id)) != 0 {
-			continue
-		}
-		topImages[id] = img
-	}
-
-	for id := range topImages {
-		dgst := digest.Digest(id)
-		hex := dgst.Hex()
-		if _, ok := imageRefs[hex]; ok {
-			continue
-		}
-
-		deletedImages := []types.ImageDelete{}
-		refs := daemon.referenceStore.References(dgst)
-		if len(refs) > 0 {
-			if danglingOnly {
-				// Not a dangling image
-				continue
-			}
-
-			nrRefs := len(refs)
-			for _, ref := range refs {
-				// If nrRefs == 1, we have an image marked as myreponame:<none>
-				// i.e. the tag content was changed
-				if _, ok := ref.(reference.Canonical); ok && nrRefs > 1 {
-					continue
-				}
-				imgDel, err := daemon.ImageDelete(ref.String(), false, true)
-				if err != nil {
-					logrus.Warnf("could not delete reference %s: %v", ref.String(), err)
-					continue
-				}
-				deletedImages = append(deletedImages, imgDel...)
-			}
-		} else {
-			imgDel, err := daemon.ImageDelete(hex, false, true)
-			if err != nil {
-				logrus.Warnf("could not delete image %s: %v", hex, err)
-				continue
-			}
-			deletedImages = append(deletedImages, imgDel...)
-		}
-
-		rep.ImagesDeleted = append(rep.ImagesDeleted, deletedImages...)
-	}
-
-	// Compute how much space was freed
-	for _, d := range rep.ImagesDeleted {
-		if d.Deleted != "" {
-			chid := layer.ChainID(d.Deleted)
-			if l, ok := allLayers[chid]; ok {
-				diffSize, err := l.DiffSize()
-				if err != nil {
-					logrus.Warnf("failed to get layer %s size: %v", chid, err)
-					continue
-				}
-				rep.SpaceReclaimed += uint64(diffSize)
-			}
-		}
-	}
-
-	return rep, nil
-}
-
-// localNetworksPrune removes unused local networks
-func (daemon *Daemon) localNetworksPrune(pruneFilters filters.Args) (*types.NetworksPruneReport, error) {
-	rep := &types.NetworksPruneReport{}
-	var err error
-	// When the function returns true, the walk will stop.
-	l := func(nw libnetwork.Network) bool {
-		nwName := nw.Name()
-		predefined := runconfig.IsPreDefinedNetwork(nwName)
-		if !predefined && len(nw.Endpoints()) == 0 {
-			if err = daemon.DeleteNetwork(nw.ID()); err != nil {
-				logrus.Warnf("could not remove network %s: %v", nwName, err)
-				return false
-			}
-			rep.NetworksDeleted = append(rep.NetworksDeleted, nwName)
-		}
-		return false
-	}
-	daemon.netController.WalkNetworks(l)
-	return rep, err
-}
-
-// clusterNetworksPrune removes unused cluster networks
-func (daemon *Daemon) clusterNetworksPrune(pruneFilters filters.Args) (*types.NetworksPruneReport, error) {
-	rep := &types.NetworksPruneReport{}
-	cluster := daemon.GetCluster()
-	networks, err := cluster.GetNetworks()
-	if err != nil {
-		return rep, err
-	}
-	networkIsInUse := regexp.MustCompile(`network ([[:alnum:]]+) is in use`)
-	for _, nw := range networks {
-		if nw.Name == "ingress" {
-			continue
-		}
-		// https://github.com/docker/docker/issues/24186
-		// `docker network inspect` unfortunately displays ONLY those containers that are local to that node.
-		// So we try to remove it anyway and check the error
-		err = cluster.RemoveNetwork(nw.ID)
-		if err != nil {
-			// we can safely ignore the "network .. is in use" error
-			match := networkIsInUse.FindStringSubmatch(err.Error())
-			if len(match) != 2 || match[1] != nw.ID {
-				logrus.Warnf("could not remove network %s: %v", nw.Name, err)
-			}
-			continue
-		}
-		rep.NetworksDeleted = append(rep.NetworksDeleted, nw.Name)
-	}
-	return rep, nil
-}
-
-// NetworksPrune removes unused networks
-func (daemon *Daemon) NetworksPrune(pruneFilters filters.Args) (*types.NetworksPruneReport, error) {
-	rep := &types.NetworksPruneReport{}
-	clusterRep, err := daemon.clusterNetworksPrune(pruneFilters)
-	if err != nil {
-		logrus.Warnf("could not remove cluster networks: %v", err)
-	} else {
-		rep.NetworksDeleted = append(rep.NetworksDeleted, clusterRep.NetworksDeleted...)
-	}
-	localRep, err := daemon.localNetworksPrune(pruneFilters)
-	if err != nil {
-		logrus.Warnf("could not remove local networks: %v", err)
-	} else {
-		rep.NetworksDeleted = append(rep.NetworksDeleted, localRep.NetworksDeleted...)
-	}
-	return rep, err
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/rename.go b/installer/vendor/github.com/docker/docker/daemon/rename.go
deleted file mode 100644
index ffb7715f23..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/rename.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	dockercontainer "github.com/docker/docker/container"
-	"github.com/docker/libnetwork"
-)
-
-// ContainerRename changes the name of a container, using the oldName
-// to find the container. An error is returned if newName is already
-// reserved.
-func (daemon *Daemon) ContainerRename(oldName, newName string) error {
-	var (
-		sid string
-		sb  libnetwork.Sandbox
-	)
-
-	if oldName == "" || newName == "" {
-		return fmt.Errorf("Neither old nor new names may be empty")
-	}
-
-	if newName[0] != '/' {
-		newName = "/" + newName
-	}
-
-	container, err := daemon.GetContainer(oldName)
-	if err != nil {
-		return err
-	}
-
-	oldName = container.Name
-	oldIsAnonymousEndpoint := container.NetworkSettings.IsAnonymousEndpoint
-
-	if oldName == newName {
-		return fmt.Errorf("Renaming a container with the same name as its current name")
-	}
-
-	container.Lock()
-	defer container.Unlock()
-
-	links := map[string]*dockercontainer.Container{}
-	for k, v := range daemon.linkIndex.children(container) {
-		if !strings.HasPrefix(k, oldName) {
-			return fmt.Errorf("Linked container %s does not match parent %s", k, oldName)
-		}
-		links[strings.TrimPrefix(k, oldName)] = v
-	}
-
-	if newName, err = daemon.reserveName(container.ID, newName); err != nil {
-		return fmt.Errorf("Error when allocating new name: %v", err)
-	}
-
-	for k, v := range links {
-		daemon.nameIndex.Reserve(newName+k, v.ID)
-		daemon.linkIndex.link(container, v, newName+k)
-	}
-
-	container.Name = newName
-	container.NetworkSettings.IsAnonymousEndpoint = false
-
-	defer func() {
-		if err != nil {
-			container.Name = oldName
-			container.NetworkSettings.IsAnonymousEndpoint = oldIsAnonymousEndpoint
-			daemon.reserveName(container.ID, oldName)
-			for k, v := range links {
-				daemon.nameIndex.Reserve(oldName+k, v.ID)
-				daemon.linkIndex.link(container, v, oldName+k)
-				daemon.linkIndex.unlink(newName+k, v, container)
-				daemon.nameIndex.Release(newName + k)
-			}
-			daemon.releaseName(newName)
-		}
-	}()
-
-	for k, v := range links {
-		daemon.linkIndex.unlink(oldName+k, v, container)
-		daemon.nameIndex.Release(oldName + k)
-	}
-	daemon.releaseName(oldName)
-	if err = container.ToDisk(); err != nil {
-		return err
-	}
-
-	attributes := map[string]string{
-		"oldName": oldName,
-	}
-
-	if !container.Running {
-		daemon.LogContainerEventWithAttributes(container, "rename", attributes)
-		return nil
-	}
-
-	defer func() {
-		if err != nil {
-			container.Name = oldName
-			container.NetworkSettings.IsAnonymousEndpoint = oldIsAnonymousEndpoint
-			if e := container.ToDisk(); e != nil {
-				logrus.Errorf("%s: Failed in writing to Disk on rename failure: %v", container.ID, e)
-			}
-		}
-	}()
-
-	sid = container.NetworkSettings.SandboxID
-	if daemon.netController != nil {
-		sb, err = daemon.netController.SandboxByID(sid)
-		if err != nil {
-			return err
-		}
-
-		err = sb.Rename(strings.TrimPrefix(container.Name, "/"))
-		if err != nil {
-			return err
-		}
-	}
-
-	daemon.LogContainerEventWithAttributes(container, "rename", attributes)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/resize.go b/installer/vendor/github.com/docker/docker/daemon/resize.go
deleted file mode 100644
index 747353852e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/resize.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/libcontainerd"
-)
-
-// ContainerResize changes the size of the TTY of the process running
-// in the container with the given name to the given height and width.
-func (daemon *Daemon) ContainerResize(name string, height, width int) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if !container.IsRunning() {
-		return errNotRunning{container.ID}
-	}
-
-	if err = daemon.containerd.Resize(container.ID, libcontainerd.InitFriendlyName, width, height); err == nil {
-		attributes := map[string]string{
-			"height": fmt.Sprintf("%d", height),
-			"width":  fmt.Sprintf("%d", width),
-		}
-		daemon.LogContainerEventWithAttributes(container, "resize", attributes)
-	}
-	return err
-}
-
-// ContainerExecResize changes the size of the TTY of the process
-// running in the exec with the given name to the given height and
-// width.
-func (daemon *Daemon) ContainerExecResize(name string, height, width int) error {
-	ec, err := daemon.getExecConfig(name)
-	if err != nil {
-		return err
-	}
-	return daemon.containerd.Resize(ec.ContainerID, ec.ID, width, height)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/restart.go b/installer/vendor/github.com/docker/docker/daemon/restart.go
deleted file mode 100644
index 79292f3752..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/restart.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-)
-
-// ContainerRestart stops and starts a container. It attempts to
-// gracefully stop the container within the given timeout, forcefully
-// stopping it if the timeout is exceeded. If given a negative
-// timeout, ContainerRestart will wait forever until a graceful
-// stop. Returns an error if the container cannot be found, or if
-// there is an underlying error at any stage of the restart.
-func (daemon *Daemon) ContainerRestart(name string, seconds *int) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-	if seconds == nil {
-		stopTimeout := container.StopTimeout()
-		seconds = &stopTimeout
-	}
-	if err := daemon.containerRestart(container, *seconds); err != nil {
-		return fmt.Errorf("Cannot restart container %s: %v", name, err)
-	}
-	return nil
-
-}
-
-// containerRestart attempts to gracefully stop and then start the
-// container. When stopping, wait for the given duration in seconds to
-// gracefully stop, before forcefully terminating the container. If
-// given a negative duration, wait forever for a graceful stop.
-func (daemon *Daemon) containerRestart(container *container.Container, seconds int) error {
-	// Avoid unnecessarily unmounting and then directly mounting
-	// the container when the container stops and then starts
-	// again
-	if err := daemon.Mount(container); err == nil {
-		defer daemon.Unmount(container)
-	}
-
-	if container.IsRunning() {
-		// set AutoRemove flag to false before stop so the container won't be
-		// removed during restart process
-		autoRemove := container.HostConfig.AutoRemove
-
-		container.HostConfig.AutoRemove = false
-		err := daemon.containerStop(container, seconds)
-		// restore AutoRemove irrespective of whether the stop worked or not
-		container.HostConfig.AutoRemove = autoRemove
-		// containerStop will write HostConfig to disk, we shall restore AutoRemove
-		// in disk too
-		if toDiskErr := container.ToDiskLocking(); toDiskErr != nil {
-			logrus.Errorf("Write container to disk error: %v", toDiskErr)
-		}
-
-		if err != nil {
-			return err
-		}
-	}
-
-	if err := daemon.containerStart(container, "", "", true); err != nil {
-		return err
-	}
-
-	daemon.LogContainerEvent(container, "restart")
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/search.go b/installer/vendor/github.com/docker/docker/daemon/search.go
deleted file mode 100644
index 5d2ac5d222..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/search.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strconv"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/dockerversion"
-)
-
-var acceptedSearchFilterTags = map[string]bool{
-	"is-automated": true,
-	"is-official":  true,
-	"stars":        true,
-}
-
-// SearchRegistryForImages queries the registry for images matching
-// term. authConfig is used to login.
-func (daemon *Daemon) SearchRegistryForImages(ctx context.Context, filtersArgs string, term string, limit int,
-	authConfig *types.AuthConfig,
-	headers map[string][]string) (*registrytypes.SearchResults, error) {
-
-	searchFilters, err := filters.FromParam(filtersArgs)
-	if err != nil {
-		return nil, err
-	}
-	if err := searchFilters.Validate(acceptedSearchFilterTags); err != nil {
-		return nil, err
-	}
-
-	var isAutomated, isOfficial bool
-	var hasStarFilter = 0
-	if searchFilters.Include("is-automated") {
-		if searchFilters.UniqueExactMatch("is-automated", "true") {
-			isAutomated = true
-		} else if !searchFilters.UniqueExactMatch("is-automated", "false") {
-			return nil, fmt.Errorf("Invalid filter 'is-automated=%s'", searchFilters.Get("is-automated"))
-		}
-	}
-	if searchFilters.Include("is-official") {
-		if searchFilters.UniqueExactMatch("is-official", "true") {
-			isOfficial = true
-		} else if !searchFilters.UniqueExactMatch("is-official", "false") {
-			return nil, fmt.Errorf("Invalid filter 'is-official=%s'", searchFilters.Get("is-official"))
-		}
-	}
-	if searchFilters.Include("stars") {
-		hasStars := searchFilters.Get("stars")
-		for _, hasStar := range hasStars {
-			iHasStar, err := strconv.Atoi(hasStar)
-			if err != nil {
-				return nil, fmt.Errorf("Invalid filter 'stars=%s'", hasStar)
-			}
-			if iHasStar > hasStarFilter {
-				hasStarFilter = iHasStar
-			}
-		}
-	}
-
-	unfilteredResult, err := daemon.RegistryService.Search(ctx, term, limit, authConfig, dockerversion.DockerUserAgent(ctx), headers)
-	if err != nil {
-		return nil, err
-	}
-
-	filteredResults := []registrytypes.SearchResult{}
-	for _, result := range unfilteredResult.Results {
-		if searchFilters.Include("is-automated") {
-			if isAutomated != result.IsAutomated {
-				continue
-			}
-		}
-		if searchFilters.Include("is-official") {
-			if isOfficial != result.IsOfficial {
-				continue
-			}
-		}
-		if searchFilters.Include("stars") {
-			if result.StarCount < hasStarFilter {
-				continue
-			}
-		}
-		filteredResults = append(filteredResults, result)
-	}
-
-	return &registrytypes.SearchResults{
-		Query:      unfilteredResult.Query,
-		NumResults: len(filteredResults),
-		Results:    filteredResults,
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/search_test.go b/installer/vendor/github.com/docker/docker/daemon/search_test.go
deleted file mode 100644
index f5aa85a61e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/search_test.go
+++ /dev/null
@@ -1,358 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/registry"
-)
-
-type FakeService struct {
-	registry.DefaultService
-
-	shouldReturnError bool
-
-	term    string
-	results []registrytypes.SearchResult
-}
-
-func (s *FakeService) Search(ctx context.Context, term string, limit int, authConfig *types.AuthConfig, userAgent string, headers map[string][]string) (*registrytypes.SearchResults, error) {
-	if s.shouldReturnError {
-		return nil, fmt.Errorf("Search unknown error")
-	}
-	return &registrytypes.SearchResults{
-		Query:      s.term,
-		NumResults: len(s.results),
-		Results:    s.results,
-	}, nil
-}
-
-func TestSearchRegistryForImagesErrors(t *testing.T) {
-	errorCases := []struct {
-		filtersArgs       string
-		shouldReturnError bool
-		expectedError     string
-	}{
-		{
-			expectedError:     "Search unknown error",
-			shouldReturnError: true,
-		},
-		{
-			filtersArgs:   "invalid json",
-			expectedError: "invalid character 'i' looking for beginning of value",
-		},
-		{
-			filtersArgs:   `{"type":{"custom":true}}`,
-			expectedError: "Invalid filter 'type'",
-		},
-		{
-			filtersArgs:   `{"is-automated":{"invalid":true}}`,
-			expectedError: "Invalid filter 'is-automated=[invalid]'",
-		},
-		{
-			filtersArgs:   `{"is-automated":{"true":true,"false":true}}`,
-			expectedError: "Invalid filter 'is-automated",
-		},
-		{
-			filtersArgs:   `{"is-official":{"invalid":true}}`,
-			expectedError: "Invalid filter 'is-official=[invalid]'",
-		},
-		{
-			filtersArgs:   `{"is-official":{"true":true,"false":true}}`,
-			expectedError: "Invalid filter 'is-official",
-		},
-		{
-			filtersArgs:   `{"stars":{"invalid":true}}`,
-			expectedError: "Invalid filter 'stars=invalid'",
-		},
-		{
-			filtersArgs:   `{"stars":{"1":true,"invalid":true}}`,
-			expectedError: "Invalid filter 'stars=invalid'",
-		},
-	}
-	for index, e := range errorCases {
-		daemon := &Daemon{
-			RegistryService: &FakeService{
-				shouldReturnError: e.shouldReturnError,
-			},
-		}
-		_, err := daemon.SearchRegistryForImages(context.Background(), e.filtersArgs, "term", 25, nil, map[string][]string{})
-		if err == nil {
-			t.Errorf("%d: expected an error, got nothing", index)
-		}
-		if !strings.Contains(err.Error(), e.expectedError) {
-			t.Errorf("%d: expected error to contain %s, got %s", index, e.expectedError, err.Error())
-		}
-	}
-}
-
-func TestSearchRegistryForImages(t *testing.T) {
-	term := "term"
-	successCases := []struct {
-		filtersArgs     string
-		registryResults []registrytypes.SearchResult
-		expectedResults []registrytypes.SearchResult
-	}{
-		{
-			filtersArgs:     "",
-			registryResults: []registrytypes.SearchResult{},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: "",
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-				},
-			},
-		},
-		{
-			filtersArgs: `{"is-automated":{"true":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: `{"is-automated":{"true":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsAutomated: true,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsAutomated: true,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"is-automated":{"false":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsAutomated: true,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: `{"is-automated":{"false":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsAutomated: false,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsAutomated: false,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"is-official":{"true":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: `{"is-official":{"true":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsOfficial:  true,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsOfficial:  true,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"is-official":{"false":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsOfficial:  true,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: `{"is-official":{"false":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsOfficial:  false,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					IsOfficial:  false,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"stars":{"0":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					StarCount:   0,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					StarCount:   0,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"stars":{"1":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name",
-					Description: "description",
-					StarCount:   0,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{},
-		},
-		{
-			filtersArgs: `{"stars":{"1":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name0",
-					Description: "description0",
-					StarCount:   0,
-				},
-				{
-					Name:        "name1",
-					Description: "description1",
-					StarCount:   1,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name1",
-					Description: "description1",
-					StarCount:   1,
-				},
-			},
-		},
-		{
-			filtersArgs: `{"stars":{"1":true}, "is-official":{"true":true}, "is-automated":{"true":true}}`,
-			registryResults: []registrytypes.SearchResult{
-				{
-					Name:        "name0",
-					Description: "description0",
-					StarCount:   0,
-					IsOfficial:  true,
-					IsAutomated: true,
-				},
-				{
-					Name:        "name1",
-					Description: "description1",
-					StarCount:   1,
-					IsOfficial:  false,
-					IsAutomated: true,
-				},
-				{
-					Name:        "name2",
-					Description: "description2",
-					StarCount:   1,
-					IsOfficial:  true,
-					IsAutomated: false,
-				},
-				{
-					Name:        "name3",
-					Description: "description3",
-					StarCount:   2,
-					IsOfficial:  true,
-					IsAutomated: true,
-				},
-			},
-			expectedResults: []registrytypes.SearchResult{
-				{
-					Name:        "name3",
-					Description: "description3",
-					StarCount:   2,
-					IsOfficial:  true,
-					IsAutomated: true,
-				},
-			},
-		},
-	}
-	for index, s := range successCases {
-		daemon := &Daemon{
-			RegistryService: &FakeService{
-				term:    term,
-				results: s.registryResults,
-			},
-		}
-		results, err := daemon.SearchRegistryForImages(context.Background(), s.filtersArgs, term, 25, nil, map[string][]string{})
-		if err != nil {
-			t.Errorf("%d: %v", index, err)
-		}
-		if results.Query != term {
-			t.Errorf("%d: expected Query to be %s, got %s", index, term, results.Query)
-		}
-		if results.NumResults != len(s.expectedResults) {
-			t.Errorf("%d: expected NumResults to be %d, got %d", index, len(s.expectedResults), results.NumResults)
-		}
-		for _, result := range results.Results {
-			found := false
-			for _, expectedResult := range s.expectedResults {
-				if expectedResult.Name == result.Name &&
-					expectedResult.Description == result.Description &&
-					expectedResult.IsAutomated == result.IsAutomated &&
-					expectedResult.IsOfficial == result.IsOfficial &&
-					expectedResult.StarCount == result.StarCount {
-					found = true
-					break
-				}
-			}
-			if !found {
-				t.Errorf("%d: expected results %v, got %v", index, s.expectedResults, results.Results)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/seccomp_disabled.go b/installer/vendor/github.com/docker/docker/daemon/seccomp_disabled.go
deleted file mode 100644
index ff1127b6c2..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/seccomp_disabled.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build linux,!seccomp
-
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/container"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-var supportsSeccomp = false
-
-func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {
-	if c.SeccompProfile != "" && c.SeccompProfile != "unconfined" {
-		return fmt.Errorf("seccomp profiles are not supported on this daemon, you cannot specify a custom seccomp profile")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/seccomp_linux.go b/installer/vendor/github.com/docker/docker/daemon/seccomp_linux.go
deleted file mode 100644
index 7f16733d95..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/seccomp_linux.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// +build linux,seccomp
-
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/profiles/seccomp"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-var supportsSeccomp = true
-
-func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {
-	var profile *specs.Seccomp
-	var err error
-
-	if c.HostConfig.Privileged {
-		return nil
-	}
-
-	if !daemon.seccompEnabled {
-		if c.SeccompProfile != "" && c.SeccompProfile != "unconfined" {
-			return fmt.Errorf("Seccomp is not enabled in your kernel, cannot run a custom seccomp profile.")
-		}
-		logrus.Warn("Seccomp is not enabled in your kernel, running container without default profile.")
-		c.SeccompProfile = "unconfined"
-	}
-	if c.SeccompProfile == "unconfined" {
-		return nil
-	}
-	if c.SeccompProfile != "" {
-		profile, err = seccomp.LoadProfile(c.SeccompProfile, rs)
-		if err != nil {
-			return err
-		}
-	} else {
-		if daemon.seccompProfile != nil {
-			profile, err = seccomp.LoadProfile(string(daemon.seccompProfile), rs)
-			if err != nil {
-				return err
-			}
-		} else {
-			profile, err = seccomp.GetDefaultProfile(rs)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	rs.Linux.Seccomp = profile
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/seccomp_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/seccomp_unsupported.go
deleted file mode 100644
index b3691e96af..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/seccomp_unsupported.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !linux
-
-package daemon
-
-var supportsSeccomp = false
diff --git a/installer/vendor/github.com/docker/docker/daemon/secrets.go b/installer/vendor/github.com/docker/docker/daemon/secrets.go
deleted file mode 100644
index 355cb1e139..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/secrets.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package daemon
-
-import (
-	"github.com/Sirupsen/logrus"
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	"github.com/docker/swarmkit/agent/exec"
-)
-
-// SetContainerSecretStore sets the secret store backend for the container
-func (daemon *Daemon) SetContainerSecretStore(name string, store exec.SecretGetter) error {
-	c, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	c.SecretStore = store
-
-	return nil
-}
-
-// SetContainerSecretReferences sets the container secret references needed
-func (daemon *Daemon) SetContainerSecretReferences(name string, refs []*swarmtypes.SecretReference) error {
-	if !secretsSupported() && len(refs) > 0 {
-		logrus.Warn("secrets are not supported on this platform")
-		return nil
-	}
-
-	c, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	c.SecretReferences = refs
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/secrets_linux.go b/installer/vendor/github.com/docker/docker/daemon/secrets_linux.go
deleted file mode 100644
index fca4e12598..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/secrets_linux.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build linux
-
-package daemon
-
-func secretsSupported() bool {
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/secrets_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/secrets_unsupported.go
deleted file mode 100644
index d6f36fda1e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/secrets_unsupported.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !linux
-
-package daemon
-
-func secretsSupported() bool {
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/selinux_linux.go b/installer/vendor/github.com/docker/docker/daemon/selinux_linux.go
deleted file mode 100644
index 83a3447111..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/selinux_linux.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build linux
-
-package daemon
-
-import "github.com/opencontainers/runc/libcontainer/selinux"
-
-func selinuxSetDisabled() {
-	selinux.SetDisabled()
-}
-
-func selinuxFreeLxcContexts(label string) {
-	selinux.FreeLxcContexts(label)
-}
-
-func selinuxEnabled() bool {
-	return selinux.SelinuxEnabled()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/selinux_unsupported.go b/installer/vendor/github.com/docker/docker/daemon/selinux_unsupported.go
deleted file mode 100644
index 25a56ad157..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/selinux_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !linux
-
-package daemon
-
-func selinuxSetDisabled() {
-}
-
-func selinuxFreeLxcContexts(label string) {
-}
-
-func selinuxEnabled() bool {
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/start.go b/installer/vendor/github.com/docker/docker/daemon/start.go
deleted file mode 100644
index 6c94fd5482..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/start.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"net/http"
-	"runtime"
-	"strings"
-	"syscall"
-	"time"
-
-	"google.golang.org/grpc"
-
-	"github.com/Sirupsen/logrus"
-	apierrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/runconfig"
-)
-
-// ContainerStart starts a container.
-func (daemon *Daemon) ContainerStart(name string, hostConfig *containertypes.HostConfig, checkpoint string, checkpointDir string) error {
-	if checkpoint != "" && !daemon.HasExperimental() {
-		return apierrors.NewBadRequestError(fmt.Errorf("checkpoint is only supported in experimental mode"))
-	}
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if container.IsPaused() {
-		return fmt.Errorf("Cannot start a paused container, try unpause instead.")
-	}
-
-	if container.IsRunning() {
-		err := fmt.Errorf("Container already started")
-		return apierrors.NewErrorWithStatusCode(err, http.StatusNotModified)
-	}
-
-	// Windows does not have the backwards compatibility issue here.
-	if runtime.GOOS != "windows" {
-		// This is kept for backward compatibility - hostconfig should be passed when
-		// creating a container, not during start.
-		if hostConfig != nil {
-			logrus.Warn("DEPRECATED: Setting host configuration options when the container starts is deprecated and has been removed in Docker 1.12")
-			oldNetworkMode := container.HostConfig.NetworkMode
-			if err := daemon.setSecurityOptions(container, hostConfig); err != nil {
-				return err
-			}
-			if err := daemon.mergeAndVerifyLogConfig(&hostConfig.LogConfig); err != nil {
-				return err
-			}
-			if err := daemon.setHostConfig(container, hostConfig); err != nil {
-				return err
-			}
-			newNetworkMode := container.HostConfig.NetworkMode
-			if string(oldNetworkMode) != string(newNetworkMode) {
-				// if user has change the network mode on starting, clean up the
-				// old networks. It is a deprecated feature and has been removed in Docker 1.12
-				container.NetworkSettings.Networks = nil
-				if err := container.ToDisk(); err != nil {
-					return err
-				}
-			}
-			container.InitDNSHostConfig()
-		}
-	} else {
-		if hostConfig != nil {
-			return fmt.Errorf("Supplying a hostconfig on start is not supported. It should be supplied on create")
-		}
-	}
-
-	// check if hostConfig is in line with the current system settings.
-	// It may happen cgroups are umounted or the like.
-	if _, err = daemon.verifyContainerSettings(container.HostConfig, nil, false); err != nil {
-		return err
-	}
-	// Adapt for old containers in case we have updates in this function and
-	// old containers never have chance to call the new function in create stage.
-	if hostConfig != nil {
-		if err := daemon.adaptContainerSettings(container.HostConfig, false); err != nil {
-			return err
-		}
-	}
-
-	return daemon.containerStart(container, checkpoint, checkpointDir, true)
-}
-
-// Start starts a container
-func (daemon *Daemon) Start(container *container.Container) error {
-	return daemon.containerStart(container, "", "", true)
-}
-
-// containerStart prepares the container to run by setting up everything the
-// container needs, such as storage and networking, as well as links
-// between containers. The container is left waiting for a signal to
-// begin running.
-func (daemon *Daemon) containerStart(container *container.Container, checkpoint string, checkpointDir string, resetRestartManager bool) (err error) {
-	start := time.Now()
-	container.Lock()
-	defer container.Unlock()
-
-	if resetRestartManager && container.Running { // skip this check if already in restarting step and resetRestartManager==false
-		return nil
-	}
-
-	if container.RemovalInProgress || container.Dead {
-		return fmt.Errorf("Container is marked for removal and cannot be started.")
-	}
-
-	// if we encounter an error during start we need to ensure that any other
-	// setup has been cleaned up properly
-	defer func() {
-		if err != nil {
-			container.SetError(err)
-			// if no one else has set it, make sure we don't leave it at zero
-			if container.ExitCode() == 0 {
-				container.SetExitCode(128)
-			}
-			container.ToDisk()
-
-			container.Reset(false)
-
-			daemon.Cleanup(container)
-			// if containers AutoRemove flag is set, remove it after clean up
-			if container.HostConfig.AutoRemove {
-				container.Unlock()
-				if err := daemon.ContainerRm(container.ID, &types.ContainerRmConfig{ForceRemove: true, RemoveVolume: true}); err != nil {
-					logrus.Errorf("can't remove container %s: %v", container.ID, err)
-				}
-				container.Lock()
-			}
-		}
-	}()
-
-	if err := daemon.conditionalMountOnStart(container); err != nil {
-		return err
-	}
-
-	// Make sure NetworkMode has an acceptable value. We do this to ensure
-	// backwards API compatibility.
-	container.HostConfig = runconfig.SetDefaultNetModeIfBlank(container.HostConfig)
-
-	if err := daemon.initializeNetworking(container); err != nil {
-		return err
-	}
-
-	spec, err := daemon.createSpec(container)
-	if err != nil {
-		return err
-	}
-
-	createOptions, err := daemon.getLibcontainerdCreateOptions(container)
-	if err != nil {
-		return err
-	}
-
-	if resetRestartManager {
-		container.ResetRestartManager(true)
-	}
-
-	if checkpointDir == "" {
-		checkpointDir = container.CheckpointDir()
-	}
-
-	if err := daemon.containerd.Create(container.ID, checkpoint, checkpointDir, *spec, container.InitializeStdio, createOptions...); err != nil {
-		errDesc := grpc.ErrorDesc(err)
-		contains := func(s1, s2 string) bool {
-			return strings.Contains(strings.ToLower(s1), s2)
-		}
-		logrus.Errorf("Create container failed with error: %s", errDesc)
-		// if we receive an internal error from the initial start of a container then lets
-		// return it instead of entering the restart loop
-		// set to 127 for container cmd not found/does not exist)
-		if contains(errDesc, container.Path) &&
-			(contains(errDesc, "executable file not found") ||
-				contains(errDesc, "no such file or directory") ||
-				contains(errDesc, "system cannot find the file specified")) {
-			container.SetExitCode(127)
-		}
-		// set to 126 for container cmd can't be invoked errors
-		if contains(errDesc, syscall.EACCES.Error()) {
-			container.SetExitCode(126)
-		}
-
-		// attempted to mount a file onto a directory, or a directory onto a file, maybe from user specified bind mounts
-		if contains(errDesc, syscall.ENOTDIR.Error()) {
-			errDesc += ": Are you trying to mount a directory onto a file (or vice-versa)? Check if the specified host path exists and is the expected type"
-			container.SetExitCode(127)
-		}
-
-		return fmt.Errorf("%s", errDesc)
-	}
-
-	containerActions.WithValues("start").UpdateSince(start)
-
-	return nil
-}
-
-// Cleanup releases any network resources allocated to the container along with any rules
-// around how containers are linked together.  It also unmounts the container's root filesystem.
-func (daemon *Daemon) Cleanup(container *container.Container) {
-	daemon.releaseNetwork(container)
-
-	container.UnmountIpcMounts(detachMounted)
-
-	if err := daemon.conditionalUnmountOnCleanup(container); err != nil {
-		// FIXME: remove once reference counting for graphdrivers has been refactored
-		// Ensure that all the mounts are gone
-		if mountid, err := daemon.layerStore.GetMountID(container.ID); err == nil {
-			daemon.cleanupMountsByID(mountid)
-		}
-	}
-
-	if err := container.UnmountSecrets(); err != nil {
-		logrus.Warnf("%s cleanup: failed to unmount secrets: %s", container.ID, err)
-	}
-
-	for _, eConfig := range container.ExecCommands.Commands() {
-		daemon.unregisterExecCommand(container, eConfig)
-	}
-
-	if container.BaseFS != "" {
-		if err := container.UnmountVolumes(daemon.LogVolumeEvent); err != nil {
-			logrus.Warnf("%s cleanup: Failed to umount volumes: %v", container.ID, err)
-		}
-	}
-	container.CancelAttachContext()
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/start_unix.go b/installer/vendor/github.com/docker/docker/daemon/start_unix.go
deleted file mode 100644
index 6bbe485075..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/start_unix.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) ([]libcontainerd.CreateOption, error) {
-	createOptions := []libcontainerd.CreateOption{}
-
-	// Ensure a runtime has been assigned to this container
-	if container.HostConfig.Runtime == "" {
-		container.HostConfig.Runtime = stockRuntimeName
-		container.ToDisk()
-	}
-
-	rt := daemon.configStore.GetRuntime(container.HostConfig.Runtime)
-	if rt == nil {
-		return nil, fmt.Errorf("no such runtime '%s'", container.HostConfig.Runtime)
-	}
-	if UsingSystemd(daemon.configStore) {
-		rt.Args = append(rt.Args, "--systemd-cgroup=true")
-	}
-	createOptions = append(createOptions, libcontainerd.WithRuntime(rt.Path, rt.Args))
-
-	return createOptions, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/start_windows.go b/installer/vendor/github.com/docker/docker/daemon/start_windows.go
deleted file mode 100644
index faa7575224..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/start_windows.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"io/ioutil"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/libcontainerd"
-	"golang.org/x/sys/windows/registry"
-)
-
-const (
-	credentialSpecRegistryLocation = `SOFTWARE\Microsoft\Windows NT\CurrentVersion\Virtualization\Containers\CredentialSpecs`
-	credentialSpecFileLocation     = "CredentialSpecs"
-)
-
-func (daemon *Daemon) getLibcontainerdCreateOptions(container *container.Container) ([]libcontainerd.CreateOption, error) {
-	createOptions := []libcontainerd.CreateOption{}
-
-	// Are we going to run as a Hyper-V container?
-	hvOpts := &libcontainerd.HyperVIsolationOption{}
-	if container.HostConfig.Isolation.IsDefault() {
-		// Container is set to use the default, so take the default from the daemon configuration
-		hvOpts.IsHyperV = daemon.defaultIsolation.IsHyperV()
-	} else {
-		// Container is requesting an isolation mode. Honour it.
-		hvOpts.IsHyperV = container.HostConfig.Isolation.IsHyperV()
-	}
-
-	// Generate the layer folder of the layer options
-	layerOpts := &libcontainerd.LayerOption{}
-	m, err := container.RWLayer.Metadata()
-	if err != nil {
-		return nil, fmt.Errorf("failed to get layer metadata - %s", err)
-	}
-	if hvOpts.IsHyperV {
-		hvOpts.SandboxPath = filepath.Dir(m["dir"])
-	}
-
-	layerOpts.LayerFolderPath = m["dir"]
-
-	// Generate the layer paths of the layer options
-	img, err := daemon.imageStore.Get(container.ImageID)
-	if err != nil {
-		return nil, fmt.Errorf("failed to graph.Get on ImageID %s - %s", container.ImageID, err)
-	}
-	// Get the layer path for each layer.
-	max := len(img.RootFS.DiffIDs)
-	for i := 1; i <= max; i++ {
-		img.RootFS.DiffIDs = img.RootFS.DiffIDs[:i]
-		layerPath, err := layer.GetLayerPath(daemon.layerStore, img.RootFS.ChainID())
-		if err != nil {
-			return nil, fmt.Errorf("failed to get layer path from graphdriver %s for ImageID %s - %s", daemon.layerStore, img.RootFS.ChainID(), err)
-		}
-		// Reverse order, expecting parent most first
-		layerOpts.LayerPaths = append([]string{layerPath}, layerOpts.LayerPaths...)
-	}
-
-	// Get endpoints for the libnetwork allocated networks to the container
-	var epList []string
-	AllowUnqualifiedDNSQuery := false
-	gwHNSID := ""
-	if container.NetworkSettings != nil {
-		for n := range container.NetworkSettings.Networks {
-			sn, err := daemon.FindNetwork(n)
-			if err != nil {
-				continue
-			}
-
-			ep, err := container.GetEndpointInNetwork(sn)
-			if err != nil {
-				continue
-			}
-
-			data, err := ep.DriverInfo()
-			if err != nil {
-				continue
-			}
-
-			if data["GW_INFO"] != nil {
-				gwInfo := data["GW_INFO"].(map[string]interface{})
-				if gwInfo["hnsid"] != nil {
-					gwHNSID = gwInfo["hnsid"].(string)
-				}
-			}
-
-			if data["hnsid"] != nil {
-				epList = append(epList, data["hnsid"].(string))
-			}
-
-			if data["AllowUnqualifiedDNSQuery"] != nil {
-				AllowUnqualifiedDNSQuery = true
-			}
-		}
-	}
-
-	if gwHNSID != "" {
-		epList = append(epList, gwHNSID)
-	}
-
-	// Read and add credentials from the security options if a credential spec has been provided.
-	if container.HostConfig.SecurityOpt != nil {
-		for _, sOpt := range container.HostConfig.SecurityOpt {
-			sOpt = strings.ToLower(sOpt)
-			if !strings.Contains(sOpt, "=") {
-				return nil, fmt.Errorf("invalid security option: no equals sign in supplied value %s", sOpt)
-			}
-			var splitsOpt []string
-			splitsOpt = strings.SplitN(sOpt, "=", 2)
-			if len(splitsOpt) != 2 {
-				return nil, fmt.Errorf("invalid security option: %s", sOpt)
-			}
-			if splitsOpt[0] != "credentialspec" {
-				return nil, fmt.Errorf("security option not supported: %s", splitsOpt[0])
-			}
-
-			credentialsOpts := &libcontainerd.CredentialsOption{}
-			var (
-				match   bool
-				csValue string
-				err     error
-			)
-			if match, csValue = getCredentialSpec("file://", splitsOpt[1]); match {
-				if csValue == "" {
-					return nil, fmt.Errorf("no value supplied for file:// credential spec security option")
-				}
-				if credentialsOpts.Credentials, err = readCredentialSpecFile(container.ID, daemon.root, filepath.Clean(csValue)); err != nil {
-					return nil, err
-				}
-			} else if match, csValue = getCredentialSpec("registry://", splitsOpt[1]); match {
-				if csValue == "" {
-					return nil, fmt.Errorf("no value supplied for registry:// credential spec security option")
-				}
-				if credentialsOpts.Credentials, err = readCredentialSpecRegistry(container.ID, csValue); err != nil {
-					return nil, err
-				}
-			} else {
-				return nil, fmt.Errorf("invalid credential spec security option - value must be prefixed file:// or registry:// followed by a value")
-			}
-			createOptions = append(createOptions, credentialsOpts)
-		}
-	}
-
-	// Now add the remaining options.
-	createOptions = append(createOptions, &libcontainerd.FlushOption{IgnoreFlushesDuringBoot: !container.HasBeenStartedBefore})
-	createOptions = append(createOptions, hvOpts)
-	createOptions = append(createOptions, layerOpts)
-	if epList != nil {
-		createOptions = append(createOptions, &libcontainerd.NetworkEndpointsOption{Endpoints: epList, AllowUnqualifiedDNSQuery: AllowUnqualifiedDNSQuery})
-	}
-
-	return createOptions, nil
-}
-
-// getCredentialSpec is a helper function to get the value of a credential spec supplied
-// on the CLI, stripping the prefix
-func getCredentialSpec(prefix, value string) (bool, string) {
-	if strings.HasPrefix(value, prefix) {
-		return true, strings.TrimPrefix(value, prefix)
-	}
-	return false, ""
-}
-
-// readCredentialSpecRegistry is a helper function to read a credential spec from
-// the registry. If not found, we return an empty string and warn in the log.
-// This allows for staging on machines which do not have the necessary components.
-func readCredentialSpecRegistry(id, name string) (string, error) {
-	var (
-		k   registry.Key
-		err error
-		val string
-	)
-	if k, err = registry.OpenKey(registry.LOCAL_MACHINE, credentialSpecRegistryLocation, registry.QUERY_VALUE); err != nil {
-		return "", fmt.Errorf("failed handling spec %q for container %s - %s could not be opened", name, id, credentialSpecRegistryLocation)
-	}
-	if val, _, err = k.GetStringValue(name); err != nil {
-		if err == registry.ErrNotExist {
-			return "", fmt.Errorf("credential spec %q for container %s as it was not found", name, id)
-		}
-		return "", fmt.Errorf("error %v reading credential spec %q from registry for container %s", err, name, id)
-	}
-	return val, nil
-}
-
-// readCredentialSpecFile is a helper function to read a credential spec from
-// a file. If not found, we return an empty string and warn in the log.
-// This allows for staging on machines which do not have the necessary components.
-func readCredentialSpecFile(id, root, location string) (string, error) {
-	if filepath.IsAbs(location) {
-		return "", fmt.Errorf("invalid credential spec - file:// path cannot be absolute")
-	}
-	base := filepath.Join(root, credentialSpecFileLocation)
-	full := filepath.Join(base, location)
-	if !strings.HasPrefix(full, base) {
-		return "", fmt.Errorf("invalid credential spec - file:// path must be under %s", base)
-	}
-	bcontents, err := ioutil.ReadFile(full)
-	if err != nil {
-		return "", fmt.Errorf("credential spec '%s' for container %s as the file could not be read: %q", full, id, err)
-	}
-	return string(bcontents[:]), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats.go b/installer/vendor/github.com/docker/docker/daemon/stats.go
deleted file mode 100644
index 51f5962d17..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package daemon
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"runtime"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/api/types/versions/v1p20"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-// ContainerStats writes information about the container to the stream
-// given in the config object.
-func (daemon *Daemon) ContainerStats(ctx context.Context, prefixOrName string, config *backend.ContainerStatsConfig) error {
-	if runtime.GOOS == "solaris" {
-		return fmt.Errorf("%+v does not support stats", runtime.GOOS)
-	}
-	// Engine API version (used for backwards compatibility)
-	apiVersion := config.Version
-
-	container, err := daemon.GetContainer(prefixOrName)
-	if err != nil {
-		return err
-	}
-
-	// If the container is either not running or restarting and requires no stream, return an empty stats.
-	if (!container.IsRunning() || container.IsRestarting()) && !config.Stream {
-		return json.NewEncoder(config.OutStream).Encode(&types.Stats{})
-	}
-
-	outStream := config.OutStream
-	if config.Stream {
-		wf := ioutils.NewWriteFlusher(outStream)
-		defer wf.Close()
-		wf.Flush()
-		outStream = wf
-	}
-
-	var preCPUStats types.CPUStats
-	var preRead time.Time
-	getStatJSON := func(v interface{}) *types.StatsJSON {
-		ss := v.(types.StatsJSON)
-		ss.Name = container.Name
-		ss.ID = container.ID
-		ss.PreCPUStats = preCPUStats
-		ss.PreRead = preRead
-		preCPUStats = ss.CPUStats
-		preRead = ss.Read
-		return &ss
-	}
-
-	enc := json.NewEncoder(outStream)
-
-	updates := daemon.subscribeToContainerStats(container)
-	defer daemon.unsubscribeToContainerStats(container, updates)
-
-	noStreamFirstFrame := true
-	for {
-		select {
-		case v, ok := <-updates:
-			if !ok {
-				return nil
-			}
-
-			var statsJSON interface{}
-			statsJSONPost120 := getStatJSON(v)
-			if versions.LessThan(apiVersion, "1.21") {
-				if runtime.GOOS == "windows" {
-					return errors.New("API versions pre v1.21 do not support stats on Windows")
-				}
-				var (
-					rxBytes   uint64
-					rxPackets uint64
-					rxErrors  uint64
-					rxDropped uint64
-					txBytes   uint64
-					txPackets uint64
-					txErrors  uint64
-					txDropped uint64
-				)
-				for _, v := range statsJSONPost120.Networks {
-					rxBytes += v.RxBytes
-					rxPackets += v.RxPackets
-					rxErrors += v.RxErrors
-					rxDropped += v.RxDropped
-					txBytes += v.TxBytes
-					txPackets += v.TxPackets
-					txErrors += v.TxErrors
-					txDropped += v.TxDropped
-				}
-				statsJSON = &v1p20.StatsJSON{
-					Stats: statsJSONPost120.Stats,
-					Network: types.NetworkStats{
-						RxBytes:   rxBytes,
-						RxPackets: rxPackets,
-						RxErrors:  rxErrors,
-						RxDropped: rxDropped,
-						TxBytes:   txBytes,
-						TxPackets: txPackets,
-						TxErrors:  txErrors,
-						TxDropped: txDropped,
-					},
-				}
-			} else {
-				statsJSON = statsJSONPost120
-			}
-
-			if !config.Stream && noStreamFirstFrame {
-				// prime the cpu stats so they aren't 0 in the final output
-				noStreamFirstFrame = false
-				continue
-			}
-
-			if err := enc.Encode(statsJSON); err != nil {
-				return err
-			}
-
-			if !config.Stream {
-				return nil
-			}
-		case <-ctx.Done():
-			return nil
-		}
-	}
-}
-
-func (daemon *Daemon) subscribeToContainerStats(c *container.Container) chan interface{} {
-	return daemon.statsCollector.collect(c)
-}
-
-func (daemon *Daemon) unsubscribeToContainerStats(c *container.Container, ch chan interface{}) {
-	daemon.statsCollector.unsubscribe(c, ch)
-}
-
-// GetContainerStats collects all the stats published by a container
-func (daemon *Daemon) GetContainerStats(container *container.Container) (*types.StatsJSON, error) {
-	stats, err := daemon.stats(container)
-	if err != nil {
-		return nil, err
-	}
-
-	// We already have the network stats on Windows directly from HCS.
-	if !container.Config.NetworkDisabled && runtime.GOOS != "windows" {
-		if stats.Networks, err = daemon.getNetworkStats(container); err != nil {
-			return nil, err
-		}
-	}
-
-	return stats, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_collector.go b/installer/vendor/github.com/docker/docker/daemon/stats_collector.go
deleted file mode 100644
index dc6825e705..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_collector.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// +build !solaris
-
-package daemon
-
-import (
-	"bufio"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/pubsub"
-)
-
-type statsSupervisor interface {
-	// GetContainerStats collects all the stats related to a container
-	GetContainerStats(container *container.Container) (*types.StatsJSON, error)
-}
-
-// newStatsCollector returns a new statsCollector that collections
-// stats for a registered container at the specified interval.
-// The collector allows non-running containers to be added
-// and will start processing stats when they are started.
-func (daemon *Daemon) newStatsCollector(interval time.Duration) *statsCollector {
-	s := &statsCollector{
-		interval:   interval,
-		supervisor: daemon,
-		publishers: make(map[*container.Container]*pubsub.Publisher),
-		bufReader:  bufio.NewReaderSize(nil, 128),
-	}
-	platformNewStatsCollector(s)
-	go s.run()
-	return s
-}
-
-// statsCollector manages and provides container resource stats
-type statsCollector struct {
-	m          sync.Mutex
-	supervisor statsSupervisor
-	interval   time.Duration
-	publishers map[*container.Container]*pubsub.Publisher
-	bufReader  *bufio.Reader
-
-	// The following fields are not set on Windows currently.
-	clockTicksPerSecond uint64
-	machineMemory       uint64
-}
-
-// collect registers the container with the collector and adds it to
-// the event loop for collection on the specified interval returning
-// a channel for the subscriber to receive on.
-func (s *statsCollector) collect(c *container.Container) chan interface{} {
-	s.m.Lock()
-	defer s.m.Unlock()
-	publisher, exists := s.publishers[c]
-	if !exists {
-		publisher = pubsub.NewPublisher(100*time.Millisecond, 1024)
-		s.publishers[c] = publisher
-	}
-	return publisher.Subscribe()
-}
-
-// stopCollection closes the channels for all subscribers and removes
-// the container from metrics collection.
-func (s *statsCollector) stopCollection(c *container.Container) {
-	s.m.Lock()
-	if publisher, exists := s.publishers[c]; exists {
-		publisher.Close()
-		delete(s.publishers, c)
-	}
-	s.m.Unlock()
-}
-
-// unsubscribe removes a specific subscriber from receiving updates for a container's stats.
-func (s *statsCollector) unsubscribe(c *container.Container, ch chan interface{}) {
-	s.m.Lock()
-	publisher := s.publishers[c]
-	if publisher != nil {
-		publisher.Evict(ch)
-		if publisher.Len() == 0 {
-			delete(s.publishers, c)
-		}
-	}
-	s.m.Unlock()
-}
-
-func (s *statsCollector) run() {
-	type publishersPair struct {
-		container *container.Container
-		publisher *pubsub.Publisher
-	}
-	// we cannot determine the capacity here.
-	// it will grow enough in first iteration
-	var pairs []publishersPair
-
-	for range time.Tick(s.interval) {
-		// it does not make sense in the first iteration,
-		// but saves allocations in further iterations
-		pairs = pairs[:0]
-
-		s.m.Lock()
-		for container, publisher := range s.publishers {
-			// copy pointers here to release the lock ASAP
-			pairs = append(pairs, publishersPair{container, publisher})
-		}
-		s.m.Unlock()
-		if len(pairs) == 0 {
-			continue
-		}
-
-		systemUsage, err := s.getSystemCPUUsage()
-		if err != nil {
-			logrus.Errorf("collecting system cpu usage: %v", err)
-			continue
-		}
-
-		for _, pair := range pairs {
-			stats, err := s.supervisor.GetContainerStats(pair.container)
-			if err != nil {
-				if _, ok := err.(errNotRunning); !ok {
-					logrus.Errorf("collecting stats for %s: %v", pair.container.ID, err)
-				}
-				continue
-			}
-			// FIXME: move to containerd on Linux (not Windows)
-			stats.CPUStats.SystemUsage = systemUsage
-
-			pair.publisher.Publish(*stats)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_collector_solaris.go b/installer/vendor/github.com/docker/docker/daemon/stats_collector_solaris.go
deleted file mode 100644
index 9cf9f0a94e..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_collector_solaris.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/container"
-	"time"
-)
-
-// newStatsCollector returns a new statsCollector for collection stats
-// for a registered container at the specified interval. The collector allows
-// non-running containers to be added and will start processing stats when
-// they are started.
-func (daemon *Daemon) newStatsCollector(interval time.Duration) *statsCollector {
-	return &statsCollector{}
-}
-
-// statsCollector manages and provides container resource stats
-type statsCollector struct {
-}
-
-// collect registers the container with the collector and adds it to
-// the event loop for collection on the specified interval returning
-// a channel for the subscriber to receive on.
-func (s *statsCollector) collect(c *container.Container) chan interface{} {
-	return nil
-}
-
-// stopCollection closes the channels for all subscribers and removes
-// the container from metrics collection.
-func (s *statsCollector) stopCollection(c *container.Container) {
-}
-
-// unsubscribe removes a specific subscriber from receiving updates for a container's stats.
-func (s *statsCollector) unsubscribe(c *container.Container, ch chan interface{}) {
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_collector_unix.go b/installer/vendor/github.com/docker/docker/daemon/stats_collector_unix.go
deleted file mode 100644
index 0fcc9c5828..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_collector_unix.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// +build !windows,!solaris
-
-package daemon
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-
-	sysinfo "github.com/docker/docker/pkg/system"
-	"github.com/opencontainers/runc/libcontainer/system"
-)
-
-// platformNewStatsCollector performs platform specific initialisation of the
-// statsCollector structure.
-func platformNewStatsCollector(s *statsCollector) {
-	s.clockTicksPerSecond = uint64(system.GetClockTicks())
-	meminfo, err := sysinfo.ReadMemInfo()
-	if err == nil && meminfo.MemTotal > 0 {
-		s.machineMemory = uint64(meminfo.MemTotal)
-	}
-}
-
-const nanoSecondsPerSecond = 1e9
-
-// getSystemCPUUsage returns the host system's cpu usage in
-// nanoseconds. An error is returned if the format of the underlying
-// file does not match.
-//
-// Uses /proc/stat defined by POSIX. Looks for the cpu
-// statistics line and then sums up the first seven fields
-// provided. See `man 5 proc` for details on specific field
-// information.
-func (s *statsCollector) getSystemCPUUsage() (uint64, error) {
-	var line string
-	f, err := os.Open("/proc/stat")
-	if err != nil {
-		return 0, err
-	}
-	defer func() {
-		s.bufReader.Reset(nil)
-		f.Close()
-	}()
-	s.bufReader.Reset(f)
-	err = nil
-	for err == nil {
-		line, err = s.bufReader.ReadString('\n')
-		if err != nil {
-			break
-		}
-		parts := strings.Fields(line)
-		switch parts[0] {
-		case "cpu":
-			if len(parts) < 8 {
-				return 0, fmt.Errorf("invalid number of cpu fields")
-			}
-			var totalClockTicks uint64
-			for _, i := range parts[1:8] {
-				v, err := strconv.ParseUint(i, 10, 64)
-				if err != nil {
-					return 0, fmt.Errorf("Unable to convert value %s to int: %s", i, err)
-				}
-				totalClockTicks += v
-			}
-			return (totalClockTicks * nanoSecondsPerSecond) /
-				s.clockTicksPerSecond, nil
-		}
-	}
-	return 0, fmt.Errorf("invalid stat format. Error trying to parse the '/proc/stat' file")
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_collector_windows.go b/installer/vendor/github.com/docker/docker/daemon/stats_collector_windows.go
deleted file mode 100644
index 41731b9c14..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_collector_windows.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build windows
-
-package daemon
-
-// platformNewStatsCollector performs platform specific initialisation of the
-// statsCollector structure. This is a no-op on Windows.
-func platformNewStatsCollector(s *statsCollector) {
-}
-
-// getSystemCPUUsage returns the host system's cpu usage in
-// nanoseconds. An error is returned if the format of the underlying
-// file does not match. This is a no-op on Windows.
-func (s *statsCollector) getSystemCPUUsage() (uint64, error) {
-	return 0, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_unix.go b/installer/vendor/github.com/docker/docker/daemon/stats_unix.go
deleted file mode 100644
index d875607b3a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_unix.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build !windows
-
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-)
-
-// Resolve Network SandboxID in case the container reuse another container's network stack
-func (daemon *Daemon) getNetworkSandboxID(c *container.Container) (string, error) {
-	curr := c
-	for curr.HostConfig.NetworkMode.IsContainer() {
-		containerID := curr.HostConfig.NetworkMode.ConnectedContainer()
-		connected, err := daemon.GetContainer(containerID)
-		if err != nil {
-			return "", fmt.Errorf("Could not get container for %s", containerID)
-		}
-		curr = connected
-	}
-	return curr.NetworkSettings.SandboxID, nil
-}
-
-func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.NetworkStats, error) {
-	sandboxID, err := daemon.getNetworkSandboxID(c)
-	if err != nil {
-		return nil, err
-	}
-
-	sb, err := daemon.netController.SandboxByID(sandboxID)
-	if err != nil {
-		return nil, err
-	}
-
-	lnstats, err := sb.Statistics()
-	if err != nil {
-		return nil, err
-	}
-
-	stats := make(map[string]types.NetworkStats)
-	// Convert libnetwork nw stats into api stats
-	for ifName, ifStats := range lnstats {
-		stats[ifName] = types.NetworkStats{
-			RxBytes:   ifStats.RxBytes,
-			RxPackets: ifStats.RxPackets,
-			RxErrors:  ifStats.RxErrors,
-			RxDropped: ifStats.RxDropped,
-			TxBytes:   ifStats.TxBytes,
-			TxPackets: ifStats.TxPackets,
-			TxErrors:  ifStats.TxErrors,
-			TxDropped: ifStats.TxDropped,
-		}
-	}
-
-	return stats, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stats_windows.go b/installer/vendor/github.com/docker/docker/daemon/stats_windows.go
deleted file mode 100644
index f8e6f6f84a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stats_windows.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/container"
-)
-
-// Windows network stats are obtained directly through HCS, hence this is a no-op.
-func (daemon *Daemon) getNetworkStats(c *container.Container) (map[string]types.NetworkStats, error) {
-	return make(map[string]types.NetworkStats), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/stop.go b/installer/vendor/github.com/docker/docker/daemon/stop.go
deleted file mode 100644
index aa7b3820c8..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/stop.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-	"net/http"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/errors"
-	"github.com/docker/docker/container"
-)
-
-// ContainerStop looks for the given container and terminates it,
-// waiting the given number of seconds before forcefully killing the
-// container. If a negative number of seconds is given, ContainerStop
-// will wait for a graceful termination. An error is returned if the
-// container is not found, is already stopped, or if there is a
-// problem stopping the container.
-func (daemon *Daemon) ContainerStop(name string, seconds *int) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-	if !container.IsRunning() {
-		err := fmt.Errorf("Container %s is already stopped", name)
-		return errors.NewErrorWithStatusCode(err, http.StatusNotModified)
-	}
-	if seconds == nil {
-		stopTimeout := container.StopTimeout()
-		seconds = &stopTimeout
-	}
-	if err := daemon.containerStop(container, *seconds); err != nil {
-		return fmt.Errorf("Cannot stop container %s: %v", name, err)
-	}
-	return nil
-}
-
-// containerStop halts a container by sending a stop signal, waiting for the given
-// duration in seconds, and then calling SIGKILL and waiting for the
-// process to exit. If a negative duration is given, Stop will wait
-// for the initial signal forever. If the container is not running Stop returns
-// immediately.
-func (daemon *Daemon) containerStop(container *container.Container, seconds int) error {
-	if !container.IsRunning() {
-		return nil
-	}
-
-	daemon.stopHealthchecks(container)
-
-	stopSignal := container.StopSignal()
-	// 1. Send a stop signal
-	if err := daemon.killPossiblyDeadProcess(container, stopSignal); err != nil {
-		// While normally we might "return err" here we're not going to
-		// because if we can't stop the container by this point then
-		// its probably because its already stopped. Meaning, between
-		// the time of the IsRunning() call above and now it stopped.
-		// Also, since the err return will be environment specific we can't
-		// look for any particular (common) error that would indicate
-		// that the process is already dead vs something else going wrong.
-		// So, instead we'll give it up to 2 more seconds to complete and if
-		// by that time the container is still running, then the error
-		// we got is probably valid and so we force kill it.
-		if _, err := container.WaitStop(2 * time.Second); err != nil {
-			logrus.Infof("Container failed to stop after sending signal %d to the process, force killing", stopSignal)
-			if err := daemon.killPossiblyDeadProcess(container, 9); err != nil {
-				return err
-			}
-		}
-	}
-
-	// 2. Wait for the process to exit on its own
-	if _, err := container.WaitStop(time.Duration(seconds) * time.Second); err != nil {
-		logrus.Infof("Container %v failed to exit within %d seconds of signal %d - using the force", container.ID, seconds, stopSignal)
-		// 3. If it doesn't, then send SIGKILL
-		if err := daemon.Kill(container); err != nil {
-			container.WaitStop(-1 * time.Second)
-			logrus.Warn(err) // Don't return error because we only care that container is stopped, not what function stopped it
-		}
-	}
-
-	daemon.LogContainerEvent(container, "stop")
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/top_unix.go b/installer/vendor/github.com/docker/docker/daemon/top_unix.go
deleted file mode 100644
index 7fb81d0148..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/top_unix.go
+++ /dev/null
@@ -1,126 +0,0 @@
-//+build !windows
-
-package daemon
-
-import (
-	"fmt"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-)
-
-func validatePSArgs(psArgs string) error {
-	// NOTE: \\s does not detect unicode whitespaces.
-	// So we use fieldsASCII instead of strings.Fields in parsePSOutput.
-	// See https://github.com/docker/docker/pull/24358
-	re := regexp.MustCompile("\\s+([^\\s]*)=\\s*(PID[^\\s]*)")
-	for _, group := range re.FindAllStringSubmatch(psArgs, -1) {
-		if len(group) >= 3 {
-			k := group[1]
-			v := group[2]
-			if k != "pid" {
-				return fmt.Errorf("specifying \"%s=%s\" is not allowed", k, v)
-			}
-		}
-	}
-	return nil
-}
-
-// fieldsASCII is similar to strings.Fields but only allows ASCII whitespaces
-func fieldsASCII(s string) []string {
-	fn := func(r rune) bool {
-		switch r {
-		case '\t', '\n', '\f', '\r', ' ':
-			return true
-		}
-		return false
-	}
-	return strings.FieldsFunc(s, fn)
-}
-
-func parsePSOutput(output []byte, pids []int) (*types.ContainerProcessList, error) {
-	procList := &types.ContainerProcessList{}
-
-	lines := strings.Split(string(output), "\n")
-	procList.Titles = fieldsASCII(lines[0])
-
-	pidIndex := -1
-	for i, name := range procList.Titles {
-		if name == "PID" {
-			pidIndex = i
-		}
-	}
-	if pidIndex == -1 {
-		return nil, fmt.Errorf("Couldn't find PID field in ps output")
-	}
-
-	// loop through the output and extract the PID from each line
-	for _, line := range lines[1:] {
-		if len(line) == 0 {
-			continue
-		}
-		fields := fieldsASCII(line)
-		p, err := strconv.Atoi(fields[pidIndex])
-		if err != nil {
-			return nil, fmt.Errorf("Unexpected pid '%s': %s", fields[pidIndex], err)
-		}
-
-		for _, pid := range pids {
-			if pid == p {
-				// Make sure number of fields equals number of header titles
-				// merging "overhanging" fields
-				process := fields[:len(procList.Titles)-1]
-				process = append(process, strings.Join(fields[len(procList.Titles)-1:], " "))
-				procList.Processes = append(procList.Processes, process)
-			}
-		}
-	}
-	return procList, nil
-}
-
-// ContainerTop lists the processes running inside of the given
-// container by calling ps with the given args, or with the flags
-// "-ef" if no args are given.  An error is returned if the container
-// is not found, or is not running, or if there are any problems
-// running ps, or parsing the output.
-func (daemon *Daemon) ContainerTop(name string, psArgs string) (*types.ContainerProcessList, error) {
-	if psArgs == "" {
-		psArgs = "-ef"
-	}
-
-	if err := validatePSArgs(psArgs); err != nil {
-		return nil, err
-	}
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	if !container.IsRunning() {
-		return nil, errNotRunning{container.ID}
-	}
-
-	if container.IsRestarting() {
-		return nil, errContainerIsRestarting(container.ID)
-	}
-
-	pids, err := daemon.containerd.GetPidsForContainer(container.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	output, err := exec.Command("ps", strings.Split(psArgs, " ")...).Output()
-	if err != nil {
-		return nil, fmt.Errorf("Error running ps: %v", err)
-	}
-	procList, err := parsePSOutput(output, pids)
-	if err != nil {
-		return nil, err
-	}
-	daemon.LogContainerEvent(container, "top")
-	return procList, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/top_unix_test.go b/installer/vendor/github.com/docker/docker/daemon/top_unix_test.go
deleted file mode 100644
index 269ab6e947..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/top_unix_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-//+build !windows
-
-package daemon
-
-import (
-	"testing"
-)
-
-func TestContainerTopValidatePSArgs(t *testing.T) {
-	tests := map[string]bool{
-		"ae -o uid=PID":             true,
-		"ae -o \"uid= PID\"":        true,  // ascii space (0x20)
-		"ae -o \"uid= PID\"":        false, // unicode space (U+2003, 0xe2 0x80 0x83)
-		"ae o uid=PID":              true,
-		"aeo uid=PID":               true,
-		"ae -O uid=PID":             true,
-		"ae -o pid=PID2 -o uid=PID": true,
-		"ae -o pid=PID":             false,
-		"ae -o pid=PID -o uid=PIDX": true, // FIXME: we do not need to prohibit this
-		"aeo pid=PID":               false,
-		"ae":                        false,
-		"":                          false,
-	}
-	for psArgs, errExpected := range tests {
-		err := validatePSArgs(psArgs)
-		t.Logf("tested %q, got err=%v", psArgs, err)
-		if errExpected && err == nil {
-			t.Fatalf("expected error, got %v (%q)", err, psArgs)
-		}
-		if !errExpected && err != nil {
-			t.Fatalf("expected nil, got %v (%q)", err, psArgs)
-		}
-	}
-}
-
-func TestContainerTopParsePSOutput(t *testing.T) {
-	tests := []struct {
-		output      []byte
-		pids        []int
-		errExpected bool
-	}{
-		{[]byte(`  PID COMMAND
-   42 foo
-   43 bar
-  100 baz
-`), []int{42, 43}, false},
-		{[]byte(`  UID COMMAND
-   42 foo
-   43 bar
-  100 baz
-`), []int{42, 43}, true},
-		// unicode space (U+2003, 0xe2 0x80 0x83)
-		{[]byte(` PID COMMAND
-   42 foo
-   43 bar
-  100 baz
-`), []int{42, 43}, true},
-		// the first space is U+2003, the second one is ascii.
-		{[]byte(` PID COMMAND
-   42 foo
-   43 bar
-  100 baz
-`), []int{42, 43}, true},
-	}
-
-	for _, f := range tests {
-		_, err := parsePSOutput(f.output, f.pids)
-		t.Logf("tested %q, got err=%v", string(f.output), err)
-		if f.errExpected && err == nil {
-			t.Fatalf("expected error, got %v (%q)", err, string(f.output))
-		}
-		if !f.errExpected && err != nil {
-			t.Fatalf("expected nil, got %v (%q)", err, string(f.output))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/top_windows.go b/installer/vendor/github.com/docker/docker/daemon/top_windows.go
deleted file mode 100644
index 3dd8ead468..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/top_windows.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/go-units"
-)
-
-// ContainerTop handles `docker top` client requests.
-// Future considerations:
-// -- Windows users are far more familiar with CPU% total.
-//    Further, users on Windows rarely see user/kernel CPU stats split.
-//    The kernel returns everything in terms of 100ns. To obtain
-//    CPU%, we could do something like docker stats does which takes two
-//    samples, subtract the difference and do the maths. Unfortunately this
-//    would slow the stat call down and require two kernel calls. So instead,
-//    we do something similar to linux and display the CPU as combined HH:MM:SS.mmm.
-// -- Perhaps we could add an argument to display "raw" stats
-// -- "Memory" is an extremely overloaded term in Windows. Hence we do what
-//    task manager does and use the private working set as the memory counter.
-//    We could return more info for those who really understand how memory
-//    management works in Windows if we introduced a "raw" stats (above).
-func (daemon *Daemon) ContainerTop(name string, psArgs string) (*types.ContainerProcessList, error) {
-	// It's not at all an equivalent to linux 'ps' on Windows
-	if psArgs != "" {
-		return nil, errors.New("Windows does not support arguments to top")
-	}
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return nil, err
-	}
-
-	s, err := daemon.containerd.Summary(container.ID)
-	if err != nil {
-		return nil, err
-	}
-	procList := &types.ContainerProcessList{}
-	procList.Titles = []string{"Name", "PID", "CPU", "Private Working Set"}
-
-	for _, j := range s {
-		d := time.Duration((j.KernelTime100ns + j.UserTime100ns) * 100) // Combined time in nanoseconds
-		procList.Processes = append(procList.Processes, []string{
-			j.ImageName,
-			fmt.Sprint(j.ProcessId),
-			fmt.Sprintf("%02d:%02d:%02d.%03d", int(d.Hours()), int(d.Minutes())%60, int(d.Seconds())%60, int(d.Nanoseconds()/1000000)%1000),
-			units.HumanSize(float64(j.MemoryWorkingSetPrivateBytes))})
-	}
-	return procList, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/unpause.go b/installer/vendor/github.com/docker/docker/daemon/unpause.go
deleted file mode 100644
index e66b3868dc..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/unpause.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/container"
-)
-
-// ContainerUnpause unpauses a container
-func (daemon *Daemon) ContainerUnpause(name string) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	if err := daemon.containerUnpause(container); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// containerUnpause resumes the container execution after the container is paused.
-func (daemon *Daemon) containerUnpause(container *container.Container) error {
-	container.Lock()
-	defer container.Unlock()
-
-	// We cannot unpause the container which is not paused
-	if !container.Paused {
-		return fmt.Errorf("Container %s is not paused", container.ID)
-	}
-
-	if err := daemon.containerd.Resume(container.ID); err != nil {
-		return fmt.Errorf("Cannot unpause container %s: %s", container.ID, err)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/update.go b/installer/vendor/github.com/docker/docker/daemon/update.go
deleted file mode 100644
index 6e26eeb96a..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/update.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package daemon
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-// ContainerUpdate updates configuration of the container
-func (daemon *Daemon) ContainerUpdate(name string, hostConfig *container.HostConfig) (container.ContainerUpdateOKBody, error) {
-	var warnings []string
-
-	warnings, err := daemon.verifyContainerSettings(hostConfig, nil, true)
-	if err != nil {
-		return container.ContainerUpdateOKBody{Warnings: warnings}, err
-	}
-
-	if err := daemon.update(name, hostConfig); err != nil {
-		return container.ContainerUpdateOKBody{Warnings: warnings}, err
-	}
-
-	return container.ContainerUpdateOKBody{Warnings: warnings}, nil
-}
-
-// ContainerUpdateCmdOnBuild updates Path and Args for the container with ID cID.
-func (daemon *Daemon) ContainerUpdateCmdOnBuild(cID string, cmd []string) error {
-	if len(cmd) == 0 {
-		return nil
-	}
-	c, err := daemon.GetContainer(cID)
-	if err != nil {
-		return err
-	}
-	c.Path = cmd[0]
-	c.Args = cmd[1:]
-	return nil
-}
-
-func (daemon *Daemon) update(name string, hostConfig *container.HostConfig) error {
-	if hostConfig == nil {
-		return nil
-	}
-
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	restoreConfig := false
-	backupHostConfig := *container.HostConfig
-	defer func() {
-		if restoreConfig {
-			container.Lock()
-			container.HostConfig = &backupHostConfig
-			container.ToDisk()
-			container.Unlock()
-		}
-	}()
-
-	if container.RemovalInProgress || container.Dead {
-		return errCannotUpdate(container.ID, fmt.Errorf("Container is marked for removal and cannot be \"update\"."))
-	}
-
-	if err := container.UpdateContainer(hostConfig); err != nil {
-		restoreConfig = true
-		return errCannotUpdate(container.ID, err)
-	}
-
-	// if Restart Policy changed, we need to update container monitor
-	if hostConfig.RestartPolicy.Name != "" {
-		container.UpdateMonitor(hostConfig.RestartPolicy)
-	}
-
-	// If container is not running, update hostConfig struct is enough,
-	// resources will be updated when the container is started again.
-	// If container is running (including paused), we need to update configs
-	// to the real world.
-	if container.IsRunning() && !container.IsRestarting() {
-		if err := daemon.containerd.UpdateResources(container.ID, toContainerdResources(hostConfig.Resources)); err != nil {
-			restoreConfig = true
-			return errCannotUpdate(container.ID, err)
-		}
-	}
-
-	daemon.LogContainerEvent(container, "update")
-
-	return nil
-}
-
-func errCannotUpdate(containerID string, err error) error {
-	return fmt.Errorf("Cannot update container %s: %v", containerID, err)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/update_linux.go b/installer/vendor/github.com/docker/docker/daemon/update_linux.go
deleted file mode 100644
index f422325272..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/update_linux.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build linux
-
-package daemon
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func toContainerdResources(resources container.Resources) libcontainerd.Resources {
-	var r libcontainerd.Resources
-	r.BlkioWeight = uint64(resources.BlkioWeight)
-	r.CpuShares = uint64(resources.CPUShares)
-	r.CpuPeriod = uint64(resources.CPUPeriod)
-	r.CpuQuota = uint64(resources.CPUQuota)
-	r.CpusetCpus = resources.CpusetCpus
-	r.CpusetMems = resources.CpusetMems
-	r.MemoryLimit = uint64(resources.Memory)
-	if resources.MemorySwap > 0 {
-		r.MemorySwap = uint64(resources.MemorySwap)
-	}
-	r.MemoryReservation = uint64(resources.MemoryReservation)
-	r.KernelMemoryLimit = uint64(resources.KernelMemory)
-	return r
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/update_solaris.go b/installer/vendor/github.com/docker/docker/daemon/update_solaris.go
deleted file mode 100644
index f3b545c5f0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/update_solaris.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package daemon
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func toContainerdResources(resources container.Resources) libcontainerd.Resources {
-	var r libcontainerd.Resources
-	return r
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/update_windows.go b/installer/vendor/github.com/docker/docker/daemon/update_windows.go
deleted file mode 100644
index 01466260bb..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/update_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package daemon
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/libcontainerd"
-)
-
-func toContainerdResources(resources container.Resources) libcontainerd.Resources {
-	var r libcontainerd.Resources
-	return r
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/volumes.go b/installer/vendor/github.com/docker/docker/daemon/volumes.go
deleted file mode 100644
index 10cf787709..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/volumes.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package daemon
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	dockererrors "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/opencontainers/runc/libcontainer/label"
-)
-
-var (
-	// ErrVolumeReadonly is used to signal an error when trying to copy data into
-	// a volume mount that is not writable.
-	ErrVolumeReadonly = errors.New("mounted volume is marked read-only")
-)
-
-type mounts []container.Mount
-
-// volumeToAPIType converts a volume.Volume to the type used by the Engine API
-func volumeToAPIType(v volume.Volume) *types.Volume {
-	tv := &types.Volume{
-		Name:   v.Name(),
-		Driver: v.DriverName(),
-	}
-	if v, ok := v.(volume.DetailedVolume); ok {
-		tv.Labels = v.Labels()
-		tv.Options = v.Options()
-		tv.Scope = v.Scope()
-	}
-
-	return tv
-}
-
-// Len returns the number of mounts. Used in sorting.
-func (m mounts) Len() int {
-	return len(m)
-}
-
-// Less returns true if the number of parts (a/b/c would be 3 parts) in the
-// mount indexed by parameter 1 is less than that of the mount indexed by
-// parameter 2. Used in sorting.
-func (m mounts) Less(i, j int) bool {
-	return m.parts(i) < m.parts(j)
-}
-
-// Swap swaps two items in an array of mounts. Used in sorting
-func (m mounts) Swap(i, j int) {
-	m[i], m[j] = m[j], m[i]
-}
-
-// parts returns the number of parts in the destination of a mount. Used in sorting.
-func (m mounts) parts(i int) int {
-	return strings.Count(filepath.Clean(m[i].Destination), string(os.PathSeparator))
-}
-
-// registerMountPoints initializes the container mount points with the configured volumes and bind mounts.
-// It follows the next sequence to decide what to mount in each final destination:
-//
-// 1. Select the previously configured mount points for the containers, if any.
-// 2. Select the volumes mounted from another containers. Overrides previously configured mount point destination.
-// 3. Select the bind mounts set by the client. Overrides previously configured mount point destinations.
-// 4. Cleanup old volumes that are about to be reassigned.
-func (daemon *Daemon) registerMountPoints(container *container.Container, hostConfig *containertypes.HostConfig) (retErr error) {
-	binds := map[string]bool{}
-	mountPoints := map[string]*volume.MountPoint{}
-	defer func() {
-		// clean up the container mountpoints once return with error
-		if retErr != nil {
-			for _, m := range mountPoints {
-				if m.Volume == nil {
-					continue
-				}
-				daemon.volumes.Dereference(m.Volume, container.ID)
-			}
-		}
-	}()
-
-	// 1. Read already configured mount points.
-	for destination, point := range container.MountPoints {
-		mountPoints[destination] = point
-	}
-
-	// 2. Read volumes from other containers.
-	for _, v := range hostConfig.VolumesFrom {
-		containerID, mode, err := volume.ParseVolumesFrom(v)
-		if err != nil {
-			return err
-		}
-
-		c, err := daemon.GetContainer(containerID)
-		if err != nil {
-			return err
-		}
-
-		for _, m := range c.MountPoints {
-			cp := &volume.MountPoint{
-				Name:        m.Name,
-				Source:      m.Source,
-				RW:          m.RW && volume.ReadWrite(mode),
-				Driver:      m.Driver,
-				Destination: m.Destination,
-				Propagation: m.Propagation,
-				Spec:        m.Spec,
-				CopyData:    false,
-			}
-
-			if len(cp.Source) == 0 {
-				v, err := daemon.volumes.GetWithRef(cp.Name, cp.Driver, container.ID)
-				if err != nil {
-					return err
-				}
-				cp.Volume = v
-			}
-
-			mountPoints[cp.Destination] = cp
-		}
-	}
-
-	// 3. Read bind mounts
-	for _, b := range hostConfig.Binds {
-		bind, err := volume.ParseMountRaw(b, hostConfig.VolumeDriver)
-		if err != nil {
-			return err
-		}
-
-		// #10618
-		_, tmpfsExists := hostConfig.Tmpfs[bind.Destination]
-		if binds[bind.Destination] || tmpfsExists {
-			return fmt.Errorf("Duplicate mount point '%s'", bind.Destination)
-		}
-
-		if bind.Type == mounttypes.TypeVolume {
-			// create the volume
-			v, err := daemon.volumes.CreateWithRef(bind.Name, bind.Driver, container.ID, nil, nil)
-			if err != nil {
-				return err
-			}
-			bind.Volume = v
-			bind.Source = v.Path()
-			// bind.Name is an already existing volume, we need to use that here
-			bind.Driver = v.DriverName()
-			if bind.Driver == volume.DefaultDriverName {
-				setBindModeIfNull(bind)
-			}
-		}
-
-		binds[bind.Destination] = true
-		mountPoints[bind.Destination] = bind
-	}
-
-	for _, cfg := range hostConfig.Mounts {
-		mp, err := volume.ParseMountSpec(cfg)
-		if err != nil {
-			return dockererrors.NewBadRequestError(err)
-		}
-
-		if binds[mp.Destination] {
-			return fmt.Errorf("Duplicate mount point '%s'", cfg.Target)
-		}
-
-		if mp.Type == mounttypes.TypeVolume {
-			var v volume.Volume
-			if cfg.VolumeOptions != nil {
-				var driverOpts map[string]string
-				if cfg.VolumeOptions.DriverConfig != nil {
-					driverOpts = cfg.VolumeOptions.DriverConfig.Options
-				}
-				v, err = daemon.volumes.CreateWithRef(mp.Name, mp.Driver, container.ID, driverOpts, cfg.VolumeOptions.Labels)
-			} else {
-				v, err = daemon.volumes.CreateWithRef(mp.Name, mp.Driver, container.ID, nil, nil)
-			}
-			if err != nil {
-				return err
-			}
-
-			if err := label.Relabel(mp.Source, container.MountLabel, false); err != nil {
-				return err
-			}
-			mp.Volume = v
-			mp.Name = v.Name()
-			mp.Driver = v.DriverName()
-
-			// only use the cached path here since getting the path is not necessary right now and calling `Path()` may be slow
-			if cv, ok := v.(interface {
-				CachedPath() string
-			}); ok {
-				mp.Source = cv.CachedPath()
-			}
-		}
-
-		binds[mp.Destination] = true
-		mountPoints[mp.Destination] = mp
-	}
-
-	container.Lock()
-
-	// 4. Cleanup old volumes that are about to be reassigned.
-	for _, m := range mountPoints {
-		if m.BackwardsCompatible() {
-			if mp, exists := container.MountPoints[m.Destination]; exists && mp.Volume != nil {
-				daemon.volumes.Dereference(mp.Volume, container.ID)
-			}
-		}
-	}
-	container.MountPoints = mountPoints
-
-	container.Unlock()
-
-	return nil
-}
-
-// lazyInitializeVolume initializes a mountpoint's volume if needed.
-// This happens after a daemon restart.
-func (daemon *Daemon) lazyInitializeVolume(containerID string, m *volume.MountPoint) error {
-	if len(m.Driver) > 0 && m.Volume == nil {
-		v, err := daemon.volumes.GetWithRef(m.Name, m.Driver, containerID)
-		if err != nil {
-			return err
-		}
-		m.Volume = v
-	}
-	return nil
-}
-
-func backportMountSpec(container *container.Container) error {
-	for target, m := range container.MountPoints {
-		if m.Spec.Type != "" {
-			// if type is set on even one mount, no need to migrate
-			return nil
-		}
-		if m.Name != "" {
-			m.Type = mounttypes.TypeVolume
-			m.Spec.Type = mounttypes.TypeVolume
-
-			// make sure this is not an anyonmous volume before setting the spec source
-			if _, exists := container.Config.Volumes[target]; !exists {
-				m.Spec.Source = m.Name
-			}
-			if container.HostConfig.VolumeDriver != "" {
-				m.Spec.VolumeOptions = &mounttypes.VolumeOptions{
-					DriverConfig: &mounttypes.Driver{Name: container.HostConfig.VolumeDriver},
-				}
-			}
-			if strings.Contains(m.Mode, "nocopy") {
-				if m.Spec.VolumeOptions == nil {
-					m.Spec.VolumeOptions = &mounttypes.VolumeOptions{}
-				}
-				m.Spec.VolumeOptions.NoCopy = true
-			}
-		} else {
-			m.Type = mounttypes.TypeBind
-			m.Spec.Type = mounttypes.TypeBind
-			m.Spec.Source = m.Source
-			if m.Propagation != "" {
-				m.Spec.BindOptions = &mounttypes.BindOptions{
-					Propagation: m.Propagation,
-				}
-			}
-		}
-
-		m.Spec.Target = m.Destination
-		if !m.RW {
-			m.Spec.ReadOnly = true
-		}
-	}
-	return container.ToDiskLocking()
-}
-
-func (daemon *Daemon) traverseLocalVolumes(fn func(volume.Volume) error) error {
-	localVolumeDriver, err := volumedrivers.GetDriver(volume.DefaultDriverName)
-	if err != nil {
-		return fmt.Errorf("can't retrieve local volume driver: %v", err)
-	}
-	vols, err := localVolumeDriver.List()
-	if err != nil {
-		return fmt.Errorf("can't retrieve local volumes: %v", err)
-	}
-
-	for _, v := range vols {
-		name := v.Name()
-		_, err := daemon.volumes.Get(name)
-		if err != nil {
-			logrus.Warnf("failed to retrieve volume %s from store: %v", name, err)
-		}
-
-		err = fn(v)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/volumes_unit_test.go b/installer/vendor/github.com/docker/docker/daemon/volumes_unit_test.go
deleted file mode 100644
index 450d17f978..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/volumes_unit_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package daemon
-
-import (
-	"testing"
-
-	"github.com/docker/docker/volume"
-)
-
-func TestParseVolumesFrom(t *testing.T) {
-	cases := []struct {
-		spec    string
-		expID   string
-		expMode string
-		fail    bool
-	}{
-		{"", "", "", true},
-		{"foobar", "foobar", "rw", false},
-		{"foobar:rw", "foobar", "rw", false},
-		{"foobar:ro", "foobar", "ro", false},
-		{"foobar:baz", "", "", true},
-	}
-
-	for _, c := range cases {
-		id, mode, err := volume.ParseVolumesFrom(c.spec)
-		if c.fail {
-			if err == nil {
-				t.Fatalf("Expected error, was nil, for spec %s\n", c.spec)
-			}
-			continue
-		}
-
-		if id != c.expID {
-			t.Fatalf("Expected id %s, was %s, for spec %s\n", c.expID, id, c.spec)
-		}
-		if mode != c.expMode {
-			t.Fatalf("Expected mode %s, was %s for spec %s\n", c.expMode, mode, c.spec)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/volumes_unix.go b/installer/vendor/github.com/docker/docker/daemon/volumes_unix.go
deleted file mode 100644
index 29dffa9ea0..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/volumes_unix.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// +build !windows
-
-// TODO(amitkris): We need to split this file for solaris.
-
-package daemon
-
-import (
-	"encoding/json"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-	"github.com/docker/docker/volume/local"
-	"github.com/pkg/errors"
-)
-
-// setupMounts iterates through each of the mount points for a container and
-// calls Setup() on each. It also looks to see if is a network mount such as
-// /etc/resolv.conf, and if it is not, appends it to the array of mounts.
-func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, error) {
-	var mounts []container.Mount
-	// TODO: tmpfs mounts should be part of Mountpoints
-	tmpfsMounts := make(map[string]bool)
-	tmpfsMountInfo, err := c.TmpfsMounts()
-	if err != nil {
-		return nil, err
-	}
-	for _, m := range tmpfsMountInfo {
-		tmpfsMounts[m.Destination] = true
-	}
-	for _, m := range c.MountPoints {
-		if tmpfsMounts[m.Destination] {
-			continue
-		}
-		if err := daemon.lazyInitializeVolume(c.ID, m); err != nil {
-			return nil, err
-		}
-		rootUID, rootGID := daemon.GetRemappedUIDGID()
-		path, err := m.Setup(c.MountLabel, rootUID, rootGID)
-		if err != nil {
-			return nil, err
-		}
-		if !c.TrySetNetworkMount(m.Destination, path) {
-			mnt := container.Mount{
-				Source:      path,
-				Destination: m.Destination,
-				Writable:    m.RW,
-				Propagation: string(m.Propagation),
-			}
-			if m.Volume != nil {
-				attributes := map[string]string{
-					"driver":      m.Volume.DriverName(),
-					"container":   c.ID,
-					"destination": m.Destination,
-					"read/write":  strconv.FormatBool(m.RW),
-					"propagation": string(m.Propagation),
-				}
-				daemon.LogVolumeEvent(m.Volume.Name(), "mount", attributes)
-			}
-			mounts = append(mounts, mnt)
-		}
-	}
-
-	mounts = sortMounts(mounts)
-	netMounts := c.NetworkMounts()
-	// if we are going to mount any of the network files from container
-	// metadata, the ownership must be set properly for potential container
-	// remapped root (user namespaces)
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	for _, mount := range netMounts {
-		if err := os.Chown(mount.Source, rootUID, rootGID); err != nil {
-			return nil, err
-		}
-	}
-	return append(mounts, netMounts...), nil
-}
-
-// sortMounts sorts an array of mounts in lexicographic order. This ensure that
-// when mounting, the mounts don't shadow other mounts. For example, if mounting
-// /etc and /etc/resolv.conf, /etc/resolv.conf must not be mounted first.
-func sortMounts(m []container.Mount) []container.Mount {
-	sort.Sort(mounts(m))
-	return m
-}
-
-// setBindModeIfNull is platform specific processing to ensure the
-// shared mode is set to 'z' if it is null. This is called in the case
-// of processing a named volume and not a typical bind.
-func setBindModeIfNull(bind *volume.MountPoint) {
-	if bind.Mode == "" {
-		bind.Mode = "z"
-	}
-}
-
-// migrateVolume links the contents of a volume created pre Docker 1.7
-// into the location expected by the local driver.
-// It creates a symlink from DOCKER_ROOT/vfs/dir/VOLUME_ID to DOCKER_ROOT/volumes/VOLUME_ID/_container_data.
-// It preserves the volume json configuration generated pre Docker 1.7 to be able to
-// downgrade from Docker 1.7 to Docker 1.6 without losing volume compatibility.
-func migrateVolume(id, vfs string) error {
-	l, err := volumedrivers.GetDriver(volume.DefaultDriverName)
-	if err != nil {
-		return err
-	}
-
-	newDataPath := l.(*local.Root).DataPath(id)
-	fi, err := os.Stat(newDataPath)
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	if fi != nil && fi.IsDir() {
-		return nil
-	}
-
-	return os.Symlink(vfs, newDataPath)
-}
-
-// verifyVolumesInfo ports volumes configured for the containers pre docker 1.7.
-// It reads the container configuration and creates valid mount points for the old volumes.
-func (daemon *Daemon) verifyVolumesInfo(container *container.Container) error {
-	// Inspect old structures only when we're upgrading from old versions
-	// to versions >= 1.7 and the MountPoints has not been populated with volumes data.
-	type volumes struct {
-		Volumes   map[string]string
-		VolumesRW map[string]bool
-	}
-	cfgPath, err := container.ConfigPath()
-	if err != nil {
-		return err
-	}
-	f, err := os.Open(cfgPath)
-	if err != nil {
-		return errors.Wrap(err, "could not open container config")
-	}
-	defer f.Close()
-	var cv volumes
-	if err := json.NewDecoder(f).Decode(&cv); err != nil {
-		return errors.Wrap(err, "could not decode container config")
-	}
-
-	if len(container.MountPoints) == 0 && len(cv.Volumes) > 0 {
-		for destination, hostPath := range cv.Volumes {
-			vfsPath := filepath.Join(daemon.root, "vfs", "dir")
-			rw := cv.VolumesRW != nil && cv.VolumesRW[destination]
-
-			if strings.HasPrefix(hostPath, vfsPath) {
-				id := filepath.Base(hostPath)
-				v, err := daemon.volumes.CreateWithRef(id, volume.DefaultDriverName, container.ID, nil, nil)
-				if err != nil {
-					return err
-				}
-				if err := migrateVolume(id, hostPath); err != nil {
-					return err
-				}
-				container.AddMountPointWithVolume(destination, v, true)
-			} else { // Bind mount
-				m := volume.MountPoint{Source: hostPath, Destination: destination, RW: rw}
-				container.MountPoints[destination] = &m
-			}
-		}
-		return container.ToDisk()
-	}
-	return nil
-}
-
-func (daemon *Daemon) mountVolumes(container *container.Container) error {
-	mounts, err := daemon.setupMounts(container)
-	if err != nil {
-		return err
-	}
-
-	for _, m := range mounts {
-		dest, err := container.GetResourcePath(m.Destination)
-		if err != nil {
-			return err
-		}
-
-		var stat os.FileInfo
-		stat, err = os.Stat(m.Source)
-		if err != nil {
-			return err
-		}
-		if err = fileutils.CreateIfNotExists(dest, stat.IsDir()); err != nil {
-			return err
-		}
-
-		opts := "rbind,ro"
-		if m.Writable {
-			opts = "rbind,rw"
-		}
-
-		if err := mount.Mount(m.Source, dest, bindMountType, opts); err != nil {
-			return err
-		}
-
-		// mountVolumes() seems to be called for temporary mounts
-		// outside the container. Soon these will be unmounted with
-		// lazy unmount option and given we have mounted the rbind,
-		// all the submounts will propagate if these are shared. If
-		// daemon is running in host namespace and has / as shared
-		// then these unmounts will propagate and unmount original
-		// mount as well. So make all these mounts rprivate.
-		// Do not use propagation property of volume as that should
-		// apply only when mounting happen inside the container.
-		if err := mount.MakeRPrivate(dest); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/volumes_windows.go b/installer/vendor/github.com/docker/docker/daemon/volumes_windows.go
deleted file mode 100644
index bf7fc478a1..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/volumes_windows.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build windows
-
-package daemon
-
-import (
-	"sort"
-
-	"github.com/docker/docker/container"
-	"github.com/docker/docker/volume"
-)
-
-// setupMounts configures the mount points for a container by appending each
-// of the configured mounts on the container to the OCI mount structure
-// which will ultimately be passed into the oci runtime during container creation.
-// It also ensures each of the mounts are lexographically sorted.
-
-// BUGBUG TODO Windows containerd. This would be much better if it returned
-// an array of runtime spec mounts, not container mounts. Then no need to
-// do multiple transitions.
-
-func (daemon *Daemon) setupMounts(c *container.Container) ([]container.Mount, error) {
-	var mnts []container.Mount
-	for _, mount := range c.MountPoints { // type is volume.MountPoint
-		if err := daemon.lazyInitializeVolume(c.ID, mount); err != nil {
-			return nil, err
-		}
-		s, err := mount.Setup(c.MountLabel, 0, 0)
-		if err != nil {
-			return nil, err
-		}
-
-		mnts = append(mnts, container.Mount{
-			Source:      s,
-			Destination: mount.Destination,
-			Writable:    mount.RW,
-		})
-	}
-
-	sort.Sort(mounts(mnts))
-	return mnts, nil
-}
-
-// setBindModeIfNull is platform specific processing which is a no-op on
-// Windows.
-func setBindModeIfNull(bind *volume.MountPoint) {
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/wait.go b/installer/vendor/github.com/docker/docker/daemon/wait.go
deleted file mode 100644
index 2dab22e991..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/wait.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package daemon
-
-import (
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-// ContainerWait stops processing until the given container is
-// stopped. If the container is not found, an error is returned. On a
-// successful stop, the exit code of the container is returned. On a
-// timeout, an error is returned. If you want to wait forever, supply
-// a negative duration for the timeout.
-func (daemon *Daemon) ContainerWait(name string, timeout time.Duration) (int, error) {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return -1, err
-	}
-
-	return container.WaitStop(timeout)
-}
-
-// ContainerWaitWithContext returns a channel where exit code is sent
-// when container stops. Channel can be cancelled with a context.
-func (daemon *Daemon) ContainerWaitWithContext(ctx context.Context, name string) error {
-	container, err := daemon.GetContainer(name)
-	if err != nil {
-		return err
-	}
-
-	return container.WaitWithContext(ctx)
-}
diff --git a/installer/vendor/github.com/docker/docker/daemon/workdir.go b/installer/vendor/github.com/docker/docker/daemon/workdir.go
deleted file mode 100644
index 5bd0d0caca..0000000000
--- a/installer/vendor/github.com/docker/docker/daemon/workdir.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package daemon
-
-// ContainerCreateWorkdir creates the working directory. This is solves the
-// issue arising from https://github.com/docker/docker/issues/27545,
-// which was initially fixed by https://github.com/docker/docker/pull/27884. But that fix
-// was too expensive in terms of performance on Windows. Instead,
-// https://github.com/docker/docker/pull/28514 introduces this new functionality
-// where the builder calls into the backend here to create the working directory.
-func (daemon *Daemon) ContainerCreateWorkdir(cID string) error {
-	container, err := daemon.GetContainer(cID)
-	if err != nil {
-		return err
-	}
-	err = daemon.Mount(container)
-	if err != nil {
-		return err
-	}
-	defer daemon.Unmount(container)
-	rootUID, rootGID := daemon.GetRemappedUIDGID()
-	return container.SetupWorkingDirectory(rootUID, rootGID)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/config.go b/installer/vendor/github.com/docker/docker/distribution/config.go
deleted file mode 100644
index bfea8b0336..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/config.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package distribution
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"runtime"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/docker/libtrust"
-	"golang.org/x/net/context"
-)
-
-// Config stores configuration for communicating
-// with a registry.
-type Config struct {
-	// MetaHeaders stores HTTP headers with metadata about the image
-	MetaHeaders map[string][]string
-	// AuthConfig holds authentication credentials for authenticating with
-	// the registry.
-	AuthConfig *types.AuthConfig
-	// ProgressOutput is the interface for showing the status of the pull
-	// operation.
-	ProgressOutput progress.Output
-	// RegistryService is the registry service to use for TLS configuration
-	// and endpoint lookup.
-	RegistryService registry.Service
-	// ImageEventLogger notifies events for a given image
-	ImageEventLogger func(id, name, action string)
-	// MetadataStore is the storage backend for distribution-specific
-	// metadata.
-	MetadataStore metadata.Store
-	// ImageStore manages images.
-	ImageStore ImageConfigStore
-	// ReferenceStore manages tags. This value is optional, when excluded
-	// content will not be tagged.
-	ReferenceStore reference.Store
-	// RequireSchema2 ensures that only schema2 manifests are used.
-	RequireSchema2 bool
-}
-
-// ImagePullConfig stores pull configuration.
-type ImagePullConfig struct {
-	Config
-
-	// DownloadManager manages concurrent pulls.
-	DownloadManager RootFSDownloadManager
-	// Schema2Types is the valid schema2 configuration types allowed
-	// by the pull operation.
-	Schema2Types []string
-}
-
-// ImagePushConfig stores push configuration.
-type ImagePushConfig struct {
-	Config
-
-	// ConfigMediaType is the configuration media type for
-	// schema2 manifests.
-	ConfigMediaType string
-	// LayerStore manages layers.
-	LayerStore PushLayerProvider
-	// TrustKey is the private key for legacy signatures. This is typically
-	// an ephemeral key, since these signatures are no longer verified.
-	TrustKey libtrust.PrivateKey
-	// UploadManager dispatches uploads.
-	UploadManager *xfer.LayerUploadManager
-}
-
-// ImageConfigStore handles storing and getting image configurations
-// by digest. Allows getting an image configurations rootfs from the
-// configuration.
-type ImageConfigStore interface {
-	Put([]byte) (digest.Digest, error)
-	Get(digest.Digest) ([]byte, error)
-	RootFSFromConfig([]byte) (*image.RootFS, error)
-}
-
-// PushLayerProvider provides layers to be pushed by ChainID.
-type PushLayerProvider interface {
-	Get(layer.ChainID) (PushLayer, error)
-}
-
-// PushLayer is a pushable layer with metadata about the layer
-// and access to the content of the layer.
-type PushLayer interface {
-	ChainID() layer.ChainID
-	DiffID() layer.DiffID
-	Parent() PushLayer
-	Open() (io.ReadCloser, error)
-	Size() (int64, error)
-	MediaType() string
-	Release()
-}
-
-// RootFSDownloadManager handles downloading of the rootfs
-type RootFSDownloadManager interface {
-	// Download downloads the layers into the given initial rootfs and
-	// returns the final rootfs.
-	// Given progress output to track download progress
-	// Returns function to release download resources
-	Download(ctx context.Context, initialRootFS image.RootFS, layers []xfer.DownloadDescriptor, progressOutput progress.Output) (image.RootFS, func(), error)
-}
-
-type imageConfigStore struct {
-	image.Store
-}
-
-// NewImageConfigStoreFromStore returns an ImageConfigStore backed
-// by an image.Store for container images.
-func NewImageConfigStoreFromStore(is image.Store) ImageConfigStore {
-	return &imageConfigStore{
-		Store: is,
-	}
-}
-
-func (s *imageConfigStore) Put(c []byte) (digest.Digest, error) {
-	id, err := s.Store.Create(c)
-	return digest.Digest(id), err
-}
-
-func (s *imageConfigStore) Get(d digest.Digest) ([]byte, error) {
-	img, err := s.Store.Get(image.IDFromDigest(d))
-	if err != nil {
-		return nil, err
-	}
-	return img.RawJSON(), nil
-}
-
-func (s *imageConfigStore) RootFSFromConfig(c []byte) (*image.RootFS, error) {
-	var unmarshalledConfig image.Image
-	if err := json.Unmarshal(c, &unmarshalledConfig); err != nil {
-		return nil, err
-	}
-
-	// fail immediately on windows
-	if runtime.GOOS == "windows" && unmarshalledConfig.OS == "linux" {
-		return nil, fmt.Errorf("image operating system %q cannot be used on this platform", unmarshalledConfig.OS)
-	}
-
-	return unmarshalledConfig.RootFS, nil
-}
-
-type storeLayerProvider struct {
-	ls layer.Store
-}
-
-// NewLayerProviderFromStore returns a layer provider backed by
-// an instance of LayerStore. Only getting layers as gzipped
-// tars is supported.
-func NewLayerProviderFromStore(ls layer.Store) PushLayerProvider {
-	return &storeLayerProvider{
-		ls: ls,
-	}
-}
-
-func (p *storeLayerProvider) Get(lid layer.ChainID) (PushLayer, error) {
-	if lid == "" {
-		return &storeLayer{
-			Layer: layer.EmptyLayer,
-		}, nil
-	}
-	l, err := p.ls.Get(lid)
-	if err != nil {
-		return nil, err
-	}
-
-	sl := storeLayer{
-		Layer: l,
-		ls:    p.ls,
-	}
-	if d, ok := l.(distribution.Describable); ok {
-		return &describableStoreLayer{
-			storeLayer:  sl,
-			describable: d,
-		}, nil
-	}
-
-	return &sl, nil
-}
-
-type storeLayer struct {
-	layer.Layer
-	ls layer.Store
-}
-
-func (l *storeLayer) Parent() PushLayer {
-	p := l.Layer.Parent()
-	if p == nil {
-		return nil
-	}
-	sl := storeLayer{
-		Layer: p,
-		ls:    l.ls,
-	}
-	if d, ok := p.(distribution.Describable); ok {
-		return &describableStoreLayer{
-			storeLayer:  sl,
-			describable: d,
-		}
-	}
-
-	return &sl
-}
-
-func (l *storeLayer) Open() (io.ReadCloser, error) {
-	return l.Layer.TarStream()
-}
-
-func (l *storeLayer) Size() (int64, error) {
-	return l.Layer.DiffSize()
-}
-
-func (l *storeLayer) MediaType() string {
-	// layer store always returns uncompressed tars
-	return schema2.MediaTypeUncompressedLayer
-}
-
-func (l *storeLayer) Release() {
-	if l.ls != nil {
-		layer.ReleaseAndLog(l.ls, l.Layer)
-	}
-}
-
-type describableStoreLayer struct {
-	storeLayer
-	describable distribution.Describable
-}
-
-func (l *describableStoreLayer) Descriptor() distribution.Descriptor {
-	return l.describable.Descriptor()
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/errors.go b/installer/vendor/github.com/docker/docker/distribution/errors.go
deleted file mode 100644
index b8cf9fb9e8..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/errors.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package distribution
-
-import (
-	"net/url"
-	"strings"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/api/v2"
-	"github.com/docker/distribution/registry/client"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/reference"
-	"github.com/pkg/errors"
-)
-
-// ErrNoSupport is an error type used for errors indicating that an operation
-// is not supported. It encapsulates a more specific error.
-type ErrNoSupport struct{ Err error }
-
-func (e ErrNoSupport) Error() string {
-	if e.Err == nil {
-		return "not supported"
-	}
-	return e.Err.Error()
-}
-
-// fallbackError wraps an error that can possibly allow fallback to a different
-// endpoint.
-type fallbackError struct {
-	// err is the error being wrapped.
-	err error
-	// confirmedV2 is set to true if it was confirmed that the registry
-	// supports the v2 protocol. This is used to limit fallbacks to the v1
-	// protocol.
-	confirmedV2 bool
-	// transportOK is set to true if we managed to speak HTTP with the
-	// registry. This confirms that we're using appropriate TLS settings
-	// (or lack of TLS).
-	transportOK bool
-}
-
-// Error renders the FallbackError as a string.
-func (f fallbackError) Error() string {
-	return f.Cause().Error()
-}
-
-func (f fallbackError) Cause() error {
-	return f.err
-}
-
-// shouldV2Fallback returns true if this error is a reason to fall back to v1.
-func shouldV2Fallback(err errcode.Error) bool {
-	switch err.Code {
-	case errcode.ErrorCodeUnauthorized, v2.ErrorCodeManifestUnknown, v2.ErrorCodeNameUnknown:
-		return true
-	}
-	return false
-}
-
-// TranslatePullError is used to convert an error from a registry pull
-// operation to an error representing the entire pull operation. Any error
-// information which is not used by the returned error gets output to
-// log at info level.
-func TranslatePullError(err error, ref reference.Named) error {
-	switch v := err.(type) {
-	case errcode.Errors:
-		if len(v) != 0 {
-			for _, extra := range v[1:] {
-				logrus.Infof("Ignoring extra error returned from registry: %v", extra)
-			}
-			return TranslatePullError(v[0], ref)
-		}
-	case errcode.Error:
-		var newErr error
-		switch v.Code {
-		case errcode.ErrorCodeDenied:
-			// ErrorCodeDenied is used when access to the repository was denied
-			newErr = errors.Errorf("repository %s not found: does not exist or no pull access", ref.Name())
-		case v2.ErrorCodeManifestUnknown:
-			newErr = errors.Errorf("manifest for %s not found", ref.String())
-		case v2.ErrorCodeNameUnknown:
-			newErr = errors.Errorf("repository %s not found", ref.Name())
-		}
-		if newErr != nil {
-			logrus.Infof("Translating %q to %q", err, newErr)
-			return newErr
-		}
-	case xfer.DoNotRetry:
-		return TranslatePullError(v.Err, ref)
-	}
-
-	return err
-}
-
-// continueOnError returns true if we should fallback to the next endpoint
-// as a result of this error.
-func continueOnError(err error) bool {
-	switch v := err.(type) {
-	case errcode.Errors:
-		if len(v) == 0 {
-			return true
-		}
-		return continueOnError(v[0])
-	case ErrNoSupport:
-		return continueOnError(v.Err)
-	case errcode.Error:
-		return shouldV2Fallback(v)
-	case *client.UnexpectedHTTPResponseError:
-		return true
-	case ImageConfigPullError:
-		return false
-	case error:
-		return !strings.Contains(err.Error(), strings.ToLower(syscall.ENOSPC.Error()))
-	}
-	// let's be nice and fallback if the error is a completely
-	// unexpected one.
-	// If new errors have to be handled in some way, please
-	// add them to the switch above.
-	return true
-}
-
-// retryOnError wraps the error in xfer.DoNotRetry if we should not retry the
-// operation after this error.
-func retryOnError(err error) error {
-	switch v := err.(type) {
-	case errcode.Errors:
-		if len(v) != 0 {
-			return retryOnError(v[0])
-		}
-	case errcode.Error:
-		switch v.Code {
-		case errcode.ErrorCodeUnauthorized, errcode.ErrorCodeUnsupported, errcode.ErrorCodeDenied, errcode.ErrorCodeTooManyRequests, v2.ErrorCodeNameUnknown:
-			return xfer.DoNotRetry{Err: err}
-		}
-	case *url.Error:
-		switch v.Err {
-		case auth.ErrNoBasicAuthCredentials, auth.ErrNoToken:
-			return xfer.DoNotRetry{Err: v.Err}
-		}
-		return retryOnError(v.Err)
-	case *client.UnexpectedHTTPResponseError:
-		return xfer.DoNotRetry{Err: err}
-	case error:
-		if err == distribution.ErrBlobUnknown {
-			return xfer.DoNotRetry{Err: err}
-		}
-		if strings.Contains(err.Error(), strings.ToLower(syscall.ENOSPC.Error())) {
-			return xfer.DoNotRetry{Err: err}
-		}
-	}
-	// let's be nice and fallback if the error is a completely
-	// unexpected one.
-	// If new errors have to be handled in some way, please
-	// add them to the switch above.
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/bad_manifest b/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/bad_manifest
deleted file mode 100644
index a1f02a62a3..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/bad_manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-   "schemaVersion": 2,
-   "name": "library/hello-world",
-   "tag": "latest",
-   "architecture": "amd64",
-   "fsLayers": [
-      {
-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
-      },
-      {
-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"
-      }
-   ],
-   "history": [
-      {
-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"
-      }
-   ],
-   "signatures": [
-      {
-         "header": {
-            "jwk": {
-               "crv": "P-256",
-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",
-               "kty": "EC",
-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",
-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"
-            },
-            "alg": "ES256"
-         },
-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",
-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"
-      }
-   ]
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/extra_data_manifest b/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/extra_data_manifest
deleted file mode 100644
index beec19a801..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/extra_data_manifest
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-   "schemaVersion": 1,
-   "name": "library/hello-world",
-   "tag": "latest",
-   "architecture": "amd64",
-   "fsLayers": [
-      {
-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
-      },
-      {
-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"
-      }
-   ],
-   "history": [
-      {
-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"
-      }
-   ],
-   "fsLayers": [
-      {
-         "blobSum": "sha256:ffff95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
-      },
-      {
-         "blobSum": "sha256:ffff658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"
-      }
-   ],
-   "signatures": [
-      {
-         "header": {
-            "jwk": {
-               "crv": "P-256",
-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",
-               "kty": "EC",
-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",
-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"
-            },
-            "alg": "ES256"
-         },
-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",
-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"
-      }
-   ]
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/good_manifest b/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/good_manifest
deleted file mode 100644
index b107de3226..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/fixtures/validate_manifest/good_manifest
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-   "schemaVersion": 1,
-   "name": "library/hello-world",
-   "tag": "latest",
-   "architecture": "amd64",
-   "fsLayers": [
-      {
-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
-      },
-      {
-         "blobSum": "sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"
-      }
-   ],
-   "history": [
-      {
-         "v1Compatibility": "{\"id\":\"af340544ed62de0680f441c71fa1a80cb084678fed42bae393e543faea3a572c\",\"parent\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.608577814Z\",\"container\":\"c2b715156f640c7ac7d98472ea24335aba5432a1323a3bb722697e6d37ef794f\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/hello\\\"]\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/hello\"],\"Image\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"535020c3e8add9d6bb06e5ac15a261e73d9b213d62fb2c14d752b8e189b2b912\",\"created\":\"2015-08-06T23:53:22.241352727Z\",\"container\":\"9aeb0006ffa72a8287564caaea87625896853701459261d3b569e320c0c9d5dc\",\"container_config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) COPY file:4abd3bff60458ca3b079d7b131ce26b2719055a030dfa96ff827da2b7c7038a7 in /\"],\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.7.1\",\"config\":{\"Hostname\":\"9aeb0006ffa7\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"VolumeDriver\":\"\",\"WorkingDir\":\"\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":960}\n"
-      }
-   ],
-   "signatures": [
-      {
-         "header": {
-            "jwk": {
-               "crv": "P-256",
-               "kid": "OIH7:HQFS:44FK:45VB:3B53:OIAG:TPL4:ATF5:6PNE:MGHN:NHQX:2GE4",
-               "kty": "EC",
-               "x": "Cu_UyxwLgHzE9rvlYSmvVdqYCXY42E9eNhBb0xNv0SQ",
-               "y": "zUsjWJkeKQ5tv7S-hl1Tg71cd-CqnrtiiLxSi6N_yc8"
-            },
-            "alg": "ES256"
-         },
-         "signature": "Y6xaFz9Sy-OtcnKQS1Ilq3Dh8cu4h3nBTJCpOTF1XF7vKtcxxA_xMP8-SgDo869SJ3VsvgPL9-Xn-OoYG2rb1A",
-         "protected": "eyJmb3JtYXRMZW5ndGgiOjMxOTcsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNS0wOS0xMVQwNDoxMzo0OFoifQ"
-      }
-   ]
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/distribution/metadata/metadata.go b/installer/vendor/github.com/docker/docker/distribution/metadata/metadata.go
deleted file mode 100644
index 05ba4f817d..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/metadata/metadata.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package metadata
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-// Store implements a K/V store for mapping distribution-related IDs
-// to on-disk layer IDs and image IDs. The namespace identifies the type of
-// mapping (i.e. "v1ids" or "artifacts"). MetadataStore is goroutine-safe.
-type Store interface {
-	// Get retrieves data by namespace and key.
-	Get(namespace string, key string) ([]byte, error)
-	// Set writes data indexed by namespace and key.
-	Set(namespace, key string, value []byte) error
-	// Delete removes data indexed by namespace and key.
-	Delete(namespace, key string) error
-}
-
-// FSMetadataStore uses the filesystem to associate metadata with layer and
-// image IDs.
-type FSMetadataStore struct {
-	sync.RWMutex
-	basePath string
-}
-
-// NewFSMetadataStore creates a new filesystem-based metadata store.
-func NewFSMetadataStore(basePath string) (*FSMetadataStore, error) {
-	if err := os.MkdirAll(basePath, 0700); err != nil {
-		return nil, err
-	}
-	return &FSMetadataStore{
-		basePath: basePath,
-	}, nil
-}
-
-func (store *FSMetadataStore) path(namespace, key string) string {
-	return filepath.Join(store.basePath, namespace, key)
-}
-
-// Get retrieves data by namespace and key. The data is read from a file named
-// after the key, stored in the namespace's directory.
-func (store *FSMetadataStore) Get(namespace string, key string) ([]byte, error) {
-	store.RLock()
-	defer store.RUnlock()
-
-	return ioutil.ReadFile(store.path(namespace, key))
-}
-
-// Set writes data indexed by namespace and key. The data is written to a file
-// named after the key, stored in the namespace's directory.
-func (store *FSMetadataStore) Set(namespace, key string, value []byte) error {
-	store.Lock()
-	defer store.Unlock()
-
-	path := store.path(namespace, key)
-	if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-		return err
-	}
-	return ioutils.AtomicWriteFile(path, value, 0644)
-}
-
-// Delete removes data indexed by namespace and key. The data file named after
-// the key, stored in the namespace's directory is deleted.
-func (store *FSMetadataStore) Delete(namespace, key string) error {
-	store.Lock()
-	defer store.Unlock()
-
-	path := store.path(namespace, key)
-	return os.Remove(path)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service.go b/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service.go
deleted file mode 100644
index f262d4dc34..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package metadata
-
-import (
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/pkg/errors"
-)
-
-// V1IDService maps v1 IDs to layers on disk.
-type V1IDService struct {
-	store Store
-}
-
-// NewV1IDService creates a new V1 ID mapping service.
-func NewV1IDService(store Store) *V1IDService {
-	return &V1IDService{
-		store: store,
-	}
-}
-
-// namespace returns the namespace used by this service.
-func (idserv *V1IDService) namespace() string {
-	return "v1id"
-}
-
-// Get finds a layer by its V1 ID.
-func (idserv *V1IDService) Get(v1ID, registry string) (layer.DiffID, error) {
-	if idserv.store == nil {
-		return "", errors.New("no v1IDService storage")
-	}
-	if err := v1.ValidateID(v1ID); err != nil {
-		return layer.DiffID(""), err
-	}
-
-	idBytes, err := idserv.store.Get(idserv.namespace(), registry+","+v1ID)
-	if err != nil {
-		return layer.DiffID(""), err
-	}
-	return layer.DiffID(idBytes), nil
-}
-
-// Set associates an image with a V1 ID.
-func (idserv *V1IDService) Set(v1ID, registry string, id layer.DiffID) error {
-	if idserv.store == nil {
-		return nil
-	}
-	if err := v1.ValidateID(v1ID); err != nil {
-		return err
-	}
-	return idserv.store.Set(idserv.namespace(), registry+","+v1ID, []byte(id))
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service_test.go b/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service_test.go
deleted file mode 100644
index 556886581e..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/metadata/v1_id_service_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package metadata
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/docker/docker/layer"
-)
-
-func TestV1IDService(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "v1-id-service-test")
-	if err != nil {
-		t.Fatalf("could not create temp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	metadataStore, err := NewFSMetadataStore(tmpDir)
-	if err != nil {
-		t.Fatalf("could not create metadata store: %v", err)
-	}
-	v1IDService := NewV1IDService(metadataStore)
-
-	testVectors := []struct {
-		registry string
-		v1ID     string
-		layerID  layer.DiffID
-	}{
-		{
-			registry: "registry1",
-			v1ID:     "f0cd5ca10b07f35512fc2f1cbf9a6cefbdb5cba70ac6b0c9e5988f4497f71937",
-			layerID:  layer.DiffID("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
-		},
-		{
-			registry: "registry2",
-			v1ID:     "9e3447ca24cb96d86ebd5960cb34d1299b07e0a0e03801d90b9969a2c187dd6e",
-			layerID:  layer.DiffID("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa"),
-		},
-		{
-			registry: "registry1",
-			v1ID:     "9e3447ca24cb96d86ebd5960cb34d1299b07e0a0e03801d90b9969a2c187dd6e",
-			layerID:  layer.DiffID("sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"),
-		},
-	}
-
-	// Set some associations
-	for _, vec := range testVectors {
-		err := v1IDService.Set(vec.v1ID, vec.registry, vec.layerID)
-		if err != nil {
-			t.Fatalf("error calling Set: %v", err)
-		}
-	}
-
-	// Check the correct values are read back
-	for _, vec := range testVectors {
-		layerID, err := v1IDService.Get(vec.v1ID, vec.registry)
-		if err != nil {
-			t.Fatalf("error calling Get: %v", err)
-		}
-		if layerID != vec.layerID {
-			t.Fatal("Get returned incorrect layer ID")
-		}
-	}
-
-	// Test Get on a nonexistent entry
-	_, err = v1IDService.Get("82379823067823853223359023576437723560923756b03560378f4497753917", "registry1")
-	if err == nil {
-		t.Fatal("expected error looking up nonexistent entry")
-	}
-
-	// Overwrite one of the entries and read it back
-	err = v1IDService.Set(testVectors[0].v1ID, testVectors[0].registry, testVectors[1].layerID)
-	if err != nil {
-		t.Fatalf("error calling Set: %v", err)
-	}
-	layerID, err := v1IDService.Get(testVectors[0].v1ID, testVectors[0].registry)
-	if err != nil {
-		t.Fatalf("error calling Get: %v", err)
-	}
-	if layerID != testVectors[1].layerID {
-		t.Fatal("Get returned incorrect layer ID")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service.go b/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service.go
deleted file mode 100644
index 02d1b4ad21..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service.go
+++ /dev/null
@@ -1,241 +0,0 @@
-package metadata
-
-import (
-	"crypto/hmac"
-	"crypto/sha256"
-	"encoding/hex"
-	"encoding/json"
-	"errors"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/layer"
-)
-
-// V2MetadataService maps layer IDs to a set of known metadata for
-// the layer.
-type V2MetadataService interface {
-	GetMetadata(diffID layer.DiffID) ([]V2Metadata, error)
-	GetDiffID(dgst digest.Digest) (layer.DiffID, error)
-	Add(diffID layer.DiffID, metadata V2Metadata) error
-	TagAndAdd(diffID layer.DiffID, hmacKey []byte, metadata V2Metadata) error
-	Remove(metadata V2Metadata) error
-}
-
-// v2MetadataService implements V2MetadataService
-type v2MetadataService struct {
-	store Store
-}
-
-var _ V2MetadataService = &v2MetadataService{}
-
-// V2Metadata contains the digest and source repository information for a layer.
-type V2Metadata struct {
-	Digest           digest.Digest
-	SourceRepository string
-	// HMAC hashes above attributes with recent authconfig digest used as a key in order to determine matching
-	// metadata entries accompanied by the same credentials without actually exposing them.
-	HMAC string
-}
-
-// CheckV2MetadataHMAC return true if the given "meta" is tagged with a hmac hashed by the given "key".
-func CheckV2MetadataHMAC(meta *V2Metadata, key []byte) bool {
-	if len(meta.HMAC) == 0 || len(key) == 0 {
-		return len(meta.HMAC) == 0 && len(key) == 0
-	}
-	mac := hmac.New(sha256.New, key)
-	mac.Write([]byte(meta.Digest))
-	mac.Write([]byte(meta.SourceRepository))
-	expectedMac := mac.Sum(nil)
-
-	storedMac, err := hex.DecodeString(meta.HMAC)
-	if err != nil {
-		return false
-	}
-
-	return hmac.Equal(storedMac, expectedMac)
-}
-
-// ComputeV2MetadataHMAC returns a hmac for the given "meta" hash by the given key.
-func ComputeV2MetadataHMAC(key []byte, meta *V2Metadata) string {
-	if len(key) == 0 || meta == nil {
-		return ""
-	}
-	mac := hmac.New(sha256.New, key)
-	mac.Write([]byte(meta.Digest))
-	mac.Write([]byte(meta.SourceRepository))
-	return hex.EncodeToString(mac.Sum(nil))
-}
-
-// ComputeV2MetadataHMACKey returns a key for the given "authConfig" that can be used to hash v2 metadata
-// entries.
-func ComputeV2MetadataHMACKey(authConfig *types.AuthConfig) ([]byte, error) {
-	if authConfig == nil {
-		return nil, nil
-	}
-	key := authConfigKeyInput{
-		Username:      authConfig.Username,
-		Password:      authConfig.Password,
-		Auth:          authConfig.Auth,
-		IdentityToken: authConfig.IdentityToken,
-		RegistryToken: authConfig.RegistryToken,
-	}
-	buf, err := json.Marshal(&key)
-	if err != nil {
-		return nil, err
-	}
-	return []byte(digest.FromBytes([]byte(buf))), nil
-}
-
-// authConfigKeyInput is a reduced AuthConfig structure holding just relevant credential data eligible for
-// hmac key creation.
-type authConfigKeyInput struct {
-	Username string `json:"username,omitempty"`
-	Password string `json:"password,omitempty"`
-	Auth     string `json:"auth,omitempty"`
-
-	IdentityToken string `json:"identitytoken,omitempty"`
-	RegistryToken string `json:"registrytoken,omitempty"`
-}
-
-// maxMetadata is the number of metadata entries to keep per layer DiffID.
-const maxMetadata = 50
-
-// NewV2MetadataService creates a new diff ID to v2 metadata mapping service.
-func NewV2MetadataService(store Store) V2MetadataService {
-	return &v2MetadataService{
-		store: store,
-	}
-}
-
-func (serv *v2MetadataService) diffIDNamespace() string {
-	return "v2metadata-by-diffid"
-}
-
-func (serv *v2MetadataService) digestNamespace() string {
-	return "diffid-by-digest"
-}
-
-func (serv *v2MetadataService) diffIDKey(diffID layer.DiffID) string {
-	return string(digest.Digest(diffID).Algorithm()) + "/" + digest.Digest(diffID).Hex()
-}
-
-func (serv *v2MetadataService) digestKey(dgst digest.Digest) string {
-	return string(dgst.Algorithm()) + "/" + dgst.Hex()
-}
-
-// GetMetadata finds the metadata associated with a layer DiffID.
-func (serv *v2MetadataService) GetMetadata(diffID layer.DiffID) ([]V2Metadata, error) {
-	if serv.store == nil {
-		return nil, errors.New("no metadata storage")
-	}
-	jsonBytes, err := serv.store.Get(serv.diffIDNamespace(), serv.diffIDKey(diffID))
-	if err != nil {
-		return nil, err
-	}
-
-	var metadata []V2Metadata
-	if err := json.Unmarshal(jsonBytes, &metadata); err != nil {
-		return nil, err
-	}
-
-	return metadata, nil
-}
-
-// GetDiffID finds a layer DiffID from a digest.
-func (serv *v2MetadataService) GetDiffID(dgst digest.Digest) (layer.DiffID, error) {
-	if serv.store == nil {
-		return layer.DiffID(""), errors.New("no metadata storage")
-	}
-	diffIDBytes, err := serv.store.Get(serv.digestNamespace(), serv.digestKey(dgst))
-	if err != nil {
-		return layer.DiffID(""), err
-	}
-
-	return layer.DiffID(diffIDBytes), nil
-}
-
-// Add associates metadata with a layer DiffID. If too many metadata entries are
-// present, the oldest one is dropped.
-func (serv *v2MetadataService) Add(diffID layer.DiffID, metadata V2Metadata) error {
-	if serv.store == nil {
-		// Support a service which has no backend storage, in this case
-		// an add becomes a no-op.
-		// TODO: implement in memory storage
-		return nil
-	}
-	oldMetadata, err := serv.GetMetadata(diffID)
-	if err != nil {
-		oldMetadata = nil
-	}
-	newMetadata := make([]V2Metadata, 0, len(oldMetadata)+1)
-
-	// Copy all other metadata to new slice
-	for _, oldMeta := range oldMetadata {
-		if oldMeta != metadata {
-			newMetadata = append(newMetadata, oldMeta)
-		}
-	}
-
-	newMetadata = append(newMetadata, metadata)
-
-	if len(newMetadata) > maxMetadata {
-		newMetadata = newMetadata[len(newMetadata)-maxMetadata:]
-	}
-
-	jsonBytes, err := json.Marshal(newMetadata)
-	if err != nil {
-		return err
-	}
-
-	err = serv.store.Set(serv.diffIDNamespace(), serv.diffIDKey(diffID), jsonBytes)
-	if err != nil {
-		return err
-	}
-
-	return serv.store.Set(serv.digestNamespace(), serv.digestKey(metadata.Digest), []byte(diffID))
-}
-
-// TagAndAdd amends the given "meta" for hmac hashed by the given "hmacKey" and associates it with a layer
-// DiffID. If too many metadata entries are present, the oldest one is dropped.
-func (serv *v2MetadataService) TagAndAdd(diffID layer.DiffID, hmacKey []byte, meta V2Metadata) error {
-	meta.HMAC = ComputeV2MetadataHMAC(hmacKey, &meta)
-	return serv.Add(diffID, meta)
-}
-
-// Remove unassociates a metadata entry from a layer DiffID.
-func (serv *v2MetadataService) Remove(metadata V2Metadata) error {
-	if serv.store == nil {
-		// Support a service which has no backend storage, in this case
-		// an remove becomes a no-op.
-		// TODO: implement in memory storage
-		return nil
-	}
-	diffID, err := serv.GetDiffID(metadata.Digest)
-	if err != nil {
-		return err
-	}
-	oldMetadata, err := serv.GetMetadata(diffID)
-	if err != nil {
-		oldMetadata = nil
-	}
-	newMetadata := make([]V2Metadata, 0, len(oldMetadata))
-
-	// Copy all other metadata to new slice
-	for _, oldMeta := range oldMetadata {
-		if oldMeta != metadata {
-			newMetadata = append(newMetadata, oldMeta)
-		}
-	}
-
-	if len(newMetadata) == 0 {
-		return serv.store.Delete(serv.diffIDNamespace(), serv.diffIDKey(diffID))
-	}
-
-	jsonBytes, err := json.Marshal(newMetadata)
-	if err != nil {
-		return err
-	}
-
-	return serv.store.Set(serv.diffIDNamespace(), serv.diffIDKey(diffID), jsonBytes)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service_test.go b/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service_test.go
deleted file mode 100644
index 7b0ecb1572..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/metadata/v2_metadata_service_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package metadata
-
-import (
-	"encoding/hex"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/layer"
-)
-
-func TestV2MetadataService(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "blobsum-storage-service-test")
-	if err != nil {
-		t.Fatalf("could not create temp dir: %v", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	metadataStore, err := NewFSMetadataStore(tmpDir)
-	if err != nil {
-		t.Fatalf("could not create metadata store: %v", err)
-	}
-	V2MetadataService := NewV2MetadataService(metadataStore)
-
-	tooManyBlobSums := make([]V2Metadata, 100)
-	for i := range tooManyBlobSums {
-		randDigest := randomDigest()
-		tooManyBlobSums[i] = V2Metadata{Digest: randDigest}
-	}
-
-	testVectors := []struct {
-		diffID   layer.DiffID
-		metadata []V2Metadata
-	}{
-		{
-			diffID: layer.DiffID("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"),
-			metadata: []V2Metadata{
-				{Digest: digest.Digest("sha256:f0cd5ca10b07f35512fc2f1cbf9a6cefbdb5cba70ac6b0c9e5988f4497f71937")},
-			},
-		},
-		{
-			diffID: layer.DiffID("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa"),
-			metadata: []V2Metadata{
-				{Digest: digest.Digest("sha256:f0cd5ca10b07f35512fc2f1cbf9a6cefbdb5cba70ac6b0c9e5988f4497f71937")},
-				{Digest: digest.Digest("sha256:9e3447ca24cb96d86ebd5960cb34d1299b07e0a0e03801d90b9969a2c187dd6e")},
-			},
-		},
-		{
-			diffID:   layer.DiffID("sha256:03f4658f8b782e12230c1783426bd3bacce651ce582a4ffb6fbbfa2079428ecb"),
-			metadata: tooManyBlobSums,
-		},
-	}
-
-	// Set some associations
-	for _, vec := range testVectors {
-		for _, blobsum := range vec.metadata {
-			err := V2MetadataService.Add(vec.diffID, blobsum)
-			if err != nil {
-				t.Fatalf("error calling Set: %v", err)
-			}
-		}
-	}
-
-	// Check the correct values are read back
-	for _, vec := range testVectors {
-		metadata, err := V2MetadataService.GetMetadata(vec.diffID)
-		if err != nil {
-			t.Fatalf("error calling Get: %v", err)
-		}
-		expectedMetadataEntries := len(vec.metadata)
-		if expectedMetadataEntries > 50 {
-			expectedMetadataEntries = 50
-		}
-		if !reflect.DeepEqual(metadata, vec.metadata[len(vec.metadata)-expectedMetadataEntries:len(vec.metadata)]) {
-			t.Fatal("Get returned incorrect layer ID")
-		}
-	}
-
-	// Test GetMetadata on a nonexistent entry
-	_, err = V2MetadataService.GetMetadata(layer.DiffID("sha256:82379823067823853223359023576437723560923756b03560378f4497753917"))
-	if err == nil {
-		t.Fatal("expected error looking up nonexistent entry")
-	}
-
-	// Test GetDiffID on a nonexistent entry
-	_, err = V2MetadataService.GetDiffID(digest.Digest("sha256:82379823067823853223359023576437723560923756b03560378f4497753917"))
-	if err == nil {
-		t.Fatal("expected error looking up nonexistent entry")
-	}
-
-	// Overwrite one of the entries and read it back
-	err = V2MetadataService.Add(testVectors[1].diffID, testVectors[0].metadata[0])
-	if err != nil {
-		t.Fatalf("error calling Add: %v", err)
-	}
-	diffID, err := V2MetadataService.GetDiffID(testVectors[0].metadata[0].Digest)
-	if err != nil {
-		t.Fatalf("error calling GetDiffID: %v", err)
-	}
-	if diffID != testVectors[1].diffID {
-		t.Fatal("GetDiffID returned incorrect diffID")
-	}
-}
-
-func randomDigest() digest.Digest {
-	b := [32]byte{}
-	for i := 0; i < len(b); i++ {
-		b[i] = byte(rand.Intn(256))
-	}
-	d := hex.EncodeToString(b[:])
-	return digest.Digest("sha256:" + d)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull.go b/installer/vendor/github.com/docker/docker/distribution/pull.go
deleted file mode 100644
index a0acfe5b6b..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull.go
+++ /dev/null
@@ -1,200 +0,0 @@
-package distribution
-
-import (
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-// Puller is an interface that abstracts pulling for different API versions.
-type Puller interface {
-	// Pull tries to pull the image referenced by `tag`
-	// Pull returns an error if any, as well as a boolean that determines whether to retry Pull on the next configured endpoint.
-	//
-	Pull(ctx context.Context, ref reference.Named) error
-}
-
-// newPuller returns a Puller interface that will pull from either a v1 or v2
-// registry. The endpoint argument contains a Version field that determines
-// whether a v1 or v2 puller will be created. The other parameters are passed
-// through to the underlying puller implementation for use during the actual
-// pull operation.
-func newPuller(endpoint registry.APIEndpoint, repoInfo *registry.RepositoryInfo, imagePullConfig *ImagePullConfig) (Puller, error) {
-	switch endpoint.Version {
-	case registry.APIVersion2:
-		return &v2Puller{
-			V2MetadataService: metadata.NewV2MetadataService(imagePullConfig.MetadataStore),
-			endpoint:          endpoint,
-			config:            imagePullConfig,
-			repoInfo:          repoInfo,
-		}, nil
-	case registry.APIVersion1:
-		return &v1Puller{
-			v1IDService: metadata.NewV1IDService(imagePullConfig.MetadataStore),
-			endpoint:    endpoint,
-			config:      imagePullConfig,
-			repoInfo:    repoInfo,
-		}, nil
-	}
-	return nil, fmt.Errorf("unknown version %d for registry %s", endpoint.Version, endpoint.URL)
-}
-
-// Pull initiates a pull operation. image is the repository name to pull, and
-// tag may be either empty, or indicate a specific tag to pull.
-func Pull(ctx context.Context, ref reference.Named, imagePullConfig *ImagePullConfig) error {
-	// Resolve the Repository name from fqn to RepositoryInfo
-	repoInfo, err := imagePullConfig.RegistryService.ResolveRepository(ref)
-	if err != nil {
-		return err
-	}
-
-	// makes sure name is not empty or `scratch`
-	if err := ValidateRepoName(repoInfo.Name()); err != nil {
-		return err
-	}
-
-	endpoints, err := imagePullConfig.RegistryService.LookupPullEndpoints(repoInfo.Hostname())
-	if err != nil {
-		return err
-	}
-
-	var (
-		lastErr error
-
-		// discardNoSupportErrors is used to track whether an endpoint encountered an error of type registry.ErrNoSupport
-		// By default it is false, which means that if an ErrNoSupport error is encountered, it will be saved in lastErr.
-		// As soon as another kind of error is encountered, discardNoSupportErrors is set to true, avoiding the saving of
-		// any subsequent ErrNoSupport errors in lastErr.
-		// It's needed for pull-by-digest on v1 endpoints: if there are only v1 endpoints configured, the error should be
-		// returned and displayed, but if there was a v2 endpoint which supports pull-by-digest, then the last relevant
-		// error is the ones from v2 endpoints not v1.
-		discardNoSupportErrors bool
-
-		// confirmedV2 is set to true if a pull attempt managed to
-		// confirm that it was talking to a v2 registry. This will
-		// prevent fallback to the v1 protocol.
-		confirmedV2 bool
-
-		// confirmedTLSRegistries is a map indicating which registries
-		// are known to be using TLS. There should never be a plaintext
-		// retry for any of these.
-		confirmedTLSRegistries = make(map[string]struct{})
-	)
-	for _, endpoint := range endpoints {
-		if imagePullConfig.RequireSchema2 && endpoint.Version == registry.APIVersion1 {
-			continue
-		}
-
-		if confirmedV2 && endpoint.Version == registry.APIVersion1 {
-			logrus.Debugf("Skipping v1 endpoint %s because v2 registry was detected", endpoint.URL)
-			continue
-		}
-
-		if endpoint.URL.Scheme != "https" {
-			if _, confirmedTLS := confirmedTLSRegistries[endpoint.URL.Host]; confirmedTLS {
-				logrus.Debugf("Skipping non-TLS endpoint %s for host/port that appears to use TLS", endpoint.URL)
-				continue
-			}
-		}
-
-		logrus.Debugf("Trying to pull %s from %s %s", repoInfo.Name(), endpoint.URL, endpoint.Version)
-
-		puller, err := newPuller(endpoint, repoInfo, imagePullConfig)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-		if err := puller.Pull(ctx, ref); err != nil {
-			// Was this pull cancelled? If so, don't try to fall
-			// back.
-			fallback := false
-			select {
-			case <-ctx.Done():
-			default:
-				if fallbackErr, ok := err.(fallbackError); ok {
-					fallback = true
-					confirmedV2 = confirmedV2 || fallbackErr.confirmedV2
-					if fallbackErr.transportOK && endpoint.URL.Scheme == "https" {
-						confirmedTLSRegistries[endpoint.URL.Host] = struct{}{}
-					}
-					err = fallbackErr.err
-				}
-			}
-			if fallback {
-				if _, ok := err.(ErrNoSupport); !ok {
-					// Because we found an error that's not ErrNoSupport, discard all subsequent ErrNoSupport errors.
-					discardNoSupportErrors = true
-					// append subsequent errors
-					lastErr = err
-				} else if !discardNoSupportErrors {
-					// Save the ErrNoSupport error, because it's either the first error or all encountered errors
-					// were also ErrNoSupport errors.
-					// append subsequent errors
-					lastErr = err
-				}
-				logrus.Errorf("Attempting next endpoint for pull after error: %v", err)
-				continue
-			}
-			logrus.Errorf("Not continuing with pull after error: %v", err)
-			return TranslatePullError(err, ref)
-		}
-
-		imagePullConfig.ImageEventLogger(ref.String(), repoInfo.Name(), "pull")
-		return nil
-	}
-
-	if lastErr == nil {
-		lastErr = fmt.Errorf("no endpoints found for %s", ref.String())
-	}
-
-	return TranslatePullError(lastErr, ref)
-}
-
-// writeStatus writes a status message to out. If layersDownloaded is true, the
-// status message indicates that a newer image was downloaded. Otherwise, it
-// indicates that the image is up to date. requestedTag is the tag the message
-// will refer to.
-func writeStatus(requestedTag string, out progress.Output, layersDownloaded bool) {
-	if layersDownloaded {
-		progress.Message(out, "", "Status: Downloaded newer image for "+requestedTag)
-	} else {
-		progress.Message(out, "", "Status: Image is up to date for "+requestedTag)
-	}
-}
-
-// ValidateRepoName validates the name of a repository.
-func ValidateRepoName(name string) error {
-	if name == "" {
-		return fmt.Errorf("Repository name can't be empty")
-	}
-	if name == api.NoBaseImageSpecifier {
-		return fmt.Errorf("'%s' is a reserved name", api.NoBaseImageSpecifier)
-	}
-	return nil
-}
-
-func addDigestReference(store reference.Store, ref reference.Named, dgst digest.Digest, id digest.Digest) error {
-	dgstRef, err := reference.WithDigest(reference.TrimNamed(ref), dgst)
-	if err != nil {
-		return err
-	}
-
-	if oldTagID, err := store.Get(dgstRef); err == nil {
-		if oldTagID != id {
-			// Updating digests not supported by reference store
-			logrus.Errorf("Image ID for digest %s changed from %s to %s, cannot update", dgst.String(), oldTagID, id)
-		}
-		return nil
-	} else if err != reference.ErrDoesNotExist {
-		return err
-	}
-
-	return store.AddDigest(dgstRef, id, true)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull_v1.go b/installer/vendor/github.com/docker/docker/distribution/pull_v1.go
deleted file mode 100644
index f44ed4f371..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull_v1.go
+++ /dev/null
@@ -1,368 +0,0 @@
-package distribution
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-type v1Puller struct {
-	v1IDService *metadata.V1IDService
-	endpoint    registry.APIEndpoint
-	config      *ImagePullConfig
-	repoInfo    *registry.RepositoryInfo
-	session     *registry.Session
-}
-
-func (p *v1Puller) Pull(ctx context.Context, ref reference.Named) error {
-	if _, isCanonical := ref.(reference.Canonical); isCanonical {
-		// Allowing fallback, because HTTPS v1 is before HTTP v2
-		return fallbackError{err: ErrNoSupport{Err: errors.New("Cannot pull by digest with v1 registry")}}
-	}
-
-	tlsConfig, err := p.config.RegistryService.TLSConfig(p.repoInfo.Index.Name)
-	if err != nil {
-		return err
-	}
-	// Adds Docker-specific headers as well as user-specified headers (metaHeaders)
-	tr := transport.NewTransport(
-		// TODO(tiborvass): was ReceiveTimeout
-		registry.NewTransport(tlsConfig),
-		registry.DockerHeaders(dockerversion.DockerUserAgent(ctx), p.config.MetaHeaders)...,
-	)
-	client := registry.HTTPClient(tr)
-	v1Endpoint, err := p.endpoint.ToV1Endpoint(dockerversion.DockerUserAgent(ctx), p.config.MetaHeaders)
-	if err != nil {
-		logrus.Debugf("Could not get v1 endpoint: %v", err)
-		return fallbackError{err: err}
-	}
-	p.session, err = registry.NewSession(client, p.config.AuthConfig, v1Endpoint)
-	if err != nil {
-		// TODO(dmcgowan): Check if should fallback
-		logrus.Debugf("Fallback from error: %s", err)
-		return fallbackError{err: err}
-	}
-	if err := p.pullRepository(ctx, ref); err != nil {
-		// TODO(dmcgowan): Check if should fallback
-		return err
-	}
-	progress.Message(p.config.ProgressOutput, "", p.repoInfo.FullName()+": this image was pulled from a legacy registry.  Important: This registry version will not be supported in future versions of docker.")
-
-	return nil
-}
-
-func (p *v1Puller) pullRepository(ctx context.Context, ref reference.Named) error {
-	progress.Message(p.config.ProgressOutput, "", "Pulling repository "+p.repoInfo.FullName())
-
-	tagged, isTagged := ref.(reference.NamedTagged)
-
-	repoData, err := p.session.GetRepositoryData(p.repoInfo)
-	if err != nil {
-		if strings.Contains(err.Error(), "HTTP code: 404") {
-			if isTagged {
-				return fmt.Errorf("Error: image %s:%s not found", p.repoInfo.RemoteName(), tagged.Tag())
-			}
-			return fmt.Errorf("Error: image %s not found", p.repoInfo.RemoteName())
-		}
-		// Unexpected HTTP error
-		return err
-	}
-
-	logrus.Debug("Retrieving the tag list")
-	var tagsList map[string]string
-	if !isTagged {
-		tagsList, err = p.session.GetRemoteTags(repoData.Endpoints, p.repoInfo)
-	} else {
-		var tagID string
-		tagsList = make(map[string]string)
-		tagID, err = p.session.GetRemoteTag(repoData.Endpoints, p.repoInfo, tagged.Tag())
-		if err == registry.ErrRepoNotFound {
-			return fmt.Errorf("Tag %s not found in repository %s", tagged.Tag(), p.repoInfo.FullName())
-		}
-		tagsList[tagged.Tag()] = tagID
-	}
-	if err != nil {
-		logrus.Errorf("unable to get remote tags: %s", err)
-		return err
-	}
-
-	for tag, id := range tagsList {
-		repoData.ImgList[id] = &registry.ImgData{
-			ID:       id,
-			Tag:      tag,
-			Checksum: "",
-		}
-	}
-
-	layersDownloaded := false
-	for _, imgData := range repoData.ImgList {
-		if isTagged && imgData.Tag != tagged.Tag() {
-			continue
-		}
-
-		err := p.downloadImage(ctx, repoData, imgData, &layersDownloaded)
-		if err != nil {
-			return err
-		}
-	}
-
-	writeStatus(ref.String(), p.config.ProgressOutput, layersDownloaded)
-	return nil
-}
-
-func (p *v1Puller) downloadImage(ctx context.Context, repoData *registry.RepositoryData, img *registry.ImgData, layersDownloaded *bool) error {
-	if img.Tag == "" {
-		logrus.Debugf("Image (id: %s) present in this repository but untagged, skipping", img.ID)
-		return nil
-	}
-
-	localNameRef, err := reference.WithTag(p.repoInfo, img.Tag)
-	if err != nil {
-		retErr := fmt.Errorf("Image (id: %s) has invalid tag: %s", img.ID, img.Tag)
-		logrus.Debug(retErr.Error())
-		return retErr
-	}
-
-	if err := v1.ValidateID(img.ID); err != nil {
-		return err
-	}
-
-	progress.Updatef(p.config.ProgressOutput, stringid.TruncateID(img.ID), "Pulling image (%s) from %s", img.Tag, p.repoInfo.FullName())
-	success := false
-	var lastErr error
-	for _, ep := range p.repoInfo.Index.Mirrors {
-		ep += "v1/"
-		progress.Updatef(p.config.ProgressOutput, stringid.TruncateID(img.ID), fmt.Sprintf("Pulling image (%s) from %s, mirror: %s", img.Tag, p.repoInfo.FullName(), ep))
-		if err = p.pullImage(ctx, img.ID, ep, localNameRef, layersDownloaded); err != nil {
-			// Don't report errors when pulling from mirrors.
-			logrus.Debugf("Error pulling image (%s) from %s, mirror: %s, %s", img.Tag, p.repoInfo.FullName(), ep, err)
-			continue
-		}
-		success = true
-		break
-	}
-	if !success {
-		for _, ep := range repoData.Endpoints {
-			progress.Updatef(p.config.ProgressOutput, stringid.TruncateID(img.ID), "Pulling image (%s) from %s, endpoint: %s", img.Tag, p.repoInfo.FullName(), ep)
-			if err = p.pullImage(ctx, img.ID, ep, localNameRef, layersDownloaded); err != nil {
-				// It's not ideal that only the last error is returned, it would be better to concatenate the errors.
-				// As the error is also given to the output stream the user will see the error.
-				lastErr = err
-				progress.Updatef(p.config.ProgressOutput, stringid.TruncateID(img.ID), "Error pulling image (%s) from %s, endpoint: %s, %s", img.Tag, p.repoInfo.FullName(), ep, err)
-				continue
-			}
-			success = true
-			break
-		}
-	}
-	if !success {
-		err := fmt.Errorf("Error pulling image (%s) from %s, %v", img.Tag, p.repoInfo.FullName(), lastErr)
-		progress.Update(p.config.ProgressOutput, stringid.TruncateID(img.ID), err.Error())
-		return err
-	}
-	return nil
-}
-
-func (p *v1Puller) pullImage(ctx context.Context, v1ID, endpoint string, localNameRef reference.Named, layersDownloaded *bool) (err error) {
-	var history []string
-	history, err = p.session.GetRemoteHistory(v1ID, endpoint)
-	if err != nil {
-		return err
-	}
-	if len(history) < 1 {
-		return fmt.Errorf("empty history for image %s", v1ID)
-	}
-	progress.Update(p.config.ProgressOutput, stringid.TruncateID(v1ID), "Pulling dependent layers")
-
-	var (
-		descriptors []xfer.DownloadDescriptor
-		newHistory  []image.History
-		imgJSON     []byte
-		imgSize     int64
-	)
-
-	// Iterate over layers, in order from bottom-most to top-most. Download
-	// config for all layers and create descriptors.
-	for i := len(history) - 1; i >= 0; i-- {
-		v1LayerID := history[i]
-		imgJSON, imgSize, err = p.downloadLayerConfig(v1LayerID, endpoint)
-		if err != nil {
-			return err
-		}
-
-		// Create a new-style config from the legacy configs
-		h, err := v1.HistoryFromConfig(imgJSON, false)
-		if err != nil {
-			return err
-		}
-		newHistory = append(newHistory, h)
-
-		layerDescriptor := &v1LayerDescriptor{
-			v1LayerID:        v1LayerID,
-			indexName:        p.repoInfo.Index.Name,
-			endpoint:         endpoint,
-			v1IDService:      p.v1IDService,
-			layersDownloaded: layersDownloaded,
-			layerSize:        imgSize,
-			session:          p.session,
-		}
-
-		descriptors = append(descriptors, layerDescriptor)
-	}
-
-	rootFS := image.NewRootFS()
-	resultRootFS, release, err := p.config.DownloadManager.Download(ctx, *rootFS, descriptors, p.config.ProgressOutput)
-	if err != nil {
-		return err
-	}
-	defer release()
-
-	config, err := v1.MakeConfigFromV1Config(imgJSON, &resultRootFS, newHistory)
-	if err != nil {
-		return err
-	}
-
-	imageID, err := p.config.ImageStore.Put(config)
-	if err != nil {
-		return err
-	}
-
-	if p.config.ReferenceStore != nil {
-		if err := p.config.ReferenceStore.AddTag(localNameRef, imageID, true); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (p *v1Puller) downloadLayerConfig(v1LayerID, endpoint string) (imgJSON []byte, imgSize int64, err error) {
-	progress.Update(p.config.ProgressOutput, stringid.TruncateID(v1LayerID), "Pulling metadata")
-
-	retries := 5
-	for j := 1; j <= retries; j++ {
-		imgJSON, imgSize, err := p.session.GetRemoteImageJSON(v1LayerID, endpoint)
-		if err != nil && j == retries {
-			progress.Update(p.config.ProgressOutput, stringid.TruncateID(v1LayerID), "Error pulling layer metadata")
-			return nil, 0, err
-		} else if err != nil {
-			time.Sleep(time.Duration(j) * 500 * time.Millisecond)
-			continue
-		}
-
-		return imgJSON, imgSize, nil
-	}
-
-	// not reached
-	return nil, 0, nil
-}
-
-type v1LayerDescriptor struct {
-	v1LayerID        string
-	indexName        string
-	endpoint         string
-	v1IDService      *metadata.V1IDService
-	layersDownloaded *bool
-	layerSize        int64
-	session          *registry.Session
-	tmpFile          *os.File
-}
-
-func (ld *v1LayerDescriptor) Key() string {
-	return "v1:" + ld.v1LayerID
-}
-
-func (ld *v1LayerDescriptor) ID() string {
-	return stringid.TruncateID(ld.v1LayerID)
-}
-
-func (ld *v1LayerDescriptor) DiffID() (layer.DiffID, error) {
-	return ld.v1IDService.Get(ld.v1LayerID, ld.indexName)
-}
-
-func (ld *v1LayerDescriptor) Download(ctx context.Context, progressOutput progress.Output) (io.ReadCloser, int64, error) {
-	progress.Update(progressOutput, ld.ID(), "Pulling fs layer")
-	layerReader, err := ld.session.GetRemoteImageLayer(ld.v1LayerID, ld.endpoint, ld.layerSize)
-	if err != nil {
-		progress.Update(progressOutput, ld.ID(), "Error pulling dependent layers")
-		if uerr, ok := err.(*url.Error); ok {
-			err = uerr.Err
-		}
-		if terr, ok := err.(net.Error); ok && terr.Timeout() {
-			return nil, 0, err
-		}
-		return nil, 0, xfer.DoNotRetry{Err: err}
-	}
-	*ld.layersDownloaded = true
-
-	ld.tmpFile, err = ioutil.TempFile("", "GetImageBlob")
-	if err != nil {
-		layerReader.Close()
-		return nil, 0, err
-	}
-
-	reader := progress.NewProgressReader(ioutils.NewCancelReadCloser(ctx, layerReader), progressOutput, ld.layerSize, ld.ID(), "Downloading")
-	defer reader.Close()
-
-	_, err = io.Copy(ld.tmpFile, reader)
-	if err != nil {
-		ld.Close()
-		return nil, 0, err
-	}
-
-	progress.Update(progressOutput, ld.ID(), "Download complete")
-
-	logrus.Debugf("Downloaded %s to tempfile %s", ld.ID(), ld.tmpFile.Name())
-
-	ld.tmpFile.Seek(0, 0)
-
-	// hand off the temporary file to the download manager, so it will only
-	// be closed once
-	tmpFile := ld.tmpFile
-	ld.tmpFile = nil
-
-	return ioutils.NewReadCloserWrapper(tmpFile, func() error {
-		tmpFile.Close()
-		err := os.RemoveAll(tmpFile.Name())
-		if err != nil {
-			logrus.Errorf("Failed to remove temp file: %s", tmpFile.Name())
-		}
-		return err
-	}), ld.layerSize, nil
-}
-
-func (ld *v1LayerDescriptor) Close() {
-	if ld.tmpFile != nil {
-		ld.tmpFile.Close()
-		if err := os.RemoveAll(ld.tmpFile.Name()); err != nil {
-			logrus.Errorf("Failed to remove temp file: %s", ld.tmpFile.Name())
-		}
-		ld.tmpFile = nil
-	}
-}
-
-func (ld *v1LayerDescriptor) Registered(diffID layer.DiffID) {
-	// Cache mapping from this layer's DiffID to the blobsum
-	ld.v1IDService.Set(ld.v1LayerID, ld.indexName, diffID)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull_v2.go b/installer/vendor/github.com/docker/docker/distribution/pull_v2.go
deleted file mode 100644
index 88807edc7d..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull_v2.go
+++ /dev/null
@@ -1,878 +0,0 @@
-package distribution
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"runtime"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-var (
-	errRootFSMismatch = errors.New("layers from manifest don't match image configuration")
-	errRootFSInvalid  = errors.New("invalid rootfs in image configuration")
-)
-
-// ImageConfigPullError is an error pulling the image config blob
-// (only applies to schema2).
-type ImageConfigPullError struct {
-	Err error
-}
-
-// Error returns the error string for ImageConfigPullError.
-func (e ImageConfigPullError) Error() string {
-	return "error pulling image configuration: " + e.Err.Error()
-}
-
-type v2Puller struct {
-	V2MetadataService metadata.V2MetadataService
-	endpoint          registry.APIEndpoint
-	config            *ImagePullConfig
-	repoInfo          *registry.RepositoryInfo
-	repo              distribution.Repository
-	// confirmedV2 is set to true if we confirm we're talking to a v2
-	// registry. This is used to limit fallbacks to the v1 protocol.
-	confirmedV2 bool
-}
-
-func (p *v2Puller) Pull(ctx context.Context, ref reference.Named) (err error) {
-	// TODO(tiborvass): was ReceiveTimeout
-	p.repo, p.confirmedV2, err = NewV2Repository(ctx, p.repoInfo, p.endpoint, p.config.MetaHeaders, p.config.AuthConfig, "pull")
-	if err != nil {
-		logrus.Warnf("Error getting v2 registry: %v", err)
-		return err
-	}
-
-	if err = p.pullV2Repository(ctx, ref); err != nil {
-		if _, ok := err.(fallbackError); ok {
-			return err
-		}
-		if continueOnError(err) {
-			logrus.Errorf("Error trying v2 registry: %v", err)
-			return fallbackError{
-				err:         err,
-				confirmedV2: p.confirmedV2,
-				transportOK: true,
-			}
-		}
-	}
-	return err
-}
-
-func (p *v2Puller) pullV2Repository(ctx context.Context, ref reference.Named) (err error) {
-	var layersDownloaded bool
-	if !reference.IsNameOnly(ref) {
-		layersDownloaded, err = p.pullV2Tag(ctx, ref)
-		if err != nil {
-			return err
-		}
-	} else {
-		tags, err := p.repo.Tags(ctx).All(ctx)
-		if err != nil {
-			// If this repository doesn't exist on V2, we should
-			// permit a fallback to V1.
-			return allowV1Fallback(err)
-		}
-
-		// The v2 registry knows about this repository, so we will not
-		// allow fallback to the v1 protocol even if we encounter an
-		// error later on.
-		p.confirmedV2 = true
-
-		for _, tag := range tags {
-			tagRef, err := reference.WithTag(ref, tag)
-			if err != nil {
-				return err
-			}
-			pulledNew, err := p.pullV2Tag(ctx, tagRef)
-			if err != nil {
-				// Since this is the pull-all-tags case, don't
-				// allow an error pulling a particular tag to
-				// make the whole pull fall back to v1.
-				if fallbackErr, ok := err.(fallbackError); ok {
-					return fallbackErr.err
-				}
-				return err
-			}
-			// pulledNew is true if either new layers were downloaded OR if existing images were newly tagged
-			// TODO(tiborvass): should we change the name of `layersDownload`? What about message in WriteStatus?
-			layersDownloaded = layersDownloaded || pulledNew
-		}
-	}
-
-	writeStatus(ref.String(), p.config.ProgressOutput, layersDownloaded)
-
-	return nil
-}
-
-type v2LayerDescriptor struct {
-	digest            digest.Digest
-	repoInfo          *registry.RepositoryInfo
-	repo              distribution.Repository
-	V2MetadataService metadata.V2MetadataService
-	tmpFile           *os.File
-	verifier          digest.Verifier
-	src               distribution.Descriptor
-}
-
-func (ld *v2LayerDescriptor) Key() string {
-	return "v2:" + ld.digest.String()
-}
-
-func (ld *v2LayerDescriptor) ID() string {
-	return stringid.TruncateID(ld.digest.String())
-}
-
-func (ld *v2LayerDescriptor) DiffID() (layer.DiffID, error) {
-	return ld.V2MetadataService.GetDiffID(ld.digest)
-}
-
-func (ld *v2LayerDescriptor) Download(ctx context.Context, progressOutput progress.Output) (io.ReadCloser, int64, error) {
-	logrus.Debugf("pulling blob %q", ld.digest)
-
-	var (
-		err    error
-		offset int64
-	)
-
-	if ld.tmpFile == nil {
-		ld.tmpFile, err = createDownloadFile()
-		if err != nil {
-			return nil, 0, xfer.DoNotRetry{Err: err}
-		}
-	} else {
-		offset, err = ld.tmpFile.Seek(0, os.SEEK_END)
-		if err != nil {
-			logrus.Debugf("error seeking to end of download file: %v", err)
-			offset = 0
-
-			ld.tmpFile.Close()
-			if err := os.Remove(ld.tmpFile.Name()); err != nil {
-				logrus.Errorf("Failed to remove temp file: %s", ld.tmpFile.Name())
-			}
-			ld.tmpFile, err = createDownloadFile()
-			if err != nil {
-				return nil, 0, xfer.DoNotRetry{Err: err}
-			}
-		} else if offset != 0 {
-			logrus.Debugf("attempting to resume download of %q from %d bytes", ld.digest, offset)
-		}
-	}
-
-	tmpFile := ld.tmpFile
-
-	layerDownload, err := ld.open(ctx)
-	if err != nil {
-		logrus.Errorf("Error initiating layer download: %v", err)
-		return nil, 0, retryOnError(err)
-	}
-
-	if offset != 0 {
-		_, err := layerDownload.Seek(offset, os.SEEK_SET)
-		if err != nil {
-			if err := ld.truncateDownloadFile(); err != nil {
-				return nil, 0, xfer.DoNotRetry{Err: err}
-			}
-			return nil, 0, err
-		}
-	}
-	size, err := layerDownload.Seek(0, os.SEEK_END)
-	if err != nil {
-		// Seek failed, perhaps because there was no Content-Length
-		// header. This shouldn't fail the download, because we can
-		// still continue without a progress bar.
-		size = 0
-	} else {
-		if size != 0 && offset > size {
-			logrus.Debug("Partial download is larger than full blob. Starting over")
-			offset = 0
-			if err := ld.truncateDownloadFile(); err != nil {
-				return nil, 0, xfer.DoNotRetry{Err: err}
-			}
-		}
-
-		// Restore the seek offset either at the beginning of the
-		// stream, or just after the last byte we have from previous
-		// attempts.
-		_, err = layerDownload.Seek(offset, os.SEEK_SET)
-		if err != nil {
-			return nil, 0, err
-		}
-	}
-
-	reader := progress.NewProgressReader(ioutils.NewCancelReadCloser(ctx, layerDownload), progressOutput, size-offset, ld.ID(), "Downloading")
-	defer reader.Close()
-
-	if ld.verifier == nil {
-		ld.verifier, err = digest.NewDigestVerifier(ld.digest)
-		if err != nil {
-			return nil, 0, xfer.DoNotRetry{Err: err}
-		}
-	}
-
-	_, err = io.Copy(tmpFile, io.TeeReader(reader, ld.verifier))
-	if err != nil {
-		if err == transport.ErrWrongCodeForByteRange {
-			if err := ld.truncateDownloadFile(); err != nil {
-				return nil, 0, xfer.DoNotRetry{Err: err}
-			}
-			return nil, 0, err
-		}
-		return nil, 0, retryOnError(err)
-	}
-
-	progress.Update(progressOutput, ld.ID(), "Verifying Checksum")
-
-	if !ld.verifier.Verified() {
-		err = fmt.Errorf("filesystem layer verification failed for digest %s", ld.digest)
-		logrus.Error(err)
-
-		// Allow a retry if this digest verification error happened
-		// after a resumed download.
-		if offset != 0 {
-			if err := ld.truncateDownloadFile(); err != nil {
-				return nil, 0, xfer.DoNotRetry{Err: err}
-			}
-
-			return nil, 0, err
-		}
-		return nil, 0, xfer.DoNotRetry{Err: err}
-	}
-
-	progress.Update(progressOutput, ld.ID(), "Download complete")
-
-	logrus.Debugf("Downloaded %s to tempfile %s", ld.ID(), tmpFile.Name())
-
-	_, err = tmpFile.Seek(0, os.SEEK_SET)
-	if err != nil {
-		tmpFile.Close()
-		if err := os.Remove(tmpFile.Name()); err != nil {
-			logrus.Errorf("Failed to remove temp file: %s", tmpFile.Name())
-		}
-		ld.tmpFile = nil
-		ld.verifier = nil
-		return nil, 0, xfer.DoNotRetry{Err: err}
-	}
-
-	// hand off the temporary file to the download manager, so it will only
-	// be closed once
-	ld.tmpFile = nil
-
-	return ioutils.NewReadCloserWrapper(tmpFile, func() error {
-		tmpFile.Close()
-		err := os.RemoveAll(tmpFile.Name())
-		if err != nil {
-			logrus.Errorf("Failed to remove temp file: %s", tmpFile.Name())
-		}
-		return err
-	}), size, nil
-}
-
-func (ld *v2LayerDescriptor) Close() {
-	if ld.tmpFile != nil {
-		ld.tmpFile.Close()
-		if err := os.RemoveAll(ld.tmpFile.Name()); err != nil {
-			logrus.Errorf("Failed to remove temp file: %s", ld.tmpFile.Name())
-		}
-	}
-}
-
-func (ld *v2LayerDescriptor) truncateDownloadFile() error {
-	// Need a new hash context since we will be redoing the download
-	ld.verifier = nil
-
-	if _, err := ld.tmpFile.Seek(0, os.SEEK_SET); err != nil {
-		logrus.Errorf("error seeking to beginning of download file: %v", err)
-		return err
-	}
-
-	if err := ld.tmpFile.Truncate(0); err != nil {
-		logrus.Errorf("error truncating download file: %v", err)
-		return err
-	}
-
-	return nil
-}
-
-func (ld *v2LayerDescriptor) Registered(diffID layer.DiffID) {
-	// Cache mapping from this layer's DiffID to the blobsum
-	ld.V2MetadataService.Add(diffID, metadata.V2Metadata{Digest: ld.digest, SourceRepository: ld.repoInfo.FullName()})
-}
-
-func (p *v2Puller) pullV2Tag(ctx context.Context, ref reference.Named) (tagUpdated bool, err error) {
-	manSvc, err := p.repo.Manifests(ctx)
-	if err != nil {
-		return false, err
-	}
-
-	var (
-		manifest    distribution.Manifest
-		tagOrDigest string // Used for logging/progress only
-	)
-	if tagged, isTagged := ref.(reference.NamedTagged); isTagged {
-		manifest, err = manSvc.Get(ctx, "", distribution.WithTag(tagged.Tag()))
-		if err != nil {
-			return false, allowV1Fallback(err)
-		}
-		tagOrDigest = tagged.Tag()
-	} else if digested, isDigested := ref.(reference.Canonical); isDigested {
-		manifest, err = manSvc.Get(ctx, digested.Digest())
-		if err != nil {
-			return false, err
-		}
-		tagOrDigest = digested.Digest().String()
-	} else {
-		return false, fmt.Errorf("internal error: reference has neither a tag nor a digest: %s", ref.String())
-	}
-
-	if manifest == nil {
-		return false, fmt.Errorf("image manifest does not exist for tag or digest %q", tagOrDigest)
-	}
-
-	if m, ok := manifest.(*schema2.DeserializedManifest); ok {
-		var allowedMediatype bool
-		for _, t := range p.config.Schema2Types {
-			if m.Manifest.Config.MediaType == t {
-				allowedMediatype = true
-				break
-			}
-		}
-		if !allowedMediatype {
-			configClass := mediaTypeClasses[m.Manifest.Config.MediaType]
-			if configClass == "" {
-				configClass = "unknown"
-			}
-			return false, fmt.Errorf("target is %s", configClass)
-		}
-	}
-
-	// If manSvc.Get succeeded, we can be confident that the registry on
-	// the other side speaks the v2 protocol.
-	p.confirmedV2 = true
-
-	logrus.Debugf("Pulling ref from V2 registry: %s", ref.String())
-	progress.Message(p.config.ProgressOutput, tagOrDigest, "Pulling from "+p.repo.Named().Name())
-
-	var (
-		id             digest.Digest
-		manifestDigest digest.Digest
-	)
-
-	switch v := manifest.(type) {
-	case *schema1.SignedManifest:
-		if p.config.RequireSchema2 {
-			return false, fmt.Errorf("invalid manifest: not schema2")
-		}
-		id, manifestDigest, err = p.pullSchema1(ctx, ref, v)
-		if err != nil {
-			return false, err
-		}
-	case *schema2.DeserializedManifest:
-		id, manifestDigest, err = p.pullSchema2(ctx, ref, v)
-		if err != nil {
-			return false, err
-		}
-	case *manifestlist.DeserializedManifestList:
-		id, manifestDigest, err = p.pullManifestList(ctx, ref, v)
-		if err != nil {
-			return false, err
-		}
-	default:
-		return false, errors.New("unsupported manifest format")
-	}
-
-	progress.Message(p.config.ProgressOutput, "", "Digest: "+manifestDigest.String())
-
-	if p.config.ReferenceStore != nil {
-		oldTagID, err := p.config.ReferenceStore.Get(ref)
-		if err == nil {
-			if oldTagID == id {
-				return false, addDigestReference(p.config.ReferenceStore, ref, manifestDigest, id)
-			}
-		} else if err != reference.ErrDoesNotExist {
-			return false, err
-		}
-
-		if canonical, ok := ref.(reference.Canonical); ok {
-			if err = p.config.ReferenceStore.AddDigest(canonical, id, true); err != nil {
-				return false, err
-			}
-		} else {
-			if err = addDigestReference(p.config.ReferenceStore, ref, manifestDigest, id); err != nil {
-				return false, err
-			}
-			if err = p.config.ReferenceStore.AddTag(ref, id, true); err != nil {
-				return false, err
-			}
-		}
-	}
-	return true, nil
-}
-
-func (p *v2Puller) pullSchema1(ctx context.Context, ref reference.Named, unverifiedManifest *schema1.SignedManifest) (id digest.Digest, manifestDigest digest.Digest, err error) {
-	var verifiedManifest *schema1.Manifest
-	verifiedManifest, err = verifySchema1Manifest(unverifiedManifest, ref)
-	if err != nil {
-		return "", "", err
-	}
-
-	rootFS := image.NewRootFS()
-
-	// remove duplicate layers and check parent chain validity
-	err = fixManifestLayers(verifiedManifest)
-	if err != nil {
-		return "", "", err
-	}
-
-	var descriptors []xfer.DownloadDescriptor
-
-	// Image history converted to the new format
-	var history []image.History
-
-	// Note that the order of this loop is in the direction of bottom-most
-	// to top-most, so that the downloads slice gets ordered correctly.
-	for i := len(verifiedManifest.FSLayers) - 1; i >= 0; i-- {
-		blobSum := verifiedManifest.FSLayers[i].BlobSum
-
-		var throwAway struct {
-			ThrowAway bool `json:"throwaway,omitempty"`
-		}
-		if err := json.Unmarshal([]byte(verifiedManifest.History[i].V1Compatibility), &throwAway); err != nil {
-			return "", "", err
-		}
-
-		h, err := v1.HistoryFromConfig([]byte(verifiedManifest.History[i].V1Compatibility), throwAway.ThrowAway)
-		if err != nil {
-			return "", "", err
-		}
-		history = append(history, h)
-
-		if throwAway.ThrowAway {
-			continue
-		}
-
-		layerDescriptor := &v2LayerDescriptor{
-			digest:            blobSum,
-			repoInfo:          p.repoInfo,
-			repo:              p.repo,
-			V2MetadataService: p.V2MetadataService,
-		}
-
-		descriptors = append(descriptors, layerDescriptor)
-	}
-
-	resultRootFS, release, err := p.config.DownloadManager.Download(ctx, *rootFS, descriptors, p.config.ProgressOutput)
-	if err != nil {
-		return "", "", err
-	}
-	defer release()
-
-	config, err := v1.MakeConfigFromV1Config([]byte(verifiedManifest.History[0].V1Compatibility), &resultRootFS, history)
-	if err != nil {
-		return "", "", err
-	}
-
-	imageID, err := p.config.ImageStore.Put(config)
-	if err != nil {
-		return "", "", err
-	}
-
-	manifestDigest = digest.FromBytes(unverifiedManifest.Canonical)
-
-	return imageID, manifestDigest, nil
-}
-
-func (p *v2Puller) pullSchema2(ctx context.Context, ref reference.Named, mfst *schema2.DeserializedManifest) (id digest.Digest, manifestDigest digest.Digest, err error) {
-	manifestDigest, err = schema2ManifestDigest(ref, mfst)
-	if err != nil {
-		return "", "", err
-	}
-
-	target := mfst.Target()
-	if _, err := p.config.ImageStore.Get(target.Digest); err == nil {
-		// If the image already exists locally, no need to pull
-		// anything.
-		return target.Digest, manifestDigest, nil
-	}
-
-	var descriptors []xfer.DownloadDescriptor
-
-	// Note that the order of this loop is in the direction of bottom-most
-	// to top-most, so that the downloads slice gets ordered correctly.
-	for _, d := range mfst.Layers {
-		layerDescriptor := &v2LayerDescriptor{
-			digest:            d.Digest,
-			repo:              p.repo,
-			repoInfo:          p.repoInfo,
-			V2MetadataService: p.V2MetadataService,
-			src:               d,
-		}
-
-		descriptors = append(descriptors, layerDescriptor)
-	}
-
-	configChan := make(chan []byte, 1)
-	errChan := make(chan error, 1)
-	var cancel func()
-	ctx, cancel = context.WithCancel(ctx)
-
-	// Pull the image config
-	go func() {
-		configJSON, err := p.pullSchema2Config(ctx, target.Digest)
-		if err != nil {
-			errChan <- ImageConfigPullError{Err: err}
-			cancel()
-			return
-		}
-		configChan <- configJSON
-	}()
-
-	var (
-		configJSON       []byte        // raw serialized image config
-		downloadedRootFS *image.RootFS // rootFS from registered layers
-		configRootFS     *image.RootFS // rootFS from configuration
-	)
-
-	// https://github.com/docker/docker/issues/24766 - Err on the side of caution,
-	// explicitly blocking images intended for linux from the Windows daemon. On
-	// Windows, we do this before the attempt to download, effectively serialising
-	// the download slightly slowing it down. We have to do it this way, as
-	// chances are the download of layers itself would fail due to file names
-	// which aren't suitable for NTFS. At some point in the future, if a similar
-	// check to block Windows images being pulled on Linux is implemented, it
-	// may be necessary to perform the same type of serialisation.
-	if runtime.GOOS == "windows" {
-		configJSON, configRootFS, err = receiveConfig(p.config.ImageStore, configChan, errChan)
-		if err != nil {
-			return "", "", err
-		}
-
-		if configRootFS == nil {
-			return "", "", errRootFSInvalid
-		}
-	}
-
-	if p.config.DownloadManager != nil {
-		downloadRootFS := *image.NewRootFS()
-		rootFS, release, err := p.config.DownloadManager.Download(ctx, downloadRootFS, descriptors, p.config.ProgressOutput)
-		if err != nil {
-			if configJSON != nil {
-				// Already received the config
-				return "", "", err
-			}
-			select {
-			case err = <-errChan:
-				return "", "", err
-			default:
-				cancel()
-				select {
-				case <-configChan:
-				case <-errChan:
-				}
-				return "", "", err
-			}
-		}
-		if release != nil {
-			defer release()
-		}
-
-		downloadedRootFS = &rootFS
-	}
-
-	if configJSON == nil {
-		configJSON, configRootFS, err = receiveConfig(p.config.ImageStore, configChan, errChan)
-		if err != nil {
-			return "", "", err
-		}
-
-		if configRootFS == nil {
-			return "", "", errRootFSInvalid
-		}
-	}
-
-	if downloadedRootFS != nil {
-		// The DiffIDs returned in rootFS MUST match those in the config.
-		// Otherwise the image config could be referencing layers that aren't
-		// included in the manifest.
-		if len(downloadedRootFS.DiffIDs) != len(configRootFS.DiffIDs) {
-			return "", "", errRootFSMismatch
-		}
-
-		for i := range downloadedRootFS.DiffIDs {
-			if downloadedRootFS.DiffIDs[i] != configRootFS.DiffIDs[i] {
-				return "", "", errRootFSMismatch
-			}
-		}
-	}
-
-	imageID, err := p.config.ImageStore.Put(configJSON)
-	if err != nil {
-		return "", "", err
-	}
-
-	return imageID, manifestDigest, nil
-}
-
-func receiveConfig(s ImageConfigStore, configChan <-chan []byte, errChan <-chan error) ([]byte, *image.RootFS, error) {
-	select {
-	case configJSON := <-configChan:
-		rootfs, err := s.RootFSFromConfig(configJSON)
-		if err != nil {
-			return nil, nil, err
-		}
-		return configJSON, rootfs, nil
-	case err := <-errChan:
-		return nil, nil, err
-		// Don't need a case for ctx.Done in the select because cancellation
-		// will trigger an error in p.pullSchema2ImageConfig.
-	}
-}
-
-// pullManifestList handles "manifest lists" which point to various
-// platform-specifc manifests.
-func (p *v2Puller) pullManifestList(ctx context.Context, ref reference.Named, mfstList *manifestlist.DeserializedManifestList) (id digest.Digest, manifestListDigest digest.Digest, err error) {
-	manifestListDigest, err = schema2ManifestDigest(ref, mfstList)
-	if err != nil {
-		return "", "", err
-	}
-
-	var manifestDigest digest.Digest
-	for _, manifestDescriptor := range mfstList.Manifests {
-		// TODO(aaronl): The manifest list spec supports optional
-		// "features" and "variant" fields. These are not yet used.
-		// Once they are, their values should be interpreted here.
-		if manifestDescriptor.Platform.Architecture == runtime.GOARCH && manifestDescriptor.Platform.OS == runtime.GOOS {
-			manifestDigest = manifestDescriptor.Digest
-			break
-		}
-	}
-
-	if manifestDigest == "" {
-		return "", "", errors.New("no supported platform found in manifest list")
-	}
-
-	manSvc, err := p.repo.Manifests(ctx)
-	if err != nil {
-		return "", "", err
-	}
-
-	manifest, err := manSvc.Get(ctx, manifestDigest)
-	if err != nil {
-		return "", "", err
-	}
-
-	manifestRef, err := reference.WithDigest(reference.TrimNamed(ref), manifestDigest)
-	if err != nil {
-		return "", "", err
-	}
-
-	switch v := manifest.(type) {
-	case *schema1.SignedManifest:
-		id, _, err = p.pullSchema1(ctx, manifestRef, v)
-		if err != nil {
-			return "", "", err
-		}
-	case *schema2.DeserializedManifest:
-		id, _, err = p.pullSchema2(ctx, manifestRef, v)
-		if err != nil {
-			return "", "", err
-		}
-	default:
-		return "", "", errors.New("unsupported manifest format")
-	}
-
-	return id, manifestListDigest, err
-}
-
-func (p *v2Puller) pullSchema2Config(ctx context.Context, dgst digest.Digest) (configJSON []byte, err error) {
-	blobs := p.repo.Blobs(ctx)
-	configJSON, err = blobs.Get(ctx, dgst)
-	if err != nil {
-		return nil, err
-	}
-
-	// Verify image config digest
-	verifier, err := digest.NewDigestVerifier(dgst)
-	if err != nil {
-		return nil, err
-	}
-	if _, err := verifier.Write(configJSON); err != nil {
-		return nil, err
-	}
-	if !verifier.Verified() {
-		err := fmt.Errorf("image config verification failed for digest %s", dgst)
-		logrus.Error(err)
-		return nil, err
-	}
-
-	return configJSON, nil
-}
-
-// schema2ManifestDigest computes the manifest digest, and, if pulling by
-// digest, ensures that it matches the requested digest.
-func schema2ManifestDigest(ref reference.Named, mfst distribution.Manifest) (digest.Digest, error) {
-	_, canonical, err := mfst.Payload()
-	if err != nil {
-		return "", err
-	}
-
-	// If pull by digest, then verify the manifest digest.
-	if digested, isDigested := ref.(reference.Canonical); isDigested {
-		verifier, err := digest.NewDigestVerifier(digested.Digest())
-		if err != nil {
-			return "", err
-		}
-		if _, err := verifier.Write(canonical); err != nil {
-			return "", err
-		}
-		if !verifier.Verified() {
-			err := fmt.Errorf("manifest verification failed for digest %s", digested.Digest())
-			logrus.Error(err)
-			return "", err
-		}
-		return digested.Digest(), nil
-	}
-
-	return digest.FromBytes(canonical), nil
-}
-
-// allowV1Fallback checks if the error is a possible reason to fallback to v1
-// (even if confirmedV2 has been set already), and if so, wraps the error in
-// a fallbackError with confirmedV2 set to false. Otherwise, it returns the
-// error unmodified.
-func allowV1Fallback(err error) error {
-	switch v := err.(type) {
-	case errcode.Errors:
-		if len(v) != 0 {
-			if v0, ok := v[0].(errcode.Error); ok && shouldV2Fallback(v0) {
-				return fallbackError{
-					err:         err,
-					confirmedV2: false,
-					transportOK: true,
-				}
-			}
-		}
-	case errcode.Error:
-		if shouldV2Fallback(v) {
-			return fallbackError{
-				err:         err,
-				confirmedV2: false,
-				transportOK: true,
-			}
-		}
-	case *url.Error:
-		if v.Err == auth.ErrNoBasicAuthCredentials {
-			return fallbackError{err: err, confirmedV2: false}
-		}
-	}
-
-	return err
-}
-
-func verifySchema1Manifest(signedManifest *schema1.SignedManifest, ref reference.Named) (m *schema1.Manifest, err error) {
-	// If pull by digest, then verify the manifest digest. NOTE: It is
-	// important to do this first, before any other content validation. If the
-	// digest cannot be verified, don't even bother with those other things.
-	if digested, isCanonical := ref.(reference.Canonical); isCanonical {
-		verifier, err := digest.NewDigestVerifier(digested.Digest())
-		if err != nil {
-			return nil, err
-		}
-		if _, err := verifier.Write(signedManifest.Canonical); err != nil {
-			return nil, err
-		}
-		if !verifier.Verified() {
-			err := fmt.Errorf("image verification failed for digest %s", digested.Digest())
-			logrus.Error(err)
-			return nil, err
-		}
-	}
-	m = &signedManifest.Manifest
-
-	if m.SchemaVersion != 1 {
-		return nil, fmt.Errorf("unsupported schema version %d for %q", m.SchemaVersion, ref.String())
-	}
-	if len(m.FSLayers) != len(m.History) {
-		return nil, fmt.Errorf("length of history not equal to number of layers for %q", ref.String())
-	}
-	if len(m.FSLayers) == 0 {
-		return nil, fmt.Errorf("no FSLayers in manifest for %q", ref.String())
-	}
-	return m, nil
-}
-
-// fixManifestLayers removes repeated layers from the manifest and checks the
-// correctness of the parent chain.
-func fixManifestLayers(m *schema1.Manifest) error {
-	imgs := make([]*image.V1Image, len(m.FSLayers))
-	for i := range m.FSLayers {
-		img := &image.V1Image{}
-
-		if err := json.Unmarshal([]byte(m.History[i].V1Compatibility), img); err != nil {
-			return err
-		}
-
-		imgs[i] = img
-		if err := v1.ValidateID(img.ID); err != nil {
-			return err
-		}
-	}
-
-	if imgs[len(imgs)-1].Parent != "" && runtime.GOOS != "windows" {
-		// Windows base layer can point to a base layer parent that is not in manifest.
-		return errors.New("invalid parent ID in the base layer of the image")
-	}
-
-	// check general duplicates to error instead of a deadlock
-	idmap := make(map[string]struct{})
-
-	var lastID string
-	for _, img := range imgs {
-		// skip IDs that appear after each other, we handle those later
-		if _, exists := idmap[img.ID]; img.ID != lastID && exists {
-			return fmt.Errorf("ID %+v appears multiple times in manifest", img.ID)
-		}
-		lastID = img.ID
-		idmap[lastID] = struct{}{}
-	}
-
-	// backwards loop so that we keep the remaining indexes after removing items
-	for i := len(imgs) - 2; i >= 0; i-- {
-		if imgs[i].ID == imgs[i+1].ID { // repeated ID. remove and continue
-			m.FSLayers = append(m.FSLayers[:i], m.FSLayers[i+1:]...)
-			m.History = append(m.History[:i], m.History[i+1:]...)
-		} else if imgs[i].Parent != imgs[i+1].ID {
-			return fmt.Errorf("Invalid parent ID. Expected %v, got %v.", imgs[i+1].ID, imgs[i].Parent)
-		}
-	}
-
-	return nil
-}
-
-func createDownloadFile() (*os.File, error) {
-	return ioutil.TempFile("", "GetImageBlob")
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull_v2_test.go b/installer/vendor/github.com/docker/docker/distribution/pull_v2_test.go
deleted file mode 100644
index b745642e3b..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull_v2_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package distribution
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/docker/reference"
-)
-
-// TestFixManifestLayers checks that fixManifestLayers removes a duplicate
-// layer, and that it makes no changes to the manifest when called a second
-// time, after the duplicate is removed.
-func TestFixManifestLayers(t *testing.T) {
-	duplicateLayerManifest := schema1.Manifest{
-		FSLayers: []schema1.FSLayer{
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},
-		},
-		History: []schema1.History{
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},
-		},
-	}
-
-	duplicateLayerManifestExpectedOutput := schema1.Manifest{
-		FSLayers: []schema1.FSLayer{
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},
-		},
-		History: []schema1.History{
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},
-		},
-	}
-
-	if err := fixManifestLayers(&duplicateLayerManifest); err != nil {
-		t.Fatalf("unexpected error from fixManifestLayers: %v", err)
-	}
-
-	if !reflect.DeepEqual(duplicateLayerManifest, duplicateLayerManifestExpectedOutput) {
-		t.Fatal("incorrect output from fixManifestLayers on duplicate layer manifest")
-	}
-
-	// Run fixManifestLayers again and confirm that it doesn't change the
-	// manifest (which no longer has duplicate layers).
-	if err := fixManifestLayers(&duplicateLayerManifest); err != nil {
-		t.Fatalf("unexpected error from fixManifestLayers: %v", err)
-	}
-
-	if !reflect.DeepEqual(duplicateLayerManifest, duplicateLayerManifestExpectedOutput) {
-		t.Fatal("incorrect output from fixManifestLayers on duplicate layer manifest (second pass)")
-	}
-}
-
-// TestFixManifestLayersBaseLayerParent makes sure that fixManifestLayers fails
-// if the base layer configuration specifies a parent.
-func TestFixManifestLayersBaseLayerParent(t *testing.T) {
-	// TODO Windows: Fix this unit text
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs fixing on Windows")
-	}
-	duplicateLayerManifest := schema1.Manifest{
-		FSLayers: []schema1.FSLayer{
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},
-		},
-		History: []schema1.History{
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"parent\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},
-		},
-	}
-
-	if err := fixManifestLayers(&duplicateLayerManifest); err == nil || !strings.Contains(err.Error(), "invalid parent ID in the base layer of the image") {
-		t.Fatalf("expected an invalid parent ID error from fixManifestLayers")
-	}
-}
-
-// TestFixManifestLayersBadParent makes sure that fixManifestLayers fails
-// if an image configuration specifies a parent that doesn't directly follow
-// that (deduplicated) image in the image history.
-func TestFixManifestLayersBadParent(t *testing.T) {
-	duplicateLayerManifest := schema1.Manifest{
-		FSLayers: []schema1.FSLayer{
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-			{BlobSum: digest.Digest("sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")},
-		},
-		History: []schema1.History{
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ac3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"3b38edc92eb7c074812e217b41a6ade66888531009d6286a6f5f36a06f9841b9\",\"parent\":\"ac3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:11.368300679Z\",\"container\":\"d91be3479d5b1e84b0c00d18eea9dc777ca0ad166d51174b24283e2e6f104253\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ENTRYPOINT [\\\"/go/bin/dnsdock\\\"]\"],\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":null,\"Image\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":[\"/go/bin/dnsdock\"],\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":0}\n"},
-			{V1Compatibility: "{\"id\":\"ec3025ca8cc9bcab039e193e20ec647c2da3c53a74020f2ba611601f9b2c6c02\",\"created\":\"2015-08-19T16:49:07.568027497Z\",\"container\":\"fe9e5a5264a843c9292d17b736c92dd19bdb49986a8782d7389964ddaff887cc\",\"container_config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/sh\",\"-c\",\"cd /go/src/github.com/tonistiigi/dnsdock \\u0026\\u0026     go get -v github.com/tools/godep \\u0026\\u0026     godep restore \\u0026\\u0026     go install -ldflags \\\"-X main.version `git describe --tags HEAD``if [[ -n $(command git status --porcelain --untracked-files=no 2\\u003e/dev/null) ]]; then echo \\\"-dirty\\\"; fi`\\\" ./...\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"docker_version\":\"1.6.2\",\"config\":{\"Hostname\":\"03797203757d\",\"Domainname\":\"\",\"User\":\"\",\"Memory\":0,\"MemorySwap\":0,\"CpuShares\":0,\"Cpuset\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"PortSpecs\":null,\"ExposedPorts\":null,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[\"PATH=/go/bin:/usr/src/go/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin\",\"GOLANG_VERSION=1.4.1\",\"GOPATH=/go\"],\"Cmd\":[\"/bin/bash\"],\"Image\":\"e3b0ff09e647595dafee15c54cd632c900df9e82b1d4d313b1e20639a1461779\",\"Volumes\":null,\"WorkingDir\":\"/go\",\"Entrypoint\":null,\"NetworkDisabled\":false,\"MacAddress\":\"\",\"OnBuild\":[],\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":118430532}\n"},
-		},
-	}
-
-	if err := fixManifestLayers(&duplicateLayerManifest); err == nil || !strings.Contains(err.Error(), "Invalid parent ID.") {
-		t.Fatalf("expected an invalid parent ID error from fixManifestLayers")
-	}
-}
-
-// TestValidateManifest verifies the validateManifest function
-func TestValidateManifest(t *testing.T) {
-	// TODO Windows: Fix this unit text
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs fixing on Windows")
-	}
-	expectedDigest, err := reference.ParseNamed("repo@sha256:02fee8c3220ba806531f606525eceb83f4feb654f62b207191b1c9209188dedd")
-	if err != nil {
-		t.Fatal("could not parse reference")
-	}
-	expectedFSLayer0 := digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")
-
-	// Good manifest
-
-	goodManifestBytes, err := ioutil.ReadFile("fixtures/validate_manifest/good_manifest")
-	if err != nil {
-		t.Fatal("error reading fixture:", err)
-	}
-
-	var goodSignedManifest schema1.SignedManifest
-	err = json.Unmarshal(goodManifestBytes, &goodSignedManifest)
-	if err != nil {
-		t.Fatal("error unmarshaling manifest:", err)
-	}
-
-	verifiedManifest, err := verifySchema1Manifest(&goodSignedManifest, expectedDigest)
-	if err != nil {
-		t.Fatal("validateManifest failed:", err)
-	}
-
-	if verifiedManifest.FSLayers[0].BlobSum != expectedFSLayer0 {
-		t.Fatal("unexpected FSLayer in good manifest")
-	}
-
-	// "Extra data" manifest
-
-	extraDataManifestBytes, err := ioutil.ReadFile("fixtures/validate_manifest/extra_data_manifest")
-	if err != nil {
-		t.Fatal("error reading fixture:", err)
-	}
-
-	var extraDataSignedManifest schema1.SignedManifest
-	err = json.Unmarshal(extraDataManifestBytes, &extraDataSignedManifest)
-	if err != nil {
-		t.Fatal("error unmarshaling manifest:", err)
-	}
-
-	verifiedManifest, err = verifySchema1Manifest(&extraDataSignedManifest, expectedDigest)
-	if err != nil {
-		t.Fatal("validateManifest failed:", err)
-	}
-
-	if verifiedManifest.FSLayers[0].BlobSum != expectedFSLayer0 {
-		t.Fatal("unexpected FSLayer in extra data manifest")
-	}
-
-	// Bad manifest
-
-	badManifestBytes, err := ioutil.ReadFile("fixtures/validate_manifest/bad_manifest")
-	if err != nil {
-		t.Fatal("error reading fixture:", err)
-	}
-
-	var badSignedManifest schema1.SignedManifest
-	err = json.Unmarshal(badManifestBytes, &badSignedManifest)
-	if err != nil {
-		t.Fatal("error unmarshaling manifest:", err)
-	}
-
-	verifiedManifest, err = verifySchema1Manifest(&badSignedManifest, expectedDigest)
-	if err == nil || !strings.HasPrefix(err.Error(), "image verification failed for digest") {
-		t.Fatal("expected validateManifest to fail with digest error")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull_v2_unix.go b/installer/vendor/github.com/docker/docker/distribution/pull_v2_unix.go
deleted file mode 100644
index 45a7a0c150..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull_v2_unix.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !windows
-
-package distribution
-
-import (
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
-)
-
-func (ld *v2LayerDescriptor) open(ctx context.Context) (distribution.ReadSeekCloser, error) {
-	blobs := ld.repo.Blobs(ctx)
-	return blobs.Open(ctx, ld.digest)
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/pull_v2_windows.go b/installer/vendor/github.com/docker/docker/distribution/pull_v2_windows.go
deleted file mode 100644
index aefed86601..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/pull_v2_windows.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// +build windows
-
-package distribution
-
-import (
-	"net/http"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/distribution/registry/client/transport"
-)
-
-var _ distribution.Describable = &v2LayerDescriptor{}
-
-func (ld *v2LayerDescriptor) Descriptor() distribution.Descriptor {
-	if ld.src.MediaType == schema2.MediaTypeForeignLayer && len(ld.src.URLs) > 0 {
-		return ld.src
-	}
-	return distribution.Descriptor{}
-}
-
-func (ld *v2LayerDescriptor) open(ctx context.Context) (distribution.ReadSeekCloser, error) {
-	if len(ld.src.URLs) == 0 {
-		blobs := ld.repo.Blobs(ctx)
-		return blobs.Open(ctx, ld.digest)
-	}
-
-	var (
-		err error
-		rsc distribution.ReadSeekCloser
-	)
-
-	// Find the first URL that results in a 200 result code.
-	for _, url := range ld.src.URLs {
-		logrus.Debugf("Pulling %v from foreign URL %v", ld.digest, url)
-		rsc = transport.NewHTTPReadSeeker(http.DefaultClient, url, nil)
-		_, err = rsc.Seek(0, os.SEEK_SET)
-		if err == nil {
-			break
-		}
-		logrus.Debugf("Download for %v failed: %v", ld.digest, err)
-		rsc.Close()
-		rsc = nil
-	}
-	return rsc, err
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/push.go b/installer/vendor/github.com/docker/docker/distribution/push.go
deleted file mode 100644
index d35bdb103e..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/push.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package distribution
-
-import (
-	"bufio"
-	"compress/gzip"
-	"fmt"
-	"io"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-// Pusher is an interface that abstracts pushing for different API versions.
-type Pusher interface {
-	// Push tries to push the image configured at the creation of Pusher.
-	// Push returns an error if any, as well as a boolean that determines whether to retry Push on the next configured endpoint.
-	//
-	// TODO(tiborvass): have Push() take a reference to repository + tag, so that the pusher itself is repository-agnostic.
-	Push(ctx context.Context) error
-}
-
-const compressionBufSize = 32768
-
-// NewPusher creates a new Pusher interface that will push to either a v1 or v2
-// registry. The endpoint argument contains a Version field that determines
-// whether a v1 or v2 pusher will be created. The other parameters are passed
-// through to the underlying pusher implementation for use during the actual
-// push operation.
-func NewPusher(ref reference.Named, endpoint registry.APIEndpoint, repoInfo *registry.RepositoryInfo, imagePushConfig *ImagePushConfig) (Pusher, error) {
-	switch endpoint.Version {
-	case registry.APIVersion2:
-		return &v2Pusher{
-			v2MetadataService: metadata.NewV2MetadataService(imagePushConfig.MetadataStore),
-			ref:               ref,
-			endpoint:          endpoint,
-			repoInfo:          repoInfo,
-			config:            imagePushConfig,
-		}, nil
-	case registry.APIVersion1:
-		return &v1Pusher{
-			v1IDService: metadata.NewV1IDService(imagePushConfig.MetadataStore),
-			ref:         ref,
-			endpoint:    endpoint,
-			repoInfo:    repoInfo,
-			config:      imagePushConfig,
-		}, nil
-	}
-	return nil, fmt.Errorf("unknown version %d for registry %s", endpoint.Version, endpoint.URL)
-}
-
-// Push initiates a push operation on ref.
-// ref is the specific variant of the image to be pushed.
-// If no tag is provided, all tags will be pushed.
-func Push(ctx context.Context, ref reference.Named, imagePushConfig *ImagePushConfig) error {
-	// FIXME: Allow to interrupt current push when new push of same image is done.
-
-	// Resolve the Repository name from fqn to RepositoryInfo
-	repoInfo, err := imagePushConfig.RegistryService.ResolveRepository(ref)
-	if err != nil {
-		return err
-	}
-
-	endpoints, err := imagePushConfig.RegistryService.LookupPushEndpoints(repoInfo.Hostname())
-	if err != nil {
-		return err
-	}
-
-	progress.Messagef(imagePushConfig.ProgressOutput, "", "The push refers to a repository [%s]", repoInfo.FullName())
-
-	associations := imagePushConfig.ReferenceStore.ReferencesByName(repoInfo)
-	if len(associations) == 0 {
-		return fmt.Errorf("An image does not exist locally with the tag: %s", repoInfo.Name())
-	}
-
-	var (
-		lastErr error
-
-		// confirmedV2 is set to true if a push attempt managed to
-		// confirm that it was talking to a v2 registry. This will
-		// prevent fallback to the v1 protocol.
-		confirmedV2 bool
-
-		// confirmedTLSRegistries is a map indicating which registries
-		// are known to be using TLS. There should never be a plaintext
-		// retry for any of these.
-		confirmedTLSRegistries = make(map[string]struct{})
-	)
-
-	for _, endpoint := range endpoints {
-		if imagePushConfig.RequireSchema2 && endpoint.Version == registry.APIVersion1 {
-			continue
-		}
-		if confirmedV2 && endpoint.Version == registry.APIVersion1 {
-			logrus.Debugf("Skipping v1 endpoint %s because v2 registry was detected", endpoint.URL)
-			continue
-		}
-
-		if endpoint.URL.Scheme != "https" {
-			if _, confirmedTLS := confirmedTLSRegistries[endpoint.URL.Host]; confirmedTLS {
-				logrus.Debugf("Skipping non-TLS endpoint %s for host/port that appears to use TLS", endpoint.URL)
-				continue
-			}
-		}
-
-		logrus.Debugf("Trying to push %s to %s %s", repoInfo.FullName(), endpoint.URL, endpoint.Version)
-
-		pusher, err := NewPusher(ref, endpoint, repoInfo, imagePushConfig)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-		if err := pusher.Push(ctx); err != nil {
-			// Was this push cancelled? If so, don't try to fall
-			// back.
-			select {
-			case <-ctx.Done():
-			default:
-				if fallbackErr, ok := err.(fallbackError); ok {
-					confirmedV2 = confirmedV2 || fallbackErr.confirmedV2
-					if fallbackErr.transportOK && endpoint.URL.Scheme == "https" {
-						confirmedTLSRegistries[endpoint.URL.Host] = struct{}{}
-					}
-					err = fallbackErr.err
-					lastErr = err
-					logrus.Errorf("Attempting next endpoint for push after error: %v", err)
-					continue
-				}
-			}
-
-			logrus.Errorf("Not continuing with push after error: %v", err)
-			return err
-		}
-
-		imagePushConfig.ImageEventLogger(ref.String(), repoInfo.Name(), "push")
-		return nil
-	}
-
-	if lastErr == nil {
-		lastErr = fmt.Errorf("no endpoints found for %s", repoInfo.FullName())
-	}
-	return lastErr
-}
-
-// compress returns an io.ReadCloser which will supply a compressed version of
-// the provided Reader. The caller must close the ReadCloser after reading the
-// compressed data.
-//
-// Note that this function returns a reader instead of taking a writer as an
-// argument so that it can be used with httpBlobWriter's ReadFrom method.
-// Using httpBlobWriter's Write method would send a PATCH request for every
-// Write call.
-//
-// The second return value is a channel that gets closed when the goroutine
-// is finished. This allows the caller to make sure the goroutine finishes
-// before it releases any resources connected with the reader that was
-// passed in.
-func compress(in io.Reader) (io.ReadCloser, chan struct{}) {
-	compressionDone := make(chan struct{})
-
-	pipeReader, pipeWriter := io.Pipe()
-	// Use a bufio.Writer to avoid excessive chunking in HTTP request.
-	bufWriter := bufio.NewWriterSize(pipeWriter, compressionBufSize)
-	compressor := gzip.NewWriter(bufWriter)
-
-	go func() {
-		_, err := io.Copy(compressor, in)
-		if err == nil {
-			err = compressor.Close()
-		}
-		if err == nil {
-			err = bufWriter.Flush()
-		}
-		if err != nil {
-			pipeWriter.CloseWithError(err)
-		} else {
-			pipeWriter.Close()
-		}
-		close(compressionDone)
-	}()
-
-	return pipeReader, compressionDone
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/push_v1.go b/installer/vendor/github.com/docker/docker/distribution/push_v1.go
deleted file mode 100644
index 257ac181ec..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/push_v1.go
+++ /dev/null
@@ -1,463 +0,0 @@
-package distribution
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"golang.org/x/net/context"
-)
-
-type v1Pusher struct {
-	v1IDService *metadata.V1IDService
-	endpoint    registry.APIEndpoint
-	ref         reference.Named
-	repoInfo    *registry.RepositoryInfo
-	config      *ImagePushConfig
-	session     *registry.Session
-}
-
-func (p *v1Pusher) Push(ctx context.Context) error {
-	tlsConfig, err := p.config.RegistryService.TLSConfig(p.repoInfo.Index.Name)
-	if err != nil {
-		return err
-	}
-	// Adds Docker-specific headers as well as user-specified headers (metaHeaders)
-	tr := transport.NewTransport(
-		// TODO(tiborvass): was NoTimeout
-		registry.NewTransport(tlsConfig),
-		registry.DockerHeaders(dockerversion.DockerUserAgent(ctx), p.config.MetaHeaders)...,
-	)
-	client := registry.HTTPClient(tr)
-	v1Endpoint, err := p.endpoint.ToV1Endpoint(dockerversion.DockerUserAgent(ctx), p.config.MetaHeaders)
-	if err != nil {
-		logrus.Debugf("Could not get v1 endpoint: %v", err)
-		return fallbackError{err: err}
-	}
-	p.session, err = registry.NewSession(client, p.config.AuthConfig, v1Endpoint)
-	if err != nil {
-		// TODO(dmcgowan): Check if should fallback
-		return fallbackError{err: err}
-	}
-	if err := p.pushRepository(ctx); err != nil {
-		// TODO(dmcgowan): Check if should fallback
-		return err
-	}
-	return nil
-}
-
-// v1Image exposes the configuration, filesystem layer ID, and a v1 ID for an
-// image being pushed to a v1 registry.
-type v1Image interface {
-	Config() []byte
-	Layer() layer.Layer
-	V1ID() string
-}
-
-type v1ImageCommon struct {
-	layer  layer.Layer
-	config []byte
-	v1ID   string
-}
-
-func (common *v1ImageCommon) Config() []byte {
-	return common.config
-}
-
-func (common *v1ImageCommon) V1ID() string {
-	return common.v1ID
-}
-
-func (common *v1ImageCommon) Layer() layer.Layer {
-	return common.layer
-}
-
-// v1TopImage defines a runnable (top layer) image being pushed to a v1
-// registry.
-type v1TopImage struct {
-	v1ImageCommon
-	imageID image.ID
-}
-
-func newV1TopImage(imageID image.ID, img *image.Image, l layer.Layer, parent *v1DependencyImage) (*v1TopImage, error) {
-	v1ID := imageID.Digest().Hex()
-	parentV1ID := ""
-	if parent != nil {
-		parentV1ID = parent.V1ID()
-	}
-
-	config, err := v1.MakeV1ConfigFromConfig(img, v1ID, parentV1ID, false)
-	if err != nil {
-		return nil, err
-	}
-
-	return &v1TopImage{
-		v1ImageCommon: v1ImageCommon{
-			v1ID:   v1ID,
-			config: config,
-			layer:  l,
-		},
-		imageID: imageID,
-	}, nil
-}
-
-// v1DependencyImage defines a dependency layer being pushed to a v1 registry.
-type v1DependencyImage struct {
-	v1ImageCommon
-}
-
-func newV1DependencyImage(l layer.Layer, parent *v1DependencyImage) (*v1DependencyImage, error) {
-	v1ID := digest.Digest(l.ChainID()).Hex()
-
-	config := ""
-	if parent != nil {
-		config = fmt.Sprintf(`{"id":"%s","parent":"%s"}`, v1ID, parent.V1ID())
-	} else {
-		config = fmt.Sprintf(`{"id":"%s"}`, v1ID)
-	}
-	return &v1DependencyImage{
-		v1ImageCommon: v1ImageCommon{
-			v1ID:   v1ID,
-			config: []byte(config),
-			layer:  l,
-		},
-	}, nil
-}
-
-// Retrieve the all the images to be uploaded in the correct order
-func (p *v1Pusher) getImageList() (imageList []v1Image, tagsByImage map[image.ID][]string, referencedLayers []PushLayer, err error) {
-	tagsByImage = make(map[image.ID][]string)
-
-	// Ignore digest references
-	if _, isCanonical := p.ref.(reference.Canonical); isCanonical {
-		return
-	}
-
-	tagged, isTagged := p.ref.(reference.NamedTagged)
-	if isTagged {
-		// Push a specific tag
-		var imgID image.ID
-		var dgst digest.Digest
-		dgst, err = p.config.ReferenceStore.Get(p.ref)
-		if err != nil {
-			return
-		}
-		imgID = image.IDFromDigest(dgst)
-
-		imageList, err = p.imageListForTag(imgID, nil, &referencedLayers)
-		if err != nil {
-			return
-		}
-
-		tagsByImage[imgID] = []string{tagged.Tag()}
-
-		return
-	}
-
-	imagesSeen := make(map[digest.Digest]struct{})
-	dependenciesSeen := make(map[layer.ChainID]*v1DependencyImage)
-
-	associations := p.config.ReferenceStore.ReferencesByName(p.ref)
-	for _, association := range associations {
-		if tagged, isTagged = association.Ref.(reference.NamedTagged); !isTagged {
-			// Ignore digest references.
-			continue
-		}
-
-		imgID := image.IDFromDigest(association.ID)
-		tagsByImage[imgID] = append(tagsByImage[imgID], tagged.Tag())
-
-		if _, present := imagesSeen[association.ID]; present {
-			// Skip generating image list for already-seen image
-			continue
-		}
-		imagesSeen[association.ID] = struct{}{}
-
-		imageListForThisTag, err := p.imageListForTag(imgID, dependenciesSeen, &referencedLayers)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-
-		// append to main image list
-		imageList = append(imageList, imageListForThisTag...)
-	}
-	if len(imageList) == 0 {
-		return nil, nil, nil, fmt.Errorf("No images found for the requested repository / tag")
-	}
-	logrus.Debugf("Image list: %v", imageList)
-	logrus.Debugf("Tags by image: %v", tagsByImage)
-
-	return
-}
-
-func (p *v1Pusher) imageListForTag(imgID image.ID, dependenciesSeen map[layer.ChainID]*v1DependencyImage, referencedLayers *[]PushLayer) (imageListForThisTag []v1Image, err error) {
-	ics, ok := p.config.ImageStore.(*imageConfigStore)
-	if !ok {
-		return nil, fmt.Errorf("only image store images supported for v1 push")
-	}
-	img, err := ics.Store.Get(imgID)
-	if err != nil {
-		return nil, err
-	}
-
-	topLayerID := img.RootFS.ChainID()
-
-	pl, err := p.config.LayerStore.Get(topLayerID)
-	*referencedLayers = append(*referencedLayers, pl)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get top layer from image: %v", err)
-	}
-
-	// V1 push is deprecated, only support existing layerstore layers
-	lsl, ok := pl.(*storeLayer)
-	if !ok {
-		return nil, fmt.Errorf("only layer store layers supported for v1 push")
-	}
-	l := lsl.Layer
-
-	dependencyImages, parent, err := generateDependencyImages(l.Parent(), dependenciesSeen)
-	if err != nil {
-		return nil, err
-	}
-
-	topImage, err := newV1TopImage(imgID, img, l, parent)
-	if err != nil {
-		return nil, err
-	}
-
-	imageListForThisTag = append(dependencyImages, topImage)
-
-	return
-}
-
-func generateDependencyImages(l layer.Layer, dependenciesSeen map[layer.ChainID]*v1DependencyImage) (imageListForThisTag []v1Image, parent *v1DependencyImage, err error) {
-	if l == nil {
-		return nil, nil, nil
-	}
-
-	imageListForThisTag, parent, err = generateDependencyImages(l.Parent(), dependenciesSeen)
-
-	if dependenciesSeen != nil {
-		if dependencyImage, present := dependenciesSeen[l.ChainID()]; present {
-			// This layer is already on the list, we can ignore it
-			// and all its parents.
-			return imageListForThisTag, dependencyImage, nil
-		}
-	}
-
-	dependencyImage, err := newV1DependencyImage(l, parent)
-	if err != nil {
-		return nil, nil, err
-	}
-	imageListForThisTag = append(imageListForThisTag, dependencyImage)
-
-	if dependenciesSeen != nil {
-		dependenciesSeen[l.ChainID()] = dependencyImage
-	}
-
-	return imageListForThisTag, dependencyImage, nil
-}
-
-// createImageIndex returns an index of an image's layer IDs and tags.
-func createImageIndex(images []v1Image, tags map[image.ID][]string) []*registry.ImgData {
-	var imageIndex []*registry.ImgData
-	for _, img := range images {
-		v1ID := img.V1ID()
-
-		if topImage, isTopImage := img.(*v1TopImage); isTopImage {
-			if tags, hasTags := tags[topImage.imageID]; hasTags {
-				// If an image has tags you must add an entry in the image index
-				// for each tag
-				for _, tag := range tags {
-					imageIndex = append(imageIndex, &registry.ImgData{
-						ID:  v1ID,
-						Tag: tag,
-					})
-				}
-				continue
-			}
-		}
-
-		// If the image does not have a tag it still needs to be sent to the
-		// registry with an empty tag so that it is associated with the repository
-		imageIndex = append(imageIndex, &registry.ImgData{
-			ID:  v1ID,
-			Tag: "",
-		})
-	}
-	return imageIndex
-}
-
-// lookupImageOnEndpoint checks the specified endpoint to see if an image exists
-// and if it is absent then it sends the image id to the channel to be pushed.
-func (p *v1Pusher) lookupImageOnEndpoint(wg *sync.WaitGroup, endpoint string, images chan v1Image, imagesToPush chan string) {
-	defer wg.Done()
-	for image := range images {
-		v1ID := image.V1ID()
-		truncID := stringid.TruncateID(image.Layer().DiffID().String())
-		if err := p.session.LookupRemoteImage(v1ID, endpoint); err != nil {
-			logrus.Errorf("Error in LookupRemoteImage: %s", err)
-			imagesToPush <- v1ID
-			progress.Update(p.config.ProgressOutput, truncID, "Waiting")
-		} else {
-			progress.Update(p.config.ProgressOutput, truncID, "Already exists")
-		}
-	}
-}
-
-func (p *v1Pusher) pushImageToEndpoint(ctx context.Context, endpoint string, imageList []v1Image, tags map[image.ID][]string, repo *registry.RepositoryData) error {
-	workerCount := len(imageList)
-	// start a maximum of 5 workers to check if images exist on the specified endpoint.
-	if workerCount > 5 {
-		workerCount = 5
-	}
-	var (
-		wg           = &sync.WaitGroup{}
-		imageData    = make(chan v1Image, workerCount*2)
-		imagesToPush = make(chan string, workerCount*2)
-		pushes       = make(chan map[string]struct{}, 1)
-	)
-	for i := 0; i < workerCount; i++ {
-		wg.Add(1)
-		go p.lookupImageOnEndpoint(wg, endpoint, imageData, imagesToPush)
-	}
-	// start a go routine that consumes the images to push
-	go func() {
-		shouldPush := make(map[string]struct{})
-		for id := range imagesToPush {
-			shouldPush[id] = struct{}{}
-		}
-		pushes <- shouldPush
-	}()
-	for _, v1Image := range imageList {
-		imageData <- v1Image
-	}
-	// close the channel to notify the workers that there will be no more images to check.
-	close(imageData)
-	wg.Wait()
-	close(imagesToPush)
-	// wait for all the images that require pushes to be collected into a consumable map.
-	shouldPush := <-pushes
-	// finish by pushing any images and tags to the endpoint.  The order that the images are pushed
-	// is very important that is why we are still iterating over the ordered list of imageIDs.
-	for _, img := range imageList {
-		v1ID := img.V1ID()
-		if _, push := shouldPush[v1ID]; push {
-			if _, err := p.pushImage(ctx, img, endpoint); err != nil {
-				// FIXME: Continue on error?
-				return err
-			}
-		}
-		if topImage, isTopImage := img.(*v1TopImage); isTopImage {
-			for _, tag := range tags[topImage.imageID] {
-				progress.Messagef(p.config.ProgressOutput, "", "Pushing tag for rev [%s] on {%s}", stringid.TruncateID(v1ID), endpoint+"repositories/"+p.repoInfo.RemoteName()+"/tags/"+tag)
-				if err := p.session.PushRegistryTag(p.repoInfo, v1ID, tag, endpoint); err != nil {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// pushRepository pushes layers that do not already exist on the registry.
-func (p *v1Pusher) pushRepository(ctx context.Context) error {
-	imgList, tags, referencedLayers, err := p.getImageList()
-	defer func() {
-		for _, l := range referencedLayers {
-			l.Release()
-		}
-	}()
-	if err != nil {
-		return err
-	}
-
-	imageIndex := createImageIndex(imgList, tags)
-	for _, data := range imageIndex {
-		logrus.Debugf("Pushing ID: %s with Tag: %s", data.ID, data.Tag)
-	}
-
-	// Register all the images in a repository with the registry
-	// If an image is not in this list it will not be associated with the repository
-	repoData, err := p.session.PushImageJSONIndex(p.repoInfo, imageIndex, false, nil)
-	if err != nil {
-		return err
-	}
-	// push the repository to each of the endpoints only if it does not exist.
-	for _, endpoint := range repoData.Endpoints {
-		if err := p.pushImageToEndpoint(ctx, endpoint, imgList, tags, repoData); err != nil {
-			return err
-		}
-	}
-	_, err = p.session.PushImageJSONIndex(p.repoInfo, imageIndex, true, repoData.Endpoints)
-	return err
-}
-
-func (p *v1Pusher) pushImage(ctx context.Context, v1Image v1Image, ep string) (checksum string, err error) {
-	l := v1Image.Layer()
-	v1ID := v1Image.V1ID()
-	truncID := stringid.TruncateID(l.DiffID().String())
-
-	jsonRaw := v1Image.Config()
-	progress.Update(p.config.ProgressOutput, truncID, "Pushing")
-
-	// General rule is to use ID for graph accesses and compatibilityID for
-	// calls to session.registry()
-	imgData := &registry.ImgData{
-		ID: v1ID,
-	}
-
-	// Send the json
-	if err := p.session.PushImageJSONRegistry(imgData, jsonRaw, ep); err != nil {
-		if err == registry.ErrAlreadyExists {
-			progress.Update(p.config.ProgressOutput, truncID, "Image already pushed, skipping")
-			return "", nil
-		}
-		return "", err
-	}
-
-	arch, err := l.TarStream()
-	if err != nil {
-		return "", err
-	}
-	defer arch.Close()
-
-	// don't care if this fails; best effort
-	size, _ := l.DiffSize()
-
-	// Send the layer
-	logrus.Debugf("rendered layer for %s of [%d] size", v1ID, size)
-
-	reader := progress.NewProgressReader(ioutils.NewCancelReadCloser(ctx, arch), p.config.ProgressOutput, size, truncID, "Pushing")
-	defer reader.Close()
-
-	checksum, checksumPayload, err := p.session.PushImageLayerRegistry(v1ID, reader, ep, jsonRaw)
-	if err != nil {
-		return "", err
-	}
-	imgData.Checksum = checksum
-	imgData.ChecksumPayload = checksumPayload
-	// Send the checksum
-	if err := p.session.PushImageChecksumRegistry(imgData, ep); err != nil {
-		return "", err
-	}
-
-	if err := p.v1IDService.Set(v1ID, p.repoInfo.Index.Name, l.DiffID()); err != nil {
-		logrus.Warnf("Could not set v1 ID mapping: %v", err)
-	}
-
-	progress.Update(p.config.ProgressOutput, truncID, "Image successfully pushed")
-	return imgData.Checksum, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/push_v2.go b/installer/vendor/github.com/docker/docker/distribution/push_v2.go
deleted file mode 100644
index 1f8c822fec..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/push_v2.go
+++ /dev/null
@@ -1,697 +0,0 @@
-package distribution
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"runtime"
-	"sort"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/client"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-)
-
-const (
-	smallLayerMaximumSize  = 100 * (1 << 10) // 100KB
-	middleLayerMaximumSize = 10 * (1 << 20)  // 10MB
-)
-
-// PushResult contains the tag, manifest digest, and manifest size from the
-// push. It's used to signal this information to the trust code in the client
-// so it can sign the manifest if necessary.
-type PushResult struct {
-	Tag    string
-	Digest digest.Digest
-	Size   int
-}
-
-type v2Pusher struct {
-	v2MetadataService metadata.V2MetadataService
-	ref               reference.Named
-	endpoint          registry.APIEndpoint
-	repoInfo          *registry.RepositoryInfo
-	config            *ImagePushConfig
-	repo              distribution.Repository
-
-	// pushState is state built by the Upload functions.
-	pushState pushState
-}
-
-type pushState struct {
-	sync.Mutex
-	// remoteLayers is the set of layers known to exist on the remote side.
-	// This avoids redundant queries when pushing multiple tags that
-	// involve the same layers. It is also used to fill in digest and size
-	// information when building the manifest.
-	remoteLayers map[layer.DiffID]distribution.Descriptor
-	// confirmedV2 is set to true if we confirm we're talking to a v2
-	// registry. This is used to limit fallbacks to the v1 protocol.
-	confirmedV2 bool
-}
-
-func (p *v2Pusher) Push(ctx context.Context) (err error) {
-	p.pushState.remoteLayers = make(map[layer.DiffID]distribution.Descriptor)
-
-	p.repo, p.pushState.confirmedV2, err = NewV2Repository(ctx, p.repoInfo, p.endpoint, p.config.MetaHeaders, p.config.AuthConfig, "push", "pull")
-	if err != nil {
-		logrus.Debugf("Error getting v2 registry: %v", err)
-		return err
-	}
-
-	if err = p.pushV2Repository(ctx); err != nil {
-		if continueOnError(err) {
-			return fallbackError{
-				err:         err,
-				confirmedV2: p.pushState.confirmedV2,
-				transportOK: true,
-			}
-		}
-	}
-	return err
-}
-
-func (p *v2Pusher) pushV2Repository(ctx context.Context) (err error) {
-	if namedTagged, isNamedTagged := p.ref.(reference.NamedTagged); isNamedTagged {
-		imageID, err := p.config.ReferenceStore.Get(p.ref)
-		if err != nil {
-			return fmt.Errorf("tag does not exist: %s", p.ref.String())
-		}
-
-		return p.pushV2Tag(ctx, namedTagged, imageID)
-	}
-
-	if !reference.IsNameOnly(p.ref) {
-		return errors.New("cannot push a digest reference")
-	}
-
-	// Pull all tags
-	pushed := 0
-	for _, association := range p.config.ReferenceStore.ReferencesByName(p.ref) {
-		if namedTagged, isNamedTagged := association.Ref.(reference.NamedTagged); isNamedTagged {
-			pushed++
-			if err := p.pushV2Tag(ctx, namedTagged, association.ID); err != nil {
-				return err
-			}
-		}
-	}
-
-	if pushed == 0 {
-		return fmt.Errorf("no tags to push for %s", p.repoInfo.Name())
-	}
-
-	return nil
-}
-
-func (p *v2Pusher) pushV2Tag(ctx context.Context, ref reference.NamedTagged, id digest.Digest) error {
-	logrus.Debugf("Pushing repository: %s", ref.String())
-
-	imgConfig, err := p.config.ImageStore.Get(id)
-	if err != nil {
-		return fmt.Errorf("could not find image from tag %s: %v", ref.String(), err)
-	}
-
-	rootfs, err := p.config.ImageStore.RootFSFromConfig(imgConfig)
-	if err != nil {
-		return fmt.Errorf("unable to get rootfs for image %s: %s", ref.String(), err)
-	}
-
-	l, err := p.config.LayerStore.Get(rootfs.ChainID())
-	if err != nil {
-		return fmt.Errorf("failed to get top layer from image: %v", err)
-	}
-	defer l.Release()
-
-	hmacKey, err := metadata.ComputeV2MetadataHMACKey(p.config.AuthConfig)
-	if err != nil {
-		return fmt.Errorf("failed to compute hmac key of auth config: %v", err)
-	}
-
-	var descriptors []xfer.UploadDescriptor
-
-	descriptorTemplate := v2PushDescriptor{
-		v2MetadataService: p.v2MetadataService,
-		hmacKey:           hmacKey,
-		repoInfo:          p.repoInfo,
-		ref:               p.ref,
-		repo:              p.repo,
-		pushState:         &p.pushState,
-	}
-
-	// Loop bounds condition is to avoid pushing the base layer on Windows.
-	for i := 0; i < len(rootfs.DiffIDs); i++ {
-		descriptor := descriptorTemplate
-		descriptor.layer = l
-		descriptor.checkedDigests = make(map[digest.Digest]struct{})
-		descriptors = append(descriptors, &descriptor)
-
-		l = l.Parent()
-	}
-
-	if err := p.config.UploadManager.Upload(ctx, descriptors, p.config.ProgressOutput); err != nil {
-		return err
-	}
-
-	// Try schema2 first
-	builder := schema2.NewManifestBuilder(p.repo.Blobs(ctx), p.config.ConfigMediaType, imgConfig)
-	manifest, err := manifestFromBuilder(ctx, builder, descriptors)
-	if err != nil {
-		return err
-	}
-
-	manSvc, err := p.repo.Manifests(ctx)
-	if err != nil {
-		return err
-	}
-
-	putOptions := []distribution.ManifestServiceOption{distribution.WithTag(ref.Tag())}
-	if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
-		if runtime.GOOS == "windows" || p.config.TrustKey == nil || p.config.RequireSchema2 {
-			logrus.Warnf("failed to upload schema2 manifest: %v", err)
-			return err
-		}
-
-		logrus.Warnf("failed to upload schema2 manifest: %v - falling back to schema1", err)
-
-		manifestRef, err := distreference.WithTag(p.repo.Named(), ref.Tag())
-		if err != nil {
-			return err
-		}
-		builder = schema1.NewConfigManifestBuilder(p.repo.Blobs(ctx), p.config.TrustKey, manifestRef, imgConfig)
-		manifest, err = manifestFromBuilder(ctx, builder, descriptors)
-		if err != nil {
-			return err
-		}
-
-		if _, err = manSvc.Put(ctx, manifest, putOptions...); err != nil {
-			return err
-		}
-	}
-
-	var canonicalManifest []byte
-
-	switch v := manifest.(type) {
-	case *schema1.SignedManifest:
-		canonicalManifest = v.Canonical
-	case *schema2.DeserializedManifest:
-		_, canonicalManifest, err = v.Payload()
-		if err != nil {
-			return err
-		}
-	}
-
-	manifestDigest := digest.FromBytes(canonicalManifest)
-	progress.Messagef(p.config.ProgressOutput, "", "%s: digest: %s size: %d", ref.Tag(), manifestDigest, len(canonicalManifest))
-
-	if err := addDigestReference(p.config.ReferenceStore, ref, manifestDigest, id); err != nil {
-		return err
-	}
-
-	// Signal digest to the trust client so it can sign the
-	// push, if appropriate.
-	progress.Aux(p.config.ProgressOutput, PushResult{Tag: ref.Tag(), Digest: manifestDigest, Size: len(canonicalManifest)})
-
-	return nil
-}
-
-func manifestFromBuilder(ctx context.Context, builder distribution.ManifestBuilder, descriptors []xfer.UploadDescriptor) (distribution.Manifest, error) {
-	// descriptors is in reverse order; iterate backwards to get references
-	// appended in the right order.
-	for i := len(descriptors) - 1; i >= 0; i-- {
-		if err := builder.AppendReference(descriptors[i].(*v2PushDescriptor)); err != nil {
-			return nil, err
-		}
-	}
-
-	return builder.Build(ctx)
-}
-
-type v2PushDescriptor struct {
-	layer             PushLayer
-	v2MetadataService metadata.V2MetadataService
-	hmacKey           []byte
-	repoInfo          reference.Named
-	ref               reference.Named
-	repo              distribution.Repository
-	pushState         *pushState
-	remoteDescriptor  distribution.Descriptor
-	// a set of digests whose presence has been checked in a target repository
-	checkedDigests map[digest.Digest]struct{}
-}
-
-func (pd *v2PushDescriptor) Key() string {
-	return "v2push:" + pd.ref.FullName() + " " + pd.layer.DiffID().String()
-}
-
-func (pd *v2PushDescriptor) ID() string {
-	return stringid.TruncateID(pd.layer.DiffID().String())
-}
-
-func (pd *v2PushDescriptor) DiffID() layer.DiffID {
-	return pd.layer.DiffID()
-}
-
-func (pd *v2PushDescriptor) Upload(ctx context.Context, progressOutput progress.Output) (distribution.Descriptor, error) {
-	if fs, ok := pd.layer.(distribution.Describable); ok {
-		if d := fs.Descriptor(); len(d.URLs) > 0 {
-			progress.Update(progressOutput, pd.ID(), "Skipped foreign layer")
-			return d, nil
-		}
-	}
-
-	diffID := pd.DiffID()
-
-	pd.pushState.Lock()
-	if descriptor, ok := pd.pushState.remoteLayers[diffID]; ok {
-		// it is already known that the push is not needed and
-		// therefore doing a stat is unnecessary
-		pd.pushState.Unlock()
-		progress.Update(progressOutput, pd.ID(), "Layer already exists")
-		return descriptor, nil
-	}
-	pd.pushState.Unlock()
-
-	maxMountAttempts, maxExistenceChecks, checkOtherRepositories := getMaxMountAndExistenceCheckAttempts(pd.layer)
-
-	// Do we have any metadata associated with this layer's DiffID?
-	v2Metadata, err := pd.v2MetadataService.GetMetadata(diffID)
-	if err == nil {
-		// check for blob existence in the target repository if we have a mapping with it
-		descriptor, exists, err := pd.layerAlreadyExists(ctx, progressOutput, diffID, false, 1, v2Metadata)
-		if exists || err != nil {
-			return descriptor, err
-		}
-	}
-
-	// if digest was empty or not saved, or if blob does not exist on the remote repository,
-	// then push the blob.
-	bs := pd.repo.Blobs(ctx)
-
-	var layerUpload distribution.BlobWriter
-
-	// Attempt to find another repository in the same registry to mount the layer from to avoid an unnecessary upload
-	candidates := getRepositoryMountCandidates(pd.repoInfo, pd.hmacKey, maxMountAttempts, v2Metadata)
-	for _, mountCandidate := range candidates {
-		logrus.Debugf("attempting to mount layer %s (%s) from %s", diffID, mountCandidate.Digest, mountCandidate.SourceRepository)
-		createOpts := []distribution.BlobCreateOption{}
-
-		if len(mountCandidate.SourceRepository) > 0 {
-			namedRef, err := reference.WithName(mountCandidate.SourceRepository)
-			if err != nil {
-				logrus.Errorf("failed to parse source repository reference %v: %v", namedRef.String(), err)
-				pd.v2MetadataService.Remove(mountCandidate)
-				continue
-			}
-
-			// TODO (brianbland): We need to construct a reference where the Name is
-			// only the full remote name, so clean this up when distribution has a
-			// richer reference package
-			remoteRef, err := distreference.WithName(namedRef.RemoteName())
-			if err != nil {
-				logrus.Errorf("failed to make remote reference out of %q: %v", namedRef.RemoteName(), namedRef.RemoteName())
-				continue
-			}
-
-			canonicalRef, err := distreference.WithDigest(distreference.TrimNamed(remoteRef), mountCandidate.Digest)
-			if err != nil {
-				logrus.Errorf("failed to make canonical reference: %v", err)
-				continue
-			}
-
-			createOpts = append(createOpts, client.WithMountFrom(canonicalRef))
-		}
-
-		// send the layer
-		lu, err := bs.Create(ctx, createOpts...)
-		switch err := err.(type) {
-		case nil:
-			// noop
-		case distribution.ErrBlobMounted:
-			progress.Updatef(progressOutput, pd.ID(), "Mounted from %s", err.From.Name())
-
-			err.Descriptor.MediaType = schema2.MediaTypeLayer
-
-			pd.pushState.Lock()
-			pd.pushState.confirmedV2 = true
-			pd.pushState.remoteLayers[diffID] = err.Descriptor
-			pd.pushState.Unlock()
-
-			// Cache mapping from this layer's DiffID to the blobsum
-			if err := pd.v2MetadataService.TagAndAdd(diffID, pd.hmacKey, metadata.V2Metadata{
-				Digest:           err.Descriptor.Digest,
-				SourceRepository: pd.repoInfo.FullName(),
-			}); err != nil {
-				return distribution.Descriptor{}, xfer.DoNotRetry{Err: err}
-			}
-			return err.Descriptor, nil
-		default:
-			logrus.Infof("failed to mount layer %s (%s) from %s: %v", diffID, mountCandidate.Digest, mountCandidate.SourceRepository, err)
-		}
-
-		if len(mountCandidate.SourceRepository) > 0 &&
-			(metadata.CheckV2MetadataHMAC(&mountCandidate, pd.hmacKey) ||
-				len(mountCandidate.HMAC) == 0) {
-			cause := "blob mount failure"
-			if err != nil {
-				cause = fmt.Sprintf("an error: %v", err.Error())
-			}
-			logrus.Debugf("removing association between layer %s and %s due to %s", mountCandidate.Digest, mountCandidate.SourceRepository, cause)
-			pd.v2MetadataService.Remove(mountCandidate)
-		}
-
-		if lu != nil {
-			// cancel previous upload
-			cancelLayerUpload(ctx, mountCandidate.Digest, layerUpload)
-			layerUpload = lu
-		}
-	}
-
-	if maxExistenceChecks-len(pd.checkedDigests) > 0 {
-		// do additional layer existence checks with other known digests if any
-		descriptor, exists, err := pd.layerAlreadyExists(ctx, progressOutput, diffID, checkOtherRepositories, maxExistenceChecks-len(pd.checkedDigests), v2Metadata)
-		if exists || err != nil {
-			return descriptor, err
-		}
-	}
-
-	logrus.Debugf("Pushing layer: %s", diffID)
-	if layerUpload == nil {
-		layerUpload, err = bs.Create(ctx)
-		if err != nil {
-			return distribution.Descriptor{}, retryOnError(err)
-		}
-	}
-	defer layerUpload.Close()
-
-	// upload the blob
-	desc, err := pd.uploadUsingSession(ctx, progressOutput, diffID, layerUpload)
-	if err != nil {
-		return desc, err
-	}
-
-	return desc, nil
-}
-
-func (pd *v2PushDescriptor) SetRemoteDescriptor(descriptor distribution.Descriptor) {
-	pd.remoteDescriptor = descriptor
-}
-
-func (pd *v2PushDescriptor) Descriptor() distribution.Descriptor {
-	return pd.remoteDescriptor
-}
-
-func (pd *v2PushDescriptor) uploadUsingSession(
-	ctx context.Context,
-	progressOutput progress.Output,
-	diffID layer.DiffID,
-	layerUpload distribution.BlobWriter,
-) (distribution.Descriptor, error) {
-	var reader io.ReadCloser
-
-	contentReader, err := pd.layer.Open()
-	size, _ := pd.layer.Size()
-
-	reader = progress.NewProgressReader(ioutils.NewCancelReadCloser(ctx, contentReader), progressOutput, size, pd.ID(), "Pushing")
-
-	switch m := pd.layer.MediaType(); m {
-	case schema2.MediaTypeUncompressedLayer:
-		compressedReader, compressionDone := compress(reader)
-		defer func(closer io.Closer) {
-			closer.Close()
-			<-compressionDone
-		}(reader)
-		reader = compressedReader
-	case schema2.MediaTypeLayer:
-	default:
-		reader.Close()
-		return distribution.Descriptor{}, fmt.Errorf("unsupported layer media type %s", m)
-	}
-
-	digester := digest.Canonical.New()
-	tee := io.TeeReader(reader, digester.Hash())
-
-	nn, err := layerUpload.ReadFrom(tee)
-	reader.Close()
-	if err != nil {
-		return distribution.Descriptor{}, retryOnError(err)
-	}
-
-	pushDigest := digester.Digest()
-	if _, err := layerUpload.Commit(ctx, distribution.Descriptor{Digest: pushDigest}); err != nil {
-		return distribution.Descriptor{}, retryOnError(err)
-	}
-
-	logrus.Debugf("uploaded layer %s (%s), %d bytes", diffID, pushDigest, nn)
-	progress.Update(progressOutput, pd.ID(), "Pushed")
-
-	// Cache mapping from this layer's DiffID to the blobsum
-	if err := pd.v2MetadataService.TagAndAdd(diffID, pd.hmacKey, metadata.V2Metadata{
-		Digest:           pushDigest,
-		SourceRepository: pd.repoInfo.FullName(),
-	}); err != nil {
-		return distribution.Descriptor{}, xfer.DoNotRetry{Err: err}
-	}
-
-	desc := distribution.Descriptor{
-		Digest:    pushDigest,
-		MediaType: schema2.MediaTypeLayer,
-		Size:      nn,
-	}
-
-	pd.pushState.Lock()
-	// If Commit succeeded, that's an indication that the remote registry speaks the v2 protocol.
-	pd.pushState.confirmedV2 = true
-	pd.pushState.remoteLayers[diffID] = desc
-	pd.pushState.Unlock()
-
-	return desc, nil
-}
-
-// layerAlreadyExists checks if the registry already knows about any of the metadata passed in the "metadata"
-// slice. If it finds one that the registry knows about, it returns the known digest and "true". If
-// "checkOtherRepositories" is true, stat will be performed also with digests mapped to any other repository
-// (not just the target one).
-func (pd *v2PushDescriptor) layerAlreadyExists(
-	ctx context.Context,
-	progressOutput progress.Output,
-	diffID layer.DiffID,
-	checkOtherRepositories bool,
-	maxExistenceCheckAttempts int,
-	v2Metadata []metadata.V2Metadata,
-) (desc distribution.Descriptor, exists bool, err error) {
-	// filter the metadata
-	candidates := []metadata.V2Metadata{}
-	for _, meta := range v2Metadata {
-		if len(meta.SourceRepository) > 0 && !checkOtherRepositories && meta.SourceRepository != pd.repoInfo.FullName() {
-			continue
-		}
-		candidates = append(candidates, meta)
-	}
-	// sort the candidates by similarity
-	sortV2MetadataByLikenessAndAge(pd.repoInfo, pd.hmacKey, candidates)
-
-	digestToMetadata := make(map[digest.Digest]*metadata.V2Metadata)
-	// an array of unique blob digests ordered from the best mount candidates to worst
-	layerDigests := []digest.Digest{}
-	for i := 0; i < len(candidates); i++ {
-		if len(layerDigests) >= maxExistenceCheckAttempts {
-			break
-		}
-		meta := &candidates[i]
-		if _, exists := digestToMetadata[meta.Digest]; exists {
-			// keep reference just to the first mapping (the best mount candidate)
-			continue
-		}
-		if _, exists := pd.checkedDigests[meta.Digest]; exists {
-			// existence of this digest has already been tested
-			continue
-		}
-		digestToMetadata[meta.Digest] = meta
-		layerDigests = append(layerDigests, meta.Digest)
-	}
-
-attempts:
-	for _, dgst := range layerDigests {
-		meta := digestToMetadata[dgst]
-		logrus.Debugf("Checking for presence of layer %s (%s) in %s", diffID, dgst, pd.repoInfo.FullName())
-		desc, err = pd.repo.Blobs(ctx).Stat(ctx, dgst)
-		pd.checkedDigests[meta.Digest] = struct{}{}
-		switch err {
-		case nil:
-			if m, ok := digestToMetadata[desc.Digest]; !ok || m.SourceRepository != pd.repoInfo.FullName() || !metadata.CheckV2MetadataHMAC(m, pd.hmacKey) {
-				// cache mapping from this layer's DiffID to the blobsum
-				if err := pd.v2MetadataService.TagAndAdd(diffID, pd.hmacKey, metadata.V2Metadata{
-					Digest:           desc.Digest,
-					SourceRepository: pd.repoInfo.FullName(),
-				}); err != nil {
-					return distribution.Descriptor{}, false, xfer.DoNotRetry{Err: err}
-				}
-			}
-			desc.MediaType = schema2.MediaTypeLayer
-			exists = true
-			break attempts
-		case distribution.ErrBlobUnknown:
-			if meta.SourceRepository == pd.repoInfo.FullName() {
-				// remove the mapping to the target repository
-				pd.v2MetadataService.Remove(*meta)
-			}
-		default:
-			logrus.WithError(err).Debugf("Failed to check for presence of layer %s (%s) in %s", diffID, dgst, pd.repoInfo.FullName())
-		}
-	}
-
-	if exists {
-		progress.Update(progressOutput, pd.ID(), "Layer already exists")
-		pd.pushState.Lock()
-		pd.pushState.remoteLayers[diffID] = desc
-		pd.pushState.Unlock()
-	}
-
-	return desc, exists, nil
-}
-
-// getMaxMountAndExistenceCheckAttempts returns a maximum number of cross repository mount attempts from
-// source repositories of target registry, maximum number of layer existence checks performed on the target
-// repository and whether the check shall be done also with digests mapped to different repositories. The
-// decision is based on layer size. The smaller the layer, the fewer attempts shall be made because the cost
-// of upload does not outweigh a latency.
-func getMaxMountAndExistenceCheckAttempts(layer PushLayer) (maxMountAttempts, maxExistenceCheckAttempts int, checkOtherRepositories bool) {
-	size, err := layer.Size()
-	switch {
-	// big blob
-	case size > middleLayerMaximumSize:
-		// 1st attempt to mount the blob few times
-		// 2nd few existence checks with digests associated to any repository
-		// then fallback to upload
-		return 4, 3, true
-
-	// middle sized blobs; if we could not get the size, assume we deal with middle sized blob
-	case size > smallLayerMaximumSize, err != nil:
-		// 1st attempt to mount blobs of average size few times
-		// 2nd try at most 1 existence check if there's an existing mapping to the target repository
-		// then fallback to upload
-		return 3, 1, false
-
-	// small blobs, do a minimum number of checks
-	default:
-		return 1, 1, false
-	}
-}
-
-// getRepositoryMountCandidates returns an array of v2 metadata items belonging to the given registry. The
-// array is sorted from youngest to oldest. If requireReigstryMatch is true, the resulting array will contain
-// only metadata entries having registry part of SourceRepository matching the part of repoInfo.
-func getRepositoryMountCandidates(
-	repoInfo reference.Named,
-	hmacKey []byte,
-	max int,
-	v2Metadata []metadata.V2Metadata,
-) []metadata.V2Metadata {
-	candidates := []metadata.V2Metadata{}
-	for _, meta := range v2Metadata {
-		sourceRepo, err := reference.ParseNamed(meta.SourceRepository)
-		if err != nil || repoInfo.Hostname() != sourceRepo.Hostname() {
-			continue
-		}
-		// target repository is not a viable candidate
-		if meta.SourceRepository == repoInfo.FullName() {
-			continue
-		}
-		candidates = append(candidates, meta)
-	}
-
-	sortV2MetadataByLikenessAndAge(repoInfo, hmacKey, candidates)
-	if max >= 0 && len(candidates) > max {
-		// select the youngest metadata
-		candidates = candidates[:max]
-	}
-
-	return candidates
-}
-
-// byLikeness is a sorting container for v2 metadata candidates for cross repository mount. The
-// candidate "a" is preferred over "b":
-//
-//  1. if it was hashed using the same AuthConfig as the one used to authenticate to target repository and the
-//     "b" was not
-//  2. if a number of its repository path components exactly matching path components of target repository is higher
-type byLikeness struct {
-	arr            []metadata.V2Metadata
-	hmacKey        []byte
-	pathComponents []string
-}
-
-func (bla byLikeness) Less(i, j int) bool {
-	aMacMatch := metadata.CheckV2MetadataHMAC(&bla.arr[i], bla.hmacKey)
-	bMacMatch := metadata.CheckV2MetadataHMAC(&bla.arr[j], bla.hmacKey)
-	if aMacMatch != bMacMatch {
-		return aMacMatch
-	}
-	aMatch := numOfMatchingPathComponents(bla.arr[i].SourceRepository, bla.pathComponents)
-	bMatch := numOfMatchingPathComponents(bla.arr[j].SourceRepository, bla.pathComponents)
-	return aMatch > bMatch
-}
-func (bla byLikeness) Swap(i, j int) {
-	bla.arr[i], bla.arr[j] = bla.arr[j], bla.arr[i]
-}
-func (bla byLikeness) Len() int { return len(bla.arr) }
-
-func sortV2MetadataByLikenessAndAge(repoInfo reference.Named, hmacKey []byte, marr []metadata.V2Metadata) {
-	// reverse the metadata array to shift the newest entries to the beginning
-	for i := 0; i < len(marr)/2; i++ {
-		marr[i], marr[len(marr)-i-1] = marr[len(marr)-i-1], marr[i]
-	}
-	// keep equal entries ordered from the youngest to the oldest
-	sort.Stable(byLikeness{
-		arr:            marr,
-		hmacKey:        hmacKey,
-		pathComponents: getPathComponents(repoInfo.FullName()),
-	})
-}
-
-// numOfMatchingPathComponents returns a number of path components in "pth" that exactly match "matchComponents".
-func numOfMatchingPathComponents(pth string, matchComponents []string) int {
-	pthComponents := getPathComponents(pth)
-	i := 0
-	for ; i < len(pthComponents) && i < len(matchComponents); i++ {
-		if matchComponents[i] != pthComponents[i] {
-			return i
-		}
-	}
-	return i
-}
-
-func getPathComponents(path string) []string {
-	// make sure to add docker.io/ prefix to the path
-	named, err := reference.ParseNamed(path)
-	if err == nil {
-		path = named.FullName()
-	}
-	return strings.Split(path, "/")
-}
-
-func cancelLayerUpload(ctx context.Context, dgst digest.Digest, layerUpload distribution.BlobWriter) {
-	if layerUpload != nil {
-		logrus.Debugf("cancelling upload of blob %s", dgst)
-		err := layerUpload.Cancel(ctx)
-		if err != nil {
-			logrus.Warnf("failed to cancel upload: %v", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/push_v2_test.go b/installer/vendor/github.com/docker/docker/distribution/push_v2_test.go
deleted file mode 100644
index 6a5216b1d0..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/push_v2_test.go
+++ /dev/null
@@ -1,579 +0,0 @@
-package distribution
-
-import (
-	"net/http"
-	"reflect"
-	"testing"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/context"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema2"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-)
-
-func TestGetRepositoryMountCandidates(t *testing.T) {
-	for _, tc := range []struct {
-		name          string
-		hmacKey       string
-		targetRepo    string
-		maxCandidates int
-		metadata      []metadata.V2Metadata
-		candidates    []metadata.V2Metadata
-	}{
-		{
-			name:          "empty metadata",
-			targetRepo:    "busybox",
-			maxCandidates: -1,
-			metadata:      []metadata.V2Metadata{},
-			candidates:    []metadata.V2Metadata{},
-		},
-		{
-			name:          "one item not matching",
-			targetRepo:    "busybox",
-			maxCandidates: -1,
-			metadata:      []metadata.V2Metadata{taggedMetadata("key", "dgst", "127.0.0.1/repo")},
-			candidates:    []metadata.V2Metadata{},
-		},
-		{
-			name:          "one item matching",
-			targetRepo:    "busybox",
-			maxCandidates: -1,
-			metadata:      []metadata.V2Metadata{taggedMetadata("hash", "1", "hello-world")},
-			candidates:    []metadata.V2Metadata{taggedMetadata("hash", "1", "hello-world")},
-		},
-		{
-			name:          "allow missing SourceRepository",
-			targetRepo:    "busybox",
-			maxCandidates: -1,
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("1")},
-				{Digest: digest.Digest("3")},
-				{Digest: digest.Digest("2")},
-			},
-			candidates: []metadata.V2Metadata{},
-		},
-		{
-			name:          "handle docker.io",
-			targetRepo:    "user/app",
-			maxCandidates: -1,
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("1"), SourceRepository: "docker.io/user/foo"},
-				{Digest: digest.Digest("3"), SourceRepository: "user/bar"},
-				{Digest: digest.Digest("2"), SourceRepository: "app"},
-			},
-			candidates: []metadata.V2Metadata{
-				{Digest: digest.Digest("3"), SourceRepository: "user/bar"},
-				{Digest: digest.Digest("1"), SourceRepository: "docker.io/user/foo"},
-				{Digest: digest.Digest("2"), SourceRepository: "app"},
-			},
-		},
-		{
-			name:          "sort more items",
-			hmacKey:       "abcd",
-			targetRepo:    "127.0.0.1/foo/bar",
-			maxCandidates: -1,
-			metadata: []metadata.V2Metadata{
-				taggedMetadata("hash", "1", "hello-world"),
-				taggedMetadata("efgh", "2", "127.0.0.1/hello-world"),
-				taggedMetadata("abcd", "3", "busybox"),
-				taggedMetadata("hash", "4", "busybox"),
-				taggedMetadata("hash", "5", "127.0.0.1/foo"),
-				taggedMetadata("hash", "6", "127.0.0.1/bar"),
-				taggedMetadata("efgh", "7", "127.0.0.1/foo/bar"),
-				taggedMetadata("abcd", "8", "127.0.0.1/xyz"),
-				taggedMetadata("hash", "9", "127.0.0.1/foo/app"),
-			},
-			candidates: []metadata.V2Metadata{
-				// first by matching hash
-				taggedMetadata("abcd", "8", "127.0.0.1/xyz"),
-				// then by longest matching prefix
-				taggedMetadata("hash", "9", "127.0.0.1/foo/app"),
-				taggedMetadata("hash", "5", "127.0.0.1/foo"),
-				// sort the rest of the matching items in reversed order
-				taggedMetadata("hash", "6", "127.0.0.1/bar"),
-				taggedMetadata("efgh", "2", "127.0.0.1/hello-world"),
-			},
-		},
-		{
-			name:          "limit max candidates",
-			hmacKey:       "abcd",
-			targetRepo:    "user/app",
-			maxCandidates: 3,
-			metadata: []metadata.V2Metadata{
-				taggedMetadata("abcd", "1", "user/app1"),
-				taggedMetadata("abcd", "2", "user/app/base"),
-				taggedMetadata("hash", "3", "user/app"),
-				taggedMetadata("abcd", "4", "127.0.0.1/user/app"),
-				taggedMetadata("hash", "5", "user/foo"),
-				taggedMetadata("hash", "6", "app/bar"),
-			},
-			candidates: []metadata.V2Metadata{
-				// first by matching hash
-				taggedMetadata("abcd", "2", "user/app/base"),
-				taggedMetadata("abcd", "1", "user/app1"),
-				// then by longest matching prefix
-				taggedMetadata("hash", "3", "user/app"),
-			},
-		},
-	} {
-		repoInfo, err := reference.ParseNamed(tc.targetRepo)
-		if err != nil {
-			t.Fatalf("[%s] failed to parse reference name: %v", tc.name, err)
-		}
-		candidates := getRepositoryMountCandidates(repoInfo, []byte(tc.hmacKey), tc.maxCandidates, tc.metadata)
-		if len(candidates) != len(tc.candidates) {
-			t.Errorf("[%s] got unexpected number of candidates: %d != %d", tc.name, len(candidates), len(tc.candidates))
-		}
-		for i := 0; i < len(candidates) && i < len(tc.candidates); i++ {
-			if !reflect.DeepEqual(candidates[i], tc.candidates[i]) {
-				t.Errorf("[%s] candidate %d does not match expected: %#+v != %#+v", tc.name, i, candidates[i], tc.candidates[i])
-			}
-		}
-		for i := len(candidates); i < len(tc.candidates); i++ {
-			t.Errorf("[%s] missing expected candidate at position %d (%#+v)", tc.name, i, tc.candidates[i])
-		}
-		for i := len(tc.candidates); i < len(candidates); i++ {
-			t.Errorf("[%s] got unexpected candidate at position %d (%#+v)", tc.name, i, candidates[i])
-		}
-	}
-}
-
-func TestLayerAlreadyExists(t *testing.T) {
-	for _, tc := range []struct {
-		name                   string
-		metadata               []metadata.V2Metadata
-		targetRepo             string
-		hmacKey                string
-		maxExistenceChecks     int
-		checkOtherRepositories bool
-		remoteBlobs            map[digest.Digest]distribution.Descriptor
-		remoteErrors           map[digest.Digest]error
-		expectedDescriptor     distribution.Descriptor
-		expectedExists         bool
-		expectedError          error
-		expectedRequests       []string
-		expectedAdditions      []metadata.V2Metadata
-		expectedRemovals       []metadata.V2Metadata
-	}{
-		{
-			name:                   "empty metadata",
-			targetRepo:             "busybox",
-			maxExistenceChecks:     3,
-			checkOtherRepositories: true,
-		},
-		{
-			name:               "single not existent metadata",
-			targetRepo:         "busybox",
-			metadata:           []metadata.V2Metadata{{Digest: digest.Digest("pear"), SourceRepository: "docker.io/library/busybox"}},
-			maxExistenceChecks: 3,
-			expectedRequests:   []string{"pear"},
-			expectedRemovals:   []metadata.V2Metadata{{Digest: digest.Digest("pear"), SourceRepository: "docker.io/library/busybox"}},
-		},
-		{
-			name:               "access denied",
-			targetRepo:         "busybox",
-			maxExistenceChecks: 1,
-			metadata:           []metadata.V2Metadata{{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/busybox"}},
-			remoteErrors:       map[digest.Digest]error{digest.Digest("apple"): distribution.ErrAccessDenied},
-			expectedError:      nil,
-			expectedRequests:   []string{"apple"},
-		},
-		{
-			name:               "not matching reposies",
-			targetRepo:         "busybox",
-			maxExistenceChecks: 3,
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/hello-world"},
-				{Digest: digest.Digest("orange"), SourceRepository: "docker.io/library/busybox/subapp"},
-				{Digest: digest.Digest("pear"), SourceRepository: "docker.io/busybox"},
-				{Digest: digest.Digest("plum"), SourceRepository: "busybox"},
-				{Digest: digest.Digest("banana"), SourceRepository: "127.0.0.1/busybox"},
-			},
-		},
-		{
-			name:                   "check other repositories",
-			targetRepo:             "busybox",
-			maxExistenceChecks:     10,
-			checkOtherRepositories: true,
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/hello-world"},
-				{Digest: digest.Digest("orange"), SourceRepository: "docker.io/library/busybox/subapp"},
-				{Digest: digest.Digest("pear"), SourceRepository: "docker.io/busybox"},
-				{Digest: digest.Digest("plum"), SourceRepository: "busybox"},
-				{Digest: digest.Digest("banana"), SourceRepository: "127.0.0.1/busybox"},
-			},
-			expectedRequests: []string{"plum", "pear", "apple", "orange", "banana"},
-		},
-		{
-			name:               "find existing blob",
-			targetRepo:         "busybox",
-			metadata:           []metadata.V2Metadata{{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/busybox"}},
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("apple"): {Digest: digest.Digest("apple")}},
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("apple"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"apple"},
-		},
-		{
-			name:               "find existing blob with different hmac",
-			targetRepo:         "busybox",
-			metadata:           []metadata.V2Metadata{{SourceRepository: "docker.io/library/busybox", Digest: digest.Digest("apple"), HMAC: "dummyhmac"}},
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("apple"): {Digest: digest.Digest("apple")}},
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("apple"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"apple"},
-			expectedAdditions:  []metadata.V2Metadata{{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/busybox"}},
-		},
-		{
-			name:               "overwrite media types",
-			targetRepo:         "busybox",
-			metadata:           []metadata.V2Metadata{{Digest: digest.Digest("apple"), SourceRepository: "docker.io/library/busybox"}},
-			hmacKey:            "key",
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("apple"): {Digest: digest.Digest("apple"), MediaType: "custom-media-type"}},
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("apple"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"apple"},
-			expectedAdditions:  []metadata.V2Metadata{taggedMetadata("key", "apple", "docker.io/library/busybox")},
-		},
-		{
-			name:       "find existing blob among many",
-			targetRepo: "127.0.0.1/myapp",
-			hmacKey:    "key",
-			metadata: []metadata.V2Metadata{
-				taggedMetadata("someotherkey", "pear", "127.0.0.1/myapp"),
-				taggedMetadata("key", "apple", "127.0.0.1/myapp"),
-				taggedMetadata("", "plum", "127.0.0.1/myapp"),
-			},
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("pear"): {Digest: digest.Digest("pear")}},
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("pear"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"apple", "plum", "pear"},
-			expectedAdditions:  []metadata.V2Metadata{taggedMetadata("key", "pear", "127.0.0.1/myapp")},
-			expectedRemovals: []metadata.V2Metadata{
-				taggedMetadata("key", "apple", "127.0.0.1/myapp"),
-				{Digest: digest.Digest("plum"), SourceRepository: "127.0.0.1/myapp"},
-			},
-		},
-		{
-			name:       "reach maximum existence checks",
-			targetRepo: "user/app",
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("pear"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("apple"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("plum"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("banana"), SourceRepository: "docker.io/user/app"},
-			},
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("pear"): {Digest: digest.Digest("pear")}},
-			expectedExists:     false,
-			expectedRequests:   []string{"banana", "plum", "apple"},
-			expectedRemovals: []metadata.V2Metadata{
-				{Digest: digest.Digest("banana"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("plum"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("apple"), SourceRepository: "docker.io/user/app"},
-			},
-		},
-		{
-			name:       "zero allowed existence checks",
-			targetRepo: "user/app",
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("pear"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("apple"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("plum"), SourceRepository: "docker.io/user/app"},
-				{Digest: digest.Digest("banana"), SourceRepository: "docker.io/user/app"},
-			},
-			maxExistenceChecks: 0,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("pear"): {Digest: digest.Digest("pear")}},
-		},
-		{
-			name:       "stat single digest just once",
-			targetRepo: "busybox",
-			metadata: []metadata.V2Metadata{
-				taggedMetadata("key1", "pear", "docker.io/library/busybox"),
-				taggedMetadata("key2", "apple", "docker.io/library/busybox"),
-				taggedMetadata("key3", "apple", "docker.io/library/busybox"),
-			},
-			maxExistenceChecks: 3,
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("pear"): {Digest: digest.Digest("pear")}},
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("pear"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"apple", "pear"},
-			expectedAdditions:  []metadata.V2Metadata{{Digest: digest.Digest("pear"), SourceRepository: "docker.io/library/busybox"}},
-			expectedRemovals:   []metadata.V2Metadata{taggedMetadata("key3", "apple", "docker.io/library/busybox")},
-		},
-		{
-			name:       "don't stop on first error",
-			targetRepo: "user/app",
-			hmacKey:    "key",
-			metadata: []metadata.V2Metadata{
-				taggedMetadata("key", "banana", "docker.io/user/app"),
-				taggedMetadata("key", "orange", "docker.io/user/app"),
-				taggedMetadata("key", "plum", "docker.io/user/app"),
-			},
-			maxExistenceChecks: 3,
-			remoteErrors:       map[digest.Digest]error{"orange": distribution.ErrAccessDenied},
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("apple"): {}},
-			expectedError:      nil,
-			expectedRequests:   []string{"plum", "orange", "banana"},
-			expectedRemovals: []metadata.V2Metadata{
-				taggedMetadata("key", "plum", "docker.io/user/app"),
-				taggedMetadata("key", "banana", "docker.io/user/app"),
-			},
-		},
-		{
-			name:       "remove outdated metadata",
-			targetRepo: "docker.io/user/app",
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("plum"), SourceRepository: "docker.io/library/busybox"},
-				{Digest: digest.Digest("orange"), SourceRepository: "docker.io/user/app"},
-			},
-			maxExistenceChecks: 3,
-			remoteErrors:       map[digest.Digest]error{"orange": distribution.ErrBlobUnknown},
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("plum"): {}},
-			expectedExists:     false,
-			expectedRequests:   []string{"orange"},
-			expectedRemovals:   []metadata.V2Metadata{{Digest: digest.Digest("orange"), SourceRepository: "docker.io/user/app"}},
-		},
-		{
-			name:       "missing SourceRepository",
-			targetRepo: "busybox",
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("1")},
-				{Digest: digest.Digest("3")},
-				{Digest: digest.Digest("2")},
-			},
-			maxExistenceChecks: 3,
-			expectedExists:     false,
-			expectedRequests:   []string{"2", "3", "1"},
-		},
-
-		{
-			name:       "with and without SourceRepository",
-			targetRepo: "busybox",
-			metadata: []metadata.V2Metadata{
-				{Digest: digest.Digest("1")},
-				{Digest: digest.Digest("2"), SourceRepository: "docker.io/library/busybox"},
-				{Digest: digest.Digest("3")},
-			},
-			remoteBlobs:        map[digest.Digest]distribution.Descriptor{digest.Digest("1"): {Digest: digest.Digest("1")}},
-			maxExistenceChecks: 3,
-			expectedDescriptor: distribution.Descriptor{Digest: digest.Digest("1"), MediaType: schema2.MediaTypeLayer},
-			expectedExists:     true,
-			expectedRequests:   []string{"2", "3", "1"},
-			expectedAdditions:  []metadata.V2Metadata{{Digest: digest.Digest("1"), SourceRepository: "docker.io/library/busybox"}},
-			expectedRemovals: []metadata.V2Metadata{
-				{Digest: digest.Digest("2"), SourceRepository: "docker.io/library/busybox"},
-			},
-		},
-	} {
-		repoInfo, err := reference.ParseNamed(tc.targetRepo)
-		if err != nil {
-			t.Fatalf("[%s] failed to parse reference name: %v", tc.name, err)
-		}
-		repo := &mockRepo{
-			t:        t,
-			errors:   tc.remoteErrors,
-			blobs:    tc.remoteBlobs,
-			requests: []string{},
-		}
-		ctx := context.Background()
-		ms := &mockV2MetadataService{}
-		pd := &v2PushDescriptor{
-			hmacKey:  []byte(tc.hmacKey),
-			repoInfo: repoInfo,
-			layer: &storeLayer{
-				Layer: layer.EmptyLayer,
-			},
-			repo:              repo,
-			v2MetadataService: ms,
-			pushState:         &pushState{remoteLayers: make(map[layer.DiffID]distribution.Descriptor)},
-			checkedDigests:    make(map[digest.Digest]struct{}),
-		}
-
-		desc, exists, err := pd.layerAlreadyExists(ctx, &progressSink{t}, layer.EmptyLayer.DiffID(), tc.checkOtherRepositories, tc.maxExistenceChecks, tc.metadata)
-
-		if !reflect.DeepEqual(desc, tc.expectedDescriptor) {
-			t.Errorf("[%s] got unexpected descriptor: %#+v != %#+v", tc.name, desc, tc.expectedDescriptor)
-		}
-		if exists != tc.expectedExists {
-			t.Errorf("[%s] got unexpected exists: %t != %t", tc.name, exists, tc.expectedExists)
-		}
-		if !reflect.DeepEqual(err, tc.expectedError) {
-			t.Errorf("[%s] got unexpected error: %#+v != %#+v", tc.name, err, tc.expectedError)
-		}
-
-		if len(repo.requests) != len(tc.expectedRequests) {
-			t.Errorf("[%s] got unexpected number of requests: %d != %d", tc.name, len(repo.requests), len(tc.expectedRequests))
-		}
-		for i := 0; i < len(repo.requests) && i < len(tc.expectedRequests); i++ {
-			if repo.requests[i] != tc.expectedRequests[i] {
-				t.Errorf("[%s] request %d does not match expected: %q != %q", tc.name, i, repo.requests[i], tc.expectedRequests[i])
-			}
-		}
-		for i := len(repo.requests); i < len(tc.expectedRequests); i++ {
-			t.Errorf("[%s] missing expected request at position %d (%q)", tc.name, i, tc.expectedRequests[i])
-		}
-		for i := len(tc.expectedRequests); i < len(repo.requests); i++ {
-			t.Errorf("[%s] got unexpected request at position %d (%q)", tc.name, i, repo.requests[i])
-		}
-
-		if len(ms.added) != len(tc.expectedAdditions) {
-			t.Errorf("[%s] got unexpected number of additions: %d != %d", tc.name, len(ms.added), len(tc.expectedAdditions))
-		}
-		for i := 0; i < len(ms.added) && i < len(tc.expectedAdditions); i++ {
-			if ms.added[i] != tc.expectedAdditions[i] {
-				t.Errorf("[%s] added metadata at %d does not match expected: %q != %q", tc.name, i, ms.added[i], tc.expectedAdditions[i])
-			}
-		}
-		for i := len(ms.added); i < len(tc.expectedAdditions); i++ {
-			t.Errorf("[%s] missing expected addition at position %d (%q)", tc.name, i, tc.expectedAdditions[i])
-		}
-		for i := len(tc.expectedAdditions); i < len(ms.added); i++ {
-			t.Errorf("[%s] unexpected metadata addition at position %d (%q)", tc.name, i, ms.added[i])
-		}
-
-		if len(ms.removed) != len(tc.expectedRemovals) {
-			t.Errorf("[%s] got unexpected number of removals: %d != %d", tc.name, len(ms.removed), len(tc.expectedRemovals))
-		}
-		for i := 0; i < len(ms.removed) && i < len(tc.expectedRemovals); i++ {
-			if ms.removed[i] != tc.expectedRemovals[i] {
-				t.Errorf("[%s] removed metadata at %d does not match expected: %q != %q", tc.name, i, ms.removed[i], tc.expectedRemovals[i])
-			}
-		}
-		for i := len(ms.removed); i < len(tc.expectedRemovals); i++ {
-			t.Errorf("[%s] missing expected removal at position %d (%q)", tc.name, i, tc.expectedRemovals[i])
-		}
-		for i := len(tc.expectedRemovals); i < len(ms.removed); i++ {
-			t.Errorf("[%s] removed unexpected metadata at position %d (%q)", tc.name, i, ms.removed[i])
-		}
-	}
-}
-
-func taggedMetadata(key string, dgst string, sourceRepo string) metadata.V2Metadata {
-	meta := metadata.V2Metadata{
-		Digest:           digest.Digest(dgst),
-		SourceRepository: sourceRepo,
-	}
-
-	meta.HMAC = metadata.ComputeV2MetadataHMAC([]byte(key), &meta)
-	return meta
-}
-
-type mockRepo struct {
-	t        *testing.T
-	errors   map[digest.Digest]error
-	blobs    map[digest.Digest]distribution.Descriptor
-	requests []string
-}
-
-var _ distribution.Repository = &mockRepo{}
-
-func (m *mockRepo) Named() distreference.Named {
-	m.t.Fatalf("Named() not implemented")
-	return nil
-}
-func (m *mockRepo) Manifests(ctc context.Context, options ...distribution.ManifestServiceOption) (distribution.ManifestService, error) {
-	m.t.Fatalf("Manifests() not implemented")
-	return nil, nil
-}
-func (m *mockRepo) Tags(ctc context.Context) distribution.TagService {
-	m.t.Fatalf("Tags() not implemented")
-	return nil
-}
-func (m *mockRepo) Blobs(ctx context.Context) distribution.BlobStore {
-	return &mockBlobStore{
-		repo: m,
-	}
-}
-
-type mockBlobStore struct {
-	repo *mockRepo
-}
-
-var _ distribution.BlobStore = &mockBlobStore{}
-
-func (m *mockBlobStore) Stat(ctx context.Context, dgst digest.Digest) (distribution.Descriptor, error) {
-	m.repo.requests = append(m.repo.requests, dgst.String())
-	if err, exists := m.repo.errors[dgst]; exists {
-		return distribution.Descriptor{}, err
-	}
-	if desc, exists := m.repo.blobs[dgst]; exists {
-		return desc, nil
-	}
-	return distribution.Descriptor{}, distribution.ErrBlobUnknown
-}
-func (m *mockBlobStore) Get(ctx context.Context, dgst digest.Digest) ([]byte, error) {
-	m.repo.t.Fatal("Get() not implemented")
-	return nil, nil
-}
-
-func (m *mockBlobStore) Open(ctx context.Context, dgst digest.Digest) (distribution.ReadSeekCloser, error) {
-	m.repo.t.Fatal("Open() not implemented")
-	return nil, nil
-}
-
-func (m *mockBlobStore) Put(ctx context.Context, mediaType string, p []byte) (distribution.Descriptor, error) {
-	m.repo.t.Fatal("Put() not implemented")
-	return distribution.Descriptor{}, nil
-}
-
-func (m *mockBlobStore) Create(ctx context.Context, options ...distribution.BlobCreateOption) (distribution.BlobWriter, error) {
-	m.repo.t.Fatal("Create() not implemented")
-	return nil, nil
-}
-func (m *mockBlobStore) Resume(ctx context.Context, id string) (distribution.BlobWriter, error) {
-	m.repo.t.Fatal("Resume() not implemented")
-	return nil, nil
-}
-func (m *mockBlobStore) Delete(ctx context.Context, dgst digest.Digest) error {
-	m.repo.t.Fatal("Delete() not implemented")
-	return nil
-}
-func (m *mockBlobStore) ServeBlob(ctx context.Context, w http.ResponseWriter, r *http.Request, dgst digest.Digest) error {
-	m.repo.t.Fatalf("ServeBlob() not implemented")
-	return nil
-}
-
-type mockV2MetadataService struct {
-	added   []metadata.V2Metadata
-	removed []metadata.V2Metadata
-}
-
-var _ metadata.V2MetadataService = &mockV2MetadataService{}
-
-func (*mockV2MetadataService) GetMetadata(diffID layer.DiffID) ([]metadata.V2Metadata, error) {
-	return nil, nil
-}
-func (*mockV2MetadataService) GetDiffID(dgst digest.Digest) (layer.DiffID, error) {
-	return "", nil
-}
-func (m *mockV2MetadataService) Add(diffID layer.DiffID, metadata metadata.V2Metadata) error {
-	m.added = append(m.added, metadata)
-	return nil
-}
-func (m *mockV2MetadataService) TagAndAdd(diffID layer.DiffID, hmacKey []byte, meta metadata.V2Metadata) error {
-	meta.HMAC = metadata.ComputeV2MetadataHMAC(hmacKey, &meta)
-	m.Add(diffID, meta)
-	return nil
-}
-func (m *mockV2MetadataService) Remove(metadata metadata.V2Metadata) error {
-	m.removed = append(m.removed, metadata)
-	return nil
-}
-
-type progressSink struct {
-	t *testing.T
-}
-
-func (s *progressSink) WriteProgress(p progress.Progress) error {
-	s.t.Logf("progress update: %#+v", p)
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/registry.go b/installer/vendor/github.com/docker/docker/distribution/registry.go
deleted file mode 100644
index 95e181ded8..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/registry.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package distribution
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/manifest/schema2"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/distribution/registry/client"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/registry"
-	"github.com/docker/go-connections/sockets"
-	"golang.org/x/net/context"
-)
-
-// ImageTypes represents the schema2 config types for images
-var ImageTypes = []string{
-	schema2.MediaTypeImageConfig,
-	// Handle unexpected values from https://github.com/docker/distribution/issues/1621
-	// (see also https://github.com/docker/docker/issues/22378,
-	// https://github.com/docker/docker/issues/30083)
-	"application/octet-stream",
-	"application/json",
-	"text/html",
-	// Treat defaulted values as images, newer types cannot be implied
-	"",
-}
-
-// PluginTypes represents the schema2 config types for plugins
-var PluginTypes = []string{
-	schema2.MediaTypePluginConfig,
-}
-
-var mediaTypeClasses map[string]string
-
-func init() {
-	// initialize media type classes with all know types for
-	// plugin
-	mediaTypeClasses = map[string]string{}
-	for _, t := range ImageTypes {
-		mediaTypeClasses[t] = "image"
-	}
-	for _, t := range PluginTypes {
-		mediaTypeClasses[t] = "plugin"
-	}
-}
-
-// NewV2Repository returns a repository (v2 only). It creates an HTTP transport
-// providing timeout settings and authentication support, and also verifies the
-// remote API version.
-func NewV2Repository(ctx context.Context, repoInfo *registry.RepositoryInfo, endpoint registry.APIEndpoint, metaHeaders http.Header, authConfig *types.AuthConfig, actions ...string) (repo distribution.Repository, foundVersion bool, err error) {
-	repoName := repoInfo.FullName()
-	// If endpoint does not support CanonicalName, use the RemoteName instead
-	if endpoint.TrimHostname {
-		repoName = repoInfo.RemoteName()
-	}
-
-	direct := &net.Dialer{
-		Timeout:   30 * time.Second,
-		KeepAlive: 30 * time.Second,
-		DualStack: true,
-	}
-
-	// TODO(dmcgowan): Call close idle connections when complete, use keep alive
-	base := &http.Transport{
-		Proxy:               http.ProxyFromEnvironment,
-		Dial:                direct.Dial,
-		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig:     endpoint.TLSConfig,
-		// TODO(dmcgowan): Call close idle connections when complete and use keep alive
-		DisableKeepAlives: true,
-	}
-
-	proxyDialer, err := sockets.DialerFromEnvironment(direct)
-	if err == nil {
-		base.Dial = proxyDialer.Dial
-	}
-
-	modifiers := registry.DockerHeaders(dockerversion.DockerUserAgent(ctx), metaHeaders)
-	authTransport := transport.NewTransport(base, modifiers...)
-
-	challengeManager, foundVersion, err := registry.PingV2Registry(endpoint.URL, authTransport)
-	if err != nil {
-		transportOK := false
-		if responseErr, ok := err.(registry.PingResponseError); ok {
-			transportOK = true
-			err = responseErr.Err
-		}
-		return nil, foundVersion, fallbackError{
-			err:         err,
-			confirmedV2: foundVersion,
-			transportOK: transportOK,
-		}
-	}
-
-	if authConfig.RegistryToken != "" {
-		passThruTokenHandler := &existingTokenHandler{token: authConfig.RegistryToken}
-		modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, passThruTokenHandler))
-	} else {
-		scope := auth.RepositoryScope{
-			Repository: repoName,
-			Actions:    actions,
-			Class:      repoInfo.Class,
-		}
-
-		creds := registry.NewStaticCredentialStore(authConfig)
-		tokenHandlerOptions := auth.TokenHandlerOptions{
-			Transport:   authTransport,
-			Credentials: creds,
-			Scopes:      []auth.Scope{scope},
-			ClientID:    registry.AuthClientID,
-		}
-		tokenHandler := auth.NewTokenHandlerWithOptions(tokenHandlerOptions)
-		basicHandler := auth.NewBasicHandler(creds)
-		modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler))
-	}
-	tr := transport.NewTransport(base, modifiers...)
-
-	repoNameRef, err := distreference.ParseNamed(repoName)
-	if err != nil {
-		return nil, foundVersion, fallbackError{
-			err:         err,
-			confirmedV2: foundVersion,
-			transportOK: true,
-		}
-	}
-
-	repo, err = client.NewRepository(ctx, repoNameRef, endpoint.URL.String(), tr)
-	if err != nil {
-		err = fallbackError{
-			err:         err,
-			confirmedV2: foundVersion,
-			transportOK: true,
-		}
-	}
-	return
-}
-
-type existingTokenHandler struct {
-	token string
-}
-
-func (th *existingTokenHandler) Scheme() string {
-	return "bearer"
-}
-
-func (th *existingTokenHandler) AuthorizeRequest(req *http.Request, params map[string]string) error {
-	req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", th.token))
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/registry_unit_test.go b/installer/vendor/github.com/docker/docker/distribution/registry_unit_test.go
deleted file mode 100644
index 406de34915..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/registry_unit_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package distribution
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/docker/docker/utils"
-	"golang.org/x/net/context"
-)
-
-const secretRegistryToken = "mysecrettoken"
-
-type tokenPassThruHandler struct {
-	reached       bool
-	gotToken      bool
-	shouldSend401 func(url string) bool
-}
-
-func (h *tokenPassThruHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	h.reached = true
-	if strings.Contains(r.Header.Get("Authorization"), secretRegistryToken) {
-		logrus.Debug("Detected registry token in auth header")
-		h.gotToken = true
-	}
-	if h.shouldSend401 == nil || h.shouldSend401(r.RequestURI) {
-		w.Header().Set("WWW-Authenticate", `Bearer realm="foorealm"`)
-		w.WriteHeader(401)
-	}
-}
-
-func testTokenPassThru(t *testing.T, ts *httptest.Server) {
-	tmp, err := utils.TestDirectory("")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	uri, err := url.Parse(ts.URL)
-	if err != nil {
-		t.Fatalf("could not parse url from test server: %v", err)
-	}
-
-	endpoint := registry.APIEndpoint{
-		Mirror:       false,
-		URL:          uri,
-		Version:      2,
-		Official:     false,
-		TrimHostname: false,
-		TLSConfig:    nil,
-		//VersionHeader: "verheader",
-	}
-	n, _ := reference.ParseNamed("testremotename")
-	repoInfo := &registry.RepositoryInfo{
-		Named: n,
-		Index: &registrytypes.IndexInfo{
-			Name:     "testrepo",
-			Mirrors:  nil,
-			Secure:   false,
-			Official: false,
-		},
-		Official: false,
-	}
-	imagePullConfig := &ImagePullConfig{
-		Config: Config{
-			MetaHeaders: http.Header{},
-			AuthConfig: &types.AuthConfig{
-				RegistryToken: secretRegistryToken,
-			},
-		},
-		Schema2Types: ImageTypes,
-	}
-	puller, err := newPuller(endpoint, repoInfo, imagePullConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := puller.(*v2Puller)
-	ctx := context.Background()
-	p.repo, _, err = NewV2Repository(ctx, p.repoInfo, p.endpoint, p.config.MetaHeaders, p.config.AuthConfig, "pull")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	logrus.Debug("About to pull")
-	// We expect it to fail, since we haven't mock'd the full registry exchange in our handler above
-	tag, _ := reference.WithTag(n, "tag_goes_here")
-	_ = p.pullV2Repository(ctx, tag)
-}
-
-func TestTokenPassThru(t *testing.T) {
-	handler := &tokenPassThruHandler{shouldSend401: func(url string) bool { return url == "/v2/" }}
-	ts := httptest.NewServer(handler)
-	defer ts.Close()
-
-	testTokenPassThru(t, ts)
-
-	if !handler.reached {
-		t.Fatal("Handler not reached")
-	}
-	if !handler.gotToken {
-		t.Fatal("Failed to receive registry token")
-	}
-}
-
-func TestTokenPassThruDifferentHost(t *testing.T) {
-	handler := new(tokenPassThruHandler)
-	ts := httptest.NewServer(handler)
-	defer ts.Close()
-
-	tsredirect := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.RequestURI == "/v2/" {
-			w.Header().Set("WWW-Authenticate", `Bearer realm="foorealm"`)
-			w.WriteHeader(401)
-			return
-		}
-		http.Redirect(w, r, ts.URL+r.URL.Path, http.StatusMovedPermanently)
-	}))
-	defer tsredirect.Close()
-
-	testTokenPassThru(t, tsredirect)
-
-	if !handler.reached {
-		t.Fatal("Handler not reached")
-	}
-	if handler.gotToken {
-		t.Fatal("Redirect should not forward Authorization header to another host")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/utils/progress.go b/installer/vendor/github.com/docker/docker/distribution/utils/progress.go
deleted file mode 100644
index ef8ecc89f6..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/utils/progress.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package utils
-
-import (
-	"io"
-	"net"
-	"os"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-)
-
-// WriteDistributionProgress is a helper for writing progress from chan to JSON
-// stream with an optional cancel function.
-func WriteDistributionProgress(cancelFunc func(), outStream io.Writer, progressChan <-chan progress.Progress) {
-	progressOutput := streamformatter.NewJSONStreamFormatter().NewProgressOutput(outStream, false)
-	operationCancelled := false
-
-	for prog := range progressChan {
-		if err := progressOutput.WriteProgress(prog); err != nil && !operationCancelled {
-			// don't log broken pipe errors as this is the normal case when a client aborts
-			if isBrokenPipe(err) {
-				logrus.Info("Pull session cancelled")
-			} else {
-				logrus.Errorf("error writing progress to client: %v", err)
-			}
-			cancelFunc()
-			operationCancelled = true
-			// Don't return, because we need to continue draining
-			// progressChan until it's closed to avoid a deadlock.
-		}
-	}
-}
-
-func isBrokenPipe(e error) bool {
-	if netErr, ok := e.(*net.OpError); ok {
-		e = netErr.Err
-		if sysErr, ok := netErr.Err.(*os.SyscallError); ok {
-			e = sysErr.Err
-		}
-	}
-	return e == syscall.EPIPE
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/download.go b/installer/vendor/github.com/docker/docker/distribution/xfer/download.go
deleted file mode 100644
index 7545342212..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/download.go
+++ /dev/null
@@ -1,452 +0,0 @@
-package xfer
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"golang.org/x/net/context"
-)
-
-const maxDownloadAttempts = 5
-
-// LayerDownloadManager figures out which layers need to be downloaded, then
-// registers and downloads those, taking into account dependencies between
-// layers.
-type LayerDownloadManager struct {
-	layerStore layer.Store
-	tm         TransferManager
-}
-
-// SetConcurrency set the max concurrent downloads for each pull
-func (ldm *LayerDownloadManager) SetConcurrency(concurrency int) {
-	ldm.tm.SetConcurrency(concurrency)
-}
-
-// NewLayerDownloadManager returns a new LayerDownloadManager.
-func NewLayerDownloadManager(layerStore layer.Store, concurrencyLimit int) *LayerDownloadManager {
-	return &LayerDownloadManager{
-		layerStore: layerStore,
-		tm:         NewTransferManager(concurrencyLimit),
-	}
-}
-
-type downloadTransfer struct {
-	Transfer
-
-	layerStore layer.Store
-	layer      layer.Layer
-	err        error
-}
-
-// result returns the layer resulting from the download, if the download
-// and registration were successful.
-func (d *downloadTransfer) result() (layer.Layer, error) {
-	return d.layer, d.err
-}
-
-// A DownloadDescriptor references a layer that may need to be downloaded.
-type DownloadDescriptor interface {
-	// Key returns the key used to deduplicate downloads.
-	Key() string
-	// ID returns the ID for display purposes.
-	ID() string
-	// DiffID should return the DiffID for this layer, or an error
-	// if it is unknown (for example, if it has not been downloaded
-	// before).
-	DiffID() (layer.DiffID, error)
-	// Download is called to perform the download.
-	Download(ctx context.Context, progressOutput progress.Output) (io.ReadCloser, int64, error)
-	// Close is called when the download manager is finished with this
-	// descriptor and will not call Download again or read from the reader
-	// that Download returned.
-	Close()
-}
-
-// DownloadDescriptorWithRegistered is a DownloadDescriptor that has an
-// additional Registered method which gets called after a downloaded layer is
-// registered. This allows the user of the download manager to know the DiffID
-// of each registered layer. This method is called if a cast to
-// DownloadDescriptorWithRegistered is successful.
-type DownloadDescriptorWithRegistered interface {
-	DownloadDescriptor
-	Registered(diffID layer.DiffID)
-}
-
-// Download is a blocking function which ensures the requested layers are
-// present in the layer store. It uses the string returned by the Key method to
-// deduplicate downloads. If a given layer is not already known to present in
-// the layer store, and the key is not used by an in-progress download, the
-// Download method is called to get the layer tar data. Layers are then
-// registered in the appropriate order.  The caller must call the returned
-// release function once it is is done with the returned RootFS object.
-func (ldm *LayerDownloadManager) Download(ctx context.Context, initialRootFS image.RootFS, layers []DownloadDescriptor, progressOutput progress.Output) (image.RootFS, func(), error) {
-	var (
-		topLayer       layer.Layer
-		topDownload    *downloadTransfer
-		watcher        *Watcher
-		missingLayer   bool
-		transferKey    = ""
-		downloadsByKey = make(map[string]*downloadTransfer)
-	)
-
-	rootFS := initialRootFS
-	for _, descriptor := range layers {
-		key := descriptor.Key()
-		transferKey += key
-
-		if !missingLayer {
-			missingLayer = true
-			diffID, err := descriptor.DiffID()
-			if err == nil {
-				getRootFS := rootFS
-				getRootFS.Append(diffID)
-				l, err := ldm.layerStore.Get(getRootFS.ChainID())
-				if err == nil {
-					// Layer already exists.
-					logrus.Debugf("Layer already exists: %s", descriptor.ID())
-					progress.Update(progressOutput, descriptor.ID(), "Already exists")
-					if topLayer != nil {
-						layer.ReleaseAndLog(ldm.layerStore, topLayer)
-					}
-					topLayer = l
-					missingLayer = false
-					rootFS.Append(diffID)
-					continue
-				}
-			}
-		}
-
-		// Does this layer have the same data as a previous layer in
-		// the stack? If so, avoid downloading it more than once.
-		var topDownloadUncasted Transfer
-		if existingDownload, ok := downloadsByKey[key]; ok {
-			xferFunc := ldm.makeDownloadFuncFromDownload(descriptor, existingDownload, topDownload)
-			defer topDownload.Transfer.Release(watcher)
-			topDownloadUncasted, watcher = ldm.tm.Transfer(transferKey, xferFunc, progressOutput)
-			topDownload = topDownloadUncasted.(*downloadTransfer)
-			continue
-		}
-
-		// Layer is not known to exist - download and register it.
-		progress.Update(progressOutput, descriptor.ID(), "Pulling fs layer")
-
-		var xferFunc DoFunc
-		if topDownload != nil {
-			xferFunc = ldm.makeDownloadFunc(descriptor, "", topDownload)
-			defer topDownload.Transfer.Release(watcher)
-		} else {
-			xferFunc = ldm.makeDownloadFunc(descriptor, rootFS.ChainID(), nil)
-		}
-		topDownloadUncasted, watcher = ldm.tm.Transfer(transferKey, xferFunc, progressOutput)
-		topDownload = topDownloadUncasted.(*downloadTransfer)
-		downloadsByKey[key] = topDownload
-	}
-
-	if topDownload == nil {
-		return rootFS, func() {
-			if topLayer != nil {
-				layer.ReleaseAndLog(ldm.layerStore, topLayer)
-			}
-		}, nil
-	}
-
-	// Won't be using the list built up so far - will generate it
-	// from downloaded layers instead.
-	rootFS.DiffIDs = []layer.DiffID{}
-
-	defer func() {
-		if topLayer != nil {
-			layer.ReleaseAndLog(ldm.layerStore, topLayer)
-		}
-	}()
-
-	select {
-	case <-ctx.Done():
-		topDownload.Transfer.Release(watcher)
-		return rootFS, func() {}, ctx.Err()
-	case <-topDownload.Done():
-		break
-	}
-
-	l, err := topDownload.result()
-	if err != nil {
-		topDownload.Transfer.Release(watcher)
-		return rootFS, func() {}, err
-	}
-
-	// Must do this exactly len(layers) times, so we don't include the
-	// base layer on Windows.
-	for range layers {
-		if l == nil {
-			topDownload.Transfer.Release(watcher)
-			return rootFS, func() {}, errors.New("internal error: too few parent layers")
-		}
-		rootFS.DiffIDs = append([]layer.DiffID{l.DiffID()}, rootFS.DiffIDs...)
-		l = l.Parent()
-	}
-	return rootFS, func() { topDownload.Transfer.Release(watcher) }, err
-}
-
-// makeDownloadFunc returns a function that performs the layer download and
-// registration. If parentDownload is non-nil, it waits for that download to
-// complete before the registration step, and registers the downloaded data
-// on top of parentDownload's resulting layer. Otherwise, it registers the
-// layer on top of the ChainID given by parentLayer.
-func (ldm *LayerDownloadManager) makeDownloadFunc(descriptor DownloadDescriptor, parentLayer layer.ChainID, parentDownload *downloadTransfer) DoFunc {
-	return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-		d := &downloadTransfer{
-			Transfer:   NewTransfer(),
-			layerStore: ldm.layerStore,
-		}
-
-		go func() {
-			defer func() {
-				close(progressChan)
-			}()
-
-			progressOutput := progress.ChanOutput(progressChan)
-
-			select {
-			case <-start:
-			default:
-				progress.Update(progressOutput, descriptor.ID(), "Waiting")
-				<-start
-			}
-
-			if parentDownload != nil {
-				// Did the parent download already fail or get
-				// cancelled?
-				select {
-				case <-parentDownload.Done():
-					_, err := parentDownload.result()
-					if err != nil {
-						d.err = err
-						return
-					}
-				default:
-				}
-			}
-
-			var (
-				downloadReader io.ReadCloser
-				size           int64
-				err            error
-				retries        int
-			)
-
-			defer descriptor.Close()
-
-			for {
-				downloadReader, size, err = descriptor.Download(d.Transfer.Context(), progressOutput)
-				if err == nil {
-					break
-				}
-
-				// If an error was returned because the context
-				// was cancelled, we shouldn't retry.
-				select {
-				case <-d.Transfer.Context().Done():
-					d.err = err
-					return
-				default:
-				}
-
-				retries++
-				if _, isDNR := err.(DoNotRetry); isDNR || retries == maxDownloadAttempts {
-					logrus.Errorf("Download failed: %v", err)
-					d.err = err
-					return
-				}
-
-				logrus.Errorf("Download failed, retrying: %v", err)
-				delay := retries * 5
-				ticker := time.NewTicker(time.Second)
-
-			selectLoop:
-				for {
-					progress.Updatef(progressOutput, descriptor.ID(), "Retrying in %d second%s", delay, (map[bool]string{true: "s"})[delay != 1])
-					select {
-					case <-ticker.C:
-						delay--
-						if delay == 0 {
-							ticker.Stop()
-							break selectLoop
-						}
-					case <-d.Transfer.Context().Done():
-						ticker.Stop()
-						d.err = errors.New("download cancelled during retry delay")
-						return
-					}
-
-				}
-			}
-
-			close(inactive)
-
-			if parentDownload != nil {
-				select {
-				case <-d.Transfer.Context().Done():
-					d.err = errors.New("layer registration cancelled")
-					downloadReader.Close()
-					return
-				case <-parentDownload.Done():
-				}
-
-				l, err := parentDownload.result()
-				if err != nil {
-					d.err = err
-					downloadReader.Close()
-					return
-				}
-				parentLayer = l.ChainID()
-			}
-
-			reader := progress.NewProgressReader(ioutils.NewCancelReadCloser(d.Transfer.Context(), downloadReader), progressOutput, size, descriptor.ID(), "Extracting")
-			defer reader.Close()
-
-			inflatedLayerData, err := archive.DecompressStream(reader)
-			if err != nil {
-				d.err = fmt.Errorf("could not get decompression stream: %v", err)
-				return
-			}
-
-			var src distribution.Descriptor
-			if fs, ok := descriptor.(distribution.Describable); ok {
-				src = fs.Descriptor()
-			}
-			if ds, ok := d.layerStore.(layer.DescribableStore); ok {
-				d.layer, err = ds.RegisterWithDescriptor(inflatedLayerData, parentLayer, src)
-			} else {
-				d.layer, err = d.layerStore.Register(inflatedLayerData, parentLayer)
-			}
-			if err != nil {
-				select {
-				case <-d.Transfer.Context().Done():
-					d.err = errors.New("layer registration cancelled")
-				default:
-					d.err = fmt.Errorf("failed to register layer: %v", err)
-				}
-				return
-			}
-
-			progress.Update(progressOutput, descriptor.ID(), "Pull complete")
-			withRegistered, hasRegistered := descriptor.(DownloadDescriptorWithRegistered)
-			if hasRegistered {
-				withRegistered.Registered(d.layer.DiffID())
-			}
-
-			// Doesn't actually need to be its own goroutine, but
-			// done like this so we can defer close(c).
-			go func() {
-				<-d.Transfer.Released()
-				if d.layer != nil {
-					layer.ReleaseAndLog(d.layerStore, d.layer)
-				}
-			}()
-		}()
-
-		return d
-	}
-}
-
-// makeDownloadFuncFromDownload returns a function that performs the layer
-// registration when the layer data is coming from an existing download. It
-// waits for sourceDownload and parentDownload to complete, and then
-// reregisters the data from sourceDownload's top layer on top of
-// parentDownload. This function does not log progress output because it would
-// interfere with the progress reporting for sourceDownload, which has the same
-// Key.
-func (ldm *LayerDownloadManager) makeDownloadFuncFromDownload(descriptor DownloadDescriptor, sourceDownload *downloadTransfer, parentDownload *downloadTransfer) DoFunc {
-	return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-		d := &downloadTransfer{
-			Transfer:   NewTransfer(),
-			layerStore: ldm.layerStore,
-		}
-
-		go func() {
-			defer func() {
-				close(progressChan)
-			}()
-
-			<-start
-
-			close(inactive)
-
-			select {
-			case <-d.Transfer.Context().Done():
-				d.err = errors.New("layer registration cancelled")
-				return
-			case <-parentDownload.Done():
-			}
-
-			l, err := parentDownload.result()
-			if err != nil {
-				d.err = err
-				return
-			}
-			parentLayer := l.ChainID()
-
-			// sourceDownload should have already finished if
-			// parentDownload finished, but wait for it explicitly
-			// to be sure.
-			select {
-			case <-d.Transfer.Context().Done():
-				d.err = errors.New("layer registration cancelled")
-				return
-			case <-sourceDownload.Done():
-			}
-
-			l, err = sourceDownload.result()
-			if err != nil {
-				d.err = err
-				return
-			}
-
-			layerReader, err := l.TarStream()
-			if err != nil {
-				d.err = err
-				return
-			}
-			defer layerReader.Close()
-
-			var src distribution.Descriptor
-			if fs, ok := l.(distribution.Describable); ok {
-				src = fs.Descriptor()
-			}
-			if ds, ok := d.layerStore.(layer.DescribableStore); ok {
-				d.layer, err = ds.RegisterWithDescriptor(layerReader, parentLayer, src)
-			} else {
-				d.layer, err = d.layerStore.Register(layerReader, parentLayer)
-			}
-			if err != nil {
-				d.err = fmt.Errorf("failed to register layer: %v", err)
-				return
-			}
-
-			withRegistered, hasRegistered := descriptor.(DownloadDescriptorWithRegistered)
-			if hasRegistered {
-				withRegistered.Registered(d.layer.DiffID())
-			}
-
-			// Doesn't actually need to be its own goroutine, but
-			// done like this so we can defer close(c).
-			go func() {
-				<-d.Transfer.Released()
-				if d.layer != nil {
-					layer.ReleaseAndLog(d.layerStore, d.layer)
-				}
-			}()
-		}()
-
-		return d
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/download_test.go b/installer/vendor/github.com/docker/docker/distribution/xfer/download_test.go
deleted file mode 100644
index bc20e1e7ec..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/download_test.go
+++ /dev/null
@@ -1,356 +0,0 @@
-package xfer
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"runtime"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"golang.org/x/net/context"
-)
-
-const maxDownloadConcurrency = 3
-
-type mockLayer struct {
-	layerData bytes.Buffer
-	diffID    layer.DiffID
-	chainID   layer.ChainID
-	parent    layer.Layer
-}
-
-func (ml *mockLayer) TarStream() (io.ReadCloser, error) {
-	return ioutil.NopCloser(bytes.NewBuffer(ml.layerData.Bytes())), nil
-}
-
-func (ml *mockLayer) TarStreamFrom(layer.ChainID) (io.ReadCloser, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func (ml *mockLayer) ChainID() layer.ChainID {
-	return ml.chainID
-}
-
-func (ml *mockLayer) DiffID() layer.DiffID {
-	return ml.diffID
-}
-
-func (ml *mockLayer) Parent() layer.Layer {
-	return ml.parent
-}
-
-func (ml *mockLayer) Size() (size int64, err error) {
-	return 0, nil
-}
-
-func (ml *mockLayer) DiffSize() (size int64, err error) {
-	return 0, nil
-}
-
-func (ml *mockLayer) Metadata() (map[string]string, error) {
-	return make(map[string]string), nil
-}
-
-type mockLayerStore struct {
-	layers map[layer.ChainID]*mockLayer
-}
-
-func createChainIDFromParent(parent layer.ChainID, dgsts ...layer.DiffID) layer.ChainID {
-	if len(dgsts) == 0 {
-		return parent
-	}
-	if parent == "" {
-		return createChainIDFromParent(layer.ChainID(dgsts[0]), dgsts[1:]...)
-	}
-	// H = "H(n-1) SHA256(n)"
-	dgst := digest.FromBytes([]byte(string(parent) + " " + string(dgsts[0])))
-	return createChainIDFromParent(layer.ChainID(dgst), dgsts[1:]...)
-}
-
-func (ls *mockLayerStore) Map() map[layer.ChainID]layer.Layer {
-	layers := map[layer.ChainID]layer.Layer{}
-
-	for k, v := range ls.layers {
-		layers[k] = v
-	}
-
-	return layers
-}
-
-func (ls *mockLayerStore) Register(reader io.Reader, parentID layer.ChainID) (layer.Layer, error) {
-	return ls.RegisterWithDescriptor(reader, parentID, distribution.Descriptor{})
-}
-
-func (ls *mockLayerStore) RegisterWithDescriptor(reader io.Reader, parentID layer.ChainID, _ distribution.Descriptor) (layer.Layer, error) {
-	var (
-		parent layer.Layer
-		err    error
-	)
-
-	if parentID != "" {
-		parent, err = ls.Get(parentID)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	l := &mockLayer{parent: parent}
-	_, err = l.layerData.ReadFrom(reader)
-	if err != nil {
-		return nil, err
-	}
-	l.diffID = layer.DiffID(digest.FromBytes(l.layerData.Bytes()))
-	l.chainID = createChainIDFromParent(parentID, l.diffID)
-
-	ls.layers[l.chainID] = l
-	return l, nil
-}
-
-func (ls *mockLayerStore) Get(chainID layer.ChainID) (layer.Layer, error) {
-	l, ok := ls.layers[chainID]
-	if !ok {
-		return nil, layer.ErrLayerDoesNotExist
-	}
-	return l, nil
-}
-
-func (ls *mockLayerStore) Release(l layer.Layer) ([]layer.Metadata, error) {
-	return []layer.Metadata{}, nil
-}
-func (ls *mockLayerStore) CreateRWLayer(string, layer.ChainID, string, layer.MountInit, map[string]string) (layer.RWLayer, error) {
-	return nil, errors.New("not implemented")
-}
-
-func (ls *mockLayerStore) GetRWLayer(string) (layer.RWLayer, error) {
-	return nil, errors.New("not implemented")
-}
-
-func (ls *mockLayerStore) ReleaseRWLayer(layer.RWLayer) ([]layer.Metadata, error) {
-	return nil, errors.New("not implemented")
-}
-func (ls *mockLayerStore) GetMountID(string) (string, error) {
-	return "", errors.New("not implemented")
-}
-
-func (ls *mockLayerStore) Cleanup() error {
-	return nil
-}
-
-func (ls *mockLayerStore) DriverStatus() [][2]string {
-	return [][2]string{}
-}
-
-func (ls *mockLayerStore) DriverName() string {
-	return "mock"
-}
-
-type mockDownloadDescriptor struct {
-	currentDownloads *int32
-	id               string
-	diffID           layer.DiffID
-	registeredDiffID layer.DiffID
-	expectedDiffID   layer.DiffID
-	simulateRetries  int
-}
-
-// Key returns the key used to deduplicate downloads.
-func (d *mockDownloadDescriptor) Key() string {
-	return d.id
-}
-
-// ID returns the ID for display purposes.
-func (d *mockDownloadDescriptor) ID() string {
-	return d.id
-}
-
-// DiffID should return the DiffID for this layer, or an error
-// if it is unknown (for example, if it has not been downloaded
-// before).
-func (d *mockDownloadDescriptor) DiffID() (layer.DiffID, error) {
-	if d.diffID != "" {
-		return d.diffID, nil
-	}
-	return "", errors.New("no diffID available")
-}
-
-func (d *mockDownloadDescriptor) Registered(diffID layer.DiffID) {
-	d.registeredDiffID = diffID
-}
-
-func (d *mockDownloadDescriptor) mockTarStream() io.ReadCloser {
-	// The mock implementation returns the ID repeated 5 times as a tar
-	// stream instead of actual tar data. The data is ignored except for
-	// computing IDs.
-	return ioutil.NopCloser(bytes.NewBuffer([]byte(d.id + d.id + d.id + d.id + d.id)))
-}
-
-// Download is called to perform the download.
-func (d *mockDownloadDescriptor) Download(ctx context.Context, progressOutput progress.Output) (io.ReadCloser, int64, error) {
-	if d.currentDownloads != nil {
-		defer atomic.AddInt32(d.currentDownloads, -1)
-
-		if atomic.AddInt32(d.currentDownloads, 1) > maxDownloadConcurrency {
-			return nil, 0, errors.New("concurrency limit exceeded")
-		}
-	}
-
-	// Sleep a bit to simulate a time-consuming download.
-	for i := int64(0); i <= 10; i++ {
-		select {
-		case <-ctx.Done():
-			return nil, 0, ctx.Err()
-		case <-time.After(10 * time.Millisecond):
-			progressOutput.WriteProgress(progress.Progress{ID: d.ID(), Action: "Downloading", Current: i, Total: 10})
-		}
-	}
-
-	if d.simulateRetries != 0 {
-		d.simulateRetries--
-		return nil, 0, errors.New("simulating retry")
-	}
-
-	return d.mockTarStream(), 0, nil
-}
-
-func (d *mockDownloadDescriptor) Close() {
-}
-
-func downloadDescriptors(currentDownloads *int32) []DownloadDescriptor {
-	return []DownloadDescriptor{
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id1",
-			expectedDiffID:   layer.DiffID("sha256:68e2c75dc5c78ea9240689c60d7599766c213ae210434c53af18470ae8c53ec1"),
-		},
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id2",
-			expectedDiffID:   layer.DiffID("sha256:64a636223116aa837973a5d9c2bdd17d9b204e4f95ac423e20e65dfbb3655473"),
-		},
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id3",
-			expectedDiffID:   layer.DiffID("sha256:58745a8bbd669c25213e9de578c4da5c8ee1c836b3581432c2b50e38a6753300"),
-		},
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id2",
-			expectedDiffID:   layer.DiffID("sha256:64a636223116aa837973a5d9c2bdd17d9b204e4f95ac423e20e65dfbb3655473"),
-		},
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id4",
-			expectedDiffID:   layer.DiffID("sha256:0dfb5b9577716cc173e95af7c10289322c29a6453a1718addc00c0c5b1330936"),
-			simulateRetries:  1,
-		},
-		&mockDownloadDescriptor{
-			currentDownloads: currentDownloads,
-			id:               "id5",
-			expectedDiffID:   layer.DiffID("sha256:0a5f25fa1acbc647f6112a6276735d0fa01e4ee2aa7ec33015e337350e1ea23d"),
-		},
-	}
-}
-
-func TestSuccessfulDownload(t *testing.T) {
-	// TODO Windows: Fix this unit text
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs fixing on Windows")
-	}
-	layerStore := &mockLayerStore{make(map[layer.ChainID]*mockLayer)}
-	ldm := NewLayerDownloadManager(layerStore, maxDownloadConcurrency)
-
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-	receivedProgress := make(map[string]progress.Progress)
-
-	go func() {
-		for p := range progressChan {
-			receivedProgress[p.ID] = p
-		}
-		close(progressDone)
-	}()
-
-	var currentDownloads int32
-	descriptors := downloadDescriptors(&currentDownloads)
-
-	firstDescriptor := descriptors[0].(*mockDownloadDescriptor)
-
-	// Pre-register the first layer to simulate an already-existing layer
-	l, err := layerStore.Register(firstDescriptor.mockTarStream(), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	firstDescriptor.diffID = l.DiffID()
-
-	rootFS, releaseFunc, err := ldm.Download(context.Background(), *image.NewRootFS(), descriptors, progress.ChanOutput(progressChan))
-	if err != nil {
-		t.Fatalf("download error: %v", err)
-	}
-
-	releaseFunc()
-
-	close(progressChan)
-	<-progressDone
-
-	if len(rootFS.DiffIDs) != len(descriptors) {
-		t.Fatal("got wrong number of diffIDs in rootfs")
-	}
-
-	for i, d := range descriptors {
-		descriptor := d.(*mockDownloadDescriptor)
-
-		if descriptor.diffID != "" {
-			if receivedProgress[d.ID()].Action != "Already exists" {
-				t.Fatalf("did not get 'Already exists' message for %v", d.ID())
-			}
-		} else if receivedProgress[d.ID()].Action != "Pull complete" {
-			t.Fatalf("did not get 'Pull complete' message for %v", d.ID())
-		}
-
-		if rootFS.DiffIDs[i] != descriptor.expectedDiffID {
-			t.Fatalf("rootFS item %d has the wrong diffID (expected: %v got: %v)", i, descriptor.expectedDiffID, rootFS.DiffIDs[i])
-		}
-
-		if descriptor.diffID == "" && descriptor.registeredDiffID != rootFS.DiffIDs[i] {
-			t.Fatal("diffID mismatch between rootFS and Registered callback")
-		}
-	}
-}
-
-func TestCancelledDownload(t *testing.T) {
-	ldm := NewLayerDownloadManager(&mockLayerStore{make(map[layer.ChainID]*mockLayer)}, maxDownloadConcurrency)
-
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-
-	go func() {
-		for range progressChan {
-		}
-		close(progressDone)
-	}()
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	go func() {
-		<-time.After(time.Millisecond)
-		cancel()
-	}()
-
-	descriptors := downloadDescriptors(nil)
-	_, _, err := ldm.Download(ctx, *image.NewRootFS(), descriptors, progress.ChanOutput(progressChan))
-	if err != context.Canceled {
-		t.Fatal("expected download to be cancelled")
-	}
-
-	close(progressChan)
-	<-progressDone
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/transfer.go b/installer/vendor/github.com/docker/docker/distribution/xfer/transfer.go
deleted file mode 100644
index 14f15660ac..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/transfer.go
+++ /dev/null
@@ -1,401 +0,0 @@
-package xfer
-
-import (
-	"runtime"
-	"sync"
-
-	"github.com/docker/docker/pkg/progress"
-	"golang.org/x/net/context"
-)
-
-// DoNotRetry is an error wrapper indicating that the error cannot be resolved
-// with a retry.
-type DoNotRetry struct {
-	Err error
-}
-
-// Error returns the stringified representation of the encapsulated error.
-func (e DoNotRetry) Error() string {
-	return e.Err.Error()
-}
-
-// Watcher is returned by Watch and can be passed to Release to stop watching.
-type Watcher struct {
-	// signalChan is used to signal to the watcher goroutine that
-	// new progress information is available, or that the transfer
-	// has finished.
-	signalChan chan struct{}
-	// releaseChan signals to the watcher goroutine that the watcher
-	// should be detached.
-	releaseChan chan struct{}
-	// running remains open as long as the watcher is watching the
-	// transfer. It gets closed if the transfer finishes or the
-	// watcher is detached.
-	running chan struct{}
-}
-
-// Transfer represents an in-progress transfer.
-type Transfer interface {
-	Watch(progressOutput progress.Output) *Watcher
-	Release(*Watcher)
-	Context() context.Context
-	Close()
-	Done() <-chan struct{}
-	Released() <-chan struct{}
-	Broadcast(masterProgressChan <-chan progress.Progress)
-}
-
-type transfer struct {
-	mu sync.Mutex
-
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	// watchers keeps track of the goroutines monitoring progress output,
-	// indexed by the channels that release them.
-	watchers map[chan struct{}]*Watcher
-
-	// lastProgress is the most recently received progress event.
-	lastProgress progress.Progress
-	// hasLastProgress is true when lastProgress has been set.
-	hasLastProgress bool
-
-	// running remains open as long as the transfer is in progress.
-	running chan struct{}
-	// released stays open until all watchers release the transfer and
-	// the transfer is no longer tracked by the transfer manager.
-	released chan struct{}
-
-	// broadcastDone is true if the master progress channel has closed.
-	broadcastDone bool
-	// closed is true if Close has been called
-	closed bool
-	// broadcastSyncChan allows watchers to "ping" the broadcasting
-	// goroutine to wait for it for deplete its input channel. This ensures
-	// a detaching watcher won't miss an event that was sent before it
-	// started detaching.
-	broadcastSyncChan chan struct{}
-}
-
-// NewTransfer creates a new transfer.
-func NewTransfer() Transfer {
-	t := &transfer{
-		watchers:          make(map[chan struct{}]*Watcher),
-		running:           make(chan struct{}),
-		released:          make(chan struct{}),
-		broadcastSyncChan: make(chan struct{}),
-	}
-
-	// This uses context.Background instead of a caller-supplied context
-	// so that a transfer won't be cancelled automatically if the client
-	// which requested it is ^C'd (there could be other viewers).
-	t.ctx, t.cancel = context.WithCancel(context.Background())
-
-	return t
-}
-
-// Broadcast copies the progress and error output to all viewers.
-func (t *transfer) Broadcast(masterProgressChan <-chan progress.Progress) {
-	for {
-		var (
-			p  progress.Progress
-			ok bool
-		)
-		select {
-		case p, ok = <-masterProgressChan:
-		default:
-			// We've depleted the channel, so now we can handle
-			// reads on broadcastSyncChan to let detaching watchers
-			// know we're caught up.
-			select {
-			case <-t.broadcastSyncChan:
-				continue
-			case p, ok = <-masterProgressChan:
-			}
-		}
-
-		t.mu.Lock()
-		if ok {
-			t.lastProgress = p
-			t.hasLastProgress = true
-			for _, w := range t.watchers {
-				select {
-				case w.signalChan <- struct{}{}:
-				default:
-				}
-			}
-		} else {
-			t.broadcastDone = true
-		}
-		t.mu.Unlock()
-		if !ok {
-			close(t.running)
-			return
-		}
-	}
-}
-
-// Watch adds a watcher to the transfer. The supplied channel gets progress
-// updates and is closed when the transfer finishes.
-func (t *transfer) Watch(progressOutput progress.Output) *Watcher {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	w := &Watcher{
-		releaseChan: make(chan struct{}),
-		signalChan:  make(chan struct{}),
-		running:     make(chan struct{}),
-	}
-
-	t.watchers[w.releaseChan] = w
-
-	if t.broadcastDone {
-		close(w.running)
-		return w
-	}
-
-	go func() {
-		defer func() {
-			close(w.running)
-		}()
-		var (
-			done           bool
-			lastWritten    progress.Progress
-			hasLastWritten bool
-		)
-		for {
-			t.mu.Lock()
-			hasLastProgress := t.hasLastProgress
-			lastProgress := t.lastProgress
-			t.mu.Unlock()
-
-			// Make sure we don't write the last progress item
-			// twice.
-			if hasLastProgress && (!done || !hasLastWritten || lastProgress != lastWritten) {
-				progressOutput.WriteProgress(lastProgress)
-				lastWritten = lastProgress
-				hasLastWritten = true
-			}
-
-			if done {
-				return
-			}
-
-			select {
-			case <-w.signalChan:
-			case <-w.releaseChan:
-				done = true
-				// Since the watcher is going to detach, make
-				// sure the broadcaster is caught up so we
-				// don't miss anything.
-				select {
-				case t.broadcastSyncChan <- struct{}{}:
-				case <-t.running:
-				}
-			case <-t.running:
-				done = true
-			}
-		}
-	}()
-
-	return w
-}
-
-// Release is the inverse of Watch; indicating that the watcher no longer wants
-// to be notified about the progress of the transfer. All calls to Watch must
-// be paired with later calls to Release so that the lifecycle of the transfer
-// is properly managed.
-func (t *transfer) Release(watcher *Watcher) {
-	t.mu.Lock()
-	delete(t.watchers, watcher.releaseChan)
-
-	if len(t.watchers) == 0 {
-		if t.closed {
-			// released may have been closed already if all
-			// watchers were released, then another one was added
-			// while waiting for a previous watcher goroutine to
-			// finish.
-			select {
-			case <-t.released:
-			default:
-				close(t.released)
-			}
-		} else {
-			t.cancel()
-		}
-	}
-	t.mu.Unlock()
-
-	close(watcher.releaseChan)
-	// Block until the watcher goroutine completes
-	<-watcher.running
-}
-
-// Done returns a channel which is closed if the transfer completes or is
-// cancelled. Note that having 0 watchers causes a transfer to be cancelled.
-func (t *transfer) Done() <-chan struct{} {
-	// Note that this doesn't return t.ctx.Done() because that channel will
-	// be closed the moment Cancel is called, and we need to return a
-	// channel that blocks until a cancellation is actually acknowledged by
-	// the transfer function.
-	return t.running
-}
-
-// Released returns a channel which is closed once all watchers release the
-// transfer AND the transfer is no longer tracked by the transfer manager.
-func (t *transfer) Released() <-chan struct{} {
-	return t.released
-}
-
-// Context returns the context associated with the transfer.
-func (t *transfer) Context() context.Context {
-	return t.ctx
-}
-
-// Close is called by the transfer manager when the transfer is no longer
-// being tracked.
-func (t *transfer) Close() {
-	t.mu.Lock()
-	t.closed = true
-	if len(t.watchers) == 0 {
-		close(t.released)
-	}
-	t.mu.Unlock()
-}
-
-// DoFunc is a function called by the transfer manager to actually perform
-// a transfer. It should be non-blocking. It should wait until the start channel
-// is closed before transferring any data. If the function closes inactive, that
-// signals to the transfer manager that the job is no longer actively moving
-// data - for example, it may be waiting for a dependent transfer to finish.
-// This prevents it from taking up a slot.
-type DoFunc func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer
-
-// TransferManager is used by LayerDownloadManager and LayerUploadManager to
-// schedule and deduplicate transfers. It is up to the TransferManager
-// implementation to make the scheduling and concurrency decisions.
-type TransferManager interface {
-	// Transfer checks if a transfer with the given key is in progress. If
-	// so, it returns progress and error output from that transfer.
-	// Otherwise, it will call xferFunc to initiate the transfer.
-	Transfer(key string, xferFunc DoFunc, progressOutput progress.Output) (Transfer, *Watcher)
-	// SetConcurrency set the concurrencyLimit so that it is adjustable daemon reload
-	SetConcurrency(concurrency int)
-}
-
-type transferManager struct {
-	mu sync.Mutex
-
-	concurrencyLimit int
-	activeTransfers  int
-	transfers        map[string]Transfer
-	waitingTransfers []chan struct{}
-}
-
-// NewTransferManager returns a new TransferManager.
-func NewTransferManager(concurrencyLimit int) TransferManager {
-	return &transferManager{
-		concurrencyLimit: concurrencyLimit,
-		transfers:        make(map[string]Transfer),
-	}
-}
-
-// SetConcurrency set the concurrencyLimit
-func (tm *transferManager) SetConcurrency(concurrency int) {
-	tm.mu.Lock()
-	tm.concurrencyLimit = concurrency
-	tm.mu.Unlock()
-}
-
-// Transfer checks if a transfer matching the given key is in progress. If not,
-// it starts one by calling xferFunc. The caller supplies a channel which
-// receives progress output from the transfer.
-func (tm *transferManager) Transfer(key string, xferFunc DoFunc, progressOutput progress.Output) (Transfer, *Watcher) {
-	tm.mu.Lock()
-	defer tm.mu.Unlock()
-
-	for {
-		xfer, present := tm.transfers[key]
-		if !present {
-			break
-		}
-		// Transfer is already in progress.
-		watcher := xfer.Watch(progressOutput)
-
-		select {
-		case <-xfer.Context().Done():
-			// We don't want to watch a transfer that has been cancelled.
-			// Wait for it to be removed from the map and try again.
-			xfer.Release(watcher)
-			tm.mu.Unlock()
-			// The goroutine that removes this transfer from the
-			// map is also waiting for xfer.Done(), so yield to it.
-			// This could be avoided by adding a Closed method
-			// to Transfer to allow explicitly waiting for it to be
-			// removed the map, but forcing a scheduling round in
-			// this very rare case seems better than bloating the
-			// interface definition.
-			runtime.Gosched()
-			<-xfer.Done()
-			tm.mu.Lock()
-		default:
-			return xfer, watcher
-		}
-	}
-
-	start := make(chan struct{})
-	inactive := make(chan struct{})
-
-	if tm.concurrencyLimit == 0 || tm.activeTransfers < tm.concurrencyLimit {
-		close(start)
-		tm.activeTransfers++
-	} else {
-		tm.waitingTransfers = append(tm.waitingTransfers, start)
-	}
-
-	masterProgressChan := make(chan progress.Progress)
-	xfer := xferFunc(masterProgressChan, start, inactive)
-	watcher := xfer.Watch(progressOutput)
-	go xfer.Broadcast(masterProgressChan)
-	tm.transfers[key] = xfer
-
-	// When the transfer is finished, remove from the map.
-	go func() {
-		for {
-			select {
-			case <-inactive:
-				tm.mu.Lock()
-				tm.inactivate(start)
-				tm.mu.Unlock()
-				inactive = nil
-			case <-xfer.Done():
-				tm.mu.Lock()
-				if inactive != nil {
-					tm.inactivate(start)
-				}
-				delete(tm.transfers, key)
-				tm.mu.Unlock()
-				xfer.Close()
-				return
-			}
-		}
-	}()
-
-	return xfer, watcher
-}
-
-func (tm *transferManager) inactivate(start chan struct{}) {
-	// If the transfer was started, remove it from the activeTransfers
-	// count.
-	select {
-	case <-start:
-		// Start next transfer if any are waiting
-		if len(tm.waitingTransfers) != 0 {
-			close(tm.waitingTransfers[0])
-			tm.waitingTransfers = tm.waitingTransfers[1:]
-		} else {
-			tm.activeTransfers--
-		}
-	default:
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/transfer_test.go b/installer/vendor/github.com/docker/docker/distribution/xfer/transfer_test.go
deleted file mode 100644
index 6c50ce3524..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/transfer_test.go
+++ /dev/null
@@ -1,410 +0,0 @@
-package xfer
-
-import (
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/progress"
-)
-
-func TestTransfer(t *testing.T) {
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			select {
-			case <-start:
-			default:
-				t.Fatalf("transfer function not started even though concurrency limit not reached")
-			}
-
-			xfer := NewTransfer()
-			go func() {
-				for i := 0; i <= 10; i++ {
-					progressChan <- progress.Progress{ID: id, Action: "testing", Current: int64(i), Total: 10}
-					time.Sleep(10 * time.Millisecond)
-				}
-				close(progressChan)
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(5)
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-	receivedProgress := make(map[string]int64)
-
-	go func() {
-		for p := range progressChan {
-			val, present := receivedProgress[p.ID]
-			if present && p.Current <= val {
-				t.Fatalf("got unexpected progress value: %d (expected %d)", p.Current, val+1)
-			}
-			receivedProgress[p.ID] = p.Current
-		}
-		close(progressDone)
-	}()
-
-	// Start a few transfers
-	ids := []string{"id1", "id2", "id3"}
-	xfers := make([]Transfer, len(ids))
-	watchers := make([]*Watcher, len(ids))
-	for i, id := range ids {
-		xfers[i], watchers[i] = tm.Transfer(id, makeXferFunc(id), progress.ChanOutput(progressChan))
-	}
-
-	for i, xfer := range xfers {
-		<-xfer.Done()
-		xfer.Release(watchers[i])
-	}
-	close(progressChan)
-	<-progressDone
-
-	for _, id := range ids {
-		if receivedProgress[id] != 10 {
-			t.Fatalf("final progress value %d instead of 10", receivedProgress[id])
-		}
-	}
-}
-
-func TestConcurrencyLimit(t *testing.T) {
-	concurrencyLimit := 3
-	var runningJobs int32
-
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			xfer := NewTransfer()
-			go func() {
-				<-start
-				totalJobs := atomic.AddInt32(&runningJobs, 1)
-				if int(totalJobs) > concurrencyLimit {
-					t.Fatalf("too many jobs running")
-				}
-				for i := 0; i <= 10; i++ {
-					progressChan <- progress.Progress{ID: id, Action: "testing", Current: int64(i), Total: 10}
-					time.Sleep(10 * time.Millisecond)
-				}
-				atomic.AddInt32(&runningJobs, -1)
-				close(progressChan)
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(concurrencyLimit)
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-	receivedProgress := make(map[string]int64)
-
-	go func() {
-		for p := range progressChan {
-			receivedProgress[p.ID] = p.Current
-		}
-		close(progressDone)
-	}()
-
-	// Start more transfers than the concurrency limit
-	ids := []string{"id1", "id2", "id3", "id4", "id5", "id6", "id7", "id8"}
-	xfers := make([]Transfer, len(ids))
-	watchers := make([]*Watcher, len(ids))
-	for i, id := range ids {
-		xfers[i], watchers[i] = tm.Transfer(id, makeXferFunc(id), progress.ChanOutput(progressChan))
-	}
-
-	for i, xfer := range xfers {
-		<-xfer.Done()
-		xfer.Release(watchers[i])
-	}
-	close(progressChan)
-	<-progressDone
-
-	for _, id := range ids {
-		if receivedProgress[id] != 10 {
-			t.Fatalf("final progress value %d instead of 10", receivedProgress[id])
-		}
-	}
-}
-
-func TestInactiveJobs(t *testing.T) {
-	concurrencyLimit := 3
-	var runningJobs int32
-	testDone := make(chan struct{})
-
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			xfer := NewTransfer()
-			go func() {
-				<-start
-				totalJobs := atomic.AddInt32(&runningJobs, 1)
-				if int(totalJobs) > concurrencyLimit {
-					t.Fatalf("too many jobs running")
-				}
-				for i := 0; i <= 10; i++ {
-					progressChan <- progress.Progress{ID: id, Action: "testing", Current: int64(i), Total: 10}
-					time.Sleep(10 * time.Millisecond)
-				}
-				atomic.AddInt32(&runningJobs, -1)
-				close(inactive)
-				<-testDone
-				close(progressChan)
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(concurrencyLimit)
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-	receivedProgress := make(map[string]int64)
-
-	go func() {
-		for p := range progressChan {
-			receivedProgress[p.ID] = p.Current
-		}
-		close(progressDone)
-	}()
-
-	// Start more transfers than the concurrency limit
-	ids := []string{"id1", "id2", "id3", "id4", "id5", "id6", "id7", "id8"}
-	xfers := make([]Transfer, len(ids))
-	watchers := make([]*Watcher, len(ids))
-	for i, id := range ids {
-		xfers[i], watchers[i] = tm.Transfer(id, makeXferFunc(id), progress.ChanOutput(progressChan))
-	}
-
-	close(testDone)
-	for i, xfer := range xfers {
-		<-xfer.Done()
-		xfer.Release(watchers[i])
-	}
-	close(progressChan)
-	<-progressDone
-
-	for _, id := range ids {
-		if receivedProgress[id] != 10 {
-			t.Fatalf("final progress value %d instead of 10", receivedProgress[id])
-		}
-	}
-}
-
-func TestWatchRelease(t *testing.T) {
-	ready := make(chan struct{})
-
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			xfer := NewTransfer()
-			go func() {
-				defer func() {
-					close(progressChan)
-				}()
-				<-ready
-				for i := int64(0); ; i++ {
-					select {
-					case <-time.After(10 * time.Millisecond):
-					case <-xfer.Context().Done():
-						return
-					}
-					progressChan <- progress.Progress{ID: id, Action: "testing", Current: i, Total: 10}
-				}
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(5)
-
-	type watcherInfo struct {
-		watcher               *Watcher
-		progressChan          chan progress.Progress
-		progressDone          chan struct{}
-		receivedFirstProgress chan struct{}
-	}
-
-	progressConsumer := func(w watcherInfo) {
-		first := true
-		for range w.progressChan {
-			if first {
-				close(w.receivedFirstProgress)
-			}
-			first = false
-		}
-		close(w.progressDone)
-	}
-
-	// Start a transfer
-	watchers := make([]watcherInfo, 5)
-	var xfer Transfer
-	watchers[0].progressChan = make(chan progress.Progress)
-	watchers[0].progressDone = make(chan struct{})
-	watchers[0].receivedFirstProgress = make(chan struct{})
-	xfer, watchers[0].watcher = tm.Transfer("id1", makeXferFunc("id1"), progress.ChanOutput(watchers[0].progressChan))
-	go progressConsumer(watchers[0])
-
-	// Give it multiple watchers
-	for i := 1; i != len(watchers); i++ {
-		watchers[i].progressChan = make(chan progress.Progress)
-		watchers[i].progressDone = make(chan struct{})
-		watchers[i].receivedFirstProgress = make(chan struct{})
-		watchers[i].watcher = xfer.Watch(progress.ChanOutput(watchers[i].progressChan))
-		go progressConsumer(watchers[i])
-	}
-
-	// Now that the watchers are set up, allow the transfer goroutine to
-	// proceed.
-	close(ready)
-
-	// Confirm that each watcher gets progress output.
-	for _, w := range watchers {
-		<-w.receivedFirstProgress
-	}
-
-	// Release one watcher every 5ms
-	for _, w := range watchers {
-		xfer.Release(w.watcher)
-		<-time.After(5 * time.Millisecond)
-	}
-
-	// Now that all watchers have been released, Released() should
-	// return a closed channel.
-	<-xfer.Released()
-
-	// Done() should return a closed channel because the xfer func returned
-	// due to cancellation.
-	<-xfer.Done()
-
-	for _, w := range watchers {
-		close(w.progressChan)
-		<-w.progressDone
-	}
-}
-
-func TestWatchFinishedTransfer(t *testing.T) {
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			xfer := NewTransfer()
-			go func() {
-				// Finish immediately
-				close(progressChan)
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(5)
-
-	// Start a transfer
-	watchers := make([]*Watcher, 3)
-	var xfer Transfer
-	xfer, watchers[0] = tm.Transfer("id1", makeXferFunc("id1"), progress.ChanOutput(make(chan progress.Progress)))
-
-	// Give it a watcher immediately
-	watchers[1] = xfer.Watch(progress.ChanOutput(make(chan progress.Progress)))
-
-	// Wait for the transfer to complete
-	<-xfer.Done()
-
-	// Set up another watcher
-	watchers[2] = xfer.Watch(progress.ChanOutput(make(chan progress.Progress)))
-
-	// Release the watchers
-	for _, w := range watchers {
-		xfer.Release(w)
-	}
-
-	// Now that all watchers have been released, Released() should
-	// return a closed channel.
-	<-xfer.Released()
-}
-
-func TestDuplicateTransfer(t *testing.T) {
-	ready := make(chan struct{})
-
-	var xferFuncCalls int32
-
-	makeXferFunc := func(id string) DoFunc {
-		return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-			atomic.AddInt32(&xferFuncCalls, 1)
-			xfer := NewTransfer()
-			go func() {
-				defer func() {
-					close(progressChan)
-				}()
-				<-ready
-				for i := int64(0); ; i++ {
-					select {
-					case <-time.After(10 * time.Millisecond):
-					case <-xfer.Context().Done():
-						return
-					}
-					progressChan <- progress.Progress{ID: id, Action: "testing", Current: i, Total: 10}
-				}
-			}()
-			return xfer
-		}
-	}
-
-	tm := NewTransferManager(5)
-
-	type transferInfo struct {
-		xfer                  Transfer
-		watcher               *Watcher
-		progressChan          chan progress.Progress
-		progressDone          chan struct{}
-		receivedFirstProgress chan struct{}
-	}
-
-	progressConsumer := func(t transferInfo) {
-		first := true
-		for range t.progressChan {
-			if first {
-				close(t.receivedFirstProgress)
-			}
-			first = false
-		}
-		close(t.progressDone)
-	}
-
-	// Try to start multiple transfers with the same ID
-	transfers := make([]transferInfo, 5)
-	for i := range transfers {
-		t := &transfers[i]
-		t.progressChan = make(chan progress.Progress)
-		t.progressDone = make(chan struct{})
-		t.receivedFirstProgress = make(chan struct{})
-		t.xfer, t.watcher = tm.Transfer("id1", makeXferFunc("id1"), progress.ChanOutput(t.progressChan))
-		go progressConsumer(*t)
-	}
-
-	// Allow the transfer goroutine to proceed.
-	close(ready)
-
-	// Confirm that each watcher gets progress output.
-	for _, t := range transfers {
-		<-t.receivedFirstProgress
-	}
-
-	// Confirm that the transfer function was called exactly once.
-	if xferFuncCalls != 1 {
-		t.Fatal("transfer function wasn't called exactly once")
-	}
-
-	// Release one watcher every 5ms
-	for _, t := range transfers {
-		t.xfer.Release(t.watcher)
-		<-time.After(5 * time.Millisecond)
-	}
-
-	for _, t := range transfers {
-		// Now that all watchers have been released, Released() should
-		// return a closed channel.
-		<-t.xfer.Released()
-		// Done() should return a closed channel because the xfer func returned
-		// due to cancellation.
-		<-t.xfer.Done()
-	}
-
-	for _, t := range transfers {
-		close(t.progressChan)
-		<-t.progressDone
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/upload.go b/installer/vendor/github.com/docker/docker/distribution/xfer/upload.go
deleted file mode 100644
index ad3398369c..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/upload.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package xfer
-
-import (
-	"errors"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"golang.org/x/net/context"
-)
-
-const maxUploadAttempts = 5
-
-// LayerUploadManager provides task management and progress reporting for
-// uploads.
-type LayerUploadManager struct {
-	tm TransferManager
-}
-
-// SetConcurrency set the max concurrent uploads for each push
-func (lum *LayerUploadManager) SetConcurrency(concurrency int) {
-	lum.tm.SetConcurrency(concurrency)
-}
-
-// NewLayerUploadManager returns a new LayerUploadManager.
-func NewLayerUploadManager(concurrencyLimit int) *LayerUploadManager {
-	return &LayerUploadManager{
-		tm: NewTransferManager(concurrencyLimit),
-	}
-}
-
-type uploadTransfer struct {
-	Transfer
-
-	remoteDescriptor distribution.Descriptor
-	err              error
-}
-
-// An UploadDescriptor references a layer that may need to be uploaded.
-type UploadDescriptor interface {
-	// Key returns the key used to deduplicate uploads.
-	Key() string
-	// ID returns the ID for display purposes.
-	ID() string
-	// DiffID should return the DiffID for this layer.
-	DiffID() layer.DiffID
-	// Upload is called to perform the Upload.
-	Upload(ctx context.Context, progressOutput progress.Output) (distribution.Descriptor, error)
-	// SetRemoteDescriptor provides the distribution.Descriptor that was
-	// returned by Upload. This descriptor is not to be confused with
-	// the UploadDescriptor interface, which is used for internally
-	// identifying layers that are being uploaded.
-	SetRemoteDescriptor(descriptor distribution.Descriptor)
-}
-
-// Upload is a blocking function which ensures the listed layers are present on
-// the remote registry. It uses the string returned by the Key method to
-// deduplicate uploads.
-func (lum *LayerUploadManager) Upload(ctx context.Context, layers []UploadDescriptor, progressOutput progress.Output) error {
-	var (
-		uploads          []*uploadTransfer
-		dedupDescriptors = make(map[string]*uploadTransfer)
-	)
-
-	for _, descriptor := range layers {
-		progress.Update(progressOutput, descriptor.ID(), "Preparing")
-
-		key := descriptor.Key()
-		if _, present := dedupDescriptors[key]; present {
-			continue
-		}
-
-		xferFunc := lum.makeUploadFunc(descriptor)
-		upload, watcher := lum.tm.Transfer(descriptor.Key(), xferFunc, progressOutput)
-		defer upload.Release(watcher)
-		uploads = append(uploads, upload.(*uploadTransfer))
-		dedupDescriptors[key] = upload.(*uploadTransfer)
-	}
-
-	for _, upload := range uploads {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-upload.Transfer.Done():
-			if upload.err != nil {
-				return upload.err
-			}
-		}
-	}
-	for _, l := range layers {
-		l.SetRemoteDescriptor(dedupDescriptors[l.Key()].remoteDescriptor)
-	}
-
-	return nil
-}
-
-func (lum *LayerUploadManager) makeUploadFunc(descriptor UploadDescriptor) DoFunc {
-	return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) Transfer {
-		u := &uploadTransfer{
-			Transfer: NewTransfer(),
-		}
-
-		go func() {
-			defer func() {
-				close(progressChan)
-			}()
-
-			progressOutput := progress.ChanOutput(progressChan)
-
-			select {
-			case <-start:
-			default:
-				progress.Update(progressOutput, descriptor.ID(), "Waiting")
-				<-start
-			}
-
-			retries := 0
-			for {
-				remoteDescriptor, err := descriptor.Upload(u.Transfer.Context(), progressOutput)
-				if err == nil {
-					u.remoteDescriptor = remoteDescriptor
-					break
-				}
-
-				// If an error was returned because the context
-				// was cancelled, we shouldn't retry.
-				select {
-				case <-u.Transfer.Context().Done():
-					u.err = err
-					return
-				default:
-				}
-
-				retries++
-				if _, isDNR := err.(DoNotRetry); isDNR || retries == maxUploadAttempts {
-					logrus.Errorf("Upload failed: %v", err)
-					u.err = err
-					return
-				}
-
-				logrus.Errorf("Upload failed, retrying: %v", err)
-				delay := retries * 5
-				ticker := time.NewTicker(time.Second)
-
-			selectLoop:
-				for {
-					progress.Updatef(progressOutput, descriptor.ID(), "Retrying in %d second%s", delay, (map[bool]string{true: "s"})[delay != 1])
-					select {
-					case <-ticker.C:
-						delay--
-						if delay == 0 {
-							ticker.Stop()
-							break selectLoop
-						}
-					case <-u.Transfer.Context().Done():
-						ticker.Stop()
-						u.err = errors.New("upload cancelled during retry delay")
-						return
-					}
-				}
-			}
-		}()
-
-		return u
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/distribution/xfer/upload_test.go b/installer/vendor/github.com/docker/docker/distribution/xfer/upload_test.go
deleted file mode 100644
index 16bd187336..0000000000
--- a/installer/vendor/github.com/docker/docker/distribution/xfer/upload_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package xfer
-
-import (
-	"errors"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"golang.org/x/net/context"
-)
-
-const maxUploadConcurrency = 3
-
-type mockUploadDescriptor struct {
-	currentUploads  *int32
-	diffID          layer.DiffID
-	simulateRetries int
-}
-
-// Key returns the key used to deduplicate downloads.
-func (u *mockUploadDescriptor) Key() string {
-	return u.diffID.String()
-}
-
-// ID returns the ID for display purposes.
-func (u *mockUploadDescriptor) ID() string {
-	return u.diffID.String()
-}
-
-// DiffID should return the DiffID for this layer.
-func (u *mockUploadDescriptor) DiffID() layer.DiffID {
-	return u.diffID
-}
-
-// SetRemoteDescriptor is not used in the mock.
-func (u *mockUploadDescriptor) SetRemoteDescriptor(remoteDescriptor distribution.Descriptor) {
-}
-
-// Upload is called to perform the upload.
-func (u *mockUploadDescriptor) Upload(ctx context.Context, progressOutput progress.Output) (distribution.Descriptor, error) {
-	if u.currentUploads != nil {
-		defer atomic.AddInt32(u.currentUploads, -1)
-
-		if atomic.AddInt32(u.currentUploads, 1) > maxUploadConcurrency {
-			return distribution.Descriptor{}, errors.New("concurrency limit exceeded")
-		}
-	}
-
-	// Sleep a bit to simulate a time-consuming upload.
-	for i := int64(0); i <= 10; i++ {
-		select {
-		case <-ctx.Done():
-			return distribution.Descriptor{}, ctx.Err()
-		case <-time.After(10 * time.Millisecond):
-			progressOutput.WriteProgress(progress.Progress{ID: u.ID(), Current: i, Total: 10})
-		}
-	}
-
-	if u.simulateRetries != 0 {
-		u.simulateRetries--
-		return distribution.Descriptor{}, errors.New("simulating retry")
-	}
-
-	return distribution.Descriptor{}, nil
-}
-
-func uploadDescriptors(currentUploads *int32) []UploadDescriptor {
-	return []UploadDescriptor{
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"), 0},
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:1515325234325236634634608943609283523908626098235490238423902343"), 0},
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:6929356290463485374960346430698374523437683470934634534953453453"), 0},
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"), 0},
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:8159352387436803946235346346368745389534789534897538734598734987"), 1},
-		&mockUploadDescriptor{currentUploads, layer.DiffID("sha256:4637863963478346897346987346987346789346789364879364897364987346"), 0},
-	}
-}
-
-func TestSuccessfulUpload(t *testing.T) {
-	lum := NewLayerUploadManager(maxUploadConcurrency)
-
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-	receivedProgress := make(map[string]int64)
-
-	go func() {
-		for p := range progressChan {
-			receivedProgress[p.ID] = p.Current
-		}
-		close(progressDone)
-	}()
-
-	var currentUploads int32
-	descriptors := uploadDescriptors(&currentUploads)
-
-	err := lum.Upload(context.Background(), descriptors, progress.ChanOutput(progressChan))
-	if err != nil {
-		t.Fatalf("upload error: %v", err)
-	}
-
-	close(progressChan)
-	<-progressDone
-}
-
-func TestCancelledUpload(t *testing.T) {
-	lum := NewLayerUploadManager(maxUploadConcurrency)
-
-	progressChan := make(chan progress.Progress)
-	progressDone := make(chan struct{})
-
-	go func() {
-		for range progressChan {
-		}
-		close(progressDone)
-	}()
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	go func() {
-		<-time.After(time.Millisecond)
-		cancel()
-	}()
-
-	descriptors := uploadDescriptors(nil)
-	err := lum.Upload(ctx, descriptors, progress.ChanOutput(progressChan))
-	if err != context.Canceled {
-		t.Fatal("expected upload to be cancelled")
-	}
-
-	close(progressChan)
-	<-progressDone
-}
diff --git a/installer/vendor/github.com/docker/docker/dockerversion/useragent.go b/installer/vendor/github.com/docker/docker/dockerversion/useragent.go
deleted file mode 100644
index d2a891c4d6..0000000000
--- a/installer/vendor/github.com/docker/docker/dockerversion/useragent.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package dockerversion
-
-import (
-	"fmt"
-	"runtime"
-
-	"github.com/docker/docker/api/server/httputils"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/pkg/useragent"
-	"golang.org/x/net/context"
-)
-
-// DockerUserAgent is the User-Agent the Docker client uses to identify itself.
-// In accordance with RFC 7231 (5.5.3) is of the form:
-//    [docker client's UA] UpstreamClient([upstream client's UA])
-func DockerUserAgent(ctx context.Context) string {
-	httpVersion := make([]useragent.VersionInfo, 0, 6)
-	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "docker", Version: Version})
-	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "go", Version: runtime.Version()})
-	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "git-commit", Version: GitCommit})
-	if kernelVersion, err := kernel.GetKernelVersion(); err == nil {
-		httpVersion = append(httpVersion, useragent.VersionInfo{Name: "kernel", Version: kernelVersion.String()})
-	}
-	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "os", Version: runtime.GOOS})
-	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "arch", Version: runtime.GOARCH})
-
-	dockerUA := useragent.AppendVersions("", httpVersion...)
-	upstreamUA := getUserAgentFromContext(ctx)
-	if len(upstreamUA) > 0 {
-		ret := insertUpstreamUserAgent(upstreamUA, dockerUA)
-		return ret
-	}
-	return dockerUA
-}
-
-// getUserAgentFromContext returns the previously saved user-agent context stored in ctx, if one exists
-func getUserAgentFromContext(ctx context.Context) string {
-	var upstreamUA string
-	if ctx != nil {
-		var ki interface{} = ctx.Value(httputils.UAStringKey)
-		if ki != nil {
-			upstreamUA = ctx.Value(httputils.UAStringKey).(string)
-		}
-	}
-	return upstreamUA
-}
-
-// escapeStr returns s with every rune in charsToEscape escaped by a backslash
-func escapeStr(s string, charsToEscape string) string {
-	var ret string
-	for _, currRune := range s {
-		appended := false
-		for _, escapeableRune := range charsToEscape {
-			if currRune == escapeableRune {
-				ret += `\` + string(currRune)
-				appended = true
-				break
-			}
-		}
-		if !appended {
-			ret += string(currRune)
-		}
-	}
-	return ret
-}
-
-// insertUpstreamUserAgent adds the upstream client useragent to create a user-agent
-// string of the form:
-//   $dockerUA UpstreamClient($upstreamUA)
-func insertUpstreamUserAgent(upstreamUA string, dockerUA string) string {
-	charsToEscape := `();\`
-	upstreamUAEscaped := escapeStr(upstreamUA, charsToEscape)
-	return fmt.Sprintf("%s UpstreamClient(%s)", dockerUA, upstreamUAEscaped)
-}
diff --git a/installer/vendor/github.com/docker/docker/dockerversion/version_lib.go b/installer/vendor/github.com/docker/docker/dockerversion/version_lib.go
deleted file mode 100644
index 33f77d3ce6..0000000000
--- a/installer/vendor/github.com/docker/docker/dockerversion/version_lib.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !autogen
-
-// Package dockerversion is auto-generated at build-time
-package dockerversion
-
-// Default build-time variable for library-import.
-// This file is overridden on build with build-time informations.
-const (
-	GitCommit          string = "library-import"
-	Version            string = "library-import"
-	BuildTime          string = "library-import"
-	IAmStatic          string = "library-import"
-	ContainerdCommitID string = "library-import"
-	RuncCommitID       string = "library-import"
-	InitCommitID       string = "library-import"
-)
diff --git a/installer/vendor/github.com/docker/docker/docs/README.md b/installer/vendor/github.com/docker/docker/docs/README.md
deleted file mode 100644
index da93093075..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# The non-reference docs have been moved!
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-The documentation for Docker Engine has been merged into
-[the general documentation repo](https://github.com/docker/docker.github.io).
-
-See the [README](https://github.com/docker/docker.github.io/blob/master/README.md)
-for instructions on contributing to and building the documentation.
-
-If you'd like to edit the current published version of the Engine docs,
-do it in the master branch here:
-https://github.com/docker/docker.github.io/tree/master/engine
-
-If you need to document the functionality of an upcoming Engine release,
-use the `vnext-engine` branch:
-https://github.com/docker/docker.github.io/tree/vnext-engine/engine
-
-The reference docs have been left in docker/docker (this repo), which remains
-the place to edit them.
-
-The docs in the general repo are open-source and we appreciate
-your feedback and pull requests!
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.18.md b/installer/vendor/github.com/docker/docker/docs/api/v1.18.md
deleted file mode 100644
index 0db0c0f916..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.18.md
+++ /dev/null
@@ -1,2156 +0,0 @@
----
-title: "Engine API v1.18"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.18/
-- /reference/api/docker_remote_api_v1.18/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST, but for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `STDOUT`,
-   `STDIN` and `STDERR`.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.18/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`restarting`|`running`|`paused`|`exited`)
-  -   `label=key` or `label="key=value"` of a container label
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.18/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": null,
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Links": ["redis3:redis"],
-             "LxcConf": {"lxc.utsname":"docker"},
-             "Memory": 0,
-             "MemorySwap": 0,
-             "CpuShares": 512,
-             "CpusetCpus": "0,1",
-             "PidMode": "",
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": ""
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **HostConfig**
-    -   **Binds** – A list of bind-mounts for this container. Each item is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **LxcConf** - LXC specific configurations. These configurations only
-          work when using the `lxc` execution driver.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, `none`, and `container:<name|id>`
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.18/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"PortSpecs": null,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": null,
-			"WorkingDir": ""
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecDriver": "native-0.2",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpuShares": 0,
-			"Devices": [],
-			"Dns": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}]
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"Gateway": "",
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"MacAddress": "",
-			"PortMapping": null,
-			"Ports": null
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z"
-		},
-		"Volumes": {},
-		"VolumesRW": {}
-	}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.18/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.18/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.18/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.18/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.18/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.18/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "network" : {
-            "rx_dropped" : 0,
-            "rx_bytes" : 648,
-            "rx_errors" : 0,
-            "tx_packets" : 8,
-            "tx_dropped" : 0,
-            "rx_packets" : 8,
-            "tx_errors" : 0,
-            "tx_bytes" : 648
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  16970827,
-                  1839451,
-                  7107380,
-                  10571290
-               ],
-               "usage_in_usermode" : 10000000,
-               "total_usage" : 36488948,
-               "usage_in_kernelmode" : 20000000
-            },
-            "system_cpu_usage" : 20091722000000000,
-            "throttling_data" : {}
-         }
-      }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize?h=<height>&w=<width>`
-
-Resize the TTY for container with  `id`. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.18/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.18/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.18/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.18/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.18/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.18/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.18/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the Dockerfile. This is
-        ignored if `remote` is specified and points to an individual filename.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – base64-encoded ConfigFile object
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.18/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
--   **repo** – Repository name.
--   **tag** – Tag. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.18/images/ubuntu/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Created": "2013-03-23T22:24:18.818426-07:00",
-       "Container": "3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
-       "ContainerConfig": {
-          "Hostname": "",
-          "User": "",
-          "AttachStdin": false,
-          "AttachStdout": false,
-          "AttachStderr": false,
-          "Tty": true,
-          "OpenStdin": true,
-          "StdinOnce": false,
-          "Env": null,
-          "Cmd": ["/bin/bash"],
-          "Dns": null,
-          "Image": "ubuntu",
-          "Labels": {
-             "com.example.vendor": "Acme",
-             "com.example.license": "GPL",
-             "com.example.version": "1.0"
-          },
-          "Volumes": null,
-          "VolumesFrom": "",
-          "WorkingDir": ""
-       },
-       "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-       "Parent": "27cf784147099545",
-       "Size": 6824592
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.18/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "b750fe79269d",
-            "Created": 1364102658,
-            "CreatedBy": "/bin/bash"
-        },
-        {
-            "Id": "27cf78414709",
-            "Created": 1364068391,
-            "CreatedBy": ""
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.18/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-**Example request**:
-
-    POST /v1.18/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.18/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.18/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.18/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "star_count": 12,
-                "is_official": false,
-                "name": "wma55/u1210sshd",
-                "is_automated": false,
-                "description": ""
-            },
-            {
-                "star_count": 10,
-                "is_official": false,
-                "name": "jdswinbank/sshd",
-                "is_automated": false,
-                "description": ""
-            },
-            {
-                "star_count": 18,
-                "is_official": false,
-                "name": "vgauthier/sshd",
-                "is_automated": false,
-                "description": ""
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Get the default username and email
-
-**Example request**:
-
-    POST /v1.18/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "email": "hannibal@a-team.com",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.18/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Containers": 11,
-        "Debug": 0,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": 1,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": 1,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OperatingSystem": "Boot2Docker",
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "SwapLimit": 0,
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.18/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.5.0",
-         "Os": "linux",
-         "KernelVersion": "3.18.5-tinycore64",
-         "GoVersion": "go1.4.1",
-         "GitCommit": "a8a31ef",
-         "Arch": "amd64",
-         "ApiVersion": "1.18"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.18/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.18/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "PortSpecs": null,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Volumes": {
-                 "/tmp": {}
-         },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    create, destroy, die, exec_create, exec_start, export, kill, oom, pause, restart, start, stop, unpause
-
-Docker images report the following events:
-
-    untag, delete
-
-**Example request**:
-
-    GET /v1.18/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "create", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "start", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "stop", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067966}
-    {"status": "destroy", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067970}
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.18/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.18/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.18/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.18/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "Tty": true
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
-
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.18/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.18/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.18/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: plain/text
-
-    {
-      "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
-      "Running" : false,
-      "ExitCode" : 2,
-      "ProcessConfig" : {
-        "privileged" : false,
-        "user" : "",
-        "tty" : false,
-        "entrypoint" : "sh",
-        "arguments" : [
-          "-c",
-          "exit 2"
-        ]
-      },
-      "OpenStdin" : false,
-      "OpenStderr" : false,
-      "OpenStdout" : false,
-      "Container" : {
-        "State" : {
-          "Running" : true,
-          "Paused" : false,
-          "Restarting" : false,
-          "OOMKilled" : false,
-          "Pid" : 3650,
-          "ExitCode" : 0,
-          "Error" : "",
-          "StartedAt" : "2014-11-17T22:26:03.717657531Z",
-          "FinishedAt" : "0001-01-01T00:00:00Z"
-        },
-        "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
-        "Created" : "2014-11-17T22:26:03.626304998Z",
-        "Path" : "date",
-        "Args" : [],
-        "Config" : {
-          "Hostname" : "8f177a186b97",
-          "Domainname" : "",
-          "User" : "",
-          "AttachStdin" : false,
-          "AttachStdout" : false,
-          "AttachStderr" : false,
-          "PortSpecs": null,
-          "ExposedPorts" : null,
-          "Tty" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
-          "Cmd" : [
-            "date"
-          ],
-          "Image" : "ubuntu",
-          "Volumes" : null,
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "NetworkDisabled" : false,
-          "MacAddress" : "",
-          "OnBuild" : null,
-          "SecurityOpt" : null
-        },
-        "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
-        "NetworkSettings" : {
-          "IPAddress" : "172.17.0.2",
-          "IPPrefixLen" : 16,
-          "MacAddress" : "02:42:ac:11:00:02",
-          "Gateway" : "172.17.42.1",
-          "Bridge" : "docker0",
-          "PortMapping" : null,
-          "Ports" : {}
-        },
-        "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
-        "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
-        "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
-        "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-        "Name" : "/test",
-        "Driver" : "aufs",
-        "ExecDriver" : "native-0.2",
-        "MountLabel" : "",
-        "ProcessLabel" : "",
-        "AppArmorProfile" : "",
-        "RestartCount" : 0,
-        "Volumes" : {},
-        "VolumesRW" : {}
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-This might change in the future.
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.19.md b/installer/vendor/github.com/docker/docker/docs/api/v1.19.md
deleted file mode 100644
index a1a7280d3a..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.19.md
+++ /dev/null
@@ -1,2238 +0,0 @@
----
-title: "Engine API v1.19"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.19/
-- /reference/api/docker_remote_api_v1.19/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
- - When the client API version is newer than the daemon's, these calls return an HTTP
-   `400 Bad Request` error message.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.19/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`restarting`|`running`|`paused`|`exited`)
-  -   `label=key` or `label="key=value"` of a container label
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.19/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": null,
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Links": ["redis3:redis"],
-             "LxcConf": {"lxc.utsname":"docker"},
-             "Memory": 0,
-             "MemorySwap": 0,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "BlkioWeight": 300,
-             "OomKillDisable": false,
-             "PidMode": "",
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": ""
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **HostConfig**
-    -   **Binds** – A list of bind-mounts for this container. Each item is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **LxcConf** - LXC specific configurations. These configurations only
-          work when using the `lxc` execution driver.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, `none`, and `container:<name|id>`
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `none`.
-          `syslog` available options are: `address`.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.19/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"PortSpecs": null,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": null,
-			"WorkingDir": ""
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecDriver": "native-0.2",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"BlkioWeight": 0,
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"OomKillDisable": false,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}]
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"Gateway": "",
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"MacAddress": "",
-			"PortMapping": null,
-			"Ports": null
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z"
-		},
-		"Volumes": {},
-		"VolumesRW": {}
-	}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.19/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.19/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.19/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.19/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.19/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.19/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "network" : {
-            "rx_dropped" : 0,
-            "rx_bytes" : 648,
-            "rx_errors" : 0,
-            "tx_packets" : 8,
-            "tx_dropped" : 0,
-            "rx_packets" : 8,
-            "tx_errors" : 0,
-            "tx_bytes" : 648
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize?h=<height>&w=<width>`
-
-Resize the TTY for container with  `id`. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.19/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.19/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.19/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.19/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.19/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.19/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.19/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the Dockerfile. This is
-        ignored if `remote` is specified and points to an individual filename.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
--   **remote** – A Git repository URI or HTTP/HTTPS URI build source. If the
-        URI specifies a filename, the file's contents are placed into a file
-        called `Dockerfile`.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – base64-encoded ConfigFile object
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.19/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
--   **repo** – Repository name.
--   **tag** – Tag. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.19/images/ubuntu/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Created": "2013-03-23T22:24:18.818426-07:00",
-       "Container": "3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
-       "ContainerConfig": {
-          "Hostname": "",
-          "User": "",
-          "AttachStdin": false,
-          "AttachStdout": false,
-          "AttachStderr": false,
-          "Tty": true,
-          "OpenStdin": true,
-          "StdinOnce": false,
-          "Env": null,
-          "Cmd": ["/bin/bash"],
-          "Dns": null,
-          "Image": "ubuntu",
-          "Labels": {
-             "com.example.vendor": "Acme",
-             "com.example.license": "GPL",
-             "com.example.version": "1.0"
-          },
-          "Volumes": null,
-          "VolumesFrom": "",
-          "WorkingDir": ""
-       },
-       "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-       "Parent": "27cf784147099545",
-       "Size": 6824592
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.19/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.19/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-**Example request**:
-
-    POST /v1.19/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.19/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.19/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com). This API
-returns both `is_trusted` and `is_automated` images. Currently, they
-are considered identical. In the future, the `is_trusted` property will
-be deprecated and replaced by the `is_automated` property.
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.19/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "star_count": 12,
-                "is_official": false,
-                "name": "wma55/u1210sshd",
-                "is_trusted": false,
-                "is_automated": false,
-                "description": ""
-            },
-            {
-                "star_count": 10,
-                "is_official": false,
-                "name": "jdswinbank/sshd",
-                "is_trusted": false,
-                "is_automated": false,
-                "description": ""
-            },
-            {
-                "star_count": 18,
-                "is_official": false,
-                "name": "vgauthier/sshd",
-                "is_trusted": false,
-                "is_automated": false,
-                "description": ""
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Get the default username and email
-
-**Example request**:
-
-    POST /v1.19/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "email": "hannibal@a-team.com",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.19/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Containers": 11,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OperatingSystem": "Boot2Docker",
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "SwapLimit": false,
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.19/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.5.0",
-         "Os": "linux",
-         "KernelVersion": "3.18.5-tinycore64",
-         "GoVersion": "go1.4.1",
-         "GitCommit": "a8a31ef",
-         "Arch": "amd64",
-         "ApiVersion": "1.19"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.19/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.19/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "PortSpecs": null,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Volumes": {
-                 "/tmp": {}
-         },
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause
-
-Docker images report the following events:
-
-    untag, delete
-
-**Example request**:
-
-    GET /v1.19/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "create", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "start", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "stop", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067966}
-    {"status": "destroy", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067970}
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.19/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.19/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.19/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.19/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.19/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.19/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.19/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: plain/text
-
-    {
-      "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
-      "Running" : false,
-      "ExitCode" : 2,
-      "ProcessConfig" : {
-        "privileged" : false,
-        "user" : "",
-        "tty" : false,
-        "entrypoint" : "sh",
-        "arguments" : [
-          "-c",
-          "exit 2"
-        ]
-      },
-      "OpenStdin" : false,
-      "OpenStderr" : false,
-      "OpenStdout" : false,
-      "Container" : {
-        "State" : {
-          "Running" : true,
-          "Paused" : false,
-          "Restarting" : false,
-          "OOMKilled" : false,
-          "Pid" : 3650,
-          "ExitCode" : 0,
-          "Error" : "",
-          "StartedAt" : "2014-11-17T22:26:03.717657531Z",
-          "FinishedAt" : "0001-01-01T00:00:00Z"
-        },
-        "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
-        "Created" : "2014-11-17T22:26:03.626304998Z",
-        "Path" : "date",
-        "Args" : [],
-        "Config" : {
-          "Hostname" : "8f177a186b97",
-          "Domainname" : "",
-          "User" : "",
-          "AttachStdin" : false,
-          "AttachStdout" : false,
-          "AttachStderr" : false,
-          "PortSpecs": null,
-          "ExposedPorts" : null,
-          "Tty" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
-          "Cmd" : [
-            "date"
-          ],
-          "Image" : "ubuntu",
-          "Volumes" : null,
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "NetworkDisabled" : false,
-          "MacAddress" : "",
-          "OnBuild" : null,
-          "SecurityOpt" : null
-        },
-        "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
-        "NetworkSettings" : {
-          "IPAddress" : "172.17.0.2",
-          "IPPrefixLen" : 16,
-          "MacAddress" : "02:42:ac:11:00:02",
-          "Gateway" : "172.17.42.1",
-          "Bridge" : "docker0",
-          "PortMapping" : null,
-          "Ports" : {}
-        },
-        "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
-        "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
-        "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
-        "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-        "Name" : "/test",
-        "Driver" : "aufs",
-        "ExecDriver" : "native-0.2",
-        "MountLabel" : "",
-        "ProcessLabel" : "",
-        "AppArmorProfile" : "",
-        "RestartCount" : 0,
-        "Volumes" : {},
-        "VolumesRW" : {}
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ docker -d -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.20.md b/installer/vendor/github.com/docker/docker/docs/api/v1.20.md
deleted file mode 100644
index 2532c49950..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.20.md
+++ /dev/null
@@ -1,2391 +0,0 @@
----
-title: "Engine API v1.20"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.20/
-- /reference/api/docker_remote_api_v1.20/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.20/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`created`|`restarting`|`running`|`paused`|`exited`)
-  -   `label=key` or `label="key=value"` of a container label
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.20/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": null,
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Links": ["redis3:redis"],
-             "LxcConf": {"lxc.utsname":"docker"},
-             "Memory": 0,
-             "MemorySwap": 0,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "BlkioWeight": 300,
-             "MemorySwappiness": 60,
-             "OomKillDisable": false,
-             "PidMode": "",
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "GroupAdd": ["newgroup"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": ""
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **HostConfig**
-    -   **Binds** – A list of bind-mounts for this container. Each item is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **LxcConf** - LXC specific configurations. These configurations only
-          work when using the `lxc` execution driver.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **GroupAdd** - A list of additional groups that the container process will run as
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          values are: `bridge`, `host`, `none`, and `container:<name|id>`
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `gelf`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.20/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": null,
-			"WorkingDir": ""
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecDriver": "native-0.2",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"BlkioWeight": 0,
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"OomKillDisable": false,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}]
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"Gateway": "",
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"MacAddress": "",
-			"PortMapping": null,
-			"Ports": null
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z"
-		},
-		"Mounts": [
-			{
-				"Source": "/data",
-				"Destination": "/data",
-				"Mode": "ro,Z",
-				"RW": false
-			}
-		]
-	}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.20/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.20/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.20/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.20/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.20/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.20/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "network" : {
-            "rx_dropped" : 0,
-            "rx_bytes" : 648,
-            "rx_errors" : 0,
-            "tx_packets" : 8,
-            "tx_dropped" : 0,
-            "rx_packets" : 8,
-            "tx_errors" : 0,
-            "tx_bytes" : 648
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize?h=<height>&w=<width>`
-
-Resize the TTY for container with  `id`. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.20/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.20/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.20/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.20/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Deprecated** in favor of the `archive` endpoint below.
-
-**Example request**:
-
-    POST /v1.20/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Retrieving information about files and folders in a container
-
-`HEAD /containers/(id or name)/archive`
-
-See the description of the `X-Docker-Container-Path-Stat` header in the
-following section.
-
-#### Get an archive of a filesystem resource in a container
-
-`GET /containers/(id or name)/archive`
-
-Get a tar archive of a resource in the filesystem of container `id`.
-
-**Query parameters**:
-
-- **path** - resource in the container's filesystem to archive. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The resource specified by **path** must exist. To assert that the resource
-    is expected to be a directory, **path** should end in `/` or  `/.`
-    (assuming a path separator of `/`). If **path** ends in `/.` then this
-    indicates that only the contents of the **path** directory should be
-    copied. A symlink is always resolved to its target.
-
-    > **Note**: It is not possible to copy certain system files such as resources
-    > under `/proc`, `/sys`, `/dev`, and mounts created by the user in the
-    > container.
-
-**Example request**:
-
-    GET /v1.20/containers/8cce319429b2/archive?path=/root HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-    X-Docker-Container-Path-Stat: eyJuYW1lIjoicm9vdCIsInNpemUiOjQwOTYsIm1vZGUiOjIxNDc0ODQwOTYsIm10aW1lIjoiMjAxNC0wMi0yN1QyMDo1MToyM1oiLCJsaW5rVGFyZ2V0IjoiIn0=
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-On success, a response header `X-Docker-Container-Path-Stat` will be set to a
-base64-encoded JSON object containing some filesystem header information about
-the archived resource. The above example value would decode to the following
-JSON object (whitespace added for readability):
-
-```json
-{
-    "name": "root",
-    "size": 4096,
-    "mode": 2147484096,
-    "mtime": "2014-02-27T20:51:23Z",
-    "linkTarget": ""
-}
-```
-
-A `HEAD` request can also be made to this endpoint if only this information is
-desired.
-
-**Status codes**:
-
-- **200** - success, returns archive of copied resource
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** was asserted to be a directory but exists as a
-      file)
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** does not exist)
-- **500** - server error
-
-#### Extract an archive of files or folders to a directory in a container
-
-`PUT /containers/(id or name)/archive`
-
-Upload a tar archive to be extracted to a path in the filesystem of container
-`id`.
-
-**Query parameters**:
-
-- **path** - path to a directory in the container
-    to extract the archive's contents into. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The **path** resource must exist.
-- **noOverwriteDirNonDir** - If "1", "true", or "True" then it will be an error
-    if unpacking the given content would cause an existing directory to be
-    replaced with a non-directory and vice versa.
-
-**Example request**:
-
-    PUT /v1.20/containers/8cce319429b2/archive?path=/vol1 HTTP/1.1
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** – the content was extracted successfully
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** should be a directory but exists as a file)
-    - unable to overwrite existing directory with non-directory
-      (if **noOverwriteDirNonDir**)
-    - unable to overwrite existing non-directory with directory
-      (if **noOverwriteDirNonDir**)
-- **403** - client error, permission denied, the volume
-    or container rootfs is marked as read-only.
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** resource does not exist)
-- **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.20/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.20/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.20/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the `Dockerfile`. This is
-        ignored if `remote` is specified and points to an external `Dockerfile`.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file. If
-        the URI points to a tarball, the file is downloaded by the daemon and
-        the contents therein used as the context for the build. If the URI
-        points to a tarball and the `dockerfile` parameter is also specified,
-        there must be a file with the corresponding path inside the tarball.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – A base64-url-safe-encoded Registry Auth Config JSON
-        object with the following structure:
-
-            {
-                "docker.example.com": {
-                    "username": "janedoe",
-                    "password": "hunter2"
-                },
-                "https://index.docker.io/v1/": {
-                    "username": "mobydock",
-                    "password": "conta1n3rize14"
-                }
-            }
-
-    This object maps the hostname of a registry to an object containing the
-    "username" and "password" for that registry. Multiple registries may
-    be specified as the build may be based on an image requiring
-    authentication to pull from any arbitrary registry. Only the registry
-    domain name (and port if not the default "443") are required. However
-    (for legacy reasons) the "official" Docker, Inc. hosted registry must
-    be specified with both a "https://" prefix and a "/v1/" suffix even
-    though Docker will prefer to use the v2 registry API.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.20/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
--   **repo** – Repository name.
--   **tag** – Tag. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.20/images/ubuntu/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Created": "2013-03-23T22:24:18.818426-07:00",
-       "Container": "3d67245a8d72ecf13f33dffac9f79dcdf70f75acb84d308770391510e0c23ad0",
-       "ContainerConfig": {
-          "Hostname": "",
-          "User": "",
-          "AttachStdin": false,
-          "AttachStdout": false,
-          "AttachStderr": false,
-          "Tty": true,
-          "OpenStdin": true,
-          "StdinOnce": false,
-          "Env": null,
-          "Cmd": ["/bin/bash"],
-          "Dns": null,
-          "Image": "ubuntu",
-          "Labels": {
-             "com.example.vendor": "Acme",
-             "com.example.license": "GPL",
-             "com.example.version": "1.0"
-          },
-          "Volumes": null,
-          "VolumesFrom": "",
-          "WorkingDir": ""
-       },
-       "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-       "Parent": "27cf784147099545",
-       "Size": 6824592
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.20/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.20/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-**Example request**:
-
-    POST /v1.20/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.20/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.20/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.20/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "wma55/u1210sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "jdswinbank/sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "vgauthier/sshd",
-                "star_count": 0
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Get the default username and email
-
-**Example request**:
-
-    POST /v1.20/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "email": "hannibal@a-team.com",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.20/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Containers": 11,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OperatingSystem": "Boot2Docker",
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "SwapLimit": false,
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.20/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.5.0",
-         "Os": "linux",
-         "KernelVersion": "3.18.5-tinycore64",
-         "GoVersion": "go1.4.1",
-         "GitCommit": "a8a31ef",
-         "Arch": "amd64",
-         "ApiVersion": "1.20",
-         "Experimental": false
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.20/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.20/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Mounts": [
-           {
-             "Source": "/data",
-             "Destination": "/data",
-             "Mode": "ro,Z",
-             "RW": false
-           }
-         ],
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
--   **pause** – 1/True/true or 0/False/false, whether to pause the container before committing
--   **changes** – Dockerfile instructions to apply while committing
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause
-
-Docker images report the following events:
-
-    delete, import, pull, push, tag, untag
-
-**Example request**:
-
-    GET /v1.20/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "create", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "start", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067924}
-    {"status": "stop", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067966}
-    {"status": "destroy", "id": "dfdf82bd3881","from": "ubuntu:latest", "time":1374067970}
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.20/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.20/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.20/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.20/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.20/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.20/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.20/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: plain/text
-
-    {
-      "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
-      "Running" : false,
-      "ExitCode" : 2,
-      "ProcessConfig" : {
-        "privileged" : false,
-        "user" : "",
-        "tty" : false,
-        "entrypoint" : "sh",
-        "arguments" : [
-          "-c",
-          "exit 2"
-        ]
-      },
-      "OpenStdin" : false,
-      "OpenStderr" : false,
-      "OpenStdout" : false,
-      "Container" : {
-        "State" : {
-          "Running" : true,
-          "Paused" : false,
-          "Restarting" : false,
-          "OOMKilled" : false,
-          "Pid" : 3650,
-          "ExitCode" : 0,
-          "Error" : "",
-          "StartedAt" : "2014-11-17T22:26:03.717657531Z",
-          "FinishedAt" : "0001-01-01T00:00:00Z"
-        },
-        "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
-        "Created" : "2014-11-17T22:26:03.626304998Z",
-        "Path" : "date",
-        "Args" : [],
-        "Config" : {
-          "Hostname" : "8f177a186b97",
-          "Domainname" : "",
-          "User" : "",
-          "AttachStdin" : false,
-          "AttachStdout" : false,
-          "AttachStderr" : false,
-          "ExposedPorts" : null,
-          "Tty" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
-          "Cmd" : [
-            "date"
-          ],
-          "Image" : "ubuntu",
-          "Volumes" : null,
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "NetworkDisabled" : false,
-          "MacAddress" : "",
-          "OnBuild" : null,
-          "SecurityOpt" : null
-        },
-        "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
-        "NetworkSettings" : {
-          "IPAddress" : "172.17.0.2",
-          "IPPrefixLen" : 16,
-          "MacAddress" : "02:42:ac:11:00:02",
-          "Gateway" : "172.17.42.1",
-          "Bridge" : "docker0",
-          "PortMapping" : null,
-          "Ports" : {}
-        },
-        "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
-        "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
-        "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
-        "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-        "Name" : "/test",
-        "Driver" : "aufs",
-        "ExecDriver" : "native-0.2",
-        "MountLabel" : "",
-        "ProcessLabel" : "",
-        "AppArmorProfile" : "",
-        "RestartCount" : 0,
-        "Mounts" : []
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.21.md b/installer/vendor/github.com/docker/docker/docs/api/v1.21.md
deleted file mode 100644
index b4f54b7c44..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.21.md
+++ /dev/null
@@ -1,2969 +0,0 @@
----
-title: "Engine API v1.21"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.21/
-- /reference/api/docker_remote_api_v1.21/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
- - When the client API version is newer than the daemon's, these calls return an HTTP
-   `400 Bad Request` error message.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.21/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`created`|`restarting`|`running`|`paused`|`exited`)
-  -   `label=key` or `label="key=value"` of a container label
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.21/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": null,
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "StopSignal": "SIGTERM",
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Links": ["redis3:redis"],
-             "LxcConf": {"lxc.utsname":"docker"},
-             "Memory": 0,
-             "MemorySwap": 0,
-             "MemoryReservation": 0,
-             "KernelMemory": 0,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "BlkioWeight": 300,
-             "MemorySwappiness": 60,
-             "OomKillDisable": false,
-             "PidMode": "",
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsOptions": [""],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "GroupAdd": ["newgroup"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": "",
-             "VolumeDriver": ""
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **StopSignal** - Signal to stop a container as a string or unsigned integer. `SIGTERM` by default.
--   **HostConfig**
-    -   **Binds** – A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-           + `volume-name:container-dest` to bind-mount a volume managed by a
-             volume driver into the container. `container-dest` must be an
-             _absolute_ path.
-           + `volume-name:container-dest:ro` to mount the volume read-only
-             inside the container.  `container-dest` must be an _absolute_ path.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **LxcConf** - LXC specific configurations. These configurations only
-          work when using the `lxc` execution driver.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **MemoryReservation** - Memory soft limit in bytes.
-    -   **KernelMemory** - Kernel memory limit in bytes.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsOptions** - A list of DNS options
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **GroupAdd** - A list of additional groups that the container process will run as
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart, `"unless-stopped"` to restart always except when
-            user has manually stopped the container or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-          as a custom network's name to which this container should connect to.
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `gelf`, `awslogs`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-    -   **VolumeDriver** - Driver that this container users to mount volumes.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.21/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": null,
-			"WorkingDir": "",
-			"StopSignal": "SIGTERM"
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecDriver": "native-0.2",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"BlkioWeight": 0,
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsOptions": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"MemoryReservation": 0,
-			"KernelMemory": 0,
-			"OomKillDisable": false,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}],
-			"VolumeDriver": ""
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"SandboxID": "",
-			"HairpinMode": false,
-			"LinkLocalIPv6Address": "",
-			"LinkLocalIPv6PrefixLen": 0,
-			"Ports": null,
-			"SandboxKey": "",
-			"SecondaryIPAddresses": null,
-			"SecondaryIPv6Addresses": null,
-			"EndpointID": "",
-			"Gateway": "",
-			"GlobalIPv6Address": "",
-			"GlobalIPv6PrefixLen": 0,
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"IPv6Gateway": "",
-			"MacAddress": "",
-			"Networks": {
-				"bridge": {
-					"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-					"Gateway": "172.17.0.1",
-					"IPAddress": "172.17.0.2",
-					"IPPrefixLen": 16,
-					"IPv6Gateway": "",
-					"GlobalIPv6Address": "",
-					"GlobalIPv6PrefixLen": 0,
-					"MacAddress": "02:42:ac:12:00:02"
-				}
-			}
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z",
-			"Status": "running"
-		},
-		"Mounts": [
-			{
-				"Source": "/data",
-				"Destination": "/data",
-				"Mode": "ro,Z",
-				"RW": false
-			}
-		]
-	}
-
-**Example request, with size information**:
-
-    GET /v1.21/containers/4fa6e0f0c678/json?size=1 HTTP/1.1
-
-**Example response, with size information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-    ....
-    "SizeRw": 0,
-    "SizeRootFs": 972,
-    ....
-    }
-
-**Query parameters**:
-
--   **size** – 1/True/true or 0/False/false, return container size information. Default is `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.21/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.21/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.21/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.21/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.21/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.21/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "networks": {
-                 "eth0": {
-                     "rx_bytes": 5338,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 36,
-                     "tx_bytes": 648,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 8
-                 },
-                 "eth5": {
-                     "rx_bytes": 4641,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 26,
-                     "tx_bytes": 690,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 9
-                 }
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize`
-
-Resize the TTY for container with  `id`. The unit is number of characters. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.21/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.21/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.21/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.21/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Deprecated** in favor of the `archive` endpoint below.
-
-**Example request**:
-
-    POST /v1.21/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Retrieving information about files and folders in a container
-
-`HEAD /containers/(id or name)/archive`
-
-See the description of the `X-Docker-Container-Path-Stat` header in the
-following section.
-
-#### Get an archive of a filesystem resource in a container
-
-`GET /containers/(id or name)/archive`
-
-Get a tar archive of a resource in the filesystem of container `id`.
-
-**Query parameters**:
-
-- **path** - resource in the container's filesystem to archive. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The resource specified by **path** must exist. To assert that the resource
-    is expected to be a directory, **path** should end in `/` or  `/.`
-    (assuming a path separator of `/`). If **path** ends in `/.` then this
-    indicates that only the contents of the **path** directory should be
-    copied. A symlink is always resolved to its target.
-
-    > **Note**: It is not possible to copy certain system files such as resources
-    > under `/proc`, `/sys`, `/dev`, and mounts created by the user in the
-    > container.
-
-**Example request**:
-
-    GET /v1.21/containers/8cce319429b2/archive?path=/root HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-    X-Docker-Container-Path-Stat: eyJuYW1lIjoicm9vdCIsInNpemUiOjQwOTYsIm1vZGUiOjIxNDc0ODQwOTYsIm10aW1lIjoiMjAxNC0wMi0yN1QyMDo1MToyM1oiLCJsaW5rVGFyZ2V0IjoiIn0=
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-On success, a response header `X-Docker-Container-Path-Stat` will be set to a
-base64-encoded JSON object containing some filesystem header information about
-the archived resource. The above example value would decode to the following
-JSON object (whitespace added for readability):
-
-```json
-{
-    "name": "root",
-    "size": 4096,
-    "mode": 2147484096,
-    "mtime": "2014-02-27T20:51:23Z",
-    "linkTarget": ""
-}
-```
-
-A `HEAD` request can also be made to this endpoint if only this information is
-desired.
-
-**Status codes**:
-
-- **200** - success, returns archive of copied resource
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** was asserted to be a directory but exists as a
-      file)
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** does not exist)
-- **500** - server error
-
-#### Extract an archive of files or folders to a directory in a container
-
-`PUT /containers/(id or name)/archive`
-
-Upload a tar archive to be extracted to a path in the filesystem of container
-`id`.
-
-**Query parameters**:
-
-- **path** - path to a directory in the container
-    to extract the archive's contents into. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The **path** resource must exist.
-- **noOverwriteDirNonDir** - If "1", "true", or "True" then it will be an error
-    if unpacking the given content would cause an existing directory to be
-    replaced with a non-directory and vice versa.
-
-**Example request**:
-
-    PUT /v1.21/containers/8cce319429b2/archive?path=/vol1 HTTP/1.1
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** – the content was extracted successfully
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** should be a directory but exists as a file)
-    - unable to overwrite existing directory with non-directory
-      (if **noOverwriteDirNonDir**)
-    - unable to overwrite existing non-directory with directory
-      (if **noOverwriteDirNonDir**)
-- **403** - client error, permission denied, the volume
-    or container rootfs is marked as read-only.
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** resource does not exist)
-- **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.21/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.21/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.21/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the `Dockerfile`. This is
-        ignored if `remote` is specified and points to an external `Dockerfile`.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
-        You can provide one or more `t` parameters.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file. If
-        the URI points to a tarball, the file is downloaded by the daemon and
-        the contents therein used as the context for the build. If the URI
-        points to a tarball and the `dockerfile` parameter is also specified,
-        there must be a file with the corresponding path inside the tarball.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
--   **buildargs** – JSON map of string pairs for build-time variables. Users pass
-        these values at build-time. Docker uses the `buildargs` as the environment
-        context for command(s) run via the Dockerfile's `RUN` instruction or for
-        variable expansion in other Dockerfile instructions. This is not meant for
-        passing secret values. [Read more about the buildargs instruction](../reference/builder.md#arg)
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – A base64-url-safe-encoded Registry Auth Config JSON
-        object with the following structure:
-
-            {
-                "docker.example.com": {
-                    "username": "janedoe",
-                    "password": "hunter2"
-                },
-                "https://index.docker.io/v1/": {
-                    "username": "mobydock",
-                    "password": "conta1n3rize14"
-                }
-            }
-
-    This object maps the hostname of a registry to an object containing the
-    "username" and "password" for that registry. Multiple registries may
-    be specified as the build may be based on an image requiring
-    authentication to pull from any arbitrary registry. Only the registry
-    domain name (and port if not the default "443") are required. However
-    (for legacy reasons) the "official" Docker, Inc. hosted registry must
-    be specified with both a "https://" prefix and a "/v1/" suffix even
-    though Docker will prefer to use the v2 registry API.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.21/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull. The name may include a tag or
-        digest. This parameter may only be used when pulling an image.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
-        This parameter may only be used when importing an image.
--   **repo** – Repository name given to an image when it is imported.
-        The repo may include a tag. This parameter may only be used when importing
-        an image.
--   **tag** – Tag or digest. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.21/images/example/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Id" : "85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c",
-       "Container" : "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a",
-       "Comment" : "",
-       "Os" : "linux",
-       "Architecture" : "amd64",
-       "Parent" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-       "ContainerConfig" : {
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "User" : "",
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "Labels" : {
-             "com.example.license" : "GPL",
-             "com.example.version" : "1.0",
-             "com.example.vendor" : "Acme"
-          },
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "ExposedPorts" : null,
-          "Cmd" : [
-             "/bin/sh",
-             "-c",
-             "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-          ]
-       },
-       "DockerVersion" : "1.9.0-dev",
-       "VirtualSize" : 188359297,
-       "Size" : 0,
-       "Author" : "",
-       "Created" : "2015-09-10T08:30:53.26995814Z",
-       "GraphDriver" : {
-          "Name" : "aufs",
-          "Data" : null
-       },
-       "RepoDigests" : [
-          "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-       ],
-       "RepoTags" : [
-          "example:1.0",
-          "example:latest",
-          "example:stable"
-       ],
-       "Config" : {
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "StdinOnce" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Cmd" : [
-             "/bin/bash"
-          ],
-          "ExposedPorts" : null,
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "Labels" : {
-             "com.example.vendor" : "Acme",
-             "com.example.version" : "1.0",
-             "com.example.license" : "GPL"
-          },
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "WorkingDir" : "",
-          "User" : ""
-       }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.21/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.21/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-**Example request**:
-
-    POST /v1.21/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.21/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.21/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.21/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "wma55/u1210sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "jdswinbank/sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "vgauthier/sshd",
-                "star_count": 0
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Get the default username and email
-
-**Example request**:
-
-    POST /v1.21/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "email": "hannibal@a-team.com",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.21/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "ClusterStore": "etcd://localhost:2379",
-        "Containers": 11,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OperatingSystem": "Boot2Docker",
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "ServerVersion": "1.9.0",
-        "SwapLimit": false,
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.21/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.5.0",
-         "Os": "linux",
-         "KernelVersion": "3.18.5-tinycore64",
-         "GoVersion": "go1.4.1",
-         "GitCommit": "a8a31ef",
-         "Arch": "amd64",
-         "ApiVersion": "1.20",
-         "Experimental": false
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.21/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.21/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Mounts": [
-           {
-             "Source": "/data",
-             "Destination": "/data",
-             "Mode": "ro,Z",
-             "RW": false
-           }
-         ],
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
--   **pause** – 1/True/true or 0/False/false, whether to pause the container before committing
--   **changes** – Dockerfile instructions to apply while committing
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause
-
-Docker images report the following events:
-
-    delete, import, pull, push, tag, untag
-
-**Example request**:
-
-    GET /v1.21/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status":"pull","id":"busybox:latest","time":1442421700,"timeNano":1442421700598988358}
-    {"status":"create","id":"5745704abe9caa5","from":"busybox","time":1442421716,"timeNano":1442421716853979870}
-    {"status":"attach","id":"5745704abe9caa5","from":"busybox","time":1442421716,"timeNano":1442421716894759198}
-    {"status":"start","id":"5745704abe9caa5","from":"busybox","time":1442421716,"timeNano":1442421716983607193}
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-  -   `label=<string>`; -- image and container label to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.21/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.21/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.21/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.21/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "Privileged": true,
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Privileged** - Boolean value, runs the exec process with extended privileges.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **409** - container is paused
--   **500** - server error
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.21/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **409** - container is paused
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.21/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.21/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: plain/text
-
-    {
-      "ID" : "11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39",
-      "Running" : false,
-      "ExitCode" : 2,
-      "ProcessConfig" : {
-        "privileged" : false,
-        "user" : "",
-        "tty" : false,
-        "entrypoint" : "sh",
-        "arguments" : [
-          "-c",
-          "exit 2"
-        ]
-      },
-      "OpenStdin" : false,
-      "OpenStderr" : false,
-      "OpenStdout" : false,
-      "Container" : {
-        "State" : {
-          "Status" : "running",
-          "Running" : true,
-          "Paused" : false,
-          "Restarting" : false,
-          "OOMKilled" : false,
-          "Pid" : 3650,
-          "ExitCode" : 0,
-          "Error" : "",
-          "StartedAt" : "2014-11-17T22:26:03.717657531Z",
-          "FinishedAt" : "0001-01-01T00:00:00Z"
-        },
-        "ID" : "8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c",
-        "Created" : "2014-11-17T22:26:03.626304998Z",
-        "Path" : "date",
-        "Args" : [],
-        "Config" : {
-          "Hostname" : "8f177a186b97",
-          "Domainname" : "",
-          "User" : "",
-          "AttachStdin" : false,
-          "AttachStdout" : false,
-          "AttachStderr" : false,
-          "ExposedPorts" : null,
-          "Tty" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "Env" : [ "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ],
-          "Cmd" : [
-            "date"
-          ],
-          "Image" : "ubuntu",
-          "Volumes" : null,
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "NetworkDisabled" : false,
-          "MacAddress" : "",
-          "OnBuild" : null,
-          "SecurityOpt" : null
-        },
-        "Image" : "5506de2b643be1e6febbf3b8a240760c6843244c41e12aa2f60ccbb7153d17f5",
-        "NetworkSettings" : {
-          "Bridge": "",
-          "SandboxID": "",
-          "HairpinMode": false,
-          "LinkLocalIPv6Address": "",
-          "LinkLocalIPv6PrefixLen": 0,
-          "Ports": null,
-          "SandboxKey": "",
-          "SecondaryIPAddresses": null,
-          "SecondaryIPv6Addresses": null,
-          "EndpointID": "",
-          "Gateway": "",
-          "GlobalIPv6Address": "",
-          "GlobalIPv6PrefixLen": 0,
-          "IPAddress": "",
-          "IPPrefixLen": 0,
-          "IPv6Gateway": "",
-          "MacAddress": "",
-          "Networks": {
-            "bridge": {
-              "EndpointID": "",
-              "Gateway": "",
-              "IPAddress": "",
-              "IPPrefixLen": 0,
-              "IPv6Gateway": "",
-              "GlobalIPv6Address": "",
-              "GlobalIPv6PrefixLen": 0,
-              "MacAddress": ""
-            }
-          }
-        },
-        "ResolvConfPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/resolv.conf",
-        "HostnamePath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hostname",
-        "HostsPath" : "/var/lib/docker/containers/8f177a186b977fb451136e0fdf182abff5599a08b3c7f6ef0d36a55aaf89634c/hosts",
-        "LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-        "Name" : "/test",
-        "Driver" : "aufs",
-        "ExecDriver" : "native-0.2",
-        "MountLabel" : "",
-        "ProcessLabel" : "",
-        "AppArmorProfile" : "",
-        "RestartCount" : 0,
-        "Mounts" : []
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-### 2.4 Volumes
-
-#### List volumes
-
-`GET /volumes`
-
-**Example request**:
-
-    GET /v1.21/volumes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Volumes": [
-        {
-          "Name": "tardis",
-          "Driver": "local",
-          "Mountpoint": "/var/lib/docker/volumes/tardis"
-        }
-      ]
-    }
-
-**Query parameters**:
-
-- **filters** - JSON encoded value of the filters (a `map[string][]string`) to process on the volumes list. There is one available filter: `dangling=true`
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a volume
-
-`POST /volumes/create`
-
-Create a volume
-
-**Example request**:
-
-    POST /v1.21/volumes/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "tardis"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis"
-    }
-
-**Status codes**:
-
-- **201** - no error
-- **500**  - server error
-
-**JSON parameters**:
-
-- **Name** - The new volume's name. If not specified, Docker generates a name.
-- **Driver** - Name of the volume driver to use. Defaults to `local` for the name.
-- **DriverOpts** - A mapping of driver options and values. These options are
-    passed directly to the driver and are driver specific.
-
-#### Inspect a volume
-
-`GET /volumes/(name)`
-
-Return low-level information on the volume `name`
-
-**Example request**:
-
-    GET /volumes/tardis
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis"
-    }
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such volume
--   **500** - server error
-
-#### Remove a volume
-
-`DELETE /volumes/(name)`
-
-Instruct the driver to remove the volume (`name`).
-
-**Example request**:
-
-    DELETE /v1.21/volumes/tardis HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such volume or volume driver
--   **409** - volume is in use and cannot be removed
--   **500** - server error
-
-### 2.5 Networks
-
-#### List networks
-
-`GET /networks`
-
-**Example request**:
-
-    GET /v1.21/networks HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-[
-  {
-    "Name": "bridge",
-    "Id": "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566",
-    "Scope": "local",
-    "Driver": "bridge",
-    "IPAM": {
-      "Driver": "default",
-      "Config": [
-        {
-          "Subnet": "172.17.0.0/16"
-        }
-      ]
-    },
-    "Containers": {
-      "39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867": {
-        "EndpointID": "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda",
-        "MacAddress": "02:42:ac:11:00:02",
-        "IPv4Address": "172.17.0.2/16",
-        "IPv6Address": ""
-      }
-    },
-    "Options": {
-      "com.docker.network.bridge.default_bridge": "true",
-      "com.docker.network.bridge.enable_icc": "true",
-      "com.docker.network.bridge.enable_ip_masquerade": "true",
-      "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-      "com.docker.network.bridge.name": "docker0",
-      "com.docker.network.driver.mtu": "1500"
-    }
-  },
-  {
-    "Name": "none",
-    "Id": "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794",
-    "Scope": "local",
-    "Driver": "null",
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  },
-  {
-    "Name": "host",
-    "Id": "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e",
-    "Scope": "local",
-    "Driver": "host",
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  }
-]
-```
-
-**Query parameters**:
-
-- **filters** - JSON encoded value of the filters (a `map[string][]string`) to process on the networks list. Available filters: `name=[network-names]` , `id=[network-ids]`
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Inspect network
-
-`GET /networks/<network-id>`
-
-**Example request**:
-
-    GET /v1.21/networks/f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566 HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-{
-  "Name": "bridge",
-  "Id": "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566",
-  "Scope": "local",
-  "Driver": "bridge",
-  "IPAM": {
-    "Driver": "default",
-    "Config": [
-      {
-        "Subnet": "172.17.0.0/16"
-      }
-    ]
-  },
-  "Containers": {
-    "39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867": {
-      "EndpointID": "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda",
-      "MacAddress": "02:42:ac:11:00:02",
-      "IPv4Address": "172.17.0.2/16",
-      "IPv6Address": ""
-    }
-  },
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  }
-}
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - network not found
-
-#### Create a network
-
-`POST /networks/create`
-
-Create a network
-
-**Example request**:
-
-```
-POST /v1.21/networks/create HTTP/1.1
-Content-Type: application/json
-
-{
-  "Name":"isolated_nw",
-  "CheckDuplicate":true,
-  "Driver":"bridge",
-  "IPAM":{
-    "Driver": "default",
-    "Config":[
-      {
-        "Subnet":"172.20.0.0/16",
-        "IPRange":"172.20.10.0/24",
-        "Gateway":"172.20.10.11"
-      }
-    ]
-  }
-}
-```
-
-**Example response**:
-
-```
-HTTP/1.1 201 Created
-Content-Type: application/json
-
-{
-  "Id": "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30",
-  "Warning": ""
-}
-```
-
-**Status codes**:
-
-- **201** - no error
-- **404** - plugin not found
-- **500** - server error
-
-**JSON parameters**:
-
-- **Name** - The new network's name. this is a mandatory field
-- **CheckDuplicate** - Requests daemon to check for networks with same name. Defaults to `false`
-- **Driver** - Name of the network driver plugin to use. Defaults to `bridge` driver
-- **IPAM** - Optional custom IP scheme for the network
-  - **Driver** - Name of the IPAM driver to use. Defaults to `default` driver
-  - **Config** - List of IPAM configuration options, specified as a map:
-      `{"Subnet": <CIDR>, "IPRange": <CIDR>, "Gateway": <IP address>, "AuxAddress": <device_name:IP address>}`
-- **Options** - Network specific options to be used by the drivers
-
-#### Connect a container to a network
-
-`POST /networks/(id)/connect`
-
-Connect a container to a network
-
-**Example request**:
-
-```
-POST /v1.21/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/connect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4"
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container is not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **container** - container-id/name to be connected to the network
-
-#### Disconnect a container from a network
-
-`POST /networks/(id)/disconnect`
-
-Disconnect a container from a network
-
-**Example request**:
-
-```
-POST /v1.21/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/disconnect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4"
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **Container** - container-id/name to be disconnected from a network
-
-#### Remove a network
-
-`DELETE /networks/(id)`
-
-Instruct the driver to remove the network (`id`).
-
-**Example request**:
-
-    DELETE /v1.21/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such network
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.22.md b/installer/vendor/github.com/docker/docker/docs/api/v1.22.md
deleted file mode 100644
index e94081344c..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.22.md
+++ /dev/null
@@ -1,3307 +0,0 @@
----
-title: "Engine API v1.22"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.22/
-- /reference/api/docker_remote_api_v1.22/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.22/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.2",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:02"
-                                  }
-                         }
-                 }
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.8",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:08"
-                                  }
-                         }
-                 }
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.6",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:06"
-                                  }
-                         }
-                 }
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.5",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:05"
-                                  }
-                         }
-                 }
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`created`|`restarting`|`running`|`paused`|`exited`|`dead`)
-  -   `label=key` or `label="key=value"` of a container label
-  -   `isolation=`(`default`|`process`|`hyperv`)   (Windows daemon only)
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.22/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": null,
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "StopSignal": "SIGTERM",
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
-             "Links": ["redis3:redis"],
-             "Memory": 0,
-             "MemorySwap": 0,
-             "MemoryReservation": 0,
-             "KernelMemory": 0,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "BlkioWeight": 300,
-             "BlkioWeightDevice": [{}],
-             "BlkioDeviceReadBps": [{}],
-             "BlkioDeviceReadIOps": [{}],
-             "BlkioDeviceWriteBps": [{}],
-             "BlkioDeviceWriteIOps": [{}],
-             "MemorySwappiness": 60,
-             "OomKillDisable": false,
-             "OomScoreAdj": 500,
-             "PidMode": "",
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsOptions": [""],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "GroupAdd": ["newgroup"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": "",
-             "VolumeDriver": "",
-             "ShmSize": 67108864
-          },
-          "NetworkingConfig": {
-              "EndpointsConfig": {
-                  "isolated_nw" : {
-                      "IPAMConfig": {
-                          "IPv4Address":"172.20.30.33",
-                          "IPv6Address":"2001:db8:abcd::3033"
-                      },
-                      "Links":["container_1", "container_2"],
-                      "Aliases":["server_x", "server_y"]
-                  }
-              }
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **StopSignal** - Signal to stop a container as a string or unsigned integer. `SIGTERM` by default.
--   **HostConfig**
-    -   **Binds** – A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-           + `volume-name:container-dest` to bind-mount a volume managed by a
-             volume driver into the container. `container-dest` must be an
-             _absolute_ path.
-           + `volume-name:container-dest:ro` to mount the volume read-only
-             inside the container.  `container-dest` must be an _absolute_ path.
-    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
-          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **MemoryReservation** - Memory soft limit in bytes.
-    -   **KernelMemory** - Kernel memory limit in bytes.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of:        `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
-    -   **BlkioDeviceReadBps** - Limit read rate (bytes per second) from a device in the form of:	`"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceWriteBps** - Limit write rate (bytes per second) to a device in the form of:	`"BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceReadIOps** - Limit read rate (IO per second) from a device in the form of:	`"BlkioDeviceReadIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **BlkioDeviceWiiteIOps** - Limit write rate (IO per second) to a device in the form of:	`"BlkioDeviceWriteIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **OomScoreAdj** - An integer value containing the score given to the container in order to tune OOM killer preferences.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsOptions** - A list of DNS options
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **GroupAdd** - A list of additional groups that the container process will run as
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart, `"unless-stopped"` to restart always except when
-            user has manually stopped the container or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-          as a custom network's name to which this container should connect to.
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `gelf`, `awslogs`, `splunk`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-    -   **VolumeDriver** - Driver that this container users to mount volumes.
-    -   **ShmSize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.22/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": {
-				"/volumes/data": {}
-			},
-			"WorkingDir": "",
-			"StopSignal": "SIGTERM"
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"BlkioWeight": 0,
-			"BlkioWeightDevice": [{}],
-			"BlkioDeviceReadBps": [{}],
-			"BlkioDeviceWriteBps": [{}],
-			"BlkioDeviceReadIOps": [{}],
-			"BlkioDeviceWriteIOps": [{}],
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsOptions": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"MemoryReservation": 0,
-			"KernelMemory": 0,
-			"OomKillDisable": false,
-			"OomScoreAdj": 500,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}],
-			"VolumeDriver": "",
-			"ShmSize": 67108864
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"SandboxID": "",
-			"HairpinMode": false,
-			"LinkLocalIPv6Address": "",
-			"LinkLocalIPv6PrefixLen": 0,
-			"Ports": null,
-			"SandboxKey": "",
-			"SecondaryIPAddresses": null,
-			"SecondaryIPv6Addresses": null,
-			"EndpointID": "",
-			"Gateway": "",
-			"GlobalIPv6Address": "",
-			"GlobalIPv6PrefixLen": 0,
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"IPv6Gateway": "",
-			"MacAddress": "",
-			"Networks": {
-				"bridge": {
-					"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-					"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-					"Gateway": "172.17.0.1",
-					"IPAddress": "172.17.0.2",
-					"IPPrefixLen": 16,
-					"IPv6Gateway": "",
-					"GlobalIPv6Address": "",
-					"GlobalIPv6PrefixLen": 0,
-					"MacAddress": "02:42:ac:12:00:02"
-				}
-			}
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Dead": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z",
-			"Status": "running"
-		},
-		"Mounts": [
-			{
-				"Name": "fac362...80535",
-				"Source": "/data",
-				"Destination": "/data",
-				"Driver": "local",
-				"Mode": "ro,Z",
-				"RW": false,
-				"Propagation": ""
-			}
-		]
-	}
-
-**Example request, with size information**:
-
-    GET /v1.22/containers/4fa6e0f0c678/json?size=1 HTTP/1.1
-
-**Example response, with size information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-    ....
-    "SizeRw": 0,
-    "SizeRootFs": 972,
-    ....
-    }
-
-**Query parameters**:
-
--   **size** – 1/True/true or 0/False/false, return container size information. Default is `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.22/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.22/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.22/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.22/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.22/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.22/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "networks": {
-                 "eth0": {
-                     "rx_bytes": 5338,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 36,
-                     "tx_bytes": 648,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 8
-                 },
-                 "eth5": {
-                     "rx_bytes": 4641,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 26,
-                     "tx_bytes": 690,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 9
-                 }
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize`
-
-Resize the TTY for container with  `id`. The unit is number of characters. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.22/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Update a container
-
-`POST /containers/(id or name)/update`
-
-Update resource configs of one or more containers.
-
-**Example request**:
-
-       POST /v1.22/containers/e90e34656806/update HTTP/1.1
-       Content-Type: application/json
-
-       {
-         "BlkioWeight": 300,
-         "CpuShares": 512,
-         "CpuPeriod": 100000,
-         "CpuQuota": 50000,
-         "CpusetCpus": "0,1",
-         "CpusetMems": "0",
-         "Memory": 314572800,
-         "MemorySwap": 514288000,
-         "MemoryReservation": 209715200,
-         "KernelMemory": 52428800,
-       }
-
-**Example response**:
-
-       HTTP/1.1 200 OK
-       Content-Type: application/json
-
-       {
-           "Warnings": []
-       }
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **409** - container is paused
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.22/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.22/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.22/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Deprecated** in favor of the `archive` endpoint below.
-
-**Example request**:
-
-    POST /v1.22/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Retrieving information about files and folders in a container
-
-`HEAD /containers/(id or name)/archive`
-
-See the description of the `X-Docker-Container-Path-Stat` header in the
-following section.
-
-#### Get an archive of a filesystem resource in a container
-
-`GET /containers/(id or name)/archive`
-
-Get a tar archive of a resource in the filesystem of container `id`.
-
-**Query parameters**:
-
-- **path** - resource in the container's filesystem to archive. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The resource specified by **path** must exist. To assert that the resource
-    is expected to be a directory, **path** should end in `/` or  `/.`
-    (assuming a path separator of `/`). If **path** ends in `/.` then this
-    indicates that only the contents of the **path** directory should be
-    copied. A symlink is always resolved to its target.
-
-    > **Note**: It is not possible to copy certain system files such as resources
-    > under `/proc`, `/sys`, `/dev`, and mounts created by the user in the
-    > container.
-
-**Example request**:
-
-    GET /v1.22/containers/8cce319429b2/archive?path=/root HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-    X-Docker-Container-Path-Stat: eyJuYW1lIjoicm9vdCIsInNpemUiOjQwOTYsIm1vZGUiOjIxNDc0ODQwOTYsIm10aW1lIjoiMjAxNC0wMi0yN1QyMDo1MToyM1oiLCJsaW5rVGFyZ2V0IjoiIn0=
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-On success, a response header `X-Docker-Container-Path-Stat` will be set to a
-base64-encoded JSON object containing some filesystem header information about
-the archived resource. The above example value would decode to the following
-JSON object (whitespace added for readability):
-
-```json
-{
-    "name": "root",
-    "size": 4096,
-    "mode": 2147484096,
-    "mtime": "2014-02-27T20:51:23Z",
-    "linkTarget": ""
-}
-```
-
-A `HEAD` request can also be made to this endpoint if only this information is
-desired.
-
-**Status codes**:
-
-- **200** - success, returns archive of copied resource
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** was asserted to be a directory but exists as a
-      file)
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** does not exist)
-- **500** - server error
-
-#### Extract an archive of files or folders to a directory in a container
-
-`PUT /containers/(id or name)/archive`
-
-Upload a tar archive to be extracted to a path in the filesystem of container
-`id`.
-
-**Query parameters**:
-
-- **path** - path to a directory in the container
-    to extract the archive's contents into. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The **path** resource must exist.
-- **noOverwriteDirNonDir** - If "1", "true", or "True" then it will be an error
-    if unpacking the given content would cause an existing directory to be
-    replaced with a non-directory and vice versa.
-
-**Example request**:
-
-    PUT /v1.22/containers/8cce319429b2/archive?path=/vol1 HTTP/1.1
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** – the content was extracted successfully
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** should be a directory but exists as a file)
-    - unable to overwrite existing directory with non-directory
-      (if **noOverwriteDirNonDir**)
-    - unable to overwrite existing non-directory with directory
-      (if **noOverwriteDirNonDir**)
-- **403** - client error, permission denied, the volume
-    or container rootfs is marked as read-only.
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** resource does not exist)
-- **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.22/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.22/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.22/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the `Dockerfile`. This is
-        ignored if `remote` is specified and points to an external `Dockerfile`.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
-        You can provide one or more `t` parameters.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file. If
-        the URI points to a tarball, the file is downloaded by the daemon and
-        the contents therein used as the context for the build. If the URI
-        points to a tarball and the `dockerfile` parameter is also specified,
-        there must be a file with the corresponding path inside the tarball.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
--   **buildargs** – JSON map of string pairs for build-time variables. Users pass
-        these values at build-time. Docker uses the `buildargs` as the environment
-        context for command(s) run via the Dockerfile's `RUN` instruction or for
-        variable expansion in other Dockerfile instructions. This is not meant for
-        passing secret values. [Read more about the buildargs instruction](../reference/builder.md#arg)
--   **shmsize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – A base64-url-safe-encoded Registry Auth Config JSON
-        object with the following structure:
-
-            {
-                "docker.example.com": {
-                    "username": "janedoe",
-                    "password": "hunter2"
-                },
-                "https://index.docker.io/v1/": {
-                    "username": "mobydock",
-                    "password": "conta1n3rize14"
-                }
-            }
-
-    This object maps the hostname of a registry to an object containing the
-    "username" and "password" for that registry. Multiple registries may
-    be specified as the build may be based on an image requiring
-    authentication to pull from any arbitrary registry. Only the registry
-    domain name (and port if not the default "443") are required. However
-    (for legacy reasons) the "official" Docker, Inc. hosted registry must
-    be specified with both a "https://" prefix and a "/v1/" suffix even
-    though Docker will prefer to use the v2 registry API.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.22/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull. The name may include a tag or
-        digest. This parameter may only be used when pulling an image.
-        The pull is cancelled if the HTTP connection is closed.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
-        This parameter may only be used when importing an image.
--   **repo** – Repository name given to an image when it is imported.
-        The repo may include a tag. This parameter may only be used when importing
-        an image.
--   **tag** – Tag or digest. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com"
-    }
-        ```
-
-    - Token based login:
-
-        ```
-    {
-            "registrytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.22/images/example/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Id" : "85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c",
-       "Container" : "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a",
-       "Comment" : "",
-       "Os" : "linux",
-       "Architecture" : "amd64",
-       "Parent" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-       "ContainerConfig" : {
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "User" : "",
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "Labels" : {
-             "com.example.license" : "GPL",
-             "com.example.version" : "1.0",
-             "com.example.vendor" : "Acme"
-          },
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "ExposedPorts" : null,
-          "Cmd" : [
-             "/bin/sh",
-             "-c",
-             "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-          ]
-       },
-       "DockerVersion" : "1.9.0-dev",
-       "VirtualSize" : 188359297,
-       "Size" : 0,
-       "Author" : "",
-       "Created" : "2015-09-10T08:30:53.26995814Z",
-       "GraphDriver" : {
-          "Name" : "aufs",
-          "Data" : null
-       },
-       "RepoDigests" : [
-          "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-       ],
-       "RepoTags" : [
-          "example:1.0",
-          "example:latest",
-          "example:stable"
-       ],
-       "Config" : {
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "StdinOnce" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Cmd" : [
-             "/bin/bash"
-          ],
-          "ExposedPorts" : null,
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "Labels" : {
-             "com.example.vendor" : "Acme",
-             "com.example.version" : "1.0",
-             "com.example.license" : "GPL"
-          },
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "WorkingDir" : "",
-          "User" : ""
-       }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.22/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.22/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-The push is cancelled if the HTTP connection is closed.
-
-**Example request**:
-
-    POST /v1.22/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com",
-    }
-        ```
-
-    - Token based login:
-
-        ```
-    {
-            "registrytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.22/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.22/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.22/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "wma55/u1210sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "jdswinbank/sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "vgauthier/sshd",
-                "star_count": 0
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Get the default username and email
-
-**Example request**:
-
-    POST /v1.22/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "email": "hannibal@a-team.com",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.22/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Architecture": "x86_64",
-        "ClusterStore": "etcd://localhost:2379",
-        "Containers": 11,
-        "ContainersRunning": 7,
-        "ContainersStopped": 3,
-        "ContainersPaused": 1,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OSType": "linux",
-        "OperatingSystem": "Boot2Docker",
-        "Plugins": {
-            "Volume": [
-                "local"
-            ],
-            "Network": [
-                "null",
-                "host",
-                "bridge"
-            ]
-        },
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "ServerVersion": "1.9.0",
-        "SwapLimit": false,
-        "SystemStatus": [["State", "Healthy"]],
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.22/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.10.0",
-         "Os": "linux",
-         "KernelVersion": "3.19.0-23-generic",
-         "GoVersion": "go1.4.2",
-         "GitCommit": "e75da4b",
-         "Arch": "amd64",
-         "ApiVersion": "1.22",
-         "BuildTime": "2015-12-01T07:09:13.444803460+00:00",
-         "Experimental": true
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.22/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.22/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Mounts": [
-           {
-             "Source": "/data",
-             "Destination": "/data",
-             "Mode": "ro,Z",
-             "RW": false
-           }
-         ],
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
--   **pause** – 1/True/true or 0/False/false, whether to pause the container before committing
--   **changes** – Dockerfile instructions to apply while committing
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update
-
-Docker images report the following events:
-
-    delete, import, pull, push, tag, untag
-
-Docker volumes report the following events:
-
-    create, mount, unmount, destroy
-
-Docker networks report the following events:
-
-    create, connect, disconnect, destroy
-
-**Example request**:
-
-    GET /v1.22/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Server: Docker/1.10.0 (linux)
-    Date: Fri, 29 Apr 2016 15:18:06 GMT
-    Transfer-Encoding: chunked
-
-    {
-      "status": "pull",
-      "id": "alpine:latest",
-      "Type": "image",
-      "Action": "pull",
-      "Actor": {
-        "ID": "alpine:latest",
-        "Attributes": {
-          "name": "alpine"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101301854122
-    }
-    {
-      "status": "create",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "create",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101381709551
-    }
-    {
-      "status": "attach",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "attach",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101383858412
-    }
-    {
-      "Type": "network",
-      "Action": "connect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101394865557
-    }
-    {
-      "status": "start",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "start",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101607533796
-    }
-    {
-      "status": "resize",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "resize",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "height": "46",
-          "image": "alpine",
-          "name": "my-container",
-          "width": "204"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101610269268
-    }
-    {
-      "status": "die",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "die",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "exitCode": "0",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105079144137
-    }
-    {
-      "Type": "network",
-      "Action": "disconnect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105230860245
-    }
-    {
-      "status": "destroy",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "destroy",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105338056026
-    }
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-  -   `label=<string>`; -- image and container label to filter
-  -   `type=<string>`; -- either `container` or `image` or `volume` or `network`
-  -   `volume=<string>`; -- volume to filter
-  -   `network=<string>`; -- network to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.22/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.22/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.22/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.22/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "DetachKeys": "ctrl-p,ctrl-q",
-      "Privileged": true,
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **DetachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Privileged** - Boolean value, runs the exec process with extended privileges.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **409** - container is paused
--   **500** - server error
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.22/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **409** - container is paused
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.22/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.22/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "CanRemove": false,
-      "ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
-      "DetachKeys": "",
-      "ExitCode": 2,
-      "ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
-      "OpenStderr": true,
-      "OpenStdin": true,
-      "OpenStdout": true,
-      "ProcessConfig": {
-        "arguments": [
-          "-c",
-          "exit 2"
-        ],
-        "entrypoint": "sh",
-        "privileged": false,
-        "tty": true,
-        "user": "1000"
-      },
-      "Running": false
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-### 2.4 Volumes
-
-#### List volumes
-
-`GET /volumes`
-
-**Example request**:
-
-    GET /v1.22/volumes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Volumes": [
-        {
-          "Name": "tardis",
-          "Driver": "local",
-          "Mountpoint": "/var/lib/docker/volumes/tardis"
-        }
-      ],
-      "Warnings": []
-    }
-
-**Query parameters**:
-
-- **filters** - JSON encoded value of the filters (a `map[string][]string`) to process on the volumes list. There is one available filter: `dangling=true`
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a volume
-
-`POST /volumes/create`
-
-Create a volume
-
-**Example request**:
-
-    POST /v1.22/volumes/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "tardis"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis"
-    }
-
-**Status codes**:
-
-- **201** - no error
-- **500**  - server error
-
-**JSON parameters**:
-
-- **Name** - The new volume's name. If not specified, Docker generates a name.
-- **Driver** - Name of the volume driver to use. Defaults to `local` for the name.
-- **DriverOpts** - A mapping of driver options and values. These options are
-    passed directly to the driver and are driver specific.
-
-#### Inspect a volume
-
-`GET /volumes/(name)`
-
-Return low-level information on the volume `name`
-
-**Example request**:
-
-    GET /volumes/tardis
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis"
-    }
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such volume
--   **500** - server error
-
-#### Remove a volume
-
-`DELETE /volumes/(name)`
-
-Instruct the driver to remove the volume (`name`).
-
-**Example request**:
-
-    DELETE /v1.22/volumes/tardis HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such volume or volume driver
--   **409** - volume is in use and cannot be removed
--   **500** - server error
-
-### 2.5 Networks
-
-#### List networks
-
-`GET /networks`
-
-**Example request**:
-
-    GET /v1.22/networks?filters={"type":{"custom":true}} HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-[
-  {
-    "Name": "bridge",
-    "Id": "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566",
-    "Scope": "local",
-    "Driver": "bridge",
-    "IPAM": {
-      "Driver": "default",
-      "Config": [
-        {
-          "Subnet": "172.17.0.0/16"
-        }
-      ]
-    },
-    "Containers": {
-      "39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867": {
-        "EndpointID": "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda",
-        "MacAddress": "02:42:ac:11:00:02",
-        "IPv4Address": "172.17.0.2/16",
-        "IPv6Address": ""
-      }
-    },
-    "Options": {
-      "com.docker.network.bridge.default_bridge": "true",
-      "com.docker.network.bridge.enable_icc": "true",
-      "com.docker.network.bridge.enable_ip_masquerade": "true",
-      "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-      "com.docker.network.bridge.name": "docker0",
-      "com.docker.network.driver.mtu": "1500"
-    }
-  },
-  {
-    "Name": "none",
-    "Id": "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794",
-    "Scope": "local",
-    "Driver": "null",
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  },
-  {
-    "Name": "host",
-    "Id": "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e",
-    "Scope": "local",
-    "Driver": "host",
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  }
-]
-```
-
-**Query parameters**:
-
-- **filters** - JSON encoded network list filter. The filter value is one of:
-  -   `id=<network-id>` Matches all or part of a network id.
-  -   `name=<network-name>` Matches all or part of a network name.
-  -   `type=["custom"|"builtin"]` Filters networks by type. The `custom` keyword returns all user-defined networks.
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Inspect network
-
-`GET /networks/<network-id>`
-
-**Example request**:
-
-    GET /v1.22/networks/7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99 HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-{
-  "Name": "net01",
-  "Id": "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99",
-  "Scope": "local",
-  "Driver": "bridge",
-  "IPAM": {
-    "Driver": "default",
-    "Config": [
-      {
-        "Subnet": "172.19.0.0/16",
-        "Gateway": "172.19.0.1/16"
-      }
-    ],
-    "Options": {
-        "foo": "bar"
-    }
-  },
-  "Containers": {
-    "19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c": {
-      "Name": "test",
-      "EndpointID": "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a",
-      "MacAddress": "02:42:ac:13:00:02",
-      "IPv4Address": "172.19.0.2/16",
-      "IPv6Address": ""
-    }
-  },
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  }
-}
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - network not found
-
-#### Create a network
-
-`POST /networks/create`
-
-Create a network
-
-**Example request**:
-
-```
-POST /v1.22/networks/create HTTP/1.1
-Content-Type: application/json
-
-{
-  "Name":"isolated_nw",
-  "CheckDuplicate":true,
-  "Driver":"bridge",
-  "IPAM":{
-    "Driver": "default",
-    "Config":[
-      {
-        "Subnet":"172.20.0.0/16",
-        "IPRange":"172.20.10.0/24",
-        "Gateway":"172.20.10.11"
-      },
-      {
-        "Subnet":"2001:db8:abcd::/64",
-        "Gateway":"2001:db8:abcd::1011"
-      }
-    ],
-    "Options": {
-      "foo": "bar"
-    }
-  },
-  "Internal":true
-}
-```
-
-**Example response**:
-
-```
-HTTP/1.1 201 Created
-Content-Type: application/json
-
-{
-  "Id": "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30",
-  "Warning": ""
-}
-```
-
-**Status codes**:
-
-- **201** - no error
-- **404** - plugin not found
-- **500** - server error
-
-**JSON parameters**:
-
-- **Name** - The new network's name. this is a mandatory field
-- **CheckDuplicate** - Requests daemon to check for networks with same name. Defaults to `false`
-- **Driver** - Name of the network driver plugin to use. Defaults to `bridge` driver
-- **IPAM** - Optional custom IP scheme for the network
-  - **Driver** - Name of the IPAM driver to use. Defaults to `default` driver
-  - **Config** - List of IPAM configuration options, specified as a map:
-      `{"Subnet": <CIDR>, "IPRange": <CIDR>, "Gateway": <IP address>, "AuxAddress": <device_name:IP address>}`
-  - **Options** - Driver-specific options, specified as a map: `{"option":"value" [,"option2":"value2"]}`
-- **Options** - Network specific options to be used by the drivers
-
-#### Connect a container to a network
-
-`POST /networks/(id)/connect`
-
-Connect a container to a network
-
-**Example request**:
-
-```
-POST /v1.22/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/connect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "EndpointConfig": {
-    "IPAMConfig": {
-        "IPv4Address":"172.24.56.89",
-        "IPv6Address":"2001:db8::5689"
-    }
-  }
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container is not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **container** - container-id/name to be connected to the network
-
-#### Disconnect a container from a network
-
-`POST /networks/(id)/disconnect`
-
-Disconnect a container from a network
-
-**Example request**:
-
-```
-POST /v1.22/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/disconnect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "Force":false
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **Container** - container-id/name to be disconnected from a network
-- **Force** - Force the container to disconnect from a network
-
-#### Remove a network
-
-`DELETE /networks/(id)`
-
-Instruct the driver to remove the network (`id`).
-
-**Example request**:
-
-    DELETE /v1.22/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such network
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.23.md b/installer/vendor/github.com/docker/docker/docs/api/v1.23.md
deleted file mode 100644
index e23811bb95..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.23.md
+++ /dev/null
@@ -1,3424 +0,0 @@
----
-title: "Engine API v1.23"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.23/
-- /reference/api/docker_remote_api_v1.23/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
- - When the client API version is newer than the daemon's, these calls return an HTTP
-   `400 Bad Request` error message.
-
-## 2. Endpoints
-
-### 2.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.23/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.2",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:02"
-                                  }
-                         }
-                 },
-                 "Mounts": [
-                         {
-                                  "Name": "fac362...80535",
-                                  "Source": "/data",
-                                  "Destination": "/data",
-                                  "Driver": "local",
-                                  "Mode": "ro,Z",
-                                  "RW": false,
-                                  "Propagation": ""
-                         }
-                 ]
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.8",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:08"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.6",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:06"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.5",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:05"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`created`|`restarting`|`running`|`paused`|`exited`|`dead`)
-  -   `label=key` or `label="key=value"` of a container label
-  -   `isolation=`(`default`|`process`|`hyperv`)   (Windows daemon only)
-  -   `ancestor`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-  -   `before`=(`<container id>` or `<container name>`)
-  -   `since`=(`<container id>` or `<container name>`)
-  -   `volume`=(`<volume name>` or `<mount point destination>`)
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.23/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": "",
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "StopSignal": "SIGTERM",
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
-             "Links": ["redis3:redis"],
-             "Memory": 0,
-             "MemorySwap": 0,
-             "MemoryReservation": 0,
-             "KernelMemory": 0,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "BlkioWeight": 300,
-             "BlkioWeightDevice": [{}],
-             "BlkioDeviceReadBps": [{}],
-             "BlkioDeviceReadIOps": [{}],
-             "BlkioDeviceWriteBps": [{}],
-             "BlkioDeviceWriteIOps": [{}],
-             "MemorySwappiness": 60,
-             "OomKillDisable": false,
-             "OomScoreAdj": 500,
-             "PidMode": "",
-             "PidsLimit": -1,
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsOptions": [""],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "GroupAdd": ["newgroup"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "CgroupParent": "",
-             "VolumeDriver": "",
-             "ShmSize": 67108864
-          },
-          "NetworkingConfig": {
-              "EndpointsConfig": {
-                  "isolated_nw" : {
-                      "IPAMConfig": {
-                          "IPv4Address":"172.20.30.33",
-                          "IPv6Address":"2001:db8:abcd::3033"
-                      },
-                      "Links":["container_1", "container_2"],
-                      "Aliases":["server_x", "server_y"]
-                  }
-              }
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **StopSignal** - Signal to stop a container as a string or unsigned integer. `SIGTERM` by default.
--   **HostConfig**
-    -   **Binds** – A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-           + `volume-name:container-dest` to bind-mount a volume managed by a
-             volume driver into the container. `container-dest` must be an
-             _absolute_ path.
-           + `volume-name:container-dest:ro` to mount the volume read-only
-             inside the container.  `container-dest` must be an _absolute_ path.
-    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
-          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **MemoryReservation** - Memory soft limit in bytes.
-    -   **KernelMemory** - Kernel memory limit in bytes.
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of:        `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
-    -   **BlkioDeviceReadBps** - Limit read rate (bytes per second) from a device in the form of:	`"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceWriteBps** - Limit write rate (bytes per second) to a device in the form of:	`"BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceReadIOps** - Limit read rate (IO per second) from a device in the form of:	`"BlkioDeviceReadIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **BlkioDeviceWiiteIOps** - Limit write rate (IO per second) to a device in the form of:	`"BlkioDeviceWriteIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **OomScoreAdj** - An integer value containing the score given to the container in order to tune OOM killer preferences.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PidsLimit** - Tune a container's pids limit. Set -1 for unlimited.
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsOptions** - A list of DNS options
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **GroupAdd** - A list of additional groups that the container process will run as
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart, `"unless-stopped"` to restart always except when
-            user has manually stopped the container or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **UsernsMode**  - Sets the usernamespace mode for the container when usernamespace remapping option is enabled.
-           supported values are: `host`.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-          as a custom network's name to which this container should connect to.
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `gelf`, `fluentd`, `awslogs`, `splunk`, `etwlogs`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-    -   **VolumeDriver** - Driver that this container users to mount volumes.
-    -   **ShmSize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.23/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": {
-				"/volumes/data": {}
-			},
-			"WorkingDir": "",
-			"StopSignal": "SIGTERM"
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"BlkioWeight": 0,
-			"BlkioWeightDevice": [{}],
-			"BlkioDeviceReadBps": [{}],
-			"BlkioDeviceWriteBps": [{}],
-			"BlkioDeviceReadIOps": [{}],
-			"BlkioDeviceWriteIOps": [{}],
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsOptions": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"MemoryReservation": 0,
-			"KernelMemory": 0,
-			"OomKillDisable": false,
-			"OomScoreAdj": 500,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}],
-			"VolumeDriver": "",
-			"ShmSize": 67108864
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"SandboxID": "",
-			"HairpinMode": false,
-			"LinkLocalIPv6Address": "",
-			"LinkLocalIPv6PrefixLen": 0,
-			"Ports": null,
-			"SandboxKey": "",
-			"SecondaryIPAddresses": null,
-			"SecondaryIPv6Addresses": null,
-			"EndpointID": "",
-			"Gateway": "",
-			"GlobalIPv6Address": "",
-			"GlobalIPv6PrefixLen": 0,
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"IPv6Gateway": "",
-			"MacAddress": "",
-			"Networks": {
-				"bridge": {
-					"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-					"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-					"Gateway": "172.17.0.1",
-					"IPAddress": "172.17.0.2",
-					"IPPrefixLen": 16,
-					"IPv6Gateway": "",
-					"GlobalIPv6Address": "",
-					"GlobalIPv6PrefixLen": 0,
-					"MacAddress": "02:42:ac:12:00:02"
-				}
-			}
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Dead": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z",
-			"Status": "running"
-		},
-		"Mounts": [
-			{
-				"Name": "fac362...80535",
-				"Source": "/data",
-				"Destination": "/data",
-				"Driver": "local",
-				"Mode": "ro,Z",
-				"RW": false,
-				"Propagation": ""
-			}
-		]
-	}
-
-**Example request, with size information**:
-
-    GET /v1.23/containers/4fa6e0f0c678/json?size=1 HTTP/1.1
-
-**Example response, with size information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-    ....
-    "SizeRw": 0,
-    "SizeRootFs": 972,
-    ....
-    }
-
-**Query parameters**:
-
--   **size** – 1/True/true or 0/False/false, return container size information. Default is `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.23/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.23/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.23/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.23/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.23/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.23/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "pids_stats": {
-            "current": 3
-         },
-         "networks": {
-                 "eth0": {
-                     "rx_bytes": 5338,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 36,
-                     "tx_bytes": 648,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 8
-                 },
-                 "eth5": {
-                     "rx_bytes": 4641,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 26,
-                     "tx_bytes": 690,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 9
-                 }
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize`
-
-Resize the TTY for container with  `id`. The unit is number of characters. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.23/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-> **Note**:
-> For backwards compatibility, this endpoint accepts a `HostConfig` as JSON-encoded request body.
-> See [create a container](#create-a-container) for details.
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Update a container
-
-`POST /containers/(id or name)/update`
-
-Update configuration of one or more containers.
-
-**Example request**:
-
-       POST /v1.23/containers/e90e34656806/update HTTP/1.1
-       Content-Type: application/json
-
-       {
-         "BlkioWeight": 300,
-         "CpuShares": 512,
-         "CpuPeriod": 100000,
-         "CpuQuota": 50000,
-         "CpusetCpus": "0,1",
-         "CpusetMems": "0",
-         "Memory": 314572800,
-         "MemorySwap": 514288000,
-         "MemoryReservation": 209715200,
-         "KernelMemory": 52428800,
-         "RestartPolicy": {
-           "MaximumRetryCount": 4,
-           "Name": "on-failure"
-         },
-       }
-
-**Example response**:
-
-       HTTP/1.1 200 OK
-       Content-Type: application/json
-
-       {
-           "Warnings": []
-       }
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **409** - container is paused
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.23/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.23/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.23/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Copy files or folders from a container
-
-`POST /containers/(id or name)/copy`
-
-Copy files or folders of container `id`
-
-**Deprecated** in favor of the `archive` endpoint below.
-
-**Example request**:
-
-    POST /v1.23/containers/4fa6e0f0c678/copy HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Resource": "test.txt"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Retrieving information about files and folders in a container
-
-`HEAD /containers/(id or name)/archive`
-
-See the description of the `X-Docker-Container-Path-Stat` header in the
-following section.
-
-#### Get an archive of a filesystem resource in a container
-
-`GET /containers/(id or name)/archive`
-
-Get a tar archive of a resource in the filesystem of container `id`.
-
-**Query parameters**:
-
-- **path** - resource in the container's filesystem to archive. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The resource specified by **path** must exist. To assert that the resource
-    is expected to be a directory, **path** should end in `/` or  `/.`
-    (assuming a path separator of `/`). If **path** ends in `/.` then this
-    indicates that only the contents of the **path** directory should be
-    copied. A symlink is always resolved to its target.
-
-    > **Note**: It is not possible to copy certain system files such as resources
-    > under `/proc`, `/sys`, `/dev`, and mounts created by the user in the
-    > container.
-
-**Example request**:
-
-    GET /v1.23/containers/8cce319429b2/archive?path=/root HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-    X-Docker-Container-Path-Stat: eyJuYW1lIjoicm9vdCIsInNpemUiOjQwOTYsIm1vZGUiOjIxNDc0ODQwOTYsIm10aW1lIjoiMjAxNC0wMi0yN1QyMDo1MToyM1oiLCJsaW5rVGFyZ2V0IjoiIn0=
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-On success, a response header `X-Docker-Container-Path-Stat` will be set to a
-base64-encoded JSON object containing some filesystem header information about
-the archived resource. The above example value would decode to the following
-JSON object (whitespace added for readability):
-
-```json
-{
-    "name": "root",
-    "size": 4096,
-    "mode": 2147484096,
-    "mtime": "2014-02-27T20:51:23Z",
-    "linkTarget": ""
-}
-```
-
-A `HEAD` request can also be made to this endpoint if only this information is
-desired.
-
-**Status codes**:
-
-- **200** - success, returns archive of copied resource
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** was asserted to be a directory but exists as a
-      file)
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** does not exist)
-- **500** - server error
-
-#### Extract an archive of files or folders to a directory in a container
-
-`PUT /containers/(id or name)/archive`
-
-Upload a tar archive to be extracted to a path in the filesystem of container
-`id`.
-
-**Query parameters**:
-
-- **path** - path to a directory in the container
-    to extract the archive's contents into. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The **path** resource must exist.
-- **noOverwriteDirNonDir** - If "1", "true", or "True" then it will be an error
-    if unpacking the given content would cause an existing directory to be
-    replaced with a non-directory and vice versa.
-
-**Example request**:
-
-    PUT /v1.23/containers/8cce319429b2/archive?path=/vol1 HTTP/1.1
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** – the content was extracted successfully
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** should be a directory but exists as a file)
-    - unable to overwrite existing directory with non-directory
-      (if **noOverwriteDirNonDir**)
-    - unable to overwrite existing non-directory with directory
-      (if **noOverwriteDirNonDir**)
-- **403** - client error, permission denied, the volume
-    or container rootfs is marked as read-only.
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** resource does not exist)
-- **500** – server error
-
-### 2.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.23/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.23/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.23/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the `Dockerfile`. This is
-        ignored if `remote` is specified and points to an external `Dockerfile`.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
-        You can provide one or more `t` parameters.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file. If
-        the URI points to a tarball, the file is downloaded by the daemon and
-        the contents therein used as the context for the build. If the URI
-        points to a tarball and the `dockerfile` parameter is also specified,
-        there must be a file with the corresponding path inside the tarball.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
--   **buildargs** – JSON map of string pairs for build-time variables. Users pass
-        these values at build-time. Docker uses the `buildargs` as the environment
-        context for command(s) run via the Dockerfile's `RUN` instruction or for
-        variable expansion in other Dockerfile instructions. This is not meant for
-        passing secret values. [Read more about the buildargs instruction](../reference/builder.md#arg)
--   **shmsize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
--   **labels** – JSON map of string pairs for labels to set on the image.
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – A base64-url-safe-encoded Registry Auth Config JSON
-        object with the following structure:
-
-            {
-                "docker.example.com": {
-                    "username": "janedoe",
-                    "password": "hunter2"
-                },
-                "https://index.docker.io/v1/": {
-                    "username": "mobydock",
-                    "password": "conta1n3rize14"
-                }
-            }
-
-    This object maps the hostname of a registry to an object containing the
-    "username" and "password" for that registry. Multiple registries may
-    be specified as the build may be based on an image requiring
-    authentication to pull from any arbitrary registry. Only the registry
-    domain name (and port if not the default "443") are required. However
-    (for legacy reasons) the "official" Docker, Inc. hosted registry must
-    be specified with both a "https://" prefix and a "/v1/" suffix even
-    though Docker will prefer to use the v2 registry API.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.23/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull. The name may include a tag or
-        digest. This parameter may only be used when pulling an image.
-        The pull is cancelled if the HTTP connection is closed.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
-        This parameter may only be used when importing an image.
--   **repo** – Repository name given to an image when it is imported.
-        The repo may include a tag. This parameter may only be used when importing
-        an image.
--   **tag** – Tag or digest. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com"
-    }
-        ```
-
-    - Token based login:
-
-        ```
-    {
-            "identitytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.23/images/example/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Id" : "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c",
-       "Container" : "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a",
-       "Comment" : "",
-       "Os" : "linux",
-       "Architecture" : "amd64",
-       "Parent" : "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-       "ContainerConfig" : {
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "User" : "",
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "Labels" : {
-             "com.example.license" : "GPL",
-             "com.example.version" : "1.0",
-             "com.example.vendor" : "Acme"
-          },
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "ExposedPorts" : null,
-          "Cmd" : [
-             "/bin/sh",
-             "-c",
-             "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-          ]
-       },
-       "DockerVersion" : "1.9.0-dev",
-       "VirtualSize" : 188359297,
-       "Size" : 0,
-       "Author" : "",
-       "Created" : "2015-09-10T08:30:53.26995814Z",
-       "GraphDriver" : {
-          "Name" : "aufs",
-          "Data" : null
-       },
-       "RepoDigests" : [
-          "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-       ],
-       "RepoTags" : [
-          "example:1.0",
-          "example:latest",
-          "example:stable"
-       ],
-       "Config" : {
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "StdinOnce" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Cmd" : [
-             "/bin/bash"
-          ],
-          "ExposedPorts" : null,
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "Labels" : {
-             "com.example.vendor" : "Acme",
-             "com.example.version" : "1.0",
-             "com.example.license" : "GPL"
-          },
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "WorkingDir" : "",
-          "User" : ""
-       },
-       "RootFS": {
-           "Type": "layers",
-           "Layers": [
-               "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6",
-               "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-           ]
-       }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.23/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.23/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-The push is cancelled if the HTTP connection is closed.
-
-**Example request**:
-
-    POST /v1.23/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com",
-    }
-        ```
-
-    - Identity token based login:
-
-        ```
-    {
-            "identitytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.23/images/test/tag?repo=myrepo&force=0&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **force** – 1/True/true or 0/False/false, default false
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.23/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.23/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "wma55/u1210sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "jdswinbank/sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "vgauthier/sshd",
-                "star_count": 0
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 2.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Validate credentials for a registry and get identity token,
-if available, for accessing the registry without password.
-
-**Example request**:
-
-    POST /v1.23/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-    {
-         "Status": "Login Succeeded",
-         "IdentityToken": "9cbaf023786cd7..."
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.23/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Architecture": "x86_64",
-        "ClusterStore": "etcd://localhost:2379",
-        "CgroupDriver": "cgroupfs",
-        "Containers": 11,
-        "ContainersRunning": 7,
-        "ContainersStopped": 3,
-        "ContainersPaused": 1,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExecutionDriver": "native-0.1",
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelMemory": true,
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OSType": "linux",
-        "OperatingSystem": "Boot2Docker",
-        "Plugins": {
-            "Volume": [
-                "local"
-            ],
-            "Network": [
-                "null",
-                "host",
-                "bridge"
-            ]
-        },
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "ServerVersion": "1.9.0",
-        "SwapLimit": false,
-        "SystemStatus": [["State", "Healthy"]],
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.23/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.11.0",
-         "Os": "linux",
-         "KernelVersion": "3.19.0-23-generic",
-         "GoVersion": "go1.4.2",
-         "GitCommit": "e75da4b",
-         "Arch": "amd64",
-         "ApiVersion": "1.23",
-         "BuildTime": "2015-12-01T07:09:13.444803460+00:00",
-         "Experimental": true
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.23/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.23/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Mounts": [
-           {
-             "Source": "/data",
-             "Destination": "/data",
-             "Mode": "ro,Z",
-             "RW": false
-           }
-         ],
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
--   **pause** – 1/True/true or 0/False/false, whether to pause the container before committing
--   **changes** – Dockerfile instructions to apply while committing
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, die, exec_create, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update
-
-Docker images report the following events:
-
-    delete, import, pull, push, tag, untag
-
-Docker volumes report the following events:
-
-    create, mount, unmount, destroy
-
-Docker networks report the following events:
-
-    create, connect, disconnect, destroy
-
-**Example request**:
-
-    GET /v1.23/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Server: Docker/1.11.0 (linux)
-    Date: Fri, 29 Apr 2016 15:18:06 GMT
-    Transfer-Encoding: chunked
-
-    {
-      "status": "pull",
-      "id": "alpine:latest",
-      "Type": "image",
-      "Action": "pull",
-      "Actor": {
-        "ID": "alpine:latest",
-        "Attributes": {
-          "name": "alpine"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101301854122
-    }
-    {
-      "status": "create",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "create",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101381709551
-    }
-    {
-      "status": "attach",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "attach",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101383858412
-    }
-    {
-      "Type": "network",
-      "Action": "connect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101394865557
-    }
-    {
-      "status": "start",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "start",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101607533796
-    }
-    {
-      "status": "resize",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "resize",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "height": "46",
-          "image": "alpine",
-          "name": "my-container",
-          "width": "204"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101610269268
-    }
-    {
-      "status": "die",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "die",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "exitCode": "0",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105079144137
-    }
-    {
-      "Type": "network",
-      "Action": "disconnect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105230860245
-    }
-    {
-      "status": "destroy",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "destroy",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105338056026
-    }
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-  -   `label=<string>`; -- image and container label to filter
-  -   `type=<string>`; -- either `container` or `image` or `volume` or `network`
-  -   `volume=<string>`; -- volume to filter
-  -   `network=<string>`; -- network to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.23/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.23/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.23/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Transfer-Encoding: chunked
-
-    {"status":"Loading layer","progressDetail":{"current":32768,"total":1292800},"progress":"[=                                                 ] 32.77 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":65536,"total":1292800},"progress":"[==                                                ] 65.54 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":98304,"total":1292800},"progress":"[===                                               ]  98.3 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":131072,"total":1292800},"progress":"[=====                                             ] 131.1 kB/1.293 MB","id":"8ac8bfaff55a"}
-    ...
-    {"stream":"Loaded image: busybox:latest\n"}
-
-**Example response**:
-
-If the "quiet" query parameter is set to `true` / `1` (`?quiet=1`), progress
-details are suppressed, and only a confirmation message is returned once the
-action completes.
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Transfer-Encoding: chunked
-
-    {"stream":"Loaded image: busybox:latest\n"}
-
-**Query parameters**:
-
--   **quiet** – Boolean value, suppress progress details during load. Defaults
-      to `0` / `false` if omitted.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.23/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "DetachKeys": "ctrl-p,ctrl-q",
-      "Privileged": true,
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **DetachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Privileged** - Boolean value, runs the exec process with extended privileges.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **409** - container is paused
--   **500** - server error
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.23/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **409** - container is paused
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.23/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.23/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "CanRemove": false,
-      "ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
-      "DetachKeys": "",
-      "ExitCode": 2,
-      "ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
-      "OpenStderr": true,
-      "OpenStdin": true,
-      "OpenStdout": true,
-      "ProcessConfig": {
-        "arguments": [
-          "-c",
-          "exit 2"
-        ],
-        "entrypoint": "sh",
-        "privileged": false,
-        "tty": true,
-        "user": "1000"
-      },
-      "Running": false
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-### 2.4 Volumes
-
-#### List volumes
-
-`GET /volumes`
-
-**Example request**:
-
-    GET /v1.23/volumes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Volumes": [
-        {
-          "Name": "tardis",
-          "Driver": "local",
-          "Mountpoint": "/var/lib/docker/volumes/tardis"
-        }
-      ],
-      "Warnings": []
-    }
-
-**Query parameters**:
-
-- **filters** - JSON encoded value of the filters (a `map[string][]string`) to process on the volumes list. There is one available filter: `dangling=true`
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a volume
-
-`POST /volumes/create`
-
-Create a volume
-
-**Example request**:
-
-    POST /v1.23/volumes/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Labels": {
-        "com.example.some-label": "some-value",
-        "com.example.some-other-label": "some-other-value"
-      }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis",
-      "Labels": {
-        "com.example.some-label": "some-value",
-        "com.example.some-other-label": "some-other-value"
-      }
-    }
-
-**Status codes**:
-
-- **201** - no error
-- **500**  - server error
-
-**JSON parameters**:
-
-- **Name** - The new volume's name. If not specified, Docker generates a name.
-- **Driver** - Name of the volume driver to use. Defaults to `local` for the name.
-- **DriverOpts** - A mapping of driver options and values. These options are
-    passed directly to the driver and are driver specific.
-- **Labels** - Labels to set on the volume, specified as a map: `{"key":"value","key2":"value2"}`
-
-#### Inspect a volume
-
-`GET /volumes/(name)`
-
-Return low-level information on the volume `name`
-
-**Example request**:
-
-    GET /v1.23/volumes/tardis
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "local",
-      "Mountpoint": "/var/lib/docker/volumes/tardis/_data",
-      "Labels": {
-          "com.example.some-label": "some-value",
-          "com.example.some-other-label": "some-other-value"
-      }
-    }
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such volume
--   **500** - server error
-
-#### Remove a volume
-
-`DELETE /volumes/(name)`
-
-Instruct the driver to remove the volume (`name`).
-
-**Example request**:
-
-    DELETE /v1.23/volumes/tardis HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such volume or volume driver
--   **409** - volume is in use and cannot be removed
--   **500** - server error
-
-### 3.5 Networks
-
-#### List networks
-
-`GET /networks`
-
-**Example request**:
-
-    GET /v1.23/networks?filters={"type":{"custom":true}} HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-[
-  {
-    "Name": "bridge",
-    "Id": "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566",
-    "Scope": "local",
-    "Driver": "bridge",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": [
-        {
-          "Subnet": "172.17.0.0/16"
-        }
-      ]
-    },
-    "Containers": {
-      "39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867": {
-        "EndpointID": "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda",
-        "MacAddress": "02:42:ac:11:00:02",
-        "IPv4Address": "172.17.0.2/16",
-        "IPv6Address": ""
-      }
-    },
-    "Options": {
-      "com.docker.network.bridge.default_bridge": "true",
-      "com.docker.network.bridge.enable_icc": "true",
-      "com.docker.network.bridge.enable_ip_masquerade": "true",
-      "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-      "com.docker.network.bridge.name": "docker0",
-      "com.docker.network.driver.mtu": "1500"
-    }
-  },
-  {
-    "Name": "none",
-    "Id": "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794",
-    "Scope": "local",
-    "Driver": "null",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  },
-  {
-    "Name": "host",
-    "Id": "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e",
-    "Scope": "local",
-    "Driver": "host",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  }
-]
-```
-
-**Query parameters**:
-
-- **filters** - JSON encoded network list filter. The filter value is one of:
-  -   `id=<network-id>` Matches all or part of a network id.
-  -   `name=<network-name>` Matches all or part of a network name.
-  -   `type=["custom"|"builtin"]` Filters networks by type. The `custom` keyword returns all user-defined networks.
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Inspect network
-
-`GET /networks/<network-id>`
-
-**Example request**:
-
-    GET /v1.23/networks/7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99 HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-{
-  "Name": "net01",
-  "Id": "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99",
-  "Scope": "local",
-  "Driver": "bridge",
-  "EnableIPv6": false,
-  "IPAM": {
-    "Driver": "default",
-    "Config": [
-      {
-        "Subnet": "172.19.0.0/16",
-        "Gateway": "172.19.0.1/16"
-      }
-    ],
-    "Options": {
-        "foo": "bar"
-    }
-  },
-  "Internal": false,
-  "Containers": {
-    "19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c": {
-      "Name": "test",
-      "EndpointID": "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a",
-      "MacAddress": "02:42:ac:13:00:02",
-      "IPv4Address": "172.19.0.2/16",
-      "IPv6Address": ""
-    }
-  },
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  },
-  "Labels": {
-    "com.example.some-label": "some-value",
-    "com.example.some-other-label": "some-other-value"
-  }
-}
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - network not found
-
-#### Create a network
-
-`POST /networks/create`
-
-Create a network
-
-**Example request**:
-
-```
-POST /v1.23/networks/create HTTP/1.1
-Content-Type: application/json
-
-{
-  "Name":"isolated_nw",
-  "CheckDuplicate":true,
-  "Driver":"bridge",
-  "EnableIPv6": true,
-  "IPAM":{
-    "Driver": "default",
-    "Config":[
-      {
-        "Subnet":"172.20.0.0/16",
-        "IPRange":"172.20.10.0/24",
-        "Gateway":"172.20.10.11"
-      },
-      {
-        "Subnet":"2001:db8:abcd::/64",
-        "Gateway":"2001:db8:abcd::1011"
-      }
-    ],
-    "Options": {
-      "foo": "bar"
-    }
-  },
-  "Internal":true,
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  },
-  "Labels": {
-    "com.example.some-label": "some-value",
-    "com.example.some-other-label": "some-other-value"
-  }
-}
-```
-
-**Example response**:
-
-```
-HTTP/1.1 201 Created
-Content-Type: application/json
-
-{
-  "Id": "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30",
-  "Warning": ""
-}
-```
-
-**Status codes**:
-
-- **201** - no error
-- **404** - plugin not found
-- **500** - server error
-
-**JSON parameters**:
-
-- **Name** - The new network's name. this is a mandatory field
-- **CheckDuplicate** - Requests daemon to check for networks with same name. Defaults to `false`
-- **Driver** - Name of the network driver plugin to use. Defaults to `bridge` driver
-- **Internal** - Restrict external access to the network
-- **IPAM** - Optional custom IP scheme for the network
-  - **Driver** - Name of the IPAM driver to use. Defaults to `default` driver
-  - **Config** - List of IPAM configuration options, specified as a map:
-      `{"Subnet": <CIDR>, "IPRange": <CIDR>, "Gateway": <IP address>, "AuxAddress": <device_name:IP address>}`
-  - **Options** - Driver-specific options, specified as a map: `{"option":"value" [,"option2":"value2"]}`
-- **EnableIPv6** - Enable IPv6 on the network
-- **Options** - Network specific options to be used by the drivers
-- **Labels** - Labels to set on the network, specified as a map: `{"key":"value" [,"key2":"value2"]}`
-
-#### Connect a container to a network
-
-`POST /networks/(id)/connect`
-
-Connect a container to a network
-
-**Example request**:
-
-```
-POST /v1.23/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/connect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "EndpointConfig": {
-    "IPAMConfig": {
-        "IPv4Address":"172.24.56.89",
-        "IPv6Address":"2001:db8::5689"
-    }
-  }
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container is not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **container** - container-id/name to be connected to the network
-
-#### Disconnect a container from a network
-
-`POST /networks/(id)/disconnect`
-
-Disconnect a container from a network
-
-**Example request**:
-
-```
-POST /v1.23/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/disconnect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "Force":false
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **404** - network or container not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **Container** - container-id/name to be disconnected from a network
-- **Force** - Force the container to disconnect from a network
-
-#### Remove a network
-
-`DELETE /networks/(id)`
-
-Instruct the driver to remove the network (`id`).
-
-**Example request**:
-
-    DELETE /v1.23/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such network
--   **500** - server error
-
-## 3. Going further
-
-### 3.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 3.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 3.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/v1.24.md b/installer/vendor/github.com/docker/docker/docs/api/v1.24.md
deleted file mode 100644
index 0cf4e2afab..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/v1.24.md
+++ /dev/null
@@ -1,5316 +0,0 @@
----
-title: "Engine API v1.24"
-description: "API Documentation for Docker"
-keywords: "API, Docker, rcli, REST, documentation"
-redirect_from:
-- /engine/reference/api/docker_remote_api_v1.24/
-- /reference/api/docker_remote_api_v1.24/
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## 1. Brief introduction
-
- - The daemon listens on `unix:///var/run/docker.sock` but you can
-   [Bind Docker to another host/port or a Unix socket](../reference/commandline/dockerd.md#bind-docker-to-another-host-port-or-a-unix-socket).
- - The API tends to be REST. However, for some complex commands, like `attach`
-   or `pull`, the HTTP connection is hijacked to transport `stdout`,
-   `stdin` and `stderr`.
-
-## 2. Errors
-
-The Engine API uses standard HTTP status codes to indicate the success or failure of the API call. The body of the response will be JSON in the following format:
-
-    {
-        "message": "page not found"
-    }
-
-The status codes that are returned for each endpoint are specified in the endpoint documentation below.
-
-## 3. Endpoints
-
-### 3.1 Containers
-
-#### List containers
-
-`GET /containers/json`
-
-List containers
-
-**Example request**:
-
-    GET /v1.24/containers/json?all=1&before=8dfafdbc3a40&size=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Id": "8dfafdbc3a40",
-                 "Names":["/boring_feynman"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 1",
-                 "Created": 1367854155,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [{"PrivatePort": 2222, "PublicPort": 3333, "Type": "tcp"}],
-                 "Labels": {
-                         "com.example.vendor": "Acme",
-                         "com.example.license": "GPL",
-                         "com.example.version": "1.0"
-                 },
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "2cdc4edb1ded3631c81f57966563e5c8525b81121bb3706a9a9a3ae102711f3f",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.2",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:02"
-                                  }
-                         }
-                 },
-                 "Mounts": [
-                         {
-                                  "Name": "fac362...80535",
-                                  "Source": "/data",
-                                  "Destination": "/data",
-                                  "Driver": "local",
-                                  "Mode": "ro,Z",
-                                  "RW": false,
-                                  "Propagation": ""
-                         }
-                 ]
-         },
-         {
-                 "Id": "9cd87474be90",
-                 "Names":["/coolName"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 222222",
-                 "Created": 1367854155,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "88eaed7b37b38c2a3f0c4bc796494fdf51b270c2d22656412a2ca5d559a64d7a",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.8",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:08"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         },
-         {
-                 "Id": "3176a2479c92",
-                 "Names":["/sleepy_dog"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 3333333333333333",
-                 "Created": 1367854154,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports":[],
-                 "Labels": {},
-                 "SizeRw":12288,
-                 "SizeRootFs":0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "8b27c041c30326d59cd6e6f510d4f8d1d570a228466f956edf7815508f78e30d",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.6",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:06"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         },
-         {
-                 "Id": "4cb07b47f9fb",
-                 "Names":["/running_cat"],
-                 "Image": "ubuntu:latest",
-                 "ImageID": "d74508fb6632491cea586a1fd7d748dfc5274cd6fdfedee309ecdcbc2bf5cb82",
-                 "Command": "echo 444444444444444444444444444444444",
-                 "Created": 1367854152,
-                 "State": "Exited",
-                 "Status": "Exit 0",
-                 "Ports": [],
-                 "Labels": {},
-                 "SizeRw": 12288,
-                 "SizeRootFs": 0,
-                 "HostConfig": {
-                         "NetworkMode": "default"
-                 },
-                 "NetworkSettings": {
-                         "Networks": {
-                                 "bridge": {
-                                          "IPAMConfig": null,
-                                          "Links": null,
-                                          "Aliases": null,
-                                          "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                                          "EndpointID": "d91c7b2f0644403d7ef3095985ea0e2370325cd2332ff3a3225c4247328e66e9",
-                                          "Gateway": "172.17.0.1",
-                                          "IPAddress": "172.17.0.5",
-                                          "IPPrefixLen": 16,
-                                          "IPv6Gateway": "",
-                                          "GlobalIPv6Address": "",
-                                          "GlobalIPv6PrefixLen": 0,
-                                          "MacAddress": "02:42:ac:11:00:05"
-                                  }
-                         }
-                 },
-                 "Mounts": []
-         }
-    ]
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, Show all containers.
-        Only running containers are shown by default (i.e., this defaults to false)
--   **limit** – Show `limit` last created
-        containers, include non-running ones.
--   **since** – Show only containers created since Id, include
-        non-running ones.
--   **before** – Show only containers created before Id, include
-        non-running ones.
--   **size** – 1/True/true or 0/False/false, Show the containers
-        sizes
--   **filters** - a JSON encoded value of the filters (a `map[string][]string`) to process on the containers list. Available filters:
-  -   `exited=<int>`; -- containers with exit code of  `<int>` ;
-  -   `status=`(`created`|`restarting`|`running`|`paused`|`exited`|`dead`)
-  -   `label=key` or `label="key=value"` of a container label
-  -   `isolation=`(`default`|`process`|`hyperv`)   (Windows daemon only)
-  -   `ancestor`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-  -   `before`=(`<container id>` or `<container name>`)
-  -   `since`=(`<container id>` or `<container name>`)
-  -   `volume`=(`<volume name>` or `<mount point destination>`)
-  -   `network`=(`<network id>` or `<network name>`)
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **500** – server error
-
-#### Create a container
-
-`POST /containers/create`
-
-Create a container
-
-**Example request**:
-
-    POST /v1.24/containers/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-           "Hostname": "",
-           "Domainname": "",
-           "User": "",
-           "AttachStdin": false,
-           "AttachStdout": true,
-           "AttachStderr": true,
-           "Tty": false,
-           "OpenStdin": false,
-           "StdinOnce": false,
-           "Env": [
-                   "FOO=bar",
-                   "BAZ=quux"
-           ],
-           "Cmd": [
-                   "date"
-           ],
-           "Entrypoint": "",
-           "Image": "ubuntu",
-           "Labels": {
-                   "com.example.vendor": "Acme",
-                   "com.example.license": "GPL",
-                   "com.example.version": "1.0"
-           },
-           "Volumes": {
-             "/volumes/data": {}
-           },
-           "WorkingDir": "",
-           "NetworkDisabled": false,
-           "MacAddress": "12:34:56:78:9a:bc",
-           "ExposedPorts": {
-                   "22/tcp": {}
-           },
-           "StopSignal": "SIGTERM",
-           "HostConfig": {
-             "Binds": ["/tmp:/tmp"],
-             "Tmpfs": { "/run": "rw,noexec,nosuid,size=65536k" },
-             "Links": ["redis3:redis"],
-             "Memory": 0,
-             "MemorySwap": 0,
-             "MemoryReservation": 0,
-             "KernelMemory": 0,
-             "CpuPercent": 80,
-             "CpuShares": 512,
-             "CpuPeriod": 100000,
-             "CpuQuota": 50000,
-             "CpusetCpus": "0,1",
-             "CpusetMems": "0,1",
-             "IOMaximumBandwidth": 0,
-             "IOMaximumIOps": 0,
-             "BlkioWeight": 300,
-             "BlkioWeightDevice": [{}],
-             "BlkioDeviceReadBps": [{}],
-             "BlkioDeviceReadIOps": [{}],
-             "BlkioDeviceWriteBps": [{}],
-             "BlkioDeviceWriteIOps": [{}],
-             "MemorySwappiness": 60,
-             "OomKillDisable": false,
-             "OomScoreAdj": 500,
-             "PidMode": "",
-             "PidsLimit": -1,
-             "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-             "PublishAllPorts": false,
-             "Privileged": false,
-             "ReadonlyRootfs": false,
-             "Dns": ["8.8.8.8"],
-             "DnsOptions": [""],
-             "DnsSearch": [""],
-             "ExtraHosts": null,
-             "VolumesFrom": ["parent", "other:ro"],
-             "CapAdd": ["NET_ADMIN"],
-             "CapDrop": ["MKNOD"],
-             "GroupAdd": ["newgroup"],
-             "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-             "NetworkMode": "bridge",
-             "Devices": [],
-             "Sysctls": { "net.ipv4.ip_forward": "1" },
-             "Ulimits": [{}],
-             "LogConfig": { "Type": "json-file", "Config": {} },
-             "SecurityOpt": [],
-             "StorageOpt": {},
-             "CgroupParent": "",
-             "VolumeDriver": "",
-             "ShmSize": 67108864
-          },
-          "NetworkingConfig": {
-              "EndpointsConfig": {
-                  "isolated_nw" : {
-                      "IPAMConfig": {
-                          "IPv4Address":"172.20.30.33",
-                          "IPv6Address":"2001:db8:abcd::3033",
-                          "LinkLocalIPs":["169.254.34.68", "fe80::3468"]
-                      },
-                      "Links":["container_1", "container_2"],
-                      "Aliases":["server_x", "server_y"]
-                  }
-              }
-          }
-      }
-
-**Example response**:
-
-      HTTP/1.1 201 Created
-      Content-Type: application/json
-
-      {
-           "Id":"e90e34656806",
-           "Warnings":[]
-      }
-
-**JSON parameters**:
-
--   **Hostname** - A string value containing the hostname to use for the
-      container. This must be a valid RFC 1123 hostname.
--   **Domainname** - A string value containing the domain name to use
-      for the container.
--   **User** - A string value specifying the user inside the container.
--   **AttachStdin** - Boolean value, attaches to `stdin`.
--   **AttachStdout** - Boolean value, attaches to `stdout`.
--   **AttachStderr** - Boolean value, attaches to `stderr`.
--   **Tty** - Boolean value, Attach standard streams to a `tty`, including `stdin` if it is not closed.
--   **OpenStdin** - Boolean value, opens `stdin`,
--   **StdinOnce** - Boolean value, close `stdin` after the 1 attached client disconnects.
--   **Env** - A list of environment variables in the form of `["VAR=value", ...]`
--   **Labels** - Adds a map of labels to a container. To specify a map: `{"key":"value", ... }`
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Entrypoint** - Set the entry point for the container as a string or an array
-      of strings.
--   **Image** - A string specifying the image name to use for the container.
--   **Volumes** - An object mapping mount point paths (strings) inside the
-      container to empty objects.
--   **WorkingDir** - A string specifying the working directory for commands to
-      run in.
--   **NetworkDisabled** - Boolean value, when true disables networking for the
-      container
--   **ExposedPorts** - An object mapping ports to an empty object in the form of:
-      `"ExposedPorts": { "<port>/<tcp|udp>: {}" }`
--   **StopSignal** - Signal to stop a container as a string or unsigned integer. `SIGTERM` by default.
--   **HostConfig**
-    -   **Binds** – A list of volume bindings for this container. Each volume binding is a string in one of these forms:
-           + `host-src:container-dest` to bind-mount a host path into the
-             container. Both `host-src`, and `container-dest` must be an
-             _absolute_ path.
-           + `host-src:container-dest:ro` to make the bind-mount read-only
-             inside the container. Both `host-src`, and `container-dest` must be
-             an _absolute_ path.
-           + `volume-name:container-dest` to bind-mount a volume managed by a
-             volume driver into the container. `container-dest` must be an
-             _absolute_ path.
-           + `volume-name:container-dest:ro` to mount the volume read-only
-             inside the container.  `container-dest` must be an _absolute_ path.
-    -   **Tmpfs** – A map of container directories which should be replaced by tmpfs mounts, and their corresponding
-          mount options. A JSON object in the form `{ "/run": "rw,noexec,nosuid,size=65536k" }`.
-    -   **Links** - A list of links for the container. Each link entry should be
-          in the form of `container_name:alias`.
-    -   **Memory** - Memory limit in bytes.
-    -   **MemorySwap** - Total memory limit (memory + swap); set `-1` to enable unlimited swap.
-          You must use this with `memory` and make the swap value larger than `memory`.
-    -   **MemoryReservation** - Memory soft limit in bytes.
-    -   **KernelMemory** - Kernel memory limit in bytes.
-    -   **CpuPercent** - An integer value containing the usable percentage of the available CPUs. (Windows daemon only)
-    -   **CpuShares** - An integer value containing the container's CPU Shares
-          (ie. the relative weight vs other containers).
-    -   **CpuPeriod** - The length of a CPU period in microseconds.
-    -   **CpuQuota** - Microseconds of CPU time that the container can get in a CPU period.
-    -   **CpusetCpus** - String value containing the `cgroups CpusetCpus` to use.
-    -   **CpusetMems** - Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-    -   **IOMaximumBandwidth** - Maximum IO absolute rate in terms of IOps.
-    -   **IOMaximumIOps** - Maximum IO absolute rate in terms of bytes per second.
-    -   **BlkioWeight** - Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-    -   **BlkioWeightDevice** - Block IO weight (relative device weight) in the form of:        `"BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]`
-    -   **BlkioDeviceReadBps** - Limit read rate (bytes per second) from a device in the form of:	`"BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceWriteBps** - Limit write rate (bytes per second) to a device in the form of:	`"BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"`
-    -   **BlkioDeviceReadIOps** - Limit read rate (IO per second) from a device in the form of:	`"BlkioDeviceReadIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceReadIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **BlkioDeviceWiiteIOps** - Limit write rate (IO per second) to a device in the form of:	`"BlkioDeviceWriteIOps": [{"Path": "device_path", "Rate": rate}]`, for example:
-        `"BlkioDeviceWriteIOps": [{"Path": "/dev/sda", "Rate": "1000"}]`
-    -   **MemorySwappiness** - Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-    -   **OomKillDisable** - Boolean value, whether to disable OOM Killer for the container or not.
-    -   **OomScoreAdj** - An integer value containing the score given to the container in order to tune OOM killer preferences.
-    -   **PidMode** - Set the PID (Process) Namespace mode for the container;
-          `"container:<name|id>"`: joins another container's PID namespace
-          `"host"`: use the host's PID namespace inside the container
-    -   **PidsLimit** - Tune a container's pids limit. Set -1 for unlimited.
-    -   **PortBindings** - A map of exposed container ports and the host port they
-          should map to. A JSON object in the form
-          `{ <port>/<protocol>: [{ "HostPort": "<port>" }] }`
-          Take note that `port` is specified as a string and not an integer value.
-    -   **PublishAllPorts** - Allocates a random host port for all of a container's
-          exposed ports. Specified as a boolean value.
-    -   **Privileged** - Gives the container full access to the host. Specified as
-          a boolean value.
-    -   **ReadonlyRootfs** - Mount the container's root filesystem as read only.
-          Specified as a boolean value.
-    -   **Dns** - A list of DNS servers for the container to use.
-    -   **DnsOptions** - A list of DNS options
-    -   **DnsSearch** - A list of DNS search domains
-    -   **ExtraHosts** - A list of hostnames/IP mappings to add to the
-        container's `/etc/hosts` file. Specified in the form `["hostname:IP"]`.
-    -   **VolumesFrom** - A list of volumes to inherit from another container.
-          Specified in the form `<container name>[:<ro|rw>]`
-    -   **CapAdd** - A list of kernel capabilities to add to the container.
-    -   **Capdrop** - A list of kernel capabilities to drop from the container.
-    -   **GroupAdd** - A list of additional groups that the container process will run as
-    -   **RestartPolicy** – The behavior to apply when the container exits.  The
-            value is an object with a `Name` property of either `"always"` to
-            always restart, `"unless-stopped"` to restart always except when
-            user has manually stopped the container or `"on-failure"` to restart only when the container
-            exit code is non-zero.  If `on-failure` is used, `MaximumRetryCount`
-            controls the number of times to retry before giving up.
-            The default is not to restart. (optional)
-            An ever increasing delay (double the previous delay, starting at 100mS)
-            is added before each restart to prevent flooding the server.
-    -   **UsernsMode**  - Sets the usernamespace mode for the container when usernamespace remapping option is enabled.
-           supported values are: `host`.
-    -   **NetworkMode** - Sets the networking mode for the container. Supported
-          standard values are: `bridge`, `host`, `none`, and `container:<name|id>`. Any other value is taken
-          as a custom network's name to which this container should connect to.
-    -   **Devices** - A list of devices to add to the container specified as a JSON object in the
-      form
-          `{ "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}`
-    -   **Ulimits** - A list of ulimits to set in the container, specified as
-          `{ "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }`, for example:
-          `Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }`
-    -   **Sysctls** - A list of kernel parameters (sysctls) to set in the container, specified as
-          `{ <name>: <Value> }`, for example:
-	  `{ "net.ipv4.ip_forward": "1" }`
-    -   **SecurityOpt**: A list of string values to customize labels for MLS
-        systems, such as SELinux.
-    -   **StorageOpt**: Storage driver options per container. Options can be passed in the form
-        `{"size":"120G"}`
-    -   **LogConfig** - Log configuration for the container, specified as a JSON object in the form
-          `{ "Type": "<driver_name>", "Config": {"key1": "val1"}}`.
-          Available types: `json-file`, `syslog`, `journald`, `gelf`, `fluentd`, `awslogs`, `splunk`, `etwlogs`, `none`.
-          `json-file` logging driver.
-    -   **CgroupParent** - Path to `cgroups` under which the container's `cgroup` is created. If the path is not absolute, the path is considered to be relative to the `cgroups` path of the init process. Cgroups are created if they do not already exist.
-    -   **VolumeDriver** - Driver that this container users to mount volumes.
-    -   **ShmSize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
-
-**Query parameters**:
-
--   **name** – Assign the specified name to the container. Must
-    match `/?[a-zA-Z0-9_-]+`.
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **406** – impossible to attach (container not running)
--   **409** – conflict
--   **500** – server error
-
-#### Inspect a container
-
-`GET /containers/(id or name)/json`
-
-Return low-level information on the container `id`
-
-**Example request**:
-
-      GET /v1.24/containers/4fa6e0f0c678/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-	{
-		"AppArmorProfile": "",
-		"Args": [
-			"-c",
-			"exit 9"
-		],
-		"Config": {
-			"AttachStderr": true,
-			"AttachStdin": false,
-			"AttachStdout": true,
-			"Cmd": [
-				"/bin/sh",
-				"-c",
-				"exit 9"
-			],
-			"Domainname": "",
-			"Entrypoint": null,
-			"Env": [
-				"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-			],
-			"ExposedPorts": null,
-			"Hostname": "ba033ac44011",
-			"Image": "ubuntu",
-			"Labels": {
-				"com.example.vendor": "Acme",
-				"com.example.license": "GPL",
-				"com.example.version": "1.0"
-			},
-			"MacAddress": "",
-			"NetworkDisabled": false,
-			"OnBuild": null,
-			"OpenStdin": false,
-			"StdinOnce": false,
-			"Tty": false,
-			"User": "",
-			"Volumes": {
-				"/volumes/data": {}
-			},
-			"WorkingDir": "",
-			"StopSignal": "SIGTERM"
-		},
-		"Created": "2015-01-06T15:47:31.485331387Z",
-		"Driver": "devicemapper",
-		"ExecIDs": null,
-		"HostConfig": {
-			"Binds": null,
-			"IOMaximumBandwidth": 0,
-			"IOMaximumIOps": 0,
-			"BlkioWeight": 0,
-			"BlkioWeightDevice": [{}],
-			"BlkioDeviceReadBps": [{}],
-			"BlkioDeviceWriteBps": [{}],
-			"BlkioDeviceReadIOps": [{}],
-			"BlkioDeviceWriteIOps": [{}],
-			"CapAdd": null,
-			"CapDrop": null,
-			"ContainerIDFile": "",
-			"CpusetCpus": "",
-			"CpusetMems": "",
-			"CpuPercent": 80,
-			"CpuShares": 0,
-			"CpuPeriod": 100000,
-			"Devices": [],
-			"Dns": null,
-			"DnsOptions": null,
-			"DnsSearch": null,
-			"ExtraHosts": null,
-			"IpcMode": "",
-			"Links": null,
-			"LxcConf": [],
-			"Memory": 0,
-			"MemorySwap": 0,
-			"MemoryReservation": 0,
-			"KernelMemory": 0,
-			"OomKillDisable": false,
-			"OomScoreAdj": 500,
-			"NetworkMode": "bridge",
-			"PidMode": "",
-			"PortBindings": {},
-			"Privileged": false,
-			"ReadonlyRootfs": false,
-			"PublishAllPorts": false,
-			"RestartPolicy": {
-				"MaximumRetryCount": 2,
-				"Name": "on-failure"
-			},
-			"LogConfig": {
-				"Config": null,
-				"Type": "json-file"
-			},
-			"SecurityOpt": null,
-			"Sysctls": {
-			        "net.ipv4.ip_forward": "1"
-			},
-			"StorageOpt": null,
-			"VolumesFrom": null,
-			"Ulimits": [{}],
-			"VolumeDriver": "",
-			"ShmSize": 67108864
-		},
-		"HostnamePath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname",
-		"HostsPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts",
-		"LogPath": "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log",
-		"Id": "ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39",
-		"Image": "04c5d3b7b0656168630d3ba35d8889bd0e9caafcaeb3004d2bfbc47e7c5d35d2",
-		"MountLabel": "",
-		"Name": "/boring_euclid",
-		"NetworkSettings": {
-			"Bridge": "",
-			"SandboxID": "",
-			"HairpinMode": false,
-			"LinkLocalIPv6Address": "",
-			"LinkLocalIPv6PrefixLen": 0,
-			"Ports": null,
-			"SandboxKey": "",
-			"SecondaryIPAddresses": null,
-			"SecondaryIPv6Addresses": null,
-			"EndpointID": "",
-			"Gateway": "",
-			"GlobalIPv6Address": "",
-			"GlobalIPv6PrefixLen": 0,
-			"IPAddress": "",
-			"IPPrefixLen": 0,
-			"IPv6Gateway": "",
-			"MacAddress": "",
-			"Networks": {
-				"bridge": {
-					"NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-					"EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-					"Gateway": "172.17.0.1",
-					"IPAddress": "172.17.0.2",
-					"IPPrefixLen": 16,
-					"IPv6Gateway": "",
-					"GlobalIPv6Address": "",
-					"GlobalIPv6PrefixLen": 0,
-					"MacAddress": "02:42:ac:12:00:02"
-				}
-			}
-		},
-		"Path": "/bin/sh",
-		"ProcessLabel": "",
-		"ResolvConfPath": "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/resolv.conf",
-		"RestartCount": 1,
-		"State": {
-			"Error": "",
-			"ExitCode": 9,
-			"FinishedAt": "2015-01-06T15:47:32.080254511Z",
-			"OOMKilled": false,
-			"Dead": false,
-			"Paused": false,
-			"Pid": 0,
-			"Restarting": false,
-			"Running": true,
-			"StartedAt": "2015-01-06T15:47:32.072697474Z",
-			"Status": "running"
-		},
-		"Mounts": [
-			{
-				"Name": "fac362...80535",
-				"Source": "/data",
-				"Destination": "/data",
-				"Driver": "local",
-				"Mode": "ro,Z",
-				"RW": false,
-				"Propagation": ""
-			}
-		]
-	}
-
-**Example request, with size information**:
-
-    GET /v1.24/containers/4fa6e0f0c678/json?size=1 HTTP/1.1
-
-**Example response, with size information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-    ....
-    "SizeRw": 0,
-    "SizeRootFs": 972,
-    ....
-    }
-
-**Query parameters**:
-
--   **size** – 1/True/true or 0/False/false, return container size information. Default is `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### List processes running inside a container
-
-`GET /containers/(id or name)/top`
-
-List processes running inside the container `id`. On Unix systems this
-is done by running the `ps` command. This endpoint is not
-supported on Windows.
-
-**Example request**:
-
-    GET /v1.24/containers/4fa6e0f0c678/top HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Titles" : [
-         "UID", "PID", "PPID", "C", "STIME", "TTY", "TIME", "CMD"
-       ],
-       "Processes" : [
-         [
-           "root", "13642", "882", "0", "17:03", "pts/0", "00:00:00", "/bin/bash"
-         ],
-         [
-           "root", "13735", "13642", "0", "17:06", "pts/0", "00:00:00", "sleep 10"
-         ]
-       ]
-    }
-
-**Example request**:
-
-    GET /v1.24/containers/4fa6e0f0c678/top?ps_args=aux HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Titles" : [
-        "USER","PID","%CPU","%MEM","VSZ","RSS","TTY","STAT","START","TIME","COMMAND"
-      ]
-      "Processes" : [
-        [
-          "root","13642","0.0","0.1","18172","3184","pts/0","Ss","17:03","0:00","/bin/bash"
-        ],
-        [
-          "root","13895","0.0","0.0","4348","692","pts/0","S+","17:15","0:00","sleep 10"
-        ]
-      ],
-    }
-
-**Query parameters**:
-
--   **ps_args** – `ps` arguments to use (e.g., `aux`), defaults to `-ef`
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container logs
-
-`GET /containers/(id or name)/logs`
-
-Get `stdout` and `stderr` logs from the container ``id``
-
-> **Note**:
-> This endpoint works only for containers with the `json-file` or `journald` logging drivers.
-
-**Example request**:
-
-     GET /v1.24/containers/4fa6e0f0c678/logs?stderr=1&stdout=1&timestamps=1&follow=1&tail=10&since=1428990821 HTTP/1.1
-
-**Example response**:
-
-     HTTP/1.1 101 UPGRADED
-     Content-Type: application/vnd.docker.raw-stream
-     Connection: Upgrade
-     Upgrade: tcp
-
-     {% raw %}
-     {{ STREAM }}
-     {% endraw %}
-
-**Query parameters**:
-
--   **details** - 1/True/true or 0/False/flase, Show extra details provided to logs. Default `false`.
--   **follow** – 1/True/true or 0/False/false, return stream. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, show `stdout` log. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, show `stderr` log. Default `false`.
--   **since** – UNIX timestamp (integer) to filter logs. Specifying a timestamp
-    will only output log-entries since that timestamp. Default: 0 (unfiltered)
--   **timestamps** – 1/True/true or 0/False/false, print timestamps for
-        every log line. Default `false`.
--   **tail** – Output specified number of lines at the end of logs: `all` or `<number>`. Default all.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **404** – no such container
--   **500** – server error
-
-#### Inspect changes on a container's filesystem
-
-`GET /containers/(id or name)/changes`
-
-Inspect changes on container `id`'s filesystem
-
-**Example request**:
-
-    GET /v1.24/containers/4fa6e0f0c678/changes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-         {
-                 "Path": "/dev",
-                 "Kind": 0
-         },
-         {
-                 "Path": "/dev/kmsg",
-                 "Kind": 1
-         },
-         {
-                 "Path": "/test",
-                 "Kind": 1
-         }
-    ]
-
-Values for `Kind`:
-
-- `0`: Modify
-- `1`: Add
-- `2`: Delete
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Export a container
-
-`GET /containers/(id or name)/export`
-
-Export the contents of container `id`
-
-**Example request**:
-
-    GET /v1.24/containers/4fa6e0f0c678/export HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/octet-stream
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Get container stats based on resource usage
-
-`GET /containers/(id or name)/stats`
-
-This endpoint returns a live stream of a container's resource usage statistics.
-
-**Example request**:
-
-    GET /v1.24/containers/redis1/stats HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Type: application/json
-
-      {
-         "read" : "2015-01-08T22:57:31.547920715Z",
-         "pids_stats": {
-            "current": 3
-         },
-         "networks": {
-                 "eth0": {
-                     "rx_bytes": 5338,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 36,
-                     "tx_bytes": 648,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 8
-                 },
-                 "eth5": {
-                     "rx_bytes": 4641,
-                     "rx_dropped": 0,
-                     "rx_errors": 0,
-                     "rx_packets": 26,
-                     "tx_bytes": 690,
-                     "tx_dropped": 0,
-                     "tx_errors": 0,
-                     "tx_packets": 9
-                 }
-         },
-         "memory_stats" : {
-            "stats" : {
-               "total_pgmajfault" : 0,
-               "cache" : 0,
-               "mapped_file" : 0,
-               "total_inactive_file" : 0,
-               "pgpgout" : 414,
-               "rss" : 6537216,
-               "total_mapped_file" : 0,
-               "writeback" : 0,
-               "unevictable" : 0,
-               "pgpgin" : 477,
-               "total_unevictable" : 0,
-               "pgmajfault" : 0,
-               "total_rss" : 6537216,
-               "total_rss_huge" : 6291456,
-               "total_writeback" : 0,
-               "total_inactive_anon" : 0,
-               "rss_huge" : 6291456,
-               "hierarchical_memory_limit" : 67108864,
-               "total_pgfault" : 964,
-               "total_active_file" : 0,
-               "active_anon" : 6537216,
-               "total_active_anon" : 6537216,
-               "total_pgpgout" : 414,
-               "total_cache" : 0,
-               "inactive_anon" : 0,
-               "active_file" : 0,
-               "pgfault" : 964,
-               "inactive_file" : 0,
-               "total_pgpgin" : 477
-            },
-            "max_usage" : 6651904,
-            "usage" : 6537216,
-            "failcnt" : 0,
-            "limit" : 67108864
-         },
-         "blkio_stats" : {},
-         "cpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24472255,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100215355,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 739306590000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         },
-         "precpu_stats" : {
-            "cpu_usage" : {
-               "percpu_usage" : [
-                  8646879,
-                  24350896,
-                  36438778,
-                  30657443
-               ],
-               "usage_in_usermode" : 50000000,
-               "total_usage" : 100093996,
-               "usage_in_kernelmode" : 30000000
-            },
-            "system_cpu_usage" : 9492140000000,
-            "throttling_data" : {"periods":0,"throttled_periods":0,"throttled_time":0}
-         }
-      }
-
-The precpu_stats is the cpu statistic of last read, which is used for calculating the cpu usage percent. It is not the exact copy of the “cpu_stats” field.
-
-**Query parameters**:
-
--   **stream** – 1/True/true or 0/False/false, pull stats once then disconnect. Default `true`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Resize a container TTY
-
-`POST /containers/(id or name)/resize`
-
-Resize the TTY for container with  `id`. The unit is number of characters. You must restart the container for the resize to take effect.
-
-**Example request**:
-
-      POST /v1.24/containers/4fa6e0f0c678/resize?h=40&w=80 HTTP/1.1
-
-**Example response**:
-
-      HTTP/1.1 200 OK
-      Content-Length: 0
-      Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **200** – no error
--   **404** – No such container
--   **500** – Cannot resize container
-
-#### Start a container
-
-`POST /containers/(id or name)/start`
-
-Start the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/start HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already started
--   **404** – no such container
--   **500** – server error
-
-#### Stop a container
-
-`POST /containers/(id or name)/stop`
-
-Stop the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/stop?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **304** – container already stopped
--   **404** – no such container
--   **500** – server error
-
-#### Restart a container
-
-`POST /containers/(id or name)/restart`
-
-Restart the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/restart?t=5 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **t** – number of seconds to wait before killing the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Kill a container
-
-`POST /containers/(id or name)/kill`
-
-Kill the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/kill HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **signal** - Signal to send to the container: integer or string like `SIGINT`.
-        When not set, `SIGKILL` is assumed and the call waits for the container to exit.
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Update a container
-
-`POST /containers/(id or name)/update`
-
-Update configuration of one or more containers.
-
-**Example request**:
-
-       POST /v1.24/containers/e90e34656806/update HTTP/1.1
-       Content-Type: application/json
-
-       {
-         "BlkioWeight": 300,
-         "CpuShares": 512,
-         "CpuPeriod": 100000,
-         "CpuQuota": 50000,
-         "CpusetCpus": "0,1",
-         "CpusetMems": "0",
-         "Memory": 314572800,
-         "MemorySwap": 514288000,
-         "MemoryReservation": 209715200,
-         "KernelMemory": 52428800,
-         "RestartPolicy": {
-           "MaximumRetryCount": 4,
-           "Name": "on-failure"
-         },
-       }
-
-**Example response**:
-
-       HTTP/1.1 200 OK
-       Content-Type: application/json
-
-       {
-           "Warnings": []
-       }
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Rename a container
-
-`POST /containers/(id or name)/rename`
-
-Rename the container `id` to a `new_name`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/rename?name=new_name HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **name** – new name for the container
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **409** - conflict name already assigned
--   **500** – server error
-
-#### Pause a container
-
-`POST /containers/(id or name)/pause`
-
-Pause the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/pause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Unpause a container
-
-`POST /containers/(id or name)/unpause`
-
-Unpause the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/unpause HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Attach to a container
-
-`POST /containers/(id or name)/attach`
-
-Attach to the container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/16253994b7c4/attach?logs=1&stream=0&stdout=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 101 UPGRADED
-    Content-Type: application/vnd.docker.raw-stream
-    Connection: Upgrade
-    Upgrade: tcp
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **101** – no error, hints proxy about hijacking
--   **200** – no error, no upgrade header found
--   **400** – bad parameter
--   **404** – no such container
--   **409** - container is paused
--   **500** – server error
-
-**Stream details**:
-
-When using the TTY setting is enabled in
-[`POST /containers/create`
-](#create-a-container),
-the stream is the raw data from the process PTY and client's `stdin`.
-When the TTY is disabled, then the stream is multiplexed to separate
-`stdout` and `stderr`.
-
-The format is a **Header** and a **Payload** (frame).
-
-**HEADER**
-
-The header contains the information which the stream writes (`stdout` or
-`stderr`). It also contains the size of the associated frame encoded in the
-last four bytes (`uint32`).
-
-It is encoded on the first eight bytes like this:
-
-    header := [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}
-
-`STREAM_TYPE` can be:
-
--   0: `stdin` (is written on `stdout`)
--   1: `stdout`
--   2: `stderr`
-
-`SIZE1, SIZE2, SIZE3, SIZE4` are the four bytes of
-the `uint32` size encoded as big endian.
-
-**PAYLOAD**
-
-The payload is the raw stream.
-
-**IMPLEMENTATION**
-
-The simplest way to implement the Attach protocol is the following:
-
-    1.  Read eight bytes.
-    2.  Choose `stdout` or `stderr` depending on the first byte.
-    3.  Extract the frame size from the last four bytes.
-    4.  Read the extracted size and output it on the correct output.
-    5.  Goto 1.
-
-#### Attach to a container (websocket)
-
-`GET /containers/(id or name)/attach/ws`
-
-Attach to the container `id` via websocket
-
-Implements websocket protocol handshake according to [RFC 6455](http://tools.ietf.org/html/rfc6455)
-
-**Example request**
-
-    GET /v1.24/containers/e90e34656806/attach/ws?logs=0&stream=1&stdin=1&stdout=1&stderr=1 HTTP/1.1
-
-**Example response**
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**Query parameters**:
-
--   **detachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **logs** – 1/True/true or 0/False/false, return logs. Default `false`.
--   **stream** – 1/True/true or 0/False/false, return stream.
-        Default `false`.
--   **stdin** – 1/True/true or 0/False/false, if `stream=true`, attach
-        to `stdin`. Default `false`.
--   **stdout** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stdout` log, if `stream=true`, attach to `stdout`. Default `false`.
--   **stderr** – 1/True/true or 0/False/false, if `logs=true`, return
-        `stderr` log, if `stream=true`, attach to `stderr`. Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **500** – server error
-
-#### Wait a container
-
-`POST /containers/(id or name)/wait`
-
-Block until container `id` stops, then returns the exit code
-
-**Example request**:
-
-    POST /v1.24/containers/16253994b7c4/wait HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"StatusCode": 0}
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Remove a container
-
-`DELETE /containers/(id or name)`
-
-Remove the container `id` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.24/containers/16253994b7c4?v=1 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Query parameters**:
-
--   **v** – 1/True/true or 0/False/false, Remove the volumes
-        associated to the container. Default `false`.
--   **force** - 1/True/true or 0/False/false, Kill then remove the container.
-        Default `false`.
-
-**Status codes**:
-
--   **204** – no error
--   **400** – bad parameter
--   **404** – no such container
--   **409** – conflict
--   **500** – server error
-
-#### Retrieving information about files and folders in a container
-
-`HEAD /containers/(id or name)/archive`
-
-See the description of the `X-Docker-Container-Path-Stat` header in the
-following section.
-
-#### Get an archive of a filesystem resource in a container
-
-`GET /containers/(id or name)/archive`
-
-Get a tar archive of a resource in the filesystem of container `id`.
-
-**Query parameters**:
-
-- **path** - resource in the container's filesystem to archive. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The resource specified by **path** must exist. To assert that the resource
-    is expected to be a directory, **path** should end in `/` or  `/.`
-    (assuming a path separator of `/`). If **path** ends in `/.` then this
-    indicates that only the contents of the **path** directory should be
-    copied. A symlink is always resolved to its target.
-
-    > **Note**: It is not possible to copy certain system files such as resources
-    > under `/proc`, `/sys`, `/dev`, and mounts created by the user in the
-    > container.
-
-**Example request**:
-
-    GET /v1.24/containers/8cce319429b2/archive?path=/root HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-    X-Docker-Container-Path-Stat: eyJuYW1lIjoicm9vdCIsInNpemUiOjQwOTYsIm1vZGUiOjIxNDc0ODQwOTYsIm10aW1lIjoiMjAxNC0wMi0yN1QyMDo1MToyM1oiLCJsaW5rVGFyZ2V0IjoiIn0=
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-On success, a response header `X-Docker-Container-Path-Stat` will be set to a
-base64-encoded JSON object containing some filesystem header information about
-the archived resource. The above example value would decode to the following
-JSON object (whitespace added for readability):
-
-```json
-{
-    "name": "root",
-    "size": 4096,
-    "mode": 2147484096,
-    "mtime": "2014-02-27T20:51:23Z",
-    "linkTarget": ""
-}
-```
-
-A `HEAD` request can also be made to this endpoint if only this information is
-desired.
-
-**Status codes**:
-
-- **200** - success, returns archive of copied resource
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** was asserted to be a directory but exists as a
-      file)
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** does not exist)
-- **500** - server error
-
-#### Extract an archive of files or folders to a directory in a container
-
-`PUT /containers/(id or name)/archive`
-
-Upload a tar archive to be extracted to a path in the filesystem of container
-`id`.
-
-**Query parameters**:
-
-- **path** - path to a directory in the container
-    to extract the archive's contents into. Required.
-
-    If not an absolute path, it is relative to the container's root directory.
-    The **path** resource must exist.
-- **noOverwriteDirNonDir** - If "1", "true", or "True" then it will be an error
-    if unpacking the given content would cause an existing directory to be
-    replaced with a non-directory and vice versa.
-
-**Example request**:
-
-    PUT /v1.24/containers/8cce319429b2/archive?path=/vol1 HTTP/1.1
-    Content-Type: application/x-tar
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** – the content was extracted successfully
-- **400** - client error, bad parameter, details in JSON response body, one of:
-    - must specify path parameter (**path** cannot be empty)
-    - not a directory (**path** should be a directory but exists as a file)
-    - unable to overwrite existing directory with non-directory
-      (if **noOverwriteDirNonDir**)
-    - unable to overwrite existing non-directory with directory
-      (if **noOverwriteDirNonDir**)
-- **403** - client error, permission denied, the volume
-    or container rootfs is marked as read-only.
-- **404** - client error, resource not found, one of:
-    – no such container (container `id` does not exist)
-    - no such file or directory (**path** resource does not exist)
-- **500** – server error
-
-### 3.2 Images
-
-#### List Images
-
-`GET /images/json`
-
-**Example request**:
-
-    GET /v1.24/images/json?all=0 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-         "RepoTags": [
-           "ubuntu:12.04",
-           "ubuntu:precise",
-           "ubuntu:latest"
-         ],
-         "Id": "8dbd9e392a964056420e5d58ca5cc376ef18e2de93b5cc90e868a1bbc8318c1c",
-         "Created": 1365714795,
-         "Size": 131506275,
-         "VirtualSize": 131506275,
-         "Labels": {}
-      },
-      {
-         "RepoTags": [
-           "ubuntu:12.10",
-           "ubuntu:quantal"
-         ],
-         "ParentId": "27cf784147099545",
-         "Id": "b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc",
-         "Created": 1364102658,
-         "Size": 24653,
-         "VirtualSize": 180116135,
-         "Labels": {
-            "com.example.version": "v1"
-         }
-      }
-    ]
-
-**Example request, with digest information**:
-
-    GET /v1.24/images/json?digests=1 HTTP/1.1
-
-**Example response, with digest information**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "Created": 1420064636,
-        "Id": "4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125",
-        "ParentId": "ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2",
-        "RepoDigests": [
-          "localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-        ],
-        "RepoTags": [
-          "localhost:5000/test/busybox:latest",
-          "playdate:latest"
-        ],
-        "Size": 0,
-        "VirtualSize": 2429728,
-        "Labels": {}
-      }
-    ]
-
-The response shows a single image `Id` associated with two repositories
-(`RepoTags`): `localhost:5000/test/busybox`: and `playdate`. A caller can use
-either of the `RepoTags` values `localhost:5000/test/busybox:latest` or
-`playdate:latest` to reference the image.
-
-You can also use `RepoDigests` values to reference an image. In this response,
-the array has only one reference and that is to the
-`localhost:5000/test/busybox` repository; the `playdate` repository has no
-digest. You can reference this digest using the value:
-`localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d...`
-
-See the `docker run` and `docker build` commands for examples of digest and tag
-references on the command line.
-
-**Query parameters**:
-
--   **all** – 1/True/true or 0/False/false, default false
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `dangling=true`
-  -   `label=key` or `label="key=value"` of an image label
-  -   `before`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
-  -   `since`=(`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`)
--   **filter** - only return images with the specified name
-
-#### Build image from a Dockerfile
-
-`POST /build`
-
-Build an image from a Dockerfile
-
-**Example request**:
-
-    POST /v1.24/build HTTP/1.1
-
-    {% raw %}
-    {{ TAR STREAM }}
-    {% endraw %}
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"stream": "Step 1/5..."}
-    {"stream": "..."}
-    {"error": "Error...", "errorDetail": {"code": 123, "message": "Error..."}}
-
-The input stream must be a `tar` archive compressed with one of the
-following algorithms: `identity` (no compression), `gzip`, `bzip2`, `xz`.
-
-The archive must include a build instructions file, typically called
-`Dockerfile` at the archive's root. The `dockerfile` parameter may be
-used to specify a different build instructions file. To do this, its value must be
-the path to the alternate build instructions file to use.
-
-The archive may include any number of other files,
-which are accessible in the build context (See the [*ADD build
-command*](../reference/builder.md#add)).
-
-The Docker daemon performs a preliminary validation of the `Dockerfile` before
-starting the build, and returns an error if the syntax is incorrect. After that,
-each instruction is run one-by-one until the ID of the new image is output.
-
-The build is canceled if the client drops the connection by quitting
-or being killed.
-
-**Query parameters**:
-
--   **dockerfile** - Path within the build context to the `Dockerfile`. This is
-        ignored if `remote` is specified and points to an external `Dockerfile`.
--   **t** – A name and optional tag to apply to the image in the `name:tag` format.
-        If you omit the `tag` the default `latest` value is assumed.
-        You can provide one or more `t` parameters.
--   **remote** – A Git repository URI or HTTP/HTTPS context URI. If the
-        URI points to a single text file, the file's contents are placed into
-        a file called `Dockerfile` and the image is built from that file. If
-        the URI points to a tarball, the file is downloaded by the daemon and
-        the contents therein used as the context for the build. If the URI
-        points to a tarball and the `dockerfile` parameter is also specified,
-        there must be a file with the corresponding path inside the tarball.
--   **q** – Suppress verbose build output.
--   **nocache** – Do not use the cache when building the image.
--   **pull** - Attempt to pull the image even if an older image exists locally.
--   **rm** - Remove intermediate containers after a successful build (default behavior).
--   **forcerm** - Always remove intermediate containers (includes `rm`).
--   **memory** - Set memory limit for build.
--   **memswap** - Total memory (memory + swap), `-1` to enable unlimited swap.
--   **cpushares** - CPU shares (relative weight).
--   **cpusetcpus** - CPUs in which to allow execution (e.g., `0-3`, `0,1`).
--   **cpuperiod** - The length of a CPU period in microseconds.
--   **cpuquota** - Microseconds of CPU time that the container can get in a CPU period.
--   **buildargs** – JSON map of string pairs for build-time variables. Users pass
-        these values at build-time. Docker uses the `buildargs` as the environment
-        context for command(s) run via the Dockerfile's `RUN` instruction or for
-        variable expansion in other Dockerfile instructions. This is not meant for
-        passing secret values. [Read more about the buildargs instruction](../reference/builder.md#arg)
--   **shmsize** - Size of `/dev/shm` in bytes. The size must be greater than 0.  If omitted the system uses 64MB.
--   **labels** – JSON map of string pairs for labels to set on the image.
-
-**Request Headers**:
-
--   **Content-type** – Set to `"application/tar"`.
--   **X-Registry-Config** – A base64-url-safe-encoded Registry Auth Config JSON
-        object with the following structure:
-
-            {
-                "docker.example.com": {
-                    "username": "janedoe",
-                    "password": "hunter2"
-                },
-                "https://index.docker.io/v1/": {
-                    "username": "mobydock",
-                    "password": "conta1n3rize14"
-                }
-            }
-
-    This object maps the hostname of a registry to an object containing the
-    "username" and "password" for that registry. Multiple registries may
-    be specified as the build may be based on an image requiring
-    authentication to pull from any arbitrary registry. Only the registry
-    domain name (and port if not the default "443") are required. However
-    (for legacy reasons) the "official" Docker, Inc. hosted registry must
-    be specified with both a "https://" prefix and a "/v1/" suffix even
-    though Docker will prefer to use the v2 registry API.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Create an image
-
-`POST /images/create`
-
-Create an image either by pulling it from the registry or by importing it
-
-**Example request**:
-
-    POST /v1.24/images/create?fromImage=busybox&tag=latest HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pulling..."}
-    {"status": "Pulling", "progress": "1 B/ 100 B", "progressDetail": {"current": 1, "total": 100}}
-    {"error": "Invalid..."}
-    ...
-
-When using this endpoint to pull an image from the registry, the
-`X-Registry-Auth` header can be used to include
-a base64-encoded AuthConfig object.
-
-**Query parameters**:
-
--   **fromImage** – Name of the image to pull. The name may include a tag or
-        digest. This parameter may only be used when pulling an image.
-        The pull is cancelled if the HTTP connection is closed.
--   **fromSrc** – Source to import.  The value may be a URL from which the image
-        can be retrieved or `-` to read the image from the request body.
-        This parameter may only be used when importing an image.
--   **repo** – Repository name given to an image when it is imported.
-        The repo may include a tag. This parameter may only be used when importing
-        an image.
--   **tag** – Tag or digest. If empty when pulling an image, this causes all tags
-        for the given image to be pulled.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com"
-    }
-        ```
-
-    - Token based login:
-
-        ```
-    {
-            "identitytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** - repository does not exist or no read access
--   **500** – server error
-
-
-
-#### Inspect an image
-
-`GET /images/(name)/json`
-
-Return low-level information on the image `name`
-
-**Example request**:
-
-    GET /v1.24/images/example/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-       "Id" : "sha256:85f05633ddc1c50679be2b16a0479ab6f7637f8884e0cfe0f4d20e1ebb3d6e7c",
-       "Container" : "cb91e48a60d01f1e27028b4fc6819f4f290b3cf12496c8176ec714d0d390984a",
-       "Comment" : "",
-       "Os" : "linux",
-       "Architecture" : "amd64",
-       "Parent" : "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-       "ContainerConfig" : {
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "StdinOnce" : false,
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "User" : "",
-          "WorkingDir" : "",
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "Labels" : {
-             "com.example.license" : "GPL",
-             "com.example.version" : "1.0",
-             "com.example.vendor" : "Acme"
-          },
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "ExposedPorts" : null,
-          "Cmd" : [
-             "/bin/sh",
-             "-c",
-             "#(nop) LABEL com.example.vendor=Acme com.example.license=GPL com.example.version=1.0"
-          ]
-       },
-       "DockerVersion" : "1.9.0-dev",
-       "VirtualSize" : 188359297,
-       "Size" : 0,
-       "Author" : "",
-       "Created" : "2015-09-10T08:30:53.26995814Z",
-       "GraphDriver" : {
-          "Name" : "aufs",
-          "Data" : null
-       },
-       "RepoDigests" : [
-          "localhost:5000/test/busybox/example@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf"
-       ],
-       "RepoTags" : [
-          "example:1.0",
-          "example:latest",
-          "example:stable"
-       ],
-       "Config" : {
-          "Image" : "91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-          "NetworkDisabled" : false,
-          "OnBuild" : [],
-          "StdinOnce" : false,
-          "PublishService" : "",
-          "AttachStdin" : false,
-          "OpenStdin" : false,
-          "Domainname" : "",
-          "AttachStdout" : false,
-          "Tty" : false,
-          "Hostname" : "e611e15f9c9d",
-          "Volumes" : null,
-          "Cmd" : [
-             "/bin/bash"
-          ],
-          "ExposedPorts" : null,
-          "Env" : [
-             "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-          ],
-          "Labels" : {
-             "com.example.vendor" : "Acme",
-             "com.example.version" : "1.0",
-             "com.example.license" : "GPL"
-          },
-          "Entrypoint" : null,
-          "MacAddress" : "",
-          "AttachStderr" : false,
-          "WorkingDir" : "",
-          "User" : ""
-       },
-       "RootFS": {
-           "Type": "layers",
-           "Layers": [
-               "sha256:1834950e52ce4d5a88a1bbd131c537f4d0e56d10ff0dd69e66be3b7dfa9df7e6",
-               "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-           ]
-       }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Get the history of an image
-
-`GET /images/(name)/history`
-
-Return the history of the image `name`
-
-**Example request**:
-
-    GET /v1.24/images/ubuntu/history HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-        {
-            "Id": "3db9c44f45209632d6050b35958829c3a2aa256d81b9a7be45b362ff85c54710",
-            "Created": 1398108230,
-            "CreatedBy": "/bin/sh -c #(nop) ADD file:eb15dbd63394e063b805a3c32ca7bf0266ef64676d5a6fab4801f2e81e2a5148 in /",
-            "Tags": [
-                "ubuntu:lucid",
-                "ubuntu:10.04"
-            ],
-            "Size": 182964289,
-            "Comment": ""
-        },
-        {
-            "Id": "6cfa4d1f33fb861d4d114f43b25abd0ac737509268065cdfd69d544a59c85ab8",
-            "Created": 1398108222,
-            "CreatedBy": "/bin/sh -c #(nop) MAINTAINER Tianon Gravi <admwiggin@gmail.com> - mkimage-debootstrap.sh -i iproute,iputils-ping,ubuntu-minimal -t lucid.tar.xz lucid http://archive.ubuntu.com/ubuntu/",
-            "Tags": null,
-            "Size": 0,
-            "Comment": ""
-        },
-        {
-            "Id": "511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158",
-            "Created": 1371157430,
-            "CreatedBy": "",
-            "Tags": [
-                "scratch12:latest",
-                "scratch:latest"
-            ],
-            "Size": 0,
-            "Comment": "Imported from -"
-        }
-    ]
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Push an image on the registry
-
-`POST /images/(name)/push`
-
-Push the image `name` on the registry
-
-**Example request**:
-
-    POST /v1.24/images/test/push HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {"status": "Pushing..."}
-    {"status": "Pushing", "progress": "1/? (n/a)", "progressDetail": {"current": 1}}}
-    {"error": "Invalid..."}
-    ...
-
-If you wish to push an image on to a private registry, that image must already have a tag
-into a repository which references that registry `hostname` and `port`.  This repository name should
-then be used in the URL. This duplicates the command line's flow.
-
-The push is cancelled if the HTTP connection is closed.
-
-**Example request**:
-
-    POST /v1.24/images/registry.acme.com:5000/test/push HTTP/1.1
-
-
-**Query parameters**:
-
--   **tag** – The tag to associate with the image on the registry. This is optional.
-
-**Request Headers**:
-
--   **X-Registry-Auth** – base64-encoded AuthConfig object, containing either login information, or a token
-    - Credential based login:
-
-        ```
-    {
-            "username": "jdoe",
-            "password": "secret",
-            "email": "jdoe@acme.com",
-    }
-        ```
-
-    - Identity token based login:
-
-        ```
-    {
-            "identitytoken": "9cbaf023786cd7..."
-    }
-        ```
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **500** – server error
-
-#### Tag an image into a repository
-
-`POST /images/(name)/tag`
-
-Tag the image `name` into a repository
-
-**Example request**:
-
-    POST /v1.24/images/test/tag?repo=myrepo&tag=v42 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-
-**Query parameters**:
-
--   **repo** – The repository to tag in
--   **tag** - The new tag name
-
-**Status codes**:
-
--   **201** – no error
--   **400** – bad parameter
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Remove an image
-
-`DELETE /images/(name)`
-
-Remove the image `name` from the filesystem
-
-**Example request**:
-
-    DELETE /v1.24/images/test HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-type: application/json
-
-    [
-     {"Untagged": "3e2f21a89f"},
-     {"Deleted": "3e2f21a89f"},
-     {"Deleted": "53b4f83ac9"}
-    ]
-
-**Query parameters**:
-
--   **force** – 1/True/true or 0/False/false, default false
--   **noprune** – 1/True/true or 0/False/false, default false
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such image
--   **409** – conflict
--   **500** – server error
-
-#### Search images
-
-`GET /images/search`
-
-Search for an image on [Docker Hub](https://hub.docker.com).
-
-> **Note**:
-> The response keys have changed from API v1.6 to reflect the JSON
-> sent by the registry server to the docker daemon's request.
-
-**Example request**:
-
-    GET /v1.24/images/search?term=sshd HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "wma55/u1210sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "jdswinbank/sshd",
-                "star_count": 0
-            },
-            {
-                "description": "",
-                "is_official": false,
-                "is_automated": false,
-                "name": "vgauthier/sshd",
-                "star_count": 0
-            }
-    ...
-    ]
-
-**Query parameters**:
-
--   **term** – term to search
--   **limit** – maximum returned search results
--   **filters** – a JSON encoded value of the filters (a map[string][]string) to process on the images list. Available filters:
-  -   `stars=<number>`
-  -   `is-automated=(true|false)`
-  -   `is-official=(true|false)`
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-### 3.3 Misc
-
-#### Check auth configuration
-
-`POST /auth`
-
-Validate credentials for a registry and get identity token,
-if available, for accessing the registry without password.
-
-**Example request**:
-
-    POST /v1.24/auth HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "username": "hannibal",
-         "password": "xxxx",
-         "serveraddress": "https://index.docker.io/v1/"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-    {
-         "Status": "Login Succeeded",
-         "IdentityToken": "9cbaf023786cd7..."
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **204** – no error
--   **500** – server error
-
-#### Display system-wide information
-
-`GET /info`
-
-Display system-wide information
-
-**Example request**:
-
-    GET /v1.24/info HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-        "Architecture": "x86_64",
-        "ClusterStore": "etcd://localhost:2379",
-        "CgroupDriver": "cgroupfs",
-        "Containers": 11,
-        "ContainersRunning": 7,
-        "ContainersStopped": 3,
-        "ContainersPaused": 1,
-        "CpuCfsPeriod": true,
-        "CpuCfsQuota": true,
-        "Debug": false,
-        "DockerRootDir": "/var/lib/docker",
-        "Driver": "btrfs",
-        "DriverStatus": [[""]],
-        "ExperimentalBuild": false,
-        "HttpProxy": "http://test:test@localhost:8080",
-        "HttpsProxy": "https://test:test@localhost:8080",
-        "ID": "7TRN:IPZB:QYBB:VPBQ:UMPP:KARE:6ZNR:XE6T:7EWV:PKF4:ZOJD:TPYS",
-        "IPv4Forwarding": true,
-        "Images": 16,
-        "IndexServerAddress": "https://index.docker.io/v1/",
-        "InitPath": "/usr/bin/docker",
-        "InitSha1": "",
-        "KernelMemory": true,
-        "KernelVersion": "3.12.0-1-amd64",
-        "Labels": [
-            "storage=ssd"
-        ],
-        "MemTotal": 2099236864,
-        "MemoryLimit": true,
-        "NCPU": 1,
-        "NEventsListener": 0,
-        "NFd": 11,
-        "NGoroutines": 21,
-        "Name": "prod-server-42",
-        "NoProxy": "9.81.1.160",
-        "OomKillDisable": true,
-        "OSType": "linux",
-        "OperatingSystem": "Boot2Docker",
-        "Plugins": {
-            "Volume": [
-                "local"
-            ],
-            "Network": [
-                "null",
-                "host",
-                "bridge"
-            ]
-        },
-        "RegistryConfig": {
-            "IndexConfigs": {
-                "docker.io": {
-                    "Mirrors": null,
-                    "Name": "docker.io",
-                    "Official": true,
-                    "Secure": true
-                }
-            },
-            "InsecureRegistryCIDRs": [
-                "127.0.0.0/8"
-            ]
-        },
-        "SecurityOptions": [
-            "apparmor",
-            "seccomp",
-            "selinux"
-        ],
-        "ServerVersion": "1.9.0",
-        "SwapLimit": false,
-        "SystemStatus": [["State", "Healthy"]],
-        "SystemTime": "2015-03-10T11:11:23.730591467-07:00"
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Show the docker version information
-
-`GET /version`
-
-Show the docker version information
-
-**Example request**:
-
-    GET /v1.24/version HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-         "Version": "1.12.0",
-         "Os": "linux",
-         "KernelVersion": "3.19.0-23-generic",
-         "GoVersion": "go1.6.3",
-         "GitCommit": "deadbee",
-         "Arch": "amd64",
-         "ApiVersion": "1.24",
-         "BuildTime": "2016-06-14T07:09:13.444803460+00:00",
-         "Experimental": true
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Ping the docker server
-
-`GET /_ping`
-
-Ping the docker server
-
-**Example request**:
-
-    GET /v1.24/_ping HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: text/plain
-
-    OK
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a new image from a container's changes
-
-`POST /commit`
-
-Create a new image from a container's changes
-
-**Example request**:
-
-    POST /v1.24/commit?container=44c004db4b17&comment=message&repo=myrepo HTTP/1.1
-    Content-Type: application/json
-
-    {
-         "Hostname": "",
-         "Domainname": "",
-         "User": "",
-         "AttachStdin": false,
-         "AttachStdout": true,
-         "AttachStderr": true,
-         "Tty": false,
-         "OpenStdin": false,
-         "StdinOnce": false,
-         "Env": null,
-         "Cmd": [
-                 "date"
-         ],
-         "Mounts": [
-           {
-             "Source": "/data",
-             "Destination": "/data",
-             "Mode": "ro,Z",
-             "RW": false
-           }
-         ],
-         "Labels": {
-                 "key1": "value1",
-                 "key2": "value2"
-          },
-         "WorkingDir": "",
-         "NetworkDisabled": false,
-         "ExposedPorts": {
-                 "22/tcp": {}
-         }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {"Id": "596069db4bf5"}
-
-**JSON parameters**:
-
--  **config** - the container's configuration
-
-**Query parameters**:
-
--   **container** – source container
--   **repo** – repository
--   **tag** – tag
--   **comment** – commit message
--   **author** – author (e.g., "John Hannibal Smith
-    <[hannibal@a-team.com](mailto:hannibal%40a-team.com)>")
--   **pause** – 1/True/true or 0/False/false, whether to pause the container before committing
--   **changes** – Dockerfile instructions to apply while committing
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **500** – server error
-
-#### Monitor Docker's events
-
-`GET /events`
-
-Get container events from docker, in real time via streaming.
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, detach, die, exec_create, exec_detach, exec_start, export, health_status, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update
-
-Docker images report the following events:
-
-    delete, import, load, pull, push, save, tag, untag
-
-Docker volumes report the following events:
-
-    create, mount, unmount, destroy
-
-Docker networks report the following events:
-
-    create, connect, disconnect, destroy
-
-Docker daemon report the following event:
-
-    reload
-
-**Example request**:
-
-    GET /v1.24/events?since=1374067924
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Server: Docker/1.12.0 (linux)
-    Date: Fri, 29 Apr 2016 15:18:06 GMT
-    Transfer-Encoding: chunked
-
-    {
-      "status": "pull",
-      "id": "alpine:latest",
-      "Type": "image",
-      "Action": "pull",
-      "Actor": {
-        "ID": "alpine:latest",
-        "Attributes": {
-          "name": "alpine"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101301854122
-    }
-    {
-      "status": "create",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "create",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101381709551
-    }
-    {
-      "status": "attach",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "attach",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101383858412
-    }
-    {
-      "Type": "network",
-      "Action": "connect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101394865557
-    }
-    {
-      "status": "start",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "start",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101607533796
-    }
-    {
-      "status": "resize",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "resize",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "height": "46",
-          "image": "alpine",
-          "name": "my-container",
-          "width": "204"
-        }
-      },
-      "time": 1461943101,
-      "timeNano": 1461943101610269268
-    }
-    {
-      "status": "die",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "die",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "exitCode": "0",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105079144137
-    }
-    {
-      "Type": "network",
-      "Action": "disconnect",
-      "Actor": {
-        "ID": "7dc8ac97d5d29ef6c31b6052f3938c1e8f2749abbd17d1bd1febf2608db1b474",
-        "Attributes": {
-          "container": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-          "name": "bridge",
-          "type": "bridge"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105230860245
-    }
-    {
-      "status": "destroy",
-      "id": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-      "from": "alpine",
-      "Type": "container",
-      "Action": "destroy",
-      "Actor": {
-        "ID": "ede54ee1afda366ab42f824e8a5ffd195155d853ceaec74a927f249ea270c743",
-        "Attributes": {
-          "com.example.some-label": "some-label-value",
-          "image": "alpine",
-          "name": "my-container"
-        }
-      },
-      "time": 1461943105,
-      "timeNano": 1461943105338056026
-    }
-
-**Query parameters**:
-
--   **since** – Timestamp. Show all events created since timestamp and then stream
--   **until** – Timestamp. Show events created until given timestamp and stop streaming
--   **filters** – A json encoded value of the filters (a map[string][]string) to process on the event list. Available filters:
-  -   `container=<string>`; -- container to filter
-  -   `event=<string>`; -- event to filter
-  -   `image=<string>`; -- image to filter
-  -   `label=<string>`; -- image and container label to filter
-  -   `type=<string>`; -- either `container` or `image` or `volume` or `network` or `daemon`
-  -   `volume=<string>`; -- volume to filter
-  -   `network=<string>`; -- network to filter
-  -   `daemon=<string>`; -- daemon name or id to filter
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images in a repository
-
-`GET /images/(name)/get`
-
-Get a tarball containing all images and metadata for the repository specified
-by `name`.
-
-If `name` is a specific name and tag (e.g. ubuntu:latest), then only that image
-(and its parents) are returned. If `name` is an image ID, similarly only that
-image (and its parents) are returned, but with the exclusion of the
-'repositories' file in the tarball, as there were no image names referenced.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.24/images/ubuntu/get
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Get a tarball containing all images
-
-`GET /images/get`
-
-Get a tarball containing all images and metadata for one or more repositories.
-
-For each value of the `names` parameter: if it is a specific name and tag (e.g.
-`ubuntu:latest`), then only that image (and its parents) are returned; if it is
-an image ID, similarly only that image (and its parents) are returned and there
-would be no names referenced in the 'repositories' file for this image ID.
-
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    GET /v1.24/images/get?names=myname%2Fmyapp%3Alatest&names=busybox
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/x-tar
-
-    Binary data stream
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Load a tarball with a set of images and tags into docker
-
-`POST /images/load`
-
-Load a set of images and tags into a Docker repository.
-See the [image tarball format](#image-tarball-format) for more details.
-
-**Example request**
-
-    POST /v1.24/images/load
-    Content-Type: application/x-tar
-
-    Tarball in body
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Transfer-Encoding: chunked
-
-    {"status":"Loading layer","progressDetail":{"current":32768,"total":1292800},"progress":"[=                                                 ] 32.77 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":65536,"total":1292800},"progress":"[==                                                ] 65.54 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":98304,"total":1292800},"progress":"[===                                               ]  98.3 kB/1.293 MB","id":"8ac8bfaff55a"}
-    {"status":"Loading layer","progressDetail":{"current":131072,"total":1292800},"progress":"[=====                                             ] 131.1 kB/1.293 MB","id":"8ac8bfaff55a"}
-    ...
-    {"stream":"Loaded image: busybox:latest\n"}
-
-**Example response**:
-
-If the "quiet" query parameter is set to `true` / `1` (`?quiet=1`), progress
-details are suppressed, and only a confirmation message is returned once the
-action completes.
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-    Transfer-Encoding: chunked
-
-    {"stream":"Loaded image: busybox:latest\n"}
-
-**Query parameters**:
-
--   **quiet** – Boolean value, suppress progress details during load. Defaults
-      to `0` / `false` if omitted.
-
-**Status codes**:
-
--   **200** – no error
--   **500** – server error
-
-#### Image tarball format
-
-An image tarball contains one directory per image layer (named using its long ID),
-each containing these files:
-
-- `VERSION`: currently `1.0` - the file format version
-- `json`: detailed layer information, similar to `docker inspect layer_id`
-- `layer.tar`: A tarfile containing the filesystem changes in this layer
-
-The `layer.tar` file contains `aufs` style `.wh..wh.aufs` files and directories
-for storing attribute changes and deletions.
-
-If the tarball defines a repository, the tarball should also include a `repositories` file at
-the root that contains a list of repository and tag names mapped to layer IDs.
-
-```
-{"hello-world":
-    {"latest": "565a9d68a73f6706862bfe8409a7f659776d4d60a8d096eb4a3cbce6999cc2a1"}
-}
-```
-
-#### Exec Create
-
-`POST /containers/(id or name)/exec`
-
-Sets up an exec instance in a running container `id`
-
-**Example request**:
-
-    POST /v1.24/containers/e90e34656806/exec HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "AttachStdin": true,
-      "AttachStdout": true,
-      "AttachStderr": true,
-      "Cmd": ["sh"],
-      "DetachKeys": "ctrl-p,ctrl-q",
-      "Privileged": true,
-      "Tty": true,
-      "User": "123:456"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-         "Id": "f90e34656806",
-         "Warnings":[]
-    }
-
-**JSON parameters**:
-
--   **AttachStdin** - Boolean value, attaches to `stdin` of the `exec` command.
--   **AttachStdout** - Boolean value, attaches to `stdout` of the `exec` command.
--   **AttachStderr** - Boolean value, attaches to `stderr` of the `exec` command.
--   **DetachKeys** – Override the key sequence for detaching a
-        container. Format is a single character `[a-Z]` or `ctrl-<value>`
-        where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
--   **Cmd** - Command to run specified as a string or an array of strings.
--   **Privileged** - Boolean value, runs the exec process with extended privileges.
--   **User** - A string value specifying the user, and optionally, group to run
-        the exec process inside the container. Format is one of: `"user"`,
-        `"user:group"`, `"uid"`, or `"uid:gid"`.
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such container
--   **409** - container is paused
--   **500** - server error
-
-#### Exec Start
-
-`POST /exec/(id)/start`
-
-Starts a previously set up `exec` instance `id`. If `detach` is true, this API
-returns after starting the `exec` command. Otherwise, this API sets up an
-interactive session with the `exec` command.
-
-**Example request**:
-
-    POST /v1.24/exec/e90e34656806/start HTTP/1.1
-    Content-Type: application/json
-
-    {
-     "Detach": false,
-     "Tty": false
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/vnd.docker.raw-stream
-
-    {% raw %}
-    {{ STREAM }}
-    {% endraw %}
-
-**JSON parameters**:
-
--   **Detach** - Detach from the `exec` command.
--   **Tty** - Boolean value to allocate a pseudo-TTY.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **409** - container is paused
-
-**Stream details**:
-
-Similar to the stream behavior of `POST /containers/(id or name)/attach` API
-
-#### Exec Resize
-
-`POST /exec/(id)/resize`
-
-Resizes the `tty` session used by the `exec` command `id`.  The unit is number of characters.
-This API is valid only if `tty` was specified as part of creating and starting the `exec` command.
-
-**Example request**:
-
-    POST /v1.24/exec/e90e34656806/resize?h=40&w=80 HTTP/1.1
-    Content-Type: text/plain
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: text/plain
-
-**Query parameters**:
-
--   **h** – height of `tty` session
--   **w** – width
-
-**Status codes**:
-
--   **201** – no error
--   **404** – no such exec instance
-
-#### Exec Inspect
-
-`GET /exec/(id)/json`
-
-Return low-level information about the `exec` command `id`.
-
-**Example request**:
-
-    GET /v1.24/exec/11fb006128e8ceb3942e7c58d77750f24210e35f879dd204ac975c184b820b39/json HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "CanRemove": false,
-      "ContainerID": "b53ee82b53a40c7dca428523e34f741f3abc51d9f297a14ff874bf761b995126",
-      "DetachKeys": "",
-      "ExitCode": 2,
-      "ID": "f33bbfb39f5b142420f4759b2348913bd4a8d1a6d7fd56499cb41a1bb91d7b3b",
-      "OpenStderr": true,
-      "OpenStdin": true,
-      "OpenStdout": true,
-      "ProcessConfig": {
-        "arguments": [
-          "-c",
-          "exit 2"
-        ],
-        "entrypoint": "sh",
-        "privileged": false,
-        "tty": true,
-        "user": "1000"
-      },
-      "Running": false
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such exec instance
--   **500** - server error
-
-### 3.4 Volumes
-
-#### List volumes
-
-`GET /volumes`
-
-**Example request**:
-
-    GET /v1.24/volumes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Volumes": [
-        {
-          "Name": "tardis",
-          "Driver": "local",
-          "Mountpoint": "/var/lib/docker/volumes/tardis",
-          "Labels": null,
-          "Scope": "local"
-        }
-      ],
-      "Warnings": []
-    }
-
-**Query parameters**:
-
-- **filters** - JSON encoded value of the filters (a `map[string][]string`) to process on the volumes list. Available filters:
-  -   `name=<volume-name>` Matches all or part of a volume name.
-  -   `dangling=<boolean>` When set to `true` (or `1`), returns all volumes that are "dangling" (not in use by a container). When set to `false` (or `0`), only volumes that are in use by one or more containers are returned.
-  -   `driver=<volume-driver-name>` Matches all or part of a volume driver name.
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Create a volume
-
-`POST /volumes/create`
-
-Create a volume
-
-**Example request**:
-
-    POST /v1.24/volumes/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Labels": {
-        "com.example.some-label": "some-value",
-        "com.example.some-other-label": "some-other-value"
-      },
-      "Driver": "custom"
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "custom",
-      "Mountpoint": "/var/lib/docker/volumes/tardis",
-      "Status": {
-        "hello": "world"
-      },
-      "Labels": {
-        "com.example.some-label": "some-value",
-        "com.example.some-other-label": "some-other-value"
-      },
-      "Scope": "local"
-    }
-
-**Status codes**:
-
-- **201** - no error
-- **500**  - server error
-
-**JSON parameters**:
-
-- **Name** - The new volume's name. If not specified, Docker generates a name.
-- **Driver** - Name of the volume driver to use. Defaults to `local` for the name.
-- **DriverOpts** - A mapping of driver options and values. These options are
-    passed directly to the driver and are driver specific.
-- **Labels** - Labels to set on the volume, specified as a map: `{"key":"value","key2":"value2"}`
-
-**JSON fields in response**:
-
-Refer to the [inspect a volume](#inspect-a-volume) section or details about the
-JSON fields returned in the response.
-
-#### Inspect a volume
-
-`GET /volumes/(name)`
-
-Return low-level information on the volume `name`
-
-**Example request**:
-
-    GET /v1.24/volumes/tardis
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "Name": "tardis",
-      "Driver": "custom",
-      "Mountpoint": "/var/lib/docker/volumes/tardis/_data",
-      "Status": {
-        "hello": "world"
-      },
-      "Labels": {
-          "com.example.some-label": "some-value",
-          "com.example.some-other-label": "some-other-value"
-      },
-      "Scope": "local"
-    }
-
-**Status codes**:
-
--   **200** - no error
--   **404** - no such volume
--   **500** - server error
-
-**JSON fields in response**:
-
-The following fields can be returned in the API response. Empty fields, or
-fields that are not supported by the volume's driver may be omitted in the
-response.
-
-- **Name** - Name of the volume.
-- **Driver** - Name of the volume driver used by the volume.
-- **Mountpoint** - Mount path of the volume on the host.
-- **Status** - Low-level details about the volume, provided by the volume driver.
-    Details are returned as a map with key/value pairs: `{"key":"value","key2":"value2"}`.
-    The `Status` field is optional, and is omitted if the volume driver does not
-    support this feature.
-- **Labels** - Labels set on the volume, specified as a map: `{"key":"value","key2":"value2"}`.
-- **Scope** - Scope describes the level at which the volume exists, can be one of
-    `global` for cluster-wide or `local` for machine level. The default is `local`.
-
-#### Remove a volume
-
-`DELETE /volumes/(name)`
-
-Instruct the driver to remove the volume (`name`).
-
-**Example request**:
-
-    DELETE /v1.24/volumes/tardis HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such volume or volume driver
--   **409** - volume is in use and cannot be removed
--   **500** - server error
-
-### 3.5 Networks
-
-#### List networks
-
-`GET /networks`
-
-**Example request**:
-
-    GET /v1.24/networks?filters={"type":{"custom":true}} HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-[
-  {
-    "Name": "bridge",
-    "Id": "f2de39df4171b0dc801e8002d1d999b77256983dfc63041c0f34030aa3977566",
-    "Scope": "local",
-    "Driver": "bridge",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": [
-        {
-          "Subnet": "172.17.0.0/16"
-        }
-      ]
-    },
-    "Containers": {
-      "39b69226f9d79f5634485fb236a23b2fe4e96a0a94128390a7fbbcc167065867": {
-        "EndpointID": "ed2419a97c1d9954d05b46e462e7002ea552f216e9b136b80a7db8d98b442eda",
-        "MacAddress": "02:42:ac:11:00:02",
-        "IPv4Address": "172.17.0.2/16",
-        "IPv6Address": ""
-      }
-    },
-    "Options": {
-      "com.docker.network.bridge.default_bridge": "true",
-      "com.docker.network.bridge.enable_icc": "true",
-      "com.docker.network.bridge.enable_ip_masquerade": "true",
-      "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-      "com.docker.network.bridge.name": "docker0",
-      "com.docker.network.driver.mtu": "1500"
-    }
-  },
-  {
-    "Name": "none",
-    "Id": "e086a3893b05ab69242d3c44e49483a3bbbd3a26b46baa8f61ab797c1088d794",
-    "Scope": "local",
-    "Driver": "null",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  },
-  {
-    "Name": "host",
-    "Id": "13e871235c677f196c4e1ecebb9dc733b9b2d2ab589e30c539efeda84a24215e",
-    "Scope": "local",
-    "Driver": "host",
-    "EnableIPv6": false,
-    "Internal": false,
-    "IPAM": {
-      "Driver": "default",
-      "Config": []
-    },
-    "Containers": {},
-    "Options": {}
-  }
-]
-```
-
-**Query parameters**:
-
-- **filters** - JSON encoded network list filter. The filter value is one of:
-  -   `driver=<driver-name>` Matches a network's driver.
-  -   `id=<network-id>` Matches all or part of a network id.
-  -   `label=<key>` or `label=<key>=<value>` of a network label.
-  -   `name=<network-name>` Matches all or part of a network name.
-  -   `type=["custom"|"builtin"]` Filters networks by type. The `custom` keyword returns all user-defined networks.
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Inspect network
-
-`GET /networks/<network-id>`
-
-**Example request**:
-
-    GET /v1.24/networks/7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99 HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-{
-  "Name": "net01",
-  "Id": "7d86d31b1478e7cca9ebed7e73aa0fdeec46c5ca29497431d3007d2d9e15ed99",
-  "Scope": "local",
-  "Driver": "bridge",
-  "EnableIPv6": false,
-  "IPAM": {
-    "Driver": "default",
-    "Config": [
-      {
-        "Subnet": "172.19.0.0/16",
-        "Gateway": "172.19.0.1"
-      }
-    ],
-    "Options": {
-        "foo": "bar"
-    }
-  },
-  "Internal": false,
-  "Containers": {
-    "19a4d5d687db25203351ed79d478946f861258f018fe384f229f2efa4b23513c": {
-      "Name": "test",
-      "EndpointID": "628cadb8bcb92de107b2a1e516cbffe463e321f548feb37697cce00ad694f21a",
-      "MacAddress": "02:42:ac:13:00:02",
-      "IPv4Address": "172.19.0.2/16",
-      "IPv6Address": ""
-    }
-  },
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  },
-  "Labels": {
-    "com.example.some-label": "some-value",
-    "com.example.some-other-label": "some-other-value"
-  }
-}
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - network not found
-
-#### Create a network
-
-`POST /networks/create`
-
-Create a network
-
-**Example request**:
-
-```
-POST /v1.24/networks/create HTTP/1.1
-Content-Type: application/json
-
-{
-  "Name":"isolated_nw",
-  "CheckDuplicate":true,
-  "Driver":"bridge",
-  "EnableIPv6": true,
-  "IPAM":{
-    "Driver": "default",
-    "Config":[
-      {
-        "Subnet":"172.20.0.0/16",
-        "IPRange":"172.20.10.0/24",
-        "Gateway":"172.20.10.11"
-      },
-      {
-        "Subnet":"2001:db8:abcd::/64",
-        "Gateway":"2001:db8:abcd::1011"
-      }
-    ],
-    "Options": {
-      "foo": "bar"
-    }
-  },
-  "Internal":true,
-  "Options": {
-    "com.docker.network.bridge.default_bridge": "true",
-    "com.docker.network.bridge.enable_icc": "true",
-    "com.docker.network.bridge.enable_ip_masquerade": "true",
-    "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-    "com.docker.network.bridge.name": "docker0",
-    "com.docker.network.driver.mtu": "1500"
-  },
-  "Labels": {
-    "com.example.some-label": "some-value",
-    "com.example.some-other-label": "some-other-value"
-  }
-}
-```
-
-**Example response**:
-
-```
-HTTP/1.1 201 Created
-Content-Type: application/json
-
-{
-  "Id": "22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30",
-  "Warning": ""
-}
-```
-
-**Status codes**:
-
-- **201** - no error
-- **403** - operation not supported for pre-defined networks
-- **404** - plugin not found
-- **500** - server error
-
-**JSON parameters**:
-
-- **Name** - The new network's name. this is a mandatory field
-- **CheckDuplicate** - Requests daemon to check for networks with same name. Defaults to `false`
-- **Driver** - Name of the network driver plugin to use. Defaults to `bridge` driver
-- **Internal** - Restrict external access to the network
-- **IPAM** - Optional custom IP scheme for the network
-  - **Driver** - Name of the IPAM driver to use. Defaults to `default` driver
-  - **Config** - List of IPAM configuration options, specified as a map:
-      `{"Subnet": <CIDR>, "IPRange": <CIDR>, "Gateway": <IP address>, "AuxAddress": <device_name:IP address>}`
-  - **Options** - Driver-specific options, specified as a map: `{"option":"value" [,"option2":"value2"]}`
-- **EnableIPv6** - Enable IPv6 on the network
-- **Options** - Network specific options to be used by the drivers
-- **Labels** - Labels to set on the network, specified as a map: `{"key":"value" [,"key2":"value2"]}`
-
-#### Connect a container to a network
-
-`POST /networks/(id)/connect`
-
-Connect a container to a network
-
-**Example request**:
-
-```
-POST /v1.24/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/connect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "EndpointConfig": {
-    "IPAMConfig": {
-        "IPv4Address":"172.24.56.89",
-        "IPv6Address":"2001:db8::5689"
-    }
-  }
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **403** - operation not supported for swarm scoped networks
-- **404** - network or container is not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **container** - container-id/name to be connected to the network
-
-#### Disconnect a container from a network
-
-`POST /networks/(id)/disconnect`
-
-Disconnect a container from a network
-
-**Example request**:
-
-```
-POST /v1.24/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30/disconnect HTTP/1.1
-Content-Type: application/json
-
-{
-  "Container":"3613f73ba0e4",
-  "Force":false
-}
-```
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-
-**Status codes**:
-
-- **200** - no error
-- **403** - operation not supported for swarm scoped networks
-- **404** - network or container not found
-- **500** - Internal Server Error
-
-**JSON parameters**:
-
-- **Container** - container-id/name to be disconnected from a network
-- **Force** - Force the container to disconnect from a network
-
-#### Remove a network
-
-`DELETE /networks/(id)`
-
-Instruct the driver to remove the network (`id`).
-
-**Example request**:
-
-    DELETE /v1.24/networks/22be93d5babb089c5aab8dbc369042fad48ff791584ca2da2100db837a1c7c30 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 204 No Content
-
-**Status codes**:
-
--   **204** - no error
--   **404** - no such network
--   **500** - server error
-
-### 3.6 Plugins (experimental)
-
-#### List plugins
-
-`GET /plugins`
-
-Returns information about installed plugins.
-
-**Example request**:
-
-    GET /v1.24/plugins HTTP/1.1
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-[
-  {
-    "Id": "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078",
-    "Name": "tiborvass/no-remove",
-    "Tag": "latest",
-    "Active": true,
-    "Config": {
-      "Mounts": [
-        {
-          "Name": "",
-          "Description": "",
-          "Settable": null,
-          "Source": "/data",
-          "Destination": "/data",
-          "Type": "bind",
-          "Options": [
-            "shared",
-            "rbind"
-          ]
-        },
-        {
-          "Name": "",
-          "Description": "",
-          "Settable": null,
-          "Source": null,
-          "Destination": "/foobar",
-          "Type": "tmpfs",
-          "Options": null
-        }
-      ],
-      "Env": [
-        "DEBUG=1"
-      ],
-      "Args": null,
-      "Devices": null
-    },
-    "Manifest": {
-      "ManifestVersion": "v0",
-      "Description": "A test plugin for Docker",
-      "Documentation": "https://docs.docker.com/engine/extend/plugins/",
-      "Interface": {
-        "Types": [
-          "docker.volumedriver/1.0"
-        ],
-        "Socket": "plugins.sock"
-      },
-      "Entrypoint": [
-        "plugin-no-remove",
-        "/data"
-      ],
-      "Workdir": "",
-      "User": {
-      },
-      "Network": {
-        "Type": "host"
-      },
-      "Capabilities": null,
-      "Mounts": [
-        {
-          "Name": "",
-          "Description": "",
-          "Settable": null,
-          "Source": "/data",
-          "Destination": "/data",
-          "Type": "bind",
-          "Options": [
-            "shared",
-            "rbind"
-          ]
-        },
-        {
-          "Name": "",
-          "Description": "",
-          "Settable": null,
-          "Source": null,
-          "Destination": "/foobar",
-          "Type": "tmpfs",
-          "Options": null
-        }
-      ],
-      "Devices": [
-        {
-          "Name": "device",
-          "Description": "a host device to mount",
-          "Settable": null,
-          "Path": "/dev/cpu_dma_latency"
-        }
-      ],
-      "Env": [
-        {
-          "Name": "DEBUG",
-          "Description": "If set, prints debug messages",
-          "Settable": null,
-          "Value": "1"
-        }
-      ],
-      "Args": {
-        "Name": "args",
-        "Description": "command line arguments",
-        "Settable": null,
-        "Value": [
-
-        ]
-      }
-    }
-  }
-]
-```
-
-**Status codes**:
-
--   **200** - no error
--   **500** - server error
-
-#### Install a plugin
-
-`POST /plugins/pull?name=<plugin name>`
-
-Pulls and installs a plugin. After the plugin is installed, it can be enabled
-using the [`POST /plugins/(plugin name)/enable` endpoint](#enable-a-plugin).
-
-**Example request**:
-
-```
-POST /v1.24/plugins/pull?name=tiborvass/no-remove:latest HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted. When using
-this endpoint to pull a plugin from the registry, the `X-Registry-Auth` header
-can be used to include a base64-encoded AuthConfig object. Refer to the [create
-an image](#create-an-image) section for more details.
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-Content-Length: 175
-
-[
-  {
-    "Name": "network",
-    "Description": "",
-    "Value": [
-      "host"
-    ]
-  },
-  {
-    "Name": "mount",
-    "Description": "",
-    "Value": [
-      "/data"
-    ]
-  },
-  {
-    "Name": "device",
-    "Description": "",
-    "Value": [
-      "/dev/cpu_dma_latency"
-    ]
-  }
-]
-```
-
-**Query parameters**:
-
-- **name** -  Name of the plugin to pull. The name may include a tag or digest.
-    This parameter is required.
-
-**Status codes**:
-
--   **200** - no error
--   **500** - error parsing reference / not a valid repository/tag: repository
-      name must have at least one component
--   **500** - plugin already exists
-
-#### Inspect a plugin
-
-`GET /plugins/(plugin name)`
-
-Returns detailed information about an installed plugin.
-
-**Example request**:
-
-```
-GET /v1.24/plugins/tiborvass/no-remove:latest HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted.
-
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Type: application/json
-
-{
-  "Id": "5724e2c8652da337ab2eedd19fc6fc0ec908e4bd907c7421bf6a8dfc70c4c078",
-  "Name": "tiborvass/no-remove",
-  "Tag": "latest",
-  "Active": false,
-  "Config": {
-    "Mounts": [
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": "/data",
-        "Destination": "/data",
-        "Type": "bind",
-        "Options": [
-          "shared",
-          "rbind"
-        ]
-      },
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": null,
-        "Destination": "/foobar",
-        "Type": "tmpfs",
-        "Options": null
-      }
-    ],
-    "Env": [
-      "DEBUG=1"
-    ],
-    "Args": null,
-    "Devices": null
-  },
-  "Manifest": {
-    "ManifestVersion": "v0",
-    "Description": "A test plugin for Docker",
-    "Documentation": "https://docs.docker.com/engine/extend/plugins/",
-    "Interface": {
-      "Types": [
-        "docker.volumedriver/1.0"
-      ],
-      "Socket": "plugins.sock"
-    },
-    "Entrypoint": [
-      "plugin-no-remove",
-      "/data"
-    ],
-    "Workdir": "",
-    "User": {
-    },
-    "Network": {
-      "Type": "host"
-    },
-    "Capabilities": null,
-    "Mounts": [
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": "/data",
-        "Destination": "/data",
-        "Type": "bind",
-        "Options": [
-          "shared",
-          "rbind"
-        ]
-      },
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": null,
-        "Destination": "/foobar",
-        "Type": "tmpfs",
-        "Options": null
-      }
-    ],
-    "Devices": [
-      {
-        "Name": "device",
-        "Description": "a host device to mount",
-        "Settable": null,
-        "Path": "/dev/cpu_dma_latency"
-      }
-    ],
-    "Env": [
-      {
-        "Name": "DEBUG",
-        "Description": "If set, prints debug messages",
-        "Settable": null,
-        "Value": "1"
-      }
-    ],
-    "Args": {
-      "Name": "args",
-      "Description": "command line arguments",
-      "Settable": null,
-      "Value": [
-
-      ]
-    }
-  }
-}
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - plugin not installed
-
-#### Enable a plugin
-
-`POST /plugins/(plugin name)/enable`
-
-Enables a plugin
-
-**Example request**:
-
-```
-POST /v1.24/plugins/tiborvass/no-remove:latest/enable HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted.
-
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Length: 0
-Content-Type: text/plain; charset=utf-8
-```
-
-**Status codes**:
-
--   **200** - no error
--   **500** - plugin is already enabled
-
-#### Disable a plugin
-
-`POST /plugins/(plugin name)/disable`
-
-Disables a plugin
-
-**Example request**:
-
-```
-POST /v1.24/plugins/tiborvass/no-remove:latest/disable HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted.
-
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Length: 0
-Content-Type: text/plain; charset=utf-8
-```
-
-**Status codes**:
-
--   **200** - no error
--   **500** - plugin is already disabled
-
-#### Remove a plugin
-
-`DELETE /plugins/(plugin name)`
-
-Removes a plugin
-
-**Example request**:
-
-```
-DELETE /v1.24/plugins/tiborvass/no-remove:latest HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted.
-
-**Example response**:
-
-```
-HTTP/1.1 200 OK
-Content-Length: 0
-Content-Type: text/plain; charset=utf-8
-```
-
-**Status codes**:
-
--   **200** - no error
--   **404** - plugin not installed
--   **500** - plugin is active
-
-<!-- TODO Document "docker plugin push" endpoint once we have "plugin build"
-
-#### Push a plugin
-
-`POST /v1.24/plugins/tiborvass/(plugin name)/push HTTP/1.1`
-
-Pushes a plugin to the registry.
-
-**Example request**:
-
-```
-POST /v1.24/plugins/tiborvass/no-remove:latest HTTP/1.1
-```
-
-The `:latest` tag is optional, and is used as default if omitted. When using
-this endpoint to push a plugin to the registry, the `X-Registry-Auth` header
-can be used to include a base64-encoded AuthConfig object. Refer to the [create
-an image](#create-an-image) section for more details.
-
-**Example response**:
-
-**Status codes**:
-
--   **200** - no error
--   **404** - plugin not installed
-
--->
-
-### 3.7 Nodes
-
-**Note**: Node operations require the engine to be part of a swarm.
-
-#### List nodes
-
-
-`GET /nodes`
-
-List nodes
-
-**Example request**:
-
-    GET /v1.24/nodes HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "ID": "24ifsmvkjbyhk",
-        "Version": {
-          "Index": 8
-        },
-        "CreatedAt": "2016-06-07T20:31:11.853781916Z",
-        "UpdatedAt": "2016-06-07T20:31:11.999868824Z",
-        "Spec": {
-          "Name": "my-node",
-          "Role": "manager",
-          "Availability": "active"
-          "Labels": {
-              "foo": "bar"
-          }
-        },
-        "Description": {
-          "Hostname": "bf3067039e47",
-          "Platform": {
-            "Architecture": "x86_64",
-            "OS": "linux"
-          },
-          "Resources": {
-            "NanoCPUs": 4000000000,
-            "MemoryBytes": 8272408576
-          },
-          "Engine": {
-            "EngineVersion": "1.12.0",
-            "Labels": {
-                "foo": "bar",
-            }
-            "Plugins": [
-              {
-                "Type": "Volume",
-                "Name": "local"
-              },
-              {
-                "Type": "Network",
-                "Name": "bridge"
-              }
-              {
-                "Type": "Network",
-                "Name": "null"
-              }
-              {
-                "Type": "Network",
-                "Name": "overlay"
-              }
-            ]
-          }
-        },
-        "Status": {
-          "State": "ready"
-        },
-        "ManagerStatus": {
-          "Leader": true,
-          "Reachability": "reachable",
-          "Addr": "172.17.0.2:2377""
-        }
-      }
-    ]
-
-**Query parameters**:
-
-- **filters** – a JSON encoded value of the filters (a `map[string][]string`) to process on the
-  nodes list. Available filters:
-  - `id=<node id>`
-  - `label=<engine label>`
-  - `membership=`(`accepted`|`pending`)`
-  - `name=<node name>`
-  - `role=`(`manager`|`worker`)`
-
-**Status codes**:
-
--   **200** – no error
--   **406** - node is not part of a swarm
--   **500** – server error
-
-#### Inspect a node
-
-
-`GET /nodes/(id or name)`
-
-Return low-level information on the node `id`
-
-**Example request**:
-
-      GET /v1.24/nodes/24ifsmvkjbyhk HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "ID": "24ifsmvkjbyhk",
-      "Version": {
-        "Index": 8
-      },
-      "CreatedAt": "2016-06-07T20:31:11.853781916Z",
-      "UpdatedAt": "2016-06-07T20:31:11.999868824Z",
-      "Spec": {
-        "Name": "my-node",
-        "Role": "manager",
-        "Availability": "active"
-        "Labels": {
-            "foo": "bar"
-        }
-      },
-      "Description": {
-        "Hostname": "bf3067039e47",
-        "Platform": {
-          "Architecture": "x86_64",
-          "OS": "linux"
-        },
-        "Resources": {
-          "NanoCPUs": 4000000000,
-          "MemoryBytes": 8272408576
-        },
-        "Engine": {
-          "EngineVersion": "1.12.0",
-          "Labels": {
-              "foo": "bar",
-          }
-          "Plugins": [
-            {
-              "Type": "Volume",
-              "Name": "local"
-            },
-            {
-              "Type": "Network",
-              "Name": "bridge"
-            }
-            {
-              "Type": "Network",
-              "Name": "null"
-            }
-            {
-              "Type": "Network",
-              "Name": "overlay"
-            }
-          ]
-        }
-      },
-      "Status": {
-        "State": "ready"
-      },
-      "ManagerStatus": {
-        "Leader": true,
-        "Reachability": "reachable",
-        "Addr": "172.17.0.2:2377""
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such node
--   **406** – node is not part of a swarm
--   **500** – server error
-
-#### Remove a node
-
-
-`DELETE /nodes/(id or name)`
-
-Remove a node from the swarm.
-
-**Example request**:
-
-    DELETE /v1.24/nodes/24ifsmvkjbyhk HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
--   **force** - 1/True/true or 0/False/false, Force remove a node from the swarm.
-        Default `false`.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such node
--   **406** – node is not part of a swarm
--   **500** – server error
-
-#### Update a node
-
-
-`POST /nodes/(id)/update`
-
-Update a node.
-
-The payload of the `POST` request is the new `NodeSpec` and
-overrides the current `NodeSpec` for the specified node.
-
-If `Availability` or `Role` are omitted, this returns an
-error. Any other field omitted resets the current value to either
-an empty value or the default cluster-wide value.
-
-**Example Request**
-
-    POST /v1.24/nodes/24ifsmvkjbyhk/update?version=8 HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Availability": "active",
-      "Name": "node-name",
-      "Role": "manager",
-      "Labels": {
-        "foo": "bar"
-      }
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
-- **version** – The version number of the node object being updated. This is
-  required to avoid conflicting writes.
-
-JSON Parameters:
-
-- **Annotations** – Optional medata to associate with the node.
-    - **Name** – User-defined name for the node.
-    - **Labels** – A map of labels to associate with the node (e.g.,
-      `{"key":"value", "key2":"value2"}`).
-- **Role** - Role of the node (worker/manager).
-- **Availability** - Availability of the node (active/pause/drain).
-
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such node
--   **406** – node is not part of a swarm
--   **500** – server error
-
-### 3.8 Swarm
-
-#### Inspect swarm
-
-
-`GET /swarm`
-
-Inspect swarm
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    {
-      "CreatedAt" : "2016-08-15T16:00:20.349727406Z",
-      "Spec" : {
-        "Dispatcher" : {
-          "HeartbeatPeriod" : 5000000000
-        },
-        "Orchestration" : {
-         "TaskHistoryRetentionLimit" : 10
-        },
-        "CAConfig" : {
-          "NodeCertExpiry" : 7776000000000000
-        },
-        "Raft" : {
-          "LogEntriesForSlowFollowers" : 500,
-          "HeartbeatTick" : 1,
-          "SnapshotInterval" : 10000,
-          "ElectionTick" : 3
-        },
-        "TaskDefaults" : {},
-        "Name" : "default"
-      },
-     "JoinTokens" : {
-        "Worker" : "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-6qmn92w6bu3jdvnglku58u11a",
-        "Manager" : "SWMTKN-1-1h8aps2yszaiqmz2l3oc5392pgk8e49qhx2aj3nyv0ui0hez2a-8llk83c4wm9lwioey2s316r9l"
-     },
-     "ID" : "70ilmkj2f6sp2137c753w2nmt",
-     "UpdatedAt" : "2016-08-15T16:32:09.623207604Z",
-     "Version" : {
-       "Index" : 51
-    }
-  }
-
-**Status codes**:
-
--   **200** - no error
--   **406** – node is not part of a swarm
--   **500** - sever error
-
-#### Initialize a new swarm
-
-
-`POST /swarm/init`
-
-Initialize a new swarm. The body of the HTTP response includes the node ID.
-
-**Example request**:
-
-    POST /v1.24/swarm/init HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "ListenAddr": "0.0.0.0:2377",
-      "AdvertiseAddr": "192.168.1.1:2377",
-      "ForceNewCluster": false,
-      "Spec": {
-        "Orchestration": {},
-        "Raft": {},
-        "Dispatcher": {},
-        "CAConfig": {}
-      }
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 28
-    Content-Type: application/json
-    Date: Thu, 01 Sep 2016 21:49:13 GMT
-    Server: Docker/1.12.0 (linux)
-
-    "7v2t30z9blmxuhnyo6s4cpenp"
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **406** – node is already part of a swarm
--   **500** - server error
-
-JSON Parameters:
-
-- **ListenAddr** – Listen address used for inter-manager communication, as well as determining
-  the networking interface used for the VXLAN Tunnel Endpoint (VTEP). This can either be an
-  address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port
-  number, like `eth0:4567`. If the port number is omitted, the default swarm listening port is
-  used.
-- **AdvertiseAddr** – Externally reachable address advertised to other nodes. This can either be
-  an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port
-  number, like `eth0:4567`. If the port number is omitted, the port number from the listen
-  address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when
-  possible.
-- **ForceNewCluster** – Force creation of a new swarm.
-- **Spec** – Configuration settings for the new swarm.
-    - **Orchestration** – Configuration settings for the orchestration aspects of the swarm.
-        - **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
-    - **Raft** – Raft related configuration.
-        - **SnapshotInterval** – Number of logs entries between snapshot.
-        - **KeepOldSnapshots** – Number of snapshots to keep beyond the current snapshot.
-        - **LogEntriesForSlowFollowers** – Number of log entries to keep around to sync up slow
-          followers after a snapshot is created.
-        - **HeartbeatTick** – Amount of ticks (in seconds) between each heartbeat.
-        - **ElectionTick** – Amount of ticks (in seconds) needed without a leader to trigger a new
-          election.
-    - **Dispatcher** – Configuration settings for the task dispatcher.
-        - **HeartbeatPeriod** – The delay for an agent to send a heartbeat to the dispatcher.
-    - **CAConfig** – Certificate authority configuration.
-        - **NodeCertExpiry** – Automatic expiry for nodes certificates.
-        - **ExternalCA** - Configuration for forwarding signing requests to an external
-          certificate authority.
-            - **Protocol** - Protocol for communication with the external CA
-              (currently only "cfssl" is supported).
-            - **URL** - URL where certificate signing requests should be sent.
-            - **Options** - An object with key/value pairs that are interpreted
-              as protocol-specific options for the external CA driver.
-
-#### Join an existing swarm
-
-`POST /swarm/join`
-
-Join an existing swarm
-
-**Example request**:
-
-    POST /v1.24/swarm/join HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "ListenAddr": "0.0.0.0:2377",
-      "AdvertiseAddr": "192.168.1.1:2377",
-      "RemoteAddrs": ["node1:2377"],
-      "JoinToken": "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **406** – node is already part of a swarm
--   **500** - server error
-
-JSON Parameters:
-
-- **ListenAddr** – Listen address used for inter-manager communication if the node gets promoted to
-  manager, as well as determining the networking interface used for the VXLAN Tunnel Endpoint (VTEP).
-- **AdvertiseAddr** – Externally reachable address advertised to other nodes. This can either be
-  an address/port combination in the form `192.168.1.1:4567`, or an interface followed by a port
-  number, like `eth0:4567`. If the port number is omitted, the port number from the listen
-  address is used. If `AdvertiseAddr` is not specified, it will be automatically detected when
-  possible.
-- **RemoteAddr** – Address of any manager node already participating in the swarm.
-- **JoinToken** – Secret token for joining this swarm.
-
-#### Leave a swarm
-
-
-`POST /swarm/leave`
-
-Leave a swarm
-
-**Example request**:
-
-    POST /v1.24/swarm/leave HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
-- **force** - Boolean (0/1, false/true). Force leave swarm, even if this is the last manager or that it will break the cluster.
-
-**Status codes**:
-
--  **200** – no error
--  **406** – node is not part of a swarm
--  **500** - server error
-
-#### Update a swarm
-
-
-`POST /swarm/update`
-
-Update a swarm
-
-**Example request**:
-
-    POST /v1.24/swarm/update HTTP/1.1
-
-    {
-      "Name": "default",
-      "Orchestration": {
-        "TaskHistoryRetentionLimit": 10
-      },
-      "Raft": {
-        "SnapshotInterval": 10000,
-        "LogEntriesForSlowFollowers": 500,
-        "HeartbeatTick": 1,
-        "ElectionTick": 3
-      },
-      "Dispatcher": {
-        "HeartbeatPeriod": 5000000000
-      },
-      "CAConfig": {
-        "NodeCertExpiry": 7776000000000000
-      },
-      "JoinTokens": {
-        "Worker": "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx",
-        "Manager": "SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2"
-      }
-    }
-
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Query parameters**:
-
-- **version** – The version number of the swarm object being updated. This is
-  required to avoid conflicting writes.
-- **rotateWorkerToken** - Set to `true` (or `1`) to rotate the worker join token.
-- **rotateManagerToken** - Set to `true` (or `1`) to rotate the manager join token.
-
-**Status codes**:
-
--   **200** – no error
--   **400** – bad parameter
--   **406** – node is not part of a swarm
--   **500** - server error
-
-JSON Parameters:
-
-- **Orchestration** – Configuration settings for the orchestration aspects of the swarm.
-    - **TaskHistoryRetentionLimit** – Maximum number of tasks history stored.
-- **Raft** – Raft related configuration.
-    - **SnapshotInterval** – Number of logs entries between snapshot.
-    - **KeepOldSnapshots** – Number of snapshots to keep beyond the current snapshot.
-    - **LogEntriesForSlowFollowers** – Number of log entries to keep around to sync up slow
-      followers after a snapshot is created.
-    - **HeartbeatTick** – Amount of ticks (in seconds) between each heartbeat.
-    - **ElectionTick** – Amount of ticks (in seconds) needed without a leader to trigger a new
-      election.
-- **Dispatcher** – Configuration settings for the task dispatcher.
-    - **HeartbeatPeriod** – The delay for an agent to send a heartbeat to the dispatcher.
-- **CAConfig** – CA configuration.
-    - **NodeCertExpiry** – Automatic expiry for nodes certificates.
-    - **ExternalCA** - Configuration for forwarding signing requests to an external
-      certificate authority.
-        - **Protocol** - Protocol for communication with the external CA
-          (currently only "cfssl" is supported).
-        - **URL** - URL where certificate signing requests should be sent.
-        - **Options** - An object with key/value pairs that are interpreted
-          as protocol-specific options for the external CA driver.
-- **JoinTokens** - Tokens that can be used by other nodes to join the swarm.
-    - **Worker** - Token to use for joining as a worker.
-    - **Manager** - Token to use for joining as a manager.
-
-### 3.9 Services
-
-**Note**: Service operations require to first be part of a swarm.
-
-#### List services
-
-
-`GET /services`
-
-List services
-
-**Example request**:
-
-    GET /v1.24/services HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Type: application/json
-
-    [
-      {
-        "ID": "9mnpnzenvg8p8tdbtq4wvbkcz",
-        "Version": {
-          "Index": 19
-        },
-        "CreatedAt": "2016-06-07T21:05:51.880065305Z",
-        "UpdatedAt": "2016-06-07T21:07:29.962229872Z",
-        "Spec": {
-          "Name": "hopeful_cori",
-          "TaskTemplate": {
-            "ContainerSpec": {
-              "Image": "redis"
-            },
-            "Resources": {
-              "Limits": {},
-              "Reservations": {}
-            },
-            "RestartPolicy": {
-              "Condition": "any",
-              "MaxAttempts": 0
-            },
-            "Placement": {
-              "Constraints": [
-                "node.role == worker"
-              ]
-            }
-          },
-          "Mode": {
-            "Replicated": {
-              "Replicas": 1
-            }
-          },
-          "UpdateConfig": {
-            "Parallelism": 1,
-            "FailureAction": "pause"
-          },
-          "EndpointSpec": {
-            "Mode": "vip",
-            "Ports": [
-              {
-                "Protocol": "tcp",
-                "TargetPort": 6379,
-                "PublishedPort": 30001
-              }
-            ]
-          }
-        },
-        "Endpoint": {
-          "Spec": {
-            "Mode": "vip",
-            "Ports": [
-              {
-                "Protocol": "tcp",
-                "TargetPort": 6379,
-                "PublishedPort": 30001
-              }
-            ]
-          },
-          "Ports": [
-            {
-              "Protocol": "tcp",
-              "TargetPort": 6379,
-              "PublishedPort": 30001
-            }
-          ],
-          "VirtualIPs": [
-            {
-              "NetworkID": "4qvuz4ko70xaltuqbt8956gd1",
-              "Addr": "10.255.0.2/16"
-            },
-            {
-              "NetworkID": "4qvuz4ko70xaltuqbt8956gd1",
-              "Addr": "10.255.0.3/16"
-            }
-          ]
-        }
-      }
-    ]
-
-**Query parameters**:
-
-- **filters** – a JSON encoded value of the filters (a `map[string][]string`) to process on the
-  services list. Available filters:
-  - `id=<service id>`
-  - `label=<service label>`
-  - `name=<service name>`
-
-**Status codes**:
-
--   **200** – no error
--   **406** – node is not part of a swarm
--   **500** – server error
-
-#### Create a service
-
-`POST /services/create`
-
-Create a service. When using this endpoint to create a service using a private
-repository from the registry, the `X-Registry-Auth` header must be used to
-include a base64-encoded AuthConfig object. Refer to the [create an
-image](#create-an-image) section for more details.
-
-**Example request**:
-
-    POST /v1.24/services/create HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "web",
-      "TaskTemplate": {
-        "ContainerSpec": {
-          "Image": "nginx:alpine",
-          "Mounts": [
-            {
-              "ReadOnly": true,
-              "Source": "web-data",
-              "Target": "/usr/share/nginx/html",
-              "Type": "volume",
-              "VolumeOptions": {
-                "DriverConfig": {
-                },
-                "Labels": {
-                  "com.example.something": "something-value"
-                }
-              }
-            }
-          ],
-          "User": "33"
-        },
-        "Networks": [
-            {
-              "Target": "overlay1"
-            }
-        ],
-        "LogDriver": {
-          "Name": "json-file",
-          "Options": {
-            "max-file": "3",
-            "max-size": "10M"
-          }
-        },
-        "Placement": {
-          "Constraints": [
-            "node.role == worker"
-          ]
-        },
-        "Resources": {
-          "Limits": {
-            "MemoryBytes": 104857600
-          },
-          "Reservations": {
-          }
-        },
-        "RestartPolicy": {
-          "Condition": "on-failure",
-          "Delay": 10000000000,
-          "MaxAttempts": 10
-        }
-      },
-      "Mode": {
-        "Replicated": {
-          "Replicas": 4
-        }
-      },
-      "UpdateConfig": {
-        "Delay": 30000000000,
-        "Parallelism": 2,
-        "FailureAction": "pause"
-      },
-      "EndpointSpec": {
-        "Ports": [
-          {
-            "Protocol": "tcp",
-            "PublishedPort": 8080,
-            "TargetPort": 80
-          }
-        ]
-      },
-      "Labels": {
-        "foo": "bar"
-      }
-    }
-
-**Example response**:
-
-    HTTP/1.1 201 Created
-    Content-Type: application/json
-
-    {
-      "ID":"ak7w3gjqoa3kuz8xcpnyy0pvl"
-    }
-
-**Status codes**:
-
--   **201** – no error
--   **403** - network is not eligible for services
--   **406** – node is not part of a swarm
--   **409** – name conflicts with an existing object
--   **500** - server error
-
-**JSON Parameters**:
-
-- **Name** – User-defined name for the service.
-- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value", "key2":"value2"}`).
-- **TaskTemplate** – Specification of the tasks to start as part of the new service.
-    - **ContainerSpec** - Container settings for containers started as part of this task.
-        - **Image** – A string specifying the image name to use for the container.
-        - **Command** – The command to be run in the image.
-        - **Args** – Arguments to the command.
-        - **Env** – A list of environment variables in the form of `["VAR=value"[,"VAR2=value2"]]`.
-        - **Dir** – A string specifying the working directory for commands to run in.
-        - **User** – A string value specifying the user inside the container.
-        - **Labels** – A map of labels to associate with the service (e.g.,
-          `{"key":"value", "key2":"value2"}`).
-        - **Mounts** – Specification for mounts to be added to containers
-          created as part of the service.
-            - **Target** – Container path.
-            - **Source** – Mount source (e.g. a volume name, a host path).
-            - **Type** – The mount type (`bind`, or `volume`).
-            - **ReadOnly** – A boolean indicating whether the mount should be read-only.
-            - **BindOptions** - Optional configuration for the `bind` type.
-              - **Propagation** – A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`.
-            - **VolumeOptions** – Optional configuration for the `volume` type.
-                - **NoCopy** – A boolean indicating if volume should be
-                  populated with the data from the target. (Default false)
-                - **Labels** – User-defined name and labels for the volume.
-                - **DriverConfig** – Map of driver-specific options.
-                  - **Name** - Name of the driver to use to create the volume.
-                  - **Options** - key/value map of driver specific options.
-        - **StopGracePeriod** – Amount of time to wait for the container to terminate before
-          forcefully killing it.
-    - **LogDriver** - Log configuration for containers created as part of the
-      service.
-        - **Name** - Name of the logging driver to use (`json-file`, `syslog`,
-          `journald`, `gelf`, `fluentd`, `awslogs`, `splunk`, `etwlogs`, `none`).
-        - **Options** - Driver-specific options.
-    - **Resources** – Resource requirements which apply to each individual container created as part
-      of the service.
-        - **Limits** – Define resources limits.
-            - **NanoCPUs** – CPU limit in units of 10<sup>-9</sup> CPU shares.
-            - **MemoryBytes** – Memory limit in Bytes.
-        - **Reservation** – Define resources reservation.
-            - **NanoCPUs** – CPU reservation in units of 10<sup>-9</sup> CPU shares.
-            - **MemoryBytes** – Memory reservation in Bytes.
-    - **RestartPolicy** – Specification for the restart policy which applies to containers created
-      as part of this service.
-        - **Condition** – Condition for restart (`none`, `on-failure`, or `any`).
-        - **Delay** – Delay between restart attempts.
-        - **Attempts** – Maximum attempts to restart a given container before giving up (default value
-          is 0, which is ignored).
-        - **Window** – Windows is the time window used to evaluate the restart policy (default value is
-          0, which is unbounded).
-    - **Placement** – Restrictions on where a service can run.
-        - **Constraints** – An array of constraints, e.g. `[ "node.role == manager" ]`.
-- **Mode** – Scheduling mode for the service (`replicated` or `global`, defaults to `replicated`).
-- **UpdateConfig** – Specification for the update strategy of the service.
-    - **Parallelism** – Maximum number of tasks to be updated in one iteration (0 means unlimited
-      parallelism).
-    - **Delay** – Amount of time between updates.
-    - **FailureAction** - Action to take if an updated task fails to run, or stops running during the
-      update. Values are `continue` and `pause`.
-- **Networks** – Array of network names or IDs to attach the service to.
-- **EndpointSpec** – Properties that can be configured to access and load balance a service.
-    - **Mode** – The mode of resolution to use for internal load balancing
-      between tasks (`vip` or `dnsrr`). Defaults to `vip` if not provided.
-    - **Ports** – List of exposed ports that this service is accessible on from
-      the outside, in the form of:
-      `{"Protocol": <"tcp"|"udp">, "PublishedPort": <port>, "TargetPort": <port>}`.
-      Ports can only be provided if `vip` resolution mode is used.
-
-**Request Headers**:
-
-- **Content-type** – Set to `"application/json"`.
-- **X-Registry-Auth** – base64-encoded AuthConfig object, containing either
-  login information, or a token. Refer to the [create an image](#create-an-image)
-  section for more details.
-
-
-#### Remove a service
-
-
-`DELETE /services/(id or name)`
-
-Stop and remove the service `id`
-
-**Example request**:
-
-    DELETE /v1.24/services/16253994b7c4 HTTP/1.1
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such service
--   **406** - node is not part of a swarm
--   **500** – server error
-
-#### Inspect one or more services
-
-
-`GET /services/(id or name)`
-
-Return information on the service `id`.
-
-**Example request**:
-
-    GET /v1.24/services/1cb4dnqcyx6m66g2t538x3rxha HTTP/1.1
-
-**Example response**:
-
-    {
-      "ID": "ak7w3gjqoa3kuz8xcpnyy0pvl",
-      "Version": {
-        "Index": 95
-      },
-      "CreatedAt": "2016-06-07T21:10:20.269723157Z",
-      "UpdatedAt": "2016-06-07T21:10:20.276301259Z",
-      "Spec": {
-        "Name": "redis",
-        "TaskTemplate": {
-          "ContainerSpec": {
-            "Image": "redis"
-          },
-          "Resources": {
-            "Limits": {},
-            "Reservations": {}
-          },
-          "RestartPolicy": {
-            "Condition": "any",
-            "MaxAttempts": 0
-          },
-          "Placement": {}
-        },
-        "Mode": {
-          "Replicated": {
-            "Replicas": 1
-          }
-        },
-        "UpdateConfig": {
-          "Parallelism": 1,
-          "FailureAction": "pause"
-        },
-        "EndpointSpec": {
-          "Mode": "vip",
-          "Ports": [
-            {
-              "Protocol": "tcp",
-              "TargetPort": 6379,
-              "PublishedPort": 30001
-            }
-          ]
-        }
-      },
-      "Endpoint": {
-        "Spec": {
-          "Mode": "vip",
-          "Ports": [
-            {
-              "Protocol": "tcp",
-              "TargetPort": 6379,
-              "PublishedPort": 30001
-            }
-          ]
-        },
-        "Ports": [
-          {
-            "Protocol": "tcp",
-            "TargetPort": 6379,
-            "PublishedPort": 30001
-          }
-        ],
-        "VirtualIPs": [
-          {
-            "NetworkID": "4qvuz4ko70xaltuqbt8956gd1",
-            "Addr": "10.255.0.4/16"
-          }
-        ]
-      }
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such service
--   **406** - node is not part of a swarm
--   **500** – server error
-
-#### Update a service
-
-`POST /services/(id or name)/update`
-
-Update a service. When using this endpoint to create a service using a
-private repository from the registry, the `X-Registry-Auth` header can be used
-to update the authentication information for that is stored for the service.
-The header contains a base64-encoded AuthConfig object. Refer to the [create an
-image](#create-an-image) section for more details.
-
-**Example request**:
-
-    POST /v1.24/services/1cb4dnqcyx6m66g2t538x3rxha/update?version=23 HTTP/1.1
-    Content-Type: application/json
-
-    {
-      "Name": "top",
-      "TaskTemplate": {
-        "ContainerSpec": {
-          "Image": "busybox",
-          "Args": [
-            "top"
-          ]
-        },
-        "Resources": {
-          "Limits": {},
-          "Reservations": {}
-        },
-        "RestartPolicy": {
-          "Condition": "any",
-          "MaxAttempts": 0
-        },
-        "Placement": {}
-      },
-      "Mode": {
-        "Replicated": {
-          "Replicas": 1
-        }
-      },
-      "UpdateConfig": {
-        "Parallelism": 1
-      },
-      "EndpointSpec": {
-        "Mode": "vip"
-      }
-    }
-
-**Example response**:
-
-    HTTP/1.1 200 OK
-    Content-Length: 0
-    Content-Type: text/plain; charset=utf-8
-
-**JSON Parameters**:
-
-- **Name** – User-defined name for the service. Note that renaming services is not supported.
-- **Labels** – A map of labels to associate with the service (e.g., `{"key":"value", "key2":"value2"}`).
-- **TaskTemplate** – Specification of the tasks to start as part of the new service.
-    - **ContainerSpec** - Container settings for containers started as part of this task.
-        - **Image** – A string specifying the image name to use for the container.
-        - **Command** – The command to be run in the image.
-        - **Args** – Arguments to the command.
-        - **Env** – A list of environment variables in the form of `["VAR=value"[,"VAR2=value2"]]`.
-        - **Dir** – A string specifying the working directory for commands to run in.
-        - **User** – A string value specifying the user inside the container.
-        - **Labels** – A map of labels to associate with the service (e.g.,
-          `{"key":"value", "key2":"value2"}`).
-        - **Mounts** – Specification for mounts to be added to containers created as part of the new
-          service.
-            - **Target** – Container path.
-            - **Source** – Mount source (e.g. a volume name, a host path).
-            - **Type** – The mount type (`bind`, or `volume`).
-            - **ReadOnly** – A boolean indicating whether the mount should be read-only.
-            - **BindOptions** - Optional configuration for the `bind` type
-              - **Propagation** – A propagation mode with the value `[r]private`, `[r]shared`, or `[r]slave`.
-            - **VolumeOptions** – Optional configuration for the `volume` type.
-                - **NoCopy** – A boolean indicating if volume should be
-                  populated with the data from the target. (Default false)
-                - **Labels** – User-defined name and labels for the volume.
-                - **DriverConfig** – Map of driver-specific options.
-                  - **Name** - Name of the driver to use to create the volume
-                  - **Options** - key/value map of driver specific options
-        - **StopGracePeriod** – Amount of time to wait for the container to terminate before
-          forcefully killing it.
-    - **Resources** – Resource requirements which apply to each individual container created as part
-      of the service.
-        - **Limits** – Define resources limits.
-            - **CPU** – CPU limit
-            - **Memory** – Memory limit
-        - **Reservation** – Define resources reservation.
-            - **CPU** – CPU reservation
-            - **Memory** – Memory reservation
-    - **RestartPolicy** – Specification for the restart policy which applies to containers created
-      as part of this service.
-        - **Condition** – Condition for restart (`none`, `on-failure`, or `any`).
-        - **Delay** – Delay between restart attempts.
-        - **MaxAttempts** – Maximum attempts to restart a given container before giving up (default value
-          is 0, which is ignored).
-        - **Window** – Windows is the time window used to evaluate the restart policy (default value is
-          0, which is unbounded).
-    - **Placement** – Restrictions on where a service can run.
-        - **Constraints** – An array of constraints, e.g. `[ "node.role == manager" ]`.
-- **Mode** – Scheduling mode for the service (`replicated` or `global`, defaults to `replicated`).
-- **UpdateConfig** – Specification for the update strategy of the service.
-    - **Parallelism** – Maximum number of tasks to be updated in one iteration (0 means unlimited
-      parallelism).
-    - **Delay** – Amount of time between updates.
-- **Networks** – Array of network names or IDs to attach the service to.
-- **EndpointSpec** – Properties that can be configured to access and load balance a service.
-    - **Mode** – The mode of resolution to use for internal load balancing
-      between tasks (`vip` or `dnsrr`). Defaults to `vip` if not provided.
-    - **Ports** – List of exposed ports that this service is accessible on from
-      the outside, in the form of:
-      `{"Protocol": <"tcp"|"udp">, "PublishedPort": <port>, "TargetPort": <port>}`.
-      Ports can only be provided if `vip` resolution mode is used.
-
-**Query parameters**:
-
-- **version** – The version number of the service object being updated. This is
-  required to avoid conflicting writes.
-
-**Request Headers**:
-
-- **Content-type** – Set to `"application/json"`.
-- **X-Registry-Auth** – base64-encoded AuthConfig object, containing either
-  login information, or a token. Refer to the [create an image](#create-an-image)
-  section for more details.
-
-**Status codes**:
-
--   **200** – no error
--   **404** – no such service
--   **406** - node is not part of a swarm
--   **500** – server error
-
-### 3.10 Tasks
-
-**Note**: Task operations require the engine to be part of a swarm.
-
-#### List tasks
-
-
-`GET /tasks`
-
-List tasks
-
-**Example request**:
-
-    GET /v1.24/tasks HTTP/1.1
-
-**Example response**:
-
-    [
-      {
-        "ID": "0kzzo1i0y4jz6027t0k7aezc7",
-        "Version": {
-          "Index": 71
-        },
-        "CreatedAt": "2016-06-07T21:07:31.171892745Z",
-        "UpdatedAt": "2016-06-07T21:07:31.376370513Z",
-        "Spec": {
-          "ContainerSpec": {
-            "Image": "redis"
-          },
-          "Resources": {
-            "Limits": {},
-            "Reservations": {}
-          },
-          "RestartPolicy": {
-            "Condition": "any",
-            "MaxAttempts": 0
-          },
-          "Placement": {}
-        },
-        "ServiceID": "9mnpnzenvg8p8tdbtq4wvbkcz",
-        "Slot": 1,
-        "NodeID": "60gvrl6tm78dmak4yl7srz94v",
-        "Status": {
-          "Timestamp": "2016-06-07T21:07:31.290032978Z",
-          "State": "running",
-          "Message": "started",
-          "ContainerStatus": {
-            "ContainerID": "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035",
-            "PID": 677
-          }
-        },
-        "DesiredState": "running",
-        "NetworksAttachments": [
-          {
-            "Network": {
-              "ID": "4qvuz4ko70xaltuqbt8956gd1",
-              "Version": {
-                "Index": 18
-              },
-              "CreatedAt": "2016-06-07T20:31:11.912919752Z",
-              "UpdatedAt": "2016-06-07T21:07:29.955277358Z",
-              "Spec": {
-                "Name": "ingress",
-                "Labels": {
-                  "com.docker.swarm.internal": "true"
-                },
-                "DriverConfiguration": {},
-                "IPAMOptions": {
-                  "Driver": {},
-                  "Configs": [
-                    {
-                      "Subnet": "10.255.0.0/16",
-                      "Gateway": "10.255.0.1"
-                    }
-                  ]
-                }
-              },
-              "DriverState": {
-                "Name": "overlay",
-                "Options": {
-                  "com.docker.network.driver.overlay.vxlanid_list": "256"
-                }
-              },
-              "IPAMOptions": {
-                "Driver": {
-                  "Name": "default"
-                },
-                "Configs": [
-                  {
-                    "Subnet": "10.255.0.0/16",
-                    "Gateway": "10.255.0.1"
-                  }
-                ]
-              }
-            },
-            "Addresses": [
-              "10.255.0.10/16"
-            ]
-          }
-        ],
-      },
-      {
-        "ID": "1yljwbmlr8er2waf8orvqpwms",
-        "Version": {
-          "Index": 30
-        },
-        "CreatedAt": "2016-06-07T21:07:30.019104782Z",
-        "UpdatedAt": "2016-06-07T21:07:30.231958098Z",
-        "Name": "hopeful_cori",
-        "Spec": {
-          "ContainerSpec": {
-            "Image": "redis"
-          },
-          "Resources": {
-            "Limits": {},
-            "Reservations": {}
-          },
-          "RestartPolicy": {
-            "Condition": "any",
-            "MaxAttempts": 0
-          },
-          "Placement": {}
-        },
-        "ServiceID": "9mnpnzenvg8p8tdbtq4wvbkcz",
-        "Slot": 1,
-        "NodeID": "60gvrl6tm78dmak4yl7srz94v",
-        "Status": {
-          "Timestamp": "2016-06-07T21:07:30.202183143Z",
-          "State": "shutdown",
-          "Message": "shutdown",
-          "ContainerStatus": {
-            "ContainerID": "1cf8d63d18e79668b0004a4be4c6ee58cddfad2dae29506d8781581d0688a213"
-          }
-        },
-        "DesiredState": "shutdown",
-        "NetworksAttachments": [
-          {
-            "Network": {
-              "ID": "4qvuz4ko70xaltuqbt8956gd1",
-              "Version": {
-                "Index": 18
-              },
-              "CreatedAt": "2016-06-07T20:31:11.912919752Z",
-              "UpdatedAt": "2016-06-07T21:07:29.955277358Z",
-              "Spec": {
-                "Name": "ingress",
-                "Labels": {
-                  "com.docker.swarm.internal": "true"
-                },
-                "DriverConfiguration": {},
-                "IPAMOptions": {
-                  "Driver": {},
-                  "Configs": [
-                    {
-                      "Subnet": "10.255.0.0/16",
-                      "Gateway": "10.255.0.1"
-                    }
-                  ]
-                }
-              },
-              "DriverState": {
-                "Name": "overlay",
-                "Options": {
-                  "com.docker.network.driver.overlay.vxlanid_list": "256"
-                }
-              },
-              "IPAMOptions": {
-                "Driver": {
-                  "Name": "default"
-                },
-                "Configs": [
-                  {
-                    "Subnet": "10.255.0.0/16",
-                    "Gateway": "10.255.0.1"
-                  }
-                ]
-              }
-            },
-            "Addresses": [
-              "10.255.0.5/16"
-            ]
-          }
-        ]
-      }
-    ]
-
-**Query parameters**:
-
-- **filters** – a JSON encoded value of the filters (a `map[string][]string`) to process on the
-  services list. Available filters:
-  - `id=<task id>`
-  - `name=<task name>`
-  - `service=<service name>`
-  - `node=<node id or name>`
-  - `label=key` or `label="key=value"`
-  - `desired-state=(running | shutdown | accepted)`
-
-**Status codes**:
-
--   **200** – no error
--   **406** - node is not part of a swarm
--   **500** – server error
-
-#### Inspect a task
-
-
-`GET /tasks/(id)`
-
-Get details on the task `id`
-
-**Example request**:
-
-    GET /v1.24/tasks/0kzzo1i0y4jz6027t0k7aezc7 HTTP/1.1
-
-**Example response**:
-
-    {
-      "ID": "0kzzo1i0y4jz6027t0k7aezc7",
-      "Version": {
-        "Index": 71
-      },
-      "CreatedAt": "2016-06-07T21:07:31.171892745Z",
-      "UpdatedAt": "2016-06-07T21:07:31.376370513Z",
-      "Spec": {
-        "ContainerSpec": {
-          "Image": "redis"
-        },
-        "Resources": {
-          "Limits": {},
-          "Reservations": {}
-        },
-        "RestartPolicy": {
-          "Condition": "any",
-          "MaxAttempts": 0
-        },
-        "Placement": {}
-      },
-      "ServiceID": "9mnpnzenvg8p8tdbtq4wvbkcz",
-      "Slot": 1,
-      "NodeID": "60gvrl6tm78dmak4yl7srz94v",
-      "Status": {
-        "Timestamp": "2016-06-07T21:07:31.290032978Z",
-        "State": "running",
-        "Message": "started",
-        "ContainerStatus": {
-          "ContainerID": "e5d62702a1b48d01c3e02ca1e0212a250801fa8d67caca0b6f35919ebc12f035",
-          "PID": 677
-        }
-      },
-      "DesiredState": "running",
-      "NetworksAttachments": [
-        {
-          "Network": {
-            "ID": "4qvuz4ko70xaltuqbt8956gd1",
-            "Version": {
-              "Index": 18
-            },
-            "CreatedAt": "2016-06-07T20:31:11.912919752Z",
-            "UpdatedAt": "2016-06-07T21:07:29.955277358Z",
-            "Spec": {
-              "Name": "ingress",
-              "Labels": {
-                "com.docker.swarm.internal": "true"
-              },
-              "DriverConfiguration": {},
-              "IPAMOptions": {
-                "Driver": {},
-                "Configs": [
-                  {
-                    "Subnet": "10.255.0.0/16",
-                    "Gateway": "10.255.0.1"
-                  }
-                ]
-              }
-            },
-            "DriverState": {
-              "Name": "overlay",
-              "Options": {
-                "com.docker.network.driver.overlay.vxlanid_list": "256"
-              }
-            },
-            "IPAMOptions": {
-              "Driver": {
-                "Name": "default"
-              },
-              "Configs": [
-                {
-                  "Subnet": "10.255.0.0/16",
-                  "Gateway": "10.255.0.1"
-                }
-              ]
-            }
-          },
-          "Addresses": [
-            "10.255.0.10/16"
-          ]
-        }
-      ]
-    }
-
-**Status codes**:
-
--   **200** – no error
--   **404** – unknown task
--   **406** - node is not part of a swarm
--   **500** – server error
-
-## 4. Going further
-
-### 4.1 Inside `docker run`
-
-As an example, the `docker run` command line makes the following API calls:
-
-- Create the container
-
-- If the status code is 404, it means the image doesn't exist:
-    - Try to pull it.
-    - Then, retry to create the container.
-
-- Start the container.
-
-- If you are not in detached mode:
-- Attach to the container, using `logs=1` (to have `stdout` and
-      `stderr` from the container's start) and `stream=1`
-
-- If in detached mode or only `stdin` is attached, display the container's id.
-
-### 4.2 Hijacking
-
-In this version of the API, `/attach`, uses hijacking to transport `stdin`,
-`stdout`, and `stderr` on the same socket.
-
-To hint potential proxies about connection hijacking, Docker client sends
-connection upgrade headers similarly to websocket.
-
-    Upgrade: tcp
-    Connection: Upgrade
-
-When Docker daemon detects the `Upgrade` header, it switches its status code
-from **200 OK** to **101 UPGRADED** and resends the same headers.
-
-
-### 4.3 CORS Requests
-
-To set cross origin requests to the Engine API please give values to
-`--api-cors-header` when running Docker in daemon mode. Set * (asterisk) allows all,
-default or blank means CORS disabled
-
-    $ dockerd -H="192.168.1.9:2375" --api-cors-header="http://foo.bar"
diff --git a/installer/vendor/github.com/docker/docker/docs/api/version-history.md b/installer/vendor/github.com/docker/docker/docs/api/version-history.md
deleted file mode 100644
index 4363cfbd74..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/api/version-history.md
+++ /dev/null
@@ -1,249 +0,0 @@
----
-title: "Engine API version history"
-description: "Documentation of changes that have been made to Engine API."
-keywords: "API, Docker, rcli, REST, documentation"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## v1.26 API changes
-
-[Docker Engine API v1.26](https://docs.docker.com/engine/api/v1.26/) documentation
-
-* `POST /plugins/(plugin name)/upgrade` upgrade a plugin.
-
-## v1.25 API changes
-
-[Docker Engine API v1.25](https://docs.docker.com/engine/api/v1.25/) documentation
-
-* The API version is now required in all API calls. Instead of just requesting, for example, the URL `/containers/json`, you must now request `/v1.25/containers/json`.
-* `GET /version` now returns `MinAPIVersion`.
-* `POST /build` accepts `networkmode` parameter to specify network used during build.
-* `GET /images/(name)/json` now returns `OsVersion` if populated
-* `GET /info` now returns `Isolation`.
-* `POST /containers/create` now takes `AutoRemove` in HostConfig, to enable auto-removal of the container on daemon side when the container's process exits.
-* `GET /containers/json` and `GET /containers/(id or name)/json` now return `"removing"` as a value for the `State.Status` field if the container is being removed. Previously, "exited" was returned as status.
-* `GET /containers/json` now accepts `removing` as a valid value for the `status` filter.
-* `GET /containers/json` now supports filtering containers by `health` status.
-* `DELETE /volumes/(name)` now accepts a `force` query parameter to force removal of volumes that were already removed out of band by the volume driver plugin.
-* `POST /containers/create/` and `POST /containers/(name)/update` now validates restart policies.
-* `POST /containers/create` now validates IPAMConfig in NetworkingConfig, and returns error for invalid IPv4 and IPv6 addresses (`--ip` and `--ip6` in `docker create/run`).
-* `POST /containers/create` now takes a `Mounts` field in `HostConfig` which replaces `Binds`, `Volumes`, and `Tmpfs`. *note*: `Binds`, `Volumes`, and `Tmpfs` are still available and can be combined with `Mounts`.
-* `POST /build` now performs a preliminary validation of the `Dockerfile` before starting the build, and returns an error if the syntax is incorrect. Note that this change is _unversioned_ and applied to all API versions.
-* `POST /build` accepts `cachefrom` parameter to specify images used for build cache.
-* `GET /networks/` endpoint now correctly returns a list of *all* networks,
-  instead of the default network if a trailing slash is provided, but no `name`
-  or `id`.
-* `DELETE /containers/(name)` endpoint now returns an error of `removal of container name is already in progress` with status code of 400, when container name is in a state of removal in progress.
-* `GET /containers/json` now supports a `is-task` filter to filter
-  containers that are tasks (part of a service in swarm mode).
-* `POST /containers/create` now takes `StopTimeout` field.
-* `POST /services/create` and `POST /services/(id or name)/update` now accept `Monitor` and `MaxFailureRatio` parameters, which control the response to failures during service updates.
-* `POST /services/(id or name)/update` now accepts a `ForceUpdate` parameter inside the `TaskTemplate`, which causes the service to be updated even if there are no changes which would ordinarily trigger an update.
-* `POST /services/create` and `POST /services/(id or name)/update` now return a `Warnings` array.
-* `GET /networks/(name)` now returns field `Created` in response to show network created time.
-* `POST /containers/(id or name)/exec` now accepts an `Env` field, which holds a list of environment variables to be set in the context of the command execution.
-* `GET /volumes`, `GET /volumes/(name)`, and `POST /volumes/create` now return the `Options` field which holds the driver specific options to use for when creating the volume.
-* `GET /exec/(id)/json` now returns `Pid`, which is the system pid for the exec'd process.
-* `POST /containers/prune` prunes stopped containers.
-* `POST /images/prune` prunes unused images.
-* `POST /volumes/prune` prunes unused volumes.
-* `POST /networks/prune` prunes unused networks.
-* Every API response now includes a `Docker-Experimental` header specifying if experimental features are enabled (value can be `true` or `false`).
-* Every API response now includes a `API-Version` header specifying the default API version of the server.
-* The `hostConfig` option now accepts the fields `CpuRealtimePeriod` and `CpuRtRuntime` to allocate cpu runtime to rt tasks when `CONFIG_RT_GROUP_SCHED` is enabled in the kernel.
-* The `SecurityOptions` field within the `GET /info` response now includes `userns` if user namespaces are enabled in the daemon.
-* `GET /nodes` and `GET /node/(id or name)` now return `Addr` as part of a node's `Status`, which is the address that that node connects to the manager from.
-* The `HostConfig` field now includes `NanoCPUs` that represents CPU quota in units of 10<sup>-9</sup> CPUs.
-* `GET /info` now returns more structured information about security options.
-* The `HostConfig` field now includes `CpuCount` that represents the number of CPUs available for execution by the container. Windows daemon only.
-* `POST /services/create` and `POST /services/(id or name)/update` now accept the `TTY` parameter, which allocate a pseudo-TTY in container.
-* `POST /services/create` and `POST /services/(id or name)/update` now accept the `DNSConfig` parameter, which specifies DNS related configurations in resolver configuration file (resolv.conf) through `Nameservers`, `Search`, and `Options`.
-* `GET /networks/(id or name)` now includes IP and name of all peers nodes for swarm mode overlay networks.
-* `GET /plugins` list plugins.
-* `POST /plugins/pull?name=<plugin name>` pulls a plugin.
-* `GET /plugins/(plugin name)` inspect a plugin.
-* `POST /plugins/(plugin name)/set` configure a plugin.
-* `POST /plugins/(plugin name)/enable` enable a plugin.
-* `POST /plugins/(plugin name)/disable` disable a plugin.
-* `POST /plugins/(plugin name)/push` push a plugin.
-* `POST /plugins/create?name=(plugin name)` create a plugin.
-* `DELETE /plugins/(plugin name)` delete a plugin.
-* `POST /node/(id or name)/update` now accepts both `id` or `name` to identify the node to update.
-* `GET /images/json` now support a `reference` filter.
-* `GET /secrets` returns information on the secrets.
-* `POST /secrets/create` creates a secret.
-* `DELETE /secrets/{id}` removes the secret `id`.
-* `GET /secrets/{id}` returns information on the secret `id`.
-* `POST /secrets/{id}/update` updates the secret `id`.
-
-## v1.24 API changes
-
-[Docker Engine API v1.24](v1.24.md) documentation
-
-* `POST /containers/create` now takes `StorageOpt` field.
-* `GET /info` now returns `SecurityOptions` field, showing if `apparmor`, `seccomp`, or `selinux` is supported.
-* `GET /info` no longer returns the `ExecutionDriver` property. This property was no longer used after integration
-  with ContainerD in Docker 1.11.
-* `GET /networks` now supports filtering by `label` and `driver`.
-* `GET /containers/json` now supports filtering containers by `network` name or id.
-* `POST /containers/create` now takes `IOMaximumBandwidth` and `IOMaximumIOps` fields. Windows daemon only.
-* `POST /containers/create` now returns an HTTP 400 "bad parameter" message
-  if no command is specified (instead of an HTTP 500 "server error")
-* `GET /images/search` now takes a `filters` query parameter.
-* `GET /events` now supports a `reload` event that is emitted when the daemon configuration is reloaded.
-* `GET /events` now supports filtering by daemon name or ID.
-* `GET /events` now supports a `detach` event that is emitted on detaching from container process.
-* `GET /events` now supports an `exec_detach ` event that is emitted on detaching from exec process.
-* `GET /images/json` now supports filters `since` and `before`.
-* `POST /containers/(id or name)/start` no longer accepts a `HostConfig`.
-* `POST /images/(name)/tag` no longer has a `force` query parameter.
-* `GET /images/search` now supports maximum returned search results `limit`.
-* `POST /containers/{name:.*}/copy` is now removed and errors out starting from this API version.
-* API errors are now returned as JSON instead of plain text.
-* `POST /containers/create` and `POST /containers/(id)/start` allow you to configure kernel parameters (sysctls) for use in the container.
-* `POST /containers/<container ID>/exec` and `POST /exec/<exec ID>/start`
-  no longer expects a "Container" field to be present. This property was not used
-  and is no longer sent by the docker client.
-* `POST /containers/create/` now validates the hostname (should be a valid RFC 1123 hostname).
-* `POST /containers/create/` `HostConfig.PidMode` field now accepts `container:<name|id>`,
-  to have the container join the PID namespace of an existing container.
-
-## v1.23 API changes
-
-[Docker Engine API v1.23](v1.23.md) documentation
-
-* `GET /containers/json` returns the state of the container, one of `created`, `restarting`, `running`, `paused`, `exited` or `dead`.
-* `GET /containers/json` returns the mount points for the container.
-* `GET /networks/(name)` now returns an `Internal` field showing whether the network is internal or not.
-* `GET /networks/(name)` now returns an `EnableIPv6` field showing whether the network has ipv6 enabled or not.
-* `POST /containers/(name)/update` now supports updating container's restart policy.
-* `POST /networks/create` now supports enabling ipv6 on the network by setting the `EnableIPv6` field (doing this with a label will no longer work).
-* `GET /info` now returns `CgroupDriver` field showing what cgroup driver the daemon is using; `cgroupfs` or `systemd`.
-* `GET /info` now returns `KernelMemory` field, showing if "kernel memory limit" is supported.
-* `POST /containers/create` now takes `PidsLimit` field, if the kernel is >= 4.3 and the pids cgroup is supported.
-* `GET /containers/(id or name)/stats` now returns `pids_stats`, if the kernel is >= 4.3 and the pids cgroup is supported.
-* `POST /containers/create` now allows you to override usernamespaces remapping and use privileged options for the container.
-* `POST /containers/create` now allows specifying `nocopy` for named volumes, which disables automatic copying from the container path to the volume.
-* `POST /auth` now returns an `IdentityToken` when supported by a registry.
-* `POST /containers/create` with both `Hostname` and `Domainname` fields specified will result in the container's hostname being set to `Hostname`, rather than `Hostname.Domainname`.
-* `GET /volumes` now supports more filters, new added filters are `name` and `driver`.
-* `GET /containers/(id or name)/logs` now accepts a `details` query parameter to stream the extra attributes that were provided to the containers `LogOpts`, such as environment variables and labels, with the logs.
-* `POST /images/load` now returns progress information as a JSON stream, and has a `quiet` query parameter to suppress progress details.
-
-## v1.22 API changes
-
-[Docker Engine API v1.22](v1.22.md) documentation
-
-* `POST /container/(name)/update` updates the resources of a container.
-* `GET /containers/json` supports filter `isolation` on Windows.
-* `GET /containers/json` now returns the list of networks of containers.
-* `GET /info` Now returns `Architecture` and `OSType` fields, providing information
-  about the host architecture and operating system type that the daemon runs on.
-* `GET /networks/(name)` now returns a `Name` field for each container attached to the network.
-* `GET /version` now returns the `BuildTime` field in RFC3339Nano format to make it
-  consistent with other date/time values returned by the API.
-* `AuthConfig` now supports a `registrytoken` for token based authentication
-* `POST /containers/create` now has a 4M minimum value limit for `HostConfig.KernelMemory`
-* Pushes initiated with `POST /images/(name)/push` and pulls initiated with `POST /images/create`
-  will be cancelled if the HTTP connection making the API request is closed before
-  the push or pull completes.
-* `POST /containers/create` now allows you to set a read/write rate limit for a
-  device (in bytes per second or IO per second).
-* `GET /networks` now supports filtering by `name`, `id` and `type`.
-* `POST /containers/create` now allows you to set the static IPv4 and/or IPv6 address for the container.
-* `POST /networks/(id)/connect` now allows you to set the static IPv4 and/or IPv6 address for the container.
-* `GET /info` now includes the number of containers running, stopped, and paused.
-* `POST /networks/create` now supports restricting external access to the network by setting the `Internal` field.
-* `POST /networks/(id)/disconnect` now includes a `Force` option to forcefully disconnect a container from network
-* `GET /containers/(id)/json` now returns the `NetworkID` of containers.
-* `POST /networks/create` Now supports an options field in the IPAM config that provides options
-  for custom IPAM plugins.
-* `GET /networks/{network-id}` Now returns IPAM config options for custom IPAM plugins if any
-  are available.
-* `GET /networks/<network-id>` now returns subnets info for user-defined networks.
-* `GET /info` can now return a `SystemStatus` field useful for returning additional information about applications
-  that are built on top of engine.
-
-## v1.21 API changes
-
-[Docker Engine API v1.21](v1.21.md) documentation
-
-* `GET /volumes` lists volumes from all volume drivers.
-* `POST /volumes/create` to create a volume.
-* `GET /volumes/(name)` get low-level information about a volume.
-* `DELETE /volumes/(name)` remove a volume with the specified name.
-* `VolumeDriver` was moved from `config` to `HostConfig` to make the configuration portable.
-* `GET /images/(name)/json` now returns information about an image's `RepoTags` and `RepoDigests`.
-* The `config` option now accepts the field `StopSignal`, which specifies the signal to use to kill a container.
-* `GET /containers/(id)/stats` will return networking information respectively for each interface.
-* The `HostConfig` option now includes the `DnsOptions` field to configure the container's DNS options.
-* `POST /build` now optionally takes a serialized map of build-time variables.
-* `GET /events` now includes a `timenano` field, in addition to the existing `time` field.
-* `GET /events` now supports filtering by image and container labels.
-* `GET /info` now lists engine version information and return the information of `CPUShares` and `Cpuset`.
-* `GET /containers/json` will return `ImageID` of the image used by container.
-* `POST /exec/(name)/start` will now return an HTTP 409 when the container is either stopped or paused.
-* `POST /containers/create` now takes `KernelMemory` in HostConfig to specify kernel memory limit.
-* `GET /containers/(name)/json` now accepts a `size` parameter. Setting this parameter to '1' returns container size information in the `SizeRw` and `SizeRootFs` fields.
-* `GET /containers/(name)/json` now returns a `NetworkSettings.Networks` field,
-  detailing network settings per network. This field deprecates the
-  `NetworkSettings.Gateway`, `NetworkSettings.IPAddress`,
-  `NetworkSettings.IPPrefixLen`, and `NetworkSettings.MacAddress` fields, which
-  are still returned for backward-compatibility, but will be removed in a future version.
-* `GET /exec/(id)/json` now returns a `NetworkSettings.Networks` field,
-  detailing networksettings per network. This field deprecates the
-  `NetworkSettings.Gateway`, `NetworkSettings.IPAddress`,
-  `NetworkSettings.IPPrefixLen`, and `NetworkSettings.MacAddress` fields, which
-  are still returned for backward-compatibility, but will be removed in a future version.
-* The `HostConfig` option now includes the `OomScoreAdj` field for adjusting the
-  badness heuristic. This heuristic selects which processes the OOM killer kills
-  under out-of-memory conditions.
-
-## v1.20 API changes
-
-[Docker Engine API v1.20](v1.20.md) documentation
-
-* `GET /containers/(id)/archive` get an archive of filesystem content from a container.
-* `PUT /containers/(id)/archive` upload an archive of content to be extracted to
-an existing directory inside a container's filesystem.
-* `POST /containers/(id)/copy` is deprecated in favor of the above `archive`
-endpoint which can be used to download files and directories from a container.
-* The `hostConfig` option now accepts the field `GroupAdd`, which specifies a
-list of additional groups that the container process will run as.
-
-## v1.19 API changes
-
-[Docker Engine API v1.19](v1.19.md) documentation
-
-* When the daemon detects a version mismatch with the client, usually when
-the client is newer than the daemon, an HTTP 400 is now returned instead
-of a 404.
-* `GET /containers/(id)/stats` now accepts `stream` bool to get only one set of stats and disconnect.
-* `GET /containers/(id)/logs` now accepts a `since` timestamp parameter.
-* `GET /info` The fields `Debug`, `IPv4Forwarding`, `MemoryLimit`, and
-`SwapLimit` are now returned as boolean instead of as an int. In addition, the
-end point now returns the new boolean fields `CpuCfsPeriod`, `CpuCfsQuota`, and
-`OomKillDisable`.
-* The `hostConfig` option now accepts the fields `CpuPeriod` and `CpuQuota`
-* `POST /build` accepts `cpuperiod` and `cpuquota` options
-
-## v1.18 API changes
-
-[Docker Engine API v1.18](v1.18.md) documentation
-
-* `GET /version` now returns `Os`, `Arch` and `KernelVersion`.
-* `POST /containers/create` and `POST /containers/(id)/start`allow you to  set ulimit settings for use in the container.
-* `GET /info` now returns `SystemTime`, `HttpProxy`,`HttpsProxy` and `NoProxy`.
-* `GET /images/json` added a `RepoDigests` field to include image digest information.
-* `POST /build` can now set resource constraints for all containers created for the build.
-* `CgroupParent` can be passed in the host config to setup container cgroups under a specific cgroup.
-* `POST /build` closing the HTTP request cancels the build
-* `POST /containers/(id)/exec` includes `Warnings` field to response.
diff --git a/installer/vendor/github.com/docker/docker/docs/deprecated.md b/installer/vendor/github.com/docker/docker/docs/deprecated.md
deleted file mode 100644
index 1298370ba9..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/deprecated.md
+++ /dev/null
@@ -1,286 +0,0 @@
----
-aliases: ["/engine/misc/deprecated/"]
-title: "Deprecated Engine Features"
-description: "Deprecated Features."
-keywords: "docker, documentation, about, technology, deprecate"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Deprecated Engine Features
-
-The following list of features are deprecated in Engine.
-To learn more about Docker Engine's deprecation policy,
-see [Feature Deprecation Policy](https://docs.docker.com/engine/#feature-deprecation-policy).
-
-
-### Top-level network properties in NetworkSettings
-
-**Deprecated In Release: v1.13.0**
-
-**Target For Removal In Release: v1.16**
-
-When inspecting a container, `NetworkSettings` contains top-level information
-about the default ("bridge") network;
-
-`EndpointID`, `Gateway`, `GlobalIPv6Address`, `GlobalIPv6PrefixLen`, `IPAddress`,
-`IPPrefixLen`, `IPv6Gateway`, and `MacAddress`.
-
-These properties are deprecated in favor of per-network properties in
-`NetworkSettings.Networks`. These properties were already "deprecated" in
-docker 1.9, but kept around for backward compatibility.
-
-Refer to [#17538](https://github.com/docker/docker/pull/17538) for further
-information.
-
-## `filter` param for `/images/json` endpoint
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-The `filter` param to filter the list of image by reference (name or name:tag) is now implemented as a regular filter, named `reference`.
-
-### `repository:shortid` image references
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-`repository:shortid` syntax for referencing images is very little used, collides with tag references can be confused with digest references.
-
-### `docker daemon` subcommand
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-The daemon is moved to a separate binary (`dockerd`), and should be used instead.
-
-### Duplicate keys with conflicting values in engine labels
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-Duplicate keys with conflicting values have been deprecated. A warning is displayed
-in the output, and an error will be returned in the future.
-
-### `MAINTAINER` in Dockerfile
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-`MAINTAINER` was an early very limited form of `LABEL` which should be used instead.
-
-### API calls without a version
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-API versions should be supplied to all API calls to ensure compatibility with
-future Engine versions. Instead of just requesting, for example, the URL
-`/containers/json`, you must now request `/v1.25/containers/json`.
-
-### Backing filesystem without `d_type` support for overlay/overlay2
-**Deprecated In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-**Target For Removal In Release: v1.16**
-
-The overlay and overlay2 storage driver does not work as expected if the backing
-filesystem does not support `d_type`. For example, XFS does not support `d_type`
-if it is formatted with the `ftype=0` option.
-
-Please also refer to [#27358](https://github.com/docker/docker/issues/27358) for
-further information.
-
-### Three arguments form in `docker import`
-**Deprecated In Release: [v0.6.7](https://github.com/docker/docker/releases/tag/v0.6.7)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-The `docker import` command format `file|URL|- [REPOSITORY [TAG]]` is deprecated since November 2013. It's no more supported.
-
-### `-h` shorthand for `--help`
-
-**Deprecated In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-**Target For Removal In Release: v1.15**
-
-The shorthand (`-h`) is less common than `--help` on Linux and cannot be used
-on all subcommands (due to it conflicting with, e.g. `-h` / `--hostname` on
-`docker create`). For this reason, the `-h` shorthand was not printed in the
-"usage" output of subcommands, nor documented, and is now marked "deprecated".
-
-### `-e` and `--email` flags on `docker login`
-**Deprecated In Release: [v1.11.0](https://github.com/docker/docker/releases/tag/v1.11.0)**
-
-**Target For Removal In Release: v1.14**
-
-The docker login command is removing the ability to automatically register for an account with the target registry if the given username doesn't exist. Due to this change, the email flag is no longer required, and will be deprecated.
-
-### Separator (`:`) of `--security-opt` flag on `docker run`
-**Deprecated In Release: [v1.11.0](https://github.com/docker/docker/releases/tag/v1.11.0)**
-
-**Target For Removal In Release: v1.14**
-
-The flag `--security-opt` doesn't use the colon separator(`:`) anymore to divide keys and values, it uses the equal symbol(`=`) for consistency with other similar flags, like `--storage-opt`.
-
-### `/containers/(id or name)/copy` endpoint
-
-**Deprecated In Release: [v1.8.0](https://github.com/docker/docker/releases/tag/v1.8.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-The endpoint `/containers/(id or name)/copy` is deprecated in favor of `/containers/(id or name)/archive`.
-
-### Ambiguous event fields in API
-**Deprecated In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-The fields `ID`, `Status` and `From` in the events API have been deprecated in favor of a more rich structure.
-See the events API documentation for the new format.
-
-### `-f` flag on `docker tag`
-**Deprecated In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-To make tagging consistent across the various `docker` commands, the `-f` flag on the `docker tag` command is deprecated. It is not longer necessary to specify `-f` to move a tag from one image to another. Nor will `docker` generate an error if the `-f` flag is missing and the specified tag is already in use.
-
-### HostConfig at API container start
-**Deprecated In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-Passing an `HostConfig` to `POST /containers/{name}/start` is deprecated in favor of
-defining it at container creation (`POST /containers/create`).
-
-### `--before` and `--since` flags on `docker ps`
-
-**Deprecated In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-The `docker ps --before` and `docker ps --since` options are deprecated.
-Use `docker ps --filter=before=...` and `docker ps --filter=since=...` instead.
-
-### `--automated` and `--stars` flags on `docker search`
-
-**Deprecated in Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-**Target For Removal In Release: v1.15**
-
-The `docker search --automated` and `docker search --stars` options are deprecated.
-Use `docker search --filter=is-automated=...` and `docker search --filter=stars=...` instead.
-
-### Driver Specific Log Tags
-**Deprecated In Release: [v1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-Log tags are now generated in a standard way across different logging drivers.
-Because of which, the driver specific log tag options `syslog-tag`, `gelf-tag` and
-`fluentd-tag` have been deprecated in favor of the generic `tag` option.
-
-    docker --log-driver=syslog --log-opt tag="{{.ImageName}}/{{.Name}}/{{.ID}}"
-
-### LXC built-in exec driver
-**Deprecated In Release: [v1.8.0](https://github.com/docker/docker/releases/tag/v1.8.0)**
-
-**Removed In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-The built-in LXC execution driver, the lxc-conf flag, and API fields have been removed.
-
-### Old Command Line Options
-**Deprecated In Release: [v1.8.0](https://github.com/docker/docker/releases/tag/v1.8.0)**
-
-**Removed In Release: [v1.10.0](https://github.com/docker/docker/releases/tag/v1.10.0)**
-
-The flags `-d` and `--daemon` are deprecated in favor of the `daemon` subcommand:
-
-    docker daemon -H ...
-
-The following single-dash (`-opt`) variant of certain command line options
-are deprecated and replaced with double-dash options (`--opt`):
-
-    docker attach -nostdin
-    docker attach -sig-proxy
-    docker build -no-cache
-    docker build -rm
-    docker commit -author
-    docker commit -run
-    docker events -since
-    docker history -notrunc
-    docker images -notrunc
-    docker inspect -format
-    docker ps -beforeId
-    docker ps -notrunc
-    docker ps -sinceId
-    docker rm -link
-    docker run -cidfile
-    docker run -dns
-    docker run -entrypoint
-    docker run -expose
-    docker run -link
-    docker run -lxc-conf
-    docker run -n
-    docker run -privileged
-    docker run -volumes-from
-    docker search -notrunc
-    docker search -stars
-    docker search -t
-    docker search -trusted
-    docker tag -force
-
-The following double-dash options are deprecated and have no replacement:
-
-    docker run --cpuset
-    docker run --networking
-    docker ps --since-id
-    docker ps --before-id
-    docker search --trusted
-
-**Deprecated In Release: [v1.5.0](https://github.com/docker/docker/releases/tag/v1.5.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-The single-dash (`-help`) was removed, in favor of the double-dash `--help`
-
-    docker -help
-    docker [COMMAND] -help
-
-### `--run` flag on docker commit
-
-**Deprecated In Release: [v0.10.0](https://github.com/docker/docker/releases/tag/v0.10.0)**
-
-**Removed In Release: [v1.13.0](https://github.com/docker/docker/releases/tag/v1.13.0)**
-
-The flag `--run` of the docker commit (and its short version `-run`) were deprecated in favor
-of the `--changes` flag that allows to pass `Dockerfile` commands.
-
-
-### Interacting with V1 registries
-
-**Disabled By Default In Release: v1.14**
-
-**Target For Removal In Release: v1.17**
-
-Version 1.9 adds a flag (`--disable-legacy-registry=false`) which prevents the
-docker daemon from `pull`, `push`, and `login` operations against v1
-registries.  Though enabled by default, this signals the intent to deprecate
-the v1 protocol.
-
-Support for the v1 protocol to the public registry was removed in 1.13. Any
-mirror configurations using v1 should be updated to use a
-[v2 registry mirror](https://docs.docker.com/registry/recipes/mirror/).
-
-### Docker Content Trust ENV passphrase variables name change
-**Deprecated In Release: [v1.9.0](https://github.com/docker/docker/releases/tag/v1.9.0)**
-
-**Removed In Release: [v1.12.0](https://github.com/docker/docker/releases/tag/v1.12.0)**
-
-Since 1.9, Docker Content Trust Offline key has been renamed to Root key and the Tagging key has been renamed to Repository key. Due to this renaming, we're also changing the corresponding environment variables
-
-- DOCKER_CONTENT_TRUST_OFFLINE_PASSPHRASE is now named DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE
-- DOCKER_CONTENT_TRUST_TAGGING_PASSPHRASE is now named DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/EBS_volume.md b/installer/vendor/github.com/docker/docker/docs/extend/EBS_volume.md
deleted file mode 100644
index 8c64efa164..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/EBS_volume.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-description: Volume plugin for Amazon EBS
-keywords: "API, Usage, plugins, documentation, developer, amazon, ebs, rexray, volume"
-title: Volume plugin for Amazon EBS
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# A proof-of-concept Rexray plugin
-
-In this example, a simple Rexray plugin will be created for the purposes of using
-it on an Amazon EC2 instance with EBS. It is not meant to be a complete Rexray plugin.
-
-The example source is available at [https://github.com/tiborvass/rexray-plugin](https://github.com/tiborvass/rexray-plugin).
-
-To learn more about Rexray: [https://github.com/codedellemc/rexray](https://github.com/codedellemc/rexray)
-
-## 1. Make a Docker image
-
-The following is the Dockerfile used to containerize rexray.
-
-```Dockerfile
-FROM debian:jessie
-RUN apt-get update && apt-get install -y --no-install-recommends wget ca-certificates
-RUN wget https://dl.bintray.com/emccode/rexray/stable/0.6.4/rexray-Linux-x86_64-0.6.4.tar.gz -O rexray.tar.gz && tar -xvzf rexray.tar.gz -C /usr/bin && rm rexray.tar.gz
-RUN mkdir -p /run/docker/plugins /var/lib/libstorage/volumes
-ENTRYPOINT ["rexray"]
-CMD ["--help"]
-```
-
-To build it you can run `image=$(cat Dockerfile | docker build -q -)` and `$image`
-will reference the containerized rexray image.
-
-## 2. Extract rootfs
-
-```sh
-$ TMPDIR=/tmp/rexray  # for the purpose of this example
-$  # create container without running it, to extract the rootfs from image
-$ docker create --name rexray "$image"
-$  # save the rootfs to a tar archive
-$ docker export -o $TMPDIR/rexray.tar rexray
-$  # extract rootfs from tar archive to a rootfs folder
-$ ( mkdir -p $TMPDIR/rootfs; cd $TMPDIR/rootfs; tar xf ../rexray.tar )
-```
-
-## 3. Add plugin configuration
-
-We have to put the following JSON to `$TMPDIR/config.json`:
-
-```json
-{
-      "Args": {
-        "Description": "",
-        "Name": "",
-        "Settable": null,
-        "Value": null
-      },
-      "Description": "A proof-of-concept EBS plugin (using rexray) for Docker",
-      "Documentation": "https://github.com/tiborvass/rexray-plugin",
-      "Entrypoint": [
-        "/usr/bin/rexray", "service", "start", "-f"
-      ],
-      "Env": [
-        {
-          "Description": "",
-          "Name": "REXRAY_SERVICE",
-          "Settable": [
-            "value"
-          ],
-          "Value": "ebs"
-        },
-        {
-          "Description": "",
-          "Name": "EBS_ACCESSKEY",
-          "Settable": [
-            "value"
-          ],
-          "Value": ""
-        },
-        {
-          "Description": "",
-          "Name": "EBS_SECRETKEY",
-          "Settable": [
-            "value"
-          ],
-          "Value": ""
-        }
-      ],
-      "Interface": {
-        "Socket": "rexray.sock",
-        "Types": [
-          "docker.volumedriver/1.0"
-        ]
-      },
-      "Linux": {
-        "AllowAllDevices": true,
-        "Capabilities": ["CAP_SYS_ADMIN"],
-        "Devices": null
-      },
-      "Mounts": [
-        {
-          "Source": "/dev",
-          "Destination": "/dev",
-          "Type": "bind",
-          "Options": ["rbind"]
-        }
-      ],
-      "Network": {
-        "Type": "host"
-      },
-      "PropagatedMount": "/var/lib/libstorage/volumes",
-      "User": {},
-      "WorkDir": ""
-}
-```
-
-Please note a couple of points:
-- `PropagatedMount` is needed so that the docker daemon can see mounts done by the
-rexray plugin from within the container, otherwise the docker daemon is not able
-to mount a docker volume.
-- The rexray plugin needs dynamic access to host devices. For that reason, we
-have to give it access to all devices under `/dev` and set `AllowAllDevices` to
-true for proper access.
-- The user of this simple plugin can change only 3 settings: `REXRAY_SERVICE`,
-`EBS_ACCESSKEY` and `EBS_SECRETKEY`. This is because of the reduced scope of this
-plugin. Ideally other rexray parameters could also be set.
-
-## 4. Create plugin
-
-`docker plugin create tiborvass/rexray-plugin "$TMPDIR"` will create the plugin.
-
-```sh
-$ docker plugin ls
-ID                  NAME                             DESCRIPTION                         ENABLED
-2475a4bd0ca5        tiborvass/rexray-plugin:latest   A rexray volume plugin for Docker   false
-```
-
-## 5. Test plugin
-
-```sh
-$ docker plugin set tiborvass/rexray-plugin EBS_ACCESSKEY=$AWS_ACCESSKEY EBS_SECRETKEY=$AWS_SECRETKEY`
-$ docker plugin enable tiborvass/rexray-plugin
-$ docker volume create -d tiborvass/rexray-plugin my-ebs-volume
-$ docker volume ls
-DRIVER                              VOLUME NAME
-tiborvass/rexray-plugin:latest      my-ebs-volume
-$ docker run --rm -v my-ebs-volume:/volume busybox sh -c 'echo bye > /volume/hi'
-$ docker run --rm -v my-ebs-volume:/volume busybox cat /volume/hi
-bye
-```
-
-## 6. Push plugin
-
-First, ensure you are logged in with `docker login`. Then you can run:
-`docker plugin push tiborvass/rexray-plugin` to push it like a regular docker
-image to a registry, to make it available for others to install via
-`docker plugin install tiborvass/rexray-plugin EBS_ACCESSKEY=$AWS_ACCESSKEY EBS_SECRETKEY=$AWS_SECRETKEY`.
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/config.md b/installer/vendor/github.com/docker/docker/docs/extend/config.md
deleted file mode 100644
index 096d2d0822..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/config.md
+++ /dev/null
@@ -1,225 +0,0 @@
----
-title: "Plugin config"
-description: "How develop and use a plugin with the managed plugin system"
-keywords: "API, Usage, plugins, documentation, developer"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-
-# Plugin Config Version 1 of Plugin V2
-
-This document outlines the format of the V0 plugin configuration. The plugin
-config described herein was introduced in the Docker daemon in the [v1.12.0
-release](https://github.com/docker/docker/commit/f37117045c5398fd3dca8016ea8ca0cb47e7312b).
-
-Plugin configs describe the various constituents of a docker plugin. Plugin
-configs can be serialized to JSON format with the following media types:
-
-Config Type  | Media Type
-------------- | -------------
-config  | "application/vnd.docker.plugin.v1+json"
-
-
-## *Config* Field Descriptions
-
-Config provides the base accessible fields for working with V0 plugin format
- in the registry.
-
-- **`description`** *string*
-
-	description of the plugin
-
-- **`documentation`** *string*
-
-  	link to the documentation about the plugin
-
-- **`interface`** *PluginInterface*
-
-   interface implemented by the plugins, struct consisting of the following fields
-
-    - **`types`** *string array*
-
-      types indicate what interface(s) the plugin currently implements.
-
-      currently supported:
-
-      	- **docker.volumedriver/1.0**
-
-      	- **docker.authz/1.0**
-
-    - **`socket`** *string*
-
-      socket is the name of the socket the engine should use to communicate with the plugins.
-      the socket will be created in `/run/docker/plugins`.
-
-
-- **`entrypoint`** *string array*
-
-   entrypoint of the plugin, see [`ENTRYPOINT`](../reference/builder.md#entrypoint)
-
-- **`workdir`** *string*
-
-   workdir of the plugin, see [`WORKDIR`](../reference/builder.md#workdir)
-
-- **`network`** *PluginNetwork*
-
-   network of the plugin, struct consisting of the following fields
-
-    - **`type`** *string*
-
-      network type.
-
-      currently supported:
-
-      	- **bridge**
-      	- **host**
-      	- **none**
-
-- **`mounts`** *PluginMount array*
-
-   mount of the plugin, struct consisting of the following fields, see [`MOUNTS`](https://github.com/opencontainers/runtime-spec/blob/master/config.md#mounts)
-
-    - **`name`** *string*
-
-	  name of the mount.
-
-    - **`description`** *string*
-
-      description of the mount.
-
-    - **`source`** *string*
-
-	  source of the mount.
-
-    - **`destination`** *string*
-
-	  destination of the mount.
-
-    - **`type`** *string*
-
-      mount type.
-
-    - **`options`** *string array*
-
-	  options of the mount.
-
-- **`propagatedMount`** *string*
-
-   path to be mounted as rshared, so that mounts under that path are visible to docker. This is useful for volume plugins.
-   This path will be bind-mounted outisde of the plugin rootfs so it's contents
-   are preserved on upgrade.
-
-- **`env`** *PluginEnv array*
-
-   env of the plugin, struct consisting of the following fields
-
-    - **`name`** *string*
-
-	  name of the env.
-
-    - **`description`** *string*
-
-      description of the env.
-
-    - **`value`** *string*
-
-	  value of the env.
-
-- **`args`** *PluginArgs*
-
-   args of the plugin, struct consisting of the following fields
-
-    - **`name`** *string*
-
-	  name of the args.
-
-    - **`description`** *string*
-
-      description of the args.
-
-    - **`value`** *string array*
-
-	  values of the args.
-
-- **`linux`** *PluginLinux*
-
-    - **`capabilities`** *string array*
-
-          capabilities of the plugin (*Linux only*), see list [`here`](https://github.com/opencontainers/runc/blob/master/libcontainer/SPEC.md#security)
-
-    - **`allowAllDevices`** *boolean*
-
-	If `/dev` is bind mounted from the host, and allowAllDevices is set to true, the plugin will have `rwm` access to all devices on the host.
-
-    - **`devices`** *PluginDevice array*
-
-          device of the plugin, (*Linux only*), struct consisting of the following fields, see [`DEVICES`](https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#devices)
-
-          - **`name`** *string*
-
-	      name of the device.
-
-          - **`description`** *string*
-
-              description of the device.
-
-          - **`path`** *string*
-
-              path of the device.
-
-## Example Config
-
-*Example showing the 'tiborvass/sample-volume-plugin' plugin config.*
-
-```json
-{
-            "Args": {
-                "Description": "",
-                "Name": "",
-                "Settable": null,
-                "Value": null
-            },
-            "Description": "A sample volume plugin for Docker",
-            "Documentation": "https://docs.docker.com/engine/extend/plugins/",
-            "Entrypoint": [
-                "/usr/bin/sample-volume-plugin",
-                "/data"
-            ],
-            "Env": [
-                {
-                    "Description": "",
-                    "Name": "DEBUG",
-                    "Settable": [
-                        "value"
-                    ],
-                    "Value": "0"
-                }
-            ],
-            "Interface": {
-                "Socket": "plugin.sock",
-                "Types": [
-                    "docker.volumedriver/1.0"
-                ]
-            },
-            "Linux": {
-                "Capabilities": null,
-                "AllowAllDevices": false,
-                "Devices": null
-            },
-            "Mounts": null,
-            "Network": {
-                "Type": ""
-            },
-            "PropagatedMount": "/data",
-            "User": {},
-            "Workdir": ""
-}
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_additional_info.png b/installer/vendor/github.com/docker/docker/docs/extend/images/authz_additional_info.png
deleted file mode 100644
index 1a6a6d01d2..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_additional_info.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_allow.png b/installer/vendor/github.com/docker/docker/docs/extend/images/authz_allow.png
deleted file mode 100644
index f42108040b..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_allow.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_chunked.png b/installer/vendor/github.com/docker/docker/docs/extend/images/authz_chunked.png
deleted file mode 100644
index 5bde2c71f9..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_chunked.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_connection_hijack.png b/installer/vendor/github.com/docker/docker/docs/extend/images/authz_connection_hijack.png
deleted file mode 100644
index f13a2987b2..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_connection_hijack.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_deny.png b/installer/vendor/github.com/docker/docker/docs/extend/images/authz_deny.png
deleted file mode 100644
index fa4a48584a..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/extend/images/authz_deny.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/index.md b/installer/vendor/github.com/docker/docker/docs/extend/index.md
deleted file mode 100644
index 1410b205e5..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/index.md
+++ /dev/null
@@ -1,222 +0,0 @@
----
-description: Develop and use a plugin with the managed plugin system
-keywords: "API, Usage, plugins, documentation, developer"
-title: Managed plugin system
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Docker Engine managed plugin system
-
-* [Installing and using a plugin](index.md#installing-and-using-a-plugin)
-* [Developing a plugin](index.md#developing-a-plugin)
-
-Docker Engine's plugins system allows you to install, start, stop, and remove
-plugins using Docker Engine. This mechanism is currently only available for
-volume drivers, but more plugin driver types will be available in future releases.
-
-For information about the legacy plugin system available in Docker Engine 1.12
-and earlier, see [Understand legacy Docker Engine plugins](legacy_plugins.md).
-
-> **Note**: Docker Engine managed plugins are currently not supported
-on Windows daemons.
-
-## Installing and using a plugin
-
-Plugins are distributed as Docker images and can be hosted on Docker Hub or on
-a private registry.
-
-To install a plugin, use the `docker plugin install` command, which pulls the
-plugin from Docker hub or your private registry, prompts you to grant
-permissions or capabilities if necessary, and enables the plugin.
-
-To check the status of installed plugins, use the `docker plugin ls` command.
-Plugins that start successfully are listed as enabled in the output.
-
-After a plugin is installed, you can use it as an option for another Docker
-operation, such as creating a volume.
-
-In the following example, you install the `sshfs` plugin, verify that it is
-enabled, and use it to create a volume.
-
-1.  Install the `sshfs` plugin.
-
-    ```bash
-    $ docker plugin install vieux/sshfs
-
-    Plugin "vieux/sshfs" is requesting the following privileges:
-    - network: [host]
-    - capabilities: [CAP_SYS_ADMIN]
-    Do you grant the above permissions? [y/N] y
-
-    vieux/sshfs
-    ```
-
-    The plugin requests 2 privileges:
-    - It needs access to the `host` network.
-    - It needs the `CAP_SYS_ADMIN` capability, which allows the plugin to run
-    the `mount` command.
-
-2.  Check that the plugin is enabled in the output of `docker plugin ls`.
-
-    ```bash
-    $ docker plugin ls
-
-    ID                    NAME                  TAG                 DESCRIPTION                   ENABLED
-    69553ca1d789          vieux/sshfs           latest              the `sshfs` plugin            true
-    ```
-
-3.  Create a volume using the plugin.
-    This example mounts the `/remote` directory on host `1.2.3.4` into a
-    volume named `sshvolume`. This volume can now be mounted into containers.
-
-    ```bash
-    $ docker volume create \
-      -d vieux/sshfs \
-      --name sshvolume \
-      -o sshcmd=user@1.2.3.4:/remote
-
-    sshvolume
-    ```
-4.  Verify that the volume was created successfully.
-
-    ```bash
-    $ docker volume ls
-
-    DRIVER              NAME
-    vieux/sshfs         sshvolume
-    ```
-
-5.  Start a container that uses the volume `sshvolume`.
-
-    ```bash
-    $ docker run -v sshvolume:/data busybox ls /data
-
-    <content of /remote on machine 1.2.3.4>
-    ```
-
-To disable a plugin, use the `docker plugin disable` command. To completely
-remove it, use the `docker plugin remove` command. For other available
-commands and options, see the
-[command line reference](../reference/commandline/index.md).
-
-## Service creation using plugins
-
-In swarm mode, it is possible to create a service that allows for attaching
-to networks or mounting volumes. Swarm schedules services based on plugin availability
-on a node. In this example, a volume plugin is installed on a swarm worker and a volume 
-is created using the plugin. In the manager, a service is created with the relevant
-mount options. It can be observed that the service is scheduled to run on the worker
-node with the said volume plugin and volume. 
-
-In the following example, node1 is the manager and node2 is the worker.
-
-1.  Prepare manager. In node 1:
-
-    ```bash
-    $ docker swarm init
-    Swarm initialized: current node (dxn1zf6l61qsb1josjja83ngz) is now a manager.
-    ```
-
-2. Join swarm, install plugin and create volume on worker. In node 2:
-
-    ```bash
-    $ docker swarm join \
-    --token SWMTKN-1-49nj1cmql0jkz5s954yi3oex3nedyz0fb0xx14ie39trti4wxv-8vxv8rssmk743ojnwacrr2e7c \
-    192.168.99.100:2377
-    ```
-
-    ```bash
-    $ docker plugin install tiborvass/sample-volume-plugin
-    latest: Pulling from tiborvass/sample-volume-plugin
-    eb9c16fbdc53: Download complete
-    Digest: sha256:00b42de88f3a3e0342e7b35fa62394b0a9ceb54d37f4c50be5d3167899994639
-    Status: Downloaded newer image for tiborvass/sample-volume-plugin:latest
-    Installed plugin tiborvass/sample-volume-plugin
-    ```
-	
-    ```bash
-    $ docker volume create -d tiborvass/sample-volume-plugin --name pluginVol
-    ```
-
-3. Create a service using the plugin and volume. In node1:
-
-    ```bash
-    $ docker service create --name my-service --mount type=volume,volume-driver=tiborvass/sample-volume-plugin,source=pluginVol,destination=/tmp busybox top
-
-    $ docker service ls
-    z1sj8bb8jnfn  my-service   replicated  1/1       busybox:latest 
-    ```
-    docker service ls shows service 1 instance of service running.
-
-4. Observe the task getting scheduled in node 2:
-
-    ```bash
-    $ docker ps --format '{{.ID}}\t {{.Status}} {{.Names}} {{.Command}}' 
-    83fc1e842599     Up 2 days my-service.1.9jn59qzn7nbc3m0zt1hij12xs "top"
-    ```
-
-## Developing a plugin
-
-#### The rootfs directory
-The `rootfs` directory represents the root filesystem of the plugin. In this
-example, it was created from a Dockerfile:
-
->**Note:** The `/run/docker/plugins` directory is mandatory inside of the
-plugin's filesystem for docker to communicate with the plugin.
-
-```bash
-$ git clone https://github.com/vieux/docker-volume-sshfs
-$ cd docker-volume-sshfs
-$ docker build -t rootfsimage .
-$ id=$(docker create rootfsimage true) # id was cd851ce43a403 when the image was created
-$ sudo mkdir -p myplugin/rootfs
-$ sudo docker export "$id" | sudo tar -x -C myplugin/rootfs
-$ docker rm -vf "$id"
-$ docker rmi rootfsimage
-```
-
-#### The config.json file
-
-The `config.json` file describes the plugin. See the [plugins config reference](config.md).
-
-Consider the following `config.json` file.
-
-```json
-{
-	"description": "sshFS plugin for Docker",
-	"documentation": "https://docs.docker.com/engine/extend/plugins/",
-	"entrypoint": ["/go/bin/docker-volume-sshfs"],
-	"network": {
-		   "type": "host"
-		   },
-	"interface" : {
-		   "types": ["docker.volumedriver/1.0"],
-		   "socket": "sshfs.sock"
-	},
-	"capabilities": ["CAP_SYS_ADMIN"]
-}
-```
-
-This plugin is a volume driver. It requires a `host` network and the
-`CAP_SYS_ADMIN` capability. It depends upon the `/go/bin/docker-volume-sshfs`
-entrypoint and uses the `/run/docker/plugins/sshfs.sock` socket to communicate
-with Docker Engine. This plugin has no runtime parameters.
-
-#### Creating the plugin
-
-A new plugin can be created by running
-`docker plugin create <plugin-name> ./path/to/plugin/data` where the plugin
-data contains a plugin configuration file `config.json` and a root filesystem
-in subdirectory `rootfs`. 
-
-After that the plugin `<plugin-name>` will show up in `docker plugin ls`.
-Plugins can be pushed to remote registries with
-`docker plugin push <plugin-name>`.
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/legacy_plugins.md b/installer/vendor/github.com/docker/docker/docs/extend/legacy_plugins.md
deleted file mode 100644
index 6ac914e366..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/legacy_plugins.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-redirect_from:
-- "/engine/extend/plugins/"
-title: "Use Docker Engine plugins"
-description: "How to add additional functionality to Docker with plugins extensions"
-keywords: "Examples, Usage, plugins, docker, documentation, user guide"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Use Docker Engine plugins
-
-This document describes the Docker Engine plugins generally available in Docker
-Engine. To view information on plugins managed by Docker,
-refer to [Docker Engine plugin system](index.md).
-
-You can extend the capabilities of the Docker Engine by loading third-party
-plugins. This page explains the types of plugins and provides links to several
-volume and network plugins for Docker.
-
-## Types of plugins
-
-Plugins extend Docker's functionality. They come in specific types.  For
-example, a [volume plugin](plugins_volume.md) might enable Docker
-volumes to persist across multiple Docker hosts and a
-[network plugin](plugins_network.md) might provide network plumbing.
-
-Currently Docker supports authorization, volume and network driver plugins. In the future it
-will support additional plugin types.
-
-## Installing a plugin
-
-Follow the instructions in the plugin's documentation.
-
-## Finding a plugin
-
-The sections below provide an inexhaustive overview of available plugins.
-
-<style>
-#DocumentationText  tr td:first-child { white-space: nowrap;}
-</style>
-
-### Network plugins
-
-Plugin                                                                              | Description
------------------------------------------------------------------------------------ | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-[Contiv Networking](https://github.com/contiv/netplugin)                            | An open source network plugin to provide infrastructure and security policies for a multi-tenant micro services deployment, while providing an integration to physical network for non-container workload. Contiv Networking implements the remote driver and IPAM APIs available in Docker 1.9 onwards.
-[Kuryr Network Plugin](https://github.com/openstack/kuryr)                          | A network plugin is developed as part of the OpenStack Kuryr project and implements the Docker networking (libnetwork) remote driver API by utilizing Neutron, the OpenStack networking service. It includes an IPAM driver as well.
-[Weave Network Plugin](https://www.weave.works/docs/net/latest/introducing-weave/)    | A network plugin that creates a virtual network that connects your Docker containers - across multiple hosts or clouds and enables automatic discovery of applications. Weave networks are resilient, partition tolerant, secure and work in partially connected networks, and other adverse environments - all configured with delightful simplicity.
-
-### Volume plugins
-
-Plugin                                                                              | Description
------------------------------------------------------------------------------------ | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-[Azure File Storage plugin](https://github.com/Azure/azurefile-dockervolumedriver)  | Lets you mount Microsoft [Azure File Storage](https://azure.microsoft.com/blog/azure-file-storage-now-generally-available/) shares to Docker containers as volumes using the SMB 3.0 protocol. [Learn more](https://azure.microsoft.com/blog/persistent-docker-volumes-with-azure-file-storage/).
-[Blockbridge plugin](https://github.com/blockbridge/blockbridge-docker-volume)      | A volume plugin that provides access to an extensible set of container-based persistent storage options. It supports single and multi-host Docker environments with features that include tenant isolation, automated provisioning, encryption, secure deletion, snapshots and QoS.
-[Contiv Volume Plugin](https://github.com/contiv/volplugin)                         | An open source volume plugin that provides multi-tenant, persistent, distributed storage with intent based consumption. It has support for Ceph and NFS.
-[Convoy plugin](https://github.com/rancher/convoy)                                  | A volume plugin for a variety of storage back-ends including device mapper and NFS. It's a simple standalone executable written in Go and provides the framework to support vendor-specific extensions such as snapshots, backups and restore.
-[DRBD plugin](https://www.drbd.org/en/supported-projects/docker)                    | A volume plugin that provides highly available storage replicated by [DRBD](https://www.drbd.org). Data written to the docker volume is replicated in a cluster of DRBD nodes.
-[Flocker plugin](https://clusterhq.com/docker-plugin/)                              | A volume plugin that provides multi-host portable volumes for Docker, enabling you to run databases and other stateful containers and move them around across a cluster of machines.
-[gce-docker plugin](https://github.com/mcuadros/gce-docker)                         | A volume plugin able to attach, format and mount Google Compute [persistent-disks](https://cloud.google.com/compute/docs/disks/persistent-disks).
-[GlusterFS plugin](https://github.com/calavera/docker-volume-glusterfs)             | A volume plugin that provides multi-host volumes management for Docker using GlusterFS.
-[Horcrux Volume Plugin](https://github.com/muthu-r/horcrux)                         | A volume plugin that allows on-demand, version controlled access to your data. Horcrux is an open-source plugin, written in Go, and supports SCP, [Minio](https://www.minio.io) and Amazon S3.
-[HPE 3Par Volume Plugin](https://github.com/hpe-storage/python-hpedockerplugin/)    | A volume plugin that supports HPE 3Par and StoreVirtual iSCSI storage arrays.
-[IPFS Volume Plugin](http://github.com/vdemeester/docker-volume-ipfs)               | An open source volume plugin that allows using an [ipfs](https://ipfs.io/) filesystem as a volume.
-[Keywhiz plugin](https://github.com/calavera/docker-volume-keywhiz)                 | A plugin that provides credentials and secret management using Keywhiz as a central repository.
-[Local Persist Plugin](https://github.com/CWSpear/local-persist)                    | A volume plugin that extends the default `local` driver's functionality by allowing you specify a mountpoint anywhere on the host, which enables the files to *always persist*, even if the volume is removed via `docker volume rm`.
-[NetApp Plugin](https://github.com/NetApp/netappdvp) (nDVP)                         | A volume plugin that provides direct integration with the Docker ecosystem for the NetApp storage portfolio. The nDVP package supports the provisioning and management of storage resources from the storage platform to Docker hosts, with a robust framework for adding additional platforms in the future.
-[Netshare plugin](https://github.com/ContainX/docker-volume-netshare)                 | A volume plugin that provides volume management for NFS 3/4, AWS EFS and CIFS file systems.
-[OpenStorage Plugin](https://github.com/libopenstorage/openstorage)                 | A cluster-aware volume plugin that provides volume management for file and block storage solutions.  It implements a vendor neutral specification for implementing extensions such as CoS, encryption, and snapshots. It has example drivers based on FUSE, NFS, NBD and EBS to name a few.
-[Portworx Volume Plugin](https://github.com/portworx/px-dev)                        | A volume plugin that turns any server into a scale-out converged compute/storage node, providing container granular storage and highly available volumes across any node, using a shared-nothing storage backend that works with any docker scheduler.
-[Quobyte Volume Plugin](https://github.com/quobyte/docker-volume)                   | A volume plugin that connects Docker to [Quobyte](http://www.quobyte.com/containers)'s data center file system, a general-purpose scalable and fault-tolerant storage platform.
-[REX-Ray plugin](https://github.com/emccode/rexray)                                 | A volume plugin which is written in Go and provides advanced storage functionality for many platforms including VirtualBox, EC2, Google Compute Engine, OpenStack, and EMC.
-[Virtuozzo Storage and Ploop plugin](https://github.com/virtuozzo/docker-volume-ploop) | A volume plugin with support for Virtuozzo Storage distributed cloud file system as well as ploop devices.
-[VMware vSphere Storage Plugin](https://github.com/vmware/docker-volume-vsphere)    | Docker Volume Driver for vSphere enables customers to address persistent storage requirements for Docker containers in vSphere environments.
-
-### Authorization plugins
-
- Plugin                                                       | Description
-------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
- [Twistlock AuthZ Broker](https://github.com/twistlock/authz) | A basic extendable authorization plugin that runs directly on the host or inside a container. This plugin allows you to define user policies that it evaluates during authorization. Basic authorization is provided if Docker daemon is started with the --tlsverify flag (username is extracted from the certificate common name).
-
-## Troubleshooting a plugin
-
-If you are having problems with Docker after loading a plugin, ask the authors
-of the plugin for help. The Docker team may not be able to assist you.
-
-## Writing a plugin
-
-If you are interested in writing a plugin for Docker, or seeing how they work
-under the hood, see the [docker plugins reference](plugin_api.md).
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/plugin_api.md b/installer/vendor/github.com/docker/docker/docs/extend/plugin_api.md
deleted file mode 100644
index 693b77a2f3..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/plugin_api.md
+++ /dev/null
@@ -1,196 +0,0 @@
----
-title: "Plugins API"
-description: "How to write Docker plugins extensions "
-keywords: "API, Usage, plugins, documentation, developer"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Docker Plugin API
-
-Docker plugins are out-of-process extensions which add capabilities to the
-Docker Engine.
-
-This document describes the Docker Engine plugin API. To view information on
-plugins managed by Docker Engine, refer to [Docker Engine plugin system](index.md).
-
-This page is intended for people who want to develop their own Docker plugin.
-If you just want to learn about or use Docker plugins, look
-[here](legacy_plugins.md).
-
-## What plugins are
-
-A plugin is a process running on the same or a different host as the docker daemon,
-which registers itself by placing a file on the same docker host in one of the plugin
-directories described in [Plugin discovery](#plugin-discovery).
-
-Plugins have human-readable names, which are short, lowercase strings. For
-example, `flocker` or `weave`.
-
-Plugins can run inside or outside containers. Currently running them outside
-containers is recommended.
-
-## Plugin discovery
-
-Docker discovers plugins by looking for them in the plugin directory whenever a
-user or container tries to use one by name.
-
-There are three types of files which can be put in the plugin directory.
-
-* `.sock` files are UNIX domain sockets.
-* `.spec` files are text files containing a URL, such as `unix:///other.sock` or `tcp://localhost:8080`.
-* `.json` files are text files containing a full json specification for the plugin.
-
-Plugins with UNIX domain socket files must run on the same docker host, whereas
-plugins with spec or json files can run on a different host if a remote URL is specified.
-
-UNIX domain socket files must be located under `/run/docker/plugins`, whereas
-spec files can be located either under `/etc/docker/plugins` or `/usr/lib/docker/plugins`.
-
-The name of the file (excluding the extension) determines the plugin name.
-
-For example, the `flocker` plugin might create a UNIX socket at
-`/run/docker/plugins/flocker.sock`.
-
-You can define each plugin into a separated subdirectory if you want to isolate definitions from each other.
-For example, you can create the `flocker` socket under `/run/docker/plugins/flocker/flocker.sock` and only
-mount `/run/docker/plugins/flocker` inside the `flocker` container.
-
-Docker always searches for unix sockets in `/run/docker/plugins` first. It checks for spec or json files under
-`/etc/docker/plugins` and `/usr/lib/docker/plugins` if the socket doesn't exist. The directory scan stops as
-soon as it finds the first plugin definition with the given name.
-
-### JSON specification
-
-This is the JSON format for a plugin:
-
-```json
-{
-  "Name": "plugin-example",
-  "Addr": "https://example.com/docker/plugin",
-  "TLSConfig": {
-    "InsecureSkipVerify": false,
-    "CAFile": "/usr/shared/docker/certs/example-ca.pem",
-    "CertFile": "/usr/shared/docker/certs/example-cert.pem",
-    "KeyFile": "/usr/shared/docker/certs/example-key.pem"
-  }
-}
-```
-
-The `TLSConfig` field is optional and TLS will only be verified if this configuration is present.
-
-## Plugin lifecycle
-
-Plugins should be started before Docker, and stopped after Docker.  For
-example, when packaging a plugin for a platform which supports `systemd`, you
-might use [`systemd` dependencies](
-http://www.freedesktop.org/software/systemd/man/systemd.unit.html#Before=) to
-manage startup and shutdown order.
-
-When upgrading a plugin, you should first stop the Docker daemon, upgrade the
-plugin, then start Docker again.
-
-## Plugin activation
-
-When a plugin is first referred to -- either by a user referring to it by name
-(e.g.  `docker run --volume-driver=foo`) or a container already configured to
-use a plugin being started -- Docker looks for the named plugin in the plugin
-directory and activates it with a handshake. See Handshake API below.
-
-Plugins are *not* activated automatically at Docker daemon startup. Rather,
-they are activated only lazily, or on-demand, when they are needed.
-
-## Systemd socket activation
-
-Plugins may also be socket activated by `systemd`. The official [Plugins helpers](https://github.com/docker/go-plugins-helpers)
-natively supports socket activation. In order for a plugin to be socket activated it needs
-a `service` file and a `socket` file.
-
-The `service` file (for example `/lib/systemd/system/your-plugin.service`):
-
-```
-[Unit]
-Description=Your plugin
-Before=docker.service
-After=network.target your-plugin.socket
-Requires=your-plugin.socket docker.service
-
-[Service]
-ExecStart=/usr/lib/docker/your-plugin
-
-[Install]
-WantedBy=multi-user.target
-```
-The `socket` file (for example `/lib/systemd/system/your-plugin.socket`):
-
-```
-[Unit]
-Description=Your plugin
-
-[Socket]
-ListenStream=/run/docker/plugins/your-plugin.sock
-
-[Install]
-WantedBy=sockets.target
-```
-
-This will allow plugins to be actually started when the Docker daemon connects to
-the sockets they're listening on (for instance the first time the daemon uses them
-or if one of the plugin goes down accidentally).
-
-## API design
-
-The Plugin API is RPC-style JSON over HTTP, much like webhooks.
-
-Requests flow *from* the Docker daemon *to* the plugin.  So the plugin needs to
-implement an HTTP server and bind this to the UNIX socket mentioned in the
-"plugin discovery" section.
-
-All requests are HTTP `POST` requests.
-
-The API is versioned via an Accept header, which currently is always set to
-`application/vnd.docker.plugins.v1+json`.
-
-## Handshake API
-
-Plugins are activated via the following "handshake" API call.
-
-### /Plugin.Activate
-
-**Request:** empty body
-
-**Response:**
-```
-{
-    "Implements": ["VolumeDriver"]
-}
-```
-
-Responds with a list of Docker subsystems which this plugin implements.
-After activation, the plugin will then be sent events from this subsystem.
-
-Possible values are:
-
-* [`authz`](plugins_authorization.md)
-* [`NetworkDriver`](plugins_network.md)
-* [`VolumeDriver`](plugins_volume.md)
-
-
-## Plugin retries
-
-Attempts to call a method on a plugin are retried with an exponential backoff
-for up to 30 seconds. This may help when packaging plugins as containers, since
-it gives plugin containers a chance to start up before failing any user
-containers which depend on them.
-
-## Plugins helpers
-
-To ease plugins development, we're providing an `sdk` for each kind of plugins
-currently supported by Docker at [docker/go-plugins-helpers](https://github.com/docker/go-plugins-helpers).
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/plugins_authorization.md b/installer/vendor/github.com/docker/docker/docs/extend/plugins_authorization.md
deleted file mode 100644
index ac1837f754..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/plugins_authorization.md
+++ /dev/null
@@ -1,260 +0,0 @@
----
-title: "Access authorization plugin"
-description: "How to create authorization plugins to manage access control to your Docker daemon."
-keywords: "security, authorization, authentication, docker, documentation, plugin, extend"
-redirect_from:
-- "/engine/extend/authorization/"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Create an authorization plugin
-
-This document describes the Docker Engine plugins generally available in Docker
-Engine. To view information on plugins managed by Docker Engine,
-refer to [Docker Engine plugin system](index.md).
-
-Docker's out-of-the-box authorization model is all or nothing. Any user with
-permission to access the Docker daemon can run any Docker client command. The
-same is true for callers using Docker's Engine API to contact the daemon. If you
-require greater access control, you can create authorization plugins and add
-them to your Docker daemon configuration. Using an authorization plugin, a
-Docker administrator can configure granular access policies for managing access
-to Docker daemon.
-
-Anyone with the appropriate skills can develop an authorization plugin. These
-skills, at their most basic, are knowledge of Docker, understanding of REST, and
-sound programming knowledge. This document describes the architecture, state,
-and methods information available to an authorization plugin developer.
-
-## Basic principles
-
-Docker's [plugin infrastructure](plugin_api.md) enables
-extending Docker by loading, removing and communicating with
-third-party components using a generic API. The access authorization subsystem
-was built using this mechanism.
-
-Using this subsystem, you don't need to rebuild the Docker daemon to add an
-authorization plugin.  You can add a plugin to an installed Docker daemon. You do
-need to restart the Docker daemon to add a new plugin.
-
-An authorization plugin approves or denies requests to the Docker daemon based
-on both the current authentication context and the command context. The
-authentication context contains all user details and the authentication method.
-The command context contains all the relevant request data.
-
-Authorization plugins must follow the rules described in [Docker Plugin API](plugin_api.md).
-Each plugin must reside within directories described under the
-[Plugin discovery](plugin_api.md#plugin-discovery) section.
-
-**Note**: the abbreviations `AuthZ` and `AuthN` mean authorization and authentication
-respectively.
-
-## Default user authorization mechanism
-
-If TLS is enabled in the [Docker daemon](https://docs.docker.com/engine/security/https/), the default user authorization flow extracts the user details from the certificate subject name.
-That is, the `User` field is set to the client certificate subject common name, and the `AuthenticationMethod` field is set to `TLS`.
-
-## Basic architecture
-
-You are responsible for registering your plugin as part of the Docker daemon
-startup. You can install multiple plugins and chain them together. This chain
-can be ordered. Each request to the daemon passes in order through the chain.
-Only when all the plugins grant access to the resource, is the access granted.
-
-When an HTTP request is made to the Docker daemon through the CLI or via the
-Engine API, the authentication subsystem passes the request to the installed
-authentication plugin(s). The request contains the user (caller) and command
-context. The plugin is responsible for deciding whether to allow or deny the
-request.
-
-The sequence diagrams below depict an allow and deny authorization flow:
-
-![Authorization Allow flow](images/authz_allow.png)
-
-![Authorization Deny flow](images/authz_deny.png)
-
-Each request sent to the plugin includes the authenticated user, the HTTP
-headers, and the request/response body. Only the user name and the
-authentication method used are passed to the plugin. Most importantly, no user
-credentials or tokens are passed. Finally, not all request/response bodies
-are sent to the authorization plugin. Only those request/response bodies where
-the `Content-Type` is either `text/*` or `application/json` are sent.
-
-For commands that can potentially hijack the HTTP connection (`HTTP
-Upgrade`), such as `exec`, the authorization plugin is only called for the
-initial HTTP requests. Once the plugin approves the command, authorization is
-not applied to the rest of the flow. Specifically, the streaming data is not
-passed to the authorization plugins. For commands that return chunked HTTP
-response, such as `logs` and `events`, only the HTTP request is sent to the
-authorization plugins.
-
-During request/response processing, some authorization flows might
-need to do additional queries to the Docker daemon. To complete such flows,
-plugins can call the daemon API similar to a regular user. To enable these
-additional queries, the plugin must provide the means for an administrator to
-configure proper authentication and security policies.
-
-## Docker client flows
-
-To enable and configure the authorization plugin, the plugin developer must
-support the Docker client interactions detailed in this section.
-
-### Setting up Docker daemon
-
-Enable the authorization plugin with a dedicated command line flag in the
-`--authorization-plugin=PLUGIN_ID` format. The flag supplies a `PLUGIN_ID`
-value. This value can be the plugin’s socket or a path to a specification file.
-Authorization plugins can be loaded without restarting the daemon. Refer
-to the [`dockerd` documentation](../reference/commandline/dockerd.md#configuration-reloading) for more information.
-
-```bash
-$ dockerd --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
-```
-
-Docker's authorization subsystem supports multiple `--authorization-plugin` parameters.
-
-### Calling authorized command (allow)
-
-```bash
-$ docker pull centos
-...
-f1b10cd84249: Pull complete
-...
-```
-
-### Calling unauthorized command (deny)
-
-```bash
-$ docker pull centos
-...
-docker: Error response from daemon: authorization denied by plugin PLUGIN_NAME: volumes are not allowed.
-```
-
-### Error from plugins
-
-```bash
-$ docker pull centos
-...
-docker: Error response from daemon: plugin PLUGIN_NAME failed with error: AuthZPlugin.AuthZReq: Cannot connect to the Docker daemon. Is the docker daemon running on this host?.
-```
-
-## API schema and implementation
-
-In addition to Docker's standard plugin registration method, each plugin
-should implement the following two methods:
-
-* `/AuthZPlugin.AuthZReq` This authorize request method is called before the Docker daemon processes the client request.
-
-* `/AuthZPlugin.AuthZRes` This authorize response method is called before the response is returned from Docker daemon to the client.
-
-#### /AuthZPlugin.AuthZReq
-
-**Request**:
-
-```json
-{
-    "User":              "The user identification",
-    "UserAuthNMethod":   "The authentication method used",
-    "RequestMethod":     "The HTTP method",
-    "RequestURI":        "The HTTP request URI",
-    "RequestBody":       "Byte array containing the raw HTTP request body",
-    "RequestHeader":     "Byte array containing the raw HTTP request header as a map[string][]string "
-}
-```
-
-**Response**:
-
-```json
-{
-    "Allow": "Determined whether the user is allowed or not",
-    "Msg":   "The authorization message",
-    "Err":   "The error message if things go wrong"
-}
-```
-#### /AuthZPlugin.AuthZRes
-
-**Request**:
-
-```json
-{
-    "User":              "The user identification",
-    "UserAuthNMethod":   "The authentication method used",
-    "RequestMethod":     "The HTTP method",
-    "RequestURI":        "The HTTP request URI",
-    "RequestBody":       "Byte array containing the raw HTTP request body",
-    "RequestHeader":     "Byte array containing the raw HTTP request header as a map[string][]string",
-    "ResponseBody":      "Byte array containing the raw HTTP response body",
-    "ResponseHeader":    "Byte array containing the raw HTTP response header as a map[string][]string",
-    "ResponseStatusCode":"Response status code"
-}
-```
-
-**Response**:
-
-```json
-{
-   "Allow":              "Determined whether the user is allowed or not",
-   "Msg":                "The authorization message",
-   "Err":                "The error message if things go wrong"
-}
-```
-
-### Request authorization
-
-Each plugin must support two request authorization messages formats, one from the daemon to the plugin and then from the plugin to the daemon. The tables below detail the content expected in each message.
-
-#### Daemon -> Plugin
-
-Name                   | Type              | Description
------------------------|-------------------|-------------------------------------------------------
-User                   | string            | The user identification
-Authentication method  | string            | The authentication method used
-Request method         | enum              | The HTTP method (GET/DELETE/POST)
-Request URI            | string            | The HTTP request URI including API version (e.g., v.1.17/containers/json)
-Request headers        | map[string]string | Request headers as key value pairs (without the authorization header)
-Request body           | []byte            | Raw request body
-
-
-#### Plugin -> Daemon
-
-Name    | Type   | Description
---------|--------|----------------------------------------------------------------------------------
-Allow   | bool   | Boolean value indicating whether the request is allowed or denied
-Msg     | string | Authorization message (will be returned to the client in case the access is denied)
-Err     | string | Error message (will be returned to the client in case the plugin encounter an error. The string value supplied may appear in logs, so should not include confidential information)
-
-### Response authorization
-
-The plugin must support two authorization messages formats, one from the daemon to the plugin and then from the plugin to the daemon. The tables below detail the content expected in each message.
-
-#### Daemon -> Plugin
-
-
-Name                    | Type              | Description
------------------------ |------------------ |----------------------------------------------------
-User                    | string            | The user identification
-Authentication method   | string            | The authentication method used
-Request method          | string            | The HTTP method (GET/DELETE/POST)
-Request URI             | string            | The HTTP request URI including API version (e.g., v.1.17/containers/json)
-Request headers         | map[string]string | Request headers as key value pairs (without the authorization header)
-Request body            | []byte            | Raw request body
-Response status code    | int               | Status code from the docker daemon
-Response headers        | map[string]string | Response headers as key value pairs
-Response body           | []byte            | Raw docker daemon response body
-
-
-#### Plugin -> Daemon
-
-Name    | Type   | Description
---------|--------|----------------------------------------------------------------------------------
-Allow   | bool   | Boolean value indicating whether the response is allowed or denied
-Msg     | string | Authorization message (will be returned to the client in case the access is denied)
-Err     | string | Error message (will be returned to the client in case the plugin encounter an error. The string value supplied may appear in logs, so should not include confidential information)
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/plugins_graphdriver.md b/installer/vendor/github.com/docker/docker/docs/extend/plugins_graphdriver.md
deleted file mode 100644
index d91c383b5f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/plugins_graphdriver.md
+++ /dev/null
@@ -1,376 +0,0 @@
----
-title: "Graphdriver plugins"
-description: "How to manage image and container filesystems with external plugins"
-keywords: "Examples, Usage, storage, image, docker, data, graph, plugin, api"
-advisory: experimental
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-
-## Changelog
-
-### 1.13.0
-
-- Support v2 plugins
-
-# Docker graph driver plugins
-
-Docker graph driver plugins enable admins to use an external/out-of-process
-graph driver for use with Docker engine. This is an alternative to using the
-built-in storage drivers, such as aufs/overlay/devicemapper/btrfs.
-
-You need to install and enable the plugin and then restart the Docker daemon
-before using the plugin. See the following example for the correct ordering
-of steps.
-
-```
-$ docker plugin install cpuguy83/docker-overlay2-graphdriver-plugin # this command also enables the driver
-<output supressed>
-$ pkill dockerd
-$ dockerd --experimental -s cpuguy83/docker-overlay2-graphdriver-plugin
-```
-
-# Write a graph driver plugin
-
-See the [plugin documentation](/docs/extend/index.md) for detailed information
-on the underlying plugin protocol.
-
-
-## Graph Driver plugin protocol
-
-If a plugin registers itself as a `GraphDriver` when activated, then it is
-expected to provide the rootfs for containers as well as image layer storage.
-
-### /GraphDriver.Init
-
-**Request**:
-```json
-{
-  "Home": "/graph/home/path",
-  "Opts": [],
-  "UIDMaps": [],
-  "GIDMaps": []
-}
-```
-
-Initialize the graph driver plugin with a home directory and array of options.
-These are passed through from the user, but the plugin is not required to parse
-or honor them.
-
-The request also includes a list of UID and GID mappings, structed as follows:
-```json
-{
-  "ContainerID": 0,
-  "HostID": 0,
-  "Size": 0
-}
-```
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-
-### /GraphDriver.Create
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142",
-  "MountLabel": "",
-  "StorageOpt": {}
-}
-```
-
-Create a new, empty, read-only filesystem layer with the specified
-`ID`, `Parent` and `MountLabel`. If `Parent` is an empty string, there is no
-parent layer. `StorageOpt` is map of strings which indicate storage options.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.CreateReadWrite
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142",
-  "MountLabel": "",
-  "StorageOpt": {}
-}
-```
-
-Similar to `/GraphDriver.Create` but creates a read-write filesystem layer.
-
-### /GraphDriver.Remove
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Remove the filesystem layer with this given `ID`.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Get
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "MountLabel": ""
-}
-```
-
-Get the mountpoint for the layered filesystem referred to by the given `ID`.
-
-**Response**:
-```json
-{
-  "Dir": "/var/mygraph/46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Err": ""
-}
-```
-
-Respond with the absolute path to the mounted layered filesystem.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Put
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Release the system resources for the specified `ID`, such as unmounting the
-filesystem layer.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Exists
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Determine if a filesystem layer with the specified `ID` exists.
-
-**Response**:
-```json
-{
-  "Exists": true
-}
-```
-
-Respond with a boolean for whether or not the filesystem layer with the specified
-`ID` exists.
-
-### /GraphDriver.Status
-
-**Request**:
-```json
-{}
-```
-
-Get low-level diagnostic information about the graph driver.
-
-**Response**:
-```json
-{
-  "Status": [[]]
-}
-```
-
-Respond with a 2-D array with key/value pairs for the underlying status
-information.
-
-
-### /GraphDriver.GetMetadata
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187"
-}
-```
-
-Get low-level diagnostic information about the layered filesystem with the
-with the specified `ID`
-
-**Response**:
-```json
-{
-  "Metadata": {},
-  "Err": ""
-}
-```
-
-Respond with a set of key/value pairs containing the low-level diagnostic
-information about the layered filesystem.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.Cleanup
-
-**Request**:
-```json
-{}
-```
-
-Perform necessary tasks to release resources help by the plugin, such as
-unmounting all the layered file systems.
-
-**Response**:
-```json
-{
-  "Err": ""
-}
-```
-
-Respond with a non-empty string error if an error occurred.
-
-
-### /GraphDriver.Diff
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Get an archive of the changes between the filesystem layers specified by the `ID`
-and `Parent`. `Parent` may be an empty string, in which case there is no parent.
-
-**Response**:
-```
-{{ TAR STREAM }}
-```
-
-### /GraphDriver.Changes
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Get a list of changes between the filesystem layers specified by the `ID` and
-`Parent`. If `Parent` is an empty string, there is no parent.
-
-**Response**:
-```json
-{
-  "Changes": [{}],
-  "Err": ""
-}
-```
-
-Respond with a list of changes. The structure of a change is:
-```json
-  "Path": "/some/path",
-  "Kind": 0,
-```
-
-Where the `Path` is the filesystem path within the layered filesystem that is
-changed and `Kind` is an integer specifying the type of change that occurred:
-
-- 0 - Modified
-- 1 - Added
-- 2 - Deleted
-
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.ApplyDiff
-
-**Request**:
-```
-{{ TAR STREAM }}
-```
-
-Extract the changeset from the given diff into the layer with the specified `ID`
-and `Parent`
-
-**Query Parameters**:
-
-- id (required)- the `ID` of the new filesystem layer to extract the diff to
-- parent (required)- the `Parent` of the given `ID`
-
-**Response**:
-```json
-{
-  "Size": 512366,
-  "Err": ""
-}
-```
-
-Respond with the size of the new layer in bytes.
-Respond with a non-empty string error if an error occurred.
-
-### /GraphDriver.DiffSize
-
-**Request**:
-```json
-{
-  "ID": "46fe8644f2572fd1e505364f7581e0c9dbc7f14640bd1fb6ce97714fb6fc5187",
-  "Parent": "2cd9c322cb78a55e8212aa3ea8425a4180236d7106938ec921d0935a4b8ca142"
-}
-```
-
-Calculate the changes between the specified `ID`
-
-**Response**:
-```json
-{
-  "Size": 512366,
-  "Err": ""
-}
-```
-
-Respond with the size changes between the specified `ID` and `Parent`
-Respond with a non-empty string error if an error occurred.
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/plugins_network.md b/installer/vendor/github.com/docker/docker/docs/extend/plugins_network.md
deleted file mode 100644
index a974862fa6..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/plugins_network.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: "Docker network driver plugins"
-description: "Network driver plugins."
-keywords: "Examples, Usage, plugins, docker, documentation, user guide"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Engine network driver plugins
-
-This document describes Docker Engine network driver plugins generally
-available in Docker Engine. To view information on plugins
-managed by Docker Engine, refer to [Docker Engine plugin system](index.md).
-
-Docker Engine network plugins enable Engine deployments to be extended to
-support a wide range of networking technologies, such as VXLAN, IPVLAN, MACVLAN
-or something completely different. Network driver plugins are supported via the
-LibNetwork project. Each plugin is implemented as a  "remote driver" for
-LibNetwork, which shares plugin infrastructure with Engine. Effectively, network
-driver plugins are activated in the same way as other plugins, and use the same
-kind of protocol.
-
-## Network driver plugins and swarm mode
-
-Docker 1.12 adds support for cluster management and orchestration called
-[swarm mode](https://docs.docker.com/engine/swarm/). Docker Engine running in swarm mode currently
-only supports the built-in overlay driver for networking. Therefore existing
-networking plugins will not work in swarm mode.
-
-When you run Docker Engine outside of swarm mode, all networking plugins that
-worked in Docker 1.11 will continue to function normally. They do not require
-any modification.
-
-## Using network driver plugins
-
-The means of installing and running a network driver plugin depend on the
-particular plugin. So, be sure to install your plugin according to the
-instructions obtained from the plugin developer.
-
-Once running however, network driver plugins are used just like the built-in
-network drivers: by being mentioned as a driver in network-oriented Docker
-commands. For example,
-
-    $ docker network create --driver weave mynet
-
-Some network driver plugins are listed in [plugins](legacy_plugins.md)
-
-The `mynet` network is now owned by `weave`, so subsequent commands
-referring to that network will be sent to the plugin,
-
-    $ docker run --network=mynet busybox top
-
-
-## Write a network plugin
-
-Network plugins implement the [Docker plugin
-API](plugin_api.md) and the network plugin protocol
-
-## Network plugin protocol
-
-The network driver protocol, in addition to the plugin activation call, is
-documented as part of libnetwork:
-[https://github.com/docker/libnetwork/blob/master/docs/remote.md](https://github.com/docker/libnetwork/blob/master/docs/remote.md).
-
-# Related Information
-
-To interact with the Docker maintainers and other interested users, see the IRC channel `#docker-network`.
-
--  [Docker networks feature overview](https://docs.docker.com/engine/userguide/networking/)
--  The [LibNetwork](https://github.com/docker/libnetwork) project
diff --git a/installer/vendor/github.com/docker/docker/docs/extend/plugins_volume.md b/installer/vendor/github.com/docker/docker/docs/extend/plugins_volume.md
deleted file mode 100644
index c060bf39b1..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/extend/plugins_volume.md
+++ /dev/null
@@ -1,276 +0,0 @@
----
-title: "Volume plugins"
-description: "How to manage data with external volume plugins"
-keywords: "Examples, Usage, volume, docker, data, volumes, plugin, api"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Write a volume plugin
-
-Docker Engine volume plugins enable Engine deployments to be integrated with
-external storage systems, such as Amazon EBS, and enable data volumes to persist
-beyond the lifetime of a single Engine host. See the
-[plugin documentation](legacy_plugins.md) for more information.
-
-## Changelog
-
-### 1.13.0
-
-- If used as part of the v2 plugin architecture, mountpoints that are part of paths returned by plugin have to be mounted under the directory specified by PropagatedMount in the plugin configuration [#26398](https://github.com/docker/docker/pull/26398)
-
-### 1.12.0
-
-- Add `Status` field to `VolumeDriver.Get` response ([#21006](https://github.com/docker/docker/pull/21006#))
-- Add `VolumeDriver.Capabilities` to get capabilities of the volume driver([#22077](https://github.com/docker/docker/pull/22077))
-
-### 1.10.0
-
-- Add `VolumeDriver.Get` which gets the details about the volume ([#16534](https://github.com/docker/docker/pull/16534))
-- Add `VolumeDriver.List` which lists all volumes owned by the driver ([#16534](https://github.com/docker/docker/pull/16534))
-
-### 1.8.0
-
-- Initial support for volume driver plugins ([#14659](https://github.com/docker/docker/pull/14659))
-
-## Command-line changes
-
-A volume plugin makes use of the `-v`and `--volume-driver` flag on the `docker run` command.  The `-v` flag accepts a volume name and the `--volume-driver` flag a driver type, for example:
-
-    $ docker run -ti -v volumename:/data --volume-driver=flocker   busybox sh
-
-This command passes the `volumename` through to the volume plugin as a
-user-given name for the volume. The `volumename` must not begin with a `/`.
-
-By having the user specify a  `volumename`, a plugin can associate the volume
-with an external volume beyond the lifetime of a single container or container
-host. This can be used, for example, to move a stateful container from one
-server to another.
-
-By specifying a `volumedriver` in conjunction with a `volumename`, users can use plugins such as [Flocker](https://clusterhq.com/docker-plugin/) to manage volumes external to a single host, such as those on EBS.
-
-
-## Create a VolumeDriver
-
-The container creation endpoint (`/containers/create`) accepts a `VolumeDriver`
-field of type `string` allowing to specify the name of the driver. It's default
-value of `"local"` (the default driver for local volumes).
-
-## Volume plugin protocol
-
-If a plugin registers itself as a `VolumeDriver` when activated, then it is
-expected to provide writeable paths on the host filesystem for the Docker
-daemon to provide to containers to consume.
-
-The Docker daemon handles bind-mounting the provided paths into user
-containers.
-
-> **Note**: Volume plugins should *not* write data to the `/var/lib/docker/`
-> directory, including `/var/lib/docker/volumes`. The `/var/lib/docker/`
-> directory is reserved for Docker.
-
-### /VolumeDriver.Create
-
-**Request**:
-```json
-{
-    "Name": "volume_name",
-    "Opts": {}
-}
-```
-
-Instruct the plugin that the user wants to create a volume, given a user
-specified volume name.  The plugin does not need to actually manifest the
-volume on the filesystem yet (until Mount is called).
-Opts is a map of driver specific options passed through from the user request.
-
-**Response**:
-```json
-{
-    "Err": ""
-}
-```
-
-Respond with a string error if an error occurred.
-
-### /VolumeDriver.Remove
-
-**Request**:
-```json
-{
-    "Name": "volume_name"
-}
-```
-
-Delete the specified volume from disk. This request is issued when a user invokes `docker rm -v` to remove volumes associated with a container.
-
-**Response**:
-```json
-{
-    "Err": ""
-}
-```
-
-Respond with a string error if an error occurred.
-
-### /VolumeDriver.Mount
-
-**Request**:
-```json
-{
-    "Name": "volume_name",
-    "ID": "b87d7442095999a92b65b3d9691e697b61713829cc0ffd1bb72e4ccd51aa4d6c"
-}
-```
-
-Docker requires the plugin to provide a volume, given a user specified volume
-name. This is called once per container start. If the same volume_name is requested
-more than once, the plugin may need to keep track of each new mount request and provision
-at the first mount request and deprovision at the last corresponding unmount request.
-
-`ID` is a unique ID for the caller that is requesting the mount.
-
-**Response**:
-```json
-{
-    "Mountpoint": "/path/to/directory/on/host",
-    "Err": ""
-}
-```
-
-Respond with the path on the host filesystem where the volume has been made
-available, and/or a string error if an error occurred.
-
-### /VolumeDriver.Path
-
-**Request**:
-```json
-{
-    "Name": "volume_name"
-}
-```
-
-Docker needs reminding of the path to the volume on the host.
-
-**Response**:
-```json
-{
-    "Mountpoint": "/path/to/directory/on/host",
-    "Err": ""
-}
-```
-
-Respond with the path on the host filesystem where the volume has been made
-available, and/or a string error if an error occurred. `Mountpoint` is optional,
-however the plugin may be queried again later if one is not provided.
-
-### /VolumeDriver.Unmount
-
-**Request**:
-```json
-{
-    "Name": "volume_name",
-    "ID": "b87d7442095999a92b65b3d9691e697b61713829cc0ffd1bb72e4ccd51aa4d6c"
-}
-```
-
-Indication that Docker no longer is using the named volume. This is called once
-per container stop.  Plugin may deduce that it is safe to deprovision it at
-this point.
-
-`ID` is a unique ID for the caller that is requesting the mount.
-
-**Response**:
-```json
-{
-    "Err": ""
-}
-```
-
-Respond with a string error if an error occurred.
-
-
-### /VolumeDriver.Get
-
-**Request**:
-```json
-{
-    "Name": "volume_name"
-}
-```
-
-Get the volume info.
-
-
-**Response**:
-```json
-{
-  "Volume": {
-    "Name": "volume_name",
-    "Mountpoint": "/path/to/directory/on/host",
-    "Status": {}
-  },
-  "Err": ""
-}
-```
-
-Respond with a string error if an error occurred. `Mountpoint` and `Status` are
-optional.
-
-
-### /VolumeDriver.List
-
-**Request**:
-```json
-{}
-```
-
-Get the list of volumes registered with the plugin.
-
-**Response**:
-```json
-{
-  "Volumes": [
-    {
-      "Name": "volume_name",
-      "Mountpoint": "/path/to/directory/on/host"
-    }
-  ],
-  "Err": ""
-}
-```
-
-Respond with a string error if an error occurred. `Mountpoint` is optional.
-
-### /VolumeDriver.Capabilities
-
-**Request**:
-```json
-{}
-```
-
-Get the list of capabilities the driver supports.
-The driver is not required to implement this endpoint, however in such cases
-the default values will be taken.
-
-**Response**:
-```json
-{
-  "Capabilities": {
-    "Scope": "global"
-  }
-}
-```
-
-Supported scopes are `global` and `local`. Any other value in `Scope` will be
-ignored and assumed to be `local`. Scope allows cluster managers to handle the
-volume differently, for instance with a scope of `global`, the cluster manager
-knows it only needs to create the volume once instead of on every engine. More
-capabilities may be added in the future.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/builder.md b/installer/vendor/github.com/docker/docker/docs/reference/builder.md
deleted file mode 100644
index 6fa5a24150..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/builder.md
+++ /dev/null
@@ -1,1746 +0,0 @@
----
-title: "Dockerfile reference"
-description: "Dockerfiles use a simple DSL which allows you to automate the steps you would normally manually take to create an image."
-keywords: "builder, docker, Dockerfile, automation, image creation"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Dockerfile reference
-
-Docker can build images automatically by reading the instructions from a
-`Dockerfile`. A `Dockerfile` is a text document that contains all the commands a
-user could call on the command line to assemble an image. Using `docker build`
-users can create an automated build that executes several command-line
-instructions in succession.
-
-This page describes the commands you can use in a `Dockerfile`. When you are
-done reading this page, refer to the [`Dockerfile` Best
-Practices](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/) for a tip-oriented guide.
-
-## Usage
-
-The [`docker build`](commandline/build.md) command builds an image from
-a `Dockerfile` and a *context*. The build's context is the files at a specified
-location `PATH` or `URL`. The `PATH` is a directory on your local filesystem.
-The `URL` is a Git repository location.
-
-A context is processed recursively. So, a `PATH` includes any subdirectories and
-the `URL` includes the repository and its submodules. A simple build command
-that uses the current directory as context:
-
-    $ docker build .
-    Sending build context to Docker daemon  6.51 MB
-    ...
-
-The build is run by the Docker daemon, not by the CLI. The first thing a build
-process does is send the entire context (recursively) to the daemon.  In most
-cases, it's best to start with an empty directory as context and keep your
-Dockerfile in that directory. Add only the files needed for building the
-Dockerfile.
-
->**Warning**: Do not use your root directory, `/`, as the `PATH` as it causes
->the build to transfer the entire contents of your hard drive to the Docker
->daemon.
-
-To use a file in the build context, the `Dockerfile` refers to the file specified
-in an instruction, for example,  a `COPY` instruction. To increase the build's
-performance, exclude files and directories by adding a `.dockerignore` file to
-the context directory.  For information about how to [create a `.dockerignore`
-file](#dockerignore-file) see the documentation on this page.
-
-Traditionally, the `Dockerfile` is called `Dockerfile` and located in the root
-of the context. You use the `-f` flag with `docker build` to point to a Dockerfile
-anywhere in your file system.
-
-    $ docker build -f /path/to/a/Dockerfile .
-
-You can specify a repository and tag at which to save the new image if
-the build succeeds:
-
-    $ docker build -t shykes/myapp .
-
-To tag the image into multiple repositories after the build,
-add multiple `-t` parameters when you run the `build` command:
-
-    $ docker build -t shykes/myapp:1.0.2 -t shykes/myapp:latest .
-
-Before the Docker daemon runs the instructions in the `Dockerfile`, it performs
-a preliminary validation of the `Dockerfile` and returns an error if the syntax is incorrect:
-
-    $ docker build -t test/myapp .
-    Sending build context to Docker daemon 2.048 kB
-    Error response from daemon: Unknown instruction: RUNCMD
-
-The Docker daemon runs the instructions in the `Dockerfile` one-by-one,
-committing the result of each instruction
-to a new image if necessary, before finally outputting the ID of your
-new image. The Docker daemon will automatically clean up the context you
-sent.
-
-Note that each instruction is run independently, and causes a new image
-to be created - so `RUN cd /tmp` will not have any effect on the next
-instructions.
-
-Whenever possible, Docker will re-use the intermediate images (cache),
-to accelerate the `docker build` process significantly. This is indicated by
-the `Using cache` message in the console output.
-(For more information, see the [Build cache section](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#/build-cache)) in the
-`Dockerfile` best practices guide:
-
-    $ docker build -t svendowideit/ambassador .
-    Sending build context to Docker daemon 15.36 kB
-    Step 1/4 : FROM alpine:3.2
-     ---> 31f630c65071
-    Step 2/4 : MAINTAINER SvenDowideit@home.org.au
-     ---> Using cache
-     ---> 2a1c91448f5f
-    Step 3/4 : RUN apk update &&      apk add socat &&        rm -r /var/cache/
-     ---> Using cache
-     ---> 21ed6e7fbb73
-    Step 4/4 : CMD env | grep _TCP= | (sed 's/.*_PORT_\([0-9]*\)_TCP=tcp:\/\/\(.*\):\(.*\)/socat -t 100000000 TCP4-LISTEN:\1,fork,reuseaddr TCP4:\2:\3 \&/' && echo wait) | sh
-     ---> Using cache
-     ---> 7ea8aef582cc
-    Successfully built 7ea8aef582cc
-
-Build cache is only used from images that have a local parent chain. This means
-that these images were created by previous builds or the whole chain of images
-was loaded with `docker load`. If you wish to use build cache of a specific
-image you can specify it with `--cache-from` option. Images specified with
-`--cache-from` do not need to have a parent chain and may be pulled from other
-registries.
-
-When you're done with your build, you're ready to look into [*Pushing a
-repository to its registry*](https://docs.docker.com/engine/tutorials/dockerrepos/#/contributing-to-docker-hub).
-
-## Format
-
-Here is the format of the `Dockerfile`:
-
-```Dockerfile
-# Comment
-INSTRUCTION arguments
-```
-
-The instruction is not case-sensitive. However, convention is for them to
-be UPPERCASE to distinguish them from arguments more easily.
-
-
-Docker runs instructions in a `Dockerfile` in order. **The first
-instruction must be \`FROM\`** in order to specify the [*Base
-Image*](glossary.md#base-image) from which you are building.
-
-Docker treats lines that *begin* with `#` as a comment, unless the line is
-a valid [parser directive](#parser-directives). A `#` marker anywhere
-else in a line is treated as an argument. This allows statements like:
-
-```Dockerfile
-# Comment
-RUN echo 'we are running some # of cool things'
-```
-
-Line continuation characters are not supported in comments.
-
-## Parser directives
-
-Parser directives are optional, and affect the way in which subsequent lines
-in a `Dockerfile` are handled. Parser directives do not add layers to the build,
-and will not be shown as a build step. Parser directives are written as a
-special type of comment in the form `# directive=value`. A single directive
-may only be used once.
-
-Once a comment, empty line or builder instruction has been processed, Docker
-no longer looks for parser directives. Instead it treats anything formatted
-as a parser directive as a comment and does not attempt to validate if it might
-be a parser directive. Therefore, all parser directives must be at the very
-top of a `Dockerfile`.
-
-Parser directives are not case-sensitive. However, convention is for them to
-be lowercase. Convention is also to include a blank line following any
-parser directives. Line continuation characters are not supported in parser
-directives.
-
-Due to these rules, the following examples are all invalid:
-
-Invalid due to line continuation:
-
-```Dockerfile
-# direc \
-tive=value
-```
-
-Invalid due to appearing twice:
-
-```Dockerfile
-# directive=value1
-# directive=value2
-
-FROM ImageName
-```
-
-Treated as a comment due to appearing after a builder instruction:
-
-```Dockerfile
-FROM ImageName
-# directive=value
-```
-
-Treated as a comment due to appearing after a comment which is not a parser
-directive:
-
-```Dockerfile
-# About my dockerfile
-FROM ImageName
-# directive=value
-```
-
-The unknown directive is treated as a comment due to not being recognized. In
-addition, the known directive is treated as a comment due to appearing after
-a comment which is not a parser directive.
-
-```Dockerfile
-# unknowndirective=value
-# knowndirective=value
-```
-
-Non line-breaking whitespace is permitted in a parser directive. Hence, the
-following lines are all treated identically:
-
-```Dockerfile
-#directive=value
-# directive =value
-#	directive= value
-# directive = value
-#	  dIrEcTiVe=value
-```
-
-The following parser directive is supported:
-
-* `escape`
-
-## escape
-
-    # escape=\ (backslash)
-
-Or
-
-    # escape=` (backtick)
-
-The `escape` directive sets the character used to escape characters in a
-`Dockerfile`. If not specified, the default escape character is `\`.
-
-The escape character is used both to escape characters in a line, and to
-escape a newline. This allows a `Dockerfile` instruction to
-span multiple lines. Note that regardless of whether the `escape` parser
-directive is included in a `Dockerfile`, *escaping is not performed in
-a `RUN` command, except at the end of a line.*
-
-Setting the escape character to `` ` `` is especially useful on
-`Windows`, where `\` is the directory path separator. `` ` `` is consistent
-with [Windows PowerShell](https://technet.microsoft.com/en-us/library/hh847755.aspx).
-
-Consider the following example which would fail in a non-obvious way on
-`Windows`. The second `\` at the end of the second line would be interpreted as an
-escape for the newline, instead of a target of the escape from the first `\`.
-Similarly, the `\` at the end of the third line would, assuming it was actually
-handled as an instruction, cause it be treated as a line continuation. The result
-of this dockerfile is that second and third lines are considered a single
-instruction:
-
-```Dockerfile
-FROM microsoft/nanoserver
-COPY testfile.txt c:\\
-RUN dir c:\
-```
-
-Results in:
-
-    PS C:\John> docker build -t cmd .
-    Sending build context to Docker daemon 3.072 kB
-    Step 1/2 : FROM microsoft/nanoserver
-     ---> 22738ff49c6d
-    Step 2/2 : COPY testfile.txt c:\RUN dir c:
-    GetFileAttributesEx c:RUN: The system cannot find the file specified.
-    PS C:\John>
-
-One solution to the above would be to use `/` as the target of both the `COPY`
-instruction, and `dir`. However, this syntax is, at best, confusing as it is not
-natural for paths on `Windows`, and at worst, error prone as not all commands on
-`Windows` support `/` as the path separator.
-
-By adding the `escape` parser directive, the following `Dockerfile` succeeds as
-expected with the use of natural platform semantics for file paths on `Windows`:
-
-    # escape=`
-
-    FROM microsoft/nanoserver
-    COPY testfile.txt c:\
-    RUN dir c:\
-
-Results in:
-
-    PS C:\John> docker build -t succeeds --no-cache=true .
-    Sending build context to Docker daemon 3.072 kB
-    Step 1/3 : FROM microsoft/nanoserver
-     ---> 22738ff49c6d
-    Step 2/3 : COPY testfile.txt c:\
-     ---> 96655de338de
-    Removing intermediate container 4db9acbb1682
-    Step 3/3 : RUN dir c:\
-     ---> Running in a2c157f842f5
-     Volume in drive C has no label.
-     Volume Serial Number is 7E6D-E0F7
-    
-     Directory of c:\
-    
-    10/05/2016  05:04 PM             1,894 License.txt
-    10/05/2016  02:22 PM    <DIR>          Program Files
-    10/05/2016  02:14 PM    <DIR>          Program Files (x86)
-    10/28/2016  11:18 AM                62 testfile.txt
-    10/28/2016  11:20 AM    <DIR>          Users
-    10/28/2016  11:20 AM    <DIR>          Windows
-               2 File(s)          1,956 bytes
-               4 Dir(s)  21,259,096,064 bytes free
-     ---> 01c7f3bef04f
-    Removing intermediate container a2c157f842f5
-    Successfully built 01c7f3bef04f
-    PS C:\John>
-
-## Environment replacement
-
-Environment variables (declared with [the `ENV` statement](#env)) can also be
-used in certain instructions as variables to be interpreted by the
-`Dockerfile`. Escapes are also handled for including variable-like syntax
-into a statement literally.
-
-Environment variables are notated in the `Dockerfile` either with
-`$variable_name` or `${variable_name}`. They are treated equivalently and the
-brace syntax is typically used to address issues with variable names with no
-whitespace, like `${foo}_bar`.
-
-The `${variable_name}` syntax also supports a few of the standard `bash`
-modifiers as specified below:
-
-* `${variable:-word}` indicates that if `variable` is set then the result
-  will be that value. If `variable` is not set then `word` will be the result.
-* `${variable:+word}` indicates that if `variable` is set then `word` will be
-  the result, otherwise the result is the empty string.
-
-In all cases, `word` can be any string, including additional environment
-variables.
-
-Escaping is possible by adding a `\` before the variable: `\$foo` or `\${foo}`,
-for example, will translate to `$foo` and `${foo}` literals respectively.
-
-Example (parsed representation is displayed after the `#`):
-
-    FROM busybox
-    ENV foo /bar
-    WORKDIR ${foo}   # WORKDIR /bar
-    ADD . $foo       # ADD . /bar
-    COPY \$foo /quux # COPY $foo /quux
-
-Environment variables are supported by the following list of instructions in
-the `Dockerfile`:
-
-* `ADD`
-* `COPY`
-* `ENV`
-* `EXPOSE`
-* `LABEL`
-* `USER`
-* `WORKDIR`
-* `VOLUME`
-* `STOPSIGNAL`
-
-as well as:
-
-* `ONBUILD` (when combined with one of the supported instructions above)
-
-> **Note**:
-> prior to 1.4, `ONBUILD` instructions did **NOT** support environment
-> variable, even when combined with any of the instructions listed above.
-
-Environment variable substitution will use the same value for each variable
-throughout the entire command. In other words, in this example:
-
-    ENV abc=hello
-    ENV abc=bye def=$abc
-    ENV ghi=$abc
-
-will result in `def` having a value of `hello`, not `bye`. However,
-`ghi` will have a value of `bye` because it is not part of the same command
-that set `abc` to `bye`.
-
-## .dockerignore file
-
-Before the docker CLI sends the context to the docker daemon, it looks
-for a file named `.dockerignore` in the root directory of the context.
-If this file exists, the CLI modifies the context to exclude files and
-directories that match patterns in it.  This helps to avoid
-unnecessarily sending large or sensitive files and directories to the
-daemon and potentially adding them to images using `ADD` or `COPY`.
-
-The CLI interprets the `.dockerignore` file as a newline-separated
-list of patterns similar to the file globs of Unix shells.  For the
-purposes of matching, the root of the context is considered to be both
-the working and the root directory.  For example, the patterns
-`/foo/bar` and `foo/bar` both exclude a file or directory named `bar`
-in the `foo` subdirectory of `PATH` or in the root of the git
-repository located at `URL`.  Neither excludes anything else.
-
-If a line in `.dockerignore` file starts with `#` in column 1, then this line is
-considered as a comment and is ignored before interpreted by the CLI.
-
-Here is an example `.dockerignore` file:
-
-```
-# comment
-    */temp*
-    */*/temp*
-    temp?
-```
-
-This file causes the following build behavior:
-
-| Rule           | Behavior                                                                                                                                                                     |
-|----------------|------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `# comment`    | Ignored.                 |
-| `*/temp*`      | Exclude files and directories whose names start with `temp` in any immediate subdirectory of the root.  For example, the plain file `/somedir/temporary.txt` is excluded, as is the directory `/somedir/temp`.                 |
-| `*/*/temp*`    | Exclude files and directories starting with `temp` from any subdirectory that is two levels below the root. For example, `/somedir/subdir/temporary.txt` is excluded. |
-| `temp?`        | Exclude files and directories in the root directory whose names are a one-character extension of `temp`.  For example, `/tempa` and `/tempb` are excluded.
-
-
-Matching is done using Go's
-[filepath.Match](http://golang.org/pkg/path/filepath#Match) rules.  A
-preprocessing step removes leading and trailing whitespace and
-eliminates `.` and `..` elements using Go's
-[filepath.Clean](http://golang.org/pkg/path/filepath/#Clean).  Lines
-that are blank after preprocessing are ignored.
-
-Beyond Go's filepath.Match rules, Docker also supports a special
-wildcard string `**` that matches any number of directories (including
-zero). For example, `**/*.go` will exclude all files that end with `.go`
-that are found in all directories, including the root of the build context.
-
-Lines starting with `!` (exclamation mark) can be used to make exceptions
-to exclusions.  The following is an example `.dockerignore` file that
-uses this mechanism:
-
-```
-    *.md
-    !README.md
-```
-
-All markdown files *except* `README.md` are excluded from the context.
-
-The placement of `!` exception rules influences the behavior: the last
-line of the `.dockerignore` that matches a particular file determines
-whether it is included or excluded.  Consider the following example:
-
-```
-    *.md
-    !README*.md
-    README-secret.md
-```
-
-No markdown files are included in the context except README files other than
-`README-secret.md`.
-
-Now consider this example:
-
-```
-    *.md
-    README-secret.md
-    !README*.md
-```
-
-All of the README files are included.  The middle line has no effect because
-`!README*.md` matches `README-secret.md` and comes last.
-
-You can even use the `.dockerignore` file to exclude the `Dockerfile`
-and `.dockerignore` files.  These files are still sent to the daemon
-because it needs them to do its job.  But the `ADD` and `COPY` commands
-do not copy them to the image.
-
-Finally, you may want to specify which files to include in the
-context, rather than which to exclude. To achieve this, specify `*` as
-the first pattern, followed by one or more `!` exception patterns.
-
-**Note**: For historical reasons, the pattern `.` is ignored.
-
-## FROM
-
-    FROM <image>
-
-Or
-
-    FROM <image>:<tag>
-
-Or
-
-    FROM <image>@<digest>
-
-The `FROM` instruction sets the [*Base Image*](glossary.md#base-image)
-for subsequent instructions. As such, a valid `Dockerfile` must have `FROM` as
-its first instruction. The image can be any valid image – it is especially easy
-to start by **pulling an image** from the [*Public Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/).
-
-- `FROM` must be the first non-comment instruction in the `Dockerfile`.
-
-- `FROM` can appear multiple times within a single `Dockerfile` in order to create
-multiple images. Simply make a note of the last image ID output by the commit
-before each new `FROM` command.
-
-- The `tag` or `digest` values are optional. If you omit either of them, the builder
-assumes a `latest` by default. The builder returns an error if it cannot match
-the `tag` value.
-
-## RUN
-
-RUN has 2 forms:
-
-- `RUN <command>` (*shell* form, the command is run in a shell, which by
-default is `/bin/sh -c` on Linux or `cmd /S /C` on Windows)
-- `RUN ["executable", "param1", "param2"]` (*exec* form)
-
-The `RUN` instruction will execute any commands in a new layer on top of the
-current image and commit the results. The resulting committed image will be
-used for the next step in the `Dockerfile`.
-
-Layering `RUN` instructions and generating commits conforms to the core
-concepts of Docker where commits are cheap and containers can be created from
-any point in an image's history, much like source control.
-
-The *exec* form makes it possible to avoid shell string munging, and to `RUN`
-commands using a base image that does not contain the specified shell executable.
-
-The default shell for the *shell* form can be changed using the `SHELL`
-command.
-
-In the *shell* form you can use a `\` (backslash) to continue a single
-RUN instruction onto the next line. For example, consider these two lines:
-
-```
-RUN /bin/bash -c 'source $HOME/.bashrc; \
-echo $HOME'
-```
-Together they are equivalent to this single line:
-
-```
-RUN /bin/bash -c 'source $HOME/.bashrc; echo $HOME'
-```
-
-> **Note**:
-> To use a different shell, other than '/bin/sh', use the *exec* form
-> passing in the desired shell. For example,
-> `RUN ["/bin/bash", "-c", "echo hello"]`
-
-> **Note**:
-> The *exec* form is parsed as a JSON array, which means that
-> you must use double-quotes (") around words not single-quotes (').
-
-> **Note**:
-> Unlike the *shell* form, the *exec* form does not invoke a command shell.
-> This means that normal shell processing does not happen. For example,
-> `RUN [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`.
-> If you want shell processing then either use the *shell* form or execute
-> a shell directly, for example: `RUN [ "sh", "-c", "echo $HOME" ]`.
-> When using the exec form and executing a shell directly, as in the case for
-> the shell form, it is the shell that is doing the environment variable
-> expansion, not docker.
->
-> **Note**:
-> In the *JSON* form, it is necessary to escape backslashes. This is
-> particularly relevant on Windows where the backslash is the path separator.
-> The following line would otherwise be treated as *shell* form due to not
-> being valid JSON, and fail in an unexpected way:
-> `RUN ["c:\windows\system32\tasklist.exe"]`
-> The correct syntax for this example is:
-> `RUN ["c:\\windows\\system32\\tasklist.exe"]`
-
-The cache for `RUN` instructions isn't invalidated automatically during
-the next build. The cache for an instruction like
-`RUN apt-get dist-upgrade -y` will be reused during the next build. The
-cache for `RUN` instructions can be invalidated by using the `--no-cache`
-flag, for example `docker build --no-cache`.
-
-See the [`Dockerfile` Best Practices
-guide](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#/build-cache) for more information.
-
-The cache for `RUN` instructions can be invalidated by `ADD` instructions. See
-[below](#add) for details.
-
-### Known issues (RUN)
-
-- [Issue 783](https://github.com/docker/docker/issues/783) is about file
-  permissions problems that can occur when using the AUFS file system. You
-  might notice it during an attempt to `rm` a file, for example.
-
-  For systems that have recent aufs version (i.e., `dirperm1` mount option can
-  be set), docker will attempt to fix the issue automatically by mounting
-  the layers with `dirperm1` option. More details on `dirperm1` option can be
-  found at [`aufs` man page](https://github.com/sfjro/aufs3-linux/tree/aufs3.18/Documentation/filesystems/aufs)
-
-  If your system doesn't have support for `dirperm1`, the issue describes a workaround.
-
-## CMD
-
-The `CMD` instruction has three forms:
-
-- `CMD ["executable","param1","param2"]` (*exec* form, this is the preferred form)
-- `CMD ["param1","param2"]` (as *default parameters to ENTRYPOINT*)
-- `CMD command param1 param2` (*shell* form)
-
-There can only be one `CMD` instruction in a `Dockerfile`. If you list more than one `CMD`
-then only the last `CMD` will take effect.
-
-**The main purpose of a `CMD` is to provide defaults for an executing
-container.** These defaults can include an executable, or they can omit
-the executable, in which case you must specify an `ENTRYPOINT`
-instruction as well.
-
-> **Note**:
-> If `CMD` is used to provide default arguments for the `ENTRYPOINT`
-> instruction, both the `CMD` and `ENTRYPOINT` instructions should be specified
-> with the JSON array format.
-
-> **Note**:
-> The *exec* form is parsed as a JSON array, which means that
-> you must use double-quotes (") around words not single-quotes (').
-
-> **Note**:
-> Unlike the *shell* form, the *exec* form does not invoke a command shell.
-> This means that normal shell processing does not happen. For example,
-> `CMD [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`.
-> If you want shell processing then either use the *shell* form or execute
-> a shell directly, for example: `CMD [ "sh", "-c", "echo $HOME" ]`.
-> When using the exec form and executing a shell directly, as in the case for
-> the shell form, it is the shell that is doing the environment variable
-> expansion, not docker.
-
-When used in the shell or exec formats, the `CMD` instruction sets the command
-to be executed when running the image.
-
-If you use the *shell* form of the `CMD`, then the `<command>` will execute in
-`/bin/sh -c`:
-
-    FROM ubuntu
-    CMD echo "This is a test." | wc -
-
-If you want to **run your** `<command>` **without a shell** then you must
-express the command as a JSON array and give the full path to the executable.
-**This array form is the preferred format of `CMD`.** Any additional parameters
-must be individually expressed as strings in the array:
-
-    FROM ubuntu
-    CMD ["/usr/bin/wc","--help"]
-
-If you would like your container to run the same executable every time, then
-you should consider using `ENTRYPOINT` in combination with `CMD`. See
-[*ENTRYPOINT*](#entrypoint).
-
-If the user specifies arguments to `docker run` then they will override the
-default specified in `CMD`.
-
-> **Note**:
-> Don't confuse `RUN` with `CMD`. `RUN` actually runs a command and commits
-> the result; `CMD` does not execute anything at build time, but specifies
-> the intended command for the image.
-
-## LABEL
-
-    LABEL <key>=<value> <key>=<value> <key>=<value> ...
-
-The `LABEL` instruction adds metadata to an image. A `LABEL` is a
-key-value pair. To include spaces within a `LABEL` value, use quotes and
-backslashes as you would in command-line parsing. A few usage examples:
-
-    LABEL "com.example.vendor"="ACME Incorporated"
-    LABEL com.example.label-with-value="foo"
-    LABEL version="1.0"
-    LABEL description="This text illustrates \
-    that label-values can span multiple lines."
-
-An image can have more than one label. To specify multiple labels,
-Docker recommends combining labels into a single `LABEL` instruction where
-possible. Each `LABEL` instruction produces a new layer which can result in an
-inefficient image if you use many labels. This example results in a single image
-layer.
-
-    LABEL multi.label1="value1" multi.label2="value2" other="value3"
-
-The above can also be written as:
-
-    LABEL multi.label1="value1" \
-          multi.label2="value2" \
-          other="value3"
-
-Labels are additive including `LABEL`s in `FROM` images. If Docker
-encounters a label/key that already exists, the new value overrides any previous
-labels with identical keys.
-
-To view an image's labels, use the `docker inspect` command.
-
-    "Labels": {
-        "com.example.vendor": "ACME Incorporated"
-        "com.example.label-with-value": "foo",
-        "version": "1.0",
-        "description": "This text illustrates that label-values can span multiple lines.",
-        "multi.label1": "value1",
-        "multi.label2": "value2",
-        "other": "value3"
-    },
-
-## MAINTAINER (deprecated)
-
-    MAINTAINER <name>
-
-The `MAINTAINER` instruction sets the *Author* field of the generated images.
-The `LABEL` instruction is a much more flexible version of this and you should use
-it instead, as it enables setting any metadata you require, and can be viewed
-easily, for example with `docker inspect`. To set a label corresponding to the
-`MAINTAINER` field you could use:
-
-    LABEL maintainer "SvenDowideit@home.org.au"
-
-This will then be visible from `docker inspect` with the other labels.
-
-## EXPOSE
-
-    EXPOSE <port> [<port>...]
-
-The `EXPOSE` instruction informs Docker that the container listens on the
-specified network ports at runtime. `EXPOSE` does not make the ports of the
-container accessible to the host. To do that, you must use either the `-p` flag
-to publish a range of ports or the `-P` flag to publish all of the exposed
-ports. You can expose one port number and publish it externally under another
-number.
-
-To set up port redirection on the host system, see [using the -P
-flag](run.md#expose-incoming-ports). The Docker network feature supports
-creating networks without the need to expose ports within the network, for
-detailed information see the  [overview of this
-feature](https://docs.docker.com/engine/userguide/networking/)).
-
-## ENV
-
-    ENV <key> <value>
-    ENV <key>=<value> ...
-
-The `ENV` instruction sets the environment variable `<key>` to the value
-`<value>`. This value will be in the environment of all "descendant"
-`Dockerfile` commands and can be [replaced inline](#environment-replacement) in
-many as well.
-
-The `ENV` instruction has two forms. The first form, `ENV <key> <value>`,
-will set a single variable to a value. The entire string after the first
-space will be treated as the `<value>` - including characters such as
-spaces and quotes.
-
-The second form, `ENV <key>=<value> ...`, allows for multiple variables to
-be set at one time. Notice that the second form uses the equals sign (=)
-in the syntax, while the first form does not. Like command line parsing,
-quotes and backslashes can be used to include spaces within values.
-
-For example:
-
-    ENV myName="John Doe" myDog=Rex\ The\ Dog \
-        myCat=fluffy
-
-and
-
-    ENV myName John Doe
-    ENV myDog Rex The Dog
-    ENV myCat fluffy
-
-will yield the same net results in the final image, but the first form
-is preferred because it produces a single cache layer.
-
-The environment variables set using `ENV` will persist when a container is run
-from the resulting image. You can view the values using `docker inspect`, and
-change them using `docker run --env <key>=<value>`.
-
-> **Note**:
-> Environment persistence can cause unexpected side effects. For example,
-> setting `ENV DEBIAN_FRONTEND noninteractive` may confuse apt-get
-> users on a Debian-based image. To set a value for a single command, use
-> `RUN <key>=<value> <command>`.
-
-## ADD
-
-ADD has two forms:
-
-- `ADD <src>... <dest>`
-- `ADD ["<src>",... "<dest>"]` (this form is required for paths containing
-whitespace)
-
-The `ADD` instruction copies new files, directories or remote file URLs from `<src>`
-and adds them to the filesystem of the image at the path `<dest>`.
-
-Multiple `<src>` resource may be specified but if they are files or
-directories then they must be relative to the source directory that is
-being built (the context of the build).
-
-Each `<src>` may contain wildcards and matching will be done using Go's
-[filepath.Match](http://golang.org/pkg/path/filepath#Match) rules. For example:
-
-    ADD hom* /mydir/        # adds all files starting with "hom"
-    ADD hom?.txt /mydir/    # ? is replaced with any single character, e.g., "home.txt"
-
-The `<dest>` is an absolute path, or a path relative to `WORKDIR`, into which
-the source will be copied inside the destination container.
-
-    ADD test relativeDir/          # adds "test" to `WORKDIR`/relativeDir/
-    ADD test /absoluteDir/         # adds "test" to /absoluteDir/
-
-All new files and directories are created with a UID and GID of 0.
-
-In the case where `<src>` is a remote file URL, the destination will
-have permissions of 600. If the remote file being retrieved has an HTTP
-`Last-Modified` header, the timestamp from that header will be used
-to set the `mtime` on the destination file. However, like any other file
-processed during an `ADD`, `mtime` will not be included in the determination
-of whether or not the file has changed and the cache should be updated.
-
-> **Note**:
-> If you build by passing a `Dockerfile` through STDIN (`docker
-> build - < somefile`), there is no build context, so the `Dockerfile`
-> can only contain a URL based `ADD` instruction. You can also pass a
-> compressed archive through STDIN: (`docker build - < archive.tar.gz`),
-> the `Dockerfile` at the root of the archive and the rest of the
-> archive will be used as the context of the build.
-
-> **Note**:
-> If your URL files are protected using authentication, you
-> will need to use `RUN wget`, `RUN curl` or use another tool from
-> within the container as the `ADD` instruction does not support
-> authentication.
-
-> **Note**:
-> The first encountered `ADD` instruction will invalidate the cache for all
-> following instructions from the Dockerfile if the contents of `<src>` have
-> changed. This includes invalidating the cache for `RUN` instructions.
-> See the [`Dockerfile` Best Practices
-guide](https://docs.docker.com/engine/userguide/eng-image/dockerfile_best-practices/#/build-cache) for more information.
-
-
-`ADD` obeys the following rules:
-
-- The `<src>` path must be inside the *context* of the build;
-  you cannot `ADD ../something /something`, because the first step of a
-  `docker build` is to send the context directory (and subdirectories) to the
-  docker daemon.
-
-- If `<src>` is a URL and `<dest>` does not end with a trailing slash, then a
-  file is downloaded from the URL and copied to `<dest>`.
-
-- If `<src>` is a URL and `<dest>` does end with a trailing slash, then the
-  filename is inferred from the URL and the file is downloaded to
-  `<dest>/<filename>`. For instance, `ADD http://example.com/foobar /` would
-  create the file `/foobar`. The URL must have a nontrivial path so that an
-  appropriate filename can be discovered in this case (`http://example.com`
-  will not work).
-
-- If `<src>` is a directory, the entire contents of the directory are copied,
-  including filesystem metadata.
-
-> **Note**:
-> The directory itself is not copied, just its contents.
-
-- If `<src>` is a *local* tar archive in a recognized compression format
-  (identity, gzip, bzip2 or xz) then it is unpacked as a directory. Resources
-  from *remote* URLs are **not** decompressed. When a directory is copied or
-  unpacked, it has the same behavior as `tar -x`, the result is the union of:
-
-    1. Whatever existed at the destination path and
-    2. The contents of the source tree, with conflicts resolved in favor
-       of "2." on a file-by-file basis.
-
-  > **Note**:
-  > Whether a file is identified as a recognized compression format or not
-  > is done solely based on the contents of the file, not the name of the file.
-  > For example, if an empty file happens to end with `.tar.gz` this will not
-  > be recognized as a compressed file and **will not** generate any kind of
-  > decompression error message, rather the file will simply be copied to the
-  > destination.
-
-- If `<src>` is any other kind of file, it is copied individually along with
-  its metadata. In this case, if `<dest>` ends with a trailing slash `/`, it
-  will be considered a directory and the contents of `<src>` will be written
-  at `<dest>/base(<src>)`.
-
-- If multiple `<src>` resources are specified, either directly or due to the
-  use of a wildcard, then `<dest>` must be a directory, and it must end with
-  a slash `/`.
-
-- If `<dest>` does not end with a trailing slash, it will be considered a
-  regular file and the contents of `<src>` will be written at `<dest>`.
-
-- If `<dest>` doesn't exist, it is created along with all missing directories
-  in its path.
-
-## COPY
-
-COPY has two forms:
-
-- `COPY <src>... <dest>`
-- `COPY ["<src>",... "<dest>"]` (this form is required for paths containing
-whitespace)
-
-The `COPY` instruction copies new files or directories from `<src>`
-and adds them to the filesystem of the container at the path `<dest>`.
-
-Multiple `<src>` resource may be specified but they must be relative
-to the source directory that is being built (the context of the build).
-
-Each `<src>` may contain wildcards and matching will be done using Go's
-[filepath.Match](http://golang.org/pkg/path/filepath#Match) rules. For example:
-
-    COPY hom* /mydir/        # adds all files starting with "hom"
-    COPY hom?.txt /mydir/    # ? is replaced with any single character, e.g., "home.txt"
-
-The `<dest>` is an absolute path, or a path relative to `WORKDIR`, into which
-the source will be copied inside the destination container.
-
-    COPY test relativeDir/   # adds "test" to `WORKDIR`/relativeDir/
-    COPY test /absoluteDir/  # adds "test" to /absoluteDir/
-
-All new files and directories are created with a UID and GID of 0.
-
-> **Note**:
-> If you build using STDIN (`docker build - < somefile`), there is no
-> build context, so `COPY` can't be used.
-
-`COPY` obeys the following rules:
-
-- The `<src>` path must be inside the *context* of the build;
-  you cannot `COPY ../something /something`, because the first step of a
-  `docker build` is to send the context directory (and subdirectories) to the
-  docker daemon.
-
-- If `<src>` is a directory, the entire contents of the directory are copied,
-  including filesystem metadata.
-
-> **Note**:
-> The directory itself is not copied, just its contents.
-
-- If `<src>` is any other kind of file, it is copied individually along with
-  its metadata. In this case, if `<dest>` ends with a trailing slash `/`, it
-  will be considered a directory and the contents of `<src>` will be written
-  at `<dest>/base(<src>)`.
-
-- If multiple `<src>` resources are specified, either directly or due to the
-  use of a wildcard, then `<dest>` must be a directory, and it must end with
-  a slash `/`.
-
-- If `<dest>` does not end with a trailing slash, it will be considered a
-  regular file and the contents of `<src>` will be written at `<dest>`.
-
-- If `<dest>` doesn't exist, it is created along with all missing directories
-  in its path.
-
-## ENTRYPOINT
-
-ENTRYPOINT has two forms:
-
-- `ENTRYPOINT ["executable", "param1", "param2"]`
-  (*exec* form, preferred)
-- `ENTRYPOINT command param1 param2`
-  (*shell* form)
-
-An `ENTRYPOINT` allows you to configure a container that will run as an executable.
-
-For example, the following will start nginx with its default content, listening
-on port 80:
-
-    docker run -i -t --rm -p 80:80 nginx
-
-Command line arguments to `docker run <image>` will be appended after all
-elements in an *exec* form `ENTRYPOINT`, and will override all elements specified
-using `CMD`.
-This allows arguments to be passed to the entry point, i.e., `docker run <image> -d`
-will pass the `-d` argument to the entry point.
-You can override the `ENTRYPOINT` instruction using the `docker run --entrypoint`
-flag.
-
-The *shell* form prevents any `CMD` or `run` command line arguments from being
-used, but has the disadvantage that your `ENTRYPOINT` will be started as a
-subcommand of `/bin/sh -c`, which does not pass signals.
-This means that the executable will not be the container's `PID 1` - and
-will _not_ receive Unix signals - so your executable will not receive a
-`SIGTERM` from `docker stop <container>`.
-
-Only the last `ENTRYPOINT` instruction in the `Dockerfile` will have an effect.
-
-### Exec form ENTRYPOINT example
-
-You can use the *exec* form of `ENTRYPOINT` to set fairly stable default commands
-and arguments and then use either form of `CMD` to set additional defaults that
-are more likely to be changed.
-
-    FROM ubuntu
-    ENTRYPOINT ["top", "-b"]
-    CMD ["-c"]
-
-When you run the container, you can see that `top` is the only process:
-
-    $ docker run -it --rm --name test  top -H
-    top - 08:25:00 up  7:27,  0 users,  load average: 0.00, 0.01, 0.05
-    Threads:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-    %Cpu(s):  0.1 us,  0.1 sy,  0.0 ni, 99.7 id,  0.0 wa,  0.0 hi,  0.0 si,  0.0 st
-    KiB Mem:   2056668 total,  1616832 used,   439836 free,    99352 buffers
-    KiB Swap:  1441840 total,        0 used,  1441840 free.  1324440 cached Mem
-
-      PID USER      PR  NI    VIRT    RES    SHR S %CPU %MEM     TIME+ COMMAND
-        1 root      20   0   19744   2336   2080 R  0.0  0.1   0:00.04 top
-
-To examine the result further, you can use `docker exec`:
-
-    $ docker exec -it test ps aux
-    USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
-    root         1  2.6  0.1  19752  2352 ?        Ss+  08:24   0:00 top -b -H
-    root         7  0.0  0.1  15572  2164 ?        R+   08:25   0:00 ps aux
-
-And you can gracefully request `top` to shut down using `docker stop test`.
-
-The following `Dockerfile` shows using the `ENTRYPOINT` to run Apache in the
-foreground (i.e., as `PID 1`):
-
-```
-FROM debian:stable
-RUN apt-get update && apt-get install -y --force-yes apache2
-EXPOSE 80 443
-VOLUME ["/var/www", "/var/log/apache2", "/etc/apache2"]
-ENTRYPOINT ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]
-```
-
-If you need to write a starter script for a single executable, you can ensure that
-the final executable receives the Unix signals by using `exec` and `gosu`
-commands:
-
-```bash
-#!/bin/bash
-set -e
-
-if [ "$1" = 'postgres' ]; then
-    chown -R postgres "$PGDATA"
-
-    if [ -z "$(ls -A "$PGDATA")" ]; then
-        gosu postgres initdb
-    fi
-
-    exec gosu postgres "$@"
-fi
-
-exec "$@"
-```
-
-Lastly, if you need to do some extra cleanup (or communicate with other containers)
-on shutdown, or are co-ordinating more than one executable, you may need to ensure
-that the `ENTRYPOINT` script receives the Unix signals, passes them on, and then
-does some more work:
-
-```
-#!/bin/sh
-# Note: I've written this using sh so it works in the busybox container too
-
-# USE the trap if you need to also do manual cleanup after the service is stopped,
-#     or need to start multiple services in the one container
-trap "echo TRAPed signal" HUP INT QUIT TERM
-
-# start service in background here
-/usr/sbin/apachectl start
-
-echo "[hit enter key to exit] or run 'docker stop <container>'"
-read
-
-# stop service and clean up here
-echo "stopping apache"
-/usr/sbin/apachectl stop
-
-echo "exited $0"
-```
-
-If you run this image with `docker run -it --rm -p 80:80 --name test apache`,
-you can then examine the container's processes with `docker exec`, or `docker top`,
-and then ask the script to stop Apache:
-
-```bash
-$ docker exec -it test ps aux
-USER       PID %CPU %MEM    VSZ   RSS TTY      STAT START   TIME COMMAND
-root         1  0.1  0.0   4448   692 ?        Ss+  00:42   0:00 /bin/sh /run.sh 123 cmd cmd2
-root        19  0.0  0.2  71304  4440 ?        Ss   00:42   0:00 /usr/sbin/apache2 -k start
-www-data    20  0.2  0.2 360468  6004 ?        Sl   00:42   0:00 /usr/sbin/apache2 -k start
-www-data    21  0.2  0.2 360468  6000 ?        Sl   00:42   0:00 /usr/sbin/apache2 -k start
-root        81  0.0  0.1  15572  2140 ?        R+   00:44   0:00 ps aux
-$ docker top test
-PID                 USER                COMMAND
-10035               root                {run.sh} /bin/sh /run.sh 123 cmd cmd2
-10054               root                /usr/sbin/apache2 -k start
-10055               33                  /usr/sbin/apache2 -k start
-10056               33                  /usr/sbin/apache2 -k start
-$ /usr/bin/time docker stop test
-test
-real	0m 0.27s
-user	0m 0.03s
-sys	0m 0.03s
-```
-
-> **Note:** you can override the `ENTRYPOINT` setting using `--entrypoint`,
-> but this can only set the binary to *exec* (no `sh -c` will be used).
-
-> **Note**:
-> The *exec* form is parsed as a JSON array, which means that
-> you must use double-quotes (") around words not single-quotes (').
-
-> **Note**:
-> Unlike the *shell* form, the *exec* form does not invoke a command shell.
-> This means that normal shell processing does not happen. For example,
-> `ENTRYPOINT [ "echo", "$HOME" ]` will not do variable substitution on `$HOME`.
-> If you want shell processing then either use the *shell* form or execute
-> a shell directly, for example: `ENTRYPOINT [ "sh", "-c", "echo $HOME" ]`.
-> When using the exec form and executing a shell directly, as in the case for
-> the shell form, it is the shell that is doing the environment variable
-> expansion, not docker.
-
-### Shell form ENTRYPOINT example
-
-You can specify a plain string for the `ENTRYPOINT` and it will execute in `/bin/sh -c`.
-This form will use shell processing to substitute shell environment variables,
-and will ignore any `CMD` or `docker run` command line arguments.
-To ensure that `docker stop` will signal any long running `ENTRYPOINT` executable
-correctly, you need to remember to start it with `exec`:
-
-    FROM ubuntu
-    ENTRYPOINT exec top -b
-
-When you run this image, you'll see the single `PID 1` process:
-
-    $ docker run -it --rm --name test top
-    Mem: 1704520K used, 352148K free, 0K shrd, 0K buff, 140368121167873K cached
-    CPU:   5% usr   0% sys   0% nic  94% idle   0% io   0% irq   0% sirq
-    Load average: 0.08 0.03 0.05 2/98 6
-      PID  PPID USER     STAT   VSZ %VSZ %CPU COMMAND
-        1     0 root     R     3164   0%   0% top -b
-
-Which will exit cleanly on `docker stop`:
-
-    $ /usr/bin/time docker stop test
-    test
-    real	0m 0.20s
-    user	0m 0.02s
-    sys	0m 0.04s
-
-If you forget to add `exec` to the beginning of your `ENTRYPOINT`:
-
-    FROM ubuntu
-    ENTRYPOINT top -b
-    CMD --ignored-param1
-
-You can then run it (giving it a name for the next step):
-
-    $ docker run -it --name test top --ignored-param2
-    Mem: 1704184K used, 352484K free, 0K shrd, 0K buff, 140621524238337K cached
-    CPU:   9% usr   2% sys   0% nic  88% idle   0% io   0% irq   0% sirq
-    Load average: 0.01 0.02 0.05 2/101 7
-      PID  PPID USER     STAT   VSZ %VSZ %CPU COMMAND
-        1     0 root     S     3168   0%   0% /bin/sh -c top -b cmd cmd2
-        7     1 root     R     3164   0%   0% top -b
-
-You can see from the output of `top` that the specified `ENTRYPOINT` is not `PID 1`.
-
-If you then run `docker stop test`, the container will not exit cleanly - the
-`stop` command will be forced to send a `SIGKILL` after the timeout:
-
-    $ docker exec -it test ps aux
-    PID   USER     COMMAND
-        1 root     /bin/sh -c top -b cmd cmd2
-        7 root     top -b
-        8 root     ps aux
-    $ /usr/bin/time docker stop test
-    test
-    real	0m 10.19s
-    user	0m 0.04s
-    sys	0m 0.03s
-
-### Understand how CMD and ENTRYPOINT interact
-
-Both `CMD` and `ENTRYPOINT` instructions define what command gets executed when running a container.
-There are few rules that describe their co-operation.
-
-1. Dockerfile should specify at least one of `CMD` or `ENTRYPOINT` commands.
-
-2. `ENTRYPOINT` should be defined when using the container as an executable.
-
-3. `CMD` should be used as a way of defining default arguments for an `ENTRYPOINT` command
-or for executing an ad-hoc command in a container.
-
-4. `CMD` will be overridden when running the container with alternative arguments.
-
-The table below shows what command is executed for different `ENTRYPOINT` / `CMD` combinations:
-
-|                                | No ENTRYPOINT              | ENTRYPOINT exec_entry p1_entry | ENTRYPOINT ["exec_entry", "p1_entry"]          |
-|--------------------------------|----------------------------|--------------------------------|------------------------------------------------|
-| **No CMD**                     | *error, not allowed*       | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry                            |
-| **CMD ["exec_cmd", "p1_cmd"]** | exec_cmd p1_cmd            | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry exec_cmd p1_cmd            |
-| **CMD ["p1_cmd", "p2_cmd"]**   | p1_cmd p2_cmd              | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry p1_cmd p2_cmd              |
-| **CMD exec_cmd p1_cmd**        | /bin/sh -c exec_cmd p1_cmd | /bin/sh -c exec_entry p1_entry | exec_entry p1_entry /bin/sh -c exec_cmd p1_cmd |
-
-## VOLUME
-
-    VOLUME ["/data"]
-
-The `VOLUME` instruction creates a mount point with the specified name
-and marks it as holding externally mounted volumes from native host or other
-containers. The value can be a JSON array, `VOLUME ["/var/log/"]`, or a plain
-string with multiple arguments, such as `VOLUME /var/log` or `VOLUME /var/log
-/var/db`. For more information/examples and mounting instructions via the
-Docker client, refer to
-[*Share Directories via Volumes*](https://docs.docker.com/engine/tutorials/dockervolumes/#/mount-a-host-directory-as-a-data-volume)
-documentation.
-
-The `docker run` command initializes the newly created volume with any data
-that exists at the specified location within the base image. For example,
-consider the following Dockerfile snippet:
-
-    FROM ubuntu
-    RUN mkdir /myvol
-    RUN echo "hello world" > /myvol/greeting
-    VOLUME /myvol
-
-This Dockerfile results in an image that causes `docker run`, to
-create a new mount point at `/myvol` and copy the  `greeting` file
-into the newly created volume.
-
-> **Note**:
-> If any build steps change the data within the volume after it has been
-> declared, those changes will be discarded.
-
-> **Note**:
-> The list is parsed as a JSON array, which means that
-> you must use double-quotes (") around words not single-quotes (').
-
-## USER
-
-    USER daemon
-
-The `USER` instruction sets the user name or UID to use when running the image
-and for any `RUN`, `CMD` and `ENTRYPOINT` instructions that follow it in the
-`Dockerfile`.
-
-## WORKDIR
-
-    WORKDIR /path/to/workdir
-
-The `WORKDIR` instruction sets the working directory for any `RUN`, `CMD`,
-`ENTRYPOINT`, `COPY` and `ADD` instructions that follow it in the `Dockerfile`.
-If the `WORKDIR` doesn't exist, it will be created even if it's not used in any
-subsequent `Dockerfile` instruction.
-
-It can be used multiple times in the one `Dockerfile`. If a relative path
-is provided, it will be relative to the path of the previous `WORKDIR`
-instruction. For example:
-
-    WORKDIR /a
-    WORKDIR b
-    WORKDIR c
-    RUN pwd
-
-The output of the final `pwd` command in this `Dockerfile` would be
-`/a/b/c`.
-
-The `WORKDIR` instruction can resolve environment variables previously set using
-`ENV`. You can only use environment variables explicitly set in the `Dockerfile`.
-For example:
-
-    ENV DIRPATH /path
-    WORKDIR $DIRPATH/$DIRNAME
-    RUN pwd
-
-The output of the final `pwd` command in this `Dockerfile` would be
-`/path/$DIRNAME`
-
-## ARG
-
-    ARG <name>[=<default value>]
-
-The `ARG` instruction defines a variable that users can pass at build-time to
-the builder with the `docker build` command using the `--build-arg <varname>=<value>`
-flag. If a user specifies a build argument that was not
-defined in the Dockerfile, the build outputs a warning.
-
-```
-[Warning] One or more build-args [foo] were not consumed.
-```
-
-The Dockerfile author can define a single variable by specifying `ARG` once or many
-variables by specifying `ARG` more than once. For example, a valid Dockerfile:
-
-```
-FROM busybox
-ARG user1
-ARG buildno
-...
-```
-
-A Dockerfile author may optionally specify a default value for an `ARG` instruction:
-
-```
-FROM busybox
-ARG user1=someuser
-ARG buildno=1
-...
-```
-
-If an `ARG` value has a default and if there is no value passed at build-time, the
-builder uses the default.
-
-An `ARG` variable definition comes into effect from the line on which it is
-defined in the `Dockerfile` not from the argument's use on the command-line or
-elsewhere.  For example, consider this Dockerfile:
-
-```
-1 FROM busybox
-2 USER ${user:-some_user}
-3 ARG user
-4 USER $user
-...
-```
-A user builds this file by calling:
-
-```
-$ docker build --build-arg user=what_user Dockerfile
-```
-
-The `USER` at line 2 evaluates to `some_user` as the `user` variable is defined on the
-subsequent line 3. The `USER` at line 4 evaluates to `what_user` as `user` is
-defined and the `what_user` value was passed on the command line. Prior to its definition by an
-`ARG` instruction, any use of a variable results in an empty string.
-
-> **Warning:** It is not recommended to use build-time variables for
->  passing secrets like github keys, user credentials etc. Build-time variable
->  values are visible to any user of the image with the `docker history` command.
-
-You can use an `ARG` or an `ENV` instruction to specify variables that are
-available to the `RUN` instruction. Environment variables defined using the
-`ENV` instruction always override an `ARG` instruction of the same name. Consider
-this Dockerfile with an `ENV` and `ARG` instruction.
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 ENV CONT_IMG_VER v1.0.0
-4 RUN echo $CONT_IMG_VER
-```
-Then, assume this image is built with this command:
-
-```
-$ docker build --build-arg CONT_IMG_VER=v2.0.1 Dockerfile
-```
-
-In this case, the `RUN` instruction uses `v1.0.0` instead of the `ARG` setting
-passed by the user:`v2.0.1` This behavior is similar to a shell
-script where a locally scoped variable overrides the variables passed as
-arguments or inherited from environment, from its point of definition.
-
-Using the example above but a different `ENV` specification you can create more
-useful interactions between `ARG` and `ENV` instructions:
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 ENV CONT_IMG_VER ${CONT_IMG_VER:-v1.0.0}
-4 RUN echo $CONT_IMG_VER
-```
-
-Unlike an `ARG` instruction, `ENV` values are always persisted in the built
-image. Consider a docker build without the `--build-arg` flag:
-
-```
-$ docker build Dockerfile
-```
-
-Using this Dockerfile example, `CONT_IMG_VER` is still persisted in the image but
-its value would be `v1.0.0` as it is the default set in line 3 by the `ENV` instruction.
-
-The variable expansion technique in this example allows you to pass arguments
-from the command line and persist them in the final image by leveraging the
-`ENV` instruction. Variable expansion is only supported for [a limited set of
-Dockerfile instructions.](#environment-replacement)
-
-Docker has a set of predefined `ARG` variables that you can use without a
-corresponding `ARG` instruction in the Dockerfile.
-
-* `HTTP_PROXY`
-* `http_proxy`
-* `HTTPS_PROXY`
-* `https_proxy`
-* `FTP_PROXY`
-* `ftp_proxy`
-* `NO_PROXY`
-* `no_proxy`
-
-To use these, simply pass them on the command line using the flag:
-
-```
---build-arg <varname>=<value>
-```
-
-### Impact on build caching
-
-`ARG` variables are not persisted into the built image as `ENV` variables are.
-However, `ARG` variables do impact the build cache in similar ways. If a
-Dockerfile defines an `ARG` variable whose value is different from a previous
-build, then a "cache miss" occurs upon its first usage, not its definition. In
-particular, all `RUN` instructions following an `ARG` instruction use the `ARG`
-variable implicitly (as an environment variable), thus can cause a cache miss.
-
-For example, consider these two Dockerfile:
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 RUN echo $CONT_IMG_VER
-```
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 RUN echo hello
-```
-
-If you specify `--build-arg CONT_IMG_VER=<value>` on the command line, in both
-cases, the specification on line 2 does not cause a cache miss; line 3 does
-cause a cache miss.`ARG CONT_IMG_VER` causes the RUN line to be identified
-as the same as running `CONT_IMG_VER=<value>` echo hello, so if the `<value>`
-changes, we get a cache miss.
-
-Consider another example under the same command line:
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 ENV CONT_IMG_VER $CONT_IMG_VER
-4 RUN echo $CONT_IMG_VER
-```
-In this example, the cache miss occurs on line 3. The miss happens because
-the variable's value in the `ENV` references the `ARG` variable and that
-variable is changed through the command line. In this example, the `ENV`
-command causes the image to include the value.
-
-If an `ENV` instruction overrides an `ARG` instruction of the same name, like
-this Dockerfile:
-
-```
-1 FROM ubuntu
-2 ARG CONT_IMG_VER
-3 ENV CONT_IMG_VER hello
-4 RUN echo $CONT_IMG_VER
-```
-
-Line 3 does not cause a cache miss because the value of `CONT_IMG_VER` is a
-constant (`hello`). As a result, the environment variables and values used on
-the `RUN` (line 4) doesn't change between builds.
-
-## ONBUILD
-
-    ONBUILD [INSTRUCTION]
-
-The `ONBUILD` instruction adds to the image a *trigger* instruction to
-be executed at a later time, when the image is used as the base for
-another build. The trigger will be executed in the context of the
-downstream build, as if it had been inserted immediately after the
-`FROM` instruction in the downstream `Dockerfile`.
-
-Any build instruction can be registered as a trigger.
-
-This is useful if you are building an image which will be used as a base
-to build other images, for example an application build environment or a
-daemon which may be customized with user-specific configuration.
-
-For example, if your image is a reusable Python application builder, it
-will require application source code to be added in a particular
-directory, and it might require a build script to be called *after*
-that. You can't just call `ADD` and `RUN` now, because you don't yet
-have access to the application source code, and it will be different for
-each application build. You could simply provide application developers
-with a boilerplate `Dockerfile` to copy-paste into their application, but
-that is inefficient, error-prone and difficult to update because it
-mixes with application-specific code.
-
-The solution is to use `ONBUILD` to register advance instructions to
-run later, during the next build stage.
-
-Here's how it works:
-
-1. When it encounters an `ONBUILD` instruction, the builder adds a
-   trigger to the metadata of the image being built. The instruction
-   does not otherwise affect the current build.
-2. At the end of the build, a list of all triggers is stored in the
-   image manifest, under the key `OnBuild`. They can be inspected with
-   the `docker inspect` command.
-3. Later the image may be used as a base for a new build, using the
-   `FROM` instruction. As part of processing the `FROM` instruction,
-   the downstream builder looks for `ONBUILD` triggers, and executes
-   them in the same order they were registered. If any of the triggers
-   fail, the `FROM` instruction is aborted which in turn causes the
-   build to fail. If all triggers succeed, the `FROM` instruction
-   completes and the build continues as usual.
-4. Triggers are cleared from the final image after being executed. In
-   other words they are not inherited by "grand-children" builds.
-
-For example you might add something like this:
-
-    [...]
-    ONBUILD ADD . /app/src
-    ONBUILD RUN /usr/local/bin/python-build --dir /app/src
-    [...]
-
-> **Warning**: Chaining `ONBUILD` instructions using `ONBUILD ONBUILD` isn't allowed.
-
-> **Warning**: The `ONBUILD` instruction may not trigger `FROM` or `MAINTAINER` instructions.
-
-## STOPSIGNAL
-
-    STOPSIGNAL signal
-
-The `STOPSIGNAL` instruction sets the system call signal that will be sent to the container to exit.
-This signal can be a valid unsigned number that matches a position in the kernel's syscall table, for instance 9,
-or a signal name in the format SIGNAME, for instance SIGKILL.
-
-## HEALTHCHECK
-
-The `HEALTHCHECK` instruction has two forms:
-
-* `HEALTHCHECK [OPTIONS] CMD command` (check container health by running a command inside the container)
-* `HEALTHCHECK NONE` (disable any healthcheck inherited from the base image)
-
-The `HEALTHCHECK` instruction tells Docker how to test a container to check that
-it is still working. This can detect cases such as a web server that is stuck in
-an infinite loop and unable to handle new connections, even though the server
-process is still running.
-
-When a container has a healthcheck specified, it has a _health status_ in
-addition to its normal status. This status is initially `starting`. Whenever a
-health check passes, it becomes `healthy` (whatever state it was previously in).
-After a certain number of consecutive failures, it becomes `unhealthy`.
-
-The options that can appear before `CMD` are:
-
-* `--interval=DURATION` (default: `30s`)
-* `--timeout=DURATION` (default: `30s`)
-* `--retries=N` (default: `3`)
-
-The health check will first run **interval** seconds after the container is
-started, and then again **interval** seconds after each previous check completes.
-
-If a single run of the check takes longer than **timeout** seconds then the check
-is considered to have failed.
-
-It takes **retries** consecutive failures of the health check for the container
-to be considered `unhealthy`.
-
-There can only be one `HEALTHCHECK` instruction in a Dockerfile. If you list
-more than one then only the last `HEALTHCHECK` will take effect.
-
-The command after the `CMD` keyword can be either a shell command (e.g. `HEALTHCHECK
-CMD /bin/check-running`) or an _exec_ array (as with other Dockerfile commands;
-see e.g. `ENTRYPOINT` for details).
-
-The command's exit status indicates the health status of the container.
-The possible values are:
-
-- 0: success - the container is healthy and ready for use
-- 1: unhealthy - the container is not working correctly
-- 2: reserved - do not use this exit code
-
-For example, to check every five minutes or so that a web-server is able to
-serve the site's main page within three seconds:
-
-    HEALTHCHECK --interval=5m --timeout=3s \
-      CMD curl -f http://localhost/ || exit 1
-
-To help debug failing probes, any output text (UTF-8 encoded) that the command writes
-on stdout or stderr will be stored in the health status and can be queried with
-`docker inspect`. Such output should be kept short (only the first 4096 bytes
-are stored currently).
-
-When the health status of a container changes, a `health_status` event is
-generated with the new status.
-
-The `HEALTHCHECK` feature was added in Docker 1.12.
-
-
-## SHELL
-
-    SHELL ["executable", "parameters"]
-
-The `SHELL` instruction allows the default shell used for the *shell* form of
-commands to be overridden. The default shell on Linux is `["/bin/sh", "-c"]`, and on
-Windows is `["cmd", "/S", "/C"]`. The `SHELL` instruction *must* be written in JSON
-form in a Dockerfile.
-
-The `SHELL` instruction is particularly useful on Windows where there are
-two commonly used and quite different native shells: `cmd` and `powershell`, as
-well as alternate shells available including `sh`.
-
-The `SHELL` instruction can appear multiple times. Each `SHELL` instruction overrides
-all previous `SHELL` instructions, and affects all subsequent instructions. For example:
-
-    FROM microsoft/windowsservercore
-
-    # Executed as cmd /S /C echo default
-    RUN echo default
-
-    # Executed as cmd /S /C powershell -command Write-Host default
-    RUN powershell -command Write-Host default
-
-    # Executed as powershell -command Write-Host hello
-    SHELL ["powershell", "-command"]
-    RUN Write-Host hello
-
-    # Executed as cmd /S /C echo hello
-    SHELL ["cmd", "/S"", "/C"]
-    RUN echo hello
-
-The following instructions can be affected by the `SHELL` instruction when the
-*shell* form of them is used in a Dockerfile: `RUN`, `CMD` and `ENTRYPOINT`.
-
-The following example is a common pattern found on Windows which can be
-streamlined by using the `SHELL` instruction:
-
-    ...
-    RUN powershell -command Execute-MyCmdlet -param1 "c:\foo.txt"
-    ...
-
-The command invoked by docker will be:
-
-    cmd /S /C powershell -command Execute-MyCmdlet -param1 "c:\foo.txt"
-
-This is inefficient for two reasons. First, there is an un-necessary cmd.exe command
-processor (aka shell) being invoked. Second, each `RUN` instruction in the *shell*
-form requires an extra `powershell -command` prefixing the command.
-
-To make this more efficient, one of two mechanisms can be employed. One is to
-use the JSON form of the RUN command such as:
-
-    ...
-    RUN ["powershell", "-command", "Execute-MyCmdlet", "-param1 \"c:\\foo.txt\""]
-    ...
-
-While the JSON form is unambiguous and does not use the un-necessary cmd.exe,
-it does require more verbosity through double-quoting and escaping. The alternate
-mechanism is to use the `SHELL` instruction and the *shell* form,
-making a more natural syntax for Windows users, especially when combined with
-the `escape` parser directive:
-
-    # escape=`
-
-    FROM microsoft/nanoserver
-    SHELL ["powershell","-command"]
-    RUN New-Item -ItemType Directory C:\Example
-    ADD Execute-MyCmdlet.ps1 c:\example\
-    RUN c:\example\Execute-MyCmdlet -sample 'hello world'
-
-Resulting in:
-
-    PS E:\docker\build\shell> docker build -t shell .
-    Sending build context to Docker daemon 4.096 kB
-    Step 1/5 : FROM microsoft/nanoserver
-     ---> 22738ff49c6d
-    Step 2/5 : SHELL powershell -command
-     ---> Running in 6fcdb6855ae2
-     ---> 6331462d4300
-    Removing intermediate container 6fcdb6855ae2
-    Step 3/5 : RUN New-Item -ItemType Directory C:\Example
-     ---> Running in d0eef8386e97
-    
-    
-        Directory: C:\
-    
-    
-    Mode                LastWriteTime         Length Name
-    ----                -------------         ------ ----
-    d-----       10/28/2016  11:26 AM                Example
-    
-    
-     ---> 3f2fbf1395d9
-    Removing intermediate container d0eef8386e97
-    Step 4/5 : ADD Execute-MyCmdlet.ps1 c:\example\
-     ---> a955b2621c31
-    Removing intermediate container b825593d39fc
-    Step 5/5 : RUN c:\example\Execute-MyCmdlet 'hello world'
-     ---> Running in be6d8e63fe75
-    hello world
-     ---> 8e559e9bf424
-    Removing intermediate container be6d8e63fe75
-    Successfully built 8e559e9bf424
-    PS E:\docker\build\shell>
-
-The `SHELL` instruction could also be used to modify the way in which
-a shell operates. For example, using `SHELL cmd /S /C /V:ON|OFF` on Windows, delayed
-environment variable expansion semantics could be modified.
-
-The `SHELL` instruction can also be used on Linux should an alternate shell be
-required such as `zsh`, `csh`, `tcsh` and others.
-
-The `SHELL` feature was added in Docker 1.12.
-
-## Dockerfile examples
-
-Below you can see some examples of Dockerfile syntax. If you're interested in
-something more realistic, take a look at the list of [Dockerization examples](https://docs.docker.com/engine/examples/).
-
-```
-# Nginx
-#
-# VERSION               0.0.1
-
-FROM      ubuntu
-LABEL Description="This image is used to start the foobar executable" Vendor="ACME Products" Version="1.0"
-RUN apt-get update && apt-get install -y inotify-tools nginx apache2 openssh-server
-```
-
-```
-# Firefox over VNC
-#
-# VERSION               0.3
-
-FROM ubuntu
-
-# Install vnc, xvfb in order to create a 'fake' display and firefox
-RUN apt-get update && apt-get install -y x11vnc xvfb firefox
-RUN mkdir ~/.vnc
-# Setup a password
-RUN x11vnc -storepasswd 1234 ~/.vnc/passwd
-# Autostart firefox (might not be the best way, but it does the trick)
-RUN bash -c 'echo "firefox" >> /.bashrc'
-
-EXPOSE 5900
-CMD    ["x11vnc", "-forever", "-usepw", "-create"]
-```
-
-```
-# Multiple images example
-#
-# VERSION               0.1
-
-FROM ubuntu
-RUN echo foo > bar
-# Will output something like ===> 907ad6c2736f
-
-FROM ubuntu
-RUN echo moo > oink
-# Will output something like ===> 695d7793cbe4
-
-# You᾿ll now have two images, 907ad6c2736f with /bar, and 695d7793cbe4 with
-# /oink.
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/attach.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/attach.md
deleted file mode 100644
index 307068a339..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/attach.md
+++ /dev/null
@@ -1,131 +0,0 @@
----
-title: "attach"
-description: "The attach command description and usage"
-keywords: "attach, running, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# attach
-
-```markdown
-Usage: docker attach [OPTIONS] CONTAINER
-
-Attach to a running container
-
-Options:
-      --detach-keys string   Override the key sequence for detaching a container
-      --help                 Print usage
-      --no-stdin             Do not attach STDIN
-      --sig-proxy            Proxy all received signals to the process (default true)
-```
-
-Use `docker attach` to attach to a running container using the container's ID
-or name, either to view its ongoing output or to control it interactively.
-You can attach to the same contained process multiple times simultaneously,
-screen sharing style, or quickly view the progress of your detached process.
-
-To stop a container, use `CTRL-c`. This key sequence sends `SIGKILL` to the
-container. If `--sig-proxy` is true (the default),`CTRL-c` sends a `SIGINT` to
-the container. You can detach from a container and leave it running using the
- `CTRL-p CTRL-q` key sequence.
-
-> **Note:**
-> A process running as PID 1 inside a container is treated specially by
-> Linux: it ignores any signal with the default action. So, the process
-> will not terminate on `SIGINT` or `SIGTERM` unless it is coded to do
-> so.
-
-It is forbidden to redirect the standard input of a `docker attach` command
-while attaching to a tty-enabled container (i.e.: launched with `-t`).
-
-While a client is connected to container's stdio using `docker attach`, Docker
-uses a ~1MB memory buffer to maximize the throughput of the application. If
-this buffer is filled, the speed of the API connection will start to have an
-effect on the process output writing speed. This is similar to other
-applications like SSH. Because of this, it is not recommended to run
-performance critical applications that generate a lot of output in the
-foreground over a slow client connection. Instead, users should use the
-`docker logs` command to get access to the logs.
-
-
-## Override the detach sequence
-
-If you want, you can configure an override the Docker key sequence for detach.
-This is useful if the Docker default sequence conflicts with key sequence you
-use for other applications. There are two ways to define your own detach key
-sequence, as a per-container override or as a configuration property on  your
-entire configuration.
-
-To override the sequence for an individual container, use the
-`--detach-keys="<sequence>"` flag with the `docker attach` command. The format of
-the `<sequence>` is either a letter [a-Z], or the `ctrl-` combined with any of
-the following:
-
-* `a-z` (a single lowercase alpha character )
-* `@` (at sign)
-* `[` (left bracket)
-* `\\` (two backward slashes)
-*  `_` (underscore)
-* `^` (caret)
-
-These `a`, `ctrl-a`, `X`, or `ctrl-\\` values are all examples of valid key
-sequences. To configure a different configuration default key sequence for all
-containers, see [**Configuration file** section](cli.md#configuration-files).
-
-#### Examples
-
-    $ docker run -d --name topdemo ubuntu /usr/bin/top -b
-    $ docker attach topdemo
-    top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-    Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-    Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-    Mem:    373572k total,   355560k used,    18012k free,    27872k buffers
-    Swap:   786428k total,        0k used,   786428k free,   221740k cached
-
-    PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-     1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top
-
-     top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-     Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-     Mem:    373572k total,   355244k used,    18328k free,    27872k buffers
-     Swap:   786428k total,        0k used,   786428k free,   221776k cached
-
-       PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-           1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top
-
-
-     top - 02:05:58 up  3:06,  0 users,  load average: 0.01, 0.02, 0.05
-     Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-     Cpu(s):  0.2%us,  0.3%sy,  0.0%ni, 99.5%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-     Mem:    373572k total,   355780k used,    17792k free,    27880k buffers
-     Swap:   786428k total,        0k used,   786428k free,   221776k cached
-
-     PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-          1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top
-    ^C$
-    $ echo $?
-    0
-    $ docker ps -a | grep topdemo
-    7998ac8581f9        ubuntu:14.04        "/usr/bin/top -b"   38 seconds ago      Exited (0) 21 seconds ago                          topdemo
-
-And in this second example, you can see the exit code returned by the `bash`
-process is returned by the `docker attach` command to its caller too:
-
-    $ docker run --name test -d -it debian
-    275c44472aebd77c926d4527885bb09f2f6db21d878c75f0a1c212c03d3bcfab
-    $ docker attach test
-    root@f38c87f2a42d:/# exit 13
-    exit
-    $ echo $?
-    13
-    $ docker ps -a | grep test
-    275c44472aeb        debian:7            "/bin/bash"         26 seconds ago      Exited (13) 17 seconds ago                         test
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/build.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/build.md
deleted file mode 100644
index 42c3ecf65f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/build.md
+++ /dev/null
@@ -1,451 +0,0 @@
----
-title: "build"
-description: "The build command description and usage"
-keywords: "build, docker, image"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# build
-
-```markdown
-Usage:  docker build [OPTIONS] PATH | URL | -
-
-Build an image from a Dockerfile
-
-Options:
-      --build-arg value         Set build-time variables (default [])
-      --cache-from value        Images to consider as cache sources (default [])
-      --cgroup-parent string    Optional parent cgroup for the container
-      --compress                Compress the build context using gzip
-      --cpu-period int          Limit the CPU CFS (Completely Fair Scheduler) period
-      --cpu-quota int           Limit the CPU CFS (Completely Fair Scheduler) quota
-  -c, --cpu-shares int          CPU shares (relative weight)
-      --cpuset-cpus string      CPUs in which to allow execution (0-3, 0,1)
-      --cpuset-mems string      MEMs in which to allow execution (0-3, 0,1)
-      --disable-content-trust   Skip image verification (default true)
-  -f, --file string             Name of the Dockerfile (Default is 'PATH/Dockerfile')
-      --force-rm                Always remove intermediate containers
-      --help                    Print usage
-      --isolation string        Container isolation technology
-      --label value             Set metadata for an image (default [])
-  -m, --memory string           Memory limit
-      --memory-swap string      Swap limit equal to memory plus swap: '-1' to enable unlimited swap
-      --network string          Set the networking mode for the RUN instructions during build
-                                'bridge': use default Docker bridge
-                                'none': no networking
-                                'container:<name|id>': reuse another container's network stack
-                                'host': use the Docker host network stack
-                                '<network-name>|<network-id>': connect to a user-defined network
-      --no-cache                Do not use cache when building the image
-      --pull                    Always attempt to pull a newer version of the image
-  -q, --quiet                   Suppress the build output and print image ID on success
-      --rm                      Remove intermediate containers after a successful build (default true)
-      --security-opt value      Security Options (default [])
-      --shm-size string         Size of /dev/shm, default value is 64MB.
-                                The format is `<number><unit>`. `number` must be greater than `0`.
-                                Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes),
-                                or `g` (gigabytes). If you omit the unit, the system uses bytes.
-      --squash                  Squash newly built layers into a single new layer (**Experimental Only**)
-  -t, --tag value               Name and optionally a tag in the 'name:tag' format (default [])
-      --ulimit value            Ulimit options (default [])
-```
-
-Builds Docker images from a Dockerfile and a "context". A build's context is
-the files located in the specified `PATH` or `URL`. The build process can refer
-to any of the files in the context. For example, your build can use an
-[*ADD*](../builder.md#add) instruction to reference a file in the
-context.
-
-The `URL` parameter can refer to three kinds of resources: Git repositories,
-pre-packaged tarball contexts and plain text files.
-
-### Git repositories
-
-When the `URL` parameter points to the location of a Git repository, the
-repository acts as the build context. The system recursively clones the
-repository and its submodules using a `git clone --depth 1 --recursive`
-command. This command runs in a temporary directory on your local host. After
-the command succeeds, the directory is sent to the Docker daemon as the
-context. Local clones give you the ability to access private repositories using
-local user credentials, VPN's, and so forth.
-
-Git URLs accept context configuration in their fragment section, separated by a
-colon `:`.  The first part represents the reference that Git will check out,
-this can be either a branch, a tag, or a commit SHA. The second part represents
-a subdirectory inside the repository that will be used as a build context.
-
-For example, run this command to use a directory called `docker` in the branch
-`container`:
-
-```bash
-$ docker build https://github.com/docker/rootfs.git#container:docker
-```
-
-The following table represents all the valid suffixes with their build
-contexts:
-
-Build Syntax Suffix             | Commit Used           | Build Context Used
---------------------------------|-----------------------|-------------------
-`myrepo.git`                    | `refs/heads/master`   | `/`
-`myrepo.git#mytag`              | `refs/tags/mytag`     | `/`
-`myrepo.git#mybranch`           | `refs/heads/mybranch` | `/`
-`myrepo.git#abcdef`             | `sha1 = abcdef`       | `/`
-`myrepo.git#:myfolder`          | `refs/heads/master`   | `/myfolder`
-`myrepo.git#master:myfolder`    | `refs/heads/master`   | `/myfolder`
-`myrepo.git#mytag:myfolder`     | `refs/tags/mytag`     | `/myfolder`
-`myrepo.git#mybranch:myfolder`  | `refs/heads/mybranch` | `/myfolder`
-`myrepo.git#abcdef:myfolder`    | `sha1 = abcdef`       | `/myfolder`
-
-
-### Tarball contexts
-
-If you pass an URL to a remote tarball, the URL itself is sent to the daemon:
-
-Instead of specifying a context, you can pass a single Dockerfile in the `URL`
-or pipe the file in via `STDIN`. To pipe a Dockerfile from `STDIN`:
-
-```bash
-$ docker build http://server/context.tar.gz
-```
-
-The download operation will be performed on the host the Docker daemon is
-running on, which is not necessarily the same host from which the build command
-is being issued. The Docker daemon will fetch `context.tar.gz` and use it as the
-build context. Tarball contexts must be tar archives conforming to the standard
-`tar` UNIX format and can be compressed with any one of the 'xz', 'bzip2',
-'gzip' or 'identity' (no compression) formats.
-
-### Text files
-
-Instead of specifying a context, you can pass a single `Dockerfile` in the
-`URL` or pipe the file in via `STDIN`. To pipe a `Dockerfile` from `STDIN`:
-
-```bash
-$ docker build - < Dockerfile
-```
-
-With Powershell on Windows, you can run:
-
-```powershell
-Get-Content Dockerfile | docker build -
-```
-
-If you use `STDIN` or specify a `URL` pointing to a plain text file, the system
-places the contents into a file called `Dockerfile`, and any `-f`, `--file`
-option is ignored. In this scenario, there is no context.
-
-By default the `docker build` command will look for a `Dockerfile` at the root
-of the build context. The `-f`, `--file`, option lets you specify the path to
-an alternative file to use instead. This is useful in cases where the same set
-of files are used for multiple builds. The path must be to a file within the
-build context. If a relative path is specified then it is interpreted as
-relative to the root of the context.
-
-In most cases, it's best to put each Dockerfile in an empty directory. Then,
-add to that directory only the files needed for building the Dockerfile. To
-increase the build's performance, you can exclude files and directories by
-adding a `.dockerignore` file to that directory as well. For information on
-creating one, see the [.dockerignore file](../builder.md#dockerignore-file).
-
-If the Docker client loses connection to the daemon, the build is canceled.
-This happens if you interrupt the Docker client with `CTRL-c` or if the Docker
-client is killed for any reason. If the build initiated a pull which is still
-running at the time the build is cancelled, the pull is cancelled as well.
-
-## Return code
-
-On a successful build, a return code of success `0` will be returned.  When the
-build fails, a non-zero failure code will be returned.
-
-There should be informational output of the reason for failure output to
-`STDERR`:
-
-```bash
-$ docker build -t fail .
-
-Sending build context to Docker daemon 2.048 kB
-Sending build context to Docker daemon
-Step 1/3 : FROM busybox
- ---> 4986bf8c1536
-Step 2/3 : RUN exit 13
- ---> Running in e26670ec7a0a
-INFO[0000] The command [/bin/sh -c exit 13] returned a non-zero code: 13
-$ echo $?
-1
-```
-
-See also:
-
-[*Dockerfile Reference*](../builder.md).
-
-## Examples
-
-### Build with PATH
-
-```bash
-$ docker build .
-
-Uploading context 10240 bytes
-Step 1/3 : FROM busybox
-Pulling repository busybox
- ---> e9aa60c60128MB/2.284 MB (100%) endpoint: https://cdn-registry-1.docker.io/v1/
-Step 2/3 : RUN ls -lh /
- ---> Running in 9c9e81692ae9
-total 24
-drwxr-xr-x    2 root     root        4.0K Mar 12  2013 bin
-drwxr-xr-x    5 root     root        4.0K Oct 19 00:19 dev
-drwxr-xr-x    2 root     root        4.0K Oct 19 00:19 etc
-drwxr-xr-x    2 root     root        4.0K Nov 15 23:34 lib
-lrwxrwxrwx    1 root     root           3 Mar 12  2013 lib64 -> lib
-dr-xr-xr-x  116 root     root           0 Nov 15 23:34 proc
-lrwxrwxrwx    1 root     root           3 Mar 12  2013 sbin -> bin
-dr-xr-xr-x   13 root     root           0 Nov 15 23:34 sys
-drwxr-xr-x    2 root     root        4.0K Mar 12  2013 tmp
-drwxr-xr-x    2 root     root        4.0K Nov 15 23:34 usr
- ---> b35f4035db3f
-Step 3/3 : CMD echo Hello world
- ---> Running in 02071fceb21b
- ---> f52f38b7823e
-Successfully built f52f38b7823e
-Removing intermediate container 9c9e81692ae9
-Removing intermediate container 02071fceb21b
-```
-
-This example specifies that the `PATH` is `.`, and so all the files in the
-local directory get `tar`d and sent to the Docker daemon. The `PATH` specifies
-where to find the files for the "context" of the build on the Docker daemon.
-Remember that the daemon could be running on a remote machine and that no
-parsing of the Dockerfile happens at the client side (where you're running
-`docker build`). That means that *all* the files at `PATH` get sent, not just
-the ones listed to [*ADD*](../builder.md#add) in the Dockerfile.
-
-The transfer of context from the local machine to the Docker daemon is what the
-`docker` client means when you see the "Sending build context" message.
-
-If you wish to keep the intermediate containers after the build is complete,
-you must use `--rm=false`. This does not affect the build cache.
-
-### Build with URL
-
-```bash
-$ docker build github.com/creack/docker-firefox
-```
-
-This will clone the GitHub repository and use the cloned repository as context.
-The Dockerfile at the root of the repository is used as Dockerfile. You can
-specify an arbitrary Git repository by using the `git://` or `git@` scheme.
-
-```bash
-$ docker build -f ctx/Dockerfile http://server/ctx.tar.gz
-
-Downloading context: http://server/ctx.tar.gz [===================>]    240 B/240 B
-Step 1/3 : FROM busybox
- ---> 8c2e06607696
-Step 2/3 : ADD ctx/container.cfg /
- ---> e7829950cee3
-Removing intermediate container b35224abf821
-Step 3/3 : CMD /bin/ls
- ---> Running in fbc63d321d73
- ---> 3286931702ad
-Removing intermediate container fbc63d321d73
-Successfully built 377c409b35e4
-```
-
-This sends the URL `http://server/ctx.tar.gz` to the Docker daemon, which
-downloads and extracts the referenced tarball. The `-f ctx/Dockerfile`
-parameter specifies a path inside `ctx.tar.gz` to the `Dockerfile` that is used
-to build the image. Any `ADD` commands in that `Dockerfile` that refer to local
-paths must be relative to the root of the contents inside `ctx.tar.gz`. In the
-example above, the tarball contains a directory `ctx/`, so the `ADD
-ctx/container.cfg /` operation works as expected.
-
-### Build with -
-
-```bash
-$ docker build - < Dockerfile
-```
-
-This will read a Dockerfile from `STDIN` without context. Due to the lack of a
-context, no contents of any local directory will be sent to the Docker daemon.
-Since there is no context, a Dockerfile `ADD` only works if it refers to a
-remote URL.
-
-```bash
-$ docker build - < context.tar.gz
-```
-
-This will build an image for a compressed context read from `STDIN`.  Supported
-formats are: bzip2, gzip and xz.
-
-### Usage of .dockerignore
-
-```bash
-$ docker build .
-
-Uploading context 18.829 MB
-Uploading context
-Step 1/2 : FROM busybox
- ---> 769b9341d937
-Step 2/2 : CMD echo Hello world
- ---> Using cache
- ---> 99cc1ad10469
-Successfully built 99cc1ad10469
-$ echo ".git" > .dockerignore
-$ docker build .
-Uploading context  6.76 MB
-Uploading context
-Step 1/2 : FROM busybox
- ---> 769b9341d937
-Step 2/2 : CMD echo Hello world
- ---> Using cache
- ---> 99cc1ad10469
-Successfully built 99cc1ad10469
-```
-
-This example shows the use of the `.dockerignore` file to exclude the `.git`
-directory from the context. Its effect can be seen in the changed size of the
-uploaded context. The builder reference contains detailed information on
-[creating a .dockerignore file](../builder.md#dockerignore-file)
-
-### Tag image (-t)
-
-```bash
-$ docker build -t vieux/apache:2.0 .
-```
-
-This will build like the previous example, but it will then tag the resulting
-image. The repository name will be `vieux/apache` and the tag will be `2.0`.
-[Read more about valid tags](tag.md).
-
-You can apply multiple tags to an image. For example, you can apply the `latest`
-tag to a newly built image and add another tag that references a specific
-version.
-For example, to tag an image both as `whenry/fedora-jboss:latest` and
-`whenry/fedora-jboss:v2.1`, use the following:
-
-```bash
-$ docker build -t whenry/fedora-jboss:latest -t whenry/fedora-jboss:v2.1 .
-```
-### Specify Dockerfile (-f)
-
-```bash
-$ docker build -f Dockerfile.debug .
-```
-
-This will use a file called `Dockerfile.debug` for the build instructions
-instead of `Dockerfile`.
-
-```bash
-$ docker build -f dockerfiles/Dockerfile.debug -t myapp_debug .
-$ docker build -f dockerfiles/Dockerfile.prod  -t myapp_prod .
-```
-
-The above commands will build the current build context (as specified by the
-`.`) twice, once using a debug version of a `Dockerfile` and once using a
-production version.
-
-```bash
-$ cd /home/me/myapp/some/dir/really/deep
-$ docker build -f /home/me/myapp/dockerfiles/debug /home/me/myapp
-$ docker build -f ../../../../dockerfiles/debug /home/me/myapp
-```
-
-These two `docker build` commands do the exact same thing. They both use the
-contents of the `debug` file instead of looking for a `Dockerfile` and will use
-`/home/me/myapp` as the root of the build context. Note that `debug` is in the
-directory structure of the build context, regardless of how you refer to it on
-the command line.
-
-> **Note:**
-> `docker build` will return a `no such file or directory` error if the
-> file or directory does not exist in the uploaded context. This may
-> happen if there is no context, or if you specify a file that is
-> elsewhere on the Host system. The context is limited to the current
-> directory (and its children) for security reasons, and to ensure
-> repeatable builds on remote Docker hosts. This is also the reason why
-> `ADD ../file` will not work.
-
-### Optional parent cgroup (--cgroup-parent)
-
-When `docker build` is run with the `--cgroup-parent` option the containers
-used in the build will be run with the [corresponding `docker run`
-flag](../run.md#specifying-custom-cgroups).
-
-### Set ulimits in container (--ulimit)
-
-Using the `--ulimit` option with `docker build` will cause each build step's
-container to be started using those [`--ulimit`
-flag values](./run.md#set-ulimits-in-container-ulimit).
-
-### Set build-time variables (--build-arg)
-
-You can use `ENV` instructions in a Dockerfile to define variable
-values. These values persist in the built image. However, often
-persistence is not what you want. Users want to specify variables differently
-depending on which host they build an image on.
-
-A good example is `http_proxy` or source versions for pulling intermediate
-files. The `ARG` instruction lets Dockerfile authors define values that users
-can set at build-time using the  `--build-arg` flag:
-
-```bash
-$ docker build --build-arg HTTP_PROXY=http://10.20.30.2:1234 .
-```
-
-This flag allows you to pass the build-time variables that are
-accessed like regular environment variables in the `RUN` instruction of the
-Dockerfile. Also, these values don't persist in the intermediate or final images
-like `ENV` values do.
-
-Using this flag will not alter the output you see when the `ARG` lines from the
-Dockerfile are echoed during the build process.
-
-For detailed information on using `ARG` and `ENV` instructions, see the
-[Dockerfile reference](../builder.md).
-
-### Optional security options (--security-opt)
-
-This flag is only supported on a daemon running on Windows, and only supports
-the `credentialspec` option. The `credentialspec` must be in the format
-`file://spec.txt` or `registry://keyname`.
-
-### Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Windows. The `--isolation=<value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. On Microsoft Windows, you can specify these values:
-
-
-| Value     | Description                                                                                                                                                   |
-|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `default` | Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value.  |
-| `process` | Namespace isolation only.                                                                                                                                     |
-| `hyperv`  | Hyper-V hypervisor partition-based isolation.                                                                                                                 |
-
-Specifying the `--isolation` flag without a value is the same as setting `--isolation="default"`.
-
-
-### Squash an image's layers (--squash) **Experimental Only**
-
-Once the image is built, squash the new layers into a new image with a single
-new layer. Squashing does not destroy any existing image, rather it creates a new
-image with the content of the squshed layers. This effectively makes it look
-like all `Dockerfile` commands were created with a single layer. The build
-cache is preserved with this method.
-
-**Note**: using this option means the new image will not be able to take
-advantage of layer sharing with other images and may use significantly more
-space.
-
-**Note**: using this option you may see significantly more space used due to
-storing two copies of the image, one for the build cache with all the cache
-layers in tact, and one for the squashed version.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/cli.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/cli.md
deleted file mode 100644
index e56fb9f847..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/cli.md
+++ /dev/null
@@ -1,249 +0,0 @@
----
-title: "Use the Docker command line"
-description: "Docker's CLI command description and usage"
-keywords: "Docker, Docker documentation, CLI, command line"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Use the Docker command line
-
-To list available commands, either run `docker` with no parameters
-or execute `docker help`:
-
-```bash
-$ docker
-Usage: docker [OPTIONS] COMMAND [ARG...]
-       docker [ --help | -v | --version ]
-
-A self-sufficient runtime for containers.
-
-Options:
-      --config string      Location of client config files (default "/root/.docker")
-  -D, --debug              Enable debug mode
-      --help               Print usage
-  -H, --host value         Daemon socket(s) to connect to (default [])
-  -l, --log-level string   Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
-      --tls                Use TLS; implied by --tlsverify
-      --tlscacert string   Trust certs signed only by this CA (default "/root/.docker/ca.pem")
-      --tlscert string     Path to TLS certificate file (default "/root/.docker/cert.pem")
-      --tlskey string      Path to TLS key file (default "/root/.docker/key.pem")
-      --tlsverify          Use TLS and verify the remote
-  -v, --version            Print version information and quit
-
-Commands:
-    attach    Attach to a running container
-    # […]
-```
-
-Depending on your Docker system configuration, you may be required to preface
-each `docker` command with `sudo`. To avoid having to use `sudo` with the
-`docker` command, your system administrator can create a Unix group called
-`docker` and add users to it.
-
-For more information about installing Docker or `sudo` configuration, refer to
-the [installation](https://docs.docker.com/engine/installation/) instructions for your operating system.
-
-## Environment variables
-
-For easy reference, the following list of environment variables are supported
-by the `docker` command line:
-
-* `DOCKER_API_VERSION` The API version to use (e.g. `1.19`)
-* `DOCKER_CONFIG` The location of your client configuration files.
-* `DOCKER_CERT_PATH` The location of your authentication keys.
-* `DOCKER_DRIVER` The graph driver to use.
-* `DOCKER_HOST` Daemon socket to connect to.
-* `DOCKER_NOWARN_KERNEL_VERSION` Prevent warnings that your Linux kernel is
-  unsuitable for Docker.
-* `DOCKER_RAMDISK` If set this will disable 'pivot_root'.
-* `DOCKER_TLS_VERIFY` When set Docker uses TLS and verifies the remote.
-* `DOCKER_CONTENT_TRUST` When set Docker uses notary to sign and verify images.
-  Equates to `--disable-content-trust=false` for build, create, pull, push, run.
-* `DOCKER_CONTENT_TRUST_SERVER` The URL of the Notary server to use. This defaults
-  to the same URL as the registry.
-* `DOCKER_HIDE_LEGACY_COMMANDS` When set, Docker hides "legacy" top-level commands (such as `docker rm`, and 
-  `docker pull`) in `docker help` output, and only `Management commands` per object-type (e.g., `docker container`) are
-  printed. This may become the default in a future release, at which point this environment-variable is removed.
-* `DOCKER_TMPDIR` Location for temporary Docker files.
-
-Because Docker is developed using Go, you can also use any environment
-variables used by the Go runtime. In particular, you may find these useful:
-
-* `HTTP_PROXY`
-* `HTTPS_PROXY`
-* `NO_PROXY`
-
-These Go environment variables are case-insensitive. See the
-[Go specification](http://golang.org/pkg/net/http/) for details on these
-variables.
-
-## Configuration files
-
-By default, the Docker command line stores its configuration files in a
-directory called `.docker` within your `$HOME` directory. However, you can
-specify a different location via the `DOCKER_CONFIG` environment variable
-or the `--config` command line option. If both are specified, then the
-`--config` option overrides the `DOCKER_CONFIG` environment variable.
-For example:
-
-    docker --config ~/testconfigs/ ps
-
-Instructs Docker to use the configuration files in your `~/testconfigs/`
-directory when running the `ps` command.
-
-Docker manages most of the files in the configuration directory
-and you should not modify them. However, you *can modify* the
-`config.json` file to control certain aspects of how the `docker`
-command behaves.
-
-Currently, you can modify the `docker` command behavior using environment
-variables or command-line options. You can also use options within
-`config.json` to modify some of the same behavior. When using these
-mechanisms, you must keep in mind the order of precedence among them. Command
-line options override environment variables and environment variables override
-properties you specify in a `config.json` file.
-
-The `config.json` file stores a JSON encoding of several properties:
-
-The property `HttpHeaders` specifies a set of headers to include in all messages
-sent from the Docker client to the daemon. Docker does not try to interpret or
-understand these header; it simply puts them into the messages. Docker does
-not allow these headers to change any headers it sets for itself.
-
-The property `psFormat` specifies the default format for `docker ps` output.
-When the `--format` flag is not provided with the `docker ps` command,
-Docker's client uses this property. If this property is not set, the client
-falls back to the default table format. For a list of supported formatting
-directives, see the
-[**Formatting** section in the `docker ps` documentation](ps.md)
-
-The property `imagesFormat` specifies the default format for `docker images` output.
-When the `--format` flag is not provided with the `docker images` command,
-Docker's client uses this property. If this property is not set, the client
-falls back to the default table format. For a list of supported formatting
-directives, see the [**Formatting** section in the `docker images` documentation](images.md)
-
-The property `serviceInspectFormat` specifies the default format for `docker
-service inspect` output. When the `--format` flag is not provided with the
-`docker service inspect` command, Docker's client uses this property. If this
-property is not set, the client falls back to the default json format. For a
-list of supported formatting directives, see the
-[**Formatting** section in the `docker service inspect` documentation](service_inspect.md)
-
-The property `statsFormat` specifies the default format for `docker
-stats` output. When the `--format` flag is not provided with the
-`docker stats` command, Docker's client uses this property. If this
-property is not set, the client falls back to the default table
-format. For a list of supported formatting directives, see
-[**Formatting** section in the `docker stats` documentation](stats.md)
-
-Once attached to a container, users detach from it and leave it running using
-the using `CTRL-p CTRL-q` key sequence. This detach key sequence is customizable
-using the `detachKeys` property. Specify a `<sequence>` value for the
-property. The format of the `<sequence>` is a comma-separated list of either
-a letter [a-Z], or the `ctrl-` combined with any of the following:
-
-* `a-z` (a single lowercase alpha character )
-* `@` (at sign)
-* `[` (left bracket)
-* `\\` (two backward slashes)
-*  `_` (underscore)
-* `^` (caret)
-
-Your customization applies to all containers started in with your Docker client.
-Users can override your custom or the default key sequence on a per-container
-basis. To do this, the user specifies the `--detach-keys` flag with the `docker
-attach`, `docker exec`, `docker run` or `docker start` command.
-
-Following is a sample `config.json` file:
-
-    {% raw %}
-    {
-      "HttpHeaders": {
-        "MyHeader": "MyValue"
-      },
-      "psFormat": "table {{.ID}}\\t{{.Image}}\\t{{.Command}}\\t{{.Labels}}",
-      "imagesFormat": "table {{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}",
-      "statsFormat": "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}",
-      "serviceInspectFormat": "pretty",
-      "detachKeys": "ctrl-e,e"
-    }
-    {% endraw %}
-
-### Notary
-
-If using your own notary server and a self-signed certificate or an internal
-Certificate Authority, you need to place the certificate at
-`tls/<registry_url>/ca.crt` in your docker config directory.
-
-Alternatively you can trust the certificate globally by adding it to your system's
-list of root Certificate Authorities.
-
-## Help
-
-To list the help on any command just execute the command, followed by the
-`--help` option.
-
-    $ docker run --help
-
-    Usage: docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
-
-    Run a command in a new container
-
-    Options:
-          --add-host value             Add a custom host-to-IP mapping (host:ip) (default [])
-      -a, --attach value               Attach to STDIN, STDOUT or STDERR (default [])
-    ...
-
-## Option types
-
-Single character command line options can be combined, so rather than
-typing `docker run -i -t --name test busybox sh`,
-you can write `docker run -it --name test busybox sh`.
-
-### Boolean
-
-Boolean options take the form `-d=false`. The value you see in the help text is
-the default value which is set if you do **not** specify that flag. If you
-specify a Boolean flag without a value, this will set the flag to `true`,
-irrespective of the default value.
-
-For example, running `docker run -d` will set the value to `true`, so your
-container **will** run in "detached" mode, in the background.
-
-Options which default to `true` (e.g., `docker build --rm=true`) can only be
-set to the non-default value by explicitly setting them to `false`:
-
-    $ docker build --rm=false .
-
-### Multi
-
-You can specify options like `-a=[]` multiple times in a single command line,
-for example in these commands:
-
-    $ docker run -a stdin -a stdout -i -t ubuntu /bin/bash
-    $ docker run -a stdin -a stdout -a stderr ubuntu /bin/ls
-
-Sometimes, multiple options can call for a more complex value string as for
-`-v`:
-
-    $ docker run -v /host:/container example/mysql
-
-> **Note:**
-> Do not use the `-t` and `-a stderr` options together due to
-> limitations in the `pty` implementation. All `stderr` in `pty` mode
-> simply goes to `stdout`.
-
-### Strings and Integers
-
-Options like `--name=""` expect a string, and they
-can only be specified once. Options like `-c=0`
-expect an integer, and they can only be specified once.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/commit.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/commit.md
deleted file mode 100644
index 8f971a5d95..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/commit.md
+++ /dev/null
@@ -1,93 +0,0 @@
----
-title: "commit"
-description: "The commit command description and usage"
-keywords: "commit, file, changes"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# commit
-
-```markdown
-Usage:  docker commit [OPTIONS] CONTAINER [REPOSITORY[:TAG]]
-
-Create a new image from a container's changes
-
-Options:
-  -a, --author string    Author (e.g., "John Hannibal Smith <hannibal@a-team.com>")
-  -c, --change value     Apply Dockerfile instruction to the created image (default [])
-      --help             Print usage
-  -m, --message string   Commit message
-  -p, --pause            Pause container during commit (default true)
-```
-
-It can be useful to commit a container's file changes or settings into a new
-image. This allows you debug a container by running an interactive shell, or to
-export a working dataset to another server. Generally, it is better to use
-Dockerfiles to manage your images in a documented and maintainable way.
-[Read more about valid image names and tags](tag.md).
-
-The commit operation will not include any data contained in
-volumes mounted inside the container.
-
-By default, the container being committed and its processes will be paused
-while the image is committed. This reduces the likelihood of encountering data
-corruption during the process of creating the commit.  If this behavior is
-undesired, set the `--pause` option to false.
-
-The `--change` option will apply `Dockerfile` instructions to the image that is
-created.  Supported `Dockerfile` instructions:
-`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
-
-## Commit a container
-
-    $ docker ps
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-    $ docker commit c3f279d17e0a  svendowideit/testimage:version3
-    f5283438590d
-    $ docker images
-    REPOSITORY                        TAG                 ID                  CREATED             SIZE
-    svendowideit/testimage            version3            f5283438590d        16 seconds ago      335.7 MB
-
-## Commit a container with new configurations
-
-    {% raw %}
-    $ docker ps
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-    $ docker inspect -f "{{ .Config.Env }}" c3f279d17e0a
-    [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin]
-    $ docker commit --change "ENV DEBUG true" c3f279d17e0a  svendowideit/testimage:version3
-    f5283438590d
-    $ docker inspect -f "{{ .Config.Env }}" f5283438590d
-    [HOME=/ PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin DEBUG=true]
-    {% endraw %}
-
-## Commit a container with new `CMD` and `EXPOSE` instructions
-
-    $ docker ps
-    ID                  IMAGE               COMMAND             CREATED             STATUS              PORTS
-    c3f279d17e0a        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-    197387f1b436        ubuntu:12.04        /bin/bash           7 days ago          Up 25 hours
-
-    $ docker commit --change='CMD ["apachectl", "-DFOREGROUND"]' -c "EXPOSE 80" c3f279d17e0a  svendowideit/testimage:version4
-    f5283438590d
-
-    $ docker run -d svendowideit/testimage:version4
-    89373736e2e7f00bc149bd783073ac43d0507da250e999f3f1036e0db60817c0
-
-    $ docker ps
-    ID                  IMAGE               COMMAND                 CREATED             STATUS              PORTS
-    89373736e2e7        testimage:version4  "apachectl -DFOREGROU"  3 seconds ago       Up 2 seconds        80/tcp
-    c3f279d17e0a        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours
-    197387f1b436        ubuntu:12.04        /bin/bash               7 days ago          Up 25 hours
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/container_prune.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/container_prune.md
deleted file mode 100644
index 43156406ec..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/container_prune.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: "container prune"
-description: "Remove all stopped containers"
-keywords: container, prune, delete, remove
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# container prune
-
-```markdown
-Usage:	docker container prune [OPTIONS]
-
-Remove all stopped containers
-
-Options:
-  -f, --force   Do not prompt for confirmation
-      --help    Print usage
-```
-
-## Examples
-
-```bash
-$ docker container prune
-WARNING! This will remove all stopped containers.
-Are you sure you want to continue? [y/N] y
-Deleted Containers:
-4a7f7eebae0f63178aff7eb0aa39cd3f0627a203ab2df258c1a00b456cf20063
-f98f9c2aa1eaf727e4ec9c0283bc7d4aa4762fbdba7f26191f26c97f64090360
-
-Total reclaimed space: 212 B
-```
-
-## Related information
-
-* [system df](system_df.md)
-* [volume prune](volume_prune.md)
-* [image prune](image_prune.md)
-* [network prune](network_prune.md)
-* [system prune](system_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/cp.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/cp.md
deleted file mode 100644
index fcfd35fce1..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/cp.md
+++ /dev/null
@@ -1,112 +0,0 @@
----
-title: "cp"
-description: "The cp command description and usage"
-keywords: "copy, container, files, folders"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# cp
-
-```markdown
-Usage:  docker cp [OPTIONS] CONTAINER:SRC_PATH DEST_PATH|-
-        docker cp [OPTIONS] SRC_PATH|- CONTAINER:DEST_PATH
-
-Copy files/folders between a container and the local filesystem
-
-Use '-' as the source to read a tar archive from stdin
-and extract it to a directory destination in a container.
-Use '-' as the destination to stream a tar archive of a
-container source to stdout.
-
-Options:
-  -L, --follow-link   Always follow symbol link in SRC_PATH
-      --help          Print usage
-```
-
-The `docker cp` utility copies the contents of `SRC_PATH` to the `DEST_PATH`.
-You can copy from the container's file system to the local machine or the
-reverse, from the local filesystem to the container. If `-` is specified for
-either the `SRC_PATH` or `DEST_PATH`, you can also stream a tar archive from
-`STDIN` or to `STDOUT`. The `CONTAINER` can be a running or stopped container.
-The `SRC_PATH` or `DEST_PATH` can be a file or directory.
-
-The `docker cp` command assumes container paths are relative to the container's
-`/` (root) directory. This means supplying the initial forward slash is optional;
-The command sees `compassionate_darwin:/tmp/foo/myfile.txt` and
-`compassionate_darwin:tmp/foo/myfile.txt` as identical. Local machine paths can
-be an absolute or relative value. The command interprets a local machine's
-relative paths as relative to the current working directory where `docker cp` is
-run.
-
-The `cp` command behaves like the Unix `cp -a` command in that directories are
-copied recursively with permissions preserved if possible. Ownership is set to
-the user and primary group at the destination. For example, files copied to a
-container are created with `UID:GID` of the root user. Files copied to the local
-machine are created with the `UID:GID` of the user which invoked the `docker cp`
-command.  If you specify the `-L` option, `docker cp` follows any symbolic link
-in the `SRC_PATH`.  `docker cp` does *not* create parent directories for
-`DEST_PATH` if they do not exist.
-
-Assuming a path separator of `/`, a first argument of `SRC_PATH` and second
-argument of `DEST_PATH`, the behavior is as follows:
-
-- `SRC_PATH` specifies a file
-    - `DEST_PATH` does not exist
-        - the file is saved to a file created at `DEST_PATH`
-    - `DEST_PATH` does not exist and ends with `/`
-        - Error condition: the destination directory must exist.
-    - `DEST_PATH` exists and is a file
-        - the destination is overwritten with the source file's contents
-    - `DEST_PATH` exists and is a directory
-        - the file is copied into this directory using the basename from
-          `SRC_PATH`
-- `SRC_PATH` specifies a directory
-    - `DEST_PATH` does not exist
-        - `DEST_PATH` is created as a directory and the *contents* of the source
-           directory are copied into this directory
-    - `DEST_PATH` exists and is a file
-        - Error condition: cannot copy a directory to a file
-    - `DEST_PATH` exists and is a directory
-        - `SRC_PATH` does not end with `/.`
-            - the source directory is copied into this directory
-        - `SRC_PATH` does end with `/.`
-            - the *content* of the source directory is copied into this
-              directory
-
-The command requires `SRC_PATH` and `DEST_PATH` to exist according to the above
-rules. If `SRC_PATH` is local and is a symbolic link, the symbolic link, not
-the target, is copied by default. To copy the link target and not the link, specify
-the `-L` option.
-
-A colon (`:`) is used as a delimiter between `CONTAINER` and its path. You can
-also use `:` when specifying paths to a `SRC_PATH` or `DEST_PATH` on a local
-machine, for example  `file:name.txt`. If you use a `:` in a local machine path,
-you must be explicit with a relative or absolute path, for example:
-
-    `/path/to/file:name.txt` or `./file:name.txt`
-
-It is not possible to copy certain system files such as resources under
-`/proc`, `/sys`, `/dev`, [tmpfs](run.md#mount-tmpfs-tmpfs), and mounts created by
-the user in the container. However, you can still copy such files by manually
-running `tar` in `docker exec`. For example (consider `SRC_PATH` and `DEST_PATH`
-are directories):
-
-    $ docker exec foo tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | tar Cxf DEST_PATH -
-
-or
-
-    $ tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | docker exec -i foo tar Cxf DEST_PATH -
-
-
-Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.
-The command extracts the content of the tar to the `DEST_PATH` in container's
-filesystem. In this case, `DEST_PATH` must specify a directory. Using `-` as
-the `DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/create.md
deleted file mode 100644
index e6582e4a38..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/create.md
+++ /dev/null
@@ -1,211 +0,0 @@
----
-title: "create"
-description: "The create command description and usage"
-keywords: "docker, create, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# create
-
-Creates a new container.
-
-```markdown
-Usage:  docker create [OPTIONS] IMAGE [COMMAND] [ARG...]
-
-Create a new container
-
-Options:
-      --add-host value              Add a custom host-to-IP mapping (host:ip) (default [])
-  -a, --attach value                Attach to STDIN, STDOUT or STDERR (default [])
-      --blkio-weight value          Block IO (relative weight), between 10 and 1000
-      --blkio-weight-device value   Block IO weight (relative device weight) (default [])
-      --cap-add value               Add Linux capabilities (default [])
-      --cap-drop value              Drop Linux capabilities (default [])
-      --cgroup-parent string        Optional parent cgroup for the container
-      --cidfile string              Write the container ID to the file
-      --cpu-count int               The number of CPUs available for execution by the container.
-                                    Windows daemon only. On Windows Server containers, this is
-                                    approximated as a percentage of total CPU usage.
-      --cpu-percent int             CPU percent (Windows only)
-      --cpu-period int              Limit CPU CFS (Completely Fair Scheduler) period
-      --cpu-quota int               Limit CPU CFS (Completely Fair Scheduler) quota
-  -c, --cpu-shares int              CPU shares (relative weight)
-      --cpus NanoCPUs               Number of CPUs (default 0.000)
-      --cpu-rt-period int           Limit the CPU real-time period in microseconds
-      --cpu-rt-runtime int          Limit the CPU real-time runtime in microseconds
-      --cpuset-cpus string          CPUs in which to allow execution (0-3, 0,1)
-      --cpuset-mems string          MEMs in which to allow execution (0-3, 0,1)
-      --device value                Add a host device to the container (default [])
-      --device-read-bps value       Limit read rate (bytes per second) from a device (default [])
-      --device-read-iops value      Limit read rate (IO per second) from a device (default [])
-      --device-write-bps value      Limit write rate (bytes per second) to a device (default [])
-      --device-write-iops value     Limit write rate (IO per second) to a device (default [])
-      --disable-content-trust       Skip image verification (default true)
-      --dns value                   Set custom DNS servers (default [])
-      --dns-option value            Set DNS options (default [])
-      --dns-search value            Set custom DNS search domains (default [])
-      --entrypoint string           Overwrite the default ENTRYPOINT of the image
-  -e, --env value                   Set environment variables (default [])
-      --env-file value              Read in a file of environment variables (default [])
-      --expose value                Expose a port or a range of ports (default [])
-      --group-add value             Add additional groups to join (default [])
-      --health-cmd string           Command to run to check health
-      --health-interval duration    Time between running the check (ns|us|ms|s|m|h) (default 0s)
-      --health-retries int          Consecutive failures needed to report unhealthy
-      --health-timeout duration     Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s)
-      --help                        Print usage
-  -h, --hostname string             Container host name
-      --init                        Run an init inside the container that forwards signals and reaps processes
-      --init-path string            Path to the docker-init binary
-  -i, --interactive                 Keep STDIN open even if not attached
-      --io-maxbandwidth string      Maximum IO bandwidth limit for the system drive (Windows only)
-      --io-maxiops uint             Maximum IOps limit for the system drive (Windows only)
-      --ip string                   Container IPv4 address (e.g. 172.30.100.104)
-      --ip6 string                  Container IPv6 address (e.g. 2001:db8::33)
-      --ipc string                  IPC namespace to use
-      --isolation string            Container isolation technology
-      --kernel-memory string        Kernel memory limit
-  -l, --label value                 Set meta data on a container (default [])
-      --label-file value            Read in a line delimited file of labels (default [])
-      --link value                  Add link to another container (default [])
-      --link-local-ip value         Container IPv4/IPv6 link-local addresses (default [])
-      --log-driver string           Logging driver for the container
-      --log-opt value               Log driver options (default [])
-      --mac-address string          Container MAC address (e.g. 92:d0:c6:0a:29:33)
-  -m, --memory string               Memory limit
-      --memory-reservation string   Memory soft limit
-      --memory-swap string          Swap limit equal to memory plus swap: '-1' to enable unlimited swap
-      --memory-swappiness int       Tune container memory swappiness (0 to 100) (default -1)
-      --name string                 Assign a name to the container
-      --network-alias value         Add network-scoped alias for the container (default [])
-      --network string              Connect a container to a network (default "default")
-                                    'bridge': create a network stack on the default Docker bridge
-                                    'none': no networking
-                                    'container:<name|id>': reuse another container's network stack
-                                    'host': use the Docker host network stack
-                                    '<network-name>|<network-id>': connect to a user-defined network
-      --no-healthcheck              Disable any container-specified HEALTHCHECK
-      --oom-kill-disable            Disable OOM Killer
-      --oom-score-adj int           Tune host's OOM preferences (-1000 to 1000)
-      --pid string                  PID namespace to use
-      --pids-limit int              Tune container pids limit (set -1 for unlimited), kernel >= 4.3
-      --privileged                  Give extended privileges to this container
-  -p, --publish value               Publish a container's port(s) to the host (default [])
-  -P, --publish-all                 Publish all exposed ports to random ports
-      --read-only                   Mount the container's root filesystem as read only
-      --restart string              Restart policy to apply when a container exits (default "no")
-                                    Possible values are: no, on-failure[:max-retry], always, unless-stopped
-      --rm                          Automatically remove the container when it exits
-      --runtime string              Runtime to use for this container
-      --security-opt value          Security Options (default [])
-      --shm-size string             Size of /dev/shm, default value is 64MB.
-                                    The format is `<number><unit>`. `number` must be greater than `0`.
-                                    Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes),
-                                    or `g` (gigabytes). If you omit the unit, the system uses bytes.
-      --stop-signal string          Signal to stop a container, SIGTERM by default (default "SIGTERM")
-      --stop-timeout=10             Timeout (in seconds) to stop a container
-      --storage-opt value           Storage driver options for the container (default [])
-      --sysctl value                Sysctl options (default map[])
-      --tmpfs value                 Mount a tmpfs directory (default [])
-  -t, --tty                         Allocate a pseudo-TTY
-      --ulimit value                Ulimit options (default [])
-  -u, --user string                 Username or UID (format: <name|uid>[:<group|gid>])
-      --userns string               User namespace to use
-                                    'host': Use the Docker host user namespace
-                                    '': Use the Docker daemon user namespace specified by `--userns-remap` option.
-      --uts string                  UTS namespace to use
-  -v, --volume value                Bind mount a volume (default []). The format
-                                    is `[host-src:]container-dest[:<options>]`.
-                                    The comma-delimited `options` are [rw|ro],
-                                    [z|Z], [[r]shared|[r]slave|[r]private], and
-                                    [nocopy]. The 'host-src' is an absolute path
-                                    or a name value.
-      --volume-driver string        Optional volume driver for the container
-      --volumes-from value          Mount volumes from the specified container(s) (default [])
-  -w, --workdir string              Working directory inside the container
-```
-
-The `docker create` command creates a writeable container layer over the
-specified image and prepares it for running the specified command.  The
-container ID is then printed to `STDOUT`.  This is similar to `docker run -d`
-except the container is never started.  You can then use the
-`docker start <container_id>` command to start the container at any point.
-
-This is useful when you want to set up a container configuration ahead of time
-so that it is ready to start when you need it. The initial status of the
-new container is `created`.
-
-Please see the [run command](run.md) section and the [Docker run reference](../run.md) for more details.
-
-## Examples
-
-    $ docker create -t -i fedora bash
-    6d8af538ec541dd581ebc2a24153a28329acb5268abe5ef868c1f1a261221752
-    $ docker start -a -i 6d8af538ec5
-    bash-4.2#
-
-As of v1.4.0 container volumes are initialized during the `docker create` phase
-(i.e., `docker run` too). For example, this allows you to `create` the `data`
-volume container, and then use it from another container:
-
-    $ docker create -v /data --name data ubuntu
-    240633dfbb98128fa77473d3d9018f6123b99c454b3251427ae190a7d951ad57
-    $ docker run --rm --volumes-from data ubuntu ls -la /data
-    total 8
-    drwxr-xr-x  2 root root 4096 Dec  5 04:10 .
-    drwxr-xr-x 48 root root 4096 Dec  5 04:11 ..
-
-Similarly, `create` a host directory bind mounted volume container, which can
-then be used from the subsequent container:
-
-    $ docker create -v /home/docker:/docker --name docker ubuntu
-    9aa88c08f319cd1e4515c3c46b0de7cc9aa75e878357b1e96f91e2c773029f03
-    $ docker run --rm --volumes-from docker ubuntu ls -la /docker
-    total 20
-    drwxr-sr-x  5 1000 staff  180 Dec  5 04:00 .
-    drwxr-xr-x 48 root root  4096 Dec  5 04:13 ..
-    -rw-rw-r--  1 1000 staff 3833 Dec  5 04:01 .ash_history
-    -rw-r--r--  1 1000 staff  446 Nov 28 11:51 .ashrc
-    -rw-r--r--  1 1000 staff   25 Dec  5 04:00 .gitconfig
-    drwxr-sr-x  3 1000 staff   60 Dec  1 03:28 .local
-    -rw-r--r--  1 1000 staff  920 Nov 28 11:51 .profile
-    drwx--S---  2 1000 staff  460 Dec  5 00:51 .ssh
-    drwxr-xr-x 32 1000 staff 1140 Dec  5 04:01 docker
-
-Set storage driver options per container.
-
-    $ docker create -it --storage-opt size=120G fedora /bin/bash
-
-This (size) will allow to set the container rootfs size to 120G at creation time.
-This option is only available for the `devicemapper`, `btrfs`, `overlay2`,
-`windowsfilter` and `zfs` graph drivers.
-For the `devicemapper`, `btrfs`, `windowsfilter` and `zfs` graph drivers,
-user cannot pass a size less than the Default BaseFS Size.
-For the `overlay2` storage driver, the size option is only available if the
-backing fs is `xfs` and mounted with the `pquota` mount option.
-Under these conditions, user can pass any size less then the backing fs size.
-
-### Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Windows. The `--isolation=<value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. On Microsoft Windows, you can specify these values:
-
-
-| Value     | Description                                                                                                                                                   |
-|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `default` | Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value if the
-daemon is running on Windows server, or `hyperv` if running on Windows client.  |
-| `process` | Namespace isolation only.                                                                                                                                     |
-| `hyperv`   | Hyper-V hypervisor partition-based isolation.                                                                                                                  |
-
-Specifying the `--isolation` flag without a value is the same as setting `--isolation="default"`.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/deploy.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/deploy.md
deleted file mode 100644
index 53074b2fd4..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/deploy.md
+++ /dev/null
@@ -1,101 +0,0 @@
----
-title: "deploy"
-description: "The deploy command description and usage"
-keywords: "stack, deploy"
-advisory: "experimental"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# deploy (alias for stack deploy) (experimental)
-
-```markdown
-Usage:  docker deploy [OPTIONS] STACK
-
-Deploy a new stack or update an existing stack
-
-Aliases:
-  deploy, up
-
-Options:
-      --bundle-file string    Path to a Distributed Application Bundle file
-      --compose-file string   Path to a Compose file
-      --help                  Print usage
-      --with-registry-auth    Send registry authentication details to Swarm agents
-```
-
-Create and update a stack from a `compose` or a `dab` file on the swarm. This command
-has to be run targeting a manager node.
-
-## Compose file
-
-The `deploy` command supports compose file version `3.0` and above.
-
-```bash
-$ docker stack deploy --compose-file docker-compose.yml vossibility
-Ignoring unsupported options: links
-
-Creating network vossibility_vossibility
-Creating network vossibility_default
-Creating service vossibility_nsqd
-Creating service vossibility_logstash
-Creating service vossibility_elasticsearch
-Creating service vossibility_kibana
-Creating service vossibility_ghollector
-Creating service vossibility_lookupd
-```
-
-You can verify that the services were correctly created
-
-```
-$ docker service ls
-ID            NAME                               MODE        REPLICAS  IMAGE
-29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4tjx9biia6fs  vossibility_elasticsearch          replicated  1/1       elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility_kibana                 replicated  1/1       kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility_logstash               replicated  1/1       logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe
-axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba
-```
-
-## DAB file
-
-```bash
-$ docker stack deploy --bundle-file vossibility-stack.dab vossibility
-Loading bundle from vossibility-stack.dab
-Creating service vossibility_elasticsearch
-Creating service vossibility_kibana
-Creating service vossibility_logstash
-Creating service vossibility_lookupd
-Creating service vossibility_nsqd
-Creating service vossibility_vossibility-collector
-```
-
-You can verify that the services were correctly created:
-
-```bash
-$ docker service ls
-ID            NAME                               MODE        REPLICAS  IMAGE
-29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4tjx9biia6fs  vossibility_elasticsearch          replicated  1/1       elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility_kibana                 replicated  1/1       kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility_logstash               replicated  1/1       logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe
-axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba
-```
-
-## Related information
-
-* [stack config](stack_config.md)
-* [stack deploy](stack_deploy.md)
-* [stack ls](stack_ls.md)
-* [stack ps](stack_ps.md)
-* [stack rm](stack_rm.md)
-* [stack services](stack_services.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/diff.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/diff.md
deleted file mode 100644
index be27678dcd..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/diff.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "diff"
-description: "The diff command description and usage"
-keywords: "list, changed, files, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# diff
-
-```markdown
-Usage:  docker diff CONTAINER
-
-Inspect changes on a container's filesystem
-
-Options:
-      --help   Print usage
-```
-
-List the changed files and directories in a container᾿s filesystem.
- There are 3 events that are listed in the `diff`:
-
-1. `A` - Add
-2. `D` - Delete
-3. `C` - Change
-
-For example:
-
-    $ docker diff 7bb0e258aefe
-
-    C /dev
-    A /dev/kmsg
-    C /etc
-    A /etc/mtab
-    A /go
-    A /go/src
-    A /go/src/github.com
-    A /go/src/github.com/docker
-    A /go/src/github.com/docker/docker
-    A /go/src/github.com/docker/docker/.git
-    ....
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/docker_images.gif b/installer/vendor/github.com/docker/docker/docs/reference/commandline/docker_images.gif
deleted file mode 100644
index 5894ca270e..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/reference/commandline/docker_images.gif and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/dockerd.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/dockerd.md
deleted file mode 100644
index 24ac77611d..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/dockerd.md
+++ /dev/null
@@ -1,1364 +0,0 @@
----
-title: "dockerd"
-aliases: ["/engine/reference/commandline/daemon/"]
-description: "The daemon command description and usage"
-keywords: "container, daemon, runtime"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# daemon
-
-```markdown
-Usage: dockerd [OPTIONS]
-
-A self-sufficient runtime for containers.
-
-Options:
-      --add-runtime value                     Register an additional OCI compatible runtime (default [])
-      --api-cors-header string                Set CORS headers in the Engine API
-      --authorization-plugin value            Authorization plugins to load (default [])
-      --bip string                            Specify network bridge IP
-  -b, --bridge string                         Attach containers to a network bridge
-      --cgroup-parent string                  Set parent cgroup for all containers
-      --cluster-advertise string              Address or interface name to advertise
-      --cluster-store string                  URL of the distributed storage backend
-      --cluster-store-opt value               Set cluster store options (default map[])
-      --config-file string                    Daemon configuration file (default "/etc/docker/daemon.json")
-      --containerd string                     Path to containerd socket
-  -D, --debug                                 Enable debug mode
-      --default-gateway value                 Container default gateway IPv4 address
-      --default-gateway-v6 value              Container default gateway IPv6 address
-      --default-runtime string                Default OCI runtime for containers (default "runc")
-      --default-ulimit value                  Default ulimits for containers (default [])
-      --disable-legacy-registry               Disable contacting legacy registries
-      --dns value                             DNS server to use (default [])
-      --dns-opt value                         DNS options to use (default [])
-      --dns-search value                      DNS search domains to use (default [])
-      --exec-opt value                        Runtime execution options (default [])
-      --exec-root string                      Root directory for execution state files (default "/var/run/docker")
-      --experimental                          Enable experimental features
-      --fixed-cidr string                     IPv4 subnet for fixed IPs
-      --fixed-cidr-v6 string                  IPv6 subnet for fixed IPs
-  -g, --graph string                          Root of the Docker runtime (default "/var/lib/docker")
-  -G, --group string                          Group for the unix socket (default "docker")
-      --help                                  Print usage
-  -H, --host value                            Daemon socket(s) to connect to (default [])
-      --icc                                   Enable inter-container communication (default true)
-      --init                                  Run an init in the container to forward signals and reap processes
-      --init-path string                      Path to the docker-init binary
-      --insecure-registry value               Enable insecure registry communication (default [])
-      --ip value                              Default IP when binding container ports (default 0.0.0.0)
-      --ip-forward                            Enable net.ipv4.ip_forward (default true)
-      --ip-masq                               Enable IP masquerading (default true)
-      --iptables                              Enable addition of iptables rules (default true)
-      --ipv6                                  Enable IPv6 networking
-      --label value                           Set key=value labels to the daemon (default [])
-      --live-restore                          Enable live restore of docker when containers are still running (Linux only)
-      --log-driver string                     Default driver for container logs (default "json-file")
-  -l, --log-level string                      Set the logging level ("debug", "info", "warn", "error", "fatal") (default "info")
-      --log-opt value                         Default log driver options for containers (default map[])
-      --max-concurrent-downloads int          Set the max concurrent downloads for each pull (default 3)
-      --max-concurrent-uploads int            Set the max concurrent uploads for each push (default 5)
-      --metrics-addr string                   Set address and port to serve the metrics api (default "")
-      --mtu int                               Set the containers network MTU
-      --oom-score-adjust int                  Set the oom_score_adj for the daemon (default -500)
-  -p, --pidfile string                        Path to use for daemon PID file (default "/var/run/docker.pid")
-      --raw-logs                              Full timestamps without ANSI coloring
-      --registry-mirror value                 Preferred Docker registry mirror (default [])
-      --seccomp-profile value                 Path to seccomp profile
-      --selinux-enabled                       Enable selinux support
-      --shutdown-timeout=15                   Set the shutdown timeout value in seconds
-  -s, --storage-driver string                 Storage driver to use
-      --storage-opt value                     Storage driver options (default [])
-      --swarm-default-advertise-addr string   Set default address or interface for swarm advertised address
-      --tls                                   Use TLS; implied by --tlsverify
-      --tlscacert string                      Trust certs signed only by this CA (default "/root/.docker/ca.pem")
-      --tlscert string                        Path to TLS certificate file (default "/root/.docker/cert.pem")
-      --tlskey string                         Path to TLS key file (default "/root/.docker/key.pem")
-      --tlsverify                             Use TLS and verify the remote
-      --userland-proxy                        Use userland proxy for loopback traffic (default true)
-      --userland-proxy-path string            Path to the userland proxy binary
-      --userns-remap string                   User/Group setting for user namespaces
-  -v, --version                               Print version information and quit
-```
-
-Options with [] may be specified multiple times.
-
-dockerd is the persistent process that manages containers. Docker
-uses different binaries for the daemon and client. To run the daemon you
-type `dockerd`.
-
-To run the daemon with debug output, use `dockerd -D`.
-
-## Daemon socket option
-
-The Docker daemon can listen for [Docker Engine API](../api/)
-requests via three different types of Socket: `unix`, `tcp`, and `fd`.
-
-By default, a `unix` domain socket (or IPC socket) is created at
-`/var/run/docker.sock`, requiring either `root` permission, or `docker` group
-membership.
-
-If you need to access the Docker daemon remotely, you need to enable the `tcp`
-Socket. Beware that the default setup provides un-encrypted and
-un-authenticated direct access to the Docker daemon - and should be secured
-either using the [built in HTTPS encrypted socket](https://docs.docker.com/engine/security/https/), or by
-putting a secure web proxy in front of it. You can listen on port `2375` on all
-network interfaces with `-H tcp://0.0.0.0:2375`, or on a particular network
-interface using its IP address: `-H tcp://192.168.59.103:2375`. It is
-conventional to use port `2375` for un-encrypted, and port `2376` for encrypted
-communication with the daemon.
-
-> **Note:**
-> If you're using an HTTPS encrypted socket, keep in mind that only
-> TLS1.0 and greater are supported. Protocols SSLv3 and under are not
-> supported anymore for security reasons.
-
-On Systemd based systems, you can communicate with the daemon via
-[Systemd socket activation](http://0pointer.de/blog/projects/socket-activation.html),
-use `dockerd -H fd://`. Using `fd://` will work perfectly for most setups but
-you can also specify individual sockets: `dockerd -H fd://3`. If the
-specified socket activated files aren't found, then Docker will exit. You can
-find examples of using Systemd socket activation with Docker and Systemd in the
-[Docker source tree](https://github.com/docker/docker/tree/master/contrib/init/systemd/).
-
-You can configure the Docker daemon to listen to multiple sockets at the same
-time using multiple `-H` options:
-
-```bash
-# listen using the default unix socket, and on 2 specific IP addresses on this host.
-$ sudo dockerd -H unix:///var/run/docker.sock -H tcp://192.168.59.106 -H tcp://10.10.10.2
-```
-
-The Docker client will honor the `DOCKER_HOST` environment variable to set the
-`-H` flag for the client.
-
-```bash
-$ docker -H tcp://0.0.0.0:2375 ps
-# or
-$ export DOCKER_HOST="tcp://0.0.0.0:2375"
-$ docker ps
-# both are equal
-```
-
-Setting the `DOCKER_TLS_VERIFY` environment variable to any value other than
-the empty string is equivalent to setting the `--tlsverify` flag. The following
-are equivalent:
-
-```bash
-$ docker --tlsverify ps
-# or
-$ export DOCKER_TLS_VERIFY=1
-$ docker ps
-```
-
-The Docker client will honor the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
-environment variables (or the lowercase versions thereof). `HTTPS_PROXY` takes
-precedence over `HTTP_PROXY`.
-
-### Bind Docker to another host/port or a Unix socket
-
-> **Warning**:
-> Changing the default `docker` daemon binding to a
-> TCP port or Unix *docker* user group will increase your security risks
-> by allowing non-root users to gain *root* access on the host. Make sure
-> you control access to `docker`. If you are binding
-> to a TCP port, anyone with access to that port has full Docker access;
-> so it is not advisable on an open network.
-
-With `-H` it is possible to make the Docker daemon to listen on a
-specific IP and port. By default, it will listen on
-`unix:///var/run/docker.sock` to allow only local connections by the
-*root* user. You *could* set it to `0.0.0.0:2375` or a specific host IP
-to give access to everybody, but that is **not recommended** because
-then it is trivial for someone to gain root access to the host where the
-daemon is running.
-
-Similarly, the Docker client can use `-H` to connect to a custom port.
-The Docker client will default to connecting to `unix:///var/run/docker.sock`
-on Linux, and `tcp://127.0.0.1:2376` on Windows.
-
-`-H` accepts host and port assignment in the following format:
-
-    tcp://[host]:[port][path] or unix://path
-
-For example:
-
--   `tcp://` -> TCP connection to `127.0.0.1` on either port `2376` when TLS encryption
-    is on, or port `2375` when communication is in plain text.
--   `tcp://host:2375` -> TCP connection on
-    host:2375
--   `tcp://host:2375/path` -> TCP connection on
-    host:2375 and prepend path to all requests
--   `unix://path/to/socket` -> Unix socket located
-    at `path/to/socket`
-
-`-H`, when empty, will default to the same value as
-when no `-H` was passed in.
-
-`-H` also accepts short form for TCP bindings: `host:` or `host:port` or `:port`
-
-Run Docker in daemon mode:
-
-```bash
-$ sudo <path to>/dockerd -H 0.0.0.0:5555 &
-```
-
-Download an `ubuntu` image:
-
-```bash
-$ docker -H :5555 pull ubuntu
-```
-
-You can use multiple `-H`, for example, if you want to listen on both
-TCP and a Unix socket
-
-```bash
-# Run docker in daemon mode
-$ sudo <path to>/dockerd -H tcp://127.0.0.1:2375 -H unix:///var/run/docker.sock &
-# Download an ubuntu image, use default Unix socket
-$ docker pull ubuntu
-# OR use the TCP port
-$ docker -H tcp://127.0.0.1:2375 pull ubuntu
-```
-
-### Daemon storage-driver option
-
-The Docker daemon has support for several different image layer storage
-drivers: `aufs`, `devicemapper`, `btrfs`, `zfs`, `overlay` and `overlay2`.
-
-The `aufs` driver is the oldest, but is based on a Linux kernel patch-set that
-is unlikely to be merged into the main kernel. These are also known to cause
-some serious kernel crashes. However, `aufs` allows containers to share
-executable and shared library memory, so is a useful choice when running
-thousands of containers with the same program or libraries.
-
-The `devicemapper` driver uses thin provisioning and Copy on Write (CoW)
-snapshots. For each devicemapper graph location – typically
-`/var/lib/docker/devicemapper` – a thin pool is created based on two block
-devices, one for data and one for metadata. By default, these block devices
-are created automatically by using loopback mounts of automatically created
-sparse files. Refer to [Storage driver options](#storage-driver-options) below
-for a way how to customize this setup.
-[~jpetazzo/Resizing Docker containers with the Device Mapper plugin](http://jpetazzo.github.io/2014/01/29/docker-device-mapper-resize/)
-article explains how to tune your existing setup without the use of options.
-
-The `btrfs` driver is very fast for `docker build` - but like `devicemapper`
-does not share executable memory between devices. Use
-`dockerd -s btrfs -g /mnt/btrfs_partition`.
-
-The `zfs` driver is probably not as fast as `btrfs` but has a longer track record
-on stability. Thanks to `Single Copy ARC` shared blocks between clones will be
-cached only once. Use `dockerd -s zfs`. To select a different zfs filesystem
-set `zfs.fsname` option as described in [Storage driver options](#storage-driver-options).
-
-The `overlay` is a very fast union filesystem. It is now merged in the main
-Linux kernel as of [3.18.0](https://lkml.org/lkml/2014/10/26/137). `overlay`
-also supports page cache sharing, this means multiple containers accessing
-the same file can share a single page cache entry (or entries), it makes
-`overlay` as efficient with memory as `aufs` driver. Call
-`dockerd -s overlay` to use it.
-
-> **Note:**
-> As promising as `overlay` is, the feature is still quite young and should not
-> be used in production. Most notably, using `overlay` can cause excessive
-> inode consumption (especially as the number of images grows), as well as
-> being incompatible with the use of RPMs.
-
-The `overlay2` uses the same fast union filesystem but takes advantage of
-[additional features](https://lkml.org/lkml/2015/2/11/106) added in Linux
-kernel 4.0 to avoid excessive inode consumption. Call `dockerd -s overlay2`
-to use it.
-
-> **Note:**
-> Both `overlay` and `overlay2` are currently unsupported on `btrfs` or any
-> Copy on Write filesystem and should only be used over `ext4` partitions.
-
-### Storage driver options
-
-Particular storage-driver can be configured with options specified with
-`--storage-opt` flags. Options for `devicemapper` are prefixed with `dm`,
-options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`.
-
-#### Devicemapper options
-
-*   `dm.thinpooldev`
-
-    Specifies a custom block storage device to use for the thin pool.
-
-    If using a block device for device mapper storage, it is best to use `lvm`
-    to create and manage the thin-pool volume. This volume is then handed to Docker
-    to exclusively create snapshot volumes needed for images and containers.
-
-    Managing the thin-pool outside of Engine makes for the most feature-rich
-    method of having Docker utilize device mapper thin provisioning as the
-    backing storage for Docker containers. The highlights of the lvm-based
-    thin-pool management feature include: automatic or interactive thin-pool
-    resize support, dynamically changing thin-pool features, automatic thinp
-    metadata checking when lvm activates the thin-pool, etc.
-
-    As a fallback if no thin pool is provided, loopback files are
-    created. Loopback is very slow, but can be used without any
-    pre-configuration of storage. It is strongly recommended that you do
-    not use loopback in production. Ensure your Engine daemon has a
-    `--storage-opt dm.thinpooldev` argument provided.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.thinpooldev=/dev/mapper/thin-pool
-    ```
-
-*   `dm.basesize`
-
-    Specifies the size to use when creating the base device, which limits the
-    size of images and containers. The default value is 10G. Note, thin devices
-    are inherently "sparse", so a 10G device which is mostly empty doesn't use
-    10 GB of space on the pool. However, the filesystem will use more space for
-    the empty case the larger the device is.
-
-    The base device size can be increased at daemon restart which will allow
-    all future images and containers (based on those new images) to be of the
-    new base device size.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.basesize=50G
-    ```
-
-    This will increase the base device size to 50G. The Docker daemon will throw an
-    error if existing base device size is larger than 50G. A user can use
-    this option to expand the base device size however shrinking is not permitted.
-
-    This value affects the system-wide "base" empty filesystem
-    that may already be initialized and inherited by pulled images. Typically,
-    a change to this value requires additional steps to take effect:
-
-     ```bash
-    $ sudo service docker stop
-    $ sudo rm -rf /var/lib/docker
-    $ sudo service docker start
-    ```
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.basesize=20G
-    ```
-
-*   `dm.loopdatasize`
-
-    > **Note**:
-    > This option configures devicemapper loopback, which should not
-    > be used in production.
-
-    Specifies the size to use when creating the loopback file for the
-    "data" device which is used for the thin pool. The default size is
-    100G. The file is sparse, so it will not initially take up this
-    much space.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.loopdatasize=200G
-    ```
-
-*   `dm.loopmetadatasize`
-
-    > **Note**:
-    > This option configures devicemapper loopback, which should not
-    > be used in production.
-
-    Specifies the size to use when creating the loopback file for the
-    "metadata" device which is used for the thin pool. The default size
-    is 2G. The file is sparse, so it will not initially take up
-    this much space.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.loopmetadatasize=4G
-    ```
-
-*   `dm.fs`
-
-    Specifies the filesystem type to use for the base device. The supported
-    options are "ext4" and "xfs". The default is "xfs"
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.fs=ext4
-    ```
-
-*   `dm.mkfsarg`
-
-    Specifies extra mkfs arguments to be used when creating the base device.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt "dm.mkfsarg=-O ^has_journal"
-    ```
-
-*   `dm.mountopt`
-
-    Specifies extra mount options used when mounting the thin devices.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.mountopt=nodiscard
-    ```
-
-*   `dm.datadev`
-
-    (Deprecated, use `dm.thinpooldev`)
-
-    Specifies a custom blockdevice to use for data for the thin pool.
-
-    If using a block device for device mapper storage, ideally both datadev and
-    metadatadev should be specified to completely avoid using the loopback
-    device.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd \
-          --storage-opt dm.datadev=/dev/sdb1 \
-          --storage-opt dm.metadatadev=/dev/sdc1
-    ```
-
-*   `dm.metadatadev`
-
-    (Deprecated, use `dm.thinpooldev`)
-
-    Specifies a custom blockdevice to use for metadata for the thin pool.
-
-    For best performance the metadata should be on a different spindle than the
-    data, or even better on an SSD.
-
-    If setting up a new metadata pool it is required to be valid. This can be
-    achieved by zeroing the first 4k to indicate empty metadata, like this:
-
-    ```bash
-    $ dd if=/dev/zero of=$metadata_dev bs=4096 count=1
-    ```
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd \
-          --storage-opt dm.datadev=/dev/sdb1 \
-          --storage-opt dm.metadatadev=/dev/sdc1
-    ```
-
-*   `dm.blocksize`
-
-    Specifies a custom blocksize to use for the thin pool. The default
-    blocksize is 64K.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.blocksize=512K
-    ```
-
-*   `dm.blkdiscard`
-
-    Enables or disables the use of blkdiscard when removing devicemapper
-    devices. This is enabled by default (only) if using loopback devices and is
-    required to resparsify the loopback file on image/container removal.
-
-    Disabling this on loopback can lead to *much* faster container removal
-    times, but will make the space used in `/var/lib/docker` directory not be
-    returned to the system for other use when containers are removed.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.blkdiscard=false
-    ```
-
-*   `dm.override_udev_sync_check`
-
-    Overrides the `udev` synchronization checks between `devicemapper` and `udev`.
-    `udev` is the device manager for the Linux kernel.
-
-    To view the `udev` sync support of a Docker daemon that is using the
-    `devicemapper` driver, run:
-
-    ```bash
-    $ docker info
-    [...]
-    Udev Sync Supported: true
-    [...]
-    ```
-
-    When `udev` sync support is `true`, then `devicemapper` and udev can
-    coordinate the activation and deactivation of devices for containers.
-
-    When `udev` sync support is `false`, a race condition occurs between
-    the`devicemapper` and `udev` during create and cleanup. The race condition
-    results in errors and failures. (For information on these failures, see
-    [docker#4036](https://github.com/docker/docker/issues/4036))
-
-    To allow the `docker` daemon to start, regardless of `udev` sync not being
-    supported, set `dm.override_udev_sync_check` to true:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.override_udev_sync_check=true
-    ```
-
-    When this value is `true`, the  `devicemapper` continues and simply warns
-    you the errors are happening.
-
-    > **Note:**
-    > The ideal is to pursue a `docker` daemon and environment that does
-    > support synchronizing with `udev`. For further discussion on this
-    > topic, see [docker#4036](https://github.com/docker/docker/issues/4036).
-    > Otherwise, set this flag for migrating existing Docker daemons to
-    > a daemon with a supported environment.
-
-*   `dm.use_deferred_removal`
-
-    Enables use of deferred device removal if `libdm` and the kernel driver
-    support the mechanism.
-
-    Deferred device removal means that if device is busy when devices are
-    being removed/deactivated, then a deferred removal is scheduled on
-    device. And devices automatically go away when last user of the device
-    exits.
-
-    For example, when a container exits, its associated thin device is removed.
-    If that device has leaked into some other mount namespace and can't be
-    removed, the container exit still succeeds and this option causes the
-    system to schedule the device for deferred removal. It does not wait in a
-    loop trying to remove a busy device.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.use_deferred_removal=true
-    ```
-
-*   `dm.use_deferred_deletion`
-
-    Enables use of deferred device deletion for thin pool devices. By default,
-    thin pool device deletion is synchronous. Before a container is deleted,
-    the Docker daemon removes any associated devices. If the storage driver
-    can not remove a device, the container deletion fails and daemon returns.
-
-        Error deleting container: Error response from daemon: Cannot destroy container
-
-    To avoid this failure, enable both deferred device deletion and deferred
-    device removal on the daemon.
-
-    ```bash
-    $ sudo dockerd \
-          --storage-opt dm.use_deferred_deletion=true \
-          --storage-opt dm.use_deferred_removal=true
-    ```
-
-    With these two options enabled, if a device is busy when the driver is
-    deleting a container, the driver marks the device as deleted. Later, when
-    the device isn't in use, the driver deletes it.
-
-    In general it should be safe to enable this option by default. It will help
-    when unintentional leaking of mount point happens across multiple mount
-    namespaces.
-
-*   `dm.min_free_space`
-
-    Specifies the min free space percent in a thin pool require for new device
-    creation to succeed. This check applies to both free data space as well
-    as free metadata space. Valid values are from 0% - 99%. Value 0% disables
-    free space checking logic. If user does not specify a value for this option,
-    the Engine uses a default value of 10%.
-
-    Whenever a new a thin pool device is created (during `docker pull` or during
-    container creation), the Engine checks if the minimum free space is
-    available. If sufficient space is unavailable, then device creation fails
-    and any relevant `docker` operation fails.
-
-    To recover from this error, you must create more free space in the thin pool
-    to recover from the error. You can create free space by deleting some images
-    and containers from the thin pool. You can also add more storage to the thin
-    pool.
-
-    To add more space to a LVM (logical volume management) thin pool, just add
-    more storage to the volume group container thin pool; this should automatically
-    resolve any errors. If your configuration uses loop devices, then stop the
-    Engine daemon, grow the size of loop files and restart the daemon to resolve
-    the issue.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.min_free_space=10%
-    ```
-
-*  `dm.xfs_nospace_max_retries`
-
-    Specifies the maximum number of retries XFS should attempt to complete
-    IO when ENOSPC (no space) error is returned by underlying storage device.
-
-    By default XFS retries infinitely for IO to finish and this can result
-    in unkillable process. To change this behavior one can set
-    xfs_nospace_max_retries to say 0 and XFS will not retry IO after getting
-    ENOSPC and will shutdown filesystem.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd --storage-opt dm.xfs_nospace_max_retries=0
-    ```
-
-#### ZFS options
-
-*   `zfs.fsname`
-
-    Set zfs filesystem under which docker will create its own datasets.
-    By default docker will pick up the zfs filesystem where docker graph
-    (`/var/lib/docker`) is located.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd -s zfs --storage-opt zfs.fsname=zroot/docker
-    ```
-
-#### Btrfs options
-
-*   `btrfs.min_space`
-
-    Specifies the minimum size to use when creating the subvolume which is used
-    for containers. If user uses disk quota for btrfs when creating or running
-    a container with **--storage-opt size** option, docker should ensure the
-    **size** cannot be smaller than **btrfs.min_space**.
-
-    Example use:
-
-    ```bash
-    $ sudo dockerd -s btrfs --storage-opt btrfs.min_space=10G
-    ```
-
-#### Overlay2 options
-
-*   `overlay2.override_kernel_check`
-
-    Overrides the Linux kernel version check allowing overlay2. Support for
-    specifying multiple lower directories needed by overlay2 was added to the
-    Linux kernel in 4.0.0. However some older kernel versions may be patched
-    to add multiple lower directory support for OverlayFS. This option should
-    only be used after verifying this support exists in the kernel. Applying
-    this option on a kernel without this support will cause failures on mount.
-
-## Docker runtime execution options
-
-The Docker daemon relies on a
-[OCI](https://github.com/opencontainers/runtime-spec) compliant runtime
-(invoked via the `containerd` daemon) as its interface to the Linux
-kernel `namespaces`, `cgroups`, and `SELinux`.
-
-By default, the Docker daemon automatically starts `containerd`. If you want to
-control `containerd` startup, manually start `containerd` and pass the path to
-the `containerd` socket using the `--containerd` flag. For example:
-
-```bash
-$ sudo dockerd --containerd /var/run/dev/docker-containerd.sock
-```
-
-Runtimes can be registered with the daemon either via the
-configuration file or using the `--add-runtime` command line argument.
-
-The following is an example adding 2 runtimes via the configuration:
-
-```json
-{
-	"default-runtime": "runc",
-	"runtimes": {
-		"runc": {
-			"path": "runc"
-		},
-		"custom": {
-			"path": "/usr/local/bin/my-runc-replacement",
-			"runtimeArgs": [
-				"--debug"
-			]
-		}
-	}
-}
-```
-
-This is the same example via the command line:
-
-```bash
-$ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-runc-replacement
-```
-
-> **Note**: defining runtime arguments via the command line is not supported.
-
-## Options for the runtime
-
-You can configure the runtime using options specified
-with the `--exec-opt` flag. All the flag's options have the `native` prefix. A
-single `native.cgroupdriver` option is available.
-
-The `native.cgroupdriver` option specifies the management of the container's
-cgroups. You can specify only specify `cgroupfs` or `systemd`. If you specify
-`systemd` and it is not available, the system errors out. If you omit the
-`native.cgroupdriver` option,` cgroupfs` is used.
-
-This example sets the `cgroupdriver` to `systemd`:
-
-```bash
-$ sudo dockerd --exec-opt native.cgroupdriver=systemd
-```
-
-Setting this option applies to all containers the daemon launches.
-
-Also Windows Container makes use of `--exec-opt` for special purpose. Docker user
-can specify default container isolation technology with this, for example:
-
-```bash
-$ sudo dockerd --exec-opt isolation=hyperv
-```
-
-Will make `hyperv` the default isolation technology on Windows. If no isolation
-value is specified on daemon start, on Windows client, the default is
-`hyperv`, and on Windows server, the default is `process`.
-
-## Daemon DNS options
-
-To set the DNS server for all Docker containers, use:
-
-```bash
-$ sudo dockerd --dns 8.8.8.8
-```
-
-
-To set the DNS search domain for all Docker containers, use:
-
-```bash
-$ sudo dockerd --dns-search example.com
-```
-
-
-## Insecure registries
-
-Docker considers a private registry either secure or insecure. In the rest of
-this section, *registry* is used for *private registry*, and `myregistry:5000`
-is a placeholder example for a private registry.
-
-A secure registry uses TLS and a copy of its CA certificate is placed on the
-Docker host at `/etc/docker/certs.d/myregistry:5000/ca.crt`. An insecure
-registry is either not using TLS (i.e., listening on plain text HTTP), or is
-using TLS with a CA certificate not known by the Docker daemon. The latter can
-happen when the certificate was not found under
-`/etc/docker/certs.d/myregistry:5000/`, or if the certificate verification
-failed (i.e., wrong CA).
-
-By default, Docker assumes all, but local (see local registries below),
-registries are secure. Communicating with an insecure registry is not possible
-if Docker assumes that registry is secure. In order to communicate with an
-insecure registry, the Docker daemon requires `--insecure-registry` in one of
-the following two forms:
-
-* `--insecure-registry myregistry:5000` tells the Docker daemon that
-  myregistry:5000 should be considered insecure.
-* `--insecure-registry 10.1.0.0/16` tells the Docker daemon that all registries
-  whose domain resolve to an IP address is part of the subnet described by the
-  CIDR syntax, should be considered insecure.
-
-The flag can be used multiple times to allow multiple registries to be marked
-as insecure.
-
-If an insecure registry is not marked as insecure, `docker pull`,
-`docker push`, and `docker search` will result in an error message prompting
-the user to either secure or pass the `--insecure-registry` flag to the Docker
-daemon as described above.
-
-Local registries, whose IP address falls in the 127.0.0.0/8 range, are
-automatically marked as insecure as of Docker 1.3.2. It is not recommended to
-rely on this, as it may change in the future.
-
-Enabling `--insecure-registry`, i.e., allowing un-encrypted and/or untrusted
-communication, can be useful when running a local registry.  However,
-because its use creates security vulnerabilities it should ONLY be enabled for
-testing purposes.  For increased security, users should add their CA to their
-system's list of trusted CAs instead of enabling `--insecure-registry`.
-
-## Legacy Registries
-
-Enabling `--disable-legacy-registry` forces a docker daemon to only interact with registries which support the V2 protocol.  Specifically, the daemon will not attempt `push`, `pull` and `login` to v1 registries.  The exception to this is `search` which can still be performed on v1 registries.
-
-## Running a Docker daemon behind an HTTPS_PROXY
-
-When running inside a LAN that uses an `HTTPS` proxy, the Docker Hub
-certificates will be replaced by the proxy's certificates. These certificates
-need to be added to your Docker host's configuration:
-
-1. Install the `ca-certificates` package for your distribution
-2. Ask your network admin for the proxy's CA certificate and append them to
-   `/etc/pki/tls/certs/ca-bundle.crt`
-3. Then start your Docker daemon with `HTTPS_PROXY=http://username:password@proxy:port/ dockerd`.
-   The `username:` and `password@` are optional - and are only needed if your
-   proxy is set up to require authentication.
-
-This will only add the proxy and authentication to the Docker daemon's requests -
-your `docker build`s and running containers will need extra configuration to
-use the proxy
-
-## Default Ulimits
-
-`--default-ulimit` allows you to set the default `ulimit` options to use for
-all containers. It takes the same options as `--ulimit` for `docker run`. If
-these defaults are not set, `ulimit` settings will be inherited, if not set on
-`docker run`, from the Docker daemon. Any `--ulimit` options passed to
-`docker run` will overwrite these defaults.
-
-Be careful setting `nproc` with the `ulimit` flag as `nproc` is designed by Linux to
-set the maximum number of processes available to a user, not to a container. For details
-please check the [run](run.md) reference.
-
-## Nodes discovery
-
-The `--cluster-advertise` option specifies the `host:port` or `interface:port`
-combination that this particular daemon instance should use when advertising
-itself to the cluster. The daemon is reached by remote hosts through this value.
-If you  specify an interface, make sure it includes the IP address of the actual
-Docker host. For Engine installation created through `docker-machine`, the
-interface is typically `eth1`.
-
-The daemon uses [libkv](https://github.com/docker/libkv/) to advertise
-the node within the cluster. Some key-value backends support mutual
-TLS. To configure the client TLS settings used by the daemon can be configured
-using the `--cluster-store-opt` flag, specifying the paths to PEM encoded
-files. For example:
-
-```bash
-$ sudo dockerd \
-    --cluster-advertise 192.168.1.2:2376 \
-    --cluster-store etcd://192.168.1.2:2379 \
-    --cluster-store-opt kv.cacertfile=/path/to/ca.pem \
-    --cluster-store-opt kv.certfile=/path/to/cert.pem \
-    --cluster-store-opt kv.keyfile=/path/to/key.pem
-```
-
-The currently supported cluster store options are:
-
-*   `discovery.heartbeat`
-
-    Specifies the heartbeat timer in seconds which is used by the daemon as a
-    keepalive mechanism to make sure discovery module treats the node as alive
-    in the cluster. If not configured, the default value is 20 seconds.
-
-*   `discovery.ttl`
-
-    Specifies the ttl (time-to-live) in seconds which is used by the discovery
-    module to timeout a node if a valid heartbeat is not received within the
-    configured ttl value. If not configured, the default value is 60 seconds.
-
-*   `kv.cacertfile`
-
-    Specifies the path to a local file with PEM encoded CA certificates to trust
-
-*   `kv.certfile`
-
-    Specifies the path to a local file with a PEM encoded certificate.  This
-    certificate is used as the client cert for communication with the
-    Key/Value store.
-
-*   `kv.keyfile`
-
-    Specifies the path to a local file with a PEM encoded private key.  This
-    private key is used as the client key for communication with the
-    Key/Value store.
-
-*   `kv.path`
-
-    Specifies the path in the Key/Value store. If not configured, the default value is 'docker/nodes'.
-
-## Access authorization
-
-Docker's access authorization can be extended by authorization plugins that your
-organization can purchase or build themselves. You can install one or more
-authorization plugins when you start the Docker `daemon` using the
-`--authorization-plugin=PLUGIN_ID` option.
-
-```bash
-$ sudo dockerd --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
-```
-
-The `PLUGIN_ID` value is either the plugin's name or a path to its specification
-file. The plugin's implementation determines whether you can specify a name or
-path. Consult with your Docker administrator to get information about the
-plugins available to you.
-
-Once a plugin is installed, requests made to the `daemon` through the command
-line or Docker's Engine API are allowed or denied by the plugin.  If you have
-multiple plugins installed, at least one must allow the request for it to
-complete.
-
-For information about how to create an authorization plugin, see [authorization
-plugin](../../extend/plugins_authorization.md) section in the Docker extend section of this documentation.
-
-
-## Daemon user namespace options
-
-The Linux kernel [user namespace support](http://man7.org/linux/man-pages/man7/user_namespaces.7.html) provides additional security by enabling
-a process, and therefore a container, to have a unique range of user and
-group IDs which are outside the traditional user and group range utilized by
-the host system. Potentially the most important security improvement is that,
-by default, container processes running as the `root` user will have expected
-administrative privilege (with some restrictions) inside the container but will
-effectively be mapped to an unprivileged `uid` on the host.
-
-When user namespace support is enabled, Docker creates a single daemon-wide mapping
-for all containers running on the same engine instance. The mappings will
-utilize the existing subordinate user and group ID feature available on all modern
-Linux distributions.
-The [`/etc/subuid`](http://man7.org/linux/man-pages/man5/subuid.5.html) and
-[`/etc/subgid`](http://man7.org/linux/man-pages/man5/subgid.5.html) files will be
-read for the user, and optional group, specified to the `--userns-remap`
-parameter.  If you do not wish to specify your own user and/or group, you can
-provide `default` as the value to this flag, and a user will be created on your behalf
-and provided subordinate uid and gid ranges. This default user will be named
-`dockremap`, and entries will be created for it in `/etc/passwd` and
-`/etc/group` using your distro's standard user and group creation tools.
-
-> **Note**: The single mapping per-daemon restriction is in place for now
-> because Docker shares image layers from its local cache across all
-> containers running on the engine instance.  Since file ownership must be
-> the same for all containers sharing the same layer content, the decision
-> was made to map the file ownership on `docker pull` to the daemon's user and
-> group mappings so that there is no delay for running containers once the
-> content is downloaded. This design preserves the same performance for `docker
-> pull`, `docker push`, and container startup as users expect with
-> user namespaces disabled.
-
-### Starting the daemon with user namespaces enabled
-
-To enable user namespace support, start the daemon with the
-`--userns-remap` flag, which accepts values in the following formats:
-
- - uid
- - uid:gid
- - username
- - username:groupname
-
-If numeric IDs are provided, translation back to valid user or group names
-will occur so that the subordinate uid and gid information can be read, given
-these resources are name-based, not id-based.  If the numeric ID information
-provided does not exist as entries in `/etc/passwd` or `/etc/group`, daemon
-startup will fail with an error message.
-
-**Example: starting with default Docker user management:**
-
-```bash
-$ sudo dockerd --userns-remap=default
-```
-
-When `default` is provided, Docker will create - or find the existing - user and group
-named `dockremap`. If the user is created, and the Linux distribution has
-appropriate support, the `/etc/subuid` and `/etc/subgid` files will be populated
-with a contiguous 65536 length range of subordinate user and group IDs, starting
-at an offset based on prior entries in those files.  For example, Ubuntu will
-create the following range, based on an existing user named `user1` already owning
-the first 65536 range:
-
-```bash
-$ cat /etc/subuid
-user1:100000:65536
-dockremap:165536:65536
-```
-
-If you have a preferred/self-managed user with subordinate ID mappings already
-configured, you can provide that username or uid to the `--userns-remap` flag.
-If you have a group that doesn't match the username, you may provide the `gid`
-or group name as well; otherwise the username will be used as the group name
-when querying the system for the subordinate group ID range.
-
-The output of `docker info` can be used to determine if the daemon is running
-with user namespaces enabled or not. If the daemon is configured with user
-namespaces, the Security Options entry in the response will list "userns" as
-one of the enabled security features.
-
-### Detailed information on `subuid`/`subgid` ranges
-
-Given potential advanced use of the subordinate ID ranges by power users, the
-following paragraphs define how the Docker daemon currently uses the range entries
-found within the subordinate range files.
-
-The simplest case is that only one contiguous range is defined for the
-provided user or group. In this case, Docker will use that entire contiguous
-range for the mapping of host uids and gids to the container process.  This
-means that the first ID in the range will be the remapped root user, and the
-IDs above that initial ID will map host ID 1 through the end of the range.
-
-From the example `/etc/subuid` content shown above, the remapped root
-user would be uid 165536.
-
-If the system administrator has set up multiple ranges for a single user or
-group, the Docker daemon will read all the available ranges and use the
-following algorithm to create the mapping ranges:
-
-1. The range segments found for the particular user will be sorted by *start ID* ascending.
-2. Map segments will be created from each range in increasing value with a length matching the length of each segment. Therefore the range segment with the lowest numeric starting value will be equal to the remapped root, and continue up through host uid/gid equal to the range segment length. As an example, if the lowest segment starts at ID 1000 and has a length of 100, then a map of 1000 -> 0 (the remapped root) up through 1100 -> 100 will be created from this segment. If the next segment starts at ID 10000, then the next map will start with mapping 10000 -> 101 up to the length of this second segment. This will continue until no more segments are found in the subordinate files for this user.
-3. If more than five range segments exist for a single user, only the first five will be utilized, matching the kernel's limitation of only five entries in `/proc/self/uid_map` and `proc/self/gid_map`.
-
-### Disable user namespace for a container
-
-If you enable user namespaces on the daemon, all containers are started
-with user namespaces enabled. In some situations you might want to disable
-this feature for a container, for example, to start a privileged container (see
-[user namespace known restrictions](#user-namespace-known-restrictions)).
-To enable those advanced features for a specific container use `--userns=host`
-in the `run/exec/create` command.
-This option will completely disable user namespace mapping for the container's user.
-
-### User namespace known restrictions
-
-The following standard Docker features are currently incompatible when
-running a Docker daemon with user namespaces enabled:
-
- - sharing PID or NET namespaces with the host (`--pid=host` or `--net=host`)
- - Using `--privileged` mode flag on `docker run` (unless also specifying `--userns=host`)
-
-In general, user namespaces are an advanced feature and will require
-coordination with other capabilities. For example, if volumes are mounted from
-the host, file ownership will have to be pre-arranged if the user or
-administrator wishes the containers to have expected access to the volume
-contents. Note that when using external volume or graph driver plugins, those
-external software programs must be made aware of user and group mapping ranges
-if they are to work seamlessly with user namespace support.
-
-Finally, while the `root` user inside a user namespaced container process has
-many of the expected admin privileges that go along with being the superuser, the
-Linux kernel has restrictions based on internal knowledge that this is a user namespaced
-process. The most notable restriction that we are aware of at this time is the
-inability to use `mknod`. Permission will be denied for device creation even as
-container `root` inside a user namespace.
-
-## Miscellaneous options
-
-IP masquerading uses address translation to allow containers without a public
-IP to talk to other machines on the Internet. This may interfere with some
-network topologies and can be disabled with `--ip-masq=false`.
-
-Docker supports softlinks for the Docker data directory (`/var/lib/docker`) and
-for `/var/lib/docker/tmp`. The `DOCKER_TMPDIR` and the data directory can be
-set like this:
-
-    DOCKER_TMPDIR=/mnt/disk2/tmp /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
-    # or
-    export DOCKER_TMPDIR=/mnt/disk2/tmp
-    /usr/local/bin/dockerd -D -g /var/lib/docker -H unix:// > /var/lib/docker-machine/docker.log 2>&1
-
-## Default cgroup parent
-
-The `--cgroup-parent` option allows you to set the default cgroup parent
-to use for containers. If this option is not set, it defaults to `/docker` for
-fs cgroup driver and `system.slice` for systemd cgroup driver.
-
-If the cgroup has a leading forward slash (`/`), the cgroup is created
-under the root cgroup, otherwise the cgroup is created under the daemon
-cgroup.
-
-Assuming the daemon is running in cgroup `daemoncgroup`,
-`--cgroup-parent=/foobar` creates a cgroup in
-`/sys/fs/cgroup/memory/foobar`, whereas using `--cgroup-parent=foobar`
-creates the cgroup in `/sys/fs/cgroup/memory/daemoncgroup/foobar`
-
-The systemd cgroup driver has different rules for `--cgroup-parent`. Systemd
-represents hierarchy by slice and the name of the slice encodes the location in
-the tree. So `--cgroup-parent` for systemd cgroups should be a slice name. A
-name can consist of a dash-separated series of names, which describes the path
-to the slice from the root slice. For example, `--cgroup-parent=user-a-b.slice`
-means the memory cgroup for the container is created in
-`/sys/fs/cgroup/memory/user.slice/user-a.slice/user-a-b.slice/docker-<id>.scope`.
-
-This setting can also be set per container, using the `--cgroup-parent`
-option on `docker create` and `docker run`, and takes precedence over
-the `--cgroup-parent` option on the daemon.
-
-## Daemon Metrics
-
-The `--metrics-addr` option takes a tcp address to serve the metrics API.
-This feature is still experimental, therefore, the daemon must be running in experimental
-mode for this feature to work.
-
-To serve the metrics API on localhost:1337 you would specify `--metrics-addr 127.0.0.1:1337`
-allowing you to make requests on the API at `127.0.0.1:1337/metrics` to receive metrics in the
-[prometheus](https://prometheus.io/docs/instrumenting/exposition_formats/) format.
-
-If you are running a prometheus server you can add this address to your scrape configs
-to have prometheus collect metrics on Docker.  For more information
-on prometheus you can view the website [here](https://prometheus.io/).
-
-```yml
-scrape_configs:
-  - job_name: 'docker'
-    static_configs:
-      - targets: ['127.0.0.1:1337']
-```
-
-Please note that this feature is still marked as experimental as metrics and metric
-names could change while this feature is still in experimental.  Please provide
-feedback on what you would like to see collected in the API.
-
-## Daemon configuration file
-
-The `--config-file` option allows you to set any configuration option
-for the daemon in a JSON format. This file uses the same flag names as keys,
-except for flags that allow several entries, where it uses the plural
-of the flag name, e.g., `labels` for the `label` flag.
-
-The options set in the configuration file must not conflict with options set
-via flags. The docker daemon fails to start if an option is duplicated between
-the file and the flags, regardless their value. We do this to avoid
-silently ignore changes introduced in configuration reloads.
-For example, the daemon fails to start if you set daemon labels
-in the configuration file and also set daemon labels via the `--label` flag.
-Options that are not present in the file are ignored when the daemon starts.
-
-### Linux configuration file
-
-The default location of the configuration file on Linux is
-`/etc/docker/daemon.json`. The `--config-file` flag can be used to specify a
- non-default location.
-
-This is a full example of the allowed configuration options on Linux:
-
-```json
-{
-	"authorization-plugins": [],
-	"dns": [],
-	"dns-opts": [],
-	"dns-search": [],
-	"exec-opts": [],
-	"exec-root": "",
-	"experimental": false,
-	"storage-driver": "",
-	"storage-opts": [],
-	"labels": [],
-	"live-restore": true,
-	"log-driver": "",
-	"log-opts": {},
-	"mtu": 0,
-	"pidfile": "",
-	"graph": "",
-	"cluster-store": "",
-	"cluster-store-opts": {},
-	"cluster-advertise": "",
-	"max-concurrent-downloads": 3,
-	"max-concurrent-uploads": 5,
-	"shutdown-timeout": 15,
-	"debug": true,
-	"hosts": [],
-	"log-level": "",
-	"tls": true,
-	"tlsverify": true,
-	"tlscacert": "",
-	"tlscert": "",
-	"tlskey": "",
-	"swarm-default-advertise-addr": "",
-	"api-cors-header": "",
-	"selinux-enabled": false,
-	"userns-remap": "",
-	"group": "",
-	"cgroup-parent": "",
-	"default-ulimits": {},
-	"init": false,
-	"init-path": "/usr/libexec/docker-init",
-	"ipv6": false,
-	"iptables": false,
-	"ip-forward": false,
-	"ip-masq": false,
-	"userland-proxy": false,
-	"userland-proxy-path": "/usr/libexec/docker-proxy",
-	"ip": "0.0.0.0",
-	"bridge": "",
-	"bip": "",
-	"fixed-cidr": "",
-	"fixed-cidr-v6": "",
-	"default-gateway": "",
-	"default-gateway-v6": "",
-	"icc": false,
-	"raw-logs": false,
-	"registry-mirrors": [],
-	"seccomp-profile": "",
-	"insecure-registries": [],
-	"disable-legacy-registry": false,
-	"default-runtime": "runc",
-	"oom-score-adjust": -500,
-	"runtimes": {
-		"runc": {
-			"path": "runc"
-		},
-		"custom": {
-			"path": "/usr/local/bin/my-runc-replacement",
-			"runtimeArgs": [
-				"--debug"
-			]
-		}
-	}
-}
-```
-
-### Windows configuration file
-
-The default location of the configuration file on Windows is
- `%programdata%\docker\config\daemon.json`. The `--config-file` flag can be
- used to specify a non-default location.
-
-This is a full example of the allowed configuration options on Windows:
-
-```json
-{
-    "authorization-plugins": [],
-    "dns": [],
-    "dns-opts": [],
-    "dns-search": [],
-    "exec-opts": [],
-    "experimental": false,
-    "storage-driver": "",
-    "storage-opts": [],
-    "labels": [],
-    "log-driver": "",
-    "mtu": 0,
-    "pidfile": "",
-    "graph": "",
-    "cluster-store": "",
-    "cluster-advertise": "",
-    "max-concurrent-downloads": 3,
-    "max-concurrent-uploads": 5,
-    "shutdown-timeout": 15,
-    "debug": true,
-    "hosts": [],
-    "log-level": "",
-    "tlsverify": true,
-    "tlscacert": "",
-    "tlscert": "",
-    "tlskey": "",
-    "swarm-default-advertise-addr": "",
-    "group": "",
-    "default-ulimits": {},
-    "bridge": "",
-    "fixed-cidr": "",
-    "raw-logs": false,
-    "registry-mirrors": [],
-    "insecure-registries": [],
-    "disable-legacy-registry": false
-}
-```
-
-### Configuration reloading
-
-Some options can be reconfigured when the daemon is running without requiring
-to restart the process. We use the `SIGHUP` signal in Linux to reload, and a global event
-in Windows with the key `Global\docker-daemon-config-$PID`. The options can
-be modified in the configuration file but still will check for conflicts with
-the provided flags. The daemon fails to reconfigure itself
-if there are conflicts, but it won't stop execution.
-
-The list of currently supported options that can be reconfigured is this:
-
-- `debug`: it changes the daemon to debug mode when set to true.
-- `cluster-store`: it reloads the discovery store with the new address.
-- `cluster-store-opts`: it uses the new options to reload the discovery store.
-- `cluster-advertise`: it modifies the address advertised after reloading.
-- `labels`: it replaces the daemon labels with a new set of labels.
-- `live-restore`: Enables [keeping containers alive during daemon downtime](https://docs.docker.com/engine/admin/live-restore/).
-- `max-concurrent-downloads`: it updates the max concurrent downloads for each pull.
-- `max-concurrent-uploads`: it updates the max concurrent uploads for each push.
-- `default-runtime`: it updates the runtime to be used if not is
-  specified at container creation. It defaults to "default" which is
-  the runtime shipped with the official docker packages.
-- `runtimes`: it updates the list of available OCI runtimes that can
-  be used to run containers
-- `authorization-plugin`: specifies the authorization plugins to use.
-- `insecure-registries`: it replaces the daemon insecure registries with a new set of insecure registries. If some existing insecure registries in daemon's configuration are not in newly reloaded insecure resgitries, these existing ones will be removed from daemon's config.
-
-Updating and reloading the cluster configurations such as `--cluster-store`,
-`--cluster-advertise` and `--cluster-store-opts` will take effect only if
-these configurations were not previously configured. If `--cluster-store`
-has been provided in flags and `cluster-advertise` not, `cluster-advertise`
-can be added in the configuration file without accompanied by `--cluster-store`.
-Configuration reload will log a warning message if it detects a change in
-previously configured cluster configurations.
-
-
-## Running multiple daemons
-
-> **Note:** Running multiple daemons on a single host is considered as "experimental". The user should be aware of
-> unsolved problems. This solution may not work properly in some cases. Solutions are currently under development
-> and will be delivered in the near future.
-
-This section describes how to run multiple Docker daemons on a single host. To
-run multiple daemons, you must configure each daemon so that it does not
-conflict with other daemons on the same host. You can set these options either
-by providing them as flags, or by using a [daemon configuration file](#daemon-configuration-file).
-
-The following daemon options must be configured for each daemon:
-
-```bash
--b, --bridge=                          Attach containers to a network bridge
---exec-root=/var/run/docker            Root of the Docker execdriver
--g, --graph=/var/lib/docker            Root of the Docker runtime
--p, --pidfile=/var/run/docker.pid      Path to use for daemon PID file
--H, --host=[]                          Daemon socket(s) to connect to
---iptables=true                        Enable addition of iptables rules
---config-file=/etc/docker/daemon.json  Daemon configuration file
---tlscacert="~/.docker/ca.pem"         Trust certs signed only by this CA
---tlscert="~/.docker/cert.pem"         Path to TLS certificate file
---tlskey="~/.docker/key.pem"           Path to TLS key file
-```
-
-When your daemons use different values for these flags, you can run them on the same host without any problems.
-It is very important to properly understand the meaning of those options and to use them correctly.
-
-- The `-b, --bridge=` flag is set to `docker0` as default bridge network. It is created automatically when you install Docker.
-If you are not using the default, you must create and configure the bridge manually or just set it to 'none': `--bridge=none`
-- `--exec-root` is the path where the container state is stored. The default value is `/var/run/docker`. Specify the path for
-your running daemon here.
-- `--graph` is the path where images are stored. The default value is `/var/lib/docker`. To avoid any conflict with other daemons
-set this parameter separately for each daemon.
-- `-p, --pidfile=/var/run/docker.pid` is the path where the process ID of the daemon is stored. Specify the path for your
-pid file here.
-- `--host=[]` specifies where the Docker daemon will listen for client connections. If unspecified, it defaults to `/var/run/docker.sock`.
--  `--iptables=false` prevents the Docker daemon from adding iptables rules. If
-multiple daemons manage iptables rules, they may overwrite rules set by another
-daemon. Be aware that disabling this option requires you to manually add
-iptables rules to expose container ports. If you prevent Docker from adding
-iptables rules, Docker will also not add IP masquerading rules, even if you set
-`--ip-masq` to `true`. Without IP masquerading rules, Docker containers will not be
-able to connect to external hosts or the internet when using network other than
-default bridge.
-- `--config-file=/etc/docker/daemon.json` is the path where configuration file is stored. You can use it instead of
-daemon flags. Specify the path for each daemon.
-- `--tls*` Docker daemon supports `--tlsverify` mode that enforces encrypted and authenticated remote connections.
-The `--tls*` options enable use of specific certificates for individual daemons.
-
-Example script for a separate “bootstrap” instance of the Docker daemon without network:
-
-```bash
-$ sudo dockerd \
-        -H unix:///var/run/docker-bootstrap.sock \
-        -p /var/run/docker-bootstrap.pid \
-        --iptables=false \
-        --ip-masq=false \
-        --bridge=none \
-        --graph=/var/lib/docker-bootstrap \
-        --exec-root=/var/run/docker-bootstrap
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/events.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/events.md
deleted file mode 100644
index baa966d620..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/events.md
+++ /dev/null
@@ -1,217 +0,0 @@
----
-title: "events"
-description: "The events command description and usage"
-keywords: "events, container, report"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# events
-
-```markdown
-Usage:  docker events [OPTIONS]
-
-Get real time events from the server
-
-Options:
-  -f, --filter value   Filter output based on conditions provided (default [])
-      --format string  Format the output using the given Go template
-      --help           Print usage
-      --since string   Show all events created since timestamp
-      --until string   Stream events until this timestamp
-```
-
-Docker containers report the following events:
-
-    attach, commit, copy, create, destroy, detach, die, exec_create, exec_detach, exec_start, export, health_status, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update
-
-Docker images report the following events:
-
-    delete, import, load, pull, push, save, tag, untag
-
-Docker plugins report the following events:
-
-    install, enable, disable, remove
-
-Docker volumes report the following events:
-
-    create, mount, unmount, destroy
-
-Docker networks report the following events:
-
-    create, connect, disconnect, destroy
-
-Docker daemon report the following events:
-
-    reload
-
-The `--since` and `--until` parameters can be Unix timestamps, date formatted
-timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
-relative to the client machine’s time. If you do not provide the `--since` option,
-the command returns only new and/or live events.  Supported formats for date
-formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
-timezone on the client will be used if you do not provide either a `Z` or a
-`+-00:00` timezone offset at the end of the timestamp.  When providing Unix
-timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
-that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
-seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a
-fraction of a second no more than nine digits long.
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If you would
-like to use multiple filters, pass multiple flags (e.g.,
-`--filter "foo=bar" --filter "bif=baz"`)
-
-Using the same filter multiple times will be handled as a *OR*; for example
-`--filter container=588a23dac085 --filter container=a8f7720b8c22` will display
-events for container 588a23dac085 *OR* container a8f7720b8c22
-
-Using multiple filters will be handled as a *AND*; for example
-`--filter container=588a23dac085 --filter event=start` will display events for
-container container 588a23dac085 *AND* the event type is *start*
-
-The currently supported filters are:
-
-* container (`container=<name or id>`)
-* event (`event=<event action>`)
-* image (`image=<tag or id>`)
-* plugin (experimental) (`plugin=<name or id>`)
-* label (`label=<key>` or `label=<key>=<value>`)
-* type (`type=<container or image or volume or network or daemon>`)
-* volume (`volume=<name or id>`)
-* network (`network=<name or id>`)
-* daemon (`daemon=<name or id>`)
-
-## Format
-
-If a format (`--format`) is specified, the given template will be executed
-instead of the default
-format. Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-If a format is set to `{{json .}}`, the events are streamed as valid JSON
-Lines. For information about JSON Lines, please refer to http://jsonlines.org/ .
-
-## Examples
-
-You'll need two shells for this example.
-
-**Shell 1: Listening for events:**
-
-    $ docker events
-
-**Shell 2: Start and Stop containers:**
-
-    $ docker start 4386fb97867d
-    $ docker stop 4386fb97867d
-    $ docker stop 7805c1d35632
-
-**Shell 1: (Again .. now showing events):**
-
-    2015-05-12T11:51:30.999999999Z07:00 container start 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T11:51:30.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:52:12.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:53:45.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2015-05-12T15:54:03.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-**Show events in the past from a specified time:**
-
-    $ docker events --since 1378216169
-    2015-05-12T11:51:30.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:52:12.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:53:45.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2015-05-12T15:54:03.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --since '2013-09-03'
-    2015-05-12T11:51:30.999999999Z07:00 container start 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T11:51:30.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:52:12.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:53:45.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2015-05-12T15:54:03.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --since '2013-09-03T15:49:29'
-    2015-05-12T11:51:30.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:52:12.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:53:45.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2015-05-12T15:54:03.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-This example outputs all events that were generated in the last 3 minutes,
-relative to the current time on the client machine:
-
-    $ docker events --since '3m'
-    2015-05-12T11:51:30.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:52:12.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2015-05-12T15:53:45.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2015-05-12T15:54:03.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-**Filter events:**
-
-    $ docker events --filter 'event=stop'
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2014-09-03T17:42:14.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'image=ubuntu-1:14.04'
-    2014-05-10T17:42:14.999999999Z07:00 container start 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-
-    $ docker events --filter 'container=7805c1d35632'
-    2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image= redis:2.8)
-
-    $ docker events --filter 'container=7805c1d35632' --filter 'container=4386fb97867d'
-    2014-09-03T15:49:29.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'container=7805c1d35632' --filter 'event=stop'
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'container=container_1' --filter 'container=container_2'
-    2014-09-03T15:49:29.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (imager=redis:2.8)
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'type=volume'
-    2015-12-23T21:05:28.136212689Z volume create test-event-volume-local (driver=local)
-    2015-12-23T21:05:28.383462717Z volume mount test-event-volume-local (read/write=true, container=562fe10671e9273da25eed36cdce26159085ac7ee6707105fd534866340a5025, destination=/foo, driver=local, propagation=rprivate)
-    2015-12-23T21:05:28.650314265Z volume unmount test-event-volume-local (container=562fe10671e9273da25eed36cdce26159085ac7ee6707105fd534866340a5025, driver=local)
-    2015-12-23T21:05:28.716218405Z volume destroy test-event-volume-local (driver=local)
-
-    $ docker events --filter 'type=network'
-    2015-12-23T21:38:24.705709133Z network create 8b111217944ba0ba844a65b13efcd57dc494932ee2527577758f939315ba2c5b (name=test-event-network-local, type=bridge)
-    2015-12-23T21:38:25.119625123Z network connect 8b111217944ba0ba844a65b13efcd57dc494932ee2527577758f939315ba2c5b (name=test-event-network-local, container=b4be644031a3d90b400f88ab3d4bdf4dc23adb250e696b6328b85441abe2c54e, type=bridge)
-
-    $ docker events --filter 'type=plugin' (experimental)
-    2016-07-25T17:30:14.825557616Z plugin pull ec7b87f2ce84330fe076e666f17dfc049d2d7ae0b8190763de94e1f2d105993f (name=tiborvass/sample-volume-plugin:latest)
-    2016-07-25T17:30:14.888127370Z plugin enable ec7b87f2ce84330fe076e666f17dfc049d2d7ae0b8190763de94e1f2d105993f (name=tiborvass/sample-volume-plugin:latest)
-
-**Format:**
-
-    $ docker events --filter 'type=container' --format 'Type={{.Type}}  Status={{.Status}}  ID={{.ID}}'
-    Type=container  Status=create  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=attach  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=start  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=resize  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=die  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=destroy  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-
-**Format (as JSON Lines):**
-
-    $ docker events --format '{{json .}}'
-    {"status":"create","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
-    {"status":"attach","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
-    {"Type":"network","Action":"connect","Actor":{"ID":"1b50a5bf755f6021dfa78e..
-    {"status":"start","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f42..
-    {"status":"resize","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/exec.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/exec.md
deleted file mode 100644
index 38891c9ea0..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/exec.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "exec"
-description: "The exec command description and usage"
-keywords: "command, container, run, execute"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# exec
-
-```markdown
-Usage:  docker exec [OPTIONS] CONTAINER COMMAND [ARG...]
-
-Run a command in a running container
-
-Options:
-  -d, --detach         Detached mode: run command in the background
-      --detach-keys    Override the key sequence for detaching a container
-  -e, --env=[]         Set environment variables
-      --help           Print usage
-  -i, --interactive    Keep STDIN open even if not attached
-      --privileged     Give extended privileges to the command
-  -t, --tty            Allocate a pseudo-TTY
-  -u, --user           Username or UID (format: <name|uid>[:<group|gid>])
-```
-
-The `docker exec` command runs a new command in a running container.
-
-The command started using `docker exec` only runs while the container's primary
-process (`PID 1`) is running, and it is not restarted if the container is
-restarted.
-
-If the container is paused, then the `docker exec` command will fail with an error:
-
-    $ docker pause test
-    test
-    $ docker ps
-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS                   PORTS               NAMES
-    1ae3b36715d2        ubuntu:latest       "bash"              17 seconds ago      Up 16 seconds (Paused)                       test
-    $ docker exec test ls
-    FATA[0000] Error response from daemon: Container test is paused, unpause the container before exec
-    $ echo $?
-    1
-
-## Examples
-
-    $ docker run --name ubuntu_bash --rm -i -t ubuntu bash
-
-This will create a container named `ubuntu_bash` and start a Bash session.
-
-    $ docker exec -d ubuntu_bash touch /tmp/execWorks
-
-This will create a new file `/tmp/execWorks` inside the running container
-`ubuntu_bash`, in the background.
-
-    $ docker exec -it ubuntu_bash bash
-
-This will create a new Bash session in the container `ubuntu_bash`.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/export.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/export.md
deleted file mode 100644
index 1004fc30c0..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/export.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: "export"
-description: "The export command description and usage"
-keywords: "export, file, system, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# export
-
-```markdown
-Usage:  docker export [OPTIONS] CONTAINER
-
-Export a container's filesystem as a tar archive
-
-Options:
-      --help            Print usage
-  -o, --output string   Write to a file, instead of STDOUT
-```
-
-The `docker export` command does not export the contents of volumes associated
-with the container. If a volume is mounted on top of an existing directory in
-the container, `docker export` will export the contents of the *underlying*
-directory, not the contents of the volume.
-
-Refer to [Backup, restore, or migrate data
-volumes](https://docs.docker.com/engine/tutorials/dockervolumes/#backup-restore-or-migrate-data-volumes) in
-the user guide for examples on exporting data in a volume.
-
-## Examples
-
-    $ docker export red_panda > latest.tar
-
-Or
-
-    $ docker export --output="latest.tar" red_panda
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/history.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/history.md
deleted file mode 100644
index 00f88db35b..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/history.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "history"
-description: "The history command description and usage"
-keywords: "docker, image, history"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# history
-
-```markdown
-Usage:  docker history [OPTIONS] IMAGE
-
-Show the history of an image
-
-Options:
-      --help       Print usage
-  -H, --human      Print sizes and dates in human readable format (default true)
-      --no-trunc   Don't truncate output
-  -q, --quiet      Only show numeric IDs
-```
-
-To see how the `docker:latest` image was built:
-
-    $ docker history docker
-    IMAGE               CREATED             CREATED BY                                      SIZE                COMMENT
-    3e23a5875458        8 days ago          /bin/sh -c #(nop) ENV LC_ALL=C.UTF-8            0 B
-    8578938dd170        8 days ago          /bin/sh -c dpkg-reconfigure locales &&    loc   1.245 MB
-    be51b77efb42        8 days ago          /bin/sh -c apt-get update && apt-get install    338.3 MB
-    4b137612be55        6 weeks ago         /bin/sh -c #(nop) ADD jessie.tar.xz in /        121 MB
-    750d58736b4b        6 weeks ago         /bin/sh -c #(nop) MAINTAINER Tianon Gravi <ad   0 B
-    511136ea3c5a        9 months ago                                                        0 B                 Imported from -
-
-To see how the `docker:apache` image was added to a container's base image:
-
-    $ docker history docker:scm
-    IMAGE               CREATED             CREATED BY                                      SIZE                COMMENT
-    2ac9d1098bf1        3 months ago        /bin/bash                                       241.4 MB            Added Apache to Fedora base image
-    88b42ffd1f7c        5 months ago        /bin/sh -c #(nop) ADD file:1fd8d7f9f6557cafc7   373.7 MB
-    c69cab00d6ef        5 months ago        /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar   0 B
-    511136ea3c5a        19 months ago                                                       0 B                 Imported from -
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/image_prune.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/image_prune.md
deleted file mode 100644
index a80b8d38c8..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/image_prune.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-title: "image prune"
-description: "Remove all stopped images"
-keywords: "image, prune, delete, remove"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# image prune
-
-```markdown
-Usage:	docker image prune [OPTIONS]
-
-Remove unused images
-
-Options:
-  -a, --all     Remove all unused images, not just dangling ones
-  -f, --force   Do not prompt for confirmation
-      --help    Print usage
-```
-
-Remove all dangling images. If `-a` is specified, will also remove all images not referenced by any container.
-
-Example output:
-
-```bash
-$ docker image prune -a
-WARNING! This will remove all images without at least one container associated to them.
-Are you sure you want to continue? [y/N] y
-Deleted Images:
-untagged: alpine:latest
-untagged: alpine@sha256:3dcdb92d7432d56604d4545cbd324b14e647b313626d99b889d0626de158f73a
-deleted: sha256:4e38e38c8ce0b8d9041a9c4fefe786631d1416225e13b0bfe8cfa2321aec4bba
-deleted: sha256:4fe15f8d0ae69e169824f25f1d4da3015a48feeeeebb265cd2e328e15c6a869f
-untagged: alpine:3.3
-untagged: alpine@sha256:4fa633f4feff6a8f02acfc7424efd5cb3e76686ed3218abf4ca0fa4a2a358423
-untagged: my-jq:latest
-deleted: sha256:ae67841be6d008a374eff7c2a974cde3934ffe9536a7dc7ce589585eddd83aff
-deleted: sha256:34f6f1261650bc341eb122313372adc4512b4fceddc2a7ecbb84f0958ce5ad65
-deleted: sha256:cf4194e8d8db1cb2d117df33f2c75c0369c3a26d96725efb978cc69e046b87e7
-untagged: my-curl:latest
-deleted: sha256:b2789dd875bf427de7f9f6ae001940073b3201409b14aba7e5db71f408b8569e
-deleted: sha256:96daac0cb203226438989926fc34dd024f365a9a8616b93e168d303cfe4cb5e9
-deleted: sha256:5cbd97a14241c9cd83250d6b6fc0649833c4a3e84099b968dd4ba403e609945e
-deleted: sha256:a0971c4015c1e898c60bf95781c6730a05b5d8a2ae6827f53837e6c9d38efdec
-deleted: sha256:d8359ca3b681cc5396a4e790088441673ed3ce90ebc04de388bfcd31a0716b06
-deleted: sha256:83fc9ba8fb70e1da31dfcc3c88d093831dbd4be38b34af998df37e8ac538260c
-deleted: sha256:ae7041a4cc625a9c8e6955452f7afe602b401f662671cea3613f08f3d9343b35
-deleted: sha256:35e0f43a37755b832f0bbea91a2360b025ee351d7309dae0d9737bc96b6d0809
-deleted: sha256:0af941dd29f00e4510195dd00b19671bc591e29d1495630e7e0f7c44c1e6a8c0
-deleted: sha256:9fc896fc2013da84f84e45b3096053eb084417b42e6b35ea0cce5a3529705eac
-deleted: sha256:47cf20d8c26c46fff71be614d9f54997edacfe8d46d51769706e5aba94b16f2b
-deleted: sha256:2c675ee9ed53425e31a13e3390bf3f539bf8637000e4bcfbb85ee03ef4d910a1
-
-Total reclaimed space: 16.43 MB
-```
-
-## Related information
-
-* [system df](system_df.md)
-* [container prune](container_prune.md)
-* [volume prune](volume_prune.md)
-* [network prune](network_prune.md)
-* [system prune](system_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/images.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/images.md
deleted file mode 100644
index 3b9ea1fe17..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/images.md
+++ /dev/null
@@ -1,304 +0,0 @@
----
-title: "images"
-description: "The images command description and usage"
-keywords: "list, docker, images"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# images
-
-```markdown
-Usage:  docker images [OPTIONS] [REPOSITORY[:TAG]]
-
-List images
-
-Options:
-  -a, --all             Show all images (default hides intermediate images)
-      --digests         Show digests
-  -f, --filter value    Filter output based on conditions provided (default [])
-                        - dangling=(true|false)
-                        - label=<key> or label=<key>=<value>
-                        - before=(<image-name>[:tag]|<image-id>|<image@digest>)
-                        - since=(<image-name>[:tag]|<image-id>|<image@digest>)
-                        - reference=(pattern of an image reference)
-      --format string   Pretty-print images using a Go template
-      --help            Print usage
-      --no-trunc        Don't truncate output
-  -q, --quiet           Only show numeric IDs
-```
-
-The default `docker images` will show all top level
-images, their repository and tags, and their size.
-
-Docker images have intermediate layers that increase reusability,
-decrease disk usage, and speed up `docker build` by
-allowing each step to be cached. These intermediate layers are not shown
-by default.
-
-The `SIZE` is the cumulative space taken up by the image and all
-its parent images. This is also the disk space used by the contents of the
-Tar file created when you `docker save` an image.
-
-An image will be listed more than once if it has multiple repository names
-or tags. This single image (identifiable by its matching `IMAGE ID`)
-uses up the `SIZE` listed only once.
-
-### Listing the most recently created images
-
-    $ docker images
-    REPOSITORY                TAG                 IMAGE ID            CREATED             SIZE
-    <none>                    <none>              77af4d6b9913        19 hours ago        1.089 GB
-    committ                   latest              b6fa739cedf5        19 hours ago        1.089 GB
-    <none>                    <none>              78a85c484f71        19 hours ago        1.089 GB
-    docker                    latest              30557a29d5ab        20 hours ago        1.089 GB
-    <none>                    <none>              5ed6274db6ce        24 hours ago        1.089 GB
-    postgres                  9                   746b819f315e        4 days ago          213.4 MB
-    postgres                  9.3                 746b819f315e        4 days ago          213.4 MB
-    postgres                  9.3.5               746b819f315e        4 days ago          213.4 MB
-    postgres                  latest              746b819f315e        4 days ago          213.4 MB
-
-### Listing images by name and tag
-
-The `docker images` command takes an optional `[REPOSITORY[:TAG]]` argument
-that restricts the list to images that match the argument. If you specify
-`REPOSITORY`but no `TAG`, the `docker images` command lists all images in the
-given repository.
-
-For example, to list all images in the "java" repository, run this command :
-
-    $ docker images java
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    java                8                   308e519aac60        6 days ago          824.5 MB
-    java                7                   493d82594c15        3 months ago        656.3 MB
-    java                latest              2711b1d6f3aa        5 months ago        603.9 MB
-
-The `[REPOSITORY[:TAG]]` value must be an "exact match". This means that, for example,
-`docker images jav` does not match the image `java`.
-
-If both `REPOSITORY` and `TAG` are provided, only images matching that
-repository and tag are listed.  To find all local images in the "java"
-repository with tag "8" you can use:
-
-    $ docker images java:8
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    java                8                   308e519aac60        6 days ago          824.5 MB
-
-If nothing matches `REPOSITORY[:TAG]`, the list is empty.
-
-    $ docker images java:0
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-
-## Listing the full length image IDs
-
-    $ docker images --no-trunc
-    REPOSITORY                    TAG                 IMAGE ID                                                                  CREATED             SIZE
-    <none>                        <none>              sha256:77af4d6b9913e693e8d0b4b294fa62ade6054e6b2f1ffb617ac955dd63fb0182   19 hours ago        1.089 GB
-    committest                    latest              sha256:b6fa739cedf5ea12a620a439402b6004d057da800f91c7524b5086a5e4749c9f   19 hours ago        1.089 GB
-    <none>                        <none>              sha256:78a85c484f71509adeaace20e72e941f6bdd2b25b4c75da8693efd9f61a37921   19 hours ago        1.089 GB
-    docker                        latest              sha256:30557a29d5abc51e5f1d5b472e79b7e296f595abcf19fe6b9199dbbc809c6ff4   20 hours ago        1.089 GB
-    <none>                        <none>              sha256:0124422dd9f9cf7ef15c0617cda3931ee68346455441d66ab8bdc5b05e9fdce5   20 hours ago        1.089 GB
-    <none>                        <none>              sha256:18ad6fad340262ac2a636efd98a6d1f0ea775ae3d45240d3418466495a19a81b   22 hours ago        1.082 GB
-    <none>                        <none>              sha256:f9f1e26352f0a3ba6a0ff68167559f64f3e21ff7ada60366e2d44a04befd1d3a   23 hours ago        1.089 GB
-    tryout                        latest              sha256:2629d1fa0b81b222fca63371ca16cbf6a0772d07759ff80e8d1369b926940074   23 hours ago        131.5 MB
-    <none>                        <none>              sha256:5ed6274db6ceb2397844896966ea239290555e74ef307030ebb01ff91b1914df   24 hours ago        1.089 GB
-
-## Listing image digests
-
-Images that use the v2 or later format have a content-addressable identifier
-called a `digest`. As long as the input used to generate the image is
-unchanged, the digest value is predictable. To list image digest values, use
-the `--digests` flag:
-
-    $ docker images --digests
-    REPOSITORY                         TAG                 DIGEST                                                                    IMAGE ID            CREATED             SIZE
-    localhost:5000/test/busybox        <none>              sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf   4986bf8c1536        9 weeks ago         2.43 MB
-
-When pushing or pulling to a 2.0 registry, the `push` or `pull` command
-output includes the image digest. You can `pull` using a digest value. You can
-also reference by digest in `create`, `run`, and `rmi` commands, as well as the
-`FROM` image reference in a Dockerfile.
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more
-than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* dangling (boolean - true or false)
-* label (`label=<key>` or `label=<key>=<value>`)
-* before (`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`) - filter images created before given id or references
-* since (`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`) - filter images created since given id or references
-
-##### Untagged images (dangling)
-
-    $ docker images --filter "dangling=true"
-
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    <none>              <none>              8abc22fbb042        4 weeks ago         0 B
-    <none>              <none>              48e5f45168b9        4 weeks ago         2.489 MB
-    <none>              <none>              bf747efa0e2f        4 weeks ago         0 B
-    <none>              <none>              980fe10e5736        12 weeks ago        101.4 MB
-    <none>              <none>              dea752e4e117        12 weeks ago        101.4 MB
-    <none>              <none>              511136ea3c5a        8 months ago        0 B
-
-This will display untagged images, that are the leaves of the images tree (not
-intermediary layers). These images occur when a new build of an image takes the
-`repo:tag` away from the image ID, leaving it as `<none>:<none>` or untagged.
-A warning will be issued if trying to remove an image when a container is presently
-using it. By having this flag it allows for batch cleanup.
-
-Ready for use by `docker rmi ...`, like:
-
-    $ docker rmi $(docker images -f "dangling=true" -q)
-
-    8abc22fbb042
-    48e5f45168b9
-    bf747efa0e2f
-    980fe10e5736
-    dea752e4e117
-    511136ea3c5a
-
-NOTE: Docker will warn you if any containers exist that are using these untagged images.
-
-
-##### Labeled images
-
-The `label` filter matches images based on the presence of a `label` alone or a `label` and a
-value.
-
-The following filter matches images with the `com.example.version` label regardless of its value.
-
-    $ docker images --filter "label=com.example.version"
-
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    match-me-1          latest              eeae25ada2aa        About a minute ago   188.3 MB
-    match-me-2          latest              dea752e4e117        About a minute ago   188.3 MB
-
-The following filter matches images with the `com.example.version` label with the `1.0` value.
-
-    $ docker images --filter "label=com.example.version=1.0"
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    match-me            latest              511136ea3c5a        About a minute ago   188.3 MB
-
-In this example, with the `0.1` value, it returns an empty set because no matches were found.
-
-    $ docker images --filter "label=com.example.version=0.1"
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-
-#### Before
-
-The `before` filter shows only images created before the image with
-given id or reference. For example, having these images:
-
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    image1              latest              eeae25ada2aa        4 minutes ago        188.3 MB
-    image2              latest              dea752e4e117        9 minutes ago        188.3 MB
-    image3              latest              511136ea3c5a        25 minutes ago       188.3 MB
-
-Filtering with `before` would give:
-
-    $ docker images --filter "before=image1"
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    image2              latest              dea752e4e117        9 minutes ago        188.3 MB
-    image3              latest              511136ea3c5a        25 minutes ago       188.3 MB
-
-#### Since
-
-The `since` filter shows only images created after the image with
-given id or reference. For example, having these images:
-
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    image1              latest              eeae25ada2aa        4 minutes ago        188.3 MB
-    image2              latest              dea752e4e117        9 minutes ago        188.3 MB
-    image3              latest              511136ea3c5a        25 minutes ago       188.3 MB
-
-Filtering with `since` would give:
-
-    $ docker images --filter "since=image3"
-    REPOSITORY          TAG                 IMAGE ID            CREATED              SIZE
-    image1              latest              eeae25ada2aa        4 minutes ago        188.3 MB
-    image2              latest              dea752e4e117        9 minutes ago        188.3 MB
-
-#### Reference
-
-The `reference` filter shows only images whose reference matches
-the specified pattern.
-
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             latest              e02e811dd08f        5 weeks ago         1.09 MB
-    busybox             uclibc              e02e811dd08f        5 weeks ago         1.09 MB
-    busybox             musl                733eb3059dce        5 weeks ago         1.21 MB
-    busybox             glibc               21c16b6787c6        5 weeks ago         4.19 MB
-
-Filtering with `reference` would give:
-
-    $ docker images --filter=reference='busy*:*libc'
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             uclibc              e02e811dd08f        5 weeks ago         1.09 MB
-    busybox             glibc               21c16b6787c6        5 weeks ago         4.19 MB
-
-## Formatting
-
-The formatting option (`--format`) will pretty print container output
-using a Go template.
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder | Description
----- | ----
-`.ID` | Image ID
-`.Repository` | Image repository
-`.Tag` | Image tag
-`.Digest` | Image digest
-`.CreatedSince` | Elapsed time since the image was created
-`.CreatedAt` | Time when the image was created
-`.Size` | Image disk size
-
-When using the `--format` option, the `image` command will either
-output the data exactly as the template declares or, when using the
-`table` directive, will include column headers as well.
-
-The following example uses a template without headers and outputs the
-`ID` and `Repository` entries separated by a colon for all images:
-
-    {% raw %}
-    $ docker images --format "{{.ID}}: {{.Repository}}"
-    77af4d6b9913: <none>
-    b6fa739cedf5: committ
-    78a85c484f71: <none>
-    30557a29d5ab: docker
-    5ed6274db6ce: <none>
-    746b819f315e: postgres
-    746b819f315e: postgres
-    746b819f315e: postgres
-    746b819f315e: postgres
-    {% endraw %}
-
-To list all images with their repository and tag in a table format you
-can use:
-
-    {% raw %}
-    $ docker images --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}"
-    IMAGE ID            REPOSITORY                TAG
-    77af4d6b9913        <none>                    <none>
-    b6fa739cedf5        committ                   latest
-    78a85c484f71        <none>                    <none>
-    30557a29d5ab        docker                    latest
-    5ed6274db6ce        <none>                    <none>
-    746b819f315e        postgres                  9
-    746b819f315e        postgres                  9.3
-    746b819f315e        postgres                  9.3.5
-    746b819f315e        postgres                  latest
-    {% endraw %}
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/import.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/import.md
deleted file mode 100644
index 20e90a61fd..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/import.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: "import"
-description: "The import command description and usage"
-keywords: "import, file, system, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# import
-
-```markdown
-Usage:  docker import [OPTIONS] file|URL|- [REPOSITORY[:TAG]]
-
-Import the contents from a tarball to create a filesystem image
-
-Options:
-  -c, --change value     Apply Dockerfile instruction to the created image (default [])
-      --help             Print usage
-  -m, --message string   Set commit message for imported image
-```
-
-You can specify a `URL` or `-` (dash) to take data directly from `STDIN`. The
-`URL` can point to an archive (.tar, .tar.gz, .tgz, .bzip, .tar.xz, or .txz)
-containing a filesystem or to an individual file on the Docker host.  If you
-specify an archive, Docker untars it in the container relative to the `/`
-(root). If you specify an individual file, you must specify the full path within
-the host. To import from a remote location, specify a `URI` that begins with the
-`http://` or `https://` protocol.
-
-The `--change` option will apply `Dockerfile` instructions to the image
-that is created.
-Supported `Dockerfile` instructions:
-`CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
-
-## Examples
-
-**Import from a remote location:**
-
-This will create a new untagged image.
-
-    $ docker import http://example.com/exampleimage.tgz
-
-**Import from a local file:**
-
-Import to docker via pipe and `STDIN`.
-
-    $ cat exampleimage.tgz | docker import - exampleimagelocal:new
-
-Import with a commit message.
-
-    $ cat exampleimage.tgz | docker import --message "New image imported from tarball" - exampleimagelocal:new
-
-Import to docker from a local archive.
-
-    $ docker import /path/to/exampleimage.tgz
-
-**Import from a local directory:**
-
-    $ sudo tar -c . | docker import - exampleimagedir
-
-**Import from a local directory with new configurations:**
-
-    $ sudo tar -c . | docker import --change "ENV DEBUG true" - exampleimagedir
-
-Note the `sudo` in this example – you must preserve
-the ownership of the files (especially root ownership) during the
-archiving with tar. If you are not root (or the sudo command) when you
-tar, then the ownerships might not get preserved.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/index.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/index.md
deleted file mode 100644
index 952fa09df1..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/index.md
+++ /dev/null
@@ -1,178 +0,0 @@
----
-title: "Docker commands"
-description: "Docker's CLI command description and usage"
-keywords: "Docker, Docker documentation, CLI, command line"
-identifier: "smn_cli_guide"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# The Docker commands
-
-This section contains reference information on using Docker's command line
-client. Each command has a reference page along with samples. If you are
-unfamiliar with the command line, you should start by reading about how to [Use
-the Docker command line](cli.md).
-
-You start the Docker daemon with the command line. How you start the daemon
-affects your Docker containers. For that reason you should also make sure to
-read the [`dockerd`](dockerd.md) reference page.
-
-### Docker management commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [dockerd](dockerd.md) | Launch the Docker daemon                             |
-| [info](info.md) | Display system-wide information                            |
-| [inspect](inspect.md)| Return low-level information on a container or image  |
-| [version](version.md) | Show the Docker version information                  |
-
-
-### Image commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [build](build.md) |  Build an image from a Dockerfile                        |
-| [commit](commit.md) | Create a new image from a container's changes          |
-| [history](history.md) | Show the history of an image                         |
-| [images](images.md) | List images                                            |
-| [import](import.md) | Import the contents from a tarball to create a filesystem image |
-| [load](load.md) | Load an image from a tar archive or STDIN                  |
-| [rmi](rmi.md) | Remove one or more images                                    |
-| [save](save.md) | Save images to a tar archive                               |
-| [tag](tag.md) | Tag an image into a repository                               |
-
-### Container commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [attach](attach.md) | Attach to a running container                          |
-| [cp](cp.md) | Copy files/folders from a container to a HOSTDIR or to STDOUT  |
-| [create](create.md) | Create a new container                                 |
-| [diff](diff.md) | Inspect changes on a container's filesystem                |
-| [events](events.md) | Get real time events from the server                   |
-| [exec](exec.md) | Run a command in a running container                       |
-| [export](export.md) | Export a container's filesystem as a tar archive       |
-| [kill](kill.md) | Kill a running container                                   |
-| [logs](logs.md) | Fetch the logs of a container                              |
-| [pause](pause.md) | Pause all processes within a container                   |
-| [port](port.md) | List port mappings or a specific mapping for the container |
-| [ps](ps.md) | List containers                                                |
-| [rename](rename.md) | Rename a container                                     |
-| [restart](restart.md) | Restart a running container                          |
-| [rm](rm.md) | Remove one or more containers                                  |
-| [run](run.md) | Run a command in a new container                             |
-| [start](start.md) | Start one or more stopped containers                     |
-| [stats](stats.md) | Display a live stream of container(s) resource usage  statistics |
-| [stop](stop.md) | Stop a running container                                   |
-| [top](top.md) | Display the running processes of a container                 |
-| [unpause](unpause.md) | Unpause all processes within a container             |
-| [update](update.md) | Update configuration of one or more containers         |
-| [wait](wait.md) | Block until a container stops, then print its exit code    |
-
-### Hub and registry commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [login](login.md) | Register or log in to a Docker registry                  |
-| [logout](logout.md) | Log out from a Docker registry                         |
-| [pull](pull.md) | Pull an image or a repository from a Docker registry       |
-| [push](push.md) | Push an image or a repository to a Docker registry         |
-| [search](search.md) | Search the Docker Hub for images                       |
-
-### Network and connectivity commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [network connect](network_connect.md) | Connect a container to a network     |
-| [network create](network_create.md) | Create a new network                   |
-| [network disconnect](network_disconnect.md) | Disconnect a container from a network |
-| [network inspect](network_inspect.md) | Display information about a network  |
-| [network ls](network_ls.md) | Lists all the networks the Engine `daemon` knows about |
-| [network rm](network_rm.md) | Removes one or more networks                   |
-
-
-### Shared data volume commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [volume create](volume_create.md) | Creates a new volume where containers can consume and store data |
-| [volume inspect](volume_inspect.md) | Display information about a volume     |
-| [volume ls](volume_ls.md) | Lists all the volumes Docker knows about         |
-| [volume prune](volume_prune.md) | Remove all unused volumes                  |
-| [volume rm](volume_rm.md) | Remove one or more volumes                       |
-
-
-### Swarm node commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [node promote](node_promote.md) | Promote a node that is pending a promotion to manager |
-| [node demote](node_demote.md) | Demotes an existing manager so that it is no longer a manager |
-| [node inspect](node_inspect.md) | Inspect a node in the swarm                |
-| [node update](node_update.md) | Update attributes for a node                 |
-| [node ps](node_ps.md) | List tasks running on one or more nodes                         |
-| [node ls](node_ls.md) | List nodes in the swarm                              |
-| [node rm](node_rm.md) | Remove one or more nodes from the swarm                         |
-
-### Swarm swarm commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [swarm init](swarm_init.md) | Initialize a swarm                             |
-| [swarm join](swarm_join.md) | Join a swarm as a manager node or worker node  |
-| [swarm leave](swarm_leave.md) | Remove the current node from the swarm       |
-| [swarm update](swarm_update.md) | Update attributes of a swarm               |
-| [swarm join-token](swarm_join_token.md) | Display or rotate join tokens      |
-
-### Swarm service commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [service create](service_create.md) | Create a new service                   |
-| [service inspect](service_inspect.md) | Inspect a service                    |
-| [service ls](service_ls.md) | List services in the swarm                     |
-| [service rm](service_rm.md) | Remove a service from the swarm                |
-| [service scale](service_scale.md) | Set the number of replicas for the desired state of the service |
-| [service ps](service_ps.md) | List the tasks of a service              |
-| [service update](service_update.md)  | Update the attributes of a service    |
-
-### Swarm secret commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [secret create](secret_create.md) | Create a secret from a file or STDIN as content |
-| [secret inspect](service_inspect.md) | Inspect the specified secret          |
-| [secret ls](secret_ls.md) | List secrets in the swarm                        |
-| [secret rm](secret_rm.md) | Remove the specified secrets from the swarm      |
-
-### Swarm stack commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [stack deploy](stack_deploy.md) | Deploy a new stack or update an existing stack |
-| [stack ls](stack_ls.md) | List stacks in the swarm                           |
-| [stack ps](stack_ps.md) | List the tasks in the stack                        |
-| [stack rm](stack_rm.md) | Remove the stack from the swarm                    |
-| [stack services](stack_services.md) | List the services in the stack         |
-
-### Plugin commands
-
-| Command | Description                                                        |
-|:--------|:-------------------------------------------------------------------|
-| [plugin create](plugin_create.md) | Create a plugin from a rootfs and configuration |
-| [plugin disable](plugin_disable.md) | Disable a plugin                       |
-| [plugin enbale](plugin_enable.md)  | Enable a plugin                         |
-| [plugin inspect](plugin_inspect.md) | Display detailed information on a plugin |
-| [plugin install](plugin_install.md) | Install a plugin                       |
-| [plugin ls](plugin_ls.md) | List plugins                                     |
-| [plugin push](plugin_push.md) | Push a plugin to a registry                  |
-| [plugin rm](plugin_rm.md) | Remove a plugin                                  |
-| [plugin set](plugin_set.md)  | Change settings for a plugin                  |
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/info.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/info.md
deleted file mode 100644
index 50a084fcb2..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/info.md
+++ /dev/null
@@ -1,224 +0,0 @@
----
-title: "info"
-description: "The info command description and usage"
-keywords: "display, docker, information"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# info
-
-```markdown
-Usage:  docker info [OPTIONS]
-
-Display system-wide information
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-This command displays system wide information regarding the Docker installation.
-Information displayed includes the kernel version, number of containers and images.
-The number of images shown is the number of unique images. The same image tagged
-under different names is counted only once.
-
-If a format is specified, the given template will be executed instead of the
-default format. Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-Depending on the storage driver in use, additional information can be shown, such
-as pool name, data file, metadata file, data space used, total data space, metadata
-space used, and total metadata space.
-
-The data file is where the images are stored and the metadata file is where the
-meta data regarding those images are stored. When run for the first time Docker
-allocates a certain amount of data space and meta data space from the space
-available on the volume where `/var/lib/docker` is mounted.
-
-# Examples
-
-## Display Docker system information
-
-Here is a sample output for a daemon running on Ubuntu, using the overlay2
-storage driver and a node that is part of a 2-node swarm:
-
-    $ docker -D info
-    Containers: 14
-     Running: 3
-     Paused: 1
-     Stopped: 10
-    Images: 52
-    Server Version: 1.13.0
-    Storage Driver: overlay2
-     Backing Filesystem: extfs
-     Supports d_type: true
-     Native Overlay Diff: false
-    Logging Driver: json-file
-    Cgroup Driver: cgroupfs
-    Plugins:
-     Volume: local
-     Network: bridge host macvlan null overlay
-    Swarm: active
-     NodeID: rdjq45w1op418waxlairloqbm
-     Is Manager: true
-     ClusterID: te8kdyw33n36fqiz74bfjeixd
-     Managers: 1
-     Nodes: 2
-     Orchestration:
-      Task History Retention Limit: 5
-     Raft:
-      Snapshot Interval: 10000
-      Number of Old Snapshots to Retain: 0
-      Heartbeat Tick: 1
-      Election Tick: 3
-     Dispatcher:
-      Heartbeat Period: 5 seconds
-     CA Configuration:
-      Expiry Duration: 3 months
-     Node Address: 172.16.66.128 172.16.66.129
-     Manager Addresses:
-      172.16.66.128:2477
-    Runtimes: runc
-    Default Runtime: runc
-    Init Binary: docker-init
-    containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531
-    runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2
-    init version: N/A (expected: v0.13.0)
-    Security Options:
-     apparmor
-     seccomp
-      Profile: default
-    Kernel Version: 4.4.0-31-generic
-    Operating System: Ubuntu 16.04.1 LTS
-    OSType: linux
-    Architecture: x86_64
-    CPUs: 2
-    Total Memory: 1.937 GiB
-    Name: ubuntu
-    ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
-    Docker Root Dir: /var/lib/docker
-    Debug Mode (client): true
-    Debug Mode (server): true
-     File Descriptors: 30
-     Goroutines: 123
-     System Time: 2016-11-12T17:24:37.955404361-08:00
-     EventsListeners: 0
-    Http Proxy: http://test:test@proxy.example.com:8080
-    Https Proxy: https://test:test@proxy.example.com:8080
-    No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
-    Registry: https://index.docker.io/v1/
-    WARNING: No swap limit support
-    Labels:
-     storage=ssd
-     staging=true
-    Experimental: false
-    Insecure Registries:
-     127.0.0.0/8
-    Registry Mirrors:
-      http://192.168.1.2/
-      http://registry-mirror.example.com:5000/
-    Live Restore Enabled: false
-
-The global `-D` option tells all `docker` commands to output debug information.
-
-The example below shows the output for a daemon running on Red Hat Enterprise Linux,
-using the devicemapper storage driver. As can be seen in the output, additional
-information about the devicemapper storage driver is shown:
-
-    $ docker info
-    Containers: 14
-     Running: 3
-     Paused: 1
-     Stopped: 10
-    Images: 52
-    Server Version: 1.10.3
-    Storage Driver: devicemapper
-     Pool Name: docker-202:2-25583803-pool
-     Pool Blocksize: 65.54 kB
-     Base Device Size: 10.74 GB
-     Backing Filesystem: xfs
-     Data file: /dev/loop0
-     Metadata file: /dev/loop1
-     Data Space Used: 1.68 GB
-     Data Space Total: 107.4 GB
-     Data Space Available: 7.548 GB
-     Metadata Space Used: 2.322 MB
-     Metadata Space Total: 2.147 GB
-     Metadata Space Available: 2.145 GB
-     Udev Sync Supported: true
-     Deferred Removal Enabled: false
-     Deferred Deletion Enabled: false
-     Deferred Deleted Device Count: 0
-     Data loop file: /var/lib/docker/devicemapper/devicemapper/data
-     Metadata loop file: /var/lib/docker/devicemapper/devicemapper/metadata
-     Library Version: 1.02.107-RHEL7 (2015-12-01)
-    Execution Driver: native-0.2
-    Logging Driver: json-file
-    Plugins:
-     Volume: local
-     Network: null host bridge
-    Kernel Version: 3.10.0-327.el7.x86_64
-    Operating System: Red Hat Enterprise Linux Server 7.2 (Maipo)
-    OSType: linux
-    Architecture: x86_64
-    CPUs: 1
-    Total Memory: 991.7 MiB
-    Name: ip-172-30-0-91.ec2.internal
-    ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
-    Docker Root Dir: /var/lib/docker
-    Debug mode (client): false
-    Debug mode (server): false
-    Username: gordontheturtle
-    Registry: https://index.docker.io/v1/
-    Insecure registries:
-     myinsecurehost:5000
-     127.0.0.0/8
-
-You can also specify the output format:
-
-    $ docker info --format '{{json .}}'
-	{"ID":"I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S","Containers":14, ...}
-
-Here is a sample output for a daemon running on Windows Server 2016:
-
-    E:\docker>docker info
-    Containers: 1
-     Running: 0
-     Paused: 0
-     Stopped: 1
-    Images: 17
-    Server Version: 1.13.0
-    Storage Driver: windowsfilter
-     Windows:
-    Logging Driver: json-file
-    Plugins:
-     Volume: local
-     Network: nat null overlay
-    Swarm: inactive
-    Default Isolation: process
-    Kernel Version: 10.0 14393 (14393.206.amd64fre.rs1_release.160912-1937)
-    Operating System: Windows Server 2016 Datacenter
-    OSType: windows
-    Architecture: x86_64
-    CPUs: 8
-    Total Memory: 3.999 GiB
-    Name: WIN-V0V70C0LU5P
-    ID: NYMS:B5VK:UMSL:FVDZ:EWB5:FKVK:LPFL:FJMQ:H6FT:BZJ6:L2TD:XH62
-    Docker Root Dir: C:\control
-    Debug Mode (client): false
-    Debug Mode (server): false
-    Registry: https://index.docker.io/v1/
-    Insecure Registries:
-     127.0.0.0/8
-    Registry Mirrors:
-      http://192.168.1.2/
-      http://registry-mirror.example.com:5000/
-    Live Restore Enabled: false
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/inspect.md
deleted file mode 100644
index 7a0c3a0871..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/inspect.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-title: "inspect"
-description: "The inspect command description and usage"
-keywords: "inspect, container, json"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# inspect
-
-```markdown
-Usage:  docker inspect [OPTIONS] NAME|ID [NAME|ID...]
-
-Return low-level information on Docker object(s) (e.g. container, image, volume,
-network, node, service, or task) identified by name or ID
-
-Options:
-  -f, --format       Format the output using the given Go template
-      --help         Print usage
-  -s, --size         Display total file sizes if the type is container
-      --type         Return JSON for specified type
-```
-
-By default, this will render all results in a JSON array. If the container and
-image have the same name, this will return container JSON for unspecified type.
-If a format is specified, the given template will be executed for each result.
-
-Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-## Examples
-
-**Get an instance's IP address:**
-
-For the most part, you can pick out any field from the JSON in a fairly
-straightforward manner.
-
-    {% raw %}
-    $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' $INSTANCE_ID
-    {% endraw %}
-
-**Get an instance's MAC address:**
-
-For the most part, you can pick out any field from the JSON in a fairly
-straightforward manner.
-
-    {% raw %}
-    $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.MacAddress}}{{end}}' $INSTANCE_ID
-    {% endraw %}
-
-**Get an instance's log path:**
-
-    {% raw %}
-    $ docker inspect --format='{{.LogPath}}' $INSTANCE_ID
-    {% endraw %}
-
-**Get a Task's image name:**
-
-    {% raw %}
-    $ docker inspect --format='{{.Container.Spec.Image}}' $INSTANCE_ID
-    {% endraw %}
-
-**List all port bindings:**
-
-One can loop over arrays and maps in the results to produce simple text
-output:
-
-    {% raw %}
-    $ docker inspect --format='{{range $p, $conf := .NetworkSettings.Ports}} {{$p}} -> {{(index $conf 0).HostPort}} {{end}}' $INSTANCE_ID
-    {% endraw %}
-
-**Find a specific port mapping:**
-
-The `.Field` syntax doesn't work when the field name begins with a
-number, but the template language's `index` function does. The
-`.NetworkSettings.Ports` section contains a map of the internal port
-mappings to a list of external address/port objects. To grab just the
-numeric public port, you use `index` to find the specific port map, and
-then `index` 0 contains the first object inside of that. Then we ask for
-the `HostPort` field to get the public address.
-
-    {% raw %}
-    $ docker inspect --format='{{(index (index .NetworkSettings.Ports "8787/tcp") 0).HostPort}}' $INSTANCE_ID
-    {% endraw %}
-
-**Get a subsection in JSON format:**
-
-If you request a field which is itself a structure containing other
-fields, by default you get a Go-style dump of the inner values.
-Docker adds a template function, `json`, which can be applied to get
-results in JSON format.
-
-    {% raw %}
-    $ docker inspect --format='{{json .Config}}' $INSTANCE_ID
-    {% endraw %}
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/kill.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/kill.md
deleted file mode 100644
index 32fde3d8b5..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/kill.md
+++ /dev/null
@@ -1,34 +0,0 @@
----
-title: "kill"
-description: "The kill command description and usage"
-keywords: "container, kill, signal"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# kill
-
-```markdown
-Usage:  docker kill [OPTIONS] CONTAINER [CONTAINER...]
-
-Kill one or more running containers
-
-Options:
-      --help            Print usage
-  -s, --signal string   Signal to send to the container (default "KILL")
-```
-
-The main process inside the container will be sent `SIGKILL`, or any
-signal specified with option `--signal`.
-
-> **Note:**
-> `ENTRYPOINT` and `CMD` in the *shell* form run as a subcommand of `/bin/sh -c`,
-> which does not pass signals. This means that the executable is not the container’s PID 1
-> and does not receive Unix signals.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/load.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/load.md
deleted file mode 100644
index 04a5bc7e56..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/load.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: "load"
-description: "The load command description and usage"
-keywords: "stdin, tarred, repository"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# load
-
-```markdown
-Usage:  docker load [OPTIONS]
-
-Load an image from a tar archive or STDIN
-
-Options:
-      --help           Print usage
-  -i, --input string   Read from tar archive file, instead of STDIN.
-                       The tarball may be compressed with gzip, bzip, or xz
-  -q, --quiet          Suppress the load output but still outputs the imported images
-```
-
-Loads a tarred repository from a file or the standard input stream.
-Restores both images and tags.
-
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    $ docker load < busybox.tar.gz
-    # […]
-    Loaded image: busybox:latest
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             latest              769b9341d937        7 weeks ago         2.489 MB
-    $ docker load --input fedora.tar
-    # […]
-    Loaded image: fedora:rawhide
-    # […]
-    Loaded image: fedora:20
-    # […]
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             latest              769b9341d937        7 weeks ago         2.489 MB
-    fedora              rawhide             0d20aec6529d        7 weeks ago         387 MB
-    fedora              20                  58394af37342        7 weeks ago         385.5 MB
-    fedora              heisenbug           58394af37342        7 weeks ago         385.5 MB
-    fedora              latest              58394af37342        7 weeks ago         385.5 MB
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/login.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/login.md
deleted file mode 100644
index a0f35fd4d0..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/login.md
+++ /dev/null
@@ -1,122 +0,0 @@
----
-title: "login"
-description: "The login command description and usage"
-keywords: "registry, login, image"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# login
-
-```markdown
-Usage:  docker login [OPTIONS] [SERVER]
-
-Log in to a Docker registry.
-If no server is specified, the default is defined by the daemon.
-
-Options:
-      --help              Print usage
-  -p, --password string   Password
-  -u, --username string   Username
-```
-
-If you want to login to a self-hosted registry you can specify this by
-adding the server name.
-
-    example:
-    $ docker login localhost:8080
-
-
-`docker login` requires user to use `sudo` or be `root`, except when:
-
-1.  connecting to a remote daemon, such as a `docker-machine` provisioned `docker engine`.
-2.  user is added to the `docker` group.  This will impact the security of your system; the `docker` group is `root` equivalent.  See [Docker Daemon Attack Surface](https://docs.docker.com/security/security/#docker-daemon-attack-surface) for details.
-
-You can log into any public or private repository for which you have
-credentials.  When you log in, the command stores encoded credentials in
-`$HOME/.docker/config.json` on Linux or `%USERPROFILE%/.docker/config.json` on Windows.
-
-## Credentials store
-
-The Docker Engine can keep user credentials in an external credentials store,
-such as the native keychain of the operating system. Using an external store
-is more secure than storing credentials in the Docker configuration file.
-
-To use a credentials store, you need an external helper program to interact
-with a specific keychain or external store. Docker requires the helper
-program to be in the client's host `$PATH`.
-
-This is the list of currently available credentials helpers and where
-you can download them from:
-
-- D-Bus Secret Service: https://github.com/docker/docker-credential-helpers/releases
-- Apple macOS keychain: https://github.com/docker/docker-credential-helpers/releases
-- Microsoft Windows Credential Manager: https://github.com/docker/docker-credential-helpers/releases
-
-### Usage
-
-You need to specify the credentials store in `$HOME/.docker/config.json`
-to tell the docker engine to use it:
-
-```json
-{
-	"credsStore": "osxkeychain"
-}
-```
-
-If you are currently logged in, run `docker logout` to remove
-the credentials from the file and run `docker login` again.
-
-### Protocol
-
-Credential helpers can be any program or script that follows a very simple protocol.
-This protocol is heavily inspired by Git, but it differs in the information shared.
-
-The helpers always use the first argument in the command to identify the action.
-There are only three possible values for that argument: `store`, `get`, and `erase`.
-
-The `store` command takes a JSON payload from the standard input. That payload carries
-the server address, to identify the credential, the user name, and either a password
-or an identity token.
-
-```json
-{
-	"ServerURL": "https://index.docker.io/v1",
-	"Username": "david",
-	"Secret": "passw0rd1"
-}
-```
-
-If the secret being stored is an identity token, the Username should be set to
-`<token>`.
-
-The `store` command can write error messages to `STDOUT` that the docker engine
-will show if there was an issue.
-
-The `get` command takes a string payload from the standard input. That payload carries
-the server address that the docker engine needs credentials for. This is
-an example of that payload: `https://index.docker.io/v1`.
-
-The `get` command writes a JSON payload to `STDOUT`. Docker reads the user name
-and password from this payload:
-
-```json
-{
-	"Username": "david",
-	"Secret": "passw0rd1"
-}
-```
-
-The `erase` command takes a string payload from `STDIN`. That payload carries
-the server address that the docker engine wants to remove credentials for. This is
-an example of that payload: `https://index.docker.io/v1`.
-
-The `erase` command can write error messages to `STDOUT` that the docker engine
-will show if there was an issue.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/logout.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/logout.md
deleted file mode 100644
index 1635e2244b..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/logout.md
+++ /dev/null
@@ -1,30 +0,0 @@
----
-title: "logout"
-description: "The logout command description and usage"
-keywords: "logout, docker, registry"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# logout
-
-```markdown
-Usage:  docker logout [SERVER]
-
-Log out from a Docker registry.
-If no server is specified, the default is defined by the daemon.
-
-Options:
-      --help   Print usage
-```
-
-For example:
-
-    $ docker logout localhost:8080
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/logs.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/logs.md
deleted file mode 100644
index 891e10b55c..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/logs.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: "logs"
-description: "The logs command description and usage"
-keywords: "logs, retrieve, docker"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# logs
-
-```markdown
-Usage:  docker logs [OPTIONS] CONTAINER
-
-Fetch the logs of a container
-
-Options:
-      --details        Show extra details provided to logs
-  -f, --follow         Follow log output
-      --help           Print usage
-      --since string   Show logs since timestamp
-      --tail string    Number of lines to show from the end of the logs (default "all")
-  -t, --timestamps     Show timestamps
-```
-
-The `docker logs` command batch-retrieves logs present at the time of execution.
-
-> **Note**: this command is only functional for containers that are started with
-> the `json-file` or `journald` logging driver.
-
-For more information about selecting and configuring logging drivers, refer to
-[Configure logging drivers](https://docs.docker.com/engine/admin/logging/overview/).
-
-The `docker logs --follow` command will continue streaming the new output from
-the container's `STDOUT` and `STDERR`.
-
-Passing a negative number or a non-integer to `--tail` is invalid and the
-value is set to `all` in that case.
-
-The `docker logs --timestamps` command will add an [RFC3339Nano timestamp](https://golang.org/pkg/time/#pkg-constants)
-, for example `2014-09-16T06:17:46.000000000Z`, to each
-log entry. To ensure that the timestamps are aligned the
-nano-second part of the timestamp will be padded with zero when necessary.
-
-The `docker logs --details` command will add on extra attributes, such as
-environment variables and labels, provided to `--log-opt` when creating the
-container.
-
-The `--since` option shows only the container logs generated after
-a given date. You can specify the date as an RFC 3339 date, a UNIX
-timestamp, or a Go duration string (e.g. `1m30s`, `3h`). Besides RFC3339 date
-format you may also use RFC3339Nano, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
-timezone on the client will be used if you do not provide either a `Z` or a
-`+-00:00` timezone offset at the end of the timestamp. When providing Unix
-timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
-that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
-seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a
-fraction of a second no more than nine digits long. You can combine the
-`--since` option with either or both of the `--follow` or `--tail` options.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/menu.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/menu.md
deleted file mode 100644
index d58afacd76..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/menu.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: "Command line reference"
-description: "Docker's CLI command description and usage"
-keywords: "Docker, Docker documentation, CLI, command line"
-identifier:  "smn_cli"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# The Docker commands
-
-This section contains reference information on using Docker's command line
-client. Each command has a reference page along with samples. If you are
-unfamiliar with the command line, you should start by reading about how to
-[Use the Docker command line](cli.md).
-
-You start the Docker daemon with the command line. How you start the daemon
-affects your Docker containers. For that reason you should also make sure to
-read the [`dockerd`](dockerd.md) reference page.
-
-For a list of Docker commands see [Command line reference guide](index.md).
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_connect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_connect.md
deleted file mode 100644
index 52459a5d5f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_connect.md
+++ /dev/null
@@ -1,100 +0,0 @@
----
-title: "network connect"
-description: "The network connect command description and usage"
-keywords: "network, connect, user-defined"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# network connect
-
-```markdown
-Usage:  docker network connect [OPTIONS] NETWORK CONTAINER
-
-Connect a container to a network
-
-Options:
-      --alias value           Add network-scoped alias for the container (default [])
-      --help                  Print usage
-      --ip string             IP Address
-      --ip6 string            IPv6 Address
-      --link value            Add link to another container (default [])
-      --link-local-ip value   Add a link-local address for the container (default [])
-```
-
-Connects a container to a network. You can connect a container by name
-or by ID. Once connected, the container can communicate with other containers in
-the same network.
-
-```bash
-$ docker network connect multi-host-network container1
-```
-
-You can also use the `docker run --network=<network-name>` option to start a container and immediately connect it to a network.
-
-```bash
-$ docker run -itd --network=multi-host-network busybox
-```
-
-You can specify the IP address you want to be assigned to the container's interface.
-
-```bash
-$ docker network connect --ip 10.10.36.122 multi-host-network container2
-```
-
-You can use `--link` option to link another container with a preferred alias
-
-```bash
-$ docker network connect --link container1:c1 multi-host-network container2
-```
-
-`--alias` option can be used to resolve the container by another name in the network
-being connected to.
-
-```bash
-$ docker network connect --alias db --alias mysql multi-host-network container2
-```
-You can pause, restart, and stop containers that are connected to a network.
-A container connects to its configured networks when it runs.
-
-If specified, the container's IP address(es) is reapplied when a stopped
-container is restarted. If the IP address is no longer available, the container
-fails to start. One way to guarantee that the IP address is available is
-to specify an `--ip-range` when creating the network, and choose the static IP
-address(es) from outside that range. This ensures that the IP address is not
-given to another container while this container is not on the network.
-
-```bash
-$ docker network create --subnet 172.20.0.0/16 --ip-range 172.20.240.0/20 multi-host-network
-```
-
-```bash
-$ docker network connect --ip 172.20.128.2 multi-host-network container2
-```
-
-To verify the container is connected, use the `docker network inspect` command. Use `docker network disconnect` to remove a container from the network.
-
-Once connected in network, containers can communicate using only another
-container's IP address or name. For `overlay` networks or custom plugins that
-support multi-host connectivity, containers connected to the same multi-host
-network but launched from different Engines can also communicate in this way.
-
-You can connect a container to one or more networks. The networks need not be the same type. For example, you can connect a single container bridge and overlay networks.
-
-## Related information
-
-* [network inspect](network_inspect.md)
-* [network create](network_create.md)
-* [network disconnect](network_disconnect.md)
-* [network ls](network_ls.md)
-* [network rm](network_rm.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
-* [Work with networks](https://docs.docker.com/engine/userguide/networking/work-with-networks/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_create.md
deleted file mode 100644
index e238217d41..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_create.md
+++ /dev/null
@@ -1,202 +0,0 @@
----
-title: "network create"
-description: "The network create command description and usage"
-keywords: "network, create"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# network create
-
-```markdown
-Usage:	docker network create [OPTIONS] NETWORK
-
-Create a network
-
-Options:
-      --attachable           Enable manual container attachment
-      --aux-address value    Auxiliary IPv4 or IPv6 addresses used by Network
-                             driver (default map[])
-  -d, --driver string        Driver to manage the Network (default "bridge")
-      --gateway value        IPv4 or IPv6 Gateway for the master subnet (default [])
-      --help                 Print usage
-      --internal             Restrict external access to the network
-      --ip-range value       Allocate container ip from a sub-range (default [])
-      --ipam-driver string   IP Address Management Driver (default "default")
-      --ipam-opt value       Set IPAM driver specific options (default map[])
-      --ipv6                 Enable IPv6 networking
-      --label value          Set metadata on a network (default [])
-  -o, --opt value            Set driver specific options (default map[])
-      --subnet value         Subnet in CIDR format that represents a
-                             network segment (default [])
-```
-
-Creates a new network. The `DRIVER` accepts `bridge` or `overlay` which are the
-built-in network drivers. If you have installed a third party or your own custom
-network driver you can specify that `DRIVER` here also. If you don't specify the
-`--driver` option, the command automatically creates a `bridge` network for you.
-When you install Docker Engine it creates a `bridge` network automatically. This
-network corresponds to the `docker0` bridge that Engine has traditionally relied
-on. When you launch a new container with  `docker run` it automatically connects to
-this bridge network. You cannot remove this default bridge network, but you can
-create new ones using the `network create` command.
-
-```bash
-$ docker network create -d bridge my-bridge-network
-```
-
-Bridge networks are isolated networks on a single Engine installation. If you
-want to create a network that spans multiple Docker hosts each running an
-Engine, you must create an `overlay` network. Unlike `bridge` networks, overlay
-networks require some pre-existing conditions before you can create one. These
-conditions are:
-
-* Access to a key-value store. Engine supports Consul, Etcd, and ZooKeeper (Distributed store) key-value stores.
-* A cluster of hosts with connectivity to the key-value store.
-* A properly configured Engine `daemon` on each host in the cluster.
-
-The `dockerd` options that support the `overlay` network are:
-
-* `--cluster-store`
-* `--cluster-store-opt`
-* `--cluster-advertise`
-
-To read more about these options and how to configure them, see ["*Get started
-with multi-host network*"](https://docs.docker.com/engine/userguide/networking/get-started-overlay).
-
-While not required, it is a good idea to install Docker Swarm to
-manage the cluster that makes up your network. Swarm provides sophisticated
-discovery and server management tools that can assist your implementation.
-
-Once you have prepared the `overlay` network prerequisites you simply choose a
-Docker host in the cluster and issue the following to create the network:
-
-```bash
-$ docker network create -d overlay my-multihost-network
-```
-
-Network names must be unique. The Docker daemon attempts to identify naming
-conflicts but this is not guaranteed. It is the user's responsibility to avoid
-name conflicts.
-
-## Connect containers
-
-When you start a container, use the `--network` flag to connect it to a network.
-This example adds the `busybox` container to the `mynet` network:
-
-```bash
-$ docker run -itd --network=mynet busybox
-```
-
-If you want to add a container to a network after the container is already
-running, use the `docker network connect` subcommand.
-
-You can connect multiple containers to the same network. Once connected, the
-containers can communicate using only another container's IP address or name.
-For `overlay` networks or custom plugins that support multi-host connectivity,
-containers connected to the same multi-host network but launched from different
-Engines can also communicate in this way.
-
-You can disconnect a container from a network using the `docker network
-disconnect` command.
-
-## Specifying advanced options
-
-When you create a network, Engine creates a non-overlapping subnetwork for the
-network by default. This subnetwork is not a subdivision of an existing
-network. It is purely for ip-addressing purposes. You can override this default
-and specify subnetwork values directly using the `--subnet` option. On a
-`bridge` network you can only create a single subnet:
-
-```bash
-$ docker network create --driver=bridge --subnet=192.168.0.0/16 br0
-```
-
-Additionally, you also specify the `--gateway` `--ip-range` and `--aux-address`
-options.
-
-```bash
-$ docker network create \
-  --driver=bridge \
-  --subnet=172.28.0.0/16 \
-  --ip-range=172.28.5.0/24 \
-  --gateway=172.28.5.254 \
-  br0
-```
-
-If you omit the `--gateway` flag the Engine selects one for you from inside a
-preferred pool. For `overlay` networks and for network driver plugins that
-support it you can create multiple subnetworks.
-
-```bash
-$ docker network create -d overlay \
-  --subnet=192.168.0.0/16 \
-  --subnet=192.170.0.0/16 \
-  --gateway=192.168.0.100 \
-  --gateway=192.170.0.100 \
-  --ip-range=192.168.1.0/24 \
-  --aux-address="my-router=192.168.1.5" --aux-address="my-switch=192.168.1.6" \
-  --aux-address="my-printer=192.170.1.5" --aux-address="my-nas=192.170.1.6" \
-  my-multihost-network
-```
-
-Be sure that your subnetworks do not overlap. If they do, the network create
-fails and Engine returns an error.
-
-# Bridge driver options
-
-When creating a custom network, the default network driver (i.e. `bridge`) has
-additional options that can be passed. The following are those options and the
-equivalent docker daemon flags used for docker0 bridge:
-
-| Option                                           | Equivalent  | Description                                           |
-|--------------------------------------------------|-------------|-------------------------------------------------------|
-| `com.docker.network.bridge.name`                 | -           | bridge name to be used when creating the Linux bridge |
-| `com.docker.network.bridge.enable_ip_masquerade` | `--ip-masq` | Enable IP masquerading                                |
-| `com.docker.network.bridge.enable_icc`           | `--icc`     | Enable or Disable Inter Container Connectivity        |
-| `com.docker.network.bridge.host_binding_ipv4`    | `--ip`      | Default IP when binding container ports               |
-| `com.docker.network.driver.mtu`                  | `--mtu`     | Set the containers network MTU                        |
-
-The following arguments can be passed to `docker network create` for any
-network driver, again with their approximate equivalents to `docker daemon`.
-
-| Argument     | Equivalent     | Description                                |
-|--------------|----------------|--------------------------------------------|
-| `--gateway`  | -              | IPv4 or IPv6 Gateway for the master subnet |
-| `--ip-range` | `--fixed-cidr` | Allocate IPs from a range                  |
-| `--internal` | -              | Restrict external access to the network   |
-| `--ipv6`     | `--ipv6`       | Enable IPv6 networking                     |
-| `--subnet`   | `--bip`        | Subnet for network                         |
-
-For example, let's use `-o` or `--opt` options to specify an IP address binding
-when publishing ports:
-
-```bash
-$ docker network create \
-    -o "com.docker.network.bridge.host_binding_ipv4"="172.19.0.1" \
-    simple-network
-```
-
-### Network internal mode
-
-By default, when you connect a container to an `overlay` network, Docker also
-connects a bridge network to it to provide external connectivity. If you want
-to create an externally isolated `overlay` network, you can specify the
-`--internal` option.
-
-## Related information
-
-* [network inspect](network_inspect.md)
-* [network connect](network_connect.md)
-* [network disconnect](network_disconnect.md)
-* [network ls](network_ls.md)
-* [network rm](network_rm.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_disconnect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_disconnect.md
deleted file mode 100644
index 42e976a500..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_disconnect.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: "network disconnect"
-description: "The network disconnect command description and usage"
-keywords: "network, disconnect, user-defined"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# network disconnect
-
-```markdown
-Usage:  docker network disconnect [OPTIONS] NETWORK CONTAINER
-
-Disconnect a container from a network
-
-Options:
-  -f, --force   Force the container to disconnect from a network
-      --help    Print usage
-```
-
-Disconnects a container from a network. The container must be running to disconnect it from the network.
-
-```bash
-  $ docker network disconnect multi-host-network container1
-```
-
-
-## Related information
-
-* [network inspect](network_inspect.md)
-* [network connect](network_connect.md)
-* [network create](network_create.md)
-* [network ls](network_ls.md)
-* [network rm](network_rm.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_inspect.md
deleted file mode 100644
index bc0005e38e..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_inspect.md
+++ /dev/null
@@ -1,192 +0,0 @@
----
-title: "network inspect"
-description: "The network inspect command description and usage"
-keywords: "network, inspect, user-defined"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# network inspect
-
-```markdown
-Usage:  docker network inspect [OPTIONS] NETWORK [NETWORK...]
-
-Display detailed information on one or more networks
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-Returns information about one or more networks. By default, this command renders all results in a JSON object. For example, if you connect two containers to the default `bridge` network:
-
-```bash
-$ sudo docker run -itd --name=container1 busybox
-f2870c98fd504370fb86e59f32cd0753b1ac9b69b7d80566ffc7192a82b3ed27
-
-$ sudo docker run -itd --name=container2 busybox
-bda12f8922785d1f160be70736f26c1e331ab8aaf8ed8d56728508f2e2fd4727
-```
-
-The `network inspect` command shows the containers, by id, in its
-results. For networks backed by multi-host network driver, such as Overlay,
-this command also shows the container endpoints in other hosts in the
-cluster. These endpoints are represented as "ep-{endpoint-id}" in the output.
-However, for swarm-scoped networks, only the endpoints that are local to the
-node are shown.
-
-You can specify an alternate format to execute a given
-template for each result. Go's
-[text/template](http://golang.org/pkg/text/template/) package describes all the
-details of the format.
-
-```bash
-$ sudo docker network inspect bridge
-[
-    {
-        "Name": "bridge",
-        "Id": "b2b1a2cba717161d984383fd68218cf70bbbd17d328496885f7c921333228b0f",
-        "Created": "2016-10-19T04:33:30.360899459Z",
-        "Scope": "local",
-        "Driver": "bridge",
-        "IPAM": {
-            "Driver": "default",
-            "Config": [
-                {
-                    "Subnet": "172.17.42.1/16",
-                    "Gateway": "172.17.42.1"
-                }
-            ]
-        },
-        "Internal": false,
-        "Containers": {
-            "bda12f8922785d1f160be70736f26c1e331ab8aaf8ed8d56728508f2e2fd4727": {
-                "Name": "container2",
-                "EndpointID": "0aebb8fcd2b282abe1365979536f21ee4ceaf3ed56177c628eae9f706e00e019",
-                "MacAddress": "02:42:ac:11:00:02",
-                "IPv4Address": "172.17.0.2/16",
-                "IPv6Address": ""
-            },
-            "f2870c98fd504370fb86e59f32cd0753b1ac9b69b7d80566ffc7192a82b3ed27": {
-                "Name": "container1",
-                "EndpointID": "a00676d9c91a96bbe5bcfb34f705387a33d7cc365bac1a29e4e9728df92d10ad",
-                "MacAddress": "02:42:ac:11:00:01",
-                "IPv4Address": "172.17.0.1/16",
-                "IPv6Address": ""
-            }
-        },
-        "Options": {
-            "com.docker.network.bridge.default_bridge": "true",
-            "com.docker.network.bridge.enable_icc": "true",
-            "com.docker.network.bridge.enable_ip_masquerade": "true",
-            "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-            "com.docker.network.bridge.name": "docker0",
-            "com.docker.network.driver.mtu": "1500"
-        },
-        "Labels": {}
-    }
-]
-```
-
-Returns the information about the user-defined network:
-
-```bash
-$ docker network create simple-network
-69568e6336d8c96bbf57869030919f7c69524f71183b44d80948bd3927c87f6a
-$ docker network inspect simple-network
-[
-    {
-        "Name": "simple-network",
-        "Id": "69568e6336d8c96bbf57869030919f7c69524f71183b44d80948bd3927c87f6a",
-        "Created": "2016-10-19T04:33:30.360899459Z",
-        "Scope": "local",
-        "Driver": "bridge",
-        "IPAM": {
-            "Driver": "default",
-            "Config": [
-                {
-                    "Subnet": "172.22.0.0/16",
-                    "Gateway": "172.22.0.1"
-                }
-            ]
-        },
-        "Containers": {},
-        "Options": {},
-        "Labels": {}
-    }
-]
-```
-
-For swarm mode overlay networks `network inspect` also shows the IP address and node name 
-of the peers. Peers are the nodes in the swarm cluster which have at least one task attached 
-to the network. Node name is of the format `<hostname>-<unique ID>`.
-
-```bash
-$ docker network inspect ingress
-[
-    {
-        "Name": "ingress",
-        "Id": "j0izitrut30h975vk4m1u5kk3",
-        "Created": "2016-11-08T06:49:59.803387552Z",
-        "Scope": "swarm",
-        "Driver": "overlay",
-        "EnableIPv6": false,
-        "IPAM": {
-            "Driver": "default",
-            "Options": null,
-            "Config": [
-                {
-                    "Subnet": "10.255.0.0/16",
-                    "Gateway": "10.255.0.1"
-                }
-            ]
-        },
-        "Internal": false,
-        "Attachable": false,
-        "Containers": {
-            "ingress-sbox": {
-                "Name": "ingress-endpoint",
-                "EndpointID": "40e002d27b7e5d75f60bc72199d8cae3344e1896abec5eddae9743755fe09115",
-                "MacAddress": "02:42:0a:ff:00:03",
-                "IPv4Address": "10.255.0.3/16",
-                "IPv6Address": ""
-            }
-        },
-        "Options": {
-            "com.docker.network.driver.overlay.vxlanid_list": "256"
-        },
-        "Labels": {},
-        "Peers": [
-            {
-                "Name": "net-1-1d22adfe4d5c",
-                "IP": "192.168.33.11"
-            },
-            {
-                "Name": "net-2-d55d838b34af",
-                "IP": "192.168.33.12"
-            },
-            {
-                "Name": "net-3-8473f8140bd9",
-                "IP": "192.168.33.13"
-            }
-        ]
-    }
-]
-```
-
-## Related information
-
-* [network disconnect ](network_disconnect.md)
-* [network connect](network_connect.md)
-* [network create](network_create.md)
-* [network ls](network_ls.md)
-* [network rm](network_rm.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_ls.md
deleted file mode 100644
index a4f671d569..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_ls.md
+++ /dev/null
@@ -1,218 +0,0 @@
----
-title: "network ls"
-description: "The network ls command description and usage"
-keywords: "network, list, user-defined"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# docker network ls
-
-```markdown
-Usage:  docker network ls [OPTIONS]
-
-List networks
-
-Aliases:
-  ls, list
-
-Options:
-  -f, --filter filter   Provide filter values (e.g. 'driver=bridge')
-      --format string   Pretty-print networks using a Go template
-      --help            Print usage
-      --no-trunc        Do not truncate the output
-  -q, --quiet           Only display network IDs
-```
-
-Lists all the networks the Engine `daemon` knows about. This includes the
-networks that span across multiple hosts in a cluster, for example:
-
-```bash
-$ sudo docker network ls
-NETWORK ID          NAME                DRIVER          SCOPE
-7fca4eb8c647        bridge              bridge          local
-9f904ee27bf5        none                null            local
-cf03ee007fb4        host                host            local
-78b03ee04fc4        multi-host          overlay         swarm
-```
-
-Use the `--no-trunc` option to display the full network id:
-
-```bash
-$ docker network ls --no-trunc
-NETWORK ID                                                         NAME                DRIVER           SCOPE
-18a2866682b85619a026c81b98a5e375bd33e1b0936a26cc497c283d27bae9b3   none                null             local
-c288470c46f6c8949c5f7e5099b5b7947b07eabe8d9a27d79a9cbf111adcbf47   host                host             local
-7b369448dccbf865d397c8d2be0cda7cf7edc6b0945f77d2529912ae917a0185   bridge              bridge           local
-95e74588f40db048e86320c6526440c504650a1ff3e9f7d60a497c4d2163e5bd   foo                 bridge           local
-63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161   dev                 bridge           local
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there
-is more than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`).
-Multiple filter flags are combined as an `OR` filter. For example,
-`-f type=custom -f type=builtin` returns both `custom` and `builtin` networks.
-
-The currently supported filters are:
-
-* driver
-* id (network's id)
-* label (`label=<key>` or `label=<key>=<value>`)
-* name (network's name)
-* type (custom|builtin)
-
-#### Driver
-
-The `driver` filter matches networks based on their driver.
-
-The following example matches networks with the `bridge` driver:
-
-```bash
-$ docker network ls --filter driver=bridge
-NETWORK ID          NAME                DRIVER            SCOPE
-db9db329f835        test1               bridge            local
-f6e212da9dfd        test2               bridge            local
-```
-
-#### ID
-
-The `id` filter matches on all or part of a network's ID.
-
-The following filter matches all networks with an ID containing the
-`63d1ff1f77b0...` string.
-
-```bash
-$ docker network ls --filter id=63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161
-NETWORK ID          NAME                DRIVER           SCOPE
-63d1ff1f77b0        dev                 bridge           local
-```
-
-You can also filter for a substring in an ID as this shows:
-
-```bash
-$ docker network ls --filter id=95e74588f40d
-NETWORK ID          NAME                DRIVER          SCOPE
-95e74588f40d        foo                 bridge          local
-
-$ docker network ls --filter id=95e
-NETWORK ID          NAME                DRIVER          SCOPE
-95e74588f40d        foo                 bridge          local
-```
-
-#### Label
-
-The `label` filter matches networks based on the presence of a `label` alone or a `label` and a
-value.
-
-The following filter matches networks with the `usage` label regardless of its value.
-
-```bash
-$ docker network ls -f "label=usage"
-NETWORK ID          NAME                DRIVER         SCOPE
-db9db329f835        test1               bridge         local
-f6e212da9dfd        test2               bridge         local
-```
-
-The following filter matches networks with the `usage` label with the `prod` value.
-
-```bash
-$ docker network ls -f "label=usage=prod"
-NETWORK ID          NAME                DRIVER        SCOPE
-f6e212da9dfd        test2               bridge        local
-```
-
-#### Name
-
-The `name` filter matches on all or part of a network's name.
-
-The following filter matches all networks with a name containing the `foobar` string.
-
-```bash
-$ docker network ls --filter name=foobar
-NETWORK ID          NAME                DRIVER       SCOPE
-06e7eef0a170        foobar              bridge       local
-```
-
-You can also filter for a substring in a name as this shows:
-
-```bash
-$ docker network ls --filter name=foo
-NETWORK ID          NAME                DRIVER       SCOPE
-95e74588f40d        foo                 bridge       local
-06e7eef0a170        foobar              bridge       local
-```
-
-#### Type
-
-The `type` filter supports two values; `builtin` displays predefined networks
-(`bridge`, `none`, `host`), whereas `custom` displays user defined networks.
-
-The following filter matches all user defined networks:
-
-```bash
-$ docker network ls --filter type=custom
-NETWORK ID          NAME                DRIVER       SCOPE
-95e74588f40d        foo                 bridge       local  
-63d1ff1f77b0        dev                 bridge       local
-```
-
-By having this flag it allows for batch cleanup. For example, use this filter
-to delete all user defined networks:
-
-```bash
-$ docker network rm `docker network ls --filter type=custom -q`
-```
-
-A warning will be issued when trying to remove a network that has containers
-attached.
-
-## Formatting
-
-The formatting options (`--format`) pretty-prints networks output
-using a Go template.
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder | Description
-------------|------------------------------------------------------------------------------------------
-`.ID`       | Network ID
-`.Name`     | Network name
-`.Driver`   | Network driver
-`.Scope`    | Network scope (local, global)
-`.IPv6`     | Whether IPv6 is enabled on the network or not.
-`.Internal` | Whether the network is internal or not.
-`.Labels`   | All labels assigned to the network.
-`.Label`    | Value of a specific label for this network. For example `{{.Label "project.version"}}`
-
-When using the `--format` option, the `network ls` command will either
-output the data exactly as the template declares or, when using the
-`table` directive, includes column headers as well.
-
-The following example uses a template without headers and outputs the
-`ID` and `Driver` entries separated by a colon for all networks:
-
-```bash
-$ docker network ls --format "{{.ID}}: {{.Driver}}"
-afaaab448eb2: bridge
-d1584f8dc718: host
-391df270dc66: null
-```
-
-## Related information
-
-* [network disconnect ](network_disconnect.md)
-* [network connect](network_connect.md)
-* [network create](network_create.md)
-* [network inspect](network_inspect.md)
-* [network rm](network_rm.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_prune.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_prune.md
deleted file mode 100644
index 5b65465600..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_prune.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: "network prune"
-description: "Remove unused networks"
-keywords: "network, prune, delete"
----
-
-# network prune
-
-```markdown
-Usage:	docker network prune [OPTIONS]
-
-Remove all unused networks
-
-Options:
-  -f, --force   Do not prompt for confirmation
-      --help    Print usage
-```
-
-Remove all unused networks. Unused networks are those which are not referenced by any containers.
-
-Example output:
-
-```bash
-$ docker network prune
-WARNING! This will remove all networks not used by at least one container.
-Are you sure you want to continue? [y/N] y
-Deleted Networks:
-n1
-n2
-```
-
-## Related information
-
-* [network disconnect ](network_disconnect.md)
-* [network connect](network_connect.md)
-* [network create](network_create.md)
-* [network ls](network_ls.md)
-* [network inspect](network_inspect.md)
-* [network rm](network_rm.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
-* [system df](system_df.md)
-* [container prune](container_prune.md)
-* [image prune](image_prune.md)
-* [volume prune](volume_prune.md)
-* [system prune](system_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_rm.md
deleted file mode 100644
index f06b4c002d..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/network_rm.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: "network rm"
-description: "the network rm command description and usage"
-keywords: "network, rm, user-defined"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# network rm
-
-```markdown
-Usage:  docker network rm NETWORK [NETWORK...]
-
-Remove one or more networks
-
-Aliases:
-  rm, remove
-
-Options:
-      --help   Print usage
-```
-
-Removes one or more networks by name or identifier. To remove a network,
-you must first disconnect any containers connected to it.
-To remove the network named 'my-network':
-
-```bash
-  $ docker network rm my-network
-```
-
-To delete multiple networks in a single `docker network rm` command, provide
-multiple network names or ids. The following example deletes a network with id
-`3695c422697f` and a network named `my-network`:
-
-```bash
-  $ docker network rm 3695c422697f my-network
-```
-
-When you specify multiple networks, the command attempts to delete each in turn.
-If the deletion of one network fails, the command continues to the next on the
-list and tries to delete that. The command reports success or failure for each
-deletion.
-
-## Related information
-
-* [network disconnect ](network_disconnect.md)
-* [network connect](network_connect.md)
-* [network create](network_create.md)
-* [network ls](network_ls.md)
-* [network inspect](network_inspect.md)
-* [network prune](network_prune.md)
-* [Understand Docker container networks](https://docs.docker.com/engine/userguide/networking/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_demote.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_demote.md
deleted file mode 100644
index 9a81bb9c04..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_demote.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: "node demote"
-description: "The node demote command description and usage"
-keywords: "node, demote"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node demote
-
-```markdown
-Usage:  docker node demote NODE [NODE...]
-
-Demote one or more nodes from manager in the swarm
-
-Options:
-      --help   Print usage
-
-```
-
-Demotes an existing manager so that it is no longer a manager. This command targets a docker engine that is a manager in the swarm.
-
-
-```bash
-$ docker node demote <node name>
-```
-
-## Related information
-
-* [node inspect](node_inspect.md)
-* [node ls](node_ls.md)
-* [node promote](node_promote.md)
-* [node ps](node_ps.md)
-* [node rm](node_rm.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_inspect.md
deleted file mode 100644
index fac688fe40..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_inspect.md
+++ /dev/null
@@ -1,137 +0,0 @@
----
-title: "node inspect"
-description: "The node inspect command description and usage"
-keywords: "node, inspect"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node inspect
-
-```markdown
-Usage:  docker node inspect [OPTIONS] self|NODE [NODE...]
-
-Display detailed information on one or more nodes
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-      --pretty          Print the information in a human friendly format.
-```
-
-Returns information about a node. By default, this command renders all results
-in a JSON array. You can specify an alternate format to execute a
-given template for each result. Go's
-[text/template](http://golang.org/pkg/text/template/) package describes all the
-details of the format.
-
-Example output:
-
-    $ docker node inspect swarm-manager
-    [
-    {
-        "ID": "e216jshn25ckzbvmwlnh5jr3g",
-        "Version": {
-            "Index": 10
-        },
-        "CreatedAt": "2016-06-16T22:52:44.9910662Z",
-        "UpdatedAt": "2016-06-16T22:52:45.230878043Z",
-        "Spec": {
-            "Role": "manager",
-            "Availability": "active"
-        },
-        "Description": {
-            "Hostname": "swarm-manager",
-            "Platform": {
-                "Architecture": "x86_64",
-                "OS": "linux"
-            },
-            "Resources": {
-                "NanoCPUs": 1000000000,
-                "MemoryBytes": 1039843328
-            },
-            "Engine": {
-                "EngineVersion": "1.12.0",
-                "Plugins": [
-                    {
-                        "Type": "Volume",
-                        "Name": "local"
-                    },
-                    {
-                        "Type": "Network",
-                        "Name": "overlay"
-                    },
-                    {
-                        "Type": "Network",
-                        "Name": "null"
-                    },
-                    {
-                        "Type": "Network",
-                        "Name": "host"
-                    },
-                    {
-                        "Type": "Network",
-                        "Name": "bridge"
-                    },
-                    {
-                        "Type": "Network",
-                        "Name": "overlay"
-                    }
-                ]
-            }
-        },
-        "Status": {
-            "State": "ready",
-            "Addr": "168.0.32.137"
-        },
-        "ManagerStatus": {
-            "Leader": true,
-            "Reachability": "reachable",
-            "Addr": "168.0.32.137:2377"
-        }
-    }
-    ]
-
-    {% raw %}
-    $ docker node inspect --format '{{ .ManagerStatus.Leader }}' self
-    false
-    {% endraw %}
-
-    $ docker node inspect --pretty self
-    ID:                     e216jshn25ckzbvmwlnh5jr3g
-    Hostname:               swarm-manager
-    Joined at:              2016-06-16 22:52:44.9910662 +0000 utc
-    Status:
-     State:                 Ready
-     Availability:          Active
-     Address:               172.17.0.2
-    Manager Status:
-     Address:               172.17.0.2:2377
-     Raft Status:           Reachable
-     Leader:                Yes
-    Platform:
-     Operating System:      linux
-     Architecture:          x86_64
-    Resources:
-     CPUs:                  4
-     Memory:                7.704 GiB
-    Plugins:
-      Network:              overlay, bridge, null, host, overlay
-      Volume:               local
-    Engine Version:         1.12.0
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node ls](node_ls.md)
-* [node promote](node_promote.md)
-* [node ps](node_ps.md)
-* [node rm](node_rm.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ls.md
deleted file mode 100644
index 5f61713c2e..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ls.md
+++ /dev/null
@@ -1,130 +0,0 @@
----
-title: "node ls"
-description: "The node ls command description and usage"
-keywords: "node, list"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node ls
-
-```markdown
-Usage:  docker node ls [OPTIONS]
-
-List nodes in the swarm
-
-Aliases:
-  ls, list
-
-Options:
-  -f, --filter value   Filter output based on conditions provided
-      --help           Print usage
-  -q, --quiet          Only display IDs
-```
-
-Lists all the nodes that the Docker Swarm manager knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options.
-
-Example output:
-
-```bash
-$ docker node ls
-
-ID                           HOSTNAME        STATUS  AVAILABILITY  MANAGER STATUS
-1bcef6utixb0l0ca7gxuivsj0    swarm-worker2   Ready   Active
-38ciaotwjuritcdtn9npbnkuz    swarm-worker1   Ready   Active
-e216jshn25ckzbvmwlnh5jr3g *  swarm-manager1  Ready   Active        Leader
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more
-than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* [id](node_ls.md#id)
-* [label](node_ls.md#label)
-* [membership](node_ls.md#membership)
-* [name](node_ls.md#name)
-* [role](node_ls.md#role)
-
-#### ID
-
-The `id` filter matches all or part of a node's id.
-
-```bash
-$ docker node ls -f id=1
-
-ID                         HOSTNAME       STATUS  AVAILABILITY  MANAGER STATUS
-1bcef6utixb0l0ca7gxuivsj0  swarm-worker2  Ready   Active
-```
-
-#### Label
-
-The `label` filter matches nodes based on engine labels and on the presence of a `label` alone or a `label` and a value. Node labels are currently not used for filtering.
-
-The following filter matches nodes with the `foo` label regardless of its value.
-
-```bash
-$ docker node ls -f "label=foo"
-
-ID                         HOSTNAME       STATUS  AVAILABILITY  MANAGER STATUS
-1bcef6utixb0l0ca7gxuivsj0  swarm-worker2  Ready   Active
-```
-
-#### Membership
-
-The `membership` filter matches nodes based on the presence of a `membership` and a value
-`accepted` or `pending`.
-
-The following filter matches nodes with the `membership` of `accepted`.
-
-```bash
-$ docker node ls -f "membership=accepted"
-
-ID                           HOSTNAME        STATUS  AVAILABILITY  MANAGER STATUS
-1bcef6utixb0l0ca7gxuivsj0    swarm-worker2   Ready   Active
-38ciaotwjuritcdtn9npbnkuz    swarm-worker1   Ready   Active
-```
-
-#### Name
-
-The `name` filter matches on all or part of a node hostname.
-
-The following filter matches the nodes with a name equal to `swarm-master` string.
-
-```bash
-$ docker node ls -f name=swarm-manager1
-
-ID                           HOSTNAME        STATUS  AVAILABILITY  MANAGER STATUS
-e216jshn25ckzbvmwlnh5jr3g *  swarm-manager1  Ready   Active        Leader
-```
-
-#### Role
-
-The `role` filter matches nodes based on the presence of a `role` and a value `worker` or `manager`.
-
-The following filter matches nodes with the `manager` role.
-
-```bash
-$ docker node ls -f "role=manager"
-
-ID                           HOSTNAME        STATUS  AVAILABILITY  MANAGER STATUS
-e216jshn25ckzbvmwlnh5jr3g *  swarm-manager1  Ready   Active        Leader
-```
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node inspect](node_inspect.md)
-* [node promote](node_promote.md)
-* [node ps](node_ps.md)
-* [node rm](node_rm.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_promote.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_promote.md
deleted file mode 100644
index 92092a8935..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_promote.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "node promote"
-description: "The node promote command description and usage"
-keywords: "node, promote"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node promote
-
-```markdown
-Usage:  docker node promote NODE [NODE...]
-
-Promote one or more nodes to manager in the swarm
-
-Options:
-      --help   Print usage
-```
-
-Promotes a node to manager. This command targets a docker engine that is a manager in the swarm.
-
-
-```bash
-$ docker node promote <node name>
-```
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node inspect](node_inspect.md)
-* [node ls](node_ls.md)
-* [node ps](node_ps.md)
-* [node rm](node_rm.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ps.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ps.md
deleted file mode 100644
index 7f07c5ea64..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_ps.md
+++ /dev/null
@@ -1,107 +0,0 @@
----
-title: "node ps"
-description: "The node ps command description and usage"
-keywords: node, tasks, ps
-aliases: ["/engine/reference/commandline/node_tasks/"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node ps
-
-```markdown
-Usage:  docker node ps [OPTIONS] [NODE...]
-
-List tasks running on one or more nodes, defaults to current node.
-
-Options:
-  -f, --filter value   Filter output based on conditions provided
-      --help           Print usage
-      --no-resolve     Do not map IDs to Names
-      --no-trunc       Do not truncate output
-```
-
-Lists all the tasks on a Node that Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options.
-
-Example output:
-
-    $ docker node ps swarm-manager1
-    NAME                                IMAGE        NODE            DESIRED STATE  CURRENT STATE
-    redis.1.7q92v0nr1hcgts2amcjyqg3pq   redis:3.0.6  swarm-manager1  Running        Running 5 hours
-    redis.6.b465edgho06e318egmgjbqo4o   redis:3.0.6  swarm-manager1  Running        Running 29 seconds
-    redis.7.bg8c07zzg87di2mufeq51a2qp   redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-    redis.9.dkkual96p4bb3s6b10r7coxxt   redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-    redis.10.0tgctg8h8cech4w0k0gwrmr23  redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more
-than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* [name](#name)
-* [id](#id)
-* [label](#label)
-* [desired-state](#desired-state)
-
-#### name
-
-The `name` filter matches on all or part of a task's name.
-
-The following filter matches all tasks with a name containing the `redis` string.
-
-    $ docker node ps -f name=redis swarm-manager1
-    NAME                                IMAGE        NODE            DESIRED STATE  CURRENT STATE
-    redis.1.7q92v0nr1hcgts2amcjyqg3pq   redis:3.0.6  swarm-manager1  Running        Running 5 hours
-    redis.6.b465edgho06e318egmgjbqo4o   redis:3.0.6  swarm-manager1  Running        Running 29 seconds
-    redis.7.bg8c07zzg87di2mufeq51a2qp   redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-    redis.9.dkkual96p4bb3s6b10r7coxxt   redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-    redis.10.0tgctg8h8cech4w0k0gwrmr23  redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-
-
-#### id
-
-The `id` filter matches a task's id.
-
-    $ docker node ps -f id=bg8c07zzg87di2mufeq51a2qp swarm-manager1
-    NAME                                IMAGE        NODE            DESIRED STATE  CURRENT STATE
-    redis.7.bg8c07zzg87di2mufeq51a2qp   redis:3.0.6  swarm-manager1  Running        Running 5 seconds
-
-
-#### label
-
-The `label` filter matches tasks based on the presence of a `label` alone or a `label` and a
-value.
-
-The following filter matches tasks with the `usage` label regardless of its value.
-
-```bash
-$ docker node ps -f "label=usage"
-NAME                               IMAGE        NODE            DESIRED STATE  CURRENT STATE
-redis.6.b465edgho06e318egmgjbqo4o  redis:3.0.6  swarm-manager1  Running        Running 10 minutes
-redis.7.bg8c07zzg87di2mufeq51a2qp  redis:3.0.6  swarm-manager1  Running        Running 9 minutes
-```
-
-
-#### desired-state
-
-The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
-
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node inspect](node_inspect.md)
-* [node ls](node_ls.md)
-* [node promote](node_promote.md)
-* [node rm](node_rm.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_rm.md
deleted file mode 100644
index b245d636cc..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_rm.md
+++ /dev/null
@@ -1,73 +0,0 @@
----
-title: "node rm"
-description: "The node rm command description and usage"
-keywords: "node, remove"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# node rm
-
-```markdown
-Usage:	docker node rm [OPTIONS] NODE [NODE...]
-
-Remove one or more nodes from the swarm
-
-Aliases:
-  rm, remove
-
-Options:
-  -f, --force   Force remove a node from the swarm
-      --help    Print usage
-```
-
-When run from a manager node, removes the specified nodes from a swarm.
-
-
-Example output:
-
-```nohighlight
-$ docker node rm swarm-node-02
-
-Node swarm-node-02 removed from swarm
-```
-
-Removes the specified nodes from the swarm, but only if the nodes are in the
-down state. If you attempt to remove an active node you will receive an error:
-
-```nohighlight
-$ docker node rm swarm-node-03
-
-Error response from daemon: rpc error: code = 9 desc = node swarm-node-03 is not
-down and can't be removed
-```
-
-If you lose access to a worker node or need to shut it down because it has been
-compromised or is not behaving as expected, you can use the `--force` option.
-This may cause transient errors or interruptions, depending on the type of task
-being run on the node.
-
-```nohighlight
-$ docker node rm --force swarm-node-03
-
-Node swarm-node-03 removed from swarm
-```
-
-A manager node must be demoted to a worker node (using `docker node demote`)
-before you can remove it from the swarm.
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node inspect](node_inspect.md)
-* [node ls](node_ls.md)
-* [node promote](node_promote.md)
-* [node ps](node_ps.md)
-* [node update](node_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_update.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_update.md
deleted file mode 100644
index aa65d0309e..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/node_update.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-title: "node update"
-description: "The node update command description and usage"
-keywords: "resources, update, dynamically"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## update
-
-```markdown
-Usage:  docker node update [OPTIONS] NODE
-
-Update a node
-
-Options:
-      --availability string   Availability of the node (active/pause/drain)
-      --help                  Print usage
-      --label-add value       Add or update a node label (key=value) (default [])
-      --label-rm value        Remove a node label if exists (default [])
-      --role string           Role of the node (worker/manager)
-```
-
-### Add label metadata to a node
-
-Add metadata to a swarm node using node labels. You can specify a node label as
-a key with an empty value:
-
-``` bash
-$ docker node update --label-add foo worker1
-```
-
-To add multiple labels to a node, pass the `--label-add` flag for each label:
-
-``` bash
-$ docker node update --label-add foo --label-add bar worker1
-```
-
-When you [create a service](service_create.md),
-you can use node labels as a constraint. A constraint limits the nodes where the
-scheduler deploys tasks for a service.
-
-For example, to add a `type` label to identify nodes where the scheduler should
-deploy message queue service tasks:
-
-``` bash
-$ docker node update --label-add type=queue worker1
-```
-
-The labels you set for nodes using `docker node update` apply only to the node
-entity within the swarm. Do not confuse them with the docker daemon labels for
-[dockerd](https://docs.docker.com/engine/userguide/labels-custom-metadata/#daemon-labels).
-
-For more information about labels, refer to [apply custom
-metadata](https://docs.docker.com/engine/userguide/labels-custom-metadata/).
-
-## Related information
-
-* [node demote](node_demote.md)
-* [node inspect](node_inspect.md)
-* [node ls](node_ls.md)
-* [node promote](node_promote.md)
-* [node ps](node_ps.md)
-* [node rm](node_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/pause.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/pause.md
deleted file mode 100644
index e2dd800d5f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/pause.md
+++ /dev/null
@@ -1,40 +0,0 @@
----
-title: "pause"
-description: "The pause command description and usage"
-keywords: "cgroups, container, suspend, SIGSTOP"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# pause
-
-```markdown
-Usage:  docker pause CONTAINER [CONTAINER...]
-
-Pause all processes within one or more containers
-
-Options:
-      --help   Print usage
-```
-
-The `docker pause` command suspends all processes in the specified containers.
-On Linux, this uses the cgroups freezer. Traditionally, when suspending a process
-the `SIGSTOP` signal is used, which is observable by the process being suspended.
-With the cgroups freezer the process is unaware, and unable to capture,
-that it is being suspended, and subsequently resumed. On Windows, only Hyper-V
-containers can be paused.
-
-See the
-[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
-for further details.
-
-## Related information
-
-* [unpause](unpause.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_create.md
deleted file mode 100644
index 9d4e99e56a..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_create.md
+++ /dev/null
@@ -1,60 +0,0 @@
----
-title: "plugin create"
-description: "the plugin create command description and usage"
-keywords: "plugin, create"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin create
-
-```markdown
-Usage:  docker plugin create [OPTIONS] PLUGIN PLUGIN-DATA-DIR
-
-Create a plugin from a rootfs and configuration. Plugin data directory must contain config.json and rootfs directory.
-
-Options:
-      --compress   Compress the context using gzip 
-      --help       Print usage
-```
-
-Creates a plugin. Before creating the plugin, prepare the plugin's root filesystem as well as
-[the config.json](../../extend/config.md)
-
-
-The following example shows how to create a sample `plugin`.
-
-```bash
-
-$ ls -ls /home/pluginDir
-
-4 -rw-r--r--  1 root root 431 Nov  7 01:40 config.json
-0 drwxr-xr-x 19 root root 420 Nov  7 01:40 rootfs
-
-$ docker plugin create plugin /home/pluginDir
-plugin
-
-NAME                  	TAG                 DESCRIPTION                  ENABLED
-plugin                  latest              A sample plugin for Docker   true
-```
-
-The plugin can subsequently be enabled for local use or pushed to the public registry.
-
-## Related information
-
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_disable.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_disable.md
deleted file mode 100644
index 451f1ace9c..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_disable.md
+++ /dev/null
@@ -1,66 +0,0 @@
----
-title: "plugin disable"
-description: "the plugin disable command description and usage"
-keywords: "plugin, disable"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin disable
-
-```markdown
-Usage:  docker plugin disable [OPTIONS] PLUGIN
-
-Disable a plugin
-
-Options:
-  -f, --force   Force the disable of an active plugin
-      --help    Print usage
-```
-
-Disables a plugin. The plugin must be installed before it can be disabled,
-see [`docker plugin install`](plugin_install.md). Without the `-f` option,
-a plugin that has references (eg, volumes, networks) cannot be disabled.
-
-
-The following example shows that the `sample-volume-plugin` plugin is installed
-and enabled:
-
-```bash
-$ docker plugin ls
-
-ID                  NAME                             TAG                 DESCRIPTION                ENABLED
-69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   true
-```
-
-To disable the plugin, use the following command:
-
-```bash
-$ docker plugin disable tiborvass/sample-volume-plugin
-
-tiborvass/sample-volume-plugin
-
-$ docker plugin ls
-
-ID                  NAME                             TAG                 DESCRIPTION                ENABLED
-69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   false
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_enable.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_enable.md
deleted file mode 100644
index df8bee3af5..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_enable.md
+++ /dev/null
@@ -1,65 +0,0 @@
----
-title: "plugin enable"
-description: "the plugin enable command description and usage"
-keywords: "plugin, enable"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin enable
-
-```markdown
-Usage:  docker plugin enable [OPTIONS] PLUGIN
-
-Enable a plugin
-
-Options:
-      --help          Print usage
-      --timeout int   HTTP client timeout (in seconds)
-```
-
-Enables a plugin. The plugin must be installed before it can be enabled,
-see [`docker plugin install`](plugin_install.md).
-
-
-The following example shows that the `sample-volume-plugin` plugin is installed,
-but disabled:
-
-```bash
-$ docker plugin ls
-
-ID                  NAME                             TAG                 DESCRIPTION                ENABLED
-69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   false
-```
-
-To enable the plugin, use the following command:
-
-```bash
-$ docker plugin enable tiborvass/sample-volume-plugin
-
-tiborvass/sample-volume-plugin
-
-$ docker plugin ls
-
-ID                  NAME                             TAG                 DESCRIPTION                ENABLED
-69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   true
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_inspect.md
deleted file mode 100644
index fdcc030c43..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_inspect.md
+++ /dev/null
@@ -1,164 +0,0 @@
----
-title: "plugin inspect"
-description: "The plugin inspect command description and usage"
-keywords: "plugin, inspect"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin inspect
-
-```markdown
-Usage:	docker plugin inspect [OPTIONS] PLUGIN [PLUGIN...]
-
-Display detailed information on one or more plugins
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-Returns information about a plugin. By default, this command renders all results
-in a JSON array.
-
-Example output:
-
-```bash
-$ docker plugin inspect tiborvass/sample-volume-plugin:latest
-```
-```JSON
-{
-  "Id": "8c74c978c434745c3ade82f1bc0acf38d04990eaf494fa507c16d9f1daa99c21",
-  "Name": "tiborvass/sample-volume-plugin:latest",
-  "PluginReference": "tiborvas/sample-volume-plugin:latest",
-  "Enabled": true,
-  "Config": {
-    "Mounts": [
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": "/data",
-        "Destination": "/data",
-        "Type": "bind",
-        "Options": [
-          "shared",
-          "rbind"
-        ]
-      },
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": null,
-        "Destination": "/foobar",
-        "Type": "tmpfs",
-        "Options": null
-      }
-    ],
-    "Env": [
-      "DEBUG=1"
-    ],
-    "Args": null,
-    "Devices": null
-  },
-  "Manifest": {
-    "ManifestVersion": "v0",
-    "Description": "A test plugin for Docker",
-    "Documentation": "https://docs.docker.com/engine/extend/plugins/",
-    "Interface": {
-      "Types": [
-        "docker.volumedriver/1.0"
-      ],
-      "Socket": "plugins.sock"
-    },
-    "Entrypoint": [
-      "plugin-sample-volume-plugin",
-      "/data"
-    ],
-    "Workdir": "",
-    "User": {
-    },
-    "Network": {
-      "Type": "host"
-    },
-    "Capabilities": null,
-    "Mounts": [
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": "/data",
-        "Destination": "/data",
-        "Type": "bind",
-        "Options": [
-          "shared",
-          "rbind"
-        ]
-      },
-      {
-        "Name": "",
-        "Description": "",
-        "Settable": null,
-        "Source": null,
-        "Destination": "/foobar",
-        "Type": "tmpfs",
-        "Options": null
-      }
-    ],
-    "Devices": [
-      {
-        "Name": "device",
-        "Description": "a host device to mount",
-        "Settable": null,
-        "Path": "/dev/cpu_dma_latency"
-      }
-    ],
-    "Env": [
-      {
-        "Name": "DEBUG",
-        "Description": "If set, prints debug messages",
-        "Settable": null,
-        "Value": "1"
-      }
-    ],
-    "Args": {
-      "Name": "args",
-      "Description": "command line arguments",
-      "Settable": null,
-      "Value": [
-
-      ]
-    }
-  }
-}
-```
-(output formatted for readability)
-
-
-```bash
-$ docker plugin inspect -f '{{.Id}}' tiborvass/sample-volume-plugin:latest
-```
-```
-8c74c978c434745c3ade82f1bc0acf38d04990eaf494fa507c16d9f1daa99c21
-```
-
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin enable](plugin_enable.md)
-* [plugin disable](plugin_disable.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_install.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_install.md
deleted file mode 100644
index 0601193ce0..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_install.md
+++ /dev/null
@@ -1,71 +0,0 @@
----
-title: "plugin install"
-description: "the plugin install command description and usage"
-keywords: "plugin, install"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin install
-
-```markdown
-Usage:  docker plugin install [OPTIONS] PLUGIN [KEY=VALUE...]
-
-Install a plugin
-
-Options:
-      --alias string            Local name for plugin
-      --disable                 Do not enable the plugin on install
-      --grant-all-permissions   Grant all permissions necessary to run the plugin
-      --help                    Print usage
-```
-
-Installs and enables a plugin. Docker looks first for the plugin on your Docker
-host. If the plugin does not exist locally, then the plugin is pulled from
-the registry. Note that the minimum required registry version to distribute
-plugins is 2.3.0
-
-
-The following example installs `vieus/sshfs` plugin and [set](plugin_set.md) it's env variable
-`DEBUG` to 1. Install consists of pulling the plugin from Docker Hub, prompting
-the user to accept the list of privileges that the plugin needs, settings parameters
- and enabling the plugin.
-
-```bash
-$ docker plugin install vieux/sshfs DEBUG=1
-
-Plugin "vieux/sshfs" is requesting the following privileges:
- - network: [host]
- - device: [/dev/fuse]
- - capabilities: [CAP_SYS_ADMIN]
-Do you grant the above permissions? [y/N] y
-vieux/sshfs
-```
-
-After the plugin is installed, it appears in the list of plugins:
-
-```bash
-$ docker plugin ls
-
-ID                  NAME                  TAG                 DESCRIPTION                ENABLED
-69553ca1d123        vieux/sshfs           latest              sshFS plugin for Docker    true
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_ls.md
deleted file mode 100644
index 7a3426d95f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_ls.md
+++ /dev/null
@@ -1,53 +0,0 @@
----
-title: "plugin ls"
-description: "The plugin ls command description and usage"
-keywords: "plugin, list"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin ls
-
-```markdown
-Usage:  docker plugin ls [OPTIONS]
-
-List plugins
-
-Aliases:
-  ls, list
-
-Options:
-      --help	   Print usage
-      --no-trunc   Don't truncate output
-```
-
-Lists all the plugins that are currently installed. You can install plugins
-using the [`docker plugin install`](plugin_install.md) command.
-
-Example output:
-
-```bash
-$ docker plugin ls
-
-ID                  NAME                             TAG                 DESCRIPTION                ENABLED
-69553ca1d123        tiborvass/sample-volume-plugin   latest              A test plugin for Docker   true
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_push.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_push.md
deleted file mode 100644
index e61d10994c..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_push.md
+++ /dev/null
@@ -1,50 +0,0 @@
----
-title: "plugin push"
-description: "the plugin push command description and usage"
-keywords: "plugin, push"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-```markdown
-Usage:  docker plugin push [OPTIONS] PLUGIN[:TAG]
-
-Push a plugin to a registry
-
-Options:
-      --help       Print usage
-```
-
-Use `docker plugin create` to create the plugin. Once the plugin is ready for distribution,
-use `docker plugin push` to share your images to the Docker Hub registry or to a self-hosted one.
-
-Registry credentials are managed by [docker login](login.md).
-
-The following example shows how to push a sample `user/plugin`.
-
-```bash
-
-$ docker plugin ls
-ID                  NAME                  TAG                 DESCRIPTION                ENABLED
-69553ca1d456        user/plugin           latest              A sample plugin for Docker false
-$ docker plugin push user/plugin
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_rm.md
deleted file mode 100644
index 323ce83f3c..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_rm.md
+++ /dev/null
@@ -1,56 +0,0 @@
----
-title: "plugin rm"
-description: "the plugin rm command description and usage"
-keywords: "plugin, rm"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin rm
-
-```markdown
-Usage:  docker plugin rm [OPTIONS] PLUGIN [PLUGIN...]
-
-Remove one or more plugins
-
-Aliases:
-  rm, remove
-
-Options:
-      -f, --force  Force the removal of an active plugin
-          --help   Print usage
-```
-
-Removes a plugin. You cannot remove a plugin if it is enabled, you must disable
-a plugin using the [`docker plugin disable`](plugin_disable.md) before removing
-it (or use --force, use of force is not recommended, since it can affect
-functioning of running containers using the plugin).
-
-The following example disables and removes the `sample-volume-plugin:latest` plugin;
-
-```bash
-$ docker plugin disable tiborvass/sample-volume-plugin
-tiborvass/sample-volume-plugin
-
-$ docker plugin rm tiborvass/sample-volume-plugin:latest
-tiborvass/sample-volume-plugin
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin set](plugin_set.md)
-* [plugin upgrade](plugin_upgrade.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_set.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_set.md
deleted file mode 100644
index c206a8a760..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_set.md
+++ /dev/null
@@ -1,99 +0,0 @@
----
-title: "plugin set"
-description: "the plugin set command description and usage"
-keywords: "plugin, set"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin set
-
-```markdown
-Usage:  docker plugin set PLUGIN KEY=VALUE [KEY=VALUE...]
-
-Change settings for a plugin
-
-Options:
-      --help                    Print usage
-```
-
-Change settings for a plugin. The plugin must be disabled.
-
-The settings currently supported are:
- * env variables
- * source of mounts
- * path of devices
- * args
-
-The following example change the env variable `DEBUG` on the
-`sample-volume-plugin` plugin.
-
-```bash
-$ docker plugin inspect -f {{.Settings.Env}} tiborvass/sample-volume-plugin
-[DEBUG=0]
-
-$ docker plugin set tiborvass/sample-volume-plugin DEBUG=1
-
-$ docker plugin inspect -f {{.Settings.Env}} tiborvass/sample-volume-plugin
-[DEBUG=1]
-```
-
-The following example change the source of the `mymount` mount on
-the `myplugin` plugin.
-
-```bash
-$ docker plugin inspect -f '{{with $mount := index .Settings.Mounts 0}}{{$mount.Source}}{{end}}' myplugin
-/foo
-
-$ docker plugins set myplugin mymount.source=/bar
-
-$ docker plugin inspect -f '{{with $mount := index .Settings.Mounts 0}}{{$mount.Source}}{{end}}' myplugin
-/bar
-```
-
-Note: since only `source` is settable in `mymount`, `docker plugins set mymount=/bar myplugin` would work too.
-
-The following example change the path of the `mydevice` device on
-the `myplugin` plugin.
-
-```bash
-$ docker plugin inspect -f '{{with $device := index .Settings.Devices 0}}{{$device.Path}}{{end}}' myplugin
-/dev/foo
-
-$ docker plugins set myplugin mydevice.path=/dev/bar
-
-$ docker plugin inspect -f '{{with $device := index .Settings.Devices 0}}{{$device.Path}}{{end}}' myplugin
-/dev/bar
-```
-
-Note: since only `path` is settable in `mydevice`, `docker plugins set mydevice=/dev/bar myplugin` would work too.
-
-The following example change the source of the args on the `myplugin` plugin.
-
-```bash
-$ docker plugin inspect -f '{{.Settings.Args}}' myplugin
-["foo", "bar"]
-
-$ docker plugins set myplugin args="foo bar baz"
-
-$ docker plugin inspect -f '{{.Settings.Args}}' myplugin
-["foo", "bar", "baz"]
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_upgrade.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_upgrade.md
deleted file mode 100644
index 20efc577aa..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/plugin_upgrade.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-title: "plugin upgrade"
-description: "the plugin upgrade command description and usage"
-keywords: "plugin, upgrade"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# plugin upgrade
-
-```markdown
-Usage:  docker plugin upgrade [OPTIONS] PLUGIN [REMOTE]
-
-Upgrade a plugin
-
-Options:
-      --disable-content-trust   Skip image verification (default true)
-      --grant-all-permissions   Grant all permissions necessary to run the plugin
-      --help                    Print usage
-      --skip-remote-check       Do not check if specified remote plugin matches existing plugin image
-```
-
-Upgrades an existing plugin to the specified remote plugin image. If no remote
-is specified, Docker will re-pull the current image and use the updated version.
-All existing references to the plugin will continue to work.
-The plugin must be disabled before running the upgrade.
-
-The following example installs `vieus/sshfs` plugin, uses it to create and use
-a volume, then upgrades the plugin.
-
-```bash
-$ docker plugin install vieux/sshfs DEBUG=1
-
-Plugin "vieux/sshfs:next" is requesting the following privileges:
- - network: [host]
- - device: [/dev/fuse]
- - capabilities: [CAP_SYS_ADMIN]
-Do you grant the above permissions? [y/N] y
-vieux/sshfs:next
-
-$ docker volume create -d vieux/sshfs:next -o sshcmd=root@1.2.3.4:/tmp/shared -o password=XXX sshvolume
-sshvolume
-$ docker run -it -v sshvolume:/data alpine sh -c "touch /data/hello"
-$ docker plugin disable -f vieux/sshfs:next
-viex/sshfs:next
-
-# Here docker volume ls doesn't show 'sshfsvolume', since the plugin is disabled
-$ docker volume ls
-DRIVER              VOLUME NAME
-
-$ docker plugin upgrade vieux/sshfs:next vieux/sshfs:next
-Plugin "vieux/sshfs:next" is requesting the following privileges:
- - network: [host]
- - device: [/dev/fuse]
- - capabilities: [CAP_SYS_ADMIN]
-Do you grant the above permissions? [y/N] y
-Upgrade plugin vieux/sshfs:next to vieux/sshfs:next
-$ docker plugin enable vieux/sshfs:next
-viex/sshfs:next
-$ docker volume ls
-DRIVER              VOLUME NAME
-viuex/sshfs:next    sshvolume
-$ docker run -it -v sshvolume:/data alpine sh -c "ls /data"
-hello
-```
-
-## Related information
-
-* [plugin create](plugin_create.md)
-* [plugin disable](plugin_disable.md)
-* [plugin enable](plugin_enable.md)
-* [plugin inspect](plugin_inspect.md)
-* [plugin install](plugin_install.md)
-* [plugin ls](plugin_ls.md)
-* [plugin push](plugin_push.md)
-* [plugin rm](plugin_rm.md)
-* [plugin set](plugin_set.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/port.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/port.md
deleted file mode 100644
index bc90b6e786..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/port.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "port"
-description: "The port command description and usage"
-keywords: "port, mapping, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# port
-
-```markdown
-Usage:  docker port CONTAINER [PRIVATE_PORT[/PROTO]]
-
-List port mappings or a specific mapping for the container
-
-Options:
-      --help   Print usage
-```
-
-You can find out all the ports mapped by not specifying a `PRIVATE_PORT`, or
-just a specific mapping:
-
-    $ docker ps
-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS                                            NAMES
-    b650456536c7        busybox:latest      top                 54 minutes ago      Up 54 minutes       0.0.0.0:1234->9876/tcp, 0.0.0.0:4321->7890/tcp   test
-    $ docker port test
-    7890/tcp -> 0.0.0.0:4321
-    9876/tcp -> 0.0.0.0:1234
-    $ docker port test 7890/tcp
-    0.0.0.0:4321
-    $ docker port test 7890/udp
-    2014/06/24 11:53:36 Error: No public port '7890/udp' published for test
-    $ docker port test 7890
-    0.0.0.0:4321
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/ps.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/ps.md
deleted file mode 100644
index 1d5f31da88..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/ps.md
+++ /dev/null
@@ -1,384 +0,0 @@
----
-title: "ps"
-description: "The ps command description and usage"
-keywords: "container, running, list"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# ps
-
-```markdown
-Usage: docker ps [OPTIONS]
-
-List containers
-
-Options:
-  -a, --all             Show all containers (default shows just running)
-  -f, --filter value    Filter output based on conditions provided (default [])
-                        - exited=<int> an exit code of <int>
-                        - label=<key> or label=<key>=<value>
-                        - status=(created|restarting|removing|running|paused|exited)
-                        - name=<string> a container's name
-                        - id=<ID> a container's ID
-                        - before=(<container-name>|<container-id>)
-                        - since=(<container-name>|<container-id>)
-                        - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>)
-                          containers created from an image or a descendant.
-                        - is-task=(true|false)
-                        - health=(starting|healthy|unhealthy|none)
-      --format string   Pretty-print containers using a Go template
-      --help            Print usage
-  -n, --last int        Show n last created containers (includes all states) (default -1)
-  -l, --latest          Show the latest created container (includes all states)
-      --no-trunc        Don't truncate output
-  -q, --quiet           Only display numeric IDs
-  -s, --size            Display total file sizes
-```
-
-Running `docker ps --no-trunc` showing 2 linked containers.
-
-```bash
-$ docker ps
-
-CONTAINER ID        IMAGE                        COMMAND                CREATED              STATUS              PORTS               NAMES
-4c01db0b339c        ubuntu:12.04                 bash                   17 seconds ago       Up 16 seconds       3300-3310/tcp       webapp
-d7886598dbe2        crosbymichael/redis:latest   /redis-server --dir    33 minutes ago       Up 33 minutes       6379/tcp            redis,webapp/db
-```
-
-The `docker ps` command only shows running containers by default. To see all
-containers, use the `-a` (or `--all`) flag:
-
-```bash
-$ docker ps -a
-```
-
-`docker ps` groups exposed ports into a single range if possible. E.g., a
-container that exposes TCP ports `100, 101, 102` displays `100-102/tcp` in
-the `PORTS` column.
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there is more
-than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* id (container's id)
-* label (`label=<key>` or `label=<key>=<value>`)
-* name (container's name)
-* exited (int - the code of exited containers. Only useful with `--all`)
-* status (created|restarting|running|removing|paused|exited|dead)
-* ancestor (`<image-name>[:<tag>]`,  `<image id>` or `<image@digest>`) - filters containers that were created from the given image or a descendant.
-* before (container's id or name) - filters containers created before given id or name
-* since (container's id or name) - filters containers created since given id or name
-* isolation (default|process|hyperv)   (Windows daemon only)
-* volume (volume name or mount point) - filters containers that mount volumes.
-* network (network id or name) - filters containers connected to the provided network
-* health (starting|healthy|unhealthy|none) - filters containers based on healthcheck status
-
-#### Label
-
-The `label` filter matches containers based on the presence of a `label` alone or a `label` and a
-value.
-
-The following filter matches containers with the `color` label regardless of its value.
-
-```bash
-$ docker ps --filter "label=color"
-
-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
-673394ef1d4c        busybox             "top"               47 seconds ago      Up 45 seconds                           nostalgic_shockley
-d85756f57265        busybox             "top"               52 seconds ago      Up 51 seconds                           high_albattani
-```
-
-The following filter matches containers with the `color` label with the `blue` value.
-
-```bash
-$ docker ps --filter "label=color=blue"
-
-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
-d85756f57265        busybox             "top"               About a minute ago   Up About a minute                       high_albattani
-```
-
-#### Name
-
-The `name` filter matches on all or part of a container's name.
-
-The following filter matches all containers with a name containing the `nostalgic_stallman` string.
-
-```bash
-$ docker ps --filter "name=nostalgic_stallman"
-
-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
-9b6247364a03        busybox             "top"               2 minutes ago       Up 2 minutes                            nostalgic_stallman
-```
-
-You can also filter for a substring in a name as this shows:
-
-```bash
-$ docker ps --filter "name=nostalgic"
-
-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
-715ebfcee040        busybox             "top"               3 seconds ago       Up 1 second                             i_am_nostalgic
-9b6247364a03        busybox             "top"               7 minutes ago       Up 7 minutes                            nostalgic_stallman
-673394ef1d4c        busybox             "top"               38 minutes ago      Up 38 minutes                           nostalgic_shockley
-```
-
-#### Exited
-
-The `exited` filter matches containers by exist status code. For example, to
-filter for containers that have exited successfully:
-
-```bash
-$ docker ps -a --filter 'exited=0'
-
-CONTAINER ID        IMAGE             COMMAND                CREATED             STATUS                   PORTS                      NAMES
-ea09c3c82f6e        registry:latest   /srv/run.sh            2 weeks ago         Exited (0) 2 weeks ago   127.0.0.1:5000->5000/tcp   desperate_leakey
-106ea823fe4e        fedora:latest     /bin/sh -c 'bash -l'   2 weeks ago         Exited (0) 2 weeks ago                              determined_albattani
-48ee228c9464        fedora:20         bash                   2 weeks ago         Exited (0) 2 weeks ago                              tender_torvalds
-```
-
-#### Killed containers
-
-You can use a filter to locate containers that exited with status of `137`
-meaning a `SIGKILL(9)` killed them.
-
-```bash
-$ docker ps -a --filter 'exited=137'
-CONTAINER ID        IMAGE               COMMAND                CREATED             STATUS                       PORTS               NAMES
-b3e1c0ed5bfe        ubuntu:latest       "sleep 1000"           12 seconds ago      Exited (137) 5 seconds ago                       grave_kowalevski
-a2eb5558d669        redis:latest        "/entrypoint.sh redi   2 hours ago         Exited (137) 2 hours ago                         sharp_lalande
-```
-
-Any of these events result in a `137` status:
-
-* the `init` process of the container is killed manually
-* `docker kill` kills the container
-* Docker daemon restarts which kills all running containers
-
-#### Status
-
-The `status` filter matches containers by status. You can filter using
-`created`, `restarting`, `running`, `removing`, `paused`, `exited` and `dead`. For example,
-to filter for `running` containers:
-
-```bash
-$ docker ps --filter status=running
-
-CONTAINER ID        IMAGE                  COMMAND             CREATED             STATUS              PORTS               NAMES
-715ebfcee040        busybox                "top"               16 minutes ago      Up 16 minutes                           i_am_nostalgic
-d5c976d3c462        busybox                "top"               23 minutes ago      Up 23 minutes                           top
-9b6247364a03        busybox                "top"               24 minutes ago      Up 24 minutes                           nostalgic_stallman
-```
-
-To filter for `paused` containers:
-
-```bash
-$ docker ps --filter status=paused
-
-CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS                      PORTS               NAMES
-673394ef1d4c        busybox             "top"               About an hour ago   Up About an hour (Paused)                       nostalgic_shockley
-```
-
-#### Ancestor
-
-The `ancestor` filter matches containers based on its image or a descendant of
-it. The filter supports the following image representation:
-
-- image
-- image:tag
-- image:tag@digest
-- short-id
-- full-id
-
-If you don't specify a `tag`, the `latest` tag is used. For example, to filter
-for containers that use the latest `ubuntu` image:
-
-```bash
-$ docker ps --filter ancestor=ubuntu
-
-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
-919e1179bdb8        ubuntu-c1           "top"               About a minute ago   Up About a minute                       admiring_lovelace
-5d1e4a540723        ubuntu-c2           "top"               About a minute ago   Up About a minute                       admiring_sammet
-82a598284012        ubuntu              "top"               3 minutes ago        Up 3 minutes                            sleepy_bose
-bab2a34ba363        ubuntu              "top"               3 minutes ago        Up 3 minutes                            focused_yonath
-```
-
-Match containers based on the `ubuntu-c1` image which, in this case, is a child
-of `ubuntu`:
-
-```bash
-$ docker ps --filter ancestor=ubuntu-c1
-
-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
-919e1179bdb8        ubuntu-c1           "top"               About a minute ago   Up About a minute                       admiring_lovelace
-```
-
-Match containers based on the `ubuntu` version `12.04.5` image:
-
-```bash
-$ docker ps --filter ancestor=ubuntu:12.04.5
-
-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
-82a598284012        ubuntu:12.04.5      "top"               3 minutes ago        Up 3 minutes                            sleepy_bose
-```
-
-The following matches containers based on the layer `d0e008c6cf02` or an image
-that have this layer in its layer stack.
-
-```bash
-$ docker ps --filter ancestor=d0e008c6cf02
-
-CONTAINER ID        IMAGE               COMMAND             CREATED              STATUS              PORTS               NAMES
-82a598284012        ubuntu:12.04.5      "top"               3 minutes ago        Up 3 minutes                            sleepy_bose
-```
-
-#### Before
-
-The `before` filter shows only containers created before the container with
-given id or name. For example, having these containers created:
-
-```bash
-$ docker ps
-
-CONTAINER ID        IMAGE       COMMAND       CREATED              STATUS              PORTS              NAMES
-9c3527ed70ce        busybox     "top"         14 seconds ago       Up 15 seconds                          desperate_dubinsky
-4aace5031105        busybox     "top"         48 seconds ago       Up 49 seconds                          focused_hamilton
-6e63f6ff38b0        busybox     "top"         About a minute ago   Up About a minute                      distracted_fermat
-```
-
-Filtering with `before` would give:
-
-```bash
-$ docker ps -f before=9c3527ed70ce
-
-CONTAINER ID        IMAGE       COMMAND       CREATED              STATUS              PORTS              NAMES
-4aace5031105        busybox     "top"         About a minute ago   Up About a minute                      focused_hamilton
-6e63f6ff38b0        busybox     "top"         About a minute ago   Up About a minute                      distracted_fermat
-```
-
-#### Since
-
-The `since` filter shows only containers created since the container with given
-id or name. For example, with the same containers as in `before` filter:
-
-```bash
-$ docker ps -f since=6e63f6ff38b0
-
-CONTAINER ID        IMAGE       COMMAND       CREATED             STATUS              PORTS               NAMES
-9c3527ed70ce        busybox     "top"         10 minutes ago      Up 10 minutes                           desperate_dubinsky
-4aace5031105        busybox     "top"         10 minutes ago      Up 10 minutes                           focused_hamilton
-```
-
-#### Volume
-
-The `volume` filter shows only containers that mount a specific volume or have
-a volume mounted in a specific path:
-
-```bash{% raw %}
-$ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
-CONTAINER ID        MOUNTS
-9c3527ed70ce        remote-volume
-
-$ docker ps --filter volume=/data --format "table {{.ID}}\t{{.Mounts}}"
-CONTAINER ID        MOUNTS
-9c3527ed70ce        remote-volume
-{% endraw %}```
-
-#### Network
-
-The `network` filter shows only containers that are connected to a network with
-a given name or id.
-
-The following filter matches all containers that are connected to a network
-with a name containing `net1`.
-
-```bash
-$ docker run -d --net=net1 --name=test1 ubuntu top
-$ docker run -d --net=net2 --name=test2 ubuntu top
-
-$ docker ps --filter network=net1
-
-CONTAINER ID        IMAGE       COMMAND       CREATED             STATUS              PORTS               NAMES
-9d4893ed80fe        ubuntu      "top"         10 minutes ago      Up 10 minutes                           test1
-```
-
-The network filter matches on both the network's name and id. The following
-example shows all containers that are attached to the `net1` network, using
-the network id as a filter;
-
-```bash
-{% raw %}
-$ docker network inspect --format "{{.ID}}" net1
-{% endraw %}
-
-8c0b4110ae930dbe26b258de9bc34a03f98056ed6f27f991d32919bfe401d7c5
-
-$ docker ps --filter network=8c0b4110ae930dbe26b258de9bc34a03f98056ed6f27f991d32919bfe401d7c5
-
-CONTAINER ID        IMAGE       COMMAND       CREATED             STATUS              PORTS               NAMES
-9d4893ed80fe        ubuntu      "top"         10 minutes ago      Up 10 minutes                           test1
-```
-
-## Formatting
-
-The formatting option (`--format`) pretty-prints container output using a Go
-template.
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder   | Description
---------------|----------------------------------------------------------------------------------------------------
-`.ID`         | Container ID
-`.Image`      | Image ID
-`.Command`    | Quoted command
-`.CreatedAt`  | Time when the container was created.
-`.RunningFor` | Elapsed time since the container was started.
-`.Ports`      | Exposed ports.
-`.Status`     | Container status.
-`.Size`       | Container disk size.
-`.Names`      | Container names.
-`.Labels`     | All labels assigned to the container.
-`.Label`      | Value of a specific label for this container. For example `'{% raw %}{{.Label "com.docker.swarm.cpu"}}{% endraw %}'`
-`.Mounts`     | Names of the volumes mounted in this container.
-`.Networks`   | Names of the networks attached to this container.
-
-When using the `--format` option, the `ps` command will either output the data
-exactly as the template declares or, when using the `table` directive, includes
-column headers as well.
-
-The following example uses a template without headers and outputs the `ID` and
-`Command` entries separated by a colon for all running containers:
-
-```bash
-{% raw %}
-$ docker ps --format "{{.ID}}: {{.Command}}"
-{% endraw %}
-
-a87ecb4f327c: /bin/sh -c #(nop) MA
-01946d9d34d8: /bin/sh -c #(nop) MA
-c1d3b0166030: /bin/sh -c yum -y up
-41d50ecd2f57: /bin/sh -c #(nop) MA
-```
-
-To list all running containers with their labels in a table format you can use:
-
-```bash
-{% raw %}
-$ docker ps --format "table {{.ID}}\t{{.Labels}}"
-{% endraw %}
-
-CONTAINER ID        LABELS
-a87ecb4f327c        com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd
-01946d9d34d8
-c1d3b0166030        com.docker.swarm.node=debian,com.docker.swarm.cpu=6
-41d50ecd2f57        com.docker.swarm.node=fedora,com.docker.swarm.cpu=3,com.docker.swarm.storage=ssd
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/pull.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/pull.md
deleted file mode 100644
index 0c960b404a..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/pull.md
+++ /dev/null
@@ -1,252 +0,0 @@
----
-title: "pull"
-description: "The pull command description and usage"
-keywords: "pull, image, hub, docker"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# pull
-
-```markdown
-Usage:  docker pull [OPTIONS] NAME[:TAG|@DIGEST]
-
-Pull an image or a repository from a registry
-
-Options:
-  -a, --all-tags                Download all tagged images in the repository
-      --disable-content-trust   Skip image verification (default true)
-      --help                    Print usage
-```
-
-Most of your images will be created on top of a base image from the
-[Docker Hub](https://hub.docker.com) registry.
-
-[Docker Hub](https://hub.docker.com) contains many pre-built images that you
-can `pull` and try without needing to define and configure your own.
-
-To download a particular image, or set of images (i.e., a repository),
-use `docker pull`.
-
-## Proxy configuration
-
-If you are behind an HTTP proxy server, for example in corporate settings,
-before open a connect to registry, you may need to configure the Docker
-daemon's proxy settings, using the `HTTP_PROXY`, `HTTPS_PROXY`, and `NO_PROXY`
-environment variables. To set these environment variables on a host using
-`systemd`, refer to the [control and configure Docker with systemd](https://docs.docker.com/engine/admin/systemd/#http-proxy)
-for variables configuration.
-
-## Concurrent downloads
-
-By default the Docker daemon will pull three layers of an image at a time.
-If you are on a low bandwidth connection this may cause timeout issues and you may want to lower
-this via the `--max-concurrent-downloads` daemon option. See the
-[daemon documentation](dockerd.md) for more details.
-
-## Examples
-
-### Pull an image from Docker Hub
-
-To download a particular image, or set of images (i.e., a repository), use
-`docker pull`. If no tag is provided, Docker Engine uses the `:latest` tag as a
-default. This command pulls the `debian:latest` image:
-
-```bash
-$ docker pull debian
-
-Using default tag: latest
-latest: Pulling from library/debian
-fdd5d7827f33: Pull complete
-a3ed95caeb02: Pull complete
-Digest: sha256:e7d38b3517548a1c71e41bffe9c8ae6d6d29546ce46bf62159837aad072c90aa
-Status: Downloaded newer image for debian:latest
-```
-
-Docker images can consist of multiple layers. In the example above, the image
-consists of two layers; `fdd5d7827f33` and `a3ed95caeb02`.
-
-Layers can be reused by images. For example, the `debian:jessie` image shares
-both layers with `debian:latest`. Pulling the `debian:jessie` image therefore
-only pulls its metadata, but not its layers, because all layers are already
-present locally:
-
-```bash
-$ docker pull debian:jessie
-
-jessie: Pulling from library/debian
-fdd5d7827f33: Already exists
-a3ed95caeb02: Already exists
-Digest: sha256:a9c958be96d7d40df920e7041608f2f017af81800ca5ad23e327bc402626b58e
-Status: Downloaded newer image for debian:jessie
-```
-
-To see which images are present locally, use the [`docker images`](images.md)
-command:
-
-```bash
-$ docker images
-
-REPOSITORY   TAG      IMAGE ID        CREATED      SIZE
-debian       jessie   f50f9524513f    5 days ago   125.1 MB
-debian       latest   f50f9524513f    5 days ago   125.1 MB
-```
-
-Docker uses a content-addressable image store, and the image ID is a SHA256
-digest covering the image's configuration and layers. In the example above,
-`debian:jessie` and `debian:latest` have the same image ID because they are
-actually the *same* image tagged with different names. Because they are the
-same image, their layers are stored only once and do not consume extra disk
-space.
-
-For more information about images, layers, and the content-addressable store,
-refer to [understand images, containers, and storage drivers](https://docs.docker.com/engine/userguide/storagedriver/imagesandcontainers/).
-
-
-## Pull an image by digest (immutable identifier)
-
-So far, you've pulled images by their name (and "tag"). Using names and tags is
-a convenient way to work with images. When using tags, you can `docker pull` an
-image again to make sure you have the most up-to-date version of that image.
-For example, `docker pull ubuntu:14.04` pulls the latest version of the Ubuntu
-14.04 image.
-
-In some cases you don't want images to be updated to newer versions, but prefer
-to use a fixed version of an image. Docker enables you to pull an image by its
-*digest*. When pulling an image by digest, you specify *exactly* which version
-of an image to pull. Doing so, allows you to "pin" an image to that version,
-and guarantee that the image you're using is always the same.
-
-To know the digest of an image, pull the image first. Let's pull the latest
-`ubuntu:14.04` image from Docker Hub:
-
-```bash
-$ docker pull ubuntu:14.04
-
-14.04: Pulling from library/ubuntu
-5a132a7e7af1: Pull complete
-fd2731e4c50c: Pull complete
-28a2f68d1120: Pull complete
-a3ed95caeb02: Pull complete
-Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-Status: Downloaded newer image for ubuntu:14.04
-```
-
-Docker prints the digest of the image after the pull has finished. In the example
-above, the digest of the image is:
-
-    sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-Docker also prints the digest of an image when *pushing* to a registry. This
-may be useful if you want to pin to a version of the image you just pushed.
-
-A digest takes the place of the tag when pulling an image, for example, to
-pull the above image by digest, run the following command:
-
-```bash
-$ docker pull ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2: Pulling from library/ubuntu
-5a132a7e7af1: Already exists
-fd2731e4c50c: Already exists
-28a2f68d1120: Already exists
-a3ed95caeb02: Already exists
-Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-Status: Downloaded newer image for ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-```
-
-Digest can also be used in the `FROM` of a Dockerfile, for example:
-
-```Dockerfile
-FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-MAINTAINER some maintainer <maintainer@example.com>
-```
-
-> **Note**: Using this feature "pins" an image to a specific version in time.
-> Docker will therefore not pull updated versions of an image, which may include
-> security updates. If you want to pull an updated image, you need to change the
-> digest accordingly.
-
-
-## Pulling from a different registry
-
-By default, `docker pull` pulls images from [Docker Hub](https://hub.docker.com). It is also possible to
-manually specify the path of a registry to pull from. For example, if you have
-set up a local registry, you can specify its path to pull from it. A registry
-path is similar to a URL, but does not contain a protocol specifier (`https://`).
-
-The following command pulls the `testing/test-image` image from a local registry
-listening on port 5000 (`myregistry.local:5000`):
-
-```bash
-$ docker pull myregistry.local:5000/testing/test-image
-```
-
-Registry credentials are managed by [docker login](login.md).
-
-Docker uses the `https://` protocol to communicate with a registry, unless the
-registry is allowed to be accessed over an insecure connection. Refer to the
-[insecure registries](dockerd.md#insecure-registries) section for more information.
-
-
-## Pull a repository with multiple images
-
-By default, `docker pull` pulls a *single* image from the registry. A repository
-can contain multiple images. To pull all images from a repository, provide the
-`-a` (or `--all-tags`) option when using `docker pull`.
-
-This command pulls all images from the `fedora` repository:
-
-```bash
-$ docker pull --all-tags fedora
-
-Pulling repository fedora
-ad57ef8d78d7: Download complete
-105182bb5e8b: Download complete
-511136ea3c5a: Download complete
-73bd853d2ea5: Download complete
-....
-
-Status: Downloaded newer image for fedora
-```
-
-After the pull has completed use the `docker images` command to see the
-images that were pulled. The example below shows all the `fedora` images
-that are present locally:
-
-```bash
-$ docker images fedora
-
-REPOSITORY   TAG         IMAGE ID        CREATED      SIZE
-fedora       rawhide     ad57ef8d78d7    5 days ago   359.3 MB
-fedora       20          105182bb5e8b    5 days ago   372.7 MB
-fedora       heisenbug   105182bb5e8b    5 days ago   372.7 MB
-fedora       latest      105182bb5e8b    5 days ago   372.7 MB
-```
-
-## Canceling a pull
-
-Killing the `docker pull` process, for example by pressing `CTRL-c` while it is
-running in a terminal, will terminate the pull operation.
-
-```bash
-$ docker pull fedora
-
-Using default tag: latest
-latest: Pulling from library/fedora
-a3ed95caeb02: Pulling fs layer
-236608c7b546: Pulling fs layer
-^C
-```
-
-> **Note**: Technically, the Engine terminates a pull operation when the
-> connection between the Docker Engine daemon and the Docker Engine client
-> initiating the pull is lost. If the connection with the Engine daemon is
-> lost for other reasons than a manual interaction, the pull is also aborted.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/push.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/push.md
deleted file mode 100644
index e36fd026d1..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/push.md
+++ /dev/null
@@ -1,75 +0,0 @@
----
-title: "push"
-description: "The push command description and usage"
-keywords: "share, push, image"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# push
-
-```markdown
-Usage:  docker push [OPTIONS] NAME[:TAG]
-
-Push an image or a repository to a registry
-
-Options:
-      --disable-content-trust   Skip image verification (default true)
-      --help                    Print usage
-```
-
-Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
-registry or to a self-hosted one.
-
-Refer to the [`docker tag`](tag.md) reference for more information about valid
-image and tag names.
-
-Killing the `docker push` process, for example by pressing `CTRL-c` while it is
-running in a terminal, terminates the push operation.
-
-Registry credentials are managed by [docker login](login.md).
-
-## Concurrent uploads
-
-By default the Docker daemon will push five layers of an image at a time.
-If you are on a low bandwidth connection this may cause timeout issues and you may want to lower
-this via the `--max-concurrent-uploads` daemon option. See the
-[daemon documentation](dockerd.md) for more details.
-
-## Examples
-
-### Pushing a new image to a registry
-
-First save the new image by finding the container ID (using [`docker ps`](ps.md))
-and then committing it to a new image name.  Note that only `a-z0-9-_.` are
-allowed when naming images:
-
-```bash
-$ docker commit c16378f943fe rhel-httpd
-```
-
-Now, push the image to the registry using the image ID. In this example the
-registry is on host named `registry-host` and listening on port `5000`. To do
-this, tag the image with the host name or IP address, and the port of the
-registry:
-
-```bash
-$ docker tag rhel-httpd registry-host:5000/myadmin/rhel-httpd
-$ docker push registry-host:5000/myadmin/rhel-httpd
-```
-
-Check that this worked by running:
-
-```bash
-$ docker images
-```
-
-You should see both `rhel-httpd` and `registry-host:5000/myadmin/rhel-httpd`
-listed.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rename.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/rename.md
deleted file mode 100644
index be035f1ce4..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rename.md
+++ /dev/null
@@ -1,27 +0,0 @@
----
-title: "rename"
-description: "The rename command description and usage"
-keywords: "rename, docker, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# rename
-
-```markdown
-Usage:  docker rename CONTAINER NEW_NAME
-
-Rename a container
-
-Options:
-      --help   Print usage
-```
-
-The `docker rename` command allows the container to be renamed to a different name.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/restart.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/restart.md
deleted file mode 100644
index 9f7ed00553..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/restart.md
+++ /dev/null
@@ -1,26 +0,0 @@
----
-title: "restart"
-description: "The restart command description and usage"
-keywords: "restart, container, Docker"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# restart
-
-```markdown
-Usage:  docker restart [OPTIONS] CONTAINER [CONTAINER...]
-
-Restart one or more containers
-
-Options:
-      --help       Print usage
-  -t, --time int   Seconds to wait for stop before killing the container (default 10)
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/rm.md
deleted file mode 100644
index 1c3e795933..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rm.md
+++ /dev/null
@@ -1,69 +0,0 @@
----
-title: "rm"
-description: "The rm command description and usage"
-keywords: "remove, Docker, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# rm
-
-```markdown
-Usage:  docker rm [OPTIONS] CONTAINER [CONTAINER...]
-
-Remove one or more containers
-
-Options:
-  -f, --force     Force the removal of a running container (uses SIGKILL)
-      --help      Print usage
-  -l, --link      Remove the specified link
-  -v, --volumes   Remove the volumes associated with the container
-```
-
-## Examples
-
-    $ docker rm /redis
-    /redis
-
-This will remove the container referenced under the link
-`/redis`.
-
-    $ docker rm --link /webapp/redis
-    /webapp/redis
-
-This will remove the underlying link between `/webapp` and the `/redis`
-containers removing all network communication.
-
-    $ docker rm --force redis
-    redis
-
-The main process inside the container referenced under the link `/redis` will receive
-`SIGKILL`, then the container will be removed.
-
-    $ docker rm $(docker ps -a -q)
-
-This command will delete all stopped containers. The command
-`docker ps -a -q` will return all existing container IDs and pass them to
-the `rm` command which will delete them. Any running containers will not be
-deleted.
-
-    $ docker rm -v redis
-    redis
-
-This command will remove the container and any volumes associated with it.
-Note that if a volume was specified with a name, it will not be removed.
-
-    $ docker create -v awesome:/foo -v /bar --name hello redis
-    hello
-    $ docker rm -v hello
-
-In this example, the volume for `/foo` will remain intact, but the volume for
-`/bar` will be removed. The same behavior holds for volumes inherited with
-`--volumes-from`.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rmi.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/rmi.md
deleted file mode 100644
index 149b7635b6..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/rmi.md
+++ /dev/null
@@ -1,83 +0,0 @@
----
-title: "rmi"
-description: "The rmi command description and usage"
-keywords: "remove, image, Docker"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# rmi
-
-```markdown
-Usage:  docker rmi [OPTIONS] IMAGE [IMAGE...]
-
-Remove one or more images
-
-Options:
-  -f, --force      Force removal of the image
-      --help       Print usage
-      --no-prune   Do not delete untagged parents
-```
-
-You can remove an image using its short or long ID, its tag, or its digest. If
-an image has one or more tag referencing it, you must remove all of them before
-the image is removed. Digest references are removed automatically when an image
-is removed by tag.
-
-    $ docker images
-    REPOSITORY                TAG                 IMAGE ID            CREATED             SIZE
-    test1                     latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-    test                      latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-    test2                     latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-
-    $ docker rmi fd484f19954f
-    Error: Conflict, cannot delete image fd484f19954f because it is tagged in multiple repositories, use -f to force
-    2013/12/11 05:47:16 Error: failed to remove one or more images
-
-    $ docker rmi test1
-    Untagged: test1:latest
-    $ docker rmi test2
-    Untagged: test2:latest
-
-    $ docker images
-    REPOSITORY                TAG                 IMAGE ID            CREATED             SIZE
-    test                      latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-    $ docker rmi test
-    Untagged: test:latest
-    Deleted: fd484f19954f4920da7ff372b5067f5b7ddb2fd3830cecd17b96ea9e286ba5b8
-
-If you use the `-f` flag and specify the image's short or long ID, then this
-command untags and removes all images that match the specified ID.
-
-    $ docker images
-    REPOSITORY                TAG                 IMAGE ID            CREATED             SIZE
-    test1                     latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-    test                      latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-    test2                     latest              fd484f19954f        23 seconds ago      7 B (virtual 4.964 MB)
-
-    $ docker rmi -f fd484f19954f
-    Untagged: test1:latest
-    Untagged: test:latest
-    Untagged: test2:latest
-    Deleted: fd484f19954f4920da7ff372b5067f5b7ddb2fd3830cecd17b96ea9e286ba5b8
-
-An image pulled by digest has no tag associated with it:
-
-    $ docker images --digests
-    REPOSITORY                     TAG       DIGEST                                                                    IMAGE ID        CREATED         SIZE
-    localhost:5000/test/busybox    <none>    sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf   4986bf8c1536    9 weeks ago     2.43 MB
-
-To remove an image using its digest:
-
-    $ docker rmi localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf
-    Untagged: localhost:5000/test/busybox@sha256:cbbf2f9a99b47fc460d422812b6a5adff7dfee951d8fa2e4a98caa0382cfbdbf
-    Deleted: 4986bf8c15363d1c5d15512d5266f8777bfba4974ac56e3270e7760f6f0a8125
-    Deleted: ea13149945cb6b1e746bf28032f02e9b5a793523481a0a18645fc77ad53c4ea2
-    Deleted: df7546f9f060a2268024c8a230d8639878585defcc1bc6f79d2728a13957871b
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/run.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/run.md
deleted file mode 100644
index e57ba4bbea..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/run.md
+++ /dev/null
@@ -1,732 +0,0 @@
----
-title: "run"
-description: "The run command description and usage"
-keywords: "run, command, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# run
-
-```markdown
-Usage:  docker run [OPTIONS] IMAGE [COMMAND] [ARG...]
-
-Run a command in a new container
-
-Options:
-      --add-host value              Add a custom host-to-IP mapping (host:ip) (default [])
-  -a, --attach value                Attach to STDIN, STDOUT or STDERR (default [])
-      --blkio-weight value          Block IO (relative weight), between 10 and 1000
-      --blkio-weight-device value   Block IO weight (relative device weight) (default [])
-      --cap-add value               Add Linux capabilities (default [])
-      --cap-drop value              Drop Linux capabilities (default [])
-      --cgroup-parent string        Optional parent cgroup for the container
-      --cidfile string              Write the container ID to the file
-      --cpu-count int               The number of CPUs available for execution by the container.
-                                    Windows daemon only. On Windows Server containers, this is
-                                    approximated as a percentage of total CPU usage.
-      --cpu-percent int             Limit percentage of CPU available for execution
-                                    by the container. Windows daemon only.
-                                    The processor resource controls are mutually
-                                    exclusive, the order of precedence is CPUCount
-                                    first, then CPUShares, and CPUPercent last.
-      --cpu-period int              Limit CPU CFS (Completely Fair Scheduler) period
-      --cpu-quota int               Limit CPU CFS (Completely Fair Scheduler) quota
-  -c, --cpu-shares int              CPU shares (relative weight)
-      --cpus NanoCPUs               Number of CPUs (default 0.000)
-      --cpu-rt-period int           Limit the CPU real-time period in microseconds
-      --cpu-rt-runtime int          Limit the CPU real-time runtime in microseconds
-      --cpuset-cpus string          CPUs in which to allow execution (0-3, 0,1)
-      --cpuset-mems string          MEMs in which to allow execution (0-3, 0,1)
-  -d, --detach                      Run container in background and print container ID
-      --detach-keys string          Override the key sequence for detaching a container
-      --device value                Add a host device to the container (default [])
-      --device-read-bps value       Limit read rate (bytes per second) from a device (default [])
-      --device-read-iops value      Limit read rate (IO per second) from a device (default [])
-      --device-write-bps value      Limit write rate (bytes per second) to a device (default [])
-      --device-write-iops value     Limit write rate (IO per second) to a device (default [])
-      --disable-content-trust       Skip image verification (default true)
-      --dns value                   Set custom DNS servers (default [])
-      --dns-option value            Set DNS options (default [])
-      --dns-search value            Set custom DNS search domains (default [])
-      --entrypoint string           Overwrite the default ENTRYPOINT of the image
-  -e, --env value                   Set environment variables (default [])
-      --env-file value              Read in a file of environment variables (default [])
-      --expose value                Expose a port or a range of ports (default [])
-      --group-add value             Add additional groups to join (default [])
-      --health-cmd string           Command to run to check health
-      --health-interval duration    Time between running the check (ns|us|ms|s|m|h) (default 0s)
-      --health-retries int          Consecutive failures needed to report unhealthy
-      --health-timeout duration     Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s)
-      --help                        Print usage
-  -h, --hostname string             Container host name
-      --init                        Run an init inside the container that forwards signals and reaps processes
-      --init-path string            Path to the docker-init binary
-  -i, --interactive                 Keep STDIN open even if not attached
-      --io-maxbandwidth string      Maximum IO bandwidth limit for the system drive (Windows only)
-                                    (Windows only). The format is `<number><unit>`.
-                                    Unit is optional and can be `b` (bytes per second),
-                                    `k` (kilobytes per second), `m` (megabytes per second),
-                                    or `g` (gigabytes per second). If you omit the unit,
-                                    the system uses bytes per second.
-                                    --io-maxbandwidth and --io-maxiops are mutually exclusive options.
-      --io-maxiops uint             Maximum IOps limit for the system drive (Windows only)
-      --ip string                   Container IPv4 address (e.g. 172.30.100.104)
-      --ip6 string                  Container IPv6 address (e.g. 2001:db8::33)
-      --ipc string                  IPC namespace to use
-      --isolation string            Container isolation technology
-      --kernel-memory string        Kernel memory limit
-  -l, --label value                 Set meta data on a container (default [])
-      --label-file value            Read in a line delimited file of labels (default [])
-      --link value                  Add link to another container (default [])
-      --link-local-ip value         Container IPv4/IPv6 link-local addresses (default [])
-      --log-driver string           Logging driver for the container
-      --log-opt value               Log driver options (default [])
-      --mac-address string          Container MAC address (e.g. 92:d0:c6:0a:29:33)
-  -m, --memory string               Memory limit
-      --memory-reservation string   Memory soft limit
-      --memory-swap string          Swap limit equal to memory plus swap: '-1' to enable unlimited swap
-      --memory-swappiness int       Tune container memory swappiness (0 to 100) (default -1)
-      --name string                 Assign a name to the container
-      --network-alias value         Add network-scoped alias for the container (default [])
-      --network string              Connect a container to a network
-                                    'bridge': create a network stack on the default Docker bridge
-                                    'none': no networking
-                                    'container:<name|id>': reuse another container's network stack
-                                    'host': use the Docker host network stack
-                                    '<network-name>|<network-id>': connect to a user-defined network
-      --no-healthcheck              Disable any container-specified HEALTHCHECK
-      --oom-kill-disable            Disable OOM Killer
-      --oom-score-adj int           Tune host's OOM preferences (-1000 to 1000)
-      --pid string                  PID namespace to use
-      --pids-limit int              Tune container pids limit (set -1 for unlimited)
-      --privileged                  Give extended privileges to this container
-  -p, --publish value               Publish a container's port(s) to the host (default [])
-  -P, --publish-all                 Publish all exposed ports to random ports
-      --read-only                   Mount the container's root filesystem as read only
-      --restart string              Restart policy to apply when a container exits (default "no")
-                                    Possible values are : no, on-failure[:max-retry], always, unless-stopped
-      --rm                          Automatically remove the container when it exits
-      --runtime string              Runtime to use for this container
-      --security-opt value          Security Options (default [])
-      --shm-size string             Size of /dev/shm, default value is 64MB.
-                                    The format is `<number><unit>`. `number` must be greater than `0`.
-                                    Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes),
-                                    or `g` (gigabytes). If you omit the unit, the system uses bytes.
-      --sig-proxy                   Proxy received signals to the process (default true)
-      --stop-signal string          Signal to stop a container, SIGTERM by default (default "SIGTERM")
-      --stop-timeout=10             Timeout (in seconds) to stop a container
-      --storage-opt value           Storage driver options for the container (default [])
-      --sysctl value                Sysctl options (default map[])
-      --tmpfs value                 Mount a tmpfs directory (default [])
-  -t, --tty                         Allocate a pseudo-TTY
-      --ulimit value                Ulimit options (default [])
-  -u, --user string                 Username or UID (format: <name|uid>[:<group|gid>])
-      --userns string               User namespace to use
-                                    'host': Use the Docker host user namespace
-                                    '': Use the Docker daemon user namespace specified by `--userns-remap` option.
-      --uts string                  UTS namespace to use
-  -v, --volume value                Bind mount a volume (default []). The format
-                                    is `[host-src:]container-dest[:<options>]`.
-                                    The comma-delimited `options` are [rw|ro],
-                                    [z|Z], [[r]shared|[r]slave|[r]private], and
-                                    [nocopy]. The 'host-src' is an absolute path
-                                    or a name value.
-      --volume-driver string        Optional volume driver for the container
-      --volumes-from value          Mount volumes from the specified container(s) (default [])
-  -w, --workdir string              Working directory inside the container
-```
-
-The `docker run` command first `creates` a writeable container layer over the
-specified image, and then `starts` it using the specified command. That is,
-`docker run` is equivalent to the API `/containers/create` then
-`/containers/(id)/start`. A stopped container can be restarted with all its
-previous changes intact using `docker start`. See `docker ps -a` to view a list
-of all containers.
-
-The `docker run` command can be used in combination with `docker commit` to
-[*change the command that a container runs*](commit.md). There is additional detailed information about `docker run` in the [Docker run reference](../run.md).
-
-For information on connecting a container to a network, see the ["*Docker network overview*"](https://docs.docker.com/engine/userguide/networking/).
-
-## Examples
-
-### Assign name and allocate pseudo-TTY (--name, -it)
-
-    $ docker run --name test -it debian
-    root@d6c0fe130dba:/# exit 13
-    $ echo $?
-    13
-    $ docker ps -a | grep test
-    d6c0fe130dba        debian:7            "/bin/bash"         26 seconds ago      Exited (13) 17 seconds ago                         test
-
-This example runs a container named `test` using the `debian:latest`
-image. The `-it` instructs Docker to allocate a pseudo-TTY connected to
-the container's stdin; creating an interactive `bash` shell in the container.
-In the example, the `bash` shell is quit by entering
-`exit 13`. This exit code is passed on to the caller of
-`docker run`, and is recorded in the `test` container's metadata.
-
-### Capture container ID (--cidfile)
-
-    $ docker run --cidfile /tmp/docker_test.cid ubuntu echo "test"
-
-This will create a container and print `test` to the console. The `cidfile`
-flag makes Docker attempt to create a new file and write the container ID to it.
-If the file exists already, Docker will return an error. Docker will close this
-file when `docker run` exits.
-
-### Full container capabilities (--privileged)
-
-    $ docker run -t -i --rm ubuntu bash
-    root@bc338942ef20:/# mount -t tmpfs none /mnt
-    mount: permission denied
-
-This will *not* work, because by default, most potentially dangerous kernel
-capabilities are dropped; including `cap_sys_admin` (which is required to mount
-filesystems). However, the `--privileged` flag will allow it to run:
-
-    $ docker run -t -i --privileged ubuntu bash
-    root@50e3f57e16e6:/# mount -t tmpfs none /mnt
-    root@50e3f57e16e6:/# df -h
-    Filesystem      Size  Used Avail Use% Mounted on
-    none            1.9G     0  1.9G   0% /mnt
-
-The `--privileged` flag gives *all* capabilities to the container, and it also
-lifts all the limitations enforced by the `device` cgroup controller. In other
-words, the container can then do almost everything that the host can do. This
-flag exists to allow special use-cases, like running Docker within Docker.
-
-### Set working directory (-w)
-
-    $ docker  run -w /path/to/dir/ -i -t  ubuntu pwd
-
-The `-w` lets the command being executed inside directory given, here
-`/path/to/dir/`. If the path does not exist it is created inside the container.
-
-### Set storage driver options per container
-
-    $ docker run -it --storage-opt size=120G fedora /bin/bash
-
-This (size) will allow to set the container rootfs size to 120G at creation time.
-This option is only available for the `devicemapper`, `btrfs`, `overlay2`,
-`windowsfilter` and `zfs` graph drivers.
-For the `devicemapper`, `btrfs`, `windowsfilter` and `zfs` graph drivers,
-user cannot pass a size less than the Default BaseFS Size.
-For the `overlay2` storage driver, the size option is only available if the
-backing fs is `xfs` and mounted with the `pquota` mount option.
-Under these conditions, user can pass any size less then the backing fs size.
-
-### Mount tmpfs (--tmpfs)
-
-    $ docker run -d --tmpfs /run:rw,noexec,nosuid,size=65536k my_image
-
-The `--tmpfs` flag mounts an empty tmpfs into the container with the `rw`,
-`noexec`, `nosuid`, `size=65536k` options.
-
-### Mount volume (-v, --read-only)
-
-    $ docker  run  -v `pwd`:`pwd` -w `pwd` -i -t  ubuntu pwd
-
-The `-v` flag mounts the current working directory into the container. The `-w`
-lets the command being executed inside the current working directory, by
-changing into the directory to the value returned by `pwd`. So this
-combination executes the command using the container, but inside the
-current working directory.
-
-    $ docker run -v /doesnt/exist:/foo -w /foo -i -t ubuntu bash
-
-When the host directory of a bind-mounted volume doesn't exist, Docker
-will automatically create this directory on the host for you. In the
-example above, Docker will create the `/doesnt/exist`
-folder before starting your container.
-
-    $ docker run --read-only -v /icanwrite busybox touch /icanwrite/here
-
-Volumes can be used in combination with `--read-only` to control where
-a container writes files. The `--read-only` flag mounts the container's root
-filesystem as read only prohibiting writes to locations other than the
-specified volumes for the container.
-
-    $ docker run -t -i -v /var/run/docker.sock:/var/run/docker.sock -v /path/to/static-docker-binary:/usr/bin/docker busybox sh
-
-By bind-mounting the docker unix socket and statically linked docker
-binary (refer to [get the linux binary](
-https://docs.docker.com/engine/installation/binaries/#/get-the-linux-binary)),
-you give the container the full access to create and manipulate the host's
-Docker daemon.
-
-On Windows, the paths must be specified using Windows-style semantics. 
-
-    PS C:\> docker run -v c:\foo:c:\dest microsoft/nanoserver cmd /s /c type c:\dest\somefile.txt
-    Contents of file
-	
-    PS C:\> docker run -v c:\foo:d: microsoft/nanoserver cmd /s /c type d:\somefile.txt
-    Contents of file
-
-The following examples will fail when using Windows-based containers, as the 
-destination of a volume or bind-mount inside the container must be one of: 
-a non-existing or empty directory; or a drive other than C:. Further, the source
-of a bind mount must be a local directory, not a file.
-
-    net use z: \\remotemachine\share
-    docker run -v z:\foo:c:\dest ...
-    docker run -v \\uncpath\to\directory:c:\dest ...
-    docker run -v c:\foo\somefile.txt:c:\dest ...
-    docker run -v c:\foo:c: ...
-    docker run -v c:\foo:c:\existing-directory-with-contents ...
-
-For in-depth information about volumes, refer to [manage data in containers](https://docs.docker.com/engine/tutorials/dockervolumes/)
-
-### Publish or expose port (-p, --expose)
-
-    $ docker run -p 127.0.0.1:80:8080 ubuntu bash
-
-This binds port `8080` of the container to port `80` on `127.0.0.1` of the host
-machine. The [Docker User
-Guide](https://docs.docker.com/engine/userguide/networking/default_network/dockerlinks/)
-explains in detail how to manipulate ports in Docker.
-
-    $ docker run --expose 80 ubuntu bash
-
-This exposes port `80` of the container without publishing the port to the host
-system's interfaces.
-
-### Set environment variables (-e, --env, --env-file)
-
-    $ docker run -e MYVAR1 --env MYVAR2=foo --env-file ./env.list ubuntu bash
-
-This sets simple (non-array) environmental variables in the container. For
-illustration all three
-flags are shown here. Where `-e`, `--env` take an environment variable and
-value, or if no `=` is provided, then that variable's current value, set via
-`export`, is passed through (i.e. `$MYVAR1` from the host is set to `$MYVAR1`
-in the container). When no `=` is provided and that variable is not defined
-in the client's environment then that variable will be removed from the
-container's list of environment variables. All three flags, `-e`, `--env` and
-`--env-file` can be repeated.
-
-Regardless of the order of these three flags, the `--env-file` are processed
-first, and then `-e`, `--env` flags. This way, the `-e` or `--env` will
-override variables as needed.
-
-    $ cat ./env.list
-    TEST_FOO=BAR
-    $ docker run --env TEST_FOO="This is a test" --env-file ./env.list busybox env | grep TEST_FOO
-    TEST_FOO=This is a test
-
-The `--env-file` flag takes a filename as an argument and expects each line
-to be in the `VAR=VAL` format, mimicking the argument passed to `--env`. Comment
-lines need only be prefixed with `#`
-
-An example of a file passed with `--env-file`
-
-    $ cat ./env.list
-    TEST_FOO=BAR
-
-    # this is a comment
-    TEST_APP_DEST_HOST=10.10.0.127
-    TEST_APP_DEST_PORT=8888
-    _TEST_BAR=FOO
-    TEST_APP_42=magic
-    helloWorld=true
-    123qwe=bar
-    org.spring.config=something
-
-    # pass through this variable from the caller
-    TEST_PASSTHROUGH
-    $ TEST_PASSTHROUGH=howdy docker run --env-file ./env.list busybox env
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    HOSTNAME=5198e0745561
-    TEST_FOO=BAR
-    TEST_APP_DEST_HOST=10.10.0.127
-    TEST_APP_DEST_PORT=8888
-    _TEST_BAR=FOO
-    TEST_APP_42=magic
-    helloWorld=true
-    TEST_PASSTHROUGH=howdy
-    HOME=/root
-    123qwe=bar
-    org.spring.config=something
-
-    $ docker run --env-file ./env.list busybox env
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    HOSTNAME=5198e0745561
-    TEST_FOO=BAR
-    TEST_APP_DEST_HOST=10.10.0.127
-    TEST_APP_DEST_PORT=8888
-    _TEST_BAR=FOO
-    TEST_APP_42=magic
-    helloWorld=true
-    TEST_PASSTHROUGH=
-    HOME=/root
-    123qwe=bar
-    org.spring.config=something
-
-### Set metadata on container (-l, --label, --label-file)
-
-A label is a `key=value` pair that applies metadata to a container. To label a container with two labels:
-
-    $ docker run -l my-label --label com.example.foo=bar ubuntu bash
-
-The `my-label` key doesn't specify a value so the label defaults to an empty
-string(`""`). To add multiple labels, repeat the label flag (`-l` or `--label`).
-
-The `key=value` must be unique to avoid overwriting the label value. If you
-specify labels with identical keys but different values, each subsequent value
-overwrites the previous. Docker uses the last `key=value` you supply.
-
-Use the `--label-file` flag to load multiple labels from a file. Delimit each
-label in the file with an EOL mark. The example below loads labels from a
-labels file in the current directory:
-
-    $ docker run --label-file ./labels ubuntu bash
-
-The label-file format is similar to the format for loading environment
-variables. (Unlike environment variables, labels are not visible to processes
-running inside a container.) The following example illustrates a label-file
-format:
-
-    com.example.label1="a label"
-
-    # this is a comment
-    com.example.label2=another\ label
-    com.example.label3
-
-You can load multiple label-files by supplying multiple  `--label-file` flags.
-
-For additional information on working with labels, see [*Labels - custom
-metadata in Docker*](https://docs.docker.com/engine/userguide/labels-custom-metadata/) in the Docker User
-Guide.
-
-### Connect a container to a network (--network)
-
-When you start a container use the `--network` flag to connect it to a network.
-This adds the `busybox` container to the `my-net` network.
-
-```bash
-$ docker run -itd --network=my-net busybox
-```
-
-You can also choose the IP addresses for the container with `--ip` and `--ip6`
-flags when you start the container on a user-defined network.
-
-```bash
-$ docker run -itd --network=my-net --ip=10.10.9.75 busybox
-```
-
-If you want to add a running container to a network use the `docker network connect` subcommand.
-
-You can connect multiple containers to the same network. Once connected, the
-containers can communicate easily need only another container's IP address
-or name. For `overlay` networks or custom plugins that support multi-host
-connectivity, containers connected to the same multi-host network but launched
-from different Engines can also communicate in this way.
-
-**Note**: Service discovery is unavailable on the default bridge network.
-Containers can communicate via their IP addresses by default. To communicate
-by name, they must be linked.
-
-You can disconnect a container from a network using the `docker network
-disconnect` command.
-
-### Mount volumes from container (--volumes-from)
-
-    $ docker run --volumes-from 777f7dc92da7 --volumes-from ba8c0c54f0f2:ro -i -t ubuntu pwd
-
-The `--volumes-from` flag mounts all the defined volumes from the referenced
-containers. Containers can be specified by repetitions of the `--volumes-from`
-argument. The container ID may be optionally suffixed with `:ro` or `:rw` to
-mount the volumes in read-only or read-write mode, respectively. By default,
-the volumes are mounted in the same mode (read write or read only) as
-the reference container.
-
-Labeling systems like SELinux require that proper labels are placed on volume
-content mounted into a container. Without a label, the security system might
-prevent the processes running inside the container from using the content. By
-default, Docker does not change the labels set by the OS.
-
-To change the label in the container context, you can add either of two suffixes
-`:z` or `:Z` to the volume mount. These suffixes tell Docker to relabel file
-objects on the shared volumes. The `z` option tells Docker that two containers
-share the volume content. As a result, Docker labels the content with a shared
-content label. Shared volume labels allow all containers to read/write content.
-The `Z` option tells Docker to label the content with a private unshared label.
-Only the current container can use a private volume.
-
-### Attach to STDIN/STDOUT/STDERR (-a)
-
-The `-a` flag tells `docker run` to bind to the container's `STDIN`, `STDOUT`
-or `STDERR`. This makes it possible to manipulate the output and input as
-needed.
-
-    $ echo "test" | docker run -i -a stdin ubuntu cat -
-
-This pipes data into a container and prints the container's ID by attaching
-only to the container's `STDIN`.
-
-    $ docker run -a stderr ubuntu echo test
-
-This isn't going to print anything unless there's an error because we've
-only attached to the `STDERR` of the container. The container's logs
-still store what's been written to `STDERR` and `STDOUT`.
-
-    $ cat somefile | docker run -i -a stdin mybuilder dobuild
-
-This is how piping a file into a container could be done for a build.
-The container's ID will be printed after the build is done and the build
-logs could be retrieved using `docker logs`. This is
-useful if you need to pipe a file or something else into a container and
-retrieve the container's ID once the container has finished running.
-
-### Add host device to container (--device)
-
-    $ docker run --device=/dev/sdc:/dev/xvdc --device=/dev/sdd --device=/dev/zero:/dev/nulo -i -t ubuntu ls -l /dev/{xvdc,sdd,nulo}
-    brw-rw---- 1 root disk 8, 2 Feb  9 16:05 /dev/xvdc
-    brw-rw---- 1 root disk 8, 3 Feb  9 16:05 /dev/sdd
-    crw-rw-rw- 1 root root 1, 5 Feb  9 16:05 /dev/nulo
-
-It is often necessary to directly expose devices to a container. The `--device`
-option enables that. For example, a specific block storage device or loop
-device or audio device can be added to an otherwise unprivileged container
-(without the `--privileged` flag) and have the application directly access it.
-
-By default, the container will be able to `read`, `write` and `mknod` these devices.
-This can be overridden using a third `:rwm` set of options to each `--device`
-flag:
-
-
-    $ docker run --device=/dev/sda:/dev/xvdc --rm -it ubuntu fdisk  /dev/xvdc
-
-    Command (m for help): q
-    $ docker run --device=/dev/sda:/dev/xvdc:r --rm -it ubuntu fdisk  /dev/xvdc
-    You will not be able to write the partition table.
-
-    Command (m for help): q
-
-    $ docker run --device=/dev/sda:/dev/xvdc:rw --rm -it ubuntu fdisk  /dev/xvdc
-
-    Command (m for help): q
-
-    $ docker run --device=/dev/sda:/dev/xvdc:m --rm -it ubuntu fdisk  /dev/xvdc
-    fdisk: unable to open /dev/xvdc: Operation not permitted
-
-> **Note:**
-> `--device` cannot be safely used with ephemeral devices. Block devices
-> that may be removed should not be added to untrusted containers with
-> `--device`.
-
-### Restart policies (--restart)
-
-Use Docker's `--restart` to specify a container's *restart policy*. A restart
-policy controls whether the Docker daemon restarts a container after exit.
-Docker supports the following restart policies:
-
-<table>
-  <thead>
-    <tr>
-      <th>Policy</th>
-      <th>Result</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><strong>no</strong></td>
-      <td>
-        Do not automatically restart the container when it exits. This is the
-        default.
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span style="white-space: nowrap">
-          <strong>on-failure</strong>[:max-retries]
-        </span>
-      </td>
-      <td>
-        Restart only if the container exits with a non-zero exit status.
-        Optionally, limit the number of restart retries the Docker
-        daemon attempts.
-      </td>
-    </tr>
-    <tr>
-      <td><strong>always</strong></td>
-      <td>
-        Always restart the container regardless of the exit status.
-        When you specify always, the Docker daemon will try to restart
-        the container indefinitely. The container will also always start
-        on daemon startup, regardless of the current state of the container.
-      </td>
-    </tr>
-    <tr>
-      <td><strong>unless-stopped</strong></td>
-      <td>
-        Always restart the container regardless of the exit status, but
-        do not start it on daemon startup if the container has been put
-        to a stopped state before.
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-    $ docker run --restart=always redis
-
-This will run the `redis` container with a restart policy of **always**
-so that if the container exits, Docker will restart it.
-
-More detailed information on restart policies can be found in the
-[Restart Policies (--restart)](../run.md#restart-policies-restart)
-section of the Docker run reference page.
-
-### Add entries to container hosts file (--add-host)
-
-You can add other hosts into a container's `/etc/hosts` file by using one or
-more `--add-host` flags. This example adds a static address for a host named
-`docker`:
-
-    $ docker run --add-host=docker:10.180.0.1 --rm -it debian
-    root@f38c87f2a42d:/# ping docker
-    PING docker (10.180.0.1): 48 data bytes
-    56 bytes from 10.180.0.1: icmp_seq=0 ttl=254 time=7.600 ms
-    56 bytes from 10.180.0.1: icmp_seq=1 ttl=254 time=30.705 ms
-    ^C--- docker ping statistics ---
-    2 packets transmitted, 2 packets received, 0% packet loss
-    round-trip min/avg/max/stddev = 7.600/19.152/30.705/11.553 ms
-
-Sometimes you need to connect to the Docker host from within your
-container. To enable this, pass the Docker host's IP address to
-the container using the `--add-host` flag. To find the host's address,
-use the `ip addr show` command.
-
-The flags you pass to `ip addr show` depend on whether you are
-using IPv4 or IPv6 networking in your containers. Use the following
-flags for IPv4 address retrieval for a network device named `eth0`:
-
-    $ HOSTIP=`ip -4 addr show scope global dev eth0 | grep inet | awk '{print \$2}' | cut -d / -f 1`
-    $ docker run  --add-host=docker:${HOSTIP} --rm -it debian
-
-For IPv6 use the `-6` flag instead of the `-4` flag. For other network
-devices, replace `eth0` with the correct device name (for example `docker0`
-for the bridge device).
-
-### Set ulimits in container (--ulimit)
-
-Since setting `ulimit` settings in a container requires extra privileges not
-available in the default container, you can set these using the `--ulimit` flag.
-`--ulimit` is specified with a soft and hard limit as such:
-`<type>=<soft limit>[:<hard limit>]`, for example:
-
-    $ docker run --ulimit nofile=1024:1024 --rm debian sh -c "ulimit -n"
-    1024
-
-> **Note:**
-> If you do not provide a `hard limit`, the `soft limit` will be used
-> for both values. If no `ulimits` are set, they will be inherited from
-> the default `ulimits` set on the daemon.  `as` option is disabled now.
-> In other words, the following script is not supported:
-> `$ docker run -it --ulimit as=1024 fedora /bin/bash`
-
-The values are sent to the appropriate `syscall` as they are set.
-Docker doesn't perform any byte conversion. Take this into account when setting the values.
-
-#### For `nproc` usage
-
-Be careful setting `nproc` with the `ulimit` flag as `nproc` is designed by Linux to set the
-maximum number of processes available to a user, not to a container.  For example, start four
-containers with `daemon` user:
-
-    docker run -d -u daemon --ulimit nproc=3 busybox top
-    docker run -d -u daemon --ulimit nproc=3 busybox top
-    docker run -d -u daemon --ulimit nproc=3 busybox top
-    docker run -d -u daemon --ulimit nproc=3 busybox top
-
-The 4th container fails and reports "[8] System error: resource temporarily unavailable" error.
-This fails because the caller set `nproc=3` resulting in the first three containers using up
-the three processes quota set for the `daemon` user.
-
-### Stop container with signal (--stop-signal)
-
-The `--stop-signal` flag sets the system call signal that will be sent to the container to exit.
-This signal can be a valid unsigned number that matches a position in the kernel's syscall table, for instance 9,
-or a signal name in the format SIGNAME, for instance SIGKILL.
-
-### Optional security options (--security-opt)
-
-On Windows, this flag can be used to specify the `credentialspec` option.
-The `credentialspec` must be in the format `file://spec.txt` or `registry://keyname`.
-
-### Stop container with timeout (--stop-timeout)
-
-The `--stop-timeout` flag sets the timeout (in seconds) that a pre-defined (see `--stop-signal`) system call
-signal that will be sent to the container to exit. After timeout elapses the container will be killed with SIGKILL.
-
-### Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Microsoft Windows. The `--isolation <value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. These two commands are equivalent on Linux:
-
-```
-$ docker run -d busybox top
-$ docker run -d --isolation default busybox top
-```
-
-On Microsoft Windows, can take any of these values:
-
-
-| Value     | Description                                                                                                                                                   |
-|-----------|---------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| `default` | Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value.  |
-| `process` | Namespace isolation only.                                                                                                                                     |
-| `hyperv`   | Hyper-V hypervisor partition-based isolation.                                                                                                                  |
-
-On Windows, the default isolation for client is `hyperv`, and for server is
-`process`. Therefore when running on Windows server without a `daemon` option
-set, these two commands are equivalent:
-```
-$ docker run -d --isolation default busybox top
-$ docker run -d --isolation process busybox top
-```
-
-If you have set the `--exec-opt isolation=hyperv` option on the Docker `daemon`,
-if running on Windows server, any of these commands also result in `hyperv` isolation:
-
-```
-$ docker run -d --isolation default busybox top
-$ docker run -d --isolation hyperv busybox top
-```
-
-### Configure namespaced kernel parameters (sysctls) at runtime
-
-The `--sysctl` sets namespaced kernel parameters (sysctls) in the
-container. For example, to turn on IP forwarding in the containers
-network namespace, run this command:
-
-    $ docker run --sysctl net.ipv4.ip_forward=1 someimage
-
-
-> **Note**: Not all sysctls are namespaced. Docker does not support changing sysctls
-> inside of a container that also modify the host system. As the kernel
-> evolves we expect to see more sysctls become namespaced.
-
-#### Currently supported sysctls
-
-  `IPC Namespace`:
-
-  kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall, kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced
-  Sysctls beginning with fs.mqueue.*
-
-  If you use the `--ipc=host` option these sysctls will not be allowed.
-
-  `Network Namespace`:
-      Sysctls beginning with net.*
-
-  If you use the `--network=host` option using these sysctls will not be allowed.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/save.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/save.md
deleted file mode 100644
index 88a5fed103..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/save.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: "save"
-description: "The save command description and usage"
-keywords: "tarred, repository, backup"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# save
-
-```markdown
-Usage:  docker save [OPTIONS] IMAGE [IMAGE...]
-
-Save one or more images to a tar archive (streamed to STDOUT by default)
-
-Options:
-      --help            Print usage
-  -o, --output string   Write to a file, instead of STDOUT
-```
-
-Produces a tarred repository to the standard output stream.
-Contains all parent layers, and all tags + versions, or specified `repo:tag`, for
-each argument provided.
-
-It is used to create a backup that can then be used with `docker load`
-
-    $ docker save busybox > busybox.tar
-    $ ls -sh busybox.tar
-    2.7M busybox.tar
-    $ docker save --output busybox.tar busybox
-    $ ls -sh busybox.tar
-    2.7M busybox.tar
-    $ docker save -o fedora-all.tar fedora
-    $ docker save -o fedora-latest.tar fedora:latest
-
-It is even useful to cherry-pick particular tags of an image repository
-
-    $ docker save -o ubuntu.tar ubuntu:lucid ubuntu:saucy
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/search.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/search.md
deleted file mode 100644
index 31faf37375..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/search.md
+++ /dev/null
@@ -1,134 +0,0 @@
----
-title: "search"
-description: "The search command description and usage"
-keywords: "search, hub, images"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# search
-
-```markdown
-Usage:  docker search [OPTIONS] TERM
-
-Search the Docker Hub for images
-
-Options:
-  -f, --filter value   Filter output based on conditions provided (default [])
-                       - is-automated=(true|false)
-                       - is-official=(true|false)
-                       - stars=<number> - image has at least 'number' stars
-      --help           Print usage
-      --limit int      Max number of search results (default 25)
-      --no-trunc       Don't truncate output
-```
-
-Search [Docker Hub](https://hub.docker.com) for images
-
-See [*Find Public Images on Docker Hub*](https://docs.docker.com/engine/tutorials/dockerrepos/#searching-for-images) for
-more details on finding shared images from the command line.
-
-> **Note:**
-> Search queries will only return up to 25 results
-
-## Examples
-
-### Search images by name
-
-This example displays images with a name containing 'busybox':
-
-    $ docker search busybox
-    NAME                             DESCRIPTION                                     STARS     OFFICIAL   AUTOMATED
-    busybox                          Busybox base image.                             316       [OK]       
-    progrium/busybox                                                                 50                   [OK]
-    radial/busyboxplus               Full-chain, Internet enabled, busybox made...   8                    [OK]
-    odise/busybox-python                                                             2                    [OK]
-    azukiapp/busybox                 This image is meant to be used as the base...   2                    [OK]
-    ofayau/busybox-jvm               Prepare busybox to install a 32 bits JVM.       1                    [OK]
-    shingonoide/archlinux-busybox    Arch Linux, a lightweight and flexible Lin...   1                    [OK]
-    odise/busybox-curl                                                               1                    [OK]
-    ofayau/busybox-libc32            Busybox with 32 bits (and 64 bits) libs         1                    [OK]
-    peelsky/zulu-openjdk-busybox                                                     1                    [OK]
-    skomma/busybox-data              Docker image suitable for data volume cont...   1                    [OK]
-    elektritter/busybox-teamspeak    Lightweight teamspeak3 container based on...    1                    [OK]
-    socketplane/busybox                                                              1                    [OK]
-    oveits/docker-nginx-busybox      This is a tiny NginX docker image based on...   0                    [OK]
-    ggtools/busybox-ubuntu           Busybox ubuntu version with extra goodies       0                    [OK]
-    nikfoundas/busybox-confd         Minimal busybox based distribution of confd     0                    [OK]
-    openshift/busybox-http-app                                                       0                    [OK]
-    jllopis/busybox                                                                  0                    [OK]
-    swyckoff/busybox                                                                 0                    [OK]
-    powellquiring/busybox                                                            0                    [OK]
-    williamyeh/busybox-sh            Docker image for BusyBox's sh                   0                    [OK]
-    simplexsys/busybox-cli-powered   Docker busybox images, with a few often us...   0                    [OK]
-    fhisamoto/busybox-java           Busybox java                                    0                    [OK]
-    scottabernethy/busybox                                                           0                    [OK]
-    marclop/busybox-solr
-
-### Display non-truncated description (--no-trunc)
-
-This example displays images with a name containing 'busybox',
-at least 3 stars and the description isn't truncated in the output:
-
-    $ docker search --stars=3 --no-trunc busybox
-    NAME                 DESCRIPTION                                                                               STARS     OFFICIAL   AUTOMATED
-    busybox              Busybox base image.                                                                       325       [OK]       
-    progrium/busybox                                                                                               50                   [OK]
-    radial/busyboxplus   Full-chain, Internet enabled, busybox made from scratch. Comes in git and cURL flavors.   8                    [OK]
-
-## Limit search results (--limit)
-
-The flag `--limit` is the maximum number of results returned by a search. This value could
-be in the range between 1 and 100. The default value of `--limit` is 25.
-
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there is more
-than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* stars (int - number of stars the image has)
-* is-automated (true|false) - is the image automated or not
-* is-official (true|false) - is the image official or not
-
-
-### stars
-
-This example displays images with a name containing 'busybox' and at
-least 3 stars:
-
-    $ docker search --filter stars=3 busybox
-    NAME                 DESCRIPTION                                     STARS     OFFICIAL   AUTOMATED
-    busybox              Busybox base image.                             325       [OK]       
-    progrium/busybox                                                     50                   [OK]
-    radial/busyboxplus   Full-chain, Internet enabled, busybox made...   8                    [OK]
-
-
-### is-automated
-
-This example displays images with a name containing 'busybox'
-and are automated builds:
-
-    $ docker search --filter is-automated busybox
-    NAME                 DESCRIPTION                                     STARS     OFFICIAL   AUTOMATED
-    progrium/busybox                                                     50                   [OK]
-    radial/busyboxplus   Full-chain, Internet enabled, busybox made...   8                    [OK]
-
-### is-official
-
-This example displays images with a name containing 'busybox', at least
-3 stars and are official builds:
-
-    $ docker search --filter "is-official=true" --filter "stars=3" busybox
-    NAME                 DESCRIPTION                                     STARS     OFFICIAL   AUTOMATED
-    progrium/busybox                                                     50                   [OK]
-    radial/busyboxplus   Full-chain, Internet enabled, busybox made...   8                    [OK]
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_create.md
deleted file mode 100644
index aebcebbcdd..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_create.md
+++ /dev/null
@@ -1,90 +0,0 @@
----
-title: "secret create"
-description: "The secret create command description and usage"
-keywords: ["secret, create"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# secret create
-
-```Markdown
-Usage:	docker secret create [OPTIONS] SECRET file|-
-
-Create a secret from a file or STDIN as content
-
-Options:
-      --help          Print usage
-  -l, --label list    Secret labels (default [])
-```
-
-Creates a secret using standard input or from a file for the secret content. You must run this
-command on a manager node.
-
-## Examples
-
-### Create a secret
-
-```bash
-$ echo <secret> | docker secret create my_secret -
-mhv17xfe3gh6xc4rij5orpfds
-
-$ docker secret ls
-ID                          NAME                    CREATED                                   UPDATED                                   SIZE
-mhv17xfe3gh6xc4rij5orpfds   my_secret               2016-10-27 23:25:43.909181089 +0000 UTC   2016-10-27 23:25:43.909181089 +0000 UTC   1679
-```
-
-### Create a secret with a file
-
-```bash
-$ docker secret create my_secret ./secret.json
-mhv17xfe3gh6xc4rij5orpfds
-
-$ docker secret ls
-ID                          NAME                    CREATED                                   UPDATED                                   SIZE
-mhv17xfe3gh6xc4rij5orpfds   my_secret               2016-10-27 23:25:43.909181089 +0000 UTC   2016-10-27 23:25:43.909181089 +0000 UTC   1679
-```
-
-### Create a secret with labels
-
-```bash
-$ docker secret create --label env=dev --label rev=20161102 my_secret ./secret.json
-jtn7g6aukl5ky7nr9gvwafoxh
-
-$ docker secret inspect my_secret
-[
-    {
-        "ID": "jtn7g6aukl5ky7nr9gvwafoxh",
-        "Version": {
-            "Index": 541
-        },
-        "CreatedAt": "2016-11-03T20:54:12.924766548Z",
-        "UpdatedAt": "2016-11-03T20:54:12.924766548Z",
-        "Spec": {
-            "Name": "my_secret",
-            "Labels": {
-                "env": "dev",
-                "rev": "20161102"
-            },
-            "Data": null
-        },
-        "Digest": "sha256:4212a44b14e94154359569333d3fc6a80f6b9959dfdaff26412f4b2796b1f387",
-        "SecretSize": 1679
-    }
-]
-
-```
-
-
-## Related information
-
-* [secret inspect](secret_inspect.md)
-* [secret ls](secret_ls.md)
-* [secret rm](secret_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_inspect.md
deleted file mode 100644
index de878f74e4..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_inspect.md
+++ /dev/null
@@ -1,85 +0,0 @@
----
-title: "secret inspect"
-description: "The secret inspect command description and usage"
-keywords: ["secret, inspect"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# secret inspect
-
-```Markdown
-Usage:  docker secret inspect [OPTIONS] SECRET [SECRET...]
-
-Display detailed information on one or more secrets
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-
-Inspects the specified secret. This command has to be run targeting a manager
-node.
-
-By default, this renders all results in a JSON array. If a format is specified,
-the given template will be executed for each result.
-
-Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-## Examples
-
-### Inspecting a secret by name or ID
-
-You can inspect a secret, either by its *name*, or *ID*
-
-For example, given the following secret:
-
-```bash
-$ docker secret ls
-ID                          NAME                    CREATED                                   UPDATED
-mhv17xfe3gh6xc4rij5orpfds   secret.json             2016-10-27 23:25:43.909181089 +0000 UTC   2016-10-27 23:25:43.909181089 +0000 UTC
-```
-
-```bash
-$ docker secret inspect secret.json
-[
-    {
-        "ID": "mhv17xfe3gh6xc4rij5orpfds",
-            "Version": {
-            "Index": 1198
-        },
-        "CreatedAt": "2016-10-27T23:25:43.909181089Z",
-        "UpdatedAt": "2016-10-27T23:25:43.909181089Z",
-        "Spec": {
-            "Name": "secret.json"
-        }
-    }
-]
-```
-
-### Formatting secret output
-
-You can use the --format option to obtain specific information about a
-secret. The following example command outputs the creation time of the
-secret.
-
-```bash{% raw %}
-$ docker secret inspect --format='{{.CreatedAt}}' mhv17xfe3gh6xc4rij5orpfds
-2016-10-27 23:25:43.909181089 +0000 UTC
-{% endraw %}```
-
-
-## Related information
-
-* [secret create](secret_create.md)
-* [secret ls](secret_ls.md)
-* [secret rm](secret_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_ls.md
deleted file mode 100644
index 6b34fc2146..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_ls.md
+++ /dev/null
@@ -1,43 +0,0 @@
----
-title: "secret ls"
-description: "The secret ls command description and usage"
-keywords: ["secret, ls"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# secret ls
-
-```Markdown
-Usage:	docker secret ls [OPTIONS]
-
-List secrets
-
-Aliases:
-  ls, list
-
-Options:
-  -q, --quiet          Only display IDs
-```
-
-Run this command on a manager node to list the secrets in the Swarm.
-
-## Examples
-
-```bash
-$ docker secret ls
-ID                          NAME                    CREATED                                   UPDATED
-mhv17xfe3gh6xc4rij5orpfds   secret.json             2016-10-27 23:25:43.909181089 +0000 UTC   2016-10-27 23:25:43.909181089 +0000 UTC
-```
-## Related information
-
-* [secret create](secret_create.md)
-* [secret inspect](secret_inspect.md)
-* [secret rm](secret_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_rm.md
deleted file mode 100644
index f504b1ba4f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/secret_rm.md
+++ /dev/null
@@ -1,48 +0,0 @@
----
-title: "secret rm"
-description: "The secret rm command description and usage"
-keywords: ["secret, rm"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# secret rm
-
-```Markdown
-Usage:	docker secret rm SECRET [SECRET...]
-
-Remove one or more secrets
-
-Aliases:
-  rm, remove
-
-Options:
-      --help   Print usage
-```
-
-Removes the specified secrets from the swarm. This command has to be run
-targeting a manager node.
-
-This example removes a secret:
-
-```bash
-$ docker secret rm secret.json
-sapth4csdo5b6wz2p5uimh5xg
-```
-
-> **Warning**: Unlike `docker rm`, this command does not ask for confirmation
-> before removing a secret.
-
-
-## Related information
-
-* [secret create](secret_create.md)
-* [secret inspect](secret_inspect.md)
-* [secret ls](secret_ls.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_create.md
deleted file mode 100644
index c9e298096b..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_create.md
+++ /dev/null
@@ -1,556 +0,0 @@
----
-title: "service create"
-description: "The service create command description and usage"
-keywords: "service, create"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service create
-
-```Markdown
-Usage:  docker service create [OPTIONS] IMAGE [COMMAND] [ARG...]
-
-Create a new service
-
-Options:
-      --constraint list                  Placement constraints (default [])
-      --container-label list             Container labels (default [])
-      --dns list                         Set custom DNS servers (default [])
-      --dns-option list                  Set DNS options (default [])
-      --dns-search list                  Set custom DNS search domains (default [])
-      --endpoint-mode string             Endpoint mode (vip or dnsrr)
-  -e, --env list                         Set environment variables (default [])
-      --env-file list                    Read in a file of environment variables (default [])
-      --group list                       Set one or more supplementary user groups for the container (default [])
-      --health-cmd string                Command to run to check health
-      --health-interval duration         Time between running the check (ns|us|ms|s|m|h)
-      --health-retries int               Consecutive failures needed to report unhealthy
-      --health-timeout duration          Maximum time to allow one check to run (ns|us|ms|s|m|h)
-      --help                             Print usage
-      --host list                        Set one or more custom host-to-IP mappings (host:ip) (default [])
-      --hostname string                  Container hostname
-  -l, --label list                       Service labels (default [])
-      --limit-cpu decimal                Limit CPUs (default 0.000)
-      --limit-memory bytes               Limit Memory (default 0 B)
-      --log-driver string                Logging driver for service
-      --log-opt list                     Logging driver options (default [])
-      --mode string                      Service mode (replicated or global) (default "replicated")
-      --mount mount                      Attach a filesystem mount to the service
-      --name string                      Service name
-      --network list                     Network attachments (default [])
-      --no-healthcheck                   Disable any container-specified HEALTHCHECK
-  -p, --publish port                     Publish a port as a node port
-      --replicas uint                    Number of tasks
-      --reserve-cpu decimal              Reserve CPUs (default 0.000)
-      --reserve-memory bytes             Reserve Memory (default 0 B)
-      --restart-condition string         Restart when condition is met (none, on-failure, or any)
-      --restart-delay duration           Delay between restart attempts (ns|us|ms|s|m|h)
-      --restart-max-attempts uint        Maximum number of restarts before giving up
-      --restart-window duration          Window used to evaluate the restart policy (ns|us|ms|s|m|h)
-      --secret secret                    Specify secrets to expose to the service
-      --stop-grace-period duration       Time to wait before force killing a container (ns|us|ms|s|m|h)
-  -t, --tty                              Allocate a pseudo-TTY
-      --update-delay duration            Delay between updates (ns|us|ms|s|m|h) (default 0s)
-      --update-failure-action string     Action on update failure (pause|continue) (default "pause")
-      --update-max-failure-ratio float   Failure rate to tolerate during an update
-      --update-monitor duration          Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)
-      --update-parallelism uint          Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
-  -u, --user string                      Username or UID (format: <name|uid>[:<group|gid>])
-      --with-registry-auth               Send registry authentication details to swarm agents
-  -w, --workdir string                   Working directory inside the container
-```
-
-Creates a service as described by the specified parameters. You must run this
-command on a manager node.
-
-## Examples
-
-### Create a service
-
-```bash
-$ docker service create --name redis redis:3.0.6
-dmu1ept4cxcfe8k8lhtux3ro3
-
-$ docker service create --mode global --name redis2 redis:3.0.6
-a8q9dasaafudfs8q8w32udass
-
-$ docker service ls
-ID            NAME    MODE        REPLICAS  IMAGE
-dmu1ept4cxcf  redis   replicated  1/1       redis:3.0.6
-a8q9dasaafud  redis2  global      1/1       redis:3.0.6
-```
-
-### Create a service with 5 replica tasks (--replicas)
-
-Use the `--replicas` flag to set the number of replica tasks for a replicated
-service. The following command creates a `redis` service with `5` replica tasks:
-
-```bash
-$ docker service create --name redis --replicas=5 redis:3.0.6
-4cdgfyky7ozwh3htjfw0d12qv
-```
-
-The above command sets the *desired* number of tasks for the service. Even
-though the command returns immediately, actual scaling of the service may take
-some time. The `REPLICAS` column shows both the *actual* and *desired* number
-of replica tasks for the service.
-
-In the following example the desired state is  `5` replicas, but the current
-number of `RUNNING` tasks is `3`:
-
-```bash
-$ docker service ls
-ID            NAME   MODE        REPLICAS  IMAGE
-4cdgfyky7ozw  redis  replicated  3/5       redis:3.0.7
-```
-
-Once all the tasks are created and `RUNNING`, the actual number of tasks is
-equal to the desired number:
-
-```bash
-$ docker service ls
-ID            NAME   MODE        REPLICAS  IMAGE
-4cdgfyky7ozw  redis  replicated  5/5       redis:3.0.7
-```
-
-### Create a service with secrets
-Use the `--secret` flag to give a container access to a
-[secret](secret_create.md).
-
-Create a service specifying a secret:
-
-```bash
-$ docker service create --name redis --secret secret.json redis:3.0.6
-4cdgfyky7ozwh3htjfw0d12qv
-```
-
-Create a service specifying the secret, target, user/group ID and mode:
-
-```bash
-$ docker service create --name redis \
-    --secret source=ssh-key,target=ssh \
-    --secret source=app-key,target=app,uid=1000,gid=1001,mode=0400 \
-    redis:3.0.6
-4cdgfyky7ozwh3htjfw0d12qv
-```
-
-Secrets are located in `/run/secrets` in the container.  If no target is
-specified, the name of the secret will be used as the in memory file in the
-container.  If a target is specified, that will be the filename.  In the
-example above, two files will be created: `/run/secrets/ssh` and
-`/run/secrets/app` for each of the secret targets specified.
-
-### Create a service with a rolling update policy
-
-```bash
-$ docker service create \
-  --replicas 10 \
-  --name redis \
-  --update-delay 10s \
-  --update-parallelism 2 \
-  redis:3.0.6
-```
-
-When you run a [service update](service_update.md), the scheduler updates a
-maximum of 2 tasks at a time, with `10s` between updates. For more information,
-refer to the [rolling updates
-tutorial](https://docs.docker.com/engine/swarm/swarm-tutorial/rolling-update/).
-
-### Set environment variables (-e, --env)
-
-This sets environmental variables for all tasks in a service. For example:
-
-```bash
-$ docker service create --name redis_2 --replicas 5 --env MYVAR=foo redis:3.0.6
-```
-
-### Create a docker service with specific hostname (--hostname)
-
-This option sets the docker service containers hostname to a specific string. For example:
-```bash
-$ docker service create --name redis --hostname myredis redis:3.0.6
-```
-### Set metadata on a service (-l, --label)
-
-A label is a `key=value` pair that applies metadata to a service. To label a
-service with two labels:
-
-```bash
-$ docker service create \
-  --name redis_2 \
-  --label com.example.foo="bar"
-  --label bar=baz \
-  redis:3.0.6
-```
-
-For more information about labels, refer to [apply custom
-metadata](https://docs.docker.com/engine/userguide/labels-custom-metadata/).
-
-### Add bind-mounts or volumes
-
-Docker supports two different kinds of mounts, which allow containers to read to
-or write from files or directories on other containers or the host operating
-system. These types are _data volumes_ (often referred to simply as volumes) and
-_bind-mounts_.
-
-Additionally, Docker also supports tmpfs mounts.
-
-A **bind-mount** makes a file or directory on the host available to the
-container it is mounted within. A bind-mount may be either read-only or
-read-write. For example, a container might share its host's DNS information by
-means of a bind-mount of the host's `/etc/resolv.conf` or a container might
-write logs to its host's `/var/log/myContainerLogs` directory. If you use
-bind-mounts and your host and containers have different notions of permissions,
-access controls, or other such details, you will run into portability issues.
-
-A **named volume** is a mechanism for decoupling persistent data needed by your
-container from the image used to create the container and from the host machine.
-Named volumes are created and managed by Docker, and a named volume persists
-even when no container is currently using it. Data in named volumes can be
-shared between a container and the host machine, as well as between multiple
-containers. Docker uses a _volume driver_ to create, manage, and mount volumes.
-You can back up or restore volumes using Docker commands.
-
-A **tmpfs** mounts a tmpfs inside a container for volatile data.
-
-Consider a situation where your image starts a lightweight web server. You could
-use that image as a base image, copy in your website's HTML files, and package
-that into another image. Each time your website changed, you'd need to update
-the new image and redeploy all of the containers serving your website. A better
-solution is to store the website in a named volume which is attached to each of
-your web server containers when they start. To update the website, you just
-update the named volume.
-
-For more information about named volumes, see
-[Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/).
-
-The following table describes options which apply to both bind-mounts and named
-volumes in a service:
-
-| Option                                   | Required                  | Description
-|:-----------------------------------------|:--------------------------|:-----------------------------------------------------------------------------------------
-| **type**                                 |                           | The type of mount, can be either `volume`, `bind`, or `tmpfs`. Defaults to `volume` if no type is specified.<ul><li>`volume`: mounts a [managed volume](volume_create.md) into the container.</li><li>`bind`: bind-mounts a directory or file from the host into the container.</li><li>`tmpfs`: mount a tmpfs in the container</li></ul>
-| **src** or **source**                    | for `type=bind`&nbsp;only | <ul><li>`type=volume`: `src` is an optional way to specify the name of the volume (for example, `src=my-volume`). If the named volume does not exist, it is automatically created. If no `src` is specified, the volume is assigned a random name which is guaranteed to be unique on the host, but may not be unique cluster-wide. A randomly-named volume has the same lifecycle as its container and is destroyed when the *container* is destroyed (which is upon `service update`, or when scaling or re-balancing the service).</li><li>`type=bind`: `src` is required, and specifies an absolute path to the file or directory to bind-mount (for example, `src=/path/on/host/`).  An error is produced if the file or directory does not exist.</li><li>`type=tmpfs`: `src` is not supported.</li></ul>
-| **dst** or **destination** or **target** | yes                       | Mount path inside the container, for example `/some/path/in/container/`. If the path does not exist in the container's filesystem, the Engine creates a directory at the specified location before mounting the volume or bind-mount.
-| **readonly** or **ro**                   |                           | The Engine mounts binds and volumes `read-write` unless `readonly` option is given when mounting the bind or volume.<br /><br /><ul><li>`true` or `1` or no value: Mounts the bind or volume read-only.</li><li>`false` or `0`: Mounts the bind or volume read-write.</li></ul>
-
-#### Bind Propagation
-
-Bind propagation refers to whether or not mounts created within a given
-bind-mount or named volume can be propagated to replicas of that mount. Consider
-a mount point `/mnt`, which is also mounted on `/tmp`. The propation settings
-control whether a mount on `/tmp/a` would also be available on `/mnt/a`. Each
-propagation setting has a recursive counterpoint. In the case of recursion,
-consider that `/tmp/a` is also mounted as `/foo`. The propagation settings
-control whether `/mnt/a` and/or `/tmp/a` would exist.
-
-The `bind-propagation` option defaults to `rprivate` for both bind-mounts and
-volume mounts, and is only configurable for bind-mounts. In other words, named
-volumes do not support bind propagation.
-
-- **`shared`**: Sub-mounts of the original mount are exposed to replica mounts,
-                and sub-mounts of replica mounts are also propagated to the
-                original mount.
-- **`slave`**: similar to a shared mount, but only in one direction. If the
-               original mount exposes a sub-mount, the replica mount can see it.
-               However, if the replica mount exposes a sub-mount, the original
-               mount cannot see it.
-- **`private`**: The mount is private. Sub-mounts within it are not exposed to
-                 replica mounts, and sub-mounts of replica mounts are not
-                 exposed to the original mount.
-- **`rshared`**: The same as shared, but the propagation also extends to and from
-                 mount points nested within any of the original or replica mount
-                 points.
-- **`rslave`**: The same as `slave`, but the propagation also extends to and from
-                 mount points nested within any of the original or replica mount
-                 points.
-- **`rprivate`**: The default. The same as `private`, meaning that no mount points
-                  anywhere within the original or replica mount points propagate
-                  in either direction.
-
-For more information about bind propagation, see the
-[Linux kernel documentation for shared subtree](https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt).
-
-#### Options for Named Volumes
-The following options can only be used for named volumes (`type=volume`);
-
-| Option                | Description
-|:----------------------|:--------------------------------------------------------------------------------------------------------------------
-| **volume-driver**     | Name of the volume-driver plugin to use for the volume. Defaults to ``"local"``, to use the local volume driver to create the volume if the volume does not exist.
-| **volume-label**      | One or more custom metadata ("labels") to apply to the volume upon creation. For example, `volume-label=mylabel=hello-world,my-other-label=hello-mars`. For more information about labels, refer to [apply custom metadata](https://docs.docker.com/engine/userguide/labels-custom-metadata/).
-| **volume-nocopy**     | By default, if you attach an empty volume to a container, and files or directories already existed at the mount-path in the container (`dst`), the Engine copies those files and directories into the volume, allowing the host to access them. Set `volume-nocopy` to disables copying files from the container's filesystem to the volume and mount the empty volume.<br /><br />A value is optional:<ul><li>`true` or `1`: Default if you do not provide a value. Disables copying.</li><li>`false` or `0`: Enables copying.</li></ul>
-| **volume-opt**        | Options specific to a given volume driver, which will be passed to the driver when creating the volume. Options are provided as a comma-separated list of key/value pairs, for example, `volume-opt=some-option=some-value,some-other-option=some-other-value`. For available options for a given driver, refer to that driver's documentation.
-
-#### Options for tmpfs
-The following options can only be used for tmpfs mounts (`type=tmpfs`);
-
-| Option                | Description
-|:----------------------|:--------------------------------------------------------------------------------------------------------------------
-| **tmpfs-size**        | Size of the tmpfs mount in bytes. Unlimited by default in Linux.
-| **tmpfs-mode**        | File mode of the tmpfs in octal. (e.g. `"700"` or `"0700"`.) Defaults to ``"1777"`` in Linux.
-
-#### Differences between "--mount" and "--volume"
-
-The `--mount` flag supports most options that are supported by the `-v`
-or `--volume` flag for `docker run`, with some important exceptions:
-
-- The `--mount` flag allows you to specify a volume driver and volume driver
-    options *per volume*, without creating the volumes in advance. In contrast,
-    `docker run` allows you to specify a single volume driver which is shared
-    by all volumes, using the `--volume-driver` flag.
-
-- The `--mount` flag allows you to specify custom metadata ("labels") for a volume,
-    before the volume is created.
-
-- When you use `--mount` with `type=bind`, the host-path must refer to an *existing*
-    path on the host. The path will not be created for you and the service will fail
-    with an error if the path does not exist.
-
-- The `--mount` flag does not allow you to relabel a volume with `Z` or `z` flags,
-    which are used for `selinux` labeling.
-
-#### Create a service using a named volume
-
-The following example creates a service that uses a named volume:
-
-```bash
-$ docker service create \
-  --name my-service \
-  --replicas 3 \
-  --mount type=volume,source=my-volume,destination=/path/in/container,volume-label="color=red",volume-label="shape=round" \
-  nginx:alpine
-```
-
-For each replica of the service, the engine requests a volume named "my-volume"
-from the default ("local") volume driver where the task is deployed. If the
-volume does not exist, the engine creates a new volume and applies the "color"
-and "shape" labels.
-
-When the task is started, the volume is mounted on `/path/in/container/` inside
-the container.
-
-Be aware that the default ("local") volume is a locally scoped volume driver.
-This means that depending on where a task is deployed, either that task gets a
-*new* volume named "my-volume", or shares the same "my-volume" with other tasks
-of the same service. Multiple containers writing to a single shared volume can
-cause data corruption if the software running inside the container is not
-designed to handle concurrent processes writing to the same location. Also take
-into account that containers can be re-scheduled by the Swarm orchestrator and
-be deployed on a different node.
-
-#### Create a service that uses an anonymous volume
-
-The following command creates a service with three replicas with an anonymous
-volume on `/path/in/container`:
-
-```bash
-$ docker service create \
-  --name my-service \
-  --replicas 3 \
-  --mount type=volume,destination=/path/in/container \
-  nginx:alpine
-```
-
-In this example, no name (`source`) is specified for the volume, so a new volume
-is created for each task. This guarantees that each task gets its own volume,
-and volumes are not shared between tasks. Anonymous volumes are removed after
-the task using them is complete.
-
-#### Create a service that uses a bind-mounted host directory
-
-The following example bind-mounts a host directory at `/path/in/container` in
-the containers backing the service:
-
-```bash
-$ docker service create \
-  --name my-service \
-  --mount type=bind,source=/path/on/host,destination=/path/in/container \
-  nginx:alpine
-```
-
-### Set service mode (--mode)
-
-The service mode determines whether this is a _replicated_ service or a _global_
-service. A replicated service runs as many tasks as specified, while a global
-service runs on each active node in the swarm.
-
-The following command creates a global service:
-
-```bash
-$ docker service create \
- --name redis_2 \
- --mode global \
- redis:3.0.6
-```
-
-### Specify service constraints (--constraint)
-
-You can limit the set of nodes where a task can be scheduled by defining
-constraint expressions. Multiple constraints find nodes that satisfy every
-expression (AND match). Constraints can match node or Docker Engine labels as
-follows:
-
-| node attribute  | matches                   | example                                         |
-|:----------------|:--------------------------|:------------------------------------------------|
-| node.id         | node ID                   | `node.id == 2ivku8v2gvtg4`                      |
-| node.hostname   | node hostname             | `node.hostname != node-2`                       |
-| node.role       | node role: manager        | `node.role == manager`                          |
-| node.labels     | user defined node labels  | `node.labels.security == high`                  |
-| engine.labels   | Docker Engine's labels    | `engine.labels.operatingsystem == ubuntu 14.04` |
-
-`engine.labels` apply to Docker Engine labels like operating system,
-drivers, etc. Swarm administrators add `node.labels` for operational purposes by
-using the [`docker node update`](node_update.md) command.
-
-For example, the following limits tasks for the redis service to nodes where the
-node type label equals queue:
-
-```bash
-$ docker service create \
-  --name redis_2 \
-  --constraint 'node.labels.type == queue' \
-  redis:3.0.6
-```
-
-### Attach a service to an existing network (--network)
-
-You can use overlay networks to connect one or more services within the swarm.
-
-First, create an overlay network on a manager node the docker network create
-command:
-
-```bash
-$ docker network create --driver overlay my-network
-
-etjpu59cykrptrgw0z0hk5snf
-```
-
-After you create an overlay network in swarm mode, all manager nodes have
-access to the network.
-
-When you create a service and pass the --network flag to attach the service to
-the overlay network:
-
-```bash
-$ docker service create \
-  --replicas 3 \
-  --network my-network \
-  --name my-web \
-  nginx
-
-716thylsndqma81j6kkkb5aus
-```
-
-The swarm extends my-network to each node running the service.
-
-Containers on the same network can access each other using
-[service discovery](https://docs.docker.com/engine/swarm/networking/#use-swarm-mode-service-discovery).
-
-### Publish service ports externally to the swarm (-p, --publish)
-
-You can publish service ports to make them available externally to the swarm
-using the `--publish` flag:
-
-```bash
-$ docker service create --publish <TARGET-PORT>:<SERVICE-PORT> nginx
-```
-
-For example:
-
-```bash
-$ docker service create --name my_web --replicas 3 --publish 8080:80 nginx
-```
-
-When you publish a service port, the swarm routing mesh makes the service
-accessible at the target port on every node regardless if there is a task for
-the service running on the node. For more information refer to
-[Use swarm mode routing mesh](https://docs.docker.com/engine/swarm/ingress/).
-
-### Publish a port for TCP only or UDP only
-
-By default, when you publish a port, it is a TCP port. You can
-specifically publish a UDP port instead of or in addition to a TCP port. When
-you publish both TCP and UDP ports, Docker 1.12.2 and earlier require you to
-add the suffix `/tcp` for TCP ports. Otherwise it is optional.
-
-#### TCP only
-
-The following two commands are equivalent.
-
-```bash
-$ docker service create --name dns-cache -p 53:53 dns-cache
-
-$ docker service create --name dns-cache -p 53:53/tcp dns-cache
-```
-
-#### TCP and UDP
-
-```bash
-$ docker service create --name dns-cache -p 53:53/tcp -p 53:53/udp dns-cache
-```
-
-#### UDP only
-
-```bash
-$ docker service create --name dns-cache -p 53:53/udp dns-cache
-```
-
-### Create services using templates
-
-You can use templates for some flags of `service create`, using the syntax
-provided by the Go's [text/template](http://golange.org/pkg/text/template/) package.
-
-The supported flags are the following :
-
-- `--hostname`
-- `--mount`
-- `--env`
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder       | Description
------------------ | --------------------------------------------
-`.Service.ID`     | Service ID
-`.Service.Name`   | Service name
-`.Service.Labels` | Service labels
-`.Node.ID`        | Node ID
-`.Task.ID`        | Task ID
-`.Task.Name`      | Task name
-`.Task.Slot`      | Task slot
-
-#### Template example
-
-In this example, we are going to set the template of the created containers based on the
-service's name and the node's ID where it sits.
-
-```bash
-$ docker service create --name hosttempl --hostname={% raw %}"{{.Node.ID}}-{{.Service.Name}}"{% endraw %} busybox top
-va8ew30grofhjoychbr6iot8c
-
-$ docker service ps va8ew30grofhjoychbr6iot8c
-ID            NAME         IMAGE                                                                                   NODE          DESIRED STATE  CURRENT STATE               ERROR  PORTS
-wo41w8hg8qan  hosttempl.1  busybox:latest@sha256:29f5d56d12684887bdfa50dcd29fc31eea4aaf4ad3bec43daf19026a7ce69912  2e7a8a9c4da2  Running        Running about a minute ago
-
-$ docker inspect --format={% raw %}"{{.Config.Hostname}}"{% endraw %} hosttempl.1.wo41w8hg8qanxwjwsg4kxpprj
-x3ti0erg11rjpg64m75kej2mz-hosttempl
-```
-
-## Related information
-
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
-
-<style>table tr > td:first-child { white-space: nowrap;}</style>
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_inspect.md
deleted file mode 100644
index 8b4ab62d89..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_inspect.md
+++ /dev/null
@@ -1,162 +0,0 @@
----
-title: "service inspect"
-description: "The service inspect command description and usage"
-keywords: "service, inspect"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service inspect
-
-```Markdown
-Usage:  docker service inspect [OPTIONS] SERVICE [SERVICE...]
-
-Display detailed information on one or more services
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-      --pretty          Print the information in a human friendly format.
-```
-
-
-Inspects the specified service. This command has to be run targeting a manager
-node.
-
-By default, this renders all results in a JSON array. If a format is specified,
-the given template will be executed for each result.
-
-Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-## Examples
-
-### Inspecting a service  by name or ID
-
-You can inspect a service, either by its *name*, or *ID*
-
-For example, given the following service;
-
-```bash
-$ docker service ls
-ID            NAME   MODE        REPLICAS  IMAGE
-dmu1ept4cxcf  redis  replicated  3/3       redis:3.0.6
-```
-
-Both `docker service inspect redis`, and `docker service inspect dmu1ept4cxcf`
-produce the same result:
-
-```bash
-$ docker service inspect redis
-[
-    {
-        "ID": "dmu1ept4cxcfe8k8lhtux3ro3",
-        "Version": {
-            "Index": 12
-        },
-        "CreatedAt": "2016-06-17T18:44:02.558012087Z",
-        "UpdatedAt": "2016-06-17T18:44:02.558012087Z",
-        "Spec": {
-            "Name": "redis",
-            "TaskTemplate": {
-                "ContainerSpec": {
-                    "Image": "redis:3.0.6"
-                },
-                "Resources": {
-                    "Limits": {},
-                    "Reservations": {}
-                },
-                "RestartPolicy": {
-                    "Condition": "any",
-                    "MaxAttempts": 0
-                },
-                "Placement": {}
-            },
-            "Mode": {
-                "Replicated": {
-                    "Replicas": 1
-                }
-            },
-            "UpdateConfig": {},
-            "EndpointSpec": {
-                "Mode": "vip"
-            }
-        },
-        "Endpoint": {
-            "Spec": {}
-        }
-    }
-]
-```
-
-```bash
-$ docker service inspect dmu1ept4cxcf
-[
-    {
-        "ID": "dmu1ept4cxcfe8k8lhtux3ro3",
-        "Version": {
-            "Index": 12
-        },
-        ...
-    }
-]
-```
-
-### Inspect a service using pretty-print
-
-You can print the inspect output in a human-readable format instead of the default
-JSON output, by using the `--pretty` option:
-
-```bash
-$ docker service inspect --pretty frontend
-ID:		c8wgl7q4ndfd52ni6qftkvnnp
-Name:		frontend
-Labels:
- - org.example.projectname=demo-app
-Service Mode:	REPLICATED
- Replicas:		5
-Placement:
-UpdateConfig:
- Parallelism:	0
-ContainerSpec:
- Image:		nginx:alpine
-Resources:
-Endpoint Mode:  vip
-Ports:
- Name =
- Protocol = tcp
- TargetPort = 443
- PublishedPort = 4443
-```
-
-You can also use `--format pretty` for the same effect.
-
-
-### Finding the number of tasks running as part of a service
-
-The `--format` option can be used to obtain specific information about a
-service. For example, the following command outputs the number of replicas
-of the "redis" service.
-
-```bash{% raw %}
-$ docker service inspect --format='{{.Spec.Mode.Replicated.Replicas}}' redis
-10
-{% endraw %}```
-
-
-## Related information
-
-* [service create](service_create.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_logs.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_logs.md
deleted file mode 100644
index fdf6a3a245..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_logs.md
+++ /dev/null
@@ -1,77 +0,0 @@
----
-title: "service logs (experimental)"
-description: "The service logs command description and usage"
-keywords: "service, logs"
-advisory: "experimental"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service logs
-
-```Markdown
-Usage:  docker service logs [OPTIONS] SERVICE
-
-Fetch the logs of a service
-
-Options:
-      --details        Show extra details provided to logs
-  -f, --follow         Follow log output
-      --help           Print usage
-      --since string   Show logs since timestamp
-      --tail string    Number of lines to show from the end of the logs (default "all")
-  -t, --timestamps     Show timestamps
-```
-
-The `docker service logs` command batch-retrieves logs present at the time of execution.
-
-> **Note**: this command is only functional for services that are started with
-> the `json-file` or `journald` logging driver.
-
-For more information about selecting and configuring logging drivers, refer to
-[Configure logging drivers](https://docs.docker.com/engine/admin/logging/overview/).
-
-The `docker service logs --follow` command will continue streaming the new output from
-the service's `STDOUT` and `STDERR`.
-
-Passing a negative number or a non-integer to `--tail` is invalid and the
-value is set to `all` in that case.
-
-The `docker service logs --timestamps` command will add an [RFC3339Nano timestamp](https://golang.org/pkg/time/#pkg-constants)
-, for example `2014-09-16T06:17:46.000000000Z`, to each
-log entry. To ensure that the timestamps are aligned the
-nano-second part of the timestamp will be padded with zero when necessary.
-
-The `docker service logs --details` command will add on extra attributes, such as
-environment variables and labels, provided to `--log-opt` when creating the
-service.
-
-The `--since` option shows only the service logs generated after
-a given date. You can specify the date as an RFC 3339 date, a UNIX
-timestamp, or a Go duration string (e.g. `1m30s`, `3h`). Besides RFC3339 date
-format you may also use RFC3339Nano, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
-timezone on the client will be used if you do not provide either a `Z` or a
-`+-00:00` timezone offset at the end of the timestamp. When providing Unix
-timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
-that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
-seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a
-fraction of a second no more than nine digits long. You can combine the
-`--since` option with either or both of the `--follow` or `--tail` options.
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service ls](service_ls.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ls.md
deleted file mode 100644
index ccd68af750..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ls.md
+++ /dev/null
@@ -1,114 +0,0 @@
----
-title: "service ls"
-description: "The service ls command description and usage"
-keywords: "service, ls"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service ls
-
-```Markdown
-Usage:	docker service ls [OPTIONS]
-
-List services
-
-Aliases:
-  ls, list
-
-Options:
-  -f, --filter value   Filter output based on conditions provided
-      --help           Print usage
-  -q, --quiet          Only display IDs
-```
-
-This command when run targeting a manager, lists services are running in the
-swarm.
-
-On a manager node:
-```bash
-$ docker service ls
-ID            NAME      MODE        REPLICAS    IMAGE
-c8wgl7q4ndfd  frontend  replicated  5/5         nginx:alpine
-dmu1ept4cxcf  redis     replicated  3/3         redis:3.0.6
-iwe3278osahj  mongo     global      7/7         mongo:3.3
-```
-
-The `REPLICAS` column shows both the *actual* and *desired* number of tasks for
-the service.
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more
-than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* [id](service_ls.md#id)
-* [label](service_ls.md#label)
-* [name](service_ls.md#name)
-
-#### ID
-
-The `id` filter matches all or part of a service's id.
-
-```bash
-$ docker service ls -f "id=0bcjw"
-ID            NAME   MODE        REPLICAS  IMAGE
-0bcjwfh8ychr  redis  replicated  1/1       redis:3.0.6
-```
-
-#### Label
-
-The `label` filter matches services based on the presence of a `label` alone or
-a `label` and a value.
-
-The following filter matches all services with a `project` label regardless of
-its value:
-
-```bash
-$ docker service ls --filter label=project
-ID            NAME       MODE        REPLICAS  IMAGE
-01sl1rp6nj5u  frontend2  replicated  1/1       nginx:alpine
-36xvvwwauej0  frontend   replicated  5/5       nginx:alpine
-74nzcxxjv6fq  backend    replicated  3/3       redis:3.0.6
-```
-
-The following filter matches only services with the `project` label with the
-`project-a` value.
-
-```bash
-$ docker service ls --filter label=project=project-a
-ID            NAME      MODE        REPLICAS  IMAGE
-36xvvwwauej0  frontend  replicated  5/5       nginx:alpine
-74nzcxxjv6fq  backend   replicated  3/3       redis:3.0.6
-```
-
-#### Name
-
-The `name` filter matches on all or part of a service's name.
-
-The following filter matches services with a name containing `redis`.
-
-```bash
-$ docker service ls --filter name=redis
-ID            NAME   MODE        REPLICAS  IMAGE
-0bcjwfh8ychr  redis  replicated  1/1       redis:3.0.6
-```
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ps.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ps.md
deleted file mode 100644
index 61abb15f67..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_ps.md
+++ /dev/null
@@ -1,161 +0,0 @@
----
-title: "service ps"
-description: "The service ps command description and usage"
-keywords: "service, tasks, ps"
-aliases: ["/engine/reference/commandline/service_tasks/"]
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service ps
-
-```Markdown
-Usage:  docker service ps [OPTIONS] SERVICE
-
-List the tasks of a service
-
-Options:
-  -f, --filter filter   Filter output based on conditions provided
-      --help            Print usage
-      --no-resolve      Do not map IDs to Names
-      --no-trunc        Do not truncate output
-  -q, --quiet           Only display task IDs
-```
-
-Lists the tasks that are running as part of the specified service. This command
-has to be run targeting a manager node.
-
-## Examples
-
-### Listing the tasks that are part of a service
-
-The following command shows all the tasks that are part of the `redis` service:
-
-```bash
-$ docker service ps redis
-
-ID             NAME      IMAGE        NODE      DESIRED STATE  CURRENT STATE          ERROR  PORTS
-0qihejybwf1x   redis.1   redis:3.0.5  manager1  Running        Running 8 seconds
-bk658fpbex0d   redis.2   redis:3.0.5  worker2   Running        Running 9 seconds
-5ls5s5fldaqg   redis.3   redis:3.0.5  worker1   Running        Running 9 seconds
-8ryt076polmc   redis.4   redis:3.0.5  worker1   Running        Running 9 seconds
-1x0v8yomsncd   redis.5   redis:3.0.5  manager1  Running        Running 8 seconds
-71v7je3el7rr   redis.6   redis:3.0.5  worker2   Running        Running 9 seconds
-4l3zm9b7tfr7   redis.7   redis:3.0.5  worker2   Running        Running 9 seconds
-9tfpyixiy2i7   redis.8   redis:3.0.5  worker1   Running        Running 9 seconds
-3w1wu13yupln   redis.9   redis:3.0.5  manager1  Running        Running 8 seconds
-8eaxrb2fqpbn   redis.10  redis:3.0.5  manager1  Running        Running 8 seconds
-```
-
-In addition to _running_ tasks, the output also shows the task history. For
-example, after updating the service to use the `redis:3.0.6` image, the output
-may look like this:
-
-```bash
-$ docker service ps redis
-
-ID            NAME         IMAGE        NODE      DESIRED STATE  CURRENT STATE                   ERROR  PORTS
-50qe8lfnxaxk  redis.1      redis:3.0.6  manager1  Running        Running 6 seconds ago
-ky2re9oz86r9   \_ redis.1  redis:3.0.5  manager1  Shutdown       Shutdown 8 seconds ago
-3s46te2nzl4i  redis.2      redis:3.0.6  worker2   Running        Running less than a second ago
-nvjljf7rmor4   \_ redis.2  redis:3.0.6  worker2   Shutdown       Rejected 23 seconds ago        "No such image: redis@sha256:6…"
-vtiuz2fpc0yb   \_ redis.2  redis:3.0.5  worker2   Shutdown       Shutdown 1 second ago
-jnarweeha8x4  redis.3      redis:3.0.6  worker1   Running        Running 3 seconds ago
-vs448yca2nz4   \_ redis.3  redis:3.0.5  worker1   Shutdown       Shutdown 4 seconds ago
-jf1i992619ir  redis.4      redis:3.0.6  worker1   Running        Running 10 seconds ago
-blkttv7zs8ee   \_ redis.4  redis:3.0.5  worker1   Shutdown       Shutdown 11 seconds ago
-```
-
-The number of items in the task history is determined by the
-`--task-history-limit` option that was set when initializing the swarm. You can
-change the task history retention limit using the
-[`docker swarm update`](swarm_update.md) command.
-
-When deploying a service, docker resolves the digest for the service's
-image, and pins the service to that digest. The digest is not shown by
-default, but is printed if `--no-trunc` is used. The `--no-trunc` option
-also shows the non-truncated task ID, and error-messages, as can be seen below;
-
-```bash
-$ docker service ps --no-trunc redis
-
-ID                          NAME         IMAGE                                                                                NODE      DESIRED STATE  CURRENT STATE            ERROR                                                                                           PORTS
-50qe8lfnxaxksi9w2a704wkp7   redis.1      redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842  manager1  Running        Running 5 minutes ago
-ky2re9oz86r9556i2szb8a8af   \_ redis.1   redis:3.0.5@sha256:f8829e00d95672c48c60f468329d6693c4bdd28d1f057e755f8ba8b40008682e  worker2   Shutdown       Shutdown 5 minutes ago
-bk658fpbex0d57cqcwoe3jthu   redis.2      redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842  worker2   Running        Running 5 seconds
-nvjljf7rmor4htv7l8rwcx7i7   \_ redis.2   redis:3.0.6@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842  worker2   Shutdown       Rejected 5 minutes ago   "No such image: redis@sha256:6a692a76c2081888b589e26e6ec835743119fe453d67ecf03df7de5b73d69842"
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there
-is more than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`).
-Multiple filter flags are combined as an `OR` filter. For example,
-`-f name=redis.1 -f name=redis.7` returns both `redis.1` and `redis.7` tasks.
-
-The currently supported filters are:
-
-* [id](#id)
-* [name](#name)
-* [node](#node)
-* [desired-state](#desired-state)
-
-
-#### ID
-
-The `id` filter matches on all or a prefix of a task's ID.
-
-```bash
-$ docker service ps -f "id=8" redis
-
-ID             NAME      IMAGE        NODE      DESIRED STATE  CURRENT STATE      ERROR  PORTS
-8ryt076polmc   redis.4   redis:3.0.6  worker1   Running        Running 9 seconds
-8eaxrb2fqpbn   redis.10  redis:3.0.6  manager1  Running        Running 8 seconds
-```
-
-#### Name
-
-The `name` filter matches on task names.
-
-```bash
-$ docker service ps -f "name=redis.1" redis
-ID            NAME     IMAGE        NODE      DESIRED STATE  CURRENT STATE      ERROR  PORTS
-qihejybwf1x5  redis.1  redis:3.0.6  manager1  Running        Running 8 seconds
-```
-
-
-#### Node
-
-The `node` filter matches on a node name or a node ID.
-
-```bash
-$ docker service ps -f "node=manager1" redis
-ID            NAME      IMAGE        NODE      DESIRED STATE  CURRENT STATE      ERROR  PORTS
-0qihejybwf1x  redis.1   redis:3.0.6  manager1  Running        Running 8 seconds
-1x0v8yomsncd  redis.5   redis:3.0.6  manager1  Running        Running 8 seconds
-3w1wu13yupln  redis.9   redis:3.0.6  manager1  Running        Running 8 seconds
-8eaxrb2fqpbn  redis.10  redis:3.0.6  manager1  Running        Running 8 seconds
-```
-
-
-#### desired-state
-
-The `desired-state` filter can take the values `running`, `shutdown`, and `accepted`.
-
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_rm.md
deleted file mode 100644
index d0ba90b26d..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_rm.md
+++ /dev/null
@@ -1,55 +0,0 @@
----
-title: "service rm"
-description: "The service rm command description and usage"
-keywords: "service, rm"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service rm
-
-```Markdown
-Usage:	docker service rm SERVICE [SERVICE...]
-
-Remove one or more services
-
-Aliases:
-  rm, remove
-
-Options:
-      --help   Print usage
-```
-
-Removes the specified services from the swarm. This command has to be run
-targeting a manager node.
-
-For example, to remove the redis service:
-
-```bash
-$ docker service rm redis
-redis
-$ docker service ls
-ID  NAME  MODE  REPLICAS  IMAGE
-```
-
-> **Warning**: Unlike `docker rm`, this command does not ask for confirmation
-> before removing a running service.
-
-
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service scale](service_scale.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_scale.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_scale.md
deleted file mode 100644
index 64075ed092..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_scale.md
+++ /dev/null
@@ -1,96 +0,0 @@
----
-title: "service scale"
-description: "The service scale command description and usage"
-keywords: "service, scale"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service scale
-
-```markdown
-Usage:  docker service scale SERVICE=REPLICAS [SERVICE=REPLICAS...]
-
-Scale one or multiple replicated services
-
-Options:
-      --help   Print usage
-```
-
-## Examples
-
-### Scale a service
-
-The scale command enables you to scale one or more replicated services either up
-or down to the desired number of replicas. This command cannot be applied on
-services which are global mode. The command will return immediately, but the
-actual scaling of the service may take some time. To stop all replicas of a
-service while keeping the service active in the swarm you can set the scale to 0.
-
-For example, the following command scales the "frontend" service to 50 tasks.
-
-```bash
-$ docker service scale frontend=50
-frontend scaled to 50
-```
-
-The following command tries to scale a global service to 10 tasks and returns an error.
-
-```
-$ docker service create --mode global --name backend backend:latest
-b4g08uwuairexjub6ome6usqh
-$ docker service scale backend=10
-backend: scale can only be used with replicated mode
-```
-
-Directly afterwards, run `docker service ls`, to see the actual number of
-replicas.
-
-```bash
-$ docker service ls --filter name=frontend
-
-ID            NAME      MODE        REPLICAS  IMAGE
-3pr5mlvu3fh9  frontend  replicated  15/50     nginx:alpine
-```
-
-You can also scale a service using the [`docker service update`](service_update.md)
-command. The following commands are equivalent:
-
-```bash
-$ docker service scale frontend=50
-$ docker service update --replicas=50 frontend
-```
-
-### Scale multiple services
-
-The `docker service scale` command allows you to set the desired number of
-tasks for multiple services at once. The following example scales both the
-backend and frontend services:
-
-```bash
-$ docker service scale backend=3 frontend=5
-backend scaled to 3
-frontend scaled to 5
-
-$ docker service ls
-ID            NAME      MODE        REPLICAS  IMAGE
-3pr5mlvu3fh9  frontend  replicated  5/5       nginx:alpine
-74nzcxxjv6fq  backend   replicated  3/3       redis:3.0.6
-```
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service rm](service_rm.md)
-* [service ps](service_ps.md)
-* [service update](service_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_update.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_update.md
deleted file mode 100644
index 301a0eabe8..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/service_update.md
+++ /dev/null
@@ -1,181 +0,0 @@
----
-title: "service update"
-description: "The service update command description and usage"
-keywords: "service, update"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# service update
-
-```Markdown
-Usage:  docker service update [OPTIONS] SERVICE
-
-Update a service
-
-Options:
-      --args string                      Service command args
-      --constraint-add list              Add or update a placement constraint (default [])
-      --constraint-rm list               Remove a constraint (default [])
-      --container-label-add list         Add or update a container label (default [])
-      --container-label-rm list          Remove a container label by its key (default [])
-      --dns-add list                     Add or update a custom DNS server (default [])
-      --dns-option-add list              Add or update a DNS option (default [])
-      --dns-option-rm list               Remove a DNS option (default [])
-      --dns-rm list                      Remove a custom DNS server (default [])
-      --dns-search-add list              Add or update a custom DNS search domain (default [])
-      --dns-search-rm list               Remove a DNS search domain (default [])
-      --endpoint-mode string             Endpoint mode (vip or dnsrr)
-      --env-add list                     Add or update an environment variable (default [])
-      --env-rm list                      Remove an environment variable (default [])
-      --force                            Force update even if no changes require it
-      --group-add list                   Add an additional supplementary user group to the container (default [])
-      --group-rm list                    Remove a previously added supplementary user group from the container (default [])
-      --health-cmd string                Command to run to check health
-      --health-interval duration         Time between running the check (ns|us|ms|s|m|h)
-      --health-retries int               Consecutive failures needed to report unhealthy
-      --health-timeout duration          Maximum time to allow one check to run (ns|us|ms|s|m|h)
-      --help                             Print usage
-      --host-add list                    Add or update a custom host-to-IP mapping (host:ip) (default [])
-      --host-rm list                     Remove a custom host-to-IP mapping (host:ip) (default [])
-      --hostname string                  Container hostname
-      --image string                     Service image tag
-      --label-add list                   Add or update a service label (default [])
-      --label-rm list                    Remove a label by its key (default [])
-      --limit-cpu decimal                Limit CPUs (default 0.000)
-      --limit-memory bytes               Limit Memory (default 0 B)
-      --log-driver string                Logging driver for service
-      --log-opt list                     Logging driver options (default [])
-      --mount-add mount                  Add or update a mount on a service
-      --mount-rm list                    Remove a mount by its target path (default [])
-      --no-healthcheck                   Disable any container-specified HEALTHCHECK
-      --publish-add port                 Add or update a published port
-      --publish-rm port                  Remove a published port by its target port
-      --replicas uint                    Number of tasks
-      --reserve-cpu decimal              Reserve CPUs (default 0.000)
-      --reserve-memory bytes             Reserve Memory (default 0 B)
-      --restart-condition string         Restart when condition is met (none, on-failure, or any)
-      --restart-delay duration           Delay between restart attempts (ns|us|ms|s|m|h)
-      --restart-max-attempts uint        Maximum number of restarts before giving up
-      --restart-window duration          Window used to evaluate the restart policy (ns|us|ms|s|m|h)
-      --rollback                         Rollback to previous specification
-      --secret-add secret                Add or update a secret on a service
-      --secret-rm list                   Remove a secret (default [])
-      --stop-grace-period duration       Time to wait before force killing a container (ns|us|ms|s|m|h)
-  -t, --tty                              Allocate a pseudo-TTY
-      --update-delay duration            Delay between updates (ns|us|ms|s|m|h) (default 0s)
-      --update-failure-action string     Action on update failure (pause|continue) (default "pause")
-      --update-max-failure-ratio float   Failure rate to tolerate during an update
-      --update-monitor duration          Duration after each task update to monitor for failure (ns|us|ms|s|m|h) (default 0s)
-      --update-parallelism uint          Maximum number of tasks updated simultaneously (0 to update all at once) (default 1)
-  -u, --user string                      Username or UID (format: <name|uid>[:<group|gid>])
-      --with-registry-auth               Send registry authentication details to swarm agents
-  -w, --workdir string                   Working directory inside the container
-```
-
-Updates a service as described by the specified parameters. This command has to be run targeting a manager node.
-The parameters are the same as [`docker service create`](service_create.md). Please look at the description there
-for further information.
-
-Normally, updating a service will only cause the service's tasks to be replaced with new ones if a change to the
-service requires recreating the tasks for it to take effect. For example, only changing the
-`--update-parallelism` setting will not recreate the tasks, because the individual tasks are not affected by this
-setting. However, the `--force` flag will cause the tasks to be recreated anyway. This can be used to perform a
-rolling restart without any changes to the service parameters.
-
-## Examples
-
-### Update a service
-
-```bash
-$ docker service update --limit-cpu 2 redis
-```
-
-### Perform a rolling restart with no parameter changes
-
-```bash
-$ docker service update --force --update-parallelism 1 --update-delay 30s redis
-```
-
-In this example, the `--force` flag causes the service's tasks to be shut down
-and replaced with new ones even though none of the other parameters would
-normally cause that to happen. The `--update-parallelism 1` setting ensures
-that only one task is replaced at a time (this is the default behavior). The
-`--update-delay 30s` setting introduces a 30 second delay between tasks, so
-that the rolling restart happens gradually.
-
-### Adding and removing mounts
-
-Use the `--mount-add` or `--mount-rm` options add or remove a service's bind-mounts
-or volumes.
-
-The following example creates a service which mounts the `test-data` volume to
-`/somewhere`. The next step updates the service to also mount the `other-volume`
-volume to `/somewhere-else`volume, The last step unmounts the `/somewhere` mount
-point, effectively removing the `test-data` volume. Each command returns the
-service name.
-
-- The `--mount-add` flag takes the same parameters as the `--mount` flag on
-  `service create`. Refer to the [volumes and
-  bind-mounts](service_create.md#volumes-and-bind-mounts-mount) section in the
-  `service create` reference for details.
-
-- The `--mount-rm` flag takes the `target` path of the mount.
-
-```bash
-$ docker service create \
-    --name=myservice \
-    --mount \
-      type=volume,source=test-data,target=/somewhere \
-    nginx:alpine \
-    myservice
-
-myservice
-
-$ docker service update \
-    --mount-add \
-      type=volume,source=other-volume,target=/somewhere-else \
-    myservice
-
-myservice
-
-$ docker service update --mount-rm /somewhere myservice
-
-myservice
-```
-
-### Adding and removing secrets
-
-Use the `--secret-add` or `--secret-rm` options add or remove a service's
-secrets.
-
-The following example adds a secret named `ssh-2` and removes `ssh-1`:
-
-```bash
-$ docker service update \
-    --secret-add source=ssh-2,target=ssh-2 \
-    --secret-rm ssh-1 \
-    myservice
-```
-
-### Update services using templates
-
-Some flags of `service update` support the use of templating.
-See [`service create`](./service_create.md#templating) for the reference.
-
-## Related information
-
-* [service create](service_create.md)
-* [service inspect](service_inspect.md)
-* [service logs](service_logs.md)
-* [service ls](service_ls.md)
-* [service ps](service_ps.md)
-* [service rm](service_rm.md)
-* [service scale](service_scale.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_deploy.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_deploy.md
deleted file mode 100644
index 037feaebd7..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_deploy.md
+++ /dev/null
@@ -1,98 +0,0 @@
----
-title: "stack deploy"
-description: "The stack deploy command description and usage"
-keywords: "stack, deploy, up"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stack deploy
-
-```markdown
-Usage:  docker stack deploy [OPTIONS] STACK
-
-Deploy a new stack or update an existing stack
-
-Aliases:
-  deploy, up
-
-Options:
-      --bundle-file string    Path to a Distributed Application Bundle file
-  -c, --compose-file string   Path to a Compose file
-      --help                  Print usage
-      --with-registry-auth    Send registry authentication details to Swarm agents
-```
-
-Create and update a stack from a `compose` or a `dab` file on the swarm. This command
-has to be run targeting a manager node.
-
-## Compose file
-
-The `deploy` command supports compose file version `3.0` and above."
-
-```bash
-$ docker stack deploy --compose-file docker-compose.yml vossibility
-Ignoring unsupported options: links
-
-Creating network vossibility_vossibility
-Creating network vossibility_default
-Creating service vossibility_nsqd
-Creating service vossibility_logstash
-Creating service vossibility_elasticsearch
-Creating service vossibility_kibana
-Creating service vossibility_ghollector
-Creating service vossibility_lookupd
-```
-
-You can verify that the services were correctly created
-
-```
-$ docker service ls
-ID            NAME                               MODE        REPLICAS  IMAGE
-29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4tjx9biia6fs  vossibility_elasticsearch          replicated  1/1       elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility_kibana                 replicated  1/1       kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility_logstash               replicated  1/1       logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe
-axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba
-```
-
-## DAB file
-
-```bash
-$ docker stack deploy --bundle-file vossibility-stack.dab vossibility
-Loading bundle from vossibility-stack.dab
-Creating service vossibility_elasticsearch
-Creating service vossibility_kibana
-Creating service vossibility_logstash
-Creating service vossibility_lookupd
-Creating service vossibility_nsqd
-Creating service vossibility_vossibility-collector
-```
-
-You can verify that the services were correctly created:
-
-```bash
-$ docker service ls
-ID            NAME                               MODE        REPLICAS  IMAGE
-29bv0vnlm903  vossibility_lookupd                replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4awt47624qwh  vossibility_nsqd                   replicated  1/1       nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4tjx9biia6fs  vossibility_elasticsearch          replicated  1/1       elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility_kibana                 replicated  1/1       kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility_logstash               replicated  1/1       logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe
-axqh55ipl40h  vossibility_vossibility-collector  replicated  1/1       icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba
-```
-
-## Related information
-
-* [stack ls](stack_ls.md)
-* [stack ps](stack_ps.md)
-* [stack rm](stack_rm.md)
-* [stack services](stack_services.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ls.md
deleted file mode 100644
index 05c7215492..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ls.md
+++ /dev/null
@@ -1,47 +0,0 @@
----
-title: "stack ls"
-description: "The stack ls command description and usage"
-keywords: "stack, ls"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stack ls
-
-```markdown
-Usage:	docker stack ls
-
-List stacks
-
-Aliases:
-  ls, list
-
-Options:
-      --help   Print usage
-```
-
-Lists the stacks.
-
-For example, the following command shows all stacks and some additional information:
-
-```bash
-$ docker stack ls
-
-ID                 SERVICES
-vossibility-stack  6
-myapp              2
-```
-
-## Related information
-
-* [stack deploy](stack_deploy.md)
-* [stack ps](stack_ps.md)
-* [stack rm](stack_rm.md)
-* [stack services](stack_services.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ps.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ps.md
deleted file mode 100644
index 101e9feb11..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_ps.md
+++ /dev/null
@@ -1,51 +0,0 @@
----
-title: "stack ps"
-description: "The stack ps command description and usage"
-keywords: "stack, ps"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stack ps
-
-```markdown
-Usage:  docker stack ps [OPTIONS] STACK
-
-List the tasks in the stack
-
-Options:
-  -f, --filter filter   Filter output based on conditions provided
-      --help            Print usage
-      --no-resolve      Do not map IDs to Names
-      --no-trunc        Do not truncate output
-```
-
-Lists the tasks that are running as part of the specified stack. This
-command has to be run targeting a manager node.
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there
-is more than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`).
-Multiple filter flags are combined as an `OR` filter. For example,
-`-f name=redis.1 -f name=redis.7` returns both `redis.1` and `redis.7` tasks.
-
-The currently supported filters are:
-
-* id
-* name
-* desired-state
-
-## Related information
-
-* [stack deploy](stack_deploy.md)
-* [stack ls](stack_ls.md)
-* [stack rm](stack_rm.md)
-* [stack services](stack_services.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_rm.md
deleted file mode 100644
index fd639978ec..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_rm.md
+++ /dev/null
@@ -1,38 +0,0 @@
----
-title: "stack rm"
-description: "The stack rm command description and usage"
-keywords: "stack, rm, remove, down"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stack rm
-
-```markdown
-Usage:  docker stack rm STACK
-
-Remove the stack
-
-Aliases:
-  rm, remove, down
-
-Options:
-      --help   Print usage
-```
-
-Remove the stack from the swarm. This command has to be run targeting
-a manager node.
-
-## Related information
-
-* [stack deploy](stack_deploy.md)
-* [stack ls](stack_ls.md)
-* [stack ps](stack_ps.md)
-* [stack services](stack_services.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_services.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_services.md
deleted file mode 100644
index 62779b4aa1..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stack_services.md
+++ /dev/null
@@ -1,70 +0,0 @@
----
-title: "stack services"
-description: "The stack services command description and usage"
-keywords: "stack, services"
-advisory: "experimental"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stack services (experimental)
-
-```markdown
-Usage:	docker stack services [OPTIONS] STACK
-
-List the services in the stack
-
-Options:
-  -f, --filter value   Filter output based on conditions provided
-      --help           Print usage
-  -q, --quiet          Only display IDs
-```
-
-Lists the services that are running as part of the specified stack. This
-command has to be run targeting a manager node.
-
-For example, the following command shows all services in the `myapp` stack:
-
-```bash
-$ docker stack services myapp
-
-ID            NAME            REPLICAS  IMAGE                                                                          COMMAND
-7be5ei6sqeye  myapp_web       1/1       nginx@sha256:23f809e7fd5952e7d5be065b4d3643fbbceccd349d537b62a123ef2201bc886f
-dn7m7nhhfb9y  myapp_db        1/1       mysql@sha256:a9a5b559f8821fe73d58c3606c812d1c044868d42c63817fa5125fd9d8b7b539
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there
-is more than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`).
-Multiple filter flags are combined as an `OR` filter.
-
-The following command shows both the `web` and `db` services:
-
-```bash
-$ docker stack services --filter name=myapp_web --filter name=myapp_db myapp
-
-ID            NAME            REPLICAS  IMAGE                                                                          COMMAND
-7be5ei6sqeye  myapp_web       1/1       nginx@sha256:23f809e7fd5952e7d5be065b4d3643fbbceccd349d537b62a123ef2201bc886f
-dn7m7nhhfb9y  myapp_db        1/1       mysql@sha256:a9a5b559f8821fe73d58c3606c812d1c044868d42c63817fa5125fd9d8b7b539
-```
-
-The currently supported filters are:
-
-* id / ID (`--filter id=7be5ei6sqeye`, or `--filter ID=7be5ei6sqeye`)
-* name (`--filter name=myapp_web`)
-* label (`--filter label=key=value`)
-
-## Related information
-
-* [stack deploy](stack_deploy.md)
-* [stack ls](stack_ls.md)
-* [stack ps](stack_ps.md)
-* [stack rm](stack_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/start.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/start.md
deleted file mode 100644
index 980bce9585..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/start.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-title: "start"
-description: "The start command description and usage"
-keywords: "Start, container, stopped"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# start
-
-```markdown
-Usage:  docker start [OPTIONS] CONTAINER [CONTAINER...]
-
-Start one or more stopped containers
-
-Options:
-  -a, --attach               Attach STDOUT/STDERR and forward signals
-      --detach-keys string   Override the key sequence for detaching a container
-      --help                 Print usage
-  -i, --interactive          Attach container's STDIN
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stats.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stats.md
deleted file mode 100644
index f5d0d54f35..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stats.md
+++ /dev/null
@@ -1,117 +0,0 @@
----
-title: "stats"
-description: "The stats command description and usage"
-keywords: "container, resource, statistics"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stats
-
-```markdown
-Usage:  docker stats [OPTIONS] [CONTAINER...]
-
-Display a live stream of container(s) resource usage statistics
-
-Options:
-  -a, --all             Show all containers (default shows just running)
-      --format string   Pretty-print images using a Go template
-      --help            Print usage
-      --no-stream       Disable streaming stats and only pull the first result
-```
-
-The `docker stats` command returns a live data stream for running containers. To limit data to one or more specific containers, specify a list of container names or ids separated by a space. You can specify a stopped container but stopped containers do not return any data.
-
-If you want more detailed information about a container's resource usage, use the `/containers/(id)/stats` API endpoint.
-
-## Examples
-
-Running `docker stats` on all running containers against a Linux daemon.
-
-    $ docker stats
-    CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O
-    1285939c1fd3        0.07%               796 KiB / 64 MiB        1.21%               788 B / 648 B       3.568 MB / 512 KB
-    9c76f7834ae2        0.07%               2.746 MiB / 64 MiB      4.29%               1.266 KB / 648 B    12.4 MB / 0 B
-    d1ea048f04e4        0.03%               4.583 MiB / 64 MiB      6.30%               2.854 KB / 648 B    27.7 MB / 0 B
-
-Running `docker stats` on multiple containers by name and id against a Linux daemon.
-
-    $ docker stats fervent_panini 5acfcb1b4fd1
-    CONTAINER           CPU %               MEM USAGE/LIMIT       MEM %               NET I/O
-    5acfcb1b4fd1        0.00%               115.2 MiB/1.045 GiB   11.03%              1.422 kB/648 B
-    fervent_panini      0.02%               11.08 MiB/1.045 GiB   1.06%               648 B/648 B
-
-Running `docker stats` on all running containers against a Windows daemon.
-
-    PS E:\> docker stats
-    CONTAINER           CPU %               PRIV WORKING SET    NET I/O             BLOCK I/O
-    09d3bb5b1604        6.61%               38.21 MiB           17.1 kB / 7.73 kB   10.7 MB / 3.57 MB
-    9db7aa4d986d        9.19%               38.26 MiB           15.2 kB / 7.65 kB   10.6 MB / 3.3 MB
-    3f214c61ad1d        0.00%               28.64 MiB           64 kB / 6.84 kB     4.42 MB / 6.93 MB
-
-Running `docker stats` on multiple containers by name and id against a Windows daemon.
-
-    PS E:\> docker ps -a
-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS               NAMES
-    3f214c61ad1d        nanoserver          "cmd"               2 minutes ago       Up 2 minutes                            big_minsky
-    9db7aa4d986d        windowsservercore   "cmd"               2 minutes ago       Up 2 minutes                            mad_wilson
-    09d3bb5b1604        windowsservercore   "cmd"               2 minutes ago       Up 2 minutes                            affectionate_easley
-
-    PS E:\> docker stats 3f214c61ad1d mad_wilson
-    CONTAINER           CPU %               PRIV WORKING SET    NET I/O             BLOCK I/O
-    3f214c61ad1d        0.00%               46.25 MiB           76.3 kB / 7.92 kB   10.3 MB / 14.7 MB
-    mad_wilson          9.59%               40.09 MiB           27.6 kB / 8.81 kB   17 MB / 20.1 MB
-
-## Formatting
-
-The formatting option (`--format`) pretty prints container output
-using a Go template.
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder  | Description
------------- | --------------------------------------------
-`.Container` | Container name or ID (user input)
-`.Name`      | Container name
-`.ID`        | Container ID
-`.CPUPerc`   | CPU percentage
-`.MemUsage`  | Memory usage
-`.NetIO`     | Network IO
-`.BlockIO`   | Block IO
-`.MemPerc`   | Memory percentage (Not available on Windows)
-`.PIDs`      | Number of PIDs (Not available on Windows)
-
-
-When using the `--format` option, the `stats` command either
-outputs the data exactly as the template declares or, when using the
-`table` directive, includes column headers as well.
-
-The following example uses a template without headers and outputs the
-`Container` and `CPUPerc` entries separated by a colon for all images:
-
-```bash
-$ docker stats --format "{{.Container}}: {{.CPUPerc}}"
-
-09d3bb5b1604: 6.61%
-9db7aa4d986d: 9.19%
-3f214c61ad1d: 0.00%
-```
-
-To list all containers statistics with their name, CPU percentage and memory
-usage in a table format you can use:
-
-```bash
-$ docker stats --format "table {{.Container}}\t{{.CPUPerc}}\t{{.MemUsage}}"
-
-CONTAINER           CPU %               PRIV WORKING SET
-1285939c1fd3        0.07%               796 KiB / 64 MiB
-9c76f7834ae2        0.07%               2.746 MiB / 64 MiB
-d1ea048f04e4        0.03%               4.583 MiB / 64 MiB
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stop.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/stop.md
deleted file mode 100644
index 3090db98ae..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/stop.md
+++ /dev/null
@@ -1,29 +0,0 @@
----
-title: "stop"
-description: "The stop command description and usage"
-keywords: "stop, SIGKILL, SIGTERM"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# stop
-
-```markdown
-Usage:  docker stop [OPTIONS] CONTAINER [CONTAINER...]
-
-Stop one or more running containers
-
-Options:
-      --help       Print usage
-  -t, --time int   Seconds to wait for stop before killing it (default 10)
-```
-
-The main process inside the container will receive `SIGTERM`, and after a grace
-period, `SIGKILL`.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_init.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_init.md
deleted file mode 100644
index 44afc27476..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_init.md
+++ /dev/null
@@ -1,142 +0,0 @@
----
-title: "swarm init"
-description: "The swarm init command description and usage"
-keywords: "swarm, init"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm init
-
-```markdown
-Usage:  docker swarm init [OPTIONS]
-
-Initialize a swarm
-
-Options:
-      --advertise-addr string           Advertised address (format: <ip|interface>[:port])
-      --autolock                        Enable manager autolocking (requiring an unlock key to start a stopped manager)
-      --cert-expiry duration            Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s)
-      --dispatcher-heartbeat duration   Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s)
-      --external-ca external-ca         Specifications of one or more certificate signing endpoints
-      --force-new-cluster               Force create a new cluster from current state
-      --help                            Print usage
-      --listen-addr node-addr           Listen address (format: <ip|interface>[:port]) (default 0.0.0.0:2377)
-      --max-snapshots uint              Number of additional Raft snapshots to retain
-      --snapshot-interval uint          Number of log entries between Raft snapshots (default 10000)
-      --task-history-limit int          Task history retention limit (default 5)
-```
-
-Initialize a swarm. The docker engine targeted by this command becomes a manager
-in the newly created single-node swarm.
-
-
-```bash
-$ docker swarm init --advertise-addr 192.168.99.121
-Swarm initialized: current node (bvz81updecsj6wjz393c09vti) is now a manager.
-
-To add a worker to this swarm, run the following command:
-
-    docker swarm join \
-    --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx \
-    172.17.0.2:2377
-
-To add a manager to this swarm, run 'docker swarm join-token manager' and follow the instructions.
-```
-
-`docker swarm init` generates two random tokens, a worker token and a manager token. When you join
-a new node to the swarm, the node joins as a worker or manager node based upon the token you pass
-to [swarm join](swarm_join.md).
-
-After you create the swarm, you can display or rotate the token using
-[swarm join-token](swarm_join_token.md).
-
-### `--autolock`
-
-This flag enables automatic locking of managers with an encryption key. The
-private keys and data stored by all managers will be protected by the
-encryption key printed in the output, and will not be accessible without it.
-Thus, it is very important to store this key in order to activate a manager
-after it restarts. The key can be passed to `docker swarm unlock` to reactivate
-the manager. Autolock can be disabled by running
-`docker swarm update --autolock=false`. After disabling it, the encryption key
-is no longer required to start the manager, and it will start up on its own
-without user intervention.
-
-### `--cert-expiry`
-
-This flag sets the validity period for node certificates.
-
-### `--dispatcher-heartbeat`
-
-This flag sets the frequency with which nodes are told to use as a
-period to report their health.
-
-### `--external-ca`
-
-This flag sets up the swarm to use an external CA to issue node certificates. The value takes
-the form `protocol=X,url=Y`. The value for `protocol` specifies what protocol should be used
-to send signing requests to the external CA. Currently, the only supported value is `cfssl`.
-The URL specifies the endpoint where signing requests should be submitted.
-
-### `--force-new-cluster`
-
-This flag forces an existing node that was part of a quorum that was lost to restart as a single node Manager without losing its data.
-
-### `--listen-addr`
-
-The node listens for inbound swarm manager traffic on this address. The default is to listen on
-0.0.0.0:2377. It is also possible to specify a network interface to listen on that interface's
-address; for example `--listen-addr eth0:2377`.
-
-Specifying a port is optional. If the value is a bare IP address or interface
-name, the default port 2377 will be used.
-
-### `--advertise-addr`
-
-This flag specifies the address that will be advertised to other members of the
-swarm for API access and overlay networking. If unspecified, Docker will check
-if the system has a single IP address, and use that IP address with the
-listening port (see `--listen-addr`). If the system has multiple IP addresses,
-`--advertise-addr` must be specified so that the correct address is chosen for
-inter-manager communication and overlay networking.
-
-It is also possible to specify a network interface to advertise that interface's address;
-for example `--advertise-addr eth0:2377`.
-
-Specifying a port is optional. If the value is a bare IP address or interface
-name, the default port 2377 will be used.
-
-### `--task-history-limit`
-
-This flag sets up task history retention limit.
-
-### `--max-snapshots`
-
-This flag sets the number of old Raft snapshots to retain in addition to the
-current Raft snapshots. By default, no old snapshots are retained. This option
-may be used for debugging, or to store old snapshots of the swarm state for
-disaster recovery purposes.
-
-### `--snapshot-interval`
-
-This flag specifies how many log entries to allow in between Raft snapshots.
-Setting this to a higher number will trigger snapshots less frequently.
-Snapshots compact the Raft log and allow for more efficient transfer of the
-state to new managers. However, there is a performance cost to taking snapshots
-frequently.
-
-## Related information
-
-* [swarm join](swarm_join.md)
-* [swarm leave](swarm_leave.md)
-* [swarm update](swarm_update.md)
-* [swarm join-token](swarm_join_token.md)
-* [node rm](node_rm.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join.md
deleted file mode 100644
index 0cde0d7bcd..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join.md
+++ /dev/null
@@ -1,102 +0,0 @@
----
-title: "swarm join"
-description: "The swarm join command description and usage"
-keywords: "swarm, join"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm join
-
-```markdown
-Usage:  docker swarm join [OPTIONS] HOST:PORT
-
-Join a swarm as a node and/or manager
-
-Options:
-      --advertise-addr string   Advertised address (format: <ip|interface>[:port])
-      --help                    Print usage
-      --listen-addr node-addr   Listen address (format: <ip|interface>[:port]) (default 0.0.0.0:2377)
-      --token string            Token for entry into the swarm
-```
-
-Join a node to a swarm. The node joins as a manager node or worker node based upon the token you
-pass with the `--token` flag. If you pass a manager token, the node joins as a manager. If you
-pass a worker token, the node joins as a worker.
-
-### Join a node to swarm as a manager
-
-The example below demonstrates joining a manager node using a manager token.
-
-```bash
-$ docker swarm join --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2 192.168.99.121:2377
-This node joined a swarm as a manager.
-$ docker node ls
-ID                           HOSTNAME  STATUS  AVAILABILITY  MANAGER STATUS
-dkp8vy1dq1kxleu9g4u78tlag *  manager2  Ready   Active        Reachable
-dvfxp4zseq4s0rih1selh0d20    manager1  Ready   Active        Leader
-```
-
-A cluster should only have 3-7 managers at most, because a majority of managers must be available
-for the cluster to function. Nodes that aren't meant to participate in this management quorum
-should join as workers instead. Managers should be stable hosts that have static IP addresses.
-
-### Join a node to swarm as a worker
-
-The example below demonstrates joining a worker node using a worker token.
-
-```bash
-$ docker swarm join --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx 192.168.99.121:2377
-This node joined a swarm as a worker.
-$ docker node ls
-ID                           HOSTNAME  STATUS  AVAILABILITY  MANAGER STATUS
-7ln70fl22uw2dvjn2ft53m3q5    worker2   Ready   Active
-dkp8vy1dq1kxleu9g4u78tlag    worker1   Ready   Active        Reachable
-dvfxp4zseq4s0rih1selh0d20 *  manager1  Ready   Active        Leader
-```
-
-### `--listen-addr value`
-
-If the node is a manager, it will listen for inbound swarm manager traffic on this
-address. The default is to listen on 0.0.0.0:2377. It is also possible to specify a
-network interface to listen on that interface's address; for example `--listen-addr eth0:2377`.
-
-Specifying a port is optional. If the value is a bare IP address, or interface
-name, the default port 2377 will be used.
-
-This flag is generally not necessary when joining an existing swarm.
-
-### `--advertise-addr value`
-
-This flag specifies the address that will be advertised to other members of the
-swarm for API access. If unspecified, Docker will check if the system has a
-single IP address, and use that IP address with the listening port (see
-`--listen-addr`). If the system has multiple IP addresses, `--advertise-addr`
-must be specified so that the correct address is chosen for inter-manager
-communication and overlay networking.
-
-It is also possible to specify a network interface to advertise that interface's address;
-for example `--advertise-addr eth0:2377`.
-
-Specifying a port is optional. If the value is a bare IP address, or interface
-name, the default port 2377 will be used.
-
-This flag is generally not necessary when joining an existing swarm.
-
-### `--token string`
-
-Secret value required for nodes to join the swarm
-
-
-## Related information
-
-* [swarm init](swarm_init.md)
-* [swarm leave](swarm_leave.md)
-* [swarm update](swarm_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join_token.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join_token.md
deleted file mode 100644
index d731f028ba..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_join_token.md
+++ /dev/null
@@ -1,105 +0,0 @@
----
-title: "swarm join-token"
-description: "The swarm join-token command description and usage"
-keywords: "swarm, join-token"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm join-token
-
-```markdown
-Usage:	docker swarm join-token [OPTIONS] (worker|manager)
-
-Manage join tokens
-
-Options:
-      --help     Print usage
-  -q, --quiet    Only display token
-      --rotate   Rotate join token
-```
-
-Join tokens are secrets that allow a node to join the swarm. There are two
-different join tokens available, one for the worker role and one for the manager
-role. You pass the token using the `--token` flag when you run
-[swarm join](swarm_join.md). Nodes use the join token only when they join the
-swarm.
-
-You can view or rotate the join tokens using `swarm join-token`.
-
-As a convenience, you can pass `worker` or `manager` as an argument to
-`join-token` to print the full `docker swarm join` command to join a new node to
-the swarm:
-
-```bash
-$ docker swarm join-token worker
-To add a worker to this swarm, run the following command:
-
-    docker swarm join \
-    --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-1awxwuwd3z9j1z3puu7rcgdbx \
-    172.17.0.2:2377
-
-$ docker swarm join-token manager
-To add a manager to this swarm, run the following command:
-
-    docker swarm join \
-    --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-7p73s1dx5in4tatdymyhg9hu2 \
-    172.17.0.2:2377
-```
-
-Use the `--rotate` flag to generate a new join token for the specified role:
-
-```bash
-$ docker swarm join-token --rotate worker
-Successfully rotated worker join token.
-
-To add a worker to this swarm, run the following command:
-
-    docker swarm join \
-    --token SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-b30ljddcqhef9b9v4rs7mel7t \
-    172.17.0.2:2377
-```
-
-After using `--rotate`, only the new token will be valid for joining with the specified role.
-
-The `-q` (or `--quiet`) flag only prints the token:
-
-```bash
-$ docker swarm join-token -q worker
-
-SWMTKN-1-3pu6hszjas19xyp7ghgosyx9k8atbfcr8p2is99znpy26u2lkl-b30ljddcqhef9b9v4rs7mel7t
-```
-
-### `--rotate`
-
-Because tokens allow new nodes to join the swarm, you should keep them secret.
-Be particularly careful with manager tokens since they allow new manager nodes
-to join the swarm. A rogue manager has the potential to disrupt the operation of
-your swarm.
-
-Rotate your swarm's join token if a token gets checked-in to version control,
-stolen, or a node is compromised. You may also want to periodically rotate the
-token to ensure any unknown token leaks do not allow a rogue node to join
-the swarm.
-
-To rotate the join token and print the newly generated token, run
-`docker swarm join-token --rotate` and pass the role: `manager` or `worker`.
-
-Rotating a join-token means that no new nodes will be able to join the swarm
-using the old token. Rotation does not affect existing nodes in the swarm
-because the join token is only used for authorizing new nodes joining the swarm.
-
-### `--quiet`
-
-Only print the token. Do not print a complete command for joining.
-
-## Related information
-
-* [swarm join](swarm_join.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_leave.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_leave.md
deleted file mode 100644
index c0d9437818..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_leave.md
+++ /dev/null
@@ -1,58 +0,0 @@
----
-title: "swarm leave"
-description: "The swarm leave command description and usage"
-keywords: "swarm, leave"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm leave
-
-```markdown
-Usage:	docker swarm leave [OPTIONS]
-
-Leave the swarm
-
-Options:
-  -f, --force   Force this node to leave the swarm, ignoring warnings
-      --help    Print usage
-```
-
-When you run this command on a worker, that worker leaves the swarm.
-
-You can use the `--force` option to on a manager to remove it from the swarm.
-However, this does not reconfigure the swarm to ensure that there are enough
-managers to maintain a quorum in the swarm. The safe way to remove a manager
-from a swarm is to demote it to a worker and then direct it to leave the quorum
-without using `--force`. Only use `--force` in situations where the swarm will
-no longer be used after the manager leaves, such as in a single-node swarm.
-
-Consider the following swarm, as seen from the manager:
-```bash
-$ docker node ls
-ID                           HOSTNAME  STATUS  AVAILABILITY  MANAGER STATUS
-7ln70fl22uw2dvjn2ft53m3q5    worker2   Ready   Active
-dkp8vy1dq1kxleu9g4u78tlag    worker1   Ready   Active
-dvfxp4zseq4s0rih1selh0d20 *  manager1  Ready   Active        Leader
-```
-
-To remove `worker2`, issue the following command from `worker2` itself:
-```bash
-$ docker swarm leave
-Node left the default swarm.
-```
-To remove an inactive node, use the [`node rm`](node_rm.md) command instead.
-
-## Related information
-
-* [node rm](node_rm.md)
-* [swarm init](swarm_init.md)
-* [swarm join](swarm_join.md)
-* [swarm update](swarm_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock.md
deleted file mode 100644
index 164b7d35a4..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-title: "swarm unlock"
-description: "The swarm unlock command description and usage"
-keywords: "swarm, unlock"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm unlock
-
-```markdown
-Usage:	docker swarm unlock
-
-Unlock swarm
-
-Options:
-      --help   Print usage
-```
-
-Unlocks a locked manager using a user-supplied unlock key. This command must be
-used to reactivate a manager after its Docker daemon restarts if the autolock
-setting is turned on. The unlock key is printed at the time when autolock is
-enabled, and is also available from the `docker swarm unlock-key` command.
-
-
-```bash
-$ docker swarm unlock
-Please enter unlock key:
-```
-
-## Related information
-
-* [swarm init](swarm_init.md)
-* [swarm update](swarm_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock_key.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock_key.md
deleted file mode 100644
index a2597fe9ab..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_unlock_key.md
+++ /dev/null
@@ -1,84 +0,0 @@
----
-title: "swarm unlock-key"
-description: "The swarm unlock-keycommand description and usage"
-keywords: "swarm, unlock-key"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm unlock-key
-
-```markdown
-Usage:	docker swarm unlock-key [OPTIONS]
-
-Manage the unlock key
-
-Options:
-      --help     Print usage
-  -q, --quiet    Only display token
-      --rotate   Rotate unlock key
-```
-
-An unlock key is a secret key needed to unlock a manager after its Docker daemon
-restarts. These keys are only used when the autolock feature is enabled for the
-swarm.
-
-You can view or rotate the unlock key using `swarm unlock-key`. To view the key,
-run the `docker swarm unlock-key` command without any arguments:
-
-
-```bash
-$ docker swarm unlock-key
-To unlock a swarm manager after it restarts, run the `docker swarm unlock`
-command and provide the following key:
-
-    SWMKEY-1-fySn8TY4w5lKcWcJPIpKufejh9hxx5KYwx6XZigx3Q4
-
-Please remember to store this key in a password manager, since without it you
-will not be able to restart the manager.
-```
-
-Use the `--rotate` flag to rotate the unlock key to a new, randomly-generated
-key:
-
-```bash
-$ docker swarm unlock-key --rotate
-Successfully rotated manager unlock key.
-
-To unlock a swarm manager after it restarts, run the `docker swarm unlock`
-command and provide the following key:
-
-    SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8
-
-Please remember to store this key in a password manager, since without it you
-will not be able to restart the manager.
-```
-
-The `-q` (or `--quiet`) flag only prints the key:
-
-```bash
-$ docker swarm unlock-key -q
-SWMKEY-1-7c37Cc8654o6p38HnroywCi19pllOnGtbdZEgtKxZu8
-```
-
-### `--rotate`
-
-This flag rotates the unlock key, replacing it with a new randomly-generated
-key. The old unlock key will no longer be accepted.
-
-### `--quiet`
-
-Only print the unlock key, without instructions.
-
-## Related information
-
-* [swarm unlock](swarm_unlock.md)
-* [swarm init](swarm_init.md)
-* [swarm update](swarm_update.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_update.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_update.md
deleted file mode 100644
index 0af63fe3e0..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/swarm_update.md
+++ /dev/null
@@ -1,45 +0,0 @@
----
-title: "swarm update"
-description: "The swarm update command description and usage"
-keywords: "swarm, update"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# swarm update
-
-```markdown
-Usage:  docker swarm update [OPTIONS]
-
-Update the swarm
-
-Options:
-      --autolock                        Change manager autolocking setting (true|false)
-      --cert-expiry duration            Validity period for node certificates (ns|us|ms|s|m|h) (default 2160h0m0s)
-      --dispatcher-heartbeat duration   Dispatcher heartbeat period (ns|us|ms|s|m|h) (default 5s)
-      --external-ca external-ca         Specifications of one or more certificate signing endpoints
-      --help                            Print usage
-      --max-snapshots uint              Number of additional Raft snapshots to retain
-      --snapshot-interval uint          Number of log entries between Raft snapshots (default 10000)
-      --task-history-limit int          Task history retention limit (default 5)
-```
-
-Updates a swarm with new parameter values. This command must target a manager node.
-
-
-```bash
-$ docker swarm update --cert-expiry 720h
-```
-
-## Related information
-
-* [swarm init](swarm_init.md)
-* [swarm join](swarm_join.md)
-* [swarm leave](swarm_leave.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_df.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_df.md
deleted file mode 100644
index c6e8bbdc68..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_df.md
+++ /dev/null
@@ -1,76 +0,0 @@
----
-title: "system df"
-description: "The system df command description and usage"
-keywords: "system, data, usage, disk"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# system df
-
-```markdown
-Usage:	docker system df [OPTIONS]
-
-Show docker filesystem usage
-
-Options:
-      --help      Print usage
-  -v, --verbose   Show detailed information on space usage
-```
-
-The `docker system df` command displays information regarding the
-amount of disk space used by the docker daemon.
-
-By default the command will just show a summary of the data used:
-```bash
-$ docker system df
-TYPE                TOTAL               ACTIVE              SIZE                RECLAIMABLE
-Images              5                   2                   16.43 MB            11.63 MB (70%)
-Containers          2                   0                   212 B               212 B (100%)
-Local Volumes       2                   1                   36 B                0 B (0%)
-```
-
-A more detailed view can be requested using the `-v, --verbose` flag:
-```bash
-$ docker system df -v
-Images space usage:
-
-REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE                SHARED SIZE         UNIQUE SIZE         CONTAINERS
-my-curl             latest              b2789dd875bf        6 minutes ago       11 MB               11 MB               5 B                 0
-my-jq               latest              ae67841be6d0        6 minutes ago       9.623 MB            8.991 MB            632.1 kB            0
-<none>              <none>              a0971c4015c1        6 minutes ago       11 MB               11 MB               0 B                 0
-alpine              latest              4e38e38c8ce0        9 weeks ago         4.799 MB            0 B                 4.799 MB            1
-alpine              3.3                 47cf20d8c26c        9 weeks ago         4.797 MB            4.797 MB            0 B                 1
-
-Containers space usage:
-
-CONTAINER ID        IMAGE               COMMAND             LOCAL VOLUMES       SIZE                CREATED             STATUS                      NAMES
-4a7f7eebae0f        alpine:latest       "sh"                1                   0 B                 16 minutes ago      Exited (0) 5 minutes ago    hopeful_yalow
-f98f9c2aa1ea        alpine:3.3          "sh"                1                   212 B               16 minutes ago      Exited (0) 48 seconds ago   anon-vol
-
-Local Volumes space usage:
-
-NAME                                                               LINKS               SIZE
-07c7bdf3e34ab76d921894c2b834f073721fccfbbcba792aa7648e3a7a664c2e   2                   36 B
-my-named-vol                                                       0                   0 B
-```
-
-* `SHARED SIZE` is the amount of space that an image shares with another one (i.e. their common data)
-* `UNIQUE SIZE` is the amount of space that is only used by a given image
-* `SIZE` is the virtual size of the image, it is the sum of `SHARED SIZE` and `UNIQUE SIZE`
-
-Note that network information is not shown because it doesn't consume the disk space.
-
-## Related Information
-* [system prune](system_prune.md)
-* [container prune](container_prune.md)
-* [volume prune](volume_prune.md)
-* [image prune](image_prune.md)
-* [network prune](network_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_prune.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_prune.md
deleted file mode 100644
index 46f8c4364a..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/system_prune.md
+++ /dev/null
@@ -1,79 +0,0 @@
----
-title: "system prune"
-description: "Remove unused data"
-keywords: "system, prune, delete, remove"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# system prune
-
-```markdown
-Usage:	docker system prune [OPTIONS]
-
-Delete unused data
-
-Options:
-  -a, --all     Remove all unused data not just dangling ones
-  -f, --force   Do not prompt for confirmation
-      --help    Print usage
-```
-
-Remove all unused containers, volumes, networks and images (both dangling and unreferenced).
-
-Example output:
-
-```bash
-$ docker system prune -a
-WARNING! This will remove:
-	- all stopped containers
-	- all volumes not used by at least one container
-	- all networks not used by at least one container
-	- all images without at least one container associated to them
-Are you sure you want to continue? [y/N] y
-Deleted Containers:
-0998aa37185a1a7036b0e12cf1ac1b6442dcfa30a5c9650a42ed5010046f195b
-73958bfb884fa81fa4cc6baf61055667e940ea2357b4036acbbe25a60f442a4d
-
-Deleted Volumes:
-named-vol
-
-Deleted Images:
-untagged: my-curl:latest
-deleted: sha256:7d88582121f2a29031d92017754d62a0d1a215c97e8f0106c586546e7404447d
-deleted: sha256:dd14a93d83593d4024152f85d7c63f76aaa4e73e228377ba1d130ef5149f4d8b
-untagged: alpine:3.3
-deleted: sha256:695f3d04125db3266d4ab7bbb3c6b23aa4293923e762aa2562c54f49a28f009f
-untagged: alpine:latest
-deleted: sha256:ee4603260daafe1a8c2f3b78fd760922918ab2441cbb2853ed5c439e59c52f96
-deleted: sha256:9007f5987db353ec398a223bc5a135c5a9601798ba20a1abba537ea2f8ac765f
-deleted: sha256:71fa90c8f04769c9721459d5aa0936db640b92c8c91c9b589b54abd412d120ab
-deleted: sha256:bb1c3357b3c30ece26e6604aea7d2ec0ace4166ff34c3616701279c22444c0f3
-untagged: my-jq:latest
-deleted: sha256:6e66d724542af9bc4c4abf4a909791d7260b6d0110d8e220708b09e4ee1322e1
-deleted: sha256:07b3fa89d4b17009eb3988dfc592c7d30ab3ba52d2007832dffcf6d40e3eda7f
-deleted: sha256:3a88a5c81eb5c283e72db2dbc6d65cbfd8e80b6c89bb6e714cfaaa0eed99c548
-
-Total reclaimed space: 13.5 MB
-```
-
-## Related information
-
-* [volume create](volume_create.md)
-* [volume ls](volume_ls.md)
-* [volume inspect](volume_inspect.md)
-* [volume rm](volume_rm.md)
-* [volume prune](volume_prune.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
-* [system df](system_df.md)
-* [container prune](container_prune.md)
-* [image prune](image_prune.md)
-* [network prune](network_prune.md)
-* [system prune](system_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/tag.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/tag.md
deleted file mode 100644
index 983bfe27b2..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/tag.md
+++ /dev/null
@@ -1,74 +0,0 @@
----
-title: "tag"
-description: "The tag command description and usage"
-keywords: "tag, name, image"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# tag
-
-```markdown
-Usage:  docker tag SOURCE_IMAGE[:TAG] TARGET_IMAGE[:TAG]
-
-Create a tag TARGET_IMAGE that refers to SOURCE_IMAGE
-
-Options:
-      --help   Print usage
-```
-
-An image name is made up of slash-separated name components, optionally prefixed
-by a registry hostname. The hostname must comply with standard DNS rules, but
-may not contain underscores. If a hostname is present, it may optionally be
-followed by a port number in the format `:8080`. If not present, the command
-uses Docker's public registry located at `registry-1.docker.io` by default. Name
-components may contain lowercase characters, digits and separators. A separator
-is defined as a period, one or two underscores, or one or more dashes. A name
-component may not start or end with a separator.
-
-A tag name may contain lowercase and uppercase characters, digits, underscores,
-periods and dashes. A tag name may not start with a period or a dash and may
-contain a maximum of 128 characters.
-
-You can group your images together using names and tags, and then upload them
-to [*Share Images via Repositories*](https://docs.docker.com/engine/tutorials/dockerrepos/#/contributing-to-docker-hub).
-
-# Examples
-
-## Tagging an image referenced by ID
-
-To tag a local image with ID "0e5574283393" into the "fedora" repository with
-"version1.0":
-
-    docker tag 0e5574283393 fedora/httpd:version1.0
-
-## Tagging an image referenced by Name
-
-To tag a local image with name "httpd" into the "fedora" repository with
-"version1.0":
-
-    docker tag httpd fedora/httpd:version1.0
-
-Note that since the tag name is not specified, the alias is created for an
-existing local version `httpd:latest`.
-
-## Tagging an image referenced by Name and Tag
-
-To tag a local image with name "httpd" and tag "test" into the "fedora"
-repository with "version1.0.test":
-
-    docker tag httpd:test fedora/httpd:version1.0.test
-
-## Tagging an image for a private repository
-
-To push an image to a private registry and not the central Docker
-registry you must tag it with the registry hostname and port (if needed).
-
-    docker tag 0e5574283393 myregistryhost:5000/fedora/httpd:version1.0
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/top.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/top.md
deleted file mode 100644
index 0a04828775..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/top.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: "top"
-description: "The top command description and usage"
-keywords: "container, running, processes"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# top
-
-```markdown
-Usage:  docker top CONTAINER [ps OPTIONS]
-
-Display the running processes of a container
-
-Options:
-      --help   Print usage
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/unpause.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/unpause.md
deleted file mode 100644
index aa2326fefc..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/unpause.md
+++ /dev/null
@@ -1,36 +0,0 @@
----
-title: "unpause"
-description: "The unpause command description and usage"
-keywords: "cgroups, suspend, container"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# unpause
-
-```markdown
-Usage:  docker unpause CONTAINER [CONTAINER...]
-
-Unpause all processes within one or more containers
-
-Options:
-      --help   Print usage
-```
-
-The `docker unpause` command un-suspends all processes in the specified containers.
-On Linux, it does this using the cgroups freezer.
-
-See the
-[cgroups freezer documentation](https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt)
-for further details.
-
-## Related information
-
-* [pause](pause.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/update.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/update.md
deleted file mode 100644
index a13900440f..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/update.md
+++ /dev/null
@@ -1,120 +0,0 @@
----
-title: "update"
-description: "The update command description and usage"
-keywords: "resources, update, dynamically"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-## update
-
-```markdown
-Usage:  docker update [OPTIONS] CONTAINER [CONTAINER...]
-
-Update configuration of one or more containers
-
-Options:
-      --blkio-weight value          Block IO (relative weight), between 10 and 1000
-      --cpu-period int              Limit CPU CFS (Completely Fair Scheduler) period
-      --cpu-quota int               Limit CPU CFS (Completely Fair Scheduler) quota
-  -c, --cpu-shares int              CPU shares (relative weight)
-      --cpu-rt-period int           Limit the CPU real-time period in microseconds
-      --cpu-rt-runtime int          Limit the CPU real-time runtime in microseconds
-      --cpuset-cpus string          CPUs in which to allow execution (0-3, 0,1)
-      --cpuset-mems string          MEMs in which to allow execution (0-3, 0,1)
-      --help                        Print usage
-      --kernel-memory string        Kernel memory limit
-  -m, --memory string               Memory limit
-      --memory-reservation string   Memory soft limit
-      --memory-swap string          Swap limit equal to memory plus swap: '-1' to enable unlimited swap
-      --restart string              Restart policy to apply when a container exits
-```
-
-The `docker update` command dynamically updates container configuration.
-You can use this command to prevent containers from consuming too many
-resources from their Docker host.  With a single command, you can place
-limits on a single container or on many. To specify more than one container,
-provide space-separated list of container names or IDs.
-
-With the exception of the `--kernel-memory` option, you can specify these
-options on a running or a stopped container. On kernel version older than
-4.6, you can only update `--kernel-memory` on a stopped container or on
-a running container with kernel memory initialized.
-
-## Examples
-
-The following sections illustrate ways to use this command.
-
-### Update a container's cpu-shares
-
-To limit a container's cpu-shares to 512, first identify the container
-name or ID. You can use `docker ps` to find these values. You can also
-use the ID returned from the `docker run` command.  Then, do the following:
-
-```bash
-$ docker update --cpu-shares 512 abebf7571666
-```
-
-### Update a container with cpu-shares and memory
-
-To update multiple resource configurations for multiple containers:
-
-```bash
-$ docker update --cpu-shares 512 -m 300M abebf7571666 hopeful_morse
-```
-
-### Update a container's kernel memory constraints
-
-You can update a container's kernel memory limit using the `--kernel-memory`
-option. On kernel version older than 4.6, this option can be updated on a
-running container only if the container was started with `--kernel-memory`.
-If the container was started *without* `--kernel-memory` you need to stop
-the container before updating kernel memory.
-
-For example, if you started a container with this command:
-
-```bash
-$ docker run -dit --name test --kernel-memory 50M ubuntu bash
-```
-
-You can update kernel memory while the container is running:
-
-```bash
-$ docker update --kernel-memory 80M test
-```
-
-If you started a container *without* kernel memory initialized:
-
-```bash
-$ docker run -dit --name test2 --memory 300M ubuntu bash
-```
-
-Update kernel memory of running container `test2` will fail. You need to stop
-the container before updating the `--kernel-memory` setting. The next time you
-start it, the container uses the new value.
-
-Kernel version newer than (include) 4.6 does not have this limitation, you
-can use `--kernel-memory` the same way as other options.
-
-### Update a container's restart policy
-
-You can change a container's restart policy on a running container. The new
-restart policy takes effect instantly after you run `docker update` on a
-container.
-
-To update restart policy for one or more containers:
-
-```bash
-$ docker update --restart=on-failure:3 abebf7571666 hopeful_morse
-```
-
-Note that if the container is started with "--rm" flag, you cannot update the restart
-policy for it. The `AutoRemove` and `RestartPolicy` are mutually exclusive for the
-container.
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/version.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/version.md
deleted file mode 100644
index cb1bcee5b3..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/version.md
+++ /dev/null
@@ -1,67 +0,0 @@
----
-title: "version"
-description: "The version command description and usage"
-keywords: "version, architecture, api"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# version
-
-```markdown
-Usage:  docker version [OPTIONS]
-
-Show the Docker version information
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-By default, this will render all version information in an easy to read
-layout. If a format is specified, the given template will be executed instead.
-
-Go's [text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-## Examples
-
-**Default output:**
-
-    $ docker version
-	Client:
-	 Version:      1.8.0
-	 API version:  1.20
-	 Go version:   go1.4.2
-	 Git commit:   f5bae0a
-	 Built:        Tue Jun 23 17:56:00 UTC 2015
-	 OS/Arch:      linux/amd64
-
-	Server:
-	 Version:      1.8.0
-	 API version:  1.20
-	 Go version:   go1.4.2
-	 Git commit:   f5bae0a
-	 Built:        Tue Jun 23 17:56:00 UTC 2015
-	 OS/Arch:      linux/amd64
-
-**Get server version:**
-
-    {% raw %}
-    $ docker version --format '{{.Server.Version}}'
-	1.8.0
-    {% endraw %}
-
-**Dump raw data:**
-
-    {% raw %}
-    $ docker version --format '{{json .}}'
-    {"Client":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"},"ServerOK":true,"Server":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","KernelVersion":"3.13.2-gentoo","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"}}
-    {% endraw %}
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_create.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_create.md
deleted file mode 100644
index 9b188a9500..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_create.md
+++ /dev/null
@@ -1,91 +0,0 @@
----
-title: "volume create"
-description: "The volume create command description and usage"
-keywords: "volume, create"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# volume create
-
-```markdown
-Usage:  docker volume create [OPTIONS] [VOLUME]
-
-Create a volume
-
-Options:
-  -d, --driver string   Specify volume driver name (default "local")
-      --help            Print usage
-      --label value     Set metadata for a volume (default [])
-  -o, --opt value       Set driver specific options (default map[])
-```
-
-Creates a new volume that containers can consume and store data in. If a name is not specified, Docker generates a random name. You create a volume and then configure the container to use it, for example:
-
-```bash
-$ docker volume create hello
-hello
-
-$ docker run -d -v hello:/world busybox ls /world
-```
-
-The mount is created inside the container's `/world` directory. Docker does not support relative paths for mount points inside the container.
-
-Multiple containers can use the same volume in the same time period. This is useful if two containers need access to shared data. For example, if one container writes and the other reads the data.
-
-Volume names must be unique among drivers.  This means you cannot use the same volume name with two different drivers.  If you attempt this `docker` returns an error:
-
-```
-A volume named  "hello"  already exists with the "some-other" driver. Choose a different volume name.
-```
-
-If you specify a volume name already in use on the current driver, Docker assumes you want to re-use the existing volume and does not return an error.   
-
-## Driver specific options
-
-Some volume drivers may take options to customize the volume creation. Use the `-o` or `--opt` flags to pass driver options:
-
-```bash
-$ docker volume create --driver fake --opt tardis=blue --opt timey=wimey
-```
-
-These options are passed directly to the volume driver. Options for
-different volume drivers may do different things (or nothing at all).
-
-The built-in `local` driver on Windows does not support any options.
-
-The built-in `local` driver on Linux accepts options similar to the linux `mount` command. You can provide multiple options by passing the `--opt` flag multiple times. Some `mount` options (such as the `o` option) can take a comma-separated list of options. Complete list of available mount options can be found [here](http://man7.org/linux/man-pages/man8/mount.8.html).
-
-For example, the following creates a `tmpfs` volume called `foo` with a size of 100 megabyte and `uid` of 1000.
-
-```bash
-$ docker volume create --driver local --opt type=tmpfs --opt device=tmpfs --opt o=size=100m,uid=1000 foo
-```
-
-Another example that uses `btrfs`:
-
-```bash
-$ docker volume create --driver local --opt type=btrfs --opt device=/dev/sda2 foo
-```
-
-Another example that uses `nfs` to mount the `/path/to/dir` in `rw` mode from `192.168.1.1`:
-
-```bash
-$ docker volume create --driver local --opt type=nfs --opt o=addr=192.168.1.1,rw --opt device=:/path/to/dir foo
-```
-
-
-## Related information
-
-* [volume inspect](volume_inspect.md)
-* [volume ls](volume_ls.md)
-* [volume rm](volume_rm.md)
-* [volume prune](volume_prune.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_inspect.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_inspect.md
deleted file mode 100644
index 98e0ee5abf..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_inspect.md
+++ /dev/null
@@ -1,59 +0,0 @@
----
-title: "volume inspect"
-description: "The volume inspect command description and usage"
-keywords: "volume, inspect"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# volume inspect
-
-```markdown
-Usage:  docker volume inspect [OPTIONS] VOLUME [VOLUME...]
-
-Display detailed information on one or more volumes
-
-Options:
-  -f, --format string   Format the output using the given Go template
-      --help            Print usage
-```
-
-Returns information about a volume. By default, this command renders all results
-in a JSON array. You can specify an alternate format to execute a
-given template for each result. Go's
-[text/template](http://golang.org/pkg/text/template/) package describes all the
-details of the format.
-
-Example output:
-
-    $ docker volume create
-    85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d
-    $ docker volume inspect 85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d
-    [
-      {
-          "Name": "85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d",
-          "Driver": "local",
-          "Mountpoint": "/var/lib/docker/volumes/85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d/_data",
-          "Status": null
-      }
-    ]
-
-    {% raw %}
-    $ docker volume inspect --format '{{ .Mountpoint }}' 85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d
-    /var/lib/docker/volumes/85bffb0677236974f93955d8ecc4df55ef5070117b0e53333cc1b443777be24d/_data
-    {% endraw %}
-
-## Related information
-
-* [volume create](volume_create.md)
-* [volume ls](volume_ls.md)
-* [volume rm](volume_rm.md)
-* [volume prune](volume_prune.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_ls.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_ls.md
deleted file mode 100644
index 90ecef2abe..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_ls.md
+++ /dev/null
@@ -1,183 +0,0 @@
----
-title: "volume ls"
-description: "The volume ls command description and usage"
-keywords: "volume, list"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# volume ls
-
-```markdown
-Usage:  docker volume ls [OPTIONS]
-
-List volumes
-
-Aliases:
-  ls, list
-
-Options:
-  -f, --filter value   Provide filter values (e.g. 'dangling=true') (default [])
-                       - dangling=<boolean> a volume if referenced or not
-                       - driver=<string> a volume's driver name
-                       - label=<key> or label=<key>=<value>
-                       - name=<string> a volume's name
-      --format string  Pretty-print volumes using a Go template
-      --help           Print usage
-  -q, --quiet          Only display volume names
-```
-
-List all the volumes Docker knows about. You can filter using the `-f` or `--filter` flag. Refer to the [filtering](#filtering) section for more information about available filter options.
-
-Example output:
-
-```bash
-$ docker volume create rosemary
-rosemary
-$docker volume create tyler
-tyler
-$ docker volume ls
-DRIVER              VOLUME NAME
-local               rosemary
-local               tyler
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is of "key=value". If there is more
-than one filter, then pass multiple flags (e.g., `--filter "foo=bar" --filter "bif=baz"`)
-
-The currently supported filters are:
-
-* dangling (boolean - true or false, 0 or 1)
-* driver (a volume driver's name)
-* label (`label=<key>` or `label=<key>=<value>`)
-* name (a volume's name)
-
-### dangling
-
-The `dangling` filter matches on all volumes not referenced by any containers
-
-```bash
-$ docker run -d  -v tyler:/tmpwork  busybox
-
-f86a7dd02898067079c99ceacd810149060a70528eff3754d0b0f1a93bd0af18
-$ docker volume ls -f dangling=true
-DRIVER              VOLUME NAME
-local               rosemary
-```
-
-### driver
-
-The `driver` filter matches on all or part of a volume's driver name.
-
-The following filter matches all volumes with a driver name containing the `local` string.
-
-```bash
-$ docker volume ls -f driver=local
-
-DRIVER              VOLUME NAME
-local               rosemary
-local               tyler
-```
-
-#### Label
-
-The `label` filter matches volumes based on the presence of a `label` alone or
-a `label` and a value.
-
-First, let's create some volumes to illustrate this;
-
-```bash
-$ docker volume create the-doctor --label is-timelord=yes
-the-doctor
-$ docker volume create daleks --label is-timelord=no
-daleks
-```
-
-The following example filter matches volumes with the `is-timelord` label
-regardless of its value.
-
-```bash
-$ docker volume ls --filter label=is-timelord
-
-DRIVER              VOLUME NAME
-local               daleks
-local               the-doctor
-```
-
-As can be seen in the above example, both volumes with `is-timelord=yes`, and
-`is-timelord=no` are returned.
-
-Filtering on both `key` *and* `value` of the label, produces the expected result:
-
-```bash
-$ docker volume ls --filter label=is-timelord=yes
-
-DRIVER              VOLUME NAME
-local               the-doctor
-```
-
-Specifying multiple label filter produces an "and" search; all conditions
-should be met;
-
-```bash
-$ docker volume ls --filter label=is-timelord=yes --filter label=is-timelord=no
-
-DRIVER              VOLUME NAME
-```
-
-### name
-
-The `name` filter matches on all or part of a volume's name.
-
-The following filter matches all volumes with a name containing the `rose` string.
-
-    $ docker volume ls -f name=rose
-    DRIVER              VOLUME NAME
-    local               rosemary
-
-## Formatting
-
-The formatting options (`--format`) pretty-prints volumes output
-using a Go template.
-
-Valid placeholders for the Go template are listed below:
-
-Placeholder   | Description
---------------|------------------------------------------------------------------------------------------
-`.Name`       | Network name
-`.Driver`     | Network driver
-`.Scope`      | Network scope (local, global)
-`.Mountpoint` | Whether the network is internal or not.
-`.Labels`     | All labels assigned to the volume.
-`.Label`      | Value of a specific label for this volume. For example `{{.Label "project.version"}}`
-
-When using the `--format` option, the `volume ls` command will either
-output the data exactly as the template declares or, when using the
-`table` directive, includes column headers as well.
-
-The following example uses a template without headers and outputs the
-`Name` and `Driver` entries separated by a colon for all volumes:
-
-```bash
-$ docker volume ls --format "{{.Name}}: {{.Driver}}"
-vol1: local
-vol2: local
-vol3: local
-```
-
-## Related information
-
-* [volume create](volume_create.md)
-* [volume inspect](volume_inspect.md)
-* [volume rm](volume_rm.md)
-* [volume prune](volume_prune.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_prune.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_prune.md
deleted file mode 100644
index d910a49cdc..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_prune.md
+++ /dev/null
@@ -1,54 +0,0 @@
----
-title: "volume prune"
-description: "Remove unused volumes"
-keywords: "volume, prune, delete"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# volume prune
-
-```markdown
-Usage:	docker volume prune [OPTIONS]
-
-Remove all unused volumes
-
-Options:
-  -f, --force   Do not prompt for confirmation
-      --help    Print usage
-```
-
-Remove all unused volumes. Unused volumes are those which are not referenced by any containers
-
-Example output:
-
-```bash
-$ docker volume prune
-WARNING! This will remove all volumes not used by at least one container.
-Are you sure you want to continue? [y/N] y
-Deleted Volumes:
-07c7bdf3e34ab76d921894c2b834f073721fccfbbcba792aa7648e3a7a664c2e
-my-named-vol
-
-Total reclaimed space: 36 B
-```
-
-## Related information
-
-* [volume create](volume_create.md)
-* [volume ls](volume_ls.md)
-* [volume inspect](volume_inspect.md)
-* [volume rm](volume_rm.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
-* [system df](system_df.md)
-* [container prune](container_prune.md)
-* [image prune](image_prune.md)
-* [network prune](network_prune.md)
-* [system prune](system_prune.md)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_rm.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_rm.md
deleted file mode 100644
index 1bf9dba220..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/volume_rm.md
+++ /dev/null
@@ -1,42 +0,0 @@
----
-title: "volume rm"
-description: "the volume rm command description and usage"
-keywords: "volume, rm"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# volume rm
-
-```markdown
-Usage:  docker volume rm [OPTIONS] VOLUME [VOLUME...]
-
-Remove one or more volumes
-
-Aliases:
-  rm, remove
-
-Options:
-  -f, --force  Force the removal of one or more volumes
-      --help   Print usage
-```
-
-Remove one or more volumes. You cannot remove a volume that is in use by a container.
-
-    $ docker volume rm hello
-    hello
-
-## Related information
-
-* [volume create](volume_create.md)
-* [volume inspect](volume_inspect.md)
-* [volume ls](volume_ls.md)
-* [volume prune](volume_prune.md)
-* [Understand Data Volumes](https://docs.docker.com/engine/tutorials/dockervolumes/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/commandline/wait.md b/installer/vendor/github.com/docker/docker/docs/reference/commandline/wait.md
deleted file mode 100644
index a07b82b071..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/commandline/wait.md
+++ /dev/null
@@ -1,25 +0,0 @@
----
-title: "wait"
-description: "The wait command description and usage"
-keywords: "container, stop, wait"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# wait
-
-```markdown
-Usage:  docker wait CONTAINER [CONTAINER...]
-
-Block until one or more containers stop, then print their exit codes
-
-Options:
-      --help   Print usage
-```
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/glossary.md b/installer/vendor/github.com/docker/docker/docs/reference/glossary.md
deleted file mode 100644
index 0bc39a2023..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/glossary.md
+++ /dev/null
@@ -1,286 +0,0 @@
----
-title: "Docker Glossary"
-description: "Glossary of terms used around Docker"
-keywords: "glossary, docker, terms, definitions"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Glossary
-
-A list of terms used around the Docker project.
-
-## aufs
-
-aufs (advanced multi layered unification filesystem) is a Linux [filesystem](#filesystem) that
-Docker supports as a storage backend. It implements the
-[union mount](http://en.wikipedia.org/wiki/Union_mount) for Linux file systems.
-
-## base image
-
-An image that has no parent is a **base image**.
-
-## boot2docker
-
-[boot2docker](http://boot2docker.io/) is a lightweight Linux distribution made
-specifically to run Docker containers. The boot2docker management tool for Mac and Windows was deprecated and replaced by [`docker-machine`](#machine) which you can install with the Docker Toolbox.
-
-## btrfs
-
-btrfs (B-tree file system) is a Linux [filesystem](#filesystem) that Docker
-supports as a storage backend. It is a [copy-on-write](http://en.wikipedia.org/wiki/Copy-on-write)
-filesystem.
-
-## build
-
-build is the process of building Docker images using a [Dockerfile](#dockerfile).
-The build uses a Dockerfile and a "context". The context is the set of files in the
-directory in which the image is built.
-
-## cgroups
-
-cgroups is a Linux kernel feature that limits, accounts for, and isolates
-the resource usage (CPU, memory, disk I/O, network, etc.) of a collection
-of processes. Docker relies on cgroups to control and isolate resource limits.
-
-*Also known as : control groups*
-
-## Compose
-
-[Compose](https://github.com/docker/compose) is a tool for defining and
-running complex applications with Docker. With compose, you define a
-multi-container application in a single file, then spin your
-application up in a single command which does everything that needs to
-be done to get it running.
-
-*Also known as : docker-compose, fig*
-
-## container
-
-A container is a runtime instance of a [docker image](#image).
-
-A Docker container consists of
-
-- A Docker image
-- Execution environment
-- A standard set of instructions
-
-The concept is borrowed from Shipping Containers, which define a standard to ship
-goods globally. Docker defines a standard to ship software.
-
-## data volume
-
-A data volume is a specially-designated directory within one or more containers
-that bypasses the Union File System. Data volumes are designed to persist data,
-independent of the container's life cycle. Docker therefore never automatically
-delete volumes when you remove a container, nor will it "garbage collect"
-volumes that are no longer referenced by a container.
-
-
-## Docker
-
-The term Docker can refer to
-
-- The Docker project as a whole, which is a platform for developers and sysadmins to
-develop, ship, and run applications
-- The docker daemon process running on the host which manages images and containers
-
-
-## Docker Hub
-
-The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with
-Docker and its components. It provides the following services:
-
-- Docker image hosting
-- User authentication
-- Automated image builds and work-flow tools such as build triggers and web hooks
-- Integration with GitHub and Bitbucket
-
-
-## Dockerfile
-
-A Dockerfile is a text document that contains all the commands you would
-normally execute manually in order to build a Docker image. Docker can
-build images automatically by reading the instructions from a Dockerfile.
-
-## filesystem
-
-A file system is the method an operating system uses to name files
-and assign them locations for efficient storage and retrieval.
-
-Examples :
-
-- Linux : ext4, aufs, btrfs, zfs
-- Windows : NTFS
-- macOS : HFS+
-
-## image
-
-Docker images are the basis of [containers](#container). An Image is an
-ordered collection of root filesystem changes and the corresponding
-execution parameters for use within a container runtime. An image typically
-contains a union of layered filesystems stacked on top of each other. An image
-does not have state and it never changes.
-
-## libcontainer
-
-libcontainer provides a native Go implementation for creating containers with
-namespaces, cgroups, capabilities, and filesystem access controls. It allows
-you to manage the lifecycle of the container performing additional operations
-after the container is created.
-
-## libnetwork
-
-libnetwork provides a native Go implementation for creating and managing container
-network namespaces and other network resources. It manage the networking lifecycle
-of the container performing additional operations after the container is created.
-
-## link
-
-links provide a legacy interface to connect Docker containers running on the
-same host to each other without exposing the hosts' network ports. Use the
-Docker networks feature instead.
-
-## Machine
-
-[Machine](https://github.com/docker/machine) is a Docker tool which
-makes it really easy to create Docker hosts on  your computer, on
-cloud providers and inside your own data center. It creates servers,
-installs Docker on them, then configures the Docker client to talk to them.
-
-*Also known as : docker-machine*
-
-## node
-
-A [node](https://docs.docker.com/engine/swarm/how-swarm-mode-works/nodes/) is a physical or virtual
-machine running an instance of the Docker Engine in swarm mode.
-
-**Manager nodes** perform swarm management and orchestration duties. By default
-manager nodes are also worker nodes.
-
-**Worker nodes** execute tasks.
-
-## overlay network driver
-
-Overlay network driver provides out of the box multi-host network connectivity
-for docker containers in a cluster.
-
-## overlay storage driver
-
-OverlayFS is a [filesystem](#filesystem) service for Linux which implements a
-[union mount](http://en.wikipedia.org/wiki/Union_mount) for other file systems.
-It is supported by the Docker daemon as a storage driver.
-
-## registry
-
-A Registry is a hosted service containing [repositories](#repository) of [images](#image)
-which responds to the Registry API.
-
-The default registry can be accessed using a browser at [Docker Hub](#docker-hub)
-or using the `docker search` command.
-
-## repository
-
-A repository is a set of Docker images. A repository can be shared by pushing it
-to a [registry](#registry) server. The different images in the repository can be
-labeled using [tags](#tag).
-
-Here is an example of the shared [nginx repository](https://hub.docker.com/_/nginx/)
-and its [tags](https://hub.docker.com/r/library/nginx/tags/)
-
-
-## service
-
-A [service](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/) is the definition of how
-you want to run your application containers in a swarm. At the most basic level
-a service  defines which container image to run in the swarm and which commands
-to run in the container. For orchestration purposes, the service defines the
-"desired state", meaning how many containers to run as tasks and constraints for
-deploying the containers.
-
-Frequently a service is a microservice within the context of some larger
-application. Examples of services might include an HTTP server, a database, or
-any other type of executable program that you wish to run in a distributed
-environment.
-
-## service discovery
-
-Swarm mode [service discovery](https://docs.docker.com/engine/swarm/networking/#use-swarm-mode-service-discovery) is a DNS component
-internal to the swarm that automatically assigns each service on an overlay
-network in the swarm a VIP and DNS entry. Containers on the network share DNS
-mappings for the service via gossip so any container on the network can access
-the service via its service name.
-
-You don’t need to expose service-specific ports to make the service available to
-other services on the same overlay network. The swarm’s internal load balancer
-automatically distributes requests to the service VIP among the active tasks.
-
-## swarm
-
-A [swarm](https://docs.docker.com/engine/swarm/) is a cluster of one or more Docker Engines running in [swarm mode](#swarm-mode).
-
-## Docker Swarm
-
-Do not confuse [Docker Swarm](https://github.com/docker/swarm) with the [swarm mode](#swarm-mode) features in Docker Engine.
-
-Docker Swarm is the name of a standalone native clustering tool for Docker.
-Docker Swarm pools together several Docker hosts and exposes them as a single
-virtual Docker host. It serves the standard Docker API, so any tool that already
-works with Docker can now transparently scale up to multiple hosts.
-
-*Also known as : docker-swarm*
-
-## swarm mode
-
-[Swarm mode](https://docs.docker.com/engine/swarm/) refers to cluster management and orchestration
-features embedded in Docker Engine. When you initialize a new swarm (cluster) or
-join nodes to a swarm, the Docker Engine runs in swarm mode.
-
-## tag
-
-A tag is a label applied to a Docker image in a [repository](#repository).
-tags are how various images in a repository are distinguished from each other.
-
-*Note : This label is not related to the key=value labels set for docker daemon*
-
-## task
-
-A [task](https://docs.docker.com/engine/swarm/how-swarm-mode-works/services/#/tasks-and-scheduling) is the
-atomic unit of scheduling within a swarm. A task carries a Docker container and
-the commands to run inside the container. Manager nodes assign tasks to worker
-nodes according to the number of replicas set in the service scale.
-
-The diagram below illustrates the relationship of services to tasks and
-containers.
-
-![services diagram](https://docs.docker.com/engine/swarm/images/services-diagram.png)
-
-## Toolbox
-
-Docker Toolbox is the installer for Mac and Windows users.
-
-
-## Union file system
-
-Union file systems, or UnionFS, are file systems that operate by creating layers, making them
-very lightweight and fast. Docker uses union file systems to provide the building
-blocks for containers.
-
-
-## virtual machine
-
-A virtual machine is a program that emulates a complete computer and imitates dedicated hardware.
-It shares physical hardware resources with other users but isolates the operating system. The
-end user has the same experience on a Virtual Machine as they would have on dedicated hardware.
-
-Compared to containers, a virtual machine is heavier to run, provides more isolation,
-gets its own set of resources and does minimal sharing.
-
-*Also known as : VM*
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/index.md b/installer/vendor/github.com/docker/docker/docs/reference/index.md
deleted file mode 100644
index f24c342dfc..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/index.md
+++ /dev/null
@@ -1,21 +0,0 @@
----
-title: "Engine reference"
-description: "Docker Engine reference"
-keywords: "Engine"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Engine reference
-
-* [Dockerfile reference](builder.md)
-* [Docker run reference](run.md)
-* [Command line reference](commandline/index.md)
-* [API Reference](https://docs.docker.com/engine/api/)
diff --git a/installer/vendor/github.com/docker/docker/docs/reference/run.md b/installer/vendor/github.com/docker/docker/docs/reference/run.md
deleted file mode 100644
index 73769ed610..0000000000
--- a/installer/vendor/github.com/docker/docker/docs/reference/run.md
+++ /dev/null
@@ -1,1555 +0,0 @@
----
-title: "Docker run reference"
-description: "Configure containers at runtime"
-keywords: "docker, run, configure, runtime"
----
-
-<!-- This file is maintained within the docker/docker Github
-     repository at https://github.com/docker/docker/. Make all
-     pull requests against that repo. If you see this file in
-     another repository, consider it read-only there, as it will
-     periodically be overwritten by the definitive file. Pull
-     requests which include edits to this file in other repositories
-     will be rejected.
--->
-
-# Docker run reference
-
-Docker runs processes in isolated containers. A container is a process
-which runs on a host. The host may be local or remote. When an operator
-executes `docker run`, the container process that runs is isolated in
-that it has its own file system, its own networking, and its own
-isolated process tree separate from the host.
-
-This page details how to use the `docker run` command to define the
-container's resources at runtime.
-
-## General form
-
-The basic `docker run` command takes this form:
-
-    $ docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [COMMAND] [ARG...]
-
-The `docker run` command must specify an [*IMAGE*](glossary.md#image)
-to derive the container from. An image developer can define image
-defaults related to:
-
- * detached or foreground running
- * container identification
- * network settings
- * runtime constraints on CPU and memory
-
-With the `docker run [OPTIONS]` an operator can add to or override the
-image defaults set by a developer. And, additionally, operators can
-override nearly all the defaults set by the Docker runtime itself. The
-operator's ability to override image and Docker runtime defaults is why
-[*run*](commandline/run.md) has more options than any
-other `docker` command.
-
-To learn how to interpret the types of `[OPTIONS]`, see [*Option
-types*](commandline/cli.md#option-types).
-
-> **Note**: Depending on your Docker system configuration, you may be
-> required to preface the `docker run` command with `sudo`. To avoid
-> having to use `sudo` with the `docker` command, your system
-> administrator can create a Unix group called `docker` and add users to
-> it. For more information about this configuration, refer to the Docker
-> installation documentation for your operating system.
-
-
-## Operator exclusive options
-
-Only the operator (the person executing `docker run`) can set the
-following options.
-
- - [Detached vs foreground](#detached-vs-foreground)
-     - [Detached (-d)](#detached--d)
-     - [Foreground](#foreground)
- - [Container identification](#container-identification)
-     - [Name (--name)](#name---name)
-     - [PID equivalent](#pid-equivalent)
- - [IPC settings (--ipc)](#ipc-settings---ipc)
- - [Network settings](#network-settings)
- - [Restart policies (--restart)](#restart-policies---restart)
- - [Clean up (--rm)](#clean-up---rm)
- - [Runtime constraints on resources](#runtime-constraints-on-resources)
- - [Runtime privilege and Linux capabilities](#runtime-privilege-and-linux-capabilities)
-
-## Detached vs foreground
-
-When starting a Docker container, you must first decide if you want to
-run the container in the background in a "detached" mode or in the
-default foreground mode:
-
-    -d=false: Detached mode: Run container in the background, print new container id
-
-### Detached (-d)
-
-To start a container in detached mode, you use `-d=true` or just `-d` option. By
-design, containers started in detached mode exit when the root process used to
-run the container exits. A container in detached mode cannot be automatically
-removed when it stops, this means you cannot use the `--rm` option with `-d` option.
-
-Do not pass a `service x start` command to a detached container. For example, this
-command attempts to start the `nginx` service.
-
-    $ docker run -d -p 80:80 my_image service nginx start
-
-This succeeds in starting the `nginx` service inside the container. However, it
-fails the detached container paradigm in that, the root process (`service nginx
-start`) returns and the detached container stops as designed. As a result, the
-`nginx` service is started but could not be used. Instead, to start a process
-such as the `nginx` web server do the following:
-
-    $ docker run -d -p 80:80 my_image nginx -g 'daemon off;'
-
-To do input/output with a detached container use network connections or shared
-volumes. These are required because the container is no longer listening to the
-command line where `docker run` was run.
-
-To reattach to a detached container, use `docker`
-[*attach*](commandline/attach.md) command.
-
-### Foreground
-
-In foreground mode (the default when `-d` is not specified), `docker
-run` can start the process in the container and attach the console to
-the process's standard input, output, and standard error. It can even
-pretend to be a TTY (this is what most command line executables expect)
-and pass along signals. All of that is configurable:
-
-    -a=[]           : Attach to `STDIN`, `STDOUT` and/or `STDERR`
-    -t              : Allocate a pseudo-tty
-    --sig-proxy=true: Proxy all received signals to the process (non-TTY mode only)
-    -i              : Keep STDIN open even if not attached
-
-If you do not specify `-a` then Docker will [attach to both stdout and stderr
-]( https://github.com/docker/docker/blob/4118e0c9eebda2412a09ae66e90c34b85fae3275/runconfig/opts/parse.go#L267).
-You can specify to which of the three standard streams (`STDIN`, `STDOUT`,
-`STDERR`) you'd like to connect instead, as in:
-
-    $ docker run -a stdin -a stdout -i -t ubuntu /bin/bash
-
-For interactive processes (like a shell), you must use `-i -t` together in
-order to allocate a tty for the container process. `-i -t` is often written `-it`
-as you'll see in later examples.  Specifying `-t` is forbidden when the client
-standard output is redirected or piped, such as in:
-
-    $ echo test | docker run -i busybox cat
-
->**Note**: A process running as PID 1 inside a container is treated
->specially by Linux: it ignores any signal with the default action.
->So, the process will not terminate on `SIGINT` or `SIGTERM` unless it is
->coded to do so.
-
-## Container identification
-
-### Name (--name)
-
-The operator can identify a container in three ways:
-
-| Identifier type       | Example value                                                      |
-| --------------------- | ------------------------------------------------------------------ |
-| UUID long identifier  | "f78375b1c487e03c9438c729345e54db9d20cfa2ac1fc3494b6eb60872e74778" |
-| UUID short identifier | "f78375b1c487"                                                     |
-| Name                  | "evil_ptolemy"                                                     |
-
-The UUID identifiers come from the Docker daemon. If you do not assign a
-container name with the `--name` option, then the daemon generates a random
-string name for you. Defining a `name` can be a handy way to add meaning to a
-container. If you specify a `name`, you can use it  when referencing the
-container within a Docker network. This works for both background and foreground
-Docker containers.
-
-> **Note**: Containers on the default bridge network must be linked to
-> communicate by name.
-
-### PID equivalent
-
-Finally, to help with automation, you can have Docker write the
-container ID out to a file of your choosing. This is similar to how some
-programs might write out their process ID to a file (you've seen them as
-PID files):
-
-    --cidfile="": Write the container ID to the file
-
-### Image[:tag]
-
-While not strictly a means of identifying a container, you can specify a version of an
-image you'd like to run the container with by adding `image[:tag]` to the command. For
-example, `docker run ubuntu:14.04`.
-
-### Image[@digest]
-
-Images using the v2 or later image format have a content-addressable identifier
-called a digest. As long as the input used to generate the image is unchanged,
-the digest value is predictable and referenceable.
-
-The following example runs a container from the `alpine` image with the
-`sha256:9cacb71397b640eca97488cf08582ae4e4068513101088e9f96c9814bfda95e0` digest:
-
-    $ docker run alpine@sha256:9cacb71397b640eca97488cf08582ae4e4068513101088e9f96c9814bfda95e0 date
-
-## PID settings (--pid)
-
-    --pid=""  : Set the PID (Process) Namespace mode for the container,
-                 'container:<name|id>': joins another container's PID namespace
-                 'host': use the host's PID namespace inside the container
-
-By default, all containers have the PID namespace enabled.
-
-PID namespace provides separation of processes. The PID Namespace removes the
-view of the system processes, and allows process ids to be reused including
-pid 1.
-
-In certain cases you want your container to share the host's process namespace,
-basically allowing processes within the container to see all of the processes
-on the system.  For example, you could build a container with debugging tools
-like `strace` or `gdb`, but want to use these tools when debugging processes
-within the container.
-
-### Example: run htop inside a container
-
-Create this Dockerfile:
-
-```
-FROM alpine:latest
-RUN apk add --update htop && rm -rf /var/cache/apk/*
-CMD ["htop"]
-```
-
-Build the Dockerfile and tag the image as `myhtop`:
-
-```bash
-$ docker build -t myhtop .
-```
-
-Use the following command to run `htop` inside a container:
-
-```
-$ docker run -it --rm --pid=host myhtop
-```
-
-Joining another container's pid namespace can be used for debugging that container.
-
-### Example
-
-Start a container running a redis server:
-
-```bash
-$ docker run --name my-redis -d redis
-```
-
-Debug the redis container by running another container that has strace in it:
-
-```bash
-$ docker run -it --pid=container:my-redis my_strace_docker_image bash
-$ strace -p 1
-```
-
-## UTS settings (--uts)
-
-    --uts=""  : Set the UTS namespace mode for the container,
-           'host': use the host's UTS namespace inside the container
-
-The UTS namespace is for setting the hostname and the domain that is visible
-to running processes in that namespace.  By default, all containers, including
-those with `--network=host`, have their own UTS namespace.  The `host` setting will
-result in the container using the same UTS namespace as the host.  Note that
-`--hostname` is invalid in `host` UTS mode.
-
-You may wish to share the UTS namespace with the host if you would like the
-hostname of the container to change as the hostname of the host changes.  A
-more advanced use case would be changing the host's hostname from a container.
-
-## IPC settings (--ipc)
-
-    --ipc=""  : Set the IPC mode for the container,
-                 'container:<name|id>': reuses another container's IPC namespace
-                 'host': use the host's IPC namespace inside the container
-
-By default, all containers have the IPC namespace enabled.
-
-IPC (POSIX/SysV IPC) namespace provides separation of named shared memory
-segments, semaphores and message queues.
-
-Shared memory segments are used to accelerate inter-process communication at
-memory speed, rather than through pipes or through the network stack. Shared
-memory is commonly used by databases and custom-built (typically C/OpenMPI,
-C++/using boost libraries) high performance applications for scientific
-computing and financial services industries. If these types of applications
-are broken into multiple containers, you might need to share the IPC mechanisms
-of the containers.
-
-## Network settings
-
-    --dns=[]           : Set custom dns servers for the container
-    --network="bridge" : Connect a container to a network
-                          'bridge': create a network stack on the default Docker bridge
-                          'none': no networking
-                          'container:<name|id>': reuse another container's network stack
-                          'host': use the Docker host network stack
-                          '<network-name>|<network-id>': connect to a user-defined network
-    --network-alias=[] : Add network-scoped alias for the container
-    --add-host=""      : Add a line to /etc/hosts (host:IP)
-    --mac-address=""   : Sets the container's Ethernet device's MAC address
-    --ip=""            : Sets the container's Ethernet device's IPv4 address
-    --ip6=""           : Sets the container's Ethernet device's IPv6 address
-    --link-local-ip=[] : Sets one or more container's Ethernet device's link local IPv4/IPv6 addresses
-
-By default, all containers have networking enabled and they can make any
-outgoing connections. The operator can completely disable networking
-with `docker run --network none` which disables all incoming and outgoing
-networking. In cases like this, you would perform I/O through files or
-`STDIN` and `STDOUT` only.
-
-Publishing ports and linking to other containers only works with the default (bridge). The linking feature is a legacy feature. You should always prefer using Docker network drivers over linking.
-
-Your container will use the same DNS servers as the host by default, but
-you can override this with `--dns`.
-
-By default, the MAC address is generated using the IP address allocated to the
-container. You can set the container's MAC address explicitly by providing a
-MAC address via the `--mac-address` parameter (format:`12:34:56:78:9a:bc`).Be
-aware that Docker does not check if manually specified MAC addresses are unique.
-
-Supported networks :
-
-<table>
-  <thead>
-    <tr>
-      <th class="no-wrap">Network</th>
-      <th>Description</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td class="no-wrap"><strong>none</strong></td>
-      <td>
-        No networking in the container.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>bridge</strong> (default)</td>
-      <td>
-        Connect the container to the bridge via veth interfaces.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>host</strong></td>
-      <td>
-        Use the host's network stack inside the container.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>container</strong>:&lt;name|id&gt;</td>
-      <td>
-        Use the network stack of another container, specified via
-        its <i>name</i> or <i>id</i>.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>NETWORK</strong></td>
-      <td>
-        Connects the container to a user created network (using <code>docker network create</code> command)
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-#### Network: none
-
-With the network is `none` a container will not have
-access to any external routes.  The container will still have a
-`loopback` interface enabled in the container but it does not have any
-routes to external traffic.
-
-#### Network: bridge
-
-With the network set to `bridge` a container will use docker's
-default networking setup.  A bridge is setup on the host, commonly named
-`docker0`, and a pair of `veth` interfaces will be created for the
-container.  One side of the `veth` pair will remain on the host attached
-to the bridge while the other side of the pair will be placed inside the
-container's namespaces in addition to the `loopback` interface.  An IP
-address will be allocated for containers on the bridge's network and
-traffic will be routed though this bridge to the container.
-
-Containers can communicate via their IP addresses by default. To communicate by
-name, they must be linked.
-
-#### Network: host
-
-With the network set to `host` a container will share the host's
-network stack and all interfaces from the host will be available to the
-container.  The container's hostname will match the hostname on the host
-system. Note that `--mac-address` is invalid in `host` netmode. Even in `host`
-network mode a container has its own UTS namespace by default. As such
-`--hostname` is allowed in `host` network mode and will only change the
-hostname inside the container.
-Similar to `--hostname`, the `--add-host`, `--dns`, `--dns-search`, and
-`--dns-option` options can be used in `host` network mode. These options update
-`/etc/hosts` or `/etc/resolv.conf` inside the container. No change are made to
-`/etc/hosts` and `/etc/resolv.conf` on the host.
-
-Compared to the default `bridge` mode, the `host` mode gives *significantly*
-better networking performance since it uses the host's native networking stack
-whereas the bridge has to go through one level of virtualization through the
-docker daemon. It is recommended to run containers in this mode when their
-networking performance is critical, for example, a production Load Balancer
-or a High Performance Web Server.
-
-> **Note**: `--network="host"` gives the container full access to local system
-> services such as D-bus and is therefore considered insecure.
-
-#### Network: container
-
-With the network set to `container` a container will share the
-network stack of another container.  The other container's name must be
-provided in the format of `--network container:<name|id>`. Note that `--add-host`
-`--hostname` `--dns` `--dns-search` `--dns-option` and `--mac-address` are
-invalid in `container` netmode, and `--publish` `--publish-all` `--expose` are
-also invalid in `container` netmode.
-
-Example running a Redis container with Redis binding to `localhost` then
-running the `redis-cli` command and connecting to the Redis server over the
-`localhost` interface.
-
-    $ docker run -d --name redis example/redis --bind 127.0.0.1
-    $ # use the redis container's network stack to access localhost
-    $ docker run --rm -it --network container:redis example/redis-cli -h 127.0.0.1
-
-#### User-defined network
-
-You can create a network using a Docker network driver or an external network
-driver plugin. You can connect multiple containers to the same network. Once
-connected to a user-defined network, the containers can communicate easily using
-only another container's IP address or name.
-
-For `overlay` networks or custom plugins that support multi-host connectivity,
-containers connected to the same multi-host network but launched from different
-Engines can also communicate in this way.
-
-The following example creates a network using the built-in `bridge` network
-driver and running a container in the created network
-
-```
-$ docker network create -d bridge my-net
-$ docker run --network=my-net -itd --name=container3 busybox
-```
-
-### Managing /etc/hosts
-
-Your container will have lines in `/etc/hosts` which define the hostname of the
-container itself as well as `localhost` and a few other common things. The
-`--add-host` flag can be used to add additional lines to `/etc/hosts`.
-
-    $ docker run -it --add-host db-static:86.75.30.9 ubuntu cat /etc/hosts
-    172.17.0.22     09d03f76bf2c
-    fe00::0         ip6-localnet
-    ff00::0         ip6-mcastprefix
-    ff02::1         ip6-allnodes
-    ff02::2         ip6-allrouters
-    127.0.0.1       localhost
-    ::1	            localhost ip6-localhost ip6-loopback
-    86.75.30.9      db-static
-
-If a container is connected to the default bridge network and `linked`
-with other containers, then the container's `/etc/hosts` file is updated
-with the linked container's name.
-
-If the container is connected to user-defined network, the container's
-`/etc/hosts` file is updated with names of all other containers in that
-user-defined network.
-
-> **Note** Since Docker may live update the container’s `/etc/hosts` file, there
-may be situations when processes inside the container can end up reading an
-empty or incomplete `/etc/hosts` file. In most cases, retrying the read again
-should fix the problem.
-
-## Restart policies (--restart)
-
-Using the `--restart` flag on Docker run you can specify a restart policy for
-how a container should or should not be restarted on exit.
-
-When a restart policy is active on a container, it will be shown as either `Up`
-or `Restarting` in [`docker ps`](commandline/ps.md). It can also be
-useful to use [`docker events`](commandline/events.md) to see the
-restart policy in effect.
-
-Docker supports the following restart policies:
-
-<table>
-  <thead>
-    <tr>
-      <th>Policy</th>
-      <th>Result</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td><strong>no</strong></td>
-      <td>
-        Do not automatically restart the container when it exits. This is the
-        default.
-      </td>
-    </tr>
-    <tr>
-      <td>
-        <span style="white-space: nowrap">
-          <strong>on-failure</strong>[:max-retries]
-        </span>
-      </td>
-      <td>
-        Restart only if the container exits with a non-zero exit status.
-        Optionally, limit the number of restart retries the Docker
-        daemon attempts.
-      </td>
-    </tr>
-    <tr>
-      <td><strong>always</strong></td>
-      <td>
-        Always restart the container regardless of the exit status.
-        When you specify always, the Docker daemon will try to restart
-        the container indefinitely. The container will also always start
-        on daemon startup, regardless of the current state of the container.
-      </td>
-    </tr>
-    <tr>
-      <td><strong>unless-stopped</strong></td>
-      <td>
-        Always restart the container regardless of the exit status, but
-        do not start it on daemon startup if the container has been put
-        to a stopped state before.
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-An ever increasing delay (double the previous delay, starting at 100
-milliseconds) is added before each restart to prevent flooding the server.
-This means the daemon will wait for 100 ms, then 200 ms, 400, 800, 1600,
-and so on until either the `on-failure` limit is hit, or when you `docker stop`
-or `docker rm -f` the container.
-
-If a container is successfully restarted (the container is started and runs
-for at least 10 seconds), the delay is reset to its default value of 100 ms.
-
-You can specify the maximum amount of times Docker will try to restart the
-container when using the **on-failure** policy.  The default is that Docker
-will try forever to restart the container. The number of (attempted) restarts
-for a container can be obtained via [`docker inspect`](commandline/inspect.md). For example, to get the number of restarts
-for container "my-container";
-
-    {% raw %}
-    $ docker inspect -f "{{ .RestartCount }}" my-container
-    # 2
-    {% endraw %}
-
-Or, to get the last time the container was (re)started;
-
-    {% raw %}
-    $ docker inspect -f "{{ .State.StartedAt }}" my-container
-    # 2015-03-04T23:47:07.691840179Z
-    {% endraw %}
-
-
-Combining `--restart` (restart policy) with the `--rm` (clean up) flag results
-in an error. On container restart, attached clients are disconnected. See the
-examples on using the [`--rm` (clean up)](#clean-up-rm) flag later in this page.
-
-### Examples
-
-    $ docker run --restart=always redis
-
-This will run the `redis` container with a restart policy of **always**
-so that if the container exits, Docker will restart it.
-
-    $ docker run --restart=on-failure:10 redis
-
-This will run the `redis` container with a restart policy of **on-failure**
-and a maximum restart count of 10.  If the `redis` container exits with a
-non-zero exit status more than 10 times in a row Docker will abort trying to
-restart the container. Providing a maximum restart limit is only valid for the
-**on-failure** policy.
-
-## Exit Status
-
-The exit code from `docker run` gives information about why the container
-failed to run or why it exited.  When `docker run` exits with a non-zero code,
-the exit codes follow the `chroot` standard, see below:
-
-**_125_** if the error is with Docker daemon **_itself_**
-
-    $ docker run --foo busybox; echo $?
-    # flag provided but not defined: --foo
-      See 'docker run --help'.
-      125
-
-**_126_** if the **_contained command_** cannot be invoked
-
-    $ docker run busybox /etc; echo $?
-    # docker: Error response from daemon: Container command '/etc' could not be invoked.
-      126
-
-**_127_** if the **_contained command_** cannot be found
-
-    $ docker run busybox foo; echo $?
-    # docker: Error response from daemon: Container command 'foo' not found or does not exist.
-      127
-
-**_Exit code_** of **_contained command_** otherwise
-
-    $ docker run busybox /bin/sh -c 'exit 3'; echo $?
-    # 3
-
-## Clean up (--rm)
-
-By default a container's file system persists even after the container
-exits. This makes debugging a lot easier (since you can inspect the
-final state) and you retain all your data by default. But if you are
-running short-term **foreground** processes, these container file
-systems can really pile up. If instead you'd like Docker to
-**automatically clean up the container and remove the file system when
-the container exits**, you can add the `--rm` flag:
-
-    --rm=false: Automatically remove the container when it exits (incompatible with -d)
-
-> **Note**: When you set the `--rm` flag, Docker also removes the volumes
-associated with the container when the container is removed. This is similar
-to running `docker rm -v my-container`. Only volumes that are specified without a
-name are removed. For example, with
-`docker run --rm -v /foo -v awesome:/bar busybox top`, the volume for `/foo` will be removed,
-but the volume for `/bar` will not. Volumes inherited via `--volumes-from` will be removed
-with the same logic -- if the original volume was specified with a name it will **not** be removed.
-
-## Security configuration
-    --security-opt="label=user:USER"     : Set the label user for the container
-    --security-opt="label=role:ROLE"     : Set the label role for the container
-    --security-opt="label=type:TYPE"     : Set the label type for the container
-    --security-opt="label=level:LEVEL"   : Set the label level for the container
-    --security-opt="label=disable"       : Turn off label confinement for the container
-    --security-opt="apparmor=PROFILE"    : Set the apparmor profile to be applied to the container
-    --security-opt="no-new-privileges"   : Disable container processes from gaining new privileges
-    --security-opt="seccomp=unconfined"  : Turn off seccomp confinement for the container
-    --security-opt="seccomp=profile.json": White listed syscalls seccomp Json file to be used as a seccomp filter
-
-
-You can override the default labeling scheme for each container by specifying
-the `--security-opt` flag. Specifying the level in the following command
-allows you to share the same content between containers.
-
-    $ docker run --security-opt label=level:s0:c100,c200 -it fedora bash
-
-> **Note**: Automatic translation of MLS labels is not currently supported.
-
-To disable the security labeling for this container versus running with the
-`--privileged` flag, use the following command:
-
-    $ docker run --security-opt label=disable -it fedora bash
-
-If you want a tighter security policy on the processes within a container,
-you can specify an alternate type for the container. You could run a container
-that is only allowed to listen on Apache ports by executing the following
-command:
-
-    $ docker run --security-opt label=type:svirt_apache_t -it centos bash
-
-> **Note**: You would have to write policy defining a `svirt_apache_t` type.
-
-If you want to prevent your container processes from gaining additional
-privileges, you can execute the following command:
-
-    $ docker run --security-opt no-new-privileges -it centos bash
-
-This means that commands that raise privileges such as `su` or `sudo` will no longer work.
-It also causes any seccomp filters to be applied later, after privileges have been dropped
-which may mean you can have a more restrictive set of filters.
-For more details, see the [kernel documentation](https://www.kernel.org/doc/Documentation/prctl/no_new_privs.txt).
-
-## Specifying custom cgroups
-
-Using the `--cgroup-parent` flag, you can pass a specific cgroup to run a
-container in. This allows you to create and manage cgroups on their own. You can
-define custom resources for those cgroups and put containers under a common
-parent group.
-
-## Runtime constraints on resources
-
-The operator can also adjust the performance parameters of the
-container:
-
-| Option                     |  Description                                                                                                                                    |
-| -------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------- |
-| `-m`, `--memory=""`        | Memory limit (format: `<number>[<unit>]`). Number is a positive integer. Unit can be one of `b`, `k`, `m`, or `g`. Minimum is 4M.               |
-| `--memory-swap=""`         | Total memory limit (memory + swap, format: `<number>[<unit>]`). Number is a positive integer. Unit can be one of `b`, `k`, `m`, or `g`.         |
-| `--memory-reservation=""`  | Memory soft limit (format: `<number>[<unit>]`). Number is a positive integer. Unit can be one of `b`, `k`, `m`, or `g`.                         |
-| `--kernel-memory=""`       | Kernel memory limit (format: `<number>[<unit>]`). Number is a positive integer. Unit can be one of `b`, `k`, `m`, or `g`. Minimum is 4M.        |
-| `-c`, `--cpu-shares=0`     | CPU shares (relative weight)                                                                                                                    |
-| `--cpus=0.000`             | Number of CPUs. Number is a fractional number. 0.000 means no limit.                                                                            |
-| `--cpu-period=0`           | Limit the CPU CFS (Completely Fair Scheduler) period                                                                                            |
-| `--cpuset-cpus=""`         | CPUs in which to allow execution (0-3, 0,1)                                                                                                     |
-| `--cpuset-mems=""`         | Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.                                                     |
-| `--cpu-quota=0`            | Limit the CPU CFS (Completely Fair Scheduler) quota                                                                                             |
-| `--cpu-rt-period=0`        | Limit the CPU real-time period. In microseconds. Requires parent cgroups be set and cannot be higher than parent. Also check rtprio ulimits.    |
-| `--cpu-rt-runtime=0`       | Limit the CPU real-time runtime. In microseconds. Requires parent cgroups be set and cannot be higher than parent. Also check rtprio ulimits.   |
-| `--blkio-weight=0`         | Block IO weight (relative weight) accepts a weight value between 10 and 1000.                                                                   |
-| `--blkio-weight-device=""` | Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`)                                                                          |
-| `--device-read-bps=""`     | Limit read rate from a device (format: `<device-path>:<number>[<unit>]`). Number is a positive integer. Unit can be one of `kb`, `mb`, or `gb`. |
-| `--device-write-bps=""`    | Limit write rate to a device (format: `<device-path>:<number>[<unit>]`). Number is a positive integer. Unit can be one of `kb`, `mb`, or `gb`.  |
-| `--device-read-iops="" `   | Limit read rate (IO per second) from a device (format: `<device-path>:<number>`). Number is a positive integer.                                 |
-| `--device-write-iops="" `  | Limit write rate (IO per second) to a device (format: `<device-path>:<number>`). Number is a positive integer.                                  |
-| `--oom-kill-disable=false` | Whether to disable OOM Killer for the container or not.                                                                                         |
-| `--oom-score-adj=0`        | Tune container's OOM preferences (-1000 to 1000)                                                                                                |
-| `--memory-swappiness=""`   | Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.                                                            |
-| `--shm-size=""`            | Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`. Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes. If you omit the size entirely, the system uses `64m`. |
-
-### User memory constraints
-
-We have four ways to set user memory usage:
-
-<table>
-  <thead>
-    <tr>
-      <th>Option</th>
-      <th>Result</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td class="no-wrap">
-          <strong>memory=inf, memory-swap=inf</strong> (default)
-      </td>
-      <td>
-        There is no memory limit for the container. The container can use
-        as much memory as needed.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>memory=L&lt;inf, memory-swap=inf</strong></td>
-      <td>
-        (specify memory and set memory-swap as <code>-1</code>) The container is
-        not allowed to use more than L bytes of memory, but can use as much swap
-        as is needed (if the host supports swap memory).
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>memory=L&lt;inf, memory-swap=2*L</strong></td>
-      <td>
-        (specify memory without memory-swap) The container is not allowed to
-        use more than L bytes of memory, swap <i>plus</i> memory usage is double
-        of that.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap">
-          <strong>memory=L&lt;inf, memory-swap=S&lt;inf, L&lt;=S</strong>
-      </td>
-      <td>
-        (specify both memory and memory-swap) The container is not allowed to
-        use more than L bytes of memory, swap <i>plus</i> memory usage is limited
-        by S.
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-Examples:
-
-    $ docker run -it ubuntu:14.04 /bin/bash
-
-We set nothing about memory, this means the processes in the container can use
-as much memory and swap memory as they need.
-
-    $ docker run -it -m 300M --memory-swap -1 ubuntu:14.04 /bin/bash
-
-We set memory limit and disabled swap memory limit, this means the processes in
-the container can use 300M memory and as much swap memory as they need (if the
-host supports swap memory).
-
-    $ docker run -it -m 300M ubuntu:14.04 /bin/bash
-
-We set memory limit only, this means the processes in the container can use
-300M memory and 300M swap memory, by default, the total virtual memory size
-(--memory-swap) will be set as double of memory, in this case, memory + swap
-would be 2*300M, so processes can use 300M swap memory as well.
-
-    $ docker run -it -m 300M --memory-swap 1G ubuntu:14.04 /bin/bash
-
-We set both memory and swap memory, so the processes in the container can use
-300M memory and 700M swap memory.
-
-Memory reservation is a kind of memory soft limit that allows for greater
-sharing of memory. Under normal circumstances, containers can use as much of
-the memory as needed and are constrained only by the hard limits set with the
-`-m`/`--memory` option. When memory reservation is set, Docker detects memory
-contention or low memory and forces containers to restrict their consumption to
-a reservation limit.
-
-Always set the memory reservation value below the hard limit, otherwise the hard
-limit takes precedence. A reservation of 0 is the same as setting no
-reservation. By default (without reservation set), memory reservation is the
-same as the hard memory limit.
-
-Memory reservation is a soft-limit feature and does not guarantee the limit
-won't be exceeded. Instead, the feature attempts to ensure that, when memory is
-heavily contended for, memory is allocated based on the reservation hints/setup.
-
-The following example limits the memory (`-m`) to 500M and sets the memory
-reservation to 200M.
-
-```bash
-$ docker run -it -m 500M --memory-reservation 200M ubuntu:14.04 /bin/bash
-```
-
-Under this configuration, when the container consumes memory more than 200M and
-less than 500M, the next system memory reclaim attempts to shrink container
-memory below 200M.
-
-The following example set memory reservation to 1G without a hard memory limit.
-
-```bash
-$ docker run -it --memory-reservation 1G ubuntu:14.04 /bin/bash
-```
-
-The container can use as much memory as it needs. The memory reservation setting
-ensures the container doesn't consume too much memory for long time, because
-every memory reclaim shrinks the container's consumption to the reservation.
-
-By default, kernel kills processes in a container if an out-of-memory (OOM)
-error occurs. To change this behaviour, use the `--oom-kill-disable` option.
-Only disable the OOM killer on containers where you have also set the
-`-m/--memory` option. If the `-m` flag is not set, this can result in the host
-running out of memory and require killing the host's system processes to free
-memory.
-
-The following example limits the memory to 100M and disables the OOM killer for
-this container:
-
-    $ docker run -it -m 100M --oom-kill-disable ubuntu:14.04 /bin/bash
-
-The following example, illustrates a dangerous way to use the flag:
-
-    $ docker run -it --oom-kill-disable ubuntu:14.04 /bin/bash
-
-The container has unlimited memory which can cause the host to run out memory
-and require killing system processes to free memory. The `--oom-score-adj`
-parameter can be changed to select the priority of which containers will
-be killed when the system is out of memory, with negative scores making them
-less likely to be killed an positive more likely.
-
-### Kernel memory constraints
-
-Kernel memory is fundamentally different than user memory as kernel memory can't
-be swapped out. The inability to swap makes it possible for the container to
-block system services by consuming too much kernel memory. Kernel memory includes：
-
- - stack pages
- - slab pages
- - sockets memory pressure
- - tcp memory pressure
-
-You can setup kernel memory limit to constrain these kinds of memory. For example,
-every process consumes some stack pages. By limiting kernel memory, you can
-prevent new processes from being created when the kernel memory usage is too high.
-
-Kernel memory is never completely independent of user memory. Instead, you limit
-kernel memory in the context of the user memory limit. Assume "U" is the user memory
-limit and "K" the kernel limit. There are three possible ways to set limits:
-
-<table>
-  <thead>
-    <tr>
-      <th>Option</th>
-      <th>Result</th>
-    </tr>
-  </thead>
-  <tbody>
-    <tr>
-      <td class="no-wrap"><strong>U != 0, K = inf</strong> (default)</td>
-      <td>
-        This is the standard memory limitation mechanism already present before using
-        kernel memory. Kernel memory is completely ignored.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>U != 0, K &lt; U</strong></td>
-      <td>
-        Kernel memory is a subset of the user memory. This setup is useful in
-        deployments where the total amount of memory per-cgroup is overcommitted.
-        Overcommitting kernel memory limits is definitely not recommended, since the
-        box can still run out of non-reclaimable memory.
-        In this case, you can configure K so that the sum of all groups is
-        never greater than the total memory. Then, freely set U at the expense of
-        the system's service quality.
-      </td>
-    </tr>
-    <tr>
-      <td class="no-wrap"><strong>U != 0, K &gt; U</strong></td>
-      <td>
-        Since kernel memory charges are also fed to the user counter and reclamation
-        is triggered for the container for both kinds of memory. This configuration
-        gives the admin a unified view of memory. It is also useful for people
-        who just want to track kernel memory usage.
-      </td>
-    </tr>
-  </tbody>
-</table>
-
-Examples:
-
-    $ docker run -it -m 500M --kernel-memory 50M ubuntu:14.04 /bin/bash
-
-We set memory and kernel memory, so the processes in the container can use
-500M memory in total, in this 500M memory, it can be 50M kernel memory tops.
-
-    $ docker run -it --kernel-memory 50M ubuntu:14.04 /bin/bash
-
-We set kernel memory without **-m**, so the processes in the container can
-use as much memory as they want, but they can only use 50M kernel memory.
-
-### Swappiness constraint
-
-By default, a container's kernel can swap out a percentage of anonymous pages.
-To set this percentage for a container, specify a `--memory-swappiness` value
-between 0 and 100. A value of 0 turns off anonymous page swapping. A value of
-100 sets all anonymous pages as swappable. By default, if you are not using
-`--memory-swappiness`, memory swappiness value will be inherited from the parent.
-
-For example, you can set:
-
-    $ docker run -it --memory-swappiness=0 ubuntu:14.04 /bin/bash
-
-Setting the `--memory-swappiness` option is helpful when you want to retain the
-container's working set and to avoid swapping performance penalties.
-
-### CPU share constraint
-
-By default, all containers get the same proportion of CPU cycles. This proportion
-can be modified by changing the container's CPU share weighting relative
-to the weighting of all other running containers.
-
-To modify the proportion from the default of 1024, use the `-c` or `--cpu-shares`
-flag to set the weighting to 2 or higher. If 0 is set, the system will ignore the
-value and use the default of 1024.
-
-The proportion will only apply when CPU-intensive processes are running.
-When tasks in one container are idle, other containers can use the
-left-over CPU time. The actual amount of CPU time will vary depending on
-the number of containers running on the system.
-
-For example, consider three containers, one has a cpu-share of 1024 and
-two others have a cpu-share setting of 512. When processes in all three
-containers attempt to use 100% of CPU, the first container would receive
-50% of the total CPU time. If you add a fourth container with a cpu-share
-of 1024, the first container only gets 33% of the CPU. The remaining containers
-receive 16.5%, 16.5% and 33% of the CPU.
-
-On a multi-core system, the shares of CPU time are distributed over all CPU
-cores. Even if a container is limited to less than 100% of CPU time, it can
-use 100% of each individual CPU core.
-
-For example, consider a system with more than three cores. If you start one
-container `{C0}` with `-c=512` running one process, and another container
-`{C1}` with `-c=1024` running two processes, this can result in the following
-division of CPU shares:
-
-    PID    container	CPU	CPU share
-    100    {C0}		0	100% of CPU0
-    101    {C1}		1	100% of CPU1
-    102    {C1}		2	100% of CPU2
-
-### CPU period constraint
-
-The default CPU CFS (Completely Fair Scheduler) period is 100ms. We can use
-`--cpu-period` to set the period of CPUs to limit the container's CPU usage.
-And usually `--cpu-period` should work with `--cpu-quota`.
-
-Examples:
-
-    $ docker run -it --cpu-period=50000 --cpu-quota=25000 ubuntu:14.04 /bin/bash
-
-If there is 1 CPU, this means the container can get 50% CPU worth of run-time every 50ms.
-
-In addition to use `--cpu-period` and `--cpu-quota` for setting CPU period constraints,
-it is possible to specify `--cpus` with a float number to achieve the same purpose.
-For example, if there is 1 CPU, then `--cpus=0.5` will achieve the same result as
-setting `--cpu-period=50000` and `--cpu-quota=25000` (50% CPU).
-
-The default value for `--cpus` is `0.000`, which means there is no limit.
-
-For more information, see the [CFS documentation on bandwidth limiting](https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt).
-
-### Cpuset constraint
-
-We can set cpus in which to allow execution for containers.
-
-Examples:
-
-    $ docker run -it --cpuset-cpus="1,3" ubuntu:14.04 /bin/bash
-
-This means processes in container can be executed on cpu 1 and cpu 3.
-
-    $ docker run -it --cpuset-cpus="0-2" ubuntu:14.04 /bin/bash
-
-This means processes in container can be executed on cpu 0, cpu 1 and cpu 2.
-
-We can set mems in which to allow execution for containers. Only effective
-on NUMA systems.
-
-Examples:
-
-    $ docker run -it --cpuset-mems="1,3" ubuntu:14.04 /bin/bash
-
-This example restricts the processes in the container to only use memory from
-memory nodes 1 and 3.
-
-    $ docker run -it --cpuset-mems="0-2" ubuntu:14.04 /bin/bash
-
-This example restricts the processes in the container to only use memory from
-memory nodes 0, 1 and 2.
-
-### CPU quota constraint
-
-The `--cpu-quota` flag limits the container's CPU usage. The default 0 value
-allows the container to take 100% of a CPU resource (1 CPU). The CFS (Completely Fair
-Scheduler) handles resource allocation for executing processes and is default
-Linux Scheduler used by the kernel. Set this value to 50000 to limit the container
-to 50% of a CPU resource. For multiple CPUs, adjust the `--cpu-quota` as necessary.
-For more information, see the [CFS documentation on bandwidth limiting](https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt).
-
-### Block IO bandwidth (Blkio) constraint
-
-By default, all containers get the same proportion of block IO bandwidth
-(blkio). This proportion is 500. To modify this proportion, change the
-container's blkio weight relative to the weighting of all other running
-containers using the `--blkio-weight` flag.
-
-> **Note:** The blkio weight setting is only available for direct IO. Buffered IO
-> is not currently supported.
-
-The `--blkio-weight` flag can set the weighting to a value between 10 to 1000.
-For example, the commands below create two containers with different blkio
-weight:
-
-    $ docker run -it --name c1 --blkio-weight 300 ubuntu:14.04 /bin/bash
-    $ docker run -it --name c2 --blkio-weight 600 ubuntu:14.04 /bin/bash
-
-If you do block IO in the two containers at the same time, by, for example:
-
-    $ time dd if=/mnt/zerofile of=test.out bs=1M count=1024 oflag=direct
-
-You'll find that the proportion of time is the same as the proportion of blkio
-weights of the two containers.
-
-The `--blkio-weight-device="DEVICE_NAME:WEIGHT"` flag sets a specific device weight.
-The `DEVICE_NAME:WEIGHT` is a string containing a colon-separated device name and weight.
-For example, to set `/dev/sda` device weight to `200`:
-
-    $ docker run -it \
-        --blkio-weight-device "/dev/sda:200" \
-        ubuntu
-
-If you specify both the `--blkio-weight` and `--blkio-weight-device`, Docker
-uses the `--blkio-weight` as the default weight and uses `--blkio-weight-device`
-to override this default with a new value on a specific device.
-The following example uses a default weight of `300` and overrides this default
-on `/dev/sda` setting that weight to `200`:
-
-    $ docker run -it \
-        --blkio-weight 300 \
-        --blkio-weight-device "/dev/sda:200" \
-        ubuntu
-
-The `--device-read-bps` flag limits the read rate (bytes per second) from a device.
-For example, this command creates a container and limits the read rate to `1mb`
-per second from `/dev/sda`:
-
-    $ docker run -it --device-read-bps /dev/sda:1mb ubuntu
-
-The `--device-write-bps` flag limits the write rate (bytes per second)to a device.
-For example, this command creates a container and limits the write rate to `1mb`
-per second for `/dev/sda`:
-
-    $ docker run -it --device-write-bps /dev/sda:1mb ubuntu
-
-Both flags take limits in the `<device-path>:<limit>[unit]` format. Both read
-and write rates must be a positive integer. You can specify the rate in `kb`
-(kilobytes), `mb` (megabytes), or `gb` (gigabytes).
-
-The `--device-read-iops` flag limits read rate (IO per second) from a device.
-For example, this command creates a container and limits the read rate to
-`1000` IO per second from `/dev/sda`:
-
-    $ docker run -ti --device-read-iops /dev/sda:1000 ubuntu
-
-The `--device-write-iops` flag limits write rate (IO per second) to a device.
-For example, this command creates a container and limits the write rate to
-`1000` IO per second to `/dev/sda`:
-
-    $ docker run -ti --device-write-iops /dev/sda:1000 ubuntu
-
-Both flags take limits in the `<device-path>:<limit>` format. Both read and
-write rates must be a positive integer.
-
-## Additional groups
-    --group-add: Add additional groups to run as
-
-By default, the docker container process runs with the supplementary groups looked
-up for the specified user. If one wants to add more to that list of groups, then
-one can use this flag:
-
-    $ docker run --rm --group-add audio --group-add nogroup --group-add 777 busybox id
-    uid=0(root) gid=0(root) groups=10(wheel),29(audio),99(nogroup),777
-
-## Runtime privilege and Linux capabilities
-
-    --cap-add: Add Linux capabilities
-    --cap-drop: Drop Linux capabilities
-    --privileged=false: Give extended privileges to this container
-    --device=[]: Allows you to run devices inside the container without the --privileged flag.
-
-By default, Docker containers are "unprivileged" and cannot, for
-example, run a Docker daemon inside a Docker container. This is because
-by default a container is not allowed to access any devices, but a
-"privileged" container is given access to all devices (see
-the documentation on [cgroups devices](https://www.kernel.org/doc/Documentation/cgroup-v1/devices.txt)).
-
-When the operator executes `docker run --privileged`, Docker will enable
-to access to all devices on the host as well as set some configuration
-in AppArmor or SELinux to allow the container nearly all the same access to the
-host as processes running outside containers on the host. Additional
-information about running with `--privileged` is available on the
-[Docker Blog](http://blog.docker.com/2013/09/docker-can-now-run-within-docker/).
-
-If you want to limit access to a specific device or devices you can use
-the `--device` flag. It allows you to specify one or more devices that
-will be accessible within the container.
-
-    $ docker run --device=/dev/snd:/dev/snd ...
-
-By default, the container will be able to `read`, `write`, and `mknod` these devices.
-This can be overridden using a third `:rwm` set of options to each `--device` flag:
-
-    $ docker run --device=/dev/sda:/dev/xvdc --rm -it ubuntu fdisk  /dev/xvdc
-
-    Command (m for help): q
-    $ docker run --device=/dev/sda:/dev/xvdc:r --rm -it ubuntu fdisk  /dev/xvdc
-    You will not be able to write the partition table.
-
-    Command (m for help): q
-
-    $ docker run --device=/dev/sda:/dev/xvdc:w --rm -it ubuntu fdisk  /dev/xvdc
-        crash....
-
-    $ docker run --device=/dev/sda:/dev/xvdc:m --rm -it ubuntu fdisk  /dev/xvdc
-    fdisk: unable to open /dev/xvdc: Operation not permitted
-
-In addition to `--privileged`, the operator can have fine grain control over the
-capabilities using `--cap-add` and `--cap-drop`. By default, Docker has a default
-list of capabilities that are kept. The following table lists the Linux capability
-options which are allowed by default and can be dropped.
-
-| Capability Key   | Capability Description                                                                                                        |
-| ---------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| SETPCAP          | Modify process capabilities.                                                                                                  |
-| MKNOD            | Create special files using mknod(2).                                                                                          |
-| AUDIT_WRITE      | Write records to kernel auditing log.                                                                                         |
-| CHOWN            | Make arbitrary changes to file UIDs and GIDs (see chown(2)).                                                                  |
-| NET_RAW          | Use RAW and PACKET sockets.                                                                                                   |
-| DAC_OVERRIDE     | Bypass file read, write, and execute permission checks.                                                                       |
-| FOWNER           | Bypass permission checks on operations that normally require the file system UID of the process to match the UID of the file. |
-| FSETID           | Don't clear set-user-ID and set-group-ID permission bits when a file is modified.                                             |
-| KILL             | Bypass permission checks for sending signals.                                                                                 |
-| SETGID           | Make arbitrary manipulations of process GIDs and supplementary GID list.                                                      |
-| SETUID           | Make arbitrary manipulations of process UIDs.                                                                                 |
-| NET_BIND_SERVICE | Bind a socket to internet domain privileged ports (port numbers less than 1024).                                              |
-| SYS_CHROOT       | Use chroot(2), change root directory.                                                                                         |
-| SETFCAP          | Set file capabilities.                                                                                                        |
-
-The next table shows the capabilities which are not granted by default and may be added.
-
-| Capability Key   | Capability Description                                                                                                        |
-| ---------------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| SYS_MODULE       | Load and unload kernel modules.                                                                                               |
-| SYS_RAWIO        | Perform I/O port operations (iopl(2) and ioperm(2)).                                                                          |
-| SYS_PACCT        | Use acct(2), switch process accounting on or off.                                                                             |
-| SYS_ADMIN        | Perform a range of system administration operations.                                                                          |
-| SYS_NICE         | Raise process nice value (nice(2), setpriority(2)) and change the nice value for arbitrary processes.                         |
-| SYS_RESOURCE     | Override resource Limits.                                                                                                     |
-| SYS_TIME         | Set system clock (settimeofday(2), stime(2), adjtimex(2)); set real-time (hardware) clock.                                    |
-| SYS_TTY_CONFIG   | Use vhangup(2); employ various privileged ioctl(2) operations on virtual terminals.                                           |
-| AUDIT_CONTROL    | Enable and disable kernel auditing; change auditing filter rules; retrieve auditing status and filtering rules.               |
-| MAC_OVERRIDE     | Allow MAC configuration or state changes. Implemented for the Smack LSM.                                                      |
-| MAC_ADMIN        | Override Mandatory Access Control (MAC). Implemented for the Smack Linux Security Module (LSM).                               |
-| NET_ADMIN        | Perform various network-related operations.                                                                                   |
-| SYSLOG           | Perform privileged syslog(2) operations.                                                                                      |
-| DAC_READ_SEARCH  | Bypass file read permission checks and directory read and execute permission checks.                                          |
-| LINUX_IMMUTABLE  | Set the FS_APPEND_FL and FS_IMMUTABLE_FL i-node flags.                                                                        |
-| NET_BROADCAST    | Make socket broadcasts, and listen to multicasts.                                                                             |
-| IPC_LOCK         | Lock memory (mlock(2), mlockall(2), mmap(2), shmctl(2)).                                                                      |
-| IPC_OWNER        | Bypass permission checks for operations on System V IPC objects.                                                              |
-| SYS_PTRACE       | Trace arbitrary processes using ptrace(2).                                                                                    |
-| SYS_BOOT         | Use reboot(2) and kexec_load(2), reboot and load a new kernel for later execution.                                            |
-| LEASE            | Establish leases on arbitrary files (see fcntl(2)).                                                                           |
-| WAKE_ALARM       | Trigger something that will wake up the system.                                                                               |
-| BLOCK_SUSPEND    | Employ features that can block system suspend.                                                                                |
-
-Further reference information is available on the [capabilities(7) - Linux man page](http://man7.org/linux/man-pages/man7/capabilities.7.html)
-
-Both flags support the value `ALL`, so if the
-operator wants to have all capabilities but `MKNOD` they could use:
-
-    $ docker run --cap-add=ALL --cap-drop=MKNOD ...
-
-For interacting with the network stack, instead of using `--privileged` they
-should use `--cap-add=NET_ADMIN` to modify the network interfaces.
-
-    $ docker run -it --rm  ubuntu:14.04 ip link add dummy0 type dummy
-    RTNETLINK answers: Operation not permitted
-    $ docker run -it --rm --cap-add=NET_ADMIN ubuntu:14.04 ip link add dummy0 type dummy
-
-To mount a FUSE based filesystem, you need to combine both `--cap-add` and
-`--device`:
-
-    $ docker run --rm -it --cap-add SYS_ADMIN sshfs sshfs sven@10.10.10.20:/home/sven /mnt
-    fuse: failed to open /dev/fuse: Operation not permitted
-    $ docker run --rm -it --device /dev/fuse sshfs sshfs sven@10.10.10.20:/home/sven /mnt
-    fusermount: mount failed: Operation not permitted
-    $ docker run --rm -it --cap-add SYS_ADMIN --device /dev/fuse sshfs
-    # sshfs sven@10.10.10.20:/home/sven /mnt
-    The authenticity of host '10.10.10.20 (10.10.10.20)' can't be established.
-    ECDSA key fingerprint is 25:34:85:75:25:b0:17:46:05:19:04:93:b5:dd:5f:c6.
-    Are you sure you want to continue connecting (yes/no)? yes
-    sven@10.10.10.20's password:
-    root@30aa0cfaf1b5:/# ls -la /mnt/src/docker
-    total 1516
-    drwxrwxr-x 1 1000 1000   4096 Dec  4 06:08 .
-    drwxrwxr-x 1 1000 1000   4096 Dec  4 11:46 ..
-    -rw-rw-r-- 1 1000 1000     16 Oct  8 00:09 .dockerignore
-    -rwxrwxr-x 1 1000 1000    464 Oct  8 00:09 .drone.yml
-    drwxrwxr-x 1 1000 1000   4096 Dec  4 06:11 .git
-    -rw-rw-r-- 1 1000 1000    461 Dec  4 06:08 .gitignore
-    ....
-
-The default seccomp profile will adjust to the selected capabilities, in order to allow
-use of facilities allowed by the capabilities, so you should not have to adjust this,
-since Docker 1.12. In Docker 1.10 and 1.11 this did not happen and it may be necessary
-to use a custom seccomp profile or use `--security-opt seccomp=unconfined` when adding
-capabilities.
-
-## Logging drivers (--log-driver)
-
-The container can have a different logging driver than the Docker daemon. Use
-the `--log-driver=VALUE` with the `docker run` command to configure the
-container's logging driver. The following options are supported:
-
-| Driver      | Description                                                                                                                   |
-| ----------- | ----------------------------------------------------------------------------------------------------------------------------- |
-| `none`      | Disables any logging for the container. `docker logs` won't be available with this driver.                                    |
-| `json-file` | Default logging driver for Docker. Writes JSON messages to file.  No logging options are supported for this driver.           |
-| `syslog`    | Syslog logging driver for Docker. Writes log messages to syslog.                                                              |
-| `journald`  | Journald logging driver for Docker. Writes log messages to `journald`.                                                        |
-| `gelf`      | Graylog Extended Log Format (GELF) logging driver for Docker. Writes log messages to a GELF endpoint likeGraylog or Logstash. |
-| `fluentd`   | Fluentd logging driver for Docker. Writes log messages to `fluentd` (forward input).                                          |
-| `awslogs`   | Amazon CloudWatch Logs logging driver for Docker. Writes log messages to Amazon CloudWatch Logs                               |
-| `splunk`    | Splunk logging driver for Docker. Writes log messages to `splunk` using Event Http Collector.                                 |
-
-The `docker logs` command is available only for the `json-file` and `journald`
-logging drivers.  For detailed information on working with logging drivers, see
-[Configure a logging driver](https://docs.docker.com/engine/admin/logging/overview/).
-
-
-## Overriding Dockerfile image defaults
-
-When a developer builds an image from a [*Dockerfile*](builder.md)
-or when she commits it, the developer can set a number of default parameters
-that take effect when the image starts up as a container.
-
-Four of the Dockerfile commands cannot be overridden at runtime: `FROM`,
-`MAINTAINER`, `RUN`, and `ADD`. Everything else has a corresponding override
-in `docker run`. We'll go through what the developer might have set in each
-Dockerfile instruction and how the operator can override that setting.
-
- - [CMD (Default Command or Options)](#cmd-default-command-or-options)
- - [ENTRYPOINT (Default Command to Execute at Runtime)](
-    #entrypoint-default-command-to-execute-at-runtime)
- - [EXPOSE (Incoming Ports)](#expose-incoming-ports)
- - [ENV (Environment Variables)](#env-environment-variables)
- - [HEALTHCHECK](#healthcheck)
- - [VOLUME (Shared Filesystems)](#volume-shared-filesystems)
- - [USER](#user)
- - [WORKDIR](#workdir)
-
-### CMD (default command or options)
-
-Recall the optional `COMMAND` in the Docker
-commandline:
-
-    $ docker run [OPTIONS] IMAGE[:TAG|@DIGEST] [COMMAND] [ARG...]
-
-This command is optional because the person who created the `IMAGE` may
-have already provided a default `COMMAND` using the Dockerfile `CMD`
-instruction. As the operator (the person running a container from the
-image), you can override that `CMD` instruction just by specifying a new
-`COMMAND`.
-
-If the image also specifies an `ENTRYPOINT` then the `CMD` or `COMMAND`
-get appended as arguments to the `ENTRYPOINT`.
-
-### ENTRYPOINT (default command to execute at runtime)
-
-    --entrypoint="": Overwrite the default entrypoint set by the image
-
-The `ENTRYPOINT` of an image is similar to a `COMMAND` because it
-specifies what executable to run when the container starts, but it is
-(purposely) more difficult to override. The `ENTRYPOINT` gives a
-container its default nature or behavior, so that when you set an
-`ENTRYPOINT` you can run the container *as if it were that binary*,
-complete with default options, and you can pass in more options via the
-`COMMAND`. But, sometimes an operator may want to run something else
-inside the container, so you can override the default `ENTRYPOINT` at
-runtime by using a string to specify the new `ENTRYPOINT`. Here is an
-example of how to run a shell in a container that has been set up to
-automatically run something else (like `/usr/bin/redis-server`):
-
-    $ docker run -it --entrypoint /bin/bash example/redis
-
-or two examples of how to pass more parameters to that ENTRYPOINT:
-
-    $ docker run -it --entrypoint /bin/bash example/redis -c ls -l
-    $ docker run -it --entrypoint /usr/bin/redis-cli example/redis --help
-
-You can reset a containers entrypoint by passing an empty string, for example:
-
-    $ docker run -it --entrypoint="" mysql bash
-
-> **Note**: Passing `--entrypoint` will clear out any default command set on the
-> image (i.e. any `CMD` instruction in the Dockerfile used to build it).
-
-### EXPOSE (incoming ports)
-
-The following `run` command options work with container networking:
-
-    --expose=[]: Expose a port or a range of ports inside the container.
-                 These are additional to those exposed by the `EXPOSE` instruction
-    -P         : Publish all exposed ports to the host interfaces
-    -p=[]      : Publish a container᾿s port or a range of ports to the host
-                   format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort
-                   Both hostPort and containerPort can be specified as a
-                   range of ports. When specifying ranges for both, the
-                   number of container ports in the range must match the
-                   number of host ports in the range, for example:
-                       -p 1234-1236:1234-1236/tcp
-
-                   When specifying a range for hostPort only, the
-                   containerPort must not be a range.  In this case the
-                   container port is published somewhere within the
-                   specified hostPort range. (e.g., `-p 1234-1236:1234/tcp`)
-
-                   (use 'docker port' to see the actual mapping)
-
-    --link=""  : Add link to another container (<name or id>:alias or <name or id>)
-
-With the exception of the `EXPOSE` directive, an image developer hasn't
-got much control over networking. The `EXPOSE` instruction defines the
-initial incoming ports that provide services. These ports are available
-to processes inside the container. An operator can use the `--expose`
-option to add to the exposed ports.
-
-To expose a container's internal port, an operator can start the
-container with the `-P` or `-p` flag. The exposed port is accessible on
-the host and the ports are available to any client that can reach the
-host.
-
-The `-P` option publishes all the ports to the host interfaces. Docker
-binds each exposed port to a random port on the host. The range of
-ports are within an *ephemeral port range* defined by
-`/proc/sys/net/ipv4/ip_local_port_range`. Use the `-p` flag to
-explicitly map a single port or range of ports.
-
-The port number inside the container (where the service listens) does
-not need to match the port number exposed on the outside of the
-container (where clients connect). For example, inside the container an
-HTTP service is listening on port 80 (and so the image developer
-specifies `EXPOSE 80` in the Dockerfile). At runtime, the port might be
-bound to 42800 on the host. To find the mapping between the host ports
-and the exposed ports, use `docker port`.
-
-If the operator uses `--link` when starting a new client container in the
-default bridge network, then the client container can access the exposed
-port via a private networking interface.
-If `--link` is used when starting a container in a user-defined network as
-described in [*Docker network overview*](https://docs.docker.com/engine/userguide/networking/),
-it will provide a named alias for the container being linked to.
-
-### ENV (environment variables)
-
-When a new container is created, Docker will set the following environment
-variables automatically:
-
-| Variable | Value |
-| -------- | ----- |
-| `HOME` | Set based on the value of `USER` |
-| `HOSTNAME` | The hostname associated with the container |
-| `PATH` | Includes popular directories, such as `:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin` |
-| `TERM` | `xterm` if the container is allocated a pseudo-TTY |
-
-Additionally, the operator can **set any environment variable** in the
-container by using one or more `-e` flags, even overriding those mentioned
-above, or already defined by the developer with a Dockerfile `ENV`:
-
-    $ docker run -e "deep=purple" --rm ubuntu /bin/bash -c export
-    declare -x HOME="/"
-    declare -x HOSTNAME="85bc26a0e200"
-    declare -x OLDPWD
-    declare -x PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-    declare -x PWD="/"
-    declare -x SHLVL="1"
-    declare -x deep="purple"
-
-Similarly the operator can set the **hostname** with `-h`.
-
-### HEALTHCHECK
-
-```
-  --health-cmd            Command to run to check health
-  --health-interval       Time between running the check
-  --health-retries        Consecutive failures needed to report unhealthy
-  --health-timeout        Maximum time to allow one check to run
-  --no-healthcheck        Disable any container-specified HEALTHCHECK
-```
-
-Example:
-
-    {% raw %}
-    $ docker run --name=test -d \
-        --health-cmd='stat /etc/passwd || exit 1' \
-        --health-interval=2s \
-        busybox sleep 1d
-    $ sleep 2; docker inspect --format='{{.State.Health.Status}}' test
-    healthy
-    $ docker exec test rm /etc/passwd
-    $ sleep 2; docker inspect --format='{{json .State.Health}}' test
-    {
-      "Status": "unhealthy",
-      "FailingStreak": 3,
-      "Log": [
-        {
-          "Start": "2016-05-25T17:22:04.635478668Z",
-          "End": "2016-05-25T17:22:04.7272552Z",
-          "ExitCode": 0,
-          "Output": "  File: /etc/passwd\n  Size: 334       \tBlocks: 8          IO Block: 4096   regular file\nDevice: 32h/50d\tInode: 12          Links: 1\nAccess: (0664/-rw-rw-r--)  Uid: (    0/    root)   Gid: (    0/    root)\nAccess: 2015-12-05 22:05:32.000000000\nModify: 2015..."
-        },
-        {
-          "Start": "2016-05-25T17:22:06.732900633Z",
-          "End": "2016-05-25T17:22:06.822168935Z",
-          "ExitCode": 0,
-          "Output": "  File: /etc/passwd\n  Size: 334       \tBlocks: 8          IO Block: 4096   regular file\nDevice: 32h/50d\tInode: 12          Links: 1\nAccess: (0664/-rw-rw-r--)  Uid: (    0/    root)   Gid: (    0/    root)\nAccess: 2015-12-05 22:05:32.000000000\nModify: 2015..."
-        },
-        {
-          "Start": "2016-05-25T17:22:08.823956535Z",
-          "End": "2016-05-25T17:22:08.897359124Z",
-          "ExitCode": 1,
-          "Output": "stat: can't stat '/etc/passwd': No such file or directory\n"
-        },
-        {
-          "Start": "2016-05-25T17:22:10.898802931Z",
-          "End": "2016-05-25T17:22:10.969631866Z",
-          "ExitCode": 1,
-          "Output": "stat: can't stat '/etc/passwd': No such file or directory\n"
-        },
-        {
-          "Start": "2016-05-25T17:22:12.971033523Z",
-          "End": "2016-05-25T17:22:13.082015516Z",
-          "ExitCode": 1,
-          "Output": "stat: can't stat '/etc/passwd': No such file or directory\n"
-        }
-      ]
-    }
-    {% endraw %}
-
-The health status is also displayed in the `docker ps` output.
-
-### TMPFS (mount tmpfs filesystems)
-
-```bash
---tmpfs=[]: Create a tmpfs mount with: container-dir[:<options>],
-            where the options are identical to the Linux
-            'mount -t tmpfs -o' command.
-```
-
-The example below mounts an empty tmpfs into the container with the `rw`,
-`noexec`, `nosuid`, and `size=65536k` options.
-
-    $ docker run -d --tmpfs /run:rw,noexec,nosuid,size=65536k my_image
-
-### VOLUME (shared filesystems)
-
-    -v, --volume=[host-src:]container-dest[:<options>]: Bind mount a volume.
-    The comma-delimited `options` are [rw|ro], [z|Z],
-    [[r]shared|[r]slave|[r]private], and [nocopy].
-    The 'host-src' is an absolute path or a name value.
-
-    If neither 'rw' or 'ro' is specified then the volume is mounted in
-    read-write mode.
-
-    The `nocopy` modes is used to disable automatic copying requested volume
-    path in the container to the volume storage location.
-    For named volumes, `copy` is the default mode. Copy modes are not supported
-    for bind-mounted volumes.
-
-    --volumes-from="": Mount all volumes from the given container(s)
-
-> **Note**:
-> When using systemd to manage the Docker daemon's start and stop, in the systemd
-> unit file there is an option to control mount propagation for the Docker daemon
-> itself, called `MountFlags`. The value of this setting may cause Docker to not
-> see mount propagation changes made on the mount point. For example, if this value
-> is `slave`, you may not be able to use the `shared` or `rshared` propagation on
-> a volume.
-
-The volumes commands are complex enough to have their own documentation
-in section [*Manage data in
-containers*](https://docs.docker.com/engine/tutorials/dockervolumes/). A developer can define
-one or more `VOLUME`'s associated with an image, but only the operator
-can give access from one container to another (or from a container to a
-volume mounted on the host).
-
-The `container-dest` must always be an absolute path such as `/src/docs`.
-The `host-src` can either be an absolute path or a `name` value. If you
-supply an absolute path for the `host-dir`, Docker bind-mounts to the path
-you specify. If you supply a `name`, Docker creates a named volume by that `name`.
-
-A `name` value must start with an alphanumeric character,
-followed by `a-z0-9`, `_` (underscore), `.` (period) or `-` (hyphen).
-An absolute path starts with a `/` (forward slash).
-
-For example, you can specify either `/foo` or `foo` for a `host-src` value.
-If you supply the `/foo` value, Docker creates a bind-mount. If you supply
-the `foo` specification, Docker creates a named volume.
-
-### USER
-
-`root` (id = 0) is the default user within a container. The image developer can
-create additional users. Those users are accessible by name.  When passing a numeric
-ID, the user does not have to exist in the container.
-
-The developer can set a default user to run the first process with the
-Dockerfile `USER` instruction. When starting a container, the operator can override
-the `USER` instruction by passing the `-u` option.
-
-    -u="", --user="": Sets the username or UID used and optionally the groupname or GID for the specified command.
-
-    The followings examples are all valid:
-    --user=[ user | user:group | uid | uid:gid | user:gid | uid:group ]
-
-> **Note:** if you pass a numeric uid, it must be in the range of 0-2147483647.
-
-### WORKDIR
-
-The default working directory for running binaries within a container is the
-root directory (`/`), but the developer can set a different default with the
-Dockerfile `WORKDIR` command. The operator can override this with:
-
-    -w="": Working directory inside the container
diff --git a/installer/vendor/github.com/docker/docker/docs/static_files/docker-logo-compressed.png b/installer/vendor/github.com/docker/docker/docs/static_files/docker-logo-compressed.png
deleted file mode 100644
index 717d09d773..0000000000
Binary files a/installer/vendor/github.com/docker/docker/docs/static_files/docker-logo-compressed.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/README.md b/installer/vendor/github.com/docker/docker/experimental/README.md
deleted file mode 100644
index b57a5d1294..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/README.md
+++ /dev/null
@@ -1,44 +0,0 @@
-# Docker Experimental Features
-
-This page contains a list of features in the Docker engine which are
-experimental. Experimental features are **not** ready for production. They are
-provided for test and evaluation in your sandbox environments.
-
-The information below describes each feature and the GitHub pull requests and
-issues associated with it. If necessary, links are provided to additional
-documentation on an issue.  As an active Docker user and community member,
-please feel free to provide any feedback on these features you wish.
-
-## Use Docker experimental
-
-Experimental features are now included in the standard Docker binaries as of
-version 1.13.0.
-For enabling experimental features, you need to start the Docker daemon with
-`--experimental` flag.
-You can also enable the daemon flag via `/etc/docker/daemon.json`. e.g.
-
-```json
-{
-    "experimental": true
-}
-```
-
-Then make sure the experimental flag is enabled:
-
-```bash
-$ docker version -f '{{.Server.Experimental}}'
-true
-```
-
-## Current experimental features
-
- * [External graphdriver plugins](../docs/extend/plugins_graphdriver.md)
- * [Ipvlan Network Drivers](vlan-networks.md)
- * [Docker Stacks and Distributed Application Bundles](docker-stacks-and-bundles.md)
- * [Checkpoint & Restore](checkpoint-restore.md)
-
-## How to comment on an experimental feature
-
-Each feature's documentation includes a list of proposal pull requests or PRs associated with the feature. If you want to comment on or suggest a change to a feature, please add it to the existing feature PR.
-
-Issues or problems with a feature? Inquire for help on the `#docker` IRC channel or on the [Docker Google group](https://groups.google.com/forum/#!forum/docker-user).
diff --git a/installer/vendor/github.com/docker/docker/experimental/checkpoint-restore.md b/installer/vendor/github.com/docker/docker/experimental/checkpoint-restore.md
deleted file mode 100644
index 7e609b60ec..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/checkpoint-restore.md
+++ /dev/null
@@ -1,88 +0,0 @@
-# Docker Checkpoint & Restore
-
-Checkpoint & Restore is a new feature that allows you to freeze a running
-container by checkpointing it, which turns its state into a collection of files
-on disk. Later, the container can be restored from the point it was frozen.
-
-This is accomplished using a tool called [CRIU](http://criu.org), which is an
-external dependency of this feature. A good overview of the history of
-checkpoint and restore in Docker is available in this
-[Kubernetes blog post](http://blog.kubernetes.io/2015/07/how-did-quake-demo-from-dockercon-work.html).
-
-## Installing CRIU
-
-If you use a Debian system, you can add the CRIU PPA and install with apt-get
-[from the criu launchpad](https://launchpad.net/~criu/+archive/ubuntu/ppa).
-
-Alternatively, you can [build CRIU from source](http://criu.org/Installation).
-
-You need at least version 2.0 of CRIU to run checkpoint/restore in Docker.
-
-## Use cases for checkpoint & restore
-
-This feature is currently focused on single-host use cases for checkpoint and
-restore. Here are a few:
-
-- Restarting the host machine without stopping/starting containers
-- Speeding up the start time of slow start applications
-- "Rewinding" processes to an earlier point in time
-- "Forensic debugging" of running processes
-
-Another primary use case of checkpoint & restore outside of Docker is the live
-migration of a server from one machine to another. This is possible with the
-current implementation, but not currently a priority (and so the workflow is
-not optimized for the task).
-
-## Using checkpoint & restore
-
-A new top level command `docker checkpoint` is introduced, with three subcommands:
-- `create` (creates a new checkpoint)
-- `ls` (lists existing checkpoints)
-- `rm` (deletes an existing checkpoint)
-
-Additionally, a `--checkpoint` flag is added to the container start command.
-
-The options for checkpoint create:
-
-    Usage:  docker checkpoint create [OPTIONS] CONTAINER CHECKPOINT
-
-    Create a checkpoint from a running container
-
-      --leave-running=false    Leave the container running after checkpoint
-      --checkpoint-dir         Use a custom checkpoint storage directory
-
-And to restore a container:
-
-    Usage:  docker start --checkpoint CHECKPOINT_ID [OTHER OPTIONS] CONTAINER
-
-
-A simple example of using checkpoint & restore on a container:
-
-    $ docker run --security-opt=seccomp:unconfined --name cr -d busybox /bin/sh -c 'i=0; while true; do echo $i; i=$(expr $i + 1); sleep 1; done'
-    > abc0123
-
-    $ docker checkpoint create cr checkpoint1
-
-    # <later>
-    $ docker start --checkpoint checkpoint1 cr
-    > abc0123
-
-This process just logs an incrementing counter to stdout. If you `docker logs`
-in between running/checkpoint/restoring you should see that the counter
-increases while the process is running, stops while it's checkpointed, and
-resumes from the point it left off once you restore.
-
-## Current limitation
-
-seccomp is only supported by CRIU in very up to date kernels.
-
-External terminal (i.e. `docker run -t ..`) is not supported at the moment.
-If you try to create a checkpoint for a container with an external terminal, 
-it would fail:
-
-    $ docker checkpoint create cr checkpoint1
-    Error response from daemon: Cannot checkpoint container c1: rpc error: code = 2 desc = exit status 1: "criu failed: type NOTIFY errno 0\nlog file: /var/lib/docker/containers/eb62ebdbf237ce1a8736d2ae3c7d88601fc0a50235b0ba767b559a1f3c5a600b/checkpoints/checkpoint1/criu.work/dump.log\n"
-    
-    $ cat /var/lib/docker/containers/eb62ebdbf237ce1a8736d2ae3c7d88601fc0a50235b0ba767b559a1f3c5a600b/checkpoints/checkpoint1/criu.work/dump.log
-    Error (mount.c:740): mnt: 126:./dev/console doesn't have a proper root mount
-
diff --git a/installer/vendor/github.com/docker/docker/experimental/docker-stacks-and-bundles.md b/installer/vendor/github.com/docker/docker/experimental/docker-stacks-and-bundles.md
deleted file mode 100644
index b777c3919c..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/docker-stacks-and-bundles.md
+++ /dev/null
@@ -1,202 +0,0 @@
-# Docker Stacks and Distributed Application Bundles
-
-## Overview
-
-Docker Stacks and Distributed Application Bundles are experimental features
-introduced in Docker 1.12 and Docker Compose 1.8, alongside the concept of
-swarm mode, and Nodes and Services in the Engine API.
-
-A Dockerfile can be built into an image, and containers can be created from
-that image. Similarly, a docker-compose.yml can be built into a **distributed
-application bundle**, and **stacks** can be created from that bundle. In that
-sense, the bundle is a multi-services distributable image format.
-
-As of Docker 1.12 and Compose 1.8, the features are experimental. Neither
-Docker Engine nor the Docker Registry support distribution of bundles.
-
-## Producing a bundle
-
-The easiest way to produce a bundle is to generate it using `docker-compose`
-from an existing `docker-compose.yml`. Of course, that's just *one* possible way
-to proceed, in the same way that `docker build` isn't the only way to produce a
-Docker image.
-
-From `docker-compose`:
-
-```bash
-$ docker-compose bundle
-WARNING: Unsupported key 'network_mode' in services.nsqd - ignoring
-WARNING: Unsupported key 'links' in services.nsqd - ignoring
-WARNING: Unsupported key 'volumes' in services.nsqd - ignoring
-[...]
-Wrote bundle to vossibility-stack.dab
-```
-
-## Creating a stack from a bundle
-
-A stack is created using the `docker deploy` command:
-
-```bash
-# docker deploy --help
-
-Usage:  docker deploy [OPTIONS] STACK
-
-Create and update a stack from a Distributed Application Bundle (DAB)
-
-Options:
-      --file   string        Path to a Distributed Application Bundle file (Default: STACK.dab)
-      --help                 Print usage
-      --with-registry-auth   Send registry authentication details to Swarm agents
-```
-
-Let's deploy the stack created before:
-
-```bash
-# docker deploy vossibility-stack
-Loading bundle from vossibility-stack.dab
-Creating service vossibility-stack_elasticsearch
-Creating service vossibility-stack_kibana
-Creating service vossibility-stack_logstash
-Creating service vossibility-stack_lookupd
-Creating service vossibility-stack_nsqd
-Creating service vossibility-stack_vossibility-collector
-```
-
-We can verify that services were correctly created:
-
-```bash
-$ docker service ls
-ID            NAME                                     MODE         REPLICAS    IMAGE
-29bv0vnlm903  vossibility-stack_lookupd                replicated   1/1         nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4awt47624qwh  vossibility-stack_nsqd                   replicated   1/1         nsqio/nsq@sha256:eeba05599f31eba418e96e71e0984c3dc96963ceb66924dd37a47bf7ce18a662
-4tjx9biia6fs  vossibility-stack_elasticsearch          replicated   1/1         elasticsearch@sha256:12ac7c6af55d001f71800b83ba91a04f716e58d82e748fa6e5a7359eed2301aa
-7563uuzr9eys  vossibility-stack_kibana                 replicated   1/1         kibana@sha256:6995a2d25709a62694a937b8a529ff36da92ebee74bafd7bf00e6caf6db2eb03
-9gc5m4met4he  vossibility-stack_logstash               replicated   1/1         logstash@sha256:2dc8bddd1bb4a5a34e8ebaf73749f6413c101b2edef6617f2f7713926d2141fe
-axqh55ipl40h  vossibility-stack_vossibility-collector  replicated   1/1         icecrime/vossibility-collector@sha256:f03f2977203ba6253988c18d04061c5ec7aab46bca9dfd89a9a1fa4500989fba
-```
-
-## Managing stacks
-
-Stacks are managed using the `docker stack` command:
-
-```bash
-# docker stack --help
-
-Usage:  docker stack COMMAND
-
-Manage Docker stacks
-
-Options:
-      --help   Print usage
-
-Commands:
-  config      Print the stack configuration
-  deploy      Create and update a stack
-  ls          List stacks
-  rm          Remove the stack
-  services    List the services in the stack
-  tasks       List the tasks in the stack
-
-Run 'docker stack COMMAND --help' for more information on a command.
-```
-
-## Bundle file format
-
-Distributed application bundles are described in a JSON format. When bundles
-are persisted as files, the file extension is `.dab` (Docker 1.12RC2 tools use
-`.dsb` for the file extension—this will be updated in the next release client).
-
-A bundle has two top-level fields: `version` and `services`. The version used
-by Docker 1.12 tools is `0.1`.
-
-`services` in the bundle are the services that comprise the app. They
-correspond to the new `Service` object introduced in the 1.12 Docker Engine API.
-
-A service has the following fields:
-
-<dl>
-    <dt>
-        Image (required) <code>string</code>
-    </dt>
-    <dd>
-        The image that the service will run. Docker images should be referenced
-        with full content hash to fully specify the deployment artifact for the
-        service. Example:
-        <code>postgres@sha256:f76245b04ddbcebab5bb6c28e76947f49222c99fec4aadb0bb
-        1c24821a 9e83ef</code>
-    </dd>
-    <dt>
-        Command <code>[]string</code>
-    </dt>
-    <dd>
-        Command to run in service containers.
-    </dd>
-    <dt>
-        Args <code>[]string</code>
-    </dt>
-    <dd>
-        Arguments passed to the service containers.
-    </dd>
-    <dt>
-        Env <code>[]string</code>
-    </dt>
-    <dd>
-        Environment variables.
-    </dd>
-    <dt>
-        Labels <code>map[string]string</code>
-    </dt>
-    <dd>
-        Labels used for setting meta data on services.
-    </dd>
-    <dt>
-        Ports <code>[]Port</code>
-    </dt>
-    <dd>
-        Service ports (composed of <code>Port</code> (<code>int</code>) and
-        <code>Protocol</code> (<code>string</code>). A service description can
-        only specify the container port to be exposed. These ports can be
-        mapped on runtime hosts at the operator's discretion.
-    </dd>
-
-    <dt>
-        WorkingDir <code>string</code>
-    </dt>
-    <dd>
-        Working directory inside the service containers.
-    </dd>
-
-    <dt>
-        User <code>string</code>
-    </dt>
-    <dd>
-        Username or UID (format: <code>&lt;name|uid&gt;[:&lt;group|gid&gt;]</code>).
-    </dd>
-
-    <dt>
-        Networks <code>[]string</code>
-    </dt>
-    <dd>
-        Networks that the service containers should be connected to. An entity
-        deploying a bundle should create networks as needed.
-    </dd>
-</dl>
-
-The following is an example of bundlefile with two services:
-
-```json
-{
-	"Version": "0.1",
-	"Services": {
-		"redis": {
-			"Image": "redis@sha256:4b24131101fa0117bcaa18ac37055fffd9176aa1a240392bb8ea85e0be50f2ce",
-			"Networks": ["default"]
-		},
-		"web": {
-			"Image": "dockercloud/hello-world@sha256:fe79a2cfbd17eefc344fb8419420808df95a1e22d93b7f621a7399fd1e9dca1d",
-			"Networks": ["default"],
-			"User": "web"
-		}
-	}
-}
-```
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.gliffy b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.gliffy
deleted file mode 100644
index bf0512af76..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.gliffy
+++ /dev/null
@@ -1 +0,0 @@
-{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#FFFFFF","width":447,"height":422,"nodeIndex":326,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":5000,"maxHeight":5000,"themeData":{"uid":"com.gliffy.theme.beach_day","name":"Beach Day","shape":{"primary":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#AEE4F4","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#004257"}},"secondary":{"strokeWidth":2,"strokeColor":"#CDB25E","fillColor":"#EACF81","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#332D1A"}},"tertiary":{"strokeWidth":2,"strokeColor":"#FFBE00","fillColor":"#FFF1CB","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#000000"}},"highlight":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#00A4DA","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#ffffff"}}},"line":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"none","arrowType":2,"interpolationType":"quadratic","cornerRadius":0,"text":{"color":"#002248"}},"text":{"color":"#002248"},"stage":{"color":"#FFFFFF"}},"viewportType":"default","fitBB":{"min":{"x":9,"y":10.461511948529278},"max":{"x":447,"y":421.5}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":12.0,"y":200.0,"rotation":0.0,"id":276,"width":434.00000000000006,"height":197.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":10,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#434343","fillColor":"#c5e4fc","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.93,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":275.0,"y":8.93295288085936,"rotation":0.0,"id":269,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":14,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":272,"py":0.5,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":290,"py":1.0,"px":0.7071067811865476}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[82.0,295.5670471191406],[-4.628896294384617,211.06704711914062]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":285.0,"y":18.93295288085936,"rotation":0.0,"id":268,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":15,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":316,"py":0.5,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":290,"py":0.9999999999999996,"px":0.29289321881345254}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-204.0,285.5670471191406],[-100.37110370561533,201.06704711914062]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":8.0,"y":203.5,"rotation":0.0,"id":267,"width":116.0,"height":16.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":16,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;font-family:Arial;\">Docker Host</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":10.0,"y":28.93295288085936,"rotation":0.0,"id":278,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":17,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":290,"py":0.5,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":246,"py":0.5,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[217.5,167.06704711914062],[219.11774189711457,53.02855906766992]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":57.51435447730654,"y":10.461511948529278,"rotation":0.0,"id":246,"width":343.20677483961606,"height":143.0,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":18,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#434343","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":106.0,"y":55.19999694824217,"rotation":0.0,"id":262,"width":262.0,"height":75.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":22,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:13px;\">Unless notified about the container networks, the physical network does not have a route to their subnets</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;font-weight:bold;\">Who has 10.16.20.0/24?</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;font-weight:bold;\">Who has 10.1.20.0/24?</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":7.0,"y":403.5,"rotation":0.0,"id":282,"width":442.0,"height":18.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":23,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:16px;font-style:italic;\">Containers can be on different subnets and reach each other</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":106.0,"y":252.5,"rotation":0.0,"id":288,"width":238.0,"height":22.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":24,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:20px;font-weight:bold;\">&nbsp;Ipvlan&nbsp;</span><span style=\"font-size:20px;font-weight:bold;\">L3 Mode</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":124.0,"y":172.0,"rotation":0.0,"id":290,"width":207.0,"height":48.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":25,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#cccccc","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":1.0,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":3.568965517241383,"y":0.0,"rotation":0.0,"id":291,"width":199.86206896551747,"height":42.0,"uid":null,"order":27,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-weight:bold;\">Eth0</span></p><p style=\"text-align:center;\"><span style=\"font-weight:bold;\">192.168.50.10/24</span></p><p style=\"text-align:center;\"><span style=\"\">Parent interface acts as a <span style=\"font-weight:bold;\">Router</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":29.0,"y":358.1999969482422,"rotation":0.0,"id":304,"width":390.99999999999994,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":29,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;\">All containers can ping each other <span style=\"font-weight:bold;\">without</span> a router if </span></p><p style=\"text-align:center;\"><span style=\"font-size:14px;\">they share the <span style=\"font-weight:bold;\">same</span> parent interface (<span style=\"font-style:italic;\">example eth0)</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":24.0,"y":276.0,"rotation":0.0,"id":320,"width":134.0,"height":77.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":48,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":316,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":44,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.279999999999999,"y":0.0,"rotation":0.0,"id":317,"width":109.44000000000001,"height":43.0,"uid":null,"order":47,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container(s)</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Eth0&nbsp;</span></span></p><p style=\"text-align:center;\"><span style=\"font-weight:bold;\">172.16.20.x/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":10.0,"y":10.0,"rotation":0.0,"id":318,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":42,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":20.0,"y":20.0,"rotation":0.0,"id":319,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":40,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":300.0,"y":276.0,"rotation":0.0,"id":321,"width":134.0,"height":77.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":49,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":272,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":35,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[{"x":2.279999999999999,"y":0.0,"rotation":0.0,"id":273,"width":109.44000000000001,"height":44.0,"uid":null,"order":38,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container(s)</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Eth0 <span style=\"font-weight:bold;\">10.1.20.x/24</span></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":10.0,"y":10.0,"rotation":0.0,"id":310,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":33,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":20.0,"y":20.0,"rotation":0.0,"id":312,"width":114.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":31,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.97,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":368.0,"y":85.93295288085938,"rotation":0.0,"id":322,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":50,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#434343","fillColor":"none","dashStyle":"4.0,4.0","startArrow":2,"endArrow":2,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-191.0,222.06704711914062],[-80.9272967534639,222.06704711914062]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":167.0,"y":25.499999999999986,"rotation":0.0,"id":323,"width":135.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":51,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;font-weight:bold;font-family:Arial;\">Physical Network</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":53}],"shapeStyles":{},"lineStyles":{"global":{"fill":"none","stroke":"#434343","strokeWidth":2,"dashStyle":"4.0,4.0","startArrow":2,"endArrow":2,"orthoMode":2}},"textStyles":{"global":{"face":"Arial","size":"13px","color":"#000000"}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.basic.basic_v1.default","com.gliffy.libraries.flowchart.flowchart_v1.default","com.gliffy.libraries.swimlanes.swimlanes_v1.default","com.gliffy.libraries.images","com.gliffy.libraries.network.network_v4.home","com.gliffy.libraries.network.network_v4.business","com.gliffy.libraries.network.network_v4.rack","com.gliffy.libraries.network.network_v3.home","com.gliffy.libraries.network.network_v3.business","com.gliffy.libraries.network.network_v3.rack"],"lastSerialized":1458117032939,"analyticsProduct":"Confluence"},"embeddedResources":{"index":0,"resources":[]}}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.png b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.png
deleted file mode 100644
index 3227a83ca1..0000000000
Binary files a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.svg b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.svg
deleted file mode 100644
index 6ed1430800..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan-l3.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="467" height="441.5"><style xmlns="http://www.w3.org/1999/xhtml"></style><defs/><g transform="translate(0,0)"><g><rect fill="#FFFFFF" stroke="none" x="0" y="0" width="467" height="441.5"/></g><g transform="translate(0,0) matrix(1,0,0,1,12,200)"><g><g transform="translate(0,0) scale(4.340000000000001,1.97)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.23041474654377878,0.5076142131979695)"><path fill="#c5e4fc" stroke="none" d="M 10 0 L 424.00000000000006 0 Q 434.00000000000006 0 434.00000000000006 10 L 434.00000000000006 187 Q 434.00000000000006 197 424.00000000000006 197 L 10 197 Q 0 197 0 187 L 0 10 Q 0 0 10 0 Z" opacity="0.93"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 424.00000000000006 0 Q 434.00000000000006 0 434.00000000000006 10 L 434.00000000000006 187 Q 434.00000000000006 197 424.00000000000006 197 L 10 197 Q 0 197 0 187 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" stroke-width="2" opacity="0.93"/></g></g></g></g></g><g transform="matrix(1,0,0,1,265.8711037056154,215.5)"><g transform="translate(0,0)"><g transform="translate(-275,-8.93295288085936) translate(9.128896294384617,-206.56704711914062) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 357 304.5 L 270.3711037056154 220" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,76.5,215.5)"><g transform="translate(0,0)"><g transform="translate(-285,-18.93295288085936) translate(208.5,-196.56704711914062) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 81 304.5 L 184.62889629438467 220" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,10,204)"><g transform="translate(18,0) matrix(1,0,0,1,0,0) translate(-18,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="113" height="16" fill-opacity="0"/></g></g><g transform="translate(18,0) matrix(1,0,0,1,0,0) translate(-18,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="113" height="16" fill-opacity="0"/></g></g><g transform="translate(18,0) matrix(1,0,0,1,0,0) translate(-18,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="18" y="0" width="79" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="18" y="14">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="66" y="14">Host</text></g></g><g transform="matrix(1,0,0,1,223,77.46151194852928)"><g transform="translate(0,0)"><g transform="translate(-10,-28.93295288085936) translate(-213,-48.52855906766992) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 227.5 196 L 229.11774189711457 81.96151194852928" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,57.51435447730654,10.461511948529278)"><g><g transform="translate(0,0) scale(3.4320505881432197,2.464785030240155) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#434343" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,108,55)"><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="259" height="75" fill-opacity="0"/></g></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="259" height="45" fill-opacity="0"/></g></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="29" y="0" width="231" height="45" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="29" y="13">Unless</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="73" y="13">notified</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="118" y="13">about</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="154" y="13">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="176" y="13">container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="14" y="28">networks</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="66" y="28">,</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="73" y="28">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="95" y="28">physical</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="146" y="28">network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="195" y="28">does</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="227" y="28">not</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="47" y="43">have</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="79" y="43">a</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="90" y="43">route</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="123" y="43">to</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="137" y="43">their</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="166" y="43">subnets</text></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="45" width="259" height="15" fill-opacity="0"/></g></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="57" y="45" width="147" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="57" y="58">Who</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="89" y="58">has</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="115" y="58">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="129" y="58">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="133" y="58">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="147" y="58">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="151" y="58">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="165" y="58">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="169" y="58">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="176" y="58">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="180" y="58">24</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="194" y="58">?</text></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="60" width="259" height="15" fill-opacity="0"/></g></g><g transform="translate(146,210) matrix(1,0,0,1,0,0) translate(-146,-210)"><g><rect fill="rgb(0,0,0)" stroke="none" x="60" y="60" width="139" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="60" y="73">Who</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="92" y="73">has</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="118" y="73">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="133" y="73">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="136" y="73">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="144" y="73">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="147" y="73">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="162" y="73">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="165" y="73">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="172" y="73">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="176" y="73">24</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="191" y="73">?</text></g></g><g transform="matrix(1,0,0,1,9,404)"><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="439" height="18" fill-opacity="0"/></g></g><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="439" height="18" fill-opacity="0"/></g></g><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="4" y="0" width="431" height="17" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="4" y="15">Containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="86" y="15">can</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="116" y="15">be</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="139" y="15">on</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="161" y="15">different</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="223" y="15">subnets</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="284" y="15">and</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="315" y="15">reach</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="359" y="15">each</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="398" y="15">other</text></g></g><g transform="matrix(1,0,0,1,108,253)"><g transform="translate(153,0) matrix(1,0,0,1,0,0) translate(-153,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="235" height="22" fill-opacity="0"/></g></g><g transform="translate(153,0) matrix(1,0,0,1,0,0) translate(-153,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="235" height="22" fill-opacity="0"/></g></g><g transform="translate(153,0) matrix(1,0,0,1,0,0) translate(-153,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="42" y="0" width="70" height="22" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="48" y="19">Ipvlan</text></g><g transform="translate(153,0) matrix(1,0,0,1,0,0) translate(-153,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="111" y="0" width="82" height="22" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="111" y="19">L3</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="140" y="19">Mode</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,124,172)"><g transform="translate(4,4) scale(1.002415458937198,1.0104166666666667)"><g><g transform="translate(0,0) scale(2.07,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.48309178743961356,2.0833333333333335)"><path fill="#000000" stroke="none" d="M 10 0 L 196.99999999999997 0 Q 206.99999999999997 0 206.99999999999997 10 L 206.99999999999997 38 Q 206.99999999999997 48 196.99999999999997 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 196.99999999999997 0 Q 206.99999999999997 0 206.99999999999997 10 L 206.99999999999997 38 Q 206.99999999999997 48 196.99999999999997 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(2.07,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.48309178743961356,2.0833333333333335)"><path fill="#cccccc" stroke="none" d="M 10 0 L 196.99999999999997 0 Q 206.99999999999997 0 206.99999999999997 10 L 206.99999999999997 38 Q 206.99999999999997 48 196.99999999999997 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 196.99999999999997 0 Q 206.99999999999997 0 206.99999999999997 10 L 206.99999999999997 38 Q 206.99999999999997 48 196.99999999999997 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,136,175)"><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="185" height="42" fill-opacity="0"/></g></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="185" height="14" fill-opacity="0"/></g></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="79" y="0" width="27" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="79" y="12">Eth0</text></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="185" height="14" fill-opacity="0"/></g></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="46" y="14" width="95" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="46" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="66" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="69" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="89" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="92" y="26">50</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="106" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="109" y="26">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="122" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="126" y="26">24</text></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="185" height="14" fill-opacity="0"/></g></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="3" y="28" width="179" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="3" y="40">Parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="42" y="40">interface</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="91" y="40">acts</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="117" y="40">as</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="133" y="40">a</text></g><g transform="translate(271,112) matrix(1,0,0,1,0,0) translate(-271,-112)"><g><rect fill="rgb(0,0,0)" stroke="none" x="143" y="28" width="40" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="143" y="40">Router</text></g></g><g transform="matrix(1,0,0,1,31,358)"><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="388" height="32" fill-opacity="0"/></g></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="388" height="16" fill-opacity="0"/></g></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="30" y="0" width="328" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="30" y="14">All</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="50" y="14">containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="118" y="14">can</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="145" y="14">ping</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="175" y="14">each</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="209" y="14">other</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="299" y="14">a</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="310" y="14">router</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="351" y="14">if</text></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="245" y="0" width="50" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="245" y="14">without</text></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="388" height="16" fill-opacity="0"/></g></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="31" y="16" width="328" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="31" y="30">they</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="61" y="30">share</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="100" y="30">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="163" y="30">parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="206" y="30">interface</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="260" y="30"> (</text></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="123" y="16" width="36" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="123" y="30">same</text></g><g transform="translate(698,64) matrix(1,0,0,1,0,0) translate(-698,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="269" y="16" width="90" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="269" y="30">example</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="326" y="30">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="353" y="30">)</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,320,296)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,310,286)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,300,276)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="matrix(1,0,0,1,310,283)"><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="94" height="44" fill-opacity="0"/></g></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="94" height="14" fill-opacity="0"/></g></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="14" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="70" y="12">s</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="76" y="12">)</text></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="94" height="30" fill-opacity="0"/></g></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="34" y="14" width="73" height="30" fill-opacity="0"/></g></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="34" y="14" width="73" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="34" y="27">Eth0</text></g><g transform="translate(93,71) matrix(1,0,0,1,0,0) translate(-93,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="29" width="73" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="11" y="42">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="26" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="29" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="36" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="40" y="42">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="54" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="58" y="42">x</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="65" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="69" y="42">24</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,44,296)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,34,286)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,24,276)"><g><g transform="translate(0,0) scale(1.14,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.8771929824561404,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 103.99999999999999 0 Q 113.99999999999999 0 113.99999999999999 10 L 113.99999999999999 46.99999999999999 Q 113.99999999999999 56.99999999999999 103.99999999999999 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="matrix(1,0,0,1,34,283)"><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="94" height="43" fill-opacity="0"/></g></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="94" height="14" fill-opacity="0"/></g></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="14" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="70" y="12">s</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="76" y="12">)</text></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="94" height="15" fill-opacity="0"/></g></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="32" y="14" width="31" height="15" fill-opacity="0"/></g></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="32" y="14" width="31" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="32" y="27">Eth0</text></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="29" width="94" height="14" fill-opacity="0"/></g></g><g transform="translate(85,100) matrix(1,0,0,1,0,0) translate(-85,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="7" y="29" width="81" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="7" y="41">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="27" y="41">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="31" y="41">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="44" y="41">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="47" y="41">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="61" y="41">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="64" y="41">x</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="71" y="41">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="74" y="41">24</text></g></g><g transform="matrix(1,0,0,1,147,278)"><image width="170" height="60" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAKoAAAA8CAYAAAD2SSHcAAADKElEQVR4Ae3ZPWgTYRzH8SYx4gu4CG5CDAkoOAkdsiYh6GwzqEMHB1FwUREaEU7roE5KwUm6uAihc8krMUtwc3QwAREUqRIXI2he/F0xEGgSr2fvTb6B48Jzz+vn+ee5uycLC3wQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEEAAAQQQQAABBBBAAAEEEAi6QCjoA/BR/wNlGfER3MyuZDKZxXg8/iKZTL5ut9tfZmbkgmWBXC53LBaLVRKJxLtOp/PeckGPMu7zqF1LzQrz5GAweKDM5y0VINNuBVLD4bChhWAzHA4XKpXKm91W4FZ+XwaqAvS4AtTQsSyIQKz6bk2YQ+2cU8CezWazL3W+W6/X2w61Y7taXwWqftlHNZKCAvSazgdsj4qCdgRCo9HoQigUWkqn08+j0ehqqVT6ZKciJ8r4IlC1gh5WcN7QAG/pOOLEQKnTskBUwXq13+8va+F4qnl53Gg0vlku7VDGsEP1Wqo2n8/v1+3mujC2VOC+DoLUkpwrmQ6plZVIJLKlgL2dSqUOutLqjEY82aIwDCPcbDYv6Zd7T/06MaNvO5KFdqpcLr81LwhvtCPDREKtVps7NsrP95ugHH/9aM6XVtp1rbD9caJbZ09XVLcGSTvBF5i76jg9PPPW3+12r+gh/pHa+uutZXJFdbpv/3v95j6qHrk+WxinuXre6fV6a61W64eF/I5k8fRlqlgs/tSo1oS2zsuUI/P7L5X2VNg3L1OeBupYUc+d3/V9Vc+Nz3Qu6GB7aozj/vmX7nBsT81z1wvQV12/qRX2iVZYQ9/Z8J8HtrfXRnpZ8u2Gvy9fprTCflDQXtYz6WnNxcbezge1TREw/0I9U61WL/rxXymzv7649U+B2076sxW1pEeCRSU8nJWPdNsCLQXoiv7jf2W7BgpOFfB0l2Jqj4KbiGVw546eI4AAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCCCAAAIIIIAAAggggAACCGwL/AYbB9txUIt6ngAAAABJRU5ErkJggg==" transform="translate(0,0)"/></g><g transform="matrix(1,0,0,1,169,33)"><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="32" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="16" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="116" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="8" y="14">Physical</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="69" y="14">Network</text></g></g></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.gliffy b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.gliffy
deleted file mode 100644
index 41b0475dfa..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.gliffy
+++ /dev/null
@@ -1 +0,0 @@
-{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#ffffff","width":323,"height":292,"nodeIndex":211,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":5000,"maxHeight":5000,"themeData":null,"viewportType":"default","fitBB":{"min":{"x":16,"y":21.51999694824218},"max":{"x":323,"y":291.5}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":241.0,"y":36.0,"rotation":0.0,"id":199,"width":73.00000000000003,"height":40.150000000000006,"uid":"com.gliffy.shape.network.network_v4.business.router","order":41,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.router","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":85.0,"y":50.0,"rotation":0.0,"id":150,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":37,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#999999","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[3.1159999999999997,6.359996948242184],[85.55799999999999,6.359996948242184],[85.55799999999999,62.0],[84.0,62.0]],"lockSegments":{"1":true},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":22.803646598905374,"y":21.51999694824218,"rotation":0.0,"id":134,"width":64.31235340109463,"height":90.0,"uid":"com.gliffy.shape.cisco.cisco_v1.servers.standard_host","order":43,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.servers.standard_host","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#3d85c6","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":87.0,"y":24.199996948242188,"rotation":0.0,"id":187,"width":105.0,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":39,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:left;\"><span style=\"\">eth0 192.168.1.0/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":147.0,"y":50.0,"rotation":0.0,"id":196,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":40,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":199,"py":0.5,"px":0.0}}},"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#999999","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-82.00001598011289,6.075000000000003],[94.0,6.075000000000003]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":220.0,"y":79.19999694824219,"rotation":0.0,"id":207,"width":105.0,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":42,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Network Router</span></p><p style=\"text-align:center;\"><span style=\"\">192.168.1.1/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":27.38636363636374,"y":108.14285409109937,"rotation":0.0,"id":129,"width":262.0,"height":124.0,"uid":"com.gliffy.shape.iphone.iphone_ios7.icons_glyphs.glyph_cloud","order":44,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.iphone.iphone_ios7.icons_glyphs.glyph_cloud","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#929292","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":33.0,"y":157.96785409109907,"rotation":0.0,"id":114,"width":150.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":16,"lockAspectRatio":false,"lockShape":false,"children":[{"x":44.0,"y":2.9951060358893704,"rotation":0.0,"id":95,"width":62.0,"height":36.17618270799329,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":4,"lockAspectRatio":false,"lockShape":false,"children":[{"x":29.139999999999997,"y":3.2300163132136848,"rotation":0.0,"id":96,"width":3.719999999999998,"height":29.7161500815659,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":13,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":99,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":99,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.8599999999999994,-1.2920065252854727],[1.8599999999999994,31.0081566068514]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":51.46,"y":3.2300163132136848,"rotation":0.0,"id":97,"width":1.2156862745098034,"height":31.008156606851365,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":10,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-1.4193795664340882,-1.292006525285804],[-1.4193795664340882,31.008156606851536]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":9.919999999999993,"y":1.5073409461663854,"rotation":0.0,"id":98,"width":1.239999999999999,"height":31.008156606851365,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":7,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[2.0393795664339223,0.4306688417619762],[2.0393795664339223,32.73083197389853]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":1.9380097879282103,"rotation":0.0,"id":99,"width":62.0,"height":32.300163132136866,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":2,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#6fa8dc","fillColor":"#3d85c6","gradient":true,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":38.326264274062034,"rotation":0.0,"id":112,"width":150.0,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":15,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">container1</span></span></p><p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">192.168.1.2/24</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":124.0,"y":157.96785409109907,"rotation":0.0,"id":115,"width":150.0,"height":58.99999999999999,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":33,"lockAspectRatio":false,"lockShape":false,"children":[{"x":44.0,"y":2.94518760195788,"rotation":0.0,"id":116,"width":62.0,"height":35.573246329526725,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":21,"lockAspectRatio":false,"lockShape":false,"children":[{"x":29.139999999999997,"y":3.1761827079934557,"rotation":0.0,"id":117,"width":3.719999999999998,"height":29.220880913539798,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":30,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":120,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":120,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.8600000000000136,-1.2704730831974018],[1.8600000000000136,30.49135399673719]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":51.46,"y":3.1761827079934557,"rotation":0.0,"id":118,"width":1.2156862745098034,"height":30.49135399673717,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":27,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-1.4193795664340882,-1.2704730831977067],[-1.4193795664340882,30.491353996737335]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":9.919999999999993,"y":1.482218597063612,"rotation":0.0,"id":119,"width":1.239999999999999,"height":30.49135399673717,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":24,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[2.0393795664339223,0.42349102773260977],[2.0393795664339223,32.185318107666895]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":1.9057096247960732,"rotation":0.0,"id":120,"width":62.0,"height":31.76182707993458,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":19,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#6fa8dc","fillColor":"#3d85c6","gradient":true,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":36.36247960848299,"rotation":0.0,"id":121,"width":150.0,"height":30.183360522022674,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":32,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">container2</span></span></p><p style=\"text-align:center;\"><span style=\"\">192.168.1.3/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":102.0,"y":130.1999969482422,"rotation":0.0,"id":130,"width":150.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":34,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">pub_net (eth0)</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":93.0,"y":92.69999694824219,"rotation":0.0,"id":140,"width":150.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":35,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"text-decoration:none;font-family:Arial;font-size:12px;\"><span style=\"text-decoration:none;\"><br /></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":14.0,"y":114.19999694824219,"rotation":0.0,"id":142,"width":78.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":36,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">Docker Host</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":71.0,"y":235.5,"rotation":0.0,"id":184,"width":196.0,"height":56.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":38,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:left;\"><span style=\"\">docker network create -d ipvlan \\</span></p><p style=\"text-align:left;\"><span style=\"\">&nbsp; &nbsp; --subnet&#61;192.168.1.0/24 \\</span></p><p style=\"text-align:left;\"><span style=\"\">&nbsp; &nbsp; --gateway&#61;192.168.1.1 \\</span></p><p style=\"text-align:left;\"><span style=\"\">&nbsp; &nbsp; -o parent&#61;eth0 pub_net</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":45}],"shapeStyles":{},"lineStyles":{"global":{"stroke":"#999999","strokeWidth":6,"orthoMode":1}},"textStyles":{"global":{"bold":true,"face":"Arial","size":"12px","color":"#000000"}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.network.network_v4.home","com.gliffy.libraries.network.network_v4.business","com.gliffy.libraries.network.network_v4.rack","com.gliffy.libraries.network.network_v3.home","com.gliffy.libraries.network.network_v3.business","com.gliffy.libraries.network.network_v3.rack"],"lastSerialized":1457584497063,"analyticsProduct":"Confluence"},"embeddedResources":{"index":0,"resources":[]}}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.png b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.png
deleted file mode 100644
index e489a446dd..0000000000
Binary files a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.svg b/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.svg
deleted file mode 100644
index 48097dc83b..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/ipvlan_l2_simple.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="343" height="311.5"><style xmlns="http://www.w3.org/1999/xhtml"></style><defs><linearGradient id="tFoWDamkeRwJ" x1="0px" x2="0px" y1="100px" y2="-50px" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3d85c6"/><stop offset="1" stop-color="#FFFFFF"/></linearGradient><linearGradient id="rNGNyECMdeKI" x1="0px" x2="0px" y1="100px" y2="-50px" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3d85c6"/><stop offset="1" stop-color="#FFFFFF"/></linearGradient></defs><g transform="translate(0,0)"><g><rect fill="#ffffff" stroke="none" x="0" y="0" width="343" height="311.5"/></g><g transform="translate(0,0) matrix(1,0,0,1,77,162.90096991491666)"><g><g transform="translate(0,0) scale(0.62,0.32300163132136867)"><g><path fill="url(#tFoWDamkeRwJ)" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(1.6129032258064517,3.0959595959596116)"><path fill="none" stroke="none" d="M 0 0 L 62 0 Q 62 0 62 0 L 62 32.300163132136866 Q 62 32.300163132136866 62 32.300163132136866 L 0 32.300163132136866 Q 0 32.300163132136866 0 32.300163132136866 L 0 0 Q 0 0 0 0 Z"/><path fill="url(#tFoWDamkeRwJ)" stroke="#6fa8dc" d="M 0 0 M 0 0 L 62 0 Q 62 0 62 0 L 62 32.300163132136866 Q 62 32.300163132136866 62 32.300163132136866 L 0 32.300163132136866 Q 0 32.300163132136866 0 32.300163132136866 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,84.45937956643391,158.4009699149168)"><g transform="translate(0,0)"><g transform="translate(-86.91999999999999,-162.47030107315481) translate(2.4606204335660777,4.069331158238015) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 88.95937956643391 162.9009699149168 L 88.95937956643391 195.20113304705336" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,122.54062043356592,158.40096991491632)"><g transform="translate(0,0)"><g transform="translate(-128.46,-164.19297644020213) translate(5.919379566434088,5.792006525285814) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 127.04062043356592 162.90096991491632 L 127.04062043356592 195.20113304705367" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,103.5,158.40096991491666)"><g transform="translate(0,0)"><g transform="translate(-106.14,-164.19297644020213) translate(2.6400000000000006,5.792006525285473) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 108 162.90096991491666 L 108 195.20113304705353" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,35,196)"><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="28" fill-opacity="0"/></g></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="45" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="45" y="0" width="57" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="45" y="12">container1</text></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="81" height="14" fill-opacity="0"/></g></g><g transform="translate(156,42) matrix(1,0,0,1,0,0) translate(-156,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="81" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="33" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="53" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="77" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="80" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="87" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="90" y="26">2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="97" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="100" y="26">24</text></g></g><g transform="translate(0,0) matrix(1,0,0,1,168,162.818751317853)"><g><g transform="translate(0,0) scale(0.62,0.3176182707993458)"><g><path fill="url(#rNGNyECMdeKI)" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(1.6129032258064517,3.148433487416555)"><path fill="none" stroke="none" d="M 0 0 L 62 0 Q 62 0 62 0 L 62 31.76182707993458 Q 62 31.76182707993458 62 31.76182707993458 L 0 31.76182707993458 Q 0 31.76182707993458 0 31.76182707993458 L 0 0 Q 0 0 0 0 Z"/><path fill="url(#rNGNyECMdeKI)" stroke="#6fa8dc" d="M 0 0 M 0 0 L 62 0 Q 62 0 62 0 L 62 31.76182707993458 Q 62 31.76182707993458 62 31.76182707993458 L 0 31.76182707993458 Q 0 31.76182707993458 0 31.76182707993458 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,175.4593795664339,158.31875131785318)"><g transform="translate(0,0)"><g transform="translate(-177.92,-162.39526029012058) translate(2.4606204335660777,4.076508972267391) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 179.9593795664339 162.81875131785318 L 179.9593795664339 194.58057839778746" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,213.54062043356592,158.3187513178527)"><g transform="translate(0,0)"><g transform="translate(-219.46,-164.08922440105042) translate(5.919379566434088,5.7704730831977145) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 218.04062043356592 162.8187513178527 L 218.04062043356592 194.58057839778775" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,194.5,158.318751317853)"><g transform="translate(0,0)"><g transform="translate(-197.14,-164.08922440105042) translate(2.6399999999999864,5.770473083197402) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 199 162.818751317853 L 199 194.5805783977876" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,126,195)"><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="30" fill-opacity="0"/></g></g><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="45" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="45" y="0" width="57" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="45" y="12">container2</text></g><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(123,28) matrix(1,0,0,1,0,0) translate(-123,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="81" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="33" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="53" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="77" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="80" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="87" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="90" y="26">3</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="97" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="100" y="26">24</text></g></g><g transform="matrix(1,0,0,1,104,130)"><g transform="translate(34,0) matrix(1,0,0,1,0,0) translate(-34,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(34,0) matrix(1,0,0,1,0,0) translate(-34,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(34,0) matrix(1,0,0,1,0,0) translate(-34,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="34" y="0" width="79" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="34" y="12">pub_net</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="78" y="12"> (</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="85" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="109" y="12">)</text></g></g><g transform="matrix(1,0,0,1,95,100)"><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g/></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="74" y="-7" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="74" y="-7" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="1" height="14" fill-opacity="0"/></g></g></g><g transform="matrix(1,0,0,1,16,114)"><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="75" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="75" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="4" y="0" width="67" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="4" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="4" y="12">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="12">Host</text></g></g><g transform="matrix(1,0,0,1,81.616,49.859996948242184)"><g transform="translate(0,0)"><g transform="translate(-85,-50) translate(3.3840000000000003,0.1400030517578159) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 88.116 56.359996948242184 L 160.558 56.359996948242184 Q 170.558 56.359996948242184 170.558 66.35999694824218 L 170.558 102 Q 170.558 112 169.779 112 L 169 112" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="matrix(1,0,0,1,73,236)"><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="193" height="56" fill-opacity="0"/></g></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="193" height="14" fill-opacity="0"/></g></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="174" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="12">docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="39" y="12">network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="85" y="12">create</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="118" y="12"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="125" y="12">d</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="135" y="12">ipvlan</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="167" y="12"> \</text></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="193" height="14" fill-opacity="0"/></g></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="152" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="13" y="26">--</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="21" y="26">subnet</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="26">=</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="64" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="84" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="88" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="108" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="111" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="118" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="121" y="26">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="128" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="131" y="26">24</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="144" y="26"> \</text></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="193" height="14" fill-opacity="0"/></g></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="144" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="13" y="40">--</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="21" y="40">gateway</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="40">=</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="73" y="40">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="93" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="96" y="40">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="116" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="120" y="40">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="126" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="130" y="40">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="136" y="40"> \</text></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="193" height="14" fill-opacity="0"/></g></g><g transform="translate(0,168) matrix(1,0,0,1,0,0) translate(0,-168)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="139" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="13" y="54">-</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="17" y="54">o</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="27" y="54">parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="61" y="54">=</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="68" y="54">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="95" y="54">pub_net</text></g></g><g transform="matrix(1,0,0,1,89,24)"><g transform="translate(0,0) matrix(1,0,0,1,0,0) translate(0,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="102" height="28" fill-opacity="0"/></g></g><g transform="translate(0,0) matrix(1,0,0,1,0,0) translate(0,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="102" height="28" fill-opacity="0"/></g></g><g transform="translate(0,0) matrix(1,0,0,1,0,0) translate(0,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="81" height="28" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="20" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="23" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="43" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="47" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="53" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="26">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="67" y="26">24</text></g></g><g transform="matrix(1,0,0,1,58.49998401988711,49.575)"><g transform="translate(0,0)"><g transform="translate(-147,-50) translate(88.50001598011289,0.42499999999999716) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 64.99998401988711 56.075 L 241 56.075" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,241,36)"><g><g transform="translate(0,0) scale(0.6083333333333336,0.6104050109462419)"><g><g><path fill="#3966A0" stroke="rgb(0,0,0)" d="M 102.635 0 C 93.815 0 86.371 6.797 85.395 15.43 L 4.554 15.43 C 2.043 15.431 0 17.473 0 19.984 L 0 53.338 C 0 55.849 2.043 57.892 4.554 57.892 L 8.016 57.892 L 8.016 65.776 L 96.471 65.776 L 96.471 57.892 L 99.672 57.892 C 102.184 57.892 104.227 55.849 104.227 53.338 L 104.227 34.655 C 107.211 34.382 109.971 33.334 112.331 31.735 L 112.331 31.735 C 112.785 31.428 113.223 31.1 113.643 30.753 C 113.655 30.744 113.665 30.734 113.676 30.725 C 114.093 30.38 114.492 30.017 114.875 29.635 C 114.875 29.635 114.887 29.623 114.893 29.617 C 118.039 26.471 120 22.143 120 17.365 C 120 7.79 112.21 0 102.635 0 Z" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 102.688 3.191 C 94.836 3.191 88.45 9.579 88.45 17.43 C 88.45 25.281 94.838 31.669 102.688 31.669 C 110.54 31.669 116.926 25.281 116.926 17.43 C 116.926 9.579 110.539 3.191 102.688 3.191 Z M 97.377 20.901 C 97.118 20.901 96.859 20.802 96.662 20.605 C 96.267 20.21 96.267 19.569 96.662 19.174 L 97.412 18.424 L 91.228 18.424 C 90.669 18.424 90.216 17.971 90.216 17.412 C 90.216 16.853 90.67 16.4 91.229 16.4 L 97.414 16.4 L 96.699 15.686 C 96.303 15.291 96.303 14.65 96.699 14.255 C 97.095 13.86 97.735 13.86 98.13 14.255 L 100.571 16.696 C 100.665 16.79 100.739 16.902 100.791 17.026 C 100.894 17.273 100.894 17.552 100.791 17.799 C 100.739 17.924 100.665 18.036 100.571 18.129 L 98.093 20.605 C 97.895 20.802 97.637 20.901 97.377 20.901 Z M 105.863 25.522 L 103.422 27.963 C 103.225 28.161 102.965 28.259 102.707 28.259 C 102.698 28.259 102.689 28.254 102.68 28.254 C 102.671 28.254 102.663 28.259 102.655 28.259 C 102.305 28.259 102.012 28.07 101.83 27.801 L 99.515 25.484 C 99.119 25.089 99.119 24.448 99.515 24.053 C 99.91 23.658 100.55 23.658 100.945 24.053 L 101.644 24.752 L 101.644 9.174 L 100.945 9.873 C 100.748 10.071 100.488 10.169 100.23 10.169 C 99.97 10.169 99.711 10.07 99.515 9.873 C 99.119 9.478 99.119 8.837 99.515 8.442 L 101.954 6 C 102.35 5.605 102.988 5.605 103.385 6 L 105.864 8.478 C 106.26 8.873 106.26 9.514 105.864 9.909 C 105.667 10.107 105.408 10.205 105.149 10.205 C 104.889 10.205 104.63 10.106 104.434 9.909 L 103.667 9.143 L 103.667 24.857 L 104.434 24.091 C 104.829 23.696 105.468 23.696 105.864 24.091 C 106.258 24.486 106.258 25.126 105.863 25.522 Z M 114.148 18.46 L 107.964 18.46 L 108.677 19.174 C 109.073 19.569 109.073 20.21 108.677 20.605 C 108.48 20.803 108.22 20.901 107.961 20.901 C 107.702 20.901 107.442 20.802 107.246 20.605 L 104.808 18.165 C 104.713 18.072 104.64 17.959 104.587 17.835 C 104.485 17.588 104.485 17.309 104.587 17.062 C 104.64 16.937 104.713 16.825 104.808 16.732 L 107.284 14.255 C 107.68 13.86 108.32 13.86 108.715 14.255 C 109.11 14.65 109.11 15.291 108.715 15.686 L 107.964 16.437 L 114.149 16.437 C 114.708 16.437 115.161 16.89 115.161 17.449 C 115.16 18.008 114.707 18.46 114.148 18.46 Z" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 80.533 36.476 A 3.247 3.247 0 1 0 80.53299837650013 36.47924699945883 Z" opacity="0.5" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 9.278 35.006 L 20.39 35.006 L 20.39 24 L 9.278 24 L 9.278 35.006 Z M 10.929 25.567 L 18.819 25.567 L 18.819 31.173 L 16.536 31.173 L 16.536 33.456 L 13.213 33.456 L 13.213 31.173 L 10.93 31.173 L 10.929 25.567 L 10.929 25.567 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 24.253 35.015 L 35.365 35.015 L 35.365 24.009 L 24.253 24.009 L 24.253 35.015 Z M 25.904 25.576 L 33.794 25.576 L 33.794 31.182 L 31.51 31.182 L 31.51 33.465 L 28.187 33.465 L 28.187 31.182 L 25.904 31.182 L 25.904 25.576 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 50.3 24.009 L 39.188 24.009 L 39.188 35.014 L 50.3 35.014 L 50.3 24.009 Z M 48.729 31.173 L 46.446 31.173 L 46.446 33.456 L 43.123 33.456 L 43.123 31.173 L 40.84 31.173 L 40.84 25.567 L 48.73 25.567 L 48.729 31.173 L 48.729 31.173 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 54.123 35.023 L 65.234 35.023 L 65.234 24.018 L 54.123 24.018 L 54.123 35.023 Z M 55.774 25.567 L 63.664 25.567 L 63.664 31.173 L 61.38 31.173 L 61.38 33.456 L 58.057 33.456 L 58.057 31.173 L 55.774 31.173 L 55.774 25.567 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 9.278 49.95 L 20.39 49.95 L 20.39 38.944 L 9.278 38.944 L 9.278 49.95 Z M 10.929 40.502 L 18.819 40.502 L 18.819 46.108 L 16.536 46.108 L 16.536 48.391 L 13.213 48.391 L 13.213 46.108 L 10.93 46.108 L 10.929 40.502 L 10.929 40.502 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 24.253 49.958 L 35.365 49.958 L 35.365 38.953 L 24.253 38.953 L 24.253 49.958 Z M 25.904 40.52 L 33.794 40.52 L 33.794 46.126 L 31.51 46.126 L 31.51 48.408 L 28.187 48.408 L 28.187 46.126 L 25.904 46.126 L 25.904 40.52 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 39.228 49.966 L 50.34 49.966 L 50.34 38.962 L 39.228 38.962 L 39.228 49.966 Z M 40.839 40.511 L 48.729 40.511 L 48.729 46.117 L 46.446 46.117 L 46.446 48.4 L 43.123 48.4 L 43.123 46.117 L 40.84 46.117 L 40.839 40.511 L 40.839 40.511 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 54.123 49.966 L 65.234 49.966 L 65.234 38.962 L 54.123 38.962 L 54.123 49.966 Z M 55.774 40.511 L 63.664 40.511 L 63.664 46.117 L 61.38 46.117 L 61.38 48.4 L 58.057 48.4 L 58.057 46.117 L 55.774 46.117 L 55.774 40.511 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 11.504 57.898 L 92.919 57.898 Q 92.919 57.898 92.919 57.898 L 92.919 62.69 Q 92.919 62.69 92.919 62.69 L 11.504 62.69 Q 11.504 62.69 11.504 62.69 L 11.504 57.898 Q 11.504 57.898 11.504 57.898 Z" opacity="0.7" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 85.525 18.936 L 5.082 18.936 C 4.255 18.936 3.582 19.609 3.582 20.436 L 3.582 53.397 C 3.582 54.224 4.255 54.897 5.082 54.897 L 11.504 54.897 L 92.919 54.897 L 99.082 54.897 C 99.909 54.897 100.582 54.224 100.582 53.397 L 100.582 34.526 C 92.561 33.543 86.232 27.039 85.525 18.936 Z M 20.389 49.95 L 9.278 49.95 L 9.278 38.944 L 20.39 38.944 L 20.389 49.95 L 20.389 49.95 Z M 20.389 35.006 L 9.278 35.006 L 9.278 24 L 20.39 24 L 20.389 35.006 L 20.389 35.006 Z M 35.365 49.958 L 24.253 49.958 L 24.253 38.953 L 35.365 38.953 L 35.365 49.958 Z M 35.365 35.015 L 24.253 35.015 L 24.253 24.009 L 35.365 24.009 L 35.365 35.015 Z M 39.188 24.009 L 50.3 24.009 L 50.3 35.014 L 39.188 35.014 L 39.188 24.009 Z M 50.34 49.966 L 39.228 49.966 L 39.228 38.962 L 50.34 38.962 L 50.34 49.966 Z M 65.234 49.966 L 54.123 49.966 L 54.123 38.962 L 65.234 38.962 L 65.234 49.966 Z M 65.234 35.023 L 54.123 35.023 L 54.123 24.018 L 65.234 24.018 L 65.234 35.023 Z M 77.286 39.723 C 75.493 39.723 74.039 38.269 74.039 36.476 C 74.039 34.683 75.493 33.229 77.286 33.229 C 79.079 33.229 80.533 34.683 80.533 36.476 C 80.533 38.269 79.08 39.723 77.286 39.723 Z M 89.541 39.723 C 87.748 39.723 86.294 38.269 86.294 36.476 C 86.294 34.683 87.748 33.229 89.541 33.229 C 91.334 33.229 92.788 34.683 92.788 36.476 C 92.787 38.269 91.334 39.723 89.541 39.723 Z" opacity="0.93" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,222,79)"><g transform="translate(20,28) matrix(1,0,0,1,0,0) translate(-20,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="102" height="28" fill-opacity="0"/></g></g><g transform="translate(20,28) matrix(1,0,0,1,0,0) translate(-20,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="102" height="14" fill-opacity="0"/></g></g><g transform="translate(20,28) matrix(1,0,0,1,0,0) translate(-20,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="9" y="0" width="84" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="9" y="12">Network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="12">Router</text></g><g transform="translate(20,28) matrix(1,0,0,1,0,0) translate(-20,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="102" height="14" fill-opacity="0"/></g></g><g transform="translate(20,28) matrix(1,0,0,1,0,0) translate(-20,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="14" width="82" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="11" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="31" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="34" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="54" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="58" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="64" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="68" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="74" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="78" y="26">24</text></g></g><g transform="translate(0,0) matrix(1,0,0,1,22.803646598905374,21.51999694824218)"><g><g transform="translate(0,0) scale(0.9127109745695561,0.9)"><g><g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 52.371 16.22 L -1.393 16.22 L -1.393 99.52 L 52.371 99.52" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 52.371 99.52 L 69.07 82.82 L 69.07 -0.48 L 19.98 -0.48 L -1.393 16.22 L 52.371 16.22 L 52.371 99.52 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 52.371 16.22 L 69.07 -0.48" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 25.3 16.22 L 25.3 99.52" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 26.149 16.22 L 44.316 -0.48" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 23.823 L 21.317 23.823 Q 21.317 23.823 21.317 23.823 L 21.317 34.868 Q 21.317 34.868 21.317 34.868 L 3.263 34.868 Q 3.263 34.868 3.263 34.868 L 3.263 23.823 Q 3.263 23.823 3.263 23.823 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 23.823 L 47.207 23.823 Q 47.207 23.823 47.207 23.823 L 47.207 34.868 Q 47.207 34.868 47.207 34.868 L 29.156 34.868 Q 29.156 34.868 29.156 34.868 L 29.156 23.823 Q 29.156 23.823 29.156 23.823 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 64.604 L 21.317 64.604 Q 21.317 64.604 21.317 64.604 L 21.317 75.648 Q 21.317 75.648 21.317 75.648 L 3.263 75.648 Q 3.263 75.648 3.263 75.648 L 3.263 64.604 Q 3.263 64.604 3.263 64.604 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 64.604 L 47.207 64.604 Q 47.207 64.604 47.207 64.604 L 47.207 75.648 Q 47.207 75.648 47.207 75.648 L 29.156 75.648 Q 29.156 75.648 29.156 75.648 L 29.156 64.604 Q 29.156 64.604 29.156 64.604 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 82.445 L 21.317 82.445 Q 21.317 82.445 21.317 82.445 L 21.317 93.49 Q 21.317 93.49 21.317 93.49 L 3.263 93.49 Q 3.263 93.49 3.263 93.49 L 3.263 82.445 Q 3.263 82.445 3.263 82.445 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 82.445 L 47.207 82.445 Q 47.207 82.445 47.207 82.445 L 47.207 93.49 Q 47.207 93.49 47.207 93.49 L 29.156 93.49 Q 29.156 93.49 29.156 93.49 L 29.156 82.445 Q 29.156 82.445 29.156 82.445 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,27.38636363636374,108.14285409109937)"><g><g transform="translate(0,0) scale(3.742857142857143,2.8181818181818183)"><g><g><g><path fill="#929292" stroke="rgb(0,0,0)" d="M 58.97 19.094 C 58.977 18.895 59 18.7 59 18.5 C 59 8.283 50.717 0 40.5 0 C 33.11 0 26.751 4.344 23.787 10.607 C 22.275 9.593 20.458 9 18.5 9 C 13.5 9 9.41 12.866 9.037 17.771 C 3.778 19.616 0 24.61 0 30.5 C 0 37.787 5.778 43.71 13 43.975 L 13 44 L 58 44 L 58 43.975 C 64.671 43.71 70 38.235 70 31.5 C 70 25.095 65.18 19.822 58.97 19.094 Z M 58 41.975 L 58 42 L 13 42 L 13 41.975 C 6.883 41.711 2 36.683 2 30.5 C 2 24.994 5.872 20.398 11.039 19.271 C 11.013 19.017 11 18.76 11 18.5 C 11 14.357 14.358 11 18.5 11 C 21.017 11 23.239 12.244 24.6 14.146 C 26.512 7.15 32.897 2 40.5 2 C 49.613 2 57 9.388 57 18.5 C 57 19.353 56.914 20.183 56.79 21 L 58 21 L 58 21.025 C 63.565 21.288 68 25.87 68 31.5 C 68 37.13 63.565 41.712 58 41.975 Z" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g></g></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.gliffy b/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.gliffy
deleted file mode 100644
index eceec778b7..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.gliffy
+++ /dev/null
@@ -1 +0,0 @@
-{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#FFFFFF","width":541,"height":352,"nodeIndex":290,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":5000,"maxHeight":5000,"themeData":{"uid":"com.gliffy.theme.beach_day","name":"Beach Day","shape":{"primary":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#AEE4F4","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#004257"}},"secondary":{"strokeWidth":2,"strokeColor":"#CDB25E","fillColor":"#EACF81","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#332D1A"}},"tertiary":{"strokeWidth":2,"strokeColor":"#FFBE00","fillColor":"#FFF1CB","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#000000"}},"highlight":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#00A4DA","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#ffffff"}}},"line":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"none","arrowType":2,"interpolationType":"quadratic","cornerRadius":0,"text":{"color":"#002248"}},"text":{"color":"#002248"},"stage":{"color":"#FFFFFF"}},"viewportType":"default","fitBB":{"min":{"x":2,"y":6.5},"max":{"x":541,"y":334.5}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":2.0,"y":6.5,"rotation":0.0,"id":288,"width":541.0,"height":22.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":31,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:20px;font-weight:bold;\">Macvlan Bridge Mode &amp; Ipvlan L2 Mode</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":8.0,"y":177.0,"rotation":0.0,"id":234,"width":252.0,"height":129.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":0,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#434343","fillColor":"#c5e4fc","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.93,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":16.0,"y":240.0,"rotation":0.0,"id":225,"width":111.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":1,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.73,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.2199999999999993,"y":0.0,"rotation":0.0,"id":235,"width":106.56,"height":45.0,"uid":null,"order":"auto","lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Container #1</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">eth0</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">172.16.1.10/24</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":138.0,"y":240.0,"rotation":0.0,"id":237,"width":111.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":4,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.73,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.2199999999999993,"y":0.0,"rotation":0.0,"id":238,"width":106.56,"height":44.0,"uid":null,"order":6,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container #2</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">eth0 172.16.1.11/24</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":40.0,"y":-26.067047119140625,"rotation":0.0,"id":258,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":7,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":237,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":241,"py":1.0,"px":0.7071067811865476}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[153.5,266.0670471191406],[117.36753236814712,224.06704711914062]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":50.0,"y":-16.067047119140625,"rotation":0.0,"id":259,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":8,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":225,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":241,"py":0.9999999999999996,"px":0.29289321881345254}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[21.5,256.0670471191406],[62.632467631852876,214.0670471191406]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":60.0,"y":-6.067047119140625,"rotation":0.0,"id":260,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":9,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":241,"py":0.5,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":246,"py":0.5,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[75.0,180.06704711914062],[215.32345076546227,90.06897143333742]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":3.0,"y":184.5,"rotation":0.0,"id":261,"width":79.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":10,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;font-family:Arial;\">Docker </span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;font-family:Arial;\"><span style=\"font-size:14px;\">Host #1</span><span style=\"text-decoration:none;\"><br /></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":283.0,"y":177.0,"rotation":0.0,"id":276,"width":252.0,"height":129.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":11,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#434343","fillColor":"#c5e4fc","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.93,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":291.0,"y":240.0,"rotation":0.0,"id":274,"width":111.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":12,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.73,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.2199999999999993,"y":0.0,"rotation":0.0,"id":275,"width":106.56,"height":45.0,"uid":null,"order":14,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Container #3</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">eth0</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">172.16.1.12/24</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":413.0,"y":240.0,"rotation":0.0,"id":272,"width":111.0,"height":57.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":15,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.73,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.2199999999999993,"y":0.0,"rotation":0.0,"id":273,"width":106.56,"height":44.0,"uid":null,"order":17,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container #4</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">eth0 <span style=\"\">172.16.1.13/24</span></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":315.0,"y":-26.067047119140625,"rotation":0.0,"id":269,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":18,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":272,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":270,"py":1.0,"px":0.7071067811865476}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[153.5,266.0670471191406],[117.36753236814712,224.06704711914062]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":325.0,"y":-16.067047119140625,"rotation":0.0,"id":268,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":19,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":274,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":270,"py":0.9999999999999996,"px":0.29289321881345254}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[21.5,256.0670471191406],[62.632467631852876,214.0670471191406]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":278.0,"y":184.5,"rotation":0.0,"id":267,"width":79.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":20,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;font-family:Arial;\">Docker </span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;font-family:Arial;\"><span style=\"font-size:14px;\">Host #2</span><span style=\"text-decoration:none;\"><br /></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":70.0,"y":3.932952880859375,"rotation":0.0,"id":278,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":21,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":270,"py":0.5,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":246,"py":0.5,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[340.0,170.06704711914062],[205.32345076546227,80.06897143333742]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":167.32131882292583,"y":39.0019243141968,"rotation":0.0,"id":246,"width":216.0042638850729,"height":90.0,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":22,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#434343","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":356.0,"y":150.0,"rotation":0.0,"id":270,"width":108.0,"height":48.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":23,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#cccccc","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":1.0,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":1.8620689655172418,"y":0.0,"rotation":0.0,"id":271,"width":104.27586206896557,"height":42.0,"uid":null,"order":25,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:12px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\"><span style=\"font-style:italic;\">(Host)</span><span style=\"font-weight:bold;\"><span style=\"\"> eth0</span></span><br /></span></span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">172.16.1.253/24</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">(IP Optional)</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":81.0,"y":150.0,"rotation":0.0,"id":241,"width":108.0,"height":48.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":26,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#cccccc","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":1.0,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":1.8620689655172415,"y":0.0,"rotation":0.0,"id":242,"width":104.27586206896555,"height":42.0,"uid":null,"order":28,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:12px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\"><span style=\"\"><span style=\"font-style:italic;\">(Host)</span></span><span style=\"font-weight:bold;\"> eth0</span><br /></span></span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">172.16.1.254/24</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:12px;font-style:italic;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">(IP Optional)</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":224.0,"y":64.19999694824219,"rotation":0.0,"id":262,"width":120.00000000000001,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":29,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;\">Network Gateway</span></p><p style=\"text-align:center;\"><span style=\"font-size:14px;\"><span style=\"\">172.16.1.1</span><span style=\"\">/24</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":307.5,"rotation":0.0,"id":282,"width":541.0,"height":36.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":30,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:16px;font-style:italic;\">Containers Attached Directly to Parent Interface. No Bridge Used (Docker0)</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":32}],"shapeStyles":{},"lineStyles":{"global":{"fill":"none","stroke":"#000000","strokeWidth":1,"orthoMode":2}},"textStyles":{"global":{"italic":true,"face":"Arial","size":"20px","color":"#000000","bold":false}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.basic.basic_v1.default","com.gliffy.libraries.flowchart.flowchart_v1.default","com.gliffy.libraries.swimlanes.swimlanes_v1.default","com.gliffy.libraries.images","com.gliffy.libraries.network.network_v4.home","com.gliffy.libraries.network.network_v4.business","com.gliffy.libraries.network.network_v4.rack","com.gliffy.libraries.network.network_v3.home","com.gliffy.libraries.network.network_v3.business","com.gliffy.libraries.network.network_v3.rack"],"lastSerialized":1458124258706,"analyticsProduct":"Confluence"},"embeddedResources":{"index":0,"resources":[]}}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.png b/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.png
deleted file mode 100644
index 13aa4f212d..0000000000
Binary files a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.svg b/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.svg
deleted file mode 100644
index 757871e3d4..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/macvlan-bridge-ipvlan-l2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="561" height="354.5"><style xmlns="http://www.w3.org/1999/xhtml"></style><defs/><g transform="translate(0,0)"><g><rect fill="#FFFFFF" stroke="none" x="0" y="0" width="561" height="354.5"/></g><g transform="translate(0,0) matrix(1,0,0,1,8,177)"><g><g transform="translate(0,0) scale(2.52,1.29)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.3968253968253968,0.7751937984496123)"><path fill="#c5e4fc" stroke="none" d="M 10 0 L 242 0 Q 252 0 252 10 L 252 119 Q 252 129 242 129 L 10 129 Q 0 129 0 119 L 0 10 Q 0 0 10 0 Z" opacity="0.93"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 242 0 Q 252 0 252 10 L 252 119 Q 252 129 242 129 L 10 129 Q 0 129 0 119 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" stroke-width="2" opacity="0.93"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,16,240)"><g transform="translate(4,4) scale(1.0045045045045045,1.0087719298245614)"><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#000000" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.73"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.73"/></g></g></g></g></g><g transform="matrix(1,0,0,1,26,246)"><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="45" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="9" y="0" width="75" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="9" y="0" width="75" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="9" y="13">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="65" y="13"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="76" y="13">1</text></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="15" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="15" width="26" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="15" width="26" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="33" y="28">eth0</text></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="30" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="30" width="88" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="30" width="88" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="2" y="43">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="24" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="43">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="42" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="46" y="43">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="53" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="57" y="43">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="71" y="43">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="75" y="43">24</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,138,240)"><g transform="translate(4,4) scale(1.0045045045045045,1.0087719298245614)"><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#000000" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.73"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.73"/></g></g></g></g></g><g transform="matrix(1,0,0,1,148,247)"><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="44" fill-opacity="0"/></g></g><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="14" fill-opacity="0"/></g></g><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="0" width="70" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="11" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="12"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="73" y="12">2</text></g><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="92" height="30" fill-opacity="0"/></g></g><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="87" height="30" fill-opacity="0"/></g></g><g transform="translate(77,42) matrix(1,0,0,1,0,0) translate(-77,-42)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="87" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="33" y="27">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="3" y="42">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="25" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="42">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="43" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="46" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="53" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="57" y="42">11</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="71" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="74" y="42">24</text></g></g><g transform="matrix(1,0,0,1,152.86753236814712,193.5)"><g transform="translate(0,0)"><g transform="translate(-40,26.067047119140625) translate(-112.86753236814712,-219.56704711914062) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 193.5 240 L 157.36753236814712 198" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,67,193.49999999999997)"><g transform="translate(0,0)"><g transform="translate(-50,16.067047119140625) translate(-17,-209.5670471191406) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 71.5 240 L 112.63246763185288 197.99999999999997" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,130.5,79.5019243141968)"><g transform="translate(0,0)"><g transform="translate(-60,6.067047119140625) translate(-70.5,-85.56897143333742) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 135 174 L 275.32345076546227 84.0019243141968" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,5,185)"><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="76" height="32" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="76" height="16" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="0" width="46" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="16" y="14">Docker</text></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="76" height="16" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="16" width="50" height="14" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="16" width="50" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="14" y="30">Host</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="43" y="30"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="54" y="30">1</text></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="62" y="18" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="1" height="14" fill-opacity="0"/></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,283,177)"><g><g transform="translate(0,0) scale(2.52,1.29)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.3968253968253968,0.7751937984496123)"><path fill="#c5e4fc" stroke="none" d="M 10 0 L 242 0 Q 252 0 252 10 L 252 119 Q 252 129 242 129 L 10 129 Q 0 129 0 119 L 0 10 Q 0 0 10 0 Z" opacity="0.93"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 242 0 Q 252 0 252 10 L 252 119 Q 252 129 242 129 L 10 129 Q 0 129 0 119 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" stroke-width="2" opacity="0.93"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,291,240)"><g transform="translate(4,4) scale(1.0045045045045045,1.0087719298245614)"><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#000000" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.73"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.73"/></g></g></g></g></g><g transform="matrix(1,0,0,1,301,246)"><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="45" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="9" y="0" width="75" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="9" y="0" width="75" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="9" y="13">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="65" y="13"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="76" y="13">3</text></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="15" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="15" width="26" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="15" width="26" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="33" y="28">eth0</text></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="30" width="92" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="30" width="88" height="15" fill-opacity="0"/></g></g><g transform="translate(88,135) matrix(1,0,0,1,0,0) translate(-88,-135)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="30" width="88" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="2" y="43">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="24" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="43">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="42" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="46" y="43">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="53" y="43">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="57" y="43">12</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="71" y="43">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="75" y="43">24</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,413,240)"><g transform="translate(4,4) scale(1.0045045045045045,1.0087719298245614)"><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#000000" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.11,0.57)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9009009009009008,1.7543859649122808)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" opacity="0.73"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 101.00000000000001 0 Q 111.00000000000001 0 111.00000000000001 10 L 111.00000000000001 46.99999999999999 Q 111.00000000000001 56.99999999999999 101.00000000000001 56.99999999999999 L 10 56.99999999999999 Q 0 56.99999999999999 0 46.99999999999999 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.73"/></g></g></g></g></g><g transform="matrix(1,0,0,1,423,247)"><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="44" fill-opacity="0"/></g></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="92" height="14" fill-opacity="0"/></g></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="0" width="70" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="11" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="12"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="73" y="12">4</text></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="92" height="30" fill-opacity="0"/></g></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="88" height="30" fill-opacity="0"/></g></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="33" y="14" width="88" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="33" y="27">eth0</text></g><g transform="translate(79,71) matrix(1,0,0,1,0,0) translate(-79,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="29" width="88" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="2" y="42">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="24" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="42">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="42" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="46" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="53" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="57" y="42">13</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="71" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="75" y="42">24</text></g></g><g transform="matrix(1,0,0,1,427.8675323681471,193.5)"><g transform="translate(0,0)"><g transform="translate(-315,26.067047119140625) translate(-112.86753236814712,-219.56704711914062) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 468.5 240 L 432.3675323681471 198" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,342,193.49999999999997)"><g transform="translate(0,0)"><g transform="translate(-325,16.067047119140625) translate(-17,-209.5670471191406) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 346.5 240 L 387.6324676318529 197.99999999999997" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,280,185)"><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="76" height="32" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="76" height="16" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="0" width="46" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="16" y="14">Docker</text></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="76" height="16" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="16" width="50" height="14" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="16" width="50" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="14" y="30">Host</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="43" y="30"> #</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="54" y="30">2</text></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="62" y="18" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(106,82) matrix(1,0,0,1,0,0) translate(-106,-82)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="1" height="14" fill-opacity="0"/></g></g></g><g transform="matrix(1,0,0,1,270.82345076546227,79.5019243141968)"><g transform="translate(0,0)"><g transform="translate(-70,-3.932952880859375) translate(-200.82345076546227,-75.56897143333742) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 410 174 L 275.32345076546227 84.0019243141968" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,167.32131882292583,39.0019243141968)"><g><g transform="translate(0,0) scale(2.1600318386915354,1.5512633057455518) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#434343" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,356,150)"><g transform="translate(4,4) scale(1.0046296296296295,1.0104166666666667)"><g><g transform="translate(0,0) scale(1.08,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9259259259259258,2.0833333333333335)"><path fill="#000000" stroke="none" d="M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.08,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9259259259259258,2.0833333333333335)"><path fill="#cccccc" stroke="none" d="M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,366,153)"><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="89" height="42" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="61" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="61" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="33" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="14" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="18" y="12">Host</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="43" y="12">)</text></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="47" y="0" width="29" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="47" y="0" width="29" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="50" y="12">eth0</text></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="14" width="88" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="14" width="88" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="1" y="26">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="21" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="25" y="26">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="38" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="41" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="48" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="51" y="26">253</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="71" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="75" y="26">24</text></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="28" width="68" height="14" fill-opacity="0"/></g></g><g transform="translate(160,126) matrix(1,0,0,1,0,0) translate(-160,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="28" width="68" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="11" y="40">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="15" y="40">IP</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="30" y="40">Optional</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="74" y="40">)</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,81,150)"><g transform="translate(4,4) scale(1.0046296296296295,1.0104166666666667)"><g><g transform="translate(0,0) scale(1.08,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9259259259259258,2.0833333333333335)"><path fill="#000000" stroke="none" d="M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.08,0.48)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9259259259259258,2.0833333333333335)"><path fill="#cccccc" stroke="none" d="M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 98 0 Q 108 0 108 10 L 108 38 Q 108 48 98 48 L 10 48 Q 0 48 0 38 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,91,153)"><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="89" height="42" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="61" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="61" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="33" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="0" width="33" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="14" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="18" y="12">Host</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="43" y="12">)</text></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="47" y="0" width="29" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="50" y="12">eth0</text></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="14" width="88" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="14" width="88" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="1" y="26">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="21" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="25" y="26">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="38" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="41" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="48" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="51" y="26">254</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="71" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="75" y="26">24</text></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="89" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="28" width="68" height="14" fill-opacity="0"/></g></g><g transform="translate(127,126) matrix(1,0,0,1,0,0) translate(-127,-126)"><g><rect fill="rgb(0,0,0)" stroke="none" x="11" y="28" width="68" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="11" y="40">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="15" y="40">IP</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="30" y="40">Optional</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="italic" font-weight="normal" text-decoration="" line-height="14px" x="74" y="40">)</text></g></g><g transform="matrix(1,0,0,1,226,64)"><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="117" height="32" fill-opacity="0"/></g></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="117" height="16" fill-opacity="0"/></g></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="3" y="0" width="111" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="3" y="14">Network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="58" y="14">Gateway</text></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="117" height="16" fill-opacity="0"/></g></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="16" width="87" height="16" fill-opacity="0"/></g></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="16" width="67" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="16" y="30">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="39" y="30">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="43" y="30">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="59" y="30">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="62" y="30">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="70" y="30">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="74" y="30">1</text></g><g transform="translate(117,64) matrix(1,0,0,1,0,0) translate(-117,-64)"><g><rect fill="rgb(0,0,0)" stroke="none" x="82" y="16" width="21" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="82" y="30">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="86" y="30">24</text></g></g><g transform="matrix(1,0,0,1,2,317)"><g transform="translate(1,0) matrix(1,0,0,1,0,0) translate(-1,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="538" height="36" fill-opacity="0"/></g></g><g transform="translate(1,0) matrix(1,0,0,1,0,0) translate(-1,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="538" height="18" fill-opacity="0"/></g></g><g transform="translate(1,0) matrix(1,0,0,1,0,0) translate(-1,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="536" height="17" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="1" y="15">Containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="83" y="15">Attached</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="151" y="15">Directly</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="209" y="15">to</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="226" y="15">Parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="278" y="15">Interface</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="340" y="15">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="349" y="15">No</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="374" y="15">Bridge</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="425" y="15">Used</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="462" y="15"> (</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="472" y="15">Docker0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="16px" font-style="italic" font-weight="normal" text-decoration="" line-height="18.5px" x="531" y="15">)</text></g></g><g transform="matrix(1,0,0,1,4,7)"><g transform="translate(81,0) matrix(1,0,0,1,0,0) translate(-81,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="538" height="22" fill-opacity="0"/></g></g><g transform="translate(81,0) matrix(1,0,0,1,0,0) translate(-81,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="538" height="22" fill-opacity="0"/></g></g><g transform="translate(81,0) matrix(1,0,0,1,0,0) translate(-81,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="81" y="0" width="376" height="22" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="81" y="19">Macvlan</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="166" y="19">Bridge</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="235" y="19">Mode</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="287" y="19"> &amp;</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="312" y="19">Ipvlan</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="376" y="19">L2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="405" y="19">Mode</text></g></g></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.gliffy b/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.gliffy
deleted file mode 100644
index 40eed17270..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.gliffy
+++ /dev/null
@@ -1 +0,0 @@
-{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#ffffff","width":389,"height":213,"nodeIndex":276,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":5000,"maxHeight":5000,"themeData":null,"viewportType":"default","fitBB":{"min":{"x":5,"y":6.6999969482421875},"max":{"x":389,"y":212.14285409109937}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":64.0,"y":36.0,"rotation":0.0,"id":216,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":10,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":5.0,"strokeColor":"#e69138","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-12.0,33.0],[84.0,33.0],[84.0,86.0],[120.0,86.0]],"lockSegments":{"1":true},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":190.0,"y":32.0,"rotation":0.0,"id":254,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":11,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":5.0,"strokeColor":"#f1c232","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-142.0,16.0],[54.0,16.0],[54.0,115.0],[87.0,115.0]],"lockSegments":{"1":true},"ortho":true}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":133.38636363636374,"y":108.14285409109937,"rotation":0.0,"id":226,"width":123.00000000000001,"height":104.0,"uid":"com.gliffy.shape.iphone.iphone_ios7.icons_glyphs.glyph_cloud","order":12,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.iphone.iphone_ios7.icons_glyphs.glyph_cloud","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#999999","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":15.147567221510933,"y":139.96785409109907,"rotation":0.0,"id":115,"width":107.40845070422536,"height":49.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":29,"lockAspectRatio":false,"lockShape":false,"children":[{"x":31.506478873239438,"y":2.4460032626429853,"rotation":0.0,"id":116,"width":44.395492957746484,"height":29.54388254486117,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":17,"lockAspectRatio":false,"lockShape":false,"children":[{"x":20.86588169014084,"y":2.637846655791175,"rotation":0.0,"id":117,"width":2.663729577464789,"height":24.268189233278818,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":26,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":120,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":120,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.3318647887324033,-1.055138662316466],[1.3318647887324033,25.3233278955953]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":36.84825915492961,"y":2.637846655791175,"rotation":0.0,"id":118,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":23,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-0.8875219090985048,-1.0551386623167391],[-0.8875219090985048,25.323327895595412]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":7.103278873239435,"y":1.230995106035881,"rotation":0.0,"id":119,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":20,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.2752008616871728,0.3517128874389471],[1.2752008616871728,26.73017944535047]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":1.5827079934747048,"rotation":0.0,"id":120,"width":44.395492957746484,"height":26.378466557911768,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":15,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#6fa8dc","fillColor":"#3d85c6","gradient":true,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":37.199347471451986,"rotation":0.0,"id":121,"width":107.40845070422536,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":28,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">container1 - vlan10</span></span></p><p style=\"text-align:center;\"><span style=\"\">192.168.1.2/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":68.0,"y":82.69999694824219,"rotation":0.0,"id":140,"width":150.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":30,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"text-decoration:none;font-family:Arial;font-size:12px;\"><span style=\"text-decoration:none;\"><br /></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":71.0,"y":4.1999969482421875,"rotation":0.0,"id":187,"width":108.99999999999999,"height":19.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":31,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">eth0 - 802.1q trunk</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":282.0,"y":8.0,"rotation":0.0,"id":199,"width":73.00000000000003,"height":40.150000000000006,"uid":"com.gliffy.shape.network.network_v4.business.router","order":32,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.network.network_v4.business.router","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#3966A0","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":62.0,"y":55.0,"rotation":0.0,"id":210,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":34,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":5.0,"strokeColor":"#e06666","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-8.0,11.0],[-8.0,34.0],[26.0,34.0],[26.0,57.0]],"lockSegments":{},"ortho":true}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":12.805718530101615,"y":11.940280333547719,"rotation":0.0,"id":134,"width":59.31028146989837,"height":83.0,"uid":"com.gliffy.shape.cisco.cisco_v1.servers.standard_host","order":35,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.servers.standard_host","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#3d85c6","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":64.0,"y":73.19999694824219,"rotation":0.0,"id":211,"width":60.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":36,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">eth0.10</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":65.0,"y":52.19999694824219,"rotation":0.0,"id":212,"width":60.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":37,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">eth0.20</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":7.386363636363733,"y":108.14285409109937,"rotation":0.0,"id":219,"width":123.00000000000001,"height":104.0,"uid":"com.gliffy.shape.iphone.iphone_ios7.icons_glyphs.glyph_cloud","order":38,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.iphone.iphone_ios7.icons_glyphs.glyph_cloud","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#999999","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":139.1475672215109,"y":139.96785409109907,"rotation":0.0,"id":227,"width":107.40845070422536,"height":49.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":55,"lockAspectRatio":false,"lockShape":false,"children":[{"x":31.506478873239438,"y":2.4460032626429853,"rotation":0.0,"id":228,"width":44.395492957746484,"height":29.54388254486117,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":43,"lockAspectRatio":false,"lockShape":false,"children":[{"x":20.86588169014084,"y":2.637846655791175,"rotation":0.0,"id":229,"width":2.663729577464789,"height":24.268189233278818,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":52,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":232,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":232,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.3318647887323891,-1.055138662316466],[1.3318647887323891,25.3233278955953]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":36.84825915492961,"y":2.637846655791175,"rotation":0.0,"id":230,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":49,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-0.8875219090985048,-1.0551386623167391],[-0.8875219090985048,25.323327895595412]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":7.103278873239435,"y":1.230995106035881,"rotation":0.0,"id":231,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":46,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.2752008616871728,0.3517128874389471],[1.2752008616871728,26.73017944535047]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":1.5827079934747048,"rotation":0.0,"id":232,"width":44.395492957746484,"height":26.378466557911768,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":41,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#6fa8dc","fillColor":"#3d85c6","gradient":true,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":37.199347471451986,"rotation":0.0,"id":233,"width":107.40845070422536,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":54,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">container2 - vlan20</span></span></p><p style=\"text-align:center;\"><span style=\"\">172.16.1.2/24</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":259.38636363636374,"y":108.14285409109937,"rotation":0.0,"id":248,"width":123.00000000000001,"height":104.0,"uid":"com.gliffy.shape.iphone.iphone_ios7.icons_glyphs.glyph_cloud","order":56,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.iphone.iphone_ios7.icons_glyphs.glyph_cloud","strokeWidth":1.0,"strokeColor":"#000000","fillColor":"#999999","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":265.14756722151094,"y":139.96785409109907,"rotation":0.0,"id":241,"width":107.40845070422536,"height":49.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":73,"lockAspectRatio":false,"lockShape":false,"children":[{"x":31.506478873239438,"y":2.4460032626429853,"rotation":0.0,"id":242,"width":44.395492957746484,"height":29.54388254486117,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":61,"lockAspectRatio":false,"lockShape":false,"children":[{"x":20.86588169014084,"y":2.637846655791175,"rotation":0.0,"id":243,"width":2.663729577464789,"height":24.268189233278818,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":70,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":246,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":246,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.3318647887323891,-1.055138662316466],[1.3318647887323891,25.3233278955953]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":36.84825915492961,"y":2.637846655791175,"rotation":0.0,"id":244,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":67,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-0.8875219090985048,-1.0551386623167391],[-0.8875219090985048,25.323327895595412]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":7.103278873239435,"y":1.230995106035881,"rotation":0.0,"id":245,"width":1.0000000000000002,"height":25.323327895595277,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":64,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#0b5394","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[1.2752008616871728,0.3517128874389471],[1.2752008616871728,26.73017944535047]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":1.5827079934747048,"rotation":0.0,"id":246,"width":44.395492957746484,"height":26.378466557911768,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":59,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#6fa8dc","fillColor":"#3d85c6","gradient":true,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":37.199347471451986,"rotation":0.0,"id":247,"width":107.40845070422536,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":72,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-family:Arial;font-size:12px;\"><span style=\"\">container3 - vlan30</span></span></p><p style=\"text-align:center;\"><span style=\"\">10.1.1.2/16</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":65.0,"y":31.199996948242188,"rotation":0.0,"id":253,"width":60.0,"height":14.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":74,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">eth0.30</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":44.49612211422149,"y":17.874999999999943,"rotation":0.0,"id":266,"width":275.00609168449375,"height":15.70000000000006,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":75,"lockAspectRatio":false,"lockShape":false,"children":[{"x":68.50387788577851,"y":43.12500000000006,"rotation":0.0,"id":258,"width":211.0,"height":31.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":9,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#999999","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-64.00387788577851,-31.924999999999997],[197.00221379871527,-31.925000000000153]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":68.50387788577851,"y":38.55333333333314,"rotation":0.0,"id":262,"width":211.0,"height":33.06666666666631,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":7,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#999999","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-64.00387788577851,-34.053333333332965],[197.00221379871527,-34.05333333333314]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":70.50387788577851,"y":40.7533333333331,"rotation":0.0,"id":261,"width":211.0,"height":33.06666666666631,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":5,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#e06666","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-64.00387788577851,-34.053333333332965],[197.00221379871527,-34.05333333333314]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":70.50387788577851,"y":42.88666666666643,"rotation":0.0,"id":260,"width":211.0,"height":33.06666666666631,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":3,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#e69138","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-64.00387788577851,-34.053333333332965],[197.00221379871527,-34.05333333333314]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":73.50387788577851,"y":43.95333333333309,"rotation":0.0,"id":259,"width":211.0,"height":33.06666666666631,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":1,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":2.0,"strokeColor":"#ffe599","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-64.00387788577851,-34.053333333332965],[197.00221379871527,-34.05333333333314]],"lockSegments":{"1":true},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":248.0,"y":51.19999694824219,"rotation":0.0,"id":207,"width":143.0,"height":70.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":33,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:left;\"><span style=\"\">Network Router (gateway)</span></p><p style=\"text-align:left;\"><span style=\"\">vlan10 - 192.168.1.1/24</span></p><p style=\"text-align:left;\"><span style=\"\">vlan20 -&nbsp;</span><span style=\"\">172.16.1.1/24</span></p><p style=\"text-align:left;\"><span style=\"\">vlan30 -&nbsp;</span><span style=\"\">10.1.1.1/16</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":3.0,"y":88.19999694824219,"rotation":0.0,"id":272,"width":77.99999999999999,"height":28.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":76,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Docker Host</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":80}],"shapeStyles":{},"lineStyles":{"global":{"stroke":"#e06666","strokeWidth":2,"orthoMode":1}},"textStyles":{"global":{"bold":true,"face":"Arial","size":"12px","color":"#000000"}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.network.network_v4.home","com.gliffy.libraries.network.network_v4.business","com.gliffy.libraries.network.network_v4.rack","com.gliffy.libraries.network.network_v3.home","com.gliffy.libraries.network.network_v3.business","com.gliffy.libraries.network.network_v3.rack"],"lastSerialized":1457586821719,"analyticsProduct":"Confluence"},"embeddedResources":{"index":0,"resources":[]}}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.png b/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.png
deleted file mode 100644
index a38633cdbc..0000000000
Binary files a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.svg b/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.svg
deleted file mode 100644
index 5c6c6070a6..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/multi_tenant_8021q_vlans.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="409" height="232.14285409109937"><style xmlns="http://www.w3.org/1999/xhtml"></style><defs><linearGradient id="RKkzpzQhZTCk" x1="0px" x2="0px" y1="100px" y2="-50px" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3d85c6"/><stop offset="1" stop-color="#FFFFFF"/></linearGradient><linearGradient id="SeALyqvahCFZ" x1="0px" x2="0px" y1="100px" y2="-50px" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3d85c6"/><stop offset="1" stop-color="#FFFFFF"/></linearGradient><linearGradient id="KIKSmddbxdCC" x1="0px" x2="0px" y1="100px" y2="-50px" gradientUnits="userSpaceOnUse"><stop offset="0" stop-color="#3d85c6"/><stop offset="1" stop-color="#FFFFFF"/></linearGradient></defs><g transform="translate(0,0)"><g><rect fill="#ffffff" stroke="none" x="0" y="0" width="409" height="232.14285409109937"/></g><g transform="matrix(1,0,0,1,49.49612211422149,23.274999999999892)"><g transform="translate(0,0)"><g transform="translate(-118,-61.828333333333035) translate(68.50387788577851,38.55333333333314) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#ffe599" d="M 53.99612211422149 27.77500000000007 L 315.0022137987153 27.774999999999892" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,46.49612211422149,22.20833333333323)"><g transform="translate(0,0)"><g transform="translate(-115,-60.76166666666637) translate(68.50387788577851,38.55333333333314) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#e69138" d="M 50.99612211422149 26.708333333333407 L 312.0022137987153 26.70833333333323" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,46.49612211422149,20.074999999999903)"><g transform="translate(0,0)"><g transform="translate(-115,-58.628333333333046) translate(68.50387788577851,38.55333333333314) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#e06666" d="M 50.99612211422149 24.57500000000008 L 312.0022137987153 24.574999999999903" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,44.49612211422149,17.874999999999943)"><g transform="translate(0,0)"><g transform="translate(-113,-56.428333333333086) translate(68.50387788577851,38.55333333333314) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 48.99612211422149 22.37500000000012 L 310.0022137987153 22.374999999999943" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,44.49612211422149,24.574999999999847)"><g transform="translate(0,0)"><g transform="translate(-113,-61) translate(68.50387788577851,36.42500000000015) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 48.99612211422149 29.075000000000003 L 310.0022137987153 29.074999999999847" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,46,63)"><g transform="translate(0,0)"><g transform="translate(-64,-36) translate(18,-27) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#e69138" d="M 52 69 L 138 69 Q 148 69 148 79 L 148 112 Q 148 122 158 122 L 184 122" stroke-miterlimit="10" stroke-width="5"/></g></g></g></g><g transform="matrix(1,0,0,1,42,42)"><g transform="translate(0,0)"><g transform="translate(-190,-32) translate(148,-10) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#f1c232" d="M 48 48 L 234 48 Q 244 48 244 58 L 244 137 Q 244 147 254 147 L 277 147" stroke-miterlimit="10" stroke-width="5"/></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,133.38636363636374,108.14285409109937)"><g><g transform="translate(0,0) scale(1.7571428571428573,2.3636363636363638)"><g><g><g><path fill="#999999" stroke="rgb(0,0,0)" d="M 58.97 19.094 C 58.977 18.895 59 18.7 59 18.5 C 59 8.283 50.717 0 40.5 0 C 33.11 0 26.751 4.344 23.787 10.607 C 22.275 9.593 20.458 9 18.5 9 C 13.5 9 9.41 12.866 9.037 17.771 C 3.778 19.616 0 24.61 0 30.5 C 0 37.787 5.778 43.71 13 43.975 L 13 44 L 58 44 L 58 43.975 C 64.671 43.71 70 38.235 70 31.5 C 70 25.095 65.18 19.822 58.97 19.094 Z M 58 41.975 L 58 42 L 13 42 L 13 41.975 C 6.883 41.711 2 36.683 2 30.5 C 2 24.994 5.872 20.398 11.039 19.271 C 11.013 19.017 11 18.76 11 18.5 C 11 14.357 14.358 11 18.5 11 C 21.017 11 23.239 12.244 24.6 14.146 C 26.512 7.15 32.897 2 40.5 2 C 49.613 2 57 9.388 57 18.5 C 57 19.353 56.914 20.183 56.79 21 L 58 21 L 58 21.025 C 63.565 21.288 68 25.87 68 31.5 C 68 37.13 63.565 41.712 58 41.975 Z" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,46.65404609475037,143.99656534721677)"><g><g transform="translate(0,0) scale(0.44395492957746485,0.26378466557911767)"><g><path fill="url(#RKkzpzQhZTCk)" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.2524809014999616,3.790970933828097)"><path fill="none" stroke="none" d="M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z"/><path fill="url(#RKkzpzQhZTCk)" stroke="#6fa8dc" d="M 0 0 M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,50.53252582967698,139.4965653472169)"><g transform="translate(0,0)"><g transform="translate(-53.7573249679898,-143.64485245977795) translate(3.224799138312825,4.148287112561064) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 55.03252582967698 143.9965653472169 L 55.03252582967698 170.37503190512842" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,78.11478334058147,139.4965653472165)"><g transform="translate(0,0)"><g transform="translate(-83.50230524967998,-145.05170400953324) translate(5.38752190909851,5.55513866231675) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 82.61478334058147 143.9965653472165 L 82.61478334058147 170.37503190512865" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,64.35179257362361,139.49656534721677)"><g transform="translate(0,0)"><g transform="translate(-67.51992778489121,-145.05170400953324) translate(3.1681352112675967,5.555138662316466) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 68.85179257362361 143.99656534721677 L 68.85179257362361 170.37503190512854" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,17,177)"><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="28" fill-opacity="0"/></g></g><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g></g><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="1" y="12">container1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="12"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="68" y="12">vlan10</text></g><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(14,28) matrix(1,0,0,1,0,0) translate(-14,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="12" y="14" width="81" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="12" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="36" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="56" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="69" y="26">2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="76" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="79" y="26">24</text></g></g><g transform="matrix(1,0,0,1,70,90)"><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="147" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g/></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="74" y="-7" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="74" y="-7" width="1" height="14" fill-opacity="0"/></g></g><g transform="translate(148,-14) matrix(1,0,0,1,0,0) translate(-148,14)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="1" height="14" fill-opacity="0"/></g></g></g><g transform="matrix(1,0,0,1,73,7)"><g transform="translate(3,0) matrix(1,0,0,1,0,0) translate(-3,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="106" height="19" fill-opacity="0"/></g></g><g transform="translate(3,0) matrix(1,0,0,1,0,0) translate(-3,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="106" height="14" fill-opacity="0"/></g></g><g transform="translate(3,0) matrix(1,0,0,1,0,0) translate(-3,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="3" y="0" width="102" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="3" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="26" y="12"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="37" y="12">802</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="60" y="12">1q</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="77" y="12">trunk</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,282,8)"><g><g transform="translate(0,0) scale(0.6083333333333336,0.6104050109462419)"><g><g><path fill="#3966A0" stroke="rgb(0,0,0)" d="M 102.635 0 C 93.815 0 86.371 6.797 85.395 15.43 L 4.554 15.43 C 2.043 15.431 0 17.473 0 19.984 L 0 53.338 C 0 55.849 2.043 57.892 4.554 57.892 L 8.016 57.892 L 8.016 65.776 L 96.471 65.776 L 96.471 57.892 L 99.672 57.892 C 102.184 57.892 104.227 55.849 104.227 53.338 L 104.227 34.655 C 107.211 34.382 109.971 33.334 112.331 31.735 L 112.331 31.735 C 112.785 31.428 113.223 31.1 113.643 30.753 C 113.655 30.744 113.665 30.734 113.676 30.725 C 114.093 30.38 114.492 30.017 114.875 29.635 C 114.875 29.635 114.887 29.623 114.893 29.617 C 118.039 26.471 120 22.143 120 17.365 C 120 7.79 112.21 0 102.635 0 Z" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 102.688 3.191 C 94.836 3.191 88.45 9.579 88.45 17.43 C 88.45 25.281 94.838 31.669 102.688 31.669 C 110.54 31.669 116.926 25.281 116.926 17.43 C 116.926 9.579 110.539 3.191 102.688 3.191 Z M 97.377 20.901 C 97.118 20.901 96.859 20.802 96.662 20.605 C 96.267 20.21 96.267 19.569 96.662 19.174 L 97.412 18.424 L 91.228 18.424 C 90.669 18.424 90.216 17.971 90.216 17.412 C 90.216 16.853 90.67 16.4 91.229 16.4 L 97.414 16.4 L 96.699 15.686 C 96.303 15.291 96.303 14.65 96.699 14.255 C 97.095 13.86 97.735 13.86 98.13 14.255 L 100.571 16.696 C 100.665 16.79 100.739 16.902 100.791 17.026 C 100.894 17.273 100.894 17.552 100.791 17.799 C 100.739 17.924 100.665 18.036 100.571 18.129 L 98.093 20.605 C 97.895 20.802 97.637 20.901 97.377 20.901 Z M 105.863 25.522 L 103.422 27.963 C 103.225 28.161 102.965 28.259 102.707 28.259 C 102.698 28.259 102.689 28.254 102.68 28.254 C 102.671 28.254 102.663 28.259 102.655 28.259 C 102.305 28.259 102.012 28.07 101.83 27.801 L 99.515 25.484 C 99.119 25.089 99.119 24.448 99.515 24.053 C 99.91 23.658 100.55 23.658 100.945 24.053 L 101.644 24.752 L 101.644 9.174 L 100.945 9.873 C 100.748 10.071 100.488 10.169 100.23 10.169 C 99.97 10.169 99.711 10.07 99.515 9.873 C 99.119 9.478 99.119 8.837 99.515 8.442 L 101.954 6 C 102.35 5.605 102.988 5.605 103.385 6 L 105.864 8.478 C 106.26 8.873 106.26 9.514 105.864 9.909 C 105.667 10.107 105.408 10.205 105.149 10.205 C 104.889 10.205 104.63 10.106 104.434 9.909 L 103.667 9.143 L 103.667 24.857 L 104.434 24.091 C 104.829 23.696 105.468 23.696 105.864 24.091 C 106.258 24.486 106.258 25.126 105.863 25.522 Z M 114.148 18.46 L 107.964 18.46 L 108.677 19.174 C 109.073 19.569 109.073 20.21 108.677 20.605 C 108.48 20.803 108.22 20.901 107.961 20.901 C 107.702 20.901 107.442 20.802 107.246 20.605 L 104.808 18.165 C 104.713 18.072 104.64 17.959 104.587 17.835 C 104.485 17.588 104.485 17.309 104.587 17.062 C 104.64 16.937 104.713 16.825 104.808 16.732 L 107.284 14.255 C 107.68 13.86 108.32 13.86 108.715 14.255 C 109.11 14.65 109.11 15.291 108.715 15.686 L 107.964 16.437 L 114.149 16.437 C 114.708 16.437 115.161 16.89 115.161 17.449 C 115.16 18.008 114.707 18.46 114.148 18.46 Z" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 80.533 36.476 A 3.247 3.247 0 1 0 80.53299837650013 36.47924699945883 Z" opacity="0.5" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 9.278 35.006 L 20.39 35.006 L 20.39 24 L 9.278 24 L 9.278 35.006 Z M 10.929 25.567 L 18.819 25.567 L 18.819 31.173 L 16.536 31.173 L 16.536 33.456 L 13.213 33.456 L 13.213 31.173 L 10.93 31.173 L 10.929 25.567 L 10.929 25.567 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 24.253 35.015 L 35.365 35.015 L 35.365 24.009 L 24.253 24.009 L 24.253 35.015 Z M 25.904 25.576 L 33.794 25.576 L 33.794 31.182 L 31.51 31.182 L 31.51 33.465 L 28.187 33.465 L 28.187 31.182 L 25.904 31.182 L 25.904 25.576 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 50.3 24.009 L 39.188 24.009 L 39.188 35.014 L 50.3 35.014 L 50.3 24.009 Z M 48.729 31.173 L 46.446 31.173 L 46.446 33.456 L 43.123 33.456 L 43.123 31.173 L 40.84 31.173 L 40.84 25.567 L 48.73 25.567 L 48.729 31.173 L 48.729 31.173 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 54.123 35.023 L 65.234 35.023 L 65.234 24.018 L 54.123 24.018 L 54.123 35.023 Z M 55.774 25.567 L 63.664 25.567 L 63.664 31.173 L 61.38 31.173 L 61.38 33.456 L 58.057 33.456 L 58.057 31.173 L 55.774 31.173 L 55.774 25.567 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 9.278 49.95 L 20.39 49.95 L 20.39 38.944 L 9.278 38.944 L 9.278 49.95 Z M 10.929 40.502 L 18.819 40.502 L 18.819 46.108 L 16.536 46.108 L 16.536 48.391 L 13.213 48.391 L 13.213 46.108 L 10.93 46.108 L 10.929 40.502 L 10.929 40.502 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 24.253 49.958 L 35.365 49.958 L 35.365 38.953 L 24.253 38.953 L 24.253 49.958 Z M 25.904 40.52 L 33.794 40.52 L 33.794 46.126 L 31.51 46.126 L 31.51 48.408 L 28.187 48.408 L 28.187 46.126 L 25.904 46.126 L 25.904 40.52 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 39.228 49.966 L 50.34 49.966 L 50.34 38.962 L 39.228 38.962 L 39.228 49.966 Z M 40.839 40.511 L 48.729 40.511 L 48.729 46.117 L 46.446 46.117 L 46.446 48.4 L 43.123 48.4 L 43.123 46.117 L 40.84 46.117 L 40.839 40.511 L 40.839 40.511 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 54.123 49.966 L 65.234 49.966 L 65.234 38.962 L 54.123 38.962 L 54.123 49.966 Z M 55.774 40.511 L 63.664 40.511 L 63.664 46.117 L 61.38 46.117 L 61.38 48.4 L 58.057 48.4 L 58.057 46.117 L 55.774 46.117 L 55.774 40.511 Z" opacity="0.65" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 11.504 57.898 L 92.919 57.898 Q 92.919 57.898 92.919 57.898 L 92.919 62.69 Q 92.919 62.69 92.919 62.69 L 11.504 62.69 Q 11.504 62.69 11.504 62.69 L 11.504 57.898 Q 11.504 57.898 11.504 57.898 Z" opacity="0.7" stroke-opacity="0" stroke-miterlimit="10"/></g><g><path fill="#FFFFFF" stroke="rgb(0,0,0)" d="M 85.525 18.936 L 5.082 18.936 C 4.255 18.936 3.582 19.609 3.582 20.436 L 3.582 53.397 C 3.582 54.224 4.255 54.897 5.082 54.897 L 11.504 54.897 L 92.919 54.897 L 99.082 54.897 C 99.909 54.897 100.582 54.224 100.582 53.397 L 100.582 34.526 C 92.561 33.543 86.232 27.039 85.525 18.936 Z M 20.389 49.95 L 9.278 49.95 L 9.278 38.944 L 20.39 38.944 L 20.389 49.95 L 20.389 49.95 Z M 20.389 35.006 L 9.278 35.006 L 9.278 24 L 20.39 24 L 20.389 35.006 L 20.389 35.006 Z M 35.365 49.958 L 24.253 49.958 L 24.253 38.953 L 35.365 38.953 L 35.365 49.958 Z M 35.365 35.015 L 24.253 35.015 L 24.253 24.009 L 35.365 24.009 L 35.365 35.015 Z M 39.188 24.009 L 50.3 24.009 L 50.3 35.014 L 39.188 35.014 L 39.188 24.009 Z M 50.34 49.966 L 39.228 49.966 L 39.228 38.962 L 50.34 38.962 L 50.34 49.966 Z M 65.234 49.966 L 54.123 49.966 L 54.123 38.962 L 65.234 38.962 L 65.234 49.966 Z M 65.234 35.023 L 54.123 35.023 L 54.123 24.018 L 65.234 24.018 L 65.234 35.023 Z M 77.286 39.723 C 75.493 39.723 74.039 38.269 74.039 36.476 C 74.039 34.683 75.493 33.229 77.286 33.229 C 79.079 33.229 80.533 34.683 80.533 36.476 C 80.533 38.269 79.08 39.723 77.286 39.723 Z M 89.541 39.723 C 87.748 39.723 86.294 38.269 86.294 36.476 C 86.294 34.683 87.748 33.229 89.541 33.229 C 91.334 33.229 92.788 34.683 92.788 36.476 C 92.787 38.269 91.334 39.723 89.541 39.723 Z" opacity="0.93" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,250,51)"><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="140" height="70" fill-opacity="0"/></g></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="140" height="14" fill-opacity="0"/></g></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="140" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="12">Network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="47" y="12">Router</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="83" y="12"> (</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="91" y="12">gateway</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="135" y="12">)</text></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="140" height="14" fill-opacity="0"/></g></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="127" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="26">vlan10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="26"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="26">192</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="69" y="26">168</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="89" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="93" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="99" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="103" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="109" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="113" y="26">24</text></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="140" height="14" fill-opacity="0"/></g></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="28" width="47" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="40">vlan20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="40"> -&#160;</text></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="46" y="28" width="74" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="40">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="69" y="40">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="83" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="86" y="40">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="93" y="40">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="96" y="40">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="103" y="40">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="106" y="40">24</text></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="140" height="14" fill-opacity="0"/></g></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="47" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="0" y="54">vlan30</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="54"> -&#160;</text></g><g transform="translate(92,238) matrix(1,0,0,1,0,0) translate(-92,-238)"><g><rect fill="rgb(0,0,0)" stroke="none" x="46" y="42" width="61" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="54">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="54">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="54">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="69" y="54">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="73" y="54">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="79" y="54">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="83" y="54">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="89" y="54">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="93" y="54">16</text></g></g><g transform="matrix(1,0,0,1,48,60)"><g transform="translate(0,0)"><g transform="translate(-62,-55) translate(14,-5) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#e06666" d="M 54 66 L 54 79 Q 54 89 64 89 L 78 89 Q 88 89 88 99 L 88 112" stroke-miterlimit="10" stroke-width="5"/></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,12.805718530101615,11.940280333547719)"><g><g transform="translate(0,0) scale(0.8417223432141461,0.83)"><g><g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 52.371 16.22 L -1.393 16.22 L -1.393 99.52 L 52.371 99.52" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 52.371 99.52 L 69.07 82.82 L 69.07 -0.48 L 19.98 -0.48 L -1.393 16.22 L 52.371 16.22 L 52.371 99.52 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 52.371 16.22 L 69.07 -0.48" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 25.3 16.22 L 25.3 99.52" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="rgb(0,0,0)" stroke="#FFFFFF" d="M 26.149 16.22 L 44.316 -0.48" fill-opacity="0" stroke-miterlimit="10" stroke-width="1.3594"/></g></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 23.823 L 21.317 23.823 Q 21.317 23.823 21.317 23.823 L 21.317 34.868 Q 21.317 34.868 21.317 34.868 L 3.263 34.868 Q 3.263 34.868 3.263 34.868 L 3.263 23.823 Q 3.263 23.823 3.263 23.823 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 23.823 L 47.207 23.823 Q 47.207 23.823 47.207 23.823 L 47.207 34.868 Q 47.207 34.868 47.207 34.868 L 29.156 34.868 Q 29.156 34.868 29.156 34.868 L 29.156 23.823 Q 29.156 23.823 29.156 23.823 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 64.604 L 21.317 64.604 Q 21.317 64.604 21.317 64.604 L 21.317 75.648 Q 21.317 75.648 21.317 75.648 L 3.263 75.648 Q 3.263 75.648 3.263 75.648 L 3.263 64.604 Q 3.263 64.604 3.263 64.604 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 64.604 L 47.207 64.604 Q 47.207 64.604 47.207 64.604 L 47.207 75.648 Q 47.207 75.648 47.207 75.648 L 29.156 75.648 Q 29.156 75.648 29.156 75.648 L 29.156 64.604 Q 29.156 64.604 29.156 64.604 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 3.263 82.445 L 21.317 82.445 Q 21.317 82.445 21.317 82.445 L 21.317 93.49 Q 21.317 93.49 21.317 93.49 L 3.263 93.49 Q 3.263 93.49 3.263 93.49 L 3.263 82.445 Q 3.263 82.445 3.263 82.445 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g><g><path fill="#3d85c6" stroke="#FFFFFF" d="M 29.156 82.445 L 47.207 82.445 Q 47.207 82.445 47.207 82.445 L 47.207 93.49 Q 47.207 93.49 47.207 93.49 L 29.156 93.49 Q 29.156 93.49 29.156 93.49 L 29.156 82.445 Q 29.156 82.445 29.156 82.445 Z" stroke-miterlimit="10" stroke-width="1.3594"/></g></g></g></g></g><g transform="matrix(1,0,0,1,66,73)"><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="41" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="12">10</text></g></g><g transform="matrix(1,0,0,1,67,52)"><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="41" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="12">20</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,7.386363636363733,108.14285409109937)"><g><g transform="translate(0,0) scale(1.7571428571428573,2.3636363636363638)"><g><g><g><path fill="#999999" stroke="rgb(0,0,0)" d="M 58.97 19.094 C 58.977 18.895 59 18.7 59 18.5 C 59 8.283 50.717 0 40.5 0 C 33.11 0 26.751 4.344 23.787 10.607 C 22.275 9.593 20.458 9 18.5 9 C 13.5 9 9.41 12.866 9.037 17.771 C 3.778 19.616 0 24.61 0 30.5 C 0 37.787 5.778 43.71 13 43.975 L 13 44 L 58 44 L 58 43.975 C 64.671 43.71 70 38.235 70 31.5 C 70 25.095 65.18 19.822 58.97 19.094 Z M 58 41.975 L 58 42 L 13 42 L 13 41.975 C 6.883 41.711 2 36.683 2 30.5 C 2 24.994 5.872 20.398 11.039 19.271 C 11.013 19.017 11 18.76 11 18.5 C 11 14.357 14.358 11 18.5 11 C 21.017 11 23.239 12.244 24.6 14.146 C 26.512 7.15 32.897 2 40.5 2 C 49.613 2 57 9.388 57 18.5 C 57 19.353 56.914 20.183 56.79 21 L 58 21 L 58 21.025 C 63.565 21.288 68 25.87 68 31.5 C 68 37.13 63.565 41.712 58 41.975 Z" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,170.65404609475036,143.99656534721677)"><g><g transform="translate(0,0) scale(0.44395492957746485,0.26378466557911767)"><g><path fill="url(#SeALyqvahCFZ)" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.2524809014999616,3.790970933828097)"><path fill="none" stroke="none" d="M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z"/><path fill="url(#SeALyqvahCFZ)" stroke="#6fa8dc" d="M 0 0 M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,174.53252582967698,139.4965653472169)"><g transform="translate(0,0)"><g transform="translate(-177.7573249679898,-143.64485245977795) translate(3.224799138312818,4.148287112561064) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 179.03252582967698 143.9965653472169 L 179.03252582967698 170.37503190512842" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,202.11478334058148,139.4965653472165)"><g transform="translate(0,0)"><g transform="translate(-207.50230524967998,-145.05170400953324) translate(5.387521909098496,5.55513866231675) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 206.61478334058148 143.9965653472165 L 206.61478334058148 170.37503190512865" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,188.35179257362358,139.49656534721677)"><g transform="translate(0,0)"><g transform="translate(-191.5199277848912,-145.05170400953324) translate(3.168135211267611,5.555138662316466) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 192.85179257362358 143.99656534721677 L 192.85179257362358 170.37503190512854" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,141,177)"><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="28" fill-opacity="0"/></g></g><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g></g><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="1" y="12">container2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="12"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="68" y="12">vlan20</text></g><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(18,28) matrix(1,0,0,1,0,0) translate(-18,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="14" width="74" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="16" y="26">172</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="36" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="39" y="26">16</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="52" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="56" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="62" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="26">2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="72" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="76" y="26">24</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,259.38636363636374,108.14285409109937)"><g><g transform="translate(0,0) scale(1.7571428571428573,2.3636363636363638)"><g><g><g><path fill="#999999" stroke="rgb(0,0,0)" d="M 58.97 19.094 C 58.977 18.895 59 18.7 59 18.5 C 59 8.283 50.717 0 40.5 0 C 33.11 0 26.751 4.344 23.787 10.607 C 22.275 9.593 20.458 9 18.5 9 C 13.5 9 9.41 12.866 9.037 17.771 C 3.778 19.616 0 24.61 0 30.5 C 0 37.787 5.778 43.71 13 43.975 L 13 44 L 58 44 L 58 43.975 C 64.671 43.71 70 38.235 70 31.5 C 70 25.095 65.18 19.822 58.97 19.094 Z M 58 41.975 L 58 42 L 13 42 L 13 41.975 C 6.883 41.711 2 36.683 2 30.5 C 2 24.994 5.872 20.398 11.039 19.271 C 11.013 19.017 11 18.76 11 18.5 C 11 14.357 14.358 11 18.5 11 C 21.017 11 23.239 12.244 24.6 14.146 C 26.512 7.15 32.897 2 40.5 2 C 49.613 2 57 9.388 57 18.5 C 57 19.353 56.914 20.183 56.79 21 L 58 21 L 58 21.025 C 63.565 21.288 68 25.87 68 31.5 C 68 37.13 63.565 41.712 58 41.975 Z" stroke-opacity="0" stroke-miterlimit="10"/></g></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,296.65404609475036,143.99656534721677)"><g><g transform="translate(0,0) scale(0.44395492957746485,0.26378466557911767)"><g><path fill="url(#KIKSmddbxdCC)" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.2524809014999616,3.790970933828097)"><path fill="none" stroke="none" d="M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z"/><path fill="url(#KIKSmddbxdCC)" stroke="#6fa8dc" d="M 0 0 M 0 0 L 44.395492957746484 0 Q 44.395492957746484 0 44.395492957746484 0 L 44.395492957746484 26.378466557911768 Q 44.395492957746484 26.378466557911768 44.395492957746484 26.378466557911768 L 0 26.378466557911768 Q 0 26.378466557911768 0 26.378466557911768 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,300.53252582967696,139.4965653472169)"><g transform="translate(0,0)"><g transform="translate(-303.7573249679898,-143.64485245977795) translate(3.2247991383128465,4.148287112561064) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 305.03252582967696 143.9965653472169 L 305.03252582967696 170.37503190512842" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,328.1147833405815,139.4965653472165)"><g transform="translate(0,0)"><g transform="translate(-333.50230524968,-145.05170400953324) translate(5.387521909098496,5.55513866231675) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 332.6147833405815 143.9965653472165 L 332.6147833405815 170.37503190512865" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,314.3517925736236,139.49656534721677)"><g transform="translate(0,0)"><g transform="translate(-317.5199277848912,-145.05170400953324) translate(3.168135211267611,5.555138662316466) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#0b5394" d="M 318.8517925736236 143.99656534721677 L 318.8517925736236 170.37503190512854" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g><g transform="matrix(1,0,0,1,267,177)"><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="28" fill-opacity="0"/></g></g><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g></g><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="1" y="0" width="103" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="1" y="12">container3</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="57" y="12"> -</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="68" y="12">vlan30</text></g><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="104" height="14" fill-opacity="0"/></g></g><g transform="translate(24,28) matrix(1,0,0,1,0,0) translate(-24,-28)"><g><rect fill="rgb(0,0,0)" stroke="none" x="22" y="14" width="61" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="22" y="26">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="36" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="39" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="49" y="26">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="56" y="26">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="26">2</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="66" y="26">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="69" y="26">16</text></g></g><g transform="matrix(1,0,0,1,67,31)"><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="57" height="14" fill-opacity="0"/></g></g><g transform="translate(8,0) matrix(1,0,0,1,0,0) translate(-8,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="41" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="35" y="12">30</text></g></g><g transform="matrix(1,0,0,1,5,95)"><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="75" height="28" fill-opacity="0"/></g></g><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="75" height="14" fill-opacity="0"/></g></g><g transform="translate(4,0) matrix(1,0,0,1,0,0) translate(-4,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="4" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="4" y="12">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="46" y="12">Host</text></g></g></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.gliffy b/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.gliffy
deleted file mode 100644
index 4d9f2761c4..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.gliffy
+++ /dev/null
@@ -1 +0,0 @@
-{"contentType":"application/gliffy+json","version":"1.3","stage":{"background":"#FFFFFF","width":566,"height":581,"nodeIndex":500,"autoFit":true,"exportBorder":false,"gridOn":true,"snapToGrid":false,"drawingGuidesOn":false,"pageBreaksOn":false,"printGridOn":false,"printPaper":"LETTER","printShrinkToFit":false,"printPortrait":true,"maxWidth":5000,"maxHeight":5000,"themeData":{"uid":"com.gliffy.theme.beach_day","name":"Beach Day","shape":{"primary":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#AEE4F4","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#004257"}},"secondary":{"strokeWidth":2,"strokeColor":"#CDB25E","fillColor":"#EACF81","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#332D1A"}},"tertiary":{"strokeWidth":2,"strokeColor":"#FFBE00","fillColor":"#FFF1CB","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#000000"}},"highlight":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"#00A4DA","gradient":false,"dropShadow":false,"opacity":1,"text":{"color":"#ffffff"}}},"line":{"strokeWidth":2,"strokeColor":"#00A4DA","fillColor":"none","arrowType":2,"interpolationType":"quadratic","cornerRadius":0,"text":{"color":"#002248"}},"text":{"color":"#002248"},"stage":{"color":"#FFFFFF"}},"viewportType":"default","fitBB":{"min":{"x":-3,"y":-1.0100878848684474},"max":{"x":566,"y":581}},"printModel":{"pageSize":"a4","portrait":false,"fitToOnePage":false,"displayPageBreaks":false},"objects":[{"x":-5.0,"y":-1.0100878848684474,"rotation":0.0,"id":499,"width":569.0,"height":582.0100878848684,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":103,"lockAspectRatio":false,"lockShape":false,"children":[{"x":374.0,"y":44.510087884868476,"rotation":0.0,"id":497,"width":145.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":101,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;\"><span style=\"font-weight:bold;\">Network &amp;&nbsp;</span></span><span style=\"font-size:14px;\"><span style=\"font-weight:bold;\">other </span></span></p><p style=\"text-align:center;\"><span style=\"font-size:14px;\"><span style=\"font-weight:bold;\">Docker Hosts</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":157.40277777777783,"y":108.18042331083174,"rotation":0.0,"id":492,"width":121.19444444444446,"height":256.03113588084784,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":99,"lockAspectRatio":false,"lockShape":false,"children":[{"x":-126.13675213675185,"y":31.971494223140525,"rotation":180.0,"id":453,"width":11.1452323717951,"height":61.19357171974171,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":57,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#38761d","fillColor":"#38761d","dashStyle":"1.0,1.0","startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-121.4915197649562,-156.36606993796556],[-121.49151976495622,-99.52846483047983],[-229.68596420939843,-99.52846483047591],[-229.68596420939843,-34.22088765589871]],"lockSegments":{"1":true},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":289.82598824786317,"y":137.23816896148608,"rotation":180.0,"id":454,"width":11.1452323717951,"height":61.19357171974171,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":55,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#38761d","fillColor":"#38761d","dashStyle":"1.0,1.0","startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[291.05455395299924,191.93174068122784],[291.05455395299924,106.06051735724502],[186.27677617521402,106.06051735724502],[186.27677617521402,69.78655839914467]],"lockSegments":{},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":372.0,"y":332.0100878848684,"rotation":0.0,"id":490,"width":144.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":97,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":9.5,"rotation":0.0,"id":365,"width":141.0,"height":40.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":98,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">&nbsp;Parent: <span style=\"font-weight:bold;\">eth0.30</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">VLAN: <span style=\"font-weight:bold;\">30</span></span></p><p style=\"text-align:center;\"></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":342,"width":144.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":96,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#eb6c6c","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":52.0,"y":332.0100878848684,"rotation":0.0,"id":489,"width":144.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":92,"lockAspectRatio":false,"lockShape":false,"children":[{"x":1.0,"y":10.5,"rotation":0.0,"id":367,"width":138.0,"height":40.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":93,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\"><span style=\"\">Parent</span>: <span style=\"font-weight:bold;\">eth0.10</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">VLAN ID</span><span style=\"font-size:18px;font-family:Arial;\">:</span><span style=\"font-size:18px;font-weight:bold;font-family:Arial;\"> <span style=\"\">10</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":340,"width":144.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":91,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#5fcc5a","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":289.40277777777794,"y":126.43727235088903,"rotation":0.0,"id":486,"width":121.19444444444446,"height":250.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":88,"lockAspectRatio":false,"lockShape":false,"children":[{"x":236.18596420940128,"y":158.89044937932732,"rotation":0.0,"id":449,"width":11.1452323717951,"height":59.50782702798556,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":53,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#cc0000","fillColor":"#cc0000","dashStyle":"1.0,1.0","startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[-121.49151976495682,-152.05853787273531],[-121.49151976495682,-81.64750068755309],[-229.68596420940125,-81.64750068755139],[-229.68596420940125,-33.27817949077674]],"lockSegments":{},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":-179.77677617521388,"y":56.523633779319084,"rotation":0.0,"id":450,"width":11.1452323717951,"height":59.50782702798556,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":51,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#cc0000","fillColor":"#cc0000","dashStyle":"1.0,1.0","startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":10.0,"controlPath":[[291.0545539529992,186.6444547140887],[291.0545539529992,117.79470574474337],[186.276776175214,117.79470574474337],[186.276776175214,67.8640963321146]],"lockSegments":{"1":true},"ortho":true}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":447.0,"y":150.01008788486848,"rotation":0.0,"id":472,"width":46.99999999999994,"height":27.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":87,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":473,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":86,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":5.485490196078445,"y":5.153846153846132,"rotation":0.0,"id":474,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":84,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":9.901960784313701,"y":9.0,"rotation":0.0,"id":475,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":82,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":368.0,"y":101.71008483311067,"rotation":0.0,"id":477,"width":140.0,"height":56.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":80,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:12px;font-family:Arial;\">Gateway&nbsp;</span><span style=\"font-weight:bold;\">10.1.30.1</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;font-weight:bold;\">&nbsp;</span><span style=\"\">&nbsp;and other&nbsp;</span><span style=\"\">containers on the same VLAN/</span><span style=\"\">subnet</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;\">&nbsp;</span></p><p style=\"text-align:center;\"></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":350.51767083236393,"y":87.47159983339776,"rotation":0.0,"id":478,"width":175.20345848455912,"height":73.0,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":79,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#cc0000","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":94.0,"y":155.01008788486848,"rotation":0.0,"id":463,"width":46.99999999999994,"height":27.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":78,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":464,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":77,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":5.485490196078445,"y":5.153846153846132,"rotation":0.0,"id":465,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":75,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":9.901960784313701,"y":9.0,"rotation":0.0,"id":466,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":73,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":80.0,"y":109.71008483311067,"rotation":0.0,"id":468,"width":140.0,"height":56.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":71,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:12px;font-family:Arial;\">Gateway&nbsp;</span><span style=\"font-weight:bold;\">10.1.10.1</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;font-weight:bold;\">&nbsp;</span><span style=\"\">&nbsp;and other&nbsp;</span><span style=\"\">containers on the same VLAN/</span><span style=\"\">subnet</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;\">&nbsp;</span></p><p style=\"text-align:center;\"></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":62.51767083236396,"y":95.47159983339776,"rotation":0.0,"id":469,"width":175.20345848455912,"height":73.0,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":70,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#38761d","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":341.0,"y":40.010087884868476,"rotation":0.0,"id":460,"width":46.99999999999994,"height":27.0,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":69,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":417,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":68,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":5.485490196078445,"y":5.153846153846132,"rotation":0.0,"id":418,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":66,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":9.901960784313701,"y":9.0,"rotation":0.0,"id":419,"width":37.09803921568625,"height":18.000000000000004,"uid":"com.gliffy.shape.basic.basic_v1.default.rectangle","order":64,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#666666","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":198.51767083236396,"y":41.471599833397754,"rotation":0.0,"id":459,"width":175.20345848455912,"height":79.73848499971291,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":62,"lockAspectRatio":false,"lockShape":false,"children":[{"x":17.482329167636067,"y":14.23848499971291,"rotation":0.0,"id":458,"width":140.0,"height":56.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":61,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:12px;font-family:Arial;\">Gateway&nbsp;</span><span style=\"font-weight:bold;\">10.1.20.1</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;font-weight:bold;\">&nbsp;</span><span style=\"\">&nbsp;and other&nbsp;</span><span style=\"\">containers on the same VLAN/</span><span style=\"\">subnet</span></p><p style=\"text-align:center;\"><span style=\"text-decoration:none;\">&nbsp;</span></p><p style=\"text-align:center;\"></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":0.0,"rotation":0.0,"id":330,"width":175.20345848455912,"height":73.0,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":59,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#ff9900","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":279.0,"y":129.01008788486848,"rotation":0.0,"id":440,"width":5.0,"height":227.0,"uid":"com.gliffy.shape.basic.basic_v1.default.line","order":49,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":6.0,"strokeColor":"#ff9900","fillColor":"#ff9900","dashStyle":"1.0,1.0","startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[4.000000000000057,-25.08952732449731],[4.000000000000114,176.01117206537933]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":56.0,"y":503.0913886978766,"rotation":0.0,"id":386,"width":135.0,"height":20.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":48,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">Frontend</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":62.0,"y":420.0100878848684,"rotation":0.0,"id":381,"width":120.0,"height":74.18803418803415,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":41,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":382,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":44,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.0417910447761187,"y":0.0,"rotation":0.0,"id":383,"width":98.00597014925374,"height":44.0,"uid":null,"order":47,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container(s)</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Eth0 <span style=\"font-weight:bold;\">10.1.10.0/24</span></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":8.955223880597016,"y":9.634809634809635,"rotation":0.0,"id":384,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":42,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":17.910447761194032,"y":19.26961926961927,"rotation":0.0,"id":385,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":40,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":382.0,"y":420.0100878848684,"rotation":0.0,"id":376,"width":120.0,"height":74.18803418803415,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":31,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":377,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":34,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.0417910447761187,"y":0.0,"rotation":0.0,"id":378,"width":98.00597014925374,"height":44.0,"uid":null,"order":37,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container(s)</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Eth0 <span style=\"font-weight:bold;\">10.1.30.0/24</span></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":8.955223880597016,"y":9.634809634809635,"rotation":0.0,"id":379,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":32,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":17.910447761194032,"y":19.26961926961927,"rotation":0.0,"id":380,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":30,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":214.0,"y":503.0100878848685,"rotation":0.0,"id":374,"width":135.0,"height":20.162601626016258,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":27,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">Backend</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":376.0,"y":502.0100878848684,"rotation":0.0,"id":373,"width":135.0,"height":20.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":26,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">Credit Cards</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":627.0,"y":99.94304076572786,"rotation":0.0,"id":364,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":25,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":363,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":342,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":1.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-183.0,310.0670471191406],[-183.0,292.0670471191406]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":372.0,"y":410.0100878848684,"rotation":0.0,"id":363,"width":144.0,"height":117.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":24,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#eb6c6c","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":218.0,"y":341.5100878848684,"rotation":0.0,"id":366,"width":132.0,"height":40.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":23,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">Parent: <span style=\"font-weight:bold;\">eth0.20</span></span></p><p style=\"text-align:center;\"><span style=\"font-size:18px;font-family:Arial;\">VLAN ID: <span style=\"font-weight:bold;\">20</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":297.0,"y":89.94304076572786,"rotation":0.0,"id":356,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":22,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":353,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":343,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":1.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[-13.0,320.0670471191406],[-13.0,302.0670471191406]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":222.0,"y":420.0100878848684,"rotation":0.0,"id":348,"width":120.0,"height":74.18803418803415,"uid":"com.gliffy.shape.basic.basic_v1.default.group","order":21,"lockAspectRatio":false,"lockShape":false,"children":[{"x":0.0,"y":0.0,"rotation":0.0,"id":349,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":17,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[{"x":2.0417910447761187,"y":0.0,"rotation":0.0,"id":350,"width":98.00597014925374,"height":44.0,"uid":null,"order":20,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":8,"paddingRight":8,"paddingBottom":8,"paddingLeft":8,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"\">Container(s)</span></p><p style=\"text-align:center;\"><span style=\"font-size:13px;text-decoration:none;font-family:Arial;\"><span style=\"text-decoration:none;\">Eth0 <span style=\"font-weight:bold;\">10.1.20.0/24</span></span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":8.955223880597016,"y":9.634809634809635,"rotation":0.0,"id":351,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":15,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":17.910447761194032,"y":19.26961926961927,"rotation":0.0,"id":352,"width":102.08955223880598,"height":54.91841491841488,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":13,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#4cacf5","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.97,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":212.0,"y":410.0100878848684,"rotation":0.0,"id":353,"width":144.0,"height":119.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":11,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#fca13f","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":212.0,"y":332.0100878848684,"rotation":0.0,"id":343,"width":144.0,"height":60.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":10,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#fca13f","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":203.0,"y":307.5100878848684,"rotation":0.0,"id":333,"width":160.0,"height":22.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":9,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:20px;font-family:Arial;\"><span style=\"font-weight:bold;\">eth0</span>&nbsp;Interface</span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":303.0,"y":240.51008788486845,"rotation":0.0,"id":323,"width":261.0,"height":48.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":8,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;font-weight:bold;font-family:Arial;\">802.1Q Trunk - </span><span style=\"font-size:14px;font-family:Arial;\"><span style=\"font-style:italic;\">can be a single Ethernet link or Multiple Bonded Ethernet links</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":36.0,"y":291.0100878848684,"rotation":0.0,"id":290,"width":497.0,"height":80.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":7,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#cccccc","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":1.0,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":0.0,"y":543.5100878848684,"rotation":0.0,"id":282,"width":569.0,"height":32.0,"uid":"com.gliffy.shape.basic.basic_v1.default.text","order":6,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Text","Text":{"overflow":"none","paddingTop":2,"paddingRight":2,"paddingBottom":2,"paddingLeft":2,"outerPaddingTop":6,"outerPaddingRight":6,"outerPaddingBottom":2,"outerPaddingLeft":6,"type":"fixed","lineTValue":null,"linePerpValue":null,"cardinalityType":null,"html":"<p style=\"text-align:center;\"><span style=\"font-size:14px;\"><span style=\"font-weight:bold;\">Docker Host</span></span><span style=\"font-size:14px;font-style:italic;\">: Frontend, Backend &amp; Credit Card App Tiers are&nbsp;<span style=\"font-weight:bold;\">Isolated</span></span><span style=\"font-size:14px;\">&nbsp;but can still communicate inside <span style=\"font-weight:bold;\">parent</span> interface or any other Docker hosts using the <span style=\"font-weight:bold;\">VLAN ID</span></span></p>","tid":null,"valign":"middle","vposition":"none","hposition":"none"}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":-33.0,"y":79.94304076572786,"rotation":0.0,"id":269,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":5,"lockAspectRatio":false,"lockShape":false,"constraints":{"constraints":[],"startConstraint":{"type":"StartPositionConstraint","StartPositionConstraint":{"nodeId":345,"py":0.0,"px":0.5}},"endConstraint":{"type":"EndPositionConstraint","EndPositionConstraint":{"nodeId":340,"py":1.0,"px":0.5}}},"graphic":{"type":"Line","Line":{"strokeWidth":1.0,"strokeColor":"#000000","fillColor":"none","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[157.0,330.0670471191406],[157.0,312.0670471191406]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":52.0,"y":410.0100878848684,"rotation":0.0,"id":345,"width":144.0,"height":119.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":4,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":1.0,"strokeColor":"#434343","fillColor":"#5fcc5a","gradient":false,"dashStyle":null,"dropShadow":true,"state":0,"opacity":0.99,"shadowX":4.0,"shadowY":4.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":20.0,"y":323.0100878848684,"rotation":0.0,"id":276,"width":531.0,"height":259.0,"uid":"com.gliffy.shape.basic.basic_v1.default.round_rectangle","order":3,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.round_rectangle.basic_v1","strokeWidth":2.0,"strokeColor":"#434343","fillColor":"#c5e4fc","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":0.93,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":19.609892022503004,"y":20.27621073737908,"rotation":355.62347411485274,"id":246,"width":540.0106597126834,"height":225.00000000000003,"uid":"com.gliffy.shape.cisco.cisco_v1.storage.cloud","order":2,"lockAspectRatio":true,"lockShape":false,"graphic":{"type":"Shape","Shape":{"tid":"com.gliffy.stencil.cisco.cisco_v1.storage.cloud","strokeWidth":2.0,"strokeColor":"#333333","fillColor":"#999999","gradient":false,"dashStyle":null,"dropShadow":false,"state":0,"opacity":1.0,"shadowX":0.0,"shadowY":0.0}},"linkMap":[],"children":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":1.0,"y":99.94304076572786,"rotation":0.0,"id":394,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":1,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":3.0,"strokeColor":"#666666","fillColor":"#999999","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[261.0,233.5670471191406],[261.0,108.05111187584177]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"},{"x":44.0,"y":90.94304076572786,"rotation":0.0,"id":481,"width":100.0,"height":100.0,"uid":"com.gliffy.shape.uml.uml_v2.sequence.anchor_line","order":0,"lockAspectRatio":false,"lockShape":false,"graphic":{"type":"Line","Line":{"strokeWidth":3.0,"strokeColor":"#666666","fillColor":"#999999","dashStyle":null,"startArrow":0,"endArrow":0,"startArrowRotation":"auto","endArrowRotation":"auto","interpolationType":"linear","cornerRadius":null,"controlPath":[[261.0,233.56704711914062],[261.0,108.05111187584174]],"lockSegments":{},"ortho":false}},"linkMap":[],"hidden":false,"layerId":"9wom3rMkTrb3"}],"hidden":false,"layerId":"9wom3rMkTrb3"}],"layers":[{"guid":"9wom3rMkTrb3","order":0,"name":"Layer 0","active":true,"locked":false,"visible":true,"nodeIndex":104}],"shapeStyles":{},"lineStyles":{"global":{"fill":"#999999","stroke":"#38761d","strokeWidth":3,"dashStyle":"1.0,1.0","orthoMode":2}},"textStyles":{"global":{"bold":true,"face":"Arial","size":"14px","color":"#000000"}}},"metadata":{"title":"untitled","revision":0,"exportBorder":false,"loadPosition":"default","libraries":["com.gliffy.libraries.basic.basic_v1.default","com.gliffy.libraries.flowchart.flowchart_v1.default","com.gliffy.libraries.swimlanes.swimlanes_v1.default","com.gliffy.libraries.images","com.gliffy.libraries.network.network_v4.home","com.gliffy.libraries.network.network_v4.business","com.gliffy.libraries.network.network_v4.rack","com.gliffy.libraries.network.network_v3.home","com.gliffy.libraries.network.network_v3.business","com.gliffy.libraries.network.network_v3.rack"],"lastSerialized":1458117295143,"analyticsProduct":"Confluence"},"embeddedResources":{"index":0,"resources":[]}}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.png b/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.png
deleted file mode 100644
index 32d95f600e..0000000000
Binary files a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.svg b/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.svg
deleted file mode 100644
index 96cd21d52f..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/images/vlans-deeper-look.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="586" height="601"><style xmlns="http://www.w3.org/1999/xhtml"></style><defs/><g transform="translate(0,0)"><g><rect fill="#FFFFFF" stroke="none" x="0" y="0" width="586" height="601"/></g><g transform="matrix(1,0,0,1,295,192.98406475670114)"><g transform="translate(0,0)"><g transform="translate(-39,-89.9329528808594) translate(-256,-103.05111187584174) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#666666" d="M 300 323.5 L 300 197.98406475670114" stroke-miterlimit="10" stroke-width="3"/></g></g></g></g><g transform="matrix(1,0,0,1,295,192.98406475670114)"><g transform="translate(0,0)"><g transform="translate(-39,-89.9329528808594) translate(-256,-103.05111187584174) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 300 323.5 L 300 197.98406475670114" stroke-miterlimit="10" stroke-width="3"/></g></g></g></g><g transform="matrix(1,0,0,1,252,201.98406475670117)"><g transform="translate(0,0)"><g transform="translate(4,-98.9329528808594) translate(-256,-103.05111187584177) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#666666" d="M 257 332.5 L 257 206.98406475670117" stroke-miterlimit="10" stroke-width="3"/></g></g></g></g><g transform="matrix(1,0,0,1,252,201.98406475670117)"><g transform="translate(0,0)"><g transform="translate(4,-98.9329528808594) translate(-256,-103.05111187584177) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#999999" d="M 257 332.5 L 257 206.98406475670117" stroke-miterlimit="10" stroke-width="3"/></g></g></g></g><g transform="translate(0,0) matrix(0.9970841003774397,-0.07631052859541608,0.07631052859541608,0.9970841003774397,6.812265994936054,40.19841100496578)"><g><g transform="translate(0,0) scale(5.40007959672885,3.87815826436388) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#999999" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,15,322)"><g><g transform="translate(0,0) scale(5.31,2.59)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.18832391713747648,0.3861003861003861)"><path fill="#c5e4fc" stroke="none" d="M 10 0 L 521 0 Q 531 0 531 10 L 531 249 Q 531 259 521 259 L 10 259 Q 0 259 0 249 L 0 10 Q 0 0 10 0 Z" opacity="0.93"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 521 0 Q 531 0 531 10 L 531 249 Q 531 259 521 259 L 10 259 Q 0 259 0 249 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" stroke-width="2" opacity="0.93"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,47,409)"><g transform="translate(4,4) scale(1.0034722222222223,1.004201680672269)"><g><g transform="translate(0,0) scale(1.44,1.19)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8403361344537815)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,1.19)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8403361344537815)"><path fill="#5fcc5a" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="matrix(1,0,0,1,115,387)"><g transform="translate(0,0)"><g transform="translate(38,-78.9329528808594) translate(-153,-308.0670471191406) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 119 409 L 119 391" stroke-miterlimit="10"/></g></g></g></g><g transform="matrix(1,0,0,1,-3,543)"><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="566" height="32" fill-opacity="0"/></g></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="566" height="32" fill-opacity="0"/></g></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="25" y="0" width="83" height="16" fill-opacity="0"/></g></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="25" y="0" width="83" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="25" y="14">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="76" y="14">Host</text></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="108" y="0" width="360" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="108" y="14">:</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="115" y="14">Frontend</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="171" y="14">,</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="179" y="14">Backend</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="234" y="14"> &amp;</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="251" y="14">Credit</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="292" y="14">Card</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="326" y="14">App</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="355" y="14">Tiers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="390" y="14">are</text></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="414" y="0" width="53" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="bold" text-decoration="" line-height="16.5px" x="414" y="14">Isolated</text></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="467" y="0" width="515" height="32" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="471" y="14">but</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="494" y="14">can</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="521" y="14">still</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="27" y="30">communicate</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="114" y="30">inside</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="201" y="30">interface</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="258" y="30">or</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="275" y="30">any</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="301" y="30">other</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="337" y="30">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="385" y="30">hosts</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="423" y="30">using</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="normal" text-decoration="" line-height="16.5px" x="460" y="30">the</text></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="154" y="16" width="44" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="154" y="30">parent</text></g><g transform="translate(1676,32) matrix(1,0,0,1,0,0) translate(-1676,-32)"><g><rect fill="rgb(0,0,0)" stroke="none" x="483" y="16" width="57" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="483" y="30">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="525" y="30">ID</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,31,290)"><g transform="translate(4,4) scale(1.0010060362173039,1.00625)"><g><g transform="translate(0,0) scale(4.97,0.8)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.2012072434607646,1.25)"><path fill="#000000" stroke="none" d="M 10 0 L 487 0 Q 497 0 497 10 L 497 70 Q 497 80 487 80 L 10 80 Q 0 80 0 70 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 487 0 Q 497 0 497 10 L 497 70 Q 497 80 487 80 L 10 80 Q 0 80 0 70 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(4.97,0.8)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.2012072434607646,1.25)"><path fill="#cccccc" stroke="none" d="M 10 0 L 487 0 Q 497 0 497 10 L 497 70 Q 497 80 487 80 L 10 80 Q 0 80 0 70 L 0 10 Q 0 0 10 0 Z"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 487 0 Q 497 0 497 10 L 497 70 Q 497 80 487 80 L 10 80 Q 0 80 0 70 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="matrix(1,0,0,1,300,248)"><g transform="translate(211,0) matrix(1,0,0,1,0,0) translate(-211,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="258" height="48" fill-opacity="0"/></g></g><g transform="translate(211,0) matrix(1,0,0,1,0,0) translate(-211,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="258" height="32" fill-opacity="0"/></g></g><g transform="translate(211,0) matrix(1,0,0,1,0,0) translate(-211,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="3" y="0" width="101" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="3" y="14">802</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="27" y="14">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="31" y="14">1Q</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="53" y="14">Trunk</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="91" y="14"> -</text></g><g transform="translate(211,0) matrix(1,0,0,1,0,0) translate(-211,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="104" y="0" width="242" height="32" fill-opacity="0"/></g></g><g transform="translate(211,0) matrix(1,0,0,1,0,0) translate(-211,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="104" y="0" width="242" height="32" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="104" y="14">can</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="130" y="14">be</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="150" y="14">a</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="161" y="14">single</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="202" y="14">Ethernet</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="14" y="30">link</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="39" y="30">or</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="55" y="30">Multiple</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="107" y="30">Bonded</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="159" y="30">Ethernet</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="italic" font-weight="normal" text-decoration="" line-height="16.5px" x="216" y="30">links</text></g></g><g transform="matrix(1,0,0,1,200,307)"><g transform="translate(32,0) matrix(1,0,0,1,0,0) translate(-32,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="157" height="22" fill-opacity="0"/></g></g><g transform="translate(32,0) matrix(1,0,0,1,0,0) translate(-32,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="157" height="22" fill-opacity="0"/></g></g><g transform="translate(32,0) matrix(1,0,0,1,0,0) translate(-32,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="0" width="125" height="22" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="normal" text-decoration="" line-height="22.75px" x="63" y="19">Interface</text></g><g transform="translate(32,0) matrix(1,0,0,1,0,0) translate(-32,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="16" y="0" width="42" height="22" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="20px" font-style="normal" font-weight="bold" text-decoration="" line-height="22.75px" x="16" y="19">eth0</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,207,331)"><g transform="translate(4,4) scale(1.0034722222222223,1.0083333333333333)"><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#fca13f" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,207,409)"><g transform="translate(4,4) scale(1.0034722222222223,1.004201680672269)"><g><g transform="translate(0,0) scale(1.44,1.19)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8403361344537815)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,1.19)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8403361344537815)"><path fill="#fca13f" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 109 Q 144 119 134 119 L 10 119 Q 0 119 0 109 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,234.91044776119404,438.2696192696193)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,225.955223880597,428.63480963480964)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,217,419)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="matrix(1,0,0,1,227,424)"><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="44" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="14" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="61" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="65" y="12">s</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="71" y="12">)</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="83" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="27">Eth0</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="29" width="73" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="5" y="42">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="20" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="23" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="31" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="34" y="42">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="49" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="52" y="42">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="60" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="63" y="42">24</text></g></g><g transform="matrix(1,0,0,1,275,387)"><g transform="translate(0,0)"><g transform="translate(-292,-88.9329528808594) translate(17,-298.0670471191406) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 279 409 L 279 391" stroke-miterlimit="10"/></g></g></g></g><g transform="matrix(1,0,0,1,215,341)"><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="129" height="40" fill-opacity="0"/></g></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="129" height="20" fill-opacity="0"/></g></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="0" width="127" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="2" y="17">Parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="55" y="17">:</text></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="65" y="0" width="63" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="65" y="17">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="102" y="17">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="107" y="17">20</text></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="20" width="129" height="20" fill-opacity="0"/></g></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="14" y="20" width="101" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="14" y="37">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="66" y="37">ID</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="84" y="37">:</text></g><g transform="translate(176,60) matrix(1,0,0,1,0,0) translate(-176,-60)"><g><rect fill="rgb(0,0,0)" stroke="none" x="95" y="20" width="21" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="95" y="37">20</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,367,409)"><g transform="translate(4,4) scale(1.0034722222222223,1.0042735042735043)"><g><g transform="translate(0,0) scale(1.44,1.17)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8547008547008548)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 107 Q 144 117 134 117 L 10 117 Q 0 117 0 107 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 107 Q 144 117 134 117 L 10 117 Q 0 117 0 107 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,1.17)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,0.8547008547008548)"><path fill="#eb6c6c" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 107 Q 144 117 134 117 L 10 117 Q 0 117 0 107 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 107 Q 144 117 134 117 L 10 117 Q 0 117 0 107 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="matrix(1,0,0,1,435,387)"><g transform="translate(0,0)"><g transform="translate(-622,-98.9329528808594) translate(187,-288.0670471191406) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#000000" d="M 439 409 L 439 391" stroke-miterlimit="10"/></g></g></g></g><g transform="matrix(1,0,0,1,373,501)"><g transform="translate(15,0) matrix(1,0,0,1,0,0) translate(-15,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(15,0) matrix(1,0,0,1,0,0) translate(-15,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(15,0) matrix(1,0,0,1,0,0) translate(-15,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="15" y="0" width="102" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="15" y="17">Credit</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="69" y="17">Cards</text></g></g><g transform="matrix(1,0,0,1,211,502)"><g transform="translate(31,0) matrix(1,0,0,1,0,0) translate(-31,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(31,0) matrix(1,0,0,1,0,0) translate(-31,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(31,0) matrix(1,0,0,1,0,0) translate(-31,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="31" y="0" width="72" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="31" y="17">Backend</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,394.910447761194,438.2696192696193)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,385.95522388059703,428.63480963480964)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,377,419)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="matrix(1,0,0,1,387,424)"><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="44" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="14" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="61" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="65" y="12">s</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="71" y="12">)</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="83" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="27">Eth0</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="29" width="73" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="5" y="42">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="20" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="23" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="31" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="34" y="42">30</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="49" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="52" y="42">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="60" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="63" y="42">24</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,74.91044776119404,438.2696192696193)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,65.95522388059702,428.63480963480964)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,57,419)"><g transform="translate(4,4) scale(1.0048976608187135,1.00910441426146)"><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#000000" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.0208955223880598,0.5491841491841488)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.9795321637426899,1.8208828522920215)"><path fill="#4cacf5" stroke="none" d="M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" opacity="0.97"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 92.08955223880598 0 Q 102.08955223880598 0 102.08955223880598 10 L 102.08955223880598 44.91841491841488 Q 102.08955223880598 54.91841491841488 92.08955223880598 54.91841491841488 L 10 54.91841491841488 Q 0 54.91841491841488 0 44.91841491841488 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.97"/></g></g></g></g></g><g transform="matrix(1,0,0,1,67,424)"><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="44" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="83" height="14" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="8" y="0" width="67" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="8" y="12">Container</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="61" y="12">(</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="65" y="12">s</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="71" y="12">)</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="83" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="28" y="14" width="73" height="30" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="normal" text-decoration="" line-height="15.5px" x="28" y="27">Eth0</text></g><g transform="translate(69,71) matrix(1,0,0,1,0,0) translate(-69,-71)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="29" width="73" height="15" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="5" y="42">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="20" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="23" y="42">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="31" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="34" y="42">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="49" y="42">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="52" y="42">0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="60" y="42">/</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="13px" font-style="normal" font-weight="bold" text-decoration="" line-height="15.5px" x="63" y="42">24</text></g></g><g transform="matrix(1,0,0,1,53,502)"><g transform="translate(30,0) matrix(1,0,0,1,0,0) translate(-30,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(30,0) matrix(1,0,0,1,0,0) translate(-30,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="132" height="20" fill-opacity="0"/></g></g><g transform="translate(30,0) matrix(1,0,0,1,0,0) translate(-30,0)"><g><rect fill="rgb(0,0,0)" stroke="none" x="30" y="0" width="74" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="30" y="17">Frontend</text></g></g><g transform="matrix(1,0,0,1,271.50000000000006,96.41047267550272)"><g transform="translate(0,0)"><g transform="translate(-274,-128.00000000000003) translate(2.499999999999943,31.58952732449731) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#ff9900" d="M 278.00000000000006 102.91047267550272 M 278.00000000000006 102.91047267550272 L 278.00000000000006 108.91047267550272 M 278.00000000000006 108.91047267550272 M 278.00000000000006 114.91047267550272 L 278.00000000000006 120.91047267550272 M 278.00000000000006 120.91047267550272 M 278.00000000000006 126.91047267550272 L 278.00000000000006 132.91047267550272 M 278.00000000000006 132.91047267550272 M 278.00000000000006 138.91047267550272 L 278.00000000000006 144.91047267550272 M 278.00000000000006 144.91047267550272 M 278.00000000000006 150.91047267550272 L 278.00000000000006 156.91047267550272 M 278.00000000000006 156.91047267550272 M 278.00000000000006 162.91047267550272 L 278.00000000000006 168.91047267550272 M 278.00000000000006 168.91047267550272 M 278.00000000000006 174.91047267550272 L 278.00000000000006 180.91047267550272 M 278.00000000000006 180.91047267550272 M 278.00000000000006 186.91047267550272 L 278.00000000000006 192.91047267550272 M 278.00000000000006 192.91047267550272 M 278.00000000000006 198.91047267550272 L 278.00000000000006 204.91047267550272 M 278.00000000000006 204.91047267550272 M 278.00000000000006 210.91047267550272 L 278.00000000000006 216.91047267550272 M 278.00000000000006 216.91047267550272 M 278.00000000000006 222.91047267550272 L 278.00000000000006 228.91047267550272 M 278.00000000000006 228.91047267550272 M 278.00000000000006 234.91047267550272 L 278.00000000000006 240.91047267550272 M 278.00000000000006 240.91047267550272 M 278.00000000000006 246.91047267550272 L 278.00000000000006 252.91047267550272 M 278.00000000000006 252.91047267550272 M 278.00000000000006 258.9104726755027 L 278.00000000000006 264.9104726755027 M 278.00000000000006 264.9104726755027 M 278.00000000000006 270.9104726755027 L 278.00000000000006 276.9104726755027 M 278.00000000000006 276.9104726755027 M 278.00000000000006 282.9104726755027 L 278.00000000000006 288.9104726755027 M 278.00000000000006 288.9104726755027 M 278.00000000000006 294.9104726755027 L 278.0000000000001 300.9104726755027 M 278.0000000000001 300.9104726755027" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="matrix(1,0,0,1,284.40277777777806,243.31491457745426)"><g transform="translate(0,0)"><g transform="translate(-104.62600160256406,-181.95081824533966) translate(-179.776776175214,-61.3640963321146) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#cc0000" d="M 395.6805555555633 368.59527295942837 M 395.6805555555633 368.59527295942837 L 395.6805555555633 362.59527295942837 M 395.6805555555633 362.59527295942837 M 395.6805555555633 356.59527295942837 L 395.6805555555633 350.59527295942837 M 395.6805555555633 350.59527295942837 M 395.6805555555633 344.59527295942837 L 395.6805555555633 338.59527295942837 M 395.6805555555633 338.59527295942837 M 395.6805555555633 332.59527295942837 L 395.6805555555633 326.59527295942837 M 395.6805555555633 326.59527295942837 M 395.6805555555633 320.59527295942837 L 395.6805555555633 314.59527295942837 M 395.6805555555633 314.59527295942837 M 395.6454730957975 308.5959974887863 Q 395.42473204507803 305.08992137071624 393.81507437340014 302.97276187360467 M 393.81507437340014 302.97276187360467 M 388.7448234749301 300.0250475217899 Q 387.3524512811001 299.74552399008303 385.6805555555633 299.74552399008303 L 382.7625569263178 299.74552399008303 M 382.7625569263178 299.74552399008303 M 376.7625569263178 299.74552399008303 L 370.7625569263178 299.74552399008303 M 370.7625569263178 299.74552399008303 M 364.7625569263178 299.74552399008303 L 358.7625569263178 299.74552399008303 M 358.7625569263178 299.74552399008303 M 352.7625569263178 299.74552399008303 L 346.7625569263178 299.74552399008303 M 346.7625569263178 299.74552399008303 M 340.7625569263178 299.74552399008303 L 334.7625569263178 299.74552399008303 M 334.7625569263178 299.74552399008303 M 328.7625569263178 299.74552399008303 L 322.7625569263178 299.74552399008303 M 322.7625569263178 299.74552399008303 M 316.7625569263178 299.74552399008303 L 310.7625569263178 299.74552399008303 M 310.7625569263178 299.74552399008303 M 304.7625569263178 299.74552399008303 L 300.90277777777806 299.74552399008303 Q 299.7712873305603 299.74552399008303 298.7678239465571 299.6174969268685 M 298.7678239465571 299.6174969268685 M 293.3857693473039 297.228457504614 Q 291.4531834876415 295.28265607285664 291.0247864262038 291.83266584287463 M 291.0247864262038 291.83266584287463 M 290.90277777777806 285.8375555400254 L 290.90277777777806 279.8375555400254 M 290.90277777777806 279.8375555400254 M 290.90277777777806 273.8375555400254 L 290.90277777777806 267.8375555400254 M 290.90277777777806 267.8375555400254 M 290.90277777777806 261.8375555400254 L 290.90277777777806 255.8375555400254 M 290.90277777777806 255.8375555400254 M 290.90277777777806 249.8375555400254 L 290.90277777777806 249.81491457745426" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="matrix(1,0,0,1,284.40277777777794,125.75909597261261)"><g transform="translate(0,0)"><g transform="translate(-520.5887419871792,-284.3176338453479) translate(236.18596420940128,158.55853787273531) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#cc0000" d="M 399.0972222222224 132.2590959726126 M 399.0972222222224 132.2590959726126 L 399.0972222222224 138.2590959726126 M 399.0972222222224 138.2590959726126 M 399.0972222222224 144.2590959726126 L 399.0972222222224 150.2590959726126 M 399.0972222222224 150.2590959726126 M 399.0972222222224 156.2590959726126 L 399.0972222222224 162.2590959726126 M 399.0972222222224 162.2590959726126 M 399.0972222222224 168.2590959726126 L 399.0972222222224 174.2590959726126 M 399.0972222222224 174.2590959726126 M 399.0972222222224 180.2590959726126 L 399.0972222222224 186.2590959726126 M 399.0972222222224 186.2590959726126 M 399.0972222222224 192.2590959726126 L 399.0972222222224 192.67013315779485 Q 399.0972222222224 195.91836389834842 398.0421219278347 198.11149434451426 M 398.0421219278347 198.11149434451426 M 393.6659405128273 201.97829744802294 Q 391.72749922241087 202.67013315779496 389.0972222222224 202.67013315779502 L 387.7405118088071 202.67013315779505 M 387.7405118088071 202.67013315779505 M 381.7405118088071 202.67013315779514 L 375.7405118088071 202.67013315779522 M 375.7405118088071 202.67013315779522 M 369.7405118088071 202.6701331577953 L 363.7405118088071 202.6701331577954 M 363.7405118088071 202.6701331577954 M 357.7405118088071 202.67013315779548 L 351.7405118088071 202.67013315779556 M 351.7405118088071 202.67013315779556 M 345.7405118088071 202.67013315779565 L 339.7405118088071 202.67013315779573 M 339.7405118088071 202.67013315779573 M 333.7405118088071 202.67013315779585 L 327.7405118088071 202.67013315779593 M 327.7405118088071 202.67013315779593 M 321.7405118088071 202.67013315779604 L 315.7405118088071 202.67013315779613 M 315.7405118088071 202.67013315779613 M 309.7405118088071 202.67013315779624 L 303.7405118088071 202.67013315779633 M 303.7405118088071 202.67013315779633 M 297.7598678856485 202.9657135423712 Q 294.4328042761472 203.65647640532174 292.72003362291935 205.9615322245457 M 292.72003362291935 205.9615322245457 M 290.93300792210687 211.60072437358687 Q 290.90277777777794 212.12031369352724 290.90277777777794 212.67013315779656 L 290.90277777777794 217.600146725365 M 290.90277777777794 217.600146725365 M 290.90277777777794 223.600146725365 L 290.90277777777794 229.600146725365 M 290.90277777777794 229.600146725365 M 290.90277777777794 235.600146725365 L 290.90277777777794 241.600146725365 M 290.90277777777794 241.600146725365 M 290.90277777777794 247.600146725365 L 290.90277777777794 251.03945435457118" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="matrix(1,0,0,1,155.81944444443684,107.17033542596326)"><g transform="translate(0,0)"><g transform="translate(-453.3739983974361,-305.60207610719107) translate(297.55455395299924,198.4317406812278) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#38761d" d="M 162.31944444443684 113.67033542596326 M 162.31944444443684 113.67033542596326 L 162.31944444443684 119.67033542596326 M 162.31944444443684 119.67033542596326 M 162.31944444443684 125.67033542596326 L 162.31944444443684 131.67033542596326 M 162.31944444443684 131.67033542596326 M 162.31944444443684 137.67033542596326 L 162.31944444443684 143.67033542596326 M 162.31944444443684 143.67033542596326 M 162.31944444443684 149.67033542596326 L 162.31944444443684 155.67033542596326 M 162.31944444443684 155.67033542596326 M 162.31944444443684 161.67033542596326 L 162.31944444443684 167.67033542596326 M 162.31944444443684 167.67033542596326 M 162.31944444443684 173.67033542596326 L 162.31944444443684 179.67033542596326 M 162.31944444443684 179.67033542596326 M 162.31944444443684 185.67033542596326 L 162.31944444443684 189.5415587499461 Q 162.31944444443684 190.66665091919444 162.44602768336722 191.66515984951238 M 162.44602768336722 191.66515984951238 M 164.82839767826374 197.05049598033753 Q 166.77191548654997 198.987072120429 170.22094619965992 199.41813535569676 M 170.22094619965992 199.41813535569676 M 176.2159687190514 199.5415587499461 L 182.2159687190514 199.5415587499461 M 182.2159687190514 199.5415587499461 M 188.2159687190514 199.5415587499461 L 194.2159687190514 199.5415587499461 M 194.2159687190514 199.5415587499461 M 200.2159687190514 199.5415587499461 L 206.2159687190514 199.5415587499461 M 206.2159687190514 199.5415587499461 M 212.2159687190514 199.5415587499461 L 218.2159687190514 199.5415587499461 M 218.2159687190514 199.5415587499461 M 224.2159687190514 199.5415587499461 L 230.2159687190514 199.5415587499461 M 230.2159687190514 199.5415587499461 M 236.2159687190514 199.5415587499461 L 242.2159687190514 199.5415587499461 M 242.2159687190514 199.5415587499461 M 248.2159687190514 199.5415587499461 L 254.2159687190514 199.5415587499461 M 254.2159687190514 199.5415587499461 M 260.1975055563821 199.82836878769723 Q 263.5309416038837 200.5080005580397 265.2539063203237 202.79810365944377 M 265.2539063203237 202.79810365944377 M 267.0644085030223 208.4287072615088 Q 267.09722222222206 208.96872614612755 267.09722222222206 209.5415587499461 L 267.09722222222206 214.4280528453731 M 267.09722222222206 214.4280528453731 M 267.09722222222206 220.4280528453731 L 267.09722222222206 226.4280528453731 M 267.09722222222206 226.4280528453731 M 267.09722222222206 232.4280528453731 L 267.09722222222206 235.81551770804643" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="matrix(1,0,0,1,152.4027777777773,228.0562890247442)"><g transform="translate(0,0)"><g transform="translate(-37.41125801282108,-200.3354013688455) translate(-114.99151976495621,-27.72088765589868) matrix(1,0,0,1,0,0)"><g><path fill="none" stroke="#38761d" d="M 158.9027777777773 356.7014713068111 M 158.9027777777773 356.7014713068111 L 158.9027777777773 350.7014713068111 M 158.9027777777773 350.7014713068111 M 158.9027777777773 344.7014713068111 L 158.9027777777773 338.7014713068111 M 158.9027777777773 338.7014713068111 M 158.9027777777773 332.7014713068111 L 158.9027777777773 326.7014713068111 M 158.9027777777773 326.7014713068111 M 158.9027777777773 320.7014713068111 L 158.90277777777732 314.7014713068111 M 158.90277777777732 314.7014713068111 M 158.9386276948351 308.7022201112491 Q 159.16189382506047 305.19660315095655 160.77561686556083 303.081443100939 M 160.77561686556083 303.081443100939 M 165.85041734767782 300.14100539293156 Q 167.23802796592435 299.86386619932506 168.90277777777732 299.863866199325 L 171.83292026888248 299.8638661993249 M 171.83292026888248 299.8638661993249 M 177.83292026888248 299.86386619932466 L 183.83292026888248 299.86386619932443 M 183.83292026888248 299.86386619932443 M 189.83292026888248 299.8638661993242 L 195.83292026888248 299.863866199324 M 195.83292026888248 299.863866199324 M 201.83292026888248 299.86386619932375 L 207.83292026888248 299.8638661993235 M 207.83292026888248 299.8638661993235 M 213.83292026888248 299.8638661993233 L 219.83292026888248 299.86386619932307 M 219.83292026888248 299.86386619932307 M 225.83292026888248 299.86386619932284 L 231.83292026888248 299.8638661993226 M 231.83292026888248 299.8638661993226 M 237.83292026888248 299.8638661993224 L 243.83292026888248 299.86386619932216 M 243.83292026888248 299.86386619932216 M 249.83292026888248 299.86386619932193 L 255.83292026888248 299.86386619932176 M 255.83292026888248 299.86386619932176 M 261.7528202251644 299.1405476054279 Q 264.7675844859315 298.0314529459795 266.0817275073145 295.22173704714703 M 266.0817275073145 295.22173704714703 M 267.0972222222195 289.3604205540609 L 267.0972222222195 283.3604205540609 M 267.0972222222195 283.3604205540609 M 267.0972222222195 277.3604205540609 L 267.0972222222195 271.3604205540609 M 267.0972222222195 271.3604205540609 M 267.0972222222195 265.3604205540609 L 267.0972222222195 259.3604205540609 M 267.0972222222195 259.3604205540609 M 267.0972222222195 253.3604205540609 L 267.0972222222195 247.3604205540609 M 267.0972222222195 247.3604205540609 M 267.0972222222195 241.3604205540609 L 267.0972222222195 235.3604205540609 M 267.0972222222195 235.3604205540609" stroke-miterlimit="10" stroke-width="6"/></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,193.51767083236396,40.461511948529306)"><g><g transform="translate(0,0) scale(1.7520258247164675,1.25824690354917) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#ff9900" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,213,55)"><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="56" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="18" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="18" y="12">Gateway</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="69" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="69" y="12">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="82" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="86" y="12">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="92" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="96" y="12">20</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="109" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="112" y="12">1</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="137" height="28" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="14" width="4" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="14" width="58" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="9" y="26">and</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="26">other</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="63" y="14" width="129" height="28" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="26">containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="122" y="26">on</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="7" y="40">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="27" y="40">same</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="40">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="91" y="40">/</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="94" y="28" width="37" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="94" y="40">subnet</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="67" y="42" width="5" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g/></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,345.9019607843137,48.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,341.48549019607844,44.15384615384616)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,336,39.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,57.51767083236396,94.4615119485293)"><g><g transform="translate(0,0) scale(1.7520258247164675,1.25824690354917) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#38761d" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,77,109)"><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="56" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="18" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="18" y="12">Gateway</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="69" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="69" y="12">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="82" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="86" y="12">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="92" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="96" y="12">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="109" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="112" y="12">1</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="137" height="28" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="14" width="4" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="14" width="58" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="9" y="26">and</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="26">other</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="63" y="14" width="129" height="28" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="26">containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="122" y="26">on</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="7" y="40">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="27" y="40">same</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="40">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="91" y="40">/</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="94" y="28" width="37" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="94" y="40">subnet</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="67" y="42" width="5" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g/></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,98.9019607843137,163.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,94.48549019607844,159.15384615384616)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,89,154.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0,0) matrix(1,0,0,1,345.51767083236393,86.4615119485293)"><g><g transform="translate(0,0) scale(1.7520258247164675,1.25824690354917) translate(0.00001348378,-0.001498589)"><g><g><path fill="#FFFFFF" stroke="#cc0000" d="M 33.84 5.912 C 16.263 2.403 6.986 11.405 8.451 19.186 L 8.57 19.61 C -5.128 21.942 -1.537 38.106 5.033 38.106 L 5.679 38.085 C 4.026 45.68 20.032 53.41 28.958 49.548 L 29.531 48.92 C 32.713 55.752 44.02 56.893 55.201 57.177 C 64.89 57.425 70.546 56.658 74.702 52.411 L 75.341 52.599 C 90.852 53.845 97.915 43.133 94.526 35.442 L 95.36 35.207 C 100.648 33.808 101.258 21.602 92.187 19.797 L 92.361 19.325 C 96.299 11.385 87.011 3.896 74.124 5.303 L 73.23 4.837 C 64.003 -3.517 37.449 -2.157 34.373 6.108 L 33.84 5.912 Z" stroke-miterlimit="10" stroke-width="2"/></g></g></g></g></g><g transform="matrix(1,0,0,1,365,101)"><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="56" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="18" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="18" y="12">Gateway</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="69" y="0" width="51" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="69" y="12">10</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="82" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="86" y="12">1</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="92" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="96" y="12">30</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="109" y="12">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="bold" text-decoration="" line-height="14px" x="112" y="12">1</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="14" width="137" height="28" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="2" y="14" width="4" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="14" width="58" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="9" y="26">and</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="32" y="26">other</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="63" y="14" width="129" height="28" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="63" y="26">containers</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="122" y="26">on</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="7" y="40">the</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="27" y="40">same</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="59" y="40">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="91" y="40">/</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="94" y="28" width="37" height="14" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="12px" font-style="normal" font-weight="normal" text-decoration="" line-height="14px" x="94" y="40">subnet</text></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="42" width="137" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g><rect fill="rgb(0,0,0)" stroke="none" x="67" y="42" width="5" height="14" fill-opacity="0"/></g></g><g transform="translate(318,224) matrix(1,0,0,1,0,0) translate(-318,-224)"><g/></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,451.9019607843137,158.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,447.48549019607844,154.15384615384616)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,442,149.00000000000003)"><g><g transform="translate(0,0) scale(0.3709803921568625,0.18000000000000005)"><g><path fill="#4cacf5" stroke="none" d="M 0 0 L 100 0 Q 100 0 100 0 L 100 100 Q 100 100 100 100 L 0 100 Q 0 100 0 100 L 0 0 Q 0 0 0 0 Z"/><g transform="scale(2.6955602536997905,5.5555555555555545)"><path fill="none" stroke="none" d="M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z"/><path fill="none" stroke="#666666" d="M 0 0 M 0 0 L 37.09803921568625 0 Q 37.09803921568625 0 37.09803921568625 0 L 37.09803921568625 18.000000000000004 Q 37.09803921568625 18.000000000000004 37.09803921568625 18.000000000000004 L 0 18.000000000000004 Q 0 18.000000000000004 0 18.000000000000004 L 0 0 Q 0 0 0 0 Z" stroke-miterlimit="10"/></g></g></g></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,47,331)"><g transform="translate(4,4) scale(1.0034722222222223,1.0083333333333333)"><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#5fcc5a" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="matrix(1,0,0,1,50,342)"><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="135" height="40" fill-opacity="0"/></g></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="135" height="20" fill-opacity="0"/></g></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="0" width="127" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="58" y="17">:</text></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="5" y="0" width="54" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="5" y="17">Parent</text></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="68" y="0" width="63" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="68" y="17">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="105" y="17">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="110" y="17">10</text></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="20" width="135" height="20" fill-opacity="0"/></g></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="17" y="20" width="71" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="17" y="37">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="69" y="37">ID</text></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="87" y="20" width="6" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="87" y="37">:</text></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="93" y="20" width="26" height="20" fill-opacity="0"/></g></g><g transform="translate(373,100) matrix(1,0,0,1,0,0) translate(-373,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="98" y="20" width="21" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="98" y="37">10</text></g></g><g transform="translate(0.5,0.5) matrix(1,0,0,1,367,331)"><g transform="translate(4,4) scale(1.0034722222222223,1.0083333333333333)"><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#000000" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.294117647"/><path fill="none" stroke="rgb(0,0,0)" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-opacity="0" stroke-miterlimit="10" opacity="0.294117647"/></g></g></g></g></g><g><g transform="translate(0,0) scale(1.44,0.6)"><g><path fill="none" stroke="none" d="M 10 0 L 90 0 Q 100 0 100 10 L 100 90 Q 100 100 90 100 L 10 100 Q 0 100 0 90 L 0 10 Q 0 0 10 0 Z"/><g transform="scale(0.6944444444444444,1.6666666666666667)"><path fill="#eb6c6c" stroke="none" d="M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" opacity="0.99"/><path fill="none" stroke="#434343" d="M 10 0 M 10 0 L 134 0 Q 144 0 144 10 L 144 50 Q 144 60 134 60 L 10 60 Q 0 60 0 50 L 0 10 Q 0 0 10 0 Z" stroke-miterlimit="10" opacity="0.99"/></g></g></g></g></g><g transform="matrix(1,0,0,1,369,341)"><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="138" height="40" fill-opacity="0"/></g></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="138" height="20" fill-opacity="0"/></g></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="4" y="0" width="132" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="9" y="17">Parent</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="62" y="17">:</text></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="72" y="0" width="63" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="72" y="17">eth0</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="109" y="17">.</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="114" y="17">30</text></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="20" width="138" height="20" fill-opacity="0"/></g></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="30" y="20" width="78" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="30" y="37">VLAN</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="normal" text-decoration="" line-height="20.5px" x="77" y="37">:</text></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g><rect fill="rgb(0,0,0)" stroke="none" x="88" y="20" width="21" height="20" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="18px" font-style="normal" font-weight="bold" text-decoration="" line-height="20.5px" x="88" y="37">30</text></g><g transform="translate(194,100) matrix(1,0,0,1,0,0) translate(-194,-100)"><g/></g></g><g transform="matrix(1,0,0,1,371,44)"><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="142" height="32" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="0" width="142" height="16" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="17" y="0" width="75" height="16" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="17" y="0" width="75" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="17" y="14">Network</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="72" y="14"> &amp;&#160;</text></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="90" y="0" width="36" height="16" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="90" y="0" width="36" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="90" y="14">other</text></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="0" y="16" width="142" height="16" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="26" y="16" width="92" height="16" fill-opacity="0"/></g></g><g transform="translate(266,48) matrix(1,0,0,1,0,0) translate(-266,-48)"><g><rect fill="rgb(0,0,0)" stroke="none" x="26" y="16" width="92" height="16" fill-opacity="0"/></g><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="26" y="30">Docker</text><text fill="rgb(0, 0, 0)" stroke="none" font-family="Arial" font-size="14px" font-style="normal" font-weight="bold" text-decoration="" line-height="16.5px" x="77" y="30">Hosts</text></g></g></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/experimental/vlan-networks.md b/installer/vendor/github.com/docker/docker/experimental/vlan-networks.md
deleted file mode 100644
index caec6d6c6b..0000000000
--- a/installer/vendor/github.com/docker/docker/experimental/vlan-networks.md
+++ /dev/null
@@ -1,471 +0,0 @@
-# Ipvlan Network Driver
-
-### Getting Started
-
-The Ipvlan driver is currently in experimental mode in order to incubate Docker users use cases and vet the implementation to ensure a hardened, production ready driver in a future release. Libnetwork now gives users total control over both IPv4 and IPv6 addressing. The VLAN driver builds on top of that in giving operators complete control of layer 2 VLAN tagging and even Ipvlan L3 routing for users interested in underlay network integration. For overlay deployments that abstract away physical constraints see the [multi-host overlay ](https://docs.docker.com/engine/userguide/networking/get-started-overlay/) driver.
-
-Ipvlan is a new twist on the tried and true network virtualization technique. The Linux implementations are extremely lightweight because rather than using the traditional Linux bridge for isolation, they are simply associated to a Linux Ethernet interface or sub-interface to enforce separation between networks and connectivity to the physical network.
-
-Ipvlan offers a number of unique features and plenty of room for further innovations with the various modes. Two high level advantages of these approaches are, the positive performance implications of bypassing the Linux bridge and the simplicity of having less moving parts. Removing the bridge that traditionally resides in between the Docker host NIC and container interface leaves a very simple setup consisting of container interfaces, attached directly to the Docker host interface. This result is easy access for external facing services as there is no port mappings in these scenarios.
-
-### Pre-Requisites
-
-- The examples on this page are all single host and setup using Docker experimental builds that can be installed with the following instructions: [Install Docker experimental](https://github.com/docker/docker/tree/master/experimental)
-
-- All of the examples can be performed on a single host running Docker. Any examples using a sub-interface like `eth0.10` can be replaced with `eth0` or any other valid parent interface on the Docker host. Sub-interfaces with a `.` are created on the fly. `-o parent` interfaces can also be left out of the `docker network create` all together and the driver will create a `dummy` interface that will enable local host connectivity to perform the examples.
-
-- Kernel requirements:
- 
- - To check your current kernel version, use `uname -r` to display your kernel version
- - Ipvlan Linux kernel v4.2+ (support for earlier kernels exists but is buggy)
-
-### Ipvlan L2 Mode Example Usage
-
-The ipvlan `L2` mode example is like the following image. The driver is specified with `-d driver_name` option. In this case `-d ipvlan`.
-
-![Simple Ipvlan L2 Mode Example](images/ipvlan_l2_simple.png)
-
-The parent interface in the next example `-o parent=eth0` is configured as followed:
-
-```
-ip addr show eth0
-3: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
-    inet 192.168.1.250/24 brd 192.168.1.255 scope global eth0
-```
-
-Use the network from the host's interface as the `--subnet` in the `docker network create`. The container will be attached to the same network as the host interface as set via the `-o parent=` option.
-
-Create the ipvlan network and run a container attaching to it:
-
-```
-# Ipvlan  (-o ipvlan_mode= Defaults to L2 mode if not specified)
-docker network  create -d ipvlan \
-    --subnet=192.168.1.0/24 \ 
-    --gateway=192.168.1.1 \
-    -o ipvlan_mode=l2 \
-    -o parent=eth0 db_net
-
-# Start a container on the db_net network
-docker  run --net=db_net -it --rm alpine /bin/sh
-
-# NOTE: the containers can NOT ping the underlying host interfaces as
-# they are intentionally filtered by Linux for additional isolation.
-```
-
-The default mode for Ipvlan is `l2`. If `-o ipvlan_mode=` are left unspecified, the default mode will be used. Similarly, if the `--gateway` is left empty, the first usable address on the network will be set as the gateway. For example, if the subnet provided in the network create is `--subnet=192.168.1.0/24` then the gateway the container receives is `192.168.1.1`.
-
-To help understand how this mode interacts with other hosts, the following figure shows the same layer 2 segment between two Docker hosts that applies to and Ipvlan L2 mode.
-
-![Multiple Ipvlan Hosts](images/macvlan-bridge-ipvlan-l2.png)
-
-The following will create the exact same network as the network `db_net` created prior, with the driver defaults for `--gateway=192.168.1.1` and `-o ipvlan_mode=l2`.
-
-```
-# Ipvlan  (-o ipvlan_mode= Defaults to L2 mode if not specified)
-docker network  create -d ipvlan \
-    --subnet=192.168.1.0/24 \ 
-    -o parent=eth0 db_net_ipv
-
-# Start a container with an explicit name in daemon mode
-docker  run --net=db_net_ipv --name=ipv1 -itd alpine /bin/sh
-
-# Start a second container and ping using the container name
-# to see the docker included name resolution functionality
-docker  run --net=db_net_ipv --name=ipv2 -it --rm alpine /bin/sh
-ping -c 4 ipv1
-
-# NOTE: the containers can NOT ping the underlying host interfaces as
-# they are intentionally filtered by Linux for additional isolation.
-```
-
-The drivers also support the `--internal` flag that will completely isolate containers on a network from any communications external to that network. Since network isolation is tightly coupled to the network's parent interface the result of leaving the `-o parent=` option off of a network create is the exact same as the `--internal` option. If the parent interface is not specified or the `--internal` flag is used, a netlink type `dummy` parent interface is created for the user and used as the parent interface effectively isolating the network completely.
-
-The following two `docker network create` examples result in identical networks that you can attach container to:
-
-```
-# Empty '-o parent=' creates an isolated network
-docker network  create -d ipvlan \
-    --subnet=192.168.10.0/24 isolated1
-
-# Explicit '--internal' flag is the same:
-docker network  create -d ipvlan \
-    --subnet=192.168.11.0/24 --internal isolated2
-
-# Even the '--subnet=' can be left empty and the default 
-# IPAM subnet of 172.18.0.0/16 will be assigned
-docker network  create -d ipvlan isolated3
-
-docker run --net=isolated1 --name=cid1 -it --rm alpine /bin/sh
-docker run --net=isolated2 --name=cid2 -it --rm alpine /bin/sh
-docker run --net=isolated3 --name=cid3 -it --rm alpine /bin/sh
-
-# To attach to any use `docker exec` and start a shell
-docker exec -it cid1 /bin/sh
-docker exec -it cid2 /bin/sh
-docker exec -it cid3 /bin/sh
-```
-
-### Ipvlan 802.1q Trunk L2 Mode Example Usage
-
-Architecturally, Ipvlan L2 mode trunking is the same as Macvlan with regard to gateways and L2 path isolation. There are nuances that can be advantageous for CAM table pressure in ToR switches, one MAC per port and MAC exhaustion on a host's parent NIC to name a few. The 802.1q trunk scenario looks the same. Both modes adhere to tagging standards and have seamless integration with the physical network for underlay integration and hardware vendor plugin integrations.
-
-Hosts on the same VLAN are typically on the same subnet and almost always are grouped together based on their security policy. In most scenarios, a multi-tier application is tiered into different subnets because the security profile of each process requires some form of isolation. For example, hosting your credit card processing on the same virtual network as the frontend webserver would be a regulatory compliance issue, along with circumventing the long standing best practice of layered defense in depth architectures. VLANs or the equivocal VNI (Virtual Network Identifier) when using the Overlay driver, are the first step in isolating tenant traffic.
-
-![Docker VLANs in Depth](images/vlans-deeper-look.png)
-
-The Linux sub-interface tagged with a vlan can either already exist or will be created when you call a `docker network create`. `docker network rm` will delete the sub-interface. Parent interfaces such as `eth0` are not deleted, only sub-interfaces with a netlink parent index > 0.
-
-For the driver to add/delete the vlan sub-interfaces the format needs to be `interface_name.vlan_tag`. Other sub-interface naming can be used as the specified parent, but the link will not be deleted automatically when `docker network rm` is invoked. 
-
-The option to use either existing parent vlan sub-interfaces or let Docker manage them enables the user to either completely manage the Linux interfaces and networking or let Docker create and delete the Vlan parent sub-interfaces (netlink `ip link`) with no effort from the user.
-
-For example: `eth0.10` to denote a sub-interface of `eth0` tagged with vlan id `10`. The equivalent `ip link` command would be `ip link add link eth0 name eth0.10 type vlan id 10`.
-
-The example creates the vlan tagged networks and then start two containers to test connectivity between containers. Different Vlans cannot ping one another without a router routing between the two networks. The default namespace is not reachable per ipvlan design in order to isolate container namespaces from the underlying host.
-
-**Vlan ID 20**
-
-In the first network tagged and isolated by the Docker host, `eth0.20` is the parent interface tagged with vlan id `20` specified with `-o parent=eth0.20`. Other naming formats can be used, but the links need to be added and deleted manually using `ip link` or Linux configuration files. As long as the `-o parent` exists anything can be used if compliant with Linux netlink.
-
-```
-# now add networks and hosts as you would normally by attaching to the master (sub)interface that is tagged
-docker network  create  -d ipvlan \
-    --subnet=192.168.20.0/24 \
-    --gateway=192.168.20.1 \
-    -o parent=eth0.20 ipvlan20
-
-# in two separate terminals, start a Docker container and the containers can now ping one another.
-docker run --net=ipvlan20 -it --name ivlan_test1 --rm alpine /bin/sh
-docker run --net=ipvlan20 -it --name ivlan_test2 --rm alpine /bin/sh
-```
-
-**Vlan ID 30**
-
-In the second network, tagged and isolated by the Docker host, `eth0.30` is the parent interface tagged with vlan id `30` specified with `-o parent=eth0.30`. The `ipvlan_mode=` defaults to l2 mode `ipvlan_mode=l2`. It can also be explicitly set with the same result as shown in the next example.
-
-```
-# now add networks and hosts as you would normally by attaching to the master (sub)interface that is tagged.
-docker network  create  -d ipvlan \
-    --subnet=192.168.30.0/24 \
-    --gateway=192.168.30.1 \
-    -o parent=eth0.30 \
-    -o ipvlan_mode=l2 ipvlan30
-
-# in two separate terminals, start a Docker container and the containers can now ping one another.
-docker run --net=ipvlan30 -it --name ivlan_test3 --rm alpine /bin/sh
-docker run --net=ipvlan30 -it --name ivlan_test4 --rm alpine /bin/sh
-```
-
-The gateway is set inside of the container as the default gateway. That gateway would typically be an external router on the network.
-
-```
-$ ip route
-  default via 192.168.30.1 dev eth0
-  192.168.30.0/24 dev eth0  src 192.168.30.2
-```
-
-Example: Multi-Subnet Ipvlan L2 Mode starting two containers on the same subnet and pinging one another. In order for the `192.168.114.0/24` to reach `192.168.116.0/24` it requires an external router in L2 mode. L3 mode can route between subnets that share a common `-o parent=`. 
-
-Secondary addresses on network routers are common as an address space becomes exhausted to add another secondary to a L3 vlan interface or commonly referred to as a "switched virtual interface" (SVI).
-
-```
-docker network  create  -d ipvlan \
-    --subnet=192.168.114.0/24 --subnet=192.168.116.0/24 \
-    --gateway=192.168.114.254  --gateway=192.168.116.254 \
-     -o parent=eth0.114 \
-     -o ipvlan_mode=l2 ipvlan114
-     
-docker run --net=ipvlan114 --ip=192.168.114.10 -it --rm alpine /bin/sh
-docker run --net=ipvlan114 --ip=192.168.114.11 -it --rm alpine /bin/sh
-```
-
-A key takeaway is, operators have the ability to map their physical network into their virtual network for integrating containers into their environment with no operational overhauls required. NetOps simply drops an 802.1q trunk into the Docker host. That virtual link would be the `-o parent=` passed in the network creation. For untagged (non-VLAN) links, it is as simple as `-o parent=eth0` or for 802.1q trunks with VLAN IDs each network gets mapped to the corresponding VLAN/Subnet from the network.
-
-An example being, NetOps provides VLAN ID and the associated subnets for VLANs being passed on the Ethernet link to the Docker host server. Those values are simply plugged into the `docker network create` commands when provisioning the Docker networks. These are persistent configurations that are applied every time the Docker engine starts which alleviates having to manage often complex configuration files. The network interfaces can also be managed manually by being pre-created and docker networking will never modify them, simply use them as parent interfaces. Example mappings from NetOps to Docker network commands are as follows:
-
-- VLAN: 10, Subnet: 172.16.80.0/24, Gateway: 172.16.80.1
-
-    - `--subnet=172.16.80.0/24 --gateway=172.16.80.1 -o parent=eth0.10` 
-
-- VLAN: 20, IP subnet: 172.16.50.0/22, Gateway: 172.16.50.1
-
-    - `--subnet=172.16.50.0/22 --gateway=172.16.50.1 -o parent=eth0.20 ` 
-
-- VLAN: 30, Subnet: 10.1.100.0/16, Gateway: 10.1.100.1
-
-    - `--subnet=10.1.100.0/16 --gateway=10.1.100.1 -o parent=eth0.30` 
-
-### IPVlan L3 Mode Example
-
-IPVlan will require routes to be distributed to each endpoint. The driver only builds the Ipvlan L3 mode port and attaches the container to the interface. Route distribution throughout a cluster is beyond the initial implementation of this single host scoped driver. In L3 mode, the Docker host is very similar to a router starting new networks in the container. They are on networks that the upstream network will not know about without route distribution. For those curious how Ipvlan L3 will fit into container networking see the following examples.
-
-![Docker Ipvlan L2 Mode](images/ipvlan-l3.png)
-
-Ipvlan L3 mode drops all broadcast and multicast traffic. This reason alone makes Ipvlan L3 mode a prime candidate for those looking for massive scale and predictable network integrations. It is predictable and in turn will lead to greater uptimes because there is no bridging involved. Bridging loops have been responsible for high profile outages that can be hard to pinpoint depending on the size of the failure domain. This is due to the cascading nature of BPDUs (Bridge Port Data Units) that are flooded throughout a broadcast domain (VLAN) to find and block topology loops. Eliminating bridging domains, or at the least, keeping them isolated to a pair of ToRs (top of rack switches) will reduce hard to troubleshoot bridging instabilities. Ipvlan L2 modes is well suited for isolated VLANs only trunked into a pair of ToRs that can provide a loop-free non-blocking fabric. The next step further is to route at the edge via Ipvlan L3 mode that reduces a failure domain to a local host only. 
-
-- L3 mode needs to be on a separate subnet as the default namespace since it requires a netlink route in the default namespace pointing to the Ipvlan parent interface.
-
-- The parent interface used in this example is `eth0` and it is on the subnet `192.168.1.0/24`. Notice the `docker network` is **not** on the same subnet as `eth0`.
-
-- Unlike ipvlan l2 modes, different subnets/networks can ping one another as long as they share the same parent interface `-o parent=`.
-
-```
-ip a show eth0
-3: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP group default qlen 1000
-    link/ether 00:50:56:39:45:2e brd ff:ff:ff:ff:ff:ff
-    inet 192.168.1.250/24 brd 192.168.1.255 scope global eth0
-```
-
--A traditional gateway doesn't mean much to an L3 mode Ipvlan interface since there is no broadcast traffic allowed. Because of that, the container default gateway simply point the the containers `eth0` device. See below for CLI output of `ip route` or `ip -6 route` from inside an L3 container for details.
-
-The mode ` -o ipvlan_mode=l3` must be explicitly specified since the default ipvlan mode is `l2`.
-
-The following example does not specify a parent interface. The network drivers will create a dummy type link for the user rather then rejecting the network creation and isolating containers from only communicating with one another.
-
-```
-# Create the Ipvlan L3 network
-docker network  create  -d ipvlan \
-    --subnet=192.168.214.0/24 \
-    --subnet=10.1.214.0/24 \
-     -o ipvlan_mode=l3 ipnet210
-
-# Test 192.168.214.0/24 connectivity
-docker run --net=ipnet210 --ip=192.168.214.10 -itd alpine /bin/sh
-docker run --net=ipnet210 --ip=10.1.214.10 -itd alpine /bin/sh
-
-# Test L3 connectivity from 10.1.214.0/24 to 192.168.212.0/24
-docker run --net=ipnet210 --ip=192.168.214.9 -it --rm alpine ping -c 2 10.1.214.10
-
-# Test L3 connectivity from 192.168.212.0/24 to 10.1.214.0/24
-docker run --net=ipnet210 --ip=10.1.214.9 -it --rm alpine ping -c 2 192.168.214.10
-
-```
-
-Notice there is no `--gateway=` option in the network create. The field is ignored if one is specified `l3` mode. Take a look at the container routing table from inside of the container:
-
-```
-# Inside an L3 mode container
-$ ip route
-  default dev eth0
-  192.168.120.0/24 dev eth0  src 192.168.120.2
-```
-
-In order to ping the containers from a remote Docker host or the container be able to ping a remote host, the remote host or the physical network in between need to have a route pointing to the host IP address of the container's Docker host eth interface. More on this as we evolve the Ipvlan `L3` story.
-
-### Dual Stack IPv4 IPv6 Ipvlan L2 Mode
-
-- Not only does Libnetwork give you complete control over IPv4 addressing, but it also gives you total control over IPv6 addressing as well as feature parity between the two address families.
-
-- The next example will start with IPv6 only. Start two containers on the same VLAN `139` and ping one another. Since the IPv4 subnet is not specified, the default IPAM will provision a default IPv4 subnet. That subnet is isolated unless the upstream network is explicitly routing it on VLAN `139`.
-
-```
-# Create a v6 network
-docker network create -d ipvlan \
-    --subnet=2001:db8:abc2::/64 --gateway=2001:db8:abc2::22 \
-    -o parent=eth0.139 v6ipvlan139
-    
-# Start a container on the network
-docker run --net=v6ipvlan139 -it --rm alpine /bin/sh
-
-```
-
-View the container eth0 interface and v6 routing table:
-
-```
- eth0@if55: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default
-    link/ether 00:50:56:2b:29:40 brd ff:ff:ff:ff:ff:ff
-    inet 172.18.0.2/16 scope global eth0
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc4::250:56ff:fe2b:2940/64 scope link
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc2::1/64 scope link nodad
-       valid_lft forever preferred_lft forever
-       
-root@5c1dc74b1daa:/# ip -6 route
-2001:db8:abc4::/64 dev eth0  proto kernel  metric 256
-2001:db8:abc2::/64 dev eth0  proto kernel  metric 256
-default via 2001:db8:abc2::22 dev eth0  metric 1024
-```
-
-Start a second container and ping the first container's v6 address. 
-
-```
-$ docker run --net=v6ipvlan139 -it --rm alpine /bin/sh
-
-root@b817e42fcc54:/# ip a show eth0
-75: eth0@if55: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default
-    link/ether 00:50:56:2b:29:40 brd ff:ff:ff:ff:ff:ff
-    inet 172.18.0.3/16 scope global eth0
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc4::250:56ff:fe2b:2940/64 scope link tentative dadfailed
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc2::2/64 scope link nodad
-       valid_lft forever preferred_lft forever
-
-root@b817e42fcc54:/# ping6 2001:db8:abc2::1
-PING 2001:db8:abc2::1 (2001:db8:abc2::1): 56 data bytes
-64 bytes from 2001:db8:abc2::1%eth0: icmp_seq=0 ttl=64 time=0.044 ms
-64 bytes from 2001:db8:abc2::1%eth0: icmp_seq=1 ttl=64 time=0.058 ms
-
-2 packets transmitted, 2 packets received, 0% packet loss
-round-trip min/avg/max/stddev = 0.044/0.051/0.058/0.000 ms
-```
-
-The next example with setup a dual stack IPv4/IPv6 network with an example VLAN ID of `140`.
-
-Next create a network with two IPv4 subnets and one IPv6 subnets, all of which have explicit gateways:
-
-```
-docker network  create  -d ipvlan \
-    --subnet=192.168.140.0/24 --subnet=192.168.142.0/24 \
-    --gateway=192.168.140.1  --gateway=192.168.142.1 \
-    --subnet=2001:db8:abc9::/64 --gateway=2001:db8:abc9::22 \
-     -o parent=eth0.140 \
-     -o ipvlan_mode=l2 ipvlan140
-```
-
-Start a container and view eth0 and both v4 & v6 routing tables:
-
-```
-docker run --net=v6ipvlan139 --ip6=2001:db8:abc2::51 -it --rm alpine /bin/sh
-
-root@3cce0d3575f3:/# ip a show eth0
-78: eth0@if77: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default
-    link/ether 00:50:56:2b:29:40 brd ff:ff:ff:ff:ff:ff
-    inet 192.168.140.2/24 scope global eth0
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc4::250:56ff:fe2b:2940/64 scope link
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc9::1/64 scope link nodad
-       valid_lft forever preferred_lft forever
-
-root@3cce0d3575f3:/# ip route
-default via 192.168.140.1 dev eth0
-192.168.140.0/24 dev eth0  proto kernel  scope link  src 192.168.140.2
-
-root@3cce0d3575f3:/# ip -6 route
-2001:db8:abc4::/64 dev eth0  proto kernel  metric 256
-2001:db8:abc9::/64 dev eth0  proto kernel  metric 256
-default via 2001:db8:abc9::22 dev eth0  metric 1024
-```
-
-Start a second container with a specific `--ip4` address and ping the first host using IPv4 packets:
-
-```
-docker run --net=ipvlan140 --ip=192.168.140.10 -it --rm alpine /bin/sh
-```
-
-**Note**: Different subnets on the same parent interface in Ipvlan `L2` mode cannot ping one another. That requires a router to proxy-arp the requests with a secondary subnet. However, Ipvlan `L3` will route the unicast traffic between disparate subnets as long as they share the same `-o parent` parent link.
-
-### Dual Stack IPv4 IPv6 Ipvlan L3 Mode 
-
-**Example:** IpVlan L3 Mode Dual Stack IPv4/IPv6, Multi-Subnet w/ 802.1q Vlan Tag:118
-
-As in all of the examples, a tagged VLAN interface does not have to be used. The sub-interfaces can be swapped with `eth0`, `eth1`, `bond0` or any other valid interface on the host other then the `lo` loopback.
-
-The primary difference you will see is that L3 mode does not create a default route with a next-hop but rather sets a default route pointing to `dev eth` only since ARP/Broadcasts/Multicast are all filtered by Linux as per the design. Since the parent interface is essentially acting as a router, the parent interface IP and subnet needs to be different from the container networks. That is the opposite of bridge and L2 modes, which need to be on the same subnet (broadcast domain) in order to forward broadcast and multicast packets.
-
-```
-# Create an IPv6+IPv4 Dual Stack Ipvlan L3 network 
-# Gateways for both v4 and v6 are set to a dev e.g. 'default dev eth0'
-docker network  create  -d ipvlan \
-    --subnet=192.168.110.0/24 \
-    --subnet=192.168.112.0/24 \
-    --subnet=2001:db8:abc6::/64 \
-     -o parent=eth0 \
-     -o ipvlan_mode=l3 ipnet110
-
-
-# Start a few of containers on the network (ipnet110) 
-# in separate terminals and check connectivity
-docker run --net=ipnet110 -it --rm alpine /bin/sh
-# Start a second container specifying the v6 address
-docker run --net=ipnet110 --ip6=2001:db8:abc6::10 -it --rm alpine /bin/sh
-# Start a third specifying the IPv4 address
-docker run --net=ipnet110 --ip=192.168.112.50 -it --rm alpine /bin/sh
-# Start a 4th specifying both the IPv4 and IPv6 addresses
-docker run --net=ipnet110 --ip6=2001:db8:abc6::50 --ip=192.168.112.50 -it --rm alpine /bin/sh
-```
-
-Interface and routing table outputs are as follows:
-
-```
-root@3a368b2a982e:/# ip a show eth0
-63: eth0@if59: <BROADCAST,MULTICAST,NOARP,UP,LOWER_UP> mtu 1500 qdisc noqueue state UNKNOWN group default
-    link/ether 00:50:56:2b:29:40 brd ff:ff:ff:ff:ff:ff
-    inet 192.168.112.2/24 scope global eth0
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc4::250:56ff:fe2b:2940/64 scope link
-       valid_lft forever preferred_lft forever
-    inet6 2001:db8:abc6::10/64 scope link nodad
-       valid_lft forever preferred_lft forever
-     
-# Note the default route is simply the eth device because ARPs are filtered.
-root@3a368b2a982e:/# ip route
-  default dev eth0  scope link
-  192.168.112.0/24 dev eth0  proto kernel  scope link  src 192.168.112.2
-
-root@3a368b2a982e:/# ip -6 route
-2001:db8:abc4::/64 dev eth0  proto kernel  metric 256
-2001:db8:abc6::/64 dev eth0  proto kernel  metric 256
-default dev eth0  metric 1024
-```
-
-*Note:* There may be a bug when specifying `--ip6=` addresses when you delete a container with a specified v6 address and then start a new container with the same v6 address it throws the following like the address isn't properly being released to the v6 pool. It will fail to unmount the container and be left dead.
-
-```
-docker: Error response from daemon: Address already in use.
-```
-
-### Manually Creating 802.1q Links
-
-**Vlan ID 40**
-
-If a user does not want the driver to create the vlan sub-interface it simply needs to exist prior to the `docker network create`. If you have sub-interface naming that is not `interface.vlan_id` it is honored in the `-o parent=` option again as long as the interface exists and us up.
-
-Links if manually created can be named anything you want. As long as the exist when the network is created that is all that matters. Manually created links do not get deleted regardless of the name when the network is deleted with `docker network rm`.
-
-```
-# create a new sub-interface tied to dot1q vlan 40
-ip link add link eth0 name eth0.40 type vlan id 40
-
-# enable the new sub-interface
-ip link set eth0.40 up
-
-# now add networks and hosts as you would normally by attaching to the master (sub)interface that is tagged
-docker network  create  -d ipvlan \
-   --subnet=192.168.40.0/24 \
-   --gateway=192.168.40.1 \
-   -o parent=eth0.40 ipvlan40
-
-# in two separate terminals, start a Docker container and the containers can now ping one another.
-docker run --net=ipvlan40 -it --name ivlan_test5 --rm alpine /bin/sh
-docker run --net=ipvlan40 -it --name ivlan_test6 --rm alpine /bin/sh
-```
-
-**Example:** Vlan sub-interface manually created with any name:
-
-```
-# create a new sub interface tied to dot1q vlan 40
-ip link add link eth0 name foo type vlan id 40
-
-# enable the new sub-interface
-ip link set foo up
-
-# now add networks and hosts as you would normally by attaching to the master (sub)interface that is tagged
-docker network  create  -d ipvlan \
-    --subnet=192.168.40.0/24 --gateway=192.168.40.1 \
-    -o parent=foo ipvlan40
-
-# in two separate terminals, start a Docker container and the containers can now ping one another.
-docker run --net=ipvlan40 -it --name ivlan_test5 --rm alpine /bin/sh
-docker run --net=ipvlan40 -it --name ivlan_test6 --rm alpine /bin/sh
-```
-
-Manually created links can be cleaned up with:
-
-```
-ip link del foo
-```
-
-As with all of the Libnetwork drivers, they can be mixed and matched, even as far as running 3rd party ecosystem drivers in parallel for maximum flexibility to the Docker user.
diff --git a/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/postbuild.sh b/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/postbuild.sh
deleted file mode 100644
index 662e2dcc37..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/postbuild.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-set +x
-set +e 
-
-echo ""
-echo ""
-echo "---"
-echo "Now starting POST-BUILD steps"
-echo "---"
-echo ""
-
-echo INFO: Pointing to $DOCKER_HOST
-
-if [ ! $(docker ps -aq | wc -l) -eq 0 ]; then
-	echo INFO: Removing containers...
-	! docker rm -vf $(docker ps -aq)
-fi
-
-# Remove all images which don't have docker or debian in the name
-if [ ! $(docker images | sed -n '1!p' | grep -v 'docker' | grep -v 'debian' | awk '{ print $3 }' | wc -l) -eq 0 ]; then 
-	echo INFO: Removing images...
-	! docker rmi -f $(docker images | sed -n '1!p' | grep -v 'docker' | grep -v 'debian' | awk '{ print $3 }') 
-fi
-
-# Kill off any instances of git, go and docker, just in case
-! taskkill -F -IM git.exe -T >& /dev/null
-! taskkill -F -IM go.exe -T >& /dev/null
-! taskkill -F -IM docker.exe -T >& /dev/null
-
-# Remove everything
-! cd /c/jenkins/gopath/src/github.com/docker/docker
-! rm -rfd * >& /dev/null
-! rm -rfd .* >& /dev/null
-
-echo INFO: Cleanup complete
-exit 0
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/setup.sh b/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/setup.sh
deleted file mode 100644
index 30e5884d97..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/Jenkins/W2L/setup.sh
+++ /dev/null
@@ -1,309 +0,0 @@
-# Jenkins CI script for Windows to Linux CI.
-# Heavily modified by John Howard (@jhowardmsft) December 2015 to try to make it more reliable.
-set +xe
-SCRIPT_VER="Wed Apr 20 18:30:19 UTC 2016"
-
-# TODO to make (even) more resilient: 
-#  - Wait for daemon to be running before executing docker commands
-#  - Check if jq is installed
-#  - Make sure bash is v4.3 or later. Can't do until all Azure nodes on the latest version
-#  - Make sure we are not running as local system. Can't do until all Azure nodes are updated.
-#  - Error if docker versions are not equal. Can't do until all Azure nodes are updated
-#  - Error if go versions are not equal. Can't do until all Azure nodes are updated.
-#  - Error if running 32-bit posix tools. Probably can take from bash --version and check contains "x86_64"
-#  - Warn if the CI directory cannot be deleted afterwards. Otherwise turdlets are left behind
-#  - Use %systemdrive% ($SYSTEMDRIVE) rather than hard code to c: for TEMP
-#  - Consider cross builing the Windows binary and copy across. That's a bit of a heavy lift. Only reason
-#    for doing that is that it mirrors the actual release process for docker.exe which is cross-built.
-#    However, should absolutely not be a problem if built natively, so nit-picking.
-#  - Tidy up of images and containers. Either here, or in the teardown script.
-
-ec=0
-uniques=1
-echo INFO: Started at `date`. Script version $SCRIPT_VER
-
-
-# !README!
-# There are two daemons running on the remote Linux host:
-# 	- outer: specified by DOCKER_HOST, this is the daemon that will build and run the inner docker daemon
-#			from the sources matching the PR.
-#	- inner: runs on the host network, on a port number similar to that of DOCKER_HOST but the last two digits are inverted
-#			(2357 if DOCKER_HOST had port 2375; and 2367 if DOCKER_HOST had port 2376).
-#			The windows integration tests are run against this inner daemon.
-
-# get the ip, inner and outer ports.
-ip="${DOCKER_HOST#*://}"
-port_outer="${ip#*:}"
-# inner port is like outer port with last two digits inverted.
-port_inner=$(echo "$port_outer" | sed -E 's/(.)(.)$/\2\1/')
-ip="${ip%%:*}"
-
-echo "INFO: IP=$ip PORT_OUTER=$port_outer PORT_INNER=$port_inner"
-
-# If TLS is enabled
-if [ -n "$DOCKER_TLS_VERIFY" ]; then
-	protocol=https
-	if [ -z "$DOCKER_MACHINE_NAME" ]; then
-		ec=1
-		echo "ERROR: DOCKER_MACHINE_NAME is undefined"
-	fi
-	certs=$(echo ~/.docker/machine/machines/$DOCKER_MACHINE_NAME)
-	curlopts="--cacert $certs/ca.pem --cert $certs/cert.pem --key $certs/key.pem"
-	run_extra_args="-v tlscerts:/etc/docker"
-	daemon_extra_args="--tlsverify --tlscacert /etc/docker/ca.pem --tlscert /etc/docker/server.pem --tlskey /etc/docker/server-key.pem"
-else
-	protocol=http
-fi
-
-# Save for use by make.sh and scripts it invokes
-export MAIN_DOCKER_HOST="tcp://$ip:$port_inner"
-
-# Verify we can get the remote node to respond to _ping
-if [ $ec -eq 0 ]; then
-	reply=`curl -s $curlopts $protocol://$ip:$port_outer/_ping`
-	if [ "$reply" != "OK" ]; then
-		ec=1
-		echo "ERROR: Failed to get an 'OK' response from the docker daemon on the Linux node"
-		echo "       at $ip:$port_outer when called with an http request for '_ping'. This implies that"
-		echo "       either the daemon has crashed/is not running, or the Linux node is unavailable."
-		echo
-		echo "       A regular ping to the remote Linux node is below. It should reply. If not, the"
-		echo "       machine cannot be reached at all and may have crashed. If it does reply, it is"
-		echo "       likely a case of the Linux daemon not running or having crashed, which requires"
-		echo "       further investigation."
-		echo
-		echo "       Try re-running this CI job, or ask on #docker-dev or #docker-maintainers"
-		echo "       for someone to perform further diagnostics, or take this node out of rotation."
-		echo
-		ping $ip
-	else
-		echo "INFO: The Linux nodes outer daemon replied to a ping. Good!"
-	fi 
-fi
-
-# Get the version from the remote node. Note this may fail if jq is not installed.
-# That's probably worth checking to make sure, just in case.
-if [ $ec -eq 0 ]; then
-	remoteVersion=`curl -s $curlopts $protocol://$ip:$port_outer/version | jq -c '.Version'`
-	echo "INFO: Remote daemon is running docker version $remoteVersion"
-fi
-
-# Compare versions. We should really fail if result is no 1. Output at end of script.
-if [ $ec -eq 0 ]; then
-	uniques=`docker version | grep Version | /usr/bin/sort -u | wc -l`
-fi
-
-# Make sure we are in repo
-if [ $ec -eq 0 ]; then
-	if [ ! -d hack ]; then
-		echo "ERROR: Are you sure this is being launched from a the root of docker repository?"
-		echo "       If this is a Windows CI machine, it should be c:\jenkins\gopath\src\github.com\docker\docker."
-                echo "       Current directory is `pwd`"
-		ec=1
-	fi
-fi
-
-# Are we in split binary mode?
-if [ `grep DOCKER_CLIENTONLY Makefile | wc -l` -gt 0 ]; then
-    splitBinary=0
-	echo "INFO: Running in single binary mode"
-else
-    splitBinary=1
-	echo "INFO: Running in split binary mode"
-fi
-
-
-# Get the commit has and verify we have something
-if [ $ec -eq 0 ]; then
-	export COMMITHASH=$(git rev-parse --short HEAD)
-	echo INFO: Commmit hash is $COMMITHASH
-	if [ -z $COMMITHASH ]; then
-		echo "ERROR: Failed to get commit hash. Are you sure this is a docker repository?"
-		ec=1
-	fi
-fi
-
-# Redirect to a temporary location. Check is here for local runs from Jenkins machines just in case not
-# in the right directory where the repo is cloned. We also redirect TEMP to not use the environment
-# TEMP as when running as a standard user (not local system), it otherwise exposes a bug in posix tar which
-# will cause CI to fail from Windows to Linux. Obviously it's not best practice to ever run as local system...
-if [ $ec -eq 0 ]; then
-	export TEMP=/c/CI/CI-$COMMITHASH
-	export TMP=$TEMP
-	/usr/bin/mkdir -p $TEMP  # Make sure Linux mkdir for -p
-fi
-
-# Tidy up time
-if [ $ec -eq 0 ]; then
-	echo INFO: Deleting pre-existing containers and images...
-    
-	# Force remove all containers based on a previously built image with this commit
-	! docker rm -f $(docker ps -aq --filter "ancestor=docker:$COMMITHASH") &>/dev/null
-    
-	# Force remove any container with this commithash as a name
-	! docker rm -f $(docker ps -aq --filter "name=docker-$COMMITHASH") &>/dev/null
-
-	# This SHOULD never happen, but just in case, also blow away any containers
-	# that might be around.
-	! if [ ! $(docker ps -aq | wc -l) -eq 0 ]; then
-		echo WARN: There were some leftover containers. Cleaning them up.
-		! docker rm -f $(docker ps -aq)
-	fi
-	
-    # Force remove the image if it exists
-	! docker rmi -f "docker-$COMMITHASH" &>/dev/null
-fi
-
-# Provide the docker version for debugging purposes. If these fail, game over. 
-# as the Linux box isn't responding for some reason.
-if [ $ec -eq 0 ]; then
-	echo INFO: Docker version and info of the outer daemon on the Linux node
-	echo
-	docker version
-	ec=$?
-	if [ 0 -ne $ec ]; then
-		echo "ERROR: The main linux daemon does not appear to be running. Has the Linux node crashed?"
-	fi
-	echo
-fi
-
-# Same as above, but docker info
-if [ $ec -eq 0 ]; then
-	echo
-	docker info
-	ec=$?
-	if [ 0 -ne $ec ]; then
-		echo "ERROR: The main linux daemon does not appear to be running. Has the Linux node crashed?"
-	fi
-	echo
-fi
-
-# build the daemon image
-if [ $ec -eq 0 ]; then
-	echo "INFO: Running docker build on Linux host at $DOCKER_HOST"
-	if [ $splitBinary -eq 0 ]; then
-		set -x
-		docker build --rm --force-rm --build-arg APT_MIRROR=cdn-fastly.deb.debian.org -t "docker:$COMMITHASH" .
-    cat <<EOF | docker build --rm --force-rm -t "docker:$COMMITHASH" -
-FROM docker:$COMMITHASH
-RUN hack/make.sh binary
-RUN cp bundles/latest/binary/docker /bin/docker 
-CMD docker daemon -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args
-EOF
-	else
-		set -x
-		docker build --rm --force-rm --build-arg APT_MIRROR=cdn-fastly.deb.debian.org -t "docker:$COMMITHASH" .
-    cat <<EOF | docker build --rm --force-rm -t "docker:$COMMITHASH" -
-FROM docker:$COMMITHASH
-RUN hack/make.sh binary
-RUN cp bundles/latest/binary-daemon/dockerd /bin/dockerd 
-CMD dockerd -D -H tcp://0.0.0.0:$port_inner $daemon_extra_args
-EOF
-
-	fi
-	ec=$?
-	set +x
-	if [ 0 -ne $ec ]; then
-		echo "ERROR: docker build failed"
-	fi
-fi
-
-# Start the docker-in-docker daemon from the image we just built
-if [ $ec -eq 0 ]; then
-	echo "INFO: Starting build of a Linux daemon to test against, and starting it..."
-	set -x
-	# aufs in aufs is faster than vfs in aufs
-	docker run -d $run_extra_args -e DOCKER_GRAPHDRIVER=aufs --pid host --privileged --name "docker-$COMMITHASH" --net host "docker:$COMMITHASH"
-	ec=$?
-	set +x
-	if [ 0 -ne $ec ]; then
-	    	echo "ERROR: Failed to compile and start the linux daemon"
-	fi
-fi
-
-# Build locally.
-if [ $ec -eq 0 ]; then
-	echo "INFO: Starting local build of Windows binary..."
-	set -x
-	export TIMEOUT="120m"
-	export DOCKER_HOST="tcp://$ip:$port_inner"
-    # This can be removed
-	export DOCKER_TEST_HOST="tcp://$ip:$port_inner"
-	unset DOCKER_CLIENTONLY
-	export DOCKER_REMOTE_DAEMON=1
-	hack/make.sh binary 
-	ec=$?
-	set +x
-	if [ 0 -ne $ec ]; then
-	    echo "ERROR: Build of binary on Windows failed"
-	fi
-fi
-
-# Make a local copy of the built binary and ensure that is first in our path
-if [ $ec -eq 0 ]; then
-	VERSION=$(< ./VERSION)
-	if [ $splitBinary -eq 0 ]; then
-		cp bundles/$VERSION/binary/docker.exe $TEMP
-	else
-		cp bundles/$VERSION/binary-client/docker.exe $TEMP
-	fi
-	ec=$?
-	if [ 0 -ne $ec ]; then
-		echo "ERROR: Failed to copy built binary to $TEMP"
-	fi
-	export PATH=$TEMP:$PATH
-fi
-
-# Run the integration tests
-if [ $ec -eq 0 ]; then	
-	echo "INFO: Running Integration tests..."
-	set -x
-	export DOCKER_TEST_TLS_VERIFY="$DOCKER_TLS_VERIFY"
-	export DOCKER_TEST_CERT_PATH="$DOCKER_CERT_PATH"
-	#export TESTFLAGS='-check.vv'
-	hack/make.sh test-integration-cli
-	ec=$?
-	set +x
-	if [ 0 -ne $ec ]; then
-		echo "ERROR: CLI test failed."
-		# Next line is useful, but very long winded if included
-		docker -H=$MAIN_DOCKER_HOST logs --tail 100 "docker-$COMMITHASH"
-    fi
-fi
-
-# Tidy up any temporary files from the CI run
-if [ ! -z $COMMITHASH ]; then
-	rm -rf $TEMP
-fi
-
-# CI Integrity check - ensure we are using the same version of go as present in the Dockerfile
-GOVER_DOCKERFILE=`grep 'ENV GO_VERSION' Dockerfile | awk '{print $3}'`
-GOVER_INSTALLED=`go version | awk '{print $3}'`
-if [ "${GOVER_INSTALLED:2}" != "$GOVER_DOCKERFILE" ]; then
-	#ec=1  # Uncomment to make CI fail once all nodes are updated.
-	echo
-	echo "---------------------------------------------------------------------------"
-	echo "WARN: CI should be using go version $GOVER_DOCKERFILE, but is using ${GOVER_INSTALLED:2}"
-	echo "      Please ping #docker-maintainers on IRC to get this CI server updated."
-	echo "---------------------------------------------------------------------------"
-	echo
-fi
-
-# Check the Linux box is running a matching version of docker
-if [ "$uniques" -ne 1 ]; then
-    ec=0  # Uncomment to make CI fail once all nodes are updated.
-	echo
-	echo "---------------------------------------------------------------------------"
-	echo "ERROR: This CI node is not running the same version of docker as the daemon."
-	echo "       This is a CI configuration issue."
-	echo "---------------------------------------------------------------------------"
-	echo
-fi
-
-# Tell the user how we did.
-if [ $ec -eq 0 ]; then
-	echo INFO: Completed successfully at `date`. 
-else
-	echo ERROR: Failed with exitcode $ec at `date`.
-fi
-exit $ec
diff --git a/installer/vendor/github.com/docker/docker/hack/Jenkins/readme.md b/installer/vendor/github.com/docker/docker/hack/Jenkins/readme.md
deleted file mode 100644
index ace3f3f563..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/Jenkins/readme.md
+++ /dev/null
@@ -1,3 +0,0 @@
-These files under this directory are for reference only. 
-
-They are used by Jenkins for CI runs.
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/hack/dind b/installer/vendor/github.com/docker/docker/hack/dind
deleted file mode 100755
index 082c3d31fe..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/dind
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-# DinD: a wrapper script which allows docker to be run inside a docker container.
-# Original version by Jerome Petazzoni <jerome@docker.com>
-# See the blog post: https://blog.docker.com/2013/09/docker-can-now-run-within-docker/
-#
-# This script should be executed inside a docker container in privileged mode
-# ('docker run --privileged', introduced in docker 0.6).
-
-# Usage: dind CMD [ARG...]
-
-# apparmor sucks and Docker needs to know that it's in a container (c) @tianon
-export container=docker
-
-if [ -d /sys/kernel/security ] && ! mountpoint -q /sys/kernel/security; then
-	mount -t securityfs none /sys/kernel/security || {
-		echo >&2 'Could not mount /sys/kernel/security.'
-		echo >&2 'AppArmor detection and --privileged mode might break.'
-	}
-fi
-
-# Mount /tmp (conditionally)
-if ! mountpoint -q /tmp; then
-	mount -t tmpfs none /tmp
-fi
-
-if [ $# -gt 0 ]; then
-	exec "$@"
-fi
-
-echo >&2 'ERROR: No command specified.'
-echo >&2 'You probably want to run hack/make.sh, or maybe a shell?'
diff --git a/installer/vendor/github.com/docker/docker/hack/dockerfile/binaries-commits b/installer/vendor/github.com/docker/docker/hack/dockerfile/binaries-commits
deleted file mode 100755
index 8dfcca3946..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/dockerfile/binaries-commits
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-
-TOMLV_COMMIT=9baf8a8a9f2ed20a8e54160840c492f937eeaf9a
-
-# When updating RUNC_COMMIT, also update runc in vendor.conf accordingly
-RUNC_COMMIT=9df8b306d01f59d3a8029be411de015b7304dd8f
-CONTAINERD_COMMIT=aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
-TINI_COMMIT=949e6facb77383876aeff8a6944dde66b3089574
-LIBNETWORK_COMMIT=0f534354b813003a754606689722fe253101bc4e
-VNDR_COMMIT=f56bd4504b4fad07a357913687fb652ee54bb3b0
-BINDATA_COMMIT=a0ff2567cfb70903282db057e799fd826784d41d
diff --git a/installer/vendor/github.com/docker/docker/hack/dockerfile/install-binaries.sh b/installer/vendor/github.com/docker/docker/hack/dockerfile/install-binaries.sh
deleted file mode 100755
index 64f2b57da1..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/dockerfile/install-binaries.sh
+++ /dev/null
@@ -1,123 +0,0 @@
-#!/bin/sh
-set -e
-set -x
-
-. $(dirname "$0")/binaries-commits
-
-RM_GOPATH=0
-
-TMP_GOPATH=${TMP_GOPATH:-""}
-
-if [ -z "$TMP_GOPATH" ]; then
-	export GOPATH="$(mktemp -d)"
-	RM_GOPATH=1
-else
-	export GOPATH="$TMP_GOPATH"
-fi
-
-# Do not build with ambient capabilities support
-RUNC_BUILDTAGS="${RUNC_BUILDTAGS:-"seccomp apparmor selinux"}"
-
-install_runc() {
-	echo "Install runc version $RUNC_COMMIT"
-	git clone https://github.com/docker/runc.git "$GOPATH/src/github.com/opencontainers/runc"
-	cd "$GOPATH/src/github.com/opencontainers/runc"
-	git checkout -q "$RUNC_COMMIT"
-	make BUILDTAGS="$RUNC_BUILDTAGS" $1
-	cp runc /usr/local/bin/docker-runc
-}
-
-install_containerd() {
-	echo "Install containerd version $CONTAINERD_COMMIT"
-	git clone https://github.com/docker/containerd.git "$GOPATH/src/github.com/docker/containerd"
-	cd "$GOPATH/src/github.com/docker/containerd"
-	git checkout -q "$CONTAINERD_COMMIT"
-	make $1
-	cp bin/containerd /usr/local/bin/docker-containerd
-	cp bin/containerd-shim /usr/local/bin/docker-containerd-shim
-	cp bin/ctr /usr/local/bin/docker-containerd-ctr
-}
-
-install_proxy() {
-	echo "Install docker-proxy version $LIBNETWORK_COMMIT"
-	git clone https://github.com/docker/libnetwork.git "$GOPATH/src/github.com/docker/libnetwork"
-	cd "$GOPATH/src/github.com/docker/libnetwork"
-	git checkout -q "$LIBNETWORK_COMMIT"
-	go build -ldflags="$PROXY_LDFLAGS" -o /usr/local/bin/docker-proxy github.com/docker/libnetwork/cmd/proxy
-}
-
-install_bindata() {
-    echo "Install go-bindata version $BINDATA_COMMIT"
-    git clone https://github.com/jteeuwen/go-bindata "$GOPATH/src/github.com/jteeuwen/go-bindata"
-    cd $GOPATH/src/github.com/jteeuwen/go-bindata
-    git checkout -q "$BINDATA_COMMIT"
-	go build -o /usr/local/bin/go-bindata github.com/jteeuwen/go-bindata/go-bindata
-}
-
-for prog in "$@"
-do
-	case $prog in
-		tomlv)
-			echo "Install tomlv version $TOMLV_COMMIT"
-			git clone https://github.com/BurntSushi/toml.git "$GOPATH/src/github.com/BurntSushi/toml"
-			cd "$GOPATH/src/github.com/BurntSushi/toml" && git checkout -q "$TOMLV_COMMIT"
-			go build -v -o /usr/local/bin/tomlv github.com/BurntSushi/toml/cmd/tomlv
-			;;
-
-		runc)
-			install_runc static
-			;;
-
-		runc-dynamic)
-			install_runc
-			;;
-
-		containerd)
-			install_containerd static
-			;;
-
-		containerd-dynamic)
-			install_containerd
-			;;
-
-		tini)
-			echo "Install tini version $TINI_COMMIT"
-			git clone https://github.com/krallin/tini.git "$GOPATH/tini"
-			cd "$GOPATH/tini"
-			git checkout -q "$TINI_COMMIT"
-			cmake .
-			make tini-static
-			cp tini-static /usr/local/bin/docker-init
-			;;
-
-		proxy)
-			export CGO_ENABLED=0
-			install_proxy
-			;;
-
-		proxy-dynamic)
-			PROXY_LDFLAGS="-linkmode=external" install_proxy
-			;;
-
-		vndr)
-			echo "Install vndr version $VNDR_COMMIT"
-			git clone https://github.com/LK4D4/vndr.git "$GOPATH/src/github.com/LK4D4/vndr"
-			cd "$GOPATH/src/github.com/LK4D4/vndr"
-			git checkout -q "$VNDR_COMMIT"
-			go build -v -o /usr/local/bin/vndr .
-			;;
-
-        bindata)
-            install_bindata
-            ;;
-
-		*)
-			echo echo "Usage: $0 [tomlv|runc|containerd|tini|proxy]"
-			exit 1
-
-	esac
-done
-
-if [ $RM_GOPATH -eq 1 ]; then
-	rm -rf "$GOPATH"
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/generate-swagger-api.sh b/installer/vendor/github.com/docker/docker/hack/generate-swagger-api.sh
deleted file mode 100755
index a8e9f818a7..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/generate-swagger-api.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-set -eu
-
-swagger generate model -f api/swagger.yaml \
-    -t api -m types --skip-validator -C api/swagger-gen.yaml \
-    -n Volume \
-    -n Port \
-    -n ImageSummary \
-    -n Plugin -n PluginDevice -n PluginMount -n PluginEnv -n PluginInterfaceType \
-    -n ErrorResponse \
-    -n IdResponse \
-    -n ServiceUpdateResponse
-
-swagger generate operation -f api/swagger.yaml \
-    -t api -a types -m types -C api/swagger-gen.yaml \
-    -T api/templates --skip-responses --skip-parameters --skip-validator \
-    -n VolumesList \
-    -n VolumesCreate \
-    -n ContainerCreate \
-    -n ContainerUpdate \
-    -n Authenticate \
-    -n ContainerWait
diff --git a/installer/vendor/github.com/docker/docker/hack/install.sh b/installer/vendor/github.com/docker/docker/hack/install.sh
deleted file mode 100644
index cc20d69396..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/install.sh
+++ /dev/null
@@ -1,484 +0,0 @@
-#!/bin/sh
-set -e
-#
-# This script is meant for quick & easy install via:
-#   'curl -sSL https://get.docker.com/ | sh'
-# or:
-#   'wget -qO- https://get.docker.com/ | sh'
-#
-# For test builds (ie. release candidates):
-#   'curl -fsSL https://test.docker.com/ | sh'
-# or:
-#   'wget -qO- https://test.docker.com/ | sh'
-#
-# For experimental builds:
-#   'curl -fsSL https://experimental.docker.com/ | sh'
-# or:
-#   'wget -qO- https://experimental.docker.com/ | sh'
-#
-# Docker Maintainers:
-#   To update this script on https://get.docker.com,
-#   use hack/release.sh during a normal release,
-#   or the following one-liner for script hotfixes:
-#     aws s3 cp --acl public-read hack/install.sh s3://get.docker.com/index
-#
-
-url="https://get.docker.com/"
-apt_url="https://apt.dockerproject.org"
-yum_url="https://yum.dockerproject.org"
-gpg_fingerprint="58118E89F3A912897C070ADBF76221572C52609D"
-
-key_servers="
-ha.pool.sks-keyservers.net
-pgp.mit.edu
-keyserver.ubuntu.com
-"
-
-mirror=''
-while [ $# -gt 0 ]; do
-	case "$1" in
-		--mirror)
-			mirror="$2"
-			shift
-			;;
-		*)
-			echo "Illegal option $1"
-			;;
-	esac
-	shift $(( $# > 0 ? 1 : 0 ))
-done
-
-case "$mirror" in
-	AzureChinaCloud)
-		apt_url="https://mirror.azure.cn/docker-engine/apt"
-		yum_url="https://mirror.azure.cn/docker-engine/yum"
-		;;
-esac
-
-command_exists() {
-	command -v "$@" > /dev/null 2>&1
-}
-
-echo_docker_as_nonroot() {
-	if command_exists docker && [ -e /var/run/docker.sock ]; then
-		(
-			set -x
-			$sh_c 'docker version'
-		) || true
-	fi
-	your_user=your-user
-	[ "$user" != 'root' ] && your_user="$user"
-	# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-EOF", spaces are kept in the output
-	cat <<-EOF
-
-	If you would like to use Docker as a non-root user, you should now consider
-	adding your user to the "docker" group with something like:
-
-	  sudo usermod -aG docker $your_user
-
-	Remember that you will have to log out and back in for this to take effect!
-
-	EOF
-}
-
-# Check if this is a forked Linux distro
-check_forked() {
-
-	# Check for lsb_release command existence, it usually exists in forked distros
-	if command_exists lsb_release; then
-		# Check if the `-u` option is supported
-		set +e
-		lsb_release -a -u > /dev/null 2>&1
-		lsb_release_exit_code=$?
-		set -e
-
-		# Check if the command has exited successfully, it means we're in a forked distro
-		if [ "$lsb_release_exit_code" = "0" ]; then
-			# Print info about current distro
-			cat <<-EOF
-			You're using '$lsb_dist' version '$dist_version'.
-			EOF
-
-			# Get the upstream release info
-			lsb_dist=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'id' | cut -d ':' -f 2 | tr -d '[[:space:]]')
-			dist_version=$(lsb_release -a -u 2>&1 | tr '[:upper:]' '[:lower:]' | grep -E 'codename' | cut -d ':' -f 2 | tr -d '[[:space:]]')
-
-			# Print info about upstream distro
-			cat <<-EOF
-			Upstream release is '$lsb_dist' version '$dist_version'.
-			EOF
-		else
-			if [ -r /etc/debian_version ] && [ "$lsb_dist" != "ubuntu" ] && [ "$lsb_dist" != "raspbian" ]; then
-				# We're Debian and don't even know it!
-				lsb_dist=debian
-				dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
-				case "$dist_version" in
-					9)
-						dist_version="stretch"
-					;;
-					8|'Kali Linux 2')
-						dist_version="jessie"
-					;;
-					7)
-						dist_version="wheezy"
-					;;
-				esac
-			fi
-		fi
-	fi
-}
-
-rpm_import_repository_key() {
-	local key=$1; shift
-	local tmpdir=$(mktemp -d)
-	chmod 600 "$tmpdir"
-	for key_server in $key_servers ; do
-		gpg --homedir "$tmpdir" --keyserver "$key_server" --recv-keys "$key" && break
-	done
-	gpg --homedir "$tmpdir" -k "$key" >/dev/null
-	gpg --homedir "$tmpdir" --export --armor "$key" > "$tmpdir"/repo.key
-	rpm --import "$tmpdir"/repo.key
-	rm -rf "$tmpdir"
-}
-
-semverParse() {
-	major="${1%%.*}"
-	minor="${1#$major.}"
-	minor="${minor%%.*}"
-	patch="${1#$major.$minor.}"
-	patch="${patch%%[-.]*}"
-}
-
-do_install() {
-	architecture=$(uname -m)
-	case $architecture in
-		# officially supported
-		amd64|x86_64)
-			;;
-		# unofficially supported with available repositories
-		armv6l|armv7l)
-			;;
-		# unofficially supported without available repositories
-		aarch64|arm64|ppc64le|s390x)
-			cat 1>&2 <<-EOF
-			Error: Docker doesn't officially support $architecture and no Docker $architecture repository exists.
-			EOF
-			exit 1
-			;;
-		# not supported
-		*)
-			cat >&2 <<-EOF
-			Error: $architecture is not a recognized platform.
-			EOF
-			exit 1
-			;;
-	esac
-
-	if command_exists docker; then
-		version="$(docker -v | cut -d ' ' -f3 | cut -d ',' -f1)"
-		MAJOR_W=1
-		MINOR_W=10
-
-		semverParse $version
-
-		shouldWarn=0
-		if [ $major -lt $MAJOR_W ]; then
-			shouldWarn=1
-		fi
-
-		if [ $major -le $MAJOR_W ] && [ $minor -lt $MINOR_W ]; then
-			shouldWarn=1
-		fi
-
-		cat >&2 <<-'EOF'
-			Warning: the "docker" command appears to already exist on this system.
-
-			If you already have Docker installed, this script can cause trouble, which is
-			why we're displaying this warning and provide the opportunity to cancel the
-			installation.
-
-			If you installed the current Docker package using this script and are using it
-		EOF
-
-		if [ $shouldWarn -eq 1 ]; then
-			cat >&2 <<-'EOF'
-			again to update Docker, we urge you to migrate your image store before upgrading
-			to v1.10+.
-
-			You can find instructions for this here:
-			https://github.com/docker/docker/wiki/Engine-v1.10.0-content-addressability-migration
-			EOF
-		else
-			cat >&2 <<-'EOF'
-			again to update Docker, you can safely ignore this message.
-			EOF
-		fi
-
-		cat >&2 <<-'EOF'
-
-			You may press Ctrl+C now to abort this script.
-		EOF
-		( set -x; sleep 20 )
-	fi
-
-	user="$(id -un 2>/dev/null || true)"
-
-	sh_c='sh -c'
-	if [ "$user" != 'root' ]; then
-		if command_exists sudo; then
-			sh_c='sudo -E sh -c'
-		elif command_exists su; then
-			sh_c='su -c'
-		else
-			cat >&2 <<-'EOF'
-			Error: this installer needs the ability to run commands as root.
-			We are unable to find either "sudo" or "su" available to make this happen.
-			EOF
-			exit 1
-		fi
-	fi
-
-	curl=''
-	if command_exists curl; then
-		curl='curl -sSL'
-	elif command_exists wget; then
-		curl='wget -qO-'
-	elif command_exists busybox && busybox --list-modules | grep -q wget; then
-		curl='busybox wget -qO-'
-	fi
-
-	# check to see which repo they are trying to install from
-	if [ -z "$repo" ]; then
-		repo='main'
-		if [ "https://test.docker.com/" = "$url" ]; then
-			repo='testing'
-		elif [ "https://experimental.docker.com/" = "$url" ]; then
-			repo='experimental'
-		fi
-	fi
-
-	# perform some very rudimentary platform detection
-	lsb_dist=''
-	dist_version=''
-	if command_exists lsb_release; then
-		lsb_dist="$(lsb_release -si)"
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/lsb-release ]; then
-		lsb_dist="$(. /etc/lsb-release && echo "$DISTRIB_ID")"
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/debian_version ]; then
-		lsb_dist='debian'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/fedora-release ]; then
-		lsb_dist='fedora'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/oracle-release ]; then
-		lsb_dist='oracleserver'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/centos-release ]; then
-		lsb_dist='centos'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/redhat-release ]; then
-		lsb_dist='redhat'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/photon-release ]; then
-		lsb_dist='photon'
-	fi
-	if [ -z "$lsb_dist" ] && [ -r /etc/os-release ]; then
-		lsb_dist="$(. /etc/os-release && echo "$ID")"
-	fi
-
-	lsb_dist="$(echo "$lsb_dist" | tr '[:upper:]' '[:lower:]')"
-
-	# Special case redhatenterpriseserver
-	if [ "${lsb_dist}" = "redhatenterpriseserver" ]; then
-        	# Set it to redhat, it will be changed to centos below anyways
-        	lsb_dist='redhat'
-	fi
-
-	case "$lsb_dist" in
-
-		ubuntu)
-			if command_exists lsb_release; then
-				dist_version="$(lsb_release --codename | cut -f2)"
-			fi
-			if [ -z "$dist_version" ] && [ -r /etc/lsb-release ]; then
-				dist_version="$(. /etc/lsb-release && echo "$DISTRIB_CODENAME")"
-			fi
-		;;
-
-		debian|raspbian)
-			dist_version="$(cat /etc/debian_version | sed 's/\/.*//' | sed 's/\..*//')"
-			case "$dist_version" in
-				8)
-					dist_version="jessie"
-				;;
-				7)
-					dist_version="wheezy"
-				;;
-			esac
-		;;
-
-		oracleserver)
-			# need to switch lsb_dist to match yum repo URL
-			lsb_dist="oraclelinux"
-			dist_version="$(rpm -q --whatprovides redhat-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//')"
-		;;
-
-		fedora|centos|redhat)
-			dist_version="$(rpm -q --whatprovides ${lsb_dist}-release --queryformat "%{VERSION}\n" | sed 's/\/.*//' | sed 's/\..*//' | sed 's/Server*//' | sort | tail -1)"
-		;;
-
-		"vmware photon")
-			lsb_dist="photon"
-			dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
-		;;
-
-		*)
-			if command_exists lsb_release; then
-				dist_version="$(lsb_release --codename | cut -f2)"
-			fi
-			if [ -z "$dist_version" ] && [ -r /etc/os-release ]; then
-				dist_version="$(. /etc/os-release && echo "$VERSION_ID")"
-			fi
-		;;
-
-
-	esac
-
-	# Check if this is a forked Linux distro
-	check_forked
-
-	# Run setup for each distro accordingly
-	case "$lsb_dist" in
-		ubuntu|debian|raspbian)
-			export DEBIAN_FRONTEND=noninteractive
-
-			did_apt_get_update=
-			apt_get_update() {
-				if [ -z "$did_apt_get_update" ]; then
-					( set -x; $sh_c 'sleep 3; apt-get update' )
-					did_apt_get_update=1
-				fi
-			}
-
-			if [ "$lsb_dist" != "raspbian" ]; then
-				# aufs is preferred over devicemapper; try to ensure the driver is available.
-				if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
-					if uname -r | grep -q -- '-generic' && dpkg -l 'linux-image-*-generic' | grep -qE '^ii|^hi' 2>/dev/null; then
-						kern_extras="linux-image-extra-$(uname -r) linux-image-extra-virtual"
-
-						apt_get_update
-						( set -x; $sh_c 'sleep 3; apt-get install -y -q '"$kern_extras" ) || true
-
-						if ! grep -q aufs /proc/filesystems && ! $sh_c 'modprobe aufs'; then
-							echo >&2 'Warning: tried to install '"$kern_extras"' (for AUFS)'
-							echo >&2 ' but we still have no AUFS.  Docker may not work. Proceeding anyways!'
-							( set -x; sleep 10 )
-						fi
-					else
-						echo >&2 'Warning: current kernel is not supported by the linux-image-extra-virtual'
-						echo >&2 ' package.  We have no AUFS support.  Consider installing the packages'
-						echo >&2 ' linux-image-virtual kernel and linux-image-extra-virtual for AUFS support.'
-						( set -x; sleep 10 )
-					fi
-				fi
-			fi
-
-			# install apparmor utils if they're missing and apparmor is enabled in the kernel
-			# otherwise Docker will fail to start
-			if [ "$(cat /sys/module/apparmor/parameters/enabled 2>/dev/null)" = 'Y' ]; then
-				if command -v apparmor_parser >/dev/null 2>&1; then
-					echo 'apparmor is enabled in the kernel and apparmor utils were already installed'
-				else
-					echo 'apparmor is enabled in the kernel, but apparmor_parser is missing. Trying to install it..'
-					apt_get_update
-					( set -x; $sh_c 'sleep 3; apt-get install -y -q apparmor' )
-				fi
-			fi
-
-			if [ ! -e /usr/lib/apt/methods/https ]; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q apt-transport-https ca-certificates' )
-			fi
-			if [ -z "$curl" ]; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q curl ca-certificates' )
-				curl='curl -sSL'
-			fi
-			if ! command -v gpg > /dev/null; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q gnupg2 || apt-get install -y -q gnupg' )
-			fi
-
-			# dirmngr is a separate package in ubuntu yakkety; see https://bugs.launchpad.net/ubuntu/+source/apt/+bug/1634464
-			if ! command -v dirmngr > /dev/null; then
-				apt_get_update
-				( set -x; $sh_c 'sleep 3; apt-get install -y -q dirmngr' )
-			fi
-
-			(
-			set -x
-			for key_server in $key_servers ; do
-				$sh_c "apt-key adv --keyserver hkp://${key_server}:80 --recv-keys ${gpg_fingerprint}" && break
-			done
-			$sh_c "apt-key adv -k ${gpg_fingerprint} >/dev/null"
-			$sh_c "mkdir -p /etc/apt/sources.list.d"
-			$sh_c "echo deb \[arch=$(dpkg --print-architecture)\] ${apt_url}/repo ${lsb_dist}-${dist_version} ${repo} > /etc/apt/sources.list.d/docker.list"
-			$sh_c 'sleep 3; apt-get update; apt-get install -y -q docker-engine'
-			)
-			echo_docker_as_nonroot
-			exit 0
-			;;
-
-		fedora|centos|redhat|oraclelinux|photon)
-			if [ "${lsb_dist}" = "redhat" ]; then
-				# we use the centos repository for both redhat and centos releases
-				lsb_dist='centos'
-			fi
-			$sh_c "cat >/etc/yum.repos.d/docker-${repo}.repo" <<-EOF
-			[docker-${repo}-repo]
-			name=Docker ${repo} Repository
-			baseurl=${yum_url}/repo/${repo}/${lsb_dist}/${dist_version}
-			enabled=1
-			gpgcheck=1
-			gpgkey=${yum_url}/gpg
-			EOF
-			if [ "$lsb_dist" = "fedora" ] && [ "$dist_version" -ge "22" ]; then
-				(
-					set -x
-					$sh_c 'sleep 3; dnf -y -q install docker-engine'
-				)
-			elif [ "$lsb_dist" = "photon" ]; then
-				(
-					set -x
-					$sh_c 'sleep 3; tdnf -y install docker-engine'
-				)
-			else
-				(
-					set -x
-					$sh_c 'sleep 3; yum -y -q install docker-engine'
-				)
-			fi
-			echo_docker_as_nonroot
-			exit 0
-			;;
-	esac
-
-	# intentionally mixed spaces and tabs here -- tabs are stripped by "<<-'EOF'", spaces are kept in the output
-	cat >&2 <<-'EOF'
-
-	  Either your platform is not easily detectable, is not supported by this
-	  installer script (yet - PRs welcome! [hack/install.sh]), or does not yet have
-	  a package for Docker.  Please visit the following URL for more detailed
-	  installation instructions:
-
-	    https://docs.docker.com/engine/installation/
-
-	EOF
-	exit 1
-}
-
-# wrapped up in a function so that we have some protection against only getting
-# half the file during "curl | sh"
-do_install
diff --git a/installer/vendor/github.com/docker/docker/hack/make.ps1 b/installer/vendor/github.com/docker/docker/hack/make.ps1
deleted file mode 100644
index 14b9603b2e..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make.ps1
+++ /dev/null
@@ -1,408 +0,0 @@
-<#
-.NOTES
-    Author:  @jhowardmsft
-
-    Summary: Windows native build script. This is similar to functionality provided
-             by hack\make.sh, but uses native Windows PowerShell semantics. It does
-             not support the full set of options provided by the Linux counterpart.
-             For example:
-
-             - You can't cross-build Linux docker binaries on Windows
-             - Hashes aren't generated on binaries
-             - 'Releasing' isn't supported.
-             - Integration tests. This is because they currently cannot run inside a container,
-               and require significant external setup.
-
-             It does however provided the minimum necessary to support parts of local Windows
-             development and Windows to Windows CI.
-
-             Usage Examples (run from repo root):
-                "hack\make.ps1 -Binary" to build the binaries
-                "hack\make.ps1 -Client" to build just the client 64-bit binary
-                "hack\make.ps1 -TestUnit" to run unit tests
-                "hack\make.ps1 -Binary -TestUnit" to build the binaries and run unit tests
-                "hack\make.ps1 -All" to run everything this script knows about
-
-.PARAMETER Client
-     Builds the client binaries.
-
-.PARAMETER Daemon
-     Builds the daemon binary.
-
-.PARAMETER Binary
-     Builds the client binaries and the daemon binary. A convenient shortcut to `make.ps1 -Client -Daemon`.
-
-.PARAMETER Race
-     Use -race in go build and go test.
-
-.PARAMETER Noisy
-     Use -v in go build.
-
-.PARAMETER ForceBuildAll
-     Use -a in go build.
-
-.PARAMETER NoOpt
-     Use -gcflags -N -l in go build to disable optimisation (can aide debugging).
-
-.PARAMETER CommitSuffix
-     Adds a custom string to be appended to the commit ID (spaces are stripped).
-
-.PARAMETER DCO
-     Runs the DCO (Developer Certificate Of Origin) test.
-
-.PARAMETER PkgImports
-     Runs the pkg\ directory imports test.
-
-.PARAMETER GoFormat
-     Runs the Go formatting test.
-
-.PARAMETER TestUnit
-     Runs unit tests.
-
-.PARAMETER All
-     Runs everything this script knows about.
-
-
-TODO
-- Unify the head commit
-- Sort out the GITCOMMIT environment variable in the absense of a .git (longer term)
-- Add golint and other checks (swagger maybe?)
-
-#>
-
-
-param(
-    [Parameter(Mandatory=$False)][switch]$Client,
-    [Parameter(Mandatory=$False)][switch]$Daemon,
-    [Parameter(Mandatory=$False)][switch]$Binary,
-    [Parameter(Mandatory=$False)][switch]$Race,
-    [Parameter(Mandatory=$False)][switch]$Noisy,
-    [Parameter(Mandatory=$False)][switch]$ForceBuildAll,
-    [Parameter(Mandatory=$False)][switch]$NoOpt,
-    [Parameter(Mandatory=$False)][string]$CommitSuffix="",
-    [Parameter(Mandatory=$False)][switch]$DCO,
-    [Parameter(Mandatory=$False)][switch]$PkgImports,
-    [Parameter(Mandatory=$False)][switch]$GoFormat,
-    [Parameter(Mandatory=$False)][switch]$TestUnit,
-    [Parameter(Mandatory=$False)][switch]$All
-)
-
-$ErrorActionPreference = "Stop"
-$pushed=$False  # To restore the directory if we have temporarily pushed to one.
-
-# Utility function to get the commit ID of the repository
-Function Get-GitCommit() {
-    if (-not (Test-Path ".\.git")) {
-        # If we don't have a .git directory, but we do have the environment
-        # variable DOCKER_GITCOMMIT set, that can override it.
-        if ($env:DOCKER_GITCOMMIT.Length -eq 0) {
-            Throw ".git directory missing and DOCKER_GITCOMMIT environment variable not specified."
-        }
-        Write-Host "INFO: Git commit assumed from DOCKER_GITCOMMIT environment variable"
-        return $env:DOCKER_GITCOMMIT
-    }
-    $gitCommit=$(git rev-parse --short HEAD)
-    if ($(git status --porcelain --untracked-files=no).Length -ne 0) {
-        $gitCommit="$gitCommit-unsupported"
-        Write-Host ""
-        Write-Warning "This version is unsupported because there are uncommitted file(s)."
-        Write-Warning "Either commit these changes, or add them to .gitignore."
-        git status --porcelain --untracked-files=no | Write-Warning
-        Write-Host ""
-    }
-    return $gitCommit
-}
-
-# Utility function to get get the current build version of docker
-Function Get-DockerVersion() {
-    if (-not (Test-Path ".\VERSION")) { Throw "VERSION file not found. Is this running from the root of a docker repository?" }
-    return $(Get-Content ".\VERSION" -raw).ToString().Replace("`n","").Trim()
-}
-
-# Utility function to determine if we are running in a container or not.
-# In Windows, we get this through an environment variable set in `Dockerfile.Windows`
-Function Check-InContainer() {
-    if ($env:FROM_DOCKERFILE.Length -eq 0) {
-        Write-Host ""
-        Write-Warning "Not running in a container. The result might be an incorrect build."
-        Write-Host ""
-    }
-}
-
-# Utility function to get the commit for HEAD
-Function Get-HeadCommit() {
-    $head = Invoke-Expression "git rev-parse --verify HEAD"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed getting HEAD commit" }
-
-    return $head
-}
-
-# Utility function to get the commit for upstream
-Function Get-UpstreamCommit() {
-    Invoke-Expression "git fetch -q https://github.com/docker/docker.git refs/heads/master"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed fetching" }
-
-    $upstream = Invoke-Expression "git rev-parse --verify FETCH_HEAD"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed getting upstream commit" }
-
-    return $upstream
-}
-
-# Build a binary (client or daemon)
-Function Execute-Build($type, $additionalBuildTags, $directory) {
-    # Generate the build flags
-    $buildTags = "autogen"
-    if ($Noisy)                     { $verboseParm=" -v" }
-    if ($Race)                      { Write-Warning "Using race detector"; $raceParm=" -race"}
-    if ($ForceBuildAll)             { $allParm=" -a" }
-    if ($NoOpt)                     { $optParm=" -gcflags "+""""+"-N -l"+"""" }
-    if ($addtionalBuildTags -ne "") { $buildTags += $(" " + $additionalBuildTags) }
-
-    # Do the go build in the appropriate directory
-    # Note -linkmode=internal is required to be able to debug on Windows.
-    # https://github.com/golang/go/issues/14319#issuecomment-189576638
-    Write-Host "INFO: Building $type..."
-    Push-Location $root\cmd\$directory; $global:pushed=$True
-    $buildCommand = "go build" + `
-                    $raceParm + `
-                    $verboseParm + `
-                    $allParm + `
-                    $optParm + `
-                    " -tags """ + $buildTags + """" + `
-                    " -ldflags """ + "-linkmode=internal" + """" + `
-                    " -o $root\bundles\"+$directory+".exe"
-    Invoke-Expression $buildCommand
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile $type" }
-    Pop-Location; $global:pushed=$False
-}
-
-
-# Validates the DCO marker is present on each commit
-Function Validate-DCO($headCommit, $upstreamCommit) {
-    Write-Host "INFO: Validating Developer Certificate of Origin..."
-    # Username may only contain alphanumeric characters or dashes and cannot begin with a dash
-    $usernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'
-
-    $dcoPrefix="Signed-off-by:"
-    $dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($usernameRegex)\\))?$"
-
-    $counts = Invoke-Expression "git diff --numstat $upstreamCommit...$headCommit"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed git diff --numstat" }
-
-    # Counts of adds and deletes after removing multiple white spaces. AWK anyone? :(
-    $adds=0; $dels=0; $($counts -replace '\s+', ' ') | %{ 
-        $a=$_.Split(" "); 
-        if ($a[0] -ne "-") { $adds+=[int]$a[0] }
-        if ($a[1] -ne "-") { $dels+=[int]$a[1] }
-    }
-    if (($adds -eq 0) -and ($dels -eq 0)) { 
-        Write-Warning "DCO validation - nothing to validate!"
-        return
-    }
-
-    $commits = Invoke-Expression "git log  $upstreamCommit..$headCommit --format=format:%H%n"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed git log --format" }
-    $commits = $($commits -split '\s+' -match '\S')
-    $badCommits=@()
-    $commits | %{
-        # Skip commits with no content such as merge commits etc
-        if ($(git log -1 --format=format: --name-status $_).Length -gt 0) {
-            # Ignore exit code on next call - always process regardless
-            $commitMessage = Invoke-Expression "git log -1 --format=format:%B --name-status $_"
-            if (($commitMessage -match $dcoRegex).Length -eq 0) { $badCommits+=$_ }
-        }
-    }
-    if ($badCommits.Length -eq 0) {
-        Write-Host "Congratulations!  All commits are properly signed with the DCO!"
-    } else {
-        $e = "`nThese commits do not have a proper '$dcoPrefix' marker:`n"
-        $badCommits | %{ $e+=" - $_`n"}
-        $e += "`nPlease amend each commit to include a properly formatted DCO marker.`n`n"
-        $e += "Visit the following URL for information about the Docker DCO:`n"
-        $e += "https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work`n"
-        Throw $e
-    }
-}
-
-# Validates that .\pkg\... is safely isolated from internal code
-Function Validate-PkgImports($headCommit, $upstreamCommit) {
-    Write-Host "INFO: Validating pkg import isolation..."
-
-    # Get a list of go source-code files which have changed under pkg\. Ignore exit code on next call - always process regardless
-    $files=@(); $files = Invoke-Expression "git diff $upstreamCommit...$headCommit --diff-filter=ACMR --name-only -- `'pkg\*.go`'"
-    $badFiles=@(); $files | %{
-        $file=$_
-        # For the current changed file, get its list of dependencies, sorted and uniqued.
-        $imports = Invoke-Expression "go list -e -f `'{{ .Deps }}`' $file"
-        if ($LASTEXITCODE -ne 0) { Throw "Failed go list for dependencies on $file" }
-        $imports = $imports -Replace "\[" -Replace "\]", "" -Split(" ") | Sort-Object | Get-Unique
-        # Filter out what we are looking for
-        $imports = $imports -NotMatch "^github.com/docker/docker/pkg/" `
-                            -NotMatch "^github.com/docker/docker/vendor" `
-                            -Match "^github.com/docker/docker" `
-                            -Replace "`n", ""
-        $imports | % { $badFiles+="$file imports $_`n" }
-    }
-    if ($badFiles.Length -eq 0) {
-        Write-Host 'Congratulations!  ".\pkg\*.go" is safely isolated from internal code.'
-    } else {
-        $e = "`nThese files import internal code: (either directly or indirectly)`n"
-        $badFiles | %{ $e+=" - $_"}
-        Throw $e
-    }
-}
-
-# Validates that changed files are correctly go-formatted
-Function Validate-GoFormat($headCommit, $upstreamCommit) {
-    Write-Host "INFO: Validating go formatting on changed files..."
-
-    # Verify gofmt is installed
-    if ($(Get-Command gofmt -ErrorAction SilentlyContinue) -eq $nil) { Throw "gofmt does not appear to be installed" }
-
-    # Get a list of all go source-code files which have changed.  Ignore exit code on next call - always process regardless
-    $files=@(); $files = Invoke-Expression "git diff $upstreamCommit...$headCommit --diff-filter=ACMR --name-only -- `'*.go`'"
-    $files = $files | Select-String -NotMatch "^vendor/" | Select-String -NotMatch "^cli/compose/schema/bindata.go"
-    $badFiles=@(); $files | %{
-        # Deliberately ignore error on next line - treat as failed
-        $content=Invoke-Expression "git show $headCommit`:$_"
-
-        # Next set of hoops are to ensure we have LF not CRLF semantics as otherwise gofmt on Windows will not succeed.
-        # Also note that gofmt on Windows does not appear to support stdin piping correctly. Hence go through a temporary file.
-        $content=$content -join "`n"
-        $content+="`n"
-        $outputFile=[System.IO.Path]::GetTempFileName()
-        if (Test-Path $outputFile) { Remove-Item $outputFile }
-        [System.IO.File]::WriteAllText($outputFile, $content, (New-Object System.Text.UTF8Encoding($False)))
-        $valid=Invoke-Expression "gofmt -s -l $outputFile"
-        Write-Host "Checking $outputFile"
-        if ($valid.Length -ne 0) { $badFiles+=$_ }
-        if (Test-Path $outputFile) { Remove-Item $outputFile }
-    }
-    if ($badFiles.Length -eq 0) {
-        Write-Host 'Congratulations!  All Go source files are properly formatted.'
-    } else {
-        $e = "`nThese files are not properly gofmt`'d:`n"
-        $badFiles | %{ $e+=" - $_`n"}
-        $e+= "`nPlease reformat the above files using `"gofmt -s -w`" and commit the result."
-        Throw $e
-    }
-}
-
-# Run the unit tests
-Function Run-UnitTests() {
-    Write-Host "INFO: Running unit tests..."
-    $testPath="./..."
-    $goListCommand = "go list -e -f '{{if ne .Name """ + '\"github.com/docker/docker\"' + """}}{{.ImportPath}}{{end}}' $testPath"
-    $pkgList = $(Invoke-Expression $goListCommand)
-    if ($LASTEXITCODE -ne 0) { Throw "go list for unit tests failed" }
-    $pkgList = $pkgList | Select-String -Pattern "github.com/docker/docker"
-    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/vendor"
-    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/man"
-    $pkgList = $pkgList | Select-String -NotMatch "github.com/docker/docker/integration-cli"
-    $pkgList = $pkgList -replace "`r`n", " "
-    $goTestCommand = "go test" + $raceParm + " -cover -ldflags -w -tags """ + "autogen daemon" + """ -a """ + "-test.timeout=10m" + """ $pkgList"
-    Invoke-Expression $goTestCommand
-    if ($LASTEXITCODE -ne 0) { Throw "Unit tests failed" }
-}
-
-# Start of main code.
-Try {
-    Write-Host -ForegroundColor Cyan "INFO: make.ps1 starting at $(Get-Date)"
-    $root=$(pwd)
-
-    # Handle the "-All" shortcut to turn on all things we can handle.
-    if ($All) { $Client=$True; $Daemon=$True; $DCO=$True; $PkgImports=$True; $GoFormat=$True; $TestUnit=$True }
-
-    # Handle the "-Binary" shortcut to build both client and daemon.
-    if ($Binary) { $Client = $True; $Daemon = $True }
-
-    # Make sure we have something to do
-    if (-not($Client) -and -not($Daemon) -and -not($DCO) -and -not($PkgImports) -and -not($GoFormat) -and -not($TestUnit)) { Throw 'Nothing to do. Try adding "-All" for everything I can do' }
-
-    # Verify git is installed
-    if ($(Get-Command git -ErrorAction SilentlyContinue) -eq $nil) { Throw "Git does not appear to be installed" }
-
-    # Verify go is installed
-    if ($(Get-Command go -ErrorAction SilentlyContinue) -eq $nil) { Throw "GoLang does not appear to be installed" }
-
-    # Get the git commit. This will also verify if we are in a repo or not. Then add a custom string if supplied.
-    $gitCommit=Get-GitCommit
-    if ($CommitSuffix -ne "") { $gitCommit += "-"+$CommitSuffix -Replace ' ', '' }
-
-    # Get the version of docker (eg 1.14.0-dev)
-    $dockerVersion=Get-DockerVersion
-
-    # Give a warning if we are not running in a container and are building binaries or running unit tests.
-    # Not relevant for validation tests as these are fine to run outside of a container.
-    if ($Client -or $Daemon -or $TestUnit) { Check-InContainer }
-
-    # Verify GOPATH is set
-    if ($env:GOPATH.Length -eq 0) { Throw "Missing GOPATH environment variable. See https://golang.org/doc/code.html#GOPATH" }
-
-    # Run autogen if building binaries or running unit tests.
-    if ($Client -or $Daemon -or $TestUnit) {
-        Write-Host "INFO: Invoking autogen..."
-        Try { .\hack\make\.go-autogen.ps1 -CommitString $gitCommit -DockerVersion $dockerVersion }
-        Catch [Exception] { Throw $_ }
-    }
-
-    # DCO, Package import and Go formatting tests.
-    if ($DCO -or $PkgImports -or $GoFormat) {
-        # We need the head and upstream commits for these
-        $headCommit=Get-HeadCommit
-        $upstreamCommit=Get-UpstreamCommit
-
-        # Run DCO validation
-        if ($DCO) { Validate-DCO $headCommit $upstreamCommit }
-
-        # Run `gofmt` validation
-        if ($GoFormat) { Validate-GoFormat $headCommit $upstreamCommit }
-
-        # Run pkg isolation validation
-        if ($PkgImports) { Validate-PkgImports $headCommit $upstreamCommit }
-    }
-
-    # Build the binaries
-    if ($Client -or $Daemon) {
-        # Create the bundles directory if it doesn't exist
-        if (-not (Test-Path ".\bundles")) { New-Item ".\bundles" -ItemType Directory | Out-Null }
-
-        # Perform the actual build
-        if ($Daemon) { Execute-Build "daemon" "daemon" "dockerd" }
-        if ($Client) { Execute-Build "client" "" "docker" }
-    }
-
-    # Run unit tests
-    if ($TestUnit) { Run-UnitTests }
-
-    # Gratuitous ASCII art.
-    if ($Daemon -or $Client) {
-        Write-Host
-        Write-Host -ForegroundColor Green " ________   ____  __."
-        Write-Host -ForegroundColor Green " \_____  \ `|    `|/ _`|"
-        Write-Host -ForegroundColor Green " /   `|   \`|      `<"
-        Write-Host -ForegroundColor Green " /    `|    \    `|  \"
-        Write-Host -ForegroundColor Green " \_______  /____`|__ \"
-        Write-Host -ForegroundColor Green "         \/        \/"
-        Write-Host
-    }
-}
-Catch [Exception] {
-    Write-Host -ForegroundColor Red ("`nERROR: make.ps1 failed:`n$_")
-
-    # More gratuitous ASCII art.
-    Write-Host
-    Write-Host -ForegroundColor Red  "___________      .__.__             .___"
-    Write-Host -ForegroundColor Red  "\_   _____/____  `|__`|  `|   ____   __`| _/"
-    Write-Host -ForegroundColor Red  " `|    __) \__  \ `|  `|  `| _/ __ \ / __ `| "
-    Write-Host -ForegroundColor Red  " `|     \   / __ \`|  `|  `|_\  ___// /_/ `| "
-    Write-Host -ForegroundColor Red  " \___  /  (____  /__`|____/\___  `>____ `| "
-    Write-Host -ForegroundColor Red  "     \/        \/             \/     \/ "
-    Write-Host
-
-    Throw $_
-}
-Finally {
-    if ($global:pushed) { Pop-Location }
-    Write-Host -ForegroundColor Cyan "INFO: make.ps1 ended at $(Get-Date)"
-}
diff --git a/installer/vendor/github.com/docker/docker/hack/make.sh b/installer/vendor/github.com/docker/docker/hack/make.sh
deleted file mode 100755
index f0e482feda..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make.sh
+++ /dev/null
@@ -1,304 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# This script builds various binary artifacts from a checkout of the docker
-# source code.
-#
-# Requirements:
-# - The current directory should be a checkout of the docker source code
-#   (https://github.com/docker/docker). Whatever version is checked out
-#   will be built.
-# - The VERSION file, at the root of the repository, should exist, and
-#   will be used as Docker binary version and package version.
-# - The hash of the git commit will also be included in the Docker binary,
-#   with the suffix -unsupported if the repository isn't clean.
-# - The script is intended to be run inside the docker container specified
-#   in the Dockerfile at the root of the source. In other words:
-#   DO NOT CALL THIS SCRIPT DIRECTLY.
-# - The right way to call this script is to invoke "make" from
-#   your checkout of the Docker repository.
-#   the Makefile will do a "docker build -t docker ." and then
-#   "docker run hack/make.sh" in the resulting image.
-#
-
-set -o pipefail
-
-export DOCKER_PKG='github.com/docker/docker'
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-export MAKEDIR="$SCRIPTDIR/make"
-export PKG_CONFIG=${PKG_CONFIG:-pkg-config}
-
-# We're a nice, sexy, little shell script, and people might try to run us;
-# but really, they shouldn't. We want to be in a container!
-inContainer="AssumeSoInitially"
-if [ "$(go env GOHOSTOS)" = 'windows' ]; then
-	if [ -z "$FROM_DOCKERFILE" ]; then
-		unset inContainer
-	fi
-else
-	if [ "$PWD" != "/go/src/$DOCKER_PKG" ] || [ -z "$DOCKER_CROSSPLATFORMS" ]; then
-		unset inContainer
-	fi
-fi
-
-if [ -z "$inContainer" ]; then
-	{
-		echo "# WARNING! I don't seem to be running in a Docker container."
-		echo "# The result of this command might be an incorrect build, and will not be"
-		echo "# officially supported."
-		echo "#"
-		echo "# Try this instead: make all"
-		echo "#"
-	} >&2
-fi
-
-echo
-
-# List of bundles to create when no argument is passed
-DEFAULT_BUNDLES=(
-	binary-client
-	binary-daemon
-	dynbinary
-
-	test-unit
-	test-integration-cli
-	test-docker-py
-
-	cross
-	tgz
-)
-
-VERSION=$(< ./VERSION)
-! BUILDTIME=$(date --rfc-3339 ns 2> /dev/null | sed -e 's/ /T/')
-if command -v git &> /dev/null && [ -d .git ] && git rev-parse &> /dev/null; then
-	GITCOMMIT=$(git rev-parse --short HEAD)
-	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		GITCOMMIT="$GITCOMMIT-unsupported"
-		echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-		echo "# GITCOMMIT = $GITCOMMIT"
-		echo "# The version you are building is listed as unsupported because"
-		echo "# there are some files in the git repository that are in an uncommitted state."
-		echo "# Commit these changes, or add to .gitignore to remove the -unsupported from the version."
-		echo "# Here is the current list:"
-		git status --porcelain --untracked-files=no
-		echo "#~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~"
-	fi
-elif [ "$DOCKER_GITCOMMIT" ]; then
-	GITCOMMIT="$DOCKER_GITCOMMIT"
-else
-	echo >&2 'error: .git directory missing and DOCKER_GITCOMMIT not specified'
-	echo >&2 '  Please either build with the .git directory accessible, or specify the'
-	echo >&2 '  exact (--short) commit hash you are building using DOCKER_GITCOMMIT for'
-	echo >&2 '  future accountability in diagnosing build issues.  Thanks!'
-	exit 1
-fi
-
-if [ "$AUTO_GOPATH" ]; then
-	rm -rf .gopath
-	mkdir -p .gopath/src/"$(dirname "${DOCKER_PKG}")"
-	ln -sf ../../../.. .gopath/src/"${DOCKER_PKG}"
-	export GOPATH="${PWD}/.gopath"
-
-	if [ "$(go env GOOS)" = 'solaris' ]; then
-		# sys/unix is installed outside the standard library on solaris
-		# TODO need to allow for version change, need to get version from go
-		export GO_VERSION=${GO_VERSION:-"1.7.1"}
-		export GOPATH="${GOPATH}:/usr/lib/gocode/${GO_VERSION}"
-	fi
-fi
-
-if [ ! "$GOPATH" ]; then
-	echo >&2 'error: missing GOPATH; please see https://golang.org/doc/code.html#GOPATH'
-	echo >&2 '  alternatively, set AUTO_GOPATH=1'
-	exit 1
-fi
-
-DOCKER_BUILDTAGS+=" daemon"
-if ${PKG_CONFIG} 'libsystemd >= 209' 2> /dev/null ; then
-	DOCKER_BUILDTAGS+=" journald"
-elif ${PKG_CONFIG} 'libsystemd-journal' 2> /dev/null ; then
-	DOCKER_BUILDTAGS+=" journald journald_compat"
-fi
-
-# test whether "btrfs/version.h" exists and apply btrfs_noversion appropriately
-if \
-	command -v gcc &> /dev/null \
-	&& ! gcc -E - -o /dev/null &> /dev/null <<<'#include <btrfs/version.h>' \
-; then
-	DOCKER_BUILDTAGS+=' btrfs_noversion'
-fi
-
-# test whether "libdevmapper.h" is new enough to support deferred remove
-# functionality.
-if \
-	command -v gcc &> /dev/null \
-	&& ! ( echo -e  '#include <libdevmapper.h>\nint main() { dm_task_deferred_remove(NULL); }'| gcc -xc - -o /dev/null -ldevmapper &> /dev/null ) \
-; then
-       DOCKER_BUILDTAGS+=' libdm_no_deferred_remove'
-fi
-
-# Use these flags when compiling the tests and final binary
-
-IAMSTATIC='true'
-source "$SCRIPTDIR/make/.go-autogen"
-if [ -z "$DOCKER_DEBUG" ]; then
-	LDFLAGS='-w'
-fi
-
-LDFLAGS_STATIC=''
-EXTLDFLAGS_STATIC='-static'
-# ORIG_BUILDFLAGS is necessary for the cross target which cannot always build
-# with options like -race.
-ORIG_BUILDFLAGS=( -tags "autogen netgo static_build sqlite_omit_load_extension $DOCKER_BUILDTAGS" -installsuffix netgo )
-# see https://github.com/golang/go/issues/9369#issuecomment-69864440 for why -installsuffix is necessary here
-
-# When $DOCKER_INCREMENTAL_BINARY is set in the environment, enable incremental
-# builds by installing dependent packages to the GOPATH.
-REBUILD_FLAG="-a"
-if [ "$DOCKER_INCREMENTAL_BINARY" ]; then
-	REBUILD_FLAG="-i"
-fi
-ORIG_BUILDFLAGS+=( $REBUILD_FLAG )
-
-BUILDFLAGS=( $BUILDFLAGS "${ORIG_BUILDFLAGS[@]}" )
-# Test timeout.
-
-if [ "${DOCKER_ENGINE_GOARCH}" == "arm" ]; then
-	: ${TIMEOUT:=10m}
-elif [ "${DOCKER_ENGINE_GOARCH}" == "windows" ]; then
-	: ${TIMEOUT:=8m}
-else
-	: ${TIMEOUT:=5m}
-fi
-
-LDFLAGS_STATIC_DOCKER="
-	$LDFLAGS_STATIC
-	-extldflags \"$EXTLDFLAGS_STATIC\"
-"
-
-if [ "$(uname -s)" = 'FreeBSD' ]; then
-	# Tell cgo the compiler is Clang, not GCC
-	# https://code.google.com/p/go/source/browse/src/cmd/cgo/gcc.go?spec=svne77e74371f2340ee08622ce602e9f7b15f29d8d3&r=e6794866ebeba2bf8818b9261b54e2eef1c9e588#752
-	export CC=clang
-
-	# "-extld clang" is a workaround for
-	# https://code.google.com/p/go/issues/detail?id=6845
-	LDFLAGS="$LDFLAGS -extld clang"
-fi
-
-# If sqlite3.h doesn't exist under /usr/include,
-# check /usr/local/include also just in case
-# (e.g. FreeBSD Ports installs it under the directory)
-if [ ! -e /usr/include/sqlite3.h ] && [ -e /usr/local/include/sqlite3.h ]; then
-	export CGO_CFLAGS='-I/usr/local/include'
-	export CGO_LDFLAGS='-L/usr/local/lib'
-fi
-
-HAVE_GO_TEST_COVER=
-if \
-	go help testflag | grep -- -cover > /dev/null \
-	&& go tool -n cover > /dev/null 2>&1 \
-; then
-	HAVE_GO_TEST_COVER=1
-fi
-
-# a helper to provide ".exe" when it's appropriate
-binary_extension() {
-	if [ "$(go env GOOS)" = 'windows' ]; then
-		echo -n '.exe'
-	fi
-}
-
-hash_files() {
-	while [ $# -gt 0 ]; do
-		f="$1"
-		shift
-		dir="$(dirname "$f")"
-		base="$(basename "$f")"
-		for hashAlgo in md5 sha256; do
-			if command -v "${hashAlgo}sum" &> /dev/null; then
-				(
-					# subshell and cd so that we get output files like:
-					#   $HASH docker-$VERSION
-					# instead of:
-					#   $HASH /go/src/github.com/.../$VERSION/binary/docker-$VERSION
-					cd "$dir"
-					"${hashAlgo}sum" "$base" > "$base.$hashAlgo"
-				)
-			fi
-		done
-	done
-}
-
-bundle() {
-	local bundle="$1"; shift
-	echo "---> Making bundle: $(basename "$bundle") (in $DEST)"
-	source "$SCRIPTDIR/make/$bundle" "$@"
-}
-
-copy_binaries() {
-	dir="$1"
-	# Add nested executables to bundle dir so we have complete set of
-	# them available, but only if the native OS/ARCH is the same as the
-	# OS/ARCH of the build target
-	if [ "$(go env GOOS)/$(go env GOARCH)" == "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
-		if [ -x /usr/local/bin/docker-runc ]; then
-			echo "Copying nested executables into $dir"
-			for file in containerd containerd-shim containerd-ctr runc init proxy; do
-				cp `which "docker-$file"` "$dir/"
-				if [ "$2" == "hash" ]; then
-					hash_files "$dir/docker-$file"
-				fi
-			done
-		fi
-	fi
-}
-
-install_binary() {
-	file="$1"
-	target="${DOCKER_MAKE_INSTALL_PREFIX:=/usr/local}/bin/"
-	if [ "$(go env GOOS)" == "linux" ]; then
-		echo "Installing $(basename $file) to ${target}"
-		cp -L "$file" "$target"
-	else
-		echo "Install is only supported on linux"
-		return 1
-	fi
-}
-
-main() {
-	# We want this to fail if the bundles already exist and cannot be removed.
-	# This is to avoid mixing bundles from different versions of the code.
-	mkdir -p bundles
-	if [ -e "bundles/$VERSION" ] && [ -z "$KEEPBUNDLE" ]; then
-		echo "bundles/$VERSION already exists. Removing."
-		rm -fr "bundles/$VERSION" && mkdir "bundles/$VERSION" || exit 1
-		echo
-	fi
-
-	if [ "$(go env GOHOSTOS)" != 'windows' ]; then
-		# Windows and symlinks don't get along well
-
-		rm -f bundles/latest
-		ln -s "$VERSION" bundles/latest
-	fi
-
-	if [ $# -lt 1 ]; then
-		bundles=(${DEFAULT_BUNDLES[@]})
-	else
-		bundles=($@)
-	fi
-	for bundle in ${bundles[@]}; do
-		export DEST="bundles/$VERSION/$(basename "$bundle")"
-		# Cygdrive paths don't play well with go build -o.
-		if [[ "$(uname -s)" == CYGWIN* ]]; then
-			export DEST="$(cygpath -mw "$DEST")"
-		fi
-		mkdir -p "$DEST"
-		ABS_DEST="$(cd "$DEST" && pwd -P)"
-		bundle "$bundle"
-		echo
-	done
-}
-
-main "$@"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.binary b/installer/vendor/github.com/docker/docker/hack/make/.binary
deleted file mode 100644
index f5c35c3b7e..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.binary
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-set -e
-
-BINARY_NAME="$BINARY_SHORT_NAME-$VERSION"
-BINARY_EXTENSION="$(binary_extension)"
-BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
-
-source "${MAKEDIR}/.go-autogen"
-
-(
-export GOGC=${DOCKER_BUILD_GOGC:-1000}
-
-if [ "$(go env GOOS)/$(go env GOARCH)" != "$(go env GOHOSTOS)/$(go env GOHOSTARCH)" ]; then
-	# must be cross-compiling!
-	case "$(go env GOOS)/$(go env GOARCH)" in
-		windows/amd64)
-			export CC=x86_64-w64-mingw32-gcc
-			export CGO_ENABLED=1
-			;;
-	esac
-fi
-
-if [ "$IAMSTATIC" == "true" ] && [ "$(go env GOHOSTOS)" == "linux" ]; then
-	if  [ "${GOOS}/${GOARCH}" == "darwin/amd64" ]; then
-		export CGO_ENABLED=1
-		export CC=o64-clang
-		export LDFLAGS='-linkmode external -s'
-		export LDFLAGS_STATIC_DOCKER='-extld='${CC}
-	else
-		export BUILDFLAGS=( "${BUILDFLAGS[@]/pkcs11 /}" ) # we cannot dlopen in pkcs11 in a static binary
-	fi
-fi
-
-echo "Building: $DEST/$BINARY_FULLNAME"
-go build \
-	-o "$DEST/$BINARY_FULLNAME" \
-	"${BUILDFLAGS[@]}" \
-	-ldflags "
-		$LDFLAGS
-		$LDFLAGS_STATIC_DOCKER
-	" \
-	$GO_PACKAGE
-)
-
-echo "Created binary: $DEST/$BINARY_FULLNAME"
-ln -sf "$BINARY_FULLNAME" "$DEST/$BINARY_SHORT_NAME$BINARY_EXTENSION"
-
-hash_files "$DEST/$BINARY_FULLNAME"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.binary-setup b/installer/vendor/github.com/docker/docker/hack/make/.binary-setup
deleted file mode 100644
index b9f8ce2517..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.binary-setup
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-DOCKER_CLIENT_BINARY_NAME='docker'
-DOCKER_DAEMON_BINARY_NAME='dockerd'
-DOCKER_RUNC_BINARY_NAME='docker-runc'
-DOCKER_CONTAINERD_BINARY_NAME='docker-containerd'
-DOCKER_CONTAINERD_CTR_BINARY_NAME='docker-containerd-ctr'
-DOCKER_CONTAINERD_SHIM_BINARY_NAME='docker-containerd-shim'
-DOCKER_PROXY_BINARY_NAME='docker-proxy'
-DOCKER_INIT_BINARY_NAME='docker-init'
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/compat b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/compat
deleted file mode 100644
index ec635144f6..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/control b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/control
deleted file mode 100644
index 0f5439947c..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/control
+++ /dev/null
@@ -1,29 +0,0 @@
-Source: docker-engine
-Section: admin
-Priority: optional
-Maintainer: Docker <support@docker.com>
-Standards-Version: 3.9.6
-Homepage: https://dockerproject.org
-Vcs-Browser: https://github.com/docker/docker
-Vcs-Git: git://github.com/docker/docker.git
-
-Package: docker-engine
-Architecture: linux-any
-Depends: iptables, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
-Recommends: aufs-tools,
-            ca-certificates,
-            cgroupfs-mount | cgroup-lite,
-            git,
-            xz-utils,
-            ${apparmor:Recommends}
-Conflicts: docker (<< 1.5~), docker.io, lxc-docker, lxc-docker-virtual-package, docker-engine-cs
-Description: Docker: the open-source application container engine
- Docker is an open source project to build, ship and run any application as a
- lightweight container
- .
- Docker containers are both hardware-agnostic and platform-agnostic. This means
- they can run anywhere, from your laptop to the largest EC2 compute instance and
- everything in between - and they don't require you to use a particular
- language, framework or packaging system. That makes them great building blocks
- for deploying and scaling web apps, databases, and backend services without
- depending on a particular stack or provider.
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.bash-completion b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.bash-completion
deleted file mode 100644
index 6ea1119308..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.bash-completion
+++ /dev/null
@@ -1 +0,0 @@
-contrib/completion/bash/docker
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.install b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.install
deleted file mode 100644
index dc6b25f04f..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.install
+++ /dev/null
@@ -1,12 +0,0 @@
-#contrib/syntax/vim/doc/* /usr/share/vim/vimfiles/doc/
-#contrib/syntax/vim/ftdetect/* /usr/share/vim/vimfiles/ftdetect/
-#contrib/syntax/vim/syntax/* /usr/share/vim/vimfiles/syntax/
-contrib/*-integration usr/share/docker-engine/contrib/
-contrib/check-config.sh usr/share/docker-engine/contrib/
-contrib/completion/fish/docker.fish usr/share/fish/vendor_completions.d/
-contrib/completion/zsh/_docker usr/share/zsh/vendor-completions/
-contrib/init/systemd/docker.service lib/systemd/system/
-contrib/init/systemd/docker.socket lib/systemd/system/
-contrib/mk* usr/share/docker-engine/contrib/
-contrib/nuke-graph-directory.sh usr/share/docker-engine/contrib/
-contrib/syntax/nano/Dockerfile.nanorc usr/share/nano/
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.manpages b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.manpages
deleted file mode 100644
index 1aa62186a6..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.manpages
+++ /dev/null
@@ -1 +0,0 @@
-man/man*/*
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.postinst b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.postinst
deleted file mode 100644
index eeef6ca801..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docker-engine.postinst
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-set -e
-
-case "$1" in
-	configure)
-		if [ -z "$2" ]; then
-			if ! getent group docker > /dev/null; then
-				groupadd --system docker
-			fi
-		fi
-		;;
-	abort-*)
-		# How'd we get here??
-		exit 1
-		;;
-	*)
-		;;
-esac
-
-#DEBHELPER#
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docs b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docs
deleted file mode 100644
index b43bf86b50..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/rules b/installer/vendor/github.com/docker/docker/hack/make/.build-deb/rules
deleted file mode 100755
index 6522103e5d..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-deb/rules
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/make -f
-
-VERSION = $(shell cat VERSION)
-SYSTEMD_VERSION := $(shell dpkg-query -W -f='$${Version}\n' systemd | cut -d- -f1)
-SYSTEMD_GT_227 := $(shell [ '$(SYSTEMD_VERSION)' ] && [ '$(SYSTEMD_VERSION)' -gt 227 ] && echo true )
-
-override_dh_gencontrol:
-	# if we're on Ubuntu, we need to Recommends: apparmor
-	echo 'apparmor:Recommends=$(shell dpkg-vendor --is Ubuntu && echo apparmor)' >> debian/docker-engine.substvars
-	dh_gencontrol
-
-override_dh_auto_build:
-	./hack/make.sh dynbinary
-	# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
-
-override_dh_auto_test:
-	./bundles/$(VERSION)/dynbinary-daemon/dockerd -v
-	./bundles/$(VERSION)/dynbinary-client/docker -v
-
-override_dh_strip:
-	# Go has lots of problems with stripping, so just don't
-
-override_dh_auto_install:
-	mkdir -p debian/docker-engine/usr/bin
-	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary-client/docker)" debian/docker-engine/usr/bin/docker
-	cp -aT "$$(readlink -f bundles/$(VERSION)/dynbinary-daemon/dockerd)" debian/docker-engine/usr/bin/dockerd
-	cp -aT /usr/local/bin/docker-proxy debian/docker-engine/usr/bin/docker-proxy
-	cp -aT /usr/local/bin/docker-containerd debian/docker-engine/usr/bin/docker-containerd
-	cp -aT /usr/local/bin/docker-containerd-shim debian/docker-engine/usr/bin/docker-containerd-shim
-	cp -aT /usr/local/bin/docker-containerd-ctr debian/docker-engine/usr/bin/docker-containerd-ctr
-	cp -aT /usr/local/bin/docker-runc debian/docker-engine/usr/bin/docker-runc
-	cp -aT /usr/local/bin/docker-init debian/docker-engine/usr/bin/docker-init
-	mkdir -p debian/docker-engine/usr/lib/docker
-
-override_dh_installinit:
-	# use "docker" as our service name, not "docker-engine"
-	dh_installinit --name=docker
-ifeq (true, $(SYSTEMD_GT_227))
-	$(warning "Setting TasksMax=infinity")
-	sed -i -- 's/#TasksMax=infinity/TasksMax=infinity/' debian/docker-engine/lib/systemd/system/docker.service
-endif
-
-override_dh_installudev:
-	# match our existing priority
-	dh_installudev --priority=z80
-
-override_dh_install:
-	dh_install
-	dh_apparmor --profile-name=docker-engine -pdocker-engine
-
-override_dh_shlibdeps:
-	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info
-
-%:
-	dh $@ --with=bash-completion $(shell command -v dh_systemd_enable > /dev/null 2>&1 && echo --with=systemd)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine-selinux.spec b/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine-selinux.spec
deleted file mode 100644
index ae597bd774..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine-selinux.spec
+++ /dev/null
@@ -1,96 +0,0 @@
-# Some bits borrowed from the openstack-selinux package
-Name: docker-engine-selinux
-Version: %{_version}
-Release: %{_release}%{?dist}
-Summary: SELinux Policies for the open-source application container engine
-BuildArch: noarch
-Group: Tools/Docker
-
-License: GPLv2
-Source: %{name}.tar.gz
-
-URL: https://dockerproject.org
-Vendor: Docker
-Packager: Docker <support@docker.com>
-
-%global selinux_policyver 3.13.1-102
-%global selinuxtype targeted
-%global moduletype  services
-%global modulenames docker
-
-Requires(post): selinux-policy-base >= %{selinux_policyver}, selinux-policy-targeted >= %{selinux_policyver}, policycoreutils, policycoreutils-python libselinux-utils
-BuildRequires: selinux-policy selinux-policy-devel
-
-# conflicting packages
-Conflicts: docker-selinux
-
-# Usage: _format var format
-#   Expand 'modulenames' into various formats as needed
-#   Format must contain '$x' somewhere to do anything useful
-%global _format() export %1=""; for x in %{modulenames}; do %1+=%2; %1+=" "; done;
-
-# Relabel files
-%global relabel_files() \
-    /sbin/restorecon -R %{_bindir}/docker %{_localstatedir}/run/docker.sock %{_localstatedir}/run/docker.pid %{_sysconfdir}/docker %{_localstatedir}/log/docker %{_localstatedir}/log/lxc %{_localstatedir}/lock/lxc %{_usr}/lib/systemd/system/docker.service /root/.docker &> /dev/null || : \
-
-%description
-SELinux policy modules for use with Docker
-
-%prep
-%if 0%{?centos} <= 6
-%setup -n %{name}
-%else
-%autosetup -n %{name}
-%endif
-
-%build
-make SHARE="%{_datadir}" TARGETS="%{modulenames}"
-
-%install
-
-# Install SELinux interfaces
-%_format INTERFACES $x.if
-install -d %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-install -p -m 644 $INTERFACES %{buildroot}%{_datadir}/selinux/devel/include/%{moduletype}
-
-# Install policy modules
-%_format MODULES $x.pp.bz2
-install -d %{buildroot}%{_datadir}/selinux/packages
-install -m 0644 $MODULES %{buildroot}%{_datadir}/selinux/packages
-
-%post
-#
-# Install all modules in a single transaction
-#
-if [ $1 -eq 1 ]; then
-    %{_sbindir}/setsebool -P -N virt_use_nfs=1 virt_sandbox_use_all_caps=1
-fi
-%_format MODULES %{_datadir}/selinux/packages/$x.pp.bz2
-%{_sbindir}/semodule -n -s %{selinuxtype} -i $MODULES
-if %{_sbindir}/selinuxenabled ; then
-    %{_sbindir}/load_policy
-    %relabel_files
-    if [ $1 -eq 1 ]; then
-      restorecon -R %{_sharedstatedir}/docker
-    fi
-fi
-
-%postun
-if [ $1 -eq 0 ]; then
-    %{_sbindir}/semodule -n -r %{modulenames} &> /dev/null || :
-    if %{_sbindir}/selinuxenabled ; then
-        %{_sbindir}/load_policy
-        %relabel_files
-    fi
-fi
-
-%files
-%doc LICENSE
-%defattr(-,root,root,0755)
-%attr(0644,root,root) %{_datadir}/selinux/packages/*.pp.bz2
-%attr(0644,root,root) %{_datadir}/selinux/devel/include/%{moduletype}/*.if
-
-%changelog
-* Tue Dec 1 2015 Jessica Frazelle <acidburn@docker.com> 1.9.1-1
-- add licence to rpm
-- add selinux-policy and docker-engine-selinux rpm
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine.spec b/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine.spec
deleted file mode 100644
index d53e55b6c9..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.build-rpm/docker-engine.spec
+++ /dev/null
@@ -1,254 +0,0 @@
-Name: docker-engine
-Version: %{_version}
-Release: %{_release}%{?dist}
-Summary: The open-source application container engine
-Group: Tools/Docker
-
-License: ASL 2.0
-Source: %{name}.tar.gz
-
-URL: https://dockerproject.org
-Vendor: Docker
-Packager: Docker <support@docker.com>
-
-# is_systemd conditional
-%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?suse_version} >= 1210
-%global is_systemd 1
-%endif
-
-# required packages for build
-# most are already in the container (see contrib/builder/rpm/ARCH/generate.sh)
-# only require systemd on those systems
-%if 0%{?is_systemd}
-%if 0%{?suse_version} >= 1210
-BuildRequires: systemd-rpm-macros
-%{?systemd_requires}
-%else
-%if 0%{?fedora} >= 25
-# Systemd 230 and up no longer have libsystemd-journal (see https://bugzilla.redhat.com/show_bug.cgi?id=1350301)
-BuildRequires: pkgconfig(systemd)
-Requires: systemd-units
-%else
-BuildRequires: pkgconfig(systemd)
-Requires: systemd-units
-BuildRequires: pkgconfig(libsystemd-journal)
-%endif
-%endif
-%else
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-%endif
-
-# required packages on install
-Requires: /bin/sh
-Requires: iptables
-%if !0%{?suse_version}
-Requires: libcgroup
-%else
-Requires: libcgroup1
-%endif
-Requires: tar
-Requires: xz
-%if 0%{?fedora} >= 21 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
-# Resolves: rhbz#1165615
-Requires: device-mapper-libs >= 1.02.90-1
-%endif
-%if 0%{?oraclelinux} >= 6
-# Require Oracle Unbreakable Enterprise Kernel R4 and newer device-mapper
-Requires: kernel-uek >= 4.1
-Requires: device-mapper >= 1.02.90-2
-%endif
-
-# docker-selinux conditional
-%if 0%{?fedora} >= 20 || 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
-%global with_selinux 1
-%endif
-
-# DWZ problem with multiple golang binary, see bug
-# https://bugzilla.redhat.com/show_bug.cgi?id=995136#c12
-%if 0%{?fedora} >= 20 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
-%global _dwz_low_mem_die_limit 0
-%endif
-
-# start if with_selinux
-%if 0%{?with_selinux}
-# Version of SELinux we were using
-%if 0%{?fedora} == 20
-%global selinux_policyver 3.12.1-197
-%endif # fedora 20
-%if 0%{?fedora} == 21
-%global selinux_policyver 3.13.1-105
-%endif # fedora 21
-%if 0%{?fedora} >= 22
-%global selinux_policyver 3.13.1-128
-%endif # fedora 22
-%if 0%{?centos} >= 7 || 0%{?rhel} >= 7 || 0%{?oraclelinux} >= 7
-%global selinux_policyver 3.13.1-23
-%endif # centos,oraclelinux 7
-%endif # with_selinux
-
-# RE: rhbz#1195804 - ensure min NVR for selinux-policy
-%if 0%{?with_selinux}
-Requires: selinux-policy >= %{selinux_policyver}
-Requires(pre): %{name}-selinux >= %{version}-%{release}
-%endif # with_selinux
-
-# conflicting packages
-Conflicts: docker
-Conflicts: docker-io
-Conflicts: docker-engine-cs
-
-%description
-Docker is an open source project to build, ship and run any application as a
-lightweight container.
-
-Docker containers are both hardware-agnostic and platform-agnostic. This means
-they can run anywhere, from your laptop to the largest EC2 compute instance and
-everything in between - and they don't require you to use a particular
-language, framework or packaging system. That makes them great building blocks
-for deploying and scaling web apps, databases, and backend services without
-depending on a particular stack or provider.
-
-%prep
-%if 0%{?centos} <= 6 || 0%{?oraclelinux} <=6
-%setup -n %{name}
-%else
-%autosetup -n %{name}
-%endif
-
-%build
-export DOCKER_GITCOMMIT=%{_gitcommit}
-./hack/make.sh dynbinary
-# ./man/md2man-all.sh runs outside the build container (if at all), since we don't have go-md2man here
-
-%check
-./bundles/%{_origversion}/dynbinary-client/docker -v
-./bundles/%{_origversion}/dynbinary-daemon/dockerd -v
-
-%install
-# install binary
-install -d $RPM_BUILD_ROOT/%{_bindir}
-install -p -m 755 bundles/%{_origversion}/dynbinary-client/docker-%{_origversion} $RPM_BUILD_ROOT/%{_bindir}/docker
-install -p -m 755 bundles/%{_origversion}/dynbinary-daemon/dockerd-%{_origversion} $RPM_BUILD_ROOT/%{_bindir}/dockerd
-
-# install proxy
-install -p -m 755 /usr/local/bin/docker-proxy $RPM_BUILD_ROOT/%{_bindir}/docker-proxy
-
-# install containerd
-install -p -m 755 /usr/local/bin/docker-containerd $RPM_BUILD_ROOT/%{_bindir}/docker-containerd
-install -p -m 755 /usr/local/bin/docker-containerd-shim $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-shim
-install -p -m 755 /usr/local/bin/docker-containerd-ctr $RPM_BUILD_ROOT/%{_bindir}/docker-containerd-ctr
-
-# install runc
-install -p -m 755 /usr/local/bin/docker-runc $RPM_BUILD_ROOT/%{_bindir}/docker-runc
-
-# install tini
-install -p -m 755 /usr/local/bin/docker-init $RPM_BUILD_ROOT/%{_bindir}/docker-init
-
-# install udev rules
-install -d $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d
-install -p -m 644 contrib/udev/80-docker.rules $RPM_BUILD_ROOT/%{_sysconfdir}/udev/rules.d/80-docker.rules
-
-# add init scripts
-install -d $RPM_BUILD_ROOT/etc/sysconfig
-install -d $RPM_BUILD_ROOT/%{_initddir}
-
-
-%if 0%{?is_systemd}
-install -d $RPM_BUILD_ROOT/%{_unitdir}
-install -p -m 644 contrib/init/systemd/docker.service.rpm $RPM_BUILD_ROOT/%{_unitdir}/docker.service
-%else
-install -p -m 644 contrib/init/sysvinit-redhat/docker.sysconfig $RPM_BUILD_ROOT/etc/sysconfig/docker
-install -p -m 755 contrib/init/sysvinit-redhat/docker $RPM_BUILD_ROOT/%{_initddir}/docker
-%endif
-# add bash, zsh, and fish completions
-install -d $RPM_BUILD_ROOT/usr/share/bash-completion/completions
-install -d $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions
-install -d $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d
-install -p -m 644 contrib/completion/bash/docker $RPM_BUILD_ROOT/usr/share/bash-completion/completions/docker
-install -p -m 644 contrib/completion/zsh/_docker $RPM_BUILD_ROOT/usr/share/zsh/vendor-completions/_docker
-install -p -m 644 contrib/completion/fish/docker.fish $RPM_BUILD_ROOT/usr/share/fish/vendor_completions.d/docker.fish
-
-# install manpages
-install -d %{buildroot}%{_mandir}/man1
-install -p -m 644 man/man1/*.1 $RPM_BUILD_ROOT/%{_mandir}/man1
-install -d %{buildroot}%{_mandir}/man5
-install -p -m 644 man/man5/*.5 $RPM_BUILD_ROOT/%{_mandir}/man5
-install -d %{buildroot}%{_mandir}/man8
-install -p -m 644 man/man8/*.8 $RPM_BUILD_ROOT/%{_mandir}/man8
-
-# add vimfiles
-install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc
-install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/ftdetect
-install -d $RPM_BUILD_ROOT/usr/share/vim/vimfiles/syntax
-install -p -m 644 contrib/syntax/vim/doc/dockerfile.txt $RPM_BUILD_ROOT/usr/share/vim/vimfiles/doc/dockerfile.txt
-install -p -m 644 contrib/syntax/vim/ftdetect/dockerfile.vim $RPM_BUILD_ROOT/usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-install -p -m 644 contrib/syntax/vim/syntax/dockerfile.vim $RPM_BUILD_ROOT/usr/share/vim/vimfiles/syntax/dockerfile.vim
-
-# add nano
-install -d $RPM_BUILD_ROOT/usr/share/nano
-install -p -m 644 contrib/syntax/nano/Dockerfile.nanorc $RPM_BUILD_ROOT/usr/share/nano/Dockerfile.nanorc
-
-# list files owned by the package here
-%files
-%doc AUTHORS CHANGELOG.md CONTRIBUTING.md LICENSE MAINTAINERS NOTICE README.md
-/%{_bindir}/docker
-/%{_bindir}/dockerd
-/%{_bindir}/docker-containerd
-/%{_bindir}/docker-containerd-shim
-/%{_bindir}/docker-containerd-ctr
-/%{_bindir}/docker-proxy
-/%{_bindir}/docker-runc
-/%{_bindir}/docker-init
-/%{_sysconfdir}/udev/rules.d/80-docker.rules
-%if 0%{?is_systemd}
-/%{_unitdir}/docker.service
-%else
-%config(noreplace,missingok) /etc/sysconfig/docker
-/%{_initddir}/docker
-%endif
-/usr/share/bash-completion/completions/docker
-/usr/share/zsh/vendor-completions/_docker
-/usr/share/fish/vendor_completions.d/docker.fish
-%doc
-/%{_mandir}/man1/*
-/%{_mandir}/man5/*
-/%{_mandir}/man8/*
-/usr/share/vim/vimfiles/doc/dockerfile.txt
-/usr/share/vim/vimfiles/ftdetect/dockerfile.vim
-/usr/share/vim/vimfiles/syntax/dockerfile.vim
-/usr/share/nano/Dockerfile.nanorc
-
-%post
-%if 0%{?is_systemd}
-%systemd_post docker
-%else
-# This adds the proper /etc/rc*.d links for the script
-/sbin/chkconfig --add docker
-%endif
-if ! getent group docker > /dev/null; then
-    groupadd --system docker
-fi
-
-%preun
-%if 0%{?is_systemd}
-%systemd_preun docker
-%else
-if [ $1 -eq 0 ] ; then
-    /sbin/service docker stop >/dev/null 2>&1
-    /sbin/chkconfig --del docker
-fi
-%endif
-
-%postun
-%if 0%{?is_systemd}
-%systemd_postun_with_restart docker
-%else
-if [ "$1" -ge "1" ] ; then
-    /sbin/service docker condrestart >/dev/null 2>&1 || :
-fi
-%endif
-
-%changelog
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.detect-daemon-osarch b/installer/vendor/github.com/docker/docker/hack/make/.detect-daemon-osarch
deleted file mode 100644
index 73955392d0..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.detect-daemon-osarch
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-set -e
-
-docker-version-osarch() {
-	local target="$1" # "Client" or "Server"
-	local fmtStr="{{.${target}.Os}}/{{.${target}.Arch}}"
-	if docker version -f "$fmtStr" 2>/dev/null; then
-		# if "docker version -f" works, let's just use that!
-		return
-	fi
-	docker version | awk '
-		$1 ~ /^(Client|Server):$/ { section = 0 }
-		$1 == "'"$target"':" { section = 1; next }
-		section && $1 == "OS/Arch:" { print $2 }
-
-		# old versions of Docker
-		$1 == "OS/Arch" && $2 == "('"${target,,}"'):" { print $3 }
-	'
-}
-
-# Retrieve OS/ARCH of docker daemon, e.g. linux/amd64
-export DOCKER_ENGINE_OSARCH="$(docker-version-osarch 'Server')"
-export DOCKER_ENGINE_GOOS="${DOCKER_ENGINE_OSARCH%/*}"
-export DOCKER_ENGINE_GOARCH="${DOCKER_ENGINE_OSARCH##*/}"
-DOCKER_ENGINE_GOARCH=${DOCKER_ENGINE_GOARCH:=amd64}
-
-# and the client, just in case
-export DOCKER_CLIENT_OSARCH="$(docker-version-osarch 'Client')"
-export DOCKER_CLIENT_GOOS="${DOCKER_CLIENT_OSARCH%/*}"
-export DOCKER_CLIENT_GOARCH="${DOCKER_CLIENT_OSARCH##*/}"
-DOCKER_CLIENT_GOARCH=${DOCKER_CLIENT_GOARCH:=amd64}
-
-# Retrieve the architecture used in contrib/builder/(deb|rpm)/$PACKAGE_ARCH/
-PACKAGE_ARCH='amd64'
-case "${DOCKER_ENGINE_GOARCH:-$DOCKER_CLIENT_GOARCH}" in
-	arm)
-		PACKAGE_ARCH='armhf'
-		;;
-	arm64)
-		PACKAGE_ARCH='aarch64'
-		;;
-	amd64|ppc64le|s390x)
-		PACKAGE_ARCH="${DOCKER_ENGINE_GOARCH:-$DOCKER_CLIENT_GOARCH}"
-		;;
-	*)
-		echo >&2 "warning: not sure how to convert '$DOCKER_ENGINE_GOARCH' to a 'Docker' arch, assuming '$PACKAGE_ARCH'"
-		;;
-esac
-export PACKAGE_ARCH
-
-DOCKERFILE='Dockerfile'
-TEST_IMAGE_NAMESPACE=
-case "$PACKAGE_ARCH" in
-	amd64)
-		case "${DOCKER_ENGINE_GOOS:-$DOCKER_CLIENT_GOOS}" in
-			windows)
-				DOCKERFILE='Dockerfile.windows'
-				;;
-			solaris)
-				DOCKERFILE='Dockerfile.solaris'
-				;;
-		esac
-		;;
-	*)
-		DOCKERFILE="Dockerfile.$PACKAGE_ARCH"
-		TEST_IMAGE_NAMESPACE="$PACKAGE_ARCH"
-		;;
-esac
-export DOCKERFILE TEST_IMAGE_NAMESPACE
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.ensure-emptyfs b/installer/vendor/github.com/docker/docker/hack/make/.ensure-emptyfs
deleted file mode 100644
index e71a30ae81..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.ensure-emptyfs
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-set -e
-
-if ! docker inspect emptyfs &> /dev/null; then
-	# let's build a "docker save" tarball for "emptyfs"
-	# see https://github.com/docker/docker/pull/5262
-	# and also https://github.com/docker/docker/issues/4242
-	dir="$DEST/emptyfs"
-	mkdir -p "$dir"
-	(
-		cd "$dir"
-		echo '{"emptyfs":{"latest":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158"}}' > repositories
-		mkdir -p 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
-		(
-			cd 511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158
-			echo '{"id":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158","comment":"Imported from -","created":"2013-06-13T14:03:50.821769-07:00","container_config":{"Hostname":"","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"PortSpecs":null,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":null},"docker_version":"0.4.0","architecture":"x86_64","Size":0}' > json
-			echo '1.0' > VERSION
-			tar -cf layer.tar --files-from /dev/null
-		)
-	)
-	( set -x; tar -cC "$dir" . | docker load )
-	rm -rf "$dir"
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.go-autogen b/installer/vendor/github.com/docker/docker/hack/make/.go-autogen
deleted file mode 100644
index 4d26052bb7..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.go-autogen
+++ /dev/null
@@ -1,86 +0,0 @@
-#!/bin/bash
-
-rm -rf autogen
-
-source hack/dockerfile/binaries-commits
-
-cat > dockerversion/version_autogen.go <<DVEOF
-// +build autogen
-
-// Package dockerversion is auto-generated at build-time
-package dockerversion
-
-// Default build-time variable for library-import.
-// This file is overridden on build with build-time informations.
-const (
-	GitCommit          string = "$GITCOMMIT"
-	Version            string = "$VERSION"
-	BuildTime          string = "$BUILDTIME"
-	IAmStatic          string = "${IAMSTATIC:-true}"
-)
-
-// AUTOGENERATED FILE; see /go/src/github.com/docker/docker/hack/make/.go-autogen
-DVEOF
-
-cat > dockerversion/version_autogen_unix.go <<DVEOF
-// +build autogen,!windows
-
-// Package dockerversion is auto-generated at build-time
-package dockerversion
-
-// Default build-time variable for library-import.
-// This file is overridden on build with build-time informations.
-const (
-	ContainerdCommitID string = "${CONTAINERD_COMMIT}"
-	RuncCommitID       string = "${RUNC_COMMIT}"
-	InitCommitID       string = "${TINI_COMMIT}"
-)
-
-// AUTOGENERATED FILE; see /go/src/github.com/docker/docker/hack/make/.go-autogen
-DVEOF
-
-# Compile the Windows resources into the sources
-if [ "$(go env GOOS)" = "windows" ]; then
-	mkdir -p autogen/winresources/tmp autogen/winresources/docker autogen/winresources/dockerd
-	cp hack/make/.resources-windows/resources.go autogen/winresources/docker/
-	cp hack/make/.resources-windows/resources.go autogen/winresources/dockerd/
-
-	if [ "$(go env GOHOSTOS)" == "windows" ]; then
-		WINDRES=windres
-		WINDMC=windmc
-	else
-		# Cross compiling
-		WINDRES=x86_64-w64-mingw32-windres
-		WINDMC=x86_64-w64-mingw32-windmc
-	fi
-
-	# Generate a Windows file version of the form major,minor,patch,build (with any part optional)
-	VERSION_QUAD=$(echo -n $VERSION | sed -re 's/^([0-9.]*).*$/\1/' | tr . ,)
-
-	# Pass version and commit information into the resource compiler
-	defs=
-	[ ! -z $VERSION ]      && defs="$defs -D DOCKER_VERSION=\"$VERSION\""
-	[ ! -z $VERSION_QUAD ] && defs="$defs -D DOCKER_VERSION_QUAD=$VERSION_QUAD"
-	[ ! -z $GITCOMMIT ]    && defs="$defs -D DOCKER_COMMIT=\"$GITCOMMIT\""
-
-	function makeres {
-		$WINDRES \
-			-i hack/make/.resources-windows/$1 \
-			-o $3 \
-			-F $2 \
-			--use-temp-file \
-			-I autogen/winresources/tmp \
-			$defs
-	}
-
-	$WINDMC \
-		hack/make/.resources-windows/event_messages.mc \
-		-h autogen/winresources/tmp \
-		-r autogen/winresources/tmp
-
-	makeres docker.rc pe-x86-64 autogen/winresources/docker/rsrc_amd64.syso
-	makeres docker.rc pe-i386 autogen/winresources/docker/rsrc_386.syso
-	makeres dockerd.rc pe-x86-64 autogen/winresources/dockerd/rsrc_amd64.syso
-
-	rm -r autogen/winresources/tmp
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.go-autogen.ps1 b/installer/vendor/github.com/docker/docker/hack/make/.go-autogen.ps1
deleted file mode 100644
index 3adc4c3e97..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.go-autogen.ps1
+++ /dev/null
@@ -1,91 +0,0 @@
-<#
-.NOTES
-    Author:  @jhowardmsft
-
-    Summary: Windows native version of .go-autogen which generates the
-             .go source code for building, and performs resource compilation.
-
-.PARAMETER CommitString
-     The commit string. This is calculated externally to this script.
-
-.PARAMETER DockerVersion
-     The version such as 1.14.0-dev. This is calculated externally to this script.
-#>
-
-param(
-    [Parameter(Mandatory=$true)][string]$CommitString,
-    [Parameter(Mandatory=$true)][string]$DockerVersion
-)
-
-$ErrorActionPreference = "Stop"
-
-# Utility function to get the build date/time in UTC
-Function Get-BuildDateTime() {
-    return $(Get-Date).ToUniversalTime()
-}
-
-try {
-    $buildDateTime=Get-BuildDateTime
-
-    if (Test-Path ".\autogen") {
-        Remove-Item ".\autogen" -Recurse -Force | Out-Null
-    }
-
-    $fileContents = '
-// +build autogen
-
-// Package dockerversion is auto-generated at build-time
-package dockerversion
-
-// Default build-time variable for library-import.
-// This file is overridden on build with build-time informations.
-const (
-    GitCommit          string = "'+$CommitString+'"
-    Version            string = "'+$DockerVersion+'"
-    BuildTime          string = "'+$buildDateTime+'"
-)
-
-// AUTOGENERATED FILE; see hack\make\.go-autogen.ps1
-'
-
-    # Write the file without BOM
-    $outputFile="$(pwd)\dockerversion\version_autogen.go"
-    if (Test-Path $outputFile) { Remove-Item $outputFile }
-    [System.IO.File]::WriteAllText($outputFile, $fileContents, (New-Object System.Text.UTF8Encoding($False)))
-
-    New-Item -ItemType Directory -Path "autogen\winresources\tmp" | Out-Null
-    New-Item -ItemType Directory -Path "autogen\winresources\docker" | Out-Null
-    New-Item -ItemType Directory -Path "autogen\winresources\dockerd" | Out-Null
-    Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\docker"
-    Copy-Item "hack\make\.resources-windows\resources.go" "autogen\winresources\dockerd"
-
-    # Generate a version in the form major,minor,patch,build
-    $versionQuad=$DockerVersion -replace "[^0-9.]*" -replace "\.", ","
-
-    # Compile the messages
-    windmc hack\make\.resources-windows\event_messages.mc -h autogen\winresources\tmp -r autogen\winresources\tmp
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile event message resources" }
-
-    # If you really want to understand this madness below, search the Internet for powershell variables after verbatim arguments... Needed to get double-quotes passed through to the compiler options.
-    # Generate the .syso files containing all the resources and manifest needed to compile the final docker binaries. Both 32 and 64-bit clients.
-    $env:_ag_dockerVersion=$DockerVersion
-    $env:_ag_gitCommit=$CommitString
-
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_amd64.syso  -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 64-bit resources" }
-
-    windres -i hack/make/.resources-windows/docker.rc  -o autogen/winresources/docker/rsrc_386.syso    -F pe-i386   --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile client 32-bit resources" }
-
-    windres -i hack/make/.resources-windows/dockerd.rc -o autogen/winresources/dockerd/rsrc_amd64.syso -F pe-x86-64 --use-temp-file -I autogen/winresources/tmp -D DOCKER_VERSION_QUAD=$versionQuad --% -D DOCKER_VERSION=\"%_ag_dockerVersion%\" -D DOCKER_COMMIT=\"%_ag_gitCommit%\"
-    if ($LASTEXITCODE -ne 0) { Throw "Failed to compile daemon resources" }
-}
-Catch [Exception] {
-    # Throw the error onto the caller to display errors. We don't expect this script to be called directly 
-    Throw ".go-autogen.ps1 failed with error $_"
-}
-Finally {
-    Remove-Item .\autogen\winresources\tmp -Recurse -Force -ErrorAction SilentlyContinue | Out-Null
-    $env:_ag_dockerVersion=""
-    $env:_ag_gitCommit=""
-}
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-setup b/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-setup
deleted file mode 100644
index 0efde717fc..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-setup
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -e
-
-bundle .detect-daemon-osarch
-if [ $DOCKER_ENGINE_GOOS != "windows" ]; then
-	bundle .ensure-emptyfs
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-start b/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-start
deleted file mode 100644
index b96979bdb2..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-start
+++ /dev/null
@@ -1,116 +0,0 @@
-#!/bin/bash
-
-# see test-integration-cli for example usage of this script
-
-base="$ABS_DEST/.."
-export PATH="$base/binary-client:$base/binary-daemon:$base/dynbinary-client:$base/dynbinary-daemon:$PATH"
-
-if ! command -v docker &> /dev/null; then
-	echo >&2 'error: binary-client or dynbinary-client must be run before .integration-daemon-start'
-	false
-fi
-
-# This is a temporary hack for split-binary mode. It can be removed once
-# https://github.com/docker/docker/pull/22134 is merged into docker master
-if [ "$(go env GOOS)" = 'windows' ]; then
-       return
-fi
-
-if [ -z "$DOCKER_TEST_HOST" ]; then
-	if docker version &> /dev/null; then
-		echo >&2 'skipping daemon start, since daemon appears to be already started'
-		return
-	fi
-fi
-
-if ! command -v dockerd &> /dev/null; then
-	echo >&2 'error: binary-daemon or dynbinary-daemon must be run before .integration-daemon-start'
-	false
-fi
-
-# intentionally open a couple bogus file descriptors to help test that they get scrubbed in containers
-exec 41>&1 42>&2
-
-export DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
-export DOCKER_USERLANDPROXY=${DOCKER_USERLANDPROXY:-true}
-
-# example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"
-storage_params=""
-if [ -n "$DOCKER_STORAGE_OPTS" ]; then
-	IFS=','
-	for i in ${DOCKER_STORAGE_OPTS}; do
-		storage_params="--storage-opt $i $storage_params"
-	done
-	unset IFS
-fi
-
-# example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"
-extra_params=""
-if [ "$DOCKER_REMAP_ROOT" ]; then
-	extra_params="--userns-remap $DOCKER_REMAP_ROOT"
-fi
-
-if [  "$DOCKER_EXPERIMENTAL" ]; then
-	echo >&2 '# DOCKER_EXPERIMENTAL is set: starting daemon with experimental features enabled! '
-	extra_params="$extra_params --experimental"
-fi
-
-if [ -z "$DOCKER_TEST_HOST" ]; then
-	# Start apparmor if it is enabled
-	if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
-		# reset container variable so apparmor profile is applied to process
-		# see https://github.com/docker/libcontainer/blob/master/apparmor/apparmor.go#L16
-		export container=""
-		(
-			set -x
-			/etc/init.d/apparmor start
-		)
-	fi
-
-	export DOCKER_HOST="unix://$(cd "$DEST" && pwd)/docker.sock" # "pwd" tricks to make sure $DEST is an absolute path, not a relative one
-	( set -x; exec \
-		dockerd --debug \
-		--host "$DOCKER_HOST" \
-		--storage-driver "$DOCKER_GRAPHDRIVER" \
-		--pidfile "$DEST/docker.pid" \
-		--userland-proxy="$DOCKER_USERLANDPROXY" \
-		$storage_params \
-		$extra_params \
-			&> "$DEST/docker.log"
-	) &
-	# make sure that if the script exits unexpectedly, we stop this daemon we just started
-	trap 'bundle .integration-daemon-stop' EXIT
-else
-	export DOCKER_HOST="$DOCKER_TEST_HOST"
-fi
-
-# give it a little time to come up so it's "ready"
-tries=60
-echo "INFO: Waiting for daemon to start..."
-while ! docker version &> /dev/null; do
-	(( tries-- ))
-	if [ $tries -le 0 ]; then
-		printf "\n"
-		if [ -z "$DOCKER_HOST" ]; then
-			echo >&2 "error: daemon failed to start"
-			echo >&2 "  check $DEST/docker.log for details"
-		else
-			echo >&2 "error: daemon at $DOCKER_HOST fails to 'docker version':"
-			docker version >&2 || true
-			# Additional Windows CI debugging as this is a common error as of
-			# January 2016
-			if [ "$(go env GOOS)" = 'windows' ]; then
-				echo >&2 "Container log below:"
-				echo >&2 "---"
-				# Important - use the docker on the CI host, not the one built locally
-				# which is currently in our path.
-				! /c/bin/docker -H=$MAIN_DOCKER_HOST logs docker-$COMMITHASH
-				echo >&2 "---"
-			fi
-		fi
-		false
-	fi
-	printf "."
-	sleep 2
-done
-printf "\n"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-stop b/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-stop
deleted file mode 100644
index 03c1b14689..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.integration-daemon-stop
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-
-if [ ! "$(go env GOOS)" = 'windows' ]; then
-	trap - EXIT # reset EXIT trap applied in .integration-daemon-start
-
-	for pidFile in $(find "$DEST" -name docker.pid); do
-		pid=$(set -x; cat "$pidFile")
-		( set -x; kill "$pid" )
-		if ! wait "$pid"; then
-			echo >&2 "warning: PID $pid from $pidFile had a nonzero exit code"
-		fi
-	done
-
-	if [ -z "$DOCKER_TEST_HOST" ]; then
-		# Stop apparmor if it is enabled
-		if [ -e "/sys/module/apparmor/parameters/enabled" ] && [ "$(cat /sys/module/apparmor/parameters/enabled)" == "Y" ]; then
-			(
-				set -x
-				/etc/init.d/apparmor stop
-			)
-		fi
-	fi
-else
-	# Note this script is not actionable on Windows to Linux CI. Instead the 
-	# DIND daemon under test is torn down by the Jenkins tear-down script
-	echo "INFO: Not stopping daemon on Windows CI"
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.integration-test-helpers b/installer/vendor/github.com/docker/docker/hack/make/.integration-test-helpers
deleted file mode 100644
index 7b73b2f140..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.integration-test-helpers
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/bash
-
-: ${TEST_REPEAT:=0}
-
-bundle_test_integration_cli() {
-	TESTFLAGS="$TESTFLAGS -check.v -check.timeout=${TIMEOUT} -test.timeout=360m"
-	go_test_dir integration-cli $DOCKER_INTEGRATION_TESTS_VERIFIED
-}
-
-# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
-# You can use this to select certain tests to run, e.g.
-#
-#     TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
-#
-# For integration-cli test, we use [gocheck](https://labix.org/gocheck), if you want
-# to run certain tests on your local host, you should run with command:
-#
-#     TESTFLAGS='-check.f DockerSuite.TestBuild*' ./hack/make.sh binary test-integration-cli
-#
-go_test_dir() {
-	dir=$1
-	precompiled=$2
-	testbinary="$DEST/test.main"
-	testcover=()
-	testcoverprofile=()
-	(
-		mkdir -p "$DEST/coverprofiles"
-		export DEST="$ABS_DEST" # in a subshell this is safe -- our integration-cli tests need DEST, and "cd" screws it up
-		if [ -z $precompiled ]; then
-			ensure_test_dir $1 $testbinary
-		fi
-		cd "$dir"
-		i=0
-		while ((++i)); do
-			test_env "$testbinary" $TESTFLAGS
-			if [ $i -gt "$TEST_REPEAT" ]; then
-				break
-			fi
-			echo "Repeating test ($i)"
-		done
-	)
-}
-
-ensure_test_dir() {
-	(
-		# make sure a test dir will compile
-		dir="$1"
-		out="$2"
-		echo Building test dir: "$dir"
-		set -xe
-		cd "$dir"
-		go test -c -o "$out" -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}"
-	)
-}
-
-test_env() {
-	(
-		set -xe
-		# use "env -i" to tightly control the environment variables that bleed into the tests
-		env -i \
-			DEST="$DEST" \
-			DOCKER_TLS_VERIFY="$DOCKER_TEST_TLS_VERIFY" \
-			DOCKER_CERT_PATH="$DOCKER_TEST_CERT_PATH" \
-			DOCKER_ENGINE_GOARCH="$DOCKER_ENGINE_GOARCH" \
-			DOCKER_GRAPHDRIVER="$DOCKER_GRAPHDRIVER" \
-			DOCKER_USERLANDPROXY="$DOCKER_USERLANDPROXY" \
-			DOCKER_HOST="$DOCKER_HOST" \
-			DOCKER_REMAP_ROOT="$DOCKER_REMAP_ROOT" \
-			DOCKER_REMOTE_DAEMON="$DOCKER_REMOTE_DAEMON" \
-			DOCKERFILE="$DOCKERFILE" \
-			GOPATH="$GOPATH" \
-			GOTRACEBACK=all \
-			HOME="$ABS_DEST/fake-HOME" \
-			PATH="$PATH" \
-			TEMP="$TEMP" \
-			TEST_IMAGE_NAMESPACE="$TEST_IMAGE_NAMESPACE" \
-			"$@"
-	)
-}
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/common.rc b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/common.rc
deleted file mode 100644
index 000fb35367..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/common.rc
+++ /dev/null
@@ -1,38 +0,0 @@
-// Application icon
-1 ICON "docker.ico"
-
-// Windows executable manifest
-1 24 /* RT_MANIFEST */ "docker.exe.manifest"
-
-// Version information
-1 VERSIONINFO
-
-#ifdef DOCKER_VERSION_QUAD
-FILEVERSION     DOCKER_VERSION_QUAD
-PRODUCTVERSION  DOCKER_VERSION_QUAD
-#endif
-
-BEGIN
-  BLOCK "StringFileInfo"
-  BEGIN
-    BLOCK "000004B0"
-    BEGIN
-      VALUE "ProductName", DOCKER_NAME
-
-#ifdef DOCKER_VERSION
-      VALUE "FileVersion", DOCKER_VERSION
-      VALUE "ProductVersion", DOCKER_VERSION
-#endif
-
-#ifdef DOCKER_COMMIT
-      VALUE "OriginalFileName", DOCKER_COMMIT
-#endif
-
-    END
-  END
-
-  BLOCK "VarFileInfo"
-  BEGIN
-    VALUE "Translation", 0x0000, 0x04B0
-  END
-END
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.exe.manifest b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.exe.manifest
deleted file mode 100644
index 674bc9422b..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.exe.manifest
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <description>Docker</description>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> 
-        <application> 
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-            <!-- Windows 8.1 -->
-            <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
-            <!-- Windows Vista -->
-            <supportedOS Id="{e2011457-1546-43c5-a5fe-008deee3d3f0}"/> 
-            <!-- Windows 7 -->
-            <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
-            <!-- Windows 8 -->
-            <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
-        </application> 
-    </compatibility>
-</assembly>
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.ico b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.ico
deleted file mode 100644
index c6506ec8db..0000000000
Binary files a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.ico and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.png b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.png
deleted file mode 100644
index 88df0b66df..0000000000
Binary files a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.png and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.rc b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.rc
deleted file mode 100644
index 40c645ad1d..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/docker.rc
+++ /dev/null
@@ -1,3 +0,0 @@
-#define DOCKER_NAME "Docker Client"
-
-#include "common.rc"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/dockerd.rc b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/dockerd.rc
deleted file mode 100644
index e77fc17519..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/dockerd.rc
+++ /dev/null
@@ -1,4 +0,0 @@
-#define DOCKER_NAME "Docker Engine"
-
-#include "common.rc"
-#include "event_messages.rc"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/event_messages.mc b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/event_messages.mc
deleted file mode 100644
index 980107a44d..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/event_messages.mc
+++ /dev/null
@@ -1,39 +0,0 @@
-MessageId=1
-Language=English
-%1
-.
-
-MessageId=2
-Language=English
-debug: %1
-.
-
-MessageId=3
-Language=English
-panic: %1
-.
-
-MessageId=4
-Language=English
-fatal: %1
-.
-
-MessageId=11
-Language=English
-%1 [%2]
-.
-
-MessageId=12
-Language=English
-debug: %1 [%2]
-.
-
-MessageId=13
-Language=English
-panic: %1 [%2]
-.
-
-MessageId=14
-Language=English
-fatal: %1 [%2]
-.
diff --git a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/resources.go b/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/resources.go
deleted file mode 100644
index b171259f83..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/.resources-windows/resources.go
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
-
-Package winresources is used to embed Windows resources into docker.exe.
-These resources are used to provide
-
-    * Version information
-    * An icon
-    * A Windows manifest declaring Windows version support
-
-The resource object files are generated in hack/make/.go-autogen from
-source files in hack/make/.resources-windows. This occurs automatically
-when you run hack/make.sh.
-
-These object files are picked up automatically by go build when this package
-is included.
-
-*/
-package winresources
diff --git a/installer/vendor/github.com/docker/docker/hack/make/README.md b/installer/vendor/github.com/docker/docker/hack/make/README.md
deleted file mode 100644
index 6574b0efe6..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-This directory holds scripts called by `make.sh` in the parent directory.
-
-Each script is named after the bundle it creates.
-They should not be called directly - instead, pass it as argument to make.sh, for example:
-
-```
-./hack/make.sh test
-./hack/make.sh binary ubuntu
-
-# Or to run all bundles:
-./hack/make.sh
-```
-
-To add a bundle:
-
-* Create a shell-compatible file here
-* Add it to $DEFAULT_BUNDLES in make.sh
diff --git a/installer/vendor/github.com/docker/docker/hack/make/binary b/installer/vendor/github.com/docker/docker/hack/make/binary
deleted file mode 100644
index 88b22cd462..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/binary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-rm -rf "$DEST"
-
-# This script exists as backwards compatibility for CI
-(
-	DEST="${DEST}-client"
-	ABS_DEST="${ABS_DEST}-client"
-	. hack/make/binary-client
-)
-(
-	DEST="${DEST}-daemon"
-	ABS_DEST="${ABS_DEST}-daemon"
-	. hack/make/binary-daemon
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/binary-client b/installer/vendor/github.com/docker/docker/hack/make/binary-client
deleted file mode 100644
index 1731fea8b0..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/binary-client
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-[ -z "$KEEPDEST" ] && \
-	rm -rf "$DEST"
-
-(
-	source "${MAKEDIR}/.binary-setup"
-	export BINARY_SHORT_NAME="$DOCKER_CLIENT_BINARY_NAME"
-	export GO_PACKAGE='github.com/docker/docker/cmd/docker'
-	source "${MAKEDIR}/.binary"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/binary-daemon b/installer/vendor/github.com/docker/docker/hack/make/binary-daemon
deleted file mode 100644
index e255543c16..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/binary-daemon
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-
-[ -z "$KEEPDEST" ] && \
-	rm -rf "$DEST"
-
-(
-	source "${MAKEDIR}/.binary-setup"
-	export BINARY_SHORT_NAME="$DOCKER_DAEMON_BINARY_NAME"
-	export GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
-	source "${MAKEDIR}/.binary"
-	copy_binaries "$DEST" 'hash'
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/build-deb b/installer/vendor/github.com/docker/docker/hack/make/build-deb
deleted file mode 100644
index d3c28591a6..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/build-deb
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/bash
-set -e
-
-# subshell so that we can export PATH and TZ without breaking other things
-(
-	export TZ=UTC # make sure our "date" variables are UTC-based
-	bundle .integration-daemon-start
-	bundle .detect-daemon-osarch
-
-	# TODO consider using frozen images for the dockercore/builder-deb tags
-
-	tilde='~' # ouch Bash 4.2 vs 4.3, you keel me
-	debVersion="${VERSION//-/$tilde}" # using \~ or '~' here works in 4.3, but not 4.2; just ~ causes $HOME to be inserted, hence the $tilde
-	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
-	if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-		gitUnix="$(git log -1 --pretty='%at')"
-		gitDate="$(date --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
-		gitCommit="$(git log -1 --pretty='%h')"
-		gitVersion="git${gitDate}.0.${gitCommit}"
-		# gitVersion is now something like 'git20150128.112847.0.17e840a'
-		debVersion="$debVersion~$gitVersion"
-
-		# $ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
-		# true
-		# $ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
-		# true
-		# $ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
-		# true
-
-		# ie, 1.5.0 > 1.5.0~rc1 > 1.5.0~git20150128.112847.17e840a > 1.5.0~dev~git20150128.112847.17e840a
-	fi
-
-	debSource="$(awk -F ': ' '$1 == "Source" { print $2; exit }' hack/make/.build-deb/control)"
-	debMaintainer="$(awk -F ': ' '$1 == "Maintainer" { print $2; exit }' hack/make/.build-deb/control)"
-	debDate="$(date --rfc-2822)"
-
-	# if go-md2man is available, pre-generate the man pages
-	make manpages
-
-	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
-	pkgs=( $(find "${builderDir}/"*/ -type d) )
-	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=()
-		for p in $DOCKER_BUILD_PKGS; do
-			pkgs+=( "$builderDir/$p" )
-		done
-	fi
-	for dir in "${pkgs[@]}"; do
-		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }
-		version="$(basename "$dir")"
-		suite="${version##*-}"
-
-		image="dockercore/builder-deb:$version"
-		if ! docker inspect "$image" &> /dev/null; then
-			(
-				# Add the APT_MIRROR args only if the consuming Dockerfile uses it
-				# Otherwise this will cause the build to fail
-				if [ "$(grep 'ARG APT_MIRROR=' $dir/Dockerfile)" ] && [ "$BUILD_APT_MIRROR" ]; then
-					DOCKER_BUILD_ARGS="$DOCKER_BUILD_ARGS $BUILD_APT_MIRROR"
-				fi
-				set -x && docker build ${DOCKER_BUILD_ARGS} -t "$image" "$dir"
-			)
-		fi
-
-		mkdir -p "$DEST/$version"
-		cat > "$DEST/$version/Dockerfile.build" <<-EOF
-			FROM $image
-			WORKDIR /usr/src/docker
-			COPY . /usr/src/docker
-			ENV DOCKER_GITCOMMIT $GITCOMMIT
-			RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers \
-				&& ln -snf /usr/src/docker /go/src/github.com/docker/docker
-		EOF
-
-		cat >> "$DEST/$version/Dockerfile.build" <<-EOF
-			# Install runc, containerd, proxy and tini
-			RUN ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
-		EOF
-		cat >> "$DEST/$version/Dockerfile.build" <<-EOF
-			RUN cp -aL hack/make/.build-deb debian
-			RUN { echo '$debSource (${debVersion}-0~${version}) $suite; urgency=low'; echo; echo '  * Version: $VERSION'; echo; echo " -- $debMaintainer  $debDate"; } > debian/changelog && cat >&2 debian/changelog
-			RUN dpkg-buildpackage -uc -us -I.git
-		EOF
-		tempImage="docker-temp/build-deb:$version"
-		( set -x && docker build -t "$tempImage" -f "$DEST/$version/Dockerfile.build" . )
-		docker run --rm "$tempImage" bash -c 'cd .. && tar -c *_*' | tar -xvC "$DEST/$version"
-		docker rmi "$tempImage"
-	done
-
-	bundle .integration-daemon-stop
-) 2>&1 | tee -a "$DEST/test.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/build-integration-test-binary b/installer/vendor/github.com/docker/docker/hack/make/build-integration-test-binary
deleted file mode 100644
index 2039be416f..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/build-integration-test-binary
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-set -e
-
-rm -rf "$DEST"
-DEST="$DEST/../test-integration-cli"
-
-if [ -z $DOCKER_INTEGRATION_TESTS_VERIFIED ]; then
-	source ${MAKEDIR}/.integration-test-helpers
-	ensure_test_dir integration-cli "$DEST/test.main"
-	export DOCKER_INTEGRATION_TESTS_VERIFIED=1
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/make/build-rpm b/installer/vendor/github.com/docker/docker/hack/make/build-rpm
deleted file mode 100644
index 7fec059392..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/build-rpm
+++ /dev/null
@@ -1,148 +0,0 @@
-#!/bin/bash
-set -e
-
-# subshell so that we can export PATH and TZ without breaking other things
-(
-	export TZ=UTC # make sure our "date" variables are UTC-based
-
-	source "$(dirname "$BASH_SOURCE")/.integration-daemon-start"
-	source "$(dirname "$BASH_SOURCE")/.detect-daemon-osarch"
-
-	# TODO consider using frozen images for the dockercore/builder-rpm tags
-
-	rpmName=docker-engine
-	rpmVersion="$VERSION"
-	rpmRelease=1
-
-	# rpmRelease versioning is as follows
-	# Docker 1.7.0:  version=1.7.0, release=1
-	# Docker 1.7.0-rc1: version=1.7.0, release=0.1.rc1
-	# Docker 1.7.0-cs1: version=1.7.0.cs1, release=1
-	# Docker 1.7.0-cs1-rc1: version=1.7.0.cs1, release=0.1.rc1
-	# Docker 1.7.0-dev nightly: version=1.7.0, release=0.0.YYYYMMDD.HHMMSS.gitHASH
-
-	# if we have a "-rc*" suffix, set appropriate release
-	if [[ "$rpmVersion" =~ .*-rc[0-9]+$ ]] ; then
-		rcVersion=${rpmVersion#*-rc}
-		rpmVersion=${rpmVersion%-rc*}
-		rpmRelease="0.${rcVersion}.rc${rcVersion}"
-	fi
-
-	DOCKER_GITCOMMIT=$(git rev-parse --short HEAD)
-	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		DOCKER_GITCOMMIT="$DOCKER_GITCOMMIT-unsupported"
-	fi
-
-	# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
-	if [[ "$rpmVersion" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-		gitUnix="$(git log -1 --pretty='%at')"
-		gitDate="$(date --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
-		gitCommit="$(git log -1 --pretty='%h')"
-		gitVersion="${gitDate}.git${gitCommit}"
-		# gitVersion is now something like '20150128.112847.17e840a'
-		rpmVersion="${rpmVersion%-dev}"
-		rpmRelease="0.0.$gitVersion"
-	fi
-
-	# Replace any other dashes with periods
-	rpmVersion="${rpmVersion/-/.}"
-
-	rpmPackager="$(awk -F ': ' '$1 == "Packager" { print $2; exit }' hack/make/.build-rpm/${rpmName}.spec)"
-	rpmDate="$(date +'%a %b %d %Y')"
-
-	# if go-md2man is available, pre-generate the man pages
-	make manpages
-
-	# Convert the CHANGELOG.md file into RPM changelog format
-	VERSION_REGEX="^\W\W (.*) \((.*)\)$"
-	ENTRY_REGEX="^[-+*] (.*)$"
-	while read -r line || [[ -n "$line" ]]; do
-		if [ -z "$line" ]; then continue; fi
-		if [[ "$line" =~ $VERSION_REGEX ]]; then
-			echo >> contrib/builder/rpm/${PACKAGE_ARCH}/changelog
-			echo "* `date -d ${BASH_REMATCH[2]} '+%a %b %d %Y'` ${rpmPackager} - ${BASH_REMATCH[1]}" >> contrib/builder/rpm/${PACKAGE_ARCH}/changelog
-		fi
-		if [[ "$line" =~ $ENTRY_REGEX ]]; then
-			echo "- ${BASH_REMATCH[1]//\`}" >> contrib/builder/rpm/${PACKAGE_ARCH}/changelog
-		fi
-	done < CHANGELOG.md
-
-	builderDir="contrib/builder/rpm/${PACKAGE_ARCH}"
-	pkgs=( $(find "${builderDir}/"*/ -type d) )
-	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=()
-		for p in $DOCKER_BUILD_PKGS; do
-			pkgs+=( "$builderDir/$p" )
-		done
-	fi
-	for dir in "${pkgs[@]}"; do
-		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }
-		version="$(basename "$dir")"
-		suite="${version##*-}"
-
-		image="dockercore/builder-rpm:$version"
-		if ! docker inspect "$image" &> /dev/null; then
-			( set -x && docker build ${DOCKER_BUILD_ARGS} -t "$image" "$dir" )
-		fi
-
-		mkdir -p "$DEST/$version"
-		cat > "$DEST/$version/Dockerfile.build" <<-EOF
-			FROM $image
-			COPY . /usr/src/${rpmName}
-			WORKDIR /usr/src/${rpmName}
-			RUN mkdir -p /go/src/github.com/docker && mkdir -p /go/src/github.com/opencontainers
-		EOF
-
-		cat >> "$DEST/$version/Dockerfile.build" <<-EOF
-			# Install runc, containerd, proxy and tini
-			RUN TMP_GOPATH="/go" ./hack/dockerfile/install-binaries.sh runc-dynamic containerd-dynamic proxy-dynamic tini
-		EOF
-		if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-			echo 'ENV DOCKER_EXPERIMENTAL 1' >> "$DEST/$version/Dockerfile.build"
-		fi
-		cat >> "$DEST/$version/Dockerfile.build" <<-EOF
-			RUN mkdir -p /root/rpmbuild/SOURCES \
-				&& echo '%_topdir /root/rpmbuild' > /root/.rpmmacros
-			WORKDIR /root/rpmbuild
-			RUN ln -sfv /usr/src/${rpmName}/hack/make/.build-rpm SPECS
-			WORKDIR /root/rpmbuild/SPECS
-			RUN tar --exclude .git -r -C /usr/src -f /root/rpmbuild/SOURCES/${rpmName}.tar ${rpmName}
-			RUN tar --exclude .git -r -C /go/src/github.com/docker -f /root/rpmbuild/SOURCES/${rpmName}.tar containerd
-			RUN tar --exclude .git -r -C /go/src/github.com/docker/libnetwork/cmd -f /root/rpmbuild/SOURCES/${rpmName}.tar proxy
-			RUN tar --exclude .git -r -C /go/src/github.com/opencontainers -f /root/rpmbuild/SOURCES/${rpmName}.tar runc
-			RUN tar --exclude .git -r -C /go/ -f /root/rpmbuild/SOURCES/${rpmName}.tar tini
-			RUN gzip /root/rpmbuild/SOURCES/${rpmName}.tar
-			RUN { cat /usr/src/${rpmName}/contrib/builder/rpm/${PACKAGE_ARCH}/changelog; } >> ${rpmName}.spec && tail >&2 ${rpmName}.spec
-			RUN rpmbuild -ba \
-				--define '_gitcommit $DOCKER_GITCOMMIT' \
-				--define '_release $rpmRelease' \
-				--define '_version $rpmVersion' \
-				--define '_origversion $VERSION' \
-				--define '_experimental ${DOCKER_EXPERIMENTAL:-0}' \
-				${rpmName}.spec
-		EOF
-		# selinux policy referencing systemd things won't work on non-systemd versions
-		# of centos or rhel, which we don't support anyways
-		if [ "${suite%.*}" -gt 6 ] && [[ "$version" != opensuse* ]]; then
-			selinuxDir="selinux"
-			if [ -d "./contrib/selinux-$version" ]; then
-				selinuxDir="selinux-${version}"
-			fi
-			cat >> "$DEST/$version/Dockerfile.build" <<-EOF
-				RUN tar -cz -C /usr/src/${rpmName}/contrib/${selinuxDir} -f /root/rpmbuild/SOURCES/${rpmName}-selinux.tar.gz ${rpmName}-selinux
-				RUN rpmbuild -ba \
-						--define '_gitcommit $DOCKER_GITCOMMIT' \
-						--define '_release $rpmRelease' \
-						--define '_version $rpmVersion' \
-						--define '_origversion $VERSION' \
-						${rpmName}-selinux.spec
-			EOF
-		fi
-		tempImage="docker-temp/build-rpm:$version"
-		( set -x && docker build -t "$tempImage" -f $DEST/$version/Dockerfile.build . )
-		docker run --rm "$tempImage" bash -c 'cd /root/rpmbuild && tar -c *RPMS' | tar -xvC "$DEST/$version"
-		docker rmi "$tempImage"
-	done
-
-	source "$(dirname "$BASH_SOURCE")/.integration-daemon-stop"
-) 2>&1 | tee -a $DEST/test.log
diff --git a/installer/vendor/github.com/docker/docker/hack/make/clean-apt-repo b/installer/vendor/github.com/docker/docker/hack/make/clean-apt-repo
deleted file mode 100755
index 1c37d98e40..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/clean-apt-repo
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script cleans the experimental pool for the apt repo.
-# This is useful when there are a lot of old experimental debs and you only want to keep the most recent.
-#
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-APTDIR=$DOCKER_RELEASE_DIR/apt/repo/pool/experimental
-: ${DOCKER_ARCHIVE_DIR:=$DEST/archive}
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-latest_versions=$(dpkg-scanpackages "$APTDIR" /dev/null 2>/dev/null | awk -F ': ' '$1 == "Filename" { print $2 }')
-
-# get the latest version
-latest_docker_engine_file=$(echo "$latest_versions" | grep docker-engine)
-latest_docker_engine_version=$(basename ${latest_docker_engine_file%~*})
-
-echo "latest docker-engine version: $latest_docker_engine_version"
-
-# remove all the files that are not that version in experimental
-pool_dir=$(dirname "$latest_docker_engine_file")
-old_pkgs=( $(ls "$pool_dir" | grep -v "^${latest_docker_engine_version}" | grep "${latest_docker_engine_version%%~git*}") )
-
-echo "${old_pkgs[@]}"
-
-mkdir -p "$DOCKER_ARCHIVE_DIR"
-for old_pkg in "${old_pkgs[@]}"; do
-	echo "moving ${pool_dir}/${old_pkg} to $DOCKER_ARCHIVE_DIR"
-	mv "${pool_dir}/${old_pkg}" "$DOCKER_ARCHIVE_DIR"
-done
-
-echo
-echo "$pool_dir now has contents:"
-ls "$pool_dir"
-
-# now regenerate release files for experimental
-export COMPONENT=experimental
-source "${DIR}/update-apt-repo"
-
-echo "You will now want to: "
-echo "   - re-sign the repo with hack/make/sign-repo"
-echo "   - re-generate index files with hack/make/generate-index-listing"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/clean-yum-repo b/installer/vendor/github.com/docker/docker/hack/make/clean-yum-repo
deleted file mode 100755
index 1cafbbd97f..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/clean-yum-repo
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script cleans the experimental pool for the yum repo.
-# This is useful when there are a lot of old experimental rpms and you only want to keep the most recent.
-#
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-YUMDIR=$DOCKER_RELEASE_DIR/yum/repo/experimental
-
-suites=( $(find "$YUMDIR" -mindepth 1 -maxdepth 1 -type d) )
-
-for suite in "${suites[@]}"; do
-	echo "cleanup in: $suite"
-	( set -x; repomanage -k2 --old "$suite" | xargs rm -f )
-done
-
-echo "You will now want to: "
-echo "   - re-sign the repo with hack/make/sign-repo"
-echo "   - re-generate index files with hack/make/generate-index-listing"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/cover b/installer/vendor/github.com/docker/docker/hack/make/cover
deleted file mode 100644
index 08e28e3fea..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/cover
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-
-bundle_cover() {
-	coverprofiles=( "$DEST/../"*"/coverprofiles/"* )
-	for p in "${coverprofiles[@]}"; do
-		echo
-		(
-			set -x
-			go tool cover -func="$p"
-		)
-	done
-}
-
-bundle_cover 2>&1 | tee "$DEST/report.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/cross b/installer/vendor/github.com/docker/docker/hack/make/cross
deleted file mode 100644
index 6d672b17c3..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/cross
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/bin/bash
-set -e
-
-# explicit list of os/arch combos that support being a daemon
-declare -A daemonSupporting
-daemonSupporting=(
-	[linux/amd64]=1
-	[windows/amd64]=1
-)
-
-# if we have our linux/amd64 version compiled, let's symlink it in
-if [ -x "$DEST/../binary-daemon/dockerd-$VERSION" ]; then
-	arch=$(go env GOHOSTARCH)
-	mkdir -p "$DEST/linux/${arch}"
-	(
-		cd "$DEST/linux/${arch}"
-		ln -s ../../../binary-daemon/* ./
-		ln -s ../../../binary-client/* ./
-	)
-	echo "Created symlinks:" "$DEST/linux/${arch}/"*
-fi
-
-for platform in $DOCKER_CROSSPLATFORMS; do
-	(
-		export KEEPDEST=1
-		export DEST="$DEST/$platform" # bundles/VERSION/cross/GOOS/GOARCH/docker-VERSION
-		mkdir -p "$DEST"
-		ABS_DEST="$(cd "$DEST" && pwd -P)"
-		export GOOS=${platform%/*}
-		export GOARCH=${platform##*/}
-
-		if [ "$GOOS" != "solaris" ]; then
-			# TODO. Solaris cannot be cross build because of CGO calls.
-			if [ -z "${daemonSupporting[$platform]}" ]; then
-				# we just need a simple client for these platforms
-				export LDFLAGS_STATIC_DOCKER=""
-				# remove the "daemon" build tag from platforms that aren't supported
-				export BUILDFLAGS=( "${ORIG_BUILDFLAGS[@]/ daemon/}" )
-				source "${MAKEDIR}/binary-client"
-			else
-				source "${MAKEDIR}/binary-client"
-				source "${MAKEDIR}/binary-daemon"
-			fi
-		fi
-	)
-done
diff --git a/installer/vendor/github.com/docker/docker/hack/make/dynbinary b/installer/vendor/github.com/docker/docker/hack/make/dynbinary
deleted file mode 100644
index 1a435dc4bf..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/dynbinary
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script exists as backwards compatibility for CI
-(
-    DEST="${DEST}-client"
-    ABS_DEST="${ABS_DEST}-client"
-    . hack/make/dynbinary-client
-)
-(
-
-    DEST="${DEST}-daemon"
-    ABS_DEST="${ABS_DEST}-daemon"
-    . hack/make/dynbinary-daemon
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/dynbinary-client b/installer/vendor/github.com/docker/docker/hack/make/dynbinary-client
deleted file mode 100644
index e4b7741848..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/dynbinary-client
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-(
-	export BINARY_SHORT_NAME='docker'
-	export GO_PACKAGE='github.com/docker/docker/cmd/docker'
-	export IAMSTATIC='false'
-	export LDFLAGS_STATIC_DOCKER=''
-	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
-	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
-	source "${MAKEDIR}/.binary"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/dynbinary-daemon b/installer/vendor/github.com/docker/docker/hack/make/dynbinary-daemon
deleted file mode 100644
index 090a916f65..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/dynbinary-daemon
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-
-(
-	export BINARY_SHORT_NAME='dockerd'
-	export GO_PACKAGE='github.com/docker/docker/cmd/dockerd'
-	export IAMSTATIC='false'
-	export LDFLAGS_STATIC_DOCKER=''
-	export BUILDFLAGS=( "${BUILDFLAGS[@]/netgo /}" ) # disable netgo, since we don't need it for a dynamic binary
-	export BUILDFLAGS=( "${BUILDFLAGS[@]/static_build /}" ) # we're not building a "static" binary here
-	source "${MAKEDIR}/.binary"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/generate-index-listing b/installer/vendor/github.com/docker/docker/hack/make/generate-index-listing
deleted file mode 100755
index ec44171f81..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/generate-index-listing
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script generates index files for the directory structure
-# of the apt and yum repos
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-APTDIR=$DOCKER_RELEASE_DIR/apt
-YUMDIR=$DOCKER_RELEASE_DIR/yum
-
-if [ ! -d $APTDIR ] && [ ! -d $YUMDIR ]; then
-	echo >&2 'release-rpm or release-deb must be run before generate-index-listing'
-	exit 1
-fi
-
-create_index() {
-	local directory=$1
-	local original=$2
-	local cleaned=${directory#$original}
-
-	# the index file to create
-	local index_file="${directory}/index"
-
-	# cd into dir & touch the index file
-	cd $directory
-	touch $index_file
-
-	# print the html header
-	cat <<-EOF > "$index_file"
-	<!DOCTYPE html>
-	<html>
-	<head><title>Index of ${cleaned}/</title></head>
-	<body bgcolor="white">
-	<h1>Index of ${cleaned}/</h1><hr>
-	<pre><a href="../">../</a>
-	EOF
-
-	# start of content output
-	(
-	# change IFS locally within subshell so the for loop saves line correctly to L var
-	IFS=$'\n';
-
-	# pretty sweet, will mimick the normal apache output. skipping "index" and hidden files
-	for L in $(find -L . -mount -depth -maxdepth 1 -type f ! -name 'index' ! -name '.*' -prune -printf "<a href=\"%f\">%f|@_@%Td-%Tb-%TY %Tk:%TM  @%f@\n"|sort|column -t -s '|' | sed 's,\([\ ]\+\)@_@,</a>\1,g');
-	do
-		# file
-		F=$(sed -e 's,^.*@\([^@]\+\)@.*$,\1,g'<<<"$L");
-
-		# file with file size
-		F=$(du -bh $F | cut -f1);
-
-		# output with correct format
-		sed -e 's,\ @.*$, '"$F"',g'<<<"$L";
-	done;
-	) >> $index_file;
-
-	# now output a list of all directories in this dir (maxdepth 1) other than '.' outputting in a sorted manner exactly like apache
-	find -L . -mount -depth -maxdepth 1 -type d ! -name '.' -printf "<a href=\"%f\">%-43f@_@%Td-%Tb-%TY %Tk:%TM  -\n"|sort -d|sed 's,\([\ ]\+\)@_@,/</a>\1,g' >> $index_file
-
-	# print the footer html
-	echo "</pre><hr></body></html>" >> $index_file
-
-}
-
-get_dirs() {
-	local directory=$1
-
-	for d in `find ${directory} -type d`; do
-		create_index $d $directory
-	done
-}
-
-get_dirs $APTDIR
-get_dirs $YUMDIR
diff --git a/installer/vendor/github.com/docker/docker/hack/make/install-binary b/installer/vendor/github.com/docker/docker/hack/make/install-binary
deleted file mode 100644
index 82cbc79933..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/install-binary
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-set -e
-rm -rf "$DEST"
-
-(
-	source "${MAKEDIR}/install-binary-client"
-)
-
-(
-	source "${MAKEDIR}/install-binary-daemon"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/install-binary-client b/installer/vendor/github.com/docker/docker/hack/make/install-binary-client
deleted file mode 100644
index 6c80452659..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/install-binary-client
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-rm -rf "$DEST"
-
-(
-	DEST="$(dirname $DEST)/binary-client"
-	source "${MAKEDIR}/.binary-setup"
-	install_binary "${DEST}/${DOCKER_CLIENT_BINARY_NAME}"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/install-binary-daemon b/installer/vendor/github.com/docker/docker/hack/make/install-binary-daemon
deleted file mode 100644
index 08a2d69b96..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/install-binary-daemon
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -e
-rm -rf "$DEST"
-
-(
-	DEST="$(dirname $DEST)/binary-daemon"
-	source "${MAKEDIR}/.binary-setup"
-	install_binary "${DEST}/${DOCKER_DAEMON_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_RUNC_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_CONTAINERD_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_CONTAINERD_CTR_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_CONTAINERD_SHIM_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_PROXY_BINARY_NAME}"
-	install_binary "${DEST}/${DOCKER_INIT_BINARY_NAME}"
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/install-script b/installer/vendor/github.com/docker/docker/hack/make/install-script
deleted file mode 100644
index feadac2f38..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/install-script
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script modifies the install.sh script for domains and keys other than
-# those used by the primary opensource releases.
-#
-# You can provide `url`, `yum_url`, `apt_url` and optionally `gpg_fingerprint`
-# or `GPG_KEYID` as environment variables, or the defaults for open source are used.
-#
-# The lower-case variables are substituted into install.sh.
-#
-# gpg_fingerprint and GPG_KEYID are optional, defaulting to the opensource release
-# key ("releasedocker"). Other GPG_KEYIDs will require you to mount a volume with
-# the correct contents to /root/.gnupg.
-#
-# It outputs the modified `install.sh` file to $DOCKER_RELEASE_DIR (default: $DEST)
-#
-# Example usage:
-#
-# docker run \
-# --rm \
-# --privileged \
-# -e "GPG_KEYID=deadbeef" \
-# -e "GNUPGHOME=/root/.gnupg" \
-# -v $HOME/.gnupg:/root/.gnupg \
-# -v $(pwd):/go/src/github.com/docker/docker/bundles \
-# "$IMAGE_DOCKER" \
-# hack/make.sh install-script
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-: ${GPG_KEYID:=releasedocker}
-
-DEFAULT_URL="https://get.docker.com/"
-DEFAULT_APT_URL="https://apt.dockerproject.org"
-DEFAULT_YUM_URL="https://yum.dockerproject.org"
-DEFAULT_GPG_FINGERPRINT="58118E89F3A912897C070ADBF76221572C52609D"
-
-: ${url:=$DEFAULT_URL}
-: ${apt_url:=$DEFAULT_APT_URL}
-: ${yum_url:=$DEFAULT_YUM_URL}
-if [[ "$GPG_KEYID" == "releasedocker" ]] ; then
-	: ${gpg_fingerprint:=$DEFAULT_GPG_FINGERPRINT}
-fi
-
-DEST_FILE="$DOCKER_RELEASE_DIR/install.sh"
-
-bundle_install_script() {
-	mkdir -p "$DOCKER_RELEASE_DIR"
-
-	if [[ -z "$gpg_fingerprint" ]] ; then
-		# NOTE: if no key matching key is in /root/.gnupg, this will fail
-		gpg_fingerprint=$(gpg --with-fingerprint -k "$GPG_KEYID" | grep "Key fingerprint" | awk -F "=" '{print $2};' | tr -d ' ')
-	fi
-
-	cp hack/install.sh "$DEST_FILE"
-	sed -i.bak 's#^url=".*"$#url="'"$url"'"#' "$DEST_FILE"
-	sed -i.bak 's#^apt_url=".*"$#apt_url="'"$apt_url"'"#' "$DEST_FILE"
-	sed -i.bak 's#^yum_url=".*"$#yum_url="'"$yum_url"'"#' "$DEST_FILE"
-	sed -i.bak 's#^gpg_fingerprint=".*"$#gpg_fingerprint="'"$gpg_fingerprint"'"#' "$DEST_FILE"
-	rm "${DEST_FILE}.bak"
-}
-
-bundle_install_script
diff --git a/installer/vendor/github.com/docker/docker/hack/make/release-deb b/installer/vendor/github.com/docker/docker/hack/make/release-deb
deleted file mode 100755
index ed65fe2f5f..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/release-deb
+++ /dev/null
@@ -1,163 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script creates the apt repos for the .deb files generated by hack/make/build-deb
-#
-# The following can then be used as apt sources:
-# 	deb http://apt.dockerproject.org/repo $distro-$release $version
-#
-# For example:
-#	deb http://apt.dockerproject.org/repo ubuntu-trusty main
-#	deb http://apt.dockerproject.org/repo ubuntu-trusty testing
-#	deb http://apt.dockerproject.org/repo debian-wheezy experimental
-#	deb http://apt.dockerproject.org/repo debian-jessie main
-#
-# ... and so on and so forth for the builds created by hack/make/build-deb
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-: ${GPG_KEYID:=releasedocker}
-APTDIR=$DOCKER_RELEASE_DIR/apt/repo
-
-# setup the apt repo (if it does not exist)
-mkdir -p "$APTDIR/conf" "$APTDIR/db" "$APTDIR/dists"
-
-# supported arches/sections
-arches=( amd64 i386 armhf )
-
-# Preserve existing components but don't add any non-existing ones
-for component in main testing experimental ; do
-	exists=$(find "$APTDIR/dists" -mindepth 2 -maxdepth 2 -type d -name "$component" -print -quit)
-	if [ -n "$exists" ] ; then
-		components+=( $component )
-	fi
-done
-
-# set the component for the version being released
-component="main"
-
-if [[ "$VERSION" == *-rc* ]]; then
-	component="testing"
-fi
-
-if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-	component="experimental"
-fi
-
-# Make sure our component is in the list of components
-if [[ ! "${components[*]}" =~ $component ]] ; then
-	components+=( $component )
-fi
-
-# create apt-ftparchive file on every run. This is essential to avoid
-# using stale versions of the config file that could cause unnecessary
-# refreshing of bits for EOL-ed releases.
-cat <<-EOF > "$APTDIR/conf/apt-ftparchive.conf"
-Dir {
-	ArchiveDir "${APTDIR}";
-	CacheDir "${APTDIR}/db";
-};
-
-Default {
-	Packages::Compress ". gzip bzip2";
-	Sources::Compress ". gzip bzip2";
-	Contents::Compress ". gzip bzip2";
-};
-
-TreeDefault {
-	BinCacheDB "packages-\$(SECTION)-\$(ARCH).db";
-	Directory "pool/\$(SECTION)";
-	Packages "\$(DIST)/\$(SECTION)/binary-\$(ARCH)/Packages";
-	SrcDirectory "pool/\$(SECTION)";
-	Sources "\$(DIST)/\$(SECTION)/source/Sources";
-	Contents "\$(DIST)/\$(SECTION)/Contents-\$(ARCH)";
-	FileList "$APTDIR/\$(DIST)/\$(SECTION)/filelist";
-};
-EOF
-
-for dir in bundles/$VERSION/build-deb/*/; do
-	version="$(basename "$dir")"
-	suite="${version//debootstrap-}"
-
-	cat <<-EOF
-	Tree "dists/${suite}" {
-		Sections "${components[*]}";
-		Architectures "${arches[*]}";
-	}
-
-	EOF
-done >> "$APTDIR/conf/apt-ftparchive.conf"
-
-cat <<-EOF > "$APTDIR/conf/docker-engine-release.conf"
-APT::FTPArchive::Release::Origin "Docker";
-APT::FTPArchive::Release::Components "${components[*]}";
-APT::FTPArchive::Release::Label "Docker APT Repository";
-APT::FTPArchive::Release::Architectures "${arches[*]}";
-EOF
-
-# release the debs
-for dir in bundles/$VERSION/build-deb/*/; do
-	version="$(basename "$dir")"
-	codename="${version//debootstrap-}"
-
-	tempdir="$(mktemp -d /tmp/tmp-docker-release-deb.XXXXXXXX)"
-	DEBFILE=( "$dir/docker-engine"*.deb )
-
-	# add the deb for each component for the distro version into the
-	# pool (if it is not there already)
-	mkdir -p "$APTDIR/pool/$component/d/docker-engine/"
- 	for deb in ${DEBFILE[@]}; do
-		d=$(basename "$deb")
-		# We do not want to generate a new deb if it has already been
-		# copied into the APTDIR
-		if [ ! -f "$APTDIR/pool/$component/d/docker-engine/$d" ]; then
-			cp "$deb" "$tempdir/"
-			# if we have a $GPG_PASSPHRASE we may as well
-			# dpkg-sign before copying the deb into the pool
-			if [ ! -z "$GPG_PASSPHRASE" ]; then
-				dpkg-sig -g "--no-tty  --digest-algo 'sha512' --passphrase '$GPG_PASSPHRASE'" \
-					-k "$GPG_KEYID" --sign builder "$tempdir/$d"
-			fi
-			mv "$tempdir/$d" "$APTDIR/pool/$component/d/docker-engine/"
-		fi
-	done
-
-	rm -rf "$tempdir"
-
-	# build the right directory structure, needed for apt-ftparchive
-	for arch in "${arches[@]}"; do
-		for c in "${components[@]}"; do
-			mkdir -p "$APTDIR/dists/$codename/$c/binary-$arch"
-		done
-	done
-
-	# update the filelist for this codename/component
-	find "$APTDIR/pool/$component" \
-		-name *~${codename}*.deb -o \
-		-name *~${codename#*-}*.deb > "$APTDIR/dists/$codename/$component/filelist"
-done
-
-# run the apt-ftparchive commands so we can have pinning
-apt-ftparchive generate "$APTDIR/conf/apt-ftparchive.conf"
-
-for dir in bundles/$VERSION/build-deb/*/; do
-	version="$(basename "$dir")"
-	codename="${version//debootstrap-}"
-
-	apt-ftparchive \
-		-c "$APTDIR/conf/docker-engine-release.conf" \
-		-o "APT::FTPArchive::Release::Codename=$codename" \
-		-o "APT::FTPArchive::Release::Suite=$codename" \
-		release \
-		"$APTDIR/dists/$codename" > "$APTDIR/dists/$codename/Release"
-
-	for arch in "${arches[@]}"; do
-		apt-ftparchive \
-			-c "$APTDIR/conf/docker-engine-release.conf" \
-			-o "APT::FTPArchive::Release::Codename=$codename" \
-			-o "APT::FTPArchive::Release::Suite=$codename" \
-			-o "APT::FTPArchive::Release::Components=$component" \
-			-o "APT::FTPArchive::Release::Architecture=$arch" \
-			release \
-			"$APTDIR/dists/$codename/$component/binary-$arch" > "$APTDIR/dists/$codename/$component/binary-$arch/Release"
-	done
-done
diff --git a/installer/vendor/github.com/docker/docker/hack/make/release-rpm b/installer/vendor/github.com/docker/docker/hack/make/release-rpm
deleted file mode 100755
index d7e3ec4f8a..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/release-rpm
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script creates the yum repos for the .rpm files generated by hack/make/build-rpm
-#
-# The following can then be used as a yum repo:
-# 	http://yum.dockerproject.org/repo/$release/$distro/$distro-version
-#
-# For example:
-# 	http://yum.dockerproject.org/repo/main/fedora/23
-# 	http://yum.dockerproject.org/repo/testing/centos/7
-# 	http://yum.dockerproject.org/repo/experimental/fedora/23
-# 	http://yum.dockerproject.org/repo/main/centos/7
-#
-# ... and so on and so forth for the builds created by hack/make/build-rpm
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-YUMDIR=$DOCKER_RELEASE_DIR/yum/repo
-: ${GPG_KEYID:=releasedocker}
-
-# get the release
-release="main"
-
-if [[ "$VERSION" == *-rc* ]]; then
-	release="testing"
-fi
-
-if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-	release="experimental"
-fi
-
-# Setup the yum repo
-for dir in bundles/$VERSION/build-rpm/*/; do
-	version="$(basename "$dir")"
-	suite="${version##*-}"
-	distro="${version%-*}"
-
-	REPO=$YUMDIR/$release/$distro
-
-	# if the directory does not exist, initialize the yum repo
-	if [[ ! -d $REPO/$suite/Packages ]]; then
-		mkdir -p "$REPO/$suite/Packages"
-
-		createrepo --pretty "$REPO/$suite"
-	fi
-
-	# path to rpms
-	RPMFILE=( "bundles/$VERSION/build-rpm/$version/RPMS/"*"/docker-engine"*.rpm "bundles/$VERSION/build-rpm/$version/SRPMS/docker-engine"*.rpm )
-
-	# if we have a $GPG_PASSPHRASE we may as well
-	# sign the rpms before adding to repo
-	if [ ! -z $GPG_PASSPHRASE ]; then
-		# export our key to rpm import
-		gpg --armor --export "$GPG_KEYID" > /tmp/gpg
-		rpm --import /tmp/gpg
-
-		# sign the rpms
-		echo "yes" | setsid rpm \
-			--define "_gpg_name $GPG_KEYID" \
-			--define "_signature gpg" \
-			--define "__gpg_check_password_cmd /bin/true" \
-			--define "__gpg_sign_cmd %{__gpg} gpg --batch --no-armor --digest-algo 'sha512' --passphrase '$GPG_PASSPHRASE' --no-secmem-warning -u '%{_gpg_name}' --sign --detach-sign --output %{__signature_filename} %{__plaintext_filename}" \
-			--resign "${RPMFILE[@]}"
-	fi
-
-	# copy the rpms to the packages folder
-	cp "${RPMFILE[@]}" "$REPO/$suite/Packages"
-
-	# update the repo
-	createrepo --pretty --update "$REPO/$suite"
-done
diff --git a/installer/vendor/github.com/docker/docker/hack/make/run b/installer/vendor/github.com/docker/docker/hack/make/run
deleted file mode 100644
index 37cfd53b5f..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/run
+++ /dev/null
@@ -1,44 +0,0 @@
-#!/bin/bash
-
-set -e
-rm -rf "$DEST"
-
-if ! command -v dockerd &> /dev/null; then
-	echo >&2 'error: binary-daemon or dynbinary-daemon must be run before run'
-	false
-fi
-
-DOCKER_GRAPHDRIVER=${DOCKER_GRAPHDRIVER:-vfs}
-DOCKER_USERLANDPROXY=${DOCKER_USERLANDPROXY:-true}
-
-# example usage: DOCKER_STORAGE_OPTS="dm.basesize=20G,dm.loopdatasize=200G"
-storage_params=""
-if [ -n "$DOCKER_STORAGE_OPTS" ]; then
-	IFS=','
-	for i in ${DOCKER_STORAGE_OPTS}; do
-		storage_params="--storage-opt $i $storage_params"
-	done
-	unset IFS
-fi
-
-
-listen_port=2375
-if [ -n "$DOCKER_PORT" ]; then
-	IFS=':' read -r -a ports <<< "$DOCKER_PORT"
-	listen_port="${ports[-1]}"
-fi
-
-extra_params=""
-if [ "$DOCKER_REMAP_ROOT" ]; then
-	extra_params="--userns-remap $DOCKER_REMAP_ROOT"
-fi
-
-args="--debug \
-	--host tcp://0.0.0.0:${listen_port} --host unix:///var/run/docker.sock \
-	--storage-driver "$DOCKER_GRAPHDRIVER" \
-	--userland-proxy="$DOCKER_USERLANDPROXY" \
-	$storage_params \
-	$extra_params"
-
-echo dockerd $args
-exec dockerd $args
diff --git a/installer/vendor/github.com/docker/docker/hack/make/sign-repos b/installer/vendor/github.com/docker/docker/hack/make/sign-repos
deleted file mode 100755
index 6ed1606885..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/sign-repos
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-# This script signs the deliverables from release-deb and release-rpm
-# with a designated GPG key.
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-: ${GPG_KEYID:=releasedocker}
-APTDIR=$DOCKER_RELEASE_DIR/apt/repo
-YUMDIR=$DOCKER_RELEASE_DIR/yum/repo
-
-if [ -z "$GPG_PASSPHRASE" ]; then
-	echo >&2 'you need to set GPG_PASSPHRASE in order to sign artifacts'
-	exit 1
-fi
-
-if [ ! -d $APTDIR ] && [ ! -d $YUMDIR ]; then
-	echo >&2 'release-rpm or release-deb must be run before sign-repos'
-	exit 1
-fi
-
-sign_packages(){
-	# sign apt repo metadata
-	if [ -d $APTDIR ]; then
-		# create file with public key
-		gpg --armor --export "$GPG_KEYID" > "$DOCKER_RELEASE_DIR/apt/gpg"
-
-		# sign the repo metadata
-		for F in $(find $APTDIR -name Release); do
-			if test "$F" -nt "$F.gpg" ; then
-				gpg -u "$GPG_KEYID" --passphrase "$GPG_PASSPHRASE" \
-					--digest-algo "sha512" \
-					--armor --sign --detach-sign \
-					--batch --yes \
-					--output "$F.gpg" "$F"
-			fi
-			inRelease="$(dirname "$F")/InRelease"
-			if test "$F" -nt "$inRelease" ; then
-				gpg -u "$GPG_KEYID" --passphrase "$GPG_PASSPHRASE" \
-					--digest-algo "sha512" \
-					--clearsign \
-					--batch --yes \
-					--output "$inRelease" "$F"
-			fi
-		done
-	fi
-
-	# sign yum repo metadata
-	if [ -d $YUMDIR ]; then
-		# create file with public key
-		gpg --armor --export "$GPG_KEYID" > "$DOCKER_RELEASE_DIR/yum/gpg"
-
-		# sign the repo metadata
-		for F in $(find $YUMDIR -name repomd.xml); do
-			if test "$F" -nt "$F.asc" ; then
-				gpg -u "$GPG_KEYID" --passphrase "$GPG_PASSPHRASE" \
-					--digest-algo "sha512" \
-					--armor --sign --detach-sign \
-					--batch --yes \
-					--output "$F.asc" "$F"
-			fi
-		done
-	fi
-}
-
-sign_packages
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-deb-install b/installer/vendor/github.com/docker/docker/hack/make/test-deb-install
deleted file mode 100755
index aec5847600..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-deb-install
+++ /dev/null
@@ -1,71 +0,0 @@
-#!/bin/bash
-# This script is used for testing install.sh and that it works for
-# each of component of our apt and yum repos
-set -e
-
-: ${DEB_DIR:="$(pwd)/bundles/$(cat VERSION)/build-deb"}
-
-if [[ ! -d "${DEB_DIR}" ]]; then
-	echo "you must first run `make deb` or hack/make/build-deb"
-	exit 1
-fi
-
-test_deb_install(){
-	# test for each Dockerfile in contrib/builder
-
-	builderDir="contrib/builder/deb/${PACKAGE_ARCH}"
-	pkgs=( $(find "${builderDir}/"*/ -type d) )
-	if [ ! -z "$DOCKER_BUILD_PKGS" ]; then
-		pkgs=()
-		for p in $DOCKER_BUILD_PKGS; do
-			pkgs+=( "$builderDir/$p" )
-		done
-	fi
-	for dir in "${pkgs[@]}"; do
-		[ -d "$dir" ] || { echo >&2 "skipping nonexistent $dir"; continue; }
-		local from="$(awk 'toupper($1) == "FROM" { print $2; exit }' "$dir/Dockerfile")"
-		local dir=$(basename "$dir")
-
-		if [[ ! -d "${DEB_DIR}/${dir}" ]]; then
-			echo "No deb found for ${dir}"
-			exit 1
-		fi
-
-		local script=$(mktemp /tmp/install-XXXXXXXXXX.sh)
-		cat <<-EOF > "${script}"
-		#!/bin/bash
-		set -e
-		set -x
-
-		apt-get update && apt-get install -y apparmor
-
-		dpkg -i /root/debs/*.deb || true
-
-		apt-get install -yf
-
-		/etc/init.d/apparmor start
-
-		# this will do everything _except_ load the profile into the kernel
-		(
-		cd /etc/apparmor.d
-		/sbin/apparmor_parser --skip-kernel-load docker-engine
-		)
-		EOF
-
-		chmod +x "${script}"
-
-		echo "testing deb install for ${from}"
-		docker run --rm -i --privileged \
-			-v ${DEB_DIR}/${dir}:/root/debs \
-			-v ${script}:/install.sh \
-			${from} /install.sh
-
-		rm -f ${script}
-	done
-}
-
-(
-	bundle .integration-daemon-start
-	test_deb_install
-	bundle .integration-daemon-stop
-) 2>&1 | tee -a "$DEST/test.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-docker-py b/installer/vendor/github.com/docker/docker/hack/make/test-docker-py
deleted file mode 100644
index fcacc16436..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-docker-py
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-source hack/make/.integration-test-helpers
-
-# subshell so that we can export PATH without breaking other things
-(
-	bundle .integration-daemon-start
-
-	dockerPy='/docker-py'
-	[ -d "$dockerPy" ] || {
-		dockerPy="$DEST/docker-py"
-		git clone https://github.com/docker/docker-py.git "$dockerPy"
-	}
-
-	# exporting PYTHONPATH to import "docker" from our local docker-py
-	test_env PYTHONPATH="$dockerPy" py.test --junitxml="$DEST/results.xml" "$dockerPy/tests/integration"
-
-	bundle .integration-daemon-stop
-) 2>&1 | tee -a "$DEST/test.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-install-script b/installer/vendor/github.com/docker/docker/hack/make/test-install-script
deleted file mode 100755
index 4782cbea88..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-install-script
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-# This script is used for testing install.sh and that it works for
-# each of component of our apt and yum repos
-set -e
-
-test_install_script(){
-	# these are equivalent to main, testing, experimental components
-	# in the repos, but its the url that will do the conversion
-	components=( experimental test get )
-
-	for component in "${components[@]}"; do
-		# change url to specific component for testing
-		local test_url=https://${component}.docker.com
-		local script=$(mktemp /tmp/install-XXXXXXXXXX.sh)
-		sed "s,url='https://get.docker.com/',url='${test_url}/'," hack/install.sh > "${script}"
-
-		chmod +x "${script}"
-
-		# test for each Dockerfile in contrib/builder
-		for dir in contrib/builder/*/*/; do
-			local from="$(awk 'toupper($1) == "FROM" { print $2; exit }' "$dir/Dockerfile")"
-
-			echo "running install.sh for ${component} with ${from}"
-			docker run --rm -i -v ${script}:/install.sh ${from} /install.sh
-		done
-
-		rm -f ${script}
-	done
-}
-
-test_install_script
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-integration-cli b/installer/vendor/github.com/docker/docker/hack/make/test-integration-cli
deleted file mode 100755
index 689a5285f3..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-integration-cli
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-set -e
-
-source hack/make/.integration-test-helpers
-
-# subshell so that we can export PATH without breaking other things
-(
-	bundle .integration-daemon-start
-
-	bundle .integration-daemon-setup
-
-	bundle_test_integration_cli
-
-	bundle .integration-daemon-stop
-
-	if [ "$(go env GOOS)" != 'windows' ]
-	then
-		leftovers=$(ps -ax -o pid,cmd | awk '$2 == "docker-containerd-shim" && $4 ~ /.*\/bundles\/.*\/test-integration-cli/ { print $1 }')
-		if [ -n "$leftovers" ]
-		then
-			ps aux
-			kill -9 $leftovers 2> /dev/null
-			echo "!!!! WARNING you have left over shim(s), Cleanup your test !!!!"
-			exit 1
-		fi
-	fi
-
-) 2>&1 | tee -a "$DEST/test.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-integration-shell b/installer/vendor/github.com/docker/docker/hack/make/test-integration-shell
deleted file mode 100644
index 86df9654a3..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-integration-shell
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-bundle .integration-daemon-start
-bundle .integration-daemon-setup
-
-export ABS_DEST
-bash +e
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-old-apt-repo b/installer/vendor/github.com/docker/docker/hack/make/test-old-apt-repo
deleted file mode 100755
index bb20128e30..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-old-apt-repo
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-set -e
-
-versions=( 1.3.3 1.4.1 1.5.0 1.6.2 )
-
-install() {
-	local version=$1
-	local tmpdir=$(mktemp -d /tmp/XXXXXXXXXX)
-	local dockerfile="${tmpdir}/Dockerfile"
-	cat <<-EOF > "$dockerfile"
-	FROM debian:jessie
-	ENV VERSION ${version}
-	RUN apt-get update && apt-get install -y \
-		apt-transport-https \
-		ca-certificates \
-		--no-install-recommends
-	RUN echo "deb https://get.docker.com/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
-	RUN apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 \
-		--recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
-	RUN apt-get update && apt-get install -y \
-		lxc-docker-\${VERSION}
-	EOF
-
-	docker build --rm --force-rm --no-cache -t docker-old-repo:${version} -f $dockerfile $tmpdir
-}
-
-for v in "${versions[@]}"; do
-	install "$v"
-done
diff --git a/installer/vendor/github.com/docker/docker/hack/make/test-unit b/installer/vendor/github.com/docker/docker/hack/make/test-unit
deleted file mode 100644
index f263345ce6..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/test-unit
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-set -e
-
-# Run Docker's test suite, including sub-packages, and store their output as a bundle
-# If $TESTFLAGS is set in the environment, it is passed as extra arguments to 'go test'.
-# You can use this to select certain tests to run, e.g.
-#
-#   TESTFLAGS='-test.run ^TestBuild$' ./hack/make.sh test-unit
-#
-bundle_test_unit() {
-	TESTFLAGS+=" -test.timeout=${TIMEOUT}"
-	INCBUILD="-i"
-	count=0
-	for flag in "${BUILDFLAGS[@]}"; do
-		if [ "${flag}" == ${INCBUILD} ]; then
-			unset BUILDFLAGS[${count}]
-			break
-		fi
-		count=$[ ${count} + 1 ]
-	done
-
-	date
-	if [ -z "$TESTDIRS" ]; then
-		TEST_PATH=./...
-	else
-		TEST_PATH=./${TESTDIRS}
-	fi
-
-	if [ "$(go env GOHOSTOS)" = 'solaris' ]; then
-		pkg_list=$(go list -e \
-			-f '{{if ne .Name "github.com/docker/docker"}}
-				{{.ImportPath}}
-			    {{end}}' \
-			"${BUILDFLAGS[@]}" $TEST_PATH \
-			| grep github.com/docker/docker \
-			| grep -v github.com/docker/docker/vendor \
-			| grep -v github.com/docker/docker/daemon/graphdriver \
-			| grep -v github.com/docker/docker/man \
-			| grep -v github.com/docker/docker/integration-cli)
-	else
-		pkg_list=$(go list -e \
-			-f '{{if ne .Name "github.com/docker/docker"}}
-				{{.ImportPath}}
-			    {{end}}' \
-			"${BUILDFLAGS[@]}" $TEST_PATH \
-			| grep github.com/docker/docker \
-			| grep -v github.com/docker/docker/vendor \
-			| grep -v github.com/docker/docker/man \
-			| grep -v github.com/docker/docker/integration-cli)
-	fi
-
-	go test -cover -ldflags "$LDFLAGS" "${BUILDFLAGS[@]}" $TESTFLAGS $pkg_list
-}
-
-bundle_test_unit 2>&1 | tee -a "$DEST/test.log"
diff --git a/installer/vendor/github.com/docker/docker/hack/make/tgz b/installer/vendor/github.com/docker/docker/hack/make/tgz
deleted file mode 100644
index 3ccd93fa01..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/tgz
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/bin/bash
-
-CROSS="$DEST/../cross"
-
-set -e
-
-arch=$(go env GOHOSTARCH)
-if [ ! -d "$CROSS/linux/${arch}" ]; then
-	echo >&2 'error: binary and cross must be run before tgz'
-	false
-fi
-
-(
-for d in "$CROSS/"*/*; do
-	export GOARCH="$(basename "$d")"
-	export GOOS="$(basename "$(dirname "$d")")"
-
-	source "${MAKEDIR}/.binary-setup"
-
-	BINARY_NAME="${DOCKER_CLIENT_BINARY_NAME}-$VERSION"
-	DAEMON_BINARY_NAME="${DOCKER_DAEMON_BINARY_NAME}-$VERSION"
-	PROXY_BINARY_NAME="${DOCKER_PROXY_BINARY_NAME}-$VERSION"
-	BINARY_EXTENSION="$(export GOOS && binary_extension)"
-	if [ "$GOOS" = 'windows' ]; then
-		# if windows use a zip, not tgz
-		BUNDLE_EXTENSION=".zip"
-		IS_TAR="false"
-	elif [ "$GOOS" == "solaris" ]; then
-		# Solaris bypasses cross due to CGO issues.
-		continue
-	else
-		BUNDLE_EXTENSION=".tgz"
-		IS_TAR="true"
-	fi
-	BINARY_FULLNAME="$BINARY_NAME$BINARY_EXTENSION"
-	DAEMON_BINARY_FULLNAME="$DAEMON_BINARY_NAME$BINARY_EXTENSION"
-	PROXY_BINARY_FULLNAME="$PROXY_BINARY_NAME$BINARY_EXTENSION"
-	mkdir -p "$DEST/$GOOS/$GOARCH"
-	TGZ="$DEST/$GOOS/$GOARCH/$BINARY_NAME$BUNDLE_EXTENSION"
-
-	# The staging directory for the files in the tgz
-	BUILD_PATH="$DEST/build"
-
-	# The directory that is at the root of the tar file
-	TAR_BASE_DIRECTORY="docker"
-
-	# $DEST/build/docker
-	TAR_PATH="$BUILD_PATH/$TAR_BASE_DIRECTORY"
-
-	# Copy the correct docker binary
-	mkdir -p $TAR_PATH
-	cp -L "$d/$BINARY_FULLNAME" "$TAR_PATH/${DOCKER_CLIENT_BINARY_NAME}${BINARY_EXTENSION}"
-	if [ -f "$d/$DAEMON_BINARY_FULLNAME" ]; then
-		cp -L "$d/$DAEMON_BINARY_FULLNAME" "$TAR_PATH/${DOCKER_DAEMON_BINARY_NAME}${BINARY_EXTENSION}"
-	fi
-	if [ -f "$d/$PROXY_BINARY_FULLNAME" ]; then
-		cp -L "$d/$PROXY_BINARY_FULLNAME" "$TAR_PATH/${DOCKER_PROXY_BINARY_NAME}${BINARY_EXTENSION}"
-	fi
-
-	# copy over all the extra binaries
-	copy_binaries $TAR_PATH
-
-	# add completions
-	for s in bash fish zsh; do
-		mkdir -p $TAR_PATH/completion/$s
-		cp -L contrib/completion/$s/*docker* $TAR_PATH/completion/$s/
-	done
-
-	if [ "$IS_TAR" == "true" ]; then
-		echo "Creating tgz from $BUILD_PATH and naming it $TGZ"
-		tar --numeric-owner --owner 0 -C "$BUILD_PATH" -czf "$TGZ" $TAR_BASE_DIRECTORY
-	else
-		# ZIP needs to full absolute dir path, not the absolute path
-		ZIP=`pwd`"/$TGZ"
-		# keep track of where we are, for later.
-		pushd .
-		# go into the BUILD_PATH since zip does not have a -C equivalent.
-		cd $BUILD_PATH
-		echo "Creating zip from $BUILD_PATH and naming it $ZIP"
-		zip -q -r $ZIP $TAR_BASE_DIRECTORY
-		# go back to where we started
-		popd
-	fi
-
-	hash_files "$TGZ"
-
-	# cleanup after ourselves
-	rm -rf "$BUILD_PATH"
-
-	echo "Created tgz: $TGZ"
-done
-)
diff --git a/installer/vendor/github.com/docker/docker/hack/make/ubuntu b/installer/vendor/github.com/docker/docker/hack/make/ubuntu
deleted file mode 100644
index 8de5d9ceac..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/ubuntu
+++ /dev/null
@@ -1,190 +0,0 @@
-#!/bin/bash
-
-PKGVERSION="${VERSION//-/'~'}"
-# if we have a "-dev" suffix or have change in Git, let's make this package version more complex so it works better
-if [[ "$VERSION" == *-dev ]] || [ -n "$(git status --porcelain)" ]; then
-	GIT_UNIX="$(git log -1 --pretty='%at')"
-	GIT_DATE="$(date --date "@$GIT_UNIX" +'%Y%m%d.%H%M%S')"
-	GIT_COMMIT="$(git log -1 --pretty='%h')"
-	GIT_VERSION="git${GIT_DATE}.0.${GIT_COMMIT}"
-	# GIT_VERSION is now something like 'git20150128.112847.0.17e840a'
-	PKGVERSION="$PKGVERSION~$GIT_VERSION"
-fi
-
-# $ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
-# true
-# $ dpkg --compare-versions 1.5.0~rc1 gt 1.5.0~git20150128.112847.17e840a && echo true || echo false
-# true
-# $ dpkg --compare-versions 1.5.0~git20150128.112847.17e840a gt 1.5.0~dev~git20150128.112847.17e840a && echo true || echo false
-# true
-
-# ie, 1.5.0 > 1.5.0~rc1 > 1.5.0~git20150128.112847.17e840a > 1.5.0~dev~git20150128.112847.17e840a
-
-PACKAGE_ARCHITECTURE="$(dpkg-architecture -qDEB_HOST_ARCH)"
-PACKAGE_URL="https://www.docker.com/"
-PACKAGE_MAINTAINER="support@docker.com"
-PACKAGE_DESCRIPTION="Linux container runtime
-Docker complements LXC with a high-level API which operates at the process
-level. It runs unix processes with strong guarantees of isolation and
-repeatability across servers.
-Docker is a great building block for automating distributed systems:
-large-scale web deployments, database clusters, continuous deployment systems,
-private PaaS, service-oriented architectures, etc."
-PACKAGE_LICENSE="Apache-2.0"
-
-# Build docker as an ubuntu package using FPM and REPREPRO (sue me).
-# bundle_binary must be called first.
-bundle_ubuntu() {
-	DIR="$ABS_DEST/build"
-
-	# Include our udev rules
-	mkdir -p "$DIR/etc/udev/rules.d"
-	cp contrib/udev/80-docker.rules "$DIR/etc/udev/rules.d/"
-
-	# Include our init scripts
-	mkdir -p "$DIR/etc/init"
-	cp contrib/init/upstart/docker.conf "$DIR/etc/init/"
-	mkdir -p "$DIR/etc/init.d"
-	cp contrib/init/sysvinit-debian/docker "$DIR/etc/init.d/"
-	mkdir -p "$DIR/etc/default"
-	cp contrib/init/sysvinit-debian/docker.default "$DIR/etc/default/docker"
-	mkdir -p "$DIR/lib/systemd/system"
-	cp contrib/init/systemd/docker.{service,socket} "$DIR/lib/systemd/system/"
-
-	# Include contributed completions
-	mkdir -p "$DIR/etc/bash_completion.d"
-	cp contrib/completion/bash/docker "$DIR/etc/bash_completion.d/"
-	mkdir -p "$DIR/usr/share/zsh/vendor-completions"
-	cp contrib/completion/zsh/_docker "$DIR/usr/share/zsh/vendor-completions/"
-	mkdir -p "$DIR/etc/fish/completions"
-	cp contrib/completion/fish/docker.fish "$DIR/etc/fish/completions/"
-
-	# Include man pages
-	make manpages
-	manRoot="$DIR/usr/share/man"
-	mkdir -p "$manRoot"
-	for manDir in man/man?; do
-		manBase="$(basename "$manDir")" # "man1"
-		for manFile in "$manDir"/*; do
-			manName="$(basename "$manFile")" # "docker-build.1"
-			mkdir -p "$manRoot/$manBase"
-			gzip -c "$manFile" > "$manRoot/$manBase/$manName.gz"
-		done
-	done
-
-	# Copy the binary
-	# This will fail if the binary bundle hasn't been built
-	mkdir -p "$DIR/usr/bin"
-	cp "$DEST/../binary/docker-$VERSION" "$DIR/usr/bin/docker"
-
-	# Generate postinst/prerm/postrm scripts
-	cat > "$DEST/postinst" <<'EOF'
-#!/bin/sh
-set -e
-set -u
-
-if [ "$1" = 'configure' ] && [ -z "$2" ]; then
-	if ! getent group docker > /dev/null; then
-		groupadd --system docker
-	fi
-fi
-
-if ! { [ -x /sbin/initctl ] && /sbin/initctl version 2>/dev/null | grep -q upstart; }; then
-	# we only need to do this if upstart isn't in charge
-	update-rc.d docker defaults > /dev/null || true
-fi
-if [ -n "$2" ]; then
-	_dh_action=restart
-else
-	_dh_action=start
-fi
-service docker $_dh_action 2>/dev/null || true
-
-#DEBHELPER#
-EOF
-	cat > "$DEST/prerm" <<'EOF'
-#!/bin/sh
-set -e
-set -u
-
-service docker stop 2>/dev/null || true
-
-#DEBHELPER#
-EOF
-	cat > "$DEST/postrm" <<'EOF'
-#!/bin/sh
-set -e
-set -u
-
-if [ "$1" = "purge" ] ; then
-	update-rc.d docker remove > /dev/null || true
-fi
-
-# In case this system is running systemd, we make systemd reload the unit files
-# to pick up changes.
-if [ -d /run/systemd/system ] ; then
-	systemctl --system daemon-reload > /dev/null || true
-fi
-
-#DEBHELPER#
-EOF
-	# TODO swaths of these were borrowed from debhelper's auto-inserted stuff, because we're still using fpm - we need to use debhelper instead, and somehow reconcile Ubuntu that way
-	chmod +x "$DEST/postinst" "$DEST/prerm" "$DEST/postrm"
-
-	(
-		# switch directories so we create *.deb in the right folder
-		cd "$DEST"
-
-		# create lxc-docker-VERSION package
-		fpm -s dir -C "$DIR" \
-			--name "lxc-docker-$VERSION" --version "$PKGVERSION" \
-			--after-install "$ABS_DEST/postinst" \
-			--before-remove "$ABS_DEST/prerm" \
-			--after-remove "$ABS_DEST/postrm" \
-			--architecture "$PACKAGE_ARCHITECTURE" \
-			--prefix / \
-			--depends iptables \
-			--deb-recommends aufs-tools \
-			--deb-recommends ca-certificates \
-			--deb-recommends git \
-			--deb-recommends xz-utils \
-			--deb-recommends 'cgroupfs-mount | cgroup-lite' \
-			--deb-suggests apparmor \
-			--description "$PACKAGE_DESCRIPTION" \
-			--maintainer "$PACKAGE_MAINTAINER" \
-			--conflicts docker \
-			--conflicts docker.io \
-			--conflicts lxc-docker-virtual-package \
-			--provides lxc-docker \
-			--provides lxc-docker-virtual-package \
-			--replaces lxc-docker \
-			--replaces lxc-docker-virtual-package \
-			--url "$PACKAGE_URL" \
-			--license "$PACKAGE_LICENSE" \
-			--config-files /etc/udev/rules.d/80-docker.rules \
-			--config-files /etc/init/docker.conf \
-			--config-files /etc/init.d/docker \
-			--config-files /etc/default/docker \
-			--deb-compression gz \
-			-t deb .
-		# TODO replace "Suggests: cgroup-lite" with "Recommends: cgroupfs-mount | cgroup-lite" once cgroupfs-mount is available
-
-		# create empty lxc-docker wrapper package
-		fpm -s empty \
-			--name lxc-docker --version "$PKGVERSION" \
-			--architecture "$PACKAGE_ARCHITECTURE" \
-			--depends lxc-docker-$VERSION \
-			--description "$PACKAGE_DESCRIPTION" \
-			--maintainer "$PACKAGE_MAINTAINER" \
-			--url "$PACKAGE_URL" \
-			--license "$PACKAGE_LICENSE" \
-			--deb-compression gz \
-			-t deb
-	)
-
-	# clean up after ourselves so we have a clean output directory
-	rm "$DEST/postinst" "$DEST/prerm" "$DEST/postrm"
-	rm -r "$DIR"
-}
-
-bundle_ubuntu
diff --git a/installer/vendor/github.com/docker/docker/hack/make/update-apt-repo b/installer/vendor/github.com/docker/docker/hack/make/update-apt-repo
deleted file mode 100755
index 7354a2ecff..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/update-apt-repo
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/bin/bash
-set -e
-
-# This script updates the apt repo in $DOCKER_RELEASE_DIR/apt/repo.
-# This script is a "fix all" for any sort of problems that might have occurred with
-# the Release or Package files in the repo.
-# It should only be used in the rare case of extreme emergencies to regenerate
-# Release and Package files for the apt repo.
-#
-# NOTE: Always be sure to re-sign the repo with hack/make/sign-repos after running
-# this script.
-
-: ${DOCKER_RELEASE_DIR:=$DEST}
-APTDIR=$DOCKER_RELEASE_DIR/apt/repo
-
-# supported arches/sections
-arches=( amd64 i386 )
-
-# Preserve existing components but don't add any non-existing ones
-for component in main testing experimental ; do
-	if ls "$APTDIR/dists/*/$component" >/dev/null 2>&1 ; then
-		components+=( $component )
-	fi
-done
-
-dists=( $(find "${APTDIR}/dists" -maxdepth 1 -mindepth 1 -type d) )
-
-# override component if it is set
-if [ "$COMPONENT" ]; then
-	components=( $COMPONENT )
-fi
-
-# release the debs
-for version in "${dists[@]}"; do
-	for component in "${components[@]}"; do
-		codename="${version//debootstrap-}"
-
-		# update the filelist for this codename/component
-		find "$APTDIR/pool/$component" \
-			-name *~${codename#*-}*.deb > "$APTDIR/dists/$codename/$component/filelist"
-	done
-done
-
-# run the apt-ftparchive commands so we can have pinning
-apt-ftparchive generate "$APTDIR/conf/apt-ftparchive.conf"
-
-for dist in "${dists[@]}"; do
-	version=$(basename "$dist")
-	for component in "${components[@]}"; do
-		codename="${version//debootstrap-}"
-
-		apt-ftparchive \
-			-o "APT::FTPArchive::Release::Codename=$codename" \
-			-o "APT::FTPArchive::Release::Suite=$codename" \
-			-c "$APTDIR/conf/docker-engine-release.conf" \
-			release \
-			"$APTDIR/dists/$codename" > "$APTDIR/dists/$codename/Release"
-
-		for arch in "${arches[@]}"; do
-			apt-ftparchive \
-				-o "APT::FTPArchive::Release::Codename=$codename" \
-				-o "APT::FTPArchive::Release::Suite=$codename" \
-				-o "APT::FTPArchive::Release::Component=$component" \
-				-o "APT::FTPArchive::Release::Architecture=$arch" \
-				-c "$APTDIR/conf/docker-engine-release.conf" \
-				release \
-				"$APTDIR/dists/$codename/$component/binary-$arch" > "$APTDIR/dists/$codename/$component/binary-$arch/Release"
-		done
-	done
-done
diff --git a/installer/vendor/github.com/docker/docker/hack/make/win b/installer/vendor/github.com/docker/docker/hack/make/win
deleted file mode 100644
index f9f4111276..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/make/win
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-set -e
-
-# explicit list of os/arch combos that support being a daemon
-declare -A daemonSupporting
-daemonSupporting=(
-	[linux/amd64]=1
-	[windows/amd64]=1
-)
-platform="windows/amd64"
-export DEST="$DEST/$platform" # bundles/VERSION/cross/GOOS/GOARCH/docker-VERSION
-mkdir -p "$DEST"
-ABS_DEST="$(cd "$DEST" && pwd -P)"
-export GOOS=${platform%/*}
-export GOARCH=${platform##*/}
-if [ -z "${daemonSupporting[$platform]}" ]; then
-	export LDFLAGS_STATIC_DOCKER="" # we just need a simple client for these platforms
-	export BUILDFLAGS=( "${ORIG_BUILDFLAGS[@]/ daemon/}" ) # remove the "daemon" build tag from platforms that aren't supported
-fi
-source "${MAKEDIR}/binary"
diff --git a/installer/vendor/github.com/docker/docker/hack/release.sh b/installer/vendor/github.com/docker/docker/hack/release.sh
deleted file mode 100755
index 4b020537ea..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/release.sh
+++ /dev/null
@@ -1,325 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-# This script looks for bundles built by make.sh, and releases them on a
-# public S3 bucket.
-#
-# Bundles should be available for the VERSION string passed as argument.
-#
-# The correct way to call this script is inside a container built by the
-# official Dockerfile at the root of the Docker source code. The Dockerfile,
-# make.sh and release.sh should all be from the same source code revision.
-
-set -o pipefail
-
-# Print a usage message and exit.
-usage() {
-	cat >&2 <<'EOF'
-To run, I need:
-- to be in a container generated by the Dockerfile at the top of the Docker
-  repository;
-- to be provided with the location of an S3 bucket and path, in
-  environment variables AWS_S3_BUCKET and AWS_S3_BUCKET_PATH (default: '');
-- to be provided with AWS credentials for this S3 bucket, in environment
-  variables AWS_ACCESS_KEY_ID and AWS_SECRET_ACCESS_KEY;
-- a generous amount of good will and nice manners.
-The canonical way to run me is to run the image produced by the Dockerfile: e.g.:"
-
-docker run -e AWS_S3_BUCKET=test.docker.com \
-           -e AWS_ACCESS_KEY_ID     \
-           -e AWS_SECRET_ACCESS_KEY \
-           -e AWS_DEFAULT_REGION    \
-           -it --privileged         \
-           docker ./hack/release.sh
-EOF
-	exit 1
-}
-
-[ "$AWS_S3_BUCKET" ] || usage
-[ "$AWS_ACCESS_KEY_ID" ] || usage
-[ "$AWS_SECRET_ACCESS_KEY" ] || usage
-[ -d /go/src/github.com/docker/docker ] || usage
-cd /go/src/github.com/docker/docker
-[ -x hack/make.sh ] || usage
-
-export AWS_DEFAULT_REGION
-: ${AWS_DEFAULT_REGION:=us-west-1}
-
-AWS_CLI=${AWS_CLI:-'aws'}
-
-RELEASE_BUNDLES=(
-	binary
-	cross
-	tgz
-)
-
-if [ "$1" != '--release-regardless-of-test-failure' ]; then
-	RELEASE_BUNDLES=(
-		test-unit
-		"${RELEASE_BUNDLES[@]}"
-		test-integration-cli
-	)
-fi
-
-VERSION=$(< VERSION)
-BUCKET=$AWS_S3_BUCKET
-BUCKET_PATH=$BUCKET
-[[ -n "$AWS_S3_BUCKET_PATH" ]] && BUCKET_PATH+=/$AWS_S3_BUCKET_PATH
-
-if command -v git &> /dev/null && git rev-parse &> /dev/null; then
-	if [ -n "$(git status --porcelain --untracked-files=no)" ]; then
-		echo "You cannot run the release script on a repo with uncommitted changes"
-		usage
-	fi
-fi
-
-# These are the 2 keys we've used to sign the deb's
-#   release (get.docker.com)
-#	GPG_KEY="36A1D7869245C8950F966E92D8576A8BA88D21E9"
-#   test    (test.docker.com)
-#	GPG_KEY="740B314AE3941731B942C66ADF4FD13717AAD7D6"
-
-setup_s3() {
-	echo "Setting up S3"
-	# Try creating the bucket. Ignore errors (it might already exist).
-	$AWS_CLI s3 mb "s3://$BUCKET" 2>/dev/null || true
-	# Check access to the bucket.
-	$AWS_CLI s3 ls "s3://$BUCKET" >/dev/null
-	# Make the bucket accessible through website endpoints.
-	$AWS_CLI s3 website --index-document index --error-document error "s3://$BUCKET"
-}
-
-# write_to_s3 uploads the contents of standard input to the specified S3 url.
-write_to_s3() {
-	DEST=$1
-	F=`mktemp`
-	cat > "$F"
-	$AWS_CLI s3 cp --acl public-read --content-type 'text/plain' "$F" "$DEST"
-	rm -f "$F"
-}
-
-s3_url() {
-	case "$BUCKET" in
-		get.docker.com|test.docker.com|experimental.docker.com)
-			echo "https://$BUCKET_PATH"
-			;;
-		*)
-			BASE_URL="http://${BUCKET}.s3-website-${AWS_DEFAULT_REGION}.amazonaws.com"
-			if [[ -n "$AWS_S3_BUCKET_PATH" ]] ; then
-				echo "$BASE_URL/$AWS_S3_BUCKET_PATH"
-			else
-				echo "$BASE_URL"
-			fi
-			;;
-	esac
-}
-
-build_all() {
-	echo "Building release"
-	if ! ./hack/make.sh "${RELEASE_BUNDLES[@]}"; then
-		echo >&2
-		echo >&2 'The build or tests appear to have failed.'
-		echo >&2
-		echo >&2 'You, as the release  maintainer, now have a couple options:'
-		echo >&2 '- delay release and fix issues'
-		echo >&2 '- delay release and fix issues'
-		echo >&2 '- did we mention how important this is?  issues need fixing :)'
-		echo >&2
-		echo >&2 'As a final LAST RESORT, you (because only you, the release maintainer,'
-		echo >&2 ' really knows all the hairy problems at hand with the current release'
-		echo >&2 ' issues) may bypass this checking by running this script again with the'
-		echo >&2 ' single argument of "--release-regardless-of-test-failure", which will skip'
-		echo >&2 ' running the test suite, and will only build the binaries and packages.  Please'
-		echo >&2 ' avoid using this if at all possible.'
-		echo >&2
-		echo >&2 'Regardless, we cannot stress enough the scarcity with which this bypass'
-		echo >&2 ' should be used.  If there are release issues, we should always err on the'
-		echo >&2 ' side of caution.'
-		echo >&2
-		exit 1
-	fi
-}
-
-upload_release_build() {
-	src="$1"
-	dst="$2"
-	latest="$3"
-
-	echo
-	echo "Uploading $src"
-	echo "  to $dst"
-	echo
-	$AWS_CLI s3 cp --follow-symlinks --acl public-read "$src" "$dst"
-	if [ "$latest" ]; then
-		echo
-		echo "Copying to $latest"
-		echo
-		$AWS_CLI s3 cp --acl public-read "$dst" "$latest"
-	fi
-
-	# get hash files too (see hash_files() in hack/make.sh)
-	for hashAlgo in md5 sha256; do
-		if [ -e "$src.$hashAlgo" ]; then
-			echo
-			echo "Uploading $src.$hashAlgo"
-			echo "  to $dst.$hashAlgo"
-			echo
-			$AWS_CLI s3 cp --follow-symlinks --acl public-read --content-type='text/plain' "$src.$hashAlgo" "$dst.$hashAlgo"
-			if [ "$latest" ]; then
-				echo
-				echo "Copying to $latest.$hashAlgo"
-				echo
-				$AWS_CLI s3 cp --acl public-read "$dst.$hashAlgo" "$latest.$hashAlgo"
-			fi
-		fi
-	done
-}
-
-release_build() {
-	echo "Releasing binaries"
-	GOOS=$1
-	GOARCH=$2
-
-	binDir=bundles/$VERSION/cross/$GOOS/$GOARCH
-	tgzDir=bundles/$VERSION/tgz/$GOOS/$GOARCH
-	binary=docker-$VERSION
-	zipExt=".tgz"
-	binaryExt=""
-	tgz=$binary$zipExt
-
-	latestBase=
-	if [ -z "$NOLATEST" ]; then
-		latestBase=docker-latest
-	fi
-
-	# we need to map our GOOS and GOARCH to uname values
-	# see https://en.wikipedia.org/wiki/Uname
-	# ie, GOOS=linux -> "uname -s"=Linux
-
-	s3Os=$GOOS
-	case "$s3Os" in
-		darwin)
-			s3Os=Darwin
-			;;
-		freebsd)
-			s3Os=FreeBSD
-			;;
-		linux)
-			s3Os=Linux
-			;;
-		solaris)
-			echo skipping solaris release
-			return 0
-			;;
-		windows)
-			# this is windows use the .zip and .exe extensions for the files.
-			s3Os=Windows
-			zipExt=".zip"
-			binaryExt=".exe"
-			tgz=$binary$zipExt
-			binary+=$binaryExt
-			;;
-		*)
-			echo >&2 "error: can't convert $s3Os to an appropriate value for 'uname -s'"
-			exit 1
-			;;
-	esac
-
-	s3Arch=$GOARCH
-	case "$s3Arch" in
-		amd64)
-			s3Arch=x86_64
-			;;
-		386)
-			s3Arch=i386
-			;;
-		arm)
-			s3Arch=armel
-			# someday, we might potentially support multiple GOARM values, in which case we might get armhf here too
-			;;
-		*)
-			echo >&2 "error: can't convert $s3Arch to an appropriate value for 'uname -m'"
-			exit 1
-			;;
-	esac
-
-	s3Dir="s3://$BUCKET_PATH/builds/$s3Os/$s3Arch"
-	# latest=
-	latestTgz=
-	if [ "$latestBase" ]; then
-		# commented out since we aren't uploading binaries right now.
-		# latest="$s3Dir/$latestBase$binaryExt"
-		# we don't include the $binaryExt because we don't want docker.exe.zip
-		latestTgz="$s3Dir/$latestBase$zipExt"
-	fi
-
-	if [ ! -f "$tgzDir/$tgz" ]; then
-		echo >&2 "error: can't find $tgzDir/$tgz - was it packaged properly?"
-		exit 1
-	fi
-	# disable binary uploads for now. Only providing tgz downloads
-	# upload_release_build "$binDir/$binary" "$s3Dir/$binary" "$latest"
-	upload_release_build "$tgzDir/$tgz" "$s3Dir/$tgz" "$latestTgz"
-}
-
-# Upload binaries and tgz files to S3
-release_binaries() {
-	[ "$(find bundles/$VERSION -path "bundles/$VERSION/cross/*/*/docker-$VERSION")" != "" ] || {
-		echo >&2 './hack/make.sh must be run before release_binaries'
-		exit 1
-	}
-
-	for d in bundles/$VERSION/cross/*/*; do
-		GOARCH="$(basename "$d")"
-		GOOS="$(basename "$(dirname "$d")")"
-		release_build "$GOOS" "$GOARCH"
-	done
-
-	# TODO create redirect from builds/*/i686 to builds/*/i386
-
-	cat <<EOF | write_to_s3 s3://$BUCKET_PATH/builds/index
-# To install, run the following commands as root:
-curl -fsSLO $(s3_url)/builds/Linux/x86_64/docker-$VERSION.tgz && tar --strip-components=1 -xvzf docker-$VERSION.tgz -C /usr/local/bin
-
-# Then start docker in daemon mode:
-/usr/local/bin/dockerd
-EOF
-
-	# Add redirect at /builds/info for URL-backwards-compatibility
-	rm -rf /tmp/emptyfile && touch /tmp/emptyfile
-	$AWS_CLI s3 cp --acl public-read --website-redirect '/builds/' --content-type='text/plain' /tmp/emptyfile "s3://$BUCKET_PATH/builds/info"
-
-	if [ -z "$NOLATEST" ]; then
-		echo "Advertising $VERSION on $BUCKET_PATH as most recent version"
-		echo "$VERSION" | write_to_s3 "s3://$BUCKET_PATH/latest"
-	fi
-}
-
-# Upload the index script
-release_index() {
-	echo "Releasing index"
-	url="$(s3_url)/" hack/make.sh install-script
-	write_to_s3 "s3://$BUCKET_PATH/index" < "bundles/$VERSION/install-script/install.sh"
-}
-
-main() {
-	[ "$SKIP_RELEASE_BUILD" -eq 1 ] || build_all
-	setup_s3
-	release_binaries
-	release_index
-}
-
-main
-
-echo
-echo
-echo "Release complete; see $(s3_url)"
-echo "Use the following text to announce the release:"
-echo
-echo "We have just pushed $VERSION to $(s3_url). You can download it with the following:"
-echo
-echo "Linux 64bit tgz: $(s3_url)/builds/Linux/x86_64/docker-$VERSION.tgz"
-echo "Darwin/OSX 64bit client tgz: $(s3_url)/builds/Darwin/x86_64/docker-$VERSION.tgz"
-echo "Windows 64bit zip: $(s3_url)/builds/Windows/x86_64/docker-$VERSION.zip"
-echo "Windows 32bit client zip: $(s3_url)/builds/Windows/i386/docker-$VERSION.zip"
-echo
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/.swagger-yamllint b/installer/vendor/github.com/docker/docker/hack/validate/.swagger-yamllint
deleted file mode 100644
index 2f00cb666c..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/.swagger-yamllint
+++ /dev/null
@@ -1,4 +0,0 @@
-extends: default
-rules:
-  document-start: disable
-  line-length: disable
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/.validate b/installer/vendor/github.com/docker/docker/hack/validate/.validate
deleted file mode 100644
index defa981865..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/.validate
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-set -e -o pipefail
-
-if [ -z "$VALIDATE_UPSTREAM" ]; then
-	# this is kind of an expensive check, so let's not do this twice if we
-	# are running more than one validate bundlescript
-
-	VALIDATE_REPO='https://github.com/docker/docker.git'
-	VALIDATE_BRANCH='master'
-
-	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
-
-	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
-	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
-
-	VALIDATE_COMMIT_LOG="$VALIDATE_UPSTREAM..$VALIDATE_HEAD"
-	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"
-
-	validate_diff() {
-		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then
-			git diff "$VALIDATE_COMMIT_DIFF" "$@"
-		fi
-	}
-	validate_log() {
-		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then
-			git log "$VALIDATE_COMMIT_LOG" "$@"
-		fi
-	}
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/all b/installer/vendor/github.com/docker/docker/hack/validate/all
deleted file mode 100755
index 308af47263..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/all
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-#
-# Run all validation
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-. $SCRIPTDIR/default
-. $SCRIPTDIR/vendor
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/compose-bindata b/installer/vendor/github.com/docker/docker/hack/validate/compose-bindata
deleted file mode 100755
index f87728259e..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/compose-bindata
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'cli/compose/schema/data' || true) )
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-	go generate github.com/docker/docker/cli/compose/schema 2> /dev/null
-	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- cli/compose/schema 2>/dev/null)"
-	if [ "$diffs" ]; then
-		{
-			echo 'The result of `go generate github.com/docker/docker/cli/compose/schema` differs'
-			echo
-			echo "$diffs"
-			echo
-			echo 'Please run `go generate github.com/docker/docker/cli/compose/schema`'
-		} >&2
-		false
-	else
-		echo 'Congratulations! cli/compose/schema/bindata.go is up-to-date.'
-	fi
-else
-    echo 'No cli/compose/schema/data changes in diff.'
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/dco b/installer/vendor/github.com/docker/docker/hack/validate/dco
deleted file mode 100755
index 754ce8faec..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/dco
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-adds=$(validate_diff --numstat | awk '{ s += $1 } END { print s }')
-dels=$(validate_diff --numstat | awk '{ s += $2 } END { print s }')
-#notDocs="$(validate_diff --numstat | awk '$3 !~ /^docs\// { print $3 }')"
-
-: ${adds:=0}
-: ${dels:=0}
-
-# "Username may only contain alphanumeric characters or dashes and cannot begin with a dash"
-githubUsernameRegex='[a-zA-Z0-9][a-zA-Z0-9-]+'
-
-# https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work
-dcoPrefix='Signed-off-by:'
-dcoRegex="^(Docker-DCO-1.1-)?$dcoPrefix ([^<]+) <([^<>@]+@[^<>]+)>( \\(github: ($githubUsernameRegex)\\))?$"
-
-check_dco() {
-	grep -qE "$dcoRegex"
-}
-
-if [ $adds -eq 0 -a $dels -eq 0 ]; then
-	echo '0 adds, 0 deletions; nothing to validate! :)'
-else
-	commits=( $(validate_log --format='format:%H%n') )
-	badCommits=()
-	for commit in "${commits[@]}"; do
-		if [ -z "$(git log -1 --format='format:' --name-status "$commit")" ]; then
-			# no content (ie, Merge commit, etc)
-			continue
-		fi
-		if ! git log -1 --format='format:%B' "$commit" | check_dco; then
-			badCommits+=( "$commit" )
-		fi
-	done
-	if [ ${#badCommits[@]} -eq 0 ]; then
-		echo "Congratulations!  All commits are properly signed with the DCO!"
-	else
-		{
-			echo "These commits do not have a proper '$dcoPrefix' marker:"
-			for commit in "${badCommits[@]}"; do
-				echo " - $commit"
-			done
-			echo
-			echo 'Please amend each commit to include a properly formatted DCO marker.'
-			echo
-			echo 'Visit the following URL for information about the Docker DCO:'
-			echo ' https://github.com/docker/docker/blob/master/CONTRIBUTING.md#sign-your-work'
-			echo
-		} >&2
-		false
-	fi
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/default b/installer/vendor/github.com/docker/docker/hack/validate/default
deleted file mode 100755
index 29b96ca9a3..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/default
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-#
-# Run default validation, exclude vendor because it's slow
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-. $SCRIPTDIR/dco
-. $SCRIPTDIR/default-seccomp
-. $SCRIPTDIR/gofmt
-. $SCRIPTDIR/lint
-. $SCRIPTDIR/pkg-imports
-. $SCRIPTDIR/swagger
-. $SCRIPTDIR/swagger-gen
-. $SCRIPTDIR/test-imports
-. $SCRIPTDIR/toml
-. $SCRIPTDIR/vet
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/default-seccomp b/installer/vendor/github.com/docker/docker/hack/validate/default-seccomp
deleted file mode 100755
index 8fe8435618..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/default-seccomp
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'profiles/seccomp' || true) )
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-	# We run 'go generate' and see if we have a diff afterwards
-	go generate ./profiles/seccomp/ >/dev/null
-	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- profiles/seccomp 2>/dev/null)"
-	if [ "$diffs" ]; then
-		{
-			echo 'The result of go generate ./profiles/seccomp/ differs'
-			echo
-			echo "$diffs"
-			echo
-			echo 'Please re-run go generate ./profiles/seccomp/'
-			echo
-		} >&2
-		false
-	else
-		echo 'Congratulations! Seccomp profile generation is done correctly.'
-	fi
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/gofmt b/installer/vendor/github.com/docker/docker/hack/validate/gofmt
deleted file mode 100755
index 2040afa09e..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/gofmt
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' |
-    grep -v '^vendor/' |
-    grep -v '^cli/compose/schema/bindata.go' || true) )
-unset IFS
-
-badFiles=()
-for f in "${files[@]}"; do
-	# we use "git show" here to validate that what's committed is formatted
-	if [ "$(git show "$VALIDATE_HEAD:$f" | gofmt -s -l)" ]; then
-		badFiles+=( "$f" )
-	fi
-done
-
-if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  All Go source files are properly formatted.'
-else
-	{
-		echo "These files are not properly gofmt'd:"
-		for f in "${badFiles[@]}"; do
-			echo " - $f"
-		done
-		echo
-		echo 'Please reformat the above files using "gofmt -s -w" and commit the result.'
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/lint b/installer/vendor/github.com/docker/docker/hack/validate/lint
deleted file mode 100755
index 4ac0a33b20..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/lint
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' | grep -v '^cli/compose/schema/bindata.go' || true) )
-unset IFS
-
-errors=()
-for f in "${files[@]}"; do
-	failedLint=$(golint "$f")
-	if [ "$failedLint" ]; then
-		errors+=( "$failedLint" )
-	fi
-done
-
-if [ ${#errors[@]} -eq 0 ]; then
-	echo 'Congratulations!  All Go source files have been linted.'
-else
-	{
-		echo "Errors from golint:"
-		for err in "${errors[@]}"; do
-			echo "$err"
-		done
-		echo
-		echo 'Please fix the above errors. You can test via "golint" and commit the result.'
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/pkg-imports b/installer/vendor/github.com/docker/docker/hack/validate/pkg-imports
deleted file mode 100755
index 9e4ea74da0..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/pkg-imports
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/bash
-set -e
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'pkg/*.go' || true) )
-unset IFS
-
-badFiles=()
-for f in "${files[@]}"; do
-	IFS=$'\n'
-	badImports=( $(go list -e -f '{{ join .Deps "\n" }}' "$f" | sort -u | grep -vE '^github.com/docker/docker/pkg/' | grep -vE '^github.com/docker/docker/vendor' | grep -E '^github.com/docker/docker' || true) )
-	unset IFS
-
-	for import in "${badImports[@]}"; do
-		badFiles+=( "$f imports $import" )
-	done
-done
-
-if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  "./pkg/..." is safely isolated from internal code.'
-else
-	{
-		echo 'These files import internal code: (either directly or indirectly)'
-		for f in "${badFiles[@]}"; do
-			echo " - $f"
-		done
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/swagger b/installer/vendor/github.com/docker/docker/hack/validate/swagger
deleted file mode 100755
index e754fb8cb9..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/swagger
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/swagger.yaml' || true) )
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-  yamllint -c ${SCRIPTDIR}/.swagger-yamllint api/swagger.yaml
-  swagger validate api/swagger.yaml
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/swagger-gen b/installer/vendor/github.com/docker/docker/hack/validate/swagger-gen
deleted file mode 100755
index 008abc7e0d..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/swagger-gen
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'api/types/' 'api/swagger.yaml' || true) )
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-	${SCRIPTDIR}/../generate-swagger-api.sh 2> /dev/null
-	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- api/types/ 2>/dev/null)"
-	if [ "$diffs" ]; then
-		{
-			echo 'The result of hack/generate-swagger-api.sh differs'
-			echo
-			echo "$diffs"
-			echo
-			echo 'Please update api/swagger.yaml with any api changes, then '
-			echo 'run `hack/generate-swagger-api.sh`.'
-		} >&2
-		false
-	else
-		echo 'Congratulations! All api changes are done the right way.'
-	fi
-else
-    echo 'No api/types/ or api/swagger.yaml changes in diff.'
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/test-imports b/installer/vendor/github.com/docker/docker/hack/validate/test-imports
deleted file mode 100755
index 373caa2f29..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/test-imports
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/bin/bash
-# Make sure we're not using gos' Testing package any more in integration-cli
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'integration-cli/*.go' || true) )
-unset IFS
-
-badFiles=()
-for f in "${files[@]}"; do
-	# skip check_test.go since it *does* use the testing package
-	if [ "$f" = "integration-cli/check_test.go" ]; then
-		continue
-	fi
-
-	# we use "git show" here to validate that what's committed doesn't contain golang built-in testing
-	if git show "$VALIDATE_HEAD:$f" | grep -q testing.T; then
-		if [ "$(echo $f | grep '_test')" ]; then
-			# allow testing.T for non- _test files
-			badFiles+=( "$f" )
-		fi
-	fi
-done
-
-if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  No testing.T found.'
-else
-	{
-		echo "These files use the wrong testing infrastructure:"
-		for f in "${badFiles[@]}"; do
-			echo " - $f"
-		done
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/toml b/installer/vendor/github.com/docker/docker/hack/validate/toml
deleted file mode 100755
index a0cb158dbd..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/toml
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'MAINTAINERS' || true) )
-unset IFS
-
-badFiles=()
-for f in "${files[@]}"; do
-	# we use "git show" here to validate that what's committed has valid toml syntax
-	if ! git show "$VALIDATE_HEAD:$f" | tomlv /proc/self/fd/0 ; then
-		badFiles+=( "$f" )
-	fi
-done
-
-if [ ${#badFiles[@]} -eq 0 ]; then
-	echo 'Congratulations!  All toml source files changed here have valid syntax.'
-else
-	{
-		echo "These files are not valid toml:"
-		for f in "${badFiles[@]}"; do
-			echo " - $f"
-		done
-		echo
-		echo 'Please reformat the above files as valid toml'
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/vendor b/installer/vendor/github.com/docker/docker/hack/validate/vendor
deleted file mode 100755
index 0cb5aabdfa..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/vendor
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'vendor.conf' 'vendor/' || true) ) 
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-	# We run vndr to and see if we have a diff afterwards
-	vndr
-	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- vendor 2>/dev/null)"
-	if [ "$diffs" ]; then
-		{
-			echo 'The result of vndr differs'
-			echo
-			echo "$diffs"
-			echo
-			echo 'Please vendor your package with github.com/LK4D4/vndr.'
-			echo
-		} >&2
-		false
-	else
-		echo 'Congratulations! All vendoring changes are done the right way.'
-	fi
-else
-    echo 'No vendor changes in diff.'
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/validate/vet b/installer/vendor/github.com/docker/docker/hack/validate/vet
deleted file mode 100755
index 64760489ea..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/validate/vet
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-export SCRIPTDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "${SCRIPTDIR}/.validate"
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- '*.go' | grep -v '^vendor/' | grep -v '^api/types/container/' || true) )
-unset IFS
-
-errors=()
-for f in "${files[@]}"; do
-	failedVet=$(go vet "$f")
-	if [ "$failedVet" ]; then
-		errors+=( "$failedVet" )
-	fi
-done
-
-
-if [ ${#errors[@]} -eq 0 ]; then
-	echo 'Congratulations!  All Go source files have been vetted.'
-else
-	{
-		echo "Errors from go vet:"
-		for err in "${errors[@]}"; do
-			echo " - $err"
-		done
-		echo
-		echo 'Please fix the above errors. You can test via "go vet" and commit the result.'
-		echo
-	} >&2
-	false
-fi
diff --git a/installer/vendor/github.com/docker/docker/hack/vendor.sh b/installer/vendor/github.com/docker/docker/hack/vendor.sh
deleted file mode 100755
index 9a4d038539..0000000000
--- a/installer/vendor/github.com/docker/docker/hack/vendor.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-# This file is just wrapper around vndr (github.com/LK4D4/vndr) tool.
-# For updating dependencies you should change `vendor.conf` file in root of the
-# project. Please refer to https://github.com/LK4D4/vndr/blob/master/README.md for
-# vndr usage.
-
-set -e
-
-if ! hash vndr; then
-	echo "Please install vndr with \"go get github.com/LK4D4/vndr\" and put it in your \$GOPATH"
-	exit 1
-fi
-
-vndr "$@"
diff --git a/installer/vendor/github.com/docker/docker/image/fs.go b/installer/vendor/github.com/docker/docker/image/fs.go
deleted file mode 100644
index 39cfbf5d74..0000000000
--- a/installer/vendor/github.com/docker/docker/image/fs.go
+++ /dev/null
@@ -1,173 +0,0 @@
-package image
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-// DigestWalkFunc is function called by StoreBackend.Walk
-type DigestWalkFunc func(id digest.Digest) error
-
-// StoreBackend provides interface for image.Store persistence
-type StoreBackend interface {
-	Walk(f DigestWalkFunc) error
-	Get(id digest.Digest) ([]byte, error)
-	Set(data []byte) (digest.Digest, error)
-	Delete(id digest.Digest) error
-	SetMetadata(id digest.Digest, key string, data []byte) error
-	GetMetadata(id digest.Digest, key string) ([]byte, error)
-	DeleteMetadata(id digest.Digest, key string) error
-}
-
-// fs implements StoreBackend using the filesystem.
-type fs struct {
-	sync.RWMutex
-	root string
-}
-
-const (
-	contentDirName  = "content"
-	metadataDirName = "metadata"
-)
-
-// NewFSStoreBackend returns new filesystem based backend for image.Store
-func NewFSStoreBackend(root string) (StoreBackend, error) {
-	return newFSStore(root)
-}
-
-func newFSStore(root string) (*fs, error) {
-	s := &fs{
-		root: root,
-	}
-	if err := os.MkdirAll(filepath.Join(root, contentDirName, string(digest.Canonical)), 0700); err != nil {
-		return nil, err
-	}
-	if err := os.MkdirAll(filepath.Join(root, metadataDirName, string(digest.Canonical)), 0700); err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-func (s *fs) contentFile(dgst digest.Digest) string {
-	return filepath.Join(s.root, contentDirName, string(dgst.Algorithm()), dgst.Hex())
-}
-
-func (s *fs) metadataDir(dgst digest.Digest) string {
-	return filepath.Join(s.root, metadataDirName, string(dgst.Algorithm()), dgst.Hex())
-}
-
-// Walk calls the supplied callback for each image ID in the storage backend.
-func (s *fs) Walk(f DigestWalkFunc) error {
-	// Only Canonical digest (sha256) is currently supported
-	s.RLock()
-	dir, err := ioutil.ReadDir(filepath.Join(s.root, contentDirName, string(digest.Canonical)))
-	s.RUnlock()
-	if err != nil {
-		return err
-	}
-	for _, v := range dir {
-		dgst := digest.NewDigestFromHex(string(digest.Canonical), v.Name())
-		if err := dgst.Validate(); err != nil {
-			logrus.Debugf("Skipping invalid digest %s: %s", dgst, err)
-			continue
-		}
-		if err := f(dgst); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Get returns the content stored under a given digest.
-func (s *fs) Get(dgst digest.Digest) ([]byte, error) {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.get(dgst)
-}
-
-func (s *fs) get(dgst digest.Digest) ([]byte, error) {
-	content, err := ioutil.ReadFile(s.contentFile(dgst))
-	if err != nil {
-		return nil, err
-	}
-
-	// todo: maybe optional
-	if digest.FromBytes(content) != dgst {
-		return nil, fmt.Errorf("failed to verify: %v", dgst)
-	}
-
-	return content, nil
-}
-
-// Set stores content by checksum.
-func (s *fs) Set(data []byte) (digest.Digest, error) {
-	s.Lock()
-	defer s.Unlock()
-
-	if len(data) == 0 {
-		return "", fmt.Errorf("Invalid empty data")
-	}
-
-	dgst := digest.FromBytes(data)
-	if err := ioutils.AtomicWriteFile(s.contentFile(dgst), data, 0600); err != nil {
-		return "", err
-	}
-
-	return dgst, nil
-}
-
-// Delete removes content and metadata files associated with the digest.
-func (s *fs) Delete(dgst digest.Digest) error {
-	s.Lock()
-	defer s.Unlock()
-
-	if err := os.RemoveAll(s.metadataDir(dgst)); err != nil {
-		return err
-	}
-	if err := os.Remove(s.contentFile(dgst)); err != nil {
-		return err
-	}
-	return nil
-}
-
-// SetMetadata sets metadata for a given ID. It fails if there's no base file.
-func (s *fs) SetMetadata(dgst digest.Digest, key string, data []byte) error {
-	s.Lock()
-	defer s.Unlock()
-	if _, err := s.get(dgst); err != nil {
-		return err
-	}
-
-	baseDir := filepath.Join(s.metadataDir(dgst))
-	if err := os.MkdirAll(baseDir, 0700); err != nil {
-		return err
-	}
-	return ioutils.AtomicWriteFile(filepath.Join(s.metadataDir(dgst), key), data, 0600)
-}
-
-// GetMetadata returns metadata for a given digest.
-func (s *fs) GetMetadata(dgst digest.Digest, key string) ([]byte, error) {
-	s.RLock()
-	defer s.RUnlock()
-
-	if _, err := s.get(dgst); err != nil {
-		return nil, err
-	}
-	return ioutil.ReadFile(filepath.Join(s.metadataDir(dgst), key))
-}
-
-// DeleteMetadata removes the metadata associated with a digest.
-func (s *fs) DeleteMetadata(dgst digest.Digest, key string) error {
-	s.Lock()
-	defer s.Unlock()
-
-	return os.RemoveAll(filepath.Join(s.metadataDir(dgst), key))
-}
diff --git a/installer/vendor/github.com/docker/docker/image/fs_test.go b/installer/vendor/github.com/docker/docker/image/fs_test.go
deleted file mode 100644
index 8d602d97eb..0000000000
--- a/installer/vendor/github.com/docker/docker/image/fs_test.go
+++ /dev/null
@@ -1,384 +0,0 @@
-package image
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-)
-
-func TestFSGetSet(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testGetSet(t, fs)
-}
-
-func TestFSGetInvalidData(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id, err := fs.Set([]byte("foobar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dgst := digest.Digest(id)
-
-	if err := ioutil.WriteFile(filepath.Join(tmpdir, contentDirName, string(dgst.Algorithm()), dgst.Hex()), []byte("foobar2"), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = fs.Get(id)
-	if err == nil {
-		t.Fatal("Expected get to fail after data modification.")
-	}
-}
-
-func TestFSInvalidSet(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id := digest.FromBytes([]byte("foobar"))
-	err = os.Mkdir(filepath.Join(tmpdir, contentDirName, string(id.Algorithm()), id.Hex()), 0700)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = fs.Set([]byte("foobar"))
-	if err == nil {
-		t.Fatal("Expecting error from invalid filesystem data.")
-	}
-}
-
-func TestFSInvalidRoot(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	tcases := []struct {
-		root, invalidFile string
-	}{
-		{"root", "root"},
-		{"root", "root/content"},
-		{"root", "root/metadata"},
-	}
-
-	for _, tc := range tcases {
-		root := filepath.Join(tmpdir, tc.root)
-		filePath := filepath.Join(tmpdir, tc.invalidFile)
-		err := os.MkdirAll(filepath.Dir(filePath), 0700)
-		if err != nil {
-			t.Fatal(err)
-		}
-		f, err := os.Create(filePath)
-		if err != nil {
-			t.Fatal(err)
-		}
-		f.Close()
-
-		_, err = NewFSStoreBackend(root)
-		if err == nil {
-			t.Fatalf("Expected error from root %q and invlid file %q", tc.root, tc.invalidFile)
-		}
-
-		os.RemoveAll(root)
-	}
-
-}
-
-func testMetadataGetSet(t *testing.T, store StoreBackend) {
-	id, err := store.Set([]byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	id2, err := store.Set([]byte("bar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tcases := []struct {
-		id    digest.Digest
-		key   string
-		value []byte
-	}{
-		{id, "tkey", []byte("tval1")},
-		{id, "tkey2", []byte("tval2")},
-		{id2, "tkey", []byte("tval3")},
-	}
-
-	for _, tc := range tcases {
-		err = store.SetMetadata(tc.id, tc.key, tc.value)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		actual, err := store.GetMetadata(tc.id, tc.key)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if bytes.Compare(actual, tc.value) != 0 {
-			t.Fatalf("Metadata expected %q, got %q", tc.value, actual)
-		}
-	}
-
-	_, err = store.GetMetadata(id2, "tkey2")
-	if err == nil {
-		t.Fatal("Expected error for getting metadata for unknown key")
-	}
-
-	id3 := digest.FromBytes([]byte("baz"))
-	err = store.SetMetadata(id3, "tkey", []byte("tval"))
-	if err == nil {
-		t.Fatal("Expected error for setting metadata for unknown ID.")
-	}
-
-	_, err = store.GetMetadata(id3, "tkey")
-	if err == nil {
-		t.Fatal("Expected error for getting metadata for unknown ID.")
-	}
-}
-
-func TestFSMetadataGetSet(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testMetadataGetSet(t, fs)
-}
-
-func TestFSDelete(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testDelete(t, fs)
-}
-
-func TestFSWalker(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testWalker(t, fs)
-}
-
-func TestFSInvalidWalker(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	fooID, err := fs.Set([]byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(tmpdir, contentDirName, "sha256/foobar"), []byte("foobar"), 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	n := 0
-	err = fs.Walk(func(id digest.Digest) error {
-		if id != fooID {
-			t.Fatalf("Invalid walker ID %q, expected %q", id, fooID)
-		}
-		n++
-		return nil
-	})
-	if err != nil {
-		t.Fatalf("Invalid data should not have caused walker error, got %v", err)
-	}
-	if n != 1 {
-		t.Fatalf("Expected 1 walk initialization, got %d", n)
-	}
-}
-
-func testGetSet(t *testing.T, store StoreBackend) {
-	type tcase struct {
-		input    []byte
-		expected digest.Digest
-	}
-	tcases := []tcase{
-		{[]byte("foobar"), digest.Digest("sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2")},
-	}
-
-	randomInput := make([]byte, 8*1024)
-	_, err := rand.Read(randomInput)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// skipping use of digest pkg because its used by the implementation
-	h := sha256.New()
-	_, err = h.Write(randomInput)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tcases = append(tcases, tcase{
-		input:    randomInput,
-		expected: digest.Digest("sha256:" + hex.EncodeToString(h.Sum(nil))),
-	})
-
-	for _, tc := range tcases {
-		id, err := store.Set([]byte(tc.input))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if id != tc.expected {
-			t.Fatalf("Expected ID %q, got %q", tc.expected, id)
-		}
-	}
-
-	for _, emptyData := range [][]byte{nil, {}} {
-		_, err := store.Set(emptyData)
-		if err == nil {
-			t.Fatal("Expected error for nil input.")
-		}
-	}
-
-	for _, tc := range tcases {
-		data, err := store.Get(tc.expected)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if bytes.Compare(data, tc.input) != 0 {
-			t.Fatalf("Expected data %q, got %q", tc.input, data)
-		}
-	}
-
-	for _, key := range []digest.Digest{"foobar:abc", "sha256:abc", "sha256:c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2a"} {
-		_, err := store.Get(key)
-		if err == nil {
-			t.Fatalf("Expected error for ID %q.", key)
-		}
-	}
-
-}
-
-func testDelete(t *testing.T, store StoreBackend) {
-	id, err := store.Set([]byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	id2, err := store.Set([]byte("bar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = store.Delete(id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = store.Get(id)
-	if err == nil {
-		t.Fatalf("Expected getting deleted item %q to fail", id)
-	}
-	_, err = store.Get(id2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = store.Delete(id2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = store.Get(id2)
-	if err == nil {
-		t.Fatalf("Expected getting deleted item %q to fail", id2)
-	}
-}
-
-func testWalker(t *testing.T, store StoreBackend) {
-	id, err := store.Set([]byte("foo"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	id2, err := store.Set([]byte("bar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tcases := make(map[digest.Digest]struct{})
-	tcases[id] = struct{}{}
-	tcases[id2] = struct{}{}
-	n := 0
-	err = store.Walk(func(id digest.Digest) error {
-		delete(tcases, id)
-		n++
-		return nil
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != 2 {
-		t.Fatalf("Expected 2 walk initializations, got %d", n)
-	}
-	if len(tcases) != 0 {
-		t.Fatalf("Expected empty unwalked set, got %+v", tcases)
-	}
-
-	// stop on error
-	tcases = make(map[digest.Digest]struct{})
-	tcases[id] = struct{}{}
-	err = store.Walk(func(id digest.Digest) error {
-		return errors.New("")
-	})
-	if err == nil {
-		t.Fatalf("Exected error from walker.")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/image/image.go b/installer/vendor/github.com/docker/docker/image/image.go
deleted file mode 100644
index 29a990a556..0000000000
--- a/installer/vendor/github.com/docker/docker/image/image.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package image
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"time"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types/container"
-)
-
-// ID is the content-addressable ID of an image.
-type ID digest.Digest
-
-func (id ID) String() string {
-	return id.Digest().String()
-}
-
-// Digest converts ID into a digest
-func (id ID) Digest() digest.Digest {
-	return digest.Digest(id)
-}
-
-// IDFromDigest creates an ID from a digest
-func IDFromDigest(digest digest.Digest) ID {
-	return ID(digest)
-}
-
-// V1Image stores the V1 image configuration.
-type V1Image struct {
-	// ID a unique 64 character identifier of the image
-	ID string `json:"id,omitempty"`
-	// Parent id of the image
-	Parent string `json:"parent,omitempty"`
-	// Comment user added comment
-	Comment string `json:"comment,omitempty"`
-	// Created timestamp when image was created
-	Created time.Time `json:"created"`
-	// Container is the id of the container used to commit
-	Container string `json:"container,omitempty"`
-	// ContainerConfig is the configuration of the container that is committed into the image
-	ContainerConfig container.Config `json:"container_config,omitempty"`
-	// DockerVersion specifies version on which image is built
-	DockerVersion string `json:"docker_version,omitempty"`
-	// Author of the image
-	Author string `json:"author,omitempty"`
-	// Config is the configuration of the container received from the client
-	Config *container.Config `json:"config,omitempty"`
-	// Architecture is the hardware that the image is build and runs on
-	Architecture string `json:"architecture,omitempty"`
-	// OS is the operating system used to build and run the image
-	OS string `json:"os,omitempty"`
-	// Size is the total size of the image including all layers it is composed of
-	Size int64 `json:",omitempty"`
-}
-
-// Image stores the image configuration
-type Image struct {
-	V1Image
-	Parent     ID        `json:"parent,omitempty"`
-	RootFS     *RootFS   `json:"rootfs,omitempty"`
-	History    []History `json:"history,omitempty"`
-	OSVersion  string    `json:"os.version,omitempty"`
-	OSFeatures []string  `json:"os.features,omitempty"`
-
-	// rawJSON caches the immutable JSON associated with this image.
-	rawJSON []byte
-
-	// computedID is the ID computed from the hash of the image config.
-	// Not to be confused with the legacy V1 ID in V1Image.
-	computedID ID
-}
-
-// RawJSON returns the immutable JSON associated with the image.
-func (img *Image) RawJSON() []byte {
-	return img.rawJSON
-}
-
-// ID returns the image's content-addressable ID.
-func (img *Image) ID() ID {
-	return img.computedID
-}
-
-// ImageID stringifies ID.
-func (img *Image) ImageID() string {
-	return img.ID().String()
-}
-
-// RunConfig returns the image's container config.
-func (img *Image) RunConfig() *container.Config {
-	return img.Config
-}
-
-// MarshalJSON serializes the image to JSON. It sorts the top-level keys so
-// that JSON that's been manipulated by a push/pull cycle with a legacy
-// registry won't end up with a different key order.
-func (img *Image) MarshalJSON() ([]byte, error) {
-	type MarshalImage Image
-
-	pass1, err := json.Marshal(MarshalImage(*img))
-	if err != nil {
-		return nil, err
-	}
-
-	var c map[string]*json.RawMessage
-	if err := json.Unmarshal(pass1, &c); err != nil {
-		return nil, err
-	}
-	return json.Marshal(c)
-}
-
-// History stores build commands that were used to create an image
-type History struct {
-	// Created timestamp for build point
-	Created time.Time `json:"created"`
-	// Author of the build point
-	Author string `json:"author,omitempty"`
-	// CreatedBy keeps the Dockerfile command used while building image.
-	CreatedBy string `json:"created_by,omitempty"`
-	// Comment is custom message set by the user when creating the image.
-	Comment string `json:"comment,omitempty"`
-	// EmptyLayer is set to true if this history item did not generate a
-	// layer. Otherwise, the history item is associated with the next
-	// layer in the RootFS section.
-	EmptyLayer bool `json:"empty_layer,omitempty"`
-}
-
-// Exporter provides interface for exporting and importing images
-type Exporter interface {
-	Load(io.ReadCloser, io.Writer, bool) error
-	// TODO: Load(net.Context, io.ReadCloser, <- chan StatusMessage) error
-	Save([]string, io.Writer) error
-}
-
-// NewFromJSON creates an Image configuration from json.
-func NewFromJSON(src []byte) (*Image, error) {
-	img := &Image{}
-
-	if err := json.Unmarshal(src, img); err != nil {
-		return nil, err
-	}
-	if img.RootFS == nil {
-		return nil, errors.New("Invalid image JSON, no RootFS key.")
-	}
-
-	img.rawJSON = src
-
-	return img, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/image/image_test.go b/installer/vendor/github.com/docker/docker/image/image_test.go
deleted file mode 100644
index 525023b813..0000000000
--- a/installer/vendor/github.com/docker/docker/image/image_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package image
-
-import (
-	"encoding/json"
-	"sort"
-	"strings"
-	"testing"
-)
-
-const sampleImageJSON = `{
-	"architecture": "amd64",
-	"os": "linux",
-	"config": {},
-	"rootfs": {
-		"type": "layers",
-		"diff_ids": []
-	}
-}`
-
-func TestJSON(t *testing.T) {
-	img, err := NewFromJSON([]byte(sampleImageJSON))
-	if err != nil {
-		t.Fatal(err)
-	}
-	rawJSON := img.RawJSON()
-	if string(rawJSON) != sampleImageJSON {
-		t.Fatalf("Raw JSON of config didn't match: expected %+v, got %v", sampleImageJSON, rawJSON)
-	}
-}
-
-func TestInvalidJSON(t *testing.T) {
-	_, err := NewFromJSON([]byte("{}"))
-	if err == nil {
-		t.Fatal("Expected JSON parse error")
-	}
-}
-
-func TestMarshalKeyOrder(t *testing.T) {
-	b, err := json.Marshal(&Image{
-		V1Image: V1Image{
-			Comment:      "a",
-			Author:       "b",
-			Architecture: "c",
-		},
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedOrder := []string{"architecture", "author", "comment"}
-	var indexes []int
-	for _, k := range expectedOrder {
-		indexes = append(indexes, strings.Index(string(b), k))
-	}
-
-	if !sort.IntsAreSorted(indexes) {
-		t.Fatal("invalid key order in JSON: ", string(b))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/image/rootfs.go b/installer/vendor/github.com/docker/docker/image/rootfs.go
deleted file mode 100644
index 7b24e3ed1e..0000000000
--- a/installer/vendor/github.com/docker/docker/image/rootfs.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package image
-
-import (
-	"runtime"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/layer"
-)
-
-// TypeLayers is used for RootFS.Type for filesystems organized into layers.
-const TypeLayers = "layers"
-
-// typeLayersWithBase is an older format used by Windows up to v1.12. We
-// explicitly handle this as an error case to ensure that a daemon which still
-// has an older image like this on disk can still start, even though the
-// image itself is not usable. See https://github.com/docker/docker/pull/25806.
-const typeLayersWithBase = "layers+base"
-
-// RootFS describes images root filesystem
-// This is currently a placeholder that only supports layers. In the future
-// this can be made into an interface that supports different implementations.
-type RootFS struct {
-	Type    string         `json:"type"`
-	DiffIDs []layer.DiffID `json:"diff_ids,omitempty"`
-}
-
-// NewRootFS returns empty RootFS struct
-func NewRootFS() *RootFS {
-	return &RootFS{Type: TypeLayers}
-}
-
-// Append appends a new diffID to rootfs
-func (r *RootFS) Append(id layer.DiffID) {
-	r.DiffIDs = append(r.DiffIDs, id)
-}
-
-// ChainID returns the ChainID for the top layer in RootFS.
-func (r *RootFS) ChainID() layer.ChainID {
-	if runtime.GOOS == "windows" && r.Type == typeLayersWithBase {
-		logrus.Warnf("Layer type is unsupported on this platform. DiffIDs: '%v'", r.DiffIDs)
-		return ""
-	}
-	return layer.CreateChainID(r.DiffIDs)
-}
diff --git a/installer/vendor/github.com/docker/docker/image/spec/v1.1.md b/installer/vendor/github.com/docker/docker/image/spec/v1.1.md
deleted file mode 100644
index 83f138011d..0000000000
--- a/installer/vendor/github.com/docker/docker/image/spec/v1.1.md
+++ /dev/null
@@ -1,637 +0,0 @@
-# Docker Image Specification v1.1.0
-
-An *Image* is an ordered collection of root filesystem changes and the
-corresponding execution parameters for use within a container runtime. This
-specification outlines the format of these filesystem changes and corresponding
-parameters and describes how to create and use them for use with a container
-runtime and execution tool.
-
-This version of the image specification was adopted starting in Docker 1.10.
-
-## Terminology
-
-This specification uses the following terms:
-
-<dl>
-    <dt>
-        Layer
-    </dt>
-    <dd>
-        Images are composed of <i>layers</i>. Each layer is a set of filesystem
-        changes. Layers do not have configuration metadata such as environment
-        variables or default arguments - these are properties of the image as a
-        whole rather than any particular layer.
-    </dd>
-    <dt>
-        Image JSON
-    </dt>
-    <dd>
-        Each image has an associated JSON structure which describes some
-        basic information about the image such as date created, author, and the
-        ID of its parent image as well as execution/runtime configuration like
-        its entry point, default arguments, CPU/memory shares, networking, and
-        volumes. The JSON structure also references a cryptographic hash of
-        each layer used by the image, and provides history information for
-        those layers. This JSON is considered to be immutable, because changing
-        it would change the computed ImageID. Changing it means creating a new
-        derived image, instead of changing the existing image.
-    </dd>
-    <dt>
-        Image Filesystem Changeset
-    </dt>
-    <dd>
-        Each layer has an archive of the files which have been added, changed,
-        or deleted relative to its parent layer. Using a layer-based or union
-        filesystem such as AUFS, or by computing the diff from filesystem
-        snapshots, the filesystem changeset can be used to present a series of
-        image layers as if they were one cohesive filesystem.
-    </dd>
-    <dt>
-        Layer DiffID
-    </dt>
-    <dd>
-        Layers are referenced by cryptographic hashes of their serialized
-        representation. This is a SHA256 digest over the tar archive used to
-        transport the layer, represented as a hexadecimal encoding of 256 bits, e.g.,
-        <code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
-        Layers must be packed and unpacked reproducibly to avoid changing the
-        layer ID, for example by using tar-split to save the tar headers. Note
-        that the digest used as the layer ID is taken over an uncompressed
-        version of the tar.
-    </dd>
-    <dt>
-        Layer ChainID
-    </dt>
-    <dd>
-        For convenience, it is sometimes useful to refer to a stack of layers
-        with a single identifier. This is called a <code>ChainID</code>. For a
-        single layer (or the layer at the bottom of a stack), the
-        <code>ChainID</code> is equal to the layer's <code>DiffID</code>.
-        Otherwise the <code>ChainID</code> is given by the formula:
-        <code>ChainID(layerN) = SHA256hex(ChainID(layerN-1) + " " + DiffID(layerN))</code>.
-    </dd>
-    <dt>
-        ImageID <a name="id_desc"></a>
-    </dt>
-    <dd>
-        Each image's ID is given by the SHA256 hash of its configuration JSON. It is 
-        represented as a hexadecimal encoding of 256 bits, e.g.,
-        <code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
-        Since the configuration JSON that gets hashed references hashes of each
-        layer in the image, this formulation of the ImageID makes images
-        content-addressable.
-    </dd>
-    <dt>
-        Tag
-    </dt>
-    <dd>
-        A tag serves to map a descriptive, user-given name to any single image
-        ID. Tag values are limited to the set of characters
-        <code>[a-zA-Z0-9_.-]</code>, except they may not start with a <code>.</code>
-        or <code>-</code> character. Tags are limited to 127 characters.
-    </dd>
-    <dt>
-        Repository
-    </dt>
-    <dd>
-        A collection of tags grouped under a common prefix (the name component
-        before <code>:</code>). For example, in an image tagged with the name
-        <code>my-app:3.1.4</code>, <code>my-app</code> is the <i>Repository</i>
-        component of the name. A repository name is made up of slash-separated
-        name components, optionally prefixed by a DNS hostname. The hostname
-        must follow comply with standard DNS rules, but may not contain
-        <code>_</code> characters. If a hostname is present, it may optionally
-        be followed by a port number in the format <code>:8080</code>.
-        Name components may contain lowercase characters, digits, and
-        separators. A separator is defined as a period, one or two underscores,
-        or one or more dashes. A name component may not start or end with
-        a separator.
-    </dd>
-</dl>
-
-## Image JSON Description
-
-Here is an example image JSON file:
-
-```
-{  
-    "created": "2015-10-31T22:22:56.015925234Z",
-    "author": "Alyssa P. Hacker &ltalyspdev@example.com&gt",
-    "architecture": "amd64",
-    "os": "linux",
-    "config": {
-        "User": "alice",
-        "Memory": 2048,
-        "MemorySwap": 4096,
-        "CpuShares": 8,
-        "ExposedPorts": {  
-            "8080/tcp": {}
-        },
-        "Env": [  
-            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-            "FOO=docker_is_a_really",
-            "BAR=great_tool_you_know"
-        ],
-        "Entrypoint": [
-            "/bin/my-app-binary"
-        ],
-        "Cmd": [
-            "--foreground",
-            "--config",
-            "/etc/my-app.d/default.cfg"
-        ],
-        "Volumes": {
-            "/var/job-result-data": {},
-            "/var/log/my-app-logs": {},
-        },
-        "WorkingDir": "/home/alice",
-    },
-    "rootfs": {
-      "diff_ids": [
-        "sha256:c6f988f4874bb0add23a778f753c65efe992244e148a1d2ec2a8b664fb66bbd1",
-        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-      ],
-      "type": "layers"
-    },
-    "history": [
-      {
-        "created": "2015-10-31T22:22:54.690851953Z",
-        "created_by": "/bin/sh -c #(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"
-      },
-      {
-        "created": "2015-10-31T22:22:55.613815829Z",
-        "created_by": "/bin/sh -c #(nop) CMD [\"sh\"]",
-        "empty_layer": true
-      }
-    ]
-}
-```
-
-Note that image JSON files produced by Docker don't contain formatting
-whitespace. It has been added to this example for clarity.
-
-### Image JSON Field Descriptions
-
-<dl>
-    <dt>
-        created <code>string</code>
-    </dt>
-    <dd>
-        ISO-8601 formatted combined date and time at which the image was
-        created.
-    </dd>
-    <dt>
-        author <code>string</code>
-    </dt>
-    <dd>
-        Gives the name and/or email address of the person or entity which
-        created and is responsible for maintaining the image.
-    </dd>
-    <dt>
-        architecture <code>string</code>
-    </dt>
-    <dd>
-        The CPU architecture which the binaries in this image are built to run
-        on. Possible values include:
-        <ul>
-            <li>386</li>
-            <li>amd64</li>
-            <li>arm</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        os <code>string</code>
-    </dt>
-    <dd>
-        The name of the operating system which the image is built to run on.
-        Possible values include:
-        <ul>
-            <li>darwin</li>
-            <li>freebsd</li>
-            <li>linux</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        config <code>struct</code>
-    </dt>
-    <dd>
-        The execution parameters which should be used as a base when running a
-        container using the image. This field can be <code>null</code>, in
-        which case any execution parameters should be specified at creation of
-        the container.
-
-        <h4>Container RunConfig Field Descriptions</h4>
-
-        <dl>
-            <dt>
-                User <code>string</code>
-            </dt>
-            <dd>
-                <p>The username or UID which the process in the container should
-                run as. This acts as a default value to use when the value is
-                not specified when creating a container.</p>
-
-                <p>All of the following are valid:</p>
-
-                <ul>
-                    <li><code>user</code></li>
-                    <li><code>uid</code></li>
-                    <li><code>user:group</code></li>
-                    <li><code>uid:gid</code></li>
-                    <li><code>uid:group</code></li>
-                    <li><code>user:gid</code></li>
-                </ul>
-
-                <p>If <code>group</code>/<code>gid</code> is not specified, the
-                default group and supplementary groups of the given
-                <code>user</code>/<code>uid</code> in <code>/etc/passwd</code>
-                from the container are applied.</p>
-            </dd>
-            <dt>
-                Memory <code>integer</code>
-            </dt>
-            <dd>
-                Memory limit (in bytes). This acts as a default value to use
-                when the value is not specified when creating a container.
-            </dd>
-            <dt>
-                MemorySwap <code>integer</code>
-            </dt>
-            <dd>
-                Total memory usage (memory + swap); set to <code>-1</code> to
-                disable swap. This acts as a default value to use when the
-                value is not specified when creating a container.
-            </dd>
-            <dt>
-                CpuShares <code>integer</code>
-            </dt>
-            <dd>
-                CPU shares (relative weight vs. other containers). This acts as
-                a default value to use when the value is not specified when
-                creating a container.
-            </dd>
-            <dt>
-                ExposedPorts <code>struct</code>
-            </dt>
-            <dd>
-                A set of ports to expose from a container running this image.
-                This JSON structure value is unusual because it is a direct
-                JSON serialization of the Go type
-                <code>map[string]struct{}</code> and is represented in JSON as
-                an object mapping its keys to an empty object. Here is an
-                example:
-
-<pre>{
-    "8080": {},
-    "53/udp": {},
-    "2356/tcp": {}
-}</pre>
-
-                Its keys can be in the format of:
-                <ul>
-                    <li>
-                        <code>"port/tcp"</code>
-                    </li>
-                    <li>
-                        <code>"port/udp"</code>
-                    </li>
-                    <li>
-                        <code>"port"</code>
-                    </li>
-                </ul>
-                with the default protocol being <code>"tcp"</code> if not
-                specified.
-
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Env <code>array of strings</code>
-            </dt>
-            <dd>
-                Entries are in the format of <code>VARNAME="var value"</code>.
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Entrypoint <code>array of strings</code>
-            </dt>
-            <dd>
-                A list of arguments to use as the command to execute when the
-                container starts. This value acts as a  default and is replaced
-                by an entrypoint specified when creating a container.
-            </dd>
-            <dt>
-                Cmd <code>array of strings</code>
-            </dt>
-            <dd>
-                Default arguments to the entry point of the container. These
-                values act as defaults and are replaced with any specified when
-                creating a container. If an <code>Entrypoint</code> value is
-                not specified, then the first entry of the <code>Cmd</code>
-                array should be interpreted as the executable to run.
-            </dd>
-            <dt>
-                Volumes <code>struct</code>
-            </dt>
-            <dd>
-                A set of directories which should be created as data volumes in
-                a container running this image. This JSON structure value is
-                unusual because it is a direct JSON serialization of the Go
-                type <code>map[string]struct{}</code> and is represented in
-                JSON as an object mapping its keys to an empty object. Here is
-                an example:
-<pre>{
-    "/var/my-app-data/": {},
-    "/etc/some-config.d/": {},
-}</pre>
-            </dd>
-            <dt>
-                WorkingDir <code>string</code>
-            </dt>
-            <dd>
-                Sets the current working directory of the entry point process
-                in the container. This value acts as a default and is replaced
-                by a working directory specified when creating a container.
-            </dd>
-        </dl>
-    </dd>
-    <dt>
-        rootfs <code>struct</code>
-    </dt>
-    <dd>
-        The rootfs key references the layer content addresses used by the
-        image. This makes the image config hash depend on the filesystem hash.
-        rootfs has two subkeys:
-
-        <ul>
-          <li>
-            <code>type</code> is usually set to <code>layers</code>.
-          </li>
-          <li>
-            <code>diff_ids</code> is an array of layer content hashes (<code>DiffIDs</code>), in order from bottom-most to top-most.
-          </li>
-        </ul>
-
-
-        Here is an example rootfs section:
-
-<pre>"rootfs": {
-  "diff_ids": [
-    "sha256:c6f988f4874bb0add23a778f753c65efe992244e148a1d2ec2a8b664fb66bbd1",
-    "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
-    "sha256:13f53e08df5a220ab6d13c58b2bf83a59cbdc2e04d0a3f041ddf4b0ba4112d49"
-  ],
-  "type": "layers"
-}</pre>
-    </dd>
-    <dt>
-        history <code>struct</code>
-    </dt>
-    <dd>
-        <code>history</code> is an array of objects describing the history of
-        each layer. The array is ordered from bottom-most layer to top-most
-        layer. The object has the following fields.
-
-        <ul>
-          <li>
-            <code>created</code>: Creation time, expressed as a ISO-8601 formatted
-            combined date and time
-          </li>
-          <li>
-            <code>author</code>: The author of the build point
-          </li>
-          <li>
-            <code>created_by</code>: The command which created the layer
-          </li>
-          <li>
-            <code>comment</code>: A custom message set when creating the layer
-          </li>
-          <li>
-            <code>empty_layer</code>: This field is used to mark if the history
-            item created a filesystem diff. It is set to true if this history
-            item doesn't correspond to an actual layer in the rootfs section
-            (for example, a command like ENV which results in no change to the
-            filesystem).
-          </li>
-        </ul>
-
-Here is an example history section:
-
-<pre>"history": [
-  {
-    "created": "2015-10-31T22:22:54.690851953Z",
-    "created_by": "/bin/sh -c #(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"
-  },
-  {
-    "created": "2015-10-31T22:22:55.613815829Z",
-    "created_by": "/bin/sh -c #(nop) CMD [\"sh\"]",
-    "empty_layer": true
-  }
-]</pre>
-    </dd>
-</dl>
-
-Any extra fields in the Image JSON struct are considered implementation
-specific and should be ignored by any implementations which are unable to
-interpret them.
-
-## Creating an Image Filesystem Changeset
-
-An example of creating an Image Filesystem Changeset follows.
-
-An image root filesystem is first created as an empty directory. Here is the
-initial empty directory structure for the a changeset using the
-randomly-generated directory name `c3167915dc9d` ([actual layer DiffIDs are
-generated based on the content](#id_desc)).
-
-```
-c3167915dc9d/
-```
-
-Files and directories are then created:
-
-```
-c3167915dc9d/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-The `c3167915dc9d` directory is then committed as a plain Tar archive with
-entries for the following files:
-
-```
-etc/my-app-config
-bin/my-app-binary
-bin/my-app-tools
-```
-
-To make changes to the filesystem of this container image, create a new
-directory, such as `f60c56784b83`, and initialize it with a snapshot of the
-parent image's root filesystem, so that the directory is identical to that
-of `c3167915dc9d`. NOTE: a copy-on-write or union filesystem can make this very
-efficient:
-
-```
-f60c56784b83/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This example change is going add a configuration directory at `/etc/my-app.d`
-which contains a default config file. There's also a change to the
-`my-app-tools` binary to handle the config layout change. The `f60c56784b83`
-directory then looks like this:
-
-```
-f60c56784b83/
-    etc/
-        my-app.d/
-            default.cfg
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This reflects the removal of `/etc/my-app-config` and creation of a file and
-directory at `/etc/my-app.d/default.cfg`. `/bin/my-app-tools` has also been
-replaced with an updated version. Before committing this directory to a
-changeset, because it has a parent image, it is first compared with the
-directory tree of the parent snapshot, `f60c56784b83`, looking for files and
-directories that have been added, modified, or removed. The following changeset
-is found:
-
-```
-Added:      /etc/my-app.d/default.cfg
-Modified:   /bin/my-app-tools
-Deleted:    /etc/my-app-config
-```
-
-A Tar Archive is then created which contains *only* this changeset: The added
-and modified files and directories in their entirety, and for each deleted item
-an entry for an empty file at the same location but with the basename of the
-deleted file or directory prefixed with `.wh.`. The filenames prefixed with
-`.wh.` are known as "whiteout" files. NOTE: For this reason, it is not possible
-to create an image root filesystem which contains a file or directory with a
-name beginning with `.wh.`. The resulting Tar archive for `f60c56784b83` has
-the following entries:
-
-```
-/etc/my-app.d/default.cfg
-/bin/my-app-tools
-/etc/.wh.my-app-config
-```
-
-Any given image is likely to be composed of several of these Image Filesystem
-Changeset tar archives.
-
-## Combined Image JSON + Filesystem Changeset Format
-
-There is also a format for a single archive which contains complete information
-about an image, including:
-
- - repository names/tags
- - image configuration JSON file
- - all tar archives of each layer filesystem changesets
-
-For example, here's what the full archive of `library/busybox` is (displayed in
-`tree` format):
-
-```
-.
-├── 47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb.json
-├── 5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── a65da33792c5187473faa80fa3e1b975acba06712852d1dea860692ccddf3198
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── manifest.json
-└── repositories
-```
-
-There is a directory for each layer in the image. Each directory is named with
-a 64 character hex name that is deterministically generated from the layer
-information. These names are not necessarily layer DiffIDs or ChainIDs. Each of
-these directories contains 3 files:
-
- * `VERSION` - The schema version of the `json` file
- * `json` - The legacy JSON metadata for an image layer. In this version of
-    the image specification, layers don't have JSON metadata, but in
-    [version 1](v1.md), they did. A file is created for each layer in the
-    v1 format for backward compatibility.
- * `layer.tar` - The Tar archive of the filesystem changeset for an image
-   layer.
-
-Note that this directory layout is only important for backward compatibility.
-Current implementations use the paths specified in `manifest.json`.
-
-The content of the `VERSION` files is simply the semantic version of the JSON
-metadata schema:
-
-```
-1.0
-```
-
-The `repositories` file is another JSON file which describes names/tags:
-
-```
-{  
-    "busybox":{  
-        "latest":"5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a"
-    }
-}
-```
-
-Every key in this object is the name of a repository, and maps to a collection
-of tag suffixes. Each tag maps to the ID of the image represented by that tag.
-This file is only used for backwards compatibility. Current implementations use
-the `manifest.json` file instead.
-
-The `manifest.json` file provides the image JSON for the top-level image, and
-optionally for parent images that this image was derived from. It consists of
-an array of metadata entries:
-
-```
-[
-  {
-    "Config": "47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb.json",
-    "RepoTags": ["busybox:latest"],
-    "Layers": [
-      "a65da33792c5187473faa80fa3e1b975acba06712852d1dea860692ccddf3198/layer.tar",
-      "5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a/layer.tar"
-    ]
-  }
-]
-```
-
-There is an entry in the array for each image.
-
-The `Config` field references another file in the tar which includes the image
-JSON for this image.
-
-The `RepoTags` field lists references pointing to this image.
-
-The `Layers` field points to the filesystem changeset tars.
-
-An optional `Parent` field references the imageID of the parent image. This
-parent must be part of the same `manifest.json` file.
-
-This file shouldn't be confused with the distribution manifest, used to push
-and pull images.
-
-Generally, implementations that support this version of the spec will use
-the `manifest.json` file if available, and older implementations will use the
-legacy `*/json` files and `repositories`.
diff --git a/installer/vendor/github.com/docker/docker/image/spec/v1.2.md b/installer/vendor/github.com/docker/docker/image/spec/v1.2.md
deleted file mode 100644
index 6c641cafec..0000000000
--- a/installer/vendor/github.com/docker/docker/image/spec/v1.2.md
+++ /dev/null
@@ -1,696 +0,0 @@
-# Docker Image Specification v1.2.0
-
-An *Image* is an ordered collection of root filesystem changes and the
-corresponding execution parameters for use within a container runtime. This
-specification outlines the format of these filesystem changes and corresponding
-parameters and describes how to create and use them for use with a container
-runtime and execution tool.
-
-This version of the image specification was adopted starting in Docker 1.12.
-
-## Terminology
-
-This specification uses the following terms:
-
-<dl>
-    <dt>
-        Layer
-    </dt>
-    <dd>
-        Images are composed of <i>layers</i>. Each layer is a set of filesystem
-        changes. Layers do not have configuration metadata such as environment
-        variables or default arguments - these are properties of the image as a
-        whole rather than any particular layer.
-    </dd>
-    <dt>
-        Image JSON
-    </dt>
-    <dd>
-        Each image has an associated JSON structure which describes some
-        basic information about the image such as date created, author, and the
-        ID of its parent image as well as execution/runtime configuration like
-        its entry point, default arguments, CPU/memory shares, networking, and
-        volumes. The JSON structure also references a cryptographic hash of
-        each layer used by the image, and provides history information for
-        those layers. This JSON is considered to be immutable, because changing
-        it would change the computed ImageID. Changing it means creating a new
-        derived image, instead of changing the existing image.
-    </dd>
-    <dt>
-        Image Filesystem Changeset
-    </dt>
-    <dd>
-        Each layer has an archive of the files which have been added, changed,
-        or deleted relative to its parent layer. Using a layer-based or union
-        filesystem such as AUFS, or by computing the diff from filesystem
-        snapshots, the filesystem changeset can be used to present a series of
-        image layers as if they were one cohesive filesystem.
-    </dd>
-    <dt>
-        Layer DiffID
-    </dt>
-    <dd>
-        Layers are referenced by cryptographic hashes of their serialized
-        representation. This is a SHA256 digest over the tar archive used to
-        transport the layer, represented as a hexadecimal encoding of 256 bits, e.g.,
-        <code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
-        Layers must be packed and unpacked reproducibly to avoid changing the
-        layer ID, for example by using tar-split to save the tar headers. Note
-        that the digest used as the layer ID is taken over an uncompressed
-        version of the tar.
-    </dd>
-    <dt>
-        Layer ChainID
-    </dt>
-    <dd>
-        For convenience, it is sometimes useful to refer to a stack of layers
-        with a single identifier. This is called a <code>ChainID</code>. For a
-        single layer (or the layer at the bottom of a stack), the
-        <code>ChainID</code> is equal to the layer's <code>DiffID</code>.
-        Otherwise the <code>ChainID</code> is given by the formula:
-        <code>ChainID(layerN) = SHA256hex(ChainID(layerN-1) + " " + DiffID(layerN))</code>.
-    </dd>
-    <dt>
-        ImageID <a name="id_desc"></a>
-    </dt>
-    <dd>
-        Each image's ID is given by the SHA256 hash of its configuration JSON. It is 
-        represented as a hexadecimal encoding of 256 bits, e.g.,
-        <code>sha256:a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
-        Since the configuration JSON that gets hashed references hashes of each
-        layer in the image, this formulation of the ImageID makes images
-        content-addressable.
-    </dd>
-    <dt>
-        Tag
-    </dt>
-    <dd>
-        A tag serves to map a descriptive, user-given name to any single image
-        ID. Tag values are limited to the set of characters
-        <code>[a-zA-Z0-9_.-]</code>, except they may not start with a <code>.</code>
-        or <code>-</code> character. Tags are limited to 127 characters.
-    </dd>
-    <dt>
-        Repository
-    </dt>
-    <dd>
-        A collection of tags grouped under a common prefix (the name component
-        before <code>:</code>). For example, in an image tagged with the name
-        <code>my-app:3.1.4</code>, <code>my-app</code> is the <i>Repository</i>
-        component of the name. A repository name is made up of slash-separated
-        name components, optionally prefixed by a DNS hostname. The hostname
-        must follow comply with standard DNS rules, but may not contain
-        <code>_</code> characters. If a hostname is present, it may optionally
-        be followed by a port number in the format <code>:8080</code>.
-        Name components may contain lowercase characters, digits, and
-        separators. A separator is defined as a period, one or two underscores,
-        or one or more dashes. A name component may not start or end with
-        a separator.
-    </dd>
-</dl>
-
-## Image JSON Description
-
-Here is an example image JSON file:
-
-```
-{  
-    "created": "2015-10-31T22:22:56.015925234Z",
-    "author": "Alyssa P. Hacker &ltalyspdev@example.com&gt",
-    "architecture": "amd64",
-    "os": "linux",
-    "config": {
-        "User": "alice",
-        "Memory": 2048,
-        "MemorySwap": 4096,
-        "CpuShares": 8,
-        "ExposedPorts": {  
-            "8080/tcp": {}
-        },
-        "Env": [  
-            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-            "FOO=docker_is_a_really",
-            "BAR=great_tool_you_know"
-        ],
-        "Entrypoint": [
-            "/bin/my-app-binary"
-        ],
-        "Cmd": [
-            "--foreground",
-            "--config",
-            "/etc/my-app.d/default.cfg"
-        ],
-        "Volumes": {
-            "/var/job-result-data": {},
-            "/var/log/my-app-logs": {},
-        },
-        "WorkingDir": "/home/alice",
-    },
-    "rootfs": {
-      "diff_ids": [
-        "sha256:c6f988f4874bb0add23a778f753c65efe992244e148a1d2ec2a8b664fb66bbd1",
-        "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"
-      ],
-      "type": "layers"
-    },
-    "history": [
-      {
-        "created": "2015-10-31T22:22:54.690851953Z",
-        "created_by": "/bin/sh -c #(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"
-      },
-      {
-        "created": "2015-10-31T22:22:55.613815829Z",
-        "created_by": "/bin/sh -c #(nop) CMD [\"sh\"]",
-        "empty_layer": true
-      }
-    ]
-}
-```
-
-Note that image JSON files produced by Docker don't contain formatting
-whitespace. It has been added to this example for clarity.
-
-### Image JSON Field Descriptions
-
-<dl>
-    <dt>
-        created <code>string</code>
-    </dt>
-    <dd>
-        ISO-8601 formatted combined date and time at which the image was
-        created.
-    </dd>
-    <dt>
-        author <code>string</code>
-    </dt>
-    <dd>
-        Gives the name and/or email address of the person or entity which
-        created and is responsible for maintaining the image.
-    </dd>
-    <dt>
-        architecture <code>string</code>
-    </dt>
-    <dd>
-        The CPU architecture which the binaries in this image are built to run
-        on. Possible values include:
-        <ul>
-            <li>386</li>
-            <li>amd64</li>
-            <li>arm</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        os <code>string</code>
-    </dt>
-    <dd>
-        The name of the operating system which the image is built to run on.
-        Possible values include:
-        <ul>
-            <li>darwin</li>
-            <li>freebsd</li>
-            <li>linux</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        config <code>struct</code>
-    </dt>
-    <dd>
-        The execution parameters which should be used as a base when running a
-        container using the image. This field can be <code>null</code>, in
-        which case any execution parameters should be specified at creation of
-        the container.
-
-        <h4>Container RunConfig Field Descriptions</h4>
-
-        <dl>
-            <dt>
-                User <code>string</code>
-            </dt>
-            <dd>
-                <p>The username or UID which the process in the container should
-                run as. This acts as a default value to use when the value is
-                not specified when creating a container.</p>
-
-                <p>All of the following are valid:</p>
-
-                <ul>
-                    <li><code>user</code></li>
-                    <li><code>uid</code></li>
-                    <li><code>user:group</code></li>
-                    <li><code>uid:gid</code></li>
-                    <li><code>uid:group</code></li>
-                    <li><code>user:gid</code></li>
-                </ul>
-
-                <p>If <code>group</code>/<code>gid</code> is not specified, the
-                default group and supplementary groups of the given
-                <code>user</code>/<code>uid</code> in <code>/etc/passwd</code>
-                from the container are applied.</p>
-            </dd>
-            <dt>
-                Memory <code>integer</code>
-            </dt>
-            <dd>
-                Memory limit (in bytes). This acts as a default value to use
-                when the value is not specified when creating a container.
-            </dd>
-            <dt>
-                MemorySwap <code>integer</code>
-            </dt>
-            <dd>
-                Total memory usage (memory + swap); set to <code>-1</code> to
-                disable swap. This acts as a default value to use when the
-                value is not specified when creating a container.
-            </dd>
-            <dt>
-                CpuShares <code>integer</code>
-            </dt>
-            <dd>
-                CPU shares (relative weight vs. other containers). This acts as
-                a default value to use when the value is not specified when
-                creating a container.
-            </dd>
-            <dt>
-                ExposedPorts <code>struct</code>
-            </dt>
-            <dd>
-                A set of ports to expose from a container running this image.
-                This JSON structure value is unusual because it is a direct
-                JSON serialization of the Go type
-                <code>map[string]struct{}</code> and is represented in JSON as
-                an object mapping its keys to an empty object. Here is an
-                example:
-
-<pre>{
-    "8080": {},
-    "53/udp": {},
-    "2356/tcp": {}
-}</pre>
-
-                Its keys can be in the format of:
-                <ul>
-                    <li>
-                        <code>"port/tcp"</code>
-                    </li>
-                    <li>
-                        <code>"port/udp"</code>
-                    </li>
-                    <li>
-                        <code>"port"</code>
-                    </li>
-                </ul>
-                with the default protocol being <code>"tcp"</code> if not
-                specified.
-
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Env <code>array of strings</code>
-            </dt>
-            <dd>
-                Entries are in the format of <code>VARNAME="var value"</code>.
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Entrypoint <code>array of strings</code>
-            </dt>
-            <dd>
-                A list of arguments to use as the command to execute when the
-                container starts. This value acts as a  default and is replaced
-                by an entrypoint specified when creating a container.
-            </dd>
-            <dt>
-                Cmd <code>array of strings</code>
-            </dt>
-            <dd>
-                Default arguments to the entry point of the container. These
-                values act as defaults and are replaced with any specified when
-                creating a container. If an <code>Entrypoint</code> value is
-                not specified, then the first entry of the <code>Cmd</code>
-                array should be interpreted as the executable to run.
-            </dd>
-            <dt>
-                Healthcheck <code>struct</code>
-            </dt>
-            <dd>
-                A test to perform to determine whether the container is healthy.
-                Here is an example:
-<pre>{
-  "Test": [
-      "CMD-SHELL",
-      "/usr/bin/check-health localhost"
-  ],
-  "Interval": 30000000000,
-  "Timeout": 10000000000,
-  "Retries": 3
-}</pre>
-                The object has the following fields.
-                <dl>
-                    <dt>
-                        Test <code>array of strings</code>
-                    </dt>
-                    <dd>
-                        The test to perform to check that the container is healthy.
-                        The options are:
-                        <ul>
-                            <li><code>[]</code> : inherit healthcheck from base image</li>
-                            <li><code>["NONE"]</code> : disable healthcheck</li>
-                            <li><code>["CMD", arg1, arg2, ...]</code> : exec arguments directly</li>
-                            <li><code>["CMD-SHELL", command]</code> : run command with system's default shell</li>
-                        </ul>
-
-                        The test command should exit with a status of 0 if the container is healthy,
-                        or with 1 if it is unhealthy.
-                    </dd>
-                    <dt>
-                        Interval <code>integer</code>
-                    </dt>
-                    <dd>
-                        Number of nanoseconds to wait between probe attempts.
-                    </dd>
-                    <dt>
-                        Timeout <code>integer</code>
-                    </dt>
-                    <dd>
-                        Number of nanoseconds to wait before considering the check to have hung.
-                    </dd>
-                    <dt>
-                        Retries <code>integer</code>
-                    <dt>
-                    <dd>
-                        The number of consecutive failures needed to consider a container as unhealthy.
-                    </dd>
-                </dl>
-
-                In each case, the field can be omitted to indicate that the
-                value should be inherited from the base layer.
-
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Volumes <code>struct</code>
-            </dt>
-            <dd>
-                A set of directories which should be created as data volumes in
-                a container running this image. This JSON structure value is
-                unusual because it is a direct JSON serialization of the Go
-                type <code>map[string]struct{}</code> and is represented in
-                JSON as an object mapping its keys to an empty object. Here is
-                an example:
-<pre>{
-    "/var/my-app-data/": {},
-    "/etc/some-config.d/": {},
-}</pre>
-            </dd>
-            <dt>
-                WorkingDir <code>string</code>
-            </dt>
-            <dd>
-                Sets the current working directory of the entry point process
-                in the container. This value acts as a default and is replaced
-                by a working directory specified when creating a container.
-            </dd>
-        </dl>
-    </dd>
-    <dt>
-        rootfs <code>struct</code>
-    </dt>
-    <dd>
-        The rootfs key references the layer content addresses used by the
-        image. This makes the image config hash depend on the filesystem hash.
-        rootfs has two subkeys:
-
-        <ul>
-          <li>
-            <code>type</code> is usually set to <code>layers</code>.
-          </li>
-          <li>
-            <code>diff_ids</code> is an array of layer content hashes (<code>DiffIDs</code>), in order from bottom-most to top-most.
-          </li>
-        </ul>
-
-
-        Here is an example rootfs section:
-
-<pre>"rootfs": {
-  "diff_ids": [
-    "sha256:c6f988f4874bb0add23a778f753c65efe992244e148a1d2ec2a8b664fb66bbd1",
-    "sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef",
-    "sha256:13f53e08df5a220ab6d13c58b2bf83a59cbdc2e04d0a3f041ddf4b0ba4112d49"
-  ],
-  "type": "layers"
-}</pre>
-    </dd>
-    <dt>
-        history <code>struct</code>
-    </dt>
-    <dd>
-        <code>history</code> is an array of objects describing the history of
-        each layer. The array is ordered from bottom-most layer to top-most
-        layer. The object has the following fields.
-
-        <ul>
-          <li>
-            <code>created</code>: Creation time, expressed as a ISO-8601 formatted
-            combined date and time
-          </li>
-          <li>
-            <code>author</code>: The author of the build point
-          </li>
-          <li>
-            <code>created_by</code>: The command which created the layer
-          </li>
-          <li>
-            <code>comment</code>: A custom message set when creating the layer
-          </li>
-          <li>
-            <code>empty_layer</code>: This field is used to mark if the history
-            item created a filesystem diff. It is set to true if this history
-            item doesn't correspond to an actual layer in the rootfs section
-            (for example, a command like ENV which results in no change to the
-            filesystem).
-          </li>
-        </ul>
-
-Here is an example history section:
-
-<pre>"history": [
-  {
-    "created": "2015-10-31T22:22:54.690851953Z",
-    "created_by": "/bin/sh -c #(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"
-  },
-  {
-    "created": "2015-10-31T22:22:55.613815829Z",
-    "created_by": "/bin/sh -c #(nop) CMD [\"sh\"]",
-    "empty_layer": true
-  }
-]</pre>
-    </dd>
-</dl>
-
-Any extra fields in the Image JSON struct are considered implementation
-specific and should be ignored by any implementations which are unable to
-interpret them.
-
-## Creating an Image Filesystem Changeset
-
-An example of creating an Image Filesystem Changeset follows.
-
-An image root filesystem is first created as an empty directory. Here is the
-initial empty directory structure for the a changeset using the
-randomly-generated directory name `c3167915dc9d` ([actual layer DiffIDs are
-generated based on the content](#id_desc)).
-
-```
-c3167915dc9d/
-```
-
-Files and directories are then created:
-
-```
-c3167915dc9d/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-The `c3167915dc9d` directory is then committed as a plain Tar archive with
-entries for the following files:
-
-```
-etc/my-app-config
-bin/my-app-binary
-bin/my-app-tools
-```
-
-To make changes to the filesystem of this container image, create a new
-directory, such as `f60c56784b83`, and initialize it with a snapshot of the
-parent image's root filesystem, so that the directory is identical to that
-of `c3167915dc9d`. NOTE: a copy-on-write or union filesystem can make this very
-efficient:
-
-```
-f60c56784b83/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This example change is going add a configuration directory at `/etc/my-app.d`
-which contains a default config file. There's also a change to the
-`my-app-tools` binary to handle the config layout change. The `f60c56784b83`
-directory then looks like this:
-
-```
-f60c56784b83/
-    etc/
-        my-app.d/
-            default.cfg
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This reflects the removal of `/etc/my-app-config` and creation of a file and
-directory at `/etc/my-app.d/default.cfg`. `/bin/my-app-tools` has also been
-replaced with an updated version. Before committing this directory to a
-changeset, because it has a parent image, it is first compared with the
-directory tree of the parent snapshot, `f60c56784b83`, looking for files and
-directories that have been added, modified, or removed. The following changeset
-is found:
-
-```
-Added:      /etc/my-app.d/default.cfg
-Modified:   /bin/my-app-tools
-Deleted:    /etc/my-app-config
-```
-
-A Tar Archive is then created which contains *only* this changeset: The added
-and modified files and directories in their entirety, and for each deleted item
-an entry for an empty file at the same location but with the basename of the
-deleted file or directory prefixed with `.wh.`. The filenames prefixed with
-`.wh.` are known as "whiteout" files. NOTE: For this reason, it is not possible
-to create an image root filesystem which contains a file or directory with a
-name beginning with `.wh.`. The resulting Tar archive for `f60c56784b83` has
-the following entries:
-
-```
-/etc/my-app.d/default.cfg
-/bin/my-app-tools
-/etc/.wh.my-app-config
-```
-
-Any given image is likely to be composed of several of these Image Filesystem
-Changeset tar archives.
-
-## Combined Image JSON + Filesystem Changeset Format
-
-There is also a format for a single archive which contains complete information
-about an image, including:
-
- - repository names/tags
- - image configuration JSON file
- - all tar archives of each layer filesystem changesets
-
-For example, here's what the full archive of `library/busybox` is (displayed in
-`tree` format):
-
-```
-.
-├── 47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb.json
-├── 5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── a65da33792c5187473faa80fa3e1b975acba06712852d1dea860692ccddf3198
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── manifest.json
-└── repositories
-```
-
-There is a directory for each layer in the image. Each directory is named with
-a 64 character hex name that is deterministically generated from the layer
-information. These names are not necessarily layer DiffIDs or ChainIDs. Each of
-these directories contains 3 files:
-
- * `VERSION` - The schema version of the `json` file
- * `json` - The legacy JSON metadata for an image layer. In this version of
-    the image specification, layers don't have JSON metadata, but in
-    [version 1](v1.md), they did. A file is created for each layer in the
-    v1 format for backward compatibility.
- * `layer.tar` - The Tar archive of the filesystem changeset for an image
-   layer.
-
-Note that this directory layout is only important for backward compatibility.
-Current implementations use the paths specified in `manifest.json`.
-
-The content of the `VERSION` files is simply the semantic version of the JSON
-metadata schema:
-
-```
-1.0
-```
-
-The `repositories` file is another JSON file which describes names/tags:
-
-```
-{  
-    "busybox":{  
-        "latest":"5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a"
-    }
-}
-```
-
-Every key in this object is the name of a repository, and maps to a collection
-of tag suffixes. Each tag maps to the ID of the image represented by that tag.
-This file is only used for backwards compatibility. Current implementations use
-the `manifest.json` file instead.
-
-The `manifest.json` file provides the image JSON for the top-level image, and
-optionally for parent images that this image was derived from. It consists of
-an array of metadata entries:
-
-```
-[
-  {
-    "Config": "47bcc53f74dc94b1920f0b34f6036096526296767650f223433fe65c35f149eb.json",
-    "RepoTags": ["busybox:latest"],
-    "Layers": [
-      "a65da33792c5187473faa80fa3e1b975acba06712852d1dea860692ccddf3198/layer.tar",
-      "5f29f704785248ddb9d06b90a11b5ea36c534865e9035e4022bb2e71d4ecbb9a/layer.tar"
-    ]
-  }
-]
-```
-
-There is an entry in the array for each image.
-
-The `Config` field references another file in the tar which includes the image
-JSON for this image.
-
-The `RepoTags` field lists references pointing to this image.
-
-The `Layers` field points to the filesystem changeset tars.
-
-An optional `Parent` field references the imageID of the parent image. This
-parent must be part of the same `manifest.json` file.
-
-This file shouldn't be confused with the distribution manifest, used to push
-and pull images.
-
-Generally, implementations that support this version of the spec will use
-the `manifest.json` file if available, and older implementations will use the
-legacy `*/json` files and `repositories`.
diff --git a/installer/vendor/github.com/docker/docker/image/spec/v1.md b/installer/vendor/github.com/docker/docker/image/spec/v1.md
deleted file mode 100644
index 57a599b8ff..0000000000
--- a/installer/vendor/github.com/docker/docker/image/spec/v1.md
+++ /dev/null
@@ -1,573 +0,0 @@
-# Docker Image Specification v1.0.0
-
-An *Image* is an ordered collection of root filesystem changes and the
-corresponding execution parameters for use within a container runtime. This
-specification outlines the format of these filesystem changes and corresponding
-parameters and describes how to create and use them for use with a container
-runtime and execution tool.
-
-## Terminology
-
-This specification uses the following terms:
-
-<dl>
-    <dt>
-        Layer
-    </dt>
-    <dd>
-        Images are composed of <i>layers</i>. <i>Image layer</i> is a general
-        term which may be used to refer to one or both of the following:
-
-        <ol>
-            <li>The metadata for the layer, described in the JSON format.</li>
-            <li>The filesystem changes described by a layer.</li>
-        </ol>
-
-        To refer to the former you may use the term <i>Layer JSON</i> or
-        <i>Layer Metadata</i>. To refer to the latter you may use the term
-        <i>Image Filesystem Changeset</i> or <i>Image Diff</i>.
-    </dd>
-    <dt>
-        Image JSON
-    </dt>
-    <dd>
-        Each layer has an associated JSON structure which describes some
-        basic information about the image such as date created, author, and the
-        ID of its parent image as well as execution/runtime configuration like
-        its entry point, default arguments, CPU/memory shares, networking, and
-        volumes.
-    </dd>
-    <dt>
-        Image Filesystem Changeset
-    </dt>
-    <dd>
-        Each layer has an archive of the files which have been added, changed,
-        or deleted relative to its parent layer. Using a layer-based or union
-        filesystem such as AUFS, or by computing the diff from filesystem
-        snapshots, the filesystem changeset can be used to present a series of
-        image layers as if they were one cohesive filesystem.
-    </dd>
-    <dt>
-        Image ID <a name="id_desc"></a>
-    </dt>
-    <dd>
-        Each layer is given an ID upon its creation. It is 
-        represented as a hexadecimal encoding of 256 bits, e.g.,
-        <code>a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9</code>.
-        Image IDs should be sufficiently random so as to be globally unique.
-        32 bytes read from <code>/dev/urandom</code> is sufficient for all
-        practical purposes. Alternatively, an image ID may be derived as a
-        cryptographic hash of image contents as the result is considered
-        indistinguishable from random. The choice is left up to implementors.
-    </dd>
-    <dt>
-        Image Parent
-    </dt>
-    <dd>
-        Most layer metadata structs contain a <code>parent</code> field which
-        refers to the Image from which another directly descends. An image
-        contains a separate JSON metadata file and set of changes relative to
-        the filesystem of its parent image. <i>Image Ancestor</i> and
-        <i>Image Descendant</i> are also common terms.
-    </dd>
-    <dt>
-        Image Checksum
-    </dt>
-    <dd>
-        Layer metadata structs contain a cryptographic hash of the contents of
-        the layer's filesystem changeset. Though the set of changes exists as a
-        simple Tar archive, two archives with identical filenames and content
-        will have different SHA digests if the last-access or last-modified
-        times of any entries differ. For this reason, image checksums are
-        generated using the TarSum algorithm which produces a cryptographic
-        hash of file contents and selected headers only. Details of this
-        algorithm are described in the separate <a href="https://github.com/docker/docker/blob/master/pkg/tarsum/tarsum_spec.md">TarSum specification</a>.
-    </dd>
-    <dt>
-        Tag
-    </dt>
-    <dd>
-        A tag serves to map a descriptive, user-given name to any single image
-        ID. An image name suffix (the name component after <code>:</code>) is
-        often referred to as a tag as well, though it strictly refers to the
-        full name of an image. Acceptable values for a tag suffix are
-        implementation specific, but they SHOULD be limited to the set of
-        alphanumeric characters <code>[a-zA-z0-9]</code>, punctuation
-        characters <code>[._-]</code>, and MUST NOT contain a <code>:</code>
-        character.
-    </dd>
-    <dt>
-        Repository
-    </dt>
-    <dd>
-        A collection of tags grouped under a common prefix (the name component
-        before <code>:</code>). For example, in an image tagged with the name
-        <code>my-app:3.1.4</code>, <code>my-app</code> is the <i>Repository</i>
-        component of the name. Acceptable values for repository name are
-        implementation specific, but they SHOULD be limited to the set of
-        alphanumeric characters <code>[a-zA-z0-9]</code>, and punctuation
-        characters <code>[._-]</code>, however it MAY contain additional
-        <code>/</code> and <code>:</code> characters for organizational
-        purposes, with the last <code>:</code> character being interpreted
-        dividing the repository component of the name from the tag suffix
-        component.
-    </dd>
-</dl>
-
-## Image JSON Description
-
-Here is an example image JSON file:
-
-```
-{  
-    "id": "a9561eb1b190625c9adb5a9513e72c4dedafc1cb2d4c5236c9a6957ec7dfd5a9",
-    "parent": "c6e3cedcda2e3982a1a6760e178355e8e65f7b80e4e5248743fa3549d284e024",
-    "checksum": "tarsum.v1+sha256:e58fcf7418d2390dec8e8fb69d88c06ec07039d651fedc3aa72af9972e7d046b",
-    "created": "2014-10-13T21:19:18.674353812Z",
-    "author": "Alyssa P. Hacker &ltalyspdev@example.com&gt",
-    "architecture": "amd64",
-    "os": "linux",
-    "Size": 271828,
-    "config": {
-        "User": "alice",
-        "Memory": 2048,
-        "MemorySwap": 4096,
-        "CpuShares": 8,
-        "ExposedPorts": {  
-            "8080/tcp": {}
-        },
-        "Env": [  
-            "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-            "FOO=docker_is_a_really",
-            "BAR=great_tool_you_know"
-        ],
-        "Entrypoint": [
-            "/bin/my-app-binary"
-        ],
-        "Cmd": [
-            "--foreground",
-            "--config",
-            "/etc/my-app.d/default.cfg"
-        ],
-        "Volumes": {
-            "/var/job-result-data": {},
-            "/var/log/my-app-logs": {},
-        },
-        "WorkingDir": "/home/alice",
-    }
-}
-```
-
-### Image JSON Field Descriptions
-
-<dl>
-    <dt>
-        id <code>string</code>
-    </dt>
-    <dd>
-        Randomly generated, 256-bit, hexadecimal encoded. Uniquely identifies
-        the image.
-    </dd>
-    <dt>
-        parent <code>string</code>
-    </dt>
-    <dd>
-        ID of the parent image. If there is no parent image then this field
-        should be omitted. A collection of images may share many of the same
-        ancestor layers. This organizational structure is strictly a tree with
-        any one layer having either no parent or a single parent and zero or
-        more descendant layers. Cycles are not allowed and implementations
-        should be careful to avoid creating them or iterating through a cycle
-        indefinitely.
-    </dd>
-    <dt>
-        created <code>string</code>
-    </dt>
-    <dd>
-        ISO-8601 formatted combined date and time at which the image was
-        created.
-    </dd>
-    <dt>
-        author <code>string</code>
-    </dt>
-    <dd>
-        Gives the name and/or email address of the person or entity which
-        created and is responsible for maintaining the image.
-    </dd>
-    <dt>
-        architecture <code>string</code>
-    </dt>
-    <dd>
-        The CPU architecture which the binaries in this image are built to run
-        on. Possible values include:
-        <ul>
-            <li>386</li>
-            <li>amd64</li>
-            <li>arm</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        os <code>string</code>
-    </dt>
-    <dd>
-        The name of the operating system which the image is built to run on.
-        Possible values include:
-        <ul>
-            <li>darwin</li>
-            <li>freebsd</li>
-            <li>linux</li>
-        </ul>
-        More values may be supported in the future and any of these may or may
-        not be supported by a given container runtime implementation.
-    </dd>
-    <dt>
-        checksum <code>string</code>
-    </dt>
-    <dd>
-        Image Checksum of the filesystem changeset associated with the image
-        layer.
-    </dd>
-    <dt>
-        Size <code>integer</code>
-    </dt>
-    <dd>
-        The size in bytes of the filesystem changeset associated with the image
-        layer.
-    </dd>
-    <dt>
-        config <code>struct</code>
-    </dt>
-    <dd>
-        The execution parameters which should be used as a base when running a
-        container using the image. This field can be <code>null</code>, in
-        which case any execution parameters should be specified at creation of
-        the container.
-
-        <h4>Container RunConfig Field Descriptions</h4>
-
-        <dl>
-            <dt>
-                User <code>string</code>
-            </dt>
-            <dd>
-                <p>The username or UID which the process in the container should
-                run as. This acts as a default value to use when the value is
-                not specified when creating a container.</p>
-
-                <p>All of the following are valid:</p>
-
-                <ul>
-                    <li><code>user</code></li>
-                    <li><code>uid</code></li>
-                    <li><code>user:group</code></li>
-                    <li><code>uid:gid</code></li>
-                    <li><code>uid:group</code></li>
-                    <li><code>user:gid</code></li>
-                </ul>
-
-                <p>If <code>group</code>/<code>gid</code> is not specified, the
-                default group and supplementary groups of the given
-                <code>user</code>/<code>uid</code> in <code>/etc/passwd</code>
-                from the container are applied.</p>
-            </dd>
-            <dt>
-                Memory <code>integer</code>
-            </dt>
-            <dd>
-                Memory limit (in bytes). This acts as a default value to use
-                when the value is not specified when creating a container.
-            </dd>
-            <dt>
-                MemorySwap <code>integer</code>
-            </dt>
-            <dd>
-                Total memory usage (memory + swap); set to <code>-1</code> to
-                disable swap. This acts as a default value to use when the
-                value is not specified when creating a container.
-            </dd>
-            <dt>
-                CpuShares <code>integer</code>
-            </dt>
-            <dd>
-                CPU shares (relative weight vs. other containers). This acts as
-                a default value to use when the value is not specified when
-                creating a container.
-            </dd>
-            <dt>
-                ExposedPorts <code>struct</code>
-            </dt>
-            <dd>
-                A set of ports to expose from a container running this image.
-                This JSON structure value is unusual because it is a direct
-                JSON serialization of the Go type
-                <code>map[string]struct{}</code> and is represented in JSON as
-                an object mapping its keys to an empty object. Here is an
-                example:
-
-<pre>{
-    "8080": {},
-    "53/udp": {},
-    "2356/tcp": {}
-}</pre>
-
-                Its keys can be in the format of:
-                <ul>
-                    <li>
-                        <code>"port/tcp"</code>
-                    </li>
-                    <li>
-                        <code>"port/udp"</code>
-                    </li>
-                    <li>
-                        <code>"port"</code>
-                    </li>
-                </ul>
-                with the default protocol being <code>"tcp"</code> if not
-                specified.
-
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Env <code>array of strings</code>
-            </dt>
-            <dd>
-                Entries are in the format of <code>VARNAME="var value"</code>.
-                These values act as defaults and are merged with any specified
-                when creating a container.
-            </dd>
-            <dt>
-                Entrypoint <code>array of strings</code>
-            </dt>
-            <dd>
-                A list of arguments to use as the command to execute when the
-                container starts. This value acts as a  default and is replaced
-                by an entrypoint specified when creating a container.
-            </dd>
-            <dt>
-                Cmd <code>array of strings</code>
-            </dt>
-            <dd>
-                Default arguments to the entry point of the container. These
-                values act as defaults and are replaced with any specified when
-                creating a container. If an <code>Entrypoint</code> value is
-                not specified, then the first entry of the <code>Cmd</code>
-                array should be interpreted as the executable to run.
-            </dd>
-            <dt>
-                Volumes <code>struct</code>
-            </dt>
-            <dd>
-                A set of directories which should be created as data volumes in
-                a container running this image. This JSON structure value is
-                unusual because it is a direct JSON serialization of the Go
-                type <code>map[string]struct{}</code> and is represented in
-                JSON as an object mapping its keys to an empty object. Here is
-                an example:
-<pre>{
-    "/var/my-app-data/": {},
-    "/etc/some-config.d/": {},
-}</pre>
-            </dd>
-            <dt>
-                WorkingDir <code>string</code>
-            </dt>
-            <dd>
-                Sets the current working directory of the entry point process
-                in the container. This value acts as a default and is replaced
-                by a working directory specified when creating a container.
-            </dd>
-        </dl>
-    </dd>
-</dl>
-
-Any extra fields in the Image JSON struct are considered implementation
-specific and should be ignored by any implementations which are unable to
-interpret them.
-
-## Creating an Image Filesystem Changeset
-
-An example of creating an Image Filesystem Changeset follows.
-
-An image root filesystem is first created as an empty directory named with the
-ID of the image being created. Here is the initial empty directory structure
-for the changeset for an image with ID `c3167915dc9d` ([real IDs are much
-longer](#id_desc), but this example use a truncated one here for brevity.
-Implementations need not name the rootfs directory in this way but it may be
-convenient for keeping record of a large number of image layers.):
-
-```
-c3167915dc9d/
-```
-
-Files and directories are then created:
-
-```
-c3167915dc9d/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-The `c3167915dc9d` directory is then committed as a plain Tar archive with
-entries for the following files:
-
-```
-etc/my-app-config
-bin/my-app-binary
-bin/my-app-tools
-```
-
-The TarSum checksum for the archive file is then computed and placed in the
-JSON metadata along with the execution parameters.
-
-To make changes to the filesystem of this container image, create a new
-directory named with a new ID, such as `f60c56784b83`, and initialize it with
-a snapshot of the parent image's root filesystem, so that the directory is
-identical to that of `c3167915dc9d`. NOTE: a copy-on-write or union filesystem
-can make this very efficient:
-
-```
-f60c56784b83/
-    etc/
-        my-app-config
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This example change is going add a configuration directory at `/etc/my-app.d`
-which contains a default config file. There's also a change to the
-`my-app-tools` binary to handle the config layout change. The `f60c56784b83`
-directory then looks like this:
-
-```
-f60c56784b83/
-    etc/
-        my-app.d/
-            default.cfg
-    bin/
-        my-app-binary
-        my-app-tools
-```
-
-This reflects the removal of `/etc/my-app-config` and creation of a file and
-directory at `/etc/my-app.d/default.cfg`. `/bin/my-app-tools` has also been
-replaced with an updated version. Before committing this directory to a
-changeset, because it has a parent image, it is first compared with the
-directory tree of the parent snapshot, `f60c56784b83`, looking for files and
-directories that have been added, modified, or removed. The following changeset
-is found:
-
-```
-Added:      /etc/my-app.d/default.cfg
-Modified:   /bin/my-app-tools
-Deleted:    /etc/my-app-config
-```
-
-A Tar Archive is then created which contains *only* this changeset: The added
-and modified files and directories in their entirety, and for each deleted item
-an entry for an empty file at the same location but with the basename of the
-deleted file or directory prefixed with `.wh.`. The filenames prefixed with
-`.wh.` are known as "whiteout" files. NOTE: For this reason, it is not possible
-to create an image root filesystem which contains a file or directory with a
-name beginning with `.wh.`. The resulting Tar archive for `f60c56784b83` has
-the following entries:
-
-```
-/etc/my-app.d/default.cfg
-/bin/my-app-tools
-/etc/.wh.my-app-config
-```
-
-Any given image is likely to be composed of several of these Image Filesystem
-Changeset tar archives.
-
-## Combined Image JSON + Filesystem Changeset Format
-
-There is also a format for a single archive which contains complete information
-about an image, including:
-
- - repository names/tags
- - all image layer JSON files
- - all tar archives of each layer filesystem changesets
-
-For example, here's what the full archive of `library/busybox` is (displayed in
-`tree` format):
-
-```
-.
-├── 5785b62b697b99a5af6cd5d0aabc804d5748abbb6d3d07da5d1d3795f2dcc83e
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── a7b8b41220991bfc754d7ad445ad27b7f272ab8b4a2c175b9512b97471d02a8a
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── a936027c5ca8bf8f517923169a233e391cbb38469a75de8383b5228dc2d26ceb
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-├── f60c56784b832dd990022afc120b8136ab3da9528094752ae13fe63a2d28dc8c
-│   ├── VERSION
-│   ├── json
-│   └── layer.tar
-└── repositories
-```
-
-There are one or more directories named with the ID for each layer in a full
-image. Each of these directories contains 3 files:
-
- * `VERSION` - The schema version of the `json` file
- * `json` - The JSON metadata for an image layer
- * `layer.tar` - The Tar archive of the filesystem changeset for an image
-   layer.
-
-The content of the `VERSION` files is simply the semantic version of the JSON
-metadata schema:
-
-```
-1.0
-```
-
-And the `repositories` file is another JSON file which describes names/tags:
-
-```
-{  
-    "busybox":{  
-        "latest":"5785b62b697b99a5af6cd5d0aabc804d5748abbb6d3d07da5d1d3795f2dcc83e"
-    }
-}
-```
-
-Every key in this object is the name of a repository, and maps to a collection
-of tag suffixes. Each tag maps to the ID of the image represented by that tag.
-
-## Loading an Image Filesystem Changeset
-
-Unpacking a bundle of image layer JSON files and their corresponding filesystem
-changesets can be done using a series of steps:
-
-1. Follow the parent IDs of image layers to find the root ancestor (an image
-with no parent ID specified).
-2. For every image layer, in order from root ancestor and descending down,
-extract the contents of that layer's filesystem changeset archive into a
-directory which will be used as the root of a container filesystem.
-
-    - Extract all contents of each archive.
-    - Walk the directory tree once more, removing any files with the prefix
-    `.wh.` and the corresponding file or directory named without this prefix.
-
-
-## Implementations
-
-This specification is an admittedly imperfect description of an
-imperfectly-understood problem. The Docker project is, in turn, an attempt to
-implement this specification. Our goal and our execution toward it will evolve
-over time, but our primary concern in this specification and in our
-implementation is compatibility and interoperability.
diff --git a/installer/vendor/github.com/docker/docker/image/store.go b/installer/vendor/github.com/docker/docker/image/store.go
deleted file mode 100644
index b61c456097..0000000000
--- a/installer/vendor/github.com/docker/docker/image/store.go
+++ /dev/null
@@ -1,295 +0,0 @@
-package image
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/layer"
-)
-
-// Store is an interface for creating and accessing images
-type Store interface {
-	Create(config []byte) (ID, error)
-	Get(id ID) (*Image, error)
-	Delete(id ID) ([]layer.Metadata, error)
-	Search(partialID string) (ID, error)
-	SetParent(id ID, parent ID) error
-	GetParent(id ID) (ID, error)
-	Children(id ID) []ID
-	Map() map[ID]*Image
-	Heads() map[ID]*Image
-}
-
-// LayerGetReleaser is a minimal interface for getting and releasing images.
-type LayerGetReleaser interface {
-	Get(layer.ChainID) (layer.Layer, error)
-	Release(layer.Layer) ([]layer.Metadata, error)
-}
-
-type imageMeta struct {
-	layer    layer.Layer
-	children map[ID]struct{}
-}
-
-type store struct {
-	sync.Mutex
-	ls        LayerGetReleaser
-	images    map[ID]*imageMeta
-	fs        StoreBackend
-	digestSet *digest.Set
-}
-
-// NewImageStore returns new store object for given layer store
-func NewImageStore(fs StoreBackend, ls LayerGetReleaser) (Store, error) {
-	is := &store{
-		ls:        ls,
-		images:    make(map[ID]*imageMeta),
-		fs:        fs,
-		digestSet: digest.NewSet(),
-	}
-
-	// load all current images and retain layers
-	if err := is.restore(); err != nil {
-		return nil, err
-	}
-
-	return is, nil
-}
-
-func (is *store) restore() error {
-	err := is.fs.Walk(func(dgst digest.Digest) error {
-		img, err := is.Get(IDFromDigest(dgst))
-		if err != nil {
-			logrus.Errorf("invalid image %v, %v", dgst, err)
-			return nil
-		}
-		var l layer.Layer
-		if chainID := img.RootFS.ChainID(); chainID != "" {
-			l, err = is.ls.Get(chainID)
-			if err != nil {
-				return err
-			}
-		}
-		if err := is.digestSet.Add(dgst); err != nil {
-			return err
-		}
-
-		imageMeta := &imageMeta{
-			layer:    l,
-			children: make(map[ID]struct{}),
-		}
-
-		is.images[IDFromDigest(dgst)] = imageMeta
-
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	// Second pass to fill in children maps
-	for id := range is.images {
-		if parent, err := is.GetParent(id); err == nil {
-			if parentMeta := is.images[parent]; parentMeta != nil {
-				parentMeta.children[id] = struct{}{}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (is *store) Create(config []byte) (ID, error) {
-	var img Image
-	err := json.Unmarshal(config, &img)
-	if err != nil {
-		return "", err
-	}
-
-	// Must reject any config that references diffIDs from the history
-	// which aren't among the rootfs layers.
-	rootFSLayers := make(map[layer.DiffID]struct{})
-	for _, diffID := range img.RootFS.DiffIDs {
-		rootFSLayers[diffID] = struct{}{}
-	}
-
-	layerCounter := 0
-	for _, h := range img.History {
-		if !h.EmptyLayer {
-			layerCounter++
-		}
-	}
-	if layerCounter > len(img.RootFS.DiffIDs) {
-		return "", errors.New("too many non-empty layers in History section")
-	}
-
-	dgst, err := is.fs.Set(config)
-	if err != nil {
-		return "", err
-	}
-	imageID := IDFromDigest(dgst)
-
-	is.Lock()
-	defer is.Unlock()
-
-	if _, exists := is.images[imageID]; exists {
-		return imageID, nil
-	}
-
-	layerID := img.RootFS.ChainID()
-
-	var l layer.Layer
-	if layerID != "" {
-		l, err = is.ls.Get(layerID)
-		if err != nil {
-			return "", err
-		}
-	}
-
-	imageMeta := &imageMeta{
-		layer:    l,
-		children: make(map[ID]struct{}),
-	}
-
-	is.images[imageID] = imageMeta
-	if err := is.digestSet.Add(imageID.Digest()); err != nil {
-		delete(is.images, imageID)
-		return "", err
-	}
-
-	return imageID, nil
-}
-
-func (is *store) Search(term string) (ID, error) {
-	is.Lock()
-	defer is.Unlock()
-
-	dgst, err := is.digestSet.Lookup(term)
-	if err != nil {
-		if err == digest.ErrDigestNotFound {
-			err = fmt.Errorf("No such image: %s", term)
-		}
-		return "", err
-	}
-	return IDFromDigest(dgst), nil
-}
-
-func (is *store) Get(id ID) (*Image, error) {
-	// todo: Check if image is in images
-	// todo: Detect manual insertions and start using them
-	config, err := is.fs.Get(id.Digest())
-	if err != nil {
-		return nil, err
-	}
-
-	img, err := NewFromJSON(config)
-	if err != nil {
-		return nil, err
-	}
-	img.computedID = id
-
-	img.Parent, err = is.GetParent(id)
-	if err != nil {
-		img.Parent = ""
-	}
-
-	return img, nil
-}
-
-func (is *store) Delete(id ID) ([]layer.Metadata, error) {
-	is.Lock()
-	defer is.Unlock()
-
-	imageMeta := is.images[id]
-	if imageMeta == nil {
-		return nil, fmt.Errorf("unrecognized image ID %s", id.String())
-	}
-	for id := range imageMeta.children {
-		is.fs.DeleteMetadata(id.Digest(), "parent")
-	}
-	if parent, err := is.GetParent(id); err == nil && is.images[parent] != nil {
-		delete(is.images[parent].children, id)
-	}
-
-	if err := is.digestSet.Remove(id.Digest()); err != nil {
-		logrus.Errorf("error removing %s from digest set: %q", id, err)
-	}
-	delete(is.images, id)
-	is.fs.Delete(id.Digest())
-
-	if imageMeta.layer != nil {
-		return is.ls.Release(imageMeta.layer)
-	}
-	return nil, nil
-}
-
-func (is *store) SetParent(id, parent ID) error {
-	is.Lock()
-	defer is.Unlock()
-	parentMeta := is.images[parent]
-	if parentMeta == nil {
-		return fmt.Errorf("unknown parent image ID %s", parent.String())
-	}
-	if parent, err := is.GetParent(id); err == nil && is.images[parent] != nil {
-		delete(is.images[parent].children, id)
-	}
-	parentMeta.children[id] = struct{}{}
-	return is.fs.SetMetadata(id.Digest(), "parent", []byte(parent))
-}
-
-func (is *store) GetParent(id ID) (ID, error) {
-	d, err := is.fs.GetMetadata(id.Digest(), "parent")
-	if err != nil {
-		return "", err
-	}
-	return ID(d), nil // todo: validate?
-}
-
-func (is *store) Children(id ID) []ID {
-	is.Lock()
-	defer is.Unlock()
-
-	return is.children(id)
-}
-
-func (is *store) children(id ID) []ID {
-	var ids []ID
-	if is.images[id] != nil {
-		for id := range is.images[id].children {
-			ids = append(ids, id)
-		}
-	}
-	return ids
-}
-
-func (is *store) Heads() map[ID]*Image {
-	return is.imagesMap(false)
-}
-
-func (is *store) Map() map[ID]*Image {
-	return is.imagesMap(true)
-}
-
-func (is *store) imagesMap(all bool) map[ID]*Image {
-	is.Lock()
-	defer is.Unlock()
-
-	images := make(map[ID]*Image)
-
-	for id := range is.images {
-		if !all && len(is.children(id)) > 0 {
-			continue
-		}
-		img, err := is.Get(id)
-		if err != nil {
-			logrus.Errorf("invalid image access: %q, error: %q", id, err)
-			continue
-		}
-		images[id] = img
-	}
-	return images
-}
diff --git a/installer/vendor/github.com/docker/docker/image/store_test.go b/installer/vendor/github.com/docker/docker/image/store_test.go
deleted file mode 100644
index 50f8aa8b84..0000000000
--- a/installer/vendor/github.com/docker/docker/image/store_test.go
+++ /dev/null
@@ -1,300 +0,0 @@
-package image
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/layer"
-)
-
-func TestRestore(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id1, err := fs.Set([]byte(`{"comment": "abc", "rootfs": {"type": "layers"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = fs.Set([]byte(`invalid`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	id2, err := fs.Set([]byte(`{"comment": "def", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = fs.SetMetadata(id2, "parent", []byte(id1))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := NewImageStore(fs, &mockLayerGetReleaser{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	imgs := is.Map()
-	if actual, expected := len(imgs), 2; actual != expected {
-		t.Fatalf("invalid images length, expected 2, got %q", len(imgs))
-	}
-
-	img1, err := is.Get(ID(id1))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := img1.computedID, ID(id1); actual != expected {
-		t.Fatalf("invalid image ID: expected %q, got %q", expected, actual)
-	}
-
-	if actual, expected := img1.computedID.String(), string(id1); actual != expected {
-		t.Fatalf("invalid image ID string: expected %q, got %q", expected, actual)
-	}
-
-	img2, err := is.Get(ID(id2))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := img1.Comment, "abc"; actual != expected {
-		t.Fatalf("invalid comment for image1: expected %q, got %q", expected, actual)
-	}
-
-	if actual, expected := img2.Comment, "def"; actual != expected {
-		t.Fatalf("invalid comment for image2: expected %q, got %q", expected, actual)
-	}
-
-	p, err := is.GetParent(ID(id1))
-	if err == nil {
-		t.Fatal("expected error for getting parent")
-	}
-
-	p, err = is.GetParent(ID(id2))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual, expected := p, ID(id1); actual != expected {
-		t.Fatalf("invalid parent: expected %q, got %q", expected, actual)
-	}
-
-	children := is.Children(ID(id1))
-	if len(children) != 1 {
-		t.Fatalf("invalid children length: %q", len(children))
-	}
-	if actual, expected := children[0], ID(id2); actual != expected {
-		t.Fatalf("invalid child for id1: expected %q, got %q", expected, actual)
-	}
-
-	heads := is.Heads()
-	if actual, expected := len(heads), 1; actual != expected {
-		t.Fatalf("invalid images length: expected %q, got %q", expected, actual)
-	}
-
-	sid1, err := is.Search(string(id1)[:10])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual, expected := sid1, ID(id1); actual != expected {
-		t.Fatalf("searched ID mismatch: expected %q, got %q", expected, actual)
-	}
-
-	sid1, err = is.Search(digest.Digest(id1).Hex()[:6])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual, expected := sid1, ID(id1); actual != expected {
-		t.Fatalf("searched ID mismatch: expected %q, got %q", expected, actual)
-	}
-
-	invalidPattern := digest.Digest(id1).Hex()[1:6]
-	_, err = is.Search(invalidPattern)
-	if err == nil {
-		t.Fatalf("expected search for %q to fail", invalidPattern)
-	}
-
-}
-
-func TestAddDelete(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := NewImageStore(fs, &mockLayerGetReleaser{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id1, err := is.Create([]byte(`{"comment": "abc", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := id1, ID("sha256:8d25a9c45df515f9d0fe8e4a6b1c64dd3b965a84790ddbcc7954bb9bc89eb993"); actual != expected {
-		t.Fatalf("create ID mismatch: expected %q, got %q", expected, actual)
-	}
-
-	img, err := is.Get(id1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := img.Comment, "abc"; actual != expected {
-		t.Fatalf("invalid comment in image: expected %q, got %q", expected, actual)
-	}
-
-	id2, err := is.Create([]byte(`{"comment": "def", "rootfs": {"type": "layers", "diff_ids": ["2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"]}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = is.SetParent(id2, id1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pid1, err := is.GetParent(id2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual, expected := pid1, id1; actual != expected {
-		t.Fatalf("invalid parent for image: expected %q, got %q", expected, actual)
-	}
-
-	_, err = is.Delete(id1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = is.Get(id1)
-	if err == nil {
-		t.Fatalf("expected get for deleted image %q to fail", id1)
-	}
-	_, err = is.Get(id2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	pid1, err = is.GetParent(id2)
-	if err == nil {
-		t.Fatalf("expected parent check for image %q to fail, got %q", id2, pid1)
-	}
-
-}
-
-func TestSearchAfterDelete(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := NewImageStore(fs, &mockLayerGetReleaser{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id, err := is.Create([]byte(`{"comment": "abc", "rootfs": {"type": "layers"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id1, err := is.Search(string(id)[:15])
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := id1, id; expected != actual {
-		t.Fatalf("wrong id returned from search: expected %q, got %q", expected, actual)
-	}
-
-	if _, err := is.Delete(id); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := is.Search(string(id)[:15]); err == nil {
-		t.Fatal("expected search after deletion to fail")
-	}
-}
-
-func TestParentReset(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "images-fs-store")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	fs, err := NewFSStoreBackend(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := NewImageStore(fs, &mockLayerGetReleaser{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id, err := is.Create([]byte(`{"comment": "abc1", "rootfs": {"type": "layers"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id2, err := is.Create([]byte(`{"comment": "abc2", "rootfs": {"type": "layers"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id3, err := is.Create([]byte(`{"comment": "abc3", "rootfs": {"type": "layers"}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := is.SetParent(id, id2); err != nil {
-		t.Fatal(err)
-	}
-
-	ids := is.Children(id2)
-	if actual, expected := len(ids), 1; expected != actual {
-		t.Fatalf("wrong number of children: %d, got %d", expected, actual)
-	}
-
-	if err := is.SetParent(id, id3); err != nil {
-		t.Fatal(err)
-	}
-
-	ids = is.Children(id2)
-	if actual, expected := len(ids), 0; expected != actual {
-		t.Fatalf("wrong number of children after parent reset: %d, got %d", expected, actual)
-	}
-
-	ids = is.Children(id3)
-	if actual, expected := len(ids), 1; expected != actual {
-		t.Fatalf("wrong number of children after parent reset: %d, got %d", expected, actual)
-	}
-
-}
-
-type mockLayerGetReleaser struct{}
-
-func (ls *mockLayerGetReleaser) Get(layer.ChainID) (layer.Layer, error) {
-	return nil, nil
-}
-
-func (ls *mockLayerGetReleaser) Release(layer.Layer) ([]layer.Metadata, error) {
-	return nil, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/image/tarexport/load.go b/installer/vendor/github.com/docker/docker/image/tarexport/load.go
deleted file mode 100644
index 01edd91fb7..0000000000
--- a/installer/vendor/github.com/docker/docker/image/tarexport/load.go
+++ /dev/null
@@ -1,390 +0,0 @@
-package tarexport
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/reference"
-)
-
-func (l *tarexporter) Load(inTar io.ReadCloser, outStream io.Writer, quiet bool) error {
-	var (
-		sf             = streamformatter.NewJSONStreamFormatter()
-		progressOutput progress.Output
-	)
-	if !quiet {
-		progressOutput = sf.NewProgressOutput(outStream, false)
-	}
-	outStream = &streamformatter.StdoutFormatter{Writer: outStream, StreamFormatter: streamformatter.NewJSONStreamFormatter()}
-
-	tmpDir, err := ioutil.TempDir("", "docker-import-")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tmpDir)
-
-	if err := chrootarchive.Untar(inTar, tmpDir, nil); err != nil {
-		return err
-	}
-	// read manifest, if no file then load in legacy mode
-	manifestPath, err := safePath(tmpDir, manifestFileName)
-	if err != nil {
-		return err
-	}
-	manifestFile, err := os.Open(manifestPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return l.legacyLoad(tmpDir, outStream, progressOutput)
-		}
-		return err
-	}
-	defer manifestFile.Close()
-
-	var manifest []manifestItem
-	if err := json.NewDecoder(manifestFile).Decode(&manifest); err != nil {
-		return err
-	}
-
-	var parentLinks []parentLink
-	var imageIDsStr string
-	var imageRefCount int
-
-	for _, m := range manifest {
-		configPath, err := safePath(tmpDir, m.Config)
-		if err != nil {
-			return err
-		}
-		config, err := ioutil.ReadFile(configPath)
-		if err != nil {
-			return err
-		}
-		img, err := image.NewFromJSON(config)
-		if err != nil {
-			return err
-		}
-		var rootFS image.RootFS
-		rootFS = *img.RootFS
-		rootFS.DiffIDs = nil
-
-		if expected, actual := len(m.Layers), len(img.RootFS.DiffIDs); expected != actual {
-			return fmt.Errorf("invalid manifest, layers length mismatch: expected %q, got %q", expected, actual)
-		}
-
-		for i, diffID := range img.RootFS.DiffIDs {
-			layerPath, err := safePath(tmpDir, m.Layers[i])
-			if err != nil {
-				return err
-			}
-			r := rootFS
-			r.Append(diffID)
-			newLayer, err := l.ls.Get(r.ChainID())
-			if err != nil {
-				newLayer, err = l.loadLayer(layerPath, rootFS, diffID.String(), m.LayerSources[diffID], progressOutput)
-				if err != nil {
-					return err
-				}
-			}
-			defer layer.ReleaseAndLog(l.ls, newLayer)
-			if expected, actual := diffID, newLayer.DiffID(); expected != actual {
-				return fmt.Errorf("invalid diffID for layer %d: expected %q, got %q", i, expected, actual)
-			}
-			rootFS.Append(diffID)
-		}
-
-		imgID, err := l.is.Create(config)
-		if err != nil {
-			return err
-		}
-		imageIDsStr += fmt.Sprintf("Loaded image ID: %s\n", imgID)
-
-		imageRefCount = 0
-		for _, repoTag := range m.RepoTags {
-			named, err := reference.ParseNamed(repoTag)
-			if err != nil {
-				return err
-			}
-			ref, ok := named.(reference.NamedTagged)
-			if !ok {
-				return fmt.Errorf("invalid tag %q", repoTag)
-			}
-			l.setLoadedTag(ref, imgID.Digest(), outStream)
-			outStream.Write([]byte(fmt.Sprintf("Loaded image: %s\n", ref)))
-			imageRefCount++
-		}
-
-		parentLinks = append(parentLinks, parentLink{imgID, m.Parent})
-		l.loggerImgEvent.LogImageEvent(imgID.String(), imgID.String(), "load")
-	}
-
-	for _, p := range validatedParentLinks(parentLinks) {
-		if p.parentID != "" {
-			if err := l.setParentID(p.id, p.parentID); err != nil {
-				return err
-			}
-		}
-	}
-
-	if imageRefCount == 0 {
-		outStream.Write([]byte(imageIDsStr))
-	}
-
-	return nil
-}
-
-func (l *tarexporter) setParentID(id, parentID image.ID) error {
-	img, err := l.is.Get(id)
-	if err != nil {
-		return err
-	}
-	parent, err := l.is.Get(parentID)
-	if err != nil {
-		return err
-	}
-	if !checkValidParent(img, parent) {
-		return fmt.Errorf("image %v is not a valid parent for %v", parent.ID(), img.ID())
-	}
-	return l.is.SetParent(id, parentID)
-}
-
-func (l *tarexporter) loadLayer(filename string, rootFS image.RootFS, id string, foreignSrc distribution.Descriptor, progressOutput progress.Output) (layer.Layer, error) {
-	// We use system.OpenSequential to use sequential file access on Windows, avoiding
-	// depleting the standby list. On Linux, this equates to a regular os.Open.
-	rawTar, err := system.OpenSequential(filename)
-	if err != nil {
-		logrus.Debugf("Error reading embedded tar: %v", err)
-		return nil, err
-	}
-	defer rawTar.Close()
-
-	var r io.Reader
-	if progressOutput != nil {
-		fileInfo, err := rawTar.Stat()
-		if err != nil {
-			logrus.Debugf("Error statting file: %v", err)
-			return nil, err
-		}
-
-		r = progress.NewProgressReader(rawTar, progressOutput, fileInfo.Size(), stringid.TruncateID(id), "Loading layer")
-	} else {
-		r = rawTar
-	}
-
-	inflatedLayerData, err := archive.DecompressStream(r)
-	if err != nil {
-		return nil, err
-	}
-	defer inflatedLayerData.Close()
-
-	if ds, ok := l.ls.(layer.DescribableStore); ok {
-		return ds.RegisterWithDescriptor(inflatedLayerData, rootFS.ChainID(), foreignSrc)
-	}
-	return l.ls.Register(inflatedLayerData, rootFS.ChainID())
-}
-
-func (l *tarexporter) setLoadedTag(ref reference.NamedTagged, imgID digest.Digest, outStream io.Writer) error {
-	if prevID, err := l.rs.Get(ref); err == nil && prevID != imgID {
-		fmt.Fprintf(outStream, "The image %s already exists, renaming the old one with ID %s to empty string\n", ref.String(), string(prevID)) // todo: this message is wrong in case of multiple tags
-	}
-
-	if err := l.rs.AddTag(ref, imgID, true); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (l *tarexporter) legacyLoad(tmpDir string, outStream io.Writer, progressOutput progress.Output) error {
-	legacyLoadedMap := make(map[string]image.ID)
-
-	dirs, err := ioutil.ReadDir(tmpDir)
-	if err != nil {
-		return err
-	}
-
-	// every dir represents an image
-	for _, d := range dirs {
-		if d.IsDir() {
-			if err := l.legacyLoadImage(d.Name(), tmpDir, legacyLoadedMap, progressOutput); err != nil {
-				return err
-			}
-		}
-	}
-
-	// load tags from repositories file
-	repositoriesPath, err := safePath(tmpDir, legacyRepositoriesFileName)
-	if err != nil {
-		return err
-	}
-	repositoriesFile, err := os.Open(repositoriesPath)
-	if err != nil {
-		return err
-	}
-	defer repositoriesFile.Close()
-
-	repositories := make(map[string]map[string]string)
-	if err := json.NewDecoder(repositoriesFile).Decode(&repositories); err != nil {
-		return err
-	}
-
-	for name, tagMap := range repositories {
-		for tag, oldID := range tagMap {
-			imgID, ok := legacyLoadedMap[oldID]
-			if !ok {
-				return fmt.Errorf("invalid target ID: %v", oldID)
-			}
-			named, err := reference.WithName(name)
-			if err != nil {
-				return err
-			}
-			ref, err := reference.WithTag(named, tag)
-			if err != nil {
-				return err
-			}
-			l.setLoadedTag(ref, imgID.Digest(), outStream)
-		}
-	}
-
-	return nil
-}
-
-func (l *tarexporter) legacyLoadImage(oldID, sourceDir string, loadedMap map[string]image.ID, progressOutput progress.Output) error {
-	if _, loaded := loadedMap[oldID]; loaded {
-		return nil
-	}
-	configPath, err := safePath(sourceDir, filepath.Join(oldID, legacyConfigFileName))
-	if err != nil {
-		return err
-	}
-	imageJSON, err := ioutil.ReadFile(configPath)
-	if err != nil {
-		logrus.Debugf("Error reading json: %v", err)
-		return err
-	}
-
-	var img struct{ Parent string }
-	if err := json.Unmarshal(imageJSON, &img); err != nil {
-		return err
-	}
-
-	var parentID image.ID
-	if img.Parent != "" {
-		for {
-			var loaded bool
-			if parentID, loaded = loadedMap[img.Parent]; !loaded {
-				if err := l.legacyLoadImage(img.Parent, sourceDir, loadedMap, progressOutput); err != nil {
-					return err
-				}
-			} else {
-				break
-			}
-		}
-	}
-
-	// todo: try to connect with migrate code
-	rootFS := image.NewRootFS()
-	var history []image.History
-
-	if parentID != "" {
-		parentImg, err := l.is.Get(parentID)
-		if err != nil {
-			return err
-		}
-
-		rootFS = parentImg.RootFS
-		history = parentImg.History
-	}
-
-	layerPath, err := safePath(sourceDir, filepath.Join(oldID, legacyLayerFileName))
-	if err != nil {
-		return err
-	}
-	newLayer, err := l.loadLayer(layerPath, *rootFS, oldID, distribution.Descriptor{}, progressOutput)
-	if err != nil {
-		return err
-	}
-	rootFS.Append(newLayer.DiffID())
-
-	h, err := v1.HistoryFromConfig(imageJSON, false)
-	if err != nil {
-		return err
-	}
-	history = append(history, h)
-
-	config, err := v1.MakeConfigFromV1Config(imageJSON, rootFS, history)
-	if err != nil {
-		return err
-	}
-	imgID, err := l.is.Create(config)
-	if err != nil {
-		return err
-	}
-
-	metadata, err := l.ls.Release(newLayer)
-	layer.LogReleaseMetadata(metadata)
-	if err != nil {
-		return err
-	}
-
-	if parentID != "" {
-		if err := l.is.SetParent(imgID, parentID); err != nil {
-			return err
-		}
-	}
-
-	loadedMap[oldID] = imgID
-	return nil
-}
-
-func safePath(base, path string) (string, error) {
-	return symlink.FollowSymlinkInScope(filepath.Join(base, path), base)
-}
-
-type parentLink struct {
-	id, parentID image.ID
-}
-
-func validatedParentLinks(pl []parentLink) (ret []parentLink) {
-mainloop:
-	for i, p := range pl {
-		ret = append(ret, p)
-		for _, p2 := range pl {
-			if p2.id == p.parentID && p2.id != p.id {
-				continue mainloop
-			}
-		}
-		ret[i].parentID = ""
-	}
-	return
-}
-
-func checkValidParent(img, parent *image.Image) bool {
-	if len(img.History) == 0 && len(parent.History) == 0 {
-		return true // having history is not mandatory
-	}
-	if len(img.History)-len(parent.History) != 1 {
-		return false
-	}
-	for i, h := range parent.History {
-		if !reflect.DeepEqual(h, img.History[i]) {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/image/tarexport/save.go b/installer/vendor/github.com/docker/docker/image/tarexport/save.go
deleted file mode 100644
index 6e3a5bc589..0000000000
--- a/installer/vendor/github.com/docker/docker/image/tarexport/save.go
+++ /dev/null
@@ -1,355 +0,0 @@
-package tarexport
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/reference"
-)
-
-type imageDescriptor struct {
-	refs   []reference.NamedTagged
-	layers []string
-}
-
-type saveSession struct {
-	*tarexporter
-	outDir      string
-	images      map[image.ID]*imageDescriptor
-	savedLayers map[string]struct{}
-	diffIDPaths map[layer.DiffID]string // cache every diffID blob to avoid duplicates
-}
-
-func (l *tarexporter) Save(names []string, outStream io.Writer) error {
-	images, err := l.parseNames(names)
-	if err != nil {
-		return err
-	}
-
-	return (&saveSession{tarexporter: l, images: images}).save(outStream)
-}
-
-func (l *tarexporter) parseNames(names []string) (map[image.ID]*imageDescriptor, error) {
-	imgDescr := make(map[image.ID]*imageDescriptor)
-
-	addAssoc := func(id image.ID, ref reference.Named) {
-		if _, ok := imgDescr[id]; !ok {
-			imgDescr[id] = &imageDescriptor{}
-		}
-
-		if ref != nil {
-			var tagged reference.NamedTagged
-			if _, ok := ref.(reference.Canonical); ok {
-				return
-			}
-			var ok bool
-			if tagged, ok = ref.(reference.NamedTagged); !ok {
-				var err error
-				if tagged, err = reference.WithTag(ref, reference.DefaultTag); err != nil {
-					return
-				}
-			}
-
-			for _, t := range imgDescr[id].refs {
-				if tagged.String() == t.String() {
-					return
-				}
-			}
-			imgDescr[id].refs = append(imgDescr[id].refs, tagged)
-		}
-	}
-
-	for _, name := range names {
-		id, ref, err := reference.ParseIDOrReference(name)
-		if err != nil {
-			return nil, err
-		}
-		if id != "" {
-			_, err := l.is.Get(image.IDFromDigest(id))
-			if err != nil {
-				return nil, err
-			}
-			addAssoc(image.IDFromDigest(id), nil)
-			continue
-		}
-		if ref.Name() == string(digest.Canonical) {
-			imgID, err := l.is.Search(name)
-			if err != nil {
-				return nil, err
-			}
-			addAssoc(imgID, nil)
-			continue
-		}
-		if reference.IsNameOnly(ref) {
-			assocs := l.rs.ReferencesByName(ref)
-			for _, assoc := range assocs {
-				addAssoc(image.IDFromDigest(assoc.ID), assoc.Ref)
-			}
-			if len(assocs) == 0 {
-				imgID, err := l.is.Search(name)
-				if err != nil {
-					return nil, err
-				}
-				addAssoc(imgID, nil)
-			}
-			continue
-		}
-		id, err = l.rs.Get(ref)
-		if err != nil {
-			return nil, err
-		}
-		addAssoc(image.IDFromDigest(id), ref)
-
-	}
-	return imgDescr, nil
-}
-
-func (s *saveSession) save(outStream io.Writer) error {
-	s.savedLayers = make(map[string]struct{})
-	s.diffIDPaths = make(map[layer.DiffID]string)
-
-	// get image json
-	tempDir, err := ioutil.TempDir("", "docker-export-")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tempDir)
-
-	s.outDir = tempDir
-	reposLegacy := make(map[string]map[string]string)
-
-	var manifest []manifestItem
-	var parentLinks []parentLink
-
-	for id, imageDescr := range s.images {
-		foreignSrcs, err := s.saveImage(id)
-		if err != nil {
-			return err
-		}
-
-		var repoTags []string
-		var layers []string
-
-		for _, ref := range imageDescr.refs {
-			if _, ok := reposLegacy[ref.Name()]; !ok {
-				reposLegacy[ref.Name()] = make(map[string]string)
-			}
-			reposLegacy[ref.Name()][ref.Tag()] = imageDescr.layers[len(imageDescr.layers)-1]
-			repoTags = append(repoTags, ref.String())
-		}
-
-		for _, l := range imageDescr.layers {
-			layers = append(layers, filepath.Join(l, legacyLayerFileName))
-		}
-
-		manifest = append(manifest, manifestItem{
-			Config:       id.Digest().Hex() + ".json",
-			RepoTags:     repoTags,
-			Layers:       layers,
-			LayerSources: foreignSrcs,
-		})
-
-		parentID, _ := s.is.GetParent(id)
-		parentLinks = append(parentLinks, parentLink{id, parentID})
-		s.tarexporter.loggerImgEvent.LogImageEvent(id.String(), id.String(), "save")
-	}
-
-	for i, p := range validatedParentLinks(parentLinks) {
-		if p.parentID != "" {
-			manifest[i].Parent = p.parentID
-		}
-	}
-
-	if len(reposLegacy) > 0 {
-		reposFile := filepath.Join(tempDir, legacyRepositoriesFileName)
-		rf, err := os.OpenFile(reposFile, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-		if err != nil {
-			return err
-		}
-
-		if err := json.NewEncoder(rf).Encode(reposLegacy); err != nil {
-			rf.Close()
-			return err
-		}
-
-		rf.Close()
-
-		if err := system.Chtimes(reposFile, time.Unix(0, 0), time.Unix(0, 0)); err != nil {
-			return err
-		}
-	}
-
-	manifestFileName := filepath.Join(tempDir, manifestFileName)
-	f, err := os.OpenFile(manifestFileName, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0644)
-	if err != nil {
-		return err
-	}
-
-	if err := json.NewEncoder(f).Encode(manifest); err != nil {
-		f.Close()
-		return err
-	}
-
-	f.Close()
-
-	if err := system.Chtimes(manifestFileName, time.Unix(0, 0), time.Unix(0, 0)); err != nil {
-		return err
-	}
-
-	fs, err := archive.Tar(tempDir, archive.Uncompressed)
-	if err != nil {
-		return err
-	}
-	defer fs.Close()
-
-	if _, err := io.Copy(outStream, fs); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (s *saveSession) saveImage(id image.ID) (map[layer.DiffID]distribution.Descriptor, error) {
-	img, err := s.is.Get(id)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(img.RootFS.DiffIDs) == 0 {
-		return nil, fmt.Errorf("empty export - not implemented")
-	}
-
-	var parent digest.Digest
-	var layers []string
-	var foreignSrcs map[layer.DiffID]distribution.Descriptor
-	for i := range img.RootFS.DiffIDs {
-		v1Img := image.V1Image{
-			Created: img.Created,
-		}
-		if i == len(img.RootFS.DiffIDs)-1 {
-			v1Img = img.V1Image
-		}
-		rootFS := *img.RootFS
-		rootFS.DiffIDs = rootFS.DiffIDs[:i+1]
-		v1ID, err := v1.CreateID(v1Img, rootFS.ChainID(), parent)
-		if err != nil {
-			return nil, err
-		}
-
-		v1Img.ID = v1ID.Hex()
-		if parent != "" {
-			v1Img.Parent = parent.Hex()
-		}
-
-		src, err := s.saveLayer(rootFS.ChainID(), v1Img, img.Created)
-		if err != nil {
-			return nil, err
-		}
-		layers = append(layers, v1Img.ID)
-		parent = v1ID
-		if src.Digest != "" {
-			if foreignSrcs == nil {
-				foreignSrcs = make(map[layer.DiffID]distribution.Descriptor)
-			}
-			foreignSrcs[img.RootFS.DiffIDs[i]] = src
-		}
-	}
-
-	configFile := filepath.Join(s.outDir, id.Digest().Hex()+".json")
-	if err := ioutil.WriteFile(configFile, img.RawJSON(), 0644); err != nil {
-		return nil, err
-	}
-	if err := system.Chtimes(configFile, img.Created, img.Created); err != nil {
-		return nil, err
-	}
-
-	s.images[id].layers = layers
-	return foreignSrcs, nil
-}
-
-func (s *saveSession) saveLayer(id layer.ChainID, legacyImg image.V1Image, createdTime time.Time) (distribution.Descriptor, error) {
-	if _, exists := s.savedLayers[legacyImg.ID]; exists {
-		return distribution.Descriptor{}, nil
-	}
-
-	outDir := filepath.Join(s.outDir, legacyImg.ID)
-	if err := os.Mkdir(outDir, 0755); err != nil {
-		return distribution.Descriptor{}, err
-	}
-
-	// todo: why is this version file here?
-	if err := ioutil.WriteFile(filepath.Join(outDir, legacyVersionFileName), []byte("1.0"), 0644); err != nil {
-		return distribution.Descriptor{}, err
-	}
-
-	imageConfig, err := json.Marshal(legacyImg)
-	if err != nil {
-		return distribution.Descriptor{}, err
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(outDir, legacyConfigFileName), imageConfig, 0644); err != nil {
-		return distribution.Descriptor{}, err
-	}
-
-	// serialize filesystem
-	layerPath := filepath.Join(outDir, legacyLayerFileName)
-	l, err := s.ls.Get(id)
-	if err != nil {
-		return distribution.Descriptor{}, err
-	}
-	defer layer.ReleaseAndLog(s.ls, l)
-
-	if oldPath, exists := s.diffIDPaths[l.DiffID()]; exists {
-		relPath, err := filepath.Rel(outDir, oldPath)
-		if err != nil {
-			return distribution.Descriptor{}, err
-		}
-		os.Symlink(relPath, layerPath)
-	} else {
-		// Use system.CreateSequential rather than os.Create. This ensures sequential
-		// file access on Windows to avoid eating into MM standby list.
-		// On Linux, this equates to a regular os.Create.
-		tarFile, err := system.CreateSequential(layerPath)
-		if err != nil {
-			return distribution.Descriptor{}, err
-		}
-		defer tarFile.Close()
-
-		arch, err := l.TarStream()
-		if err != nil {
-			return distribution.Descriptor{}, err
-		}
-		defer arch.Close()
-
-		if _, err := io.Copy(tarFile, arch); err != nil {
-			return distribution.Descriptor{}, err
-		}
-
-		for _, fname := range []string{"", legacyVersionFileName, legacyConfigFileName, legacyLayerFileName} {
-			// todo: maybe save layer created timestamp?
-			if err := system.Chtimes(filepath.Join(outDir, fname), createdTime, createdTime); err != nil {
-				return distribution.Descriptor{}, err
-			}
-		}
-
-		s.diffIDPaths[l.DiffID()] = layerPath
-	}
-	s.savedLayers[legacyImg.ID] = struct{}{}
-
-	var src distribution.Descriptor
-	if fs, ok := l.(distribution.Describable); ok {
-		src = fs.Descriptor()
-	}
-	return src, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/image/tarexport/tarexport.go b/installer/vendor/github.com/docker/docker/image/tarexport/tarexport.go
deleted file mode 100644
index c0be95480e..0000000000
--- a/installer/vendor/github.com/docker/docker/image/tarexport/tarexport.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package tarexport
-
-import (
-	"github.com/docker/distribution"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/reference"
-)
-
-const (
-	manifestFileName           = "manifest.json"
-	legacyLayerFileName        = "layer.tar"
-	legacyConfigFileName       = "json"
-	legacyVersionFileName      = "VERSION"
-	legacyRepositoriesFileName = "repositories"
-)
-
-type manifestItem struct {
-	Config       string
-	RepoTags     []string
-	Layers       []string
-	Parent       image.ID                                 `json:",omitempty"`
-	LayerSources map[layer.DiffID]distribution.Descriptor `json:",omitempty"`
-}
-
-type tarexporter struct {
-	is             image.Store
-	ls             layer.Store
-	rs             reference.Store
-	loggerImgEvent LogImageEvent
-}
-
-// LogImageEvent defines interface for event generation related to image tar(load and save) operations
-type LogImageEvent interface {
-	//LogImageEvent generates an event related to an image operation
-	LogImageEvent(imageID, refName, action string)
-}
-
-// NewTarExporter returns new ImageExporter for tar packages
-func NewTarExporter(is image.Store, ls layer.Store, rs reference.Store, loggerImgEvent LogImageEvent) image.Exporter {
-	return &tarexporter{
-		is:             is,
-		ls:             ls,
-		rs:             rs,
-		loggerImgEvent: loggerImgEvent,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/image/v1/imagev1.go b/installer/vendor/github.com/docker/docker/image/v1/imagev1.go
deleted file mode 100644
index d498ddbc00..0000000000
--- a/installer/vendor/github.com/docker/docker/image/v1/imagev1.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package v1
-
-import (
-	"encoding/json"
-	"fmt"
-	"reflect"
-	"regexp"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-)
-
-var validHex = regexp.MustCompile(`^([a-f0-9]{64})$`)
-
-// noFallbackMinVersion is the minimum version for which v1compatibility
-// information will not be marshaled through the Image struct to remove
-// blank fields.
-var noFallbackMinVersion = "1.8.3"
-
-// HistoryFromConfig creates a History struct from v1 configuration JSON
-func HistoryFromConfig(imageJSON []byte, emptyLayer bool) (image.History, error) {
-	h := image.History{}
-	var v1Image image.V1Image
-	if err := json.Unmarshal(imageJSON, &v1Image); err != nil {
-		return h, err
-	}
-
-	return image.History{
-		Author:     v1Image.Author,
-		Created:    v1Image.Created,
-		CreatedBy:  strings.Join(v1Image.ContainerConfig.Cmd, " "),
-		Comment:    v1Image.Comment,
-		EmptyLayer: emptyLayer,
-	}, nil
-}
-
-// CreateID creates an ID from v1 image, layerID and parent ID.
-// Used for backwards compatibility with old clients.
-func CreateID(v1Image image.V1Image, layerID layer.ChainID, parent digest.Digest) (digest.Digest, error) {
-	v1Image.ID = ""
-	v1JSON, err := json.Marshal(v1Image)
-	if err != nil {
-		return "", err
-	}
-
-	var config map[string]*json.RawMessage
-	if err := json.Unmarshal(v1JSON, &config); err != nil {
-		return "", err
-	}
-
-	// FIXME: note that this is slightly incompatible with RootFS logic
-	config["layer_id"] = rawJSON(layerID)
-	if parent != "" {
-		config["parent"] = rawJSON(parent)
-	}
-
-	configJSON, err := json.Marshal(config)
-	if err != nil {
-		return "", err
-	}
-	logrus.Debugf("CreateV1ID %s", configJSON)
-
-	return digest.FromBytes(configJSON), nil
-}
-
-// MakeConfigFromV1Config creates an image config from the legacy V1 config format.
-func MakeConfigFromV1Config(imageJSON []byte, rootfs *image.RootFS, history []image.History) ([]byte, error) {
-	var dver struct {
-		DockerVersion string `json:"docker_version"`
-	}
-
-	if err := json.Unmarshal(imageJSON, &dver); err != nil {
-		return nil, err
-	}
-
-	useFallback := versions.LessThan(dver.DockerVersion, noFallbackMinVersion)
-
-	if useFallback {
-		var v1Image image.V1Image
-		err := json.Unmarshal(imageJSON, &v1Image)
-		if err != nil {
-			return nil, err
-		}
-		imageJSON, err = json.Marshal(v1Image)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	var c map[string]*json.RawMessage
-	if err := json.Unmarshal(imageJSON, &c); err != nil {
-		return nil, err
-	}
-
-	delete(c, "id")
-	delete(c, "parent")
-	delete(c, "Size") // Size is calculated from data on disk and is inconsistent
-	delete(c, "parent_id")
-	delete(c, "layer_id")
-	delete(c, "throwaway")
-
-	c["rootfs"] = rawJSON(rootfs)
-	c["history"] = rawJSON(history)
-
-	return json.Marshal(c)
-}
-
-// MakeV1ConfigFromConfig creates an legacy V1 image config from an Image struct
-func MakeV1ConfigFromConfig(img *image.Image, v1ID, parentV1ID string, throwaway bool) ([]byte, error) {
-	// Top-level v1compatibility string should be a modified version of the
-	// image config.
-	var configAsMap map[string]*json.RawMessage
-	if err := json.Unmarshal(img.RawJSON(), &configAsMap); err != nil {
-		return nil, err
-	}
-
-	// Delete fields that didn't exist in old manifest
-	imageType := reflect.TypeOf(img).Elem()
-	for i := 0; i < imageType.NumField(); i++ {
-		f := imageType.Field(i)
-		jsonName := strings.Split(f.Tag.Get("json"), ",")[0]
-		// Parent is handled specially below.
-		if jsonName != "" && jsonName != "parent" {
-			delete(configAsMap, jsonName)
-		}
-	}
-	configAsMap["id"] = rawJSON(v1ID)
-	if parentV1ID != "" {
-		configAsMap["parent"] = rawJSON(parentV1ID)
-	}
-	if throwaway {
-		configAsMap["throwaway"] = rawJSON(true)
-	}
-
-	return json.Marshal(configAsMap)
-}
-
-func rawJSON(value interface{}) *json.RawMessage {
-	jsonval, err := json.Marshal(value)
-	if err != nil {
-		return nil
-	}
-	return (*json.RawMessage)(&jsonval)
-}
-
-// ValidateID checks whether an ID string is a valid image ID.
-func ValidateID(id string) error {
-	if ok := validHex.MatchString(id); !ok {
-		return fmt.Errorf("image ID %q is invalid", id)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/image/v1/imagev1_test.go b/installer/vendor/github.com/docker/docker/image/v1/imagev1_test.go
deleted file mode 100644
index 936c55e4c5..0000000000
--- a/installer/vendor/github.com/docker/docker/image/v1/imagev1_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package v1
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/docker/docker/image"
-)
-
-func TestMakeV1ConfigFromConfig(t *testing.T) {
-	img := &image.Image{
-		V1Image: image.V1Image{
-			ID:     "v2id",
-			Parent: "v2parent",
-			OS:     "os",
-		},
-		OSVersion: "osversion",
-		RootFS: &image.RootFS{
-			Type: "layers",
-		},
-	}
-	v2js, err := json.Marshal(img)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Convert the image back in order to get RawJSON() support.
-	img, err = image.NewFromJSON(v2js)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	js, err := MakeV1ConfigFromConfig(img, "v1id", "v1parent", false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	newimg := &image.Image{}
-	err = json.Unmarshal(js, newimg)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if newimg.V1Image.ID != "v1id" || newimg.Parent != "v1parent" {
-		t.Error("ids should have changed", newimg.V1Image.ID, newimg.V1Image.Parent)
-	}
-
-	if newimg.RootFS != nil {
-		t.Error("rootfs should have been removed")
-	}
-
-	if newimg.V1Image.OS != "os" {
-		t.Error("os should have been preserved")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/benchmark_test.go b/installer/vendor/github.com/docker/docker/integration-cli/benchmark_test.go
deleted file mode 100644
index b87e131b7e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/benchmark_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"sync"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) BenchmarkConcurrentContainerActions(c *check.C) {
-	maxConcurrency := runtime.GOMAXPROCS(0)
-	numIterations := c.N
-	outerGroup := &sync.WaitGroup{}
-	outerGroup.Add(maxConcurrency)
-	chErr := make(chan error, numIterations*2*maxConcurrency)
-
-	for i := 0; i < maxConcurrency; i++ {
-		go func() {
-			defer outerGroup.Done()
-			innerGroup := &sync.WaitGroup{}
-			innerGroup.Add(2)
-
-			go func() {
-				defer innerGroup.Done()
-				for i := 0; i < numIterations; i++ {
-					args := []string{"run", "-d", defaultSleepImage}
-					args = append(args, sleepCommandForDaemonPlatform()...)
-					out, _, err := dockerCmdWithError(args...)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-						return
-					}
-
-					id := strings.TrimSpace(out)
-					tmpDir, err := ioutil.TempDir("", "docker-concurrent-test-"+id)
-					if err != nil {
-						chErr <- err
-						return
-					}
-					defer os.RemoveAll(tmpDir)
-					out, _, err = dockerCmdWithError("cp", id+":/tmp", tmpDir)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-						return
-					}
-
-					out, _, err = dockerCmdWithError("kill", id)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-					}
-
-					out, _, err = dockerCmdWithError("start", id)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-					}
-
-					out, _, err = dockerCmdWithError("kill", id)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-					}
-
-					// don't do an rm -f here since it can potentially ignore errors from the graphdriver
-					out, _, err = dockerCmdWithError("rm", id)
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-					}
-				}
-			}()
-
-			go func() {
-				defer innerGroup.Done()
-				for i := 0; i < numIterations; i++ {
-					out, _, err := dockerCmdWithError("ps")
-					if err != nil {
-						chErr <- fmt.Errorf(out)
-					}
-				}
-			}()
-
-			innerGroup.Wait()
-		}()
-	}
-
-	outerGroup.Wait()
-	close(chErr)
-
-	for err := range chErr {
-		c.Assert(err, checker.IsNil)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/check_test.go b/installer/vendor/github.com/docker/docker/integration-cli/check_test.go
deleted file mode 100644
index 7084d6f8af..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/check_test.go
+++ /dev/null
@@ -1,383 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"sync"
-	"syscall"
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/pkg/reexec"
-	"github.com/go-check/check"
-)
-
-func Test(t *testing.T) {
-	reexec.Init() // This is required for external graphdriver tests
-
-	if !isLocalDaemon {
-		fmt.Println("INFO: Testing against a remote daemon")
-	} else {
-		fmt.Println("INFO: Testing against a local daemon")
-	}
-
-	if daemonPlatform == "linux" {
-		ensureFrozenImagesLinux(t)
-	}
-	check.TestingT(t)
-}
-
-func init() {
-	check.Suite(&DockerSuite{})
-}
-
-type DockerSuite struct {
-}
-
-func (s *DockerSuite) OnTimeout(c *check.C) {
-	if daemonPid > 0 && isLocalDaemon {
-		signalDaemonDump(daemonPid)
-	}
-}
-
-func (s *DockerSuite) TearDownTest(c *check.C) {
-	unpauseAllContainers()
-	deleteAllContainers()
-	deleteAllImages()
-	deleteAllVolumes()
-	deleteAllNetworks()
-	deleteAllPlugins()
-}
-
-func init() {
-	check.Suite(&DockerRegistrySuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerRegistrySuite struct {
-	ds  *DockerSuite
-	reg *testRegistryV2
-	d   *Daemon
-}
-
-func (s *DockerRegistrySuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerRegistrySuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux, RegistryHosting)
-	s.reg = setupRegistry(c, false, "", "")
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerRegistrySuite) TearDownTest(c *check.C) {
-	if s.reg != nil {
-		s.reg.Close()
-	}
-	if s.d != nil {
-		s.d.Stop()
-	}
-	s.ds.TearDownTest(c)
-}
-
-func init() {
-	check.Suite(&DockerSchema1RegistrySuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerSchema1RegistrySuite struct {
-	ds  *DockerSuite
-	reg *testRegistryV2
-	d   *Daemon
-}
-
-func (s *DockerSchema1RegistrySuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerSchema1RegistrySuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux, RegistryHosting, NotArm64)
-	s.reg = setupRegistry(c, true, "", "")
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TearDownTest(c *check.C) {
-	if s.reg != nil {
-		s.reg.Close()
-	}
-	if s.d != nil {
-		s.d.Stop()
-	}
-	s.ds.TearDownTest(c)
-}
-
-func init() {
-	check.Suite(&DockerRegistryAuthHtpasswdSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerRegistryAuthHtpasswdSuite struct {
-	ds  *DockerSuite
-	reg *testRegistryV2
-	d   *Daemon
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux, RegistryHosting)
-	s.reg = setupRegistry(c, false, "htpasswd", "")
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TearDownTest(c *check.C) {
-	if s.reg != nil {
-		out, err := s.d.Cmd("logout", privateRegistryURL)
-		c.Assert(err, check.IsNil, check.Commentf(out))
-		s.reg.Close()
-	}
-	if s.d != nil {
-		s.d.Stop()
-	}
-	s.ds.TearDownTest(c)
-}
-
-func init() {
-	check.Suite(&DockerRegistryAuthTokenSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerRegistryAuthTokenSuite struct {
-	ds  *DockerSuite
-	reg *testRegistryV2
-	d   *Daemon
-}
-
-func (s *DockerRegistryAuthTokenSuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerRegistryAuthTokenSuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux, RegistryHosting)
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerRegistryAuthTokenSuite) TearDownTest(c *check.C) {
-	if s.reg != nil {
-		out, err := s.d.Cmd("logout", privateRegistryURL)
-		c.Assert(err, check.IsNil, check.Commentf(out))
-		s.reg.Close()
-	}
-	if s.d != nil {
-		s.d.Stop()
-	}
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerRegistryAuthTokenSuite) setupRegistryWithTokenService(c *check.C, tokenURL string) {
-	if s == nil {
-		c.Fatal("registry suite isn't initialized")
-	}
-	s.reg = setupRegistry(c, false, "token", tokenURL)
-}
-
-func init() {
-	check.Suite(&DockerDaemonSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerDaemonSuite struct {
-	ds *DockerSuite
-	d  *Daemon
-}
-
-func (s *DockerDaemonSuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerDaemonSuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerDaemonSuite) TearDownTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	if s.d != nil {
-		s.d.Stop()
-	}
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerDaemonSuite) TearDownSuite(c *check.C) {
-	filepath.Walk(daemonSockRoot, func(path string, fi os.FileInfo, err error) error {
-		if err != nil {
-			// ignore errors here
-			// not cleaning up sockets is not really an error
-			return nil
-		}
-		if fi.Mode() == os.ModeSocket {
-			syscall.Unlink(path)
-		}
-		return nil
-	})
-	os.RemoveAll(daemonSockRoot)
-}
-
-const defaultSwarmPort = 2477
-
-func init() {
-	check.Suite(&DockerSwarmSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerSwarmSuite struct {
-	server      *httptest.Server
-	ds          *DockerSuite
-	daemons     []*SwarmDaemon
-	daemonsLock sync.Mutex // protect access to daemons
-	portIndex   int
-}
-
-func (s *DockerSwarmSuite) OnTimeout(c *check.C) {
-	s.daemonsLock.Lock()
-	defer s.daemonsLock.Unlock()
-	for _, d := range s.daemons {
-		d.DumpStackAndQuit()
-	}
-}
-
-func (s *DockerSwarmSuite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-}
-
-func (s *DockerSwarmSuite) AddDaemon(c *check.C, joinSwarm, manager bool) *SwarmDaemon {
-	d := &SwarmDaemon{
-		Daemon: NewDaemon(c),
-		port:   defaultSwarmPort + s.portIndex,
-	}
-	d.listenAddr = fmt.Sprintf("0.0.0.0:%d", d.port)
-	args := []string{"--iptables=false", "--swarm-default-advertise-addr=lo"} // avoid networking conflicts
-	if experimentalDaemon {
-		args = append(args, "--experimental")
-	}
-	err := d.StartWithBusybox(args...)
-	c.Assert(err, check.IsNil)
-
-	if joinSwarm == true {
-		if len(s.daemons) > 0 {
-			tokens := s.daemons[0].joinTokens(c)
-			token := tokens.Worker
-			if manager {
-				token = tokens.Manager
-			}
-			c.Assert(d.Join(swarm.JoinRequest{
-				RemoteAddrs: []string{s.daemons[0].listenAddr},
-				JoinToken:   token,
-			}), check.IsNil)
-		} else {
-			c.Assert(d.Init(swarm.InitRequest{}), check.IsNil)
-		}
-	}
-
-	s.portIndex++
-	s.daemonsLock.Lock()
-	s.daemons = append(s.daemons, d)
-	s.daemonsLock.Unlock()
-
-	return d
-}
-
-func (s *DockerSwarmSuite) TearDownTest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	s.daemonsLock.Lock()
-	for _, d := range s.daemons {
-		d.Stop()
-		// raft state file is quite big (64MB) so remove it after every test
-		walDir := filepath.Join(d.root, "swarm/raft/wal")
-		if err := os.RemoveAll(walDir); err != nil {
-			c.Logf("error removing %v: %v", walDir, err)
-		}
-
-		cleanupExecRoot(c, d.execRoot)
-	}
-	s.daemons = nil
-	s.daemonsLock.Unlock()
-
-	s.portIndex = 0
-	s.ds.TearDownTest(c)
-}
-
-func init() {
-	check.Suite(&DockerTrustSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerTrustSuite struct {
-	ds  *DockerSuite
-	reg *testRegistryV2
-	not *testNotary
-}
-
-func (s *DockerTrustSuite) SetUpTest(c *check.C) {
-	testRequires(c, RegistryHosting, NotaryServerHosting)
-	s.reg = setupRegistry(c, false, "", "")
-	s.not = setupNotary(c)
-}
-
-func (s *DockerTrustSuite) TearDownTest(c *check.C) {
-	if s.reg != nil {
-		s.reg.Close()
-	}
-	if s.not != nil {
-		s.not.Close()
-	}
-
-	// Remove trusted keys and metadata after test
-	os.RemoveAll(filepath.Join(cliconfig.ConfigDir(), "trust"))
-	s.ds.TearDownTest(c)
-}
-
-func init() {
-	ds := &DockerSuite{}
-	check.Suite(&DockerTrustedSwarmSuite{
-		trustSuite: DockerTrustSuite{
-			ds: ds,
-		},
-		swarmSuite: DockerSwarmSuite{
-			ds: ds,
-		},
-	})
-}
-
-type DockerTrustedSwarmSuite struct {
-	swarmSuite DockerSwarmSuite
-	trustSuite DockerTrustSuite
-	reg        *testRegistryV2
-	not        *testNotary
-}
-
-func (s *DockerTrustedSwarmSuite) SetUpTest(c *check.C) {
-	s.swarmSuite.SetUpTest(c)
-	s.trustSuite.SetUpTest(c)
-}
-
-func (s *DockerTrustedSwarmSuite) TearDownTest(c *check.C) {
-	s.trustSuite.TearDownTest(c)
-	s.swarmSuite.TearDownTest(c)
-}
-
-func (s *DockerTrustedSwarmSuite) OnTimeout(c *check.C) {
-	s.swarmSuite.OnTimeout(c)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/daemon.go b/installer/vendor/github.com/docker/docker/integration-cli/daemon.go
deleted file mode 100644
index 9fd3f1e82d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/daemon.go
+++ /dev/null
@@ -1,608 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/go-check/check"
-)
-
-var daemonSockRoot = filepath.Join(os.TempDir(), "docker-integration")
-
-// Daemon represents a Docker daemon for the testing framework.
-type Daemon struct {
-	GlobalFlags []string
-
-	id                string
-	c                 *check.C
-	logFile           *os.File
-	folder            string
-	root              string
-	stdin             io.WriteCloser
-	stdout, stderr    io.ReadCloser
-	cmd               *exec.Cmd
-	storageDriver     string
-	wait              chan error
-	userlandProxy     bool
-	useDefaultHost    bool
-	useDefaultTLSHost bool
-	execRoot          string
-}
-
-type clientConfig struct {
-	transport *http.Transport
-	scheme    string
-	addr      string
-}
-
-// NewDaemon returns a Daemon instance to be used for testing.
-// This will create a directory such as d123456789 in the folder specified by $DEST.
-// The daemon will not automatically start.
-func NewDaemon(c *check.C) *Daemon {
-	dest := os.Getenv("DEST")
-	c.Assert(dest, check.Not(check.Equals), "", check.Commentf("Please set the DEST environment variable"))
-
-	err := os.MkdirAll(daemonSockRoot, 0700)
-	c.Assert(err, checker.IsNil, check.Commentf("could not create daemon socket root"))
-
-	id := fmt.Sprintf("d%s", stringid.TruncateID(stringid.GenerateRandomID()))
-	dir := filepath.Join(dest, id)
-	daemonFolder, err := filepath.Abs(dir)
-	c.Assert(err, check.IsNil, check.Commentf("Could not make %q an absolute path", dir))
-	daemonRoot := filepath.Join(daemonFolder, "root")
-
-	c.Assert(os.MkdirAll(daemonRoot, 0755), check.IsNil, check.Commentf("Could not create daemon root %q", dir))
-
-	userlandProxy := true
-	if env := os.Getenv("DOCKER_USERLANDPROXY"); env != "" {
-		if val, err := strconv.ParseBool(env); err != nil {
-			userlandProxy = val
-		}
-	}
-
-	return &Daemon{
-		id:            id,
-		c:             c,
-		folder:        daemonFolder,
-		root:          daemonRoot,
-		storageDriver: os.Getenv("DOCKER_GRAPHDRIVER"),
-		userlandProxy: userlandProxy,
-		execRoot:      filepath.Join(os.TempDir(), "docker-execroot", id),
-	}
-}
-
-// RootDir returns the root directory of the daemon.
-func (d *Daemon) RootDir() string {
-	return d.root
-}
-
-func (d *Daemon) getClientConfig() (*clientConfig, error) {
-	var (
-		transport *http.Transport
-		scheme    string
-		addr      string
-		proto     string
-	)
-	if d.useDefaultTLSHost {
-		option := &tlsconfig.Options{
-			CAFile:   "fixtures/https/ca.pem",
-			CertFile: "fixtures/https/client-cert.pem",
-			KeyFile:  "fixtures/https/client-key.pem",
-		}
-		tlsConfig, err := tlsconfig.Client(*option)
-		if err != nil {
-			return nil, err
-		}
-		transport = &http.Transport{
-			TLSClientConfig: tlsConfig,
-		}
-		addr = fmt.Sprintf("%s:%d", opts.DefaultHTTPHost, opts.DefaultTLSHTTPPort)
-		scheme = "https"
-		proto = "tcp"
-	} else if d.useDefaultHost {
-		addr = opts.DefaultUnixSocket
-		proto = "unix"
-		scheme = "http"
-		transport = &http.Transport{}
-	} else {
-		addr = d.sockPath()
-		proto = "unix"
-		scheme = "http"
-		transport = &http.Transport{}
-	}
-
-	d.c.Assert(sockets.ConfigureTransport(transport, proto, addr), check.IsNil)
-
-	return &clientConfig{
-		transport: transport,
-		scheme:    scheme,
-		addr:      addr,
-	}, nil
-}
-
-// Start will start the daemon and return once it is ready to receive requests.
-// You can specify additional daemon flags.
-func (d *Daemon) Start(args ...string) error {
-	logFile, err := os.OpenFile(filepath.Join(d.folder, "docker.log"), os.O_RDWR|os.O_CREATE|os.O_APPEND, 0600)
-	d.c.Assert(err, check.IsNil, check.Commentf("[%s] Could not create %s/docker.log", d.id, d.folder))
-
-	return d.StartWithLogFile(logFile, args...)
-}
-
-// StartWithLogFile will start the daemon and attach its streams to a given file.
-func (d *Daemon) StartWithLogFile(out *os.File, providedArgs ...string) error {
-	dockerdBinary, err := exec.LookPath(dockerdBinary)
-	d.c.Assert(err, check.IsNil, check.Commentf("[%s] could not find docker binary in $PATH", d.id))
-
-	args := append(d.GlobalFlags,
-		"--containerd", "/var/run/docker/libcontainerd/docker-containerd.sock",
-		"--graph", d.root,
-		"--exec-root", d.execRoot,
-		"--pidfile", fmt.Sprintf("%s/docker.pid", d.folder),
-		fmt.Sprintf("--userland-proxy=%t", d.userlandProxy),
-	)
-	if experimentalDaemon {
-		args = append(args, "--experimental", "--init")
-	}
-	if !(d.useDefaultHost || d.useDefaultTLSHost) {
-		args = append(args, []string{"--host", d.sock()}...)
-	}
-	if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
-		args = append(args, []string{"--userns-remap", root}...)
-	}
-
-	// If we don't explicitly set the log-level or debug flag(-D) then
-	// turn on debug mode
-	foundLog := false
-	foundSd := false
-	for _, a := range providedArgs {
-		if strings.Contains(a, "--log-level") || strings.Contains(a, "-D") || strings.Contains(a, "--debug") {
-			foundLog = true
-		}
-		if strings.Contains(a, "--storage-driver") {
-			foundSd = true
-		}
-	}
-	if !foundLog {
-		args = append(args, "--debug")
-	}
-	if d.storageDriver != "" && !foundSd {
-		args = append(args, "--storage-driver", d.storageDriver)
-	}
-
-	args = append(args, providedArgs...)
-	d.cmd = exec.Command(dockerdBinary, args...)
-	d.cmd.Env = append(os.Environ(), "DOCKER_SERVICE_PREFER_OFFLINE_IMAGE=1")
-	d.cmd.Stdout = out
-	d.cmd.Stderr = out
-	d.logFile = out
-
-	if err := d.cmd.Start(); err != nil {
-		return fmt.Errorf("[%s] could not start daemon container: %v", d.id, err)
-	}
-
-	wait := make(chan error)
-
-	go func() {
-		wait <- d.cmd.Wait()
-		d.c.Logf("[%s] exiting daemon", d.id)
-		close(wait)
-	}()
-
-	d.wait = wait
-
-	tick := time.Tick(500 * time.Millisecond)
-	// make sure daemon is ready to receive requests
-	startTime := time.Now().Unix()
-	for {
-		d.c.Logf("[%s] waiting for daemon to start", d.id)
-		if time.Now().Unix()-startTime > 5 {
-			// After 5 seconds, give up
-			return fmt.Errorf("[%s] Daemon exited and never started", d.id)
-		}
-		select {
-		case <-time.After(2 * time.Second):
-			return fmt.Errorf("[%s] timeout: daemon does not respond", d.id)
-		case <-tick:
-			clientConfig, err := d.getClientConfig()
-			if err != nil {
-				return err
-			}
-
-			client := &http.Client{
-				Transport: clientConfig.transport,
-			}
-
-			req, err := http.NewRequest("GET", "/_ping", nil)
-			d.c.Assert(err, check.IsNil, check.Commentf("[%s] could not create new request", d.id))
-			req.URL.Host = clientConfig.addr
-			req.URL.Scheme = clientConfig.scheme
-			resp, err := client.Do(req)
-			if err != nil {
-				continue
-			}
-			if resp.StatusCode != http.StatusOK {
-				d.c.Logf("[%s] received status != 200 OK: %s", d.id, resp.Status)
-			}
-			d.c.Logf("[%s] daemon started", d.id)
-			d.root, err = d.queryRootDir()
-			if err != nil {
-				return fmt.Errorf("[%s] error querying daemon for root directory: %v", d.id, err)
-			}
-			return nil
-		case <-d.wait:
-			return fmt.Errorf("[%s] Daemon exited during startup", d.id)
-		}
-	}
-}
-
-// StartWithBusybox will first start the daemon with Daemon.Start()
-// then save the busybox image from the main daemon and load it into this Daemon instance.
-func (d *Daemon) StartWithBusybox(arg ...string) error {
-	if err := d.Start(arg...); err != nil {
-		return err
-	}
-	return d.LoadBusybox()
-}
-
-// Kill will send a SIGKILL to the daemon
-func (d *Daemon) Kill() error {
-	if d.cmd == nil || d.wait == nil {
-		return errors.New("daemon not started")
-	}
-
-	defer func() {
-		d.logFile.Close()
-		d.cmd = nil
-	}()
-
-	if err := d.cmd.Process.Kill(); err != nil {
-		d.c.Logf("Could not kill daemon: %v", err)
-		return err
-	}
-
-	if err := os.Remove(fmt.Sprintf("%s/docker.pid", d.folder)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// DumpStackAndQuit sends SIGQUIT to the daemon, which triggers it to dump its
-// stack to its log file and exit
-// This is used primarily for gathering debug information on test timeout
-func (d *Daemon) DumpStackAndQuit() {
-	if d.cmd == nil || d.cmd.Process == nil {
-		return
-	}
-	signalDaemonDump(d.cmd.Process.Pid)
-}
-
-// Stop will send a SIGINT every second and wait for the daemon to stop.
-// If it timeouts, a SIGKILL is sent.
-// Stop will not delete the daemon directory. If a purged daemon is needed,
-// instantiate a new one with NewDaemon.
-func (d *Daemon) Stop() error {
-	if d.cmd == nil || d.wait == nil {
-		return errors.New("daemon not started")
-	}
-
-	defer func() {
-		d.logFile.Close()
-		d.cmd = nil
-	}()
-
-	i := 1
-	tick := time.Tick(time.Second)
-
-	if err := d.cmd.Process.Signal(os.Interrupt); err != nil {
-		return fmt.Errorf("could not send signal: %v", err)
-	}
-out1:
-	for {
-		select {
-		case err := <-d.wait:
-			return err
-		case <-time.After(20 * time.Second):
-			// time for stopping jobs and run onShutdown hooks
-			d.c.Logf("timeout: %v", d.id)
-			break out1
-		}
-	}
-
-out2:
-	for {
-		select {
-		case err := <-d.wait:
-			return err
-		case <-tick:
-			i++
-			if i > 5 {
-				d.c.Logf("tried to interrupt daemon for %d times, now try to kill it", i)
-				break out2
-			}
-			d.c.Logf("Attempt #%d: daemon is still running with pid %d", i, d.cmd.Process.Pid)
-			if err := d.cmd.Process.Signal(os.Interrupt); err != nil {
-				return fmt.Errorf("could not send signal: %v", err)
-			}
-		}
-	}
-
-	if err := d.cmd.Process.Kill(); err != nil {
-		d.c.Logf("Could not kill daemon: %v", err)
-		return err
-	}
-
-	if err := os.Remove(fmt.Sprintf("%s/docker.pid", d.folder)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Restart will restart the daemon by first stopping it and then starting it.
-func (d *Daemon) Restart(arg ...string) error {
-	d.Stop()
-	// in the case of tests running a user namespace-enabled daemon, we have resolved
-	// d.root to be the actual final path of the graph dir after the "uid.gid" of
-	// remapped root is added--we need to subtract it from the path before calling
-	// start or else we will continue making subdirectories rather than truly restarting
-	// with the same location/root:
-	if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
-		d.root = filepath.Dir(d.root)
-	}
-	return d.Start(arg...)
-}
-
-// LoadBusybox will load the stored busybox into a newly started daemon
-func (d *Daemon) LoadBusybox() error {
-	bb := filepath.Join(d.folder, "busybox.tar")
-	if _, err := os.Stat(bb); err != nil {
-		if !os.IsNotExist(err) {
-			return fmt.Errorf("unexpected error on busybox.tar stat: %v", err)
-		}
-		// saving busybox image from main daemon
-		if out, err := exec.Command(dockerBinary, "save", "--output", bb, "busybox:latest").CombinedOutput(); err != nil {
-			imagesOut, _ := exec.Command(dockerBinary, "images", "--format", "{{ .Repository }}:{{ .Tag }}").CombinedOutput()
-			return fmt.Errorf("could not save busybox image: %s\n%s", string(out), strings.TrimSpace(string(imagesOut)))
-		}
-	}
-	// loading busybox image to this daemon
-	if out, err := d.Cmd("load", "--input", bb); err != nil {
-		return fmt.Errorf("could not load busybox image: %s", out)
-	}
-	if err := os.Remove(bb); err != nil {
-		d.c.Logf("could not remove %s: %v", bb, err)
-	}
-	return nil
-}
-
-func (d *Daemon) queryRootDir() (string, error) {
-	// update daemon root by asking /info endpoint (to support user
-	// namespaced daemon with root remapped uid.gid directory)
-	clientConfig, err := d.getClientConfig()
-	if err != nil {
-		return "", err
-	}
-
-	client := &http.Client{
-		Transport: clientConfig.transport,
-	}
-
-	req, err := http.NewRequest("GET", "/info", nil)
-	if err != nil {
-		return "", err
-	}
-	req.Header.Set("Content-Type", "application/json")
-	req.URL.Host = clientConfig.addr
-	req.URL.Scheme = clientConfig.scheme
-
-	resp, err := client.Do(req)
-	if err != nil {
-		return "", err
-	}
-	body := ioutils.NewReadCloserWrapper(resp.Body, func() error {
-		return resp.Body.Close()
-	})
-
-	type Info struct {
-		DockerRootDir string
-	}
-	var b []byte
-	var i Info
-	b, err = readBody(body)
-	if err == nil && resp.StatusCode == http.StatusOK {
-		// read the docker root dir
-		if err = json.Unmarshal(b, &i); err == nil {
-			return i.DockerRootDir, nil
-		}
-	}
-	return "", err
-}
-
-func (d *Daemon) sock() string {
-	return fmt.Sprintf("unix://" + d.sockPath())
-}
-
-func (d *Daemon) sockPath() string {
-	return filepath.Join(daemonSockRoot, d.id+".sock")
-}
-
-func (d *Daemon) waitRun(contID string) error {
-	args := []string{"--host", d.sock()}
-	return waitInspectWithArgs(contID, "{{.State.Running}}", "true", 10*time.Second, args...)
-}
-
-func (d *Daemon) getBaseDeviceSize(c *check.C) int64 {
-	infoCmdOutput, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "-H", d.sock(), "info"),
-		exec.Command("grep", "Base Device Size"),
-	)
-	c.Assert(err, checker.IsNil)
-	basesizeSlice := strings.Split(infoCmdOutput, ":")
-	basesize := strings.Trim(basesizeSlice[1], " ")
-	basesize = strings.Trim(basesize, "\n")[:len(basesize)-3]
-	basesizeFloat, err := strconv.ParseFloat(strings.Trim(basesize, " "), 64)
-	c.Assert(err, checker.IsNil)
-	basesizeBytes := int64(basesizeFloat) * (1024 * 1024 * 1024)
-	return basesizeBytes
-}
-
-// Cmd will execute a docker CLI command against this Daemon.
-// Example: d.Cmd("version") will run docker -H unix://path/to/unix.sock version
-func (d *Daemon) Cmd(args ...string) (string, error) {
-	b, err := d.command(args...).CombinedOutput()
-	return string(b), err
-}
-
-func (d *Daemon) command(args ...string) *exec.Cmd {
-	return exec.Command(dockerBinary, d.prependHostArg(args)...)
-}
-
-func (d *Daemon) prependHostArg(args []string) []string {
-	for _, arg := range args {
-		if arg == "--host" || arg == "-H" {
-			return args
-		}
-	}
-	return append([]string{"--host", d.sock()}, args...)
-}
-
-// SockRequest executes a socket request on a daemon and returns statuscode and output.
-func (d *Daemon) SockRequest(method, endpoint string, data interface{}) (int, []byte, error) {
-	jsonData := bytes.NewBuffer(nil)
-	if err := json.NewEncoder(jsonData).Encode(data); err != nil {
-		return -1, nil, err
-	}
-
-	res, body, err := d.SockRequestRaw(method, endpoint, jsonData, "application/json")
-	if err != nil {
-		return -1, nil, err
-	}
-	b, err := readBody(body)
-	return res.StatusCode, b, err
-}
-
-// SockRequestRaw executes a socket request on a daemon and returns an http
-// response and a reader for the output data.
-func (d *Daemon) SockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) {
-	return sockRequestRawToDaemon(method, endpoint, data, ct, d.sock())
-}
-
-// LogFileName returns the path the the daemon's log file
-func (d *Daemon) LogFileName() string {
-	return d.logFile.Name()
-}
-
-func (d *Daemon) getIDByName(name string) (string, error) {
-	return d.inspectFieldWithError(name, "Id")
-}
-
-func (d *Daemon) activeContainers() (ids []string) {
-	out, _ := d.Cmd("ps", "-q")
-	for _, id := range strings.Split(out, "\n") {
-		if id = strings.TrimSpace(id); id != "" {
-			ids = append(ids, id)
-		}
-	}
-	return
-}
-
-func (d *Daemon) inspectFilter(name, filter string) (string, error) {
-	format := fmt.Sprintf("{{%s}}", filter)
-	out, err := d.Cmd("inspect", "-f", format, name)
-	if err != nil {
-		return "", fmt.Errorf("failed to inspect %s: %s", name, out)
-	}
-	return strings.TrimSpace(out), nil
-}
-
-func (d *Daemon) inspectFieldWithError(name, field string) (string, error) {
-	return d.inspectFilter(name, fmt.Sprintf(".%s", field))
-}
-
-func (d *Daemon) findContainerIP(id string) string {
-	out, err := d.Cmd("inspect", fmt.Sprintf("--format='{{ .NetworkSettings.Networks.bridge.IPAddress }}'"), id)
-	if err != nil {
-		d.c.Log(err)
-	}
-	return strings.Trim(out, " \r\n'")
-}
-
-func (d *Daemon) buildImageWithOut(name, dockerfile string, useCache bool, buildFlags ...string) (string, int, error) {
-	buildCmd := buildImageCmdWithHost(name, dockerfile, d.sock(), useCache, buildFlags...)
-	return runCommandWithOutput(buildCmd)
-}
-
-func (d *Daemon) checkActiveContainerCount(c *check.C) (interface{}, check.CommentInterface) {
-	out, err := d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil)
-	if len(strings.TrimSpace(out)) == 0 {
-		return 0, nil
-	}
-	return len(strings.Split(strings.TrimSpace(out), "\n")), check.Commentf("output: %q", string(out))
-}
-
-func (d *Daemon) reloadConfig() error {
-	if d.cmd == nil || d.cmd.Process == nil {
-		return fmt.Errorf("daemon is not running")
-	}
-
-	errCh := make(chan error)
-	started := make(chan struct{})
-	go func() {
-		_, body, err := sockRequestRawToDaemon("GET", "/events", nil, "", d.sock())
-		close(started)
-		if err != nil {
-			errCh <- err
-		}
-		defer body.Close()
-		dec := json.NewDecoder(body)
-		for {
-			var e events.Message
-			if err := dec.Decode(&e); err != nil {
-				errCh <- err
-				return
-			}
-			if e.Type != events.DaemonEventType {
-				continue
-			}
-			if e.Action != "reload" {
-				continue
-			}
-			close(errCh) // notify that we are done
-			return
-		}
-	}()
-
-	<-started
-	if err := signalDaemonReload(d.cmd.Process.Pid); err != nil {
-		return fmt.Errorf("error signaling daemon reload: %v", err)
-	}
-	select {
-	case err := <-errCh:
-		if err != nil {
-			return fmt.Errorf("error waiting for daemon reload event: %v", err)
-		}
-	case <-time.After(30 * time.Second):
-		return fmt.Errorf("timeout waiting for daemon reload event")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm.go b/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm.go
deleted file mode 100644
index 199bce0e7b..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm.go
+++ /dev/null
@@ -1,419 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// SwarmDaemon is a test daemon with helpers for participating in a swarm.
-type SwarmDaemon struct {
-	*Daemon
-	swarm.Info
-	port       int
-	listenAddr string
-}
-
-// Init initializes a new swarm cluster.
-func (d *SwarmDaemon) Init(req swarm.InitRequest) error {
-	if req.ListenAddr == "" {
-		req.ListenAddr = d.listenAddr
-	}
-	status, out, err := d.SockRequest("POST", "/swarm/init", req)
-	if status != http.StatusOK {
-		return fmt.Errorf("initializing swarm: invalid statuscode %v, %q", status, out)
-	}
-	if err != nil {
-		return fmt.Errorf("initializing swarm: %v", err)
-	}
-	info, err := d.info()
-	if err != nil {
-		return err
-	}
-	d.Info = info
-	return nil
-}
-
-// Join joins a daemon to an existing cluster.
-func (d *SwarmDaemon) Join(req swarm.JoinRequest) error {
-	if req.ListenAddr == "" {
-		req.ListenAddr = d.listenAddr
-	}
-	status, out, err := d.SockRequest("POST", "/swarm/join", req)
-	if status != http.StatusOK {
-		return fmt.Errorf("joining swarm: invalid statuscode %v, %q", status, out)
-	}
-	if err != nil {
-		return fmt.Errorf("joining swarm: %v", err)
-	}
-	info, err := d.info()
-	if err != nil {
-		return err
-	}
-	d.Info = info
-	return nil
-}
-
-// Leave forces daemon to leave current cluster.
-func (d *SwarmDaemon) Leave(force bool) error {
-	url := "/swarm/leave"
-	if force {
-		url += "?force=1"
-	}
-	status, out, err := d.SockRequest("POST", url, nil)
-	if status != http.StatusOK {
-		return fmt.Errorf("leaving swarm: invalid statuscode %v, %q", status, out)
-	}
-	if err != nil {
-		err = fmt.Errorf("leaving swarm: %v", err)
-	}
-	return err
-}
-
-func (d *SwarmDaemon) info() (swarm.Info, error) {
-	var info struct {
-		Swarm swarm.Info
-	}
-	status, dt, err := d.SockRequest("GET", "/info", nil)
-	if status != http.StatusOK {
-		return info.Swarm, fmt.Errorf("get swarm info: invalid statuscode %v", status)
-	}
-	if err != nil {
-		return info.Swarm, fmt.Errorf("get swarm info: %v", err)
-	}
-	if err := json.Unmarshal(dt, &info); err != nil {
-		return info.Swarm, err
-	}
-	return info.Swarm, nil
-}
-
-type serviceConstructor func(*swarm.Service)
-type nodeConstructor func(*swarm.Node)
-type specConstructor func(*swarm.Spec)
-
-func (d *SwarmDaemon) createService(c *check.C, f ...serviceConstructor) string {
-	var service swarm.Service
-	for _, fn := range f {
-		fn(&service)
-	}
-	status, out, err := d.SockRequest("POST", "/services/create", service.Spec)
-
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf("output: %q", string(out)))
-
-	var scr types.ServiceCreateResponse
-	c.Assert(json.Unmarshal(out, &scr), checker.IsNil)
-	return scr.ID
-}
-
-func (d *SwarmDaemon) getService(c *check.C, id string) *swarm.Service {
-	var service swarm.Service
-	status, out, err := d.SockRequest("GET", "/services/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &service), checker.IsNil)
-	return &service
-}
-
-func (d *SwarmDaemon) getServiceTasks(c *check.C, service string) []swarm.Task {
-	var tasks []swarm.Task
-
-	filterArgs := filters.NewArgs()
-	filterArgs.Add("desired-state", "running")
-	filterArgs.Add("service", service)
-	filters, err := filters.ToParam(filterArgs)
-	c.Assert(err, checker.IsNil)
-
-	status, out, err := d.SockRequest("GET", "/tasks?filters="+filters, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &tasks), checker.IsNil)
-	return tasks
-}
-
-func (d *SwarmDaemon) checkServiceTasksInState(service string, state swarm.TaskState, message string) func(*check.C) (interface{}, check.CommentInterface) {
-	return func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks := d.getServiceTasks(c, service)
-		var count int
-		for _, task := range tasks {
-			if task.Status.State == state {
-				if message == "" || strings.Contains(task.Status.Message, message) {
-					count++
-				}
-			}
-		}
-		return count, nil
-	}
-}
-
-func (d *SwarmDaemon) checkServiceRunningTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {
-	return d.checkServiceTasksInState(service, swarm.TaskStateRunning, "")
-}
-
-func (d *SwarmDaemon) checkServiceUpdateState(service string) func(*check.C) (interface{}, check.CommentInterface) {
-	return func(c *check.C) (interface{}, check.CommentInterface) {
-		service := d.getService(c, service)
-		return service.UpdateStatus.State, nil
-	}
-}
-
-func (d *SwarmDaemon) checkServiceTasks(service string) func(*check.C) (interface{}, check.CommentInterface) {
-	return func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks := d.getServiceTasks(c, service)
-		return len(tasks), nil
-	}
-}
-
-func (d *SwarmDaemon) checkRunningTaskImages(c *check.C) (interface{}, check.CommentInterface) {
-	var tasks []swarm.Task
-
-	filterArgs := filters.NewArgs()
-	filterArgs.Add("desired-state", "running")
-	filters, err := filters.ToParam(filterArgs)
-	c.Assert(err, checker.IsNil)
-
-	status, out, err := d.SockRequest("GET", "/tasks?filters="+filters, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &tasks), checker.IsNil)
-
-	result := make(map[string]int)
-	for _, task := range tasks {
-		if task.Status.State == swarm.TaskStateRunning {
-			result[task.Spec.ContainerSpec.Image]++
-		}
-	}
-	return result, nil
-}
-
-func (d *SwarmDaemon) checkNodeReadyCount(c *check.C) (interface{}, check.CommentInterface) {
-	nodes := d.listNodes(c)
-	var readyCount int
-	for _, node := range nodes {
-		if node.Status.State == swarm.NodeStateReady {
-			readyCount++
-		}
-	}
-	return readyCount, nil
-}
-
-func (d *SwarmDaemon) getTask(c *check.C, id string) swarm.Task {
-	var task swarm.Task
-
-	status, out, err := d.SockRequest("GET", "/tasks/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &task), checker.IsNil)
-	return task
-}
-
-func (d *SwarmDaemon) updateService(c *check.C, service *swarm.Service, f ...serviceConstructor) {
-	for _, fn := range f {
-		fn(service)
-	}
-	url := fmt.Sprintf("/services/%s/update?version=%d", service.ID, service.Version.Index)
-	status, out, err := d.SockRequest("POST", url, service.Spec)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) removeService(c *check.C, id string) {
-	status, out, err := d.SockRequest("DELETE", "/services/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) getNode(c *check.C, id string) *swarm.Node {
-	var node swarm.Node
-	status, out, err := d.SockRequest("GET", "/nodes/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &node), checker.IsNil)
-	c.Assert(node.ID, checker.Equals, id)
-	return &node
-}
-
-func (d *SwarmDaemon) removeNode(c *check.C, id string, force bool) {
-	url := "/nodes/" + id
-	if force {
-		url += "?force=1"
-	}
-
-	status, out, err := d.SockRequest("DELETE", url, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) updateNode(c *check.C, id string, f ...nodeConstructor) {
-	for i := 0; ; i++ {
-		node := d.getNode(c, id)
-		for _, fn := range f {
-			fn(node)
-		}
-		url := fmt.Sprintf("/nodes/%s/update?version=%d", node.ID, node.Version.Index)
-		status, out, err := d.SockRequest("POST", url, node.Spec)
-		if i < 10 && strings.Contains(string(out), "update out of sequence") {
-			time.Sleep(100 * time.Millisecond)
-			continue
-		}
-		c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-		c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-		return
-	}
-}
-
-func (d *SwarmDaemon) listNodes(c *check.C) []swarm.Node {
-	status, out, err := d.SockRequest("GET", "/nodes", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-
-	nodes := []swarm.Node{}
-	c.Assert(json.Unmarshal(out, &nodes), checker.IsNil)
-	return nodes
-}
-
-func (d *SwarmDaemon) listServices(c *check.C) []swarm.Service {
-	status, out, err := d.SockRequest("GET", "/services", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-
-	services := []swarm.Service{}
-	c.Assert(json.Unmarshal(out, &services), checker.IsNil)
-	return services
-}
-
-func (d *SwarmDaemon) createSecret(c *check.C, secretSpec swarm.SecretSpec) string {
-	status, out, err := d.SockRequest("POST", "/secrets/create", secretSpec)
-
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf("output: %q", string(out)))
-
-	var scr types.SecretCreateResponse
-	c.Assert(json.Unmarshal(out, &scr), checker.IsNil)
-	return scr.ID
-}
-
-func (d *SwarmDaemon) listSecrets(c *check.C) []swarm.Secret {
-	status, out, err := d.SockRequest("GET", "/secrets", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-
-	secrets := []swarm.Secret{}
-	c.Assert(json.Unmarshal(out, &secrets), checker.IsNil)
-	return secrets
-}
-
-func (d *SwarmDaemon) getSecret(c *check.C, id string) *swarm.Secret {
-	var secret swarm.Secret
-	status, out, err := d.SockRequest("GET", "/secrets/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &secret), checker.IsNil)
-	return &secret
-}
-
-func (d *SwarmDaemon) deleteSecret(c *check.C, id string) {
-	status, out, err := d.SockRequest("DELETE", "/secrets/"+id, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusNoContent, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) getSwarm(c *check.C) swarm.Swarm {
-	var sw swarm.Swarm
-	status, out, err := d.SockRequest("GET", "/swarm", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &sw), checker.IsNil)
-	return sw
-}
-
-func (d *SwarmDaemon) updateSwarm(c *check.C, f ...specConstructor) {
-	sw := d.getSwarm(c)
-	for _, fn := range f {
-		fn(&sw.Spec)
-	}
-	url := fmt.Sprintf("/swarm/update?version=%d", sw.Version.Index)
-	status, out, err := d.SockRequest("POST", url, sw.Spec)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) rotateTokens(c *check.C) {
-	var sw swarm.Swarm
-	status, out, err := d.SockRequest("GET", "/swarm", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &sw), checker.IsNil)
-
-	url := fmt.Sprintf("/swarm/update?version=%d&rotateWorkerToken=true&rotateManagerToken=true", sw.Version.Index)
-	status, out, err = d.SockRequest("POST", url, sw.Spec)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-}
-
-func (d *SwarmDaemon) joinTokens(c *check.C) swarm.JoinTokens {
-	var sw swarm.Swarm
-	status, out, err := d.SockRequest("GET", "/swarm", nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	c.Assert(json.Unmarshal(out, &sw), checker.IsNil)
-	return sw.JoinTokens
-}
-
-func (d *SwarmDaemon) checkLocalNodeState(c *check.C) (interface{}, check.CommentInterface) {
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	return info.LocalNodeState, nil
-}
-
-func (d *SwarmDaemon) checkControlAvailable(c *check.C) (interface{}, check.CommentInterface) {
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	return info.ControlAvailable, nil
-}
-
-func (d *SwarmDaemon) checkLeader(c *check.C) (interface{}, check.CommentInterface) {
-	errList := check.Commentf("could not get node list")
-	status, out, err := d.SockRequest("GET", "/nodes", nil)
-	if err != nil {
-		return err, errList
-	}
-	if status != http.StatusOK {
-		return fmt.Errorf("expected http status OK, got: %d", status), errList
-	}
-
-	var ls []swarm.Node
-	if err := json.Unmarshal(out, &ls); err != nil {
-		return err, errList
-	}
-
-	for _, node := range ls {
-		if node.ManagerStatus != nil && node.ManagerStatus.Leader {
-			return nil, nil
-		}
-	}
-	return fmt.Errorf("no leader"), check.Commentf("could not find leader")
-}
-
-func (d *SwarmDaemon) cmdRetryOutOfSequence(args ...string) (string, error) {
-	for i := 0; ; i++ {
-		out, err := d.Cmd(args...)
-		if err != nil {
-			if strings.Contains(out, "update out of sequence") {
-				if i < 10 {
-					continue
-				}
-			}
-		}
-		return out, err
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm_hack.go b/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm_hack.go
deleted file mode 100644
index 0cea901420..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/daemon_swarm_hack.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package main
-
-import "github.com/go-check/check"
-
-func (s *DockerSwarmSuite) getDaemon(c *check.C, nodeID string) *SwarmDaemon {
-	s.daemonsLock.Lock()
-	defer s.daemonsLock.Unlock()
-	for _, d := range s.daemons {
-		if d.NodeID == nodeID {
-			return d
-		}
-	}
-	c.Fatalf("could not find node with id: %s", nodeID)
-	return nil
-}
-
-// nodeCmd executes a command on a given node via the normal docker socket
-func (s *DockerSwarmSuite) nodeCmd(c *check.C, id string, args ...string) (string, error) {
-	return s.getDaemon(c, id).Cmd(args...)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/daemon_unix.go b/installer/vendor/github.com/docker/docker/integration-cli/daemon_unix.go
deleted file mode 100644
index 6ca7daf21c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/daemon_unix.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/go-check/check"
-)
-
-func cleanupExecRoot(c *check.C, execRoot string) {
-	// Cleanup network namespaces in the exec root of this
-	// daemon because this exec root is specific to this
-	// daemon instance and has no chance of getting
-	// cleaned up when a new daemon is instantiated with a
-	// new exec root.
-	netnsPath := filepath.Join(execRoot, "netns")
-	filepath.Walk(netnsPath, func(path string, info os.FileInfo, err error) error {
-		if err := syscall.Unmount(path, syscall.MNT_FORCE); err != nil {
-			c.Logf("unmount of %s failed: %v", path, err)
-		}
-		os.Remove(path)
-		return nil
-	})
-}
-
-func signalDaemonDump(pid int) {
-	syscall.Kill(pid, syscall.SIGQUIT)
-}
-
-func signalDaemonReload(pid int) error {
-	return syscall.Kill(pid, syscall.SIGHUP)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/daemon_windows.go b/installer/vendor/github.com/docker/docker/integration-cli/daemon_windows.go
deleted file mode 100644
index 885b703b33..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/daemon_windows.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strconv"
-	"syscall"
-	"unsafe"
-
-	"github.com/go-check/check"
-	"golang.org/x/sys/windows"
-)
-
-func openEvent(desiredAccess uint32, inheritHandle bool, name string, proc *windows.LazyProc) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p2 uint32
-	if inheritHandle {
-		_p2 = 1
-	}
-	r0, _, e1 := proc.Call(uintptr(desiredAccess), uintptr(_p2), uintptr(unsafe.Pointer(namep)))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-func pulseEvent(handle syscall.Handle, proc *windows.LazyProc) (err error) {
-	r0, _, _ := proc.Call(uintptr(handle))
-	if r0 != 0 {
-		err = syscall.Errno(r0)
-	}
-	return
-}
-
-func signalDaemonDump(pid int) {
-	modkernel32 := windows.NewLazySystemDLL("kernel32.dll")
-	procOpenEvent := modkernel32.NewProc("OpenEventW")
-	procPulseEvent := modkernel32.NewProc("PulseEvent")
-
-	ev := "Global\\docker-daemon-" + strconv.Itoa(pid)
-	h2, _ := openEvent(0x0002, false, ev, procOpenEvent)
-	if h2 == 0 {
-		return
-	}
-	pulseEvent(h2, procPulseEvent)
-}
-
-func signalDaemonReload(pid int) error {
-	return fmt.Errorf("daemon reload not supported")
-}
-
-func cleanupExecRoot(c *check.C, execRoot string) {
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_attach_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_attach_test.go
deleted file mode 100644
index d43bf3ab0e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_attach_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"io"
-	"net"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/client"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/go-check/check"
-	"golang.org/x/net/websocket"
-)
-
-func (s *DockerSuite) TestGetContainersAttachWebsocket(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-dit", "busybox", "cat")
-
-	rwc, err := sockConn(time.Duration(10*time.Second), "")
-	c.Assert(err, checker.IsNil)
-
-	cleanedContainerID := strings.TrimSpace(out)
-	config, err := websocket.NewConfig(
-		"/containers/"+cleanedContainerID+"/attach/ws?stream=1&stdin=1&stdout=1&stderr=1",
-		"http://localhost",
-	)
-	c.Assert(err, checker.IsNil)
-
-	ws, err := websocket.NewClient(config, rwc)
-	c.Assert(err, checker.IsNil)
-	defer ws.Close()
-
-	expected := []byte("hello")
-	actual := make([]byte, len(expected))
-
-	outChan := make(chan error)
-	go func() {
-		_, err := io.ReadFull(ws, actual)
-		outChan <- err
-		close(outChan)
-	}()
-
-	inChan := make(chan error)
-	go func() {
-		_, err := ws.Write(expected)
-		inChan <- err
-		close(inChan)
-	}()
-
-	select {
-	case err := <-inChan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(5 * time.Second):
-		c.Fatal("Timeout writing to ws")
-	}
-
-	select {
-	case err := <-outChan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(5 * time.Second):
-		c.Fatal("Timeout reading from ws")
-	}
-
-	c.Assert(actual, checker.DeepEquals, expected, check.Commentf("Websocket didn't return the expected data"))
-}
-
-// regression gh14320
-func (s *DockerSuite) TestPostContainersAttachContainerNotFound(c *check.C) {
-	req, client, err := newRequestClient("POST", "/containers/doesnotexist/attach", nil, "", "")
-	c.Assert(err, checker.IsNil)
-
-	resp, err := client.Do(req)
-	// connection will shutdown, err should be "persistent connection closed"
-	c.Assert(err, checker.NotNil) // Server shutdown connection
-
-	body, err := readBody(resp.Body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
-	expected := "No such container: doesnotexist\r\n"
-	c.Assert(string(body), checker.Equals, expected)
-}
-
-func (s *DockerSuite) TestGetContainersWsAttachContainerNotFound(c *check.C) {
-	status, body, err := sockRequest("GET", "/containers/doesnotexist/attach/ws", nil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-	c.Assert(err, checker.IsNil)
-	expected := "No such container: doesnotexist"
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestPostContainersAttach(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	expectSuccess := func(conn net.Conn, br *bufio.Reader, stream string, tty bool) {
-		defer conn.Close()
-		expected := []byte("success")
-		_, err := conn.Write(expected)
-		c.Assert(err, checker.IsNil)
-
-		conn.SetReadDeadline(time.Now().Add(time.Second))
-		lenHeader := 0
-		if !tty {
-			lenHeader = 8
-		}
-		actual := make([]byte, len(expected)+lenHeader)
-		_, err = io.ReadFull(br, actual)
-		c.Assert(err, checker.IsNil)
-		if !tty {
-			fdMap := map[string]byte{
-				"stdin":  0,
-				"stdout": 1,
-				"stderr": 2,
-			}
-			c.Assert(actual[0], checker.Equals, fdMap[stream])
-		}
-		c.Assert(actual[lenHeader:], checker.DeepEquals, expected, check.Commentf("Attach didn't return the expected data from %s", stream))
-	}
-
-	expectTimeout := func(conn net.Conn, br *bufio.Reader, stream string) {
-		defer conn.Close()
-		_, err := conn.Write([]byte{'t'})
-		c.Assert(err, checker.IsNil)
-
-		conn.SetReadDeadline(time.Now().Add(time.Second))
-		actual := make([]byte, 1)
-		_, err = io.ReadFull(br, actual)
-		opErr, ok := err.(*net.OpError)
-		c.Assert(ok, checker.Equals, true, check.Commentf("Error is expected to be *net.OpError, got %v", err))
-		c.Assert(opErr.Timeout(), checker.Equals, true, check.Commentf("Read from %s is expected to timeout", stream))
-	}
-
-	// Create a container that only emits stdout.
-	cid, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
-	cid = strings.TrimSpace(cid)
-	// Attach to the container's stdout stream.
-	conn, br, err := sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	// Check if the data from stdout can be received.
-	expectSuccess(conn, br, "stdout", false)
-	// Attach to the container's stderr stream.
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	// Since the container only emits stdout, attaching to stderr should return nothing.
-	expectTimeout(conn, br, "stdout")
-
-	// Test the similar functions of the stderr stream.
-	cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "cat >&2")
-	cid = strings.TrimSpace(cid)
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	expectSuccess(conn, br, "stderr", false)
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	expectTimeout(conn, br, "stderr")
-
-	// Test with tty.
-	cid, _ = dockerCmd(c, "run", "-dit", "busybox", "/bin/sh", "-c", "cat >&2")
-	cid = strings.TrimSpace(cid)
-	// Attach to stdout only.
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stdout=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	expectSuccess(conn, br, "stdout", true)
-
-	// Attach without stdout stream.
-	conn, br, err = sockRequestHijack("POST", "/containers/"+cid+"/attach?stream=1&stdin=1&stderr=1", nil, "text/plain")
-	c.Assert(err, checker.IsNil)
-	// Nothing should be received because both the stdout and stderr of the container will be
-	// sent to the client as stdout when tty is enabled.
-	expectTimeout(conn, br, "stdout")
-
-	// Test the client API
-	// Make sure we don't see "hello" if Logs is false
-	client, err := client.NewEnvClient()
-	c.Assert(err, checker.IsNil)
-
-	cid, _ = dockerCmd(c, "run", "-di", "busybox", "/bin/sh", "-c", "echo hello; cat")
-	cid = strings.TrimSpace(cid)
-
-	attachOpts := types.ContainerAttachOptions{
-		Stream: true,
-		Stdin:  true,
-		Stdout: true,
-	}
-
-	resp, err := client.ContainerAttach(context.Background(), cid, attachOpts)
-	c.Assert(err, checker.IsNil)
-	expectSuccess(resp.Conn, resp.Reader, "stdout", false)
-
-	// Make sure we do see "hello" if Logs is true
-	attachOpts.Logs = true
-	resp, err = client.ContainerAttach(context.Background(), cid, attachOpts)
-	c.Assert(err, checker.IsNil)
-
-	defer resp.Conn.Close()
-	resp.Conn.SetReadDeadline(time.Now().Add(time.Second))
-
-	_, err = resp.Conn.Write([]byte("success"))
-	c.Assert(err, checker.IsNil)
-
-	actualStdout := new(bytes.Buffer)
-	actualStderr := new(bytes.Buffer)
-	stdcopy.StdCopy(actualStdout, actualStderr, resp.Reader)
-	c.Assert(actualStdout.Bytes(), checker.DeepEquals, []byte("hello\nsuccess"), check.Commentf("Attach didn't return the expected data from stdout"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_auth_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_auth_test.go
deleted file mode 100644
index bfcae31bd0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_auth_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// Test case for #22244
-func (s *DockerSuite) TestAuthAPI(c *check.C) {
-	testRequires(c, Network)
-	config := types.AuthConfig{
-		Username: "no-user",
-		Password: "no-password",
-	}
-
-	expected := "Get https://registry-1.docker.io/v2/: unauthorized: incorrect username or password"
-	status, body, err := sockRequest("POST", "/auth", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusUnauthorized)
-	msg := getErrorMessage(c, body)
-	c.Assert(msg, checker.Contains, expected, check.Commentf("Expected: %v, got: %v", expected, msg))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_build_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_build_test.go
deleted file mode 100644
index 9b069a43a6..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_build_test.go
+++ /dev/null
@@ -1,254 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"bytes"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestBuildAPIDockerFileRemote(c *check.C) {
-	testRequires(c, NotUserNamespace)
-	var testD string
-	if daemonPlatform == "windows" {
-		testD = `FROM busybox
-COPY * /tmp/
-RUN find / -name ba*
-RUN find /tmp/`
-	} else {
-		// -xdev is required because sysfs can cause EPERM
-		testD = `FROM busybox
-COPY * /tmp/
-RUN find / -xdev -name ba*
-RUN find /tmp/`
-	}
-	server, err := fakeStorage(map[string]string{"testD": testD})
-	c.Assert(err, checker.IsNil)
-	defer server.Close()
-
-	res, body, err := sockRequestRaw("POST", "/build?dockerfile=baz&remote="+server.URL()+"/testD", nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	buf, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	// Make sure Dockerfile exists.
-	// Make sure 'baz' doesn't exist ANYWHERE despite being mentioned in the URL
-	out := string(buf)
-	c.Assert(out, checker.Contains, "/tmp/Dockerfile")
-	c.Assert(out, checker.Not(checker.Contains), "baz")
-}
-
-func (s *DockerSuite) TestBuildAPIRemoteTarballContext(c *check.C) {
-	buffer := new(bytes.Buffer)
-	tw := tar.NewWriter(buffer)
-	defer tw.Close()
-
-	dockerfile := []byte("FROM busybox")
-	err := tw.WriteHeader(&tar.Header{
-		Name: "Dockerfile",
-		Size: int64(len(dockerfile)),
-	})
-	// failed to write tar file header
-	c.Assert(err, checker.IsNil)
-
-	_, err = tw.Write(dockerfile)
-	// failed to write tar file content
-	c.Assert(err, checker.IsNil)
-
-	// failed to close tar archive
-	c.Assert(tw.Close(), checker.IsNil)
-
-	server, err := fakeBinaryStorage(map[string]*bytes.Buffer{
-		"testT.tar": buffer,
-	})
-	c.Assert(err, checker.IsNil)
-
-	defer server.Close()
-
-	res, b, err := sockRequestRaw("POST", "/build?remote="+server.URL()+"/testT.tar", nil, "application/tar")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-	b.Close()
-}
-
-func (s *DockerSuite) TestBuildAPIRemoteTarballContextWithCustomDockerfile(c *check.C) {
-	buffer := new(bytes.Buffer)
-	tw := tar.NewWriter(buffer)
-	defer tw.Close()
-
-	dockerfile := []byte(`FROM busybox
-RUN echo 'wrong'`)
-	err := tw.WriteHeader(&tar.Header{
-		Name: "Dockerfile",
-		Size: int64(len(dockerfile)),
-	})
-	// failed to write tar file header
-	c.Assert(err, checker.IsNil)
-
-	_, err = tw.Write(dockerfile)
-	// failed to write tar file content
-	c.Assert(err, checker.IsNil)
-
-	custom := []byte(`FROM busybox
-RUN echo 'right'
-`)
-	err = tw.WriteHeader(&tar.Header{
-		Name: "custom",
-		Size: int64(len(custom)),
-	})
-
-	// failed to write tar file header
-	c.Assert(err, checker.IsNil)
-
-	_, err = tw.Write(custom)
-	// failed to write tar file content
-	c.Assert(err, checker.IsNil)
-
-	// failed to close tar archive
-	c.Assert(tw.Close(), checker.IsNil)
-
-	server, err := fakeBinaryStorage(map[string]*bytes.Buffer{
-		"testT.tar": buffer,
-	})
-	c.Assert(err, checker.IsNil)
-
-	defer server.Close()
-	url := "/build?dockerfile=custom&remote=" + server.URL() + "/testT.tar"
-	res, body, err := sockRequestRaw("POST", url, nil, "application/tar")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	defer body.Close()
-	content, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	// Build used the wrong dockerfile.
-	c.Assert(string(content), checker.Not(checker.Contains), "wrong")
-}
-
-func (s *DockerSuite) TestBuildAPILowerDockerfile(c *check.C) {
-	git, err := newFakeGit("repo", map[string]string{
-		"dockerfile": `FROM busybox
-RUN echo from dockerfile`,
-	}, false)
-	c.Assert(err, checker.IsNil)
-	defer git.Close()
-
-	res, body, err := sockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	buf, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	out := string(buf)
-	c.Assert(out, checker.Contains, "from dockerfile")
-}
-
-func (s *DockerSuite) TestBuildAPIBuildGitWithF(c *check.C) {
-	git, err := newFakeGit("repo", map[string]string{
-		"baz": `FROM busybox
-RUN echo from baz`,
-		"Dockerfile": `FROM busybox
-RUN echo from Dockerfile`,
-	}, false)
-	c.Assert(err, checker.IsNil)
-	defer git.Close()
-
-	// Make sure it tries to 'dockerfile' query param value
-	res, body, err := sockRequestRaw("POST", "/build?dockerfile=baz&remote="+git.RepoURL, nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	buf, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	out := string(buf)
-	c.Assert(out, checker.Contains, "from baz")
-}
-
-func (s *DockerSuite) TestBuildAPIDoubleDockerfile(c *check.C) {
-	testRequires(c, UnixCli) // dockerfile overwrites Dockerfile on Windows
-	git, err := newFakeGit("repo", map[string]string{
-		"Dockerfile": `FROM busybox
-RUN echo from Dockerfile`,
-		"dockerfile": `FROM busybox
-RUN echo from dockerfile`,
-	}, false)
-	c.Assert(err, checker.IsNil)
-	defer git.Close()
-
-	// Make sure it tries to 'dockerfile' query param value
-	res, body, err := sockRequestRaw("POST", "/build?remote="+git.RepoURL, nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	buf, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	out := string(buf)
-	c.Assert(out, checker.Contains, "from Dockerfile")
-}
-
-func (s *DockerSuite) TestBuildAPIUnnormalizedTarPaths(c *check.C) {
-	// Make sure that build context tars with entries of the form
-	// x/./y don't cause caching false positives.
-
-	buildFromTarContext := func(fileContents []byte) string {
-		buffer := new(bytes.Buffer)
-		tw := tar.NewWriter(buffer)
-		defer tw.Close()
-
-		dockerfile := []byte(`FROM busybox
-	COPY dir /dir/`)
-		err := tw.WriteHeader(&tar.Header{
-			Name: "Dockerfile",
-			Size: int64(len(dockerfile)),
-		})
-		//failed to write tar file header
-		c.Assert(err, checker.IsNil)
-
-		_, err = tw.Write(dockerfile)
-		// failed to write Dockerfile in tar file content
-		c.Assert(err, checker.IsNil)
-
-		err = tw.WriteHeader(&tar.Header{
-			Name: "dir/./file",
-			Size: int64(len(fileContents)),
-		})
-		//failed to write tar file header
-		c.Assert(err, checker.IsNil)
-
-		_, err = tw.Write(fileContents)
-		// failed to write file contents in tar file content
-		c.Assert(err, checker.IsNil)
-
-		// failed to close tar archive
-		c.Assert(tw.Close(), checker.IsNil)
-
-		res, body, err := sockRequestRaw("POST", "/build", buffer, "application/x-tar")
-		c.Assert(err, checker.IsNil)
-		c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-		out, err := readBody(body)
-		c.Assert(err, checker.IsNil)
-		lines := strings.Split(string(out), "\n")
-		c.Assert(len(lines), checker.GreaterThan, 1)
-		c.Assert(lines[len(lines)-2], checker.Matches, ".*Successfully built [0-9a-f]{12}.*")
-
-		re := regexp.MustCompile("Successfully built ([0-9a-f]{12})")
-		matches := re.FindStringSubmatch(lines[len(lines)-2])
-		return matches[1]
-	}
-
-	imageA := buildFromTarContext([]byte("abc"))
-	imageB := buildFromTarContext([]byte("def"))
-
-	c.Assert(imageA, checker.Not(checker.Equals), imageB)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_containers_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_containers_test.go
deleted file mode 100644
index d046ec0684..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_containers_test.go
+++ /dev/null
@@ -1,1961 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	containertypes "github.com/docker/docker/api/types/container"
-	mounttypes "github.com/docker/docker/api/types/mount"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/pkg/integration"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/volume"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestContainerAPIGetAll(c *check.C) {
-	startCount, err := getContainerCount()
-	c.Assert(err, checker.IsNil, check.Commentf("Cannot query container count"))
-
-	name := "getall"
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-
-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var inspectJSON []struct {
-		Names []string
-	}
-	err = json.Unmarshal(body, &inspectJSON)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to unmarshal response body"))
-
-	c.Assert(inspectJSON, checker.HasLen, startCount+1)
-
-	actual := inspectJSON[0].Names[0]
-	c.Assert(actual, checker.Equals, "/"+name)
-}
-
-// regression test for empty json field being omitted #13691
-func (s *DockerSuite) TestContainerAPIGetJSONNoFieldsOmitted(c *check.C) {
-	dockerCmd(c, "run", "busybox", "true")
-
-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	// empty Labels field triggered this bug, make sense to check for everything
-	// cause even Ports for instance can trigger this bug
-	// better safe than sorry..
-	fields := []string{
-		"Id",
-		"Names",
-		"Image",
-		"Command",
-		"Created",
-		"Ports",
-		"Labels",
-		"Status",
-		"NetworkSettings",
-	}
-
-	// decoding into types.Container do not work since it eventually unmarshal
-	// and empty field to an empty go map, so we just check for a string
-	for _, f := range fields {
-		if !strings.Contains(string(body), f) {
-			c.Fatalf("Field %s is missing and it shouldn't", f)
-		}
-	}
-}
-
-type containerPs struct {
-	Names []string
-	Ports []map[string]interface{}
-}
-
-// regression test for non-empty fields from #13901
-func (s *DockerSuite) TestContainerAPIPsOmitFields(c *check.C) {
-	// Problematic for Windows porting due to networking not yet being passed back
-	testRequires(c, DaemonIsLinux)
-	name := "pstest"
-	port := 80
-	runSleepingContainer(c, "--name", name, "--expose", strconv.Itoa(port))
-
-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var resp []containerPs
-	err = json.Unmarshal(body, &resp)
-	c.Assert(err, checker.IsNil)
-
-	var foundContainer *containerPs
-	for _, container := range resp {
-		for _, testName := range container.Names {
-			if "/"+name == testName {
-				foundContainer = &container
-				break
-			}
-		}
-	}
-
-	c.Assert(foundContainer.Ports, checker.HasLen, 1)
-	c.Assert(foundContainer.Ports[0]["PrivatePort"], checker.Equals, float64(port))
-	_, ok := foundContainer.Ports[0]["PublicPort"]
-	c.Assert(ok, checker.Not(checker.Equals), true)
-	_, ok = foundContainer.Ports[0]["IP"]
-	c.Assert(ok, checker.Not(checker.Equals), true)
-}
-
-func (s *DockerSuite) TestContainerAPIGetExport(c *check.C) {
-	// Not supported on Windows as Windows does not support docker export
-	testRequires(c, DaemonIsLinux)
-	name := "exportcontainer"
-	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test")
-
-	status, body, err := sockRequest("GET", "/containers/"+name+"/export", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	found := false
-	for tarReader := tar.NewReader(bytes.NewReader(body)); ; {
-		h, err := tarReader.Next()
-		if err != nil && err == io.EOF {
-			break
-		}
-		if h.Name == "test" {
-			found = true
-			break
-		}
-	}
-	c.Assert(found, checker.True, check.Commentf("The created test file has not been found in the exported image"))
-}
-
-func (s *DockerSuite) TestContainerAPIGetChanges(c *check.C) {
-	// Not supported on Windows as Windows does not support docker diff (/containers/name/changes)
-	testRequires(c, DaemonIsLinux)
-	name := "changescontainer"
-	dockerCmd(c, "run", "--name", name, "busybox", "rm", "/etc/passwd")
-
-	status, body, err := sockRequest("GET", "/containers/"+name+"/changes", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	changes := []struct {
-		Kind int
-		Path string
-	}{}
-	c.Assert(json.Unmarshal(body, &changes), checker.IsNil, check.Commentf("unable to unmarshal response body"))
-
-	// Check the changelog for removal of /etc/passwd
-	success := false
-	for _, elem := range changes {
-		if elem.Path == "/etc/passwd" && elem.Kind == 2 {
-			success = true
-		}
-	}
-	c.Assert(success, checker.True, check.Commentf("/etc/passwd has been removed but is not present in the diff"))
-}
-
-func (s *DockerSuite) TestGetContainerStats(c *check.C) {
-	var (
-		name = "statscontainer"
-	)
-	runSleepingContainer(c, "--name", name)
-
-	type b struct {
-		status int
-		body   []byte
-		err    error
-	}
-	bc := make(chan b, 1)
-	go func() {
-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats", nil)
-		bc <- b{status, body, err}
-	}()
-
-	// allow some time to stream the stats from the container
-	time.Sleep(4 * time.Second)
-	dockerCmd(c, "rm", "-f", name)
-
-	// collect the results from the stats stream or timeout and fail
-	// if the stream was not disconnected.
-	select {
-	case <-time.After(2 * time.Second):
-		c.Fatal("stream was not closed after container was removed")
-	case sr := <-bc:
-		c.Assert(sr.err, checker.IsNil)
-		c.Assert(sr.status, checker.Equals, http.StatusOK)
-
-		dec := json.NewDecoder(bytes.NewBuffer(sr.body))
-		var s *types.Stats
-		// decode only one object from the stream
-		c.Assert(dec.Decode(&s), checker.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestGetContainerStatsRmRunning(c *check.C) {
-	out, _ := runSleepingContainer(c)
-	id := strings.TrimSpace(out)
-
-	buf := &integration.ChannelBuffer{make(chan []byte, 1)}
-	defer buf.Close()
-
-	_, body, err := sockRequestRaw("GET", "/containers/"+id+"/stats?stream=1", nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	defer body.Close()
-
-	chErr := make(chan error, 1)
-	go func() {
-		_, err = io.Copy(buf, body)
-		chErr <- err
-	}()
-
-	b := make([]byte, 32)
-	// make sure we've got some stats
-	_, err = buf.ReadTimeout(b, 2*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	// Now remove without `-f` and make sure we are still pulling stats
-	_, _, err = dockerCmdWithError("rm", id)
-	c.Assert(err, checker.Not(checker.IsNil), check.Commentf("rm should have failed but didn't"))
-	_, err = buf.ReadTimeout(b, 2*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "rm", "-f", id)
-	c.Assert(<-chErr, checker.IsNil)
-}
-
-// regression test for gh13421
-// previous test was just checking one stat entry so it didn't fail (stats with
-// stream false always return one stat)
-func (s *DockerSuite) TestGetContainerStatsStream(c *check.C) {
-	name := "statscontainer"
-	runSleepingContainer(c, "--name", name)
-
-	type b struct {
-		status int
-		body   []byte
-		err    error
-	}
-	bc := make(chan b, 1)
-	go func() {
-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats", nil)
-		bc <- b{status, body, err}
-	}()
-
-	// allow some time to stream the stats from the container
-	time.Sleep(4 * time.Second)
-	dockerCmd(c, "rm", "-f", name)
-
-	// collect the results from the stats stream or timeout and fail
-	// if the stream was not disconnected.
-	select {
-	case <-time.After(2 * time.Second):
-		c.Fatal("stream was not closed after container was removed")
-	case sr := <-bc:
-		c.Assert(sr.err, checker.IsNil)
-		c.Assert(sr.status, checker.Equals, http.StatusOK)
-
-		s := string(sr.body)
-		// count occurrences of "read" of types.Stats
-		if l := strings.Count(s, "read"); l < 2 {
-			c.Fatalf("Expected more than one stat streamed, got %d", l)
-		}
-	}
-}
-
-func (s *DockerSuite) TestGetContainerStatsNoStream(c *check.C) {
-	name := "statscontainer"
-	runSleepingContainer(c, "--name", name)
-
-	type b struct {
-		status int
-		body   []byte
-		err    error
-	}
-	bc := make(chan b, 1)
-	go func() {
-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats?stream=0", nil)
-		bc <- b{status, body, err}
-	}()
-
-	// allow some time to stream the stats from the container
-	time.Sleep(4 * time.Second)
-	dockerCmd(c, "rm", "-f", name)
-
-	// collect the results from the stats stream or timeout and fail
-	// if the stream was not disconnected.
-	select {
-	case <-time.After(2 * time.Second):
-		c.Fatal("stream was not closed after container was removed")
-	case sr := <-bc:
-		c.Assert(sr.err, checker.IsNil)
-		c.Assert(sr.status, checker.Equals, http.StatusOK)
-
-		s := string(sr.body)
-		// count occurrences of `"read"` of types.Stats
-		c.Assert(strings.Count(s, `"read"`), checker.Equals, 1, check.Commentf("Expected only one stat streamed, got %d", strings.Count(s, `"read"`)))
-	}
-}
-
-func (s *DockerSuite) TestGetStoppedContainerStats(c *check.C) {
-	name := "statscontainer"
-	dockerCmd(c, "create", "--name", name, "busybox", "ps")
-
-	type stats struct {
-		status int
-		err    error
-	}
-	chResp := make(chan stats)
-
-	// We expect an immediate response, but if it's not immediate, the test would hang, so put it in a goroutine
-	// below we'll check this on a timeout.
-	go func() {
-		resp, body, err := sockRequestRaw("GET", "/containers/"+name+"/stats", nil, "")
-		body.Close()
-		chResp <- stats{resp.StatusCode, err}
-	}()
-
-	select {
-	case r := <-chResp:
-		c.Assert(r.err, checker.IsNil)
-		c.Assert(r.status, checker.Equals, http.StatusOK)
-	case <-time.After(10 * time.Second):
-		c.Fatal("timeout waiting for stats response for stopped container")
-	}
-}
-
-func (s *DockerSuite) TestContainerAPIPause(c *check.C) {
-	// Problematic on Windows as Windows does not support pause
-	testRequires(c, DaemonIsLinux)
-	defer unpauseAllContainers()
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sleep", "30")
-	ContainerID := strings.TrimSpace(out)
-
-	status, _, err := sockRequest("POST", "/containers/"+ContainerID+"/pause", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	pausedContainers, err := getSliceOfPausedContainers()
-	c.Assert(err, checker.IsNil, check.Commentf("error thrown while checking if containers were paused"))
-
-	if len(pausedContainers) != 1 || stringid.TruncateID(ContainerID) != pausedContainers[0] {
-		c.Fatalf("there should be one paused container and not %d", len(pausedContainers))
-	}
-
-	status, _, err = sockRequest("POST", "/containers/"+ContainerID+"/unpause", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	pausedContainers, err = getSliceOfPausedContainers()
-	c.Assert(err, checker.IsNil, check.Commentf("error thrown while checking if containers were paused"))
-	c.Assert(pausedContainers, checker.IsNil, check.Commentf("There should be no paused container."))
-}
-
-func (s *DockerSuite) TestContainerAPITop(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "top")
-	id := strings.TrimSpace(string(out))
-	c.Assert(waitRun(id), checker.IsNil)
-
-	type topResp struct {
-		Titles    []string
-		Processes [][]string
-	}
-	var top topResp
-	status, b, err := sockRequest("GET", "/containers/"+id+"/top?ps_args=aux", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(json.Unmarshal(b, &top), checker.IsNil)
-	c.Assert(top.Titles, checker.HasLen, 11, check.Commentf("expected 11 titles, found %d: %v", len(top.Titles), top.Titles))
-
-	if top.Titles[0] != "USER" || top.Titles[10] != "COMMAND" {
-		c.Fatalf("expected `USER` at `Titles[0]` and `COMMAND` at Titles[10]: %v", top.Titles)
-	}
-	c.Assert(top.Processes, checker.HasLen, 2, check.Commentf("expected 2 processes, found %d: %v", len(top.Processes), top.Processes))
-	c.Assert(top.Processes[0][10], checker.Equals, "/bin/sh -c top")
-	c.Assert(top.Processes[1][10], checker.Equals, "top")
-}
-
-func (s *DockerSuite) TestContainerAPITopWindows(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	out, _ := runSleepingContainer(c, "-d")
-	id := strings.TrimSpace(string(out))
-	c.Assert(waitRun(id), checker.IsNil)
-
-	type topResp struct {
-		Titles    []string
-		Processes [][]string
-	}
-	var top topResp
-	status, b, err := sockRequest("GET", "/containers/"+id+"/top", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(json.Unmarshal(b, &top), checker.IsNil)
-	c.Assert(top.Titles, checker.HasLen, 4, check.Commentf("expected 4 titles, found %d: %v", len(top.Titles), top.Titles))
-
-	if top.Titles[0] != "Name" || top.Titles[3] != "Private Working Set" {
-		c.Fatalf("expected `Name` at `Titles[0]` and `Private Working Set` at Titles[3]: %v", top.Titles)
-	}
-	c.Assert(len(top.Processes), checker.GreaterOrEqualThan, 2, check.Commentf("expected at least 2 processes, found %d: %v", len(top.Processes), top.Processes))
-
-	foundProcess := false
-	expectedProcess := "busybox.exe"
-	for _, process := range top.Processes {
-		if process[0] == expectedProcess {
-			foundProcess = true
-			break
-		}
-	}
-
-	c.Assert(foundProcess, checker.Equals, true, check.Commentf("expected to find %s: %v", expectedProcess, top.Processes))
-}
-
-func (s *DockerSuite) TestContainerAPICommit(c *check.C) {
-	cName := "testapicommit"
-	dockerCmd(c, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test")
-
-	name := "testcontainerapicommit"
-	status, b, err := sockRequest("POST", "/commit?repo="+name+"&testtag=tag&container="+cName, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	type resp struct {
-		ID string
-	}
-	var img resp
-	c.Assert(json.Unmarshal(b, &img), checker.IsNil)
-
-	cmd := inspectField(c, img.ID, "Config.Cmd")
-	c.Assert(cmd, checker.Equals, "[/bin/sh -c touch /test]", check.Commentf("got wrong Cmd from commit: %q", cmd))
-
-	// sanity check, make sure the image is what we think it is
-	dockerCmd(c, "run", img.ID, "ls", "/test")
-}
-
-func (s *DockerSuite) TestContainerAPICommitWithLabelInConfig(c *check.C) {
-	cName := "testapicommitwithconfig"
-	dockerCmd(c, "run", "--name="+cName, "busybox", "/bin/sh", "-c", "touch /test")
-
-	config := map[string]interface{}{
-		"Labels": map[string]string{"key1": "value1", "key2": "value2"},
-	}
-
-	name := "testcontainerapicommitwithconfig"
-	status, b, err := sockRequest("POST", "/commit?repo="+name+"&container="+cName, config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	type resp struct {
-		ID string
-	}
-	var img resp
-	c.Assert(json.Unmarshal(b, &img), checker.IsNil)
-
-	label1 := inspectFieldMap(c, img.ID, "Config.Labels", "key1")
-	c.Assert(label1, checker.Equals, "value1")
-
-	label2 := inspectFieldMap(c, img.ID, "Config.Labels", "key2")
-	c.Assert(label2, checker.Equals, "value2")
-
-	cmd := inspectField(c, img.ID, "Config.Cmd")
-	c.Assert(cmd, checker.Equals, "[/bin/sh -c touch /test]", check.Commentf("got wrong Cmd from commit: %q", cmd))
-
-	// sanity check, make sure the image is what we think it is
-	dockerCmd(c, "run", img.ID, "ls", "/test")
-}
-
-func (s *DockerSuite) TestContainerAPIBadPort(c *check.C) {
-	// TODO Windows to Windows CI - Port this test
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image": "busybox",
-		"Cmd":   []string{"/bin/sh", "-c", "echo test"},
-		"PortBindings": map[string]interface{}{
-			"8080/tcp": []map[string]interface{}{
-				{
-					"HostIP":   "",
-					"HostPort": "aa80",
-				},
-			},
-		},
-	}
-
-	jsonData := bytes.NewBuffer(nil)
-	json.NewEncoder(jsonData).Encode(config)
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	c.Assert(getErrorMessage(c, body), checker.Equals, `invalid port specification: "aa80"`, check.Commentf("Incorrect error msg: %s", body))
-}
-
-func (s *DockerSuite) TestContainerAPICreate(c *check.C) {
-	config := map[string]interface{}{
-		"Image": "busybox",
-		"Cmd":   []string{"/bin/sh", "-c", "touch /test && ls /test"},
-	}
-
-	status, b, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	type createResp struct {
-		ID string
-	}
-	var container createResp
-	c.Assert(json.Unmarshal(b, &container), checker.IsNil)
-
-	out, _ := dockerCmd(c, "start", "-a", container.ID)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "/test")
-}
-
-func (s *DockerSuite) TestContainerAPICreateEmptyConfig(c *check.C) {
-	config := map[string]interface{}{}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-
-	expected := "Config cannot be empty in order to create a container"
-	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
-}
-
-func (s *DockerSuite) TestContainerAPICreateMultipleNetworksConfig(c *check.C) {
-	// Container creation must fail if client specified configurations for more than one network
-	config := map[string]interface{}{
-		"Image": "busybox",
-		"NetworkingConfig": networktypes.NetworkingConfig{
-			EndpointsConfig: map[string]*networktypes.EndpointSettings{
-				"net1": {},
-				"net2": {},
-				"net3": {},
-			},
-		},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusBadRequest)
-	msg := getErrorMessage(c, body)
-	// network name order in error message is not deterministic
-	c.Assert(msg, checker.Contains, "Container cannot be connected to network endpoints")
-	c.Assert(msg, checker.Contains, "net1")
-	c.Assert(msg, checker.Contains, "net2")
-	c.Assert(msg, checker.Contains, "net3")
-}
-
-func (s *DockerSuite) TestContainerAPICreateWithHostName(c *check.C) {
-	hostName := "test-host"
-	config := map[string]interface{}{
-		"Image":    "busybox",
-		"Hostname": hostName,
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), checker.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
-	c.Assert(containerJSON.Config.Hostname, checker.Equals, hostName, check.Commentf("Mismatched Hostname"))
-}
-
-func (s *DockerSuite) TestContainerAPICreateWithDomainName(c *check.C) {
-	domainName := "test-domain"
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"Domainname": domainName,
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), checker.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
-	c.Assert(containerJSON.Config.Domainname, checker.Equals, domainName, check.Commentf("Mismatched Domainname"))
-}
-
-func (s *DockerSuite) TestContainerAPICreateBridgeNetworkMode(c *check.C) {
-	// Windows does not support bridge
-	testRequires(c, DaemonIsLinux)
-	UtilCreateNetworkMode(c, "bridge")
-}
-
-func (s *DockerSuite) TestContainerAPICreateOtherNetworkModes(c *check.C) {
-	// Windows does not support these network modes
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	UtilCreateNetworkMode(c, "host")
-	UtilCreateNetworkMode(c, "container:web1")
-}
-
-func UtilCreateNetworkMode(c *check.C, networkMode string) {
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"HostConfig": map[string]interface{}{"NetworkMode": networkMode},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), checker.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
-	c.Assert(containerJSON.HostConfig.NetworkMode, checker.Equals, containertypes.NetworkMode(networkMode), check.Commentf("Mismatched NetworkMode"))
-}
-
-func (s *DockerSuite) TestContainerAPICreateWithCpuSharesCpuset(c *check.C) {
-	// TODO Windows to Windows CI. The CpuShares part could be ported.
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"CpuShares":  512,
-		"CpusetCpus": "0",
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), checker.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-
-	c.Assert(json.Unmarshal(body, &containerJSON), checker.IsNil)
-
-	out := inspectField(c, containerJSON.ID, "HostConfig.CpuShares")
-	c.Assert(out, checker.Equals, "512")
-
-	outCpuset := inspectField(c, containerJSON.ID, "HostConfig.CpusetCpus")
-	c.Assert(outCpuset, checker.Equals, "0")
-}
-
-func (s *DockerSuite) TestContainerAPIVerifyHeader(c *check.C) {
-	config := map[string]interface{}{
-		"Image": "busybox",
-	}
-
-	create := func(ct string) (*http.Response, io.ReadCloser, error) {
-		jsonData := bytes.NewBuffer(nil)
-		c.Assert(json.NewEncoder(jsonData).Encode(config), checker.IsNil)
-		return sockRequestRaw("POST", "/containers/create", jsonData, ct)
-	}
-
-	// Try with no content-type
-	res, body, err := create("")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-	body.Close()
-
-	// Try with wrong content-type
-	res, body, err = create("application/xml")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-	body.Close()
-
-	// now application/json
-	res, body, err = create("application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)
-	body.Close()
-}
-
-//Issue 14230. daemon should return 500 for invalid port syntax
-func (s *DockerSuite) TestContainerAPIInvalidPortSyntax(c *check.C) {
-	config := `{
-				  "Image": "busybox",
-				  "HostConfig": {
-					"NetworkMode": "default",
-					"PortBindings": {
-					  "19039;1230": [
-						{}
-					  ]
-					}
-				  }
-				}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b[:]), checker.Contains, "invalid port")
-}
-
-func (s *DockerSuite) TestContainerAPIRestartPolicyInvalidPolicyName(c *check.C) {
-	config := `{
-		"Image": "busybox",
-		"HostConfig": {
-			"RestartPolicy": {
-				"Name": "something",
-				"MaximumRetryCount": 0
-			}
-		}
-	}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b[:]), checker.Contains, "invalid restart policy")
-}
-
-func (s *DockerSuite) TestContainerAPIRestartPolicyRetryMismatch(c *check.C) {
-	config := `{
-		"Image": "busybox",
-		"HostConfig": {
-			"RestartPolicy": {
-				"Name": "always",
-				"MaximumRetryCount": 2
-			}
-		}
-	}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b[:]), checker.Contains, "maximum retry count cannot be used with restart policy")
-}
-
-func (s *DockerSuite) TestContainerAPIRestartPolicyNegativeRetryCount(c *check.C) {
-	config := `{
-		"Image": "busybox",
-		"HostConfig": {
-			"RestartPolicy": {
-				"Name": "on-failure",
-				"MaximumRetryCount": -2
-			}
-		}
-	}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b[:]), checker.Contains, "maximum retry count cannot be negative")
-}
-
-func (s *DockerSuite) TestContainerAPIRestartPolicyDefaultRetryCount(c *check.C) {
-	config := `{
-		"Image": "busybox",
-		"HostConfig": {
-			"RestartPolicy": {
-				"Name": "on-failure",
-				"MaximumRetryCount": 0
-			}
-		}
-	}`
-
-	res, _, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)
-}
-
-// Issue 7941 - test to make sure a "null" in JSON is just ignored.
-// W/o this fix a null in JSON would be parsed into a string var as "null"
-func (s *DockerSuite) TestContainerAPIPostCreateNull(c *check.C) {
-	config := `{
-		"Hostname":"",
-		"Domainname":"",
-		"Memory":0,
-		"MemorySwap":0,
-		"CpuShares":0,
-		"Cpuset":null,
-		"AttachStdin":true,
-		"AttachStdout":true,
-		"AttachStderr":true,
-		"ExposedPorts":{},
-		"Tty":true,
-		"OpenStdin":true,
-		"StdinOnce":true,
-		"Env":[],
-		"Cmd":"ls",
-		"Image":"busybox",
-		"Volumes":{},
-		"WorkingDir":"",
-		"Entrypoint":null,
-		"NetworkDisabled":false,
-		"OnBuild":null}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusCreated)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	type createResp struct {
-		ID string
-	}
-	var container createResp
-	c.Assert(json.Unmarshal(b, &container), checker.IsNil)
-	out := inspectField(c, container.ID, "HostConfig.CpusetCpus")
-	c.Assert(out, checker.Equals, "")
-
-	outMemory := inspectField(c, container.ID, "HostConfig.Memory")
-	c.Assert(outMemory, checker.Equals, "0")
-	outMemorySwap := inspectField(c, container.ID, "HostConfig.MemorySwap")
-	c.Assert(outMemorySwap, checker.Equals, "0")
-}
-
-func (s *DockerSuite) TestCreateWithTooLowMemoryLimit(c *check.C) {
-	// TODO Windows: Port once memory is supported
-	testRequires(c, DaemonIsLinux)
-	config := `{
-		"Image":     "busybox",
-		"Cmd":       "ls",
-		"OpenStdin": true,
-		"CpuShares": 100,
-		"Memory":    524287
-	}`
-
-	res, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	b, err2 := readBody(body)
-	c.Assert(err2, checker.IsNil)
-
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-	c.Assert(string(b), checker.Contains, "Minimum memory limit allowed is 4MB")
-}
-
-func (s *DockerSuite) TestContainerAPIRename(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--name", "TestContainerAPIRename", "-d", "busybox", "sh")
-
-	containerID := strings.TrimSpace(out)
-	newName := "TestContainerAPIRenameNew"
-	statusCode, _, err := sockRequest("POST", "/containers/"+containerID+"/rename?name="+newName, nil)
-	c.Assert(err, checker.IsNil)
-	// 204 No Content is expected, not 200
-	c.Assert(statusCode, checker.Equals, http.StatusNoContent)
-
-	name := inspectField(c, containerID, "Name")
-	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container"))
-}
-
-func (s *DockerSuite) TestContainerAPIKill(c *check.C) {
-	name := "test-api-kill"
-	runSleepingContainer(c, "-i", "--name", name)
-
-	status, _, err := sockRequest("POST", "/containers/"+name+"/kill", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	state := inspectField(c, name, "State.Running")
-	c.Assert(state, checker.Equals, "false", check.Commentf("got wrong State from container %s: %q", name, state))
-}
-
-func (s *DockerSuite) TestContainerAPIRestart(c *check.C) {
-	name := "test-api-restart"
-	runSleepingContainer(c, "-di", "--name", name)
-
-	status, _, err := sockRequest("POST", "/containers/"+name+"/restart?t=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 15*time.Second), checker.IsNil)
-}
-
-func (s *DockerSuite) TestContainerAPIRestartNotimeoutParam(c *check.C) {
-	name := "test-api-restart-no-timeout-param"
-	out, _ := runSleepingContainer(c, "-di", "--name", name)
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	status, _, err := sockRequest("POST", "/containers/"+name+"/restart", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-	c.Assert(waitInspect(name, "{{ .State.Restarting  }} {{ .State.Running  }}", "false true", 15*time.Second), checker.IsNil)
-}
-
-func (s *DockerSuite) TestContainerAPIStart(c *check.C) {
-	name := "testing-start"
-	config := map[string]interface{}{
-		"Image":     "busybox",
-		"Cmd":       append([]string{"/bin/sh", "-c"}, sleepCommandForDaemonPlatform()...),
-		"OpenStdin": true,
-	}
-
-	status, _, err := sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	status, _, err = sockRequest("POST", "/containers/"+name+"/start", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	// second call to start should give 304
-	status, _, err = sockRequest("POST", "/containers/"+name+"/start", nil)
-	c.Assert(err, checker.IsNil)
-
-	// TODO(tibor): figure out why this doesn't work on windows
-	if isLocalDaemon {
-		c.Assert(status, checker.Equals, http.StatusNotModified)
-	}
-}
-
-func (s *DockerSuite) TestContainerAPIStop(c *check.C) {
-	name := "test-api-stop"
-	runSleepingContainer(c, "-i", "--name", name)
-
-	status, _, err := sockRequest("POST", "/containers/"+name+"/stop?t=30", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-	c.Assert(waitInspect(name, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)
-
-	// second call to start should give 304
-	status, _, err = sockRequest("POST", "/containers/"+name+"/stop?t=30", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotModified)
-}
-
-func (s *DockerSuite) TestContainerAPIWait(c *check.C) {
-	name := "test-api-wait"
-
-	sleepCmd := "/bin/sleep"
-	if daemonPlatform == "windows" {
-		sleepCmd = "sleep"
-	}
-	dockerCmd(c, "run", "--name", name, "busybox", sleepCmd, "2")
-
-	status, body, err := sockRequest("POST", "/containers/"+name+"/wait", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(waitInspect(name, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)
-
-	var waitres containertypes.ContainerWaitOKBody
-	c.Assert(json.Unmarshal(body, &waitres), checker.IsNil)
-	c.Assert(waitres.StatusCode, checker.Equals, int64(0))
-}
-
-func (s *DockerSuite) TestContainerAPICopyNotExistsAnyMore(c *check.C) {
-	name := "test-container-api-copy"
-	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
-
-	postData := types.CopyConfig{
-		Resource: "/test.txt",
-	}
-
-	status, _, err := sockRequest("POST", "/containers/"+name+"/copy", postData)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-}
-
-func (s *DockerSuite) TestContainerAPICopyPre124(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	name := "test-container-api-copy"
-	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
-
-	postData := types.CopyConfig{
-		Resource: "/test.txt",
-	}
-
-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	found := false
-	for tarReader := tar.NewReader(bytes.NewReader(body)); ; {
-		h, err := tarReader.Next()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			c.Fatal(err)
-		}
-		if h.Name == "test.txt" {
-			found = true
-			break
-		}
-	}
-	c.Assert(found, checker.True)
-}
-
-func (s *DockerSuite) TestContainerAPICopyResourcePathEmptyPr124(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	name := "test-container-api-copy-resource-empty"
-	dockerCmd(c, "run", "--name", name, "busybox", "touch", "/test.txt")
-
-	postData := types.CopyConfig{
-		Resource: "",
-	}
-
-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	c.Assert(string(body), checker.Matches, "Path cannot be empty\n")
-}
-
-func (s *DockerSuite) TestContainerAPICopyResourcePathNotFoundPre124(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	name := "test-container-api-copy-resource-not-found"
-	dockerCmd(c, "run", "--name", name, "busybox")
-
-	postData := types.CopyConfig{
-		Resource: "/notexist",
-	}
-
-	status, body, err := sockRequest("POST", "/v1.23/containers/"+name+"/copy", postData)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	c.Assert(string(body), checker.Matches, "Could not find the file /notexist in container "+name+"\n")
-}
-
-func (s *DockerSuite) TestContainerAPICopyContainerNotFoundPr124(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	postData := types.CopyConfig{
-		Resource: "/something",
-	}
-
-	status, _, err := sockRequest("POST", "/v1.23/containers/notexists/copy", postData)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-}
-
-func (s *DockerSuite) TestContainerAPIDelete(c *check.C) {
-	out, _ := runSleepingContainer(c)
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	dockerCmd(c, "stop", id)
-
-	status, _, err := sockRequest("DELETE", "/containers/"+id, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-}
-
-func (s *DockerSuite) TestContainerAPIDeleteNotExist(c *check.C) {
-	status, body, err := sockRequest("DELETE", "/containers/doesnotexist", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-	c.Assert(getErrorMessage(c, body), checker.Matches, "No such container: doesnotexist")
-}
-
-func (s *DockerSuite) TestContainerAPIDeleteForce(c *check.C) {
-	out, _ := runSleepingContainer(c)
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	status, _, err := sockRequest("DELETE", "/containers/"+id+"?force=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-}
-
-func (s *DockerSuite) TestContainerAPIDeleteRemoveLinks(c *check.C) {
-	// Windows does not support links
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--name", "tlink1", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	out, _ = dockerCmd(c, "run", "--link", "tlink1:tlink1", "--name", "tlink2", "-d", "busybox", "top")
-
-	id2 := strings.TrimSpace(out)
-	c.Assert(waitRun(id2), checker.IsNil)
-
-	links := inspectFieldJSON(c, id2, "HostConfig.Links")
-	c.Assert(links, checker.Equals, "[\"/tlink1:/tlink2/tlink1\"]", check.Commentf("expected to have links between containers"))
-
-	status, b, err := sockRequest("DELETE", "/containers/tlink2/tlink1?link=1", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusNoContent, check.Commentf(string(b)))
-
-	linksPostRm := inspectFieldJSON(c, id2, "HostConfig.Links")
-	c.Assert(linksPostRm, checker.Equals, "null", check.Commentf("call to api deleteContainer links should have removed the specified links"))
-}
-
-func (s *DockerSuite) TestContainerAPIDeleteConflict(c *check.C) {
-	out, _ := runSleepingContainer(c)
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	status, _, err := sockRequest("DELETE", "/containers/"+id, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusConflict)
-}
-
-func (s *DockerSuite) TestContainerAPIDeleteRemoveVolume(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	vol := "/testvolume"
-	if daemonPlatform == "windows" {
-		vol = `c:\testvolume`
-	}
-
-	out, _ := runSleepingContainer(c, "-v", vol)
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	source, err := inspectMountSourceField(id, vol)
-	_, err = os.Stat(source)
-	c.Assert(err, checker.IsNil)
-
-	status, _, err := sockRequest("DELETE", "/containers/"+id+"?v=1&force=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-	_, err = os.Stat(source)
-	c.Assert(os.IsNotExist(err), checker.True, check.Commentf("expected to get ErrNotExist error, got %v", err))
-}
-
-// Regression test for https://github.com/docker/docker/issues/6231
-func (s *DockerSuite) TestContainerAPIChunkedEncoding(c *check.C) {
-	conn, err := sockConn(time.Duration(10*time.Second), "")
-	c.Assert(err, checker.IsNil)
-	client := httputil.NewClientConn(conn, nil)
-	defer client.Close()
-
-	config := map[string]interface{}{
-		"Image":     "busybox",
-		"Cmd":       append([]string{"/bin/sh", "-c"}, sleepCommandForDaemonPlatform()...),
-		"OpenStdin": true,
-	}
-	b, err := json.Marshal(config)
-	c.Assert(err, checker.IsNil)
-
-	req, err := http.NewRequest("POST", "/containers/create", bytes.NewBuffer(b))
-	c.Assert(err, checker.IsNil)
-	req.Header.Set("Content-Type", "application/json")
-	// This is a cheat to make the http request do chunked encoding
-	// Otherwise (just setting the Content-Encoding to chunked) net/http will overwrite
-	// https://golang.org/src/pkg/net/http/request.go?s=11980:12172
-	req.ContentLength = -1
-
-	resp, err := client.Do(req)
-	c.Assert(err, checker.IsNil, check.Commentf("error creating container with chunked encoding"))
-	resp.Body.Close()
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusCreated)
-}
-
-func (s *DockerSuite) TestContainerAPIPostContainerStop(c *check.C) {
-	out, _ := runSleepingContainer(c)
-
-	containerID := strings.TrimSpace(out)
-	c.Assert(waitRun(containerID), checker.IsNil)
-
-	statusCode, _, err := sockRequest("POST", "/containers/"+containerID+"/stop", nil)
-	c.Assert(err, checker.IsNil)
-	// 204 No Content is expected, not 200
-	c.Assert(statusCode, checker.Equals, http.StatusNoContent)
-	c.Assert(waitInspect(containerID, "{{ .State.Running  }}", "false", 60*time.Second), checker.IsNil)
-}
-
-// #14170
-func (s *DockerSuite) TestPostContainerAPICreateWithStringOrSliceEntrypoint(c *check.C) {
-	config := struct {
-		Image      string
-		Entrypoint string
-		Cmd        []string
-	}{"busybox", "echo", []string{"hello", "world"}}
-	_, _, err := sockRequest("POST", "/containers/create?name=echotest", config)
-	c.Assert(err, checker.IsNil)
-	out, _ := dockerCmd(c, "start", "-a", "echotest")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello world")
-
-	config2 := struct {
-		Image      string
-		Entrypoint []string
-		Cmd        []string
-	}{"busybox", []string{"echo"}, []string{"hello", "world"}}
-	_, _, err = sockRequest("POST", "/containers/create?name=echotest2", config2)
-	c.Assert(err, checker.IsNil)
-	out, _ = dockerCmd(c, "start", "-a", "echotest2")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello world")
-}
-
-// #14170
-func (s *DockerSuite) TestPostContainersCreateWithStringOrSliceCmd(c *check.C) {
-	config := struct {
-		Image      string
-		Entrypoint string
-		Cmd        string
-	}{"busybox", "echo", "hello world"}
-	_, _, err := sockRequest("POST", "/containers/create?name=echotest", config)
-	c.Assert(err, checker.IsNil)
-	out, _ := dockerCmd(c, "start", "-a", "echotest")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello world")
-
-	config2 := struct {
-		Image string
-		Cmd   []string
-	}{"busybox", []string{"echo", "hello", "world"}}
-	_, _, err = sockRequest("POST", "/containers/create?name=echotest2", config2)
-	c.Assert(err, checker.IsNil)
-	out, _ = dockerCmd(c, "start", "-a", "echotest2")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello world")
-}
-
-// regression #14318
-func (s *DockerSuite) TestPostContainersCreateWithStringOrSliceCapAddDrop(c *check.C) {
-	// Windows doesn't support CapAdd/CapDrop
-	testRequires(c, DaemonIsLinux)
-	config := struct {
-		Image   string
-		CapAdd  string
-		CapDrop string
-	}{"busybox", "NET_ADMIN", "SYS_ADMIN"}
-	status, _, err := sockRequest("POST", "/containers/create?name=capaddtest0", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	config2 := struct {
-		Image   string
-		CapAdd  []string
-		CapDrop []string
-	}{"busybox", []string{"NET_ADMIN", "SYS_ADMIN"}, []string{"SETGID"}}
-	status, _, err = sockRequest("POST", "/containers/create?name=capaddtest1", config2)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-}
-
-// #14915
-func (s *DockerSuite) TestContainerAPICreateNoHostConfig118(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only support 1.25 or later
-	config := struct {
-		Image string
-	}{"busybox"}
-	status, _, err := sockRequest("POST", "/v1.18/containers/create", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-}
-
-// Ensure an error occurs when you have a container read-only rootfs but you
-// extract an archive to a symlink in a writable volume which points to a
-// directory outside of the volume.
-func (s *DockerSuite) TestPutContainerArchiveErrSymlinkInVolumeToReadOnlyRootfs(c *check.C) {
-	// Windows does not support read-only rootfs
-	// Requires local volume mount bind.
-	// --read-only + userns has remount issues
-	testRequires(c, SameHostDaemon, NotUserNamespace, DaemonIsLinux)
-
-	testVol := getTestDir(c, "test-put-container-archive-err-symlink-in-volume-to-read-only-rootfs-")
-	defer os.RemoveAll(testVol)
-
-	makeTestContentInDir(c, testVol)
-
-	cID := makeTestContainer(c, testContainerOptions{
-		readOnly: true,
-		volumes:  defaultVolumes(testVol), // Our bind mount is at /vol2
-	})
-	defer deleteContainer(cID)
-
-	// Attempt to extract to a symlink in the volume which points to a
-	// directory outside the volume. This should cause an error because the
-	// rootfs is read-only.
-	query := make(url.Values, 1)
-	query.Set("path", "/vol2/symlinkToAbsDir")
-	urlPath := fmt.Sprintf("/v1.20/containers/%s/archive?%s", cID, query.Encode())
-
-	statusCode, body, err := sockRequest("PUT", urlPath, nil)
-	c.Assert(err, checker.IsNil)
-
-	if !isCpCannotCopyReadOnly(fmt.Errorf(string(body))) {
-		c.Fatalf("expected ErrContainerRootfsReadonly error, but got %d: %s", statusCode, string(body))
-	}
-}
-
-func (s *DockerSuite) TestContainerAPIGetContainersJSONEmpty(c *check.C) {
-	status, body, err := sockRequest("GET", "/containers/json?all=1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(string(body), checker.Equals, "[]\n")
-}
-
-func (s *DockerSuite) TestPostContainersCreateWithWrongCpusetValues(c *check.C) {
-	// Not supported on Windows
-	testRequires(c, DaemonIsLinux)
-
-	c1 := struct {
-		Image      string
-		CpusetCpus string
-	}{"busybox", "1-42,,"}
-	name := "wrong-cpuset-cpus"
-	status, body, err := sockRequest("POST", "/containers/create?name="+name, c1)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	expected := "Invalid value 1-42,, for cpuset cpus"
-	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
-
-	c2 := struct {
-		Image      string
-		CpusetMems string
-	}{"busybox", "42-3,1--"}
-	name = "wrong-cpuset-mems"
-	status, body, err = sockRequest("POST", "/containers/create?name="+name, c2)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	expected = "Invalid value 42-3,1-- for cpuset mems"
-	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
-}
-
-func (s *DockerSuite) TestPostContainersCreateShmSizeNegative(c *check.C) {
-	// ShmSize is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"HostConfig": map[string]interface{}{"ShmSize": -1},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	c.Assert(getErrorMessage(c, body), checker.Contains, "SHM size can not be less than 0")
-}
-
-func (s *DockerSuite) TestPostContainersCreateShmSizeHostConfigOmitted(c *check.C) {
-	// ShmSize is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-	var defaultSHMSize int64 = 67108864
-	config := map[string]interface{}{
-		"Image": "busybox",
-		"Cmd":   "mount",
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), check.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), check.IsNil)
-
-	c.Assert(containerJSON.HostConfig.ShmSize, check.Equals, defaultSHMSize)
-
-	out, _ := dockerCmd(c, "start", "-i", containerJSON.ID)
-	shmRegexp := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=65536k`)
-	if !shmRegexp.MatchString(out) {
-		c.Fatalf("Expected shm of 64MB in mount command, got %v", out)
-	}
-}
-
-func (s *DockerSuite) TestPostContainersCreateShmSizeOmitted(c *check.C) {
-	// ShmSize is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"HostConfig": map[string]interface{}{},
-		"Cmd":        "mount",
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), check.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), check.IsNil)
-
-	c.Assert(containerJSON.HostConfig.ShmSize, check.Equals, int64(67108864))
-
-	out, _ := dockerCmd(c, "start", "-i", containerJSON.ID)
-	shmRegexp := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=65536k`)
-	if !shmRegexp.MatchString(out) {
-		c.Fatalf("Expected shm of 64MB in mount command, got %v", out)
-	}
-}
-
-func (s *DockerSuite) TestPostContainersCreateWithShmSize(c *check.C) {
-	// ShmSize is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image":      "busybox",
-		"Cmd":        "mount",
-		"HostConfig": map[string]interface{}{"ShmSize": 1073741824},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), check.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), check.IsNil)
-
-	c.Assert(containerJSON.HostConfig.ShmSize, check.Equals, int64(1073741824))
-
-	out, _ := dockerCmd(c, "start", "-i", containerJSON.ID)
-	shmRegex := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=1048576k`)
-	if !shmRegex.MatchString(out) {
-		c.Fatalf("Expected shm of 1GB in mount command, got %v", out)
-	}
-}
-
-func (s *DockerSuite) TestPostContainersCreateMemorySwappinessHostConfigOmitted(c *check.C) {
-	// Swappiness is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-	config := map[string]interface{}{
-		"Image": "busybox",
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated)
-
-	var container containertypes.ContainerCreateCreatedBody
-	c.Assert(json.Unmarshal(body, &container), check.IsNil)
-
-	status, body, err = sockRequest("GET", "/containers/"+container.ID+"/json", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-
-	var containerJSON types.ContainerJSON
-	c.Assert(json.Unmarshal(body, &containerJSON), check.IsNil)
-
-	c.Assert(*containerJSON.HostConfig.MemorySwappiness, check.Equals, int64(-1))
-}
-
-// check validation is done daemon side and not only in cli
-func (s *DockerSuite) TestPostContainersCreateWithOomScoreAdjInvalidRange(c *check.C) {
-	// OomScoreAdj is not supported on Windows
-	testRequires(c, DaemonIsLinux)
-
-	config := struct {
-		Image       string
-		OomScoreAdj int
-	}{"busybox", 1001}
-	name := "oomscoreadj-over"
-	status, b, err := sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-
-	expected := "Invalid value 1001, range for oom score adj is [-1000, 1000]"
-	msg := getErrorMessage(c, b)
-	if !strings.Contains(msg, expected) {
-		c.Fatalf("Expected output to contain %q, got %q", expected, msg)
-	}
-
-	config = struct {
-		Image       string
-		OomScoreAdj int
-	}{"busybox", -1001}
-	name = "oomscoreadj-low"
-	status, b, err = sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	expected = "Invalid value -1001, range for oom score adj is [-1000, 1000]"
-	msg = getErrorMessage(c, b)
-	if !strings.Contains(msg, expected) {
-		c.Fatalf("Expected output to contain %q, got %q", expected, msg)
-	}
-}
-
-// test case for #22210 where an empty container name caused panic.
-func (s *DockerSuite) TestContainerAPIDeleteWithEmptyName(c *check.C) {
-	status, out, err := sockRequest("DELETE", "/containers/", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusBadRequest)
-	c.Assert(string(out), checker.Contains, "No container name or ID supplied")
-}
-
-func (s *DockerSuite) TestContainerAPIStatsWithNetworkDisabled(c *check.C) {
-	// Problematic on Windows as Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-
-	name := "testing-network-disabled"
-	config := map[string]interface{}{
-		"Image":           "busybox",
-		"Cmd":             []string{"top"},
-		"NetworkDisabled": true,
-	}
-
-	status, _, err := sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	status, _, err = sockRequest("POST", "/containers/"+name+"/start", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	c.Assert(waitRun(name), check.IsNil)
-
-	type b struct {
-		status int
-		body   []byte
-		err    error
-	}
-	bc := make(chan b, 1)
-	go func() {
-		status, body, err := sockRequest("GET", "/containers/"+name+"/stats", nil)
-		bc <- b{status, body, err}
-	}()
-
-	// allow some time to stream the stats from the container
-	time.Sleep(4 * time.Second)
-	dockerCmd(c, "rm", "-f", name)
-
-	// collect the results from the stats stream or timeout and fail
-	// if the stream was not disconnected.
-	select {
-	case <-time.After(2 * time.Second):
-		c.Fatal("stream was not closed after container was removed")
-	case sr := <-bc:
-		c.Assert(sr.err, checker.IsNil)
-		c.Assert(sr.status, checker.Equals, http.StatusOK)
-
-		// decode only one object from the stream
-		var s *types.Stats
-		dec := json.NewDecoder(bytes.NewBuffer(sr.body))
-		c.Assert(dec.Decode(&s), checker.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestContainersAPICreateMountsValidation(c *check.C) {
-	type m mounttypes.Mount
-	type hc struct{ Mounts []m }
-	type cfg struct {
-		Image      string
-		HostConfig hc
-	}
-	type testCase struct {
-		config cfg
-		status int
-		msg    string
-	}
-
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	destPath := prefix + slash + "foo"
-	notExistPath := prefix + slash + "notexist"
-
-	cases := []testCase{
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type:   "notreal",
-						Target: destPath}}}},
-			status: http.StatusBadRequest,
-			msg:    "mount type unknown",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type: "bind"}}}},
-			status: http.StatusBadRequest,
-			msg:    "Target must not be empty",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type:   "bind",
-						Target: destPath}}}},
-			status: http.StatusBadRequest,
-			msg:    "Source must not be empty",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type:   "bind",
-						Source: notExistPath,
-						Target: destPath}}}},
-			status: http.StatusBadRequest,
-			msg:    "bind source path does not exist",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type: "volume"}}}},
-			status: http.StatusBadRequest,
-			msg:    "Target must not be empty",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type:   "volume",
-						Source: "hello",
-						Target: destPath}}}},
-			status: http.StatusCreated,
-			msg:    "",
-		},
-		{
-			config: cfg{
-				Image: "busybox",
-				HostConfig: hc{
-					Mounts: []m{{
-						Type:   "volume",
-						Source: "hello2",
-						Target: destPath,
-						VolumeOptions: &mounttypes.VolumeOptions{
-							DriverConfig: &mounttypes.Driver{
-								Name: "local"}}}}}},
-			status: http.StatusCreated,
-			msg:    "",
-		},
-	}
-
-	if SameHostDaemon.Condition() {
-		tmpDir, err := ioutils.TempDir("", "test-mounts-api")
-		c.Assert(err, checker.IsNil)
-		defer os.RemoveAll(tmpDir)
-		cases = append(cases, []testCase{
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:   "bind",
-							Source: tmpDir,
-							Target: destPath}}}},
-				status: http.StatusCreated,
-				msg:    "",
-			},
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:          "bind",
-							Source:        tmpDir,
-							Target:        destPath,
-							VolumeOptions: &mounttypes.VolumeOptions{}}}}},
-				status: http.StatusBadRequest,
-				msg:    "VolumeOptions must not be specified",
-			},
-		}...)
-	}
-
-	if DaemonIsLinux.Condition() {
-		cases = append(cases, []testCase{
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:   "volume",
-							Source: "hello3",
-							Target: destPath,
-							VolumeOptions: &mounttypes.VolumeOptions{
-								DriverConfig: &mounttypes.Driver{
-									Name:    "local",
-									Options: map[string]string{"o": "size=1"}}}}}}},
-				status: http.StatusCreated,
-				msg:    "",
-			},
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:   "tmpfs",
-							Target: destPath}}}},
-				status: http.StatusCreated,
-				msg:    "",
-			},
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:   "tmpfs",
-							Target: destPath,
-							TmpfsOptions: &mounttypes.TmpfsOptions{
-								SizeBytes: 4096 * 1024,
-								Mode:      0700,
-							}}}}},
-				status: http.StatusCreated,
-				msg:    "",
-			},
-
-			{
-				config: cfg{
-					Image: "busybox",
-					HostConfig: hc{
-						Mounts: []m{{
-							Type:   "tmpfs",
-							Source: "/shouldnotbespecified",
-							Target: destPath}}}},
-				status: http.StatusBadRequest,
-				msg:    "Source must not be specified",
-			},
-		}...)
-
-	}
-
-	for i, x := range cases {
-		c.Logf("case %d", i)
-		status, b, err := sockRequest("POST", "/containers/create", x.config)
-		c.Assert(err, checker.IsNil)
-		c.Assert(status, checker.Equals, x.status, check.Commentf("%s\n%v", string(b), cases[i].config))
-		if len(x.msg) > 0 {
-			c.Assert(string(b), checker.Contains, x.msg, check.Commentf("%v", cases[i].config))
-		}
-	}
-}
-
-func (s *DockerSuite) TestContainerAPICreateMountsBindRead(c *check.C) {
-	testRequires(c, NotUserNamespace, SameHostDaemon)
-	// also with data in the host side
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	destPath := prefix + slash + "foo"
-	tmpDir, err := ioutil.TempDir("", "test-mounts-api-bind")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-	err = ioutil.WriteFile(filepath.Join(tmpDir, "bar"), []byte("hello"), 666)
-	c.Assert(err, checker.IsNil)
-
-	data := map[string]interface{}{
-		"Image":      "busybox",
-		"Cmd":        []string{"/bin/sh", "-c", "cat /foo/bar"},
-		"HostConfig": map[string]interface{}{"Mounts": []map[string]interface{}{{"Type": "bind", "Source": tmpDir, "Target": destPath}}},
-	}
-	status, resp, err := sockRequest("POST", "/containers/create?name=test", data)
-	c.Assert(err, checker.IsNil, check.Commentf(string(resp)))
-	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(resp)))
-
-	out, _ := dockerCmd(c, "start", "-a", "test")
-	c.Assert(out, checker.Equals, "hello")
-}
-
-// Test Mounts comes out as expected for the MountPoint
-func (s *DockerSuite) TestContainersAPICreateMountsCreate(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	destPath := prefix + slash + "foo"
-
-	var (
-		err     error
-		testImg string
-	)
-	if daemonPlatform != "windows" {
-		testImg, err = buildImage("test-mount-config", `
-	FROM busybox
-	RUN mkdir `+destPath+` && touch `+destPath+slash+`bar
-	CMD cat `+destPath+slash+`bar
-	`, true)
-	} else {
-		testImg = "busybox"
-	}
-	c.Assert(err, checker.IsNil)
-
-	type testCase struct {
-		cfg      mounttypes.Mount
-		expected types.MountPoint
-	}
-
-	cases := []testCase{
-		// use literal strings here for `Type` instead of the defined constants in the volume package to keep this honest
-		// Validation of the actual `Mount` struct is done in another test is not needed here
-		{mounttypes.Mount{Type: "volume", Target: destPath}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},
-		{mounttypes.Mount{Type: "volume", Target: destPath + slash}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},
-		{mounttypes.Mount{Type: "volume", Target: destPath, Source: "test1"}, types.MountPoint{Type: "volume", Name: "test1", RW: true, Destination: destPath}},
-		{mounttypes.Mount{Type: "volume", Target: destPath, ReadOnly: true, Source: "test2"}, types.MountPoint{Type: "volume", Name: "test2", RW: false, Destination: destPath}},
-		{mounttypes.Mount{Type: "volume", Target: destPath, Source: "test3", VolumeOptions: &mounttypes.VolumeOptions{DriverConfig: &mounttypes.Driver{Name: volume.DefaultDriverName}}}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", Name: "test3", RW: true, Destination: destPath}},
-	}
-
-	if SameHostDaemon.Condition() {
-		// setup temp dir for testing binds
-		tmpDir1, err := ioutil.TempDir("", "test-mounts-api-1")
-		c.Assert(err, checker.IsNil)
-		defer os.RemoveAll(tmpDir1)
-		cases = append(cases, []testCase{
-			{mounttypes.Mount{Type: "bind", Source: tmpDir1, Target: destPath}, types.MountPoint{Type: "bind", RW: true, Destination: destPath, Source: tmpDir1}},
-			{mounttypes.Mount{Type: "bind", Source: tmpDir1, Target: destPath, ReadOnly: true}, types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir1}},
-		}...)
-
-		// for modes only supported on Linux
-		if DaemonIsLinux.Condition() {
-			tmpDir3, err := ioutils.TempDir("", "test-mounts-api-3")
-			c.Assert(err, checker.IsNil)
-			defer os.RemoveAll(tmpDir3)
-
-			c.Assert(mount.Mount(tmpDir3, tmpDir3, "none", "bind,rw"), checker.IsNil)
-			c.Assert(mount.ForceMount("", tmpDir3, "none", "shared"), checker.IsNil)
-
-			cases = append(cases, []testCase{
-				{mounttypes.Mount{Type: "bind", Source: tmpDir3, Target: destPath}, types.MountPoint{Type: "bind", RW: true, Destination: destPath, Source: tmpDir3}},
-				{mounttypes.Mount{Type: "bind", Source: tmpDir3, Target: destPath, ReadOnly: true}, types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3}},
-				{mounttypes.Mount{Type: "bind", Source: tmpDir3, Target: destPath, ReadOnly: true, BindOptions: &mounttypes.BindOptions{Propagation: "shared"}}, types.MountPoint{Type: "bind", RW: false, Destination: destPath, Source: tmpDir3, Propagation: "shared"}},
-			}...)
-		}
-	}
-
-	if daemonPlatform != "windows" { // Windows does not support volume populate
-		cases = append(cases, []testCase{
-			{mounttypes.Mount{Type: "volume", Target: destPath, VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},
-			{mounttypes.Mount{Type: "volume", Target: destPath + slash, VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Driver: volume.DefaultDriverName, Type: "volume", RW: true, Destination: destPath}},
-			{mounttypes.Mount{Type: "volume", Target: destPath, Source: "test4", VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Type: "volume", Name: "test4", RW: true, Destination: destPath}},
-			{mounttypes.Mount{Type: "volume", Target: destPath, Source: "test5", ReadOnly: true, VolumeOptions: &mounttypes.VolumeOptions{NoCopy: true}}, types.MountPoint{Type: "volume", Name: "test5", RW: false, Destination: destPath}},
-		}...)
-	}
-
-	type wrapper struct {
-		containertypes.Config
-		HostConfig containertypes.HostConfig
-	}
-	type createResp struct {
-		ID string `json:"Id"`
-	}
-	for i, x := range cases {
-		c.Logf("case %d - config: %v", i, x.cfg)
-		status, data, err := sockRequest("POST", "/containers/create", wrapper{containertypes.Config{Image: testImg}, containertypes.HostConfig{Mounts: []mounttypes.Mount{x.cfg}}})
-		c.Assert(err, checker.IsNil, check.Commentf(string(data)))
-		c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(data)))
-
-		var resp createResp
-		err = json.Unmarshal(data, &resp)
-		c.Assert(err, checker.IsNil, check.Commentf(string(data)))
-		id := resp.ID
-
-		var mps []types.MountPoint
-		err = json.NewDecoder(strings.NewReader(inspectFieldJSON(c, id, "Mounts"))).Decode(&mps)
-		c.Assert(err, checker.IsNil)
-		c.Assert(mps, checker.HasLen, 1)
-		c.Assert(mps[0].Destination, checker.Equals, x.expected.Destination)
-
-		if len(x.expected.Source) > 0 {
-			c.Assert(mps[0].Source, checker.Equals, x.expected.Source)
-		}
-		if len(x.expected.Name) > 0 {
-			c.Assert(mps[0].Name, checker.Equals, x.expected.Name)
-		}
-		if len(x.expected.Driver) > 0 {
-			c.Assert(mps[0].Driver, checker.Equals, x.expected.Driver)
-		}
-		c.Assert(mps[0].RW, checker.Equals, x.expected.RW)
-		c.Assert(mps[0].Type, checker.Equals, x.expected.Type)
-		c.Assert(mps[0].Mode, checker.Equals, x.expected.Mode)
-		if len(x.expected.Propagation) > 0 {
-			c.Assert(mps[0].Propagation, checker.Equals, x.expected.Propagation)
-		}
-
-		out, _, err := dockerCmdWithError("start", "-a", id)
-		if (x.cfg.Type != "volume" || (x.cfg.VolumeOptions != nil && x.cfg.VolumeOptions.NoCopy)) && daemonPlatform != "windows" {
-			c.Assert(err, checker.NotNil, check.Commentf("%s\n%v", out, mps[0]))
-		} else {
-			c.Assert(err, checker.IsNil, check.Commentf("%s\n%v", out, mps[0]))
-		}
-
-		dockerCmd(c, "rm", "-fv", id)
-		if x.cfg.Type == "volume" && len(x.cfg.Source) > 0 {
-			// This should still exist even though we removed the container
-			dockerCmd(c, "volume", "inspect", mps[0].Name)
-		} else {
-			// This should be removed automatically when we removed the container
-			out, _, err := dockerCmdWithError("volume", "inspect", mps[0].Name)
-			c.Assert(err, checker.NotNil, check.Commentf(out))
-		}
-	}
-}
-
-func (s *DockerSuite) TestContainersAPICreateMountsTmpfs(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	type testCase struct {
-		cfg             map[string]interface{}
-		expectedOptions []string
-	}
-	target := "/foo"
-	cases := []testCase{
-		{
-			cfg: map[string]interface{}{
-				"Type":   "tmpfs",
-				"Target": target},
-			expectedOptions: []string{"rw", "nosuid", "nodev", "noexec", "relatime"},
-		},
-		{
-			cfg: map[string]interface{}{
-				"Type":   "tmpfs",
-				"Target": target,
-				"TmpfsOptions": map[string]interface{}{
-					"SizeBytes": 4096 * 1024, "Mode": 0700}},
-			expectedOptions: []string{"rw", "nosuid", "nodev", "noexec", "relatime", "size=4096k", "mode=700"},
-		},
-	}
-
-	for i, x := range cases {
-		cName := fmt.Sprintf("test-tmpfs-%d", i)
-		data := map[string]interface{}{
-			"Image": "busybox",
-			"Cmd": []string{"/bin/sh", "-c",
-				fmt.Sprintf("mount | grep 'tmpfs on %s'", target)},
-			"HostConfig": map[string]interface{}{"Mounts": []map[string]interface{}{x.cfg}},
-		}
-		status, resp, err := sockRequest("POST", "/containers/create?name="+cName, data)
-		c.Assert(err, checker.IsNil, check.Commentf(string(resp)))
-		c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(resp)))
-		out, _ := dockerCmd(c, "start", "-a", cName)
-		for _, option := range x.expectedOptions {
-			c.Assert(out, checker.Contains, option)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_create_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_create_test.go
deleted file mode 100644
index 41011c3157..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_create_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPICreateWithNotExistImage(c *check.C) {
-	name := "test"
-	config := map[string]interface{}{
-		"Image":   "test456:v1",
-		"Volumes": map[string]struct{}{"/tmp": {}},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusNotFound)
-	expected := "No such image: test456:v1"
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-
-	config2 := map[string]interface{}{
-		"Image":   "test456",
-		"Volumes": map[string]struct{}{"/tmp": {}},
-	}
-
-	status, body, err = sockRequest("POST", "/containers/create?name="+name, config2)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusNotFound)
-	expected = "No such image: test456:latest"
-	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
-
-	config3 := map[string]interface{}{
-		"Image": "sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa",
-	}
-
-	status, body, err = sockRequest("POST", "/containers/create?name="+name, config3)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusNotFound)
-	expected = "No such image: sha256:0cb40641836c461bc97c793971d84d758371ed682042457523e4ae701efeaaaa"
-	c.Assert(getErrorMessage(c, body), checker.Equals, expected)
-
-}
-
-// Test for #25099
-func (s *DockerSuite) TestAPICreateEmptyEnv(c *check.C) {
-	name := "test1"
-	config := map[string]interface{}{
-		"Image": "busybox",
-		"Env":   []string{"", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
-		"Cmd":   []string{"true"},
-	}
-
-	status, body, err := sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	expected := "invalid environment variable:"
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-
-	name = "test2"
-	config = map[string]interface{}{
-		"Image": "busybox",
-		"Env":   []string{"=", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
-		"Cmd":   []string{"true"},
-	}
-	status, body, err = sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	expected = "invalid environment variable: ="
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-
-	name = "test3"
-	config = map[string]interface{}{
-		"Image": "busybox",
-		"Env":   []string{"=foo", "PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
-		"Cmd":   []string{"true"},
-	}
-	status, body, err = sockRequest("POST", "/containers/create?name="+name, config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	expected = "invalid environment variable: =foo"
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_events_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_events_test.go
deleted file mode 100644
index 3891c87379..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_events_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"io"
-	"net/http"
-	"net/url"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestEventsAPIEmptyOutput(c *check.C) {
-	type apiResp struct {
-		resp *http.Response
-		err  error
-	}
-	chResp := make(chan *apiResp)
-	go func() {
-		resp, body, err := sockRequestRaw("GET", "/events", nil, "")
-		body.Close()
-		chResp <- &apiResp{resp, err}
-	}()
-
-	select {
-	case r := <-chResp:
-		c.Assert(r.err, checker.IsNil)
-		c.Assert(r.resp.StatusCode, checker.Equals, http.StatusOK)
-	case <-time.After(3 * time.Second):
-		c.Fatal("timeout waiting for events api to respond, should have responded immediately")
-	}
-}
-
-func (s *DockerSuite) TestEventsAPIBackwardsCompatible(c *check.C) {
-	since := daemonTime(c).Unix()
-	ts := strconv.FormatInt(since, 10)
-
-	out, _ := runSleepingContainer(c, "--name=foo", "-d")
-	containerID := strings.TrimSpace(out)
-	c.Assert(waitRun(containerID), checker.IsNil)
-
-	q := url.Values{}
-	q.Set("since", ts)
-
-	_, body, err := sockRequestRaw("GET", "/events?"+q.Encode(), nil, "")
-	c.Assert(err, checker.IsNil)
-	defer body.Close()
-
-	dec := json.NewDecoder(body)
-	var containerCreateEvent *jsonmessage.JSONMessage
-	for {
-		var event jsonmessage.JSONMessage
-		if err := dec.Decode(&event); err != nil {
-			if err == io.EOF {
-				break
-			}
-			c.Fatal(err)
-		}
-		if event.Status == "create" && event.ID == containerID {
-			containerCreateEvent = &event
-			break
-		}
-	}
-
-	c.Assert(containerCreateEvent, checker.Not(checker.IsNil))
-	c.Assert(containerCreateEvent.Status, checker.Equals, "create")
-	c.Assert(containerCreateEvent.ID, checker.Equals, containerID)
-	c.Assert(containerCreateEvent.From, checker.Equals, "busybox")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_resize_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_resize_test.go
deleted file mode 100644
index cf4dded483..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_resize_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-	"sync"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestExecResizeAPIHeightWidthNoInt(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	endpoint := "/exec/" + cleanedContainerID + "/resize?h=foo&w=bar"
-	status, _, err := sockRequest("POST", endpoint, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-}
-
-// Part of #14845
-func (s *DockerSuite) TestExecResizeImmediatelyAfterExecStart(c *check.C) {
-	name := "exec_resize_test"
-	dockerCmd(c, "run", "-d", "-i", "-t", "--name", name, "--restart", "always", "busybox", "/bin/sh")
-
-	testExecResize := func() error {
-		data := map[string]interface{}{
-			"AttachStdin": true,
-			"Cmd":         []string{"/bin/sh"},
-		}
-		uri := fmt.Sprintf("/containers/%s/exec", name)
-		status, body, err := sockRequest("POST", uri, data)
-		if err != nil {
-			return err
-		}
-		if status != http.StatusCreated {
-			return fmt.Errorf("POST %s is expected to return %d, got %d", uri, http.StatusCreated, status)
-		}
-
-		out := map[string]string{}
-		err = json.Unmarshal(body, &out)
-		if err != nil {
-			return fmt.Errorf("ExecCreate returned invalid json. Error: %q", err.Error())
-		}
-
-		execID := out["Id"]
-		if len(execID) < 1 {
-			return fmt.Errorf("ExecCreate got invalid execID")
-		}
-
-		payload := bytes.NewBufferString(`{"Tty":true}`)
-		conn, _, err := sockRequestHijack("POST", fmt.Sprintf("/exec/%s/start", execID), payload, "application/json")
-		if err != nil {
-			return fmt.Errorf("Failed to start the exec: %q", err.Error())
-		}
-		defer conn.Close()
-
-		_, rc, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/resize?h=24&w=80", execID), nil, "text/plain")
-		// It's probably a panic of the daemon if io.ErrUnexpectedEOF is returned.
-		if err == io.ErrUnexpectedEOF {
-			return fmt.Errorf("The daemon might have crashed.")
-		}
-
-		if err == nil {
-			rc.Close()
-		}
-
-		// We only interested in the io.ErrUnexpectedEOF error, so we return nil otherwise.
-		return nil
-	}
-
-	// The panic happens when daemon.ContainerExecStart is called but the
-	// container.Exec is not called.
-	// Because the panic is not 100% reproducible, we send the requests concurrently
-	// to increase the probability that the problem is triggered.
-	var (
-		n  = 10
-		ch = make(chan error, n)
-		wg sync.WaitGroup
-	)
-	for i := 0; i < n; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			if err := testExecResize(); err != nil {
-				ch <- err
-			}
-		}()
-	}
-
-	wg.Wait()
-	select {
-	case err := <-ch:
-		c.Fatal(err.Error())
-	default:
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_test.go
deleted file mode 100644
index 716e9ac68f..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_exec_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// +build !test_no_exec
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// Regression test for #9414
-func (s *DockerSuite) TestExecAPICreateNoCmd(c *check.C) {
-	name := "exec_test"
-	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
-
-	status, body, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), map[string]interface{}{"Cmd": nil})
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-
-	comment := check.Commentf("Expected message when creating exec command with no Cmd specified")
-	c.Assert(getErrorMessage(c, body), checker.Contains, "No exec command specified", comment)
-}
-
-func (s *DockerSuite) TestExecAPICreateNoValidContentType(c *check.C) {
-	name := "exec_test"
-	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
-
-	jsonData := bytes.NewBuffer(nil)
-	if err := json.NewEncoder(jsonData).Encode(map[string]interface{}{"Cmd": nil}); err != nil {
-		c.Fatalf("Can not encode data to json %s", err)
-	}
-
-	res, body, err := sockRequestRaw("POST", fmt.Sprintf("/containers/%s/exec", name), jsonData, "text/plain")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-
-	comment := check.Commentf("Expected message when creating exec command with invalid Content-Type specified")
-	c.Assert(getErrorMessage(c, b), checker.Contains, "Content-Type specified", comment)
-}
-
-func (s *DockerSuite) TestExecAPICreateContainerPaused(c *check.C) {
-	// Not relevant on Windows as Windows containers cannot be paused
-	testRequires(c, DaemonIsLinux)
-	name := "exec_create_test"
-	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
-
-	dockerCmd(c, "pause", name)
-	status, body, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), map[string]interface{}{"Cmd": []string{"true"}})
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusConflict)
-
-	comment := check.Commentf("Expected message when creating exec command with Container %s is paused", name)
-	c.Assert(getErrorMessage(c, body), checker.Contains, "Container "+name+" is paused, unpause the container before exec", comment)
-}
-
-func (s *DockerSuite) TestExecAPIStart(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Uses pause/unpause but bits may be salvagable to Windows to Windows CI
-	dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
-
-	id := createExec(c, "test")
-	startExec(c, id, http.StatusOK)
-
-	var execJSON struct{ PID int }
-	inspectExec(c, id, &execJSON)
-	c.Assert(execJSON.PID, checker.GreaterThan, 1)
-
-	id = createExec(c, "test")
-	dockerCmd(c, "stop", "test")
-
-	startExec(c, id, http.StatusNotFound)
-
-	dockerCmd(c, "start", "test")
-	startExec(c, id, http.StatusNotFound)
-
-	// make sure exec is created before pausing
-	id = createExec(c, "test")
-	dockerCmd(c, "pause", "test")
-	startExec(c, id, http.StatusConflict)
-	dockerCmd(c, "unpause", "test")
-	startExec(c, id, http.StatusOK)
-}
-
-func (s *DockerSuite) TestExecAPIStartEnsureHeaders(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
-
-	id := createExec(c, "test")
-	resp, _, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.Header.Get("Server"), checker.Not(checker.Equals), "")
-}
-
-func (s *DockerSuite) TestExecAPIStartBackwardsCompatible(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	runSleepingContainer(c, "-d", "--name", "test")
-	id := createExec(c, "test")
-
-	resp, body, err := sockRequestRaw("POST", fmt.Sprintf("/v1.20/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "text/plain")
-	c.Assert(err, checker.IsNil)
-
-	b, err := readBody(body)
-	comment := check.Commentf("response body: %s", b)
-	c.Assert(err, checker.IsNil, comment)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusOK, comment)
-}
-
-// #19362
-func (s *DockerSuite) TestExecAPIStartMultipleTimesError(c *check.C) {
-	runSleepingContainer(c, "-d", "--name", "test")
-	execID := createExec(c, "test")
-	startExec(c, execID, http.StatusOK)
-
-	timeout := time.After(60 * time.Second)
-	var execJSON struct{ Running bool }
-	for {
-		select {
-		case <-timeout:
-			c.Fatal("timeout waiting for exec to start")
-		default:
-		}
-
-		inspectExec(c, execID, &execJSON)
-		if !execJSON.Running {
-			break
-		}
-	}
-
-	startExec(c, execID, http.StatusConflict)
-}
-
-// #20638
-func (s *DockerSuite) TestExecAPIStartWithDetach(c *check.C) {
-	name := "foo"
-	runSleepingContainer(c, "-d", "-t", "--name", name)
-	data := map[string]interface{}{
-		"cmd":         []string{"true"},
-		"AttachStdin": true,
-	}
-	_, b, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), data)
-	c.Assert(err, checker.IsNil, check.Commentf(string(b)))
-
-	createResp := struct {
-		ID string `json:"Id"`
-	}{}
-	c.Assert(json.Unmarshal(b, &createResp), checker.IsNil, check.Commentf(string(b)))
-
-	_, body, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", createResp.ID), strings.NewReader(`{"Detach": true}`), "application/json")
-	c.Assert(err, checker.IsNil)
-
-	b, err = readBody(body)
-	comment := check.Commentf("response body: %s", b)
-	c.Assert(err, checker.IsNil, comment)
-
-	resp, _, err := sockRequestRaw("GET", "/_ping", nil, "")
-	c.Assert(err, checker.IsNil)
-	if resp.StatusCode != http.StatusOK {
-		c.Fatal("daemon is down, it should alive")
-	}
-}
-
-func createExec(c *check.C, name string) string {
-	_, b, err := sockRequest("POST", fmt.Sprintf("/containers/%s/exec", name), map[string]interface{}{"Cmd": []string{"true"}})
-	c.Assert(err, checker.IsNil, check.Commentf(string(b)))
-
-	createResp := struct {
-		ID string `json:"Id"`
-	}{}
-	c.Assert(json.Unmarshal(b, &createResp), checker.IsNil, check.Commentf(string(b)))
-	return createResp.ID
-}
-
-func startExec(c *check.C, id string, code int) {
-	resp, body, err := sockRequestRaw("POST", fmt.Sprintf("/exec/%s/start", id), strings.NewReader(`{"Detach": true}`), "application/json")
-	c.Assert(err, checker.IsNil)
-
-	b, err := readBody(body)
-	comment := check.Commentf("response body: %s", b)
-	c.Assert(err, checker.IsNil, comment)
-	c.Assert(resp.StatusCode, checker.Equals, code, comment)
-}
-
-func inspectExec(c *check.C, id string, out interface{}) {
-	resp, body, err := sockRequestRaw("GET", fmt.Sprintf("/exec/%s/json", id), nil, "")
-	c.Assert(err, checker.IsNil)
-	defer body.Close()
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)
-	err = json.NewDecoder(body).Decode(out)
-	c.Assert(err, checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_images_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_images_test.go
deleted file mode 100644
index b7617eae25..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_images_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPIImagesFilter(c *check.C) {
-	name := "utest:tag1"
-	name2 := "utest/docker:tag2"
-	name3 := "utest:5000/docker:tag3"
-	for _, n := range []string{name, name2, name3} {
-		dockerCmd(c, "tag", "busybox", n)
-	}
-	type image types.ImageSummary
-	getImages := func(filter string) []image {
-		v := url.Values{}
-		v.Set("filter", filter)
-		status, b, err := sockRequest("GET", "/images/json?"+v.Encode(), nil)
-		c.Assert(err, checker.IsNil)
-		c.Assert(status, checker.Equals, http.StatusOK)
-
-		var images []image
-		err = json.Unmarshal(b, &images)
-		c.Assert(err, checker.IsNil)
-
-		return images
-	}
-
-	//incorrect number of matches returned
-	images := getImages("utest*/*")
-	c.Assert(images[0].RepoTags, checker.HasLen, 2)
-
-	images = getImages("utest")
-	c.Assert(images[0].RepoTags, checker.HasLen, 1)
-
-	images = getImages("utest*")
-	c.Assert(images[0].RepoTags, checker.HasLen, 1)
-
-	images = getImages("*5000*/*")
-	c.Assert(images[0].RepoTags, checker.HasLen, 1)
-}
-
-func (s *DockerSuite) TestAPIImagesSaveAndLoad(c *check.C) {
-	// TODO Windows to Windows CI: Investigate further why this test fails.
-	testRequires(c, Network)
-	testRequires(c, DaemonIsLinux)
-	out, err := buildImage("saveandload", "FROM busybox\nENV FOO bar", false)
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	res, body, err := sockRequestRaw("GET", "/images/"+id+"/get", nil, "")
-	c.Assert(err, checker.IsNil)
-	defer body.Close()
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	dockerCmd(c, "rmi", id)
-
-	res, loadBody, err := sockRequestRaw("POST", "/images/load", body, "application/x-tar")
-	c.Assert(err, checker.IsNil)
-	defer loadBody.Close()
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-
-	inspectOut := inspectField(c, id, "Id")
-	c.Assert(strings.TrimSpace(string(inspectOut)), checker.Equals, id, check.Commentf("load did not work properly"))
-}
-
-func (s *DockerSuite) TestAPIImagesDelete(c *check.C) {
-	if daemonPlatform != "windows" {
-		testRequires(c, Network)
-	}
-	name := "test-api-images-delete"
-	out, err := buildImage(name, "FROM busybox\nENV FOO bar", false)
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	dockerCmd(c, "tag", name, "test:tag1")
-
-	status, _, err := sockRequest("DELETE", "/images/"+id, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusConflict)
-
-	status, _, err = sockRequest("DELETE", "/images/test:noexist", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound) //Status Codes:404 – no such image
-
-	status, _, err = sockRequest("DELETE", "/images/test:tag1", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-}
-
-func (s *DockerSuite) TestAPIImagesHistory(c *check.C) {
-	if daemonPlatform != "windows" {
-		testRequires(c, Network)
-	}
-	name := "test-api-images-history"
-	out, err := buildImage(name, "FROM busybox\nENV FOO bar", false)
-	c.Assert(err, checker.IsNil)
-
-	id := strings.TrimSpace(out)
-
-	status, body, err := sockRequest("GET", "/images/"+id+"/history", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var historydata []types.ImageHistory
-	err = json.Unmarshal(body, &historydata)
-	c.Assert(err, checker.IsNil, check.Commentf("Error on unmarshal"))
-
-	c.Assert(historydata, checker.Not(checker.HasLen), 0)
-	c.Assert(historydata[0].Tags[0], checker.Equals, "test-api-images-history:latest")
-}
-
-// #14846
-func (s *DockerSuite) TestAPIImagesSearchJSONContentType(c *check.C) {
-	testRequires(c, Network)
-
-	res, b, err := sockRequestRaw("GET", "/images/search?term=test", nil, "application/json")
-	c.Assert(err, check.IsNil)
-	b.Close()
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-	c.Assert(res.Header.Get("Content-Type"), checker.Equals, "application/json")
-}
-
-// Test case for 30027: image size reported as -1 in v1.12 client against v1.13 daemon.
-// This test checks to make sure both v1.12 and v1.13 client against v1.13 daemon get correct `Size` after the fix.
-func (s *DockerSuite) TestAPIImagesSizeCompatibility(c *check.C) {
-	status, b, err := sockRequest("GET", "/images/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	var images []types.ImageSummary
-	err = json.Unmarshal(b, &images)
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(images), checker.Not(checker.Equals), 0)
-	for _, image := range images {
-		c.Assert(image.Size, checker.Not(checker.Equals), int64(-1))
-	}
-
-	type v124Image struct {
-		ID          string `json:"Id"`
-		ParentID    string `json:"ParentId"`
-		RepoTags    []string
-		RepoDigests []string
-		Created     int64
-		Size        int64
-		VirtualSize int64
-		Labels      map[string]string
-	}
-	status, b, err = sockRequest("GET", "/v1.24/images/json", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	var v124Images []v124Image
-	err = json.Unmarshal(b, &v124Images)
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(v124Images), checker.Not(checker.Equals), 0)
-	for _, image := range v124Images {
-		c.Assert(image.Size, checker.Not(checker.Equals), int64(-1))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_info_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_info_test.go
deleted file mode 100644
index 1556099734..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_info_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import (
-	"net/http"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestInfoAPI(c *check.C) {
-	endpoint := "/info"
-
-	status, body, err := sockRequest("GET", endpoint, nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	// always shown fields
-	stringsToCheck := []string{
-		"ID",
-		"Containers",
-		"ContainersRunning",
-		"ContainersPaused",
-		"ContainersStopped",
-		"Images",
-		"LoggingDriver",
-		"OperatingSystem",
-		"NCPU",
-		"OSType",
-		"Architecture",
-		"MemTotal",
-		"KernelVersion",
-		"Driver",
-		"ServerVersion",
-		"SecurityOptions"}
-
-	out := string(body)
-	for _, linePrefix := range stringsToCheck {
-		c.Assert(out, checker.Contains, linePrefix)
-	}
-}
-
-func (s *DockerSuite) TestInfoAPIVersioned(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	endpoint := "/v1.20/info"
-
-	status, body, err := sockRequest("GET", endpoint, nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	out := string(body)
-	c.Assert(out, checker.Contains, "ExecutionDriver")
-	c.Assert(out, checker.Contains, "not supported")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_test.go
deleted file mode 100644
index 546b224c92..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"net/http"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p20"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestInspectAPIContainerResponse(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-
-	cleanedContainerID := strings.TrimSpace(out)
-	keysBase := []string{"Id", "State", "Created", "Path", "Args", "Config", "Image", "NetworkSettings",
-		"ResolvConfPath", "HostnamePath", "HostsPath", "LogPath", "Name", "Driver", "MountLabel", "ProcessLabel", "GraphDriver"}
-
-	type acase struct {
-		version string
-		keys    []string
-	}
-
-	var cases []acase
-
-	if daemonPlatform == "windows" {
-		cases = []acase{
-			{"v1.25", append(keysBase, "Mounts")},
-		}
-
-	} else {
-		cases = []acase{
-			{"v1.20", append(keysBase, "Mounts")},
-			{"v1.19", append(keysBase, "Volumes", "VolumesRW")},
-		}
-	}
-
-	for _, cs := range cases {
-		body := getInspectBody(c, cs.version, cleanedContainerID)
-
-		var inspectJSON map[string]interface{}
-		err := json.Unmarshal(body, &inspectJSON)
-		c.Assert(err, checker.IsNil, check.Commentf("Unable to unmarshal body for version %s", cs.version))
-
-		for _, key := range cs.keys {
-			_, ok := inspectJSON[key]
-			c.Check(ok, checker.True, check.Commentf("%s does not exist in response for version %s", key, cs.version))
-		}
-
-		//Issue #6830: type not properly converted to JSON/back
-		_, ok := inspectJSON["Path"].(bool)
-		c.Assert(ok, checker.False, check.Commentf("Path of `true` should not be converted to boolean `true` via JSON marshalling"))
-	}
-}
-
-func (s *DockerSuite) TestInspectAPIContainerVolumeDriverLegacy(c *check.C) {
-	// No legacy implications for Windows
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	cases := []string{"v1.19", "v1.20"}
-	for _, version := range cases {
-		body := getInspectBody(c, version, cleanedContainerID)
-
-		var inspectJSON map[string]interface{}
-		err := json.Unmarshal(body, &inspectJSON)
-		c.Assert(err, checker.IsNil, check.Commentf("Unable to unmarshal body for version %s", version))
-
-		config, ok := inspectJSON["Config"]
-		c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
-		cfg := config.(map[string]interface{})
-		_, ok = cfg["VolumeDriver"]
-		c.Assert(ok, checker.True, check.Commentf("API version %s expected to include VolumeDriver in 'Config'", version))
-	}
-}
-
-func (s *DockerSuite) TestInspectAPIContainerVolumeDriver(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "--volume-driver", "local", "busybox", "true")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	body := getInspectBody(c, "v1.25", cleanedContainerID)
-
-	var inspectJSON map[string]interface{}
-	err := json.Unmarshal(body, &inspectJSON)
-	c.Assert(err, checker.IsNil, check.Commentf("Unable to unmarshal body for version 1.25"))
-
-	config, ok := inspectJSON["Config"]
-	c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
-	cfg := config.(map[string]interface{})
-	_, ok = cfg["VolumeDriver"]
-	c.Assert(ok, checker.False, check.Commentf("API version 1.25 expected to not include VolumeDriver in 'Config'"))
-
-	config, ok = inspectJSON["HostConfig"]
-	c.Assert(ok, checker.True, check.Commentf("Unable to find 'HostConfig'"))
-	cfg = config.(map[string]interface{})
-	_, ok = cfg["VolumeDriver"]
-	c.Assert(ok, checker.True, check.Commentf("API version 1.25 expected to include VolumeDriver in 'HostConfig'"))
-}
-
-func (s *DockerSuite) TestInspectAPIImageResponse(c *check.C) {
-	dockerCmd(c, "tag", "busybox:latest", "busybox:mytag")
-
-	endpoint := "/images/busybox/json"
-	status, body, err := sockRequest("GET", endpoint, nil)
-
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var imageJSON types.ImageInspect
-	err = json.Unmarshal(body, &imageJSON)
-	c.Assert(err, checker.IsNil, check.Commentf("Unable to unmarshal body for latest version"))
-	c.Assert(imageJSON.RepoTags, checker.HasLen, 2)
-
-	c.Assert(stringutils.InSlice(imageJSON.RepoTags, "busybox:latest"), checker.Equals, true)
-	c.Assert(stringutils.InSlice(imageJSON.RepoTags, "busybox:mytag"), checker.Equals, true)
-}
-
-// #17131, #17139, #17173
-func (s *DockerSuite) TestInspectAPIEmptyFieldsInConfigPre121(c *check.C) {
-	// Not relevant on Windows
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	cases := []string{"v1.19", "v1.20"}
-	for _, version := range cases {
-		body := getInspectBody(c, version, cleanedContainerID)
-
-		var inspectJSON map[string]interface{}
-		err := json.Unmarshal(body, &inspectJSON)
-		c.Assert(err, checker.IsNil, check.Commentf("Unable to unmarshal body for version %s", version))
-		config, ok := inspectJSON["Config"]
-		c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
-		cfg := config.(map[string]interface{})
-		for _, f := range []string{"MacAddress", "NetworkDisabled", "ExposedPorts"} {
-			_, ok := cfg[f]
-			c.Check(ok, checker.True, check.Commentf("API version %s expected to include %s in 'Config'", version, f))
-		}
-	}
-}
-
-func (s *DockerSuite) TestInspectAPIBridgeNetworkSettings120(c *check.C) {
-	// Not relevant on Windows, and besides it doesn't have any bridge network settings
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-	waitRun(containerID)
-
-	body := getInspectBody(c, "v1.20", containerID)
-
-	var inspectJSON v1p20.ContainerJSON
-	err := json.Unmarshal(body, &inspectJSON)
-	c.Assert(err, checker.IsNil)
-
-	settings := inspectJSON.NetworkSettings
-	c.Assert(settings.IPAddress, checker.Not(checker.HasLen), 0)
-}
-
-func (s *DockerSuite) TestInspectAPIBridgeNetworkSettings121(c *check.C) {
-	// Windows doesn't have any bridge network settings
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-	waitRun(containerID)
-
-	body := getInspectBody(c, "v1.21", containerID)
-
-	var inspectJSON types.ContainerJSON
-	err := json.Unmarshal(body, &inspectJSON)
-	c.Assert(err, checker.IsNil)
-
-	settings := inspectJSON.NetworkSettings
-	c.Assert(settings.IPAddress, checker.Not(checker.HasLen), 0)
-	c.Assert(settings.Networks["bridge"], checker.Not(checker.IsNil))
-	c.Assert(settings.IPAddress, checker.Equals, settings.Networks["bridge"].IPAddress)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_unix_test.go
deleted file mode 100644
index f49a139c28..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_inspect_unix_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// #16665
-func (s *DockerSuite) TestInspectAPICpusetInConfigPre120(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, cgroupCpuset)
-
-	name := "cpusetinconfig-pre120"
-	dockerCmd(c, "run", "--name", name, "--cpuset-cpus", "0", "busybox", "true")
-
-	status, body, err := sockRequest("GET", fmt.Sprintf("/v1.19/containers/%s/json", name), nil)
-	c.Assert(status, check.Equals, http.StatusOK)
-	c.Assert(err, check.IsNil)
-
-	var inspectJSON map[string]interface{}
-	err = json.Unmarshal(body, &inspectJSON)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to unmarshal body for version 1.19"))
-
-	config, ok := inspectJSON["Config"]
-	c.Assert(ok, checker.True, check.Commentf("Unable to find 'Config'"))
-	cfg := config.(map[string]interface{})
-	_, ok = cfg["Cpuset"]
-	c.Assert(ok, checker.True, check.Commentf("API version 1.19 expected to include Cpuset in 'Config'"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_logs_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_logs_test.go
deleted file mode 100644
index 2e8ffa9bdc..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_logs_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestLogsAPIWithStdout(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 1; done")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	type logOut struct {
-		out string
-		res *http.Response
-		err error
-	}
-	chLog := make(chan logOut)
-
-	go func() {
-		res, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&timestamps=1", id), nil, "")
-		if err != nil {
-			chLog <- logOut{"", nil, err}
-			return
-		}
-		defer body.Close()
-		out, err := bufio.NewReader(body).ReadString('\n')
-		if err != nil {
-			chLog <- logOut{"", nil, err}
-			return
-		}
-		chLog <- logOut{strings.TrimSpace(out), res, err}
-	}()
-
-	select {
-	case l := <-chLog:
-		c.Assert(l.err, checker.IsNil)
-		c.Assert(l.res.StatusCode, checker.Equals, http.StatusOK)
-		if !strings.HasSuffix(l.out, "hello") {
-			c.Fatalf("expected log output to container 'hello', but it does not")
-		}
-	case <-time.After(20 * time.Second):
-		c.Fatal("timeout waiting for logs to exit")
-	}
-}
-
-func (s *DockerSuite) TestLogsAPINoStdoutNorStderr(c *check.C) {
-	name := "logs_test"
-	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "/bin/sh")
-
-	status, body, err := sockRequest("GET", fmt.Sprintf("/containers/%s/logs", name), nil)
-	c.Assert(status, checker.Equals, http.StatusBadRequest)
-	c.Assert(err, checker.IsNil)
-
-	expected := "Bad parameters: you must choose at least one stream"
-	c.Assert(getErrorMessage(c, body), checker.Contains, expected)
-}
-
-// Regression test for #12704
-func (s *DockerSuite) TestLogsAPIFollowEmptyOutput(c *check.C) {
-	name := "logs_test"
-	t0 := time.Now()
-	dockerCmd(c, "run", "-d", "-t", "--name", name, "busybox", "sleep", "10")
-
-	_, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
-	t1 := time.Now()
-	c.Assert(err, checker.IsNil)
-	body.Close()
-	elapsed := t1.Sub(t0).Seconds()
-	if elapsed > 20.0 {
-		c.Fatalf("HTTP response was not immediate (elapsed %.1fs)", elapsed)
-	}
-}
-
-func (s *DockerSuite) TestLogsAPIContainerNotFound(c *check.C) {
-	name := "nonExistentContainer"
-	resp, _, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/logs?follow=1&stdout=1&stderr=1&tail=all", name), bytes.NewBuffer(nil), "")
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusNotFound)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_network_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_network_test.go
deleted file mode 100644
index 1cc66f0900..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_network_test.go
+++ /dev/null
@@ -1,353 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPINetworkGetDefaults(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// By default docker daemon creates 3 networks. check if they are present
-	defaults := []string{"bridge", "host", "none"}
-	for _, nn := range defaults {
-		c.Assert(isNetworkAvailable(c, nn), checker.Equals, true)
-	}
-}
-
-func (s *DockerSuite) TestAPINetworkCreateDelete(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// Create a network
-	name := "testnetwork"
-	config := types.NetworkCreateRequest{
-		Name: name,
-		NetworkCreate: types.NetworkCreate{
-			CheckDuplicate: true,
-		},
-	}
-	id := createNetwork(c, config, true)
-	c.Assert(isNetworkAvailable(c, name), checker.Equals, true)
-
-	// delete the network and make sure it is deleted
-	deleteNetwork(c, id, true)
-	c.Assert(isNetworkAvailable(c, name), checker.Equals, false)
-}
-
-func (s *DockerSuite) TestAPINetworkCreateCheckDuplicate(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testcheckduplicate"
-	configOnCheck := types.NetworkCreateRequest{
-		Name: name,
-		NetworkCreate: types.NetworkCreate{
-			CheckDuplicate: true,
-		},
-	}
-	configNotCheck := types.NetworkCreateRequest{
-		Name: name,
-		NetworkCreate: types.NetworkCreate{
-			CheckDuplicate: false,
-		},
-	}
-
-	// Creating a new network first
-	createNetwork(c, configOnCheck, true)
-	c.Assert(isNetworkAvailable(c, name), checker.Equals, true)
-
-	// Creating another network with same name and CheckDuplicate must fail
-	createNetwork(c, configOnCheck, false)
-
-	// Creating another network with same name and not CheckDuplicate must succeed
-	createNetwork(c, configNotCheck, true)
-}
-
-func (s *DockerSuite) TestAPINetworkFilter(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	nr := getNetworkResource(c, getNetworkIDByName(c, "bridge"))
-	c.Assert(nr.Name, checker.Equals, "bridge")
-}
-
-func (s *DockerSuite) TestAPINetworkInspect(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// Inspect default bridge network
-	nr := getNetworkResource(c, "bridge")
-	c.Assert(nr.Name, checker.Equals, "bridge")
-
-	// run a container and attach it to the default bridge network
-	out, _ := dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-	containerIP := findContainerIP(c, "test", "bridge")
-
-	// inspect default bridge network again and make sure the container is connected
-	nr = getNetworkResource(c, nr.ID)
-	c.Assert(nr.Driver, checker.Equals, "bridge")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, false)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.Containers), checker.Equals, 1)
-	c.Assert(nr.Containers[containerID], checker.NotNil)
-
-	ip, _, err := net.ParseCIDR(nr.Containers[containerID].IPv4Address)
-	c.Assert(err, checker.IsNil)
-	c.Assert(ip.String(), checker.Equals, containerIP)
-
-	// IPAM configuration inspect
-	ipam := &network.IPAM{
-		Driver: "default",
-		Config: []network.IPAMConfig{{Subnet: "172.28.0.0/16", IPRange: "172.28.5.0/24", Gateway: "172.28.5.254"}},
-	}
-	config := types.NetworkCreateRequest{
-		Name: "br0",
-		NetworkCreate: types.NetworkCreate{
-			Driver:  "bridge",
-			IPAM:    ipam,
-			Options: map[string]string{"foo": "bar", "opts": "dopts"},
-		},
-	}
-	id0 := createNetwork(c, config, true)
-	c.Assert(isNetworkAvailable(c, "br0"), checker.Equals, true)
-
-	nr = getNetworkResource(c, id0)
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
-	c.Assert(nr.IPAM.Config[0].Subnet, checker.Equals, "172.28.0.0/16")
-	c.Assert(nr.IPAM.Config[0].IPRange, checker.Equals, "172.28.5.0/24")
-	c.Assert(nr.IPAM.Config[0].Gateway, checker.Equals, "172.28.5.254")
-	c.Assert(nr.Options["foo"], checker.Equals, "bar")
-	c.Assert(nr.Options["opts"], checker.Equals, "dopts")
-
-	// delete the network and make sure it is deleted
-	deleteNetwork(c, id0, true)
-	c.Assert(isNetworkAvailable(c, "br0"), checker.Equals, false)
-}
-
-func (s *DockerSuite) TestAPINetworkConnectDisconnect(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// Create test network
-	name := "testnetwork"
-	config := types.NetworkCreateRequest{
-		Name: name,
-	}
-	id := createNetwork(c, config, true)
-	nr := getNetworkResource(c, id)
-	c.Assert(nr.Name, checker.Equals, name)
-	c.Assert(nr.ID, checker.Equals, id)
-	c.Assert(len(nr.Containers), checker.Equals, 0)
-
-	// run a container
-	out, _ := dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-
-	// connect the container to the test network
-	connectNetwork(c, nr.ID, containerID)
-
-	// inspect the network to make sure container is connected
-	nr = getNetworkResource(c, nr.ID)
-	c.Assert(len(nr.Containers), checker.Equals, 1)
-	c.Assert(nr.Containers[containerID], checker.NotNil)
-
-	// check if container IP matches network inspect
-	ip, _, err := net.ParseCIDR(nr.Containers[containerID].IPv4Address)
-	c.Assert(err, checker.IsNil)
-	containerIP := findContainerIP(c, "test", "testnetwork")
-	c.Assert(ip.String(), checker.Equals, containerIP)
-
-	// disconnect container from the network
-	disconnectNetwork(c, nr.ID, containerID)
-	nr = getNetworkResource(c, nr.ID)
-	c.Assert(nr.Name, checker.Equals, name)
-	c.Assert(len(nr.Containers), checker.Equals, 0)
-
-	// delete the network
-	deleteNetwork(c, nr.ID, true)
-}
-
-func (s *DockerSuite) TestAPINetworkIPAMMultipleBridgeNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// test0 bridge network
-	ipam0 := &network.IPAM{
-		Driver: "default",
-		Config: []network.IPAMConfig{{Subnet: "192.178.0.0/16", IPRange: "192.178.128.0/17", Gateway: "192.178.138.100"}},
-	}
-	config0 := types.NetworkCreateRequest{
-		Name: "test0",
-		NetworkCreate: types.NetworkCreate{
-			Driver: "bridge",
-			IPAM:   ipam0,
-		},
-	}
-	id0 := createNetwork(c, config0, true)
-	c.Assert(isNetworkAvailable(c, "test0"), checker.Equals, true)
-
-	ipam1 := &network.IPAM{
-		Driver: "default",
-		Config: []network.IPAMConfig{{Subnet: "192.178.128.0/17", Gateway: "192.178.128.1"}},
-	}
-	// test1 bridge network overlaps with test0
-	config1 := types.NetworkCreateRequest{
-		Name: "test1",
-		NetworkCreate: types.NetworkCreate{
-			Driver: "bridge",
-			IPAM:   ipam1,
-		},
-	}
-	createNetwork(c, config1, false)
-	c.Assert(isNetworkAvailable(c, "test1"), checker.Equals, false)
-
-	ipam2 := &network.IPAM{
-		Driver: "default",
-		Config: []network.IPAMConfig{{Subnet: "192.169.0.0/16", Gateway: "192.169.100.100"}},
-	}
-	// test2 bridge network does not overlap
-	config2 := types.NetworkCreateRequest{
-		Name: "test2",
-		NetworkCreate: types.NetworkCreate{
-			Driver: "bridge",
-			IPAM:   ipam2,
-		},
-	}
-	createNetwork(c, config2, true)
-	c.Assert(isNetworkAvailable(c, "test2"), checker.Equals, true)
-
-	// remove test0 and retry to create test1
-	deleteNetwork(c, id0, true)
-	createNetwork(c, config1, true)
-	c.Assert(isNetworkAvailable(c, "test1"), checker.Equals, true)
-
-	// for networks w/o ipam specified, docker will choose proper non-overlapping subnets
-	createNetwork(c, types.NetworkCreateRequest{Name: "test3"}, true)
-	c.Assert(isNetworkAvailable(c, "test3"), checker.Equals, true)
-	createNetwork(c, types.NetworkCreateRequest{Name: "test4"}, true)
-	c.Assert(isNetworkAvailable(c, "test4"), checker.Equals, true)
-	createNetwork(c, types.NetworkCreateRequest{Name: "test5"}, true)
-	c.Assert(isNetworkAvailable(c, "test5"), checker.Equals, true)
-
-	for i := 1; i < 6; i++ {
-		deleteNetwork(c, fmt.Sprintf("test%d", i), true)
-	}
-}
-
-func (s *DockerSuite) TestAPICreateDeletePredefinedNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	createDeletePredefinedNetwork(c, "bridge")
-	createDeletePredefinedNetwork(c, "none")
-	createDeletePredefinedNetwork(c, "host")
-}
-
-func createDeletePredefinedNetwork(c *check.C, name string) {
-	// Create pre-defined network
-	config := types.NetworkCreateRequest{
-		Name: name,
-		NetworkCreate: types.NetworkCreate{
-			CheckDuplicate: true,
-		},
-	}
-	shouldSucceed := false
-	createNetwork(c, config, shouldSucceed)
-	deleteNetwork(c, name, shouldSucceed)
-}
-
-func isNetworkAvailable(c *check.C, name string) bool {
-	status, body, err := sockRequest("GET", "/networks", nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	nJSON := []types.NetworkResource{}
-	err = json.Unmarshal(body, &nJSON)
-	c.Assert(err, checker.IsNil)
-
-	for _, n := range nJSON {
-		if n.Name == name {
-			return true
-		}
-	}
-	return false
-}
-
-func getNetworkIDByName(c *check.C, name string) string {
-	var (
-		v          = url.Values{}
-		filterArgs = filters.NewArgs()
-	)
-	filterArgs.Add("name", name)
-	filterJSON, err := filters.ToParam(filterArgs)
-	c.Assert(err, checker.IsNil)
-	v.Set("filters", filterJSON)
-
-	status, body, err := sockRequest("GET", "/networks?"+v.Encode(), nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	nJSON := []types.NetworkResource{}
-	err = json.Unmarshal(body, &nJSON)
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(nJSON), checker.Equals, 1)
-
-	return nJSON[0].ID
-}
-
-func getNetworkResource(c *check.C, id string) *types.NetworkResource {
-	_, obj, err := sockRequest("GET", "/networks/"+id, nil)
-	c.Assert(err, checker.IsNil)
-
-	nr := types.NetworkResource{}
-	err = json.Unmarshal(obj, &nr)
-	c.Assert(err, checker.IsNil)
-
-	return &nr
-}
-
-func createNetwork(c *check.C, config types.NetworkCreateRequest, shouldSucceed bool) string {
-	status, resp, err := sockRequest("POST", "/networks/create", config)
-	if !shouldSucceed {
-		c.Assert(status, checker.Not(checker.Equals), http.StatusCreated)
-		return ""
-	}
-
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	var nr types.NetworkCreateResponse
-	err = json.Unmarshal(resp, &nr)
-	c.Assert(err, checker.IsNil)
-
-	return nr.ID
-}
-
-func connectNetwork(c *check.C, nid, cid string) {
-	config := types.NetworkConnect{
-		Container: cid,
-	}
-
-	status, _, err := sockRequest("POST", "/networks/"+nid+"/connect", config)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-}
-
-func disconnectNetwork(c *check.C, nid, cid string) {
-	config := types.NetworkConnect{
-		Container: cid,
-	}
-
-	status, _, err := sockRequest("POST", "/networks/"+nid+"/disconnect", config)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-}
-
-func deleteNetwork(c *check.C, id string, shouldSucceed bool) {
-	status, _, err := sockRequest("DELETE", "/networks/"+id, nil)
-	if !shouldSucceed {
-		c.Assert(status, checker.Not(checker.Equals), http.StatusOK)
-		return
-	}
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-	c.Assert(err, checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_resize_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_resize_test.go
deleted file mode 100644
index daf1b05d2e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_resize_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestResizeAPIResponse(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"
-	status, _, err := sockRequest("POST", endpoint, nil)
-	c.Assert(status, check.Equals, http.StatusOK)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestResizeAPIHeightWidthNoInt(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	endpoint := "/containers/" + cleanedContainerID + "/resize?h=foo&w=bar"
-	status, _, err := sockRequest("POST", endpoint, nil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestResizeAPIResponseWhenContainerNotStarted(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	// make sure the exited container is not running
-	dockerCmd(c, "wait", cleanedContainerID)
-
-	endpoint := "/containers/" + cleanedContainerID + "/resize?h=40&w=40"
-	status, body, err := sockRequest("POST", endpoint, nil)
-	c.Assert(status, check.Equals, http.StatusInternalServerError)
-	c.Assert(err, check.IsNil)
-
-	c.Assert(getErrorMessage(c, body), checker.Contains, "is not running", check.Commentf("resize should fail with message 'Container is not running'"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_service_update_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_service_update_test.go
deleted file mode 100644
index 15a21e579f..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_service_update_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func setPortConfig(portConfig []swarm.PortConfig) serviceConstructor {
-	return func(s *swarm.Service) {
-		if s.Spec.EndpointSpec == nil {
-			s.Spec.EndpointSpec = &swarm.EndpointSpec{}
-		}
-		s.Spec.EndpointSpec.Ports = portConfig
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPIServiceUpdatePort(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a service with a port mapping of 8080:8081.
-	portConfig := []swarm.PortConfig{{TargetPort: 8081, PublishedPort: 8080}}
-	serviceID := d.createService(c, simpleTestService, setInstances(1), setPortConfig(portConfig))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// Update the service: changed the port mapping from 8080:8081 to 8082:8083.
-	updatedPortConfig := []swarm.PortConfig{{TargetPort: 8083, PublishedPort: 8082}}
-	remoteService := d.getService(c, serviceID)
-	d.updateService(c, remoteService, setPortConfig(updatedPortConfig))
-
-	// Inspect the service and verify port mapping.
-	updatedService := d.getService(c, serviceID)
-	c.Assert(updatedService.Spec.EndpointSpec, check.NotNil)
-	c.Assert(len(updatedService.Spec.EndpointSpec.Ports), check.Equals, 1)
-	c.Assert(updatedService.Spec.EndpointSpec.Ports[0].TargetPort, check.Equals, uint32(8083))
-	c.Assert(updatedService.Spec.EndpointSpec.Ports[0].PublishedPort, check.Equals, uint32(8082))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_test.go
deleted file mode 100644
index 23fbdbb740..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_test.go
+++ /dev/null
@@ -1,310 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-var expectedNetworkInterfaceStats = strings.Split("rx_bytes rx_dropped rx_errors rx_packets tx_bytes tx_dropped tx_errors tx_packets", " ")
-
-func (s *DockerSuite) TestAPIStatsNoStreamGetCpu(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "while true;do echo 'Hello'; usleep 100000; done")
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	resp, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", id), nil, "")
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)
-	c.Assert(resp.Header.Get("Content-Type"), checker.Equals, "application/json")
-
-	var v *types.Stats
-	err = json.NewDecoder(body).Decode(&v)
-	c.Assert(err, checker.IsNil)
-	body.Close()
-
-	var cpuPercent = 0.0
-
-	if daemonPlatform != "windows" {
-		cpuDelta := float64(v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage)
-		systemDelta := float64(v.CPUStats.SystemUsage - v.PreCPUStats.SystemUsage)
-		cpuPercent = (cpuDelta / systemDelta) * float64(len(v.CPUStats.CPUUsage.PercpuUsage)) * 100.0
-	} else {
-		// Max number of 100ns intervals between the previous time read and now
-		possIntervals := uint64(v.Read.Sub(v.PreRead).Nanoseconds()) // Start with number of ns intervals
-		possIntervals /= 100                                         // Convert to number of 100ns intervals
-		possIntervals *= uint64(v.NumProcs)                          // Multiple by the number of processors
-
-		// Intervals used
-		intervalsUsed := v.CPUStats.CPUUsage.TotalUsage - v.PreCPUStats.CPUUsage.TotalUsage
-
-		// Percentage avoiding divide-by-zero
-		if possIntervals > 0 {
-			cpuPercent = float64(intervalsUsed) / float64(possIntervals) * 100.0
-		}
-	}
-
-	c.Assert(cpuPercent, check.Not(checker.Equals), 0.0, check.Commentf("docker stats with no-stream get cpu usage failed: was %v", cpuPercent))
-}
-
-func (s *DockerSuite) TestAPIStatsStoppedContainerInGoroutines(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo 1")
-	id := strings.TrimSpace(out)
-
-	getGoRoutines := func() int {
-		_, body, err := sockRequestRaw("GET", fmt.Sprintf("/info"), nil, "")
-		c.Assert(err, checker.IsNil)
-		info := types.Info{}
-		err = json.NewDecoder(body).Decode(&info)
-		c.Assert(err, checker.IsNil)
-		body.Close()
-		return info.NGoroutines
-	}
-
-	// When the HTTP connection is closed, the number of goroutines should not increase.
-	routines := getGoRoutines()
-	_, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats", id), nil, "")
-	c.Assert(err, checker.IsNil)
-	body.Close()
-
-	t := time.After(30 * time.Second)
-	for {
-		select {
-		case <-t:
-			c.Assert(getGoRoutines(), checker.LessOrEqualThan, routines)
-			return
-		default:
-			if n := getGoRoutines(); n <= routines {
-				return
-			}
-			time.Sleep(200 * time.Millisecond)
-		}
-	}
-}
-
-func (s *DockerSuite) TestAPIStatsNetworkStats(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	out, _ := runSleepingContainer(c)
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	// Retrieve the container address
-	net := "bridge"
-	if daemonPlatform == "windows" {
-		net = "nat"
-	}
-	contIP := findContainerIP(c, id, net)
-	numPings := 1
-
-	var preRxPackets uint64
-	var preTxPackets uint64
-	var postRxPackets uint64
-	var postTxPackets uint64
-
-	// Get the container networking stats before and after pinging the container
-	nwStatsPre := getNetworkStats(c, id)
-	for _, v := range nwStatsPre {
-		preRxPackets += v.RxPackets
-		preTxPackets += v.TxPackets
-	}
-
-	countParam := "-c"
-	if runtime.GOOS == "windows" {
-		countParam = "-n" // Ping count parameter is -n on Windows
-	}
-	pingout, err := exec.Command("ping", contIP, countParam, strconv.Itoa(numPings)).CombinedOutput()
-	if err != nil && runtime.GOOS == "linux" {
-		// If it fails then try a work-around, but just for linux.
-		// If this fails too then go back to the old error for reporting.
-		//
-		// The ping will sometimes fail due to an apparmor issue where it
-		// denies access to the libc.so.6 shared library - running it
-		// via /lib64/ld-linux-x86-64.so.2 seems to work around it.
-		pingout2, err2 := exec.Command("/lib64/ld-linux-x86-64.so.2", "/bin/ping", contIP, "-c", strconv.Itoa(numPings)).CombinedOutput()
-		if err2 == nil {
-			pingout = pingout2
-			err = err2
-		}
-	}
-	c.Assert(err, checker.IsNil)
-	pingouts := string(pingout[:])
-	nwStatsPost := getNetworkStats(c, id)
-	for _, v := range nwStatsPost {
-		postRxPackets += v.RxPackets
-		postTxPackets += v.TxPackets
-	}
-
-	// Verify the stats contain at least the expected number of packets
-	// On Linux, account for ARP.
-	expRxPkts := preRxPackets + uint64(numPings)
-	expTxPkts := preTxPackets + uint64(numPings)
-	if daemonPlatform != "windows" {
-		expRxPkts++
-		expTxPkts++
-	}
-	c.Assert(postTxPackets, checker.GreaterOrEqualThan, expTxPkts,
-		check.Commentf("Reported less TxPackets than expected. Expected >= %d. Found %d. %s", expTxPkts, postTxPackets, pingouts))
-	c.Assert(postRxPackets, checker.GreaterOrEqualThan, expRxPkts,
-		check.Commentf("Reported less Txbytes than expected. Expected >= %d. Found %d. %s", expRxPkts, postRxPackets, pingouts))
-}
-
-func (s *DockerSuite) TestAPIStatsNetworkStatsVersioning(c *check.C) {
-	// Windows doesn't support API versions less than 1.25, so no point testing 1.17 .. 1.21
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := runSleepingContainer(c)
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-	wg := sync.WaitGroup{}
-
-	for i := 17; i <= 21; i++ {
-		wg.Add(1)
-		go func(i int) {
-			defer wg.Done()
-			apiVersion := fmt.Sprintf("v1.%d", i)
-			statsJSONBlob := getVersionedStats(c, id, apiVersion)
-			if versions.LessThan(apiVersion, "v1.21") {
-				c.Assert(jsonBlobHasLTv121NetworkStats(statsJSONBlob), checker.Equals, true,
-					check.Commentf("Stats JSON blob from API %s %#v does not look like a <v1.21 API stats structure", apiVersion, statsJSONBlob))
-			} else {
-				c.Assert(jsonBlobHasGTE121NetworkStats(statsJSONBlob), checker.Equals, true,
-					check.Commentf("Stats JSON blob from API %s %#v does not look like a >=v1.21 API stats structure", apiVersion, statsJSONBlob))
-			}
-		}(i)
-	}
-	wg.Wait()
-}
-
-func getNetworkStats(c *check.C, id string) map[string]types.NetworkStats {
-	var st *types.StatsJSON
-
-	_, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", id), nil, "")
-	c.Assert(err, checker.IsNil)
-
-	err = json.NewDecoder(body).Decode(&st)
-	c.Assert(err, checker.IsNil)
-	body.Close()
-
-	return st.Networks
-}
-
-// getVersionedStats returns stats result for the
-// container with id using an API call with version apiVersion. Since the
-// stats result type differs between API versions, we simply return
-// map[string]interface{}.
-func getVersionedStats(c *check.C, id string, apiVersion string) map[string]interface{} {
-	stats := make(map[string]interface{})
-
-	_, body, err := sockRequestRaw("GET", fmt.Sprintf("/%s/containers/%s/stats?stream=false", apiVersion, id), nil, "")
-	c.Assert(err, checker.IsNil)
-	defer body.Close()
-
-	err = json.NewDecoder(body).Decode(&stats)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to decode stat: %s", err))
-
-	return stats
-}
-
-func jsonBlobHasLTv121NetworkStats(blob map[string]interface{}) bool {
-	networkStatsIntfc, ok := blob["network"]
-	if !ok {
-		return false
-	}
-	networkStats, ok := networkStatsIntfc.(map[string]interface{})
-	if !ok {
-		return false
-	}
-	for _, expectedKey := range expectedNetworkInterfaceStats {
-		if _, ok := networkStats[expectedKey]; !ok {
-			return false
-		}
-	}
-	return true
-}
-
-func jsonBlobHasGTE121NetworkStats(blob map[string]interface{}) bool {
-	networksStatsIntfc, ok := blob["networks"]
-	if !ok {
-		return false
-	}
-	networksStats, ok := networksStatsIntfc.(map[string]interface{})
-	if !ok {
-		return false
-	}
-	for _, networkInterfaceStatsIntfc := range networksStats {
-		networkInterfaceStats, ok := networkInterfaceStatsIntfc.(map[string]interface{})
-		if !ok {
-			return false
-		}
-		for _, expectedKey := range expectedNetworkInterfaceStats {
-			if _, ok := networkInterfaceStats[expectedKey]; !ok {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func (s *DockerSuite) TestAPIStatsContainerNotFound(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	status, _, err := sockRequest("GET", "/containers/nonexistent/stats", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-
-	status, _, err = sockRequest("GET", "/containers/nonexistent/stats?stream=0", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound)
-}
-
-func (s *DockerSuite) TestAPIStatsNoStreamConnectedContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out1, _ := runSleepingContainer(c)
-	id1 := strings.TrimSpace(out1)
-	c.Assert(waitRun(id1), checker.IsNil)
-
-	out2, _ := runSleepingContainer(c, "--net", "container:"+id1)
-	id2 := strings.TrimSpace(out2)
-	c.Assert(waitRun(id2), checker.IsNil)
-
-	ch := make(chan error)
-	go func() {
-		resp, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", id2), nil, "")
-		defer body.Close()
-		if err != nil {
-			ch <- err
-		}
-		if resp.StatusCode != http.StatusOK {
-			ch <- fmt.Errorf("Invalid StatusCode %v", resp.StatusCode)
-		}
-		if resp.Header.Get("Content-Type") != "application/json" {
-			ch <- fmt.Errorf("Invalid 'Content-Type' %v", resp.Header.Get("Content-Type"))
-		}
-		var v *types.Stats
-		if err := json.NewDecoder(body).Decode(&v); err != nil {
-			ch <- err
-		}
-		ch <- nil
-	}()
-
-	select {
-	case err := <-ch:
-		c.Assert(err, checker.IsNil, check.Commentf("Error in stats Engine API: %v", err))
-	case <-time.After(15 * time.Second):
-		c.Fatalf("Stats did not return after timeout")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_unix_test.go
deleted file mode 100644
index 0995ce3833..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_stats_unix_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPIStatsContainerGetMemoryLimit(c *check.C) {
-	testRequires(c, DaemonIsLinux, memoryLimitSupport)
-
-	resp, body, err := sockRequestRaw("GET", "/info", nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)
-	var info types.Info
-	err = json.NewDecoder(body).Decode(&info)
-	c.Assert(err, checker.IsNil)
-	body.Close()
-
-	// don't set a memory limit, the memory limit should be system memory
-	conName := "foo"
-	dockerCmd(c, "run", "-d", "--name", conName, "busybox", "top")
-	c.Assert(waitRun(conName), checker.IsNil)
-
-	resp, body, err = sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", conName), nil, "")
-	c.Assert(err, checker.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusOK)
-	c.Assert(resp.Header.Get("Content-Type"), checker.Equals, "application/json")
-
-	var v *types.Stats
-	err = json.NewDecoder(body).Decode(&v)
-	c.Assert(err, checker.IsNil)
-	body.Close()
-	c.Assert(fmt.Sprintf("%d", v.MemoryStats.Limit), checker.Equals, fmt.Sprintf("%d", info.MemTotal))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_swarm_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_swarm_test.go
deleted file mode 100644
index 1f8eaec6de..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_swarm_test.go
+++ /dev/null
@@ -1,1367 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-var defaultReconciliationTimeout = 30 * time.Second
-
-func (s *DockerSwarmSuite) TestAPISwarmInit(c *check.C) {
-	// todo: should find a better way to verify that components are running than /info
-	d1 := s.AddDaemon(c, true, true)
-	info, err := d1.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.True)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	d2 := s.AddDaemon(c, true, false)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.False)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	// Leaving cluster
-	c.Assert(d2.Leave(false), checker.IsNil)
-
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.False)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	c.Assert(d2.Join(swarm.JoinRequest{JoinToken: d1.joinTokens(c).Worker, RemoteAddrs: []string{d1.listenAddr}}), checker.IsNil)
-
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.False)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	// Current state restoring after restarts
-	err = d1.Stop()
-	c.Assert(err, checker.IsNil)
-	err = d2.Stop()
-	c.Assert(err, checker.IsNil)
-
-	err = d1.Start()
-	c.Assert(err, checker.IsNil)
-	err = d2.Start()
-	c.Assert(err, checker.IsNil)
-
-	info, err = d1.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.True)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.False)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmJoinToken(c *check.C) {
-	d1 := s.AddDaemon(c, false, false)
-	c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
-
-	d2 := s.AddDaemon(c, false, false)
-	err := d2.Join(swarm.JoinRequest{RemoteAddrs: []string{d1.listenAddr}})
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "join token is necessary")
-	info, err := d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	err = d2.Join(swarm.JoinRequest{JoinToken: "foobaz", RemoteAddrs: []string{d1.listenAddr}})
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "join token is necessary")
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	workerToken := d1.joinTokens(c).Worker
-
-	c.Assert(d2.Join(swarm.JoinRequest{JoinToken: workerToken, RemoteAddrs: []string{d1.listenAddr}}), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	c.Assert(d2.Leave(false), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	// change tokens
-	d1.rotateTokens(c)
-
-	err = d2.Join(swarm.JoinRequest{JoinToken: workerToken, RemoteAddrs: []string{d1.listenAddr}})
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "join token is necessary")
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	workerToken = d1.joinTokens(c).Worker
-
-	c.Assert(d2.Join(swarm.JoinRequest{JoinToken: workerToken, RemoteAddrs: []string{d1.listenAddr}}), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	c.Assert(d2.Leave(false), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	// change spec, don't change tokens
-	d1.updateSwarm(c, func(s *swarm.Spec) {})
-
-	err = d2.Join(swarm.JoinRequest{RemoteAddrs: []string{d1.listenAddr}})
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "join token is necessary")
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	c.Assert(d2.Join(swarm.JoinRequest{JoinToken: workerToken, RemoteAddrs: []string{d1.listenAddr}}), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	c.Assert(d2.Leave(false), checker.IsNil)
-	info, err = d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmCAHash(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, false, false)
-	splitToken := strings.Split(d1.joinTokens(c).Worker, "-")
-	splitToken[2] = "1kxftv4ofnc6mt30lmgipg6ngf9luhwqopfk1tz6bdmnkubg0e"
-	replacementToken := strings.Join(splitToken, "-")
-	err := d2.Join(swarm.JoinRequest{JoinToken: replacementToken, RemoteAddrs: []string{d1.listenAddr}})
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "remote CA does not match fingerprint")
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmPromoteDemote(c *check.C) {
-	d1 := s.AddDaemon(c, false, false)
-	c.Assert(d1.Init(swarm.InitRequest{}), checker.IsNil)
-	d2 := s.AddDaemon(c, true, false)
-
-	info, err := d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.False)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Role = swarm.NodeRoleManager
-	})
-
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkControlAvailable, checker.True)
-
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Role = swarm.NodeRoleWorker
-	})
-
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkControlAvailable, checker.False)
-
-	// Demoting last node should fail
-	node := d1.getNode(c, d1.NodeID)
-	node.Spec.Role = swarm.NodeRoleWorker
-	url := fmt.Sprintf("/nodes/%s/update?version=%d", node.ID, node.Version.Index)
-	status, out, err := d1.SockRequest("POST", url, node.Spec)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError, check.Commentf("output: %q", string(out)))
-	c.Assert(string(out), checker.Contains, "last manager of the swarm")
-	info, err = d1.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	c.Assert(info.ControlAvailable, checker.True)
-
-	// Promote already demoted node
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Role = swarm.NodeRoleManager
-	})
-
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkControlAvailable, checker.True)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesEmptyList(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	services := d.listServices(c)
-	c.Assert(services, checker.NotNil)
-	c.Assert(len(services), checker.Equals, 0, check.Commentf("services: %#v", services))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesCreate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	instances := 2
-	id := d.createService(c, simpleTestService, setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-
-	service := d.getService(c, id)
-	instances = 5
-	d.updateService(c, service, setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-
-	d.removeService(c, service.ID)
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 0)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesMultipleAgents(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-	d3 := s.AddDaemon(c, true, false)
-
-	time.Sleep(1 * time.Second) // make sure all daemons are ready to accept tasks
-
-	instances := 9
-	id := d1.createService(c, simpleTestService, setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout, d3.checkActiveContainerCount, checker.GreaterThan, 0)
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-	// reconciliation on d2 node down
-	c.Assert(d2.Stop(), checker.IsNil)
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-	// test downscaling
-	instances = 5
-	d1.updateService(c, d1.getService(c, id), setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesCreateGlobal(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-	d3 := s.AddDaemon(c, true, false)
-
-	d1.createService(c, simpleTestService, setGlobalMode)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.Equals, 1)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, 1)
-	waitAndAssert(c, defaultReconciliationTimeout, d3.checkActiveContainerCount, checker.Equals, 1)
-
-	d4 := s.AddDaemon(c, true, false)
-	d5 := s.AddDaemon(c, true, false)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d4.checkActiveContainerCount, checker.Equals, 1)
-	waitAndAssert(c, defaultReconciliationTimeout, d5.checkActiveContainerCount, checker.Equals, 1)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesUpdate(c *check.C) {
-	const nodeCount = 3
-	var daemons [nodeCount]*SwarmDaemon
-	for i := 0; i < nodeCount; i++ {
-		daemons[i] = s.AddDaemon(c, true, i == 0)
-	}
-	// wait for nodes ready
-	waitAndAssert(c, 5*time.Second, daemons[0].checkNodeReadyCount, checker.Equals, nodeCount)
-
-	// service image at start
-	image1 := "busybox:latest"
-	// target image in update
-	image2 := "busybox:test"
-
-	// create a different tag
-	for _, d := range daemons {
-		out, err := d.Cmd("tag", image1, image2)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-	}
-
-	// create service
-	instances := 5
-	parallelism := 2
-	id := daemons[0].createService(c, serviceForUpdate, setInstances(instances))
-
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances})
-
-	// issue service update
-	service := daemons[0].getService(c, id)
-	daemons[0].updateService(c, service, setImage(image2))
-
-	// first batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances - parallelism, image2: parallelism})
-
-	// 2nd batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances - 2*parallelism, image2: 2 * parallelism})
-
-	// 3nd batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image2: instances})
-
-	// Roll back to the previous version. This uses the CLI because
-	// rollback is a client-side operation.
-	out, err := daemons[0].Cmd("service", "update", "--rollback", id)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// first batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image2: instances - parallelism, image1: parallelism})
-
-	// 2nd batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image2: instances - 2*parallelism, image1: 2 * parallelism})
-
-	// 3nd batch
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances})
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesFailedUpdate(c *check.C) {
-	const nodeCount = 3
-	var daemons [nodeCount]*SwarmDaemon
-	for i := 0; i < nodeCount; i++ {
-		daemons[i] = s.AddDaemon(c, true, i == 0)
-	}
-	// wait for nodes ready
-	waitAndAssert(c, 5*time.Second, daemons[0].checkNodeReadyCount, checker.Equals, nodeCount)
-
-	// service image at start
-	image1 := "busybox:latest"
-	// target image in update
-	image2 := "busybox:badtag"
-
-	// create service
-	instances := 5
-	id := daemons[0].createService(c, serviceForUpdate, setInstances(instances))
-
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances})
-
-	// issue service update
-	service := daemons[0].getService(c, id)
-	daemons[0].updateService(c, service, setImage(image2), setFailureAction(swarm.UpdateFailureActionPause), setMaxFailureRatio(0.25), setParallelism(1))
-
-	// should update 2 tasks and then pause
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceUpdateState(id), checker.Equals, swarm.UpdateStatePaused)
-	v, _ := daemons[0].checkServiceRunningTasks(id)(c)
-	c.Assert(v, checker.Equals, instances-2)
-
-	// Roll back to the previous version. This uses the CLI because
-	// rollback is a client-side operation.
-	out, err := daemons[0].Cmd("service", "update", "--rollback", id)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkRunningTaskImages, checker.DeepEquals,
-		map[string]int{image1: instances})
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintRole(c *check.C) {
-	const nodeCount = 3
-	var daemons [nodeCount]*SwarmDaemon
-	for i := 0; i < nodeCount; i++ {
-		daemons[i] = s.AddDaemon(c, true, i == 0)
-	}
-	// wait for nodes ready
-	waitAndAssert(c, 5*time.Second, daemons[0].checkNodeReadyCount, checker.Equals, nodeCount)
-
-	// create service
-	constraints := []string{"node.role==worker"}
-	instances := 3
-	id := daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceRunningTasks(id), checker.Equals, instances)
-	// validate tasks are running on worker nodes
-	tasks := daemons[0].getServiceTasks(c, id)
-	for _, task := range tasks {
-		node := daemons[0].getNode(c, task.NodeID)
-		c.Assert(node.Spec.Role, checker.Equals, swarm.NodeRoleWorker)
-	}
-	//remove service
-	daemons[0].removeService(c, id)
-
-	// create service
-	constraints = []string{"node.role!=worker"}
-	id = daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceRunningTasks(id), checker.Equals, instances)
-	tasks = daemons[0].getServiceTasks(c, id)
-	// validate tasks are running on manager nodes
-	for _, task := range tasks {
-		node := daemons[0].getNode(c, task.NodeID)
-		c.Assert(node.Spec.Role, checker.Equals, swarm.NodeRoleManager)
-	}
-	//remove service
-	daemons[0].removeService(c, id)
-
-	// create service
-	constraints = []string{"node.role==nosuchrole"}
-	id = daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks created
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceTasks(id), checker.Equals, instances)
-	// let scheduler try
-	time.Sleep(250 * time.Millisecond)
-	// validate tasks are not assigned to any node
-	tasks = daemons[0].getServiceTasks(c, id)
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Equals, "")
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServiceConstraintLabel(c *check.C) {
-	const nodeCount = 3
-	var daemons [nodeCount]*SwarmDaemon
-	for i := 0; i < nodeCount; i++ {
-		daemons[i] = s.AddDaemon(c, true, i == 0)
-	}
-	// wait for nodes ready
-	waitAndAssert(c, 5*time.Second, daemons[0].checkNodeReadyCount, checker.Equals, nodeCount)
-	nodes := daemons[0].listNodes(c)
-	c.Assert(len(nodes), checker.Equals, nodeCount)
-
-	// add labels to nodes
-	daemons[0].updateNode(c, nodes[0].ID, func(n *swarm.Node) {
-		n.Spec.Annotations.Labels = map[string]string{
-			"security": "high",
-		}
-	})
-	for i := 1; i < nodeCount; i++ {
-		daemons[0].updateNode(c, nodes[i].ID, func(n *swarm.Node) {
-			n.Spec.Annotations.Labels = map[string]string{
-				"security": "low",
-			}
-		})
-	}
-
-	// create service
-	instances := 3
-	constraints := []string{"node.labels.security==high"}
-	id := daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceRunningTasks(id), checker.Equals, instances)
-	tasks := daemons[0].getServiceTasks(c, id)
-	// validate all tasks are running on nodes[0]
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Equals, nodes[0].ID)
-	}
-	//remove service
-	daemons[0].removeService(c, id)
-
-	// create service
-	constraints = []string{"node.labels.security!=high"}
-	id = daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceRunningTasks(id), checker.Equals, instances)
-	tasks = daemons[0].getServiceTasks(c, id)
-	// validate all tasks are NOT running on nodes[0]
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Not(checker.Equals), nodes[0].ID)
-	}
-	//remove service
-	daemons[0].removeService(c, id)
-
-	constraints = []string{"node.labels.security==medium"}
-	id = daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks created
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceTasks(id), checker.Equals, instances)
-	// let scheduler try
-	time.Sleep(250 * time.Millisecond)
-	tasks = daemons[0].getServiceTasks(c, id)
-	// validate tasks are not assigned
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Equals, "")
-	}
-	//remove service
-	daemons[0].removeService(c, id)
-
-	// multiple constraints
-	constraints = []string{
-		"node.labels.security==high",
-		fmt.Sprintf("node.id==%s", nodes[1].ID),
-	}
-	id = daemons[0].createService(c, simpleTestService, setConstraints(constraints), setInstances(instances))
-	// wait for tasks created
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceTasks(id), checker.Equals, instances)
-	// let scheduler try
-	time.Sleep(250 * time.Millisecond)
-	tasks = daemons[0].getServiceTasks(c, id)
-	// validate tasks are not assigned
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Equals, "")
-	}
-	// make nodes[1] fulfills the constraints
-	daemons[0].updateNode(c, nodes[1].ID, func(n *swarm.Node) {
-		n.Spec.Annotations.Labels = map[string]string{
-			"security": "high",
-		}
-	})
-	// wait for tasks ready
-	waitAndAssert(c, defaultReconciliationTimeout, daemons[0].checkServiceRunningTasks(id), checker.Equals, instances)
-	tasks = daemons[0].getServiceTasks(c, id)
-	for _, task := range tasks {
-		c.Assert(task.NodeID, checker.Equals, nodes[1].ID)
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesStateReporting(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	testRequires(c, DaemonIsLinux)
-
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, true)
-	d3 := s.AddDaemon(c, true, false)
-
-	time.Sleep(1 * time.Second) // make sure all daemons are ready to accept
-
-	instances := 9
-	d1.createService(c, simpleTestService, setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-	getContainers := func() map[string]*SwarmDaemon {
-		m := make(map[string]*SwarmDaemon)
-		for _, d := range []*SwarmDaemon{d1, d2, d3} {
-			for _, id := range d.activeContainers() {
-				m[id] = d
-			}
-		}
-		return m
-	}
-
-	containers := getContainers()
-	c.Assert(containers, checker.HasLen, instances)
-	var toRemove string
-	for i := range containers {
-		toRemove = i
-	}
-
-	_, err := containers[toRemove].Cmd("stop", toRemove)
-	c.Assert(err, checker.IsNil)
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-	containers2 := getContainers()
-	c.Assert(containers2, checker.HasLen, instances)
-	for i := range containers {
-		if i == toRemove {
-			c.Assert(containers2[i], checker.IsNil)
-		} else {
-			c.Assert(containers2[i], checker.NotNil)
-		}
-	}
-
-	containers = containers2
-	for i := range containers {
-		toRemove = i
-	}
-
-	// try with killing process outside of docker
-	pidStr, err := containers[toRemove].Cmd("inspect", "-f", "{{.State.Pid}}", toRemove)
-	c.Assert(err, checker.IsNil)
-	pid, err := strconv.Atoi(strings.TrimSpace(pidStr))
-	c.Assert(err, checker.IsNil)
-	c.Assert(syscall.Kill(pid, syscall.SIGKILL), checker.IsNil)
-
-	time.Sleep(time.Second) // give some time to handle the signal
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-
-	containers2 = getContainers()
-	c.Assert(containers2, checker.HasLen, instances)
-	for i := range containers {
-		if i == toRemove {
-			c.Assert(containers2[i], checker.IsNil)
-		} else {
-			c.Assert(containers2[i], checker.NotNil)
-		}
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmLeaderProxy(c *check.C) {
-	// add three managers, one of these is leader
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, true)
-	d3 := s.AddDaemon(c, true, true)
-
-	// start a service by hitting each of the 3 managers
-	d1.createService(c, simpleTestService, func(s *swarm.Service) {
-		s.Spec.Name = "test1"
-	})
-	d2.createService(c, simpleTestService, func(s *swarm.Service) {
-		s.Spec.Name = "test2"
-	})
-	d3.createService(c, simpleTestService, func(s *swarm.Service) {
-		s.Spec.Name = "test3"
-	})
-
-	// 3 services should be started now, because the requests were proxied to leader
-	// query each node and make sure it returns 3 services
-	for _, d := range []*SwarmDaemon{d1, d2, d3} {
-		services := d.listServices(c)
-		c.Assert(services, checker.HasLen, 3)
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmLeaderElection(c *check.C) {
-	// Create 3 nodes
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, true)
-	d3 := s.AddDaemon(c, true, true)
-
-	// assert that the first node we made is the leader, and the other two are followers
-	c.Assert(d1.getNode(c, d1.NodeID).ManagerStatus.Leader, checker.True)
-	c.Assert(d1.getNode(c, d2.NodeID).ManagerStatus.Leader, checker.False)
-	c.Assert(d1.getNode(c, d3.NodeID).ManagerStatus.Leader, checker.False)
-
-	d1.Stop() // stop the leader
-
-	var (
-		leader    *SwarmDaemon   // keep track of leader
-		followers []*SwarmDaemon // keep track of followers
-	)
-	checkLeader := func(nodes ...*SwarmDaemon) checkF {
-		return func(c *check.C) (interface{}, check.CommentInterface) {
-			// clear these out before each run
-			leader = nil
-			followers = nil
-			for _, d := range nodes {
-				if d.getNode(c, d.NodeID).ManagerStatus.Leader {
-					leader = d
-				} else {
-					followers = append(followers, d)
-				}
-			}
-
-			if leader == nil {
-				return false, check.Commentf("no leader elected")
-			}
-
-			return true, check.Commentf("elected %v", leader.id)
-		}
-	}
-
-	// wait for an election to occur
-	waitAndAssert(c, defaultReconciliationTimeout, checkLeader(d2, d3), checker.True)
-
-	// assert that we have a new leader
-	c.Assert(leader, checker.NotNil)
-
-	// Keep track of the current leader, since we want that to be chosen.
-	stableleader := leader
-
-	// add the d1, the initial leader, back
-	d1.Start()
-
-	// TODO(stevvooe): may need to wait for rejoin here
-
-	// wait for possible election
-	waitAndAssert(c, defaultReconciliationTimeout, checkLeader(d1, d2, d3), checker.True)
-	// pick out the leader and the followers again
-
-	// verify that we still only have 1 leader and 2 followers
-	c.Assert(leader, checker.NotNil)
-	c.Assert(followers, checker.HasLen, 2)
-	// and that after we added d1 back, the leader hasn't changed
-	c.Assert(leader.NodeID, checker.Equals, stableleader.NodeID)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmRaftQuorum(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, true)
-	d3 := s.AddDaemon(c, true, true)
-
-	d1.createService(c, simpleTestService)
-
-	c.Assert(d2.Stop(), checker.IsNil)
-
-	// make sure there is a leader
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkLeader, checker.IsNil)
-
-	d1.createService(c, simpleTestService, func(s *swarm.Service) {
-		s.Spec.Name = "top1"
-	})
-
-	c.Assert(d3.Stop(), checker.IsNil)
-
-	// make sure there is a leader
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkLeader, checker.IsNil)
-
-	var service swarm.Service
-	simpleTestService(&service)
-	service.Spec.Name = "top2"
-	status, out, err := d1.SockRequest("POST", "/services/create", service.Spec)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError, check.Commentf("deadline exceeded", string(out)))
-
-	c.Assert(d2.Start(), checker.IsNil)
-
-	// make sure there is a leader
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkLeader, checker.IsNil)
-
-	d1.createService(c, simpleTestService, func(s *swarm.Service) {
-		s.Spec.Name = "top3"
-	})
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmListNodes(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-	d3 := s.AddDaemon(c, true, false)
-
-	nodes := d1.listNodes(c)
-	c.Assert(len(nodes), checker.Equals, 3, check.Commentf("nodes: %#v", nodes))
-
-loop0:
-	for _, n := range nodes {
-		for _, d := range []*SwarmDaemon{d1, d2, d3} {
-			if n.ID == d.NodeID {
-				continue loop0
-			}
-		}
-		c.Errorf("unknown nodeID %v", n.ID)
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmNodeUpdate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	nodes := d.listNodes(c)
-
-	d.updateNode(c, nodes[0].ID, func(n *swarm.Node) {
-		n.Spec.Availability = swarm.NodeAvailabilityPause
-	})
-
-	n := d.getNode(c, nodes[0].ID)
-	c.Assert(n.Spec.Availability, checker.Equals, swarm.NodeAvailabilityPause)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmNodeRemove(c *check.C) {
-	testRequires(c, Network)
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-	_ = s.AddDaemon(c, true, false)
-
-	nodes := d1.listNodes(c)
-	c.Assert(len(nodes), checker.Equals, 3, check.Commentf("nodes: %#v", nodes))
-
-	// Getting the info so we can take the NodeID
-	d2Info, err := d2.info()
-	c.Assert(err, checker.IsNil)
-
-	// forceful removal of d2 should work
-	d1.removeNode(c, d2Info.NodeID, true)
-
-	nodes = d1.listNodes(c)
-	c.Assert(len(nodes), checker.Equals, 2, check.Commentf("nodes: %#v", nodes))
-
-	// Restart the node that was removed
-	err = d2.Restart()
-	c.Assert(err, checker.IsNil)
-
-	// Give some time for the node to rejoin
-	time.Sleep(1 * time.Second)
-
-	// Make sure the node didn't rejoin
-	nodes = d1.listNodes(c)
-	c.Assert(len(nodes), checker.Equals, 2, check.Commentf("nodes: %#v", nodes))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmNodeDrainPause(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-
-	time.Sleep(1 * time.Second) // make sure all daemons are ready to accept tasks
-
-	// start a service, expect balanced distribution
-	instances := 8
-	id := d1.createService(c, simpleTestService, setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount), checker.Equals, instances)
-
-	// drain d2, all containers should move to d1
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Availability = swarm.NodeAvailabilityDrain
-	})
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.Equals, instances)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, 0)
-
-	// set d2 back to active
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Availability = swarm.NodeAvailabilityActive
-	})
-
-	instances = 1
-	d1.updateService(c, d1.getService(c, id), setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout*2, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount), checker.Equals, instances)
-
-	instances = 8
-	d1.updateService(c, d1.getService(c, id), setInstances(instances))
-
-	// drained node first so we don't get any old containers
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.GreaterThan, 0)
-	waitAndAssert(c, defaultReconciliationTimeout*2, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount), checker.Equals, instances)
-
-	d2ContainerCount := len(d2.activeContainers())
-
-	// set d2 to paused, scale service up, only d1 gets new tasks
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Availability = swarm.NodeAvailabilityPause
-	})
-
-	instances = 14
-	d1.updateService(c, d1.getService(c, id), setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.Equals, instances-d2ContainerCount)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, d2ContainerCount)
-
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmLeaveRemovesContainer(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	instances := 2
-	d.createService(c, simpleTestService, setInstances(instances))
-
-	id, err := d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	id = strings.TrimSpace(id)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances+1)
-
-	c.Assert(d.Leave(false), checker.NotNil)
-	c.Assert(d.Leave(true), checker.IsNil)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	id2, err := d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id, checker.HasPrefix, strings.TrimSpace(id2))
-}
-
-// #23629
-func (s *DockerSwarmSuite) TestAPISwarmLeaveOnPendingJoin(c *check.C) {
-	testRequires(c, Network)
-	s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, false, false)
-
-	id, err := d2.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	id = strings.TrimSpace(id)
-
-	err = d2.Join(swarm.JoinRequest{
-		RemoteAddrs: []string{"123.123.123.123:1234"},
-	})
-	c.Assert(err, check.NotNil)
-	c.Assert(err.Error(), checker.Contains, "Timeout was reached")
-
-	info, err := d2.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStatePending)
-
-	c.Assert(d2.Leave(true), checker.IsNil)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, 1)
-
-	id2, err := d2.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id, checker.HasPrefix, strings.TrimSpace(id2))
-}
-
-// #23705
-func (s *DockerSwarmSuite) TestAPISwarmRestoreOnPendingJoin(c *check.C) {
-	testRequires(c, Network)
-	d := s.AddDaemon(c, false, false)
-	err := d.Join(swarm.JoinRequest{
-		RemoteAddrs: []string{"123.123.123.123:1234"},
-	})
-	c.Assert(err, check.NotNil)
-	c.Assert(err.Error(), checker.Contains, "Timeout was reached")
-
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkLocalNodeState, checker.Equals, swarm.LocalNodeStatePending)
-
-	c.Assert(d.Stop(), checker.IsNil)
-	c.Assert(d.Start(), checker.IsNil)
-
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmManagerRestore(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-
-	instances := 2
-	id := d1.createService(c, simpleTestService, setInstances(instances))
-
-	d1.getService(c, id)
-	d1.Stop()
-	d1.Start()
-	d1.getService(c, id)
-
-	d2 := s.AddDaemon(c, true, true)
-	d2.getService(c, id)
-	d2.Stop()
-	d2.Start()
-	d2.getService(c, id)
-
-	d3 := s.AddDaemon(c, true, true)
-	d3.getService(c, id)
-	d3.Stop()
-	d3.Start()
-	d3.getService(c, id)
-
-	d3.Kill()
-	time.Sleep(1 * time.Second) // time to handle signal
-	d3.Start()
-	d3.getService(c, id)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmScaleNoRollingUpdate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	instances := 2
-	id := d.createService(c, simpleTestService, setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-	containers := d.activeContainers()
-	instances = 4
-	d.updateService(c, d.getService(c, id), setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-	containers2 := d.activeContainers()
-
-loop0:
-	for _, c1 := range containers {
-		for _, c2 := range containers2 {
-			if c1 == c2 {
-				continue loop0
-			}
-		}
-		c.Errorf("container %v not found in new set %#v", c1, containers2)
-	}
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmInvalidAddress(c *check.C) {
-	d := s.AddDaemon(c, false, false)
-	req := swarm.InitRequest{
-		ListenAddr: "",
-	}
-	status, _, err := d.SockRequest("POST", "/swarm/init", req)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-
-	req2 := swarm.JoinRequest{
-		ListenAddr:  "0.0.0.0:2377",
-		RemoteAddrs: []string{""},
-	}
-	status, _, err = d.SockRequest("POST", "/swarm/join", req2)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmForceNewCluster(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, true)
-
-	instances := 2
-	id := d1.createService(c, simpleTestService, setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d2.checkActiveContainerCount), checker.Equals, instances)
-
-	// drain d2, all containers should move to d1
-	d1.updateNode(c, d2.NodeID, func(n *swarm.Node) {
-		n.Spec.Availability = swarm.NodeAvailabilityDrain
-	})
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.Equals, instances)
-	waitAndAssert(c, defaultReconciliationTimeout, d2.checkActiveContainerCount, checker.Equals, 0)
-
-	c.Assert(d2.Stop(), checker.IsNil)
-
-	c.Assert(d1.Init(swarm.InitRequest{
-		ForceNewCluster: true,
-		Spec:            swarm.Spec{},
-	}), checker.IsNil)
-
-	waitAndAssert(c, defaultReconciliationTimeout, d1.checkActiveContainerCount, checker.Equals, instances)
-
-	d3 := s.AddDaemon(c, true, true)
-	info, err := d3.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.ControlAvailable, checker.True)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	instances = 4
-	d3.updateService(c, d3.getService(c, id), setInstances(instances))
-
-	waitAndAssert(c, defaultReconciliationTimeout, reducedCheck(sumAsIntegers, d1.checkActiveContainerCount, d3.checkActiveContainerCount), checker.Equals, instances)
-}
-
-func simpleTestService(s *swarm.Service) {
-	ureplicas := uint64(1)
-	restartDelay := time.Duration(100 * time.Millisecond)
-
-	s.Spec = swarm.ServiceSpec{
-		TaskTemplate: swarm.TaskSpec{
-			ContainerSpec: swarm.ContainerSpec{
-				Image:   "busybox:latest",
-				Command: []string{"/bin/top"},
-			},
-			RestartPolicy: &swarm.RestartPolicy{
-				Delay: &restartDelay,
-			},
-		},
-		Mode: swarm.ServiceMode{
-			Replicated: &swarm.ReplicatedService{
-				Replicas: &ureplicas,
-			},
-		},
-	}
-	s.Spec.Name = "top"
-}
-
-func serviceForUpdate(s *swarm.Service) {
-	ureplicas := uint64(1)
-	restartDelay := time.Duration(100 * time.Millisecond)
-
-	s.Spec = swarm.ServiceSpec{
-		TaskTemplate: swarm.TaskSpec{
-			ContainerSpec: swarm.ContainerSpec{
-				Image:   "busybox:latest",
-				Command: []string{"/bin/top"},
-			},
-			RestartPolicy: &swarm.RestartPolicy{
-				Delay: &restartDelay,
-			},
-		},
-		Mode: swarm.ServiceMode{
-			Replicated: &swarm.ReplicatedService{
-				Replicas: &ureplicas,
-			},
-		},
-		UpdateConfig: &swarm.UpdateConfig{
-			Parallelism:   2,
-			Delay:         4 * time.Second,
-			FailureAction: swarm.UpdateFailureActionContinue,
-		},
-	}
-	s.Spec.Name = "updatetest"
-}
-
-func setInstances(replicas int) serviceConstructor {
-	ureplicas := uint64(replicas)
-	return func(s *swarm.Service) {
-		s.Spec.Mode = swarm.ServiceMode{
-			Replicated: &swarm.ReplicatedService{
-				Replicas: &ureplicas,
-			},
-		}
-	}
-}
-
-func setImage(image string) serviceConstructor {
-	return func(s *swarm.Service) {
-		s.Spec.TaskTemplate.ContainerSpec.Image = image
-	}
-}
-
-func setFailureAction(failureAction string) serviceConstructor {
-	return func(s *swarm.Service) {
-		s.Spec.UpdateConfig.FailureAction = failureAction
-	}
-}
-
-func setMaxFailureRatio(maxFailureRatio float32) serviceConstructor {
-	return func(s *swarm.Service) {
-		s.Spec.UpdateConfig.MaxFailureRatio = maxFailureRatio
-	}
-}
-
-func setParallelism(parallelism uint64) serviceConstructor {
-	return func(s *swarm.Service) {
-		s.Spec.UpdateConfig.Parallelism = parallelism
-	}
-}
-
-func setConstraints(constraints []string) serviceConstructor {
-	return func(s *swarm.Service) {
-		if s.Spec.TaskTemplate.Placement == nil {
-			s.Spec.TaskTemplate.Placement = &swarm.Placement{}
-		}
-		s.Spec.TaskTemplate.Placement.Constraints = constraints
-	}
-}
-
-func setGlobalMode(s *swarm.Service) {
-	s.Spec.Mode = swarm.ServiceMode{
-		Global: &swarm.GlobalService{},
-	}
-}
-
-func checkClusterHealth(c *check.C, cl []*SwarmDaemon, managerCount, workerCount int) {
-	var totalMCount, totalWCount int
-
-	for _, d := range cl {
-		var (
-			info swarm.Info
-			err  error
-		)
-
-		// check info in a waitAndAssert, because if the cluster doesn't have a leader, `info` will return an error
-		checkInfo := func(c *check.C) (interface{}, check.CommentInterface) {
-			info, err = d.info()
-			return err, check.Commentf("cluster not ready in time")
-		}
-		waitAndAssert(c, defaultReconciliationTimeout, checkInfo, checker.IsNil)
-		if !info.ControlAvailable {
-			totalWCount++
-			continue
-		}
-
-		var leaderFound bool
-		totalMCount++
-		var mCount, wCount int
-
-		for _, n := range d.listNodes(c) {
-			waitReady := func(c *check.C) (interface{}, check.CommentInterface) {
-				if n.Status.State == swarm.NodeStateReady {
-					return true, nil
-				}
-				nn := d.getNode(c, n.ID)
-				n = *nn
-				return n.Status.State == swarm.NodeStateReady, check.Commentf("state of node %s, reported by %s", n.ID, d.Info.NodeID)
-			}
-			waitAndAssert(c, defaultReconciliationTimeout, waitReady, checker.True)
-
-			waitActive := func(c *check.C) (interface{}, check.CommentInterface) {
-				if n.Spec.Availability == swarm.NodeAvailabilityActive {
-					return true, nil
-				}
-				nn := d.getNode(c, n.ID)
-				n = *nn
-				return n.Spec.Availability == swarm.NodeAvailabilityActive, check.Commentf("availability of node %s, reported by %s", n.ID, d.Info.NodeID)
-			}
-			waitAndAssert(c, defaultReconciliationTimeout, waitActive, checker.True)
-
-			if n.Spec.Role == swarm.NodeRoleManager {
-				c.Assert(n.ManagerStatus, checker.NotNil, check.Commentf("manager status of node %s (manager), reported by %s", n.ID, d.Info.NodeID))
-				if n.ManagerStatus.Leader {
-					leaderFound = true
-				}
-				mCount++
-			} else {
-				c.Assert(n.ManagerStatus, checker.IsNil, check.Commentf("manager status of node %s (worker), reported by %s", n.ID, d.Info.NodeID))
-				wCount++
-			}
-		}
-		c.Assert(leaderFound, checker.True, check.Commentf("lack of leader reported by node %s", info.NodeID))
-		c.Assert(mCount, checker.Equals, managerCount, check.Commentf("managers count reported by node %s", info.NodeID))
-		c.Assert(wCount, checker.Equals, workerCount, check.Commentf("workers count reported by node %s", info.NodeID))
-	}
-	c.Assert(totalMCount, checker.Equals, managerCount)
-	c.Assert(totalWCount, checker.Equals, workerCount)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmRestartCluster(c *check.C) {
-	mCount, wCount := 5, 1
-
-	var nodes []*SwarmDaemon
-	for i := 0; i < mCount; i++ {
-		manager := s.AddDaemon(c, true, true)
-		info, err := manager.info()
-		c.Assert(err, checker.IsNil)
-		c.Assert(info.ControlAvailable, checker.True)
-		c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-		nodes = append(nodes, manager)
-	}
-
-	for i := 0; i < wCount; i++ {
-		worker := s.AddDaemon(c, true, false)
-		info, err := worker.info()
-		c.Assert(err, checker.IsNil)
-		c.Assert(info.ControlAvailable, checker.False)
-		c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-		nodes = append(nodes, worker)
-	}
-
-	// stop whole cluster
-	{
-		var wg sync.WaitGroup
-		wg.Add(len(nodes))
-		errs := make(chan error, len(nodes))
-
-		for _, d := range nodes {
-			go func(daemon *SwarmDaemon) {
-				defer wg.Done()
-				if err := daemon.Stop(); err != nil {
-					errs <- err
-				}
-				if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
-					daemon.root = filepath.Dir(daemon.root)
-				}
-			}(d)
-		}
-		wg.Wait()
-		close(errs)
-		for err := range errs {
-			c.Assert(err, check.IsNil)
-		}
-	}
-
-	// start whole cluster
-	{
-		var wg sync.WaitGroup
-		wg.Add(len(nodes))
-		errs := make(chan error, len(nodes))
-
-		for _, d := range nodes {
-			go func(daemon *SwarmDaemon) {
-				defer wg.Done()
-				if err := daemon.Start("--iptables=false"); err != nil {
-					errs <- err
-				}
-			}(d)
-		}
-		wg.Wait()
-		close(errs)
-		for err := range errs {
-			c.Assert(err, check.IsNil)
-		}
-	}
-
-	checkClusterHealth(c, nodes, mCount, wCount)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmServicesUpdateWithName(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	instances := 2
-	id := d.createService(c, simpleTestService, setInstances(instances))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-
-	service := d.getService(c, id)
-	instances = 5
-
-	setInstances(instances)(service)
-	url := fmt.Sprintf("/services/%s/update?version=%d", service.Spec.Name, service.Version.Index)
-	status, out, err := d.SockRequest("POST", url, service.Spec)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf("output: %q", string(out)))
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, instances)
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsEmptyList(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	secrets := d.listSecrets(c)
-	c.Assert(secrets, checker.NotNil)
-	c.Assert(len(secrets), checker.Equals, 0, check.Commentf("secrets: %#v", secrets))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsCreate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	secrets := d.listSecrets(c)
-	c.Assert(len(secrets), checker.Equals, 1, check.Commentf("secrets: %#v", secrets))
-	name := secrets[0].Spec.Annotations.Name
-	c.Assert(name, checker.Equals, testName, check.Commentf("secret: %s", name))
-}
-
-func (s *DockerSwarmSuite) TestAPISwarmSecretsDelete(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	secret := d.getSecret(c, id)
-	c.Assert(secret.ID, checker.Equals, id, check.Commentf("secret: %v", secret))
-
-	d.deleteSecret(c, secret.ID)
-	status, out, err := d.SockRequest("GET", "/secrets/"+id, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNotFound, check.Commentf("secret delete: %s", string(out)))
-}
-
-// Test case for 30242, where duplicate networks, with different drivers `bridge` and `overlay`,
-// caused both scopes to be `swarm` for `docker network inspect` and `docker network ls`.
-// This test makes sure the fixes correctly output scopes instead.
-func (s *DockerSwarmSuite) TestAPIDuplicateNetworks(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "foo"
-	networkCreateRequest := types.NetworkCreateRequest{
-		Name: name,
-		NetworkCreate: types.NetworkCreate{
-			CheckDuplicate: false,
-		},
-	}
-
-	var n1 types.NetworkCreateResponse
-	networkCreateRequest.NetworkCreate.Driver = "bridge"
-
-	status, out, err := d.SockRequest("POST", "/networks/create", networkCreateRequest)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(out)))
-
-	c.Assert(json.Unmarshal(out, &n1), checker.IsNil)
-
-	var n2 types.NetworkCreateResponse
-	networkCreateRequest.NetworkCreate.Driver = "overlay"
-
-	status, out, err = d.SockRequest("POST", "/networks/create", networkCreateRequest)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusCreated, check.Commentf(string(out)))
-
-	c.Assert(json.Unmarshal(out, &n2), checker.IsNil)
-
-	var r1 types.NetworkResource
-
-	status, out, err = d.SockRequest("GET", "/networks/"+n1.ID, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(out)))
-
-	c.Assert(json.Unmarshal(out, &r1), checker.IsNil)
-
-	c.Assert(r1.Scope, checker.Equals, "local")
-
-	var r2 types.NetworkResource
-
-	status, out, err = d.SockRequest("GET", "/networks/"+n2.ID, nil)
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(out)))
-
-	c.Assert(json.Unmarshal(out, &r2), checker.IsNil)
-
-	c.Assert(r2.Scope, checker.Equals, "swarm")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_test.go
deleted file mode 100644
index 3b38ba96f2..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"runtime"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPIOptionsRoute(c *check.C) {
-	status, _, err := sockRequest("OPTIONS", "/", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-}
-
-func (s *DockerSuite) TestAPIGetEnabledCORS(c *check.C) {
-	res, body, err := sockRequestRaw("GET", "/version", nil, "")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusOK)
-	body.Close()
-	// TODO: @runcom incomplete tests, why old integration tests had this headers
-	// and here none of the headers below are in the response?
-	//c.Log(res.Header)
-	//c.Assert(res.Header.Get("Access-Control-Allow-Origin"), check.Equals, "*")
-	//c.Assert(res.Header.Get("Access-Control-Allow-Headers"), check.Equals, "Origin, X-Requested-With, Content-Type, Accept, X-Registry-Auth")
-}
-
-func (s *DockerSuite) TestAPIClientVersionOldNotSupported(c *check.C) {
-	if daemonPlatform != runtime.GOOS {
-		c.Skip("Daemon platform doesn't match test platform")
-	}
-	if api.MinVersion == api.DefaultVersion {
-		c.Skip("API MinVersion==DefaultVersion")
-	}
-	v := strings.Split(api.MinVersion, ".")
-	vMinInt, err := strconv.Atoi(v[1])
-	c.Assert(err, checker.IsNil)
-	vMinInt--
-	v[1] = strconv.Itoa(vMinInt)
-	version := strings.Join(v, ".")
-
-	status, body, err := sockRequest("GET", "/v"+version+"/version", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusBadRequest)
-	expected := fmt.Sprintf("client version %s is too old. Minimum supported API version is %s, please upgrade your client to a newer version", version, api.MinVersion)
-	c.Assert(strings.TrimSpace(string(body)), checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestAPIDockerAPIVersion(c *check.C) {
-	var svrVersion string
-
-	server := httptest.NewServer(http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("API-Version", api.DefaultVersion)
-			url := r.URL.Path
-			svrVersion = url
-		}))
-	defer server.Close()
-
-	// Test using the env var first
-	result := icmd.RunCmd(icmd.Cmd{
-		Command: binaryWithArgs("-H="+server.URL[7:], "version"),
-		Env:     appendBaseEnv(false, "DOCKER_API_VERSION=xxx"),
-	})
-	c.Assert(result, icmd.Matches, icmd.Expected{Out: "API version:  xxx", ExitCode: 1})
-	c.Assert(svrVersion, check.Equals, "/vxxx/version", check.Commentf("%s", result.Compare(icmd.Success)))
-}
-
-func (s *DockerSuite) TestAPIErrorJSON(c *check.C) {
-	httpResp, body, err := sockRequestRaw("POST", "/containers/create", strings.NewReader(`{}`), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError)
-	c.Assert(httpResp.Header.Get("Content-Type"), checker.Equals, "application/json")
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(getErrorMessage(c, b), checker.Equals, "Config cannot be empty in order to create a container")
-}
-
-func (s *DockerSuite) TestAPIErrorPlainText(c *check.C) {
-	// Windows requires API 1.25 or later. This test is validating a behaviour which was present
-	// in v1.23, but changed in 1.24, hence not applicable on Windows. See apiVersionSupportsJSONErrors
-	testRequires(c, DaemonIsLinux)
-	httpResp, body, err := sockRequestRaw("POST", "/v1.23/containers/create", strings.NewReader(`{}`), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusInternalServerError)
-	c.Assert(httpResp.Header.Get("Content-Type"), checker.Contains, "text/plain")
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(string(b)), checker.Equals, "Config cannot be empty in order to create a container")
-}
-
-func (s *DockerSuite) TestAPIErrorNotFoundJSON(c *check.C) {
-	// 404 is a different code path to normal errors, so test separately
-	httpResp, body, err := sockRequestRaw("GET", "/notfound", nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusNotFound)
-	c.Assert(httpResp.Header.Get("Content-Type"), checker.Equals, "application/json")
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(getErrorMessage(c, b), checker.Equals, "page not found")
-}
-
-func (s *DockerSuite) TestAPIErrorNotFoundPlainText(c *check.C) {
-	httpResp, body, err := sockRequestRaw("GET", "/v1.23/notfound", nil, "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(httpResp.StatusCode, checker.Equals, http.StatusNotFound)
-	c.Assert(httpResp.Header.Get("Content-Type"), checker.Contains, "text/plain")
-	b, err := readBody(body)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(string(b)), checker.Equals, "page not found")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_update_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_update_unix_test.go
deleted file mode 100644
index dfe14ec7b0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_update_unix_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestAPIUpdateContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-
-	name := "apiUpdateContainer"
-	hostConfig := map[string]interface{}{
-		"Memory":     314572800,
-		"MemorySwap": 524288000,
-	}
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "200M", "busybox", "top")
-	_, _, err := sockRequest("POST", "/containers/"+name+"/update", hostConfig)
-	c.Assert(err, check.IsNil)
-
-	c.Assert(inspectField(c, name, "HostConfig.Memory"), checker.Equals, "314572800")
-	file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "314572800")
-
-	c.Assert(inspectField(c, name, "HostConfig.MemorySwap"), checker.Equals, "524288000")
-	file = "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
-	out, _ = dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "524288000")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_version_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_version_test.go
deleted file mode 100644
index eb2de5904a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_version_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestGetVersion(c *check.C) {
-	status, body, err := sockRequest("GET", "/version", nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	var v types.Version
-
-	c.Assert(json.Unmarshal(body, &v), checker.IsNil)
-
-	c.Assert(v.Version, checker.Equals, dockerversion.Version, check.Commentf("Version mismatch"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_volumes_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_api_volumes_test.go
deleted file mode 100644
index d1d44005e0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_api_volumes_test.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"net/http"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestVolumesAPIList(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	dockerCmd(c, "run", "-v", prefix+"/foo", "busybox")
-
-	status, b, err := sockRequest("GET", "/volumes", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var volumes volumetypes.VolumesListOKBody
-	c.Assert(json.Unmarshal(b, &volumes), checker.IsNil)
-
-	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))
-}
-
-func (s *DockerSuite) TestVolumesAPICreate(c *check.C) {
-	config := volumetypes.VolumesCreateBody{
-		Name: "test",
-	}
-	status, b, err := sockRequest("POST", "/volumes/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated, check.Commentf(string(b)))
-
-	var vol types.Volume
-	err = json.Unmarshal(b, &vol)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(filepath.Base(filepath.Dir(vol.Mountpoint)), checker.Equals, config.Name)
-}
-
-func (s *DockerSuite) TestVolumesAPIRemove(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	dockerCmd(c, "run", "-v", prefix+"/foo", "--name=test", "busybox")
-
-	status, b, err := sockRequest("GET", "/volumes", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-
-	var volumes volumetypes.VolumesListOKBody
-	c.Assert(json.Unmarshal(b, &volumes), checker.IsNil)
-	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))
-
-	v := volumes.Volumes[0]
-	status, _, err = sockRequest("DELETE", "/volumes/"+v.Name, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusConflict, check.Commentf("Should not be able to remove a volume that is in use"))
-
-	dockerCmd(c, "rm", "-f", "test")
-	status, data, err := sockRequest("DELETE", "/volumes/"+v.Name, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent, check.Commentf(string(data)))
-
-}
-
-func (s *DockerSuite) TestVolumesAPIInspect(c *check.C) {
-	config := volumetypes.VolumesCreateBody{
-		Name: "test",
-	}
-	status, b, err := sockRequest("POST", "/volumes/create", config)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusCreated, check.Commentf(string(b)))
-
-	status, b, err = sockRequest("GET", "/volumes", nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(b)))
-
-	var volumes volumetypes.VolumesListOKBody
-	c.Assert(json.Unmarshal(b, &volumes), checker.IsNil)
-	c.Assert(len(volumes.Volumes), checker.Equals, 1, check.Commentf("\n%v", volumes.Volumes))
-
-	var vol types.Volume
-	status, b, err = sockRequest("GET", "/volumes/"+config.Name, nil)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusOK, check.Commentf(string(b)))
-	c.Assert(json.Unmarshal(b, &vol), checker.IsNil)
-	c.Assert(vol.Name, checker.Equals, config.Name)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_test.go
deleted file mode 100644
index 2df4fdc4d2..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os/exec"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-const attachWait = 5 * time.Second
-
-func (s *DockerSuite) TestAttachMultipleAndRestart(c *check.C) {
-	endGroup := &sync.WaitGroup{}
-	startGroup := &sync.WaitGroup{}
-	endGroup.Add(3)
-	startGroup.Add(3)
-
-	err := waitForContainer("attacher", "-d", "busybox", "/bin/sh", "-c", "while true; do sleep 1; echo hello; done")
-	c.Assert(err, check.IsNil)
-
-	startDone := make(chan struct{})
-	endDone := make(chan struct{})
-
-	go func() {
-		endGroup.Wait()
-		close(endDone)
-	}()
-
-	go func() {
-		startGroup.Wait()
-		close(startDone)
-	}()
-
-	for i := 0; i < 3; i++ {
-		go func() {
-			cmd := exec.Command(dockerBinary, "attach", "attacher")
-
-			defer func() {
-				cmd.Wait()
-				endGroup.Done()
-			}()
-
-			out, err := cmd.StdoutPipe()
-			if err != nil {
-				c.Fatal(err)
-			}
-			defer out.Close()
-
-			if err := cmd.Start(); err != nil {
-				c.Fatal(err)
-			}
-
-			buf := make([]byte, 1024)
-
-			if _, err := out.Read(buf); err != nil && err != io.EOF {
-				c.Fatal(err)
-			}
-
-			startGroup.Done()
-
-			if !strings.Contains(string(buf), "hello") {
-				c.Fatalf("unexpected output %s expected hello\n", string(buf))
-			}
-		}()
-	}
-
-	select {
-	case <-startDone:
-	case <-time.After(attachWait):
-		c.Fatalf("Attaches did not initialize properly")
-	}
-
-	dockerCmd(c, "kill", "attacher")
-
-	select {
-	case <-endDone:
-	case <-time.After(attachWait):
-		c.Fatalf("Attaches did not finish properly")
-	}
-}
-
-func (s *DockerSuite) TestAttachTTYWithoutStdin(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "-ti", "busybox")
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	done := make(chan error)
-	go func() {
-		defer close(done)
-
-		cmd := exec.Command(dockerBinary, "attach", id)
-		if _, err := cmd.StdinPipe(); err != nil {
-			done <- err
-			return
-		}
-
-		expected := "the input device is not a TTY"
-		if runtime.GOOS == "windows" {
-			expected += ".  If you are using mintty, try prefixing the command with 'winpty'"
-		}
-		if out, _, err := runCommandWithOutput(cmd); err == nil {
-			done <- fmt.Errorf("attach should have failed")
-			return
-		} else if !strings.Contains(out, expected) {
-			done <- fmt.Errorf("attach failed with error %q: expected %q", out, expected)
-			return
-		}
-	}()
-
-	select {
-	case err := <-done:
-		c.Assert(err, check.IsNil)
-	case <-time.After(attachWait):
-		c.Fatal("attach is running but should have failed")
-	}
-}
-
-func (s *DockerSuite) TestAttachDisconnect(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-di", "busybox", "/bin/cat")
-	id := strings.TrimSpace(out)
-
-	cmd := exec.Command(dockerBinary, "attach", id)
-	stdin, err := cmd.StdinPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer stdin.Close()
-	stdout, err := cmd.StdoutPipe()
-	c.Assert(err, check.IsNil)
-	defer stdout.Close()
-	c.Assert(cmd.Start(), check.IsNil)
-	defer cmd.Process.Kill()
-
-	_, err = stdin.Write([]byte("hello\n"))
-	c.Assert(err, check.IsNil)
-	out, err = bufio.NewReader(stdout).ReadString('\n')
-	c.Assert(err, check.IsNil)
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
-
-	c.Assert(stdin.Close(), check.IsNil)
-
-	// Expect container to still be running after stdin is closed
-	running := inspectField(c, id, "State.Running")
-	c.Assert(running, check.Equals, "true")
-}
-
-func (s *DockerSuite) TestAttachPausedContainer(c *check.C) {
-	testRequires(c, IsPausable)
-	defer unpauseAllContainers()
-	runSleepingContainer(c, "-d", "--name=test")
-	dockerCmd(c, "pause", "test")
-
-	result := dockerCmdWithResult("attach", "test")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		Error:    "exit status 1",
-		ExitCode: 1,
-		Err:      "You cannot attach to a paused container, unpause it first",
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_unix_test.go
deleted file mode 100644
index fb794ccc40..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_attach_unix_test.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bufio"
-	"io/ioutil"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// #9860 Make sure attach ends when container ends (with no errors)
-func (s *DockerSuite) TestAttachClosedOnContainerStop(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	out, _ := dockerCmd(c, "run", "-dti", "busybox", "/bin/sh", "-c", `trap 'exit 0' SIGTERM; while true; do sleep 1; done`)
-
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	pty, tty, err := pty.Open()
-	c.Assert(err, check.IsNil)
-
-	attachCmd := exec.Command(dockerBinary, "attach", id)
-	attachCmd.Stdin = tty
-	attachCmd.Stdout = tty
-	attachCmd.Stderr = tty
-	err = attachCmd.Start()
-	c.Assert(err, check.IsNil)
-
-	errChan := make(chan error)
-	go func() {
-		time.Sleep(300 * time.Millisecond)
-		defer close(errChan)
-		// Container is waiting for us to signal it to stop
-		dockerCmd(c, "stop", id)
-		// And wait for the attach command to end
-		errChan <- attachCmd.Wait()
-	}()
-
-	// Wait for the docker to end (should be done by the
-	// stop command in the go routine)
-	dockerCmd(c, "wait", id)
-
-	select {
-	case err := <-errChan:
-		tty.Close()
-		out, _ := ioutil.ReadAll(pty)
-		c.Assert(err, check.IsNil, check.Commentf("out: %v", string(out)))
-	case <-time.After(attachWait):
-		c.Fatal("timed out without attach returning")
-	}
-
-}
-
-func (s *DockerSuite) TestAttachAfterDetach(c *check.C) {
-	name := "detachtest"
-
-	cpty, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err))
-	cmd := exec.Command(dockerBinary, "run", "-ti", "--name", name, "busybox")
-	cmd.Stdin = tty
-	cmd.Stdout = tty
-	cmd.Stderr = tty
-
-	errChan := make(chan error)
-	go func() {
-		errChan <- cmd.Run()
-		close(errChan)
-	}()
-
-	c.Assert(waitRun(name), check.IsNil)
-
-	cpty.Write([]byte{16})
-	time.Sleep(100 * time.Millisecond)
-	cpty.Write([]byte{17})
-
-	select {
-	case err := <-errChan:
-		if err != nil {
-			buff := make([]byte, 200)
-			tty.Read(buff)
-			c.Fatalf("%s: %s", err, buff)
-		}
-	case <-time.After(5 * time.Second):
-		c.Fatal("timeout while detaching")
-	}
-
-	cpty, tty, err = pty.Open()
-	c.Assert(err, checker.IsNil, check.Commentf("Could not open pty: %v", err))
-
-	cmd = exec.Command(dockerBinary, "attach", name)
-	cmd.Stdin = tty
-	cmd.Stdout = tty
-	cmd.Stderr = tty
-
-	err = cmd.Start()
-	c.Assert(err, checker.IsNil)
-
-	bytes := make([]byte, 10)
-	var nBytes int
-	readErr := make(chan error, 1)
-
-	go func() {
-		time.Sleep(500 * time.Millisecond)
-		cpty.Write([]byte("\n"))
-		time.Sleep(500 * time.Millisecond)
-
-		nBytes, err = cpty.Read(bytes)
-		cpty.Close()
-		readErr <- err
-	}()
-
-	select {
-	case err := <-readErr:
-		c.Assert(err, check.IsNil)
-	case <-time.After(2 * time.Second):
-		c.Fatal("timeout waiting for attach read")
-	}
-
-	err = cmd.Wait()
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(string(bytes[:nBytes]), checker.Contains, "/ #")
-
-}
-
-// TestAttachDetach checks that attach in tty mode can be detached using the long container ID
-func (s *DockerSuite) TestAttachDetach(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-itd", "busybox", "cat")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	cpty, tty, err := pty.Open()
-	c.Assert(err, check.IsNil)
-	defer cpty.Close()
-
-	cmd := exec.Command(dockerBinary, "attach", id)
-	cmd.Stdin = tty
-	stdout, err := cmd.StdoutPipe()
-	c.Assert(err, check.IsNil)
-	defer stdout.Close()
-	err = cmd.Start()
-	c.Assert(err, check.IsNil)
-	c.Assert(waitRun(id), check.IsNil)
-
-	_, err = cpty.Write([]byte("hello\n"))
-	c.Assert(err, check.IsNil)
-	out, err = bufio.NewReader(stdout).ReadString('\n')
-	c.Assert(err, check.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out))
-
-	// escape sequence
-	_, err = cpty.Write([]byte{16})
-	c.Assert(err, checker.IsNil)
-	time.Sleep(100 * time.Millisecond)
-	_, err = cpty.Write([]byte{17})
-	c.Assert(err, checker.IsNil)
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	running := inspectField(c, id, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-
-	go func() {
-		dockerCmd(c, "kill", id)
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Millisecond):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-}
-
-// TestAttachDetachTruncatedID checks that attach in tty mode can be detached
-func (s *DockerSuite) TestAttachDetachTruncatedID(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-itd", "busybox", "cat")
-	id := stringid.TruncateID(strings.TrimSpace(out))
-	c.Assert(waitRun(id), check.IsNil)
-
-	cpty, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil)
-	defer cpty.Close()
-
-	cmd := exec.Command(dockerBinary, "attach", id)
-	cmd.Stdin = tty
-	stdout, err := cmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-	defer stdout.Close()
-	err = cmd.Start()
-	c.Assert(err, checker.IsNil)
-
-	_, err = cpty.Write([]byte("hello\n"))
-	c.Assert(err, checker.IsNil)
-	out, err = bufio.NewReader(stdout).ReadString('\n')
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello', got %q", out))
-
-	// escape sequence
-	_, err = cpty.Write([]byte{16})
-	c.Assert(err, checker.IsNil)
-	time.Sleep(100 * time.Millisecond)
-	_, err = cpty.Write([]byte{17})
-	c.Assert(err, checker.IsNil)
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	running := inspectField(c, id, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-
-	go func() {
-		dockerCmd(c, "kill", id)
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Millisecond):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_plugin_v2_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_plugin_v2_test.go
deleted file mode 100644
index 8a669fb379..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_plugin_v2_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-var (
-	authzPluginName            = "riyaz/authz-no-volume-plugin"
-	authzPluginTag             = "latest"
-	authzPluginNameWithTag     = authzPluginName + ":" + authzPluginTag
-	authzPluginBadManifestName = "riyaz/authz-plugin-bad-manifest"
-	nonexistentAuthzPluginName = "riyaz/nonexistent-authz-plugin"
-)
-
-func init() {
-	check.Suite(&DockerAuthzV2Suite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerAuthzV2Suite struct {
-	ds *DockerSuite
-	d  *Daemon
-}
-
-func (s *DockerAuthzV2Suite) SetUpTest(c *check.C) {
-	testRequires(c, DaemonIsLinux, Network)
-	s.d = NewDaemon(c)
-	c.Assert(s.d.Start(), check.IsNil)
-}
-
-func (s *DockerAuthzV2Suite) TearDownTest(c *check.C) {
-	s.d.Stop()
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerAuthzV2Suite) TestAuthZPluginAllowNonVolumeRequest(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	// Install authz plugin
-	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
-	c.Assert(err, checker.IsNil)
-	// start the daemon with the plugin and load busybox, --net=none build fails otherwise
-	// because it needs to pull busybox
-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginNameWithTag), check.IsNil)
-	c.Assert(s.d.LoadBusybox(), check.IsNil)
-
-	// defer disabling the plugin
-	defer func() {
-		c.Assert(s.d.Restart(), check.IsNil)
-		_, err = s.d.Cmd("plugin", "disable", authzPluginNameWithTag)
-		c.Assert(err, checker.IsNil)
-		_, err = s.d.Cmd("plugin", "rm", authzPluginNameWithTag)
-		c.Assert(err, checker.IsNil)
-	}()
-
-	// Ensure docker run command and accompanying docker ps are successful
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	id := strings.TrimSpace(out)
-
-	out, err = s.d.Cmd("ps")
-	c.Assert(err, check.IsNil)
-	c.Assert(assertContainerList(out, []string{id}), check.Equals, true)
-}
-
-func (s *DockerAuthzV2Suite) TestAuthZPluginRejectVolumeRequests(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	// Install authz plugin
-	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	// restart the daemon with the plugin
-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginNameWithTag), check.IsNil)
-
-	// defer disabling the plugin
-	defer func() {
-		c.Assert(s.d.Restart(), check.IsNil)
-		_, err = s.d.Cmd("plugin", "disable", authzPluginNameWithTag)
-		c.Assert(err, checker.IsNil)
-		_, err = s.d.Cmd("plugin", "rm", authzPluginNameWithTag)
-		c.Assert(err, checker.IsNil)
-	}()
-
-	out, err := s.d.Cmd("volume", "create")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Error response from daemon: plugin %s failed with error:", authzPluginNameWithTag))
-
-	out, err = s.d.Cmd("volume", "ls")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Error response from daemon: plugin %s failed with error:", authzPluginNameWithTag))
-
-	// The plugin will block the command before it can determine the volume does not exist
-	out, err = s.d.Cmd("volume", "rm", "test")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Error response from daemon: plugin %s failed with error:", authzPluginNameWithTag))
-
-	out, err = s.d.Cmd("volume", "inspect", "test")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Error response from daemon: plugin %s failed with error:", authzPluginNameWithTag))
-
-	out, err = s.d.Cmd("volume", "prune", "-f")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Error response from daemon: plugin %s failed with error:", authzPluginNameWithTag))
-}
-
-func (s *DockerAuthzV2Suite) TestAuthZPluginBadManifestFailsDaemonStart(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	// Install authz plugin with bad manifest
-	_, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", authzPluginBadManifestName)
-	c.Assert(err, checker.IsNil)
-
-	// start the daemon with the plugin, it will error
-	c.Assert(s.d.Restart("--authorization-plugin="+authzPluginBadManifestName), check.NotNil)
-
-	// restarting the daemon without requiring the plugin will succeed
-	c.Assert(s.d.Restart(), check.IsNil)
-}
-
-func (s *DockerAuthzV2Suite) TestNonexistentAuthZPluginFailsDaemonStart(c *check.C) {
-	testRequires(c, DaemonIsLinux, Network)
-	// start the daemon with a non-existent authz plugin, it will error
-	c.Assert(s.d.Restart("--authorization-plugin="+nonexistentAuthzPluginName), check.NotNil)
-
-	// restarting the daemon without requiring the plugin will succeed
-	c.Assert(s.d.Restart(), check.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_unix_test.go
deleted file mode 100644
index a826249e2e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_authz_unix_test.go
+++ /dev/null
@@ -1,477 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"bufio"
-	"bytes"
-	"os/exec"
-	"strconv"
-	"time"
-
-	"net"
-	"net/http/httputil"
-	"net/url"
-
-	"github.com/docker/docker/pkg/authorization"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/go-check/check"
-)
-
-const (
-	testAuthZPlugin     = "authzplugin"
-	unauthorizedMessage = "User unauthorized authz plugin"
-	errorMessage        = "something went wrong..."
-	containerListAPI    = "/containers/json"
-)
-
-var (
-	alwaysAllowed = []string{"/_ping", "/info"}
-)
-
-func init() {
-	check.Suite(&DockerAuthzSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerAuthzSuite struct {
-	server *httptest.Server
-	ds     *DockerSuite
-	d      *Daemon
-	ctrl   *authorizationController
-}
-
-type authorizationController struct {
-	reqRes        authorization.Response // reqRes holds the plugin response to the initial client request
-	resRes        authorization.Response // resRes holds the plugin response to the daemon response
-	psRequestCnt  int                    // psRequestCnt counts the number of calls to list container request api
-	psResponseCnt int                    // psResponseCnt counts the number of calls to list containers response API
-	requestsURIs  []string               // requestsURIs stores all request URIs that are sent to the authorization controller
-	reqUser       string
-	resUser       string
-}
-
-func (s *DockerAuthzSuite) SetUpTest(c *check.C) {
-	s.d = NewDaemon(c)
-	s.ctrl = &authorizationController{}
-}
-
-func (s *DockerAuthzSuite) TearDownTest(c *check.C) {
-	s.d.Stop()
-	s.ds.TearDownTest(c)
-	s.ctrl = nil
-}
-
-func (s *DockerAuthzSuite) SetUpSuite(c *check.C) {
-	mux := http.NewServeMux()
-	s.server = httptest.NewServer(mux)
-
-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		b, err := json.Marshal(plugins.Manifest{Implements: []string{authorization.AuthZApiImplements}})
-		c.Assert(err, check.IsNil)
-		w.Write(b)
-	})
-
-	mux.HandleFunc("/AuthZPlugin.AuthZReq", func(w http.ResponseWriter, r *http.Request) {
-		defer r.Body.Close()
-		body, err := ioutil.ReadAll(r.Body)
-		c.Assert(err, check.IsNil)
-		authReq := authorization.Request{}
-		err = json.Unmarshal(body, &authReq)
-		c.Assert(err, check.IsNil)
-
-		assertBody(c, authReq.RequestURI, authReq.RequestHeaders, authReq.RequestBody)
-		assertAuthHeaders(c, authReq.RequestHeaders)
-
-		// Count only container list api
-		if strings.HasSuffix(authReq.RequestURI, containerListAPI) {
-			s.ctrl.psRequestCnt++
-		}
-
-		s.ctrl.requestsURIs = append(s.ctrl.requestsURIs, authReq.RequestURI)
-
-		reqRes := s.ctrl.reqRes
-		if isAllowed(authReq.RequestURI) {
-			reqRes = authorization.Response{Allow: true}
-		}
-		if reqRes.Err != "" {
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		b, err := json.Marshal(reqRes)
-		c.Assert(err, check.IsNil)
-		s.ctrl.reqUser = authReq.User
-		w.Write(b)
-	})
-
-	mux.HandleFunc("/AuthZPlugin.AuthZRes", func(w http.ResponseWriter, r *http.Request) {
-		defer r.Body.Close()
-		body, err := ioutil.ReadAll(r.Body)
-		c.Assert(err, check.IsNil)
-		authReq := authorization.Request{}
-		err = json.Unmarshal(body, &authReq)
-		c.Assert(err, check.IsNil)
-
-		assertBody(c, authReq.RequestURI, authReq.ResponseHeaders, authReq.ResponseBody)
-		assertAuthHeaders(c, authReq.ResponseHeaders)
-
-		// Count only container list api
-		if strings.HasSuffix(authReq.RequestURI, containerListAPI) {
-			s.ctrl.psResponseCnt++
-		}
-		resRes := s.ctrl.resRes
-		if isAllowed(authReq.RequestURI) {
-			resRes = authorization.Response{Allow: true}
-		}
-		if resRes.Err != "" {
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		b, err := json.Marshal(resRes)
-		c.Assert(err, check.IsNil)
-		s.ctrl.resUser = authReq.User
-		w.Write(b)
-	})
-
-	err := os.MkdirAll("/etc/docker/plugins", 0755)
-	c.Assert(err, checker.IsNil)
-
-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", testAuthZPlugin)
-	err = ioutil.WriteFile(fileName, []byte(s.server.URL), 0644)
-	c.Assert(err, checker.IsNil)
-}
-
-// check for always allowed endpoints to not inhibit test framework functions
-func isAllowed(reqURI string) bool {
-	for _, endpoint := range alwaysAllowed {
-		if strings.HasSuffix(reqURI, endpoint) {
-			return true
-		}
-	}
-	return false
-}
-
-// assertAuthHeaders validates authentication headers are removed
-func assertAuthHeaders(c *check.C, headers map[string]string) error {
-	for k := range headers {
-		if strings.Contains(strings.ToLower(k), "auth") || strings.Contains(strings.ToLower(k), "x-registry") {
-			c.Errorf("Found authentication headers in request '%v'", headers)
-		}
-	}
-	return nil
-}
-
-// assertBody asserts that body is removed for non text/json requests
-func assertBody(c *check.C, requestURI string, headers map[string]string, body []byte) {
-	if strings.Contains(strings.ToLower(requestURI), "auth") && len(body) > 0 {
-		//return fmt.Errorf("Body included for authentication endpoint %s", string(body))
-		c.Errorf("Body included for authentication endpoint %s", string(body))
-	}
-
-	for k, v := range headers {
-		if strings.EqualFold(k, "Content-Type") && strings.HasPrefix(v, "text/") || v == "application/json" {
-			return
-		}
-	}
-	if len(body) > 0 {
-		c.Errorf("Body included while it should not (Headers: '%v')", headers)
-	}
-}
-
-func (s *DockerAuthzSuite) TearDownSuite(c *check.C) {
-	if s.server == nil {
-		return
-	}
-
-	s.server.Close()
-
-	err := os.RemoveAll("/etc/docker/plugins")
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginAllowRequest(c *check.C) {
-	// start the daemon and load busybox, --net=none build fails otherwise
-	// cause it needs to pull busybox
-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin), check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-	c.Assert(s.d.LoadBusybox(), check.IsNil)
-
-	// Ensure command successful
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	id := strings.TrimSpace(out)
-	assertURIRecorded(c, s.ctrl.requestsURIs, "/containers/create")
-	assertURIRecorded(c, s.ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", id))
-
-	out, err = s.d.Cmd("ps")
-	c.Assert(err, check.IsNil)
-	c.Assert(assertContainerList(out, []string{id}), check.Equals, true)
-	c.Assert(s.ctrl.psRequestCnt, check.Equals, 1)
-	c.Assert(s.ctrl.psResponseCnt, check.Equals, 1)
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginTls(c *check.C) {
-
-	const testDaemonHTTPSAddr = "tcp://localhost:4271"
-	// start the daemon and load busybox, --net=none build fails otherwise
-	// cause it needs to pull busybox
-	if err := s.d.Start(
-		"--authorization-plugin="+testAuthZPlugin,
-		"--tlsverify",
-		"--tlscacert",
-		"fixtures/https/ca.pem",
-		"--tlscert",
-		"fixtures/https/server-cert.pem",
-		"--tlskey",
-		"fixtures/https/server-key.pem",
-		"-H", testDaemonHTTPSAddr); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-
-	out, _ := dockerCmd(
-		c,
-		"--tlsverify",
-		"--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-cert.pem",
-		"--tlskey", "fixtures/https/client-key.pem",
-		"-H",
-		testDaemonHTTPSAddr,
-		"version",
-	)
-	if !strings.Contains(out, "Server") {
-		c.Fatalf("docker version should return information of server side")
-	}
-
-	c.Assert(s.ctrl.reqUser, check.Equals, "client")
-	c.Assert(s.ctrl.resUser, check.Equals, "client")
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginDenyRequest(c *check.C) {
-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
-	c.Assert(err, check.IsNil)
-	s.ctrl.reqRes.Allow = false
-	s.ctrl.reqRes.Msg = unauthorizedMessage
-
-	// Ensure command is blocked
-	res, err := s.d.Cmd("ps")
-	c.Assert(err, check.NotNil)
-	c.Assert(s.ctrl.psRequestCnt, check.Equals, 1)
-	c.Assert(s.ctrl.psResponseCnt, check.Equals, 0)
-
-	// Ensure unauthorized message appears in response
-	c.Assert(res, check.Equals, fmt.Sprintf("Error response from daemon: authorization denied by plugin %s: %s\n", testAuthZPlugin, unauthorizedMessage))
-}
-
-// TestAuthZPluginAPIDenyResponse validates that when authorization plugin deny the request, the status code is forbidden
-func (s *DockerAuthzSuite) TestAuthZPluginAPIDenyResponse(c *check.C) {
-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
-	c.Assert(err, check.IsNil)
-	s.ctrl.reqRes.Allow = false
-	s.ctrl.resRes.Msg = unauthorizedMessage
-
-	daemonURL, err := url.Parse(s.d.sock())
-
-	conn, err := net.DialTimeout(daemonURL.Scheme, daemonURL.Path, time.Second*10)
-	c.Assert(err, check.IsNil)
-	client := httputil.NewClientConn(conn, nil)
-	req, err := http.NewRequest("GET", "/version", nil)
-	c.Assert(err, check.IsNil)
-	resp, err := client.Do(req)
-
-	c.Assert(err, check.IsNil)
-	c.Assert(resp.StatusCode, checker.Equals, http.StatusForbidden)
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginDenyResponse(c *check.C) {
-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
-	c.Assert(err, check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = false
-	s.ctrl.resRes.Msg = unauthorizedMessage
-
-	// Ensure command is blocked
-	res, err := s.d.Cmd("ps")
-	c.Assert(err, check.NotNil)
-	c.Assert(s.ctrl.psRequestCnt, check.Equals, 1)
-	c.Assert(s.ctrl.psResponseCnt, check.Equals, 1)
-
-	// Ensure unauthorized message appears in response
-	c.Assert(res, check.Equals, fmt.Sprintf("Error response from daemon: authorization denied by plugin %s: %s\n", testAuthZPlugin, unauthorizedMessage))
-}
-
-// TestAuthZPluginAllowEventStream verifies event stream propagates correctly after request pass through by the authorization plugin
-func (s *DockerAuthzSuite) TestAuthZPluginAllowEventStream(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// start the daemon and load busybox to avoid pulling busybox from Docker Hub
-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin), check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-	c.Assert(s.d.LoadBusybox(), check.IsNil)
-
-	startTime := strconv.FormatInt(daemonTime(c).Unix(), 10)
-	// Add another command to to enable event pipelining
-	eventsCmd := exec.Command(dockerBinary, "--host", s.d.sock(), "events", "--since", startTime)
-	stdout, err := eventsCmd.StdoutPipe()
-	if err != nil {
-		c.Assert(err, check.IsNil)
-	}
-
-	observer := eventObserver{
-		buffer:    new(bytes.Buffer),
-		command:   eventsCmd,
-		scanner:   bufio.NewScanner(stdout),
-		startTime: startTime,
-	}
-
-	err = observer.Start()
-	c.Assert(err, checker.IsNil)
-	defer observer.Stop()
-
-	// Create a container and wait for the creation events
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	containerID := strings.TrimSpace(out)
-	c.Assert(s.d.waitRun(containerID), checker.IsNil)
-
-	events := map[string]chan bool{
-		"create": make(chan bool, 1),
-		"start":  make(chan bool, 1),
-	}
-
-	matcher := matchEventLine(containerID, "container", events)
-	processor := processEventMatch(events)
-	go observer.Match(matcher, processor)
-
-	// Ensure all events are received
-	for event, eventChannel := range events {
-
-		select {
-		case <-time.After(30 * time.Second):
-			// Fail the test
-			observer.CheckEventError(c, containerID, event, matcher)
-			c.FailNow()
-		case <-eventChannel:
-			// Ignore, event received
-		}
-	}
-
-	// Ensure both events and container endpoints are passed to the authorization plugin
-	assertURIRecorded(c, s.ctrl.requestsURIs, "/events")
-	assertURIRecorded(c, s.ctrl.requestsURIs, "/containers/create")
-	assertURIRecorded(c, s.ctrl.requestsURIs, fmt.Sprintf("/containers/%s/start", containerID))
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginErrorResponse(c *check.C) {
-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
-	c.Assert(err, check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Err = errorMessage
-
-	// Ensure command is blocked
-	res, err := s.d.Cmd("ps")
-	c.Assert(err, check.NotNil)
-
-	c.Assert(res, check.Equals, fmt.Sprintf("Error response from daemon: plugin %s failed with error: %s: %s\n", testAuthZPlugin, authorization.AuthZApiResponse, errorMessage))
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginErrorRequest(c *check.C) {
-	err := s.d.Start("--authorization-plugin=" + testAuthZPlugin)
-	c.Assert(err, check.IsNil)
-	s.ctrl.reqRes.Err = errorMessage
-
-	// Ensure command is blocked
-	res, err := s.d.Cmd("ps")
-	c.Assert(err, check.NotNil)
-
-	c.Assert(res, check.Equals, fmt.Sprintf("Error response from daemon: plugin %s failed with error: %s: %s\n", testAuthZPlugin, authorization.AuthZApiRequest, errorMessage))
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginEnsureNoDuplicatePluginRegistration(c *check.C) {
-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin), check.IsNil)
-
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-
-	out, err := s.d.Cmd("ps")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// assert plugin is only called once..
-	c.Assert(s.ctrl.psRequestCnt, check.Equals, 1)
-	c.Assert(s.ctrl.psResponseCnt, check.Equals, 1)
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginEnsureLoadImportWorking(c *check.C) {
-	c.Assert(s.d.Start("--authorization-plugin="+testAuthZPlugin, "--authorization-plugin="+testAuthZPlugin), check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-	c.Assert(s.d.LoadBusybox(), check.IsNil)
-
-	tmp, err := ioutil.TempDir("", "test-authz-load-import")
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(tmp)
-
-	savedImagePath := filepath.Join(tmp, "save.tar")
-
-	out, err := s.d.Cmd("save", "-o", savedImagePath, "busybox")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("load", "--input", savedImagePath)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	exportedImagePath := filepath.Join(tmp, "export.tar")
-
-	out, err = s.d.Cmd("run", "-d", "--name", "testexport", "busybox")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("export", "-o", exportedImagePath, "testexport")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("import", exportedImagePath)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerAuthzSuite) TestAuthZPluginHeader(c *check.C) {
-	c.Assert(s.d.Start("--debug", "--authorization-plugin="+testAuthZPlugin), check.IsNil)
-	s.ctrl.reqRes.Allow = true
-	s.ctrl.resRes.Allow = true
-	c.Assert(s.d.LoadBusybox(), check.IsNil)
-
-	daemonURL, err := url.Parse(s.d.sock())
-
-	conn, err := net.DialTimeout(daemonURL.Scheme, daemonURL.Path, time.Second*10)
-	c.Assert(err, check.IsNil)
-	client := httputil.NewClientConn(conn, nil)
-	req, err := http.NewRequest("GET", "/version", nil)
-	c.Assert(err, check.IsNil)
-	resp, err := client.Do(req)
-
-	c.Assert(err, check.IsNil)
-	c.Assert(resp.Header["Content-Type"][0], checker.Equals, "application/json")
-}
-
-// assertURIRecorded verifies that the given URI was sent and recorded in the authz plugin
-func assertURIRecorded(c *check.C, uris []string, uri string) {
-	var found bool
-	for _, u := range uris {
-		if strings.Contains(u, uri) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("Expected to find URI '%s', recorded uris '%s'", uri, strings.Join(uris, ","))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_test.go
deleted file mode 100644
index 49c1062c25..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_test.go
+++ /dev/null
@@ -1,7392 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
-
-	"github.com/docker/docker/builder/dockerfile/command"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestBuildJSONEmptyRun(c *check.C) {
-	name := "testbuildjsonemptyrun"
-
-	_, err := buildImage(
-		name,
-		`
-    FROM busybox
-    RUN []
-    `,
-		true)
-
-	if err != nil {
-		c.Fatal("error when dealing with a RUN statement with empty JSON array")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildShCmdJSONEntrypoint(c *check.C) {
-	name := "testbuildshcmdjsonentrypoint"
-
-	_, err := buildImage(
-		name,
-		`
-    FROM busybox
-    ENTRYPOINT ["echo"]
-    CMD echo test
-    `,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--rm", name)
-
-	if daemonPlatform == "windows" {
-		if !strings.Contains(out, "cmd /S /C echo test") {
-			c.Fatalf("CMD did not contain cmd /S /C echo test : %q", out)
-		}
-	} else {
-		if strings.TrimSpace(out) != "/bin/sh -c echo test" {
-			c.Fatalf("CMD did not contain /bin/sh -c : %q", out)
-		}
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementUser(c *check.C) {
-	// Windows does not support FROM scratch or the USER command
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvironmentreplacement"
-
-	_, err := buildImage(name, `
-  FROM scratch
-  ENV user foo
-  USER ${user}
-  `, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.User")
-
-	if res != `"foo"` {
-		c.Fatal("User foo from environment not in Config.User on image")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementVolume(c *check.C) {
-	name := "testbuildenvironmentreplacement"
-
-	var volumePath string
-
-	if daemonPlatform == "windows" {
-		volumePath = "c:/quux"
-	} else {
-		volumePath = "/quux"
-	}
-
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  ENV volume `+volumePath+`
-  VOLUME ${volume}
-  `, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Volumes")
-
-	var volumes map[string]interface{}
-
-	if err := json.Unmarshal([]byte(res), &volumes); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := volumes[volumePath]; !ok {
-		c.Fatal("Volume " + volumePath + " from environment not in Config.Volumes on image")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementExpose(c *check.C) {
-	// Windows does not support FROM scratch or the EXPOSE command
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvironmentreplacement"
-
-	_, err := buildImage(name, `
-  FROM scratch
-  ENV port 80
-  EXPOSE ${port}
-  ENV ports "  99   100 "
-  EXPOSE ${ports}
-  `, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.ExposedPorts")
-
-	var exposedPorts map[string]interface{}
-
-	if err := json.Unmarshal([]byte(res), &exposedPorts); err != nil {
-		c.Fatal(err)
-	}
-
-	exp := []int{80, 99, 100}
-
-	for _, p := range exp {
-		tmp := fmt.Sprintf("%d/tcp", p)
-		if _, ok := exposedPorts[tmp]; !ok {
-			c.Fatalf("Exposed port %d from environment not in Config.ExposedPorts on image", p)
-		}
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementWorkdir(c *check.C) {
-	name := "testbuildenvironmentreplacement"
-
-	_, err := buildImage(name, `
-  FROM busybox
-  ENV MYWORKDIR /work
-  RUN mkdir ${MYWORKDIR}
-  WORKDIR ${MYWORKDIR}
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementAddCopy(c *check.C) {
-	name := "testbuildenvironmentreplacement"
-
-	ctx, err := fakeContext(`
-  FROM `+minimalBaseImage()+`
-  ENV baz foo
-  ENV quux bar
-  ENV dot .
-  ENV fee fff
-  ENV gee ggg
-
-  ADD ${baz} ${dot}
-  COPY ${quux} ${dot}
-  ADD ${zzz:-${fee}} ${dot}
-  COPY ${zzz:-${gee}} ${dot}
-  `,
-		map[string]string{
-			"foo": "test1",
-			"bar": "test2",
-			"fff": "test3",
-			"ggg": "test4",
-		})
-
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvironmentReplacementEnv(c *check.C) {
-	// ENV expansions work differently in Windows
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvironmentreplacement"
-
-	_, err := buildImage(name,
-		`
-  FROM busybox
-  ENV foo zzz
-  ENV bar ${foo}
-  ENV abc1='$foo'
-  ENV env1=$foo env2=${foo} env3="$foo" env4="${foo}"
-  RUN [ "$abc1" = '$foo' ] && (echo "$abc1" | grep -q foo)
-  ENV abc2="\$foo"
-  RUN [ "$abc2" = '$foo' ] && (echo "$abc2" | grep -q foo)
-  ENV abc3 '$foo'
-  RUN [ "$abc3" = '$foo' ] && (echo "$abc3" | grep -q foo)
-  ENV abc4 "\$foo"
-  RUN [ "$abc4" = '$foo' ] && (echo "$abc4" | grep -q foo)
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Env")
-
-	envResult := []string{}
-
-	if err = json.Unmarshal([]byte(res), &envResult); err != nil {
-		c.Fatal(err)
-	}
-
-	found := false
-	envCount := 0
-
-	for _, env := range envResult {
-		parts := strings.SplitN(env, "=", 2)
-		if parts[0] == "bar" {
-			found = true
-			if parts[1] != "zzz" {
-				c.Fatalf("Could not find replaced var for env `bar`: got %q instead of `zzz`", parts[1])
-			}
-		} else if strings.HasPrefix(parts[0], "env") {
-			envCount++
-			if parts[1] != "zzz" {
-				c.Fatalf("%s should be 'foo' but instead its %q", parts[0], parts[1])
-			}
-		} else if strings.HasPrefix(parts[0], "env") {
-			envCount++
-			if parts[1] != "foo" {
-				c.Fatalf("%s should be 'foo' but instead its %q", parts[0], parts[1])
-			}
-		}
-	}
-
-	if !found {
-		c.Fatal("Never found the `bar` env variable")
-	}
-
-	if envCount != 4 {
-		c.Fatalf("Didn't find all env vars - only saw %d\n%s", envCount, envResult)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildHandleEscapes(c *check.C) {
-	// The volume paths used in this test are invalid on Windows
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildhandleescapes"
-
-	_, err := buildImage(name,
-		`
-  FROM scratch
-  ENV FOO bar
-  VOLUME ${FOO}
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	var result map[string]map[string]struct{}
-
-	res := inspectFieldJSON(c, name, "Config.Volumes")
-
-	if err = json.Unmarshal([]byte(res), &result); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := result["bar"]; !ok {
-		c.Fatalf("Could not find volume bar set from env foo in volumes table, got %q", result)
-	}
-
-	deleteImages(name)
-
-	_, err = buildImage(name,
-		`
-  FROM scratch
-  ENV FOO bar
-  VOLUME \${FOO}
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res = inspectFieldJSON(c, name, "Config.Volumes")
-
-	if err = json.Unmarshal([]byte(res), &result); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := result["${FOO}"]; !ok {
-		c.Fatalf("Could not find volume ${FOO} set from env foo in volumes table, got %q", result)
-	}
-
-	deleteImages(name)
-
-	// this test in particular provides *7* backslashes and expects 6 to come back.
-	// Like above, the first escape is swallowed and the rest are treated as
-	// literals, this one is just less obvious because of all the character noise.
-
-	_, err = buildImage(name,
-		`
-  FROM scratch
-  ENV FOO bar
-  VOLUME \\\\\\\${FOO}
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res = inspectFieldJSON(c, name, "Config.Volumes")
-
-	if err = json.Unmarshal([]byte(res), &result); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := result[`\\\${FOO}`]; !ok {
-		c.Fatalf(`Could not find volume \\\${FOO} set from env foo in volumes table, got %q`, result)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildOnBuildLowercase(c *check.C) {
-	name := "testbuildonbuildlowercase"
-	name2 := "testbuildonbuildlowercase2"
-
-	_, err := buildImage(name,
-		`
-  FROM busybox
-  onbuild run echo quux
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	_, out, err := buildImageWithOut(name2, fmt.Sprintf(`
-  FROM %s
-  `, name), true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if !strings.Contains(out, "quux") {
-		c.Fatalf("Did not receive the expected echo text, got %s", out)
-	}
-
-	if strings.Contains(out, "ONBUILD ONBUILD") {
-		c.Fatalf("Got an ONBUILD ONBUILD error with no error: got %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvEscapes(c *check.C) {
-	// ENV expansions work differently in Windows
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvescapes"
-	_, err := buildImage(name,
-		`
-    FROM busybox
-    ENV TEST foo
-    CMD echo \$
-    `,
-		true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "-t", name)
-
-	if strings.TrimSpace(out) != "$" {
-		c.Fatalf("Env TEST was not overwritten with bar when foo was supplied to dockerfile: was %q", strings.TrimSpace(out))
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEnvOverwrite(c *check.C) {
-	// ENV expansions work differently in Windows
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvoverwrite"
-
-	_, err := buildImage(name,
-		`
-    FROM busybox
-    ENV TEST foo
-    CMD echo ${TEST}
-    `,
-		true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "-e", "TEST=bar", "-t", name)
-
-	if strings.TrimSpace(out) != "bar" {
-		c.Fatalf("Env TEST was not overwritten with bar when foo was supplied to dockerfile: was %q", strings.TrimSpace(out))
-	}
-
-}
-
-func (s *DockerSuite) TestBuildOnBuildCmdEntrypointJSON(c *check.C) {
-	name1 := "onbuildcmd"
-	name2 := "onbuildgenerated"
-
-	_, err := buildImage(name1, `
-FROM busybox
-ONBUILD CMD ["hello world"]
-ONBUILD ENTRYPOINT ["echo"]
-ONBUILD RUN ["true"]`,
-		false)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	_, err = buildImage(name2, fmt.Sprintf(`FROM %s`, name1), false)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", name2)
-
-	if !regexp.MustCompile(`(?m)^hello world`).MatchString(out) {
-		c.Fatalf("did not get echo output from onbuild. Got: %q", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildOnBuildEntrypointJSON(c *check.C) {
-	name1 := "onbuildcmd"
-	name2 := "onbuildgenerated"
-
-	_, err := buildImage(name1, `
-FROM busybox
-ONBUILD ENTRYPOINT ["echo"]`,
-		false)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	_, err = buildImage(name2, fmt.Sprintf("FROM %s\nCMD [\"hello world\"]\n", name1), false)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", name2)
-
-	if !regexp.MustCompile(`(?m)^hello world`).MatchString(out) {
-		c.Fatal("got malformed output from onbuild", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildCacheAdd(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows doesn't have httpserver image yet
-	name := "testbuildtwoimageswithadd"
-	server, err := fakeStorage(map[string]string{
-		"robots.txt": "hello",
-		"index.html": "world",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	if _, err := buildImage(name,
-		fmt.Sprintf(`FROM scratch
-		ADD %s/robots.txt /`, server.URL()),
-		true); err != nil {
-		c.Fatal(err)
-	}
-	if err != nil {
-		c.Fatal(err)
-	}
-	deleteImages(name)
-	_, out, err := buildImageWithOut(name,
-		fmt.Sprintf(`FROM scratch
-		ADD %s/index.html /`, server.URL()),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.Contains(out, "Using cache") {
-		c.Fatal("2nd build used cache on ADD, it shouldn't")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildLastModified(c *check.C) {
-	name := "testbuildlastmodified"
-
-	server, err := fakeStorage(map[string]string{
-		"file": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	var out, out2 string
-
-	dFmt := `FROM busybox
-ADD %s/file /`
-
-	dockerfile := fmt.Sprintf(dFmt, server.URL())
-
-	if _, _, err = buildImageWithOut(name, dockerfile, false); err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ = dockerCmd(c, "run", name, "ls", "-le", "/file")
-
-	// Build it again and make sure the mtime of the file didn't change.
-	// Wait a few seconds to make sure the time changed enough to notice
-	time.Sleep(2 * time.Second)
-
-	if _, _, err = buildImageWithOut(name, dockerfile, false); err != nil {
-		c.Fatal(err)
-	}
-	out2, _ = dockerCmd(c, "run", name, "ls", "-le", "/file")
-
-	if out != out2 {
-		c.Fatalf("MTime changed:\nOrigin:%s\nNew:%s", out, out2)
-	}
-
-	// Now 'touch' the file and make sure the timestamp DID change this time
-	// Create a new fakeStorage instead of just using Add() to help windows
-	server, err = fakeStorage(map[string]string{
-		"file": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	dockerfile = fmt.Sprintf(dFmt, server.URL())
-
-	if _, _, err = buildImageWithOut(name, dockerfile, false); err != nil {
-		c.Fatal(err)
-	}
-	out2, _ = dockerCmd(c, "run", name, "ls", "-le", "/file")
-
-	if out == out2 {
-		c.Fatalf("MTime didn't change:\nOrigin:%s\nNew:%s", out, out2)
-	}
-
-}
-
-// Regression for https://github.com/docker/docker/pull/27805
-// Makes sure that we don't use the cache if the contents of
-// a file in a subfolder of the context is modified and we re-build.
-func (s *DockerSuite) TestBuildModifyFileInFolder(c *check.C) {
-	name := "testbuildmodifyfileinfolder"
-
-	ctx, err := fakeContext(`FROM busybox
-RUN ["mkdir", "/test"]
-ADD folder/file /test/changetarget`,
-		map[string]string{})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if err := ctx.Add("folder/file", "first"); err != nil {
-		c.Fatal(err)
-	}
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if err := ctx.Add("folder/file", "second"); err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("cache was used even though file contents in folder was changed")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddSingleFileToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddimg"
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio /exists
-ADD test_file /
-RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_file | awk '{print $1}') = '%s' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expectedFileChmod),
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Issue #3960: "ADD src ." hangs
-func (s *DockerSuite) TestBuildAddSingleFileToWorkdir(c *check.C) {
-	name := "testaddsinglefiletoworkdir"
-	ctx, err := fakeContext(`FROM busybox
-ADD test_file .`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	errChan := make(chan error)
-	go func() {
-		_, err := buildImageFromContext(name, ctx, true)
-		errChan <- err
-		close(errChan)
-	}()
-	select {
-	case <-time.After(15 * time.Second):
-		c.Fatal("Build with adding to workdir timed out")
-	case err := <-errChan:
-		c.Assert(err, check.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddSingleFileToExistDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddsinglefiletoexistdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN mkdir /exists
-RUN touch /exists/exists_file
-RUN chown -R dockerio.dockerio /exists
-ADD test_file /exists/
-RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyAddMultipleFiles(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	server, err := fakeStorage(map[string]string{
-		"robots.txt": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	name := "testcopymultiplefilestofile"
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN mkdir /exists
-RUN touch /exists/exists_file
-RUN chown -R dockerio.dockerio /exists
-COPY test_file1 test_file2 /exists/
-ADD test_file3 test_file4 %s/robots.txt /exists/
-RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/test_file1 | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists/test_file2 | awk '{print $3":"$4}') = 'root:root' ]
-
-RUN [ $(ls -l /exists/test_file3 | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists/test_file4 | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists/robots.txt | awk '{print $3":"$4}') = 'root:root' ]
-
-RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-`, server.URL()),
-		map[string]string{
-			"test_file1": "test1",
-			"test_file2": "test2",
-			"test_file3": "test3",
-			"test_file4": "test4",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// This test is mainly for user namespaces to verify that new directories
-// are created as the remapped root uid/gid pair
-func (s *DockerSuite) TestBuildAddToNewDestination(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddtonewdest"
-	ctx, err := fakeContext(`FROM busybox
-ADD . /new_dir
-RUN ls -l /
-RUN [ $(ls -l / | grep new_dir | awk '{print $3":"$4}') = 'root:root' ]`,
-		map[string]string{
-			"test_dir/test_file": "test file",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// This test is mainly for user namespaces to verify that new directories
-// are created as the remapped root uid/gid pair
-func (s *DockerSuite) TestBuildCopyToNewParentDirectory(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopytonewdir"
-	ctx, err := fakeContext(`FROM busybox
-COPY test_dir /new_dir
-RUN ls -l /new_dir
-RUN [ $(ls -l / | grep new_dir | awk '{print $3":"$4}') = 'root:root' ]`,
-		map[string]string{
-			"test_dir/test_file": "test file",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// This test is mainly for user namespaces to verify that new directories
-// are created as the remapped root uid/gid pair
-func (s *DockerSuite) TestBuildWorkdirIsContainerRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testworkdirownership"
-	if _, err := buildImage(name, `FROM busybox
-WORKDIR /new_dir
-RUN ls -l /
-RUN [ $(ls -l / | grep new_dir | awk '{print $3":"$4}') = 'root:root' ]`, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddFileWithWhitespace(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Not currently passing on Windows
-	name := "testaddfilewithwhitespace"
-	ctx, err := fakeContext(`FROM busybox
-RUN mkdir "/test dir"
-RUN mkdir "/test_dir"
-ADD [ "test file1", "/test_file1" ]
-ADD [ "test_file2", "/test file2" ]
-ADD [ "test file3", "/test file3" ]
-ADD [ "test dir/test_file4", "/test_dir/test_file4" ]
-ADD [ "test_dir/test_file5", "/test dir/test_file5" ]
-ADD [ "test dir/test_file6", "/test dir/test_file6" ]
-RUN [ $(cat "/test_file1") = 'test1' ]
-RUN [ $(cat "/test file2") = 'test2' ]
-RUN [ $(cat "/test file3") = 'test3' ]
-RUN [ $(cat "/test_dir/test_file4") = 'test4' ]
-RUN [ $(cat "/test dir/test_file5") = 'test5' ]
-RUN [ $(cat "/test dir/test_file6") = 'test6' ]`,
-		map[string]string{
-			"test file1":          "test1",
-			"test_file2":          "test2",
-			"test file3":          "test3",
-			"test dir/test_file4": "test4",
-			"test_dir/test_file5": "test5",
-			"test dir/test_file6": "test6",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyFileWithWhitespace(c *check.C) {
-	dockerfile := `FROM busybox
-RUN mkdir "/test dir"
-RUN mkdir "/test_dir"
-COPY [ "test file1", "/test_file1" ]
-COPY [ "test_file2", "/test file2" ]
-COPY [ "test file3", "/test file3" ]
-COPY [ "test dir/test_file4", "/test_dir/test_file4" ]
-COPY [ "test_dir/test_file5", "/test dir/test_file5" ]
-COPY [ "test dir/test_file6", "/test dir/test_file6" ]
-RUN [ $(cat "/test_file1") = 'test1' ]
-RUN [ $(cat "/test file2") = 'test2' ]
-RUN [ $(cat "/test file3") = 'test3' ]
-RUN [ $(cat "/test_dir/test_file4") = 'test4' ]
-RUN [ $(cat "/test dir/test_file5") = 'test5' ]
-RUN [ $(cat "/test dir/test_file6") = 'test6' ]`
-
-	if daemonPlatform == "windows" {
-		dockerfile = `FROM ` + WindowsBaseImage + `
-RUN mkdir "C:/test dir"
-RUN mkdir "C:/test_dir"
-COPY [ "test file1", "/test_file1" ]
-COPY [ "test_file2", "/test file2" ]
-COPY [ "test file3", "/test file3" ]
-COPY [ "test dir/test_file4", "/test_dir/test_file4" ]
-COPY [ "test_dir/test_file5", "/test dir/test_file5" ]
-COPY [ "test dir/test_file6", "/test dir/test_file6" ]
-RUN find "test1" "C:/test_file1"
-RUN find "test2" "C:/test file2"
-RUN find "test3" "C:/test file3"
-RUN find "test4" "C:/test_dir/test_file4"
-RUN find "test5" "C:/test dir/test_file5"
-RUN find "test6" "C:/test dir/test_file6"`
-	}
-
-	name := "testcopyfilewithwhitespace"
-	ctx, err := fakeContext(dockerfile,
-		map[string]string{
-			"test file1":          "test1",
-			"test_file2":          "test2",
-			"test file3":          "test3",
-			"test dir/test_file4": "test4",
-			"test_dir/test_file5": "test5",
-			"test dir/test_file6": "test6",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyWildcard(c *check.C) {
-	name := "testcopywildcard"
-	server, err := fakeStorage(map[string]string{
-		"robots.txt": "hello",
-		"index.html": "world",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-	COPY file*.txt /tmp/
-	RUN ls /tmp/file1.txt /tmp/file2.txt
-	RUN [ "mkdir",  "/tmp1" ]
-	COPY dir* /tmp1/
-	RUN ls /tmp1/dirt /tmp1/nested_file /tmp1/nested_dir/nest_nest_file
-	RUN [ "mkdir",  "/tmp2" ]
-        ADD dir/*dir %s/robots.txt /tmp2/
-	RUN ls /tmp2/nest_nest_file /tmp2/robots.txt
-	`, server.URL()),
-		map[string]string{
-			"file1.txt":                     "test1",
-			"file2.txt":                     "test2",
-			"dir/nested_file":               "nested file",
-			"dir/nested_dir/nest_nest_file": "2 times nested",
-			"dirt": "dirty",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Now make sure we use a cache the 2nd time
-	id2, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if id1 != id2 {
-		c.Fatal("didn't use the cache")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildCopyWildcardInName(c *check.C) {
-	name := "testcopywildcardinname"
-	ctx, err := fakeContext(`FROM busybox
-	COPY *.txt /tmp/
-	RUN [ "$(cat /tmp/\*.txt)" = 'hi there' ]
-	`, map[string]string{"*.txt": "hi there"})
-
-	if err != nil {
-		// Normally we would do c.Fatal(err) here but given that
-		// the odds of this failing are so rare, it must be because
-		// the OS we're running the client on doesn't support * in
-		// filenames (like windows).  So, instead of failing the test
-		// just let it pass. Then we don't need to explicitly
-		// say which OSs this works on or not.
-		return
-	}
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatalf("should have built: %q", err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyWildcardCache(c *check.C) {
-	name := "testcopywildcardcache"
-	ctx, err := fakeContext(`FROM busybox
-	COPY file1.txt /tmp/`,
-		map[string]string{
-			"file1.txt": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Now make sure we use a cache the 2nd time even with wild cards.
-	// Use the same context so the file is the same and the checksum will match
-	ctx.Add("Dockerfile", `FROM busybox
-	COPY file*.txt /tmp/`)
-
-	id2, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if id1 != id2 {
-		c.Fatal("didn't use the cache")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildAddSingleFileToNonExistingDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddsinglefiletononexistingdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio /exists
-ADD test_file /test_dir/
-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildAddDirContentToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testadddircontenttoroot"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio exists
-ADD test_dir /
-RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddDirContentToExistingDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testadddircontenttoexistingdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN mkdir /exists
-RUN touch /exists/exists_file
-RUN chown -R dockerio.dockerio /exists
-ADD test_dir/ /exists/
-RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddWholeDirToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddwholedirtoroot"
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio exists
-ADD test_dir /test_dir
-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '%s' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expectedFileChmod),
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Testing #5941
-func (s *DockerSuite) TestBuildAddEtcToRoot(c *check.C) {
-	name := "testaddetctoroot"
-
-	ctx, err := fakeContext(`FROM `+minimalBaseImage()+`
-ADD . /`,
-		map[string]string{
-			"etc/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Testing #9401
-func (s *DockerSuite) TestBuildAddPreservesFilesSpecialBits(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testaddpreservesfilesspecialbits"
-	ctx, err := fakeContext(`FROM busybox
-ADD suidbin /usr/bin/suidbin
-RUN chmod 4755 /usr/bin/suidbin
-RUN [ $(ls -l /usr/bin/suidbin | awk '{print $1}') = '-rwsr-xr-x' ]
-ADD ./data/ /
-RUN [ $(ls -l /usr/bin/suidbin | awk '{print $1}') = '-rwsr-xr-x' ]`,
-		map[string]string{
-			"suidbin":             "suidbin",
-			"/data/usr/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopySingleFileToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopysinglefiletoroot"
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio /exists
-COPY test_file /
-RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_file | awk '{print $1}') = '%s' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expectedFileChmod),
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Issue #3960: "ADD src ." hangs - adapted for COPY
-func (s *DockerSuite) TestBuildCopySingleFileToWorkdir(c *check.C) {
-	name := "testcopysinglefiletoworkdir"
-	ctx, err := fakeContext(`FROM busybox
-COPY test_file .`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	errChan := make(chan error)
-	go func() {
-		_, err := buildImageFromContext(name, ctx, true)
-		errChan <- err
-		close(errChan)
-	}()
-	select {
-	case <-time.After(15 * time.Second):
-		c.Fatal("Build with adding to workdir timed out")
-	case err := <-errChan:
-		c.Assert(err, check.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopySingleFileToExistDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopysinglefiletoexistdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN mkdir /exists
-RUN touch /exists/exists_file
-RUN chown -R dockerio.dockerio /exists
-COPY test_file /exists/
-RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopySingleFileToNonExistDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopysinglefiletononexistdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio /exists
-COPY test_file /test_dir/
-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyDirContentToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopydircontenttoroot"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio exists
-COPY test_dir /
-RUN [ $(ls -l /test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`,
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyDirContentToExistDir(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopydircontenttoexistdir"
-	ctx, err := fakeContext(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN mkdir /exists
-RUN touch /exists/exists_file
-RUN chown -R dockerio.dockerio /exists
-COPY test_dir/ /exists/
-RUN [ $(ls -l / | grep exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/exists_file | awk '{print $3":"$4}') = 'dockerio:dockerio' ]
-RUN [ $(ls -l /exists/test_file | awk '{print $3":"$4}') = 'root:root' ]`,
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyWholeDirToRoot(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Linux specific test
-	name := "testcopywholedirtoroot"
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-RUN echo 'dockerio:x:1001:' >> /etc/group
-RUN touch /exists
-RUN chown dockerio.dockerio exists
-COPY test_dir /test_dir
-RUN [ $(ls -l / | grep test_dir | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l / | grep test_dir | awk '{print $1}') = 'drwxr-xr-x' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $3":"$4}') = 'root:root' ]
-RUN [ $(ls -l /test_dir/test_file | awk '{print $1}') = '%s' ]
-RUN [ $(ls -l /exists | awk '{print $3":"$4}') = 'dockerio:dockerio' ]`, expectedFileChmod),
-		map[string]string{
-			"test_dir/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyEtcToRoot(c *check.C) {
-	name := "testcopyetctoroot"
-
-	ctx, err := fakeContext(`FROM `+minimalBaseImage()+`
-COPY . /`,
-		map[string]string{
-			"etc/test_file": "test1",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddBadLinks(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Not currently working on Windows
-
-	dockerfile := `
-		FROM scratch
-		ADD links.tar /
-		ADD foo.txt /symlink/
-		`
-	targetFile := "foo.txt"
-	var (
-		name = "test-link-absolute"
-	)
-	ctx, err := fakeContext(dockerfile, nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	tempDir, err := ioutil.TempDir("", "test-link-absolute-temp-")
-	if err != nil {
-		c.Fatalf("failed to create temporary directory: %s", tempDir)
-	}
-	defer os.RemoveAll(tempDir)
-
-	var symlinkTarget string
-	if runtime.GOOS == "windows" {
-		var driveLetter string
-		if abs, err := filepath.Abs(tempDir); err != nil {
-			c.Fatal(err)
-		} else {
-			driveLetter = abs[:1]
-		}
-		tempDirWithoutDrive := tempDir[2:]
-		symlinkTarget = fmt.Sprintf(`%s:\..\..\..\..\..\..\..\..\..\..\..\..%s`, driveLetter, tempDirWithoutDrive)
-	} else {
-		symlinkTarget = fmt.Sprintf("/../../../../../../../../../../../..%s", tempDir)
-	}
-
-	tarPath := filepath.Join(ctx.Dir, "links.tar")
-	nonExistingFile := filepath.Join(tempDir, targetFile)
-	fooPath := filepath.Join(ctx.Dir, targetFile)
-
-	tarOut, err := os.Create(tarPath)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	tarWriter := tar.NewWriter(tarOut)
-
-	header := &tar.Header{
-		Name:     "symlink",
-		Typeflag: tar.TypeSymlink,
-		Linkname: symlinkTarget,
-		Mode:     0755,
-		Uid:      0,
-		Gid:      0,
-	}
-
-	err = tarWriter.WriteHeader(header)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	tarWriter.Close()
-	tarOut.Close()
-
-	foo, err := os.Create(fooPath)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer foo.Close()
-
-	if _, err := foo.WriteString("test"); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := os.Stat(nonExistingFile); err == nil || err != nil && !os.IsNotExist(err) {
-		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildAddBadLinksVolume(c *check.C) {
-	testRequires(c, DaemonIsLinux) // ln not implemented on Windows busybox
-	const (
-		dockerfileTemplate = `
-		FROM busybox
-		RUN ln -s /../../../../../../../../%s /x
-		VOLUME /x
-		ADD foo.txt /x/`
-		targetFile = "foo.txt"
-	)
-	var (
-		name       = "test-link-absolute-volume"
-		dockerfile = ""
-	)
-
-	tempDir, err := ioutil.TempDir("", "test-link-absolute-volume-temp-")
-	if err != nil {
-		c.Fatalf("failed to create temporary directory: %s", tempDir)
-	}
-	defer os.RemoveAll(tempDir)
-
-	dockerfile = fmt.Sprintf(dockerfileTemplate, tempDir)
-	nonExistingFile := filepath.Join(tempDir, targetFile)
-
-	ctx, err := fakeContext(dockerfile, nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	fooPath := filepath.Join(ctx.Dir, targetFile)
-
-	foo, err := os.Create(fooPath)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer foo.Close()
-
-	if _, err := foo.WriteString("test"); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := os.Stat(nonExistingFile); err == nil || err != nil && !os.IsNotExist(err) {
-		c.Fatalf("%s shouldn't have been written and it shouldn't exist", nonExistingFile)
-	}
-
-}
-
-// Issue #5270 - ensure we throw a better error than "unexpected EOF"
-// when we can't access files in the context.
-func (s *DockerSuite) TestBuildWithInaccessibleFilesInContext(c *check.C) {
-	testRequires(c, DaemonIsLinux, UnixCli) // test uses chown/chmod: not available on windows
-
-	{
-		name := "testbuildinaccessiblefiles"
-		ctx, err := fakeContext("FROM scratch\nADD . /foo/", map[string]string{"fileWithoutReadAccess": "foo"})
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-		// This is used to ensure we detect inaccessible files early during build in the cli client
-		pathToFileWithoutReadAccess := filepath.Join(ctx.Dir, "fileWithoutReadAccess")
-
-		if err = os.Chown(pathToFileWithoutReadAccess, 0, 0); err != nil {
-			c.Fatalf("failed to chown file to root: %s", err)
-		}
-		if err = os.Chmod(pathToFileWithoutReadAccess, 0700); err != nil {
-			c.Fatalf("failed to chmod file to 700: %s", err)
-		}
-		buildCmd := exec.Command("su", "unprivilegeduser", "-c", fmt.Sprintf("%s build -t %s .", dockerBinary, name))
-		buildCmd.Dir = ctx.Dir
-		out, _, err := runCommandWithOutput(buildCmd)
-		if err == nil {
-			c.Fatalf("build should have failed: %s %s", err, out)
-		}
-
-		// check if we've detected the failure before we started building
-		if !strings.Contains(out, "no permission to read from ") {
-			c.Fatalf("output should've contained the string: no permission to read from but contained: %s", out)
-		}
-
-		if !strings.Contains(out, "Error checking context") {
-			c.Fatalf("output should've contained the string: Error checking context")
-		}
-	}
-	{
-		name := "testbuildinaccessibledirectory"
-		ctx, err := fakeContext("FROM scratch\nADD . /foo/", map[string]string{"directoryWeCantStat/bar": "foo"})
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-		// This is used to ensure we detect inaccessible directories early during build in the cli client
-		pathToDirectoryWithoutReadAccess := filepath.Join(ctx.Dir, "directoryWeCantStat")
-		pathToFileInDirectoryWithoutReadAccess := filepath.Join(pathToDirectoryWithoutReadAccess, "bar")
-
-		if err = os.Chown(pathToDirectoryWithoutReadAccess, 0, 0); err != nil {
-			c.Fatalf("failed to chown directory to root: %s", err)
-		}
-		if err = os.Chmod(pathToDirectoryWithoutReadAccess, 0444); err != nil {
-			c.Fatalf("failed to chmod directory to 444: %s", err)
-		}
-		if err = os.Chmod(pathToFileInDirectoryWithoutReadAccess, 0700); err != nil {
-			c.Fatalf("failed to chmod file to 700: %s", err)
-		}
-
-		buildCmd := exec.Command("su", "unprivilegeduser", "-c", fmt.Sprintf("%s build -t %s .", dockerBinary, name))
-		buildCmd.Dir = ctx.Dir
-		out, _, err := runCommandWithOutput(buildCmd)
-		if err == nil {
-			c.Fatalf("build should have failed: %s %s", err, out)
-		}
-
-		// check if we've detected the failure before we started building
-		if !strings.Contains(out, "can't stat") {
-			c.Fatalf("output should've contained the string: can't access %s", out)
-		}
-
-		if !strings.Contains(out, "Error checking context") {
-			c.Fatalf("output should've contained the string: Error checking context\ngot:%s", out)
-		}
-
-	}
-	{
-		name := "testlinksok"
-		ctx, err := fakeContext("FROM scratch\nADD . /foo/", nil)
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-
-		target := "../../../../../../../../../../../../../../../../../../../azA"
-		if err := os.Symlink(filepath.Join(ctx.Dir, "g"), target); err != nil {
-			c.Fatal(err)
-		}
-		defer os.Remove(target)
-		// This is used to ensure we don't follow links when checking if everything in the context is accessible
-		// This test doesn't require that we run commands as an unprivileged user
-		if _, err := buildImageFromContext(name, ctx, true); err != nil {
-			c.Fatal(err)
-		}
-	}
-	{
-		name := "testbuildignoredinaccessible"
-		ctx, err := fakeContext("FROM scratch\nADD . /foo/",
-			map[string]string{
-				"directoryWeCantStat/bar": "foo",
-				".dockerignore":           "directoryWeCantStat",
-			})
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-		// This is used to ensure we don't try to add inaccessible files when they are ignored by a .dockerignore pattern
-		pathToDirectoryWithoutReadAccess := filepath.Join(ctx.Dir, "directoryWeCantStat")
-		pathToFileInDirectoryWithoutReadAccess := filepath.Join(pathToDirectoryWithoutReadAccess, "bar")
-		if err = os.Chown(pathToDirectoryWithoutReadAccess, 0, 0); err != nil {
-			c.Fatalf("failed to chown directory to root: %s", err)
-		}
-		if err = os.Chmod(pathToDirectoryWithoutReadAccess, 0444); err != nil {
-			c.Fatalf("failed to chmod directory to 444: %s", err)
-		}
-		if err = os.Chmod(pathToFileInDirectoryWithoutReadAccess, 0700); err != nil {
-			c.Fatalf("failed to chmod file to 700: %s", err)
-		}
-
-		result := icmd.RunCmd(icmd.Cmd{
-			Dir: ctx.Dir,
-			Command: []string{"su", "unprivilegeduser", "-c",
-				fmt.Sprintf("%s build -t %s .", dockerBinary, name)},
-		})
-		result.Assert(c, icmd.Expected{})
-	}
-}
-
-func (s *DockerSuite) TestBuildForceRm(c *check.C) {
-	containerCountBefore, err := getContainerCount()
-	if err != nil {
-		c.Fatalf("failed to get the container count: %s", err)
-	}
-	name := "testbuildforcerm"
-
-	ctx, err := fakeContext(`FROM `+minimalBaseImage()+`
-	RUN true
-	RUN thiswillfail`, nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	dockerCmdInDir(c, ctx.Dir, "build", "-t", name, "--force-rm", ".")
-
-	containerCountAfter, err := getContainerCount()
-	if err != nil {
-		c.Fatalf("failed to get the container count: %s", err)
-	}
-
-	if containerCountBefore != containerCountAfter {
-		c.Fatalf("--force-rm shouldn't have left containers behind")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildRm(c *check.C) {
-	name := "testbuildrm"
-
-	ctx, err := fakeContext(`FROM `+minimalBaseImage()+`
-	ADD foo /
-	ADD foo /`, map[string]string{"foo": "bar"})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	{
-		containerCountBefore, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "--rm", "-t", name, ".")
-
-		if err != nil {
-			c.Fatal("failed to build the image", out)
-		}
-
-		containerCountAfter, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		if containerCountBefore != containerCountAfter {
-			c.Fatalf("-rm shouldn't have left containers behind")
-		}
-		deleteImages(name)
-	}
-
-	{
-		containerCountBefore, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-t", name, ".")
-
-		if err != nil {
-			c.Fatal("failed to build the image", out)
-		}
-
-		containerCountAfter, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		if containerCountBefore != containerCountAfter {
-			c.Fatalf("--rm shouldn't have left containers behind")
-		}
-		deleteImages(name)
-	}
-
-	{
-		containerCountBefore, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "--rm=false", "-t", name, ".")
-
-		if err != nil {
-			c.Fatal("failed to build the image", out)
-		}
-
-		containerCountAfter, err := getContainerCount()
-		if err != nil {
-			c.Fatalf("failed to get the container count: %s", err)
-		}
-
-		if containerCountBefore == containerCountAfter {
-			c.Fatalf("--rm=false should have left containers behind")
-		}
-		deleteImages(name)
-
-	}
-
-}
-
-func (s *DockerSuite) TestBuildWithVolumes(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Invalid volume paths on Windows
-	var (
-		result   map[string]map[string]struct{}
-		name     = "testbuildvolumes"
-		emptyMap = make(map[string]struct{})
-		expected = map[string]map[string]struct{}{
-			"/test1":  emptyMap,
-			"/test2":  emptyMap,
-			"/test3":  emptyMap,
-			"/test4":  emptyMap,
-			"/test5":  emptyMap,
-			"/test6":  emptyMap,
-			"[/test7": emptyMap,
-			"/test8]": emptyMap,
-		}
-	)
-	_, err := buildImage(name,
-		`FROM scratch
-		VOLUME /test1
-		VOLUME /test2
-    VOLUME /test3 /test4
-    VOLUME ["/test5", "/test6"]
-    VOLUME [/test7 /test8]
-    `,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.Volumes")
-
-	err = json.Unmarshal([]byte(res), &result)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	equal := reflect.DeepEqual(&result, &expected)
-
-	if !equal {
-		c.Fatalf("Volumes %s, expected %s", result, expected)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildMaintainer(c *check.C) {
-	name := "testbuildmaintainer"
-
-	expected := "dockerio"
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Author")
-	if res != expected {
-		c.Fatalf("Maintainer %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildUser(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuilduser"
-	expected := "dockerio"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-		USER dockerio
-		RUN [ $(whoami) = 'dockerio' ]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.User")
-	if res != expected {
-		c.Fatalf("User %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildRelativeWorkdir(c *check.C) {
-	name := "testbuildrelativeworkdir"
-
-	var (
-		expected1     string
-		expected2     string
-		expected3     string
-		expected4     string
-		expectedFinal string
-	)
-
-	if daemonPlatform == "windows" {
-		expected1 = `C:/`
-		expected2 = `C:/test1`
-		expected3 = `C:/test2`
-		expected4 = `C:/test2/test3`
-		expectedFinal = `C:\test2\test3` // Note inspect is going to return Windows paths, as it's not in busybox
-	} else {
-		expected1 = `/`
-		expected2 = `/test1`
-		expected3 = `/test2`
-		expected4 = `/test2/test3`
-		expectedFinal = `/test2/test3`
-	}
-
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN sh -c "[ "$PWD" = "`+expected1+`" ]"
-		WORKDIR test1
-		RUN sh -c "[ "$PWD" = "`+expected2+`" ]"
-		WORKDIR /test2
-		RUN sh -c "[ "$PWD" = "`+expected3+`" ]"
-		WORKDIR test3
-		RUN sh -c "[ "$PWD" = "`+expected4+`" ]"`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.WorkingDir")
-	if res != expectedFinal {
-		c.Fatalf("Workdir %s, expected %s", res, expectedFinal)
-	}
-}
-
-// #22181 Regression test. Single end-to-end test of using
-// Windows semantics. Most path handling verifications are in unit tests
-func (s *DockerSuite) TestBuildWindowsWorkdirProcessing(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildwindowsworkdirprocessing"
-	_, err := buildImage(name,
-		`FROM busybox
-		WORKDIR C:\\foo
-		WORKDIR bar
-		RUN sh -c "[ "$PWD" = "C:/foo/bar" ]"
-		`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-// #22181 Regression test. Most paths handling verifications are in unit test.
-// One functional test for end-to-end
-func (s *DockerSuite) TestBuildWindowsAddCopyPathProcessing(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildwindowsaddcopypathprocessing"
-	// TODO Windows (@jhowardmsft). Needs a follow-up PR to 22181 to
-	// support backslash such as .\\ being equivalent to ./ and c:\\ being
-	// equivalent to c:/. This is not currently (nor ever has been) supported
-	// by docker on the Windows platform.
-	dockerfile := `
-		FROM busybox
-			# No trailing slash on COPY/ADD
-			# Results in dir being changed to a file
-			WORKDIR /wc1
-			COPY wc1 c:/wc1
-			WORKDIR /wc2
-			ADD wc2 c:/wc2
-			WORKDIR c:/
-			RUN sh -c "[ $(cat c:/wc1/wc1) = 'hellowc1' ]"
-			RUN sh -c "[ $(cat c:/wc2/wc2) = 'worldwc2' ]"
-
-			# Trailing slash on COPY/ADD, Windows-style path.
-			WORKDIR /wd1
-			COPY wd1 c:/wd1/
-			WORKDIR /wd2
-			ADD wd2 c:/wd2/
-			RUN sh -c "[ $(cat c:/wd1/wd1) = 'hellowd1' ]"
-			RUN sh -c "[ $(cat c:/wd2/wd2) = 'worldwd2' ]"
-			`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"wc1": "hellowc1",
-		"wc2": "worldwc2",
-		"wd1": "hellowd1",
-		"wd2": "worldwd2",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	_, err = buildImageFromContext(name, ctx, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildWorkdirWithEnvVariables(c *check.C) {
-	name := "testbuildworkdirwithenvvariables"
-
-	var expected string
-	if daemonPlatform == "windows" {
-		expected = `C:\test1\test2`
-	} else {
-		expected = `/test1/test2`
-	}
-
-	_, err := buildImage(name,
-		`FROM busybox
-		ENV DIRPATH /test1
-		ENV SUBDIRNAME test2
-		WORKDIR $DIRPATH
-		WORKDIR $SUBDIRNAME/$MISSING_VAR`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.WorkingDir")
-	if res != expected {
-		c.Fatalf("Workdir %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildRelativeCopy(c *check.C) {
-	// cat /test1/test2/foo gets permission denied for the user
-	testRequires(c, NotUserNamespace)
-
-	var expected string
-	if daemonPlatform == "windows" {
-		expected = `C:/test1/test2`
-	} else {
-		expected = `/test1/test2`
-	}
-
-	name := "testbuildrelativecopy"
-	dockerfile := `
-		FROM busybox
-			WORKDIR /test1
-			WORKDIR test2
-			RUN sh -c "[ "$PWD" = '` + expected + `' ]"
-			COPY foo ./
-			RUN sh -c "[ $(cat /test1/test2/foo) = 'hello' ]"
-			ADD foo ./bar/baz
-			RUN sh -c "[ $(cat /test1/test2/bar/baz) = 'hello' ]"
-			COPY foo ./bar/baz2
-			RUN sh -c "[ $(cat /test1/test2/bar/baz2) = 'hello' ]"
-			WORKDIR ..
-			COPY foo ./
-			RUN sh -c "[ $(cat /test1/foo) = 'hello' ]"
-			COPY foo /test3/
-			RUN sh -c "[ $(cat /test3/foo) = 'hello' ]"
-			WORKDIR /test4
-			COPY . .
-			RUN sh -c "[ $(cat /test4/foo) = 'hello' ]"
-			WORKDIR /test5/test6
-			COPY foo ../
-			RUN sh -c "[ $(cat /test5/foo) = 'hello' ]"
-			`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	_, err = buildImageFromContext(name, ctx, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildBlankName(c *check.C) {
-	name := "testbuildblankname"
-	_, _, stderr, err := buildImageWithStdoutStderr(name,
-		`FROM busybox
-		ENV =`,
-		true)
-	if err == nil {
-		c.Fatal("Build was supposed to fail but didn't")
-	}
-	if !strings.Contains(stderr, "ENV names can not be blank") {
-		c.Fatalf("Missing error message, got: %s", stderr)
-	}
-
-	_, _, stderr, err = buildImageWithStdoutStderr(name,
-		`FROM busybox
-		LABEL =`,
-		true)
-	if err == nil {
-		c.Fatal("Build was supposed to fail but didn't")
-	}
-	if !strings.Contains(stderr, "LABEL names can not be blank") {
-		c.Fatalf("Missing error message, got: %s", stderr)
-	}
-
-	_, _, stderr, err = buildImageWithStdoutStderr(name,
-		`FROM busybox
-		ARG =foo`,
-		true)
-	if err == nil {
-		c.Fatal("Build was supposed to fail but didn't")
-	}
-	if !strings.Contains(stderr, "ARG names can not be blank") {
-		c.Fatalf("Missing error message, got: %s", stderr)
-	}
-}
-
-func (s *DockerSuite) TestBuildEnv(c *check.C) {
-	testRequires(c, DaemonIsLinux) // ENV expansion is different in Windows
-	name := "testbuildenv"
-	expected := "[PATH=/test:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PORT=2375]"
-	_, err := buildImage(name,
-		`FROM busybox
-		ENV PATH /test:$PATH
-        ENV PORT 2375
-		RUN [ $(env | grep PORT) = 'PORT=2375' ]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Env")
-	if res != expected {
-		c.Fatalf("Env %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildPATH(c *check.C) {
-	testRequires(c, DaemonIsLinux) // ENV expansion is different in Windows
-
-	defPath := "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-	fn := func(dockerfile string, exp string) {
-		_, err := buildImage("testbldpath", dockerfile, true)
-		c.Assert(err, check.IsNil)
-
-		res := inspectField(c, "testbldpath", "Config.Env")
-
-		if res != exp {
-			c.Fatalf("Env %q, expected %q for dockerfile:%q", res, exp, dockerfile)
-		}
-	}
-
-	tests := []struct{ dockerfile, exp string }{
-		{"FROM scratch\nMAINTAINER me", "[PATH=" + defPath + "]"},
-		{"FROM busybox\nMAINTAINER me", "[PATH=" + defPath + "]"},
-		{"FROM scratch\nENV FOO=bar", "[PATH=" + defPath + " FOO=bar]"},
-		{"FROM busybox\nENV FOO=bar", "[PATH=" + defPath + " FOO=bar]"},
-		{"FROM scratch\nENV PATH=/test", "[PATH=/test]"},
-		{"FROM busybox\nENV PATH=/test", "[PATH=/test]"},
-		{"FROM scratch\nENV PATH=''", "[PATH=]"},
-		{"FROM busybox\nENV PATH=''", "[PATH=]"},
-	}
-
-	for _, test := range tests {
-		fn(test.dockerfile, test.exp)
-	}
-}
-
-func (s *DockerSuite) TestBuildContextCleanup(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	name := "testbuildcontextcleanup"
-	entries, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))
-	if err != nil {
-		c.Fatalf("failed to list contents of tmp dir: %s", err)
-	}
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	entriesFinal, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))
-	if err != nil {
-		c.Fatalf("failed to list contents of tmp dir: %s", err)
-	}
-	if err = compareDirectoryEntries(entries, entriesFinal); err != nil {
-		c.Fatalf("context should have been deleted, but wasn't")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildContextCleanupFailedBuild(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	name := "testbuildcontextcleanup"
-	entries, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))
-	if err != nil {
-		c.Fatalf("failed to list contents of tmp dir: %s", err)
-	}
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage()+`
-	RUN /non/existing/command`,
-		true)
-	if err == nil {
-		c.Fatalf("expected build to fail, but it didn't")
-	}
-	entriesFinal, err := ioutil.ReadDir(filepath.Join(dockerBasePath, "tmp"))
-	if err != nil {
-		c.Fatalf("failed to list contents of tmp dir: %s", err)
-	}
-	if err = compareDirectoryEntries(entries, entriesFinal); err != nil {
-		c.Fatalf("context should have been deleted, but wasn't")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildCmd(c *check.C) {
-	name := "testbuildcmd"
-
-	expected := "[/bin/echo Hello World]"
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        CMD ["/bin/echo", "Hello World"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Cmd")
-	if res != expected {
-		c.Fatalf("Cmd %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildExpose(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	name := "testbuildexpose"
-	expected := "map[2375/tcp:{}]"
-	_, err := buildImage(name,
-		`FROM scratch
-        EXPOSE 2375`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.ExposedPorts")
-	if res != expected {
-		c.Fatalf("Exposed ports %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildExposeMorePorts(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	// start building docker file with a large number of ports
-	portList := make([]string, 50)
-	line := make([]string, 100)
-	expectedPorts := make([]int, len(portList)*len(line))
-	for i := 0; i < len(portList); i++ {
-		for j := 0; j < len(line); j++ {
-			p := i*len(line) + j + 1
-			line[j] = strconv.Itoa(p)
-			expectedPorts[p-1] = p
-		}
-		if i == len(portList)-1 {
-			portList[i] = strings.Join(line, " ")
-		} else {
-			portList[i] = strings.Join(line, " ") + ` \`
-		}
-	}
-
-	dockerfile := `FROM scratch
-	EXPOSE {{range .}} {{.}}
-	{{end}}`
-	tmpl := template.Must(template.New("dockerfile").Parse(dockerfile))
-	buf := bytes.NewBuffer(nil)
-	tmpl.Execute(buf, portList)
-
-	name := "testbuildexpose"
-	_, err := buildImage(name, buf.String(), true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// check if all the ports are saved inside Config.ExposedPorts
-	res := inspectFieldJSON(c, name, "Config.ExposedPorts")
-	var exposedPorts map[string]interface{}
-	if err := json.Unmarshal([]byte(res), &exposedPorts); err != nil {
-		c.Fatal(err)
-	}
-
-	for _, p := range expectedPorts {
-		ep := fmt.Sprintf("%d/tcp", p)
-		if _, ok := exposedPorts[ep]; !ok {
-			c.Errorf("Port(%s) is not exposed", ep)
-		} else {
-			delete(exposedPorts, ep)
-		}
-	}
-	if len(exposedPorts) != 0 {
-		c.Errorf("Unexpected extra exposed ports %v", exposedPorts)
-	}
-}
-
-func (s *DockerSuite) TestBuildExposeOrder(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	buildID := func(name, exposed string) string {
-		_, err := buildImage(name, fmt.Sprintf(`FROM scratch
-		EXPOSE %s`, exposed), true)
-		if err != nil {
-			c.Fatal(err)
-		}
-		id := inspectField(c, name, "Id")
-		return id
-	}
-
-	id1 := buildID("testbuildexpose1", "80 2375")
-	id2 := buildID("testbuildexpose2", "2375 80")
-	if id1 != id2 {
-		c.Errorf("EXPOSE should invalidate the cache only when ports actually changed")
-	}
-}
-
-func (s *DockerSuite) TestBuildExposeUpperCaseProto(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	name := "testbuildexposeuppercaseproto"
-	expected := "map[5678/udp:{}]"
-	_, err := buildImage(name,
-		`FROM scratch
-        EXPOSE 5678/UDP`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.ExposedPorts")
-	if res != expected {
-		c.Fatalf("Exposed ports %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildEmptyEntrypointInheritance(c *check.C) {
-	name := "testbuildentrypointinheritance"
-	name2 := "testbuildentrypointinheritance2"
-
-	_, err := buildImage(name,
-		`FROM busybox
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Entrypoint")
-
-	expected := "[/bin/echo]"
-	if res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-
-	_, err = buildImage(name2,
-		fmt.Sprintf(`FROM %s
-        ENTRYPOINT []`, name),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res = inspectField(c, name2, "Config.Entrypoint")
-
-	expected = "[]"
-
-	if res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEmptyEntrypoint(c *check.C) {
-	name := "testbuildentrypoint"
-	expected := "[]"
-
-	_, err := buildImage(name,
-		`FROM busybox
-        ENTRYPOINT []`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Entrypoint")
-	if res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEntrypoint(c *check.C) {
-	name := "testbuildentrypoint"
-
-	expected := "[/bin/echo]"
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Entrypoint")
-	if res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-
-}
-
-// #6445 ensure ONBUILD triggers aren't committed to grandchildren
-func (s *DockerSuite) TestBuildOnBuildLimitedInheritence(c *check.C) {
-	var (
-		out2, out3 string
-	)
-	{
-		name1 := "testonbuildtrigger1"
-		dockerfile1 := `
-		FROM busybox
-		RUN echo "GRANDPARENT"
-		ONBUILD RUN echo "ONBUILD PARENT"
-		`
-		ctx, err := fakeContext(dockerfile1, nil)
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-
-		out1, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-t", name1, ".")
-		if err != nil {
-			c.Fatalf("build failed to complete: %s, %v", out1, err)
-		}
-	}
-	{
-		name2 := "testonbuildtrigger2"
-		dockerfile2 := `
-		FROM testonbuildtrigger1
-		`
-		ctx, err := fakeContext(dockerfile2, nil)
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-
-		out2, _, err = dockerCmdInDir(c, ctx.Dir, "build", "-t", name2, ".")
-		if err != nil {
-			c.Fatalf("build failed to complete: %s, %v", out2, err)
-		}
-	}
-	{
-		name3 := "testonbuildtrigger3"
-		dockerfile3 := `
-		FROM testonbuildtrigger2
-		`
-		ctx, err := fakeContext(dockerfile3, nil)
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-
-		out3, _, err = dockerCmdInDir(c, ctx.Dir, "build", "-t", name3, ".")
-		if err != nil {
-			c.Fatalf("build failed to complete: %s, %v", out3, err)
-		}
-
-	}
-
-	// ONBUILD should be run in second build.
-	if !strings.Contains(out2, "ONBUILD PARENT") {
-		c.Fatalf("ONBUILD instruction did not run in child of ONBUILD parent")
-	}
-
-	// ONBUILD should *not* be run in third build.
-	if strings.Contains(out3, "ONBUILD PARENT") {
-		c.Fatalf("ONBUILD instruction ran in grandchild of ONBUILD parent")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildWithCache(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	name := "testbuildwithcache"
-	id1, err := buildImage(name,
-		`FROM scratch
-		MAINTAINER dockerio
-		EXPOSE 5432
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImage(name,
-		`FROM scratch
-		MAINTAINER dockerio
-		EXPOSE 5432
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildWithoutCache(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Expose not implemented on Windows
-	name := "testbuildwithoutcache"
-	name2 := "testbuildwithoutcache2"
-	id1, err := buildImage(name,
-		`FROM scratch
-		MAINTAINER dockerio
-		EXPOSE 5432
-        ENTRYPOINT ["/bin/echo"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	id2, err := buildImage(name2,
-		`FROM scratch
-		MAINTAINER dockerio
-		EXPOSE 5432
-        ENTRYPOINT ["/bin/echo"]`,
-		false)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildConditionalCache(c *check.C) {
-	name := "testbuildconditionalcache"
-
-	dockerfile := `
-		FROM busybox
-        ADD foo /tmp/`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatalf("Error building #1: %s", err)
-	}
-
-	if err := ctx.Add("foo", "bye"); err != nil {
-		c.Fatalf("Error modifying foo: %s", err)
-	}
-
-	id2, err := buildImageFromContext(name, ctx, false)
-	if err != nil {
-		c.Fatalf("Error building #2: %s", err)
-	}
-	if id2 == id1 {
-		c.Fatal("Should not have used the cache")
-	}
-
-	id3, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatalf("Error building #3: %s", err)
-	}
-	if id3 != id2 {
-		c.Fatal("Should have used the cache")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddLocalFileWithCache(c *check.C) {
-	// local files are not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	name := "testbuildaddlocalfilewithcache"
-	name2 := "testbuildaddlocalfilewithcache2"
-	dockerfile := `
-		FROM busybox
-        MAINTAINER dockerio
-        ADD foo /usr/lib/bla/bar
-		RUN sh -c "[ $(cat /usr/lib/bla/bar) = "hello" ]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddMultipleLocalFileWithCache(c *check.C) {
-	name := "testbuildaddmultiplelocalfilewithcache"
-	name2 := "testbuildaddmultiplelocalfilewithcache2"
-	dockerfile := `
-		FROM busybox
-        MAINTAINER dockerio
-        ADD foo Dockerfile /usr/lib/bla/
-		RUN sh -c "[ $(cat /usr/lib/bla/foo) = "hello" ]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddLocalFileWithoutCache(c *check.C) {
-	// local files are not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	name := "testbuildaddlocalfilewithoutcache"
-	name2 := "testbuildaddlocalfilewithoutcache2"
-	dockerfile := `
-		FROM busybox
-        MAINTAINER dockerio
-        ADD foo /usr/lib/bla/bar
-		RUN sh -c "[ $(cat /usr/lib/bla/bar) = "hello" ]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildCopyDirButNotFile(c *check.C) {
-	name := "testbuildcopydirbutnotfile"
-	name2 := "testbuildcopydirbutnotfile2"
-
-	dockerfile := `
-        FROM ` + minimalBaseImage() + `
-        COPY dir /tmp/`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"dir/foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	// Check that adding file with similar name doesn't mess with cache
-	if err := ctx.Add("dir_file", "hello2"); err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but wasn't")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddCurrentDirWithCache(c *check.C) {
-	name := "testbuildaddcurrentdirwithcache"
-	name2 := name + "2"
-	name3 := name + "3"
-	name4 := name + "4"
-	dockerfile := `
-        FROM ` + minimalBaseImage() + `
-        MAINTAINER dockerio
-        ADD . /usr/lib/bla`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	// Check that adding file invalidate cache of "ADD ."
-	if err := ctx.Add("bar", "hello2"); err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-	// Check that changing file invalidate cache of "ADD ."
-	if err := ctx.Add("foo", "hello1"); err != nil {
-		c.Fatal(err)
-	}
-	id3, err := buildImageFromContext(name3, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id2 == id3 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-	// Check that changing file to same content with different mtime does not
-	// invalidate cache of "ADD ."
-	time.Sleep(1 * time.Second) // wait second because of mtime precision
-	if err := ctx.Add("foo", "hello1"); err != nil {
-		c.Fatal(err)
-	}
-	id4, err := buildImageFromContext(name4, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id3 != id4 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddCurrentDirWithoutCache(c *check.C) {
-	name := "testbuildaddcurrentdirwithoutcache"
-	name2 := "testbuildaddcurrentdirwithoutcache2"
-	dockerfile := `
-        FROM ` + minimalBaseImage() + `
-        MAINTAINER dockerio
-        ADD . /usr/lib/bla`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddRemoteFileWithCache(c *check.C) {
-	name := "testbuildaddremotefilewithcache"
-	server, err := fakeStorage(map[string]string{
-		"baz": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	id1, err := buildImage(name,
-		fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImage(name,
-		fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddRemoteFileWithoutCache(c *check.C) {
-	name := "testbuildaddremotefilewithoutcache"
-	name2 := "testbuildaddremotefilewithoutcache2"
-	server, err := fakeStorage(map[string]string{
-		"baz": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	id1, err := buildImage(name,
-		fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImage(name2,
-		fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		false)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalided but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddRemoteFileMTime(c *check.C) {
-	name := "testbuildaddremotefilemtime"
-	name2 := name + "2"
-	name3 := name + "3"
-
-	files := map[string]string{"baz": "hello"}
-	server, err := fakeStorage(files)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()), nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	id2, err := buildImageFromContext(name2, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but wasn't - #1")
-	}
-
-	// Now create a different server with same contents (causes different mtime)
-	// The cache should still be used
-
-	// allow some time for clock to pass as mtime precision is only 1s
-	time.Sleep(2 * time.Second)
-
-	server2, err := fakeStorage(files)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server2.Close()
-
-	ctx2, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD %s/baz /usr/lib/baz/quux`, server2.URL()), nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx2.Close()
-	id3, err := buildImageFromContext(name3, ctx2, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id3 {
-		c.Fatal("The cache should have been used but wasn't")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithCache(c *check.C) {
-	name := "testbuildaddlocalandremotefilewithcache"
-	server, err := fakeStorage(map[string]string{
-		"baz": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD foo /usr/lib/bla/bar
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		map[string]string{
-			"foo": "hello world",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 != id2 {
-		c.Fatal("The cache should have been used but hasn't.")
-	}
-}
-
-func testContextTar(c *check.C, compression archive.Compression) {
-	ctx, err := fakeContext(
-		`FROM busybox
-ADD foo /foo
-CMD ["cat", "/foo"]`,
-		map[string]string{
-			"foo": "bar",
-		},
-	)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	context, err := archive.Tar(ctx.Dir, compression)
-	if err != nil {
-		c.Fatalf("failed to build context tar: %v", err)
-	}
-	name := "contexttar"
-	buildCmd := exec.Command(dockerBinary, "build", "-t", name, "-")
-	buildCmd.Stdin = context
-
-	if out, _, err := runCommandWithOutput(buildCmd); err != nil {
-		c.Fatalf("build failed to complete: %v %v", out, err)
-	}
-}
-
-func (s *DockerSuite) TestBuildContextTarGzip(c *check.C) {
-	testContextTar(c, archive.Gzip)
-}
-
-func (s *DockerSuite) TestBuildContextTarNoCompression(c *check.C) {
-	testContextTar(c, archive.Uncompressed)
-}
-
-func (s *DockerSuite) TestBuildNoContext(c *check.C) {
-	buildCmd := exec.Command(dockerBinary, "build", "-t", "nocontext", "-")
-	buildCmd.Stdin = strings.NewReader(
-		`FROM busybox
-		CMD ["echo", "ok"]`)
-
-	if out, _, err := runCommandWithOutput(buildCmd); err != nil {
-		c.Fatalf("build failed to complete: %v %v", out, err)
-	}
-
-	if out, _ := dockerCmd(c, "run", "--rm", "nocontext"); out != "ok\n" {
-		c.Fatalf("run produced invalid output: %q, expected %q", out, "ok")
-	}
-}
-
-// TODO: TestCaching
-func (s *DockerSuite) TestBuildAddLocalAndRemoteFilesWithoutCache(c *check.C) {
-	name := "testbuildaddlocalandremotefilewithoutcache"
-	name2 := "testbuildaddlocalandremotefilewithoutcache2"
-	server, err := fakeStorage(map[string]string{
-		"baz": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	ctx, err := fakeContext(fmt.Sprintf(`FROM `+minimalBaseImage()+`
-        MAINTAINER dockerio
-        ADD foo /usr/lib/bla/bar
-        ADD %s/baz /usr/lib/baz/quux`, server.URL()),
-		map[string]string{
-			"foo": "hello world",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	id1, err := buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	id2, err := buildImageFromContext(name2, ctx, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if id1 == id2 {
-		c.Fatal("The cache should have been invalidated but hasn't.")
-	}
-}
-
-func (s *DockerSuite) TestBuildWithVolumeOwnership(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildimg"
-
-	_, err := buildImage(name,
-		`FROM busybox:latest
-        RUN mkdir /test && chown daemon:daemon /test && chmod 0600 /test
-        VOLUME /test`,
-		true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--rm", "testbuildimg", "ls", "-la", "/test")
-
-	if expected := "drw-------"; !strings.Contains(out, expected) {
-		c.Fatalf("expected %s received %s", expected, out)
-	}
-
-	if expected := "daemon   daemon"; !strings.Contains(out, expected) {
-		c.Fatalf("expected %s received %s", expected, out)
-	}
-
-}
-
-// testing #1405 - config.Cmd does not get cleaned up if
-// utilizing cache
-func (s *DockerSuite) TestBuildEntrypointRunCleanup(c *check.C) {
-	name := "testbuildcmdcleanup"
-	if _, err := buildImage(name,
-		`FROM busybox
-        RUN echo "hello"`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-
-	ctx, err := fakeContext(`FROM busybox
-        RUN echo "hello"
-        ADD foo /foo
-        ENTRYPOINT ["/bin/echo"]`,
-		map[string]string{
-			"foo": "hello",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Cmd")
-	// Cmd must be cleaned up
-	if res != "[]" {
-		c.Fatalf("Cmd %s, expected nil", res)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddFileNotFound(c *check.C) {
-	name := "testbuildaddnotfound"
-	expected := "foo: no such file or directory"
-
-	if daemonPlatform == "windows" {
-		expected = "foo: The system cannot find the file specified"
-	}
-
-	ctx, err := fakeContext(`FROM `+minimalBaseImage()+`
-        ADD foo /usr/local/bar`,
-		map[string]string{"bar": "hello"})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		if !strings.Contains(err.Error(), expected) {
-			c.Fatalf("Wrong error %v, must be about missing foo file or directory", err)
-		}
-	} else {
-		c.Fatal("Error must not be nil")
-	}
-}
-
-func (s *DockerSuite) TestBuildInheritance(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildinheritance"
-
-	_, err := buildImage(name,
-		`FROM scratch
-		EXPOSE 2375`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	ports1 := inspectField(c, name, "Config.ExposedPorts")
-
-	_, err = buildImage(name,
-		fmt.Sprintf(`FROM %s
-		ENTRYPOINT ["/bin/echo"]`, name),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectField(c, name, "Config.Entrypoint")
-	if expected := "[/bin/echo]"; res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-	ports2 := inspectField(c, name, "Config.ExposedPorts")
-	if ports1 != ports2 {
-		c.Fatalf("Ports must be same: %s != %s", ports1, ports2)
-	}
-}
-
-func (s *DockerSuite) TestBuildFails(c *check.C) {
-	name := "testbuildfails"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN sh -c "exit 23"`,
-		true)
-	if err != nil {
-		if !strings.Contains(err.Error(), "returned a non-zero code: 23") {
-			c.Fatalf("Wrong error %v, must be about non-zero code 23", err)
-		}
-	} else {
-		c.Fatal("Error must not be nil")
-	}
-}
-
-func (s *DockerSuite) TestBuildOnBuild(c *check.C) {
-	name := "testbuildonbuild"
-	_, err := buildImage(name,
-		`FROM busybox
-		ONBUILD RUN touch foobar`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	_, err = buildImage(name,
-		fmt.Sprintf(`FROM %s
-		RUN [ -f foobar ]`, name),
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-// gh #2446
-func (s *DockerSuite) TestBuildAddToSymlinkDest(c *check.C) {
-	makeLink := `ln -s /foo /bar`
-	if daemonPlatform == "windows" {
-		makeLink = `mklink /D C:\bar C:\foo`
-	}
-	name := "testbuildaddtosymlinkdest"
-	ctx, err := fakeContext(`FROM busybox
-        RUN sh -c "mkdir /foo"
-        RUN `+makeLink+`
-        ADD foo /bar/
-        RUN sh -c "[ -f /bar/foo ]"
-        RUN sh -c "[ -f /foo/foo ]"`,
-		map[string]string{
-			"foo": "hello",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildEscapeWhitespace(c *check.C) {
-	name := "testbuildescapewhitespace"
-
-	_, err := buildImage(name, `
-  # ESCAPE=\
-  FROM busybox
-  MAINTAINER "Docker \
-IO <io@\
-docker.com>"
-  `, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectField(c, name, "Author")
-
-	if res != "\"Docker IO <io@docker.com>\"" {
-		c.Fatalf("Parsed string did not match the escaped string. Got: %q", res)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildVerifyIntString(c *check.C) {
-	// Verify that strings that look like ints are still passed as strings
-	name := "testbuildstringing"
-
-	_, err := buildImage(name, `
-  FROM busybox
-  MAINTAINER 123
-  `, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "inspect", name)
-
-	if !strings.Contains(out, "\"123\"") {
-		c.Fatalf("Output does not contain the int as a string:\n%s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildDockerignore(c *check.C) {
-	name := "testbuilddockerignore"
-	dockerfile := `
-        FROM busybox
-        ADD . /bla
-		RUN sh -c "[[ -f /bla/src/x.go ]]"
-		RUN sh -c "[[ -f /bla/Makefile ]]"
-		RUN sh -c "[[ ! -e /bla/src/_vendor ]]"
-		RUN sh -c "[[ ! -e /bla/.gitignore ]]"
-		RUN sh -c "[[ ! -e /bla/README.md ]]"
-		RUN sh -c "[[ ! -e /bla/dir/foo ]]"
-		RUN sh -c "[[ ! -e /bla/foo ]]"
-		RUN sh -c "[[ ! -e /bla/.git ]]"
-		RUN sh -c "[[ ! -e v.cc ]]"
-		RUN sh -c "[[ ! -e src/v.cc ]]"
-		RUN sh -c "[[ ! -e src/_vendor/v.cc ]]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Makefile":         "all:",
-		".git/HEAD":        "ref: foo",
-		"src/x.go":         "package main",
-		"src/_vendor/v.go": "package main",
-		"src/_vendor/v.cc": "package main",
-		"src/v.cc":         "package main",
-		"v.cc":             "package main",
-		"dir/foo":          "",
-		".gitignore":       "",
-		"README.md":        "readme",
-		".dockerignore": `
-.git
-pkg
-.gitignore
-src/_vendor
-*.md
-**/*.cc
-dir`,
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoreCleanPaths(c *check.C) {
-	name := "testbuilddockerignorecleanpaths"
-	dockerfile := `
-        FROM busybox
-        ADD . /tmp/
-        RUN sh -c "(! ls /tmp/foo) && (! ls /tmp/foo2) && (! ls /tmp/dir1/foo)"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo":           "foo",
-		"foo2":          "foo2",
-		"dir1/foo":      "foo in dir1",
-		".dockerignore": "./foo\ndir1//foo\n./dir1/../foo2",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoreExceptions(c *check.C) {
-	name := "testbuilddockerignoreexceptions"
-	dockerfile := `
-        FROM busybox
-        ADD . /bla
-		RUN sh -c "[[ -f /bla/src/x.go ]]"
-		RUN sh -c "[[ -f /bla/Makefile ]]"
-		RUN sh -c "[[ ! -e /bla/src/_vendor ]]"
-		RUN sh -c "[[ ! -e /bla/.gitignore ]]"
-		RUN sh -c "[[ ! -e /bla/README.md ]]"
-		RUN sh -c "[[  -e /bla/dir/dir/foo ]]"
-		RUN sh -c "[[ ! -e /bla/dir/foo1 ]]"
-		RUN sh -c "[[ -f /bla/dir/e ]]"
-		RUN sh -c "[[ -f /bla/dir/e-dir/foo ]]"
-		RUN sh -c "[[ ! -e /bla/foo ]]"
-		RUN sh -c "[[ ! -e /bla/.git ]]"
-		RUN sh -c "[[ -e /bla/dir/a.cc ]]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Makefile":         "all:",
-		".git/HEAD":        "ref: foo",
-		"src/x.go":         "package main",
-		"src/_vendor/v.go": "package main",
-		"dir/foo":          "",
-		"dir/foo1":         "",
-		"dir/dir/f1":       "",
-		"dir/dir/foo":      "",
-		"dir/e":            "",
-		"dir/e-dir/foo":    "",
-		".gitignore":       "",
-		"README.md":        "readme",
-		"dir/a.cc":         "hello",
-		".dockerignore": `
-.git
-pkg
-.gitignore
-src/_vendor
-*.md
-dir
-!dir/e*
-!dir/dir/foo
-**/*.cc
-!**/*.cc`,
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoringDockerfile(c *check.C) {
-	name := "testbuilddockerignoredockerfile"
-	dockerfile := `
-        FROM busybox
-		ADD . /tmp/
-		RUN sh -c "! ls /tmp/Dockerfile"
-		RUN ls /tmp/.dockerignore`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    dockerfile,
-		".dockerignore": "Dockerfile\n",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't ignore Dockerfile correctly:%s", err)
-	}
-
-	// now try it with ./Dockerfile
-	ctx.Add(".dockerignore", "./Dockerfile\n")
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't ignore ./Dockerfile correctly:%s", err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildDockerignoringRenamedDockerfile(c *check.C) {
-	name := "testbuilddockerignoredockerfile"
-	dockerfile := `
-        FROM busybox
-		ADD . /tmp/
-		RUN ls /tmp/Dockerfile
-		RUN sh -c "! ls /tmp/MyDockerfile"
-		RUN ls /tmp/.dockerignore`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    "Should not use me",
-		"MyDockerfile":  dockerfile,
-		".dockerignore": "MyDockerfile\n",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't ignore MyDockerfile correctly:%s", err)
-	}
-
-	// now try it with ./MyDockerfile
-	ctx.Add(".dockerignore", "./MyDockerfile\n")
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't ignore ./MyDockerfile correctly:%s", err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildDockerignoringDockerignore(c *check.C) {
-	name := "testbuilddockerignoredockerignore"
-	dockerfile := `
-        FROM busybox
-		ADD . /tmp/
-		RUN sh -c "! ls /tmp/.dockerignore"
-		RUN ls /tmp/Dockerfile`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    dockerfile,
-		".dockerignore": ".dockerignore\n",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't ignore .dockerignore correctly:%s", err)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoreTouchDockerfile(c *check.C) {
-	var id1 string
-	var id2 string
-
-	name := "testbuilddockerignoretouchdockerfile"
-	dockerfile := `
-        FROM busybox
-		ADD . /tmp/`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    dockerfile,
-		".dockerignore": "Dockerfile\n",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if id1, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't build it correctly:%s", err)
-	}
-
-	if id2, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't build it correctly:%s", err)
-	}
-	if id1 != id2 {
-		c.Fatalf("Didn't use the cache - 1")
-	}
-
-	// Now make sure touching Dockerfile doesn't invalidate the cache
-	if err = ctx.Add("Dockerfile", dockerfile+"\n# hi"); err != nil {
-		c.Fatalf("Didn't add Dockerfile: %s", err)
-	}
-	if id2, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't build it correctly:%s", err)
-	}
-	if id1 != id2 {
-		c.Fatalf("Didn't use the cache - 2")
-	}
-
-	// One more time but just 'touch' it instead of changing the content
-	if err = ctx.Add("Dockerfile", dockerfile+"\n# hi"); err != nil {
-		c.Fatalf("Didn't add Dockerfile: %s", err)
-	}
-	if id2, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("Didn't build it correctly:%s", err)
-	}
-	if id1 != id2 {
-		c.Fatalf("Didn't use the cache - 3")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildDockerignoringWholeDir(c *check.C) {
-	name := "testbuilddockerignorewholedir"
-	dockerfile := `
-        FROM busybox
-		COPY . /
-		RUN sh -c "[[ ! -e /.gitignore ]]"
-		RUN sh -c "[[ -f /Makefile ]]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    "FROM scratch",
-		"Makefile":      "all:",
-		".gitignore":    "",
-		".dockerignore": ".*\n",
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-	c.Assert(ctx.Add(".dockerfile", "*"), check.IsNil)
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-	c.Assert(ctx.Add(".dockerfile", "."), check.IsNil)
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-	c.Assert(ctx.Add(".dockerfile", "?"), check.IsNil)
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoringBadExclusion(c *check.C) {
-	name := "testbuilddockerignorebadexclusion"
-	dockerfile := `
-        FROM busybox
-		COPY . /
-		RUN sh -c "[[ ! -e /.gitignore ]]"
-		RUN sh -c "[[ -f /Makefile ]]"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":    "FROM scratch",
-		"Makefile":      "all:",
-		".gitignore":    "",
-		".dockerignore": "!\n",
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-	if _, err = buildImageFromContext(name, ctx, true); err == nil {
-		c.Fatalf("Build was supposed to fail but didn't")
-	}
-
-	if err.Error() != "failed to build the image: Error checking context: 'Illegal exclusion pattern: !'.\n" {
-		c.Fatalf("Incorrect output, got:%q", err.Error())
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoringWildTopDir(c *check.C) {
-	dockerfile := `
-        FROM busybox
-		COPY . /
-		RUN sh -c "[[ ! -e /.dockerignore ]]"
-		RUN sh -c "[[ ! -e /Dockerfile ]]"
-		RUN sh -c "[[ ! -e /file1 ]]"
-		RUN sh -c "[[ ! -e /dir ]]"`
-
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile": "FROM scratch",
-		"file1":      "",
-		"dir/dfile1": "",
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	// All of these should result in ignoring all files
-	for _, variant := range []string{"**", "**/", "**/**", "*"} {
-		ctx.Add(".dockerignore", variant)
-		_, err = buildImageFromContext("noname", ctx, true)
-		c.Assert(err, check.IsNil, check.Commentf("variant: %s", variant))
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerignoringWildDirs(c *check.C) {
-	dockerfile := `
-        FROM busybox
-		COPY . /
-		#RUN sh -c "[[ -e /.dockerignore ]]"
-		RUN sh -c "[[ -e /Dockerfile ]]           && \
-		           [[ ! -e /file0 ]]              && \
-		           [[ ! -e /dir1/file0 ]]         && \
-		           [[ ! -e /dir2/file0 ]]         && \
-		           [[ ! -e /file1 ]]              && \
-		           [[ ! -e /dir1/file1 ]]         && \
-		           [[ ! -e /dir1/dir2/file1 ]]    && \
-		           [[ ! -e /dir1/file2 ]]         && \
-		           [[   -e /dir1/dir2/file2 ]]    && \
-		           [[ ! -e /dir1/dir2/file4 ]]    && \
-		           [[ ! -e /dir1/dir2/file5 ]]    && \
-		           [[ ! -e /dir1/dir2/file6 ]]    && \
-		           [[ ! -e /dir1/dir3/file7 ]]    && \
-		           [[ ! -e /dir1/dir3/file8 ]]    && \
-		           [[   -e /dir1/dir3 ]]          && \
-		           [[   -e /dir1/dir4 ]]          && \
-		           [[ ! -e 'dir1/dir5/fileAA' ]]  && \
-		           [[   -e 'dir1/dir5/fileAB' ]]  && \
-		           [[   -e 'dir1/dir5/fileB' ]]"   # "." in pattern means nothing
-
-		RUN echo all done!`
-
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile":      "FROM scratch",
-		"file0":           "",
-		"dir1/file0":      "",
-		"dir1/dir2/file0": "",
-
-		"file1":           "",
-		"dir1/file1":      "",
-		"dir1/dir2/file1": "",
-
-		"dir1/file2":      "",
-		"dir1/dir2/file2": "", // remains
-
-		"dir1/dir2/file4": "",
-		"dir1/dir2/file5": "",
-		"dir1/dir2/file6": "",
-		"dir1/dir3/file7": "",
-		"dir1/dir3/file8": "",
-		"dir1/dir4/file9": "",
-
-		"dir1/dir5/fileAA": "",
-		"dir1/dir5/fileAB": "",
-		"dir1/dir5/fileB":  "",
-
-		".dockerignore": `
-**/file0
-**/*file1
-**/dir1/file2
-dir1/**/file4
-**/dir2/file5
-**/dir1/dir2/file6
-dir1/dir3/**
-**/dir4/**
-**/file?A
-**/file\?B
-**/dir5/file.
-`,
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	_, err = buildImageFromContext("noname", ctx, true)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestBuildLineBreak(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildlinebreak"
-	_, err := buildImage(name,
-		`FROM  busybox
-RUN    sh -c 'echo root:testpass \
-	> /tmp/passwd'
-RUN    mkdir -p /var/run/sshd
-RUN    sh -c "[ "$(cat /tmp/passwd)" = "root:testpass" ]"
-RUN    sh -c "[ "$(ls -d /var/run/sshd)" = "/var/run/sshd" ]"`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildEOLInLine(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildeolinline"
-	_, err := buildImage(name,
-		`FROM   busybox
-RUN    sh -c 'echo root:testpass > /tmp/passwd'
-RUN    echo "foo \n bar"; echo "baz"
-RUN    mkdir -p /var/run/sshd
-RUN    sh -c "[ "$(cat /tmp/passwd)" = "root:testpass" ]"
-RUN    sh -c "[ "$(ls -d /var/run/sshd)" = "/var/run/sshd" ]"`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildCommentsShebangs(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildcomments"
-	_, err := buildImage(name,
-		`FROM busybox
-# This is an ordinary comment.
-RUN { echo '#!/bin/sh'; echo 'echo hello world'; } > /hello.sh
-RUN [ ! -x /hello.sh ]
-# comment with line break \
-RUN chmod +x /hello.sh
-RUN [ -x /hello.sh ]
-RUN [ "$(cat /hello.sh)" = $'#!/bin/sh\necho hello world' ]
-RUN [ "$(/hello.sh)" = "hello world" ]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildUsersAndGroups(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildusers"
-	_, err := buildImage(name,
-		`FROM busybox
-
-# Make sure our defaults work
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)" = '0:0/root:root' ]
-
-# TODO decide if "args.user = strconv.Itoa(syscall.Getuid())" is acceptable behavior for changeUser in sysvinit instead of "return nil" when "USER" isn't specified (so that we get the proper group list even if that is the empty list, even in the default case of not supplying an explicit USER to run as, which implies USER 0)
-USER root
-RUN [ "$(id -G):$(id -Gn)" = '0 10:root wheel' ]
-
-# Setup dockerio user and group
-RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd && \
-	echo 'dockerio:x:1001:' >> /etc/group
-
-# Make sure we can switch to our user and all the information is exactly as we expect it to be
-USER dockerio
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
-
-# Switch back to root and double check that worked exactly as we might expect it to
-USER root
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '0:0/root:root/0 10:root wheel' ] && \
-        # Add a "supplementary" group for our dockerio user
-	echo 'supplementary:x:1002:dockerio' >> /etc/group
-
-# ... and then go verify that we get it like we expect
-USER dockerio
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001 1002:dockerio supplementary' ]
-USER 1001
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001 1002:dockerio supplementary' ]
-
-# super test the new "user:group" syntax
-USER dockerio:dockerio
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
-USER 1001:dockerio
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
-USER dockerio:1001
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
-USER 1001:1001
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1001/dockerio:dockerio/1001:dockerio' ]
-USER dockerio:supplementary
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1002/dockerio:supplementary/1002:supplementary' ]
-USER dockerio:1002
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1002/dockerio:supplementary/1002:supplementary' ]
-USER 1001:supplementary
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1002/dockerio:supplementary/1002:supplementary' ]
-USER 1001:1002
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1001:1002/dockerio:supplementary/1002:supplementary' ]
-
-# make sure unknown uid/gid still works properly
-USER 1042:1043
-RUN [ "$(id -u):$(id -g)/$(id -un):$(id -gn)/$(id -G):$(id -Gn)" = '1042:1043/1042:1043/1043:1043' ]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildEnvUsage(c *check.C) {
-	// /docker/world/hello is not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvusage"
-	dockerfile := `FROM busybox
-ENV    HOME /root
-ENV    PATH $HOME/bin:$PATH
-ENV    PATH /tmp:$PATH
-RUN    [ "$PATH" = "/tmp:$HOME/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" ]
-ENV    FOO /foo/baz
-ENV    BAR /bar
-ENV    BAZ $BAR
-ENV    FOOPATH $PATH:$FOO
-RUN    [ "$BAR" = "$BAZ" ]
-RUN    [ "$FOOPATH" = "$PATH:/foo/baz" ]
-ENV	   FROM hello/docker/world
-ENV    TO /docker/world/hello
-ADD    $FROM $TO
-RUN    [ "$(cat $TO)" = "hello" ]
-ENV    abc=def
-ENV    ghi=$abc
-RUN    [ "$ghi" = "def" ]
-`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"hello/docker/world": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildEnvUsage2(c *check.C) {
-	// /docker/world/hello is not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildenvusage2"
-	dockerfile := `FROM busybox
-ENV    abc=def def="hello world"
-RUN    [ "$abc,$def" = "def,hello world" ]
-ENV    def=hello\ world v1=abc v2="hi there" v3='boogie nights' v4="with'quotes too"
-RUN    [ "$def,$v1,$v2,$v3,$v4" = "hello world,abc,hi there,boogie nights,with'quotes too" ]
-ENV    abc=zzz FROM=hello/docker/world
-ENV    abc=zzz TO=/docker/world/hello
-ADD    $FROM $TO
-RUN    [ "$abc,$(cat $TO)" = "zzz,hello" ]
-ENV    abc 'yyy'
-RUN    [ $abc = 'yyy' ]
-ENV    abc=
-RUN    [ "$abc" = "" ]
-
-# use grep to make sure if the builder substitutes \$foo by mistake
-# we don't get a false positive
-ENV    abc=\$foo
-RUN    [ "$abc" = "\$foo" ] && (echo "$abc" | grep foo)
-ENV    abc \$foo
-RUN    [ "$abc" = "\$foo" ] && (echo "$abc" | grep foo)
-
-ENV    abc=\'foo\' abc2=\"foo\"
-RUN    [ "$abc,$abc2" = "'foo',\"foo\"" ]
-ENV    abc "foo"
-RUN    [ "$abc" = "foo" ]
-ENV    abc 'foo'
-RUN    [ "$abc" = 'foo' ]
-ENV    abc \'foo\'
-RUN    [ "$abc" = "'foo'" ]
-ENV    abc \"foo\"
-RUN    [ "$abc" = '"foo"' ]
-
-ENV    abc=ABC
-RUN    [ "$abc" = "ABC" ]
-ENV    def1=${abc:-DEF} def2=${ccc:-DEF}
-ENV    def3=${ccc:-${def2}xx} def4=${abc:+ALT} def5=${def2:+${abc}:} def6=${ccc:-\$abc:} def7=${ccc:-\${abc}:}
-RUN    [ "$def1,$def2,$def3,$def4,$def5,$def6,$def7" = 'ABC,DEF,DEFxx,ALT,ABC:,$abc:,${abc:}' ]
-ENV    mypath=${mypath:+$mypath:}/home
-ENV    mypath=${mypath:+$mypath:}/away
-RUN    [ "$mypath" = '/home:/away' ]
-
-ENV    e1=bar
-ENV    e2=$e1 e3=$e11 e4=\$e1 e5=\$e11
-RUN    [ "$e0,$e1,$e2,$e3,$e4,$e5" = ',bar,bar,,$e1,$e11' ]
-
-ENV    ee1 bar
-ENV    ee2 $ee1
-ENV    ee3 $ee11
-ENV    ee4 \$ee1
-ENV    ee5 \$ee11
-RUN    [ "$ee1,$ee2,$ee3,$ee4,$ee5" = 'bar,bar,,$ee1,$ee11' ]
-
-ENV    eee1="foo" eee2='foo'
-ENV    eee3 "foo"
-ENV    eee4 'foo'
-RUN    [ "$eee1,$eee2,$eee3,$eee4" = 'foo,foo,foo,foo' ]
-
-`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"hello/docker/world": "hello",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddScript(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildaddscript"
-	dockerfile := `
-FROM busybox
-ADD test /test
-RUN ["chmod","+x","/test"]
-RUN ["/test"]
-RUN [ "$(cat /testfile)" = 'test!' ]`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"test": "#!/bin/sh\necho 'test!' > /testfile",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildAddTar(c *check.C) {
-	// /test/foo is not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	name := "testbuildaddtar"
-
-	ctx := func() *FakeContext {
-		dockerfile := `
-FROM busybox
-ADD test.tar /
-RUN cat /test/foo | grep Hi
-ADD test.tar /test.tar
-RUN cat /test.tar/test/foo | grep Hi
-ADD test.tar /unlikely-to-exist
-RUN cat /unlikely-to-exist/test/foo | grep Hi
-ADD test.tar /unlikely-to-exist-trailing-slash/
-RUN cat /unlikely-to-exist-trailing-slash/test/foo | grep Hi
-RUN sh -c "mkdir /existing-directory" #sh -c is needed on Windows to use the correct mkdir
-ADD test.tar /existing-directory
-RUN cat /existing-directory/test/foo | grep Hi
-ADD test.tar /existing-directory-trailing-slash/
-RUN cat /existing-directory-trailing-slash/test/foo | grep Hi`
-		tmpDir, err := ioutil.TempDir("", "fake-context")
-		c.Assert(err, check.IsNil)
-		testTar, err := os.Create(filepath.Join(tmpDir, "test.tar"))
-		if err != nil {
-			c.Fatalf("failed to create test.tar archive: %v", err)
-		}
-		defer testTar.Close()
-
-		tw := tar.NewWriter(testTar)
-
-		if err := tw.WriteHeader(&tar.Header{
-			Name: "test/foo",
-			Size: 2,
-		}); err != nil {
-			c.Fatalf("failed to write tar file header: %v", err)
-		}
-		if _, err := tw.Write([]byte("Hi")); err != nil {
-			c.Fatalf("failed to write tar file content: %v", err)
-		}
-		if err := tw.Close(); err != nil {
-			c.Fatalf("failed to close tar archive: %v", err)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(dockerfile), 0644); err != nil {
-			c.Fatalf("failed to open destination dockerfile: %v", err)
-		}
-		return fakeContextFromDir(tmpDir)
-	}()
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("build failed to complete for TestBuildAddTar: %v", err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildAddBrokenTar(c *check.C) {
-	name := "testbuildaddbrokentar"
-
-	ctx := func() *FakeContext {
-		dockerfile := `
-FROM busybox
-ADD test.tar /`
-		tmpDir, err := ioutil.TempDir("", "fake-context")
-		c.Assert(err, check.IsNil)
-		testTar, err := os.Create(filepath.Join(tmpDir, "test.tar"))
-		if err != nil {
-			c.Fatalf("failed to create test.tar archive: %v", err)
-		}
-		defer testTar.Close()
-
-		tw := tar.NewWriter(testTar)
-
-		if err := tw.WriteHeader(&tar.Header{
-			Name: "test/foo",
-			Size: 2,
-		}); err != nil {
-			c.Fatalf("failed to write tar file header: %v", err)
-		}
-		if _, err := tw.Write([]byte("Hi")); err != nil {
-			c.Fatalf("failed to write tar file content: %v", err)
-		}
-		if err := tw.Close(); err != nil {
-			c.Fatalf("failed to close tar archive: %v", err)
-		}
-
-		// Corrupt the tar by removing one byte off the end
-		stat, err := testTar.Stat()
-		if err != nil {
-			c.Fatalf("failed to stat tar archive: %v", err)
-		}
-		if err := testTar.Truncate(stat.Size() - 1); err != nil {
-			c.Fatalf("failed to truncate tar archive: %v", err)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(dockerfile), 0644); err != nil {
-			c.Fatalf("failed to open destination dockerfile: %v", err)
-		}
-		return fakeContextFromDir(tmpDir)
-	}()
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err == nil {
-		c.Fatalf("build should have failed for TestBuildAddBrokenTar")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddNonTar(c *check.C) {
-	name := "testbuildaddnontar"
-
-	// Should not try to extract test.tar
-	ctx, err := fakeContext(`
-		FROM busybox
-		ADD test.tar /
-		RUN test -f /test.tar`,
-		map[string]string{"test.tar": "not_a_tar_file"})
-
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("build failed for TestBuildAddNonTar")
-	}
-}
-
-func (s *DockerSuite) TestBuildAddTarXz(c *check.C) {
-	// /test/foo is not owned by the correct user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildaddtarxz"
-
-	ctx := func() *FakeContext {
-		dockerfile := `
-			FROM busybox
-			ADD test.tar.xz /
-			RUN cat /test/foo | grep Hi`
-		tmpDir, err := ioutil.TempDir("", "fake-context")
-		c.Assert(err, check.IsNil)
-		testTar, err := os.Create(filepath.Join(tmpDir, "test.tar"))
-		if err != nil {
-			c.Fatalf("failed to create test.tar archive: %v", err)
-		}
-		defer testTar.Close()
-
-		tw := tar.NewWriter(testTar)
-
-		if err := tw.WriteHeader(&tar.Header{
-			Name: "test/foo",
-			Size: 2,
-		}); err != nil {
-			c.Fatalf("failed to write tar file header: %v", err)
-		}
-		if _, err := tw.Write([]byte("Hi")); err != nil {
-			c.Fatalf("failed to write tar file content: %v", err)
-		}
-		if err := tw.Close(); err != nil {
-			c.Fatalf("failed to close tar archive: %v", err)
-		}
-
-		xzCompressCmd := exec.Command("xz", "-k", "test.tar")
-		xzCompressCmd.Dir = tmpDir
-		out, _, err := runCommandWithOutput(xzCompressCmd)
-		if err != nil {
-			c.Fatal(err, out)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(dockerfile), 0644); err != nil {
-			c.Fatalf("failed to open destination dockerfile: %v", err)
-		}
-		return fakeContextFromDir(tmpDir)
-	}()
-
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("build failed to complete for TestBuildAddTarXz: %v", err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildAddTarXzGz(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildaddtarxzgz"
-
-	ctx := func() *FakeContext {
-		dockerfile := `
-			FROM busybox
-			ADD test.tar.xz.gz /
-			RUN ls /test.tar.xz.gz`
-		tmpDir, err := ioutil.TempDir("", "fake-context")
-		c.Assert(err, check.IsNil)
-		testTar, err := os.Create(filepath.Join(tmpDir, "test.tar"))
-		if err != nil {
-			c.Fatalf("failed to create test.tar archive: %v", err)
-		}
-		defer testTar.Close()
-
-		tw := tar.NewWriter(testTar)
-
-		if err := tw.WriteHeader(&tar.Header{
-			Name: "test/foo",
-			Size: 2,
-		}); err != nil {
-			c.Fatalf("failed to write tar file header: %v", err)
-		}
-		if _, err := tw.Write([]byte("Hi")); err != nil {
-			c.Fatalf("failed to write tar file content: %v", err)
-		}
-		if err := tw.Close(); err != nil {
-			c.Fatalf("failed to close tar archive: %v", err)
-		}
-
-		xzCompressCmd := exec.Command("xz", "-k", "test.tar")
-		xzCompressCmd.Dir = tmpDir
-		out, _, err := runCommandWithOutput(xzCompressCmd)
-		if err != nil {
-			c.Fatal(err, out)
-		}
-
-		gzipCompressCmd := exec.Command("gzip", "test.tar.xz")
-		gzipCompressCmd.Dir = tmpDir
-		out, _, err = runCommandWithOutput(gzipCompressCmd)
-		if err != nil {
-			c.Fatal(err, out)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(dockerfile), 0644); err != nil {
-			c.Fatalf("failed to open destination dockerfile: %v", err)
-		}
-		return fakeContextFromDir(tmpDir)
-	}()
-
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("build failed to complete for TestBuildAddTarXz: %v", err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildFromGit(c *check.C) {
-	name := "testbuildfromgit"
-	git, err := newFakeGit("repo", map[string]string{
-		"Dockerfile": `FROM busybox
-					ADD first /first
-					RUN [ -f /first ]
-					MAINTAINER docker`,
-		"first": "test git data",
-	}, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer git.Close()
-
-	_, err = buildImageFromPath(name, git.RepoURL, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Author")
-	if res != "docker" {
-		c.Fatalf("Maintainer should be docker, got %s", res)
-	}
-}
-
-func (s *DockerSuite) TestBuildFromGitWithContext(c *check.C) {
-	name := "testbuildfromgit"
-	git, err := newFakeGit("repo", map[string]string{
-		"docker/Dockerfile": `FROM busybox
-					ADD first /first
-					RUN [ -f /first ]
-					MAINTAINER docker`,
-		"docker/first": "test git data",
-	}, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer git.Close()
-
-	u := fmt.Sprintf("%s#master:docker", git.RepoURL)
-	_, err = buildImageFromPath(name, u, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Author")
-	if res != "docker" {
-		c.Fatalf("Maintainer should be docker, got %s", res)
-	}
-}
-
-func (s *DockerSuite) TestBuildFromGitwithF(c *check.C) {
-	name := "testbuildfromgitwithf"
-	git, err := newFakeGit("repo", map[string]string{
-		"myApp/myDockerfile": `FROM busybox
-					RUN echo hi from Dockerfile`,
-	}, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer git.Close()
-
-	out, _, err := dockerCmdWithError("build", "-t", name, "--no-cache", "-f", "myApp/myDockerfile", git.RepoURL)
-	if err != nil {
-		c.Fatalf("Error on build. Out: %s\nErr: %v", out, err)
-	}
-
-	if !strings.Contains(out, "hi from Dockerfile") {
-		c.Fatalf("Missing expected output, got:\n%s", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildFromRemoteTarball(c *check.C) {
-	name := "testbuildfromremotetarball"
-
-	buffer := new(bytes.Buffer)
-	tw := tar.NewWriter(buffer)
-	defer tw.Close()
-
-	dockerfile := []byte(`FROM busybox
-					MAINTAINER docker`)
-	if err := tw.WriteHeader(&tar.Header{
-		Name: "Dockerfile",
-		Size: int64(len(dockerfile)),
-	}); err != nil {
-		c.Fatalf("failed to write tar file header: %v", err)
-	}
-	if _, err := tw.Write(dockerfile); err != nil {
-		c.Fatalf("failed to write tar file content: %v", err)
-	}
-	if err := tw.Close(); err != nil {
-		c.Fatalf("failed to close tar archive: %v", err)
-	}
-
-	server, err := fakeBinaryStorage(map[string]*bytes.Buffer{
-		"testT.tar": buffer,
-	})
-	c.Assert(err, check.IsNil)
-
-	defer server.Close()
-
-	_, err = buildImageFromPath(name, server.URL()+"/testT.tar", true)
-	c.Assert(err, check.IsNil)
-
-	res := inspectField(c, name, "Author")
-
-	if res != "docker" {
-		c.Fatalf("Maintainer should be docker, got %s", res)
-	}
-}
-
-func (s *DockerSuite) TestBuildCleanupCmdOnEntrypoint(c *check.C) {
-	name := "testbuildcmdcleanuponentrypoint"
-	if _, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        CMD ["test"]
-		ENTRYPOINT ["echo"]`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-	if _, err := buildImage(name,
-		fmt.Sprintf(`FROM %s
-		ENTRYPOINT ["cat"]`, name),
-		true); err != nil {
-		c.Fatal(err)
-	}
-	res := inspectField(c, name, "Config.Cmd")
-	if res != "[]" {
-		c.Fatalf("Cmd %s, expected nil", res)
-	}
-
-	res = inspectField(c, name, "Config.Entrypoint")
-	if expected := "[cat]"; res != expected {
-		c.Fatalf("Entrypoint %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildClearCmd(c *check.C) {
-	name := "testbuildclearcmd"
-	_, err := buildImage(name,
-		`From `+minimalBaseImage()+`
-   ENTRYPOINT ["/bin/bash"]
-   CMD []`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.Cmd")
-	if res != "[]" {
-		c.Fatalf("Cmd %s, expected %s", res, "[]")
-	}
-}
-
-func (s *DockerSuite) TestBuildEmptyCmd(c *check.C) {
-	// Skip on Windows. Base image on Windows has a CMD set in the image.
-	testRequires(c, DaemonIsLinux)
-
-	name := "testbuildemptycmd"
-	if _, err := buildImage(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true); err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.Cmd")
-	if res != "null" {
-		c.Fatalf("Cmd %s, expected %s", res, "null")
-	}
-}
-
-func (s *DockerSuite) TestBuildOnBuildOutput(c *check.C) {
-	name := "testbuildonbuildparent"
-	if _, err := buildImage(name, "FROM busybox\nONBUILD RUN echo foo\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	_, out, err := buildImageWithOut(name, "FROM "+name+"\nMAINTAINER quux\n", true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if !strings.Contains(out, "# Executing 1 build trigger") {
-		c.Fatal("failed to find the build trigger output", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildInvalidTag(c *check.C) {
-	name := "abcd:" + stringutils.GenerateRandomAlphaOnlyString(200)
-	_, out, err := buildImageWithOut(name, "FROM "+minimalBaseImage()+"\nMAINTAINER quux\n", true)
-	// if the error doesn't check for illegal tag name, or the image is built
-	// then this should fail
-	if !strings.Contains(out, "Error parsing reference") || strings.Contains(out, "Sending build context to Docker daemon") {
-		c.Fatalf("failed to stop before building. Error: %s, Output: %s", err, out)
-	}
-}
-
-func (s *DockerSuite) TestBuildCmdShDashC(c *check.C) {
-	name := "testbuildcmdshc"
-	if _, err := buildImage(name, "FROM busybox\nCMD echo cmd\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Cmd")
-
-	expected := `["/bin/sh","-c","echo cmd"]`
-	if daemonPlatform == "windows" {
-		expected = `["cmd","/S","/C","echo cmd"]`
-	}
-
-	if res != expected {
-		c.Fatalf("Expected value %s not in Config.Cmd: %s", expected, res)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildCmdSpaces(c *check.C) {
-	// Test to make sure that when we strcat arrays we take into account
-	// the arg separator to make sure ["echo","hi"] and ["echo hi"] don't
-	// look the same
-	name := "testbuildcmdspaces"
-	var id1 string
-	var id2 string
-	var err error
-
-	if id1, err = buildImage(name, "FROM busybox\nCMD [\"echo hi\"]\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	if id2, err = buildImage(name, "FROM busybox\nCMD [\"echo\", \"hi\"]\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	if id1 == id2 {
-		c.Fatal("Should not have resulted in the same CMD")
-	}
-
-	// Now do the same with ENTRYPOINT
-	if id1, err = buildImage(name, "FROM busybox\nENTRYPOINT [\"echo hi\"]\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	if id2, err = buildImage(name, "FROM busybox\nENTRYPOINT [\"echo\", \"hi\"]\n", true); err != nil {
-		c.Fatal(err)
-	}
-
-	if id1 == id2 {
-		c.Fatal("Should not have resulted in the same ENTRYPOINT")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildCmdJSONNoShDashC(c *check.C) {
-	name := "testbuildcmdjson"
-	if _, err := buildImage(name, "FROM busybox\nCMD [\"echo\", \"cmd\"]", true); err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Cmd")
-
-	expected := `["echo","cmd"]`
-
-	if res != expected {
-		c.Fatalf("Expected value %s not in Config.Cmd: %s", expected, res)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEntrypointInheritance(c *check.C) {
-
-	if _, err := buildImage("parent", `
-    FROM busybox
-    ENTRYPOINT exit 130
-    `, true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, status, _ := dockerCmdWithError("run", "parent"); status != 130 {
-		c.Fatalf("expected exit code 130 but received %d", status)
-	}
-
-	if _, err := buildImage("child", `
-    FROM parent
-    ENTRYPOINT exit 5
-    `, true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, status, _ := dockerCmdWithError("run", "child"); status != 5 {
-		c.Fatalf("expected exit code 5 but received %d", status)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEntrypointInheritanceInspect(c *check.C) {
-	var (
-		name     = "testbuildepinherit"
-		name2    = "testbuildepinherit2"
-		expected = `["/bin/sh","-c","echo quux"]`
-	)
-
-	if daemonPlatform == "windows" {
-		expected = `["cmd","/S","/C","echo quux"]`
-	}
-
-	if _, err := buildImage(name, "FROM busybox\nENTRYPOINT /foo/bar", true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := buildImage(name2, fmt.Sprintf("FROM %s\nENTRYPOINT echo quux", name), true); err != nil {
-		c.Fatal(err)
-	}
-
-	res := inspectFieldJSON(c, name2, "Config.Entrypoint")
-
-	if res != expected {
-		c.Fatalf("Expected value %s not in Config.Entrypoint: %s", expected, res)
-	}
-
-	out, _ := dockerCmd(c, "run", name2)
-
-	expected = "quux"
-
-	if strings.TrimSpace(out) != expected {
-		c.Fatalf("Expected output is %s, got %s", expected, out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildRunShEntrypoint(c *check.C) {
-	name := "testbuildentrypoint"
-	_, err := buildImage(name,
-		`FROM busybox
-                                ENTRYPOINT echo`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "--rm", name)
-}
-
-func (s *DockerSuite) TestBuildExoticShellInterpolation(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildexoticshellinterpolation"
-
-	_, err := buildImage(name, `
-		FROM busybox
-
-		ENV SOME_VAR a.b.c
-
-		RUN [ "$SOME_VAR"       = 'a.b.c' ]
-		RUN [ "${SOME_VAR}"     = 'a.b.c' ]
-		RUN [ "${SOME_VAR%.*}"  = 'a.b'   ]
-		RUN [ "${SOME_VAR%%.*}" = 'a'     ]
-		RUN [ "${SOME_VAR#*.}"  = 'b.c'   ]
-		RUN [ "${SOME_VAR##*.}" = 'c'     ]
-		RUN [ "${SOME_VAR/c/d}" = 'a.b.d' ]
-		RUN [ "${#SOME_VAR}"    = '5'     ]
-
-		RUN [ "${SOME_UNSET_VAR:-$SOME_VAR}" = 'a.b.c' ]
-		RUN [ "${SOME_VAR:+Version: ${SOME_VAR}}" = 'Version: a.b.c' ]
-		RUN [ "${SOME_UNSET_VAR:+${SOME_VAR}}" = '' ]
-		RUN [ "${SOME_UNSET_VAR:-${SOME_VAR:-d.e.f}}" = 'a.b.c' ]
-	`, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildVerifySingleQuoteFails(c *check.C) {
-	// This testcase is supposed to generate an error because the
-	// JSON array we're passing in on the CMD uses single quotes instead
-	// of double quotes (per the JSON spec). This means we interpret it
-	// as a "string" instead of "JSON array" and pass it on to "sh -c" and
-	// it should barf on it.
-	name := "testbuildsinglequotefails"
-
-	if _, err := buildImage(name,
-		`FROM busybox
-		CMD [ '/bin/sh', '-c', 'echo hi' ]`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, _, err := dockerCmdWithError("run", "--rm", name); err == nil {
-		c.Fatal("The image was not supposed to be able to run")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildVerboseOut(c *check.C) {
-	name := "testbuildverboseout"
-	expected := "\n123\n"
-
-	if daemonPlatform == "windows" {
-		expected = "\n123\r\n"
-	}
-
-	_, out, err := buildImageWithOut(name,
-		`FROM busybox
-RUN echo 123`,
-		false)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(out, expected) {
-		c.Fatalf("Output should contain %q: %q", "123", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildWithTabs(c *check.C) {
-	name := "testbuildwithtabs"
-	_, err := buildImage(name,
-		"FROM busybox\nRUN echo\tone\t\ttwo", true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "ContainerConfig.Cmd")
-	expected1 := `["/bin/sh","-c","echo\tone\t\ttwo"]`
-	expected2 := `["/bin/sh","-c","echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates
-	if daemonPlatform == "windows" {
-		expected1 = `["cmd","/S","/C","echo\tone\t\ttwo"]`
-		expected2 = `["cmd","/S","/C","echo\u0009one\u0009\u0009two"]` // syntactically equivalent, and what Go 1.3 generates
-	}
-	if res != expected1 && res != expected2 {
-		c.Fatalf("Missing tabs.\nGot: %s\nExp: %s or %s", res, expected1, expected2)
-	}
-}
-
-func (s *DockerSuite) TestBuildLabels(c *check.C) {
-	name := "testbuildlabel"
-	expected := `{"License":"GPL","Vendor":"Acme"}`
-	_, err := buildImage(name,
-		`FROM busybox
-		LABEL Vendor=Acme
-                LABEL License GPL`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-}
-
-func (s *DockerSuite) TestBuildLabelsCache(c *check.C) {
-	name := "testbuildlabelcache"
-
-	id1, err := buildImage(name,
-		`FROM busybox
-		LABEL Vendor=Acme`, false)
-	if err != nil {
-		c.Fatalf("Build 1 should have worked: %v", err)
-	}
-
-	id2, err := buildImage(name,
-		`FROM busybox
-		LABEL Vendor=Acme`, true)
-	if err != nil || id1 != id2 {
-		c.Fatalf("Build 2 should have worked & used cache(%s,%s): %v", id1, id2, err)
-	}
-
-	id2, err = buildImage(name,
-		`FROM busybox
-		LABEL Vendor=Acme1`, true)
-	if err != nil || id1 == id2 {
-		c.Fatalf("Build 3 should have worked & NOT used cache(%s,%s): %v", id1, id2, err)
-	}
-
-	id2, err = buildImage(name,
-		`FROM busybox
-		LABEL Vendor Acme`, true) // Note: " " and "=" should be same
-	if err != nil || id1 != id2 {
-		c.Fatalf("Build 4 should have worked & used cache(%s,%s): %v", id1, id2, err)
-	}
-
-	// Now make sure the cache isn't used by mistake
-	id1, err = buildImage(name,
-		`FROM busybox
-       LABEL f1=b1 f2=b2`, false)
-	if err != nil {
-		c.Fatalf("Build 5 should have worked: %q", err)
-	}
-
-	id2, err = buildImage(name,
-		`FROM busybox
-       LABEL f1="b1 f2=b2"`, true)
-	if err != nil || id1 == id2 {
-		c.Fatalf("Build 6 should have worked & NOT used the cache(%s,%s): %q", id1, id2, err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildNotVerboseSuccess(c *check.C) {
-	// This test makes sure that -q works correctly when build is successful:
-	// stdout has only the image ID (long image ID) and stderr is empty.
-	var stdout, stderr string
-	var err error
-	outRegexp := regexp.MustCompile("^(sha256:|)[a-z0-9]{64}\\n$")
-
-	tt := []struct {
-		Name      string
-		BuildFunc func(string)
-	}{
-		{
-			Name: "quiet_build_stdin_success",
-			BuildFunc: func(name string) {
-				_, stdout, stderr, err = buildImageWithStdoutStderr(name, "FROM busybox", true, "-q", "--force-rm", "--rm")
-			},
-		},
-		{
-			Name: "quiet_build_ctx_success",
-			BuildFunc: func(name string) {
-				ctx, err := fakeContext("FROM busybox", map[string]string{
-					"quiet_build_success_fctx": "test",
-				})
-				if err != nil {
-					c.Fatalf("Failed to create context: %s", err.Error())
-				}
-				defer ctx.Close()
-				_, stdout, stderr, err = buildImageFromContextWithStdoutStderr(name, ctx, true, "-q", "--force-rm", "--rm")
-			},
-		},
-		{
-			Name: "quiet_build_git_success",
-			BuildFunc: func(name string) {
-				git, err := newFakeGit("repo", map[string]string{
-					"Dockerfile": "FROM busybox",
-				}, true)
-				if err != nil {
-					c.Fatalf("Failed to create the git repo: %s", err.Error())
-				}
-				defer git.Close()
-				_, stdout, stderr, err = buildImageFromGitWithStdoutStderr(name, git, true, "-q", "--force-rm", "--rm")
-
-			},
-		},
-	}
-
-	for _, te := range tt {
-		te.BuildFunc(te.Name)
-		if err != nil {
-			c.Fatalf("Test %s shouldn't fail, but got the following error: %s", te.Name, err.Error())
-		}
-		if outRegexp.Find([]byte(stdout)) == nil {
-			c.Fatalf("Test %s expected stdout to match the [%v] regexp, but it is [%v]", te.Name, outRegexp, stdout)
-		}
-
-		if stderr != "" {
-			c.Fatalf("Test %s expected stderr to be empty, but it is [%#v]", te.Name, stderr)
-		}
-	}
-
-}
-
-func (s *DockerSuite) TestBuildNotVerboseFailureWithNonExistImage(c *check.C) {
-	// This test makes sure that -q works correctly when build fails by
-	// comparing between the stderr output in quiet mode and in stdout
-	// and stderr output in verbose mode
-	testRequires(c, Network)
-	testName := "quiet_build_not_exists_image"
-	buildCmd := "FROM busybox11"
-	_, _, qstderr, qerr := buildImageWithStdoutStderr(testName, buildCmd, false, "-q", "--force-rm", "--rm")
-	_, vstdout, vstderr, verr := buildImageWithStdoutStderr(testName, buildCmd, false, "--force-rm", "--rm")
-	if verr == nil || qerr == nil {
-		c.Fatal(fmt.Errorf("Test [%s] expected to fail but didn't", testName))
-	}
-	if qstderr != vstdout+vstderr {
-		c.Fatal(fmt.Errorf("Test[%s] expected that quiet stderr and verbose stdout are equal; quiet [%v], verbose [%v]", testName, qstderr, vstdout+vstderr))
-	}
-}
-
-func (s *DockerSuite) TestBuildNotVerboseFailure(c *check.C) {
-	// This test makes sure that -q works correctly when build fails by
-	// comparing between the stderr output in quiet mode and in stdout
-	// and stderr output in verbose mode
-	tt := []struct {
-		TestName  string
-		BuildCmds string
-	}{
-		{"quiet_build_no_from_at_the_beginning", "RUN whoami"},
-		{"quiet_build_unknown_instr", "FROMD busybox"},
-	}
-
-	for _, te := range tt {
-		_, _, qstderr, qerr := buildImageWithStdoutStderr(te.TestName, te.BuildCmds, false, "-q", "--force-rm", "--rm")
-		_, vstdout, vstderr, verr := buildImageWithStdoutStderr(te.TestName, te.BuildCmds, false, "--force-rm", "--rm")
-		if verr == nil || qerr == nil {
-			c.Fatal(fmt.Errorf("Test [%s] expected to fail but didn't", te.TestName))
-		}
-		if qstderr != vstdout+vstderr {
-			c.Fatal(fmt.Errorf("Test[%s] expected that quiet stderr and verbose stdout are equal; quiet [%v], verbose [%v]", te.TestName, qstderr, vstdout+vstderr))
-		}
-	}
-}
-
-func (s *DockerSuite) TestBuildNotVerboseFailureRemote(c *check.C) {
-	// This test ensures that when given a wrong URL, stderr in quiet mode and
-	// stderr in verbose mode are identical.
-	// TODO(vdemeester) with cobra, stdout has a carriage return too much so this test should not check stdout
-	URL := "http://something.invalid"
-	Name := "quiet_build_wrong_remote"
-	_, _, qstderr, qerr := buildImageWithStdoutStderr(Name, "", false, "-q", "--force-rm", "--rm", URL)
-	_, _, vstderr, verr := buildImageWithStdoutStderr(Name, "", false, "--force-rm", "--rm", URL)
-	if qerr == nil || verr == nil {
-		c.Fatal(fmt.Errorf("Test [%s] expected to fail but didn't", Name))
-	}
-	if qstderr != vstderr {
-		c.Fatal(fmt.Errorf("Test[%s] expected that quiet stderr and verbose stdout are equal; quiet [%v], verbose [%v]", Name, qstderr, vstderr))
-	}
-}
-
-func (s *DockerSuite) TestBuildStderr(c *check.C) {
-	// This test just makes sure that no non-error output goes
-	// to stderr
-	name := "testbuildstderr"
-	_, _, stderr, err := buildImageWithStdoutStderr(name,
-		"FROM busybox\nRUN echo one", true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if runtime.GOOS == "windows" &&
-		daemonPlatform != "windows" {
-		// Windows to non-Windows should have a security warning
-		if !strings.Contains(stderr, "SECURITY WARNING:") {
-			c.Fatalf("Stderr contains unexpected output: %q", stderr)
-		}
-	} else {
-		// Other platform combinations should have no stderr written too
-		if stderr != "" {
-			c.Fatalf("Stderr should have been empty, instead it's: %q", stderr)
-		}
-	}
-}
-
-func (s *DockerSuite) TestBuildChownSingleFile(c *check.C) {
-	testRequires(c, UnixCli) // test uses chown: not available on windows
-	testRequires(c, DaemonIsLinux)
-
-	name := "testbuildchownsinglefile"
-
-	ctx, err := fakeContext(`
-FROM busybox
-COPY test /
-RUN ls -l /test
-RUN [ $(ls -l /test | awk '{print $3":"$4}') = 'root:root' ]
-`, map[string]string{
-		"test": "test",
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if err := os.Chown(filepath.Join(ctx.Dir, "test"), 4242, 4242); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildSymlinkBreakout(c *check.C) {
-	name := "testbuildsymlinkbreakout"
-	tmpdir, err := ioutil.TempDir("", name)
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(tmpdir)
-	ctx := filepath.Join(tmpdir, "context")
-	if err := os.MkdirAll(ctx, 0755); err != nil {
-		c.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(ctx, "Dockerfile"), []byte(`
-	from busybox
-	add symlink.tar /
-	add inject /symlink/
-	`), 0644); err != nil {
-		c.Fatal(err)
-	}
-	inject := filepath.Join(ctx, "inject")
-	if err := ioutil.WriteFile(inject, nil, 0644); err != nil {
-		c.Fatal(err)
-	}
-	f, err := os.Create(filepath.Join(ctx, "symlink.tar"))
-	if err != nil {
-		c.Fatal(err)
-	}
-	w := tar.NewWriter(f)
-	w.WriteHeader(&tar.Header{
-		Name:     "symlink2",
-		Typeflag: tar.TypeSymlink,
-		Linkname: "/../../../../../../../../../../../../../../",
-		Uid:      os.Getuid(),
-		Gid:      os.Getgid(),
-	})
-	w.WriteHeader(&tar.Header{
-		Name:     "symlink",
-		Typeflag: tar.TypeSymlink,
-		Linkname: filepath.Join("symlink2", tmpdir),
-		Uid:      os.Getuid(),
-		Gid:      os.Getgid(),
-	})
-	w.Close()
-	f.Close()
-	if _, err := buildImageFromContext(name, fakeContextFromDir(ctx), false); err != nil {
-		c.Fatal(err)
-	}
-	if _, err := os.Lstat(filepath.Join(tmpdir, "inject")); err == nil {
-		c.Fatal("symlink breakout - inject")
-	} else if !os.IsNotExist(err) {
-		c.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func (s *DockerSuite) TestBuildXZHost(c *check.C) {
-	// /usr/local/sbin/xz gets permission denied for the user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildxzhost"
-
-	ctx, err := fakeContext(`
-FROM busybox
-ADD xz /usr/local/sbin/
-RUN chmod 755 /usr/local/sbin/xz
-ADD test.xz /
-RUN [ ! -e /injected ]`,
-		map[string]string{
-			"test.xz": "\xfd\x37\x7a\x58\x5a\x00\x00\x04\xe6\xd6\xb4\x46\x02\x00" +
-				"\x21\x01\x16\x00\x00\x00\x74\x2f\xe5\xa3\x01\x00\x3f\xfd" +
-				"\x37\x7a\x58\x5a\x00\x00\x04\xe6\xd6\xb4\x46\x02\x00\x21",
-			"xz": "#!/bin/sh\ntouch /injected",
-		})
-
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildVolumesRetainContents(c *check.C) {
-	// /foo/file gets permission denied for the user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux) // TODO Windows: Issue #20127
-	var (
-		name     = "testbuildvolumescontent"
-		expected = "some text"
-		volName  = "/foo"
-	)
-
-	if daemonPlatform == "windows" {
-		volName = "C:/foo"
-	}
-
-	ctx, err := fakeContext(`
-FROM busybox
-COPY content /foo/file
-VOLUME `+volName+`
-CMD cat /foo/file`,
-		map[string]string{
-			"content": expected,
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, false); err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--rm", name)
-	if out != expected {
-		c.Fatalf("expected file contents for /foo/file to be %q but received %q", expected, out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildRenamedDockerfile(c *check.C) {
-
-	ctx, err := fakeContext(`FROM busybox
-	RUN echo from Dockerfile`,
-		map[string]string{
-			"Dockerfile":       "FROM busybox\nRUN echo from Dockerfile",
-			"files/Dockerfile": "FROM busybox\nRUN echo from files/Dockerfile",
-			"files/dFile":      "FROM busybox\nRUN echo from files/dFile",
-			"dFile":            "FROM busybox\nRUN echo from dFile",
-			"files/dFile2":     "FROM busybox\nRUN echo from files/dFile2",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-t", "test1", ".")
-	if err != nil {
-		c.Fatalf("Failed to build: %s\n%s", out, err)
-	}
-	if !strings.Contains(out, "from Dockerfile") {
-		c.Fatalf("test1 should have used Dockerfile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, ctx.Dir, "build", "-f", filepath.Join("files", "Dockerfile"), "-t", "test2", ".")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(out, "from files/Dockerfile") {
-		c.Fatalf("test2 should have used files/Dockerfile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, ctx.Dir, "build", fmt.Sprintf("--file=%s", filepath.Join("files", "dFile")), "-t", "test3", ".")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(out, "from files/dFile") {
-		c.Fatalf("test3 should have used files/dFile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, ctx.Dir, "build", "--file=dFile", "-t", "test4", ".")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(out, "from dFile") {
-		c.Fatalf("test4 should have used dFile, output:%s", out)
-	}
-
-	dirWithNoDockerfile, err := ioutil.TempDir(os.TempDir(), "test5")
-	c.Assert(err, check.IsNil)
-	nonDockerfileFile := filepath.Join(dirWithNoDockerfile, "notDockerfile")
-	if _, err = os.Create(nonDockerfileFile); err != nil {
-		c.Fatal(err)
-	}
-	out, _, err = dockerCmdInDir(c, ctx.Dir, "build", fmt.Sprintf("--file=%s", nonDockerfileFile), "-t", "test5", ".")
-
-	if err == nil {
-		c.Fatalf("test5 was supposed to fail to find passwd")
-	}
-
-	if expected := fmt.Sprintf("The Dockerfile (%s) must be within the build context (.)", nonDockerfileFile); !strings.Contains(out, expected) {
-		c.Fatalf("wrong error message:%v\nexpected to contain=%v", out, expected)
-	}
-
-	out, _, err = dockerCmdInDir(c, filepath.Join(ctx.Dir, "files"), "build", "-f", filepath.Join("..", "Dockerfile"), "-t", "test6", "..")
-	if err != nil {
-		c.Fatalf("test6 failed: %s", err)
-	}
-	if !strings.Contains(out, "from Dockerfile") {
-		c.Fatalf("test6 should have used root Dockerfile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, filepath.Join(ctx.Dir, "files"), "build", "-f", filepath.Join(ctx.Dir, "files", "Dockerfile"), "-t", "test7", "..")
-	if err != nil {
-		c.Fatalf("test7 failed: %s", err)
-	}
-	if !strings.Contains(out, "from files/Dockerfile") {
-		c.Fatalf("test7 should have used files Dockerfile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, filepath.Join(ctx.Dir, "files"), "build", "-f", filepath.Join("..", "Dockerfile"), "-t", "test8", ".")
-	if err == nil || !strings.Contains(out, "must be within the build context") {
-		c.Fatalf("test8 should have failed with Dockerfile out of context: %s", err)
-	}
-
-	tmpDir := os.TempDir()
-	out, _, err = dockerCmdInDir(c, tmpDir, "build", "-t", "test9", ctx.Dir)
-	if err != nil {
-		c.Fatalf("test9 - failed: %s", err)
-	}
-	if !strings.Contains(out, "from Dockerfile") {
-		c.Fatalf("test9 should have used root Dockerfile, output:%s", out)
-	}
-
-	out, _, err = dockerCmdInDir(c, filepath.Join(ctx.Dir, "files"), "build", "-f", "dFile2", "-t", "test10", ".")
-	if err != nil {
-		c.Fatalf("test10 should have worked: %s", err)
-	}
-	if !strings.Contains(out, "from files/dFile2") {
-		c.Fatalf("test10 should have used files/dFile2, output:%s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildFromMixedcaseDockerfile(c *check.C) {
-	testRequires(c, UnixCli) // Dockerfile overwrites dockerfile on windows
-	testRequires(c, DaemonIsLinux)
-
-	ctx, err := fakeContext(`FROM busybox
-	RUN echo from dockerfile`,
-		map[string]string{
-			"dockerfile": "FROM busybox\nRUN echo from dockerfile",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-t", "test1", ".")
-	if err != nil {
-		c.Fatalf("Failed to build: %s\n%s", out, err)
-	}
-
-	if !strings.Contains(out, "from dockerfile") {
-		c.Fatalf("Missing proper output: %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildWithTwoDockerfiles(c *check.C) {
-	testRequires(c, UnixCli) // Dockerfile overwrites dockerfile on windows
-	testRequires(c, DaemonIsLinux)
-
-	ctx, err := fakeContext(`FROM busybox
-RUN echo from Dockerfile`,
-		map[string]string{
-			"dockerfile": "FROM busybox\nRUN echo from dockerfile",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-t", "test1", ".")
-	if err != nil {
-		c.Fatalf("Failed to build: %s\n%s", out, err)
-	}
-
-	if !strings.Contains(out, "from Dockerfile") {
-		c.Fatalf("Missing proper output: %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildFromURLWithF(c *check.C) {
-	server, err := fakeStorage(map[string]string{"baz": `FROM busybox
-RUN echo from baz
-COPY * /tmp/
-RUN find /tmp/`})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer server.Close()
-
-	ctx, err := fakeContext(`FROM busybox
-RUN echo from Dockerfile`,
-		map[string]string{})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	// Make sure that -f is ignored and that we don't use the Dockerfile
-	// that's in the current dir
-	out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "-f", "baz", "-t", "test1", server.URL()+"/baz")
-	if err != nil {
-		c.Fatalf("Failed to build: %s\n%s", out, err)
-	}
-
-	if !strings.Contains(out, "from baz") ||
-		strings.Contains(out, "/tmp/baz") ||
-		!strings.Contains(out, "/tmp/Dockerfile") {
-		c.Fatalf("Missing proper output: %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildFromStdinWithF(c *check.C) {
-	testRequires(c, DaemonIsLinux) // TODO Windows: This test is flaky; no idea why
-	ctx, err := fakeContext(`FROM busybox
-RUN echo "from Dockerfile"`,
-		map[string]string{})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	// Make sure that -f is ignored and that we don't use the Dockerfile
-	// that's in the current dir
-	dockerCommand := exec.Command(dockerBinary, "build", "-f", "baz", "-t", "test1", "-")
-	dockerCommand.Dir = ctx.Dir
-	dockerCommand.Stdin = strings.NewReader(`FROM busybox
-RUN echo "from baz"
-COPY * /tmp/
-RUN sh -c "find /tmp/" # sh -c is needed on Windows to use the correct find`)
-	out, status, err := runCommandWithOutput(dockerCommand)
-	if err != nil || status != 0 {
-		c.Fatalf("Error building: %s", err)
-	}
-
-	if !strings.Contains(out, "from baz") ||
-		strings.Contains(out, "/tmp/baz") ||
-		!strings.Contains(out, "/tmp/Dockerfile") {
-		c.Fatalf("Missing proper output: %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildFromOfficialNames(c *check.C) {
-	name := "testbuildfromofficial"
-	fromNames := []string{
-		"busybox",
-		"docker.io/busybox",
-		"index.docker.io/busybox",
-		"library/busybox",
-		"docker.io/library/busybox",
-		"index.docker.io/library/busybox",
-	}
-	for idx, fromName := range fromNames {
-		imgName := fmt.Sprintf("%s%d", name, idx)
-		_, err := buildImage(imgName, "FROM "+fromName, true)
-		if err != nil {
-			c.Errorf("Build failed using FROM %s: %s", fromName, err)
-		}
-		deleteImages(imgName)
-	}
-}
-
-func (s *DockerSuite) TestBuildDockerfileOutsideContext(c *check.C) {
-	testRequires(c, UnixCli) // uses os.Symlink: not implemented in windows at the time of writing (go-1.4.2)
-	testRequires(c, DaemonIsLinux)
-
-	name := "testbuilddockerfileoutsidecontext"
-	tmpdir, err := ioutil.TempDir("", name)
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(tmpdir)
-	ctx := filepath.Join(tmpdir, "context")
-	if err := os.MkdirAll(ctx, 0755); err != nil {
-		c.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(ctx, "Dockerfile"), []byte("FROM scratch\nENV X Y"), 0644); err != nil {
-		c.Fatal(err)
-	}
-	wd, err := os.Getwd()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.Chdir(wd)
-	if err := os.Chdir(ctx); err != nil {
-		c.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(tmpdir, "outsideDockerfile"), []byte("FROM scratch\nENV x y"), 0644); err != nil {
-		c.Fatal(err)
-	}
-	if err := os.Symlink(filepath.Join("..", "outsideDockerfile"), filepath.Join(ctx, "dockerfile1")); err != nil {
-		c.Fatal(err)
-	}
-	if err := os.Symlink(filepath.Join(tmpdir, "outsideDockerfile"), filepath.Join(ctx, "dockerfile2")); err != nil {
-		c.Fatal(err)
-	}
-
-	for _, dockerfilePath := range []string{
-		filepath.Join("..", "outsideDockerfile"),
-		filepath.Join(ctx, "dockerfile1"),
-		filepath.Join(ctx, "dockerfile2"),
-	} {
-		result := dockerCmdWithResult("build", "-t", name, "--no-cache", "-f", dockerfilePath, ".")
-		c.Assert(result, icmd.Matches, icmd.Expected{
-			Err:      "must be within the build context",
-			ExitCode: 1,
-		})
-		deleteImages(name)
-	}
-
-	os.Chdir(tmpdir)
-
-	// Path to Dockerfile should be resolved relative to working directory, not relative to context.
-	// There is a Dockerfile in the context, but since there is no Dockerfile in the current directory, the following should fail
-	out, _, err := dockerCmdWithError("build", "-t", name, "--no-cache", "-f", "Dockerfile", ctx)
-	if err == nil {
-		c.Fatalf("Expected error. Out: %s", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildSpaces(c *check.C) {
-	// Test to make sure that leading/trailing spaces on a command
-	// doesn't change the error msg we get
-	var (
-		err1 error
-		err2 error
-	)
-
-	name := "testspaces"
-	ctx, err := fakeContext("FROM busybox\nCOPY\n",
-		map[string]string{
-			"Dockerfile": "FROM busybox\nCOPY\n",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err1 = buildImageFromContext(name, ctx, false); err1 == nil {
-		c.Fatal("Build 1 was supposed to fail, but didn't")
-	}
-
-	ctx.Add("Dockerfile", "FROM busybox\nCOPY    ")
-	if _, err2 = buildImageFromContext(name, ctx, false); err2 == nil {
-		c.Fatal("Build 2 was supposed to fail, but didn't")
-	}
-
-	removeLogTimestamps := func(s string) string {
-		return regexp.MustCompile(`time="(.*?)"`).ReplaceAllString(s, `time=[TIMESTAMP]`)
-	}
-
-	// Skip over the times
-	e1 := removeLogTimestamps(err1.Error())
-	e2 := removeLogTimestamps(err2.Error())
-
-	// Ignore whitespace since that's what were verifying doesn't change stuff
-	if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
-		c.Fatalf("Build 2's error wasn't the same as build 1's\n1:%s\n2:%s", err1, err2)
-	}
-
-	ctx.Add("Dockerfile", "FROM busybox\n   COPY")
-	if _, err2 = buildImageFromContext(name, ctx, false); err2 == nil {
-		c.Fatal("Build 3 was supposed to fail, but didn't")
-	}
-
-	// Skip over the times
-	e1 = removeLogTimestamps(err1.Error())
-	e2 = removeLogTimestamps(err2.Error())
-
-	// Ignore whitespace since that's what were verifying doesn't change stuff
-	if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
-		c.Fatalf("Build 3's error wasn't the same as build 1's\n1:%s\n3:%s", err1, err2)
-	}
-
-	ctx.Add("Dockerfile", "FROM busybox\n   COPY    ")
-	if _, err2 = buildImageFromContext(name, ctx, false); err2 == nil {
-		c.Fatal("Build 4 was supposed to fail, but didn't")
-	}
-
-	// Skip over the times
-	e1 = removeLogTimestamps(err1.Error())
-	e2 = removeLogTimestamps(err2.Error())
-
-	// Ignore whitespace since that's what were verifying doesn't change stuff
-	if strings.Replace(e1, " ", "", -1) != strings.Replace(e2, " ", "", -1) {
-		c.Fatalf("Build 4's error wasn't the same as build 1's\n1:%s\n4:%s", err1, err2)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildSpacesWithQuotes(c *check.C) {
-	// Test to make sure that spaces in quotes aren't lost
-	name := "testspacesquotes"
-
-	dockerfile := `FROM busybox
-RUN echo "  \
-  foo  "`
-
-	_, out, err := buildImageWithOut(name, dockerfile, false)
-	if err != nil {
-		c.Fatal("Build failed:", err)
-	}
-
-	expecting := "\n    foo  \n"
-	// Windows uses the builtin echo, which preserves quotes
-	if daemonPlatform == "windows" {
-		expecting = "\"    foo  \""
-	}
-	if !strings.Contains(out, expecting) {
-		c.Fatalf("Bad output: %q expecting to contain %q", out, expecting)
-	}
-
-}
-
-// #4393
-func (s *DockerSuite) TestBuildVolumeFileExistsinContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux) // TODO Windows: This should error out
-	buildCmd := exec.Command(dockerBinary, "build", "-t", "docker-test-errcreatevolumewithfile", "-")
-	buildCmd.Stdin = strings.NewReader(`
-	FROM busybox
-	RUN touch /foo
-	VOLUME /foo
-	`)
-
-	out, _, err := runCommandWithOutput(buildCmd)
-	if err == nil || !strings.Contains(out, "file exists") {
-		c.Fatalf("expected build to fail when file exists in container at requested volume path")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildMissingArgs(c *check.C) {
-	// Test to make sure that all Dockerfile commands (except the ones listed
-	// in skipCmds) will generate an error if no args are provided.
-	// Note: INSERT is deprecated so we exclude it because of that.
-	skipCmds := map[string]struct{}{
-		"CMD":        {},
-		"RUN":        {},
-		"ENTRYPOINT": {},
-		"INSERT":     {},
-	}
-
-	if daemonPlatform == "windows" {
-		skipCmds = map[string]struct{}{
-			"CMD":        {},
-			"RUN":        {},
-			"ENTRYPOINT": {},
-			"INSERT":     {},
-			"STOPSIGNAL": {},
-			"ARG":        {},
-			"USER":       {},
-			"EXPOSE":     {},
-		}
-	}
-
-	for cmd := range command.Commands {
-		cmd = strings.ToUpper(cmd)
-		if _, ok := skipCmds[cmd]; ok {
-			continue
-		}
-
-		var dockerfile string
-		if cmd == "FROM" {
-			dockerfile = cmd
-		} else {
-			// Add FROM to make sure we don't complain about it missing
-			dockerfile = "FROM busybox\n" + cmd
-		}
-
-		ctx, err := fakeContext(dockerfile, map[string]string{})
-		if err != nil {
-			c.Fatal(err)
-		}
-		defer ctx.Close()
-		var out string
-		if out, err = buildImageFromContext("args", ctx, true); err == nil {
-			c.Fatalf("%s was supposed to fail. Out:%s", cmd, out)
-		}
-		if !strings.Contains(err.Error(), cmd+" requires") {
-			c.Fatalf("%s returned the wrong type of error:%s", cmd, err)
-		}
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEmptyScratch(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	_, out, err := buildImageWithOut("sc", "FROM scratch", true)
-	if err == nil {
-		c.Fatalf("Build was supposed to fail")
-	}
-	if !strings.Contains(out, "No image was generated") {
-		c.Fatalf("Wrong error message: %v", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildDotDotFile(c *check.C) {
-	ctx, err := fakeContext("FROM busybox\n",
-		map[string]string{
-			"..gitme": "",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err = buildImageFromContext("sc", ctx, false); err != nil {
-		c.Fatalf("Build was supposed to work: %s", err)
-	}
-}
-
-func (s *DockerSuite) TestBuildRUNoneJSON(c *check.C) {
-	testRequires(c, DaemonIsLinux) // No hello-world Windows image
-	name := "testbuildrunonejson"
-
-	ctx, err := fakeContext(`FROM hello-world:frozen
-RUN [ "/hello" ]`, map[string]string{})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	out, _, err := dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "-t", name, ".")
-	if err != nil {
-		c.Fatalf("failed to build the image: %s, %v", out, err)
-	}
-
-	if !strings.Contains(out, "Hello from Docker") {
-		c.Fatalf("bad output: %s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildEmptyStringVolume(c *check.C) {
-	name := "testbuildemptystringvolume"
-
-	_, err := buildImage(name, `
-  FROM busybox
-  ENV foo=""
-  VOLUME $foo
-  `, false)
-	if err == nil {
-		c.Fatal("Should have failed to build")
-	}
-
-}
-
-func (s *DockerSuite) TestBuildContainerWithCgroupParent(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "test"
-	data, err := ioutil.ReadFile("/proc/self/cgroup")
-	if err != nil {
-		c.Fatalf("failed to read '/proc/self/cgroup - %v", err)
-	}
-	selfCgroupPaths := parseCgroupPaths(string(data))
-	_, found := selfCgroupPaths["memory"]
-	if !found {
-		c.Fatalf("unable to find self memory cgroup path. CgroupsPath: %v", selfCgroupPaths)
-	}
-	cmd := exec.Command(dockerBinary, "build", "--cgroup-parent", cgroupParent, "-")
-	cmd.Stdin = strings.NewReader(`
-FROM busybox
-RUN cat /proc/self/cgroup
-`)
-
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
-	}
-	m, err := regexp.MatchString(fmt.Sprintf("memory:.*/%s/.*", cgroupParent), out)
-	c.Assert(err, check.IsNil)
-	if !m {
-		c.Fatalf("There is no expected memory cgroup with parent /%s/: %s", cgroupParent, out)
-	}
-}
-
-func (s *DockerSuite) TestBuildNoDupOutput(c *check.C) {
-	// Check to make sure our build output prints the Dockerfile cmd
-	// property - there was a bug that caused it to be duplicated on the
-	// Step X  line
-	name := "testbuildnodupoutput"
-
-	_, out, err := buildImageWithOut(name, `
-  FROM busybox
-  RUN env`, false)
-	if err != nil {
-		c.Fatalf("Build should have worked: %q", err)
-	}
-
-	exp := "\nStep 2/2 : RUN env\n"
-	if !strings.Contains(out, exp) {
-		c.Fatalf("Bad output\nGot:%s\n\nExpected to contain:%s\n", out, exp)
-	}
-}
-
-// GH15826
-func (s *DockerSuite) TestBuildStartsFromOne(c *check.C) {
-	// Explicit check to ensure that build starts from step 1 rather than 0
-	name := "testbuildstartsfromone"
-
-	_, out, err := buildImageWithOut(name, `
-  FROM busybox`, false)
-	if err != nil {
-		c.Fatalf("Build should have worked: %q", err)
-	}
-
-	exp := "\nStep 1/1 : FROM busybox\n"
-	if !strings.Contains(out, exp) {
-		c.Fatalf("Bad output\nGot:%s\n\nExpected to contain:%s\n", out, exp)
-	}
-}
-
-func (s *DockerSuite) TestBuildRUNErrMsg(c *check.C) {
-	// Test to make sure the bad command is quoted with just "s and
-	// not as a Go []string
-	name := "testbuildbadrunerrmsg"
-	_, out, err := buildImageWithOut(name, `
-  FROM busybox
-  RUN badEXE a1 \& a2	a3`, false) // tab between a2 and a3
-	if err == nil {
-		c.Fatal("Should have failed to build")
-	}
-	shell := "/bin/sh -c"
-	exitCode := "127"
-	if daemonPlatform == "windows" {
-		shell = "cmd /S /C"
-		// architectural - Windows has to start the container to determine the exe is bad, Linux does not
-		exitCode = "1"
-	}
-	exp := `The command '` + shell + ` badEXE a1 \& a2	a3' returned a non-zero code: ` + exitCode
-	if !strings.Contains(out, exp) {
-		c.Fatalf("RUN doesn't have the correct output:\nGot:%s\nExpected:%s", out, exp)
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedBuild(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-build")
-	dockerFile := fmt.Sprintf(`
-  FROM %s
-  RUN []
-    `, repoName)
-
-	name := "testtrustedbuild"
-
-	buildCmd := buildImageCmd(name, dockerFile, true)
-	s.trustedCmd(buildCmd)
-	out, _, err := runCommandWithOutput(buildCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted build: %s\n%s", err, out)
-	}
-
-	if !strings.Contains(out, fmt.Sprintf("FROM %s@sha", repoName[:len(repoName)-7])) {
-		c.Fatalf("Unexpected output on trusted build:\n%s", out)
-	}
-
-	// We should also have a tag reference for the image.
-	if out, exitCode := dockerCmd(c, "inspect", repoName); exitCode != 0 {
-		c.Fatalf("unexpected exit code inspecting image %q: %d: %s", repoName, exitCode, out)
-	}
-
-	// We should now be able to remove the tag reference.
-	if out, exitCode := dockerCmd(c, "rmi", repoName); exitCode != 0 {
-		c.Fatalf("unexpected exit code inspecting image %q: %d: %s", repoName, exitCode, out)
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedBuildUntrustedTag(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/build-untrusted-tag:latest", privateRegistryURL)
-	dockerFile := fmt.Sprintf(`
-  FROM %s
-  RUN []
-    `, repoName)
-
-	name := "testtrustedbuilduntrustedtag"
-
-	buildCmd := buildImageCmd(name, dockerFile, true)
-	s.trustedCmd(buildCmd)
-	out, _, err := runCommandWithOutput(buildCmd)
-	if err == nil {
-		c.Fatalf("Expected error on trusted build with untrusted tag: %s\n%s", err, out)
-	}
-
-	if !strings.Contains(out, "does not have trust data for") {
-		c.Fatalf("Unexpected output on trusted build with untrusted tag:\n%s", out)
-	}
-}
-
-func (s *DockerTrustSuite) TestBuildContextDirIsSymlink(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	tempDir, err := ioutil.TempDir("", "test-build-dir-is-symlink-")
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(tempDir)
-
-	// Make a real context directory in this temp directory with a simple
-	// Dockerfile.
-	realContextDirname := filepath.Join(tempDir, "context")
-	if err := os.Mkdir(realContextDirname, os.FileMode(0755)); err != nil {
-		c.Fatal(err)
-	}
-
-	if err = ioutil.WriteFile(
-		filepath.Join(realContextDirname, "Dockerfile"),
-		[]byte(`
-			FROM busybox
-			RUN echo hello world
-		`),
-		os.FileMode(0644),
-	); err != nil {
-		c.Fatal(err)
-	}
-
-	// Make a symlink to the real context directory.
-	contextSymlinkName := filepath.Join(tempDir, "context_link")
-	if err := os.Symlink(realContextDirname, contextSymlinkName); err != nil {
-		c.Fatal(err)
-	}
-
-	// Executing the build with the symlink as the specified context should
-	// *not* fail.
-	if out, exitStatus := dockerCmd(c, "build", contextSymlinkName); exitStatus != 0 {
-		c.Fatalf("build failed with exit status %d: %s", exitStatus, out)
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedBuildTagFromReleasesRole(c *check.C) {
-	testRequires(c, NotaryHosting)
-
-	latestTag := s.setupTrustedImage(c, "trusted-build-releases-role")
-	repoName := strings.TrimSuffix(latestTag, ":latest")
-
-	// Now create the releases role
-	s.notaryCreateDelegation(c, repoName, "targets/releases", s.not.keys[0].Public)
-	s.notaryImportKey(c, repoName, "targets/releases", s.not.keys[0].Private)
-	s.notaryPublish(c, repoName)
-
-	// push a different tag to the releases role
-	otherTag := fmt.Sprintf("%s:other", repoName)
-	dockerCmd(c, "tag", "busybox", otherTag)
-
-	pushCmd := exec.Command(dockerBinary, "push", otherTag)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Trusted push failed: %s", out))
-	s.assertTargetInRoles(c, repoName, "other", "targets/releases")
-	s.assertTargetNotInRoles(c, repoName, "other", "targets")
-
-	out, status := dockerCmd(c, "rmi", otherTag)
-	c.Assert(status, check.Equals, 0, check.Commentf("docker rmi failed: %s", out))
-
-	dockerFile := fmt.Sprintf(`
-  FROM %s
-  RUN []
-    `, otherTag)
-
-	name := "testtrustedbuildreleasesrole"
-
-	buildCmd := buildImageCmd(name, dockerFile, true)
-	s.trustedCmd(buildCmd)
-	out, _, err = runCommandWithOutput(buildCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Trusted build failed: %s", out))
-	c.Assert(out, checker.Contains, fmt.Sprintf("FROM %s@sha", repoName))
-}
-
-func (s *DockerTrustSuite) TestTrustedBuildTagIgnoresOtherDelegationRoles(c *check.C) {
-	testRequires(c, NotaryHosting)
-
-	latestTag := s.setupTrustedImage(c, "trusted-build-releases-role")
-	repoName := strings.TrimSuffix(latestTag, ":latest")
-
-	// Now create a non-releases delegation role
-	s.notaryCreateDelegation(c, repoName, "targets/other", s.not.keys[0].Public)
-	s.notaryImportKey(c, repoName, "targets/other", s.not.keys[0].Private)
-	s.notaryPublish(c, repoName)
-
-	// push a different tag to the other role
-	otherTag := fmt.Sprintf("%s:other", repoName)
-	dockerCmd(c, "tag", "busybox", otherTag)
-
-	pushCmd := exec.Command(dockerBinary, "push", otherTag)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Trusted push failed: %s", out))
-	s.assertTargetInRoles(c, repoName, "other", "targets/other")
-	s.assertTargetNotInRoles(c, repoName, "other", "targets")
-
-	out, status := dockerCmd(c, "rmi", otherTag)
-	c.Assert(status, check.Equals, 0, check.Commentf("docker rmi failed: %s", out))
-
-	dockerFile := fmt.Sprintf(`
-  FROM %s
-  RUN []
-    `, otherTag)
-
-	name := "testtrustedbuildotherrole"
-
-	buildCmd := buildImageCmd(name, dockerFile, true)
-	s.trustedCmd(buildCmd)
-	out, _, err = runCommandWithOutput(buildCmd)
-	c.Assert(err, check.NotNil, check.Commentf("Trusted build expected to fail: %s", out))
-}
-
-// Issue #15634: COPY fails when path starts with "null"
-func (s *DockerSuite) TestBuildNullStringInAddCopyVolume(c *check.C) {
-	name := "testbuildnullstringinaddcopyvolume"
-
-	volName := "nullvolume"
-
-	if daemonPlatform == "windows" {
-		volName = `C:\\nullvolume`
-	}
-
-	ctx, err := fakeContext(`
-		FROM busybox
-
-		ADD null /
-		COPY nullfile /
-		VOLUME `+volName+`
-		`,
-		map[string]string{
-			"null":     "test1",
-			"nullfile": "test2",
-		},
-	)
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestBuildStopSignal(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support STOPSIGNAL yet
-	imgName := "test_build_stop_signal"
-	_, err := buildImage(imgName,
-		`FROM busybox
-		 STOPSIGNAL SIGKILL`,
-		true)
-	c.Assert(err, check.IsNil)
-	res := inspectFieldJSON(c, imgName, "Config.StopSignal")
-	if res != `"SIGKILL"` {
-		c.Fatalf("Signal %s, expected SIGKILL", res)
-	}
-
-	containerName := "test-container-stop-signal"
-	dockerCmd(c, "run", "-d", "--name", containerName, imgName, "top")
-
-	res = inspectFieldJSON(c, containerName, "Config.StopSignal")
-	if res != `"SIGKILL"` {
-		c.Fatalf("Signal %s, expected SIGKILL", res)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArg(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	args := []string{"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal)}
-	var dockerfile string
-	if daemonPlatform == "windows" {
-		// Bugs in Windows busybox port - use the default base image and native cmd stuff
-		dockerfile = fmt.Sprintf(`FROM `+minimalBaseImage()+`
-			ARG %s
-			RUN echo %%%s%%
-			CMD setlocal enableextensions && if defined %s (echo %%%s%%)`, envKey, envKey, envKey, envKey)
-	} else {
-		dockerfile = fmt.Sprintf(`FROM busybox
-			ARG %s
-			RUN echo $%s
-			CMD echo $%s`, envKey, envKey, envKey)
-
-	}
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || !strings.Contains(out, envVal) {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envVal)
-	}
-
-	containerName := "bldargCont"
-	out, _ := dockerCmd(c, "run", "--name", containerName, imgName)
-	out = strings.Trim(out, " \r\n'")
-	if out != "" {
-		c.Fatalf("run produced invalid output: %q, expected empty string", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgHistory(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	envDef := "bar1"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s=%s`, envKey, envDef)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || !strings.Contains(out, envVal) {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envVal)
-	}
-
-	out, _ := dockerCmd(c, "history", "--no-trunc", imgName)
-	outputTabs := strings.Split(out, "\n")[1]
-	if !strings.Contains(outputTabs, envDef) {
-		c.Fatalf("failed to find arg default in image history output: %q expected: %q", outputTabs, envDef)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgCacheHit(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		RUN echo $%s`, envKey, envKey)
-
-	origImgID := ""
-	var err error
-	if origImgID, err = buildImage(imgName, dockerfile, true, args...); err != nil {
-		c.Fatal(err)
-	}
-
-	imgNameCache := "bldargtestcachehit"
-	if newImgID, err := buildImage(imgNameCache, dockerfile, true, args...); err != nil || newImgID != origImgID {
-		if err != nil {
-			c.Fatal(err)
-		}
-		c.Fatalf("build didn't use cache! expected image id: %q built image id: %q", origImgID, newImgID)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgCacheMissExtraArg(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	extraEnvKey := "foo1"
-	extraEnvVal := "bar1"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		ARG %s
-		RUN echo $%s`, envKey, extraEnvKey, envKey)
-
-	origImgID := ""
-	var err error
-	if origImgID, err = buildImage(imgName, dockerfile, true, args...); err != nil {
-		c.Fatal(err)
-	}
-
-	imgNameCache := "bldargtestcachemiss"
-	args = append(args, "--build-arg", fmt.Sprintf("%s=%s", extraEnvKey, extraEnvVal))
-	if newImgID, err := buildImage(imgNameCache, dockerfile, true, args...); err != nil || newImgID == origImgID {
-		if err != nil {
-			c.Fatal(err)
-		}
-		c.Fatalf("build used cache, expected a miss!")
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgCacheMissSameArgDiffVal(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	newEnvVal := "bar1"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		RUN echo $%s`, envKey, envKey)
-
-	origImgID := ""
-	var err error
-	if origImgID, err = buildImage(imgName, dockerfile, true, args...); err != nil {
-		c.Fatal(err)
-	}
-
-	imgNameCache := "bldargtestcachemiss"
-	args = []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, newEnvVal),
-	}
-	if newImgID, err := buildImage(imgNameCache, dockerfile, true, args...); err != nil || newImgID == origImgID {
-		if err != nil {
-			c.Fatal(err)
-		}
-		c.Fatalf("build used cache, expected a miss!")
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgOverrideArgDefinedBeforeEnv(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	envValOveride := "barOverride"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		ENV %s %s
-		RUN echo $%s
-		CMD echo $%s
-        `, envKey, envKey, envValOveride, envKey, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Count(out, envValOveride) != 2 {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envValOveride)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); !strings.Contains(out, envValOveride) {
-		c.Fatalf("run produced invalid output: %q, expected %q", out, envValOveride)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgOverrideEnvDefinedBeforeArg(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	envValOveride := "barOverride"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ENV %s %s
-		ARG %s
-		RUN echo $%s
-		CMD echo $%s
-        `, envKey, envValOveride, envKey, envKey, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Count(out, envValOveride) != 2 {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envValOveride)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); !strings.Contains(out, envValOveride) {
-		c.Fatalf("run produced invalid output: %q, expected %q", out, envValOveride)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgExpansion(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldvarstest"
-
-	wdVar := "WDIR"
-	wdVal := "/tmp/"
-	addVar := "AFILE"
-	addVal := "addFile"
-	copyVar := "CFILE"
-	copyVal := "copyFile"
-	envVar := "foo"
-	envVal := "bar"
-	exposeVar := "EPORT"
-	exposeVal := "9999"
-	userVar := "USER"
-	userVal := "testUser"
-	volVar := "VOL"
-	volVal := "/testVol/"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", wdVar, wdVal),
-		"--build-arg", fmt.Sprintf("%s=%s", addVar, addVal),
-		"--build-arg", fmt.Sprintf("%s=%s", copyVar, copyVal),
-		"--build-arg", fmt.Sprintf("%s=%s", envVar, envVal),
-		"--build-arg", fmt.Sprintf("%s=%s", exposeVar, exposeVal),
-		"--build-arg", fmt.Sprintf("%s=%s", userVar, userVal),
-		"--build-arg", fmt.Sprintf("%s=%s", volVar, volVal),
-	}
-	ctx, err := fakeContext(fmt.Sprintf(`FROM busybox
-		ARG %s
-		WORKDIR ${%s}
-		ARG %s
-		ADD ${%s} testDir/
-		ARG %s
-		COPY $%s testDir/
-		ARG %s
-		ENV %s=${%s}
-		ARG %s
-		EXPOSE $%s
-		ARG %s
-		USER $%s
-		ARG %s
-		VOLUME ${%s}`,
-		wdVar, wdVar, addVar, addVar, copyVar, copyVar, envVar, envVar,
-		envVar, exposeVar, exposeVar, userVar, userVar, volVar, volVar),
-		map[string]string{
-			addVal:  "some stuff",
-			copyVal: "some stuff",
-		})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(imgName, ctx, true, args...); err != nil {
-		c.Fatal(err)
-	}
-
-	var resMap map[string]interface{}
-	var resArr []string
-	res := ""
-	res = inspectField(c, imgName, "Config.WorkingDir")
-	if res != filepath.ToSlash(filepath.Clean(wdVal)) {
-		c.Fatalf("Config.WorkingDir value mismatch. Expected: %s, got: %s", filepath.ToSlash(filepath.Clean(wdVal)), res)
-	}
-
-	inspectFieldAndMarshall(c, imgName, "Config.Env", &resArr)
-
-	found := false
-	for _, v := range resArr {
-		if fmt.Sprintf("%s=%s", envVar, envVal) == v {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("Config.Env value mismatch. Expected <key=value> to exist: %s=%s, got: %v",
-			envVar, envVal, resArr)
-	}
-
-	inspectFieldAndMarshall(c, imgName, "Config.ExposedPorts", &resMap)
-	if _, ok := resMap[fmt.Sprintf("%s/tcp", exposeVal)]; !ok {
-		c.Fatalf("Config.ExposedPorts value mismatch. Expected exposed port: %s/tcp, got: %v", exposeVal, resMap)
-	}
-
-	res = inspectField(c, imgName, "Config.User")
-	if res != userVal {
-		c.Fatalf("Config.User value mismatch. Expected: %s, got: %s", userVal, res)
-	}
-
-	inspectFieldAndMarshall(c, imgName, "Config.Volumes", &resMap)
-	if _, ok := resMap[volVal]; !ok {
-		c.Fatalf("Config.Volumes value mismatch. Expected volume: %s, got: %v", volVal, resMap)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgExpansionOverride(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldvarstest"
-	envKey := "foo"
-	envVal := "bar"
-	envKey1 := "foo1"
-	envValOveride := "barOverride"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		ENV %s %s
-		ENV %s ${%s}
-		RUN echo $%s
-		CMD echo $%s`, envKey, envKey, envValOveride, envKey1, envKey, envKey1, envKey1)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Count(out, envValOveride) != 2 {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envValOveride)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); !strings.Contains(out, envValOveride) {
-		c.Fatalf("run produced invalid output: %q, expected %q", out, envValOveride)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgUntrustedDefinedAfterUse(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		RUN echo $%s
-		ARG %s
-		CMD echo $%s`, envKey, envKey, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Contains(out, envVal) {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("able to access environment variable in output: %q expected to be missing", out)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); out != "\n" {
-		c.Fatalf("run produced invalid output: %q, expected empty string", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgBuiltinArg(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support --build-arg
-	imgName := "bldargtest"
-	envKey := "HTTP_PROXY"
-	envVal := "bar"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		RUN echo $%s
-		CMD echo $%s`, envKey, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || !strings.Contains(out, envVal) {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envVal)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); out != "\n" {
-		c.Fatalf("run produced invalid output: %q, expected empty string", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgDefaultOverride(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	envValOveride := "barOverride"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envValOveride),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s=%s
-		ENV %s $%s
-		RUN echo $%s
-		CMD echo $%s`, envKey, envVal, envKey, envKey, envKey, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Count(out, envValOveride) != 1 {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("failed to access environment variable in output: %q expected: %q", out, envValOveride)
-	}
-
-	containerName := "bldargCont"
-	if out, _ := dockerCmd(c, "run", "--name", containerName, imgName); !strings.Contains(out, envValOveride) {
-		c.Fatalf("run produced invalid output: %q, expected %q", out, envValOveride)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgUnconsumedArg(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envVal := "bar"
-	args := []string{
-		"--build-arg", fmt.Sprintf("%s=%s", envKey, envVal),
-	}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		RUN echo $%s
-		CMD echo $%s`, envKey, envKey)
-
-	warnStr := "[Warning] One or more build-args"
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); !strings.Contains(out, warnStr) {
-		c.Fatalf("build completed without warning: %q %q", out, err)
-	} else if err != nil {
-		c.Fatalf("build failed to complete: %q %q", out, err)
-	}
-
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgEnv(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	args := []string{
-		"build",
-		"--build-arg", fmt.Sprintf("FOO1=fromcmd"),
-		"--build-arg", fmt.Sprintf("FOO2="),
-		"--build-arg", fmt.Sprintf("FOO3"), // set in env
-		"--build-arg", fmt.Sprintf("FOO4"), // not set in env
-		"--build-arg", fmt.Sprintf("FOO5=fromcmd"),
-		// FOO6 is not set at all
-		"--build-arg", fmt.Sprintf("FOO7=fromcmd"), // should produce a warning
-		"--build-arg", fmt.Sprintf("FOO8="), // should produce a warning
-		"--build-arg", fmt.Sprintf("FOO9"), // should produce a warning
-		".",
-	}
-
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG FOO1=fromfile
-		ARG FOO2=fromfile
-		ARG FOO3=fromfile
-		ARG FOO4=fromfile
-		ARG FOO5
-		ARG FOO6
-		RUN env
-		RUN [ "$FOO1" == "fromcmd" ]
-		RUN [ "$FOO2" == "" ]
-		RUN [ "$FOO3" == "fromenv" ]
-		RUN [ "$FOO4" == "fromfile" ]
-		RUN [ "$FOO5" == "fromcmd" ]
-		# The following should not exist at all in the env
-		RUN [ "$(env | grep FOO6)" == "" ]
-		RUN [ "$(env | grep FOO7)" == "" ]
-		RUN [ "$(env | grep FOO8)" == "" ]
-		RUN [ "$(env | grep FOO9)" == "" ]
-	    `)
-
-	ctx, err := fakeContext(dockerfile, nil)
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	cmd := exec.Command(dockerBinary, args...)
-	cmd.Dir = ctx.Dir
-	cmd.Env = append(os.Environ(),
-		"FOO1=fromenv",
-		"FOO2=fromenv",
-		"FOO3=fromenv")
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-
-	// Now check to make sure we got a warning msg about unused build-args
-	i := strings.Index(out, "[Warning]")
-	if i < 0 {
-		c.Fatalf("Missing the build-arg warning in %q", out)
-	}
-
-	out = out[i:] // "out" should contain just the warning message now
-
-	// These were specified on a --build-arg but no ARG was in the Dockerfile
-	c.Assert(out, checker.Contains, "FOO7")
-	c.Assert(out, checker.Contains, "FOO8")
-	c.Assert(out, checker.Contains, "FOO9")
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgQuotedValVariants(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	envKey1 := "foo1"
-	envKey2 := "foo2"
-	envKey3 := "foo3"
-	args := []string{}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s=""
-		ARG %s=''
-		ARG %s="''"
-		ARG %s='""'
-		RUN [ "$%s" != "$%s" ]
-		RUN [ "$%s" != "$%s" ]
-		RUN [ "$%s" != "$%s" ]
-		RUN [ "$%s" != "$%s" ]
-		RUN [ "$%s" != "$%s" ]`, envKey, envKey1, envKey2, envKey3,
-		envKey, envKey2, envKey, envKey3, envKey1, envKey2, envKey1, envKey3,
-		envKey2, envKey3)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil {
-		c.Fatalf("build failed to complete: %q %q", out, err)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgEmptyValVariants(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support ARG
-	imgName := "bldargtest"
-	envKey := "foo"
-	envKey1 := "foo1"
-	envKey2 := "foo2"
-	args := []string{}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s=
-		ARG %s=""
-		ARG %s=''
-		RUN [ "$%s" == "$%s" ]
-		RUN [ "$%s" == "$%s" ]
-		RUN [ "$%s" == "$%s" ]`, envKey, envKey1, envKey2, envKey, envKey1, envKey1, envKey2, envKey, envKey2)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil {
-		c.Fatalf("build failed to complete: %q %q", out, err)
-	}
-}
-
-func (s *DockerSuite) TestBuildBuildTimeArgDefintionWithNoEnvInjection(c *check.C) {
-	imgName := "bldargtest"
-	envKey := "foo"
-	args := []string{}
-	dockerfile := fmt.Sprintf(`FROM busybox
-		ARG %s
-		RUN env`, envKey)
-
-	if _, out, err := buildImageWithOut(imgName, dockerfile, true, args...); err != nil || strings.Count(out, envKey) != 1 {
-		if err != nil {
-			c.Fatalf("build failed to complete: %q %q", out, err)
-		}
-		c.Fatalf("unexpected number of occurrences of the arg in output: %q expected: 1", out)
-	}
-}
-
-func (s *DockerSuite) TestBuildNoNamedVolume(c *check.C) {
-	volName := "testname:/foo"
-
-	if daemonPlatform == "windows" {
-		volName = "testname:C:\\foo"
-	}
-	dockerCmd(c, "run", "-v", volName, "busybox", "sh", "-c", "touch /foo/oops")
-
-	dockerFile := `FROM busybox
-	VOLUME ` + volName + `
-	RUN ls /foo/oops
-	`
-	_, err := buildImage("test", dockerFile, false)
-	c.Assert(err, check.NotNil, check.Commentf("image build should have failed"))
-}
-
-func (s *DockerSuite) TestBuildTagEvent(c *check.C) {
-	since := daemonUnixTime(c)
-
-	dockerFile := `FROM busybox
-	RUN echo events
-	`
-	_, err := buildImage("test", dockerFile, false)
-	c.Assert(err, check.IsNil)
-
-	until := daemonUnixTime(c)
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "--filter", "type=image")
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	actions := eventActionsByIDAndType(c, events, "test:latest", "image")
-	var foundTag bool
-	for _, a := range actions {
-		if a == "tag" {
-			foundTag = true
-			break
-		}
-	}
-
-	c.Assert(foundTag, checker.True, check.Commentf("No tag event found:\n%s", out))
-}
-
-// #15780
-func (s *DockerSuite) TestBuildMultipleTags(c *check.C) {
-	dockerfile := `
-	FROM busybox
-	MAINTAINER test-15780
-	`
-	cmd := exec.Command(dockerBinary, "build", "-t", "tag1", "-t", "tag2:v2",
-		"-t", "tag1:latest", "-t", "tag1", "--no-cache", "-")
-	cmd.Stdin = strings.NewReader(dockerfile)
-	_, err := runCommand(cmd)
-	c.Assert(err, check.IsNil)
-
-	id1, err := getIDByName("tag1")
-	c.Assert(err, check.IsNil)
-	id2, err := getIDByName("tag2:v2")
-	c.Assert(err, check.IsNil)
-	c.Assert(id1, check.Equals, id2)
-}
-
-// #17290
-func (s *DockerSuite) TestBuildCacheBrokenSymlink(c *check.C) {
-	name := "testbuildbrokensymlink"
-	ctx, err := fakeContext(`
-	FROM busybox
-	COPY . ./`,
-		map[string]string{
-			"foo": "bar",
-		})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	err = os.Symlink(filepath.Join(ctx.Dir, "nosuchfile"), filepath.Join(ctx.Dir, "asymlink"))
-	c.Assert(err, checker.IsNil)
-
-	// warm up cache
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	// add new file to context, should invalidate cache
-	err = ioutil.WriteFile(filepath.Join(ctx.Dir, "newfile"), []byte("foo"), 0644)
-	c.Assert(err, checker.IsNil)
-
-	_, out, err := buildImageFromContextWithOut(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Not(checker.Contains), "Using cache")
-
-}
-
-func (s *DockerSuite) TestBuildFollowSymlinkToFile(c *check.C) {
-	name := "testbuildbrokensymlink"
-	ctx, err := fakeContext(`
-	FROM busybox
-	COPY asymlink target`,
-		map[string]string{
-			"foo": "bar",
-		})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	err = os.Symlink("foo", filepath.Join(ctx.Dir, "asymlink"))
-	c.Assert(err, checker.IsNil)
-
-	id, err := buildImageFromContext(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "run", "--rm", id, "cat", "target")
-	c.Assert(out, checker.Matches, "bar")
-
-	// change target file should invalidate cache
-	err = ioutil.WriteFile(filepath.Join(ctx.Dir, "foo"), []byte("baz"), 0644)
-	c.Assert(err, checker.IsNil)
-
-	id, out, err = buildImageFromContextWithOut(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), "Using cache")
-
-	out, _ = dockerCmd(c, "run", "--rm", id, "cat", "target")
-	c.Assert(out, checker.Matches, "baz")
-}
-
-func (s *DockerSuite) TestBuildFollowSymlinkToDir(c *check.C) {
-	name := "testbuildbrokensymlink"
-	ctx, err := fakeContext(`
-	FROM busybox
-	COPY asymlink /`,
-		map[string]string{
-			"foo/abc": "bar",
-			"foo/def": "baz",
-		})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	err = os.Symlink("foo", filepath.Join(ctx.Dir, "asymlink"))
-	c.Assert(err, checker.IsNil)
-
-	id, err := buildImageFromContext(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "run", "--rm", id, "cat", "abc", "def")
-	c.Assert(out, checker.Matches, "barbaz")
-
-	// change target file should invalidate cache
-	err = ioutil.WriteFile(filepath.Join(ctx.Dir, "foo/def"), []byte("bax"), 0644)
-	c.Assert(err, checker.IsNil)
-
-	id, out, err = buildImageFromContextWithOut(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), "Using cache")
-
-	out, _ = dockerCmd(c, "run", "--rm", id, "cat", "abc", "def")
-	c.Assert(out, checker.Matches, "barbax")
-
-}
-
-// TestBuildSymlinkBasename tests that target file gets basename from symlink,
-// not from the target file.
-func (s *DockerSuite) TestBuildSymlinkBasename(c *check.C) {
-	name := "testbuildbrokensymlink"
-	ctx, err := fakeContext(`
-	FROM busybox
-	COPY asymlink /`,
-		map[string]string{
-			"foo": "bar",
-		})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	err = os.Symlink("foo", filepath.Join(ctx.Dir, "asymlink"))
-	c.Assert(err, checker.IsNil)
-
-	id, err := buildImageFromContext(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "run", "--rm", id, "cat", "asymlink")
-	c.Assert(out, checker.Matches, "bar")
-
-}
-
-// #17827
-func (s *DockerSuite) TestBuildCacheRootSource(c *check.C) {
-	name := "testbuildrootsource"
-	ctx, err := fakeContext(`
-	FROM busybox
-	COPY / /data`,
-		map[string]string{
-			"foo": "bar",
-		})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	// warm up cache
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	// change file, should invalidate cache
-	err = ioutil.WriteFile(filepath.Join(ctx.Dir, "foo"), []byte("baz"), 0644)
-	c.Assert(err, checker.IsNil)
-
-	_, out, err := buildImageFromContextWithOut(name, ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Not(checker.Contains), "Using cache")
-}
-
-// #19375
-func (s *DockerSuite) TestBuildFailsGitNotCallable(c *check.C) {
-	cmd := exec.Command(dockerBinary, "build", "github.com/docker/v1.10-migrator.git")
-	cmd.Env = append(cmd.Env, "PATH=")
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "unable to prepare context: unable to find 'git': ")
-
-	cmd = exec.Command(dockerBinary, "build", "https://github.com/docker/v1.10-migrator.git")
-	cmd.Env = append(cmd.Env, "PATH=")
-	out, _, err = runCommandWithOutput(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "unable to prepare context: unable to find 'git': ")
-}
-
-// TestBuildWorkdirWindowsPath tests that a Windows style path works as a workdir
-func (s *DockerSuite) TestBuildWorkdirWindowsPath(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildworkdirwindowspath"
-
-	_, err := buildImage(name, `
-	FROM `+WindowsBaseImage+`
-	RUN mkdir C:\\work
-	WORKDIR C:\\work
-	RUN if "%CD%" NEQ "C:\work" exit -1
-	`, true)
-
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestBuildLabel(c *check.C) {
-	name := "testbuildlabel"
-	testLabel := "foo"
-
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  LABEL default foo
-`, false, "--label", testLabel)
-
-	c.Assert(err, checker.IsNil)
-
-	res := inspectFieldJSON(c, name, "Config.Labels")
-
-	var labels map[string]string
-
-	if err := json.Unmarshal([]byte(res), &labels); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := labels[testLabel]; !ok {
-		c.Fatal("label not found in image")
-	}
-}
-
-func (s *DockerSuite) TestBuildLabelOneNode(c *check.C) {
-	name := "testbuildlabel"
-
-	_, err := buildImage(name, "FROM busybox", false, "--label", "foo=bar")
-
-	c.Assert(err, checker.IsNil)
-
-	res, err := inspectImage(name, "json .Config.Labels")
-	c.Assert(err, checker.IsNil)
-	var labels map[string]string
-
-	if err := json.Unmarshal([]byte(res), &labels); err != nil {
-		c.Fatal(err)
-	}
-
-	v, ok := labels["foo"]
-	if !ok {
-		c.Fatal("label `foo` not found in image")
-	}
-	c.Assert(v, checker.Equals, "bar")
-}
-
-func (s *DockerSuite) TestBuildLabelCacheCommit(c *check.C) {
-	name := "testbuildlabelcachecommit"
-	testLabel := "foo"
-
-	if _, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  LABEL default foo
-  `, false); err != nil {
-		c.Fatal(err)
-	}
-
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  LABEL default foo
-`, true, "--label", testLabel)
-
-	c.Assert(err, checker.IsNil)
-
-	res := inspectFieldJSON(c, name, "Config.Labels")
-
-	var labels map[string]string
-
-	if err := json.Unmarshal([]byte(res), &labels); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, ok := labels[testLabel]; !ok {
-		c.Fatal("label not found in image")
-	}
-}
-
-func (s *DockerSuite) TestBuildLabelMultiple(c *check.C) {
-	name := "testbuildlabelmultiple"
-	testLabels := map[string]string{
-		"foo": "bar",
-		"123": "456",
-	}
-
-	labelArgs := []string{}
-
-	for k, v := range testLabels {
-		labelArgs = append(labelArgs, "--label", k+"="+v)
-	}
-
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  LABEL default foo
-`, false, labelArgs...)
-
-	if err != nil {
-		c.Fatal("error building image with labels", err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Labels")
-
-	var labels map[string]string
-
-	if err := json.Unmarshal([]byte(res), &labels); err != nil {
-		c.Fatal(err)
-	}
-
-	for k, v := range testLabels {
-		if x, ok := labels[k]; !ok || x != v {
-			c.Fatalf("label %s=%s not found in image", k, v)
-		}
-	}
-}
-
-func (s *DockerSuite) TestBuildLabelOverwrite(c *check.C) {
-	name := "testbuildlabeloverwrite"
-	testLabel := "foo"
-	testValue := "bar"
-
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  LABEL `+testLabel+`+ foo
-`, false, []string{"--label", testLabel + "=" + testValue}...)
-
-	if err != nil {
-		c.Fatal("error building image with labels", err)
-	}
-
-	res := inspectFieldJSON(c, name, "Config.Labels")
-
-	var labels map[string]string
-
-	if err := json.Unmarshal([]byte(res), &labels); err != nil {
-		c.Fatal(err)
-	}
-
-	v, ok := labels[testLabel]
-	if !ok {
-		c.Fatal("label not found in image")
-	}
-
-	if v != testValue {
-		c.Fatal("label not overwritten")
-	}
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestBuildFromAuthenticatedRegistry(c *check.C) {
-	dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	baseImage := privateRegistryURL + "/baseimage"
-
-	_, err := buildImage(baseImage, `
-	FROM busybox
-	ENV env1 val1
-	`, true)
-
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "push", baseImage)
-	dockerCmd(c, "rmi", baseImage)
-
-	_, err = buildImage(baseImage, fmt.Sprintf(`
-	FROM %s
-	ENV env2 val2
-	`, baseImage), true)
-
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestBuildWithExternalAuth(c *check.C) {
-	osPath := os.Getenv("PATH")
-	defer os.Setenv("PATH", osPath)
-
-	workingDir, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
-	c.Assert(err, checker.IsNil)
-	testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
-
-	os.Setenv("PATH", testPath)
-
-	repoName := fmt.Sprintf("%v/dockercli/busybox:authtest", privateRegistryURL)
-
-	tmp, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-
-	externalAuthConfig := `{ "credsStore": "shell-test" }`
-
-	configPath := filepath.Join(tmp, "config.json")
-	err = ioutil.WriteFile(configPath, []byte(externalAuthConfig), 0644)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	b, err := ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), "\"auth\":")
-
-	dockerCmd(c, "--config", tmp, "tag", "busybox", repoName)
-	dockerCmd(c, "--config", tmp, "push", repoName)
-
-	// make sure the image is pulled when building
-	dockerCmd(c, "rmi", repoName)
-
-	buildCmd := exec.Command(dockerBinary, "--config", tmp, "build", "-")
-	buildCmd.Stdin = strings.NewReader(fmt.Sprintf("FROM %s", repoName))
-
-	out, _, err := runCommandWithOutput(buildCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-// Test cases in #22036
-func (s *DockerSuite) TestBuildLabelsOverride(c *check.C) {
-	// Command line option labels will always override
-	name := "scratchy"
-	expected := `{"bar":"from-flag","foo":"from-flag"}`
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-                LABEL foo=from-dockerfile`,
-		true, "--label", "foo=from-flag", "--label", "bar=from-flag")
-	c.Assert(err, check.IsNil)
-
-	res := inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	name = "from"
-	expected = `{"foo":"from-dockerfile"}`
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage()+`
-                LABEL foo from-dockerfile`,
-		true)
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	// Command line option label will override even via `FROM`
-	name = "new"
-	expected = `{"bar":"from-dockerfile2","foo":"new"}`
-	_, err = buildImage(name,
-		`FROM from
-                LABEL bar from-dockerfile2`,
-		true, "--label", "foo=new")
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	// Command line option without a value set (--label foo, --label bar=)
-	// will be treated as --label foo="", --label bar=""
-	name = "scratchy2"
-	expected = `{"bar":"","foo":""}`
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage()+`
-                LABEL foo=from-dockerfile`,
-		true, "--label", "foo", "--label", "bar=")
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	// Command line option without a value set (--label foo, --label bar=)
-	// will be treated as --label foo="", --label bar=""
-	// This time is for inherited images
-	name = "new2"
-	expected = `{"bar":"","foo":""}`
-	_, err = buildImage(name,
-		`FROM from
-                LABEL bar from-dockerfile2`,
-		true, "--label", "foo=", "--label", "bar")
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	// Command line option labels with only `FROM`
-	name = "scratchy"
-	expected = `{"bar":"from-flag","foo":"from-flag"}`
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage(),
-		true, "--label", "foo=from-flag", "--label", "bar=from-flag")
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-	// Command line option labels with env var
-	name = "scratchz"
-	expected = `{"bar":"$PATH"}`
-	_, err = buildImage(name,
-		`FROM `+minimalBaseImage(),
-		true, "--label", "bar=$PATH")
-	c.Assert(err, check.IsNil)
-
-	res = inspectFieldJSON(c, name, "Config.Labels")
-	if res != expected {
-		c.Fatalf("Labels %s, expected %s", res, expected)
-	}
-
-}
-
-// Test case for #22855
-func (s *DockerSuite) TestBuildDeleteCommittedFile(c *check.C) {
-	name := "test-delete-committed-file"
-
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo test > file
-		RUN test -e file
-		RUN rm file
-		RUN sh -c "! test -e file"`, false)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-// #20083
-func (s *DockerSuite) TestBuildDockerignoreComment(c *check.C) {
-	// TODO Windows: Figure out why this test is flakey on TP5. If you add
-	// something like RUN sleep 5, or even RUN ls /tmp after the ADD line,
-	// it is more reliable, but that's not a good fix.
-	testRequires(c, DaemonIsLinux)
-
-	name := "testbuilddockerignorecleanpaths"
-	dockerfile := `
-        FROM busybox
-        ADD . /tmp/
-        RUN sh -c "(ls -la /tmp/#1)"
-        RUN sh -c "(! ls -la /tmp/#2)"
-        RUN sh -c "(! ls /tmp/foo) && (! ls /tmp/foo2) && (ls /tmp/dir1/foo)"`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"foo":      "foo",
-		"foo2":     "foo2",
-		"dir1/foo": "foo in dir1",
-		"#1":       "# file 1",
-		"#2":       "# file 2",
-		".dockerignore": `# Visual C++ cache files
-# because we have git ;-)
-# The above comment is from #20083
-foo
-#dir1/foo
-foo2
-# The following is considered as comment as # is at the beginning
-#1
-# The following is not considered as comment as # is not at the beginning
-  #2
-`,
-	})
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Test case for #23221
-func (s *DockerSuite) TestBuildWithUTF8BOM(c *check.C) {
-	name := "test-with-utf8-bom"
-	dockerfile := []byte(`FROM busybox`)
-	bomDockerfile := append([]byte{0xEF, 0xBB, 0xBF}, dockerfile...)
-	ctx, err := fakeContextFromNewTempDir()
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-	err = ctx.addFile("Dockerfile", bomDockerfile)
-	c.Assert(err, check.IsNil)
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, check.IsNil)
-}
-
-// Test case for UTF-8 BOM in .dockerignore, related to #23221
-func (s *DockerSuite) TestBuildWithUTF8BOMDockerignore(c *check.C) {
-	name := "test-with-utf8-bom-dockerignore"
-	dockerfile := `
-        FROM busybox
-		ADD . /tmp/
-		RUN ls -la /tmp
-		RUN sh -c "! ls /tmp/Dockerfile"
-		RUN ls /tmp/.dockerignore`
-	dockerignore := []byte("./Dockerfile\n")
-	bomDockerignore := append([]byte{0xEF, 0xBB, 0xBF}, dockerignore...)
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile": dockerfile,
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-	err = ctx.addFile(".dockerignore", bomDockerignore)
-	c.Assert(err, check.IsNil)
-	_, err = buildImageFromContext(name, ctx, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-// #22489 Shell test to confirm config gets updated correctly
-func (s *DockerSuite) TestBuildShellUpdatesConfig(c *check.C) {
-	name := "testbuildshellupdatesconfig"
-
-	expected := `["foo","-bar","#(nop) ","SHELL [foo -bar]"]`
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        SHELL ["foo", "-bar"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "ContainerConfig.Cmd")
-	if res != expected {
-		c.Fatalf("%s, expected %s", res, expected)
-	}
-	res = inspectFieldJSON(c, name, "ContainerConfig.Shell")
-	if res != `["foo","-bar"]` {
-		c.Fatalf(`%s, expected ["foo","-bar"]`, res)
-	}
-}
-
-// #22489 Changing the shell multiple times and CMD after.
-func (s *DockerSuite) TestBuildShellMultiple(c *check.C) {
-	name := "testbuildshellmultiple"
-
-	_, out, _, err := buildImageWithStdoutStderr(name,
-		`FROM busybox
-		RUN echo defaultshell
-		SHELL ["echo"]
-		RUN echoshell
-		SHELL ["ls"]
-		RUN -l
-		CMD -l`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Must contain 'defaultshell' twice
-	if len(strings.Split(out, "defaultshell")) != 3 {
-		c.Fatalf("defaultshell should have appeared twice in %s", out)
-	}
-
-	// Must contain 'echoshell' twice
-	if len(strings.Split(out, "echoshell")) != 3 {
-		c.Fatalf("echoshell should have appeared twice in %s", out)
-	}
-
-	// Must contain "total " (part of ls -l)
-	if !strings.Contains(out, "total ") {
-		c.Fatalf("%s should have contained 'total '", out)
-	}
-
-	// A container started from the image uses the shell-form CMD.
-	// Last shell is ls. CMD is -l. So should contain 'total '.
-	outrun, _ := dockerCmd(c, "run", "--rm", name)
-	if !strings.Contains(outrun, "total ") {
-		c.Fatalf("Expected started container to run ls -l. %s", outrun)
-	}
-}
-
-// #22489. Changed SHELL with ENTRYPOINT
-func (s *DockerSuite) TestBuildShellEntrypoint(c *check.C) {
-	name := "testbuildshellentrypoint"
-
-	_, err := buildImage(name,
-		`FROM busybox
-		SHELL ["ls"]
-		ENTRYPOINT -l`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// A container started from the image uses the shell-form ENTRYPOINT.
-	// Shell is ls. ENTRYPOINT is -l. So should contain 'total '.
-	outrun, _ := dockerCmd(c, "run", "--rm", name)
-	if !strings.Contains(outrun, "total ") {
-		c.Fatalf("Expected started container to run ls -l. %s", outrun)
-	}
-}
-
-// #22489 Shell test to confirm shell is inherited in a subsequent build
-func (s *DockerSuite) TestBuildShellInherited(c *check.C) {
-	name1 := "testbuildshellinherited1"
-	_, err := buildImage(name1,
-		`FROM busybox
-        SHELL ["ls"]`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	name2 := "testbuildshellinherited2"
-	_, out, _, err := buildImageWithStdoutStderr(name2,
-		`FROM `+name1+`
-        RUN -l`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// ls -l has "total " followed by some number in it, ls without -l does not.
-	if !strings.Contains(out, "total ") {
-		c.Fatalf("Should have seen total in 'ls -l'.\n%s", out)
-	}
-}
-
-// #22489 Shell test to confirm non-JSON doesn't work
-func (s *DockerSuite) TestBuildShellNotJSON(c *check.C) {
-	name := "testbuildshellnotjson"
-
-	_, err := buildImage(name,
-		`FROM `+minimalBaseImage()+`
-        sHeLl exec -form`, // Casing explicit to ensure error is upper-cased.
-		true)
-	if err == nil {
-		c.Fatal("Image build should have failed")
-	}
-	if !strings.Contains(err.Error(), "SHELL requires the arguments to be in JSON form") {
-		c.Fatal("Error didn't indicate that arguments must be in JSON form")
-	}
-}
-
-// #22489 Windows shell test to confirm native is powershell if executing a PS command
-// This would error if the default shell were still cmd.
-func (s *DockerSuite) TestBuildShellWindowsPowershell(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildshellpowershell"
-	_, out, err := buildImageWithOut(name,
-		`FROM `+minimalBaseImage()+`
-        SHELL ["powershell", "-command"]
-		RUN Write-Host John`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(out, "\nJohn\n") {
-		c.Fatalf("Line with 'John' not found in output %q", out)
-	}
-}
-
-// Verify that escape is being correctly applied to words when escape directive is not \.
-// Tests WORKDIR, ADD
-func (s *DockerSuite) TestBuildEscapeNotBackslashWordTest(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildescapenotbackslashwordtesta"
-	_, out, err := buildImageWithOut(name,
-		`# escape= `+"`"+`
-		FROM `+minimalBaseImage()+`
-        WORKDIR c:\windows
-		RUN dir /w`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(strings.ToLower(out), "[system32]") {
-		c.Fatalf("Line with '[windows]' not found in output %q", out)
-	}
-
-	name = "testbuildescapenotbackslashwordtestb"
-	_, out, err = buildImageWithOut(name,
-		`# escape= `+"`"+`
-		FROM `+minimalBaseImage()+`
-		SHELL ["powershell.exe"]
-        WORKDIR c:\foo
-		ADD Dockerfile c:\foo\
-		RUN dir Dockerfile`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !strings.Contains(strings.ToLower(out), "-a----") {
-		c.Fatalf("Line with '-a----' not found in output %q", out)
-	}
-
-}
-
-// #22868. Make sure shell-form CMD is marked as escaped in the config of the image
-func (s *DockerSuite) TestBuildCmdShellArgsEscaped(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildcmdshellescaped"
-	_, err := buildImage(name, `
-  FROM `+minimalBaseImage()+`
-  CMD "ipconfig"
-  `, true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.ArgsEscaped")
-	if res != "true" {
-		c.Fatalf("CMD did not update Config.ArgsEscaped on image: %v", res)
-	}
-	dockerCmd(c, "run", "--name", "inspectme", name)
-	dockerCmd(c, "wait", "inspectme")
-	res = inspectFieldJSON(c, name, "Config.Cmd")
-
-	if res != `["cmd","/S","/C","\"ipconfig\""]` {
-		c.Fatalf("CMD was not escaped Config.Cmd: got %v", res)
-	}
-}
-
-// Test case for #24912.
-func (s *DockerSuite) TestBuildStepsWithProgress(c *check.C) {
-	name := "testbuildstepswithprogress"
-
-	totalRun := 5
-	_, out, err := buildImageWithOut(name, "FROM busybox\n"+strings.Repeat("RUN echo foo\n", totalRun), true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Step 1/%d : FROM busybox", 1+totalRun))
-	for i := 2; i <= 1+totalRun; i++ {
-		c.Assert(out, checker.Contains, fmt.Sprintf("Step %d/%d : RUN echo foo", i, 1+totalRun))
-	}
-}
-
-func (s *DockerSuite) TestBuildWithFailure(c *check.C) {
-	name := "testbuildwithfailure"
-
-	// First test case can only detect `nobody` in runtime so all steps will show up
-	buildCmd := "FROM busybox\nRUN nobody"
-	_, stdout, _, err := buildImageWithStdoutStderr(name, buildCmd, false, "--force-rm", "--rm")
-	c.Assert(err, checker.NotNil)
-	c.Assert(stdout, checker.Contains, "Step 1/2 : FROM busybox")
-	c.Assert(stdout, checker.Contains, "Step 2/2 : RUN nobody")
-
-	// Second test case `FFOM` should have been detected before build runs so no steps
-	buildCmd = "FFOM nobody\nRUN nobody"
-	_, stdout, _, err = buildImageWithStdoutStderr(name, buildCmd, false, "--force-rm", "--rm")
-	c.Assert(err, checker.NotNil)
-	c.Assert(stdout, checker.Not(checker.Contains), "Step 1/2 : FROM busybox")
-	c.Assert(stdout, checker.Not(checker.Contains), "Step 2/2 : RUN nobody")
-}
-
-func (s *DockerSuite) TestBuildCacheFrom(c *check.C) {
-	testRequires(c, DaemonIsLinux) // All tests that do save are skipped in windows
-	dockerfile := `
-		FROM busybox
-		ENV FOO=bar
-		ADD baz /
-		RUN touch bax`
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"Dockerfile": dockerfile,
-		"baz":        "baz",
-	})
-	c.Assert(err, checker.IsNil)
-	defer ctx.Close()
-
-	id1, err := buildImageFromContext("build1", ctx, true)
-	c.Assert(err, checker.IsNil)
-
-	// rebuild with cache-from
-	id2, out, err := buildImageFromContextWithOut("build2", ctx, true, "--cache-from=build1")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id1, checker.Equals, id2)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 3)
-	dockerCmd(c, "rmi", "build2")
-
-	// no cache match with unknown source
-	id2, out, err = buildImageFromContextWithOut("build2", ctx, true, "--cache-from=nosuchtag")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id1, checker.Not(checker.Equals), id2)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 0)
-	dockerCmd(c, "rmi", "build2")
-
-	// clear parent images
-	tempDir, err := ioutil.TempDir("", "test-build-cache-from-")
-	if err != nil {
-		c.Fatalf("failed to create temporary directory: %s", tempDir)
-	}
-	defer os.RemoveAll(tempDir)
-	tempFile := filepath.Join(tempDir, "img.tar")
-	dockerCmd(c, "save", "-o", tempFile, "build1")
-	dockerCmd(c, "rmi", "build1")
-	dockerCmd(c, "load", "-i", tempFile)
-	parentID, _ := dockerCmd(c, "inspect", "-f", "{{.Parent}}", "build1")
-	c.Assert(strings.TrimSpace(parentID), checker.Equals, "")
-
-	// cache still applies without parents
-	id2, out, err = buildImageFromContextWithOut("build2", ctx, true, "--cache-from=build1")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id1, checker.Equals, id2)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 3)
-	history1, _ := dockerCmd(c, "history", "-q", "build2")
-
-	// Retry, no new intermediate images
-	id3, out, err := buildImageFromContextWithOut("build3", ctx, true, "--cache-from=build1")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id1, checker.Equals, id3)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 3)
-	history2, _ := dockerCmd(c, "history", "-q", "build3")
-
-	c.Assert(history1, checker.Equals, history2)
-	dockerCmd(c, "rmi", "build2")
-	dockerCmd(c, "rmi", "build3")
-	dockerCmd(c, "rmi", "build1")
-	dockerCmd(c, "load", "-i", tempFile)
-
-	// Modify file, everything up to last command and layers are reused
-	dockerfile = `
-		FROM busybox
-		ENV FOO=bar
-		ADD baz /
-		RUN touch newfile`
-	err = ioutil.WriteFile(filepath.Join(ctx.Dir, "Dockerfile"), []byte(dockerfile), 0644)
-	c.Assert(err, checker.IsNil)
-
-	id2, out, err = buildImageFromContextWithOut("build2", ctx, true, "--cache-from=build1")
-	c.Assert(err, checker.IsNil)
-	c.Assert(id1, checker.Not(checker.Equals), id2)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 2)
-
-	layers1Str, _ := dockerCmd(c, "inspect", "-f", "{{json .RootFS.Layers}}", "build1")
-	layers2Str, _ := dockerCmd(c, "inspect", "-f", "{{json .RootFS.Layers}}", "build2")
-
-	var layers1 []string
-	var layers2 []string
-	c.Assert(json.Unmarshal([]byte(layers1Str), &layers1), checker.IsNil)
-	c.Assert(json.Unmarshal([]byte(layers2Str), &layers2), checker.IsNil)
-
-	c.Assert(len(layers1), checker.Equals, len(layers2))
-	for i := 0; i < len(layers1)-1; i++ {
-		c.Assert(layers1[i], checker.Equals, layers2[i])
-	}
-	c.Assert(layers1[len(layers1)-1], checker.Not(checker.Equals), layers2[len(layers1)-1])
-}
-
-func (s *DockerSuite) TestBuildNetNone(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	name := "testbuildnetnone"
-	_, out, err := buildImageWithOut(name, `
-  FROM busybox
-  RUN ping -c 1 8.8.8.8
-  `, true, "--network=none")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "unreachable")
-}
-
-func (s *DockerSuite) TestBuildNetContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	id, _ := dockerCmd(c, "run", "--hostname", "foobar", "-d", "busybox", "nc", "-ll", "-p", "1234", "-e", "hostname")
-
-	name := "testbuildnetcontainer"
-	out, err := buildImage(name, `
-  FROM busybox
-  RUN nc localhost 1234 > /otherhost
-  `, true, "--network=container:"+strings.TrimSpace(id))
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	host, _ := dockerCmd(c, "run", "testbuildnetcontainer", "cat", "/otherhost")
-	c.Assert(strings.TrimSpace(host), check.Equals, "foobar")
-}
-
-func (s *DockerSuite) TestBuildSquashParent(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-	dockerFile := `
-		FROM busybox
-		RUN echo hello > /hello
-		RUN echo world >> /hello
-		RUN echo hello > /remove_me
-		ENV HELLO world
-		RUN rm /remove_me
-		`
-	// build and get the ID that we can use later for history comparison
-	origID, err := buildImage("test", dockerFile, false)
-	c.Assert(err, checker.IsNil)
-
-	// build with squash
-	id, err := buildImage("test", dockerFile, true, "--squash")
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "run", "--rm", id, "/bin/sh", "-c", "cat /hello")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello\nworld")
-
-	dockerCmd(c, "run", "--rm", id, "/bin/sh", "-c", "[ ! -f /remove_me ]")
-	dockerCmd(c, "run", "--rm", id, "/bin/sh", "-c", `[ "$(echo $HELLO)" == "world" ]`)
-
-	// make sure the ID produced is the ID of the tag we specified
-	inspectID, err := inspectImage("test", ".ID")
-	c.Assert(err, checker.IsNil)
-	c.Assert(inspectID, checker.Equals, id)
-
-	origHistory, _ := dockerCmd(c, "history", origID)
-	testHistory, _ := dockerCmd(c, "history", "test")
-
-	splitOrigHistory := strings.Split(strings.TrimSpace(origHistory), "\n")
-	splitTestHistory := strings.Split(strings.TrimSpace(testHistory), "\n")
-	c.Assert(len(splitTestHistory), checker.Equals, len(splitOrigHistory)+1)
-
-	out, err = inspectImage(id, "len .RootFS.Layers")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "3")
-}
-
-func (s *DockerSuite) TestBuildContChar(c *check.C) {
-	name := "testbuildcontchar"
-
-	_, out, err := buildImageWithOut(name,
-		`FROM busybox\`, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Step 1/1 : FROM busybox")
-
-	_, out, err = buildImageWithOut(name,
-		`FROM busybox
-		 RUN echo hi \`, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Step 1/2 : FROM busybox")
-	c.Assert(out, checker.Contains, "Step 2/2 : RUN echo hi\n")
-
-	_, out, err = buildImageWithOut(name,
-		`FROM busybox
-		 RUN echo hi \\`, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Step 1/2 : FROM busybox")
-	c.Assert(out, checker.Contains, "Step 2/2 : RUN echo hi \\\n")
-
-	_, out, err = buildImageWithOut(name,
-		`FROM busybox
-		 RUN echo hi \\\`, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Step 1/2 : FROM busybox")
-	c.Assert(out, checker.Contains, "Step 2/2 : RUN echo hi \\\\\n")
-}
-
-// TestBuildOpaqueDirectory tests that a build succeeds which
-// creates opaque directories.
-// See https://github.com/docker/docker/issues/25244
-func (s *DockerSuite) TestBuildOpaqueDirectory(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerFile := `
-		FROM busybox
-		RUN mkdir /dir1 && touch /dir1/f1
-		RUN rm -rf /dir1 && mkdir /dir1 && touch /dir1/f2
-		RUN touch /dir1/f3
-		RUN [ -f /dir1/f2 ]
-		`
-
-	// Test that build succeeds, last command fails if opaque directory
-	// was not handled correctly
-	_, err := buildImage("testopaquedirectory", dockerFile, false)
-	c.Assert(err, checker.IsNil)
-}
-
-// Windows test for USER in dockerfile
-func (s *DockerSuite) TestBuildWindowsUser(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildwindowsuser"
-	_, out, err := buildImageWithOut(name,
-		`FROM `+WindowsBaseImage+`
-		RUN net user user /add
-		USER user
-		RUN set username
-		`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(strings.ToLower(out), checker.Contains, "username=user")
-}
-
-// Verifies if COPY file . when WORKDIR is set to a non-existing directory,
-// the directory is created and the file is copied into the directory,
-// as opposed to the file being copied as a file with the name of the
-// directory. Fix for 27545 (found on Windows, but regression good for Linux too).
-// Note 27545 was reverted in 28505, but a new fix was added subsequently in 28514.
-func (s *DockerSuite) TestBuildCopyFileDotWithWorkdir(c *check.C) {
-	name := "testbuildcopyfiledotwithworkdir"
-	ctx, err := fakeContext(`FROM busybox 
-WORKDIR /foo 
-COPY file . 
-RUN ["cat", "/foo/file"] 
-`,
-		map[string]string{})
-
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	if err := ctx.Add("file", "content"); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err = buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatal(err)
-	}
-}
-
-// Case-insensitive environment variables on Windows
-func (s *DockerSuite) TestBuildWindowsEnvCaseInsensitive(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	name := "testbuildwindowsenvcaseinsensitive"
-	if _, err := buildImage(name, `
-		FROM `+WindowsBaseImage+`
-		ENV FOO=bar foo=bar
-  `, true); err != nil {
-		c.Fatal(err)
-	}
-	res := inspectFieldJSON(c, name, "Config.Env")
-	if res != `["foo=bar"]` { // Should not have FOO=bar in it - takes the last one processed. And only one entry as deduped.
-		c.Fatalf("Case insensitive environment variables on Windows failed. Got %s", res)
-	}
-}
-
-// Test case for 29667
-func (s *DockerSuite) TestBuildWorkdirImageCmd(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	image := "testworkdirimagecmd"
-	dockerfile := `
-FROM busybox
-WORKDIR /foo/bar
-`
-	out, err := buildImage(image, dockerfile, true)
-	c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
-
-	out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image)
-	c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`)
-
-	image = "testworkdirlabelimagecmd"
-	dockerfile = `
-FROM busybox
-WORKDIR /foo/bar
-LABEL a=b
-`
-	out, err = buildImage(image, dockerfile, true)
-	c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
-
-	out, _ = dockerCmd(c, "inspect", "--format", "{{ json .Config.Cmd }}", image)
-	c.Assert(strings.TrimSpace(out), checker.Equals, `["sh"]`)
-}
-
-// Test case for 28902/28090
-func (s *DockerSuite) TestBuildWorkdirCmd(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerFile := `
-                FROM golang:1.7-alpine
-                WORKDIR /
-                `
-	_, err := buildImage("testbuildworkdircmd", dockerFile, true)
-	c.Assert(err, checker.IsNil)
-
-	_, out, err := buildImageWithOut("testbuildworkdircmd", dockerFile, true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.Count(out, "Using cache"), checker.Equals, 1)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_unix_test.go
deleted file mode 100644
index 0205a927dd..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_build_unix_test.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/go-units"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestBuildResourceConstraintsAreUsed(c *check.C) {
-	testRequires(c, cpuCfsQuota)
-	name := "testbuildresourceconstraints"
-
-	ctx, err := fakeContext(`
-	FROM hello-world:frozen
-	RUN ["/hello"]
-	`, map[string]string{})
-	c.Assert(err, checker.IsNil)
-
-	_, _, err = dockerCmdInDir(c, ctx.Dir, "build", "--no-cache", "--rm=false", "--memory=64m", "--memory-swap=-1", "--cpuset-cpus=0", "--cpuset-mems=0", "--cpu-shares=100", "--cpu-quota=8000", "--ulimit", "nofile=42", "-t", name, ".")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "ps", "-lq")
-	cID := strings.TrimSpace(out)
-
-	type hostConfig struct {
-		Memory     int64
-		MemorySwap int64
-		CpusetCpus string
-		CpusetMems string
-		CPUShares  int64
-		CPUQuota   int64
-		Ulimits    []*units.Ulimit
-	}
-
-	cfg := inspectFieldJSON(c, cID, "HostConfig")
-
-	var c1 hostConfig
-	err = json.Unmarshal([]byte(cfg), &c1)
-	c.Assert(err, checker.IsNil, check.Commentf(cfg))
-
-	c.Assert(c1.Memory, checker.Equals, int64(64*1024*1024), check.Commentf("resource constraints not set properly for Memory"))
-	c.Assert(c1.MemorySwap, checker.Equals, int64(-1), check.Commentf("resource constraints not set properly for MemorySwap"))
-	c.Assert(c1.CpusetCpus, checker.Equals, "0", check.Commentf("resource constraints not set properly for CpusetCpus"))
-	c.Assert(c1.CpusetMems, checker.Equals, "0", check.Commentf("resource constraints not set properly for CpusetMems"))
-	c.Assert(c1.CPUShares, checker.Equals, int64(100), check.Commentf("resource constraints not set properly for CPUShares"))
-	c.Assert(c1.CPUQuota, checker.Equals, int64(8000), check.Commentf("resource constraints not set properly for CPUQuota"))
-	c.Assert(c1.Ulimits[0].Name, checker.Equals, "nofile", check.Commentf("resource constraints not set properly for Ulimits"))
-	c.Assert(c1.Ulimits[0].Hard, checker.Equals, int64(42), check.Commentf("resource constraints not set properly for Ulimits"))
-
-	// Make sure constraints aren't saved to image
-	dockerCmd(c, "run", "--name=test", name)
-
-	cfg = inspectFieldJSON(c, "test", "HostConfig")
-
-	var c2 hostConfig
-	err = json.Unmarshal([]byte(cfg), &c2)
-	c.Assert(err, checker.IsNil, check.Commentf(cfg))
-
-	c.Assert(c2.Memory, check.Not(checker.Equals), int64(64*1024*1024), check.Commentf("resource leaked from build for Memory"))
-	c.Assert(c2.MemorySwap, check.Not(checker.Equals), int64(-1), check.Commentf("resource leaked from build for MemorySwap"))
-	c.Assert(c2.CpusetCpus, check.Not(checker.Equals), "0", check.Commentf("resource leaked from build for CpusetCpus"))
-	c.Assert(c2.CpusetMems, check.Not(checker.Equals), "0", check.Commentf("resource leaked from build for CpusetMems"))
-	c.Assert(c2.CPUShares, check.Not(checker.Equals), int64(100), check.Commentf("resource leaked from build for CPUShares"))
-	c.Assert(c2.CPUQuota, check.Not(checker.Equals), int64(8000), check.Commentf("resource leaked from build for CPUQuota"))
-	c.Assert(c2.Ulimits, checker.IsNil, check.Commentf("resource leaked from build for Ulimits"))
-}
-
-func (s *DockerSuite) TestBuildAddChangeOwnership(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildaddown"
-
-	ctx := func() *FakeContext {
-		dockerfile := `
-			FROM busybox
-			ADD foo /bar/
-			RUN [ $(stat -c %U:%G "/bar") = 'root:root' ]
-			RUN [ $(stat -c %U:%G "/bar/foo") = 'root:root' ]
-			`
-		tmpDir, err := ioutil.TempDir("", "fake-context")
-		c.Assert(err, check.IsNil)
-		testFile, err := os.Create(filepath.Join(tmpDir, "foo"))
-		if err != nil {
-			c.Fatalf("failed to create foo file: %v", err)
-		}
-		defer testFile.Close()
-
-		chownCmd := exec.Command("chown", "daemon:daemon", "foo")
-		chownCmd.Dir = tmpDir
-		out, _, err := runCommandWithOutput(chownCmd)
-		if err != nil {
-			c.Fatal(err, out)
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(tmpDir, "Dockerfile"), []byte(dockerfile), 0644); err != nil {
-			c.Fatalf("failed to open destination dockerfile: %v", err)
-		}
-		return fakeContextFromDir(tmpDir)
-	}()
-
-	defer ctx.Close()
-
-	if _, err := buildImageFromContext(name, ctx, true); err != nil {
-		c.Fatalf("build failed to complete for TestBuildAddChangeOwnership: %v", err)
-	}
-}
-
-// Test that an infinite sleep during a build is killed if the client disconnects.
-// This test is fairly hairy because there are lots of ways to race.
-// Strategy:
-// * Monitor the output of docker events starting from before
-// * Run a 1-year-long sleep from a docker build.
-// * When docker events sees container start, close the "docker build" command
-// * Wait for docker events to emit a dying event.
-func (s *DockerSuite) TestBuildCancellationKillsSleep(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testbuildcancellation"
-
-	observer, err := newEventObserver(c)
-	c.Assert(err, checker.IsNil)
-	err = observer.Start()
-	c.Assert(err, checker.IsNil)
-	defer observer.Stop()
-
-	// (Note: one year, will never finish)
-	ctx, err := fakeContext("FROM busybox\nRUN sleep 31536000", nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer ctx.Close()
-
-	buildCmd := exec.Command(dockerBinary, "build", "-t", name, ".")
-	buildCmd.Dir = ctx.Dir
-
-	stdoutBuild, err := buildCmd.StdoutPipe()
-	if err := buildCmd.Start(); err != nil {
-		c.Fatalf("failed to run build: %s", err)
-	}
-
-	matchCID := regexp.MustCompile("Running in (.+)")
-	scanner := bufio.NewScanner(stdoutBuild)
-
-	outputBuffer := new(bytes.Buffer)
-	var buildID string
-	for scanner.Scan() {
-		line := scanner.Text()
-		outputBuffer.WriteString(line)
-		outputBuffer.WriteString("\n")
-		if matches := matchCID.FindStringSubmatch(line); len(matches) > 0 {
-			buildID = matches[1]
-			break
-		}
-	}
-
-	if buildID == "" {
-		c.Fatalf("Unable to find build container id in build output:\n%s", outputBuffer.String())
-	}
-
-	testActions := map[string]chan bool{
-		"start": make(chan bool, 1),
-		"die":   make(chan bool, 1),
-	}
-
-	matcher := matchEventLine(buildID, "container", testActions)
-	processor := processEventMatch(testActions)
-	go observer.Match(matcher, processor)
-
-	select {
-	case <-time.After(10 * time.Second):
-		observer.CheckEventError(c, buildID, "start", matcher)
-	case <-testActions["start"]:
-		// ignore, done
-	}
-
-	// Send a kill to the `docker build` command.
-	// Causes the underlying build to be cancelled due to socket close.
-	if err := buildCmd.Process.Kill(); err != nil {
-		c.Fatalf("error killing build command: %s", err)
-	}
-
-	// Get the exit status of `docker build`, check it exited because killed.
-	if err := buildCmd.Wait(); err != nil && !integration.IsKilled(err) {
-		c.Fatalf("wait failed during build run: %T %s", err, err)
-	}
-
-	select {
-	case <-time.After(10 * time.Second):
-		observer.CheckEventError(c, buildID, "die", matcher)
-	case <-testActions["die"]:
-		// ignore, done
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_by_digest_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_by_digest_test.go
deleted file mode 100644
index c2d85461a8..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_by_digest_test.go
+++ /dev/null
@@ -1,693 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/go-check/check"
-)
-
-var (
-	remoteRepoName  = "dockercli/busybox-by-dgst"
-	repoName        = fmt.Sprintf("%s/%s", privateRegistryURL, remoteRepoName)
-	pushDigestRegex = regexp.MustCompile("[\\S]+: digest: ([\\S]+) size: [0-9]+")
-	digestRegex     = regexp.MustCompile("Digest: ([\\S]+)")
-)
-
-func setupImage(c *check.C) (digest.Digest, error) {
-	return setupImageWithTag(c, "latest")
-}
-
-func setupImageWithTag(c *check.C, tag string) (digest.Digest, error) {
-	containerName := "busyboxbydigest"
-
-	dockerCmd(c, "run", "-e", "digest=1", "--name", containerName, "busybox")
-
-	// tag the image to upload it to the private registry
-	repoAndTag := repoName + ":" + tag
-	out, _, err := dockerCmdWithError("commit", containerName, repoAndTag)
-	c.Assert(err, checker.IsNil, check.Commentf("image tagging failed: %s", out))
-
-	// delete the container as we don't need it any more
-	err = deleteContainer(containerName)
-	c.Assert(err, checker.IsNil)
-
-	// push the image
-	out, _, err = dockerCmdWithError("push", repoAndTag)
-	c.Assert(err, checker.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out))
-
-	// delete our local repo that we previously tagged
-	rmiout, _, err := dockerCmdWithError("rmi", repoAndTag)
-	c.Assert(err, checker.IsNil, check.Commentf("error deleting images prior to real test: %s", rmiout))
-
-	matches := pushDigestRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from push output: %s", out))
-	pushDigest := matches[1]
-
-	return digest.Digest(pushDigest), nil
-}
-
-func testPullByTagDisplaysDigest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// pull from the registry using the tag
-	out, _ := dockerCmd(c, "pull", repoName)
-
-	// the pull output includes "Digest: <digest>", so find that
-	matches := digestRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from pull output: %s", out))
-	pullDigest := matches[1]
-
-	// make sure the pushed and pull digests match
-	c.Assert(pushDigest.String(), checker.Equals, pullDigest)
-}
-
-func (s *DockerRegistrySuite) TestPullByTagDisplaysDigest(c *check.C) {
-	testPullByTagDisplaysDigest(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullByTagDisplaysDigest(c *check.C) {
-	testPullByTagDisplaysDigest(c)
-}
-
-func testPullByDigest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// pull from the registry using the <name>@<digest> reference
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-	out, _ := dockerCmd(c, "pull", imageReference)
-
-	// the pull output includes "Digest: <digest>", so find that
-	matches := digestRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from pull output: %s", out))
-	pullDigest := matches[1]
-
-	// make sure the pushed and pull digests match
-	c.Assert(pushDigest.String(), checker.Equals, pullDigest)
-}
-
-func (s *DockerRegistrySuite) TestPullByDigest(c *check.C) {
-	testPullByDigest(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullByDigest(c *check.C) {
-	testPullByDigest(c)
-}
-
-func testPullByDigestNoFallback(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// pull from the registry using the <name>@<digest> reference
-	imageReference := fmt.Sprintf("%s@sha256:ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff", repoName)
-	out, _, err := dockerCmdWithError("pull", imageReference)
-	c.Assert(err, checker.NotNil, check.Commentf("expected non-zero exit status and correct error message when pulling non-existing image"))
-	c.Assert(out, checker.Contains, fmt.Sprintf("manifest for %s not found", imageReference), check.Commentf("expected non-zero exit status and correct error message when pulling non-existing image"))
-}
-
-func (s *DockerRegistrySuite) TestPullByDigestNoFallback(c *check.C) {
-	testPullByDigestNoFallback(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullByDigestNoFallback(c *check.C) {
-	testPullByDigestNoFallback(c)
-}
-
-func (s *DockerRegistrySuite) TestCreateByDigest(c *check.C) {
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-
-	containerName := "createByDigest"
-	dockerCmd(c, "create", "--name", containerName, imageReference)
-
-	res := inspectField(c, containerName, "Config.Image")
-	c.Assert(res, checker.Equals, imageReference)
-}
-
-func (s *DockerRegistrySuite) TestRunByDigest(c *check.C) {
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil)
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-
-	containerName := "runByDigest"
-	out, _ := dockerCmd(c, "run", "--name", containerName, imageReference, "sh", "-c", "echo found=$digest")
-
-	foundRegex := regexp.MustCompile("found=([^\n]+)")
-	matches := foundRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from pull output: %s", out))
-	c.Assert(matches[1], checker.Equals, "1", check.Commentf("Expected %q, got %q", "1", matches[1]))
-
-	res := inspectField(c, containerName, "Config.Image")
-	c.Assert(res, checker.Equals, imageReference)
-}
-
-func (s *DockerRegistrySuite) TestRemoveImageByDigest(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	// make sure inspect runs ok
-	inspectField(c, imageReference, "Id")
-
-	// do the delete
-	err = deleteImages(imageReference)
-	c.Assert(err, checker.IsNil, check.Commentf("unexpected error deleting image"))
-
-	// try to inspect again - it should error this time
-	_, err = inspectFieldWithError(imageReference, "Id")
-	//unexpected nil err trying to inspect what should be a non-existent image
-	c.Assert(err, checker.NotNil)
-	c.Assert(err.Error(), checker.Contains, "No such object")
-}
-
-func (s *DockerRegistrySuite) TestBuildByDigest(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	// get the image id
-	imageID := inspectField(c, imageReference, "Id")
-
-	// do the build
-	name := "buildbydigest"
-	_, err = buildImage(name, fmt.Sprintf(
-		`FROM %s
-     CMD ["/bin/echo", "Hello World"]`, imageReference),
-		true)
-	c.Assert(err, checker.IsNil)
-
-	// get the build's image id
-	res := inspectField(c, name, "Config.Image")
-	// make sure they match
-	c.Assert(res, checker.Equals, imageID)
-}
-
-func (s *DockerRegistrySuite) TestTagByDigest(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	// tag it
-	tag := "tagbydigest"
-	dockerCmd(c, "tag", imageReference, tag)
-
-	expectedID := inspectField(c, imageReference, "Id")
-
-	tagID := inspectField(c, tag, "Id")
-	c.Assert(tagID, checker.Equals, expectedID)
-}
-
-func (s *DockerRegistrySuite) TestListImagesWithoutDigests(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	out, _ := dockerCmd(c, "images")
-	c.Assert(out, checker.Not(checker.Contains), "DIGEST", check.Commentf("list output should not have contained DIGEST header"))
-}
-
-func (s *DockerRegistrySuite) TestListImagesWithDigests(c *check.C) {
-
-	// setup image1
-	digest1, err := setupImageWithTag(c, "tag1")
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-	imageReference1 := fmt.Sprintf("%s@%s", repoName, digest1)
-	c.Logf("imageReference1 = %s", imageReference1)
-
-	// pull image1 by digest
-	dockerCmd(c, "pull", imageReference1)
-
-	// list images
-	out, _ := dockerCmd(c, "images", "--digests")
-
-	// make sure repo shown, tag=<none>, digest = $digest1
-	re1 := regexp.MustCompile(`\s*` + repoName + `\s*<none>\s*` + digest1.String() + `\s`)
-	c.Assert(re1.MatchString(out), checker.True, check.Commentf("expected %q: %s", re1.String(), out))
-	// setup image2
-	digest2, err := setupImageWithTag(c, "tag2")
-	//error setting up image
-	c.Assert(err, checker.IsNil)
-	imageReference2 := fmt.Sprintf("%s@%s", repoName, digest2)
-	c.Logf("imageReference2 = %s", imageReference2)
-
-	// pull image1 by digest
-	dockerCmd(c, "pull", imageReference1)
-
-	// pull image2 by digest
-	dockerCmd(c, "pull", imageReference2)
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests")
-
-	// make sure repo shown, tag=<none>, digest = $digest1
-	c.Assert(re1.MatchString(out), checker.True, check.Commentf("expected %q: %s", re1.String(), out))
-
-	// make sure repo shown, tag=<none>, digest = $digest2
-	re2 := regexp.MustCompile(`\s*` + repoName + `\s*<none>\s*` + digest2.String() + `\s`)
-	c.Assert(re2.MatchString(out), checker.True, check.Commentf("expected %q: %s", re2.String(), out))
-
-	// pull tag1
-	dockerCmd(c, "pull", repoName+":tag1")
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests")
-
-	// make sure image 1 has repo, tag, <none> AND repo, <none>, digest
-	reWithDigest1 := regexp.MustCompile(`\s*` + repoName + `\s*tag1\s*` + digest1.String() + `\s`)
-	c.Assert(reWithDigest1.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest1.String(), out))
-	// make sure image 2 has repo, <none>, digest
-	c.Assert(re2.MatchString(out), checker.True, check.Commentf("expected %q: %s", re2.String(), out))
-
-	// pull tag 2
-	dockerCmd(c, "pull", repoName+":tag2")
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests")
-
-	// make sure image 1 has repo, tag, digest
-	c.Assert(reWithDigest1.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest1.String(), out))
-
-	// make sure image 2 has repo, tag, digest
-	reWithDigest2 := regexp.MustCompile(`\s*` + repoName + `\s*tag2\s*` + digest2.String() + `\s`)
-	c.Assert(reWithDigest2.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest2.String(), out))
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests")
-
-	// make sure image 1 has repo, tag, digest
-	c.Assert(reWithDigest1.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest1.String(), out))
-	// make sure image 2 has repo, tag, digest
-	c.Assert(reWithDigest2.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest2.String(), out))
-	// make sure busybox has tag, but not digest
-	busyboxRe := regexp.MustCompile(`\s*busybox\s*latest\s*<none>\s`)
-	c.Assert(busyboxRe.MatchString(out), checker.True, check.Commentf("expected %q: %s", busyboxRe.String(), out))
-}
-
-func (s *DockerRegistrySuite) TestListDanglingImagesWithDigests(c *check.C) {
-	// setup image1
-	digest1, err := setupImageWithTag(c, "dangle1")
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-	imageReference1 := fmt.Sprintf("%s@%s", repoName, digest1)
-	c.Logf("imageReference1 = %s", imageReference1)
-
-	// pull image1 by digest
-	dockerCmd(c, "pull", imageReference1)
-
-	// list images
-	out, _ := dockerCmd(c, "images", "--digests")
-
-	// make sure repo shown, tag=<none>, digest = $digest1
-	re1 := regexp.MustCompile(`\s*` + repoName + `\s*<none>\s*` + digest1.String() + `\s`)
-	c.Assert(re1.MatchString(out), checker.True, check.Commentf("expected %q: %s", re1.String(), out))
-	// setup image2
-	digest2, err := setupImageWithTag(c, "dangle2")
-	//error setting up image
-	c.Assert(err, checker.IsNil)
-	imageReference2 := fmt.Sprintf("%s@%s", repoName, digest2)
-	c.Logf("imageReference2 = %s", imageReference2)
-
-	// pull image1 by digest
-	dockerCmd(c, "pull", imageReference1)
-
-	// pull image2 by digest
-	dockerCmd(c, "pull", imageReference2)
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests", "--filter=dangling=true")
-
-	// make sure repo shown, tag=<none>, digest = $digest1
-	c.Assert(re1.MatchString(out), checker.True, check.Commentf("expected %q: %s", re1.String(), out))
-
-	// make sure repo shown, tag=<none>, digest = $digest2
-	re2 := regexp.MustCompile(`\s*` + repoName + `\s*<none>\s*` + digest2.String() + `\s`)
-	c.Assert(re2.MatchString(out), checker.True, check.Commentf("expected %q: %s", re2.String(), out))
-
-	// pull dangle1 tag
-	dockerCmd(c, "pull", repoName+":dangle1")
-
-	// list images
-	out, _ = dockerCmd(c, "images", "--digests", "--filter=dangling=true")
-
-	// make sure image 1 has repo, tag, <none> AND repo, <none>, digest
-	reWithDigest1 := regexp.MustCompile(`\s*` + repoName + `\s*dangle1\s*` + digest1.String() + `\s`)
-	c.Assert(reWithDigest1.MatchString(out), checker.False, check.Commentf("unexpected %q: %s", reWithDigest1.String(), out))
-	// make sure image 2 has repo, <none>, digest
-	c.Assert(re2.MatchString(out), checker.True, check.Commentf("expected %q: %s", re2.String(), out))
-
-	// pull dangle2 tag
-	dockerCmd(c, "pull", repoName+":dangle2")
-
-	// list images, show tagged images
-	out, _ = dockerCmd(c, "images", "--digests")
-
-	// make sure image 1 has repo, tag, digest
-	c.Assert(reWithDigest1.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest1.String(), out))
-
-	// make sure image 2 has repo, tag, digest
-	reWithDigest2 := regexp.MustCompile(`\s*` + repoName + `\s*dangle2\s*` + digest2.String() + `\s`)
-	c.Assert(reWithDigest2.MatchString(out), checker.True, check.Commentf("expected %q: %s", reWithDigest2.String(), out))
-
-	// list images, no longer dangling, should not match
-	out, _ = dockerCmd(c, "images", "--digests", "--filter=dangling=true")
-
-	// make sure image 1 has repo, tag, digest
-	c.Assert(reWithDigest1.MatchString(out), checker.False, check.Commentf("unexpected %q: %s", reWithDigest1.String(), out))
-	// make sure image 2 has repo, tag, digest
-	c.Assert(reWithDigest2.MatchString(out), checker.False, check.Commentf("unexpected %q: %s", reWithDigest2.String(), out))
-}
-
-func (s *DockerRegistrySuite) TestInspectImageWithDigests(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, check.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	out, _ := dockerCmd(c, "inspect", imageReference)
-
-	var imageJSON []types.ImageInspect
-	err = json.Unmarshal([]byte(out), &imageJSON)
-	c.Assert(err, checker.IsNil)
-	c.Assert(imageJSON, checker.HasLen, 1)
-	c.Assert(imageJSON[0].RepoDigests, checker.HasLen, 1)
-	c.Assert(stringutils.InSlice(imageJSON[0].RepoDigests, imageReference), checker.Equals, true)
-}
-
-func (s *DockerRegistrySuite) TestPsListContainersFilterAncestorImageByDigest(c *check.C) {
-	digest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	imageReference := fmt.Sprintf("%s@%s", repoName, digest)
-
-	// pull from the registry using the <name>@<digest> reference
-	dockerCmd(c, "pull", imageReference)
-
-	// build an image from it
-	imageName1 := "images_ps_filter_test"
-	_, err = buildImage(imageName1, fmt.Sprintf(
-		`FROM %s
-		 LABEL match me 1`, imageReference), true)
-	c.Assert(err, checker.IsNil)
-
-	// run a container based on that
-	dockerCmd(c, "run", "--name=test1", imageReference, "echo", "hello")
-	expectedID, err := getIDByName("test1")
-	c.Assert(err, check.IsNil)
-
-	// run a container based on the a descendant of that too
-	dockerCmd(c, "run", "--name=test2", imageName1, "echo", "hello")
-	expectedID1, err := getIDByName("test2")
-	c.Assert(err, check.IsNil)
-
-	expectedIDs := []string{expectedID, expectedID1}
-
-	// Invalid imageReference
-	out, _ := dockerCmd(c, "ps", "-a", "-q", "--no-trunc", fmt.Sprintf("--filter=ancestor=busybox@%s", digest))
-	// Filter container for ancestor filter should be empty
-	c.Assert(strings.TrimSpace(out), checker.Equals, "")
-
-	// Valid imageReference
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=ancestor="+imageReference)
-	checkPsAncestorFilterOutput(c, out, imageReference, expectedIDs)
-}
-
-func (s *DockerRegistrySuite) TestDeleteImageByIDOnlyPulledByDigest(c *check.C) {
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// pull from the registry using the <name>@<digest> reference
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-	dockerCmd(c, "pull", imageReference)
-	// just in case...
-
-	dockerCmd(c, "tag", imageReference, repoName+":sometag")
-
-	imageID := inspectField(c, imageReference, "Id")
-
-	dockerCmd(c, "rmi", imageID)
-
-	_, err = inspectFieldWithError(imageID, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image should have been deleted"))
-}
-
-func (s *DockerRegistrySuite) TestDeleteImageWithDigestAndTag(c *check.C) {
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// pull from the registry using the <name>@<digest> reference
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-	dockerCmd(c, "pull", imageReference)
-
-	imageID := inspectField(c, imageReference, "Id")
-
-	repoTag := repoName + ":sometag"
-	repoTag2 := repoName + ":othertag"
-	dockerCmd(c, "tag", imageReference, repoTag)
-	dockerCmd(c, "tag", imageReference, repoTag2)
-
-	dockerCmd(c, "rmi", repoTag2)
-
-	// rmi should have deleted only repoTag2, because there's another tag
-	inspectField(c, repoTag, "Id")
-
-	dockerCmd(c, "rmi", repoTag)
-
-	// rmi should have deleted the tag, the digest reference, and the image itself
-	_, err = inspectFieldWithError(imageID, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image should have been deleted"))
-}
-
-func (s *DockerRegistrySuite) TestDeleteImageWithDigestAndMultiRepoTag(c *check.C) {
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	repo2 := fmt.Sprintf("%s/%s", repoName, "repo2")
-
-	// pull from the registry using the <name>@<digest> reference
-	imageReference := fmt.Sprintf("%s@%s", repoName, pushDigest)
-	dockerCmd(c, "pull", imageReference)
-
-	imageID := inspectField(c, imageReference, "Id")
-
-	repoTag := repoName + ":sometag"
-	repoTag2 := repo2 + ":othertag"
-	dockerCmd(c, "tag", imageReference, repoTag)
-	dockerCmd(c, "tag", imageReference, repoTag2)
-
-	dockerCmd(c, "rmi", repoTag)
-
-	// rmi should have deleted repoTag and image reference, but left repoTag2
-	inspectField(c, repoTag2, "Id")
-	_, err = inspectFieldWithError(imageReference, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image digest reference should have been removed"))
-
-	_, err = inspectFieldWithError(repoTag, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image tag reference should have been removed"))
-
-	dockerCmd(c, "rmi", repoTag2)
-
-	// rmi should have deleted the tag, the digest reference, and the image itself
-	_, err = inspectFieldWithError(imageID, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image should have been deleted"))
-}
-
-// TestPullFailsWithAlteredManifest tests that a `docker pull` fails when
-// we have modified a manifest blob and its digest cannot be verified.
-// This is the schema2 version of the test.
-func (s *DockerRegistrySuite) TestPullFailsWithAlteredManifest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	manifestDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// Load the target manifest blob.
-	manifestBlob := s.reg.readBlobContents(c, manifestDigest)
-
-	var imgManifest schema2.Manifest
-	err = json.Unmarshal(manifestBlob, &imgManifest)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to decode image manifest from blob"))
-
-	// Change a layer in the manifest.
-	imgManifest.Layers[0].Digest = digest.Digest("sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef")
-
-	// Move the existing data file aside, so that we can replace it with a
-	// malicious blob of data. NOTE: we defer the returned undo func.
-	undo := s.reg.tempMoveBlobData(c, manifestDigest)
-	defer undo()
-
-	alteredManifestBlob, err := json.MarshalIndent(imgManifest, "", "   ")
-	c.Assert(err, checker.IsNil, check.Commentf("unable to encode altered image manifest to JSON"))
-
-	s.reg.writeBlobContents(c, manifestDigest, alteredManifestBlob)
-
-	// Now try pulling that image by digest. We should get an error about
-	// digest verification for the manifest digest.
-
-	// Pull from the registry using the <name>@<digest> reference.
-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)
-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
-	c.Assert(exitStatus, checker.Not(check.Equals), 0)
-
-	expectedErrorMsg := fmt.Sprintf("manifest verification failed for digest %s", manifestDigest)
-	c.Assert(out, checker.Contains, expectedErrorMsg)
-}
-
-// TestPullFailsWithAlteredManifest tests that a `docker pull` fails when
-// we have modified a manifest blob and its digest cannot be verified.
-// This is the schema1 version of the test.
-func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredManifest(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	manifestDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// Load the target manifest blob.
-	manifestBlob := s.reg.readBlobContents(c, manifestDigest)
-
-	var imgManifest schema1.Manifest
-	err = json.Unmarshal(manifestBlob, &imgManifest)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to decode image manifest from blob"))
-
-	// Change a layer in the manifest.
-	imgManifest.FSLayers[0] = schema1.FSLayer{
-		BlobSum: digest.Digest("sha256:0123456789abcdef0123456789abcdef0123456789abcdef0123456789abcdef"),
-	}
-
-	// Move the existing data file aside, so that we can replace it with a
-	// malicious blob of data. NOTE: we defer the returned undo func.
-	undo := s.reg.tempMoveBlobData(c, manifestDigest)
-	defer undo()
-
-	alteredManifestBlob, err := json.MarshalIndent(imgManifest, "", "   ")
-	c.Assert(err, checker.IsNil, check.Commentf("unable to encode altered image manifest to JSON"))
-
-	s.reg.writeBlobContents(c, manifestDigest, alteredManifestBlob)
-
-	// Now try pulling that image by digest. We should get an error about
-	// digest verification for the manifest digest.
-
-	// Pull from the registry using the <name>@<digest> reference.
-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)
-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
-	c.Assert(exitStatus, checker.Not(check.Equals), 0)
-
-	expectedErrorMsg := fmt.Sprintf("image verification failed for digest %s", manifestDigest)
-	c.Assert(out, checker.Contains, expectedErrorMsg)
-}
-
-// TestPullFailsWithAlteredLayer tests that a `docker pull` fails when
-// we have modified a layer blob and its digest cannot be verified.
-// This is the schema2 version of the test.
-func (s *DockerRegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	manifestDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil)
-
-	// Load the target manifest blob.
-	manifestBlob := s.reg.readBlobContents(c, manifestDigest)
-
-	var imgManifest schema2.Manifest
-	err = json.Unmarshal(manifestBlob, &imgManifest)
-	c.Assert(err, checker.IsNil)
-
-	// Next, get the digest of one of the layers from the manifest.
-	targetLayerDigest := imgManifest.Layers[0].Digest
-
-	// Move the existing data file aside, so that we can replace it with a
-	// malicious blob of data. NOTE: we defer the returned undo func.
-	undo := s.reg.tempMoveBlobData(c, targetLayerDigest)
-	defer undo()
-
-	// Now make a fake data blob in this directory.
-	s.reg.writeBlobContents(c, targetLayerDigest, []byte("This is not the data you are looking for."))
-
-	// Now try pulling that image by digest. We should get an error about
-	// digest verification for the target layer digest.
-
-	// Remove distribution cache to force a re-pull of the blobs
-	if err := os.RemoveAll(filepath.Join(dockerBasePath, "image", s.d.storageDriver, "distribution")); err != nil {
-		c.Fatalf("error clearing distribution cache: %v", err)
-	}
-
-	// Pull from the registry using the <name>@<digest> reference.
-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)
-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
-	c.Assert(exitStatus, checker.Not(check.Equals), 0, check.Commentf("expected a non-zero exit status"))
-
-	expectedErrorMsg := fmt.Sprintf("filesystem layer verification failed for digest %s", targetLayerDigest)
-	c.Assert(out, checker.Contains, expectedErrorMsg, check.Commentf("expected error message in output: %s", out))
-}
-
-// TestPullFailsWithAlteredLayer tests that a `docker pull` fails when
-// we have modified a layer blob and its digest cannot be verified.
-// This is the schema1 version of the test.
-func (s *DockerSchema1RegistrySuite) TestPullFailsWithAlteredLayer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	manifestDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil)
-
-	// Load the target manifest blob.
-	manifestBlob := s.reg.readBlobContents(c, manifestDigest)
-
-	var imgManifest schema1.Manifest
-	err = json.Unmarshal(manifestBlob, &imgManifest)
-	c.Assert(err, checker.IsNil)
-
-	// Next, get the digest of one of the layers from the manifest.
-	targetLayerDigest := imgManifest.FSLayers[0].BlobSum
-
-	// Move the existing data file aside, so that we can replace it with a
-	// malicious blob of data. NOTE: we defer the returned undo func.
-	undo := s.reg.tempMoveBlobData(c, targetLayerDigest)
-	defer undo()
-
-	// Now make a fake data blob in this directory.
-	s.reg.writeBlobContents(c, targetLayerDigest, []byte("This is not the data you are looking for."))
-
-	// Now try pulling that image by digest. We should get an error about
-	// digest verification for the target layer digest.
-
-	// Remove distribution cache to force a re-pull of the blobs
-	if err := os.RemoveAll(filepath.Join(dockerBasePath, "image", s.d.storageDriver, "distribution")); err != nil {
-		c.Fatalf("error clearing distribution cache: %v", err)
-	}
-
-	// Pull from the registry using the <name>@<digest> reference.
-	imageReference := fmt.Sprintf("%s@%s", repoName, manifestDigest)
-	out, exitStatus, _ := dockerCmdWithError("pull", imageReference)
-	c.Assert(exitStatus, checker.Not(check.Equals), 0, check.Commentf("expected a non-zero exit status"))
-
-	expectedErrorMsg := fmt.Sprintf("filesystem layer verification failed for digest %s", targetLayerDigest)
-	c.Assert(out, checker.Contains, expectedErrorMsg, check.Commentf("expected error message in output: %s", out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_commit_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_commit_test.go
deleted file mode 100644
index 8008ae1716..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_commit_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestCommitAfterContainerIsDone(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "wait", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "commit", cleanedContainerID)
-
-	cleanedImageID := strings.TrimSpace(out)
-
-	dockerCmd(c, "inspect", cleanedImageID)
-}
-
-func (s *DockerSuite) TestCommitWithoutPause(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-i", "-a", "stdin", "busybox", "echo", "foo")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "wait", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "commit", "-p=false", cleanedContainerID)
-
-	cleanedImageID := strings.TrimSpace(out)
-
-	dockerCmd(c, "inspect", cleanedImageID)
-}
-
-//test commit a paused container should not unpause it after commit
-func (s *DockerSuite) TestCommitPausedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	defer unpauseAllContainers()
-	out, _ := dockerCmd(c, "run", "-i", "-d", "busybox")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "pause", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "commit", cleanedContainerID)
-
-	out = inspectField(c, cleanedContainerID, "State.Paused")
-	// commit should not unpause a paused container
-	c.Assert(out, checker.Contains, "true")
-}
-
-func (s *DockerSuite) TestCommitNewFile(c *check.C) {
-	dockerCmd(c, "run", "--name", "commiter", "busybox", "/bin/sh", "-c", "echo koye > /foo")
-
-	imageID, _ := dockerCmd(c, "commit", "commiter")
-	imageID = strings.TrimSpace(imageID)
-
-	out, _ := dockerCmd(c, "run", imageID, "cat", "/foo")
-	actual := strings.TrimSpace(out)
-	c.Assert(actual, checker.Equals, "koye")
-}
-
-func (s *DockerSuite) TestCommitHardlink(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	firstOutput, _ := dockerCmd(c, "run", "-t", "--name", "hardlinks", "busybox", "sh", "-c", "touch file1 && ln file1 file2 && ls -di file1 file2")
-
-	chunks := strings.Split(strings.TrimSpace(firstOutput), " ")
-	inode := chunks[0]
-	chunks = strings.SplitAfterN(strings.TrimSpace(firstOutput), " ", 2)
-	c.Assert(chunks[1], checker.Contains, chunks[0], check.Commentf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:]))
-
-	imageID, _ := dockerCmd(c, "commit", "hardlinks", "hardlinks")
-	imageID = strings.TrimSpace(imageID)
-
-	secondOutput, _ := dockerCmd(c, "run", "-t", "hardlinks", "ls", "-di", "file1", "file2")
-
-	chunks = strings.Split(strings.TrimSpace(secondOutput), " ")
-	inode = chunks[0]
-	chunks = strings.SplitAfterN(strings.TrimSpace(secondOutput), " ", 2)
-	c.Assert(chunks[1], checker.Contains, chunks[0], check.Commentf("Failed to create hardlink in a container. Expected to find %q in %q", inode, chunks[1:]))
-}
-
-func (s *DockerSuite) TestCommitTTY(c *check.C) {
-	dockerCmd(c, "run", "-t", "--name", "tty", "busybox", "/bin/ls")
-
-	imageID, _ := dockerCmd(c, "commit", "tty", "ttytest")
-	imageID = strings.TrimSpace(imageID)
-
-	dockerCmd(c, "run", "ttytest", "/bin/ls")
-}
-
-func (s *DockerSuite) TestCommitWithHostBindMount(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "bind-commit", "-v", "/dev/null:/winning", "busybox", "true")
-
-	imageID, _ := dockerCmd(c, "commit", "bind-commit", "bindtest")
-	imageID = strings.TrimSpace(imageID)
-
-	dockerCmd(c, "run", "bindtest", "true")
-}
-
-func (s *DockerSuite) TestCommitChange(c *check.C) {
-	dockerCmd(c, "run", "--name", "test", "busybox", "true")
-
-	imageID, _ := dockerCmd(c, "commit",
-		"--change", "EXPOSE 8080",
-		"--change", "ENV DEBUG true",
-		"--change", "ENV test 1",
-		"--change", "ENV PATH /foo",
-		"--change", "LABEL foo bar",
-		"--change", "CMD [\"/bin/sh\"]",
-		"--change", "WORKDIR /opt",
-		"--change", "ENTRYPOINT [\"/bin/sh\"]",
-		"--change", "USER testuser",
-		"--change", "VOLUME /var/lib/docker",
-		"--change", "ONBUILD /usr/local/bin/python-build --dir /app/src",
-		"test", "test-commit")
-	imageID = strings.TrimSpace(imageID)
-
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	prefix = strings.ToUpper(prefix) // Force C: as that's how WORKDIR is normalised on Windows
-	expected := map[string]string{
-		"Config.ExposedPorts": "map[8080/tcp:{}]",
-		"Config.Env":          "[DEBUG=true test=1 PATH=/foo]",
-		"Config.Labels":       "map[foo:bar]",
-		"Config.Cmd":          "[/bin/sh]",
-		"Config.WorkingDir":   prefix + slash + "opt",
-		"Config.Entrypoint":   "[/bin/sh]",
-		"Config.User":         "testuser",
-		"Config.Volumes":      "map[/var/lib/docker:{}]",
-		"Config.OnBuild":      "[/usr/local/bin/python-build --dir /app/src]",
-	}
-
-	for conf, value := range expected {
-		res := inspectField(c, imageID, conf)
-		if res != value {
-			c.Errorf("%s('%s'), expected %s", conf, res, value)
-		}
-	}
-}
-
-func (s *DockerSuite) TestCommitChangeLabels(c *check.C) {
-	dockerCmd(c, "run", "--name", "test", "--label", "some=label", "busybox", "true")
-
-	imageID, _ := dockerCmd(c, "commit",
-		"--change", "LABEL some=label2",
-		"test", "test-commit")
-	imageID = strings.TrimSpace(imageID)
-
-	c.Assert(inspectField(c, imageID, "Config.Labels"), checker.Equals, "map[some:label2]")
-	// check that container labels didn't change
-	c.Assert(inspectField(c, "test", "Config.Labels"), checker.Equals, "map[some:label]")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_config_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_config_test.go
deleted file mode 100644
index 1d5e5ad3db..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_config_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-
-	"github.com/docker/docker/api"
-	"github.com/docker/docker/dockerversion"
-	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestConfigHTTPHeader(c *check.C) {
-	testRequires(c, UnixCli) // Can't set/unset HOME on windows right now
-	// We either need a level of Go that supports Unsetenv (for cases
-	// when HOME/USERPROFILE isn't set), or we need to be able to use
-	// os/user but user.Current() only works if we aren't statically compiling
-
-	var headers map[string][]string
-
-	server := httptest.NewServer(http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("API-Version", api.DefaultVersion)
-			headers = r.Header
-		}))
-	defer server.Close()
-
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-	tmpDir, err := ioutil.TempDir("", "fake-home")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-
-	dotDocker := filepath.Join(tmpDir, ".docker")
-	os.Mkdir(dotDocker, 0600)
-	tmpCfg := filepath.Join(dotDocker, "config.json")
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpDir)
-
-	data := `{
-		"HttpHeaders": { "MyHeader": "MyValue" }
-	}`
-
-	err = ioutil.WriteFile(tmpCfg, []byte(data), 0600)
-	c.Assert(err, checker.IsNil)
-
-	cmd := exec.Command(dockerBinary, "-H="+server.URL[7:], "ps")
-	out, _, _ := runCommandWithOutput(cmd)
-
-	c.Assert(headers["User-Agent"], checker.NotNil, check.Commentf("Missing User-Agent"))
-
-	c.Assert(headers["User-Agent"][0], checker.Equals, "Docker-Client/"+dockerversion.Version+" ("+runtime.GOOS+")", check.Commentf("Badly formatted User-Agent,out:%v", out))
-
-	c.Assert(headers["Myheader"], checker.NotNil)
-	c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("Missing/bad header,out:%v", out))
-
-}
-
-func (s *DockerSuite) TestConfigDir(c *check.C) {
-	cDir, err := ioutil.TempDir("", "fake-home")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(cDir)
-
-	// First make sure pointing to empty dir doesn't generate an error
-	dockerCmd(c, "--config", cDir, "ps")
-
-	// Test with env var too
-	cmd := exec.Command(dockerBinary, "ps")
-	cmd.Env = appendBaseEnv(true, "DOCKER_CONFIG="+cDir)
-	out, _, err := runCommandWithOutput(cmd)
-
-	c.Assert(err, checker.IsNil, check.Commentf("ps2 didn't work,out:%v", out))
-
-	// Start a server so we can check to see if the config file was
-	// loaded properly
-	var headers map[string][]string
-
-	server := httptest.NewServer(http.HandlerFunc(
-		func(w http.ResponseWriter, r *http.Request) {
-			headers = r.Header
-		}))
-	defer server.Close()
-
-	// Create a dummy config file in our new config dir
-	data := `{
-		"HttpHeaders": { "MyHeader": "MyValue" }
-	}`
-
-	tmpCfg := filepath.Join(cDir, "config.json")
-	err = ioutil.WriteFile(tmpCfg, []byte(data), 0600)
-	c.Assert(err, checker.IsNil, check.Commentf("Err creating file"))
-
-	env := appendBaseEnv(false)
-
-	cmd = exec.Command(dockerBinary, "--config", cDir, "-H="+server.URL[7:], "ps")
-	cmd.Env = env
-	out, _, err = runCommandWithOutput(cmd)
-
-	c.Assert(err, checker.NotNil, check.Commentf("out:%v", out))
-	c.Assert(headers["Myheader"], checker.NotNil)
-	c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps3 - Missing header,out:%v", out))
-
-	// Reset headers and try again using env var this time
-	headers = map[string][]string{}
-	cmd = exec.Command(dockerBinary, "-H="+server.URL[7:], "ps")
-	cmd.Env = append(env, "DOCKER_CONFIG="+cDir)
-	out, _, err = runCommandWithOutput(cmd)
-
-	c.Assert(err, checker.NotNil, check.Commentf("%v", out))
-	c.Assert(headers["Myheader"], checker.NotNil)
-	c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps4 - Missing header,out:%v", out))
-
-	// Reset headers and make sure flag overrides the env var
-	headers = map[string][]string{}
-	cmd = exec.Command(dockerBinary, "--config", cDir, "-H="+server.URL[7:], "ps")
-	cmd.Env = append(env, "DOCKER_CONFIG=MissingDir")
-	out, _, err = runCommandWithOutput(cmd)
-
-	c.Assert(err, checker.NotNil, check.Commentf("out:%v", out))
-	c.Assert(headers["Myheader"], checker.NotNil)
-	c.Assert(headers["Myheader"][0], checker.Equals, "MyValue", check.Commentf("ps5 - Missing header,out:%v", out))
-
-	// Reset headers and make sure flag overrides the env var.
-	// Almost same as previous but make sure the "MissingDir" isn't
-	// ignore - we don't want to default back to the env var.
-	headers = map[string][]string{}
-	cmd = exec.Command(dockerBinary, "--config", "MissingDir", "-H="+server.URL[7:], "ps")
-	cmd.Env = append(env, "DOCKER_CONFIG="+cDir)
-	out, _, err = runCommandWithOutput(cmd)
-
-	c.Assert(err, checker.NotNil, check.Commentf("out:%v", out))
-	c.Assert(headers["Myheader"], checker.IsNil, check.Commentf("ps6 - Headers shouldn't be the expected value,out:%v", out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_from_container_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_from_container_test.go
deleted file mode 100644
index 9ed7e8c720..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_from_container_test.go
+++ /dev/null
@@ -1,488 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// docker cp CONTAINER:PATH LOCALPATH
-
-// Try all of the test cases from the archive package which implements the
-// internals of `docker cp` and ensure that the behavior matches when actually
-// copying to and from containers.
-
-// Basic assumptions about SRC and DST:
-// 1. SRC must exist.
-// 2. If SRC ends with a trailing separator, it must be a directory.
-// 3. DST parent directory must exist.
-// 4. If DST exists as a file, it must not end with a trailing separator.
-
-// First get these easy error cases out of the way.
-
-// Test for error when SRC does not exist.
-func (s *DockerSuite) TestCpFromErrSrcNotExists(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{})
-
-	tmpDir := getTestDir(c, "test-cp-from-err-src-not-exists")
-	defer os.RemoveAll(tmpDir)
-
-	err := runDockerCp(c, containerCpPath(containerID, "file1"), tmpDir)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-}
-
-// Test for error when SRC ends in a trailing
-// path separator but it exists as a file.
-func (s *DockerSuite) TestCpFromErrSrcNotDir(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-err-src-not-dir")
-	defer os.RemoveAll(tmpDir)
-
-	err := runDockerCp(c, containerCpPathTrailingSep(containerID, "file1"), tmpDir)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotDir(err), checker.True, check.Commentf("expected IsNotDir error, but got %T: %s", err, err))
-}
-
-// Test for error when SRC is a valid file or directory,
-// bu the DST parent directory does not exist.
-func (s *DockerSuite) TestCpFromErrDstParentNotExists(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-err-dst-parent-not-exists")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	// Try with a file source.
-	srcPath := containerCpPath(containerID, "/file1")
-	dstPath := cpPath(tmpDir, "notExists", "file1")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-
-	// Try with a directory source.
-	srcPath = containerCpPath(containerID, "/dir1")
-
-	err = runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-}
-
-// Test for error when DST ends in a trailing
-// path separator but exists as a file.
-func (s *DockerSuite) TestCpFromErrDstNotDir(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-err-dst-not-dir")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	// Try with a file source.
-	srcPath := containerCpPath(containerID, "/file1")
-	dstPath := cpPathTrailingSep(tmpDir, "file1")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotDir(err), checker.True, check.Commentf("expected IsNotDir error, but got %T: %s", err, err))
-
-	// Try with a directory source.
-	srcPath = containerCpPath(containerID, "/dir1")
-
-	err = runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotDir(err), checker.True, check.Commentf("expected IsNotDir error, but got %T: %s", err, err))
-}
-
-// Check that copying from a container to a local symlink copies to the symlink
-// target and does not overwrite the local symlink itself.
-func (s *DockerSuite) TestCpFromSymlinkDestination(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-err-dst-not-dir")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	// First, copy a file from the container to a symlink to a file. This
-	// should overwrite the symlink target contents with the source contents.
-	srcPath := containerCpPath(containerID, "/file2")
-	dstPath := cpPath(tmpDir, "symlinkToFile1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, dstPath, "file1"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(tmpDir, "file1"), "file2\n"), checker.IsNil)
-
-	// Next, copy a file from the container to a symlink to a directory. This
-	// should copy the file into the symlink target directory.
-	dstPath = cpPath(tmpDir, "symlinkToDir1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, dstPath, "dir1"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(tmpDir, "file2"), "file2\n"), checker.IsNil)
-
-	// Next, copy a file from the container to a symlink to a file that does
-	// not exist (a broken symlink). This should create the target file with
-	// the contents of the source file.
-	dstPath = cpPath(tmpDir, "brokenSymlinkToFileX")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, dstPath, "fileX"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(tmpDir, "fileX"), "file2\n"), checker.IsNil)
-
-	// Next, copy a directory from the container to a symlink to a local
-	// directory. This should copy the directory into the symlink target
-	// directory and not modify the symlink.
-	srcPath = containerCpPath(containerID, "/dir2")
-	dstPath = cpPath(tmpDir, "symlinkToDir1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, dstPath, "dir1"), checker.IsNil)
-
-	// The directory should now contain a copy of "dir2".
-	c.Assert(fileContentEquals(c, cpPath(tmpDir, "dir1/dir2/file2-1"), "file2-1\n"), checker.IsNil)
-
-	// Next, copy a directory from the container to a symlink to a local
-	// directory that does not exist (a broken symlink). This should create
-	// the target as a directory with the contents of the source directory. It
-	// should not modify the symlink.
-	dstPath = cpPath(tmpDir, "brokenSymlinkToDirX")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, dstPath, "dirX"), checker.IsNil)
-
-	// The "dirX" directory should now be a copy of "dir2".
-	c.Assert(fileContentEquals(c, cpPath(tmpDir, "dirX/file2-1"), "file2-1\n"), checker.IsNil)
-}
-
-// Possibilities are reduced to the remaining 10 cases:
-//
-//  case | srcIsDir | onlyDirContents | dstExists | dstIsDir | dstTrSep | action
-// ===================================================================================================
-//   A   |  no      |  -              |  no       |  -       |  no      |  create file
-//   B   |  no      |  -              |  no       |  -       |  yes     |  error
-//   C   |  no      |  -              |  yes      |  no      |  -       |  overwrite file
-//   D   |  no      |  -              |  yes      |  yes     |  -       |  create file in dst dir
-//   E   |  yes     |  no             |  no       |  -       |  -       |  create dir, copy contents
-//   F   |  yes     |  no             |  yes      |  no      |  -       |  error
-//   G   |  yes     |  no             |  yes      |  yes     |  -       |  copy dir and contents
-//   H   |  yes     |  yes            |  no       |  -       |  -       |  create dir, copy contents
-//   I   |  yes     |  yes            |  yes      |  no      |  -       |  error
-//   J   |  yes     |  yes            |  yes      |  yes     |  -       |  copy dir contents
-//
-
-// A. SRC specifies a file and DST (no trailing path separator) doesn't
-//    exist. This should create a file with the name DST and copy the
-//    contents of the source file into it.
-func (s *DockerSuite) TestCpFromCaseA(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-a")
-	defer os.RemoveAll(tmpDir)
-
-	srcPath := containerCpPath(containerID, "/root/file1")
-	dstPath := cpPath(tmpDir, "itWorks.txt")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1\n"), checker.IsNil)
-}
-
-// B. SRC specifies a file and DST (with trailing path separator) doesn't
-//    exist. This should cause an error because the copy operation cannot
-//    create a directory when copying a single file.
-func (s *DockerSuite) TestCpFromCaseB(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-b")
-	defer os.RemoveAll(tmpDir)
-
-	srcPath := containerCpPath(containerID, "/file1")
-	dstDir := cpPathTrailingSep(tmpDir, "testDir")
-
-	err := runDockerCp(c, srcPath, dstDir)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpDirNotExist(err), checker.True, check.Commentf("expected DirNotExists error, but got %T: %s", err, err))
-}
-
-// C. SRC specifies a file and DST exists as a file. This should overwrite
-//    the file at DST with the contents of the source file.
-func (s *DockerSuite) TestCpFromCaseC(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-c")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := containerCpPath(containerID, "/root/file1")
-	dstPath := cpPath(tmpDir, "file2")
-
-	// Ensure the local file starts with different content.
-	c.Assert(fileContentEquals(c, dstPath, "file2\n"), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1\n"), checker.IsNil)
-}
-
-// D. SRC specifies a file and DST exists as a directory. This should place
-//    a copy of the source file inside it using the basename from SRC. Ensure
-//    this works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpFromCaseD(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-d")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := containerCpPath(containerID, "/file1")
-	dstDir := cpPath(tmpDir, "dir1")
-	dstPath := filepath.Join(dstDir, "file1")
-
-	// Ensure that dstPath doesn't exist.
-	_, err := os.Stat(dstPath)
-	c.Assert(os.IsNotExist(err), checker.True, check.Commentf("did not expect dstPath %q to exist", dstPath))
-
-	c.Assert(runDockerCp(c, srcPath, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// unable to remove dstDir
-	c.Assert(os.RemoveAll(dstDir), checker.IsNil)
-
-	// unable to make dstDir
-	c.Assert(os.MkdirAll(dstDir, os.FileMode(0755)), checker.IsNil)
-
-	dstDir = cpPathTrailingSep(tmpDir, "dir1")
-
-	c.Assert(runDockerCp(c, srcPath, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1\n"), checker.IsNil)
-}
-
-// E. SRC specifies a directory and DST does not exist. This should create a
-//    directory at DST and copy the contents of the SRC directory into the DST
-//    directory. Ensure this works whether DST has a trailing path separator or
-//    not.
-func (s *DockerSuite) TestCpFromCaseE(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-e")
-	defer os.RemoveAll(tmpDir)
-
-	srcDir := containerCpPath(containerID, "dir1")
-	dstDir := cpPath(tmpDir, "testDir")
-	dstPath := filepath.Join(dstDir, "file1-1")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// unable to remove dstDir
-	c.Assert(os.RemoveAll(dstDir), checker.IsNil)
-
-	dstDir = cpPathTrailingSep(tmpDir, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-}
-
-// F. SRC specifies a directory and DST exists as a file. This should cause an
-//    error as it is not possible to overwrite a file with a directory.
-func (s *DockerSuite) TestCpFromCaseF(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-f")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := containerCpPath(containerID, "/root/dir1")
-	dstFile := cpPath(tmpDir, "file1")
-
-	err := runDockerCp(c, srcDir, dstFile)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyDir(err), checker.True, check.Commentf("expected ErrCannotCopyDir error, but got %T: %s", err, err))
-}
-
-// G. SRC specifies a directory and DST exists as a directory. This should copy
-//    the SRC directory and all its contents to the DST directory. Ensure this
-//    works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpFromCaseG(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-g")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := containerCpPath(containerID, "/root/dir1")
-	dstDir := cpPath(tmpDir, "dir2")
-	resultDir := filepath.Join(dstDir, "dir1")
-	dstPath := filepath.Join(resultDir, "file1-1")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// unable to remove dstDir
-	c.Assert(os.RemoveAll(dstDir), checker.IsNil)
-
-	// unable to make dstDir
-	c.Assert(os.MkdirAll(dstDir, os.FileMode(0755)), checker.IsNil)
-
-	dstDir = cpPathTrailingSep(tmpDir, "dir2")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-}
-
-// H. SRC specifies a directory's contents only and DST does not exist. This
-//    should create a directory at DST and copy the contents of the SRC
-//    directory (but not the directory itself) into the DST directory. Ensure
-//    this works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpFromCaseH(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-h")
-	defer os.RemoveAll(tmpDir)
-
-	srcDir := containerCpPathTrailingSep(containerID, "dir1") + "."
-	dstDir := cpPath(tmpDir, "testDir")
-	dstPath := filepath.Join(dstDir, "file1-1")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// unable to remove resultDir
-	c.Assert(os.RemoveAll(dstDir), checker.IsNil)
-
-	dstDir = cpPathTrailingSep(tmpDir, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-}
-
-// I. SRC specifies a directory's contents only and DST exists as a file. This
-//    should cause an error as it is not possible to overwrite a file with a
-//    directory.
-func (s *DockerSuite) TestCpFromCaseI(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-i")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := containerCpPathTrailingSep(containerID, "/root/dir1") + "."
-	dstFile := cpPath(tmpDir, "file1")
-
-	err := runDockerCp(c, srcDir, dstFile)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyDir(err), checker.True, check.Commentf("expected ErrCannotCopyDir error, but got %T: %s", err, err))
-}
-
-// J. SRC specifies a directory's contents only and DST exists as a directory.
-//    This should copy the contents of the SRC directory (but not the directory
-//    itself) into the DST directory. Ensure this works whether DST has a
-//    trailing path separator or not.
-func (s *DockerSuite) TestCpFromCaseJ(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-from-case-j")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := containerCpPathTrailingSep(containerID, "/root/dir1") + "."
-	dstDir := cpPath(tmpDir, "dir2")
-	dstPath := filepath.Join(dstDir, "file1-1")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// unable to remove dstDir
-	c.Assert(os.RemoveAll(dstDir), checker.IsNil)
-
-	// unable to make dstDir
-	c.Assert(os.MkdirAll(dstDir, os.FileMode(0755)), checker.IsNil)
-
-	dstDir = cpPathTrailingSep(tmpDir, "dir2")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	c.Assert(fileContentEquals(c, dstPath, "file1-1\n"), checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_test.go
deleted file mode 100644
index 4e5c39e998..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_test.go
+++ /dev/null
@@ -1,660 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-const (
-	cpTestPathParent = "/some"
-	cpTestPath       = "/some/path"
-	cpTestName       = "test"
-	cpFullPath       = "/some/path/test"
-
-	cpContainerContents = "holla, i am the container"
-	cpHostContents      = "hello, i am the host"
-)
-
-// Ensure that an all-local path case returns an error.
-func (s *DockerSuite) TestCpLocalOnly(c *check.C) {
-	err := runDockerCp(c, "foo", "bar")
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(err.Error(), checker.Contains, "must specify at least one container source")
-}
-
-// Test for #5656
-// Check that garbage paths don't escape the container's rootfs
-func (s *DockerSuite) TestCpGarbagePath(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	c.Assert(os.MkdirAll(cpTestPath, os.ModeDir), checker.IsNil)
-
-	hostFile, err := os.Create(cpFullPath)
-	c.Assert(err, checker.IsNil)
-	defer hostFile.Close()
-	defer os.RemoveAll(cpTestPathParent)
-
-	fmt.Fprintf(hostFile, "%s", cpHostContents)
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-
-	tmpname := filepath.Join(tmpdir, cpTestName)
-	defer os.RemoveAll(tmpdir)
-
-	path := path.Join("../../../../../../../../../../../../", cpFullPath)
-
-	dockerCmd(c, "cp", containerID+":"+path, tmpdir)
-
-	file, _ := os.Open(tmpname)
-	defer file.Close()
-
-	test, err := ioutil.ReadAll(file)
-	c.Assert(err, checker.IsNil)
-
-	// output matched host file -- garbage path can escape container rootfs
-	c.Assert(string(test), checker.Not(checker.Equals), cpHostContents)
-
-	// output doesn't match the input for garbage path
-	c.Assert(string(test), checker.Equals, cpContainerContents)
-}
-
-// Check that relative paths are relative to the container's rootfs
-func (s *DockerSuite) TestCpRelativePath(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	c.Assert(os.MkdirAll(cpTestPath, os.ModeDir), checker.IsNil)
-
-	hostFile, err := os.Create(cpFullPath)
-	c.Assert(err, checker.IsNil)
-	defer hostFile.Close()
-	defer os.RemoveAll(cpTestPathParent)
-
-	fmt.Fprintf(hostFile, "%s", cpHostContents)
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-
-	tmpname := filepath.Join(tmpdir, cpTestName)
-	defer os.RemoveAll(tmpdir)
-
-	var relPath string
-	if path.IsAbs(cpFullPath) {
-		// normally this is `filepath.Rel("/", cpFullPath)` but we cannot
-		// get this unix-path manipulation on windows with filepath.
-		relPath = cpFullPath[1:]
-	}
-	c.Assert(path.IsAbs(cpFullPath), checker.True, check.Commentf("path %s was assumed to be an absolute path", cpFullPath))
-
-	dockerCmd(c, "cp", containerID+":"+relPath, tmpdir)
-
-	file, _ := os.Open(tmpname)
-	defer file.Close()
-
-	test, err := ioutil.ReadAll(file)
-	c.Assert(err, checker.IsNil)
-
-	// output matched host file -- relative path can escape container rootfs
-	c.Assert(string(test), checker.Not(checker.Equals), cpHostContents)
-
-	// output doesn't match the input for relative path
-	c.Assert(string(test), checker.Equals, cpContainerContents)
-}
-
-// Check that absolute paths are relative to the container's rootfs
-func (s *DockerSuite) TestCpAbsolutePath(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath)
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	c.Assert(os.MkdirAll(cpTestPath, os.ModeDir), checker.IsNil)
-
-	hostFile, err := os.Create(cpFullPath)
-	c.Assert(err, checker.IsNil)
-	defer hostFile.Close()
-	defer os.RemoveAll(cpTestPathParent)
-
-	fmt.Fprintf(hostFile, "%s", cpHostContents)
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-
-	tmpname := filepath.Join(tmpdir, cpTestName)
-	defer os.RemoveAll(tmpdir)
-
-	path := cpFullPath
-
-	dockerCmd(c, "cp", containerID+":"+path, tmpdir)
-
-	file, _ := os.Open(tmpname)
-	defer file.Close()
-
-	test, err := ioutil.ReadAll(file)
-	c.Assert(err, checker.IsNil)
-
-	// output matched host file -- absolute path can escape container rootfs
-	c.Assert(string(test), checker.Not(checker.Equals), cpHostContents)
-
-	// output doesn't match the input for absolute path
-	c.Assert(string(test), checker.Equals, cpContainerContents)
-}
-
-// Test for #5619
-// Check that absolute symlinks are still relative to the container's rootfs
-func (s *DockerSuite) TestCpAbsoluteSymlink(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath+" && ln -s "+cpFullPath+" container_path")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	c.Assert(os.MkdirAll(cpTestPath, os.ModeDir), checker.IsNil)
-
-	hostFile, err := os.Create(cpFullPath)
-	c.Assert(err, checker.IsNil)
-	defer hostFile.Close()
-	defer os.RemoveAll(cpTestPathParent)
-
-	fmt.Fprintf(hostFile, "%s", cpHostContents)
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-
-	tmpname := filepath.Join(tmpdir, "container_path")
-	defer os.RemoveAll(tmpdir)
-
-	path := path.Join("/", "container_path")
-
-	dockerCmd(c, "cp", containerID+":"+path, tmpdir)
-
-	// We should have copied a symlink *NOT* the file itself!
-	linkTarget, err := os.Readlink(tmpname)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(linkTarget, checker.Equals, filepath.FromSlash(cpFullPath))
-}
-
-// Check that symlinks to a directory behave as expected when copying one from
-// a container.
-func (s *DockerSuite) TestCpFromSymlinkToDirectory(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath+" && ln -s "+cpTestPathParent+" /dir_link")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	testDir, err := ioutil.TempDir("", "test-cp-from-symlink-to-dir-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(testDir)
-
-	// This copy command should copy the symlink, not the target, into the
-	// temporary directory.
-	dockerCmd(c, "cp", containerID+":"+"/dir_link", testDir)
-
-	expectedPath := filepath.Join(testDir, "dir_link")
-	linkTarget, err := os.Readlink(expectedPath)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(linkTarget, checker.Equals, filepath.FromSlash(cpTestPathParent))
-
-	os.Remove(expectedPath)
-
-	// This copy command should resolve the symlink (note the trailing
-	// separator), copying the target into the temporary directory.
-	dockerCmd(c, "cp", containerID+":"+"/dir_link/", testDir)
-
-	// It *should not* have copied the directory using the target's name, but
-	// used the given name instead.
-	unexpectedPath := filepath.Join(testDir, cpTestPathParent)
-	stat, err := os.Lstat(unexpectedPath)
-	if err == nil {
-		out = fmt.Sprintf("target name was copied: %q - %q", stat.Mode(), stat.Name())
-	}
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-
-	// It *should* have copied the directory using the asked name "dir_link".
-	stat, err = os.Lstat(expectedPath)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to stat resource at %q", expectedPath))
-
-	c.Assert(stat.IsDir(), checker.True, check.Commentf("should have copied a directory but got %q instead", stat.Mode()))
-}
-
-// Check that symlinks to a directory behave as expected when copying one to a
-// container.
-func (s *DockerSuite) TestCpToSymlinkToDirectory(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon) // Requires local volume mount bind.
-
-	testVol, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(testVol)
-
-	// Create a test container with a local volume. We will test by copying
-	// to the volume path in the container which we can then verify locally.
-	out, _ := dockerCmd(c, "create", "-v", testVol+":/testVol", "busybox")
-
-	containerID := strings.TrimSpace(out)
-
-	// Create a temp directory to hold a test file nested in a directory.
-	testDir, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(testDir)
-
-	// This file will be at "/testDir/some/path/test" and will be copied into
-	// the test volume later.
-	hostTestFilename := filepath.Join(testDir, cpFullPath)
-	c.Assert(os.MkdirAll(filepath.Dir(hostTestFilename), os.FileMode(0700)), checker.IsNil)
-	c.Assert(ioutil.WriteFile(hostTestFilename, []byte(cpHostContents), os.FileMode(0600)), checker.IsNil)
-
-	// Now create another temp directory to hold a symlink to the
-	// "/testDir/some" directory.
-	linkDir, err := ioutil.TempDir("", "test-cp-to-symlink-to-dir-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(linkDir)
-
-	// Then symlink "/linkDir/dir_link" to "/testdir/some".
-	linkTarget := filepath.Join(testDir, cpTestPathParent)
-	localLink := filepath.Join(linkDir, "dir_link")
-	c.Assert(os.Symlink(linkTarget, localLink), checker.IsNil)
-
-	// Now copy that symlink into the test volume in the container.
-	dockerCmd(c, "cp", localLink, containerID+":/testVol")
-
-	// This copy command should have copied the symlink *not* the target.
-	expectedPath := filepath.Join(testVol, "dir_link")
-	actualLinkTarget, err := os.Readlink(expectedPath)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to read symlink at %q", expectedPath))
-
-	c.Assert(actualLinkTarget, checker.Equals, linkTarget)
-
-	// Good, now remove that copied link for the next test.
-	os.Remove(expectedPath)
-
-	// This copy command should resolve the symlink (note the trailing
-	// separator), copying the target into the test volume directory in the
-	// container.
-	dockerCmd(c, "cp", localLink+"/", containerID+":/testVol")
-
-	// It *should not* have copied the directory using the target's name, but
-	// used the given name instead.
-	unexpectedPath := filepath.Join(testVol, cpTestPathParent)
-	stat, err := os.Lstat(unexpectedPath)
-	if err == nil {
-		out = fmt.Sprintf("target name was copied: %q - %q", stat.Mode(), stat.Name())
-	}
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-
-	// It *should* have copied the directory using the asked name "dir_link".
-	stat, err = os.Lstat(expectedPath)
-	c.Assert(err, checker.IsNil, check.Commentf("unable to stat resource at %q", expectedPath))
-
-	c.Assert(stat.IsDir(), checker.True, check.Commentf("should have copied a directory but got %q instead", stat.Mode()))
-
-	// And this directory should contain the file copied from the host at the
-	// expected location: "/testVol/dir_link/path/test"
-	expectedFilepath := filepath.Join(testVol, "dir_link/path/test")
-	fileContents, err := ioutil.ReadFile(expectedFilepath)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(string(fileContents), checker.Equals, cpHostContents)
-}
-
-// Test for #5619
-// Check that symlinks which are part of the resource path are still relative to the container's rootfs
-func (s *DockerSuite) TestCpSymlinkComponent(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath+" && ln -s "+cpTestPath+" container_path")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	c.Assert(os.MkdirAll(cpTestPath, os.ModeDir), checker.IsNil)
-
-	hostFile, err := os.Create(cpFullPath)
-	c.Assert(err, checker.IsNil)
-	defer hostFile.Close()
-	defer os.RemoveAll(cpTestPathParent)
-
-	fmt.Fprintf(hostFile, "%s", cpHostContents)
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-
-	c.Assert(err, checker.IsNil)
-
-	tmpname := filepath.Join(tmpdir, cpTestName)
-	defer os.RemoveAll(tmpdir)
-
-	path := path.Join("/", "container_path", cpTestName)
-
-	dockerCmd(c, "cp", containerID+":"+path, tmpdir)
-
-	file, _ := os.Open(tmpname)
-	defer file.Close()
-
-	test, err := ioutil.ReadAll(file)
-	c.Assert(err, checker.IsNil)
-
-	// output matched host file -- symlink path component can escape container rootfs
-	c.Assert(string(test), checker.Not(checker.Equals), cpHostContents)
-
-	// output doesn't match the input for symlink path component
-	c.Assert(string(test), checker.Equals, cpContainerContents)
-}
-
-// Check that cp with unprivileged user doesn't return any error
-func (s *DockerSuite) TestCpUnprivilegedUser(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, UnixCli) // uses chmod/su: not available on windows
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "touch "+cpTestName)
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-
-	defer os.RemoveAll(tmpdir)
-
-	c.Assert(os.Chmod(tmpdir, 0777), checker.IsNil)
-
-	result := icmd.RunCommand("su", "unprivilegeduser", "-c",
-		fmt.Sprintf("%s cp %s:%s %s", dockerBinary, containerID, cpTestName, tmpdir))
-	result.Assert(c, icmd.Expected{})
-}
-
-func (s *DockerSuite) TestCpSpecialFiles(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon)
-
-	outDir, err := ioutil.TempDir("", "cp-test-special-files")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(outDir)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "touch /foo")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	// Copy actual /etc/resolv.conf
-	dockerCmd(c, "cp", containerID+":/etc/resolv.conf", outDir)
-
-	expected, err := readContainerFile(containerID, "resolv.conf")
-	actual, err := ioutil.ReadFile(outDir + "/resolv.conf")
-
-	// Expected copied file to be duplicate of the container resolvconf
-	c.Assert(bytes.Equal(actual, expected), checker.True)
-
-	// Copy actual /etc/hosts
-	dockerCmd(c, "cp", containerID+":/etc/hosts", outDir)
-
-	expected, err = readContainerFile(containerID, "hosts")
-	actual, err = ioutil.ReadFile(outDir + "/hosts")
-
-	// Expected copied file to be duplicate of the container hosts
-	c.Assert(bytes.Equal(actual, expected), checker.True)
-
-	// Copy actual /etc/resolv.conf
-	dockerCmd(c, "cp", containerID+":/etc/hostname", outDir)
-
-	expected, err = readContainerFile(containerID, "hostname")
-	actual, err = ioutil.ReadFile(outDir + "/hostname")
-
-	// Expected copied file to be duplicate of the container resolvconf
-	c.Assert(bytes.Equal(actual, expected), checker.True)
-}
-
-func (s *DockerSuite) TestCpVolumePath(c *check.C) {
-	//  stat /tmp/cp-test-volumepath851508420/test gets permission denied for the user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon)
-
-	tmpDir, err := ioutil.TempDir("", "cp-test-volumepath")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-	outDir, err := ioutil.TempDir("", "cp-test-volumepath-out")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(outDir)
-	_, err = os.Create(tmpDir + "/test")
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "run", "-d", "-v", "/foo", "-v", tmpDir+"/test:/test", "-v", tmpDir+":/baz", "busybox", "/bin/sh", "-c", "touch /foo/bar")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	// Copy actual volume path
-	dockerCmd(c, "cp", containerID+":/foo", outDir)
-
-	stat, err := os.Stat(outDir + "/foo")
-	c.Assert(err, checker.IsNil)
-	// expected copied content to be dir
-	c.Assert(stat.IsDir(), checker.True)
-	stat, err = os.Stat(outDir + "/foo/bar")
-	c.Assert(err, checker.IsNil)
-	// Expected file `bar` to be a file
-	c.Assert(stat.IsDir(), checker.False)
-
-	// Copy file nested in volume
-	dockerCmd(c, "cp", containerID+":/foo/bar", outDir)
-
-	stat, err = os.Stat(outDir + "/bar")
-	c.Assert(err, checker.IsNil)
-	// Expected file `bar` to be a file
-	c.Assert(stat.IsDir(), checker.False)
-
-	// Copy Bind-mounted dir
-	dockerCmd(c, "cp", containerID+":/baz", outDir)
-	stat, err = os.Stat(outDir + "/baz")
-	c.Assert(err, checker.IsNil)
-	// Expected `baz` to be a dir
-	c.Assert(stat.IsDir(), checker.True)
-
-	// Copy file nested in bind-mounted dir
-	dockerCmd(c, "cp", containerID+":/baz/test", outDir)
-	fb, err := ioutil.ReadFile(outDir + "/baz/test")
-	c.Assert(err, checker.IsNil)
-	fb2, err := ioutil.ReadFile(tmpDir + "/test")
-	c.Assert(err, checker.IsNil)
-	// Expected copied file to be duplicate of bind-mounted file
-	c.Assert(bytes.Equal(fb, fb2), checker.True)
-
-	// Copy bind-mounted file
-	dockerCmd(c, "cp", containerID+":/test", outDir)
-	fb, err = ioutil.ReadFile(outDir + "/test")
-	c.Assert(err, checker.IsNil)
-	fb2, err = ioutil.ReadFile(tmpDir + "/test")
-	c.Assert(err, checker.IsNil)
-	// Expected copied file to be duplicate of bind-mounted file
-	c.Assert(bytes.Equal(fb, fb2), checker.True)
-}
-
-func (s *DockerSuite) TestCpToDot(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /test")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpdir)
-	cwd, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	defer os.Chdir(cwd)
-	c.Assert(os.Chdir(tmpdir), checker.IsNil)
-	dockerCmd(c, "cp", containerID+":/test", ".")
-	content, err := ioutil.ReadFile("./test")
-	c.Assert(string(content), checker.Equals, "lololol\n")
-}
-
-func (s *DockerSuite) TestCpToStdout(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /test")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "cp", containerID+":/test", "-"),
-		exec.Command("tar", "-vtf", "-"))
-
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Contains, "test")
-	c.Assert(out, checker.Contains, "-rw")
-}
-
-func (s *DockerSuite) TestCpNameHasColon(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "echo lololol > /te:s:t")
-
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	tmpdir, err := ioutil.TempDir("", "docker-integration")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpdir)
-	dockerCmd(c, "cp", containerID+":/te:s:t", tmpdir)
-	content, err := ioutil.ReadFile(tmpdir + "/te:s:t")
-	c.Assert(string(content), checker.Equals, "lololol\n")
-}
-
-func (s *DockerSuite) TestCopyAndRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	expectedMsg := "hello"
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "echo", expectedMsg)
-	containerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	// failed to set up container
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	tmpDir, err := ioutil.TempDir("", "test-docker-restart-after-copy-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-
-	dockerCmd(c, "cp", fmt.Sprintf("%s:/etc/group", containerID), tmpDir)
-
-	out, _ = dockerCmd(c, "start", "-a", containerID)
-
-	c.Assert(strings.TrimSpace(out), checker.Equals, expectedMsg)
-}
-
-func (s *DockerSuite) TestCopyCreatedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "create", "--name", "test_cp", "-v", "/test", "busybox")
-
-	tmpDir, err := ioutil.TempDir("", "test")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-	dockerCmd(c, "cp", "test_cp:/bin/sh", tmpDir)
-}
-
-// test copy with option `-L`: following symbol link
-// Check that symlinks to a file behave as expected when copying one from
-// a container to host following symbol link
-func (s *DockerSuite) TestCpSymlinkFromConToHostFollowSymlink(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, exitCode := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir -p '"+cpTestPath+"' && echo -n '"+cpContainerContents+"' > "+cpFullPath+" && ln -s "+cpFullPath+" /dir_link")
-	if exitCode != 0 {
-		c.Fatal("failed to create a container", out)
-	}
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", cleanedContainerID)
-	if strings.TrimSpace(out) != "0" {
-		c.Fatal("failed to set up container", out)
-	}
-
-	testDir, err := ioutil.TempDir("", "test-cp-symlink-container-to-host-follow-symlink")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(testDir)
-
-	// This copy command should copy the symlink, not the target, into the
-	// temporary directory.
-	dockerCmd(c, "cp", "-L", cleanedContainerID+":"+"/dir_link", testDir)
-
-	expectedPath := filepath.Join(testDir, "dir_link")
-
-	expected := []byte(cpContainerContents)
-	actual, err := ioutil.ReadFile(expectedPath)
-
-	if !bytes.Equal(actual, expected) {
-		c.Fatalf("Expected copied file to be duplicate of the container symbol link target")
-	}
-	os.Remove(expectedPath)
-
-	// now test copy symbol link to a non-existing file in host
-	expectedPath = filepath.Join(testDir, "somefile_host")
-	// expectedPath shouldn't exist, if exists, remove it
-	if _, err := os.Lstat(expectedPath); err == nil {
-		os.Remove(expectedPath)
-	}
-
-	dockerCmd(c, "cp", "-L", cleanedContainerID+":"+"/dir_link", expectedPath)
-
-	actual, err = ioutil.ReadFile(expectedPath)
-
-	if !bytes.Equal(actual, expected) {
-		c.Fatalf("Expected copied file to be duplicate of the container symbol link target")
-	}
-	defer os.Remove(expectedPath)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_test.go
deleted file mode 100644
index f981cb8f8b..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_test.go
+++ /dev/null
@@ -1,599 +0,0 @@
-package main
-
-import (
-	"os"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// docker cp LOCALPATH CONTAINER:PATH
-
-// Try all of the test cases from the archive package which implements the
-// internals of `docker cp` and ensure that the behavior matches when actually
-// copying to and from containers.
-
-// Basic assumptions about SRC and DST:
-// 1. SRC must exist.
-// 2. If SRC ends with a trailing separator, it must be a directory.
-// 3. DST parent directory must exist.
-// 4. If DST exists as a file, it must not end with a trailing separator.
-
-// First get these easy error cases out of the way.
-
-// Test for error when SRC does not exist.
-func (s *DockerSuite) TestCpToErrSrcNotExists(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{})
-
-	tmpDir := getTestDir(c, "test-cp-to-err-src-not-exists")
-	defer os.RemoveAll(tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "file1")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-}
-
-// Test for error when SRC ends in a trailing
-// path separator but it exists as a file.
-func (s *DockerSuite) TestCpToErrSrcNotDir(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{})
-
-	tmpDir := getTestDir(c, "test-cp-to-err-src-not-dir")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPathTrailingSep(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "testDir")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotDir(err), checker.True, check.Commentf("expected IsNotDir error, but got %T: %s", err, err))
-}
-
-// Test for error when SRC is a valid file or directory,
-// bu the DST parent directory does not exist.
-func (s *DockerSuite) TestCpToErrDstParentNotExists(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-to-err-dst-parent-not-exists")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	// Try with a file source.
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/notExists", "file1")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-
-	// Try with a directory source.
-	srcPath = cpPath(tmpDir, "dir1")
-
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpNotExist(err), checker.True, check.Commentf("expected IsNotExist error, but got %T: %s", err, err))
-}
-
-// Test for error when DST ends in a trailing path separator but exists as a
-// file. Also test that we cannot overwrite an existing directory with a
-// non-directory and cannot overwrite an existing
-func (s *DockerSuite) TestCpToErrDstNotDir(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{addContent: true})
-
-	tmpDir := getTestDir(c, "test-cp-to-err-dst-not-dir")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	// Try with a file source.
-	srcPath := cpPath(tmpDir, "dir1/file1-1")
-	dstPath := containerCpPathTrailingSep(containerID, "file1")
-
-	// The client should encounter an error trying to stat the destination
-	// and then be unable to copy since the destination is asserted to be a
-	// directory but does not exist.
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpDirNotExist(err), checker.True, check.Commentf("expected DirNotExist error, but got %T: %s", err, err))
-
-	// Try with a directory source.
-	srcPath = cpPath(tmpDir, "dir1")
-
-	// The client should encounter an error trying to stat the destination and
-	// then decide to extract to the parent directory instead with a rebased
-	// name in the source archive, but this directory would overwrite the
-	// existing file with the same name.
-	err = runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCannotOverwriteNonDirWithDir(err), checker.True, check.Commentf("expected CannotOverwriteNonDirWithDir error, but got %T: %s", err, err))
-}
-
-// Check that copying from a local path to a symlink in a container copies to
-// the symlink target and does not overwrite the container symlink itself.
-func (s *DockerSuite) TestCpToSymlinkDestination(c *check.C) {
-	//  stat /tmp/test-cp-to-symlink-destination-262430901/vol3 gets permission denied for the user
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon) // Requires local volume mount bind.
-
-	testVol := getTestDir(c, "test-cp-to-symlink-destination-")
-	defer os.RemoveAll(testVol)
-
-	makeTestContentInDir(c, testVol)
-
-	containerID := makeTestContainer(c, testContainerOptions{
-		volumes: defaultVolumes(testVol), // Our bind mount is at /vol2
-	})
-
-	// First, copy a local file to a symlink to a file in the container. This
-	// should overwrite the symlink target contents with the source contents.
-	srcPath := cpPath(testVol, "file2")
-	dstPath := containerCpPath(containerID, "/vol2/symlinkToFile1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, cpPath(testVol, "symlinkToFile1"), "file1"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(testVol, "file1"), "file2\n"), checker.IsNil)
-
-	// Next, copy a local file to a symlink to a directory in the container.
-	// This should copy the file into the symlink target directory.
-	dstPath = containerCpPath(containerID, "/vol2/symlinkToDir1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, cpPath(testVol, "symlinkToDir1"), "dir1"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(testVol, "file2"), "file2\n"), checker.IsNil)
-
-	// Next, copy a file to a symlink to a file that does not exist (a broken
-	// symlink) in the container. This should create the target file with the
-	// contents of the source file.
-	dstPath = containerCpPath(containerID, "/vol2/brokenSymlinkToFileX")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, cpPath(testVol, "brokenSymlinkToFileX"), "fileX"), checker.IsNil)
-
-	// The file should have the contents of "file2" now.
-	c.Assert(fileContentEquals(c, cpPath(testVol, "fileX"), "file2\n"), checker.IsNil)
-
-	// Next, copy a local directory to a symlink to a directory in the
-	// container. This should copy the directory into the symlink target
-	// directory and not modify the symlink.
-	srcPath = cpPath(testVol, "/dir2")
-	dstPath = containerCpPath(containerID, "/vol2/symlinkToDir1")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, cpPath(testVol, "symlinkToDir1"), "dir1"), checker.IsNil)
-
-	// The directory should now contain a copy of "dir2".
-	c.Assert(fileContentEquals(c, cpPath(testVol, "dir1/dir2/file2-1"), "file2-1\n"), checker.IsNil)
-
-	// Next, copy a local directory to a symlink to a local directory that does
-	// not exist (a broken symlink) in the container. This should create the
-	// target as a directory with the contents of the source directory. It
-	// should not modify the symlink.
-	dstPath = containerCpPath(containerID, "/vol2/brokenSymlinkToDirX")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// The symlink should not have been modified.
-	c.Assert(symlinkTargetEquals(c, cpPath(testVol, "brokenSymlinkToDirX"), "dirX"), checker.IsNil)
-
-	// The "dirX" directory should now be a copy of "dir2".
-	c.Assert(fileContentEquals(c, cpPath(testVol, "dirX/file2-1"), "file2-1\n"), checker.IsNil)
-}
-
-// Possibilities are reduced to the remaining 10 cases:
-//
-//  case | srcIsDir | onlyDirContents | dstExists | dstIsDir | dstTrSep | action
-// ===================================================================================================
-//   A   |  no      |  -              |  no       |  -       |  no      |  create file
-//   B   |  no      |  -              |  no       |  -       |  yes     |  error
-//   C   |  no      |  -              |  yes      |  no      |  -       |  overwrite file
-//   D   |  no      |  -              |  yes      |  yes     |  -       |  create file in dst dir
-//   E   |  yes     |  no             |  no       |  -       |  -       |  create dir, copy contents
-//   F   |  yes     |  no             |  yes      |  no      |  -       |  error
-//   G   |  yes     |  no             |  yes      |  yes     |  -       |  copy dir and contents
-//   H   |  yes     |  yes            |  no       |  -       |  -       |  create dir, copy contents
-//   I   |  yes     |  yes            |  yes      |  no      |  -       |  error
-//   J   |  yes     |  yes            |  yes      |  yes     |  -       |  copy dir contents
-//
-
-// A. SRC specifies a file and DST (no trailing path separator) doesn't
-//    exist. This should create a file with the name DST and copy the
-//    contents of the source file into it.
-func (s *DockerSuite) TestCpToCaseA(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{
-		workDir: "/root", command: makeCatFileCommand("itWorks.txt"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-a")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/root/itWorks.txt")
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	c.Assert(containerStartOutputEquals(c, containerID, "file1\n"), checker.IsNil)
-}
-
-// B. SRC specifies a file and DST (with trailing path separator) doesn't
-//    exist. This should cause an error because the copy operation cannot
-//    create a directory when copying a single file.
-func (s *DockerSuite) TestCpToCaseB(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("testDir/file1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-b")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstDir := containerCpPathTrailingSep(containerID, "testDir")
-
-	err := runDockerCp(c, srcPath, dstDir)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpDirNotExist(err), checker.True, check.Commentf("expected DirNotExists error, but got %T: %s", err, err))
-}
-
-// C. SRC specifies a file and DST exists as a file. This should overwrite
-//    the file at DST with the contents of the source file.
-func (s *DockerSuite) TestCpToCaseC(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-		command: makeCatFileCommand("file2"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-c")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/root/file2")
-
-	// Ensure the container's file starts with the original content.
-	c.Assert(containerStartOutputEquals(c, containerID, "file2\n"), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcPath, dstPath), checker.IsNil)
-
-	// Should now contain file1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1\n"), checker.IsNil)
-}
-
-// D. SRC specifies a file and DST exists as a directory. This should place
-//    a copy of the source file inside it using the basename from SRC. Ensure
-//    this works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpToCaseD(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true,
-		command:    makeCatFileCommand("/dir1/file1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-d")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstDir := containerCpPath(containerID, "dir1")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcPath, dstDir), checker.IsNil)
-
-	// Should now contain file1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// Make new destination container.
-	containerID = makeTestContainer(c, testContainerOptions{
-		addContent: true,
-		command:    makeCatFileCommand("/dir1/file1"),
-	})
-
-	dstDir = containerCpPathTrailingSep(containerID, "dir1")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcPath, dstDir), checker.IsNil)
-
-	// Should now contain file1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1\n"), checker.IsNil)
-}
-
-// E. SRC specifies a directory and DST does not exist. This should create a
-//    directory at DST and copy the contents of the SRC directory into the DST
-//    directory. Ensure this works whether DST has a trailing path separator or
-//    not.
-func (s *DockerSuite) TestCpToCaseE(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("/testDir/file1-1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-e")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPath(tmpDir, "dir1")
-	dstDir := containerCpPath(containerID, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// Make new destination container.
-	containerID = makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("/testDir/file1-1"),
-	})
-
-	dstDir = containerCpPathTrailingSep(containerID, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-}
-
-// F. SRC specifies a directory and DST exists as a file. This should cause an
-//    error as it is not possible to overwrite a file with a directory.
-func (s *DockerSuite) TestCpToCaseF(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-f")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPath(tmpDir, "dir1")
-	dstFile := containerCpPath(containerID, "/root/file1")
-
-	err := runDockerCp(c, srcDir, dstFile)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyDir(err), checker.True, check.Commentf("expected ErrCannotCopyDir error, but got %T: %s", err, err))
-}
-
-// G. SRC specifies a directory and DST exists as a directory. This should copy
-//    the SRC directory and all its contents to the DST directory. Ensure this
-//    works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpToCaseG(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-		command: makeCatFileCommand("dir2/dir1/file1-1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-g")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPath(tmpDir, "dir1")
-	dstDir := containerCpPath(containerID, "/root/dir2")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// Make new destination container.
-	containerID = makeTestContainer(c, testContainerOptions{
-		addContent: true,
-		command:    makeCatFileCommand("/dir2/dir1/file1-1"),
-	})
-
-	dstDir = containerCpPathTrailingSep(containerID, "/dir2")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-}
-
-// H. SRC specifies a directory's contents only and DST does not exist. This
-//    should create a directory at DST and copy the contents of the SRC
-//    directory (but not the directory itself) into the DST directory. Ensure
-//    this works whether DST has a trailing path separator or not.
-func (s *DockerSuite) TestCpToCaseH(c *check.C) {
-	containerID := makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("/testDir/file1-1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-h")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPathTrailingSep(tmpDir, "dir1") + "."
-	dstDir := containerCpPath(containerID, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// Make new destination container.
-	containerID = makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("/testDir/file1-1"),
-	})
-
-	dstDir = containerCpPathTrailingSep(containerID, "testDir")
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-}
-
-// I. SRC specifies a directory's contents only and DST exists as a file. This
-//    should cause an error as it is not possible to overwrite a file with a
-//    directory.
-func (s *DockerSuite) TestCpToCaseI(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-i")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPathTrailingSep(tmpDir, "dir1") + "."
-	dstFile := containerCpPath(containerID, "/root/file1")
-
-	err := runDockerCp(c, srcDir, dstFile)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyDir(err), checker.True, check.Commentf("expected ErrCannotCopyDir error, but got %T: %s", err, err))
-}
-
-// J. SRC specifies a directory's contents only and DST exists as a directory.
-//    This should copy the contents of the SRC directory (but not the directory
-//    itself) into the DST directory. Ensure this works whether DST has a
-//    trailing path separator or not.
-func (s *DockerSuite) TestCpToCaseJ(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := makeTestContainer(c, testContainerOptions{
-		addContent: true, workDir: "/root",
-		command: makeCatFileCommand("/dir2/file1-1"),
-	})
-
-	tmpDir := getTestDir(c, "test-cp-to-case-j")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcDir := cpPathTrailingSep(tmpDir, "dir1") + "."
-	dstDir := containerCpPath(containerID, "/dir2")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	// Make new destination container.
-	containerID = makeTestContainer(c, testContainerOptions{
-		command: makeCatFileCommand("/dir2/file1-1"),
-	})
-
-	dstDir = containerCpPathTrailingSep(containerID, "/dir2")
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-
-	c.Assert(runDockerCp(c, srcDir, dstDir), checker.IsNil)
-
-	// Should now contain file1-1's contents.
-	c.Assert(containerStartOutputEquals(c, containerID, "file1-1\n"), checker.IsNil)
-}
-
-// The `docker cp` command should also ensure that you cannot
-// write to a container rootfs that is marked as read-only.
-func (s *DockerSuite) TestCpToErrReadOnlyRootfs(c *check.C) {
-	// --read-only + userns has remount issues
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	tmpDir := getTestDir(c, "test-cp-to-err-read-only-rootfs")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	containerID := makeTestContainer(c, testContainerOptions{
-		readOnly: true, workDir: "/root",
-		command: makeCatFileCommand("shouldNotExist"),
-	})
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/root/shouldNotExist")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyReadOnly(err), checker.True, check.Commentf("expected ErrContainerRootfsReadonly error, but got %T: %s", err, err))
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-}
-
-// The `docker cp` command should also ensure that you
-// cannot write to a volume that is mounted as read-only.
-func (s *DockerSuite) TestCpToErrReadOnlyVolume(c *check.C) {
-	// --read-only + userns has remount issues
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	tmpDir := getTestDir(c, "test-cp-to-err-read-only-volume")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	containerID := makeTestContainer(c, testContainerOptions{
-		volumes: defaultVolumes(tmpDir), workDir: "/root",
-		command: makeCatFileCommand("/vol_ro/shouldNotExist"),
-	})
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/vol_ro/shouldNotExist")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.NotNil)
-
-	c.Assert(isCpCannotCopyReadOnly(err), checker.True, check.Commentf("expected ErrVolumeReadonly error, but got %T: %s", err, err))
-
-	// Ensure that dstPath doesn't exist.
-	c.Assert(containerStartOutputEquals(c, containerID, ""), checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_unix_test.go
deleted file mode 100644
index 45d85ba5d1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_to_container_unix_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/system"
-	"github.com/go-check/check"
-)
-
-// Check ownership is root, both in non-userns and userns enabled modes
-func (s *DockerSuite) TestCpCheckDestOwnership(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	tmpVolDir := getTestDir(c, "test-cp-tmpvol")
-	containerID := makeTestContainer(c,
-		testContainerOptions{volumes: []string{fmt.Sprintf("%s:/tmpvol", tmpVolDir)}})
-
-	tmpDir := getTestDir(c, "test-cp-to-check-ownership")
-	defer os.RemoveAll(tmpDir)
-
-	makeTestContentInDir(c, tmpDir)
-
-	srcPath := cpPath(tmpDir, "file1")
-	dstPath := containerCpPath(containerID, "/tmpvol", "file1")
-
-	err := runDockerCp(c, srcPath, dstPath)
-	c.Assert(err, checker.IsNil)
-
-	stat, err := system.Stat(filepath.Join(tmpVolDir, "file1"))
-	c.Assert(err, checker.IsNil)
-	uid, gid, err := getRootUIDGID()
-	c.Assert(err, checker.IsNil)
-	c.Assert(stat.UID(), checker.Equals, uint32(uid), check.Commentf("Copied file not owned by container root UID"))
-	c.Assert(stat.GID(), checker.Equals, uint32(gid), check.Commentf("Copied file not owned by container root GID"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_utils.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_utils.go
deleted file mode 100644
index 0501c5d735..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_cp_utils.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-type fileType uint32
-
-const (
-	ftRegular fileType = iota
-	ftDir
-	ftSymlink
-)
-
-type fileData struct {
-	filetype fileType
-	path     string
-	contents string
-}
-
-func (fd fileData) creationCommand() string {
-	var command string
-
-	switch fd.filetype {
-	case ftRegular:
-		// Don't overwrite the file if it already exists!
-		command = fmt.Sprintf("if [ ! -f %s ]; then echo %q > %s; fi", fd.path, fd.contents, fd.path)
-	case ftDir:
-		command = fmt.Sprintf("mkdir -p %s", fd.path)
-	case ftSymlink:
-		command = fmt.Sprintf("ln -fs %s %s", fd.contents, fd.path)
-	}
-
-	return command
-}
-
-func mkFilesCommand(fds []fileData) string {
-	commands := make([]string, len(fds))
-
-	for i, fd := range fds {
-		commands[i] = fd.creationCommand()
-	}
-
-	return strings.Join(commands, " && ")
-}
-
-var defaultFileData = []fileData{
-	{ftRegular, "file1", "file1"},
-	{ftRegular, "file2", "file2"},
-	{ftRegular, "file3", "file3"},
-	{ftRegular, "file4", "file4"},
-	{ftRegular, "file5", "file5"},
-	{ftRegular, "file6", "file6"},
-	{ftRegular, "file7", "file7"},
-	{ftDir, "dir1", ""},
-	{ftRegular, "dir1/file1-1", "file1-1"},
-	{ftRegular, "dir1/file1-2", "file1-2"},
-	{ftDir, "dir2", ""},
-	{ftRegular, "dir2/file2-1", "file2-1"},
-	{ftRegular, "dir2/file2-2", "file2-2"},
-	{ftDir, "dir3", ""},
-	{ftRegular, "dir3/file3-1", "file3-1"},
-	{ftRegular, "dir3/file3-2", "file3-2"},
-	{ftDir, "dir4", ""},
-	{ftRegular, "dir4/file3-1", "file4-1"},
-	{ftRegular, "dir4/file3-2", "file4-2"},
-	{ftDir, "dir5", ""},
-	{ftSymlink, "symlinkToFile1", "file1"},
-	{ftSymlink, "symlinkToDir1", "dir1"},
-	{ftSymlink, "brokenSymlinkToFileX", "fileX"},
-	{ftSymlink, "brokenSymlinkToDirX", "dirX"},
-	{ftSymlink, "symlinkToAbsDir", "/root"},
-}
-
-func defaultMkContentCommand() string {
-	return mkFilesCommand(defaultFileData)
-}
-
-func makeTestContentInDir(c *check.C, dir string) {
-	for _, fd := range defaultFileData {
-		path := filepath.Join(dir, filepath.FromSlash(fd.path))
-		switch fd.filetype {
-		case ftRegular:
-			c.Assert(ioutil.WriteFile(path, []byte(fd.contents+"\n"), os.FileMode(0666)), checker.IsNil)
-		case ftDir:
-			c.Assert(os.Mkdir(path, os.FileMode(0777)), checker.IsNil)
-		case ftSymlink:
-			c.Assert(os.Symlink(fd.contents, path), checker.IsNil)
-		}
-	}
-}
-
-type testContainerOptions struct {
-	addContent bool
-	readOnly   bool
-	volumes    []string
-	workDir    string
-	command    string
-}
-
-func makeTestContainer(c *check.C, options testContainerOptions) (containerID string) {
-	if options.addContent {
-		mkContentCmd := defaultMkContentCommand()
-		if options.command == "" {
-			options.command = mkContentCmd
-		} else {
-			options.command = fmt.Sprintf("%s && %s", defaultMkContentCommand(), options.command)
-		}
-	}
-
-	if options.command == "" {
-		options.command = "#(nop)"
-	}
-
-	args := []string{"run", "-d"}
-
-	for _, volume := range options.volumes {
-		args = append(args, "-v", volume)
-	}
-
-	if options.workDir != "" {
-		args = append(args, "-w", options.workDir)
-	}
-
-	if options.readOnly {
-		args = append(args, "--read-only")
-	}
-
-	args = append(args, "busybox", "/bin/sh", "-c", options.command)
-
-	out, _ := dockerCmd(c, args...)
-
-	containerID = strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "wait", containerID)
-
-	exitCode := strings.TrimSpace(out)
-	if exitCode != "0" {
-		out, _ = dockerCmd(c, "logs", containerID)
-	}
-	c.Assert(exitCode, checker.Equals, "0", check.Commentf("failed to make test container: %s", out))
-
-	return
-}
-
-func makeCatFileCommand(path string) string {
-	return fmt.Sprintf("if [ -f %s ]; then cat %s; fi", path, path)
-}
-
-func cpPath(pathElements ...string) string {
-	localizedPathElements := make([]string, len(pathElements))
-	for i, path := range pathElements {
-		localizedPathElements[i] = filepath.FromSlash(path)
-	}
-	return strings.Join(localizedPathElements, string(filepath.Separator))
-}
-
-func cpPathTrailingSep(pathElements ...string) string {
-	return fmt.Sprintf("%s%c", cpPath(pathElements...), filepath.Separator)
-}
-
-func containerCpPath(containerID string, pathElements ...string) string {
-	joined := strings.Join(pathElements, "/")
-	return fmt.Sprintf("%s:%s", containerID, joined)
-}
-
-func containerCpPathTrailingSep(containerID string, pathElements ...string) string {
-	return fmt.Sprintf("%s/", containerCpPath(containerID, pathElements...))
-}
-
-func runDockerCp(c *check.C, src, dst string) (err error) {
-	c.Logf("running `docker cp %s %s`", src, dst)
-
-	args := []string{"cp", src, dst}
-
-	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, args...))
-	if err != nil {
-		err = fmt.Errorf("error executing `docker cp` command: %s: %s", err, out)
-	}
-
-	return
-}
-
-func startContainerGetOutput(c *check.C, containerID string) (out string, err error) {
-	c.Logf("running `docker start -a %s`", containerID)
-
-	args := []string{"start", "-a", containerID}
-
-	out, _, err = runCommandWithOutput(exec.Command(dockerBinary, args...))
-	if err != nil {
-		err = fmt.Errorf("error executing `docker start` command: %s: %s", err, out)
-	}
-
-	return
-}
-
-func getTestDir(c *check.C, label string) (tmpDir string) {
-	var err error
-
-	tmpDir, err = ioutil.TempDir("", label)
-	// unable to make temporary directory
-	c.Assert(err, checker.IsNil)
-
-	return
-}
-
-func isCpNotExist(err error) bool {
-	return strings.Contains(err.Error(), "no such file or directory") || strings.Contains(err.Error(), "cannot find the file specified")
-}
-
-func isCpDirNotExist(err error) bool {
-	return strings.Contains(err.Error(), archive.ErrDirNotExists.Error())
-}
-
-func isCpNotDir(err error) bool {
-	return strings.Contains(err.Error(), archive.ErrNotDirectory.Error()) || strings.Contains(err.Error(), "filename, directory name, or volume label syntax is incorrect")
-}
-
-func isCpCannotCopyDir(err error) bool {
-	return strings.Contains(err.Error(), archive.ErrCannotCopyDir.Error())
-}
-
-func isCpCannotCopyReadOnly(err error) bool {
-	return strings.Contains(err.Error(), "marked read-only")
-}
-
-func isCannotOverwriteNonDirWithDir(err error) bool {
-	return strings.Contains(err.Error(), "cannot overwrite non-directory")
-}
-
-func fileContentEquals(c *check.C, filename, contents string) (err error) {
-	c.Logf("checking that file %q contains %q\n", filename, contents)
-
-	fileBytes, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return
-	}
-
-	expectedBytes, err := ioutil.ReadAll(strings.NewReader(contents))
-	if err != nil {
-		return
-	}
-
-	if !bytes.Equal(fileBytes, expectedBytes) {
-		err = fmt.Errorf("file content not equal - expected %q, got %q", string(expectedBytes), string(fileBytes))
-	}
-
-	return
-}
-
-func symlinkTargetEquals(c *check.C, symlink, expectedTarget string) (err error) {
-	c.Logf("checking that the symlink %q points to %q\n", symlink, expectedTarget)
-
-	actualTarget, err := os.Readlink(symlink)
-	if err != nil {
-		return
-	}
-
-	if actualTarget != expectedTarget {
-		err = fmt.Errorf("symlink target points to %q not %q", actualTarget, expectedTarget)
-	}
-
-	return
-}
-
-func containerStartOutputEquals(c *check.C, containerID, contents string) (err error) {
-	c.Logf("checking that container %q start output contains %q\n", containerID, contents)
-
-	out, err := startContainerGetOutput(c, containerID)
-	if err != nil {
-		return
-	}
-
-	if out != contents {
-		err = fmt.Errorf("output contents not equal - expected %q, got %q", contents, out)
-	}
-
-	return
-}
-
-func defaultVolumes(tmpDir string) []string {
-	if SameHostDaemon.Condition() {
-		return []string{
-			"/vol1",
-			fmt.Sprintf("%s:/vol2", tmpDir),
-			fmt.Sprintf("%s:/vol3", filepath.Join(tmpDir, "vol3")),
-			fmt.Sprintf("%s:/vol_ro:ro", filepath.Join(tmpDir, "vol_ro")),
-		}
-	}
-
-	// Can't bind-mount volumes with separate host daemon.
-	return []string{"/vol1", "/vol2", "/vol3", "/vol_ro:/vol_ro:ro"}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_create_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_create_test.go
deleted file mode 100644
index 515a340976..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_create_test.go
+++ /dev/null
@@ -1,513 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"reflect"
-	"strings"
-	"time"
-
-	"os/exec"
-
-	"io/ioutil"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/go-connections/nat"
-	"github.com/go-check/check"
-)
-
-// Make sure we can create a simple container with some args
-func (s *DockerSuite) TestCreateArgs(c *check.C) {
-	// Intentionally clear entrypoint, as the Windows busybox image needs an entrypoint, which breaks this test
-	out, _ := dockerCmd(c, "create", "--entrypoint=", "busybox", "command", "arg1", "arg2", "arg with space", "-c", "flags")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "inspect", cleanedContainerID)
-
-	containers := []struct {
-		ID      string
-		Created time.Time
-		Path    string
-		Args    []string
-		Image   string
-	}{}
-
-	err := json.Unmarshal([]byte(out), &containers)
-	c.Assert(err, check.IsNil, check.Commentf("Error inspecting the container: %s", err))
-	c.Assert(containers, checker.HasLen, 1)
-
-	cont := containers[0]
-	c.Assert(string(cont.Path), checker.Equals, "command", check.Commentf("Unexpected container path. Expected command, received: %s", cont.Path))
-
-	b := false
-	expected := []string{"arg1", "arg2", "arg with space", "-c", "flags"}
-	for i, arg := range expected {
-		if arg != cont.Args[i] {
-			b = true
-			break
-		}
-	}
-	if len(cont.Args) != len(expected) || b {
-		c.Fatalf("Unexpected args. Expected %v, received: %v", expected, cont.Args)
-	}
-
-}
-
-// Make sure we can grow the container's rootfs at creation time.
-func (s *DockerSuite) TestCreateGrowRootfs(c *check.C) {
-	// Windows and Devicemapper support growing the rootfs
-	if daemonPlatform != "windows" {
-		testRequires(c, Devicemapper)
-	}
-	out, _ := dockerCmd(c, "create", "--storage-opt", "size=120G", "busybox")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	inspectOut := inspectField(c, cleanedContainerID, "HostConfig.StorageOpt")
-	c.Assert(inspectOut, checker.Equals, "map[size:120G]")
-}
-
-// Make sure we cannot shrink the container's rootfs at creation time.
-func (s *DockerSuite) TestCreateShrinkRootfs(c *check.C) {
-	testRequires(c, Devicemapper)
-
-	// Ensure this fails because of the defaultBaseFsSize is 10G
-	out, _, err := dockerCmdWithError("create", "--storage-opt", "size=5G", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Container size cannot be smaller than")
-}
-
-// Make sure we can set hostconfig options too
-func (s *DockerSuite) TestCreateHostConfig(c *check.C) {
-	out, _ := dockerCmd(c, "create", "-P", "busybox", "echo")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "inspect", cleanedContainerID)
-
-	containers := []struct {
-		HostConfig *struct {
-			PublishAllPorts bool
-		}
-	}{}
-
-	err := json.Unmarshal([]byte(out), &containers)
-	c.Assert(err, check.IsNil, check.Commentf("Error inspecting the container: %s", err))
-	c.Assert(containers, checker.HasLen, 1)
-
-	cont := containers[0]
-	c.Assert(cont.HostConfig, check.NotNil, check.Commentf("Expected HostConfig, got none"))
-	c.Assert(cont.HostConfig.PublishAllPorts, check.NotNil, check.Commentf("Expected PublishAllPorts, got false"))
-}
-
-func (s *DockerSuite) TestCreateWithPortRange(c *check.C) {
-	out, _ := dockerCmd(c, "create", "-p", "3300-3303:3300-3303/tcp", "busybox", "echo")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "inspect", cleanedContainerID)
-
-	containers := []struct {
-		HostConfig *struct {
-			PortBindings map[nat.Port][]nat.PortBinding
-		}
-	}{}
-	err := json.Unmarshal([]byte(out), &containers)
-	c.Assert(err, check.IsNil, check.Commentf("Error inspecting the container: %s", err))
-	c.Assert(containers, checker.HasLen, 1)
-
-	cont := containers[0]
-
-	c.Assert(cont.HostConfig, check.NotNil, check.Commentf("Expected HostConfig, got none"))
-	c.Assert(cont.HostConfig.PortBindings, checker.HasLen, 4, check.Commentf("Expected 4 ports bindings, got %d", len(cont.HostConfig.PortBindings)))
-
-	for k, v := range cont.HostConfig.PortBindings {
-		c.Assert(v, checker.HasLen, 1, check.Commentf("Expected 1 ports binding, for the port  %s but found %s", k, v))
-		c.Assert(k.Port(), checker.Equals, v[0].HostPort, check.Commentf("Expected host port %s to match published port %s", k.Port(), v[0].HostPort))
-
-	}
-
-}
-
-func (s *DockerSuite) TestCreateWithLargePortRange(c *check.C) {
-	out, _ := dockerCmd(c, "create", "-p", "1-65535:1-65535/tcp", "busybox", "echo")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "inspect", cleanedContainerID)
-
-	containers := []struct {
-		HostConfig *struct {
-			PortBindings map[nat.Port][]nat.PortBinding
-		}
-	}{}
-
-	err := json.Unmarshal([]byte(out), &containers)
-	c.Assert(err, check.IsNil, check.Commentf("Error inspecting the container: %s", err))
-	c.Assert(containers, checker.HasLen, 1)
-
-	cont := containers[0]
-	c.Assert(cont.HostConfig, check.NotNil, check.Commentf("Expected HostConfig, got none"))
-	c.Assert(cont.HostConfig.PortBindings, checker.HasLen, 65535)
-
-	for k, v := range cont.HostConfig.PortBindings {
-		c.Assert(v, checker.HasLen, 1)
-		c.Assert(k.Port(), checker.Equals, v[0].HostPort, check.Commentf("Expected host port %s to match published port %s", k.Port(), v[0].HostPort))
-	}
-
-}
-
-// "test123" should be printed by docker create + start
-func (s *DockerSuite) TestCreateEchoStdout(c *check.C) {
-	out, _ := dockerCmd(c, "create", "busybox", "echo", "test123")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "start", "-ai", cleanedContainerID)
-	c.Assert(out, checker.Equals, "test123\n", check.Commentf("container should've printed 'test123', got %q", out))
-
-}
-
-func (s *DockerSuite) TestCreateVolumesCreated(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	name := "test_create_volume"
-	dockerCmd(c, "create", "--name", name, "-v", prefix+slash+"foo", "busybox")
-
-	dir, err := inspectMountSourceField(name, prefix+slash+"foo")
-	c.Assert(err, check.IsNil, check.Commentf("Error getting volume host path: %q", err))
-
-	if _, err := os.Stat(dir); err != nil && os.IsNotExist(err) {
-		c.Fatalf("Volume was not created")
-	}
-	if err != nil {
-		c.Fatalf("Error statting volume host path: %q", err)
-	}
-
-}
-
-func (s *DockerSuite) TestCreateLabels(c *check.C) {
-	name := "test_create_labels"
-	expected := map[string]string{"k1": "v1", "k2": "v2"}
-	dockerCmd(c, "create", "--name", name, "-l", "k1=v1", "--label", "k2=v2", "busybox")
-
-	actual := make(map[string]string)
-	inspectFieldAndMarshall(c, name, "Config.Labels", &actual)
-
-	if !reflect.DeepEqual(expected, actual) {
-		c.Fatalf("Expected %s got %s", expected, actual)
-	}
-}
-
-func (s *DockerSuite) TestCreateLabelFromImage(c *check.C) {
-	imageName := "testcreatebuildlabel"
-	_, err := buildImage(imageName,
-		`FROM busybox
-		LABEL k1=v1 k2=v2`,
-		true)
-
-	c.Assert(err, check.IsNil)
-
-	name := "test_create_labels_from_image"
-	expected := map[string]string{"k2": "x", "k3": "v3", "k1": "v1"}
-	dockerCmd(c, "create", "--name", name, "-l", "k2=x", "--label", "k3=v3", imageName)
-
-	actual := make(map[string]string)
-	inspectFieldAndMarshall(c, name, "Config.Labels", &actual)
-
-	if !reflect.DeepEqual(expected, actual) {
-		c.Fatalf("Expected %s got %s", expected, actual)
-	}
-}
-
-func (s *DockerSuite) TestCreateHostnameWithNumber(c *check.C) {
-	image := "busybox"
-	// Busybox on Windows does not implement hostname command
-	if daemonPlatform == "windows" {
-		image = WindowsBaseImage
-	}
-	out, _ := dockerCmd(c, "run", "-h", "web.0", image, "hostname")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "web.0", check.Commentf("hostname not set, expected `web.0`, got: %s", out))
-
-}
-
-func (s *DockerSuite) TestCreateRM(c *check.C) {
-	// Test to make sure we can 'rm' a new container that is in
-	// "Created" state, and has ever been run. Test "rm -f" too.
-
-	// create a container
-	out, _ := dockerCmd(c, "create", "busybox")
-	cID := strings.TrimSpace(out)
-
-	dockerCmd(c, "rm", cID)
-
-	// Now do it again so we can "rm -f" this time
-	out, _ = dockerCmd(c, "create", "busybox")
-
-	cID = strings.TrimSpace(out)
-	dockerCmd(c, "rm", "-f", cID)
-}
-
-func (s *DockerSuite) TestCreateModeIpcContainer(c *check.C) {
-	// Uses Linux specific functionality (--ipc)
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-
-	out, _ := dockerCmd(c, "create", "busybox")
-	id := strings.TrimSpace(out)
-
-	dockerCmd(c, "create", fmt.Sprintf("--ipc=container:%s", id), "busybox")
-}
-
-func (s *DockerSuite) TestCreateByImageID(c *check.C) {
-	imageName := "testcreatebyimageid"
-	imageID, err := buildImage(imageName,
-		`FROM busybox
-		MAINTAINER dockerio`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	truncatedImageID := stringid.TruncateID(imageID)
-
-	dockerCmd(c, "create", imageID)
-	dockerCmd(c, "create", truncatedImageID)
-	dockerCmd(c, "create", fmt.Sprintf("%s:%s", imageName, truncatedImageID))
-
-	// Ensure this fails
-	out, exit, _ := dockerCmdWithError("create", fmt.Sprintf("%s:%s", imageName, imageID))
-	if exit == 0 {
-		c.Fatalf("expected non-zero exit code; received %d", exit)
-	}
-
-	if expected := "Error parsing reference"; !strings.Contains(out, expected) {
-		c.Fatalf(`Expected %q in output; got: %s`, expected, out)
-	}
-
-	out, exit, _ = dockerCmdWithError("create", fmt.Sprintf("%s:%s", "wrongimage", truncatedImageID))
-	if exit == 0 {
-		c.Fatalf("expected non-zero exit code; received %d", exit)
-	}
-
-	if expected := "Unable to find image"; !strings.Contains(out, expected) {
-		c.Fatalf(`Expected %q in output; got: %s`, expected, out)
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedCreate(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-create")
-
-	// Try create
-	createCmd := exec.Command(dockerBinary, "create", repoName)
-	s.trustedCmd(createCmd)
-	out, _, err := runCommandWithOutput(createCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try untrusted create to ensure we pushed the tag to the registry
-	createCmd = exec.Command(dockerBinary, "create", "--disable-content-trust=true", repoName)
-	s.trustedCmd(createCmd)
-	out, _, err = runCommandWithOutput(createCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Status: Downloaded", check.Commentf("Missing expected output on trusted create with --disable-content-trust:\n%s", out))
-
-}
-
-func (s *DockerTrustSuite) TestUntrustedCreate(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercliuntrusted/createtest", privateRegistryURL)
-	withTagName := fmt.Sprintf("%s:latest", repoName)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", withTagName)
-	dockerCmd(c, "push", withTagName)
-	dockerCmd(c, "rmi", withTagName)
-
-	// Try trusted create on untrusted tag
-	createCmd := exec.Command(dockerBinary, "create", withTagName)
-	s.trustedCmd(createCmd)
-	out, _, err := runCommandWithOutput(createCmd)
-	c.Assert(err, check.Not(check.IsNil))
-	c.Assert(string(out), checker.Contains, fmt.Sprintf("does not have trust data for %s", repoName), check.Commentf("Missing expected output on trusted create:\n%s", out))
-
-}
-
-func (s *DockerTrustSuite) TestTrustedIsolatedCreate(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-isolated-create")
-
-	// Try create
-	createCmd := exec.Command(dockerBinary, "--config", "/tmp/docker-isolated-create", "create", repoName)
-	s.trustedCmd(createCmd)
-	out, _, err := runCommandWithOutput(createCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	dockerCmd(c, "rmi", repoName)
-}
-
-func (s *DockerTrustSuite) TestCreateWhenCertExpired(c *check.C) {
-	c.Skip("Currently changes system time, causing instability")
-	repoName := s.setupTrustedImage(c, "trusted-create-expired")
-
-	// Certificates have 10 years of expiration
-	elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11)
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try create
-		createCmd := exec.Command(dockerBinary, "create", repoName)
-		s.trustedCmd(createCmd)
-		out, _, err := runCommandWithOutput(createCmd)
-		c.Assert(err, check.Not(check.IsNil))
-		c.Assert(string(out), checker.Contains, "could not validate the path to a trusted root", check.Commentf("Missing expected output on trusted create in the distant future:\n%s", out))
-	})
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try create
-		createCmd := exec.Command(dockerBinary, "create", "--disable-content-trust", repoName)
-		s.trustedCmd(createCmd)
-		out, _, err := runCommandWithOutput(createCmd)
-		c.Assert(err, check.Not(check.IsNil))
-		c.Assert(string(out), checker.Contains, "Status: Downloaded", check.Commentf("Missing expected output on trusted create in the distant future:\n%s", out))
-
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedCreateFromBadTrustServer(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclievilcreate/trusted:latest", privateRegistryURL)
-	evilLocalConfigDir, err := ioutil.TempDir("", "evilcreate-local-config-dir")
-	c.Assert(err, check.IsNil)
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try create
-	createCmd := exec.Command(dockerBinary, "create", repoName)
-	s.trustedCmd(createCmd)
-	out, _, err = runCommandWithOutput(createCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Kill the notary server, start a new "evil" one.
-	s.not.Close()
-	s.not, err = newTestNotary(c)
-	c.Assert(err, check.IsNil)
-
-	// In order to make an evil server, lets re-init a client (with a different trust dir) and push new data.
-	// tag an image and upload it to the private registry
-	dockerCmd(c, "--config", evilLocalConfigDir, "tag", "busybox", repoName)
-
-	// Push up to the new server
-	pushCmd = exec.Command(dockerBinary, "--config", evilLocalConfigDir, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil)
-	c.Assert(string(out), checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	// Now, try creating with the original client from this new trust server. This should fail because the new root is invalid.
-	createCmd = exec.Command(dockerBinary, "create", repoName)
-	s.trustedCmd(createCmd)
-	out, _, err = runCommandWithOutput(createCmd)
-	if err == nil {
-		c.Fatalf("Continuing with cached data even though it's an invalid root rotation: %s\n%s", err, out)
-	}
-	if !strings.Contains(out, "could not rotate trust to a new trusted root") {
-		c.Fatalf("Missing expected output on trusted create:\n%s", out)
-	}
-
-}
-
-func (s *DockerSuite) TestCreateStopSignal(c *check.C) {
-	name := "test_create_stop_signal"
-	dockerCmd(c, "create", "--name", name, "--stop-signal", "9", "busybox")
-
-	res := inspectFieldJSON(c, name, "Config.StopSignal")
-	c.Assert(res, checker.Contains, "9")
-
-}
-
-func (s *DockerSuite) TestCreateWithWorkdir(c *check.C) {
-	name := "foo"
-
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	dir := prefix + slash + "home" + slash + "foo" + slash + "bar"
-
-	dockerCmd(c, "create", "--name", name, "-w", dir, "busybox")
-	// Windows does not create the workdir until the container is started
-	if daemonPlatform == "windows" {
-		dockerCmd(c, "start", name)
-	}
-	dockerCmd(c, "cp", fmt.Sprintf("%s:%s", name, dir), prefix+slash+"tmp")
-}
-
-func (s *DockerSuite) TestCreateWithInvalidLogOpts(c *check.C) {
-	name := "test-invalidate-log-opts"
-	out, _, err := dockerCmdWithError("create", "--name", name, "--log-opt", "invalid=true", "busybox")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "unknown log opt")
-
-	out, _ = dockerCmd(c, "ps", "-a")
-	c.Assert(out, checker.Not(checker.Contains), name)
-}
-
-// #20972
-func (s *DockerSuite) TestCreate64ByteHexID(c *check.C) {
-	out := inspectField(c, "busybox", "Id")
-	imageID := strings.TrimPrefix(strings.TrimSpace(string(out)), "sha256:")
-
-	dockerCmd(c, "create", imageID)
-}
-
-// Test case for #23498
-func (s *DockerSuite) TestCreateUnsetEntrypoint(c *check.C) {
-	name := "test-entrypoint"
-	dockerfile := `FROM busybox
-ADD entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-CMD echo foobar`
-
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"entrypoint.sh": `#!/bin/sh
-echo "I am an entrypoint"
-exec "$@"`,
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "create", "--entrypoint=", name, "echo", "foo")
-	id := strings.TrimSpace(out)
-	c.Assert(id, check.Not(check.Equals), "")
-	out, _ = dockerCmd(c, "start", "-a", id)
-	c.Assert(strings.TrimSpace(out), check.Equals, "foo")
-}
-
-// #22471
-func (s *DockerSuite) TestCreateStopTimeout(c *check.C) {
-	name1 := "test_create_stop_timeout_1"
-	dockerCmd(c, "create", "--name", name1, "--stop-timeout", "15", "busybox")
-
-	res := inspectFieldJSON(c, name1, "Config.StopTimeout")
-	c.Assert(res, checker.Contains, "15")
-
-	name2 := "test_create_stop_timeout_2"
-	dockerCmd(c, "create", "--name", name2, "busybox")
-
-	res = inspectFieldJSON(c, name2, "Config.StopTimeout")
-	c.Assert(res, checker.Contains, "null")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_plugins_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_plugins_test.go
deleted file mode 100644
index f91edc6555..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_plugins_test.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// +build linux
-
-package main
-
-import (
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/go-check/check"
-)
-
-// TestDaemonRestartWithPluginEnabled tests state restore for an enabled plugin
-func (s *DockerDaemonSuite) TestDaemonRestartWithPluginEnabled(c *check.C) {
-	testRequires(c, IsAmd64, Network)
-
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-
-	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-
-	defer func() {
-		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
-			c.Fatalf("Could not disable plugin: %v %s", err, out)
-		}
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-	}()
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatalf("Could not restart daemon: %v", err)
-	}
-
-	out, err := s.d.Cmd("plugin", "ls")
-	if err != nil {
-		c.Fatalf("Could not list plugins: %v %s", err, out)
-	}
-	c.Assert(out, checker.Contains, pName)
-	c.Assert(out, checker.Contains, "true")
-}
-
-// TestDaemonRestartWithPluginDisabled tests state restore for a disabled plugin
-func (s *DockerDaemonSuite) TestDaemonRestartWithPluginDisabled(c *check.C) {
-	testRequires(c, IsAmd64, Network)
-
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-
-	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName, "--disable"); err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-
-	defer func() {
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-	}()
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatalf("Could not restart daemon: %v", err)
-	}
-
-	out, err := s.d.Cmd("plugin", "ls")
-	if err != nil {
-		c.Fatalf("Could not list plugins: %v %s", err, out)
-	}
-	c.Assert(out, checker.Contains, pName)
-	c.Assert(out, checker.Contains, "false")
-}
-
-// TestDaemonKillLiveRestoreWithPlugins SIGKILLs daemon started with --live-restore.
-// Plugins should continue to run.
-func (s *DockerDaemonSuite) TestDaemonKillLiveRestoreWithPlugins(c *check.C) {
-	testRequires(c, IsAmd64, Network)
-
-	if err := s.d.Start("--live-restore"); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-	defer func() {
-		if err := s.d.Restart("--live-restore"); err != nil {
-			c.Fatalf("Could not restart daemon: %v", err)
-		}
-		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
-			c.Fatalf("Could not disable plugin: %v %s", err, out)
-		}
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-	}()
-
-	if err := s.d.Kill(); err != nil {
-		c.Fatalf("Could not kill daemon: %v", err)
-	}
-
-	cmd := exec.Command("pgrep", "-f", pluginProcessName)
-	if out, ec, err := runCommandWithOutput(cmd); ec != 0 {
-		c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out)
-	}
-}
-
-// TestDaemonShutdownLiveRestoreWithPlugins SIGTERMs daemon started with --live-restore.
-// Plugins should continue to run.
-func (s *DockerDaemonSuite) TestDaemonShutdownLiveRestoreWithPlugins(c *check.C) {
-	testRequires(c, IsAmd64, Network)
-
-	if err := s.d.Start("--live-restore"); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-	defer func() {
-		if err := s.d.Restart("--live-restore"); err != nil {
-			c.Fatalf("Could not restart daemon: %v", err)
-		}
-		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
-			c.Fatalf("Could not disable plugin: %v %s", err, out)
-		}
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-	}()
-
-	if err := s.d.cmd.Process.Signal(os.Interrupt); err != nil {
-		c.Fatalf("Could not kill daemon: %v", err)
-	}
-
-	cmd := exec.Command("pgrep", "-f", pluginProcessName)
-	if out, ec, err := runCommandWithOutput(cmd); ec != 0 {
-		c.Fatalf("Expected exit code '0', got %d err: %v output: %s ", ec, err, out)
-	}
-}
-
-// TestDaemonShutdownWithPlugins shuts down running plugins.
-func (s *DockerDaemonSuite) TestDaemonShutdownWithPlugins(c *check.C) {
-	testRequires(c, IsAmd64, Network, SameHostDaemon)
-
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	if out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName); err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-
-	defer func() {
-		if err := s.d.Restart(); err != nil {
-			c.Fatalf("Could not restart daemon: %v", err)
-		}
-		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
-			c.Fatalf("Could not disable plugin: %v %s", err, out)
-		}
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-	}()
-
-	if err := s.d.cmd.Process.Signal(os.Interrupt); err != nil {
-		c.Fatalf("Could not kill daemon: %v", err)
-	}
-
-	for {
-		if err := syscall.Kill(s.d.cmd.Process.Pid, 0); err == syscall.ESRCH {
-			break
-		}
-	}
-
-	cmd := exec.Command("pgrep", "-f", pluginProcessName)
-	if out, ec, err := runCommandWithOutput(cmd); ec != 1 {
-		c.Fatalf("Expected exit code '1', got %d err: %v output: %s ", ec, err, out)
-	}
-
-	s.d.Start("--live-restore")
-	cmd = exec.Command("pgrep", "-f", pluginProcessName)
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-}
-
-// TestVolumePlugin tests volume creation using a plugin.
-func (s *DockerDaemonSuite) TestVolumePlugin(c *check.C) {
-	testRequires(c, IsAmd64, Network)
-
-	volName := "plugin-volume"
-	destDir := "/tmp/data/"
-	destFile := "foo"
-
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	out, err := s.d.Cmd("plugin", "install", pName, "--grant-all-permissions")
-	if err != nil {
-		c.Fatalf("Could not install plugin: %v %s", err, out)
-	}
-	pluginID, err := s.d.Cmd("plugin", "inspect", "-f", "{{.Id}}", pName)
-	pluginID = strings.TrimSpace(pluginID)
-	if err != nil {
-		c.Fatalf("Could not retrieve plugin ID: %v %s", err, pluginID)
-	}
-	mountpointPrefix := filepath.Join(s.d.RootDir(), "plugins", pluginID, "rootfs")
-	defer func() {
-		if out, err := s.d.Cmd("plugin", "disable", pName); err != nil {
-			c.Fatalf("Could not disable plugin: %v %s", err, out)
-		}
-
-		if out, err := s.d.Cmd("plugin", "remove", pName); err != nil {
-			c.Fatalf("Could not remove plugin: %v %s", err, out)
-		}
-
-		exists, err := existsMountpointWithPrefix(mountpointPrefix)
-		c.Assert(err, checker.IsNil)
-		c.Assert(exists, checker.Equals, false)
-
-	}()
-
-	out, err = s.d.Cmd("volume", "create", "-d", pName, volName)
-	if err != nil {
-		c.Fatalf("Could not create volume: %v %s", err, out)
-	}
-	defer func() {
-		if out, err := s.d.Cmd("volume", "remove", volName); err != nil {
-			c.Fatalf("Could not remove volume: %v %s", err, out)
-		}
-	}()
-
-	out, err = s.d.Cmd("volume", "ls")
-	if err != nil {
-		c.Fatalf("Could not list volume: %v %s", err, out)
-	}
-	c.Assert(out, checker.Contains, volName)
-	c.Assert(out, checker.Contains, pName)
-
-	mountPoint, err := s.d.Cmd("volume", "inspect", volName, "--format", "{{.Mountpoint}}")
-	if err != nil {
-		c.Fatalf("Could not inspect volume: %v %s", err, mountPoint)
-	}
-	mountPoint = strings.TrimSpace(mountPoint)
-
-	out, err = s.d.Cmd("run", "--rm", "-v", volName+":"+destDir, "busybox", "touch", destDir+destFile)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	path := filepath.Join(s.d.RootDir(), "plugins", pluginID, "rootfs", mountPoint, destFile)
-	_, err = os.Lstat(path)
-	c.Assert(err, checker.IsNil)
-
-	exists, err := existsMountpointWithPrefix(mountpointPrefix)
-	c.Assert(err, checker.IsNil)
-	c.Assert(exists, checker.Equals, true)
-}
-
-func (s *DockerDaemonSuite) TestGraphdriverPlugin(c *check.C) {
-	testRequires(c, Network, IsAmd64, DaemonIsLinux, overlay2Supported, ExperimentalDaemon)
-
-	s.d.Start()
-
-	// install the plugin
-	plugin := "cpuguy83/docker-overlay2-graphdriver-plugin"
-	out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", plugin)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// restart the daemon with the plugin set as the storage driver
-	s.d.Restart("-s", plugin, "--storage-opt", "overlay2.override_kernel_check=1")
-
-	// run a container
-	out, err = s.d.Cmd("run", "--rm", "busybox", "true") // this will pull busybox using the plugin
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestPluginVolumeRemoveOnRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux, Network, IsAmd64)
-
-	s.d.Start("--live-restore=true")
-
-	out, err := s.d.Cmd("plugin", "install", "--grant-all-permissions", pName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	out, err = s.d.Cmd("volume", "create", "--driver", pName, "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	s.d.Restart("--live-restore=true")
-
-	out, err = s.d.Cmd("plugin", "disable", pName)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "in use")
-
-	out, err = s.d.Cmd("volume", "rm", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("plugin", "disable", pName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("plugin", "rm", pName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-}
-
-func existsMountpointWithPrefix(mountpointPrefix string) (bool, error) {
-	mounts, err := mount.GetMounts()
-	if err != nil {
-		return false, err
-	}
-	for _, mnt := range mounts {
-		if strings.HasPrefix(mnt.Mountpoint, mountpointPrefix) {
-			return true, nil
-		}
-	}
-	return false, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_test.go
deleted file mode 100644
index 3a74fe215f..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_daemon_test.go
+++ /dev/null
@@ -1,2988 +0,0 @@
-// +build linux
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/go-units"
-	"github.com/docker/libnetwork/iptables"
-	"github.com/docker/libtrust"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// TestLegacyDaemonCommand test starting docker daemon using "deprecated" docker daemon
-// command. Remove this test when we remove this.
-func (s *DockerDaemonSuite) TestLegacyDaemonCommand(c *check.C) {
-	cmd := exec.Command(dockerBinary, "daemon", "--storage-driver=vfs", "--debug")
-	err := cmd.Start()
-	c.Assert(err, checker.IsNil, check.Commentf("could not start daemon using 'docker daemon'"))
-
-	c.Assert(cmd.Process.Kill(), checker.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithRunningContainersPorts(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	if out, err := s.d.Cmd("run", "-d", "--name", "top1", "-p", "1234:80", "--restart", "always", "busybox:latest", "top"); err != nil {
-		c.Fatalf("Could not run top1: err=%v\n%s", err, out)
-	}
-	// --restart=no by default
-	if out, err := s.d.Cmd("run", "-d", "--name", "top2", "-p", "80", "busybox:latest", "top"); err != nil {
-		c.Fatalf("Could not run top2: err=%v\n%s", err, out)
-	}
-
-	testRun := func(m map[string]bool, prefix string) {
-		var format string
-		for cont, shouldRun := range m {
-			out, err := s.d.Cmd("ps")
-			if err != nil {
-				c.Fatalf("Could not run ps: err=%v\n%q", err, out)
-			}
-			if shouldRun {
-				format = "%scontainer %q is not running"
-			} else {
-				format = "%scontainer %q is running"
-			}
-			if shouldRun != strings.Contains(out, cont) {
-				c.Fatalf(format, prefix, cont)
-			}
-		}
-	}
-
-	testRun(map[string]bool{"top1": true, "top2": true}, "")
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatalf("Could not restart daemon: %v", err)
-	}
-	testRun(map[string]bool{"top1": true, "top2": false}, "After daemon restart: ")
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithVolumesRefs(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-
-	if out, err := s.d.Cmd("run", "--name", "volrestarttest1", "-v", "/foo", "busybox"); err != nil {
-		c.Fatal(err, out)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := s.d.Cmd("run", "-d", "--volumes-from", "volrestarttest1", "--name", "volrestarttest2", "busybox", "top"); err != nil {
-		c.Fatal(err)
-	}
-
-	if out, err := s.d.Cmd("rm", "-fv", "volrestarttest2"); err != nil {
-		c.Fatal(err, out)
-	}
-
-	out, err := s.d.Cmd("inspect", "-f", "{{json .Mounts}}", "volrestarttest1")
-	c.Assert(err, check.IsNil)
-
-	if _, err := inspectMountPointJSON(out, "/foo"); err != nil {
-		c.Fatalf("Expected volume to exist: /foo, error: %v\n", err)
-	}
-}
-
-// #11008
-func (s *DockerDaemonSuite) TestDaemonRestartUnlessStopped(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name", "top1", "--restart", "always", "busybox:latest", "top")
-	c.Assert(err, check.IsNil, check.Commentf("run top1: %v", out))
-
-	out, err = s.d.Cmd("run", "-d", "--name", "top2", "--restart", "unless-stopped", "busybox:latest", "top")
-	c.Assert(err, check.IsNil, check.Commentf("run top2: %v", out))
-
-	testRun := func(m map[string]bool, prefix string) {
-		var format string
-		for name, shouldRun := range m {
-			out, err := s.d.Cmd("ps")
-			c.Assert(err, check.IsNil, check.Commentf("run ps: %v", out))
-			if shouldRun {
-				format = "%scontainer %q is not running"
-			} else {
-				format = "%scontainer %q is running"
-			}
-			c.Assert(strings.Contains(out, name), check.Equals, shouldRun, check.Commentf(format, prefix, name))
-		}
-	}
-
-	// both running
-	testRun(map[string]bool{"top1": true, "top2": true}, "")
-
-	out, err = s.d.Cmd("stop", "top1")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("stop", "top2")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// both stopped
-	testRun(map[string]bool{"top1": false, "top2": false}, "")
-
-	err = s.d.Restart()
-	c.Assert(err, check.IsNil)
-
-	// restart=always running
-	testRun(map[string]bool{"top1": true, "top2": false}, "After daemon restart: ")
-
-	out, err = s.d.Cmd("start", "top2")
-	c.Assert(err, check.IsNil, check.Commentf("start top2: %v", out))
-
-	err = s.d.Restart()
-	c.Assert(err, check.IsNil)
-
-	// both running
-	testRun(map[string]bool{"top1": true, "top2": true}, "After second daemon restart: ")
-
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartOnFailure(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name", "test1", "--restart", "on-failure:3", "busybox:latest", "false")
-	c.Assert(err, check.IsNil, check.Commentf("run top1: %v", out))
-
-	// wait test1 to stop
-	hostArgs := []string{"--host", s.d.sock()}
-	err = waitInspectWithArgs("test1", "{{.State.Running}} {{.State.Restarting}}", "false false", 10*time.Second, hostArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf("test1 should exit but not"))
-
-	// record last start time
-	out, err = s.d.Cmd("inspect", "-f={{.State.StartedAt}}", "test1")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	lastStartTime := out
-
-	err = s.d.Restart()
-	c.Assert(err, check.IsNil)
-
-	// test1 shouldn't restart at all
-	err = waitInspectWithArgs("test1", "{{.State.Running}} {{.State.Restarting}}", "false false", 0, hostArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf("test1 should exit but not"))
-
-	// make sure test1 isn't restarted when daemon restart
-	// if "StartAt" time updates, means test1 was once restarted.
-	out, err = s.d.Cmd("inspect", "-f={{.State.StartedAt}}", "test1")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	c.Assert(out, checker.Equals, lastStartTime, check.Commentf("test1 shouldn't start after daemon restarts"))
-}
-
-func (s *DockerDaemonSuite) TestDaemonStartIptablesFalse(c *check.C) {
-	if err := s.d.Start("--iptables=false"); err != nil {
-		c.Fatalf("we should have been able to start the daemon with passing iptables=false: %v", err)
-	}
-}
-
-// Make sure we cannot shrink base device at daemon restart.
-func (s *DockerDaemonSuite) TestDaemonRestartWithInvalidBasesize(c *check.C) {
-	testRequires(c, Devicemapper)
-	c.Assert(s.d.Start(), check.IsNil)
-
-	oldBasesizeBytes := s.d.getBaseDeviceSize(c)
-	var newBasesizeBytes int64 = 1073741824 //1GB in bytes
-
-	if newBasesizeBytes < oldBasesizeBytes {
-		err := s.d.Restart("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))
-		c.Assert(err, check.IsNil, check.Commentf("daemon should not have started as new base device size is less than existing base device size: %v", err))
-	}
-	c.Assert(s.d.Stop(), check.IsNil)
-}
-
-// Make sure we can grow base device at daemon restart.
-func (s *DockerDaemonSuite) TestDaemonRestartWithIncreasedBasesize(c *check.C) {
-	testRequires(c, Devicemapper)
-	c.Assert(s.d.Start(), check.IsNil)
-
-	oldBasesizeBytes := s.d.getBaseDeviceSize(c)
-
-	var newBasesizeBytes int64 = 53687091200 //50GB in bytes
-
-	if newBasesizeBytes < oldBasesizeBytes {
-		c.Skip(fmt.Sprintf("New base device size (%v) must be greater than (%s)", units.HumanSize(float64(newBasesizeBytes)), units.HumanSize(float64(oldBasesizeBytes))))
-	}
-
-	err := s.d.Restart("--storage-opt", fmt.Sprintf("dm.basesize=%d", newBasesizeBytes))
-	c.Assert(err, check.IsNil, check.Commentf("we should have been able to start the daemon with increased base device size: %v", err))
-
-	basesizeAfterRestart := s.d.getBaseDeviceSize(c)
-	newBasesize, err := convertBasesize(newBasesizeBytes)
-	c.Assert(err, check.IsNil, check.Commentf("Error in converting base device size: %v", err))
-	c.Assert(newBasesize, check.Equals, basesizeAfterRestart, check.Commentf("Basesize passed is not equal to Basesize set"))
-	c.Assert(s.d.Stop(), check.IsNil)
-}
-
-// Issue #8444: If docker0 bridge is modified (intentionally or unintentionally) and
-// no longer has an IP associated, we should gracefully handle that case and associate
-// an IP with it rather than fail daemon start
-func (s *DockerDaemonSuite) TestDaemonStartBridgeWithoutIPAssociation(c *check.C) {
-	// rather than depending on brctl commands to verify docker0 is created and up
-	// let's start the daemon and stop it, and then make a modification to run the
-	// actual test
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	if err := s.d.Stop(); err != nil {
-		c.Fatalf("Could not stop daemon: %v", err)
-	}
-
-	// now we will remove the ip from docker0 and then try starting the daemon
-	ipCmd := exec.Command("ip", "addr", "flush", "dev", "docker0")
-	stdout, stderr, _, err := runCommandWithStdoutStderr(ipCmd)
-	if err != nil {
-		c.Fatalf("failed to remove docker0 IP association: %v, stdout: %q, stderr: %q", err, stdout, stderr)
-	}
-
-	if err := s.d.Start(); err != nil {
-		warning := "**WARNING: Docker bridge network in bad state--delete docker0 bridge interface to fix"
-		c.Fatalf("Could not start daemon when docker0 has no IP address: %v\n%s", err, warning)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonIptablesClean(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	if out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top"); err != nil {
-		c.Fatalf("Could not run top: %s, %v", out, err)
-	}
-
-	// get output from iptables with container running
-	ipTablesSearchString := "tcp dpt:80"
-	ipTablesCmd := exec.Command("iptables", "-nvL")
-	out, _, err := runCommandWithOutput(ipTablesCmd)
-	if err != nil {
-		c.Fatalf("Could not run iptables -nvL: %s, %v", out, err)
-	}
-
-	if !strings.Contains(out, ipTablesSearchString) {
-		c.Fatalf("iptables output should have contained %q, but was %q", ipTablesSearchString, out)
-	}
-
-	if err := s.d.Stop(); err != nil {
-		c.Fatalf("Could not stop daemon: %v", err)
-	}
-
-	// get output from iptables after restart
-	ipTablesCmd = exec.Command("iptables", "-nvL")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	if err != nil {
-		c.Fatalf("Could not run iptables -nvL: %s, %v", out, err)
-	}
-
-	if strings.Contains(out, ipTablesSearchString) {
-		c.Fatalf("iptables output should not have contained %q, but was %q", ipTablesSearchString, out)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonIptablesCreate(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	if out, err := s.d.Cmd("run", "-d", "--name", "top", "--restart=always", "-p", "80", "busybox:latest", "top"); err != nil {
-		c.Fatalf("Could not run top: %s, %v", out, err)
-	}
-
-	// get output from iptables with container running
-	ipTablesSearchString := "tcp dpt:80"
-	ipTablesCmd := exec.Command("iptables", "-nvL")
-	out, _, err := runCommandWithOutput(ipTablesCmd)
-	if err != nil {
-		c.Fatalf("Could not run iptables -nvL: %s, %v", out, err)
-	}
-
-	if !strings.Contains(out, ipTablesSearchString) {
-		c.Fatalf("iptables output should have contained %q, but was %q", ipTablesSearchString, out)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatalf("Could not restart daemon: %v", err)
-	}
-
-	// make sure the container is not running
-	runningOut, err := s.d.Cmd("inspect", "--format={{.State.Running}}", "top")
-	if err != nil {
-		c.Fatalf("Could not inspect on container: %s, %v", out, err)
-	}
-	if strings.TrimSpace(runningOut) != "true" {
-		c.Fatalf("Container should have been restarted after daemon restart. Status running should have been true but was: %q", strings.TrimSpace(runningOut))
-	}
-
-	// get output from iptables after restart
-	ipTablesCmd = exec.Command("iptables", "-nvL")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	if err != nil {
-		c.Fatalf("Could not run iptables -nvL: %s, %v", out, err)
-	}
-
-	if !strings.Contains(out, ipTablesSearchString) {
-		c.Fatalf("iptables output after restart should have contained %q, but was %q", ipTablesSearchString, out)
-	}
-}
-
-// TestDaemonIPv6Enabled checks that when the daemon is started with --ipv6=true that the docker0 bridge
-// has the fe80::1 address and that a container is assigned a link-local address
-func (s *DockerDaemonSuite) TestDaemonIPv6Enabled(c *check.C) {
-	testRequires(c, IPv6)
-
-	setupV6(c)
-	defer teardownV6(c)
-
-	if err := s.d.StartWithBusybox("--ipv6"); err != nil {
-		c.Fatal(err)
-	}
-
-	iface, err := net.InterfaceByName("docker0")
-	if err != nil {
-		c.Fatalf("Error getting docker0 interface: %v", err)
-	}
-
-	addrs, err := iface.Addrs()
-	if err != nil {
-		c.Fatalf("Error getting addresses for docker0 interface: %v", err)
-	}
-
-	var found bool
-	expected := "fe80::1/64"
-
-	for i := range addrs {
-		if addrs[i].String() == expected {
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		c.Fatalf("Bridge does not have an IPv6 Address")
-	}
-
-	if out, err := s.d.Cmd("run", "-itd", "--name=ipv6test", "busybox:latest"); err != nil {
-		c.Fatalf("Could not run container: %s, %v", out, err)
-	}
-
-	out, err := s.d.Cmd("inspect", "--format", "'{{.NetworkSettings.Networks.bridge.LinkLocalIPv6Address}}'", "ipv6test")
-	out = strings.Trim(out, " \r\n'")
-
-	if err != nil {
-		c.Fatalf("Error inspecting container: %s, %v", out, err)
-	}
-
-	if ip := net.ParseIP(out); ip == nil {
-		c.Fatalf("Container should have a link-local IPv6 address")
-	}
-
-	out, err = s.d.Cmd("inspect", "--format", "'{{.NetworkSettings.Networks.bridge.GlobalIPv6Address}}'", "ipv6test")
-	out = strings.Trim(out, " \r\n'")
-
-	if err != nil {
-		c.Fatalf("Error inspecting container: %s, %v", out, err)
-	}
-
-	if ip := net.ParseIP(out); ip != nil {
-		c.Fatalf("Container should not have a global IPv6 address: %v", out)
-	}
-}
-
-// TestDaemonIPv6FixedCIDR checks that when the daemon is started with --ipv6=true and a fixed CIDR
-// that running containers are given a link-local and global IPv6 address
-func (s *DockerDaemonSuite) TestDaemonIPv6FixedCIDR(c *check.C) {
-	// IPv6 setup is messing with local bridge address.
-	testRequires(c, SameHostDaemon)
-	setupV6(c)
-	defer teardownV6(c)
-
-	err := s.d.StartWithBusybox("--ipv6", "--fixed-cidr-v6=2001:db8:2::/64", "--default-gateway-v6=2001:db8:2::100")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not start daemon with busybox: %v", err))
-
-	out, err := s.d.Cmd("run", "-itd", "--name=ipv6test", "busybox:latest")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not run container: %s, %v", out, err))
-
-	out, err = s.d.Cmd("inspect", "--format", "{{.NetworkSettings.Networks.bridge.GlobalIPv6Address}}", "ipv6test")
-	out = strings.Trim(out, " \r\n'")
-
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	ip := net.ParseIP(out)
-	c.Assert(ip, checker.NotNil, check.Commentf("Container should have a global IPv6 address"))
-
-	out, err = s.d.Cmd("inspect", "--format", "{{.NetworkSettings.Networks.bridge.IPv6Gateway}}", "ipv6test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	c.Assert(strings.Trim(out, " \r\n'"), checker.Equals, "2001:db8:2::100", check.Commentf("Container should have a global IPv6 gateway"))
-}
-
-// TestDaemonIPv6FixedCIDRAndMac checks that when the daemon is started with ipv6 fixed CIDR
-// the running containers are given an IPv6 address derived from the MAC address and the ipv6 fixed CIDR
-func (s *DockerDaemonSuite) TestDaemonIPv6FixedCIDRAndMac(c *check.C) {
-	// IPv6 setup is messing with local bridge address.
-	testRequires(c, SameHostDaemon)
-	setupV6(c)
-	defer teardownV6(c)
-
-	err := s.d.StartWithBusybox("--ipv6", "--fixed-cidr-v6=2001:db8:1::/64")
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "-itd", "--name=ipv6test", "--mac-address", "AA:BB:CC:DD:EE:FF", "busybox")
-	c.Assert(err, checker.IsNil)
-
-	out, err = s.d.Cmd("inspect", "--format", "{{.NetworkSettings.Networks.bridge.GlobalIPv6Address}}", "ipv6test")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.Trim(out, " \r\n'"), checker.Equals, "2001:db8:1::aabb:ccdd:eeff")
-}
-
-func (s *DockerDaemonSuite) TestDaemonLogLevelWrong(c *check.C) {
-	c.Assert(s.d.Start("--log-level=bogus"), check.NotNil, check.Commentf("Daemon shouldn't start with wrong log level"))
-}
-
-func (s *DockerDaemonSuite) TestDaemonLogLevelDebug(c *check.C) {
-	if err := s.d.Start("--log-level=debug"); err != nil {
-		c.Fatal(err)
-	}
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	if !strings.Contains(string(content), `level=debug`) {
-		c.Fatalf(`Missing level="debug" in log file:\n%s`, string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLogLevelFatal(c *check.C) {
-	// we creating new daemons to create new logFile
-	if err := s.d.Start("--log-level=fatal"); err != nil {
-		c.Fatal(err)
-	}
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	if strings.Contains(string(content), `level=debug`) {
-		c.Fatalf(`Should not have level="debug" in log file:\n%s`, string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonFlagD(c *check.C) {
-	if err := s.d.Start("-D"); err != nil {
-		c.Fatal(err)
-	}
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	if !strings.Contains(string(content), `level=debug`) {
-		c.Fatalf(`Should have level="debug" in log file using -D:\n%s`, string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonFlagDebug(c *check.C) {
-	if err := s.d.Start("--debug"); err != nil {
-		c.Fatal(err)
-	}
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	if !strings.Contains(string(content), `level=debug`) {
-		c.Fatalf(`Should have level="debug" in log file using --debug:\n%s`, string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonFlagDebugLogLevelFatal(c *check.C) {
-	if err := s.d.Start("--debug", "--log-level=fatal"); err != nil {
-		c.Fatal(err)
-	}
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	if !strings.Contains(string(content), `level=debug`) {
-		c.Fatalf(`Should have level="debug" in log file when using both --debug and --log-level=fatal:\n%s`, string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonAllocatesListeningPort(c *check.C) {
-	listeningPorts := [][]string{
-		{"0.0.0.0", "0.0.0.0", "5678"},
-		{"127.0.0.1", "127.0.0.1", "1234"},
-		{"localhost", "127.0.0.1", "1235"},
-	}
-
-	cmdArgs := make([]string, 0, len(listeningPorts)*2)
-	for _, hostDirective := range listeningPorts {
-		cmdArgs = append(cmdArgs, "--host", fmt.Sprintf("tcp://%s:%s", hostDirective[0], hostDirective[2]))
-	}
-
-	if err := s.d.StartWithBusybox(cmdArgs...); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	for _, hostDirective := range listeningPorts {
-		output, err := s.d.Cmd("run", "-p", fmt.Sprintf("%s:%s:80", hostDirective[1], hostDirective[2]), "busybox", "true")
-		if err == nil {
-			c.Fatalf("Container should not start, expected port already allocated error: %q", output)
-		} else if !strings.Contains(output, "port is already allocated") {
-			c.Fatalf("Expected port is already allocated error: %q", output)
-		}
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonKeyGeneration(c *check.C) {
-	// TODO: skip or update for Windows daemon
-	os.Remove("/etc/docker/key.json")
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	s.d.Stop()
-
-	k, err := libtrust.LoadKeyFile("/etc/docker/key.json")
-	if err != nil {
-		c.Fatalf("Error opening key file")
-	}
-	kid := k.KeyID()
-	// Test Key ID is a valid fingerprint (e.g. QQXN:JY5W:TBXI:MK3X:GX6P:PD5D:F56N:NHCS:LVRZ:JA46:R24J:XEFF)
-	if len(kid) != 59 {
-		c.Fatalf("Bad key ID: %s", kid)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonKeyMigration(c *check.C) {
-	// TODO: skip or update for Windows daemon
-	os.Remove("/etc/docker/key.json")
-	k1, err := libtrust.GenerateECP256PrivateKey()
-	if err != nil {
-		c.Fatalf("Error generating private key: %s", err)
-	}
-	if err := os.MkdirAll(filepath.Join(os.Getenv("HOME"), ".docker"), 0755); err != nil {
-		c.Fatalf("Error creating .docker directory: %s", err)
-	}
-	if err := libtrust.SaveKey(filepath.Join(os.Getenv("HOME"), ".docker", "key.json"), k1); err != nil {
-		c.Fatalf("Error saving private key: %s", err)
-	}
-
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	s.d.Stop()
-
-	k2, err := libtrust.LoadKeyFile("/etc/docker/key.json")
-	if err != nil {
-		c.Fatalf("Error opening key file")
-	}
-	if k1.KeyID() != k2.KeyID() {
-		c.Fatalf("Key not migrated")
-	}
-}
-
-// GH#11320 - verify that the daemon exits on failure properly
-// Note that this explicitly tests the conflict of {-b,--bridge} and {--bip} options as the means
-// to get a daemon init failure; no other tests for -b/--bip conflict are therefore required
-func (s *DockerDaemonSuite) TestDaemonExitOnFailure(c *check.C) {
-	//attempt to start daemon with incorrect flags (we know -b and --bip conflict)
-	if err := s.d.Start("--bridge", "nosuchbridge", "--bip", "1.1.1.1"); err != nil {
-		//verify we got the right error
-		if !strings.Contains(err.Error(), "Daemon exited") {
-			c.Fatalf("Expected daemon not to start, got %v", err)
-		}
-		// look in the log and make sure we got the message that daemon is shutting down
-		runCmd := exec.Command("grep", "Error starting daemon", s.d.LogFileName())
-		if out, _, err := runCommandWithOutput(runCmd); err != nil {
-			c.Fatalf("Expected 'Error starting daemon' message; but doesn't exist in log: %q, err: %v", out, err)
-		}
-	} else {
-		//if we didn't get an error and the daemon is running, this is a failure
-		c.Fatal("Conflicting options should cause the daemon to error out with a failure")
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeExternal(c *check.C) {
-	d := s.d
-	err := d.Start("--bridge", "nosuchbridge")
-	c.Assert(err, check.NotNil, check.Commentf("--bridge option with an invalid bridge should cause the daemon to fail"))
-	defer d.Restart()
-
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.1.1/24"
-	_, bridgeIPNet, _ := net.ParseCIDR(bridgeIP)
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	err = d.StartWithBusybox("--bridge", bridgeName)
-	c.Assert(err, check.IsNil)
-
-	ipTablesSearchString := bridgeIPNet.String()
-	ipTablesCmd := exec.Command("iptables", "-t", "nat", "-nvL")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	c.Assert(err, check.IsNil)
-
-	c.Assert(strings.Contains(out, ipTablesSearchString), check.Equals, true,
-		check.Commentf("iptables output should have contained %q, but was %q",
-			ipTablesSearchString, out))
-
-	_, err = d.Cmd("run", "-d", "--name", "ExtContainer", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	containerIP := d.findContainerIP("ExtContainer")
-	ip := net.ParseIP(containerIP)
-	c.Assert(bridgeIPNet.Contains(ip), check.Equals, true,
-		check.Commentf("Container IP-Address must be in the same subnet range : %s",
-			containerIP))
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeNone(c *check.C) {
-	// start with bridge none
-	d := s.d
-	err := d.StartWithBusybox("--bridge", "none")
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	// verify docker0 iface is not there
-	out, _, err := runCommandWithOutput(exec.Command("ifconfig", "docker0"))
-	c.Assert(err, check.NotNil, check.Commentf("docker0 should not be present if daemon started with --bridge=none"))
-	c.Assert(strings.Contains(out, "Device not found"), check.Equals, true)
-
-	// verify default "bridge" network is not there
-	out, err = d.Cmd("network", "inspect", "bridge")
-	c.Assert(err, check.NotNil, check.Commentf("\"bridge\" network should not be present if daemon started with --bridge=none"))
-	c.Assert(strings.Contains(out, "No such network"), check.Equals, true)
-}
-
-func createInterface(c *check.C, ifType string, ifName string, ipNet string) (string, error) {
-	args := []string{"link", "add", "name", ifName, "type", ifType}
-	ipLinkCmd := exec.Command("ip", args...)
-	out, _, err := runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-
-	ifCfgCmd := exec.Command("ifconfig", ifName, ipNet, "up")
-	out, _, err = runCommandWithOutput(ifCfgCmd)
-	return out, err
-}
-
-func deleteInterface(c *check.C, ifName string) {
-	ifCmd := exec.Command("ip", "link", "delete", ifName)
-	out, _, err := runCommandWithOutput(ifCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	flushCmd := exec.Command("iptables", "-t", "nat", "--flush")
-	out, _, err = runCommandWithOutput(flushCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	flushCmd = exec.Command("iptables", "--flush")
-	out, _, err = runCommandWithOutput(flushCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeIP(c *check.C) {
-	// TestDaemonBridgeIP Steps
-	// 1. Delete the existing docker0 Bridge
-	// 2. Set --bip daemon configuration and start the new Docker Daemon
-	// 3. Check if the bip config has taken effect using ifconfig and iptables commands
-	// 4. Launch a Container and make sure the IP-Address is in the expected subnet
-	// 5. Delete the docker0 Bridge
-	// 6. Restart the Docker Daemon (via deferred action)
-	//    This Restart takes care of bringing docker0 interface back to auto-assigned IP
-
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	d := s.d
-
-	bridgeIP := "192.169.1.1/24"
-	ip, bridgeIPNet, _ := net.ParseCIDR(bridgeIP)
-
-	err := d.StartWithBusybox("--bip", bridgeIP)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	ifconfigSearchString := ip.String()
-	ifconfigCmd := exec.Command("ifconfig", defaultNetworkBridge)
-	out, _, _, err := runCommandWithStdoutStderr(ifconfigCmd)
-	c.Assert(err, check.IsNil)
-
-	c.Assert(strings.Contains(out, ifconfigSearchString), check.Equals, true,
-		check.Commentf("ifconfig output should have contained %q, but was %q",
-			ifconfigSearchString, out))
-
-	ipTablesSearchString := bridgeIPNet.String()
-	ipTablesCmd := exec.Command("iptables", "-t", "nat", "-nvL")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	c.Assert(err, check.IsNil)
-
-	c.Assert(strings.Contains(out, ipTablesSearchString), check.Equals, true,
-		check.Commentf("iptables output should have contained %q, but was %q",
-			ipTablesSearchString, out))
-
-	out, err = d.Cmd("run", "-d", "--name", "test", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	containerIP := d.findContainerIP("test")
-	ip = net.ParseIP(containerIP)
-	c.Assert(bridgeIPNet.Contains(ip), check.Equals, true,
-		check.Commentf("Container IP-Address must be in the same subnet range : %s",
-			containerIP))
-	deleteInterface(c, defaultNetworkBridge)
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithBridgeIPChange(c *check.C) {
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-	defer s.d.Restart()
-	if err := s.d.Stop(); err != nil {
-		c.Fatalf("Could not stop daemon: %v", err)
-	}
-
-	// now we will change the docker0's IP and then try starting the daemon
-	bridgeIP := "192.169.100.1/24"
-	_, bridgeIPNet, _ := net.ParseCIDR(bridgeIP)
-
-	ipCmd := exec.Command("ifconfig", "docker0", bridgeIP)
-	stdout, stderr, _, err := runCommandWithStdoutStderr(ipCmd)
-	if err != nil {
-		c.Fatalf("failed to change docker0's IP association: %v, stdout: %q, stderr: %q", err, stdout, stderr)
-	}
-
-	if err := s.d.Start("--bip", bridgeIP); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-
-	//check if the iptables contains new bridgeIP MASQUERADE rule
-	ipTablesSearchString := bridgeIPNet.String()
-	ipTablesCmd := exec.Command("iptables", "-t", "nat", "-nvL")
-	out, _, err := runCommandWithOutput(ipTablesCmd)
-	if err != nil {
-		c.Fatalf("Could not run iptables -nvL: %s, %v", out, err)
-	}
-	if !strings.Contains(out, ipTablesSearchString) {
-		c.Fatalf("iptables output should have contained new MASQUERADE rule with IP %q, but was %q", ipTablesSearchString, out)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr(c *check.C) {
-	d := s.d
-
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.1.1/24"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	args := []string{"--bridge", bridgeName, "--fixed-cidr", "192.169.1.0/30"}
-	err = d.StartWithBusybox(args...)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	for i := 0; i < 4; i++ {
-		cName := "Container" + strconv.Itoa(i)
-		out, err := d.Cmd("run", "-d", "--name", cName, "busybox", "top")
-		if err != nil {
-			c.Assert(strings.Contains(out, "no available IPv4 addresses"), check.Equals, true,
-				check.Commentf("Could not run a Container : %s %s", err.Error(), out))
-		}
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeFixedCidr2(c *check.C) {
-	d := s.d
-
-	bridgeName := "external-bridge"
-	bridgeIP := "10.2.2.1/16"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	err = d.StartWithBusybox("--bip", bridgeIP, "--fixed-cidr", "10.2.2.0/24")
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	out, err = d.Cmd("run", "-d", "--name", "bb", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	defer d.Cmd("stop", "bb")
-
-	out, err = d.Cmd("exec", "bb", "/bin/sh", "-c", "ifconfig eth0 | awk '/inet addr/{print substr($2,6)}'")
-	c.Assert(out, checker.Equals, "10.2.2.0\n")
-
-	out, err = d.Cmd("run", "--rm", "busybox", "/bin/sh", "-c", "ifconfig eth0 | awk '/inet addr/{print substr($2,6)}'")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Equals, "10.2.2.2\n")
-}
-
-func (s *DockerDaemonSuite) TestDaemonBridgeFixedCIDREqualBridgeNetwork(c *check.C) {
-	d := s.d
-
-	bridgeName := "external-bridge"
-	bridgeIP := "172.27.42.1/16"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	err = d.StartWithBusybox("--bridge", bridgeName, "--fixed-cidr", bridgeIP)
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	out, err = d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	cid1 := strings.TrimSpace(out)
-	defer d.Cmd("stop", cid1)
-}
-
-func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4Implicit(c *check.C) {
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	d := s.d
-
-	bridgeIP := "192.169.1.1"
-	bridgeIPNet := fmt.Sprintf("%s/24", bridgeIP)
-
-	err := d.StartWithBusybox("--bip", bridgeIPNet)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	expectedMessage := fmt.Sprintf("default via %s dev", bridgeIP)
-	out, err := d.Cmd("run", "busybox", "ip", "-4", "route", "list", "0/0")
-	c.Assert(strings.Contains(out, expectedMessage), check.Equals, true,
-		check.Commentf("Implicit default gateway should be bridge IP %s, but default route was '%s'",
-			bridgeIP, strings.TrimSpace(out)))
-	deleteInterface(c, defaultNetworkBridge)
-}
-
-func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4Explicit(c *check.C) {
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	d := s.d
-
-	bridgeIP := "192.169.1.1"
-	bridgeIPNet := fmt.Sprintf("%s/24", bridgeIP)
-	gatewayIP := "192.169.1.254"
-
-	err := d.StartWithBusybox("--bip", bridgeIPNet, "--default-gateway", gatewayIP)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	expectedMessage := fmt.Sprintf("default via %s dev", gatewayIP)
-	out, err := d.Cmd("run", "busybox", "ip", "-4", "route", "list", "0/0")
-	c.Assert(strings.Contains(out, expectedMessage), check.Equals, true,
-		check.Commentf("Explicit default gateway should be %s, but default route was '%s'",
-			gatewayIP, strings.TrimSpace(out)))
-	deleteInterface(c, defaultNetworkBridge)
-}
-
-func (s *DockerDaemonSuite) TestDaemonDefaultGatewayIPv4ExplicitOutsideContainerSubnet(c *check.C) {
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	// Program a custom default gateway outside of the container subnet, daemon should accept it and start
-	err := s.d.StartWithBusybox("--bip", "172.16.0.10/16", "--fixed-cidr", "172.16.1.0/24", "--default-gateway", "172.16.0.254")
-	c.Assert(err, check.IsNil)
-
-	deleteInterface(c, defaultNetworkBridge)
-	s.d.Restart()
-}
-
-func (s *DockerDaemonSuite) TestDaemonDefaultNetworkInvalidClusterConfig(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-
-	// Start daemon without docker0 bridge
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	discoveryBackend := "consul://consuladdr:consulport/some/path"
-	err := s.d.Start(fmt.Sprintf("--cluster-store=%s", discoveryBackend))
-	c.Assert(err, checker.IsNil)
-
-	// Start daemon with docker0 bridge
-	result := icmd.RunCommand("ifconfig", defaultNetworkBridge)
-	c.Assert(result, icmd.Matches, icmd.Success)
-
-	err = s.d.Restart(fmt.Sprintf("--cluster-store=%s", discoveryBackend))
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonIP(c *check.C) {
-	d := s.d
-
-	ipStr := "192.170.1.1/24"
-	ip, _, _ := net.ParseCIDR(ipStr)
-	args := []string{"--ip", ip.String()}
-	err := d.StartWithBusybox(args...)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	out, err := d.Cmd("run", "-d", "-p", "8000:8000", "busybox", "top")
-	c.Assert(err, check.NotNil,
-		check.Commentf("Running a container must fail with an invalid --ip option"))
-	c.Assert(strings.Contains(out, "Error starting userland proxy"), check.Equals, true)
-
-	ifName := "dummy"
-	out, err = createInterface(c, "dummy", ifName, ipStr)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, ifName)
-
-	_, err = d.Cmd("run", "-d", "-p", "8000:8000", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	ipTablesCmd := exec.Command("iptables", "-t", "nat", "-nvL")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	c.Assert(err, check.IsNil)
-
-	regex := fmt.Sprintf("DNAT.*%s.*dpt:8000", ip.String())
-	matched, _ := regexp.MatchString(regex, out)
-	c.Assert(matched, check.Equals, true,
-		check.Commentf("iptables output should have contained %q, but was %q", regex, out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonICCPing(c *check.C) {
-	testRequires(c, bridgeNfIptables)
-	d := s.d
-
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.1.1/24"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	args := []string{"--bridge", bridgeName, "--icc=false"}
-	err = d.StartWithBusybox(args...)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	ipTablesCmd := exec.Command("iptables", "-nvL", "FORWARD")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	c.Assert(err, check.IsNil)
-
-	regex := fmt.Sprintf("DROP.*all.*%s.*%s", bridgeName, bridgeName)
-	matched, _ := regexp.MatchString(regex, out)
-	c.Assert(matched, check.Equals, true,
-		check.Commentf("iptables output should have contained %q, but was %q", regex, out))
-
-	// Pinging another container must fail with --icc=false
-	pingContainers(c, d, true)
-
-	ipStr := "192.171.1.1/24"
-	ip, _, _ := net.ParseCIDR(ipStr)
-	ifName := "icc-dummy"
-
-	createInterface(c, "dummy", ifName, ipStr)
-
-	// But, Pinging external or a Host interface must succeed
-	pingCmd := fmt.Sprintf("ping -c 1 %s -W 1", ip.String())
-	runArgs := []string{"run", "--rm", "busybox", "sh", "-c", pingCmd}
-	_, err = d.Cmd(runArgs...)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonICCLinkExpose(c *check.C) {
-	d := s.d
-
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.1.1/24"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	args := []string{"--bridge", bridgeName, "--icc=false"}
-	err = d.StartWithBusybox(args...)
-	c.Assert(err, check.IsNil)
-	defer d.Restart()
-
-	ipTablesCmd := exec.Command("iptables", "-nvL", "FORWARD")
-	out, _, err = runCommandWithOutput(ipTablesCmd)
-	c.Assert(err, check.IsNil)
-
-	regex := fmt.Sprintf("DROP.*all.*%s.*%s", bridgeName, bridgeName)
-	matched, _ := regexp.MatchString(regex, out)
-	c.Assert(matched, check.Equals, true,
-		check.Commentf("iptables output should have contained %q, but was %q", regex, out))
-
-	out, err = d.Cmd("run", "-d", "--expose", "4567", "--name", "icc1", "busybox", "nc", "-l", "-p", "4567")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("run", "--link", "icc1:icc1", "busybox", "nc", "icc1", "4567")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonLinksIpTablesRulesWhenLinkAndUnlink(c *check.C) {
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.1.1/24"
-
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	err = s.d.StartWithBusybox("--bridge", bridgeName, "--icc=false")
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	_, err = s.d.Cmd("run", "-d", "--name", "child", "--publish", "8080:80", "busybox", "top")
-	c.Assert(err, check.IsNil)
-	_, err = s.d.Cmd("run", "-d", "--name", "parent", "--link", "child:http", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	childIP := s.d.findContainerIP("child")
-	parentIP := s.d.findContainerIP("parent")
-
-	sourceRule := []string{"-i", bridgeName, "-o", bridgeName, "-p", "tcp", "-s", childIP, "--sport", "80", "-d", parentIP, "-j", "ACCEPT"}
-	destinationRule := []string{"-i", bridgeName, "-o", bridgeName, "-p", "tcp", "-s", parentIP, "--dport", "80", "-d", childIP, "-j", "ACCEPT"}
-	if !iptables.Exists("filter", "DOCKER", sourceRule...) || !iptables.Exists("filter", "DOCKER", destinationRule...) {
-		c.Fatal("Iptables rules not found")
-	}
-
-	s.d.Cmd("rm", "--link", "parent/http")
-	if iptables.Exists("filter", "DOCKER", sourceRule...) || iptables.Exists("filter", "DOCKER", destinationRule...) {
-		c.Fatal("Iptables rules should be removed when unlink")
-	}
-
-	s.d.Cmd("kill", "child")
-	s.d.Cmd("kill", "parent")
-}
-
-func (s *DockerDaemonSuite) TestDaemonUlimitDefaults(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	if err := s.d.StartWithBusybox("--default-ulimit", "nofile=42:42", "--default-ulimit", "nproc=1024:1024"); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := s.d.Cmd("run", "--ulimit", "nproc=2048", "--name=test", "busybox", "/bin/sh", "-c", "echo $(ulimit -n); echo $(ulimit -p)")
-	if err != nil {
-		c.Fatal(out, err)
-	}
-
-	outArr := strings.Split(out, "\n")
-	if len(outArr) < 2 {
-		c.Fatalf("got unexpected output: %s", out)
-	}
-	nofile := strings.TrimSpace(outArr[0])
-	nproc := strings.TrimSpace(outArr[1])
-
-	if nofile != "42" {
-		c.Fatalf("expected `ulimit -n` to be `42`, got: %s", nofile)
-	}
-	if nproc != "2048" {
-		c.Fatalf("exepcted `ulimit -p` to be 2048, got: %s", nproc)
-	}
-
-	// Now restart daemon with a new default
-	if err := s.d.Restart("--default-ulimit", "nofile=43"); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err = s.d.Cmd("start", "-a", "test")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	outArr = strings.Split(out, "\n")
-	if len(outArr) < 2 {
-		c.Fatalf("got unexpected output: %s", out)
-	}
-	nofile = strings.TrimSpace(outArr[0])
-	nproc = strings.TrimSpace(outArr[1])
-
-	if nofile != "43" {
-		c.Fatalf("expected `ulimit -n` to be `43`, got: %s", nofile)
-	}
-	if nproc != "2048" {
-		c.Fatalf("exepcted `ulimit -p` to be 2048, got: %s", nproc)
-	}
-}
-
-// #11315
-func (s *DockerDaemonSuite) TestDaemonRestartRenameContainer(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-
-	if out, err := s.d.Cmd("run", "--name=test", "busybox"); err != nil {
-		c.Fatal(err, out)
-	}
-
-	if out, err := s.d.Cmd("rename", "test", "test2"); err != nil {
-		c.Fatal(err, out)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	if out, err := s.d.Cmd("start", "test2"); err != nil {
-		c.Fatal(err, out)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLoggingDriverDefault(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := s.d.Cmd("run", "--name=test", "busybox", "echo", "testline")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	id, err := s.d.getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	logPath := filepath.Join(s.d.root, "containers", id, id+"-json.log")
-
-	if _, err := os.Stat(logPath); err != nil {
-		c.Fatal(err)
-	}
-	f, err := os.Open(logPath)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer f.Close()
-
-	var res struct {
-		Log    string    `json:"log"`
-		Stream string    `json:"stream"`
-		Time   time.Time `json:"time"`
-	}
-	if err := json.NewDecoder(f).Decode(&res); err != nil {
-		c.Fatal(err)
-	}
-	if res.Log != "testline\n" {
-		c.Fatalf("Unexpected log line: %q, expected: %q", res.Log, "testline\n")
-	}
-	if res.Stream != "stdout" {
-		c.Fatalf("Unexpected stream: %q, expected: %q", res.Stream, "stdout")
-	}
-	if !time.Now().After(res.Time) {
-		c.Fatalf("Log time %v in future", res.Time)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLoggingDriverDefaultOverride(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := s.d.Cmd("run", "--name=test", "--log-driver=none", "busybox", "echo", "testline")
-	if err != nil {
-		c.Fatal(out, err)
-	}
-	id, err := s.d.getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	logPath := filepath.Join(s.d.root, "containers", id, id+"-json.log")
-
-	if _, err := os.Stat(logPath); err == nil || !os.IsNotExist(err) {
-		c.Fatalf("%s shouldn't exits, error on Stat: %s", logPath, err)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLoggingDriverNone(c *check.C) {
-	if err := s.d.StartWithBusybox("--log-driver=none"); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := s.d.Cmd("run", "--name=test", "busybox", "echo", "testline")
-	if err != nil {
-		c.Fatal(out, err)
-	}
-	id, err := s.d.getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	logPath := filepath.Join(s.d.folder, "graph", "containers", id, id+"-json.log")
-
-	if _, err := os.Stat(logPath); err == nil || !os.IsNotExist(err) {
-		c.Fatalf("%s shouldn't exits, error on Stat: %s", logPath, err)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLoggingDriverNoneOverride(c *check.C) {
-	if err := s.d.StartWithBusybox("--log-driver=none"); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := s.d.Cmd("run", "--name=test", "--log-driver=json-file", "busybox", "echo", "testline")
-	if err != nil {
-		c.Fatal(out, err)
-	}
-	id, err := s.d.getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	logPath := filepath.Join(s.d.root, "containers", id, id+"-json.log")
-
-	if _, err := os.Stat(logPath); err != nil {
-		c.Fatal(err)
-	}
-	f, err := os.Open(logPath)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer f.Close()
-
-	var res struct {
-		Log    string    `json:"log"`
-		Stream string    `json:"stream"`
-		Time   time.Time `json:"time"`
-	}
-	if err := json.NewDecoder(f).Decode(&res); err != nil {
-		c.Fatal(err)
-	}
-	if res.Log != "testline\n" {
-		c.Fatalf("Unexpected log line: %q, expected: %q", res.Log, "testline\n")
-	}
-	if res.Stream != "stdout" {
-		c.Fatalf("Unexpected stream: %q, expected: %q", res.Stream, "stdout")
-	}
-	if !time.Now().After(res.Time) {
-		c.Fatalf("Log time %v in future", res.Time)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonLoggingDriverNoneLogsError(c *check.C) {
-	c.Assert(s.d.StartWithBusybox("--log-driver=none"), checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--name=test", "busybox", "echo", "testline")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("logs", "test")
-	c.Assert(err, check.NotNil, check.Commentf("Logs should fail with 'none' driver"))
-	expected := `"logs" command is supported only for "json-file" and "journald" logging drivers (got: none)`
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerDaemonSuite) TestDaemonUnixSockCleanedUp(c *check.C) {
-	dir, err := ioutil.TempDir("", "socket-cleanup-test")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	sockPath := filepath.Join(dir, "docker.sock")
-	if err := s.d.Start("--host", "unix://"+sockPath); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := os.Stat(sockPath); err != nil {
-		c.Fatal("socket does not exist")
-	}
-
-	if err := s.d.Stop(); err != nil {
-		c.Fatal(err)
-	}
-
-	if _, err := os.Stat(sockPath); err == nil || !os.IsNotExist(err) {
-		c.Fatal("unix socket is not cleaned up")
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonWithWrongkey(c *check.C) {
-	type Config struct {
-		Crv string `json:"crv"`
-		D   string `json:"d"`
-		Kid string `json:"kid"`
-		Kty string `json:"kty"`
-		X   string `json:"x"`
-		Y   string `json:"y"`
-	}
-
-	os.Remove("/etc/docker/key.json")
-	if err := s.d.Start(); err != nil {
-		c.Fatalf("Failed to start daemon: %v", err)
-	}
-
-	if err := s.d.Stop(); err != nil {
-		c.Fatalf("Could not stop daemon: %v", err)
-	}
-
-	config := &Config{}
-	bytes, err := ioutil.ReadFile("/etc/docker/key.json")
-	if err != nil {
-		c.Fatalf("Error reading key.json file: %s", err)
-	}
-
-	// byte[] to Data-Struct
-	if err := json.Unmarshal(bytes, &config); err != nil {
-		c.Fatalf("Error Unmarshal: %s", err)
-	}
-
-	//replace config.Kid with the fake value
-	config.Kid = "VSAJ:FUYR:X3H2:B2VZ:KZ6U:CJD5:K7BX:ZXHY:UZXT:P4FT:MJWG:HRJ4"
-
-	// NEW Data-Struct to byte[]
-	newBytes, err := json.Marshal(&config)
-	if err != nil {
-		c.Fatalf("Error Marshal: %s", err)
-	}
-
-	// write back
-	if err := ioutil.WriteFile("/etc/docker/key.json", newBytes, 0400); err != nil {
-		c.Fatalf("Error ioutil.WriteFile: %s", err)
-	}
-
-	defer os.Remove("/etc/docker/key.json")
-
-	if err := s.d.Start(); err == nil {
-		c.Fatalf("It should not be successful to start daemon with wrong key: %v", err)
-	}
-
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-
-	if !strings.Contains(string(content), "Public Key ID does not match") {
-		c.Fatalf("Missing KeyID message from daemon logs: %s", string(content))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartKillWait(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	out, err := s.d.Cmd("run", "-id", "busybox", "/bin/cat")
-	if err != nil {
-		c.Fatalf("Could not run /bin/cat: err=%v\n%s", err, out)
-	}
-	containerID := strings.TrimSpace(out)
-
-	if out, err := s.d.Cmd("kill", containerID); err != nil {
-		c.Fatalf("Could not kill %s: err=%v\n%s", containerID, err, out)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatalf("Could not restart daemon: %v", err)
-	}
-
-	errchan := make(chan error)
-	go func() {
-		if out, err := s.d.Cmd("wait", containerID); err != nil {
-			errchan <- fmt.Errorf("%v:\n%s", err, out)
-		}
-		close(errchan)
-	}()
-
-	select {
-	case <-time.After(5 * time.Second):
-		c.Fatal("Waiting on a stopped (killed) container timed out")
-	case err := <-errchan:
-		if err != nil {
-			c.Fatal(err)
-		}
-	}
-}
-
-// TestHTTPSInfo connects via two-way authenticated HTTPS to the info endpoint
-func (s *DockerDaemonSuite) TestHTTPSInfo(c *check.C) {
-	const (
-		testDaemonHTTPSAddr = "tcp://localhost:4271"
-	)
-
-	if err := s.d.Start("--tlsverify", "--tlscacert", "fixtures/https/ca.pem", "--tlscert", "fixtures/https/server-cert.pem",
-		"--tlskey", "fixtures/https/server-key.pem", "-H", testDaemonHTTPSAddr); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	args := []string{
-		"--host", testDaemonHTTPSAddr,
-		"--tlsverify", "--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-cert.pem",
-		"--tlskey", "fixtures/https/client-key.pem",
-		"info",
-	}
-	out, err := s.d.Cmd(args...)
-	if err != nil {
-		c.Fatalf("Error Occurred: %s and output: %s", err, out)
-	}
-}
-
-// TestHTTPSRun connects via two-way authenticated HTTPS to the create, attach, start, and wait endpoints.
-// https://github.com/docker/docker/issues/19280
-func (s *DockerDaemonSuite) TestHTTPSRun(c *check.C) {
-	const (
-		testDaemonHTTPSAddr = "tcp://localhost:4271"
-	)
-
-	if err := s.d.StartWithBusybox("--tlsverify", "--tlscacert", "fixtures/https/ca.pem", "--tlscert", "fixtures/https/server-cert.pem",
-		"--tlskey", "fixtures/https/server-key.pem", "-H", testDaemonHTTPSAddr); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	args := []string{
-		"--host", testDaemonHTTPSAddr,
-		"--tlsverify", "--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-cert.pem",
-		"--tlskey", "fixtures/https/client-key.pem",
-		"run", "busybox", "echo", "TLS response",
-	}
-	out, err := s.d.Cmd(args...)
-	if err != nil {
-		c.Fatalf("Error Occurred: %s and output: %s", err, out)
-	}
-
-	if !strings.Contains(out, "TLS response") {
-		c.Fatalf("expected output to include `TLS response`, got %v", out)
-	}
-}
-
-// TestTLSVerify verifies that --tlsverify=false turns on tls
-func (s *DockerDaemonSuite) TestTLSVerify(c *check.C) {
-	out, err := exec.Command(dockerdBinary, "--tlsverify=false").CombinedOutput()
-	if err == nil || !strings.Contains(string(out), "Could not load X509 key pair") {
-		c.Fatalf("Daemon should not have started due to missing certs: %v\n%s", err, string(out))
-	}
-}
-
-// TestHTTPSInfoRogueCert connects via two-way authenticated HTTPS to the info endpoint
-// by using a rogue client certificate and checks that it fails with the expected error.
-func (s *DockerDaemonSuite) TestHTTPSInfoRogueCert(c *check.C) {
-	const (
-		errBadCertificate   = "bad certificate"
-		testDaemonHTTPSAddr = "tcp://localhost:4271"
-	)
-
-	if err := s.d.Start("--tlsverify", "--tlscacert", "fixtures/https/ca.pem", "--tlscert", "fixtures/https/server-cert.pem",
-		"--tlskey", "fixtures/https/server-key.pem", "-H", testDaemonHTTPSAddr); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	args := []string{
-		"--host", testDaemonHTTPSAddr,
-		"--tlsverify", "--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-rogue-cert.pem",
-		"--tlskey", "fixtures/https/client-rogue-key.pem",
-		"info",
-	}
-	out, err := s.d.Cmd(args...)
-	if err == nil || !strings.Contains(out, errBadCertificate) {
-		c.Fatalf("Expected err: %s, got instead: %s and output: %s", errBadCertificate, err, out)
-	}
-}
-
-// TestHTTPSInfoRogueServerCert connects via two-way authenticated HTTPS to the info endpoint
-// which provides a rogue server certificate and checks that it fails with the expected error
-func (s *DockerDaemonSuite) TestHTTPSInfoRogueServerCert(c *check.C) {
-	const (
-		errCaUnknown             = "x509: certificate signed by unknown authority"
-		testDaemonRogueHTTPSAddr = "tcp://localhost:4272"
-	)
-	if err := s.d.Start("--tlsverify", "--tlscacert", "fixtures/https/ca.pem", "--tlscert", "fixtures/https/server-rogue-cert.pem",
-		"--tlskey", "fixtures/https/server-rogue-key.pem", "-H", testDaemonRogueHTTPSAddr); err != nil {
-		c.Fatalf("Could not start daemon with busybox: %v", err)
-	}
-
-	args := []string{
-		"--host", testDaemonRogueHTTPSAddr,
-		"--tlsverify", "--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-rogue-cert.pem",
-		"--tlskey", "fixtures/https/client-rogue-key.pem",
-		"info",
-	}
-	out, err := s.d.Cmd(args...)
-	if err == nil || !strings.Contains(out, errCaUnknown) {
-		c.Fatalf("Expected err: %s, got instead: %s and output: %s", errCaUnknown, err, out)
-	}
-}
-
-func pingContainers(c *check.C, d *Daemon, expectFailure bool) {
-	var dargs []string
-	if d != nil {
-		dargs = []string{"--host", d.sock()}
-	}
-
-	args := append(dargs, "run", "-d", "--name", "container1", "busybox", "top")
-	dockerCmd(c, args...)
-
-	args = append(dargs, "run", "--rm", "--link", "container1:alias1", "busybox", "sh", "-c")
-	pingCmd := "ping -c 1 %s -W 1"
-	args = append(args, fmt.Sprintf(pingCmd, "alias1"))
-	_, _, err := dockerCmdWithError(args...)
-
-	if expectFailure {
-		c.Assert(err, check.NotNil)
-	} else {
-		c.Assert(err, check.IsNil)
-	}
-
-	args = append(dargs, "rm", "-f", "container1")
-	dockerCmd(c, args...)
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithSocketAsVolume(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), check.IsNil)
-
-	socket := filepath.Join(s.d.folder, "docker.sock")
-
-	out, err := s.d.Cmd("run", "--restart=always", "-v", socket+":/sock", "busybox")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(s.d.Restart(), check.IsNil)
-}
-
-// os.Kill should kill daemon ungracefully, leaving behind container mounts.
-// A subsequent daemon restart shoud clean up said mounts.
-func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonAndContainerKill(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	id := strings.TrimSpace(out)
-	c.Assert(s.d.cmd.Process.Signal(os.Kill), check.IsNil)
-	mountOut, err := ioutil.ReadFile("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))
-
-	// container mounts should exist even after daemon has crashed.
-	comment := check.Commentf("%s should stay mounted from older daemon start:\nDaemon root repository %s\n%s", id, s.d.folder, mountOut)
-	c.Assert(strings.Contains(string(mountOut), id), check.Equals, true, comment)
-
-	// kill the container
-	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", id)
-	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
-		c.Fatalf("Failed to run ctr, ExitCode: %d, err: %v output: %s id: %s\n", ec, err, out, id)
-	}
-
-	// restart daemon.
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	// Now, container mounts should be gone.
-	mountOut, err = ioutil.ReadFile("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))
-	comment = check.Commentf("%s is still mounted from older daemon start:\nDaemon root repository %s\n%s", id, s.d.folder, mountOut)
-	c.Assert(strings.Contains(string(mountOut), id), check.Equals, false, comment)
-}
-
-// os.Interrupt should perform a graceful daemon shutdown and hence cleanup mounts.
-func (s *DockerDaemonSuite) TestCleanupMountsAfterGracefulShutdown(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	id := strings.TrimSpace(out)
-
-	// Send SIGINT and daemon should clean up
-	c.Assert(s.d.cmd.Process.Signal(os.Interrupt), check.IsNil)
-	// Wait for the daemon to stop.
-	c.Assert(<-s.d.wait, checker.IsNil)
-
-	mountOut, err := ioutil.ReadFile("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))
-
-	comment := check.Commentf("%s is still mounted from older daemon start:\nDaemon root repository %s\n%s", id, s.d.folder, mountOut)
-	c.Assert(strings.Contains(string(mountOut), id), check.Equals, false, comment)
-}
-
-func (s *DockerDaemonSuite) TestRunContainerWithBridgeNone(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	c.Assert(s.d.StartWithBusybox("-b", "none"), check.IsNil)
-
-	out, err := s.d.Cmd("run", "--rm", "busybox", "ip", "l")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(strings.Contains(out, "eth0"), check.Equals, false,
-		check.Commentf("There shouldn't be eth0 in container in default(bridge) mode when bridge network is disabled: %s", out))
-
-	out, err = s.d.Cmd("run", "--rm", "--net=bridge", "busybox", "ip", "l")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(strings.Contains(out, "eth0"), check.Equals, false,
-		check.Commentf("There shouldn't be eth0 in container in bridge mode when bridge network is disabled: %s", out))
-	// the extra grep and awk clean up the output of `ip` to only list the number and name of
-	// interfaces, allowing for different versions of ip (e.g. inside and outside the container) to
-	// be used while still verifying that the interface list is the exact same
-	cmd := exec.Command("sh", "-c", "ip l | grep -E '^[0-9]+:' | awk -F: ' { print $1\":\"$2 } '")
-	stdout := bytes.NewBuffer(nil)
-	cmd.Stdout = stdout
-	if err := cmd.Run(); err != nil {
-		c.Fatal("Failed to get host network interface")
-	}
-	out, err = s.d.Cmd("run", "--rm", "--net=host", "busybox", "sh", "-c", "ip l | grep -E '^[0-9]+:' | awk -F: ' { print $1\":\"$2 } '")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(out, check.Equals, fmt.Sprintf("%s", stdout),
-		check.Commentf("The network interfaces in container should be the same with host when --net=host when bridge network is disabled: %s", out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithContainerRunning(t *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		t.Fatal(err)
-	}
-	if out, err := s.d.Cmd("run", "-d", "--name", "test", "busybox", "top"); err != nil {
-		t.Fatal(out, err)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		t.Fatal(err)
-	}
-	// Container 'test' should be removed without error
-	if out, err := s.d.Cmd("rm", "test"); err != nil {
-		t.Fatal(out, err)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartCleanupNetns(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-	out, err := s.d.Cmd("run", "--name", "netns", "-d", "busybox", "top")
-	if err != nil {
-		c.Fatal(out, err)
-	}
-
-	// Get sandbox key via inspect
-	out, err = s.d.Cmd("inspect", "--format", "'{{.NetworkSettings.SandboxKey}}'", "netns")
-	if err != nil {
-		c.Fatalf("Error inspecting container: %s, %v", out, err)
-	}
-	fileName := strings.Trim(out, " \r\n'")
-
-	if out, err := s.d.Cmd("stop", "netns"); err != nil {
-		c.Fatal(out, err)
-	}
-
-	// Test if the file still exists
-	out, _, err = runCommandWithOutput(exec.Command("stat", "-c", "%n", fileName))
-	out = strings.TrimSpace(out)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(out, check.Equals, fileName, check.Commentf("Output: %s", out))
-
-	// Remove the container and restart the daemon
-	if out, err := s.d.Cmd("rm", "netns"); err != nil {
-		c.Fatal(out, err)
-	}
-
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	// Test again and see now the netns file does not exist
-	out, _, err = runCommandWithOutput(exec.Command("stat", "-c", "%n", fileName))
-	out = strings.TrimSpace(out)
-	c.Assert(err, check.Not(check.IsNil), check.Commentf("Output: %s", out))
-}
-
-// tests regression detailed in #13964 where DOCKER_TLS_VERIFY env is ignored
-func (s *DockerDaemonSuite) TestDaemonTLSVerifyIssue13964(c *check.C) {
-	host := "tcp://localhost:4271"
-	c.Assert(s.d.Start("-H", host), check.IsNil)
-	cmd := exec.Command(dockerBinary, "-H", host, "info")
-	cmd.Env = []string{"DOCKER_TLS_VERIFY=1", "DOCKER_CERT_PATH=fixtures/https"}
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, check.Not(check.IsNil), check.Commentf("%s", out))
-	c.Assert(strings.Contains(out, "error during connect"), check.Equals, true)
-
-}
-
-func setupV6(c *check.C) {
-	// Hack to get the right IPv6 address on docker0, which has already been created
-	result := icmd.RunCommand("ip", "addr", "add", "fe80::1/64", "dev", "docker0")
-	result.Assert(c, icmd.Expected{})
-}
-
-func teardownV6(c *check.C) {
-	result := icmd.RunCommand("ip", "addr", "del", "fe80::1/64", "dev", "docker0")
-	result.Assert(c, icmd.Expected{})
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithContainerWithRestartPolicyAlways(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--restart", "always", "busybox", "top")
-	c.Assert(err, check.IsNil)
-	id := strings.TrimSpace(out)
-
-	_, err = s.d.Cmd("stop", id)
-	c.Assert(err, check.IsNil)
-	_, err = s.d.Cmd("wait", id)
-	c.Assert(err, check.IsNil)
-
-	out, err = s.d.Cmd("ps", "-q")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, check.Equals, "")
-
-	c.Assert(s.d.Restart(), check.IsNil)
-
-	out, err = s.d.Cmd("ps", "-q")
-	c.Assert(err, check.IsNil)
-	c.Assert(strings.TrimSpace(out), check.Equals, id[:12])
-}
-
-func (s *DockerDaemonSuite) TestDaemonWideLogConfig(c *check.C) {
-	if err := s.d.StartWithBusybox("--log-opt=max-size=1k"); err != nil {
-		c.Fatal(err)
-	}
-	name := "logtest"
-	out, err := s.d.Cmd("run", "-d", "--log-opt=max-file=5", "--name", name, "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s, err: %v", out, err))
-
-	out, err = s.d.Cmd("inspect", "-f", "{{ .HostConfig.LogConfig.Config }}", name)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(out, checker.Contains, "max-size:1k")
-	c.Assert(out, checker.Contains, "max-file:5")
-
-	out, err = s.d.Cmd("inspect", "-f", "{{ .HostConfig.LogConfig.Type }}", name)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "json-file")
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithPausedContainer(c *check.C) {
-	if err := s.d.StartWithBusybox(); err != nil {
-		c.Fatal(err)
-	}
-	if out, err := s.d.Cmd("run", "-i", "-d", "--name", "test", "busybox", "top"); err != nil {
-		c.Fatal(err, out)
-	}
-	if out, err := s.d.Cmd("pause", "test"); err != nil {
-		c.Fatal(err, out)
-	}
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	errchan := make(chan error)
-	go func() {
-		out, err := s.d.Cmd("start", "test")
-		if err != nil {
-			errchan <- fmt.Errorf("%v:\n%s", err, out)
-		}
-		name := strings.TrimSpace(out)
-		if name != "test" {
-			errchan <- fmt.Errorf("Paused container start error on docker daemon restart, expected 'test' but got '%s'", name)
-		}
-		close(errchan)
-	}()
-
-	select {
-	case <-time.After(5 * time.Second):
-		c.Fatal("Waiting on start a container timed out")
-	case err := <-errchan:
-		if err != nil {
-			c.Fatal(err)
-		}
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartRmVolumeInUse(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), check.IsNil)
-
-	out, err := s.d.Cmd("create", "-v", "test:/foo", "busybox")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	c.Assert(s.d.Restart(), check.IsNil)
-
-	out, err = s.d.Cmd("volume", "rm", "test")
-	c.Assert(err, check.NotNil, check.Commentf("should not be able to remove in use volume after daemon restart"))
-	c.Assert(out, checker.Contains, "in use")
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartLocalVolumes(c *check.C) {
-	c.Assert(s.d.Start(), check.IsNil)
-
-	_, err := s.d.Cmd("volume", "create", "test")
-	c.Assert(err, check.IsNil)
-	c.Assert(s.d.Restart(), check.IsNil)
-
-	_, err = s.d.Cmd("volume", "inspect", "test")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonCorruptedLogDriverAddress(c *check.C) {
-	c.Assert(s.d.Start("--log-driver=syslog", "--log-opt", "syslog-address=corrupted:42"), check.NotNil)
-	expected := "Failed to set log opts: syslog-address should be in form proto://address"
-	runCmd := exec.Command("grep", expected, s.d.LogFileName())
-	if out, _, err := runCommandWithOutput(runCmd); err != nil {
-		c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonCorruptedFluentdAddress(c *check.C) {
-	c.Assert(s.d.Start("--log-driver=fluentd", "--log-opt", "fluentd-address=corrupted:c"), check.NotNil)
-	expected := "Failed to set log opts: invalid fluentd-address corrupted:c: "
-	runCmd := exec.Command("grep", expected, s.d.LogFileName())
-	if out, _, err := runCommandWithOutput(runCmd); err != nil {
-		c.Fatalf("Expected %q message; but doesn't exist in log: %q, err: %v", expected, out, err)
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonStartWithoutHost(c *check.C) {
-	s.d.useDefaultHost = true
-	defer func() {
-		s.d.useDefaultHost = false
-	}()
-	c.Assert(s.d.Start(), check.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonStartWithDefalutTLSHost(c *check.C) {
-	s.d.useDefaultTLSHost = true
-	defer func() {
-		s.d.useDefaultTLSHost = false
-	}()
-	if err := s.d.Start(
-		"--tlsverify",
-		"--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/server-cert.pem",
-		"--tlskey", "fixtures/https/server-key.pem"); err != nil {
-		c.Fatalf("Could not start daemon: %v", err)
-	}
-
-	// The client with --tlsverify should also use default host localhost:2376
-	tmpHost := os.Getenv("DOCKER_HOST")
-	defer func() {
-		os.Setenv("DOCKER_HOST", tmpHost)
-	}()
-
-	os.Setenv("DOCKER_HOST", "")
-
-	out, _ := dockerCmd(
-		c,
-		"--tlsverify",
-		"--tlscacert", "fixtures/https/ca.pem",
-		"--tlscert", "fixtures/https/client-cert.pem",
-		"--tlskey", "fixtures/https/client-key.pem",
-		"version",
-	)
-	if !strings.Contains(out, "Server") {
-		c.Fatalf("docker version should return information of server side")
-	}
-}
-
-func (s *DockerDaemonSuite) TestBridgeIPIsExcludedFromAllocatorPool(c *check.C) {
-	defaultNetworkBridge := "docker0"
-	deleteInterface(c, defaultNetworkBridge)
-
-	bridgeIP := "192.169.1.1"
-	bridgeRange := bridgeIP + "/30"
-
-	err := s.d.StartWithBusybox("--bip", bridgeRange)
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	var cont int
-	for {
-		contName := fmt.Sprintf("container%d", cont)
-		_, err = s.d.Cmd("run", "--name", contName, "-d", "busybox", "/bin/sleep", "2")
-		if err != nil {
-			// pool exhausted
-			break
-		}
-		ip, err := s.d.Cmd("inspect", "--format", "'{{.NetworkSettings.IPAddress}}'", contName)
-		c.Assert(err, check.IsNil)
-
-		c.Assert(ip, check.Not(check.Equals), bridgeIP)
-		cont++
-	}
-}
-
-// Test daemon for no space left on device error
-func (s *DockerDaemonSuite) TestDaemonNoSpaceLeftOnDeviceError(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux, Network)
-
-	testDir, err := ioutil.TempDir("", "no-space-left-on-device-test")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(testDir)
-	c.Assert(mount.MakeRShared(testDir), checker.IsNil)
-	defer mount.Unmount(testDir)
-
-	// create a 2MiB image and mount it as graph root
-	// Why in a container? Because `mount` sometimes behaves weirdly and often fails outright on this test in debian:jessie (which is what the test suite runs under if run from the Makefile)
-	dockerCmd(c, "run", "--rm", "-v", testDir+":/test", "busybox", "sh", "-c", "dd of=/test/testfs.img bs=1M seek=2 count=0")
-	out, _, err := runCommandWithOutput(exec.Command("mkfs.ext4", "-F", filepath.Join(testDir, "testfs.img"))) // `mkfs.ext4` is not in busybox
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	cmd := exec.Command("losetup", "-f", "--show", filepath.Join(testDir, "testfs.img"))
-	loout, err := cmd.CombinedOutput()
-	c.Assert(err, checker.IsNil)
-	loopname := strings.TrimSpace(string(loout))
-	defer exec.Command("losetup", "-d", loopname).Run()
-
-	dockerCmd(c, "run", "--privileged", "--rm", "-v", testDir+":/test:shared", "busybox", "sh", "-c", fmt.Sprintf("mkdir -p /test/test-mount && mount -t ext4 -no loop,rw %v /test/test-mount", loopname))
-	defer mount.Unmount(filepath.Join(testDir, "test-mount"))
-
-	err = s.d.Start("--graph", filepath.Join(testDir, "test-mount"))
-	defer s.d.Stop()
-	c.Assert(err, check.IsNil)
-
-	// pull a repository large enough to fill the mount point
-	pullOut, err := s.d.Cmd("pull", "registry:2")
-	c.Assert(err, checker.NotNil, check.Commentf(pullOut))
-	c.Assert(pullOut, checker.Contains, "no space left on device")
-}
-
-// Test daemon restart with container links + auto restart
-func (s *DockerDaemonSuite) TestDaemonRestartContainerLinksRestart(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	parent1Args := []string{}
-	parent2Args := []string{}
-	wg := sync.WaitGroup{}
-	maxChildren := 10
-	chErr := make(chan error, maxChildren)
-
-	for i := 0; i < maxChildren; i++ {
-		wg.Add(1)
-		name := fmt.Sprintf("test%d", i)
-
-		if i < maxChildren/2 {
-			parent1Args = append(parent1Args, []string{"--link", name}...)
-		} else {
-			parent2Args = append(parent2Args, []string{"--link", name}...)
-		}
-
-		go func() {
-			_, err = s.d.Cmd("run", "-d", "--name", name, "--restart=always", "busybox", "top")
-			chErr <- err
-			wg.Done()
-		}()
-	}
-
-	wg.Wait()
-	close(chErr)
-	for err := range chErr {
-		c.Assert(err, check.IsNil)
-	}
-
-	parent1Args = append([]string{"run", "-d"}, parent1Args...)
-	parent1Args = append(parent1Args, []string{"--name=parent1", "--restart=always", "busybox", "top"}...)
-	parent2Args = append([]string{"run", "-d"}, parent2Args...)
-	parent2Args = append(parent2Args, []string{"--name=parent2", "--restart=always", "busybox", "top"}...)
-
-	_, err = s.d.Cmd(parent1Args...)
-	c.Assert(err, check.IsNil)
-	_, err = s.d.Cmd(parent2Args...)
-	c.Assert(err, check.IsNil)
-
-	err = s.d.Stop()
-	c.Assert(err, check.IsNil)
-	// clear the log file -- we don't need any of it but may for the next part
-	// can ignore the error here, this is just a cleanup
-	os.Truncate(s.d.LogFileName(), 0)
-	err = s.d.Start()
-	c.Assert(err, check.IsNil)
-
-	for _, num := range []string{"1", "2"} {
-		out, err := s.d.Cmd("inspect", "-f", "{{ .State.Running }}", "parent"+num)
-		c.Assert(err, check.IsNil)
-		if strings.TrimSpace(out) != "true" {
-			log, _ := ioutil.ReadFile(s.d.LogFileName())
-			c.Fatalf("parent container is not running\n%s", string(log))
-		}
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonCgroupParent(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "test"
-	name := "cgroup-test"
-
-	err := s.d.StartWithBusybox("--cgroup-parent", cgroupParent)
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	out, err := s.d.Cmd("run", "--name", name, "busybox", "cat", "/proc/self/cgroup")
-	c.Assert(err, checker.IsNil)
-	cgroupPaths := parseCgroupPaths(string(out))
-	c.Assert(len(cgroupPaths), checker.Not(checker.Equals), 0, check.Commentf("unexpected output - %q", string(out)))
-	out, err = s.d.Cmd("inspect", "-f", "{{.Id}}", name)
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(string(out))
-	expectedCgroup := path.Join(cgroupParent, id)
-	found := false
-	for _, path := range cgroupPaths {
-		if strings.HasSuffix(path, expectedCgroup) {
-			found = true
-			break
-		}
-	}
-	c.Assert(found, checker.True, check.Commentf("Cgroup path for container (%s) doesn't found in cgroups file: %s", expectedCgroup, cgroupPaths))
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithLinks(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support links
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name=test", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "--name=test2", "--link", "test:abc", "busybox", "sh", "-c", "ping -c 1 -w 1 abc")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	c.Assert(s.d.Restart(), check.IsNil)
-
-	// should fail since test is not running yet
-	out, err = s.d.Cmd("start", "test2")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("start", "test")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("start", "-a", "test2")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(strings.Contains(out, "1 packets transmitted, 1 packets received"), check.Equals, true, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithNames(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support links
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("create", "--name=test", "busybox")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "-d", "--name=test2", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	test2ID := strings.TrimSpace(out)
-
-	out, err = s.d.Cmd("run", "-d", "--name=test3", "--link", "test2:abc", "busybox", "top")
-	test3ID := strings.TrimSpace(out)
-
-	c.Assert(s.d.Restart(), check.IsNil)
-
-	out, err = s.d.Cmd("create", "--name=test", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf("expected error trying to create container with duplicate name"))
-	// this one is no longer needed, removing simplifies the remainder of the test
-	out, err = s.d.Cmd("rm", "-f", "test")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("ps", "-a", "--no-trunc")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	lines := strings.Split(strings.TrimSpace(out), "\n")[1:]
-
-	test2validated := false
-	test3validated := false
-	for _, line := range lines {
-		fields := strings.Fields(line)
-		names := fields[len(fields)-1]
-		switch fields[0] {
-		case test2ID:
-			c.Assert(names, check.Equals, "test2,test3/abc")
-			test2validated = true
-		case test3ID:
-			c.Assert(names, check.Equals, "test3")
-			test3validated = true
-		}
-	}
-
-	c.Assert(test2validated, check.Equals, true)
-	c.Assert(test3validated, check.Equals, true)
-}
-
-// TestDaemonRestartWithKilledRunningContainer requires live restore of running containers
-func (s *DockerDaemonSuite) TestDaemonRestartWithKilledRunningContainer(t *check.C) {
-	// TODO(mlaventure): Not sure what would the exit code be on windows
-	testRequires(t, DaemonIsLinux)
-	if err := s.d.StartWithBusybox(); err != nil {
-		t.Fatal(err)
-	}
-
-	cid, err := s.d.Cmd("run", "-d", "--name", "test", "busybox", "top")
-	defer s.d.Stop()
-	if err != nil {
-		t.Fatal(cid, err)
-	}
-	cid = strings.TrimSpace(cid)
-
-	pid, err := s.d.Cmd("inspect", "-f", "{{.State.Pid}}", cid)
-	t.Assert(err, check.IsNil)
-	pid = strings.TrimSpace(pid)
-
-	// Kill the daemon
-	if err := s.d.Kill(); err != nil {
-		t.Fatal(err)
-	}
-
-	// kill the container
-	runCmd := exec.Command(ctrBinary, "--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock", "containers", "kill", cid)
-	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
-		t.Fatalf("Failed to run ctr, ExitCode: %d, err: '%v' output: '%s' cid: '%s'\n", ec, err, out, cid)
-	}
-
-	// Give time to containerd to process the command if we don't
-	// the exit event might be received after we do the inspect
-	pidCmd := exec.Command("kill", "-0", pid)
-	_, ec, _ := runCommandWithOutput(pidCmd)
-	for ec == 0 {
-		time.Sleep(1 * time.Second)
-		_, ec, _ = runCommandWithOutput(pidCmd)
-	}
-
-	// restart the daemon
-	if err := s.d.Start(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Check that we've got the correct exit code
-	out, err := s.d.Cmd("inspect", "-f", "{{.State.ExitCode}}", cid)
-	t.Assert(err, check.IsNil)
-
-	out = strings.TrimSpace(out)
-	if out != "143" {
-		t.Fatalf("Expected exit code '%s' got '%s' for container '%s'\n", "143", out, cid)
-	}
-
-}
-
-// os.Kill should kill daemon ungracefully, leaving behind live containers.
-// The live containers should be known to the restarted daemon. Stopping
-// them now, should remove the mounts.
-func (s *DockerDaemonSuite) TestCleanupMountsAfterDaemonCrash(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	c.Assert(s.d.StartWithBusybox("--live-restore"), check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	id := strings.TrimSpace(out)
-
-	c.Assert(s.d.cmd.Process.Signal(os.Kill), check.IsNil)
-	mountOut, err := ioutil.ReadFile("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))
-
-	// container mounts should exist even after daemon has crashed.
-	comment := check.Commentf("%s should stay mounted from older daemon start:\nDaemon root repository %s\n%s", id, s.d.folder, mountOut)
-	c.Assert(strings.Contains(string(mountOut), id), check.Equals, true, comment)
-
-	// restart daemon.
-	if err := s.d.Restart("--live-restore"); err != nil {
-		c.Fatal(err)
-	}
-
-	// container should be running.
-	out, err = s.d.Cmd("inspect", "--format={{.State.Running}}", id)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-	out = strings.TrimSpace(out)
-	if out != "true" {
-		c.Fatalf("Container %s expected to stay alive after daemon restart", id)
-	}
-
-	// 'docker stop' should work.
-	out, err = s.d.Cmd("stop", id)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-
-	// Now, container mounts should be gone.
-	mountOut, err = ioutil.ReadFile("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", mountOut))
-	comment = check.Commentf("%s is still mounted from older daemon start:\nDaemon root repository %s\n%s", id, s.d.folder, mountOut)
-	c.Assert(strings.Contains(string(mountOut), id), check.Equals, false, comment)
-}
-
-// TestDaemonRestartWithUnpausedRunningContainer requires live restore of running containers.
-func (s *DockerDaemonSuite) TestDaemonRestartWithUnpausedRunningContainer(t *check.C) {
-	// TODO(mlaventure): Not sure what would the exit code be on windows
-	testRequires(t, DaemonIsLinux)
-	if err := s.d.StartWithBusybox("--live-restore"); err != nil {
-		t.Fatal(err)
-	}
-
-	cid, err := s.d.Cmd("run", "-d", "--name", "test", "busybox", "top")
-	defer s.d.Stop()
-	if err != nil {
-		t.Fatal(cid, err)
-	}
-	cid = strings.TrimSpace(cid)
-
-	pid, err := s.d.Cmd("inspect", "-f", "{{.State.Pid}}", cid)
-	t.Assert(err, check.IsNil)
-
-	// pause the container
-	if _, err := s.d.Cmd("pause", cid); err != nil {
-		t.Fatal(cid, err)
-	}
-
-	// Kill the daemon
-	if err := s.d.Kill(); err != nil {
-		t.Fatal(err)
-	}
-
-	// resume the container
-	result := icmd.RunCommand(
-		ctrBinary,
-		"--address", "unix:///var/run/docker/libcontainerd/docker-containerd.sock",
-		"containers", "resume", cid)
-	t.Assert(result, icmd.Matches, icmd.Success)
-
-	// Give time to containerd to process the command if we don't
-	// the resume event might be received after we do the inspect
-	waitAndAssert(t, defaultReconciliationTimeout, func(*check.C) (interface{}, check.CommentInterface) {
-		result := icmd.RunCommand("kill", "-0", strings.TrimSpace(pid))
-		return result.ExitCode, nil
-	}, checker.Equals, 0)
-
-	// restart the daemon
-	if err := s.d.Start("--live-restore"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Check that we've got the correct status
-	out, err := s.d.Cmd("inspect", "-f", "{{.State.Status}}", cid)
-	t.Assert(err, check.IsNil)
-
-	out = strings.TrimSpace(out)
-	if out != "running" {
-		t.Fatalf("Expected exit code '%s' got '%s' for container '%s'\n", "running", out, cid)
-	}
-	if _, err := s.d.Cmd("kill", cid); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// TestRunLinksChanged checks that creating a new container with the same name does not update links
-// this ensures that the old, pre gh#16032 functionality continues on
-func (s *DockerDaemonSuite) TestRunLinksChanged(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support links
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name=test", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "--name=test2", "--link=test:abc", "busybox", "sh", "-c", "ping -c 1 abc")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "1 packets transmitted, 1 packets received")
-
-	out, err = s.d.Cmd("rm", "-f", "test")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "-d", "--name=test", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("start", "-a", "test2")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, check.Not(checker.Contains), "1 packets transmitted, 1 packets received")
-
-	err = s.d.Restart()
-	c.Assert(err, check.IsNil)
-	out, err = s.d.Cmd("start", "-a", "test2")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, check.Not(checker.Contains), "1 packets transmitted, 1 packets received")
-}
-
-func (s *DockerDaemonSuite) TestDaemonStartWithoutColors(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotPpc64le)
-
-	infoLog := "\x1b[34mINFO\x1b"
-
-	p, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil)
-	defer func() {
-		tty.Close()
-		p.Close()
-	}()
-
-	b := bytes.NewBuffer(nil)
-	go io.Copy(b, p)
-
-	// Enable coloring explicitly
-	s.d.StartWithLogFile(tty, "--raw-logs=false")
-	s.d.Stop()
-	c.Assert(b.String(), checker.Contains, infoLog)
-
-	b.Reset()
-
-	// Disable coloring explicitly
-	s.d.StartWithLogFile(tty, "--raw-logs=true")
-	s.d.Stop()
-	c.Assert(b.String(), check.Not(checker.Contains), infoLog)
-}
-
-func (s *DockerDaemonSuite) TestDaemonDebugLog(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotPpc64le)
-
-	debugLog := "\x1b[37mDEBU\x1b"
-
-	p, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil)
-	defer func() {
-		tty.Close()
-		p.Close()
-	}()
-
-	b := bytes.NewBuffer(nil)
-	go io.Copy(b, p)
-
-	s.d.StartWithLogFile(tty, "--debug")
-	s.d.Stop()
-	c.Assert(b.String(), checker.Contains, debugLog)
-}
-
-func (s *DockerDaemonSuite) TestDaemonDiscoveryBackendConfigReload(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// daemon config file
-	daemonConfig := `{ "debug" : false }`
-	configFile, err := ioutil.TempFile("", "test-daemon-discovery-backend-config-reload-config")
-	c.Assert(err, checker.IsNil, check.Commentf("could not create temp file for config reload"))
-	configFilePath := configFile.Name()
-	defer func() {
-		configFile.Close()
-		os.RemoveAll(configFile.Name())
-	}()
-
-	_, err = configFile.Write([]byte(daemonConfig))
-	c.Assert(err, checker.IsNil)
-
-	// --log-level needs to be set so that d.Start() doesn't add --debug causing
-	// a conflict with the config
-	err = s.d.Start("--config-file", configFilePath, "--log-level=info")
-	c.Assert(err, checker.IsNil)
-
-	// daemon config file
-	daemonConfig = `{
-	      "cluster-store": "consul://consuladdr:consulport/some/path",
-	      "cluster-advertise": "192.168.56.100:0",
-	      "debug" : false
-	}`
-
-	err = configFile.Truncate(0)
-	c.Assert(err, checker.IsNil)
-	_, err = configFile.Seek(0, os.SEEK_SET)
-	c.Assert(err, checker.IsNil)
-
-	_, err = configFile.Write([]byte(daemonConfig))
-	c.Assert(err, checker.IsNil)
-
-	err = s.d.reloadConfig()
-	c.Assert(err, checker.IsNil, check.Commentf("error reloading daemon config"))
-
-	out, err := s.d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: consul://consuladdr:consulport/some/path"))
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: 192.168.56.100:0"))
-}
-
-// Test for #21956
-func (s *DockerDaemonSuite) TestDaemonLogOptions(c *check.C) {
-	err := s.d.StartWithBusybox("--log-driver=syslog", "--log-opt=syslog-address=udp://127.0.0.1:514")
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--log-driver=json-file", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	out, err = s.d.Cmd("inspect", "--format='{{.HostConfig.LogConfig}}'", id)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "{json-file map[]}")
-}
-
-// Test case for #20936, #22443
-func (s *DockerDaemonSuite) TestDaemonMaxConcurrency(c *check.C) {
-	c.Assert(s.d.Start("--max-concurrent-uploads=6", "--max-concurrent-downloads=8"), check.IsNil)
-
-	expectedMaxConcurrentUploads := `level=debug msg="Max Concurrent Uploads: 6"`
-	expectedMaxConcurrentDownloads := `level=debug msg="Max Concurrent Downloads: 8"`
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-}
-
-// Test case for #20936, #22443
-func (s *DockerDaemonSuite) TestDaemonMaxConcurrencyWithConfigFile(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// daemon config file
-	configFilePath := "test.json"
-	configFile, err := os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(configFilePath)
-
-	daemonConfig := `{ "max-concurrent-downloads" : 8 }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-	c.Assert(s.d.Start(fmt.Sprintf("--config-file=%s", configFilePath)), check.IsNil)
-
-	expectedMaxConcurrentUploads := `level=debug msg="Max Concurrent Uploads: 5"`
-	expectedMaxConcurrentDownloads := `level=debug msg="Max Concurrent Downloads: 8"`
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-
-	configFile, err = os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	daemonConfig = `{ "max-concurrent-uploads" : 7, "max-concurrent-downloads" : 9 }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	time.Sleep(3 * time.Second)
-
-	expectedMaxConcurrentUploads = `level=debug msg="Reset Max Concurrent Uploads: 7"`
-	expectedMaxConcurrentDownloads = `level=debug msg="Reset Max Concurrent Downloads: 9"`
-	content, _ = ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-}
-
-// Test case for #20936, #22443
-func (s *DockerDaemonSuite) TestDaemonMaxConcurrencyWithConfigFileReload(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// daemon config file
-	configFilePath := "test.json"
-	configFile, err := os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(configFilePath)
-
-	daemonConfig := `{ "max-concurrent-uploads" : null }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-	c.Assert(s.d.Start(fmt.Sprintf("--config-file=%s", configFilePath)), check.IsNil)
-
-	expectedMaxConcurrentUploads := `level=debug msg="Max Concurrent Uploads: 5"`
-	expectedMaxConcurrentDownloads := `level=debug msg="Max Concurrent Downloads: 3"`
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-
-	configFile, err = os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	daemonConfig = `{ "max-concurrent-uploads" : 1, "max-concurrent-downloads" : null }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	time.Sleep(3 * time.Second)
-
-	expectedMaxConcurrentUploads = `level=debug msg="Reset Max Concurrent Uploads: 1"`
-	expectedMaxConcurrentDownloads = `level=debug msg="Reset Max Concurrent Downloads: 3"`
-	content, _ = ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-
-	configFile, err = os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	daemonConfig = `{ "labels":["foo=bar"] }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	time.Sleep(3 * time.Second)
-
-	expectedMaxConcurrentUploads = `level=debug msg="Reset Max Concurrent Uploads: 5"`
-	expectedMaxConcurrentDownloads = `level=debug msg="Reset Max Concurrent Downloads: 3"`
-	content, _ = ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentUploads)
-	c.Assert(string(content), checker.Contains, expectedMaxConcurrentDownloads)
-}
-
-func (s *DockerDaemonSuite) TestBuildOnDisabledBridgeNetworkDaemon(c *check.C) {
-	err := s.d.StartWithBusybox("-b=none", "--iptables=false")
-	c.Assert(err, check.IsNil)
-	s.d.c.Logf("dockerBinary %s", dockerBinary)
-	out, code, err := s.d.buildImageWithOut("busyboxs",
-		`FROM busybox
-                RUN cat /etc/hosts`, false)
-	comment := check.Commentf("Failed to build image. output %s, exitCode %d, err %v", out, code, err)
-	c.Assert(err, check.IsNil, comment)
-	c.Assert(code, check.Equals, 0, comment)
-}
-
-// Test case for #21976
-func (s *DockerDaemonSuite) TestDaemonDNSInHostMode(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	err := s.d.StartWithBusybox("--dns", "1.2.3.4")
-	c.Assert(err, checker.IsNil)
-
-	expectedOutput := "nameserver 1.2.3.4"
-	out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-// Test case for #21976
-func (s *DockerDaemonSuite) TestDaemonDNSSearchInHostMode(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	err := s.d.StartWithBusybox("--dns-search", "example.com")
-	c.Assert(err, checker.IsNil)
-
-	expectedOutput := "search example.com"
-	out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-// Test case for #21976
-func (s *DockerDaemonSuite) TestDaemonDNSOptionsInHostMode(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	err := s.d.StartWithBusybox("--dns-opt", "timeout:3")
-	c.Assert(err, checker.IsNil)
-
-	expectedOutput := "options timeout:3"
-	out, _ := s.d.Cmd("run", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-func (s *DockerDaemonSuite) TestRunWithRuntimeFromConfigFile(c *check.C) {
-	conf, err := ioutil.TempFile("", "config-file-")
-	c.Assert(err, check.IsNil)
-	configName := conf.Name()
-	conf.Close()
-	defer os.Remove(configName)
-
-	config := `
-{
-    "runtimes": {
-        "oci": {
-            "path": "docker-runc"
-        },
-        "vm": {
-            "path": "/usr/local/bin/vm-manager",
-            "runtimeArgs": [
-                "--debug"
-            ]
-        }
-    }
-}
-`
-	ioutil.WriteFile(configName, []byte(config), 0644)
-	err = s.d.StartWithBusybox("--config-file", configName)
-	c.Assert(err, check.IsNil)
-
-	// Run with default runtime
-	out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with default runtime explicitly
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with oci (same path as default) but keep it around
-	out, err = s.d.Cmd("run", "--name", "oci-runtime-ls", "--runtime=oci", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with "vm"
-	out, err = s.d.Cmd("run", "--rm", "--runtime=vm", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
-
-	// Reset config to only have the default
-	config = `
-{
-    "runtimes": {
-    }
-}
-`
-	ioutil.WriteFile(configName, []byte(config), 0644)
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-	// Give daemon time to reload config
-	<-time.After(1 * time.Second)
-
-	// Run with default runtime
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with "oci"
-	out, err = s.d.Cmd("run", "--rm", "--runtime=oci", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Unknown runtime specified oci")
-
-	// Start previously created container with oci
-	out, err = s.d.Cmd("start", "oci-runtime-ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Unknown runtime specified oci")
-
-	// Check that we can't override the default runtime
-	config = `
-{
-    "runtimes": {
-        "runc": {
-            "path": "my-runc"
-        }
-    }
-}
-`
-	ioutil.WriteFile(configName, []byte(config), 0644)
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-	// Give daemon time to reload config
-	<-time.After(1 * time.Second)
-
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, `file configuration validation failed (runtime name 'runc' is reserved)`)
-
-	// Check that we can select a default runtime
-	config = `
-{
-    "default-runtime": "vm",
-    "runtimes": {
-        "oci": {
-            "path": "docker-runc"
-        },
-        "vm": {
-            "path": "/usr/local/bin/vm-manager",
-            "runtimeArgs": [
-                "--debug"
-            ]
-        }
-    }
-}
-`
-	ioutil.WriteFile(configName, []byte(config), 0644)
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-	// Give daemon time to reload config
-	<-time.After(1 * time.Second)
-
-	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
-
-	// Run with default runtime explicitly
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestRunWithRuntimeFromCommandLine(c *check.C) {
-	err := s.d.StartWithBusybox("--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
-	c.Assert(err, check.IsNil)
-
-	// Run with default runtime
-	out, err := s.d.Cmd("run", "--rm", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with default runtime explicitly
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with oci (same path as default) but keep it around
-	out, err = s.d.Cmd("run", "--name", "oci-runtime-ls", "--runtime=oci", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with "vm"
-	out, err = s.d.Cmd("run", "--rm", "--runtime=vm", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
-
-	// Start a daemon without any extra runtimes
-	s.d.Stop()
-	err = s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	// Run with default runtime
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Run with "oci"
-	out, err = s.d.Cmd("run", "--rm", "--runtime=oci", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Unknown runtime specified oci")
-
-	// Start previously created container with oci
-	out, err = s.d.Cmd("start", "oci-runtime-ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Unknown runtime specified oci")
-
-	// Check that we can't override the default runtime
-	s.d.Stop()
-	err = s.d.Start("--add-runtime", "runc=my-runc")
-	c.Assert(err, check.NotNil)
-
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, `runtime name 'runc' is reserved`)
-
-	// Check that we can select a default runtime
-	s.d.Stop()
-	err = s.d.StartWithBusybox("--default-runtime=vm", "--add-runtime", "oci=docker-runc", "--add-runtime", "vm=/usr/local/bin/vm-manager")
-	c.Assert(err, check.IsNil)
-
-	out, err = s.d.Cmd("run", "--rm", "busybox", "ls")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "/usr/local/bin/vm-manager: no such file or directory")
-
-	// Run with default runtime explicitly
-	out, err = s.d.Cmd("run", "--rm", "--runtime=runc", "busybox", "ls")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartWithAutoRemoveContainer(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	// top1 will exist after daemon restarts
-	out, err := s.d.Cmd("run", "-d", "--name", "top1", "busybox:latest", "top")
-	c.Assert(err, checker.IsNil, check.Commentf("run top1: %v", out))
-	// top2 will be removed after daemon restarts
-	out, err = s.d.Cmd("run", "-d", "--rm", "--name", "top2", "busybox:latest", "top")
-	c.Assert(err, checker.IsNil, check.Commentf("run top2: %v", out))
-
-	out, err = s.d.Cmd("ps")
-	c.Assert(out, checker.Contains, "top1", check.Commentf("top1 should be running"))
-	c.Assert(out, checker.Contains, "top2", check.Commentf("top2 should be running"))
-
-	// now restart daemon gracefully
-	err = s.d.Restart()
-	c.Assert(err, checker.IsNil)
-
-	out, err = s.d.Cmd("ps", "-a")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	c.Assert(out, checker.Contains, "top1", check.Commentf("top1 should exist after daemon restarts"))
-	c.Assert(out, checker.Not(checker.Contains), "top2", check.Commentf("top2 should be removed after daemon restarts"))
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartSaveContainerExitCode(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	containerName := "error-values"
-	// Make a container with both a non 0 exit code and an error message
-	out, err := s.d.Cmd("run", "--name", containerName, "busybox", "toto")
-	c.Assert(err, checker.NotNil)
-
-	// Check that those values were saved on disk
-	out, err = s.d.Cmd("inspect", "-f", "{{.State.ExitCode}}", containerName)
-	out = strings.TrimSpace(out)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Equals, "127")
-
-	out, err = s.d.Cmd("inspect", "-f", "{{.State.Error}}", containerName)
-	out = strings.TrimSpace(out)
-	c.Assert(err, checker.IsNil)
-
-	// now restart daemon
-	err = s.d.Restart()
-	c.Assert(err, checker.IsNil)
-
-	// Check that those values are still around
-	out, err = s.d.Cmd("inspect", "-f", "{{.State.ExitCode}}", containerName)
-	out = strings.TrimSpace(out)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Equals, "127")
-
-	out, err = s.d.Cmd("inspect", "-f", "{{.State.Error}}", containerName)
-	out = strings.TrimSpace(out)
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerDaemonSuite) TestDaemonBackcompatPre17Volumes(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	d := s.d
-	err := d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	// hack to be able to side-load a container config
-	out, err := d.Cmd("create", "busybox:latest")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	out, err = d.Cmd("inspect", "--type=image", "--format={{.ID}}", "busybox:latest")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(d.Stop(), checker.IsNil)
-	<-d.wait
-
-	imageID := strings.TrimSpace(out)
-	volumeID := stringid.GenerateNonCryptoID()
-	vfsPath := filepath.Join(d.root, "vfs", "dir", volumeID)
-	c.Assert(os.MkdirAll(vfsPath, 0755), checker.IsNil)
-
-	config := []byte(`
-		{
-			"ID": "` + id + `",
-			"Name": "hello",
-			"Driver": "` + d.storageDriver + `",
-			"Image": "` + imageID + `",
-			"Config": {"Image": "busybox:latest"},
-			"NetworkSettings": {},
-			"Volumes": {
-				"/bar":"/foo",
-				"/foo": "` + vfsPath + `",
-				"/quux":"/quux"
-			},
-			"VolumesRW": {
-				"/bar": true,
-				"/foo": true,
-				"/quux": false
-			}
-		}
-	`)
-
-	configPath := filepath.Join(d.root, "containers", id, "config.v2.json")
-	err = ioutil.WriteFile(configPath, config, 600)
-	err = d.Start()
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd("inspect", "--type=container", "--format={{ json .Mounts }}", id)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	type mount struct {
-		Name        string
-		Source      string
-		Destination string
-		Driver      string
-		RW          bool
-	}
-
-	ls := []mount{}
-	err = json.NewDecoder(strings.NewReader(out)).Decode(&ls)
-	c.Assert(err, checker.IsNil)
-
-	expected := []mount{
-		{Source: "/foo", Destination: "/bar", RW: true},
-		{Name: volumeID, Destination: "/foo", RW: true},
-		{Source: "/quux", Destination: "/quux", RW: false},
-	}
-	c.Assert(ls, checker.HasLen, len(expected))
-
-	for _, m := range ls {
-		var matched bool
-		for _, x := range expected {
-			if m.Source == x.Source && m.Destination == x.Destination && m.RW == x.RW || m.Name != x.Name {
-				matched = true
-				break
-			}
-		}
-		c.Assert(matched, checker.True, check.Commentf("did find match for %+v", m))
-	}
-}
-
-func (s *DockerDaemonSuite) TestDaemonWithUserlandProxyPath(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	dockerProxyPath, err := exec.LookPath("docker-proxy")
-	c.Assert(err, checker.IsNil)
-	tmpDir, err := ioutil.TempDir("", "test-docker-proxy")
-	c.Assert(err, checker.IsNil)
-
-	newProxyPath := filepath.Join(tmpDir, "docker-proxy")
-	cmd := exec.Command("cp", dockerProxyPath, newProxyPath)
-	c.Assert(cmd.Run(), checker.IsNil)
-
-	// custom one
-	c.Assert(s.d.StartWithBusybox("--userland-proxy-path", newProxyPath), checker.IsNil)
-	out, err := s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// try with the original one
-	c.Assert(s.d.Restart("--userland-proxy-path", dockerProxyPath), checker.IsNil)
-	out, err = s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// not exist
-	c.Assert(s.d.Restart("--userland-proxy-path", "/does/not/exist"), checker.IsNil)
-	out, err = s.d.Cmd("run", "-p", "5000:5000", "busybox:latest", "true")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "driver failed programming external connectivity on endpoint")
-	c.Assert(out, checker.Contains, "/does/not/exist: no such file or directory")
-}
-
-// Test case for #22471
-func (s *DockerDaemonSuite) TestDaemonShutdownTimeout(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	c.Assert(s.d.StartWithBusybox("--shutdown-timeout=3"), check.IsNil)
-
-	_, err := s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil)
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGINT)
-
-	select {
-	case <-s.d.wait:
-	case <-time.After(5 * time.Second):
-	}
-
-	expectedMessage := `level=debug msg="start clean shutdown of all containers with a 3 seconds timeout..."`
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMessage)
-}
-
-// Test case for #22471
-func (s *DockerDaemonSuite) TestDaemonShutdownTimeoutWithConfigFile(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	// daemon config file
-	configFilePath := "test.json"
-	configFile, err := os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(configFilePath)
-
-	daemonConfig := `{ "shutdown-timeout" : 8 }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-	c.Assert(s.d.Start(fmt.Sprintf("--config-file=%s", configFilePath)), check.IsNil)
-
-	configFile, err = os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	daemonConfig = `{ "shutdown-timeout" : 5 }`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	select {
-	case <-s.d.wait:
-	case <-time.After(3 * time.Second):
-	}
-
-	expectedMessage := `level=debug msg="Reset Shutdown Timeout: 5"`
-	content, _ := ioutil.ReadFile(s.d.logFile.Name())
-	c.Assert(string(content), checker.Contains, expectedMessage)
-}
-
-// Test case for 29342
-func (s *DockerDaemonSuite) TestExecWithUserAfterLiveRestore(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	s.d.StartWithBusybox("--live-restore")
-
-	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "sh", "-c", "addgroup -S test && adduser -S -G test test -D -s /bin/sh && top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-
-	s.d.waitRun("top")
-
-	out1, err := s.d.Cmd("exec", "-u", "test", "top", "id")
-	// uid=100(test) gid=101(test) groups=101(test)
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out1))
-
-	// restart daemon.
-	s.d.Restart("--live-restore")
-
-	out2, err := s.d.Cmd("exec", "-u", "test", "top", "id")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out2))
-	c.Assert(out1, check.Equals, out2, check.Commentf("Output: before restart '%s', after restart '%s'", out1, out2))
-
-	out, err = s.d.Cmd("stop", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-}
-
-func (s *DockerDaemonSuite) TestRemoveContainerAfterLiveRestore(c *check.C) {
-	testRequires(c, DaemonIsLinux, overlayFSSupported, SameHostDaemon)
-	s.d.StartWithBusybox("--live-restore", "--storage-driver", "overlay")
-	out, err := s.d.Cmd("run", "-d", "--name=top", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-
-	s.d.waitRun("top")
-
-	// restart daemon.
-	s.d.Restart("--live-restore", "--storage-driver", "overlay")
-
-	out, err = s.d.Cmd("stop", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-
-	// test if the rootfs mountpoint still exist
-	mountpoint, err := s.d.inspectFilter("top", ".GraphDriver.Data.MergedDir")
-	c.Assert(err, check.IsNil)
-	f, err := os.Open("/proc/self/mountinfo")
-	c.Assert(err, check.IsNil)
-	defer f.Close()
-	sc := bufio.NewScanner(f)
-	for sc.Scan() {
-		line := sc.Text()
-		if strings.Contains(line, mountpoint) {
-			c.Fatalf("mountinfo should not include the mountpoint of stop container")
-		}
-	}
-
-	out, err = s.d.Cmd("rm", "top")
-	c.Assert(err, check.IsNil, check.Commentf("Output: %s", out))
-
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_diff_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_diff_test.go
deleted file mode 100644
index 08cf6e1caa..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_diff_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package main
-
-import (
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// ensure that an added file shows up in docker diff
-func (s *DockerSuite) TestDiffFilenameShownInOutput(c *check.C) {
-	containerCmd := `mkdir /foo; echo xyzzy > /foo/bar`
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd)
-
-	// Wait for it to exit as cannot diff a running container on Windows, and
-	// it will take a few seconds to exit. Also there's no way in Windows to
-	// differentiate between an Add or a Modify, and all files are under
-	// a "Files/" prefix.
-	containerID := strings.TrimSpace(out)
-	lookingFor := "A /foo/bar"
-	if daemonPlatform == "windows" {
-		err := waitExited(containerID, 60*time.Second)
-		c.Assert(err, check.IsNil)
-		lookingFor = "C Files/foo/bar"
-	}
-
-	cleanCID := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "diff", cleanCID)
-
-	found := false
-	for _, line := range strings.Split(out, "\n") {
-		if strings.Contains(line, lookingFor) {
-			found = true
-			break
-		}
-	}
-	c.Assert(found, checker.True)
-}
-
-// test to ensure GH #3840 doesn't occur any more
-func (s *DockerSuite) TestDiffEnsureInitLayerFilesAreIgnored(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// this is a list of files which shouldn't show up in `docker diff`
-	initLayerFiles := []string{"/etc/resolv.conf", "/etc/hostname", "/etc/hosts", "/.dockerenv"}
-	containerCount := 5
-
-	// we might not run into this problem from the first run, so start a few containers
-	for i := 0; i < containerCount; i++ {
-		containerCmd := `echo foo > /root/bar`
-		out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", containerCmd)
-
-		cleanCID := strings.TrimSpace(out)
-		out, _ = dockerCmd(c, "diff", cleanCID)
-
-		for _, filename := range initLayerFiles {
-			c.Assert(out, checker.Not(checker.Contains), filename)
-		}
-	}
-}
-
-func (s *DockerSuite) TestDiffEnsureDefaultDevs(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sleep", "0")
-
-	cleanCID := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "diff", cleanCID)
-
-	expected := map[string]bool{
-		"C /dev":         true,
-		"A /dev/full":    true, // busybox
-		"C /dev/ptmx":    true, // libcontainer
-		"A /dev/mqueue":  true,
-		"A /dev/kmsg":    true,
-		"A /dev/fd":      true,
-		"A /dev/ptmx":    true,
-		"A /dev/null":    true,
-		"A /dev/random":  true,
-		"A /dev/stdout":  true,
-		"A /dev/stderr":  true,
-		"A /dev/tty1":    true,
-		"A /dev/stdin":   true,
-		"A /dev/tty":     true,
-		"A /dev/urandom": true,
-		"A /dev/zero":    true,
-	}
-
-	for _, line := range strings.Split(out, "\n") {
-		c.Assert(line == "" || expected[line], checker.True, check.Commentf(line))
-	}
-}
-
-// https://github.com/docker/docker/pull/14381#discussion_r33859347
-func (s *DockerSuite) TestDiffEmptyArgClientError(c *check.C) {
-	out, _, err := dockerCmdWithError("diff", "")
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, "Container name cannot be empty")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_test.go
deleted file mode 100644
index 1fbfc742de..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_test.go
+++ /dev/null
@@ -1,794 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	eventtypes "github.com/docker/docker/api/types/events"
-	eventstestutils "github.com/docker/docker/daemon/events/testutils"
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestEventsTimestampFormats(c *check.C) {
-	name := "events-time-format-test"
-
-	// Start stopwatch, generate an event
-	start := daemonTime(c)
-	time.Sleep(1100 * time.Millisecond) // so that first event occur in different second from since (just for the case)
-	dockerCmd(c, "run", "--rm", "--name", name, "busybox", "true")
-	time.Sleep(1100 * time.Millisecond) // so that until > since
-	end := daemonTime(c)
-
-	// List of available time formats to --since
-	unixTs := func(t time.Time) string { return fmt.Sprintf("%v", t.Unix()) }
-	rfc3339 := func(t time.Time) string { return t.Format(time.RFC3339) }
-	duration := func(t time.Time) string { return time.Now().Sub(t).String() }
-
-	// --since=$start must contain only the 'untag' event
-	for _, f := range []func(time.Time) string{unixTs, rfc3339, duration} {
-		since, until := f(start), f(end)
-		out, _ := dockerCmd(c, "events", "--since="+since, "--until="+until)
-		events := strings.Split(out, "\n")
-		events = events[:len(events)-1]
-
-		nEvents := len(events)
-		c.Assert(nEvents, checker.GreaterOrEqualThan, 5) //Missing expected event
-		containerEvents := eventActionsByIDAndType(c, events, name, "container")
-		c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))
-
-		c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))
-		c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))
-		c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))
-		c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))
-		c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))
-	}
-}
-
-func (s *DockerSuite) TestEventsUntag(c *check.C) {
-	image := "busybox"
-	dockerCmd(c, "tag", image, "utest:tag1")
-	dockerCmd(c, "tag", image, "utest:tag2")
-	dockerCmd(c, "rmi", "utest:tag1")
-	dockerCmd(c, "rmi", "utest:tag2")
-
-	result := icmd.RunCmd(icmd.Cmd{
-		Command: []string{dockerBinary, "events", "--since=1"},
-		Timeout: time.Millisecond * 2500,
-	})
-	c.Assert(result, icmd.Matches, icmd.Expected{Timeout: true})
-
-	events := strings.Split(result.Stdout(), "\n")
-	nEvents := len(events)
-	// The last element after the split above will be an empty string, so we
-	// get the two elements before the last, which are the untags we're
-	// looking for.
-	for _, v := range events[nEvents-3 : nEvents-1] {
-		c.Assert(v, checker.Contains, "untag", check.Commentf("event should be untag"))
-	}
-}
-
-func (s *DockerSuite) TestEventsLimit(c *check.C) {
-	// Limit to 8 goroutines creating containers in order to prevent timeouts
-	// creating so many containers simultaneously on Windows
-	sem := make(chan bool, 8)
-	numContainers := 17
-	errChan := make(chan error, numContainers)
-
-	args := []string{"run", "--rm", "busybox", "true"}
-	for i := 0; i < numContainers; i++ {
-		sem <- true
-		go func() {
-			defer func() { <-sem }()
-			out, err := exec.Command(dockerBinary, args...).CombinedOutput()
-			if err != nil {
-				err = fmt.Errorf("%v: %s", err, string(out))
-			}
-			errChan <- err
-		}()
-	}
-
-	// Wait for all goroutines to finish
-	for i := 0; i < cap(sem); i++ {
-		sem <- true
-	}
-	close(errChan)
-
-	for err := range errChan {
-		c.Assert(err, checker.IsNil, check.Commentf("%q failed with error", strings.Join(args, " ")))
-	}
-
-	out, _ := dockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c))
-	events := strings.Split(out, "\n")
-	nEvents := len(events) - 1
-	c.Assert(nEvents, checker.Equals, 64, check.Commentf("events should be limited to 64, but received %d", nEvents))
-}
-
-func (s *DockerSuite) TestEventsContainerEvents(c *check.C) {
-	dockerCmd(c, "run", "--rm", "--name", "container-events-test", "busybox", "true")
-
-	out, _ := dockerCmd(c, "events", "--until", daemonUnixTime(c))
-	events := strings.Split(out, "\n")
-	events = events[:len(events)-1]
-
-	nEvents := len(events)
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 5) //Missing expected event
-	containerEvents := eventActionsByIDAndType(c, events, "container-events-test", "container")
-	c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))
-
-	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))
-	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))
-	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))
-	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))
-	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))
-}
-
-func (s *DockerSuite) TestEventsContainerEventsAttrSort(c *check.C) {
-	since := daemonUnixTime(c)
-	dockerCmd(c, "run", "--rm", "--name", "container-events-test", "busybox", "true")
-
-	out, _ := dockerCmd(c, "events", "--filter", "container=container-events-test", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(out, "\n")
-
-	nEvents := len(events)
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 3) //Missing expected event
-	matchedEvents := 0
-	for _, event := range events {
-		matches := eventstestutils.ScanMap(event)
-		if matches["eventType"] == "container" && matches["action"] == "create" {
-			matchedEvents++
-			c.Assert(out, checker.Contains, "(image=busybox, name=container-events-test)", check.Commentf("Event attributes not sorted"))
-		} else if matches["eventType"] == "container" && matches["action"] == "start" {
-			matchedEvents++
-			c.Assert(out, checker.Contains, "(image=busybox, name=container-events-test)", check.Commentf("Event attributes not sorted"))
-		}
-	}
-	c.Assert(matchedEvents, checker.Equals, 2, check.Commentf("missing events for container container-events-test:\n%s", out))
-}
-
-func (s *DockerSuite) TestEventsContainerEventsSinceUnixEpoch(c *check.C) {
-	dockerCmd(c, "run", "--rm", "--name", "since-epoch-test", "busybox", "true")
-	timeBeginning := time.Unix(0, 0).Format(time.RFC3339Nano)
-	timeBeginning = strings.Replace(timeBeginning, "Z", ".000000000Z", -1)
-	out, _ := dockerCmd(c, "events", "--since", timeBeginning, "--until", daemonUnixTime(c))
-	events := strings.Split(out, "\n")
-	events = events[:len(events)-1]
-
-	nEvents := len(events)
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 5) //Missing expected event
-	containerEvents := eventActionsByIDAndType(c, events, "since-epoch-test", "container")
-	c.Assert(containerEvents, checker.HasLen, 5, check.Commentf("events: %v", events))
-
-	c.Assert(containerEvents[0], checker.Equals, "create", check.Commentf(out))
-	c.Assert(containerEvents[1], checker.Equals, "attach", check.Commentf(out))
-	c.Assert(containerEvents[2], checker.Equals, "start", check.Commentf(out))
-	c.Assert(containerEvents[3], checker.Equals, "die", check.Commentf(out))
-	c.Assert(containerEvents[4], checker.Equals, "destroy", check.Commentf(out))
-}
-
-func (s *DockerSuite) TestEventsImageTag(c *check.C) {
-	time.Sleep(1 * time.Second) // because API has seconds granularity
-	since := daemonUnixTime(c)
-	image := "testimageevents:tag"
-	dockerCmd(c, "tag", "busybox", image)
-
-	out, _ := dockerCmd(c, "events",
-		"--since", since, "--until", daemonUnixTime(c))
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1, check.Commentf("was expecting 1 event. out=%s", out))
-	event := strings.TrimSpace(events[0])
-
-	matches := eventstestutils.ScanMap(event)
-	c.Assert(matchEventID(matches, image), checker.True, check.Commentf("matches: %v\nout:\n%s", matches, out))
-	c.Assert(matches["action"], checker.Equals, "tag")
-}
-
-func (s *DockerSuite) TestEventsImagePull(c *check.C) {
-	// TODO Windows: Enable this test once pull and reliable image names are available
-	testRequires(c, DaemonIsLinux)
-	since := daemonUnixTime(c)
-	testRequires(c, Network)
-
-	dockerCmd(c, "pull", "hello-world")
-
-	out, _ := dockerCmd(c, "events",
-		"--since", since, "--until", daemonUnixTime(c))
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	event := strings.TrimSpace(events[len(events)-1])
-	matches := eventstestutils.ScanMap(event)
-	c.Assert(matches["id"], checker.Equals, "hello-world:latest")
-	c.Assert(matches["action"], checker.Equals, "pull")
-
-}
-
-func (s *DockerSuite) TestEventsImageImport(c *check.C) {
-	// TODO Windows CI. This should be portable once export/import are
-	// more reliable (@swernli)
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	since := daemonUnixTime(c)
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "export", cleanedContainerID),
-		exec.Command(dockerBinary, "import", "-"),
-	)
-	c.Assert(err, checker.IsNil, check.Commentf("import failed with output: %q", out))
-	imageRef := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", "event=import")
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1)
-	matches := eventstestutils.ScanMap(events[0])
-	c.Assert(matches["id"], checker.Equals, imageRef, check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-	c.Assert(matches["action"], checker.Equals, "import", check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-}
-
-func (s *DockerSuite) TestEventsImageLoad(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	myImageName := "footest:v1"
-	dockerCmd(c, "tag", "busybox", myImageName)
-	since := daemonUnixTime(c)
-
-	out, _ := dockerCmd(c, "images", "-q", "--no-trunc", myImageName)
-	longImageID := strings.TrimSpace(out)
-	c.Assert(longImageID, checker.Not(check.Equals), "", check.Commentf("Id should not be empty"))
-
-	dockerCmd(c, "save", "-o", "saveimg.tar", myImageName)
-	dockerCmd(c, "rmi", myImageName)
-	out, _ = dockerCmd(c, "images", "-q", myImageName)
-	noImageID := strings.TrimSpace(out)
-	c.Assert(noImageID, checker.Equals, "", check.Commentf("Should not have any image"))
-	dockerCmd(c, "load", "-i", "saveimg.tar")
-
-	result := icmd.RunCommand("rm", "-rf", "saveimg.tar")
-	c.Assert(result, icmd.Matches, icmd.Success)
-
-	out, _ = dockerCmd(c, "images", "-q", "--no-trunc", myImageName)
-	imageID := strings.TrimSpace(out)
-	c.Assert(imageID, checker.Equals, longImageID, check.Commentf("Should have same image id as before"))
-
-	out, _ = dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", "event=load")
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1)
-	matches := eventstestutils.ScanMap(events[0])
-	c.Assert(matches["id"], checker.Equals, imageID, check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-	c.Assert(matches["action"], checker.Equals, "load", check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-
-	out, _ = dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", "event=save")
-	events = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1)
-	matches = eventstestutils.ScanMap(events[0])
-	c.Assert(matches["id"], checker.Equals, imageID, check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-	c.Assert(matches["action"], checker.Equals, "save", check.Commentf("matches: %v\nout:\n%s\n", matches, out))
-}
-
-func (s *DockerSuite) TestEventsPluginOps(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "plugin", "install", pNameWithTag, "--grant-all-permissions")
-	dockerCmd(c, "plugin", "disable", pNameWithTag)
-	dockerCmd(c, "plugin", "remove", pNameWithTag)
-
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(out, "\n")
-	events = events[:len(events)-1]
-
-	nEvents := len(events)
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 4)
-
-	pluginEvents := eventActionsByIDAndType(c, events, pNameWithTag, "plugin")
-	c.Assert(pluginEvents, checker.HasLen, 4, check.Commentf("events: %v", events))
-
-	c.Assert(pluginEvents[0], checker.Equals, "pull", check.Commentf(out))
-	c.Assert(pluginEvents[1], checker.Equals, "enable", check.Commentf(out))
-	c.Assert(pluginEvents[2], checker.Equals, "disable", check.Commentf(out))
-	c.Assert(pluginEvents[3], checker.Equals, "remove", check.Commentf(out))
-}
-
-func (s *DockerSuite) TestEventsFilters(c *check.C) {
-	since := daemonUnixTime(c)
-	dockerCmd(c, "run", "--rm", "busybox", "true")
-	dockerCmd(c, "run", "--rm", "busybox", "true")
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", "event=die")
-	parseEvents(c, out, "die")
-
-	out, _ = dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", "event=die", "--filter", "event=start")
-	parseEvents(c, out, "die|start")
-
-	// make sure we at least got 2 start events
-	count := strings.Count(out, "start")
-	c.Assert(strings.Count(out, "start"), checker.GreaterOrEqualThan, 2, check.Commentf("should have had 2 start events but had %d, out: %s", count, out))
-
-}
-
-func (s *DockerSuite) TestEventsFilterImageName(c *check.C) {
-	since := daemonUnixTime(c)
-
-	out, _ := dockerCmd(c, "run", "--name", "container_1", "-d", "busybox:latest", "true")
-	container1 := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "run", "--name", "container_2", "-d", "busybox", "true")
-	container2 := strings.TrimSpace(out)
-
-	name := "busybox"
-	out, _ = dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--filter", fmt.Sprintf("image=%s", name))
-	events := strings.Split(out, "\n")
-	events = events[:len(events)-1]
-	c.Assert(events, checker.Not(checker.HasLen), 0) //Expected events but found none for the image busybox:latest
-	count1 := 0
-	count2 := 0
-
-	for _, e := range events {
-		if strings.Contains(e, container1) {
-			count1++
-		} else if strings.Contains(e, container2) {
-			count2++
-		}
-	}
-	c.Assert(count1, checker.Not(checker.Equals), 0, check.Commentf("Expected event from container but got %d from %s", count1, container1))
-	c.Assert(count2, checker.Not(checker.Equals), 0, check.Commentf("Expected event from container but got %d from %s", count2, container2))
-
-}
-
-func (s *DockerSuite) TestEventsFilterLabels(c *check.C) {
-	since := daemonUnixTime(c)
-	label := "io.docker.testing=foo"
-
-	out, _ := dockerCmd(c, "run", "-d", "-l", label, "busybox:latest", "true")
-	container1 := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "run", "-d", "busybox", "true")
-	container2 := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter", fmt.Sprintf("label=%s", label))
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.Equals, 3)
-
-	for _, e := range events {
-		c.Assert(e, checker.Contains, container1)
-		c.Assert(e, checker.Not(checker.Contains), container2)
-	}
-}
-
-func (s *DockerSuite) TestEventsFilterImageLabels(c *check.C) {
-	since := daemonUnixTime(c)
-	name := "labelfiltertest"
-	label := "io.docker.testing=image"
-
-	// Build a test image.
-	_, err := buildImage(name, fmt.Sprintf(`
-		FROM busybox:latest
-		LABEL %s`, label), true)
-	c.Assert(err, checker.IsNil, check.Commentf("Couldn't create image"))
-
-	dockerCmd(c, "tag", name, "labelfiltertest:tag1")
-	dockerCmd(c, "tag", name, "labelfiltertest:tag2")
-	dockerCmd(c, "tag", "busybox:latest", "labelfiltertest:tag3")
-
-	out, _ := dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter", fmt.Sprintf("label=%s", label),
-		"--filter", "type=image")
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-
-	// 2 events from the "docker tag" command, another one is from "docker build"
-	c.Assert(events, checker.HasLen, 3, check.Commentf("Events == %s", events))
-	for _, e := range events {
-		c.Assert(e, checker.Contains, "labelfiltertest")
-	}
-}
-
-func (s *DockerSuite) TestEventsFilterContainer(c *check.C) {
-	since := daemonUnixTime(c)
-	nameID := make(map[string]string)
-
-	for _, name := range []string{"container_1", "container_2"} {
-		dockerCmd(c, "run", "--name", name, "busybox", "true")
-		id := inspectField(c, name, "Id")
-		nameID[name] = id
-	}
-
-	until := daemonUnixTime(c)
-
-	checkEvents := func(id string, events []string) error {
-		if len(events) != 4 { // create, attach, start, die
-			return fmt.Errorf("expected 4 events, got %v", events)
-		}
-		for _, event := range events {
-			matches := eventstestutils.ScanMap(event)
-			if !matchEventID(matches, id) {
-				return fmt.Errorf("expected event for container id %s: %s - parsed container id: %s", id, event, matches["id"])
-			}
-		}
-		return nil
-	}
-
-	for name, ID := range nameID {
-		// filter by names
-		out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "--filter", "container="+name)
-		events := strings.Split(strings.TrimSuffix(out, "\n"), "\n")
-		c.Assert(checkEvents(ID, events), checker.IsNil)
-
-		// filter by ID's
-		out, _ = dockerCmd(c, "events", "--since", since, "--until", until, "--filter", "container="+ID)
-		events = strings.Split(strings.TrimSuffix(out, "\n"), "\n")
-		c.Assert(checkEvents(ID, events), checker.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestEventsCommit(c *check.C) {
-	// Problematic on Windows as cannot commit a running container
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := runSleepingContainer(c)
-	cID := strings.TrimSpace(out)
-	c.Assert(waitRun(cID), checker.IsNil)
-
-	dockerCmd(c, "commit", "-m", "test", cID)
-	dockerCmd(c, "stop", cID)
-	c.Assert(waitExited(cID, 5*time.Second), checker.IsNil)
-
-	until := daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "container="+cID, "--until="+until)
-	c.Assert(out, checker.Contains, "commit", check.Commentf("Missing 'commit' log event"))
-}
-
-func (s *DockerSuite) TestEventsCopy(c *check.C) {
-	// Build a test image.
-	id, err := buildImage("cpimg", `
-		  FROM busybox
-		  RUN echo HI > /file`, true)
-	c.Assert(err, checker.IsNil, check.Commentf("Couldn't create image"))
-
-	// Create an empty test file.
-	tempFile, err := ioutil.TempFile("", "test-events-copy-")
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(tempFile.Name())
-
-	c.Assert(tempFile.Close(), checker.IsNil)
-
-	dockerCmd(c, "create", "--name=cptest", id)
-
-	dockerCmd(c, "cp", "cptest:/file", tempFile.Name())
-
-	until := daemonUnixTime(c)
-	out, _ := dockerCmd(c, "events", "--since=0", "-f", "container=cptest", "--until="+until)
-	c.Assert(out, checker.Contains, "archive-path", check.Commentf("Missing 'archive-path' log event\n"))
-
-	dockerCmd(c, "cp", tempFile.Name(), "cptest:/filecopy")
-
-	until = daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "container=cptest", "--until="+until)
-	c.Assert(out, checker.Contains, "extract-to-dir", check.Commentf("Missing 'extract-to-dir' log event"))
-}
-
-func (s *DockerSuite) TestEventsResize(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cID := strings.TrimSpace(out)
-	c.Assert(waitRun(cID), checker.IsNil)
-
-	endpoint := "/containers/" + cID + "/resize?h=80&w=24"
-	status, _, err := sockRequest("POST", endpoint, nil)
-	c.Assert(status, checker.Equals, http.StatusOK)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "stop", cID)
-
-	until := daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "container="+cID, "--until="+until)
-	c.Assert(out, checker.Contains, "resize", check.Commentf("Missing 'resize' log event"))
-}
-
-func (s *DockerSuite) TestEventsAttach(c *check.C) {
-	// TODO Windows CI: Figure out why this test fails intermittently (TP5).
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-di", "busybox", "cat")
-	cID := strings.TrimSpace(out)
-	c.Assert(waitRun(cID), checker.IsNil)
-
-	cmd := exec.Command(dockerBinary, "attach", cID)
-	stdin, err := cmd.StdinPipe()
-	c.Assert(err, checker.IsNil)
-	defer stdin.Close()
-	stdout, err := cmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-	defer stdout.Close()
-	c.Assert(cmd.Start(), checker.IsNil)
-	defer cmd.Process.Kill()
-
-	// Make sure we're done attaching by writing/reading some stuff
-	_, err = stdin.Write([]byte("hello\n"))
-	c.Assert(err, checker.IsNil)
-	out, err = bufio.NewReader(stdout).ReadString('\n')
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello", check.Commentf("expected 'hello'"))
-
-	c.Assert(stdin.Close(), checker.IsNil)
-
-	dockerCmd(c, "kill", cID)
-	c.Assert(waitExited(cID, 5*time.Second), checker.IsNil)
-
-	until := daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "container="+cID, "--until="+until)
-	c.Assert(out, checker.Contains, "attach", check.Commentf("Missing 'attach' log event"))
-}
-
-func (s *DockerSuite) TestEventsRename(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--name", "oldName", "busybox", "true")
-	cID := strings.TrimSpace(out)
-	dockerCmd(c, "rename", "oldName", "newName")
-
-	until := daemonUnixTime(c)
-	// filter by the container id because the name in the event will be the new name.
-	out, _ = dockerCmd(c, "events", "-f", "container="+cID, "--until", until)
-	c.Assert(out, checker.Contains, "rename", check.Commentf("Missing 'rename' log event\n"))
-}
-
-func (s *DockerSuite) TestEventsTop(c *check.C) {
-	// Problematic on Windows as Windows does not support top
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := runSleepingContainer(c, "-d")
-	cID := strings.TrimSpace(out)
-	c.Assert(waitRun(cID), checker.IsNil)
-
-	dockerCmd(c, "top", cID)
-	dockerCmd(c, "stop", cID)
-
-	until := daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "container="+cID, "--until="+until)
-	c.Assert(out, checker.Contains, " top", check.Commentf("Missing 'top' log event"))
-}
-
-// #14316
-func (s *DockerRegistrySuite) TestEventsImageFilterPush(c *check.C) {
-	// Problematic to port for Windows CI during TP5 timeframe until
-	// supporting push
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, Network)
-	repoName := fmt.Sprintf("%v/dockercli/testf", privateRegistryURL)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	cID := strings.TrimSpace(out)
-	c.Assert(waitRun(cID), checker.IsNil)
-
-	dockerCmd(c, "commit", cID, repoName)
-	dockerCmd(c, "stop", cID)
-	dockerCmd(c, "push", repoName)
-
-	until := daemonUnixTime(c)
-	out, _ = dockerCmd(c, "events", "-f", "image="+repoName, "-f", "event=push", "--until", until)
-	c.Assert(out, checker.Contains, repoName, check.Commentf("Missing 'push' log event for %s", repoName))
-}
-
-func (s *DockerSuite) TestEventsFilterType(c *check.C) {
-	since := daemonUnixTime(c)
-	name := "labelfiltertest"
-	label := "io.docker.testing=image"
-
-	// Build a test image.
-	_, err := buildImage(name, fmt.Sprintf(`
-		FROM busybox:latest
-		LABEL %s`, label), true)
-	c.Assert(err, checker.IsNil, check.Commentf("Couldn't create image"))
-
-	dockerCmd(c, "tag", name, "labelfiltertest:tag1")
-	dockerCmd(c, "tag", name, "labelfiltertest:tag2")
-	dockerCmd(c, "tag", "busybox:latest", "labelfiltertest:tag3")
-
-	out, _ := dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter", fmt.Sprintf("label=%s", label),
-		"--filter", "type=image")
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-
-	// 2 events from the "docker tag" command, another one is from "docker build"
-	c.Assert(events, checker.HasLen, 3, check.Commentf("Events == %s", events))
-	for _, e := range events {
-		c.Assert(e, checker.Contains, "labelfiltertest")
-	}
-
-	out, _ = dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter", fmt.Sprintf("label=%s", label),
-		"--filter", "type=container")
-	events = strings.Split(strings.TrimSpace(out), "\n")
-
-	// Events generated by the container that builds the image
-	c.Assert(events, checker.HasLen, 3, check.Commentf("Events == %s", events))
-
-	out, _ = dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter", "type=network")
-	events = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.GreaterOrEqualThan, 1, check.Commentf("Events == %s", events))
-}
-
-// #25798
-func (s *DockerSuite) TestEventsSpecialFiltersWithExecCreate(c *check.C) {
-	since := daemonUnixTime(c)
-	runSleepingContainer(c, "--name", "test-container", "-d")
-	waitRun("test-container")
-
-	dockerCmd(c, "exec", "test-container", "echo", "hello-world")
-
-	out, _ := dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter",
-		"event='exec_create: echo hello-world'",
-	)
-
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.Equals, 1, check.Commentf(out))
-
-	out, _ = dockerCmd(
-		c,
-		"events",
-		"--since", since,
-		"--until", daemonUnixTime(c),
-		"--filter",
-		"event=exec_create",
-	)
-	c.Assert(len(events), checker.Equals, 1, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestEventsFilterImageInContainerAction(c *check.C) {
-	since := daemonUnixTime(c)
-	dockerCmd(c, "run", "--name", "test-container", "-d", "busybox", "true")
-	waitRun("test-container")
-
-	out, _ := dockerCmd(c, "events", "--filter", "image=busybox", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.GreaterThan, 1, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestEventsContainerRestart(c *check.C) {
-	dockerCmd(c, "run", "-d", "--name=testEvent", "--restart=on-failure:3", "busybox", "false")
-
-	// wait until test2 is auto removed.
-	waitTime := 10 * time.Second
-	if daemonPlatform == "windows" {
-		// Windows takes longer...
-		waitTime = 90 * time.Second
-	}
-
-	err := waitInspect("testEvent", "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTime)
-	c.Assert(err, checker.IsNil)
-
-	var (
-		createCount int
-		startCount  int
-		dieCount    int
-	)
-	out, _ := dockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c), "-f", "container=testEvent")
-	events := strings.Split(strings.TrimSpace(out), "\n")
-
-	nEvents := len(events)
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 1) //Missing expected event
-	actions := eventActionsByIDAndType(c, events, "testEvent", "container")
-
-	for _, a := range actions {
-		switch a {
-		case "create":
-			createCount++
-		case "start":
-			startCount++
-		case "die":
-			dieCount++
-		}
-	}
-	c.Assert(createCount, checker.Equals, 1, check.Commentf("testEvent should be created 1 times: %v", actions))
-	c.Assert(startCount, checker.Equals, 4, check.Commentf("testEvent should start 4 times: %v", actions))
-	c.Assert(dieCount, checker.Equals, 4, check.Commentf("testEvent should die 4 times: %v", actions))
-}
-
-func (s *DockerSuite) TestEventsSinceInTheFuture(c *check.C) {
-	dockerCmd(c, "run", "--name", "test-container", "-d", "busybox", "true")
-	waitRun("test-container")
-
-	since := daemonTime(c)
-	until := since.Add(time.Duration(-24) * time.Hour)
-	out, _, err := dockerCmdWithError("events", "--filter", "image=busybox", "--since", parseEventTime(since), "--until", parseEventTime(until))
-
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "cannot be after `until`")
-}
-
-func (s *DockerSuite) TestEventsUntilInThePast(c *check.C) {
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "run", "--name", "test-container", "-d", "busybox", "true")
-	waitRun("test-container")
-
-	until := daemonUnixTime(c)
-
-	dockerCmd(c, "run", "--name", "test-container2", "-d", "busybox", "true")
-	waitRun("test-container2")
-
-	out, _ := dockerCmd(c, "events", "--filter", "image=busybox", "--since", since, "--until", until)
-
-	c.Assert(out, checker.Not(checker.Contains), "test-container2")
-	c.Assert(out, checker.Contains, "test-container")
-}
-
-func (s *DockerSuite) TestEventsFormat(c *check.C) {
-	since := daemonUnixTime(c)
-	dockerCmd(c, "run", "--rm", "busybox", "true")
-	dockerCmd(c, "run", "--rm", "busybox", "true")
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", daemonUnixTime(c), "--format", "{{json .}}")
-	dec := json.NewDecoder(strings.NewReader(out))
-	// make sure we got 2 start events
-	startCount := 0
-	for {
-		var err error
-		var ev eventtypes.Message
-		if err = dec.Decode(&ev); err == io.EOF {
-			break
-		}
-		c.Assert(err, checker.IsNil)
-		if ev.Status == "start" {
-			startCount++
-		}
-	}
-
-	c.Assert(startCount, checker.Equals, 2, check.Commentf("should have had 2 start events but had %d, out: %s", startCount, out))
-}
-
-func (s *DockerSuite) TestEventsFormatBadFunc(c *check.C) {
-	// make sure it fails immediately, without receiving any event
-	result := dockerCmdWithResult("events", "--format", "{{badFuncString .}}")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		Error:    "exit status 64",
-		ExitCode: 64,
-		Err:      "Error parsing format: template: :1: function \"badFuncString\" not defined",
-	})
-}
-
-func (s *DockerSuite) TestEventsFormatBadField(c *check.C) {
-	// make sure it fails immediately, without receiving any event
-	result := dockerCmdWithResult("events", "--format", "{{.badFieldString}}")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		Error:    "exit status 64",
-		ExitCode: 64,
-		Err:      "Error parsing format: template: :1:2: executing \"\" at <.badFieldString>: can't evaluate field badFieldString in type *events.Message",
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_unix_test.go
deleted file mode 100644
index dc91667116..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_events_unix_test.go
+++ /dev/null
@@ -1,486 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-	"syscall"
-	"time"
-	"unicode"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// #5979
-func (s *DockerSuite) TestEventsRedirectStdout(c *check.C) {
-	since := daemonUnixTime(c)
-	dockerCmd(c, "run", "busybox", "true")
-
-	file, err := ioutil.TempFile("", "")
-	c.Assert(err, checker.IsNil, check.Commentf("could not create temp file"))
-	defer os.Remove(file.Name())
-
-	command := fmt.Sprintf("%s events --since=%s --until=%s > %s", dockerBinary, since, daemonUnixTime(c), file.Name())
-	_, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil, check.Commentf("Could not open pty"))
-	cmd := exec.Command("sh", "-c", command)
-	cmd.Stdin = tty
-	cmd.Stdout = tty
-	cmd.Stderr = tty
-	c.Assert(cmd.Run(), checker.IsNil, check.Commentf("run err for command %q", command))
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		for _, ch := range scanner.Text() {
-			c.Assert(unicode.IsControl(ch), checker.False, check.Commentf("found control character %v", []byte(string(ch))))
-		}
-	}
-	c.Assert(scanner.Err(), checker.IsNil, check.Commentf("Scan err for command %q", command))
-
-}
-
-func (s *DockerSuite) TestEventsOOMDisableFalse(c *check.C) {
-	testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, swapMemorySupport)
-
-	errChan := make(chan error)
-	go func() {
-		defer close(errChan)
-		out, exitCode, _ := dockerCmdWithError("run", "--name", "oomFalse", "-m", "10MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
-		if expected := 137; exitCode != expected {
-			errChan <- fmt.Errorf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
-		}
-	}()
-	select {
-	case err := <-errChan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(30 * time.Second):
-		c.Fatal("Timeout waiting for container to die on OOM")
-	}
-
-	out, _ := dockerCmd(c, "events", "--since=0", "-f", "container=oomFalse", "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSuffix(out, "\n"), "\n")
-	nEvents := len(events)
-
-	c.Assert(nEvents, checker.GreaterOrEqualThan, 5) //Missing expected event
-	c.Assert(parseEventAction(c, events[nEvents-5]), checker.Equals, "create")
-	c.Assert(parseEventAction(c, events[nEvents-4]), checker.Equals, "attach")
-	c.Assert(parseEventAction(c, events[nEvents-3]), checker.Equals, "start")
-	c.Assert(parseEventAction(c, events[nEvents-2]), checker.Equals, "oom")
-	c.Assert(parseEventAction(c, events[nEvents-1]), checker.Equals, "die")
-}
-
-func (s *DockerSuite) TestEventsOOMDisableTrue(c *check.C) {
-	testRequires(c, DaemonIsLinux, oomControl, memoryLimitSupport, NotArm, swapMemorySupport)
-
-	errChan := make(chan error)
-	observer, err := newEventObserver(c)
-	c.Assert(err, checker.IsNil)
-	err = observer.Start()
-	c.Assert(err, checker.IsNil)
-	defer observer.Stop()
-
-	go func() {
-		defer close(errChan)
-		out, exitCode, _ := dockerCmdWithError("run", "--oom-kill-disable=true", "--name", "oomTrue", "-m", "10MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
-		if expected := 137; exitCode != expected {
-			errChan <- fmt.Errorf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
-		}
-	}()
-
-	c.Assert(waitRun("oomTrue"), checker.IsNil)
-	defer dockerCmd(c, "kill", "oomTrue")
-	containerID := inspectField(c, "oomTrue", "Id")
-
-	testActions := map[string]chan bool{
-		"oom": make(chan bool),
-	}
-
-	matcher := matchEventLine(containerID, "container", testActions)
-	processor := processEventMatch(testActions)
-	go observer.Match(matcher, processor)
-
-	select {
-	case <-time.After(20 * time.Second):
-		observer.CheckEventError(c, containerID, "oom", matcher)
-	case <-testActions["oom"]:
-		// ignore, done
-	case errRun := <-errChan:
-		if errRun != nil {
-			c.Fatalf("%v", errRun)
-		} else {
-			c.Fatalf("container should be still running but it's not")
-		}
-	}
-
-	status := inspectField(c, "oomTrue", "State.Status")
-	c.Assert(strings.TrimSpace(status), checker.Equals, "running", check.Commentf("container should be still running"))
-}
-
-// #18453
-func (s *DockerSuite) TestEventsContainerFilterByName(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	cOut, _ := dockerCmd(c, "run", "--name=foo", "-d", "busybox", "top")
-	c1 := strings.TrimSpace(cOut)
-	waitRun("foo")
-	cOut, _ = dockerCmd(c, "run", "--name=bar", "-d", "busybox", "top")
-	c2 := strings.TrimSpace(cOut)
-	waitRun("bar")
-	out, _ := dockerCmd(c, "events", "-f", "container=foo", "--since=0", "--until", daemonUnixTime(c))
-	c.Assert(out, checker.Contains, c1, check.Commentf(out))
-	c.Assert(out, checker.Not(checker.Contains), c2, check.Commentf(out))
-}
-
-// #18453
-func (s *DockerSuite) TestEventsContainerFilterBeforeCreate(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	buf := &bytes.Buffer{}
-	cmd := exec.Command(dockerBinary, "events", "-f", "container=foo", "--since=0")
-	cmd.Stdout = buf
-	c.Assert(cmd.Start(), check.IsNil)
-	defer cmd.Wait()
-	defer cmd.Process.Kill()
-
-	// Sleep for a second to make sure we are testing the case where events are listened before container starts.
-	time.Sleep(time.Second)
-	id, _ := dockerCmd(c, "run", "--name=foo", "-d", "busybox", "top")
-	cID := strings.TrimSpace(id)
-	for i := 0; ; i++ {
-		out := buf.String()
-		if strings.Contains(out, cID) {
-			break
-		}
-		if i > 30 {
-			c.Fatalf("Missing event of container (foo, %v), got %q", cID, out)
-		}
-		time.Sleep(500 * time.Millisecond)
-	}
-}
-
-func (s *DockerSuite) TestVolumeEvents(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	since := daemonUnixTime(c)
-
-	// Observe create/mount volume actions
-	dockerCmd(c, "volume", "create", "test-event-volume-local")
-	dockerCmd(c, "run", "--name", "test-volume-container", "--volume", "test-event-volume-local:/foo", "-d", "busybox", "true")
-	waitRun("test-volume-container")
-
-	// Observe unmount/destroy volume actions
-	dockerCmd(c, "rm", "-f", "test-volume-container")
-	dockerCmd(c, "volume", "rm", "test-event-volume-local")
-
-	until := daemonUnixTime(c)
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", until)
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.GreaterThan, 4)
-
-	volumeEvents := eventActionsByIDAndType(c, events, "test-event-volume-local", "volume")
-	c.Assert(volumeEvents, checker.HasLen, 4)
-	c.Assert(volumeEvents[0], checker.Equals, "create")
-	c.Assert(volumeEvents[1], checker.Equals, "mount")
-	c.Assert(volumeEvents[2], checker.Equals, "unmount")
-	c.Assert(volumeEvents[3], checker.Equals, "destroy")
-}
-
-func (s *DockerSuite) TestNetworkEvents(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	since := daemonUnixTime(c)
-
-	// Observe create/connect network actions
-	dockerCmd(c, "network", "create", "test-event-network-local")
-	dockerCmd(c, "run", "--name", "test-network-container", "--net", "test-event-network-local", "-d", "busybox", "true")
-	waitRun("test-network-container")
-
-	// Observe disconnect/destroy network actions
-	dockerCmd(c, "rm", "-f", "test-network-container")
-	dockerCmd(c, "network", "rm", "test-event-network-local")
-
-	until := daemonUnixTime(c)
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", until)
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.GreaterThan, 4)
-
-	netEvents := eventActionsByIDAndType(c, events, "test-event-network-local", "network")
-	c.Assert(netEvents, checker.HasLen, 4)
-	c.Assert(netEvents[0], checker.Equals, "create")
-	c.Assert(netEvents[1], checker.Equals, "connect")
-	c.Assert(netEvents[2], checker.Equals, "disconnect")
-	c.Assert(netEvents[3], checker.Equals, "destroy")
-}
-
-func (s *DockerSuite) TestEventsContainerWithMultiNetwork(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// Observe create/connect network actions
-	dockerCmd(c, "network", "create", "test-event-network-local-1")
-	dockerCmd(c, "network", "create", "test-event-network-local-2")
-	dockerCmd(c, "run", "--name", "test-network-container", "--net", "test-event-network-local-1", "-td", "busybox", "sh")
-	waitRun("test-network-container")
-	dockerCmd(c, "network", "connect", "test-event-network-local-2", "test-network-container")
-
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "stop", "-t", "1", "test-network-container")
-
-	until := daemonUnixTime(c)
-	out, _ := dockerCmd(c, "events", "--since", since, "--until", until, "-f", "type=network")
-	netEvents := strings.Split(strings.TrimSpace(out), "\n")
-
-	// received two network disconnect events
-	c.Assert(len(netEvents), checker.Equals, 2)
-	c.Assert(netEvents[0], checker.Contains, "disconnect")
-	c.Assert(netEvents[1], checker.Contains, "disconnect")
-
-	//both networks appeared in the network event output
-	c.Assert(out, checker.Contains, "test-event-network-local-1")
-	c.Assert(out, checker.Contains, "test-event-network-local-2")
-}
-
-func (s *DockerSuite) TestEventsStreaming(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	observer, err := newEventObserver(c)
-	c.Assert(err, checker.IsNil)
-	err = observer.Start()
-	c.Assert(err, checker.IsNil)
-	defer observer.Stop()
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox:latest", "true")
-	containerID := strings.TrimSpace(out)
-
-	testActions := map[string]chan bool{
-		"create":  make(chan bool, 1),
-		"start":   make(chan bool, 1),
-		"die":     make(chan bool, 1),
-		"destroy": make(chan bool, 1),
-	}
-
-	matcher := matchEventLine(containerID, "container", testActions)
-	processor := processEventMatch(testActions)
-	go observer.Match(matcher, processor)
-
-	select {
-	case <-time.After(5 * time.Second):
-		observer.CheckEventError(c, containerID, "create", matcher)
-	case <-testActions["create"]:
-		// ignore, done
-	}
-
-	select {
-	case <-time.After(5 * time.Second):
-		observer.CheckEventError(c, containerID, "start", matcher)
-	case <-testActions["start"]:
-		// ignore, done
-	}
-
-	select {
-	case <-time.After(5 * time.Second):
-		observer.CheckEventError(c, containerID, "die", matcher)
-	case <-testActions["die"]:
-		// ignore, done
-	}
-
-	dockerCmd(c, "rm", containerID)
-
-	select {
-	case <-time.After(5 * time.Second):
-		observer.CheckEventError(c, containerID, "destroy", matcher)
-	case <-testActions["destroy"]:
-		// ignore, done
-	}
-}
-
-func (s *DockerSuite) TestEventsImageUntagDelete(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	observer, err := newEventObserver(c)
-	c.Assert(err, checker.IsNil)
-	err = observer.Start()
-	c.Assert(err, checker.IsNil)
-	defer observer.Stop()
-
-	name := "testimageevents"
-	imageID, err := buildImage(name,
-		`FROM scratch
-		MAINTAINER "docker"`,
-		true)
-	c.Assert(err, checker.IsNil)
-	c.Assert(deleteImages(name), checker.IsNil)
-
-	testActions := map[string]chan bool{
-		"untag":  make(chan bool, 1),
-		"delete": make(chan bool, 1),
-	}
-
-	matcher := matchEventLine(imageID, "image", testActions)
-	processor := processEventMatch(testActions)
-	go observer.Match(matcher, processor)
-
-	select {
-	case <-time.After(10 * time.Second):
-		observer.CheckEventError(c, imageID, "untag", matcher)
-	case <-testActions["untag"]:
-		// ignore, done
-	}
-
-	select {
-	case <-time.After(10 * time.Second):
-		observer.CheckEventError(c, imageID, "delete", matcher)
-	case <-testActions["delete"]:
-		// ignore, done
-	}
-}
-
-func (s *DockerSuite) TestEventsFilterVolumeAndNetworkType(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "network", "create", "test-event-network-type")
-	dockerCmd(c, "volume", "create", "test-event-volume-type")
-
-	out, _ := dockerCmd(c, "events", "--filter", "type=volume", "--filter", "type=network", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(events), checker.GreaterOrEqualThan, 2, check.Commentf(out))
-
-	networkActions := eventActionsByIDAndType(c, events, "test-event-network-type", "network")
-	volumeActions := eventActionsByIDAndType(c, events, "test-event-volume-type", "volume")
-
-	c.Assert(volumeActions[0], checker.Equals, "create")
-	c.Assert(networkActions[0], checker.Equals, "create")
-}
-
-func (s *DockerSuite) TestEventsFilterVolumeID(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "volume", "create", "test-event-volume-id")
-	out, _ := dockerCmd(c, "events", "--filter", "volume=test-event-volume-id", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1)
-
-	c.Assert(events[0], checker.Contains, "test-event-volume-id")
-	c.Assert(events[0], checker.Contains, "driver=local")
-}
-
-func (s *DockerSuite) TestEventsFilterNetworkID(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	since := daemonUnixTime(c)
-
-	dockerCmd(c, "network", "create", "test-event-network-local")
-	out, _ := dockerCmd(c, "events", "--filter", "network=test-event-network-local", "--since", since, "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(events, checker.HasLen, 1)
-
-	c.Assert(events[0], checker.Contains, "test-event-network-local")
-	c.Assert(events[0], checker.Contains, "type=bridge")
-}
-
-func (s *DockerDaemonSuite) TestDaemonEvents(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// daemon config file
-	configFilePath := "test.json"
-	configFile, err := os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(configFilePath)
-
-	daemonConfig := `{"labels":["foo=bar"]}`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-	c.Assert(s.d.Start(fmt.Sprintf("--config-file=%s", configFilePath)), check.IsNil)
-
-	// Get daemon ID
-	out, err := s.d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	daemonID := ""
-	daemonName := ""
-	for _, line := range strings.Split(out, "\n") {
-		if strings.HasPrefix(line, "ID: ") {
-			daemonID = strings.TrimPrefix(line, "ID: ")
-		} else if strings.HasPrefix(line, "Name: ") {
-			daemonName = strings.TrimPrefix(line, "Name: ")
-		}
-	}
-	c.Assert(daemonID, checker.Not(checker.Equals), "")
-
-	configFile, err = os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	daemonConfig = `{"max-concurrent-downloads":1,"labels":["bar=foo"], "shutdown-timeout": 10}`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	time.Sleep(3 * time.Second)
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c))
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s (cluster-advertise=, cluster-store=, cluster-store-opts={}, debug=true, default-runtime=runc, insecure-registries=[], labels=[\"bar=foo\"], live-restore=false, max-concurrent-downloads=1, max-concurrent-uploads=5, name=%s, runtimes=runc:{docker-runc []}, shutdown-timeout=10)", daemonID, daemonName))
-}
-
-func (s *DockerDaemonSuite) TestDaemonEventsWithFilters(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// daemon config file
-	configFilePath := "test.json"
-	configFile, err := os.Create(configFilePath)
-	c.Assert(err, checker.IsNil)
-	defer os.Remove(configFilePath)
-
-	daemonConfig := `{"labels":["foo=bar"]}`
-	fmt.Fprintf(configFile, "%s", daemonConfig)
-	configFile.Close()
-	c.Assert(s.d.Start(fmt.Sprintf("--config-file=%s", configFilePath)), check.IsNil)
-
-	// Get daemon ID
-	out, err := s.d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	daemonID := ""
-	daemonName := ""
-	for _, line := range strings.Split(out, "\n") {
-		if strings.HasPrefix(line, "ID: ") {
-			daemonID = strings.TrimPrefix(line, "ID: ")
-		} else if strings.HasPrefix(line, "Name: ") {
-			daemonName = strings.TrimPrefix(line, "Name: ")
-		}
-	}
-	c.Assert(daemonID, checker.Not(checker.Equals), "")
-
-	syscall.Kill(s.d.cmd.Process.Pid, syscall.SIGHUP)
-
-	time.Sleep(3 * time.Second)
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c), "--filter", fmt.Sprintf("daemon=%s", daemonID))
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s", daemonID))
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c), "--filter", fmt.Sprintf("daemon=%s", daemonName))
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s", daemonID))
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c), "--filter", "daemon=foo")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), fmt.Sprintf("daemon reload %s", daemonID))
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c), "--filter", "type=daemon")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("daemon reload %s", daemonID))
-
-	out, err = s.d.Cmd("events", "--since=0", "--until", daemonUnixTime(c), "--filter", "type=container")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), fmt.Sprintf("daemon reload %s", daemonID))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_test.go
deleted file mode 100644
index cac76d96ae..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_test.go
+++ /dev/null
@@ -1,601 +0,0 @@
-// +build !test_no_exec
-
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"net/http"
-	"os"
-	"os/exec"
-	"reflect"
-	"runtime"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestExec(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--name", "testing", "busybox", "sh", "-c", "echo test > /tmp/file && top")
-	c.Assert(waitRun(strings.TrimSpace(out)), check.IsNil)
-
-	out, _ = dockerCmd(c, "exec", "testing", "cat", "/tmp/file")
-	out = strings.Trim(out, "\r\n")
-	c.Assert(out, checker.Equals, "test")
-
-}
-
-func (s *DockerSuite) TestExecInteractive(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "testing", "busybox", "sh", "-c", "echo test > /tmp/file && top")
-
-	execCmd := exec.Command(dockerBinary, "exec", "-i", "testing", "sh")
-	stdin, err := execCmd.StdinPipe()
-	c.Assert(err, checker.IsNil)
-	stdout, err := execCmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-
-	err = execCmd.Start()
-	c.Assert(err, checker.IsNil)
-	_, err = stdin.Write([]byte("cat /tmp/file\n"))
-	c.Assert(err, checker.IsNil)
-
-	r := bufio.NewReader(stdout)
-	line, err := r.ReadString('\n')
-	c.Assert(err, checker.IsNil)
-	line = strings.TrimSpace(line)
-	c.Assert(line, checker.Equals, "test")
-	err = stdin.Close()
-	c.Assert(err, checker.IsNil)
-	errChan := make(chan error)
-	go func() {
-		errChan <- execCmd.Wait()
-		close(errChan)
-	}()
-	select {
-	case err := <-errChan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(1 * time.Second):
-		c.Fatal("docker exec failed to exit on stdin close")
-	}
-
-}
-
-func (s *DockerSuite) TestExecAfterContainerRestart(c *check.C) {
-	out, _ := runSleepingContainer(c)
-	cleanedContainerID := strings.TrimSpace(out)
-	c.Assert(waitRun(cleanedContainerID), check.IsNil)
-	dockerCmd(c, "restart", cleanedContainerID)
-	c.Assert(waitRun(cleanedContainerID), check.IsNil)
-
-	out, _ = dockerCmd(c, "exec", cleanedContainerID, "echo", "hello")
-	outStr := strings.TrimSpace(out)
-	c.Assert(outStr, checker.Equals, "hello")
-}
-
-func (s *DockerDaemonSuite) TestExecAfterDaemonRestart(c *check.C) {
-	// TODO Windows CI: Requires a little work to get this ported.
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon)
-
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name", "top", "-p", "80", "busybox:latest", "top")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not run top: %s", out))
-
-	err = s.d.Restart()
-	c.Assert(err, checker.IsNil, check.Commentf("Could not restart daemon"))
-
-	out, err = s.d.Cmd("start", "top")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not start top after daemon restart: %s", out))
-
-	out, err = s.d.Cmd("exec", "top", "echo", "hello")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not exec on container top: %s", out))
-
-	outStr := strings.TrimSpace(string(out))
-	c.Assert(outStr, checker.Equals, "hello")
-}
-
-// Regression test for #9155, #9044
-func (s *DockerSuite) TestExecEnv(c *check.C) {
-	// TODO Windows CI: This one is interesting and may just end up being a feature
-	// difference between Windows and Linux. On Windows, the environment is passed
-	// into the process that is launched, not into the machine environment. Hence
-	// a subsequent exec will not have LALA set/
-	testRequires(c, DaemonIsLinux)
-	runSleepingContainer(c, "-e", "LALA=value1", "-e", "LALA=value2", "-d", "--name", "testing")
-	c.Assert(waitRun("testing"), check.IsNil)
-
-	out, _ := dockerCmd(c, "exec", "testing", "env")
-	c.Assert(out, checker.Not(checker.Contains), "LALA=value1")
-	c.Assert(out, checker.Contains, "LALA=value2")
-	c.Assert(out, checker.Contains, "HOME=/root")
-}
-
-func (s *DockerSuite) TestExecSetEnv(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	runSleepingContainer(c, "-e", "HOME=/root", "-d", "--name", "testing")
-	c.Assert(waitRun("testing"), check.IsNil)
-
-	out, _ := dockerCmd(c, "exec", "-e", "HOME=/another", "-e", "ABC=xyz", "testing", "env")
-	c.Assert(out, checker.Not(checker.Contains), "HOME=/root")
-	c.Assert(out, checker.Contains, "HOME=/another")
-	c.Assert(out, checker.Contains, "ABC=xyz")
-}
-
-func (s *DockerSuite) TestExecExitStatus(c *check.C) {
-	runSleepingContainer(c, "-d", "--name", "top")
-
-	result := icmd.RunCommand(dockerBinary, "exec", "top", "sh", "-c", "exit 23")
-	c.Assert(result, icmd.Matches, icmd.Expected{ExitCode: 23, Error: "exit status 23"})
-}
-
-func (s *DockerSuite) TestExecPausedContainer(c *check.C) {
-	testRequires(c, IsPausable)
-	defer unpauseAllContainers()
-
-	out, _ := runSleepingContainer(c, "-d", "--name", "testing")
-	ContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "pause", "testing")
-	out, _, err := dockerCmdWithError("exec", "-i", "-t", ContainerID, "echo", "hello")
-	c.Assert(err, checker.NotNil, check.Commentf("container should fail to exec new conmmand if it is paused"))
-
-	expected := ContainerID + " is paused, unpause the container before exec"
-	c.Assert(out, checker.Contains, expected, check.Commentf("container should not exec new command if it is paused"))
-}
-
-// regression test for #9476
-func (s *DockerSuite) TestExecTTYCloseStdin(c *check.C) {
-	// TODO Windows CI: This requires some work to port to Windows.
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "-it", "--name", "exec_tty_stdin", "busybox")
-
-	cmd := exec.Command(dockerBinary, "exec", "-i", "exec_tty_stdin", "cat")
-	stdinRw, err := cmd.StdinPipe()
-	c.Assert(err, checker.IsNil)
-
-	stdinRw.Write([]byte("test"))
-	stdinRw.Close()
-
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, _ = dockerCmd(c, "top", "exec_tty_stdin")
-	outArr := strings.Split(out, "\n")
-	c.Assert(len(outArr), checker.LessOrEqualThan, 3, check.Commentf("exec process left running"))
-	c.Assert(out, checker.Not(checker.Contains), "nsenter-exec")
-}
-
-func (s *DockerSuite) TestExecTTYWithoutStdin(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "-ti", "busybox")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	errChan := make(chan error)
-	go func() {
-		defer close(errChan)
-
-		cmd := exec.Command(dockerBinary, "exec", "-ti", id, "true")
-		if _, err := cmd.StdinPipe(); err != nil {
-			errChan <- err
-			return
-		}
-
-		expected := "the input device is not a TTY"
-		if runtime.GOOS == "windows" {
-			expected += ".  If you are using mintty, try prefixing the command with 'winpty'"
-		}
-		if out, _, err := runCommandWithOutput(cmd); err == nil {
-			errChan <- fmt.Errorf("exec should have failed")
-			return
-		} else if !strings.Contains(out, expected) {
-			errChan <- fmt.Errorf("exec failed with error %q: expected %q", out, expected)
-			return
-		}
-	}()
-
-	select {
-	case err := <-errChan:
-		c.Assert(err, check.IsNil)
-	case <-time.After(3 * time.Second):
-		c.Fatal("exec is running but should have failed")
-	}
-}
-
-func (s *DockerSuite) TestExecParseError(c *check.C) {
-	// TODO Windows CI: Requires some extra work. Consider copying the
-	// runSleepingContainer helper to have an exec version.
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "top", "busybox", "top")
-
-	// Test normal (non-detached) case first
-	cmd := exec.Command(dockerBinary, "exec", "top")
-	_, stderr, _, err := runCommandWithStdoutStderr(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(stderr, checker.Contains, "See 'docker exec --help'")
-}
-
-func (s *DockerSuite) TestExecStopNotHanging(c *check.C) {
-	// TODO Windows CI: Requires some extra work. Consider copying the
-	// runSleepingContainer helper to have an exec version.
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "testing", "busybox", "top")
-
-	err := exec.Command(dockerBinary, "exec", "testing", "top").Start()
-	c.Assert(err, checker.IsNil)
-
-	type dstop struct {
-		out []byte
-		err error
-	}
-
-	ch := make(chan dstop)
-	go func() {
-		out, err := exec.Command(dockerBinary, "stop", "testing").CombinedOutput()
-		ch <- dstop{out, err}
-		close(ch)
-	}()
-	select {
-	case <-time.After(3 * time.Second):
-		c.Fatal("Container stop timed out")
-	case s := <-ch:
-		c.Assert(s.err, check.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestExecCgroup(c *check.C) {
-	// Not applicable on Windows - using Linux specific functionality
-	testRequires(c, NotUserNamespace)
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "testing", "busybox", "top")
-
-	out, _ := dockerCmd(c, "exec", "testing", "cat", "/proc/1/cgroup")
-	containerCgroups := sort.StringSlice(strings.Split(out, "\n"))
-
-	var wg sync.WaitGroup
-	var mu sync.Mutex
-	execCgroups := []sort.StringSlice{}
-	errChan := make(chan error)
-	// exec a few times concurrently to get consistent failure
-	for i := 0; i < 5; i++ {
-		wg.Add(1)
-		go func() {
-			out, _, err := dockerCmdWithError("exec", "testing", "cat", "/proc/self/cgroup")
-			if err != nil {
-				errChan <- err
-				return
-			}
-			cg := sort.StringSlice(strings.Split(out, "\n"))
-
-			mu.Lock()
-			execCgroups = append(execCgroups, cg)
-			mu.Unlock()
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-	close(errChan)
-
-	for err := range errChan {
-		c.Assert(err, checker.IsNil)
-	}
-
-	for _, cg := range execCgroups {
-		if !reflect.DeepEqual(cg, containerCgroups) {
-			fmt.Println("exec cgroups:")
-			for _, name := range cg {
-				fmt.Printf(" %s\n", name)
-			}
-
-			fmt.Println("container cgroups:")
-			for _, name := range containerCgroups {
-				fmt.Printf(" %s\n", name)
-			}
-			c.Fatal("cgroups mismatched")
-		}
-	}
-}
-
-func (s *DockerSuite) TestExecInspectID(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	id := strings.TrimSuffix(out, "\n")
-
-	out = inspectField(c, id, "ExecIDs")
-	c.Assert(out, checker.Equals, "[]", check.Commentf("ExecIDs should be empty, got: %s", out))
-
-	// Start an exec, have it block waiting so we can do some checking
-	cmd := exec.Command(dockerBinary, "exec", id, "sh", "-c",
-		"while ! test -e /execid1; do sleep 1; done")
-
-	err := cmd.Start()
-	c.Assert(err, checker.IsNil, check.Commentf("failed to start the exec cmd"))
-
-	// Give the exec 10 chances/seconds to start then give up and stop the test
-	tries := 10
-	for i := 0; i < tries; i++ {
-		// Since its still running we should see exec as part of the container
-		out = strings.TrimSpace(inspectField(c, id, "ExecIDs"))
-
-		if out != "[]" && out != "<no value>" {
-			break
-		}
-		c.Assert(i+1, checker.Not(checker.Equals), tries, check.Commentf("ExecIDs still empty after 10 second"))
-		time.Sleep(1 * time.Second)
-	}
-
-	// Save execID for later
-	execID, err := inspectFilter(id, "index .ExecIDs 0")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to get the exec id"))
-
-	// End the exec by creating the missing file
-	err = exec.Command(dockerBinary, "exec", id,
-		"sh", "-c", "touch /execid1").Run()
-
-	c.Assert(err, checker.IsNil, check.Commentf("failed to run the 2nd exec cmd"))
-
-	// Wait for 1st exec to complete
-	cmd.Wait()
-
-	// Give the exec 10 chances/seconds to stop then give up and stop the test
-	for i := 0; i < tries; i++ {
-		// Since its still running we should see exec as part of the container
-		out = strings.TrimSpace(inspectField(c, id, "ExecIDs"))
-
-		if out == "[]" {
-			break
-		}
-		c.Assert(i+1, checker.Not(checker.Equals), tries, check.Commentf("ExecIDs still not empty after 10 second"))
-		time.Sleep(1 * time.Second)
-	}
-
-	// But we should still be able to query the execID
-	sc, body, err := sockRequest("GET", "/exec/"+execID+"/json", nil)
-	c.Assert(sc, checker.Equals, http.StatusOK, check.Commentf("received status != 200 OK: %d\n%s", sc, body))
-
-	// Now delete the container and then an 'inspect' on the exec should
-	// result in a 404 (not 'container not running')
-	out, ec := dockerCmd(c, "rm", "-f", id)
-	c.Assert(ec, checker.Equals, 0, check.Commentf("error removing container: %s", out))
-	sc, body, err = sockRequest("GET", "/exec/"+execID+"/json", nil)
-	c.Assert(sc, checker.Equals, http.StatusNotFound, check.Commentf("received status != 404: %d\n%s", sc, body))
-}
-
-func (s *DockerSuite) TestLinksPingLinkedContainersOnRename(c *check.C) {
-	// Problematic on Windows as Windows does not support links
-	testRequires(c, DaemonIsLinux)
-	var out string
-	out, _ = dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
-	idA := strings.TrimSpace(out)
-	c.Assert(idA, checker.Not(checker.Equals), "", check.Commentf("%s, id should not be nil", out))
-	out, _ = dockerCmd(c, "run", "-d", "--link", "container1:alias1", "--name", "container2", "busybox", "top")
-	idB := strings.TrimSpace(out)
-	c.Assert(idB, checker.Not(checker.Equals), "", check.Commentf("%s, id should not be nil", out))
-
-	dockerCmd(c, "exec", "container2", "ping", "-c", "1", "alias1", "-W", "1")
-	dockerCmd(c, "rename", "container1", "container_new")
-	dockerCmd(c, "exec", "container2", "ping", "-c", "1", "alias1", "-W", "1")
-}
-
-func (s *DockerSuite) TestRunMutableNetworkFiles(c *check.C) {
-	// Not applicable on Windows to Windows CI.
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-	for _, fn := range []string{"resolv.conf", "hosts"} {
-		deleteAllContainers()
-
-		content, err := runCommandAndReadContainerFile(fn, exec.Command(dockerBinary, "run", "-d", "--name", "c1", "busybox", "sh", "-c", fmt.Sprintf("echo success >/etc/%s && top", fn)))
-		c.Assert(err, checker.IsNil)
-
-		c.Assert(strings.TrimSpace(string(content)), checker.Equals, "success", check.Commentf("Content was not what was modified in the container", string(content)))
-
-		out, _ := dockerCmd(c, "run", "-d", "--name", "c2", "busybox", "top")
-		contID := strings.TrimSpace(out)
-		netFilePath := containerStorageFile(contID, fn)
-
-		f, err := os.OpenFile(netFilePath, os.O_WRONLY|os.O_SYNC|os.O_APPEND, 0644)
-		c.Assert(err, checker.IsNil)
-
-		if _, err := f.Seek(0, 0); err != nil {
-			f.Close()
-			c.Fatal(err)
-		}
-
-		if err := f.Truncate(0); err != nil {
-			f.Close()
-			c.Fatal(err)
-		}
-
-		if _, err := f.Write([]byte("success2\n")); err != nil {
-			f.Close()
-			c.Fatal(err)
-		}
-		f.Close()
-
-		res, _ := dockerCmd(c, "exec", contID, "cat", "/etc/"+fn)
-		c.Assert(res, checker.Equals, "success2\n")
-	}
-}
-
-func (s *DockerSuite) TestExecWithUser(c *check.C) {
-	// TODO Windows CI: This may be fixable in the future once Windows
-	// supports users
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")
-
-	out, _ := dockerCmd(c, "exec", "-u", "1", "parent", "id")
-	c.Assert(out, checker.Contains, "uid=1(daemon) gid=1(daemon)")
-
-	out, _ = dockerCmd(c, "exec", "-u", "root", "parent", "id")
-	c.Assert(out, checker.Contains, "uid=0(root) gid=0(root)", check.Commentf("exec with user by id expected daemon user got %s", out))
-}
-
-func (s *DockerSuite) TestExecWithPrivileged(c *check.C) {
-	// Not applicable on Windows
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	// Start main loop which attempts mknod repeatedly
-	dockerCmd(c, "run", "-d", "--name", "parent", "--cap-drop=ALL", "busybox", "sh", "-c", `while (true); do if [ -e /exec_priv ]; then cat /exec_priv && mknod /tmp/sda b 8 0 && echo "Success"; else echo "Privileged exec has not run yet"; fi; usleep 10000; done`)
-
-	// Check exec mknod doesn't work
-	cmd := exec.Command(dockerBinary, "exec", "parent", "sh", "-c", "mknod /tmp/sdb b 8 16")
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.NotNil, check.Commentf("exec mknod in --cap-drop=ALL container without --privileged should fail"))
-	c.Assert(out, checker.Contains, "Operation not permitted", check.Commentf("exec mknod in --cap-drop=ALL container without --privileged should fail"))
-
-	// Check exec mknod does work with --privileged
-	cmd = exec.Command(dockerBinary, "exec", "--privileged", "parent", "sh", "-c", `echo "Running exec --privileged" > /exec_priv && mknod /tmp/sdb b 8 16 && usleep 50000 && echo "Finished exec --privileged" > /exec_priv && echo ok`)
-	out, _, err = runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil)
-
-	actual := strings.TrimSpace(out)
-	c.Assert(actual, checker.Equals, "ok", check.Commentf("exec mknod in --cap-drop=ALL container with --privileged failed, output: %q", out))
-
-	// Check subsequent unprivileged exec cannot mknod
-	cmd = exec.Command(dockerBinary, "exec", "parent", "sh", "-c", "mknod /tmp/sdc b 8 32")
-	out, _, err = runCommandWithOutput(cmd)
-	c.Assert(err, checker.NotNil, check.Commentf("repeating exec mknod in --cap-drop=ALL container after --privileged without --privileged should fail"))
-	c.Assert(out, checker.Contains, "Operation not permitted", check.Commentf("repeating exec mknod in --cap-drop=ALL container after --privileged without --privileged should fail"))
-
-	// Confirm at no point was mknod allowed
-	logCmd := exec.Command(dockerBinary, "logs", "parent")
-	out, _, err = runCommandWithOutput(logCmd)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), "Success")
-
-}
-
-func (s *DockerSuite) TestExecWithImageUser(c *check.C) {
-	// Not applicable on Windows
-	testRequires(c, DaemonIsLinux)
-	name := "testbuilduser"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-		USER dockerio`,
-		true)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "run", "-d", "--name", "dockerioexec", name, "top")
-
-	out, _ := dockerCmd(c, "exec", "dockerioexec", "whoami")
-	c.Assert(out, checker.Contains, "dockerio", check.Commentf("exec with user by id expected dockerio user got %s", out))
-}
-
-func (s *DockerSuite) TestExecOnReadonlyContainer(c *check.C) {
-	// Windows does not support read-only
-	// --read-only + userns has remount issues
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "run", "-d", "--read-only", "--name", "parent", "busybox", "top")
-	dockerCmd(c, "exec", "parent", "true")
-}
-
-func (s *DockerSuite) TestExecUlimits(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "testexeculimits"
-	runSleepingContainer(c, "-d", "--ulimit", "nproc=21", "--name", name)
-	c.Assert(waitRun(name), checker.IsNil)
-
-	out, _, err := dockerCmdWithError("exec", name, "sh", "-c", "ulimit -p")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "21")
-}
-
-// #15750
-func (s *DockerSuite) TestExecStartFails(c *check.C) {
-	// TODO Windows CI. This test should be portable. Figure out why it fails
-	// currently.
-	testRequires(c, DaemonIsLinux)
-	name := "exec-15750"
-	runSleepingContainer(c, "-d", "--name", name)
-	c.Assert(waitRun(name), checker.IsNil)
-
-	out, _, err := dockerCmdWithError("exec", name, "no-such-cmd")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "executable file not found")
-}
-
-// Fix regression in https://github.com/docker/docker/pull/26461#issuecomment-250287297
-func (s *DockerSuite) TestExecWindowsPathNotWiped(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	out, _ := dockerCmd(c, "run", "-d", "--name", "testing", minimalBaseImage(), "powershell", "start-sleep", "60")
-	c.Assert(waitRun(strings.TrimSpace(out)), check.IsNil)
-
-	out, _ = dockerCmd(c, "exec", "testing", "powershell", "write-host", "$env:PATH")
-	out = strings.ToLower(strings.Trim(out, "\r\n"))
-	c.Assert(out, checker.Contains, `windowspowershell\v1.0`)
-}
-
-func (s *DockerSuite) TestExecEnvLinksHost(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	runSleepingContainer(c, "-d", "--name", "foo")
-	runSleepingContainer(c, "-d", "--link", "foo:db", "--hostname", "myhost", "--name", "bar")
-	out, _ := dockerCmd(c, "exec", "bar", "env")
-	c.Assert(out, checker.Contains, "HOSTNAME=myhost")
-	c.Assert(out, checker.Contains, "DB_NAME=/bar/db")
-}
-
-func (s *DockerSuite) TestExecWindowsOpenHandles(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	runSleepingContainer(c, "-d", "--name", "test")
-	exec := make(chan bool)
-	go func() {
-		dockerCmd(c, "exec", "test", "cmd", "/c", "start sleep 10")
-		exec <- true
-	}()
-
-	for {
-		top := make(chan string)
-		var out string
-		go func() {
-			out, _ := dockerCmd(c, "top", "test")
-			top <- out
-		}()
-
-		select {
-		case <-time.After(time.Second * 5):
-			c.Error("timed out waiting for top while exec is exiting")
-		case out = <-top:
-			break
-		}
-
-		if strings.Count(out, "busybox.exe") == 2 && !strings.Contains(out, "cmd.exe") {
-			// The initial exec process (cmd.exe) has exited, and both sleeps are currently running
-			break
-		}
-		time.Sleep(1 * time.Second)
-	}
-
-	inspect := make(chan bool)
-	go func() {
-		dockerCmd(c, "inspect", "test")
-		inspect <- true
-	}()
-
-	select {
-	case <-time.After(time.Second * 5):
-		c.Error("timed out waiting for inspect while exec is exiting")
-	case <-inspect:
-		break
-	}
-
-	// Ensure the background sleep is still running
-	out, _ := dockerCmd(c, "top", "test")
-	c.Assert(strings.Count(out, "busybox.exe"), checker.Equals, 2)
-
-	// The exec should exit when the background sleep exits
-	select {
-	case <-time.After(time.Second * 15):
-		c.Error("timed out waiting for async exec to exit")
-	case <-exec:
-		// Ensure the background sleep has actually exited
-		out, _ := dockerCmd(c, "top", "test")
-		c.Assert(strings.Count(out, "busybox.exe"), checker.Equals, 1)
-		break
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_unix_test.go
deleted file mode 100644
index 5f691196f1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_exec_unix_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// +build !windows,!test_no_exec
-
-package main
-
-import (
-	"bytes"
-	"io"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// regression test for #12546
-func (s *DockerSuite) TestExecInteractiveStdinClose(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-itd", "busybox", "/bin/cat")
-	contID := strings.TrimSpace(out)
-
-	cmd := exec.Command(dockerBinary, "exec", "-i", contID, "echo", "-n", "hello")
-	p, err := pty.Start(cmd)
-	c.Assert(err, checker.IsNil)
-
-	b := bytes.NewBuffer(nil)
-	go io.Copy(b, p)
-
-	ch := make(chan error)
-	go func() { ch <- cmd.Wait() }()
-
-	select {
-	case err := <-ch:
-		c.Assert(err, checker.IsNil)
-		output := b.String()
-		c.Assert(strings.TrimSpace(output), checker.Equals, "hello")
-	case <-time.After(5 * time.Second):
-		c.Fatal("timed out running docker exec")
-	}
-}
-
-func (s *DockerSuite) TestExecTTY(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	dockerCmd(c, "run", "-d", "--name=test", "busybox", "sh", "-c", "echo hello > /foo && top")
-
-	cmd := exec.Command(dockerBinary, "exec", "-it", "test", "sh")
-	p, err := pty.Start(cmd)
-	c.Assert(err, checker.IsNil)
-	defer p.Close()
-
-	_, err = p.Write([]byte("cat /foo && exit\n"))
-	c.Assert(err, checker.IsNil)
-
-	chErr := make(chan error)
-	go func() {
-		chErr <- cmd.Wait()
-	}()
-	select {
-	case err := <-chErr:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(3 * time.Second):
-		c.Fatal("timeout waiting for exec to exit")
-	}
-
-	buf := make([]byte, 256)
-	read, err := p.Read(buf)
-	c.Assert(err, checker.IsNil)
-	c.Assert(bytes.Contains(buf, []byte("hello")), checker.Equals, true, check.Commentf(string(buf[:read])))
-}
-
-// Test the the TERM env var is set when -t is provided on exec
-func (s *DockerSuite) TestExecWithTERM(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	out, _ := dockerCmd(c, "run", "-id", "busybox", "/bin/cat")
-	contID := strings.TrimSpace(out)
-	cmd := exec.Command(dockerBinary, "exec", "-t", contID, "sh", "-c", "if [ -z $TERM ]; then exit 1; else exit 0; fi")
-	if err := cmd.Run(); err != nil {
-		c.Assert(err, checker.IsNil)
-	}
-}
-
-// Test that the TERM env var is not set on exec when -t is not provided, even if it was set
-// on run
-func (s *DockerSuite) TestExecWithNoTERM(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	out, _ := dockerCmd(c, "run", "-itd", "busybox", "/bin/cat")
-	contID := strings.TrimSpace(out)
-	cmd := exec.Command(dockerBinary, "exec", contID, "sh", "-c", "if [ -z $TERM ]; then exit 0; else exit 1; fi")
-	if err := cmd.Run(); err != nil {
-		c.Assert(err, checker.IsNil)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_experimental_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_experimental_test.go
deleted file mode 100644
index 6a49cc8cb1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_experimental_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestExperimentalVersionTrue(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-
-	out, _ := dockerCmd(c, "version")
-	for _, line := range strings.Split(out, "\n") {
-		if strings.HasPrefix(strings.TrimSpace(line), "Experimental:") {
-			c.Assert(line, checker.Matches, "*true")
-			return
-		}
-	}
-
-	c.Fatal(`"Experimental" not found in version output`)
-}
-
-func (s *DockerSuite) TestExperimentalVersionFalse(c *check.C) {
-	testRequires(c, NotExperimentalDaemon)
-
-	out, _ := dockerCmd(c, "version")
-	for _, line := range strings.Split(out, "\n") {
-		if strings.HasPrefix(strings.TrimSpace(line), "Experimental:") {
-			c.Assert(line, checker.Matches, "*false")
-			return
-		}
-	}
-
-	c.Fatal(`"Experimental" not found in version output`)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_export_import_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_export_import_test.go
deleted file mode 100644
index 069dc08162..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_export_import_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package main
-
-import (
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// export an image and try to import it into a new one
-func (s *DockerSuite) TestExportContainerAndImportImage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := "testexportcontainerandimportimage"
-
-	dockerCmd(c, "run", "--name", containerID, "busybox", "true")
-
-	out, _ := dockerCmd(c, "export", containerID)
-
-	importCmd := exec.Command(dockerBinary, "import", "-", "repo/testexp:v1")
-	importCmd.Stdin = strings.NewReader(out)
-	out, _, err := runCommandWithOutput(importCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to import image repo/testexp:v1: %s", out))
-
-	cleanedImageID := strings.TrimSpace(out)
-	c.Assert(cleanedImageID, checker.Not(checker.Equals), "", check.Commentf("output should have been an image id"))
-}
-
-// Used to test output flag in the export command
-func (s *DockerSuite) TestExportContainerWithOutputAndImportImage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	containerID := "testexportcontainerwithoutputandimportimage"
-
-	dockerCmd(c, "run", "--name", containerID, "busybox", "true")
-	dockerCmd(c, "export", "--output=testexp.tar", containerID)
-	defer os.Remove("testexp.tar")
-
-	out, _, err := runCommandWithOutput(exec.Command("cat", "testexp.tar"))
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	importCmd := exec.Command(dockerBinary, "import", "-", "repo/testexp:v1")
-	importCmd.Stdin = strings.NewReader(out)
-	out, _, err = runCommandWithOutput(importCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to import image repo/testexp:v1: %s", out))
-
-	cleanedImageID := strings.TrimSpace(out)
-	c.Assert(cleanedImageID, checker.Not(checker.Equals), "", check.Commentf("output should have been an image id"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_graphdriver_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_graphdriver_unix_test.go
deleted file mode 100644
index a794ca742d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_graphdriver_unix_test.go
+++ /dev/null
@@ -1,405 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"strings"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/vfs"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/go-check/check"
-)
-
-func init() {
-	check.Suite(&DockerExternalGraphdriverSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerExternalGraphdriverSuite struct {
-	server  *httptest.Server
-	jserver *httptest.Server
-	ds      *DockerSuite
-	d       *Daemon
-	ec      map[string]*graphEventsCounter
-}
-
-type graphEventsCounter struct {
-	activations int
-	creations   int
-	removals    int
-	gets        int
-	puts        int
-	stats       int
-	cleanups    int
-	exists      int
-	init        int
-	metadata    int
-	diff        int
-	applydiff   int
-	changes     int
-	diffsize    int
-}
-
-func (s *DockerExternalGraphdriverSuite) SetUpTest(c *check.C) {
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerExternalGraphdriverSuite) OnTimeout(c *check.C) {
-	s.d.DumpStackAndQuit()
-}
-
-func (s *DockerExternalGraphdriverSuite) TearDownTest(c *check.C) {
-	s.d.Stop()
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerExternalGraphdriverSuite) SetUpSuite(c *check.C) {
-	s.ec = make(map[string]*graphEventsCounter)
-	s.setUpPluginViaSpecFile(c)
-	s.setUpPluginViaJSONFile(c)
-}
-
-func (s *DockerExternalGraphdriverSuite) setUpPluginViaSpecFile(c *check.C) {
-	mux := http.NewServeMux()
-	s.server = httptest.NewServer(mux)
-
-	s.setUpPlugin(c, "test-external-graph-driver", "spec", mux, []byte(s.server.URL))
-}
-
-func (s *DockerExternalGraphdriverSuite) setUpPluginViaJSONFile(c *check.C) {
-	mux := http.NewServeMux()
-	s.jserver = httptest.NewServer(mux)
-
-	p := plugins.NewLocalPlugin("json-external-graph-driver", s.jserver.URL)
-	b, err := json.Marshal(p)
-	c.Assert(err, check.IsNil)
-
-	s.setUpPlugin(c, "json-external-graph-driver", "json", mux, b)
-}
-
-func (s *DockerExternalGraphdriverSuite) setUpPlugin(c *check.C, name string, ext string, mux *http.ServeMux, b []byte) {
-	type graphDriverRequest struct {
-		ID         string `json:",omitempty"`
-		Parent     string `json:",omitempty"`
-		MountLabel string `json:",omitempty"`
-		ReadOnly   bool   `json:",omitempty"`
-	}
-
-	type graphDriverResponse struct {
-		Err      error             `json:",omitempty"`
-		Dir      string            `json:",omitempty"`
-		Exists   bool              `json:",omitempty"`
-		Status   [][2]string       `json:",omitempty"`
-		Metadata map[string]string `json:",omitempty"`
-		Changes  []archive.Change  `json:",omitempty"`
-		Size     int64             `json:",omitempty"`
-	}
-
-	respond := func(w http.ResponseWriter, data interface{}) {
-		w.Header().Set("Content-Type", "appplication/vnd.docker.plugins.v1+json")
-		switch t := data.(type) {
-		case error:
-			fmt.Fprintln(w, fmt.Sprintf(`{"Err": %q}`, t.Error()))
-		case string:
-			fmt.Fprintln(w, t)
-		default:
-			json.NewEncoder(w).Encode(&data)
-		}
-	}
-
-	decReq := func(b io.ReadCloser, out interface{}, w http.ResponseWriter) error {
-		defer b.Close()
-		if err := json.NewDecoder(b).Decode(&out); err != nil {
-			http.Error(w, fmt.Sprintf("error decoding json: %s", err.Error()), 500)
-		}
-		return nil
-	}
-
-	base, err := ioutil.TempDir("", name)
-	c.Assert(err, check.IsNil)
-	vfsProto, err := vfs.Init(base, []string{}, nil, nil)
-	c.Assert(err, check.IsNil, check.Commentf("error initializing graph driver"))
-	driver := graphdriver.NewNaiveDiffDriver(vfsProto, nil, nil)
-
-	s.ec[ext] = &graphEventsCounter{}
-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].activations++
-		respond(w, `{"Implements": ["GraphDriver"]}`)
-	})
-
-	mux.HandleFunc("/GraphDriver.Init", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].init++
-		respond(w, "{}")
-	})
-
-	mux.HandleFunc("/GraphDriver.CreateReadWrite", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].creations++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-		if err := driver.CreateReadWrite(req.ID, req.Parent, nil); err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, "{}")
-	})
-
-	mux.HandleFunc("/GraphDriver.Create", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].creations++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-		if err := driver.Create(req.ID, req.Parent, nil); err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, "{}")
-	})
-
-	mux.HandleFunc("/GraphDriver.Remove", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].removals++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		if err := driver.Remove(req.ID); err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, "{}")
-	})
-
-	mux.HandleFunc("/GraphDriver.Get", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].gets++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		dir, err := driver.Get(req.ID, req.MountLabel)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, &graphDriverResponse{Dir: dir})
-	})
-
-	mux.HandleFunc("/GraphDriver.Put", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].puts++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		if err := driver.Put(req.ID); err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, "{}")
-	})
-
-	mux.HandleFunc("/GraphDriver.Exists", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].exists++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-		respond(w, &graphDriverResponse{Exists: driver.Exists(req.ID)})
-	})
-
-	mux.HandleFunc("/GraphDriver.Status", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].stats++
-		respond(w, &graphDriverResponse{Status: driver.Status()})
-	})
-
-	mux.HandleFunc("/GraphDriver.Cleanup", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].cleanups++
-		err := driver.Cleanup()
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, `{}`)
-	})
-
-	mux.HandleFunc("/GraphDriver.GetMetadata", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].metadata++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		data, err := driver.GetMetadata(req.ID)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, &graphDriverResponse{Metadata: data})
-	})
-
-	mux.HandleFunc("/GraphDriver.Diff", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].diff++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		diff, err := driver.Diff(req.ID, req.Parent)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		io.Copy(w, diff)
-	})
-
-	mux.HandleFunc("/GraphDriver.Changes", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].changes++
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		changes, err := driver.Changes(req.ID, req.Parent)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, &graphDriverResponse{Changes: changes})
-	})
-
-	mux.HandleFunc("/GraphDriver.ApplyDiff", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].applydiff++
-		diff := r.Body
-		defer r.Body.Close()
-
-		id := r.URL.Query().Get("id")
-		parent := r.URL.Query().Get("parent")
-
-		if id == "" {
-			http.Error(w, fmt.Sprintf("missing id"), 409)
-		}
-
-		size, err := driver.ApplyDiff(id, parent, diff)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, &graphDriverResponse{Size: size})
-	})
-
-	mux.HandleFunc("/GraphDriver.DiffSize", func(w http.ResponseWriter, r *http.Request) {
-		s.ec[ext].diffsize++
-
-		var req graphDriverRequest
-		if err := decReq(r.Body, &req, w); err != nil {
-			return
-		}
-
-		size, err := driver.DiffSize(req.ID, req.Parent)
-		if err != nil {
-			respond(w, err)
-			return
-		}
-		respond(w, &graphDriverResponse{Size: size})
-	})
-
-	err = os.MkdirAll("/etc/docker/plugins", 0755)
-	c.Assert(err, check.IsNil, check.Commentf("error creating /etc/docker/plugins"))
-
-	specFile := "/etc/docker/plugins/" + name + "." + ext
-	err = ioutil.WriteFile(specFile, b, 0644)
-	c.Assert(err, check.IsNil, check.Commentf("error writing to %s", specFile))
-}
-
-func (s *DockerExternalGraphdriverSuite) TearDownSuite(c *check.C) {
-	s.server.Close()
-	s.jserver.Close()
-
-	err := os.RemoveAll("/etc/docker/plugins")
-	c.Assert(err, check.IsNil, check.Commentf("error removing /etc/docker/plugins"))
-}
-
-func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriver(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-
-	s.testExternalGraphDriver("test-external-graph-driver", "spec", c)
-	s.testExternalGraphDriver("json-external-graph-driver", "json", c)
-}
-
-func (s *DockerExternalGraphdriverSuite) testExternalGraphDriver(name string, ext string, c *check.C) {
-	if err := s.d.StartWithBusybox("-s", name); err != nil {
-		b, _ := ioutil.ReadFile(s.d.LogFileName())
-		c.Assert(err, check.IsNil, check.Commentf("\n%s", string(b)))
-	}
-
-	out, err := s.d.Cmd("run", "--name=graphtest", "busybox", "sh", "-c", "echo hello > /hello")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	err = s.d.Restart("-s", name)
-
-	out, err = s.d.Cmd("inspect", "--format={{.GraphDriver.Name}}", "graphtest")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), check.Equals, name)
-
-	out, err = s.d.Cmd("diff", "graphtest")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(strings.Contains(out, "A /hello"), check.Equals, true, check.Commentf("diff output: %s", out))
-
-	out, err = s.d.Cmd("rm", "-f", "graphtest")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("info")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	err = s.d.Stop()
-	c.Assert(err, check.IsNil)
-
-	// Don't check s.ec.exists, because the daemon no longer calls the
-	// Exists function.
-	c.Assert(s.ec[ext].activations, check.Equals, 2)
-	c.Assert(s.ec[ext].init, check.Equals, 2)
-	c.Assert(s.ec[ext].creations >= 1, check.Equals, true)
-	c.Assert(s.ec[ext].removals >= 1, check.Equals, true)
-	c.Assert(s.ec[ext].gets >= 1, check.Equals, true)
-	c.Assert(s.ec[ext].puts >= 1, check.Equals, true)
-	c.Assert(s.ec[ext].stats, check.Equals, 5)
-	c.Assert(s.ec[ext].cleanups, check.Equals, 2)
-	c.Assert(s.ec[ext].applydiff >= 1, check.Equals, true)
-	c.Assert(s.ec[ext].changes, check.Equals, 1)
-	c.Assert(s.ec[ext].diffsize, check.Equals, 0)
-	c.Assert(s.ec[ext].diff, check.Equals, 0)
-	c.Assert(s.ec[ext].metadata, check.Equals, 1)
-}
-
-func (s *DockerExternalGraphdriverSuite) TestExternalGraphDriverPull(c *check.C) {
-	testRequires(c, Network, ExperimentalDaemon)
-
-	c.Assert(s.d.Start(), check.IsNil)
-
-	out, err := s.d.Cmd("pull", "busybox:latest")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_volume_driver_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_volume_driver_unix_test.go
deleted file mode 100644
index 806d87ec77..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_external_volume_driver_unix_test.go
+++ /dev/null
@@ -1,627 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/volume"
-	"github.com/go-check/check"
-)
-
-const volumePluginName = "test-external-volume-driver"
-
-func init() {
-	check.Suite(&DockerExternalVolumeSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type eventCounter struct {
-	activations int
-	creations   int
-	removals    int
-	mounts      int
-	unmounts    int
-	paths       int
-	lists       int
-	gets        int
-	caps        int
-}
-
-type DockerExternalVolumeSuite struct {
-	ds *DockerSuite
-	d  *Daemon
-	*volumePlugin
-}
-
-func (s *DockerExternalVolumeSuite) SetUpTest(c *check.C) {
-	s.d = NewDaemon(c)
-	s.ec = &eventCounter{}
-}
-
-func (s *DockerExternalVolumeSuite) TearDownTest(c *check.C) {
-	s.d.Stop()
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerExternalVolumeSuite) SetUpSuite(c *check.C) {
-	s.volumePlugin = newVolumePlugin(c, volumePluginName)
-}
-
-type volumePlugin struct {
-	ec *eventCounter
-	*httptest.Server
-	vols map[string]vol
-}
-
-type vol struct {
-	Name       string
-	Mountpoint string
-	Ninja      bool // hack used to trigger a null volume return on `Get`
-	Status     map[string]interface{}
-	Options    map[string]string
-}
-
-func (p *volumePlugin) Close() {
-	p.Server.Close()
-}
-
-func newVolumePlugin(c *check.C, name string) *volumePlugin {
-	mux := http.NewServeMux()
-	s := &volumePlugin{Server: httptest.NewServer(mux), ec: &eventCounter{}, vols: make(map[string]vol)}
-
-	type pluginRequest struct {
-		Name string
-		Opts map[string]string
-		ID   string
-	}
-
-	type pluginResp struct {
-		Mountpoint string `json:",omitempty"`
-		Err        string `json:",omitempty"`
-	}
-
-	read := func(b io.ReadCloser) (pluginRequest, error) {
-		defer b.Close()
-		var pr pluginRequest
-		if err := json.NewDecoder(b).Decode(&pr); err != nil {
-			return pr, err
-		}
-		return pr, nil
-	}
-
-	send := func(w http.ResponseWriter, data interface{}) {
-		switch t := data.(type) {
-		case error:
-			http.Error(w, t.Error(), 500)
-		case string:
-			w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-			fmt.Fprintln(w, t)
-		default:
-			w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-			json.NewEncoder(w).Encode(&data)
-		}
-	}
-
-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.activations++
-		send(w, `{"Implements": ["VolumeDriver"]}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Create", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.creations++
-		pr, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-		_, isNinja := pr.Opts["ninja"]
-		status := map[string]interface{}{"Hello": "world"}
-		s.vols[pr.Name] = vol{Name: pr.Name, Ninja: isNinja, Status: status, Options: pr.Opts}
-		send(w, nil)
-	})
-
-	mux.HandleFunc("/VolumeDriver.List", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.lists++
-		vols := make([]vol, 0, len(s.vols))
-		for _, v := range s.vols {
-			if v.Ninja {
-				continue
-			}
-			vols = append(vols, v)
-		}
-		send(w, map[string][]vol{"Volumes": vols})
-	})
-
-	mux.HandleFunc("/VolumeDriver.Get", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.gets++
-		pr, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-
-		v, exists := s.vols[pr.Name]
-		if !exists {
-			send(w, `{"Err": "no such volume"}`)
-		}
-
-		if v.Ninja {
-			send(w, map[string]vol{})
-			return
-		}
-
-		v.Mountpoint = hostVolumePath(pr.Name)
-		send(w, map[string]vol{"Volume": v})
-		return
-	})
-
-	mux.HandleFunc("/VolumeDriver.Remove", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.removals++
-		pr, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-
-		v, ok := s.vols[pr.Name]
-		if !ok {
-			send(w, nil)
-			return
-		}
-
-		if err := os.RemoveAll(hostVolumePath(v.Name)); err != nil {
-			send(w, &pluginResp{Err: err.Error()})
-			return
-		}
-		delete(s.vols, v.Name)
-		send(w, nil)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Path", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.paths++
-
-		pr, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-		p := hostVolumePath(pr.Name)
-		send(w, &pluginResp{Mountpoint: p})
-	})
-
-	mux.HandleFunc("/VolumeDriver.Mount", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.mounts++
-
-		pr, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-
-		if v, exists := s.vols[pr.Name]; exists {
-			// Use this to simulate a mount failure
-			if _, exists := v.Options["invalidOption"]; exists {
-				send(w, fmt.Errorf("invalid argument"))
-				return
-			}
-		}
-
-		p := hostVolumePath(pr.Name)
-		if err := os.MkdirAll(p, 0755); err != nil {
-			send(w, &pluginResp{Err: err.Error()})
-			return
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(p, "test"), []byte(s.Server.URL), 0644); err != nil {
-			send(w, err)
-			return
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(p, "mountID"), []byte(pr.ID), 0644); err != nil {
-			send(w, err)
-			return
-		}
-
-		send(w, &pluginResp{Mountpoint: p})
-	})
-
-	mux.HandleFunc("/VolumeDriver.Unmount", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.unmounts++
-
-		_, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-
-		send(w, nil)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Capabilities", func(w http.ResponseWriter, r *http.Request) {
-		s.ec.caps++
-
-		_, err := read(r.Body)
-		if err != nil {
-			send(w, err)
-			return
-		}
-
-		send(w, `{"Capabilities": { "Scope": "global" }}`)
-	})
-
-	err := os.MkdirAll("/etc/docker/plugins", 0755)
-	c.Assert(err, checker.IsNil)
-
-	err = ioutil.WriteFile("/etc/docker/plugins/"+name+".spec", []byte(s.Server.URL), 0644)
-	c.Assert(err, checker.IsNil)
-	return s
-}
-
-func (s *DockerExternalVolumeSuite) TearDownSuite(c *check.C) {
-	s.volumePlugin.Close()
-
-	err := os.RemoveAll("/etc/docker/plugins")
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerExternalVolumeSuite) TestVolumeCLICreateOptionConflict(c *check.C) {
-	dockerCmd(c, "volume", "create", "test")
-
-	out, _, err := dockerCmdWithError("volume", "create", "test", "--driver", volumePluginName)
-	c.Assert(err, check.NotNil, check.Commentf("volume create exception name already in use with another driver"))
-	c.Assert(out, checker.Contains, "A volume named test already exists")
-
-	out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Driver }}", "test")
-	_, _, err = dockerCmdWithError("volume", "create", "test", "--driver", strings.TrimSpace(out))
-	c.Assert(err, check.IsNil)
-
-	// make sure hidden --name option conflicts with positional arg name
-	out, _, err = dockerCmdWithError("volume", "create", "--name", "test2", "test2")
-	c.Assert(err, check.NotNil, check.Commentf("Conflicting options: either specify --name or provide positional arg, not both"))
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverNamed(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, s.Server.URL)
-
-	_, err = s.d.Cmd("volume", "rm", "external-volume-test")
-	c.Assert(err, checker.IsNil)
-
-	p := hostVolumePath("external-volume-test")
-	_, err = os.Lstat(p)
-	c.Assert(err, checker.NotNil)
-	c.Assert(os.IsNotExist(err), checker.True, check.Commentf("Expected volume path in host to not exist: %s, %v\n", p, err))
-
-	c.Assert(s.ec.activations, checker.Equals, 1)
-	c.Assert(s.ec.creations, checker.Equals, 1)
-	c.Assert(s.ec.removals, checker.Equals, 1)
-	c.Assert(s.ec.mounts, checker.Equals, 1)
-	c.Assert(s.ec.unmounts, checker.Equals, 1)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnnamed(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--rm", "--name", "test-data", "-v", "/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, s.Server.URL)
-
-	c.Assert(s.ec.activations, checker.Equals, 1)
-	c.Assert(s.ec.creations, checker.Equals, 1)
-	c.Assert(s.ec.removals, checker.Equals, 1)
-	c.Assert(s.ec.mounts, checker.Equals, 1)
-	c.Assert(s.ec.unmounts, checker.Equals, 1)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverVolumesFrom(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--name", "vol-test1", "-v", "/foo", "--volume-driver", volumePluginName, "busybox:latest")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("run", "--rm", "--volumes-from", "vol-test1", "--name", "vol-test2", "busybox", "ls", "/tmp")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("rm", "-fv", "vol-test1")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	c.Assert(s.ec.activations, checker.Equals, 1)
-	c.Assert(s.ec.creations, checker.Equals, 1)
-	c.Assert(s.ec.removals, checker.Equals, 1)
-	c.Assert(s.ec.mounts, checker.Equals, 2)
-	c.Assert(s.ec.unmounts, checker.Equals, 2)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverDeleteContainer(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--name", "vol-test1", "-v", "/foo", "--volume-driver", volumePluginName, "busybox:latest")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("rm", "-fv", "vol-test1")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	c.Assert(s.ec.activations, checker.Equals, 1)
-	c.Assert(s.ec.creations, checker.Equals, 1)
-	c.Assert(s.ec.removals, checker.Equals, 1)
-	c.Assert(s.ec.mounts, checker.Equals, 1)
-	c.Assert(s.ec.unmounts, checker.Equals, 1)
-}
-
-func hostVolumePath(name string) string {
-	return fmt.Sprintf("/var/lib/docker/volumes/%s", name)
-}
-
-// Make sure a request to use a down driver doesn't block other requests
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverLookupNotBlocked(c *check.C) {
-	specPath := "/etc/docker/plugins/down-driver.spec"
-	err := ioutil.WriteFile(specPath, []byte("tcp://127.0.0.7:9999"), 0644)
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(specPath)
-
-	chCmd1 := make(chan struct{})
-	chCmd2 := make(chan error)
-	cmd1 := exec.Command(dockerBinary, "volume", "create", "-d", "down-driver")
-	cmd2 := exec.Command(dockerBinary, "volume", "create")
-
-	c.Assert(cmd1.Start(), checker.IsNil)
-	defer cmd1.Process.Kill()
-	time.Sleep(100 * time.Millisecond) // ensure API has been called
-	c.Assert(cmd2.Start(), checker.IsNil)
-
-	go func() {
-		cmd1.Wait()
-		close(chCmd1)
-	}()
-	go func() {
-		chCmd2 <- cmd2.Wait()
-	}()
-
-	select {
-	case <-chCmd1:
-		cmd2.Process.Kill()
-		c.Fatalf("volume create with down driver finished unexpectedly")
-	case err := <-chCmd2:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(5 * time.Second):
-		cmd2.Process.Kill()
-		c.Fatal("volume creates are blocked by previous create requests when previous driver is down")
-	}
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverRetryNotImmediatelyExists(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	specPath := "/etc/docker/plugins/test-external-volume-driver-retry.spec"
-	os.RemoveAll(specPath)
-	defer os.RemoveAll(specPath)
-
-	errchan := make(chan error)
-	go func() {
-		if out, err := s.d.Cmd("run", "--rm", "--name", "test-data-retry", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", "test-external-volume-driver-retry", "busybox:latest"); err != nil {
-			errchan <- fmt.Errorf("%v:\n%s", err, out)
-		}
-		close(errchan)
-	}()
-	go func() {
-		// wait for a retry to occur, then create spec to allow plugin to register
-		time.Sleep(2000 * time.Millisecond)
-		// no need to check for an error here since it will get picked up by the timeout later
-		ioutil.WriteFile(specPath, []byte(s.Server.URL), 0644)
-	}()
-
-	select {
-	case err := <-errchan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(8 * time.Second):
-		c.Fatal("volume creates fail when plugin not immediately available")
-	}
-
-	_, err = s.d.Cmd("volume", "rm", "external-volume-test")
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(s.ec.activations, checker.Equals, 1)
-	c.Assert(s.ec.creations, checker.Equals, 1)
-	c.Assert(s.ec.removals, checker.Equals, 1)
-	c.Assert(s.ec.mounts, checker.Equals, 1)
-	c.Assert(s.ec.unmounts, checker.Equals, 1)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverBindExternalVolume(c *check.C) {
-	dockerCmd(c, "volume", "create", "-d", volumePluginName, "foo")
-	dockerCmd(c, "run", "-d", "--name", "testing", "-v", "foo:/bar", "busybox", "top")
-
-	var mounts []struct {
-		Name   string
-		Driver string
-	}
-	out := inspectFieldJSON(c, "testing", "Mounts")
-	c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), checker.IsNil)
-	c.Assert(len(mounts), checker.Equals, 1, check.Commentf(out))
-	c.Assert(mounts[0].Name, checker.Equals, "foo")
-	c.Assert(mounts[0].Driver, checker.Equals, volumePluginName)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverList(c *check.C) {
-	dockerCmd(c, "volume", "create", "-d", volumePluginName, "abc3")
-	out, _ := dockerCmd(c, "volume", "ls")
-	ls := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(ls), check.Equals, 2, check.Commentf("\n%s", out))
-
-	vol := strings.Fields(ls[len(ls)-1])
-	c.Assert(len(vol), check.Equals, 2, check.Commentf("%v", vol))
-	c.Assert(vol[0], check.Equals, volumePluginName)
-	c.Assert(vol[1], check.Equals, "abc3")
-
-	c.Assert(s.ec.lists, check.Equals, 1)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGet(c *check.C) {
-	out, _, err := dockerCmdWithError("volume", "inspect", "dummy")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "No such volume")
-	c.Assert(s.ec.gets, check.Equals, 1)
-
-	dockerCmd(c, "volume", "create", "test", "-d", volumePluginName)
-	out, _ = dockerCmd(c, "volume", "inspect", "test")
-
-	type vol struct {
-		Status map[string]string
-	}
-	var st []vol
-
-	c.Assert(json.Unmarshal([]byte(out), &st), checker.IsNil)
-	c.Assert(st, checker.HasLen, 1)
-	c.Assert(st[0].Status, checker.HasLen, 1, check.Commentf("%v", st[0]))
-	c.Assert(st[0].Status["Hello"], checker.Equals, "world", check.Commentf("%v", st[0].Status))
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverWithDaemonRestart(c *check.C) {
-	dockerCmd(c, "volume", "create", "-d", volumePluginName, "abc1")
-	err := s.d.Restart()
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "run", "--name=test", "-v", "abc1:/foo", "busybox", "true")
-	var mounts []types.MountPoint
-	inspectFieldAndMarshall(c, "test", "Mounts", &mounts)
-	c.Assert(mounts, checker.HasLen, 1)
-	c.Assert(mounts[0].Driver, checker.Equals, volumePluginName)
-}
-
-// Ensures that the daemon handles when the plugin responds to a `Get` request with a null volume and a null error.
-// Prior the daemon would panic in this scenario.
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGetEmptyResponse(c *check.C) {
-	c.Assert(s.d.Start(), checker.IsNil)
-
-	out, err := s.d.Cmd("volume", "create", "-d", volumePluginName, "abc2", "--opt", "ninja=1")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("volume", "inspect", "abc2")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "No such volume")
-}
-
-// Ensure only cached paths are used in volume list to prevent N+1 calls to `VolumeDriver.Path`
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverPathCalls(c *check.C) {
-	c.Assert(s.d.Start(), checker.IsNil)
-	c.Assert(s.ec.paths, checker.Equals, 0)
-
-	out, err := s.d.Cmd("volume", "create", "test", "--driver=test-external-volume-driver")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(s.ec.paths, checker.Equals, 1)
-
-	out, err = s.d.Cmd("volume", "ls")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(s.ec.paths, checker.Equals, 1)
-
-	out, err = s.d.Cmd("volume", "inspect", "--format='{{.Mountpoint}}'", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	c.Assert(s.ec.paths, checker.Equals, 1)
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverMountID(c *check.C) {
-	err := s.d.StartWithBusybox()
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("run", "--rm", "-v", "external-volume-test:/tmp/external-volume-test", "--volume-driver", volumePluginName, "busybox:latest", "cat", "/tmp/external-volume-test/test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-}
-
-// Check that VolumeDriver.Capabilities gets called, and only called once
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverCapabilities(c *check.C) {
-	c.Assert(s.d.Start(), checker.IsNil)
-	c.Assert(s.ec.caps, checker.Equals, 0)
-
-	for i := 0; i < 3; i++ {
-		out, err := s.d.Cmd("volume", "create", "-d", volumePluginName, fmt.Sprintf("test%d", i))
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		c.Assert(s.ec.caps, checker.Equals, 1)
-		out, err = s.d.Cmd("volume", "inspect", "--format={{.Scope}}", fmt.Sprintf("test%d", i))
-		c.Assert(err, checker.IsNil)
-		c.Assert(strings.TrimSpace(out), checker.Equals, volume.GlobalScope)
-	}
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverOutOfBandDelete(c *check.C) {
-	driverName := stringid.GenerateNonCryptoID()
-	p := newVolumePlugin(c, driverName)
-	defer p.Close()
-
-	c.Assert(s.d.StartWithBusybox(), checker.IsNil)
-
-	out, err := s.d.Cmd("volume", "create", "-d", driverName, "--name", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "volume named test already exists")
-
-	// simulate out of band volume deletion on plugin level
-	delete(p.vols, "test")
-
-	// test re-create with same driver
-	out, err = s.d.Cmd("volume", "create", "-d", driverName, "--opt", "foo=bar", "--name", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	out, err = s.d.Cmd("volume", "inspect", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var vs []types.Volume
-	err = json.Unmarshal([]byte(out), &vs)
-	c.Assert(err, checker.IsNil)
-	c.Assert(vs, checker.HasLen, 1)
-	c.Assert(vs[0].Driver, checker.Equals, driverName)
-	c.Assert(vs[0].Options, checker.NotNil)
-	c.Assert(vs[0].Options["foo"], checker.Equals, "bar")
-	c.Assert(vs[0].Driver, checker.Equals, driverName)
-
-	// simulate out of band volume deletion on plugin level
-	delete(p.vols, "test")
-
-	// test create with different driver
-	out, err = s.d.Cmd("volume", "create", "-d", "local", "--name", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = s.d.Cmd("volume", "inspect", "test")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	vs = nil
-	err = json.Unmarshal([]byte(out), &vs)
-	c.Assert(err, checker.IsNil)
-	c.Assert(vs, checker.HasLen, 1)
-	c.Assert(vs[0].Options, checker.HasLen, 0)
-	c.Assert(vs[0].Driver, checker.Equals, "local")
-}
-
-func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverUnmountOnMountFail(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), checker.IsNil)
-	s.d.Cmd("volume", "create", "-d", "test-external-volume-driver", "--opt=invalidOption=1", "--name=testumount")
-
-	out, _ := s.d.Cmd("run", "-v", "testumount:/foo", "busybox", "true")
-	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf(out))
-	out, _ = s.d.Cmd("run", "-w", "/foo", "-v", "testumount:/foo", "busybox", "true")
-	c.Assert(s.ec.unmounts, checker.Equals, 0, check.Commentf(out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_health_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_health_test.go
deleted file mode 100644
index 6b7baebd00..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_health_test.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func waitForStatus(c *check.C, name string, prev string, expected string) {
-	prev = prev + "\n"
-	expected = expected + "\n"
-	for {
-		out, _ := dockerCmd(c, "inspect", "--format={{.State.Status}}", name)
-		if out == expected {
-			return
-		}
-		c.Check(out, checker.Equals, prev)
-		if out != prev {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-}
-
-func waitForHealthStatus(c *check.C, name string, prev string, expected string) {
-	prev = prev + "\n"
-	expected = expected + "\n"
-	for {
-		out, _ := dockerCmd(c, "inspect", "--format={{.State.Health.Status}}", name)
-		if out == expected {
-			return
-		}
-		c.Check(out, checker.Equals, prev)
-		if out != prev {
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-}
-
-func getHealth(c *check.C, name string) *types.Health {
-	out, _ := dockerCmd(c, "inspect", "--format={{json .State.Health}}", name)
-	var health types.Health
-	err := json.Unmarshal([]byte(out), &health)
-	c.Check(err, checker.Equals, nil)
-	return &health
-}
-
-func (s *DockerSuite) TestHealth(c *check.C) {
-	testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
-
-	imageName := "testhealth"
-	_, err := buildImage(imageName,
-		`FROM busybox
-		RUN echo OK > /status
-		CMD ["/bin/sleep", "120"]
-		STOPSIGNAL SIGKILL
-		HEALTHCHECK --interval=1s --timeout=30s \
-		  CMD cat /status`,
-		true)
-
-	c.Check(err, check.IsNil)
-
-	// No health status before starting
-	name := "test_health"
-	dockerCmd(c, "create", "--name", name, imageName)
-	out, _ := dockerCmd(c, "ps", "-a", "--format={{.Status}}")
-	c.Check(out, checker.Equals, "Created\n")
-
-	// Inspect the options
-	out, _ = dockerCmd(c, "inspect",
-		"--format=timeout={{.Config.Healthcheck.Timeout}} "+
-			"interval={{.Config.Healthcheck.Interval}} "+
-			"retries={{.Config.Healthcheck.Retries}} "+
-			"test={{.Config.Healthcheck.Test}}", name)
-	c.Check(out, checker.Equals, "timeout=30s interval=1s retries=0 test=[CMD-SHELL cat /status]\n")
-
-	// Start
-	dockerCmd(c, "start", name)
-	waitForHealthStatus(c, name, "starting", "healthy")
-
-	// Make it fail
-	dockerCmd(c, "exec", name, "rm", "/status")
-	waitForHealthStatus(c, name, "healthy", "unhealthy")
-
-	// Inspect the status
-	out, _ = dockerCmd(c, "inspect", "--format={{.State.Health.Status}}", name)
-	c.Check(out, checker.Equals, "unhealthy\n")
-
-	// Make it healthy again
-	dockerCmd(c, "exec", name, "touch", "/status")
-	waitForHealthStatus(c, name, "unhealthy", "healthy")
-
-	// Remove container
-	dockerCmd(c, "rm", "-f", name)
-
-	// Disable the check from the CLI
-	out, _ = dockerCmd(c, "create", "--name=noh", "--no-healthcheck", imageName)
-	out, _ = dockerCmd(c, "inspect", "--format={{.Config.Healthcheck.Test}}", "noh")
-	c.Check(out, checker.Equals, "[NONE]\n")
-	dockerCmd(c, "rm", "noh")
-
-	// Disable the check with a new build
-	_, err = buildImage("no_healthcheck",
-		`FROM testhealth
-		HEALTHCHECK NONE`, true)
-	c.Check(err, check.IsNil)
-
-	out, _ = dockerCmd(c, "inspect", "--format={{.ContainerConfig.Healthcheck.Test}}", "no_healthcheck")
-	c.Check(out, checker.Equals, "[NONE]\n")
-
-	// Enable the checks from the CLI
-	_, _ = dockerCmd(c, "run", "-d", "--name=fatal_healthcheck",
-		"--health-interval=0.5s",
-		"--health-retries=3",
-		"--health-cmd=cat /status",
-		"no_healthcheck")
-	waitForHealthStatus(c, "fatal_healthcheck", "starting", "healthy")
-	health := getHealth(c, "fatal_healthcheck")
-	c.Check(health.Status, checker.Equals, "healthy")
-	c.Check(health.FailingStreak, checker.Equals, 0)
-	last := health.Log[len(health.Log)-1]
-	c.Check(last.ExitCode, checker.Equals, 0)
-	c.Check(last.Output, checker.Equals, "OK\n")
-
-	// Fail the check
-	dockerCmd(c, "exec", "fatal_healthcheck", "rm", "/status")
-	waitForHealthStatus(c, "fatal_healthcheck", "healthy", "unhealthy")
-
-	failsStr, _ := dockerCmd(c, "inspect", "--format={{.State.Health.FailingStreak}}", "fatal_healthcheck")
-	fails, err := strconv.Atoi(strings.TrimSpace(failsStr))
-	c.Check(err, check.IsNil)
-	c.Check(fails >= 3, checker.Equals, true)
-	dockerCmd(c, "rm", "-f", "fatal_healthcheck")
-
-	// Check timeout
-	// Note: if the interval is too small, it seems that Docker spends all its time running health
-	// checks and never gets around to killing it.
-	_, _ = dockerCmd(c, "run", "-d", "--name=test",
-		"--health-interval=1s", "--health-cmd=sleep 5m", "--health-timeout=1ms", imageName)
-	waitForHealthStatus(c, "test", "starting", "unhealthy")
-	health = getHealth(c, "test")
-	last = health.Log[len(health.Log)-1]
-	c.Check(health.Status, checker.Equals, "unhealthy")
-	c.Check(last.ExitCode, checker.Equals, -1)
-	c.Check(last.Output, checker.Equals, "Health check exceeded timeout (1ms)")
-	dockerCmd(c, "rm", "-f", "test")
-
-	// Check JSON-format
-	_, err = buildImage(imageName,
-		`FROM busybox
-		RUN echo OK > /status
-		CMD ["/bin/sleep", "120"]
-		STOPSIGNAL SIGKILL
-		HEALTHCHECK --interval=1s --timeout=30s \
-		  CMD ["cat", "/my status"]`,
-		true)
-	c.Check(err, check.IsNil)
-	out, _ = dockerCmd(c, "inspect",
-		"--format={{.Config.Healthcheck.Test}}", imageName)
-	c.Check(out, checker.Equals, "[CMD cat /my status]\n")
-
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_help_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_help_test.go
deleted file mode 100644
index 29b6553fc5..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_help_test.go
+++ /dev/null
@@ -1,321 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os/exec"
-	"runtime"
-	"strings"
-	"unicode"
-
-	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestHelpTextVerify(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// Make sure main help text fits within 80 chars and that
-	// on non-windows system we use ~ when possible (to shorten things).
-	// Test for HOME set to its default value and set to "/" on linux
-	// Yes on windows setting up an array and looping (right now) isn't
-	// necessary because we just have one value, but we'll need the
-	// array/loop on linux so we might as well set it up so that we can
-	// test any number of home dirs later on and all we need to do is
-	// modify the array - the rest of the testing infrastructure should work
-	homes := []string{homedir.Get()}
-
-	// Non-Windows machines need to test for this special case of $HOME
-	if runtime.GOOS != "windows" {
-		homes = append(homes, "/")
-	}
-
-	homeKey := homedir.Key()
-	baseEnvs := appendBaseEnv(true)
-
-	// Remove HOME env var from list so we can add a new value later.
-	for i, env := range baseEnvs {
-		if strings.HasPrefix(env, homeKey+"=") {
-			baseEnvs = append(baseEnvs[:i], baseEnvs[i+1:]...)
-			break
-		}
-	}
-
-	for _, home := range homes {
-
-		// Dup baseEnvs and add our new HOME value
-		newEnvs := make([]string, len(baseEnvs)+1)
-		copy(newEnvs, baseEnvs)
-		newEnvs[len(newEnvs)-1] = homeKey + "=" + home
-
-		scanForHome := runtime.GOOS != "windows" && home != "/"
-
-		// Check main help text to make sure its not over 80 chars
-		helpCmd := exec.Command(dockerBinary, "help")
-		helpCmd.Env = newEnvs
-		out, _, err := runCommandWithOutput(helpCmd)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		lines := strings.Split(out, "\n")
-		for _, line := range lines {
-			// All lines should not end with a space
-			c.Assert(line, checker.Not(checker.HasSuffix), " ", check.Commentf("Line should not end with a space"))
-
-			if scanForHome && strings.Contains(line, `=`+home) {
-				c.Fatalf("Line should use '%q' instead of %q:\n%s", homedir.GetShortcutString(), home, line)
-			}
-			if runtime.GOOS != "windows" {
-				i := strings.Index(line, homedir.GetShortcutString())
-				if i >= 0 && i != len(line)-1 && line[i+1] != '/' {
-					c.Fatalf("Main help should not have used home shortcut:\n%s", line)
-				}
-			}
-		}
-
-		// Make sure each cmd's help text fits within 90 chars and that
-		// on non-windows system we use ~ when possible (to shorten things).
-		// Pull the list of commands from the "Commands:" section of docker help
-		helpCmd = exec.Command(dockerBinary, "help")
-		helpCmd.Env = newEnvs
-		out, _, err = runCommandWithOutput(helpCmd)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		i := strings.Index(out, "Commands:")
-		c.Assert(i, checker.GreaterOrEqualThan, 0, check.Commentf("Missing 'Commands:' in:\n%s", out))
-
-		cmds := []string{}
-		// Grab all chars starting at "Commands:"
-		helpOut := strings.Split(out[i:], "\n")
-		// Skip first line, it is just "Commands:"
-		helpOut = helpOut[1:]
-
-		// Create the list of commands we want to test
-		cmdsToTest := []string{}
-		for _, cmd := range helpOut {
-			// Stop on blank line or non-idented line
-			if cmd == "" || !unicode.IsSpace(rune(cmd[0])) {
-				break
-			}
-
-			// Grab just the first word of each line
-			cmd = strings.Split(strings.TrimSpace(cmd), " ")[0]
-			cmds = append(cmds, cmd) // Saving count for later
-
-			cmdsToTest = append(cmdsToTest, cmd)
-		}
-
-		// Add some 'two word' commands - would be nice to automatically
-		// calculate this list - somehow
-		cmdsToTest = append(cmdsToTest, "volume create")
-		cmdsToTest = append(cmdsToTest, "volume inspect")
-		cmdsToTest = append(cmdsToTest, "volume ls")
-		cmdsToTest = append(cmdsToTest, "volume rm")
-		cmdsToTest = append(cmdsToTest, "network connect")
-		cmdsToTest = append(cmdsToTest, "network create")
-		cmdsToTest = append(cmdsToTest, "network disconnect")
-		cmdsToTest = append(cmdsToTest, "network inspect")
-		cmdsToTest = append(cmdsToTest, "network ls")
-		cmdsToTest = append(cmdsToTest, "network rm")
-
-		if experimentalDaemon {
-			cmdsToTest = append(cmdsToTest, "checkpoint create")
-			cmdsToTest = append(cmdsToTest, "checkpoint ls")
-			cmdsToTest = append(cmdsToTest, "checkpoint rm")
-		}
-
-		// Divide the list of commands into go routines and  run the func testcommand on the commands in parallel
-		// to save runtime of test
-
-		errChan := make(chan error)
-
-		for index := 0; index < len(cmdsToTest); index++ {
-			go func(index int) {
-				errChan <- testCommand(cmdsToTest[index], newEnvs, scanForHome, home)
-			}(index)
-		}
-
-		for index := 0; index < len(cmdsToTest); index++ {
-			err := <-errChan
-			if err != nil {
-				c.Fatal(err)
-			}
-		}
-	}
-}
-
-func (s *DockerSuite) TestHelpExitCodesHelpOutput(c *check.C) {
-	// Test to make sure the exit code and output (stdout vs stderr) of
-	// various good and bad cases are what we expect
-
-	// docker : stdout=all, stderr=empty, rc=0
-	out, _, err := dockerCmdWithError()
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	// Be really pick
-	c.Assert(out, checker.Not(checker.HasSuffix), "\n\n", check.Commentf("Should not have a blank line at the end of 'docker'\n"))
-
-	// docker help: stdout=all, stderr=empty, rc=0
-	out, _, err = dockerCmdWithError("help")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	// Be really pick
-	c.Assert(out, checker.Not(checker.HasSuffix), "\n\n", check.Commentf("Should not have a blank line at the end of 'docker help'\n"))
-
-	// docker --help: stdout=all, stderr=empty, rc=0
-	out, _, err = dockerCmdWithError("--help")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	// Be really pick
-	c.Assert(out, checker.Not(checker.HasSuffix), "\n\n", check.Commentf("Should not have a blank line at the end of 'docker --help'\n"))
-
-	// docker inspect busybox: stdout=all, stderr=empty, rc=0
-	// Just making sure stderr is empty on valid cmd
-	out, _, err = dockerCmdWithError("inspect", "busybox")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	// Be really pick
-	c.Assert(out, checker.Not(checker.HasSuffix), "\n\n", check.Commentf("Should not have a blank line at the end of 'docker inspect busyBox'\n"))
-
-	// docker rm: stdout=empty, stderr=all, rc!=0
-	// testing the min arg error msg
-	cmd := exec.Command(dockerBinary, "rm")
-	stdout, stderr, _, err := runCommandWithStdoutStderr(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(stdout, checker.Equals, "")
-	// Should not contain full help text but should contain info about
-	// # of args and Usage line
-	c.Assert(stderr, checker.Contains, "requires at least 1 argument", check.Commentf("Missing # of args text from 'docker rm'\n"))
-
-	// docker rm NoSuchContainer: stdout=empty, stderr=all, rc=0
-	// testing to make sure no blank line on error
-	cmd = exec.Command(dockerBinary, "rm", "NoSuchContainer")
-	stdout, stderr, _, err = runCommandWithStdoutStderr(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(len(stderr), checker.Not(checker.Equals), 0)
-	c.Assert(stdout, checker.Equals, "")
-	// Be really picky
-	c.Assert(stderr, checker.Not(checker.HasSuffix), "\n\n", check.Commentf("Should not have a blank line at the end of 'docker rm'\n"))
-
-	// docker BadCmd: stdout=empty, stderr=all, rc=0
-	cmd = exec.Command(dockerBinary, "BadCmd")
-	stdout, stderr, _, err = runCommandWithStdoutStderr(cmd)
-	c.Assert(err, checker.NotNil)
-	c.Assert(stdout, checker.Equals, "")
-	c.Assert(stderr, checker.Equals, "docker: 'BadCmd' is not a docker command.\nSee 'docker --help'\n", check.Commentf("Unexcepted output for 'docker badCmd'\n"))
-}
-
-func testCommand(cmd string, newEnvs []string, scanForHome bool, home string) error {
-
-	args := strings.Split(cmd+" --help", " ")
-
-	// Check the full usage text
-	helpCmd := exec.Command(dockerBinary, args...)
-	helpCmd.Env = newEnvs
-	out, stderr, _, err := runCommandWithStdoutStderr(helpCmd)
-	if len(stderr) != 0 {
-		return fmt.Errorf("Error on %q help. non-empty stderr:%q\n", cmd, stderr)
-	}
-	if strings.HasSuffix(out, "\n\n") {
-		return fmt.Errorf("Should not have blank line on %q\n", cmd)
-	}
-	if !strings.Contains(out, "--help") {
-		return fmt.Errorf("All commands should mention '--help'. Command '%v' did not.\n", cmd)
-	}
-
-	if err != nil {
-		return fmt.Errorf(out)
-	}
-
-	// Check each line for lots of stuff
-	lines := strings.Split(out, "\n")
-	for _, line := range lines {
-		i := strings.Index(line, "~")
-		if i >= 0 && i != len(line)-1 && line[i+1] != '/' {
-			return fmt.Errorf("Help for %q should not have used ~:\n%s", cmd, line)
-		}
-
-		// If a line starts with 4 spaces then assume someone
-		// added a multi-line description for an option and we need
-		// to flag it
-		if strings.HasPrefix(line, "    ") &&
-			!strings.HasPrefix(strings.TrimLeft(line, " "), "--") {
-			return fmt.Errorf("Help for %q should not have a multi-line option", cmd)
-		}
-
-		// Options should NOT end with a period
-		if strings.HasPrefix(line, "  -") && strings.HasSuffix(line, ".") {
-			return fmt.Errorf("Help for %q should not end with a period: %s", cmd, line)
-		}
-
-		// Options should NOT end with a space
-		if strings.HasSuffix(line, " ") {
-			return fmt.Errorf("Help for %q should not end with a space: %s", cmd, line)
-		}
-
-	}
-
-	// For each command make sure we generate an error
-	// if we give a bad arg
-	args = strings.Split(cmd+" --badArg", " ")
-
-	out, _, err = dockerCmdWithError(args...)
-	if err == nil {
-		return fmt.Errorf(out)
-	}
-
-	// Be really picky
-	if strings.HasSuffix(stderr, "\n\n") {
-		return fmt.Errorf("Should not have a blank line at the end of 'docker rm'\n")
-	}
-
-	// Now make sure that each command will print a short-usage
-	// (not a full usage - meaning no opts section) if we
-	// are missing a required arg or pass in a bad arg
-
-	// These commands will never print a short-usage so don't test
-	noShortUsage := map[string]string{
-		"images":        "",
-		"login":         "",
-		"logout":        "",
-		"network":       "",
-		"stats":         "",
-		"volume create": "",
-	}
-
-	if _, ok := noShortUsage[cmd]; !ok {
-		// skipNoArgs are ones that we don't want to try w/o
-		// any args. Either because it'll hang the test or
-		// lead to incorrect test result (like false negative).
-		// Whatever the reason, skip trying to run w/o args and
-		// jump to trying with a bogus arg.
-		skipNoArgs := map[string]struct{}{
-			"daemon": {},
-			"events": {},
-			"load":   {},
-		}
-
-		var result *icmd.Result
-		if _, ok := skipNoArgs[cmd]; !ok {
-			result = dockerCmdWithResult(strings.Split(cmd, " ")...)
-		}
-
-		// If its ok w/o any args then try again with an arg
-		if result == nil || result.ExitCode == 0 {
-			result = dockerCmdWithResult(strings.Split(cmd+" badArg", " ")...)
-		}
-
-		if err := result.Compare(icmd.Expected{
-			Out:      icmd.None,
-			Err:      "\nUsage:",
-			ExitCode: 1,
-		}); err != nil {
-			return err
-		}
-
-		stderr := result.Stderr()
-		// Shouldn't have full usage
-		if strings.Contains(stderr, "--help=false") {
-			return fmt.Errorf("Should not have full usage on %q:%v", result.Cmd.Args, stderr)
-		}
-		if strings.HasSuffix(stderr, "\n\n") {
-			return fmt.Errorf("Should not have a blank line on %q\n%v", result.Cmd.Args, stderr)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_history_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_history_test.go
deleted file mode 100644
index 9979080b1c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_history_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// This is a heisen-test.  Because the created timestamp of images and the behavior of
-// sort is not predictable it doesn't always fail.
-func (s *DockerSuite) TestBuildHistory(c *check.C) {
-	name := "testbuildhistory"
-	_, err := buildImage(name, `FROM `+minimalBaseImage()+`
-LABEL label.A="A"
-LABEL label.B="B"
-LABEL label.C="C"
-LABEL label.D="D"
-LABEL label.E="E"
-LABEL label.F="F"
-LABEL label.G="G"
-LABEL label.H="H"
-LABEL label.I="I"
-LABEL label.J="J"
-LABEL label.K="K"
-LABEL label.L="L"
-LABEL label.M="M"
-LABEL label.N="N"
-LABEL label.O="O"
-LABEL label.P="P"
-LABEL label.Q="Q"
-LABEL label.R="R"
-LABEL label.S="S"
-LABEL label.T="T"
-LABEL label.U="U"
-LABEL label.V="V"
-LABEL label.W="W"
-LABEL label.X="X"
-LABEL label.Y="Y"
-LABEL label.Z="Z"`,
-		true)
-
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "history", "testbuildhistory")
-	actualValues := strings.Split(out, "\n")[1:27]
-	expectedValues := [26]string{"Z", "Y", "X", "W", "V", "U", "T", "S", "R", "Q", "P", "O", "N", "M", "L", "K", "J", "I", "H", "G", "F", "E", "D", "C", "B", "A"}
-
-	for i := 0; i < 26; i++ {
-		echoValue := fmt.Sprintf("LABEL label.%s=%s", expectedValues[i], expectedValues[i])
-		actualValue := actualValues[i]
-		c.Assert(actualValue, checker.Contains, echoValue)
-	}
-
-}
-
-func (s *DockerSuite) TestHistoryExistentImage(c *check.C) {
-	dockerCmd(c, "history", "busybox")
-}
-
-func (s *DockerSuite) TestHistoryNonExistentImage(c *check.C) {
-	_, _, err := dockerCmdWithError("history", "testHistoryNonExistentImage")
-	c.Assert(err, checker.NotNil, check.Commentf("history on a non-existent image should fail."))
-}
-
-func (s *DockerSuite) TestHistoryImageWithComment(c *check.C) {
-	name := "testhistoryimagewithcomment"
-
-	// make an image through docker commit <container id> [ -m messages ]
-
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-	dockerCmd(c, "wait", name)
-
-	comment := "This_is_a_comment"
-	dockerCmd(c, "commit", "-m="+comment, name, name)
-
-	// test docker history <image id> to check comment messages
-
-	out, _ := dockerCmd(c, "history", name)
-	outputTabs := strings.Fields(strings.Split(out, "\n")[1])
-	actualValue := outputTabs[len(outputTabs)-1]
-	c.Assert(actualValue, checker.Contains, comment)
-}
-
-func (s *DockerSuite) TestHistoryHumanOptionFalse(c *check.C) {
-	out, _ := dockerCmd(c, "history", "--human=false", "busybox")
-	lines := strings.Split(out, "\n")
-	sizeColumnRegex, _ := regexp.Compile("SIZE +")
-	indices := sizeColumnRegex.FindStringIndex(lines[0])
-	startIndex := indices[0]
-	endIndex := indices[1]
-	for i := 1; i < len(lines)-1; i++ {
-		if endIndex > len(lines[i]) {
-			endIndex = len(lines[i])
-		}
-		sizeString := lines[i][startIndex:endIndex]
-
-		_, err := strconv.Atoi(strings.TrimSpace(sizeString))
-		c.Assert(err, checker.IsNil, check.Commentf("The size '%s' was not an Integer", sizeString))
-	}
-}
-
-func (s *DockerSuite) TestHistoryHumanOptionTrue(c *check.C) {
-	out, _ := dockerCmd(c, "history", "--human=true", "busybox")
-	lines := strings.Split(out, "\n")
-	sizeColumnRegex, _ := regexp.Compile("SIZE +")
-	humanSizeRegexRaw := "\\d+.*B" // Matches human sizes like 10 MB, 3.2 KB, etc
-	indices := sizeColumnRegex.FindStringIndex(lines[0])
-	startIndex := indices[0]
-	endIndex := indices[1]
-	for i := 1; i < len(lines)-1; i++ {
-		if endIndex > len(lines[i]) {
-			endIndex = len(lines[i])
-		}
-		sizeString := lines[i][startIndex:endIndex]
-		c.Assert(strings.TrimSpace(sizeString), checker.Matches, humanSizeRegexRaw, check.Commentf("The size '%s' was not in human format", sizeString))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_images_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_images_test.go
deleted file mode 100644
index 3b678a2586..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_images_test.go
+++ /dev/null
@@ -1,364 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestImagesEnsureImageIsListed(c *check.C) {
-	imagesOut, _ := dockerCmd(c, "images")
-	c.Assert(imagesOut, checker.Contains, "busybox")
-}
-
-func (s *DockerSuite) TestImagesEnsureImageWithTagIsListed(c *check.C) {
-	name := "imagewithtag"
-	dockerCmd(c, "tag", "busybox", name+":v1")
-	dockerCmd(c, "tag", "busybox", name+":v1v1")
-	dockerCmd(c, "tag", "busybox", name+":v2")
-
-	imagesOut, _ := dockerCmd(c, "images", name+":v1")
-	c.Assert(imagesOut, checker.Contains, name)
-	c.Assert(imagesOut, checker.Contains, "v1")
-	c.Assert(imagesOut, checker.Not(checker.Contains), "v2")
-	c.Assert(imagesOut, checker.Not(checker.Contains), "v1v1")
-
-	imagesOut, _ = dockerCmd(c, "images", name)
-	c.Assert(imagesOut, checker.Contains, name)
-	c.Assert(imagesOut, checker.Contains, "v1")
-	c.Assert(imagesOut, checker.Contains, "v1v1")
-	c.Assert(imagesOut, checker.Contains, "v2")
-}
-
-func (s *DockerSuite) TestImagesEnsureImageWithBadTagIsNotListed(c *check.C) {
-	imagesOut, _ := dockerCmd(c, "images", "busybox:nonexistent")
-	c.Assert(imagesOut, checker.Not(checker.Contains), "busybox")
-}
-
-func (s *DockerSuite) TestImagesOrderedByCreationDate(c *check.C) {
-	id1, err := buildImage("order:test_a",
-		`FROM busybox
-                MAINTAINER dockerio1`, true)
-	c.Assert(err, checker.IsNil)
-	time.Sleep(1 * time.Second)
-	id2, err := buildImage("order:test_c",
-		`FROM busybox
-                MAINTAINER dockerio2`, true)
-	c.Assert(err, checker.IsNil)
-	time.Sleep(1 * time.Second)
-	id3, err := buildImage("order:test_b",
-		`FROM busybox
-                MAINTAINER dockerio3`, true)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "images", "-q", "--no-trunc")
-	imgs := strings.Split(out, "\n")
-	c.Assert(imgs[0], checker.Equals, id3, check.Commentf("First image must be %s, got %s", id3, imgs[0]))
-	c.Assert(imgs[1], checker.Equals, id2, check.Commentf("First image must be %s, got %s", id2, imgs[1]))
-	c.Assert(imgs[2], checker.Equals, id1, check.Commentf("First image must be %s, got %s", id1, imgs[2]))
-}
-
-func (s *DockerSuite) TestImagesErrorWithInvalidFilterNameTest(c *check.C) {
-	out, _, err := dockerCmdWithError("images", "-f", "FOO=123")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Invalid filter")
-}
-
-func (s *DockerSuite) TestImagesFilterLabelMatch(c *check.C) {
-	imageName1 := "images_filter_test1"
-	imageName2 := "images_filter_test2"
-	imageName3 := "images_filter_test3"
-	image1ID, err := buildImage(imageName1,
-		`FROM busybox
-                 LABEL match me`, true)
-	c.Assert(err, check.IsNil)
-
-	image2ID, err := buildImage(imageName2,
-		`FROM busybox
-                 LABEL match="me too"`, true)
-	c.Assert(err, check.IsNil)
-
-	image3ID, err := buildImage(imageName3,
-		`FROM busybox
-                 LABEL nomatch me`, true)
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "images", "--no-trunc", "-q", "-f", "label=match")
-	out = strings.TrimSpace(out)
-	c.Assert(out, check.Matches, fmt.Sprintf("[\\s\\w:]*%s[\\s\\w:]*", image1ID))
-	c.Assert(out, check.Matches, fmt.Sprintf("[\\s\\w:]*%s[\\s\\w:]*", image2ID))
-	c.Assert(out, check.Not(check.Matches), fmt.Sprintf("[\\s\\w:]*%s[\\s\\w:]*", image3ID))
-
-	out, _ = dockerCmd(c, "images", "--no-trunc", "-q", "-f", "label=match=me too")
-	out = strings.TrimSpace(out)
-	c.Assert(out, check.Equals, image2ID)
-}
-
-// Regression : #15659
-func (s *DockerSuite) TestImagesFilterLabelWithCommit(c *check.C) {
-	// Create a container
-	dockerCmd(c, "run", "--name", "bar", "busybox", "/bin/sh")
-	// Commit with labels "using changes"
-	out, _ := dockerCmd(c, "commit", "-c", "LABEL foo.version=1.0.0-1", "-c", "LABEL foo.name=bar", "-c", "LABEL foo.author=starlord", "bar", "bar:1.0.0-1")
-	imageID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "images", "--no-trunc", "-q", "-f", "label=foo.version=1.0.0-1")
-	out = strings.TrimSpace(out)
-	c.Assert(out, check.Equals, imageID)
-}
-
-func (s *DockerSuite) TestImagesFilterSinceAndBefore(c *check.C) {
-	imageID1, err := buildImage("image:1", `FROM `+minimalBaseImage()+`
-LABEL number=1`, true)
-	c.Assert(err, checker.IsNil)
-	imageID2, err := buildImage("image:2", `FROM `+minimalBaseImage()+`
-LABEL number=2`, true)
-	c.Assert(err, checker.IsNil)
-	imageID3, err := buildImage("image:3", `FROM `+minimalBaseImage()+`
-LABEL number=3`, true)
-	c.Assert(err, checker.IsNil)
-
-	expected := []string{imageID3, imageID2}
-
-	out, _ := dockerCmd(c, "images", "-f", "since=image:1", "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	out, _ = dockerCmd(c, "images", "-f", "since="+imageID1, "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	expected = []string{imageID3}
-
-	out, _ = dockerCmd(c, "images", "-f", "since=image:2", "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	out, _ = dockerCmd(c, "images", "-f", "since="+imageID2, "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	expected = []string{imageID2, imageID1}
-
-	out, _ = dockerCmd(c, "images", "-f", "before=image:3", "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	out, _ = dockerCmd(c, "images", "-f", "before="+imageID3, "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	expected = []string{imageID1}
-
-	out, _ = dockerCmd(c, "images", "-f", "before=image:2", "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter: Image list is not in the correct order: %v\n%s", expected, out))
-
-	out, _ = dockerCmd(c, "images", "-f", "before="+imageID2, "image")
-	c.Assert(assertImageList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter: Image list is not in the correct order: %v\n%s", expected, out))
-}
-
-func assertImageList(out string, expected []string) bool {
-	lines := strings.Split(strings.Trim(out, "\n "), "\n")
-
-	if len(lines)-1 != len(expected) {
-		return false
-	}
-
-	imageIDIndex := strings.Index(lines[0], "IMAGE ID")
-	for i := 0; i < len(expected); i++ {
-		imageID := lines[i+1][imageIDIndex : imageIDIndex+12]
-		found := false
-		for _, e := range expected {
-			if imageID == e[7:19] {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (s *DockerSuite) TestImagesFilterSpaceTrimCase(c *check.C) {
-	imageName := "images_filter_test"
-	buildImage(imageName,
-		`FROM busybox
-                 RUN touch /test/foo
-                 RUN touch /test/bar
-                 RUN touch /test/baz`, true)
-
-	filters := []string{
-		"dangling=true",
-		"Dangling=true",
-		" dangling=true",
-		"dangling=true ",
-		"dangling = true",
-	}
-
-	imageListings := make([][]string, 5, 5)
-	for idx, filter := range filters {
-		out, _ := dockerCmd(c, "images", "-q", "-f", filter)
-		listing := strings.Split(out, "\n")
-		sort.Strings(listing)
-		imageListings[idx] = listing
-	}
-
-	for idx, listing := range imageListings {
-		if idx < 4 && !reflect.DeepEqual(listing, imageListings[idx+1]) {
-			for idx, errListing := range imageListings {
-				fmt.Printf("out %d\n", idx)
-				for _, image := range errListing {
-					fmt.Print(image)
-				}
-				fmt.Print("")
-			}
-			c.Fatalf("All output must be the same")
-		}
-	}
-}
-
-func (s *DockerSuite) TestImagesEnsureDanglingImageOnlyListedOnce(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// create container 1
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	containerID1 := strings.TrimSpace(out)
-
-	// tag as foobox
-	out, _ = dockerCmd(c, "commit", containerID1, "foobox")
-	imageID := stringid.TruncateID(strings.TrimSpace(out))
-
-	// overwrite the tag, making the previous image dangling
-	dockerCmd(c, "tag", "busybox", "foobox")
-
-	out, _ = dockerCmd(c, "images", "-q", "-f", "dangling=true")
-	// Expect one dangling image
-	c.Assert(strings.Count(out, imageID), checker.Equals, 1)
-
-	out, _ = dockerCmd(c, "images", "-q", "-f", "dangling=false")
-	//dangling=false would not include dangling images
-	c.Assert(out, checker.Not(checker.Contains), imageID)
-
-	out, _ = dockerCmd(c, "images")
-	//docker images still include dangling images
-	c.Assert(out, checker.Contains, imageID)
-
-}
-
-func (s *DockerSuite) TestImagesWithIncorrectFilter(c *check.C) {
-	out, _, err := dockerCmdWithError("images", "-f", "dangling=invalid")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Invalid filter")
-}
-
-func (s *DockerSuite) TestImagesEnsureOnlyHeadsImagesShown(c *check.C) {
-	dockerfile := `
-        FROM busybox
-        MAINTAINER docker
-        ENV foo bar`
-
-	head, out, err := buildImageWithOut("scratch-image", dockerfile, false)
-	c.Assert(err, check.IsNil)
-
-	// this is just the output of docker build
-	// we're interested in getting the image id of the MAINTAINER instruction
-	// and that's located at output, line 5, from 7 to end
-	split := strings.Split(out, "\n")
-	intermediate := strings.TrimSpace(split[5][7:])
-
-	out, _ = dockerCmd(c, "images")
-	// images shouldn't show non-heads images
-	c.Assert(out, checker.Not(checker.Contains), intermediate)
-	// images should contain final built images
-	c.Assert(out, checker.Contains, stringid.TruncateID(head))
-}
-
-func (s *DockerSuite) TestImagesEnsureImagesFromScratchShown(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support FROM scratch
-
-	dockerfile := `
-        FROM scratch
-        MAINTAINER docker`
-
-	id, _, err := buildImageWithOut("scratch-image", dockerfile, false)
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "images")
-	// images should contain images built from scratch
-	c.Assert(out, checker.Contains, stringid.TruncateID(id))
-}
-
-// For W2W - equivalent to TestImagesEnsureImagesFromScratchShown but Windows
-// doesn't support from scratch
-func (s *DockerSuite) TestImagesEnsureImagesFromBusyboxShown(c *check.C) {
-	dockerfile := `
-        FROM busybox
-        MAINTAINER docker`
-
-	id, _, err := buildImageWithOut("busybox-image", dockerfile, false)
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "images")
-	// images should contain images built from busybox
-	c.Assert(out, checker.Contains, stringid.TruncateID(id))
-}
-
-// #18181
-func (s *DockerSuite) TestImagesFilterNameWithPort(c *check.C) {
-	tag := "a.b.c.d:5000/hello"
-	dockerCmd(c, "tag", "busybox", tag)
-	out, _ := dockerCmd(c, "images", tag)
-	c.Assert(out, checker.Contains, tag)
-
-	out, _ = dockerCmd(c, "images", tag+":latest")
-	c.Assert(out, checker.Contains, tag)
-
-	out, _ = dockerCmd(c, "images", tag+":no-such-tag")
-	c.Assert(out, checker.Not(checker.Contains), tag)
-}
-
-func (s *DockerSuite) TestImagesFormat(c *check.C) {
-	// testRequires(c, DaemonIsLinux)
-	tag := "myimage"
-	dockerCmd(c, "tag", "busybox", tag+":v1")
-	dockerCmd(c, "tag", "busybox", tag+":v2")
-
-	out, _ := dockerCmd(c, "images", "--format", "{{.Repository}}", tag)
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-
-	expected := []string{"myimage", "myimage"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))
-}
-
-// ImagesDefaultFormatAndQuiet
-func (s *DockerSuite) TestImagesFormatDefaultFormat(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// create container 1
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	containerID1 := strings.TrimSpace(out)
-
-	// tag as foobox
-	out, _ = dockerCmd(c, "commit", containerID1, "myimage")
-	imageID := stringid.TruncateID(strings.TrimSpace(out))
-
-	config := `{
-		"imagesFormat": "{{ .ID }} default"
-}`
-	d, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "--config", d, "images", "-q", "myimage")
-	c.Assert(out, checker.Equals, imageID+"\n", check.Commentf("Expected to print only the image id, got %v\n", out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_import_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_import_test.go
deleted file mode 100644
index 57dc2a6698..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_import_test.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"compress/gzip"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestImportDisplay(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "export", cleanedContainerID),
-		exec.Command(dockerBinary, "import", "-"),
-	)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
-
-	image := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "run", "--rm", image, "true")
-	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
-}
-
-func (s *DockerSuite) TestImportBadURL(c *check.C) {
-	out, _, err := dockerCmdWithError("import", "http://nourl/bad")
-	c.Assert(err, checker.NotNil, check.Commentf("import was supposed to fail but didn't"))
-	// Depending on your system you can get either of these errors
-	if !strings.Contains(out, "dial tcp") &&
-		!strings.Contains(out, "ApplyLayer exit status 1 stdout:  stderr: archive/tar: invalid tar header") &&
-		!strings.Contains(out, "Error processing tar file") {
-		c.Fatalf("expected an error msg but didn't get one.\nErr: %v\nOut: %v", err, out)
-	}
-}
-
-func (s *DockerSuite) TestImportFile(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
-
-	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
-	defer os.Remove(temporaryFile.Name())
-
-	runCmd := exec.Command(dockerBinary, "export", "test-import")
-	runCmd.Stdout = bufio.NewWriter(temporaryFile)
-
-	_, err = runCommand(runCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
-
-	out, _ := dockerCmd(c, "import", temporaryFile.Name())
-	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
-	image := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "run", "--rm", image, "true")
-	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
-}
-
-func (s *DockerSuite) TestImportGzipped(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
-
-	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
-	defer os.Remove(temporaryFile.Name())
-
-	runCmd := exec.Command(dockerBinary, "export", "test-import")
-	w := gzip.NewWriter(temporaryFile)
-	runCmd.Stdout = w
-
-	_, err = runCommand(runCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
-	err = w.Close()
-	c.Assert(err, checker.IsNil, check.Commentf("failed to close gzip writer"))
-	temporaryFile.Close()
-	out, _ := dockerCmd(c, "import", temporaryFile.Name())
-	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
-	image := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "run", "--rm", image, "true")
-	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing."))
-}
-
-func (s *DockerSuite) TestImportFileWithMessage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
-
-	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
-	defer os.Remove(temporaryFile.Name())
-
-	runCmd := exec.Command(dockerBinary, "export", "test-import")
-	runCmd.Stdout = bufio.NewWriter(temporaryFile)
-
-	_, err = runCommand(runCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to export a container"))
-
-	message := "Testing commit message"
-	out, _ := dockerCmd(c, "import", "-m", message, temporaryFile.Name())
-	c.Assert(out, checker.Count, "\n", 1, check.Commentf("display is expected 1 '\\n' but didn't"))
-	image := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "history", image)
-	split := strings.Split(out, "\n")
-
-	c.Assert(split, checker.HasLen, 3, check.Commentf("expected 3 lines from image history"))
-	r := regexp.MustCompile("[\\s]{2,}")
-	split = r.Split(split[1], -1)
-
-	c.Assert(message, checker.Equals, split[3], check.Commentf("didn't get expected value in commit message"))
-
-	out, _ = dockerCmd(c, "run", "--rm", image, "true")
-	c.Assert(out, checker.Equals, "", check.Commentf("command output should've been nothing"))
-}
-
-func (s *DockerSuite) TestImportFileNonExistentFile(c *check.C) {
-	_, _, err := dockerCmdWithError("import", "example.com/myImage.tar")
-	c.Assert(err, checker.NotNil, check.Commentf("import non-existing file must failed"))
-}
-
-func (s *DockerSuite) TestImportWithQuotedChanges(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test-import", "busybox", "true")
-
-	temporaryFile, err := ioutil.TempFile("", "exportImportTest")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
-	defer os.Remove(temporaryFile.Name())
-
-	result := icmd.RunCmd(icmd.Cmd{
-		Command: binaryWithArgs("export", "test-import"),
-		Stdout:  bufio.NewWriter(temporaryFile),
-	})
-	c.Assert(result, icmd.Matches, icmd.Success)
-
-	result = dockerCmdWithResult("import", "-c", `ENTRYPOINT ["/bin/sh", "-c"]`, temporaryFile.Name())
-	c.Assert(result, icmd.Matches, icmd.Success)
-	image := strings.TrimSpace(result.Stdout())
-
-	result = dockerCmdWithResult("run", "--rm", image, "true")
-	c.Assert(result, icmd.Matches, icmd.Expected{Out: icmd.None})
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_test.go
deleted file mode 100644
index 62ce7e22f2..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_test.go
+++ /dev/null
@@ -1,234 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// ensure docker info succeeds
-func (s *DockerSuite) TestInfoEnsureSucceeds(c *check.C) {
-	out, _ := dockerCmd(c, "info")
-
-	// always shown fields
-	stringsToCheck := []string{
-		"ID:",
-		"Containers:",
-		" Running:",
-		" Paused:",
-		" Stopped:",
-		"Images:",
-		"OSType:",
-		"Architecture:",
-		"Logging Driver:",
-		"Operating System:",
-		"CPUs:",
-		"Total Memory:",
-		"Kernel Version:",
-		"Storage Driver:",
-		"Volume:",
-		"Network:",
-		"Live Restore Enabled:",
-	}
-
-	if daemonPlatform == "linux" {
-		stringsToCheck = append(stringsToCheck, "Init Binary:", "Security Options:", "containerd version:", "runc version:", "init version:")
-	}
-
-	if DaemonIsLinux.Condition() {
-		stringsToCheck = append(stringsToCheck, "Runtimes:", "Default Runtime: runc")
-	}
-
-	if experimentalDaemon {
-		stringsToCheck = append(stringsToCheck, "Experimental: true")
-	} else {
-		stringsToCheck = append(stringsToCheck, "Experimental: false")
-	}
-
-	for _, linePrefix := range stringsToCheck {
-		c.Assert(out, checker.Contains, linePrefix, check.Commentf("couldn't find string %v in output", linePrefix))
-	}
-}
-
-// TestInfoFormat tests `docker info --format`
-func (s *DockerSuite) TestInfoFormat(c *check.C) {
-	out, status := dockerCmd(c, "info", "--format", "{{json .}}")
-	c.Assert(status, checker.Equals, 0)
-	var m map[string]interface{}
-	err := json.Unmarshal([]byte(out), &m)
-	c.Assert(err, checker.IsNil)
-	_, _, err = dockerCmdWithError("info", "--format", "{{.badString}}")
-	c.Assert(err, checker.NotNil)
-}
-
-// TestInfoDiscoveryBackend verifies that a daemon run with `--cluster-advertise` and
-// `--cluster-store` properly show the backend's endpoint in info output.
-func (s *DockerSuite) TestInfoDiscoveryBackend(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	d := NewDaemon(c)
-	discoveryBackend := "consul://consuladdr:consulport/some/path"
-	discoveryAdvertise := "1.1.1.1:2375"
-	err := d.Start(fmt.Sprintf("--cluster-store=%s", discoveryBackend), fmt.Sprintf("--cluster-advertise=%s", discoveryAdvertise))
-	c.Assert(err, checker.IsNil)
-	defer d.Stop()
-
-	out, err := d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: %s\n", discoveryBackend))
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: %s\n", discoveryAdvertise))
-}
-
-// TestInfoDiscoveryInvalidAdvertise verifies that a daemon run with
-// an invalid `--cluster-advertise` configuration
-func (s *DockerSuite) TestInfoDiscoveryInvalidAdvertise(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	d := NewDaemon(c)
-	discoveryBackend := "consul://consuladdr:consulport/some/path"
-
-	// --cluster-advertise with an invalid string is an error
-	err := d.Start(fmt.Sprintf("--cluster-store=%s", discoveryBackend), "--cluster-advertise=invalid")
-	c.Assert(err, checker.Not(checker.IsNil))
-
-	// --cluster-advertise without --cluster-store is also an error
-	err = d.Start("--cluster-advertise=1.1.1.1:2375")
-	c.Assert(err, checker.Not(checker.IsNil))
-}
-
-// TestInfoDiscoveryAdvertiseInterfaceName verifies that a daemon run with `--cluster-advertise`
-// configured with interface name properly show the advertise ip-address in info output.
-func (s *DockerSuite) TestInfoDiscoveryAdvertiseInterfaceName(c *check.C) {
-	testRequires(c, SameHostDaemon, Network, DaemonIsLinux)
-
-	d := NewDaemon(c)
-	discoveryBackend := "consul://consuladdr:consulport/some/path"
-	discoveryAdvertise := "eth0"
-
-	err := d.Start(fmt.Sprintf("--cluster-store=%s", discoveryBackend), fmt.Sprintf("--cluster-advertise=%s:2375", discoveryAdvertise))
-	c.Assert(err, checker.IsNil)
-	defer d.Stop()
-
-	iface, err := net.InterfaceByName(discoveryAdvertise)
-	c.Assert(err, checker.IsNil)
-	addrs, err := iface.Addrs()
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(addrs), checker.GreaterThan, 0)
-	ip, _, err := net.ParseCIDR(addrs[0].String())
-	c.Assert(err, checker.IsNil)
-
-	out, err := d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Store: %s\n", discoveryBackend))
-	c.Assert(out, checker.Contains, fmt.Sprintf("Cluster Advertise: %s:2375\n", ip.String()))
-}
-
-func (s *DockerSuite) TestInfoDisplaysRunningContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerCmd(c, "run", "-d", "busybox", "top")
-	out, _ := dockerCmd(c, "info")
-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))
-}
-
-func (s *DockerSuite) TestInfoDisplaysPausedContainers(c *check.C) {
-	testRequires(c, IsPausable)
-
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "pause", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "info")
-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 0))
-}
-
-func (s *DockerSuite) TestInfoDisplaysStoppedContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "stop", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "info")
-	c.Assert(out, checker.Contains, fmt.Sprintf("Containers: %d\n", 1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Running: %d\n", 0))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Paused: %d\n", 0))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" Stopped: %d\n", 1))
-}
-
-func (s *DockerSuite) TestInfoDebug(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	d := NewDaemon(c)
-	err := d.Start("--debug")
-	c.Assert(err, checker.IsNil)
-	defer d.Stop()
-
-	out, err := d.Cmd("--debug", "info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Debug Mode (client): true\n")
-	c.Assert(out, checker.Contains, "Debug Mode (server): true\n")
-	c.Assert(out, checker.Contains, "File Descriptors")
-	c.Assert(out, checker.Contains, "Goroutines")
-	c.Assert(out, checker.Contains, "System Time")
-	c.Assert(out, checker.Contains, "EventsListeners")
-	c.Assert(out, checker.Contains, "Docker Root Dir")
-}
-
-func (s *DockerSuite) TestInsecureRegistries(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	registryCIDR := "192.168.1.0/24"
-	registryHost := "insecurehost.com:5000"
-
-	d := NewDaemon(c)
-	err := d.Start("--insecure-registry="+registryCIDR, "--insecure-registry="+registryHost)
-	c.Assert(err, checker.IsNil)
-	defer d.Stop()
-
-	out, err := d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Insecure Registries:\n")
-	c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryHost))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" %s\n", registryCIDR))
-}
-
-func (s *DockerDaemonSuite) TestRegistryMirrors(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	registryMirror1 := "https://192.168.1.2"
-	registryMirror2 := "http://registry.mirror.com:5000"
-
-	err := s.d.Start("--registry-mirror="+registryMirror1, "--registry-mirror="+registryMirror2)
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Registry Mirrors:\n")
-	c.Assert(out, checker.Contains, fmt.Sprintf(" %s", registryMirror1))
-	c.Assert(out, checker.Contains, fmt.Sprintf(" %s", registryMirror2))
-}
-
-// Test case for #24392
-func (s *DockerDaemonSuite) TestInfoLabels(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	err := s.d.Start("--label", `test.empty=`, "--label", `test.empty=`, "--label", `test.label="1"`, "--label", `test.label="2"`)
-	c.Assert(err, checker.IsNil)
-
-	out, err := s.d.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "WARNING: labels with duplicate keys and conflicting values have been deprecated")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_unix_test.go
deleted file mode 100644
index b9323060dd..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_info_unix_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestInfoSecurityOptions(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, Apparmor, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "info")
-	c.Assert(out, checker.Contains, "Security Options:\n apparmor\n seccomp\n  Profile: default\n")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_inspect_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_inspect_test.go
deleted file mode 100644
index 32ed28afe1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_inspect_test.go
+++ /dev/null
@@ -1,466 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func checkValidGraphDriver(c *check.C, name string) {
-	if name != "devicemapper" && name != "overlay" && name != "vfs" && name != "zfs" && name != "btrfs" && name != "aufs" {
-		c.Fatalf("%v is not a valid graph driver name", name)
-	}
-}
-
-func (s *DockerSuite) TestInspectImage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	imageTest := "emptyfs"
-	// It is important that this ID remain stable. If a code change causes
-	// it to be different, this is equivalent to a cache bust when pulling
-	// a legacy-format manifest. If the check at the end of this function
-	// fails, fix the difference in the image serialization instead of
-	// updating this hash.
-	imageTestID := "sha256:11f64303f0f7ffdc71f001788132bca5346831939a956e3e975c93267d89a16d"
-	id := inspectField(c, imageTest, "Id")
-
-	c.Assert(id, checker.Equals, imageTestID)
-}
-
-func (s *DockerSuite) TestInspectInt64(c *check.C) {
-	dockerCmd(c, "run", "-d", "-m=300M", "--name", "inspectTest", "busybox", "true")
-	inspectOut := inspectField(c, "inspectTest", "HostConfig.Memory")
-	c.Assert(inspectOut, checker.Equals, "314572800")
-}
-
-func (s *DockerSuite) TestInspectDefault(c *check.C) {
-	//Both the container and image are named busybox. docker inspect will fetch the container JSON.
-	//If the container JSON is not available, it will go for the image JSON.
-
-	out, _ := dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
-	containerID := strings.TrimSpace(out)
-
-	inspectOut := inspectField(c, "busybox", "Id")
-	c.Assert(strings.TrimSpace(inspectOut), checker.Equals, containerID)
-}
-
-func (s *DockerSuite) TestInspectStatus(c *check.C) {
-	if daemonPlatform != "windows" {
-		defer unpauseAllContainers()
-	}
-	out, _ := runSleepingContainer(c, "-d")
-	out = strings.TrimSpace(out)
-
-	inspectOut := inspectField(c, out, "State.Status")
-	c.Assert(inspectOut, checker.Equals, "running")
-
-	// Windows does not support pause/unpause on Windows Server Containers.
-	// (RS1 does for Hyper-V Containers, but production CI is not setup for that)
-	if daemonPlatform != "windows" {
-		dockerCmd(c, "pause", out)
-		inspectOut = inspectField(c, out, "State.Status")
-		c.Assert(inspectOut, checker.Equals, "paused")
-
-		dockerCmd(c, "unpause", out)
-		inspectOut = inspectField(c, out, "State.Status")
-		c.Assert(inspectOut, checker.Equals, "running")
-	}
-
-	dockerCmd(c, "stop", out)
-	inspectOut = inspectField(c, out, "State.Status")
-	c.Assert(inspectOut, checker.Equals, "exited")
-
-}
-
-func (s *DockerSuite) TestInspectTypeFlagContainer(c *check.C) {
-	//Both the container and image are named busybox. docker inspect will fetch container
-	//JSON State.Running field. If the field is true, it's a container.
-	runSleepingContainer(c, "--name=busybox", "-d")
-
-	formatStr := "--format={{.State.Running}}"
-	out, _ := dockerCmd(c, "inspect", "--type=container", formatStr, "busybox")
-	c.Assert(out, checker.Equals, "true\n") // not a container JSON
-}
-
-func (s *DockerSuite) TestInspectTypeFlagWithNoContainer(c *check.C) {
-	//Run this test on an image named busybox. docker inspect will try to fetch container
-	//JSON. Since there is no container named busybox and --type=container, docker inspect will
-	//not try to get the image JSON. It will throw an error.
-
-	dockerCmd(c, "run", "-d", "busybox", "true")
-
-	_, _, err := dockerCmdWithError("inspect", "--type=container", "busybox")
-	// docker inspect should fail, as there is no container named busybox
-	c.Assert(err, checker.NotNil)
-}
-
-func (s *DockerSuite) TestInspectTypeFlagWithImage(c *check.C) {
-	//Both the container and image are named busybox. docker inspect will fetch image
-	//JSON as --type=image. if there is no image with name busybox, docker inspect
-	//will throw an error.
-
-	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
-
-	out, _ := dockerCmd(c, "inspect", "--type=image", "busybox")
-	c.Assert(out, checker.Not(checker.Contains), "State") // not an image JSON
-}
-
-func (s *DockerSuite) TestInspectTypeFlagWithInvalidValue(c *check.C) {
-	//Both the container and image are named busybox. docker inspect will fail
-	//as --type=foobar is not a valid value for the flag.
-
-	dockerCmd(c, "run", "--name=busybox", "-d", "busybox", "true")
-
-	out, exitCode, err := dockerCmdWithError("inspect", "--type=foobar", "busybox")
-	c.Assert(err, checker.NotNil, check.Commentf("%s", exitCode))
-	c.Assert(exitCode, checker.Equals, 1, check.Commentf("%s", err))
-	c.Assert(out, checker.Contains, "not a valid value for --type")
-}
-
-func (s *DockerSuite) TestInspectImageFilterInt(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	imageTest := "emptyfs"
-	out := inspectField(c, imageTest, "Size")
-
-	size, err := strconv.Atoi(out)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect size of the image: %s, %v", out, err))
-
-	//now see if the size turns out to be the same
-	formatStr := fmt.Sprintf("--format={{eq .Size %d}}", size)
-	out, _ = dockerCmd(c, "inspect", formatStr, imageTest)
-	result, err := strconv.ParseBool(strings.TrimSuffix(out, "\n"))
-	c.Assert(err, checker.IsNil)
-	c.Assert(result, checker.Equals, true)
-}
-
-func (s *DockerSuite) TestInspectContainerFilterInt(c *check.C) {
-	runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "cat")
-	runCmd.Stdin = strings.NewReader("blahblah")
-	out, _, _, err := runCommandWithStdoutStderr(runCmd)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to run container: %v, output: %q", err, out))
-
-	id := strings.TrimSpace(out)
-
-	out = inspectField(c, id, "State.ExitCode")
-
-	exitCode, err := strconv.Atoi(out)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect exitcode of the container: %s, %v", out, err))
-
-	//now get the exit code to verify
-	formatStr := fmt.Sprintf("--format={{eq .State.ExitCode %d}}", exitCode)
-	out, _ = dockerCmd(c, "inspect", formatStr, id)
-	result, err := strconv.ParseBool(strings.TrimSuffix(out, "\n"))
-	c.Assert(err, checker.IsNil)
-	c.Assert(result, checker.Equals, true)
-}
-
-func (s *DockerSuite) TestInspectImageGraphDriver(c *check.C) {
-	testRequires(c, DaemonIsLinux, Devicemapper)
-	imageTest := "emptyfs"
-	name := inspectField(c, imageTest, "GraphDriver.Name")
-
-	checkValidGraphDriver(c, name)
-
-	deviceID := inspectField(c, imageTest, "GraphDriver.Data.DeviceId")
-
-	_, err := strconv.Atoi(deviceID)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect DeviceId of the image: %s, %v", deviceID, err))
-
-	deviceSize := inspectField(c, imageTest, "GraphDriver.Data.DeviceSize")
-
-	_, err = strconv.ParseUint(deviceSize, 10, 64)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect DeviceSize of the image: %s, %v", deviceSize, err))
-}
-
-func (s *DockerSuite) TestInspectContainerGraphDriver(c *check.C) {
-	testRequires(c, DaemonIsLinux, Devicemapper)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	out = strings.TrimSpace(out)
-
-	name := inspectField(c, out, "GraphDriver.Name")
-
-	checkValidGraphDriver(c, name)
-
-	imageDeviceID := inspectField(c, "busybox", "GraphDriver.Data.DeviceId")
-
-	deviceID := inspectField(c, out, "GraphDriver.Data.DeviceId")
-
-	c.Assert(imageDeviceID, checker.Not(checker.Equals), deviceID)
-
-	_, err := strconv.Atoi(deviceID)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect DeviceId of the image: %s, %v", deviceID, err))
-
-	deviceSize := inspectField(c, out, "GraphDriver.Data.DeviceSize")
-
-	_, err = strconv.ParseUint(deviceSize, 10, 64)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect DeviceSize of the image: %s, %v", deviceSize, err))
-}
-
-func (s *DockerSuite) TestInspectBindMountPoint(c *check.C) {
-	modifier := ",z"
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	if daemonPlatform == "windows" {
-		modifier = ""
-		// TODO Windows: Temporary check - remove once TP5 support is dropped
-		if windowsDaemonKV < 14350 {
-			c.Skip("Needs later Windows build for RO volumes")
-		}
-		// Linux creates the host directory if it doesn't exist. Windows does not.
-		os.Mkdir(`c:\data`, os.ModeDir)
-	}
-
-	dockerCmd(c, "run", "-d", "--name", "test", "-v", prefix+slash+"data:"+prefix+slash+"data:ro"+modifier, "busybox", "cat")
-
-	vol := inspectFieldJSON(c, "test", "Mounts")
-
-	var mp []types.MountPoint
-	err := json.Unmarshal([]byte(vol), &mp)
-	c.Assert(err, checker.IsNil)
-
-	// check that there is only one mountpoint
-	c.Assert(mp, check.HasLen, 1)
-
-	m := mp[0]
-
-	c.Assert(m.Name, checker.Equals, "")
-	c.Assert(m.Driver, checker.Equals, "")
-	c.Assert(m.Source, checker.Equals, prefix+slash+"data")
-	c.Assert(m.Destination, checker.Equals, prefix+slash+"data")
-	if daemonPlatform != "windows" { // Windows does not set mode
-		c.Assert(m.Mode, checker.Equals, "ro"+modifier)
-	}
-	c.Assert(m.RW, checker.Equals, false)
-}
-
-func (s *DockerSuite) TestInspectNamedMountPoint(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	dockerCmd(c, "run", "-d", "--name", "test", "-v", "data:"+prefix+slash+"data", "busybox", "cat")
-
-	vol := inspectFieldJSON(c, "test", "Mounts")
-
-	var mp []types.MountPoint
-	err := json.Unmarshal([]byte(vol), &mp)
-	c.Assert(err, checker.IsNil)
-
-	// check that there is only one mountpoint
-	c.Assert(mp, checker.HasLen, 1)
-
-	m := mp[0]
-
-	c.Assert(m.Name, checker.Equals, "data")
-	c.Assert(m.Driver, checker.Equals, "local")
-	c.Assert(m.Source, checker.Not(checker.Equals), "")
-	c.Assert(m.Destination, checker.Equals, prefix+slash+"data")
-	c.Assert(m.RW, checker.Equals, true)
-}
-
-// #14947
-func (s *DockerSuite) TestInspectTimesAsRFC3339Nano(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-	id := strings.TrimSpace(out)
-	startedAt := inspectField(c, id, "State.StartedAt")
-	finishedAt := inspectField(c, id, "State.FinishedAt")
-	created := inspectField(c, id, "Created")
-
-	_, err := time.Parse(time.RFC3339Nano, startedAt)
-	c.Assert(err, checker.IsNil)
-	_, err = time.Parse(time.RFC3339Nano, finishedAt)
-	c.Assert(err, checker.IsNil)
-	_, err = time.Parse(time.RFC3339Nano, created)
-	c.Assert(err, checker.IsNil)
-
-	created = inspectField(c, "busybox", "Created")
-
-	_, err = time.Parse(time.RFC3339Nano, created)
-	c.Assert(err, checker.IsNil)
-}
-
-// #15633
-func (s *DockerSuite) TestInspectLogConfigNoType(c *check.C) {
-	dockerCmd(c, "create", "--name=test", "--log-opt", "max-file=42", "busybox")
-	var logConfig container.LogConfig
-
-	out := inspectFieldJSON(c, "test", "HostConfig.LogConfig")
-
-	err := json.NewDecoder(strings.NewReader(out)).Decode(&logConfig)
-	c.Assert(err, checker.IsNil, check.Commentf("%v", out))
-
-	c.Assert(logConfig.Type, checker.Equals, "json-file")
-	c.Assert(logConfig.Config["max-file"], checker.Equals, "42", check.Commentf("%v", logConfig))
-}
-
-func (s *DockerSuite) TestInspectNoSizeFlagContainer(c *check.C) {
-
-	//Both the container and image are named busybox. docker inspect will fetch container
-	//JSON SizeRw and SizeRootFs field. If there is no flag --size/-s, there are no size fields.
-
-	runSleepingContainer(c, "--name=busybox", "-d")
-
-	formatStr := "--format={{.SizeRw}},{{.SizeRootFs}}"
-	out, _ := dockerCmd(c, "inspect", "--type=container", formatStr, "busybox")
-	c.Assert(strings.TrimSpace(out), check.Equals, "<nil>,<nil>", check.Commentf("Exepcted not to display size info: %s", out))
-}
-
-func (s *DockerSuite) TestInspectSizeFlagContainer(c *check.C) {
-	runSleepingContainer(c, "--name=busybox", "-d")
-
-	formatStr := "--format='{{.SizeRw}},{{.SizeRootFs}}'"
-	out, _ := dockerCmd(c, "inspect", "-s", "--type=container", formatStr, "busybox")
-	sz := strings.Split(out, ",")
-
-	c.Assert(strings.TrimSpace(sz[0]), check.Not(check.Equals), "<nil>")
-	c.Assert(strings.TrimSpace(sz[1]), check.Not(check.Equals), "<nil>")
-}
-
-func (s *DockerSuite) TestInspectTemplateError(c *check.C) {
-	// Template parsing error for both the container and image.
-
-	runSleepingContainer(c, "--name=container1", "-d")
-
-	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='Format container: {{.ThisDoesNotExist}}'", "container1")
-	c.Assert(err, check.Not(check.IsNil))
-	c.Assert(out, checker.Contains, "Template parsing error")
-
-	out, _, err = dockerCmdWithError("inspect", "--type=image", "--format='Format container: {{.ThisDoesNotExist}}'", "busybox")
-	c.Assert(err, check.Not(check.IsNil))
-	c.Assert(out, checker.Contains, "Template parsing error")
-}
-
-func (s *DockerSuite) TestInspectJSONFields(c *check.C) {
-	runSleepingContainer(c, "--name=busybox", "-d")
-	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format={{.HostConfig.Dns}}", "busybox")
-
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Equals, "[]\n")
-}
-
-func (s *DockerSuite) TestInspectByPrefix(c *check.C) {
-	id := inspectField(c, "busybox", "Id")
-	c.Assert(id, checker.HasPrefix, "sha256:")
-
-	id2 := inspectField(c, id[:12], "Id")
-	c.Assert(id, checker.Equals, id2)
-
-	id3 := inspectField(c, strings.TrimPrefix(id, "sha256:")[:12], "Id")
-	c.Assert(id, checker.Equals, id3)
-}
-
-func (s *DockerSuite) TestInspectStopWhenNotFound(c *check.C) {
-	runSleepingContainer(c, "--name=busybox", "-d")
-	runSleepingContainer(c, "--name=not-shown", "-d")
-	out, _, err := dockerCmdWithError("inspect", "--type=container", "--format='{{.Name}}'", "busybox", "missing", "not-shown")
-
-	c.Assert(err, checker.Not(check.IsNil))
-	c.Assert(out, checker.Contains, "busybox")
-	c.Assert(out, checker.Not(checker.Contains), "not-shown")
-	c.Assert(out, checker.Contains, "Error: No such container: missing")
-}
-
-func (s *DockerSuite) TestInspectHistory(c *check.C) {
-	dockerCmd(c, "run", "--name=testcont", "busybox", "echo", "hello")
-	dockerCmd(c, "commit", "-m", "test comment", "testcont", "testimg")
-	out, _, err := dockerCmdWithError("inspect", "--format='{{.Comment}}'", "testimg")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "test comment")
-}
-
-func (s *DockerSuite) TestInspectContainerNetworkDefault(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	contName := "test1"
-	dockerCmd(c, "run", "--name", contName, "-d", "busybox", "top")
-	netOut, _ := dockerCmd(c, "network", "inspect", "--format={{.ID}}", "bridge")
-	out := inspectField(c, contName, "NetworkSettings.Networks")
-	c.Assert(out, checker.Contains, "bridge")
-	out = inspectField(c, contName, "NetworkSettings.Networks.bridge.NetworkID")
-	c.Assert(strings.TrimSpace(out), checker.Equals, strings.TrimSpace(netOut))
-}
-
-func (s *DockerSuite) TestInspectContainerNetworkCustom(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	netOut, _ := dockerCmd(c, "network", "create", "net1")
-	dockerCmd(c, "run", "--name=container1", "--net=net1", "-d", "busybox", "top")
-	out := inspectField(c, "container1", "NetworkSettings.Networks")
-	c.Assert(out, checker.Contains, "net1")
-	out = inspectField(c, "container1", "NetworkSettings.Networks.net1.NetworkID")
-	c.Assert(strings.TrimSpace(out), checker.Equals, strings.TrimSpace(netOut))
-}
-
-func (s *DockerSuite) TestInspectRootFS(c *check.C) {
-	out, _, err := dockerCmdWithError("inspect", "busybox")
-	c.Assert(err, check.IsNil)
-
-	var imageJSON []types.ImageInspect
-	err = json.Unmarshal([]byte(out), &imageJSON)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(len(imageJSON[0].RootFS.Layers), checker.GreaterOrEqualThan, 1)
-}
-
-func (s *DockerSuite) TestInspectAmpersand(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	name := "test"
-	out, _ := dockerCmd(c, "run", "--name", name, "--env", `TEST_ENV="soanni&rtr"`, "busybox", "env")
-	c.Assert(out, checker.Contains, `soanni&rtr`)
-	out, _ = dockerCmd(c, "inspect", name)
-	c.Assert(out, checker.Contains, `soanni&rtr`)
-}
-
-func (s *DockerSuite) TestInspectPlugin(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("inspect", "--type", "plugin", "--format", "{{.Name}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
-
-	out, _, err = dockerCmdWithError("inspect", "--format", "{{.Name}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
-
-	// Even without tag the inspect still work
-	out, _, err = dockerCmdWithError("inspect", "--type", "plugin", "--format", "{{.Name}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
-
-	out, _, err = dockerCmdWithError("inspect", "--format", "{{.Name}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, pNameWithTag)
-
-	_, _, err = dockerCmdWithError("plugin", "disable", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pNameWithTag)
-}
-
-// Test case for 29185
-func (s *DockerSuite) TestInspectUnknownObject(c *check.C) {
-	// This test should work on both Windows and Linux
-	out, _, err := dockerCmdWithError("inspect", "foobar")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Error: No such object: foobar")
-	c.Assert(err.Error(), checker.Contains, "Error: No such object: foobar")
-}
-
-func (s *DockerSuite) TestInpectInvalidReference(c *check.C) {
-	// This test should work on both Windows and Linux
-	out, _, err := dockerCmdWithError("inspect", "FooBar")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Error: No such object: FooBar")
-	c.Assert(err.Error(), checker.Contains, "Error: No such object: FooBar")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_kill_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_kill_test.go
deleted file mode 100644
index 43164801d4..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_kill_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestKillContainer(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-	c.Assert(waitRun(cleanedContainerID), check.IsNil)
-
-	dockerCmd(c, "kill", cleanedContainerID)
-	c.Assert(waitExited(cleanedContainerID, 10*time.Second), check.IsNil)
-
-	out, _ = dockerCmd(c, "ps", "-q")
-	c.Assert(out, checker.Not(checker.Contains), cleanedContainerID, check.Commentf("killed container is still running"))
-
-}
-
-func (s *DockerSuite) TestKillOffStoppedContainer(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "stop", cleanedContainerID)
-	c.Assert(waitExited(cleanedContainerID, 10*time.Second), check.IsNil)
-
-	_, _, err := dockerCmdWithError("kill", "-s", "30", cleanedContainerID)
-	c.Assert(err, check.Not(check.IsNil), check.Commentf("Container %s is not running", cleanedContainerID))
-}
-
-func (s *DockerSuite) TestKillDifferentUserContainer(c *check.C) {
-	// TODO Windows: Windows does not yet support -u (Feb 2016).
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-u", "daemon", "-d", "busybox", "top")
-	cleanedContainerID := strings.TrimSpace(out)
-	c.Assert(waitRun(cleanedContainerID), check.IsNil)
-
-	dockerCmd(c, "kill", cleanedContainerID)
-	c.Assert(waitExited(cleanedContainerID, 10*time.Second), check.IsNil)
-
-	out, _ = dockerCmd(c, "ps", "-q")
-	c.Assert(out, checker.Not(checker.Contains), cleanedContainerID, check.Commentf("killed container is still running"))
-
-}
-
-// regression test about correct signal parsing see #13665
-func (s *DockerSuite) TestKillWithSignal(c *check.C) {
-	// Cannot port to Windows - does not support signals in the same way Linux does
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	cid := strings.TrimSpace(out)
-	c.Assert(waitRun(cid), check.IsNil)
-
-	dockerCmd(c, "kill", "-s", "SIGWINCH", cid)
-	time.Sleep(250 * time.Millisecond)
-
-	running := inspectField(c, cid, "State.Running")
-
-	c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after SIGWINCH"))
-}
-
-func (s *DockerSuite) TestKillWithStopSignalWithSameSignalShouldDisableRestartPolicy(c *check.C) {
-	// Cannot port to Windows - does not support signals int the same way as Linux does
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--stop-signal=TERM", "--restart=always", "busybox", "top")
-	cid := strings.TrimSpace(out)
-	c.Assert(waitRun(cid), check.IsNil)
-
-	// Let docker send a TERM signal to the container
-	// It will kill the process and disable the restart policy
-	dockerCmd(c, "kill", "-s", "TERM", cid)
-	c.Assert(waitExited(cid, 10*time.Second), check.IsNil)
-
-	out, _ = dockerCmd(c, "ps", "-q")
-	c.Assert(out, checker.Not(checker.Contains), cid, check.Commentf("killed container is still running"))
-}
-
-func (s *DockerSuite) TestKillWithStopSignalWithDifferentSignalShouldKeepRestartPolicy(c *check.C) {
-	// Cannot port to Windows - does not support signals int the same way as Linux does
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--stop-signal=CONT", "--restart=always", "busybox", "top")
-	cid := strings.TrimSpace(out)
-	c.Assert(waitRun(cid), check.IsNil)
-
-	// Let docker send a TERM signal to the container
-	// It will kill the process, but not disable the restart policy
-	dockerCmd(c, "kill", "-s", "TERM", cid)
-	c.Assert(waitRestart(cid, 10*time.Second), check.IsNil)
-
-	// Restart policy should still be in place, so it should be still running
-	c.Assert(waitRun(cid), check.IsNil)
-}
-
-// FIXME(vdemeester) should be a unit test
-func (s *DockerSuite) TestKillWithInvalidSignal(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cid := strings.TrimSpace(out)
-	c.Assert(waitRun(cid), check.IsNil)
-
-	out, _, err := dockerCmdWithError("kill", "-s", "0", cid)
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Invalid signal: 0", check.Commentf("Kill with an invalid signal didn't error out correctly"))
-
-	running := inspectField(c, cid, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after an invalid signal"))
-
-	out, _ = runSleepingContainer(c, "-d")
-	cid = strings.TrimSpace(out)
-	c.Assert(waitRun(cid), check.IsNil)
-
-	out, _, err = dockerCmdWithError("kill", "-s", "SIG42", cid)
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Invalid signal: SIG42", check.Commentf("Kill with an invalid signal error out correctly"))
-
-	running = inspectField(c, cid, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("Container should be in running state after an invalid signal"))
-
-}
-
-func (s *DockerSuite) TestKillStoppedContainerAPIPre120(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows only supports 1.25 or later
-	runSleepingContainer(c, "--name", "docker-kill-test-api", "-d")
-	dockerCmd(c, "stop", "docker-kill-test-api")
-
-	status, _, err := sockRequest("POST", fmt.Sprintf("/v1.19/containers/%s/kill", "docker-kill-test-api"), nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusNoContent)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_test.go
deleted file mode 100644
index a5872d9e0c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_test.go
+++ /dev/null
@@ -1,240 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/runconfig"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestLinksPingUnlinkedContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	_, exitCode, err := dockerCmdWithError("run", "--rm", "busybox", "sh", "-c", "ping -c 1 alias1 -W 1 && ping -c 1 alias2 -W 1")
-
-	// run ping failed with error
-	c.Assert(exitCode, checker.Equals, 1, check.Commentf("error: %v", err))
-}
-
-// Test for appropriate error when calling --link with an invalid target container
-func (s *DockerSuite) TestLinksInvalidContainerTarget(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--link", "bogus:alias", "busybox", "true")
-
-	// an invalid container target should produce an error
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	// an invalid container target should produce an error
-	c.Assert(out, checker.Contains, "Could not get container")
-}
-
-func (s *DockerSuite) TestLinksPingLinkedContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// Test with the three different ways of specifying the default network on Linux
-	testLinkPingOnNetwork(c, "")
-	testLinkPingOnNetwork(c, "default")
-	testLinkPingOnNetwork(c, "bridge")
-}
-
-func testLinkPingOnNetwork(c *check.C, network string) {
-	var postArgs []string
-	if network != "" {
-		postArgs = append(postArgs, []string{"--net", network}...)
-	}
-	postArgs = append(postArgs, []string{"busybox", "top"}...)
-	runArgs1 := append([]string{"run", "-d", "--name", "container1", "--hostname", "fred"}, postArgs...)
-	runArgs2 := append([]string{"run", "-d", "--name", "container2", "--hostname", "wilma"}, postArgs...)
-
-	// Run the two named containers
-	dockerCmd(c, runArgs1...)
-	dockerCmd(c, runArgs2...)
-
-	postArgs = []string{}
-	if network != "" {
-		postArgs = append(postArgs, []string{"--net", network}...)
-	}
-	postArgs = append(postArgs, []string{"busybox", "sh", "-c"}...)
-
-	// Format a run for a container which links to the other two
-	runArgs := append([]string{"run", "--rm", "--link", "container1:alias1", "--link", "container2:alias2"}, postArgs...)
-	pingCmd := "ping -c 1 %s -W 1 && ping -c 1 %s -W 1"
-
-	// test ping by alias, ping by name, and ping by hostname
-	// 1. Ping by alias
-	dockerCmd(c, append(runArgs, fmt.Sprintf(pingCmd, "alias1", "alias2"))...)
-	// 2. Ping by container name
-	dockerCmd(c, append(runArgs, fmt.Sprintf(pingCmd, "container1", "container2"))...)
-	// 3. Ping by hostname
-	dockerCmd(c, append(runArgs, fmt.Sprintf(pingCmd, "fred", "wilma"))...)
-
-	// Clean for next round
-	dockerCmd(c, "rm", "-f", "container1")
-	dockerCmd(c, "rm", "-f", "container2")
-}
-
-func (s *DockerSuite) TestLinksPingLinkedContainersAfterRename(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
-	idA := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "run", "-d", "--name", "container2", "busybox", "top")
-	idB := strings.TrimSpace(out)
-	dockerCmd(c, "rename", "container1", "container_new")
-	dockerCmd(c, "run", "--rm", "--link", "container_new:alias1", "--link", "container2:alias2", "busybox", "sh", "-c", "ping -c 1 alias1 -W 1 && ping -c 1 alias2 -W 1")
-	dockerCmd(c, "kill", idA)
-	dockerCmd(c, "kill", idB)
-
-}
-
-func (s *DockerSuite) TestLinksInspectLinksStarted(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	var (
-		expected = map[string]struct{}{"/container1:/testinspectlink/alias1": {}, "/container2:/testinspectlink/alias2": {}}
-		result   []string
-	)
-	dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name", "container2", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name", "testinspectlink", "--link", "container1:alias1", "--link", "container2:alias2", "busybox", "top")
-	links := inspectFieldJSON(c, "testinspectlink", "HostConfig.Links")
-
-	err := json.Unmarshal([]byte(links), &result)
-	c.Assert(err, checker.IsNil)
-
-	output := convertSliceOfStringsToMap(result)
-
-	c.Assert(output, checker.DeepEquals, expected)
-}
-
-func (s *DockerSuite) TestLinksInspectLinksStopped(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	var (
-		expected = map[string]struct{}{"/container1:/testinspectlink/alias1": {}, "/container2:/testinspectlink/alias2": {}}
-		result   []string
-	)
-	dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name", "container2", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name", "testinspectlink", "--link", "container1:alias1", "--link", "container2:alias2", "busybox", "true")
-	links := inspectFieldJSON(c, "testinspectlink", "HostConfig.Links")
-
-	err := json.Unmarshal([]byte(links), &result)
-	c.Assert(err, checker.IsNil)
-
-	output := convertSliceOfStringsToMap(result)
-
-	c.Assert(output, checker.DeepEquals, expected)
-}
-
-func (s *DockerSuite) TestLinksNotStartedParentNotFail(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "create", "--name=first", "busybox", "top")
-	dockerCmd(c, "create", "--name=second", "--link=first:first", "busybox", "top")
-	dockerCmd(c, "start", "first")
-
-}
-
-func (s *DockerSuite) TestLinksHostsFilesInject(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon, ExecSupport)
-
-	out, _ := dockerCmd(c, "run", "-itd", "--name", "one", "busybox", "top")
-	idOne := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "run", "-itd", "--name", "two", "--link", "one:onetwo", "busybox", "top")
-	idTwo := strings.TrimSpace(out)
-
-	c.Assert(waitRun(idTwo), checker.IsNil)
-
-	contentOne, err := readContainerFileWithExec(idOne, "/etc/hosts")
-	c.Assert(err, checker.IsNil, check.Commentf("contentOne: %s", string(contentOne)))
-
-	contentTwo, err := readContainerFileWithExec(idTwo, "/etc/hosts")
-	c.Assert(err, checker.IsNil, check.Commentf("contentTwo: %s", string(contentTwo)))
-	// Host is not present in updated hosts file
-	c.Assert(string(contentTwo), checker.Contains, "onetwo")
-}
-
-func (s *DockerSuite) TestLinksUpdateOnRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon, ExecSupport)
-	dockerCmd(c, "run", "-d", "--name", "one", "busybox", "top")
-	out, _ := dockerCmd(c, "run", "-d", "--name", "two", "--link", "one:onetwo", "--link", "one:one", "busybox", "top")
-	id := strings.TrimSpace(string(out))
-
-	realIP := inspectField(c, "one", "NetworkSettings.Networks.bridge.IPAddress")
-	content, err := readContainerFileWithExec(id, "/etc/hosts")
-	c.Assert(err, checker.IsNil)
-
-	getIP := func(hosts []byte, hostname string) string {
-		re := regexp.MustCompile(fmt.Sprintf(`(\S*)\t%s`, regexp.QuoteMeta(hostname)))
-		matches := re.FindSubmatch(hosts)
-		c.Assert(matches, checker.NotNil, check.Commentf("Hostname %s have no matches in hosts", hostname))
-		return string(matches[1])
-	}
-	ip := getIP(content, "one")
-	c.Assert(ip, checker.Equals, realIP)
-
-	ip = getIP(content, "onetwo")
-	c.Assert(ip, checker.Equals, realIP)
-
-	dockerCmd(c, "restart", "one")
-	realIP = inspectField(c, "one", "NetworkSettings.Networks.bridge.IPAddress")
-
-	content, err = readContainerFileWithExec(id, "/etc/hosts")
-	c.Assert(err, checker.IsNil, check.Commentf("content: %s", string(content)))
-	ip = getIP(content, "one")
-	c.Assert(ip, checker.Equals, realIP)
-
-	ip = getIP(content, "onetwo")
-	c.Assert(ip, checker.Equals, realIP)
-}
-
-func (s *DockerSuite) TestLinksEnvs(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "-e", "e1=", "-e", "e2=v2", "-e", "e3=v3=v3", "--name=first", "busybox", "top")
-	out, _ := dockerCmd(c, "run", "--name=second", "--link=first:first", "busybox", "env")
-	c.Assert(out, checker.Contains, "FIRST_ENV_e1=\n")
-	c.Assert(out, checker.Contains, "FIRST_ENV_e2=v2")
-	c.Assert(out, checker.Contains, "FIRST_ENV_e3=v3=v3")
-}
-
-func (s *DockerSuite) TestLinkShortDefinition(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--name", "shortlinkdef", "busybox", "top")
-
-	cid := strings.TrimSpace(out)
-	c.Assert(waitRun(cid), checker.IsNil)
-
-	out, _ = dockerCmd(c, "run", "-d", "--name", "link2", "--link", "shortlinkdef", "busybox", "top")
-
-	cid2 := strings.TrimSpace(out)
-	c.Assert(waitRun(cid2), checker.IsNil)
-
-	links := inspectFieldJSON(c, cid2, "HostConfig.Links")
-	c.Assert(links, checker.Equals, "[\"/shortlinkdef:/link2/shortlinkdef\"]")
-}
-
-func (s *DockerSuite) TestLinksNetworkHostContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "run", "-d", "--net", "host", "--name", "host_container", "busybox", "top")
-	out, _, err := dockerCmdWithError("run", "--name", "should_fail", "--link", "host_container:tester", "busybox", "true")
-
-	// Running container linking to a container with --net host should have failed
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	// Running container linking to a container with --net host should have failed
-	c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetworkAndLinks.Error())
-}
-
-func (s *DockerSuite) TestLinksEtcHostsRegularFile(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--net=host", "busybox", "ls", "-la", "/etc/hosts")
-	// /etc/hosts should be a regular file
-	c.Assert(out, checker.Matches, "^-.+\n")
-}
-
-func (s *DockerSuite) TestLinksMultipleWithSameName(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name=upstream-a", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--name=upstream-b", "busybox", "top")
-	dockerCmd(c, "run", "--link", "upstream-a:upstream", "--link", "upstream-b:upstream", "busybox", "sh", "-c", "ping -c 1 upstream")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_unix_test.go
deleted file mode 100644
index 1af927930d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_links_unix_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestLinksEtcHostsContentMatch(c *check.C) {
-	// In a _unix file as using Unix specific files, and must be on the
-	// same host as the daemon.
-	testRequires(c, SameHostDaemon, NotUserNamespace)
-
-	out, _ := dockerCmd(c, "run", "--net=host", "busybox", "cat", "/etc/hosts")
-	hosts, err := ioutil.ReadFile("/etc/hosts")
-	if os.IsNotExist(err) {
-		c.Skip("/etc/hosts does not exist, skip this test")
-	}
-
-	c.Assert(out, checker.Equals, string(hosts), check.Commentf("container: %s\n\nhost:%s", out, hosts))
-
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_login_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_login_test.go
deleted file mode 100644
index 01de75d985..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_login_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"os/exec"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestLoginWithoutTTY(c *check.C) {
-	cmd := exec.Command(dockerBinary, "login")
-
-	// Send to stdin so the process does not get the TTY
-	cmd.Stdin = bytes.NewBufferString("buffer test string \n")
-
-	// run the command and block until it's done
-	err := cmd.Run()
-	c.Assert(err, checker.NotNil) //"Expected non nil err when loginning in & TTY not available"
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistry(c *check.C) {
-	// wrong credentials
-	out, _, err := dockerCmdWithError("login", "-u", s.reg.username, "-p", "WRONGPASSWORD", privateRegistryURL)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "401 Unauthorized")
-
-	// now it's fine
-	dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestLoginToPrivateRegistryDeprecatedEmailFlag(c *check.C) {
-	// Test to make sure login still works with the deprecated -e and --email flags
-	// wrong credentials
-	out, _, err := dockerCmdWithError("login", "-u", s.reg.username, "-p", "WRONGPASSWORD", "-e", s.reg.email, privateRegistryURL)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "401 Unauthorized")
-
-	// now it's fine
-	// -e flag
-	dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, "-e", s.reg.email, privateRegistryURL)
-	// --email flag
-	dockerCmd(c, "login", "-u", s.reg.username, "-p", s.reg.password, "--email", s.reg.email, privateRegistryURL)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logout_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logout_test.go
deleted file mode 100644
index a5f4b108cf..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logout_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithExternalAuth(c *check.C) {
-	osPath := os.Getenv("PATH")
-	defer os.Setenv("PATH", osPath)
-
-	workingDir, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
-	c.Assert(err, checker.IsNil)
-	testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
-
-	os.Setenv("PATH", testPath)
-
-	repoName := fmt.Sprintf("%v/dockercli/busybox:authtest", privateRegistryURL)
-
-	tmp, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-
-	externalAuthConfig := `{ "credsStore": "shell-test" }`
-
-	configPath := filepath.Join(tmp, "config.json")
-	err = ioutil.WriteFile(configPath, []byte(externalAuthConfig), 0644)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	b, err := ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), "\"auth\":")
-	c.Assert(string(b), checker.Contains, privateRegistryURL)
-
-	dockerCmd(c, "--config", tmp, "tag", "busybox", repoName)
-	dockerCmd(c, "--config", tmp, "push", repoName)
-
-	dockerCmd(c, "--config", tmp, "logout", privateRegistryURL)
-
-	b, err = ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), privateRegistryURL)
-
-	// check I cannot pull anymore
-	out, _, err := dockerCmdWithError("--config", tmp, "pull", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Error: image dockercli/busybox:authtest not found")
-}
-
-// #23100
-func (s *DockerRegistryAuthHtpasswdSuite) TestLogoutWithWrongHostnamesStored(c *check.C) {
-	osPath := os.Getenv("PATH")
-	defer os.Setenv("PATH", osPath)
-
-	workingDir, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
-	c.Assert(err, checker.IsNil)
-	testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
-
-	os.Setenv("PATH", testPath)
-
-	cmd := exec.Command("docker-credential-shell-test", "store")
-	stdin := bytes.NewReader([]byte(fmt.Sprintf(`{"ServerURL": "https://%s", "Username": "%s", "Secret": "%s"}`, privateRegistryURL, s.reg.username, s.reg.password)))
-	cmd.Stdin = stdin
-	c.Assert(cmd.Run(), checker.IsNil)
-
-	tmp, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-
-	externalAuthConfig := fmt.Sprintf(`{ "auths": {"https://%s": {}}, "credsStore": "shell-test" }`, privateRegistryURL)
-
-	configPath := filepath.Join(tmp, "config.json")
-	err = ioutil.WriteFile(configPath, []byte(externalAuthConfig), 0644)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	b, err := ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Contains, fmt.Sprintf("\"https://%s\": {}", privateRegistryURL))
-	c.Assert(string(b), checker.Contains, fmt.Sprintf("\"%s\": {}", privateRegistryURL))
-
-	dockerCmd(c, "--config", tmp, "logout", privateRegistryURL)
-
-	b, err = ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), fmt.Sprintf("\"https://%s\": {}", privateRegistryURL))
-	c.Assert(string(b), checker.Not(checker.Contains), fmt.Sprintf("\"%s\": {}", privateRegistryURL))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_bench_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_bench_test.go
deleted file mode 100644
index eeb008de70..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_bench_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) BenchmarkLogsCLIRotateFollow(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "--log-opt", "max-size=1b", "--log-opt", "max-file=10", "busybox", "sh", "-c", "while true; do usleep 50000; echo hello; done")
-	id := strings.TrimSpace(out)
-	ch := make(chan error, 1)
-	go func() {
-		ch <- nil
-		out, _, _ := dockerCmdWithError("logs", "-f", id)
-		// if this returns at all, it's an error
-		ch <- fmt.Errorf(out)
-	}()
-
-	<-ch
-	select {
-	case <-time.After(30 * time.Second):
-		// ran for 30 seconds with no problem
-		return
-	case err := <-ch:
-		if err != nil {
-			c.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_test.go
deleted file mode 100644
index d2dcad1052..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_logs_test.go
+++ /dev/null
@@ -1,328 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"os/exec"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/go-check/check"
-)
-
-// This used to work, it test a log of PageSize-1 (gh#4851)
-func (s *DockerSuite) TestLogsContainerSmallerThanPage(c *check.C) {
-	testLen := 32767
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	out, _ = dockerCmd(c, "logs", id)
-
-	c.Assert(out, checker.HasLen, testLen+1)
-}
-
-// Regression test: When going over the PageSize, it used to panic (gh#4851)
-func (s *DockerSuite) TestLogsContainerBiggerThanPage(c *check.C) {
-	testLen := 32768
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	out, _ = dockerCmd(c, "logs", id)
-
-	c.Assert(out, checker.HasLen, testLen+1)
-}
-
-// Regression test: When going much over the PageSize, it used to block (gh#4851)
-func (s *DockerSuite) TestLogsContainerMuchBiggerThanPage(c *check.C) {
-	testLen := 33000
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo -n = >> a.a; done; echo >> a.a; cat a.a", testLen))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	out, _ = dockerCmd(c, "logs", id)
-
-	c.Assert(out, checker.HasLen, testLen+1)
-}
-
-func (s *DockerSuite) TestLogsTimestamps(c *check.C) {
-	testLen := 100
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo = >> a.a; done; cat a.a", testLen))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	out, _ = dockerCmd(c, "logs", "-t", id)
-
-	lines := strings.Split(out, "\n")
-
-	c.Assert(lines, checker.HasLen, testLen+1)
-
-	ts := regexp.MustCompile(`^.* `)
-
-	for _, l := range lines {
-		if l != "" {
-			_, err := time.Parse(jsonlog.RFC3339NanoFixed+" ", ts.FindString(l))
-			c.Assert(err, checker.IsNil, check.Commentf("Failed to parse timestamp from %v", l))
-			// ensure we have padded 0's
-			c.Assert(l[29], checker.Equals, uint8('Z'))
-		}
-	}
-}
-
-func (s *DockerSuite) TestLogsSeparateStderr(c *check.C) {
-	msg := "stderr_log"
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("echo %s 1>&2", msg))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	stdout, stderr, _ := dockerCmdWithStdoutStderr(c, "logs", id)
-
-	c.Assert(stdout, checker.Equals, "")
-
-	stderr = strings.TrimSpace(stderr)
-
-	c.Assert(stderr, checker.Equals, msg)
-}
-
-func (s *DockerSuite) TestLogsStderrInStdout(c *check.C) {
-	// TODO Windows: Needs investigation why this fails. Obtained string includes
-	// a bunch of ANSI escape sequences before the "stderr_log" message.
-	testRequires(c, DaemonIsLinux)
-	msg := "stderr_log"
-	out, _ := dockerCmd(c, "run", "-d", "-t", "busybox", "sh", "-c", fmt.Sprintf("echo %s 1>&2", msg))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	stdout, stderr, _ := dockerCmdWithStdoutStderr(c, "logs", id)
-	c.Assert(stderr, checker.Equals, "")
-
-	stdout = strings.TrimSpace(stdout)
-	c.Assert(stdout, checker.Equals, msg)
-}
-
-func (s *DockerSuite) TestLogsTail(c *check.C) {
-	testLen := 100
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", fmt.Sprintf("for i in $(seq 1 %d); do echo =; done;", testLen))
-
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "wait", id)
-
-	out, _ = dockerCmd(c, "logs", "--tail", "0", id)
-	lines := strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, 1)
-
-	out, _ = dockerCmd(c, "logs", "--tail", "5", id)
-	lines = strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, 6)
-
-	out, _ = dockerCmd(c, "logs", "--tail", "99", id)
-	lines = strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, 100)
-
-	out, _ = dockerCmd(c, "logs", "--tail", "all", id)
-	lines = strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, testLen+1)
-
-	out, _ = dockerCmd(c, "logs", "--tail", "-1", id)
-	lines = strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, testLen+1)
-
-	out, _, _ = dockerCmdWithStdoutStderr(c, "logs", "--tail", "random", id)
-	lines = strings.Split(out, "\n")
-	c.Assert(lines, checker.HasLen, testLen+1)
-}
-
-func (s *DockerSuite) TestLogsFollowStopped(c *check.C) {
-	dockerCmd(c, "run", "--name=test", "busybox", "echo", "hello")
-	id, err := getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	logsCmd := exec.Command(dockerBinary, "logs", "-f", id)
-	c.Assert(logsCmd.Start(), checker.IsNil)
-
-	errChan := make(chan error)
-	go func() {
-		errChan <- logsCmd.Wait()
-		close(errChan)
-	}()
-
-	select {
-	case err := <-errChan:
-		c.Assert(err, checker.IsNil)
-	case <-time.After(30 * time.Second):
-		c.Fatal("Following logs is hanged")
-	}
-}
-
-func (s *DockerSuite) TestLogsSince(c *check.C) {
-	name := "testlogssince"
-	dockerCmd(c, "run", "--name="+name, "busybox", "/bin/sh", "-c", "for i in $(seq 1 3); do sleep 2; echo log$i; done")
-	out, _ := dockerCmd(c, "logs", "-t", name)
-
-	log2Line := strings.Split(strings.Split(out, "\n")[1], " ")
-	t, err := time.Parse(time.RFC3339Nano, log2Line[0]) // the timestamp log2 is written
-	c.Assert(err, checker.IsNil)
-	since := t.Unix() + 1 // add 1s so log1 & log2 doesn't show up
-	out, _ = dockerCmd(c, "logs", "-t", fmt.Sprintf("--since=%v", since), name)
-
-	// Skip 2 seconds
-	unexpected := []string{"log1", "log2"}
-	for _, v := range unexpected {
-		c.Assert(out, checker.Not(checker.Contains), v, check.Commentf("unexpected log message returned, since=%v", since))
-	}
-
-	// Test to make sure a bad since format is caught by the client
-	out, _, _ = dockerCmdWithError("logs", "-t", "--since=2006-01-02T15:04:0Z", name)
-	c.Assert(out, checker.Contains, "cannot parse \"0Z\" as \"05\"", check.Commentf("bad since format passed to server"))
-
-	// Test with default value specified and parameter omitted
-	expected := []string{"log1", "log2", "log3"}
-	for _, cmd := range []*exec.Cmd{
-		exec.Command(dockerBinary, "logs", "-t", name),
-		exec.Command(dockerBinary, "logs", "-t", "--since=0", name),
-	} {
-		out, _, err = runCommandWithOutput(cmd)
-		c.Assert(err, checker.IsNil, check.Commentf("failed to log container: %s", out))
-		for _, v := range expected {
-			c.Assert(out, checker.Contains, v)
-		}
-	}
-}
-
-func (s *DockerSuite) TestLogsSinceFutureFollow(c *check.C) {
-	// TODO Windows TP5 - Figure out why this test is so flakey. Disabled for now.
-	testRequires(c, DaemonIsLinux)
-	name := "testlogssincefuturefollow"
-	out, _ := dockerCmd(c, "run", "-d", "--name", name, "busybox", "/bin/sh", "-c", `for i in $(seq 1 5); do echo log$i; sleep 1; done`)
-
-	// Extract one timestamp from the log file to give us a starting point for
-	// our `--since` argument. Because the log producer runs in the background,
-	// we need to check repeatedly for some output to be produced.
-	var timestamp string
-	for i := 0; i != 100 && timestamp == ""; i++ {
-		if out, _ = dockerCmd(c, "logs", "-t", name); out == "" {
-			time.Sleep(time.Millisecond * 100) // Retry
-		} else {
-			timestamp = strings.Split(strings.Split(out, "\n")[0], " ")[0]
-		}
-	}
-
-	c.Assert(timestamp, checker.Not(checker.Equals), "")
-	t, err := time.Parse(time.RFC3339Nano, timestamp)
-	c.Assert(err, check.IsNil)
-
-	since := t.Unix() + 2
-	out, _ = dockerCmd(c, "logs", "-t", "-f", fmt.Sprintf("--since=%v", since), name)
-	c.Assert(out, checker.Not(checker.HasLen), 0, check.Commentf("cannot read from empty log"))
-	lines := strings.Split(strings.TrimSpace(out), "\n")
-	for _, v := range lines {
-		ts, err := time.Parse(time.RFC3339Nano, strings.Split(v, " ")[0])
-		c.Assert(err, checker.IsNil, check.Commentf("cannot parse timestamp output from log: '%v'", v))
-		c.Assert(ts.Unix() >= since, checker.Equals, true, check.Commentf("earlier log found. since=%v logdate=%v", since, ts))
-	}
-}
-
-// Regression test for #8832
-func (s *DockerSuite) TestLogsFollowSlowStdoutConsumer(c *check.C) {
-	// TODO Windows: Fix this test for TP5.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", `usleep 600000;yes X | head -c 200000`)
-
-	id := strings.TrimSpace(out)
-
-	stopSlowRead := make(chan bool)
-
-	go func() {
-		exec.Command(dockerBinary, "wait", id).Run()
-		stopSlowRead <- true
-	}()
-
-	logCmd := exec.Command(dockerBinary, "logs", "-f", id)
-	stdout, err := logCmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-	c.Assert(logCmd.Start(), checker.IsNil)
-
-	// First read slowly
-	bytes1, err := consumeWithSpeed(stdout, 10, 50*time.Millisecond, stopSlowRead)
-	c.Assert(err, checker.IsNil)
-
-	// After the container has finished we can continue reading fast
-	bytes2, err := consumeWithSpeed(stdout, 32*1024, 0, nil)
-	c.Assert(err, checker.IsNil)
-
-	actual := bytes1 + bytes2
-	expected := 200000
-	c.Assert(actual, checker.Equals, expected)
-}
-
-func (s *DockerSuite) TestLogsFollowGoroutinesWithStdout(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "while true; do echo hello; sleep 2; done")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	nroutines, err := getGoroutineNumber()
-	c.Assert(err, checker.IsNil)
-	cmd := exec.Command(dockerBinary, "logs", "-f", id)
-	r, w := io.Pipe()
-	cmd.Stdout = w
-	c.Assert(cmd.Start(), checker.IsNil)
-
-	// Make sure pipe is written to
-	chErr := make(chan error)
-	go func() {
-		b := make([]byte, 1)
-		_, err := r.Read(b)
-		chErr <- err
-	}()
-	c.Assert(<-chErr, checker.IsNil)
-	c.Assert(cmd.Process.Kill(), checker.IsNil)
-
-	// NGoroutines is not updated right away, so we need to wait before failing
-	c.Assert(waitForGoroutines(nroutines), checker.IsNil)
-}
-
-func (s *DockerSuite) TestLogsFollowGoroutinesNoOutput(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "while true; do sleep 2; done")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	nroutines, err := getGoroutineNumber()
-	c.Assert(err, checker.IsNil)
-	cmd := exec.Command(dockerBinary, "logs", "-f", id)
-	c.Assert(cmd.Start(), checker.IsNil)
-	time.Sleep(200 * time.Millisecond)
-	c.Assert(cmd.Process.Kill(), checker.IsNil)
-
-	// NGoroutines is not updated right away, so we need to wait before failing
-	c.Assert(waitForGoroutines(nroutines), checker.IsNil)
-}
-
-func (s *DockerSuite) TestLogsCLIContainerNotFound(c *check.C) {
-	name := "testlogsnocontainer"
-	out, _, _ := dockerCmdWithError("logs", name)
-	message := fmt.Sprintf("Error: No such container: %s\n", name)
-	c.Assert(out, checker.Equals, message)
-}
-
-func (s *DockerSuite) TestLogsWithDetails(c *check.C) {
-	dockerCmd(c, "run", "--name=test", "--label", "foo=bar", "-e", "baz=qux", "--log-opt", "labels=foo", "--log-opt", "env=baz", "busybox", "echo", "hello")
-	out, _ := dockerCmd(c, "logs", "--details", "--timestamps", "test")
-
-	logFields := strings.Fields(strings.TrimSpace(out))
-	c.Assert(len(logFields), checker.Equals, 3, check.Commentf(out))
-
-	details := strings.Split(logFields[1], ",")
-	c.Assert(details, checker.HasLen, 2)
-	c.Assert(details[0], checker.Equals, "baz=qux")
-	c.Assert(details[1], checker.Equals, "foo=bar")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_nat_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_nat_test.go
deleted file mode 100644
index 7f4cc2cbd7..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_nat_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func startServerContainer(c *check.C, msg string, port int) string {
-	name := "server"
-	cmd := []string{
-		"-d",
-		"-p", fmt.Sprintf("%d:%d", port, port),
-		"busybox",
-		"sh", "-c", fmt.Sprintf("echo %q | nc -lp %d", msg, port),
-	}
-	c.Assert(waitForContainer(name, cmd...), check.IsNil)
-	return name
-}
-
-func getExternalAddress(c *check.C) net.IP {
-	iface, err := net.InterfaceByName("eth0")
-	if err != nil {
-		c.Skip(fmt.Sprintf("Test not running with `make test`. Interface eth0 not found: %v", err))
-	}
-
-	ifaceAddrs, err := iface.Addrs()
-	c.Assert(err, check.IsNil)
-	c.Assert(ifaceAddrs, checker.Not(checker.HasLen), 0)
-
-	ifaceIP, _, err := net.ParseCIDR(ifaceAddrs[0].String())
-	c.Assert(err, check.IsNil)
-
-	return ifaceIP
-}
-
-func getContainerLogs(c *check.C, containerID string) string {
-	out, _ := dockerCmd(c, "logs", containerID)
-	return strings.Trim(out, "\r\n")
-}
-
-func getContainerStatus(c *check.C, containerID string) string {
-	out := inspectField(c, containerID, "State.Running")
-	return out
-}
-
-func (s *DockerSuite) TestNetworkNat(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	msg := "it works"
-	startServerContainer(c, msg, 8080)
-	endpoint := getExternalAddress(c)
-	conn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", endpoint.String(), 8080))
-	c.Assert(err, check.IsNil)
-
-	data, err := ioutil.ReadAll(conn)
-	conn.Close()
-	c.Assert(err, check.IsNil)
-
-	final := strings.TrimRight(string(data), "\n")
-	c.Assert(final, checker.Equals, msg)
-}
-
-func (s *DockerSuite) TestNetworkLocalhostTCPNat(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-	var (
-		msg = "hi yall"
-	)
-	startServerContainer(c, msg, 8081)
-	conn, err := net.Dial("tcp", "localhost:8081")
-	c.Assert(err, check.IsNil)
-
-	data, err := ioutil.ReadAll(conn)
-	conn.Close()
-	c.Assert(err, check.IsNil)
-
-	final := strings.TrimRight(string(data), "\n")
-	c.Assert(final, checker.Equals, msg)
-}
-
-func (s *DockerSuite) TestNetworkLoopbackNat(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace)
-	msg := "it works"
-	startServerContainer(c, msg, 8080)
-	endpoint := getExternalAddress(c)
-	out, _ := dockerCmd(c, "run", "-t", "--net=container:server", "busybox",
-		"sh", "-c", fmt.Sprintf("stty raw && nc -w 5 %s 8080", endpoint.String()))
-	final := strings.TrimRight(string(out), "\n")
-	c.Assert(final, checker.Equals, msg)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_netmode_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_netmode_test.go
deleted file mode 100644
index 4dfad937b5..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_netmode_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package main
-
-import (
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/runconfig"
-	"github.com/go-check/check"
-)
-
-// GH14530. Validates combinations of --net= with other options
-
-// stringCheckPS is how the output of PS starts in order to validate that
-// the command executed in a container did really run PS correctly.
-const stringCheckPS = "PID   USER"
-
-// DockerCmdWithFail executes a docker command that is supposed to fail and returns
-// the output, the exit code. If the command returns a Nil error, it will fail and
-// stop the tests.
-func dockerCmdWithFail(c *check.C, args ...string) (string, int) {
-	out, status, err := dockerCmdWithError(args...)
-	c.Assert(err, check.NotNil, check.Commentf("%v", out))
-	return out, status
-}
-
-func (s *DockerSuite) TestNetHostnameWithNetHost(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	out, _ := dockerCmd(c, "run", "--net=host", "busybox", "ps")
-	c.Assert(out, checker.Contains, stringCheckPS)
-}
-
-func (s *DockerSuite) TestNetHostname(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-h=name", "busybox", "ps")
-	c.Assert(out, checker.Contains, stringCheckPS)
-
-	out, _ = dockerCmd(c, "run", "-h=name", "--net=bridge", "busybox", "ps")
-	c.Assert(out, checker.Contains, stringCheckPS)
-
-	out, _ = dockerCmd(c, "run", "-h=name", "--net=none", "busybox", "ps")
-	c.Assert(out, checker.Contains, stringCheckPS)
-
-	out, _ = dockerCmdWithFail(c, "run", "-h=name", "--net=container:other", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHostname.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container", "busybox", "ps")
-	c.Assert(out, checker.Contains, "--net: invalid net mode: invalid container format container:<name|id>")
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=weird", "busybox", "ps")
-	c.Assert(out, checker.Contains, "network weird not found")
-}
-
-func (s *DockerSuite) TestConflictContainerNetworkAndLinks(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmdWithFail(c, "run", "--net=container:other", "--link=zip:zap", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndLinks.Error())
-}
-
-func (s *DockerSuite) TestConflictContainerNetworkHostAndLinks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	out, _ := dockerCmdWithFail(c, "run", "--net=host", "--link=zip:zap", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetworkAndLinks.Error())
-}
-
-func (s *DockerSuite) TestConflictNetworkModeNetHostAndOptions(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	out, _ := dockerCmdWithFail(c, "run", "--net=host", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndMac.Error())
-}
-
-func (s *DockerSuite) TestConflictNetworkModeAndOptions(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmdWithFail(c, "run", "--net=container:other", "--dns=8.8.8.8", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkAndDNS.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--add-host=name:8.8.8.8", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkHosts.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--mac-address=92:d0:c6:0a:29:33", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictContainerNetworkAndMac.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-P", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkPublishPorts.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "-p", "8080", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkPublishPorts.Error())
-
-	out, _ = dockerCmdWithFail(c, "run", "--net=container:other", "--expose", "8000-9000", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNetworkExposePorts.Error())
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_network_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_network_unix_test.go
deleted file mode 100644
index 97f204ab47..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_network_unix_test.go
+++ /dev/null
@@ -1,1791 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/versions/v1p20"
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/libnetwork/driverapi"
-	remoteapi "github.com/docker/libnetwork/drivers/remote/api"
-	"github.com/docker/libnetwork/ipamapi"
-	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
-	"github.com/docker/libnetwork/netlabel"
-	"github.com/go-check/check"
-	"github.com/vishvananda/netlink"
-)
-
-const dummyNetworkDriver = "dummy-network-driver"
-const dummyIPAMDriver = "dummy-ipam-driver"
-
-var remoteDriverNetworkRequest remoteapi.CreateNetworkRequest
-
-func init() {
-	check.Suite(&DockerNetworkSuite{
-		ds: &DockerSuite{},
-	})
-}
-
-type DockerNetworkSuite struct {
-	server *httptest.Server
-	ds     *DockerSuite
-	d      *Daemon
-}
-
-func (s *DockerNetworkSuite) SetUpTest(c *check.C) {
-	s.d = NewDaemon(c)
-}
-
-func (s *DockerNetworkSuite) TearDownTest(c *check.C) {
-	s.d.Stop()
-	s.ds.TearDownTest(c)
-}
-
-func (s *DockerNetworkSuite) SetUpSuite(c *check.C) {
-	mux := http.NewServeMux()
-	s.server = httptest.NewServer(mux)
-	c.Assert(s.server, check.NotNil, check.Commentf("Failed to start an HTTP Server"))
-	setupRemoteNetworkDrivers(c, mux, s.server.URL, dummyNetworkDriver, dummyIPAMDriver)
-}
-
-func setupRemoteNetworkDrivers(c *check.C, mux *http.ServeMux, url, netDrv, ipamDrv string) {
-
-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Implements": ["%s", "%s"]}`, driverapi.NetworkPluginEndpointType, ipamapi.PluginEndpointType)
-	})
-
-	// Network driver implementation
-	mux.HandleFunc(fmt.Sprintf("/%s.GetCapabilities", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Scope":"local"}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.CreateNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&remoteDriverNetworkRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.DeleteNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.CreateEndpoint", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Interface":{"MacAddress":"a0:b1:c2:d3:e4:f5"}}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.Join", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-
-		veth := &netlink.Veth{
-			LinkAttrs: netlink.LinkAttrs{Name: "randomIfName", TxQLen: 0}, PeerName: "cnt0"}
-		if err := netlink.LinkAdd(veth); err != nil {
-			fmt.Fprintf(w, `{"Error":"failed to add veth pair: `+err.Error()+`"}`)
-		} else {
-			fmt.Fprintf(w, `{"InterfaceName":{ "SrcName":"cnt0", "DstPrefix":"veth"}}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.Leave", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.DeleteEndpoint", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		if link, err := netlink.LinkByName("cnt0"); err == nil {
-			netlink.LinkDel(link)
-		}
-		fmt.Fprintf(w, "null")
-	})
-
-	// IPAM Driver implementation
-	var (
-		poolRequest       remoteipam.RequestPoolRequest
-		poolReleaseReq    remoteipam.ReleasePoolRequest
-		addressRequest    remoteipam.RequestAddressRequest
-		addressReleaseReq remoteipam.ReleaseAddressRequest
-		lAS               = "localAS"
-		gAS               = "globalAS"
-		pool              = "172.28.0.0/16"
-		poolID            = lAS + "/" + pool
-		gw                = "172.28.255.254/16"
-	)
-
-	mux.HandleFunc(fmt.Sprintf("/%s.GetDefaultAddressSpaces", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"LocalDefaultAddressSpace":"`+lAS+`", "GlobalDefaultAddressSpace": "`+gAS+`"}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.RequestPool", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&poolRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		if poolRequest.AddressSpace != lAS && poolRequest.AddressSpace != gAS {
-			fmt.Fprintf(w, `{"Error":"Unknown address space in pool request: `+poolRequest.AddressSpace+`"}`)
-		} else if poolRequest.Pool != "" && poolRequest.Pool != pool {
-			fmt.Fprintf(w, `{"Error":"Cannot handle explicit pool requests yet"}`)
-		} else {
-			fmt.Fprintf(w, `{"PoolID":"`+poolID+`", "Pool":"`+pool+`"}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.RequestAddress", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&addressRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now querying on the expected pool id
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else if addressRequest.Address != "" {
-			fmt.Fprintf(w, `{"Error":"Cannot handle explicit address requests yet"}`)
-		} else {
-			fmt.Fprintf(w, `{"Address":"`+gw+`"}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.ReleaseAddress", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&addressReleaseReq)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now asking to release the expected address from the expected poolid
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else if addressReleaseReq.Address != gw {
-			fmt.Fprintf(w, `{"Error":"unknown address"}`)
-		} else {
-			fmt.Fprintf(w, "null")
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.ReleasePool", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&poolReleaseReq)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now asking to release the expected poolid
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else {
-			fmt.Fprintf(w, "null")
-		}
-	})
-
-	err := os.MkdirAll("/etc/docker/plugins", 0755)
-	c.Assert(err, checker.IsNil)
-
-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
-	err = ioutil.WriteFile(fileName, []byte(url), 0644)
-	c.Assert(err, checker.IsNil)
-
-	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
-	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerNetworkSuite) TearDownSuite(c *check.C) {
-	if s.server == nil {
-		return
-	}
-
-	s.server.Close()
-
-	err := os.RemoveAll("/etc/docker/plugins")
-	c.Assert(err, checker.IsNil)
-}
-
-func assertNwIsAvailable(c *check.C, name string) {
-	if !isNwPresent(c, name) {
-		c.Fatalf("Network %s not found in network ls o/p", name)
-	}
-}
-
-func assertNwNotAvailable(c *check.C, name string) {
-	if isNwPresent(c, name) {
-		c.Fatalf("Found network %s in network ls o/p", name)
-	}
-}
-
-func isNwPresent(c *check.C, name string) bool {
-	out, _ := dockerCmd(c, "network", "ls")
-	lines := strings.Split(out, "\n")
-	for i := 1; i < len(lines)-1; i++ {
-		netFields := strings.Fields(lines[i])
-		if netFields[1] == name {
-			return true
-		}
-	}
-	return false
-}
-
-// assertNwList checks network list retrieved with ls command
-// equals to expected network list
-// note: out should be `network ls [option]` result
-func assertNwList(c *check.C, out string, expectNws []string) {
-	lines := strings.Split(out, "\n")
-	var nwList []string
-	for _, line := range lines[1 : len(lines)-1] {
-		netFields := strings.Fields(line)
-		// wrap all network name in nwList
-		nwList = append(nwList, netFields[1])
-	}
-
-	// network ls should contains all expected networks
-	c.Assert(nwList, checker.DeepEquals, expectNws)
-}
-
-func getNwResource(c *check.C, name string) *types.NetworkResource {
-	out, _ := dockerCmd(c, "network", "inspect", name)
-	nr := []types.NetworkResource{}
-	err := json.Unmarshal([]byte(out), &nr)
-	c.Assert(err, check.IsNil)
-	return &nr[0]
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkLsDefault(c *check.C) {
-	defaults := []string{"bridge", "host", "none"}
-	for _, nn := range defaults {
-		assertNwIsAvailable(c, nn)
-	}
-}
-
-func (s *DockerSuite) TestNetworkLsFormat(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "network", "ls", "--format", "{{.Name}}")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-
-	expected := []string{"bridge", "host", "none"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestNetworkLsFormatDefaultFormat(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	config := `{
-		"networksFormat": "{{ .Name }} default"
-}`
-	d, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "--config", d, "network", "ls")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-
-	expected := []string{"bridge default", "host default", "none default"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkCreatePredefined(c *check.C) {
-	predefined := []string{"bridge", "host", "none", "default"}
-	for _, net := range predefined {
-		// predefined networks can't be created again
-		out, _, err := dockerCmdWithError("network", "create", net)
-		c.Assert(err, checker.NotNil, check.Commentf("%v", out))
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkCreateHostBind(c *check.C) {
-	dockerCmd(c, "network", "create", "--subnet=192.168.10.0/24", "--gateway=192.168.10.1", "-o", "com.docker.network.bridge.host_binding_ipv4=192.168.10.1", "testbind")
-	assertNwIsAvailable(c, "testbind")
-
-	out, _ := runSleepingContainer(c, "--net=testbind", "-p", "5000:5000")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-	out, _ = dockerCmd(c, "ps")
-	c.Assert(out, checker.Contains, "192.168.10.1:5000->5000/tcp")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkRmPredefined(c *check.C) {
-	predefined := []string{"bridge", "host", "none", "default"}
-	for _, net := range predefined {
-		// predefined networks can't be removed
-		out, _, err := dockerCmdWithError("network", "rm", net)
-		c.Assert(err, checker.NotNil, check.Commentf("%v", out))
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkLsFilter(c *check.C) {
-	testNet := "testnet1"
-	testLabel := "foo"
-	testValue := "bar"
-	out, _ := dockerCmd(c, "network", "create", "dev")
-	defer func() {
-		dockerCmd(c, "network", "rm", "dev")
-		dockerCmd(c, "network", "rm", testNet)
-	}()
-	networkID := strings.TrimSpace(out)
-
-	// filter with partial ID
-	// only show 'dev' network
-	out, _ = dockerCmd(c, "network", "ls", "-f", "id="+networkID[0:5])
-	assertNwList(c, out, []string{"dev"})
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "name=dge")
-	assertNwList(c, out, []string{"bridge"})
-
-	// only show built-in network (bridge, none, host)
-	out, _ = dockerCmd(c, "network", "ls", "-f", "type=builtin")
-	assertNwList(c, out, []string{"bridge", "host", "none"})
-
-	// only show custom networks (dev)
-	out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom")
-	assertNwList(c, out, []string{"dev"})
-
-	// show all networks with filter
-	// it should be equivalent of ls without option
-	out, _ = dockerCmd(c, "network", "ls", "-f", "type=custom", "-f", "type=builtin")
-	assertNwList(c, out, []string{"bridge", "dev", "host", "none"})
-
-	out, _ = dockerCmd(c, "network", "create", "--label", testLabel+"="+testValue, testNet)
-	assertNwIsAvailable(c, testNet)
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "label="+testLabel)
-	assertNwList(c, out, []string{testNet})
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "label="+testLabel+"="+testValue)
-	assertNwList(c, out, []string{testNet})
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "label=nonexistent")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("%s\n", out))
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "driver=null")
-	assertNwList(c, out, []string{"none"})
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "driver=host")
-	assertNwList(c, out, []string{"host"})
-
-	out, _ = dockerCmd(c, "network", "ls", "-f", "driver=bridge")
-	assertNwList(c, out, []string{"bridge", "dev", testNet})
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkCreateDelete(c *check.C) {
-	dockerCmd(c, "network", "create", "test")
-	assertNwIsAvailable(c, "test")
-
-	dockerCmd(c, "network", "rm", "test")
-	assertNwNotAvailable(c, "test")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkCreateLabel(c *check.C) {
-	testNet := "testnetcreatelabel"
-	testLabel := "foo"
-	testValue := "bar"
-
-	dockerCmd(c, "network", "create", "--label", testLabel+"="+testValue, testNet)
-	assertNwIsAvailable(c, testNet)
-
-	out, _, err := dockerCmdWithError("network", "inspect", "--format={{ .Labels."+testLabel+" }}", testNet)
-	c.Assert(err, check.IsNil)
-	c.Assert(strings.TrimSpace(out), check.Equals, testValue)
-
-	dockerCmd(c, "network", "rm", testNet)
-	assertNwNotAvailable(c, testNet)
-}
-
-func (s *DockerSuite) TestDockerNetworkDeleteNotExists(c *check.C) {
-	out, _, err := dockerCmdWithError("network", "rm", "test")
-	c.Assert(err, checker.NotNil, check.Commentf("%v", out))
-}
-
-func (s *DockerSuite) TestDockerNetworkDeleteMultiple(c *check.C) {
-	dockerCmd(c, "network", "create", "testDelMulti0")
-	assertNwIsAvailable(c, "testDelMulti0")
-	dockerCmd(c, "network", "create", "testDelMulti1")
-	assertNwIsAvailable(c, "testDelMulti1")
-	dockerCmd(c, "network", "create", "testDelMulti2")
-	assertNwIsAvailable(c, "testDelMulti2")
-	out, _ := dockerCmd(c, "run", "-d", "--net", "testDelMulti2", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-	waitRun(containerID)
-
-	// delete three networks at the same time, since testDelMulti2
-	// contains active container, its deletion should fail.
-	out, _, err := dockerCmdWithError("network", "rm", "testDelMulti0", "testDelMulti1", "testDelMulti2")
-	// err should not be nil due to deleting testDelMulti2 failed.
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	// testDelMulti2 should fail due to network has active endpoints
-	c.Assert(out, checker.Contains, "has active endpoints")
-	assertNwNotAvailable(c, "testDelMulti0")
-	assertNwNotAvailable(c, "testDelMulti1")
-	// testDelMulti2 can't be deleted, so it should exist
-	assertNwIsAvailable(c, "testDelMulti2")
-}
-
-func (s *DockerSuite) TestDockerNetworkInspect(c *check.C) {
-	out, _ := dockerCmd(c, "network", "inspect", "host")
-	networkResources := []types.NetworkResource{}
-	err := json.Unmarshal([]byte(out), &networkResources)
-	c.Assert(err, check.IsNil)
-	c.Assert(networkResources, checker.HasLen, 1)
-
-	out, _ = dockerCmd(c, "network", "inspect", "--format={{ .Name }}", "host")
-	c.Assert(strings.TrimSpace(out), check.Equals, "host")
-}
-
-func (s *DockerSuite) TestDockerNetworkInspectWithID(c *check.C) {
-	out, _ := dockerCmd(c, "network", "create", "test2")
-	networkID := strings.TrimSpace(out)
-	assertNwIsAvailable(c, "test2")
-	out, _ = dockerCmd(c, "network", "inspect", "--format={{ .Id }}", "test2")
-	c.Assert(strings.TrimSpace(out), check.Equals, networkID)
-
-	out, _ = dockerCmd(c, "network", "inspect", "--format={{ .ID }}", "test2")
-	c.Assert(strings.TrimSpace(out), check.Equals, networkID)
-}
-
-func (s *DockerSuite) TestDockerInspectMultipleNetwork(c *check.C) {
-	result := dockerCmdWithResult("network", "inspect", "host", "none")
-	c.Assert(result, icmd.Matches, icmd.Success)
-
-	networkResources := []types.NetworkResource{}
-	err := json.Unmarshal([]byte(result.Stdout()), &networkResources)
-	c.Assert(err, check.IsNil)
-	c.Assert(networkResources, checker.HasLen, 2)
-
-	// Should print an error, return an exitCode 1 *but* should print the host network
-	result = dockerCmdWithResult("network", "inspect", "host", "nonexistent")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		ExitCode: 1,
-		Err:      "Error: No such network: nonexistent",
-		Out:      "host",
-	})
-
-	networkResources = []types.NetworkResource{}
-	err = json.Unmarshal([]byte(result.Stdout()), &networkResources)
-	c.Assert(networkResources, checker.HasLen, 1)
-
-	// Should print an error and return an exitCode, nothing else
-	result = dockerCmdWithResult("network", "inspect", "nonexistent")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		ExitCode: 1,
-		Err:      "Error: No such network: nonexistent",
-		Out:      "[]",
-	})
-}
-
-func (s *DockerSuite) TestDockerInspectNetworkWithContainerName(c *check.C) {
-	dockerCmd(c, "network", "create", "brNetForInspect")
-	assertNwIsAvailable(c, "brNetForInspect")
-	defer func() {
-		dockerCmd(c, "network", "rm", "brNetForInspect")
-		assertNwNotAvailable(c, "brNetForInspect")
-	}()
-
-	out, _ := dockerCmd(c, "run", "-d", "--name", "testNetInspect1", "--net", "brNetForInspect", "busybox", "top")
-	c.Assert(waitRun("testNetInspect1"), check.IsNil)
-	containerID := strings.TrimSpace(out)
-	defer func() {
-		// we don't stop container by name, because we'll rename it later
-		dockerCmd(c, "stop", containerID)
-	}()
-
-	out, _ = dockerCmd(c, "network", "inspect", "brNetForInspect")
-	networkResources := []types.NetworkResource{}
-	err := json.Unmarshal([]byte(out), &networkResources)
-	c.Assert(err, check.IsNil)
-	c.Assert(networkResources, checker.HasLen, 1)
-	container, ok := networkResources[0].Containers[containerID]
-	c.Assert(ok, checker.True)
-	c.Assert(container.Name, checker.Equals, "testNetInspect1")
-
-	// rename container and check docker inspect output update
-	newName := "HappyNewName"
-	dockerCmd(c, "rename", "testNetInspect1", newName)
-
-	// check whether network inspect works properly
-	out, _ = dockerCmd(c, "network", "inspect", "brNetForInspect")
-	newNetRes := []types.NetworkResource{}
-	err = json.Unmarshal([]byte(out), &newNetRes)
-	c.Assert(err, check.IsNil)
-	c.Assert(newNetRes, checker.HasLen, 1)
-	container1, ok := newNetRes[0].Containers[containerID]
-	c.Assert(ok, checker.True)
-	c.Assert(container1.Name, checker.Equals, newName)
-
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnect(c *check.C) {
-	dockerCmd(c, "network", "create", "test")
-	assertNwIsAvailable(c, "test")
-	nr := getNwResource(c, "test")
-
-	c.Assert(nr.Name, checker.Equals, "test")
-	c.Assert(len(nr.Containers), checker.Equals, 0)
-
-	// run a container
-	out, _ := dockerCmd(c, "run", "-d", "--name", "test", "busybox", "top")
-	c.Assert(waitRun("test"), check.IsNil)
-	containerID := strings.TrimSpace(out)
-
-	// connect the container to the test network
-	dockerCmd(c, "network", "connect", "test", containerID)
-
-	// inspect the network to make sure container is connected
-	nr = getNetworkResource(c, nr.ID)
-	c.Assert(len(nr.Containers), checker.Equals, 1)
-	c.Assert(nr.Containers[containerID], check.NotNil)
-
-	// check if container IP matches network inspect
-	ip, _, err := net.ParseCIDR(nr.Containers[containerID].IPv4Address)
-	c.Assert(err, check.IsNil)
-	containerIP := findContainerIP(c, "test", "test")
-	c.Assert(ip.String(), checker.Equals, containerIP)
-
-	// disconnect container from the network
-	dockerCmd(c, "network", "disconnect", "test", containerID)
-	nr = getNwResource(c, "test")
-	c.Assert(nr.Name, checker.Equals, "test")
-	c.Assert(len(nr.Containers), checker.Equals, 0)
-
-	// run another container
-	out, _ = dockerCmd(c, "run", "-d", "--net", "test", "--name", "test2", "busybox", "top")
-	c.Assert(waitRun("test2"), check.IsNil)
-	containerID = strings.TrimSpace(out)
-
-	nr = getNwResource(c, "test")
-	c.Assert(nr.Name, checker.Equals, "test")
-	c.Assert(len(nr.Containers), checker.Equals, 1)
-
-	// force disconnect the container to the test network
-	dockerCmd(c, "network", "disconnect", "-f", "test", containerID)
-
-	nr = getNwResource(c, "test")
-	c.Assert(nr.Name, checker.Equals, "test")
-	c.Assert(len(nr.Containers), checker.Equals, 0)
-
-	dockerCmd(c, "network", "rm", "test")
-	assertNwNotAvailable(c, "test")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIPAMMultipleNetworks(c *check.C) {
-	// test0 bridge network
-	dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test1")
-	assertNwIsAvailable(c, "test1")
-
-	// test2 bridge network does not overlap
-	dockerCmd(c, "network", "create", "--subnet=192.169.0.0/16", "test2")
-	assertNwIsAvailable(c, "test2")
-
-	// for networks w/o ipam specified, docker will choose proper non-overlapping subnets
-	dockerCmd(c, "network", "create", "test3")
-	assertNwIsAvailable(c, "test3")
-	dockerCmd(c, "network", "create", "test4")
-	assertNwIsAvailable(c, "test4")
-	dockerCmd(c, "network", "create", "test5")
-	assertNwIsAvailable(c, "test5")
-
-	// test network with multiple subnets
-	// bridge network doesn't support multiple subnets. hence, use a dummy driver that supports
-
-	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "--subnet=192.168.0.0/16", "--subnet=192.170.0.0/16", "test6")
-	assertNwIsAvailable(c, "test6")
-
-	// test network with multiple subnets with valid ipam combinations
-	// also check same subnet across networks when the driver supports it.
-	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver,
-		"--subnet=192.168.0.0/16", "--subnet=192.170.0.0/16",
-		"--gateway=192.168.0.100", "--gateway=192.170.0.100",
-		"--ip-range=192.168.1.0/24",
-		"--aux-address", "a=192.168.1.5", "--aux-address", "b=192.168.1.6",
-		"--aux-address", "c=192.170.1.5", "--aux-address", "d=192.170.1.6",
-		"test7")
-	assertNwIsAvailable(c, "test7")
-
-	// cleanup
-	for i := 1; i < 8; i++ {
-		dockerCmd(c, "network", "rm", fmt.Sprintf("test%d", i))
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkCustomIPAM(c *check.C) {
-	// Create a bridge network using custom ipam driver
-	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "br0")
-	assertNwIsAvailable(c, "br0")
-
-	// Verify expected network ipam fields are there
-	nr := getNetworkResource(c, "br0")
-	c.Assert(nr.Driver, checker.Equals, "bridge")
-	c.Assert(nr.IPAM.Driver, checker.Equals, dummyIPAMDriver)
-
-	// remove network and exercise remote ipam driver
-	dockerCmd(c, "network", "rm", "br0")
-	assertNwNotAvailable(c, "br0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIPAMOptions(c *check.C) {
-	// Create a bridge network using custom ipam driver and options
-	dockerCmd(c, "network", "create", "--ipam-driver", dummyIPAMDriver, "--ipam-opt", "opt1=drv1", "--ipam-opt", "opt2=drv2", "br0")
-	assertNwIsAvailable(c, "br0")
-
-	// Verify expected network ipam options
-	nr := getNetworkResource(c, "br0")
-	opts := nr.IPAM.Options
-	c.Assert(opts["opt1"], checker.Equals, "drv1")
-	c.Assert(opts["opt2"], checker.Equals, "drv2")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkInspectDefault(c *check.C) {
-	nr := getNetworkResource(c, "none")
-	c.Assert(nr.Driver, checker.Equals, "null")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, false)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 0)
-
-	nr = getNetworkResource(c, "host")
-	c.Assert(nr.Driver, checker.Equals, "host")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, false)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 0)
-
-	nr = getNetworkResource(c, "bridge")
-	c.Assert(nr.Driver, checker.Equals, "bridge")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, false)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
-	c.Assert(nr.IPAM.Config[0].Subnet, checker.NotNil)
-	c.Assert(nr.IPAM.Config[0].Gateway, checker.NotNil)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomUnspecified(c *check.C) {
-	// if unspecified, network subnet will be selected from inside preferred pool
-	dockerCmd(c, "network", "create", "test01")
-	assertNwIsAvailable(c, "test01")
-
-	nr := getNetworkResource(c, "test01")
-	c.Assert(nr.Driver, checker.Equals, "bridge")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, false)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 1)
-	c.Assert(nr.IPAM.Config[0].Subnet, checker.NotNil)
-	c.Assert(nr.IPAM.Config[0].Gateway, checker.NotNil)
-
-	dockerCmd(c, "network", "rm", "test01")
-	assertNwNotAvailable(c, "test01")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkInspectCustomSpecified(c *check.C) {
-	dockerCmd(c, "network", "create", "--driver=bridge", "--ipv6", "--subnet=fd80:24e2:f998:72d6::/64", "--subnet=172.28.0.0/16", "--ip-range=172.28.5.0/24", "--gateway=172.28.5.254", "br0")
-	assertNwIsAvailable(c, "br0")
-
-	nr := getNetworkResource(c, "br0")
-	c.Assert(nr.Driver, checker.Equals, "bridge")
-	c.Assert(nr.Scope, checker.Equals, "local")
-	c.Assert(nr.Internal, checker.Equals, false)
-	c.Assert(nr.EnableIPv6, checker.Equals, true)
-	c.Assert(nr.IPAM.Driver, checker.Equals, "default")
-	c.Assert(len(nr.IPAM.Config), checker.Equals, 2)
-	c.Assert(nr.IPAM.Config[0].Subnet, checker.Equals, "172.28.0.0/16")
-	c.Assert(nr.IPAM.Config[0].IPRange, checker.Equals, "172.28.5.0/24")
-	c.Assert(nr.IPAM.Config[0].Gateway, checker.Equals, "172.28.5.254")
-	c.Assert(nr.Internal, checker.False)
-	dockerCmd(c, "network", "rm", "br0")
-	assertNwNotAvailable(c, "test01")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIPAMInvalidCombinations(c *check.C) {
-	// network with ip-range out of subnet range
-	_, _, err := dockerCmdWithError("network", "create", "--subnet=192.168.0.0/16", "--ip-range=192.170.0.0/16", "test")
-	c.Assert(err, check.NotNil)
-
-	// network with multiple gateways for a single subnet
-	_, _, err = dockerCmdWithError("network", "create", "--subnet=192.168.0.0/16", "--gateway=192.168.0.1", "--gateway=192.168.0.2", "test")
-	c.Assert(err, check.NotNil)
-
-	// Multiple overlapping subnets in the same network must fail
-	_, _, err = dockerCmdWithError("network", "create", "--subnet=192.168.0.0/16", "--subnet=192.168.1.0/16", "test")
-	c.Assert(err, check.NotNil)
-
-	// overlapping subnets across networks must fail
-	// create a valid test0 network
-	dockerCmd(c, "network", "create", "--subnet=192.168.0.0/16", "test0")
-	assertNwIsAvailable(c, "test0")
-	// create an overlapping test1 network
-	_, _, err = dockerCmdWithError("network", "create", "--subnet=192.168.128.0/17", "test1")
-	c.Assert(err, check.NotNil)
-	dockerCmd(c, "network", "rm", "test0")
-	assertNwNotAvailable(c, "test0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkDriverOptions(c *check.C) {
-	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, "-o", "opt1=drv1", "-o", "opt2=drv2", "testopt")
-	assertNwIsAvailable(c, "testopt")
-	gopts := remoteDriverNetworkRequest.Options[netlabel.GenericData]
-	c.Assert(gopts, checker.NotNil)
-	opts, ok := gopts.(map[string]interface{})
-	c.Assert(ok, checker.Equals, true)
-	c.Assert(opts["opt1"], checker.Equals, "drv1")
-	c.Assert(opts["opt2"], checker.Equals, "drv2")
-	dockerCmd(c, "network", "rm", "testopt")
-	assertNwNotAvailable(c, "testopt")
-
-}
-
-func (s *DockerNetworkSuite) TestDockerPluginV2NetworkDriver(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-
-	var (
-		npName        = "tiborvass/test-docker-netplugin"
-		npTag         = "latest"
-		npNameWithTag = npName + ":" + npTag
-	)
-	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", npNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, npName)
-	c.Assert(out, checker.Contains, npTag)
-	c.Assert(out, checker.Contains, "true")
-
-	dockerCmd(c, "network", "create", "-d", npNameWithTag, "v2net")
-	assertNwIsAvailable(c, "v2net")
-	dockerCmd(c, "network", "rm", "v2net")
-	assertNwNotAvailable(c, "v2net")
-
-}
-
-func (s *DockerDaemonSuite) TestDockerNetworkNoDiscoveryDefaultBridgeNetwork(c *check.C) {
-	testRequires(c, ExecSupport)
-	// On default bridge network built-in service discovery should not happen
-	hostsFile := "/etc/hosts"
-	bridgeName := "external-bridge"
-	bridgeIP := "192.169.255.254/24"
-	out, err := createInterface(c, "bridge", bridgeName, bridgeIP)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer deleteInterface(c, bridgeName)
-
-	err = s.d.StartWithBusybox("--bridge", bridgeName)
-	c.Assert(err, check.IsNil)
-	defer s.d.Restart()
-
-	// run two containers and store first container's etc/hosts content
-	out, err = s.d.Cmd("run", "-d", "busybox", "top")
-	c.Assert(err, check.IsNil)
-	cid1 := strings.TrimSpace(out)
-	defer s.d.Cmd("stop", cid1)
-
-	hosts, err := s.d.Cmd("exec", cid1, "cat", hostsFile)
-	c.Assert(err, checker.IsNil)
-
-	out, err = s.d.Cmd("run", "-d", "--name", "container2", "busybox", "top")
-	c.Assert(err, check.IsNil)
-	cid2 := strings.TrimSpace(out)
-
-	// verify first container's etc/hosts file has not changed after spawning the second named container
-	hostsPost, err := s.d.Cmd("exec", cid1, "cat", hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts), checker.Equals, string(hostsPost),
-		check.Commentf("Unexpected %s change on second container creation", hostsFile))
-
-	// stop container 2 and verify first container's etc/hosts has not changed
-	_, err = s.d.Cmd("stop", cid2)
-	c.Assert(err, check.IsNil)
-
-	hostsPost, err = s.d.Cmd("exec", cid1, "cat", hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts), checker.Equals, string(hostsPost),
-		check.Commentf("Unexpected %s change on second container creation", hostsFile))
-
-	// but discovery is on when connecting to non default bridge network
-	network := "anotherbridge"
-	out, err = s.d.Cmd("network", "create", network)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	defer s.d.Cmd("network", "rm", network)
-
-	out, err = s.d.Cmd("network", "connect", network, cid1)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	hosts, err = s.d.Cmd("exec", cid1, "cat", hostsFile)
-	c.Assert(err, checker.IsNil)
-
-	hostsPost, err = s.d.Cmd("exec", cid1, "cat", hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts), checker.Equals, string(hostsPost),
-		check.Commentf("Unexpected %s change on second network connection", hostsFile))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkAnonymousEndpoint(c *check.C) {
-	testRequires(c, ExecSupport, NotArm)
-	hostsFile := "/etc/hosts"
-	cstmBridgeNw := "custom-bridge-nw"
-	cstmBridgeNw1 := "custom-bridge-nw1"
-
-	dockerCmd(c, "network", "create", "-d", "bridge", cstmBridgeNw)
-	assertNwIsAvailable(c, cstmBridgeNw)
-
-	// run two anonymous containers and store their etc/hosts content
-	out, _ := dockerCmd(c, "run", "-d", "--net", cstmBridgeNw, "busybox", "top")
-	cid1 := strings.TrimSpace(out)
-
-	hosts1, err := readContainerFileWithExec(cid1, hostsFile)
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "run", "-d", "--net", cstmBridgeNw, "busybox", "top")
-	cid2 := strings.TrimSpace(out)
-
-	hosts2, err := readContainerFileWithExec(cid2, hostsFile)
-	c.Assert(err, checker.IsNil)
-
-	// verify first container etc/hosts file has not changed
-	hosts1post, err := readContainerFileWithExec(cid1, hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts1), checker.Equals, string(hosts1post),
-		check.Commentf("Unexpected %s change on anonymous container creation", hostsFile))
-
-	// Connect the 2nd container to a new network and verify the
-	// first container /etc/hosts file still hasn't changed.
-	dockerCmd(c, "network", "create", "-d", "bridge", cstmBridgeNw1)
-	assertNwIsAvailable(c, cstmBridgeNw1)
-
-	dockerCmd(c, "network", "connect", cstmBridgeNw1, cid2)
-
-	hosts2, err = readContainerFileWithExec(cid2, hostsFile)
-	c.Assert(err, checker.IsNil)
-
-	hosts1post, err = readContainerFileWithExec(cid1, hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts1), checker.Equals, string(hosts1post),
-		check.Commentf("Unexpected %s change on container connect", hostsFile))
-
-	// start a named container
-	cName := "AnyName"
-	out, _ = dockerCmd(c, "run", "-d", "--net", cstmBridgeNw, "--name", cName, "busybox", "top")
-	cid3 := strings.TrimSpace(out)
-
-	// verify that container 1 and 2 can ping the named container
-	dockerCmd(c, "exec", cid1, "ping", "-c", "1", cName)
-	dockerCmd(c, "exec", cid2, "ping", "-c", "1", cName)
-
-	// Stop named container and verify first two containers' etc/hosts file hasn't changed
-	dockerCmd(c, "stop", cid3)
-	hosts1post, err = readContainerFileWithExec(cid1, hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts1), checker.Equals, string(hosts1post),
-		check.Commentf("Unexpected %s change on name container creation", hostsFile))
-
-	hosts2post, err := readContainerFileWithExec(cid2, hostsFile)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(hosts2), checker.Equals, string(hosts2post),
-		check.Commentf("Unexpected %s change on name container creation", hostsFile))
-
-	// verify that container 1 and 2 can't ping the named container now
-	_, _, err = dockerCmdWithError("exec", cid1, "ping", "-c", "1", cName)
-	c.Assert(err, check.NotNil)
-	_, _, err = dockerCmdWithError("exec", cid2, "ping", "-c", "1", cName)
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkLinkOnDefaultNetworkOnly(c *check.C) {
-	// Legacy Link feature must work only on default network, and not across networks
-	cnt1 := "container1"
-	cnt2 := "container2"
-	network := "anotherbridge"
-
-	// Run first container on default network
-	dockerCmd(c, "run", "-d", "--name", cnt1, "busybox", "top")
-
-	// Create another network and run the second container on it
-	dockerCmd(c, "network", "create", network)
-	assertNwIsAvailable(c, network)
-	dockerCmd(c, "run", "-d", "--net", network, "--name", cnt2, "busybox", "top")
-
-	// Try launching a container on default network, linking to the first container. Must succeed
-	dockerCmd(c, "run", "-d", "--link", fmt.Sprintf("%s:%s", cnt1, cnt1), "busybox", "top")
-
-	// Try launching a container on default network, linking to the second container. Must fail
-	_, _, err := dockerCmdWithError("run", "-d", "--link", fmt.Sprintf("%s:%s", cnt2, cnt2), "busybox", "top")
-	c.Assert(err, checker.NotNil)
-
-	// Connect second container to default network. Now a container on default network can link to it
-	dockerCmd(c, "network", "connect", "bridge", cnt2)
-	dockerCmd(c, "run", "-d", "--link", fmt.Sprintf("%s:%s", cnt2, cnt2), "busybox", "top")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkOverlayPortMapping(c *check.C) {
-	// Verify exposed ports are present in ps output when running a container on
-	// a network managed by a driver which does not provide the default gateway
-	// for the container
-	nwn := "ov"
-	ctn := "bb"
-	port1 := 80
-	port2 := 443
-	expose1 := fmt.Sprintf("--expose=%d", port1)
-	expose2 := fmt.Sprintf("--expose=%d", port2)
-
-	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, nwn)
-	assertNwIsAvailable(c, nwn)
-
-	dockerCmd(c, "run", "-d", "--net", nwn, "--name", ctn, expose1, expose2, "busybox", "top")
-
-	// Check docker ps o/p for last created container reports the unpublished ports
-	unpPort1 := fmt.Sprintf("%d/tcp", port1)
-	unpPort2 := fmt.Sprintf("%d/tcp", port2)
-	out, _ := dockerCmd(c, "ps", "-n=1")
-	// Missing unpublished ports in docker ps output
-	c.Assert(out, checker.Contains, unpPort1)
-	// Missing unpublished ports in docker ps output
-	c.Assert(out, checker.Contains, unpPort2)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkDriverUngracefulRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dnd := "dnd"
-	did := "did"
-
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-	setupRemoteNetworkDrivers(c, mux, server.URL, dnd, did)
-
-	s.d.StartWithBusybox()
-	_, err := s.d.Cmd("network", "create", "-d", dnd, "--subnet", "1.1.1.0/24", "net1")
-	c.Assert(err, checker.IsNil)
-
-	_, err = s.d.Cmd("run", "-itd", "--net", "net1", "--name", "foo", "--ip", "1.1.1.10", "busybox", "sh")
-	c.Assert(err, checker.IsNil)
-
-	// Kill daemon and restart
-	if err = s.d.cmd.Process.Kill(); err != nil {
-		c.Fatal(err)
-	}
-
-	server.Close()
-
-	startTime := time.Now().Unix()
-	if err = s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-	lapse := time.Now().Unix() - startTime
-	if lapse > 60 {
-		// In normal scenarios, daemon restart takes ~1 second.
-		// Plugin retry mechanism can delay the daemon start. systemd may not like it.
-		// Avoid accessing plugins during daemon bootup
-		c.Logf("daemon restart took too long : %d seconds", lapse)
-	}
-
-	// Restart the custom dummy plugin
-	mux = http.NewServeMux()
-	server = httptest.NewServer(mux)
-	setupRemoteNetworkDrivers(c, mux, server.URL, dnd, did)
-
-	// trying to reuse the same ip must succeed
-	_, err = s.d.Cmd("run", "-itd", "--net", "net1", "--name", "bar", "--ip", "1.1.1.10", "busybox", "sh")
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMacInspect(c *check.C) {
-	// Verify endpoint MAC address is correctly populated in container's network settings
-	nwn := "ov"
-	ctn := "bb"
-
-	dockerCmd(c, "network", "create", "-d", dummyNetworkDriver, nwn)
-	assertNwIsAvailable(c, nwn)
-
-	dockerCmd(c, "run", "-d", "--net", nwn, "--name", ctn, "busybox", "top")
-
-	mac := inspectField(c, ctn, "NetworkSettings.Networks."+nwn+".MacAddress")
-	c.Assert(mac, checker.Equals, "a0:b1:c2:d3:e4:f5")
-}
-
-func (s *DockerSuite) TestInspectAPIMultipleNetworks(c *check.C) {
-	dockerCmd(c, "network", "create", "mybridge1")
-	dockerCmd(c, "network", "create", "mybridge2")
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	dockerCmd(c, "network", "connect", "mybridge1", id)
-	dockerCmd(c, "network", "connect", "mybridge2", id)
-
-	body := getInspectBody(c, "v1.20", id)
-	var inspect120 v1p20.ContainerJSON
-	err := json.Unmarshal(body, &inspect120)
-	c.Assert(err, checker.IsNil)
-
-	versionedIP := inspect120.NetworkSettings.IPAddress
-
-	body = getInspectBody(c, "v1.21", id)
-	var inspect121 types.ContainerJSON
-	err = json.Unmarshal(body, &inspect121)
-	c.Assert(err, checker.IsNil)
-	c.Assert(inspect121.NetworkSettings.Networks, checker.HasLen, 3)
-
-	bridge := inspect121.NetworkSettings.Networks["bridge"]
-	c.Assert(bridge.IPAddress, checker.Equals, versionedIP)
-	c.Assert(bridge.IPAddress, checker.Equals, inspect121.NetworkSettings.IPAddress)
-}
-
-func connectContainerToNetworks(c *check.C, d *Daemon, cName string, nws []string) {
-	// Run a container on the default network
-	out, err := d.Cmd("run", "-d", "--name", cName, "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// Attach the container to other networks
-	for _, nw := range nws {
-		out, err = d.Cmd("network", "create", nw)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		out, err = d.Cmd("network", "connect", nw, cName)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-	}
-}
-
-func verifyContainerIsConnectedToNetworks(c *check.C, d *Daemon, cName string, nws []string) {
-	// Verify container is connected to all the networks
-	for _, nw := range nws {
-		out, err := d.Cmd("inspect", "-f", fmt.Sprintf("{{.NetworkSettings.Networks.%s}}", nw), cName)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		c.Assert(out, checker.Not(checker.Equals), "<no value>\n")
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksGracefulDaemonRestart(c *check.C) {
-	cName := "bb"
-	nwList := []string{"nw1", "nw2", "nw3"}
-
-	s.d.StartWithBusybox()
-
-	connectContainerToNetworks(c, s.d, cName, nwList)
-	verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
-
-	// Reload daemon
-	s.d.Restart()
-
-	_, err := s.d.Cmd("start", cName)
-	c.Assert(err, checker.IsNil)
-
-	verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMultipleNetworksUngracefulDaemonRestart(c *check.C) {
-	cName := "cc"
-	nwList := []string{"nw1", "nw2", "nw3"}
-
-	s.d.StartWithBusybox()
-
-	connectContainerToNetworks(c, s.d, cName, nwList)
-	verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
-
-	// Kill daemon and restart
-	if err := s.d.cmd.Process.Kill(); err != nil {
-		c.Fatal(err)
-	}
-	s.d.Restart()
-
-	// Restart container
-	_, err := s.d.Cmd("start", cName)
-	c.Assert(err, checker.IsNil)
-
-	verifyContainerIsConnectedToNetworks(c, s.d, cName, nwList)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkRunNetByID(c *check.C) {
-	out, _ := dockerCmd(c, "network", "create", "one")
-	containerOut, _, err := dockerCmdWithError("run", "-d", "--net", strings.TrimSpace(out), "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(containerOut))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkHostModeUngracefulDaemonRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	s.d.StartWithBusybox()
-
-	// Run a few containers on host network
-	for i := 0; i < 10; i++ {
-		cName := fmt.Sprintf("hostc-%d", i)
-		out, err := s.d.Cmd("run", "-d", "--name", cName, "--net=host", "--restart=always", "busybox", "top")
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-
-		// verfiy container has finished starting before killing daemon
-		err = s.d.waitRun(cName)
-		c.Assert(err, checker.IsNil)
-	}
-
-	// Kill daemon ungracefully and restart
-	if err := s.d.cmd.Process.Kill(); err != nil {
-		c.Fatal(err)
-	}
-	if err := s.d.Restart(); err != nil {
-		c.Fatal(err)
-	}
-
-	// make sure all the containers are up and running
-	for i := 0; i < 10; i++ {
-		err := s.d.waitRun(fmt.Sprintf("hostc-%d", i))
-		c.Assert(err, checker.IsNil)
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectToHostFromOtherNetwork(c *check.C) {
-	dockerCmd(c, "run", "-d", "--name", "container1", "busybox", "top")
-	c.Assert(waitRun("container1"), check.IsNil)
-	dockerCmd(c, "network", "disconnect", "bridge", "container1")
-	out, _, err := dockerCmdWithError("network", "connect", "host", "container1")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetwork.Error())
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromHost(c *check.C) {
-	dockerCmd(c, "run", "-d", "--name", "container1", "--net=host", "busybox", "top")
-	c.Assert(waitRun("container1"), check.IsNil)
-	out, _, err := dockerCmdWithError("network", "disconnect", "host", "container1")
-	c.Assert(err, checker.NotNil, check.Commentf("Should err out disconnect from host"))
-	c.Assert(out, checker.Contains, runconfig.ErrConflictHostNetwork.Error())
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectWithPortMapping(c *check.C) {
-	testRequires(c, NotArm)
-	dockerCmd(c, "network", "create", "test1")
-	dockerCmd(c, "run", "-d", "--name", "c1", "-p", "5000:5000", "busybox", "top")
-	c.Assert(waitRun("c1"), check.IsNil)
-	dockerCmd(c, "network", "connect", "test1", "c1")
-}
-
-func verifyPortMap(c *check.C, container, port, originalMapping string, mustBeEqual bool) {
-	chk := checker.Equals
-	if !mustBeEqual {
-		chk = checker.Not(checker.Equals)
-	}
-	currentMapping, _ := dockerCmd(c, "port", container, port)
-	c.Assert(currentMapping, chk, originalMapping)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnectWithPortMapping(c *check.C) {
-	// Connect and disconnect a container with explicit and non-explicit
-	// host port mapping to/from networks which do cause and do not cause
-	// the container default gateway to change, and verify docker port cmd
-	// returns congruent information
-	testRequires(c, NotArm)
-	cnt := "c1"
-	dockerCmd(c, "network", "create", "aaa")
-	dockerCmd(c, "network", "create", "ccc")
-
-	dockerCmd(c, "run", "-d", "--name", cnt, "-p", "9000:90", "-p", "70", "busybox", "top")
-	c.Assert(waitRun(cnt), check.IsNil)
-	curPortMap, _ := dockerCmd(c, "port", cnt, "70")
-	curExplPortMap, _ := dockerCmd(c, "port", cnt, "90")
-
-	// Connect to a network which causes the container's default gw switch
-	dockerCmd(c, "network", "connect", "aaa", cnt)
-	verifyPortMap(c, cnt, "70", curPortMap, false)
-	verifyPortMap(c, cnt, "90", curExplPortMap, true)
-
-	// Read current mapping
-	curPortMap, _ = dockerCmd(c, "port", cnt, "70")
-
-	// Disconnect from a network which causes the container's default gw switch
-	dockerCmd(c, "network", "disconnect", "aaa", cnt)
-	verifyPortMap(c, cnt, "70", curPortMap, false)
-	verifyPortMap(c, cnt, "90", curExplPortMap, true)
-
-	// Read current mapping
-	curPortMap, _ = dockerCmd(c, "port", cnt, "70")
-
-	// Connect to a network which does not cause the container's default gw switch
-	dockerCmd(c, "network", "connect", "ccc", cnt)
-	verifyPortMap(c, cnt, "70", curPortMap, true)
-	verifyPortMap(c, cnt, "90", curExplPortMap, true)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectWithMac(c *check.C) {
-	macAddress := "02:42:ac:11:00:02"
-	dockerCmd(c, "network", "create", "mynetwork")
-	dockerCmd(c, "run", "--name=test", "-d", "--mac-address", macAddress, "busybox", "top")
-	c.Assert(waitRun("test"), check.IsNil)
-	mac1 := inspectField(c, "test", "NetworkSettings.Networks.bridge.MacAddress")
-	c.Assert(strings.TrimSpace(mac1), checker.Equals, macAddress)
-	dockerCmd(c, "network", "connect", "mynetwork", "test")
-	mac2 := inspectField(c, "test", "NetworkSettings.Networks.mynetwork.MacAddress")
-	c.Assert(strings.TrimSpace(mac2), checker.Not(checker.Equals), strings.TrimSpace(mac1))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkInspectCreatedContainer(c *check.C) {
-	dockerCmd(c, "create", "--name", "test", "busybox")
-	networks := inspectField(c, "test", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, "bridge", check.Commentf("Should return 'bridge' network"))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkRestartWithMultipleNetworks(c *check.C) {
-	dockerCmd(c, "network", "create", "test")
-	dockerCmd(c, "run", "--name=foo", "-d", "busybox", "top")
-	c.Assert(waitRun("foo"), checker.IsNil)
-	dockerCmd(c, "network", "connect", "test", "foo")
-	dockerCmd(c, "restart", "foo")
-	networks := inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, "bridge", check.Commentf("Should contain 'bridge' network"))
-	c.Assert(networks, checker.Contains, "test", check.Commentf("Should contain 'test' network"))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectDisconnectToStoppedContainer(c *check.C) {
-	dockerCmd(c, "network", "create", "test")
-	dockerCmd(c, "create", "--name=foo", "busybox", "top")
-	dockerCmd(c, "network", "connect", "test", "foo")
-	networks := inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, "test", check.Commentf("Should contain 'test' network"))
-
-	// Restart docker daemon to test the config has persisted to disk
-	s.d.Restart()
-	networks = inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, "test", check.Commentf("Should contain 'test' network"))
-
-	// start the container and test if we can ping it from another container in the same network
-	dockerCmd(c, "start", "foo")
-	c.Assert(waitRun("foo"), checker.IsNil)
-	ip := inspectField(c, "foo", "NetworkSettings.Networks.test.IPAddress")
-	ip = strings.TrimSpace(ip)
-	dockerCmd(c, "run", "--net=test", "busybox", "sh", "-c", fmt.Sprintf("ping -c 1 %s", ip))
-
-	dockerCmd(c, "stop", "foo")
-
-	// Test disconnect
-	dockerCmd(c, "network", "disconnect", "test", "foo")
-	networks = inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Not(checker.Contains), "test", check.Commentf("Should not contain 'test' network"))
-
-	// Restart docker daemon to test the config has persisted to disk
-	s.d.Restart()
-	networks = inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Not(checker.Contains), "test", check.Commentf("Should not contain 'test' network"))
-
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkDisconnectContainerNonexistingNetwork(c *check.C) {
-	dockerCmd(c, "network", "create", "test")
-	dockerCmd(c, "run", "--net=test", "-d", "--name=foo", "busybox", "top")
-	networks := inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, "test", check.Commentf("Should contain 'test' network"))
-
-	// Stop container and remove network
-	dockerCmd(c, "stop", "foo")
-	dockerCmd(c, "network", "rm", "test")
-
-	// Test disconnecting stopped container from nonexisting network
-	dockerCmd(c, "network", "disconnect", "-f", "test", "foo")
-	networks = inspectField(c, "foo", "NetworkSettings.Networks")
-	c.Assert(networks, checker.Not(checker.Contains), "test", check.Commentf("Should not contain 'test' network"))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIP(c *check.C) {
-	// create two networks
-	dockerCmd(c, "network", "create", "--ipv6", "--subnet=172.28.0.0/16", "--subnet=2001:db8:1234::/64", "n0")
-	assertNwIsAvailable(c, "n0")
-
-	dockerCmd(c, "network", "create", "--ipv6", "--subnet=172.30.0.0/16", "--ip-range=172.30.5.0/24", "--subnet=2001:db8:abcd::/64", "--ip-range=2001:db8:abcd::/80", "n1")
-	assertNwIsAvailable(c, "n1")
-
-	// run a container on first network specifying the ip addresses
-	dockerCmd(c, "run", "-d", "--name", "c0", "--net=n0", "--ip", "172.28.99.88", "--ip6", "2001:db8:1234::9988", "busybox", "top")
-	c.Assert(waitRun("c0"), check.IsNil)
-	verifyIPAddressConfig(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988")
-	verifyIPAddresses(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988")
-
-	// connect the container to the second network specifying an ip addresses
-	dockerCmd(c, "network", "connect", "--ip", "172.30.55.44", "--ip6", "2001:db8:abcd::5544", "n1", "c0")
-	verifyIPAddressConfig(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544")
-	verifyIPAddresses(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544")
-
-	// Stop and restart the container
-	dockerCmd(c, "stop", "c0")
-	dockerCmd(c, "start", "c0")
-
-	// verify requested addresses are applied and configs are still there
-	verifyIPAddressConfig(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988")
-	verifyIPAddresses(c, "c0", "n0", "172.28.99.88", "2001:db8:1234::9988")
-	verifyIPAddressConfig(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544")
-	verifyIPAddresses(c, "c0", "n1", "172.30.55.44", "2001:db8:abcd::5544")
-
-	// Still it should fail to connect to the default network with a specified IP (whatever ip)
-	out, _, err := dockerCmdWithError("network", "connect", "--ip", "172.21.55.44", "bridge", "c0")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndIP.Error())
-
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectPreferredIPStoppedContainer(c *check.C) {
-	// create a container
-	dockerCmd(c, "create", "--name", "c0", "busybox", "top")
-
-	// create a network
-	dockerCmd(c, "network", "create", "--ipv6", "--subnet=172.30.0.0/16", "--subnet=2001:db8:abcd::/64", "n0")
-	assertNwIsAvailable(c, "n0")
-
-	// connect the container to the network specifying an ip addresses
-	dockerCmd(c, "network", "connect", "--ip", "172.30.55.44", "--ip6", "2001:db8:abcd::5544", "n0", "c0")
-	verifyIPAddressConfig(c, "c0", "n0", "172.30.55.44", "2001:db8:abcd::5544")
-
-	// start the container, verify config has not changed and ip addresses are assigned
-	dockerCmd(c, "start", "c0")
-	c.Assert(waitRun("c0"), check.IsNil)
-	verifyIPAddressConfig(c, "c0", "n0", "172.30.55.44", "2001:db8:abcd::5544")
-	verifyIPAddresses(c, "c0", "n0", "172.30.55.44", "2001:db8:abcd::5544")
-
-	// stop the container and check ip config has not changed
-	dockerCmd(c, "stop", "c0")
-	verifyIPAddressConfig(c, "c0", "n0", "172.30.55.44", "2001:db8:abcd::5544")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkUnsupportedRequiredIP(c *check.C) {
-	// requested IP is not supported on predefined networks
-	for _, mode := range []string{"none", "host", "bridge", "default"} {
-		checkUnsupportedNetworkAndIP(c, mode)
-	}
-
-	// requested IP is not supported on networks with no user defined subnets
-	dockerCmd(c, "network", "create", "n0")
-	assertNwIsAvailable(c, "n0")
-
-	out, _, err := dockerCmdWithError("run", "-d", "--ip", "172.28.99.88", "--net", "n0", "busybox", "top")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkNoSubnetAndIP.Error())
-
-	out, _, err = dockerCmdWithError("run", "-d", "--ip6", "2001:db8:1234::9988", "--net", "n0", "busybox", "top")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkNoSubnetAndIP.Error())
-
-	dockerCmd(c, "network", "rm", "n0")
-	assertNwNotAvailable(c, "n0")
-}
-
-func checkUnsupportedNetworkAndIP(c *check.C, nwMode string) {
-	out, _, err := dockerCmdWithError("run", "-d", "--net", nwMode, "--ip", "172.28.99.88", "--ip6", "2001:db8:1234::9988", "busybox", "top")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndIP.Error())
-}
-
-func verifyIPAddressConfig(c *check.C, cName, nwname, ipv4, ipv6 string) {
-	if ipv4 != "" {
-		out := inspectField(c, cName, fmt.Sprintf("NetworkSettings.Networks.%s.IPAMConfig.IPv4Address", nwname))
-		c.Assert(strings.TrimSpace(out), check.Equals, ipv4)
-	}
-
-	if ipv6 != "" {
-		out := inspectField(c, cName, fmt.Sprintf("NetworkSettings.Networks.%s.IPAMConfig.IPv6Address", nwname))
-		c.Assert(strings.TrimSpace(out), check.Equals, ipv6)
-	}
-}
-
-func verifyIPAddresses(c *check.C, cName, nwname, ipv4, ipv6 string) {
-	out := inspectField(c, cName, fmt.Sprintf("NetworkSettings.Networks.%s.IPAddress", nwname))
-	c.Assert(strings.TrimSpace(out), check.Equals, ipv4)
-
-	out = inspectField(c, cName, fmt.Sprintf("NetworkSettings.Networks.%s.GlobalIPv6Address", nwname))
-	c.Assert(strings.TrimSpace(out), check.Equals, ipv6)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectLinkLocalIP(c *check.C) {
-	// create one test network
-	dockerCmd(c, "network", "create", "n0")
-	assertNwIsAvailable(c, "n0")
-
-	// run a container with incorrect link-local address
-	_, _, err := dockerCmdWithError("run", "--link-local-ip", "169.253.5.5", "busybox", "top")
-	c.Assert(err, check.NotNil)
-	_, _, err = dockerCmdWithError("run", "--link-local-ip", "2001:db8::89", "busybox", "top")
-	c.Assert(err, check.NotNil)
-
-	// run two containers with link-local ip on the test network
-	dockerCmd(c, "run", "-d", "--name", "c0", "--net=n0", "--link-local-ip", "169.254.7.7", "--link-local-ip", "fe80::254:77", "busybox", "top")
-	c.Assert(waitRun("c0"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--name", "c1", "--net=n0", "--link-local-ip", "169.254.8.8", "--link-local-ip", "fe80::254:88", "busybox", "top")
-	c.Assert(waitRun("c1"), check.IsNil)
-
-	// run a container on the default network and connect it to the test network specifying a link-local address
-	dockerCmd(c, "run", "-d", "--name", "c2", "busybox", "top")
-	c.Assert(waitRun("c2"), check.IsNil)
-	dockerCmd(c, "network", "connect", "--link-local-ip", "169.254.9.9", "n0", "c2")
-
-	// verify the three containers can ping each other via the link-local addresses
-	_, _, err = dockerCmdWithError("exec", "c0", "ping", "-c", "1", "169.254.8.8")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "c1", "ping", "-c", "1", "169.254.9.9")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "c2", "ping", "-c", "1", "169.254.7.7")
-	c.Assert(err, check.IsNil)
-
-	// Stop and restart the three containers
-	dockerCmd(c, "stop", "c0")
-	dockerCmd(c, "stop", "c1")
-	dockerCmd(c, "stop", "c2")
-	dockerCmd(c, "start", "c0")
-	dockerCmd(c, "start", "c1")
-	dockerCmd(c, "start", "c2")
-
-	// verify the ping again
-	_, _, err = dockerCmdWithError("exec", "c0", "ping", "-c", "1", "169.254.8.8")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "c1", "ping", "-c", "1", "169.254.9.9")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "c2", "ping", "-c", "1", "169.254.7.7")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkConnectDisconnectLink(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "foo1")
-	dockerCmd(c, "network", "create", "-d", "bridge", "foo2")
-
-	dockerCmd(c, "run", "-d", "--net=foo1", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// run a container in a user-defined network with a link for an existing container
-	// and a link for a container that doesn't exist
-	dockerCmd(c, "run", "-d", "--net=foo1", "--name=second", "--link=first:FirstInFoo1",
-		"--link=third:bar", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping to first and its alias FirstInFoo1 must succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "FirstInFoo1")
-	c.Assert(err, check.IsNil)
-
-	// connect first container to foo2 network
-	dockerCmd(c, "network", "connect", "foo2", "first")
-	// connect second container to foo2 network with a different alias for first container
-	dockerCmd(c, "network", "connect", "--link=first:FirstInFoo2", "foo2", "second")
-
-	// ping the new alias in network foo2
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "FirstInFoo2")
-	c.Assert(err, check.IsNil)
-
-	// disconnect first container from foo1 network
-	dockerCmd(c, "network", "disconnect", "foo1", "first")
-
-	// link in foo1 network must fail
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "FirstInFoo1")
-	c.Assert(err, check.NotNil)
-
-	// link in foo2 network must succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "FirstInFoo2")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkDisconnectDefault(c *check.C) {
-	netWorkName1 := "test1"
-	netWorkName2 := "test2"
-	containerName := "foo"
-
-	dockerCmd(c, "network", "create", netWorkName1)
-	dockerCmd(c, "network", "create", netWorkName2)
-	dockerCmd(c, "create", "--name", containerName, "busybox", "top")
-	dockerCmd(c, "network", "connect", netWorkName1, containerName)
-	dockerCmd(c, "network", "connect", netWorkName2, containerName)
-	dockerCmd(c, "network", "disconnect", "bridge", containerName)
-
-	dockerCmd(c, "start", containerName)
-	c.Assert(waitRun(containerName), checker.IsNil)
-	networks := inspectField(c, containerName, "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, netWorkName1, check.Commentf(fmt.Sprintf("Should contain '%s' network", netWorkName1)))
-	c.Assert(networks, checker.Contains, netWorkName2, check.Commentf(fmt.Sprintf("Should contain '%s' network", netWorkName2)))
-	c.Assert(networks, checker.Not(checker.Contains), "bridge", check.Commentf("Should not contain 'bridge' network"))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkConnectWithAliasOnDefaultNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-
-	defaults := []string{"bridge", "host", "none"}
-	out, _ := dockerCmd(c, "run", "-d", "--net=none", "busybox", "top")
-	containerID := strings.TrimSpace(out)
-	for _, net := range defaults {
-		res, _, err := dockerCmdWithError("network", "connect", "--alias", "alias"+net, net, containerID)
-		c.Assert(err, checker.NotNil)
-		c.Assert(res, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
-	}
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkConnectDisconnectAlias(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "net1")
-	dockerCmd(c, "network", "create", "-d", "bridge", "net2")
-
-	cid, _ := dockerCmd(c, "run", "-d", "--net=net1", "--name=first", "--net-alias=foo", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	dockerCmd(c, "run", "-d", "--net=net1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping first container and its alias
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-
-	// ping first container's short-id alias
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid))
-	c.Assert(err, check.IsNil)
-
-	// connect first container to net2 network
-	dockerCmd(c, "network", "connect", "--alias=bar", "net2", "first")
-	// connect second container to foo2 network with a different alias for first container
-	dockerCmd(c, "network", "connect", "net2", "second")
-
-	// ping the new alias in network foo2
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "bar")
-	c.Assert(err, check.IsNil)
-
-	// disconnect first container from net1 network
-	dockerCmd(c, "network", "disconnect", "net1", "first")
-
-	// ping to net1 scoped alias "foo" must fail
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.NotNil)
-
-	// ping to net2 scoped alias "bar" must still succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "bar")
-	c.Assert(err, check.IsNil)
-	// ping to net2 scoped alias short-id must still succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid))
-	c.Assert(err, check.IsNil)
-
-	// verify the alias option is rejected when running on predefined network
-	out, _, err := dockerCmdWithError("run", "--rm", "--name=any", "--net-alias=any", "busybox", "top")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
-
-	// verify the alias option is rejected when connecting to predefined network
-	out, _, err = dockerCmdWithError("network", "connect", "--alias=any", "bridge", "first")
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkConnectivity(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "network", "create", "-d", "bridge", "br.net1")
-
-	dockerCmd(c, "run", "-d", "--net=br.net1", "--name=c1.net1", "busybox", "top")
-	c.Assert(waitRun("c1.net1"), check.IsNil)
-
-	dockerCmd(c, "run", "-d", "--net=br.net1", "--name=c2.net1", "busybox", "top")
-	c.Assert(waitRun("c2.net1"), check.IsNil)
-
-	// ping first container by its unqualified name
-	_, _, err := dockerCmdWithError("exec", "c2.net1", "ping", "-c", "1", "c1.net1")
-	c.Assert(err, check.IsNil)
-
-	// ping first container by its qualified name
-	_, _, err = dockerCmdWithError("exec", "c2.net1", "ping", "-c", "1", "c1.net1.br.net1")
-	c.Assert(err, check.IsNil)
-
-	// ping with first qualified name masked by an additional domain. should fail
-	_, _, err = dockerCmdWithError("exec", "c2.net1", "ping", "-c", "1", "c1.net1.br.net1.google.com")
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerSuite) TestEmbeddedDNSInvalidInput(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "network", "create", "-d", "bridge", "nw1")
-
-	// Sending garbage to embedded DNS shouldn't crash the daemon
-	dockerCmd(c, "run", "-i", "--net=nw1", "--name=c1", "debian:jessie", "bash", "-c", "echo InvalidQuery > /dev/udp/127.0.0.11/53")
-}
-
-func (s *DockerSuite) TestDockerNetworkConnectFailsNoInspectChange(c *check.C) {
-	dockerCmd(c, "run", "-d", "--name=bb", "busybox", "top")
-	c.Assert(waitRun("bb"), check.IsNil)
-
-	ns0 := inspectField(c, "bb", "NetworkSettings.Networks.bridge")
-
-	// A failing redundant network connect should not alter current container's endpoint settings
-	_, _, err := dockerCmdWithError("network", "connect", "bridge", "bb")
-	c.Assert(err, check.NotNil)
-
-	ns1 := inspectField(c, "bb", "NetworkSettings.Networks.bridge")
-	c.Assert(ns1, check.Equals, ns0)
-}
-
-func (s *DockerSuite) TestDockerNetworkInternalMode(c *check.C) {
-	dockerCmd(c, "network", "create", "--driver=bridge", "--internal", "internal")
-	assertNwIsAvailable(c, "internal")
-	nr := getNetworkResource(c, "internal")
-	c.Assert(nr.Internal, checker.True)
-
-	dockerCmd(c, "run", "-d", "--net=internal", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=internal", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-	out, _, err := dockerCmdWithError("exec", "first", "ping", "-W", "4", "-c", "1", "www.google.com")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "ping: bad address")
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-// Test for #21401
-func (s *DockerNetworkSuite) TestDockerNetworkCreateDeleteSpecialCharacters(c *check.C) {
-	dockerCmd(c, "network", "create", "test@#$")
-	assertNwIsAvailable(c, "test@#$")
-	dockerCmd(c, "network", "rm", "test@#$")
-	assertNwNotAvailable(c, "test@#$")
-
-	dockerCmd(c, "network", "create", "kiwl$%^")
-	assertNwIsAvailable(c, "kiwl$%^")
-	dockerCmd(c, "network", "rm", "kiwl$%^")
-	assertNwNotAvailable(c, "kiwl$%^")
-}
-
-func (s *DockerDaemonSuite) TestDaemonRestartRestoreBridgeNetwork(t *check.C) {
-	testRequires(t, DaemonIsLinux)
-	if err := s.d.StartWithBusybox("--live-restore"); err != nil {
-		t.Fatal(err)
-	}
-	defer s.d.Stop()
-	oldCon := "old"
-
-	_, err := s.d.Cmd("run", "-d", "--name", oldCon, "-p", "80:80", "busybox", "top")
-	if err != nil {
-		t.Fatal(err)
-	}
-	oldContainerIP, err := s.d.Cmd("inspect", "-f", "{{ .NetworkSettings.Networks.bridge.IPAddress }}", oldCon)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Kill the daemon
-	if err := s.d.Kill(); err != nil {
-		t.Fatal(err)
-	}
-
-	// restart the daemon
-	if err := s.d.Start("--live-restore"); err != nil {
-		t.Fatal(err)
-	}
-
-	// start a new container, the new container's ip should not be the same with
-	// old running container.
-	newCon := "new"
-	_, err = s.d.Cmd("run", "-d", "--name", newCon, "busybox", "top")
-	if err != nil {
-		t.Fatal(err)
-	}
-	newContainerIP, err := s.d.Cmd("inspect", "-f", "{{ .NetworkSettings.Networks.bridge.IPAddress }}", newCon)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if strings.Compare(strings.TrimSpace(oldContainerIP), strings.TrimSpace(newContainerIP)) == 0 {
-		t.Fatalf("new container ip should not equal to old running container  ip")
-	}
-
-	// start a new container, the new container should ping old running container
-	_, err = s.d.Cmd("run", "-t", "busybox", "ping", "-c", "1", oldContainerIP)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// start a new container, trying to publish port 80:80 should fail
-	out, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")
-	if err == nil || !strings.Contains(out, "Bind for 0.0.0.0:80 failed: port is already allocated") {
-		t.Fatalf("80 port is allocated to old running container, it should failed on allocating to new container")
-	}
-
-	// kill old running container and try to allocate again
-	_, err = s.d.Cmd("kill", oldCon)
-	if err != nil {
-		t.Fatal(err)
-	}
-	id, err := s.d.Cmd("run", "-p", "80:80", "-d", "busybox", "top")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Cleanup because these containers will not be shut down by daemon
-	out, err = s.d.Cmd("stop", newCon)
-	if err != nil {
-		t.Fatalf("err: %v %v", err, string(out))
-	}
-	_, err = s.d.Cmd("stop", strings.TrimSpace(id))
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkFlagAlias(c *check.C) {
-	dockerCmd(c, "network", "create", "user")
-	output, status := dockerCmd(c, "run", "--rm", "--network=user", "--network-alias=foo", "busybox", "true")
-	c.Assert(status, checker.Equals, 0, check.Commentf("unexpected status code %d (%s)", status, output))
-
-	output, status, _ = dockerCmdWithError("run", "--rm", "--net=user", "--network=user", "busybox", "true")
-	c.Assert(status, checker.Equals, 0, check.Commentf("unexpected status code %d (%s)", status, output))
-
-	output, status, _ = dockerCmdWithError("run", "--rm", "--network=user", "--net-alias=foo", "--network-alias=bar", "busybox", "true")
-	c.Assert(status, checker.Equals, 0, check.Commentf("unexpected status code %d (%s)", status, output))
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkValidateIP(c *check.C) {
-	_, _, err := dockerCmdWithError("network", "create", "--ipv6", "--subnet=172.28.0.0/16", "--subnet=2001:db8:1234::/64", "mynet")
-	c.Assert(err, check.IsNil)
-	assertNwIsAvailable(c, "mynet")
-
-	_, _, err = dockerCmdWithError("run", "-d", "--name", "mynet0", "--net=mynet", "--ip", "172.28.99.88", "--ip6", "2001:db8:1234::9988", "busybox", "top")
-	c.Assert(err, check.IsNil)
-	c.Assert(waitRun("mynet0"), check.IsNil)
-	verifyIPAddressConfig(c, "mynet0", "mynet", "172.28.99.88", "2001:db8:1234::9988")
-	verifyIPAddresses(c, "mynet0", "mynet", "172.28.99.88", "2001:db8:1234::9988")
-
-	_, _, err = dockerCmdWithError("run", "--net=mynet", "--ip", "mynet_ip", "--ip6", "2001:db8:1234::9999", "busybox", "top")
-	c.Assert(err.Error(), checker.Contains, "invalid IPv4 address")
-	_, _, err = dockerCmdWithError("run", "--net=mynet", "--ip", "172.28.99.99", "--ip6", "mynet_ip6", "busybox", "top")
-	c.Assert(err.Error(), checker.Contains, "invalid IPv6 address")
-	// This is a case of IPv4 address to `--ip6`
-	_, _, err = dockerCmdWithError("run", "--net=mynet", "--ip6", "172.28.99.99", "busybox", "top")
-	c.Assert(err.Error(), checker.Contains, "invalid IPv6 address")
-	// This is a special case of an IPv4-mapped IPv6 address
-	_, _, err = dockerCmdWithError("run", "--net=mynet", "--ip6", "::ffff:172.28.99.99", "busybox", "top")
-	c.Assert(err.Error(), checker.Contains, "invalid IPv6 address")
-}
-
-// Test case for 26220
-func (s *DockerNetworkSuite) TestDockerNetworkDisconnectFromBridge(c *check.C) {
-	out, _ := dockerCmd(c, "network", "inspect", "--format", "{{.Id}}", "bridge")
-
-	network := strings.TrimSpace(out)
-
-	name := "test"
-	dockerCmd(c, "create", "--name", name, "busybox", "top")
-
-	_, _, err := dockerCmdWithError("network", "disconnect", network, name)
-	c.Assert(err, check.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_oom_killed_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_oom_killed_test.go
deleted file mode 100644
index bcf59f8601..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_oom_killed_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestInspectOomKilledTrue(c *check.C) {
-	testRequires(c, DaemonIsLinux, memoryLimitSupport, swapMemorySupport)
-
-	name := "testoomkilled"
-	_, exitCode, _ := dockerCmdWithError("run", "--name", name, "--memory", "32MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
-
-	c.Assert(exitCode, checker.Equals, 137, check.Commentf("OOM exit should be 137"))
-
-	oomKilled := inspectField(c, name, "State.OOMKilled")
-	c.Assert(oomKilled, checker.Equals, "true")
-}
-
-func (s *DockerSuite) TestInspectOomKilledFalse(c *check.C) {
-	testRequires(c, DaemonIsLinux, memoryLimitSupport, swapMemorySupport)
-
-	name := "testoomkilled"
-	dockerCmd(c, "run", "--name", name, "--memory", "32MB", "busybox", "sh", "-c", "echo hello world")
-
-	oomKilled := inspectField(c, name, "State.OOMKilled")
-	c.Assert(oomKilled, checker.Equals, "false")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pause_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pause_test.go
deleted file mode 100644
index 9217a69968..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pause_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestPause(c *check.C) {
-	testRequires(c, IsPausable)
-	defer unpauseAllContainers()
-
-	name := "testeventpause"
-	runSleepingContainer(c, "-d", "--name", name)
-
-	dockerCmd(c, "pause", name)
-	pausedContainers, err := getSliceOfPausedContainers()
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(pausedContainers), checker.Equals, 1)
-
-	dockerCmd(c, "unpause", name)
-
-	out, _ := dockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	actions := eventActionsByIDAndType(c, events, name, "container")
-
-	c.Assert(actions[len(actions)-2], checker.Equals, "pause")
-	c.Assert(actions[len(actions)-1], checker.Equals, "unpause")
-}
-
-func (s *DockerSuite) TestPauseMultipleContainers(c *check.C) {
-	testRequires(c, IsPausable)
-	defer unpauseAllContainers()
-
-	containers := []string{
-		"testpausewithmorecontainers1",
-		"testpausewithmorecontainers2",
-	}
-	for _, name := range containers {
-		runSleepingContainer(c, "-d", "--name", name)
-	}
-	dockerCmd(c, append([]string{"pause"}, containers...)...)
-	pausedContainers, err := getSliceOfPausedContainers()
-	c.Assert(err, checker.IsNil)
-	c.Assert(len(pausedContainers), checker.Equals, len(containers))
-
-	dockerCmd(c, append([]string{"unpause"}, containers...)...)
-
-	out, _ := dockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c))
-	events := strings.Split(strings.TrimSpace(out), "\n")
-
-	for _, name := range containers {
-		actions := eventActionsByIDAndType(c, events, name, "container")
-
-		c.Assert(actions[len(actions)-2], checker.Equals, "pause")
-		c.Assert(actions[len(actions)-1], checker.Equals, "unpause")
-	}
-}
-
-func (s *DockerSuite) TestPauseFailsOnWindowsServerContainers(c *check.C) {
-	testRequires(c, DaemonIsWindows, NotPausable)
-	runSleepingContainer(c, "-d", "--name=test")
-	out, _, _ := dockerCmdWithError("pause", "test")
-	c.Assert(out, checker.Contains, "cannot pause Windows Server Containers")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_plugins_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_plugins_test.go
deleted file mode 100644
index 380357d303..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_plugins_test.go
+++ /dev/null
@@ -1,393 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os/exec"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-var (
-	pluginProcessName = "sample-volume-plugin"
-	pName             = "tiborvass/sample-volume-plugin"
-	npName            = "tiborvass/test-docker-netplugin"
-	pTag              = "latest"
-	pNameWithTag      = pName + ":" + pTag
-	npNameWithTag     = npName + ":" + pTag
-)
-
-func (s *DockerSuite) TestPluginBasicOps(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pName)
-	c.Assert(out, checker.Contains, pTag)
-	c.Assert(out, checker.Contains, "true")
-
-	id, _, err := dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", pNameWithTag)
-	id = strings.TrimSpace(id)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "is enabled")
-
-	_, _, err = dockerCmdWithError("plugin", "disable", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pNameWithTag)
-
-	_, err = os.Stat(filepath.Join(dockerBasePath, "plugins", id))
-	if !os.IsNotExist(err) {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestPluginForceRemove(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(out, checker.Contains, "is enabled")
-
-	out, _, err = dockerCmdWithError("plugin", "remove", "--force", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pNameWithTag)
-}
-
-func (s *DockerSuite) TestPluginActive(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	_, _, err = dockerCmdWithError("volume", "create", "-d", pNameWithTag, "--name", "testvol1")
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("plugin", "disable", pNameWithTag)
-	c.Assert(out, checker.Contains, "in use")
-
-	_, _, err = dockerCmdWithError("volume", "rm", "testvol1")
-	c.Assert(err, checker.IsNil)
-
-	_, _, err = dockerCmdWithError("plugin", "disable", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pNameWithTag)
-}
-
-func (s *DockerSuite) TestPluginActiveNetwork(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", npNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("network", "create", "-d", npNameWithTag, "test")
-	c.Assert(err, checker.IsNil)
-
-	nID := strings.TrimSpace(out)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", npNameWithTag)
-	c.Assert(out, checker.Contains, "is in use")
-
-	_, _, err = dockerCmdWithError("network", "rm", nID)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", npNameWithTag)
-	c.Assert(out, checker.Contains, "is enabled")
-
-	_, _, err = dockerCmdWithError("plugin", "disable", npNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", npNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, npNameWithTag)
-}
-
-func (s *DockerSuite) TestPluginInstallDisable(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	out, _, err = dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "false")
-
-	out, _, err = dockerCmdWithError("plugin", "enable", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	out, _, err = dockerCmdWithError("plugin", "disable", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-}
-
-func (s *DockerSuite) TestPluginInstallDisableVolumeLs(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", "--disable", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	dockerCmd(c, "volume", "ls")
-}
-
-func (s *DockerSuite) TestPluginSet(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	env, _ := dockerCmd(c, "plugin", "inspect", "-f", "{{.Settings.Env}}", pName)
-	c.Assert(strings.TrimSpace(env), checker.Equals, "[DEBUG=0]")
-
-	dockerCmd(c, "plugin", "set", pName, "DEBUG=1")
-
-	env, _ = dockerCmd(c, "plugin", "inspect", "-f", "{{.Settings.Env}}", pName)
-	c.Assert(strings.TrimSpace(env), checker.Equals, "[DEBUG=1]")
-}
-
-func (s *DockerSuite) TestPluginInstallArgs(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _ := dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--disable", pName, "DEBUG=1")
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	env, _ := dockerCmd(c, "plugin", "inspect", "-f", "{{.Settings.Env}}", pName)
-	c.Assert(strings.TrimSpace(env), checker.Equals, "[DEBUG=1]")
-}
-
-func (s *DockerRegistrySuite) TestPluginInstallImage(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64)
-
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	// tag the image to upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	// push the image to the registry
-	dockerCmd(c, "push", repoName)
-
-	out, _, err := dockerCmdWithError("plugin", "install", repoName)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "target is image")
-}
-
-func (s *DockerSuite) TestPluginEnableDisableNegative(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	out, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, pName)
-
-	out, _, err = dockerCmdWithError("plugin", "enable", pName)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, "already enabled")
-
-	_, _, err = dockerCmdWithError("plugin", "disable", pName)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "disable", pName)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, "already disabled")
-
-	_, _, err = dockerCmdWithError("plugin", "remove", pName)
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerSuite) TestPluginCreate(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-
-	name := "foo/bar-driver"
-	temp, err := ioutil.TempDir("", "foo")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(temp)
-
-	data := `{"description": "foo plugin"}`
-	err = ioutil.WriteFile(filepath.Join(temp, "config.json"), []byte(data), 0644)
-	c.Assert(err, checker.IsNil)
-
-	err = os.MkdirAll(filepath.Join(temp, "rootfs"), 0700)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("plugin", "create", name, temp)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-
-	out, _, err = dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-
-	out, _, err = dockerCmdWithError("plugin", "create", name, temp)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "already exist")
-
-	out, _, err = dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-	// The output will consists of one HEADER line and one line of foo/bar-driver
-	c.Assert(len(strings.Split(strings.TrimSpace(out), "\n")), checker.Equals, 2)
-}
-
-func (s *DockerSuite) TestPluginInspect(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-	_, _, err := dockerCmdWithError("plugin", "install", "--grant-all-permissions", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pName)
-	c.Assert(out, checker.Contains, pTag)
-	c.Assert(out, checker.Contains, "true")
-
-	// Find the ID first
-	out, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-	c.Assert(id, checker.Not(checker.Equals), "")
-
-	// Long form
-	out, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", id)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, id)
-
-	// Short form
-	out, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", id[:5])
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, id)
-
-	// Name with tag form
-	out, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, id)
-
-	// Name without tag form
-	out, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", pName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, id)
-
-	_, _, err = dockerCmdWithError("plugin", "disable", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("plugin", "remove", pNameWithTag)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, pNameWithTag)
-
-	// After remove nothing should be found
-	_, _, err = dockerCmdWithError("plugin", "inspect", "-f", "{{.Id}}", id[:5])
-	c.Assert(err, checker.NotNil)
-}
-
-// Test case for https://github.com/docker/docker/pull/29186#discussion_r91277345
-func (s *DockerSuite) TestPluginInspectOnWindows(c *check.C) {
-	// This test should work on Windows only
-	testRequires(c, DaemonIsWindows)
-
-	out, _, err := dockerCmdWithError("plugin", "inspect", "foobar")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "plugins are not supported on this platform")
-	c.Assert(err.Error(), checker.Contains, "plugins are not supported on this platform")
-}
-
-func (s *DockerTrustSuite) TestPluginTrustedInstall(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-
-	trustedName := s.setupTrustedplugin(c, pNameWithTag, "trusted-plugin-install")
-
-	installCmd := exec.Command(dockerBinary, "plugin", "install", "--grant-all-permissions", trustedName)
-	s.trustedCmd(installCmd)
-	out, _, err := runCommandWithOutput(installCmd)
-
-	c.Assert(strings.TrimSpace(out), checker.Contains, trustedName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, trustedName)
-
-	out, _, err = dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "true")
-
-	out, _, err = dockerCmdWithError("plugin", "disable", trustedName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, trustedName)
-
-	out, _, err = dockerCmdWithError("plugin", "enable", trustedName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, trustedName)
-
-	out, _, err = dockerCmdWithError("plugin", "rm", "-f", trustedName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, trustedName)
-
-	// Try untrusted pull to ensure we pushed the tag to the registry
-	installCmd = exec.Command(dockerBinary, "plugin", "install", "--disable-content-trust=true", "--grant-all-permissions", trustedName)
-	s.trustedCmd(installCmd)
-	out, _, err = runCommandWithOutput(installCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Downloaded", check.Commentf(out))
-
-	out, _, err = dockerCmdWithError("plugin", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "true")
-
-}
-
-func (s *DockerTrustSuite) TestPluginUntrustedInstall(c *check.C) {
-	testRequires(c, DaemonIsLinux, IsAmd64, Network)
-
-	pluginName := fmt.Sprintf("%v/dockercliuntrusted/plugintest:latest", privateRegistryURL)
-	// install locally and push to private registry
-	dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--alias", pluginName, pNameWithTag)
-	dockerCmd(c, "plugin", "push", pluginName)
-	dockerCmd(c, "plugin", "rm", "-f", pluginName)
-
-	// Try trusted install on untrusted plugin
-	installCmd := exec.Command(dockerBinary, "plugin", "install", "--grant-all-permissions", pluginName)
-	s.trustedCmd(installCmd)
-	out, _, err := runCommandWithOutput(installCmd)
-
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Error: remote trust data does not exist", check.Commentf(out))
-}
-
-func (s *DockerSuite) TestPluginUpgrade(c *check.C) {
-	testRequires(c, DaemonIsLinux, Network, SameHostDaemon, IsAmd64)
-	plugin := "cpuguy83/docker-volume-driver-plugin-local:latest"
-	pluginV2 := "cpuguy83/docker-volume-driver-plugin-local:v2"
-
-	dockerCmd(c, "plugin", "install", "--grant-all-permissions", plugin)
-	dockerCmd(c, "volume", "create", "--driver", plugin, "bananas")
-	dockerCmd(c, "run", "--rm", "-v", "bananas:/apple", "busybox", "sh", "-c", "touch /apple/core")
-
-	out, _, err := dockerCmdWithError("plugin", "upgrade", "--grant-all-permissions", plugin, pluginV2)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "disabled before upgrading")
-
-	out, _ = dockerCmd(c, "plugin", "inspect", "--format={{.ID}}", plugin)
-	id := strings.TrimSpace(out)
-
-	// make sure "v2" does not exists
-	_, err = os.Stat(filepath.Join(dockerBasePath, "plugins", id, "rootfs", "v2"))
-	c.Assert(os.IsNotExist(err), checker.True, check.Commentf(out))
-
-	dockerCmd(c, "plugin", "disable", "-f", plugin)
-	dockerCmd(c, "plugin", "upgrade", "--grant-all-permissions", "--skip-remote-check", plugin, pluginV2)
-
-	// make sure "v2" file exists
-	_, err = os.Stat(filepath.Join(dockerBasePath, "plugins", id, "rootfs", "v2"))
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "plugin", "enable", plugin)
-	dockerCmd(c, "volume", "inspect", "bananas")
-	dockerCmd(c, "run", "--rm", "-v", "bananas:/apple", "busybox", "sh", "-c", "ls -lh /apple/core")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_port_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_port_test.go
deleted file mode 100644
index 80b00fe93e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_port_test.go
+++ /dev/null
@@ -1,319 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net"
-	"regexp"
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestPortList(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// one port
-	out, _ := dockerCmd(c, "run", "-d", "-p", "9876:80", "busybox", "top")
-	firstID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", firstID, "80")
-
-	err := assertPortList(c, out, []string{"0.0.0.0:9876"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "port", firstID)
-
-	err = assertPortList(c, out, []string{"80/tcp -> 0.0.0.0:9876"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "rm", "-f", firstID)
-
-	// three port
-	out, _ = dockerCmd(c, "run", "-d",
-		"-p", "9876:80",
-		"-p", "9877:81",
-		"-p", "9878:82",
-		"busybox", "top")
-	ID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", ID, "80")
-
-	err = assertPortList(c, out, []string{"0.0.0.0:9876"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "port", ID)
-
-	err = assertPortList(c, out, []string{
-		"80/tcp -> 0.0.0.0:9876",
-		"81/tcp -> 0.0.0.0:9877",
-		"82/tcp -> 0.0.0.0:9878"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "rm", "-f", ID)
-
-	// more and one port mapped to the same container port
-	out, _ = dockerCmd(c, "run", "-d",
-		"-p", "9876:80",
-		"-p", "9999:80",
-		"-p", "9877:81",
-		"-p", "9878:82",
-		"busybox", "top")
-	ID = strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", ID, "80")
-
-	err = assertPortList(c, out, []string{"0.0.0.0:9876", "0.0.0.0:9999"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "port", ID)
-
-	err = assertPortList(c, out, []string{
-		"80/tcp -> 0.0.0.0:9876",
-		"80/tcp -> 0.0.0.0:9999",
-		"81/tcp -> 0.0.0.0:9877",
-		"82/tcp -> 0.0.0.0:9878"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-	dockerCmd(c, "rm", "-f", ID)
-
-	testRange := func() {
-		// host port ranges used
-		IDs := make([]string, 3)
-		for i := 0; i < 3; i++ {
-			out, _ = dockerCmd(c, "run", "-d",
-				"-p", "9090-9092:80",
-				"busybox", "top")
-			IDs[i] = strings.TrimSpace(out)
-
-			out, _ = dockerCmd(c, "port", IDs[i])
-
-			err = assertPortList(c, out, []string{fmt.Sprintf("80/tcp -> 0.0.0.0:%d", 9090+i)})
-			// Port list is not correct
-			c.Assert(err, checker.IsNil)
-		}
-
-		// test port range exhaustion
-		out, _, err = dockerCmdWithError("run", "-d",
-			"-p", "9090-9092:80",
-			"busybox", "top")
-		// Exhausted port range did not return an error
-		c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-
-		for i := 0; i < 3; i++ {
-			dockerCmd(c, "rm", "-f", IDs[i])
-		}
-	}
-	testRange()
-	// Verify we ran re-use port ranges after they are no longer in use.
-	testRange()
-
-	// test invalid port ranges
-	for _, invalidRange := range []string{"9090-9089:80", "9090-:80", "-9090:80"} {
-		out, _, err = dockerCmdWithError("run", "-d",
-			"-p", invalidRange,
-			"busybox", "top")
-		// Port range should have returned an error
-		c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	}
-
-	// test host range:container range spec.
-	out, _ = dockerCmd(c, "run", "-d",
-		"-p", "9800-9803:80-83",
-		"busybox", "top")
-	ID = strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", ID)
-
-	err = assertPortList(c, out, []string{
-		"80/tcp -> 0.0.0.0:9800",
-		"81/tcp -> 0.0.0.0:9801",
-		"82/tcp -> 0.0.0.0:9802",
-		"83/tcp -> 0.0.0.0:9803"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-	dockerCmd(c, "rm", "-f", ID)
-
-	// test mixing protocols in same port range
-	out, _ = dockerCmd(c, "run", "-d",
-		"-p", "8000-8080:80",
-		"-p", "8000-8080:80/udp",
-		"busybox", "top")
-	ID = strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", ID)
-
-	err = assertPortList(c, out, []string{
-		"80/tcp -> 0.0.0.0:8000",
-		"80/udp -> 0.0.0.0:8000"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-	dockerCmd(c, "rm", "-f", ID)
-}
-
-func assertPortList(c *check.C, out string, expected []string) error {
-	lines := strings.Split(strings.Trim(out, "\n "), "\n")
-	if len(lines) != len(expected) {
-		return fmt.Errorf("different size lists %s, %d, %d", out, len(lines), len(expected))
-	}
-	sort.Strings(lines)
-	sort.Strings(expected)
-
-	for i := 0; i < len(expected); i++ {
-		if lines[i] != expected[i] {
-			return fmt.Errorf("|" + lines[i] + "!=" + expected[i] + "|")
-		}
-	}
-
-	return nil
-}
-
-func stopRemoveContainer(id string, c *check.C) {
-	dockerCmd(c, "rm", "-f", id)
-}
-
-func (s *DockerSuite) TestUnpublishedPortsInPsOutput(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	// Run busybox with command line expose (equivalent to EXPOSE in image's Dockerfile) for the following ports
-	port1 := 80
-	port2 := 443
-	expose1 := fmt.Sprintf("--expose=%d", port1)
-	expose2 := fmt.Sprintf("--expose=%d", port2)
-	dockerCmd(c, "run", "-d", expose1, expose2, "busybox", "sleep", "5")
-
-	// Check docker ps o/p for last created container reports the unpublished ports
-	unpPort1 := fmt.Sprintf("%d/tcp", port1)
-	unpPort2 := fmt.Sprintf("%d/tcp", port2)
-	out, _ := dockerCmd(c, "ps", "-n=1")
-	// Missing unpublished ports in docker ps output
-	c.Assert(out, checker.Contains, unpPort1)
-	// Missing unpublished ports in docker ps output
-	c.Assert(out, checker.Contains, unpPort2)
-
-	// Run the container forcing to publish the exposed ports
-	dockerCmd(c, "run", "-d", "-P", expose1, expose2, "busybox", "sleep", "5")
-
-	// Check docker ps o/p for last created container reports the exposed ports in the port bindings
-	expBndRegx1 := regexp.MustCompile(`0.0.0.0:\d\d\d\d\d->` + unpPort1)
-	expBndRegx2 := regexp.MustCompile(`0.0.0.0:\d\d\d\d\d->` + unpPort2)
-	out, _ = dockerCmd(c, "ps", "-n=1")
-	// Cannot find expected port binding port (0.0.0.0:xxxxx->unpPort1) in docker ps output
-	c.Assert(expBndRegx1.MatchString(out), checker.Equals, true, check.Commentf("out: %s; unpPort1: %s", out, unpPort1))
-	// Cannot find expected port binding port (0.0.0.0:xxxxx->unpPort2) in docker ps output
-	c.Assert(expBndRegx2.MatchString(out), checker.Equals, true, check.Commentf("out: %s; unpPort2: %s", out, unpPort2))
-
-	// Run the container specifying explicit port bindings for the exposed ports
-	offset := 10000
-	pFlag1 := fmt.Sprintf("%d:%d", offset+port1, port1)
-	pFlag2 := fmt.Sprintf("%d:%d", offset+port2, port2)
-	out, _ = dockerCmd(c, "run", "-d", "-p", pFlag1, "-p", pFlag2, expose1, expose2, "busybox", "sleep", "5")
-	id := strings.TrimSpace(out)
-
-	// Check docker ps o/p for last created container reports the specified port mappings
-	expBnd1 := fmt.Sprintf("0.0.0.0:%d->%s", offset+port1, unpPort1)
-	expBnd2 := fmt.Sprintf("0.0.0.0:%d->%s", offset+port2, unpPort2)
-	out, _ = dockerCmd(c, "ps", "-n=1")
-	// Cannot find expected port binding (expBnd1) in docker ps output
-	c.Assert(out, checker.Contains, expBnd1)
-	// Cannot find expected port binding (expBnd2) in docker ps output
-	c.Assert(out, checker.Contains, expBnd2)
-
-	// Remove container now otherwise it will interfere with next test
-	stopRemoveContainer(id, c)
-
-	// Run the container with explicit port bindings and no exposed ports
-	out, _ = dockerCmd(c, "run", "-d", "-p", pFlag1, "-p", pFlag2, "busybox", "sleep", "5")
-	id = strings.TrimSpace(out)
-
-	// Check docker ps o/p for last created container reports the specified port mappings
-	out, _ = dockerCmd(c, "ps", "-n=1")
-	// Cannot find expected port binding (expBnd1) in docker ps output
-	c.Assert(out, checker.Contains, expBnd1)
-	// Cannot find expected port binding (expBnd2) in docker ps output
-	c.Assert(out, checker.Contains, expBnd2)
-	// Remove container now otherwise it will interfere with next test
-	stopRemoveContainer(id, c)
-
-	// Run the container with one unpublished exposed port and one explicit port binding
-	dockerCmd(c, "run", "-d", expose1, "-p", pFlag2, "busybox", "sleep", "5")
-
-	// Check docker ps o/p for last created container reports the specified unpublished port and port mapping
-	out, _ = dockerCmd(c, "ps", "-n=1")
-	// Missing unpublished exposed ports (unpPort1) in docker ps output
-	c.Assert(out, checker.Contains, unpPort1)
-	// Missing port binding (expBnd2) in docker ps output
-	c.Assert(out, checker.Contains, expBnd2)
-}
-
-func (s *DockerSuite) TestPortHostBinding(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "-d", "-p", "9876:80", "busybox",
-		"nc", "-l", "-p", "80")
-	firstID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", firstID, "80")
-
-	err := assertPortList(c, out, []string{"0.0.0.0:9876"})
-	// Port list is not correct
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "run", "--net=host", "busybox",
-		"nc", "localhost", "9876")
-
-	dockerCmd(c, "rm", "-f", firstID)
-
-	out, _, err = dockerCmdWithError("run", "--net=host", "busybox", "nc", "localhost", "9876")
-	// Port is still bound after the Container is removed
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-}
-
-func (s *DockerSuite) TestPortExposeHostBinding(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "-d", "-P", "--expose", "80", "busybox",
-		"nc", "-l", "-p", "80")
-	firstID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "port", firstID, "80")
-
-	_, exposedPort, err := net.SplitHostPort(out)
-	c.Assert(err, checker.IsNil, check.Commentf("out: %s", out))
-
-	dockerCmd(c, "run", "--net=host", "busybox",
-		"nc", "localhost", strings.TrimSpace(exposedPort))
-
-	dockerCmd(c, "rm", "-f", firstID)
-
-	out, _, err = dockerCmdWithError("run", "--net=host", "busybox",
-		"nc", "localhost", strings.TrimSpace(exposedPort))
-	// Port is still bound after the Container is removed
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-}
-
-func (s *DockerSuite) TestPortBindingOnSandbox(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "network", "create", "--internal", "-d", "bridge", "internal-net")
-	nr := getNetworkResource(c, "internal-net")
-	c.Assert(nr.Internal, checker.Equals, true)
-
-	dockerCmd(c, "run", "--net", "internal-net", "-d", "--name", "c1",
-		"-p", "8080:8080", "busybox", "nc", "-l", "-p", "8080")
-	c.Assert(waitRun("c1"), check.IsNil)
-
-	_, _, err := dockerCmdWithError("run", "--net=host", "busybox", "nc", "localhost", "8080")
-	c.Assert(err, check.NotNil,
-		check.Commentf("Port mapping on internal network is expected to fail"))
-
-	// Connect container to another normal bridge network
-	dockerCmd(c, "network", "create", "-d", "bridge", "foo-net")
-	dockerCmd(c, "network", "connect", "foo-net", "c1")
-
-	_, _, err = dockerCmdWithError("run", "--net=host", "busybox", "nc", "localhost", "8080")
-	c.Assert(err, check.IsNil,
-		check.Commentf("Port mapping on the new network is expected to succeed"))
-
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_proxy_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_proxy_test.go
deleted file mode 100644
index 1cf569b806..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_proxy_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-import (
-	"net"
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestCLIProxyDisableProxyUnixSock(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, SameHostDaemon) // test is valid when DOCKER_HOST=unix://..
-
-	cmd := exec.Command(dockerBinary, "info")
-	cmd.Env = appendBaseEnv(false, "HTTP_PROXY=http://127.0.0.1:9999")
-
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil, check.Commentf("%v", out))
-
-}
-
-// Can't use localhost here since go has a special case to not use proxy if connecting to localhost
-// See https://golang.org/pkg/net/http/#ProxyFromEnvironment
-func (s *DockerDaemonSuite) TestCLIProxyProxyTCPSock(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	// get the IP to use to connect since we can't use localhost
-	addrs, err := net.InterfaceAddrs()
-	c.Assert(err, checker.IsNil)
-	var ip string
-	for _, addr := range addrs {
-		sAddr := addr.String()
-		if !strings.Contains(sAddr, "127.0.0.1") {
-			addrArr := strings.Split(sAddr, "/")
-			ip = addrArr[0]
-			break
-		}
-	}
-
-	c.Assert(ip, checker.Not(checker.Equals), "")
-
-	err = s.d.Start("-H", "tcp://"+ip+":2375")
-	c.Assert(err, checker.IsNil)
-	cmd := exec.Command(dockerBinary, "info")
-	cmd.Env = []string{"DOCKER_HOST=tcp://" + ip + ":2375", "HTTP_PROXY=127.0.0.1:9999"}
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.NotNil, check.Commentf("%v", out))
-	// Test with no_proxy
-	cmd.Env = append(cmd.Env, "NO_PROXY="+ip)
-	out, _, err = runCommandWithOutput(exec.Command(dockerBinary, "info"))
-	c.Assert(err, checker.IsNil, check.Commentf("%v", out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_prune_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_prune_unix_test.go
deleted file mode 100644
index dabbc72081..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_prune_unix_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func pruneNetworkAndVerify(c *check.C, d *SwarmDaemon, kept, pruned []string) {
-	_, err := d.Cmd("network", "prune", "--force")
-	c.Assert(err, checker.IsNil)
-	out, err := d.Cmd("network", "ls", "--format", "{{.Name}}")
-	c.Assert(err, checker.IsNil)
-	for _, s := range kept {
-		c.Assert(out, checker.Contains, s)
-	}
-	for _, s := range pruned {
-		c.Assert(out, checker.Not(checker.Contains), s)
-	}
-}
-
-func (s *DockerSwarmSuite) TestPruneNetwork(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	_, err := d.Cmd("network", "create", "n1") // used by container (testprune)
-	c.Assert(err, checker.IsNil)
-	_, err = d.Cmd("network", "create", "n2")
-	c.Assert(err, checker.IsNil)
-	_, err = d.Cmd("network", "create", "n3", "--driver", "overlay") // used by service (testprunesvc)
-	c.Assert(err, checker.IsNil)
-	_, err = d.Cmd("network", "create", "n4", "--driver", "overlay")
-	c.Assert(err, checker.IsNil)
-
-	cName := "testprune"
-	_, err = d.Cmd("run", "-d", "--name", cName, "--net", "n1", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-
-	serviceName := "testprunesvc"
-	replicas := 1
-	out, err := d.Cmd("service", "create", "--name", serviceName,
-		"--replicas", strconv.Itoa(replicas),
-		"--network", "n3",
-		"busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, replicas+1)
-
-	// prune and verify
-	pruneNetworkAndVerify(c, d, []string{"n1", "n3"}, []string{"n2", "n4"})
-
-	// remove containers, then prune and verify again
-	_, err = d.Cmd("rm", "-f", cName)
-	c.Assert(err, checker.IsNil)
-	_, err = d.Cmd("service", "rm", serviceName)
-	c.Assert(err, checker.IsNil)
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 0)
-	pruneNetworkAndVerify(c, d, []string{}, []string{"n1", "n3"})
-}
-
-func (s *DockerDaemonSuite) TestPruneImageDangling(c *check.C) {
-	c.Assert(s.d.StartWithBusybox(), checker.IsNil)
-
-	out, _, err := s.d.buildImageWithOut("test",
-		`FROM busybox
-                 LABEL foo=bar`, true, "-q")
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	out, err = s.d.Cmd("images", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, id)
-
-	out, err = s.d.Cmd("image", "prune", "--force")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id)
-
-	out, err = s.d.Cmd("images", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, id)
-
-	out, err = s.d.Cmd("image", "prune", "--force", "--all")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, id)
-
-	out, err = s.d.Cmd("images", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Contains), id)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_ps_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_ps_test.go
deleted file mode 100644
index 19ede90d5a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_ps_test.go
+++ /dev/null
@@ -1,952 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestPsListContainersBase(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	firstID := strings.TrimSpace(out)
-
-	out, _ = runSleepingContainer(c, "-d")
-	secondID := strings.TrimSpace(out)
-
-	// not long running
-	out, _ = dockerCmd(c, "run", "-d", "busybox", "true")
-	thirdID := strings.TrimSpace(out)
-
-	out, _ = runSleepingContainer(c, "-d")
-	fourthID := strings.TrimSpace(out)
-
-	// make sure the second is running
-	c.Assert(waitRun(secondID), checker.IsNil)
-
-	// make sure third one is not running
-	dockerCmd(c, "wait", thirdID)
-
-	// make sure the forth is running
-	c.Assert(waitRun(fourthID), checker.IsNil)
-
-	// all
-	out, _ = dockerCmd(c, "ps", "-a")
-	c.Assert(assertContainerList(out, []string{fourthID, thirdID, secondID, firstID}), checker.Equals, true, check.Commentf("ALL: Container list is not in the correct order: \n%s", out))
-
-	// running
-	out, _ = dockerCmd(c, "ps")
-	c.Assert(assertContainerList(out, []string{fourthID, secondID, firstID}), checker.Equals, true, check.Commentf("RUNNING: Container list is not in the correct order: \n%s", out))
-
-	// limit
-	out, _ = dockerCmd(c, "ps", "-n=2", "-a")
-	expected := []string{fourthID, thirdID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("LIMIT & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-n=2")
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("LIMIT: Container list is not in the correct order: \n%s", out))
-
-	// filter since
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-a")
-	expected = []string{fourthID, thirdID, secondID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID)
-	expected = []string{fourthID, secondID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "since="+thirdID)
-	expected = []string{fourthID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Container list is not in the correct order: \n%s", out))
-
-	// filter before
-	out, _ = dockerCmd(c, "ps", "-f", "before="+fourthID, "-a")
-	expected = []string{thirdID, secondID, firstID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "before="+fourthID)
-	expected = []string{secondID, firstID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "before="+thirdID)
-	expected = []string{secondID, firstID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter: Container list is not in the correct order: \n%s", out))
-
-	// filter since & before
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-f", "before="+fourthID, "-a")
-	expected = []string{thirdID, secondID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, BEFORE filter & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-f", "before="+fourthID)
-	expected = []string{secondID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, BEFORE filter: Container list is not in the correct order: \n%s", out))
-
-	// filter since & limit
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-n=2", "-a")
-	expected = []string{fourthID, thirdID}
-
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, LIMIT & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-n=2")
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, LIMIT: Container list is not in the correct order: \n%s", out))
-
-	// filter before & limit
-	out, _ = dockerCmd(c, "ps", "-f", "before="+fourthID, "-n=1", "-a")
-	expected = []string{thirdID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter, LIMIT & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "before="+fourthID, "-n=1")
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("BEFORE filter, LIMIT: Container list is not in the correct order: \n%s", out))
-
-	// filter since & filter before & limit
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-f", "before="+fourthID, "-n=1", "-a")
-	expected = []string{thirdID}
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, BEFORE filter, LIMIT & ALL: Container list is not in the correct order: \n%s", out))
-
-	out, _ = dockerCmd(c, "ps", "-f", "since="+firstID, "-f", "before="+fourthID, "-n=1")
-	c.Assert(assertContainerList(out, expected), checker.Equals, true, check.Commentf("SINCE filter, BEFORE filter, LIMIT: Container list is not in the correct order: \n%s", out))
-
-}
-
-func assertContainerList(out string, expected []string) bool {
-	lines := strings.Split(strings.Trim(out, "\n "), "\n")
-
-	if len(lines)-1 != len(expected) {
-		return false
-	}
-
-	containerIDIndex := strings.Index(lines[0], "CONTAINER ID")
-	for i := 0; i < len(expected); i++ {
-		foundID := lines[i+1][containerIDIndex : containerIDIndex+12]
-		if foundID != expected[i][:12] {
-			return false
-		}
-	}
-
-	return true
-}
-
-// FIXME(vdemeester) Move this into a unit test in daemon package
-func (s *DockerSuite) TestPsListContainersInvalidFilterName(c *check.C) {
-	out, _, err := dockerCmdWithError("ps", "-f", "invalidFilter=test")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Invalid filter")
-}
-
-func (s *DockerSuite) TestPsListContainersSize(c *check.C) {
-	// Problematic on Windows as it doesn't report the size correctly @swernli
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "busybox")
-
-	baseOut, _ := dockerCmd(c, "ps", "-s", "-n=1")
-	baseLines := strings.Split(strings.Trim(baseOut, "\n "), "\n")
-	baseSizeIndex := strings.Index(baseLines[0], "SIZE")
-	baseFoundsize := baseLines[1][baseSizeIndex:]
-	baseBytes, err := strconv.Atoi(strings.Split(baseFoundsize, " ")[0])
-	c.Assert(err, checker.IsNil)
-
-	name := "test_size"
-	dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo 1 > test")
-	id, err := getIDByName(name)
-	c.Assert(err, checker.IsNil)
-
-	runCmd := exec.Command(dockerBinary, "ps", "-s", "-n=1")
-	var out string
-
-	wait := make(chan struct{})
-	go func() {
-		out, _, err = runCommandWithOutput(runCmd)
-		close(wait)
-	}()
-	select {
-	case <-wait:
-	case <-time.After(3 * time.Second):
-		c.Fatalf("Calling \"docker ps -s\" timed out!")
-	}
-	c.Assert(err, checker.IsNil)
-	lines := strings.Split(strings.Trim(out, "\n "), "\n")
-	c.Assert(lines, checker.HasLen, 2, check.Commentf("Expected 2 lines for 'ps -s -n=1' output, got %d", len(lines)))
-	sizeIndex := strings.Index(lines[0], "SIZE")
-	idIndex := strings.Index(lines[0], "CONTAINER ID")
-	foundID := lines[1][idIndex : idIndex+12]
-	c.Assert(foundID, checker.Equals, id[:12], check.Commentf("Expected id %s, got %s", id[:12], foundID))
-	expectedSize := fmt.Sprintf("%d B", (2 + baseBytes))
-	foundSize := lines[1][sizeIndex:]
-	c.Assert(foundSize, checker.Contains, expectedSize, check.Commentf("Expected size %q, got %q", expectedSize, foundSize))
-}
-
-func (s *DockerSuite) TestPsListContainersFilterStatus(c *check.C) {
-	// start exited container
-	out, _ := dockerCmd(c, "run", "-d", "busybox")
-	firstID := strings.TrimSpace(out)
-
-	// make sure the exited container is not running
-	dockerCmd(c, "wait", firstID)
-
-	// start running container
-	out, _ = dockerCmd(c, "run", "-itd", "busybox")
-	secondID := strings.TrimSpace(out)
-
-	// filter containers by exited
-	out, _ = dockerCmd(c, "ps", "--no-trunc", "-q", "--filter=status=exited")
-	containerOut := strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, firstID)
-
-	out, _ = dockerCmd(c, "ps", "-a", "--no-trunc", "-q", "--filter=status=running")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, secondID)
-
-	result := dockerCmdWithTimeout(time.Second*60, "ps", "-a", "-q", "--filter=status=rubbish")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		ExitCode: 1,
-		Err:      "Unrecognised filter value for status",
-	})
-
-	// Windows doesn't support pausing of containers
-	if daemonPlatform != "windows" {
-		// pause running container
-		out, _ = dockerCmd(c, "run", "-itd", "busybox")
-		pausedID := strings.TrimSpace(out)
-		dockerCmd(c, "pause", pausedID)
-		// make sure the container is unpaused to let the daemon stop it properly
-		defer func() { dockerCmd(c, "unpause", pausedID) }()
-
-		out, _ = dockerCmd(c, "ps", "--no-trunc", "-q", "--filter=status=paused")
-		containerOut = strings.TrimSpace(out)
-		c.Assert(containerOut, checker.Equals, pausedID)
-	}
-}
-
-func (s *DockerSuite) TestPsListContainersFilterHealth(c *check.C) {
-	// Test legacy no health check
-	out, _ := runSleepingContainer(c, "--name=none_legacy")
-	containerID := strings.TrimSpace(out)
-
-	waitForContainer(containerID)
-
-	out, _ = dockerCmd(c, "ps", "-q", "-l", "--no-trunc", "--filter=health=none")
-	containerOut := strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected id %s, got %s for legacy none filter, output: %q", containerID, containerOut, out))
-
-	// Test no health check specified explicitly
-	out, _ = runSleepingContainer(c, "--name=none", "--no-healthcheck")
-	containerID = strings.TrimSpace(out)
-
-	waitForContainer(containerID)
-
-	out, _ = dockerCmd(c, "ps", "-q", "-l", "--no-trunc", "--filter=health=none")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected id %s, got %s for none filter, output: %q", containerID, containerOut, out))
-
-	// Test failing health check
-	out, _ = runSleepingContainer(c, "--name=failing_container", "--health-cmd=exit 1", "--health-interval=1s")
-	containerID = strings.TrimSpace(out)
-
-	waitForHealthStatus(c, "failing_container", "starting", "unhealthy")
-
-	out, _ = dockerCmd(c, "ps", "-q", "--no-trunc", "--filter=health=unhealthy")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected containerID %s, got %s for unhealthy filter, output: %q", containerID, containerOut, out))
-
-	// Check passing healthcheck
-	out, _ = runSleepingContainer(c, "--name=passing_container", "--health-cmd=exit 0", "--health-interval=1s")
-	containerID = strings.TrimSpace(out)
-
-	waitForHealthStatus(c, "passing_container", "starting", "healthy")
-
-	out, _ = dockerCmd(c, "ps", "-q", "--no-trunc", "--filter=health=healthy")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, containerID, check.Commentf("Expected containerID %s, got %s for healthy filter, output: %q", containerID, containerOut, out))
-}
-
-func (s *DockerSuite) TestPsListContainersFilterID(c *check.C) {
-	// start container
-	out, _ := dockerCmd(c, "run", "-d", "busybox")
-	firstID := strings.TrimSpace(out)
-
-	// start another container
-	runSleepingContainer(c)
-
-	// filter containers by id
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--filter=id="+firstID)
-	containerOut := strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, firstID[:12], check.Commentf("Expected id %s, got %s for exited filter, output: %q", firstID[:12], containerOut, out))
-}
-
-func (s *DockerSuite) TestPsListContainersFilterName(c *check.C) {
-	// start container
-	dockerCmd(c, "run", "--name=a_name_to_match", "busybox")
-	id, err := getIDByName("a_name_to_match")
-	c.Assert(err, check.IsNil)
-
-	// start another container
-	runSleepingContainer(c, "--name=b_name_to_match")
-
-	// filter containers by name
-	out, _ := dockerCmd(c, "ps", "-a", "-q", "--filter=name=a_name_to_match")
-	containerOut := strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, id[:12], check.Commentf("Expected id %s, got %s for exited filter, output: %q", id[:12], containerOut, out))
-}
-
-// Test for the ancestor filter for ps.
-// There is also the same test but with image:tag@digest in docker_cli_by_digest_test.go
-//
-// What the test setups :
-// - Create 2 image based on busybox using the same repository but different tags
-// - Create an image based on the previous image (images_ps_filter_test2)
-// - Run containers for each of those image (busybox, images_ps_filter_test1, images_ps_filter_test2)
-// - Filter them out :P
-func (s *DockerSuite) TestPsListContainersFilterAncestorImage(c *check.C) {
-	// Build images
-	imageName1 := "images_ps_filter_test1"
-	imageID1, err := buildImage(imageName1,
-		`FROM busybox
-		 LABEL match me 1`, true)
-	c.Assert(err, checker.IsNil)
-
-	imageName1Tagged := "images_ps_filter_test1:tag"
-	imageID1Tagged, err := buildImage(imageName1Tagged,
-		`FROM busybox
-		 LABEL match me 1 tagged`, true)
-	c.Assert(err, checker.IsNil)
-
-	imageName2 := "images_ps_filter_test2"
-	imageID2, err := buildImage(imageName2,
-		fmt.Sprintf(`FROM %s
-		 LABEL match me 2`, imageName1), true)
-	c.Assert(err, checker.IsNil)
-
-	// start containers
-	dockerCmd(c, "run", "--name=first", "busybox", "echo", "hello")
-	firstID, err := getIDByName("first")
-	c.Assert(err, check.IsNil)
-
-	// start another container
-	dockerCmd(c, "run", "--name=second", "busybox", "echo", "hello")
-	secondID, err := getIDByName("second")
-	c.Assert(err, check.IsNil)
-
-	// start third container
-	dockerCmd(c, "run", "--name=third", imageName1, "echo", "hello")
-	thirdID, err := getIDByName("third")
-	c.Assert(err, check.IsNil)
-
-	// start fourth container
-	dockerCmd(c, "run", "--name=fourth", imageName1Tagged, "echo", "hello")
-	fourthID, err := getIDByName("fourth")
-	c.Assert(err, check.IsNil)
-
-	// start fifth container
-	dockerCmd(c, "run", "--name=fifth", imageName2, "echo", "hello")
-	fifthID, err := getIDByName("fifth")
-	c.Assert(err, check.IsNil)
-
-	var filterTestSuite = []struct {
-		filterName  string
-		expectedIDs []string
-	}{
-		// non existent stuff
-		{"nonexistent", []string{}},
-		{"nonexistent:tag", []string{}},
-		// image
-		{"busybox", []string{firstID, secondID, thirdID, fourthID, fifthID}},
-		{imageName1, []string{thirdID, fifthID}},
-		{imageName2, []string{fifthID}},
-		// image:tag
-		{fmt.Sprintf("%s:latest", imageName1), []string{thirdID, fifthID}},
-		{imageName1Tagged, []string{fourthID}},
-		// short-id
-		{stringid.TruncateID(imageID1), []string{thirdID, fifthID}},
-		{stringid.TruncateID(imageID2), []string{fifthID}},
-		// full-id
-		{imageID1, []string{thirdID, fifthID}},
-		{imageID1Tagged, []string{fourthID}},
-		{imageID2, []string{fifthID}},
-	}
-
-	var out string
-	for _, filter := range filterTestSuite {
-		out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=ancestor="+filter.filterName)
-		checkPsAncestorFilterOutput(c, out, filter.filterName, filter.expectedIDs)
-	}
-
-	// Multiple ancestor filter
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=ancestor="+imageName2, "--filter=ancestor="+imageName1Tagged)
-	checkPsAncestorFilterOutput(c, out, imageName2+","+imageName1Tagged, []string{fourthID, fifthID})
-}
-
-func checkPsAncestorFilterOutput(c *check.C, out string, filterName string, expectedIDs []string) {
-	actualIDs := []string{}
-	if out != "" {
-		actualIDs = strings.Split(out[:len(out)-1], "\n")
-	}
-	sort.Strings(actualIDs)
-	sort.Strings(expectedIDs)
-
-	c.Assert(actualIDs, checker.HasLen, len(expectedIDs), check.Commentf("Expected filtered container(s) for %s ancestor filter to be %v:%v, got %v:%v", filterName, len(expectedIDs), expectedIDs, len(actualIDs), actualIDs))
-	if len(expectedIDs) > 0 {
-		same := true
-		for i := range expectedIDs {
-			if actualIDs[i] != expectedIDs[i] {
-				c.Logf("%s, %s", actualIDs[i], expectedIDs[i])
-				same = false
-				break
-			}
-		}
-		c.Assert(same, checker.Equals, true, check.Commentf("Expected filtered container(s) for %s ancestor filter to be %v, got %v", filterName, expectedIDs, actualIDs))
-	}
-}
-
-func (s *DockerSuite) TestPsListContainersFilterLabel(c *check.C) {
-	// start container
-	dockerCmd(c, "run", "--name=first", "-l", "match=me", "-l", "second=tag", "busybox")
-	firstID, err := getIDByName("first")
-	c.Assert(err, check.IsNil)
-
-	// start another container
-	dockerCmd(c, "run", "--name=second", "-l", "match=me too", "busybox")
-	secondID, err := getIDByName("second")
-	c.Assert(err, check.IsNil)
-
-	// start third container
-	dockerCmd(c, "run", "--name=third", "-l", "nomatch=me", "busybox")
-	thirdID, err := getIDByName("third")
-	c.Assert(err, check.IsNil)
-
-	// filter containers by exact match
-	out, _ := dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=label=match=me")
-	containerOut := strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, firstID, check.Commentf("Expected id %s, got %s for exited filter, output: %q", firstID, containerOut, out))
-
-	// filter containers by two labels
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=label=match=me", "--filter=label=second=tag")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, firstID, check.Commentf("Expected id %s, got %s for exited filter, output: %q", firstID, containerOut, out))
-
-	// filter containers by two labels, but expect not found because of AND behavior
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=label=match=me", "--filter=label=second=tag-no")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Equals, "", check.Commentf("Expected nothing, got %s for exited filter, output: %q", containerOut, out))
-
-	// filter containers by exact key
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=label=match")
-	containerOut = strings.TrimSpace(out)
-	c.Assert(containerOut, checker.Contains, firstID)
-	c.Assert(containerOut, checker.Contains, secondID)
-	c.Assert(containerOut, checker.Not(checker.Contains), thirdID)
-}
-
-func (s *DockerSuite) TestPsListContainersFilterExited(c *check.C) {
-	runSleepingContainer(c, "--name=sleep")
-
-	dockerCmd(c, "run", "--name", "zero1", "busybox", "true")
-	firstZero, err := getIDByName("zero1")
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "run", "--name", "zero2", "busybox", "true")
-	secondZero, err := getIDByName("zero2")
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("run", "--name", "nonzero1", "busybox", "false")
-	c.Assert(err, checker.NotNil, check.Commentf("Should fail.", out, err))
-
-	firstNonZero, err := getIDByName("nonzero1")
-	c.Assert(err, checker.IsNil)
-
-	out, _, err = dockerCmdWithError("run", "--name", "nonzero2", "busybox", "false")
-	c.Assert(err, checker.NotNil, check.Commentf("Should fail.", out, err))
-	secondNonZero, err := getIDByName("nonzero2")
-	c.Assert(err, checker.IsNil)
-
-	// filter containers by exited=0
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=exited=0")
-	ids := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(ids, checker.HasLen, 2, check.Commentf("Should be 2 zero exited containers got %d: %s", len(ids), out))
-	c.Assert(ids[0], checker.Equals, secondZero, check.Commentf("First in list should be %q, got %q", secondZero, ids[0]))
-	c.Assert(ids[1], checker.Equals, firstZero, check.Commentf("Second in list should be %q, got %q", firstZero, ids[1]))
-
-	out, _ = dockerCmd(c, "ps", "-a", "-q", "--no-trunc", "--filter=exited=1")
-	ids = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(ids, checker.HasLen, 2, check.Commentf("Should be 2 zero exited containers got %d", len(ids)))
-	c.Assert(ids[0], checker.Equals, secondNonZero, check.Commentf("First in list should be %q, got %q", secondNonZero, ids[0]))
-	c.Assert(ids[1], checker.Equals, firstNonZero, check.Commentf("Second in list should be %q, got %q", firstNonZero, ids[1]))
-
-}
-
-func (s *DockerSuite) TestPsRightTagName(c *check.C) {
-	// TODO Investigate further why this fails on Windows to Windows CI
-	testRequires(c, DaemonIsLinux)
-	tag := "asybox:shmatest"
-	dockerCmd(c, "tag", "busybox", tag)
-
-	var id1 string
-	out, _ := runSleepingContainer(c)
-	id1 = strings.TrimSpace(string(out))
-
-	var id2 string
-	out, _ = runSleepingContainerInImage(c, tag)
-	id2 = strings.TrimSpace(string(out))
-
-	var imageID string
-	out = inspectField(c, "busybox", "Id")
-	imageID = strings.TrimSpace(string(out))
-
-	var id3 string
-	out, _ = runSleepingContainerInImage(c, imageID)
-	id3 = strings.TrimSpace(string(out))
-
-	out, _ = dockerCmd(c, "ps", "--no-trunc")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	// skip header
-	lines = lines[1:]
-	c.Assert(lines, checker.HasLen, 3, check.Commentf("There should be 3 running container, got %d", len(lines)))
-	for _, line := range lines {
-		f := strings.Fields(line)
-		switch f[0] {
-		case id1:
-			c.Assert(f[1], checker.Equals, "busybox", check.Commentf("Expected %s tag for id %s, got %s", "busybox", id1, f[1]))
-		case id2:
-			c.Assert(f[1], checker.Equals, tag, check.Commentf("Expected %s tag for id %s, got %s", tag, id2, f[1]))
-		case id3:
-			c.Assert(f[1], checker.Equals, imageID, check.Commentf("Expected %s imageID for id %s, got %s", tag, id3, f[1]))
-		default:
-			c.Fatalf("Unexpected id %s, expected %s and %s and %s", f[0], id1, id2, id3)
-		}
-	}
-}
-
-func (s *DockerSuite) TestPsLinkedWithNoTrunc(c *check.C) {
-	// Problematic on Windows as it doesn't support links as of Jan 2016
-	testRequires(c, DaemonIsLinux)
-	runSleepingContainer(c, "--name=first")
-	runSleepingContainer(c, "--name=second", "--link=first:first")
-
-	out, _ := dockerCmd(c, "ps", "--no-trunc")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	// strip header
-	lines = lines[1:]
-	expected := []string{"second", "first,second/first"}
-	var names []string
-	for _, l := range lines {
-		fields := strings.Fields(l)
-		names = append(names, fields[len(fields)-1])
-	}
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestPsGroupPortRange(c *check.C) {
-	// Problematic on Windows as it doesn't support port ranges as of Jan 2016
-	testRequires(c, DaemonIsLinux)
-	portRange := "3850-3900"
-	dockerCmd(c, "run", "-d", "--name", "porttest", "-p", portRange+":"+portRange, "busybox", "top")
-
-	out, _ := dockerCmd(c, "ps")
-
-	c.Assert(string(out), checker.Contains, portRange, check.Commentf("docker ps output should have had the port range %q: %s", portRange, string(out)))
-
-}
-
-func (s *DockerSuite) TestPsWithSize(c *check.C) {
-	// Problematic on Windows as it doesn't report the size correctly @swernli
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "sizetest", "busybox", "top")
-
-	out, _ := dockerCmd(c, "ps", "--size")
-	c.Assert(out, checker.Contains, "virtual", check.Commentf("docker ps with --size should show virtual size of container"))
-}
-
-func (s *DockerSuite) TestPsListContainersFilterCreated(c *check.C) {
-	// create a container
-	out, _ := dockerCmd(c, "create", "busybox")
-	cID := strings.TrimSpace(out)
-	shortCID := cID[:12]
-
-	// Make sure it DOESN'T show up w/o a '-a' for normal 'ps'
-	out, _ = dockerCmd(c, "ps", "-q")
-	c.Assert(out, checker.Not(checker.Contains), shortCID, check.Commentf("Should have not seen '%s' in ps output:\n%s", shortCID, out))
-
-	// Make sure it DOES show up as 'Created' for 'ps -a'
-	out, _ = dockerCmd(c, "ps", "-a")
-
-	hits := 0
-	for _, line := range strings.Split(out, "\n") {
-		if !strings.Contains(line, shortCID) {
-			continue
-		}
-		hits++
-		c.Assert(line, checker.Contains, "Created", check.Commentf("Missing 'Created' on '%s'", line))
-	}
-
-	c.Assert(hits, checker.Equals, 1, check.Commentf("Should have seen '%s' in ps -a output once:%d\n%s", shortCID, hits, out))
-
-	// filter containers by 'create' - note, no -a needed
-	out, _ = dockerCmd(c, "ps", "-q", "-f", "status=created")
-	containerOut := strings.TrimSpace(out)
-	c.Assert(cID, checker.HasPrefix, containerOut)
-}
-
-func (s *DockerSuite) TestPsFormatMultiNames(c *check.C) {
-	// Problematic on Windows as it doesn't support link as of Jan 2016
-	testRequires(c, DaemonIsLinux)
-	//create 2 containers and link them
-	dockerCmd(c, "run", "--name=child", "-d", "busybox", "top")
-	dockerCmd(c, "run", "--name=parent", "--link=child:linkedone", "-d", "busybox", "top")
-
-	//use the new format capabilities to only list the names and --no-trunc to get all names
-	out, _ := dockerCmd(c, "ps", "--format", "{{.Names}}", "--no-trunc")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	expected := []string{"parent", "child,parent/linkedone"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with non-truncated names: %v, got: %v", expected, names))
-
-	//now list without turning off truncation and make sure we only get the non-link names
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}}")
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	expected = []string{"parent", "child"}
-	var truncNames []string
-	truncNames = append(truncNames, lines...)
-	c.Assert(expected, checker.DeepEquals, truncNames, check.Commentf("Expected array with truncated names: %v, got: %v", expected, truncNames))
-}
-
-// Test for GitHub issue #21772
-func (s *DockerSuite) TestPsNamesMultipleTime(c *check.C) {
-	runSleepingContainer(c, "--name=test1")
-	runSleepingContainer(c, "--name=test2")
-
-	//use the new format capabilities to list the names twice
-	out, _ := dockerCmd(c, "ps", "--format", "{{.Names}} {{.Names}}")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	expected := []string{"test2 test2", "test1 test1"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with names displayed twice: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestPsFormatHeaders(c *check.C) {
-	// make sure no-container "docker ps" still prints the header row
-	out, _ := dockerCmd(c, "ps", "--format", "table {{.ID}}")
-	c.Assert(out, checker.Equals, "CONTAINER ID\n", check.Commentf(`Expected 'CONTAINER ID\n', got %v`, out))
-
-	// verify that "docker ps" with a container still prints the header row also
-	runSleepingContainer(c, "--name=test")
-	out, _ = dockerCmd(c, "ps", "--format", "table {{.Names}}")
-	c.Assert(out, checker.Equals, "NAMES\ntest\n", check.Commentf(`Expected 'NAMES\ntest\n', got %v`, out))
-}
-
-func (s *DockerSuite) TestPsDefaultFormatAndQuiet(c *check.C) {
-	config := `{
-		"psFormat": "default {{ .ID }}"
-}`
-	d, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := runSleepingContainer(c, "--name=test")
-	id := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "--config", d, "ps", "-q")
-	c.Assert(id, checker.HasPrefix, strings.TrimSpace(out), check.Commentf("Expected to print only the container id, got %v\n", out))
-}
-
-// Test for GitHub issue #12595
-func (s *DockerSuite) TestPsImageIDAfterUpdate(c *check.C) {
-	// TODO: Investigate why this fails on Windows to Windows CI further.
-	testRequires(c, DaemonIsLinux)
-	originalImageName := "busybox:TestPsImageIDAfterUpdate-original"
-	updatedImageName := "busybox:TestPsImageIDAfterUpdate-updated"
-
-	runCmd := exec.Command(dockerBinary, "tag", "busybox:latest", originalImageName)
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.IsNil)
-
-	originalImageID, err := getIDByName(originalImageName)
-	c.Assert(err, checker.IsNil)
-
-	runCmd = exec.Command(dockerBinary, append([]string{"run", "-d", originalImageName}, sleepCommandForDaemonPlatform()...)...)
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.IsNil)
-	containerID := strings.TrimSpace(out)
-
-	linesOut, err := exec.Command(dockerBinary, "ps", "--no-trunc").CombinedOutput()
-	c.Assert(err, checker.IsNil)
-
-	lines := strings.Split(strings.TrimSpace(string(linesOut)), "\n")
-	// skip header
-	lines = lines[1:]
-	c.Assert(len(lines), checker.Equals, 1)
-
-	for _, line := range lines {
-		f := strings.Fields(line)
-		c.Assert(f[1], checker.Equals, originalImageName)
-	}
-
-	runCmd = exec.Command(dockerBinary, "commit", containerID, updatedImageName)
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.IsNil)
-
-	runCmd = exec.Command(dockerBinary, "tag", updatedImageName, originalImageName)
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.IsNil)
-
-	linesOut, err = exec.Command(dockerBinary, "ps", "--no-trunc").CombinedOutput()
-	c.Assert(err, checker.IsNil)
-
-	lines = strings.Split(strings.TrimSpace(string(linesOut)), "\n")
-	// skip header
-	lines = lines[1:]
-	c.Assert(len(lines), checker.Equals, 1)
-
-	for _, line := range lines {
-		f := strings.Fields(line)
-		c.Assert(f[1], checker.Equals, originalImageID)
-	}
-
-}
-
-func (s *DockerSuite) TestPsNotShowPortsOfStoppedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name=foo", "-d", "-p", "5000:5000", "busybox", "top")
-	c.Assert(waitRun("foo"), checker.IsNil)
-	out, _ := dockerCmd(c, "ps")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	expected := "0.0.0.0:5000->5000/tcp"
-	fields := strings.Fields(lines[1])
-	c.Assert(fields[len(fields)-2], checker.Equals, expected, check.Commentf("Expected: %v, got: %v", expected, fields[len(fields)-2]))
-
-	dockerCmd(c, "kill", "foo")
-	dockerCmd(c, "wait", "foo")
-	out, _ = dockerCmd(c, "ps", "-l")
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	fields = strings.Fields(lines[1])
-	c.Assert(fields[len(fields)-2], checker.Not(checker.Equals), expected, check.Commentf("Should not got %v", expected))
-}
-
-func (s *DockerSuite) TestPsShowMounts(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	mp := prefix + slash + "test"
-
-	dockerCmd(c, "volume", "create", "ps-volume-test")
-	// volume mount containers
-	runSleepingContainer(c, "--name=volume-test-1", "--volume", "ps-volume-test:"+mp)
-	c.Assert(waitRun("volume-test-1"), checker.IsNil)
-	runSleepingContainer(c, "--name=volume-test-2", "--volume", mp)
-	c.Assert(waitRun("volume-test-2"), checker.IsNil)
-	// bind mount container
-	var bindMountSource string
-	var bindMountDestination string
-	if DaemonIsWindows.Condition() {
-		bindMountSource = "c:\\"
-		bindMountDestination = "c:\\t"
-	} else {
-		bindMountSource = "/tmp"
-		bindMountDestination = "/t"
-	}
-	runSleepingContainer(c, "--name=bind-mount-test", "-v", bindMountSource+":"+bindMountDestination)
-	c.Assert(waitRun("bind-mount-test"), checker.IsNil)
-
-	out, _ := dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}")
-
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-	c.Assert(lines, checker.HasLen, 3)
-
-	fields := strings.Fields(lines[0])
-	c.Assert(fields, checker.HasLen, 2)
-	c.Assert(fields[0], checker.Equals, "bind-mount-test")
-	c.Assert(fields[1], checker.Equals, bindMountSource)
-
-	fields = strings.Fields(lines[1])
-	c.Assert(fields, checker.HasLen, 2)
-
-	annonymounsVolumeID := fields[1]
-
-	fields = strings.Fields(lines[2])
-	c.Assert(fields[1], checker.Equals, "ps-volume-test")
-
-	// filter by volume name
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume=ps-volume-test")
-
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	c.Assert(lines, checker.HasLen, 1)
-
-	fields = strings.Fields(lines[0])
-	c.Assert(fields[1], checker.Equals, "ps-volume-test")
-
-	// empty results filtering by unknown volume
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume=this-volume-should-not-exist")
-	c.Assert(strings.TrimSpace(string(out)), checker.HasLen, 0)
-
-	// filter by mount destination
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume="+mp)
-
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	c.Assert(lines, checker.HasLen, 2)
-
-	fields = strings.Fields(lines[0])
-	c.Assert(fields[1], checker.Equals, annonymounsVolumeID)
-	fields = strings.Fields(lines[1])
-	c.Assert(fields[1], checker.Equals, "ps-volume-test")
-
-	// filter by bind mount source
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume="+bindMountSource)
-
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	c.Assert(lines, checker.HasLen, 1)
-
-	fields = strings.Fields(lines[0])
-	c.Assert(fields, checker.HasLen, 2)
-	c.Assert(fields[0], checker.Equals, "bind-mount-test")
-	c.Assert(fields[1], checker.Equals, bindMountSource)
-
-	// filter by bind mount destination
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume="+bindMountDestination)
-
-	lines = strings.Split(strings.TrimSpace(string(out)), "\n")
-	c.Assert(lines, checker.HasLen, 1)
-
-	fields = strings.Fields(lines[0])
-	c.Assert(fields, checker.HasLen, 2)
-	c.Assert(fields[0], checker.Equals, "bind-mount-test")
-	c.Assert(fields[1], checker.Equals, bindMountSource)
-
-	// empty results filtering by unknown mount point
-	out, _ = dockerCmd(c, "ps", "--format", "{{.Names}} {{.Mounts}}", "--filter", "volume="+prefix+slash+"this-path-was-never-mounted")
-	c.Assert(strings.TrimSpace(string(out)), checker.HasLen, 0)
-}
-
-func (s *DockerSuite) TestPsFormatSize(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	runSleepingContainer(c)
-
-	out, _ := dockerCmd(c, "ps", "--format", "table {{.Size}}")
-	lines := strings.Split(out, "\n")
-	c.Assert(lines[1], checker.Not(checker.Equals), "0 B", check.Commentf("Should not display a size of 0 B"))
-
-	out, _ = dockerCmd(c, "ps", "--size", "--format", "table {{.Size}}")
-	lines = strings.Split(out, "\n")
-	c.Assert(lines[0], checker.Equals, "SIZE", check.Commentf("Should only have one size column"))
-
-	out, _ = dockerCmd(c, "ps", "--size", "--format", "raw")
-	lines = strings.Split(out, "\n")
-	c.Assert(lines[8], checker.HasPrefix, "size:", check.Commentf("Size should be appended on a newline"))
-}
-
-func (s *DockerSuite) TestPsListContainersFilterNetwork(c *check.C) {
-	// TODO default network on Windows is not called "bridge", and creating a
-	// custom network fails on Windows fails with "Error response from daemon: plugin not found")
-	testRequires(c, DaemonIsLinux)
-
-	// create some containers
-	runSleepingContainer(c, "--net=bridge", "--name=onbridgenetwork")
-	runSleepingContainer(c, "--net=none", "--name=onnonenetwork")
-
-	// Filter docker ps on non existing network
-	out, _ := dockerCmd(c, "ps", "--filter", "network=doesnotexist")
-	containerOut := strings.TrimSpace(string(out))
-	lines := strings.Split(containerOut, "\n")
-
-	// skip header
-	lines = lines[1:]
-
-	// ps output should have no containers
-	c.Assert(lines, checker.HasLen, 0)
-
-	// Filter docker ps on network bridge
-	out, _ = dockerCmd(c, "ps", "--filter", "network=bridge")
-	containerOut = strings.TrimSpace(string(out))
-
-	lines = strings.Split(containerOut, "\n")
-
-	// skip header
-	lines = lines[1:]
-
-	// ps output should have only one container
-	c.Assert(lines, checker.HasLen, 1)
-
-	// Making sure onbridgenetwork is on the output
-	c.Assert(containerOut, checker.Contains, "onbridgenetwork", check.Commentf("Missing the container on network\n"))
-
-	// Filter docker ps on networks bridge and none
-	out, _ = dockerCmd(c, "ps", "--filter", "network=bridge", "--filter", "network=none")
-	containerOut = strings.TrimSpace(string(out))
-
-	lines = strings.Split(containerOut, "\n")
-
-	// skip header
-	lines = lines[1:]
-
-	//ps output should have both the containers
-	c.Assert(lines, checker.HasLen, 2)
-
-	// Making sure onbridgenetwork and onnonenetwork is on the output
-	c.Assert(containerOut, checker.Contains, "onnonenetwork", check.Commentf("Missing the container on none network\n"))
-	c.Assert(containerOut, checker.Contains, "onbridgenetwork", check.Commentf("Missing the container on bridge network\n"))
-
-	nwID, _ := dockerCmd(c, "network", "inspect", "--format", "{{.ID}}", "bridge")
-
-	// Filter by network ID
-	out, _ = dockerCmd(c, "ps", "--filter", "network="+nwID)
-	containerOut = strings.TrimSpace(string(out))
-
-	c.Assert(containerOut, checker.Contains, "onbridgenetwork")
-}
-
-func (s *DockerSuite) TestPsByOrder(c *check.C) {
-	name1 := "xyz-abc"
-	out, err := runSleepingContainer(c, "--name", name1)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	container1 := strings.TrimSpace(out)
-
-	name2 := "xyz-123"
-	out, err = runSleepingContainer(c, "--name", name2)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	container2 := strings.TrimSpace(out)
-
-	name3 := "789-abc"
-	out, err = runSleepingContainer(c, "--name", name3)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	name4 := "789-123"
-	out, err = runSleepingContainer(c, "--name", name4)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// Run multiple time should have the same result
-	out, err = dockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz")
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, fmt.Sprintf("%s\n%s", container2, container1))
-
-	// Run multiple time should have the same result
-	out, err = dockerCmd(c, "ps", "--no-trunc", "-q", "-f", "name=xyz")
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, fmt.Sprintf("%s\n%s", container2, container1))
-}
-
-func (s *DockerSuite) TestPsFilterMissingArgErrorCode(c *check.C) {
-	_, errCode, _ := dockerCmdWithError("ps", "--filter")
-	c.Assert(errCode, checker.Equals, 125)
-}
-
-// Test case for 30291
-func (s *DockerSuite) TestPsFormatTemplateWithArg(c *check.C) {
-	runSleepingContainer(c, "-d", "--name", "top", "--label", "some.label=label.foo-bar")
-	out, _ := dockerCmd(c, "ps", "--format", `{{.Names}} {{.Label "some.label"}}`)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "top label.foo-bar")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_local_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_local_test.go
deleted file mode 100644
index cb14c2c702..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_local_test.go
+++ /dev/null
@@ -1,492 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest"
-	"github.com/docker/distribution/manifest/manifestlist"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// testPullImageWithAliases pulls a specific image tag and verifies that any aliases (i.e., other
-// tags for the same image) are not also pulled down.
-//
-// Ref: docker/docker#8141
-func testPullImageWithAliases(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-
-	repos := []string{}
-	for _, tag := range []string{"recent", "fresh"} {
-		repos = append(repos, fmt.Sprintf("%v:%v", repoName, tag))
-	}
-
-	// Tag and push the same image multiple times.
-	for _, repo := range repos {
-		dockerCmd(c, "tag", "busybox", repo)
-		dockerCmd(c, "push", repo)
-	}
-
-	// Clear local images store.
-	args := append([]string{"rmi"}, repos...)
-	dockerCmd(c, args...)
-
-	// Pull a single tag and verify it doesn't bring down all aliases.
-	dockerCmd(c, "pull", repos[0])
-	dockerCmd(c, "inspect", repos[0])
-	for _, repo := range repos[1:] {
-		_, _, err := dockerCmdWithError("inspect", repo)
-		c.Assert(err, checker.NotNil, check.Commentf("Image %v shouldn't have been pulled down", repo))
-	}
-}
-
-func (s *DockerRegistrySuite) TestPullImageWithAliases(c *check.C) {
-	testPullImageWithAliases(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullImageWithAliases(c *check.C) {
-	testPullImageWithAliases(c)
-}
-
-// testConcurrentPullWholeRepo pulls the same repo concurrently.
-func testConcurrentPullWholeRepo(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-
-	repos := []string{}
-	for _, tag := range []string{"recent", "fresh", "todays"} {
-		repo := fmt.Sprintf("%v:%v", repoName, tag)
-		_, err := buildImage(repo, fmt.Sprintf(`
-		    FROM busybox
-		    ENTRYPOINT ["/bin/echo"]
-		    ENV FOO foo
-		    ENV BAR bar
-		    CMD echo %s
-		`, repo), true)
-		c.Assert(err, checker.IsNil)
-		dockerCmd(c, "push", repo)
-		repos = append(repos, repo)
-	}
-
-	// Clear local images store.
-	args := append([]string{"rmi"}, repos...)
-	dockerCmd(c, args...)
-
-	// Run multiple re-pulls concurrently
-	results := make(chan error)
-	numPulls := 3
-
-	for i := 0; i != numPulls; i++ {
-		go func() {
-			_, _, err := runCommandWithOutput(exec.Command(dockerBinary, "pull", "-a", repoName))
-			results <- err
-		}()
-	}
-
-	// These checks are separate from the loop above because the check
-	// package is not goroutine-safe.
-	for i := 0; i != numPulls; i++ {
-		err := <-results
-		c.Assert(err, checker.IsNil, check.Commentf("concurrent pull failed with error: %v", err))
-	}
-
-	// Ensure all tags were pulled successfully
-	for _, repo := range repos {
-		dockerCmd(c, "inspect", repo)
-		out, _ := dockerCmd(c, "run", "--rm", repo)
-		c.Assert(strings.TrimSpace(out), checker.Equals, "/bin/sh -c echo "+repo)
-	}
-}
-
-func (s *DockerRegistrySuite) testConcurrentPullWholeRepo(c *check.C) {
-	testConcurrentPullWholeRepo(c)
-}
-
-func (s *DockerSchema1RegistrySuite) testConcurrentPullWholeRepo(c *check.C) {
-	testConcurrentPullWholeRepo(c)
-}
-
-// testConcurrentFailingPull tries a concurrent pull that doesn't succeed.
-func testConcurrentFailingPull(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-
-	// Run multiple pulls concurrently
-	results := make(chan error)
-	numPulls := 3
-
-	for i := 0; i != numPulls; i++ {
-		go func() {
-			_, _, err := runCommandWithOutput(exec.Command(dockerBinary, "pull", repoName+":asdfasdf"))
-			results <- err
-		}()
-	}
-
-	// These checks are separate from the loop above because the check
-	// package is not goroutine-safe.
-	for i := 0; i != numPulls; i++ {
-		err := <-results
-		c.Assert(err, checker.NotNil, check.Commentf("expected pull to fail"))
-	}
-}
-
-func (s *DockerRegistrySuite) testConcurrentFailingPull(c *check.C) {
-	testConcurrentFailingPull(c)
-}
-
-func (s *DockerSchema1RegistrySuite) testConcurrentFailingPull(c *check.C) {
-	testConcurrentFailingPull(c)
-}
-
-// testConcurrentPullMultipleTags pulls multiple tags from the same repo
-// concurrently.
-func testConcurrentPullMultipleTags(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-
-	repos := []string{}
-	for _, tag := range []string{"recent", "fresh", "todays"} {
-		repo := fmt.Sprintf("%v:%v", repoName, tag)
-		_, err := buildImage(repo, fmt.Sprintf(`
-		    FROM busybox
-		    ENTRYPOINT ["/bin/echo"]
-		    ENV FOO foo
-		    ENV BAR bar
-		    CMD echo %s
-		`, repo), true)
-		c.Assert(err, checker.IsNil)
-		dockerCmd(c, "push", repo)
-		repos = append(repos, repo)
-	}
-
-	// Clear local images store.
-	args := append([]string{"rmi"}, repos...)
-	dockerCmd(c, args...)
-
-	// Re-pull individual tags, in parallel
-	results := make(chan error)
-
-	for _, repo := range repos {
-		go func(repo string) {
-			_, _, err := runCommandWithOutput(exec.Command(dockerBinary, "pull", repo))
-			results <- err
-		}(repo)
-	}
-
-	// These checks are separate from the loop above because the check
-	// package is not goroutine-safe.
-	for range repos {
-		err := <-results
-		c.Assert(err, checker.IsNil, check.Commentf("concurrent pull failed with error: %v", err))
-	}
-
-	// Ensure all tags were pulled successfully
-	for _, repo := range repos {
-		dockerCmd(c, "inspect", repo)
-		out, _ := dockerCmd(c, "run", "--rm", repo)
-		c.Assert(strings.TrimSpace(out), checker.Equals, "/bin/sh -c echo "+repo)
-	}
-}
-
-func (s *DockerRegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {
-	testConcurrentPullMultipleTags(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestConcurrentPullMultipleTags(c *check.C) {
-	testConcurrentPullMultipleTags(c)
-}
-
-// testPullIDStability verifies that pushing an image and pulling it back
-// preserves the image ID.
-func testPullIDStability(c *check.C) {
-	derivedImage := privateRegistryURL + "/dockercli/id-stability"
-	baseImage := "busybox"
-
-	_, err := buildImage(derivedImage, fmt.Sprintf(`
-	    FROM %s
-	    ENV derived true
-	    ENV asdf true
-	    RUN dd if=/dev/zero of=/file bs=1024 count=1024
-	    CMD echo %s
-	`, baseImage, derivedImage), true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	originalID, err := getIDByName(derivedImage)
-	if err != nil {
-		c.Fatalf("error inspecting: %v", err)
-	}
-	dockerCmd(c, "push", derivedImage)
-
-	// Pull
-	out, _ := dockerCmd(c, "pull", derivedImage)
-	if strings.Contains(out, "Pull complete") {
-		c.Fatalf("repull redownloaded a layer: %s", out)
-	}
-
-	derivedIDAfterPull, err := getIDByName(derivedImage)
-	if err != nil {
-		c.Fatalf("error inspecting: %v", err)
-	}
-
-	if derivedIDAfterPull != originalID {
-		c.Fatal("image's ID unexpectedly changed after a repush/repull")
-	}
-
-	// Make sure the image runs correctly
-	out, _ = dockerCmd(c, "run", "--rm", derivedImage)
-	if strings.TrimSpace(out) != derivedImage {
-		c.Fatalf("expected %s; got %s", derivedImage, out)
-	}
-
-	// Confirm that repushing and repulling does not change the computed ID
-	dockerCmd(c, "push", derivedImage)
-	dockerCmd(c, "rmi", derivedImage)
-	dockerCmd(c, "pull", derivedImage)
-
-	derivedIDAfterPull, err = getIDByName(derivedImage)
-	if err != nil {
-		c.Fatalf("error inspecting: %v", err)
-	}
-
-	if derivedIDAfterPull != originalID {
-		c.Fatal("image's ID unexpectedly changed after a repush/repull")
-	}
-	if err != nil {
-		c.Fatalf("error inspecting: %v", err)
-	}
-
-	// Make sure the image still runs
-	out, _ = dockerCmd(c, "run", "--rm", derivedImage)
-	if strings.TrimSpace(out) != derivedImage {
-		c.Fatalf("expected %s; got %s", derivedImage, out)
-	}
-}
-
-func (s *DockerRegistrySuite) TestPullIDStability(c *check.C) {
-	testPullIDStability(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullIDStability(c *check.C) {
-	testPullIDStability(c)
-}
-
-// #21213
-func testPullNoLayers(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/scratch", privateRegistryURL)
-
-	_, err := buildImage(repoName, `
-	FROM scratch
-	ENV foo bar`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "push", repoName)
-	dockerCmd(c, "rmi", repoName)
-	dockerCmd(c, "pull", repoName)
-}
-
-func (s *DockerRegistrySuite) TestPullNoLayers(c *check.C) {
-	testPullNoLayers(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPullNoLayers(c *check.C) {
-	testPullNoLayers(c)
-}
-
-func (s *DockerRegistrySuite) TestPullManifestList(c *check.C) {
-	testRequires(c, NotArm)
-	pushDigest, err := setupImage(c)
-	c.Assert(err, checker.IsNil, check.Commentf("error setting up image"))
-
-	// Inject a manifest list into the registry
-	manifestList := &manifestlist.ManifestList{
-		Versioned: manifest.Versioned{
-			SchemaVersion: 2,
-			MediaType:     manifestlist.MediaTypeManifestList,
-		},
-		Manifests: []manifestlist.ManifestDescriptor{
-			{
-				Descriptor: distribution.Descriptor{
-					Digest:    "sha256:1a9ec845ee94c202b2d5da74a24f0ed2058318bfa9879fa541efaecba272e86b",
-					Size:      3253,
-					MediaType: schema2.MediaTypeManifest,
-				},
-				Platform: manifestlist.PlatformSpec{
-					Architecture: "bogus_arch",
-					OS:           "bogus_os",
-				},
-			},
-			{
-				Descriptor: distribution.Descriptor{
-					Digest:    pushDigest,
-					Size:      3253,
-					MediaType: schema2.MediaTypeManifest,
-				},
-				Platform: manifestlist.PlatformSpec{
-					Architecture: runtime.GOARCH,
-					OS:           runtime.GOOS,
-				},
-			},
-		},
-	}
-
-	manifestListJSON, err := json.MarshalIndent(manifestList, "", "   ")
-	c.Assert(err, checker.IsNil, check.Commentf("error marshalling manifest list"))
-
-	manifestListDigest := digest.FromBytes(manifestListJSON)
-	hexDigest := manifestListDigest.Hex()
-
-	registryV2Path := filepath.Join(s.reg.dir, "docker", "registry", "v2")
-
-	// Write manifest list to blob store
-	blobDir := filepath.Join(registryV2Path, "blobs", "sha256", hexDigest[:2], hexDigest)
-	err = os.MkdirAll(blobDir, 0755)
-	c.Assert(err, checker.IsNil, check.Commentf("error creating blob dir"))
-	blobPath := filepath.Join(blobDir, "data")
-	err = ioutil.WriteFile(blobPath, []byte(manifestListJSON), 0644)
-	c.Assert(err, checker.IsNil, check.Commentf("error writing manifest list"))
-
-	// Add to revision store
-	revisionDir := filepath.Join(registryV2Path, "repositories", remoteRepoName, "_manifests", "revisions", "sha256", hexDigest)
-	err = os.Mkdir(revisionDir, 0755)
-	c.Assert(err, checker.IsNil, check.Commentf("error creating revision dir"))
-	revisionPath := filepath.Join(revisionDir, "link")
-	err = ioutil.WriteFile(revisionPath, []byte(manifestListDigest.String()), 0644)
-	c.Assert(err, checker.IsNil, check.Commentf("error writing revision link"))
-
-	// Update tag
-	tagPath := filepath.Join(registryV2Path, "repositories", remoteRepoName, "_manifests", "tags", "latest", "current", "link")
-	err = ioutil.WriteFile(tagPath, []byte(manifestListDigest.String()), 0644)
-	c.Assert(err, checker.IsNil, check.Commentf("error writing tag link"))
-
-	// Verify that the image can be pulled through the manifest list.
-	out, _ := dockerCmd(c, "pull", repoName)
-
-	// The pull output includes "Digest: <digest>", so find that
-	matches := digestRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from pull output: %s", out))
-	pullDigest := matches[1]
-
-	// Make sure the pushed and pull digests match
-	c.Assert(manifestListDigest.String(), checker.Equals, pullDigest)
-
-	// Was the image actually created?
-	dockerCmd(c, "inspect", repoName)
-
-	dockerCmd(c, "rmi", repoName)
-}
-
-// #23100
-func (s *DockerRegistryAuthHtpasswdSuite) TestPullWithExternalAuthLoginWithScheme(c *check.C) {
-	osPath := os.Getenv("PATH")
-	defer os.Setenv("PATH", osPath)
-
-	workingDir, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
-	c.Assert(err, checker.IsNil)
-	testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
-
-	os.Setenv("PATH", testPath)
-
-	repoName := fmt.Sprintf("%v/dockercli/busybox:authtest", privateRegistryURL)
-
-	tmp, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-
-	externalAuthConfig := `{ "credsStore": "shell-test" }`
-
-	configPath := filepath.Join(tmp, "config.json")
-	err = ioutil.WriteFile(configPath, []byte(externalAuthConfig), 0644)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	b, err := ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), "\"auth\":")
-
-	dockerCmd(c, "--config", tmp, "tag", "busybox", repoName)
-	dockerCmd(c, "--config", tmp, "push", repoName)
-
-	dockerCmd(c, "--config", tmp, "logout", privateRegistryURL)
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, "https://"+privateRegistryURL)
-	dockerCmd(c, "--config", tmp, "pull", repoName)
-
-	// likewise push should work
-	repoName2 := fmt.Sprintf("%v/dockercli/busybox:nocreds", privateRegistryURL)
-	dockerCmd(c, "tag", repoName, repoName2)
-	dockerCmd(c, "--config", tmp, "push", repoName2)
-
-	// logout should work w scheme also because it will be stripped
-	dockerCmd(c, "--config", tmp, "logout", "https://"+privateRegistryURL)
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestPullWithExternalAuth(c *check.C) {
-	osPath := os.Getenv("PATH")
-	defer os.Setenv("PATH", osPath)
-
-	workingDir, err := os.Getwd()
-	c.Assert(err, checker.IsNil)
-	absolute, err := filepath.Abs(filepath.Join(workingDir, "fixtures", "auth"))
-	c.Assert(err, checker.IsNil)
-	testPath := fmt.Sprintf("%s%c%s", osPath, filepath.ListSeparator, absolute)
-
-	os.Setenv("PATH", testPath)
-
-	repoName := fmt.Sprintf("%v/dockercli/busybox:authtest", privateRegistryURL)
-
-	tmp, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-
-	externalAuthConfig := `{ "credsStore": "shell-test" }`
-
-	configPath := filepath.Join(tmp, "config.json")
-	err = ioutil.WriteFile(configPath, []byte(externalAuthConfig), 0644)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "--config", tmp, "login", "-u", s.reg.username, "-p", s.reg.password, privateRegistryURL)
-
-	b, err := ioutil.ReadFile(configPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(string(b), checker.Not(checker.Contains), "\"auth\":")
-
-	dockerCmd(c, "--config", tmp, "tag", "busybox", repoName)
-	dockerCmd(c, "--config", tmp, "push", repoName)
-
-	dockerCmd(c, "--config", tmp, "pull", repoName)
-}
-
-// TestRunImplicitPullWithNoTag should pull implicitly only the default tag (latest)
-func (s *DockerRegistrySuite) TestRunImplicitPullWithNoTag(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repo := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	repoTag1 := fmt.Sprintf("%v:latest", repo)
-	repoTag2 := fmt.Sprintf("%v:t1", repo)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoTag1)
-	dockerCmd(c, "tag", "busybox", repoTag2)
-	dockerCmd(c, "push", repo)
-	dockerCmd(c, "rmi", repoTag1)
-	dockerCmd(c, "rmi", repoTag2)
-
-	out, _, err := dockerCmdWithError("run", repo)
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, fmt.Sprintf("Unable to find image '%s:latest' locally", repo))
-
-	// There should be only one line for repo, the one with repo:latest
-	outImageCmd, _, err := dockerCmdWithError("images", repo)
-	splitOutImageCmd := strings.Split(strings.TrimSpace(outImageCmd), "\n")
-	c.Assert(splitOutImageCmd, checker.HasLen, 2)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_test.go
deleted file mode 100644
index a0118a8e95..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"regexp"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// TestPullFromCentralRegistry pulls an image from the central registry and verifies that the client
-// prints all expected output.
-func (s *DockerHubPullSuite) TestPullFromCentralRegistry(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out := s.Cmd(c, "pull", "hello-world")
-	defer deleteImages("hello-world")
-
-	c.Assert(out, checker.Contains, "Using default tag: latest", check.Commentf("expected the 'latest' tag to be automatically assumed"))
-	c.Assert(out, checker.Contains, "Pulling from library/hello-world", check.Commentf("expected the 'library/' prefix to be automatically assumed"))
-	c.Assert(out, checker.Contains, "Downloaded newer image for hello-world:latest")
-
-	matches := regexp.MustCompile(`Digest: (.+)\n`).FindAllStringSubmatch(out, -1)
-	c.Assert(len(matches), checker.Equals, 1, check.Commentf("expected exactly one image digest in the output"))
-	c.Assert(len(matches[0]), checker.Equals, 2, check.Commentf("unexpected number of submatches for the digest"))
-	_, err := digest.ParseDigest(matches[0][1])
-	c.Check(err, checker.IsNil, check.Commentf("invalid digest %q in output", matches[0][1]))
-
-	// We should have a single entry in images.
-	img := strings.TrimSpace(s.Cmd(c, "images"))
-	splitImg := strings.Split(img, "\n")
-	c.Assert(splitImg, checker.HasLen, 2)
-	c.Assert(splitImg[1], checker.Matches, `hello-world\s+latest.*?`, check.Commentf("invalid output for `docker images` (expected image and tag name"))
-}
-
-// TestPullNonExistingImage pulls non-existing images from the central registry, with different
-// combinations of implicit tag and library prefix.
-func (s *DockerHubPullSuite) TestPullNonExistingImage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	type entry struct {
-		repo  string
-		alias string
-		tag   string
-	}
-
-	entries := []entry{
-		{"asdfasdf", "asdfasdf", "foobar"},
-		{"asdfasdf", "library/asdfasdf", "foobar"},
-		{"asdfasdf", "asdfasdf", ""},
-		{"asdfasdf", "asdfasdf", "latest"},
-		{"asdfasdf", "library/asdfasdf", ""},
-		{"asdfasdf", "library/asdfasdf", "latest"},
-	}
-
-	// The option field indicates "-a" or not.
-	type record struct {
-		e      entry
-		option string
-		out    string
-		err    error
-	}
-
-	// Execute 'docker pull' in parallel, pass results (out, err) and
-	// necessary information ("-a" or not, and the image name) to channel.
-	var group sync.WaitGroup
-	recordChan := make(chan record, len(entries)*2)
-	for _, e := range entries {
-		group.Add(1)
-		go func(e entry) {
-			defer group.Done()
-			repoName := e.alias
-			if e.tag != "" {
-				repoName += ":" + e.tag
-			}
-			out, err := s.CmdWithError("pull", repoName)
-			recordChan <- record{e, "", out, err}
-		}(e)
-		if e.tag == "" {
-			// pull -a on a nonexistent registry should fall back as well
-			group.Add(1)
-			go func(e entry) {
-				defer group.Done()
-				out, err := s.CmdWithError("pull", "-a", e.alias)
-				recordChan <- record{e, "-a", out, err}
-			}(e)
-		}
-	}
-
-	// Wait for completion
-	group.Wait()
-	close(recordChan)
-
-	// Process the results (out, err).
-	for record := range recordChan {
-		if len(record.option) == 0 {
-			c.Assert(record.err, checker.NotNil, check.Commentf("expected non-zero exit status when pulling non-existing image: %s", record.out))
-			c.Assert(record.out, checker.Contains, fmt.Sprintf("repository %s not found: does not exist or no pull access", record.e.repo), check.Commentf("expected image not found error messages"))
-		} else {
-			// pull -a on a nonexistent registry should fall back as well
-			c.Assert(record.err, checker.NotNil, check.Commentf("expected non-zero exit status when pulling non-existing image: %s", record.out))
-			c.Assert(record.out, checker.Contains, fmt.Sprintf("repository %s not found", record.e.repo), check.Commentf("expected image not found error messages"))
-			c.Assert(record.out, checker.Not(checker.Contains), "unauthorized", check.Commentf(`message should not contain "unauthorized"`))
-		}
-	}
-
-}
-
-// TestPullFromCentralRegistryImplicitRefParts pulls an image from the central registry and verifies
-// that pulling the same image with different combinations of implicit elements of the the image
-// reference (tag, repository, central registry url, ...) doesn't trigger a new pull nor leads to
-// multiple images.
-func (s *DockerHubPullSuite) TestPullFromCentralRegistryImplicitRefParts(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// Pull hello-world from v2
-	pullFromV2 := func(ref string) (int, string) {
-		out := s.Cmd(c, "pull", "hello-world")
-		v1Retries := 0
-		for strings.Contains(out, "this image was pulled from a legacy registry") {
-			// Some network errors may cause fallbacks to the v1
-			// protocol, which would violate the test's assumption
-			// that it will get the same images. To make the test
-			// more robust against these network glitches, allow a
-			// few retries if we end up with a v1 pull.
-
-			if v1Retries > 2 {
-				c.Fatalf("too many v1 fallback incidents when pulling %s", ref)
-			}
-
-			s.Cmd(c, "rmi", ref)
-			out = s.Cmd(c, "pull", ref)
-
-			v1Retries++
-		}
-
-		return v1Retries, out
-	}
-
-	pullFromV2("hello-world")
-	defer deleteImages("hello-world")
-
-	s.Cmd(c, "tag", "hello-world", "hello-world-backup")
-
-	for _, ref := range []string{
-		"hello-world",
-		"hello-world:latest",
-		"library/hello-world",
-		"library/hello-world:latest",
-		"docker.io/library/hello-world",
-		"index.docker.io/library/hello-world",
-	} {
-		var out string
-		for {
-			var v1Retries int
-			v1Retries, out = pullFromV2(ref)
-
-			// Keep repeating the test case until we don't hit a v1
-			// fallback case. We won't get the right "Image is up
-			// to date" message if the local image was replaced
-			// with one pulled from v1.
-			if v1Retries == 0 {
-				break
-			}
-			s.Cmd(c, "rmi", ref)
-			s.Cmd(c, "tag", "hello-world-backup", "hello-world")
-		}
-		c.Assert(out, checker.Contains, "Image is up to date for hello-world:latest")
-	}
-
-	s.Cmd(c, "rmi", "hello-world-backup")
-
-	// We should have a single entry in images.
-	img := strings.TrimSpace(s.Cmd(c, "images"))
-	splitImg := strings.Split(img, "\n")
-	c.Assert(splitImg, checker.HasLen, 2)
-	c.Assert(splitImg[1], checker.Matches, `hello-world\s+latest.*?`, check.Commentf("invalid output for `docker images` (expected image and tag name"))
-}
-
-// TestPullScratchNotAllowed verifies that pulling 'scratch' is rejected.
-func (s *DockerHubPullSuite) TestPullScratchNotAllowed(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, err := s.CmdWithError("pull", "scratch")
-	c.Assert(err, checker.NotNil, check.Commentf("expected pull of scratch to fail"))
-	c.Assert(out, checker.Contains, "'scratch' is a reserved name")
-	c.Assert(out, checker.Not(checker.Contains), "Pulling repository scratch")
-}
-
-// TestPullAllTagsFromCentralRegistry pulls using `all-tags` for a given image and verifies that it
-// results in more images than a naked pull.
-func (s *DockerHubPullSuite) TestPullAllTagsFromCentralRegistry(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	s.Cmd(c, "pull", "busybox")
-	outImageCmd := s.Cmd(c, "images", "busybox")
-	splitOutImageCmd := strings.Split(strings.TrimSpace(outImageCmd), "\n")
-	c.Assert(splitOutImageCmd, checker.HasLen, 2)
-
-	s.Cmd(c, "pull", "--all-tags=true", "busybox")
-	outImageAllTagCmd := s.Cmd(c, "images", "busybox")
-	linesCount := strings.Count(outImageAllTagCmd, "\n")
-	c.Assert(linesCount, checker.GreaterThan, 2, check.Commentf("pulling all tags should provide more than two images, got %s", outImageAllTagCmd))
-
-	// Verify that the line for 'busybox:latest' is left unchanged.
-	var latestLine string
-	for _, line := range strings.Split(outImageAllTagCmd, "\n") {
-		if strings.HasPrefix(line, "busybox") && strings.Contains(line, "latest") {
-			latestLine = line
-			break
-		}
-	}
-	c.Assert(latestLine, checker.Not(checker.Equals), "", check.Commentf("no entry for busybox:latest found after pulling all tags"))
-	splitLatest := strings.Fields(latestLine)
-	splitCurrent := strings.Fields(splitOutImageCmd[1])
-
-	// Clear relative creation times, since these can easily change between
-	// two invocations of "docker images". Without this, the test can fail
-	// like this:
-	// ... obtained []string = []string{"busybox", "latest", "d9551b4026f0", "27", "minutes", "ago", "1.113", "MB"}
-	// ... expected []string = []string{"busybox", "latest", "d9551b4026f0", "26", "minutes", "ago", "1.113", "MB"}
-	splitLatest[3] = ""
-	splitLatest[4] = ""
-	splitLatest[5] = ""
-	splitCurrent[3] = ""
-	splitCurrent[4] = ""
-	splitCurrent[5] = ""
-
-	c.Assert(splitLatest, checker.DeepEquals, splitCurrent, check.Commentf("busybox:latest was changed after pulling all tags"))
-}
-
-// TestPullClientDisconnect kills the client during a pull operation and verifies that the operation
-// gets cancelled.
-//
-// Ref: docker/docker#15589
-func (s *DockerHubPullSuite) TestPullClientDisconnect(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repoName := "hello-world:latest"
-
-	pullCmd := s.MakeCmd("pull", repoName)
-	stdout, err := pullCmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-	err = pullCmd.Start()
-	c.Assert(err, checker.IsNil)
-
-	// Cancel as soon as we get some output.
-	buf := make([]byte, 10)
-	_, err = stdout.Read(buf)
-	c.Assert(err, checker.IsNil)
-
-	err = pullCmd.Process.Kill()
-	c.Assert(err, checker.IsNil)
-
-	time.Sleep(2 * time.Second)
-	_, err = s.CmdWithError("inspect", repoName)
-	c.Assert(err, checker.NotNil, check.Commentf("image was pulled after client disconnected"))
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestPullNoCredentialsNotFound(c *check.C) {
-	// we don't care about the actual image, we just want to see image not found
-	// because that means v2 call returned 401 and we fell back to v1 which usually
-	// gives a 404 (in this case the test registry doesn't handle v1 at all)
-	out, _, err := dockerCmdWithError("pull", privateRegistryURL+"/busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Error: image busybox:latest not found")
-}
-
-// Regression test for https://github.com/docker/docker/issues/26429
-func (s *DockerSuite) TestPullLinuxImageFailsOnWindows(c *check.C) {
-	testRequires(c, DaemonIsWindows, Network)
-	_, _, err := dockerCmdWithError("pull", "ubuntu")
-	c.Assert(err.Error(), checker.Contains, "cannot be used on this platform")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_trusted_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_trusted_test.go
deleted file mode 100644
index 96a42d6758..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_pull_trusted_test.go
+++ /dev/null
@@ -1,365 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerTrustSuite) TestTrustedPull(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-pull")
-
-	// Try pull
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err := runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf(out))
-
-	dockerCmd(c, "rmi", repoName)
-	// Try untrusted pull to ensure we pushed the tag to the registry
-	pullCmd = exec.Command(dockerBinary, "pull", "--disable-content-trust=true", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Downloaded", check.Commentf(out))
-
-}
-
-func (s *DockerTrustSuite) TestTrustedIsolatedPull(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-isolated-pull")
-
-	// Try pull (run from isolated directory without trust information)
-	pullCmd := exec.Command(dockerBinary, "--config", "/tmp/docker-isolated", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err := runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf(string(out)))
-
-	dockerCmd(c, "rmi", repoName)
-}
-
-func (s *DockerTrustSuite) TestUntrustedPull(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercliuntrusted/pulltest:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	dockerCmd(c, "push", repoName)
-	dockerCmd(c, "rmi", repoName)
-
-	// Try trusted pull on untrusted tag
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err := runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Error: remote trust data does not exist", check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestPullWhenCertExpired(c *check.C) {
-	c.Skip("Currently changes system time, causing instability")
-	repoName := s.setupTrustedImage(c, "trusted-cert-expired")
-
-	// Certificates have 10 years of expiration
-	elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11)
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try pull
-		pullCmd := exec.Command(dockerBinary, "pull", repoName)
-		s.trustedCmd(pullCmd)
-		out, _, err := runCommandWithOutput(pullCmd)
-
-		c.Assert(err, check.NotNil, check.Commentf(out))
-		c.Assert(string(out), checker.Contains, "could not validate the path to a trusted root", check.Commentf(out))
-	})
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try pull
-		pullCmd := exec.Command(dockerBinary, "pull", "--disable-content-trust", repoName)
-		s.trustedCmd(pullCmd)
-		out, _, err := runCommandWithOutput(pullCmd)
-
-		c.Assert(err, check.IsNil, check.Commentf(out))
-		c.Assert(string(out), checker.Contains, "Status: Downloaded", check.Commentf(out))
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedPullFromBadTrustServer(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclievilpull/trusted:latest", privateRegistryURL)
-	evilLocalConfigDir, err := ioutil.TempDir("", "evil-local-config-dir")
-	if err != nil {
-		c.Fatalf("Failed to create local temp dir")
-	}
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Signing and pushing trust metadata", check.Commentf(out))
-	dockerCmd(c, "rmi", repoName)
-
-	// Try pull
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf(out))
-	dockerCmd(c, "rmi", repoName)
-
-	// Kill the notary server, start a new "evil" one.
-	s.not.Close()
-	s.not, err = newTestNotary(c)
-
-	c.Assert(err, check.IsNil, check.Commentf("Restarting notary server failed."))
-
-	// In order to make an evil server, lets re-init a client (with a different trust dir) and push new data.
-	// tag an image and upload it to the private registry
-	dockerCmd(c, "--config", evilLocalConfigDir, "tag", "busybox", repoName)
-
-	// Push up to the new server
-	pushCmd = exec.Command(dockerBinary, "--config", evilLocalConfigDir, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Signing and pushing trust metadata", check.Commentf(out))
-
-	// Now, try pulling with the original client from this new trust server. This should fail because the new root is invalid.
-	pullCmd = exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	if err == nil {
-		c.Fatalf("Continuing with cached data even though it's an invalid root rotation: %s\n%s", err, out)
-	}
-	if !strings.Contains(out, "could not rotate trust to a new trusted root") {
-		c.Fatalf("Missing expected output on trusted pull:\n%s", out)
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedPullWithExpiredSnapshot(c *check.C) {
-	c.Skip("Currently changes system time, causing instability")
-	repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppull/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	// Push with default passphrases
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Signing and pushing trust metadata", check.Commentf(out))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Snapshots last for three years. This should be expired
-	fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4)
-
-	runAtDifferentDate(fourYearsLater, func() {
-		// Try pull
-		pullCmd := exec.Command(dockerBinary, "pull", repoName)
-		s.trustedCmd(pullCmd)
-		out, _, err = runCommandWithOutput(pullCmd)
-
-		c.Assert(err, check.NotNil, check.Commentf("Missing expected error running trusted pull with expired snapshots"))
-		c.Assert(string(out), checker.Contains, "repository out-of-date", check.Commentf(out))
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedOfflinePull(c *check.C) {
-	repoName := s.setupTrustedImage(c, "trusted-offline-pull")
-
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmdWithServer(pullCmd, "https://invalidnotaryserver")
-	out, _, err := runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "error contacting notary server", check.Commentf(out))
-	// Do valid trusted pull to warm cache
-	pullCmd = exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf(out))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try pull again with invalid notary server, should use cache
-	pullCmd = exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmdWithServer(pullCmd, "https://invalidnotaryserver")
-	out, _, err = runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Tagging", check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPullDelete(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/%s:latest", privateRegistryURL, "trusted-pull-delete")
-	// tag the image and upload it to the private registry
-	_, err := buildImage(repoName, `
-                    FROM busybox
-                    CMD echo trustedpulldelete
-                `, true)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted push: %s\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "Signing and pushing trust metadata") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	if out, status := dockerCmd(c, "rmi", repoName); status != 0 {
-		c.Fatalf("Error removing image %q\n%s", repoName, out)
-	}
-
-	// Try pull
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	matches := digestRegex.FindStringSubmatch(out)
-	c.Assert(matches, checker.HasLen, 2, check.Commentf("unable to parse digest from pull output: %s", out))
-	pullDigest := matches[1]
-
-	imageID := inspectField(c, repoName, "Id")
-
-	imageByDigest := repoName + "@" + pullDigest
-	byDigestID := inspectField(c, imageByDigest, "Id")
-
-	c.Assert(byDigestID, checker.Equals, imageID)
-
-	// rmi of tag should also remove the digest reference
-	dockerCmd(c, "rmi", repoName)
-
-	_, err = inspectFieldWithError(imageByDigest, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("digest reference should have been removed"))
-
-	_, err = inspectFieldWithError(imageID, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("image should have been deleted"))
-}
-
-func (s *DockerTrustSuite) TestTrustedPullReadsFromReleasesRole(c *check.C) {
-	testRequires(c, NotaryHosting)
-	repoName := fmt.Sprintf("%v/dockerclireleasesdelegationpulling/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-
-	// Push with targets first, initializing the repo
-	dockerCmd(c, "tag", "busybox", targetName)
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	s.assertTargetInRoles(c, repoName, "latest", "targets")
-
-	// Try pull, check we retrieve from targets role
-	pullCmd := exec.Command(dockerBinary, "-D", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "retrieving target for targets role")
-
-	// Now we'll create the releases role, and try pushing and pulling
-	s.notaryCreateDelegation(c, repoName, "targets/releases", s.not.keys[0].Public)
-	s.notaryImportKey(c, repoName, "targets/releases", s.not.keys[0].Private)
-	s.notaryPublish(c, repoName)
-
-	// try a pull, check that we can still pull because we can still read the
-	// old tag in the targets role
-	pullCmd = exec.Command(dockerBinary, "-D", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "retrieving target for targets role")
-
-	// try a pull -a, check that it succeeds because we can still pull from the
-	// targets role
-	pullCmd = exec.Command(dockerBinary, "-D", "pull", "-a", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	// Push, should sign with targets/releases
-	dockerCmd(c, "tag", "busybox", targetName)
-	pushCmd = exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-	s.assertTargetInRoles(c, repoName, "latest", "targets", "targets/releases")
-
-	// Try pull, check we retrieve from targets/releases role
-	pullCmd = exec.Command(dockerBinary, "-D", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(out, checker.Contains, "retrieving target for targets/releases role")
-
-	// Create another delegation that we'll sign with
-	s.notaryCreateDelegation(c, repoName, "targets/other", s.not.keys[1].Public)
-	s.notaryImportKey(c, repoName, "targets/other", s.not.keys[1].Private)
-	s.notaryPublish(c, repoName)
-
-	dockerCmd(c, "tag", "busybox", targetName)
-	pushCmd = exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-	s.assertTargetInRoles(c, repoName, "latest", "targets", "targets/releases", "targets/other")
-
-	// Try pull, check we retrieve from targets/releases role
-	pullCmd = exec.Command(dockerBinary, "-D", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(out, checker.Contains, "retrieving target for targets/releases role")
-}
-
-func (s *DockerTrustSuite) TestTrustedPullIgnoresOtherDelegationRoles(c *check.C) {
-	testRequires(c, NotaryHosting)
-	repoName := fmt.Sprintf("%v/dockerclipullotherdelegation/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-
-	// We'll create a repo first with a non-release delegation role, so that when we
-	// push we'll sign it into the delegation role
-	s.notaryInitRepo(c, repoName)
-	s.notaryCreateDelegation(c, repoName, "targets/other", s.not.keys[0].Public)
-	s.notaryImportKey(c, repoName, "targets/other", s.not.keys[0].Private)
-	s.notaryPublish(c, repoName)
-
-	// Push should write to the delegation role, not targets
-	dockerCmd(c, "tag", "busybox", targetName)
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	s.assertTargetInRoles(c, repoName, "latest", "targets/other")
-	s.assertTargetNotInRoles(c, repoName, "latest", "targets")
-
-	// Try pull - we should fail, since pull will only pull from the targets/releases
-	// role or the targets role
-	pullCmd := exec.Command(dockerBinary, "-D", "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "No trust data for")
-
-	// try a pull -a: we should fail since pull will only pull from the targets/releases
-	// role or the targets role
-	pullCmd = exec.Command(dockerBinary, "-D", "pull", "-a", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "No trusted tags for")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_push_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_push_test.go
deleted file mode 100644
index f750c12674..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_push_test.go
+++ /dev/null
@@ -1,715 +0,0 @@
-package main
-
-import (
-	"archive/tar"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// Pushing an image to a private registry.
-func testPushBusyboxImage(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	// tag the image to upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	// push the image to the registry
-	dockerCmd(c, "push", repoName)
-}
-
-func (s *DockerRegistrySuite) TestPushBusyboxImage(c *check.C) {
-	testPushBusyboxImage(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPushBusyboxImage(c *check.C) {
-	testPushBusyboxImage(c)
-}
-
-// pushing an image without a prefix should throw an error
-func (s *DockerSuite) TestPushUnprefixedRepo(c *check.C) {
-	out, _, err := dockerCmdWithError("push", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf("pushing an unprefixed repo didn't result in a non-zero exit status: %s", out))
-}
-
-func testPushUntagged(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	expected := "An image does not exist locally with the tag"
-
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf("pushing the image to the private registry should have failed: output %q", out))
-	c.Assert(out, checker.Contains, expected, check.Commentf("pushing the image failed"))
-}
-
-func (s *DockerRegistrySuite) TestPushUntagged(c *check.C) {
-	testPushUntagged(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPushUntagged(c *check.C) {
-	testPushUntagged(c)
-}
-
-func testPushBadTag(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox:latest", privateRegistryURL)
-	expected := "does not exist"
-
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf("pushing the image to the private registry should have failed: output %q", out))
-	c.Assert(out, checker.Contains, expected, check.Commentf("pushing the image failed"))
-}
-
-func (s *DockerRegistrySuite) TestPushBadTag(c *check.C) {
-	testPushBadTag(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPushBadTag(c *check.C) {
-	testPushBadTag(c)
-}
-
-func testPushMultipleTags(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	repoTag1 := fmt.Sprintf("%v/dockercli/busybox:t1", privateRegistryURL)
-	repoTag2 := fmt.Sprintf("%v/dockercli/busybox:t2", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoTag1)
-
-	dockerCmd(c, "tag", "busybox", repoTag2)
-
-	dockerCmd(c, "push", repoName)
-
-	// Ensure layer list is equivalent for repoTag1 and repoTag2
-	out1, _ := dockerCmd(c, "pull", repoTag1)
-
-	imageAlreadyExists := ": Image already exists"
-	var out1Lines []string
-	for _, outputLine := range strings.Split(out1, "\n") {
-		if strings.Contains(outputLine, imageAlreadyExists) {
-			out1Lines = append(out1Lines, outputLine)
-		}
-	}
-
-	out2, _ := dockerCmd(c, "pull", repoTag2)
-
-	var out2Lines []string
-	for _, outputLine := range strings.Split(out2, "\n") {
-		if strings.Contains(outputLine, imageAlreadyExists) {
-			out1Lines = append(out1Lines, outputLine)
-		}
-	}
-	c.Assert(out2Lines, checker.HasLen, len(out1Lines))
-
-	for i := range out1Lines {
-		c.Assert(out1Lines[i], checker.Equals, out2Lines[i])
-	}
-}
-
-func (s *DockerRegistrySuite) TestPushMultipleTags(c *check.C) {
-	testPushMultipleTags(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPushMultipleTags(c *check.C) {
-	testPushMultipleTags(c)
-}
-
-func testPushEmptyLayer(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/emptylayer", privateRegistryURL)
-	emptyTarball, err := ioutil.TempFile("", "empty_tarball")
-	c.Assert(err, check.IsNil, check.Commentf("Unable to create test file"))
-
-	tw := tar.NewWriter(emptyTarball)
-	err = tw.Close()
-	c.Assert(err, check.IsNil, check.Commentf("Error creating empty tarball"))
-
-	freader, err := os.Open(emptyTarball.Name())
-	c.Assert(err, check.IsNil, check.Commentf("Could not open test tarball"))
-	defer freader.Close()
-
-	importCmd := exec.Command(dockerBinary, "import", "-", repoName)
-	importCmd.Stdin = freader
-	out, _, err := runCommandWithOutput(importCmd)
-	c.Assert(err, check.IsNil, check.Commentf("import failed: %q", out))
-
-	// Now verify we can push it
-	out, _, err = dockerCmdWithError("push", repoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out))
-}
-
-func (s *DockerRegistrySuite) TestPushEmptyLayer(c *check.C) {
-	testPushEmptyLayer(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestPushEmptyLayer(c *check.C) {
-	testPushEmptyLayer(c)
-}
-
-// testConcurrentPush pushes multiple tags to the same repo
-// concurrently.
-func testConcurrentPush(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-
-	repos := []string{}
-	for _, tag := range []string{"push1", "push2", "push3"} {
-		repo := fmt.Sprintf("%v:%v", repoName, tag)
-		_, err := buildImage(repo, fmt.Sprintf(`
-	FROM busybox
-	ENTRYPOINT ["/bin/echo"]
-	ENV FOO foo
-	ENV BAR bar
-	CMD echo %s
-`, repo), true)
-		c.Assert(err, checker.IsNil)
-		repos = append(repos, repo)
-	}
-
-	// Push tags, in parallel
-	results := make(chan error)
-
-	for _, repo := range repos {
-		go func(repo string) {
-			_, _, err := runCommandWithOutput(exec.Command(dockerBinary, "push", repo))
-			results <- err
-		}(repo)
-	}
-
-	for range repos {
-		err := <-results
-		c.Assert(err, checker.IsNil, check.Commentf("concurrent push failed with error: %v", err))
-	}
-
-	// Clear local images store.
-	args := append([]string{"rmi"}, repos...)
-	dockerCmd(c, args...)
-
-	// Re-pull and run individual tags, to make sure pushes succeeded
-	for _, repo := range repos {
-		dockerCmd(c, "pull", repo)
-		dockerCmd(c, "inspect", repo)
-		out, _ := dockerCmd(c, "run", "--rm", repo)
-		c.Assert(strings.TrimSpace(out), checker.Equals, "/bin/sh -c echo "+repo)
-	}
-}
-
-func (s *DockerRegistrySuite) TestConcurrentPush(c *check.C) {
-	testConcurrentPush(c)
-}
-
-func (s *DockerSchema1RegistrySuite) TestConcurrentPush(c *check.C) {
-	testConcurrentPush(c)
-}
-
-func (s *DockerRegistrySuite) TestCrossRepositoryLayerPush(c *check.C) {
-	sourceRepoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	// tag the image to upload it to the private registry
-	dockerCmd(c, "tag", "busybox", sourceRepoName)
-	// push the image to the registry
-	out1, _, err := dockerCmdWithError("push", sourceRepoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out1))
-	// ensure that none of the layers were mounted from another repository during push
-	c.Assert(strings.Contains(out1, "Mounted from"), check.Equals, false)
-
-	digest1 := reference.DigestRegexp.FindString(out1)
-	c.Assert(len(digest1), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
-
-	destRepoName := fmt.Sprintf("%v/dockercli/crossrepopush", privateRegistryURL)
-	// retag the image to upload the same layers to another repo in the same registry
-	dockerCmd(c, "tag", "busybox", destRepoName)
-	// push the image to the registry
-	out2, _, err := dockerCmdWithError("push", destRepoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out2))
-	// ensure that layers were mounted from the first repo during push
-	c.Assert(strings.Contains(out2, "Mounted from dockercli/busybox"), check.Equals, true)
-
-	digest2 := reference.DigestRegexp.FindString(out2)
-	c.Assert(len(digest2), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
-	c.Assert(digest1, check.Equals, digest2)
-
-	// ensure that pushing again produces the same digest
-	out3, _, err := dockerCmdWithError("push", destRepoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out2))
-
-	digest3 := reference.DigestRegexp.FindString(out3)
-	c.Assert(len(digest2), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
-	c.Assert(digest3, check.Equals, digest2)
-
-	// ensure that we can pull and run the cross-repo-pushed repository
-	dockerCmd(c, "rmi", destRepoName)
-	dockerCmd(c, "pull", destRepoName)
-	out4, _ := dockerCmd(c, "run", destRepoName, "echo", "-n", "hello world")
-	c.Assert(out4, check.Equals, "hello world")
-}
-
-func (s *DockerSchema1RegistrySuite) TestCrossRepositoryLayerPushNotSupported(c *check.C) {
-	sourceRepoName := fmt.Sprintf("%v/dockercli/busybox", privateRegistryURL)
-	// tag the image to upload it to the private registry
-	dockerCmd(c, "tag", "busybox", sourceRepoName)
-	// push the image to the registry
-	out1, _, err := dockerCmdWithError("push", sourceRepoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out1))
-	// ensure that none of the layers were mounted from another repository during push
-	c.Assert(strings.Contains(out1, "Mounted from"), check.Equals, false)
-
-	digest1 := reference.DigestRegexp.FindString(out1)
-	c.Assert(len(digest1), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
-
-	destRepoName := fmt.Sprintf("%v/dockercli/crossrepopush", privateRegistryURL)
-	// retag the image to upload the same layers to another repo in the same registry
-	dockerCmd(c, "tag", "busybox", destRepoName)
-	// push the image to the registry
-	out2, _, err := dockerCmdWithError("push", destRepoName)
-	c.Assert(err, check.IsNil, check.Commentf("pushing the image to the private registry has failed: %s", out2))
-	// schema1 registry should not support cross-repo layer mounts, so ensure that this does not happen
-	c.Assert(strings.Contains(out2, "Mounted from"), check.Equals, false)
-
-	digest2 := reference.DigestRegexp.FindString(out2)
-	c.Assert(len(digest2), checker.GreaterThan, 0, check.Commentf("no digest found for pushed manifest"))
-	c.Assert(digest1, check.Not(check.Equals), digest2)
-
-	// ensure that we can pull and run the second pushed repository
-	dockerCmd(c, "rmi", destRepoName)
-	dockerCmd(c, "pull", destRepoName)
-	out3, _ := dockerCmd(c, "run", destRepoName, "echo", "-n", "hello world")
-	c.Assert(out3, check.Equals, "hello world")
-}
-
-func (s *DockerTrustSuite) TestTrustedPush(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclitrusted/pushtest:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Error running trusted push: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push"))
-
-	// Try pull after push
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Image is up to date", check.Commentf(out))
-
-	// Assert that we rotated the snapshot key to the server by checking our local keystore
-	contents, err := ioutil.ReadDir(filepath.Join(cliconfig.ConfigDir(), "trust/private/tuf_keys", privateRegistryURL, "dockerclitrusted/pushtest"))
-	c.Assert(err, check.IsNil, check.Commentf("Unable to read local tuf key files"))
-	// Check that we only have 1 key (targets key)
-	c.Assert(contents, checker.HasLen, 1)
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithEnvPasswords(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclienv/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmdWithPassphrases(pushCmd, "12345678", "12345678")
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Error running trusted push: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push"))
-
-	// Try pull after push
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Image is up to date", check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithFailingServer(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclitrusted/failingserver:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	// Using a name that doesn't resolve to an address makes this test faster
-	s.trustedCmdWithServer(pushCmd, "https://server.invalid:81/")
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.NotNil, check.Commentf("Missing error while running trusted push w/ no server"))
-	c.Assert(out, checker.Contains, "error contacting notary server", check.Commentf("Missing expected output on trusted push"))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithoutServerAndUntrusted(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclitrusted/trustedandnot:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", "--disable-content-trust", repoName)
-	// Using a name that doesn't resolve to an address makes this test faster
-	s.trustedCmdWithServer(pushCmd, "https://server.invalid")
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push with no server and --disable-content-trust failed: %s\n%s", err, out))
-	c.Assert(out, check.Not(checker.Contains), "Error establishing connection to notary repository", check.Commentf("Missing expected output on trusted push with --disable-content-trust:"))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithExistingTag(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclitag/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	dockerCmd(c, "push", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-
-	// Try pull after push
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Image is up to date", check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithExistingSignedTag(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclipushpush/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	// Do a trusted push
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-
-	// Do another trusted push
-	pushCmd = exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try pull to ensure the double push did not break our ability to pull
-	pullCmd := exec.Command(dockerBinary, "pull", repoName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf("Error running trusted pull: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Status: Downloaded", check.Commentf("Missing expected output on trusted pull with --disable-content-trust"))
-
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithIncorrectPassphraseForNonRoot(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockercliincorretpwd/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	// Push with default passphrases
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push:\n%s", out))
-
-	// Push with wrong passphrases
-	pushCmd = exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmdWithPassphrases(pushCmd, "12345678", "87654321")
-	out, _, err = runCommandWithOutput(pushCmd)
-	c.Assert(err, check.NotNil, check.Commentf("Error missing from trusted push with short targets passphrase: \n%s", out))
-	c.Assert(out, checker.Contains, "could not find necessary signing keys", check.Commentf("Missing expected output on trusted push with short targets/snapsnot passphrase"))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithExpiredSnapshot(c *check.C) {
-	c.Skip("Currently changes system time, causing instability")
-	repoName := fmt.Sprintf("%v/dockercliexpiredsnapshot/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	// Push with default passphrases
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push"))
-
-	// Snapshots last for three years. This should be expired
-	fourYearsLater := time.Now().Add(time.Hour * 24 * 365 * 4)
-
-	runAtDifferentDate(fourYearsLater, func() {
-		// Push with wrong passphrases
-		pushCmd = exec.Command(dockerBinary, "push", repoName)
-		s.trustedCmd(pushCmd)
-		out, _, err = runCommandWithOutput(pushCmd)
-		c.Assert(err, check.NotNil, check.Commentf("Error missing from trusted push with expired snapshot: \n%s", out))
-		c.Assert(out, checker.Contains, "repository out-of-date", check.Commentf("Missing expected output on trusted push with expired snapshot"))
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithExpiredTimestamp(c *check.C) {
-	c.Skip("Currently changes system time, causing instability")
-	repoName := fmt.Sprintf("%v/dockercliexpiredtimestamppush/trusted:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	// Push with default passphrases
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push"))
-
-	// The timestamps expire in two weeks. Lets check three
-	threeWeeksLater := time.Now().Add(time.Hour * 24 * 21)
-
-	// Should succeed because the server transparently re-signs one
-	runAtDifferentDate(threeWeeksLater, func() {
-		pushCmd := exec.Command(dockerBinary, "push", repoName)
-		s.trustedCmd(pushCmd)
-		out, _, err := runCommandWithOutput(pushCmd)
-		c.Assert(err, check.IsNil, check.Commentf("Error running trusted push: %s\n%s", err, out))
-		c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with expired timestamp"))
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedPushWithReleasesDelegationOnly(c *check.C) {
-	testRequires(c, NotaryHosting)
-	repoName := fmt.Sprintf("%v/dockerclireleasedelegationinitfirst/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-	s.notaryInitRepo(c, repoName)
-	s.notaryCreateDelegation(c, repoName, "targets/releases", s.not.keys[0].Public)
-	s.notaryPublish(c, repoName)
-
-	s.notaryImportKey(c, repoName, "targets/releases", s.not.keys[0].Private)
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", targetName)
-
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-	// check to make sure that the target has been added to targets/releases and not targets
-	s.assertTargetInRoles(c, repoName, "latest", "targets/releases")
-	s.assertTargetNotInRoles(c, repoName, "latest", "targets")
-
-	// Try pull after push
-	os.RemoveAll(filepath.Join(cliconfig.ConfigDir(), "trust"))
-
-	pullCmd := exec.Command(dockerBinary, "pull", targetName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Status: Image is up to date", check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushSignsAllFirstLevelRolesWeHaveKeysFor(c *check.C) {
-	testRequires(c, NotaryHosting)
-	repoName := fmt.Sprintf("%v/dockerclimanyroles/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-	s.notaryInitRepo(c, repoName)
-	s.notaryCreateDelegation(c, repoName, "targets/role1", s.not.keys[0].Public)
-	s.notaryCreateDelegation(c, repoName, "targets/role2", s.not.keys[1].Public)
-	s.notaryCreateDelegation(c, repoName, "targets/role3", s.not.keys[2].Public)
-
-	// import everything except the third key
-	s.notaryImportKey(c, repoName, "targets/role1", s.not.keys[0].Private)
-	s.notaryImportKey(c, repoName, "targets/role2", s.not.keys[1].Private)
-
-	s.notaryCreateDelegation(c, repoName, "targets/role1/subrole", s.not.keys[3].Public)
-	s.notaryImportKey(c, repoName, "targets/role1/subrole", s.not.keys[3].Private)
-
-	s.notaryPublish(c, repoName)
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", targetName)
-
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-
-	// check to make sure that the target has been added to targets/role1 and targets/role2, and
-	// not targets (because there are delegations) or targets/role3 (due to missing key) or
-	// targets/role1/subrole (due to it being a second level delegation)
-	s.assertTargetInRoles(c, repoName, "latest", "targets/role1", "targets/role2")
-	s.assertTargetNotInRoles(c, repoName, "latest", "targets")
-
-	// Try pull after push
-	os.RemoveAll(filepath.Join(cliconfig.ConfigDir(), "trust"))
-
-	// pull should fail because none of these are the releases role
-	pullCmd := exec.Command(dockerBinary, "pull", targetName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushSignsForRolesWithKeysAndValidPaths(c *check.C) {
-	repoName := fmt.Sprintf("%v/dockerclirolesbykeysandpaths/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-	s.notaryInitRepo(c, repoName)
-	s.notaryCreateDelegation(c, repoName, "targets/role1", s.not.keys[0].Public, "l", "z")
-	s.notaryCreateDelegation(c, repoName, "targets/role2", s.not.keys[1].Public, "x", "y")
-	s.notaryCreateDelegation(c, repoName, "targets/role3", s.not.keys[2].Public, "latest")
-	s.notaryCreateDelegation(c, repoName, "targets/role4", s.not.keys[3].Public, "latest")
-
-	// import everything except the third key
-	s.notaryImportKey(c, repoName, "targets/role1", s.not.keys[0].Private)
-	s.notaryImportKey(c, repoName, "targets/role2", s.not.keys[1].Private)
-	s.notaryImportKey(c, repoName, "targets/role4", s.not.keys[3].Private)
-
-	s.notaryPublish(c, repoName)
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", targetName)
-
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.IsNil, check.Commentf("trusted push failed: %s\n%s", err, out))
-	c.Assert(out, checker.Contains, "Signing and pushing trust metadata", check.Commentf("Missing expected output on trusted push with existing tag"))
-
-	// check to make sure that the target has been added to targets/role1 and targets/role4, and
-	// not targets (because there are delegations) or targets/role2 (due to path restrictions) or
-	// targets/role3 (due to missing key)
-	s.assertTargetInRoles(c, repoName, "latest", "targets/role1", "targets/role4")
-	s.assertTargetNotInRoles(c, repoName, "latest", "targets")
-
-	// Try pull after push
-	os.RemoveAll(filepath.Join(cliconfig.ConfigDir(), "trust"))
-
-	// pull should fail because none of these are the releases role
-	pullCmd := exec.Command(dockerBinary, "pull", targetName)
-	s.trustedCmd(pullCmd)
-	out, _, err = runCommandWithOutput(pullCmd)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerTrustSuite) TestTrustedPushDoesntSignTargetsIfDelegationsExist(c *check.C) {
-	testRequires(c, NotaryHosting)
-	repoName := fmt.Sprintf("%v/dockerclireleasedelegationnotsignable/trusted", privateRegistryURL)
-	targetName := fmt.Sprintf("%s:latest", repoName)
-	s.notaryInitRepo(c, repoName)
-	s.notaryCreateDelegation(c, repoName, "targets/role1", s.not.keys[0].Public)
-	s.notaryPublish(c, repoName)
-
-	// do not import any delegations key
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", targetName)
-
-	pushCmd := exec.Command(dockerBinary, "push", targetName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	c.Assert(err, check.NotNil, check.Commentf("trusted push succeeded but should have failed:\n%s", out))
-	c.Assert(out, checker.Contains, "no valid signing keys",
-		check.Commentf("Missing expected output on trusted push without keys"))
-
-	s.assertTargetNotInRoles(c, repoName, "latest", "targets", "targets/role1")
-}
-
-func (s *DockerRegistryAuthHtpasswdSuite) TestPushNoCredentialsNoRetry(c *check.C) {
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, check.Not(checker.Contains), "Retrying")
-	c.Assert(out, checker.Contains, "no basic auth credentials")
-}
-
-// This may be flaky but it's needed not to regress on unauthorized push, see #21054
-func (s *DockerSuite) TestPushToCentralRegistryUnauthorized(c *check.C) {
-	testRequires(c, Network)
-	repoName := "test/busybox"
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, check.Not(checker.Contains), "Retrying")
-}
-
-func getTestTokenService(status int, body string, retries int) *httptest.Server {
-	var mu sync.Mutex
-	return httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		mu.Lock()
-		if retries > 0 {
-			w.WriteHeader(http.StatusServiceUnavailable)
-			w.Header().Set("Content-Type", "application/json")
-			w.Write([]byte(`{"errors":[{"code":"UNAVAILABLE","message":"cannot create token at this time"}]}`))
-			retries--
-		} else {
-			w.WriteHeader(status)
-			w.Header().Set("Content-Type", "application/json")
-			w.Write([]byte(body))
-		}
-		mu.Unlock()
-	}))
-}
-
-func (s *DockerRegistryAuthTokenSuite) TestPushTokenServiceUnauthResponse(c *check.C) {
-	ts := getTestTokenService(http.StatusUnauthorized, `{"errors": [{"Code":"UNAUTHORIZED", "message": "a message", "detail": null}]}`, 0)
-	defer ts.Close()
-	s.setupRegistryWithTokenService(c, ts.URL)
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Not(checker.Contains), "Retrying")
-	c.Assert(out, checker.Contains, "unauthorized: a message")
-}
-
-func (s *DockerRegistryAuthTokenSuite) TestPushMisconfiguredTokenServiceResponseUnauthorized(c *check.C) {
-	ts := getTestTokenService(http.StatusUnauthorized, `{"error": "unauthorized"}`, 0)
-	defer ts.Close()
-	s.setupRegistryWithTokenService(c, ts.URL)
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Not(checker.Contains), "Retrying")
-	split := strings.Split(out, "\n")
-	c.Assert(split[len(split)-2], check.Equals, "unauthorized: authentication required")
-}
-
-func (s *DockerRegistryAuthTokenSuite) TestPushMisconfiguredTokenServiceResponseError(c *check.C) {
-	ts := getTestTokenService(http.StatusTooManyRequests, `{"errors": [{"code":"TOOMANYREQUESTS","message":"out of tokens"}]}`, 4)
-	defer ts.Close()
-	s.setupRegistryWithTokenService(c, ts.URL)
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Retrying")
-	c.Assert(out, checker.Not(checker.Contains), "Retrying in 15")
-	split := strings.Split(out, "\n")
-	c.Assert(split[len(split)-2], check.Equals, "toomanyrequests: out of tokens")
-}
-
-func (s *DockerRegistryAuthTokenSuite) TestPushMisconfiguredTokenServiceResponseUnparsable(c *check.C) {
-	ts := getTestTokenService(http.StatusForbidden, `no way`, 0)
-	defer ts.Close()
-	s.setupRegistryWithTokenService(c, ts.URL)
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Not(checker.Contains), "Retrying")
-	split := strings.Split(out, "\n")
-	c.Assert(split[len(split)-2], checker.Contains, "error parsing HTTP 403 response body: ")
-}
-
-func (s *DockerRegistryAuthTokenSuite) TestPushMisconfiguredTokenServiceResponseNoToken(c *check.C) {
-	ts := getTestTokenService(http.StatusOK, `{"something": "wrong"}`, 0)
-	defer ts.Close()
-	s.setupRegistryWithTokenService(c, ts.URL)
-	repoName := fmt.Sprintf("%s/busybox", privateRegistryURL)
-	dockerCmd(c, "tag", "busybox", repoName)
-	out, _, err := dockerCmdWithError("push", repoName)
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Not(checker.Contains), "Retrying")
-	split := strings.Split(out, "\n")
-	c.Assert(split[len(split)-2], check.Equals, "authorization server did not include a token in the response")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_registry_user_agent_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_registry_user_agent_test.go
deleted file mode 100644
index fb9a66a541..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_registry_user_agent_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net/http"
-	"regexp"
-
-	"github.com/go-check/check"
-)
-
-// unescapeBackslashSemicolonParens unescapes \;()
-func unescapeBackslashSemicolonParens(s string) string {
-	re := regexp.MustCompile(`\\;`)
-	ret := re.ReplaceAll([]byte(s), []byte(";"))
-
-	re = regexp.MustCompile(`\\\(`)
-	ret = re.ReplaceAll([]byte(ret), []byte("("))
-
-	re = regexp.MustCompile(`\\\)`)
-	ret = re.ReplaceAll([]byte(ret), []byte(")"))
-
-	re = regexp.MustCompile(`\\\\`)
-	ret = re.ReplaceAll([]byte(ret), []byte(`\`))
-
-	return string(ret)
-}
-
-func regexpCheckUA(c *check.C, ua string) {
-	re := regexp.MustCompile("(?P<dockerUA>.+) UpstreamClient(?P<upstreamUA>.+)")
-	substrArr := re.FindStringSubmatch(ua)
-
-	c.Assert(substrArr, check.HasLen, 3, check.Commentf("Expected 'UpstreamClient()' with upstream client UA"))
-	dockerUA := substrArr[1]
-	upstreamUAEscaped := substrArr[2]
-
-	// check dockerUA looks correct
-	reDockerUA := regexp.MustCompile("^docker/[0-9A-Za-z+]")
-	bMatchDockerUA := reDockerUA.MatchString(dockerUA)
-	c.Assert(bMatchDockerUA, check.Equals, true, check.Commentf("Docker Engine User-Agent malformed"))
-
-	// check upstreamUA looks correct
-	// Expecting something like:  Docker-Client/1.11.0-dev (linux)
-	upstreamUA := unescapeBackslashSemicolonParens(upstreamUAEscaped)
-	reUpstreamUA := regexp.MustCompile("^\\(Docker-Client/[0-9A-Za-z+]")
-	bMatchUpstreamUA := reUpstreamUA.MatchString(upstreamUA)
-	c.Assert(bMatchUpstreamUA, check.Equals, true, check.Commentf("(Upstream) Docker Client User-Agent malformed"))
-}
-
-func registerUserAgentHandler(reg *testRegistry, result *string) {
-	reg.registerHandler("/v2/", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(404)
-		var ua string
-		for k, v := range r.Header {
-			if k == "User-Agent" {
-				ua = v[0]
-			}
-		}
-		*result = ua
-	})
-}
-
-// TestUserAgentPassThrough verifies that when an image is pulled from
-// a registry, the registry should see a User-Agent string of the form
-// [docker engine UA] UptreamClientSTREAM-CLIENT([client UA])
-func (s *DockerRegistrySuite) TestUserAgentPassThrough(c *check.C) {
-	var (
-		buildUA string
-		pullUA  string
-		pushUA  string
-		loginUA string
-	)
-
-	buildReg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-	registerUserAgentHandler(buildReg, &buildUA)
-	buildRepoName := fmt.Sprintf("%s/busybox", buildReg.hostport)
-
-	pullReg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-	registerUserAgentHandler(pullReg, &pullUA)
-	pullRepoName := fmt.Sprintf("%s/busybox", pullReg.hostport)
-
-	pushReg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-	registerUserAgentHandler(pushReg, &pushUA)
-	pushRepoName := fmt.Sprintf("%s/busybox", pushReg.hostport)
-
-	loginReg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-	registerUserAgentHandler(loginReg, &loginUA)
-
-	err = s.d.Start(
-		"--insecure-registry", buildReg.hostport,
-		"--insecure-registry", pullReg.hostport,
-		"--insecure-registry", pushReg.hostport,
-		"--insecure-registry", loginReg.hostport,
-		"--disable-legacy-registry=true")
-	c.Assert(err, check.IsNil)
-
-	dockerfileName, cleanup1, err := makefile(fmt.Sprintf("FROM %s", buildRepoName))
-	c.Assert(err, check.IsNil, check.Commentf("Unable to create test dockerfile"))
-	defer cleanup1()
-	s.d.Cmd("build", "--file", dockerfileName, ".")
-	regexpCheckUA(c, buildUA)
-
-	s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", loginReg.hostport)
-	regexpCheckUA(c, loginUA)
-
-	s.d.Cmd("pull", pullRepoName)
-	regexpCheckUA(c, pullUA)
-
-	dockerfileName, cleanup2, err := makefile(`FROM scratch
-	ENV foo bar`)
-	c.Assert(err, check.IsNil, check.Commentf("Unable to create test dockerfile"))
-	defer cleanup2()
-	s.d.Cmd("build", "-t", pushRepoName, "--file", dockerfileName, ".")
-
-	s.d.Cmd("push", pushRepoName)
-	regexpCheckUA(c, pushUA)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rename_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rename_test.go
deleted file mode 100644
index 373d614b5e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rename_test.go
+++ /dev/null
@@ -1,138 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestRenameStoppedContainer(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
-	cleanedContainerID := strings.TrimSpace(out)
-	dockerCmd(c, "wait", cleanedContainerID)
-
-	name := inspectField(c, cleanedContainerID, "Name")
-	newName := "new_name" + stringid.GenerateNonCryptoID()
-	dockerCmd(c, "rename", "first_name", newName)
-
-	name = inspectField(c, cleanedContainerID, "Name")
-	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-
-}
-
-func (s *DockerSuite) TestRenameRunningContainer(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
-	newName := "new_name" + stringid.GenerateNonCryptoID()
-	cleanedContainerID := strings.TrimSpace(out)
-	dockerCmd(c, "rename", "first_name", newName)
-
-	name := inspectField(c, cleanedContainerID, "Name")
-	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-}
-
-func (s *DockerSuite) TestRenameRunningContainerAndReuse(c *check.C) {
-	out, _ := runSleepingContainer(c, "--name", "first_name")
-	c.Assert(waitRun("first_name"), check.IsNil)
-
-	newName := "new_name"
-	ContainerID := strings.TrimSpace(out)
-	dockerCmd(c, "rename", "first_name", newName)
-
-	name := inspectField(c, ContainerID, "Name")
-	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container"))
-
-	out, _ = runSleepingContainer(c, "--name", "first_name")
-	c.Assert(waitRun("first_name"), check.IsNil)
-	newContainerID := strings.TrimSpace(out)
-	name = inspectField(c, newContainerID, "Name")
-	c.Assert(name, checker.Equals, "/first_name", check.Commentf("Failed to reuse container name"))
-}
-
-func (s *DockerSuite) TestRenameCheckNames(c *check.C) {
-	dockerCmd(c, "run", "--name", "first_name", "-d", "busybox", "sh")
-
-	newName := "new_name" + stringid.GenerateNonCryptoID()
-	dockerCmd(c, "rename", "first_name", newName)
-
-	name := inspectField(c, newName, "Name")
-	c.Assert(name, checker.Equals, "/"+newName, check.Commentf("Failed to rename container %s", name))
-
-	result := dockerCmdWithResult("inspect", "-f={{.Name}}", "--type=container", "first_name")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		ExitCode: 1,
-		Err:      "No such container: first_name",
-	})
-}
-
-func (s *DockerSuite) TestRenameInvalidName(c *check.C) {
-	runSleepingContainer(c, "--name", "myname")
-
-	out, _, err := dockerCmdWithError("rename", "myname", "new:invalid")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "Invalid container name", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", "myname")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "requires exactly 2 argument(s).", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", "myname", "")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container to invalid name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", "", "newname")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming container with empty name should have failed: %s", out))
-	c.Assert(out, checker.Contains, "may be empty", check.Commentf("%v", err))
-
-	out, _ = dockerCmd(c, "ps", "-a")
-	c.Assert(out, checker.Contains, "myname", check.Commentf("Output of docker ps should have included 'myname': %s", out))
-}
-
-func (s *DockerSuite) TestRenameAnonymousContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerCmd(c, "network", "create", "network1")
-	out, _ := dockerCmd(c, "create", "-it", "--net", "network1", "busybox", "top")
-
-	anonymousContainerID := strings.TrimSpace(out)
-
-	dockerCmd(c, "rename", anonymousContainerID, "container1")
-	dockerCmd(c, "start", "container1")
-
-	count := "-c"
-	if daemonPlatform == "windows" {
-		count = "-n"
-	}
-
-	_, _, err := dockerCmdWithError("run", "--net", "network1", "busybox", "ping", count, "1", "container1")
-	c.Assert(err, check.IsNil, check.Commentf("Embedded DNS lookup fails after renaming anonymous container: %v", err))
-}
-
-func (s *DockerSuite) TestRenameContainerWithSameName(c *check.C) {
-	out, _ := runSleepingContainer(c, "--name", "old")
-	ContainerID := strings.TrimSpace(out)
-
-	out, _, err := dockerCmdWithError("rename", "old", "old")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming a container with the same name should have failed"))
-	c.Assert(out, checker.Contains, "Renaming a container with the same name", check.Commentf("%v", err))
-
-	out, _, err = dockerCmdWithError("rename", ContainerID, "old")
-	c.Assert(err, checker.NotNil, check.Commentf("Renaming a container with the same name should have failed"))
-	c.Assert(out, checker.Contains, "Renaming a container with the same name", check.Commentf("%v", err))
-}
-
-// Test case for #23973
-func (s *DockerSuite) TestRenameContainerWithLinkedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	db1, _ := dockerCmd(c, "run", "--name", "db1", "-d", "busybox", "top")
-	dockerCmd(c, "run", "--name", "app1", "-d", "--link", "db1:/mysql", "busybox", "top")
-	dockerCmd(c, "rename", "app1", "app2")
-	out, _, err := dockerCmdWithError("inspect", "--format={{ .Id }}", "app2/mysql")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, strings.TrimSpace(db1))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_restart_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_restart_test.go
deleted file mode 100644
index 7d585289eb..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_restart_test.go
+++ /dev/null
@@ -1,278 +0,0 @@
-package main
-
-import (
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestRestartStoppedContainer(c *check.C) {
-	dockerCmd(c, "run", "--name=test", "busybox", "echo", "foobar")
-	cleanedContainerID, err := getIDByName("test")
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "logs", cleanedContainerID)
-	c.Assert(out, checker.Equals, "foobar\n")
-
-	dockerCmd(c, "restart", cleanedContainerID)
-
-	// Wait until the container has stopped
-	err = waitInspect(cleanedContainerID, "{{.State.Running}}", "false", 20*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "logs", cleanedContainerID)
-	c.Assert(out, checker.Equals, "foobar\nfoobar\n")
-}
-
-func (s *DockerSuite) TestRestartRunningContainer(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo foobar && sleep 30 && echo 'should not print this'")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	c.Assert(waitRun(cleanedContainerID), checker.IsNil)
-
-	out, _ = dockerCmd(c, "logs", cleanedContainerID)
-	c.Assert(out, checker.Equals, "foobar\n")
-
-	dockerCmd(c, "restart", "-t", "1", cleanedContainerID)
-
-	out, _ = dockerCmd(c, "logs", cleanedContainerID)
-
-	c.Assert(waitRun(cleanedContainerID), checker.IsNil)
-
-	c.Assert(out, checker.Equals, "foobar\nfoobar\n")
-}
-
-// Test that restarting a container with a volume does not create a new volume on restart. Regression test for #819.
-func (s *DockerSuite) TestRestartWithVolumes(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	out, _ := runSleepingContainer(c, "-d", "-v", prefix+slash+"test")
-
-	cleanedContainerID := strings.TrimSpace(out)
-	out, err := inspectFilter(cleanedContainerID, "len .Mounts")
-	c.Assert(err, check.IsNil, check.Commentf("failed to inspect %s: %s", cleanedContainerID, out))
-	out = strings.Trim(out, " \n\r")
-	c.Assert(out, checker.Equals, "1")
-
-	source, err := inspectMountSourceField(cleanedContainerID, prefix+slash+"test")
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "restart", cleanedContainerID)
-
-	out, err = inspectFilter(cleanedContainerID, "len .Mounts")
-	c.Assert(err, check.IsNil, check.Commentf("failed to inspect %s: %s", cleanedContainerID, out))
-	out = strings.Trim(out, " \n\r")
-	c.Assert(out, checker.Equals, "1")
-
-	sourceAfterRestart, err := inspectMountSourceField(cleanedContainerID, prefix+slash+"test")
-	c.Assert(err, checker.IsNil)
-	c.Assert(source, checker.Equals, sourceAfterRestart)
-}
-
-func (s *DockerSuite) TestRestartPolicyNO(c *check.C) {
-	out, _ := dockerCmd(c, "create", "--restart=no", "busybox")
-
-	id := strings.TrimSpace(string(out))
-	name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
-	c.Assert(name, checker.Equals, "no")
-}
-
-func (s *DockerSuite) TestRestartPolicyAlways(c *check.C) {
-	out, _ := dockerCmd(c, "create", "--restart=always", "busybox")
-
-	id := strings.TrimSpace(string(out))
-	name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
-	c.Assert(name, checker.Equals, "always")
-
-	MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-
-	// MaximumRetryCount=0 if the restart policy is always
-	c.Assert(MaximumRetryCount, checker.Equals, "0")
-}
-
-func (s *DockerSuite) TestRestartPolicyOnFailure(c *check.C) {
-	out, _, err := dockerCmdWithError("create", "--restart=on-failure:-1", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "maximum retry count cannot be negative")
-
-	out, _ = dockerCmd(c, "create", "--restart=on-failure:1", "busybox")
-
-	id := strings.TrimSpace(string(out))
-	name := inspectField(c, id, "HostConfig.RestartPolicy.Name")
-	maxRetry := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-
-	c.Assert(name, checker.Equals, "on-failure")
-	c.Assert(maxRetry, checker.Equals, "1")
-
-	out, _ = dockerCmd(c, "create", "--restart=on-failure:0", "busybox")
-
-	id = strings.TrimSpace(string(out))
-	name = inspectField(c, id, "HostConfig.RestartPolicy.Name")
-	maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-
-	c.Assert(name, checker.Equals, "on-failure")
-	c.Assert(maxRetry, checker.Equals, "0")
-
-	out, _ = dockerCmd(c, "create", "--restart=on-failure", "busybox")
-
-	id = strings.TrimSpace(string(out))
-	name = inspectField(c, id, "HostConfig.RestartPolicy.Name")
-	maxRetry = inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-
-	c.Assert(name, checker.Equals, "on-failure")
-	c.Assert(maxRetry, checker.Equals, "0")
-}
-
-// a good container with --restart=on-failure:3
-// MaximumRetryCount!=0; RestartCount=0
-func (s *DockerSuite) TestRestartContainerwithGoodContainer(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "true")
-
-	id := strings.TrimSpace(string(out))
-	err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false false", 30*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	count := inspectField(c, id, "RestartCount")
-	c.Assert(count, checker.Equals, "0")
-
-	MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-	c.Assert(MaximumRetryCount, checker.Equals, "3")
-
-}
-
-func (s *DockerSuite) TestRestartContainerSuccess(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	out, _ := runSleepingContainer(c, "-d", "--restart=always")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	pidStr := inspectField(c, id, "State.Pid")
-
-	pid, err := strconv.Atoi(pidStr)
-	c.Assert(err, check.IsNil)
-
-	p, err := os.FindProcess(pid)
-	c.Assert(err, check.IsNil)
-	c.Assert(p, check.NotNil)
-
-	err = p.Kill()
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestRestartWithPolicyUserDefinedNetwork(c *check.C) {
-	// TODO Windows. This may be portable following HNS integration post TP5.
-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "udNet")
-
-	dockerCmd(c, "run", "-d", "--net=udNet", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	dockerCmd(c, "run", "-d", "--restart=always", "--net=udNet", "--name=second",
-		"--link=first:foo", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping to first and its alias foo must succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-
-	// Now kill the second container and let the restart policy kick in
-	pidStr := inspectField(c, "second", "State.Pid")
-
-	pid, err := strconv.Atoi(pidStr)
-	c.Assert(err, check.IsNil)
-
-	p, err := os.FindProcess(pid)
-	c.Assert(err, check.IsNil)
-	c.Assert(p, check.NotNil)
-
-	err = p.Kill()
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect("second", "{{.RestartCount}}", "1", 5*time.Second)
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect("second", "{{.State.Status}}", "running", 5*time.Second)
-
-	// ping to first and its alias foo must still succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestRestartPolicyAfterRestart(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	out, _ := runSleepingContainer(c, "-d", "--restart=always")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-
-	dockerCmd(c, "restart", id)
-
-	c.Assert(waitRun(id), check.IsNil)
-
-	pidStr := inspectField(c, id, "State.Pid")
-
-	pid, err := strconv.Atoi(pidStr)
-	c.Assert(err, check.IsNil)
-
-	p, err := os.FindProcess(pid)
-	c.Assert(err, check.IsNil)
-	c.Assert(p, check.NotNil)
-
-	err = p.Kill()
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)
-	c.Assert(err, check.IsNil)
-
-	err = waitInspect(id, "{{.State.Status}}", "running", 30*time.Second)
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestRestartContainerwithRestartPolicy(c *check.C) {
-	out1, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "false")
-	out2, _ := dockerCmd(c, "run", "-d", "--restart=always", "busybox", "false")
-
-	id1 := strings.TrimSpace(string(out1))
-	id2 := strings.TrimSpace(string(out2))
-	waitTimeout := 15 * time.Second
-	if daemonPlatform == "windows" {
-		waitTimeout = 150 * time.Second
-	}
-	err := waitInspect(id1, "{{ .State.Restarting }} {{ .State.Running }}", "false false", waitTimeout)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "restart", id1)
-	dockerCmd(c, "restart", id2)
-
-	dockerCmd(c, "stop", id1)
-	dockerCmd(c, "stop", id2)
-	dockerCmd(c, "start", id1)
-	dockerCmd(c, "start", id2)
-}
-
-func (s *DockerSuite) TestRestartAutoRemoveContainer(c *check.C) {
-	out, _ := runSleepingContainer(c, "--rm")
-
-	id := strings.TrimSpace(string(out))
-	dockerCmd(c, "restart", id)
-	err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false true", 15*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	out, _ = dockerCmd(c, "ps")
-	c.Assert(out, checker.Contains, id[:12], check.Commentf("container should be restarted instead of removed: %v", out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rm_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rm_test.go
deleted file mode 100644
index 0186c56741..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rm_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestRmContainerWithRemovedVolume(c *check.C) {
-	testRequires(c, SameHostDaemon)
-
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	tempDir, err := ioutil.TempDir("", "test-rm-container-with-removed-volume-")
-	if err != nil {
-		c.Fatalf("failed to create temporary directory: %s", tempDir)
-	}
-	defer os.RemoveAll(tempDir)
-
-	dockerCmd(c, "run", "--name", "losemyvolumes", "-v", tempDir+":"+prefix+slash+"test", "busybox", "true")
-
-	err = os.RemoveAll(tempDir)
-	c.Assert(err, check.IsNil)
-
-	dockerCmd(c, "rm", "-v", "losemyvolumes")
-}
-
-func (s *DockerSuite) TestRmContainerWithVolume(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	dockerCmd(c, "run", "--name", "foo", "-v", prefix+slash+"srv", "busybox", "true")
-
-	dockerCmd(c, "rm", "-v", "foo")
-}
-
-func (s *DockerSuite) TestRmContainerRunning(c *check.C) {
-	createRunningContainer(c, "foo")
-
-	_, _, err := dockerCmdWithError("rm", "foo")
-	c.Assert(err, checker.NotNil, check.Commentf("Expected error, can't rm a running container"))
-}
-
-func (s *DockerSuite) TestRmContainerForceRemoveRunning(c *check.C) {
-	createRunningContainer(c, "foo")
-
-	// Stop then remove with -s
-	dockerCmd(c, "rm", "-f", "foo")
-}
-
-func (s *DockerSuite) TestRmContainerOrphaning(c *check.C) {
-	dockerfile1 := `FROM busybox:latest
-	ENTRYPOINT ["true"]`
-	img := "test-container-orphaning"
-	dockerfile2 := `FROM busybox:latest
-	ENTRYPOINT ["true"]
-	MAINTAINER Integration Tests`
-
-	// build first dockerfile
-	img1, err := buildImage(img, dockerfile1, true)
-	c.Assert(err, check.IsNil, check.Commentf("Could not build image %s", img))
-	// run container on first image
-	dockerCmd(c, "run", img)
-	// rebuild dockerfile with a small addition at the end
-	_, err = buildImage(img, dockerfile2, true)
-	c.Assert(err, check.IsNil, check.Commentf("Could not rebuild image %s", img))
-	// try to remove the image, should not error out.
-	out, _, err := dockerCmdWithError("rmi", img)
-	c.Assert(err, check.IsNil, check.Commentf("Expected to removing the image, but failed: %s", out))
-
-	// check if we deleted the first image
-	out, _ = dockerCmd(c, "images", "-q", "--no-trunc")
-	c.Assert(out, checker.Contains, img1, check.Commentf("Orphaned container (could not find %q in docker images): %s", img1, out))
-
-}
-
-func (s *DockerSuite) TestRmInvalidContainer(c *check.C) {
-	out, _, err := dockerCmdWithError("rm", "unknown")
-	c.Assert(err, checker.NotNil, check.Commentf("Expected error on rm unknown container, got none"))
-	c.Assert(out, checker.Contains, "No such container")
-}
-
-func createRunningContainer(c *check.C, name string) {
-	runSleepingContainer(c, "-dt", "--name", name)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rmi_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rmi_test.go
deleted file mode 100644
index cb16d9d88c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_rmi_test.go
+++ /dev/null
@@ -1,352 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestRmiWithContainerFails(c *check.C) {
-	errSubstr := "is using it"
-
-	// create a container
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-
-	cleanedContainerID := strings.TrimSpace(out)
-
-	// try to delete the image
-	out, _, err := dockerCmdWithError("rmi", "busybox")
-	// Container is using image, should not be able to rmi
-	c.Assert(err, checker.NotNil)
-	// Container is using image, error message should contain errSubstr
-	c.Assert(out, checker.Contains, errSubstr, check.Commentf("Container: %q", cleanedContainerID))
-
-	// make sure it didn't delete the busybox name
-	images, _ := dockerCmd(c, "images")
-	// The name 'busybox' should not have been removed from images
-	c.Assert(images, checker.Contains, "busybox")
-}
-
-func (s *DockerSuite) TestRmiTag(c *check.C) {
-	imagesBefore, _ := dockerCmd(c, "images", "-a")
-	dockerCmd(c, "tag", "busybox", "utest:tag1")
-	dockerCmd(c, "tag", "busybox", "utest/docker:tag2")
-	dockerCmd(c, "tag", "busybox", "utest:5000/docker:tag3")
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n")+3, check.Commentf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))
-	}
-	dockerCmd(c, "rmi", "utest/docker:tag2")
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n")+2, check.Commentf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))
-	}
-	dockerCmd(c, "rmi", "utest:5000/docker:tag3")
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n")+1, check.Commentf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))
-
-	}
-	dockerCmd(c, "rmi", "utest:tag1")
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n"), check.Commentf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))
-
-	}
-}
-
-func (s *DockerSuite) TestRmiImgIDMultipleTag(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir '/busybox-one'")
-
-	containerID := strings.TrimSpace(out)
-
-	// Wait for it to exit as cannot commit a running container on Windows, and
-	// it will take a few seconds to exit
-	if daemonPlatform == "windows" {
-		err := waitExited(containerID, 60*time.Second)
-		c.Assert(err, check.IsNil)
-	}
-
-	dockerCmd(c, "commit", containerID, "busybox-one")
-
-	imagesBefore, _ := dockerCmd(c, "images", "-a")
-	dockerCmd(c, "tag", "busybox-one", "busybox-one:tag1")
-	dockerCmd(c, "tag", "busybox-one", "busybox-one:tag2")
-
-	imagesAfter, _ := dockerCmd(c, "images", "-a")
-	// tag busybox to create 2 more images with same imageID
-	c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n")+2, check.Commentf("docker images shows: %q\n", imagesAfter))
-
-	imgID := inspectField(c, "busybox-one:tag1", "Id")
-
-	// run a container with the image
-	out, _ = runSleepingContainerInImage(c, "busybox-one")
-
-	containerID = strings.TrimSpace(out)
-
-	// first checkout without force it fails
-	out, _, err := dockerCmdWithError("rmi", imgID)
-	expected := fmt.Sprintf("conflict: unable to delete %s (cannot be forced) - image is being used by running container %s", stringid.TruncateID(imgID), stringid.TruncateID(containerID))
-	// rmi tagged in multiple repos should have failed without force
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, expected)
-
-	dockerCmd(c, "stop", containerID)
-	dockerCmd(c, "rmi", "-f", imgID)
-
-	imagesAfter, _ = dockerCmd(c, "images", "-a")
-	// rmi -f failed, image still exists
-	c.Assert(imagesAfter, checker.Not(checker.Contains), imgID[:12], check.Commentf("ImageID:%q; ImagesAfter: %q", imgID, imagesAfter))
-}
-
-func (s *DockerSuite) TestRmiImgIDForce(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "mkdir '/busybox-test'")
-
-	containerID := strings.TrimSpace(out)
-
-	// Wait for it to exit as cannot commit a running container on Windows, and
-	// it will take a few seconds to exit
-	if daemonPlatform == "windows" {
-		err := waitExited(containerID, 60*time.Second)
-		c.Assert(err, check.IsNil)
-	}
-
-	dockerCmd(c, "commit", containerID, "busybox-test")
-
-	imagesBefore, _ := dockerCmd(c, "images", "-a")
-	dockerCmd(c, "tag", "busybox-test", "utest:tag1")
-	dockerCmd(c, "tag", "busybox-test", "utest:tag2")
-	dockerCmd(c, "tag", "busybox-test", "utest/docker:tag3")
-	dockerCmd(c, "tag", "busybox-test", "utest:5000/docker:tag4")
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		c.Assert(strings.Count(imagesAfter, "\n"), checker.Equals, strings.Count(imagesBefore, "\n")+4, check.Commentf("before: %q\n\nafter: %q\n", imagesBefore, imagesAfter))
-	}
-	imgID := inspectField(c, "busybox-test", "Id")
-
-	// first checkout without force it fails
-	out, _, err := dockerCmdWithError("rmi", imgID)
-	// rmi tagged in multiple repos should have failed without force
-	c.Assert(err, checker.NotNil)
-	// rmi tagged in multiple repos should have failed without force
-	c.Assert(out, checker.Contains, "(must be forced) - image is referenced in multiple repositories", check.Commentf("out: %s; err: %v;", out, err))
-
-	dockerCmd(c, "rmi", "-f", imgID)
-	{
-		imagesAfter, _ := dockerCmd(c, "images", "-a")
-		// rmi failed, image still exists
-		c.Assert(imagesAfter, checker.Not(checker.Contains), imgID[:12])
-	}
-}
-
-// See https://github.com/docker/docker/issues/14116
-func (s *DockerSuite) TestRmiImageIDForceWithRunningContainersAndMultipleTags(c *check.C) {
-	dockerfile := "FROM busybox\nRUN echo test 14116\n"
-	imgID, err := buildImage("test-14116", dockerfile, false)
-	c.Assert(err, checker.IsNil)
-
-	newTag := "newtag"
-	dockerCmd(c, "tag", imgID, newTag)
-	runSleepingContainerInImage(c, imgID)
-
-	out, _, err := dockerCmdWithError("rmi", "-f", imgID)
-	// rmi -f should not delete image with running containers
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "(cannot be forced) - image is being used by running container")
-}
-
-func (s *DockerSuite) TestRmiTagWithExistingContainers(c *check.C) {
-	container := "test-delete-tag"
-	newtag := "busybox:newtag"
-	bb := "busybox:latest"
-	dockerCmd(c, "tag", bb, newtag)
-
-	dockerCmd(c, "run", "--name", container, bb, "/bin/true")
-
-	out, _ := dockerCmd(c, "rmi", newtag)
-	c.Assert(strings.Count(out, "Untagged: "), checker.Equals, 1)
-}
-
-func (s *DockerSuite) TestRmiForceWithExistingContainers(c *check.C) {
-	image := "busybox-clone"
-
-	cmd := exec.Command(dockerBinary, "build", "--no-cache", "-t", image, "-")
-	cmd.Stdin = strings.NewReader(`FROM busybox
-MAINTAINER foo`)
-
-	out, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil, check.Commentf("Could not build %s: %s", image, out))
-
-	dockerCmd(c, "run", "--name", "test-force-rmi", image, "/bin/true")
-
-	dockerCmd(c, "rmi", "-f", image)
-}
-
-func (s *DockerSuite) TestRmiWithMultipleRepositories(c *check.C) {
-	newRepo := "127.0.0.1:5000/busybox"
-	oldRepo := "busybox"
-	newTag := "busybox:test"
-	dockerCmd(c, "tag", oldRepo, newRepo)
-
-	dockerCmd(c, "run", "--name", "test", oldRepo, "touch", "/abcd")
-
-	dockerCmd(c, "commit", "test", newTag)
-
-	out, _ := dockerCmd(c, "rmi", newTag)
-	c.Assert(out, checker.Contains, "Untagged: "+newTag)
-}
-
-func (s *DockerSuite) TestRmiForceWithMultipleRepositories(c *check.C) {
-	imageName := "rmiimage"
-	tag1 := imageName + ":tag1"
-	tag2 := imageName + ":tag2"
-
-	_, err := buildImage(tag1,
-		`FROM busybox
-		MAINTAINER "docker"`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "tag", tag1, tag2)
-
-	out, _ := dockerCmd(c, "rmi", "-f", tag2)
-	c.Assert(out, checker.Contains, "Untagged: "+tag2)
-	c.Assert(out, checker.Not(checker.Contains), "Untagged: "+tag1)
-
-	// Check built image still exists
-	images, _ := dockerCmd(c, "images", "-a")
-	c.Assert(images, checker.Contains, imageName, check.Commentf("Built image missing %q; Images: %q", imageName, images))
-}
-
-func (s *DockerSuite) TestRmiBlank(c *check.C) {
-	out, _, err := dockerCmdWithError("rmi", " ")
-	// Should have failed to delete ' ' image
-	c.Assert(err, checker.NotNil)
-	// Wrong error message generated
-	c.Assert(out, checker.Not(checker.Contains), "no such id", check.Commentf("out: %s", out))
-	// Expected error message not generated
-	c.Assert(out, checker.Contains, "image name cannot be blank", check.Commentf("out: %s", out))
-}
-
-func (s *DockerSuite) TestRmiContainerImageNotFound(c *check.C) {
-	// Build 2 images for testing.
-	imageNames := []string{"test1", "test2"}
-	imageIds := make([]string, 2)
-	for i, name := range imageNames {
-		dockerfile := fmt.Sprintf("FROM busybox\nMAINTAINER %s\nRUN echo %s\n", name, name)
-		id, err := buildImage(name, dockerfile, false)
-		c.Assert(err, checker.IsNil)
-		imageIds[i] = id
-	}
-
-	// Create a long-running container.
-	runSleepingContainerInImage(c, imageNames[0])
-
-	// Create a stopped container, and then force remove its image.
-	dockerCmd(c, "run", imageNames[1], "true")
-	dockerCmd(c, "rmi", "-f", imageIds[1])
-
-	// Try to remove the image of the running container and see if it fails as expected.
-	out, _, err := dockerCmdWithError("rmi", "-f", imageIds[0])
-	// The image of the running container should not be removed.
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "image is being used by running container", check.Commentf("out: %s", out))
-}
-
-// #13422
-func (s *DockerSuite) TestRmiUntagHistoryLayer(c *check.C) {
-	image := "tmp1"
-	// Build an image for testing.
-	dockerfile := `FROM busybox
-MAINTAINER foo
-RUN echo 0 #layer0
-RUN echo 1 #layer1
-RUN echo 2 #layer2
-`
-	_, err := buildImage(image, dockerfile, false)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "history", "-q", image)
-	ids := strings.Split(out, "\n")
-	idToTag := ids[2]
-
-	// Tag layer0 to "tmp2".
-	newTag := "tmp2"
-	dockerCmd(c, "tag", idToTag, newTag)
-	// Create a container based on "tmp1".
-	dockerCmd(c, "run", "-d", image, "true")
-
-	// See if the "tmp2" can be untagged.
-	out, _ = dockerCmd(c, "rmi", newTag)
-	// Expected 1 untagged entry
-	c.Assert(strings.Count(out, "Untagged: "), checker.Equals, 1, check.Commentf("out: %s", out))
-
-	// Now let's add the tag again and create a container based on it.
-	dockerCmd(c, "tag", idToTag, newTag)
-	out, _ = dockerCmd(c, "run", "-d", newTag, "true")
-	cid := strings.TrimSpace(out)
-
-	// At this point we have 2 containers, one based on layer2 and another based on layer0.
-	// Try to untag "tmp2" without the -f flag.
-	out, _, err = dockerCmdWithError("rmi", newTag)
-	// should not be untagged without the -f flag
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, cid[:12])
-	c.Assert(out, checker.Contains, "(must force)")
-
-	// Add the -f flag and test again.
-	out, _ = dockerCmd(c, "rmi", "-f", newTag)
-	// should be allowed to untag with the -f flag
-	c.Assert(out, checker.Contains, fmt.Sprintf("Untagged: %s:latest", newTag))
-}
-
-func (*DockerSuite) TestRmiParentImageFail(c *check.C) {
-	_, err := buildImage("test", `
-	FROM busybox
-	RUN echo hello`, false)
-	c.Assert(err, checker.IsNil)
-
-	id := inspectField(c, "busybox", "ID")
-	out, _, err := dockerCmdWithError("rmi", id)
-	c.Assert(err, check.NotNil)
-	if !strings.Contains(out, "image has dependent child images") {
-		c.Fatalf("rmi should have failed because it's a parent image, got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRmiWithParentInUse(c *check.C) {
-	out, _ := dockerCmd(c, "create", "busybox")
-	cID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "commit", cID)
-	imageID := strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "create", imageID)
-	cID = strings.TrimSpace(out)
-
-	out, _ = dockerCmd(c, "commit", cID)
-	imageID = strings.TrimSpace(out)
-
-	dockerCmd(c, "rmi", imageID)
-}
-
-// #18873
-func (s *DockerSuite) TestRmiByIDHardConflict(c *check.C) {
-	dockerCmd(c, "create", "busybox")
-
-	imgID := inspectField(c, "busybox:latest", "Id")
-
-	_, _, err := dockerCmdWithError("rmi", imgID[:12])
-	c.Assert(err, checker.NotNil)
-
-	// check that tag was not removed
-	imgID2 := inspectField(c, "busybox:latest", "Id")
-	c.Assert(imgID, checker.Equals, imgID2)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_test.go
deleted file mode 100644
index 9462aef800..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_test.go
+++ /dev/null
@@ -1,4689 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/go-connections/nat"
-	"github.com/docker/libnetwork/resolvconf"
-	"github.com/docker/libnetwork/types"
-	"github.com/go-check/check"
-	libcontainerUser "github.com/opencontainers/runc/libcontainer/user"
-)
-
-// "test123" should be printed by docker run
-func (s *DockerSuite) TestRunEchoStdout(c *check.C) {
-	out, _ := dockerCmd(c, "run", "busybox", "echo", "test123")
-	if out != "test123\n" {
-		c.Fatalf("container should've printed 'test123', got '%s'", out)
-	}
-}
-
-// "test" should be printed
-func (s *DockerSuite) TestRunEchoNamedContainer(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--name", "testfoonamedcontainer", "busybox", "echo", "test")
-	if out != "test\n" {
-		c.Errorf("container should've printed 'test'")
-	}
-}
-
-// docker run should not leak file descriptors. This test relies on Unix
-// specific functionality and cannot run on Windows.
-func (s *DockerSuite) TestRunLeakyFileDescriptors(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "busybox", "ls", "-C", "/proc/self/fd")
-
-	// normally, we should only get 0, 1, and 2, but 3 gets created by "ls" when it does "opendir" on the "fd" directory
-	if out != "0  1  2  3\n" {
-		c.Errorf("container should've printed '0  1  2  3', not: %s", out)
-	}
-}
-
-// it should be possible to lookup Google DNS
-// this will fail when Internet access is unavailable
-func (s *DockerSuite) TestRunLookupGoogleDNS(c *check.C) {
-	testRequires(c, Network, NotArm)
-	if daemonPlatform == "windows" {
-		// nslookup isn't present in Windows busybox. Is built-in. Further,
-		// nslookup isn't present in nanoserver. Hence just use PowerShell...
-		dockerCmd(c, "run", WindowsBaseImage, "powershell", "Resolve-DNSName", "google.com")
-	} else {
-		dockerCmd(c, "run", DefaultImage, "nslookup", "google.com")
-	}
-
-}
-
-// the exit code should be 0
-func (s *DockerSuite) TestRunExitCodeZero(c *check.C) {
-	dockerCmd(c, "run", "busybox", "true")
-}
-
-// the exit code should be 1
-func (s *DockerSuite) TestRunExitCodeOne(c *check.C) {
-	_, exitCode, err := dockerCmdWithError("run", "busybox", "false")
-	c.Assert(err, checker.NotNil)
-	c.Assert(exitCode, checker.Equals, 1)
-}
-
-// it should be possible to pipe in data via stdin to a process running in a container
-func (s *DockerSuite) TestRunStdinPipe(c *check.C) {
-	// TODO Windows: This needs some work to make compatible.
-	testRequires(c, DaemonIsLinux)
-	runCmd := exec.Command(dockerBinary, "run", "-i", "-a", "stdin", "busybox", "cat")
-	runCmd.Stdin = strings.NewReader("blahblah")
-	out, _, _, err := runCommandWithStdoutStderr(runCmd)
-	if err != nil {
-		c.Fatalf("failed to run container: %v, output: %q", err, out)
-	}
-
-	out = strings.TrimSpace(out)
-	dockerCmd(c, "wait", out)
-
-	logsOut, _ := dockerCmd(c, "logs", out)
-
-	containerLogs := strings.TrimSpace(logsOut)
-	if containerLogs != "blahblah" {
-		c.Errorf("logs didn't print the container's logs %s", containerLogs)
-	}
-
-	dockerCmd(c, "rm", out)
-}
-
-// the container's ID should be printed when starting a container in detached mode
-func (s *DockerSuite) TestRunDetachedContainerIDPrinting(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "true")
-
-	out = strings.TrimSpace(out)
-	dockerCmd(c, "wait", out)
-
-	rmOut, _ := dockerCmd(c, "rm", out)
-
-	rmOut = strings.TrimSpace(rmOut)
-	if rmOut != out {
-		c.Errorf("rm didn't print the container ID %s %s", out, rmOut)
-	}
-}
-
-// the working directory should be set correctly
-func (s *DockerSuite) TestRunWorkingDirectory(c *check.C) {
-	dir := "/root"
-	image := "busybox"
-	if daemonPlatform == "windows" {
-		dir = `C:/Windows`
-	}
-
-	// First with -w
-	out, _ := dockerCmd(c, "run", "-w", dir, image, "pwd")
-	out = strings.TrimSpace(out)
-	if out != dir {
-		c.Errorf("-w failed to set working directory")
-	}
-
-	// Then with --workdir
-	out, _ = dockerCmd(c, "run", "--workdir", dir, image, "pwd")
-	out = strings.TrimSpace(out)
-	if out != dir {
-		c.Errorf("--workdir failed to set working directory")
-	}
-}
-
-// pinging Google's DNS resolver should fail when we disable the networking
-func (s *DockerSuite) TestRunWithoutNetworking(c *check.C) {
-	count := "-c"
-	image := "busybox"
-	if daemonPlatform == "windows" {
-		count = "-n"
-		image = WindowsBaseImage
-	}
-
-	// First using the long form --net
-	out, exitCode, err := dockerCmdWithError("run", "--net=none", image, "ping", count, "1", "8.8.8.8")
-	if err != nil && exitCode != 1 {
-		c.Fatal(out, err)
-	}
-	if exitCode != 1 {
-		c.Errorf("--net=none should've disabled the network; the container shouldn't have been able to ping 8.8.8.8")
-	}
-}
-
-//test --link use container name to link target
-func (s *DockerSuite) TestRunLinksContainerWithContainerName(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as the networking
-	// settings are not populated back yet on inspect.
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-i", "-t", "-d", "--name", "parent", "busybox")
-
-	ip := inspectField(c, "parent", "NetworkSettings.Networks.bridge.IPAddress")
-
-	out, _ := dockerCmd(c, "run", "--link", "parent:test", "busybox", "/bin/cat", "/etc/hosts")
-	if !strings.Contains(out, ip+"	test") {
-		c.Fatalf("use a container name to link target failed")
-	}
-}
-
-//test --link use container id to link target
-func (s *DockerSuite) TestRunLinksContainerWithContainerID(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as the networking
-	// settings are not populated back yet on inspect.
-	testRequires(c, DaemonIsLinux)
-	cID, _ := dockerCmd(c, "run", "-i", "-t", "-d", "busybox")
-
-	cID = strings.TrimSpace(cID)
-	ip := inspectField(c, cID, "NetworkSettings.Networks.bridge.IPAddress")
-
-	out, _ := dockerCmd(c, "run", "--link", cID+":test", "busybox", "/bin/cat", "/etc/hosts")
-	if !strings.Contains(out, ip+"	test") {
-		c.Fatalf("use a container id to link target failed")
-	}
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkLinks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "udlinkNet")
-
-	dockerCmd(c, "run", "-d", "--net=udlinkNet", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// run a container in user-defined network udlinkNet with a link for an existing container
-	// and a link for a container that doesn't exist
-	dockerCmd(c, "run", "-d", "--net=udlinkNet", "--name=second", "--link=first:foo",
-		"--link=third:bar", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping to first and its alias foo must succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-
-	// ping to third and its alias must fail
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "third")
-	c.Assert(err, check.NotNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "bar")
-	c.Assert(err, check.NotNil)
-
-	// start third container now
-	dockerCmd(c, "run", "-d", "--net=udlinkNet", "--name=third", "busybox", "top")
-	c.Assert(waitRun("third"), check.IsNil)
-
-	// ping to third and its alias must succeed now
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "third")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "bar")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkLinksWithRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "udlinkNet")
-
-	dockerCmd(c, "run", "-d", "--net=udlinkNet", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	dockerCmd(c, "run", "-d", "--net=udlinkNet", "--name=second", "--link=first:foo",
-		"busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping to first and its alias foo must succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-
-	// Restart first container
-	dockerCmd(c, "restart", "first")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// ping to first and its alias foo must still succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-
-	// Restart second container
-	dockerCmd(c, "restart", "second")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// ping to first and its alias foo must still succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestRunWithNetAliasOnDefaultNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-
-	defaults := []string{"bridge", "host", "none"}
-	for _, net := range defaults {
-		out, _, err := dockerCmdWithError("run", "-d", "--net", net, "--net-alias", "alias_"+net, "busybox", "top")
-		c.Assert(err, checker.NotNil)
-		c.Assert(out, checker.Contains, runconfig.ErrUnsupportedNetworkAndAlias.Error())
-	}
-}
-
-func (s *DockerSuite) TestUserDefinedNetworkAlias(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "net1")
-
-	cid1, _ := dockerCmd(c, "run", "-d", "--net=net1", "--name=first", "--net-alias=foo1", "--net-alias=foo2", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// Check if default short-id alias is added automatically
-	id := strings.TrimSpace(cid1)
-	aliases := inspectField(c, id, "NetworkSettings.Networks.net1.Aliases")
-	c.Assert(aliases, checker.Contains, stringid.TruncateID(id))
-
-	cid2, _ := dockerCmd(c, "run", "-d", "--net=net1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// Check if default short-id alias is added automatically
-	id = strings.TrimSpace(cid2)
-	aliases = inspectField(c, id, "NetworkSettings.Networks.net1.Aliases")
-	c.Assert(aliases, checker.Contains, stringid.TruncateID(id))
-
-	// ping to first and its network-scoped aliases
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo1")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo2")
-	c.Assert(err, check.IsNil)
-	// ping first container's short-id alias
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1))
-	c.Assert(err, check.IsNil)
-
-	// Restart first container
-	dockerCmd(c, "restart", "first")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// ping to first and its network-scoped aliases must succeed
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo1")
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "foo2")
-	c.Assert(err, check.IsNil)
-	// ping first container's short-id alias
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", stringid.TruncateID(cid1))
-	c.Assert(err, check.IsNil)
-}
-
-// Issue 9677.
-func (s *DockerSuite) TestRunWithDaemonFlags(c *check.C) {
-	out, _, err := dockerCmdWithError("--exec-opt", "foo=bar", "run", "-i", "busybox", "true")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "unknown flag: --exec-opt")
-}
-
-// Regression test for #4979
-func (s *DockerSuite) TestRunWithVolumesFromExited(c *check.C) {
-
-	var (
-		out      string
-		exitCode int
-	)
-
-	// Create a file in a volume
-	if daemonPlatform == "windows" {
-		out, exitCode = dockerCmd(c, "run", "--name", "test-data", "--volume", `c:\some\dir`, WindowsBaseImage, "cmd", "/c", `echo hello > c:\some\dir\file`)
-	} else {
-		out, exitCode = dockerCmd(c, "run", "--name", "test-data", "--volume", "/some/dir", "busybox", "touch", "/some/dir/file")
-	}
-	if exitCode != 0 {
-		c.Fatal("1", out, exitCode)
-	}
-
-	// Read the file from another container using --volumes-from to access the volume in the second container
-	if daemonPlatform == "windows" {
-		out, exitCode = dockerCmd(c, "run", "--volumes-from", "test-data", WindowsBaseImage, "cmd", "/c", `type c:\some\dir\file`)
-	} else {
-		out, exitCode = dockerCmd(c, "run", "--volumes-from", "test-data", "busybox", "cat", "/some/dir/file")
-	}
-	if exitCode != 0 {
-		c.Fatal("2", out, exitCode)
-	}
-}
-
-// Volume path is a symlink which also exists on the host, and the host side is a file not a dir
-// But the volume call is just a normal volume, not a bind mount
-func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir(c *check.C) {
-	var (
-		dockerFile    string
-		containerPath string
-		cmd           string
-	)
-	// TODO Windows (Post TP5): This test cannot run on a Windows daemon as
-	// Windows does not support symlinks inside a volume path
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-	name := "test-volume-symlink"
-
-	dir, err := ioutil.TempDir("", name)
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	// In the case of Windows to Windows CI, if the machine is setup so that
-	// the temp directory is not the C: drive, this test is invalid and will
-	// not work.
-	if daemonPlatform == "windows" && strings.ToLower(dir[:1]) != "c" {
-		c.Skip("Requires TEMP to point to C: drive")
-	}
-
-	f, err := os.OpenFile(filepath.Join(dir, "test"), os.O_CREATE, 0700)
-	if err != nil {
-		c.Fatal(err)
-	}
-	f.Close()
-
-	if daemonPlatform == "windows" {
-		dockerFile = fmt.Sprintf("FROM %s\nRUN mkdir %s\nRUN mklink /D c:\\test %s", WindowsBaseImage, dir, dir)
-		containerPath = `c:\test\test`
-		cmd = "tasklist"
-	} else {
-		dockerFile = fmt.Sprintf("FROM busybox\nRUN mkdir -p %s\nRUN ln -s %s /test", dir, dir)
-		containerPath = "/test/test"
-		cmd = "true"
-	}
-	if _, err := buildImage(name, dockerFile, false); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-v", containerPath, name, cmd)
-}
-
-// Volume path is a symlink in the container
-func (s *DockerSuite) TestRunCreateVolumesInSymlinkDir2(c *check.C) {
-	var (
-		dockerFile    string
-		containerPath string
-		cmd           string
-	)
-	// TODO Windows (Post TP5): This test cannot run on a Windows daemon as
-	// Windows does not support symlinks inside a volume path
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-	name := "test-volume-symlink2"
-
-	if daemonPlatform == "windows" {
-		dockerFile = fmt.Sprintf("FROM %s\nRUN mkdir c:\\%s\nRUN mklink /D c:\\test c:\\%s", WindowsBaseImage, name, name)
-		containerPath = `c:\test\test`
-		cmd = "tasklist"
-	} else {
-		dockerFile = fmt.Sprintf("FROM busybox\nRUN mkdir -p /%s\nRUN ln -s /%s /test", name, name)
-		containerPath = "/test/test"
-		cmd = "true"
-	}
-	if _, err := buildImage(name, dockerFile, false); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-v", containerPath, name, cmd)
-}
-
-func (s *DockerSuite) TestRunVolumesMountedAsReadonly(c *check.C) {
-	// TODO Windows: Temporary check - remove once TP5 support is dropped
-	if daemonPlatform == "windows" && windowsDaemonKV < 14350 {
-		c.Skip("Needs later Windows build for RO volumes")
-	}
-	if _, code, err := dockerCmdWithError("run", "-v", "/test:/test:ro", "busybox", "touch", "/test/somefile"); err == nil || code == 0 {
-		c.Fatalf("run should fail because volume is ro: exit code %d", code)
-	}
-}
-
-func (s *DockerSuite) TestRunVolumesFromInReadonlyModeFails(c *check.C) {
-	// TODO Windows: Temporary check - remove once TP5 support is dropped
-	if daemonPlatform == "windows" && windowsDaemonKV < 14350 {
-		c.Skip("Needs later Windows build for RO volumes")
-	}
-	var (
-		volumeDir string
-		fileInVol string
-	)
-	if daemonPlatform == "windows" {
-		volumeDir = `c:/test` // Forward-slash as using busybox
-		fileInVol = `c:/test/file`
-	} else {
-		testRequires(c, DaemonIsLinux)
-		volumeDir = "/test"
-		fileInVol = `/test/file`
-	}
-	dockerCmd(c, "run", "--name", "parent", "-v", volumeDir, "busybox", "true")
-
-	if _, code, err := dockerCmdWithError("run", "--volumes-from", "parent:ro", "busybox", "touch", fileInVol); err == nil || code == 0 {
-		c.Fatalf("run should fail because volume is ro: exit code %d", code)
-	}
-}
-
-// Regression test for #1201
-func (s *DockerSuite) TestRunVolumesFromInReadWriteMode(c *check.C) {
-	var (
-		volumeDir string
-		fileInVol string
-	)
-	if daemonPlatform == "windows" {
-		volumeDir = `c:/test` // Forward-slash as using busybox
-		fileInVol = `c:/test/file`
-	} else {
-		volumeDir = "/test"
-		fileInVol = "/test/file"
-	}
-
-	dockerCmd(c, "run", "--name", "parent", "-v", volumeDir, "busybox", "true")
-	dockerCmd(c, "run", "--volumes-from", "parent:rw", "busybox", "touch", fileInVol)
-
-	if out, _, err := dockerCmdWithError("run", "--volumes-from", "parent:bar", "busybox", "touch", fileInVol); err == nil || !strings.Contains(out, `invalid mode: bar`) {
-		c.Fatalf("running --volumes-from parent:bar should have failed with invalid mode: %q", out)
-	}
-
-	dockerCmd(c, "run", "--volumes-from", "parent", "busybox", "touch", fileInVol)
-}
-
-func (s *DockerSuite) TestVolumesFromGetsProperMode(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	hostpath := randomTmpDirPath("test", daemonPlatform)
-	if err := os.MkdirAll(hostpath, 0755); err != nil {
-		c.Fatalf("Failed to create %s: %q", hostpath, err)
-	}
-	defer os.RemoveAll(hostpath)
-
-	// TODO Windows: Temporary check - remove once TP5 support is dropped
-	if daemonPlatform == "windows" && windowsDaemonKV < 14350 {
-		c.Skip("Needs later Windows build for RO volumes")
-	}
-	dockerCmd(c, "run", "--name", "parent", "-v", hostpath+":"+prefix+slash+"test:ro", "busybox", "true")
-
-	// Expect this "rw" mode to be be ignored since the inherited volume is "ro"
-	if _, _, err := dockerCmdWithError("run", "--volumes-from", "parent:rw", "busybox", "touch", prefix+slash+"test"+slash+"file"); err == nil {
-		c.Fatal("Expected volumes-from to inherit read-only volume even when passing in `rw`")
-	}
-
-	dockerCmd(c, "run", "--name", "parent2", "-v", hostpath+":"+prefix+slash+"test:ro", "busybox", "true")
-
-	// Expect this to be read-only since both are "ro"
-	if _, _, err := dockerCmdWithError("run", "--volumes-from", "parent2:ro", "busybox", "touch", prefix+slash+"test"+slash+"file"); err == nil {
-		c.Fatal("Expected volumes-from to inherit read-only volume even when passing in `ro`")
-	}
-}
-
-// Test for GH#10618
-func (s *DockerSuite) TestRunNoDupVolumes(c *check.C) {
-	path1 := randomTmpDirPath("test1", daemonPlatform)
-	path2 := randomTmpDirPath("test2", daemonPlatform)
-
-	someplace := ":/someplace"
-	if daemonPlatform == "windows" {
-		// Windows requires that the source directory exists before calling HCS
-		testRequires(c, SameHostDaemon)
-		someplace = `:c:\someplace`
-		if err := os.MkdirAll(path1, 0755); err != nil {
-			c.Fatalf("Failed to create %s: %q", path1, err)
-		}
-		defer os.RemoveAll(path1)
-		if err := os.MkdirAll(path2, 0755); err != nil {
-			c.Fatalf("Failed to create %s: %q", path1, err)
-		}
-		defer os.RemoveAll(path2)
-	}
-	mountstr1 := path1 + someplace
-	mountstr2 := path2 + someplace
-
-	if out, _, err := dockerCmdWithError("run", "-v", mountstr1, "-v", mountstr2, "busybox", "true"); err == nil {
-		c.Fatal("Expected error about duplicate mount definitions")
-	} else {
-		if !strings.Contains(out, "Duplicate mount point") {
-			c.Fatalf("Expected 'duplicate mount point' error, got %v", out)
-		}
-	}
-
-	// Test for https://github.com/docker/docker/issues/22093
-	volumename1 := "test1"
-	volumename2 := "test2"
-	volume1 := volumename1 + someplace
-	volume2 := volumename2 + someplace
-	if out, _, err := dockerCmdWithError("run", "-v", volume1, "-v", volume2, "busybox", "true"); err == nil {
-		c.Fatal("Expected error about duplicate mount definitions")
-	} else {
-		if !strings.Contains(out, "Duplicate mount point") {
-			c.Fatalf("Expected 'duplicate mount point' error, got %v", out)
-		}
-	}
-	// create failed should have create volume volumename1 or volumename2
-	// we should remove volumename2 or volumename2 successfully
-	out, _ := dockerCmd(c, "volume", "ls")
-	if strings.Contains(out, volumename1) {
-		dockerCmd(c, "volume", "rm", volumename1)
-	} else {
-		dockerCmd(c, "volume", "rm", volumename2)
-	}
-}
-
-// Test for #1351
-func (s *DockerSuite) TestRunApplyVolumesFromBeforeVolumes(c *check.C) {
-	prefix := ""
-	if daemonPlatform == "windows" {
-		prefix = `c:`
-	}
-	dockerCmd(c, "run", "--name", "parent", "-v", prefix+"/test", "busybox", "touch", prefix+"/test/foo")
-	dockerCmd(c, "run", "--volumes-from", "parent", "-v", prefix+"/test", "busybox", "cat", prefix+"/test/foo")
-}
-
-func (s *DockerSuite) TestRunMultipleVolumesFrom(c *check.C) {
-	prefix := ""
-	if daemonPlatform == "windows" {
-		prefix = `c:`
-	}
-	dockerCmd(c, "run", "--name", "parent1", "-v", prefix+"/test", "busybox", "touch", prefix+"/test/foo")
-	dockerCmd(c, "run", "--name", "parent2", "-v", prefix+"/other", "busybox", "touch", prefix+"/other/bar")
-	dockerCmd(c, "run", "--volumes-from", "parent1", "--volumes-from", "parent2", "busybox", "sh", "-c", "cat /test/foo && cat /other/bar")
-}
-
-// this tests verifies the ID format for the container
-func (s *DockerSuite) TestRunVerifyContainerID(c *check.C) {
-	out, exit, err := dockerCmdWithError("run", "-d", "busybox", "true")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if exit != 0 {
-		c.Fatalf("expected exit code 0 received %d", exit)
-	}
-
-	match, err := regexp.MatchString("^[0-9a-f]{64}$", strings.TrimSuffix(out, "\n"))
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !match {
-		c.Fatalf("Invalid container ID: %s", out)
-	}
-}
-
-// Test that creating a container with a volume doesn't crash. Regression test for #995.
-func (s *DockerSuite) TestRunCreateVolume(c *check.C) {
-	prefix := ""
-	if daemonPlatform == "windows" {
-		prefix = `c:`
-	}
-	dockerCmd(c, "run", "-v", prefix+"/var/lib/data", "busybox", "true")
-}
-
-// Test that creating a volume with a symlink in its path works correctly. Test for #5152.
-// Note that this bug happens only with symlinks with a target that starts with '/'.
-func (s *DockerSuite) TestRunCreateVolumeWithSymlink(c *check.C) {
-	// Cannot run on Windows as relies on Linux-specific functionality (sh -c mount...)
-	testRequires(c, DaemonIsLinux)
-	image := "docker-test-createvolumewithsymlink"
-
-	buildCmd := exec.Command(dockerBinary, "build", "-t", image, "-")
-	buildCmd.Stdin = strings.NewReader(`FROM busybox
-		RUN ln -s home /bar`)
-	buildCmd.Dir = workingDirectory
-	err := buildCmd.Run()
-	if err != nil {
-		c.Fatalf("could not build '%s': %v", image, err)
-	}
-
-	_, exitCode, err := dockerCmdWithError("run", "-v", "/bar/foo", "--name", "test-createvolumewithsymlink", image, "sh", "-c", "mount | grep -q /home/foo")
-	if err != nil || exitCode != 0 {
-		c.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
-	}
-
-	volPath, err := inspectMountSourceField("test-createvolumewithsymlink", "/bar/foo")
-	c.Assert(err, checker.IsNil)
-
-	_, exitCode, err = dockerCmdWithError("rm", "-v", "test-createvolumewithsymlink")
-	if err != nil || exitCode != 0 {
-		c.Fatalf("[rm] err: %v, exitcode: %d", err, exitCode)
-	}
-
-	_, err = os.Stat(volPath)
-	if !os.IsNotExist(err) {
-		c.Fatalf("[open] (expecting 'file does not exist' error) err: %v, volPath: %s", err, volPath)
-	}
-}
-
-// Tests that a volume path that has a symlink exists in a container mounting it with `--volumes-from`.
-func (s *DockerSuite) TestRunVolumesFromSymlinkPath(c *check.C) {
-	// TODO Windows (Post TP5): This test cannot run on a Windows daemon as
-	// Windows does not support symlinks inside a volume path
-	testRequires(c, DaemonIsLinux)
-	name := "docker-test-volumesfromsymlinkpath"
-	prefix := ""
-	dfContents := `FROM busybox
-		RUN ln -s home /foo
-		VOLUME ["/foo/bar"]`
-
-	if daemonPlatform == "windows" {
-		prefix = `c:`
-		dfContents = `FROM ` + WindowsBaseImage + `
-	    RUN mkdir c:\home
-		RUN mklink /D c:\foo c:\home
-		VOLUME ["c:/foo/bar"]
-		ENTRYPOINT c:\windows\system32\cmd.exe`
-	}
-
-	buildCmd := exec.Command(dockerBinary, "build", "-t", name, "-")
-	buildCmd.Stdin = strings.NewReader(dfContents)
-	buildCmd.Dir = workingDirectory
-	err := buildCmd.Run()
-	if err != nil {
-		c.Fatalf("could not build 'docker-test-volumesfromsymlinkpath': %v", err)
-	}
-
-	out, exitCode, err := dockerCmdWithError("run", "--name", "test-volumesfromsymlinkpath", name)
-	if err != nil || exitCode != 0 {
-		c.Fatalf("[run] (volume) err: %v, exitcode: %d, out: %s", err, exitCode, out)
-	}
-
-	_, exitCode, err = dockerCmdWithError("run", "--volumes-from", "test-volumesfromsymlinkpath", "busybox", "sh", "-c", "ls "+prefix+"/foo | grep -q bar")
-	if err != nil || exitCode != 0 {
-		c.Fatalf("[run] err: %v, exitcode: %d", err, exitCode)
-	}
-}
-
-func (s *DockerSuite) TestRunExitCode(c *check.C) {
-	var (
-		exit int
-		err  error
-	)
-
-	_, exit, err = dockerCmdWithError("run", "busybox", "/bin/sh", "-c", "exit 72")
-
-	if err == nil {
-		c.Fatal("should not have a non nil error")
-	}
-	if exit != 72 {
-		c.Fatalf("expected exit code 72 received %d", exit)
-	}
-}
-
-func (s *DockerSuite) TestRunUserDefaults(c *check.C) {
-	expected := "uid=0(root) gid=0(root)"
-	if daemonPlatform == "windows" {
-		expected = "uid=1000(ContainerAdministrator) gid=1000(ContainerAdministrator)"
-	}
-	out, _ := dockerCmd(c, "run", "busybox", "id")
-	if !strings.Contains(out, expected) {
-		c.Fatalf("expected '%s' got %s", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserByName(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-u", "root", "busybox", "id")
-	if !strings.Contains(out, "uid=0(root) gid=0(root)") {
-		c.Fatalf("expected root user got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserByID(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-u", "1", "busybox", "id")
-	if !strings.Contains(out, "uid=1(daemon) gid=1(daemon)") {
-		c.Fatalf("expected daemon user got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserByIDBig(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux, NotArm)
-	out, _, err := dockerCmdWithError("run", "-u", "2147483648", "busybox", "id")
-	if err == nil {
-		c.Fatal("No error, but must be.", out)
-	}
-	if !strings.Contains(strings.ToUpper(out), strings.ToUpper(libcontainerUser.ErrRange.Error())) {
-		c.Fatalf("expected error about uids range, got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserByIDNegative(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-u", "-1", "busybox", "id")
-	if err == nil {
-		c.Fatal("No error, but must be.", out)
-	}
-	if !strings.Contains(strings.ToUpper(out), strings.ToUpper(libcontainerUser.ErrRange.Error())) {
-		c.Fatalf("expected error about uids range, got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserByIDZero(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-u", "0", "busybox", "id")
-	if err != nil {
-		c.Fatal(err, out)
-	}
-	if !strings.Contains(out, "uid=0(root) gid=0(root) groups=10(wheel)") {
-		c.Fatalf("expected daemon user got %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunUserNotFound(c *check.C) {
-	// TODO Windows: This test cannot run on a Windows daemon as Windows does
-	// not support the use of -u
-	testRequires(c, DaemonIsLinux)
-	_, _, err := dockerCmdWithError("run", "-u", "notme", "busybox", "id")
-	if err == nil {
-		c.Fatal("unknown user should cause container to fail")
-	}
-}
-
-func (s *DockerSuite) TestRunTwoConcurrentContainers(c *check.C) {
-	sleepTime := "2"
-	group := sync.WaitGroup{}
-	group.Add(2)
-
-	errChan := make(chan error, 2)
-	for i := 0; i < 2; i++ {
-		go func() {
-			defer group.Done()
-			_, _, err := dockerCmdWithError("run", "busybox", "sleep", sleepTime)
-			errChan <- err
-		}()
-	}
-
-	group.Wait()
-	close(errChan)
-
-	for err := range errChan {
-		c.Assert(err, check.IsNil)
-	}
-}
-
-func (s *DockerSuite) TestRunEnvironment(c *check.C) {
-	// TODO Windows: Environment handling is different between Linux and
-	// Windows and this test relies currently on unix functionality.
-	testRequires(c, DaemonIsLinux)
-	cmd := exec.Command(dockerBinary, "run", "-h", "testing", "-e=FALSE=true", "-e=TRUE", "-e=TRICKY", "-e=HOME=", "busybox", "env")
-	cmd.Env = append(os.Environ(),
-		"TRUE=false",
-		"TRICKY=tri\ncky\n",
-	)
-
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-
-	actualEnv := strings.Split(strings.TrimSpace(out), "\n")
-	sort.Strings(actualEnv)
-
-	goodEnv := []string{
-		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-		"HOSTNAME=testing",
-		"FALSE=true",
-		"TRUE=false",
-		"TRICKY=tri",
-		"cky",
-		"",
-		"HOME=/root",
-	}
-	sort.Strings(goodEnv)
-	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
-	}
-	for i := range goodEnv {
-		if actualEnv[i] != goodEnv[i] {
-			c.Fatalf("Wrong environment variable: should be %s, not %s", goodEnv[i], actualEnv[i])
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunEnvironmentErase(c *check.C) {
-	// TODO Windows: Environment handling is different between Linux and
-	// Windows and this test relies currently on unix functionality.
-	testRequires(c, DaemonIsLinux)
-
-	// Test to make sure that when we use -e on env vars that are
-	// not set in our local env that they're removed (if present) in
-	// the container
-
-	cmd := exec.Command(dockerBinary, "run", "-e", "FOO", "-e", "HOSTNAME", "busybox", "env")
-	cmd.Env = appendBaseEnv(true)
-
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-
-	actualEnv := strings.Split(strings.TrimSpace(out), "\n")
-	sort.Strings(actualEnv)
-
-	goodEnv := []string{
-		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-		"HOME=/root",
-	}
-	sort.Strings(goodEnv)
-	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
-	}
-	for i := range goodEnv {
-		if actualEnv[i] != goodEnv[i] {
-			c.Fatalf("Wrong environment variable: should be %s, not %s", goodEnv[i], actualEnv[i])
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunEnvironmentOverride(c *check.C) {
-	// TODO Windows: Environment handling is different between Linux and
-	// Windows and this test relies currently on unix functionality.
-	testRequires(c, DaemonIsLinux)
-
-	// Test to make sure that when we use -e on env vars that are
-	// already in the env that we're overriding them
-
-	cmd := exec.Command(dockerBinary, "run", "-e", "HOSTNAME", "-e", "HOME=/root2", "busybox", "env")
-	cmd.Env = appendBaseEnv(true, "HOSTNAME=bar")
-
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-
-	actualEnv := strings.Split(strings.TrimSpace(out), "\n")
-	sort.Strings(actualEnv)
-
-	goodEnv := []string{
-		"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-		"HOME=/root2",
-		"HOSTNAME=bar",
-	}
-	sort.Strings(goodEnv)
-	if len(goodEnv) != len(actualEnv) {
-		c.Fatalf("Wrong environment: should be %d variables, not %d: %q", len(goodEnv), len(actualEnv), strings.Join(actualEnv, ", "))
-	}
-	for i := range goodEnv {
-		if actualEnv[i] != goodEnv[i] {
-			c.Fatalf("Wrong environment variable: should be %s, not %s", goodEnv[i], actualEnv[i])
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunContainerNetwork(c *check.C) {
-	if daemonPlatform == "windows" {
-		// Windows busybox does not have ping. Use built in ping instead.
-		dockerCmd(c, "run", WindowsBaseImage, "ping", "-n", "1", "127.0.0.1")
-	} else {
-		dockerCmd(c, "run", "busybox", "ping", "-c", "1", "127.0.0.1")
-	}
-}
-
-func (s *DockerSuite) TestRunNetHostNotAllowedWithLinks(c *check.C) {
-	// TODO Windows: This is Linux specific as --link is not supported and
-	// this will be deprecated in favor of container networking model.
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	dockerCmd(c, "run", "--name", "linked", "busybox", "true")
-
-	_, _, err := dockerCmdWithError("run", "--net=host", "--link", "linked:linked", "busybox", "true")
-	if err == nil {
-		c.Fatal("Expected error")
-	}
-}
-
-// #7851 hostname outside container shows FQDN, inside only shortname
-// For testing purposes it is not required to set host's hostname directly
-// and use "--net=host" (as the original issue submitter did), as the same
-// codepath is executed with "docker run -h <hostname>".  Both were manually
-// tested, but this testcase takes the simpler path of using "run -h .."
-func (s *DockerSuite) TestRunFullHostnameSet(c *check.C) {
-	// TODO Windows: -h is not yet functional.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-h", "foo.bar.baz", "busybox", "hostname")
-	if actual := strings.Trim(out, "\r\n"); actual != "foo.bar.baz" {
-		c.Fatalf("expected hostname 'foo.bar.baz', received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunPrivilegedCanMknod(c *check.C) {
-	// Not applicable for Windows as Windows daemon does not support
-	// the concept of --privileged, and mknod is a Unix concept.
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--privileged", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunUnprivilegedCanMknod(c *check.C) {
-	// Not applicable for Windows as Windows daemon does not support
-	// the concept of --privileged, and mknod is a Unix concept.
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapDropInvalid(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-drop
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-drop=CHPASS", "busybox", "ls")
-	if err == nil {
-		c.Fatal(err, out)
-	}
-}
-
-func (s *DockerSuite) TestRunCapDropCannotMknod(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-drop or mknod
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-drop=MKNOD", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-
-	if err == nil {
-		c.Fatal(err, out)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual == "ok" {
-		c.Fatalf("expected output not ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapDropCannotMknodLowerCase(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-drop or mknod
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-drop=mknod", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-
-	if err == nil {
-		c.Fatal(err, out)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual == "ok" {
-		c.Fatalf("expected output not ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapDropALLCannotMknod(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-drop or mknod
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-drop=ALL", "--cap-add=SETGID", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-	if err == nil {
-		c.Fatal(err, out)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual == "ok" {
-		c.Fatalf("expected output not ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapDropALLAddMknodCanMknod(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-drop or mknod
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--cap-drop=ALL", "--cap-add=MKNOD", "--cap-add=SETGID", "busybox", "sh", "-c", "mknod /tmp/sda b 8 0 && echo ok")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddInvalid(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-add
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-add=CHPASS", "busybox", "ls")
-	if err == nil {
-		c.Fatal(err, out)
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddCanDownInterface(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-add
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--cap-add=NET_ADMIN", "busybox", "sh", "-c", "ip link set eth0 down && echo ok")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddALLCanDownInterface(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-add
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--cap-add=ALL", "busybox", "sh", "-c", "ip link set eth0 down && echo ok")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddALLDropNetAdminCanDownInterface(c *check.C) {
-	// Not applicable for Windows as there is no concept of --cap-add
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cap-add=ALL", "--cap-drop=NET_ADMIN", "busybox", "sh", "-c", "ip link set eth0 down && echo ok")
-	if err == nil {
-		c.Fatal(err, out)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual == "ok" {
-		c.Fatalf("expected output not ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunGroupAdd(c *check.C) {
-	// Not applicable for Windows as there is no concept of --group-add
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--group-add=audio", "--group-add=staff", "--group-add=777", "busybox", "sh", "-c", "id")
-
-	groupsList := "uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777"
-	if actual := strings.Trim(out, "\r\n"); actual != groupsList {
-		c.Fatalf("expected output %s received %s", groupsList, actual)
-	}
-}
-
-func (s *DockerSuite) TestRunPrivilegedCanMount(c *check.C) {
-	// Not applicable for Windows as there is no concept of --privileged
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--privileged", "busybox", "sh", "-c", "mount -t tmpfs none /tmp && echo ok")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunUnprivilegedCannotMount(c *check.C) {
-	// Not applicable for Windows as there is no concept of unprivileged
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "busybox", "sh", "-c", "mount -t tmpfs none /tmp && echo ok")
-
-	if err == nil {
-		c.Fatal(err, out)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual == "ok" {
-		c.Fatalf("expected output not ok received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunSysNotWritableInNonPrivilegedContainers(c *check.C) {
-	// Not applicable for Windows as there is no concept of unprivileged
-	testRequires(c, DaemonIsLinux, NotArm)
-	if _, code, err := dockerCmdWithError("run", "busybox", "touch", "/sys/kernel/profiling"); err == nil || code == 0 {
-		c.Fatal("sys should not be writable in a non privileged container")
-	}
-}
-
-func (s *DockerSuite) TestRunSysWritableInPrivilegedContainers(c *check.C) {
-	// Not applicable for Windows as there is no concept of unprivileged
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	if _, code, err := dockerCmdWithError("run", "--privileged", "busybox", "touch", "/sys/kernel/profiling"); err != nil || code != 0 {
-		c.Fatalf("sys should be writable in privileged container")
-	}
-}
-
-func (s *DockerSuite) TestRunProcNotWritableInNonPrivilegedContainers(c *check.C) {
-	// Not applicable for Windows as there is no concept of unprivileged
-	testRequires(c, DaemonIsLinux)
-	if _, code, err := dockerCmdWithError("run", "busybox", "touch", "/proc/sysrq-trigger"); err == nil || code == 0 {
-		c.Fatal("proc should not be writable in a non privileged container")
-	}
-}
-
-func (s *DockerSuite) TestRunProcWritableInPrivilegedContainers(c *check.C) {
-	// Not applicable for Windows as there is no concept of --privileged
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	if _, code := dockerCmd(c, "run", "--privileged", "busybox", "sh", "-c", "touch /proc/sysrq-trigger"); code != 0 {
-		c.Fatalf("proc should be writable in privileged container")
-	}
-}
-
-func (s *DockerSuite) TestRunDeviceNumbers(c *check.C) {
-	// Not applicable on Windows as /dev/ is a Unix specific concept
-	// TODO: NotUserNamespace could be removed here if "root" "root" is replaced w user
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "busybox", "sh", "-c", "ls -l /dev/null")
-	deviceLineFields := strings.Fields(out)
-	deviceLineFields[6] = ""
-	deviceLineFields[7] = ""
-	deviceLineFields[8] = ""
-	expected := []string{"crw-rw-rw-", "1", "root", "root", "1,", "3", "", "", "", "/dev/null"}
-
-	if !(reflect.DeepEqual(deviceLineFields, expected)) {
-		c.Fatalf("expected output\ncrw-rw-rw- 1 root root 1, 3 May 24 13:29 /dev/null\n received\n %s\n", out)
-	}
-}
-
-func (s *DockerSuite) TestRunThatCharacterDevicesActLikeCharacterDevices(c *check.C) {
-	// Not applicable on Windows as /dev/ is a Unix specific concept
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "busybox", "sh", "-c", "dd if=/dev/zero of=/zero bs=1k count=5 2> /dev/null ; du -h /zero")
-	if actual := strings.Trim(out, "\r\n"); actual[0] == '0' {
-		c.Fatalf("expected a new file called /zero to be create that is greater than 0 bytes long, but du says: %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunUnprivilegedWithChroot(c *check.C) {
-	// Not applicable on Windows as it does not support chroot
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "busybox", "chroot", "/", "true")
-}
-
-func (s *DockerSuite) TestRunAddingOptionalDevices(c *check.C) {
-	// Not applicable on Windows as Windows does not support --device
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--device", "/dev/zero:/dev/nulo", "busybox", "sh", "-c", "ls /dev/nulo")
-	if actual := strings.Trim(out, "\r\n"); actual != "/dev/nulo" {
-		c.Fatalf("expected output /dev/nulo, received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunAddingOptionalDevicesNoSrc(c *check.C) {
-	// Not applicable on Windows as Windows does not support --device
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--device", "/dev/zero:rw", "busybox", "sh", "-c", "ls /dev/zero")
-	if actual := strings.Trim(out, "\r\n"); actual != "/dev/zero" {
-		c.Fatalf("expected output /dev/zero, received %s", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunAddingOptionalDevicesInvalidMode(c *check.C) {
-	// Not applicable on Windows as Windows does not support --device
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	_, _, err := dockerCmdWithError("run", "--device", "/dev/zero:ro", "busybox", "sh", "-c", "ls /dev/zero")
-	if err == nil {
-		c.Fatalf("run container with device mode ro should fail")
-	}
-}
-
-func (s *DockerSuite) TestRunModeHostname(c *check.C) {
-	// Not applicable on Windows as Windows does not support -h
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	out, _ := dockerCmd(c, "run", "-h=testhostname", "busybox", "cat", "/etc/hostname")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "testhostname" {
-		c.Fatalf("expected 'testhostname', but says: %q", actual)
-	}
-
-	out, _ = dockerCmd(c, "run", "--net=host", "busybox", "cat", "/etc/hostname")
-
-	hostname, err := os.Hostname()
-	if err != nil {
-		c.Fatal(err)
-	}
-	if actual := strings.Trim(out, "\r\n"); actual != hostname {
-		c.Fatalf("expected %q, but says: %q", hostname, actual)
-	}
-}
-
-func (s *DockerSuite) TestRunRootWorkdir(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--workdir", "/", "busybox", "pwd")
-	expected := "/\n"
-	if daemonPlatform == "windows" {
-		expected = "C:" + expected
-	}
-	if out != expected {
-		c.Fatalf("pwd returned %q (expected %s)", s, expected)
-	}
-}
-
-func (s *DockerSuite) TestRunAllowBindMountingRoot(c *check.C) {
-	if daemonPlatform == "windows" {
-		// Windows busybox will fail with Permission Denied on items such as pagefile.sys
-		dockerCmd(c, "run", "-v", `c:\:c:\host`, WindowsBaseImage, "cmd", "-c", "dir", `c:\host`)
-	} else {
-		dockerCmd(c, "run", "-v", "/:/host", "busybox", "ls", "/host")
-	}
-}
-
-func (s *DockerSuite) TestRunDisallowBindMountingRootToRoot(c *check.C) {
-	mount := "/:/"
-	targetDir := "/host"
-	if daemonPlatform == "windows" {
-		mount = `c:\:c\`
-		targetDir = "c:/host" // Forward slash as using busybox
-	}
-	out, _, err := dockerCmdWithError("run", "-v", mount, "busybox", "ls", targetDir)
-	if err == nil {
-		c.Fatal(out, err)
-	}
-}
-
-// Verify that a container gets default DNS when only localhost resolvers exist
-func (s *DockerSuite) TestRunDNSDefaultOptions(c *check.C) {
-	// Not applicable on Windows as this is testing Unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	// preserve original resolv.conf for restoring after test
-	origResolvConf, err := ioutil.ReadFile("/etc/resolv.conf")
-	if os.IsNotExist(err) {
-		c.Fatalf("/etc/resolv.conf does not exist")
-	}
-	// defer restored original conf
-	defer func() {
-		if err := ioutil.WriteFile("/etc/resolv.conf", origResolvConf, 0644); err != nil {
-			c.Fatal(err)
-		}
-	}()
-
-	// test 3 cases: standard IPv4 localhost, commented out localhost, and IPv6 localhost
-	// 2 are removed from the file at container start, and the 3rd (commented out) one is ignored by
-	// GetNameservers(), leading to a replacement of nameservers with the default set
-	tmpResolvConf := []byte("nameserver 127.0.0.1\n#nameserver 127.0.2.1\nnameserver ::1")
-	if err := ioutil.WriteFile("/etc/resolv.conf", tmpResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	actual, _ := dockerCmd(c, "run", "busybox", "cat", "/etc/resolv.conf")
-	// check that the actual defaults are appended to the commented out
-	// localhost resolver (which should be preserved)
-	// NOTE: if we ever change the defaults from google dns, this will break
-	expected := "#nameserver 127.0.2.1\n\nnameserver 8.8.8.8\nnameserver 8.8.4.4\n"
-	if actual != expected {
-		c.Fatalf("expected resolv.conf be: %q, but was: %q", expected, actual)
-	}
-}
-
-func (s *DockerSuite) TestRunDNSOptions(c *check.C) {
-	// Not applicable on Windows as Windows does not support --dns*, or
-	// the Unix-specific functionality of resolv.conf.
-	testRequires(c, DaemonIsLinux)
-	out, stderr, _ := dockerCmdWithStdoutStderr(c, "run", "--dns=127.0.0.1", "--dns-search=mydomain", "--dns-opt=ndots:9", "busybox", "cat", "/etc/resolv.conf")
-
-	// The client will get a warning on stderr when setting DNS to a localhost address; verify this:
-	if !strings.Contains(stderr, "Localhost DNS setting") {
-		c.Fatalf("Expected warning on stderr about localhost resolver, but got %q", stderr)
-	}
-
-	actual := strings.Replace(strings.Trim(out, "\r\n"), "\n", " ", -1)
-	if actual != "search mydomain nameserver 127.0.0.1 options ndots:9" {
-		c.Fatalf("expected 'search mydomain nameserver 127.0.0.1 options ndots:9', but says: %q", actual)
-	}
-
-	out, stderr, _ = dockerCmdWithStdoutStderr(c, "run", "--dns=127.0.0.1", "--dns-search=.", "--dns-opt=ndots:3", "busybox", "cat", "/etc/resolv.conf")
-
-	actual = strings.Replace(strings.Trim(strings.Trim(out, "\r\n"), " "), "\n", " ", -1)
-	if actual != "nameserver 127.0.0.1 options ndots:3" {
-		c.Fatalf("expected 'nameserver 127.0.0.1 options ndots:3', but says: %q", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunDNSRepeatOptions(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--dns=1.1.1.1", "--dns=2.2.2.2", "--dns-search=mydomain", "--dns-search=mydomain2", "--dns-opt=ndots:9", "--dns-opt=timeout:3", "busybox", "cat", "/etc/resolv.conf")
-
-	actual := strings.Replace(strings.Trim(out, "\r\n"), "\n", " ", -1)
-	if actual != "search mydomain mydomain2 nameserver 1.1.1.1 nameserver 2.2.2.2 options ndots:9 timeout:3" {
-		c.Fatalf("expected 'search mydomain mydomain2 nameserver 1.1.1.1 nameserver 2.2.2.2 options ndots:9 timeout:3', but says: %q", actual)
-	}
-}
-
-func (s *DockerSuite) TestRunDNSOptionsBasedOnHostResolvConf(c *check.C) {
-	// Not applicable on Windows as testing Unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	origResolvConf, err := ioutil.ReadFile("/etc/resolv.conf")
-	if os.IsNotExist(err) {
-		c.Fatalf("/etc/resolv.conf does not exist")
-	}
-
-	hostNameservers := resolvconf.GetNameservers(origResolvConf, types.IP)
-	hostSearch := resolvconf.GetSearchDomains(origResolvConf)
-
-	var out string
-	out, _ = dockerCmd(c, "run", "--dns=127.0.0.1", "busybox", "cat", "/etc/resolv.conf")
-
-	if actualNameservers := resolvconf.GetNameservers([]byte(out), types.IP); string(actualNameservers[0]) != "127.0.0.1" {
-		c.Fatalf("expected '127.0.0.1', but says: %q", string(actualNameservers[0]))
-	}
-
-	actualSearch := resolvconf.GetSearchDomains([]byte(out))
-	if len(actualSearch) != len(hostSearch) {
-		c.Fatalf("expected %q search domain(s), but it has: %q", len(hostSearch), len(actualSearch))
-	}
-	for i := range actualSearch {
-		if actualSearch[i] != hostSearch[i] {
-			c.Fatalf("expected %q domain, but says: %q", actualSearch[i], hostSearch[i])
-		}
-	}
-
-	out, _ = dockerCmd(c, "run", "--dns-search=mydomain", "busybox", "cat", "/etc/resolv.conf")
-
-	actualNameservers := resolvconf.GetNameservers([]byte(out), types.IP)
-	if len(actualNameservers) != len(hostNameservers) {
-		c.Fatalf("expected %q nameserver(s), but it has: %q", len(hostNameservers), len(actualNameservers))
-	}
-	for i := range actualNameservers {
-		if actualNameservers[i] != hostNameservers[i] {
-			c.Fatalf("expected %q nameserver, but says: %q", actualNameservers[i], hostNameservers[i])
-		}
-	}
-
-	if actualSearch = resolvconf.GetSearchDomains([]byte(out)); string(actualSearch[0]) != "mydomain" {
-		c.Fatalf("expected 'mydomain', but says: %q", string(actualSearch[0]))
-	}
-
-	// test with file
-	tmpResolvConf := []byte("search example.com\nnameserver 12.34.56.78\nnameserver 127.0.0.1")
-	if err := ioutil.WriteFile("/etc/resolv.conf", tmpResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-	// put the old resolvconf back
-	defer func() {
-		if err := ioutil.WriteFile("/etc/resolv.conf", origResolvConf, 0644); err != nil {
-			c.Fatal(err)
-		}
-	}()
-
-	resolvConf, err := ioutil.ReadFile("/etc/resolv.conf")
-	if os.IsNotExist(err) {
-		c.Fatalf("/etc/resolv.conf does not exist")
-	}
-
-	hostNameservers = resolvconf.GetNameservers(resolvConf, types.IP)
-	hostSearch = resolvconf.GetSearchDomains(resolvConf)
-
-	out, _ = dockerCmd(c, "run", "busybox", "cat", "/etc/resolv.conf")
-	if actualNameservers = resolvconf.GetNameservers([]byte(out), types.IP); string(actualNameservers[0]) != "12.34.56.78" || len(actualNameservers) != 1 {
-		c.Fatalf("expected '12.34.56.78', but has: %v", actualNameservers)
-	}
-
-	actualSearch = resolvconf.GetSearchDomains([]byte(out))
-	if len(actualSearch) != len(hostSearch) {
-		c.Fatalf("expected %q search domain(s), but it has: %q", len(hostSearch), len(actualSearch))
-	}
-	for i := range actualSearch {
-		if actualSearch[i] != hostSearch[i] {
-			c.Fatalf("expected %q domain, but says: %q", actualSearch[i], hostSearch[i])
-		}
-	}
-}
-
-// Test to see if a non-root user can resolve a DNS name. Also
-// check if the container resolv.conf file has at least 0644 perm.
-func (s *DockerSuite) TestRunNonRootUserResolvName(c *check.C) {
-	// Not applicable on Windows as Windows does not support --user
-	testRequires(c, SameHostDaemon, Network, DaemonIsLinux, NotArm)
-
-	dockerCmd(c, "run", "--name=testperm", "--user=nobody", "busybox", "nslookup", "apt.dockerproject.org")
-
-	cID, err := getIDByName("testperm")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	fmode := (os.FileMode)(0644)
-	finfo, err := os.Stat(containerStorageFile(cID, "resolv.conf"))
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if (finfo.Mode() & fmode) != fmode {
-		c.Fatalf("Expected container resolv.conf mode to be at least %s, instead got %s", fmode.String(), finfo.Mode().String())
-	}
-}
-
-// Test if container resolv.conf gets updated the next time it restarts
-// if host /etc/resolv.conf has changed. This only applies if the container
-// uses the host's /etc/resolv.conf and does not have any dns options provided.
-func (s *DockerSuite) TestRunResolvconfUpdate(c *check.C) {
-	// Not applicable on Windows as testing unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-	c.Skip("Unstable test, to be re-activated once #19937 is resolved")
-
-	tmpResolvConf := []byte("search pommesfrites.fr\nnameserver 12.34.56.78\n")
-	tmpLocalhostResolvConf := []byte("nameserver 127.0.0.1")
-
-	//take a copy of resolv.conf for restoring after test completes
-	resolvConfSystem, err := ioutil.ReadFile("/etc/resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// This test case is meant to test monitoring resolv.conf when it is
-	// a regular file not a bind mounc. So we unmount resolv.conf and replace
-	// it with a file containing the original settings.
-	mounted, err := mount.Mounted("/etc/resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if mounted {
-		cmd := exec.Command("umount", "/etc/resolv.conf")
-		if _, err = runCommand(cmd); err != nil {
-			c.Fatal(err)
-		}
-	}
-
-	//cleanup
-	defer func() {
-		if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
-			c.Fatal(err)
-		}
-	}()
-
-	//1. test that a restarting container gets an updated resolv.conf
-	dockerCmd(c, "run", "--name=first", "busybox", "true")
-	containerID1, err := getIDByName("first")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// replace resolv.conf with our temporary copy
-	bytesResolvConf := []byte(tmpResolvConf)
-	if err := ioutil.WriteFile("/etc/resolv.conf", bytesResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// start the container again to pickup changes
-	dockerCmd(c, "start", "first")
-
-	// check for update in container
-	containerResolv, err := readContainerFile(containerID1, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !bytes.Equal(containerResolv, bytesResolvConf) {
-		c.Fatalf("Restarted container does not have updated resolv.conf; expected %q, got %q", tmpResolvConf, string(containerResolv))
-	}
-
-	/*	//make a change to resolv.conf (in this case replacing our tmp copy with orig copy)
-		if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
-						c.Fatal(err)
-								} */
-	//2. test that a restarting container does not receive resolv.conf updates
-	//   if it modified the container copy of the starting point resolv.conf
-	dockerCmd(c, "run", "--name=second", "busybox", "sh", "-c", "echo 'search mylittlepony.com' >>/etc/resolv.conf")
-	containerID2, err := getIDByName("second")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	//make a change to resolv.conf (in this case replacing our tmp copy with orig copy)
-	if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// start the container again
-	dockerCmd(c, "start", "second")
-
-	// check for update in container
-	containerResolv, err = readContainerFile(containerID2, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if bytes.Equal(containerResolv, resolvConfSystem) {
-		c.Fatalf("Container's resolv.conf should not have been updated with host resolv.conf: %q", string(containerResolv))
-	}
-
-	//3. test that a running container's resolv.conf is not modified while running
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	runningContainerID := strings.TrimSpace(out)
-
-	// replace resolv.conf
-	if err := ioutil.WriteFile("/etc/resolv.conf", bytesResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// check for update in container
-	containerResolv, err = readContainerFile(runningContainerID, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if bytes.Equal(containerResolv, bytesResolvConf) {
-		c.Fatalf("Running container should not have updated resolv.conf; expected %q, got %q", string(resolvConfSystem), string(containerResolv))
-	}
-
-	//4. test that a running container's resolv.conf is updated upon restart
-	//   (the above container is still running..)
-	dockerCmd(c, "restart", runningContainerID)
-
-	// check for update in container
-	containerResolv, err = readContainerFile(runningContainerID, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !bytes.Equal(containerResolv, bytesResolvConf) {
-		c.Fatalf("Restarted container should have updated resolv.conf; expected %q, got %q", string(bytesResolvConf), string(containerResolv))
-	}
-
-	//5. test that additions of a localhost resolver are cleaned from
-	//   host resolv.conf before updating container's resolv.conf copies
-
-	// replace resolv.conf with a localhost-only nameserver copy
-	bytesResolvConf = []byte(tmpLocalhostResolvConf)
-	if err = ioutil.WriteFile("/etc/resolv.conf", bytesResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// start the container again to pickup changes
-	dockerCmd(c, "start", "first")
-
-	// our first exited container ID should have been updated, but with default DNS
-	// after the cleanup of resolv.conf found only a localhost nameserver:
-	containerResolv, err = readContainerFile(containerID1, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	expected := "\nnameserver 8.8.8.8\nnameserver 8.8.4.4\n"
-	if !bytes.Equal(containerResolv, []byte(expected)) {
-		c.Fatalf("Container does not have cleaned/replaced DNS in resolv.conf; expected %q, got %q", expected, string(containerResolv))
-	}
-
-	//6. Test that replacing (as opposed to modifying) resolv.conf triggers an update
-	//   of containers' resolv.conf.
-
-	// Restore the original resolv.conf
-	if err := ioutil.WriteFile("/etc/resolv.conf", resolvConfSystem, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// Run the container so it picks up the old settings
-	dockerCmd(c, "run", "--name=third", "busybox", "true")
-	containerID3, err := getIDByName("third")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Create a modified resolv.conf.aside and override resolv.conf with it
-	bytesResolvConf = []byte(tmpResolvConf)
-	if err := ioutil.WriteFile("/etc/resolv.conf.aside", bytesResolvConf, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	err = os.Rename("/etc/resolv.conf.aside", "/etc/resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// start the container again to pickup changes
-	dockerCmd(c, "start", "third")
-
-	// check for update in container
-	containerResolv, err = readContainerFile(containerID3, "resolv.conf")
-	if err != nil {
-		c.Fatal(err)
-	}
-	if !bytes.Equal(containerResolv, bytesResolvConf) {
-		c.Fatalf("Stopped container does not have updated resolv.conf; expected\n%q\n got\n%q", tmpResolvConf, string(containerResolv))
-	}
-
-	//cleanup, restore original resolv.conf happens in defer func()
-}
-
-func (s *DockerSuite) TestRunAddHost(c *check.C) {
-	// Not applicable on Windows as it does not support --add-host
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--add-host=extra:86.75.30.9", "busybox", "grep", "extra", "/etc/hosts")
-
-	actual := strings.Trim(out, "\r\n")
-	if actual != "86.75.30.9\textra" {
-		c.Fatalf("expected '86.75.30.9\textra', but says: %q", actual)
-	}
-}
-
-// Regression test for #6983
-func (s *DockerSuite) TestRunAttachStdErrOnlyTTYMode(c *check.C) {
-	_, exitCode := dockerCmd(c, "run", "-t", "-a", "stderr", "busybox", "true")
-	if exitCode != 0 {
-		c.Fatalf("Container should have exited with error code 0")
-	}
-}
-
-// Regression test for #6983
-func (s *DockerSuite) TestRunAttachStdOutOnlyTTYMode(c *check.C) {
-	_, exitCode := dockerCmd(c, "run", "-t", "-a", "stdout", "busybox", "true")
-	if exitCode != 0 {
-		c.Fatalf("Container should have exited with error code 0")
-	}
-}
-
-// Regression test for #6983
-func (s *DockerSuite) TestRunAttachStdOutAndErrTTYMode(c *check.C) {
-	_, exitCode := dockerCmd(c, "run", "-t", "-a", "stdout", "-a", "stderr", "busybox", "true")
-	if exitCode != 0 {
-		c.Fatalf("Container should have exited with error code 0")
-	}
-}
-
-// Test for #10388 - this will run the same test as TestRunAttachStdOutAndErrTTYMode
-// but using --attach instead of -a to make sure we read the flag correctly
-func (s *DockerSuite) TestRunAttachWithDetach(c *check.C) {
-	cmd := exec.Command(dockerBinary, "run", "-d", "--attach", "stdout", "busybox", "true")
-	_, stderr, _, err := runCommandWithStdoutStderr(cmd)
-	if err == nil {
-		c.Fatal("Container should have exited with error code different than 0")
-	} else if !strings.Contains(stderr, "Conflicting options: -a and -d") {
-		c.Fatal("Should have been returned an error with conflicting options -a and -d")
-	}
-}
-
-func (s *DockerSuite) TestRunState(c *check.C) {
-	// TODO Windows: This needs some rework as Windows busybox does not support top
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	state := inspectField(c, id, "State.Running")
-	if state != "true" {
-		c.Fatal("Container state is 'not running'")
-	}
-	pid1 := inspectField(c, id, "State.Pid")
-	if pid1 == "0" {
-		c.Fatal("Container state Pid 0")
-	}
-
-	dockerCmd(c, "stop", id)
-	state = inspectField(c, id, "State.Running")
-	if state != "false" {
-		c.Fatal("Container state is 'running'")
-	}
-	pid2 := inspectField(c, id, "State.Pid")
-	if pid2 == pid1 {
-		c.Fatalf("Container state Pid %s, but expected %s", pid2, pid1)
-	}
-
-	dockerCmd(c, "start", id)
-	state = inspectField(c, id, "State.Running")
-	if state != "true" {
-		c.Fatal("Container state is 'not running'")
-	}
-	pid3 := inspectField(c, id, "State.Pid")
-	if pid3 == pid1 {
-		c.Fatalf("Container state Pid %s, but expected %s", pid2, pid1)
-	}
-}
-
-// Test for #1737
-func (s *DockerSuite) TestRunCopyVolumeUIDGID(c *check.C) {
-	// Not applicable on Windows as it does not support uid or gid in this way
-	testRequires(c, DaemonIsLinux)
-	name := "testrunvolumesuidgid"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-		RUN echo 'dockerio:x:1001:' >> /etc/group
-		RUN mkdir -p /hello && touch /hello/test && chown dockerio.dockerio /hello`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Test that the uid and gid is copied from the image to the volume
-	out, _ := dockerCmd(c, "run", "--rm", "-v", "/hello", name, "sh", "-c", "ls -l / | grep hello | awk '{print $3\":\"$4}'")
-	out = strings.TrimSpace(out)
-	if out != "dockerio:dockerio" {
-		c.Fatalf("Wrong /hello ownership: %s, expected dockerio:dockerio", out)
-	}
-}
-
-// Test for #1582
-func (s *DockerSuite) TestRunCopyVolumeContent(c *check.C) {
-	// TODO Windows, post TP5. Windows does not yet support volume functionality
-	// that copies from the image to the volume.
-	testRequires(c, DaemonIsLinux)
-	name := "testruncopyvolumecontent"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN mkdir -p /hello/local && echo hello > /hello/local/world`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Test that the content is copied from the image to the volume
-	out, _ := dockerCmd(c, "run", "--rm", "-v", "/hello", name, "find", "/hello")
-	if !(strings.Contains(out, "/hello/local/world") && strings.Contains(out, "/hello/local")) {
-		c.Fatal("Container failed to transfer content to volume")
-	}
-}
-
-func (s *DockerSuite) TestRunCleanupCmdOnEntrypoint(c *check.C) {
-	name := "testrunmdcleanuponentrypoint"
-	if _, err := buildImage(name,
-		`FROM busybox
-		ENTRYPOINT ["echo"]
-		CMD ["testingpoint"]`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-
-	out, exit := dockerCmd(c, "run", "--entrypoint", "whoami", name)
-	if exit != 0 {
-		c.Fatalf("expected exit code 0 received %d, out: %q", exit, out)
-	}
-	out = strings.TrimSpace(out)
-	expected := "root"
-	if daemonPlatform == "windows" {
-		if strings.Contains(WindowsBaseImage, "windowsservercore") {
-			expected = `user manager\containeradministrator`
-		} else {
-			expected = `ContainerAdministrator` // nanoserver
-		}
-	}
-	if out != expected {
-		c.Fatalf("Expected output %s, got %q. %s", expected, out, WindowsBaseImage)
-	}
-}
-
-// TestRunWorkdirExistsAndIsFile checks that if 'docker run -w' with existing file can be detected
-func (s *DockerSuite) TestRunWorkdirExistsAndIsFile(c *check.C) {
-	existingFile := "/bin/cat"
-	expected := "not a directory"
-	if daemonPlatform == "windows" {
-		existingFile = `\windows\system32\ntdll.dll`
-		expected = `The directory name is invalid.`
-	}
-
-	out, exitCode, err := dockerCmdWithError("run", "-w", existingFile, "busybox")
-	if !(err != nil && exitCode == 125 && strings.Contains(out, expected)) {
-		c.Fatalf("Existing binary as a directory should error out with exitCode 125; we got: %s, exitCode: %d", out, exitCode)
-	}
-}
-
-func (s *DockerSuite) TestRunExitOnStdinClose(c *check.C) {
-	name := "testrunexitonstdinclose"
-
-	meow := "/bin/cat"
-	delay := 60
-	if daemonPlatform == "windows" {
-		meow = "cat"
-	}
-	runCmd := exec.Command(dockerBinary, "run", "--name", name, "-i", "busybox", meow)
-
-	stdin, err := runCmd.StdinPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	stdout, err := runCmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if err := runCmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-	if _, err := stdin.Write([]byte("hello\n")); err != nil {
-		c.Fatal(err)
-	}
-
-	r := bufio.NewReader(stdout)
-	line, err := r.ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	line = strings.TrimSpace(line)
-	if line != "hello" {
-		c.Fatalf("Output should be 'hello', got '%q'", line)
-	}
-	if err := stdin.Close(); err != nil {
-		c.Fatal(err)
-	}
-	finish := make(chan error)
-	go func() {
-		finish <- runCmd.Wait()
-		close(finish)
-	}()
-	select {
-	case err := <-finish:
-		c.Assert(err, check.IsNil)
-	case <-time.After(time.Duration(delay) * time.Second):
-		c.Fatal("docker run failed to exit on stdin close")
-	}
-	state := inspectField(c, name, "State.Running")
-
-	if state != "false" {
-		c.Fatal("Container must be stopped after stdin closing")
-	}
-}
-
-// Test run -i --restart xxx doesn't hang
-func (s *DockerSuite) TestRunInteractiveWithRestartPolicy(c *check.C) {
-	name := "test-inter-restart"
-
-	result := icmd.StartCmd(icmd.Cmd{
-		Command: []string{dockerBinary, "run", "-i", "--name", name, "--restart=always", "busybox", "sh"},
-		Stdin:   bytes.NewBufferString("exit 11"),
-	})
-	c.Assert(result.Error, checker.IsNil)
-	defer func() {
-		dockerCmdWithResult("stop", name).Assert(c, icmd.Success)
-	}()
-
-	result = icmd.WaitOnCmd(60*time.Second, result)
-	c.Assert(result, icmd.Matches, icmd.Expected{ExitCode: 11})
-}
-
-// Test for #2267
-func (s *DockerSuite) TestRunWriteHostsFileAndNotCommit(c *check.C) {
-	// Cannot run on Windows as Windows does not support diff.
-	testRequires(c, DaemonIsLinux)
-	name := "writehosts"
-	out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/hosts && cat /etc/hosts")
-	if !strings.Contains(out, "test2267") {
-		c.Fatal("/etc/hosts should contain 'test2267'")
-	}
-
-	out, _ = dockerCmd(c, "diff", name)
-	if len(strings.Trim(out, "\r\n")) != 0 && !eqToBaseDiff(out, c) {
-		c.Fatal("diff should be empty")
-	}
-}
-
-func eqToBaseDiff(out string, c *check.C) bool {
-	name := "eqToBaseDiff" + stringutils.GenerateRandomAlphaOnlyString(32)
-	dockerCmd(c, "run", "--name", name, "busybox", "echo", "hello")
-	cID, err := getIDByName(name)
-	c.Assert(err, check.IsNil)
-
-	baseDiff, _ := dockerCmd(c, "diff", cID)
-	baseArr := strings.Split(baseDiff, "\n")
-	sort.Strings(baseArr)
-	outArr := strings.Split(out, "\n")
-	sort.Strings(outArr)
-	return sliceEq(baseArr, outArr)
-}
-
-func sliceEq(a, b []string) bool {
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-
-	return true
-}
-
-// Test for #2267
-func (s *DockerSuite) TestRunWriteHostnameFileAndNotCommit(c *check.C) {
-	// Cannot run on Windows as Windows does not support diff.
-	testRequires(c, DaemonIsLinux)
-	name := "writehostname"
-	out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/hostname && cat /etc/hostname")
-	if !strings.Contains(out, "test2267") {
-		c.Fatal("/etc/hostname should contain 'test2267'")
-	}
-
-	out, _ = dockerCmd(c, "diff", name)
-	if len(strings.Trim(out, "\r\n")) != 0 && !eqToBaseDiff(out, c) {
-		c.Fatal("diff should be empty")
-	}
-}
-
-// Test for #2267
-func (s *DockerSuite) TestRunWriteResolvFileAndNotCommit(c *check.C) {
-	// Cannot run on Windows as Windows does not support diff.
-	testRequires(c, DaemonIsLinux)
-	name := "writeresolv"
-	out, _ := dockerCmd(c, "run", "--name", name, "busybox", "sh", "-c", "echo test2267 >> /etc/resolv.conf && cat /etc/resolv.conf")
-	if !strings.Contains(out, "test2267") {
-		c.Fatal("/etc/resolv.conf should contain 'test2267'")
-	}
-
-	out, _ = dockerCmd(c, "diff", name)
-	if len(strings.Trim(out, "\r\n")) != 0 && !eqToBaseDiff(out, c) {
-		c.Fatal("diff should be empty")
-	}
-}
-
-func (s *DockerSuite) TestRunWithBadDevice(c *check.C) {
-	// Cannot run on Windows as Windows does not support --device
-	testRequires(c, DaemonIsLinux)
-	name := "baddevice"
-	out, _, err := dockerCmdWithError("run", "--name", name, "--device", "/etc", "busybox", "true")
-
-	if err == nil {
-		c.Fatal("Run should fail with bad device")
-	}
-	expected := `"/etc": not a device node`
-	if !strings.Contains(out, expected) {
-		c.Fatalf("Output should contain %q, actual out: %q", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunEntrypoint(c *check.C) {
-	name := "entrypoint"
-
-	out, _ := dockerCmd(c, "run", "--name", name, "--entrypoint", "echo", "busybox", "-n", "foobar")
-	expected := "foobar"
-
-	if out != expected {
-		c.Fatalf("Output should be %q, actual out: %q", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunBindMounts(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	if daemonPlatform == "linux" {
-		testRequires(c, DaemonIsLinux, NotUserNamespace)
-	}
-
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-
-	tmpDir, err := ioutil.TempDir("", "docker-test-container")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	defer os.RemoveAll(tmpDir)
-	writeFile(path.Join(tmpDir, "touch-me"), "", c)
-
-	// TODO Windows: Temporary check - remove once TP5 support is dropped
-	if daemonPlatform != "windows" || windowsDaemonKV >= 14350 {
-		// Test reading from a read-only bind mount
-		out, _ := dockerCmd(c, "run", "-v", fmt.Sprintf("%s:%s/tmp:ro", tmpDir, prefix), "busybox", "ls", prefix+"/tmp")
-		if !strings.Contains(out, "touch-me") {
-			c.Fatal("Container failed to read from bind mount")
-		}
-	}
-
-	// test writing to bind mount
-	if daemonPlatform == "windows" {
-		dockerCmd(c, "run", "-v", fmt.Sprintf(`%s:c:\tmp:rw`, tmpDir), "busybox", "touch", "c:/tmp/holla")
-	} else {
-		dockerCmd(c, "run", "-v", fmt.Sprintf("%s:/tmp:rw", tmpDir), "busybox", "touch", "/tmp/holla")
-	}
-
-	readFile(path.Join(tmpDir, "holla"), c) // Will fail if the file doesn't exist
-
-	// test mounting to an illegal destination directory
-	_, _, err = dockerCmdWithError("run", "-v", fmt.Sprintf("%s:.", tmpDir), "busybox", "ls", ".")
-	if err == nil {
-		c.Fatal("Container bind mounted illegal directory")
-	}
-
-	// Windows does not (and likely never will) support mounting a single file
-	if daemonPlatform != "windows" {
-		// test mount a file
-		dockerCmd(c, "run", "-v", fmt.Sprintf("%s/holla:/tmp/holla:rw", tmpDir), "busybox", "sh", "-c", "echo -n 'yotta' > /tmp/holla")
-		content := readFile(path.Join(tmpDir, "holla"), c) // Will fail if the file doesn't exist
-		expected := "yotta"
-		if content != expected {
-			c.Fatalf("Output should be %q, actual out: %q", expected, content)
-		}
-	}
-}
-
-// Ensure that CIDFile gets deleted if it's empty
-// Perform this test by making `docker run` fail
-func (s *DockerSuite) TestRunCidFileCleanupIfEmpty(c *check.C) {
-	// Skip on Windows. Base image on Windows has a CMD set in the image.
-	testRequires(c, DaemonIsLinux)
-
-	tmpDir, err := ioutil.TempDir("", "TestRunCidFile")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-	tmpCidFile := path.Join(tmpDir, "cid")
-
-	image := "emptyfs"
-	if daemonPlatform == "windows" {
-		// Windows can't support an emptyfs image. Just use the regular Windows image
-		image = WindowsBaseImage
-	}
-	out, _, err := dockerCmdWithError("run", "--cidfile", tmpCidFile, image)
-	if err == nil {
-		c.Fatalf("Run without command must fail. out=%s", out)
-	} else if !strings.Contains(out, "No command specified") {
-		c.Fatalf("Run without command failed with wrong output. out=%s\nerr=%v", out, err)
-	}
-
-	if _, err := os.Stat(tmpCidFile); err == nil {
-		c.Fatalf("empty CIDFile %q should've been deleted", tmpCidFile)
-	}
-}
-
-// #2098 - Docker cidFiles only contain short version of the containerId
-//sudo docker run --cidfile /tmp/docker_tesc.cid ubuntu echo "test"
-// TestRunCidFile tests that run --cidfile returns the longid
-func (s *DockerSuite) TestRunCidFileCheckIDLength(c *check.C) {
-	tmpDir, err := ioutil.TempDir("", "TestRunCidFile")
-	if err != nil {
-		c.Fatal(err)
-	}
-	tmpCidFile := path.Join(tmpDir, "cid")
-	defer os.RemoveAll(tmpDir)
-
-	out, _ := dockerCmd(c, "run", "-d", "--cidfile", tmpCidFile, "busybox", "true")
-
-	id := strings.TrimSpace(out)
-	buffer, err := ioutil.ReadFile(tmpCidFile)
-	if err != nil {
-		c.Fatal(err)
-	}
-	cid := string(buffer)
-	if len(cid) != 64 {
-		c.Fatalf("--cidfile should be a long id, not %q", id)
-	}
-	if cid != id {
-		c.Fatalf("cid must be equal to %s, got %s", id, cid)
-	}
-}
-
-func (s *DockerSuite) TestRunSetMacAddress(c *check.C) {
-	mac := "12:34:56:78:9a:bc"
-	var out string
-	if daemonPlatform == "windows" {
-		out, _ = dockerCmd(c, "run", "-i", "--rm", fmt.Sprintf("--mac-address=%s", mac), "busybox", "sh", "-c", "ipconfig /all | grep 'Physical Address' | awk '{print $12}'")
-		mac = strings.Replace(strings.ToUpper(mac), ":", "-", -1) // To Windows-style MACs
-	} else {
-		out, _ = dockerCmd(c, "run", "-i", "--rm", fmt.Sprintf("--mac-address=%s", mac), "busybox", "/bin/sh", "-c", "ip link show eth0 | tail -1 | awk '{print $2}'")
-	}
-
-	actualMac := strings.TrimSpace(out)
-	if actualMac != mac {
-		c.Fatalf("Set MAC address with --mac-address failed. The container has an incorrect MAC address: %q, expected: %q", actualMac, mac)
-	}
-}
-
-func (s *DockerSuite) TestRunInspectMacAddress(c *check.C) {
-	// TODO Windows. Network settings are not propagated back to inspect.
-	testRequires(c, DaemonIsLinux)
-	mac := "12:34:56:78:9a:bc"
-	out, _ := dockerCmd(c, "run", "-d", "--mac-address="+mac, "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	inspectedMac := inspectField(c, id, "NetworkSettings.Networks.bridge.MacAddress")
-	if inspectedMac != mac {
-		c.Fatalf("docker inspect outputs wrong MAC address: %q, should be: %q", inspectedMac, mac)
-	}
-}
-
-// test docker run use an invalid mac address
-func (s *DockerSuite) TestRunWithInvalidMacAddress(c *check.C) {
-	out, _, err := dockerCmdWithError("run", "--mac-address", "92:d0:c6:0a:29", "busybox")
-	//use an invalid mac address should with an error out
-	if err == nil || !strings.Contains(out, "is not a valid mac address") {
-		c.Fatalf("run with an invalid --mac-address should with error out")
-	}
-}
-
-func (s *DockerSuite) TestRunDeallocatePortOnMissingIptablesRule(c *check.C) {
-	// TODO Windows. Network settings are not propagated back to inspect.
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "-p", "23:23", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	ip := inspectField(c, id, "NetworkSettings.Networks.bridge.IPAddress")
-	iptCmd := exec.Command("iptables", "-D", "DOCKER", "-d", fmt.Sprintf("%s/32", ip),
-		"!", "-i", "docker0", "-o", "docker0", "-p", "tcp", "-m", "tcp", "--dport", "23", "-j", "ACCEPT")
-	out, _, err := runCommandWithOutput(iptCmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-	if err := deleteContainer(id); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-d", "-p", "23:23", "busybox", "top")
-}
-
-func (s *DockerSuite) TestRunPortInUse(c *check.C) {
-	// TODO Windows. The duplicate NAT message returned by Windows will be
-	// changing as is currently completely undecipherable. Does need modifying
-	// to run sh rather than top though as top isn't in Windows busybox.
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	port := "1234"
-	dockerCmd(c, "run", "-d", "-p", port+":80", "busybox", "top")
-
-	out, _, err := dockerCmdWithError("run", "-d", "-p", port+":80", "busybox", "top")
-	if err == nil {
-		c.Fatalf("Binding on used port must fail")
-	}
-	if !strings.Contains(out, "port is already allocated") {
-		c.Fatalf("Out must be about \"port is already allocated\", got %s", out)
-	}
-}
-
-// https://github.com/docker/docker/issues/12148
-func (s *DockerSuite) TestRunAllocatePortInReservedRange(c *check.C) {
-	// TODO Windows. -P is not yet supported
-	testRequires(c, DaemonIsLinux)
-	// allocate a dynamic port to get the most recent
-	out, _ := dockerCmd(c, "run", "-d", "-P", "-p", "80", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "port", id, "80")
-
-	strPort := strings.Split(strings.TrimSpace(out), ":")[1]
-	port, err := strconv.ParseInt(strPort, 10, 64)
-	if err != nil {
-		c.Fatalf("invalid port, got: %s, error: %s", strPort, err)
-	}
-
-	// allocate a static port and a dynamic port together, with static port
-	// takes the next recent port in dynamic port range.
-	dockerCmd(c, "run", "-d", "-P", "-p", "80", "-p", fmt.Sprintf("%d:8080", port+1), "busybox", "top")
-}
-
-// Regression test for #7792
-func (s *DockerSuite) TestRunMountOrdering(c *check.C) {
-	// TODO Windows: Post TP5. Updated, but Windows does not support nested mounts currently.
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-
-	tmpDir, err := ioutil.TempDir("", "docker_nested_mount_test")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	tmpDir2, err := ioutil.TempDir("", "docker_nested_mount_test2")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir2)
-
-	// Create a temporary tmpfs mounc.
-	fooDir := filepath.Join(tmpDir, "foo")
-	if err := os.MkdirAll(filepath.Join(tmpDir, "foo"), 0755); err != nil {
-		c.Fatalf("failed to mkdir at %s - %s", fooDir, err)
-	}
-
-	if err := ioutil.WriteFile(fmt.Sprintf("%s/touch-me", fooDir), []byte{}, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(fmt.Sprintf("%s/touch-me", tmpDir), []byte{}, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(fmt.Sprintf("%s/touch-me", tmpDir2), []byte{}, 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run",
-		"-v", fmt.Sprintf("%s:"+prefix+"/tmp", tmpDir),
-		"-v", fmt.Sprintf("%s:"+prefix+"/tmp/foo", fooDir),
-		"-v", fmt.Sprintf("%s:"+prefix+"/tmp/tmp2", tmpDir2),
-		"-v", fmt.Sprintf("%s:"+prefix+"/tmp/tmp2/foo", fooDir),
-		"busybox:latest", "sh", "-c",
-		"ls "+prefix+"/tmp/touch-me && ls "+prefix+"/tmp/foo/touch-me && ls "+prefix+"/tmp/tmp2/touch-me && ls "+prefix+"/tmp/tmp2/foo/touch-me")
-}
-
-// Regression test for https://github.com/docker/docker/issues/8259
-func (s *DockerSuite) TestRunReuseBindVolumeThatIsSymlink(c *check.C) {
-	// Not applicable on Windows as Windows does not support volumes
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-
-	tmpDir, err := ioutil.TempDir(os.TempDir(), "testlink")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	linkPath := os.TempDir() + "/testlink2"
-	if err := os.Symlink(tmpDir, linkPath); err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(linkPath)
-
-	// Create first container
-	dockerCmd(c, "run", "-v", fmt.Sprintf("%s:"+prefix+"/tmp/test", linkPath), "busybox", "ls", prefix+"/tmp/test")
-
-	// Create second container with same symlinked path
-	// This will fail if the referenced issue is hit with a "Volume exists" error
-	dockerCmd(c, "run", "-v", fmt.Sprintf("%s:"+prefix+"/tmp/test", linkPath), "busybox", "ls", prefix+"/tmp/test")
-}
-
-//GH#10604: Test an "/etc" volume doesn't overlay special bind mounts in container
-func (s *DockerSuite) TestRunCreateVolumeEtc(c *check.C) {
-	// While Windows supports volumes, it does not support --add-host hence
-	// this test is not applicable on Windows.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--dns=127.0.0.1", "-v", "/etc", "busybox", "cat", "/etc/resolv.conf")
-	if !strings.Contains(out, "nameserver 127.0.0.1") {
-		c.Fatal("/etc volume mount hides /etc/resolv.conf")
-	}
-
-	out, _ = dockerCmd(c, "run", "-h=test123", "-v", "/etc", "busybox", "cat", "/etc/hostname")
-	if !strings.Contains(out, "test123") {
-		c.Fatal("/etc volume mount hides /etc/hostname")
-	}
-
-	out, _ = dockerCmd(c, "run", "--add-host=test:192.168.0.1", "-v", "/etc", "busybox", "cat", "/etc/hosts")
-	out = strings.Replace(out, "\n", " ", -1)
-	if !strings.Contains(out, "192.168.0.1\ttest") || !strings.Contains(out, "127.0.0.1\tlocalhost") {
-		c.Fatal("/etc volume mount hides /etc/hosts")
-	}
-}
-
-func (s *DockerSuite) TestVolumesNoCopyData(c *check.C) {
-	// TODO Windows (Post RS1). Windows does not support volumes which
-	// are pre-populated such as is built in the dockerfile used in this test.
-	testRequires(c, DaemonIsLinux)
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	if _, err := buildImage("dataimage",
-		`FROM busybox
-		RUN ["mkdir", "-p", "/foo"]
-		RUN ["touch", "/foo/bar"]`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "--name", "test", "-v", prefix+slash+"foo", "busybox")
-
-	if out, _, err := dockerCmdWithError("run", "--volumes-from", "test", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("Data was copied on volumes-from but shouldn't be:\n%q", out)
-	}
-
-	tmpDir := randomTmpDirPath("docker_test_bind_mount_copy_data", daemonPlatform)
-	if out, _, err := dockerCmdWithError("run", "-v", tmpDir+":/foo", "dataimage", "ls", "-lh", "/foo/bar"); err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("Data was copied on bind-mount but shouldn't be:\n%q", out)
-	}
-}
-
-func (s *DockerSuite) TestRunNoOutputFromPullInStdout(c *check.C) {
-	// just run with unknown image
-	cmd := exec.Command(dockerBinary, "run", "asdfsg")
-	stdout := bytes.NewBuffer(nil)
-	cmd.Stdout = stdout
-	if err := cmd.Run(); err == nil {
-		c.Fatal("Run with unknown image should fail")
-	}
-	if stdout.Len() != 0 {
-		c.Fatalf("Stdout contains output from pull: %s", stdout)
-	}
-}
-
-func (s *DockerSuite) TestRunVolumesCleanPaths(c *check.C) {
-	testRequires(c, SameHostDaemon)
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-	if _, err := buildImage("run_volumes_clean_paths",
-		`FROM busybox
-		VOLUME `+prefix+`/foo/`,
-		true); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-v", prefix+"/foo", "-v", prefix+"/bar/", "--name", "dark_helmet", "run_volumes_clean_paths")
-
-	out, err := inspectMountSourceField("dark_helmet", prefix+slash+"foo"+slash)
-	if err != errMountNotFound {
-		c.Fatalf("Found unexpected volume entry for '%s/foo/' in volumes\n%q", prefix, out)
-	}
-
-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+`foo`)
-	c.Assert(err, check.IsNil)
-	if !strings.Contains(strings.ToLower(out), strings.ToLower(volumesConfigPath)) {
-		c.Fatalf("Volume was not defined for %s/foo\n%q", prefix, out)
-	}
-
-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+"bar"+slash)
-	if err != errMountNotFound {
-		c.Fatalf("Found unexpected volume entry for '%s/bar/' in volumes\n%q", prefix, out)
-	}
-
-	out, err = inspectMountSourceField("dark_helmet", prefix+slash+"bar")
-	c.Assert(err, check.IsNil)
-	if !strings.Contains(strings.ToLower(out), strings.ToLower(volumesConfigPath)) {
-		c.Fatalf("Volume was not defined for %s/bar\n%q", prefix, out)
-	}
-}
-
-// Regression test for #3631
-func (s *DockerSuite) TestRunSlowStdoutConsumer(c *check.C) {
-	// TODO Windows: This should be able to run on Windows if can find an
-	// alternate to /dev/zero and /dev/stdout.
-	testRequires(c, DaemonIsLinux)
-	cont := exec.Command(dockerBinary, "run", "--rm", "busybox", "/bin/sh", "-c", "dd if=/dev/zero of=/dev/stdout bs=1024 count=2000 | catv")
-
-	stdout, err := cont.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	if err := cont.Start(); err != nil {
-		c.Fatal(err)
-	}
-	n, err := consumeWithSpeed(stdout, 10000, 5*time.Millisecond, nil)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	expected := 2 * 1024 * 2000
-	if n != expected {
-		c.Fatalf("Expected %d, got %d", expected, n)
-	}
-}
-
-func (s *DockerSuite) TestRunAllowPortRangeThroughExpose(c *check.C) {
-	// TODO Windows: -P is not currently supported. Also network
-	// settings are not propagated back.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--expose", "3000-3003", "-P", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	portstr := inspectFieldJSON(c, id, "NetworkSettings.Ports")
-	var ports nat.PortMap
-	if err := json.Unmarshal([]byte(portstr), &ports); err != nil {
-		c.Fatal(err)
-	}
-	for port, binding := range ports {
-		portnum, _ := strconv.Atoi(strings.Split(string(port), "/")[0])
-		if portnum < 3000 || portnum > 3003 {
-			c.Fatalf("Port %d is out of range ", portnum)
-		}
-		if binding == nil || len(binding) != 1 || len(binding[0].HostPort) == 0 {
-			c.Fatalf("Port is not mapped for the port %s", port)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunExposePort(c *check.C) {
-	out, _, err := dockerCmdWithError("run", "--expose", "80000", "busybox")
-	c.Assert(err, checker.NotNil, check.Commentf("--expose with an invalid port should error out"))
-	c.Assert(out, checker.Contains, "invalid range format for --expose")
-}
-
-func (s *DockerSuite) TestRunModeIpcHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	hostIpc, err := os.Readlink("/proc/1/ns/ipc")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--ipc=host", "busybox", "readlink", "/proc/self/ns/ipc")
-	out = strings.Trim(out, "\n")
-	if hostIpc != out {
-		c.Fatalf("IPC different with --ipc=host %s != %s\n", hostIpc, out)
-	}
-
-	out, _ = dockerCmd(c, "run", "busybox", "readlink", "/proc/self/ns/ipc")
-	out = strings.Trim(out, "\n")
-	if hostIpc == out {
-		c.Fatalf("IPC should be different without --ipc=host %s == %s\n", hostIpc, out)
-	}
-}
-
-func (s *DockerSuite) TestRunModeIpcContainer(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && touch /dev/mqueue/toto && top")
-
-	id := strings.TrimSpace(out)
-	state := inspectField(c, id, "State.Running")
-	if state != "true" {
-		c.Fatal("Container state is 'not running'")
-	}
-	pid1 := inspectField(c, id, "State.Pid")
-
-	parentContainerIpc, err := os.Readlink(fmt.Sprintf("/proc/%s/ns/ipc", pid1))
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ = dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "readlink", "/proc/self/ns/ipc")
-	out = strings.Trim(out, "\n")
-	if parentContainerIpc != out {
-		c.Fatalf("IPC different with --ipc=container:%s %s != %s\n", id, parentContainerIpc, out)
-	}
-
-	catOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "cat", "/dev/shm/test")
-	if catOutput != "test" {
-		c.Fatalf("Output of /dev/shm/test expected test but found: %s", catOutput)
-	}
-
-	// check that /dev/mqueue is actually of mqueue type
-	grepOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "grep", "/dev/mqueue", "/proc/mounts")
-	if !strings.HasPrefix(grepOutput, "mqueue /dev/mqueue mqueue rw") {
-		c.Fatalf("Output of 'grep /proc/mounts' expected 'mqueue /dev/mqueue mqueue rw' but found: %s", grepOutput)
-	}
-
-	lsOutput, _ := dockerCmd(c, "run", fmt.Sprintf("--ipc=container:%s", id), "busybox", "ls", "/dev/mqueue")
-	lsOutput = strings.Trim(lsOutput, "\n")
-	if lsOutput != "toto" {
-		c.Fatalf("Output of 'ls /dev/mqueue' expected 'toto' but found: %s", lsOutput)
-	}
-}
-
-func (s *DockerSuite) TestRunModeIpcContainerNotExists(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-d", "--ipc", "container:abcd1234", "busybox", "top")
-	if !strings.Contains(out, "abcd1234") || err == nil {
-		c.Fatalf("run IPC from a non exists container should with correct error out")
-	}
-}
-
-func (s *DockerSuite) TestRunModeIpcContainerNotRunning(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "create", "busybox")
-
-	id := strings.TrimSpace(out)
-	out, _, err := dockerCmdWithError("run", fmt.Sprintf("--ipc=container:%s", id), "busybox")
-	if err == nil {
-		c.Fatalf("Run container with ipc mode container should fail with non running container: %s\n%s", out, err)
-	}
-}
-
-func (s *DockerSuite) TestRunModePIDContainer(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "top")
-
-	id := strings.TrimSpace(out)
-	state := inspectField(c, id, "State.Running")
-	if state != "true" {
-		c.Fatal("Container state is 'not running'")
-	}
-	pid1 := inspectField(c, id, "State.Pid")
-
-	parentContainerPid, err := os.Readlink(fmt.Sprintf("/proc/%s/ns/pid", pid1))
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ = dockerCmd(c, "run", fmt.Sprintf("--pid=container:%s", id), "busybox", "readlink", "/proc/self/ns/pid")
-	out = strings.Trim(out, "\n")
-	if parentContainerPid != out {
-		c.Fatalf("PID different with --pid=container:%s %s != %s\n", id, parentContainerPid, out)
-	}
-}
-
-func (s *DockerSuite) TestRunModePIDContainerNotExists(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-d", "--pid", "container:abcd1234", "busybox", "top")
-	if !strings.Contains(out, "abcd1234") || err == nil {
-		c.Fatalf("run PID from a non exists container should with correct error out")
-	}
-}
-
-func (s *DockerSuite) TestRunModePIDContainerNotRunning(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "create", "busybox")
-
-	id := strings.TrimSpace(out)
-	out, _, err := dockerCmdWithError("run", fmt.Sprintf("--pid=container:%s", id), "busybox")
-	if err == nil {
-		c.Fatalf("Run container with pid mode container should fail with non running container: %s\n%s", out, err)
-	}
-}
-
-func (s *DockerSuite) TestRunMountShmMqueueFromHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	dockerCmd(c, "run", "-d", "--name", "shmfromhost", "-v", "/dev/shm:/dev/shm", "-v", "/dev/mqueue:/dev/mqueue", "busybox", "sh", "-c", "echo -n test > /dev/shm/test && touch /dev/mqueue/toto && top")
-	defer os.Remove("/dev/mqueue/toto")
-	defer os.Remove("/dev/shm/test")
-	volPath, err := inspectMountSourceField("shmfromhost", "/dev/shm")
-	c.Assert(err, checker.IsNil)
-	if volPath != "/dev/shm" {
-		c.Fatalf("volumePath should have been /dev/shm, was %s", volPath)
-	}
-
-	out, _ := dockerCmd(c, "run", "--name", "ipchost", "--ipc", "host", "busybox", "cat", "/dev/shm/test")
-	if out != "test" {
-		c.Fatalf("Output of /dev/shm/test expected test but found: %s", out)
-	}
-
-	// Check that the mq was created
-	if _, err := os.Stat("/dev/mqueue/toto"); err != nil {
-		c.Fatalf("Failed to confirm '/dev/mqueue/toto' presence on host: %s", err.Error())
-	}
-}
-
-func (s *DockerSuite) TestContainerNetworkMode(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-	pid1 := inspectField(c, id, "State.Pid")
-
-	parentContainerNet, err := os.Readlink(fmt.Sprintf("/proc/%s/ns/net", pid1))
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ = dockerCmd(c, "run", fmt.Sprintf("--net=container:%s", id), "busybox", "readlink", "/proc/self/ns/net")
-	out = strings.Trim(out, "\n")
-	if parentContainerNet != out {
-		c.Fatalf("NET different with --net=container:%s %s != %s\n", id, parentContainerNet, out)
-	}
-}
-
-func (s *DockerSuite) TestRunModePIDHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	hostPid, err := os.Readlink("/proc/1/ns/pid")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--pid=host", "busybox", "readlink", "/proc/self/ns/pid")
-	out = strings.Trim(out, "\n")
-	if hostPid != out {
-		c.Fatalf("PID different with --pid=host %s != %s\n", hostPid, out)
-	}
-
-	out, _ = dockerCmd(c, "run", "busybox", "readlink", "/proc/self/ns/pid")
-	out = strings.Trim(out, "\n")
-	if hostPid == out {
-		c.Fatalf("PID should be different without --pid=host %s == %s\n", hostPid, out)
-	}
-}
-
-func (s *DockerSuite) TestRunModeUTSHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	hostUTS, err := os.Readlink("/proc/1/ns/uts")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--uts=host", "busybox", "readlink", "/proc/self/ns/uts")
-	out = strings.Trim(out, "\n")
-	if hostUTS != out {
-		c.Fatalf("UTS different with --uts=host %s != %s\n", hostUTS, out)
-	}
-
-	out, _ = dockerCmd(c, "run", "busybox", "readlink", "/proc/self/ns/uts")
-	out = strings.Trim(out, "\n")
-	if hostUTS == out {
-		c.Fatalf("UTS should be different without --uts=host %s == %s\n", hostUTS, out)
-	}
-
-	out, _ = dockerCmdWithFail(c, "run", "-h=name", "--uts=host", "busybox", "ps")
-	c.Assert(out, checker.Contains, runconfig.ErrConflictUTSHostname.Error())
-}
-
-func (s *DockerSuite) TestRunTLSVerify(c *check.C) {
-	// Remote daemons use TLS and this test is not applicable when TLS is required.
-	testRequires(c, SameHostDaemon)
-	if out, code, err := dockerCmdWithError("ps"); err != nil || code != 0 {
-		c.Fatalf("Should have worked: %v:\n%v", err, out)
-	}
-
-	// Regardless of whether we specify true or false we need to
-	// test to make sure tls is turned on if --tlsverify is specified at all
-	result := dockerCmdWithResult("--tlsverify=false", "ps")
-	result.Assert(c, icmd.Expected{ExitCode: 1, Err: "error during connect"})
-
-	result = dockerCmdWithResult("--tlsverify=true", "ps")
-	result.Assert(c, icmd.Expected{ExitCode: 1, Err: "cert"})
-}
-
-func (s *DockerSuite) TestRunPortFromDockerRangeInUse(c *check.C) {
-	// TODO Windows. Once moved to libnetwork/CNM, this may be able to be
-	// re-instated.
-	testRequires(c, DaemonIsLinux)
-	// first find allocator current position
-	out, _ := dockerCmd(c, "run", "-d", "-p", ":80", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "port", id)
-
-	out = strings.TrimSpace(out)
-	if out == "" {
-		c.Fatal("docker port command output is empty")
-	}
-	out = strings.Split(out, ":")[1]
-	lastPort, err := strconv.Atoi(out)
-	if err != nil {
-		c.Fatal(err)
-	}
-	port := lastPort + 1
-	l, err := net.Listen("tcp", ":"+strconv.Itoa(port))
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer l.Close()
-
-	out, _ = dockerCmd(c, "run", "-d", "-p", ":80", "busybox", "top")
-
-	id = strings.TrimSpace(out)
-	dockerCmd(c, "port", id)
-}
-
-func (s *DockerSuite) TestRunTTYWithPipe(c *check.C) {
-	errChan := make(chan error)
-	go func() {
-		defer close(errChan)
-
-		cmd := exec.Command(dockerBinary, "run", "-ti", "busybox", "true")
-		if _, err := cmd.StdinPipe(); err != nil {
-			errChan <- err
-			return
-		}
-
-		expected := "the input device is not a TTY"
-		if runtime.GOOS == "windows" {
-			expected += ".  If you are using mintty, try prefixing the command with 'winpty'"
-		}
-		if out, _, err := runCommandWithOutput(cmd); err == nil {
-			errChan <- fmt.Errorf("run should have failed")
-			return
-		} else if !strings.Contains(out, expected) {
-			errChan <- fmt.Errorf("run failed with error %q: expected %q", out, expected)
-			return
-		}
-	}()
-
-	select {
-	case err := <-errChan:
-		c.Assert(err, check.IsNil)
-	case <-time.After(30 * time.Second):
-		c.Fatal("container is running but should have failed")
-	}
-}
-
-func (s *DockerSuite) TestRunNonLocalMacAddress(c *check.C) {
-	addr := "00:16:3E:08:00:50"
-	args := []string{"run", "--mac-address", addr}
-	expected := addr
-
-	if daemonPlatform != "windows" {
-		args = append(args, "busybox", "ifconfig")
-	} else {
-		args = append(args, WindowsBaseImage, "ipconfig", "/all")
-		expected = strings.Replace(strings.ToUpper(addr), ":", "-", -1)
-	}
-
-	if out, _ := dockerCmd(c, args...); !strings.Contains(out, expected) {
-		c.Fatalf("Output should have contained %q: %s", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunNetHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	hostNet, err := os.Readlink("/proc/1/ns/net")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "run", "--net=host", "busybox", "readlink", "/proc/self/ns/net")
-	out = strings.Trim(out, "\n")
-	if hostNet != out {
-		c.Fatalf("Net namespace different with --net=host %s != %s\n", hostNet, out)
-	}
-
-	out, _ = dockerCmd(c, "run", "busybox", "readlink", "/proc/self/ns/net")
-	out = strings.Trim(out, "\n")
-	if hostNet == out {
-		c.Fatalf("Net namespace should be different without --net=host %s == %s\n", hostNet, out)
-	}
-}
-
-func (s *DockerSuite) TestRunNetHostTwiceSameName(c *check.C) {
-	// TODO Windows. As Windows networking evolves and converges towards
-	// CNM, this test may be possible to enable on Windows.
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	dockerCmd(c, "run", "--rm", "--name=thost", "--net=host", "busybox", "true")
-	dockerCmd(c, "run", "--rm", "--name=thost", "--net=host", "busybox", "true")
-}
-
-func (s *DockerSuite) TestRunNetContainerWhichHost(c *check.C) {
-	// Not applicable on Windows as uses Unix-specific capabilities
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	hostNet, err := os.Readlink("/proc/1/ns/net")
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-d", "--net=host", "--name=test", "busybox", "top")
-
-	out, _ := dockerCmd(c, "run", "--net=container:test", "busybox", "readlink", "/proc/self/ns/net")
-	out = strings.Trim(out, "\n")
-	if hostNet != out {
-		c.Fatalf("Container should have host network namespace")
-	}
-}
-
-func (s *DockerSuite) TestRunAllowPortRangeThroughPublish(c *check.C) {
-	// TODO Windows. This may be possible to enable in the future. However,
-	// Windows does not currently support --expose, or populate the network
-	// settings seen through inspect.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--expose", "3000-3003", "-p", "3000-3003", "busybox", "top")
-
-	id := strings.TrimSpace(out)
-	portstr := inspectFieldJSON(c, id, "NetworkSettings.Ports")
-
-	var ports nat.PortMap
-	err := json.Unmarshal([]byte(portstr), &ports)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to unmarshal: %v", portstr))
-	for port, binding := range ports {
-		portnum, _ := strconv.Atoi(strings.Split(string(port), "/")[0])
-		if portnum < 3000 || portnum > 3003 {
-			c.Fatalf("Port %d is out of range ", portnum)
-		}
-		if binding == nil || len(binding) != 1 || len(binding[0].HostPort) == 0 {
-			c.Fatal("Port is not mapped for the port "+port, out)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunSetDefaultRestartPolicy(c *check.C) {
-	runSleepingContainer(c, "--name=testrunsetdefaultrestartpolicy")
-	out := inspectField(c, "testrunsetdefaultrestartpolicy", "HostConfig.RestartPolicy.Name")
-	if out != "no" {
-		c.Fatalf("Set default restart policy failed")
-	}
-}
-
-func (s *DockerSuite) TestRunRestartMaxRetries(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "false")
-	timeout := 10 * time.Second
-	if daemonPlatform == "windows" {
-		timeout = 120 * time.Second
-	}
-
-	id := strings.TrimSpace(string(out))
-	if err := waitInspect(id, "{{ .State.Restarting }} {{ .State.Running }}", "false false", timeout); err != nil {
-		c.Fatal(err)
-	}
-
-	count := inspectField(c, id, "RestartCount")
-	if count != "3" {
-		c.Fatalf("Container was restarted %s times, expected %d", count, 3)
-	}
-
-	MaximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-	if MaximumRetryCount != "3" {
-		c.Fatalf("Container Maximum Retry Count is %s, expected %s", MaximumRetryCount, "3")
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithWritableRootfs(c *check.C) {
-	dockerCmd(c, "run", "--rm", "busybox", "touch", "/file")
-}
-
-func (s *DockerSuite) TestRunContainerWithReadonlyRootfs(c *check.C) {
-	// Not applicable on Windows which does not support --read-only
-	testRequires(c, DaemonIsLinux, UserNamespaceROMount)
-
-	testPriv := true
-	// don't test privileged mode subtest if user namespaces enabled
-	if root := os.Getenv("DOCKER_REMAP_ROOT"); root != "" {
-		testPriv = false
-	}
-	testReadOnlyFile(c, testPriv, "/file", "/etc/hosts", "/etc/resolv.conf", "/etc/hostname", "/sys/kernel", "/dev/.dont.touch.me")
-}
-
-func (s *DockerSuite) TestPermissionsPtsReadonlyRootfs(c *check.C) {
-	// Not applicable on Windows due to use of Unix specific functionality, plus
-	// the use of --read-only which is not supported.
-	testRequires(c, DaemonIsLinux, UserNamespaceROMount)
-
-	// Ensure we have not broken writing /dev/pts
-	out, status := dockerCmd(c, "run", "--read-only", "--rm", "busybox", "mount")
-	if status != 0 {
-		c.Fatal("Could not obtain mounts when checking /dev/pts mntpnt.")
-	}
-	expected := "type devpts (rw,"
-	if !strings.Contains(string(out), expected) {
-		c.Fatalf("expected output to contain %s but contains %s", expected, out)
-	}
-}
-
-func testReadOnlyFile(c *check.C, testPriv bool, filenames ...string) {
-	touch := "touch " + strings.Join(filenames, " ")
-	out, _, err := dockerCmdWithError("run", "--read-only", "--rm", "busybox", "sh", "-c", touch)
-	c.Assert(err, checker.NotNil)
-
-	for _, f := range filenames {
-		expected := "touch: " + f + ": Read-only file system"
-		c.Assert(out, checker.Contains, expected)
-	}
-
-	if !testPriv {
-		return
-	}
-
-	out, _, err = dockerCmdWithError("run", "--read-only", "--privileged", "--rm", "busybox", "sh", "-c", touch)
-	c.Assert(err, checker.NotNil)
-
-	for _, f := range filenames {
-		expected := "touch: " + f + ": Read-only file system"
-		c.Assert(out, checker.Contains, expected)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithReadonlyEtcHostsAndLinkedContainer(c *check.C) {
-	// Not applicable on Windows which does not support --link
-	testRequires(c, DaemonIsLinux, UserNamespaceROMount)
-
-	dockerCmd(c, "run", "-d", "--name", "test-etc-hosts-ro-linked", "busybox", "top")
-
-	out, _ := dockerCmd(c, "run", "--read-only", "--link", "test-etc-hosts-ro-linked:testlinked", "busybox", "cat", "/etc/hosts")
-	if !strings.Contains(string(out), "testlinked") {
-		c.Fatal("Expected /etc/hosts to be updated even if --read-only enabled")
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithReadonlyRootfsWithDNSFlag(c *check.C) {
-	// Not applicable on Windows which does not support either --read-only or --dns.
-	testRequires(c, DaemonIsLinux, UserNamespaceROMount)
-
-	out, _ := dockerCmd(c, "run", "--read-only", "--dns", "1.1.1.1", "busybox", "/bin/cat", "/etc/resolv.conf")
-	if !strings.Contains(string(out), "1.1.1.1") {
-		c.Fatal("Expected /etc/resolv.conf to be updated even if --read-only enabled and --dns flag used")
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithReadonlyRootfsWithAddHostFlag(c *check.C) {
-	// Not applicable on Windows which does not support --read-only
-	testRequires(c, DaemonIsLinux, UserNamespaceROMount)
-
-	out, _ := dockerCmd(c, "run", "--read-only", "--add-host", "testreadonly:127.0.0.1", "busybox", "/bin/cat", "/etc/hosts")
-	if !strings.Contains(string(out), "testreadonly") {
-		c.Fatal("Expected /etc/hosts to be updated even if --read-only enabled and --add-host flag used")
-	}
-}
-
-func (s *DockerSuite) TestRunVolumesFromRestartAfterRemoved(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	runSleepingContainer(c, "--name=voltest", "-v", prefix+"/foo")
-	runSleepingContainer(c, "--name=restarter", "--volumes-from", "voltest")
-
-	// Remove the main volume container and restart the consuming container
-	dockerCmd(c, "rm", "-f", "voltest")
-
-	// This should not fail since the volumes-from were already applied
-	dockerCmd(c, "restart", "restarter")
-}
-
-// run container with --rm should remove container if exit code != 0
-func (s *DockerSuite) TestRunContainerWithRmFlagExitCodeNotEqualToZero(c *check.C) {
-	name := "flowers"
-	out, _, err := dockerCmdWithError("run", "--name", name, "--rm", "busybox", "ls", "/notexists")
-	if err == nil {
-		c.Fatal("Expected docker run to fail", out, err)
-	}
-
-	out, err = getAllContainers()
-	if err != nil {
-		c.Fatal(out, err)
-	}
-
-	if out != "" {
-		c.Fatal("Expected not to have containers", out)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithRmFlagCannotStartContainer(c *check.C) {
-	name := "sparkles"
-	out, _, err := dockerCmdWithError("run", "--name", name, "--rm", "busybox", "commandNotFound")
-	if err == nil {
-		c.Fatal("Expected docker run to fail", out, err)
-	}
-
-	out, err = getAllContainers()
-	if err != nil {
-		c.Fatal(out, err)
-	}
-
-	if out != "" {
-		c.Fatal("Expected not to have containers", out)
-	}
-}
-
-func (s *DockerSuite) TestRunPIDHostWithChildIsKillable(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	name := "ibuildthecloud"
-	dockerCmd(c, "run", "-d", "--pid=host", "--name", name, "busybox", "sh", "-c", "sleep 30; echo hi")
-
-	c.Assert(waitRun(name), check.IsNil)
-
-	errchan := make(chan error)
-	go func() {
-		if out, _, err := dockerCmdWithError("kill", name); err != nil {
-			errchan <- fmt.Errorf("%v:\n%s", err, out)
-		}
-		close(errchan)
-	}()
-	select {
-	case err := <-errchan:
-		c.Assert(err, check.IsNil)
-	case <-time.After(5 * time.Second):
-		c.Fatal("Kill container timed out")
-	}
-}
-
-func (s *DockerSuite) TestRunWithTooSmallMemoryLimit(c *check.C) {
-	// TODO Windows. This may be possible to enable once Windows supports
-	// memory limits on containers
-	testRequires(c, DaemonIsLinux)
-	// this memory limit is 1 byte less than the min, which is 4MB
-	// https://github.com/docker/docker/blob/v1.5.0/daemon/create.go#L22
-	out, _, err := dockerCmdWithError("run", "-m", "4194303", "busybox")
-	if err == nil || !strings.Contains(out, "Minimum memory limit allowed is 4MB") {
-		c.Fatalf("expected run to fail when using too low a memory limit: %q", out)
-	}
-}
-
-func (s *DockerSuite) TestRunWriteToProcAsound(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	_, code, err := dockerCmdWithError("run", "busybox", "sh", "-c", "echo 111 >> /proc/asound/version")
-	if err == nil || code == 0 {
-		c.Fatal("standard container should not be able to write to /proc/asound")
-	}
-}
-
-func (s *DockerSuite) TestRunReadProcTimer(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	out, code, err := dockerCmdWithError("run", "busybox", "cat", "/proc/timer_stats")
-	if code != 0 {
-		return
-	}
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.Trim(out, "\n ") != "" {
-		c.Fatalf("expected to receive no output from /proc/timer_stats but received %q", out)
-	}
-}
-
-func (s *DockerSuite) TestRunReadProcLatency(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	// some kernels don't have this configured so skip the test if this file is not found
-	// on the host running the tests.
-	if _, err := os.Stat("/proc/latency_stats"); err != nil {
-		c.Skip("kernel doesn't have latency_stats configured")
-		return
-	}
-	out, code, err := dockerCmdWithError("run", "busybox", "cat", "/proc/latency_stats")
-	if code != 0 {
-		return
-	}
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.Trim(out, "\n ") != "" {
-		c.Fatalf("expected to receive no output from /proc/latency_stats but received %q", out)
-	}
-}
-
-func (s *DockerSuite) TestRunReadFilteredProc(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace)
-
-	testReadPaths := []string{
-		"/proc/latency_stats",
-		"/proc/timer_stats",
-		"/proc/kcore",
-	}
-	for i, filePath := range testReadPaths {
-		name := fmt.Sprintf("procsieve-%d", i)
-		shellCmd := fmt.Sprintf("exec 3<%s", filePath)
-
-		out, exitCode, err := dockerCmdWithError("run", "--privileged", "--security-opt", "apparmor=docker-default", "--name", name, "busybox", "sh", "-c", shellCmd)
-		if exitCode != 0 {
-			return
-		}
-		if err != nil {
-			c.Fatalf("Open FD for read should have failed with permission denied, got: %s, %v", out, err)
-		}
-	}
-}
-
-func (s *DockerSuite) TestMountIntoProc(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	_, code, err := dockerCmdWithError("run", "-v", "/proc//sys", "busybox", "true")
-	if err == nil || code == 0 {
-		c.Fatal("container should not be able to mount into /proc")
-	}
-}
-
-func (s *DockerSuite) TestMountIntoSys(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, NotUserNamespace)
-	dockerCmd(c, "run", "-v", "/sys/fs/cgroup", "busybox", "true")
-}
-
-func (s *DockerSuite) TestRunUnshareProc(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace)
-
-	// In this test goroutines are used to run test cases in parallel to prevent the test from taking a long time to run.
-	errChan := make(chan error)
-
-	go func() {
-		name := "acidburn"
-		out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "--mount-proc=/proc", "mount")
-		if err == nil ||
-			!(strings.Contains(strings.ToLower(out), "permission denied") ||
-				strings.Contains(strings.ToLower(out), "operation not permitted")) {
-			errChan <- fmt.Errorf("unshare with --mount-proc should have failed with 'permission denied' or 'operation not permitted', got: %s, %v", out, err)
-		} else {
-			errChan <- nil
-		}
-	}()
-
-	go func() {
-		name := "cereal"
-		out, _, err := dockerCmdWithError("run", "--name", name, "--security-opt", "seccomp=unconfined", "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc")
-		if err == nil ||
-			!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") ||
-				strings.Contains(strings.ToLower(out), "permission denied") ||
-				strings.Contains(strings.ToLower(out), "operation not permitted")) {
-			errChan <- fmt.Errorf("unshare and mount of /proc should have failed with 'mount: cannot mount none' or 'permission denied', got: %s, %v", out, err)
-		} else {
-			errChan <- nil
-		}
-	}()
-
-	/* Ensure still fails if running privileged with the default policy */
-	go func() {
-		name := "crashoverride"
-		out, _, err := dockerCmdWithError("run", "--privileged", "--security-opt", "seccomp=unconfined", "--security-opt", "apparmor=docker-default", "--name", name, "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc")
-		if err == nil ||
-			!(strings.Contains(strings.ToLower(out), "mount: cannot mount none") ||
-				strings.Contains(strings.ToLower(out), "permission denied") ||
-				strings.Contains(strings.ToLower(out), "operation not permitted")) {
-			errChan <- fmt.Errorf("privileged unshare with apparmor should have failed with 'mount: cannot mount none' or 'permission denied', got: %s, %v", out, err)
-		} else {
-			errChan <- nil
-		}
-	}()
-
-	for i := 0; i < 3; i++ {
-		err := <-errChan
-		if err != nil {
-			c.Fatal(err)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunPublishPort(c *check.C) {
-	// TODO Windows: This may be possible once Windows moves to libnetwork and CNM
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "test", "--expose", "8080", "busybox", "top")
-	out, _ := dockerCmd(c, "port", "test")
-	out = strings.Trim(out, "\r\n")
-	if out != "" {
-		c.Fatalf("run without --publish-all should not publish port, out should be nil, but got: %s", out)
-	}
-}
-
-// Issue #10184.
-func (s *DockerSuite) TestDevicePermissions(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	const permissions = "crw-rw-rw-"
-	out, status := dockerCmd(c, "run", "--device", "/dev/fuse:/dev/fuse:mrw", "busybox:latest", "ls", "-l", "/dev/fuse")
-	if status != 0 {
-		c.Fatalf("expected status 0, got %d", status)
-	}
-	if !strings.HasPrefix(out, permissions) {
-		c.Fatalf("output should begin with %q, got %q", permissions, out)
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddCHOWN(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--cap-drop=ALL", "--cap-add=CHOWN", "busybox", "sh", "-c", "adduser -D -H newuser && chown newuser /home && echo ok")
-
-	if actual := strings.Trim(out, "\r\n"); actual != "ok" {
-		c.Fatalf("expected output ok received %s", actual)
-	}
-}
-
-// https://github.com/docker/docker/pull/14498
-func (s *DockerSuite) TestVolumeFromMixedRWOptions(c *check.C) {
-	prefix, slash := getPrefixAndSlashFromDaemonPlatform()
-
-	dockerCmd(c, "run", "--name", "parent", "-v", prefix+"/test", "busybox", "true")
-
-	// TODO Windows: Temporary check - remove once TP5 support is dropped
-	if daemonPlatform != "windows" || windowsDaemonKV >= 14350 {
-		dockerCmd(c, "run", "--volumes-from", "parent:ro", "--name", "test-volumes-1", "busybox", "true")
-	}
-	dockerCmd(c, "run", "--volumes-from", "parent:rw", "--name", "test-volumes-2", "busybox", "true")
-
-	if daemonPlatform != "windows" {
-		mRO, err := inspectMountPoint("test-volumes-1", prefix+slash+"test")
-		c.Assert(err, checker.IsNil, check.Commentf("failed to inspect mount point"))
-		if mRO.RW {
-			c.Fatalf("Expected RO volume was RW")
-		}
-	}
-
-	mRW, err := inspectMountPoint("test-volumes-2", prefix+slash+"test")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to inspect mount point"))
-	if !mRW.RW {
-		c.Fatalf("Expected RW volume was RO")
-	}
-}
-
-func (s *DockerSuite) TestRunWriteFilteredProc(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, Apparmor, DaemonIsLinux, NotUserNamespace)
-
-	testWritePaths := []string{
-		/* modprobe and core_pattern should both be denied by generic
-		 * policy of denials for /proc/sys/kernel. These files have been
-		 * picked to be checked as they are particularly sensitive to writes */
-		"/proc/sys/kernel/modprobe",
-		"/proc/sys/kernel/core_pattern",
-		"/proc/sysrq-trigger",
-		"/proc/kcore",
-	}
-	for i, filePath := range testWritePaths {
-		name := fmt.Sprintf("writeprocsieve-%d", i)
-
-		shellCmd := fmt.Sprintf("exec 3>%s", filePath)
-		out, code, err := dockerCmdWithError("run", "--privileged", "--security-opt", "apparmor=docker-default", "--name", name, "busybox", "sh", "-c", shellCmd)
-		if code != 0 {
-			return
-		}
-		if err != nil {
-			c.Fatalf("Open FD for write should have failed with permission denied, got: %s, %v", out, err)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunNetworkFilesBindMount(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	expected := "test123"
-
-	filename := createTmpFile(c, expected)
-	defer os.Remove(filename)
-
-	nwfiles := []string{"/etc/resolv.conf", "/etc/hosts", "/etc/hostname"}
-
-	for i := range nwfiles {
-		actual, _ := dockerCmd(c, "run", "-v", filename+":"+nwfiles[i], "busybox", "cat", nwfiles[i])
-		if actual != expected {
-			c.Fatalf("expected %s be: %q, but was: %q", nwfiles[i], expected, actual)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunNetworkFilesBindMountRO(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	filename := createTmpFile(c, "test123")
-	defer os.Remove(filename)
-
-	nwfiles := []string{"/etc/resolv.conf", "/etc/hosts", "/etc/hostname"}
-
-	for i := range nwfiles {
-		_, exitCode, err := dockerCmdWithError("run", "-v", filename+":"+nwfiles[i]+":ro", "busybox", "touch", nwfiles[i])
-		if err == nil || exitCode == 0 {
-			c.Fatalf("run should fail because bind mount of %s is ro: exit code %d", nwfiles[i], exitCode)
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunNetworkFilesBindMountROFilesystem(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, SameHostDaemon, DaemonIsLinux, UserNamespaceROMount)
-
-	filename := createTmpFile(c, "test123")
-	defer os.Remove(filename)
-
-	nwfiles := []string{"/etc/resolv.conf", "/etc/hosts", "/etc/hostname"}
-
-	for i := range nwfiles {
-		_, exitCode := dockerCmd(c, "run", "-v", filename+":"+nwfiles[i], "--read-only", "busybox", "touch", nwfiles[i])
-		if exitCode != 0 {
-			c.Fatalf("run should not fail because %s is mounted writable on read-only root filesystem: exit code %d", nwfiles[i], exitCode)
-		}
-	}
-
-	for i := range nwfiles {
-		_, exitCode, err := dockerCmdWithError("run", "-v", filename+":"+nwfiles[i]+":ro", "--read-only", "busybox", "touch", nwfiles[i])
-		if err == nil || exitCode == 0 {
-			c.Fatalf("run should fail because %s is mounted read-only on read-only root filesystem: exit code %d", nwfiles[i], exitCode)
-		}
-	}
-}
-
-func (s *DockerTrustSuite) TestTrustedRun(c *check.C) {
-	// Windows does not support this functionality
-	testRequires(c, DaemonIsLinux)
-	repoName := s.setupTrustedImage(c, "trusted-run")
-
-	// Try run
-	runCmd := exec.Command(dockerBinary, "run", repoName)
-	s.trustedCmd(runCmd)
-	out, _, err := runCommandWithOutput(runCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted run: %s\n%s\n", err, out)
-	}
-
-	if !strings.Contains(string(out), "Tagging") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try untrusted run to ensure we pushed the tag to the registry
-	runCmd = exec.Command(dockerBinary, "run", "--disable-content-trust=true", repoName)
-	s.trustedCmd(runCmd)
-	out, _, err = runCommandWithOutput(runCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted run: %s\n%s", err, out)
-	}
-
-	if !strings.Contains(string(out), "Status: Downloaded") {
-		c.Fatalf("Missing expected output on trusted run with --disable-content-trust:\n%s", out)
-	}
-}
-
-func (s *DockerTrustSuite) TestUntrustedRun(c *check.C) {
-	// Windows does not support this functionality
-	testRequires(c, DaemonIsLinux)
-	repoName := fmt.Sprintf("%v/dockercliuntrusted/runtest:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	dockerCmd(c, "push", repoName)
-	dockerCmd(c, "rmi", repoName)
-
-	// Try trusted run on untrusted tag
-	runCmd := exec.Command(dockerBinary, "run", repoName)
-	s.trustedCmd(runCmd)
-	out, _, err := runCommandWithOutput(runCmd)
-	if err == nil {
-		c.Fatalf("Error expected when running trusted run with:\n%s", out)
-	}
-
-	if !strings.Contains(string(out), "does not have trust data for") {
-		c.Fatalf("Missing expected output on trusted run:\n%s", out)
-	}
-}
-
-func (s *DockerTrustSuite) TestRunWhenCertExpired(c *check.C) {
-	// Windows does not support this functionality
-	testRequires(c, DaemonIsLinux)
-	c.Skip("Currently changes system time, causing instability")
-	repoName := s.setupTrustedImage(c, "trusted-run-expired")
-
-	// Certificates have 10 years of expiration
-	elevenYearsFromNow := time.Now().Add(time.Hour * 24 * 365 * 11)
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try run
-		runCmd := exec.Command(dockerBinary, "run", repoName)
-		s.trustedCmd(runCmd)
-		out, _, err := runCommandWithOutput(runCmd)
-		if err == nil {
-			c.Fatalf("Error running trusted run in the distant future: %s\n%s", err, out)
-		}
-
-		if !strings.Contains(string(out), "could not validate the path to a trusted root") {
-			c.Fatalf("Missing expected output on trusted run in the distant future:\n%s", out)
-		}
-	})
-
-	runAtDifferentDate(elevenYearsFromNow, func() {
-		// Try run
-		runCmd := exec.Command(dockerBinary, "run", "--disable-content-trust", repoName)
-		s.trustedCmd(runCmd)
-		out, _, err := runCommandWithOutput(runCmd)
-		if err != nil {
-			c.Fatalf("Error running untrusted run in the distant future: %s\n%s", err, out)
-		}
-
-		if !strings.Contains(string(out), "Status: Downloaded") {
-			c.Fatalf("Missing expected output on untrusted run in the distant future:\n%s", out)
-		}
-	})
-}
-
-func (s *DockerTrustSuite) TestTrustedRunFromBadTrustServer(c *check.C) {
-	// Windows does not support this functionality
-	testRequires(c, DaemonIsLinux)
-	repoName := fmt.Sprintf("%v/dockerclievilrun/trusted:latest", privateRegistryURL)
-	evilLocalConfigDir, err := ioutil.TempDir("", "evilrun-local-config-dir")
-	if err != nil {
-		c.Fatalf("Failed to create local temp dir")
-	}
-
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted push: %s\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "Signing and pushing trust metadata") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Try run
-	runCmd := exec.Command(dockerBinary, "run", repoName)
-	s.trustedCmd(runCmd)
-	out, _, err = runCommandWithOutput(runCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted run: %s\n%s", err, out)
-	}
-
-	if !strings.Contains(string(out), "Tagging") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	dockerCmd(c, "rmi", repoName)
-
-	// Kill the notary server, start a new "evil" one.
-	s.not.Close()
-	s.not, err = newTestNotary(c)
-	if err != nil {
-		c.Fatalf("Restarting notary server failed.")
-	}
-
-	// In order to make an evil server, lets re-init a client (with a different trust dir) and push new data.
-	// tag an image and upload it to the private registry
-	dockerCmd(c, "--config", evilLocalConfigDir, "tag", "busybox", repoName)
-
-	// Push up to the new server
-	pushCmd = exec.Command(dockerBinary, "--config", evilLocalConfigDir, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err = runCommandWithOutput(pushCmd)
-	if err != nil {
-		c.Fatalf("Error running trusted push: %s\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "Signing and pushing trust metadata") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	// Now, try running with the original client from this new trust server. This should fail because the new root is invalid.
-	runCmd = exec.Command(dockerBinary, "run", repoName)
-	s.trustedCmd(runCmd)
-	out, _, err = runCommandWithOutput(runCmd)
-
-	if err == nil {
-		c.Fatalf("Continuing with cached data even though it's an invalid root rotation: %s\n%s", err, out)
-	}
-	if !strings.Contains(out, "could not rotate trust to a new trusted root") {
-		c.Fatalf("Missing expected output on trusted run:\n%s", out)
-	}
-}
-
-func (s *DockerSuite) TestPtraceContainerProcsFromHost(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux, SameHostDaemon)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), check.IsNil)
-	pid1 := inspectField(c, id, "State.Pid")
-
-	_, err := os.Readlink(fmt.Sprintf("/proc/%s/ns/net", pid1))
-	if err != nil {
-		c.Fatal(err)
-	}
-}
-
-func (s *DockerSuite) TestAppArmorDeniesPtrace(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux)
-
-	// Run through 'sh' so we are NOT pid 1. Pid 1 may be able to trace
-	// itself, but pid>1 should not be able to trace pid1.
-	_, exitCode, _ := dockerCmdWithError("run", "busybox", "sh", "-c", "sh -c readlink /proc/1/ns/net")
-	if exitCode == 0 {
-		c.Fatal("ptrace was not successfully restricted by AppArmor")
-	}
-}
-
-func (s *DockerSuite) TestAppArmorTraceSelf(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux, SameHostDaemon, Apparmor)
-
-	_, exitCode, _ := dockerCmdWithError("run", "busybox", "readlink", "/proc/1/ns/net")
-	if exitCode != 0 {
-		c.Fatal("ptrace of self failed.")
-	}
-}
-
-func (s *DockerSuite) TestAppArmorDeniesChmodProc(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, SameHostDaemon, Apparmor, DaemonIsLinux, NotUserNamespace)
-	_, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "744", "/proc/cpuinfo")
-	if exitCode == 0 {
-		// If our test failed, attempt to repair the host system...
-		_, exitCode, _ := dockerCmdWithError("run", "busybox", "chmod", "444", "/proc/cpuinfo")
-		if exitCode == 0 {
-			c.Fatal("AppArmor was unsuccessful in prohibiting chmod of /proc/* files.")
-		}
-	}
-}
-
-func (s *DockerSuite) TestRunCapAddSYSTIME(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	dockerCmd(c, "run", "--cap-drop=ALL", "--cap-add=SYS_TIME", "busybox", "sh", "-c", "grep ^CapEff /proc/self/status | sed 's/^CapEff:\t//' | grep ^0000000002000000$")
-}
-
-// run create container failed should clean up the container
-func (s *DockerSuite) TestRunCreateContainerFailedCleanUp(c *check.C) {
-	// TODO Windows. This may be possible to enable once link is supported
-	testRequires(c, DaemonIsLinux)
-	name := "unique_name"
-	_, _, err := dockerCmdWithError("run", "--name", name, "--link", "nothing:nothing", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf("Expected docker run to fail!"))
-
-	containerID, err := inspectFieldWithError(name, "Id")
-	c.Assert(err, checker.NotNil, check.Commentf("Expected not to have this container: %s!", containerID))
-	c.Assert(containerID, check.Equals, "", check.Commentf("Expected not to have this container: %s!", containerID))
-}
-
-func (s *DockerSuite) TestRunNamedVolume(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name=test", "-v", "testing:"+prefix+"/foo", "busybox", "sh", "-c", "echo hello > "+prefix+"/foo/bar")
-
-	out, _ := dockerCmd(c, "run", "--volumes-from", "test", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
-
-	out, _ = dockerCmd(c, "run", "-v", "testing:"+prefix+"/foo", "busybox", "sh", "-c", "cat "+prefix+"/foo/bar")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
-}
-
-func (s *DockerSuite) TestRunWithUlimits(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "--name=testulimits", "--ulimit", "nofile=42", "busybox", "/bin/sh", "-c", "ulimit -n")
-	ul := strings.TrimSpace(out)
-	if ul != "42" {
-		c.Fatalf("expected `ulimit -n` to be 42, got %s", ul)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithCgroupParent(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "test"
-	name := "cgroup-test"
-
-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
-	if err != nil {
-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
-	}
-	cgroupPaths := parseCgroupPaths(string(out))
-	if len(cgroupPaths) == 0 {
-		c.Fatalf("unexpected output - %q", string(out))
-	}
-	id, err := getIDByName(name)
-	c.Assert(err, check.IsNil)
-	expectedCgroup := path.Join(cgroupParent, id)
-	found := false
-	for _, path := range cgroupPaths {
-		if strings.HasSuffix(path, expectedCgroup) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithCgroupParentAbsPath(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "/cgroup-parent/test"
-	name := "cgroup-test"
-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
-	if err != nil {
-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
-	}
-	cgroupPaths := parseCgroupPaths(string(out))
-	if len(cgroupPaths) == 0 {
-		c.Fatalf("unexpected output - %q", string(out))
-	}
-	id, err := getIDByName(name)
-	c.Assert(err, check.IsNil)
-	expectedCgroup := path.Join(cgroupParent, id)
-	found := false
-	for _, path := range cgroupPaths {
-		if strings.HasSuffix(path, expectedCgroup) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
-	}
-}
-
-// TestRunInvalidCgroupParent checks that a specially-crafted cgroup parent doesn't cause Docker to crash or start modifying /.
-func (s *DockerSuite) TestRunInvalidCgroupParent(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "../../../../../../../../SHOULD_NOT_EXIST"
-	cleanCgroupParent := "SHOULD_NOT_EXIST"
-	name := "cgroup-invalid-test"
-
-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
-	if err != nil {
-		// XXX: This may include a daemon crash.
-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
-	}
-
-	// We expect "/SHOULD_NOT_EXIST" to not exist. If not, we have a security issue.
-	if _, err := os.Stat("/SHOULD_NOT_EXIST"); err == nil || !os.IsNotExist(err) {
-		c.Fatalf("SECURITY: --cgroup-parent with ../../ relative paths cause files to be created in the host (this is bad) !!")
-	}
-
-	cgroupPaths := parseCgroupPaths(string(out))
-	if len(cgroupPaths) == 0 {
-		c.Fatalf("unexpected output - %q", string(out))
-	}
-	id, err := getIDByName(name)
-	c.Assert(err, check.IsNil)
-	expectedCgroup := path.Join(cleanCgroupParent, id)
-	found := false
-	for _, path := range cgroupPaths {
-		if strings.HasSuffix(path, expectedCgroup) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
-	}
-}
-
-// TestRunInvalidCgroupParent checks that a specially-crafted cgroup parent doesn't cause Docker to crash or start modifying /.
-func (s *DockerSuite) TestRunAbsoluteInvalidCgroupParent(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	testRequires(c, DaemonIsLinux)
-
-	cgroupParent := "/../../../../../../../../SHOULD_NOT_EXIST"
-	cleanCgroupParent := "/SHOULD_NOT_EXIST"
-	name := "cgroup-absolute-invalid-test"
-
-	out, _, err := dockerCmdWithError("run", "--cgroup-parent", cgroupParent, "--name", name, "busybox", "cat", "/proc/self/cgroup")
-	if err != nil {
-		// XXX: This may include a daemon crash.
-		c.Fatalf("unexpected failure when running container with --cgroup-parent option - %s\n%v", string(out), err)
-	}
-
-	// We expect "/SHOULD_NOT_EXIST" to not exist. If not, we have a security issue.
-	if _, err := os.Stat("/SHOULD_NOT_EXIST"); err == nil || !os.IsNotExist(err) {
-		c.Fatalf("SECURITY: --cgroup-parent with /../../ garbage paths cause files to be created in the host (this is bad) !!")
-	}
-
-	cgroupPaths := parseCgroupPaths(string(out))
-	if len(cgroupPaths) == 0 {
-		c.Fatalf("unexpected output - %q", string(out))
-	}
-	id, err := getIDByName(name)
-	c.Assert(err, check.IsNil)
-	expectedCgroup := path.Join(cleanCgroupParent, id)
-	found := false
-	for _, path := range cgroupPaths {
-		if strings.HasSuffix(path, expectedCgroup) {
-			found = true
-			break
-		}
-	}
-	if !found {
-		c.Fatalf("unexpected cgroup paths. Expected at least one cgroup path to have suffix %q. Cgroup Paths: %v", expectedCgroup, cgroupPaths)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerWithCgroupMountRO(c *check.C) {
-	// Not applicable on Windows as uses Unix specific functionality
-	// --read-only + userns has remount issues
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	filename := "/sys/fs/cgroup/devices/test123"
-	out, _, err := dockerCmdWithError("run", "busybox", "touch", filename)
-	if err == nil {
-		c.Fatal("expected cgroup mount point to be read-only, touch file should fail")
-	}
-	expected := "Read-only file system"
-	if !strings.Contains(out, expected) {
-		c.Fatalf("expected output from failure to contain %s but contains %s", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerNetworkModeToSelf(c *check.C) {
-	// Not applicable on Windows which does not support --net=container
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--name=me", "--net=container:me", "busybox", "true")
-	if err == nil || !strings.Contains(out, "cannot join own network") {
-		c.Fatalf("using container net mode to self should result in an error\nerr: %q\nout: %s", err, out)
-	}
-}
-
-func (s *DockerSuite) TestRunContainerNetModeWithDNSMacHosts(c *check.C) {
-	// Not applicable on Windows which does not support --net=container
-	testRequires(c, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "-d", "--name", "parent", "busybox", "top")
-	if err != nil {
-		c.Fatalf("failed to run container: %v, output: %q", err, out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--dns", "1.2.3.4", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkAndDNS.Error()) {
-		c.Fatalf("run --net=container with --dns should error out")
-	}
-
-	out, _, err = dockerCmdWithError("run", "--mac-address", "92:d0:c6:0a:29:33", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictContainerNetworkAndMac.Error()) {
-		c.Fatalf("run --net=container with --mac-address should error out")
-	}
-
-	out, _, err = dockerCmdWithError("run", "--add-host", "test:192.168.2.109", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkHosts.Error()) {
-		c.Fatalf("run --net=container with --add-host should error out")
-	}
-}
-
-func (s *DockerSuite) TestRunContainerNetModeWithExposePort(c *check.C) {
-	// Not applicable on Windows which does not support --net=container
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")
-
-	out, _, err := dockerCmdWithError("run", "-p", "5000:5000", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()) {
-		c.Fatalf("run --net=container with -p should error out")
-	}
-
-	out, _, err = dockerCmdWithError("run", "-P", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkPublishPorts.Error()) {
-		c.Fatalf("run --net=container with -P should error out")
-	}
-
-	out, _, err = dockerCmdWithError("run", "--expose", "5000", "--net=container:parent", "busybox")
-	if err == nil || !strings.Contains(out, runconfig.ErrConflictNetworkExposePorts.Error()) {
-		c.Fatalf("run --net=container with --expose should error out")
-	}
-}
-
-func (s *DockerSuite) TestRunLinkToContainerNetMode(c *check.C) {
-	// Not applicable on Windows which does not support --net=container or --link
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test", "-d", "busybox", "top")
-	dockerCmd(c, "run", "--name", "parent", "-d", "--net=container:test", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--link=parent:parent", "busybox", "top")
-	dockerCmd(c, "run", "--name", "child", "-d", "--net=container:parent", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--link=child:child", "busybox", "top")
-}
-
-func (s *DockerSuite) TestRunLoopbackOnlyExistsWhenNetworkingDisabled(c *check.C) {
-	// TODO Windows: This may be possible to convert.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "--net=none", "busybox", "ip", "-o", "-4", "a", "show", "up")
-
-	var (
-		count = 0
-		parts = strings.Split(out, "\n")
-	)
-
-	for _, l := range parts {
-		if l != "" {
-			count++
-		}
-	}
-
-	if count != 1 {
-		c.Fatalf("Wrong interface count in container %d", count)
-	}
-
-	if !strings.HasPrefix(out, "1: lo") {
-		c.Fatalf("Wrong interface in test container: expected [1: lo], got %s", out)
-	}
-}
-
-// Issue #4681
-func (s *DockerSuite) TestRunLoopbackWhenNetworkDisabled(c *check.C) {
-	if daemonPlatform == "windows" {
-		dockerCmd(c, "run", "--net=none", WindowsBaseImage, "ping", "-n", "1", "127.0.0.1")
-	} else {
-		dockerCmd(c, "run", "--net=none", "busybox", "ping", "-c", "1", "127.0.0.1")
-	}
-}
-
-func (s *DockerSuite) TestRunModeNetContainerHostname(c *check.C) {
-	// Windows does not support --net=container
-	testRequires(c, DaemonIsLinux, ExecSupport)
-
-	dockerCmd(c, "run", "-i", "-d", "--name", "parent", "busybox", "top")
-	out, _ := dockerCmd(c, "exec", "parent", "cat", "/etc/hostname")
-	out1, _ := dockerCmd(c, "run", "--net=container:parent", "busybox", "cat", "/etc/hostname")
-
-	if out1 != out {
-		c.Fatal("containers with shared net namespace should have same hostname")
-	}
-}
-
-func (s *DockerSuite) TestRunNetworkNotInitializedNoneMode(c *check.C) {
-	// TODO Windows: Network settings are not currently propagated. This may
-	// be resolved in the future with the move to libnetwork and CNM.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "--net=none", "busybox", "top")
-	id := strings.TrimSpace(out)
-	res := inspectField(c, id, "NetworkSettings.Networks.none.IPAddress")
-	if res != "" {
-		c.Fatalf("For 'none' mode network must not be initialized, but container got IP: %s", res)
-	}
-}
-
-func (s *DockerSuite) TestTwoContainersInNetHost(c *check.C) {
-	// Not applicable as Windows does not support --net=host
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotUserNamespace)
-	dockerCmd(c, "run", "-d", "--net=host", "--name=first", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=host", "--name=second", "busybox", "top")
-	dockerCmd(c, "stop", "first")
-	dockerCmd(c, "stop", "second")
-}
-
-func (s *DockerSuite) TestContainersInUserDefinedNetwork(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork")
-	dockerCmd(c, "run", "-d", "--net=testnetwork", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-t", "--net=testnetwork", "--name=second", "busybox", "ping", "-c", "1", "first")
-}
-
-func (s *DockerSuite) TestContainersInMultipleNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	// Create 2 networks using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork2")
-	// Run and connect containers to testnetwork1
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-	// Check connectivity between containers in testnetwork2
-	dockerCmd(c, "exec", "first", "ping", "-c", "1", "second.testnetwork1")
-	// Connect containers to testnetwork2
-	dockerCmd(c, "network", "connect", "testnetwork2", "first")
-	dockerCmd(c, "network", "connect", "testnetwork2", "second")
-	// Check connectivity between containers
-	dockerCmd(c, "exec", "second", "ping", "-c", "1", "first.testnetwork2")
-}
-
-func (s *DockerSuite) TestContainersNetworkIsolation(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	// Create 2 networks using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork2")
-	// Run 1 container in testnetwork1 and another in testnetwork2
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=testnetwork2", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// Check Isolation between containers : ping must fail
-	_, _, err := dockerCmdWithError("exec", "first", "ping", "-c", "1", "second")
-	c.Assert(err, check.NotNil)
-	// Connect first container to testnetwork2
-	dockerCmd(c, "network", "connect", "testnetwork2", "first")
-	// ping must succeed now
-	_, _, err = dockerCmdWithError("exec", "first", "ping", "-c", "1", "second")
-	c.Assert(err, check.IsNil)
-
-	// Disconnect first container from testnetwork2
-	dockerCmd(c, "network", "disconnect", "testnetwork2", "first")
-	// ping must fail again
-	_, _, err = dockerCmdWithError("exec", "first", "ping", "-c", "1", "second")
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerSuite) TestNetworkRmWithActiveContainers(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	// Create 2 networks using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-	// Run and connect containers to testnetwork1
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-	// Network delete with active containers must fail
-	_, _, err := dockerCmdWithError("network", "rm", "testnetwork1")
-	c.Assert(err, check.NotNil)
-
-	dockerCmd(c, "stop", "first")
-	_, _, err = dockerCmdWithError("network", "rm", "testnetwork1")
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerSuite) TestContainerRestartInMultipleNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	// Create 2 networks using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork2")
-
-	// Run and connect containers to testnetwork1
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-	// Check connectivity between containers in testnetwork2
-	dockerCmd(c, "exec", "first", "ping", "-c", "1", "second.testnetwork1")
-	// Connect containers to testnetwork2
-	dockerCmd(c, "network", "connect", "testnetwork2", "first")
-	dockerCmd(c, "network", "connect", "testnetwork2", "second")
-	// Check connectivity between containers
-	dockerCmd(c, "exec", "second", "ping", "-c", "1", "first.testnetwork2")
-
-	// Stop second container and test ping failures on both networks
-	dockerCmd(c, "stop", "second")
-	_, _, err := dockerCmdWithError("exec", "first", "ping", "-c", "1", "second.testnetwork1")
-	c.Assert(err, check.NotNil)
-	_, _, err = dockerCmdWithError("exec", "first", "ping", "-c", "1", "second.testnetwork2")
-	c.Assert(err, check.NotNil)
-
-	// Start second container and connectivity must be restored on both networks
-	dockerCmd(c, "start", "second")
-	dockerCmd(c, "exec", "first", "ping", "-c", "1", "second.testnetwork1")
-	dockerCmd(c, "exec", "second", "ping", "-c", "1", "first.testnetwork2")
-}
-
-func (s *DockerSuite) TestContainerWithConflictingHostNetworks(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	// Run a container with --net=host
-	dockerCmd(c, "run", "-d", "--net=host", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// Create a network using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-
-	// Connecting to the user defined network must fail
-	_, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "first")
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerSuite) TestContainerWithConflictingSharedNetwork(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	// Run second container in first container's network namespace
-	dockerCmd(c, "run", "-d", "--net=container:first", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// Create a network using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-
-	// Connecting to the user defined network must fail
-	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "second")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, runconfig.ErrConflictSharedNetwork.Error())
-}
-
-func (s *DockerSuite) TestContainerWithConflictingNoneNetwork(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "-d", "--net=none", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-
-	// Create a network using bridge driver
-	dockerCmd(c, "network", "create", "-d", "bridge", "testnetwork1")
-
-	// Connecting to the user defined network must fail
-	out, _, err := dockerCmdWithError("network", "connect", "testnetwork1", "first")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, runconfig.ErrConflictNoNetwork.Error())
-
-	// create a container connected to testnetwork1
-	dockerCmd(c, "run", "-d", "--net=testnetwork1", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// Connect second container to none network. it must fail as well
-	_, _, err = dockerCmdWithError("network", "connect", "none", "second")
-	c.Assert(err, check.NotNil)
-}
-
-// #11957 - stdin with no tty does not exit if stdin is not closed even though container exited
-func (s *DockerSuite) TestRunStdinBlockedAfterContainerExit(c *check.C) {
-	cmd := exec.Command(dockerBinary, "run", "-i", "--name=test", "busybox", "true")
-	in, err := cmd.StdinPipe()
-	c.Assert(err, check.IsNil)
-	defer in.Close()
-	stdout := bytes.NewBuffer(nil)
-	cmd.Stdout = stdout
-	cmd.Stderr = stdout
-	c.Assert(cmd.Start(), check.IsNil)
-
-	waitChan := make(chan error)
-	go func() {
-		waitChan <- cmd.Wait()
-	}()
-
-	select {
-	case err := <-waitChan:
-		c.Assert(err, check.IsNil, check.Commentf(stdout.String()))
-	case <-time.After(30 * time.Second):
-		c.Fatal("timeout waiting for command to exit")
-	}
-}
-
-func (s *DockerSuite) TestRunWrongCpusetCpusFlagValue(c *check.C) {
-	// TODO Windows: This needs validation (error out) in the daemon.
-	testRequires(c, DaemonIsLinux)
-	out, exitCode, err := dockerCmdWithError("run", "--cpuset-cpus", "1-10,11--", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Error response from daemon: Invalid value 1-10,11-- for cpuset cpus.\n"
-	if !(strings.Contains(out, expected) || exitCode == 125) {
-		c.Fatalf("Expected output to contain %q with exitCode 125, got out: %q exitCode: %v", expected, out, exitCode)
-	}
-}
-
-func (s *DockerSuite) TestRunWrongCpusetMemsFlagValue(c *check.C) {
-	// TODO Windows: This needs validation (error out) in the daemon.
-	testRequires(c, DaemonIsLinux)
-	out, exitCode, err := dockerCmdWithError("run", "--cpuset-mems", "1-42--", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Error response from daemon: Invalid value 1-42-- for cpuset mems.\n"
-	if !(strings.Contains(out, expected) || exitCode == 125) {
-		c.Fatalf("Expected output to contain %q with exitCode 125, got out: %q exitCode: %v", expected, out, exitCode)
-	}
-}
-
-// TestRunNonExecutableCmd checks that 'docker run busybox foo' exits with error code 127'
-func (s *DockerSuite) TestRunNonExecutableCmd(c *check.C) {
-	name := "testNonExecutableCmd"
-	runCmd := exec.Command(dockerBinary, "run", "--name", name, "busybox", "foo")
-	_, exit, _ := runCommandWithOutput(runCmd)
-	stateExitCode := findContainerExitCode(c, name)
-	if !(exit == 127 && strings.Contains(stateExitCode, "127")) {
-		c.Fatalf("Run non-executable command should have errored with exit code 127, but we got exit: %d, State.ExitCode: %s", exit, stateExitCode)
-	}
-}
-
-// TestRunNonExistingCmd checks that 'docker run busybox /bin/foo' exits with code 127.
-func (s *DockerSuite) TestRunNonExistingCmd(c *check.C) {
-	name := "testNonExistingCmd"
-	runCmd := exec.Command(dockerBinary, "run", "--name", name, "busybox", "/bin/foo")
-	_, exit, _ := runCommandWithOutput(runCmd)
-	stateExitCode := findContainerExitCode(c, name)
-	if !(exit == 127 && strings.Contains(stateExitCode, "127")) {
-		c.Fatalf("Run non-existing command should have errored with exit code 127, but we got exit: %d, State.ExitCode: %s", exit, stateExitCode)
-	}
-}
-
-// TestCmdCannotBeInvoked checks that 'docker run busybox /etc' exits with 126, or
-// 127 on Windows. The difference is that in Windows, the container must be started
-// as that's when the check is made (and yes, by its design...)
-func (s *DockerSuite) TestCmdCannotBeInvoked(c *check.C) {
-	expected := 126
-	if daemonPlatform == "windows" {
-		expected = 127
-	}
-	name := "testCmdCannotBeInvoked"
-	runCmd := exec.Command(dockerBinary, "run", "--name", name, "busybox", "/etc")
-	_, exit, _ := runCommandWithOutput(runCmd)
-	stateExitCode := findContainerExitCode(c, name)
-	if !(exit == expected && strings.Contains(stateExitCode, strconv.Itoa(expected))) {
-		c.Fatalf("Run cmd that cannot be invoked should have errored with code %d, but we got exit: %d, State.ExitCode: %s", expected, exit, stateExitCode)
-	}
-}
-
-// TestRunNonExistingImage checks that 'docker run foo' exits with error msg 125 and contains  'Unable to find image'
-func (s *DockerSuite) TestRunNonExistingImage(c *check.C) {
-	runCmd := exec.Command(dockerBinary, "run", "foo")
-	out, exit, err := runCommandWithOutput(runCmd)
-	if !(err != nil && exit == 125 && strings.Contains(out, "Unable to find image")) {
-		c.Fatalf("Run non-existing image should have errored with 'Unable to find image' code 125, but we got out: %s, exit: %d, err: %s", out, exit, err)
-	}
-}
-
-// TestDockerFails checks that 'docker run -foo busybox' exits with 125 to signal docker run failed
-func (s *DockerSuite) TestDockerFails(c *check.C) {
-	runCmd := exec.Command(dockerBinary, "run", "-foo", "busybox")
-	out, exit, err := runCommandWithOutput(runCmd)
-	if !(err != nil && exit == 125) {
-		c.Fatalf("Docker run with flag not defined should exit with 125, but we got out: %s, exit: %d, err: %s", out, exit, err)
-	}
-}
-
-// TestRunInvalidReference invokes docker run with a bad reference.
-func (s *DockerSuite) TestRunInvalidReference(c *check.C) {
-	out, exit, _ := dockerCmdWithError("run", "busybox@foo")
-	if exit == 0 {
-		c.Fatalf("expected non-zero exist code; received %d", exit)
-	}
-
-	if !strings.Contains(out, "Error parsing reference") {
-		c.Fatalf(`Expected "Error parsing reference" in output; got: %s`, out)
-	}
-}
-
-// Test fix for issue #17854
-func (s *DockerSuite) TestRunInitLayerPathOwnership(c *check.C) {
-	// Not applicable on Windows as it does not support Linux uid/gid ownership
-	testRequires(c, DaemonIsLinux)
-	name := "testetcfileownership"
-	_, err := buildImage(name,
-		`FROM busybox
-		RUN echo 'dockerio:x:1001:1001::/bin:/bin/false' >> /etc/passwd
-		RUN echo 'dockerio:x:1001:' >> /etc/group
-		RUN chown dockerio:dockerio /etc`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-
-	// Test that dockerio ownership of /etc is retained at runtime
-	out, _ := dockerCmd(c, "run", "--rm", name, "stat", "-c", "%U:%G", "/etc")
-	out = strings.TrimSpace(out)
-	if out != "dockerio:dockerio" {
-		c.Fatalf("Wrong /etc ownership: expected dockerio:dockerio, got %q", out)
-	}
-}
-
-func (s *DockerSuite) TestRunWithOomScoreAdj(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	expected := "642"
-	out, _ := dockerCmd(c, "run", "--oom-score-adj", expected, "busybox", "cat", "/proc/self/oom_score_adj")
-	oomScoreAdj := strings.TrimSpace(out)
-	if oomScoreAdj != "642" {
-		c.Fatalf("Expected oom_score_adj set to %q, got %q instead", expected, oomScoreAdj)
-	}
-}
-
-func (s *DockerSuite) TestRunWithOomScoreAdjInvalidRange(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _, err := dockerCmdWithError("run", "--oom-score-adj", "1001", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Invalid value 1001, range for oom score adj is [-1000, 1000]."
-	if !strings.Contains(out, expected) {
-		c.Fatalf("Expected output to contain %q, got %q instead", expected, out)
-	}
-	out, _, err = dockerCmdWithError("run", "--oom-score-adj", "-1001", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected = "Invalid value -1001, range for oom score adj is [-1000, 1000]."
-	if !strings.Contains(out, expected) {
-		c.Fatalf("Expected output to contain %q, got %q instead", expected, out)
-	}
-}
-
-func (s *DockerSuite) TestRunVolumesMountedAsShared(c *check.C) {
-	// Volume propagation is linux only. Also it creates directories for
-	// bind mounting, so needs to be same host.
-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace)
-
-	// Prepare a source directory to bind mount
-	tmpDir, err := ioutil.TempDir("", "volume-source")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	if err := os.Mkdir(path.Join(tmpDir, "mnt1"), 0755); err != nil {
-		c.Fatal(err)
-	}
-
-	// Convert this directory into a shared mount point so that we do
-	// not rely on propagation properties of parent mount.
-	cmd := exec.Command("mount", "--bind", tmpDir, tmpDir)
-	if _, err = runCommand(cmd); err != nil {
-		c.Fatal(err)
-	}
-
-	cmd = exec.Command("mount", "--make-private", "--make-shared", tmpDir)
-	if _, err = runCommand(cmd); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "--privileged", "-v", fmt.Sprintf("%s:/volume-dest:shared", tmpDir), "busybox", "mount", "--bind", "/volume-dest/mnt1", "/volume-dest/mnt1")
-
-	// Make sure a bind mount under a shared volume propagated to host.
-	if mounted, _ := mount.Mounted(path.Join(tmpDir, "mnt1")); !mounted {
-		c.Fatalf("Bind mount under shared volume did not propagate to host")
-	}
-
-	mount.Unmount(path.Join(tmpDir, "mnt1"))
-}
-
-func (s *DockerSuite) TestRunVolumesMountedAsSlave(c *check.C) {
-	// Volume propagation is linux only. Also it creates directories for
-	// bind mounting, so needs to be same host.
-	testRequires(c, DaemonIsLinux, SameHostDaemon, NotUserNamespace)
-
-	// Prepare a source directory to bind mount
-	tmpDir, err := ioutil.TempDir("", "volume-source")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	if err := os.Mkdir(path.Join(tmpDir, "mnt1"), 0755); err != nil {
-		c.Fatal(err)
-	}
-
-	// Prepare a source directory with file in it. We will bind mount this
-	// directory and see if file shows up.
-	tmpDir2, err := ioutil.TempDir("", "volume-source2")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir2)
-
-	if err := ioutil.WriteFile(path.Join(tmpDir2, "slave-testfile"), []byte("Test"), 0644); err != nil {
-		c.Fatal(err)
-	}
-
-	// Convert this directory into a shared mount point so that we do
-	// not rely on propagation properties of parent mount.
-	cmd := exec.Command("mount", "--bind", tmpDir, tmpDir)
-	if _, err = runCommand(cmd); err != nil {
-		c.Fatal(err)
-	}
-
-	cmd = exec.Command("mount", "--make-private", "--make-shared", tmpDir)
-	if _, err = runCommand(cmd); err != nil {
-		c.Fatal(err)
-	}
-
-	dockerCmd(c, "run", "-i", "-d", "--name", "parent", "-v", fmt.Sprintf("%s:/volume-dest:slave", tmpDir), "busybox", "top")
-
-	// Bind mount tmpDir2/ onto tmpDir/mnt1. If mount propagates inside
-	// container then contents of tmpDir2/slave-testfile should become
-	// visible at "/volume-dest/mnt1/slave-testfile"
-	cmd = exec.Command("mount", "--bind", tmpDir2, path.Join(tmpDir, "mnt1"))
-	if _, err = runCommand(cmd); err != nil {
-		c.Fatal(err)
-	}
-
-	out, _ := dockerCmd(c, "exec", "parent", "cat", "/volume-dest/mnt1/slave-testfile")
-
-	mount.Unmount(path.Join(tmpDir, "mnt1"))
-
-	if out != "Test" {
-		c.Fatalf("Bind mount under slave volume did not propagate to container")
-	}
-}
-
-func (s *DockerSuite) TestRunNamedVolumesMountedAsShared(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, exitCode, _ := dockerCmdWithError("run", "-v", "foo:/test:shared", "busybox", "touch", "/test/somefile")
-	c.Assert(exitCode, checker.Not(checker.Equals), 0)
-	c.Assert(out, checker.Contains, "invalid mount config")
-}
-
-func (s *DockerSuite) TestRunNamedVolumeCopyImageData(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	testImg := "testvolumecopy"
-	_, err := buildImage(testImg, `
-	FROM busybox
-	RUN mkdir -p /foo && echo hello > /foo/hello
-	`, true)
-	c.Assert(err, check.IsNil)
-
-	dockerCmd(c, "run", "-v", "foo:/foo", testImg)
-	out, _ := dockerCmd(c, "run", "-v", "foo:/foo", "busybox", "cat", "/foo/hello")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
-}
-
-func (s *DockerSuite) TestRunNamedVolumeNotRemoved(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-
-	dockerCmd(c, "volume", "create", "test")
-
-	dockerCmd(c, "run", "--rm", "-v", "test:"+prefix+"/foo", "-v", prefix+"/bar", "busybox", "true")
-	dockerCmd(c, "volume", "inspect", "test")
-	out, _ := dockerCmd(c, "volume", "ls", "-q")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "test")
-
-	dockerCmd(c, "run", "--name=test", "-v", "test:"+prefix+"/foo", "-v", prefix+"/bar", "busybox", "true")
-	dockerCmd(c, "rm", "-fv", "test")
-	dockerCmd(c, "volume", "inspect", "test")
-	out, _ = dockerCmd(c, "volume", "ls", "-q")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "test")
-}
-
-func (s *DockerSuite) TestRunNamedVolumesFromNotRemoved(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-
-	dockerCmd(c, "volume", "create", "test")
-	dockerCmd(c, "run", "--name=parent", "-v", "test:"+prefix+"/foo", "-v", prefix+"/bar", "busybox", "true")
-	dockerCmd(c, "run", "--name=child", "--volumes-from=parent", "busybox", "true")
-
-	// Remove the parent so there are not other references to the volumes
-	dockerCmd(c, "rm", "-f", "parent")
-	// now remove the child and ensure the named volume (and only the named volume) still exists
-	dockerCmd(c, "rm", "-fv", "child")
-	dockerCmd(c, "volume", "inspect", "test")
-	out, _ := dockerCmd(c, "volume", "ls", "-q")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "test")
-}
-
-func (s *DockerSuite) TestRunAttachFailedNoLeak(c *check.C) {
-	nroutines, err := getGoroutineNumber()
-	c.Assert(err, checker.IsNil)
-
-	runSleepingContainer(c, "--name=test", "-p", "8000:8000")
-
-	// Wait until container is fully up and running
-	c.Assert(waitRun("test"), check.IsNil)
-
-	out, _, err := dockerCmdWithError("run", "--name=fail", "-p", "8000:8000", "busybox", "true")
-	// We will need the following `inspect` to diagnose the issue if test fails (#21247)
-	out1, err1 := dockerCmd(c, "inspect", "--format", "{{json .State}}", "test")
-	out2, err2 := dockerCmd(c, "inspect", "--format", "{{json .State}}", "fail")
-	c.Assert(err, checker.NotNil, check.Commentf("Command should have failed but succeeded with: %s\nContainer 'test' [%+v]: %s\nContainer 'fail' [%+v]: %s", out, err1, out1, err2, out2))
-	// check for windows error as well
-	// TODO Windows Post TP5. Fix the error message string
-	c.Assert(strings.Contains(string(out), "port is already allocated") ||
-		strings.Contains(string(out), "were not connected because a duplicate name exists") ||
-		strings.Contains(string(out), "HNS failed with error : Failed to create endpoint") ||
-		strings.Contains(string(out), "HNS failed with error : The object already exists"), checker.Equals, true, check.Commentf("Output: %s", out))
-	dockerCmd(c, "rm", "-f", "test")
-
-	// NGoroutines is not updated right away, so we need to wait before failing
-	c.Assert(waitForGoroutines(nroutines), checker.IsNil)
-}
-
-// Test for one character directory name case (#20122)
-func (s *DockerSuite) TestRunVolumeWithOneCharacter(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-v", "/tmp/q:/foo", "busybox", "sh", "-c", "find /foo")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "/foo")
-}
-
-func (s *DockerSuite) TestRunVolumeCopyFlag(c *check.C) {
-	testRequires(c, DaemonIsLinux) // Windows does not support copying data from image to the volume
-	_, err := buildImage("volumecopy",
-		`FROM busybox
-		RUN mkdir /foo && echo hello > /foo/bar
-		CMD cat /foo/bar`,
-		true,
-	)
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "volume", "create", "test")
-
-	// test with the nocopy flag
-	out, _, err := dockerCmdWithError("run", "-v", "test:/foo:nocopy", "volumecopy")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	// test default behavior which is to copy for non-binds
-	out, _ = dockerCmd(c, "run", "-v", "test:/foo", "volumecopy")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello")
-	// error out when the volume is already populated
-	out, _, err = dockerCmdWithError("run", "-v", "test:/foo:copy", "volumecopy")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	// do not error out when copy isn't explicitly set even though it's already populated
-	out, _ = dockerCmd(c, "run", "-v", "test:/foo", "volumecopy")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello")
-
-	// do not allow copy modes on volumes-from
-	dockerCmd(c, "run", "--name=test", "-v", "/foo", "busybox", "true")
-	out, _, err = dockerCmdWithError("run", "--volumes-from=test:copy", "busybox", "true")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	out, _, err = dockerCmdWithError("run", "--volumes-from=test:nocopy", "busybox", "true")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-
-	// do not allow copy modes on binds
-	out, _, err = dockerCmdWithError("run", "-v", "/foo:/bar:copy", "busybox", "true")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	out, _, err = dockerCmdWithError("run", "-v", "/foo:/bar:nocopy", "busybox", "true")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-}
-
-// Test case for #21976
-func (s *DockerSuite) TestRunDNSInHostMode(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	expectedOutput := "nameserver 127.0.0.1"
-	expectedWarning := "Localhost DNS setting"
-	out, stderr, _ := dockerCmdWithStdoutStderr(c, "run", "--dns=127.0.0.1", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-	c.Assert(stderr, checker.Contains, expectedWarning, check.Commentf("Expected warning on stderr about localhost resolver, but got %q", stderr))
-
-	expectedOutput = "nameserver 1.2.3.4"
-	out, _ = dockerCmd(c, "run", "--dns=1.2.3.4", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-
-	expectedOutput = "search example.com"
-	out, _ = dockerCmd(c, "run", "--dns-search=example.com", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-
-	expectedOutput = "options timeout:3"
-	out, _ = dockerCmd(c, "run", "--dns-opt=timeout:3", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-
-	expectedOutput1 := "nameserver 1.2.3.4"
-	expectedOutput2 := "search example.com"
-	expectedOutput3 := "options timeout:3"
-	out, _ = dockerCmd(c, "run", "--dns=1.2.3.4", "--dns-search=example.com", "--dns-opt=timeout:3", "--net=host", "busybox", "cat", "/etc/resolv.conf")
-	c.Assert(out, checker.Contains, expectedOutput1, check.Commentf("Expected '%s', but got %q", expectedOutput1, out))
-	c.Assert(out, checker.Contains, expectedOutput2, check.Commentf("Expected '%s', but got %q", expectedOutput2, out))
-	c.Assert(out, checker.Contains, expectedOutput3, check.Commentf("Expected '%s', but got %q", expectedOutput3, out))
-}
-
-// Test case for #21976
-func (s *DockerSuite) TestRunAddHostInHostMode(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	expectedOutput := "1.2.3.4\textra"
-	out, _ := dockerCmd(c, "run", "--add-host=extra:1.2.3.4", "--net=host", "busybox", "cat", "/etc/hosts")
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-func (s *DockerSuite) TestRunRmAndWait(c *check.C) {
-	dockerCmd(c, "run", "--name=test", "--rm", "-d", "busybox", "sh", "-c", "sleep 3;exit 2")
-
-	out, code, err := dockerCmdWithError("wait", "test")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %s; exit code: %d", out, code))
-	c.Assert(out, checker.Equals, "2\n", check.Commentf("exit code: %d", code))
-	c.Assert(code, checker.Equals, 0)
-}
-
-// Test case for #23498
-func (s *DockerSuite) TestRunUnsetEntrypoint(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "test-entrypoint"
-	dockerfile := `FROM busybox
-ADD entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
-ENTRYPOINT ["/entrypoint.sh"]
-CMD echo foobar`
-
-	ctx, err := fakeContext(dockerfile, map[string]string{
-		"entrypoint.sh": `#!/bin/sh
-echo "I am an entrypoint"
-exec "$@"`,
-	})
-	c.Assert(err, check.IsNil)
-	defer ctx.Close()
-
-	_, err = buildImageFromContext(name, ctx, true)
-	c.Assert(err, check.IsNil)
-
-	out, _ := dockerCmd(c, "run", "--entrypoint=", "-t", name, "echo", "foo")
-	c.Assert(strings.TrimSpace(out), check.Equals, "foo")
-
-	// CMD will be reset as well (the same as setting a custom entrypoint)
-	_, _, err = dockerCmdWithError("run", "--entrypoint=", "-t", name)
-	c.Assert(err, check.NotNil)
-	c.Assert(err.Error(), checker.Contains, "No command specified")
-}
-
-func (s *DockerDaemonSuite) TestRunWithUlimitAndDaemonDefault(c *check.C) {
-	c.Assert(s.d.StartWithBusybox("--debug", "--default-ulimit=nofile=65535"), checker.IsNil)
-
-	name := "test-A"
-	_, err := s.d.Cmd("run", "--name", name, "-d", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(s.d.waitRun(name), check.IsNil)
-
-	out, err := s.d.Cmd("inspect", "--format", "{{.HostConfig.Ulimits}}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "[nofile=65535:65535]")
-
-	name = "test-B"
-	_, err = s.d.Cmd("run", "--name", name, "--ulimit=nofile=42", "-d", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(s.d.waitRun(name), check.IsNil)
-
-	out, err = s.d.Cmd("inspect", "--format", "{{.HostConfig.Ulimits}}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "[nofile=42:42]")
-}
-
-func (s *DockerSuite) TestRunStoppedLoggingDriverNoLeak(c *check.C) {
-	nroutines, err := getGoroutineNumber()
-	c.Assert(err, checker.IsNil)
-
-	out, _, err := dockerCmdWithError("run", "--name=fail", "--log-driver=splunk", "busybox", "true")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Failed to initialize logging driver", check.Commentf("error should be about logging driver, got output %s", out))
-
-	// NGoroutines is not updated right away, so we need to wait before failing
-	c.Assert(waitForGoroutines(nroutines), checker.IsNil)
-}
-
-// Handles error conditions for --credentialspec. Validating E2E success cases
-// requires additional infrastructure (AD for example) on CI servers.
-func (s *DockerSuite) TestRunCredentialSpecFailures(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	attempts := []struct{ value, expectedError string }{
-		{"rubbish", "invalid credential spec security option - value must be prefixed file:// or registry://"},
-		{"rubbish://", "invalid credential spec security option - value must be prefixed file:// or registry://"},
-		{"file://", "no value supplied for file:// credential spec security option"},
-		{"registry://", "no value supplied for registry:// credential spec security option"},
-		{`file://c:\blah.txt`, "path cannot be absolute"},
-		{`file://doesnotexist.txt`, "The system cannot find the file specified"},
-	}
-	for _, attempt := range attempts {
-		_, _, err := dockerCmdWithError("run", "--security-opt=credentialspec="+attempt.value, "busybox", "true")
-		c.Assert(err, checker.NotNil, check.Commentf("%s expected non-nil err", attempt.value))
-		c.Assert(err.Error(), checker.Contains, attempt.expectedError, check.Commentf("%s expected %s got %s", attempt.value, attempt.expectedError, err))
-	}
-}
-
-// Windows specific test to validate credential specs with a well-formed spec.
-// Note it won't actually do anything in CI configuration with the spec, but
-// it should not fail to run a container.
-func (s *DockerSuite) TestRunCredentialSpecWellFormed(c *check.C) {
-	testRequires(c, DaemonIsWindows, SameHostDaemon)
-	validCS := readFile(`fixtures\credentialspecs\valid.json`, c)
-	writeFile(filepath.Join(dockerBasePath, `credentialspecs\valid.json`), validCS, c)
-	dockerCmd(c, "run", `--security-opt=credentialspec=file://valid.json`, "busybox", "true")
-}
-
-// Windows specific test to ensure that a servicing app container is started
-// if necessary once a container exits. It does this by forcing a no-op
-// servicing event and verifying the event from Hyper-V-Compute
-func (s *DockerSuite) TestRunServicingContainer(c *check.C) {
-	testRequires(c, DaemonIsWindows, SameHostDaemon)
-
-	out, _ := dockerCmd(c, "run", "-d", WindowsBaseImage, "cmd", "/c", "mkdir c:\\programdata\\Microsoft\\Windows\\ContainerUpdates\\000_000_d99f45d0-ffc8-4af7-bd9c-ea6a62e035c9_200 && sc control cexecsvc 255")
-	containerID := strings.TrimSpace(out)
-	err := waitExited(containerID, 60*time.Second)
-	c.Assert(err, checker.IsNil)
-
-	cmd := exec.Command("powershell", "echo", `(Get-WinEvent -ProviderName "Microsoft-Windows-Hyper-V-Compute" -FilterXPath 'Event[System[EventID=2010]]' -MaxEvents 1).Message`)
-	out2, _, err := runCommandWithOutput(cmd)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out2, checker.Contains, `"Servicing":true`, check.Commentf("Servicing container does not appear to have been started: %s", out2))
-	c.Assert(out2, checker.Contains, `Windows Container (Servicing)`, check.Commentf("Didn't find 'Windows Container (Servicing): %s", out2))
-	c.Assert(out2, checker.Contains, containerID+"_servicing", check.Commentf("Didn't find '%s_servicing': %s", containerID+"_servicing", out2))
-}
-
-func (s *DockerSuite) TestRunDuplicateMount(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux, NotUserNamespace)
-
-	tmpFile, err := ioutil.TempFile("", "touch-me")
-	c.Assert(err, checker.IsNil)
-	defer tmpFile.Close()
-
-	data := "touch-me-foo-bar\n"
-	if _, err := tmpFile.Write([]byte(data)); err != nil {
-		c.Fatal(err)
-	}
-
-	name := "test"
-	out, _ := dockerCmd(c, "run", "--name", name, "-v", "/tmp:/tmp", "-v", "/tmp:/tmp", "busybox", "sh", "-c", "cat "+tmpFile.Name()+" && ls /")
-	c.Assert(out, checker.Not(checker.Contains), "tmp:")
-	c.Assert(out, checker.Contains, data)
-
-	out = inspectFieldJSON(c, name, "Config.Volumes")
-	c.Assert(out, checker.Contains, "null")
-}
-
-func (s *DockerSuite) TestRunWindowsWithCPUCount(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-
-	out, _ := dockerCmd(c, "run", "--cpu-count=1", "--name", "test", "busybox", "echo", "testing")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "testing")
-
-	out = inspectField(c, "test", "HostConfig.CPUCount")
-	c.Assert(out, check.Equals, "1")
-}
-
-func (s *DockerSuite) TestRunWindowsWithCPUShares(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-
-	out, _ := dockerCmd(c, "run", "--cpu-shares=1000", "--name", "test", "busybox", "echo", "testing")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "testing")
-
-	out = inspectField(c, "test", "HostConfig.CPUShares")
-	c.Assert(out, check.Equals, "1000")
-}
-
-func (s *DockerSuite) TestRunWindowsWithCPUPercent(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-
-	out, _ := dockerCmd(c, "run", "--cpu-percent=80", "--name", "test", "busybox", "echo", "testing")
-	c.Assert(strings.TrimSpace(out), checker.Equals, "testing")
-
-	out = inspectField(c, "test", "HostConfig.CPUPercent")
-	c.Assert(out, check.Equals, "80")
-}
-
-func (s *DockerSuite) TestRunProcessIsolationWithCPUCountCPUSharesAndCPUPercent(c *check.C) {
-	testRequires(c, DaemonIsWindows, IsolationIsProcess)
-
-	out, _ := dockerCmd(c, "run", "--cpu-count=1", "--cpu-shares=1000", "--cpu-percent=80", "--name", "test", "busybox", "echo", "testing")
-	c.Assert(strings.TrimSpace(out), checker.Contains, "WARNING: Conflicting options: CPU count takes priority over CPU shares on Windows Server Containers. CPU shares discarded")
-	c.Assert(strings.TrimSpace(out), checker.Contains, "WARNING: Conflicting options: CPU count takes priority over CPU percent on Windows Server Containers. CPU percent discarded")
-	c.Assert(strings.TrimSpace(out), checker.Contains, "testing")
-
-	out = inspectField(c, "test", "HostConfig.CPUCount")
-	c.Assert(out, check.Equals, "1")
-
-	out = inspectField(c, "test", "HostConfig.CPUShares")
-	c.Assert(out, check.Equals, "0")
-
-	out = inspectField(c, "test", "HostConfig.CPUPercent")
-	c.Assert(out, check.Equals, "0")
-}
-
-func (s *DockerSuite) TestRunHypervIsolationWithCPUCountCPUSharesAndCPUPercent(c *check.C) {
-	testRequires(c, DaemonIsWindows, IsolationIsHyperv)
-
-	out, _ := dockerCmd(c, "run", "--cpu-count=1", "--cpu-shares=1000", "--cpu-percent=80", "--name", "test", "busybox", "echo", "testing")
-	c.Assert(strings.TrimSpace(out), checker.Contains, "testing")
-
-	out = inspectField(c, "test", "HostConfig.CPUCount")
-	c.Assert(out, check.Equals, "1")
-
-	out = inspectField(c, "test", "HostConfig.CPUShares")
-	c.Assert(out, check.Equals, "1000")
-
-	out = inspectField(c, "test", "HostConfig.CPUPercent")
-	c.Assert(out, check.Equals, "80")
-}
-
-// Test for #25099
-func (s *DockerSuite) TestRunEmptyEnv(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	expectedOutput := "invalid environment variable:"
-
-	out, _, err := dockerCmdWithError("run", "-e", "", "busybox", "true")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-
-	out, _, err = dockerCmdWithError("run", "-e", "=", "busybox", "true")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-
-	out, _, err = dockerCmdWithError("run", "-e", "=foo", "busybox", "true")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-}
-
-// #28658
-func (s *DockerSuite) TestSlowStdinClosing(c *check.C) {
-	name := "testslowstdinclosing"
-	repeat := 3 // regression happened 50% of the time
-	for i := 0; i < repeat; i++ {
-		cmd := exec.Command(dockerBinary, "run", "--rm", "--name", name, "-i", "busybox", "cat")
-		cmd.Stdin = &delayedReader{}
-		done := make(chan error, 1)
-		go func() {
-			_, err := runCommand(cmd)
-			done <- err
-		}()
-
-		select {
-		case <-time.After(15 * time.Second):
-			c.Fatal("running container timed out") // cleanup in teardown
-		case err := <-done:
-			c.Assert(err, checker.IsNil)
-		}
-	}
-}
-
-type delayedReader struct{}
-
-func (s *delayedReader) Read([]byte) (int, error) {
-	time.Sleep(500 * time.Millisecond)
-	return 0, io.EOF
-}
-
-// #28823 (originally #28639)
-func (s *DockerSuite) TestRunMountReadOnlyDevShm(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-	emptyDir, err := ioutil.TempDir("", "test-read-only-dev-shm")
-	c.Assert(err, check.IsNil)
-	defer os.RemoveAll(emptyDir)
-	out, _, err := dockerCmdWithError("run", "--rm", "--read-only",
-		"-v", fmt.Sprintf("%s:/dev/shm:ro", emptyDir),
-		"busybox", "touch", "/dev/shm/foo")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Read-only file system")
-}
-
-// Test case for 29129
-func (s *DockerSuite) TestRunHostnameInHostMode(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	expectedOutput := "foobar\nfoobar"
-	out, _ := dockerCmd(c, "run", "--net=host", "--hostname=foobar", "busybox", "sh", "-c", `echo $HOSTNAME && hostname`)
-	c.Assert(strings.TrimSpace(out), checker.Equals, expectedOutput)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_unix_test.go
deleted file mode 100644
index e346c19f8e..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_run_unix_test.go
+++ /dev/null
@@ -1,1592 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/docker/docker/pkg/homedir"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/parsers"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// #6509
-func (s *DockerSuite) TestRunRedirectStdout(c *check.C) {
-	checkRedirect := func(command string) {
-		_, tty, err := pty.Open()
-		c.Assert(err, checker.IsNil, check.Commentf("Could not open pty"))
-		cmd := exec.Command("sh", "-c", command)
-		cmd.Stdin = tty
-		cmd.Stdout = tty
-		cmd.Stderr = tty
-		c.Assert(cmd.Start(), checker.IsNil)
-		ch := make(chan error)
-		go func() {
-			ch <- cmd.Wait()
-			close(ch)
-		}()
-
-		select {
-		case <-time.After(10 * time.Second):
-			c.Fatal("command timeout")
-		case err := <-ch:
-			c.Assert(err, checker.IsNil, check.Commentf("wait err"))
-		}
-	}
-
-	checkRedirect(dockerBinary + " run -i busybox cat /etc/passwd | grep -q root")
-	checkRedirect(dockerBinary + " run busybox cat /etc/passwd | grep -q root")
-}
-
-// Test recursive bind mount works by default
-func (s *DockerSuite) TestRunWithVolumesIsRecursive(c *check.C) {
-	// /tmp gets permission denied
-	testRequires(c, NotUserNamespace, SameHostDaemon)
-	tmpDir, err := ioutil.TempDir("", "docker_recursive_mount_test")
-	c.Assert(err, checker.IsNil)
-
-	defer os.RemoveAll(tmpDir)
-
-	// Create a temporary tmpfs mount.
-	tmpfsDir := filepath.Join(tmpDir, "tmpfs")
-	c.Assert(os.MkdirAll(tmpfsDir, 0777), checker.IsNil, check.Commentf("failed to mkdir at %s", tmpfsDir))
-	c.Assert(mount.Mount("tmpfs", tmpfsDir, "tmpfs", ""), checker.IsNil, check.Commentf("failed to create a tmpfs mount at %s", tmpfsDir))
-
-	f, err := ioutil.TempFile(tmpfsDir, "touch-me")
-	c.Assert(err, checker.IsNil)
-	defer f.Close()
-
-	runCmd := exec.Command(dockerBinary, "run", "--name", "test-data", "--volume", fmt.Sprintf("%s:/tmp:ro", tmpDir), "busybox:latest", "ls", "/tmp/tmpfs")
-	out, _, _, err := runCommandWithStdoutStderr(runCmd)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, filepath.Base(f.Name()), check.Commentf("Recursive bind mount test failed. Expected file not found"))
-}
-
-func (s *DockerSuite) TestRunDeviceDirectory(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm)
-	if _, err := os.Stat("/dev/snd"); err != nil {
-		c.Skip("Host does not have /dev/snd")
-	}
-
-	out, _ := dockerCmd(c, "run", "--device", "/dev/snd:/dev/snd", "busybox", "sh", "-c", "ls /dev/snd/")
-	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "timer", check.Commentf("expected output /dev/snd/timer"))
-
-	out, _ = dockerCmd(c, "run", "--device", "/dev/snd:/dev/othersnd", "busybox", "sh", "-c", "ls /dev/othersnd/")
-	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "seq", check.Commentf("expected output /dev/othersnd/seq"))
-}
-
-// TestRunDetach checks attaching and detaching with the default escape sequence.
-func (s *DockerSuite) TestRunAttachDetach(c *check.C) {
-	name := "attach-detach"
-
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "cat")
-
-	cmd := exec.Command(dockerBinary, "attach", name)
-	stdout, err := cmd.StdoutPipe()
-	c.Assert(err, checker.IsNil)
-	cpty, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil)
-	defer cpty.Close()
-	cmd.Stdin = tty
-	c.Assert(cmd.Start(), checker.IsNil)
-	c.Assert(waitRun(name), check.IsNil)
-
-	_, err = cpty.Write([]byte("hello\n"))
-	c.Assert(err, checker.IsNil)
-
-	out, err := bufio.NewReader(stdout).ReadString('\n')
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "hello")
-
-	// escape sequence
-	_, err = cpty.Write([]byte{16})
-	c.Assert(err, checker.IsNil)
-	time.Sleep(100 * time.Millisecond)
-	_, err = cpty.Write([]byte{17})
-	c.Assert(err, checker.IsNil)
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Second):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-	running := inspectField(c, name, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-
-	out, _ = dockerCmd(c, "events", "--since=0", "--until", daemonUnixTime(c), "-f", "container="+name)
-	// attach and detach event should be monitored
-	c.Assert(out, checker.Contains, "attach")
-	c.Assert(out, checker.Contains, "detach")
-}
-
-// TestRunDetach checks attaching and detaching with the escape sequence specified via flags.
-func (s *DockerSuite) TestRunAttachDetachFromFlag(c *check.C) {
-	name := "attach-detach"
-	keyCtrlA := []byte{1}
-	keyA := []byte{97}
-
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "cat")
-
-	cmd := exec.Command(dockerBinary, "attach", "--detach-keys=ctrl-a,a", name)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	cpty, tty, err := pty.Open()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer cpty.Close()
-	cmd.Stdin = tty
-	if err := cmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(waitRun(name), check.IsNil)
-
-	if _, err := cpty.Write([]byte("hello\n")); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("expected 'hello', got %q", out)
-	}
-
-	// escape sequence
-	if _, err := cpty.Write(keyCtrlA); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write(keyA); err != nil {
-		c.Fatal(err)
-	}
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Second):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-	running := inspectField(c, name, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-}
-
-// TestRunDetach checks attaching and detaching with the escape sequence specified via flags.
-func (s *DockerSuite) TestRunAttachDetachFromInvalidFlag(c *check.C) {
-	name := "attach-detach"
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "top")
-	c.Assert(waitRun(name), check.IsNil)
-
-	// specify an invalid detach key, container will ignore it and use default
-	cmd := exec.Command(dockerBinary, "attach", "--detach-keys=ctrl-A,a", name)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	cpty, tty, err := pty.Open()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer cpty.Close()
-	cmd.Stdin = tty
-	if err := cmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-
-	bufReader := bufio.NewReader(stdout)
-	out, err := bufReader.ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	// it should print a warning to indicate the detach key flag is invalid
-	errStr := "Invalid escape keys (ctrl-A,a) provided"
-	c.Assert(strings.TrimSpace(out), checker.Equals, errStr)
-}
-
-// TestRunDetach checks attaching and detaching with the escape sequence specified via config file.
-func (s *DockerSuite) TestRunAttachDetachFromConfig(c *check.C) {
-	keyCtrlA := []byte{1}
-	keyA := []byte{97}
-
-	// Setup config
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-	tmpDir, err := ioutil.TempDir("", "fake-home")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-
-	dotDocker := filepath.Join(tmpDir, ".docker")
-	os.Mkdir(dotDocker, 0600)
-	tmpCfg := filepath.Join(dotDocker, "config.json")
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpDir)
-
-	data := `{
-		"detachKeys": "ctrl-a,a"
-	}`
-
-	err = ioutil.WriteFile(tmpCfg, []byte(data), 0600)
-	c.Assert(err, checker.IsNil)
-
-	// Then do the work
-	name := "attach-detach"
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "cat")
-
-	cmd := exec.Command(dockerBinary, "attach", name)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	cpty, tty, err := pty.Open()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer cpty.Close()
-	cmd.Stdin = tty
-	if err := cmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(waitRun(name), check.IsNil)
-
-	if _, err := cpty.Write([]byte("hello\n")); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("expected 'hello', got %q", out)
-	}
-
-	// escape sequence
-	if _, err := cpty.Write(keyCtrlA); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write(keyA); err != nil {
-		c.Fatal(err)
-	}
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Second):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-	running := inspectField(c, name, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-}
-
-// TestRunDetach checks attaching and detaching with the detach flags, making sure it overrides config file
-func (s *DockerSuite) TestRunAttachDetachKeysOverrideConfig(c *check.C) {
-	keyCtrlA := []byte{1}
-	keyA := []byte{97}
-
-	// Setup config
-	homeKey := homedir.Key()
-	homeVal := homedir.Get()
-	tmpDir, err := ioutil.TempDir("", "fake-home")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-
-	dotDocker := filepath.Join(tmpDir, ".docker")
-	os.Mkdir(dotDocker, 0600)
-	tmpCfg := filepath.Join(dotDocker, "config.json")
-
-	defer func() { os.Setenv(homeKey, homeVal) }()
-	os.Setenv(homeKey, tmpDir)
-
-	data := `{
-		"detachKeys": "ctrl-e,e"
-	}`
-
-	err = ioutil.WriteFile(tmpCfg, []byte(data), 0600)
-	c.Assert(err, checker.IsNil)
-
-	// Then do the work
-	name := "attach-detach"
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "cat")
-
-	cmd := exec.Command(dockerBinary, "attach", "--detach-keys=ctrl-a,a", name)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	cpty, tty, err := pty.Open()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer cpty.Close()
-	cmd.Stdin = tty
-	if err := cmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(waitRun(name), check.IsNil)
-
-	if _, err := cpty.Write([]byte("hello\n")); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.TrimSpace(out) != "hello" {
-		c.Fatalf("expected 'hello', got %q", out)
-	}
-
-	// escape sequence
-	if _, err := cpty.Write(keyCtrlA); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write(keyA); err != nil {
-		c.Fatal(err)
-	}
-
-	ch := make(chan struct{})
-	go func() {
-		cmd.Wait()
-		ch <- struct{}{}
-	}()
-
-	select {
-	case <-ch:
-	case <-time.After(10 * time.Second):
-		c.Fatal("timed out waiting for container to exit")
-	}
-
-	running := inspectField(c, name, "State.Running")
-	c.Assert(running, checker.Equals, "true", check.Commentf("expected container to still be running"))
-}
-
-func (s *DockerSuite) TestRunAttachInvalidDetachKeySequencePreserved(c *check.C) {
-	name := "attach-detach"
-	keyA := []byte{97}
-	keyB := []byte{98}
-
-	dockerCmd(c, "run", "--name", name, "-itd", "busybox", "cat")
-
-	cmd := exec.Command(dockerBinary, "attach", "--detach-keys=a,b,c", name)
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		c.Fatal(err)
-	}
-	cpty, tty, err := pty.Open()
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer cpty.Close()
-	cmd.Stdin = tty
-	if err := cmd.Start(); err != nil {
-		c.Fatal(err)
-	}
-	c.Assert(waitRun(name), check.IsNil)
-
-	// Invalid escape sequence aba, should print aba in output
-	if _, err := cpty.Write(keyA); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write(keyB); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write(keyA); err != nil {
-		c.Fatal(err)
-	}
-	time.Sleep(100 * time.Millisecond)
-	if _, err := cpty.Write([]byte("\n")); err != nil {
-		c.Fatal(err)
-	}
-
-	out, err := bufio.NewReader(stdout).ReadString('\n')
-	if err != nil {
-		c.Fatal(err)
-	}
-	if strings.TrimSpace(out) != "aba" {
-		c.Fatalf("expected 'aba', got %q", out)
-	}
-}
-
-// "test" should be printed
-func (s *DockerSuite) TestRunWithCPUQuota(c *check.C) {
-	testRequires(c, cpuCfsQuota)
-
-	file := "/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
-	out, _ := dockerCmd(c, "run", "--cpu-quota", "8000", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "8000")
-
-	out = inspectField(c, "test", "HostConfig.CpuQuota")
-	c.Assert(out, checker.Equals, "8000", check.Commentf("setting the CPU CFS quota failed"))
-}
-
-func (s *DockerSuite) TestRunWithCpuPeriod(c *check.C) {
-	testRequires(c, cpuCfsPeriod)
-
-	file := "/sys/fs/cgroup/cpu/cpu.cfs_period_us"
-	out, _ := dockerCmd(c, "run", "--cpu-period", "50000", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "50000")
-
-	out, _ = dockerCmd(c, "run", "--cpu-period", "0", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "100000")
-
-	out = inspectField(c, "test", "HostConfig.CpuPeriod")
-	c.Assert(out, checker.Equals, "50000", check.Commentf("setting the CPU CFS period failed"))
-}
-
-func (s *DockerSuite) TestRunWithInvalidCpuPeriod(c *check.C) {
-	testRequires(c, cpuCfsPeriod)
-	out, _, err := dockerCmdWithError("run", "--cpu-period", "900", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "CPU cfs period can not be less than 1ms (i.e. 1000) or larger than 1s (i.e. 1000000)"
-	c.Assert(out, checker.Contains, expected)
-
-	out, _, err = dockerCmdWithError("run", "--cpu-period", "2000000", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, expected)
-
-	out, _, err = dockerCmdWithError("run", "--cpu-period", "-3", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
-	testRequires(c, kernelMemorySupport)
-
-	file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
-	stdout, _, _ := dockerCmdWithStdoutStderr(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(stdout), checker.Equals, "52428800")
-
-	out := inspectField(c, "test1", "HostConfig.KernelMemory")
-	c.Assert(out, check.Equals, "52428800")
-}
-
-func (s *DockerSuite) TestRunWithInvalidKernelMemory(c *check.C) {
-	testRequires(c, kernelMemorySupport)
-
-	out, _, err := dockerCmdWithError("run", "--kernel-memory", "2M", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Minimum kernel memory limit allowed is 4MB"
-	c.Assert(out, checker.Contains, expected)
-
-	out, _, err = dockerCmdWithError("run", "--kernel-memory", "-16m", "--name", "test2", "busybox", "echo", "test")
-	c.Assert(err, check.NotNil)
-	expected = "invalid size"
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunWithCPUShares(c *check.C) {
-	testRequires(c, cpuShare)
-
-	file := "/sys/fs/cgroup/cpu/cpu.shares"
-	out, _ := dockerCmd(c, "run", "--cpu-shares", "1000", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "1000")
-
-	out = inspectField(c, "test", "HostConfig.CPUShares")
-	c.Assert(out, check.Equals, "1000")
-}
-
-// "test" should be printed
-func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
-	testRequires(c, cpuShare)
-	testRequires(c, memoryLimitSupport)
-	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "--cpu-shares", "1000", "-m", "32m", "busybox", "echo", "test")
-	c.Assert(out, checker.Equals, "test\n", check.Commentf("container should've printed 'test'"))
-}
-
-func (s *DockerSuite) TestRunWithCpusetCpus(c *check.C) {
-	testRequires(c, cgroupCpuset)
-
-	file := "/sys/fs/cgroup/cpuset/cpuset.cpus"
-	out, _ := dockerCmd(c, "run", "--cpuset-cpus", "0", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	out = inspectField(c, "test", "HostConfig.CpusetCpus")
-	c.Assert(out, check.Equals, "0")
-}
-
-func (s *DockerSuite) TestRunWithCpusetMems(c *check.C) {
-	testRequires(c, cgroupCpuset)
-
-	file := "/sys/fs/cgroup/cpuset/cpuset.mems"
-	out, _ := dockerCmd(c, "run", "--cpuset-mems", "0", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	out = inspectField(c, "test", "HostConfig.CpusetMems")
-	c.Assert(out, check.Equals, "0")
-}
-
-func (s *DockerSuite) TestRunWithBlkioWeight(c *check.C) {
-	testRequires(c, blkioWeight)
-
-	file := "/sys/fs/cgroup/blkio/blkio.weight"
-	out, _ := dockerCmd(c, "run", "--blkio-weight", "300", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "300")
-
-	out = inspectField(c, "test", "HostConfig.BlkioWeight")
-	c.Assert(out, check.Equals, "300")
-}
-
-func (s *DockerSuite) TestRunWithInvalidBlkioWeight(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--blkio-weight", "5", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	expected := "Range of blkio weight is from 10 to 1000"
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunWithInvalidPathforBlkioWeightDevice(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--blkio-weight-device", "/dev/sdX:100", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestRunWithInvalidPathforBlkioDeviceReadBps(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--device-read-bps", "/dev/sdX:500", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestRunWithInvalidPathforBlkioDeviceWriteBps(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--device-write-bps", "/dev/sdX:500", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestRunWithInvalidPathforBlkioDeviceReadIOps(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--device-read-iops", "/dev/sdX:500", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestRunWithInvalidPathforBlkioDeviceWriteIOps(c *check.C) {
-	testRequires(c, blkioWeight)
-	out, _, err := dockerCmdWithError("run", "--device-write-iops", "/dev/sdX:500", "busybox", "true")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
-	testRequires(c, memoryLimitSupport, swapMemorySupport)
-	errChan := make(chan error)
-	go func() {
-		defer close(errChan)
-		out, exitCode, _ := dockerCmdWithError("run", "-m", "4MB", "busybox", "sh", "-c", "x=a; while true; do x=$x$x$x$x; done")
-		if expected := 137; exitCode != expected {
-			errChan <- fmt.Errorf("wrong exit code for OOM container: expected %d, got %d (output: %q)", expected, exitCode, out)
-		}
-	}()
-
-	select {
-	case err := <-errChan:
-		c.Assert(err, check.IsNil)
-	case <-time.After(600 * time.Second):
-		c.Fatal("Timeout waiting for container to die on OOM")
-	}
-}
-
-func (s *DockerSuite) TestRunWithMemoryLimit(c *check.C) {
-	testRequires(c, memoryLimitSupport)
-
-	file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	stdout, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "32M", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(stdout), checker.Equals, "33554432")
-
-	out := inspectField(c, "test", "HostConfig.Memory")
-	c.Assert(out, check.Equals, "33554432")
-}
-
-// TestRunWithoutMemoryswapLimit sets memory limit and disables swap
-// memory limit, this means the processes in the container can use
-// 16M memory and as much swap memory as they need (if the host
-// supports swap memory).
-func (s *DockerSuite) TestRunWithoutMemoryswapLimit(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-	dockerCmd(c, "run", "-m", "32m", "--memory-swap", "-1", "busybox", "true")
-}
-
-func (s *DockerSuite) TestRunWithSwappiness(c *check.C) {
-	testRequires(c, memorySwappinessSupport)
-	file := "/sys/fs/cgroup/memory/memory.swappiness"
-	out, _ := dockerCmd(c, "run", "--memory-swappiness", "0", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0")
-
-	out = inspectField(c, "test", "HostConfig.MemorySwappiness")
-	c.Assert(out, check.Equals, "0")
-}
-
-func (s *DockerSuite) TestRunWithSwappinessInvalid(c *check.C) {
-	testRequires(c, memorySwappinessSupport)
-	out, _, err := dockerCmdWithError("run", "--memory-swappiness", "101", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Valid memory swappiness range is 0-100"
-	c.Assert(out, checker.Contains, expected, check.Commentf("Expected output to contain %q, not %q", out, expected))
-
-	out, _, err = dockerCmdWithError("run", "--memory-swappiness", "-10", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, expected, check.Commentf("Expected output to contain %q, not %q", out, expected))
-}
-
-func (s *DockerSuite) TestRunWithMemoryReservation(c *check.C) {
-	testRequires(c, memoryReservationSupport)
-
-	file := "/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"
-	out, _ := dockerCmd(c, "run", "--memory-reservation", "200M", "--name", "test", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "209715200")
-
-	out = inspectField(c, "test", "HostConfig.MemoryReservation")
-	c.Assert(out, check.Equals, "209715200")
-}
-
-func (s *DockerSuite) TestRunWithMemoryReservationInvalid(c *check.C) {
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, memoryReservationSupport)
-	out, _, err := dockerCmdWithError("run", "-m", "500M", "--memory-reservation", "800M", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := "Minimum memory limit can not be less than memory reservation limit"
-	c.Assert(strings.TrimSpace(out), checker.Contains, expected, check.Commentf("run container should fail with invalid memory reservation"))
-
-	out, _, err = dockerCmdWithError("run", "--memory-reservation", "1k", "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected = "Minimum memory reservation allowed is 4MB"
-	c.Assert(strings.TrimSpace(out), checker.Contains, expected, check.Commentf("run container should fail with invalid memory reservation"))
-}
-
-func (s *DockerSuite) TestStopContainerSignal(c *check.C) {
-	out, _ := dockerCmd(c, "run", "--stop-signal", "SIGUSR1", "-d", "busybox", "/bin/sh", "-c", `trap 'echo "exit trapped"; exit 0' USR1; while true; do sleep 1; done`)
-	containerID := strings.TrimSpace(out)
-
-	c.Assert(waitRun(containerID), checker.IsNil)
-
-	dockerCmd(c, "stop", containerID)
-	out, _ = dockerCmd(c, "logs", containerID)
-
-	c.Assert(out, checker.Contains, "exit trapped", check.Commentf("Expected `exit trapped` in the log"))
-}
-
-func (s *DockerSuite) TestRunSwapLessThanMemoryLimit(c *check.C) {
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-	out, _, err := dockerCmdWithError("run", "-m", "16m", "--memory-swap", "15m", "busybox", "echo", "test")
-	expected := "Minimum memoryswap limit should be larger than memory limit"
-	c.Assert(err, check.NotNil)
-
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunInvalidCpusetCpusFlagValue(c *check.C) {
-	testRequires(c, cgroupCpuset, SameHostDaemon)
-
-	sysInfo := sysinfo.New(true)
-	cpus, err := parsers.ParseUintList(sysInfo.Cpus)
-	c.Assert(err, check.IsNil)
-	var invalid int
-	for i := 0; i <= len(cpus)+1; i++ {
-		if !cpus[i] {
-			invalid = i
-			break
-		}
-	}
-	out, _, err := dockerCmdWithError("run", "--cpuset-cpus", strconv.Itoa(invalid), "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := fmt.Sprintf("Error response from daemon: Requested CPUs are not available - requested %s, available: %s", strconv.Itoa(invalid), sysInfo.Cpus)
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunInvalidCpusetMemsFlagValue(c *check.C) {
-	testRequires(c, cgroupCpuset)
-
-	sysInfo := sysinfo.New(true)
-	mems, err := parsers.ParseUintList(sysInfo.Mems)
-	c.Assert(err, check.IsNil)
-	var invalid int
-	for i := 0; i <= len(mems)+1; i++ {
-		if !mems[i] {
-			invalid = i
-			break
-		}
-	}
-	out, _, err := dockerCmdWithError("run", "--cpuset-mems", strconv.Itoa(invalid), "busybox", "true")
-	c.Assert(err, check.NotNil)
-	expected := fmt.Sprintf("Error response from daemon: Requested memory nodes are not available - requested %s, available: %s", strconv.Itoa(invalid), sysInfo.Mems)
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunInvalidCPUShares(c *check.C) {
-	testRequires(c, cpuShare, DaemonIsLinux)
-	out, _, err := dockerCmdWithError("run", "--cpu-shares", "1", "busybox", "echo", "test")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	expected := "The minimum allowed cpu-shares is 2"
-	c.Assert(out, checker.Contains, expected)
-
-	out, _, err = dockerCmdWithError("run", "--cpu-shares", "-1", "busybox", "echo", "test")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	expected = "shares: invalid argument"
-	c.Assert(out, checker.Contains, expected)
-
-	out, _, err = dockerCmdWithError("run", "--cpu-shares", "99999999", "busybox", "echo", "test")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	expected = "The maximum allowed cpu-shares is"
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestRunWithDefaultShmSize(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	name := "shm-default"
-	out, _ := dockerCmd(c, "run", "--name", name, "busybox", "mount")
-	shmRegex := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=65536k`)
-	if !shmRegex.MatchString(out) {
-		c.Fatalf("Expected shm of 64MB in mount command, got %v", out)
-	}
-	shmSize := inspectField(c, name, "HostConfig.ShmSize")
-	c.Assert(shmSize, check.Equals, "67108864")
-}
-
-func (s *DockerSuite) TestRunWithShmSize(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	name := "shm"
-	out, _ := dockerCmd(c, "run", "--name", name, "--shm-size=1G", "busybox", "mount")
-	shmRegex := regexp.MustCompile(`shm on /dev/shm type tmpfs(.*)size=1048576k`)
-	if !shmRegex.MatchString(out) {
-		c.Fatalf("Expected shm of 1GB in mount command, got %v", out)
-	}
-	shmSize := inspectField(c, name, "HostConfig.ShmSize")
-	c.Assert(shmSize, check.Equals, "1073741824")
-}
-
-func (s *DockerSuite) TestRunTmpfsMountsEnsureOrdered(c *check.C) {
-	tmpFile, err := ioutil.TempFile("", "test")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-	out, _ := dockerCmd(c, "run", "--tmpfs", "/run", "-v", tmpFile.Name()+":/run/test", "busybox", "ls", "/run")
-	c.Assert(out, checker.Contains, "test")
-}
-
-func (s *DockerSuite) TestRunTmpfsMounts(c *check.C) {
-	// TODO Windows (Post TP5): This test cannot run on a Windows daemon as
-	// Windows does not support tmpfs mounts.
-	testRequires(c, DaemonIsLinux)
-	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run", "busybox", "touch", "/run/somefile"); err != nil {
-		c.Fatalf("/run directory not mounted on tmpfs %q %s", err, out)
-	}
-	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run:noexec", "busybox", "touch", "/run/somefile"); err != nil {
-		c.Fatalf("/run directory not mounted on tmpfs %q %s", err, out)
-	}
-	if out, _, err := dockerCmdWithError("run", "--tmpfs", "/run:noexec,nosuid,rw,size=5k,mode=700", "busybox", "touch", "/run/somefile"); err != nil {
-		c.Fatalf("/run failed to mount on tmpfs with valid options %q %s", err, out)
-	}
-	if _, _, err := dockerCmdWithError("run", "--tmpfs", "/run:foobar", "busybox", "touch", "/run/somefile"); err == nil {
-		c.Fatalf("/run mounted on tmpfs when it should have vailed within invalid mount option")
-	}
-	if _, _, err := dockerCmdWithError("run", "--tmpfs", "/run", "-v", "/run:/run", "busybox", "touch", "/run/somefile"); err == nil {
-		c.Fatalf("Should have generated an error saying Duplicate mount  points")
-	}
-}
-
-func (s *DockerSuite) TestRunTmpfsMountsOverrideImageVolumes(c *check.C) {
-	name := "img-with-volumes"
-	_, err := buildImage(
-		name,
-		`
-    FROM busybox
-    VOLUME /run
-    RUN touch /run/stuff
-    `,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	out, _ := dockerCmd(c, "run", "--tmpfs", "/run", name, "ls", "/run")
-	c.Assert(out, checker.Not(checker.Contains), "stuff")
-}
-
-// Test case for #22420
-func (s *DockerSuite) TestRunTmpfsMountsWithOptions(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	expectedOptions := []string{"rw", "nosuid", "nodev", "noexec", "relatime"}
-	out, _ := dockerCmd(c, "run", "--tmpfs", "/tmp", "busybox", "sh", "-c", "mount | grep 'tmpfs on /tmp'")
-	for _, option := range expectedOptions {
-		c.Assert(out, checker.Contains, option)
-	}
-	c.Assert(out, checker.Not(checker.Contains), "size=")
-
-	expectedOptions = []string{"rw", "nosuid", "nodev", "noexec", "relatime"}
-	out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:rw", "busybox", "sh", "-c", "mount | grep 'tmpfs on /tmp'")
-	for _, option := range expectedOptions {
-		c.Assert(out, checker.Contains, option)
-	}
-	c.Assert(out, checker.Not(checker.Contains), "size=")
-
-	expectedOptions = []string{"rw", "nosuid", "nodev", "relatime", "size=8192k"}
-	out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:rw,exec,size=8192k", "busybox", "sh", "-c", "mount | grep 'tmpfs on /tmp'")
-	for _, option := range expectedOptions {
-		c.Assert(out, checker.Contains, option)
-	}
-
-	expectedOptions = []string{"rw", "nosuid", "nodev", "noexec", "relatime", "size=4096k"}
-	out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:rw,size=8192k,exec,size=4096k,noexec", "busybox", "sh", "-c", "mount | grep 'tmpfs on /tmp'")
-	for _, option := range expectedOptions {
-		c.Assert(out, checker.Contains, option)
-	}
-
-	// We use debian:jessie as there is no findmnt in busybox. Also the output will be in the format of
-	// TARGET PROPAGATION
-	// /tmp   shared
-	// so we only capture `shared` here.
-	expectedOptions = []string{"shared"}
-	out, _ = dockerCmd(c, "run", "--tmpfs", "/tmp:shared", "debian:jessie", "findmnt", "-o", "TARGET,PROPAGATION", "/tmp")
-	for _, option := range expectedOptions {
-		c.Assert(out, checker.Contains, option)
-	}
-}
-
-func (s *DockerSuite) TestRunSysctls(c *check.C) {
-
-	testRequires(c, DaemonIsLinux)
-	var err error
-
-	out, _ := dockerCmd(c, "run", "--sysctl", "net.ipv4.ip_forward=1", "--name", "test", "busybox", "cat", "/proc/sys/net/ipv4/ip_forward")
-	c.Assert(strings.TrimSpace(out), check.Equals, "1")
-
-	out = inspectFieldJSON(c, "test", "HostConfig.Sysctls")
-
-	sysctls := make(map[string]string)
-	err = json.Unmarshal([]byte(out), &sysctls)
-	c.Assert(err, check.IsNil)
-	c.Assert(sysctls["net.ipv4.ip_forward"], check.Equals, "1")
-
-	out, _ = dockerCmd(c, "run", "--sysctl", "net.ipv4.ip_forward=0", "--name", "test1", "busybox", "cat", "/proc/sys/net/ipv4/ip_forward")
-	c.Assert(strings.TrimSpace(out), check.Equals, "0")
-
-	out = inspectFieldJSON(c, "test1", "HostConfig.Sysctls")
-
-	err = json.Unmarshal([]byte(out), &sysctls)
-	c.Assert(err, check.IsNil)
-	c.Assert(sysctls["net.ipv4.ip_forward"], check.Equals, "0")
-
-	runCmd := exec.Command(dockerBinary, "run", "--sysctl", "kernel.foobar=1", "--name", "test2", "busybox", "cat", "/proc/sys/kernel/foobar")
-	out, _, _ = runCommandWithOutput(runCmd)
-	if !strings.Contains(out, "invalid argument") {
-		c.Fatalf("expected --sysctl to fail, got %s", out)
-	}
-}
-
-// TestRunSeccompProfileDenyUnshare checks that 'docker run --security-opt seccomp=/tmp/profile.json debian:jessie unshare' exits with operation not permitted.
-func (s *DockerSuite) TestRunSeccompProfileDenyUnshare(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, NotArm, Apparmor)
-	jsonData := `{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"name": "unshare",
-			"action": "SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer tmpFile.Close()
-
-	if _, err := tmpFile.Write([]byte(jsonData)); err != nil {
-		c.Fatal(err)
-	}
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), "debian:jessie", "unshare", "-p", "-m", "-f", "-r", "mount", "-t", "proc", "none", "/proc")
-	out, _, _ := runCommandWithOutput(runCmd)
-	if !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("expected unshare with seccomp profile denied to fail, got %s", out)
-	}
-}
-
-// TestRunSeccompProfileDenyChmod checks that 'docker run --security-opt seccomp=/tmp/profile.json busybox chmod 400 /etc/hostname' exits with operation not permitted.
-func (s *DockerSuite) TestRunSeccompProfileDenyChmod(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-	jsonData := `{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"name": "chmod",
-			"action": "SCMP_ACT_ERRNO"
-		},
-		{
-			"name":"fchmod",
-			"action": "SCMP_ACT_ERRNO"
-		},
-		{
-			"name": "fchmodat",
-			"action":"SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-
-	if _, err := tmpFile.Write([]byte(jsonData)); err != nil {
-		c.Fatal(err)
-	}
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "seccomp="+tmpFile.Name(), "busybox", "chmod", "400", "/etc/hostname")
-	out, _, _ := runCommandWithOutput(runCmd)
-	if !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("expected chmod with seccomp profile denied to fail, got %s", out)
-	}
-}
-
-// TestRunSeccompProfileDenyUnshareUserns checks that 'docker run debian:jessie unshare --map-root-user --user sh -c whoami' with a specific profile to
-// deny unhare of a userns exits with operation not permitted.
-func (s *DockerSuite) TestRunSeccompProfileDenyUnshareUserns(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, NotArm, Apparmor)
-	// from sched.h
-	jsonData := fmt.Sprintf(`{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"name": "unshare",
-			"action": "SCMP_ACT_ERRNO",
-			"args": [
-				{
-					"index": 0,
-					"value": %d,
-					"op": "SCMP_CMP_EQ"
-				}
-			]
-		}
-	]
-}`, uint64(0x10000000))
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	if err != nil {
-		c.Fatal(err)
-	}
-	defer tmpFile.Close()
-
-	if _, err := tmpFile.Write([]byte(jsonData)); err != nil {
-		c.Fatal(err)
-	}
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "apparmor=unconfined", "--security-opt", "seccomp="+tmpFile.Name(), "debian:jessie", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami")
-	out, _, _ := runCommandWithOutput(runCmd)
-	if !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("expected unshare userns with seccomp profile denied to fail, got %s", out)
-	}
-}
-
-// TestRunSeccompProfileDenyCloneUserns checks that 'docker run syscall-test'
-// with a the default seccomp profile exits with operation not permitted.
-func (s *DockerSuite) TestRunSeccompProfileDenyCloneUserns(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-	ensureSyscallTest(c)
-
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "userns-test", "id")
-	out, _, err := runCommandWithOutput(runCmd)
-	if err == nil || !strings.Contains(out, "clone failed: Operation not permitted") {
-		c.Fatalf("expected clone userns with default seccomp profile denied to fail, got %s: %v", out, err)
-	}
-}
-
-// TestRunSeccompUnconfinedCloneUserns checks that
-// 'docker run --security-opt seccomp=unconfined syscall-test' allows creating a userns.
-func (s *DockerSuite) TestRunSeccompUnconfinedCloneUserns(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, UserNamespaceInKernel, NotUserNamespace, unprivilegedUsernsClone)
-	ensureSyscallTest(c)
-
-	// make sure running w privileged is ok
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "seccomp=unconfined", "syscall-test", "userns-test", "id")
-	if out, _, err := runCommandWithOutput(runCmd); err != nil || !strings.Contains(out, "nobody") {
-		c.Fatalf("expected clone userns with --security-opt seccomp=unconfined to succeed, got %s: %v", out, err)
-	}
-}
-
-// TestRunSeccompAllowPrivCloneUserns checks that 'docker run --privileged syscall-test'
-// allows creating a userns.
-func (s *DockerSuite) TestRunSeccompAllowPrivCloneUserns(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, UserNamespaceInKernel, NotUserNamespace)
-	ensureSyscallTest(c)
-
-	// make sure running w privileged is ok
-	runCmd := exec.Command(dockerBinary, "run", "--privileged", "syscall-test", "userns-test", "id")
-	if out, _, err := runCommandWithOutput(runCmd); err != nil || !strings.Contains(out, "nobody") {
-		c.Fatalf("expected clone userns with --privileged to succeed, got %s: %v", out, err)
-	}
-}
-
-// TestRunSeccompProfileAllow32Bit checks that 32 bit code can run on x86_64
-// with the default seccomp profile.
-func (s *DockerSuite) TestRunSeccompProfileAllow32Bit(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, IsAmd64)
-	ensureSyscallTest(c)
-
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "exit32-test", "id")
-	if out, _, err := runCommandWithOutput(runCmd); err != nil {
-		c.Fatalf("expected to be able to run 32 bit code, got %s: %v", out, err)
-	}
-}
-
-// TestRunSeccompAllowSetrlimit checks that 'docker run debian:jessie ulimit -v 1048510' succeeds.
-func (s *DockerSuite) TestRunSeccompAllowSetrlimit(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	// ulimit uses setrlimit, so we want to make sure we don't break it
-	runCmd := exec.Command(dockerBinary, "run", "debian:jessie", "bash", "-c", "ulimit -v 1048510")
-	if out, _, err := runCommandWithOutput(runCmd); err != nil {
-		c.Fatalf("expected ulimit with seccomp to succeed, got %s: %v", out, err)
-	}
-}
-
-func (s *DockerSuite) TestRunSeccompDefaultProfileAcct(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, NotUserNamespace)
-	ensureSyscallTest(c)
-
-	out, _, err := dockerCmdWithError("run", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("test 0: expected Operation not permitted, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "sys_admin", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("test 1: expected Operation not permitted, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "sys_pacct", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("test 2: expected No such file or directory, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "ALL", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("test 3: expected No such file or directory, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-drop", "ALL", "--cap-add", "sys_pacct", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("test 4: expected No such file or directory, got: %s", out)
-	}
-}
-
-func (s *DockerSuite) TestRunSeccompDefaultProfileNS(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled, NotUserNamespace)
-	ensureSyscallTest(c)
-
-	out, _, err := dockerCmdWithError("run", "syscall-test", "ns-test", "echo", "hello0")
-	if err == nil || !strings.Contains(out, "Operation not permitted") {
-		c.Fatalf("test 0: expected Operation not permitted, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "sys_admin", "syscall-test", "ns-test", "echo", "hello1")
-	if err != nil || !strings.Contains(out, "hello1") {
-		c.Fatalf("test 1: expected hello1, got: %s, %v", out, err)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-drop", "all", "--cap-add", "sys_admin", "syscall-test", "ns-test", "echo", "hello2")
-	if err != nil || !strings.Contains(out, "hello2") {
-		c.Fatalf("test 2: expected hello2, got: %s, %v", out, err)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "ALL", "syscall-test", "ns-test", "echo", "hello3")
-	if err != nil || !strings.Contains(out, "hello3") {
-		c.Fatalf("test 3: expected hello3, got: %s, %v", out, err)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "ALL", "--security-opt", "seccomp=unconfined", "syscall-test", "acct-test")
-	if err == nil || !strings.Contains(out, "No such file or directory") {
-		c.Fatalf("test 4: expected No such file or directory, got: %s", out)
-	}
-
-	out, _, err = dockerCmdWithError("run", "--cap-add", "ALL", "--security-opt", "seccomp=unconfined", "syscall-test", "ns-test", "echo", "hello4")
-	if err != nil || !strings.Contains(out, "hello4") {
-		c.Fatalf("test 5: expected hello4, got: %s, %v", out, err)
-	}
-}
-
-// TestRunNoNewPrivSetuid checks that --security-opt=no-new-privileges prevents
-// effective uid transtions on executing setuid binaries.
-func (s *DockerSuite) TestRunNoNewPrivSetuid(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, SameHostDaemon)
-	ensureNNPTest(c)
-
-	// test that running a setuid binary results in no effective uid transition
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "no-new-privileges", "--user", "1000", "nnp-test", "/usr/bin/nnp-test")
-	if out, _, err := runCommandWithOutput(runCmd); err != nil || !strings.Contains(out, "EUID=1000") {
-		c.Fatalf("expected output to contain EUID=1000, got %s: %v", out, err)
-	}
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesChown(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_CHOWN
-	runCmd := exec.Command(dockerBinary, "run", "busybox", "chown", "100", "/tmp")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_CHOWN
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "busybox", "chown", "100", "/tmp")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_CHOWN
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "chown", "busybox", "chown", "100", "/tmp")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesDacOverride(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_DAC_OVERRIDE
-	runCmd := exec.Command(dockerBinary, "run", "busybox", "sh", "-c", "echo test > /etc/passwd")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_DAC_OVERRIDE
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "busybox", "sh", "-c", "echo test > /etc/passwd")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Permission denied")
-	// TODO test that root user can drop default capability CAP_DAC_OVERRIDE
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesFowner(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_FOWNER
-	runCmd := exec.Command(dockerBinary, "run", "busybox", "chmod", "777", "/etc/passwd")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_FOWNER
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "busybox", "chmod", "777", "/etc/passwd")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// TODO test that root user can drop default capability CAP_FOWNER
-}
-
-// TODO CAP_KILL
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesSetuid(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_SETUID
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "setuid-test")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_SETUID
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "syscall-test", "setuid-test")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_SETUID
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "setuid", "syscall-test", "setuid-test")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesSetgid(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_SETGID
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "setgid-test")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_SETGID
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "syscall-test", "setgid-test")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_SETGID
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "setgid", "syscall-test", "setgid-test")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-// TODO CAP_SETPCAP
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesNetBindService(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_NET_BIND_SERVICE
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "socket-test")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_NET_BIND_SERVICE
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "syscall-test", "socket-test")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Permission denied")
-	// test that root user can drop default capability CAP_NET_BIND_SERVICE
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "net_bind_service", "syscall-test", "socket-test")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Permission denied")
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesNetRaw(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_NET_RAW
-	runCmd := exec.Command(dockerBinary, "run", "syscall-test", "raw-test")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_NET_RAW
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "syscall-test", "raw-test")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_NET_RAW
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "net_raw", "syscall-test", "raw-test")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesChroot(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_SYS_CHROOT
-	runCmd := exec.Command(dockerBinary, "run", "busybox", "chroot", "/", "/bin/true")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_SYS_CHROOT
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "busybox", "chroot", "/", "/bin/true")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_SYS_CHROOT
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "sys_chroot", "busybox", "chroot", "/", "/bin/true")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerSuite) TestUserNoEffectiveCapabilitiesMknod(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	ensureSyscallTest(c)
-
-	// test that a root user has default capability CAP_MKNOD
-	runCmd := exec.Command(dockerBinary, "run", "busybox", "mknod", "/tmp/node", "b", "1", "2")
-	_, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, check.IsNil)
-	// test that non root user does not have default capability CAP_MKNOD
-	runCmd = exec.Command(dockerBinary, "run", "--user", "1000:1000", "busybox", "mknod", "/tmp/node", "b", "1", "2")
-	out, _, err := runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-	// test that root user can drop default capability CAP_MKNOD
-	runCmd = exec.Command(dockerBinary, "run", "--cap-drop", "mknod", "busybox", "mknod", "/tmp/node", "b", "1", "2")
-	out, _, err = runCommandWithOutput(runCmd)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-// TODO CAP_AUDIT_WRITE
-// TODO CAP_SETFCAP
-
-func (s *DockerSuite) TestRunApparmorProcDirectory(c *check.C) {
-	testRequires(c, SameHostDaemon, Apparmor)
-
-	// running w seccomp unconfined tests the apparmor profile
-	runCmd := exec.Command(dockerBinary, "run", "--security-opt", "seccomp=unconfined", "busybox", "chmod", "777", "/proc/1/cgroup")
-	if out, _, err := runCommandWithOutput(runCmd); err == nil || !(strings.Contains(out, "Permission denied") || strings.Contains(out, "Operation not permitted")) {
-		c.Fatalf("expected chmod 777 /proc/1/cgroup to fail, got %s: %v", out, err)
-	}
-
-	runCmd = exec.Command(dockerBinary, "run", "--security-opt", "seccomp=unconfined", "busybox", "chmod", "777", "/proc/1/attr/current")
-	if out, _, err := runCommandWithOutput(runCmd); err == nil || !(strings.Contains(out, "Permission denied") || strings.Contains(out, "Operation not permitted")) {
-		c.Fatalf("expected chmod 777 /proc/1/attr/current to fail, got %s: %v", out, err)
-	}
-}
-
-// make sure the default profile can be successfully parsed (using unshare as it is
-// something which we know is blocked in the default profile)
-func (s *DockerSuite) TestRunSeccompWithDefaultProfile(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	out, _, err := dockerCmdWithError("run", "--security-opt", "seccomp=../profiles/seccomp/default.json", "debian:jessie", "unshare", "--map-root-user", "--user", "sh", "-c", "whoami")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "unshare: unshare failed: Operation not permitted")
-}
-
-// TestRunDeviceSymlink checks run with device that follows symlink (#13840 and #22271)
-func (s *DockerSuite) TestRunDeviceSymlink(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace, NotArm, SameHostDaemon)
-	if _, err := os.Stat("/dev/zero"); err != nil {
-		c.Skip("Host does not have /dev/zero")
-	}
-
-	// Create a temporary directory to create symlink
-	tmpDir, err := ioutil.TempDir("", "docker_device_follow_symlink_tests")
-	c.Assert(err, checker.IsNil)
-
-	defer os.RemoveAll(tmpDir)
-
-	// Create a symbolic link to /dev/zero
-	symZero := filepath.Join(tmpDir, "zero")
-	err = os.Symlink("/dev/zero", symZero)
-	c.Assert(err, checker.IsNil)
-
-	// Create a temporary file "temp" inside tmpDir, write some data to "tmpDir/temp",
-	// then create a symlink "tmpDir/file" to the temporary file "tmpDir/temp".
-	tmpFile := filepath.Join(tmpDir, "temp")
-	err = ioutil.WriteFile(tmpFile, []byte("temp"), 0666)
-	c.Assert(err, checker.IsNil)
-	symFile := filepath.Join(tmpDir, "file")
-	err = os.Symlink(tmpFile, symFile)
-	c.Assert(err, checker.IsNil)
-
-	// Create a symbolic link to /dev/zero, this time with a relative path (#22271)
-	err = os.Symlink("zero", "/dev/symzero")
-	if err != nil {
-		c.Fatal("/dev/symzero creation failed")
-	}
-	// We need to remove this symbolic link here as it is created in /dev/, not temporary directory as above
-	defer os.Remove("/dev/symzero")
-
-	// md5sum of 'dd if=/dev/zero bs=4K count=8' is bb7df04e1b0a2570657527a7e108ae23
-	out, _ := dockerCmd(c, "run", "--device", symZero+":/dev/symzero", "busybox", "sh", "-c", "dd if=/dev/symzero bs=4K count=8 | md5sum")
-	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "bb7df04e1b0a2570657527a7e108ae23", check.Commentf("expected output bb7df04e1b0a2570657527a7e108ae23"))
-
-	// symlink "tmpDir/file" to a file "tmpDir/temp" will result in an error as it is not a device.
-	out, _, err = dockerCmdWithError("run", "--device", symFile+":/dev/symzero", "busybox", "sh", "-c", "dd if=/dev/symzero bs=4K count=8 | md5sum")
-	c.Assert(err, check.NotNil)
-	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "not a device node", check.Commentf("expected output 'not a device node'"))
-
-	// md5sum of 'dd if=/dev/zero bs=4K count=8' is bb7df04e1b0a2570657527a7e108ae23 (this time check with relative path backed, see #22271)
-	out, _ = dockerCmd(c, "run", "--device", "/dev/symzero:/dev/symzero", "busybox", "sh", "-c", "dd if=/dev/symzero bs=4K count=8 | md5sum")
-	c.Assert(strings.Trim(out, "\r\n"), checker.Contains, "bb7df04e1b0a2570657527a7e108ae23", check.Commentf("expected output bb7df04e1b0a2570657527a7e108ae23"))
-}
-
-// TestRunPIDsLimit makes sure the pids cgroup is set with --pids-limit
-func (s *DockerSuite) TestRunPIDsLimit(c *check.C) {
-	testRequires(c, pidsLimit)
-
-	file := "/sys/fs/cgroup/pids/pids.max"
-	out, _ := dockerCmd(c, "run", "--name", "skittles", "--pids-limit", "4", "busybox", "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "4")
-
-	out = inspectField(c, "skittles", "HostConfig.PidsLimit")
-	c.Assert(out, checker.Equals, "4", check.Commentf("setting the pids limit failed"))
-}
-
-func (s *DockerSuite) TestRunPrivilegedAllowedDevices(c *check.C) {
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-
-	file := "/sys/fs/cgroup/devices/devices.list"
-	out, _ := dockerCmd(c, "run", "--privileged", "busybox", "cat", file)
-	c.Logf("out: %q", out)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "a *:* rwm")
-}
-
-func (s *DockerSuite) TestRunUserDeviceAllowed(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	fi, err := os.Stat("/dev/snd/timer")
-	if err != nil {
-		c.Skip("Host does not have /dev/snd/timer")
-	}
-	stat, ok := fi.Sys().(*syscall.Stat_t)
-	if !ok {
-		c.Skip("Could not stat /dev/snd/timer")
-	}
-
-	file := "/sys/fs/cgroup/devices/devices.list"
-	out, _ := dockerCmd(c, "run", "--device", "/dev/snd/timer:w", "busybox", "cat", file)
-	c.Assert(out, checker.Contains, fmt.Sprintf("c %d:%d w", stat.Rdev/256, stat.Rdev%256))
-}
-
-func (s *DockerDaemonSuite) TestRunSeccompJSONNewFormat(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	jsonData := `{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"names": ["chmod", "fchmod", "fchmodat"],
-			"action": "SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-	_, err = tmpFile.Write([]byte(jsonData))
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "--security-opt", "seccomp="+tmpFile.Name(), "busybox", "chmod", "777", ".")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerDaemonSuite) TestRunSeccompJSONNoNameAndNames(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	jsonData := `{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"name": "chmod",
-			"names": ["fchmod", "fchmodat"],
-			"action": "SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-	_, err = tmpFile.Write([]byte(jsonData))
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "--security-opt", "seccomp="+tmpFile.Name(), "busybox", "chmod", "777", ".")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "'name' and 'names' were specified in the seccomp profile, use either 'name' or 'names'")
-}
-
-func (s *DockerDaemonSuite) TestRunSeccompJSONNoArchAndArchMap(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	jsonData := `{
-	"archMap": [
-		{
-			"architecture": "SCMP_ARCH_X86_64",
-			"subArchitectures": [
-				"SCMP_ARCH_X86",
-				"SCMP_ARCH_X32"
-			]
-		}
-	],
-	"architectures": [
-		"SCMP_ARCH_X32"
-	],
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"names": ["chmod", "fchmod", "fchmodat"],
-			"action": "SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-	_, err = tmpFile.Write([]byte(jsonData))
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "--security-opt", "seccomp="+tmpFile.Name(), "busybox", "chmod", "777", ".")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "'architectures' and 'archMap' were specified in the seccomp profile, use either 'architectures' or 'archMap'")
-}
-
-func (s *DockerDaemonSuite) TestRunWithDaemonDefaultSeccompProfile(c *check.C) {
-	testRequires(c, SameHostDaemon, seccompEnabled)
-
-	err := s.d.StartWithBusybox()
-	c.Assert(err, check.IsNil)
-
-	// 1) verify I can run containers with the Docker default shipped profile which allows chmod
-	_, err = s.d.Cmd("run", "busybox", "chmod", "777", ".")
-	c.Assert(err, check.IsNil)
-
-	jsonData := `{
-	"defaultAction": "SCMP_ACT_ALLOW",
-	"syscalls": [
-		{
-			"name": "chmod",
-			"action": "SCMP_ACT_ERRNO"
-		}
-	]
-}`
-	tmpFile, err := ioutil.TempFile("", "profile.json")
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-	_, err = tmpFile.Write([]byte(jsonData))
-	c.Assert(err, check.IsNil)
-
-	// 2) restart the daemon and add a custom seccomp profile in which we deny chmod
-	err = s.d.Restart("--seccomp-profile=" + tmpFile.Name())
-	c.Assert(err, check.IsNil)
-
-	out, err := s.d.Cmd("run", "busybox", "chmod", "777", ".")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Operation not permitted")
-}
-
-func (s *DockerSuite) TestRunWithNanoCPUs(c *check.C) {
-	testRequires(c, cpuCfsQuota, cpuCfsPeriod)
-
-	file1 := "/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
-	file2 := "/sys/fs/cgroup/cpu/cpu.cfs_period_us"
-	out, _ := dockerCmd(c, "run", "--cpus", "0.5", "--name", "test", "busybox", "sh", "-c", fmt.Sprintf("cat %s && cat %s", file1, file2))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "50000\n100000")
-
-	out = inspectField(c, "test", "HostConfig.NanoCpus")
-	c.Assert(out, checker.Equals, "5e+08", check.Commentf("setting the Nano CPUs failed"))
-	out = inspectField(c, "test", "HostConfig.CpuQuota")
-	c.Assert(out, checker.Equals, "0", check.Commentf("CPU CFS quota should be 0"))
-	out = inspectField(c, "test", "HostConfig.CpuPeriod")
-	c.Assert(out, checker.Equals, "0", check.Commentf("CPU CFS period should be 0"))
-
-	out, _, err := dockerCmdWithError("run", "--cpus", "0.5", "--cpu-quota", "50000", "--cpu-period", "100000", "busybox", "sh")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Conflicting options: Nano CPUs and CPU Period cannot both be set")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_test.go
deleted file mode 100644
index 70139a59bc..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_test.go
+++ /dev/null
@@ -1,383 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// save a repo using gz compression and try to load it using stdout
-func (s *DockerSuite) TestSaveXzAndLoadRepoStdout(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "test-save-xz-and-load-repo-stdout"
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-
-	repoName := "foobar-save-load-test-xz-gz"
-	out, _ := dockerCmd(c, "commit", name, repoName)
-
-	dockerCmd(c, "inspect", repoName)
-
-	repoTarball, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", repoName),
-		exec.Command("xz", "-c"),
-		exec.Command("gzip", "-c"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save repo: %v %v", out, err))
-	deleteImages(repoName)
-
-	loadCmd := exec.Command(dockerBinary, "load")
-	loadCmd.Stdin = strings.NewReader(repoTarball)
-	out, _, err = runCommandWithOutput(loadCmd)
-	c.Assert(err, checker.NotNil, check.Commentf("expected error, but succeeded with no error and output: %v", out))
-
-	after, _, err := dockerCmdWithError("inspect", repoName)
-	c.Assert(err, checker.NotNil, check.Commentf("the repo should not exist: %v", after))
-}
-
-// save a repo using xz+gz compression and try to load it using stdout
-func (s *DockerSuite) TestSaveXzGzAndLoadRepoStdout(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "test-save-xz-gz-and-load-repo-stdout"
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-
-	repoName := "foobar-save-load-test-xz-gz"
-	dockerCmd(c, "commit", name, repoName)
-
-	dockerCmd(c, "inspect", repoName)
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", repoName),
-		exec.Command("xz", "-c"),
-		exec.Command("gzip", "-c"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save repo: %v %v", out, err))
-
-	deleteImages(repoName)
-
-	loadCmd := exec.Command(dockerBinary, "load")
-	loadCmd.Stdin = strings.NewReader(out)
-	out, _, err = runCommandWithOutput(loadCmd)
-	c.Assert(err, checker.NotNil, check.Commentf("expected error, but succeeded with no error and output: %v", out))
-
-	after, _, err := dockerCmdWithError("inspect", repoName)
-	c.Assert(err, checker.NotNil, check.Commentf("the repo should not exist: %v", after))
-}
-
-func (s *DockerSuite) TestSaveSingleTag(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repoName := "foobar-save-single-tag-test"
-	dockerCmd(c, "tag", "busybox:latest", fmt.Sprintf("%v:latest", repoName))
-
-	out, _ := dockerCmd(c, "images", "-q", "--no-trunc", repoName)
-	cleanedImageID := strings.TrimSpace(out)
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", fmt.Sprintf("%v:latest", repoName)),
-		exec.Command("tar", "t"),
-		exec.Command("grep", "-E", fmt.Sprintf("(^repositories$|%v)", cleanedImageID)))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save repo with image ID and 'repositories' file: %s, %v", out, err))
-}
-
-func (s *DockerSuite) TestSaveCheckTimes(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repoName := "busybox:latest"
-	out, _ := dockerCmd(c, "inspect", repoName)
-	data := []struct {
-		ID      string
-		Created time.Time
-	}{}
-	err := json.Unmarshal([]byte(out), &data)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to marshal from %q: err %v", repoName, err))
-	c.Assert(len(data), checker.Not(checker.Equals), 0, check.Commentf("failed to marshal the data from %q", repoName))
-	tarTvTimeFormat := "2006-01-02 15:04"
-	out, _, err = runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", repoName),
-		exec.Command("tar", "tv"),
-		exec.Command("grep", "-E", fmt.Sprintf("%s %s", data[0].Created.Format(tarTvTimeFormat), digest.Digest(data[0].ID).Hex())))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save repo with image ID and 'repositories' file: %s, %v", out, err))
-}
-
-func (s *DockerSuite) TestSaveImageId(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repoName := "foobar-save-image-id-test"
-	dockerCmd(c, "tag", "emptyfs:latest", fmt.Sprintf("%v:latest", repoName))
-
-	out, _ := dockerCmd(c, "images", "-q", "--no-trunc", repoName)
-	cleanedLongImageID := strings.TrimPrefix(strings.TrimSpace(out), "sha256:")
-
-	out, _ = dockerCmd(c, "images", "-q", repoName)
-	cleanedShortImageID := strings.TrimSpace(out)
-
-	// Make sure IDs are not empty
-	c.Assert(cleanedLongImageID, checker.Not(check.Equals), "", check.Commentf("Id should not be empty."))
-	c.Assert(cleanedShortImageID, checker.Not(check.Equals), "", check.Commentf("Id should not be empty."))
-
-	saveCmd := exec.Command(dockerBinary, "save", cleanedShortImageID)
-	tarCmd := exec.Command("tar", "t")
-
-	var err error
-	tarCmd.Stdin, err = saveCmd.StdoutPipe()
-	c.Assert(err, checker.IsNil, check.Commentf("cannot set stdout pipe for tar: %v", err))
-	grepCmd := exec.Command("grep", cleanedLongImageID)
-	grepCmd.Stdin, err = tarCmd.StdoutPipe()
-	c.Assert(err, checker.IsNil, check.Commentf("cannot set stdout pipe for grep: %v", err))
-
-	c.Assert(tarCmd.Start(), checker.IsNil, check.Commentf("tar failed with error: %v", err))
-	c.Assert(saveCmd.Start(), checker.IsNil, check.Commentf("docker save failed with error: %v", err))
-	defer func() {
-		saveCmd.Wait()
-		tarCmd.Wait()
-		dockerCmd(c, "rmi", repoName)
-	}()
-
-	out, _, err = runCommandWithOutput(grepCmd)
-
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save repo with image ID: %s, %v", out, err))
-}
-
-// save a repo and try to load it using flags
-func (s *DockerSuite) TestSaveAndLoadRepoFlags(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	name := "test-save-and-load-repo-flags"
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-
-	repoName := "foobar-save-load-test"
-
-	deleteImages(repoName)
-	dockerCmd(c, "commit", name, repoName)
-
-	before, _ := dockerCmd(c, "inspect", repoName)
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", repoName),
-		exec.Command(dockerBinary, "load"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err))
-
-	after, _ := dockerCmd(c, "inspect", repoName)
-	c.Assert(before, checker.Equals, after, check.Commentf("inspect is not the same after a save / load"))
-}
-
-func (s *DockerSuite) TestSaveWithNoExistImage(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	imgName := "foobar-non-existing-image"
-
-	out, _, err := dockerCmdWithError("save", "-o", "test-img.tar", imgName)
-	c.Assert(err, checker.NotNil, check.Commentf("save image should fail for non-existing image"))
-	c.Assert(out, checker.Contains, fmt.Sprintf("No such image: %s", imgName))
-}
-
-func (s *DockerSuite) TestSaveMultipleNames(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	repoName := "foobar-save-multi-name-test"
-
-	// Make one image
-	dockerCmd(c, "tag", "emptyfs:latest", fmt.Sprintf("%v-one:latest", repoName))
-
-	// Make two images
-	dockerCmd(c, "tag", "emptyfs:latest", fmt.Sprintf("%v-two:latest", repoName))
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", fmt.Sprintf("%v-one", repoName), fmt.Sprintf("%v-two:latest", repoName)),
-		exec.Command("tar", "xO", "repositories"),
-		exec.Command("grep", "-q", "-E", "(-one|-two)"),
-	)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save multiple repos: %s, %v", out, err))
-}
-
-func (s *DockerSuite) TestSaveRepoWithMultipleImages(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	makeImage := func(from string, tag string) string {
-		var (
-			out string
-		)
-		out, _ = dockerCmd(c, "run", "-d", from, "true")
-		cleanedContainerID := strings.TrimSpace(out)
-
-		out, _ = dockerCmd(c, "commit", cleanedContainerID, tag)
-		imageID := strings.TrimSpace(out)
-		return imageID
-	}
-
-	repoName := "foobar-save-multi-images-test"
-	tagFoo := repoName + ":foo"
-	tagBar := repoName + ":bar"
-
-	idFoo := makeImage("busybox:latest", tagFoo)
-	idBar := makeImage("busybox:latest", tagBar)
-
-	deleteImages(repoName)
-
-	// create the archive
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", repoName, "busybox:latest"),
-		exec.Command("tar", "t"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save multiple images: %s, %v", out, err))
-
-	lines := strings.Split(strings.TrimSpace(out), "\n")
-	var actual []string
-	for _, l := range lines {
-		if regexp.MustCompile("^[a-f0-9]{64}\\.json$").Match([]byte(l)) {
-			actual = append(actual, strings.TrimSuffix(l, ".json"))
-		}
-	}
-
-	// make the list of expected layers
-	out = inspectField(c, "busybox:latest", "Id")
-	expected := []string{strings.TrimSpace(out), idFoo, idBar}
-
-	// prefixes are not in tar
-	for i := range expected {
-		expected[i] = digest.Digest(expected[i]).Hex()
-	}
-
-	sort.Strings(actual)
-	sort.Strings(expected)
-	c.Assert(actual, checker.DeepEquals, expected, check.Commentf("archive does not contains the right layers: got %v, expected %v, output: %q", actual, expected, out))
-}
-
-// Issue #6722 #5892 ensure directories are included in changes
-func (s *DockerSuite) TestSaveDirectoryPermissions(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	layerEntries := []string{"opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"}
-	layerEntriesAUFS := []string{"./", ".wh..wh.aufs", ".wh..wh.orph/", ".wh..wh.plnk/", "opt/", "opt/a/", "opt/a/b/", "opt/a/b/c"}
-
-	name := "save-directory-permissions"
-	tmpDir, err := ioutil.TempDir("", "save-layers-with-directories")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary directory: %s", err))
-	extractionDirectory := filepath.Join(tmpDir, "image-extraction-dir")
-	os.Mkdir(extractionDirectory, 0777)
-
-	defer os.RemoveAll(tmpDir)
-	_, err = buildImage(name,
-		`FROM busybox
-	RUN adduser -D user && mkdir -p /opt/a/b && chown -R user:user /opt/a
-	RUN touch /opt/a/b/c && chown user:user /opt/a/b/c`,
-		true)
-	c.Assert(err, checker.IsNil, check.Commentf("%v", err))
-
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", name),
-		exec.Command("tar", "-xf", "-", "-C", extractionDirectory),
-	)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save and extract image: %s", out))
-
-	dirs, err := ioutil.ReadDir(extractionDirectory)
-	c.Assert(err, checker.IsNil, check.Commentf("failed to get a listing of the layer directories: %s", err))
-
-	found := false
-	for _, entry := range dirs {
-		var entriesSansDev []string
-		if entry.IsDir() {
-			layerPath := filepath.Join(extractionDirectory, entry.Name(), "layer.tar")
-
-			f, err := os.Open(layerPath)
-			c.Assert(err, checker.IsNil, check.Commentf("failed to open %s: %s", layerPath, err))
-			defer f.Close()
-
-			entries, err := listTar(f)
-			for _, e := range entries {
-				if !strings.Contains(e, "dev/") {
-					entriesSansDev = append(entriesSansDev, e)
-				}
-			}
-			c.Assert(err, checker.IsNil, check.Commentf("encountered error while listing tar entries: %s", err))
-
-			if reflect.DeepEqual(entriesSansDev, layerEntries) || reflect.DeepEqual(entriesSansDev, layerEntriesAUFS) {
-				found = true
-				break
-			}
-		}
-	}
-
-	c.Assert(found, checker.Equals, true, check.Commentf("failed to find the layer with the right content listing"))
-
-}
-
-// Test loading a weird image where one of the layers is of zero size.
-// The layer.tar file is actually zero bytes, no padding or anything else.
-// See issue: 18170
-func (s *DockerSuite) TestLoadZeroSizeLayer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerCmd(c, "load", "-i", "fixtures/load/emptyLayer.tar")
-}
-
-func (s *DockerSuite) TestSaveLoadParents(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	makeImage := func(from string, addfile string) string {
-		var (
-			out string
-		)
-		out, _ = dockerCmd(c, "run", "-d", from, "touch", addfile)
-		cleanedContainerID := strings.TrimSpace(out)
-
-		out, _ = dockerCmd(c, "commit", cleanedContainerID)
-		imageID := strings.TrimSpace(out)
-
-		dockerCmd(c, "rm", "-f", cleanedContainerID)
-		return imageID
-	}
-
-	idFoo := makeImage("busybox", "foo")
-	idBar := makeImage(idFoo, "bar")
-
-	tmpDir, err := ioutil.TempDir("", "save-load-parents")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(tmpDir)
-
-	c.Log("tmpdir", tmpDir)
-
-	outfile := filepath.Join(tmpDir, "out.tar")
-
-	dockerCmd(c, "save", "-o", outfile, idBar, idFoo)
-	dockerCmd(c, "rmi", idBar)
-	dockerCmd(c, "load", "-i", outfile)
-
-	inspectOut := inspectField(c, idBar, "Parent")
-	c.Assert(inspectOut, checker.Equals, idFoo)
-
-	inspectOut = inspectField(c, idFoo, "Parent")
-	c.Assert(inspectOut, checker.Equals, "")
-}
-
-func (s *DockerSuite) TestSaveLoadNoTag(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	name := "saveloadnotag"
-
-	_, err := buildImage(name, "FROM busybox\nENV foo=bar", true)
-	c.Assert(err, checker.IsNil, check.Commentf("%v", err))
-
-	id := inspectField(c, name, "Id")
-
-	// Test to make sure that save w/o name just shows imageID during load
-	out, _, err := runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", id),
-		exec.Command(dockerBinary, "load"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err))
-
-	// Should not show 'name' but should show the image ID during the load
-	c.Assert(out, checker.Not(checker.Contains), "Loaded image: ")
-	c.Assert(out, checker.Contains, "Loaded image ID:")
-	c.Assert(out, checker.Contains, id)
-
-	// Test to make sure that save by name shows that name during load
-	out, _, err = runCommandPipelineWithOutput(
-		exec.Command(dockerBinary, "save", name),
-		exec.Command(dockerBinary, "load"))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to save and load repo: %s, %v", out, err))
-	c.Assert(out, checker.Contains, "Loaded image: "+name+":latest")
-	c.Assert(out, checker.Not(checker.Contains), "Loaded image ID:")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_unix_test.go
deleted file mode 100644
index 22445e5bbe..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_save_load_unix_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-	"github.com/kr/pty"
-)
-
-// save a repo and try to load it using stdout
-func (s *DockerSuite) TestSaveAndLoadRepoStdout(c *check.C) {
-	name := "test-save-and-load-repo-stdout"
-	dockerCmd(c, "run", "--name", name, "busybox", "true")
-
-	repoName := "foobar-save-load-test"
-	before, _ := dockerCmd(c, "commit", name, repoName)
-	before = strings.TrimRight(before, "\n")
-
-	tmpFile, err := ioutil.TempFile("", "foobar-save-load-test.tar")
-	c.Assert(err, check.IsNil)
-	defer os.Remove(tmpFile.Name())
-
-	saveCmd := exec.Command(dockerBinary, "save", repoName)
-	saveCmd.Stdout = tmpFile
-
-	_, err = runCommand(saveCmd)
-	c.Assert(err, check.IsNil)
-
-	tmpFile, err = os.Open(tmpFile.Name())
-	c.Assert(err, check.IsNil)
-	defer tmpFile.Close()
-
-	deleteImages(repoName)
-
-	loadCmd := exec.Command(dockerBinary, "load")
-	loadCmd.Stdin = tmpFile
-
-	out, _, err := runCommandWithOutput(loadCmd)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-
-	after := inspectField(c, repoName, "Id")
-	after = strings.TrimRight(after, "\n")
-
-	c.Assert(after, check.Equals, before) //inspect is not the same after a save / load
-
-	deleteImages(repoName)
-
-	pty, tty, err := pty.Open()
-	c.Assert(err, check.IsNil)
-	cmd := exec.Command(dockerBinary, "save", repoName)
-	cmd.Stdin = tty
-	cmd.Stdout = tty
-	cmd.Stderr = tty
-	c.Assert(cmd.Start(), check.IsNil)
-	c.Assert(cmd.Wait(), check.NotNil) //did not break writing to a TTY
-
-	buf := make([]byte, 1024)
-
-	n, err := pty.Read(buf)
-	c.Assert(err, check.IsNil) //could not read tty output
-	c.Assert(string(buf[:n]), checker.Contains, "Cowardly refusing", check.Commentf("help output is not being yielded", out))
-}
-
-func (s *DockerSuite) TestSaveAndLoadWithProgressBar(c *check.C) {
-	name := "test-load"
-	_, err := buildImage(name, `
-	FROM busybox
-	RUN touch aa
-	`, true)
-	c.Assert(err, check.IsNil)
-
-	tmptar := name + ".tar"
-	dockerCmd(c, "save", "-o", tmptar, name)
-	defer os.Remove(tmptar)
-
-	dockerCmd(c, "rmi", name)
-	dockerCmd(c, "tag", "busybox", name)
-	out, _ := dockerCmd(c, "load", "-i", tmptar)
-	expected := fmt.Sprintf("The image %s:latest already exists, renaming the old one with ID", name)
-	c.Assert(out, checker.Contains, expected)
-}
-
-// fail because load didn't receive data from stdin
-func (s *DockerSuite) TestLoadNoStdinFail(c *check.C) {
-	pty, tty, err := pty.Open()
-	c.Assert(err, check.IsNil)
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-	defer cancel()
-	cmd := exec.CommandContext(ctx, dockerBinary, "load")
-	cmd.Stdin = tty
-	cmd.Stdout = tty
-	cmd.Stderr = tty
-	c.Assert(cmd.Run(), check.NotNil) // docker-load should fail
-
-	buf := make([]byte, 1024)
-
-	n, err := pty.Read(buf)
-	c.Assert(err, check.IsNil) //could not read tty output
-	c.Assert(string(buf[:n]), checker.Contains, "requested load from stdin, but stdin is empty")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_search_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_search_test.go
deleted file mode 100644
index 5a32f2ab93..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_search_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// search for repos named  "registry" on the central registry
-func (s *DockerSuite) TestSearchOnCentralRegistry(c *check.C) {
-	testRequires(c, Network, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "search", "busybox")
-	c.Assert(out, checker.Contains, "Busybox base image.", check.Commentf("couldn't find any repository named (or containing) 'Busybox base image.'"))
-}
-
-func (s *DockerSuite) TestSearchStarsOptionWithWrongParameter(c *check.C) {
-	out, _, err := dockerCmdWithError("search", "--filter", "stars=a", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Invalid filter", check.Commentf("couldn't find the invalid filter warning"))
-
-	out, _, err = dockerCmdWithError("search", "-f", "stars=a", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Invalid filter", check.Commentf("couldn't find the invalid filter warning"))
-
-	out, _, err = dockerCmdWithError("search", "-f", "is-automated=a", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Invalid filter", check.Commentf("couldn't find the invalid filter warning"))
-
-	out, _, err = dockerCmdWithError("search", "-f", "is-official=a", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Invalid filter", check.Commentf("couldn't find the invalid filter warning"))
-
-	// -s --stars deprecated since Docker 1.13
-	out, _, err = dockerCmdWithError("search", "--stars=a", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "invalid syntax", check.Commentf("couldn't find the invalid value warning"))
-
-	// -s --stars deprecated since Docker 1.13
-	out, _, err = dockerCmdWithError("search", "-s=-1", "busybox")
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "invalid syntax", check.Commentf("couldn't find the invalid value warning"))
-}
-
-func (s *DockerSuite) TestSearchCmdOptions(c *check.C) {
-	testRequires(c, Network, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "search", "--help")
-	c.Assert(out, checker.Contains, "Usage:\tdocker search [OPTIONS] TERM")
-
-	outSearchCmd, _ := dockerCmd(c, "search", "busybox")
-	outSearchCmdNotrunc, _ := dockerCmd(c, "search", "--no-trunc=true", "busybox")
-
-	c.Assert(len(outSearchCmd) > len(outSearchCmdNotrunc), check.Equals, false, check.Commentf("The no-trunc option can't take effect."))
-
-	outSearchCmdautomated, _ := dockerCmd(c, "search", "--filter", "is-automated=true", "busybox") //The busybox is a busybox base image, not an AUTOMATED image.
-	outSearchCmdautomatedSlice := strings.Split(outSearchCmdautomated, "\n")
-	for i := range outSearchCmdautomatedSlice {
-		c.Assert(strings.HasPrefix(outSearchCmdautomatedSlice[i], "busybox "), check.Equals, false, check.Commentf("The busybox is not an AUTOMATED image: %s", outSearchCmdautomated))
-	}
-
-	outSearchCmdNotOfficial, _ := dockerCmd(c, "search", "--filter", "is-official=false", "busybox") //The busybox is a busybox base image, official image.
-	outSearchCmdNotOfficialSlice := strings.Split(outSearchCmdNotOfficial, "\n")
-	for i := range outSearchCmdNotOfficialSlice {
-		c.Assert(strings.HasPrefix(outSearchCmdNotOfficialSlice[i], "busybox "), check.Equals, false, check.Commentf("The busybox is not an OFFICIAL image: %s", outSearchCmdNotOfficial))
-	}
-
-	outSearchCmdOfficial, _ := dockerCmd(c, "search", "--filter", "is-official=true", "busybox") //The busybox is a busybox base image, official image.
-	outSearchCmdOfficialSlice := strings.Split(outSearchCmdOfficial, "\n")
-	c.Assert(outSearchCmdOfficialSlice, checker.HasLen, 3) // 1 header, 1 line, 1 carriage return
-	c.Assert(strings.HasPrefix(outSearchCmdOfficialSlice[1], "busybox "), check.Equals, true, check.Commentf("The busybox is an OFFICIAL image: %s", outSearchCmdNotOfficial))
-
-	outSearchCmdStars, _ := dockerCmd(c, "search", "--filter", "stars=2", "busybox")
-	c.Assert(strings.Count(outSearchCmdStars, "[OK]") > strings.Count(outSearchCmd, "[OK]"), check.Equals, false, check.Commentf("The quantity of images with stars should be less than that of all images: %s", outSearchCmdStars))
-
-	dockerCmd(c, "search", "--filter", "is-automated=true", "--filter", "stars=2", "--no-trunc=true", "busybox")
-
-	// --automated deprecated since Docker 1.13
-	outSearchCmdautomated1, _ := dockerCmd(c, "search", "--automated=true", "busybox") //The busybox is a busybox base image, not an AUTOMATED image.
-	outSearchCmdautomatedSlice1 := strings.Split(outSearchCmdautomated1, "\n")
-	for i := range outSearchCmdautomatedSlice1 {
-		c.Assert(strings.HasPrefix(outSearchCmdautomatedSlice1[i], "busybox "), check.Equals, false, check.Commentf("The busybox is not an AUTOMATED image: %s", outSearchCmdautomated))
-	}
-
-	// -s --stars deprecated since Docker 1.13
-	outSearchCmdStars1, _ := dockerCmd(c, "search", "--stars=2", "busybox")
-	c.Assert(strings.Count(outSearchCmdStars1, "[OK]") > strings.Count(outSearchCmd, "[OK]"), check.Equals, false, check.Commentf("The quantity of images with stars should be less than that of all images: %s", outSearchCmdStars1))
-
-	// -s --stars deprecated since Docker 1.13
-	dockerCmd(c, "search", "--stars=2", "--automated=true", "--no-trunc=true", "busybox")
-}
-
-// search for repos which start with "ubuntu-" on the central registry
-func (s *DockerSuite) TestSearchOnCentralRegistryWithDash(c *check.C) {
-	testRequires(c, Network, DaemonIsLinux)
-
-	dockerCmd(c, "search", "ubuntu-")
-}
-
-// test case for #23055
-func (s *DockerSuite) TestSearchWithLimit(c *check.C) {
-	testRequires(c, Network, DaemonIsLinux)
-
-	limit := 10
-	out, _, err := dockerCmdWithError("search", fmt.Sprintf("--limit=%d", limit), "docker")
-	c.Assert(err, checker.IsNil)
-	outSlice := strings.Split(out, "\n")
-	c.Assert(outSlice, checker.HasLen, limit+2) // 1 header, 1 carriage return
-
-	limit = 50
-	out, _, err = dockerCmdWithError("search", fmt.Sprintf("--limit=%d", limit), "docker")
-	c.Assert(err, checker.IsNil)
-	outSlice = strings.Split(out, "\n")
-	c.Assert(outSlice, checker.HasLen, limit+2) // 1 header, 1 carriage return
-
-	limit = 100
-	out, _, err = dockerCmdWithError("search", fmt.Sprintf("--limit=%d", limit), "docker")
-	c.Assert(err, checker.IsNil)
-	outSlice = strings.Split(out, "\n")
-	c.Assert(outSlice, checker.HasLen, limit+2) // 1 header, 1 carriage return
-
-	limit = 0
-	out, _, err = dockerCmdWithError("search", fmt.Sprintf("--limit=%d", limit), "docker")
-	c.Assert(err, checker.Not(checker.IsNil))
-
-	limit = 200
-	out, _, err = dockerCmdWithError("search", fmt.Sprintf("--limit=%d", limit), "docker")
-	c.Assert(err, checker.Not(checker.IsNil))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_create_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_create_test.go
deleted file mode 100644
index b79fdbeb59..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_create_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestSecretCreate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	secret := d.getSecret(c, id)
-	c.Assert(secret.Spec.Name, checker.Equals, testName)
-}
-
-func (s *DockerSwarmSuite) TestSecretCreateWithLabels(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-			Labels: map[string]string{
-				"key1": "value1",
-				"key2": "value2",
-			},
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	secret := d.getSecret(c, id)
-	c.Assert(secret.Spec.Name, checker.Equals, testName)
-	c.Assert(len(secret.Spec.Labels), checker.Equals, 2)
-	c.Assert(secret.Spec.Labels["key1"], checker.Equals, "value1")
-	c.Assert(secret.Spec.Labels["key2"], checker.Equals, "value2")
-}
-
-// Test case for 28884
-func (s *DockerSwarmSuite) TestSecretCreateResolve(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "foo"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: name,
-		},
-		[]byte("foo"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	fake := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: id,
-		},
-		[]byte("fake foo"),
-	})
-	c.Assert(fake, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", fake))
-
-	out, err := d.Cmd("secret", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-	c.Assert(out, checker.Contains, fake)
-
-	out, err = d.Cmd("secret", "rm", id)
-	c.Assert(out, checker.Contains, id)
-
-	// Fake one will remain
-	out, err = d.Cmd("secret", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name)
-	c.Assert(out, checker.Contains, fake)
-
-	// Remove based on name prefix of the fake one
-	// (which is the same as the ID of foo one) should not work
-	// as search is only done based on:
-	// - Full ID
-	// - Full Name
-	// - Partial ID (prefix)
-	out, err = d.Cmd("secret", "rm", id[:5])
-	c.Assert(out, checker.Not(checker.Contains), id)
-	out, err = d.Cmd("secret", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name)
-	c.Assert(out, checker.Contains, fake)
-
-	// Remove based on ID prefix of the fake one should succeed
-	out, err = d.Cmd("secret", "rm", fake[:5])
-	c.Assert(out, checker.Contains, fake)
-	out, err = d.Cmd("secret", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name)
-	c.Assert(out, checker.Not(checker.Contains), id)
-	c.Assert(out, checker.Not(checker.Contains), fake)
-}
-
-func (s *DockerSwarmSuite) TestSecretCreateWithFile(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testFile, err := ioutil.TempFile("", "secretCreateTest")
-	c.Assert(err, checker.IsNil, check.Commentf("failed to create temporary file"))
-	defer os.Remove(testFile.Name())
-
-	testData := "TESTINGDATA"
-	_, err = testFile.Write([]byte(testData))
-	c.Assert(err, checker.IsNil, check.Commentf("failed to write to temporary file"))
-
-	testName := "test_secret"
-	out, err := d.Cmd("secret", "create", testName, testFile.Name())
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "", check.Commentf(out))
-
-	id := strings.TrimSpace(out)
-	secret := d.getSecret(c, id)
-	c.Assert(secret.Spec.Name, checker.Equals, testName)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_inspect_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_inspect_test.go
deleted file mode 100644
index 0985a2bd59..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_secret_inspect_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestSecretInspect(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	secret := d.getSecret(c, id)
-	c.Assert(secret.Spec.Name, checker.Equals, testName)
-
-	out, err := d.Cmd("secret", "inspect", testName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var secrets []swarm.Secret
-	c.Assert(json.Unmarshal([]byte(out), &secrets), checker.IsNil)
-	c.Assert(secrets, checker.HasLen, 1)
-}
-
-func (s *DockerSwarmSuite) TestSecretInspectMultiple(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testNames := []string{
-		"test0",
-		"test1",
-	}
-	for _, n := range testNames {
-		id := d.createSecret(c, swarm.SecretSpec{
-			swarm.Annotations{
-				Name: n,
-			},
-			[]byte("TESTINGDATA"),
-		})
-		c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-		secret := d.getSecret(c, id)
-		c.Assert(secret.Spec.Name, checker.Equals, n)
-
-	}
-
-	args := []string{
-		"secret",
-		"inspect",
-	}
-	args = append(args, testNames...)
-	out, err := d.Cmd(args...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var secrets []swarm.Secret
-	c.Assert(json.Unmarshal([]byte(out), &secrets), checker.IsNil)
-	c.Assert(secrets, checker.HasLen, 2)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_create_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_create_test.go
deleted file mode 100644
index 9e8b1e9956..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_create_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestServiceCreateMountVolume(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	out, err := d.Cmd("service", "create", "--mount", "type=volume,source=foo,target=/foo,volume-nocopy", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	var tasks []swarm.Task
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks = d.getServiceTasks(c, id)
-		return len(tasks) > 0, nil
-	}, checker.Equals, true)
-
-	task := tasks[0]
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		if task.NodeID == "" || task.Status.ContainerStatus.ContainerID == "" {
-			task = d.getTask(c, task.ID)
-		}
-		return task.NodeID != "" && task.Status.ContainerStatus.ContainerID != "", nil
-	}, checker.Equals, true)
-
-	// check container mount config
-	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .HostConfig.Mounts}}", task.Status.ContainerStatus.ContainerID)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var mountConfig []mount.Mount
-	c.Assert(json.Unmarshal([]byte(out), &mountConfig), checker.IsNil)
-	c.Assert(mountConfig, checker.HasLen, 1)
-
-	c.Assert(mountConfig[0].Source, checker.Equals, "foo")
-	c.Assert(mountConfig[0].Target, checker.Equals, "/foo")
-	c.Assert(mountConfig[0].Type, checker.Equals, mount.TypeVolume)
-	c.Assert(mountConfig[0].VolumeOptions, checker.NotNil)
-	c.Assert(mountConfig[0].VolumeOptions.NoCopy, checker.True)
-
-	// check container mounts actual
-	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .Mounts}}", task.Status.ContainerStatus.ContainerID)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var mounts []types.MountPoint
-	c.Assert(json.Unmarshal([]byte(out), &mounts), checker.IsNil)
-	c.Assert(mounts, checker.HasLen, 1)
-
-	c.Assert(mounts[0].Type, checker.Equals, mount.TypeVolume)
-	c.Assert(mounts[0].Name, checker.Equals, "foo")
-	c.Assert(mounts[0].Destination, checker.Equals, "/foo")
-	c.Assert(mounts[0].RW, checker.Equals, true)
-}
-
-func (s *DockerSwarmSuite) TestServiceCreateWithSecretSimple(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	serviceName := "test-service-secret"
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-
-	out, err := d.Cmd("service", "create", "--name", serviceName, "--secret", testName, "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	var refs []swarm.SecretReference
-	c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
-	c.Assert(refs, checker.HasLen, 1)
-
-	c.Assert(refs[0].SecretName, checker.Equals, testName)
-	c.Assert(refs[0].File, checker.Not(checker.IsNil))
-	c.Assert(refs[0].File.Name, checker.Equals, testName)
-	c.Assert(refs[0].File.UID, checker.Equals, "0")
-	c.Assert(refs[0].File.GID, checker.Equals, "0")
-}
-
-func (s *DockerSwarmSuite) TestServiceCreateWithSecretSourceTarget(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	serviceName := "test-service-secret"
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-	testTarget := "testing"
-
-	out, err := d.Cmd("service", "create", "--name", serviceName, "--secret", fmt.Sprintf("source=%s,target=%s", testName, testTarget), "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	var refs []swarm.SecretReference
-	c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
-	c.Assert(refs, checker.HasLen, 1)
-
-	c.Assert(refs[0].SecretName, checker.Equals, testName)
-	c.Assert(refs[0].File, checker.Not(checker.IsNil))
-	c.Assert(refs[0].File.Name, checker.Equals, testTarget)
-}
-
-func (s *DockerSwarmSuite) TestServiceCreateMountTmpfs(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	out, err := d.Cmd("service", "create", "--mount", "type=tmpfs,target=/foo,tmpfs-size=1MB", "busybox", "sh", "-c", "mount | grep foo; tail -f /dev/null")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	var tasks []swarm.Task
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks = d.getServiceTasks(c, id)
-		return len(tasks) > 0, nil
-	}, checker.Equals, true)
-
-	task := tasks[0]
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		if task.NodeID == "" || task.Status.ContainerStatus.ContainerID == "" {
-			task = d.getTask(c, task.ID)
-		}
-		return task.NodeID != "" && task.Status.ContainerStatus.ContainerID != "", nil
-	}, checker.Equals, true)
-
-	// check container mount config
-	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .HostConfig.Mounts}}", task.Status.ContainerStatus.ContainerID)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var mountConfig []mount.Mount
-	c.Assert(json.Unmarshal([]byte(out), &mountConfig), checker.IsNil)
-	c.Assert(mountConfig, checker.HasLen, 1)
-
-	c.Assert(mountConfig[0].Source, checker.Equals, "")
-	c.Assert(mountConfig[0].Target, checker.Equals, "/foo")
-	c.Assert(mountConfig[0].Type, checker.Equals, mount.TypeTmpfs)
-	c.Assert(mountConfig[0].TmpfsOptions, checker.NotNil)
-	c.Assert(mountConfig[0].TmpfsOptions.SizeBytes, checker.Equals, int64(1048576))
-
-	// check container mounts actual
-	out, err = s.nodeCmd(c, task.NodeID, "inspect", "--format", "{{json .Mounts}}", task.Status.ContainerStatus.ContainerID)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	var mounts []types.MountPoint
-	c.Assert(json.Unmarshal([]byte(out), &mounts), checker.IsNil)
-	c.Assert(mounts, checker.HasLen, 1)
-
-	c.Assert(mounts[0].Type, checker.Equals, mount.TypeTmpfs)
-	c.Assert(mounts[0].Name, checker.Equals, "")
-	c.Assert(mounts[0].Destination, checker.Equals, "/foo")
-	c.Assert(mounts[0].RW, checker.Equals, true)
-
-	out, err = s.nodeCmd(c, task.NodeID, "logs", task.Status.ContainerStatus.ContainerID)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.HasPrefix, "tmpfs on /foo type tmpfs")
-	c.Assert(strings.TrimSpace(out), checker.Contains, "size=1024k")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_health_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_health_test.go
deleted file mode 100644
index 30580f6be3..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_health_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/daemon/cluster/executor/container"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// start a service, and then make its task unhealthy during running
-// finally, unhealthy task should be detected and killed
-func (s *DockerSwarmSuite) TestServiceHealthRun(c *check.C) {
-	testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
-
-	d := s.AddDaemon(c, true, true)
-
-	// build image with health-check
-	// note: use `daemon.buildImageWithOut` to build, do not use `buildImage` to build
-	imageName := "testhealth"
-	_, _, err := d.buildImageWithOut(imageName,
-		`FROM busybox
-		RUN touch /status
-		HEALTHCHECK --interval=1s --timeout=1s --retries=1\
-		  CMD cat /status`,
-		true)
-	c.Check(err, check.IsNil)
-
-	serviceName := "healthServiceRun"
-	out, err := d.Cmd("service", "create", "--name", serviceName, imageName, "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	var tasks []swarm.Task
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks = d.getServiceTasks(c, id)
-		return tasks, nil
-	}, checker.HasLen, 1)
-
-	task := tasks[0]
-
-	// wait for task to start
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateRunning)
-	containerID := task.Status.ContainerStatus.ContainerID
-
-	// wait for container to be healthy
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		out, _ := d.Cmd("inspect", "--format={{.State.Health.Status}}", containerID)
-		return strings.TrimSpace(out), nil
-	}, checker.Equals, "healthy")
-
-	// make it fail
-	d.Cmd("exec", containerID, "rm", "/status")
-	// wait for container to be unhealthy
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		out, _ := d.Cmd("inspect", "--format={{.State.Health.Status}}", containerID)
-		return strings.TrimSpace(out), nil
-	}, checker.Equals, "unhealthy")
-
-	// Task should be terminated
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateFailed)
-
-	if !strings.Contains(task.Status.Err, container.ErrContainerUnhealthy.Error()) {
-		c.Fatal("unhealthy task exits because of other error")
-	}
-}
-
-// start a service whose task is unhealthy at beginning
-// its tasks should be blocked in starting stage, until health check is passed
-func (s *DockerSwarmSuite) TestServiceHealthStart(c *check.C) {
-	testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
-
-	d := s.AddDaemon(c, true, true)
-
-	// service started from this image won't pass health check
-	imageName := "testhealth"
-	_, _, err := d.buildImageWithOut(imageName,
-		`FROM busybox
-		HEALTHCHECK --interval=1s --timeout=1s --retries=1024\
-		  CMD cat /status`,
-		true)
-	c.Check(err, check.IsNil)
-
-	serviceName := "healthServiceStart"
-	out, err := d.Cmd("service", "create", "--name", serviceName, imageName, "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	var tasks []swarm.Task
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks = d.getServiceTasks(c, id)
-		return tasks, nil
-	}, checker.HasLen, 1)
-
-	task := tasks[0]
-
-	// wait for task to start
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateStarting)
-
-	containerID := task.Status.ContainerStatus.ContainerID
-
-	// wait for health check to work
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		out, _ := d.Cmd("inspect", "--format={{.State.Health.FailingStreak}}", containerID)
-		failingStreak, _ := strconv.Atoi(strings.TrimSpace(out))
-		return failingStreak, nil
-	}, checker.GreaterThan, 0)
-
-	// task should be blocked at starting status
-	task = d.getTask(c, task.ID)
-	c.Assert(task.Status.State, check.Equals, swarm.TaskStateStarting)
-
-	// make it healthy
-	d.Cmd("exec", containerID, "touch", "/status")
-
-	// Task should be at running status
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateRunning)
-}
-
-// start a service whose task is unhealthy at beginning
-// its tasks should be blocked in starting stage, until health check is passed
-func (s *DockerSwarmSuite) TestServiceHealthUpdate(c *check.C) {
-	testRequires(c, DaemonIsLinux) // busybox doesn't work on Windows
-
-	d := s.AddDaemon(c, true, true)
-
-	// service started from this image won't pass health check
-	imageName := "testhealth"
-	_, _, err := d.buildImageWithOut(imageName,
-		`FROM busybox
-		HEALTHCHECK --interval=1s --timeout=1s --retries=1024\
-		  CMD cat /status`,
-		true)
-	c.Check(err, check.IsNil)
-
-	serviceName := "healthServiceStart"
-	out, err := d.Cmd("service", "create", "--name", serviceName, imageName, "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	id := strings.TrimSpace(out)
-
-	var tasks []swarm.Task
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		tasks = d.getServiceTasks(c, id)
-		return tasks, nil
-	}, checker.HasLen, 1)
-
-	task := tasks[0]
-
-	// wait for task to start
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateStarting)
-
-	containerID := task.Status.ContainerStatus.ContainerID
-
-	// wait for health check to work
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		out, _ := d.Cmd("inspect", "--format={{.State.Health.FailingStreak}}", containerID)
-		failingStreak, _ := strconv.Atoi(strings.TrimSpace(out))
-		return failingStreak, nil
-	}, checker.GreaterThan, 0)
-
-	// task should be blocked at starting status
-	task = d.getTask(c, task.ID)
-	c.Assert(task.Status.State, check.Equals, swarm.TaskStateStarting)
-
-	// make it healthy
-	d.Cmd("exec", containerID, "touch", "/status")
-	// Task should be at running status
-	waitAndAssert(c, defaultReconciliationTimeout, func(c *check.C) (interface{}, check.CommentInterface) {
-		task = d.getTask(c, task.ID)
-		return task.Status.State, nil
-	}, checker.Equals, swarm.TaskStateRunning)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_logs_experimental_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_logs_experimental_test.go
deleted file mode 100644
index c2216543d7..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_logs_experimental_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-type logMessage struct {
-	err  error
-	data []byte
-}
-
-func (s *DockerSwarmSuite) TestServiceLogs(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-
-	d := s.AddDaemon(c, true, true)
-
-	// we have multiple services here for detecting the goroutine issue #28915
-	services := map[string]string{
-		"TestServiceLogs1": "hello1",
-		"TestServiceLogs2": "hello2",
-	}
-
-	for name, message := range services {
-		out, err := d.Cmd("service", "create", "--name", name, "busybox",
-			"sh", "-c", fmt.Sprintf("echo %s; tail -f /dev/null", message))
-		c.Assert(err, checker.IsNil)
-		c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	}
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout,
-		d.checkActiveContainerCount, checker.Equals, len(services))
-
-	for name, message := range services {
-		out, err := d.Cmd("service", "logs", name)
-		c.Assert(err, checker.IsNil)
-		c.Logf("log for %q: %q", name, out)
-		c.Assert(out, checker.Contains, message)
-	}
-}
-
-func (s *DockerSwarmSuite) TestServiceLogsFollow(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-
-	d := s.AddDaemon(c, true, true)
-
-	name := "TestServiceLogsFollow"
-
-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", "while true; do echo log test; sleep 0.1; done")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	args := []string{"service", "logs", "-f", name}
-	cmd := exec.Command(dockerBinary, d.prependHostArg(args)...)
-	r, w := io.Pipe()
-	cmd.Stdout = w
-	cmd.Stderr = w
-	c.Assert(cmd.Start(), checker.IsNil)
-
-	// Make sure pipe is written to
-	ch := make(chan *logMessage)
-	done := make(chan struct{})
-	go func() {
-		reader := bufio.NewReader(r)
-		for {
-			msg := &logMessage{}
-			msg.data, _, msg.err = reader.ReadLine()
-			select {
-			case ch <- msg:
-			case <-done:
-				return
-			}
-		}
-	}()
-
-	for i := 0; i < 3; i++ {
-		msg := <-ch
-		c.Assert(msg.err, checker.IsNil)
-		c.Assert(string(msg.data), checker.Contains, "log test")
-	}
-	close(done)
-
-	c.Assert(cmd.Process.Kill(), checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_scale_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_scale_test.go
deleted file mode 100644
index 29cca2358d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_scale_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestServiceScale(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	service1Name := "TestService1"
-	service1Args := append([]string{"service", "create", "--name", service1Name, defaultSleepImage}, sleepCommandForDaemonPlatform()...)
-
-	// global mode
-	service2Name := "TestService2"
-	service2Args := append([]string{"service", "create", "--name", service2Name, "--mode=global", defaultSleepImage}, sleepCommandForDaemonPlatform()...)
-
-	// Create services
-	out, err := d.Cmd(service1Args...)
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd(service2Args...)
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd("service", "scale", "TestService1=2")
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd("service", "scale", "TestService1=foobar")
-	c.Assert(err, checker.NotNil)
-
-	str := fmt.Sprintf("%s: invalid replicas value %s", service1Name, "foobar")
-	if !strings.Contains(out, str) {
-		c.Errorf("got: %s, expected has sub string: %s", out, str)
-	}
-
-	out, err = d.Cmd("service", "scale", "TestService1=-1")
-	c.Assert(err, checker.NotNil)
-
-	str = fmt.Sprintf("%s: invalid replicas value %s", service1Name, "-1")
-	if !strings.Contains(out, str) {
-		c.Errorf("got: %s, expected has sub string: %s", out, str)
-	}
-
-	// TestService2 is a global mode
-	out, err = d.Cmd("service", "scale", "TestService2=2")
-	c.Assert(err, checker.NotNil)
-
-	str = fmt.Sprintf("%s: scale can only be used with replicated mode\n", service2Name)
-	if out != str {
-		c.Errorf("got: %s, expected: %s", out, str)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_update_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_update_test.go
deleted file mode 100644
index 837370ceeb..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_service_update_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestServiceUpdatePort(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	serviceName := "TestServiceUpdatePort"
-	serviceArgs := append([]string{"service", "create", "--name", serviceName, "-p", "8080:8081", defaultSleepImage}, sleepCommandForDaemonPlatform()...)
-
-	// Create a service with a port mapping of 8080:8081.
-	out, err := d.Cmd(serviceArgs...)
-	c.Assert(err, checker.IsNil)
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// Update the service: changed the port mapping from 8080:8081 to 8082:8083.
-	_, err = d.Cmd("service", "update", "--publish-add", "8082:8083", "--publish-rm", "8081", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	// Inspect the service and verify port mapping
-	expected := []swarm.PortConfig{
-		{
-			Protocol:      "tcp",
-			PublishedPort: 8082,
-			TargetPort:    8083,
-			PublishMode:   "ingress",
-		},
-	}
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.EndpointSpec.Ports }}", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	var portConfig []swarm.PortConfig
-	if err := json.Unmarshal([]byte(out), &portConfig); err != nil {
-		c.Fatalf("invalid JSON in inspect result: %v (%s)", err, out)
-	}
-	c.Assert(portConfig, checker.DeepEquals, expected)
-}
-
-func (s *DockerSwarmSuite) TestServiceUpdateLabel(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	out, err := d.Cmd("service", "create", "--name=test", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service := d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 0)
-
-	// add label to empty set
-	out, err = d.Cmd("service", "update", "test", "--label-add", "foo=bar")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service = d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 1)
-	c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
-
-	// add label to non-empty set
-	out, err = d.Cmd("service", "update", "test", "--label-add", "foo2=bar")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service = d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 2)
-	c.Assert(service.Spec.Labels["foo2"], checker.Equals, "bar")
-
-	out, err = d.Cmd("service", "update", "test", "--label-rm", "foo2")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service = d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 1)
-	c.Assert(service.Spec.Labels["foo2"], checker.Equals, "")
-
-	out, err = d.Cmd("service", "update", "test", "--label-rm", "foo")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service = d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 0)
-	c.Assert(service.Spec.Labels["foo"], checker.Equals, "")
-
-	// now make sure we can add again
-	out, err = d.Cmd("service", "update", "test", "--label-add", "foo=bar")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	service = d.getService(c, "test")
-	c.Assert(service.Spec.Labels, checker.HasLen, 1)
-	c.Assert(service.Spec.Labels["foo"], checker.Equals, "bar")
-}
-
-func (s *DockerSwarmSuite) TestServiceUpdateSecrets(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	testName := "test_secret"
-	id := d.createSecret(c, swarm.SecretSpec{
-		swarm.Annotations{
-			Name: testName,
-		},
-		[]byte("TESTINGDATA"),
-	})
-	c.Assert(id, checker.Not(checker.Equals), "", check.Commentf("secrets: %s", id))
-	testTarget := "testing"
-	serviceName := "test"
-
-	out, err := d.Cmd("service", "create", "--name", serviceName, "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// add secret
-	out, err = d.cmdRetryOutOfSequence("service", "update", "test", "--secret-add", fmt.Sprintf("source=%s,target=%s", testName, testTarget))
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	var refs []swarm.SecretReference
-	c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
-	c.Assert(refs, checker.HasLen, 1)
-
-	c.Assert(refs[0].SecretName, checker.Equals, testName)
-	c.Assert(refs[0].File, checker.Not(checker.IsNil))
-	c.Assert(refs[0].File.Name, checker.Equals, testTarget)
-
-	// remove
-	out, err = d.cmdRetryOutOfSequence("service", "update", "test", "--secret-rm", testName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", serviceName)
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
-	c.Assert(refs, checker.HasLen, 0)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_sni_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_sni_test.go
deleted file mode 100644
index fb896d52d5..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_sni_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os/exec"
-	"strings"
-
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestClientSetsTLSServerName(c *check.C) {
-	c.Skip("Flakey test")
-	// there may be more than one hit to the server for each registry request
-	serverNameReceived := []string{}
-	var serverName string
-
-	virtualHostServer := httptest.NewTLSServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		serverNameReceived = append(serverNameReceived, r.TLS.ServerName)
-	}))
-	defer virtualHostServer.Close()
-	// discard TLS handshake errors written by default to os.Stderr
-	virtualHostServer.Config.ErrorLog = log.New(ioutil.Discard, "", 0)
-
-	u, err := url.Parse(virtualHostServer.URL)
-	c.Assert(err, check.IsNil)
-	hostPort := u.Host
-	serverName = strings.Split(hostPort, ":")[0]
-
-	repoName := fmt.Sprintf("%v/dockercli/image:latest", hostPort)
-	cmd := exec.Command(dockerBinary, "pull", repoName)
-	cmd.Run()
-
-	// check that the fake server was hit at least once
-	c.Assert(len(serverNameReceived) > 0, check.Equals, true)
-	// check that for each hit the right server name was received
-	for _, item := range serverNameReceived {
-		c.Check(item, check.Equals, serverName)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stack_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stack_test.go
deleted file mode 100644
index fd9b15449d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stack_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"sort"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestStackRemoveUnknown(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	stackArgs := append([]string{"stack", "remove", "UNKNOWN_STACK"})
-
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "Nothing found in stack: UNKNOWN_STACK\n")
-}
-
-func (s *DockerSwarmSuite) TestStackPSUnknown(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	stackArgs := append([]string{"stack", "ps", "UNKNOWN_STACK"})
-
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "Nothing found in stack: UNKNOWN_STACK\n")
-}
-
-func (s *DockerSwarmSuite) TestStackServicesUnknown(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	stackArgs := append([]string{"stack", "services", "UNKNOWN_STACK"})
-
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "Nothing found in stack: UNKNOWN_STACK\n")
-}
-
-func (s *DockerSwarmSuite) TestStackDeployComposeFile(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testStackName := "testdeploy"
-	stackArgs := []string{
-		"stack", "deploy",
-		"--compose-file", "fixtures/deploy/default.yaml",
-		testStackName,
-	}
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("stack", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "NAME        SERVICES\n"+"testdeploy  2\n")
-
-	out, err = d.Cmd("stack", "rm", testStackName)
-	c.Assert(err, checker.IsNil)
-	out, err = d.Cmd("stack", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "NAME  SERVICES\n")
-}
-
-func (s *DockerSwarmSuite) TestStackDeployWithSecretsTwice(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("secret", "create", "outside", "fixtures/secrets/default")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	testStackName := "testdeploy"
-	stackArgs := []string{
-		"stack", "deploy",
-		"--compose-file", "fixtures/deploy/secrets.yaml",
-		testStackName,
-	}
-	out, err = d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ json .Spec.TaskTemplate.ContainerSpec.Secrets }}", "testdeploy_web")
-	c.Assert(err, checker.IsNil)
-
-	var refs []swarm.SecretReference
-	c.Assert(json.Unmarshal([]byte(out), &refs), checker.IsNil)
-	c.Assert(refs, checker.HasLen, 3)
-
-	sort.Sort(sortSecrets(refs))
-	c.Assert(refs[0].SecretName, checker.Equals, "outside")
-	c.Assert(refs[1].SecretName, checker.Equals, "testdeploy_special")
-	c.Assert(refs[1].File.Name, checker.Equals, "special")
-	c.Assert(refs[2].SecretName, checker.Equals, "testdeploy_super")
-	c.Assert(refs[2].File.Name, checker.Equals, "foo.txt")
-	c.Assert(refs[2].File.Mode, checker.Equals, os.FileMode(0400))
-
-	// Deploy again to ensure there are no errors when secret hasn't changed
-	out, err = d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-}
-
-func (s *DockerSwarmSuite) TestStackRemove(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	stackName := "testdeploy"
-	stackArgs := []string{
-		"stack", "deploy",
-		"--compose-file", "fixtures/deploy/remove.yaml",
-		stackName,
-	}
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	out, err = d.Cmd("stack", "ps", stackName)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.Split(strings.TrimSpace(out), "\n"), checker.HasLen, 2)
-
-	out, err = d.Cmd("stack", "rm", stackName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Removing service testdeploy_web")
-	c.Assert(out, checker.Contains, "Removing network testdeploy_default")
-	c.Assert(out, checker.Contains, "Removing secret testdeploy_special")
-}
-
-type sortSecrets []swarm.SecretReference
-
-func (s sortSecrets) Len() int           { return len(s) }
-func (s sortSecrets) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s sortSecrets) Less(i, j int) bool { return s[i].SecretName < s[j].SecretName }
-
-// testDAB is the DAB JSON used for testing.
-// TODO: Use template/text and substitute "Image" with the result of
-// `docker inspect --format '{{index .RepoDigests 0}}' busybox:latest`
-const testDAB = `{
-    "Version": "0.1",
-    "Services": {
-	"srv1": {
-	    "Image": "busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0",
-	    "Command": ["top"]
-	},
-	"srv2": {
-	    "Image": "busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0",
-	    "Command": ["tail"],
-	    "Args": ["-f", "/dev/null"]
-	}
-    }
-}`
-
-func (s *DockerSwarmSuite) TestStackDeployWithDAB(c *check.C) {
-	testRequires(c, ExperimentalDaemon)
-	// setup
-	testStackName := "test"
-	testDABFileName := testStackName + ".dab"
-	defer os.RemoveAll(testDABFileName)
-	err := ioutil.WriteFile(testDABFileName, []byte(testDAB), 0444)
-	c.Assert(err, checker.IsNil)
-	d := s.AddDaemon(c, true, true)
-	// deploy
-	stackArgs := []string{
-		"stack", "deploy",
-		"--bundle-file", testDABFileName,
-		testStackName,
-	}
-	out, err := d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Loading bundle from test.dab\n")
-	c.Assert(out, checker.Contains, "Creating service test_srv1\n")
-	c.Assert(out, checker.Contains, "Creating service test_srv2\n")
-	// ls
-	stackArgs = []string{"stack", "ls"}
-	out, err = d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "NAME  SERVICES\n"+"test  2\n")
-	// rm
-	stackArgs = []string{"stack", "rm", testStackName}
-	out, err = d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "Removing service test_srv1\n")
-	c.Assert(out, checker.Contains, "Removing service test_srv2\n")
-	// ls (empty)
-	stackArgs = []string{"stack", "ls"}
-	out, err = d.Cmd(stackArgs...)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, check.Equals, "NAME  SERVICES\n")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_start_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_start_test.go
deleted file mode 100644
index b1cea35872..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_start_test.go
+++ /dev/null
@@ -1,199 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// Regression test for https://github.com/docker/docker/issues/7843
-func (s *DockerSuite) TestStartAttachReturnsOnError(c *check.C) {
-	// Windows does not support link
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "run", "--name", "test", "busybox")
-
-	// Expect this to fail because the above container is stopped, this is what we want
-	out, _, err := dockerCmdWithError("run", "--name", "test2", "--link", "test:test", "busybox")
-	// err shouldn't be nil because container test2 try to link to stopped container
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-
-	ch := make(chan error)
-	go func() {
-		// Attempt to start attached to the container that won't start
-		// This should return an error immediately since the container can't be started
-		if out, _, err := dockerCmdWithError("start", "-a", "test2"); err == nil {
-			ch <- fmt.Errorf("Expected error but got none:\n%s", out)
-		}
-		close(ch)
-	}()
-
-	select {
-	case err := <-ch:
-		c.Assert(err, check.IsNil)
-	case <-time.After(5 * time.Second):
-		c.Fatalf("Attach did not exit properly")
-	}
-}
-
-// gh#8555: Exit code should be passed through when using start -a
-func (s *DockerSuite) TestStartAttachCorrectExitCode(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-d", "busybox", "sh", "-c", "sleep 2; exit 1")
-	out = strings.TrimSpace(out)
-
-	// make sure the container has exited before trying the "start -a"
-	dockerCmd(c, "wait", out)
-
-	startOut, exitCode, err := dockerCmdWithError("start", "-a", out)
-	// start command should fail
-	c.Assert(err, checker.NotNil, check.Commentf("startOut: %s", startOut))
-	// start -a did not respond with proper exit code
-	c.Assert(exitCode, checker.Equals, 1, check.Commentf("startOut: %s", startOut))
-
-}
-
-func (s *DockerSuite) TestStartAttachSilent(c *check.C) {
-	name := "teststartattachcorrectexitcode"
-	dockerCmd(c, "run", "--name", name, "busybox", "echo", "test")
-
-	// make sure the container has exited before trying the "start -a"
-	dockerCmd(c, "wait", name)
-
-	startOut, _ := dockerCmd(c, "start", "-a", name)
-	// start -a produced unexpected output
-	c.Assert(startOut, checker.Equals, "test\n")
-}
-
-func (s *DockerSuite) TestStartRecordError(c *check.C) {
-	// TODO Windows CI: Requires further porting work. Should be possible.
-	testRequires(c, DaemonIsLinux)
-	// when container runs successfully, we should not have state.Error
-	dockerCmd(c, "run", "-d", "-p", "9999:9999", "--name", "test", "busybox", "top")
-	stateErr := inspectField(c, "test", "State.Error")
-	// Expected to not have state error
-	c.Assert(stateErr, checker.Equals, "")
-
-	// Expect this to fail and records error because of ports conflict
-	out, _, err := dockerCmdWithError("run", "-d", "--name", "test2", "-p", "9999:9999", "busybox", "top")
-	// err shouldn't be nil because docker run will fail
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-
-	stateErr = inspectField(c, "test2", "State.Error")
-	c.Assert(stateErr, checker.Contains, "port is already allocated")
-
-	// Expect the conflict to be resolved when we stop the initial container
-	dockerCmd(c, "stop", "test")
-	dockerCmd(c, "start", "test2")
-	stateErr = inspectField(c, "test2", "State.Error")
-	// Expected to not have state error but got one
-	c.Assert(stateErr, checker.Equals, "")
-}
-
-func (s *DockerSuite) TestStartPausedContainer(c *check.C) {
-	// Windows does not support pausing containers
-	testRequires(c, IsPausable)
-	defer unpauseAllContainers()
-
-	runSleepingContainer(c, "-d", "--name", "testing")
-
-	dockerCmd(c, "pause", "testing")
-
-	out, _, err := dockerCmdWithError("start", "testing")
-	// an error should have been shown that you cannot start paused container
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	// an error should have been shown that you cannot start paused container
-	c.Assert(out, checker.Contains, "Cannot start a paused container, try unpause instead.")
-}
-
-func (s *DockerSuite) TestStartMultipleContainers(c *check.C) {
-	// Windows does not support --link
-	testRequires(c, DaemonIsLinux)
-	// run a container named 'parent' and create two container link to `parent`
-	dockerCmd(c, "run", "-d", "--name", "parent", "busybox", "top")
-
-	for _, container := range []string{"child_first", "child_second"} {
-		dockerCmd(c, "create", "--name", container, "--link", "parent:parent", "busybox", "top")
-	}
-
-	// stop 'parent' container
-	dockerCmd(c, "stop", "parent")
-
-	out := inspectField(c, "parent", "State.Running")
-	// Container should be stopped
-	c.Assert(out, checker.Equals, "false")
-
-	// start all the three containers, container `child_first` start first which should be failed
-	// container 'parent' start second and then start container 'child_second'
-	expOut := "Cannot link to a non running container"
-	expErr := "failed to start containers: [child_first]"
-	out, _, err := dockerCmdWithError("start", "child_first", "parent", "child_second")
-	// err shouldn't be nil because start will fail
-	c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-	// output does not correspond to what was expected
-	if !(strings.Contains(out, expOut) || strings.Contains(err.Error(), expErr)) {
-		c.Fatalf("Expected out: %v with err: %v  but got out: %v with err: %v", expOut, expErr, out, err)
-	}
-
-	for container, expected := range map[string]string{"parent": "true", "child_first": "false", "child_second": "true"} {
-		out := inspectField(c, container, "State.Running")
-		// Container running state wrong
-		c.Assert(out, checker.Equals, expected)
-	}
-}
-
-func (s *DockerSuite) TestStartAttachMultipleContainers(c *check.C) {
-	// run  multiple containers to test
-	for _, container := range []string{"test1", "test2", "test3"} {
-		runSleepingContainer(c, "--name", container)
-	}
-
-	// stop all the containers
-	for _, container := range []string{"test1", "test2", "test3"} {
-		dockerCmd(c, "stop", container)
-	}
-
-	// test start and attach multiple containers at once, expected error
-	for _, option := range []string{"-a", "-i", "-ai"} {
-		out, _, err := dockerCmdWithError("start", option, "test1", "test2", "test3")
-		// err shouldn't be nil because start will fail
-		c.Assert(err, checker.NotNil, check.Commentf("out: %s", out))
-		// output does not correspond to what was expected
-		c.Assert(out, checker.Contains, "You cannot start and attach multiple containers at once.")
-	}
-
-	// confirm the state of all the containers be stopped
-	for container, expected := range map[string]string{"test1": "false", "test2": "false", "test3": "false"} {
-		out := inspectField(c, container, "State.Running")
-		// Container running state wrong
-		c.Assert(out, checker.Equals, expected)
-	}
-}
-
-// Test case for #23716
-func (s *DockerSuite) TestStartAttachWithRename(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "create", "-t", "--name", "before", "busybox")
-	go func() {
-		c.Assert(waitRun("before"), checker.IsNil)
-		dockerCmd(c, "rename", "before", "after")
-		dockerCmd(c, "stop", "--time=2", "after")
-	}()
-	_, stderr, _, _ := runCommandWithStdoutStderr(exec.Command(dockerBinary, "start", "-a", "before"))
-	c.Assert(stderr, checker.Not(checker.Contains), "No such container")
-}
-
-func (s *DockerSuite) TestStartReturnCorrectExitCode(c *check.C) {
-	dockerCmd(c, "create", "--restart=on-failure:2", "--name", "withRestart", "busybox", "sh", "-c", "exit 11")
-	dockerCmd(c, "create", "--rm", "--name", "withRm", "busybox", "sh", "-c", "exit 12")
-
-	_, exitCode, err := dockerCmdWithError("start", "-a", "withRestart")
-	c.Assert(err, checker.NotNil)
-	c.Assert(exitCode, checker.Equals, 11)
-	_, exitCode, err = dockerCmdWithError("start", "-a", "withRm")
-	c.Assert(err, checker.NotNil)
-	c.Assert(exitCode, checker.Equals, 12)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stats_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stats_test.go
deleted file mode 100644
index 5cb1a3ea02..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stats_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"os/exec"
-	"regexp"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestStatsNoStream(c *check.C) {
-	// Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	c.Assert(waitRun(id), checker.IsNil)
-
-	statsCmd := exec.Command(dockerBinary, "stats", "--no-stream", id)
-	type output struct {
-		out []byte
-		err error
-	}
-
-	ch := make(chan output)
-	go func() {
-		out, err := statsCmd.Output()
-		ch <- output{out, err}
-	}()
-
-	select {
-	case outerr := <-ch:
-		c.Assert(outerr.err, checker.IsNil, check.Commentf("Error running stats: %v", outerr.err))
-		c.Assert(string(outerr.out), checker.Contains, id) //running container wasn't present in output
-	case <-time.After(3 * time.Second):
-		statsCmd.Process.Kill()
-		c.Fatalf("stats did not return immediately when not streaming")
-	}
-}
-
-func (s *DockerSuite) TestStatsContainerNotFound(c *check.C) {
-	// Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-
-	out, _, err := dockerCmdWithError("stats", "notfound")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "No such container: notfound", check.Commentf("Expected to fail on not found container stats, got %q instead", out))
-
-	out, _, err = dockerCmdWithError("stats", "--no-stream", "notfound")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "No such container: notfound", check.Commentf("Expected to fail on not found container stats with --no-stream, got %q instead", out))
-}
-
-func (s *DockerSuite) TestStatsAllRunningNoStream(c *check.C) {
-	// Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id1 := strings.TrimSpace(out)[:12]
-	c.Assert(waitRun(id1), check.IsNil)
-	out, _ = dockerCmd(c, "run", "-d", "busybox", "top")
-	id2 := strings.TrimSpace(out)[:12]
-	c.Assert(waitRun(id2), check.IsNil)
-	out, _ = dockerCmd(c, "run", "-d", "busybox", "top")
-	id3 := strings.TrimSpace(out)[:12]
-	c.Assert(waitRun(id3), check.IsNil)
-	dockerCmd(c, "stop", id3)
-
-	out, _ = dockerCmd(c, "stats", "--no-stream")
-	if !strings.Contains(out, id1) || !strings.Contains(out, id2) {
-		c.Fatalf("Expected stats output to contain both %s and %s, got %s", id1, id2, out)
-	}
-	if strings.Contains(out, id3) {
-		c.Fatalf("Did not expect %s in stats, got %s", id3, out)
-	}
-
-	// check output contains real data, but not all zeros
-	reg, _ := regexp.Compile("[1-9]+")
-	// split output with "\n", outLines[1] is id2's output
-	// outLines[2] is id1's output
-	outLines := strings.Split(out, "\n")
-	// check stat result of id2 contains real data
-	realData := reg.Find([]byte(outLines[1][12:]))
-	c.Assert(realData, checker.NotNil, check.Commentf("stat result are empty: %s", out))
-	// check stat result of id1 contains real data
-	realData = reg.Find([]byte(outLines[2][12:]))
-	c.Assert(realData, checker.NotNil, check.Commentf("stat result are empty: %s", out))
-}
-
-func (s *DockerSuite) TestStatsAllNoStream(c *check.C) {
-	// Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "top")
-	id1 := strings.TrimSpace(out)[:12]
-	c.Assert(waitRun(id1), check.IsNil)
-	dockerCmd(c, "stop", id1)
-	out, _ = dockerCmd(c, "run", "-d", "busybox", "top")
-	id2 := strings.TrimSpace(out)[:12]
-	c.Assert(waitRun(id2), check.IsNil)
-
-	out, _ = dockerCmd(c, "stats", "--all", "--no-stream")
-	if !strings.Contains(out, id1) || !strings.Contains(out, id2) {
-		c.Fatalf("Expected stats output to contain both %s and %s, got %s", id1, id2, out)
-	}
-
-	// check output contains real data, but not all zeros
-	reg, _ := regexp.Compile("[1-9]+")
-	// split output with "\n", outLines[1] is id2's output
-	outLines := strings.Split(out, "\n")
-	// check stat result of id2 contains real data
-	realData := reg.Find([]byte(outLines[1][12:]))
-	c.Assert(realData, checker.NotNil, check.Commentf("stat result of %s is empty: %s", id2, out))
-	// check stat result of id1 contains all zero
-	realData = reg.Find([]byte(outLines[2][12:]))
-	c.Assert(realData, checker.IsNil, check.Commentf("stat result of %s should be empty : %s", id1, out))
-}
-
-func (s *DockerSuite) TestStatsAllNewContainersAdded(c *check.C) {
-	// Windows does not support stats
-	testRequires(c, DaemonIsLinux)
-
-	id := make(chan string)
-	addedChan := make(chan struct{})
-
-	runSleepingContainer(c, "-d")
-	statsCmd := exec.Command(dockerBinary, "stats")
-	stdout, err := statsCmd.StdoutPipe()
-	c.Assert(err, check.IsNil)
-	c.Assert(statsCmd.Start(), check.IsNil)
-	defer statsCmd.Process.Kill()
-
-	go func() {
-		containerID := <-id
-		matchID := regexp.MustCompile(containerID)
-
-		scanner := bufio.NewScanner(stdout)
-		for scanner.Scan() {
-			switch {
-			case matchID.MatchString(scanner.Text()):
-				close(addedChan)
-				return
-			}
-		}
-	}()
-
-	out, _ := runSleepingContainer(c, "-d")
-	c.Assert(waitRun(strings.TrimSpace(out)), check.IsNil)
-	id <- strings.TrimSpace(out)[:12]
-
-	select {
-	case <-time.After(30 * time.Second):
-		c.Fatal("failed to observe new container created added to stats")
-	case <-addedChan:
-		// ignore, done
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stop_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stop_test.go
deleted file mode 100644
index 103d01374c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_stop_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package main
-
-import (
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestStopContainerWithRestartPolicyAlways(c *check.C) {
-	dockerCmd(c, "run", "--name", "verifyRestart1", "-d", "--restart=always", "busybox", "false")
-	dockerCmd(c, "run", "--name", "verifyRestart2", "-d", "--restart=always", "busybox", "false")
-
-	c.Assert(waitRun("verifyRestart1"), checker.IsNil)
-	c.Assert(waitRun("verifyRestart2"), checker.IsNil)
-
-	dockerCmd(c, "stop", "verifyRestart1")
-	dockerCmd(c, "stop", "verifyRestart2")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_test.go
deleted file mode 100644
index 8eae162cba..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_test.go
+++ /dev/null
@@ -1,1254 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/libnetwork/driverapi"
-	"github.com/docker/libnetwork/ipamapi"
-	remoteipam "github.com/docker/libnetwork/ipams/remote/api"
-	"github.com/go-check/check"
-	"github.com/vishvananda/netlink"
-)
-
-func (s *DockerSwarmSuite) TestSwarmUpdate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	getSpec := func() swarm.Spec {
-		sw := d.getSwarm(c)
-		return sw.Spec
-	}
-
-	out, err := d.Cmd("swarm", "update", "--cert-expiry", "30h", "--dispatcher-heartbeat", "11s")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	spec := getSpec()
-	c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
-	c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, 11*time.Second)
-
-	// setting anything under 30m for cert-expiry is not allowed
-	out, err = d.Cmd("swarm", "update", "--cert-expiry", "15m")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "minimum certificate expiry time")
-	spec = getSpec()
-	c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
-}
-
-func (s *DockerSwarmSuite) TestSwarmInit(c *check.C) {
-	d := s.AddDaemon(c, false, false)
-
-	getSpec := func() swarm.Spec {
-		sw := d.getSwarm(c)
-		return sw.Spec
-	}
-
-	out, err := d.Cmd("swarm", "init", "--cert-expiry", "30h", "--dispatcher-heartbeat", "11s")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	spec := getSpec()
-	c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 30*time.Hour)
-	c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, 11*time.Second)
-
-	c.Assert(d.Leave(true), checker.IsNil)
-	time.Sleep(500 * time.Millisecond) // https://github.com/docker/swarmkit/issues/1421
-	out, err = d.Cmd("swarm", "init")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	spec = getSpec()
-	c.Assert(spec.CAConfig.NodeCertExpiry, checker.Equals, 90*24*time.Hour)
-	c.Assert(spec.Dispatcher.HeartbeatPeriod, checker.Equals, 5*time.Second)
-}
-
-func (s *DockerSwarmSuite) TestSwarmInitIPv6(c *check.C) {
-	testRequires(c, IPv6)
-	d1 := s.AddDaemon(c, false, false)
-	out, err := d1.Cmd("swarm", "init", "--listen-addr", "::1")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	d2 := s.AddDaemon(c, false, false)
-	out, err = d2.Cmd("swarm", "join", "::1")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-
-	out, err = d2.Cmd("info")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	c.Assert(out, checker.Contains, "Swarm: active")
-}
-
-func (s *DockerSwarmSuite) TestSwarmInitUnspecifiedAdvertiseAddr(c *check.C) {
-	d := s.AddDaemon(c, false, false)
-	out, err := d.Cmd("swarm", "init", "--advertise-addr", "0.0.0.0")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "advertise address must be a non-zero IP address")
-}
-
-func (s *DockerSwarmSuite) TestSwarmIncompatibleDaemon(c *check.C) {
-	// init swarm mode and stop a daemon
-	d := s.AddDaemon(c, true, true)
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-	c.Assert(d.Stop(), checker.IsNil)
-
-	// start a daemon with --cluster-store and --cluster-advertise
-	err = d.Start("--cluster-store=consul://consuladdr:consulport/some/path", "--cluster-advertise=1.1.1.1:2375")
-	c.Assert(err, checker.NotNil)
-	content, _ := ioutil.ReadFile(d.logFile.Name())
-	c.Assert(string(content), checker.Contains, "--cluster-store and --cluster-advertise daemon configurations are incompatible with swarm mode")
-
-	// start a daemon with --live-restore
-	err = d.Start("--live-restore")
-	c.Assert(err, checker.NotNil)
-	content, _ = ioutil.ReadFile(d.logFile.Name())
-	c.Assert(string(content), checker.Contains, "--live-restore daemon configuration is incompatible with swarm mode")
-	// restart for teardown
-	c.Assert(d.Start(), checker.IsNil)
-}
-
-// Test case for #24090
-func (s *DockerSwarmSuite) TestSwarmNodeListHostname(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// The first line should contain "HOSTNAME"
-	out, err := d.Cmd("node", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.Split(out, "\n")[0], checker.Contains, "HOSTNAME")
-}
-
-func (s *DockerSwarmSuite) TestSwarmServiceTemplatingHostname(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("service", "create", "--name", "test", "--hostname", "{{.Service.Name}}-{{.Task.Slot}}", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	containers := d.activeContainers()
-	out, err = d.Cmd("inspect", "--type", "container", "--format", "{{.Config.Hostname}}", containers[0])
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.Split(out, "\n")[0], checker.Equals, "test-1", check.Commentf("hostname with templating invalid"))
-}
-
-// Test case for #24270
-func (s *DockerSwarmSuite) TestSwarmServiceListFilter(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name1 := "redis-cluster-md5"
-	name2 := "redis-cluster"
-	name3 := "other-cluster"
-	out, err := d.Cmd("service", "create", "--name", name1, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	out, err = d.Cmd("service", "create", "--name", name2, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	out, err = d.Cmd("service", "create", "--name", name3, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	filter1 := "name=redis-cluster-md5"
-	filter2 := "name=redis-cluster"
-
-	// We search checker.Contains with `name+" "` to prevent prefix only.
-	out, err = d.Cmd("service", "ls", "--filter", filter1)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name1+" ")
-	c.Assert(out, checker.Not(checker.Contains), name2+" ")
-	c.Assert(out, checker.Not(checker.Contains), name3+" ")
-
-	out, err = d.Cmd("service", "ls", "--filter", filter2)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name1+" ")
-	c.Assert(out, checker.Contains, name2+" ")
-	c.Assert(out, checker.Not(checker.Contains), name3+" ")
-
-	out, err = d.Cmd("service", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name1+" ")
-	c.Assert(out, checker.Contains, name2+" ")
-	c.Assert(out, checker.Contains, name3+" ")
-}
-
-func (s *DockerSwarmSuite) TestSwarmNodeListFilter(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("node", "inspect", "--format", "{{ .Description.Hostname }}", "self")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	name := strings.TrimSpace(out)
-
-	filter := "name=" + name[:4]
-
-	out, err = d.Cmd("node", "ls", "--filter", filter)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-
-	out, err = d.Cmd("node", "ls", "--filter", "name=none")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name)
-}
-
-func (s *DockerSwarmSuite) TestSwarmNodeTaskListFilter(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "redis-cluster-md5"
-	out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 3)
-
-	filter := "name=redis-cluster"
-
-	out, err = d.Cmd("node", "ps", "--filter", filter, "self")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name+".1")
-	c.Assert(out, checker.Contains, name+".2")
-	c.Assert(out, checker.Contains, name+".3")
-
-	out, err = d.Cmd("node", "ps", "--filter", "name=none", "self")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name+".1")
-	c.Assert(out, checker.Not(checker.Contains), name+".2")
-	c.Assert(out, checker.Not(checker.Contains), name+".3")
-}
-
-// Test case for #25375
-func (s *DockerSwarmSuite) TestSwarmPublishAdd(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	testCases := []struct {
-		name       string
-		publishAdd []string
-		ports      string
-	}{
-		{
-			name: "simple-syntax",
-			publishAdd: []string{
-				"80:80",
-				"80:80",
-				"80:80",
-				"80:20",
-			},
-			ports: "[{ tcp 80 80 ingress}]",
-		},
-		{
-			name: "complex-syntax",
-			publishAdd: []string{
-				"target=90,published=90,protocol=tcp,mode=ingress",
-				"target=90,published=90,protocol=tcp,mode=ingress",
-				"target=90,published=90,protocol=tcp,mode=ingress",
-				"target=30,published=90,protocol=tcp,mode=ingress",
-			},
-			ports: "[{ tcp 90 90 ingress}]",
-		},
-	}
-
-	for _, tc := range testCases {
-		out, err := d.Cmd("service", "create", "--name", tc.name, "--label", "x=y", "busybox", "top")
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-		c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-		out, err = d.cmdRetryOutOfSequence("service", "update", "--publish-add", tc.publishAdd[0], tc.name)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-
-		out, err = d.cmdRetryOutOfSequence("service", "update", "--publish-add", tc.publishAdd[1], tc.name)
-		c.Assert(err, checker.IsNil, check.Commentf(out))
-
-		out, err = d.cmdRetryOutOfSequence("service", "update", "--publish-add", tc.publishAdd[2], "--publish-add", tc.publishAdd[3], tc.name)
-		c.Assert(err, checker.NotNil, check.Commentf(out))
-
-		out, err = d.Cmd("service", "inspect", "--format", "{{ .Spec.EndpointSpec.Ports }}", tc.name)
-		c.Assert(err, checker.IsNil)
-		c.Assert(strings.TrimSpace(out), checker.Equals, tc.ports)
-	}
-}
-
-func (s *DockerSwarmSuite) TestSwarmServiceWithGroup(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "top"
-	out, err := d.Cmd("service", "create", "--name", name, "--user", "root:root", "--group", "wheel", "--group", "audio", "--group", "staff", "--group", "777", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	out, err = d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	container := strings.TrimSpace(out)
-
-	out, err = d.Cmd("exec", container, "id")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "uid=0(root) gid=0(root) groups=10(wheel),29(audio),50(staff),777")
-}
-
-func (s *DockerSwarmSuite) TestSwarmContainerAutoStart(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "--attachable", "-d", "overlay", "foo")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	out, err = d.Cmd("run", "-id", "--restart=always", "--net=foo", "--name=test", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	out, err = d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	d.Restart()
-
-	out, err = d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-}
-
-func (s *DockerSwarmSuite) TestSwarmContainerEndpointOptions(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "--attachable", "-d", "overlay", "foo")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	_, err = d.Cmd("run", "-d", "--net=foo", "--name=first", "--net-alias=first-alias", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	_, err = d.Cmd("run", "-d", "--net=foo", "--name=second", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// ping first container and its alias
-	_, err = d.Cmd("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	_, err = d.Cmd("exec", "second", "ping", "-c", "1", "first-alias")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerSwarmSuite) TestSwarmContainerAttachByNetworkId(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "--attachable", "-d", "overlay", "testnet")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	networkID := strings.TrimSpace(out)
-
-	out, err = d.Cmd("run", "-d", "--net", networkID, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	cID := strings.TrimSpace(out)
-	d.waitRun(cID)
-
-	_, err = d.Cmd("rm", "-f", cID)
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd("network", "rm", "testnet")
-	c.Assert(err, checker.IsNil)
-
-	checkNetwork := func(*check.C) (interface{}, check.CommentInterface) {
-		out, err := d.Cmd("network", "ls")
-		c.Assert(err, checker.IsNil)
-		return out, nil
-	}
-
-	waitAndAssert(c, 3*time.Second, checkNetwork, checker.Not(checker.Contains), "testnet")
-}
-
-func (s *DockerSwarmSuite) TestOverlayAttachable(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "-d", "overlay", "--attachable", "ovnet")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// validate attachable
-	out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "true")
-
-	// validate containers can attache to this overlay network
-	out, err = d.Cmd("run", "-d", "--network", "ovnet", "--name", "c1", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// redo validation, there was a bug that the value of attachable changes after
-	// containers attach to the network
-	out, err = d.Cmd("network", "inspect", "--format", "{{json .Attachable}}", "ovnet")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "true")
-}
-
-func (s *DockerSwarmSuite) TestOverlayAttachableOnSwarmLeave(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create an attachable swarm network
-	nwName := "attovl"
-	out, err := d.Cmd("network", "create", "-d", "overlay", "--attachable", nwName)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// Connect a container to the network
-	out, err = d.Cmd("run", "-d", "--network", nwName, "--name", "c1", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// Leave the swarm
-	err = d.Leave(true)
-	c.Assert(err, checker.IsNil)
-
-	// Check the container is disconnected
-	out, err = d.Cmd("inspect", "c1", "--format", "{{.NetworkSettings.Networks."+nwName+"}}")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "<no value>")
-
-	// Check the network is gone
-	out, err = d.Cmd("network", "ls", "--format", "{{.Name}}")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), nwName)
-}
-
-func (s *DockerSwarmSuite) TestSwarmRemoveInternalNetwork(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "ingress"
-	out, err := d.Cmd("network", "rm", name)
-	c.Assert(err, checker.NotNil)
-	c.Assert(strings.TrimSpace(out), checker.Contains, name)
-	c.Assert(strings.TrimSpace(out), checker.Contains, "is a pre-defined network and cannot be removed")
-}
-
-// Test case for #24108, also the case from:
-// https://github.com/docker/docker/pull/24620#issuecomment-233715656
-func (s *DockerSwarmSuite) TestSwarmTaskListFilter(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "redis-cluster-md5"
-	out, err := d.Cmd("service", "create", "--name", name, "--replicas=3", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	filter := "name=redis-cluster"
-
-	checkNumTasks := func(*check.C) (interface{}, check.CommentInterface) {
-		out, err := d.Cmd("service", "ps", "--filter", filter, name)
-		c.Assert(err, checker.IsNil)
-		return len(strings.Split(out, "\n")) - 2, nil // includes header and nl in last line
-	}
-
-	// wait until all tasks have been created
-	waitAndAssert(c, defaultReconciliationTimeout, checkNumTasks, checker.Equals, 3)
-
-	out, err = d.Cmd("service", "ps", "--filter", filter, name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name+".1")
-	c.Assert(out, checker.Contains, name+".2")
-	c.Assert(out, checker.Contains, name+".3")
-
-	out, err = d.Cmd("service", "ps", "--filter", "name="+name+".1", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name+".1")
-	c.Assert(out, checker.Not(checker.Contains), name+".2")
-	c.Assert(out, checker.Not(checker.Contains), name+".3")
-
-	out, err = d.Cmd("service", "ps", "--filter", "name=none", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name+".1")
-	c.Assert(out, checker.Not(checker.Contains), name+".2")
-	c.Assert(out, checker.Not(checker.Contains), name+".3")
-
-	name = "redis-cluster-sha1"
-	out, err = d.Cmd("service", "create", "--name", name, "--mode=global", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	waitAndAssert(c, defaultReconciliationTimeout, checkNumTasks, checker.Equals, 1)
-
-	filter = "name=redis-cluster"
-	out, err = d.Cmd("service", "ps", "--filter", filter, name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-
-	out, err = d.Cmd("service", "ps", "--filter", "name="+name, name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, name)
-
-	out, err = d.Cmd("service", "ps", "--filter", "name=none", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Not(checker.Contains), name)
-}
-
-func (s *DockerSwarmSuite) TestPsListContainersFilterIsTask(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a bare container
-	out, err := d.Cmd("run", "-d", "--name=bare-container", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	bareID := strings.TrimSpace(out)[:12]
-	// Create a service
-	name := "busybox-top"
-	out, err = d.Cmd("service", "create", "--name", name, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkServiceRunningTasks(name), checker.Equals, 1)
-
-	// Filter non-tasks
-	out, err = d.Cmd("ps", "-a", "-q", "--filter=is-task=false")
-	c.Assert(err, checker.IsNil)
-	psOut := strings.TrimSpace(out)
-	c.Assert(psOut, checker.Equals, bareID, check.Commentf("Expected id %s, got %s for is-task label, output %q", bareID, psOut, out))
-
-	// Filter tasks
-	out, err = d.Cmd("ps", "-a", "-q", "--filter=is-task=true")
-	c.Assert(err, checker.IsNil)
-	lines := strings.Split(strings.Trim(out, "\n "), "\n")
-	c.Assert(lines, checker.HasLen, 1)
-	c.Assert(lines[0], checker.Not(checker.Equals), bareID, check.Commentf("Expected not %s, but got it for is-task label, output %q", bareID, out))
-}
-
-const globalNetworkPlugin = "global-network-plugin"
-const globalIPAMPlugin = "global-ipam-plugin"
-
-func setupRemoteGlobalNetworkPlugin(c *check.C, mux *http.ServeMux, url, netDrv, ipamDrv string) {
-
-	mux.HandleFunc("/Plugin.Activate", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Implements": ["%s", "%s"]}`, driverapi.NetworkPluginEndpointType, ipamapi.PluginEndpointType)
-	})
-
-	// Network driver implementation
-	mux.HandleFunc(fmt.Sprintf("/%s.GetCapabilities", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Scope":"global"}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.AllocateNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&remoteDriverNetworkRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.FreeNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.CreateNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&remoteDriverNetworkRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.DeleteNetwork", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.CreateEndpoint", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"Interface":{"MacAddress":"a0:b1:c2:d3:e4:f5"}}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.Join", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-
-		veth := &netlink.Veth{
-			LinkAttrs: netlink.LinkAttrs{Name: "randomIfName", TxQLen: 0}, PeerName: "cnt0"}
-		if err := netlink.LinkAdd(veth); err != nil {
-			fmt.Fprintf(w, `{"Error":"failed to add veth pair: `+err.Error()+`"}`)
-		} else {
-			fmt.Fprintf(w, `{"InterfaceName":{ "SrcName":"cnt0", "DstPrefix":"veth"}}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.Leave", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, "null")
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.DeleteEndpoint", driverapi.NetworkPluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		if link, err := netlink.LinkByName("cnt0"); err == nil {
-			netlink.LinkDel(link)
-		}
-		fmt.Fprintf(w, "null")
-	})
-
-	// IPAM Driver implementation
-	var (
-		poolRequest       remoteipam.RequestPoolRequest
-		poolReleaseReq    remoteipam.ReleasePoolRequest
-		addressRequest    remoteipam.RequestAddressRequest
-		addressReleaseReq remoteipam.ReleaseAddressRequest
-		lAS               = "localAS"
-		gAS               = "globalAS"
-		pool              = "172.28.0.0/16"
-		poolID            = lAS + "/" + pool
-		gw                = "172.28.255.254/16"
-	)
-
-	mux.HandleFunc(fmt.Sprintf("/%s.GetDefaultAddressSpaces", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintf(w, `{"LocalDefaultAddressSpace":"`+lAS+`", "GlobalDefaultAddressSpace": "`+gAS+`"}`)
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.RequestPool", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&poolRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		if poolRequest.AddressSpace != lAS && poolRequest.AddressSpace != gAS {
-			fmt.Fprintf(w, `{"Error":"Unknown address space in pool request: `+poolRequest.AddressSpace+`"}`)
-		} else if poolRequest.Pool != "" && poolRequest.Pool != pool {
-			fmt.Fprintf(w, `{"Error":"Cannot handle explicit pool requests yet"}`)
-		} else {
-			fmt.Fprintf(w, `{"PoolID":"`+poolID+`", "Pool":"`+pool+`"}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.RequestAddress", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&addressRequest)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now querying on the expected pool id
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else if addressRequest.Address != "" {
-			fmt.Fprintf(w, `{"Error":"Cannot handle explicit address requests yet"}`)
-		} else {
-			fmt.Fprintf(w, `{"Address":"`+gw+`"}`)
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.ReleaseAddress", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&addressReleaseReq)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now asking to release the expected address from the expected poolid
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else if addressReleaseReq.Address != gw {
-			fmt.Fprintf(w, `{"Error":"unknown address"}`)
-		} else {
-			fmt.Fprintf(w, "null")
-		}
-	})
-
-	mux.HandleFunc(fmt.Sprintf("/%s.ReleasePool", ipamapi.PluginEndpointType), func(w http.ResponseWriter, r *http.Request) {
-		err := json.NewDecoder(r.Body).Decode(&poolReleaseReq)
-		if err != nil {
-			http.Error(w, "Unable to decode JSON payload: "+err.Error(), http.StatusBadRequest)
-			return
-		}
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		// make sure libnetwork is now asking to release the expected poolid
-		if addressRequest.PoolID != poolID {
-			fmt.Fprintf(w, `{"Error":"unknown pool id"}`)
-		} else {
-			fmt.Fprintf(w, "null")
-		}
-	})
-
-	err := os.MkdirAll("/etc/docker/plugins", 0755)
-	c.Assert(err, checker.IsNil)
-
-	fileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", netDrv)
-	err = ioutil.WriteFile(fileName, []byte(url), 0644)
-	c.Assert(err, checker.IsNil)
-
-	ipamFileName := fmt.Sprintf("/etc/docker/plugins/%s.spec", ipamDrv)
-	err = ioutil.WriteFile(ipamFileName, []byte(url), 0644)
-	c.Assert(err, checker.IsNil)
-}
-
-func (s *DockerSwarmSuite) TestSwarmNetworkPlugin(c *check.C) {
-	mux := http.NewServeMux()
-	s.server = httptest.NewServer(mux)
-	c.Assert(s.server, check.NotNil, check.Commentf("Failed to start an HTTP Server"))
-	setupRemoteGlobalNetworkPlugin(c, mux, s.server.URL, globalNetworkPlugin, globalIPAMPlugin)
-	defer func() {
-		s.server.Close()
-		err := os.RemoveAll("/etc/docker/plugins")
-		c.Assert(err, checker.IsNil)
-	}()
-
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "-d", globalNetworkPlugin, "foo")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "not supported in swarm mode")
-}
-
-// Test case for #24712
-func (s *DockerSwarmSuite) TestSwarmServiceEnvFile(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	path := filepath.Join(d.folder, "env.txt")
-	err := ioutil.WriteFile(path, []byte("VAR1=A\nVAR2=A\n"), 0644)
-	c.Assert(err, checker.IsNil)
-
-	name := "worker"
-	out, err := d.Cmd("service", "create", "--env-file", path, "--env", "VAR1=B", "--env", "VAR1=C", "--env", "VAR2=", "--env", "VAR2", "--name", name, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	// The complete env is [VAR1=A VAR2=A VAR1=B VAR1=C VAR2= VAR2] and duplicates will be removed => [VAR1=C VAR2]
-	out, err = d.Cmd("inspect", "--format", "{{ .Spec.TaskTemplate.ContainerSpec.Env }}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, "[VAR1=C VAR2]")
-}
-
-func (s *DockerSwarmSuite) TestSwarmServiceTTY(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "top"
-
-	ttyCheck := "if [ -t 0 ]; then echo TTY > /status && top; else echo none > /status && top; fi"
-
-	// Without --tty
-	expectedOutput := "none"
-	out, err := d.Cmd("service", "create", "--name", name, "busybox", "sh", "-c", ttyCheck)
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// We need to get the container id.
-	out, err = d.Cmd("ps", "-a", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	out, err = d.Cmd("exec", id, "cat", "/status")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-
-	// Remove service
-	out, err = d.Cmd("service", "rm", name)
-	c.Assert(err, checker.IsNil)
-	// Make sure container has been destroyed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 0)
-
-	// With --tty
-	expectedOutput = "TTY"
-	out, err = d.Cmd("service", "create", "--name", name, "--tty", "busybox", "sh", "-c", ttyCheck)
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// We need to get the container id.
-	out, err = d.Cmd("ps", "-a", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	id = strings.TrimSpace(out)
-
-	out, err = d.Cmd("exec", id, "cat", "/status")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-func (s *DockerSwarmSuite) TestSwarmServiceTTYUpdate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a service
-	name := "top"
-	_, err := d.Cmd("service", "create", "--name", name, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	out, err := d.Cmd("service", "inspect", "--format", "{{ .Spec.TaskTemplate.ContainerSpec.TTY }}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "false")
-
-	_, err = d.Cmd("service", "update", "--tty", name)
-	c.Assert(err, checker.IsNil)
-
-	out, err = d.Cmd("service", "inspect", "--format", "{{ .Spec.TaskTemplate.ContainerSpec.TTY }}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "true")
-}
-
-func (s *DockerSwarmSuite) TestDNSConfig(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a service
-	name := "top"
-	_, err := d.Cmd("service", "create", "--name", name, "--dns=1.2.3.4", "--dns-search=example.com", "--dns-option=timeout:3", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// We need to get the container id.
-	out, err := d.Cmd("ps", "-a", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	// Compare against expected output.
-	expectedOutput1 := "nameserver 1.2.3.4"
-	expectedOutput2 := "search example.com"
-	expectedOutput3 := "options timeout:3"
-	out, err = d.Cmd("exec", id, "cat", "/etc/resolv.conf")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput1, check.Commentf("Expected '%s', but got %q", expectedOutput1, out))
-	c.Assert(out, checker.Contains, expectedOutput2, check.Commentf("Expected '%s', but got %q", expectedOutput2, out))
-	c.Assert(out, checker.Contains, expectedOutput3, check.Commentf("Expected '%s', but got %q", expectedOutput3, out))
-}
-
-func (s *DockerSwarmSuite) TestDNSConfigUpdate(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a service
-	name := "top"
-	_, err := d.Cmd("service", "create", "--name", name, "busybox", "top")
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	_, err = d.Cmd("service", "update", "--dns-add=1.2.3.4", "--dns-search-add=example.com", "--dns-option-add=timeout:3", name)
-	c.Assert(err, checker.IsNil)
-
-	out, err := d.Cmd("service", "inspect", "--format", "{{ .Spec.TaskTemplate.ContainerSpec.DNSConfig }}", name)
-	c.Assert(err, checker.IsNil)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "{[1.2.3.4] [example.com] [timeout:3]}")
-}
-
-func (s *DockerSwarmSuite) TestSwarmInitLocked(c *check.C) {
-	d := s.AddDaemon(c, false, false)
-
-	outs, err := d.Cmd("swarm", "init", "--autolock")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	c.Assert(outs, checker.Contains, "docker swarm unlock")
-
-	var unlockKey string
-	for _, line := range strings.Split(outs, "\n") {
-		if strings.Contains(line, "SWMKEY") {
-			unlockKey = strings.TrimSpace(line)
-			break
-		}
-	}
-
-	c.Assert(unlockKey, checker.Not(checker.Equals), "")
-
-	outs, err = d.Cmd("swarm", "unlock-key", "-q")
-	c.Assert(outs, checker.Equals, unlockKey+"\n")
-
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	c.Assert(d.Restart(), checker.IsNil)
-
-	info, err = d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateLocked)
-
-	cmd := d.command("swarm", "unlock")
-	cmd.Stdin = bytes.NewBufferString("wrong-secret-key")
-	out, err := cmd.CombinedOutput()
-	c.Assert(err, checker.NotNil, check.Commentf("out: %v", string(out)))
-	c.Assert(string(out), checker.Contains, "invalid key")
-
-	cmd = d.command("swarm", "unlock")
-	cmd.Stdin = bytes.NewBufferString(unlockKey)
-	out, err = cmd.CombinedOutput()
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", string(out)))
-
-	info, err = d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	outs, err = d.Cmd("node", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(outs, checker.Not(checker.Contains), "Swarm is encrypted and needs to be unlocked")
-
-	outs, err = d.Cmd("swarm", "update", "--autolock=false")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	// Wait for autolock to be turned off
-	time.Sleep(time.Second)
-
-	c.Assert(d.Restart(), checker.IsNil)
-
-	info, err = d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-	outs, err = d.Cmd("node", "ls")
-	c.Assert(err, checker.IsNil)
-	c.Assert(outs, checker.Not(checker.Contains), "Swarm is encrypted and needs to be unlocked")
-}
-
-func (s *DockerSwarmSuite) TestSwarmLeaveLocked(c *check.C) {
-	d := s.AddDaemon(c, false, false)
-
-	outs, err := d.Cmd("swarm", "init", "--autolock")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	c.Assert(d.Restart("--swarm-default-advertise-addr=lo"), checker.IsNil)
-
-	info, err := d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateLocked)
-
-	outs, _ = d.Cmd("node", "ls")
-	c.Assert(outs, checker.Contains, "Swarm is encrypted and needs to be unlocked")
-
-	outs, err = d.Cmd("swarm", "leave", "--force")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	info, err = d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateInactive)
-
-	outs, err = d.Cmd("swarm", "init")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	info, err = d.info()
-	c.Assert(err, checker.IsNil)
-	c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-}
-
-func (s *DockerSwarmSuite) TestSwarmRotateUnlockKey(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	outs, err := d.Cmd("swarm", "update", "--autolock")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-
-	c.Assert(outs, checker.Contains, "docker swarm unlock")
-
-	var unlockKey string
-	for _, line := range strings.Split(outs, "\n") {
-		if strings.Contains(line, "SWMKEY") {
-			unlockKey = strings.TrimSpace(line)
-			break
-		}
-	}
-
-	c.Assert(unlockKey, checker.Not(checker.Equals), "")
-
-	outs, err = d.Cmd("swarm", "unlock-key", "-q")
-	c.Assert(outs, checker.Equals, unlockKey+"\n")
-
-	// Rotate multiple times
-	for i := 0; i != 3; i++ {
-		outs, err = d.Cmd("swarm", "unlock-key", "-q", "--rotate")
-		c.Assert(err, checker.IsNil, check.Commentf("out: %v", outs))
-		// Strip \n
-		newUnlockKey := outs[:len(outs)-1]
-		c.Assert(newUnlockKey, checker.Not(checker.Equals), "")
-		c.Assert(newUnlockKey, checker.Not(checker.Equals), unlockKey)
-
-		c.Assert(d.Restart(), checker.IsNil)
-
-		info, err := d.info()
-		c.Assert(err, checker.IsNil)
-		c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateLocked)
-
-		outs, _ = d.Cmd("node", "ls")
-		c.Assert(outs, checker.Contains, "Swarm is encrypted and needs to be unlocked")
-
-		cmd := d.command("swarm", "unlock")
-		cmd.Stdin = bytes.NewBufferString(unlockKey)
-		out, err := cmd.CombinedOutput()
-
-		if err == nil {
-			// On occasion, the daemon may not have finished
-			// rotating the KEK before restarting. The test is
-			// intentionally written to explore this behavior.
-			// When this happens, unlocking with the old key will
-			// succeed. If we wait for the rotation to happen and
-			// restart again, the new key should be required this
-			// time.
-
-			time.Sleep(3 * time.Second)
-
-			c.Assert(d.Restart(), checker.IsNil)
-
-			cmd = d.command("swarm", "unlock")
-			cmd.Stdin = bytes.NewBufferString(unlockKey)
-			out, err = cmd.CombinedOutput()
-		}
-		c.Assert(err, checker.NotNil, check.Commentf("out: %v", string(out)))
-		c.Assert(string(out), checker.Contains, "invalid key")
-
-		outs, _ = d.Cmd("node", "ls")
-		c.Assert(outs, checker.Contains, "Swarm is encrypted and needs to be unlocked")
-
-		cmd = d.command("swarm", "unlock")
-		cmd.Stdin = bytes.NewBufferString(newUnlockKey)
-		out, err = cmd.CombinedOutput()
-		c.Assert(err, checker.IsNil, check.Commentf("out: %v", string(out)))
-
-		info, err = d.info()
-		c.Assert(err, checker.IsNil)
-		c.Assert(info.LocalNodeState, checker.Equals, swarm.LocalNodeStateActive)
-
-		outs, err = d.Cmd("node", "ls")
-		c.Assert(err, checker.IsNil)
-		c.Assert(outs, checker.Not(checker.Contains), "Swarm is encrypted and needs to be unlocked")
-
-		unlockKey = newUnlockKey
-	}
-}
-
-func (s *DockerSwarmSuite) TestExtraHosts(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	// Create a service
-	name := "top"
-	_, err := d.Cmd("service", "create", "--name", name, "--host=example.com:1.2.3.4", "busybox", "top")
-	c.Assert(err, checker.IsNil)
-
-	// Make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	// We need to get the container id.
-	out, err := d.Cmd("ps", "-a", "-q", "--no-trunc")
-	c.Assert(err, checker.IsNil)
-	id := strings.TrimSpace(out)
-
-	// Compare against expected output.
-	expectedOutput := "1.2.3.4\texample.com"
-	out, err = d.Cmd("exec", id, "cat", "/etc/hosts")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf("Expected '%s', but got %q", expectedOutput, out))
-}
-
-func (s *DockerSwarmSuite) TestSwarmManagerAddress(c *check.C) {
-	d1 := s.AddDaemon(c, true, true)
-	d2 := s.AddDaemon(c, true, false)
-	d3 := s.AddDaemon(c, true, false)
-
-	// Manager Addresses will always show Node 1's address
-	expectedOutput := fmt.Sprintf("Manager Addresses:\n  127.0.0.1:%d\n", d1.port)
-
-	out, err := d1.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-
-	out, err = d2.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-
-	out, err = d3.Cmd("info")
-	c.Assert(err, checker.IsNil)
-	c.Assert(out, checker.Contains, expectedOutput)
-}
-
-func (s *DockerSwarmSuite) TestSwarmServiceInspectPretty(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	name := "top"
-	out, err := d.Cmd("service", "create", "--name", name, "--limit-cpu=0.5", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	expectedOutput := `
-Resources:
- Limits:
-  CPU:		0.5`
-	out, err = d.Cmd("service", "inspect", "--pretty", name)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf(out))
-}
-
-func (s *DockerSwarmSuite) TestSwarmNetworkIPAMOptions(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("network", "create", "-d", "overlay", "--ipam-opt", "foo=bar", "foo")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-
-	out, err = d.Cmd("network", "inspect", "--format", "{{.IPAM.Options}}", "foo")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "map[foo:bar]")
-
-	out, err = d.Cmd("service", "create", "--network=foo", "--name", "top", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	out, err = d.Cmd("network", "inspect", "--format", "{{.IPAM.Options}}", "foo")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(strings.TrimSpace(out), checker.Equals, "map[foo:bar]")
-}
-
-// TODO: migrate to a unit test
-// This test could be migrated to unit test and save costly integration test,
-// once PR #29143 is merged.
-func (s *DockerSwarmSuite) TestSwarmUpdateWithoutArgs(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	expectedOutput := `
-Usage:	docker swarm update [OPTIONS]
-
-Update the swarm
-
-Options:`
-
-	out, err := d.Cmd("swarm", "update")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	c.Assert(out, checker.Contains, expectedOutput, check.Commentf(out))
-}
-
-func (s *DockerTrustedSwarmSuite) TestTrustedServiceCreate(c *check.C) {
-	d := s.swarmSuite.AddDaemon(c, true, true)
-
-	// Attempt creating a service from an image that is known to notary.
-	repoName := s.trustSuite.setupTrustedImage(c, "trusted-pull")
-
-	name := "trusted"
-	serviceCmd := d.command("-D", "service", "create", "--name", name, repoName, "top")
-	s.trustSuite.trustedCmd(serviceCmd)
-	out, _, err := runCommandWithOutput(serviceCmd)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "resolved image tag to", check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--pretty", name)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, repoName+"@", check.Commentf(out))
-
-	// Try trusted service create on an untrusted tag.
-
-	repoName = fmt.Sprintf("%v/untrustedservicecreate/createtest:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	dockerCmd(c, "push", repoName)
-	dockerCmd(c, "rmi", repoName)
-
-	name = "untrusted"
-	serviceCmd = d.command("service", "create", "--name", name, repoName, "top")
-	s.trustSuite.trustedCmd(serviceCmd)
-	out, _, err = runCommandWithOutput(serviceCmd)
-
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Error: remote trust data does not exist", check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--pretty", name)
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-}
-
-func (s *DockerTrustedSwarmSuite) TestTrustedServiceUpdate(c *check.C) {
-	d := s.swarmSuite.AddDaemon(c, true, true)
-
-	// Attempt creating a service from an image that is known to notary.
-	repoName := s.trustSuite.setupTrustedImage(c, "trusted-pull")
-
-	name := "myservice"
-
-	// Create a service without content trust
-	_, err := d.Cmd("service", "create", "--name", name, repoName, "top")
-	c.Assert(err, checker.IsNil)
-
-	out, err := d.Cmd("service", "inspect", "--pretty", name)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	// Daemon won't insert the digest because this is disabled by
-	// DOCKER_SERVICE_PREFER_OFFLINE_IMAGE.
-	c.Assert(out, check.Not(checker.Contains), repoName+"@", check.Commentf(out))
-
-	serviceCmd := d.command("-D", "service", "update", "--image", repoName, name)
-	s.trustSuite.trustedCmd(serviceCmd)
-	out, _, err = runCommandWithOutput(serviceCmd)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "resolved image tag to", check.Commentf(out))
-
-	out, err = d.Cmd("service", "inspect", "--pretty", name)
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, repoName+"@", check.Commentf(out))
-
-	// Try trusted service update on an untrusted tag.
-
-	repoName = fmt.Sprintf("%v/untrustedservicecreate/createtest:latest", privateRegistryURL)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-	dockerCmd(c, "push", repoName)
-	dockerCmd(c, "rmi", repoName)
-
-	serviceCmd = d.command("service", "update", "--image", repoName, name)
-	s.trustSuite.trustedCmd(serviceCmd)
-	out, _, err = runCommandWithOutput(serviceCmd)
-
-	c.Assert(err, check.NotNil, check.Commentf(out))
-	c.Assert(string(out), checker.Contains, "Error: remote trust data does not exist", check.Commentf(out))
-}
-
-// Test case for issue #27866, which did not allow NW name that is the prefix of a swarm NW ID.
-// e.g. if the ingress ID starts with "n1", it was impossible to create a NW named "n1".
-func (s *DockerSwarmSuite) TestSwarmNetworkCreateIssue27866(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	out, err := d.Cmd("network", "inspect", "-f", "{{.Id}}", "ingress")
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	ingressID := strings.TrimSpace(out)
-	c.Assert(ingressID, checker.Not(checker.Equals), "")
-
-	// create a network of which name is the prefix of the ID of an overlay network
-	// (ingressID in this case)
-	newNetName := ingressID[0:2]
-	out, err = d.Cmd("network", "create", "--driver", "overlay", newNetName)
-	// In #27866, it was failing because of "network with name %s already exists"
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-	out, err = d.Cmd("network", "rm", newNetName)
-	c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-}
-
-// Test case for https://github.com/docker/docker/pull/27938#issuecomment-265768303
-// This test creates two networks with the same name sequentially, with various drivers.
-// Since the operations in this test are done sequentially, the 2nd call should fail with
-// "network with name FOO already exists".
-// Note that it is to ok have multiple networks with the same name if the operations are done
-// in parallel. (#18864)
-func (s *DockerSwarmSuite) TestSwarmNetworkCreateDup(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-	drivers := []string{"bridge", "overlay"}
-	for i, driver1 := range drivers {
-		nwName := fmt.Sprintf("network-test-%d", i)
-		for _, driver2 := range drivers {
-			c.Logf("Creating a network named %q with %q, then %q",
-				nwName, driver1, driver2)
-			out, err := d.Cmd("network", "create", "--driver", driver1, nwName)
-			c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-			out, err = d.Cmd("network", "create", "--driver", driver2, nwName)
-			c.Assert(out, checker.Contains,
-				fmt.Sprintf("network with name %s already exists", nwName))
-			c.Assert(err, checker.NotNil)
-			c.Logf("As expected, the attempt to network %q with %q failed: %s",
-				nwName, driver2, out)
-			out, err = d.Cmd("network", "rm", nwName)
-			c.Assert(err, checker.IsNil, check.Commentf("out: %v", out))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_unix_test.go
deleted file mode 100644
index d9e56ce6df..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_swarm_unix_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSwarmSuite) TestSwarmVolumePlugin(c *check.C) {
-	d := s.AddDaemon(c, true, true)
-
-	out, err := d.Cmd("service", "create", "--mount", "type=volume,source=my-volume,destination=/foo,volume-driver=customvolumedriver", "--name", "top", "busybox", "top")
-	c.Assert(err, checker.IsNil, check.Commentf(out))
-
-	// Make sure task stays pending before plugin is available
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkServiceTasksInState("top", swarm.TaskStatePending, "missing plugin on 1 node"), checker.Equals, 1)
-
-	plugin := newVolumePlugin(c, "customvolumedriver")
-	defer plugin.Close()
-
-	// create a dummy volume to trigger lazy loading of the plugin
-	out, err = d.Cmd("volume", "create", "-d", "customvolumedriver", "hello")
-
-	// TODO(aaronl): It will take about 15 seconds for swarm to realize the
-	// plugin was loaded. Switching the test over to plugin v2 would avoid
-	// this long delay.
-
-	// make sure task has been deployed.
-	waitAndAssert(c, defaultReconciliationTimeout, d.checkActiveContainerCount, checker.Equals, 1)
-
-	out, err = d.Cmd("ps", "-q")
-	c.Assert(err, checker.IsNil)
-	containerID := strings.TrimSpace(out)
-
-	out, err = d.Cmd("inspect", "-f", "{{json .Mounts}}", containerID)
-	c.Assert(err, checker.IsNil)
-
-	var mounts []struct {
-		Name   string
-		Driver string
-	}
-
-	c.Assert(json.NewDecoder(strings.NewReader(out)).Decode(&mounts), checker.IsNil)
-	c.Assert(len(mounts), checker.Equals, 1, check.Commentf(out))
-	c.Assert(mounts[0].Name, checker.Equals, "my-volume")
-	c.Assert(mounts[0].Driver, checker.Equals, "customvolumedriver")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_tag_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_tag_test.go
deleted file mode 100644
index b7d2b1dfe6..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_tag_test.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/go-check/check"
-)
-
-// tagging a named image in a new unprefixed repo should work
-func (s *DockerSuite) TestTagUnprefixedRepoByName(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-
-	dockerCmd(c, "tag", "busybox:latest", "testfoobarbaz")
-}
-
-// tagging an image by ID in a new unprefixed repo should work
-func (s *DockerSuite) TestTagUnprefixedRepoByID(c *check.C) {
-	imageID := inspectField(c, "busybox", "Id")
-	dockerCmd(c, "tag", imageID, "testfoobarbaz")
-}
-
-// ensure we don't allow the use of invalid repository names; these tag operations should fail
-func (s *DockerSuite) TestTagInvalidUnprefixedRepo(c *check.C) {
-	invalidRepos := []string{"fo$z$", "Foo@3cc", "Foo$3", "Foo*3", "Fo^3", "Foo!3", "F)xcz(", "fo%asd", "FOO/bar"}
-
-	for _, repo := range invalidRepos {
-		out, _, err := dockerCmdWithError("tag", "busybox", repo)
-		c.Assert(err, checker.NotNil, check.Commentf("tag busybox %v should have failed : %v", repo, out))
-	}
-}
-
-// ensure we don't allow the use of invalid tags; these tag operations should fail
-func (s *DockerSuite) TestTagInvalidPrefixedRepo(c *check.C) {
-	longTag := stringutils.GenerateRandomAlphaOnlyString(121)
-
-	invalidTags := []string{"repo:fo$z$", "repo:Foo@3cc", "repo:Foo$3", "repo:Foo*3", "repo:Fo^3", "repo:Foo!3", "repo:%goodbye", "repo:#hashtagit", "repo:F)xcz(", "repo:-foo", "repo:..", longTag}
-
-	for _, repotag := range invalidTags {
-		out, _, err := dockerCmdWithError("tag", "busybox", repotag)
-		c.Assert(err, checker.NotNil, check.Commentf("tag busybox %v should have failed : %v", repotag, out))
-	}
-}
-
-// ensure we allow the use of valid tags
-func (s *DockerSuite) TestTagValidPrefixedRepo(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-
-	validRepos := []string{"fooo/bar", "fooaa/test", "foooo:t", "HOSTNAME.DOMAIN.COM:443/foo/bar"}
-
-	for _, repo := range validRepos {
-		_, _, err := dockerCmdWithError("tag", "busybox:latest", repo)
-		if err != nil {
-			c.Errorf("tag busybox %v should have worked: %s", repo, err)
-			continue
-		}
-		deleteImages(repo)
-	}
-}
-
-// tag an image with an existed tag name without -f option should work
-func (s *DockerSuite) TestTagExistedNameWithoutForce(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-
-	dockerCmd(c, "tag", "busybox:latest", "busybox:test")
-}
-
-func (s *DockerSuite) TestTagWithPrefixHyphen(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-	// test repository name begin with '-'
-	out, _, err := dockerCmdWithError("tag", "busybox:latest", "-busybox:test")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Error parsing reference", check.Commentf("tag a name begin with '-' should failed"))
-
-	// test namespace name begin with '-'
-	out, _, err = dockerCmdWithError("tag", "busybox:latest", "-test/busybox:test")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Error parsing reference", check.Commentf("tag a name begin with '-' should failed"))
-
-	// test index name begin with '-'
-	out, _, err = dockerCmdWithError("tag", "busybox:latest", "-index:5000/busybox:test")
-	c.Assert(err, checker.NotNil, check.Commentf(out))
-	c.Assert(out, checker.Contains, "Error parsing reference", check.Commentf("tag a name begin with '-' should failed"))
-}
-
-// ensure tagging using official names works
-// ensure all tags result in the same name
-func (s *DockerSuite) TestTagOfficialNames(c *check.C) {
-	names := []string{
-		"docker.io/busybox",
-		"index.docker.io/busybox",
-		"library/busybox",
-		"docker.io/library/busybox",
-		"index.docker.io/library/busybox",
-	}
-
-	for _, name := range names {
-		out, exitCode, err := dockerCmdWithError("tag", "busybox:latest", name+":latest")
-		if err != nil || exitCode != 0 {
-			c.Errorf("tag busybox %v should have worked: %s, %s", name, err, out)
-			continue
-		}
-
-		// ensure we don't have multiple tag names.
-		out, _, err = dockerCmdWithError("images")
-		if err != nil {
-			c.Errorf("listing images failed with errors: %v, %s", err, out)
-		} else if strings.Contains(out, name) {
-			c.Errorf("images should not have listed '%s'", name)
-			deleteImages(name + ":latest")
-		}
-	}
-
-	for _, name := range names {
-		_, exitCode, err := dockerCmdWithError("tag", name+":latest", "fooo/bar:latest")
-		if err != nil || exitCode != 0 {
-			c.Errorf("tag %v fooo/bar should have worked: %s", name, err)
-			continue
-		}
-		deleteImages("fooo/bar:latest")
-	}
-}
-
-// ensure tags can not match digests
-func (s *DockerSuite) TestTagMatchesDigest(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-	digest := "busybox@sha256:abcdef76720241213f5303bda7704ec4c2ef75613173910a56fb1b6e20251507"
-	// test setting tag fails
-	_, _, err := dockerCmdWithError("tag", "busybox:latest", digest)
-	if err == nil {
-		c.Fatal("digest tag a name should have failed")
-	}
-	// check that no new image matches the digest
-	_, _, err = dockerCmdWithError("inspect", digest)
-	if err == nil {
-		c.Fatal("inspecting by digest should have failed")
-	}
-}
-
-func (s *DockerSuite) TestTagInvalidRepoName(c *check.C) {
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-
-	// test setting tag fails
-	_, _, err := dockerCmdWithError("tag", "busybox:latest", "sha256:sometag")
-	if err == nil {
-		c.Fatal("tagging with image named \"sha256\" should have failed")
-	}
-}
-
-// ensure tags cannot create ambiguity with image ids
-func (s *DockerSuite) TestTagTruncationAmbiguity(c *check.C) {
-	//testRequires(c, DaemonIsLinux)
-	// Don't attempt to pull on Windows as not in hub. It's installed
-	// as an image through .ensure-frozen-images-windows
-	if daemonPlatform != "windows" {
-		if err := pullImageIfNotExist("busybox:latest"); err != nil {
-			c.Fatal("couldn't find the busybox:latest image locally and failed to pull it")
-		}
-	}
-	imageID, err := buildImage("notbusybox:latest",
-		`FROM busybox
-		MAINTAINER dockerio`,
-		true)
-	if err != nil {
-		c.Fatal(err)
-	}
-	truncatedImageID := stringid.TruncateID(imageID)
-	truncatedTag := fmt.Sprintf("notbusybox:%s", truncatedImageID)
-
-	id := inspectField(c, truncatedTag, "Id")
-
-	// Ensure inspect by image id returns image for image id
-	c.Assert(id, checker.Equals, imageID)
-	c.Logf("Built image: %s", imageID)
-
-	// test setting tag fails
-	_, _, err = dockerCmdWithError("tag", "busybox:latest", truncatedTag)
-	if err != nil {
-		c.Fatalf("Error tagging with an image id: %s", err)
-	}
-
-	id = inspectField(c, truncatedTag, "Id")
-
-	// Ensure id is imageID and not busybox:latest
-	c.Assert(id, checker.Not(checker.Equals), imageID)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_top_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_top_test.go
deleted file mode 100644
index caae29024a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_top_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestTopMultipleArgs(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	var expected icmd.Expected
-	switch daemonPlatform {
-	case "windows":
-		expected = icmd.Expected{ExitCode: 1, Err: "Windows does not support arguments to top"}
-	default:
-		expected = icmd.Expected{Out: "PID"}
-	}
-	result := dockerCmdWithResult("top", cleanedContainerID, "-o", "pid")
-	c.Assert(result, icmd.Matches, expected)
-}
-
-func (s *DockerSuite) TestTopNonPrivileged(c *check.C) {
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out1, _ := dockerCmd(c, "top", cleanedContainerID)
-	out2, _ := dockerCmd(c, "top", cleanedContainerID)
-	dockerCmd(c, "kill", cleanedContainerID)
-
-	// Windows will list the name of the launched executable which in this case is busybox.exe, without the parameters.
-	// Linux will display the command executed in the container
-	var lookingFor string
-	if daemonPlatform == "windows" {
-		lookingFor = "busybox.exe"
-	} else {
-		lookingFor = "top"
-	}
-
-	c.Assert(out1, checker.Contains, lookingFor, check.Commentf("top should've listed `%s` in the process list, but failed the first time", lookingFor))
-	c.Assert(out2, checker.Contains, lookingFor, check.Commentf("top should've listed `%s` in the process list, but failed the second time", lookingFor))
-}
-
-// TestTopWindowsCoreProcesses validates that there are lines for the critical
-// processes which are found in a Windows container. Note Windows is architecturally
-// very different to Linux in this regard.
-func (s *DockerSuite) TestTopWindowsCoreProcesses(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	out, _ := runSleepingContainer(c, "-d")
-	cleanedContainerID := strings.TrimSpace(out)
-	out1, _ := dockerCmd(c, "top", cleanedContainerID)
-	lookingFor := []string{"smss.exe", "csrss.exe", "wininit.exe", "services.exe", "lsass.exe", "CExecSvc.exe"}
-	for i, s := range lookingFor {
-		c.Assert(out1, checker.Contains, s, check.Commentf("top should've listed `%s` in the process list, but failed. Test case %d", s, i))
-	}
-}
-
-func (s *DockerSuite) TestTopPrivileged(c *check.C) {
-	// Windows does not support --privileged
-	testRequires(c, DaemonIsLinux, NotUserNamespace)
-	out, _ := dockerCmd(c, "run", "--privileged", "-i", "-d", "busybox", "top")
-	cleanedContainerID := strings.TrimSpace(out)
-
-	out1, _ := dockerCmd(c, "top", cleanedContainerID)
-	out2, _ := dockerCmd(c, "top", cleanedContainerID)
-	dockerCmd(c, "kill", cleanedContainerID)
-
-	c.Assert(out1, checker.Contains, "top", check.Commentf("top should've listed `top` in the process list, but failed the first time"))
-	c.Assert(out2, checker.Contains, "top", check.Commentf("top should've listed `top` in the process list, but failed the second time"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_test.go
deleted file mode 100644
index 0b31bb45ff..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package main
-
-import (
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestUpdateRestartPolicy(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "--restart=on-failure:3", "busybox", "sh", "-c", "sleep 1 && false")
-	timeout := 60 * time.Second
-	if daemonPlatform == "windows" {
-		timeout = 180 * time.Second
-	}
-
-	id := strings.TrimSpace(string(out))
-
-	// update restart policy to on-failure:5
-	dockerCmd(c, "update", "--restart=on-failure:5", id)
-
-	err := waitExited(id, timeout)
-	c.Assert(err, checker.IsNil)
-
-	count := inspectField(c, id, "RestartCount")
-	c.Assert(count, checker.Equals, "5")
-
-	maximumRetryCount := inspectField(c, id, "HostConfig.RestartPolicy.MaximumRetryCount")
-	c.Assert(maximumRetryCount, checker.Equals, "5")
-}
-
-func (s *DockerSuite) TestUpdateRestartWithAutoRemoveFlag(c *check.C) {
-	out, _ := runSleepingContainer(c, "--rm")
-	id := strings.TrimSpace(out)
-
-	// update restart policy for an AutoRemove container
-	out, _, err := dockerCmdWithError("update", "--restart=always", id)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Restart policy cannot be updated because AutoRemove is enabled for the container")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go
deleted file mode 100644
index 580ff02602..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/kr/pty"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestUpdateRunningContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "300M", "busybox", "top")
-	dockerCmd(c, "update", "-m", "500M", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.Memory"), checker.Equals, "524288000")
-
-	file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "524288000")
-}
-
-func (s *DockerSuite) TestUpdateRunningContainerWithRestart(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "300M", "busybox", "top")
-	dockerCmd(c, "update", "-m", "500M", name)
-	dockerCmd(c, "restart", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.Memory"), checker.Equals, "524288000")
-
-	file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "524288000")
-}
-
-func (s *DockerSuite) TestUpdateStoppedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-
-	name := "test-update-container"
-	file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
-	dockerCmd(c, "run", "--name", name, "-m", "300M", "busybox", "cat", file)
-	dockerCmd(c, "update", "-m", "500M", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.Memory"), checker.Equals, "524288000")
-
-	out, _ := dockerCmd(c, "start", "-a", name)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "524288000")
-}
-
-func (s *DockerSuite) TestUpdatePausedContainer(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, cpuShare)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "--cpu-shares", "1000", "busybox", "top")
-	dockerCmd(c, "pause", name)
-	dockerCmd(c, "update", "--cpu-shares", "500", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.CPUShares"), checker.Equals, "500")
-
-	dockerCmd(c, "unpause", name)
-	file := "/sys/fs/cgroup/cpu/cpu.shares"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "500")
-}
-
-func (s *DockerSuite) TestUpdateWithUntouchedFields(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, cpuShare)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "300M", "--cpu-shares", "800", "busybox", "top")
-	dockerCmd(c, "update", "-m", "500M", name)
-
-	// Update memory and not touch cpus, `cpuset.cpus` should still have the old value
-	out := inspectField(c, name, "HostConfig.CPUShares")
-	c.Assert(out, check.Equals, "800")
-
-	file := "/sys/fs/cgroup/cpu/cpu.shares"
-	out, _ = dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "800")
-}
-
-func (s *DockerSuite) TestUpdateContainerInvalidValue(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "300M", "busybox", "true")
-	out, _, err := dockerCmdWithError("update", "-m", "2M", name)
-	c.Assert(err, check.NotNil)
-	expected := "Minimum memory limit allowed is 4MB"
-	c.Assert(out, checker.Contains, expected)
-}
-
-func (s *DockerSuite) TestUpdateContainerWithoutFlags(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "-m", "300M", "busybox", "true")
-	_, _, err := dockerCmdWithError("update", name)
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DockerSuite) TestUpdateKernelMemory(c *check.C) {
-	testRequires(c, DaemonIsLinux, kernelMemorySupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "--kernel-memory", "50M", "busybox", "top")
-	dockerCmd(c, "update", "--kernel-memory", "100M", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.KernelMemory"), checker.Equals, "104857600")
-
-	file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "104857600")
-}
-
-func (s *DockerSuite) TestUpdateKernelMemoryUninitialized(c *check.C) {
-	testRequires(c, DaemonIsLinux, kernelMemorySupport)
-
-	isNewKernel := kernel.CheckKernelVersion(4, 6, 0)
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "busybox", "top")
-	_, _, err := dockerCmdWithError("update", "--kernel-memory", "100M", name)
-	// Update kernel memory to a running container without kernel memory initialized
-	// is not allowed before kernel version 4.6.
-	if !isNewKernel {
-		c.Assert(err, check.NotNil)
-	} else {
-		c.Assert(err, check.IsNil)
-	}
-
-	dockerCmd(c, "pause", name)
-	_, _, err = dockerCmdWithError("update", "--kernel-memory", "200M", name)
-	if !isNewKernel {
-		c.Assert(err, check.NotNil)
-	} else {
-		c.Assert(err, check.IsNil)
-	}
-	dockerCmd(c, "unpause", name)
-
-	dockerCmd(c, "stop", name)
-	dockerCmd(c, "update", "--kernel-memory", "300M", name)
-	dockerCmd(c, "start", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.KernelMemory"), checker.Equals, "314572800")
-
-	file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "314572800")
-}
-
-func (s *DockerSuite) TestUpdateSwapMemoryOnly(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "--memory", "300M", "--memory-swap", "500M", "busybox", "top")
-	dockerCmd(c, "update", "--memory-swap", "600M", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.MemorySwap"), checker.Equals, "629145600")
-
-	file := "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "629145600")
-}
-
-func (s *DockerSuite) TestUpdateInvalidSwapMemory(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "--memory", "300M", "--memory-swap", "500M", "busybox", "top")
-	_, _, err := dockerCmdWithError("update", "--memory-swap", "200M", name)
-	// Update invalid swap memory should fail.
-	// This will pass docker config validation, but failed at kernel validation
-	c.Assert(err, check.NotNil)
-
-	// Update invalid swap memory with failure should not change HostConfig
-	c.Assert(inspectField(c, name, "HostConfig.Memory"), checker.Equals, "314572800")
-	c.Assert(inspectField(c, name, "HostConfig.MemorySwap"), checker.Equals, "524288000")
-
-	dockerCmd(c, "update", "--memory-swap", "600M", name)
-
-	c.Assert(inspectField(c, name, "HostConfig.MemorySwap"), checker.Equals, "629145600")
-
-	file := "/sys/fs/cgroup/memory/memory.memsw.limit_in_bytes"
-	out, _ := dockerCmd(c, "exec", name, "cat", file)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "629145600")
-}
-
-func (s *DockerSuite) TestUpdateStats(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, cpuCfsQuota)
-	name := "foo"
-	dockerCmd(c, "run", "-d", "-ti", "--name", name, "-m", "500m", "busybox")
-
-	c.Assert(waitRun(name), checker.IsNil)
-
-	getMemLimit := func(id string) uint64 {
-		resp, body, err := sockRequestRaw("GET", fmt.Sprintf("/containers/%s/stats?stream=false", id), nil, "")
-		c.Assert(err, checker.IsNil)
-		c.Assert(resp.Header.Get("Content-Type"), checker.Equals, "application/json")
-
-		var v *types.Stats
-		err = json.NewDecoder(body).Decode(&v)
-		c.Assert(err, checker.IsNil)
-		body.Close()
-
-		return v.MemoryStats.Limit
-	}
-	preMemLimit := getMemLimit(name)
-
-	dockerCmd(c, "update", "--cpu-quota", "2000", name)
-
-	curMemLimit := getMemLimit(name)
-
-	c.Assert(preMemLimit, checker.Equals, curMemLimit)
-
-}
-
-func (s *DockerSuite) TestUpdateMemoryWithSwapMemory(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testRequires(c, memoryLimitSupport)
-	testRequires(c, swapMemorySupport)
-
-	name := "test-update-container"
-	dockerCmd(c, "run", "-d", "--name", name, "--memory", "300M", "busybox", "top")
-	out, _, err := dockerCmdWithError("update", "--memory", "800M", name)
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Memory limit should be smaller than already set memoryswap limit")
-
-	dockerCmd(c, "update", "--memory", "800M", "--memory-swap", "1000M", name)
-}
-
-func (s *DockerSuite) TestUpdateNotAffectMonitorRestartPolicy(c *check.C) {
-	testRequires(c, DaemonIsLinux, cpuShare)
-
-	out, _ := dockerCmd(c, "run", "-tid", "--restart=always", "busybox", "sh")
-	id := strings.TrimSpace(string(out))
-	dockerCmd(c, "update", "--cpu-shares", "512", id)
-
-	cpty, tty, err := pty.Open()
-	c.Assert(err, checker.IsNil)
-	defer cpty.Close()
-
-	cmd := exec.Command(dockerBinary, "attach", id)
-	cmd.Stdin = tty
-
-	c.Assert(cmd.Start(), checker.IsNil)
-	defer cmd.Process.Kill()
-
-	_, err = cpty.Write([]byte("exit\n"))
-	c.Assert(err, checker.IsNil)
-
-	c.Assert(cmd.Wait(), checker.IsNil)
-
-	// container should restart again and keep running
-	err = waitInspect(id, "{{.RestartCount}}", "1", 30*time.Second)
-	c.Assert(err, checker.IsNil)
-	c.Assert(waitRun(id), checker.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_userns_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_userns_test.go
deleted file mode 100644
index acf74238b2..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_userns_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/system"
-	"github.com/go-check/check"
-)
-
-// user namespaces test: run daemon with remapped root setting
-// 1. validate uid/gid maps are set properly
-// 2. verify that files created are owned by remapped root
-func (s *DockerDaemonSuite) TestDaemonUserNamespaceRootSetting(c *check.C) {
-	testRequires(c, DaemonIsLinux, SameHostDaemon, UserNamespaceInKernel)
-
-	c.Assert(s.d.StartWithBusybox("--userns-remap", "default"), checker.IsNil)
-
-	tmpDir, err := ioutil.TempDir("", "userns")
-	c.Assert(err, checker.IsNil)
-
-	defer os.RemoveAll(tmpDir)
-
-	// Set a non-existent path
-	tmpDirNotExists := path.Join(os.TempDir(), "userns"+stringid.GenerateRandomID())
-	defer os.RemoveAll(tmpDirNotExists)
-
-	// we need to find the uid and gid of the remapped root from the daemon's root dir info
-	uidgid := strings.Split(filepath.Base(s.d.root), ".")
-	c.Assert(uidgid, checker.HasLen, 2, check.Commentf("Should have gotten uid/gid strings from root dirname: %s", filepath.Base(s.d.root)))
-	uid, err := strconv.Atoi(uidgid[0])
-	c.Assert(err, checker.IsNil, check.Commentf("Can't parse uid"))
-	gid, err := strconv.Atoi(uidgid[1])
-	c.Assert(err, checker.IsNil, check.Commentf("Can't parse gid"))
-
-	// writable by the remapped root UID/GID pair
-	c.Assert(os.Chown(tmpDir, uid, gid), checker.IsNil)
-
-	out, err := s.d.Cmd("run", "-d", "--name", "userns", "-v", tmpDir+":/goofy", "-v", tmpDirNotExists+":/donald", "busybox", "sh", "-c", "touch /goofy/testfile; top")
-	c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
-	user := s.findUser(c, "userns")
-	c.Assert(uidgid[0], checker.Equals, user)
-
-	// check that the created directory is owned by remapped uid:gid
-	statNotExists, err := system.Stat(tmpDirNotExists)
-	c.Assert(err, checker.IsNil)
-	c.Assert(statNotExists.UID(), checker.Equals, uint32(uid), check.Commentf("Created directory not owned by remapped root UID"))
-	c.Assert(statNotExists.GID(), checker.Equals, uint32(gid), check.Commentf("Created directory not owned by remapped root GID"))
-
-	pid, err := s.d.Cmd("inspect", "--format={{.State.Pid}}", "userns")
-	c.Assert(err, checker.IsNil, check.Commentf("Could not inspect running container: out: %q", pid))
-	// check the uid and gid maps for the PID to ensure root is remapped
-	// (cmd = cat /proc/<pid>/uid_map | grep -E '0\s+9999\s+1')
-	out, rc1, err := runCommandPipelineWithOutput(
-		exec.Command("cat", "/proc/"+strings.TrimSpace(pid)+"/uid_map"),
-		exec.Command("grep", "-E", fmt.Sprintf("0[[:space:]]+%d[[:space:]]+", uid)))
-	c.Assert(rc1, checker.Equals, 0, check.Commentf("Didn't match uid_map: output: %s", out))
-
-	out, rc2, err := runCommandPipelineWithOutput(
-		exec.Command("cat", "/proc/"+strings.TrimSpace(pid)+"/gid_map"),
-		exec.Command("grep", "-E", fmt.Sprintf("0[[:space:]]+%d[[:space:]]+", gid)))
-	c.Assert(rc2, checker.Equals, 0, check.Commentf("Didn't match gid_map: output: %s", out))
-
-	// check that the touched file is owned by remapped uid:gid
-	stat, err := system.Stat(filepath.Join(tmpDir, "testfile"))
-	c.Assert(err, checker.IsNil)
-	c.Assert(stat.UID(), checker.Equals, uint32(uid), check.Commentf("Touched file not owned by remapped root UID"))
-	c.Assert(stat.GID(), checker.Equals, uint32(gid), check.Commentf("Touched file not owned by remapped root GID"))
-
-	// use host usernamespace
-	out, err = s.d.Cmd("run", "-d", "--name", "userns_skip", "--userns", "host", "busybox", "sh", "-c", "touch /goofy/testfile; top")
-	c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
-	user = s.findUser(c, "userns_skip")
-	// userns are skipped, user is root
-	c.Assert(user, checker.Equals, "root")
-}
-
-// findUser finds the uid or name of the user of the first process that runs in a container
-func (s *DockerDaemonSuite) findUser(c *check.C, container string) string {
-	out, err := s.d.Cmd("top", container)
-	c.Assert(err, checker.IsNil, check.Commentf("Output: %s", out))
-	rows := strings.Split(out, "\n")
-	if len(rows) < 2 {
-		// No process rows founds
-		c.FailNow()
-	}
-	return strings.Fields(rows[1])[0]
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_v2_only_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_v2_only_test.go
deleted file mode 100644
index 889936a062..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_v2_only_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-
-	"github.com/go-check/check"
-)
-
-func makefile(contents string) (string, func(), error) {
-	cleanup := func() {
-
-	}
-
-	f, err := ioutil.TempFile(".", "tmp")
-	if err != nil {
-		return "", cleanup, err
-	}
-	err = ioutil.WriteFile(f.Name(), []byte(contents), os.ModePerm)
-	if err != nil {
-		return "", cleanup, err
-	}
-
-	cleanup = func() {
-		err := os.Remove(f.Name())
-		if err != nil {
-			fmt.Println("Error removing tmpfile")
-		}
-	}
-	return f.Name(), cleanup, nil
-
-}
-
-// TestV2Only ensures that a daemon in v2-only mode does not
-// attempt to contact any v1 registry endpoints.
-func (s *DockerRegistrySuite) TestV2Only(c *check.C) {
-	reg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-
-	reg.registerHandler("/v2/", func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(404)
-	})
-
-	reg.registerHandler("/v1/.*", func(w http.ResponseWriter, r *http.Request) {
-		c.Fatal("V1 registry contacted")
-	})
-
-	repoName := fmt.Sprintf("%s/busybox", reg.hostport)
-
-	err = s.d.Start("--insecure-registry", reg.hostport, "--disable-legacy-registry=true")
-	c.Assert(err, check.IsNil)
-
-	dockerfileName, cleanup, err := makefile(fmt.Sprintf("FROM %s/busybox", reg.hostport))
-	c.Assert(err, check.IsNil, check.Commentf("Unable to create test dockerfile"))
-	defer cleanup()
-
-	s.d.Cmd("build", "--file", dockerfileName, ".")
-
-	s.d.Cmd("run", repoName)
-	s.d.Cmd("login", "-u", "richard", "-p", "testtest", "-e", "testuser@testdomain.com", reg.hostport)
-	s.d.Cmd("tag", "busybox", repoName)
-	s.d.Cmd("push", repoName)
-	s.d.Cmd("pull", repoName)
-}
-
-// TestV1 starts a daemon in 'normal' mode
-// and ensure v1 endpoints are hit for the following operations:
-// login, push, pull, build & run
-func (s *DockerRegistrySuite) TestV1(c *check.C) {
-	reg, err := newTestRegistry(c)
-	c.Assert(err, check.IsNil)
-
-	v2Pings := 0
-	reg.registerHandler("/v2/", func(w http.ResponseWriter, r *http.Request) {
-		v2Pings++
-		// V2 ping 404 causes fallback to v1
-		w.WriteHeader(404)
-	})
-
-	v1Pings := 0
-	reg.registerHandler("/v1/_ping", func(w http.ResponseWriter, r *http.Request) {
-		v1Pings++
-	})
-
-	v1Logins := 0
-	reg.registerHandler("/v1/users/", func(w http.ResponseWriter, r *http.Request) {
-		v1Logins++
-	})
-
-	v1Repo := 0
-	reg.registerHandler("/v1/repositories/busybox/", func(w http.ResponseWriter, r *http.Request) {
-		v1Repo++
-	})
-
-	reg.registerHandler("/v1/repositories/busybox/images", func(w http.ResponseWriter, r *http.Request) {
-		v1Repo++
-	})
-
-	err = s.d.Start("--insecure-registry", reg.hostport, "--disable-legacy-registry=false")
-	c.Assert(err, check.IsNil)
-
-	dockerfileName, cleanup, err := makefile(fmt.Sprintf("FROM %s/busybox", reg.hostport))
-	c.Assert(err, check.IsNil, check.Commentf("Unable to create test dockerfile"))
-	defer cleanup()
-
-	s.d.Cmd("build", "--file", dockerfileName, ".")
-	c.Assert(v1Repo, check.Equals, 1, check.Commentf("Expected v1 repository access after build"))
-
-	repoName := fmt.Sprintf("%s/busybox", reg.hostport)
-	s.d.Cmd("run", repoName)
-	c.Assert(v1Repo, check.Equals, 2, check.Commentf("Expected v1 repository access after run"))
-
-	s.d.Cmd("login", "-u", "richard", "-p", "testtest", reg.hostport)
-	c.Assert(v1Logins, check.Equals, 1, check.Commentf("Expected v1 login attempt"))
-
-	s.d.Cmd("tag", "busybox", repoName)
-	s.d.Cmd("push", repoName)
-
-	c.Assert(v1Repo, check.Equals, 2)
-
-	s.d.Cmd("pull", repoName)
-	c.Assert(v1Repo, check.Equals, 3, check.Commentf("Expected v1 repository access after pull"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_version_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_version_test.go
deleted file mode 100644
index 7672beb732..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_version_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-import (
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// ensure docker version works
-func (s *DockerSuite) TestVersionEnsureSucceeds(c *check.C) {
-	out, _ := dockerCmd(c, "version")
-	stringsToCheck := map[string]int{
-		"Client:":       1,
-		"Server:":       1,
-		" Version:":     2,
-		" API version:": 2,
-		" Go version:":  2,
-		" Git commit:":  2,
-		" OS/Arch:":     2,
-		" Built:":       2,
-	}
-
-	for k, v := range stringsToCheck {
-		c.Assert(strings.Count(out, k), checker.Equals, v, check.Commentf("The count of %v in %s does not match excepted", k, out))
-	}
-}
-
-// ensure the Windows daemon return the correct platform string
-func (s *DockerSuite) TestVersionPlatform_w(c *check.C) {
-	testRequires(c, DaemonIsWindows)
-	testVersionPlatform(c, "windows/amd64")
-}
-
-// ensure the Linux daemon return the correct platform string
-func (s *DockerSuite) TestVersionPlatform_l(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	testVersionPlatform(c, "linux")
-}
-
-func testVersionPlatform(c *check.C, platform string) {
-	out, _ := dockerCmd(c, "version")
-	expected := "OS/Arch:      " + platform
-
-	split := strings.Split(out, "\n")
-	c.Assert(len(split) >= 14, checker.Equals, true, check.Commentf("got %d lines from version", len(split)))
-
-	// Verify the second 'OS/Arch' matches the platform. Experimental has
-	// more lines of output than 'regular'
-	bFound := false
-	for i := 14; i < len(split); i++ {
-		if strings.Contains(split[i], expected) {
-			bFound = true
-			break
-		}
-	}
-	c.Assert(bFound, checker.Equals, true, check.Commentf("Could not find server '%s' in '%s'", expected, out))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_volume_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_volume_test.go
deleted file mode 100644
index 61a9413758..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_volume_test.go
+++ /dev/null
@@ -1,427 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/go-check/check"
-)
-
-func (s *DockerSuite) TestVolumeCLICreate(c *check.C) {
-	dockerCmd(c, "volume", "create")
-
-	_, err := runCommand(exec.Command(dockerBinary, "volume", "create", "-d", "nosuchdriver"))
-	c.Assert(err, check.Not(check.IsNil))
-
-	// test using hidden --name option
-	out, _ := dockerCmd(c, "volume", "create", "--name=test")
-	name := strings.TrimSpace(out)
-	c.Assert(name, check.Equals, "test")
-
-	out, _ = dockerCmd(c, "volume", "create", "test2")
-	name = strings.TrimSpace(out)
-	c.Assert(name, check.Equals, "test2")
-}
-
-func (s *DockerSuite) TestVolumeCLIInspect(c *check.C) {
-	c.Assert(
-		exec.Command(dockerBinary, "volume", "inspect", "doesntexist").Run(),
-		check.Not(check.IsNil),
-		check.Commentf("volume inspect should error on non-existent volume"),
-	)
-
-	out, _ := dockerCmd(c, "volume", "create")
-	name := strings.TrimSpace(out)
-	out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Name }}", name)
-	c.Assert(strings.TrimSpace(out), check.Equals, name)
-
-	dockerCmd(c, "volume", "create", "test")
-	out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Name }}", "test")
-	c.Assert(strings.TrimSpace(out), check.Equals, "test")
-}
-
-func (s *DockerSuite) TestVolumeCLIInspectMulti(c *check.C) {
-	dockerCmd(c, "volume", "create", "test1")
-	dockerCmd(c, "volume", "create", "test2")
-	dockerCmd(c, "volume", "create", "not-shown")
-
-	result := dockerCmdWithResult("volume", "inspect", "--format={{ .Name }}", "test1", "test2", "doesntexist", "not-shown")
-	c.Assert(result, icmd.Matches, icmd.Expected{
-		ExitCode: 1,
-		Err:      "No such volume: doesntexist",
-	})
-
-	out := result.Stdout()
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 2, check.Commentf("\n%s", out))
-
-	c.Assert(out, checker.Contains, "test1")
-	c.Assert(out, checker.Contains, "test2")
-	c.Assert(out, checker.Not(checker.Contains), "not-shown")
-}
-
-func (s *DockerSuite) TestVolumeCLILs(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	dockerCmd(c, "volume", "create", "aaa")
-
-	dockerCmd(c, "volume", "create", "test")
-
-	dockerCmd(c, "volume", "create", "soo")
-	dockerCmd(c, "run", "-v", "soo:"+prefix+"/foo", "busybox", "ls", "/")
-
-	out, _ := dockerCmd(c, "volume", "ls")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 4, check.Commentf("\n%s", out))
-
-	assertVolList(c, out, []string{"aaa", "soo", "test"})
-}
-
-func (s *DockerSuite) TestVolumeLsFormat(c *check.C) {
-	dockerCmd(c, "volume", "create", "aaa")
-	dockerCmd(c, "volume", "create", "test")
-	dockerCmd(c, "volume", "create", "soo")
-
-	out, _ := dockerCmd(c, "volume", "ls", "--format", "{{.Name}}")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-
-	expected := []string{"aaa", "soo", "test"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))
-}
-
-func (s *DockerSuite) TestVolumeLsFormatDefaultFormat(c *check.C) {
-	dockerCmd(c, "volume", "create", "aaa")
-	dockerCmd(c, "volume", "create", "test")
-	dockerCmd(c, "volume", "create", "soo")
-
-	config := `{
-		"volumesFormat": "{{ .Name }} default"
-}`
-	d, err := ioutil.TempDir("", "integration-cli-")
-	c.Assert(err, checker.IsNil)
-	defer os.RemoveAll(d)
-
-	err = ioutil.WriteFile(filepath.Join(d, "config.json"), []byte(config), 0644)
-	c.Assert(err, checker.IsNil)
-
-	out, _ := dockerCmd(c, "--config", d, "volume", "ls")
-	lines := strings.Split(strings.TrimSpace(string(out)), "\n")
-
-	expected := []string{"aaa default", "soo default", "test default"}
-	var names []string
-	names = append(names, lines...)
-	c.Assert(expected, checker.DeepEquals, names, check.Commentf("Expected array with truncated names: %v, got: %v", expected, names))
-}
-
-// assertVolList checks volume retrieved with ls command
-// equals to expected volume list
-// note: out should be `volume ls [option]` result
-func assertVolList(c *check.C, out string, expectVols []string) {
-	lines := strings.Split(out, "\n")
-	var volList []string
-	for _, line := range lines[1 : len(lines)-1] {
-		volFields := strings.Fields(line)
-		// wrap all volume name in volList
-		volList = append(volList, volFields[1])
-	}
-
-	// volume ls should contains all expected volumes
-	c.Assert(volList, checker.DeepEquals, expectVols)
-}
-
-func (s *DockerSuite) TestVolumeCLILsFilterDangling(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	dockerCmd(c, "volume", "create", "testnotinuse1")
-	dockerCmd(c, "volume", "create", "testisinuse1")
-	dockerCmd(c, "volume", "create", "testisinuse2")
-
-	// Make sure both "created" (but not started), and started
-	// containers are included in reference counting
-	dockerCmd(c, "run", "--name", "volume-test1", "-v", "testisinuse1:"+prefix+"/foo", "busybox", "true")
-	dockerCmd(c, "create", "--name", "volume-test2", "-v", "testisinuse2:"+prefix+"/foo", "busybox", "true")
-
-	out, _ := dockerCmd(c, "volume", "ls")
-
-	// No filter, all volumes should show
-	c.Assert(out, checker.Contains, "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse1\n", check.Commentf("expected volume 'testisinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse2\n", check.Commentf("expected volume 'testisinuse2' in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "dangling=false")
-
-	// Explicitly disabling dangling
-	c.Assert(out, check.Not(checker.Contains), "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse1\n", check.Commentf("expected volume 'testisinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse2\n", check.Commentf("expected volume 'testisinuse2' in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "dangling=true")
-
-	// Filter "dangling" volumes; only "dangling" (unused) volumes should be in the output
-	c.Assert(out, checker.Contains, "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, check.Not(checker.Contains), "testisinuse1\n", check.Commentf("volume 'testisinuse1' in output, but not expected"))
-	c.Assert(out, check.Not(checker.Contains), "testisinuse2\n", check.Commentf("volume 'testisinuse2' in output, but not expected"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "dangling=1")
-	// Filter "dangling" volumes; only "dangling" (unused) volumes should be in the output, dangling also accept 1
-	c.Assert(out, checker.Contains, "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, check.Not(checker.Contains), "testisinuse1\n", check.Commentf("volume 'testisinuse1' in output, but not expected"))
-	c.Assert(out, check.Not(checker.Contains), "testisinuse2\n", check.Commentf("volume 'testisinuse2' in output, but not expected"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "dangling=0")
-	// dangling=0 is same as dangling=false case
-	c.Assert(out, check.Not(checker.Contains), "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse1\n", check.Commentf("expected volume 'testisinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse2\n", check.Commentf("expected volume 'testisinuse2' in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "name=testisin")
-	c.Assert(out, check.Not(checker.Contains), "testnotinuse1\n", check.Commentf("expected volume 'testnotinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse1\n", check.Commentf("execpeted volume 'testisinuse1' in output"))
-	c.Assert(out, checker.Contains, "testisinuse2\n", check.Commentf("expected volume 'testisinuse2' in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "driver=invalidDriver")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("%s\n", out))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "driver=local")
-	outArr = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 4, check.Commentf("\n%s", out))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "driver=loc")
-	outArr = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 4, check.Commentf("\n%s", out))
-
-}
-
-func (s *DockerSuite) TestVolumeCLILsErrorWithInvalidFilterName(c *check.C) {
-	out, _, err := dockerCmdWithError("volume", "ls", "-f", "FOO=123")
-	c.Assert(err, checker.NotNil)
-	c.Assert(out, checker.Contains, "Invalid filter")
-}
-
-func (s *DockerSuite) TestVolumeCLILsWithIncorrectFilterValue(c *check.C) {
-	out, _, err := dockerCmdWithError("volume", "ls", "-f", "dangling=invalid")
-	c.Assert(err, check.NotNil)
-	c.Assert(out, checker.Contains, "Invalid filter")
-}
-
-func (s *DockerSuite) TestVolumeCLIRm(c *check.C) {
-	prefix, _ := getPrefixAndSlashFromDaemonPlatform()
-	out, _ := dockerCmd(c, "volume", "create")
-	id := strings.TrimSpace(out)
-
-	dockerCmd(c, "volume", "create", "test")
-	dockerCmd(c, "volume", "rm", id)
-	dockerCmd(c, "volume", "rm", "test")
-
-	out, _ = dockerCmd(c, "volume", "ls")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("%s\n", out))
-
-	volumeID := "testing"
-	dockerCmd(c, "run", "-v", volumeID+":"+prefix+"/foo", "--name=test", "busybox", "sh", "-c", "echo hello > /foo/bar")
-	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "volume", "rm", "testing"))
-	c.Assert(
-		err,
-		check.Not(check.IsNil),
-		check.Commentf("Should not be able to remove volume that is in use by a container\n%s", out))
-
-	out, _ = dockerCmd(c, "run", "--volumes-from=test", "--name=test2", "busybox", "sh", "-c", "cat /foo/bar")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello")
-	dockerCmd(c, "rm", "-fv", "test2")
-	dockerCmd(c, "volume", "inspect", volumeID)
-	dockerCmd(c, "rm", "-f", "test")
-
-	out, _ = dockerCmd(c, "run", "--name=test2", "-v", volumeID+":"+prefix+"/foo", "busybox", "sh", "-c", "cat /foo/bar")
-	c.Assert(strings.TrimSpace(out), check.Equals, "hello", check.Commentf("volume data was removed"))
-	dockerCmd(c, "rm", "test2")
-
-	dockerCmd(c, "volume", "rm", volumeID)
-	c.Assert(
-		exec.Command("volume", "rm", "doesntexist").Run(),
-		check.Not(check.IsNil),
-		check.Commentf("volume rm should fail with non-existent volume"),
-	)
-}
-
-func (s *DockerSuite) TestVolumeCLINoArgs(c *check.C) {
-	out, _ := dockerCmd(c, "volume")
-	// no args should produce the cmd usage output
-	usage := "Usage:	docker volume COMMAND"
-	c.Assert(out, checker.Contains, usage)
-
-	// invalid arg should error and show the command usage on stderr
-	_, stderr, _, err := runCommandWithStdoutStderr(exec.Command(dockerBinary, "volume", "somearg"))
-	c.Assert(err, check.NotNil, check.Commentf(stderr))
-	c.Assert(stderr, checker.Contains, usage)
-
-	// invalid flag should error and show the flag error and cmd usage
-	_, stderr, _, err = runCommandWithStdoutStderr(exec.Command(dockerBinary, "volume", "--no-such-flag"))
-	c.Assert(err, check.NotNil, check.Commentf(stderr))
-	c.Assert(stderr, checker.Contains, usage)
-	c.Assert(stderr, checker.Contains, "unknown flag: --no-such-flag")
-}
-
-func (s *DockerSuite) TestVolumeCLIInspectTmplError(c *check.C) {
-	out, _ := dockerCmd(c, "volume", "create")
-	name := strings.TrimSpace(out)
-
-	out, exitCode, err := dockerCmdWithError("volume", "inspect", "--format='{{ .FooBar }}'", name)
-	c.Assert(err, checker.NotNil, check.Commentf("Output: %s", out))
-	c.Assert(exitCode, checker.Equals, 1, check.Commentf("Output: %s", out))
-	c.Assert(out, checker.Contains, "Template parsing error")
-}
-
-func (s *DockerSuite) TestVolumeCLICreateWithOpts(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	dockerCmd(c, "volume", "create", "-d", "local", "test", "--opt=type=tmpfs", "--opt=device=tmpfs", "--opt=o=size=1m,uid=1000")
-	out, _ := dockerCmd(c, "run", "-v", "test:/foo", "busybox", "mount")
-
-	mounts := strings.Split(out, "\n")
-	var found bool
-	for _, m := range mounts {
-		if strings.Contains(m, "/foo") {
-			found = true
-			info := strings.Fields(m)
-			// tmpfs on <path> type tmpfs (rw,relatime,size=1024k,uid=1000)
-			c.Assert(info[0], checker.Equals, "tmpfs")
-			c.Assert(info[2], checker.Equals, "/foo")
-			c.Assert(info[4], checker.Equals, "tmpfs")
-			c.Assert(info[5], checker.Contains, "uid=1000")
-			c.Assert(info[5], checker.Contains, "size=1024k")
-		}
-	}
-	c.Assert(found, checker.Equals, true)
-}
-
-func (s *DockerSuite) TestVolumeCLICreateLabel(c *check.C) {
-	testVol := "testvolcreatelabel"
-	testLabel := "foo"
-	testValue := "bar"
-
-	out, _, err := dockerCmdWithError("volume", "create", "--label", testLabel+"="+testValue, testVol)
-	c.Assert(err, check.IsNil)
-
-	out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Labels."+testLabel+" }}", testVol)
-	c.Assert(strings.TrimSpace(out), check.Equals, testValue)
-}
-
-func (s *DockerSuite) TestVolumeCLICreateLabelMultiple(c *check.C) {
-	testVol := "testvolcreatelabel"
-
-	testLabels := map[string]string{
-		"foo": "bar",
-		"baz": "foo",
-	}
-
-	args := []string{
-		"volume",
-		"create",
-		testVol,
-	}
-
-	for k, v := range testLabels {
-		args = append(args, "--label", k+"="+v)
-	}
-
-	out, _, err := dockerCmdWithError(args...)
-	c.Assert(err, check.IsNil)
-
-	for k, v := range testLabels {
-		out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Labels."+k+" }}", testVol)
-		c.Assert(strings.TrimSpace(out), check.Equals, v)
-	}
-}
-
-func (s *DockerSuite) TestVolumeCLILsFilterLabels(c *check.C) {
-	testVol1 := "testvolcreatelabel-1"
-	out, _, err := dockerCmdWithError("volume", "create", "--label", "foo=bar1", testVol1)
-	c.Assert(err, check.IsNil)
-
-	testVol2 := "testvolcreatelabel-2"
-	out, _, err = dockerCmdWithError("volume", "create", "--label", "foo=bar2", testVol2)
-	c.Assert(err, check.IsNil)
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "label=foo")
-
-	// filter with label=key
-	c.Assert(out, checker.Contains, "testvolcreatelabel-1\n", check.Commentf("expected volume 'testvolcreatelabel-1' in output"))
-	c.Assert(out, checker.Contains, "testvolcreatelabel-2\n", check.Commentf("expected volume 'testvolcreatelabel-2' in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "label=foo=bar1")
-
-	// filter with label=key=value
-	c.Assert(out, checker.Contains, "testvolcreatelabel-1\n", check.Commentf("expected volume 'testvolcreatelabel-1' in output"))
-	c.Assert(out, check.Not(checker.Contains), "testvolcreatelabel-2\n", check.Commentf("expected volume 'testvolcreatelabel-2 in output"))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "label=non-exist")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("\n%s", out))
-
-	out, _ = dockerCmd(c, "volume", "ls", "--filter", "label=foo=non-exist")
-	outArr = strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("\n%s", out))
-}
-
-func (s *DockerSuite) TestVolumeCLIRmForceUsage(c *check.C) {
-	out, _ := dockerCmd(c, "volume", "create")
-	id := strings.TrimSpace(out)
-
-	dockerCmd(c, "volume", "rm", "-f", id)
-	dockerCmd(c, "volume", "rm", "--force", "nonexist")
-
-	out, _ = dockerCmd(c, "volume", "ls")
-	outArr := strings.Split(strings.TrimSpace(out), "\n")
-	c.Assert(len(outArr), check.Equals, 1, check.Commentf("%s\n", out))
-}
-
-func (s *DockerSuite) TestVolumeCLIRmForce(c *check.C) {
-	testRequires(c, SameHostDaemon, DaemonIsLinux)
-
-	name := "test"
-	out, _ := dockerCmd(c, "volume", "create", name)
-	id := strings.TrimSpace(out)
-	c.Assert(id, checker.Equals, name)
-
-	out, _ = dockerCmd(c, "volume", "inspect", "--format", "{{.Mountpoint}}", name)
-	c.Assert(strings.TrimSpace(out), checker.Not(checker.Equals), "")
-	// Mountpoint is in the form of "/var/lib/docker/volumes/.../_data", removing `/_data`
-	path := strings.TrimSuffix(strings.TrimSpace(out), "/_data")
-	out, _, err := runCommandWithOutput(exec.Command("rm", "-rf", path))
-	c.Assert(err, check.IsNil)
-
-	dockerCmd(c, "volume", "rm", "-f", "test")
-	out, _ = dockerCmd(c, "volume", "ls")
-	c.Assert(out, checker.Not(checker.Contains), name)
-	dockerCmd(c, "volume", "create", "test")
-	out, _ = dockerCmd(c, "volume", "ls")
-	c.Assert(out, checker.Contains, name)
-}
-
-func (s *DockerSuite) TestVolumeCliInspectWithVolumeOpts(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-
-	// Without options
-	name := "test1"
-	dockerCmd(c, "volume", "create", "-d", "local", name)
-	out, _ := dockerCmd(c, "volume", "inspect", "--format={{ .Options }}", name)
-	c.Assert(strings.TrimSpace(out), checker.Contains, "map[]")
-
-	// With options
-	name = "test2"
-	k1, v1 := "type", "tmpfs"
-	k2, v2 := "device", "tmpfs"
-	k3, v3 := "o", "size=1m,uid=1000"
-	dockerCmd(c, "volume", "create", "-d", "local", name, "--opt", fmt.Sprintf("%s=%s", k1, v1), "--opt", fmt.Sprintf("%s=%s", k2, v2), "--opt", fmt.Sprintf("%s=%s", k3, v3))
-	out, _ = dockerCmd(c, "volume", "inspect", "--format={{ .Options }}", name)
-	c.Assert(strings.TrimSpace(out), checker.Contains, fmt.Sprintf("%s:%s", k1, v1))
-	c.Assert(strings.TrimSpace(out), checker.Contains, fmt.Sprintf("%s:%s", k2, v2))
-	c.Assert(strings.TrimSpace(out), checker.Contains, fmt.Sprintf("%s:%s", k3, v3))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_wait_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_wait_test.go
deleted file mode 100644
index 961aef5525..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_cli_wait_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// non-blocking wait with 0 exit code
-func (s *DockerSuite) TestWaitNonBlockedExitZero(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "true")
-	containerID := strings.TrimSpace(out)
-
-	err := waitInspect(containerID, "{{.State.Running}}", "false", 30*time.Second)
-	c.Assert(err, checker.IsNil) //Container should have stopped by now
-
-	out, _ = dockerCmd(c, "wait", containerID)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "0", check.Commentf("failed to set up container, %v", out))
-
-}
-
-// blocking wait with 0 exit code
-func (s *DockerSuite) TestWaitBlockedExitZero(c *check.C) {
-	// Windows busybox does not support trap in this way, not sleep with sub-second
-	// granularity. It will always exit 0x40010004.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "trap 'exit 0' TERM; while true; do usleep 10; done")
-	containerID := strings.TrimSpace(out)
-
-	c.Assert(waitRun(containerID), checker.IsNil)
-
-	chWait := make(chan string)
-	go func() {
-		chWait <- ""
-		out, _, _ := runCommandWithOutput(exec.Command(dockerBinary, "wait", containerID))
-		chWait <- out
-	}()
-
-	<-chWait // make sure the goroutine is started
-	time.Sleep(100 * time.Millisecond)
-	dockerCmd(c, "stop", containerID)
-
-	select {
-	case status := <-chWait:
-		c.Assert(strings.TrimSpace(status), checker.Equals, "0", check.Commentf("expected exit 0, got %s", status))
-	case <-time.After(2 * time.Second):
-		c.Fatal("timeout waiting for `docker wait` to exit")
-	}
-
-}
-
-// non-blocking wait with random exit code
-func (s *DockerSuite) TestWaitNonBlockedExitRandom(c *check.C) {
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "sh", "-c", "exit 99")
-	containerID := strings.TrimSpace(out)
-
-	err := waitInspect(containerID, "{{.State.Running}}", "false", 30*time.Second)
-	c.Assert(err, checker.IsNil) //Container should have stopped by now
-	out, _ = dockerCmd(c, "wait", containerID)
-	c.Assert(strings.TrimSpace(out), checker.Equals, "99", check.Commentf("failed to set up container, %v", out))
-
-}
-
-// blocking wait with random exit code
-func (s *DockerSuite) TestWaitBlockedExitRandom(c *check.C) {
-	// Cannot run on Windows as trap in Windows busybox does not support trap in this way.
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "run", "-d", "busybox", "/bin/sh", "-c", "trap 'exit 99' TERM; while true; do usleep 10; done")
-	containerID := strings.TrimSpace(out)
-	c.Assert(waitRun(containerID), checker.IsNil)
-
-	chWait := make(chan error)
-	waitCmd := exec.Command(dockerBinary, "wait", containerID)
-	waitCmdOut := bytes.NewBuffer(nil)
-	waitCmd.Stdout = waitCmdOut
-	c.Assert(waitCmd.Start(), checker.IsNil)
-	go func() {
-		chWait <- waitCmd.Wait()
-	}()
-
-	dockerCmd(c, "stop", containerID)
-
-	select {
-	case err := <-chWait:
-		c.Assert(err, checker.IsNil, check.Commentf(waitCmdOut.String()))
-		status, err := waitCmdOut.ReadString('\n')
-		c.Assert(err, checker.IsNil)
-		c.Assert(strings.TrimSpace(status), checker.Equals, "99", check.Commentf("expected exit 99, got %s", status))
-	case <-time.After(2 * time.Second):
-		waitCmd.Process.Kill()
-		c.Fatal("timeout waiting for `docker wait` to exit")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_test.go
deleted file mode 100644
index 7bc287eca7..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_test.go
+++ /dev/null
@@ -1,227 +0,0 @@
-// This file will be removed when we completely drop support for
-// passing HostConfig to container start API.
-
-package main
-
-import (
-	"net/http"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func formatV123StartAPIURL(url string) string {
-	return "/v1.23" + url
-}
-
-func (s *DockerSuite) TestDeprecatedContainerAPIStartHostConfig(c *check.C) {
-	name := "test-deprecated-api-124"
-	dockerCmd(c, "create", "--name", name, "busybox")
-	config := map[string]interface{}{
-		"Binds": []string{"/aa:/bb"},
-	}
-	status, body, err := sockRequest("POST", "/containers/"+name+"/start", config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusBadRequest)
-	c.Assert(string(body), checker.Contains, "was deprecated since v1.10")
-}
-
-func (s *DockerSuite) TestDeprecatedContainerAPIStartVolumeBinds(c *check.C) {
-	// TODO Windows CI: Investigate further why this fails on Windows to Windows CI.
-	testRequires(c, DaemonIsLinux)
-	path := "/foo"
-	if daemonPlatform == "windows" {
-		path = `c:\foo`
-	}
-	name := "testing"
-	config := map[string]interface{}{
-		"Image":   "busybox",
-		"Volumes": map[string]struct{}{path: {}},
-	}
-
-	status, _, err := sockRequest("POST", formatV123StartAPIURL("/containers/create?name="+name), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	bindPath := randomTmpDirPath("test", daemonPlatform)
-	config = map[string]interface{}{
-		"Binds": []string{bindPath + ":" + path},
-	}
-	status, _, err = sockRequest("POST", formatV123StartAPIURL("/containers/"+name+"/start"), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	pth, err := inspectMountSourceField(name, path)
-	c.Assert(err, checker.IsNil)
-	c.Assert(pth, checker.Equals, bindPath, check.Commentf("expected volume host path to be %s, got %s", bindPath, pth))
-}
-
-// Test for GH#10618
-func (s *DockerSuite) TestDeprecatedContainerAPIStartDupVolumeBinds(c *check.C) {
-	// TODO Windows to Windows CI - Port this
-	testRequires(c, DaemonIsLinux)
-	name := "testdups"
-	config := map[string]interface{}{
-		"Image":   "busybox",
-		"Volumes": map[string]struct{}{"/tmp": {}},
-	}
-
-	status, _, err := sockRequest("POST", formatV123StartAPIURL("/containers/create?name="+name), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	bindPath1 := randomTmpDirPath("test1", daemonPlatform)
-	bindPath2 := randomTmpDirPath("test2", daemonPlatform)
-
-	config = map[string]interface{}{
-		"Binds": []string{bindPath1 + ":/tmp", bindPath2 + ":/tmp"},
-	}
-	status, body, err := sockRequest("POST", formatV123StartAPIURL("/containers/"+name+"/start"), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusInternalServerError)
-	c.Assert(string(body), checker.Contains, "Duplicate mount point", check.Commentf("Expected failure due to duplicate bind mounts to same path, instead got: %q with error: %v", string(body), err))
-}
-
-func (s *DockerSuite) TestDeprecatedContainerAPIStartVolumesFrom(c *check.C) {
-	// TODO Windows to Windows CI - Port this
-	testRequires(c, DaemonIsLinux)
-	volName := "voltst"
-	volPath := "/tmp"
-
-	dockerCmd(c, "run", "--name", volName, "-v", volPath, "busybox")
-
-	name := "TestContainerAPIStartVolumesFrom"
-	config := map[string]interface{}{
-		"Image":   "busybox",
-		"Volumes": map[string]struct{}{volPath: {}},
-	}
-
-	status, _, err := sockRequest("POST", formatV123StartAPIURL("/containers/create?name="+name), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusCreated)
-
-	config = map[string]interface{}{
-		"VolumesFrom": []string{volName},
-	}
-	status, _, err = sockRequest("POST", formatV123StartAPIURL("/containers/"+name+"/start"), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	pth, err := inspectMountSourceField(name, volPath)
-	c.Assert(err, checker.IsNil)
-	pth2, err := inspectMountSourceField(volName, volPath)
-	c.Assert(err, checker.IsNil)
-	c.Assert(pth, checker.Equals, pth2, check.Commentf("expected volume host path to be %s, got %s", pth, pth2))
-}
-
-// #9981 - Allow a docker created volume (ie, one in /var/lib/docker/volumes) to be used to overwrite (via passing in Binds on api start) an existing volume
-func (s *DockerSuite) TestDeprecatedPostContainerBindNormalVolume(c *check.C) {
-	// TODO Windows to Windows CI - Port this
-	testRequires(c, DaemonIsLinux)
-	dockerCmd(c, "create", "-v", "/foo", "--name=one", "busybox")
-
-	fooDir, err := inspectMountSourceField("one", "/foo")
-	c.Assert(err, checker.IsNil)
-
-	dockerCmd(c, "create", "-v", "/foo", "--name=two", "busybox")
-
-	bindSpec := map[string][]string{"Binds": {fooDir + ":/foo"}}
-	status, _, err := sockRequest("POST", formatV123StartAPIURL("/containers/two/start"), bindSpec)
-	c.Assert(err, checker.IsNil)
-	c.Assert(status, checker.Equals, http.StatusNoContent)
-
-	fooDir2, err := inspectMountSourceField("two", "/foo")
-	c.Assert(err, checker.IsNil)
-	c.Assert(fooDir2, checker.Equals, fooDir, check.Commentf("expected volume path to be %s, got: %s", fooDir, fooDir2))
-}
-
-func (s *DockerSuite) TestDeprecatedStartWithTooLowMemoryLimit(c *check.C) {
-	// TODO Windows: Port once memory is supported
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "create", "busybox")
-
-	containerID := strings.TrimSpace(out)
-
-	config := `{
-                "CpuShares": 100,
-                "Memory":    524287
-        }`
-
-	res, body, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+containerID+"/start"), strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	b, err2 := readBody(body)
-	c.Assert(err2, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusInternalServerError)
-	c.Assert(string(b), checker.Contains, "Minimum memory limit allowed is 4MB")
-}
-
-// #14640
-func (s *DockerSuite) TestDeprecatedPostContainersStartWithoutLinksInHostConfig(c *check.C) {
-	// TODO Windows: Windows doesn't support supplying a hostconfig on start.
-	// An alternate test could be written to validate the negative testing aspect of this
-	testRequires(c, DaemonIsLinux)
-	name := "test-host-config-links"
-	dockerCmd(c, append([]string{"create", "--name", name, "busybox"}, sleepCommandForDaemonPlatform()...)...)
-
-	hc := inspectFieldJSON(c, name, "HostConfig")
-	config := `{"HostConfig":` + hc + `}`
-
-	res, b, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+name+"/start"), strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusNoContent)
-	b.Close()
-}
-
-// #14640
-func (s *DockerSuite) TestDeprecatedPostContainersStartWithLinksInHostConfig(c *check.C) {
-	// TODO Windows: Windows doesn't support supplying a hostconfig on start.
-	// An alternate test could be written to validate the negative testing aspect of this
-	testRequires(c, DaemonIsLinux)
-	name := "test-host-config-links"
-	dockerCmd(c, "run", "--name", "foo", "-d", "busybox", "top")
-	dockerCmd(c, "create", "--name", name, "--link", "foo:bar", "busybox", "top")
-
-	hc := inspectFieldJSON(c, name, "HostConfig")
-	config := `{"HostConfig":` + hc + `}`
-
-	res, b, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+name+"/start"), strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusNoContent)
-	b.Close()
-}
-
-// #14640
-func (s *DockerSuite) TestDeprecatedPostContainersStartWithLinksInHostConfigIdLinked(c *check.C) {
-	// Windows does not support links
-	testRequires(c, DaemonIsLinux)
-	name := "test-host-config-links"
-	out, _ := dockerCmd(c, "run", "--name", "link0", "-d", "busybox", "top")
-	id := strings.TrimSpace(out)
-	dockerCmd(c, "create", "--name", name, "--link", id, "busybox", "top")
-
-	hc := inspectFieldJSON(c, name, "HostConfig")
-	config := `{"HostConfig":` + hc + `}`
-
-	res, b, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+name+"/start"), strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusNoContent)
-	b.Close()
-}
-
-func (s *DockerSuite) TestDeprecatedStartWithNilDNS(c *check.C) {
-	// TODO Windows: Add once DNS is supported
-	testRequires(c, DaemonIsLinux)
-	out, _ := dockerCmd(c, "create", "busybox")
-	containerID := strings.TrimSpace(out)
-
-	config := `{"HostConfig": {"Dns": null}}`
-
-	res, b, err := sockRequestRaw("POST", formatV123StartAPIURL("/containers/"+containerID+"/start"), strings.NewReader(config), "application/json")
-	c.Assert(err, checker.IsNil)
-	c.Assert(res.StatusCode, checker.Equals, http.StatusNoContent)
-	b.Close()
-
-	dns := inspectFieldJSON(c, containerID, "HostConfig.Dns")
-	c.Assert(dns, checker.Equals, "[]")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_unix_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_unix_test.go
deleted file mode 100644
index 94ef9b1a00..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_deprecated_api_v124_unix_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// #19100 This is a deprecated feature test, it should be removed in Docker 1.12
-func (s *DockerNetworkSuite) TestDeprecatedDockerNetworkStartAPIWithHostconfig(c *check.C) {
-	netName := "test"
-	conName := "foo"
-	dockerCmd(c, "network", "create", netName)
-	dockerCmd(c, "create", "--name", conName, "busybox", "top")
-
-	config := map[string]interface{}{
-		"HostConfig": map[string]interface{}{
-			"NetworkMode": netName,
-		},
-	}
-	_, _, err := sockRequest("POST", formatV123StartAPIURL("/containers/"+conName+"/start"), config)
-	c.Assert(err, checker.IsNil)
-	c.Assert(waitRun(conName), checker.IsNil)
-	networks := inspectField(c, conName, "NetworkSettings.Networks")
-	c.Assert(networks, checker.Contains, netName, check.Commentf(fmt.Sprintf("Should contain '%s' network", netName)))
-	c.Assert(networks, checker.Not(checker.Contains), "bridge", check.Commentf("Should not contain 'bridge' network"))
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_experimental_network_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_experimental_network_test.go
deleted file mode 100644
index 85dec31948..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_experimental_network_test.go
+++ /dev/null
@@ -1,594 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/go-check/check"
-)
-
-var (
-	MacvlanKernelSupport = testRequirement{
-		func() bool {
-			const macvlanKernelVer = 3 // minimum macvlan kernel support
-			const macvlanMajorVer = 9  // minimum macvlan major kernel support
-			kv, err := kernel.GetKernelVersion()
-			if err != nil {
-				return false
-			}
-			// ensure Kernel version is >= v3.9 for macvlan support
-			if kv.Kernel < macvlanKernelVer || (kv.Kernel == macvlanKernelVer && kv.Major < macvlanMajorVer) {
-				return false
-			}
-			return true
-		},
-		"kernel version failed to meet the minimum macvlan kernel requirement of 3.9",
-	}
-	IpvlanKernelSupport = testRequirement{
-		func() bool {
-			const ipvlanKernelVer = 4 // minimum ipvlan kernel support
-			const ipvlanMajorVer = 2  // minimum ipvlan major kernel support
-			kv, err := kernel.GetKernelVersion()
-			if err != nil {
-				return false
-			}
-			// ensure Kernel version is >= v4.2 for ipvlan support
-			if kv.Kernel < ipvlanKernelVer || (kv.Kernel == ipvlanKernelVer && kv.Major < ipvlanMajorVer) {
-				return false
-			}
-			return true
-		},
-		"kernel version failed to meet the minimum ipvlan kernel requirement of 4.0.0",
-	}
-)
-
-func (s *DockerNetworkSuite) TestDockerNetworkMacvlanPersistance(c *check.C) {
-	// verify the driver automatically provisions the 802.1q link (dm-dummy0.60)
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-
-	// master dummy interface 'dm' abbreviation represents 'docker macvlan'
-	master := "dm-dummy0"
-	// simulate the master link the vlan tagged subinterface parent link will use
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network specifying the desired sub-interface name
-	dockerCmd(c, "network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0.60", "dm-persist")
-	assertNwIsAvailable(c, "dm-persist")
-	// Restart docker daemon to test the config has persisted to disk
-	s.d.Restart()
-	// verify network is recreated from persistence
-	assertNwIsAvailable(c, "dm-persist")
-	// cleanup the master interface that also collects the slave dev
-	deleteInterface(c, "dm-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanPersistance(c *check.C) {
-	// verify the driver automatically provisions the 802.1q link (di-dummy0.70)
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	// master dummy interface 'di' notation represent 'docker ipvlan'
-	master := "di-dummy0"
-	// simulate the master link the vlan tagged subinterface parent link will use
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network specifying the desired sub-interface name
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.70", "di-persist")
-	assertNwIsAvailable(c, "di-persist")
-	// Restart docker daemon to test the config has persisted to disk
-	s.d.Restart()
-	// verify network is recreated from persistence
-	assertNwIsAvailable(c, "di-persist")
-	// cleanup the master interface that also collects the slave dev
-	deleteInterface(c, "di-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMacvlanSubIntCreate(c *check.C) {
-	// verify the driver automatically provisions the 802.1q link (dm-dummy0.50)
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	// master dummy interface 'dm' abbreviation represents 'docker macvlan'
-	master := "dm-dummy0"
-	// simulate the master link the vlan tagged subinterface parent link will use
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network specifying the desired sub-interface name
-	dockerCmd(c, "network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0.50", "dm-subinterface")
-	assertNwIsAvailable(c, "dm-subinterface")
-	// cleanup the master interface which also collects the slave dev
-	deleteInterface(c, "dm-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanSubIntCreate(c *check.C) {
-	// verify the driver automatically provisions the 802.1q link (di-dummy0.50)
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	// master dummy interface 'dm' abbreviation represents 'docker ipvlan'
-	master := "di-dummy0"
-	// simulate the master link the vlan tagged subinterface parent link will use
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network specifying the desired sub-interface name
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.60", "di-subinterface")
-	assertNwIsAvailable(c, "di-subinterface")
-	// cleanup the master interface which also collects the slave dev
-	deleteInterface(c, "di-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMacvlanOverlapParent(c *check.C) {
-	// verify the same parent interface cannot be used if already in use by an existing network
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	// master dummy interface 'dm' abbreviation represents 'docker macvlan'
-	master := "dm-dummy0"
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = createVlanInterface(c, master, "dm-dummy0.40", "40")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network using an existing parent interface
-	dockerCmd(c, "network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0.40", "dm-subinterface")
-	assertNwIsAvailable(c, "dm-subinterface")
-	// attempt to create another network using the same parent iface that should fail
-	out, _, err = dockerCmdWithError("network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0.40", "dm-parent-net-overlap")
-	// verify that the overlap returns an error
-	c.Assert(err, check.NotNil)
-	// cleanup the master interface which also collects the slave dev
-	deleteInterface(c, "dm-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanOverlapParent(c *check.C) {
-	// verify the same parent interface cannot be used if already in use by an existing network
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	// master dummy interface 'dm' abbreviation represents 'docker ipvlan'
-	master := "di-dummy0"
-	out, err := createMasterDummy(c, master)
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = createVlanInterface(c, master, "di-dummy0.30", "30")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network using an existing parent interface
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.30", "di-subinterface")
-	assertNwIsAvailable(c, "di-subinterface")
-	// attempt to create another network using the same parent iface that should fail
-	out, _, err = dockerCmdWithError("network", "create", "--driver=ipvlan", "-o", "parent=di-dummy0.30", "di-parent-net-overlap")
-	// verify that the overlap returns an error
-	c.Assert(err, check.NotNil)
-	// cleanup the master interface which also collects the slave dev
-	deleteInterface(c, "di-dummy0")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkMacvlanMultiSubnet(c *check.C) {
-	// create a dual stack multi-subnet Macvlan bridge mode network and validate connectivity between four containers, two on each subnet
-	testRequires(c, DaemonIsLinux, IPv6, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=macvlan", "--ipv6", "--subnet=172.28.100.0/24", "--subnet=172.28.102.0/24", "--gateway=172.28.102.254",
-		"--subnet=2001:db8:abc2::/64", "--subnet=2001:db8:abc4::/64", "--gateway=2001:db8:abc4::254", "dualstackbridge")
-	// Ensure the network was created
-	assertNwIsAvailable(c, "dualstackbridge")
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.100.0/24 and 2001:db8:abc2::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=first", "--ip", "172.28.100.20", "--ip6", "2001:db8:abc2::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=second", "--ip", "172.28.100.21", "--ip6", "2001:db8:abc2::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackbridge
-	ip := inspectField(c, "first", "NetworkSettings.Networks.dualstackbridge.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackbridge
-	ip6 := inspectField(c, "first", "NetworkSettings.Networks.dualstackbridge.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address second to first
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address second to first
-	c.Skip("Temporarily skipping while invesitigating sporadic v6 CI issues")
-	_, _, err = dockerCmdWithError("exec", "second", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.102.0/24 and 2001:db8:abc4::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=third", "--ip", "172.28.102.20", "--ip6", "2001:db8:abc4::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=fourth", "--ip", "172.28.102.21", "--ip6", "2001:db8:abc4::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackbridge
-	ip = inspectField(c, "third", "NetworkSettings.Networks.dualstackbridge.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackbridge
-	ip6 = inspectField(c, "third", "NetworkSettings.Networks.dualstackbridge.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// Inspect the v4 gateway to ensure the proper default GW was assigned
-	ip4gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackbridge.Gateway")
-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.100.1")
-	// Inspect the v6 gateway to ensure the proper default GW was assigned
-	ip6gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackbridge.IPv6Gateway")
-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc2::1")
-
-	// Inspect the v4 gateway to ensure the proper explicitly assigned default GW was assigned
-	ip4gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackbridge.Gateway")
-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.102.254")
-	// Inspect the v6 gateway to ensure the proper explicitly assigned default GW was assigned
-	ip6gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackbridge.IPv6Gateway")
-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc4::254")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanL2MultiSubnet(c *check.C) {
-	// create a dual stack multi-subnet Ipvlan L2 network and validate connectivity within the subnets, two on each subnet
-	testRequires(c, DaemonIsLinux, IPv6, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.200.0/24", "--subnet=172.28.202.0/24", "--gateway=172.28.202.254",
-		"--subnet=2001:db8:abc8::/64", "--subnet=2001:db8:abc6::/64", "--gateway=2001:db8:abc6::254", "dualstackl2")
-	// Ensure the network was created
-	assertNwIsAvailable(c, "dualstackl2")
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.200.0/24 and 2001:db8:abc8::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=first", "--ip", "172.28.200.20", "--ip6", "2001:db8:abc8::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=second", "--ip", "172.28.200.21", "--ip6", "2001:db8:abc8::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackl2
-	ip := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackl2
-	ip6 := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address second to first
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address second to first
-	_, _, err = dockerCmdWithError("exec", "second", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.202.0/24 and 2001:db8:abc6::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=third", "--ip", "172.28.202.20", "--ip6", "2001:db8:abc6::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=fourth", "--ip", "172.28.202.21", "--ip6", "2001:db8:abc6::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackl2
-	ip = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackl2
-	ip6 = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// Inspect the v4 gateway to ensure the proper default GW was assigned
-	ip4gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.Gateway")
-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.200.1")
-	// Inspect the v6 gateway to ensure the proper default GW was assigned
-	ip6gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl2.IPv6Gateway")
-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc8::1")
-
-	// Inspect the v4 gateway to ensure the proper explicitly assigned default GW was assigned
-	ip4gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.Gateway")
-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "172.28.202.254")
-	// Inspect the v6 gateway to ensure the proper explicitly assigned default GW was assigned
-	ip6gw = inspectField(c, "third", "NetworkSettings.Networks.dualstackl2.IPv6Gateway")
-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "2001:db8:abc6::254")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanL3MultiSubnet(c *check.C) {
-	// create a dual stack multi-subnet Ipvlan L3 network and validate connectivity between all four containers per L3 mode
-	testRequires(c, DaemonIsLinux, IPv6, IpvlanKernelSupport, NotUserNamespace, NotArm, IPv6, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.10.0/24", "--subnet=172.28.12.0/24", "--gateway=172.28.12.254",
-		"--subnet=2001:db8:abc9::/64", "--subnet=2001:db8:abc7::/64", "--gateway=2001:db8:abc7::254", "-o", "ipvlan_mode=l3", "dualstackl3")
-	// Ensure the network was created
-	assertNwIsAvailable(c, "dualstackl3")
-
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.10.0/24 and 2001:db8:abc9::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=first", "--ip", "172.28.10.20", "--ip6", "2001:db8:abc9::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=second", "--ip", "172.28.10.21", "--ip6", "2001:db8:abc9::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackl3
-	ip := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackl3
-	ip6 := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address second to first
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address second to first
-	_, _, err = dockerCmdWithError("exec", "second", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// start dual stack containers and verify the user specified --ip and --ip6 addresses on subnets 172.28.12.0/24 and 2001:db8:abc7::/64
-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=third", "--ip", "172.28.12.20", "--ip6", "2001:db8:abc7::20", "busybox", "top")
-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=fourth", "--ip", "172.28.12.21", "--ip6", "2001:db8:abc7::21", "busybox", "top")
-
-	// Inspect and store the v4 address from specified container on the network dualstackl3
-	ip = inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackl3
-	ip6 = inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")
-
-	// verify ipv4 connectivity to the explicit --ipv address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	// verify ipv6 connectivity to the explicit --ipv6 address from third to fourth
-	_, _, err = dockerCmdWithError("exec", "fourth", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// Inspect and store the v4 address from specified container on the network dualstackl3
-	ip = inspectField(c, "second", "NetworkSettings.Networks.dualstackl3.IPAddress")
-	// Inspect and store the v6 address from specified container on the network dualstackl3
-	ip6 = inspectField(c, "second", "NetworkSettings.Networks.dualstackl3.GlobalIPv6Address")
-
-	// Verify connectivity across disparate subnets which is unique to L3 mode only
-	_, _, err = dockerCmdWithError("exec", "third", "ping", "-c", "1", strings.TrimSpace(ip))
-	c.Assert(err, check.IsNil)
-	_, _, err = dockerCmdWithError("exec", "third", "ping6", "-c", "1", strings.TrimSpace(ip6))
-	c.Assert(err, check.IsNil)
-
-	// Inspect the v4 gateway to ensure no next hop is assigned in L3 mode
-	ip4gw := inspectField(c, "first", "NetworkSettings.Networks.dualstackl3.Gateway")
-	c.Assert(strings.TrimSpace(ip4gw), check.Equals, "")
-	// Inspect the v6 gateway to ensure the explicitly specified default GW is ignored per L3 mode enabled
-	ip6gw := inspectField(c, "third", "NetworkSettings.Networks.dualstackl3.IPv6Gateway")
-	c.Assert(strings.TrimSpace(ip6gw), check.Equals, "")
-}
-
-func (s *DockerNetworkSuite) TestDockerNetworkIpvlanAddressing(c *check.C) {
-	// Ensure the default gateways, next-hops and default dev devices are properly set
-	testRequires(c, DaemonIsLinux, IPv6, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=macvlan", "--ipv6", "--subnet=172.28.130.0/24",
-		"--subnet=2001:db8:abca::/64", "--gateway=2001:db8:abca::254", "-o", "macvlan_mode=bridge", "dualstackbridge")
-	assertNwIsAvailable(c, "dualstackbridge")
-	dockerCmd(c, "run", "-d", "--net=dualstackbridge", "--name=first", "busybox", "top")
-	// Validate macvlan bridge mode defaults gateway sets the default IPAM next-hop inferred from the subnet
-	out, _, err := dockerCmdWithError("exec", "first", "ip", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default via 172.28.130.1 dev eth0")
-	// Validate macvlan bridge mode sets the v6 gateway to the user specified default gateway/next-hop
-	out, _, err = dockerCmdWithError("exec", "first", "ip", "-6", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default via 2001:db8:abca::254 dev eth0")
-
-	// Verify ipvlan l2 mode sets the proper default gateway routes via netlink
-	// for either an explicitly set route by the user or inferred via default IPAM
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.140.0/24", "--gateway=172.28.140.254",
-		"--subnet=2001:db8:abcb::/64", "-o", "ipvlan_mode=l2", "dualstackl2")
-	assertNwIsAvailable(c, "dualstackl2")
-	dockerCmd(c, "run", "-d", "--net=dualstackl2", "--name=second", "busybox", "top")
-	// Validate ipvlan l2 mode defaults gateway sets the default IPAM next-hop inferred from the subnet
-	out, _, err = dockerCmdWithError("exec", "second", "ip", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default via 172.28.140.254 dev eth0")
-	// Validate ipvlan l2 mode sets the v6 gateway to the user specified default gateway/next-hop
-	out, _, err = dockerCmdWithError("exec", "second", "ip", "-6", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default via 2001:db8:abcb::1 dev eth0")
-
-	// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--ipv6", "--subnet=172.28.160.0/24", "--gateway=172.28.160.254",
-		"--subnet=2001:db8:abcd::/64", "--gateway=2001:db8:abcd::254", "-o", "ipvlan_mode=l3", "dualstackl3")
-	assertNwIsAvailable(c, "dualstackl3")
-	dockerCmd(c, "run", "-d", "--net=dualstackl3", "--name=third", "busybox", "top")
-	// Validate ipvlan l3 mode sets the v4 gateway to dev eth0 and disregards any explicit or inferred next-hops
-	out, _, err = dockerCmdWithError("exec", "third", "ip", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default dev eth0")
-	// Validate ipvlan l3 mode sets the v6 gateway to dev eth0 and disregards any explicit or inferred next-hops
-	out, _, err = dockerCmdWithError("exec", "third", "ip", "-6", "route")
-	c.Assert(err, check.IsNil)
-	c.Assert(out, checker.Contains, "default dev eth0")
-}
-
-func (s *DockerSuite) TestDockerNetworkMacVlanBridgeNilParent(c *check.C) {
-	// macvlan bridge mode - dummy parent interface is provisioned dynamically
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=macvlan", "dm-nil-parent")
-	assertNwIsAvailable(c, "dm-nil-parent")
-
-	// start two containers on the same subnet
-	dockerCmd(c, "run", "-d", "--net=dm-nil-parent", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=dm-nil-parent", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkMacVlanBridgeInternalMode(c *check.C) {
-	// macvlan bridge mode --internal containers can communicate inside the network but not externally
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=macvlan", "--internal", "dm-internal")
-	assertNwIsAvailable(c, "dm-internal")
-	nr := getNetworkResource(c, "dm-internal")
-	c.Assert(nr.Internal, checker.True)
-
-	// start two containers on the same subnet
-	dockerCmd(c, "run", "-d", "--net=dm-internal", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=dm-internal", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// access outside of the network should fail
-	result := dockerCmdWithTimeout(time.Second, "exec", "first", "ping", "-c", "1", "-w", "1", "8.8.8.8")
-	c.Assert(result, icmd.Matches, icmd.Expected{Timeout: true})
-
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkIpvlanL2NilParent(c *check.C) {
-	// ipvlan l2 mode - dummy parent interface is provisioned dynamically
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "di-nil-parent")
-	assertNwIsAvailable(c, "di-nil-parent")
-
-	// start two containers on the same subnet
-	dockerCmd(c, "run", "-d", "--net=di-nil-parent", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=di-nil-parent", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkIpvlanL2InternalMode(c *check.C) {
-	// ipvlan l2 mode --internal containers can communicate inside the network but not externally
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--internal", "di-internal")
-	assertNwIsAvailable(c, "di-internal")
-	nr := getNetworkResource(c, "di-internal")
-	c.Assert(nr.Internal, checker.True)
-
-	// start two containers on the same subnet
-	dockerCmd(c, "run", "-d", "--net=di-internal", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=di-internal", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// access outside of the network should fail
-	result := dockerCmdWithTimeout(time.Second, "exec", "first", "ping", "-c", "1", "-w", "1", "8.8.8.8")
-	c.Assert(result, icmd.Matches, icmd.Expected{Timeout: true})
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkIpvlanL3NilParent(c *check.C) {
-	// ipvlan l3 mode - dummy parent interface is provisioned dynamically
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--subnet=172.28.230.0/24",
-		"--subnet=172.28.220.0/24", "-o", "ipvlan_mode=l3", "di-nil-parent-l3")
-	assertNwIsAvailable(c, "di-nil-parent-l3")
-
-	// start two containers on separate subnets
-	dockerCmd(c, "run", "-d", "--ip=172.28.220.10", "--net=di-nil-parent-l3", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--ip=172.28.230.10", "--net=di-nil-parent-l3", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkIpvlanL3InternalMode(c *check.C) {
-	// ipvlan l3 mode --internal containers can communicate inside the network but not externally
-	testRequires(c, DaemonIsLinux, IpvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	dockerCmd(c, "network", "create", "--driver=ipvlan", "--subnet=172.28.230.0/24",
-		"--subnet=172.28.220.0/24", "-o", "ipvlan_mode=l3", "--internal", "di-internal-l3")
-	assertNwIsAvailable(c, "di-internal-l3")
-	nr := getNetworkResource(c, "di-internal-l3")
-	c.Assert(nr.Internal, checker.True)
-
-	// start two containers on separate subnets
-	dockerCmd(c, "run", "-d", "--ip=172.28.220.10", "--net=di-internal-l3", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--ip=172.28.230.10", "--net=di-internal-l3", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-
-	// access outside of the network should fail
-	result := dockerCmdWithTimeout(time.Second, "exec", "first", "ping", "-c", "1", "-w", "1", "8.8.8.8")
-	c.Assert(result, icmd.Matches, icmd.Expected{Timeout: true})
-	// intra-network communications should succeed
-	_, _, err := dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-}
-
-func (s *DockerSuite) TestDockerNetworkMacVlanExistingParent(c *check.C) {
-	// macvlan bridge mode - empty parent interface containers can reach each other internally but not externally
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	netName := "dm-parent-exists"
-	out, err := createMasterDummy(c, "dm-dummy0")
-	//out, err := createVlanInterface(c, "dm-parent", "dm-slave", "macvlan", "bridge")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network using an existing parent interface
-	dockerCmd(c, "network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0", netName)
-	assertNwIsAvailable(c, netName)
-	// delete the network while preserving the parent link
-	dockerCmd(c, "network", "rm", netName)
-	assertNwNotAvailable(c, netName)
-	// verify the network delete did not delete the predefined link
-	out, err = linkExists(c, "dm-dummy0")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	deleteInterface(c, "dm-dummy0")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func (s *DockerSuite) TestDockerNetworkMacVlanSubinterface(c *check.C) {
-	// macvlan bridge mode -  empty parent interface containers can reach each other internally but not externally
-	testRequires(c, DaemonIsLinux, MacvlanKernelSupport, NotUserNamespace, NotArm, ExperimentalDaemon)
-	netName := "dm-subinterface"
-	out, err := createMasterDummy(c, "dm-dummy0")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	out, err = createVlanInterface(c, "dm-dummy0", "dm-dummy0.20", "20")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// create a network using an existing parent interface
-	dockerCmd(c, "network", "create", "--driver=macvlan", "-o", "parent=dm-dummy0.20", netName)
-	assertNwIsAvailable(c, netName)
-
-	// start containers on 802.1q tagged '-o parent' sub-interface
-	dockerCmd(c, "run", "-d", "--net=dm-subinterface", "--name=first", "busybox", "top")
-	c.Assert(waitRun("first"), check.IsNil)
-	dockerCmd(c, "run", "-d", "--net=dm-subinterface", "--name=second", "busybox", "top")
-	c.Assert(waitRun("second"), check.IsNil)
-	// verify containers can communicate
-	_, _, err = dockerCmdWithError("exec", "second", "ping", "-c", "1", "first")
-	c.Assert(err, check.IsNil)
-
-	// remove the containers
-	dockerCmd(c, "rm", "-f", "first")
-	dockerCmd(c, "rm", "-f", "second")
-	// delete the network while preserving the parent link
-	dockerCmd(c, "network", "rm", netName)
-	assertNwNotAvailable(c, netName)
-	// verify the network delete did not delete the predefined sub-interface
-	out, err = linkExists(c, "dm-dummy0.20")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-	// delete the parent interface which also collects the slave
-	deleteInterface(c, "dm-dummy0")
-	c.Assert(err, check.IsNil, check.Commentf(out))
-}
-
-func createMasterDummy(c *check.C, master string) (string, error) {
-	// ip link add <dummy_name> type dummy
-	args := []string{"link", "add", master, "type", "dummy"}
-	ipLinkCmd := exec.Command("ip", args...)
-	out, _, err := runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-	// ip link set dummy_name up
-	args = []string{"link", "set", master, "up"}
-	ipLinkCmd = exec.Command("ip", args...)
-	out, _, err = runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-	return out, err
-}
-
-func createVlanInterface(c *check.C, master, slave, id string) (string, error) {
-	// ip link add link <master> name <master>.<VID> type vlan id <VID>
-	args := []string{"link", "add", "link", master, "name", slave, "type", "vlan", "id", id}
-	ipLinkCmd := exec.Command("ip", args...)
-	out, _, err := runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-	// ip link set <sub_interface_name> up
-	args = []string{"link", "set", slave, "up"}
-	ipLinkCmd = exec.Command("ip", args...)
-	out, _, err = runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-	return out, err
-}
-
-func linkExists(c *check.C, master string) (string, error) {
-	// verify the specified link exists, ip link show <link_name>
-	args := []string{"link", "show", master}
-	ipLinkCmd := exec.Command("ip", args...)
-	out, _, err := runCommandWithOutput(ipLinkCmd)
-	if err != nil {
-		return out, err
-	}
-	return out, err
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_hub_pull_suite_test.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_hub_pull_suite_test.go
deleted file mode 100644
index df52cae1a4..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_hub_pull_suite_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package main
-
-import (
-	"os/exec"
-	"runtime"
-	"strings"
-
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func init() {
-	// FIXME. Temporarily turning this off for Windows as GH16039 was breaking
-	// Windows to Linux CI @icecrime
-	if runtime.GOOS != "windows" {
-		check.Suite(newDockerHubPullSuite())
-	}
-}
-
-// DockerHubPullSuite provides an isolated daemon that doesn't have all the
-// images that are baked into our 'global' test environment daemon (e.g.,
-// busybox, httpserver, ...).
-//
-// We use it for push/pull tests where we want to start fresh, and measure the
-// relative impact of each individual operation. As part of this suite, all
-// images are removed after each test.
-type DockerHubPullSuite struct {
-	d  *Daemon
-	ds *DockerSuite
-}
-
-// newDockerHubPullSuite returns a new instance of a DockerHubPullSuite.
-func newDockerHubPullSuite() *DockerHubPullSuite {
-	return &DockerHubPullSuite{
-		ds: &DockerSuite{},
-	}
-}
-
-// SetUpSuite starts the suite daemon.
-func (s *DockerHubPullSuite) SetUpSuite(c *check.C) {
-	testRequires(c, DaemonIsLinux)
-	s.d = NewDaemon(c)
-	err := s.d.Start()
-	c.Assert(err, checker.IsNil, check.Commentf("starting push/pull test daemon: %v", err))
-}
-
-// TearDownSuite stops the suite daemon.
-func (s *DockerHubPullSuite) TearDownSuite(c *check.C) {
-	if s.d != nil {
-		err := s.d.Stop()
-		c.Assert(err, checker.IsNil, check.Commentf("stopping push/pull test daemon: %v", err))
-	}
-}
-
-// SetUpTest declares that all tests of this suite require network.
-func (s *DockerHubPullSuite) SetUpTest(c *check.C) {
-	testRequires(c, Network)
-}
-
-// TearDownTest removes all images from the suite daemon.
-func (s *DockerHubPullSuite) TearDownTest(c *check.C) {
-	out := s.Cmd(c, "images", "-aq")
-	images := strings.Split(out, "\n")
-	images = append([]string{"rmi", "-f"}, images...)
-	s.d.Cmd(images...)
-	s.ds.TearDownTest(c)
-}
-
-// Cmd executes a command against the suite daemon and returns the combined
-// output. The function fails the test when the command returns an error.
-func (s *DockerHubPullSuite) Cmd(c *check.C, name string, arg ...string) string {
-	out, err := s.CmdWithError(name, arg...)
-	c.Assert(err, checker.IsNil, check.Commentf("%q failed with errors: %s, %v", strings.Join(arg, " "), out, err))
-	return out
-}
-
-// CmdWithError executes a command against the suite daemon and returns the
-// combined output as well as any error.
-func (s *DockerHubPullSuite) CmdWithError(name string, arg ...string) (string, error) {
-	c := s.MakeCmd(name, arg...)
-	b, err := c.CombinedOutput()
-	return string(b), err
-}
-
-// MakeCmd returns an exec.Cmd command to run against the suite daemon.
-func (s *DockerHubPullSuite) MakeCmd(name string, arg ...string) *exec.Cmd {
-	args := []string{"--host", s.d.sock(), name}
-	args = append(args, arg...)
-	return exec.Command(dockerBinary, args...)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_test_vars.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_test_vars.go
deleted file mode 100644
index 3559bfdbb7..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_test_vars.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/reexec"
-)
-
-var (
-	// the docker client binary to use
-	dockerBinary = "docker"
-	// the docker daemon binary to use
-	dockerdBinary = "dockerd"
-
-	// path to containerd's ctr binary
-	ctrBinary = "docker-containerd-ctr"
-
-	// the private registry image to use for tests involving the registry
-	registryImageName = "registry"
-
-	// the private registry to use for tests
-	privateRegistryURL = "127.0.0.1:5000"
-
-	// TODO Windows CI. These are incorrect and need fixing into
-	// platform specific pieces.
-	runtimePath = "/var/run/docker"
-
-	workingDirectory string
-
-	// isLocalDaemon is true if the daemon under test is on the same
-	// host as the CLI.
-	isLocalDaemon bool
-
-	// daemonPlatform is held globally so that tests can make intelligent
-	// decisions on how to configure themselves according to the platform
-	// of the daemon. This is initialized in docker_utils by sending
-	// a version call to the daemon and examining the response header.
-	daemonPlatform string
-
-	// windowsDaemonKV is used on Windows to distinguish between different
-	// versions. This is necessary to enable certain tests based on whether
-	// the platform supports it. For example, Windows Server 2016 TP3 did
-	// not support volumes, but TP4 did.
-	windowsDaemonKV int
-
-	// daemonDefaultImage is the name of the default image to use when running
-	// tests. This is platform dependent.
-	daemonDefaultImage string
-
-	// For a local daemon on Linux, these values will be used for testing
-	// user namespace support as the standard graph path(s) will be
-	// appended with the root remapped uid.gid prefix
-	dockerBasePath       string
-	volumesConfigPath    string
-	containerStoragePath string
-
-	// experimentalDaemon tell whether the main daemon has
-	// experimental features enabled or not
-	experimentalDaemon bool
-
-	// daemonStorageDriver is held globally so that tests can know the storage
-	// driver of the daemon. This is initialized in docker_utils by sending
-	// a version call to the daemon and examining the response header.
-	daemonStorageDriver string
-
-	// WindowsBaseImage is the name of the base image for Windows testing
-	// Environment variable WINDOWS_BASE_IMAGE can override this
-	WindowsBaseImage = "microsoft/windowsservercore"
-
-	// isolation is the isolation mode of the daemon under test
-	isolation container.Isolation
-
-	// daemonPid is the pid of the main test daemon
-	daemonPid int
-
-	daemonKernelVersion string
-)
-
-const (
-	// DefaultImage is the name of the base image for the majority of tests that
-	// are run across suites
-	DefaultImage = "busybox"
-)
-
-func init() {
-	reexec.Init()
-	if dockerBin := os.Getenv("DOCKER_BINARY"); dockerBin != "" {
-		dockerBinary = dockerBin
-	}
-	var err error
-	dockerBinary, err = exec.LookPath(dockerBinary)
-	if err != nil {
-		fmt.Printf("ERROR: couldn't resolve full path to the Docker binary (%v)\n", err)
-		os.Exit(1)
-	}
-	if registryImage := os.Getenv("REGISTRY_IMAGE"); registryImage != "" {
-		registryImageName = registryImage
-	}
-	if registry := os.Getenv("REGISTRY_URL"); registry != "" {
-		privateRegistryURL = registry
-	}
-	workingDirectory, _ = os.Getwd()
-
-	// Deterministically working out the environment in which CI is running
-	// to evaluate whether the daemon is local or remote is not possible through
-	// a build tag.
-	//
-	// For example Windows to Linux CI under Jenkins tests the 64-bit
-	// Windows binary build with the daemon build tag, but calls a remote
-	// Linux daemon.
-	//
-	// We can't just say if Windows then assume the daemon is local as at
-	// some point, we will be testing the Windows CLI against a Windows daemon.
-	//
-	// Similarly, it will be perfectly valid to also run CLI tests from
-	// a Linux CLI (built with the daemon tag) against a Windows daemon.
-	if len(os.Getenv("DOCKER_REMOTE_DAEMON")) > 0 {
-		isLocalDaemon = false
-	} else {
-		isLocalDaemon = true
-	}
-
-	// TODO Windows CI. This are incorrect and need fixing into
-	// platform specific pieces.
-	// This is only used for a tests with local daemon true (Linux-only today)
-	// default is "/var/lib/docker", but we'll try and ask the
-	// /info endpoint for the specific root dir
-	dockerBasePath = "/var/lib/docker"
-	type Info struct {
-		DockerRootDir     string
-		ExperimentalBuild bool
-		KernelVersion     string
-	}
-	var i Info
-	status, b, err := sockRequest("GET", "/info", nil)
-	if err == nil && status == 200 {
-		if err = json.Unmarshal(b, &i); err == nil {
-			dockerBasePath = i.DockerRootDir
-			experimentalDaemon = i.ExperimentalBuild
-			daemonKernelVersion = i.KernelVersion
-		}
-	}
-	volumesConfigPath = dockerBasePath + "/volumes"
-	containerStoragePath = dockerBasePath + "/containers"
-
-	if len(os.Getenv("WINDOWS_BASE_IMAGE")) > 0 {
-		WindowsBaseImage = os.Getenv("WINDOWS_BASE_IMAGE")
-		fmt.Println("INFO: Windows Base image is ", WindowsBaseImage)
-	}
-
-	dest := os.Getenv("DEST")
-	b, err = ioutil.ReadFile(filepath.Join(dest, "docker.pid"))
-	if err == nil {
-		if p, err := strconv.ParseInt(string(b), 10, 32); err == nil {
-			daemonPid = int(p)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/docker_utils.go b/installer/vendor/github.com/docker/docker/integration-cli/docker_utils.go
deleted file mode 100644
index 749e4b3357..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/docker_utils.go
+++ /dev/null
@@ -1,1607 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	volumetypes "github.com/docker/docker/api/types/volume"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/httputils"
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/go-connections/tlsconfig"
-	units "github.com/docker/go-units"
-	"github.com/go-check/check"
-)
-
-func init() {
-	cmd := exec.Command(dockerBinary, "images", "-f", "dangling=false", "--format", "{{.Repository}}:{{.Tag}}")
-	cmd.Env = appendBaseEnv(true)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		panic(fmt.Errorf("err=%v\nout=%s\n", err, out))
-	}
-	images := strings.Split(strings.TrimSpace(string(out)), "\n")
-	for _, img := range images {
-		protectedImages[img] = struct{}{}
-	}
-
-	res, body, err := sockRequestRaw("GET", "/info", nil, "application/json")
-	if err != nil {
-		panic(fmt.Errorf("Init failed to get /info: %v", err))
-	}
-	defer body.Close()
-	if res.StatusCode != http.StatusOK {
-		panic(fmt.Errorf("Init failed to get /info. Res=%v", res))
-	}
-
-	svrHeader, _ := httputils.ParseServerHeader(res.Header.Get("Server"))
-	daemonPlatform = svrHeader.OS
-	if daemonPlatform != "linux" && daemonPlatform != "windows" {
-		panic("Cannot run tests against platform: " + daemonPlatform)
-	}
-
-	// Now we know the daemon platform, can set paths used by tests.
-	var info types.Info
-	err = json.NewDecoder(body).Decode(&info)
-	if err != nil {
-		panic(fmt.Errorf("Init failed to unmarshal docker info: %v", err))
-	}
-
-	daemonStorageDriver = info.Driver
-	dockerBasePath = info.DockerRootDir
-	volumesConfigPath = filepath.Join(dockerBasePath, "volumes")
-	containerStoragePath = filepath.Join(dockerBasePath, "containers")
-	// Make sure in context of daemon, not the local platform. Note we can't
-	// use filepath.FromSlash or ToSlash here as they are a no-op on Unix.
-	if daemonPlatform == "windows" {
-		volumesConfigPath = strings.Replace(volumesConfigPath, `/`, `\`, -1)
-		containerStoragePath = strings.Replace(containerStoragePath, `/`, `\`, -1)
-		// On Windows, extract out the version as we need to make selective
-		// decisions during integration testing as and when features are implemented.
-		// eg in "10.0 10550 (10550.1000.amd64fre.branch.date-time)" we want 10550
-		windowsDaemonKV, _ = strconv.Atoi(strings.Split(info.KernelVersion, " ")[1])
-	} else {
-		volumesConfigPath = strings.Replace(volumesConfigPath, `\`, `/`, -1)
-		containerStoragePath = strings.Replace(containerStoragePath, `\`, `/`, -1)
-	}
-	isolation = info.Isolation
-}
-
-func convertBasesize(basesizeBytes int64) (int64, error) {
-	basesize := units.HumanSize(float64(basesizeBytes))
-	basesize = strings.Trim(basesize, " ")[:len(basesize)-3]
-	basesizeFloat, err := strconv.ParseFloat(strings.Trim(basesize, " "), 64)
-	if err != nil {
-		return 0, err
-	}
-	return int64(basesizeFloat) * 1024 * 1024 * 1024, nil
-}
-
-func daemonHost() string {
-	daemonURLStr := "unix://" + opts.DefaultUnixSocket
-	if daemonHostVar := os.Getenv("DOCKER_HOST"); daemonHostVar != "" {
-		daemonURLStr = daemonHostVar
-	}
-	return daemonURLStr
-}
-
-func getTLSConfig() (*tls.Config, error) {
-	dockerCertPath := os.Getenv("DOCKER_CERT_PATH")
-
-	if dockerCertPath == "" {
-		return nil, fmt.Errorf("DOCKER_TLS_VERIFY specified, but no DOCKER_CERT_PATH environment variable")
-	}
-
-	option := &tlsconfig.Options{
-		CAFile:   filepath.Join(dockerCertPath, "ca.pem"),
-		CertFile: filepath.Join(dockerCertPath, "cert.pem"),
-		KeyFile:  filepath.Join(dockerCertPath, "key.pem"),
-	}
-	tlsConfig, err := tlsconfig.Client(*option)
-	if err != nil {
-		return nil, err
-	}
-
-	return tlsConfig, nil
-}
-
-func sockConn(timeout time.Duration, daemon string) (net.Conn, error) {
-	if daemon == "" {
-		daemon = daemonHost()
-	}
-	daemonURL, err := url.Parse(daemon)
-	if err != nil {
-		return nil, fmt.Errorf("could not parse url %q: %v", daemon, err)
-	}
-
-	var c net.Conn
-	switch daemonURL.Scheme {
-	case "npipe":
-		return npipeDial(daemonURL.Path, timeout)
-	case "unix":
-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Path, timeout)
-	case "tcp":
-		if os.Getenv("DOCKER_TLS_VERIFY") != "" {
-			// Setup the socket TLS configuration.
-			tlsConfig, err := getTLSConfig()
-			if err != nil {
-				return nil, err
-			}
-			dialer := &net.Dialer{Timeout: timeout}
-			return tls.DialWithDialer(dialer, daemonURL.Scheme, daemonURL.Host, tlsConfig)
-		}
-		return net.DialTimeout(daemonURL.Scheme, daemonURL.Host, timeout)
-	default:
-		return c, fmt.Errorf("unknown scheme %v (%s)", daemonURL.Scheme, daemon)
-	}
-}
-
-func sockRequest(method, endpoint string, data interface{}) (int, []byte, error) {
-	jsonData := bytes.NewBuffer(nil)
-	if err := json.NewEncoder(jsonData).Encode(data); err != nil {
-		return -1, nil, err
-	}
-
-	res, body, err := sockRequestRaw(method, endpoint, jsonData, "application/json")
-	if err != nil {
-		return -1, nil, err
-	}
-	b, err := readBody(body)
-	return res.StatusCode, b, err
-}
-
-func sockRequestRaw(method, endpoint string, data io.Reader, ct string) (*http.Response, io.ReadCloser, error) {
-	return sockRequestRawToDaemon(method, endpoint, data, ct, "")
-}
-
-func sockRequestRawToDaemon(method, endpoint string, data io.Reader, ct, daemon string) (*http.Response, io.ReadCloser, error) {
-	req, client, err := newRequestClient(method, endpoint, data, ct, daemon)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	resp, err := client.Do(req)
-	if err != nil {
-		client.Close()
-		return nil, nil, err
-	}
-	body := ioutils.NewReadCloserWrapper(resp.Body, func() error {
-		defer resp.Body.Close()
-		return client.Close()
-	})
-
-	return resp, body, nil
-}
-
-func sockRequestHijack(method, endpoint string, data io.Reader, ct string) (net.Conn, *bufio.Reader, error) {
-	req, client, err := newRequestClient(method, endpoint, data, ct, "")
-	if err != nil {
-		return nil, nil, err
-	}
-
-	client.Do(req)
-	conn, br := client.Hijack()
-	return conn, br, nil
-}
-
-func newRequestClient(method, endpoint string, data io.Reader, ct, daemon string) (*http.Request, *httputil.ClientConn, error) {
-	c, err := sockConn(time.Duration(10*time.Second), daemon)
-	if err != nil {
-		return nil, nil, fmt.Errorf("could not dial docker daemon: %v", err)
-	}
-
-	client := httputil.NewClientConn(c, nil)
-
-	req, err := http.NewRequest(method, endpoint, data)
-	if err != nil {
-		client.Close()
-		return nil, nil, fmt.Errorf("could not create new request: %v", err)
-	}
-
-	if ct != "" {
-		req.Header.Set("Content-Type", ct)
-	}
-	return req, client, nil
-}
-
-func readBody(b io.ReadCloser) ([]byte, error) {
-	defer b.Close()
-	return ioutil.ReadAll(b)
-}
-
-func deleteContainer(container ...string) error {
-	result := icmd.RunCommand(dockerBinary, append([]string{"rm", "-fv"}, container...)...)
-	return result.Compare(icmd.Success)
-}
-
-func getAllContainers() (string, error) {
-	getContainersCmd := exec.Command(dockerBinary, "ps", "-q", "-a")
-	out, exitCode, err := runCommandWithOutput(getContainersCmd)
-	if exitCode != 0 && err == nil {
-		err = fmt.Errorf("failed to get a list of containers: %v\n", out)
-	}
-
-	return out, err
-}
-
-func deleteAllContainers() error {
-	containers, err := getAllContainers()
-	if err != nil {
-		fmt.Println(containers)
-		return err
-	}
-	if containers == "" {
-		return nil
-	}
-
-	err = deleteContainer(strings.Split(strings.TrimSpace(containers), "\n")...)
-	if err != nil {
-		fmt.Println(err.Error())
-	}
-	return err
-}
-
-func deleteAllNetworks() error {
-	networks, err := getAllNetworks()
-	if err != nil {
-		return err
-	}
-	var errors []string
-	for _, n := range networks {
-		if n.Name == "bridge" || n.Name == "none" || n.Name == "host" {
-			continue
-		}
-		if daemonPlatform == "windows" && strings.ToLower(n.Name) == "nat" {
-			// nat is a pre-defined network on Windows and cannot be removed
-			continue
-		}
-		status, b, err := sockRequest("DELETE", "/networks/"+n.Name, nil)
-		if err != nil {
-			errors = append(errors, err.Error())
-			continue
-		}
-		if status != http.StatusNoContent {
-			errors = append(errors, fmt.Sprintf("error deleting network %s: %s", n.Name, string(b)))
-		}
-	}
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, "\n"))
-	}
-	return nil
-}
-
-func getAllNetworks() ([]types.NetworkResource, error) {
-	var networks []types.NetworkResource
-	_, b, err := sockRequest("GET", "/networks", nil)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(b, &networks); err != nil {
-		return nil, err
-	}
-	return networks, nil
-}
-
-func deleteAllPlugins() error {
-	plugins, err := getAllPlugins()
-	if err != nil {
-		return err
-	}
-	var errors []string
-	for _, p := range plugins {
-		status, b, err := sockRequest("DELETE", "/plugins/"+p.Name+"?force=1", nil)
-		if err != nil {
-			errors = append(errors, err.Error())
-			continue
-		}
-		if status != http.StatusNoContent {
-			errors = append(errors, fmt.Sprintf("error deleting plugin %s: %s", p.Name, string(b)))
-		}
-	}
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, "\n"))
-	}
-	return nil
-}
-
-func getAllPlugins() (types.PluginsListResponse, error) {
-	var plugins types.PluginsListResponse
-	_, b, err := sockRequest("GET", "/plugins", nil)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(b, &plugins); err != nil {
-		return nil, err
-	}
-	return plugins, nil
-}
-
-func deleteAllVolumes() error {
-	volumes, err := getAllVolumes()
-	if err != nil {
-		return err
-	}
-	var errors []string
-	for _, v := range volumes {
-		status, b, err := sockRequest("DELETE", "/volumes/"+v.Name, nil)
-		if err != nil {
-			errors = append(errors, err.Error())
-			continue
-		}
-		if status != http.StatusNoContent {
-			errors = append(errors, fmt.Sprintf("error deleting volume %s: %s", v.Name, string(b)))
-		}
-	}
-	if len(errors) > 0 {
-		return fmt.Errorf(strings.Join(errors, "\n"))
-	}
-	return nil
-}
-
-func getAllVolumes() ([]*types.Volume, error) {
-	var volumes volumetypes.VolumesListOKBody
-	_, b, err := sockRequest("GET", "/volumes", nil)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(b, &volumes); err != nil {
-		return nil, err
-	}
-	return volumes.Volumes, nil
-}
-
-var protectedImages = map[string]struct{}{}
-
-func deleteAllImages() error {
-	cmd := exec.Command(dockerBinary, "images")
-	cmd.Env = appendBaseEnv(true)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return err
-	}
-	lines := strings.Split(string(out), "\n")[1:]
-	var imgs []string
-	for _, l := range lines {
-		if l == "" {
-			continue
-		}
-		fields := strings.Fields(l)
-		imgTag := fields[0] + ":" + fields[1]
-		if _, ok := protectedImages[imgTag]; !ok {
-			if fields[0] == "<none>" {
-				imgs = append(imgs, fields[2])
-				continue
-			}
-			imgs = append(imgs, imgTag)
-		}
-	}
-	if len(imgs) == 0 {
-		return nil
-	}
-	args := append([]string{"rmi", "-f"}, imgs...)
-	if err := exec.Command(dockerBinary, args...).Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-func getPausedContainers() (string, error) {
-	getPausedContainersCmd := exec.Command(dockerBinary, "ps", "-f", "status=paused", "-q", "-a")
-	out, exitCode, err := runCommandWithOutput(getPausedContainersCmd)
-	if exitCode != 0 && err == nil {
-		err = fmt.Errorf("failed to get a list of paused containers: %v\n", out)
-	}
-
-	return out, err
-}
-
-func getSliceOfPausedContainers() ([]string, error) {
-	out, err := getPausedContainers()
-	if err == nil {
-		if len(out) == 0 {
-			return nil, err
-		}
-		slice := strings.Split(strings.TrimSpace(out), "\n")
-		return slice, err
-	}
-	return []string{out}, err
-}
-
-func unpauseContainer(container string) error {
-	return icmd.RunCommand(dockerBinary, "unpause", container).Error
-}
-
-func unpauseAllContainers() error {
-	containers, err := getPausedContainers()
-	if err != nil {
-		fmt.Println(containers)
-		return err
-	}
-
-	containers = strings.Replace(containers, "\n", " ", -1)
-	containers = strings.Trim(containers, " ")
-	containerList := strings.Split(containers, " ")
-
-	for _, value := range containerList {
-		if err = unpauseContainer(value); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func deleteImages(images ...string) error {
-	args := []string{dockerBinary, "rmi", "-f"}
-	return icmd.RunCmd(icmd.Cmd{Command: append(args, images...)}).Error
-}
-
-func imageExists(image string) error {
-	return icmd.RunCommand(dockerBinary, "inspect", image).Error
-}
-
-func pullImageIfNotExist(image string) error {
-	if err := imageExists(image); err != nil {
-		pullCmd := exec.Command(dockerBinary, "pull", image)
-		_, exitCode, err := runCommandWithOutput(pullCmd)
-
-		if err != nil || exitCode != 0 {
-			return fmt.Errorf("image %q wasn't found locally and it couldn't be pulled: %s", image, err)
-		}
-	}
-	return nil
-}
-
-func dockerCmdWithError(args ...string) (string, int, error) {
-	if err := validateArgs(args...); err != nil {
-		return "", 0, err
-	}
-	result := icmd.RunCommand(dockerBinary, args...)
-	if result.Error != nil {
-		return result.Combined(), result.ExitCode, result.Compare(icmd.Success)
-	}
-	return result.Combined(), result.ExitCode, result.Error
-}
-
-func dockerCmdWithStdoutStderr(c *check.C, args ...string) (string, string, int) {
-	if err := validateArgs(args...); err != nil {
-		c.Fatalf(err.Error())
-	}
-
-	result := icmd.RunCommand(dockerBinary, args...)
-	// TODO: why is c ever nil?
-	if c != nil {
-		c.Assert(result, icmd.Matches, icmd.Success)
-	}
-	return result.Stdout(), result.Stderr(), result.ExitCode
-}
-
-func dockerCmd(c *check.C, args ...string) (string, int) {
-	if err := validateArgs(args...); err != nil {
-		c.Fatalf(err.Error())
-	}
-	result := icmd.RunCommand(dockerBinary, args...)
-	c.Assert(result, icmd.Matches, icmd.Success)
-	return result.Combined(), result.ExitCode
-}
-
-func dockerCmdWithResult(args ...string) *icmd.Result {
-	return icmd.RunCommand(dockerBinary, args...)
-}
-
-func binaryWithArgs(args ...string) []string {
-	return append([]string{dockerBinary}, args...)
-}
-
-// execute a docker command with a timeout
-func dockerCmdWithTimeout(timeout time.Duration, args ...string) *icmd.Result {
-	if err := validateArgs(args...); err != nil {
-		return &icmd.Result{Error: err}
-	}
-	return icmd.RunCmd(icmd.Cmd{Command: binaryWithArgs(args...), Timeout: timeout})
-}
-
-// execute a docker command in a directory
-func dockerCmdInDir(c *check.C, path string, args ...string) (string, int, error) {
-	if err := validateArgs(args...); err != nil {
-		c.Fatalf(err.Error())
-	}
-	result := icmd.RunCmd(icmd.Cmd{Command: binaryWithArgs(args...), Dir: path})
-	return result.Combined(), result.ExitCode, result.Error
-}
-
-// execute a docker command in a directory with a timeout
-func dockerCmdInDirWithTimeout(timeout time.Duration, path string, args ...string) *icmd.Result {
-	if err := validateArgs(args...); err != nil {
-		return &icmd.Result{Error: err}
-	}
-	return icmd.RunCmd(icmd.Cmd{
-		Command: binaryWithArgs(args...),
-		Timeout: timeout,
-		Dir:     path,
-	})
-}
-
-// validateArgs is a checker to ensure tests are not running commands which are
-// not supported on platforms. Specifically on Windows this is 'busybox top'.
-func validateArgs(args ...string) error {
-	if daemonPlatform != "windows" {
-		return nil
-	}
-	foundBusybox := -1
-	for key, value := range args {
-		if strings.ToLower(value) == "busybox" {
-			foundBusybox = key
-		}
-		if (foundBusybox != -1) && (key == foundBusybox+1) && (strings.ToLower(value) == "top") {
-			return errors.New("cannot use 'busybox top' in tests on Windows. Use runSleepingContainer()")
-		}
-	}
-	return nil
-}
-
-// find the State.ExitCode in container metadata
-func findContainerExitCode(c *check.C, name string, vargs ...string) string {
-	args := append(vargs, "inspect", "--format='{{ .State.ExitCode }} {{ .State.Error }}'", name)
-	cmd := exec.Command(dockerBinary, args...)
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		c.Fatal(err, out)
-	}
-	return out
-}
-
-func findContainerIP(c *check.C, id string, network string) string {
-	out, _ := dockerCmd(c, "inspect", fmt.Sprintf("--format='{{ .NetworkSettings.Networks.%s.IPAddress }}'", network), id)
-	return strings.Trim(out, " \r\n'")
-}
-
-func getContainerCount() (int, error) {
-	const containers = "Containers:"
-
-	cmd := exec.Command(dockerBinary, "info")
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		return 0, err
-	}
-
-	lines := strings.Split(out, "\n")
-	for _, line := range lines {
-		if strings.Contains(line, containers) {
-			output := strings.TrimSpace(line)
-			output = strings.TrimLeft(output, containers)
-			output = strings.Trim(output, " ")
-			containerCount, err := strconv.Atoi(output)
-			if err != nil {
-				return 0, err
-			}
-			return containerCount, nil
-		}
-	}
-	return 0, fmt.Errorf("couldn't find the Container count in the output")
-}
-
-// FakeContext creates directories that can be used as a build context
-type FakeContext struct {
-	Dir string
-}
-
-// Add a file at a path, creating directories where necessary
-func (f *FakeContext) Add(file, content string) error {
-	return f.addFile(file, []byte(content))
-}
-
-func (f *FakeContext) addFile(file string, content []byte) error {
-	fp := filepath.Join(f.Dir, filepath.FromSlash(file))
-	dirpath := filepath.Dir(fp)
-	if dirpath != "." {
-		if err := os.MkdirAll(dirpath, 0755); err != nil {
-			return err
-		}
-	}
-	return ioutil.WriteFile(fp, content, 0644)
-
-}
-
-// Delete a file at a path
-func (f *FakeContext) Delete(file string) error {
-	fp := filepath.Join(f.Dir, filepath.FromSlash(file))
-	return os.RemoveAll(fp)
-}
-
-// Close deletes the context
-func (f *FakeContext) Close() error {
-	return os.RemoveAll(f.Dir)
-}
-
-func fakeContextFromNewTempDir() (*FakeContext, error) {
-	tmp, err := ioutil.TempDir("", "fake-context")
-	if err != nil {
-		return nil, err
-	}
-	if err := os.Chmod(tmp, 0755); err != nil {
-		return nil, err
-	}
-	return fakeContextFromDir(tmp), nil
-}
-
-func fakeContextFromDir(dir string) *FakeContext {
-	return &FakeContext{dir}
-}
-
-func fakeContextWithFiles(files map[string]string) (*FakeContext, error) {
-	ctx, err := fakeContextFromNewTempDir()
-	if err != nil {
-		return nil, err
-	}
-	for file, content := range files {
-		if err := ctx.Add(file, content); err != nil {
-			ctx.Close()
-			return nil, err
-		}
-	}
-	return ctx, nil
-}
-
-func fakeContextAddDockerfile(ctx *FakeContext, dockerfile string) error {
-	if err := ctx.Add("Dockerfile", dockerfile); err != nil {
-		ctx.Close()
-		return err
-	}
-	return nil
-}
-
-func fakeContext(dockerfile string, files map[string]string) (*FakeContext, error) {
-	ctx, err := fakeContextWithFiles(files)
-	if err != nil {
-		return nil, err
-	}
-	if err := fakeContextAddDockerfile(ctx, dockerfile); err != nil {
-		return nil, err
-	}
-	return ctx, nil
-}
-
-// FakeStorage is a static file server. It might be running locally or remotely
-// on test host.
-type FakeStorage interface {
-	Close() error
-	URL() string
-	CtxDir() string
-}
-
-func fakeBinaryStorage(archives map[string]*bytes.Buffer) (FakeStorage, error) {
-	ctx, err := fakeContextFromNewTempDir()
-	if err != nil {
-		return nil, err
-	}
-	for name, content := range archives {
-		if err := ctx.addFile(name, content.Bytes()); err != nil {
-			return nil, err
-		}
-	}
-	return fakeStorageWithContext(ctx)
-}
-
-// fakeStorage returns either a local or remote (at daemon machine) file server
-func fakeStorage(files map[string]string) (FakeStorage, error) {
-	ctx, err := fakeContextWithFiles(files)
-	if err != nil {
-		return nil, err
-	}
-	return fakeStorageWithContext(ctx)
-}
-
-// fakeStorageWithContext returns either a local or remote (at daemon machine) file server
-func fakeStorageWithContext(ctx *FakeContext) (FakeStorage, error) {
-	if isLocalDaemon {
-		return newLocalFakeStorage(ctx)
-	}
-	return newRemoteFileServer(ctx)
-}
-
-// localFileStorage is a file storage on the running machine
-type localFileStorage struct {
-	*FakeContext
-	*httptest.Server
-}
-
-func (s *localFileStorage) URL() string {
-	return s.Server.URL
-}
-
-func (s *localFileStorage) CtxDir() string {
-	return s.FakeContext.Dir
-}
-
-func (s *localFileStorage) Close() error {
-	defer s.Server.Close()
-	return s.FakeContext.Close()
-}
-
-func newLocalFakeStorage(ctx *FakeContext) (*localFileStorage, error) {
-	handler := http.FileServer(http.Dir(ctx.Dir))
-	server := httptest.NewServer(handler)
-	return &localFileStorage{
-		FakeContext: ctx,
-		Server:      server,
-	}, nil
-}
-
-// remoteFileServer is a containerized static file server started on the remote
-// testing machine to be used in URL-accepting docker build functionality.
-type remoteFileServer struct {
-	host      string // hostname/port web server is listening to on docker host e.g. 0.0.0.0:43712
-	container string
-	image     string
-	ctx       *FakeContext
-}
-
-func (f *remoteFileServer) URL() string {
-	u := url.URL{
-		Scheme: "http",
-		Host:   f.host}
-	return u.String()
-}
-
-func (f *remoteFileServer) CtxDir() string {
-	return f.ctx.Dir
-}
-
-func (f *remoteFileServer) Close() error {
-	defer func() {
-		if f.ctx != nil {
-			f.ctx.Close()
-		}
-		if f.image != "" {
-			deleteImages(f.image)
-		}
-	}()
-	if f.container == "" {
-		return nil
-	}
-	return deleteContainer(f.container)
-}
-
-func newRemoteFileServer(ctx *FakeContext) (*remoteFileServer, error) {
-	var (
-		image     = fmt.Sprintf("fileserver-img-%s", strings.ToLower(stringutils.GenerateRandomAlphaOnlyString(10)))
-		container = fmt.Sprintf("fileserver-cnt-%s", strings.ToLower(stringutils.GenerateRandomAlphaOnlyString(10)))
-	)
-
-	if err := ensureHTTPServerImage(); err != nil {
-		return nil, err
-	}
-
-	// Build the image
-	if err := fakeContextAddDockerfile(ctx, `FROM httpserver
-COPY . /static`); err != nil {
-		return nil, fmt.Errorf("Cannot add Dockerfile to context: %v", err)
-	}
-	if _, err := buildImageFromContext(image, ctx, false); err != nil {
-		return nil, fmt.Errorf("failed building file storage container image: %v", err)
-	}
-
-	// Start the container
-	runCmd := exec.Command(dockerBinary, "run", "-d", "-P", "--name", container, image)
-	if out, ec, err := runCommandWithOutput(runCmd); err != nil {
-		return nil, fmt.Errorf("failed to start file storage container. ec=%v\nout=%s\nerr=%v", ec, out, err)
-	}
-
-	// Find out the system assigned port
-	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "port", container, "80/tcp"))
-	if err != nil {
-		return nil, fmt.Errorf("failed to find container port: err=%v\nout=%s", err, out)
-	}
-
-	fileserverHostPort := strings.Trim(out, "\n")
-	_, port, err := net.SplitHostPort(fileserverHostPort)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse file server host:port: %v", err)
-	}
-
-	dockerHostURL, err := url.Parse(daemonHost())
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse daemon host URL: %v", err)
-	}
-
-	host, _, err := net.SplitHostPort(dockerHostURL.Host)
-	if err != nil {
-		return nil, fmt.Errorf("unable to parse docker daemon host:port: %v", err)
-	}
-
-	return &remoteFileServer{
-		container: container,
-		image:     image,
-		host:      fmt.Sprintf("%s:%s", host, port),
-		ctx:       ctx}, nil
-}
-
-func inspectFieldAndMarshall(c *check.C, name, field string, output interface{}) {
-	str := inspectFieldJSON(c, name, field)
-	err := json.Unmarshal([]byte(str), output)
-	if c != nil {
-		c.Assert(err, check.IsNil, check.Commentf("failed to unmarshal: %v", err))
-	}
-}
-
-func inspectFilter(name, filter string) (string, error) {
-	format := fmt.Sprintf("{{%s}}", filter)
-	inspectCmd := exec.Command(dockerBinary, "inspect", "-f", format, name)
-	out, exitCode, err := runCommandWithOutput(inspectCmd)
-	if err != nil || exitCode != 0 {
-		return "", fmt.Errorf("failed to inspect %s: %s", name, out)
-	}
-	return strings.TrimSpace(out), nil
-}
-
-func inspectFieldWithError(name, field string) (string, error) {
-	return inspectFilter(name, fmt.Sprintf(".%s", field))
-}
-
-func inspectField(c *check.C, name, field string) string {
-	out, err := inspectFilter(name, fmt.Sprintf(".%s", field))
-	if c != nil {
-		c.Assert(err, check.IsNil)
-	}
-	return out
-}
-
-func inspectFieldJSON(c *check.C, name, field string) string {
-	out, err := inspectFilter(name, fmt.Sprintf("json .%s", field))
-	if c != nil {
-		c.Assert(err, check.IsNil)
-	}
-	return out
-}
-
-func inspectFieldMap(c *check.C, name, path, field string) string {
-	out, err := inspectFilter(name, fmt.Sprintf("index .%s %q", path, field))
-	if c != nil {
-		c.Assert(err, check.IsNil)
-	}
-	return out
-}
-
-func inspectMountSourceField(name, destination string) (string, error) {
-	m, err := inspectMountPoint(name, destination)
-	if err != nil {
-		return "", err
-	}
-	return m.Source, nil
-}
-
-func inspectMountPoint(name, destination string) (types.MountPoint, error) {
-	out, err := inspectFilter(name, "json .Mounts")
-	if err != nil {
-		return types.MountPoint{}, err
-	}
-
-	return inspectMountPointJSON(out, destination)
-}
-
-var errMountNotFound = errors.New("mount point not found")
-
-func inspectMountPointJSON(j, destination string) (types.MountPoint, error) {
-	var mp []types.MountPoint
-	if err := json.Unmarshal([]byte(j), &mp); err != nil {
-		return types.MountPoint{}, err
-	}
-
-	var m *types.MountPoint
-	for _, c := range mp {
-		if c.Destination == destination {
-			m = &c
-			break
-		}
-	}
-
-	if m == nil {
-		return types.MountPoint{}, errMountNotFound
-	}
-
-	return *m, nil
-}
-
-func inspectImage(name, filter string) (string, error) {
-	args := []string{"inspect", "--type", "image"}
-	if filter != "" {
-		format := fmt.Sprintf("{{%s}}", filter)
-		args = append(args, "-f", format)
-	}
-	args = append(args, name)
-	inspectCmd := exec.Command(dockerBinary, args...)
-	out, exitCode, err := runCommandWithOutput(inspectCmd)
-	if err != nil || exitCode != 0 {
-		return "", fmt.Errorf("failed to inspect %s: %s", name, out)
-	}
-	return strings.TrimSpace(out), nil
-}
-
-func getIDByName(name string) (string, error) {
-	return inspectFieldWithError(name, "Id")
-}
-
-// getContainerState returns the exit code of the container
-// and true if it's running
-// the exit code should be ignored if it's running
-func getContainerState(c *check.C, id string) (int, bool, error) {
-	var (
-		exitStatus int
-		running    bool
-	)
-	out, exitCode := dockerCmd(c, "inspect", "--format={{.State.Running}} {{.State.ExitCode}}", id)
-	if exitCode != 0 {
-		return 0, false, fmt.Errorf("%q doesn't exist: %s", id, out)
-	}
-
-	out = strings.Trim(out, "\n")
-	splitOutput := strings.Split(out, " ")
-	if len(splitOutput) != 2 {
-		return 0, false, fmt.Errorf("failed to get container state: output is broken")
-	}
-	if splitOutput[0] == "true" {
-		running = true
-	}
-	if n, err := strconv.Atoi(splitOutput[1]); err == nil {
-		exitStatus = n
-	} else {
-		return 0, false, fmt.Errorf("failed to get container state: couldn't parse integer")
-	}
-
-	return exitStatus, running, nil
-}
-
-func buildImageCmd(name, dockerfile string, useCache bool, buildFlags ...string) *exec.Cmd {
-	return buildImageCmdWithHost(name, dockerfile, "", useCache, buildFlags...)
-}
-
-func buildImageCmdWithHost(name, dockerfile, host string, useCache bool, buildFlags ...string) *exec.Cmd {
-	args := []string{}
-	if host != "" {
-		args = append(args, "--host", host)
-	}
-	args = append(args, "build", "-t", name)
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, buildFlags...)
-	args = append(args, "-")
-	buildCmd := exec.Command(dockerBinary, args...)
-	buildCmd.Stdin = strings.NewReader(dockerfile)
-	return buildCmd
-}
-
-func buildImageWithOut(name, dockerfile string, useCache bool, buildFlags ...string) (string, string, error) {
-	buildCmd := buildImageCmd(name, dockerfile, useCache, buildFlags...)
-	out, exitCode, err := runCommandWithOutput(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", out, fmt.Errorf("failed to build the image: %s", out)
-	}
-	id, err := getIDByName(name)
-	if err != nil {
-		return "", out, err
-	}
-	return id, out, nil
-}
-
-func buildImageWithStdoutStderr(name, dockerfile string, useCache bool, buildFlags ...string) (string, string, string, error) {
-	buildCmd := buildImageCmd(name, dockerfile, useCache, buildFlags...)
-	stdout, stderr, exitCode, err := runCommandWithStdoutStderr(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", stdout, stderr, fmt.Errorf("failed to build the image: %s", stdout)
-	}
-	id, err := getIDByName(name)
-	if err != nil {
-		return "", stdout, stderr, err
-	}
-	return id, stdout, stderr, nil
-}
-
-func buildImage(name, dockerfile string, useCache bool, buildFlags ...string) (string, error) {
-	id, _, err := buildImageWithOut(name, dockerfile, useCache, buildFlags...)
-	return id, err
-}
-
-func buildImageFromContext(name string, ctx *FakeContext, useCache bool, buildFlags ...string) (string, error) {
-	id, _, err := buildImageFromContextWithOut(name, ctx, useCache, buildFlags...)
-	if err != nil {
-		return "", err
-	}
-	return id, nil
-}
-
-func buildImageFromContextWithOut(name string, ctx *FakeContext, useCache bool, buildFlags ...string) (string, string, error) {
-	args := []string{"build", "-t", name}
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, buildFlags...)
-	args = append(args, ".")
-	buildCmd := exec.Command(dockerBinary, args...)
-	buildCmd.Dir = ctx.Dir
-	out, exitCode, err := runCommandWithOutput(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", "", fmt.Errorf("failed to build the image: %s", out)
-	}
-	id, err := getIDByName(name)
-	if err != nil {
-		return "", "", err
-	}
-	return id, out, nil
-}
-
-func buildImageFromContextWithStdoutStderr(name string, ctx *FakeContext, useCache bool, buildFlags ...string) (string, string, string, error) {
-	args := []string{"build", "-t", name}
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, buildFlags...)
-	args = append(args, ".")
-	buildCmd := exec.Command(dockerBinary, args...)
-	buildCmd.Dir = ctx.Dir
-
-	stdout, stderr, exitCode, err := runCommandWithStdoutStderr(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", stdout, stderr, fmt.Errorf("failed to build the image: %s", stdout)
-	}
-	id, err := getIDByName(name)
-	if err != nil {
-		return "", stdout, stderr, err
-	}
-	return id, stdout, stderr, nil
-}
-
-func buildImageFromGitWithStdoutStderr(name string, ctx *fakeGit, useCache bool, buildFlags ...string) (string, string, string, error) {
-	args := []string{"build", "-t", name}
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, buildFlags...)
-	args = append(args, ctx.RepoURL)
-	buildCmd := exec.Command(dockerBinary, args...)
-
-	stdout, stderr, exitCode, err := runCommandWithStdoutStderr(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", stdout, stderr, fmt.Errorf("failed to build the image: %s", stdout)
-	}
-	id, err := getIDByName(name)
-	if err != nil {
-		return "", stdout, stderr, err
-	}
-	return id, stdout, stderr, nil
-}
-
-func buildImageFromPath(name, path string, useCache bool, buildFlags ...string) (string, error) {
-	args := []string{"build", "-t", name}
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, buildFlags...)
-	args = append(args, path)
-	buildCmd := exec.Command(dockerBinary, args...)
-	out, exitCode, err := runCommandWithOutput(buildCmd)
-	if err != nil || exitCode != 0 {
-		return "", fmt.Errorf("failed to build the image: %s", out)
-	}
-	return getIDByName(name)
-}
-
-type gitServer interface {
-	URL() string
-	Close() error
-}
-
-type localGitServer struct {
-	*httptest.Server
-}
-
-func (r *localGitServer) Close() error {
-	r.Server.Close()
-	return nil
-}
-
-func (r *localGitServer) URL() string {
-	return r.Server.URL
-}
-
-type fakeGit struct {
-	root    string
-	server  gitServer
-	RepoURL string
-}
-
-func (g *fakeGit) Close() {
-	g.server.Close()
-	os.RemoveAll(g.root)
-}
-
-func newFakeGit(name string, files map[string]string, enforceLocalServer bool) (*fakeGit, error) {
-	ctx, err := fakeContextWithFiles(files)
-	if err != nil {
-		return nil, err
-	}
-	defer ctx.Close()
-	curdir, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-	defer os.Chdir(curdir)
-
-	if output, err := exec.Command("git", "init", ctx.Dir).CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("error trying to init repo: %s (%s)", err, output)
-	}
-	err = os.Chdir(ctx.Dir)
-	if err != nil {
-		return nil, err
-	}
-	if output, err := exec.Command("git", "config", "user.name", "Fake User").CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("error trying to set 'user.name': %s (%s)", err, output)
-	}
-	if output, err := exec.Command("git", "config", "user.email", "fake.user@example.com").CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("error trying to set 'user.email': %s (%s)", err, output)
-	}
-	if output, err := exec.Command("git", "add", "*").CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("error trying to add files to repo: %s (%s)", err, output)
-	}
-	if output, err := exec.Command("git", "commit", "-a", "-m", "Initial commit").CombinedOutput(); err != nil {
-		return nil, fmt.Errorf("error trying to commit to repo: %s (%s)", err, output)
-	}
-
-	root, err := ioutil.TempDir("", "docker-test-git-repo")
-	if err != nil {
-		return nil, err
-	}
-	repoPath := filepath.Join(root, name+".git")
-	if output, err := exec.Command("git", "clone", "--bare", ctx.Dir, repoPath).CombinedOutput(); err != nil {
-		os.RemoveAll(root)
-		return nil, fmt.Errorf("error trying to clone --bare: %s (%s)", err, output)
-	}
-	err = os.Chdir(repoPath)
-	if err != nil {
-		os.RemoveAll(root)
-		return nil, err
-	}
-	if output, err := exec.Command("git", "update-server-info").CombinedOutput(); err != nil {
-		os.RemoveAll(root)
-		return nil, fmt.Errorf("error trying to git update-server-info: %s (%s)", err, output)
-	}
-	err = os.Chdir(curdir)
-	if err != nil {
-		os.RemoveAll(root)
-		return nil, err
-	}
-
-	var server gitServer
-	if !enforceLocalServer {
-		// use fakeStorage server, which might be local or remote (at test daemon)
-		server, err = fakeStorageWithContext(fakeContextFromDir(root))
-		if err != nil {
-			return nil, fmt.Errorf("cannot start fake storage: %v", err)
-		}
-	} else {
-		// always start a local http server on CLI test machine
-		httpServer := httptest.NewServer(http.FileServer(http.Dir(root)))
-		server = &localGitServer{httpServer}
-	}
-	return &fakeGit{
-		root:    root,
-		server:  server,
-		RepoURL: fmt.Sprintf("%s/%s.git", server.URL(), name),
-	}, nil
-}
-
-// Write `content` to the file at path `dst`, creating it if necessary,
-// as well as any missing directories.
-// The file is truncated if it already exists.
-// Fail the test when error occurs.
-func writeFile(dst, content string, c *check.C) {
-	// Create subdirectories if necessary
-	c.Assert(os.MkdirAll(path.Dir(dst), 0700), check.IsNil)
-	f, err := os.OpenFile(dst, os.O_CREATE|os.O_RDWR|os.O_TRUNC, 0700)
-	c.Assert(err, check.IsNil)
-	defer f.Close()
-	// Write content (truncate if it exists)
-	_, err = io.Copy(f, strings.NewReader(content))
-	c.Assert(err, check.IsNil)
-}
-
-// Return the contents of file at path `src`.
-// Fail the test when error occurs.
-func readFile(src string, c *check.C) (content string) {
-	data, err := ioutil.ReadFile(src)
-	c.Assert(err, check.IsNil)
-
-	return string(data)
-}
-
-func containerStorageFile(containerID, basename string) string {
-	return filepath.Join(containerStoragePath, containerID, basename)
-}
-
-// docker commands that use this function must be run with the '-d' switch.
-func runCommandAndReadContainerFile(filename string, cmd *exec.Cmd) ([]byte, error) {
-	out, _, err := runCommandWithOutput(cmd)
-	if err != nil {
-		return nil, fmt.Errorf("%v: %q", err, out)
-	}
-
-	contID := strings.TrimSpace(out)
-
-	if err := waitRun(contID); err != nil {
-		return nil, fmt.Errorf("%v: %q", contID, err)
-	}
-
-	return readContainerFile(contID, filename)
-}
-
-func readContainerFile(containerID, filename string) ([]byte, error) {
-	f, err := os.Open(containerStorageFile(containerID, filename))
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	content, err := ioutil.ReadAll(f)
-	if err != nil {
-		return nil, err
-	}
-
-	return content, nil
-}
-
-func readContainerFileWithExec(containerID, filename string) ([]byte, error) {
-	out, _, err := runCommandWithOutput(exec.Command(dockerBinary, "exec", containerID, "cat", filename))
-	return []byte(out), err
-}
-
-// daemonTime provides the current time on the daemon host
-func daemonTime(c *check.C) time.Time {
-	if isLocalDaemon {
-		return time.Now()
-	}
-
-	status, body, err := sockRequest("GET", "/info", nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-
-	type infoJSON struct {
-		SystemTime string
-	}
-	var info infoJSON
-	err = json.Unmarshal(body, &info)
-	c.Assert(err, check.IsNil, check.Commentf("unable to unmarshal GET /info response"))
-
-	dt, err := time.Parse(time.RFC3339Nano, info.SystemTime)
-	c.Assert(err, check.IsNil, check.Commentf("invalid time format in GET /info response"))
-	return dt
-}
-
-// daemonUnixTime returns the current time on the daemon host with nanoseconds precision.
-// It return the time formatted how the client sends timestamps to the server.
-func daemonUnixTime(c *check.C) string {
-	return parseEventTime(daemonTime(c))
-}
-
-func parseEventTime(t time.Time) string {
-	return fmt.Sprintf("%d.%09d", t.Unix(), int64(t.Nanosecond()))
-}
-
-func setupRegistry(c *check.C, schema1 bool, auth, tokenURL string) *testRegistryV2 {
-	reg, err := newTestRegistryV2(c, schema1, auth, tokenURL)
-	c.Assert(err, check.IsNil)
-
-	// Wait for registry to be ready to serve requests.
-	for i := 0; i != 50; i++ {
-		if err = reg.Ping(); err == nil {
-			break
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-
-	c.Assert(err, check.IsNil, check.Commentf("Timeout waiting for test registry to become available: %v", err))
-	return reg
-}
-
-func setupNotary(c *check.C) *testNotary {
-	ts, err := newTestNotary(c)
-	c.Assert(err, check.IsNil)
-
-	return ts
-}
-
-// appendBaseEnv appends the minimum set of environment variables to exec the
-// docker cli binary for testing with correct configuration to the given env
-// list.
-func appendBaseEnv(isTLS bool, env ...string) []string {
-	preserveList := []string{
-		// preserve remote test host
-		"DOCKER_HOST",
-
-		// windows: requires preserving SystemRoot, otherwise dial tcp fails
-		// with "GetAddrInfoW: A non-recoverable error occurred during a database lookup."
-		"SystemRoot",
-
-		// testing help text requires the $PATH to dockerd is set
-		"PATH",
-	}
-	if isTLS {
-		preserveList = append(preserveList, "DOCKER_TLS_VERIFY", "DOCKER_CERT_PATH")
-	}
-
-	for _, key := range preserveList {
-		if val := os.Getenv(key); val != "" {
-			env = append(env, fmt.Sprintf("%s=%s", key, val))
-		}
-	}
-	return env
-}
-
-func createTmpFile(c *check.C, content string) string {
-	f, err := ioutil.TempFile("", "testfile")
-	c.Assert(err, check.IsNil)
-
-	filename := f.Name()
-
-	err = ioutil.WriteFile(filename, []byte(content), 0644)
-	c.Assert(err, check.IsNil)
-
-	return filename
-}
-
-func buildImageWithOutInDamon(socket string, name, dockerfile string, useCache bool) (string, error) {
-	args := []string{"--host", socket}
-	buildCmd := buildImageCmdArgs(args, name, dockerfile, useCache)
-	out, exitCode, err := runCommandWithOutput(buildCmd)
-	if err != nil || exitCode != 0 {
-		return out, fmt.Errorf("failed to build the image: %s, error: %v", out, err)
-	}
-	return out, nil
-}
-
-func buildImageCmdArgs(args []string, name, dockerfile string, useCache bool) *exec.Cmd {
-	args = append(args, []string{"-D", "build", "-t", name}...)
-	if !useCache {
-		args = append(args, "--no-cache")
-	}
-	args = append(args, "-")
-	buildCmd := exec.Command(dockerBinary, args...)
-	buildCmd.Stdin = strings.NewReader(dockerfile)
-	return buildCmd
-
-}
-
-func waitForContainer(contID string, args ...string) error {
-	args = append([]string{dockerBinary, "run", "--name", contID}, args...)
-	result := icmd.RunCmd(icmd.Cmd{Command: args})
-	if result.Error != nil {
-		return result.Error
-	}
-	return waitRun(contID)
-}
-
-// waitRestart will wait for the specified container to restart once
-func waitRestart(contID string, duration time.Duration) error {
-	return waitInspect(contID, "{{.RestartCount}}", "1", duration)
-}
-
-// waitRun will wait for the specified container to be running, maximum 5 seconds.
-func waitRun(contID string) error {
-	return waitInspect(contID, "{{.State.Running}}", "true", 5*time.Second)
-}
-
-// waitExited will wait for the specified container to state exit, subject
-// to a maximum time limit in seconds supplied by the caller
-func waitExited(contID string, duration time.Duration) error {
-	return waitInspect(contID, "{{.State.Status}}", "exited", duration)
-}
-
-// waitInspect will wait for the specified container to have the specified string
-// in the inspect output. It will wait until the specified timeout (in seconds)
-// is reached.
-func waitInspect(name, expr, expected string, timeout time.Duration) error {
-	return waitInspectWithArgs(name, expr, expected, timeout)
-}
-
-func waitInspectWithArgs(name, expr, expected string, timeout time.Duration, arg ...string) error {
-	after := time.After(timeout)
-
-	args := append(arg, "inspect", "-f", expr, name)
-	for {
-		result := icmd.RunCommand(dockerBinary, args...)
-		if result.Error != nil {
-			if !strings.Contains(result.Stderr(), "No such") {
-				return fmt.Errorf("error executing docker inspect: %v\n%s",
-					result.Stderr(), result.Stdout())
-			}
-			select {
-			case <-after:
-				return result.Error
-			default:
-				time.Sleep(10 * time.Millisecond)
-				continue
-			}
-		}
-
-		out := strings.TrimSpace(result.Stdout())
-		if out == expected {
-			break
-		}
-
-		select {
-		case <-after:
-			return fmt.Errorf("condition \"%q == %q\" not true in time", out, expected)
-		default:
-		}
-
-		time.Sleep(100 * time.Millisecond)
-	}
-	return nil
-}
-
-func getInspectBody(c *check.C, version, id string) []byte {
-	endpoint := fmt.Sprintf("/%s/containers/%s/json", version, id)
-	status, body, err := sockRequest("GET", endpoint, nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(status, check.Equals, http.StatusOK)
-	return body
-}
-
-// Run a long running idle task in a background container using the
-// system-specific default image and command.
-func runSleepingContainer(c *check.C, extraArgs ...string) (string, int) {
-	return runSleepingContainerInImage(c, defaultSleepImage, extraArgs...)
-}
-
-// Run a long running idle task in a background container using the specified
-// image and the system-specific command.
-func runSleepingContainerInImage(c *check.C, image string, extraArgs ...string) (string, int) {
-	args := []string{"run", "-d"}
-	args = append(args, extraArgs...)
-	args = append(args, image)
-	args = append(args, sleepCommandForDaemonPlatform()...)
-	return dockerCmd(c, args...)
-}
-
-func getRootUIDGID() (int, int, error) {
-	uidgid := strings.Split(filepath.Base(dockerBasePath), ".")
-	if len(uidgid) == 1 {
-		//user namespace remapping is not turned on; return 0
-		return 0, 0, nil
-	}
-	uid, err := strconv.Atoi(uidgid[0])
-	if err != nil {
-		return 0, 0, err
-	}
-	gid, err := strconv.Atoi(uidgid[1])
-	if err != nil {
-		return 0, 0, err
-	}
-	return uid, gid, nil
-}
-
-// minimalBaseImage returns the name of the minimal base image for the current
-// daemon platform.
-func minimalBaseImage() string {
-	if daemonPlatform == "windows" {
-		return WindowsBaseImage
-	}
-	return "scratch"
-}
-
-func getGoroutineNumber() (int, error) {
-	i := struct {
-		NGoroutines int
-	}{}
-	status, b, err := sockRequest("GET", "/info", nil)
-	if err != nil {
-		return 0, err
-	}
-	if status != http.StatusOK {
-		return 0, fmt.Errorf("http status code: %d", status)
-	}
-	if err := json.Unmarshal(b, &i); err != nil {
-		return 0, err
-	}
-	return i.NGoroutines, nil
-}
-
-func waitForGoroutines(expected int) error {
-	t := time.After(30 * time.Second)
-	for {
-		select {
-		case <-t:
-			n, err := getGoroutineNumber()
-			if err != nil {
-				return err
-			}
-			if n > expected {
-				return fmt.Errorf("leaked goroutines: expected less than or equal to %d, got: %d", expected, n)
-			}
-		default:
-			n, err := getGoroutineNumber()
-			if err != nil {
-				return err
-			}
-			if n <= expected {
-				return nil
-			}
-			time.Sleep(200 * time.Millisecond)
-		}
-	}
-}
-
-// getErrorMessage returns the error message from an error API response
-func getErrorMessage(c *check.C, body []byte) string {
-	var resp types.ErrorResponse
-	c.Assert(json.Unmarshal(body, &resp), check.IsNil)
-	return strings.TrimSpace(resp.Message)
-}
-
-func waitAndAssert(c *check.C, timeout time.Duration, f checkF, checker check.Checker, args ...interface{}) {
-	after := time.After(timeout)
-	for {
-		v, comment := f(c)
-		assert, _ := checker.Check(append([]interface{}{v}, args...), checker.Info().Params)
-		select {
-		case <-after:
-			assert = true
-		default:
-		}
-		if assert {
-			if comment != nil {
-				args = append(args, comment)
-			}
-			c.Assert(v, checker, args...)
-			return
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-}
-
-type checkF func(*check.C) (interface{}, check.CommentInterface)
-type reducer func(...interface{}) interface{}
-
-func reducedCheck(r reducer, funcs ...checkF) checkF {
-	return func(c *check.C) (interface{}, check.CommentInterface) {
-		var values []interface{}
-		var comments []string
-		for _, f := range funcs {
-			v, comment := f(c)
-			values = append(values, v)
-			if comment != nil {
-				comments = append(comments, comment.CheckCommentString())
-			}
-		}
-		return r(values...), check.Commentf("%v", strings.Join(comments, ", "))
-	}
-}
-
-func sumAsIntegers(vals ...interface{}) interface{} {
-	var s int
-	for _, v := range vals {
-		s += v.(int)
-	}
-	return s
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/events_utils.go b/installer/vendor/github.com/docker/docker/integration-cli/events_utils.go
deleted file mode 100644
index ba241796b3..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/events_utils.go
+++ /dev/null
@@ -1,206 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"os/exec"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	eventstestutils "github.com/docker/docker/daemon/events/testutils"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-// eventMatcher is a function that tries to match an event input.
-// It returns true if the event matches and a map with
-// a set of key/value to identify the match.
-type eventMatcher func(text string) (map[string]string, bool)
-
-// eventMatchProcessor is a function to handle an event match.
-// It receives a map of key/value with the information extracted in a match.
-type eventMatchProcessor func(matches map[string]string)
-
-// eventObserver runs an events commands and observes its output.
-type eventObserver struct {
-	buffer             *bytes.Buffer
-	command            *exec.Cmd
-	scanner            *bufio.Scanner
-	startTime          string
-	disconnectionError error
-}
-
-// newEventObserver creates the observer and initializes the command
-// without running it. Users must call `eventObserver.Start` to start the command.
-func newEventObserver(c *check.C, args ...string) (*eventObserver, error) {
-	since := daemonTime(c).Unix()
-	return newEventObserverWithBacklog(c, since, args...)
-}
-
-// newEventObserverWithBacklog creates a new observer changing the start time of the backlog to return.
-func newEventObserverWithBacklog(c *check.C, since int64, args ...string) (*eventObserver, error) {
-	startTime := strconv.FormatInt(since, 10)
-	cmdArgs := []string{"events", "--since", startTime}
-	if len(args) > 0 {
-		cmdArgs = append(cmdArgs, args...)
-	}
-	eventsCmd := exec.Command(dockerBinary, cmdArgs...)
-	stdout, err := eventsCmd.StdoutPipe()
-	if err != nil {
-		return nil, err
-	}
-
-	return &eventObserver{
-		buffer:    new(bytes.Buffer),
-		command:   eventsCmd,
-		scanner:   bufio.NewScanner(stdout),
-		startTime: startTime,
-	}, nil
-}
-
-// Start starts the events command.
-func (e *eventObserver) Start() error {
-	return e.command.Start()
-}
-
-// Stop stops the events command.
-func (e *eventObserver) Stop() {
-	e.command.Process.Kill()
-	e.command.Process.Release()
-}
-
-// Match tries to match the events output with a given matcher.
-func (e *eventObserver) Match(match eventMatcher, process eventMatchProcessor) {
-	for e.scanner.Scan() {
-		text := e.scanner.Text()
-		e.buffer.WriteString(text)
-		e.buffer.WriteString("\n")
-
-		if matches, ok := match(text); ok {
-			process(matches)
-		}
-	}
-
-	err := e.scanner.Err()
-	if err == nil {
-		err = io.EOF
-	}
-
-	logrus.Debugf("EventObserver scanner loop finished: %v", err)
-	e.disconnectionError = err
-}
-
-func (e *eventObserver) CheckEventError(c *check.C, id, event string, match eventMatcher) {
-	var foundEvent bool
-	scannerOut := e.buffer.String()
-
-	if e.disconnectionError != nil {
-		until := daemonUnixTime(c)
-		out, _ := dockerCmd(c, "events", "--since", e.startTime, "--until", until)
-		events := strings.Split(strings.TrimSpace(out), "\n")
-		for _, e := range events {
-			if _, ok := match(e); ok {
-				foundEvent = true
-				break
-			}
-		}
-		scannerOut = out
-	}
-	if !foundEvent {
-		c.Fatalf("failed to observe event `%s` for %s. Disconnection error: %v\nout:\n%v", event, id, e.disconnectionError, scannerOut)
-	}
-}
-
-// matchEventLine matches a text with the event regular expression.
-// It returns the matches and true if the regular expression matches with the given id and event type.
-// It returns an empty map and false if there is no match.
-func matchEventLine(id, eventType string, actions map[string]chan bool) eventMatcher {
-	return func(text string) (map[string]string, bool) {
-		matches := eventstestutils.ScanMap(text)
-		if len(matches) == 0 {
-			return matches, false
-		}
-
-		if matchIDAndEventType(matches, id, eventType) {
-			if _, ok := actions[matches["action"]]; ok {
-				return matches, true
-			}
-		}
-		return matches, false
-	}
-}
-
-// processEventMatch closes an action channel when an event line matches the expected action.
-func processEventMatch(actions map[string]chan bool) eventMatchProcessor {
-	return func(matches map[string]string) {
-		if ch, ok := actions[matches["action"]]; ok {
-			ch <- true
-		}
-	}
-}
-
-// parseEventAction parses an event text and returns the action.
-// It fails if the text is not in the event format.
-func parseEventAction(c *check.C, text string) string {
-	matches := eventstestutils.ScanMap(text)
-	return matches["action"]
-}
-
-// eventActionsByIDAndType returns the actions for a given id and type.
-// It fails if the text is not in the event format.
-func eventActionsByIDAndType(c *check.C, events []string, id, eventType string) []string {
-	var filtered []string
-	for _, event := range events {
-		matches := eventstestutils.ScanMap(event)
-		c.Assert(matches, checker.Not(checker.IsNil))
-		if matchIDAndEventType(matches, id, eventType) {
-			filtered = append(filtered, matches["action"])
-		}
-	}
-	return filtered
-}
-
-// matchIDAndEventType returns true if an event matches a given id and type.
-// It also resolves names in the event attributes if the id doesn't match.
-func matchIDAndEventType(matches map[string]string, id, eventType string) bool {
-	return matchEventID(matches, id) && matches["eventType"] == eventType
-}
-
-func matchEventID(matches map[string]string, id string) bool {
-	matchID := matches["id"] == id || strings.HasPrefix(matches["id"], id)
-	if !matchID && matches["attributes"] != "" {
-		// try matching a name in the attributes
-		attributes := map[string]string{}
-		for _, a := range strings.Split(matches["attributes"], ", ") {
-			kv := strings.Split(a, "=")
-			attributes[kv[0]] = kv[1]
-		}
-		matchID = attributes["name"] == id
-	}
-	return matchID
-}
-
-func parseEvents(c *check.C, out, match string) {
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	for _, event := range events {
-		matches := eventstestutils.ScanMap(event)
-		matched, err := regexp.MatchString(match, matches["action"])
-		c.Assert(err, checker.IsNil)
-		c.Assert(matched, checker.True, check.Commentf("Matcher: %s did not match %s", match, matches["action"]))
-	}
-}
-
-func parseEventsWithID(c *check.C, out, match, id string) {
-	events := strings.Split(strings.TrimSpace(out), "\n")
-	for _, event := range events {
-		matches := eventstestutils.ScanMap(event)
-		c.Assert(matchEventID(matches, id), checker.True)
-
-		matched, err := regexp.MatchString(match, matches["action"])
-		c.Assert(err, checker.IsNil)
-		c.Assert(matched, checker.True, check.Commentf("Matcher: %s did not match %s", match, matches["action"]))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures.go b/installer/vendor/github.com/docker/docker/integration-cli/fixtures.go
deleted file mode 100644
index e99b738158..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sync"
-)
-
-var ensureHTTPServerOnce sync.Once
-
-func ensureHTTPServerImage() error {
-	var doIt bool
-	ensureHTTPServerOnce.Do(func() {
-		doIt = true
-	})
-
-	if !doIt {
-		return nil
-	}
-
-	protectedImages["httpserver:latest"] = struct{}{}
-
-	tmp, err := ioutil.TempDir("", "docker-http-server-test")
-	if err != nil {
-		return fmt.Errorf("could not build http server: %v", err)
-	}
-	defer os.RemoveAll(tmp)
-
-	goos := daemonPlatform
-	if goos == "" {
-		goos = "linux"
-	}
-	goarch := os.Getenv("DOCKER_ENGINE_GOARCH")
-	if goarch == "" {
-		goarch = "amd64"
-	}
-
-	goCmd, lookErr := exec.LookPath("go")
-	if lookErr != nil {
-		return fmt.Errorf("could not build http server: %v", lookErr)
-	}
-
-	cmd := exec.Command(goCmd, "build", "-o", filepath.Join(tmp, "httpserver"), "github.com/docker/docker/contrib/httpserver")
-	cmd.Env = append(os.Environ(), []string{
-		"CGO_ENABLED=0",
-		"GOOS=" + goos,
-		"GOARCH=" + goarch,
-	}...)
-	var out []byte
-	if out, err = cmd.CombinedOutput(); err != nil {
-		return fmt.Errorf("could not build http server: %s", string(out))
-	}
-
-	cpCmd, lookErr := exec.LookPath("cp")
-	if lookErr != nil {
-		return fmt.Errorf("could not build http server: %v", lookErr)
-	}
-	if out, err = exec.Command(cpCmd, "../contrib/httpserver/Dockerfile", filepath.Join(tmp, "Dockerfile")).CombinedOutput(); err != nil {
-		return fmt.Errorf("could not build http server: %v", string(out))
-	}
-
-	if out, err = exec.Command(dockerBinary, "build", "-q", "-t", "httpserver", tmp).CombinedOutput(); err != nil {
-		return fmt.Errorf("could not build http server: %v", string(out))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/auth/docker-credential-shell-test b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/auth/docker-credential-shell-test
deleted file mode 100755
index a7be56b2f2..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/auth/docker-credential-shell-test
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/bash
-
-set -e
-
-listFile=shell_test_list.json
-
-case $1 in
-	"store")
-		in=$(</dev/stdin)
-		server=$(echo "$in" | jq --raw-output ".ServerURL")
-		serverHash=$(echo "$server" | sha1sum - | awk '{print $1}')
-
-		username=$(echo "$in" | jq --raw-output ".Username")
-		password=$(echo "$in" | jq --raw-output ".Secret")
-		echo "{ \"Username\": \"${username}\", \"Secret\": \"${password}\" }" > $TEMP/$serverHash
-		# add the server to the list file
-		if [[ ! -f $TEMP/$listFile ]]; then
-			echo "{ \"${server}\": \"${username}\" }" > $TEMP/$listFile
-		else
-			list=$(<$TEMP/$listFile)
-			echo "$list" | jq ". + {\"${server}\": \"${username}\"}" > $TEMP/$listFile
-		fi
-		;;
-	"get")
-		in=$(</dev/stdin)
-		serverHash=$(echo "$in" | sha1sum - | awk '{print $1}')
-		if [[ ! -f $TEMP/$serverHash ]]; then
-			echo "credentials not found in native keychain"
-			exit 1
-		fi
-		payload=$(<$TEMP/$serverHash)
-		echo "$payload"
-		;;
-	"erase")
-		in=$(</dev/stdin)
-		serverHash=$(echo "$in" | sha1sum - | awk '{print $1}')
-		rm -f $TEMP/$serverHash
-
-		# Remove the server from the list
-		list=$(<$TEMP/$listFile)
-		echo "$list" | jq "del(.[\"${in}\"])" > $TEMP/$listFile
-		;;
-	"list")
-		if [[ ! -f $TEMP/$listFile ]]; then
-			echo "{}"
-		else
-			payload=$(<$TEMP/$listFile)
-			echo "$payload"
-		fi
-		;;
-	*)
-		echo "unknown credential option"
-		exit 1
-		;;
-esac
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/credentialspecs/valid.json b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/credentialspecs/valid.json
deleted file mode 100644
index 28913e49de..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/credentialspecs/valid.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-    "CmsPlugins":  [
-                       "ActiveDirectory"
-                   ],
-    "DomainJoinConfig":  {
-                             "Sid":  "S-1-5-21-4288985-3632099173-1864715694",
-                             "MachineAccountName":  "MusicStoreAcct",
-                             "Guid":  "3705d4c3-0b80-42a9-ad97-ebc1801c74b9",
-                             "DnsTreeName":  "hyperv.local",
-                             "DnsName":  "hyperv.local",
-                             "NetBiosName":  "hyperv"
-                         },
-    "ActiveDirectoryConfig":  {
-                                  "GroupManagedServiceAccounts":  [
-                                                                      {
-                                                                          "Name":  "MusicStoreAcct",
-                                                                          "Scope":  "hyperv.local"
-                                                                      },
-                                                                      {
-                                                                          "Name":  "MusicStoreAcct",
-                                                                          "Scope":  "hyperv"
-                                                                      }
-                                                                  ]
-                              }
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/default.yaml b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/default.yaml
deleted file mode 100644
index f30c04f8f1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/default.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-version: "3"
-services:
-  web:
-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0
-    command: top
-  db:
-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0
-    command: "tail -f /dev/null"
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/remove.yaml b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/remove.yaml
deleted file mode 100644
index 4ec8cacc9b..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/remove.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-version: "3.1"
-services:
-  web:
-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0
-    command: top
-    secrets:
-      - special
-secrets:
-  special:
-    file: fixtures/secrets/default
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/secrets.yaml b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/secrets.yaml
deleted file mode 100644
index 6ac92cddee..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/deploy/secrets.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-version: "3.1"
-services:
-  web:
-    image: busybox@sha256:e4f93f6ed15a0cdd342f5aae387886fba0ab98af0a102da6276eaf24d6e6ade0
-    command: top
-    secrets:
-      - special
-      - source: super
-        target: foo.txt
-        mode: 0400
-      - star
-secrets:
-  special:
-    file: fixtures/secrets/default
-  super:
-    file: fixtures/secrets/default
-  star:
-    external:
-      name: outside
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/ca.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/ca.pem
deleted file mode 100644
index 6825d6d1bd..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/ca.pem
+++ /dev/null
@@ -1,23 +0,0 @@
------BEGIN CERTIFICATE-----
-MIID0TCCAzqgAwIBAgIJAP2r7GqEJwSnMA0GCSqGSIb3DQEBBQUAMIGiMQswCQYD
-VQQGEwJVUzELMAkGA1UECBMCQ0ExFTATBgNVBAcTDFNhbkZyYW5jaXNjbzEVMBMG
-A1UEChMMRm9ydC1GdW5zdG9uMREwDwYDVQQLEwhjaGFuZ2VtZTERMA8GA1UEAxMI
-Y2hhbmdlbWUxETAPBgNVBCkTCGNoYW5nZW1lMR8wHQYJKoZIhvcNAQkBFhBtYWls
-QGhvc3QuZG9tYWluMB4XDTEzMTIwMzE2NTYzMFoXDTIzMTIwMTE2NTYzMFowgaIx
-CzAJBgNVBAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2Nv
-MRUwEwYDVQQKEwxGb3J0LUZ1bnN0b24xETAPBgNVBAsTCGNoYW5nZW1lMREwDwYD
-VQQDEwhjaGFuZ2VtZTERMA8GA1UEKRMIY2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEW
-EG1haWxAaG9zdC5kb21haW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBALAn
-0xDw+5y7ZptQacq66pUhRu82JP2WU6IDgo5QUtNU6/CX5PwQATe/OnYTZQFbksxp
-AU9boG0FCkgxfsgPYXEuZxVEGKI2fxfKHOZZI8mrkWmj6eWU/0cvCjGVc9rTITP5
-sNQvg+hORyVDdNp2IdsbMJayiB3AQYMFx3vSDOMTAgMBAAGjggELMIIBBzAdBgNV
-HQ4EFgQUZu7DFz09q0QBa2+ymRm9qgK1NPswgdcGA1UdIwSBzzCBzIAUZu7DFz09
-q0QBa2+ymRm9qgK1NPuhgaikgaUwgaIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJD
-QTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMRUwEwYDVQQKEwxGb3J0LUZ1bnN0b24x
-ETAPBgNVBAsTCGNoYW5nZW1lMREwDwYDVQQDEwhjaGFuZ2VtZTERMA8GA1UEKRMI
-Y2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEWEG1haWxAaG9zdC5kb21haW6CCQD9q+xq
-hCcEpzAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAF8fJKKM+/oOdnNi
-zEd0M1+PmZOyqvjYQn/2ZR8UHH6Imgc/OPQKZXf0bVE1Txc/DaUNn9Isd1SuCuaE
-ic3vAIYYU7PmgeNN6vwec48V96T7jr+GAi6AVMhQEc2hHCfVtx11Xx+x6aHDZzJt
-Zxtf5lL6KSO9Y+EFwM+rju6hm5hW
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-cert.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-cert.pem
deleted file mode 100644
index c05ed47c2c..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-cert.pem
+++ /dev/null
@@ -1,73 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 3 (0x3)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=changeme/name=changeme/emailAddress=mail@host.domain
-        Validity
-            Not Before: Dec  4 14:17:54 2013 GMT
-            Not After : Dec  2 14:17:54 2023 GMT
-        Subject: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=client/name=changeme/emailAddress=mail@host.domain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:ca:c9:05:d0:09:4e:3e:a4:fc:d5:14:f4:a5:e8:
-                    34:d3:6b:51:e3:f3:62:ea:a1:f0:e8:ed:c4:2a:bc:
-                    f0:4f:ca:07:df:e3:88:fa:f4:21:99:35:0e:3d:ea:
-                    b0:86:e7:c4:d2:8a:83:2b:42:b8:ec:a3:99:62:70:
-                    81:46:cc:fc:a5:1d:d2:63:e8:eb:07:25:9a:e2:25:
-                    6d:11:56:f2:1a:51:a1:b6:3e:1c:57:32:e9:7b:2c:
-                    aa:1b:cc:97:2d:89:2d:b1:c9:5e:35:28:4d:7c:fa:
-                    65:31:3e:f7:70:dd:6e:0b:3c:58:af:a8:2e:24:c0:
-                    7e:4e:78:7d:0a:9e:8f:42:43
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                Easy-RSA Generated Certificate
-            X509v3 Subject Key Identifier: 
-                DE:42:EF:2D:98:A3:6C:A8:AA:E0:8C:71:2C:9D:64:23:A9:E2:7E:81
-            X509v3 Authority Key Identifier: 
-                keyid:66:EE:C3:17:3D:3D:AB:44:01:6B:6F:B2:99:19:BD:AA:02:B5:34:FB
-                DirName:/C=US/ST=CA/L=SanFrancisco/O=Fort-Funston/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain
-                serial:FD:AB:EC:6A:84:27:04:A7
-
-            X509v3 Extended Key Usage: 
-                TLS Web Client Authentication
-            X509v3 Key Usage: 
-                Digital Signature
-    Signature Algorithm: sha1WithRSAEncryption
-         1c:44:26:ea:e1:66:25:cb:e4:8e:57:1c:f6:b9:17:22:62:40:
-         12:90:8f:3b:b2:61:7a:54:94:8f:b1:20:0b:bf:a3:51:e3:fa:
-         1c:a1:be:92:3a:d0:76:44:c0:57:83:ab:6a:e4:1a:45:49:a4:
-         af:39:0d:60:32:fc:3a:be:d7:fb:5d:99:7a:1f:87:e7:d5:ab:
-         84:a2:5e:90:d8:bf:fa:89:6d:32:26:02:5e:31:35:68:7f:31:
-         f5:6b:51:46:bc:af:70:ed:5a:09:7d:ec:b2:48:4f:fe:c5:2f:
-         56:04:ad:f6:c1:d2:2a:e4:6a:c4:87:fe:08:35:c5:38:cb:5e:
-         4a:c4
------BEGIN CERTIFICATE-----
-MIIEFTCCA36gAwIBAgIBAzANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRUwEwYDVQQHEwxTYW5GcmFuY2lzY28xFTATBgNVBAoTDEZv
-cnQtRnVuc3RvbjERMA8GA1UECxMIY2hhbmdlbWUxETAPBgNVBAMTCGNoYW5nZW1l
-MREwDwYDVQQpEwhjaGFuZ2VtZTEfMB0GCSqGSIb3DQEJARYQbWFpbEBob3N0LmRv
-bWFpbjAeFw0xMzEyMDQxNDE3NTRaFw0yMzEyMDIxNDE3NTRaMIGgMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCQ0ExFTATBgNVBAcTDFNhbkZyYW5jaXNjbzEVMBMGA1UE
-ChMMRm9ydC1GdW5zdG9uMREwDwYDVQQLEwhjaGFuZ2VtZTEPMA0GA1UEAxMGY2xp
-ZW50MREwDwYDVQQpEwhjaGFuZ2VtZTEfMB0GCSqGSIb3DQEJARYQbWFpbEBob3N0
-LmRvbWFpbjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAyskF0AlOPqT81RT0
-peg002tR4/Ni6qHw6O3EKrzwT8oH3+OI+vQhmTUOPeqwhufE0oqDK0K47KOZYnCB
-Rsz8pR3SY+jrByWa4iVtEVbyGlGhtj4cVzLpeyyqG8yXLYktscleNShNfPplMT73
-cN1uCzxYr6guJMB+Tnh9Cp6PQkMCAwEAAaOCAVkwggFVMAkGA1UdEwQCMAAwLQYJ
-YIZIAYb4QgENBCAWHkVhc3ktUlNBIEdlbmVyYXRlZCBDZXJ0aWZpY2F0ZTAdBgNV
-HQ4EFgQU3kLvLZijbKiq4IxxLJ1kI6nifoEwgdcGA1UdIwSBzzCBzIAUZu7DFz09
-q0QBa2+ymRm9qgK1NPuhgaikgaUwgaIxCzAJBgNVBAYTAlVTMQswCQYDVQQIEwJD
-QTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMRUwEwYDVQQKEwxGb3J0LUZ1bnN0b24x
-ETAPBgNVBAsTCGNoYW5nZW1lMREwDwYDVQQDEwhjaGFuZ2VtZTERMA8GA1UEKRMI
-Y2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEWEG1haWxAaG9zdC5kb21haW6CCQD9q+xq
-hCcEpzATBgNVHSUEDDAKBggrBgEFBQcDAjALBgNVHQ8EBAMCB4AwDQYJKoZIhvcN
-AQEFBQADgYEAHEQm6uFmJcvkjlcc9rkXImJAEpCPO7JhelSUj7EgC7+jUeP6HKG+
-kjrQdkTAV4OrauQaRUmkrzkNYDL8Or7X+12Zeh+H59WrhKJekNi/+oltMiYCXjE1
-aH8x9WtRRryvcO1aCX3sskhP/sUvVgSt9sHSKuRqxIf+CDXFOMteSsQ=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-key.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-key.pem
deleted file mode 100644
index b5c15f8dc7..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-key.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdQIBADANBgkqhkiG9w0BAQEFAASCAl8wggJbAgEAAoGBAMrJBdAJTj6k/NUU
-9KXoNNNrUePzYuqh8OjtxCq88E/KB9/jiPr0IZk1Dj3qsIbnxNKKgytCuOyjmWJw
-gUbM/KUd0mPo6wclmuIlbRFW8hpRobY+HFcy6XssqhvMly2JLbHJXjUoTXz6ZTE+
-93Ddbgs8WK+oLiTAfk54fQqej0JDAgMBAAECgYBOFEzKp2qbMEexe9ofL2N3rDDh
-xkrl8OijpzkLA6i78BxMFn4dsnZlWUpciMrjhsYAExkiRRSS+QMMJimAq1jzQqc3
-FAQV2XGYwkd0cUn7iZGvfNnEPysjsfyYQM+m+sT0ATj4BZjVShC6kkSjTdm1leLN
-OSvcHdcu3Xxg9ufF0QJBAPYdnNt5sIndt2WECePuRVi+uF4mlxTobFY0fjn26yhC
-4RsnhhD3Vldygo9gvnkwrAZYaALGSPBewes2InxvjA8CQQDS7erKiNXpwoqz5XiU
-SVEsIIVTdWzBjGbIqMOu/hUwM5FK4j6JTBks0aTGMyh0YV9L1EzM0X79J29JahCe
-iQKNAkBKNMOGqTpBV0hko1sYDk96YobUXG5RL4L6uvkUIQ7mJMQam+AgXXL7Ctuy
-v0iu4a38e8tgisiTMP7nHHtpaXihAkAOiN54/lzfMsykANgCP9scE1GcoqbP34Dl
-qttxH4kOPT9xzY1JoLjLYdbc4YGUI3GRpBt2sajygNkmUey7P+2xAkBBsVCZFvTw
-qHvOpPS2kX5ml5xoc/QAHK9N7kR+X7XFYx82RTVSqJEK4lPb+aEWn+CjiIewO4Q5
-ksDFuNxAzbhl
------END PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-cert.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-cert.pem
deleted file mode 100644
index 21ae4bd579..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-cert.pem
+++ /dev/null
@@ -1,73 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 2 (0x2)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, L=SanFrancisco, O=Evil Inc, OU=changeme, CN=changeme/name=changeme/emailAddress=mail@host.domain
-        Validity
-            Not Before: Feb 24 17:54:59 2014 GMT
-            Not After : Feb 22 17:54:59 2024 GMT
-        Subject: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=client/name=changeme/emailAddress=mail@host.domain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:e8:e2:2c:b8:d4:db:89:50:4f:47:1e:68:db:f7:
-                    e4:cc:47:41:63:75:03:37:50:7a:a8:4d:27:36:d5:
-                    15:01:08:b6:cf:56:f7:56:6d:3d:f9:e2:8d:1a:5d:
-                    bf:a0:24:5e:07:55:8e:d0:dc:f1:fa:19:87:1d:d6:
-                    b6:58:82:2e:ba:69:6d:e9:d9:c8:16:0d:1d:59:7f:
-                    f4:8e:58:10:01:3d:21:14:16:3c:ec:cd:8c:b7:0e:
-                    e6:7b:77:b4:f9:90:a5:17:01:bb:84:c6:b2:12:87:
-                    70:eb:9f:6d:4f:d0:68:8b:96:c0:e7:0b:51:b4:9d:
-                    1d:7b:6c:7b:be:89:6b:88:8b
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Comment: 
-                Easy-RSA Generated Certificate
-            X509v3 Subject Key Identifier: 
-                9E:F8:49:D0:A2:76:30:5C:AB:2B:8A:B5:8D:C6:45:1F:A7:F8:CF:85
-            X509v3 Authority Key Identifier: 
-                keyid:DC:A5:F1:76:DB:4E:CD:8E:EF:B1:23:56:1D:92:80:99:74:3B:EA:6F
-                DirName:/C=US/ST=CA/L=SanFrancisco/O=Evil Inc/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain
-                serial:E7:21:1E:18:41:1B:96:83
-
-            X509v3 Extended Key Usage: 
-                TLS Web Client Authentication
-            X509v3 Key Usage: 
-                Digital Signature
-    Signature Algorithm: sha1WithRSAEncryption
-         48:76:c0:18:fa:0a:ee:4e:1a:ec:02:9d:d4:83:ca:94:54:a1:
-         3f:51:2f:3e:4b:95:c3:42:9b:71:a0:4b:d9:af:47:23:b9:1c:
-         fb:85:ba:76:e2:09:cb:65:bb:d2:7d:44:3d:4b:67:ba:80:83:
-         be:a8:ed:c4:b9:ea:1a:1b:c7:59:3b:d9:5c:0d:46:d8:c9:92:
-         cb:10:c5:f2:1a:38:a4:aa:07:2c:e3:84:16:79:c7:95:09:e3:
-         01:d2:15:a2:77:0b:8b:bf:94:04:e9:7f:c0:cd:e6:2e:64:cd:
-         1e:a3:32:ec:11:cc:62:ce:c7:4e:cd:ad:48:5c:b1:b8:e9:76:
-         b3:f9
------BEGIN CERTIFICATE-----
-MIIEDTCCA3agAwIBAgIBAjANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRUwEwYDVQQHEwxTYW5GcmFuY2lzY28xETAPBgNVBAoTCEV2
-aWwgSW5jMREwDwYDVQQLEwhjaGFuZ2VtZTERMA8GA1UEAxMIY2hhbmdlbWUxETAP
-BgNVBCkTCGNoYW5nZW1lMR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3QuZG9tYWlu
-MB4XDTE0MDIyNDE3NTQ1OVoXDTI0MDIyMjE3NTQ1OVowgaAxCzAJBgNVBAYTAlVT
-MQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMRUwEwYDVQQKEwxG
-b3J0LUZ1bnN0b24xETAPBgNVBAsTCGNoYW5nZW1lMQ8wDQYDVQQDEwZjbGllbnQx
-ETAPBgNVBCkTCGNoYW5nZW1lMR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3QuZG9t
-YWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDo4iy41NuJUE9HHmjb9+TM
-R0FjdQM3UHqoTSc21RUBCLbPVvdWbT354o0aXb+gJF4HVY7Q3PH6GYcd1rZYgi66
-aW3p2cgWDR1Zf/SOWBABPSEUFjzszYy3DuZ7d7T5kKUXAbuExrISh3Drn21P0GiL
-lsDnC1G0nR17bHu+iWuIiwIDAQABo4IBVTCCAVEwCQYDVR0TBAIwADAtBglghkgB
-hvhCAQ0EIBYeRWFzeS1SU0EgR2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQW
-BBSe+EnQonYwXKsrirWNxkUfp/jPhTCB0wYDVR0jBIHLMIHIgBTcpfF2207Nju+x
-I1YdkoCZdDvqb6GBpKSBoTCBnjELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMRUw
-EwYDVQQHEwxTYW5GcmFuY2lzY28xETAPBgNVBAoTCEV2aWwgSW5jMREwDwYDVQQL
-EwhjaGFuZ2VtZTERMA8GA1UEAxMIY2hhbmdlbWUxETAPBgNVBCkTCGNoYW5nZW1l
-MR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3QuZG9tYWluggkA5yEeGEEbloMwEwYD
-VR0lBAwwCgYIKwYBBQUHAwIwCwYDVR0PBAQDAgeAMA0GCSqGSIb3DQEBBQUAA4GB
-AEh2wBj6Cu5OGuwCndSDypRUoT9RLz5LlcNCm3GgS9mvRyO5HPuFunbiCctlu9J9
-RD1LZ7qAg76o7cS56hobx1k72VwNRtjJkssQxfIaOKSqByzjhBZ5x5UJ4wHSFaJ3
-C4u/lATpf8DN5i5kzR6jMuwRzGLOx07NrUhcsbjpdrP5
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-key.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-key.pem
deleted file mode 100644
index 53c122ab70..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/client-rogue-key.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBAOjiLLjU24lQT0ce
-aNv35MxHQWN1AzdQeqhNJzbVFQEIts9W91ZtPfnijRpdv6AkXgdVjtDc8foZhx3W
-tliCLrppbenZyBYNHVl/9I5YEAE9IRQWPOzNjLcO5nt3tPmQpRcBu4TGshKHcOuf
-bU/QaIuWwOcLUbSdHXtse76Ja4iLAgMBAAECgYADs+TmI2xCKKa6CL++D5jxrohZ
-nnionnz0xBVFh+nHlG3jqgxQsXf0yydXLfpn/2wHTdLxezHVuiYt0UYg7iD0CglW
-+IjcgMebzyjLeYqYOE5llPlMvhp2HoEMYJNb+7bRrZ1WCITbu+Su0w1cgA7Cs+Ej
-VlfvGzN+qqnDThRUYQJBAPY0sMWZJKly8QhUmUvmcXdPczzSOf6Mm7gc5LR6wzxd
-vW7syuqk50qjqVqFpN81vCV7GoDxRUWbTM9ftf7JGFkCQQDyJc/1RMygE2o+enU1
-6UBxJyclXITEYtDn8aoEpLNc7RakP1WoPUKjZOnjkcoKcIkFNkSPeCfQujrb5f3F
-MkuDAkByAI/hzzmkpK5rFxEsjfX4Mve/L/DepyjrpaVY1IdWimlO1aJX6CeY7hNa
-8QsYt/74s/nfvtg+lNyKIV1aLq9xAkB+WSSNgfyTeg3x08vc+Xxajmdqoz/TiQwg
-OoTQL3A3iK5LvZBgXLasszcnOycFE3srcQmNItEDpGiZ3QPxJTEpAkEA45EE9NMJ
-SA7EGWSFlbz4f4u4oBeiDiJRJbGGfAyVxZlpCWUjPpg9+swsWoFEOjnGYaChAMk5
-nrOdMf15T6QF7Q==
------END PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-cert.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-cert.pem
deleted file mode 100644
index 08abfd1a3b..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-cert.pem
+++ /dev/null
@@ -1,76 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 4 (0x4)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=changeme/name=changeme/emailAddress=mail@host.domain
-        Validity
-            Not Before: Dec  4 15:01:20 2013 GMT
-            Not After : Dec  2 15:01:20 2023 GMT
-        Subject: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=*/name=changeme/emailAddress=mail@host.domain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:c1:ff:7d:30:6f:64:4a:b1:92:b1:71:d1:c1:74:
-                    e2:1d:db:2d:11:24:e1:00:d4:00:ae:6f:c8:9e:ae:
-                    67:b3:4a:bd:f7:e6:9e:57:6d:19:4c:3c:23:94:2d:
-                    3d:d6:63:84:d8:fa:76:2b:38:12:c1:ed:20:9d:32:
-                    e0:e8:c2:bf:9a:77:70:04:3f:7f:ca:8c:2c:82:d6:
-                    3d:25:5c:02:1a:4f:64:93:03:dd:9c:42:97:5e:09:
-                    49:af:f0:c2:e1:30:08:0e:21:46:95:d1:13:59:c0:
-                    c8:76:be:94:0d:8b:43:67:21:33:b2:08:60:9d:76:
-                    a8:05:32:1e:f9:95:09:14:75
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Cert Type: 
-                SSL Server
-            Netscape Comment: 
-                Easy-RSA Generated Server Certificate
-            X509v3 Subject Key Identifier: 
-                14:02:FD:FD:DD:13:38:E0:71:EA:D1:BE:C0:0E:89:1A:2D:B6:19:06
-            X509v3 Authority Key Identifier: 
-                keyid:66:EE:C3:17:3D:3D:AB:44:01:6B:6F:B2:99:19:BD:AA:02:B5:34:FB
-                DirName:/C=US/ST=CA/L=SanFrancisco/O=Fort-Funston/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain
-                serial:FD:AB:EC:6A:84:27:04:A7
-
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-            X509v3 Key Usage: 
-                Digital Signature, Key Encipherment
-    Signature Algorithm: sha1WithRSAEncryption
-         40:0f:10:39:c4:b7:0f:0d:2f:bf:d2:16:cc:8e:d3:9a:fb:8b:
-         ce:4b:7b:0d:48:77:ce:f1:fe:d5:8f:ea:b1:71:ed:49:1d:9f:
-         23:3a:16:d4:70:7c:c5:29:bf:e4:90:34:d0:f0:00:24:f4:e4:
-         df:2c:c3:83:01:66:61:c9:a8:ab:29:e7:98:6d:27:89:4a:76:
-         c9:2e:19:8e:fe:6e:d5:f8:99:11:0e:97:67:4b:34:e3:1e:e3:
-         9f:35:00:a5:32:f9:b5:2c:f2:e0:c5:2e:cc:81:bd:18:dd:5c:
-         12:c8:6b:fa:0c:17:74:30:55:f6:6e:20:9a:6c:1e:09:b4:0c:
-         15:42
------BEGIN CERTIFICATE-----
-MIIEKjCCA5OgAwIBAgIBBDANBgkqhkiG9w0BAQUFADCBojELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRUwEwYDVQQHEwxTYW5GcmFuY2lzY28xFTATBgNVBAoTDEZv
-cnQtRnVuc3RvbjERMA8GA1UECxMIY2hhbmdlbWUxETAPBgNVBAMTCGNoYW5nZW1l
-MREwDwYDVQQpEwhjaGFuZ2VtZTEfMB0GCSqGSIb3DQEJARYQbWFpbEBob3N0LmRv
-bWFpbjAeFw0xMzEyMDQxNTAxMjBaFw0yMzEyMDIxNTAxMjBaMIGbMQswCQYDVQQG
-EwJVUzELMAkGA1UECBMCQ0ExFTATBgNVBAcTDFNhbkZyYW5jaXNjbzEVMBMGA1UE
-ChMMRm9ydC1GdW5zdG9uMREwDwYDVQQLEwhjaGFuZ2VtZTEKMAgGA1UEAxQBKjER
-MA8GA1UEKRMIY2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEWEG1haWxAaG9zdC5kb21h
-aW4wgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBAMH/fTBvZEqxkrFx0cF04h3b
-LREk4QDUAK5vyJ6uZ7NKvffmnldtGUw8I5QtPdZjhNj6dis4EsHtIJ0y4OjCv5p3
-cAQ/f8qMLILWPSVcAhpPZJMD3ZxCl14JSa/wwuEwCA4hRpXRE1nAyHa+lA2LQ2ch
-M7IIYJ12qAUyHvmVCRR1AgMBAAGjggFzMIIBbzAJBgNVHRMEAjAAMBEGCWCGSAGG
-+EIBAQQEAwIGQDA0BglghkgBhvhCAQ0EJxYlRWFzeS1SU0EgR2VuZXJhdGVkIFNl
-cnZlciBDZXJ0aWZpY2F0ZTAdBgNVHQ4EFgQUFAL9/d0TOOBx6tG+wA6JGi22GQYw
-gdcGA1UdIwSBzzCBzIAUZu7DFz09q0QBa2+ymRm9qgK1NPuhgaikgaUwgaIxCzAJ
-BgNVBAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMRUw
-EwYDVQQKEwxGb3J0LUZ1bnN0b24xETAPBgNVBAsTCGNoYW5nZW1lMREwDwYDVQQD
-EwhjaGFuZ2VtZTERMA8GA1UEKRMIY2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEWEG1h
-aWxAaG9zdC5kb21haW6CCQD9q+xqhCcEpzATBgNVHSUEDDAKBggrBgEFBQcDATAL
-BgNVHQ8EBAMCBaAwDQYJKoZIhvcNAQEFBQADgYEAQA8QOcS3Dw0vv9IWzI7TmvuL
-zkt7DUh3zvH+1Y/qsXHtSR2fIzoW1HB8xSm/5JA00PAAJPTk3yzDgwFmYcmoqynn
-mG0niUp2yS4Zjv5u1fiZEQ6XZ0s04x7jnzUApTL5tSzy4MUuzIG9GN1cEshr+gwX
-dDBV9m4gmmweCbQMFUI=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-key.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-key.pem
deleted file mode 100644
index c269320ef0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-key.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICeAIBADANBgkqhkiG9w0BAQEFAASCAmIwggJeAgEAAoGBAMH/fTBvZEqxkrFx
-0cF04h3bLREk4QDUAK5vyJ6uZ7NKvffmnldtGUw8I5QtPdZjhNj6dis4EsHtIJ0y
-4OjCv5p3cAQ/f8qMLILWPSVcAhpPZJMD3ZxCl14JSa/wwuEwCA4hRpXRE1nAyHa+
-lA2LQ2chM7IIYJ12qAUyHvmVCRR1AgMBAAECgYAmwckb9RUfSwyYgLm8IYLPHiuJ
-wkllZfVg5Bo7gXJcQnFjZmJ56uTj8xvUjZlODIHM63TSO5ibv6kFXtXKCqZGd2M+
-wGbhZ0f+2GvKcwMmJERnIQjuoNaYSQLT0tM0VB9Iz0rJlZC+tzPZ+5pPqEumRdsS
-IzWNXfF42AhcbwAQYQJBAPVXtMYIJc9EZsz86ZcQiMPWUpCX5vnRmtwL8kKyR8D5
-4KfYeiowyFffSRMMcclwNHq7TgSXN+nIXM9WyzyzwikCQQDKbNA28AgZp9aT54HP
-WnbeE2pmt+uk/zl/BtxJSoK6H+69Jec+lf7EgL7HgOWYRSNot4uQWu8IhsHLTiUq
-+0FtAkEAqwlRxRy4/x24bP+D+QRV0/D97j93joFJbE4Hved7jlSlAV4xDGilwlyv
-HNB4Iu5OJ6Gcaibhm+FKkmD3noHSwQJBAIpu3fokLzX0bS+bDFBU6qO3HXX/47xj
-+tsfQvkwZrSI8AkU6c8IX0HdVhsz0FBRQAT2ORDQz1XCarfxykNZrwUCQQCGCBIc
-BBCWzhHlswlGidWJg3HqqO6hPPClEr3B5G87oCsdeYwiO23XT6rUnoJXfJHp6oCW
-5nCwDu5ZTP+khltg
------END PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-cert.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-cert.pem
deleted file mode 100644
index 28feba6656..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-cert.pem
+++ /dev/null
@@ -1,76 +0,0 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number: 3 (0x3)
-    Signature Algorithm: sha1WithRSAEncryption
-        Issuer: C=US, ST=CA, L=SanFrancisco, O=Evil Inc, OU=changeme, CN=changeme/name=changeme/emailAddress=mail@host.domain
-        Validity
-            Not Before: Feb 28 18:49:31 2014 GMT
-            Not After : Feb 26 18:49:31 2024 GMT
-        Subject: C=US, ST=CA, L=SanFrancisco, O=Fort-Funston, OU=changeme, CN=localhost/name=changeme/emailAddress=mail@host.domain
-        Subject Public Key Info:
-            Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
-                Modulus:
-                    00:d1:08:58:24:60:a1:69:65:4b:76:46:8f:88:75:
-                    7c:49:3a:d8:03:cc:5b:58:c5:d1:bb:e5:f9:54:b9:
-                    75:65:df:7e:bb:fb:54:d4:b2:e9:6f:58:a2:a4:84:
-                    43:94:77:24:81:38:36:36:f0:66:65:26:e5:5b:2a:
-                    14:1c:a9:ae:57:7f:75:00:23:14:4b:61:58:e4:82:
-                    aa:15:97:94:bd:50:35:0d:5d:18:18:ed:10:6a:bb:
-                    d3:64:5a:eb:36:98:5b:58:a7:fe:67:48:c1:6c:3f:
-                    51:2f:02:65:96:54:77:9b:34:f9:a7:d2:63:54:6a:
-                    9e:02:5c:be:65:98:a4:b4:b5
-                Exponent: 65537 (0x10001)
-        X509v3 extensions:
-            X509v3 Basic Constraints: 
-                CA:FALSE
-            Netscape Cert Type: 
-                SSL Server
-            Netscape Comment: 
-                Easy-RSA Generated Server Certificate
-            X509v3 Subject Key Identifier: 
-                1F:E0:57:CA:CB:76:C9:C4:86:B9:EA:69:17:C0:F3:51:CE:95:40:EC
-            X509v3 Authority Key Identifier: 
-                keyid:DC:A5:F1:76:DB:4E:CD:8E:EF:B1:23:56:1D:92:80:99:74:3B:EA:6F
-                DirName:/C=US/ST=CA/L=SanFrancisco/O=Evil Inc/OU=changeme/CN=changeme/name=changeme/emailAddress=mail@host.domain
-                serial:E7:21:1E:18:41:1B:96:83
-
-            X509v3 Extended Key Usage: 
-                TLS Web Server Authentication
-            X509v3 Key Usage: 
-                Digital Signature, Key Encipherment
-    Signature Algorithm: sha1WithRSAEncryption
-         04:93:0e:28:01:94:18:f0:8c:7c:d3:0c:ad:e9:b7:46:b1:30:
-         65:ed:68:7c:8c:91:cd:1a:86:66:87:4a:4f:c0:97:bc:f7:85:
-         4b:38:79:31:b2:65:88:b1:76:16:9e:80:93:38:f4:b9:eb:65:
-         00:6d:bb:89:e0:a1:bf:95:5e:80:13:8e:01:73:d3:f1:08:73:
-         85:a5:33:75:0b:42:8a:a3:07:09:35:ef:d7:c6:58:eb:60:a3:
-         06:89:a0:53:99:e2:aa:41:90:e0:1a:d2:12:4b:48:7d:c3:9c:
-         ad:bd:0e:5e:5f:f7:09:0c:5d:7c:86:24:dd:92:d5:b3:14:06:
-         c7:9f
------BEGIN CERTIFICATE-----
-MIIEKjCCA5OgAwIBAgIBAzANBgkqhkiG9w0BAQUFADCBnjELMAkGA1UEBhMCVVMx
-CzAJBgNVBAgTAkNBMRUwEwYDVQQHEwxTYW5GcmFuY2lzY28xETAPBgNVBAoTCEV2
-aWwgSW5jMREwDwYDVQQLEwhjaGFuZ2VtZTERMA8GA1UEAxMIY2hhbmdlbWUxETAP
-BgNVBCkTCGNoYW5nZW1lMR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3QuZG9tYWlu
-MB4XDTE0MDIyODE4NDkzMVoXDTI0MDIyNjE4NDkzMVowgaMxCzAJBgNVBAYTAlVT
-MQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMRUwEwYDVQQKEwxG
-b3J0LUZ1bnN0b24xETAPBgNVBAsTCGNoYW5nZW1lMRIwEAYDVQQDEwlsb2NhbGhv
-c3QxETAPBgNVBCkTCGNoYW5nZW1lMR8wHQYJKoZIhvcNAQkBFhBtYWlsQGhvc3Qu
-ZG9tYWluMIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDRCFgkYKFpZUt2Ro+I
-dXxJOtgDzFtYxdG75flUuXVl3367+1TUsulvWKKkhEOUdySBODY28GZlJuVbKhQc
-qa5Xf3UAIxRLYVjkgqoVl5S9UDUNXRgY7RBqu9NkWus2mFtYp/5nSMFsP1EvAmWW
-VHebNPmn0mNUap4CXL5lmKS0tQIDAQABo4IBbzCCAWswCQYDVR0TBAIwADARBglg
-hkgBhvhCAQEEBAMCBkAwNAYJYIZIAYb4QgENBCcWJUVhc3ktUlNBIEdlbmVyYXRl
-ZCBTZXJ2ZXIgQ2VydGlmaWNhdGUwHQYDVR0OBBYEFB/gV8rLdsnEhrnqaRfA81HO
-lUDsMIHTBgNVHSMEgcswgciAFNyl8XbbTs2O77EjVh2SgJl0O+pvoYGkpIGhMIGe
-MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTATBgNVBAcTDFNhbkZyYW5jaXNj
-bzERMA8GA1UEChMIRXZpbCBJbmMxETAPBgNVBAsTCGNoYW5nZW1lMREwDwYDVQQD
-EwhjaGFuZ2VtZTERMA8GA1UEKRMIY2hhbmdlbWUxHzAdBgkqhkiG9w0BCQEWEG1h
-aWxAaG9zdC5kb21haW6CCQDnIR4YQRuWgzATBgNVHSUEDDAKBggrBgEFBQcDATAL
-BgNVHQ8EBAMCBaAwDQYJKoZIhvcNAQEFBQADgYEABJMOKAGUGPCMfNMMrem3RrEw
-Ze1ofIyRzRqGZodKT8CXvPeFSzh5MbJliLF2Fp6Akzj0uetlAG27ieChv5VegBOO
-AXPT8QhzhaUzdQtCiqMHCTXv18ZY62CjBomgU5niqkGQ4BrSEktIfcOcrb0OXl/3
-CQxdfIYk3ZLVsxQGx58=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-key.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-key.pem
deleted file mode 100644
index 10f7c65001..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/https/server-rogue-key.pem
+++ /dev/null
@@ -1,16 +0,0 @@
------BEGIN PRIVATE KEY-----
-MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBANEIWCRgoWllS3ZG
-j4h1fEk62APMW1jF0bvl+VS5dWXffrv7VNSy6W9YoqSEQ5R3JIE4NjbwZmUm5Vsq
-FByprld/dQAjFEthWOSCqhWXlL1QNQ1dGBjtEGq702Ra6zaYW1in/mdIwWw/US8C
-ZZZUd5s0+afSY1RqngJcvmWYpLS1AgMBAAECgYAJXh9dGfuB1qlIFqduDR3RxlJR
-8UGSu+LHUeoXkuwg8aAjWoMVuSLe+5DmYIsKx0AajmNXmPRtyg1zRXJ7SltmubJ8
-6qQVDsRk6biMdkpkl6a9Gk2av40psD9/VPGxagEoop7IKYhf3AeKPvPiwVB2qFrl
-1aYMZm0aMR55pgRajQJBAOk8IsJDf0beooDZXVdv/oe4hcbM9fxO8Cn3qzoGImqD
-37LL+PCzDP7AEV3fk43SsZDeSk+LDX+h0o9nPyhzHasCQQDlb3aDgcQY9NaGLUWO
-moOCB3148eBVcAwCocu+OSkf7sbQdvXxgThBOrZl11wwRIMQqh99c2yeUwj+tELl
-3VcfAkBZTiNpCvtDIaBLge9RuZpWUXs3wec2cutWxnSTxSGMc25GQf/R+l0xdk2w
-ChmvpktDUzpU9sN2aXn8WuY+EMX9AkEApbLpUbKPUELLB958RLA819TW/lkZXjrs
-wZ3eSoR3ufM1rOqtVvyvBxUDE+wETWu9iHSFB5Ir2PA5J9JCGkbPmwJAFI1ndfBj
-iuyU93nFX0p+JE2wVHKx4dMzKCearNKiJh/lGDtUq3REGgamTNUnG8RAITUbxFs+
-Z1hrIq8xYl2LOQ==
------END PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/emptyLayer.tar b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/emptyLayer.tar
deleted file mode 100644
index beabb569ac..0000000000
Binary files a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/emptyLayer.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/frozen.go b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/frozen.go
deleted file mode 100644
index 13cd393f36..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/load/frozen.go
+++ /dev/null
@@ -1,182 +0,0 @@
-package load
-
-import (
-	"bufio"
-	"bytes"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/pkg/errors"
-)
-
-var frozenImgDir = "/docker-frozen-images"
-
-// FrozenImagesLinux loads the frozen image set for the integration suite
-// If the images are not available locally it will download them
-// TODO: This loads whatever is in the frozen image dir, regardless of what
-// images were passed in. If the images need to be downloaded, then it will respect
-// the passed in images
-func FrozenImagesLinux(dockerBinary string, images ...string) error {
-	imgNS := os.Getenv("TEST_IMAGE_NAMESPACE")
-	var loadImages []struct{ srcName, destName string }
-	for _, img := range images {
-		if err := exec.Command(dockerBinary, "inspect", "--type=image", img).Run(); err != nil {
-			srcName := img
-			// hello-world:latest gets re-tagged as hello-world:frozen
-			// there are some tests that use hello-world:latest specifically so it pulls
-			// the image and hello-world:frozen is used for when we just want a super
-			// small image
-			if img == "hello-world:frozen" {
-				srcName = "hello-world:latest"
-			}
-			if imgNS != "" {
-				srcName = imgNS + "/" + srcName
-			}
-			loadImages = append(loadImages, struct{ srcName, destName string }{
-				srcName:  srcName,
-				destName: img,
-			})
-		}
-	}
-	if len(loadImages) == 0 {
-		// everything is loaded, we're done
-		return nil
-	}
-
-	fi, err := os.Stat(frozenImgDir)
-	if err != nil || !fi.IsDir() {
-		srcImages := make([]string, 0, len(loadImages))
-		for _, img := range loadImages {
-			srcImages = append(srcImages, img.srcName)
-		}
-		if err := pullImages(dockerBinary, srcImages); err != nil {
-			return errors.Wrap(err, "error pulling image list")
-		}
-	} else {
-		if err := loadFrozenImages(dockerBinary); err != nil {
-			return err
-		}
-	}
-
-	for _, img := range loadImages {
-		if img.srcName != img.destName {
-			if out, err := exec.Command(dockerBinary, "tag", img.srcName, img.destName).CombinedOutput(); err != nil {
-				return errors.Errorf("%v: %s", err, string(out))
-			}
-			if out, err := exec.Command(dockerBinary, "rmi", img.srcName).CombinedOutput(); err != nil {
-				return errors.Errorf("%v: %s", err, string(out))
-			}
-		}
-	}
-	return nil
-}
-
-func loadFrozenImages(dockerBinary string) error {
-	tar, err := exec.LookPath("tar")
-	if err != nil {
-		return errors.Wrap(err, "could not find tar binary")
-	}
-	tarCmd := exec.Command(tar, "-cC", frozenImgDir, ".")
-	out, err := tarCmd.StdoutPipe()
-	if err != nil {
-		return errors.Wrap(err, "error getting stdout pipe for tar command")
-	}
-
-	errBuf := bytes.NewBuffer(nil)
-	tarCmd.Stderr = errBuf
-	tarCmd.Start()
-	defer tarCmd.Wait()
-
-	cmd := exec.Command(dockerBinary, "load")
-	cmd.Stdin = out
-	if out, err := cmd.CombinedOutput(); err != nil {
-		return errors.Errorf("%v: %s", err, string(out))
-	}
-	return nil
-}
-
-func pullImages(dockerBinary string, images []string) error {
-	cwd, err := os.Getwd()
-	if err != nil {
-		return errors.Wrap(err, "error getting path to dockerfile")
-	}
-	dockerfile := os.Getenv("DOCKERFILE")
-	if dockerfile == "" {
-		dockerfile = "Dockerfile"
-	}
-	dockerfilePath := filepath.Join(filepath.Dir(filepath.Clean(cwd)), dockerfile)
-	pullRefs, err := readFrozenImageList(dockerfilePath, images)
-	if err != nil {
-		return errors.Wrap(err, "error reading frozen image list")
-	}
-
-	var wg sync.WaitGroup
-	chErr := make(chan error, len(images))
-	for tag, ref := range pullRefs {
-		wg.Add(1)
-		go func(tag, ref string) {
-			defer wg.Done()
-			if out, err := exec.Command(dockerBinary, "pull", ref).CombinedOutput(); err != nil {
-				chErr <- errors.Errorf("%v: %s", string(out), err)
-				return
-			}
-			if out, err := exec.Command(dockerBinary, "tag", ref, tag).CombinedOutput(); err != nil {
-				chErr <- errors.Errorf("%v: %s", string(out), err)
-				return
-			}
-			if out, err := exec.Command(dockerBinary, "rmi", ref).CombinedOutput(); err != nil {
-				chErr <- errors.Errorf("%v: %s", string(out), err)
-				return
-			}
-		}(tag, ref)
-	}
-	wg.Wait()
-	close(chErr)
-	return <-chErr
-}
-
-func readFrozenImageList(dockerfilePath string, images []string) (map[string]string, error) {
-	f, err := os.Open(dockerfilePath)
-	if err != nil {
-		return nil, errors.Wrap(err, "error reading dockerfile")
-	}
-	defer f.Close()
-	ls := make(map[string]string)
-
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		line := strings.Fields(scanner.Text())
-		if len(line) < 3 {
-			continue
-		}
-		if !(line[0] == "RUN" && line[1] == "./contrib/download-frozen-image-v2.sh") {
-			continue
-		}
-
-		frozenImgDir = line[2]
-		if line[2] == frozenImgDir {
-			frozenImgDir = filepath.Join(os.Getenv("DEST"), "frozen-images")
-		}
-
-		for scanner.Scan() {
-			img := strings.TrimSpace(scanner.Text())
-			img = strings.TrimSuffix(img, "\\")
-			img = strings.TrimSpace(img)
-			split := strings.Split(img, "@")
-			if len(split) < 2 {
-				break
-			}
-
-			for _, i := range images {
-				if split[0] == i {
-					ls[i] = img
-					break
-				}
-			}
-		}
-	}
-	return ls, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.crt b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.crt
deleted file mode 100644
index 2218f23c89..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAP2EcMN2UXPcMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ4
-WhcNMjYwNjI4MTc0ODQ4WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT
-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk
-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvgewhaYs
-Ke5s2AM7xxKrT4A6n7hW17qSnBjonCcPcwTFmYqIOdxWjYITgJuHrTwB4ZhBqWS7
-tTsUUu6hWLMeB7Uo5/GEQAAZspKkT9G/rNKF9lbWK9PPhGGkeR01c/Q932m92Hsn
-fCQ0Pp/OzD3nVTh0v9HKk+PObNMOCcqG87eYs4ylPRxs0RrE/rP+bEGssKQSbeCZ
-wazDnO+kiatVgKQZ2CK23iFdRE1z2rzqVDeaFWdvBqrRdWnkOZClhlLgEQ5nK2yV
-B6tSqOiI3MmHyHzIkGOQJp2/s7Pe0ckEkzsjTsJW8oKHlBBl6pRxHIKzNN4VFbeB
-vvYvrogrDrC/owIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF
-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUFoHfukRa6qGk1ncON64Z
-ASKlZdkwDQYJKoZIhvcNAQELBQADggEBAEq9Adpd03CPmpbRtTAJGAkjjLFr60sV
-2r+/l/m9R31ZCN9ymM9nxToQ8zfMdeAh/nnPcErziil2gDVqXueCNDkRj09tmDIE
-Q1Oc92uyNZNgcECow77cKZCTZSTku+qsJrYaykH5vSnia8ltcKj8inJedIcpBR+p
-608HEQvF0Eg5eaLPJwH48BCb0Gqdri1dJgrNnqptz7MDr8M+u7tHVulbAd3YxLlq
-JH1W2bkVUx6esbn/MUE5HL5iTuOYREEINvBSmLdmmFkampmCnCB/bDEyJeL9bAkt
-ZPIi0UNSnqFKLSP1Vf8AGLXt6iO7+1OGvtsDXEEYdXVOMsSXZtUuT7A=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.key b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.key
deleted file mode 100644
index cb37efc94a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey1.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvgewhaYsKe5s2AM7xxKrT4A6n7hW17qSnBjonCcPcwTFmYqI
-OdxWjYITgJuHrTwB4ZhBqWS7tTsUUu6hWLMeB7Uo5/GEQAAZspKkT9G/rNKF9lbW
-K9PPhGGkeR01c/Q932m92HsnfCQ0Pp/OzD3nVTh0v9HKk+PObNMOCcqG87eYs4yl
-PRxs0RrE/rP+bEGssKQSbeCZwazDnO+kiatVgKQZ2CK23iFdRE1z2rzqVDeaFWdv
-BqrRdWnkOZClhlLgEQ5nK2yVB6tSqOiI3MmHyHzIkGOQJp2/s7Pe0ckEkzsjTsJW
-8oKHlBBl6pRxHIKzNN4VFbeBvvYvrogrDrC/owIDAQABAoIBAB/o8KZwsgfUhqh7
-WoViSCwQb0e0z7hoFwhpUl4uXPTGf1v6HEgDDPG0PwwgkdbwNaypQZVtWevj4NTQ
-R326jjdjH1xbfQa2PZpz722L3jDqJR6plEtFxRoIv3KrCffPsrgabIu2mnnJJpDB
-ixtW5cq0sT4ov2i4H0i85CWWwbSY/G/MHsvCuK9PhoCj9uToVqrf1KrAESE5q4fh
-mPSYUL99KVnj7SZkUz+79rc8sLLPVks3szZACMlm1n05ZTj/d6Nd2ZZUO45DllIj
-1XJghfWmnChrB/P/KYXgQ3Y9BofIAw1ra2y3wOZeqRFNsbmojcGldfdtN/iQzhEj
-uk4ThokCgYEA9FTmv36N8qSPWuqX/KzkixDQ8WrDGohcB54kK98Wx4ijXx3i38SY
-tFjO8YUS9GVo1+UgmRjZbzVX7xeum6+TdBBwOjNOxEQ4tzwiQBWDdGpli8BccdJ2
-OOIVxSslWhiUWfpYloXVetrR88iHbT882g795pbonDaJdXSLnij4UW8CgYEAxxrr
-QFpsmOEZvI/yPSOGdG7A1RIsCeH+cEOf4cKghs7+aCtAHlIweztNOrqirl3oKI1r
-I0zQl46WsaW8S/y99v9lmmnZbWwqLa4vIu0NWs0zaZdzKZw3xljMhgp4Ge69hHa2
-utCtAxcX+7q/yLlHoTiYwKdxX54iLkheCB8csw0CgYEAleEG820kkjXUIodJ2JwO
-Tihwo8dEC6CeI6YktizRgnEVFqH0rCOjMO5Rc+KX8AfNOrK5PnD54LguSuKSH7qi
-j04OKgWTSd43lF90+y63RtCFnibQDpp2HwrBJAQFk7EEP/XMJfnPLN/SbuMSADgM
-kg8kPTFRW5Iw3DYz9z9WpE0CgYAkn6/8Q2XMbUOFqti9JEa8Lg8sYk5VdwuNbPMA
-3QMYKQUk9ieyLB4c3Nik3+XCuyVUKEc31A5egmz3umu7cn8i6vGuiJ/k/8t2YZ7s
-Bry5Ihu95Yzab5DW3Eiqs0xKQN79ebS9AluAwQO5Wy2h52rknfuDHIm/M+BHsSoS
-xl5KFQKBgQCokCsYuX1z2GojHw369/R2aX3ovCGuHqy4k7fWxUrpHTHvth2+qNPr
-84qLJ9rLWoZE5sUiZ5YdwCgW877EdfkT+v4aaBX79ixso5VdqgJ/PdnoNntah/Vq
-njQiW1skn6/P5V/eyimN2n0VsyBr/zMDEtYTRP/Tb1zi/njFLQkZEA==
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.crt b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.crt
deleted file mode 100644
index bec084790a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAIq8naKlYAQfMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ4
-WhcNMjYwNjI4MTc0ODQ4WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT
-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk
-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAyY2EWYTW
-5VHipw08t675upmD6a+akiuZ1z+XpuOxZCgjZ0aHfoOe8wGKg3Ohz7UCBdD5Mob/
-L/qvRlsCaqPHGZKIyyX1HDO4mpuQQFBhYxt+ZAO3AaawEUOw2rwwMDEjLnDDTSZM
-z8jxCMvsJjBDqgb8g3z+AmjducQ/OH6llldgHIBY8ioRbROCL2PGgqywWq2fThav
-c70YMxtKviBGDNCouYeQ8JMK/PuLwPNDXNQAagFHVARXiUv/ILHk7ImYnSGJUcuk
-JTUGN2MBnpY0eakg7i+4za8sjjqOdn+2I6aVzlGJDSiRP72nkg/cE4BqMl9FrMwK
-9iS8xa9yMDLUvwIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF
-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUvQzzFmh3Sv3HcdExY3wx
-/1u6JLAwDQYJKoZIhvcNAQELBQADggEBAJcmDme2Xj/HPUPwaN/EyCmjhY73EiHO
-x6Pm16tscg5JGn5A+u3CZ1DmxUYl8Hp6MaW/sWzdtL0oKJg76pynadCWh5EacFR8
-u+2GV/IcN9mSX6JQzvrqbjSqo5/FehqBD+W5h3euwwApWA3STAadYeyEfmdOA3SQ
-W1vzrA1y7i8qgTqeJ7UX1sEAXlIhBK2zPYaMB+en+ZOiPyNxJYj6IDdGdD2paC9L
-6H9wKC+GAUTSdCWp89HP7ETSXEGr94AXkrwU+qNsiN+OyK8ke0EMngEPh5IQoplw
-/7zEZCth3oKxvR1/4S5LmTVaHI2ZlbU4q9bnY72G4tw8YQr2gcBGo4w=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.key b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.key
deleted file mode 100644
index 5ccabe908f..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey2.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAyY2EWYTW5VHipw08t675upmD6a+akiuZ1z+XpuOxZCgjZ0aH
-foOe8wGKg3Ohz7UCBdD5Mob/L/qvRlsCaqPHGZKIyyX1HDO4mpuQQFBhYxt+ZAO3
-AaawEUOw2rwwMDEjLnDDTSZMz8jxCMvsJjBDqgb8g3z+AmjducQ/OH6llldgHIBY
-8ioRbROCL2PGgqywWq2fThavc70YMxtKviBGDNCouYeQ8JMK/PuLwPNDXNQAagFH
-VARXiUv/ILHk7ImYnSGJUcukJTUGN2MBnpY0eakg7i+4za8sjjqOdn+2I6aVzlGJ
-DSiRP72nkg/cE4BqMl9FrMwK9iS8xa9yMDLUvwIDAQABAoIBAHmffvzx7ydESWwa
-zcfdu26BkptiTvjjfJrqEd4wSewxWGPKqJqMXE8xX99A2KTZClZuKuH1mmnecQQY
-iRXGrK9ewFMuHYGeKEiLlPlqR8ohXhyGLVm+t0JDwaXMp5t9G0i73O5iLTm5fNGd
-FGxa9YnVW20Q8MqNczbVGH1D1zInhxzzOyFzBd4bBBJ8PdrUdyLpd7+RxY2ghnbT
-p9ZANR2vk5zmDLJgZx72n/u+miJWuhY6p0v3Vq4z/HHgdhf+K6vpDdzTcYlA0rO4
-c/c+RKED3ZadGUD5QoLsmEN0e3FVSMPN1kt4ZRTqWfH8f2X4mLz33aBryTjktP6+
-1rX6ThECgYEA74wc1Tq23B5R0/GaMm1AK3Ko2zzTD8wK7NSCElh2dls02B+GzrEB
-aE3A2GMQSuzb+EA0zkipwANBaqs3ZemH5G1pu4hstQsXCMd4jAJn0TmTXlplXBCf
-PSc8ZUU6XcJENRr9Q7O9/TGlgahX+z0ndxYx/CMCsSu7XsMg4IZsbAcCgYEA12Vb
-wKOVG15GGp7pMshr+2rQfVimARUP4gf3JnQmenktI4PfdnMW3a4L3DEHfLhIerwT
-6lRp/NpxSADmuT4h1UO1l2lc+gmTVPw0Vbl6VwHpgS5Kfu4ZyM6n3S66f/dE4nu7
-hQF9yZz7vn5Agghak4p6a1wC1gdMzR1tvxFzk4kCgYByBMTskWfcWeok8Yitm+bB
-R3Ar+kWT7VD97SCETusD5uG+RTNLSmEbHnc+B9kHcLo67YS0800pAeOvPBPARGnU
-RmffRU5I1iB+o0MzkSmNItSMQoagTaEd4IEUyuC/I+qHRHNsOC+kRm86ycAm67LP
-MhdUpe1wGxqyPjp15EXTHQKBgDKzFu+3EWfJvvKRKQ7dAh3BvKVkcl6a2Iw5l8Ej
-YdM+JpPPfI/i8yTmzL/dgoem0Nii4IUtrWzo9fUe0TAVId2S/HFRSaNJEbbVTnRH
-HjbQqmfPv5U08jjD+9siHp/0UfCFc1QRT8xe+RqTmReCY9+KntoaZEiAm2FEZgqt
-TukRAoGAf7QqbTP5/UH1KSkX89F5qy/6GS3pw6TLj9Ufm/l/NO8Um8gag6YhEKWR
-7HpkpCqjfWj8Av8ESR9cqddPGrbdqXFm9z7dCjlAd5T3Q3h/h+v+JzLQWbsI6WOb
-SsOSWNyE006ZZdIiFwO6GfxpLI24sVtYKgyob6Q71oxSqfnrnT0=
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.crt b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.crt
deleted file mode 100644
index f434b45fc8..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJAKHt/jxiWqMtMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ5
-WhcNMjYwNjI4MTc0ODQ5WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT
-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk
-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqfbJk2Dk
-C9FJVjV2+Q2CQrJphG3vFc1Qlu9jgVA5RhGmF9jJzetsclsV/95nBhinIGcSmPQA
-l318G7Bz/cG/6O2n5+hj+S1+YOvQweReZj3d4kCeS86SOyLNTpMD9gsF0S8nR1RN
-h0jD4t1vxAVeGD1o61U8/k0O5eDoeOfOSWZagKk5PhyrMZgNip4IrG46umCkFlrw
-zMMcgQdwTQXywPqkr/LmYpqT1WpMlzHYTQEY8rKorIJQbPtHVYdr4UxYnNmk6fbU
-biEP1DQlwjBWcFTsDLqXKP/K+e3O0/e/hMB0y7Tj9fZ7Viw0t5IKXZPsxMhwknUT
-9vmPzIJO6NiniwIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF
-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUdTXRP1EzxQ+UDZSoheVo
-Mobud1cwDQYJKoZIhvcNAQELBQADggEBADV9asTWWdbmpkeRuKyi0xGho39ONK88
-xxkFlco766BVgemo/rGQj3oPuw6M6SzHFoJ6JUPjmLiAQDIGEU/2/b6LcOuLjP+4
-YejCcDTY3lSW/HMNoAmzr2foo/LngNGfe/qhVFUqV7GjFT9+XzFFBfIZ1cQiL2ed
-kc8rgQxFPwWXFCSwaENWeFnMDugkd+7xanoAHq8GsJpg5fTruDTmJkUqC2RNiMLn
-WM7QaqW7+lmUnMnc1IBoz0hFhgoiadWM/1RQxx51zTVw6Au1koIm4ZXu5a+/WyC8
-K1+HyUbc0AVaDaRBpRSOR9aHRwLGh6WQ4aUZQNyJroc999qfYrDEEV8=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.key b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.key
deleted file mode 100644
index a61d18cc3d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey3.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEAqfbJk2DkC9FJVjV2+Q2CQrJphG3vFc1Qlu9jgVA5RhGmF9jJ
-zetsclsV/95nBhinIGcSmPQAl318G7Bz/cG/6O2n5+hj+S1+YOvQweReZj3d4kCe
-S86SOyLNTpMD9gsF0S8nR1RNh0jD4t1vxAVeGD1o61U8/k0O5eDoeOfOSWZagKk5
-PhyrMZgNip4IrG46umCkFlrwzMMcgQdwTQXywPqkr/LmYpqT1WpMlzHYTQEY8rKo
-rIJQbPtHVYdr4UxYnNmk6fbUbiEP1DQlwjBWcFTsDLqXKP/K+e3O0/e/hMB0y7Tj
-9fZ7Viw0t5IKXZPsxMhwknUT9vmPzIJO6NiniwIDAQABAoIBAQCAr/ed3A2umO7T
-FDYZik3nXBiiiW4t7r+nGGgZ3/kNgY1lnuHlROxehXLZwbX1mrLnyML/BjhwezV9
-7ZNVPd6laVPpNj6DyxtWHRZ5yARlm1Al39E7CpQTrF0QsiWcpGnqIa62xjDRTpnq
-askV/Q5qggyvqmE9FnFCQpEiAjlhvp7F0kVHVJm9s3MK3zSyR0UTZ3cpYus2Jr2z
-OotHgAMHq5Hgb3dvxOeE2xRMeYAVDujbkNzXm2SddAtiRdLhWDh7JIr3zXhp0HyN
-4rLOyhlgz00oIGeDt/C0q3fRmghr3iZOG+7m2sUx0FD1Ru1dI9v2A+jYmIVNW6+x
-YJk5PzxJAoGBANDj7AGdcHSci/LDBPoTTUiz3uucAd27/IJma/iy8mdbVfOAb0Fy
-PRSPvoozlpZyOxg2J4eH/o4QxQR4lVKtnLKZLNHK2tg3LarwyBX1LiI3vVlB+DT1
-AmV8i5bJAckDhqFeEH5qdWZFi03oZsSXWEqX5iMYCrdK5lTZggcrFZeHAoGBANBL
-fkk3knAdcVfTYpmHx18GBi2AsCWTd20KD49YBdbVy0Y2Jaa1EJAmGWpTUKdYx40R
-H5CuGgcAviXQz3bugdTU1I3tAclBtpJNU7JkhuE+Epz0CM/6WERJrE0YxcGQA5ui
-6fOguFyiXD1/85jrDBOKy74aoS7lYz9r/a6eqmjdAoGBAJpm/nmrIAZx+Ff2ouUe
-A1Ar9Ch/Zjm5zEmu3zwzOU4AiyWz14iuoktifNq2iyalRNz+mnVpplToPFizsNwu
-C9dPtXtU0DJlhtIFrD/evLz6KnGhe4/ZUm4lgyBvb2xfuNHqL5Lhqelwmil6EQxb
-Oh3Y7XkfOjyFln89TwlxZUJdAoGAJRMa4kta7EvBTeGZLjyltvsqhFTghX+vBSCC
-ToBbYbbiHJgssXSPAylU4sD7nR3HPwuqM6VZip+OOMrm8oNXZpuPTce+xqTEq1vK
-JvmPrG3RAFDLdMFZjqYSXhKnuGE60yv3Ol8EEbDwfB3XLQPBPYU56Jdy0xcPSE2f
-dMJXEJ0CgYEAisZw0nXw6lFeYecu642EGuU0wv1O9i21p7eho9QwOcsoTl4Q9l+M
-M8iBv+qTHO+D19l4JbkGvy2H2diKoYduUFACcuiFYs8fjrT+4Z6DyOQAQGAf6Ylw
-BFbU15k6KbA9v4mZDfd1tY9x62L/XO55ZxYG+J+q0e26tEThgD8cEog=
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.crt b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.crt
deleted file mode 100644
index c8cbe46bdf..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.crt
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDhTCCAm2gAwIBAgIJANae++ZkUEWMMA0GCSqGSIb3DQEBCwUAMFcxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEVMBMGA1UEBxMMU2FuRnJhbmNpc2NvMQ8wDQYD
-VQQKEwZEb2NrZXIxEzARBgNVBAMTCmRlbGVnYXRpb24wHhcNMTYwOTI4MTc0ODQ5
-WhcNMjYwNjI4MTc0ODQ5WjBXMQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFTAT
-BgNVBAcTDFNhbkZyYW5jaXNjbzEPMA0GA1UEChMGRG9ja2VyMRMwEQYDVQQDEwpk
-ZWxlZ2F0aW9uMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAqULAjgba
-Y2I10WfqdmYnPfEqEe6iMDbzcgECb2xKafXcI4ltkQj1iO4zBTs0Ft9EzXFc5ZBh
-pTjZrL6vrIa0y/CH2BiIHBJ0wRHx/40HXp4DSj3HZpVOlEMI3npRfBGNIBllUaRN
-PWG7zL7DcKMIepBfPXyjBsxzH3yNiISq0W5hSiy+ImhSo3aipJUHHcp9Z9NgvpNC
-3QvnxsGKRnECmDRDlxkq+FQu9Iqs/HWFYWgyfcsw+YTrWZq3qVnnqUouHO//c9PG
-Ry3sZSDU97MwvkjvWys1e01Xvd3AbHx08YAsxih58i/OBKe81eD9NuZDP2KrjTxI
-5xkXKhj6DV2NnQIDAQABo1QwUjAMBgNVHRMBAf8EAjAAMA4GA1UdDwEB/wQEAwIF
-oDATBgNVHSUEDDAKBggrBgEFBQcDAzAdBgNVHQ4EFgQUDt95hiqbQvi0KcvZGAUu
-VisnztQwDQYJKoZIhvcNAQELBQADggEBAGi7qHai7MWbfeu6SlXhzIP3AIMa8TMi
-lp/+mvPUFPswIVqYJ71MAN8uA7CTH3z50a2vYupGeOEtZqVJeRf+xgOEpwycncxp
-Qz6wc6TWPVIoT5q1Hqxw1RD2MyKL+Y+QBDYwFxFkthpDMlX48I9frcqoJUWFxBF2
-lnRr/cE7BbPE3sMbXV3wGPlH7+eUf+CgzXJo2HB6THzagyEgNrDiz/0rCQa1ipFd
-mNU3D/U6BFGmJNxhvSOtXX9escg8yjr05YwwzokHS2K4jE0ZuJPBd50C/Rvo3Mf4
-0h7/2Q95e7d42zPe9WYPu2F8KTWsf4r+6ddhKrKhYzXIcTAfHIOiO+U=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.key b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.key
deleted file mode 100644
index f473cc495a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/delgkey4.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAqULAjgbaY2I10WfqdmYnPfEqEe6iMDbzcgECb2xKafXcI4lt
-kQj1iO4zBTs0Ft9EzXFc5ZBhpTjZrL6vrIa0y/CH2BiIHBJ0wRHx/40HXp4DSj3H
-ZpVOlEMI3npRfBGNIBllUaRNPWG7zL7DcKMIepBfPXyjBsxzH3yNiISq0W5hSiy+
-ImhSo3aipJUHHcp9Z9NgvpNC3QvnxsGKRnECmDRDlxkq+FQu9Iqs/HWFYWgyfcsw
-+YTrWZq3qVnnqUouHO//c9PGRy3sZSDU97MwvkjvWys1e01Xvd3AbHx08YAsxih5
-8i/OBKe81eD9NuZDP2KrjTxI5xkXKhj6DV2NnQIDAQABAoIBAGK0ZKnuYSiXux60
-5MvK4pOCsa/nY3mOcgVHhW4IzpRgJdIrcFOlz9ncXrBsSAIWjX7o3u2Ydvjs4DOW
-t8d6frB3QiDInYcRVDjLCD6otWV97Bk9Ua0G4N4hAWkMF7ysV4oihS1JDSoAdo39
-qOdki6s9yeyHZGKwk2oHLlowU5TxQMBA8DHmxqBII1HTm+8xRz45bcEqRXydYSUn
-P1JuSU9jFqdylxU+Nrq6ehslMQ3y7qNWQyiLGxu6EmR+vgrzSU0s3iAOqCHthaOS
-VBBXPL3DNEYUS+0QGnGrACuJhanOMBfdiO6Orelx6ZzWZm38PNGv0yBt0WCM+8/A
-TtQNGkECgYEA1LqR6AH9XikUQ0+rM4526BgVuYqtjw21h4Lj9alaA+YTQntBBJOv
-iAcUpnJiV4T8jzAMLeqpK8R/rbxRnK5S9jOV2gr+puk4L6tH46cgahBUESDigDp8
-6vK8ur6ubBcXNPh3AT6rsPj+Ph2EU3raqiYdouvCdga/OCYZb+jr6UkCgYEAy7Cr
-l8WssI/8/ORcQ4MFJFNyfz/Y2beNXyLd1PX0H+wRSiGcKzeUuTHNtzFFpMbrK/nx
-ZOPCT2ROdHsBHzp1L+WquCb0fyMVSiYiXBU+VCFDbUU5tBr3ycTc7VwuFPENOiha
-IdlWgew/aW110FQHIaqe9g+htRe+mXe++faZtbUCgYB/MSJmNzJX53XvHSZ/CBJ+
-iVAMBSfq3caJRLCqRNzGcf1YBbwFUYxlZ95n+wJj0+byckcF+UW3HqE8rtmZNf3y
-qTtTCLnj8JQgpGeybU4LPMIXD7N9+fqQvBwuCC7gABpnGJyHCQK9KNNTLnDdPRqb
-G3ki3ZYC3dvdZaJV8E2FyQKBgQCMa5Mf4kqWvezueo+QizZ0QILibqWUEhIH0AWV
-1qkhiKCytlDvCjYhJdBnxjP40Jk3i+t6XfmKud/MNTAk0ywOhQoYQeKz8v+uSnPN
-f2ekn/nXzq1lGGJSWsDjcXTjQvqXaVIZm7cjgjaE+80IfaUc9H75qvUT3vaq3f5u
-XC7DMQKBgQDMAzCCpWlEPbZoFMl6F49+7jG0/TiqM/WRUSQnNtufPMbrR9Je4QM1
-L1UCANCPaHFOncKYer15NfIV1ctt5MZKImevDsUaQO8CUlO+dzd5H8KvHw9E29gA
-B22v8k3jIjsYeRL+UJ/sBnWHgxdAe/NEM+TdlP2oP9D1gTifutPqAg==
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/gen.sh b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/gen.sh
deleted file mode 100755
index 8d6381cec4..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/gen.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-for selfsigned in delgkey1 delgkey2 delgkey3 delgkey4; do
-        subj='/C=US/ST=CA/L=SanFrancisco/O=Docker/CN=delegation'
-
-        openssl genrsa -out "${selfsigned}.key" 2048
-        openssl req -new -key "${selfsigned}.key" -out "${selfsigned}.csr" -sha256 -subj "${subj}"
-        cat > "${selfsigned}.cnf" <<EOL
-[selfsigned]
-basicConstraints = critical,CA:FALSE
-keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage=codeSigning
-subjectKeyIdentifier=hash
-EOL
-
-        openssl x509 -req -days 3560 -in "${selfsigned}.csr" -signkey "${selfsigned}.key" -sha256 \
-                -out "${selfsigned}.crt" -extfile "${selfsigned}.cnf" -extensions selfsigned
-
-        rm "${selfsigned}.cnf" "${selfsigned}.csr"
-done
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.cert b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.cert
deleted file mode 100644
index d1233a1b06..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.cert
+++ /dev/null
@@ -1,19 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDCTCCAfOgAwIBAgIQTOoFF+ypXwgdXnXHuCTvYDALBgkqhkiG9w0BAQswJjER
-MA8GA1UEChMIUXVpY2tUTFMxETAPBgNVBAMTCFF1aWNrVExTMB4XDTE1MDcxNzE5
-NDg1M1oXDTE4MDcwMTE5NDg1M1owJzERMA8GA1UEChMIUXVpY2tUTFMxEjAQBgNV
-BAMTCWxvY2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMDO
-qvTBAi0ApXLfe90ApJkdkRGwF838Qzt1UFSxomu5fHRV6l3FjX5XCVHiFQ4w3ROh
-dMOu9NahfGLJv9VvWU2MV3YoY9Y7lIXpKwnK1v064wuls4nPh13BUWKQKofcY/e2
-qaSPd6/qmSRc/kJUvOI9jZMSX6ZRPu9K4PCqm2CivlbLq9UYuo1AbRGfuqHRvTxg
-mQG7WQCzGSvSjuSg5qX3TEh0HckTczJG9ODULNRWNE7ld0W4sfv4VF8R7Uc/G7LO
-8QwLCZ9TIl3gYMPCrhUL3Q6z9Jnn1SQS4mhDnPi6ugRYO1X8k3jjdxV9C2sXwUvN
-OZI1rLEWl9TJNA7ZXtMCAwEAAaM2MDQwDgYDVR0PAQH/BAQDAgCgMAwGA1UdEwEB
-/wQCMAAwFAYDVR0RBA0wC4IJbG9jYWxob3N0MAsGCSqGSIb3DQEBCwOCAQEAH6iq
-kM2+UMukGDLEQKHHiauioWJlHDlLXv76bJiNfjSz94B/2XOQMb9PT04//tnGUyPK
-K8Dx7RoxSodU6T5VRiz/A36mLOvt2t3bcL/1nHf9sAOHcexGtnCbQbW91V7RKfIL
-sjiLNFDkQ9VfVNY+ynQptZoyH1sy07+dplfkIiPzRs5WuVAnEGsX3r6BrhgUITzi
-g1B4kpmGZIohP4m6ZEBY5xuo/NQ0+GhjAENQMU38GpuoMyFS0i0dGcbx8weqnI/B
-Er/qa0+GE/rBnWY8TiRow8dzpneSFQnUZpJ4EwD9IoOIDHo7k2Nbz2P50HMiCXZf
-4RqzctVssRlrRVnO5w==
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.key b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.key
deleted file mode 100644
index d7778359a3..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/notary/localhost.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEogIBAAKCAQEAwM6q9MECLQClct973QCkmR2REbAXzfxDO3VQVLGia7l8dFXq
-XcWNflcJUeIVDjDdE6F0w6701qF8Ysm/1W9ZTYxXdihj1juUhekrCcrW/TrjC6Wz
-ic+HXcFRYpAqh9xj97appI93r+qZJFz+QlS84j2NkxJfplE+70rg8KqbYKK+Vsur
-1Ri6jUBtEZ+6odG9PGCZAbtZALMZK9KO5KDmpfdMSHQdyRNzMkb04NQs1FY0TuV3
-Rbix+/hUXxHtRz8bss7xDAsJn1MiXeBgw8KuFQvdDrP0mefVJBLiaEOc+Lq6BFg7
-VfyTeON3FX0LaxfBS805kjWssRaX1Mk0Dtle0wIDAQABAoIBAHbuhNHZROhRn70O
-Ui9vOBki/dt1ThnH5AkHQngb4t6kWjrAzILvW2p1cdBKr0ZDqftz+rzCbVD/5+Rg
-Iq8bsnB9g23lWEBMHD/GJsAxmRA3hNooamk11IBmwTcVSsbnkdq5mEdkICYphjHC
-Ey0DbEf6RBxWlx3WvAWLoNmTw6iFaOCH8IyLavPpe7kLbZc219oNUw2qjCnCXCZE
-/NuViADHJBPN8r7g1gmyclJmTumdUK6oHgXEMMPe43vhReGcgcReK9QZjnTcIXPM
-4oJOraw+BtoZXVvvIPnC+5ntoLFOzjIzM0kaveReZbdgffqF4zy2vRfCHhWssanc
-7a0xR4ECgYEA3Xuvcqy5Xw+v/jVCO0VZj++Z7apA78dY4tWsPx5/0DUTTziTlXkC
-ADduEbwX6HgZ/iLvA9j4C3Z4mO8qByby/6UoBU8NEe+PQt6fT7S+dKSP4uy5ZxVM
-i5opkEyrJsMbve9Jrlj4bk5CICsydrZ+SBFHnpNGjbduGQick5LORWECgYEA3trt
-gepteDGiUYmnnBgjbYtcD11RvpKC8Z/QwGnzN5vk4eBu8r7DkMcLN+SiHjAovlJo
-r5j3EbF8sla1zBf/yySdQZFqUGcwtw7MaAKCLdhQl5WsViNMIx6p2OJapu0dzbv2
-KTXrnoRCafcH92k0dUX1ahE9eyc8KX6VhbWwXLMCgYATGCCuEDoC+gVAMzM8jOQF
-xrBMjwr+IP+GvskUv/pg5tJ9V/FRR5dmkWDJ4p9lCUWkZTqZ6FCqHFKVTLkg2LjG
-VWS34HLOAwskxrCRXJG22KEW/TWWr31j46yFpjZzJwrzOvftMfpo+BI3V8IH/f+x
-EtxLzYKdoRy6x8VH67YgwQKBgHor2vjV45142FuK83AHa6SqOZXSuvWWrGJ6Ep7p
-doSN2jRaLXi2S9AaznOdy6JxFGUCGJHrcccpXgsGrjNtFLXxJKTFa1sYtwQkALsk
-ZOltJQF09D1krGC0driHntrUMvqOiKye+sS0DRS6cIuaCUAhUiELwoC5SaoV0zKy
-IDUxAoGAOK8Xq+3/sqe79vTpw25RXl+nkAmOAeKjqf3Kh6jbnBhr81rmefyKXB9a
-uj0b980tzUnliwA5cCOsyxfN2vASvMnJxFE721QZI04arlcPFHcFqCtmNnUYTcLp
-0hgn/yLZptcoxpy+eTBu3eNsxz1Bu/Tx/198+2Wr3MbtGpLNIcA=
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/registry/cert.pem b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/registry/cert.pem
deleted file mode 100644
index 376054033a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/registry/cert.pem
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDfzCCAmegAwIBAgIJAKZjzF7N4zFJMA0GCSqGSIb3DQEBCwUAMFYxCzAJBgNV
-BAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0IENpdHkxHDAaBgNVBAoME0RlZmF1bHQg
-Q29tcGFueSBMdGQxEjAQBgNVBAMMCWxvY2FsaG9zdDAeFw0xNjAzMTQxOTAzMDZa
-Fw0xNzAzMTQxOTAzMDZaMFYxCzAJBgNVBAYTAlhYMRUwEwYDVQQHDAxEZWZhdWx0
-IENpdHkxHDAaBgNVBAoME0RlZmF1bHQgQ29tcGFueSBMdGQxEjAQBgNVBAMMCWxv
-Y2FsaG9zdDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAMAVEPA6tSNy
-MoExHvT8CWvbe0MyYqZjMmUUdGVYyAaoZgmj9HvtGKaUWY/hCtgTond3OKhPq69u
-fQSDlHQA/scq4KZovKQJhvBaRb2DqD31KcbcDyh5KUAL1aalbjTLbKmAYSFSoY93
-57KiBei2BmvS55HLhOiO8ccQOq3feH/J/XcszAdAaiGXW3woDOIumYzur6Q8Suyn
-cIUEX5Ik7mxS7oGYN1IM++Y+B6aAFT7htAZEvF7RF7sjG7QBfxNPOFg9lBWXzVSv
-0vRbVme9OCDD2QOpj8O7XAPuLDwW5b2A8Iex3CJRngBI9vAK5h1Wssst8117bur9
-AiubOrF6cxUCAwEAAaNQME4wHQYDVR0OBBYEFNTGYK7uX19yjCPeGXhmel98amoA
-MB8GA1UdIwQYMBaAFNTGYK7uX19yjCPeGXhmel98amoAMAwGA1UdEwQFMAMBAf8w
-DQYJKoZIhvcNAQELBQADggEBACW/oF6RgLbTPxb8oPI9424Uv/erYYdxdqIaO3Mz
-fQfBEvGu62A0ZLH+av4BTeqBM6iVhN6/Y3hUb8UzbbZAIo/dVJSglW7PXAfUITMM
-ca9U2r2cFqgXELZkhde6mTFTYwM3swMCP0HUEo+Hu62NX5gunKr4QMNfTlE3vHEj
-jitnkTR0ZVEKHvmdTJC9S92j+NuaJVcwe5UNP1Nj/Ksd/iUUCa2DBnw2N7YwHTDB
-jb9cQb8aNVNSrjKP3sknMslVy1JVbUB1LXsth/h+kkVFNP4dsk+dZHn20uIA/VeJ
-mJ3Wo54CeTAa3DysiWbIIYsFSASCPvki08ZKI373tCf2RvE=
------END CERTIFICATE-----
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/secrets/default b/installer/vendor/github.com/docker/docker/integration-cli/fixtures/secrets/default
deleted file mode 100644
index e8ca7d8874..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures/secrets/default
+++ /dev/null
@@ -1 +0,0 @@
-this is the secret
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/fixtures_linux_daemon.go b/installer/vendor/github.com/docker/docker/integration-cli/fixtures_linux_daemon.go
deleted file mode 100644
index b9484f3a2a..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/fixtures_linux_daemon.go
+++ /dev/null
@@ -1,143 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/docker/docker/integration-cli/fixtures/load"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/go-check/check"
-)
-
-func ensureFrozenImagesLinux(t *testing.T) {
-	images := []string{"busybox:latest", "hello-world:frozen", "debian:jessie"}
-	err := load.FrozenImagesLinux(dockerBinary, images...)
-	if err != nil {
-		t.Log(dockerCmdWithError("images"))
-		t.Fatalf("%+v", err)
-	}
-	for _, img := range images {
-		protectedImages[img] = struct{}{}
-	}
-}
-
-var ensureSyscallTestOnce sync.Once
-
-func ensureSyscallTest(c *check.C) {
-	var doIt bool
-	ensureSyscallTestOnce.Do(func() {
-		doIt = true
-	})
-	if !doIt {
-		return
-	}
-	protectedImages["syscall-test:latest"] = struct{}{}
-
-	// if no match, must build in docker, which is significantly slower
-	// (slower mostly because of the vfs graphdriver)
-	if daemonPlatform != runtime.GOOS {
-		ensureSyscallTestBuild(c)
-		return
-	}
-
-	tmp, err := ioutil.TempDir("", "syscall-test-build")
-	c.Assert(err, checker.IsNil, check.Commentf("couldn't create temp dir"))
-	defer os.RemoveAll(tmp)
-
-	gcc, err := exec.LookPath("gcc")
-	c.Assert(err, checker.IsNil, check.Commentf("could not find gcc"))
-
-	tests := []string{"userns", "ns", "acct", "setuid", "setgid", "socket", "raw"}
-	for _, test := range tests {
-		out, err := exec.Command(gcc, "-g", "-Wall", "-static", fmt.Sprintf("../contrib/syscall-test/%s.c", test), "-o", fmt.Sprintf("%s/%s-test", tmp, test)).CombinedOutput()
-		c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	}
-
-	if runtime.GOOS == "linux" && runtime.GOARCH == "amd64" {
-		out, err := exec.Command(gcc, "-s", "-m32", "-nostdlib", "../contrib/syscall-test/exit32.s", "-o", tmp+"/"+"exit32-test").CombinedOutput()
-		c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-	}
-
-	dockerFile := filepath.Join(tmp, "Dockerfile")
-	content := []byte(`
-	FROM debian:jessie
-	COPY . /usr/bin/
-	`)
-	err = ioutil.WriteFile(dockerFile, content, 600)
-	c.Assert(err, checker.IsNil)
-
-	var buildArgs []string
-	if arg := os.Getenv("DOCKER_BUILD_ARGS"); strings.TrimSpace(arg) != "" {
-		buildArgs = strings.Split(arg, " ")
-	}
-	buildArgs = append(buildArgs, []string{"-q", "-t", "syscall-test", tmp}...)
-	buildArgs = append([]string{"build"}, buildArgs...)
-	dockerCmd(c, buildArgs...)
-}
-
-func ensureSyscallTestBuild(c *check.C) {
-	err := load.FrozenImagesLinux(dockerBinary, "buildpack-deps:jessie")
-	c.Assert(err, checker.IsNil)
-
-	var buildArgs []string
-	if arg := os.Getenv("DOCKER_BUILD_ARGS"); strings.TrimSpace(arg) != "" {
-		buildArgs = strings.Split(arg, " ")
-	}
-	buildArgs = append(buildArgs, []string{"-q", "-t", "syscall-test", "../contrib/syscall-test"}...)
-	buildArgs = append([]string{"build"}, buildArgs...)
-	dockerCmd(c, buildArgs...)
-}
-
-func ensureNNPTest(c *check.C) {
-	protectedImages["nnp-test:latest"] = struct{}{}
-	if daemonPlatform != runtime.GOOS {
-		ensureNNPTestBuild(c)
-		return
-	}
-
-	tmp, err := ioutil.TempDir("", "docker-nnp-test")
-	c.Assert(err, checker.IsNil)
-
-	gcc, err := exec.LookPath("gcc")
-	c.Assert(err, checker.IsNil, check.Commentf("could not find gcc"))
-
-	out, err := exec.Command(gcc, "-g", "-Wall", "-static", "../contrib/nnp-test/nnp-test.c", "-o", filepath.Join(tmp, "nnp-test")).CombinedOutput()
-	c.Assert(err, checker.IsNil, check.Commentf(string(out)))
-
-	dockerfile := filepath.Join(tmp, "Dockerfile")
-	content := `
-	FROM debian:jessie
-	COPY . /usr/bin
-	RUN chmod +s /usr/bin/nnp-test
-	`
-	err = ioutil.WriteFile(dockerfile, []byte(content), 600)
-	c.Assert(err, checker.IsNil, check.Commentf("could not write Dockerfile for nnp-test image"))
-
-	var buildArgs []string
-	if arg := os.Getenv("DOCKER_BUILD_ARGS"); strings.TrimSpace(arg) != "" {
-		buildArgs = strings.Split(arg, " ")
-	}
-	buildArgs = append(buildArgs, []string{"-q", "-t", "nnp-test", tmp}...)
-	buildArgs = append([]string{"build"}, buildArgs...)
-	dockerCmd(c, buildArgs...)
-}
-
-func ensureNNPTestBuild(c *check.C) {
-	err := load.FrozenImagesLinux(dockerBinary, "buildpack-deps:jessie")
-	c.Assert(err, checker.IsNil)
-
-	var buildArgs []string
-	if arg := os.Getenv("DOCKER_BUILD_ARGS"); strings.TrimSpace(arg) != "" {
-		buildArgs = strings.Split(arg, " ")
-	}
-	buildArgs = append(buildArgs, []string{"-q", "-t", "npp-test", "../contrib/nnp-test"}...)
-	buildArgs = append([]string{"build"}, buildArgs...)
-	dockerCmd(c, buildArgs...)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/npipe.go b/installer/vendor/github.com/docker/docker/integration-cli/npipe.go
deleted file mode 100644
index fa531a1b4d..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/npipe.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"net"
-	"time"
-)
-
-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {
-	panic("npipe protocol only supported on Windows")
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/npipe_windows.go b/installer/vendor/github.com/docker/docker/integration-cli/npipe_windows.go
deleted file mode 100644
index 4fd735f2db..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/npipe_windows.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package main
-
-import (
-	"net"
-	"time"
-
-	"github.com/Microsoft/go-winio"
-)
-
-func npipeDial(path string, timeout time.Duration) (net.Conn, error) {
-	return winio.DialPipe(path, &timeout)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/registry.go b/installer/vendor/github.com/docker/docker/integration-cli/registry.go
deleted file mode 100644
index 5181570af5..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/registry.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-
-	"github.com/docker/distribution/digest"
-	"github.com/go-check/check"
-)
-
-const (
-	v2binary        = "registry-v2"
-	v2binarySchema1 = "registry-v2-schema1"
-)
-
-type testRegistryV2 struct {
-	cmd      *exec.Cmd
-	dir      string
-	auth     string
-	username string
-	password string
-	email    string
-}
-
-func newTestRegistryV2(c *check.C, schema1 bool, auth, tokenURL string) (*testRegistryV2, error) {
-	tmp, err := ioutil.TempDir("", "registry-test-")
-	if err != nil {
-		return nil, err
-	}
-	template := `version: 0.1
-loglevel: debug
-storage:
-    filesystem:
-        rootdirectory: %s
-http:
-    addr: %s
-%s`
-	var (
-		authTemplate string
-		username     string
-		password     string
-		email        string
-	)
-	switch auth {
-	case "htpasswd":
-		htpasswdPath := filepath.Join(tmp, "htpasswd")
-		// generated with: htpasswd -Bbn testuser testpassword
-		userpasswd := "testuser:$2y$05$sBsSqk0OpSD1uTZkHXc4FeJ0Z70wLQdAX/82UiHuQOKbNbBrzs63m"
-		username = "testuser"
-		password = "testpassword"
-		email = "test@test.org"
-		if err := ioutil.WriteFile(htpasswdPath, []byte(userpasswd), os.FileMode(0644)); err != nil {
-			return nil, err
-		}
-		authTemplate = fmt.Sprintf(`auth:
-    htpasswd:
-        realm: basic-realm
-        path: %s
-`, htpasswdPath)
-	case "token":
-		authTemplate = fmt.Sprintf(`auth:
-    token:
-        realm: %s
-        service: "registry"
-        issuer: "auth-registry"
-        rootcertbundle: "fixtures/registry/cert.pem"
-`, tokenURL)
-	}
-
-	confPath := filepath.Join(tmp, "config.yaml")
-	config, err := os.Create(confPath)
-	if err != nil {
-		return nil, err
-	}
-	defer config.Close()
-
-	if _, err := fmt.Fprintf(config, template, tmp, privateRegistryURL, authTemplate); err != nil {
-		os.RemoveAll(tmp)
-		return nil, err
-	}
-
-	binary := v2binary
-	if schema1 {
-		binary = v2binarySchema1
-	}
-	cmd := exec.Command(binary, confPath)
-	if err := cmd.Start(); err != nil {
-		os.RemoveAll(tmp)
-		if os.IsNotExist(err) {
-			c.Skip(err.Error())
-		}
-		return nil, err
-	}
-	return &testRegistryV2{
-		cmd:      cmd,
-		dir:      tmp,
-		auth:     auth,
-		username: username,
-		password: password,
-		email:    email,
-	}, nil
-}
-
-func (t *testRegistryV2) Ping() error {
-	// We always ping through HTTP for our test registry.
-	resp, err := http.Get(fmt.Sprintf("http://%s/v2/", privateRegistryURL))
-	if err != nil {
-		return err
-	}
-	resp.Body.Close()
-
-	fail := resp.StatusCode != http.StatusOK
-	if t.auth != "" {
-		// unauthorized is a _good_ status when pinging v2/ and it needs auth
-		fail = fail && resp.StatusCode != http.StatusUnauthorized
-	}
-	if fail {
-		return fmt.Errorf("registry ping replied with an unexpected status code %d", resp.StatusCode)
-	}
-	return nil
-}
-
-func (t *testRegistryV2) Close() {
-	t.cmd.Process.Kill()
-	os.RemoveAll(t.dir)
-}
-
-func (t *testRegistryV2) getBlobFilename(blobDigest digest.Digest) string {
-	// Split the digest into its algorithm and hex components.
-	dgstAlg, dgstHex := blobDigest.Algorithm(), blobDigest.Hex()
-
-	// The path to the target blob data looks something like:
-	//   baseDir + "docker/registry/v2/blobs/sha256/a3/a3ed...46d4/data"
-	return fmt.Sprintf("%s/docker/registry/v2/blobs/%s/%s/%s/data", t.dir, dgstAlg, dgstHex[:2], dgstHex)
-}
-
-func (t *testRegistryV2) readBlobContents(c *check.C, blobDigest digest.Digest) []byte {
-	// Load the target manifest blob.
-	manifestBlob, err := ioutil.ReadFile(t.getBlobFilename(blobDigest))
-	if err != nil {
-		c.Fatalf("unable to read blob: %s", err)
-	}
-
-	return manifestBlob
-}
-
-func (t *testRegistryV2) writeBlobContents(c *check.C, blobDigest digest.Digest, data []byte) {
-	if err := ioutil.WriteFile(t.getBlobFilename(blobDigest), data, os.FileMode(0644)); err != nil {
-		c.Fatalf("unable to write malicious data blob: %s", err)
-	}
-}
-
-func (t *testRegistryV2) tempMoveBlobData(c *check.C, blobDigest digest.Digest) (undo func()) {
-	tempFile, err := ioutil.TempFile("", "registry-temp-blob-")
-	if err != nil {
-		c.Fatalf("unable to get temporary blob file: %s", err)
-	}
-	tempFile.Close()
-
-	blobFilename := t.getBlobFilename(blobDigest)
-
-	// Move the existing data file aside, so that we can replace it with a
-	// another blob of data.
-	if err := os.Rename(blobFilename, tempFile.Name()); err != nil {
-		os.Remove(tempFile.Name())
-		c.Fatalf("unable to move data blob: %s", err)
-	}
-
-	return func() {
-		os.Rename(tempFile.Name(), blobFilename)
-		os.Remove(tempFile.Name())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/registry_mock.go b/installer/vendor/github.com/docker/docker/integration-cli/registry_mock.go
deleted file mode 100644
index 300bf46425..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/registry_mock.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"regexp"
-	"strings"
-	"sync"
-
-	"github.com/go-check/check"
-)
-
-type handlerFunc func(w http.ResponseWriter, r *http.Request)
-
-type testRegistry struct {
-	server   *httptest.Server
-	hostport string
-	handlers map[string]handlerFunc
-	mu       sync.Mutex
-}
-
-func (tr *testRegistry) registerHandler(path string, h handlerFunc) {
-	tr.mu.Lock()
-	defer tr.mu.Unlock()
-	tr.handlers[path] = h
-}
-
-func newTestRegistry(c *check.C) (*testRegistry, error) {
-	testReg := &testRegistry{handlers: make(map[string]handlerFunc)}
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		url := r.URL.String()
-
-		var matched bool
-		var err error
-		for re, function := range testReg.handlers {
-			matched, err = regexp.MatchString(re, url)
-			if err != nil {
-				c.Fatal("Error with handler regexp")
-			}
-			if matched {
-				function(w, r)
-				break
-			}
-		}
-
-		if !matched {
-			c.Fatalf("Unable to match %s with regexp", url)
-		}
-	}))
-
-	testReg.server = ts
-	testReg.hostport = strings.Replace(ts.URL, "http://", "", 1)
-	return testReg, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/requirements.go b/installer/vendor/github.com/docker/docker/integration-cli/requirements.go
deleted file mode 100644
index abddb9fe4f..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/requirements.go
+++ /dev/null
@@ -1,243 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/go-check/check"
-)
-
-type testCondition func() bool
-
-type testRequirement struct {
-	Condition   testCondition
-	SkipMessage string
-}
-
-// List test requirements
-var (
-	DaemonIsWindows = testRequirement{
-		func() bool { return daemonPlatform == "windows" },
-		"Test requires a Windows daemon",
-	}
-	DaemonIsLinux = testRequirement{
-		func() bool { return daemonPlatform == "linux" },
-		"Test requires a Linux daemon",
-	}
-	ExperimentalDaemon = testRequirement{
-		func() bool { return experimentalDaemon },
-		"Test requires an experimental daemon",
-	}
-	NotExperimentalDaemon = testRequirement{
-		func() bool { return !experimentalDaemon },
-		"Test requires a non experimental daemon",
-	}
-	IsAmd64 = testRequirement{
-		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") == "amd64" },
-		"Test requires a daemon running on amd64",
-	}
-	NotArm = testRequirement{
-		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm" },
-		"Test requires a daemon not running on ARM",
-	}
-	NotArm64 = testRequirement{
-		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "arm64" },
-		"Test requires a daemon not running on arm64",
-	}
-	NotPpc64le = testRequirement{
-		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "ppc64le" },
-		"Test requires a daemon not running on ppc64le",
-	}
-	NotS390X = testRequirement{
-		func() bool { return os.Getenv("DOCKER_ENGINE_GOARCH") != "s390x" },
-		"Test requires a daemon not running on s390x",
-	}
-	SameHostDaemon = testRequirement{
-		func() bool { return isLocalDaemon },
-		"Test requires docker daemon to run on the same machine as CLI",
-	}
-	UnixCli = testRequirement{
-		func() bool { return isUnixCli },
-		"Test requires posix utilities or functionality to run.",
-	}
-	ExecSupport = testRequirement{
-		func() bool { return supportsExec },
-		"Test requires 'docker exec' capabilities on the tested daemon.",
-	}
-	Network = testRequirement{
-		func() bool {
-			// Set a timeout on the GET at 15s
-			var timeout = time.Duration(15 * time.Second)
-			var url = "https://hub.docker.com"
-
-			client := http.Client{
-				Timeout: timeout,
-			}
-
-			resp, err := client.Get(url)
-			if err != nil && strings.Contains(err.Error(), "use of closed network connection") {
-				panic(fmt.Sprintf("Timeout for GET request on %s", url))
-			}
-			if resp != nil {
-				resp.Body.Close()
-			}
-			return err == nil
-		},
-		"Test requires network availability, environment variable set to none to run in a non-network enabled mode.",
-	}
-	Apparmor = testRequirement{
-		func() bool {
-			buf, err := ioutil.ReadFile("/sys/module/apparmor/parameters/enabled")
-			return err == nil && len(buf) > 1 && buf[0] == 'Y'
-		},
-		"Test requires apparmor is enabled.",
-	}
-	RegistryHosting = testRequirement{
-		func() bool {
-			// for now registry binary is built only if we're running inside
-			// container through `make test`. Figure that out by testing if
-			// registry binary is in PATH.
-			_, err := exec.LookPath(v2binary)
-			return err == nil
-		},
-		fmt.Sprintf("Test requires an environment that can host %s in the same host", v2binary),
-	}
-	NotaryHosting = testRequirement{
-		func() bool {
-			// for now notary binary is built only if we're running inside
-			// container through `make test`. Figure that out by testing if
-			// notary-server binary is in PATH.
-			_, err := exec.LookPath(notaryServerBinary)
-			return err == nil
-		},
-		fmt.Sprintf("Test requires an environment that can host %s in the same host", notaryServerBinary),
-	}
-	NotaryServerHosting = testRequirement{
-		func() bool {
-			// for now notary-server binary is built only if we're running inside
-			// container through `make test`. Figure that out by testing if
-			// notary-server binary is in PATH.
-			_, err := exec.LookPath(notaryServerBinary)
-			return err == nil
-		},
-		fmt.Sprintf("Test requires an environment that can host %s in the same host", notaryServerBinary),
-	}
-	NotOverlay = testRequirement{
-		func() bool {
-			return !strings.HasPrefix(daemonStorageDriver, "overlay")
-		},
-		"Test requires underlying root filesystem not be backed by overlay.",
-	}
-
-	Devicemapper = testRequirement{
-		func() bool {
-			return strings.HasPrefix(daemonStorageDriver, "devicemapper")
-		},
-		"Test requires underlying root filesystem to be backed by devicemapper.",
-	}
-
-	IPv6 = testRequirement{
-		func() bool {
-			cmd := exec.Command("test", "-f", "/proc/net/if_inet6")
-
-			if err := cmd.Run(); err != nil {
-				return true
-			}
-			return false
-		},
-		"Test requires support for IPv6",
-	}
-	UserNamespaceROMount = testRequirement{
-		func() bool {
-			// quick case--userns not enabled in this test run
-			if os.Getenv("DOCKER_REMAP_ROOT") == "" {
-				return true
-			}
-			if _, _, err := dockerCmdWithError("run", "--rm", "--read-only", "busybox", "date"); err != nil {
-				return false
-			}
-			return true
-		},
-		"Test cannot be run if user namespaces enabled but readonly mounts fail on this kernel.",
-	}
-	UserNamespaceInKernel = testRequirement{
-		func() bool {
-			if _, err := os.Stat("/proc/self/uid_map"); os.IsNotExist(err) {
-				/*
-				 * This kernel-provided file only exists if user namespaces are
-				 * supported
-				 */
-				return false
-			}
-
-			// We need extra check on redhat based distributions
-			if f, err := os.Open("/sys/module/user_namespace/parameters/enable"); err == nil {
-				defer f.Close()
-				b := make([]byte, 1)
-				_, _ = f.Read(b)
-				if string(b) == "N" {
-					return false
-				}
-				return true
-			}
-
-			return true
-		},
-		"Kernel must have user namespaces configured and enabled.",
-	}
-	NotUserNamespace = testRequirement{
-		func() bool {
-			root := os.Getenv("DOCKER_REMAP_ROOT")
-			if root != "" {
-				return false
-			}
-			return true
-		},
-		"Test cannot be run when remapping root",
-	}
-	IsPausable = testRequirement{
-		func() bool {
-			if daemonPlatform == "windows" {
-				return isolation == "hyperv"
-			}
-			return true
-		},
-		"Test requires containers are pausable.",
-	}
-	NotPausable = testRequirement{
-		func() bool {
-			if daemonPlatform == "windows" {
-				return isolation == "process"
-			}
-			return false
-		},
-		"Test requires containers are not pausable.",
-	}
-	IsolationIsHyperv = testRequirement{
-		func() bool {
-			return daemonPlatform == "windows" && isolation == "hyperv"
-		},
-		"Test requires a Windows daemon running default isolation mode of hyperv.",
-	}
-	IsolationIsProcess = testRequirement{
-		func() bool {
-			return daemonPlatform == "windows" && isolation == "process"
-		},
-		"Test requires a Windows daemon running default isolation mode of process.",
-	}
-)
-
-// testRequires checks if the environment satisfies the requirements
-// for the test to run or skips the tests.
-func testRequires(c *check.C, requirements ...testRequirement) {
-	for _, r := range requirements {
-		if !r.Condition() {
-			c.Skip(r.SkipMessage)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/requirements_unix.go b/installer/vendor/github.com/docker/docker/integration-cli/requirements_unix.go
deleted file mode 100644
index ef017d8a76..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/requirements_unix.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// +build !windows
-
-package main
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/parsers/kernel"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-var (
-	// SysInfo stores information about which features a kernel supports.
-	SysInfo      *sysinfo.SysInfo
-	cpuCfsPeriod = testRequirement{
-		func() bool {
-			return SysInfo.CPUCfsPeriod
-		},
-		"Test requires an environment that supports cgroup cfs period.",
-	}
-	cpuCfsQuota = testRequirement{
-		func() bool {
-			return SysInfo.CPUCfsQuota
-		},
-		"Test requires an environment that supports cgroup cfs quota.",
-	}
-	cpuShare = testRequirement{
-		func() bool {
-			return SysInfo.CPUShares
-		},
-		"Test requires an environment that supports cgroup cpu shares.",
-	}
-	oomControl = testRequirement{
-		func() bool {
-			return SysInfo.OomKillDisable
-		},
-		"Test requires Oom control enabled.",
-	}
-	pidsLimit = testRequirement{
-		func() bool {
-			return SysInfo.PidsLimit
-		},
-		"Test requires pids limit enabled.",
-	}
-	kernelMemorySupport = testRequirement{
-		func() bool {
-			return SysInfo.KernelMemory
-		},
-		"Test requires an environment that supports cgroup kernel memory.",
-	}
-	memoryLimitSupport = testRequirement{
-		func() bool {
-			return SysInfo.MemoryLimit
-		},
-		"Test requires an environment that supports cgroup memory limit.",
-	}
-	memoryReservationSupport = testRequirement{
-		func() bool {
-			return SysInfo.MemoryReservation
-		},
-		"Test requires an environment that supports cgroup memory reservation.",
-	}
-	swapMemorySupport = testRequirement{
-		func() bool {
-			return SysInfo.SwapLimit
-		},
-		"Test requires an environment that supports cgroup swap memory limit.",
-	}
-	memorySwappinessSupport = testRequirement{
-		func() bool {
-			return SysInfo.MemorySwappiness
-		},
-		"Test requires an environment that supports cgroup memory swappiness.",
-	}
-	blkioWeight = testRequirement{
-		func() bool {
-			return SysInfo.BlkioWeight
-		},
-		"Test requires an environment that supports blkio weight.",
-	}
-	cgroupCpuset = testRequirement{
-		func() bool {
-			return SysInfo.Cpuset
-		},
-		"Test requires an environment that supports cgroup cpuset.",
-	}
-	seccompEnabled = testRequirement{
-		func() bool {
-			return supportsSeccomp && SysInfo.Seccomp
-		},
-		"Test requires that seccomp support be enabled in the daemon.",
-	}
-	bridgeNfIptables = testRequirement{
-		func() bool {
-			return !SysInfo.BridgeNFCallIPTablesDisabled
-		},
-		"Test requires that bridge-nf-call-iptables support be enabled in the daemon.",
-	}
-	bridgeNfIP6tables = testRequirement{
-		func() bool {
-			return !SysInfo.BridgeNFCallIP6TablesDisabled
-		},
-		"Test requires that bridge-nf-call-ip6tables support be enabled in the daemon.",
-	}
-	unprivilegedUsernsClone = testRequirement{
-		func() bool {
-			content, err := ioutil.ReadFile("/proc/sys/kernel/unprivileged_userns_clone")
-			if err == nil && strings.Contains(string(content), "0") {
-				return false
-			}
-			return true
-		},
-		"Test cannot be run with 'sysctl kernel.unprivileged_userns_clone' = 0",
-	}
-	ambientCapabilities = testRequirement{
-		func() bool {
-			content, err := ioutil.ReadFile("/proc/self/status")
-			if err == nil && strings.Contains(string(content), "CapAmb:") {
-				return true
-			}
-			return false
-		},
-		"Test cannot be run without a kernel (4.3+) supporting ambient capabilities",
-	}
-	overlayFSSupported = testRequirement{
-		func() bool {
-			cmd := exec.Command(dockerBinary, "run", "--rm", "busybox", "/bin/sh", "-c", "cat /proc/filesystems")
-			out, err := cmd.CombinedOutput()
-			if err != nil {
-				return false
-			}
-			return bytes.Contains(out, []byte("overlay\n"))
-		},
-		"Test cannot be run without suppport for overlayfs",
-	}
-	overlay2Supported = testRequirement{
-		func() bool {
-			if !overlayFSSupported.Condition() {
-				return false
-			}
-
-			daemonV, err := kernel.ParseRelease(daemonKernelVersion)
-			if err != nil {
-				return false
-			}
-			requiredV := kernel.VersionInfo{Kernel: 4}
-			return kernel.CompareKernelVersion(*daemonV, requiredV) > -1
-
-		},
-		"Test cannot be run without overlay2 support (kernel 4.0+)",
-	}
-)
-
-func init() {
-	SysInfo = sysinfo.New(true)
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars.go
deleted file mode 100644
index 97bcddd5f4..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main
-
-// sleepCommandForDaemonPlatform is a helper function that determines what
-// the command is for a sleeping container based on the daemon platform.
-// The Windows busybox image does not have a `top` command.
-func sleepCommandForDaemonPlatform() []string {
-	if daemonPlatform == "windows" {
-		return []string{"sleep", "240"}
-	}
-	return []string{"top"}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_exec.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_exec.go
deleted file mode 100644
index 7633b346ba..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_exec.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !test_no_exec
-
-package main
-
-const (
-	// indicates docker daemon tested supports 'docker exec'
-	supportsExec = true
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noexec.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noexec.go
deleted file mode 100644
index 0845090524..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noexec.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build test_no_exec
-
-package main
-
-const (
-	// indicates docker daemon tested supports 'docker exec'
-	supportsExec = false
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noseccomp.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noseccomp.go
deleted file mode 100644
index 2f47ab07a0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_noseccomp.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !seccomp
-
-package main
-
-const (
-	// indicates docker daemon built with seccomp support
-	supportsSeccomp = false
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_seccomp.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_seccomp.go
deleted file mode 100644
index 00cf697209..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_seccomp.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build seccomp
-
-package main
-
-const (
-	// indicates docker daemon built with seccomp support
-	supportsSeccomp = true
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_unix.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_unix.go
deleted file mode 100644
index f9ecc01123..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package main
-
-const (
-	// identifies if test suite is running on a unix platform
-	isUnixCli = true
-
-	expectedFileChmod = "-rw-r--r--"
-
-	// On Unix variants, the busybox image comes with the `top` command which
-	// runs indefinitely while still being interruptible by a signal.
-	defaultSleepImage = "busybox"
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_windows.go b/installer/vendor/github.com/docker/docker/integration-cli/test_vars_windows.go
deleted file mode 100644
index bfc9a5a915..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/test_vars_windows.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build windows
-
-package main
-
-const (
-	// identifies if test suite is running on a unix platform
-	isUnixCli = false
-
-	// this is the expected file permission set on windows: gh#11395
-	expectedFileChmod = "-rwxr-xr-x"
-
-	// On Windows, the busybox image doesn't have the `top` command, so we rely
-	// on `sleep` with a high duration.
-	defaultSleepImage = "busybox"
-)
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/trust_server.go b/installer/vendor/github.com/docker/docker/integration-cli/trust_server.go
deleted file mode 100644
index 18876311a1..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/trust_server.go
+++ /dev/null
@@ -1,344 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/cliconfig"
-	"github.com/docker/docker/pkg/integration/checker"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/go-check/check"
-)
-
-var notaryBinary = "notary"
-var notaryServerBinary = "notary-server"
-
-type keyPair struct {
-	Public  string
-	Private string
-}
-
-type testNotary struct {
-	cmd  *exec.Cmd
-	dir  string
-	keys []keyPair
-}
-
-const notaryHost = "localhost:4443"
-const notaryURL = "https://" + notaryHost
-
-func newTestNotary(c *check.C) (*testNotary, error) {
-	// generate server config
-	template := `{
-	"server": {
-		"http_addr": "%s",
-		"tls_key_file": "%s",
-		"tls_cert_file": "%s"
-	},
-	"trust_service": {
-		"type": "local",
-		"hostname": "",
-		"port": "",
-		"key_algorithm": "ed25519"
-	},
-	"logging": {
-		"level": "debug"
-	},
-	"storage": {
-        "backend": "memory"
-    }
-}`
-	tmp, err := ioutil.TempDir("", "notary-test-")
-	if err != nil {
-		return nil, err
-	}
-	confPath := filepath.Join(tmp, "config.json")
-	config, err := os.Create(confPath)
-	if err != nil {
-		return nil, err
-	}
-	defer config.Close()
-
-	workingDir, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-	if _, err := fmt.Fprintf(config, template, notaryHost, filepath.Join(workingDir, "fixtures/notary/localhost.key"), filepath.Join(workingDir, "fixtures/notary/localhost.cert")); err != nil {
-		os.RemoveAll(tmp)
-		return nil, err
-	}
-
-	// generate client config
-	clientConfPath := filepath.Join(tmp, "client-config.json")
-	clientConfig, err := os.Create(clientConfPath)
-	if err != nil {
-		return nil, err
-	}
-	defer clientConfig.Close()
-
-	template = `{
-	"trust_dir" : "%s",
-	"remote_server": {
-		"url": "%s",
-		"skipTLSVerify": true
-	}
-}`
-	if _, err = fmt.Fprintf(clientConfig, template, filepath.Join(cliconfig.ConfigDir(), "trust"), notaryURL); err != nil {
-		os.RemoveAll(tmp)
-		return nil, err
-	}
-
-	// load key fixture filenames
-	var keys []keyPair
-	for i := 1; i < 5; i++ {
-		keys = append(keys, keyPair{
-			Public:  filepath.Join(workingDir, fmt.Sprintf("fixtures/notary/delgkey%v.crt", i)),
-			Private: filepath.Join(workingDir, fmt.Sprintf("fixtures/notary/delgkey%v.key", i)),
-		})
-	}
-
-	// run notary-server
-	cmd := exec.Command(notaryServerBinary, "-config", confPath)
-	if err := cmd.Start(); err != nil {
-		os.RemoveAll(tmp)
-		if os.IsNotExist(err) {
-			c.Skip(err.Error())
-		}
-		return nil, err
-	}
-
-	testNotary := &testNotary{
-		cmd:  cmd,
-		dir:  tmp,
-		keys: keys,
-	}
-
-	// Wait for notary to be ready to serve requests.
-	for i := 1; i <= 20; i++ {
-		if err = testNotary.Ping(); err == nil {
-			break
-		}
-		time.Sleep(10 * time.Millisecond * time.Duration(i*i))
-	}
-
-	if err != nil {
-		c.Fatalf("Timeout waiting for test notary to become available: %s", err)
-	}
-
-	return testNotary, nil
-}
-
-func (t *testNotary) Ping() error {
-	tlsConfig := tlsconfig.ClientDefault()
-	tlsConfig.InsecureSkipVerify = true
-	client := http.Client{
-		Transport: &http.Transport{
-			Proxy: http.ProxyFromEnvironment,
-			Dial: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-			}).Dial,
-			TLSHandshakeTimeout: 10 * time.Second,
-			TLSClientConfig:     tlsConfig,
-		},
-	}
-	resp, err := client.Get(fmt.Sprintf("%s/v2/", notaryURL))
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("notary ping replied with an unexpected status code %d", resp.StatusCode)
-	}
-	return nil
-}
-
-func (t *testNotary) Close() {
-	t.cmd.Process.Kill()
-	os.RemoveAll(t.dir)
-}
-
-func (s *DockerTrustSuite) trustedCmd(cmd *exec.Cmd) {
-	pwd := "12345678"
-	trustCmdEnv(cmd, notaryURL, pwd, pwd)
-}
-
-func (s *DockerTrustSuite) trustedCmdWithServer(cmd *exec.Cmd, server string) {
-	pwd := "12345678"
-	trustCmdEnv(cmd, server, pwd, pwd)
-}
-
-func (s *DockerTrustSuite) trustedCmdWithPassphrases(cmd *exec.Cmd, rootPwd, repositoryPwd string) {
-	trustCmdEnv(cmd, notaryURL, rootPwd, repositoryPwd)
-}
-
-func trustCmdEnv(cmd *exec.Cmd, server, rootPwd, repositoryPwd string) {
-	env := []string{
-		"DOCKER_CONTENT_TRUST=1",
-		fmt.Sprintf("DOCKER_CONTENT_TRUST_SERVER=%s", server),
-		fmt.Sprintf("DOCKER_CONTENT_TRUST_ROOT_PASSPHRASE=%s", rootPwd),
-		fmt.Sprintf("DOCKER_CONTENT_TRUST_REPOSITORY_PASSPHRASE=%s", repositoryPwd),
-	}
-	cmd.Env = append(os.Environ(), env...)
-}
-
-func (s *DockerTrustSuite) setupTrustedImage(c *check.C, name string) string {
-	repoName := fmt.Sprintf("%v/dockercli/%s:latest", privateRegistryURL, name)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "tag", "busybox", repoName)
-
-	pushCmd := exec.Command(dockerBinary, "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-
-	if err != nil {
-		c.Fatalf("Error running trusted push: %s\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "Signing and pushing trust metadata") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	if out, status := dockerCmd(c, "rmi", repoName); status != 0 {
-		c.Fatalf("Error removing image %q\n%s", repoName, out)
-	}
-
-	return repoName
-}
-
-func (s *DockerTrustSuite) setupTrustedplugin(c *check.C, source, name string) string {
-	repoName := fmt.Sprintf("%v/dockercli/%s:latest", privateRegistryURL, name)
-	// tag the image and upload it to the private registry
-	dockerCmd(c, "plugin", "install", "--grant-all-permissions", "--alias", repoName, source)
-
-	pushCmd := exec.Command(dockerBinary, "plugin", "push", repoName)
-	s.trustedCmd(pushCmd)
-	out, _, err := runCommandWithOutput(pushCmd)
-
-	if err != nil {
-		c.Fatalf("Error running trusted plugin push: %s\n%s", err, out)
-	}
-	if !strings.Contains(string(out), "Signing and pushing trust metadata") {
-		c.Fatalf("Missing expected output on trusted push:\n%s", out)
-	}
-
-	if out, status := dockerCmd(c, "plugin", "rm", "-f", repoName); status != 0 {
-		c.Fatalf("Error removing plugin %q\n%s", repoName, out)
-	}
-
-	return repoName
-}
-
-func notaryClientEnv(cmd *exec.Cmd) {
-	pwd := "12345678"
-	env := []string{
-		fmt.Sprintf("NOTARY_ROOT_PASSPHRASE=%s", pwd),
-		fmt.Sprintf("NOTARY_TARGETS_PASSPHRASE=%s", pwd),
-		fmt.Sprintf("NOTARY_SNAPSHOT_PASSPHRASE=%s", pwd),
-		fmt.Sprintf("NOTARY_DELEGATION_PASSPHRASE=%s", pwd),
-	}
-	cmd.Env = append(os.Environ(), env...)
-}
-
-func (s *DockerTrustSuite) notaryInitRepo(c *check.C, repoName string) {
-	initCmd := exec.Command(notaryBinary, "-c", filepath.Join(s.not.dir, "client-config.json"), "init", repoName)
-	notaryClientEnv(initCmd)
-	out, _, err := runCommandWithOutput(initCmd)
-	if err != nil {
-		c.Fatalf("Error initializing notary repository: %s\n", out)
-	}
-}
-
-func (s *DockerTrustSuite) notaryCreateDelegation(c *check.C, repoName, role string, pubKey string, paths ...string) {
-	pathsArg := "--all-paths"
-	if len(paths) > 0 {
-		pathsArg = "--paths=" + strings.Join(paths, ",")
-	}
-
-	delgCmd := exec.Command(notaryBinary, "-c", filepath.Join(s.not.dir, "client-config.json"),
-		"delegation", "add", repoName, role, pubKey, pathsArg)
-	notaryClientEnv(delgCmd)
-	out, _, err := runCommandWithOutput(delgCmd)
-	if err != nil {
-		c.Fatalf("Error adding %s role to notary repository: %s\n", role, out)
-	}
-}
-
-func (s *DockerTrustSuite) notaryPublish(c *check.C, repoName string) {
-	pubCmd := exec.Command(notaryBinary, "-c", filepath.Join(s.not.dir, "client-config.json"), "publish", repoName)
-	notaryClientEnv(pubCmd)
-	out, _, err := runCommandWithOutput(pubCmd)
-	if err != nil {
-		c.Fatalf("Error publishing notary repository: %s\n", out)
-	}
-}
-
-func (s *DockerTrustSuite) notaryImportKey(c *check.C, repoName, role string, privKey string) {
-	impCmd := exec.Command(notaryBinary, "-c", filepath.Join(s.not.dir, "client-config.json"), "key",
-		"import", privKey, "-g", repoName, "-r", role)
-	notaryClientEnv(impCmd)
-	out, _, err := runCommandWithOutput(impCmd)
-	if err != nil {
-		c.Fatalf("Error importing key to notary repository: %s\n", out)
-	}
-}
-
-func (s *DockerTrustSuite) notaryListTargetsInRole(c *check.C, repoName, role string) map[string]string {
-	listCmd := exec.Command(notaryBinary, "-c", filepath.Join(s.not.dir, "client-config.json"), "list",
-		repoName, "-r", role)
-	notaryClientEnv(listCmd)
-	out, _, err := runCommandWithOutput(listCmd)
-	if err != nil {
-		c.Fatalf("Error listing targets in notary repository: %s\n", out)
-	}
-
-	// should look something like:
-	//    NAME                                 DIGEST                                SIZE (BYTES)    ROLE
-	// ------------------------------------------------------------------------------------------------------
-	//   latest   24a36bbc059b1345b7e8be0df20f1b23caa3602e85d42fff7ecd9d0bd255de56   1377           targets
-
-	targets := make(map[string]string)
-
-	// no target
-	lines := strings.Split(strings.TrimSpace(out), "\n")
-	if len(lines) == 1 && strings.Contains(out, "No targets present in this repository.") {
-		return targets
-	}
-
-	// otherwise, there is at least one target
-	c.Assert(len(lines), checker.GreaterOrEqualThan, 3)
-
-	for _, line := range lines[2:] {
-		tokens := strings.Fields(line)
-		c.Assert(tokens, checker.HasLen, 4)
-		targets[tokens[0]] = tokens[3]
-	}
-
-	return targets
-}
-
-func (s *DockerTrustSuite) assertTargetInRoles(c *check.C, repoName, target string, roles ...string) {
-	// check all the roles
-	for _, role := range roles {
-		targets := s.notaryListTargetsInRole(c, repoName, role)
-		roleName, ok := targets[target]
-		c.Assert(ok, checker.True)
-		c.Assert(roleName, checker.Equals, role)
-	}
-}
-
-func (s *DockerTrustSuite) assertTargetNotInRoles(c *check.C, repoName, target string, roles ...string) {
-	targets := s.notaryListTargetsInRole(c, repoName, "targets")
-
-	roleName, ok := targets[target]
-	if ok {
-		for _, role := range roles {
-			c.Assert(roleName, checker.Not(checker.Equals), role)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/integration-cli/utils.go b/installer/vendor/github.com/docker/docker/integration-cli/utils.go
deleted file mode 100644
index 87d48e41b0..0000000000
--- a/installer/vendor/github.com/docker/docker/integration-cli/utils.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package main
-
-import (
-	"io"
-	"os"
-	"os/exec"
-	"time"
-
-	"github.com/docker/docker/pkg/integration"
-	"github.com/docker/docker/pkg/integration/cmd"
-)
-
-func getPrefixAndSlashFromDaemonPlatform() (prefix, slash string) {
-	if daemonPlatform == "windows" {
-		return "c:", `\`
-	}
-	return "", "/"
-}
-
-// TODO: update code to call cmd.RunCmd directly, and remove this function
-func runCommandWithOutput(execCmd *exec.Cmd) (string, int, error) {
-	result := cmd.RunCmd(transformCmd(execCmd))
-	return result.Combined(), result.ExitCode, result.Error
-}
-
-// TODO: update code to call cmd.RunCmd directly, and remove this function
-func runCommandWithStdoutStderr(execCmd *exec.Cmd) (string, string, int, error) {
-	result := cmd.RunCmd(transformCmd(execCmd))
-	return result.Stdout(), result.Stderr(), result.ExitCode, result.Error
-}
-
-// TODO: update code to call cmd.RunCmd directly, and remove this function
-func runCommand(execCmd *exec.Cmd) (exitCode int, err error) {
-	result := cmd.RunCmd(transformCmd(execCmd))
-	return result.ExitCode, result.Error
-}
-
-// Temporary shim for migrating commands to the new function
-func transformCmd(execCmd *exec.Cmd) cmd.Cmd {
-	return cmd.Cmd{
-		Command: execCmd.Args,
-		Env:     execCmd.Env,
-		Dir:     execCmd.Dir,
-		Stdin:   execCmd.Stdin,
-		Stdout:  execCmd.Stdout,
-	}
-}
-
-func runCommandPipelineWithOutput(cmds ...*exec.Cmd) (output string, exitCode int, err error) {
-	return integration.RunCommandPipelineWithOutput(cmds...)
-}
-
-func convertSliceOfStringsToMap(input []string) map[string]struct{} {
-	return integration.ConvertSliceOfStringsToMap(input)
-}
-
-func compareDirectoryEntries(e1 []os.FileInfo, e2 []os.FileInfo) error {
-	return integration.CompareDirectoryEntries(e1, e2)
-}
-
-func listTar(f io.Reader) ([]string, error) {
-	return integration.ListTar(f)
-}
-
-func randomTmpDirPath(s string, platform string) string {
-	return integration.RandomTmpDirPath(s, platform)
-}
-
-func consumeWithSpeed(reader io.Reader, chunkSize int, interval time.Duration, stop chan bool) (n int, err error) {
-	return integration.ConsumeWithSpeed(reader, chunkSize, interval, stop)
-}
-
-func parseCgroupPaths(procCgroupData string) map[string]string {
-	return integration.ParseCgroupPaths(procCgroupData)
-}
-
-func runAtDifferentDate(date time.Time, block func()) {
-	integration.RunAtDifferentDate(date, block)
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/empty.go b/installer/vendor/github.com/docker/docker/layer/empty.go
deleted file mode 100644
index 3b6ffc82f7..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/empty.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package layer
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-)
-
-// DigestSHA256EmptyTar is the canonical sha256 digest of empty tar file -
-// (1024 NULL bytes)
-const DigestSHA256EmptyTar = DiffID("sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef")
-
-type emptyLayer struct{}
-
-// EmptyLayer is a layer that corresponds to empty tar.
-var EmptyLayer = &emptyLayer{}
-
-func (el *emptyLayer) TarStream() (io.ReadCloser, error) {
-	buf := new(bytes.Buffer)
-	tarWriter := tar.NewWriter(buf)
-	tarWriter.Close()
-	return ioutil.NopCloser(buf), nil
-}
-
-func (el *emptyLayer) TarStreamFrom(p ChainID) (io.ReadCloser, error) {
-	if p == "" {
-		return el.TarStream()
-	}
-	return nil, fmt.Errorf("can't get parent tar stream of an empty layer")
-}
-
-func (el *emptyLayer) ChainID() ChainID {
-	return ChainID(DigestSHA256EmptyTar)
-}
-
-func (el *emptyLayer) DiffID() DiffID {
-	return DigestSHA256EmptyTar
-}
-
-func (el *emptyLayer) Parent() Layer {
-	return nil
-}
-
-func (el *emptyLayer) Size() (size int64, err error) {
-	return 0, nil
-}
-
-func (el *emptyLayer) DiffSize() (size int64, err error) {
-	return 0, nil
-}
-
-func (el *emptyLayer) Metadata() (map[string]string, error) {
-	return make(map[string]string), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/empty_test.go b/installer/vendor/github.com/docker/docker/layer/empty_test.go
deleted file mode 100644
index c22da7665d..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/empty_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package layer
-
-import (
-	"io"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-)
-
-func TestEmptyLayer(t *testing.T) {
-	if EmptyLayer.ChainID() != ChainID(DigestSHA256EmptyTar) {
-		t.Fatal("wrong ID for empty layer")
-	}
-
-	if EmptyLayer.DiffID() != DigestSHA256EmptyTar {
-		t.Fatal("wrong DiffID for empty layer")
-	}
-
-	if EmptyLayer.Parent() != nil {
-		t.Fatal("expected no parent for empty layer")
-	}
-
-	if size, err := EmptyLayer.Size(); err != nil || size != 0 {
-		t.Fatal("expected zero size for empty layer")
-	}
-
-	if diffSize, err := EmptyLayer.DiffSize(); err != nil || diffSize != 0 {
-		t.Fatal("expected zero diffsize for empty layer")
-	}
-
-	tarStream, err := EmptyLayer.TarStream()
-	if err != nil {
-		t.Fatalf("error streaming tar for empty layer: %v", err)
-	}
-
-	digester := digest.Canonical.New()
-	_, err = io.Copy(digester.Hash(), tarStream)
-
-	if err != nil {
-		t.Fatalf("error hashing empty tar layer: %v", err)
-	}
-
-	if digester.Digest() != digest.Digest(DigestSHA256EmptyTar) {
-		t.Fatal("empty layer tar stream hashes to wrong value")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/filestore.go b/installer/vendor/github.com/docker/docker/layer/filestore.go
deleted file mode 100644
index 42b45556e3..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/filestore.go
+++ /dev/null
@@ -1,354 +0,0 @@
-package layer
-
-import (
-	"compress/gzip"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-var (
-	stringIDRegexp      = regexp.MustCompile(`^[a-f0-9]{64}(-init)?$`)
-	supportedAlgorithms = []digest.Algorithm{
-		digest.SHA256,
-		// digest.SHA384, // Currently not used
-		// digest.SHA512, // Currently not used
-	}
-)
-
-type fileMetadataStore struct {
-	root string
-}
-
-type fileMetadataTransaction struct {
-	store *fileMetadataStore
-	ws    *ioutils.AtomicWriteSet
-}
-
-// NewFSMetadataStore returns an instance of a metadata store
-// which is backed by files on disk using the provided root
-// as the root of metadata files.
-func NewFSMetadataStore(root string) (MetadataStore, error) {
-	if err := os.MkdirAll(root, 0700); err != nil {
-		return nil, err
-	}
-	return &fileMetadataStore{
-		root: root,
-	}, nil
-}
-
-func (fms *fileMetadataStore) getLayerDirectory(layer ChainID) string {
-	dgst := digest.Digest(layer)
-	return filepath.Join(fms.root, string(dgst.Algorithm()), dgst.Hex())
-}
-
-func (fms *fileMetadataStore) getLayerFilename(layer ChainID, filename string) string {
-	return filepath.Join(fms.getLayerDirectory(layer), filename)
-}
-
-func (fms *fileMetadataStore) getMountDirectory(mount string) string {
-	return filepath.Join(fms.root, "mounts", mount)
-}
-
-func (fms *fileMetadataStore) getMountFilename(mount, filename string) string {
-	return filepath.Join(fms.getMountDirectory(mount), filename)
-}
-
-func (fms *fileMetadataStore) StartTransaction() (MetadataTransaction, error) {
-	tmpDir := filepath.Join(fms.root, "tmp")
-	if err := os.MkdirAll(tmpDir, 0755); err != nil {
-		return nil, err
-	}
-	ws, err := ioutils.NewAtomicWriteSet(tmpDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return &fileMetadataTransaction{
-		store: fms,
-		ws:    ws,
-	}, nil
-}
-
-func (fm *fileMetadataTransaction) SetSize(size int64) error {
-	content := fmt.Sprintf("%d", size)
-	return fm.ws.WriteFile("size", []byte(content), 0644)
-}
-
-func (fm *fileMetadataTransaction) SetParent(parent ChainID) error {
-	return fm.ws.WriteFile("parent", []byte(digest.Digest(parent).String()), 0644)
-}
-
-func (fm *fileMetadataTransaction) SetDiffID(diff DiffID) error {
-	return fm.ws.WriteFile("diff", []byte(digest.Digest(diff).String()), 0644)
-}
-
-func (fm *fileMetadataTransaction) SetCacheID(cacheID string) error {
-	return fm.ws.WriteFile("cache-id", []byte(cacheID), 0644)
-}
-
-func (fm *fileMetadataTransaction) SetDescriptor(ref distribution.Descriptor) error {
-	jsonRef, err := json.Marshal(ref)
-	if err != nil {
-		return err
-	}
-	return fm.ws.WriteFile("descriptor.json", jsonRef, 0644)
-}
-
-func (fm *fileMetadataTransaction) TarSplitWriter(compressInput bool) (io.WriteCloser, error) {
-	f, err := fm.ws.FileWriter("tar-split.json.gz", os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return nil, err
-	}
-	var wc io.WriteCloser
-	if compressInput {
-		wc = gzip.NewWriter(f)
-	} else {
-		wc = f
-	}
-
-	return ioutils.NewWriteCloserWrapper(wc, func() error {
-		wc.Close()
-		return f.Close()
-	}), nil
-}
-
-func (fm *fileMetadataTransaction) Commit(layer ChainID) error {
-	finalDir := fm.store.getLayerDirectory(layer)
-	if err := os.MkdirAll(filepath.Dir(finalDir), 0755); err != nil {
-		return err
-	}
-
-	return fm.ws.Commit(finalDir)
-}
-
-func (fm *fileMetadataTransaction) Cancel() error {
-	return fm.ws.Cancel()
-}
-
-func (fm *fileMetadataTransaction) String() string {
-	return fm.ws.String()
-}
-
-func (fms *fileMetadataStore) GetSize(layer ChainID) (int64, error) {
-	content, err := ioutil.ReadFile(fms.getLayerFilename(layer, "size"))
-	if err != nil {
-		return 0, err
-	}
-
-	size, err := strconv.ParseInt(string(content), 10, 64)
-	if err != nil {
-		return 0, err
-	}
-
-	return size, nil
-}
-
-func (fms *fileMetadataStore) GetParent(layer ChainID) (ChainID, error) {
-	content, err := ioutil.ReadFile(fms.getLayerFilename(layer, "parent"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-		return "", err
-	}
-
-	dgst, err := digest.ParseDigest(strings.TrimSpace(string(content)))
-	if err != nil {
-		return "", err
-	}
-
-	return ChainID(dgst), nil
-}
-
-func (fms *fileMetadataStore) GetDiffID(layer ChainID) (DiffID, error) {
-	content, err := ioutil.ReadFile(fms.getLayerFilename(layer, "diff"))
-	if err != nil {
-		return "", err
-	}
-
-	dgst, err := digest.ParseDigest(strings.TrimSpace(string(content)))
-	if err != nil {
-		return "", err
-	}
-
-	return DiffID(dgst), nil
-}
-
-func (fms *fileMetadataStore) GetCacheID(layer ChainID) (string, error) {
-	contentBytes, err := ioutil.ReadFile(fms.getLayerFilename(layer, "cache-id"))
-	if err != nil {
-		return "", err
-	}
-	content := strings.TrimSpace(string(contentBytes))
-
-	if !stringIDRegexp.MatchString(content) {
-		return "", errors.New("invalid cache id value")
-	}
-
-	return content, nil
-}
-
-func (fms *fileMetadataStore) GetDescriptor(layer ChainID) (distribution.Descriptor, error) {
-	content, err := ioutil.ReadFile(fms.getLayerFilename(layer, "descriptor.json"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			// only return empty descriptor to represent what is stored
-			return distribution.Descriptor{}, nil
-		}
-		return distribution.Descriptor{}, err
-	}
-
-	var ref distribution.Descriptor
-	err = json.Unmarshal(content, &ref)
-	if err != nil {
-		return distribution.Descriptor{}, err
-	}
-	return ref, err
-}
-
-func (fms *fileMetadataStore) TarSplitReader(layer ChainID) (io.ReadCloser, error) {
-	fz, err := os.Open(fms.getLayerFilename(layer, "tar-split.json.gz"))
-	if err != nil {
-		return nil, err
-	}
-	f, err := gzip.NewReader(fz)
-	if err != nil {
-		return nil, err
-	}
-
-	return ioutils.NewReadCloserWrapper(f, func() error {
-		f.Close()
-		return fz.Close()
-	}), nil
-}
-
-func (fms *fileMetadataStore) SetMountID(mount string, mountID string) error {
-	if err := os.MkdirAll(fms.getMountDirectory(mount), 0755); err != nil {
-		return err
-	}
-	return ioutil.WriteFile(fms.getMountFilename(mount, "mount-id"), []byte(mountID), 0644)
-}
-
-func (fms *fileMetadataStore) SetInitID(mount string, init string) error {
-	if err := os.MkdirAll(fms.getMountDirectory(mount), 0755); err != nil {
-		return err
-	}
-	return ioutil.WriteFile(fms.getMountFilename(mount, "init-id"), []byte(init), 0644)
-}
-
-func (fms *fileMetadataStore) SetMountParent(mount string, parent ChainID) error {
-	if err := os.MkdirAll(fms.getMountDirectory(mount), 0755); err != nil {
-		return err
-	}
-	return ioutil.WriteFile(fms.getMountFilename(mount, "parent"), []byte(digest.Digest(parent).String()), 0644)
-}
-
-func (fms *fileMetadataStore) GetMountID(mount string) (string, error) {
-	contentBytes, err := ioutil.ReadFile(fms.getMountFilename(mount, "mount-id"))
-	if err != nil {
-		return "", err
-	}
-	content := strings.TrimSpace(string(contentBytes))
-
-	if !stringIDRegexp.MatchString(content) {
-		return "", errors.New("invalid mount id value")
-	}
-
-	return content, nil
-}
-
-func (fms *fileMetadataStore) GetInitID(mount string) (string, error) {
-	contentBytes, err := ioutil.ReadFile(fms.getMountFilename(mount, "init-id"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-		return "", err
-	}
-	content := strings.TrimSpace(string(contentBytes))
-
-	if !stringIDRegexp.MatchString(content) {
-		return "", errors.New("invalid init id value")
-	}
-
-	return content, nil
-}
-
-func (fms *fileMetadataStore) GetMountParent(mount string) (ChainID, error) {
-	content, err := ioutil.ReadFile(fms.getMountFilename(mount, "parent"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return "", nil
-		}
-		return "", err
-	}
-
-	dgst, err := digest.ParseDigest(strings.TrimSpace(string(content)))
-	if err != nil {
-		return "", err
-	}
-
-	return ChainID(dgst), nil
-}
-
-func (fms *fileMetadataStore) List() ([]ChainID, []string, error) {
-	var ids []ChainID
-	for _, algorithm := range supportedAlgorithms {
-		fileInfos, err := ioutil.ReadDir(filepath.Join(fms.root, string(algorithm)))
-		if err != nil {
-			if os.IsNotExist(err) {
-				continue
-			}
-			return nil, nil, err
-		}
-
-		for _, fi := range fileInfos {
-			if fi.IsDir() && fi.Name() != "mounts" {
-				dgst := digest.NewDigestFromHex(string(algorithm), fi.Name())
-				if err := dgst.Validate(); err != nil {
-					logrus.Debugf("Ignoring invalid digest %s:%s", algorithm, fi.Name())
-				} else {
-					ids = append(ids, ChainID(dgst))
-				}
-			}
-		}
-	}
-
-	fileInfos, err := ioutil.ReadDir(filepath.Join(fms.root, "mounts"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return ids, []string{}, nil
-		}
-		return nil, nil, err
-	}
-
-	var mounts []string
-	for _, fi := range fileInfos {
-		if fi.IsDir() {
-			mounts = append(mounts, fi.Name())
-		}
-	}
-
-	return ids, mounts, nil
-}
-
-func (fms *fileMetadataStore) Remove(layer ChainID) error {
-	return os.RemoveAll(fms.getLayerDirectory(layer))
-}
-
-func (fms *fileMetadataStore) RemoveMount(mount string) error {
-	return os.RemoveAll(fms.getMountDirectory(mount))
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/filestore_test.go b/installer/vendor/github.com/docker/docker/layer/filestore_test.go
deleted file mode 100644
index 55e3b28530..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/filestore_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package layer
-
-import (
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-)
-
-func randomLayerID(seed int64) ChainID {
-	r := rand.New(rand.NewSource(seed))
-
-	return ChainID(digest.FromBytes([]byte(fmt.Sprintf("%d", r.Int63()))))
-}
-
-func newFileMetadataStore(t *testing.T) (*fileMetadataStore, string, func()) {
-	td, err := ioutil.TempDir("", "layers-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	fms, err := NewFSMetadataStore(td)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return fms.(*fileMetadataStore), td, func() {
-		if err := os.RemoveAll(td); err != nil {
-			t.Logf("Failed to cleanup %q: %s", td, err)
-		}
-	}
-}
-
-func assertNotDirectoryError(t *testing.T, err error) {
-	perr, ok := err.(*os.PathError)
-	if !ok {
-		t.Fatalf("Unexpected error %#v, expected path error", err)
-	}
-
-	if perr.Err != syscall.ENOTDIR {
-		t.Fatalf("Unexpected error %s, expected %s", perr.Err, syscall.ENOTDIR)
-	}
-}
-
-func TestCommitFailure(t *testing.T) {
-	fms, td, cleanup := newFileMetadataStore(t)
-	defer cleanup()
-
-	if err := ioutil.WriteFile(filepath.Join(td, "sha256"), []byte("was here first!"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	tx, err := fms.StartTransaction()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := tx.SetSize(0); err != nil {
-		t.Fatal(err)
-	}
-
-	err = tx.Commit(randomLayerID(5))
-	if err == nil {
-		t.Fatalf("Expected error committing with invalid layer parent directory")
-	}
-	assertNotDirectoryError(t, err)
-}
-
-func TestStartTransactionFailure(t *testing.T) {
-	fms, td, cleanup := newFileMetadataStore(t)
-	defer cleanup()
-
-	if err := ioutil.WriteFile(filepath.Join(td, "tmp"), []byte("was here first!"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err := fms.StartTransaction()
-	if err == nil {
-		t.Fatalf("Expected error starting transaction with invalid layer parent directory")
-	}
-	assertNotDirectoryError(t, err)
-
-	if err := os.Remove(filepath.Join(td, "tmp")); err != nil {
-		t.Fatal(err)
-	}
-
-	tx, err := fms.StartTransaction()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := filepath.Join(td, "tmp"); strings.HasPrefix(expected, tx.String()) {
-		t.Fatalf("Unexpected transaction string %q, expected prefix %q", tx.String(), expected)
-	}
-
-	if err := tx.Cancel(); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer.go b/installer/vendor/github.com/docker/docker/layer/layer.go
deleted file mode 100644
index ec1d4346d7..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer.go
+++ /dev/null
@@ -1,275 +0,0 @@
-// Package layer is package for managing read-only
-// and read-write mounts on the union file system
-// driver. Read-only mounts are referenced using a
-// content hash and are protected from mutation in
-// the exposed interface. The tar format is used
-// to create read-only layers and export both
-// read-only and writable layers. The exported
-// tar data for a read-only layer should match
-// the tar used to create the layer.
-package layer
-
-import (
-	"errors"
-	"io"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/archive"
-)
-
-var (
-	// ErrLayerDoesNotExist is used when an operation is
-	// attempted on a layer which does not exist.
-	ErrLayerDoesNotExist = errors.New("layer does not exist")
-
-	// ErrLayerNotRetained is used when a release is
-	// attempted on a layer which is not retained.
-	ErrLayerNotRetained = errors.New("layer not retained")
-
-	// ErrMountDoesNotExist is used when an operation is
-	// attempted on a mount layer which does not exist.
-	ErrMountDoesNotExist = errors.New("mount does not exist")
-
-	// ErrMountNameConflict is used when a mount is attempted
-	// to be created but there is already a mount with the name
-	// used for creation.
-	ErrMountNameConflict = errors.New("mount already exists with name")
-
-	// ErrActiveMount is used when an operation on a
-	// mount is attempted but the layer is still
-	// mounted and the operation cannot be performed.
-	ErrActiveMount = errors.New("mount still active")
-
-	// ErrNotMounted is used when requesting an active
-	// mount but the layer is not mounted.
-	ErrNotMounted = errors.New("not mounted")
-
-	// ErrMaxDepthExceeded is used when a layer is attempted
-	// to be created which would result in a layer depth
-	// greater than the 125 max.
-	ErrMaxDepthExceeded = errors.New("max depth exceeded")
-
-	// ErrNotSupported is used when the action is not supported
-	// on the current platform
-	ErrNotSupported = errors.New("not support on this platform")
-)
-
-// ChainID is the content-addressable ID of a layer.
-type ChainID digest.Digest
-
-// String returns a string rendition of a layer ID
-func (id ChainID) String() string {
-	return string(id)
-}
-
-// DiffID is the hash of an individual layer tar.
-type DiffID digest.Digest
-
-// String returns a string rendition of a layer DiffID
-func (diffID DiffID) String() string {
-	return string(diffID)
-}
-
-// TarStreamer represents an object which may
-// have its contents exported as a tar stream.
-type TarStreamer interface {
-	// TarStream returns a tar archive stream
-	// for the contents of a layer.
-	TarStream() (io.ReadCloser, error)
-}
-
-// Layer represents a read-only layer
-type Layer interface {
-	TarStreamer
-
-	// TarStreamFrom returns a tar archive stream for all the layer chain with
-	// arbitrary depth.
-	TarStreamFrom(ChainID) (io.ReadCloser, error)
-
-	// ChainID returns the content hash of the entire layer chain. The hash
-	// chain is made up of DiffID of top layer and all of its parents.
-	ChainID() ChainID
-
-	// DiffID returns the content hash of the layer
-	// tar stream used to create this layer.
-	DiffID() DiffID
-
-	// Parent returns the next layer in the layer chain.
-	Parent() Layer
-
-	// Size returns the size of the entire layer chain. The size
-	// is calculated from the total size of all files in the layers.
-	Size() (int64, error)
-
-	// DiffSize returns the size difference of the top layer
-	// from parent layer.
-	DiffSize() (int64, error)
-
-	// Metadata returns the low level storage metadata associated
-	// with layer.
-	Metadata() (map[string]string, error)
-}
-
-// RWLayer represents a layer which is
-// read and writable
-type RWLayer interface {
-	TarStreamer
-
-	// Name of mounted layer
-	Name() string
-
-	// Parent returns the layer which the writable
-	// layer was created from.
-	Parent() Layer
-
-	// Mount mounts the RWLayer and returns the filesystem path
-	// the to the writable layer.
-	Mount(mountLabel string) (string, error)
-
-	// Unmount unmounts the RWLayer. This should be called
-	// for every mount. If there are multiple mount calls
-	// this operation will only decrement the internal mount counter.
-	Unmount() error
-
-	// Size represents the size of the writable layer
-	// as calculated by the total size of the files
-	// changed in the mutable layer.
-	Size() (int64, error)
-
-	// Changes returns the set of changes for the mutable layer
-	// from the base layer.
-	Changes() ([]archive.Change, error)
-
-	// Metadata returns the low level metadata for the mutable layer
-	Metadata() (map[string]string, error)
-}
-
-// Metadata holds information about a
-// read-only layer
-type Metadata struct {
-	// ChainID is the content hash of the layer
-	ChainID ChainID
-
-	// DiffID is the hash of the tar data used to
-	// create the layer
-	DiffID DiffID
-
-	// Size is the size of the layer and all parents
-	Size int64
-
-	// DiffSize is the size of the top layer
-	DiffSize int64
-}
-
-// MountInit is a function to initialize a
-// writable mount. Changes made here will
-// not be included in the Tar stream of the
-// RWLayer.
-type MountInit func(root string) error
-
-// Store represents a backend for managing both
-// read-only and read-write layers.
-type Store interface {
-	Register(io.Reader, ChainID) (Layer, error)
-	Get(ChainID) (Layer, error)
-	Map() map[ChainID]Layer
-	Release(Layer) ([]Metadata, error)
-
-	CreateRWLayer(id string, parent ChainID, mountLabel string, initFunc MountInit, storageOpt map[string]string) (RWLayer, error)
-	GetRWLayer(id string) (RWLayer, error)
-	GetMountID(id string) (string, error)
-	ReleaseRWLayer(RWLayer) ([]Metadata, error)
-
-	Cleanup() error
-	DriverStatus() [][2]string
-	DriverName() string
-}
-
-// DescribableStore represents a layer store capable of storing
-// descriptors for layers.
-type DescribableStore interface {
-	RegisterWithDescriptor(io.Reader, ChainID, distribution.Descriptor) (Layer, error)
-}
-
-// MetadataTransaction represents functions for setting layer metadata
-// with a single transaction.
-type MetadataTransaction interface {
-	SetSize(int64) error
-	SetParent(parent ChainID) error
-	SetDiffID(DiffID) error
-	SetCacheID(string) error
-	SetDescriptor(distribution.Descriptor) error
-	TarSplitWriter(compressInput bool) (io.WriteCloser, error)
-
-	Commit(ChainID) error
-	Cancel() error
-	String() string
-}
-
-// MetadataStore represents a backend for persisting
-// metadata about layers and providing the metadata
-// for restoring a Store.
-type MetadataStore interface {
-	// StartTransaction starts an update for new metadata
-	// which will be used to represent an ID on commit.
-	StartTransaction() (MetadataTransaction, error)
-
-	GetSize(ChainID) (int64, error)
-	GetParent(ChainID) (ChainID, error)
-	GetDiffID(ChainID) (DiffID, error)
-	GetCacheID(ChainID) (string, error)
-	GetDescriptor(ChainID) (distribution.Descriptor, error)
-	TarSplitReader(ChainID) (io.ReadCloser, error)
-
-	SetMountID(string, string) error
-	SetInitID(string, string) error
-	SetMountParent(string, ChainID) error
-
-	GetMountID(string) (string, error)
-	GetInitID(string) (string, error)
-	GetMountParent(string) (ChainID, error)
-
-	// List returns the full list of referenced
-	// read-only and read-write layers
-	List() ([]ChainID, []string, error)
-
-	Remove(ChainID) error
-	RemoveMount(string) error
-}
-
-// CreateChainID returns ID for a layerDigest slice
-func CreateChainID(dgsts []DiffID) ChainID {
-	return createChainIDFromParent("", dgsts...)
-}
-
-func createChainIDFromParent(parent ChainID, dgsts ...DiffID) ChainID {
-	if len(dgsts) == 0 {
-		return parent
-	}
-	if parent == "" {
-		return createChainIDFromParent(ChainID(dgsts[0]), dgsts[1:]...)
-	}
-	// H = "H(n-1) SHA256(n)"
-	dgst := digest.FromBytes([]byte(string(parent) + " " + string(dgsts[0])))
-	return createChainIDFromParent(ChainID(dgst), dgsts[1:]...)
-}
-
-// ReleaseAndLog releases the provided layer from the given layer
-// store, logging any error and release metadata
-func ReleaseAndLog(ls Store, l Layer) {
-	metadata, err := ls.Release(l)
-	if err != nil {
-		logrus.Errorf("Error releasing layer %s: %v", l.ChainID(), err)
-	}
-	LogReleaseMetadata(metadata)
-}
-
-// LogReleaseMetadata logs a metadata array, uses this to
-// ensure consistent logging for release metadata
-func LogReleaseMetadata(metadatas []Metadata) {
-	for _, metadata := range metadatas {
-		logrus.Infof("Layer %s cleaned up", metadata.ChainID)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_store.go b/installer/vendor/github.com/docker/docker/layer/layer_store.go
deleted file mode 100644
index 1a1ff9fe59..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_store.go
+++ /dev/null
@@ -1,684 +0,0 @@
-package layer
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/vbatts/tar-split/tar/asm"
-	"github.com/vbatts/tar-split/tar/storage"
-)
-
-// maxLayerDepth represents the maximum number of
-// layers which can be chained together. 125 was
-// chosen to account for the 127 max in some
-// graphdrivers plus the 2 additional layers
-// used to create a rwlayer.
-const maxLayerDepth = 125
-
-type layerStore struct {
-	store  MetadataStore
-	driver graphdriver.Driver
-
-	layerMap map[ChainID]*roLayer
-	layerL   sync.Mutex
-
-	mounts map[string]*mountedLayer
-	mountL sync.Mutex
-}
-
-// StoreOptions are the options used to create a new Store instance
-type StoreOptions struct {
-	StorePath                 string
-	MetadataStorePathTemplate string
-	GraphDriver               string
-	GraphDriverOptions        []string
-	UIDMaps                   []idtools.IDMap
-	GIDMaps                   []idtools.IDMap
-	PluginGetter              plugingetter.PluginGetter
-	ExperimentalEnabled       bool
-}
-
-// NewStoreFromOptions creates a new Store instance
-func NewStoreFromOptions(options StoreOptions) (Store, error) {
-	driver, err := graphdriver.New(options.GraphDriver, options.PluginGetter, graphdriver.Options{
-		Root:                options.StorePath,
-		DriverOptions:       options.GraphDriverOptions,
-		UIDMaps:             options.UIDMaps,
-		GIDMaps:             options.GIDMaps,
-		ExperimentalEnabled: options.ExperimentalEnabled,
-	})
-	if err != nil {
-		return nil, fmt.Errorf("error initializing graphdriver: %v", err)
-	}
-	logrus.Debugf("Using graph driver %s", driver)
-
-	fms, err := NewFSMetadataStore(fmt.Sprintf(options.MetadataStorePathTemplate, driver))
-	if err != nil {
-		return nil, err
-	}
-
-	return NewStoreFromGraphDriver(fms, driver)
-}
-
-// NewStoreFromGraphDriver creates a new Store instance using the provided
-// metadata store and graph driver. The metadata store will be used to restore
-// the Store.
-func NewStoreFromGraphDriver(store MetadataStore, driver graphdriver.Driver) (Store, error) {
-	ls := &layerStore{
-		store:    store,
-		driver:   driver,
-		layerMap: map[ChainID]*roLayer{},
-		mounts:   map[string]*mountedLayer{},
-	}
-
-	ids, mounts, err := store.List()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, id := range ids {
-		l, err := ls.loadLayer(id)
-		if err != nil {
-			logrus.Debugf("Failed to load layer %s: %s", id, err)
-			continue
-		}
-		if l.parent != nil {
-			l.parent.referenceCount++
-		}
-	}
-
-	for _, mount := range mounts {
-		if err := ls.loadMount(mount); err != nil {
-			logrus.Debugf("Failed to load mount %s: %s", mount, err)
-		}
-	}
-
-	return ls, nil
-}
-
-func (ls *layerStore) loadLayer(layer ChainID) (*roLayer, error) {
-	cl, ok := ls.layerMap[layer]
-	if ok {
-		return cl, nil
-	}
-
-	diff, err := ls.store.GetDiffID(layer)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get diff id for %s: %s", layer, err)
-	}
-
-	size, err := ls.store.GetSize(layer)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get size for %s: %s", layer, err)
-	}
-
-	cacheID, err := ls.store.GetCacheID(layer)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get cache id for %s: %s", layer, err)
-	}
-
-	parent, err := ls.store.GetParent(layer)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get parent for %s: %s", layer, err)
-	}
-
-	descriptor, err := ls.store.GetDescriptor(layer)
-	if err != nil {
-		return nil, fmt.Errorf("failed to get descriptor for %s: %s", layer, err)
-	}
-
-	cl = &roLayer{
-		chainID:    layer,
-		diffID:     diff,
-		size:       size,
-		cacheID:    cacheID,
-		layerStore: ls,
-		references: map[Layer]struct{}{},
-		descriptor: descriptor,
-	}
-
-	if parent != "" {
-		p, err := ls.loadLayer(parent)
-		if err != nil {
-			return nil, err
-		}
-		cl.parent = p
-	}
-
-	ls.layerMap[cl.chainID] = cl
-
-	return cl, nil
-}
-
-func (ls *layerStore) loadMount(mount string) error {
-	if _, ok := ls.mounts[mount]; ok {
-		return nil
-	}
-
-	mountID, err := ls.store.GetMountID(mount)
-	if err != nil {
-		return err
-	}
-
-	initID, err := ls.store.GetInitID(mount)
-	if err != nil {
-		return err
-	}
-
-	parent, err := ls.store.GetMountParent(mount)
-	if err != nil {
-		return err
-	}
-
-	ml := &mountedLayer{
-		name:       mount,
-		mountID:    mountID,
-		initID:     initID,
-		layerStore: ls,
-		references: map[RWLayer]*referencedRWLayer{},
-	}
-
-	if parent != "" {
-		p, err := ls.loadLayer(parent)
-		if err != nil {
-			return err
-		}
-		ml.parent = p
-
-		p.referenceCount++
-	}
-
-	ls.mounts[ml.name] = ml
-
-	return nil
-}
-
-func (ls *layerStore) applyTar(tx MetadataTransaction, ts io.Reader, parent string, layer *roLayer) error {
-	digester := digest.Canonical.New()
-	tr := io.TeeReader(ts, digester.Hash())
-
-	tsw, err := tx.TarSplitWriter(true)
-	if err != nil {
-		return err
-	}
-	metaPacker := storage.NewJSONPacker(tsw)
-	defer tsw.Close()
-
-	// we're passing nil here for the file putter, because the ApplyDiff will
-	// handle the extraction of the archive
-	rdr, err := asm.NewInputTarStream(tr, metaPacker, nil)
-	if err != nil {
-		return err
-	}
-
-	applySize, err := ls.driver.ApplyDiff(layer.cacheID, parent, rdr)
-	if err != nil {
-		return err
-	}
-
-	// Discard trailing data but ensure metadata is picked up to reconstruct stream
-	io.Copy(ioutil.Discard, rdr) // ignore error as reader may be closed
-
-	layer.size = applySize
-	layer.diffID = DiffID(digester.Digest())
-
-	logrus.Debugf("Applied tar %s to %s, size: %d", layer.diffID, layer.cacheID, applySize)
-
-	return nil
-}
-
-func (ls *layerStore) Register(ts io.Reader, parent ChainID) (Layer, error) {
-	return ls.registerWithDescriptor(ts, parent, distribution.Descriptor{})
-}
-
-func (ls *layerStore) registerWithDescriptor(ts io.Reader, parent ChainID, descriptor distribution.Descriptor) (Layer, error) {
-	// err is used to hold the error which will always trigger
-	// cleanup of creates sources but may not be an error returned
-	// to the caller (already exists).
-	var err error
-	var pid string
-	var p *roLayer
-	if string(parent) != "" {
-		p = ls.get(parent)
-		if p == nil {
-			return nil, ErrLayerDoesNotExist
-		}
-		pid = p.cacheID
-		// Release parent chain if error
-		defer func() {
-			if err != nil {
-				ls.layerL.Lock()
-				ls.releaseLayer(p)
-				ls.layerL.Unlock()
-			}
-		}()
-		if p.depth() >= maxLayerDepth {
-			err = ErrMaxDepthExceeded
-			return nil, err
-		}
-	}
-
-	// Create new roLayer
-	layer := &roLayer{
-		parent:         p,
-		cacheID:        stringid.GenerateRandomID(),
-		referenceCount: 1,
-		layerStore:     ls,
-		references:     map[Layer]struct{}{},
-		descriptor:     descriptor,
-	}
-
-	if err = ls.driver.Create(layer.cacheID, pid, nil); err != nil {
-		return nil, err
-	}
-
-	tx, err := ls.store.StartTransaction()
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			logrus.Debugf("Cleaning up layer %s: %v", layer.cacheID, err)
-			if err := ls.driver.Remove(layer.cacheID); err != nil {
-				logrus.Errorf("Error cleaning up cache layer %s: %v", layer.cacheID, err)
-			}
-			if err := tx.Cancel(); err != nil {
-				logrus.Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
-			}
-		}
-	}()
-
-	if err = ls.applyTar(tx, ts, pid, layer); err != nil {
-		return nil, err
-	}
-
-	if layer.parent == nil {
-		layer.chainID = ChainID(layer.diffID)
-	} else {
-		layer.chainID = createChainIDFromParent(layer.parent.chainID, layer.diffID)
-	}
-
-	if err = storeLayer(tx, layer); err != nil {
-		return nil, err
-	}
-
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	if existingLayer := ls.getWithoutLock(layer.chainID); existingLayer != nil {
-		// Set error for cleanup, but do not return the error
-		err = errors.New("layer already exists")
-		return existingLayer.getReference(), nil
-	}
-
-	if err = tx.Commit(layer.chainID); err != nil {
-		return nil, err
-	}
-
-	ls.layerMap[layer.chainID] = layer
-
-	return layer.getReference(), nil
-}
-
-func (ls *layerStore) getWithoutLock(layer ChainID) *roLayer {
-	l, ok := ls.layerMap[layer]
-	if !ok {
-		return nil
-	}
-
-	l.referenceCount++
-
-	return l
-}
-
-func (ls *layerStore) get(l ChainID) *roLayer {
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-	return ls.getWithoutLock(l)
-}
-
-func (ls *layerStore) Get(l ChainID) (Layer, error) {
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	layer := ls.getWithoutLock(l)
-	if layer == nil {
-		return nil, ErrLayerDoesNotExist
-	}
-
-	return layer.getReference(), nil
-}
-
-func (ls *layerStore) Map() map[ChainID]Layer {
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	layers := map[ChainID]Layer{}
-
-	for k, v := range ls.layerMap {
-		layers[k] = v
-	}
-
-	return layers
-}
-
-func (ls *layerStore) deleteLayer(layer *roLayer, metadata *Metadata) error {
-	err := ls.driver.Remove(layer.cacheID)
-	if err != nil {
-		return err
-	}
-
-	err = ls.store.Remove(layer.chainID)
-	if err != nil {
-		return err
-	}
-	metadata.DiffID = layer.diffID
-	metadata.ChainID = layer.chainID
-	metadata.Size, err = layer.Size()
-	if err != nil {
-		return err
-	}
-	metadata.DiffSize = layer.size
-
-	return nil
-}
-
-func (ls *layerStore) releaseLayer(l *roLayer) ([]Metadata, error) {
-	depth := 0
-	removed := []Metadata{}
-	for {
-		if l.referenceCount == 0 {
-			panic("layer not retained")
-		}
-		l.referenceCount--
-		if l.referenceCount != 0 {
-			return removed, nil
-		}
-
-		if len(removed) == 0 && depth > 0 {
-			panic("cannot remove layer with child")
-		}
-		if l.hasReferences() {
-			panic("cannot delete referenced layer")
-		}
-		var metadata Metadata
-		if err := ls.deleteLayer(l, &metadata); err != nil {
-			return nil, err
-		}
-
-		delete(ls.layerMap, l.chainID)
-		removed = append(removed, metadata)
-
-		if l.parent == nil {
-			return removed, nil
-		}
-
-		depth++
-		l = l.parent
-	}
-}
-
-func (ls *layerStore) Release(l Layer) ([]Metadata, error) {
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-	layer, ok := ls.layerMap[l.ChainID()]
-	if !ok {
-		return []Metadata{}, nil
-	}
-	if !layer.hasReference(l) {
-		return nil, ErrLayerNotRetained
-	}
-
-	layer.deleteReference(l)
-
-	return ls.releaseLayer(layer)
-}
-
-func (ls *layerStore) CreateRWLayer(name string, parent ChainID, mountLabel string, initFunc MountInit, storageOpt map[string]string) (RWLayer, error) {
-	ls.mountL.Lock()
-	defer ls.mountL.Unlock()
-	m, ok := ls.mounts[name]
-	if ok {
-		return nil, ErrMountNameConflict
-	}
-
-	var err error
-	var pid string
-	var p *roLayer
-	if string(parent) != "" {
-		p = ls.get(parent)
-		if p == nil {
-			return nil, ErrLayerDoesNotExist
-		}
-		pid = p.cacheID
-
-		// Release parent chain if error
-		defer func() {
-			if err != nil {
-				ls.layerL.Lock()
-				ls.releaseLayer(p)
-				ls.layerL.Unlock()
-			}
-		}()
-	}
-
-	m = &mountedLayer{
-		name:       name,
-		parent:     p,
-		mountID:    ls.mountID(name),
-		layerStore: ls,
-		references: map[RWLayer]*referencedRWLayer{},
-	}
-
-	if initFunc != nil {
-		pid, err = ls.initMount(m.mountID, pid, mountLabel, initFunc, storageOpt)
-		if err != nil {
-			return nil, err
-		}
-		m.initID = pid
-	}
-
-	createOpts := &graphdriver.CreateOpts{
-		StorageOpt: storageOpt,
-	}
-
-	if err = ls.driver.CreateReadWrite(m.mountID, pid, createOpts); err != nil {
-		return nil, err
-	}
-
-	if err = ls.saveMount(m); err != nil {
-		return nil, err
-	}
-
-	return m.getReference(), nil
-}
-
-func (ls *layerStore) GetRWLayer(id string) (RWLayer, error) {
-	ls.mountL.Lock()
-	defer ls.mountL.Unlock()
-	mount, ok := ls.mounts[id]
-	if !ok {
-		return nil, ErrMountDoesNotExist
-	}
-
-	return mount.getReference(), nil
-}
-
-func (ls *layerStore) GetMountID(id string) (string, error) {
-	ls.mountL.Lock()
-	defer ls.mountL.Unlock()
-	mount, ok := ls.mounts[id]
-	if !ok {
-		return "", ErrMountDoesNotExist
-	}
-	logrus.Debugf("GetMountID id: %s -> mountID: %s", id, mount.mountID)
-
-	return mount.mountID, nil
-}
-
-func (ls *layerStore) ReleaseRWLayer(l RWLayer) ([]Metadata, error) {
-	ls.mountL.Lock()
-	defer ls.mountL.Unlock()
-	m, ok := ls.mounts[l.Name()]
-	if !ok {
-		return []Metadata{}, nil
-	}
-
-	if err := m.deleteReference(l); err != nil {
-		return nil, err
-	}
-
-	if m.hasReferences() {
-		return []Metadata{}, nil
-	}
-
-	if err := ls.driver.Remove(m.mountID); err != nil {
-		logrus.Errorf("Error removing mounted layer %s: %s", m.name, err)
-		m.retakeReference(l)
-		return nil, err
-	}
-
-	if m.initID != "" {
-		if err := ls.driver.Remove(m.initID); err != nil {
-			logrus.Errorf("Error removing init layer %s: %s", m.name, err)
-			m.retakeReference(l)
-			return nil, err
-		}
-	}
-
-	if err := ls.store.RemoveMount(m.name); err != nil {
-		logrus.Errorf("Error removing mount metadata: %s: %s", m.name, err)
-		m.retakeReference(l)
-		return nil, err
-	}
-
-	delete(ls.mounts, m.Name())
-
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-	if m.parent != nil {
-		return ls.releaseLayer(m.parent)
-	}
-
-	return []Metadata{}, nil
-}
-
-func (ls *layerStore) saveMount(mount *mountedLayer) error {
-	if err := ls.store.SetMountID(mount.name, mount.mountID); err != nil {
-		return err
-	}
-
-	if mount.initID != "" {
-		if err := ls.store.SetInitID(mount.name, mount.initID); err != nil {
-			return err
-		}
-	}
-
-	if mount.parent != nil {
-		if err := ls.store.SetMountParent(mount.name, mount.parent.chainID); err != nil {
-			return err
-		}
-	}
-
-	ls.mounts[mount.name] = mount
-
-	return nil
-}
-
-func (ls *layerStore) initMount(graphID, parent, mountLabel string, initFunc MountInit, storageOpt map[string]string) (string, error) {
-	// Use "<graph-id>-init" to maintain compatibility with graph drivers
-	// which are expecting this layer with this special name. If all
-	// graph drivers can be updated to not rely on knowing about this layer
-	// then the initID should be randomly generated.
-	initID := fmt.Sprintf("%s-init", graphID)
-
-	createOpts := &graphdriver.CreateOpts{
-		MountLabel: mountLabel,
-		StorageOpt: storageOpt,
-	}
-
-	if err := ls.driver.CreateReadWrite(initID, parent, createOpts); err != nil {
-		return "", err
-	}
-	p, err := ls.driver.Get(initID, "")
-	if err != nil {
-		return "", err
-	}
-
-	if err := initFunc(p); err != nil {
-		ls.driver.Put(initID)
-		return "", err
-	}
-
-	if err := ls.driver.Put(initID); err != nil {
-		return "", err
-	}
-
-	return initID, nil
-}
-
-func (ls *layerStore) assembleTarTo(graphID string, metadata io.ReadCloser, size *int64, w io.Writer) error {
-	diffDriver, ok := ls.driver.(graphdriver.DiffGetterDriver)
-	if !ok {
-		diffDriver = &naiveDiffPathDriver{ls.driver}
-	}
-
-	defer metadata.Close()
-
-	// get our relative path to the container
-	fileGetCloser, err := diffDriver.DiffGetter(graphID)
-	if err != nil {
-		return err
-	}
-	defer fileGetCloser.Close()
-
-	metaUnpacker := storage.NewJSONUnpacker(metadata)
-	upackerCounter := &unpackSizeCounter{metaUnpacker, size}
-	logrus.Debugf("Assembling tar data for %s", graphID)
-	return asm.WriteOutputTarStream(fileGetCloser, upackerCounter, w)
-}
-
-func (ls *layerStore) Cleanup() error {
-	return ls.driver.Cleanup()
-}
-
-func (ls *layerStore) DriverStatus() [][2]string {
-	return ls.driver.Status()
-}
-
-func (ls *layerStore) DriverName() string {
-	return ls.driver.String()
-}
-
-type naiveDiffPathDriver struct {
-	graphdriver.Driver
-}
-
-type fileGetPutter struct {
-	storage.FileGetter
-	driver graphdriver.Driver
-	id     string
-}
-
-func (w *fileGetPutter) Close() error {
-	return w.driver.Put(w.id)
-}
-
-func (n *naiveDiffPathDriver) DiffGetter(id string) (graphdriver.FileGetCloser, error) {
-	p, err := n.Driver.Get(id, "")
-	if err != nil {
-		return nil, err
-	}
-	return &fileGetPutter{storage.NewPathFileGetter(p), n.Driver, id}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_store_windows.go b/installer/vendor/github.com/docker/docker/layer/layer_store_windows.go
deleted file mode 100644
index 1276a912cc..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_store_windows.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package layer
-
-import (
-	"io"
-
-	"github.com/docker/distribution"
-)
-
-func (ls *layerStore) RegisterWithDescriptor(ts io.Reader, parent ChainID, descriptor distribution.Descriptor) (Layer, error) {
-	return ls.registerWithDescriptor(ts, parent, descriptor)
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_test.go b/installer/vendor/github.com/docker/docker/layer/layer_test.go
deleted file mode 100644
index 10712df998..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_test.go
+++ /dev/null
@@ -1,771 +0,0 @@
-package layer
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/daemon/graphdriver/vfs"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-func init() {
-	graphdriver.ApplyUncompressedLayer = archive.UnpackLayer
-	vfs.CopyWithTar = archive.CopyWithTar
-}
-
-func newVFSGraphDriver(td string) (graphdriver.Driver, error) {
-	uidMap := []idtools.IDMap{
-		{
-			ContainerID: 0,
-			HostID:      os.Getuid(),
-			Size:        1,
-		},
-	}
-	gidMap := []idtools.IDMap{
-		{
-			ContainerID: 0,
-			HostID:      os.Getgid(),
-			Size:        1,
-		},
-	}
-
-	options := graphdriver.Options{Root: td, UIDMaps: uidMap, GIDMaps: gidMap}
-	return graphdriver.GetDriver("vfs", nil, options)
-}
-
-func newTestGraphDriver(t *testing.T) (graphdriver.Driver, func()) {
-	td, err := ioutil.TempDir("", "graph-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	driver, err := newVFSGraphDriver(td)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return driver, func() {
-		os.RemoveAll(td)
-	}
-}
-
-func newTestStore(t *testing.T) (Store, string, func()) {
-	td, err := ioutil.TempDir("", "layerstore-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graph, graphcleanup := newTestGraphDriver(t)
-	fms, err := NewFSMetadataStore(td)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ls, err := NewStoreFromGraphDriver(fms, graph)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return ls, td, func() {
-		graphcleanup()
-		os.RemoveAll(td)
-	}
-}
-
-type layerInit func(root string) error
-
-func createLayer(ls Store, parent ChainID, layerFunc layerInit) (Layer, error) {
-	containerID := stringid.GenerateRandomID()
-	mount, err := ls.CreateRWLayer(containerID, parent, "", nil, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	path, err := mount.Mount("")
-	if err != nil {
-		return nil, err
-	}
-
-	if err := layerFunc(path); err != nil {
-		return nil, err
-	}
-
-	ts, err := mount.TarStream()
-	if err != nil {
-		return nil, err
-	}
-	defer ts.Close()
-
-	layer, err := ls.Register(ts, parent)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := mount.Unmount(); err != nil {
-		return nil, err
-	}
-
-	if _, err := ls.ReleaseRWLayer(mount); err != nil {
-		return nil, err
-	}
-
-	return layer, nil
-}
-
-type FileApplier interface {
-	ApplyFile(root string) error
-}
-
-type testFile struct {
-	name       string
-	content    []byte
-	permission os.FileMode
-}
-
-func newTestFile(name string, content []byte, perm os.FileMode) FileApplier {
-	return &testFile{
-		name:       name,
-		content:    content,
-		permission: perm,
-	}
-}
-
-func (tf *testFile) ApplyFile(root string) error {
-	fullPath := filepath.Join(root, tf.name)
-	if err := os.MkdirAll(filepath.Dir(fullPath), 0755); err != nil {
-		return err
-	}
-	// Check if already exists
-	if stat, err := os.Stat(fullPath); err == nil && stat.Mode().Perm() != tf.permission {
-		if err := os.Chmod(fullPath, tf.permission); err != nil {
-			return err
-		}
-	}
-	if err := ioutil.WriteFile(fullPath, tf.content, tf.permission); err != nil {
-		return err
-	}
-	return nil
-}
-
-func initWithFiles(files ...FileApplier) layerInit {
-	return func(root string) error {
-		for _, f := range files {
-			if err := f.ApplyFile(root); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-}
-
-func getCachedLayer(l Layer) *roLayer {
-	if rl, ok := l.(*referencedCacheLayer); ok {
-		return rl.roLayer
-	}
-	return l.(*roLayer)
-}
-
-func getMountLayer(l RWLayer) *mountedLayer {
-	return l.(*referencedRWLayer).mountedLayer
-}
-
-func createMetadata(layers ...Layer) []Metadata {
-	metadata := make([]Metadata, len(layers))
-	for i := range layers {
-		size, err := layers[i].Size()
-		if err != nil {
-			panic(err)
-		}
-
-		metadata[i].ChainID = layers[i].ChainID()
-		metadata[i].DiffID = layers[i].DiffID()
-		metadata[i].Size = size
-		metadata[i].DiffSize = getCachedLayer(layers[i]).size
-	}
-
-	return metadata
-}
-
-func assertMetadata(t *testing.T, metadata, expectedMetadata []Metadata) {
-	if len(metadata) != len(expectedMetadata) {
-		t.Fatalf("Unexpected number of deletes %d, expected %d", len(metadata), len(expectedMetadata))
-	}
-
-	for i := range metadata {
-		if metadata[i] != expectedMetadata[i] {
-			t.Errorf("Unexpected metadata\n\tExpected: %#v\n\tActual: %#v", expectedMetadata[i], metadata[i])
-		}
-	}
-	if t.Failed() {
-		t.FailNow()
-	}
-}
-
-func releaseAndCheckDeleted(t *testing.T, ls Store, layer Layer, removed ...Layer) {
-	layerCount := len(ls.(*layerStore).layerMap)
-	expectedMetadata := createMetadata(removed...)
-	metadata, err := ls.Release(layer)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertMetadata(t, metadata, expectedMetadata)
-
-	if expected := layerCount - len(removed); len(ls.(*layerStore).layerMap) != expected {
-		t.Fatalf("Unexpected number of layers %d, expected %d", len(ls.(*layerStore).layerMap), expected)
-	}
-}
-
-func cacheID(l Layer) string {
-	return getCachedLayer(l).cacheID
-}
-
-func assertLayerEqual(t *testing.T, l1, l2 Layer) {
-	if l1.ChainID() != l2.ChainID() {
-		t.Fatalf("Mismatched ID: %s vs %s", l1.ChainID(), l2.ChainID())
-	}
-	if l1.DiffID() != l2.DiffID() {
-		t.Fatalf("Mismatched DiffID: %s vs %s", l1.DiffID(), l2.DiffID())
-	}
-
-	size1, err := l1.Size()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	size2, err := l2.Size()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if size1 != size2 {
-		t.Fatalf("Mismatched size: %d vs %d", size1, size2)
-	}
-
-	if cacheID(l1) != cacheID(l2) {
-		t.Fatalf("Mismatched cache id: %s vs %s", cacheID(l1), cacheID(l2))
-	}
-
-	p1 := l1.Parent()
-	p2 := l2.Parent()
-	if p1 != nil && p2 != nil {
-		assertLayerEqual(t, p1, p2)
-	} else if p1 != nil || p2 != nil {
-		t.Fatalf("Mismatched parents: %v vs %v", p1, p2)
-	}
-}
-
-func TestMountAndRegister(t *testing.T) {
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	li := initWithFiles(newTestFile("testfile.txt", []byte("some test data"), 0644))
-	layer, err := createLayer(ls, "", li)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	size, _ := layer.Size()
-	t.Logf("Layer size: %d", size)
-
-	mount2, err := ls.CreateRWLayer("new-test-mount", layer.ChainID(), "", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path2, err := mount2.Mount("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := ioutil.ReadFile(filepath.Join(path2, "testfile.txt"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := "some test data"; string(b) != expected {
-		t.Fatalf("Wrong file data, expected %q, got %q", expected, string(b))
-	}
-
-	if err := mount2.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.ReleaseRWLayer(mount2); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestLayerRelease(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	layer1, err := createLayer(ls, "", initWithFiles(newTestFile("layer1.txt", []byte("layer 1 file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2, err := createLayer(ls, layer1.ChainID(), initWithFiles(newTestFile("layer2.txt", []byte("layer 2 file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.Release(layer1); err != nil {
-		t.Fatal(err)
-	}
-
-	layer3a, err := createLayer(ls, layer2.ChainID(), initWithFiles(newTestFile("layer3.txt", []byte("layer 3a file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer3b, err := createLayer(ls, layer2.ChainID(), initWithFiles(newTestFile("layer3.txt", []byte("layer 3b file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.Release(layer2); err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("Layer1:  %s", layer1.ChainID())
-	t.Logf("Layer2:  %s", layer2.ChainID())
-	t.Logf("Layer3a: %s", layer3a.ChainID())
-	t.Logf("Layer3b: %s", layer3b.ChainID())
-
-	if expected := 4; len(ls.(*layerStore).layerMap) != expected {
-		t.Fatalf("Unexpected number of layers %d, expected %d", len(ls.(*layerStore).layerMap), expected)
-	}
-
-	releaseAndCheckDeleted(t, ls, layer3b, layer3b)
-	releaseAndCheckDeleted(t, ls, layer3a, layer3a, layer2, layer1)
-}
-
-func TestStoreRestore(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	layer1, err := createLayer(ls, "", initWithFiles(newTestFile("layer1.txt", []byte("layer 1 file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2, err := createLayer(ls, layer1.ChainID(), initWithFiles(newTestFile("layer2.txt", []byte("layer 2 file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.Release(layer1); err != nil {
-		t.Fatal(err)
-	}
-
-	layer3, err := createLayer(ls, layer2.ChainID(), initWithFiles(newTestFile("layer3.txt", []byte("layer 3 file"), 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.Release(layer2); err != nil {
-		t.Fatal(err)
-	}
-
-	m, err := ls.CreateRWLayer("some-mount_name", layer3.ChainID(), "", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path, err := m.Mount("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(path, "testfile.txt"), []byte("nothing here"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := m.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-
-	ls2, err := NewStoreFromGraphDriver(ls.(*layerStore).store, ls.(*layerStore).driver)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer3b, err := ls2.Get(layer3.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertLayerEqual(t, layer3b, layer3)
-
-	// Create again with same name, should return error
-	if _, err := ls2.CreateRWLayer("some-mount_name", layer3b.ChainID(), "", nil, nil); err == nil {
-		t.Fatal("Expected error creating mount with same name")
-	} else if err != ErrMountNameConflict {
-		t.Fatal(err)
-	}
-
-	m2, err := ls2.GetRWLayer("some-mount_name")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if mountPath, err := m2.Mount(""); err != nil {
-		t.Fatal(err)
-	} else if path != mountPath {
-		t.Fatalf("Unexpected path %s, expected %s", mountPath, path)
-	}
-
-	if mountPath, err := m2.Mount(""); err != nil {
-		t.Fatal(err)
-	} else if path != mountPath {
-		t.Fatalf("Unexpected path %s, expected %s", mountPath, path)
-	}
-	if err := m2.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := ioutil.ReadFile(filepath.Join(path, "testfile.txt"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if expected := "nothing here"; string(b) != expected {
-		t.Fatalf("Unexpected content %q, expected %q", string(b), expected)
-	}
-
-	if err := m2.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-
-	if metadata, err := ls2.ReleaseRWLayer(m2); err != nil {
-		t.Fatal(err)
-	} else if len(metadata) != 0 {
-		t.Fatalf("Unexpectedly deleted layers: %#v", metadata)
-	}
-
-	if metadata, err := ls2.ReleaseRWLayer(m2); err != nil {
-		t.Fatal(err)
-	} else if len(metadata) != 0 {
-		t.Fatalf("Unexpectedly deleted layers: %#v", metadata)
-	}
-
-	releaseAndCheckDeleted(t, ls2, layer3b, layer3, layer2, layer1)
-}
-
-func TestTarStreamStability(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	files1 := []FileApplier{
-		newTestFile("/etc/hosts", []byte("mydomain 10.0.0.1"), 0644),
-		newTestFile("/etc/profile", []byte("PATH=/usr/bin"), 0644),
-	}
-	addedFile := newTestFile("/etc/shadow", []byte("root:::::::"), 0644)
-	files2 := []FileApplier{
-		newTestFile("/etc/hosts", []byte("mydomain 10.0.0.2"), 0644),
-		newTestFile("/etc/profile", []byte("PATH=/usr/bin"), 0664),
-		newTestFile("/root/.bashrc", []byte("PATH=/usr/sbin:/usr/bin"), 0644),
-	}
-
-	tar1, err := tarFromFiles(files1...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tar2, err := tarFromFiles(files2...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1, err := ls.Register(bytes.NewReader(tar1), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// hack layer to add file
-	p, err := ls.(*layerStore).driver.Get(layer1.(*referencedCacheLayer).cacheID, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := addedFile.ApplyFile(p); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ls.(*layerStore).driver.Put(layer1.(*referencedCacheLayer).cacheID); err != nil {
-		t.Fatal(err)
-	}
-
-	layer2, err := ls.Register(bytes.NewReader(tar2), layer1.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id1 := layer1.ChainID()
-	t.Logf("Layer 1: %s", layer1.ChainID())
-	t.Logf("Layer 2: %s", layer2.ChainID())
-
-	if _, err := ls.Release(layer1); err != nil {
-		t.Fatal(err)
-	}
-
-	assertLayerDiff(t, tar2, layer2)
-
-	layer1b, err := ls.Get(id1)
-	if err != nil {
-		t.Logf("Content of layer map: %#v", ls.(*layerStore).layerMap)
-		t.Fatal(err)
-	}
-
-	if _, err := ls.Release(layer2); err != nil {
-		t.Fatal(err)
-	}
-
-	assertLayerDiff(t, tar1, layer1b)
-
-	if _, err := ls.Release(layer1b); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func assertLayerDiff(t *testing.T, expected []byte, layer Layer) {
-	expectedDigest := digest.FromBytes(expected)
-
-	if digest.Digest(layer.DiffID()) != expectedDigest {
-		t.Fatalf("Mismatched diff id for %s, got %s, expected %s", layer.ChainID(), layer.DiffID(), expected)
-	}
-
-	ts, err := layer.TarStream()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ts.Close()
-
-	actual, err := ioutil.ReadAll(ts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(actual) != len(expected) {
-		logByteDiff(t, actual, expected)
-		t.Fatalf("Mismatched tar stream size for %s, got %d, expected %d", layer.ChainID(), len(actual), len(expected))
-	}
-
-	actualDigest := digest.FromBytes(actual)
-
-	if actualDigest != expectedDigest {
-		logByteDiff(t, actual, expected)
-		t.Fatalf("Wrong digest of tar stream, got %s, expected %s", actualDigest, expectedDigest)
-	}
-}
-
-const maxByteLog = 4 * 1024
-
-func logByteDiff(t *testing.T, actual, expected []byte) {
-	d1, d2 := byteDiff(actual, expected)
-	if len(d1) == 0 && len(d2) == 0 {
-		return
-	}
-
-	prefix := len(actual) - len(d1)
-	if len(d1) > maxByteLog || len(d2) > maxByteLog {
-		t.Logf("Byte diff after %d matching bytes", prefix)
-	} else {
-		t.Logf("Byte diff after %d matching bytes\nActual bytes after prefix:\n%x\nExpected bytes after prefix:\n%x", prefix, d1, d2)
-	}
-}
-
-// byteDiff returns the differing bytes after the matching prefix
-func byteDiff(b1, b2 []byte) ([]byte, []byte) {
-	i := 0
-	for i < len(b1) && i < len(b2) {
-		if b1[i] != b2[i] {
-			break
-		}
-		i++
-	}
-
-	return b1[i:], b2[i:]
-}
-
-func tarFromFiles(files ...FileApplier) ([]byte, error) {
-	td, err := ioutil.TempDir("", "tar-")
-	if err != nil {
-		return nil, err
-	}
-	defer os.RemoveAll(td)
-
-	for _, f := range files {
-		if err := f.ApplyFile(td); err != nil {
-			return nil, err
-		}
-	}
-
-	r, err := archive.Tar(td, archive.Uncompressed)
-	if err != nil {
-		return nil, err
-	}
-
-	buf := bytes.NewBuffer(nil)
-	if _, err := io.Copy(buf, r); err != nil {
-		return nil, err
-	}
-
-	return buf.Bytes(), nil
-}
-
-// assertReferences asserts that all the references are to the same
-// image and represent the full set of references to that image.
-func assertReferences(t *testing.T, references ...Layer) {
-	if len(references) == 0 {
-		return
-	}
-	base := references[0].(*referencedCacheLayer).roLayer
-	seenReferences := map[Layer]struct{}{
-		references[0]: {},
-	}
-	for i := 1; i < len(references); i++ {
-		other := references[i].(*referencedCacheLayer).roLayer
-		if base != other {
-			t.Fatalf("Unexpected referenced cache layer %s, expecting %s", other.ChainID(), base.ChainID())
-		}
-		if _, ok := base.references[references[i]]; !ok {
-			t.Fatalf("Reference not part of reference list: %v", references[i])
-		}
-		if _, ok := seenReferences[references[i]]; ok {
-			t.Fatalf("Duplicated reference %v", references[i])
-		}
-	}
-	if rc := len(base.references); rc != len(references) {
-		t.Fatalf("Unexpected number of references %d, expecting %d", rc, len(references))
-	}
-}
-
-func TestRegisterExistingLayer(t *testing.T) {
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	baseFiles := []FileApplier{
-		newTestFile("/etc/profile", []byte("# Base configuration"), 0644),
-	}
-
-	layerFiles := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Root configuration"), 0644),
-	}
-
-	li := initWithFiles(baseFiles...)
-	layer1, err := createLayer(ls, "", li)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tar1, err := tarFromFiles(layerFiles...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2a, err := ls.Register(bytes.NewReader(tar1), layer1.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2b, err := ls.Register(bytes.NewReader(tar1), layer1.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertReferences(t, layer2a, layer2b)
-}
-
-func TestTarStreamVerification(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, tmpdir, cleanup := newTestStore(t)
-	defer cleanup()
-
-	files1 := []FileApplier{
-		newTestFile("/foo", []byte("abc"), 0644),
-		newTestFile("/bar", []byte("def"), 0644),
-	}
-	files2 := []FileApplier{
-		newTestFile("/foo", []byte("abc"), 0644),
-		newTestFile("/bar", []byte("def"), 0600), // different perm
-	}
-
-	tar1, err := tarFromFiles(files1...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tar2, err := tarFromFiles(files2...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1, err := ls.Register(bytes.NewReader(tar1), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2, err := ls.Register(bytes.NewReader(tar2), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	id1 := digest.Digest(layer1.ChainID())
-	id2 := digest.Digest(layer2.ChainID())
-
-	// Replace tar data files
-	src, err := os.Open(filepath.Join(tmpdir, id1.Algorithm().String(), id1.Hex(), "tar-split.json.gz"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer src.Close()
-
-	dst, err := os.Create(filepath.Join(tmpdir, id2.Algorithm().String(), id2.Hex(), "tar-split.json.gz"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer dst.Close()
-
-	if _, err := io.Copy(dst, src); err != nil {
-		t.Fatal(err)
-	}
-
-	src.Sync()
-	dst.Sync()
-
-	ts, err := layer2.TarStream()
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = io.Copy(ioutil.Discard, ts)
-	if err == nil {
-		t.Fatal("expected data verification to fail")
-	}
-	if !strings.Contains(err.Error(), "could not verify layer data") {
-		t.Fatalf("wrong error returned from tarstream: %q", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_unix.go b/installer/vendor/github.com/docker/docker/layer/layer_unix.go
deleted file mode 100644
index 776b78ac02..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_unix.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux freebsd darwin openbsd solaris
-
-package layer
-
-import "github.com/docker/docker/pkg/stringid"
-
-func (ls *layerStore) mountID(name string) string {
-	return stringid.GenerateRandomID()
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_unix_test.go b/installer/vendor/github.com/docker/docker/layer/layer_unix_test.go
deleted file mode 100644
index 9aa1afd597..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_unix_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// +build !windows
-
-package layer
-
-import "testing"
-
-func graphDiffSize(ls Store, l Layer) (int64, error) {
-	cl := getCachedLayer(l)
-	var parent string
-	if cl.parent != nil {
-		parent = cl.parent.cacheID
-	}
-	return ls.(*layerStore).driver.DiffSize(cl.cacheID, parent)
-}
-
-// Unix as Windows graph driver does not support Changes which is indirectly
-// invoked by calling DiffSize on the driver
-func TestLayerSize(t *testing.T) {
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	content1 := []byte("Base contents")
-	content2 := []byte("Added contents")
-
-	layer1, err := createLayer(ls, "", initWithFiles(newTestFile("file1", content1, 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2, err := createLayer(ls, layer1.ChainID(), initWithFiles(newTestFile("file2", content2, 0644)))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1DiffSize, err := graphDiffSize(ls, layer1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if int(layer1DiffSize) != len(content1) {
-		t.Fatalf("Unexpected diff size %d, expected %d", layer1DiffSize, len(content1))
-	}
-
-	layer1Size, err := layer1.Size()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := len(content1); int(layer1Size) != expected {
-		t.Fatalf("Unexpected size %d, expected %d", layer1Size, expected)
-	}
-
-	layer2DiffSize, err := graphDiffSize(ls, layer2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if int(layer2DiffSize) != len(content2) {
-		t.Fatalf("Unexpected diff size %d, expected %d", layer2DiffSize, len(content2))
-	}
-
-	layer2Size, err := layer2.Size()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := len(content1) + len(content2); int(layer2Size) != expected {
-		t.Fatalf("Unexpected size %d, expected %d", layer2Size, expected)
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/layer_windows.go b/installer/vendor/github.com/docker/docker/layer/layer_windows.go
deleted file mode 100644
index e20311a091..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/layer_windows.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package layer
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/daemon/graphdriver"
-)
-
-// GetLayerPath returns the path to a layer
-func GetLayerPath(s Store, layer ChainID) (string, error) {
-	ls, ok := s.(*layerStore)
-	if !ok {
-		return "", errors.New("unsupported layer store")
-	}
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	rl, ok := ls.layerMap[layer]
-	if !ok {
-		return "", ErrLayerDoesNotExist
-	}
-
-	path, err := ls.driver.Get(rl.cacheID, "")
-	if err != nil {
-		return "", err
-	}
-
-	if err := ls.driver.Put(rl.cacheID); err != nil {
-		return "", err
-	}
-
-	return path, nil
-}
-
-func (ls *layerStore) RegisterDiffID(graphID string, size int64) (Layer, error) {
-	var err error // this is used for cleanup in existingLayer case
-	diffID := digest.FromBytes([]byte(graphID))
-
-	// Create new roLayer
-	layer := &roLayer{
-		cacheID:        graphID,
-		diffID:         DiffID(diffID),
-		referenceCount: 1,
-		layerStore:     ls,
-		references:     map[Layer]struct{}{},
-		size:           size,
-	}
-
-	tx, err := ls.store.StartTransaction()
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			if err := tx.Cancel(); err != nil {
-				logrus.Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
-			}
-		}
-	}()
-
-	layer.chainID = createChainIDFromParent("", layer.diffID)
-
-	if !ls.driver.Exists(layer.cacheID) {
-		return nil, fmt.Errorf("layer %q is unknown to driver", layer.cacheID)
-	}
-	if err = storeLayer(tx, layer); err != nil {
-		return nil, err
-	}
-
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	if existingLayer := ls.getWithoutLock(layer.chainID); existingLayer != nil {
-		// Set error for cleanup, but do not return
-		err = errors.New("layer already exists")
-		return existingLayer.getReference(), nil
-	}
-
-	if err = tx.Commit(layer.chainID); err != nil {
-		return nil, err
-	}
-
-	ls.layerMap[layer.chainID] = layer
-
-	return layer.getReference(), nil
-}
-
-func (ls *layerStore) mountID(name string) string {
-	// windows has issues if container ID doesn't match mount ID
-	return name
-}
-
-func (ls *layerStore) GraphDriver() graphdriver.Driver {
-	return ls.driver
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/migration.go b/installer/vendor/github.com/docker/docker/layer/migration.go
deleted file mode 100644
index b45c31099d..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/migration.go
+++ /dev/null
@@ -1,256 +0,0 @@
-package layer
-
-import (
-	"compress/gzip"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/vbatts/tar-split/tar/asm"
-	"github.com/vbatts/tar-split/tar/storage"
-)
-
-// CreateRWLayerByGraphID creates a RWLayer in the layer store using
-// the provided name with the given graphID. To get the RWLayer
-// after migration the layer may be retrieved by the given name.
-func (ls *layerStore) CreateRWLayerByGraphID(name string, graphID string, parent ChainID) (err error) {
-	ls.mountL.Lock()
-	defer ls.mountL.Unlock()
-	m, ok := ls.mounts[name]
-	if ok {
-		if m.parent.chainID != parent {
-			return errors.New("name conflict, mismatched parent")
-		}
-		if m.mountID != graphID {
-			return errors.New("mount already exists")
-		}
-
-		return nil
-	}
-
-	if !ls.driver.Exists(graphID) {
-		return fmt.Errorf("graph ID does not exist: %q", graphID)
-	}
-
-	var p *roLayer
-	if string(parent) != "" {
-		p = ls.get(parent)
-		if p == nil {
-			return ErrLayerDoesNotExist
-		}
-
-		// Release parent chain if error
-		defer func() {
-			if err != nil {
-				ls.layerL.Lock()
-				ls.releaseLayer(p)
-				ls.layerL.Unlock()
-			}
-		}()
-	}
-
-	// TODO: Ensure graphID has correct parent
-
-	m = &mountedLayer{
-		name:       name,
-		parent:     p,
-		mountID:    graphID,
-		layerStore: ls,
-		references: map[RWLayer]*referencedRWLayer{},
-	}
-
-	// Check for existing init layer
-	initID := fmt.Sprintf("%s-init", graphID)
-	if ls.driver.Exists(initID) {
-		m.initID = initID
-	}
-
-	if err = ls.saveMount(m); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (ls *layerStore) ChecksumForGraphID(id, parent, oldTarDataPath, newTarDataPath string) (diffID DiffID, size int64, err error) {
-	defer func() {
-		if err != nil {
-			logrus.Debugf("could not get checksum for %q with tar-split: %q", id, err)
-			diffID, size, err = ls.checksumForGraphIDNoTarsplit(id, parent, newTarDataPath)
-		}
-	}()
-
-	if oldTarDataPath == "" {
-		err = errors.New("no tar-split file")
-		return
-	}
-
-	tarDataFile, err := os.Open(oldTarDataPath)
-	if err != nil {
-		return
-	}
-	defer tarDataFile.Close()
-	uncompressed, err := gzip.NewReader(tarDataFile)
-	if err != nil {
-		return
-	}
-
-	dgst := digest.Canonical.New()
-	err = ls.assembleTarTo(id, uncompressed, &size, dgst.Hash())
-	if err != nil {
-		return
-	}
-
-	diffID = DiffID(dgst.Digest())
-	err = os.RemoveAll(newTarDataPath)
-	if err != nil {
-		return
-	}
-	err = os.Link(oldTarDataPath, newTarDataPath)
-
-	return
-}
-
-func (ls *layerStore) checksumForGraphIDNoTarsplit(id, parent, newTarDataPath string) (diffID DiffID, size int64, err error) {
-	rawarchive, err := ls.driver.Diff(id, parent)
-	if err != nil {
-		return
-	}
-	defer rawarchive.Close()
-
-	f, err := os.Create(newTarDataPath)
-	if err != nil {
-		return
-	}
-	defer f.Close()
-	mfz := gzip.NewWriter(f)
-	defer mfz.Close()
-	metaPacker := storage.NewJSONPacker(mfz)
-
-	packerCounter := &packSizeCounter{metaPacker, &size}
-
-	archive, err := asm.NewInputTarStream(rawarchive, packerCounter, nil)
-	if err != nil {
-		return
-	}
-	dgst, err := digest.FromReader(archive)
-	if err != nil {
-		return
-	}
-	diffID = DiffID(dgst)
-	return
-}
-
-func (ls *layerStore) RegisterByGraphID(graphID string, parent ChainID, diffID DiffID, tarDataFile string, size int64) (Layer, error) {
-	// err is used to hold the error which will always trigger
-	// cleanup of creates sources but may not be an error returned
-	// to the caller (already exists).
-	var err error
-	var p *roLayer
-	if string(parent) != "" {
-		p = ls.get(parent)
-		if p == nil {
-			return nil, ErrLayerDoesNotExist
-		}
-
-		// Release parent chain if error
-		defer func() {
-			if err != nil {
-				ls.layerL.Lock()
-				ls.releaseLayer(p)
-				ls.layerL.Unlock()
-			}
-		}()
-	}
-
-	// Create new roLayer
-	layer := &roLayer{
-		parent:         p,
-		cacheID:        graphID,
-		referenceCount: 1,
-		layerStore:     ls,
-		references:     map[Layer]struct{}{},
-		diffID:         diffID,
-		size:           size,
-		chainID:        createChainIDFromParent(parent, diffID),
-	}
-
-	ls.layerL.Lock()
-	defer ls.layerL.Unlock()
-
-	if existingLayer := ls.getWithoutLock(layer.chainID); existingLayer != nil {
-		// Set error for cleanup, but do not return
-		err = errors.New("layer already exists")
-		return existingLayer.getReference(), nil
-	}
-
-	tx, err := ls.store.StartTransaction()
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			logrus.Debugf("Cleaning up transaction after failed migration for %s: %v", graphID, err)
-			if err := tx.Cancel(); err != nil {
-				logrus.Errorf("Error canceling metadata transaction %q: %s", tx.String(), err)
-			}
-		}
-	}()
-
-	tsw, err := tx.TarSplitWriter(false)
-	if err != nil {
-		return nil, err
-	}
-	defer tsw.Close()
-	tdf, err := os.Open(tarDataFile)
-	if err != nil {
-		return nil, err
-	}
-	defer tdf.Close()
-	_, err = io.Copy(tsw, tdf)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = storeLayer(tx, layer); err != nil {
-		return nil, err
-	}
-
-	if err = tx.Commit(layer.chainID); err != nil {
-		return nil, err
-	}
-
-	ls.layerMap[layer.chainID] = layer
-
-	return layer.getReference(), nil
-}
-
-type unpackSizeCounter struct {
-	unpacker storage.Unpacker
-	size     *int64
-}
-
-func (u *unpackSizeCounter) Next() (*storage.Entry, error) {
-	e, err := u.unpacker.Next()
-	if err == nil && u.size != nil {
-		*u.size += e.Size
-	}
-	return e, err
-}
-
-type packSizeCounter struct {
-	packer storage.Packer
-	size   *int64
-}
-
-func (p *packSizeCounter) AddEntry(e storage.Entry) (int, error) {
-	n, err := p.packer.AddEntry(e)
-	if err == nil && p.size != nil {
-		*p.size += e.Size
-	}
-	return n, err
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/migration_test.go b/installer/vendor/github.com/docker/docker/layer/migration_test.go
deleted file mode 100644
index 07b4b68f8f..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/migration_test.go
+++ /dev/null
@@ -1,435 +0,0 @@
-package layer
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/docker/docker/daemon/graphdriver"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/vbatts/tar-split/tar/asm"
-	"github.com/vbatts/tar-split/tar/storage"
-)
-
-func writeTarSplitFile(name string, tarContent []byte) error {
-	f, err := os.OpenFile(name, os.O_TRUNC|os.O_CREATE|os.O_WRONLY, 0644)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	fz := gzip.NewWriter(f)
-
-	metaPacker := storage.NewJSONPacker(fz)
-	defer fz.Close()
-
-	rdr, err := asm.NewInputTarStream(bytes.NewReader(tarContent), metaPacker, nil)
-	if err != nil {
-		return err
-	}
-
-	if _, err := io.Copy(ioutil.Discard, rdr); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func TestLayerMigration(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	td, err := ioutil.TempDir("", "migration-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(td)
-
-	layer1Files := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Boring configuration"), 0644),
-		newTestFile("/etc/profile", []byte("# Base configuration"), 0644),
-	}
-
-	layer2Files := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Updated configuration"), 0644),
-	}
-
-	tar1, err := tarFromFiles(layer1Files...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tar2, err := tarFromFiles(layer2Files...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graph, err := newVFSGraphDriver(filepath.Join(td, "graphdriver-"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graphID1 := stringid.GenerateRandomID()
-	if err := graph.Create(graphID1, "", nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := graph.ApplyDiff(graphID1, "", bytes.NewReader(tar1)); err != nil {
-		t.Fatal(err)
-	}
-
-	tf1 := filepath.Join(td, "tar1.json.gz")
-	if err := writeTarSplitFile(tf1, tar1); err != nil {
-		t.Fatal(err)
-	}
-
-	fms, err := NewFSMetadataStore(filepath.Join(td, "layers"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	ls, err := NewStoreFromGraphDriver(fms, graph)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	newTarDataPath := filepath.Join(td, ".migration-tardata")
-	diffID, size, err := ls.(*layerStore).ChecksumForGraphID(graphID1, "", tf1, newTarDataPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1a, err := ls.(*layerStore).RegisterByGraphID(graphID1, "", diffID, newTarDataPath, size)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1b, err := ls.Register(bytes.NewReader(tar1), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertReferences(t, layer1a, layer1b)
-	// Attempt register, should be same
-	layer2a, err := ls.Register(bytes.NewReader(tar2), layer1a.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graphID2 := stringid.GenerateRandomID()
-	if err := graph.Create(graphID2, graphID1, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := graph.ApplyDiff(graphID2, graphID1, bytes.NewReader(tar2)); err != nil {
-		t.Fatal(err)
-	}
-
-	tf2 := filepath.Join(td, "tar2.json.gz")
-	if err := writeTarSplitFile(tf2, tar2); err != nil {
-		t.Fatal(err)
-	}
-	diffID, size, err = ls.(*layerStore).ChecksumForGraphID(graphID2, graphID1, tf2, newTarDataPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2b, err := ls.(*layerStore).RegisterByGraphID(graphID2, layer1a.ChainID(), diffID, tf2, size)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertReferences(t, layer2a, layer2b)
-
-	if metadata, err := ls.Release(layer2a); err != nil {
-		t.Fatal(err)
-	} else if len(metadata) > 0 {
-		t.Fatalf("Unexpected layer removal after first release: %#v", metadata)
-	}
-
-	metadata, err := ls.Release(layer2b)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertMetadata(t, metadata, createMetadata(layer2a))
-}
-
-func tarFromFilesInGraph(graph graphdriver.Driver, graphID, parentID string, files ...FileApplier) ([]byte, error) {
-	t, err := tarFromFiles(files...)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := graph.Create(graphID, parentID, nil); err != nil {
-		return nil, err
-	}
-	if _, err := graph.ApplyDiff(graphID, parentID, bytes.NewReader(t)); err != nil {
-		return nil, err
-	}
-
-	ar, err := graph.Diff(graphID, parentID)
-	if err != nil {
-		return nil, err
-	}
-	defer ar.Close()
-
-	return ioutil.ReadAll(ar)
-}
-
-func TestLayerMigrationNoTarsplit(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	td, err := ioutil.TempDir("", "migration-test-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(td)
-
-	layer1Files := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Boring configuration"), 0644),
-		newTestFile("/etc/profile", []byte("# Base configuration"), 0644),
-	}
-
-	layer2Files := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Updated configuration"), 0644),
-	}
-
-	graph, err := newVFSGraphDriver(filepath.Join(td, "graphdriver-"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	graphID1 := stringid.GenerateRandomID()
-	graphID2 := stringid.GenerateRandomID()
-
-	tar1, err := tarFromFilesInGraph(graph, graphID1, "", layer1Files...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tar2, err := tarFromFilesInGraph(graph, graphID2, graphID1, layer2Files...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	fms, err := NewFSMetadataStore(filepath.Join(td, "layers"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	ls, err := NewStoreFromGraphDriver(fms, graph)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	newTarDataPath := filepath.Join(td, ".migration-tardata")
-	diffID, size, err := ls.(*layerStore).ChecksumForGraphID(graphID1, "", "", newTarDataPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1a, err := ls.(*layerStore).RegisterByGraphID(graphID1, "", diffID, newTarDataPath, size)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer1b, err := ls.Register(bytes.NewReader(tar1), "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertReferences(t, layer1a, layer1b)
-
-	// Attempt register, should be same
-	layer2a, err := ls.Register(bytes.NewReader(tar2), layer1a.ChainID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	diffID, size, err = ls.(*layerStore).ChecksumForGraphID(graphID2, graphID1, "", newTarDataPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer2b, err := ls.(*layerStore).RegisterByGraphID(graphID2, layer1a.ChainID(), diffID, newTarDataPath, size)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertReferences(t, layer2a, layer2b)
-
-	if metadata, err := ls.Release(layer2a); err != nil {
-		t.Fatal(err)
-	} else if len(metadata) > 0 {
-		t.Fatalf("Unexpected layer removal after first release: %#v", metadata)
-	}
-
-	metadata, err := ls.Release(layer2b)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertMetadata(t, metadata, createMetadata(layer2a))
-}
-
-func TestMountMigration(t *testing.T) {
-	// TODO Windows: Figure out why this is failing (obvious - paths... needs porting)
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	baseFiles := []FileApplier{
-		newTestFile("/root/.bashrc", []byte("# Boring configuration"), 0644),
-		newTestFile("/etc/profile", []byte("# Base configuration"), 0644),
-	}
-	initFiles := []FileApplier{
-		newTestFile("/etc/hosts", []byte{}, 0644),
-		newTestFile("/etc/resolv.conf", []byte{}, 0644),
-	}
-	mountFiles := []FileApplier{
-		newTestFile("/etc/hosts", []byte("localhost 127.0.0.1"), 0644),
-		newTestFile("/root/.bashrc", []byte("# Updated configuration"), 0644),
-		newTestFile("/root/testfile1.txt", []byte("nothing valuable"), 0644),
-	}
-
-	initTar, err := tarFromFiles(initFiles...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mountTar, err := tarFromFiles(mountFiles...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graph := ls.(*layerStore).driver
-
-	layer1, err := createLayer(ls, "", initWithFiles(baseFiles...))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	graphID1 := layer1.(*referencedCacheLayer).cacheID
-
-	containerID := stringid.GenerateRandomID()
-	containerInit := fmt.Sprintf("%s-init", containerID)
-
-	if err := graph.Create(containerInit, graphID1, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := graph.ApplyDiff(containerInit, graphID1, bytes.NewReader(initTar)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := graph.Create(containerID, containerInit, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := graph.ApplyDiff(containerID, containerInit, bytes.NewReader(mountTar)); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ls.(*layerStore).CreateRWLayerByGraphID("migration-mount", containerID, layer1.ChainID()); err != nil {
-		t.Fatal(err)
-	}
-
-	rwLayer1, err := ls.GetRWLayer("migration-mount")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := rwLayer1.Mount(""); err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := rwLayer1.Changes()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := 5; len(changes) != expected {
-		t.Logf("Changes %#v", changes)
-		t.Fatalf("Wrong number of changes %d, expected %d", len(changes), expected)
-	}
-
-	sortChanges(changes)
-
-	assertChange(t, changes[0], archive.Change{
-		Path: "/etc",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[1], archive.Change{
-		Path: "/etc/hosts",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[2], archive.Change{
-		Path: "/root",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[3], archive.Change{
-		Path: "/root/.bashrc",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[4], archive.Change{
-		Path: "/root/testfile1.txt",
-		Kind: archive.ChangeAdd,
-	})
-
-	if _, err := ls.CreateRWLayer("migration-mount", layer1.ChainID(), "", nil, nil); err == nil {
-		t.Fatal("Expected error creating mount with same name")
-	} else if err != ErrMountNameConflict {
-		t.Fatal(err)
-	}
-
-	rwLayer2, err := ls.GetRWLayer("migration-mount")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if getMountLayer(rwLayer1) != getMountLayer(rwLayer2) {
-		t.Fatal("Expected same layer from get with same name as from migrate")
-	}
-
-	if _, err := rwLayer2.Mount(""); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := rwLayer2.Mount(""); err != nil {
-		t.Fatal(err)
-	}
-
-	if metadata, err := ls.Release(layer1); err != nil {
-		t.Fatal(err)
-	} else if len(metadata) > 0 {
-		t.Fatalf("Expected no layers to be deleted, deleted %#v", metadata)
-	}
-
-	if err := rwLayer1.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ls.ReleaseRWLayer(rwLayer1); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := rwLayer2.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-	if err := rwLayer2.Unmount(); err != nil {
-		t.Fatal(err)
-	}
-	metadata, err := ls.ReleaseRWLayer(rwLayer2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(metadata) == 0 {
-		t.Fatal("Expected base layer to be deleted when deleting mount")
-	}
-
-	assertMetadata(t, metadata, createMetadata(layer1))
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/mount_test.go b/installer/vendor/github.com/docker/docker/layer/mount_test.go
deleted file mode 100644
index 7a8637eae9..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/mount_test.go
+++ /dev/null
@@ -1,230 +0,0 @@
-package layer
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sort"
-	"testing"
-
-	"github.com/docker/docker/pkg/archive"
-)
-
-func TestMountInit(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	basefile := newTestFile("testfile.txt", []byte("base data!"), 0644)
-	initfile := newTestFile("testfile.txt", []byte("init data!"), 0777)
-
-	li := initWithFiles(basefile)
-	layer, err := createLayer(ls, "", li)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mountInit := func(root string) error {
-		return initfile.ApplyFile(root)
-	}
-
-	m, err := ls.CreateRWLayer("fun-mount", layer.ChainID(), "", mountInit, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path, err := m.Mount("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := os.Open(filepath.Join(path, "testfile.txt"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := "init data!"; string(b) != expected {
-		t.Fatalf("Unexpected test file contents %q, expected %q", string(b), expected)
-	}
-
-	if fi.Mode().Perm() != 0777 {
-		t.Fatalf("Unexpected filemode %o, expecting %o", fi.Mode().Perm(), 0777)
-	}
-}
-
-func TestMountSize(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	content1 := []byte("Base contents")
-	content2 := []byte("Mutable contents")
-	contentInit := []byte("why am I excluded from the size ☹")
-
-	li := initWithFiles(newTestFile("file1", content1, 0644))
-	layer, err := createLayer(ls, "", li)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mountInit := func(root string) error {
-		return newTestFile("file-init", contentInit, 0777).ApplyFile(root)
-	}
-
-	m, err := ls.CreateRWLayer("mount-size", layer.ChainID(), "", mountInit, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path, err := m.Mount("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(path, "file2"), content2, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	mountSize, err := m.Size()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := len(content2); int(mountSize) != expected {
-		t.Fatalf("Unexpected mount size %d, expected %d", int(mountSize), expected)
-	}
-}
-
-func TestMountChanges(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	ls, _, cleanup := newTestStore(t)
-	defer cleanup()
-
-	basefiles := []FileApplier{
-		newTestFile("testfile1.txt", []byte("base data!"), 0644),
-		newTestFile("testfile2.txt", []byte("base data!"), 0644),
-		newTestFile("testfile3.txt", []byte("base data!"), 0644),
-	}
-	initfile := newTestFile("testfile1.txt", []byte("init data!"), 0777)
-
-	li := initWithFiles(basefiles...)
-	layer, err := createLayer(ls, "", li)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mountInit := func(root string) error {
-		return initfile.ApplyFile(root)
-	}
-
-	m, err := ls.CreateRWLayer("mount-changes", layer.ChainID(), "", mountInit, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	path, err := m.Mount("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Chmod(filepath.Join(path, "testfile1.txt"), 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(path, "testfile1.txt"), []byte("mount data!"), 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Remove(filepath.Join(path, "testfile2.txt")); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Chmod(filepath.Join(path, "testfile3.txt"), 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(path, "testfile4.txt"), []byte("mount data!"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := m.Changes()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected := 4; len(changes) != expected {
-		t.Fatalf("Wrong number of changes %d, expected %d", len(changes), expected)
-	}
-
-	sortChanges(changes)
-
-	assertChange(t, changes[0], archive.Change{
-		Path: "/testfile1.txt",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[1], archive.Change{
-		Path: "/testfile2.txt",
-		Kind: archive.ChangeDelete,
-	})
-	assertChange(t, changes[2], archive.Change{
-		Path: "/testfile3.txt",
-		Kind: archive.ChangeModify,
-	})
-	assertChange(t, changes[3], archive.Change{
-		Path: "/testfile4.txt",
-		Kind: archive.ChangeAdd,
-	})
-}
-
-func assertChange(t *testing.T, actual, expected archive.Change) {
-	if actual.Path != expected.Path {
-		t.Fatalf("Unexpected change path %s, expected %s", actual.Path, expected.Path)
-	}
-	if actual.Kind != expected.Kind {
-		t.Fatalf("Unexpected change type %s, expected %s", actual.Kind, expected.Kind)
-	}
-}
-
-func sortChanges(changes []archive.Change) {
-	cs := &changeSorter{
-		changes: changes,
-	}
-	sort.Sort(cs)
-}
-
-type changeSorter struct {
-	changes []archive.Change
-}
-
-func (cs *changeSorter) Len() int {
-	return len(cs.changes)
-}
-
-func (cs *changeSorter) Swap(i, j int) {
-	cs.changes[i], cs.changes[j] = cs.changes[j], cs.changes[i]
-}
-
-func (cs *changeSorter) Less(i, j int) bool {
-	return cs.changes[i].Path < cs.changes[j].Path
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/mounted_layer.go b/installer/vendor/github.com/docker/docker/layer/mounted_layer.go
deleted file mode 100644
index a5cfcfa9bd..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/mounted_layer.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package layer
-
-import (
-	"io"
-
-	"github.com/docker/docker/pkg/archive"
-)
-
-type mountedLayer struct {
-	name       string
-	mountID    string
-	initID     string
-	parent     *roLayer
-	path       string
-	layerStore *layerStore
-
-	references map[RWLayer]*referencedRWLayer
-}
-
-func (ml *mountedLayer) cacheParent() string {
-	if ml.initID != "" {
-		return ml.initID
-	}
-	if ml.parent != nil {
-		return ml.parent.cacheID
-	}
-	return ""
-}
-
-func (ml *mountedLayer) TarStream() (io.ReadCloser, error) {
-	return ml.layerStore.driver.Diff(ml.mountID, ml.cacheParent())
-}
-
-func (ml *mountedLayer) Name() string {
-	return ml.name
-}
-
-func (ml *mountedLayer) Parent() Layer {
-	if ml.parent != nil {
-		return ml.parent
-	}
-
-	// Return a nil interface instead of an interface wrapping a nil
-	// pointer.
-	return nil
-}
-
-func (ml *mountedLayer) Size() (int64, error) {
-	return ml.layerStore.driver.DiffSize(ml.mountID, ml.cacheParent())
-}
-
-func (ml *mountedLayer) Changes() ([]archive.Change, error) {
-	return ml.layerStore.driver.Changes(ml.mountID, ml.cacheParent())
-}
-
-func (ml *mountedLayer) Metadata() (map[string]string, error) {
-	return ml.layerStore.driver.GetMetadata(ml.mountID)
-}
-
-func (ml *mountedLayer) getReference() RWLayer {
-	ref := &referencedRWLayer{
-		mountedLayer: ml,
-	}
-	ml.references[ref] = ref
-
-	return ref
-}
-
-func (ml *mountedLayer) hasReferences() bool {
-	return len(ml.references) > 0
-}
-
-func (ml *mountedLayer) deleteReference(ref RWLayer) error {
-	if _, ok := ml.references[ref]; !ok {
-		return ErrLayerNotRetained
-	}
-	delete(ml.references, ref)
-	return nil
-}
-
-func (ml *mountedLayer) retakeReference(r RWLayer) {
-	if ref, ok := r.(*referencedRWLayer); ok {
-		ml.references[ref] = ref
-	}
-}
-
-type referencedRWLayer struct {
-	*mountedLayer
-}
-
-func (rl *referencedRWLayer) Mount(mountLabel string) (string, error) {
-	return rl.layerStore.driver.Get(rl.mountedLayer.mountID, mountLabel)
-}
-
-// Unmount decrements the activity count and unmounts the underlying layer
-// Callers should only call `Unmount` once per call to `Mount`, even on error.
-func (rl *referencedRWLayer) Unmount() error {
-	return rl.layerStore.driver.Put(rl.mountedLayer.mountID)
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/ro_layer.go b/installer/vendor/github.com/docker/docker/layer/ro_layer.go
deleted file mode 100644
index 7c8d233a35..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/ro_layer.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package layer
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/docker/distribution"
-	"github.com/docker/distribution/digest"
-)
-
-type roLayer struct {
-	chainID    ChainID
-	diffID     DiffID
-	parent     *roLayer
-	cacheID    string
-	size       int64
-	layerStore *layerStore
-	descriptor distribution.Descriptor
-
-	referenceCount int
-	references     map[Layer]struct{}
-}
-
-// TarStream for roLayer guarentees that the data that is produced is the exact
-// data that the layer was registered with.
-func (rl *roLayer) TarStream() (io.ReadCloser, error) {
-	r, err := rl.layerStore.store.TarSplitReader(rl.chainID)
-	if err != nil {
-		return nil, err
-	}
-
-	pr, pw := io.Pipe()
-	go func() {
-		err := rl.layerStore.assembleTarTo(rl.cacheID, r, nil, pw)
-		if err != nil {
-			pw.CloseWithError(err)
-		} else {
-			pw.Close()
-		}
-	}()
-	rc, err := newVerifiedReadCloser(pr, digest.Digest(rl.diffID))
-	if err != nil {
-		return nil, err
-	}
-	return rc, nil
-}
-
-// TarStreamFrom does not make any guarentees to the correctness of the produced
-// data. As such it should not be used when the layer content must be verified
-// to be an exact match to the registered layer.
-func (rl *roLayer) TarStreamFrom(parent ChainID) (io.ReadCloser, error) {
-	var parentCacheID string
-	for pl := rl.parent; pl != nil; pl = pl.parent {
-		if pl.chainID == parent {
-			parentCacheID = pl.cacheID
-			break
-		}
-	}
-
-	if parent != ChainID("") && parentCacheID == "" {
-		return nil, fmt.Errorf("layer ID '%s' is not a parent of the specified layer: cannot provide diff to non-parent", parent)
-	}
-	return rl.layerStore.driver.Diff(rl.cacheID, parentCacheID)
-}
-
-func (rl *roLayer) ChainID() ChainID {
-	return rl.chainID
-}
-
-func (rl *roLayer) DiffID() DiffID {
-	return rl.diffID
-}
-
-func (rl *roLayer) Parent() Layer {
-	if rl.parent == nil {
-		return nil
-	}
-	return rl.parent
-}
-
-func (rl *roLayer) Size() (size int64, err error) {
-	if rl.parent != nil {
-		size, err = rl.parent.Size()
-		if err != nil {
-			return
-		}
-	}
-
-	return size + rl.size, nil
-}
-
-func (rl *roLayer) DiffSize() (size int64, err error) {
-	return rl.size, nil
-}
-
-func (rl *roLayer) Metadata() (map[string]string, error) {
-	return rl.layerStore.driver.GetMetadata(rl.cacheID)
-}
-
-type referencedCacheLayer struct {
-	*roLayer
-}
-
-func (rl *roLayer) getReference() Layer {
-	ref := &referencedCacheLayer{
-		roLayer: rl,
-	}
-	rl.references[ref] = struct{}{}
-
-	return ref
-}
-
-func (rl *roLayer) hasReference(ref Layer) bool {
-	_, ok := rl.references[ref]
-	return ok
-}
-
-func (rl *roLayer) hasReferences() bool {
-	return len(rl.references) > 0
-}
-
-func (rl *roLayer) deleteReference(ref Layer) {
-	delete(rl.references, ref)
-}
-
-func (rl *roLayer) depth() int {
-	if rl.parent == nil {
-		return 1
-	}
-	return rl.parent.depth() + 1
-}
-
-func storeLayer(tx MetadataTransaction, layer *roLayer) error {
-	if err := tx.SetDiffID(layer.diffID); err != nil {
-		return err
-	}
-	if err := tx.SetSize(layer.size); err != nil {
-		return err
-	}
-	if err := tx.SetCacheID(layer.cacheID); err != nil {
-		return err
-	}
-	// Do not store empty descriptors
-	if layer.descriptor.Digest != "" {
-		if err := tx.SetDescriptor(layer.descriptor); err != nil {
-			return err
-		}
-	}
-	if layer.parent != nil {
-		if err := tx.SetParent(layer.parent.chainID); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func newVerifiedReadCloser(rc io.ReadCloser, dgst digest.Digest) (io.ReadCloser, error) {
-	verifier, err := digest.NewDigestVerifier(dgst)
-	if err != nil {
-		return nil, err
-	}
-	return &verifiedReadCloser{
-		rc:       rc,
-		dgst:     dgst,
-		verifier: verifier,
-	}, nil
-}
-
-type verifiedReadCloser struct {
-	rc       io.ReadCloser
-	dgst     digest.Digest
-	verifier digest.Verifier
-}
-
-func (vrc *verifiedReadCloser) Read(p []byte) (n int, err error) {
-	n, err = vrc.rc.Read(p)
-	if n > 0 {
-		if n, err := vrc.verifier.Write(p[:n]); err != nil {
-			return n, err
-		}
-	}
-	if err == io.EOF {
-		if !vrc.verifier.Verified() {
-			err = fmt.Errorf("could not verify layer data for: %s. This may be because internal files in the layer store were modified. Re-pulling or rebuilding this image may resolve the issue", vrc.dgst)
-		}
-	}
-	return
-}
-func (vrc *verifiedReadCloser) Close() error {
-	return vrc.rc.Close()
-}
diff --git a/installer/vendor/github.com/docker/docker/layer/ro_layer_windows.go b/installer/vendor/github.com/docker/docker/layer/ro_layer_windows.go
deleted file mode 100644
index 32bd7182a3..0000000000
--- a/installer/vendor/github.com/docker/docker/layer/ro_layer_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package layer
-
-import "github.com/docker/distribution"
-
-var _ distribution.Describable = &roLayer{}
-
-func (rl *roLayer) Descriptor() distribution.Descriptor {
-	return rl.descriptor
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/client.go b/installer/vendor/github.com/docker/docker/libcontainerd/client.go
deleted file mode 100644
index c14c1c5e46..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/client.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package libcontainerd
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/docker/docker/pkg/locker"
-)
-
-// clientCommon contains the platform agnostic fields used in the client structure
-type clientCommon struct {
-	backend    Backend
-	containers map[string]*container
-	locker     *locker.Locker
-	mapMutex   sync.RWMutex // protects read/write oprations from containers map
-}
-
-func (clnt *client) lock(containerID string) {
-	clnt.locker.Lock(containerID)
-}
-
-func (clnt *client) unlock(containerID string) {
-	clnt.locker.Unlock(containerID)
-}
-
-// must hold a lock for cont.containerID
-func (clnt *client) appendContainer(cont *container) {
-	clnt.mapMutex.Lock()
-	clnt.containers[cont.containerID] = cont
-	clnt.mapMutex.Unlock()
-}
-func (clnt *client) deleteContainer(containerID string) {
-	clnt.mapMutex.Lock()
-	delete(clnt.containers, containerID)
-	clnt.mapMutex.Unlock()
-}
-
-func (clnt *client) getContainer(containerID string) (*container, error) {
-	clnt.mapMutex.RLock()
-	container, ok := clnt.containers[containerID]
-	defer clnt.mapMutex.RUnlock()
-	if !ok {
-		return nil, fmt.Errorf("invalid container: %s", containerID) // fixme: typed error
-	}
-	return container, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/client_linux.go b/installer/vendor/github.com/docker/docker/libcontainerd/client_linux.go
deleted file mode 100644
index 190f981865..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/client_linux.go
+++ /dev/null
@@ -1,605 +0,0 @@
-package libcontainerd
-
-import (
-	"fmt"
-	"os"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/timestamp"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"golang.org/x/net/context"
-)
-
-type client struct {
-	clientCommon
-
-	// Platform specific properties below here.
-	remote        *remote
-	q             queue
-	exitNotifiers map[string]*exitNotifier
-	liveRestore   bool
-}
-
-// GetServerVersion returns the connected server version information
-func (clnt *client) GetServerVersion(ctx context.Context) (*ServerVersion, error) {
-	resp, err := clnt.remote.apiClient.GetServerVersion(ctx, &containerd.GetServerVersionRequest{})
-	if err != nil {
-		return nil, err
-	}
-
-	sv := &ServerVersion{
-		GetServerVersionResponse: *resp,
-	}
-
-	return sv, nil
-}
-
-// AddProcess is the handler for adding a process to an already running
-// container. It's called through docker exec. It returns the system pid of the
-// exec'd process.
-func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendlyName string, specp Process, attachStdio StdioCallback) (pid int, err error) {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return -1, err
-	}
-
-	spec, err := container.spec()
-	if err != nil {
-		return -1, err
-	}
-	sp := spec.Process
-	sp.Args = specp.Args
-	sp.Terminal = specp.Terminal
-	if len(specp.Env) > 0 {
-		sp.Env = specp.Env
-	}
-	if specp.Cwd != nil {
-		sp.Cwd = *specp.Cwd
-	}
-	if specp.User != nil {
-		sp.User = specs.User{
-			UID:            specp.User.UID,
-			GID:            specp.User.GID,
-			AdditionalGids: specp.User.AdditionalGids,
-		}
-	}
-	if specp.Capabilities != nil {
-		sp.Capabilities = specp.Capabilities
-	}
-
-	p := container.newProcess(processFriendlyName)
-
-	r := &containerd.AddProcessRequest{
-		Args:     sp.Args,
-		Cwd:      sp.Cwd,
-		Terminal: sp.Terminal,
-		Id:       containerID,
-		Env:      sp.Env,
-		User: &containerd.User{
-			Uid:            sp.User.UID,
-			Gid:            sp.User.GID,
-			AdditionalGids: sp.User.AdditionalGids,
-		},
-		Pid:             processFriendlyName,
-		Stdin:           p.fifo(syscall.Stdin),
-		Stdout:          p.fifo(syscall.Stdout),
-		Stderr:          p.fifo(syscall.Stderr),
-		Capabilities:    sp.Capabilities,
-		ApparmorProfile: sp.ApparmorProfile,
-		SelinuxLabel:    sp.SelinuxLabel,
-		NoNewPrivileges: sp.NoNewPrivileges,
-		Rlimits:         convertRlimits(sp.Rlimits),
-	}
-
-	fifoCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		if err != nil {
-			cancel()
-		}
-	}()
-
-	iopipe, err := p.openFifos(fifoCtx, sp.Terminal)
-	if err != nil {
-		return -1, err
-	}
-
-	resp, err := clnt.remote.apiClient.AddProcess(ctx, r)
-	if err != nil {
-		p.closeFifos(iopipe)
-		return -1, err
-	}
-
-	var stdinOnce sync.Once
-	stdin := iopipe.Stdin
-	iopipe.Stdin = ioutils.NewWriteCloserWrapper(stdin, func() error {
-		var err error
-		stdinOnce.Do(func() { // on error from attach we don't know if stdin was already closed
-			err = stdin.Close()
-			if err2 := p.sendCloseStdin(); err == nil {
-				err = err2
-			}
-		})
-		return err
-	})
-
-	container.processes[processFriendlyName] = p
-
-	if err := attachStdio(*iopipe); err != nil {
-		p.closeFifos(iopipe)
-		return -1, err
-	}
-
-	return int(resp.SystemPid), nil
-}
-
-func (clnt *client) SignalProcess(containerID string, pid string, sig int) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	_, err := clnt.remote.apiClient.Signal(context.Background(), &containerd.SignalRequest{
-		Id:     containerID,
-		Pid:    pid,
-		Signal: uint32(sig),
-	})
-	return err
-}
-
-func (clnt *client) Resize(containerID, processFriendlyName string, width, height int) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	if _, err := clnt.getContainer(containerID); err != nil {
-		return err
-	}
-	_, err := clnt.remote.apiClient.UpdateProcess(context.Background(), &containerd.UpdateProcessRequest{
-		Id:     containerID,
-		Pid:    processFriendlyName,
-		Width:  uint32(width),
-		Height: uint32(height),
-	})
-	return err
-}
-
-func (clnt *client) Pause(containerID string) error {
-	return clnt.setState(containerID, StatePause)
-}
-
-func (clnt *client) setState(containerID, state string) error {
-	clnt.lock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		clnt.unlock(containerID)
-		return err
-	}
-	if container.systemPid == 0 {
-		clnt.unlock(containerID)
-		return fmt.Errorf("No active process for container %s", containerID)
-	}
-	st := "running"
-	if state == StatePause {
-		st = "paused"
-	}
-	chstate := make(chan struct{})
-	_, err = clnt.remote.apiClient.UpdateContainer(context.Background(), &containerd.UpdateContainerRequest{
-		Id:     containerID,
-		Pid:    InitFriendlyName,
-		Status: st,
-	})
-	if err != nil {
-		clnt.unlock(containerID)
-		return err
-	}
-	container.pauseMonitor.append(state, chstate)
-	clnt.unlock(containerID)
-	<-chstate
-	return nil
-}
-
-func (clnt *client) Resume(containerID string) error {
-	return clnt.setState(containerID, StateResume)
-}
-
-func (clnt *client) Stats(containerID string) (*Stats, error) {
-	resp, err := clnt.remote.apiClient.Stats(context.Background(), &containerd.StatsRequest{containerID})
-	if err != nil {
-		return nil, err
-	}
-	return (*Stats)(resp), nil
-}
-
-// Take care of the old 1.11.0 behavior in case the version upgrade
-// happened without a clean daemon shutdown
-func (clnt *client) cleanupOldRootfs(containerID string) {
-	// Unmount and delete the bundle folder
-	if mts, err := mount.GetMounts(); err == nil {
-		for _, mts := range mts {
-			if strings.HasSuffix(mts.Mountpoint, containerID+"/rootfs") {
-				if err := syscall.Unmount(mts.Mountpoint, syscall.MNT_DETACH); err == nil {
-					os.RemoveAll(strings.TrimSuffix(mts.Mountpoint, "/rootfs"))
-				}
-				break
-			}
-		}
-	}
-}
-
-func (clnt *client) setExited(containerID string, exitCode uint32) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-
-	err := clnt.backend.StateChanged(containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State:    StateExit,
-			ExitCode: exitCode,
-		}})
-
-	clnt.cleanupOldRootfs(containerID)
-
-	return err
-}
-
-func (clnt *client) GetPidsForContainer(containerID string) ([]int, error) {
-	cont, err := clnt.getContainerdContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-	pids := make([]int, len(cont.Pids))
-	for i, p := range cont.Pids {
-		pids[i] = int(p)
-	}
-	return pids, nil
-}
-
-// Summary returns a summary of the processes running in a container.
-// This is a no-op on Linux.
-func (clnt *client) Summary(containerID string) ([]Summary, error) {
-	return nil, nil
-}
-
-func (clnt *client) getContainerdContainer(containerID string) (*containerd.Container, error) {
-	resp, err := clnt.remote.apiClient.State(context.Background(), &containerd.StateRequest{Id: containerID})
-	if err != nil {
-		return nil, err
-	}
-	for _, cont := range resp.Containers {
-		if cont.Id == containerID {
-			return cont, nil
-		}
-	}
-	return nil, fmt.Errorf("invalid state response")
-}
-
-func (clnt *client) UpdateResources(containerID string, resources Resources) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return err
-	}
-	if container.systemPid == 0 {
-		return fmt.Errorf("No active process for container %s", containerID)
-	}
-	_, err = clnt.remote.apiClient.UpdateContainer(context.Background(), &containerd.UpdateContainerRequest{
-		Id:        containerID,
-		Pid:       InitFriendlyName,
-		Resources: (*containerd.UpdateResource)(&resources),
-	})
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (clnt *client) getExitNotifier(containerID string) *exitNotifier {
-	clnt.mapMutex.RLock()
-	defer clnt.mapMutex.RUnlock()
-	return clnt.exitNotifiers[containerID]
-}
-
-func (clnt *client) getOrCreateExitNotifier(containerID string) *exitNotifier {
-	clnt.mapMutex.Lock()
-	w, ok := clnt.exitNotifiers[containerID]
-	defer clnt.mapMutex.Unlock()
-	if !ok {
-		w = &exitNotifier{c: make(chan struct{}), client: clnt}
-		clnt.exitNotifiers[containerID] = w
-	}
-	return w
-}
-
-func (clnt *client) restore(cont *containerd.Container, lastEvent *containerd.Event, attachStdio StdioCallback, options ...CreateOption) (err error) {
-	clnt.lock(cont.Id)
-	defer clnt.unlock(cont.Id)
-
-	logrus.Debugf("libcontainerd: restore container %s state %s", cont.Id, cont.Status)
-
-	containerID := cont.Id
-	if _, err := clnt.getContainer(containerID); err == nil {
-		return fmt.Errorf("container %s is already active", containerID)
-	}
-
-	defer func() {
-		if err != nil {
-			clnt.deleteContainer(cont.Id)
-		}
-	}()
-
-	container := clnt.newContainer(cont.BundlePath, options...)
-	container.systemPid = systemPid(cont)
-
-	var terminal bool
-	for _, p := range cont.Processes {
-		if p.Pid == InitFriendlyName {
-			terminal = p.Terminal
-		}
-	}
-
-	fifoCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		if err != nil {
-			cancel()
-		}
-	}()
-
-	iopipe, err := container.openFifos(fifoCtx, terminal)
-	if err != nil {
-		return err
-	}
-	var stdinOnce sync.Once
-	stdin := iopipe.Stdin
-	iopipe.Stdin = ioutils.NewWriteCloserWrapper(stdin, func() error {
-		var err error
-		stdinOnce.Do(func() { // on error from attach we don't know if stdin was already closed
-			err = stdin.Close()
-		})
-		return err
-	})
-
-	if err := attachStdio(*iopipe); err != nil {
-		container.closeFifos(iopipe)
-		return err
-	}
-
-	clnt.appendContainer(container)
-
-	err = clnt.backend.StateChanged(containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State: StateRestore,
-			Pid:   container.systemPid,
-		}})
-
-	if err != nil {
-		container.closeFifos(iopipe)
-		return err
-	}
-
-	if lastEvent != nil {
-		// This should only be a pause or resume event
-		if lastEvent.Type == StatePause || lastEvent.Type == StateResume {
-			return clnt.backend.StateChanged(containerID, StateInfo{
-				CommonStateInfo: CommonStateInfo{
-					State: lastEvent.Type,
-					Pid:   container.systemPid,
-				}})
-		}
-
-		logrus.Warnf("libcontainerd: unexpected backlog event: %#v", lastEvent)
-	}
-
-	return nil
-}
-
-func (clnt *client) getContainerLastEventSinceTime(id string, tsp *timestamp.Timestamp) (*containerd.Event, error) {
-	er := &containerd.EventsRequest{
-		Timestamp:  tsp,
-		StoredOnly: true,
-		Id:         id,
-	}
-	events, err := clnt.remote.apiClient.Events(context.Background(), er)
-	if err != nil {
-		logrus.Errorf("libcontainerd: failed to get container events stream for %s: %q", er.Id, err)
-		return nil, err
-	}
-
-	var ev *containerd.Event
-	for {
-		e, err := events.Recv()
-		if err != nil {
-			if err.Error() == "EOF" {
-				break
-			}
-			logrus.Errorf("libcontainerd: failed to get container event for %s: %q", id, err)
-			return nil, err
-		}
-		ev = e
-		logrus.Debugf("libcontainerd: received past event %#v", ev)
-	}
-
-	return ev, nil
-}
-
-func (clnt *client) getContainerLastEvent(id string) (*containerd.Event, error) {
-	ev, err := clnt.getContainerLastEventSinceTime(id, clnt.remote.restoreFromTimestamp)
-	if err == nil && ev == nil {
-		// If ev is nil and the container is running in containerd,
-		// we already consumed all the event of the
-		// container, included the "exit" one.
-		// Thus, we request all events containerd has in memory for
-		// this container in order to get the last one (which should
-		// be an exit event)
-		logrus.Warnf("libcontainerd: client is out of sync, restore was called on a fully synced container (%s).", id)
-		// Request all events since beginning of time
-		t := time.Unix(0, 0)
-		tsp, err := ptypes.TimestampProto(t)
-		if err != nil {
-			logrus.Errorf("libcontainerd: getLastEventSinceTime() failed to convert timestamp: %q", err)
-			return nil, err
-		}
-
-		return clnt.getContainerLastEventSinceTime(id, tsp)
-	}
-
-	return ev, err
-}
-
-func (clnt *client) Restore(containerID string, attachStdio StdioCallback, options ...CreateOption) error {
-	// Synchronize with live events
-	clnt.remote.Lock()
-	defer clnt.remote.Unlock()
-	// Check that containerd still knows this container.
-	//
-	// In the unlikely event that Restore for this container process
-	// the its past event before the main loop, the event will be
-	// processed twice. However, this is not an issue as all those
-	// events will do is change the state of the container to be
-	// exactly the same.
-	cont, err := clnt.getContainerdContainer(containerID)
-	// Get its last event
-	ev, eerr := clnt.getContainerLastEvent(containerID)
-	if err != nil || cont.Status == "Stopped" {
-		if err != nil {
-			logrus.Warnf("libcontainerd: failed to retrieve container %s state: %v", containerID, err)
-		}
-		if ev != nil && (ev.Pid != InitFriendlyName || ev.Type != StateExit) {
-			// Wait a while for the exit event
-			timeout := time.NewTimer(10 * time.Second)
-			tick := time.NewTicker(100 * time.Millisecond)
-		stop:
-			for {
-				select {
-				case <-timeout.C:
-					break stop
-				case <-tick.C:
-					ev, eerr = clnt.getContainerLastEvent(containerID)
-					if eerr != nil {
-						break stop
-					}
-					if ev != nil && ev.Pid == InitFriendlyName && ev.Type == StateExit {
-						break stop
-					}
-				}
-			}
-			timeout.Stop()
-			tick.Stop()
-		}
-
-		// get the exit status for this container, if we don't have
-		// one, indicate an error
-		ec := uint32(255)
-		if eerr == nil && ev != nil && ev.Pid == InitFriendlyName && ev.Type == StateExit {
-			ec = ev.Status
-		}
-		clnt.setExited(containerID, ec)
-
-		return nil
-	}
-
-	// container is still alive
-	if clnt.liveRestore {
-		if err := clnt.restore(cont, ev, attachStdio, options...); err != nil {
-			logrus.Errorf("libcontainerd: error restoring %s: %v", containerID, err)
-		}
-		return nil
-	}
-
-	// Kill the container if liveRestore == false
-	w := clnt.getOrCreateExitNotifier(containerID)
-	clnt.lock(cont.Id)
-	container := clnt.newContainer(cont.BundlePath)
-	container.systemPid = systemPid(cont)
-	clnt.appendContainer(container)
-	clnt.unlock(cont.Id)
-
-	container.discardFifos()
-
-	if err := clnt.Signal(containerID, int(syscall.SIGTERM)); err != nil {
-		logrus.Errorf("libcontainerd: error sending sigterm to %v: %v", containerID, err)
-	}
-	// Let the main loop handle the exit event
-	clnt.remote.Unlock()
-	select {
-	case <-time.After(10 * time.Second):
-		if err := clnt.Signal(containerID, int(syscall.SIGKILL)); err != nil {
-			logrus.Errorf("libcontainerd: error sending sigkill to %v: %v", containerID, err)
-		}
-		select {
-		case <-time.After(2 * time.Second):
-		case <-w.wait():
-			// relock because of the defer
-			clnt.remote.Lock()
-			return nil
-		}
-	case <-w.wait():
-		// relock because of the defer
-		clnt.remote.Lock()
-		return nil
-	}
-	// relock because of the defer
-	clnt.remote.Lock()
-
-	clnt.deleteContainer(containerID)
-
-	return clnt.setExited(containerID, uint32(255))
-}
-
-func (clnt *client) CreateCheckpoint(containerID string, checkpointID string, checkpointDir string, exit bool) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	if _, err := clnt.getContainer(containerID); err != nil {
-		return err
-	}
-
-	_, err := clnt.remote.apiClient.CreateCheckpoint(context.Background(), &containerd.CreateCheckpointRequest{
-		Id: containerID,
-		Checkpoint: &containerd.Checkpoint{
-			Name:        checkpointID,
-			Exit:        exit,
-			Tcp:         true,
-			UnixSockets: true,
-			Shell:       false,
-			EmptyNS:     []string{"network"},
-		},
-		CheckpointDir: checkpointDir,
-	})
-	return err
-}
-
-func (clnt *client) DeleteCheckpoint(containerID string, checkpointID string, checkpointDir string) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	if _, err := clnt.getContainer(containerID); err != nil {
-		return err
-	}
-
-	_, err := clnt.remote.apiClient.DeleteCheckpoint(context.Background(), &containerd.DeleteCheckpointRequest{
-		Id:            containerID,
-		Name:          checkpointID,
-		CheckpointDir: checkpointDir,
-	})
-	return err
-}
-
-func (clnt *client) ListCheckpoints(containerID string, checkpointDir string) (*Checkpoints, error) {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	if _, err := clnt.getContainer(containerID); err != nil {
-		return nil, err
-	}
-
-	resp, err := clnt.remote.apiClient.ListCheckpoint(context.Background(), &containerd.ListCheckpointRequest{
-		Id:            containerID,
-		CheckpointDir: checkpointDir,
-	})
-	if err != nil {
-		return nil, err
-	}
-	return (*Checkpoints)(resp), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/client_solaris.go b/installer/vendor/github.com/docker/docker/libcontainerd/client_solaris.go
deleted file mode 100644
index cb939975f8..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/client_solaris.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package libcontainerd
-
-import "golang.org/x/net/context"
-
-type client struct {
-	clientCommon
-
-	// Platform specific properties below here.
-	remote        *remote
-	q             queue
-	exitNotifiers map[string]*exitNotifier
-	liveRestore   bool
-}
-
-// GetServerVersion returns the connected server version information
-func (clnt *client) GetServerVersion(ctx context.Context) (*ServerVersion, error) {
-	resp, err := clnt.remote.apiClient.GetServerVersion(ctx, &containerd.GetServerVersionRequest{})
-	if err != nil {
-		return nil, err
-	}
-
-	sv := &ServerVersion{
-		GetServerVersionResponse: *resp,
-	}
-
-	return sv, nil
-}
-
-func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendlyName string, specp Process, attachStdio StdioCallback) (int, error) {
-	return -1, nil
-}
-
-func (clnt *client) SignalProcess(containerID string, pid string, sig int) error {
-	return nil
-}
-
-func (clnt *client) Resize(containerID, processFriendlyName string, width, height int) error {
-	return nil
-}
-
-func (clnt *client) Pause(containerID string) error {
-	return nil
-}
-
-func (clnt *client) Resume(containerID string) error {
-	return nil
-}
-
-func (clnt *client) Stats(containerID string) (*Stats, error) {
-	return nil, nil
-}
-
-func (clnt *client) getExitNotifier(containerID string) *exitNotifier {
-	clnt.mapMutex.RLock()
-	defer clnt.mapMutex.RUnlock()
-	return clnt.exitNotifiers[containerID]
-}
-
-func (clnt *client) getOrCreateExitNotifier(containerID string) *exitNotifier {
-	clnt.mapMutex.Lock()
-	defer clnt.mapMutex.Unlock()
-	w, ok := clnt.exitNotifiers[containerID]
-	if !ok {
-		w = &exitNotifier{c: make(chan struct{}), client: clnt}
-		clnt.exitNotifiers[containerID] = w
-	}
-	return w
-}
-
-// Restore is the handler for restoring a container
-func (clnt *client) Restore(containerID string, attachStdio StdioCallback, options ...CreateOption) error {
-	return nil
-}
-
-func (clnt *client) GetPidsForContainer(containerID string) ([]int, error) {
-	return nil, nil
-}
-
-// Summary returns a summary of the processes running in a container.
-func (clnt *client) Summary(containerID string) ([]Summary, error) {
-	return nil, nil
-}
-
-// UpdateResources updates resources for a running container.
-func (clnt *client) UpdateResources(containerID string, resources Resources) error {
-	// Updating resource isn't supported on Solaris
-	// but we should return nil for enabling updating container
-	return nil
-}
-
-func (clnt *client) CreateCheckpoint(containerID string, checkpointID string, checkpointDir string, exit bool) error {
-	return nil
-}
-
-func (clnt *client) DeleteCheckpoint(containerID string, checkpointID string, checkpointDir string) error {
-	return nil
-}
-
-func (clnt *client) ListCheckpoints(containerID string, checkpointDir string) (*Checkpoints, error) {
-	return nil, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/client_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/client_unix.go
deleted file mode 100644
index 21e8fea666..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/client_unix.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// +build linux solaris
-
-package libcontainerd
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/idtools"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"golang.org/x/net/context"
-)
-
-func (clnt *client) prepareBundleDir(uid, gid int) (string, error) {
-	root, err := filepath.Abs(clnt.remote.stateDir)
-	if err != nil {
-		return "", err
-	}
-	if uid == 0 && gid == 0 {
-		return root, nil
-	}
-	p := string(filepath.Separator)
-	for _, d := range strings.Split(root, string(filepath.Separator))[1:] {
-		p = filepath.Join(p, d)
-		fi, err := os.Stat(p)
-		if err != nil && !os.IsNotExist(err) {
-			return "", err
-		}
-		if os.IsNotExist(err) || fi.Mode()&1 == 0 {
-			p = fmt.Sprintf("%s.%d.%d", p, uid, gid)
-			if err := idtools.MkdirAs(p, 0700, uid, gid); err != nil && !os.IsExist(err) {
-				return "", err
-			}
-		}
-	}
-	return p, nil
-}
-
-func (clnt *client) Create(containerID string, checkpoint string, checkpointDir string, spec specs.Spec, attachStdio StdioCallback, options ...CreateOption) (err error) {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-
-	if _, err := clnt.getContainer(containerID); err == nil {
-		return fmt.Errorf("Container %s is already active", containerID)
-	}
-
-	uid, gid, err := getRootIDs(specs.Spec(spec))
-	if err != nil {
-		return err
-	}
-	dir, err := clnt.prepareBundleDir(uid, gid)
-	if err != nil {
-		return err
-	}
-
-	container := clnt.newContainer(filepath.Join(dir, containerID), options...)
-	if err := container.clean(); err != nil {
-		return err
-	}
-
-	defer func() {
-		if err != nil {
-			container.clean()
-			clnt.deleteContainer(containerID)
-		}
-	}()
-
-	if err := idtools.MkdirAllAs(container.dir, 0700, uid, gid); err != nil && !os.IsExist(err) {
-		return err
-	}
-
-	f, err := os.Create(filepath.Join(container.dir, configFilename))
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := json.NewEncoder(f).Encode(spec); err != nil {
-		return err
-	}
-
-	return container.start(checkpoint, checkpointDir, attachStdio)
-}
-
-func (clnt *client) Signal(containerID string, sig int) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	_, err := clnt.remote.apiClient.Signal(context.Background(), &containerd.SignalRequest{
-		Id:     containerID,
-		Pid:    InitFriendlyName,
-		Signal: uint32(sig),
-	})
-	return err
-}
-
-func (clnt *client) newContainer(dir string, options ...CreateOption) *container {
-	container := &container{
-		containerCommon: containerCommon{
-			process: process{
-				dir: dir,
-				processCommon: processCommon{
-					containerID:  filepath.Base(dir),
-					client:       clnt,
-					friendlyName: InitFriendlyName,
-				},
-			},
-			processes: make(map[string]*process),
-		},
-	}
-	for _, option := range options {
-		if err := option.Apply(container); err != nil {
-			logrus.Errorf("libcontainerd: newContainer(): %v", err)
-		}
-	}
-	return container
-}
-
-type exitNotifier struct {
-	id     string
-	client *client
-	c      chan struct{}
-	once   sync.Once
-}
-
-func (en *exitNotifier) close() {
-	en.once.Do(func() {
-		close(en.c)
-		en.client.mapMutex.Lock()
-		if en == en.client.exitNotifiers[en.id] {
-			delete(en.client.exitNotifiers, en.id)
-		}
-		en.client.mapMutex.Unlock()
-	})
-}
-func (en *exitNotifier) wait() <-chan struct{} {
-	return en.c
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/client_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/client_windows.go
deleted file mode 100644
index ddcf321c85..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/client_windows.go
+++ /dev/null
@@ -1,631 +0,0 @@
-package libcontainerd
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"golang.org/x/net/context"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-type client struct {
-	clientCommon
-
-	// Platform specific properties below here (none presently on Windows)
-}
-
-// Win32 error codes that are used for various workarounds
-// These really should be ALL_CAPS to match golangs syscall library and standard
-// Win32 error conventions, but golint insists on CamelCase.
-const (
-	CoEClassstring     = syscall.Errno(0x800401F3) // Invalid class string
-	ErrorNoNetwork     = syscall.Errno(1222)       // The network is not present or not started
-	ErrorBadPathname   = syscall.Errno(161)        // The specified path is invalid
-	ErrorInvalidObject = syscall.Errno(0x800710D8) // The object identifier does not represent a valid object
-)
-
-// defaultOwner is a tag passed to HCS to allow it to differentiate between
-// container creator management stacks. We hard code "docker" in the case
-// of docker.
-const defaultOwner = "docker"
-
-// Create is the entrypoint to create a container from a spec, and if successfully
-// created, start it too. Table below shows the fields required for HCS JSON calling parameters,
-// where if not populated, is omitted.
-// +-----------------+--------------------------------------------+---------------------------------------------------+
-// |                 | Isolation=Process                          | Isolation=Hyper-V                                 |
-// +-----------------+--------------------------------------------+---------------------------------------------------+
-// | VolumePath      | \\?\\Volume{GUIDa}                         |                                                   |
-// | LayerFolderPath | %root%\windowsfilter\containerID           | %root%\windowsfilter\containerID (servicing only) |
-// | Layers[]        | ID=GUIDb;Path=%root%\windowsfilter\layerID | ID=GUIDb;Path=%root%\windowsfilter\layerID        |
-// | SandboxPath     |                                            | %root%\windowsfilter                              |
-// | HvRuntime       |                                            | ImagePath=%root%\BaseLayerID\UtilityVM            |
-// +-----------------+--------------------------------------------+---------------------------------------------------+
-//
-// Isolation=Process example:
-//
-// {
-//	"SystemType": "Container",
-//	"Name": "5e0055c814a6005b8e57ac59f9a522066e0af12b48b3c26a9416e23907698776",
-//	"Owner": "docker",
-//	"IsDummy": false,
-//	"VolumePath": "\\\\\\\\?\\\\Volume{66d1ef4c-7a00-11e6-8948-00155ddbef9d}",
-//	"IgnoreFlushesDuringBoot": true,
-//	"LayerFolderPath": "C:\\\\control\\\\windowsfilter\\\\5e0055c814a6005b8e57ac59f9a522066e0af12b48b3c26a9416e23907698776",
-//	"Layers": [{
-//		"ID": "18955d65-d45a-557b-bf1c-49d6dfefc526",
-//		"Path": "C:\\\\control\\\\windowsfilter\\\\65bf96e5760a09edf1790cb229e2dfb2dbd0fcdc0bf7451bae099106bfbfea0c"
-//	}],
-//	"HostName": "5e0055c814a6",
-//	"MappedDirectories": [],
-//	"HvPartition": false,
-//	"EndpointList": ["eef2649d-bb17-4d53-9937-295a8efe6f2c"],
-//	"Servicing": false
-//}
-//
-// Isolation=Hyper-V example:
-//
-//{
-//	"SystemType": "Container",
-//	"Name": "475c2c58933b72687a88a441e7e0ca4bd72d76413c5f9d5031fee83b98f6045d",
-//	"Owner": "docker",
-//	"IsDummy": false,
-//	"IgnoreFlushesDuringBoot": true,
-//	"Layers": [{
-//		"ID": "18955d65-d45a-557b-bf1c-49d6dfefc526",
-//		"Path": "C:\\\\control\\\\windowsfilter\\\\65bf96e5760a09edf1790cb229e2dfb2dbd0fcdc0bf7451bae099106bfbfea0c"
-//	}],
-//	"HostName": "475c2c58933b",
-//	"MappedDirectories": [],
-//	"SandboxPath": "C:\\\\control\\\\windowsfilter",
-//	"HvPartition": true,
-//	"EndpointList": ["e1bb1e61-d56f-405e-b75d-fd520cefa0cb"],
-//	"HvRuntime": {
-//		"ImagePath": "C:\\\\control\\\\windowsfilter\\\\65bf96e5760a09edf1790cb229e2dfb2dbd0fcdc0bf7451bae099106bfbfea0c\\\\UtilityVM"
-//	},
-//	"Servicing": false
-//}
-func (clnt *client) Create(containerID string, checkpoint string, checkpointDir string, spec specs.Spec, attachStdio StdioCallback, options ...CreateOption) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	logrus.Debugln("libcontainerd: client.Create() with spec", spec)
-
-	configuration := &hcsshim.ContainerConfig{
-		SystemType: "Container",
-		Name:       containerID,
-		Owner:      defaultOwner,
-		IgnoreFlushesDuringBoot: false,
-		HostName:                spec.Hostname,
-		HvPartition:             false,
-	}
-
-	if spec.Windows.Resources != nil {
-		if spec.Windows.Resources.CPU != nil {
-			if spec.Windows.Resources.CPU.Count != nil {
-				// This check is being done here rather than in adaptContainerSettings
-				// because we don't want to update the HostConfig in case this container
-				// is moved to a host with more CPUs than this one.
-				cpuCount := *spec.Windows.Resources.CPU.Count
-				hostCPUCount := uint64(sysinfo.NumCPU())
-				if cpuCount > hostCPUCount {
-					logrus.Warnf("Changing requested CPUCount of %d to current number of processors, %d", cpuCount, hostCPUCount)
-					cpuCount = hostCPUCount
-				}
-				configuration.ProcessorCount = uint32(cpuCount)
-			}
-			if spec.Windows.Resources.CPU.Shares != nil {
-				configuration.ProcessorWeight = uint64(*spec.Windows.Resources.CPU.Shares)
-			}
-			if spec.Windows.Resources.CPU.Percent != nil {
-				configuration.ProcessorMaximum = int64(*spec.Windows.Resources.CPU.Percent) * 100 // ProcessorMaximum is a value between 1 and 10000
-			}
-		}
-		if spec.Windows.Resources.Memory != nil {
-			if spec.Windows.Resources.Memory.Limit != nil {
-				configuration.MemoryMaximumInMB = int64(*spec.Windows.Resources.Memory.Limit) / 1024 / 1024
-			}
-		}
-		if spec.Windows.Resources.Storage != nil {
-			if spec.Windows.Resources.Storage.Bps != nil {
-				configuration.StorageBandwidthMaximum = *spec.Windows.Resources.Storage.Bps
-			}
-			if spec.Windows.Resources.Storage.Iops != nil {
-				configuration.StorageIOPSMaximum = *spec.Windows.Resources.Storage.Iops
-			}
-		}
-	}
-
-	var layerOpt *LayerOption
-	for _, option := range options {
-		if s, ok := option.(*ServicingOption); ok {
-			configuration.Servicing = s.IsServicing
-			continue
-		}
-		if f, ok := option.(*FlushOption); ok {
-			configuration.IgnoreFlushesDuringBoot = f.IgnoreFlushesDuringBoot
-			continue
-		}
-		if h, ok := option.(*HyperVIsolationOption); ok {
-			configuration.HvPartition = h.IsHyperV
-			configuration.SandboxPath = h.SandboxPath
-			continue
-		}
-		if l, ok := option.(*LayerOption); ok {
-			layerOpt = l
-		}
-		if n, ok := option.(*NetworkEndpointsOption); ok {
-			configuration.EndpointList = n.Endpoints
-			configuration.AllowUnqualifiedDNSQuery = n.AllowUnqualifiedDNSQuery
-			continue
-		}
-		if c, ok := option.(*CredentialsOption); ok {
-			configuration.Credentials = c.Credentials
-			continue
-		}
-	}
-
-	// We must have a layer option with at least one path
-	if layerOpt == nil || layerOpt.LayerPaths == nil {
-		return fmt.Errorf("no layer option or paths were supplied to the runtime")
-	}
-
-	if configuration.HvPartition {
-		// Find the upper-most utility VM image, since the utility VM does not
-		// use layering in RS1.
-		// TODO @swernli/jhowardmsft at some point post RS1 this may be re-locatable.
-		var uvmImagePath string
-		for _, path := range layerOpt.LayerPaths {
-			fullPath := filepath.Join(path, "UtilityVM")
-			_, err := os.Stat(fullPath)
-			if err == nil {
-				uvmImagePath = fullPath
-				break
-			}
-			if !os.IsNotExist(err) {
-				return err
-			}
-		}
-		if uvmImagePath == "" {
-			return errors.New("utility VM image could not be found")
-		}
-		configuration.HvRuntime = &hcsshim.HvRuntime{ImagePath: uvmImagePath}
-	} else {
-		configuration.VolumePath = spec.Root.Path
-	}
-
-	configuration.LayerFolderPath = layerOpt.LayerFolderPath
-
-	for _, layerPath := range layerOpt.LayerPaths {
-		_, filename := filepath.Split(layerPath)
-		g, err := hcsshim.NameToGuid(filename)
-		if err != nil {
-			return err
-		}
-		configuration.Layers = append(configuration.Layers, hcsshim.Layer{
-			ID:   g.ToString(),
-			Path: layerPath,
-		})
-	}
-
-	// Add the mounts (volumes, bind mounts etc) to the structure
-	mds := make([]hcsshim.MappedDir, len(spec.Mounts))
-	for i, mount := range spec.Mounts {
-		mds[i] = hcsshim.MappedDir{
-			HostPath:      mount.Source,
-			ContainerPath: mount.Destination,
-			ReadOnly:      false,
-		}
-		for _, o := range mount.Options {
-			if strings.ToLower(o) == "ro" {
-				mds[i].ReadOnly = true
-			}
-		}
-	}
-	configuration.MappedDirectories = mds
-
-	hcsContainer, err := hcsshim.CreateContainer(containerID, configuration)
-	if err != nil {
-		return err
-	}
-
-	// Construct a container object for calling start on it.
-	container := &container{
-		containerCommon: containerCommon{
-			process: process{
-				processCommon: processCommon{
-					containerID:  containerID,
-					client:       clnt,
-					friendlyName: InitFriendlyName,
-				},
-				commandLine: strings.Join(spec.Process.Args, " "),
-			},
-			processes: make(map[string]*process),
-		},
-		ociSpec:      spec,
-		hcsContainer: hcsContainer,
-	}
-
-	container.options = options
-	for _, option := range options {
-		if err := option.Apply(container); err != nil {
-			logrus.Errorf("libcontainerd: %v", err)
-		}
-	}
-
-	// Call start, and if it fails, delete the container from our
-	// internal structure, start will keep HCS in sync by deleting the
-	// container there.
-	logrus.Debugf("libcontainerd: Create() id=%s, Calling start()", containerID)
-	if err := container.start(attachStdio); err != nil {
-		clnt.deleteContainer(containerID)
-		return err
-	}
-
-	logrus.Debugf("libcontainerd: Create() id=%s completed successfully", containerID)
-	return nil
-
-}
-
-// AddProcess is the handler for adding a process to an already running
-// container. It's called through docker exec. It returns the system pid of the
-// exec'd process.
-func (clnt *client) AddProcess(ctx context.Context, containerID, processFriendlyName string, procToAdd Process, attachStdio StdioCallback) (int, error) {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return -1, err
-	}
-	// Note we always tell HCS to
-	// create stdout as it's required regardless of '-i' or '-t' options, so that
-	// docker can always grab the output through logs. We also tell HCS to always
-	// create stdin, even if it's not used - it will be closed shortly. Stderr
-	// is only created if it we're not -t.
-	createProcessParms := hcsshim.ProcessConfig{
-		EmulateConsole:   procToAdd.Terminal,
-		CreateStdInPipe:  true,
-		CreateStdOutPipe: true,
-		CreateStdErrPipe: !procToAdd.Terminal,
-	}
-	createProcessParms.ConsoleSize[0] = uint(procToAdd.ConsoleSize.Height)
-	createProcessParms.ConsoleSize[1] = uint(procToAdd.ConsoleSize.Width)
-
-	// Take working directory from the process to add if it is defined,
-	// otherwise take from the first process.
-	if procToAdd.Cwd != "" {
-		createProcessParms.WorkingDirectory = procToAdd.Cwd
-	} else {
-		createProcessParms.WorkingDirectory = container.ociSpec.Process.Cwd
-	}
-
-	// Configure the environment for the process
-	createProcessParms.Environment = setupEnvironmentVariables(procToAdd.Env)
-	createProcessParms.CommandLine = strings.Join(procToAdd.Args, " ")
-	createProcessParms.User = procToAdd.User.Username
-
-	logrus.Debugf("libcontainerd: commandLine: %s", createProcessParms.CommandLine)
-
-	// Start the command running in the container.
-	var stdout, stderr io.ReadCloser
-	var stdin io.WriteCloser
-	newProcess, err := container.hcsContainer.CreateProcess(&createProcessParms)
-	if err != nil {
-		logrus.Errorf("libcontainerd: AddProcess(%s) CreateProcess() failed %s", containerID, err)
-		return -1, err
-	}
-
-	pid := newProcess.Pid()
-
-	stdin, stdout, stderr, err = newProcess.Stdio()
-	if err != nil {
-		logrus.Errorf("libcontainerd: %s getting std pipes failed %s", containerID, err)
-		return -1, err
-	}
-
-	iopipe := &IOPipe{Terminal: procToAdd.Terminal}
-	iopipe.Stdin = createStdInCloser(stdin, newProcess)
-
-	// Convert io.ReadClosers to io.Readers
-	if stdout != nil {
-		iopipe.Stdout = ioutil.NopCloser(&autoClosingReader{ReadCloser: stdout})
-	}
-	if stderr != nil {
-		iopipe.Stderr = ioutil.NopCloser(&autoClosingReader{ReadCloser: stderr})
-	}
-
-	proc := &process{
-		processCommon: processCommon{
-			containerID:  containerID,
-			friendlyName: processFriendlyName,
-			client:       clnt,
-			systemPid:    uint32(pid),
-		},
-		commandLine: createProcessParms.CommandLine,
-		hcsProcess:  newProcess,
-	}
-
-	// Add the process to the container's list of processes
-	container.processes[processFriendlyName] = proc
-
-	// Tell the engine to attach streams back to the client
-	if err := attachStdio(*iopipe); err != nil {
-		return -1, err
-	}
-
-	// Spin up a go routine waiting for exit to handle cleanup
-	go container.waitExit(proc, false)
-
-	return pid, nil
-}
-
-// Signal handles `docker stop` on Windows. While Linux has support for
-// the full range of signals, signals aren't really implemented on Windows.
-// We fake supporting regular stop and -9 to force kill.
-func (clnt *client) Signal(containerID string, sig int) error {
-	var (
-		cont *container
-		err  error
-	)
-
-	// Get the container as we need it to get the container handle.
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	if cont, err = clnt.getContainer(containerID); err != nil {
-		return err
-	}
-
-	cont.manualStopRequested = true
-
-	logrus.Debugf("libcontainerd: Signal() containerID=%s sig=%d pid=%d", containerID, sig, cont.systemPid)
-
-	if syscall.Signal(sig) == syscall.SIGKILL {
-		// Terminate the compute system
-		if err := cont.hcsContainer.Terminate(); err != nil {
-			if !hcsshim.IsPending(err) {
-				logrus.Errorf("libcontainerd: failed to terminate %s - %q", containerID, err)
-			}
-		}
-	} else {
-		// Terminate Process
-		if err := cont.hcsProcess.Kill(); err != nil && !hcsshim.IsAlreadyStopped(err) {
-			// ignore errors
-			logrus.Warnf("libcontainerd: failed to terminate pid %d in %s: %q", cont.systemPid, containerID, err)
-		}
-	}
-
-	return nil
-}
-
-// While Linux has support for the full range of signals, signals aren't really implemented on Windows.
-// We try to terminate the specified process whatever signal is requested.
-func (clnt *client) SignalProcess(containerID string, processFriendlyName string, sig int) error {
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	cont, err := clnt.getContainer(containerID)
-	if err != nil {
-		return err
-	}
-
-	for _, p := range cont.processes {
-		if p.friendlyName == processFriendlyName {
-			return p.hcsProcess.Kill()
-		}
-	}
-
-	return fmt.Errorf("SignalProcess could not find process %s in %s", processFriendlyName, containerID)
-}
-
-// Resize handles a CLI event to resize an interactive docker run or docker exec
-// window.
-func (clnt *client) Resize(containerID, processFriendlyName string, width, height int) error {
-	// Get the libcontainerd container object
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	cont, err := clnt.getContainer(containerID)
-	if err != nil {
-		return err
-	}
-
-	h, w := uint16(height), uint16(width)
-
-	if processFriendlyName == InitFriendlyName {
-		logrus.Debugln("libcontainerd: resizing systemPID in", containerID, cont.process.systemPid)
-		return cont.process.hcsProcess.ResizeConsole(w, h)
-	}
-
-	for _, p := range cont.processes {
-		if p.friendlyName == processFriendlyName {
-			logrus.Debugln("libcontainerd: resizing exec'd process", containerID, p.systemPid)
-			return p.hcsProcess.ResizeConsole(w, h)
-		}
-	}
-
-	return fmt.Errorf("Resize could not find containerID %s to resize", containerID)
-
-}
-
-// Pause handles pause requests for containers
-func (clnt *client) Pause(containerID string) error {
-	unlockContainer := true
-	// Get the libcontainerd container object
-	clnt.lock(containerID)
-	defer func() {
-		if unlockContainer {
-			clnt.unlock(containerID)
-		}
-	}()
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return err
-	}
-
-	for _, option := range container.options {
-		if h, ok := option.(*HyperVIsolationOption); ok {
-			if !h.IsHyperV {
-				return errors.New("cannot pause Windows Server Containers")
-			}
-			break
-		}
-	}
-
-	err = container.hcsContainer.Pause()
-	if err != nil {
-		return err
-	}
-
-	// Unlock container before calling back into the daemon
-	unlockContainer = false
-	clnt.unlock(containerID)
-
-	return clnt.backend.StateChanged(containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State: StatePause,
-		}})
-}
-
-// Resume handles resume requests for containers
-func (clnt *client) Resume(containerID string) error {
-	unlockContainer := true
-	// Get the libcontainerd container object
-	clnt.lock(containerID)
-	defer func() {
-		if unlockContainer {
-			clnt.unlock(containerID)
-		}
-	}()
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return err
-	}
-
-	// This should never happen, since Windows Server Containers cannot be paused
-	for _, option := range container.options {
-		if h, ok := option.(*HyperVIsolationOption); ok {
-			if !h.IsHyperV {
-				return errors.New("cannot resume Windows Server Containers")
-			}
-			break
-		}
-	}
-
-	err = container.hcsContainer.Resume()
-	if err != nil {
-		return err
-	}
-
-	// Unlock container before calling back into the daemon
-	unlockContainer = false
-	clnt.unlock(containerID)
-
-	return clnt.backend.StateChanged(containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State: StateResume,
-		}})
-}
-
-// Stats handles stats requests for containers
-func (clnt *client) Stats(containerID string) (*Stats, error) {
-	// Get the libcontainerd container object
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-	s, err := container.hcsContainer.Statistics()
-	if err != nil {
-		return nil, err
-	}
-	st := Stats(s)
-	return &st, nil
-}
-
-// Restore is the handler for restoring a container
-func (clnt *client) Restore(containerID string, _ StdioCallback, unusedOnWindows ...CreateOption) error {
-	// TODO Windows: Implement this. For now, just tell the backend the container exited.
-	logrus.Debugf("libcontainerd: Restore(%s)", containerID)
-	return clnt.backend.StateChanged(containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State:    StateExit,
-			ExitCode: 1 << 31,
-		}})
-}
-
-// GetPidsForContainer returns a list of process IDs running in a container.
-// Although implemented, this is not used in Windows.
-func (clnt *client) GetPidsForContainer(containerID string) ([]int, error) {
-	var pids []int
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	cont, err := clnt.getContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Add the first process
-	pids = append(pids, int(cont.containerCommon.systemPid))
-	// And add all the exec'd processes
-	for _, p := range cont.processes {
-		pids = append(pids, int(p.processCommon.systemPid))
-	}
-	return pids, nil
-}
-
-// Summary returns a summary of the processes running in a container.
-// This is present in Windows to support docker top. In linux, the
-// engine shells out to ps to get process information. On Windows, as
-// the containers could be Hyper-V containers, they would not be
-// visible on the container host. However, libcontainerd does have
-// that information.
-func (clnt *client) Summary(containerID string) ([]Summary, error) {
-
-	// Get the libcontainerd container object
-	clnt.lock(containerID)
-	defer clnt.unlock(containerID)
-	container, err := clnt.getContainer(containerID)
-	if err != nil {
-		return nil, err
-	}
-	p, err := container.hcsContainer.ProcessList()
-	if err != nil {
-		return nil, err
-	}
-	pl := make([]Summary, len(p))
-	for i := range p {
-		pl[i] = Summary(p[i])
-	}
-	return pl, nil
-}
-
-// UpdateResources updates resources for a running container.
-func (clnt *client) UpdateResources(containerID string, resources Resources) error {
-	// Updating resource isn't supported on Windows
-	// but we should return nil for enabling updating container
-	return nil
-}
-
-func (clnt *client) CreateCheckpoint(containerID string, checkpointID string, checkpointDir string, exit bool) error {
-	return errors.New("Windows: Containers do not support checkpoints")
-}
-
-func (clnt *client) DeleteCheckpoint(containerID string, checkpointID string, checkpointDir string) error {
-	return errors.New("Windows: Containers do not support checkpoints")
-}
-
-func (clnt *client) ListCheckpoints(containerID string, checkpointDir string) (*Checkpoints, error) {
-	return nil, errors.New("Windows: Containers do not support checkpoints")
-}
-
-func (clnt *client) GetServerVersion(ctx context.Context) (*ServerVersion, error) {
-	return &ServerVersion{}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/container.go b/installer/vendor/github.com/docker/docker/libcontainerd/container.go
deleted file mode 100644
index b40321389a..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/container.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package libcontainerd
-
-const (
-	// InitFriendlyName is the name given in the lookup map of processes
-	// for the first process started in a container.
-	InitFriendlyName = "init"
-	configFilename   = "config.json"
-)
-
-type containerCommon struct {
-	process
-	processes map[string]*process
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/container_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/container_unix.go
deleted file mode 100644
index 61bab145f2..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/container_unix.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// +build linux solaris
-
-package libcontainerd
-
-import (
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/ioutils"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/tonistiigi/fifo"
-	"golang.org/x/net/context"
-)
-
-type container struct {
-	containerCommon
-
-	// Platform specific fields are below here.
-	pauseMonitor
-	oom         bool
-	runtime     string
-	runtimeArgs []string
-}
-
-type runtime struct {
-	path string
-	args []string
-}
-
-// WithRuntime sets the runtime to be used for the created container
-func WithRuntime(path string, args []string) CreateOption {
-	return runtime{path, args}
-}
-
-func (rt runtime) Apply(p interface{}) error {
-	if pr, ok := p.(*container); ok {
-		pr.runtime = rt.path
-		pr.runtimeArgs = rt.args
-	}
-	return nil
-}
-
-func (ctr *container) clean() error {
-	if os.Getenv("LIBCONTAINERD_NOCLEAN") == "1" {
-		return nil
-	}
-	if _, err := os.Lstat(ctr.dir); err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-
-	if err := os.RemoveAll(ctr.dir); err != nil {
-		return err
-	}
-	return nil
-}
-
-// cleanProcess removes the fifos used by an additional process.
-// Caller needs to lock container ID before calling this method.
-func (ctr *container) cleanProcess(id string) {
-	if p, ok := ctr.processes[id]; ok {
-		for _, i := range []int{syscall.Stdin, syscall.Stdout, syscall.Stderr} {
-			if err := os.Remove(p.fifo(i)); err != nil && !os.IsNotExist(err) {
-				logrus.Warnf("libcontainerd: failed to remove %v for process %v: %v", p.fifo(i), id, err)
-			}
-		}
-	}
-	delete(ctr.processes, id)
-}
-
-func (ctr *container) spec() (*specs.Spec, error) {
-	var spec specs.Spec
-	dt, err := ioutil.ReadFile(filepath.Join(ctr.dir, configFilename))
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(dt, &spec); err != nil {
-		return nil, err
-	}
-	return &spec, nil
-}
-
-func (ctr *container) start(checkpoint string, checkpointDir string, attachStdio StdioCallback) (err error) {
-	spec, err := ctr.spec()
-	if err != nil {
-		return nil
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-	ready := make(chan struct{})
-
-	fifoCtx, cancel := context.WithCancel(context.Background())
-	defer func() {
-		if err != nil {
-			cancel()
-		}
-	}()
-
-	iopipe, err := ctr.openFifos(fifoCtx, spec.Process.Terminal)
-	if err != nil {
-		return err
-	}
-
-	var stdinOnce sync.Once
-
-	// we need to delay stdin closure after container start or else "stdin close"
-	// event will be rejected by containerd.
-	// stdin closure happens in attachStdio
-	stdin := iopipe.Stdin
-	iopipe.Stdin = ioutils.NewWriteCloserWrapper(stdin, func() error {
-		var err error
-		stdinOnce.Do(func() { // on error from attach we don't know if stdin was already closed
-			err = stdin.Close()
-			go func() {
-				select {
-				case <-ready:
-				case <-ctx.Done():
-				}
-				select {
-				case <-ready:
-					if err := ctr.sendCloseStdin(); err != nil {
-						logrus.Warnf("failed to close stdin: %+v", err)
-					}
-				default:
-				}
-			}()
-		})
-		return err
-	})
-
-	r := &containerd.CreateContainerRequest{
-		Id:            ctr.containerID,
-		BundlePath:    ctr.dir,
-		Stdin:         ctr.fifo(syscall.Stdin),
-		Stdout:        ctr.fifo(syscall.Stdout),
-		Stderr:        ctr.fifo(syscall.Stderr),
-		Checkpoint:    checkpoint,
-		CheckpointDir: checkpointDir,
-		// check to see if we are running in ramdisk to disable pivot root
-		NoPivotRoot: os.Getenv("DOCKER_RAMDISK") != "",
-		Runtime:     ctr.runtime,
-		RuntimeArgs: ctr.runtimeArgs,
-	}
-	ctr.client.appendContainer(ctr)
-
-	if err := attachStdio(*iopipe); err != nil {
-		ctr.closeFifos(iopipe)
-		return err
-	}
-
-	resp, err := ctr.client.remote.apiClient.CreateContainer(context.Background(), r)
-	if err != nil {
-		ctr.closeFifos(iopipe)
-		return err
-	}
-	ctr.systemPid = systemPid(resp.Container)
-	close(ready)
-
-	return ctr.client.backend.StateChanged(ctr.containerID, StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State: StateStart,
-			Pid:   ctr.systemPid,
-		}})
-}
-
-func (ctr *container) newProcess(friendlyName string) *process {
-	return &process{
-		dir: ctr.dir,
-		processCommon: processCommon{
-			containerID:  ctr.containerID,
-			friendlyName: friendlyName,
-			client:       ctr.client,
-		},
-	}
-}
-
-func (ctr *container) handleEvent(e *containerd.Event) error {
-	ctr.client.lock(ctr.containerID)
-	defer ctr.client.unlock(ctr.containerID)
-	switch e.Type {
-	case StateExit, StatePause, StateResume, StateOOM:
-		st := StateInfo{
-			CommonStateInfo: CommonStateInfo{
-				State:    e.Type,
-				ExitCode: e.Status,
-			},
-			OOMKilled: e.Type == StateExit && ctr.oom,
-		}
-		if e.Type == StateOOM {
-			ctr.oom = true
-		}
-		if e.Type == StateExit && e.Pid != InitFriendlyName {
-			st.ProcessID = e.Pid
-			st.State = StateExitProcess
-		}
-
-		// Remove process from list if we have exited
-		switch st.State {
-		case StateExit:
-			ctr.clean()
-			ctr.client.deleteContainer(e.Id)
-		case StateExitProcess:
-			ctr.cleanProcess(st.ProcessID)
-		}
-		ctr.client.q.append(e.Id, func() {
-			if err := ctr.client.backend.StateChanged(e.Id, st); err != nil {
-				logrus.Errorf("libcontainerd: backend.StateChanged(): %v", err)
-			}
-			if e.Type == StatePause || e.Type == StateResume {
-				ctr.pauseMonitor.handle(e.Type)
-			}
-			if e.Type == StateExit {
-				if en := ctr.client.getExitNotifier(e.Id); en != nil {
-					en.close()
-				}
-			}
-		})
-
-	default:
-		logrus.Debugf("libcontainerd: event unhandled: %+v", e)
-	}
-	return nil
-}
-
-// discardFifos attempts to fully read the container fifos to unblock processes
-// that may be blocked on the writer side.
-func (ctr *container) discardFifos() {
-	ctx, _ := context.WithTimeout(context.Background(), 3*time.Second)
-	for _, i := range []int{syscall.Stdout, syscall.Stderr} {
-		f, err := fifo.OpenFifo(ctx, ctr.fifo(i), syscall.O_RDONLY|syscall.O_NONBLOCK, 0)
-		if err != nil {
-			logrus.Warnf("error opening fifo %v for discarding: %+v", f, err)
-			continue
-		}
-		go func() {
-			io.Copy(ioutil.Discard, f)
-		}()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/container_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/container_windows.go
deleted file mode 100644
index 9b1965099a..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/container_windows.go
+++ /dev/null
@@ -1,311 +0,0 @@
-package libcontainerd
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/Sirupsen/logrus"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-type container struct {
-	containerCommon
-
-	// Platform specific fields are below here. There are none presently on Windows.
-	options []CreateOption
-
-	// The ociSpec is required, as client.Create() needs a spec,
-	// but can be called from the RestartManager context which does not
-	// otherwise have access to the Spec
-	ociSpec specs.Spec
-
-	manualStopRequested bool
-	hcsContainer        hcsshim.Container
-}
-
-func (ctr *container) newProcess(friendlyName string) *process {
-	return &process{
-		processCommon: processCommon{
-			containerID:  ctr.containerID,
-			friendlyName: friendlyName,
-			client:       ctr.client,
-		},
-	}
-}
-
-// start starts a created container.
-// Caller needs to lock container ID before calling this method.
-func (ctr *container) start(attachStdio StdioCallback) error {
-	var err error
-	isServicing := false
-
-	for _, option := range ctr.options {
-		if s, ok := option.(*ServicingOption); ok && s.IsServicing {
-			isServicing = true
-		}
-	}
-
-	// Start the container.  If this is a servicing container, this call will block
-	// until the container is done with the servicing execution.
-	logrus.Debugln("libcontainerd: starting container ", ctr.containerID)
-	if err = ctr.hcsContainer.Start(); err != nil {
-		logrus.Errorf("libcontainerd: failed to start container: %s", err)
-		if err := ctr.terminate(); err != nil {
-			logrus.Errorf("libcontainerd: failed to cleanup after a failed Start. %s", err)
-		} else {
-			logrus.Debugln("libcontainerd: cleaned up after failed Start by calling Terminate")
-		}
-		return err
-	}
-
-	// Note we always tell HCS to
-	// create stdout as it's required regardless of '-i' or '-t' options, so that
-	// docker can always grab the output through logs. We also tell HCS to always
-	// create stdin, even if it's not used - it will be closed shortly. Stderr
-	// is only created if it we're not -t.
-	createProcessParms := &hcsshim.ProcessConfig{
-		EmulateConsole:   ctr.ociSpec.Process.Terminal,
-		WorkingDirectory: ctr.ociSpec.Process.Cwd,
-		CreateStdInPipe:  !isServicing,
-		CreateStdOutPipe: !isServicing,
-		CreateStdErrPipe: !ctr.ociSpec.Process.Terminal && !isServicing,
-	}
-	createProcessParms.ConsoleSize[0] = uint(ctr.ociSpec.Process.ConsoleSize.Height)
-	createProcessParms.ConsoleSize[1] = uint(ctr.ociSpec.Process.ConsoleSize.Width)
-
-	// Configure the environment for the process
-	createProcessParms.Environment = setupEnvironmentVariables(ctr.ociSpec.Process.Env)
-	createProcessParms.CommandLine = strings.Join(ctr.ociSpec.Process.Args, " ")
-	createProcessParms.User = ctr.ociSpec.Process.User.Username
-
-	// Start the command running in the container.
-	newProcess, err := ctr.hcsContainer.CreateProcess(createProcessParms)
-	if err != nil {
-		logrus.Errorf("libcontainerd: CreateProcess() failed %s", err)
-		if err := ctr.terminate(); err != nil {
-			logrus.Errorf("libcontainerd: failed to cleanup after a failed CreateProcess. %s", err)
-		} else {
-			logrus.Debugln("libcontainerd: cleaned up after failed CreateProcess by calling Terminate")
-		}
-		return err
-	}
-
-	pid := newProcess.Pid()
-
-	// Save the hcs Process and PID
-	ctr.process.friendlyName = InitFriendlyName
-	ctr.process.hcsProcess = newProcess
-
-	// If this is a servicing container, wait on the process synchronously here and
-	// if it succeeds, wait for it cleanly shutdown and merge into the parent container.
-	if isServicing {
-		exitCode := ctr.waitProcessExitCode(&ctr.process)
-
-		if exitCode != 0 {
-			if err := ctr.terminate(); err != nil {
-				logrus.Warnf("libcontainerd: terminating servicing container %s failed: %s", ctr.containerID, err)
-			}
-			return fmt.Errorf("libcontainerd: servicing container %s returned non-zero exit code %d", ctr.containerID, exitCode)
-		}
-
-		return ctr.hcsContainer.WaitTimeout(time.Minute * 5)
-	}
-
-	var stdout, stderr io.ReadCloser
-	var stdin io.WriteCloser
-	stdin, stdout, stderr, err = newProcess.Stdio()
-	if err != nil {
-		logrus.Errorf("libcontainerd: failed to get stdio pipes: %s", err)
-		if err := ctr.terminate(); err != nil {
-			logrus.Errorf("libcontainerd: failed to cleanup after a failed Stdio. %s", err)
-		}
-		return err
-	}
-
-	iopipe := &IOPipe{Terminal: ctr.ociSpec.Process.Terminal}
-
-	iopipe.Stdin = createStdInCloser(stdin, newProcess)
-
-	// Convert io.ReadClosers to io.Readers
-	if stdout != nil {
-		iopipe.Stdout = ioutil.NopCloser(&autoClosingReader{ReadCloser: stdout})
-	}
-	if stderr != nil {
-		iopipe.Stderr = ioutil.NopCloser(&autoClosingReader{ReadCloser: stderr})
-	}
-
-	// Save the PID
-	logrus.Debugf("libcontainerd: process started - PID %d", pid)
-	ctr.systemPid = uint32(pid)
-
-	// Spin up a go routine waiting for exit to handle cleanup
-	go ctr.waitExit(&ctr.process, true)
-
-	ctr.client.appendContainer(ctr)
-
-	if err := attachStdio(*iopipe); err != nil {
-		// OK to return the error here, as waitExit will handle tear-down in HCS
-		return err
-	}
-
-	// Tell the docker engine that the container has started.
-	si := StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State: StateStart,
-			Pid:   ctr.systemPid, // Not sure this is needed? Double-check monitor.go in daemon BUGBUG @jhowardmsft
-		}}
-	logrus.Debugf("libcontainerd: start() completed OK, %+v", si)
-	return ctr.client.backend.StateChanged(ctr.containerID, si)
-
-}
-
-// waitProcessExitCode will wait for the given process to exit and return its error code.
-func (ctr *container) waitProcessExitCode(process *process) int {
-	// Block indefinitely for the process to exit.
-	err := process.hcsProcess.Wait()
-	if err != nil {
-		if herr, ok := err.(*hcsshim.ProcessError); ok && herr.Err != syscall.ERROR_BROKEN_PIPE {
-			logrus.Warnf("libcontainerd: Wait() failed (container may have been killed): %s", err)
-		}
-		// Fall through here, do not return. This ensures we attempt to continue the
-		// shutdown in HCS and tell the docker engine that the process/container
-		// has exited to avoid a container being dropped on the floor.
-	}
-
-	exitCode, err := process.hcsProcess.ExitCode()
-	if err != nil {
-		if herr, ok := err.(*hcsshim.ProcessError); ok && herr.Err != syscall.ERROR_BROKEN_PIPE {
-			logrus.Warnf("libcontainerd: unable to get exit code from container %s", ctr.containerID)
-		}
-		// Since we got an error retrieving the exit code, make sure that the code we return
-		// doesn't incorrectly indicate success.
-		exitCode = -1
-
-		// Fall through here, do not return. This ensures we attempt to continue the
-		// shutdown in HCS and tell the docker engine that the process/container
-		// has exited to avoid a container being dropped on the floor.
-	}
-
-	return exitCode
-}
-
-// waitExit runs as a goroutine waiting for the process to exit. It's
-// equivalent to (in the linux containerd world) where events come in for
-// state change notifications from containerd.
-func (ctr *container) waitExit(process *process, isFirstProcessToStart bool) error {
-	logrus.Debugln("libcontainerd: waitExit() on pid", process.systemPid)
-
-	exitCode := ctr.waitProcessExitCode(process)
-	// Lock the container while shutting down
-	ctr.client.lock(ctr.containerID)
-
-	// Assume the container has exited
-	si := StateInfo{
-		CommonStateInfo: CommonStateInfo{
-			State:     StateExit,
-			ExitCode:  uint32(exitCode),
-			Pid:       process.systemPid,
-			ProcessID: process.friendlyName,
-		},
-		UpdatePending: false,
-	}
-
-	// But it could have been an exec'd process which exited
-	if !isFirstProcessToStart {
-		si.State = StateExitProcess
-		ctr.cleanProcess(process.friendlyName)
-	} else {
-		updatePending, err := ctr.hcsContainer.HasPendingUpdates()
-		if err != nil {
-			logrus.Warnf("libcontainerd: HasPendingUpdates() failed (container may have been killed): %s", err)
-		} else {
-			si.UpdatePending = updatePending
-		}
-
-		logrus.Debugf("libcontainerd: shutting down container %s", ctr.containerID)
-		if err := ctr.shutdown(); err != nil {
-			logrus.Debugf("libcontainerd: failed to shutdown container %s", ctr.containerID)
-		} else {
-			logrus.Debugf("libcontainerd: completed shutting down container %s", ctr.containerID)
-		}
-		if err := ctr.hcsContainer.Close(); err != nil {
-			logrus.Error(err)
-		}
-
-		// Remove process from list if we have exited
-		if si.State == StateExit {
-			ctr.client.deleteContainer(ctr.containerID)
-		}
-	}
-
-	if err := process.hcsProcess.Close(); err != nil {
-		logrus.Errorf("libcontainerd: hcsProcess.Close(): %v", err)
-	}
-
-	// Unlock here before we call back into the daemon to update state
-	ctr.client.unlock(ctr.containerID)
-
-	// Call into the backend to notify it of the state change.
-	logrus.Debugf("libcontainerd: waitExit() calling backend.StateChanged %+v", si)
-	if err := ctr.client.backend.StateChanged(ctr.containerID, si); err != nil {
-		logrus.Error(err)
-	}
-
-	logrus.Debugf("libcontainerd: waitExit() completed OK, %+v", si)
-
-	return nil
-}
-
-// cleanProcess removes process from the map.
-// Caller needs to lock container ID before calling this method.
-func (ctr *container) cleanProcess(id string) {
-	delete(ctr.processes, id)
-}
-
-// shutdown shuts down the container in HCS
-// Caller needs to lock container ID before calling this method.
-func (ctr *container) shutdown() error {
-	const shutdownTimeout = time.Minute * 5
-	err := ctr.hcsContainer.Shutdown()
-	if hcsshim.IsPending(err) {
-		// Explicit timeout to avoid a (remote) possibility that shutdown hangs indefinitely.
-		err = ctr.hcsContainer.WaitTimeout(shutdownTimeout)
-	} else if hcsshim.IsAlreadyStopped(err) {
-		err = nil
-	}
-
-	if err != nil {
-		logrus.Debugf("libcontainerd: error shutting down container %s %v calling terminate", ctr.containerID, err)
-		if err := ctr.terminate(); err != nil {
-			return err
-		}
-		return err
-	}
-
-	return nil
-}
-
-// terminate terminates the container in HCS
-// Caller needs to lock container ID before calling this method.
-func (ctr *container) terminate() error {
-	const terminateTimeout = time.Minute * 5
-	err := ctr.hcsContainer.Terminate()
-
-	if hcsshim.IsPending(err) {
-		err = ctr.hcsContainer.WaitTimeout(terminateTimeout)
-	} else if hcsshim.IsAlreadyStopped(err) {
-		err = nil
-	}
-
-	if err != nil {
-		logrus.Debugf("libcontainerd: error terminating container %s %v", ctr.containerID, err)
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/oom_linux.go b/installer/vendor/github.com/docker/docker/libcontainerd/oom_linux.go
deleted file mode 100644
index e126b7a550..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/oom_linux.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package libcontainerd
-
-import (
-	"fmt"
-	"os"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/opencontainers/runc/libcontainer/system"
-)
-
-func setOOMScore(pid, score int) error {
-	oomScoreAdjPath := fmt.Sprintf("/proc/%d/oom_score_adj", pid)
-	f, err := os.OpenFile(oomScoreAdjPath, os.O_WRONLY, 0)
-	if err != nil {
-		return err
-	}
-	stringScore := strconv.Itoa(score)
-	_, err = f.WriteString(stringScore)
-	f.Close()
-	if os.IsPermission(err) {
-		// Setting oom_score_adj does not work in an
-		// unprivileged container. Ignore the error, but log
-		// it if we appear not to be in that situation.
-		if !system.RunningInUserNS() {
-			logrus.Debugf("Permission denied writing %q to %s", stringScore, oomScoreAdjPath)
-		}
-		return nil
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/oom_solaris.go b/installer/vendor/github.com/docker/docker/libcontainerd/oom_solaris.go
deleted file mode 100644
index 2ebe5e87cf..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/oom_solaris.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package libcontainerd
-
-func setOOMScore(pid, score int) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/pausemonitor_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/pausemonitor_unix.go
deleted file mode 100644
index 4f3766d95c..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/pausemonitor_unix.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build !windows
-
-package libcontainerd
-
-import (
-	"sync"
-)
-
-// pauseMonitor is helper to get notifications from pause state changes.
-type pauseMonitor struct {
-	sync.Mutex
-	waiters map[string][]chan struct{}
-}
-
-func (m *pauseMonitor) handle(t string) {
-	m.Lock()
-	defer m.Unlock()
-	if m.waiters == nil {
-		return
-	}
-	q, ok := m.waiters[t]
-	if !ok {
-		return
-	}
-	if len(q) > 0 {
-		close(q[0])
-		m.waiters[t] = q[1:]
-	}
-}
-
-func (m *pauseMonitor) append(t string, waiter chan struct{}) {
-	m.Lock()
-	defer m.Unlock()
-	if m.waiters == nil {
-		m.waiters = make(map[string][]chan struct{})
-	}
-	_, ok := m.waiters[t]
-	if !ok {
-		m.waiters[t] = make([]chan struct{}, 0)
-	}
-	m.waiters[t] = append(m.waiters[t], waiter)
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/process.go b/installer/vendor/github.com/docker/docker/libcontainerd/process.go
deleted file mode 100644
index 57562c8789..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/process.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package libcontainerd
-
-// processCommon are the platform common fields as part of the process structure
-// which keeps the state for the main container process, as well as any exec
-// processes.
-type processCommon struct {
-	client *client
-
-	// containerID is the Container ID
-	containerID string
-
-	// friendlyName is an identifier for the process (or `InitFriendlyName`
-	// for the first process)
-	friendlyName string
-
-	// systemPid is the PID of the main container process
-	systemPid uint32
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/process_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/process_unix.go
deleted file mode 100644
index 506fca6e11..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/process_unix.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// +build linux solaris
-
-package libcontainerd
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	goruntime "runtime"
-	"strings"
-
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/tonistiigi/fifo"
-	"golang.org/x/net/context"
-	"golang.org/x/sys/unix"
-)
-
-var fdNames = map[int]string{
-	unix.Stdin:  "stdin",
-	unix.Stdout: "stdout",
-	unix.Stderr: "stderr",
-}
-
-// process keeps the state for both main container process and exec process.
-type process struct {
-	processCommon
-
-	// Platform specific fields are below here.
-	dir string
-}
-
-func (p *process) openFifos(ctx context.Context, terminal bool) (pipe *IOPipe, err error) {
-	if err := os.MkdirAll(p.dir, 0700); err != nil {
-		return nil, err
-	}
-
-	io := &IOPipe{}
-
-	io.Stdin, err = fifo.OpenFifo(ctx, p.fifo(unix.Stdin), unix.O_WRONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			io.Stdin.Close()
-		}
-	}()
-
-	io.Stdout, err = fifo.OpenFifo(ctx, p.fifo(unix.Stdout), unix.O_RDONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700)
-	if err != nil {
-		return nil, err
-	}
-
-	defer func() {
-		if err != nil {
-			io.Stdout.Close()
-		}
-	}()
-
-	if goruntime.GOOS == "solaris" || !terminal {
-		// For Solaris terminal handling is done exclusively by the runtime therefore we make no distinction
-		// in the processing for terminal and !terminal cases.
-		io.Stderr, err = fifo.OpenFifo(ctx, p.fifo(unix.Stderr), unix.O_RDONLY|unix.O_CREAT|unix.O_NONBLOCK, 0700)
-		if err != nil {
-			return nil, err
-		}
-		defer func() {
-			if err != nil {
-				io.Stderr.Close()
-			}
-		}()
-	} else {
-		io.Stderr = ioutil.NopCloser(emptyReader{})
-	}
-
-	return io, nil
-}
-
-func (p *process) sendCloseStdin() error {
-	_, err := p.client.remote.apiClient.UpdateProcess(context.Background(), &containerd.UpdateProcessRequest{
-		Id:         p.containerID,
-		Pid:        p.friendlyName,
-		CloseStdin: true,
-	})
-	if err != nil && (strings.Contains(err.Error(), "container not found") || strings.Contains(err.Error(), "process not found")) {
-		return nil
-	}
-	return err
-}
-
-func (p *process) closeFifos(io *IOPipe) {
-	io.Stdin.Close()
-	io.Stdout.Close()
-	io.Stderr.Close()
-}
-
-type emptyReader struct{}
-
-func (r emptyReader) Read(b []byte) (int, error) {
-	return 0, io.EOF
-}
-
-func (p *process) fifo(index int) string {
-	return filepath.Join(p.dir, p.friendlyName+"-"+fdNames[index])
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/process_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/process_windows.go
deleted file mode 100644
index 57ecc948d0..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/process_windows.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package libcontainerd
-
-import (
-	"io"
-	"sync"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-// process keeps the state for both main container process and exec process.
-type process struct {
-	processCommon
-
-	// Platform specific fields are below here.
-
-	// commandLine is to support returning summary information for docker top
-	commandLine string
-	hcsProcess  hcsshim.Process
-}
-
-type autoClosingReader struct {
-	io.ReadCloser
-	sync.Once
-}
-
-func (r *autoClosingReader) Read(b []byte) (n int, err error) {
-	n, err = r.ReadCloser.Read(b)
-	if err == io.EOF {
-		r.Once.Do(func() { r.ReadCloser.Close() })
-	}
-	return
-}
-
-func createStdInCloser(pipe io.WriteCloser, process hcsshim.Process) io.WriteCloser {
-	return ioutils.NewWriteCloserWrapper(pipe, func() error {
-		if err := pipe.Close(); err != nil {
-			return err
-		}
-
-		err := process.CloseStdin()
-		if err != nil && !hcsshim.IsNotExist(err) && !hcsshim.IsAlreadyClosed(err) {
-			// This error will occur if the compute system is currently shutting down
-			if perr, ok := err.(*hcsshim.ProcessError); ok && perr.Err != hcsshim.ErrVmcomputeOperationInvalidState {
-				return err
-			}
-		}
-
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/queue_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/queue_unix.go
deleted file mode 100644
index b848b9872b..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/queue_unix.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// +build linux solaris
-
-package libcontainerd
-
-import "sync"
-
-type queue struct {
-	sync.Mutex
-	fns map[string]chan struct{}
-}
-
-func (q *queue) append(id string, f func()) {
-	q.Lock()
-	defer q.Unlock()
-
-	if q.fns == nil {
-		q.fns = make(map[string]chan struct{})
-	}
-
-	done := make(chan struct{})
-
-	fn, ok := q.fns[id]
-	q.fns[id] = done
-	go func() {
-		if ok {
-			<-fn
-		}
-		f()
-		close(done)
-	}()
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/remote.go b/installer/vendor/github.com/docker/docker/libcontainerd/remote.go
deleted file mode 100644
index 9031e3ae7d..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/remote.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package libcontainerd
-
-// Remote on Linux defines the accesspoint to the containerd grpc API.
-// Remote on Windows is largely an unimplemented interface as there is
-// no remote containerd.
-type Remote interface {
-	// Client returns a new Client instance connected with given Backend.
-	Client(Backend) (Client, error)
-	// Cleanup stops containerd if it was started by libcontainerd.
-	// Note this is not used on Windows as there is no remote containerd.
-	Cleanup()
-	// UpdateOptions allows various remote options to be updated at runtime.
-	UpdateOptions(...RemoteOption) error
-}
-
-// RemoteOption allows to configure parameters of remotes.
-// This is unused on Windows.
-type RemoteOption interface {
-	Apply(Remote) error
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/remote_unix.go b/installer/vendor/github.com/docker/docker/libcontainerd/remote_unix.go
deleted file mode 100644
index 64a28646be..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/remote_unix.go
+++ /dev/null
@@ -1,544 +0,0 @@
-// +build linux solaris
-
-package libcontainerd
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	goruntime "runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/locker"
-	sysinfo "github.com/docker/docker/pkg/system"
-	"github.com/docker/docker/utils"
-	"github.com/golang/protobuf/ptypes"
-	"github.com/golang/protobuf/ptypes/timestamp"
-	"golang.org/x/net/context"
-	"google.golang.org/grpc"
-	"google.golang.org/grpc/grpclog"
-	"google.golang.org/grpc/health/grpc_health_v1"
-	"google.golang.org/grpc/transport"
-)
-
-const (
-	maxConnectionRetryCount      = 3
-	containerdHealthCheckTimeout = 3 * time.Second
-	containerdShutdownTimeout    = 15 * time.Second
-	containerdBinary             = "docker-containerd"
-	containerdPidFilename        = "docker-containerd.pid"
-	containerdSockFilename       = "docker-containerd.sock"
-	containerdStateDir           = "containerd"
-	eventTimestampFilename       = "event.ts"
-)
-
-type remote struct {
-	sync.RWMutex
-	apiClient            containerd.APIClient
-	daemonPid            int
-	stateDir             string
-	rpcAddr              string
-	startDaemon          bool
-	closeManually        bool
-	debugLog             bool
-	rpcConn              *grpc.ClientConn
-	clients              []*client
-	eventTsPath          string
-	runtime              string
-	runtimeArgs          []string
-	daemonWaitCh         chan struct{}
-	liveRestore          bool
-	oomScore             int
-	restoreFromTimestamp *timestamp.Timestamp
-}
-
-// New creates a fresh instance of libcontainerd remote.
-func New(stateDir string, options ...RemoteOption) (_ Remote, err error) {
-	defer func() {
-		if err != nil {
-			err = fmt.Errorf("Failed to connect to containerd. Please make sure containerd is installed in your PATH or you have specified the correct address. Got error: %v", err)
-		}
-	}()
-	r := &remote{
-		stateDir:    stateDir,
-		daemonPid:   -1,
-		eventTsPath: filepath.Join(stateDir, eventTimestampFilename),
-	}
-	for _, option := range options {
-		if err := option.Apply(r); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := sysinfo.MkdirAll(stateDir, 0700); err != nil {
-		return nil, err
-	}
-
-	if r.rpcAddr == "" {
-		r.rpcAddr = filepath.Join(stateDir, containerdSockFilename)
-	}
-
-	if r.startDaemon {
-		if err := r.runContainerdDaemon(); err != nil {
-			return nil, err
-		}
-	}
-
-	// don't output the grpc reconnect logging
-	grpclog.SetLogger(log.New(ioutil.Discard, "", log.LstdFlags))
-	dialOpts := append([]grpc.DialOption{grpc.WithInsecure()},
-		grpc.WithDialer(func(addr string, timeout time.Duration) (net.Conn, error) {
-			return net.DialTimeout("unix", addr, timeout)
-		}),
-	)
-	conn, err := grpc.Dial(r.rpcAddr, dialOpts...)
-	if err != nil {
-		return nil, fmt.Errorf("error connecting to containerd: %v", err)
-	}
-
-	r.rpcConn = conn
-	r.apiClient = containerd.NewAPIClient(conn)
-
-	// Get the timestamp to restore from
-	t := r.getLastEventTimestamp()
-	tsp, err := ptypes.TimestampProto(t)
-	if err != nil {
-		logrus.Errorf("libcontainerd: failed to convert timestamp: %q", err)
-	}
-	r.restoreFromTimestamp = tsp
-
-	go r.handleConnectionChange()
-
-	if err := r.startEventsMonitor(); err != nil {
-		return nil, err
-	}
-
-	return r, nil
-}
-
-func (r *remote) UpdateOptions(options ...RemoteOption) error {
-	for _, option := range options {
-		if err := option.Apply(r); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (r *remote) handleConnectionChange() {
-	var transientFailureCount = 0
-
-	ticker := time.NewTicker(500 * time.Millisecond)
-	defer ticker.Stop()
-	healthClient := grpc_health_v1.NewHealthClient(r.rpcConn)
-
-	for {
-		<-ticker.C
-		ctx, cancel := context.WithTimeout(context.Background(), containerdHealthCheckTimeout)
-		_, err := healthClient.Check(ctx, &grpc_health_v1.HealthCheckRequest{})
-		cancel()
-		if err == nil {
-			continue
-		}
-
-		logrus.Debugf("libcontainerd: containerd health check returned error: %v", err)
-
-		if r.daemonPid != -1 {
-			if strings.Contains(err.Error(), "is closing") {
-				// Well, we asked for it to stop, just return
-				return
-			}
-			// all other errors are transient
-			// Reset state to be notified of next failure
-			transientFailureCount++
-			if transientFailureCount >= maxConnectionRetryCount {
-				transientFailureCount = 0
-				if utils.IsProcessAlive(r.daemonPid) {
-					utils.KillProcess(r.daemonPid)
-				}
-				<-r.daemonWaitCh
-				if err := r.runContainerdDaemon(); err != nil { //FIXME: Handle error
-					logrus.Errorf("libcontainerd: error restarting containerd: %v", err)
-				}
-				continue
-			}
-		}
-	}
-}
-
-func (r *remote) Cleanup() {
-	if r.daemonPid == -1 {
-		return
-	}
-	r.closeManually = true
-	r.rpcConn.Close()
-	// Ask the daemon to quit
-	syscall.Kill(r.daemonPid, syscall.SIGTERM)
-
-	// Wait up to 15secs for it to stop
-	for i := time.Duration(0); i < containerdShutdownTimeout; i += time.Second {
-		if !utils.IsProcessAlive(r.daemonPid) {
-			break
-		}
-		time.Sleep(time.Second)
-	}
-
-	if utils.IsProcessAlive(r.daemonPid) {
-		logrus.Warnf("libcontainerd: containerd (%d) didn't stop within 15 secs, killing it\n", r.daemonPid)
-		syscall.Kill(r.daemonPid, syscall.SIGKILL)
-	}
-
-	// cleanup some files
-	os.Remove(filepath.Join(r.stateDir, containerdPidFilename))
-	os.Remove(filepath.Join(r.stateDir, containerdSockFilename))
-}
-
-func (r *remote) Client(b Backend) (Client, error) {
-	c := &client{
-		clientCommon: clientCommon{
-			backend:    b,
-			containers: make(map[string]*container),
-			locker:     locker.New(),
-		},
-		remote:        r,
-		exitNotifiers: make(map[string]*exitNotifier),
-		liveRestore:   r.liveRestore,
-	}
-
-	r.Lock()
-	r.clients = append(r.clients, c)
-	r.Unlock()
-	return c, nil
-}
-
-func (r *remote) updateEventTimestamp(t time.Time) {
-	f, err := os.OpenFile(r.eventTsPath, syscall.O_CREAT|syscall.O_WRONLY|syscall.O_TRUNC, 0600)
-	if err != nil {
-		logrus.Warnf("libcontainerd: failed to open event timestamp file: %v", err)
-		return
-	}
-	defer f.Close()
-
-	b, err := t.MarshalText()
-	if err != nil {
-		logrus.Warnf("libcontainerd: failed to encode timestamp: %v", err)
-		return
-	}
-
-	n, err := f.Write(b)
-	if err != nil || n != len(b) {
-		logrus.Warnf("libcontainerd: failed to update event timestamp file: %v", err)
-		f.Truncate(0)
-		return
-	}
-}
-
-func (r *remote) getLastEventTimestamp() time.Time {
-	t := time.Now()
-
-	fi, err := os.Stat(r.eventTsPath)
-	if os.IsNotExist(err) || fi.Size() == 0 {
-		return t
-	}
-
-	f, err := os.Open(r.eventTsPath)
-	if err != nil {
-		logrus.Warnf("libcontainerd: Unable to access last event ts: %v", err)
-		return t
-	}
-	defer f.Close()
-
-	b := make([]byte, fi.Size())
-	n, err := f.Read(b)
-	if err != nil || n != len(b) {
-		logrus.Warnf("libcontainerd: Unable to read last event ts: %v", err)
-		return t
-	}
-
-	t.UnmarshalText(b)
-
-	return t
-}
-
-func (r *remote) startEventsMonitor() error {
-	// First, get past events
-	t := r.getLastEventTimestamp()
-	tsp, err := ptypes.TimestampProto(t)
-	if err != nil {
-		logrus.Errorf("libcontainerd: failed to convert timestamp: %q", err)
-	}
-	er := &containerd.EventsRequest{
-		Timestamp: tsp,
-	}
-	events, err := r.apiClient.Events(context.Background(), er, grpc.FailFast(false))
-	if err != nil {
-		return err
-	}
-	go r.handleEventStream(events)
-	return nil
-}
-
-func (r *remote) handleEventStream(events containerd.API_EventsClient) {
-	for {
-		e, err := events.Recv()
-		if err != nil {
-			if grpc.ErrorDesc(err) == transport.ErrConnClosing.Desc &&
-				r.closeManually {
-				// ignore error if grpc remote connection is closed manually
-				return
-			}
-			logrus.Errorf("libcontainerd: failed to receive event from containerd: %v", err)
-			go r.startEventsMonitor()
-			return
-		}
-
-		logrus.Debugf("libcontainerd: received containerd event: %#v", e)
-
-		var container *container
-		var c *client
-		r.RLock()
-		for _, c = range r.clients {
-			container, err = c.getContainer(e.Id)
-			if err == nil {
-				break
-			}
-		}
-		r.RUnlock()
-		if container == nil {
-			logrus.Warnf("libcontainerd: unknown container %s", e.Id)
-			continue
-		}
-
-		if err := container.handleEvent(e); err != nil {
-			logrus.Errorf("libcontainerd: error processing state change for %s: %v", e.Id, err)
-		}
-
-		tsp, err := ptypes.Timestamp(e.Timestamp)
-		if err != nil {
-			logrus.Errorf("libcontainerd: failed to convert event timestamp: %q", err)
-			continue
-		}
-
-		r.updateEventTimestamp(tsp)
-	}
-}
-
-func (r *remote) runContainerdDaemon() error {
-	pidFilename := filepath.Join(r.stateDir, containerdPidFilename)
-	f, err := os.OpenFile(pidFilename, os.O_RDWR|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	// File exist, check if the daemon is alive
-	b := make([]byte, 8)
-	n, err := f.Read(b)
-	if err != nil && err != io.EOF {
-		return err
-	}
-
-	if n > 0 {
-		pid, err := strconv.ParseUint(string(b[:n]), 10, 64)
-		if err != nil {
-			return err
-		}
-		if utils.IsProcessAlive(int(pid)) {
-			logrus.Infof("libcontainerd: previous instance of containerd still alive (%d)", pid)
-			r.daemonPid = int(pid)
-			return nil
-		}
-	}
-
-	// rewind the file
-	_, err = f.Seek(0, os.SEEK_SET)
-	if err != nil {
-		return err
-	}
-
-	// Truncate it
-	err = f.Truncate(0)
-	if err != nil {
-		return err
-	}
-
-	// Start a new instance
-	args := []string{
-		"-l", fmt.Sprintf("unix://%s", r.rpcAddr),
-		"--metrics-interval=0",
-		"--start-timeout", "2m",
-		"--state-dir", filepath.Join(r.stateDir, containerdStateDir),
-	}
-	if goruntime.GOOS == "solaris" {
-		args = append(args, "--shim", "containerd-shim", "--runtime", "runc")
-	} else {
-		args = append(args, "--shim", "docker-containerd-shim")
-		if r.runtime != "" {
-			args = append(args, "--runtime")
-			args = append(args, r.runtime)
-		}
-	}
-	if r.debugLog {
-		args = append(args, "--debug")
-	}
-	if len(r.runtimeArgs) > 0 {
-		for _, v := range r.runtimeArgs {
-			args = append(args, "--runtime-args")
-			args = append(args, v)
-		}
-		logrus.Debugf("libcontainerd: runContainerdDaemon: runtimeArgs: %s", args)
-	}
-
-	cmd := exec.Command(containerdBinary, args...)
-	// redirect containerd logs to docker logs
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	cmd.SysProcAttr = setSysProcAttr(true)
-	cmd.Env = nil
-	// clear the NOTIFY_SOCKET from the env when starting containerd
-	for _, e := range os.Environ() {
-		if !strings.HasPrefix(e, "NOTIFY_SOCKET") {
-			cmd.Env = append(cmd.Env, e)
-		}
-	}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	logrus.Infof("libcontainerd: new containerd process, pid: %d", cmd.Process.Pid)
-	if err := setOOMScore(cmd.Process.Pid, r.oomScore); err != nil {
-		utils.KillProcess(cmd.Process.Pid)
-		return err
-	}
-	if _, err := f.WriteString(fmt.Sprintf("%d", cmd.Process.Pid)); err != nil {
-		utils.KillProcess(cmd.Process.Pid)
-		return err
-	}
-
-	r.daemonWaitCh = make(chan struct{})
-	go func() {
-		cmd.Wait()
-		close(r.daemonWaitCh)
-	}() // Reap our child when needed
-	r.daemonPid = cmd.Process.Pid
-	return nil
-}
-
-// WithRemoteAddr sets the external containerd socket to connect to.
-func WithRemoteAddr(addr string) RemoteOption {
-	return rpcAddr(addr)
-}
-
-type rpcAddr string
-
-func (a rpcAddr) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.rpcAddr = string(a)
-		return nil
-	}
-	return fmt.Errorf("WithRemoteAddr option not supported for this remote")
-}
-
-// WithRuntimePath sets the path of the runtime to be used as the
-// default by containerd
-func WithRuntimePath(rt string) RemoteOption {
-	return runtimePath(rt)
-}
-
-type runtimePath string
-
-func (rt runtimePath) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.runtime = string(rt)
-		return nil
-	}
-	return fmt.Errorf("WithRuntime option not supported for this remote")
-}
-
-// WithRuntimeArgs sets the list of runtime args passed to containerd
-func WithRuntimeArgs(args []string) RemoteOption {
-	return runtimeArgs(args)
-}
-
-type runtimeArgs []string
-
-func (rt runtimeArgs) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.runtimeArgs = rt
-		return nil
-	}
-	return fmt.Errorf("WithRuntimeArgs option not supported for this remote")
-}
-
-// WithStartDaemon defines if libcontainerd should also run containerd daemon.
-func WithStartDaemon(start bool) RemoteOption {
-	return startDaemon(start)
-}
-
-type startDaemon bool
-
-func (s startDaemon) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.startDaemon = bool(s)
-		return nil
-	}
-	return fmt.Errorf("WithStartDaemon option not supported for this remote")
-}
-
-// WithDebugLog defines if containerd debug logs will be enabled for daemon.
-func WithDebugLog(debug bool) RemoteOption {
-	return debugLog(debug)
-}
-
-type debugLog bool
-
-func (d debugLog) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.debugLog = bool(d)
-		return nil
-	}
-	return fmt.Errorf("WithDebugLog option not supported for this remote")
-}
-
-// WithLiveRestore defines if containers are stopped on shutdown or restored.
-func WithLiveRestore(v bool) RemoteOption {
-	return liveRestore(v)
-}
-
-type liveRestore bool
-
-func (l liveRestore) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.liveRestore = bool(l)
-		for _, c := range remote.clients {
-			c.liveRestore = bool(l)
-		}
-		return nil
-	}
-	return fmt.Errorf("WithLiveRestore option not supported for this remote")
-}
-
-// WithOOMScore defines the oom_score_adj to set for the containerd process.
-func WithOOMScore(score int) RemoteOption {
-	return oomScore(score)
-}
-
-type oomScore int
-
-func (o oomScore) Apply(r Remote) error {
-	if remote, ok := r.(*remote); ok {
-		remote.oomScore = int(o)
-		return nil
-	}
-	return fmt.Errorf("WithOOMScore option not supported for this remote")
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/remote_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/remote_windows.go
deleted file mode 100644
index 74c10447bb..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/remote_windows.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package libcontainerd
-
-import "github.com/docker/docker/pkg/locker"
-
-type remote struct {
-}
-
-func (r *remote) Client(b Backend) (Client, error) {
-	c := &client{
-		clientCommon: clientCommon{
-			backend:    b,
-			containers: make(map[string]*container),
-			locker:     locker.New(),
-		},
-	}
-	return c, nil
-}
-
-// Cleanup is a no-op on Windows. It is here to implement the interface.
-func (r *remote) Cleanup() {
-}
-
-func (r *remote) UpdateOptions(opts ...RemoteOption) error {
-	return nil
-}
-
-// New creates a fresh instance of libcontainerd remote. On Windows,
-// this is not used as there is no remote containerd process.
-func New(_ string, _ ...RemoteOption) (Remote, error) {
-	return &remote{}, nil
-}
-
-// WithLiveRestore is a noop on windows.
-func WithLiveRestore(v bool) RemoteOption {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/types.go b/installer/vendor/github.com/docker/docker/libcontainerd/types.go
deleted file mode 100644
index 3d981e3371..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/types.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package libcontainerd
-
-import (
-	"io"
-
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"golang.org/x/net/context"
-)
-
-// State constants used in state change reporting.
-const (
-	StateStart       = "start-container"
-	StatePause       = "pause"
-	StateResume      = "resume"
-	StateExit        = "exit"
-	StateRestore     = "restore"
-	StateExitProcess = "exit-process"
-	StateOOM         = "oom" // fake state
-)
-
-// CommonStateInfo contains the state info common to all platforms.
-type CommonStateInfo struct { // FIXME: event?
-	State     string
-	Pid       uint32
-	ExitCode  uint32
-	ProcessID string
-}
-
-// Backend defines callbacks that the client of the library needs to implement.
-type Backend interface {
-	StateChanged(containerID string, state StateInfo) error
-}
-
-// Client provides access to containerd features.
-type Client interface {
-	GetServerVersion(ctx context.Context) (*ServerVersion, error)
-	Create(containerID string, checkpoint string, checkpointDir string, spec specs.Spec, attachStdio StdioCallback, options ...CreateOption) error
-	Signal(containerID string, sig int) error
-	SignalProcess(containerID string, processFriendlyName string, sig int) error
-	AddProcess(ctx context.Context, containerID, processFriendlyName string, process Process, attachStdio StdioCallback) (int, error)
-	Resize(containerID, processFriendlyName string, width, height int) error
-	Pause(containerID string) error
-	Resume(containerID string) error
-	Restore(containerID string, attachStdio StdioCallback, options ...CreateOption) error
-	Stats(containerID string) (*Stats, error)
-	GetPidsForContainer(containerID string) ([]int, error)
-	Summary(containerID string) ([]Summary, error)
-	UpdateResources(containerID string, resources Resources) error
-	CreateCheckpoint(containerID string, checkpointID string, checkpointDir string, exit bool) error
-	DeleteCheckpoint(containerID string, checkpointID string, checkpointDir string) error
-	ListCheckpoints(containerID string, checkpointDir string) (*Checkpoints, error)
-}
-
-// CreateOption allows to configure parameters of container creation.
-type CreateOption interface {
-	Apply(interface{}) error
-}
-
-// StdioCallback is called to connect a container or process stdio.
-type StdioCallback func(IOPipe) error
-
-// IOPipe contains the stdio streams.
-type IOPipe struct {
-	Stdin    io.WriteCloser
-	Stdout   io.ReadCloser
-	Stderr   io.ReadCloser
-	Terminal bool // Whether stderr is connected on Windows
-}
-
-// ServerVersion contains version information as retrieved from the
-// server
-type ServerVersion struct {
-	containerd.GetServerVersionResponse
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/types_linux.go b/installer/vendor/github.com/docker/docker/libcontainerd/types_linux.go
deleted file mode 100644
index cc2a17aec6..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/types_linux.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package libcontainerd
-
-import (
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Process contains information to start a specific application inside the container.
-type Process struct {
-	// Terminal creates an interactive terminal for the container.
-	Terminal bool `json:"terminal"`
-	// User specifies user information for the process.
-	User *specs.User `json:"user"`
-	// Args specifies the binary and arguments for the application to execute.
-	Args []string `json:"args"`
-	// Env populates the process environment for the process.
-	Env []string `json:"env,omitempty"`
-	// Cwd is the current working directory for the process and must be
-	// relative to the container's root.
-	Cwd *string `json:"cwd"`
-	// Capabilities are linux capabilities that are kept for the container.
-	Capabilities []string `json:"capabilities,omitempty"`
-	// Rlimits specifies rlimit options to apply to the process.
-	Rlimits []specs.Rlimit `json:"rlimits,omitempty"`
-	// ApparmorProfile specifies the apparmor profile for the container.
-	ApparmorProfile *string `json:"apparmorProfile,omitempty"`
-	// SelinuxLabel specifies the selinux context that the container process is run as.
-	SelinuxLabel *string `json:"selinuxLabel,omitempty"`
-}
-
-// StateInfo contains description about the new state container has entered.
-type StateInfo struct {
-	CommonStateInfo
-
-	// Platform specific StateInfo
-	OOMKilled bool
-}
-
-// Stats contains a stats properties from containerd.
-type Stats containerd.StatsResponse
-
-// Summary contains a container summary from containerd
-type Summary struct{}
-
-// Resources defines updatable container resource values.
-type Resources containerd.UpdateResource
-
-// Checkpoints contains the details of a checkpoint
-type Checkpoints containerd.ListCheckpointResponse
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/types_solaris.go b/installer/vendor/github.com/docker/docker/libcontainerd/types_solaris.go
deleted file mode 100644
index dbafef669f..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/types_solaris.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package libcontainerd
-
-import (
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Process contains information to start a specific application inside the container.
-type Process struct {
-	// Terminal creates an interactive terminal for the container.
-	Terminal bool `json:"terminal"`
-	// User specifies user information for the process.
-	User *specs.User `json:"user"`
-	// Args specifies the binary and arguments for the application to execute.
-	Args []string `json:"args"`
-	// Env populates the process environment for the process.
-	Env []string `json:"env,omitempty"`
-	// Cwd is the current working directory for the process and must be
-	// relative to the container's root.
-	Cwd *string `json:"cwd"`
-	// Capabilities are linux capabilities that are kept for the container.
-	Capabilities []string `json:"capabilities,omitempty"`
-}
-
-// Stats contains a stats properties from containerd.
-type Stats struct{}
-
-// Summary contains a container summary from containerd
-type Summary struct{}
-
-// StateInfo contains description about the new state container has entered.
-type StateInfo struct {
-	CommonStateInfo
-
-	// Platform specific StateInfo
-	OOMKilled bool
-}
-
-// Resources defines updatable container resource values.
-type Resources struct{}
-
-// Checkpoints contains the details of a checkpoint
-type Checkpoints containerd.ListCheckpointResponse
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/types_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/types_windows.go
deleted file mode 100644
index 24a9a96440..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/types_windows.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package libcontainerd
-
-import (
-	"github.com/Microsoft/hcsshim"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Process contains information to start a specific application inside the container.
-type Process specs.Process
-
-// Summary contains a ProcessList item from HCS to support `top`
-type Summary hcsshim.ProcessListItem
-
-// StateInfo contains description about the new state container has entered.
-type StateInfo struct {
-	CommonStateInfo
-
-	// Platform specific StateInfo
-
-	UpdatePending bool // Indicates that there are some update operations pending that should be completed by a servicing container.
-}
-
-// Stats contains statics from HCS
-type Stats hcsshim.Statistics
-
-// Resources defines updatable container resource values.
-type Resources struct{}
-
-// ServicingOption is a CreateOption with a no-op application that signifies
-// the container needs to be used for a Windows servicing operation.
-type ServicingOption struct {
-	IsServicing bool
-}
-
-// FlushOption is a CreateOption that signifies if the container should be
-// started with flushes ignored until boot has completed. This is an optimisation
-// for first boot of a container.
-type FlushOption struct {
-	IgnoreFlushesDuringBoot bool
-}
-
-// HyperVIsolationOption is a CreateOption that indicates whether the runtime
-// should start the container as a Hyper-V container, and if so, the sandbox path.
-type HyperVIsolationOption struct {
-	IsHyperV    bool
-	SandboxPath string `json:",omitempty"`
-}
-
-// LayerOption is a CreateOption that indicates to the runtime the layer folder
-// and layer paths for a container.
-type LayerOption struct {
-	// LayerFolder is the path to the current layer folder. Empty for Hyper-V containers.
-	LayerFolderPath string `json:",omitempty"`
-	// Layer paths of the parent layers
-	LayerPaths []string
-}
-
-// NetworkEndpointsOption is a CreateOption that provides the runtime list
-// of network endpoints to which a container should be attached during its creation.
-type NetworkEndpointsOption struct {
-	Endpoints                []string
-	AllowUnqualifiedDNSQuery bool
-}
-
-// CredentialsOption is a CreateOption that indicates the credentials from
-// a credential spec to be used to the runtime
-type CredentialsOption struct {
-	Credentials string
-}
-
-// Checkpoint holds the details of a checkpoint (not supported in windows)
-type Checkpoint struct {
-	Name string
-}
-
-// Checkpoints contains the details of a checkpoint
-type Checkpoints struct {
-	Checkpoints []*Checkpoint
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/utils_linux.go b/installer/vendor/github.com/docker/docker/libcontainerd/utils_linux.go
deleted file mode 100644
index 78828bcdad..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/utils_linux.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package libcontainerd
-
-import (
-	"syscall"
-
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func getRootIDs(s specs.Spec) (int, int, error) {
-	var hasUserns bool
-	for _, ns := range s.Linux.Namespaces {
-		if ns.Type == specs.UserNamespace {
-			hasUserns = true
-			break
-		}
-	}
-	if !hasUserns {
-		return 0, 0, nil
-	}
-	uid := hostIDFromMap(0, s.Linux.UIDMappings)
-	gid := hostIDFromMap(0, s.Linux.GIDMappings)
-	return uid, gid, nil
-}
-
-func hostIDFromMap(id uint32, mp []specs.IDMapping) int {
-	for _, m := range mp {
-		if id >= m.ContainerID && id <= m.ContainerID+m.Size-1 {
-			return int(m.HostID + id - m.ContainerID)
-		}
-	}
-	return 0
-}
-
-func systemPid(ctr *containerd.Container) uint32 {
-	var pid uint32
-	for _, p := range ctr.Processes {
-		if p.Pid == InitFriendlyName {
-			pid = p.SystemPid
-		}
-	}
-	return pid
-}
-
-func convertRlimits(sr []specs.Rlimit) (cr []*containerd.Rlimit) {
-	for _, r := range sr {
-		cr = append(cr, &containerd.Rlimit{
-			Type: r.Type,
-			Hard: r.Hard,
-			Soft: r.Soft,
-		})
-	}
-	return
-}
-
-// setPDeathSig sets the parent death signal to SIGKILL
-func setSysProcAttr(sid bool) *syscall.SysProcAttr {
-	return &syscall.SysProcAttr{
-		Setsid:    sid,
-		Pdeathsig: syscall.SIGKILL,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/utils_solaris.go b/installer/vendor/github.com/docker/docker/libcontainerd/utils_solaris.go
deleted file mode 100644
index 49632b45e5..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/utils_solaris.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package libcontainerd
-
-import (
-	"syscall"
-
-	containerd "github.com/docker/containerd/api/grpc/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func getRootIDs(s specs.Spec) (int, int, error) {
-	return 0, 0, nil
-}
-
-func systemPid(ctr *containerd.Container) uint32 {
-	var pid uint32
-	for _, p := range ctr.Processes {
-		if p.Pid == InitFriendlyName {
-			pid = p.SystemPid
-		}
-	}
-	return pid
-}
-
-// setPDeathSig sets the parent death signal to SIGKILL
-func setSysProcAttr(sid bool) *syscall.SysProcAttr {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows.go b/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows.go
deleted file mode 100644
index 41ac40d2c2..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package libcontainerd
-
-import "strings"
-
-// setupEnvironmentVariables converts a string array of environment variables
-// into a map as required by the HCS. Source array is in format [v1=k1] [v2=k2] etc.
-func setupEnvironmentVariables(a []string) map[string]string {
-	r := make(map[string]string)
-	for _, s := range a {
-		arr := strings.SplitN(s, "=", 2)
-		if len(arr) == 2 {
-			r[arr[0]] = arr[1]
-		}
-	}
-	return r
-}
-
-// Apply for a servicing option is a no-op.
-func (s *ServicingOption) Apply(interface{}) error {
-	return nil
-}
-
-// Apply for the flush option is a no-op.
-func (f *FlushOption) Apply(interface{}) error {
-	return nil
-}
-
-// Apply for the hypervisolation option is a no-op.
-func (h *HyperVIsolationOption) Apply(interface{}) error {
-	return nil
-}
-
-// Apply for the layer option is a no-op.
-func (h *LayerOption) Apply(interface{}) error {
-	return nil
-}
-
-// Apply for the network endpoints option is a no-op.
-func (s *NetworkEndpointsOption) Apply(interface{}) error {
-	return nil
-}
-
-// Apply for the credentials option is a no-op.
-func (s *CredentialsOption) Apply(interface{}) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows_test.go b/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows_test.go
deleted file mode 100644
index f3679bfb71..0000000000
--- a/installer/vendor/github.com/docker/docker/libcontainerd/utils_windows_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package libcontainerd
-
-import (
-	"testing"
-)
-
-func TestEnvironmentParsing(t *testing.T) {
-	env := []string{"foo=bar", "car=hat", "a=b=c"}
-	result := setupEnvironmentVariables(env)
-	if len(result) != 3 || result["foo"] != "bar" || result["car"] != "hat" || result["a"] != "b=c" {
-		t.Fatalf("Expected map[foo:bar car:hat a:b=c], got %v", result)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile b/installer/vendor/github.com/docker/docker/man/Dockerfile
deleted file mode 100644
index 80e97ff01e..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile
+++ /dev/null
@@ -1,24 +0,0 @@
-FROM    golang:1.7.5-alpine
-
-RUN     apk add -U git bash curl gcc musl-dev make
-
-RUN     mkdir -p /go/src /go/bin /go/pkg
-RUN     export GLIDE=v0.11.1; \
-        export TARGET=/go/src/github.com/Masterminds; \
-        mkdir -p ${TARGET} && \
-        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
-        cd ${TARGET}/glide && \
-        git checkout $GLIDE && \
-        make build && \
-        cp ./glide /usr/bin/glide && \
-        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
-
-COPY    glide.yaml /manvendor/
-COPY    glide.lock /manvendor/
-WORKDIR /manvendor/
-RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/manvendor
-RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
-
-WORKDIR /go/src/github.com/docker/docker/
-ENTRYPOINT ["man/generate.sh"]
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile.5.md b/installer/vendor/github.com/docker/docker/man/Dockerfile.5.md
deleted file mode 100644
index 5191b1930a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile.5.md
+++ /dev/null
@@ -1,474 +0,0 @@
-% DOCKERFILE(5) Docker User Manuals
-% Zac Dover
-% May 2014
-# NAME
-
-Dockerfile - automate the steps of creating a Docker image
-
-# INTRODUCTION
-
-The **Dockerfile** is a configuration file that automates the steps of creating
-a Docker image. It is similar to a Makefile. Docker reads instructions from the
-**Dockerfile** to automate the steps otherwise performed manually to create an
-image. To build an image, create a file called **Dockerfile**.
-
-The **Dockerfile** describes the steps taken to assemble the image. When the
-**Dockerfile** has been created, call the `docker build` command, using the
-path of directory that contains **Dockerfile** as the argument.
-
-# SYNOPSIS
-
-INSTRUCTION arguments
-
-For example:
-
-  FROM image
-
-# DESCRIPTION
-
-A Dockerfile is a file that automates the steps of creating a Docker image.
-A Dockerfile is similar to a Makefile.
-
-# USAGE
-
-  docker build .
-
-  -- Runs the steps and commits them, building a final image.
-  The path to the source repository defines where to find the context of the
-  build. The build is run by the Docker daemon, not the CLI. The whole
-  context must be transferred to the daemon. The Docker CLI reports
-  `"Sending build context to Docker daemon"` when the context is sent to the
-  daemon.
-
-  ```
-  docker build -t repository/tag .
-  ```
-
-  -- specifies a repository and tag at which to save the new image if the build
-  succeeds. The Docker daemon runs the steps one-by-one, committing the result
-  to a new image if necessary, before finally outputting the ID of the new
-  image. The Docker daemon automatically cleans up the context it is given.
-
-  Docker re-uses intermediate images whenever possible. This significantly
-  accelerates the *docker build* process.
-
-# FORMAT
-
-  `FROM image`
-
-  `FROM image:tag`
-
-  `FROM image@digest`
-
-  -- The **FROM** instruction sets the base image for subsequent instructions. A
-  valid Dockerfile must have **FROM** as its first instruction. The image can be any
-  valid image. It is easy to start by pulling an image from the public
-  repositories.
-
-  -- **FROM** must be the first non-comment instruction in Dockerfile.
-
-  -- **FROM** may appear multiple times within a single Dockerfile in order to create
-  multiple images. Make a note of the last image ID output by the commit before
-  each new **FROM** command.
-
-  -- If no tag is given to the **FROM** instruction, Docker applies the
-  `latest` tag. If the used tag does not exist, an error is returned.
-
-  -- If no digest is given to the **FROM** instruction, Docker applies the
-  `latest` tag. If the used tag does not exist, an error is returned.
-
-**MAINTAINER**
-  -- **MAINTAINER** sets the Author field for the generated images.
-  Useful for providing users with an email or url for support.
-
-**RUN**
-  -- **RUN** has two forms:
-
-  ```
-  # the command is run in a shell - /bin/sh -c
-  RUN <command>
-
-  # Executable form
-  RUN ["executable", "param1", "param2"]
-  ```
-
-
-  -- The **RUN** instruction executes any commands in a new layer on top of the current
-  image and commits the results. The committed image is used for the next step in
-  Dockerfile.
-
-  -- Layering **RUN** instructions and generating commits conforms to the core
-  concepts of Docker where commits are cheap and containers can be created from
-  any point in the history of an image. This is similar to source control.  The
-  exec form makes it possible to avoid shell string munging. The exec form makes
-  it possible to **RUN** commands using a base image that does not contain `/bin/sh`.
-
-  Note that the exec form is parsed as a JSON array, which means that you must
-  use double-quotes (") around words not single-quotes (').
-
-**CMD**
-  -- **CMD** has three forms:
-
-  ```
-  # Executable form
-  CMD ["executable", "param1", "param2"]`
-
-  # Provide default arguments to ENTRYPOINT
-  CMD ["param1", "param2"]`
-
-  # the command is run in a shell - /bin/sh -c
-  CMD command param1 param2
-  ```
-
-  -- There should be only one **CMD** in a Dockerfile. If more than one **CMD** is listed, only
-  the last **CMD** takes effect.
-  The main purpose of a **CMD** is to provide defaults for an executing container.
-  These defaults may include an executable, or they can omit the executable. If
-  they omit the executable, an **ENTRYPOINT** must be specified.
-  When used in the shell or exec formats, the **CMD** instruction sets the command to
-  be executed when running the image.
-  If you use the shell form of the **CMD**, the `<command>` executes in `/bin/sh -c`:
-
-  Note that the exec form is parsed as a JSON array, which means that you must
-  use double-quotes (") around words not single-quotes (').
-
-  ```
-  FROM ubuntu
-  CMD echo "This is a test." | wc -
-  ```
-
-  -- If you run **command** without a shell, then you must express the command as a
-  JSON array and give the full path to the executable. This array form is the
-  preferred form of **CMD**. All additional parameters must be individually expressed
-  as strings in the array:
-
-  ```
-  FROM ubuntu
-  CMD ["/usr/bin/wc","--help"]
-  ```
-
-  -- To make the container run the same executable every time, use **ENTRYPOINT** in
-  combination with **CMD**.
-  If the user specifies arguments to `docker run`, the specified commands
-  override the default in **CMD**.
-  Do not confuse **RUN** with **CMD**. **RUN** runs a command and commits the result.
-  **CMD** executes nothing at build time, but specifies the intended command for
-  the image.
-
-**LABEL**
-  -- `LABEL <key>=<value> [<key>=<value> ...]`or
-  ```
-  LABEL <key>[ <value>]
-  LABEL <key>[ <value>]
-  ...
-  ```
-  The **LABEL** instruction adds metadata to an image. A **LABEL** is a
-  key-value pair. To specify a **LABEL** without a value, simply use an empty
-  string. To include spaces within a **LABEL** value, use quotes and
-  backslashes as you would in command-line parsing.
-
-  ```
-  LABEL com.example.vendor="ACME Incorporated"
-  LABEL com.example.vendor "ACME Incorporated"
-  LABEL com.example.vendor.is-beta ""
-  LABEL com.example.vendor.is-beta=
-  LABEL com.example.vendor.is-beta=""
-  ```
-
-  An image can have more than one label. To specify multiple labels, separate
-  each key-value pair by a space.
-
-  Labels are additive including `LABEL`s in `FROM` images. As the system
-  encounters and then applies a new label, new `key`s override any previous
-  labels with identical keys.
-
-  To display an image's labels, use the `docker inspect` command.
-
-**EXPOSE**
-  -- `EXPOSE <port> [<port>...]`
-  The **EXPOSE** instruction informs Docker that the container listens on the
-  specified network ports at runtime. Docker uses this information to
-  interconnect containers using links and to set up port redirection on the host
-  system.
-
-**ENV**
-  -- `ENV <key> <value>`
-  The **ENV** instruction sets the environment variable <key> to
-  the value `<value>`. This value is passed to all future
-  **RUN**, **ENTRYPOINT**, and **CMD** instructions. This is
-  functionally equivalent to prefixing the command with `<key>=<value>`.  The
-  environment variables that are set with **ENV** persist when a container is run
-  from the resulting image. Use `docker inspect` to inspect these values, and
-  change them using `docker run --env <key>=<value>`.
-
-  Note that setting "`ENV DEBIAN_FRONTEND noninteractive`" may cause
-  unintended consequences, because it will persist when the container is run
-  interactively, as with the following command: `docker run -t -i image bash`
-
-**ADD**
-  -- **ADD** has two forms:
-
-  ```
-  ADD <src> <dest>
-
-  # Required for paths with whitespace
-  ADD ["<src>",... "<dest>"]
-  ```
-
-  The **ADD** instruction copies new files, directories
-  or remote file URLs to the filesystem of the container at path `<dest>`.
-  Multiple `<src>` resources may be specified but if they are files or directories
-  then they must be relative to the source directory that is being built
-  (the context of the build). The `<dest>` is the absolute path, or path relative
-  to **WORKDIR**, into which the source is copied inside the target container.
-  If the `<src>` argument is a local file in a recognized compression format
-  (tar, gzip, bzip2, etc) then it is unpacked at the specified `<dest>` in the
-  container's filesystem.  Note that only local compressed files will be unpacked,
-  i.e., the URL download and archive unpacking features cannot be used together.
-  All new directories are created with mode 0755 and with the uid and gid of **0**.
-
-**COPY**
-  -- **COPY** has two forms:
-
-  ```
-  COPY <src> <dest>
-
-  # Required for paths with whitespace
-  COPY ["<src>",... "<dest>"]
-  ```
-
-  The **COPY** instruction copies new files from `<src>` and
-  adds them to the filesystem of the container at path <dest>. The `<src>` must be
-  the path to a file or directory relative to the source directory that is
-  being built (the context of the build) or a remote file URL. The `<dest>` is an
-  absolute path, or a path relative to **WORKDIR**, into which the source will
-  be copied inside the target container. If you **COPY** an archive file it will
-  land in the container exactly as it appears in the build context without any
-  attempt to unpack it.  All new files and directories are created with mode **0755**
-  and with the uid and gid of **0**.
-
-**ENTRYPOINT**
-  -- **ENTRYPOINT** has two forms:
-
-  ```
-  # executable form
-  ENTRYPOINT ["executable", "param1", "param2"]`
-
-  # run command in a shell - /bin/sh -c
-  ENTRYPOINT command param1 param2
-  ```
-
-  -- An **ENTRYPOINT** helps you configure a
-  container that can be run as an executable. When you specify an **ENTRYPOINT**,
-  the whole container runs as if it was only that executable.  The **ENTRYPOINT**
-  instruction adds an entry command that is not overwritten when arguments are
-  passed to docker run. This is different from the behavior of **CMD**. This allows
-  arguments to be passed to the entrypoint, for instance `docker run <image> -d`
-  passes the -d argument to the **ENTRYPOINT**.  Specify parameters either in the
-  **ENTRYPOINT** JSON array (as in the preferred exec form above), or by using a **CMD**
-  statement.  Parameters in the **ENTRYPOINT** are not overwritten by the docker run
-  arguments.  Parameters specified via **CMD** are overwritten by docker run
-  arguments.  Specify a plain string for the **ENTRYPOINT**, and it will execute in
-  `/bin/sh -c`, like a **CMD** instruction:
-
-  ```
-  FROM ubuntu
-  ENTRYPOINT wc -l -
-  ```
-
-  This means that the Dockerfile's image always takes stdin as input (that's
-  what "-" means), and prints the number of lines (that's what "-l" means). To
-  make this optional but default, use a **CMD**:
-
-  ```
-  FROM ubuntu
-  CMD ["-l", "-"]
-  ENTRYPOINT ["/usr/bin/wc"]
-  ```
-
-**VOLUME**
-  -- `VOLUME ["/data"]`
-  The **VOLUME** instruction creates a mount point with the specified name and marks
-  it as holding externally-mounted volumes from the native host or from other
-  containers.
-
-**USER**
-  -- `USER daemon`
-  Sets the username or UID used for running subsequent commands.
-
-  The **USER** instruction can optionally be used to set the group or GID. The
-  followings examples are all valid:
-  USER [user | user:group | uid | uid:gid | user:gid | uid:group ]
-
-  Until the **USER** instruction is set, instructions will be run as root. The USER
-  instruction can be used any number of times in a Dockerfile, and will only affect
-  subsequent commands.
-
-**WORKDIR**
-  -- `WORKDIR /path/to/workdir`
-  The **WORKDIR** instruction sets the working directory for the **RUN**, **CMD**,
-  **ENTRYPOINT**, **COPY** and **ADD** Dockerfile commands that follow it. It can
-  be used multiple times in a single Dockerfile. Relative paths are defined
-  relative to the path of the previous **WORKDIR** instruction. For example:
-
-  ```
-  WORKDIR /a
-  WORKDIR b
-  WORKDIR c
-  RUN pwd
-  ```
-
-  In the above example, the output of the **pwd** command is **a/b/c**.
-
-**ARG**
-   -- ARG <name>[=<default value>]
-
-  The `ARG` instruction defines a variable that users can pass at build-time to
-  the builder with the `docker build` command using the `--build-arg
-  <varname>=<value>` flag. If a user specifies a build argument that was not
-  defined in the Dockerfile, the build outputs a warning.
-
-  ```
-  [Warning] One or more build-args [foo] were not consumed
-  ```
-
-  The Dockerfile author can define a single variable by specifying `ARG` once or many
-  variables by specifying `ARG` more than once. For example, a valid Dockerfile:
-
-  ```
-  FROM busybox
-  ARG user1
-  ARG buildno
-  ...
-  ```
-
-  A Dockerfile author may optionally specify a default value for an `ARG` instruction:
-
-  ```
-  FROM busybox
-  ARG user1=someuser
-  ARG buildno=1
-  ...
-  ```
-
-  If an `ARG` value has a default and if there is no value passed at build-time, the
-  builder uses the default.
-
-  An `ARG` variable definition comes into effect from the line on which it is
-  defined in the `Dockerfile` not from the argument's use on the command-line or
-  elsewhere.  For example, consider this Dockerfile:
-
-  ```
-  1 FROM busybox
-  2 USER ${user:-some_user}
-  3 ARG user
-  4 USER $user
-  ...
-  ```
-  A user builds this file by calling:
-
-  ```
-  $ docker build --build-arg user=what_user Dockerfile
-  ```
-
-  The `USER` at line 2 evaluates to `some_user` as the `user` variable is defined on the
-  subsequent line 3. The `USER` at line 4 evaluates to `what_user` as `user` is
-  defined and the `what_user` value was passed on the command line. Prior to its definition by an
-  `ARG` instruction, any use of a variable results in an empty string.
-
-  > **Warning:** It is not recommended to use build-time variables for
-  >  passing secrets like github keys, user credentials etc. Build-time variable
-  >  values are visible to any user of the image with the `docker history` command.
-
-  You can use an `ARG` or an `ENV` instruction to specify variables that are
-  available to the `RUN` instruction. Environment variables defined using the
-  `ENV` instruction always override an `ARG` instruction of the same name. Consider
-  this Dockerfile with an `ENV` and `ARG` instruction.
-
-  ```
-  1 FROM ubuntu
-  2 ARG CONT_IMG_VER
-  3 ENV CONT_IMG_VER v1.0.0
-  4 RUN echo $CONT_IMG_VER
-  ```
-  Then, assume this image is built with this command:
-
-  ```
-  $ docker build --build-arg CONT_IMG_VER=v2.0.1 Dockerfile
-  ```
-
-  In this case, the `RUN` instruction uses `v1.0.0` instead of the `ARG` setting
-  passed by the user:`v2.0.1` This behavior is similar to a shell
-  script where a locally scoped variable overrides the variables passed as
-  arguments or inherited from environment, from its point of definition.
-
-  Using the example above but a different `ENV` specification you can create more
-  useful interactions between `ARG` and `ENV` instructions:
-
-  ```
-  1 FROM ubuntu
-  2 ARG CONT_IMG_VER
-  3 ENV CONT_IMG_VER ${CONT_IMG_VER:-v1.0.0}
-  4 RUN echo $CONT_IMG_VER
-  ```
-
-  Unlike an `ARG` instruction, `ENV` values are always persisted in the built
-  image. Consider a docker build without the --build-arg flag:
-
-  ```
-  $ docker build Dockerfile
-  ```
-
-  Using this Dockerfile example, `CONT_IMG_VER` is still persisted in the image but
-  its value would be `v1.0.0` as it is the default set in line 3 by the `ENV` instruction.
-
-  The variable expansion technique in this example allows you to pass arguments
-  from the command line and persist them in the final image by leveraging the
-  `ENV` instruction. Variable expansion is only supported for [a limited set of
-  Dockerfile instructions.](#environment-replacement)
-
-  Docker has a set of predefined `ARG` variables that you can use without a
-  corresponding `ARG` instruction in the Dockerfile.
-
-  * `HTTP_PROXY`
-  * `http_proxy`
-  * `HTTPS_PROXY`
-  * `https_proxy`
-  * `FTP_PROXY`
-  * `ftp_proxy`
-  * `NO_PROXY`
-  * `no_proxy`
-
-  To use these, simply pass them on the command line using the `--build-arg
-  <varname>=<value>` flag.
-
-**ONBUILD**
-  -- `ONBUILD [INSTRUCTION]`
-  The **ONBUILD** instruction adds a trigger instruction to an image. The
-  trigger is executed at a later time, when the image is used as the base for
-  another build. Docker executes the trigger in the context of the downstream
-  build, as if the trigger existed immediately after the **FROM** instruction in
-  the downstream Dockerfile.
-
-  You can register any build instruction as a trigger. A trigger is useful if
-  you are defining an image to use as a base for building other images. For
-  example, if you are defining an application build environment or a daemon that
-  is customized with a user-specific configuration.  
-
-  Consider an image intended as a reusable python application builder. It must
-  add application source code to a particular directory, and might need a build
-  script called after that. You can't just call **ADD** and **RUN** now, because
-  you don't yet have access to the application source code, and it is different
-  for each application build.
-
-  -- Providing application developers with a boilerplate Dockerfile to copy-paste
-  into their application is inefficient, error-prone, and
-  difficult to update because it mixes with application-specific code.
-  The solution is to use **ONBUILD** to register instructions in advance, to
-  run later, during the next build stage.
-
-# HISTORY
-*May 2014, Compiled by Zac Dover (zdover at redhat dot com) based on docker.com Dockerfile documentation.
-*Feb 2015, updated by Brian Goff (cpuguy83@gmail.com) for readability
-*Sept 2015, updated by Sally O'Malley (somalley@redhat.com)
-*Oct 2016, updated by Addam Hardy (addam.hardy@gmail.com)
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile.aarch64 b/installer/vendor/github.com/docker/docker/man/Dockerfile.aarch64
deleted file mode 100644
index e788eb1c1d..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile.aarch64
+++ /dev/null
@@ -1,25 +0,0 @@
-FROM    aarch64/ubuntu:xenial
-
-RUN     apt-get update && apt-get install -y git golang-go
-
-RUN     mkdir -p /go/src /go/bin /go/pkg
-ENV     GOPATH=/go
-RUN     export GLIDE=v0.11.1; \
-        export TARGET=/go/src/github.com/Masterminds; \
-        mkdir -p ${TARGET} && \
-        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
-        cd ${TARGET}/glide && \
-        git checkout $GLIDE && \
-        make build && \
-        cp ./glide /usr/bin/glide && \
-        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
-
-COPY    glide.yaml /manvendor/
-COPY    glide.lock /manvendor/
-WORKDIR /manvendor/
-RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/manvendor
-RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
-
-WORKDIR /go/src/github.com/docker/docker/
-ENTRYPOINT ["man/generate.sh"]
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile.armhf b/installer/vendor/github.com/docker/docker/man/Dockerfile.armhf
deleted file mode 100644
index e7ea495646..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile.armhf
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM armhf/debian:jessie
-
-# allow replacing httpredir or deb mirror
-ARG APT_MIRROR=deb.debian.org
-RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list
-
-RUN apt-get update && apt-get install -y \
-  git \
-  bash \
-  curl \
-  gcc \
-  make
-
-ENV GO_VERSION 1.7.5
-RUN curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" \
-  | tar -xzC /usr/local
-ENV PATH /go/bin:/usr/local/go/bin:$PATH
-ENV GOPATH /go
-
-# We're building for armhf, which is ARMv7, so let's be explicit about that
-ENV GOARCH arm
-ENV GOARM 7
-
-RUN     mkdir -p /go/src /go/bin /go/pkg
-RUN     export GLIDE=v0.11.1; \
-        export TARGET=/go/src/github.com/Masterminds; \
-        mkdir -p ${TARGET} && \
-        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
-        cd ${TARGET}/glide && \
-        git checkout $GLIDE && \
-        make build && \
-        cp ./glide /usr/bin/glide && \
-        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
-
-COPY    glide.yaml /manvendor/
-COPY    glide.lock /manvendor/
-WORKDIR /manvendor/
-RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/manvendor
-RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
-
-WORKDIR /go/src/github.com/docker/docker/
-ENTRYPOINT ["man/generate.sh"]
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile.ppc64le b/installer/vendor/github.com/docker/docker/man/Dockerfile.ppc64le
deleted file mode 100644
index fc96ca7691..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile.ppc64le
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM    ppc64le/ubuntu:xenial
-
-RUN     apt-get update && apt-get install -y \
-        curl \
-        gcc \
-        git \
-        make \
-        tar
-
-ENV     GO_VERSION 1.7.5
-RUN     curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-ppc64le.tar.gz" \
-        | tar -xzC /usr/local
-ENV     PATH /usr/local/go/bin:$PATH
-ENV     GOPATH=/go
-
-RUN     mkdir -p /go/src /go/bin /go/pkg
-RUN     export GLIDE=v0.11.1; \
-        export TARGET=/go/src/github.com/Masterminds; \
-        mkdir -p ${TARGET} && \
-        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
-        cd ${TARGET}/glide && \
-        git checkout $GLIDE && \
-        make build && \
-        cp ./glide /usr/bin/glide && \
-        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
-
-COPY    glide.yaml /manvendor/
-COPY    glide.lock /manvendor/
-WORKDIR /manvendor/
-RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/manvendor
-RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
-
-WORKDIR /go/src/github.com/docker/docker/
-ENTRYPOINT ["man/generate.sh"]
diff --git a/installer/vendor/github.com/docker/docker/man/Dockerfile.s390x b/installer/vendor/github.com/docker/docker/man/Dockerfile.s390x
deleted file mode 100644
index d4bcf1da11..0000000000
--- a/installer/vendor/github.com/docker/docker/man/Dockerfile.s390x
+++ /dev/null
@@ -1,35 +0,0 @@
-FROM    s390x/ubuntu:xenial
-
-RUN     apt-get update && apt-get install -y \
-        curl \
-        gcc \
-        git \
-        make \
-        tar
-
-ENV     GO_VERSION 1.7.5
-RUN     curl -fsSL "https://golang.org/dl/go${GO_VERSION}.linux-s390x.tar.gz" \
-        | tar -xzC /usr/local
-ENV     PATH /usr/local/go/bin:$PATH
-ENV     GOPATH=/go
-
-RUN     mkdir -p /go/src /go/bin /go/pkg
-RUN     export GLIDE=v0.11.1; \
-        export TARGET=/go/src/github.com/Masterminds; \
-        mkdir -p ${TARGET} && \
-        git clone https://github.com/Masterminds/glide.git ${TARGET}/glide && \
-        cd ${TARGET}/glide && \
-        git checkout $GLIDE && \
-        make build && \
-        cp ./glide /usr/bin/glide && \
-        cd / && rm -rf /go/src/* /go/bin/* /go/pkg/*
-
-COPY    glide.yaml /manvendor/
-COPY    glide.lock /manvendor/
-WORKDIR /manvendor/
-RUN     glide install && mv vendor src
-ENV     GOPATH=$GOPATH:/manvendor
-RUN     go build -o /usr/bin/go-md2man github.com/cpuguy83/go-md2man
-
-WORKDIR /go/src/github.com/docker/docker/
-ENTRYPOINT ["man/generate.sh"]
diff --git a/installer/vendor/github.com/docker/docker/man/README.md b/installer/vendor/github.com/docker/docker/man/README.md
deleted file mode 100644
index 82dac650f9..0000000000
--- a/installer/vendor/github.com/docker/docker/man/README.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Docker Documentation
-====================
-
-This directory contains scripts for generating the man pages. Many of the man
-pages are generated directly from the `spf13/cobra` `Command` definition. Some
-legacy pages are still generated from the markdown files in this directory.
-Do *not* edit the man pages in the man1 directory. Instead, update the
-Cobra command or amend the Markdown files for legacy pages.
-
-
-## Generate the man pages
-
-From within the project root directory run:
-
-    make manpages
diff --git a/installer/vendor/github.com/docker/docker/man/docker-attach.1.md b/installer/vendor/github.com/docker/docker/man/docker-attach.1.md
deleted file mode 100644
index c39d1c9290..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-attach.1.md
+++ /dev/null
@@ -1,99 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-attach - Attach to a running container
-
-# SYNOPSIS
-**docker attach**
-[**--detach-keys**[=*[]*]]
-[**--help**]
-[**--no-stdin**]
-[**--sig-proxy**[=*true*]]
-CONTAINER
-
-# DESCRIPTION
-The **docker attach** command allows you to attach to a running container using
-the container's ID or name, either to view its ongoing output or to control it
-interactively.  You can attach to the same contained process multiple times
-simultaneously, screen sharing style, or quickly view the progress of your
-detached process.
-
-To stop a container, use `CTRL-c`. This key sequence sends `SIGKILL` to the
-container. You can detach from the container (and leave it running) using a
-configurable key sequence. The default sequence is `CTRL-p CTRL-q`. You
-configure the key sequence using the **--detach-keys** option or a configuration
-file. See **config-json(5)** for documentation on using a configuration file.
-
-It is forbidden to redirect the standard input of a `docker attach` command while
-attaching to a tty-enabled container (i.e.: launched with `-t`).
-
-# OPTIONS
-**--detach-keys**=""
-    Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**--help**
-  Print usage statement
-
-**--no-stdin**=*true*|*false*
-   Do not attach STDIN. The default is *false*.
-
-**--sig-proxy**=*true*|*false*
-   Proxy all received signals to the process (non-TTY mode only). SIGCHLD, SIGKILL, and SIGSTOP are not proxied. The default is *true*.
-
-# Override the detach sequence
-
-If you want, you can configure an override the Docker key sequence for detach.
-This is useful if the Docker default sequence conflicts with key sequence you
-use for other applications. There are two ways to define your own detach key
-sequence, as a per-container override or as a configuration property on  your
-entire configuration.
-
-To override the sequence for an individual container, use the
-`--detach-keys="<sequence>"` flag with the `docker attach` command. The format of
-the `<sequence>` is either a letter [a-Z], or the `ctrl-` combined with any of
-the following:
-
-* `a-z` (a single lowercase alpha character )
-* `@` (at sign)
-* `[` (left bracket)
-* `\\` (two backward slashes)
-*  `_` (underscore)
-* `^` (caret)
-
-These `a`, `ctrl-a`, `X`, or `ctrl-\\` values are all examples of valid key
-sequences. To configure a different configuration default key sequence for all
-containers, see **docker(1)**.
-
-# EXAMPLES
-
-## Attaching to a container
-
-In this example the top command is run inside a container, from an image called
-fedora, in detached mode. The ID from the container is passed into the **docker
-attach** command:
-
-    # ID=$(sudo docker run -d fedora /usr/bin/top -b)
-    # sudo docker attach $ID
-    top - 02:05:52 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-    Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-    Cpu(s):  0.1%us,  0.2%sy,  0.0%ni, 99.7%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-    Mem:    373572k total,   355560k used,    18012k free,    27872k buffers
-    Swap:   786428k total,        0k used,   786428k free,   221740k cached
-
-    PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-    1 root      20   0 17200 1116  912 R    0  0.3   0:00.03 top
-
-    top - 02:05:55 up  3:05,  0 users,  load average: 0.01, 0.02, 0.05
-    Tasks:   1 total,   1 running,   0 sleeping,   0 stopped,   0 zombie
-    Cpu(s):  0.0%us,  0.2%sy,  0.0%ni, 99.8%id,  0.0%wa,  0.0%hi,  0.0%si,  0.0%st
-    Mem:    373572k total,   355244k used,    18328k free,    27872k buffers
-    Swap:   786428k total,        0k used,   786428k free,   221776k cached
-
-    PID USER      PR  NI  VIRT  RES  SHR S %CPU %MEM    TIME+  COMMAND
-    1 root      20   0 17208 1144  932 R    0  0.3   0:00.03 top
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-build.1.md b/installer/vendor/github.com/docker/docker/man/docker-build.1.md
deleted file mode 100644
index 4beee88e4a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-build.1.md
+++ /dev/null
@@ -1,340 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-build - Build an image from a Dockerfile
-
-# SYNOPSIS
-**docker build**
-[**--build-arg**[=*[]*]]
-[**--cpu-shares**[=*0*]]
-[**--cgroup-parent**[=*CGROUP-PARENT*]]
-[**--help**]
-[**-f**|**--file**[=*PATH/Dockerfile*]]
-[**-squash**] *Experimental*
-[**--force-rm**]
-[**--isolation**[=*default*]]
-[**--label**[=*[]*]]
-[**--no-cache**]
-[**--pull**]
-[**--compress**]
-[**-q**|**--quiet**]
-[**--rm**[=*true*]]
-[**-t**|**--tag**[=*[]*]]
-[**-m**|**--memory**[=*MEMORY*]]
-[**--memory-swap**[=*LIMIT*]]
-[**--network**[=*"default"*]]
-[**--shm-size**[=*SHM-SIZE*]]
-[**--cpu-period**[=*0*]]
-[**--cpu-quota**[=*0*]]
-[**--cpuset-cpus**[=*CPUSET-CPUS*]]
-[**--cpuset-mems**[=*CPUSET-MEMS*]]
-[**--ulimit**[=*[]*]]
-PATH | URL | -
-
-# DESCRIPTION
-This will read the Dockerfile from the directory specified in **PATH**.
-It also sends any other files and directories found in the current
-directory to the Docker daemon. The contents of this directory would
-be used by **ADD** commands found within the Dockerfile.
-
-Warning, this will send a lot of data to the Docker daemon depending
-on the contents of the current directory. The build is run by the Docker
-daemon, not by the CLI, so the whole context must be transferred to the daemon. 
-The Docker CLI reports "Sending build context to Docker daemon" when the context is sent to
-the daemon.
-
-When the URL to a tarball archive or to a single Dockerfile is given, no context is sent from
-the client to the Docker daemon. In this case, the Dockerfile at the root of the archive and
-the rest of the archive will get used as the context of the build.  When a Git repository is
-set as the **URL**, the repository is cloned locally and then sent as the context.
-
-# OPTIONS
-**-f**, **--file**=*PATH/Dockerfile*
-   Path to the Dockerfile to use. If the path is a relative path and you are
-   building from a local directory, then the path must be relative to that
-   directory. If you are building from a remote URL pointing to either a
-   tarball or a Git repository, then the path must be relative to the root of
-   the remote context. In all cases, the file must be within the build context.
-   The default is *Dockerfile*.
-
-**--squash**=*true*|*false*
-   **Experimental Only**
-   Once the image is built, squash the new layers into a new image with a single
-   new layer. Squashing does not destroy any existing image, rather it creates a new
-   image with the content of the squshed layers. This effectively makes it look
-   like all `Dockerfile` commands were created with a single layer. The build
-   cache is preserved with this method.
-
-   **Note**: using this option means the new image will not be able to take
-   advantage of layer sharing with other images and may use significantly more
-   space.
-
-   **Note**: using this option you may see significantly more space used due to
-   storing two copies of the image, one for the build cache with all the cache
-   layers in tact, and one for the squashed version.
-
-**--build-arg**=*variable*
-   name and value of a **buildarg**.
-
-   For example, if you want to pass a value for `http_proxy`, use
-   `--build-arg=http_proxy="http://some.proxy.url"`
-
-   Users pass these values at build-time. Docker uses the `buildargs` as the
-   environment context for command(s) run via the Dockerfile's `RUN` instruction
-   or for variable expansion in other Dockerfile instructions. This is not meant
-   for passing secret values. [Read more about the buildargs instruction](https://docs.docker.com/engine/reference/builder/#arg)
-
-**--force-rm**=*true*|*false*
-   Always remove intermediate containers, even after unsuccessful builds. The default is *false*.
-
-**--isolation**="*default*"
-   Isolation specifies the type of isolation technology used by containers. 
-
-**--label**=*label*
-   Set metadata for an image
-
-**--no-cache**=*true*|*false*
-   Do not use cache when building the image. The default is *false*.
-
-**--help**
-  Print usage statement
-
-**--pull**=*true*|*false*
-   Always attempt to pull a newer version of the image. The default is *false*.
-
-**--compress**=*true*|*false*
-    Compress the build context using gzip. The default is *false*.
-
-**-q**, **--quiet**=*true*|*false*
-   Suppress the build output and print image ID on success. The default is *false*.
-
-**--rm**=*true*|*false*
-   Remove intermediate containers after a successful build. The default is *true*.
-
-**-t**, **--tag**=""
-   Repository names (and optionally with tags) to be applied to the resulting 
-   image in case of success. Refer to **docker-tag(1)** for more information
-   about valid tag names.
-
-**-m**, **--memory**=*MEMORY*
-  Memory limit
-
-**--memory-swap**=*LIMIT*
-   A limit value equal to memory plus swap. Must be used with the  **-m**
-(**--memory**) flag. The swap `LIMIT` should always be larger than **-m**
-(**--memory**) value.
-
-   The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
-`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a
-unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
-
-**--network**=*bridge*
-  Set the networking mode for the RUN instructions during build. Supported standard
-  values are: `bridge`, `host`, `none` and `container:<name|id>`. Any other value
-  is taken as a custom network's name or ID which this container should connect to.
-
-**--shm-size**=*SHM-SIZE*
-  Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`.
-  Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes.
-  If you omit the size entirely, the system uses `64m`.
-
-**--cpu-shares**=*0*
-  CPU shares (relative weight).
-
-  By default, all containers get the same proportion of CPU cycles.
-  CPU shares is a 'relative weight', relative to the default setting of 1024.
-  This default value is defined here: 
-  ```
-   cat /sys/fs/cgroup/cpu/cpu.shares
-   1024
-  ```
-  You can change this proportion by adjusting the container's CPU share 
-  weighting relative to the weighting of all other running containers.
-
-  To modify the proportion from the default of 1024, use the **--cpu-shares**
-  flag to set the weighting to 2 or higher.
-
-      Container   CPU share    Flag             
-      {C0}        60% of CPU  --cpu-shares=614 (614 is 60% of 1024)
-      {C1}        40% of CPU  --cpu-shares=410 (410 is 40% of 1024)
-
-  The proportion is only applied when CPU-intensive processes are running.
-  When tasks in one container are idle, the other containers can use the
-  left-over CPU time. The actual amount of CPU time used varies depending on
-  the number of containers running on the system.
-
-  For example, consider three containers, where one has **--cpu-shares=1024** and
-  two others have **--cpu-shares=512**. When processes in all three
-  containers attempt to use 100% of CPU, the first container would receive
-  50% of the total CPU time. If you add a fourth container with **--cpu-shares=1024**,
-  the first container only gets 33% of the CPU. The remaining containers
-  receive 16.5%, 16.5% and 33% of the CPU.
-
-
-      Container   CPU share   Flag                CPU time            
-      {C0}        100%        --cpu-shares=1024   33%
-      {C1}        50%         --cpu-shares=512    16.5%
-      {C2}        50%         --cpu-shares=512    16.5%
-      {C4}        100%        --cpu-shares=1024   33%
-
-
-  On a multi-core system, the shares of CPU time are distributed across the CPU
-  cores. Even if a container is limited to less than 100% of CPU time, it can
-  use 100% of each individual CPU core.
-
-  For example, consider a system with more than three cores. If you start one
-  container **{C0}** with **--cpu-shares=512** running one process, and another container
-  **{C1}** with **--cpu-shares=1024** running two processes, this can result in the following
-  division of CPU shares:
-
-      PID    container    CPU    CPU share
-      100    {C0}         0      100% of CPU0
-      101    {C1}         1      100% of CPU1
-      102    {C1}         2      100% of CPU2
-
-**--cpu-period**=*0*
-  Limit the CPU CFS (Completely Fair Scheduler) period.
-
-  Limit the container's CPU usage. This flag causes the kernel to restrict the
-  container's CPU usage to the period you specify.
-
-**--cpu-quota**=*0*
-  Limit the CPU CFS (Completely Fair Scheduler) quota. 
-
-  By default, containers run with the full CPU resource. This flag causes the
-kernel to restrict the container's CPU usage to the quota you specify.
-
-**--cpuset-cpus**=*CPUSET-CPUS*
-  CPUs in which to allow execution (0-3, 0,1).
-
-**--cpuset-mems**=*CPUSET-MEMS*
-  Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on
-  NUMA systems.
-
-  For example, if you have four memory nodes on your system (0-3), use `--cpuset-mems=0,1`
-to ensure the processes in your Docker container only use memory from the first
-two memory nodes.
-
-**--cgroup-parent**=*CGROUP-PARENT*
-  Path to `cgroups` under which the container's `cgroup` are created.
-
-  If the path is not absolute, the path is considered relative to the `cgroups` path of the init process.
-Cgroups are created if they do not already exist.
-
-**--ulimit**=[]
-  Ulimit options
-
-  For more information about `ulimit` see [Setting ulimits in a 
-container](https://docs.docker.com/engine/reference/commandline/run/#set-ulimits-in-container---ulimit)
-
-# EXAMPLES
-
-## Building an image using a Dockerfile located inside the current directory
-
-Docker images can be built using the build command and a Dockerfile:
-
-    docker build .
-
-During the build process Docker creates intermediate images. In order to
-keep them, you must explicitly set `--rm=false`.
-
-    docker build --rm=false .
-
-A good practice is to make a sub-directory with a related name and create
-the Dockerfile in that directory. For example, a directory called mongo may
-contain a Dockerfile to create a Docker MongoDB image. Likewise, another
-directory called httpd may be used to store Dockerfiles for Apache web
-server images.
-
-It is also a good practice to add the files required for the image to the
-sub-directory. These files will then be specified with the `COPY` or `ADD`
-instructions in the `Dockerfile`.
-
-Note: If you include a tar file (a good practice), then Docker will
-automatically extract the contents of the tar file specified within the `ADD`
-instruction into the specified target.
-
-## Building an image and naming that image
-
-A good practice is to give a name to the image you are building. Note that 
-only a-z0-9-_. should be used for consistency.  There are no hard rules here but it is best to give the names consideration. 
-
-The **-t**/**--tag** flag is used to rename an image. Here are some examples:
-
-Though it is not a good practice, image names can be arbitrary:
-
-    docker build -t myimage .
-
-A better approach is to provide a fully qualified and meaningful repository,
-name, and tag (where the tag in this context means the qualifier after 
-the ":"). In this example we build a JBoss image for the Fedora repository 
-and give it the version 1.0:
-
-    docker build -t fedora/jboss:1.0 .
-
-The next example is for the "whenry" user repository and uses Fedora and
-JBoss and gives it the version 2.1 :
-
-    docker build -t whenry/fedora-jboss:v2.1 .
-
-If you do not provide a version tag then Docker will assign `latest`:
-
-    docker build -t whenry/fedora-jboss .
-
-When you list the images, the image above will have the tag `latest`.
-
-You can apply multiple tags to an image. For example, you can apply the `latest`
-tag to a newly built image and add another tag that references a specific
-version.
-For example, to tag an image both as `whenry/fedora-jboss:latest` and
-`whenry/fedora-jboss:v2.1`, use the following:
-
-    docker build -t whenry/fedora-jboss:latest -t whenry/fedora-jboss:v2.1 .
-
-So renaming an image is arbitrary but consideration should be given to 
-a useful convention that makes sense for consumers and should also take
-into account Docker community conventions.
-
-
-## Building an image using a URL
-
-This will clone the specified GitHub repository from the URL and use it
-as context. The Dockerfile at the root of the repository is used as
-Dockerfile. This only works if the GitHub repository is a dedicated
-repository.
-
-    docker build github.com/scollier/purpletest
-
-Note: You can set an arbitrary Git repository via the `git://` scheme.
-
-## Building an image using a URL to a tarball'ed context
-
-This will send the URL itself to the Docker daemon. The daemon will fetch the
-tarball archive, decompress it and use its contents as the build context.  The 
-Dockerfile at the root of the archive and the rest of the archive will get used
-as the context of the build. If you pass an **-f PATH/Dockerfile** option as well,
-the system will look for that file inside the contents of the tarball.
-
-    docker build -f dev/Dockerfile https://10.10.10.1/docker/context.tar.gz
-
-Note: supported compression formats are 'xz', 'bzip2', 'gzip' and 'identity' (no compression).
-
-## Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Windows. The `--isolation=<value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. On Microsoft Windows, you can specify these values:
-
-* `default`: Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value.
-* `process`: Namespace isolation only.
-* `hyperv`: Hyper-V hypervisor partition-based isolation.
-
-Specifying the `--isolation` flag without a value is the same as setting `--isolation="default"`.
-
-# HISTORY
-March 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-June 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-commit.1.md b/installer/vendor/github.com/docker/docker/man/docker-commit.1.md
deleted file mode 100644
index d8a4cf8387..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-commit.1.md
+++ /dev/null
@@ -1,71 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-commit - Create a new image from a container's changes
-
-# SYNOPSIS
-**docker commit**
-[**-a**|**--author**[=*AUTHOR*]]
-[**-c**|**--change**[=\[*DOCKERFILE INSTRUCTIONS*\]]]
-[**--help**]
-[**-m**|**--message**[=*MESSAGE*]]
-[**-p**|**--pause**[=*true*]]
-CONTAINER [REPOSITORY[:TAG]]
-
-# DESCRIPTION
-Create a new image from an existing container specified by name or
-container ID.  The new image will contain the contents of the
-container filesystem, *excluding* any data volumes. Refer to **docker-tag(1)**
-for more information about valid image and tag names.
-
-While the `docker commit` command is a convenient way of extending an
-existing image, you should prefer the use of a Dockerfile and `docker
-build` for generating images that you intend to share with other
-people.
-
-# OPTIONS
-**-a**, **--author**=""
-   Author (e.g., "John Hannibal Smith <hannibal@a-team.com>")
-
-**-c** , **--change**=[]
-   Apply specified Dockerfile instructions while committing the image
-   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`LABEL`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
-
-**--help**
-  Print usage statement
-
-**-m**, **--message**=""
-   Commit message
-
-**-p**, **--pause**=*true*|*false*
-   Pause container during commit. The default is *true*.
-
-# EXAMPLES
-
-## Creating a new image from an existing container
-An existing Fedora based container has had Apache installed while running
-in interactive mode with the bash shell. Apache is also running. To
-create a new image run `docker ps` to find the container's ID and then run:
-
-    # docker commit -m="Added Apache to Fedora base image" \
-      -a="A D Ministrator" 98bd7fc99854 fedora/fedora_httpd:20
-
-Note that only a-z0-9-_. are allowed when naming images from an 
-existing container.
-
-## Apply specified Dockerfile instructions while committing the image
-If an existing container was created without the DEBUG environment
-variable set to "true", you can create a new image based on that
-container by first getting the container's ID with `docker ps` and
-then running:
-
-    # docker commit -c="ENV DEBUG true" 98bd7fc99854 debug-image
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and in
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-Oct 2014, updated by Daniel, Dao Quang Minh <daniel at nitrous dot io>
-June 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-config-json.5.md b/installer/vendor/github.com/docker/docker/man/docker-config-json.5.md
deleted file mode 100644
index 49987f08b8..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-config-json.5.md
+++ /dev/null
@@ -1,72 +0,0 @@
-% CONFIG.JSON(5) Docker User Manuals
-% Docker Community
-% JANUARY 2016
-# NAME
-HOME/.docker/config.json - Default Docker configuration file
-
-# INTRODUCTION
-
-By default, the Docker command line stores its configuration files in a
-directory called `.docker` within your `$HOME` directory.  Docker manages most of
-the files in the configuration directory and you should not modify them.
-However, you *can modify* the `config.json` file to control certain aspects of
-how the `docker` command behaves.
-
-Currently, you can modify the `docker` command behavior using environment
-variables or command-line options. You can also use options within
-`config.json` to modify some of the same behavior. When using these
-mechanisms, you must keep in mind the order of precedence among them. Command
-line options override environment variables and environment variables override
-properties you specify in a `config.json` file.
-
-The `config.json` file stores a JSON encoding of several properties:
-
-* The `HttpHeaders` property specifies a set of headers to include in all messages
-sent from the Docker client to the daemon. Docker does not try to interpret or
-understand these header; it simply puts them into the messages. Docker does not
-allow these headers to change any headers it sets for itself.
-
-* The `psFormat` property specifies the default format for `docker ps` output.
-When the `--format` flag is not provided with the `docker ps` command,
-Docker's client uses this property. If this property is not set, the client
-falls back to the default table format. For a list of supported formatting
-directives, see **docker-ps(1)**.
-
-* The `detachKeys` property specifies the default key sequence which
-detaches the container. When the `--detach-keys` flag is not provide
-with the `docker attach`, `docker exec`, `docker run` or `docker
-start`, Docker's client uses this property. If this property is not
-set, the client falls back to the default sequence `ctrl-p,ctrl-q`.
-
-
-* The `imagesFormat` property  specifies the default format for `docker images`
-output. When the `--format` flag is not provided with the `docker images`
-command, Docker's client uses this property. If this property is not set, the
-client falls back to the default table format. For a list of supported
-formatting directives, see **docker-images(1)**.
-
-You can specify a different location for the configuration files via the
-`DOCKER_CONFIG` environment variable or the `--config` command line option. If
-both are specified, then the `--config` option overrides the `DOCKER_CONFIG`
-environment variable:
-
-    docker --config ~/testconfigs/ ps
-
-This command instructs Docker to use the configuration files in the
-`~/testconfigs/` directory when running the `ps` command.
-
-## Examples
-
-Following is a sample `config.json` file:
-
-    {
-      "HttpHeaders": {
-        "MyHeader": "MyValue"
-      },
-      "psFormat": "table {{.ID}}\\t{{.Image}}\\t{{.Command}}\\t{{.Labels}}",
-      "imagesFormat": "table {{.ID}}\\t{{.Repository}}\\t{{.Tag}}\\t{{.CreatedAt}}",
-      "detachKeys": "ctrl-e,e"
-    }
-
-# HISTORY
-January 2016, created by Moxiegirl <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-cp.1.md b/installer/vendor/github.com/docker/docker/man/docker-cp.1.md
deleted file mode 100644
index 949d60bb8b..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-cp.1.md
+++ /dev/null
@@ -1,175 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-cp - Copy files/folders between a container and the local filesystem.
-
-# SYNOPSIS
-**docker cp**
-[**--help**]
-CONTAINER:SRC_PATH DEST_PATH|-
-
-**docker cp**
-[**--help**]
-SRC_PATH|- CONTAINER:DEST_PATH
-
-# DESCRIPTION
-
-The `docker cp` utility copies the contents of `SRC_PATH` to the `DEST_PATH`.
-You can copy from the container's file system to the local machine or the
-reverse, from the local filesystem to the container. If `-` is specified for
-either the `SRC_PATH` or `DEST_PATH`, you can also stream a tar archive from
-`STDIN` or to `STDOUT`. The `CONTAINER` can be a running or stopped container.
-The `SRC_PATH` or `DEST_PATH` can be a file or directory.
-
-The `docker cp` command assumes container paths are relative to the container's 
-`/` (root) directory. This means supplying the initial forward slash is optional; 
-The command sees `compassionate_darwin:/tmp/foo/myfile.txt` and
-`compassionate_darwin:tmp/foo/myfile.txt` as identical. Local machine paths can
-be an absolute or relative value. The command interprets a local machine's
-relative paths as relative to the current working directory where `docker cp` is
-run.
-
-The `cp` command behaves like the Unix `cp -a` command in that directories are
-copied recursively with permissions preserved if possible. Ownership is set to
-the user and primary group at the destination. For example, files copied to a
-container are created with `UID:GID` of the root user. Files copied to the local
-machine are created with the `UID:GID` of the user which invoked the `docker cp`
-command.  If you specify the `-L` option, `docker cp` follows any symbolic link
-in the `SRC_PATH`. `docker cp` does *not* create parent directories for
-`DEST_PATH` if they do not exist.
-
-Assuming a path separator of `/`, a first argument of `SRC_PATH` and second
-argument of `DEST_PATH`, the behavior is as follows:
-
-- `SRC_PATH` specifies a file
-    - `DEST_PATH` does not exist
-        - the file is saved to a file created at `DEST_PATH`
-    - `DEST_PATH` does not exist and ends with `/`
-        - Error condition: the destination directory must exist.
-    - `DEST_PATH` exists and is a file
-        - the destination is overwritten with the source file's contents
-    - `DEST_PATH` exists and is a directory
-        - the file is copied into this directory using the basename from
-          `SRC_PATH`
-- `SRC_PATH` specifies a directory
-    - `DEST_PATH` does not exist
-        - `DEST_PATH` is created as a directory and the *contents* of the source
-           directory are copied into this directory
-    - `DEST_PATH` exists and is a file
-        - Error condition: cannot copy a directory to a file
-    - `DEST_PATH` exists and is a directory
-        - `SRC_PATH` does not end with `/.`
-            - the source directory is copied into this directory
-        - `SRC_PATH` does end with `/.`
-            - the *content* of the source directory is copied into this
-              directory
-
-The command requires `SRC_PATH` and `DEST_PATH` to exist according to the above
-rules. If `SRC_PATH` is local and is a symbolic link, the symbolic link, not
-the target, is copied by default. To copy the link target and not the link, 
-specify the `-L` option.
-
-A colon (`:`) is used as a delimiter between `CONTAINER` and its path. You can
-also use `:` when specifying paths to a `SRC_PATH` or `DEST_PATH` on a local
-machine, for example  `file:name.txt`. If you use a `:` in a local machine path,
-you must be explicit with a relative or absolute path, for example:
-
-    `/path/to/file:name.txt` or `./file:name.txt`
-
-It is not possible to copy certain system files such as resources under
-`/proc`, `/sys`, `/dev`, tmpfs, and mounts created by the user in the container.
-However, you can still copy such files by manually running `tar` in `docker exec`.
-For example (consider `SRC_PATH` and `DEST_PATH` are directories):
-
-    $ docker exec foo tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | tar Cxf DEST_PATH -
-
-or
-
-    $ tar Ccf $(dirname SRC_PATH) - $(basename SRC_PATH) | docker exec -i foo tar Cxf DEST_PATH -
-
-
-Using `-` as the `SRC_PATH` streams the contents of `STDIN` as a tar archive.
-The command extracts the content of the tar to the `DEST_PATH` in container's
-filesystem. In this case, `DEST_PATH` must specify a directory. Using `-` as
-the `DEST_PATH` streams the contents of the resource as a tar archive to `STDOUT`.
-
-# OPTIONS
-**-L**, **--follow-link**=*true*|*false*
-  Follow symbol link in SRC_PATH
-
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-Suppose a container has finished producing some output as a file it saves
-to somewhere in its filesystem. This could be the output of a build job or
-some other computation. You can copy these outputs from the container to a
-location on your local host.
-
-If you want to copy the `/tmp/foo` directory from a container to the
-existing `/tmp` directory on your host. If you run `docker cp` in your `~`
-(home) directory on the local host:
-
-    $ docker cp compassionate_darwin:tmp/foo /tmp
-
-Docker creates a `/tmp/foo` directory on your host. Alternatively, you can omit
-the leading slash in the command. If you execute this command from your home
-directory:
-
-    $ docker cp compassionate_darwin:tmp/foo tmp
-
-If `~/tmp` does not exist, Docker will create it and copy the contents of
-`/tmp/foo` from the container into this new directory. If `~/tmp` already
-exists as a directory, then Docker will copy the contents of `/tmp/foo` from
-the container into a directory at `~/tmp/foo`.
-
-When copying a single file to an existing `LOCALPATH`, the `docker cp` command
-will either overwrite the contents of `LOCALPATH` if it is a file or place it
-into `LOCALPATH` if it is a directory, overwriting an existing file of the same
-name if one exists. For example, this command:
-
-    $ docker cp sharp_ptolemy:/tmp/foo/myfile.txt /test
-
-If `/test` does not exist on the local machine, it will be created as a file
-with the contents of `/tmp/foo/myfile.txt` from the container. If `/test`
-exists as a file, it will be overwritten. Lastly, if `/test` exists as a
-directory, the file will be copied to `/test/myfile.txt`.
-
-Next, suppose you want to copy a file or folder into a container. For example,
-this could be a configuration file or some other input to a long running
-computation that you would like to place into a created container before it
-starts. This is useful because it does not require the configuration file or
-other input to exist in the container image.
-
-If you have a file, `config.yml`, in the current directory on your local host
-and wish to copy it to an existing directory at `/etc/my-app.d` in a container,
-this command can be used:
-
-    $ docker cp config.yml myappcontainer:/etc/my-app.d
-
-If you have several files in a local directory `/config` which you need to copy
-to a directory `/etc/my-app.d` in a container:
-
-    $ docker cp /config/. myappcontainer:/etc/my-app.d
-
-The above command will copy the contents of the local `/config` directory into
-the directory `/etc/my-app.d` in the container.
-
-Finally, if you want to copy a symbolic link into a container, you typically
-want to  copy the linked target and not the link itself. To copy the target, use
-the `-L` option, for example:
-
-    $ ln -s /tmp/somefile /tmp/somefile.ln
-    $ docker cp -L /tmp/somefile.ln myappcontainer:/tmp/
-
-This command copies content of the local `/tmp/somefile` into the file
-`/tmp/somefile.ln` in the container. Without `-L` option, the `/tmp/somefile.ln`
-preserves its symbolic link but not its content.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-May 2015, updated by Josh Hawn <josh.hawn@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-create.1.md b/installer/vendor/github.com/docker/docker/man/docker-create.1.md
deleted file mode 100644
index 3f8a076374..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-create.1.md
+++ /dev/null
@@ -1,553 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-create - Create a new container
-
-# SYNOPSIS
-**docker create**
-[**-a**|**--attach**[=*[]*]]
-[**--add-host**[=*[]*]]
-[**--blkio-weight**[=*[BLKIO-WEIGHT]*]]
-[**--blkio-weight-device**[=*[]*]]
-[**--cpu-shares**[=*0*]]
-[**--cap-add**[=*[]*]]
-[**--cap-drop**[=*[]*]]
-[**--cgroup-parent**[=*CGROUP-PATH*]]
-[**--cidfile**[=*CIDFILE*]]
-[**--cpu-count**[=*0*]]
-[**--cpu-percent**[=*0*]]
-[**--cpu-period**[=*0*]]
-[**--cpu-quota**[=*0*]]
-[**--cpu-rt-period**[=*0*]]
-[**--cpu-rt-runtime**[=*0*]]
-[**--cpus**[=*0.0*]]
-[**--cpuset-cpus**[=*CPUSET-CPUS*]]
-[**--cpuset-mems**[=*CPUSET-MEMS*]]
-[**--device**[=*[]*]]
-[**--device-read-bps**[=*[]*]]
-[**--device-read-iops**[=*[]*]]
-[**--device-write-bps**[=*[]*]]
-[**--device-write-iops**[=*[]*]]
-[**--dns**[=*[]*]]
-[**--dns-search**[=*[]*]]
-[**--dns-option**[=*[]*]]
-[**-e**|**--env**[=*[]*]]
-[**--entrypoint**[=*ENTRYPOINT*]]
-[**--env-file**[=*[]*]]
-[**--expose**[=*[]*]]
-[**--group-add**[=*[]*]]
-[**-h**|**--hostname**[=*HOSTNAME*]]
-[**--help**]
-[**-i**|**--interactive**]
-[**--ip**[=*IPv4-ADDRESS*]]
-[**--ip6**[=*IPv6-ADDRESS*]]
-[**--ipc**[=*IPC*]]
-[**--isolation**[=*default*]]
-[**--kernel-memory**[=*KERNEL-MEMORY*]]
-[**-l**|**--label**[=*[]*]]
-[**--label-file**[=*[]*]]
-[**--link**[=*[]*]]
-[**--link-local-ip**[=*[]*]]
-[**--log-driver**[=*[]*]]
-[**--log-opt**[=*[]*]]
-[**-m**|**--memory**[=*MEMORY*]]
-[**--mac-address**[=*MAC-ADDRESS*]]
-[**--memory-reservation**[=*MEMORY-RESERVATION*]]
-[**--memory-swap**[=*LIMIT*]]
-[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]
-[**--name**[=*NAME*]]
-[**--network-alias**[=*[]*]]
-[**--network**[=*"bridge"*]]
-[**--oom-kill-disable**]
-[**--oom-score-adj**[=*0*]]
-[**-P**|**--publish-all**]
-[**-p**|**--publish**[=*[]*]]
-[**--pid**[=*[PID]*]]
-[**--userns**[=*[]*]]
-[**--pids-limit**[=*PIDS_LIMIT*]]
-[**--privileged**]
-[**--read-only**]
-[**--restart**[=*RESTART*]]
-[**--rm**]
-[**--security-opt**[=*[]*]]
-[**--storage-opt**[=*[]*]]
-[**--stop-signal**[=*SIGNAL*]]
-[**--stop-timeout**[=*TIMEOUT*]]
-[**--shm-size**[=*[]*]]
-[**--sysctl**[=*[]*]]
-[**-t**|**--tty**]
-[**--tmpfs**[=*[CONTAINER-DIR[:<OPTIONS>]*]]
-[**-u**|**--user**[=*USER*]]
-[**--ulimit**[=*[]*]]
-[**--uts**[=*[]*]]
-[**-v**|**--volume**[=*[[HOST-DIR:]CONTAINER-DIR[:OPTIONS]]*]]
-[**--volume-driver**[=*DRIVER*]]
-[**--volumes-from**[=*[]*]]
-[**-w**|**--workdir**[=*WORKDIR*]]
-IMAGE [COMMAND] [ARG...]
-
-# DESCRIPTION
-
-Creates a writeable container layer over the specified image and prepares it for
-running the specified command. The container ID is then printed to STDOUT. This
-is similar to **docker run -d** except the container is never started. You can 
-then use the **docker start <container_id>** command to start the container at
-any point.
-
-The initial status of the container created with **docker create** is 'created'.
-
-# OPTIONS
-**-a**, **--attach**=[]
-   Attach to STDIN, STDOUT or STDERR.
-
-**--add-host**=[]
-   Add a custom host-to-IP mapping (host:ip)
-
-**--blkio-weight**=*0*
-   Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-
-**--blkio-weight-device**=[]
-   Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`).
-
-**--cpu-shares**=*0*
-   CPU shares (relative weight)
-
-**--cap-add**=[]
-   Add Linux capabilities
-
-**--cap-drop**=[]
-   Drop Linux capabilities
-
-**--cgroup-parent**=""
-   Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist.
-
-**--cidfile**=""
-   Write the container ID to the file
-
-**--cpu-count**=*0*
-    Limit the number of CPUs available for execution by the container.
-    
-    On Windows Server containers, this is approximated as a percentage of total CPU usage.
-
-    On Windows Server containers, the processor resource controls are mutually exclusive, the order of precedence is CPUCount first, then CPUShares, and CPUPercent last.
-
-**--cpu-percent**=*0*
-    Limit the percentage of CPU available for execution by a container running on a Windows daemon.
-
-    On Windows Server containers, the processor resource controls are mutually exclusive, the order of precedence is CPUCount first, then CPUShares, and CPUPercent last.
-
-**--cpu-period**=*0*
-    Limit the CPU CFS (Completely Fair Scheduler) period
-
-    Limit the container's CPU usage. This flag tell the kernel to restrict the container's CPU usage to the period you specify.
-
-**--cpuset-cpus**=""
-   CPUs in which to allow execution (0-3, 0,1)
-
-**--cpuset-mems**=""
-   Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-
-   If you have four memory nodes on your system (0-3), use `--cpuset-mems=0,1`
-then processes in your Docker container will only use memory from the first
-two memory nodes.
-
-**--cpu-quota**=*0*
-   Limit the CPU CFS (Completely Fair Scheduler) quota
-
-**--cpu-rt-period**=0
-   Limit the CPU real-time period in microseconds
-
-   Limit the container's Real Time CPU usage. This flag tell the kernel to restrict the container's Real Time CPU usage to the period you specify.
-
-**--cpu-rt-runtime**=0
-   Limit the CPU real-time runtime in microseconds
-
-   Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex:
-   Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks.
-
-   The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup.
-
-**--cpus**=0.0
-   Number of CPUs. The default is *0.0*.
-
-**--device**=[]
-   Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)
-
-**--device-read-bps**=[]
-    Limit read rate (bytes per second) from a device (e.g. --device-read-bps=/dev/sda:1mb)
-
-**--device-read-iops**=[]
-    Limit read rate (IO per second) from a device (e.g. --device-read-iops=/dev/sda:1000)
-
-**--device-write-bps**=[]
-    Limit write rate (bytes per second) to a device (e.g. --device-write-bps=/dev/sda:1mb)
-
-**--device-write-iops**=[]
-    Limit write rate (IO per second) to a device (e.g. --device-write-iops=/dev/sda:1000)
-
-**--dns**=[]
-   Set custom DNS servers
-
-**--dns-option**=[]
-   Set custom DNS options
-
-**--dns-search**=[]
-   Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)
-
-**-e**, **--env**=[]
-   Set environment variables
-
-**--entrypoint**=""
-   Overwrite the default ENTRYPOINT of the image
-
-**--env-file**=[]
-   Read in a line-delimited file of environment variables
-
-**--expose**=[]
-   Expose a port or a range of ports (e.g. --expose=3300-3310) from the container without publishing it to your host
-
-**--group-add**=[]
-   Add additional groups to run as
-
-**-h**, **--hostname**=""
-   Container host name
-
-**--help**
-  Print usage statement
-
-**-i**, **--interactive**=*true*|*false*
-   Keep STDIN open even if not attached. The default is *false*.
-
-**--ip**=""
-   Sets the container's interface IPv4 address (e.g. 172.23.0.9)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
-**--ip6**=""
-   Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
-**--ipc**=""
-   Default is to create a private IPC namespace (POSIX SysV IPC) for the container
-                               'container:<name|id>': reuses another container shared memory, semaphores and message queues
-                               'host': use the host shared memory,semaphores and message queues inside the container.  Note: the host mode gives the container full access to local shared memory and is therefore considered insecure.
-
-**--isolation**="*default*"
-   Isolation specifies the type of isolation technology used by containers. Note
-that the default on Windows server is `process`, and the default on Windows client
-is `hyperv`. Linux only supports `default`.
-
-**--kernel-memory**=""
-   Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)
-
-   Constrains the kernel memory available to a container. If a limit of 0
-is specified (not using `--kernel-memory`), the container's kernel memory
-is not limited. If you specify a limit, it may be rounded up to a multiple
-of the operating system's page size and the value can be very large,
-millions of trillions.
-
-**-l**, **--label**=[]
-   Adds metadata to a container (e.g., --label=com.example.key=value)
-
-**--label-file**=[]
-   Read labels from a file. Delimit each label with an EOL.
-
-**--link**=[]
-   Add link to another container in the form of <name or id>:alias or just
-   <name or id> in which case the alias will match the name.
-
-**--link-local-ip**=[]
-   Add one or more link-local IPv4/IPv6 addresses to the container's interface
-
-**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*"
-  Logging driver for the container. Default is defined by daemon `--log-driver` flag.
-  **Warning**: the `docker logs` command works only for the `json-file` and
-  `journald` logging drivers.
-
-**--log-opt**=[]
-  Logging driver specific options.
-
-**-m**, **--memory**=""
-   Memory limit (format: <number>[<unit>], where unit = b, k, m or g)
-
-   Allows you to constrain the memory available to a container. If the host
-supports swap memory, then the **-m** memory setting can be larger than physical
-RAM. If a limit of 0 is specified (not using **-m**), the container's memory is
-not limited. The actual limit may be rounded up to a multiple of the operating
-system's page size (the value would be very large, that's millions of trillions).
-
-**--mac-address**=""
-   Container MAC address (e.g. 92:d0:c6:0a:29:33)
-
-**--memory-reservation**=""
-   Memory soft limit (format: <number>[<unit>], where unit = b, k, m or g)
-
-   After setting memory reservation, when the system detects memory contention
-or low memory, containers are forced to restrict their consumption to their
-reservation. So you should always set the value below **--memory**, otherwise the
-hard limit will take precedence. By default, memory reservation will be the same
-as memory limit.
-
-**--memory-swap**="LIMIT"
-   A limit value equal to memory plus swap. Must be used with the  **-m**
-(**--memory**) flag. The swap `LIMIT` should always be larger than **-m**
-(**--memory**) value.
-
-   The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
-`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a
-unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
-
-**--memory-swappiness**=""
-   Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-
-**--name**=""
-   Assign a name to the container
-
-**--network**="*bridge*"
-   Set the Network mode for the container
-                               'bridge': create a network stack on the default Docker bridge
-                               'none': no networking
-                               'container:<name|id>': reuse another container's network stack
-                               'host': use the Docker host network stack.  Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
-                               '<network-name>|<network-id>': connect to a user-defined network
-
-**--network-alias**=[]
-   Add network-scoped alias for the container
-
-**--oom-kill-disable**=*true*|*false*
-	Whether to disable OOM Killer for the container or not.
-
-**--oom-score-adj**=""
-    Tune the host's OOM preferences for containers (accepts -1000 to 1000)
-
-**-P**, **--publish-all**=*true*|*false*
-   Publish all exposed ports to random ports on the host interfaces. The default is *false*.
-
-**-p**, **--publish**=[]
-   Publish a container's port, or a range of ports, to the host
-                               format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort
-                               Both hostPort and containerPort can be specified as a range of ports. 
-                               When specifying ranges for both, the number of container ports in the range must match the number of host ports in the range. (e.g., `-p 1234-1236:1234-1236/tcp`)
-                               (use 'docker port' to see the actual mapping)
-
-**--pid**=""
-   Set the PID mode for the container
-   Default is to create a private PID namespace for the container
-                               'container:<name|id>': join another container's PID namespace
-                               'host': use the host's PID namespace for the container. Note: the host mode gives the container full access to local PID and is therefore considered insecure.
-
-**--userns**=""
-   Set the usernamespace mode for the container when `userns-remap` option is enabled.
-     **host**: use the host usernamespace and enable all privileged options (e.g., `pid=host` or `--privileged`).
-
-**--pids-limit**=""
-   Tune the container's pids limit. Set `-1` to have unlimited pids for the container.
-
-**--privileged**=*true*|*false*
-   Give extended privileges to this container. The default is *false*.
-
-**--read-only**=*true*|*false*
-   Mount the container's root filesystem as read only.
-
-**--restart**="*no*"
-   Restart policy to apply when a container exits (no, on-failure[:max-retry], always, unless-stopped).
-
-**--rm**=*true*|*false*
-   Automatically remove the container when it exits. The default is *false*.
-
-**--shm-size**=""
-   Size of `/dev/shm`. The format is `<number><unit>`. `number` must be greater than `0`.
-   Unit is optional and can be `b` (bytes), `k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you omit the unit, the system uses bytes.
-   If you omit the size entirely, the system uses `64m`.
-
-**--security-opt**=[]
-   Security Options
-
-   "label:user:USER"   : Set the label user for the container
-    "label:role:ROLE"   : Set the label role for the container
-    "label:type:TYPE"   : Set the label type for the container
-    "label:level:LEVEL" : Set the label level for the container
-    "label:disable"     : Turn off label confinement for the container
-    "no-new-privileges" : Disable container processes from gaining additional privileges
-    "seccomp:unconfined" : Turn off seccomp confinement for the container
-    "seccomp:profile.json :  White listed syscalls seccomp Json file to be used as a seccomp filter
-
-**--storage-opt**=[]
-   Storage driver options per container
-
-   $ docker create -it --storage-opt size=120G fedora /bin/bash
-
-   This (size) will allow to set the container rootfs size to 120G at creation time.
-   This option is only available for the `devicemapper`, `btrfs`, `overlay2` and `zfs` graph drivers.
-   For the `devicemapper`, `btrfs` and `zfs` storage drivers, user cannot pass a size less than the Default BaseFS Size.
-   For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option.
-   Under these conditions, user can pass any size less then the backing fs size.
-  
-**--stop-signal**=*SIGTERM*
-  Signal to stop a container. Default is SIGTERM.
-
-**--stop-timeout**=*10*
-  Timeout (in seconds) to stop a container. Default is 10.
-
-**--sysctl**=SYSCTL
-  Configure namespaced kernel parameters at runtime
-
-  IPC Namespace - current sysctls allowed:
-
-  kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall, kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced
-  Sysctls beginning with fs.mqueue.*
-
-  Note: if you use --ipc=host using these sysctls will not be allowed.
-
-  Network Namespace - current sysctls allowed:
-      Sysctls beginning with net.*
-
-  Note: if you use --network=host using these sysctls will not be allowed.
-
-**-t**, **--tty**=*true*|*false*
-   Allocate a pseudo-TTY. The default is *false*.
-
-**--tmpfs**=[] Create a tmpfs mount
-
-   Mount a temporary filesystem (`tmpfs`) mount into a container, for example:
-
-   $ docker run -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image
-
-   This command mounts a `tmpfs` at `/tmp` within the container.  The supported mount
-options are the same as the Linux default `mount` flags. If you do not specify
-any options, the systems uses the following options:
-`rw,noexec,nosuid,nodev,size=65536k`.
-
-**-u**, **--user**=""
-   Sets the username or UID used and optionally the groupname or GID for the specified command.
-
-   The followings examples are all valid:
-   --user [user | user:group | uid | uid:gid | user:gid | uid:group ]
-
-   Without this argument root user will be used in the container by default.
-
-**--ulimit**=[]
-   Ulimit options
-
-**--uts**=*host*
-   Set the UTS mode for the container
-     **host**: use the host's UTS namespace inside the container.
-     Note: the host mode gives the container access to changing the host's hostname and is therefore considered insecure.
-
-**-v**|**--volume**[=*[[HOST-DIR:]CONTAINER-DIR[:OPTIONS]]*]
-   Create a bind mount. If you specify, ` -v /HOST-DIR:/CONTAINER-DIR`, Docker
-   bind mounts `/HOST-DIR` in the host to `/CONTAINER-DIR` in the Docker
-   container. If 'HOST-DIR' is omitted,  Docker automatically creates the new
-   volume on the host.  The `OPTIONS` are a comma delimited list and can be:
-
-   * [rw|ro]
-   * [z|Z]
-   * [`[r]shared`|`[r]slave`|`[r]private`]
-
-The `CONTAINER-DIR` must be an absolute path such as `/src/docs`. The `HOST-DIR`
-can be an absolute path or a `name` value. A `name` value must start with an
-alphanumeric character, followed by `a-z0-9`, `_` (underscore), `.` (period) or
-`-` (hyphen). An absolute path starts with a `/` (forward slash).
-
-If you supply a `HOST-DIR` that is an absolute path,  Docker bind-mounts to the
-path you specify. If you supply a `name`, Docker creates a named volume by that
-`name`. For example, you can specify either `/foo` or `foo` for a `HOST-DIR`
-value. If you supply the `/foo` value, Docker creates a bind-mount. If you
-supply the `foo` specification, Docker creates a named volume.
-
-You can specify multiple  **-v** options to mount one or more mounts to a
-container. To use these same mounts in other containers, specify the
-**--volumes-from** option also.
-
-You can add `:ro` or `:rw` suffix to a volume to mount it  read-only or
-read-write mode, respectively. By default, the volumes are mounted read-write.
-See examples.
-
-Labeling systems like SELinux require that proper labels are placed on volume
-content mounted into a container. Without a label, the security system might
-prevent the processes running inside the container from using the content. By
-default, Docker does not change the labels set by the OS.
-
-To change a label in the container context, you can add either of two suffixes
-`:z` or `:Z` to the volume mount. These suffixes tell Docker to relabel file
-objects on the shared volumes. The `z` option tells Docker that two containers
-share the volume content. As a result, Docker labels the content with a shared
-content label. Shared volume labels allow all containers to read/write content.
-The `Z` option tells Docker to label the content with a private unshared label.
-Only the current container can use a private volume.
-
-By default bind mounted volumes are `private`. That means any mounts done
-inside container will not be visible on host and vice-a-versa. One can change
-this behavior by specifying a volume mount propagation property. Making a
-volume `shared` mounts done under that volume inside container will be
-visible on host and vice-a-versa. Making a volume `slave` enables only one
-way mount propagation and that is mounts done on host under that volume
-will be visible inside container but not the other way around.
-
-To control mount propagation property of volume one can use `:[r]shared`,
-`:[r]slave` or `:[r]private` propagation flag. Propagation property can
-be specified only for bind mounted volumes and not for internal volumes or
-named volumes. For mount propagation to work source mount point (mount point
-where source dir is mounted on) has to have right propagation properties. For
-shared volumes, source mount point has to be shared. And for slave volumes,
-source mount has to be either shared or slave.
-
-Use `df <source-dir>` to figure out the source mount and then use
-`findmnt -o TARGET,PROPAGATION <source-mount-dir>` to figure out propagation
-properties of source mount. If `findmnt` utility is not available, then one
-can look at mount entry for source mount point in `/proc/self/mountinfo`. Look
-at `optional fields` and see if any propagaion properties are specified.
-`shared:X` means mount is `shared`, `master:X` means mount is `slave` and if
-nothing is there that means mount is `private`.
-
-To change propagation properties of a mount point use `mount` command. For
-example, if one wants to bind mount source directory `/foo` one can do
-`mount --bind /foo /foo` and `mount --make-private --make-shared /foo`. This
-will convert /foo into a `shared` mount point. Alternatively one can directly
-change propagation properties of source mount. Say `/` is source mount for
-`/foo`, then use `mount --make-shared /` to convert `/` into a `shared` mount.
-
-> **Note**:
-> When using systemd to manage the Docker daemon's start and stop, in the systemd
-> unit file there is an option to control mount propagation for the Docker daemon
-> itself, called `MountFlags`. The value of this setting may cause Docker to not
-> see mount propagation changes made on the mount point. For example, if this value
-> is `slave`, you may not be able to use the `shared` or `rshared` propagation on
-> a volume.
-
-
-To disable automatic copying of data from the container path to the volume, use
-the `nocopy` flag. The `nocopy` flag can be set on bind mounts and named volumes.
-
-**--volume-driver**=""
-   Container's volume driver. This driver creates volumes specified either from
-   a Dockerfile's `VOLUME` instruction or from the `docker run -v` flag.
-   See **docker-volume-create(1)** for full details.
-
-**--volumes-from**=[]
-   Mount volumes from the specified container(s)
-
-**-w**, **--workdir**=""
-   Working directory inside the container
-
-# EXAMPLES
-
-## Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Windows. The `--isolation=<value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. On Microsoft Windows, you can specify these values:
-
-* `default`: Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value.
-* `process`: Namespace isolation only.
-* `hyperv`: Hyper-V hypervisor partition-based isolation.
-
-Specifying the `--isolation` flag without a value is the same as setting `--isolation="default"`.
-
-# HISTORY
-August 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-September 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-November 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-diff.1.md b/installer/vendor/github.com/docker/docker/man/docker-diff.1.md
deleted file mode 100644
index 6c6c502533..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-diff.1.md
+++ /dev/null
@@ -1,49 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-diff - Inspect changes on a container's filesystem
-
-# SYNOPSIS
-**docker diff**
-[**--help**]
-CONTAINER
-
-# DESCRIPTION
-Inspect changes on a container's filesystem. You can use the full or
-shortened container ID or the container name set using
-**docker run --name** option.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# EXAMPLES
-Inspect the changes to on a nginx container:
-
-    # docker diff 1fdfd1f54c1b
-    C /dev
-    C /dev/console
-    C /dev/core
-    C /dev/stdout
-    C /dev/fd
-    C /dev/ptmx
-    C /dev/stderr
-    C /dev/stdin
-    C /run
-    A /run/nginx.pid
-    C /var/lib/nginx/tmp
-    A /var/lib/nginx/tmp/client_body
-    A /var/lib/nginx/tmp/fastcgi
-    A /var/lib/nginx/tmp/proxy
-    A /var/lib/nginx/tmp/scgi
-    A /var/lib/nginx/tmp/uwsgi
-    C /var/log/nginx
-    A /var/log/nginx/access.log
-    A /var/log/nginx/error.log
-
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-events.1.md b/installer/vendor/github.com/docker/docker/man/docker-events.1.md
deleted file mode 100644
index 51b042775a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-events.1.md
+++ /dev/null
@@ -1,180 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-events - Get real time events from the server
-
-# SYNOPSIS
-**docker events**
-[**--help**]
-[**-f**|**--filter**[=*[]*]]
-[**--since**[=*SINCE*]]
-[**--until**[=*UNTIL*]]
-[**--format**[=*FORMAT*]]
-
-
-# DESCRIPTION
-Get event information from the Docker daemon. Information can include historical
-information and real-time information.
-
-Docker containers will report the following events:
-
-    attach, commit, copy, create, destroy, detach, die, exec_create, exec_detach, exec_start, export, kill, oom, pause, rename, resize, restart, start, stop, top, unpause, update
-
-Docker images report the following events:
-
-    delete, import, load, pull, push, save, tag, untag
-
-Docker volumes report the following events:
-
-    create, mount, unmount, destroy
-
-Docker networks report the following events:
-
-    create, connect, disconnect, destroy
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-f**, **--filter**=[]
-   Filter output based on these conditions
-   - container (`container=<name or id>`)
-   - event (`event=<event action>`)
-   - image (`image=<tag or id>`)
-   - plugin (experimental) (`plugin=<name or id>`)
-   - label (`label=<key>` or `label=<key>=<value>`)
-   - type (`type=<container or image or volume or network or daemon>`)
-   - volume (`volume=<name or id>`)
-   - network (`network=<name or id>`)
-   - daemon (`daemon=<name or id>`)
-
-**--since**=""
-   Show all events created since timestamp
-
-**--until**=""
-   Stream events until this timestamp
-
-**--format**=""
-   Format the output using the given Go template
-
-The `--since` and `--until` parameters can be Unix timestamps, date formatted
-timestamps, or Go duration strings (e.g. `10m`, `1h30m`) computed
-relative to the client machine's time. If you do not provide the `--since` option,
-the command returns only new and/or live events.  Supported formats for date
-formatted time stamps include RFC3339Nano, RFC3339, `2006-01-02T15:04:05`,
-`2006-01-02T15:04:05.999999999`, `2006-01-02Z07:00`, and `2006-01-02`. The local
-timezone on the client will be used if you do not provide either a `Z` or a
-`+-00:00` timezone offset at the end of the timestamp.  When providing Unix
-timestamps enter seconds[.nanoseconds], where seconds is the number of seconds
-that have elapsed since January 1, 1970 (midnight UTC/GMT), not counting leap
-seconds (aka Unix epoch or Unix time), and the optional .nanoseconds field is a
-fraction of a second no more than nine digits long.
-
-# EXAMPLES
-
-## Listening for Docker events
-
-After running docker events a container 786d698004576 is started and stopped
-(The container name has been shortened in the output below):
-
-    # docker events
-    2015-01-28T20:21:31.000000000-08:00 59211849bc10: (from whenry/testimage:latest) start
-    2015-01-28T20:21:31.000000000-08:00 59211849bc10: (from whenry/testimage:latest) die
-    2015-01-28T20:21:32.000000000-08:00 59211849bc10: (from whenry/testimage:latest) stop
-
-## Listening for events since a given date
-Again the output container IDs have been shortened for the purposes of this document:
-
-    # docker events --since '2015-01-28'
-    2015-01-28T20:25:38.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) create
-    2015-01-28T20:25:38.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) start
-    2015-01-28T20:25:39.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) create
-    2015-01-28T20:25:39.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) start
-    2015-01-28T20:25:40.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) die
-    2015-01-28T20:25:42.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) stop
-    2015-01-28T20:25:45.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) start
-    2015-01-28T20:25:45.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) die
-    2015-01-28T20:25:46.000000000-08:00 c21f6c22ba27: (from whenry/testimage:latest) stop
-
-The following example outputs all events that were generated in the last 3 minutes,
-relative to the current time on the client machine:
-
-    # docker events --since '3m'
-    2015-05-12T11:51:30.999999999Z07:00  4386fb97867d: (from ubuntu-1:14.04) die
-    2015-05-12T15:52:12.999999999Z07:00  4386fb97867d: (from ubuntu-1:14.04) stop
-    2015-05-12T15:53:45.999999999Z07:00  7805c1d35632: (from redis:2.8) die
-    2015-05-12T15:54:03.999999999Z07:00  7805c1d35632: (from redis:2.8) stop
-
-If you do not provide the --since option, the command returns only new and/or
-live events.
-
-## Format
-
-If a format (`--format`) is specified, the given template will be executed
-instead of the default format. Go's **text/template** package describes all the
-details of the format.
-
-    # docker events --filter 'type=container' --format 'Type={{.Type}}  Status={{.Status}}  ID={{.ID}}'
-    Type=container  Status=create  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=attach  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=start  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=resize  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=die  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-    Type=container  Status=destroy  ID=2ee349dac409e97974ce8d01b70d250b85e0ba8189299c126a87812311951e26
-
-If a format is set to `{{json .}}`, the events are streamed as valid JSON
-Lines. For information about JSON Lines, please refer to http://jsonlines.org/ .
-
-    # docker events --format '{{json .}}'
-    {"status":"create","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
-    {"status":"attach","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
-    {"Type":"network","Action":"connect","Actor":{"ID":"1b50a5bf755f6021dfa78e..
-    {"status":"start","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f42..
-    {"status":"resize","id":"196016a57679bf42424484918746a9474cd905dd993c4d0f4..
-
-## Filters
-
-    $ docker events --filter 'event=stop'
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2014-09-03T17:42:14.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'image=ubuntu-1:14.04'
-    2014-05-10T17:42:14.999999999Z07:00 container start 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-
-    $ docker events --filter 'container=7805c1d35632'
-    2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image= redis:2.8)
-
-    $ docker events --filter 'container=7805c1d35632' --filter 'container=4386fb97867d'
-    2014-09-03T15:49:29.999999999Z07:00 container die 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container stop 4386fb97867d (image=ubuntu-1:14.04)
-    2014-05-10T17:42:14.999999999Z07:00 container die 7805c1d35632 (image=redis:2.8)
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'container=7805c1d35632' --filter 'event=stop'
-    2014-09-03T15:49:29.999999999Z07:00 container stop 7805c1d35632 (image=redis:2.8)
-
-    $ docker events --filter 'type=volume'
-    2015-12-23T21:05:28.136212689Z volume create test-event-volume-local (driver=local)
-    2015-12-23T21:05:28.383462717Z volume mount test-event-volume-local (read/write=true, container=562fe10671e9273da25eed36cdce26159085ac7ee6707105fd534866340a5025, destination=/foo, driver=local, propagation=rprivate)
-    2015-12-23T21:05:28.650314265Z volume unmount test-event-volume-local (container=562fe10671e9273da25eed36cdce26159085ac7ee6707105fd534866340a5025, driver=local)
-    2015-12-23T21:05:28.716218405Z volume destroy test-event-volume-local (driver=local)
-
-    $ docker events --filter 'type=network'
-    2015-12-23T21:38:24.705709133Z network create 8b111217944ba0ba844a65b13efcd57dc494932ee2527577758f939315ba2c5b (name=test-event-network-local, type=bridge)
-    2015-12-23T21:38:25.119625123Z network connect 8b111217944ba0ba844a65b13efcd57dc494932ee2527577758f939315ba2c5b (name=test-event-network-local, container=b4be644031a3d90b400f88ab3d4bdf4dc23adb250e696b6328b85441abe2c54e, type=bridge)
-
-    $ docker events --filter 'type=plugin' (experimental)
-    2016-07-25T17:30:14.825557616Z plugin pull ec7b87f2ce84330fe076e666f17dfc049d2d7ae0b8190763de94e1f2d105993f (name=tiborvass/sample-volume-plugin:latest)
-    2016-07-25T17:30:14.888127370Z plugin enable ec7b87f2ce84330fe076e666f17dfc049d2d7ae0b8190763de94e1f2d105993f (name=tiborvass/sample-volume-plugin:latest)
-
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-June 2015, updated by Brian Goff <cpuguy83@gmail.com>
-October 2015, updated by Mike Brown <mikebrow@gmail.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-exec.1.md b/installer/vendor/github.com/docker/docker/man/docker-exec.1.md
deleted file mode 100644
index fe9c279e7e..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-exec.1.md
+++ /dev/null
@@ -1,71 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-exec - Run a command in a running container
-
-# SYNOPSIS
-**docker exec**
-[**-d**|**--detach**]
-[**--detach-keys**[=*[]*]]
-[**-e**|**--env**[=*[]*]]
-[**--help**]
-[**-i**|**--interactive**]
-[**--privileged**]
-[**-t**|**--tty**]
-[**-u**|**--user**[=*USER*]]
-CONTAINER COMMAND [ARG...]
-
-# DESCRIPTION
-
-Run a process in a running container.
-
-The command started using `docker exec` will only run while the container's primary
-process (`PID 1`) is running, and will not be restarted if the container is restarted.
-
-If the container is paused, then the `docker exec` command will wait until the
-container is unpaused, and then run
-
-# OPTIONS
-**-d**, **--detach**=*true*|*false*
-   Detached mode: run command in the background. The default is *false*.
-
-**--detach-keys**=""
-  Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**-e**, **--env**=[]
-   Set environment variables
-
-   This option allows you to specify arbitrary environment variables that are
-available for the command to be executed.
-
-**--help**
-  Print usage statement
-
-**-i**, **--interactive**=*true*|*false*
-   Keep STDIN open even if not attached. The default is *false*.
-
-**--privileged**=*true*|*false*
-   Give the process extended [Linux capabilities](http://man7.org/linux/man-pages/man7/capabilities.7.html)
-when running in a container. The default is *false*.
-
-   Without this flag, the process run by `docker exec` in a running container has
-the same capabilities as the container, which may be limited. Set
-`--privileged` to give all capabilities to the process.
-
-**-t**, **--tty**=*true*|*false*
-   Allocate a pseudo-TTY. The default is *false*.
-
-**-u**, **--user**=""
-   Sets the username or UID used and optionally the groupname or GID for the specified command.
-
-   The followings examples are all valid:
-   --user [user | user:group | uid | uid:gid | user:gid | uid:group ]
-
-   Without this argument the command will be run as root in the container.
-
-The **-t** option is incompatible with a redirection of the docker client
-standard input.
-
-# HISTORY
-November 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-export.1.md b/installer/vendor/github.com/docker/docker/man/docker-export.1.md
deleted file mode 100644
index 3d59e4788e..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-export.1.md
+++ /dev/null
@@ -1,46 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-export - Export the contents of a container's filesystem as a tar archive
-
-# SYNOPSIS
-**docker export**
-[**--help**]
-[**-o**|**--output**[=*""*]]
-CONTAINER
-
-# DESCRIPTION
-Export the contents of a container's filesystem using the full or shortened
-container ID or container name. The output is exported to STDOUT and can be
-redirected to a tar file.
-
-Stream to a file instead of STDOUT by using **-o**.
-
-# OPTIONS
-**--help**
-  Print usage statement
-  
-**-o**, **--output**=""
-  Write to a file, instead of STDOUT
-
-# EXAMPLES
-Export the contents of the container called angry_bell to a tar file
-called angry_bell.tar:
-
-    # docker export angry_bell > angry_bell.tar
-    # docker export --output=angry_bell-latest.tar angry_bell
-    # ls -sh angry_bell.tar
-    321M angry_bell.tar
-    # ls -sh angry_bell-latest.tar
-    321M angry_bell-latest.tar
-
-# See also
-**docker-import(1)** to create an empty filesystem image
-and import the contents of the tarball into it, then optionally tag it.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-January 2015, updated by Joseph Kern (josephakern at gmail dot com)
diff --git a/installer/vendor/github.com/docker/docker/man/docker-history.1.md b/installer/vendor/github.com/docker/docker/man/docker-history.1.md
deleted file mode 100644
index 91edefe25f..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-history.1.md
+++ /dev/null
@@ -1,52 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-history - Show the history of an image
-
-# SYNOPSIS
-**docker history**
-[**--help**]
-[**-H**|**--human**[=*true*]]
-[**--no-trunc**]
-[**-q**|**--quiet**]
-IMAGE
-
-# DESCRIPTION
-
-Show the history of when and how an image was created.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-H**, **--human**=*true*|*false*
-    Print sizes and dates in human readable format. The default is *true*.
-
-**--no-trunc**=*true*|*false*
-   Don't truncate output. The default is *false*.
-
-**-q**, **--quiet**=*true*|*false*
-   Only show numeric IDs. The default is *false*.
-
-# EXAMPLES
-    $ docker history fedora
-    IMAGE          CREATED          CREATED BY                                      SIZE                COMMENT
-    105182bb5e8b   5 days ago       /bin/sh -c #(nop) ADD file:71356d2ad59aa3119d   372.7 MB
-    73bd853d2ea5   13 days ago      /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar   0 B
-    511136ea3c5a   10 months ago                                                    0 B                 Imported from -
-
-## Display comments in the image history
-The `docker commit` command has a **-m** flag for adding comments to the image. These comments will be displayed in the image history.
-
-    $ sudo docker history docker:scm
-    IMAGE               CREATED             CREATED BY                                      SIZE                COMMENT
-    2ac9d1098bf1        3 months ago        /bin/bash                                       241.4 MB            Added Apache to Fedora base image
-    88b42ffd1f7c        5 months ago        /bin/sh -c #(nop) ADD file:1fd8d7f9f6557cafc7   373.7 MB            
-    c69cab00d6ef        5 months ago        /bin/sh -c #(nop) MAINTAINER Lokesh Mandvekar   0 B                 
-    511136ea3c5a        19 months ago                                                       0 B                 Imported from -
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-images.1.md b/installer/vendor/github.com/docker/docker/man/docker-images.1.md
deleted file mode 100644
index d7958d0dc4..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-images.1.md
+++ /dev/null
@@ -1,153 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-images - List images
-
-# SYNOPSIS
-**docker images**
-[**--help**]
-[**-a**|**--all**]
-[**--digests**]
-[**-f**|**--filter**[=*[]*]]
-[**--format**=*"TEMPLATE"*]
-[**--no-trunc**]
-[**-q**|**--quiet**]
-[REPOSITORY[:TAG]]
-
-# DESCRIPTION
-This command lists the images stored in the local Docker repository.
-
-By default, intermediate images, used during builds, are not listed. Some of the
-output, e.g., image ID, is truncated, for space reasons. However the truncated
-image ID, and often the first few characters, are enough to be used in other
-Docker commands that use the image ID. The output includes repository, tag, image
-ID, date created and the virtual size.
-
-The title REPOSITORY for the first title may seem confusing. It is essentially
-the image name. However, because you can tag a specific image, and multiple tags
-(image instances) can be associated with a single name, the name is really a
-repository for all tagged images of the same name. For example consider an image
-called fedora. It may be tagged with 18, 19, or 20, etc. to manage different
-versions.
-
-# OPTIONS
-**-a**, **--all**=*true*|*false*
-   Show all images (by default filter out the intermediate image layers). The default is *false*.
-
-**--digests**=*true*|*false*
-   Show image digests. The default is *false*.
-
-**-f**, **--filter**=[]
-   Filters the output based on these conditions:
-   - dangling=(true|false) - find unused images
-   - label=<key> or label=<key>=<value>
-   - before=(<image-name>[:tag]|<image-id>|<image@digest>)
-   - since=(<image-name>[:tag]|<image-id>|<image@digest>)
-
-**--format**="*TEMPLATE*"
-   Pretty-print images using a Go template.
-   Valid placeholders:
-      .ID - Image ID
-      .Repository - Image repository
-      .Tag - Image tag
-      .Digest - Image digest
-      .CreatedSince - Elapsed time since the image was created
-      .CreatedAt - Time when the image was created
-      .Size - Image disk size
-
-**--help**
-  Print usage statement
-
-**--no-trunc**=*true*|*false*
-   Don't truncate output. The default is *false*.
-
-**-q**, **--quiet**=*true*|*false*
-   Only show numeric IDs. The default is *false*.
-
-# EXAMPLES
-
-## Listing the images
-
-To list the images in a local repository (not the registry) run:
-
-    docker images
-
-The list will contain the image repository name, a tag for the image, and an
-image ID, when it was created and its virtual size. Columns: REPOSITORY, TAG,
-IMAGE ID, CREATED, and SIZE.
-
-The `docker images` command takes an optional `[REPOSITORY[:TAG]]` argument
-that restricts the list to images that match the argument. If you specify
-`REPOSITORY`but no `TAG`, the `docker images` command lists all images in the
-given repository.
-
-    docker images java
-
-The `[REPOSITORY[:TAG]]` value must be an "exact match". This means that, for example,
-`docker images jav` does not match the image `java`.
-
-If both `REPOSITORY` and `TAG` are provided, only images matching that
-repository and tag are listed.  To find all local images in the "java"
-repository with tag "8" you can use:
-
-    docker images java:8
-
-To get a verbose list of images which contains all the intermediate images
-used in builds use **-a**:
-
-    docker images -a
-
-Previously, the docker images command supported the --tree and --dot arguments,
-which displayed different visualizations of the image data. Docker core removed
-this functionality in the 1.7 version. If you liked this functionality, you can
-still find it in the third-party dockviz tool: https://github.com/justone/dockviz.
-
-## Listing images in a desired format
-
-When using the --format option, the image command will either output the data 
-exactly as the template declares or, when using the `table` directive, will 
-include column headers as well. You can use special characters like `\t` for
-inserting tab spacing between columns. 
-
-The following example uses a template without headers and outputs the ID and 
-Repository entries separated by a colon for all images:
-
-    docker images --format "{{.ID}}: {{.Repository}}"
-    77af4d6b9913: <none>
-    b6fa739cedf5: committ
-    78a85c484bad: ipbabble
-    30557a29d5ab: docker
-    5ed6274db6ce: <none>
-    746b819f315e: postgres
-    746b819f315e: postgres
-    746b819f315e: postgres
-    746b819f315e: postgres
-
-To list all images with their repository and tag in a table format you can use:
-
-    docker images --format "table {{.ID}}\t{{.Repository}}\t{{.Tag}}"
-    IMAGE ID            REPOSITORY                TAG
-    77af4d6b9913        <none>                    <none>
-    b6fa739cedf5        committ                   latest
-    78a85c484bad        ipbabble                  <none>
-    30557a29d5ab        docker                    latest
-    5ed6274db6ce        <none>                    <none>
-    746b819f315e        postgres                  9
-    746b819f315e        postgres                  9.3
-    746b819f315e        postgres                  9.3.5
-    746b819f315e        postgres                  latest
-
-Valid template placeholders are listed above.
-
-## Listing only the shortened image IDs
-
-Listing just the shortened image IDs. This can be useful for some automated
-tools.
-
-    docker images -q
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-import.1.md b/installer/vendor/github.com/docker/docker/man/docker-import.1.md
deleted file mode 100644
index 43d65efe6a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-import.1.md
+++ /dev/null
@@ -1,72 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-import - Create an empty filesystem image and import the contents of the tarball (.tar, .tar.gz, .tgz, .bzip, .tar.xz, .txz) into it, then optionally tag it.
-
-# SYNOPSIS
-**docker import**
-[**-c**|**--change**[=*[]*]]
-[**-m**|**--message**[=*MESSAGE*]]
-[**--help**]
-file|URL|**-**[REPOSITORY[:TAG]]
-
-# OPTIONS
-**-c**, **--change**=[]
-   Apply specified Dockerfile instructions while importing the image
-   Supported Dockerfile instructions: `CMD`|`ENTRYPOINT`|`ENV`|`EXPOSE`|`ONBUILD`|`USER`|`VOLUME`|`WORKDIR`
-
-**--help**
-  Print usage statement
-
-**-m**, **--message**=""
-   Set commit message for imported image
-
-# DESCRIPTION
-Create a new filesystem image from the contents of a tarball (`.tar`,
-`.tar.gz`, `.tgz`, `.bzip`, `.tar.xz`, `.txz`) into it, then optionally tag it.
-
-
-# EXAMPLES
-
-## Import from a remote location
-
-    # docker import http://example.com/exampleimage.tgz example/imagerepo
-
-## Import from a local file
-
-Import to docker via pipe and stdin:
-
-    # cat exampleimage.tgz | docker import - example/imagelocal
-
-Import with a commit message. 
-
-    # cat exampleimage.tgz | docker import --message "New image imported from tarball" - exampleimagelocal:new
-
-Import to a Docker image from a local file.
-
-    # docker import /path/to/exampleimage.tgz 
-
-
-## Import from a local file and tag
-
-Import to docker via pipe and stdin:
-
-    # cat exampleimageV2.tgz | docker import - example/imagelocal:V-2.0
-
-## Import from a local directory
-
-    # tar -c . | docker import - exampleimagedir
-
-## Apply specified Dockerfile instructions while importing the image
-This example sets the docker image ENV variable DEBUG to true by default.
-
-    # tar -c . | docker import -c="ENV DEBUG true" - exampleimagedir
-
-# See also
-**docker-export(1)** to export the contents of a filesystem as a tar archive to STDOUT.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-info.1.md b/installer/vendor/github.com/docker/docker/man/docker-info.1.md
deleted file mode 100644
index bb7a8fb4c2..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-info.1.md
+++ /dev/null
@@ -1,187 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-info - Display system-wide information
-
-# SYNOPSIS
-**docker info**
-[**--help**]
-[**-f**|**--format**[=*FORMAT*]]
-
-# DESCRIPTION
-This command displays system wide information regarding the Docker installation.
-Information displayed includes the kernel version, number of containers and images.
-The number of images shown is the number of unique images. The same image tagged
-under different names is counted only once.
-
-If a format is specified, the given template will be executed instead of the
-default format. Go's **text/template** package
-describes all the details of the format.
-
-Depending on the storage driver in use, additional information can be shown, such
-as pool name, data file, metadata file, data space used, total data space, metadata
-space used, and total metadata space.
-
-The data file is where the images are stored and the metadata file is where the
-meta data regarding those images are stored. When run for the first time Docker
-allocates a certain amount of data space and meta data space from the space
-available on the volume where `/var/lib/docker` is mounted.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-f**, **--format**=""
-  Format the output using the given Go template
-
-# EXAMPLES
-
-## Display Docker system information
-
-Here is a sample output for a daemon running on Ubuntu, using the overlay2
-storage driver:
-
-    $ docker -D info
-    Containers: 14
-     Running: 3
-     Paused: 1
-     Stopped: 10
-    Images: 52
-    Server Version: 1.13.0
-    Storage Driver: overlay2
-     Backing Filesystem: extfs
-     Supports d_type: true
-     Native Overlay Diff: false
-    Logging Driver: json-file
-    Cgroup Driver: cgroupfs
-    Plugins:
-     Volume: local
-     Network: bridge host macvlan null overlay
-    Swarm: active
-     NodeID: rdjq45w1op418waxlairloqbm
-     Is Manager: true
-     ClusterID: te8kdyw33n36fqiz74bfjeixd
-     Managers: 1
-     Nodes: 2
-     Orchestration:
-      Task History Retention Limit: 5
-     Raft:
-      Snapshot Interval: 10000
-      Number of Old Snapshots to Retain: 0
-      Heartbeat Tick: 1
-      Election Tick: 3
-     Dispatcher:
-      Heartbeat Period: 5 seconds
-     CA Configuration:
-      Expiry Duration: 3 months
-     Node Address: 172.16.66.128 172.16.66.129
-     Manager Addresses:
-      172.16.66.128:2477
-    Runtimes: runc
-    Default Runtime: runc
-    Init Binary: docker-init
-    containerd version: 8517738ba4b82aff5662c97ca4627e7e4d03b531
-    runc version: ac031b5bf1cc92239461125f4c1ffb760522bbf2
-    init version: N/A (expected: v0.13.0)
-    Security Options:
-     apparmor
-     seccomp
-      Profile: default
-    Kernel Version: 4.4.0-31-generic
-    Operating System: Ubuntu 16.04.1 LTS
-    OSType: linux
-    Architecture: x86_64
-    CPUs: 2
-    Total Memory: 1.937 GiB
-    Name: ubuntu
-    ID: H52R:7ZR6:EIIA:76JG:ORIY:BVKF:GSFU:HNPG:B5MK:APSC:SZ3Q:N326
-    Docker Root Dir: /var/lib/docker
-    Debug Mode (client): true
-    Debug Mode (server): true
-     File Descriptors: 30
-     Goroutines: 123
-     System Time: 2016-11-12T17:24:37.955404361-08:00
-     EventsListeners: 0
-    Http Proxy: http://test:test@proxy.example.com:8080
-    Https Proxy: https://test:test@proxy.example.com:8080
-    No Proxy: localhost,127.0.0.1,docker-registry.somecorporation.com
-    Registry: https://index.docker.io/v1/
-    WARNING: No swap limit support
-    Labels:
-     storage=ssd
-     staging=true
-    Experimental: false
-    Insecure Registries:
-     127.0.0.0/8
-    Registry Mirrors:
-      http://192.168.1.2/
-      http://registry-mirror.example.com:5000/
-    Live Restore Enabled: false
-
-
-
-The global `-D` option tells all `docker` commands to output debug information.
-
-The example below shows the output for a daemon running on Red Hat Enterprise Linux,
-using the devicemapper storage driver. As can be seen in the output, additional
-information about the devicemapper storage driver is shown:
-
-    $ docker info
-    Containers: 14
-     Running: 3
-     Paused: 1
-     Stopped: 10
-    Untagged Images: 52
-    Server Version: 1.10.3
-    Storage Driver: devicemapper
-     Pool Name: docker-202:2-25583803-pool
-     Pool Blocksize: 65.54 kB
-     Base Device Size: 10.74 GB
-     Backing Filesystem: xfs
-     Data file: /dev/loop0
-     Metadata file: /dev/loop1
-     Data Space Used: 1.68 GB
-     Data Space Total: 107.4 GB
-     Data Space Available: 7.548 GB
-     Metadata Space Used: 2.322 MB
-     Metadata Space Total: 2.147 GB
-     Metadata Space Available: 2.145 GB
-     Udev Sync Supported: true
-     Deferred Removal Enabled: false
-     Deferred Deletion Enabled: false
-     Deferred Deleted Device Count: 0
-     Data loop file: /var/lib/docker/devicemapper/devicemapper/data
-     Metadata loop file: /var/lib/docker/devicemapper/devicemapper/metadata
-     Library Version: 1.02.107-RHEL7 (2015-12-01)
-    Execution Driver: native-0.2
-    Logging Driver: json-file
-    Plugins:
-     Volume: local
-     Network: null host bridge
-    Kernel Version: 3.10.0-327.el7.x86_64
-    Operating System: Red Hat Enterprise Linux Server 7.2 (Maipo)
-    OSType: linux
-    Architecture: x86_64
-    CPUs: 1
-    Total Memory: 991.7 MiB
-    Name: ip-172-30-0-91.ec2.internal
-    ID: I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S
-    Docker Root Dir: /var/lib/docker
-    Debug mode (client): false
-    Debug mode (server): false
-    Username: gordontheturtle
-    Registry: https://index.docker.io/v1/
-    Insecure registries:
-     myinsecurehost:5000
-     127.0.0.0/8
-
-You can also specify the output format:
-
-    $ docker info --format '{{json .}}'
-	{"ID":"I54V:OLXT:HVMM:TPKO:JPHQ:CQCD:JNLC:O3BZ:4ZVJ:43XJ:PFHZ:6N2S","Containers":14, ...}
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-inspect.1.md b/installer/vendor/github.com/docker/docker/man/docker-inspect.1.md
deleted file mode 100644
index 21d7ba678a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-inspect.1.md
+++ /dev/null
@@ -1,323 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-inspect - Return low-level information on docker objects
-
-# SYNOPSIS
-**docker inspect**
-[**--help**]
-[**-f**|**--format**[=*FORMAT*]]
-[**-s**|**--size**]
-[**--type**=*container*|*image*|*network*|*node*|*service*|*task*|*volume*]
-NAME|ID [NAME|ID...]
-
-# DESCRIPTION
-
-This displays the low-level information on Docker object(s) (e.g. container, 
-image, volume,network, node, service, or task) identified by name or ID. By default,
-this will render all results in a JSON array. If the container and image have
-the same name, this will return container JSON for unspecified type. If a format
-is specified, the given template will be executed for each result.
-
-# OPTIONS
-**--help**
-    Print usage statement
-
-**-f**, **--format**=""
-    Format the output using the given Go template
-
-**-s**, **--size**
-    Display total file sizes if the type is container
-
-**--type**=*container*|*image*|*network*|*node*|*service*|*task*|*volume*
-    Return JSON for specified type, permissible values are "image", "container",
-    "network", "node", "service", "task", and "volume"
-
-# EXAMPLES
-
-Get information about an image when image name conflicts with the container name,
-e.g. both image and container are named rhel7:
-
-    $ docker inspect --type=image rhel7
-    [
-    {
-     "Id": "fe01a428b9d9de35d29531e9994157978e8c48fa693e1bf1d221dffbbb67b170",
-     "Parent": "10acc31def5d6f249b548e01e8ffbaccfd61af0240c17315a7ad393d022c5ca2",
-     ....
-    }
-    ]
-
-## Getting information on a container
-
-To get information on a container use its ID or instance name:
-
-    $ docker inspect d2cc496561d6
-    [{
-    "Id": "d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47",
-    "Created": "2015-06-08T16:18:02.505155285Z",
-    "Path": "bash",
-    "Args": [],
-    "State": {
-        "Running": false,
-        "Paused": false,
-        "Restarting": false,
-        "OOMKilled": false,
-        "Dead": false,
-        "Pid": 0,
-        "ExitCode": 0,
-        "Error": "",
-        "StartedAt": "2015-06-08T16:18:03.643865954Z",
-        "FinishedAt": "2015-06-08T16:57:06.448552862Z"
-    },
-    "Image": "ded7cd95e059788f2586a51c275a4f151653779d6a7f4dad77c2bd34601d94e4",
-    "NetworkSettings": {
-        "Bridge": "",
-        "SandboxID": "6b4851d1903e16dd6a567bd526553a86664361f31036eaaa2f8454d6f4611f6f",
-        "HairpinMode": false,
-        "LinkLocalIPv6Address": "",
-        "LinkLocalIPv6PrefixLen": 0,
-        "Ports": {},
-        "SandboxKey": "/var/run/docker/netns/6b4851d1903e",
-        "SecondaryIPAddresses": null,
-        "SecondaryIPv6Addresses": null,
-        "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-        "Gateway": "172.17.0.1",
-        "GlobalIPv6Address": "",
-        "GlobalIPv6PrefixLen": 0,
-        "IPAddress": "172.17.0.2",
-        "IPPrefixLen": 16,
-        "IPv6Gateway": "",
-        "MacAddress": "02:42:ac:12:00:02",
-        "Networks": {
-            "bridge": {
-                "NetworkID": "7ea29fc1412292a2d7bba362f9253545fecdfa8ce9a6e37dd10ba8bee7129812",
-                "EndpointID": "7587b82f0dada3656fda26588aee72630c6fab1536d36e394b2bfbcf898c971d",
-                "Gateway": "172.17.0.1",
-                "IPAddress": "172.17.0.2",
-                "IPPrefixLen": 16,
-                "IPv6Gateway": "",
-                "GlobalIPv6Address": "",
-                "GlobalIPv6PrefixLen": 0,
-                "MacAddress": "02:42:ac:12:00:02"
-            }
-        }
-
-    },
-    "ResolvConfPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/resolv.conf",
-    "HostnamePath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/hostname",
-    "HostsPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/hosts",
-    "LogPath": "/var/lib/docker/containers/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47/d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47-json.log",
-    "Name": "/adoring_wozniak",
-    "RestartCount": 0,
-    "Driver": "devicemapper",
-    "MountLabel": "",
-    "ProcessLabel": "",
-    "Mounts": [
-      {
-        "Source": "/data",
-        "Destination": "/data",
-        "Mode": "ro,Z",
-        "RW": false
-	"Propagation": ""
-      }
-    ],
-    "AppArmorProfile": "",
-    "ExecIDs": null,
-    "HostConfig": {
-        "Binds": null,
-        "ContainerIDFile": "",
-        "Memory": 0,
-        "MemorySwap": 0,
-        "CpuShares": 0,
-        "CpuPeriod": 0,
-        "CpusetCpus": "",
-        "CpusetMems": "",
-        "CpuQuota": 0,
-        "BlkioWeight": 0,
-        "OomKillDisable": false,
-        "Privileged": false,
-        "PortBindings": {},
-        "Links": null,
-        "PublishAllPorts": false,
-        "Dns": null,
-        "DnsSearch": null,
-        "DnsOptions": null,
-        "ExtraHosts": null,
-        "VolumesFrom": null,
-        "Devices": [],
-        "NetworkMode": "bridge",
-        "IpcMode": "",
-        "PidMode": "",
-        "UTSMode": "",
-        "CapAdd": null,
-        "CapDrop": null,
-        "RestartPolicy": {
-            "Name": "no",
-            "MaximumRetryCount": 0
-        },
-        "SecurityOpt": null,
-        "ReadonlyRootfs": false,
-        "Ulimits": null,
-        "LogConfig": {
-            "Type": "json-file",
-            "Config": {}
-        },
-        "CgroupParent": ""
-    },
-    "GraphDriver": {
-        "Name": "devicemapper",
-        "Data": {
-            "DeviceId": "5",
-            "DeviceName": "docker-253:1-2763198-d2cc496561d6d520cbc0236b4ba88c362c446a7619992123f11c809cded25b47",
-            "DeviceSize": "171798691840"
-        }
-    },
-    "Config": {
-        "Hostname": "d2cc496561d6",
-        "Domainname": "",
-        "User": "",
-        "AttachStdin": true,
-        "AttachStdout": true,
-        "AttachStderr": true,
-        "ExposedPorts": null,
-        "Tty": true,
-        "OpenStdin": true,
-        "StdinOnce": true,
-        "Env": null,
-        "Cmd": [
-            "bash"
-        ],
-        "Image": "fedora",
-        "Volumes": null,
-        "VolumeDriver": "",
-        "WorkingDir": "",
-        "Entrypoint": null,
-        "NetworkDisabled": false,
-        "MacAddress": "",
-        "OnBuild": null,
-        "Labels": {},
-        "Memory": 0,
-        "MemorySwap": 0,
-        "CpuShares": 0,
-        "Cpuset": "",
-        "StopSignal": "SIGTERM"
-    }
-    }
-    ]
-## Getting the IP address of a container instance
-
-To get the IP address of a container use:
-
-    $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' d2cc496561d6
-    172.17.0.2
-
-## Listing all port bindings
-
-One can loop over arrays and maps in the results to produce simple text
-output:
-
-    $ docker inspect --format='{{range $p, $conf := .NetworkSettings.Ports}} \
-      {{$p}} -> {{(index $conf 0).HostPort}} {{end}}' d2cc496561d6
-      80/tcp -> 80
-
-You can get more information about how to write a Go template from:
-https://golang.org/pkg/text/template/.
-
-## Getting size information on a container
-
-    $ docker inspect -s d2cc496561d6
-    [
-    {
-    ....
-    "SizeRw": 0,
-    "SizeRootFs": 972,
-    ....
-    }
-    ]
-
-## Getting information on an image
-
-Use an image's ID or name (e.g., repository/name[:tag]) to get information
-about the image:
-
-    $ docker inspect ded7cd95e059
-    [{
-    "Id": "ded7cd95e059788f2586a51c275a4f151653779d6a7f4dad77c2bd34601d94e4",
-    "Parent": "48ecf305d2cf7046c1f5f8fcbcd4994403173441d4a7f125b1bb0ceead9de731",
-    "Comment": "",
-    "Created": "2015-05-27T16:58:22.937503085Z",
-    "Container": "76cf7f67d83a7a047454b33007d03e32a8f474ad332c3a03c94537edd22b312b",
-    "ContainerConfig": {
-        "Hostname": "76cf7f67d83a",
-        "Domainname": "",
-        "User": "",
-        "AttachStdin": false,
-        "AttachStdout": false,
-        "AttachStderr": false,
-        "ExposedPorts": null,
-        "Tty": false,
-        "OpenStdin": false,
-        "StdinOnce": false,
-        "Env": null,
-        "Cmd": [
-            "/bin/sh",
-            "-c",
-            "#(nop) ADD file:4be46382bcf2b095fcb9fe8334206b584eff60bb3fad8178cbd97697fcb2ea83 in /"
-        ],
-        "Image": "48ecf305d2cf7046c1f5f8fcbcd4994403173441d4a7f125b1bb0ceead9de731",
-        "Volumes": null,
-        "VolumeDriver": "",
-        "WorkingDir": "",
-        "Entrypoint": null,
-        "NetworkDisabled": false,
-        "MacAddress": "",
-        "OnBuild": null,
-        "Labels": {}
-    },
-    "DockerVersion": "1.6.0",
-    "Author": "Lokesh Mandvekar \u003clsm5@fedoraproject.org\u003e",
-    "Config": {
-        "Hostname": "76cf7f67d83a",
-        "Domainname": "",
-        "User": "",
-        "AttachStdin": false,
-        "AttachStdout": false,
-        "AttachStderr": false,
-        "ExposedPorts": null,
-        "Tty": false,
-        "OpenStdin": false,
-        "StdinOnce": false,
-        "Env": null,
-        "Cmd": null,
-        "Image": "48ecf305d2cf7046c1f5f8fcbcd4994403173441d4a7f125b1bb0ceead9de731",
-        "Volumes": null,
-        "VolumeDriver": "",
-        "WorkingDir": "",
-        "Entrypoint": null,
-        "NetworkDisabled": false,
-        "MacAddress": "",
-        "OnBuild": null,
-        "Labels": {}
-    },
-    "Architecture": "amd64",
-    "Os": "linux",
-    "Size": 186507296,
-    "VirtualSize": 186507296,
-    "GraphDriver": {
-        "Name": "devicemapper",
-        "Data": {
-            "DeviceId": "3",
-            "DeviceName": "docker-253:1-2763198-ded7cd95e059788f2586a51c275a4f151653779d6a7f4dad77c2bd34601d94e4",
-            "DeviceSize": "171798691840"
-        }
-    }
-    }
-    ]
-
-# HISTORY
-April 2014, originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Qiang Huang <h.huangqiang@huawei.com>
-October 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-kill.1.md b/installer/vendor/github.com/docker/docker/man/docker-kill.1.md
deleted file mode 100644
index 36cbdb90ea..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-kill.1.md
+++ /dev/null
@@ -1,28 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-kill - Kill a running container using SIGKILL or a specified signal
-
-# SYNOPSIS
-**docker kill**
-[**--help**]
-[**-s**|**--signal**[=*"KILL"*]]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-The main process inside each container specified will be sent SIGKILL,
- or any signal specified with option --signal.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-s**, **--signal**="*KILL*"
-   Signal to send to the container
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
- based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-load.1.md b/installer/vendor/github.com/docker/docker/man/docker-load.1.md
deleted file mode 100644
index b165173047..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-load.1.md
+++ /dev/null
@@ -1,56 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-load - Load an image from a tar archive or STDIN
-
-# SYNOPSIS
-**docker load**
-[**--help**]
-[**-i**|**--input**[=*INPUT*]]
-[**-q**|**--quiet**]
-
-# DESCRIPTION
-
-Loads a tarred repository from a file or the standard input stream.
-Restores both images and tags. Write image names or IDs imported it
-standard output stream.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-i**, **--input**=""
-   Read from a tar archive file, instead of STDIN. The tarball may be compressed with gzip, bzip, or xz.
-
-**-q**, **--quiet**
-   Suppress the load progress bar but still outputs the imported images.
-
-# EXAMPLES
-
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             latest              769b9341d937        7 weeks ago         2.489 MB
-    $ docker load --input fedora.tar
-    # […]
-    Loaded image: fedora:rawhide
-    # […]
-    Loaded image: fedora:20
-    # […]
-    $ docker images
-    REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-    busybox             latest              769b9341d937        7 weeks ago         2.489 MB
-    fedora              rawhide             0d20aec6529d        7 weeks ago         387 MB
-    fedora              20                  58394af37342        7 weeks ago         385.5 MB
-    fedora              heisenbug           58394af37342        7 weeks ago         385.5 MB
-    fedora              latest              58394af37342        7 weeks ago         385.5 MB
-
-# See also
-**docker-save(1)** to save one or more images to a tar archive (streamed to STDOUT by default).
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2015 update by Mary Anthony <mary@docker.com>
-June 2016 update by Vincent Demeester <vincent@sbr.pm>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-login.1.md b/installer/vendor/github.com/docker/docker/man/docker-login.1.md
deleted file mode 100644
index c0d4f795db..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-login.1.md
+++ /dev/null
@@ -1,53 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-login - Log in to a Docker registry.
-
-# SYNOPSIS
-**docker login**
-[**--help**]
-[**-p**|**--password**[=*PASSWORD*]]
-[**-u**|**--username**[=*USERNAME*]]
-[SERVER]
-
-# DESCRIPTION
-Log in to a Docker Registry located on the specified
-`SERVER`.  You can specify a URL or a `hostname` for the `SERVER` value. If you
-do not specify a `SERVER`, the command uses Docker's public registry located at
-`https://registry-1.docker.io/` by default.  To get a username/password for Docker's public registry, create an account on Docker Hub.
-
-`docker login` requires user to use `sudo` or be `root`, except when:
-
-1.  connecting to  a remote daemon, such as a `docker-machine` provisioned `docker engine`.
-2.  user is added to the `docker` group.  This will impact the security of your system; the `docker` group is `root` equivalent.  See [Docker Daemon Attack Surface](https://docs.docker.com/engine/articles/security/#docker-daemon-attack-surface) for details.
-
-You can log into any public or private repository for which you have
-credentials.  When you log in, the command stores encoded credentials in
-`$HOME/.docker/config.json` on Linux or `%USERPROFILE%/.docker/config.json` on Windows.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-p**, **--password**=""
-   Password
-
-**-u**, **--username**=""
-   Username
-
-# EXAMPLES
-
-## Login to a registry on your localhost
-
-    # docker login localhost:8080
-
-# See also
-**docker-logout(1)** to log out from a Docker registry.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
-November 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-logout.1.md b/installer/vendor/github.com/docker/docker/man/docker-logout.1.md
deleted file mode 100644
index a8a4b7c3c0..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-logout.1.md
+++ /dev/null
@@ -1,32 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-logout - Log out from a Docker registry.
-
-# SYNOPSIS
-**docker logout**
-[SERVER]
-
-# DESCRIPTION
-Log out of a Docker Registry located on the specified `SERVER`. You can
-specify a URL or a `hostname` for the `SERVER` value. If you do not specify a
-`SERVER`, the command attempts to log you out of Docker's public registry
-located at `https://registry-1.docker.io/` by default.  
-
-# OPTIONS
-There are no available options.
-
-# EXAMPLES
-
-## Log out from a registry on your localhost
-
-    # docker logout localhost:8080
-
-# See also
-**docker-login(1)** to log in to a Docker registry server.
-
-# HISTORY
-June 2014, Originally compiled by Daniel, Dao Quang Minh (daniel at nitrous dot io)
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-logs.1.md b/installer/vendor/github.com/docker/docker/man/docker-logs.1.md
deleted file mode 100644
index e70f796e28..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-logs.1.md
+++ /dev/null
@@ -1,71 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-logs - Fetch the logs of a container
-
-# SYNOPSIS
-**docker logs**
-[**-f**|**--follow**]
-[**--help**]
-[**--since**[=*SINCE*]]
-[**-t**|**--timestamps**]
-[**--tail**[=*"all"*]]
-CONTAINER
-
-# DESCRIPTION
-The **docker logs** command batch-retrieves whatever logs are present for
-a container at the time of execution. This does not guarantee execution
-order when combined with a docker run (i.e., your run may not have generated
-any logs at the time you execute docker logs).
-
-The **docker logs --follow** command combines commands **docker logs** and
-**docker attach**. It will first return all logs from the beginning and
-then continue streaming new output from the container's stdout and stderr.
-
-**Warning**: This command works only for the **json-file** or **journald**
-logging drivers.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**--details**=*true*|*false*
-   Show extra details provided to logs
-
-**-f**, **--follow**=*true*|*false*
-   Follow log output. The default is *false*.
-
-**--since**=""
-   Show logs since timestamp
-
-**-t**, **--timestamps**=*true*|*false*
-   Show timestamps. The default is *false*.
-
-**--tail**="*all*"
-   Output the specified number of lines at the end of logs (defaults to all logs)
-
-The `--since` option can be Unix timestamps, date formatted timestamps, or Go
-duration strings (e.g. `10m`, `1h30m`) computed relative to the client machine's
-time. Supported formats for date formatted time stamps include RFC3339Nano,
-RFC3339, `2006-01-02T15:04:05`, `2006-01-02T15:04:05.999999999`,
-`2006-01-02Z07:00`, and `2006-01-02`. The local timezone on the client will be
-used if you do not provide either a `Z` or a `+-00:00` timezone offset at the
-end of the timestamp.  When providing Unix timestamps enter
-seconds[.nanoseconds], where seconds is the number of seconds that have elapsed
-since January 1, 1970 (midnight UTC/GMT), not counting leap  seconds (aka Unix
-epoch or Unix time), and the optional .nanoseconds field is a fraction of a
-second no more than nine digits long. You can combine the `--since` option with
-either or both of the `--follow` or `--tail` options.
-
-The `docker logs --details` command will add on extra attributes, such as
-environment variables and labels, provided to `--log-opt` when creating the
-container.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
-October 2015, updated by Mike Brown <mikebrow@gmail.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-connect.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-connect.1.md
deleted file mode 100644
index 096ec77a4d..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-connect.1.md
+++ /dev/null
@@ -1,66 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-connect - connect a container to a network
-
-# SYNOPSIS
-**docker network connect**
-[**--help**]
-NETWORK CONTAINER
-
-# DESCRIPTION
-
-Connects a container to a network. You can connect a container by name
-or by ID. Once connected, the container can communicate with other containers in
-the same network.
-
-```bash
-$ docker network connect multi-host-network container1
-```
-
-You can also use the `docker run --network=<network-name>` option to start a container and immediately connect it to a network.
-
-```bash
-$ docker run -itd --network=multi-host-network --ip 172.20.88.22 --ip6 2001:db8::8822 busybox
-```
-You can pause, restart, and stop containers that are connected to a network.
-A container connects to its configured networks when it runs.
-
-If specified, the container's IP address(es) is reapplied when a stopped
-container is restarted. If the IP address is no longer available, the container
-fails to start. One way to guarantee that the IP address is available is
-to specify an `--ip-range` when creating the network, and choose the static IP
-address(es) from outside that range. This ensures that the IP address is not
-given to another container while this container is not on the network.
-
-```bash
-$ docker network create --subnet 172.20.0.0/16 --ip-range 172.20.240.0/20 multi-host-network
-```
-
-```bash
-$ docker network connect --ip 172.20.128.2 multi-host-network container2
-```
-
-To verify the container is connected, use the `docker network inspect` command. Use `docker network disconnect` to remove a container from the network.
-
-Once connected in network, containers can communicate using only another
-container's IP address or name. For `overlay` networks or custom plugins that
-support multi-host connectivity, containers connected to the same multi-host
-network but launched from different Engines can also communicate in this way.
-
-You can connect a container to one or more networks. The networks need not be the same type. For example, you can connect a single container bridge and overlay networks.
-
-
-# OPTIONS
-**NETWORK**
-  Specify network name
-
-**CONTAINER**
-  Specify container name
-
-**--help**
-  Print usage statement
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-create.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-create.1.md
deleted file mode 100644
index 44ce8e15c2..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-create.1.md
+++ /dev/null
@@ -1,187 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-create - create a new network
-
-# SYNOPSIS
-**docker network create**
-[**--attachable**]
-[**--aux-address**=*map[]*]
-[**-d**|**--driver**=*DRIVER*]
-[**--gateway**=*[]*]
-[**--help**]
-[**--internal**]
-[**--ip-range**=*[]*]
-[**--ipam-driver**=*default*]
-[**--ipam-opt**=*map[]*]
-[**--ipv6**]
-[**--label**[=*[]*]]
-[**-o**|**--opt**=*map[]*]
-[**--subnet**=*[]*]
-NETWORK-NAME
-
-# DESCRIPTION
-
-Creates a new network. The `DRIVER` accepts `bridge` or `overlay` which are the
-built-in network drivers. If you have installed a third party or your own custom
-network driver you can specify that `DRIVER` here also. If you don't specify the
-`--driver` option, the command automatically creates a `bridge` network for you.
-When you install Docker Engine it creates a `bridge` network automatically. This
-network corresponds to the `docker0` bridge that Engine has traditionally relied
-on. When launch a new container with  `docker run` it automatically connects to
-this bridge network. You cannot remove this default bridge network but you can
-create new ones using the `network create` command.
-
-```bash
-$ docker network create -d bridge my-bridge-network
-```
-
-Bridge networks are isolated networks on a single Engine installation. If you
-want to create a network that spans multiple Docker hosts each running an
-Engine, you must create an `overlay` network. Unlike `bridge` networks overlay
-networks require some pre-existing conditions before you can create one. These
-conditions are:
-
-* Access to a key-value store. Engine supports Consul, Etcd, and Zookeeper (Distributed store) key-value stores.
-* A cluster of hosts with connectivity to the key-value store.
-* A properly configured Engine `daemon` on each host in the cluster.
-
-The `dockerd` options that support the `overlay` network are:
-
-* `--cluster-store`
-* `--cluster-store-opt`
-* `--cluster-advertise`
-
-To read more about these options and how to configure them, see ["*Get started
-with multi-host
-network*"](https://docs.docker.com/engine/userguide/networking/get-started-overlay/).
-
-It is also a good idea, though not required, that you install Docker Swarm on to
-manage the cluster that makes up your network. Swarm provides sophisticated
-discovery and server management that can assist your implementation.
-
-Once you have prepared the `overlay` network prerequisites you simply choose a
-Docker host in the cluster and issue the following to create the network:
-
-```bash
-$ docker network create -d overlay my-multihost-network
-```
-
-Network names must be unique. The Docker daemon attempts to identify naming
-conflicts but this is not guaranteed. It is the user's responsibility to avoid
-name conflicts.
-
-## Connect containers
-
-When you start a container use the `--network` flag to connect it to a network.
-This adds the `busybox` container to the `mynet` network.
-
-```bash
-$ docker run -itd --network=mynet busybox
-```
-
-If you want to add a container to a network after the container is already
-running use the `docker network connect` subcommand.
-
-You can connect multiple containers to the same network. Once connected, the
-containers can communicate using only another container's IP address or name.
-For `overlay` networks or custom plugins that support multi-host connectivity,
-containers connected to the same multi-host network but launched from different
-Engines can also communicate in this way.
-
-You can disconnect a container from a network using the `docker network
-disconnect` command.
-
-## Specifying advanced options
-
-When you create a network, Engine creates a non-overlapping subnetwork for the
-network by default. This subnetwork is not a subdivision of an existing network.
-It is purely for ip-addressing purposes. You can override this default and
-specify subnetwork values directly using the `--subnet` option. On a
-`bridge` network you can only create a single subnet:
-
-```bash
-$ docker network create -d bridge --subnet=192.168.0.0/16 br0
-```
-
-Additionally, you also specify the `--gateway` `--ip-range` and `--aux-address`
-options.
-
-```bash
-$ docker network create \
-  --driver=bridge \
-  --subnet=172.28.0.0/16 \
-  --ip-range=172.28.5.0/24 \
-  --gateway=172.28.5.254 \
-  br0
-```
-
-If you omit the `--gateway` flag the Engine selects one for you from inside a
-preferred pool. For `overlay` networks and for network driver plugins that
-support it you can create multiple subnetworks.
-
-```bash
-$ docker network create -d overlay \
-  --subnet=192.168.0.0/16 \
-  --subnet=192.170.0.0/16 \
-  --gateway=192.168.0.100 \ 
-  --gateway=192.170.0.100 \
-  --ip-range=192.168.1.0/24 \
-  --aux-address="my-router=192.168.1.5" --aux-address="my-switch=192.168.1.6" \
-  --aux-address="my-printer=192.170.1.5" --aux-address="my-nas=192.170.1.6" \
-  my-multihost-network
-```
-
-Be sure that your subnetworks do not overlap. If they do, the network create
-fails and Engine returns an error.
-
-### Network internal mode
-
-By default, when you connect a container to an `overlay` network, Docker also
-connects a bridge network to it to provide external connectivity. If you want
-to create an externally isolated `overlay` network, you can specify the
-`--internal` option.
-
-# OPTIONS
-**--attachable**
-  Enable manual container attachment
-
-**--aux-address**=map[]
-  Auxiliary IPv4 or IPv6 addresses used by network driver
-
-**-d**, **--driver**=*DRIVER*
-  Driver to manage the Network bridge or overlay. The default is bridge.
-
-**--gateway**=[]
-  IPv4 or IPv6 Gateway for the master subnet
-
-**--help**
-  Print usage
-
-**--internal**
-  Restrict external access to the network
-
-**--ip-range**=[]
-  Allocate container ip from a sub-range
-
-**--ipam-driver**=*default*
-  IP Address Management Driver
-
-**--ipam-opt**=map[]
-  Set custom IPAM driver options
-
-**--ipv6**
-  Enable IPv6 networking
-
-**--label**=*label*
-   Set metadata for a network
-
-**-o**, **--opt**=map[]
-  Set custom driver options
-
-**--subnet**=[]
-  Subnet in CIDR format that represents a network segment
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-disconnect.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-disconnect.1.md
deleted file mode 100644
index 09bcac51b0..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-disconnect.1.md
+++ /dev/null
@@ -1,36 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-disconnect - disconnect a container from a network
-
-# SYNOPSIS
-**docker network disconnect**
-[**--help**]
-[**--force**]
-NETWORK CONTAINER
-
-# DESCRIPTION
-
-Disconnects a container from a network.
-
-```bash
-  $ docker network disconnect multi-host-network container1
-```
-
-
-# OPTIONS
-**NETWORK**
-  Specify network name
-
-**CONTAINER**
-    Specify container name
-
-**--force**
-  Force the container to disconnect from a network
-
-**--help**
-  Print usage statement
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-inspect.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-inspect.1.md
deleted file mode 100644
index f27c98cb34..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-inspect.1.md
+++ /dev/null
@@ -1,112 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-inspect - inspect a network
-
-# SYNOPSIS
-**docker network inspect**
-[**-f**|**--format**[=*FORMAT*]]
-[**--help**]
-NETWORK [NETWORK...]
-
-# DESCRIPTION
-
-Returns information about one or more networks. By default, this command renders all results in a JSON object. For example, if you connect two containers to the default `bridge` network:
-
-```bash
-$ sudo docker run -itd --name=container1 busybox
-f2870c98fd504370fb86e59f32cd0753b1ac9b69b7d80566ffc7192a82b3ed27
-
-$ sudo docker run -itd --name=container2 busybox
-bda12f8922785d1f160be70736f26c1e331ab8aaf8ed8d56728508f2e2fd4727
-```
-
-The `network inspect` command shows the containers, by id, in its
-results. You can specify an alternate format to execute a given
-template for each result. Go's
-[text/template](http://golang.org/pkg/text/template/) package
-describes all the details of the format.
-
-```bash
-$ sudo docker network inspect bridge
-[
-    {
-        "Name": "bridge",
-        "Id": "b2b1a2cba717161d984383fd68218cf70bbbd17d328496885f7c921333228b0f",
-        "Scope": "local",
-        "Driver": "bridge",
-        "IPAM": {
-            "Driver": "default",
-            "Config": [
-                {
-                    "Subnet": "172.17.42.1/16",
-                    "Gateway": "172.17.42.1"
-                }
-            ]
-        },
-        "Internal": false,
-        "Containers": {
-            "bda12f8922785d1f160be70736f26c1e331ab8aaf8ed8d56728508f2e2fd4727": {
-                "Name": "container2",
-                "EndpointID": "0aebb8fcd2b282abe1365979536f21ee4ceaf3ed56177c628eae9f706e00e019",
-                "MacAddress": "02:42:ac:11:00:02",
-                "IPv4Address": "172.17.0.2/16",
-                "IPv6Address": ""
-            },
-            "f2870c98fd504370fb86e59f32cd0753b1ac9b69b7d80566ffc7192a82b3ed27": {
-                "Name": "container1",
-                "EndpointID": "a00676d9c91a96bbe5bcfb34f705387a33d7cc365bac1a29e4e9728df92d10ad",
-                "MacAddress": "02:42:ac:11:00:01",
-                "IPv4Address": "172.17.0.1/16",
-                "IPv6Address": ""
-            }
-        },
-        "Options": {
-            "com.docker.network.bridge.default_bridge": "true",
-            "com.docker.network.bridge.enable_icc": "true",
-            "com.docker.network.bridge.enable_ip_masquerade": "true",
-            "com.docker.network.bridge.host_binding_ipv4": "0.0.0.0",
-            "com.docker.network.bridge.name": "docker0",
-            "com.docker.network.driver.mtu": "1500"
-        }
-    }
-]
-```
-
-Returns the information about the user-defined network:
-
-```bash
-$ docker network create simple-network
-69568e6336d8c96bbf57869030919f7c69524f71183b44d80948bd3927c87f6a
-$ docker network inspect simple-network
-[
-    {
-        "Name": "simple-network",
-        "Id": "69568e6336d8c96bbf57869030919f7c69524f71183b44d80948bd3927c87f6a",
-        "Scope": "local",
-        "Driver": "bridge",
-        "IPAM": {
-            "Driver": "default",
-            "Config": [
-                {
-                    "Subnet": "172.22.0.0/16",
-                    "Gateway": "172.22.0.1"
-                }
-            ]
-        },
-        "Containers": {},
-        "Options": {}
-    }
-]
-```
-
-# OPTIONS
-**-f**, **--format**=""
-  Format the output using the given Go template.
-
-**--help**
-  Print usage statement
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-ls.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-ls.1.md
deleted file mode 100644
index f319e66035..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-ls.1.md
+++ /dev/null
@@ -1,188 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-ls - list networks
-
-# SYNOPSIS
-**docker network ls**
-[**-f**|**--filter**[=*[]*]]
-[**--format**=*"TEMPLATE"*]
-[**--no-trunc**[=*true*|*false*]]
-[**-q**|**--quiet**[=*true*|*false*]]
-[**--help**]
-
-# DESCRIPTION
-
-Lists all the networks the Engine `daemon` knows about. This includes the
-networks that span across multiple hosts in a cluster, for example:
-
-```bash
-    $ docker network ls
-    NETWORK ID          NAME                DRIVER          SCOPE
-    7fca4eb8c647        bridge              bridge          local
-    9f904ee27bf5        none                null            local
-    cf03ee007fb4        host                host            local
-    78b03ee04fc4        multi-host          overlay         swarm
-```
-
-Use the `--no-trunc` option to display the full network id:
-
-```bash
-$ docker network ls --no-trunc
-NETWORK ID                                                         NAME                DRIVER
-18a2866682b85619a026c81b98a5e375bd33e1b0936a26cc497c283d27bae9b3   none                null                
-c288470c46f6c8949c5f7e5099b5b7947b07eabe8d9a27d79a9cbf111adcbf47   host                host                
-7b369448dccbf865d397c8d2be0cda7cf7edc6b0945f77d2529912ae917a0185   bridge              bridge              
-95e74588f40db048e86320c6526440c504650a1ff3e9f7d60a497c4d2163e5bd   foo                 bridge    
-63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161   dev                 bridge
-```
-
-## Filtering
-
-The filtering flag (`-f` or `--filter`) format is a `key=value` pair. If there
-is more than one filter, then pass multiple flags (e.g. `--filter "foo=bar" --filter "bif=baz"`).
-Multiple filter flags are combined as an `OR` filter. For example, 
-`-f type=custom -f type=builtin` returns both `custom` and `builtin` networks.
-
-The currently supported filters are:
-
-* driver
-* id (network's id)
-* label (`label=<key>` or `label=<key>=<value>`)
-* name (network's name)
-* type (custom|builtin)
-
-#### Driver
-
-The `driver` filter matches networks based on their driver.
-
-The following example matches networks with the `bridge` driver:
-
-```bash
-$ docker network ls --filter driver=bridge
-NETWORK ID          NAME                DRIVER
-db9db329f835        test1               bridge
-f6e212da9dfd        test2               bridge
-```
-
-#### ID
-
-The `id` filter matches on all or part of a network's ID.
-
-The following filter matches all networks with an ID containing the
-`63d1ff1f77b0...` string.
-
-```bash
-$ docker network ls --filter id=63d1ff1f77b07ca51070a8c227e962238358bd310bde1529cf62e6c307ade161
-NETWORK ID          NAME                DRIVER
-63d1ff1f77b0        dev                 bridge
-```
-
-You can also filter for a substring in an ID as this shows:
-
-```bash
-$ docker network ls --filter id=95e74588f40d
-NETWORK ID          NAME                DRIVER
-95e74588f40d        foo                 bridge
-
-$ docker network ls --filter id=95e
-NETWORK ID          NAME                DRIVER
-95e74588f40d        foo                 bridge
-```
-
-#### Label
-
-The `label` filter matches networks based on the presence of a `label` alone or a `label` and a
-value.
-
-The following filter matches networks with the `usage` label regardless of its value.
-
-```bash
-$ docker network ls -f "label=usage"
-NETWORK ID          NAME                DRIVER
-db9db329f835        test1               bridge              
-f6e212da9dfd        test2               bridge
-```
-
-The following filter matches networks with the `usage` label with the `prod` value.
-
-```bash
-$ docker network ls -f "label=usage=prod"
-NETWORK ID          NAME                DRIVER
-f6e212da9dfd        test2               bridge
-```
-
-#### Name
-
-The `name` filter matches on all or part of a network's name.
-
-The following filter matches all networks with a name containing the `foobar` string.
-
-```bash
-$ docker network ls --filter name=foobar
-NETWORK ID          NAME                DRIVER
-06e7eef0a170        foobar              bridge
-```
-
-You can also filter for a substring in a name as this shows:
-
-```bash
-$ docker network ls --filter name=foo
-NETWORK ID          NAME                DRIVER
-95e74588f40d        foo                 bridge
-06e7eef0a170        foobar              bridge
-```
-
-#### Type
-
-The `type` filter supports two values; `builtin` displays predefined networks
-(`bridge`, `none`, `host`), whereas `custom` displays user defined networks.
-
-The following filter matches all user defined networks:
-
-```bash
-$ docker network ls --filter type=custom
-NETWORK ID          NAME                DRIVER
-95e74588f40d        foo                 bridge
-63d1ff1f77b0        dev                 bridge
-```
-
-By having this flag it allows for batch cleanup. For example, use this filter
-to delete all user defined networks:
-
-```bash
-$ docker network rm `docker network ls --filter type=custom -q`
-```
-
-A warning will be issued when trying to remove a network that has containers
-attached.
-
-# OPTIONS
-
-**-f**, **--filter**=*[]*
-  filter output based on conditions provided. 
-
-**--format**="*TEMPLATE*"
-  Pretty-print networks using a Go template.
-  Valid placeholders:
-     .ID - Network ID
-     .Name - Network name
-     .Driver - Network driver
-     .Scope - Network scope (local, global)
-     .IPv6 - Whether IPv6 is enabled on the network or not
-     .Internal - Whether the network is internal or not
-     .Labels - All labels assigned to the network
-     .Label - Value of a specific label for this network. For example `{{.Label "project.version"}}`
-
-**--no-trunc**=*true*|*false*
-  Do not truncate the output
-
-**-q**, **--quiet**=*true*|*false*
-  Only display network IDs
-
-**--help**
-  Print usage statement
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-network-rm.1.md b/installer/vendor/github.com/docker/docker/man/docker-network-rm.1.md
deleted file mode 100644
index c094a15286..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-network-rm.1.md
+++ /dev/null
@@ -1,43 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCT 2015
-# NAME
-docker-network-rm - remove one or more networks
-
-# SYNOPSIS
-**docker network rm** 
-[**--help**]
-NETWORK [NETWORK...]
-
-# DESCRIPTION
-
-Removes one or more networks by name or identifier. To remove a network,
-you must first disconnect any containers connected to it.
-To remove the network named 'my-network':
-
-```bash
-  $ docker network rm my-network
-```
-
-To delete multiple networks in a single `docker network rm` command, provide
-multiple network names or ids. The following example deletes a network with id
-`3695c422697f` and a network named `my-network`:
-
-```bash
-  $ docker network rm 3695c422697f my-network
-```
-
-When you specify multiple networks, the command attempts to delete each in turn.
-If the deletion of one network fails, the command continues to the next on the
-list and tries to delete that. The command reports success or failure for each
-deletion.
-
-# OPTIONS
-**NETWORK**
-  Specify network name or id
-
-**--help**
-  Print usage statement
-
-# HISTORY
-OCT 2015, created by Mary Anthony <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-pause.1.md b/installer/vendor/github.com/docker/docker/man/docker-pause.1.md
deleted file mode 100644
index 11eef5321f..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-pause.1.md
+++ /dev/null
@@ -1,32 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-pause - Pause all processes within one or more containers
-
-# SYNOPSIS
-**docker pause**
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-The `docker pause` command suspends all processes in the specified containers.
-On Linux, this uses the cgroups freezer. Traditionally, when suspending a process
-the `SIGSTOP` signal is used, which is observable by the process being suspended.
-With the cgroups freezer the process is unaware, and unable to capture,
-that it is being suspended, and subsequently resumed. On Windows, only Hyper-V
-containers can be paused.
-
-See the [cgroups freezer documentation]
-(https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for
-further details.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# See also
-**docker-unpause(1)** to unpause all processes within one or more containers.
-
-# HISTORY
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-port.1.md b/installer/vendor/github.com/docker/docker/man/docker-port.1.md
deleted file mode 100644
index 83e9cf93b6..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-port.1.md
+++ /dev/null
@@ -1,47 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-port - List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT
-
-# SYNOPSIS
-**docker port**
-[**--help**]
-CONTAINER [PRIVATE_PORT[/PROTO]]
-
-# DESCRIPTION
-List port mappings for the CONTAINER, or lookup the public-facing port that is NAT-ed to the PRIVATE_PORT
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-    # docker ps
-    CONTAINER ID        IMAGE               COMMAND             CREATED             STATUS              PORTS                                            NAMES
-    b650456536c7        busybox:latest      top                 54 minutes ago      Up 54 minutes       0.0.0.0:1234->9876/tcp, 0.0.0.0:4321->7890/tcp   test
-
-## Find out all the ports mapped
-
-    # docker port test
-    7890/tcp -> 0.0.0.0:4321
-    9876/tcp -> 0.0.0.0:1234
-
-## Find out a specific mapping
-
-    # docker port test 7890/tcp
-    0.0.0.0:4321
-
-    # docker port test 7890
-    0.0.0.0:4321
-
-## An example showing error for non-existent mapping
-
-    # docker port test 7890/udp
-    2014/06/24 11:53:36 Error: No public port '7890/udp' published for test
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-November 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-ps.1.md b/installer/vendor/github.com/docker/docker/man/docker-ps.1.md
deleted file mode 100644
index d9aa39f8fd..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-ps.1.md
+++ /dev/null
@@ -1,145 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% FEBRUARY 2015
-# NAME
-docker-ps - List containers
-
-# SYNOPSIS
-**docker ps**
-[**-a**|**--all**]
-[**-f**|**--filter**[=*[]*]]
-[**--format**=*"TEMPLATE"*]
-[**--help**]
-[**-l**|**--latest**]
-[**-n**[=*-1*]]
-[**--no-trunc**]
-[**-q**|**--quiet**]
-[**-s**|**--size**]
-
-# DESCRIPTION
-
-List the containers in the local repository. By default this shows only
-the running containers.
-
-# OPTIONS
-**-a**, **--all**=*true*|*false*
-   Show all containers. Only running containers are shown by default. The default is *false*.
-
-**-f**, **--filter**=[]
-   Filter output based on these conditions:
-   - exited=<int> an exit code of <int>
-   - label=<key> or label=<key>=<value>
-   - status=(created|restarting|running|paused|exited|dead)
-   - name=<string> a container's name
-   - id=<ID> a container's ID
-   - is-task=(true|false) - containers that are a task (part of a service managed by swarm)
-   - before=(<container-name>|<container-id>)
-   - since=(<container-name>|<container-id>)
-   - ancestor=(<image-name>[:tag]|<image-id>|<image@digest>) - containers created from an image or a descendant.
-   - volume=(<volume-name>|<mount-point-destination>)
-   - network=(<network-name>|<network-id>) - containers connected to the provided network
-   - health=(starting|healthy|unhealthy|none) - filters containers based on healthcheck status
-
-**--format**="*TEMPLATE*"
-   Pretty-print containers using a Go template.
-   Valid placeholders:
-      .ID - Container ID
-      .Image - Image ID
-      .Command - Quoted command
-      .CreatedAt - Time when the container was created.
-      .RunningFor - Elapsed time since the container was started.
-      .Ports - Exposed ports.
-      .Status - Container status.
-      .Size - Container disk size.
-      .Names - Container names.
-      .Labels - All labels assigned to the container.
-      .Label - Value of a specific label for this container. For example `{{.Label "com.docker.swarm.cpu"}}`
-      .Mounts - Names of the volumes mounted in this container.
-
-**--help**
-  Print usage statement
-
-**-l**, **--latest**=*true*|*false*
-   Show only the latest created container (includes all states). The default is *false*.
-
-**-n**=*-1*
-   Show n last created containers (includes all states).
-
-**--no-trunc**=*true*|*false*
-   Don't truncate output. The default is *false*.
-
-**-q**, **--quiet**=*true*|*false*
-   Only display numeric IDs. The default is *false*.
-
-**-s**, **--size**=*true*|*false*
-   Display total file sizes. The default is *false*.
-
-# EXAMPLES
-# Display all containers, including non-running
-
-    # docker ps -a
-    CONTAINER ID        IMAGE                 COMMAND                CREATED             STATUS      PORTS    NAMES
-    a87ecb4f327c        fedora:20             /bin/sh -c #(nop) MA   20 minutes ago      Exit 0               desperate_brattain
-    01946d9d34d8        vpavlin/rhel7:latest  /bin/sh -c #(nop) MA   33 minutes ago      Exit 0               thirsty_bell
-    c1d3b0166030        acffc0358b9e          /bin/sh -c yum -y up   2 weeks ago         Exit 1               determined_torvalds
-    41d50ecd2f57        fedora:20             /bin/sh -c #(nop) MA   2 weeks ago         Exit 0               drunk_pike
-
-# Display only IDs of all containers, including non-running
-
-    # docker ps -a -q
-    a87ecb4f327c
-    01946d9d34d8
-    c1d3b0166030
-    41d50ecd2f57
-
-# Display only IDs of all containers that have the name `determined_torvalds`
-
-    # docker ps -a -q --filter=name=determined_torvalds
-    c1d3b0166030
-
-# Display containers with their commands
-
-    # docker ps --format "{{.ID}}: {{.Command}}"
-    a87ecb4f327c: /bin/sh -c #(nop) MA
-    01946d9d34d8: /bin/sh -c #(nop) MA
-    c1d3b0166030: /bin/sh -c yum -y up
-    41d50ecd2f57: /bin/sh -c #(nop) MA
-
-# Display containers with their labels in a table
-
-    # docker ps --format "table {{.ID}}\t{{.Labels}}"
-    CONTAINER ID        LABELS
-    a87ecb4f327c        com.docker.swarm.node=ubuntu,com.docker.swarm.storage=ssd
-    01946d9d34d8
-    c1d3b0166030        com.docker.swarm.node=debian,com.docker.swarm.cpu=6
-    41d50ecd2f57        com.docker.swarm.node=fedora,com.docker.swarm.cpu=3,com.docker.swarm.storage=ssd
-
-# Display containers with their node label in a table
-
-    # docker ps --format 'table {{.ID}}\t{{(.Label "com.docker.swarm.node")}}'
-    CONTAINER ID        NODE
-    a87ecb4f327c        ubuntu
-    01946d9d34d8
-    c1d3b0166030        debian
-    41d50ecd2f57        fedora
-
-# Display containers with `remote-volume` mounted
-
-    $ docker ps --filter volume=remote-volume --format "table {{.ID}}\t{{.Mounts}}"
-    CONTAINER ID        MOUNTS
-    9c3527ed70ce        remote-volume
-
-# Display containers with a volume mounted in `/data`
-
-    $ docker ps --filter volume=/data --format "table {{.ID}}\t{{.Mounts}}"
-    CONTAINER ID        MOUNTS
-    9c3527ed70ce        remote-volume
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-August 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-November 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-February 2015, updated by André Martins <martins@noironetworks.com>
-October 2016, updated by Josh Horwitz <horwitzja@gmail.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-pull.1.md b/installer/vendor/github.com/docker/docker/man/docker-pull.1.md
deleted file mode 100644
index c61d005308..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-pull.1.md
+++ /dev/null
@@ -1,220 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-pull - Pull an image or a repository from a registry
-
-# SYNOPSIS
-**docker pull**
-[**-a**|**--all-tags**]
-[**--help**] 
-NAME[:TAG] | [REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG]
-
-# DESCRIPTION
-
-This command pulls down an image or a repository from a registry. If
-there is more than one image for a repository (e.g., fedora) then all
-images for that repository name can be pulled down including any tags
-(see the option **-a** or **--all-tags**).
-
-If you do not specify a `REGISTRY_HOST`, the command uses Docker's public
-registry located at `registry-1.docker.io` by default. 
-
-# OPTIONS
-**-a**, **--all-tags**=*true*|*false*
-   Download all tagged images in the repository. The default is *false*.
-
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-### Pull an image from Docker Hub
-
-To download a particular image, or set of images (i.e., a repository), use
-`docker pull`. If no tag is provided, Docker Engine uses the `:latest` tag as a
-default. This command pulls the `debian:latest` image:
-
-    $ docker pull debian
-
-    Using default tag: latest
-    latest: Pulling from library/debian
-    fdd5d7827f33: Pull complete
-    a3ed95caeb02: Pull complete
-    Digest: sha256:e7d38b3517548a1c71e41bffe9c8ae6d6d29546ce46bf62159837aad072c90aa
-    Status: Downloaded newer image for debian:latest
-
-Docker images can consist of multiple layers. In the example above, the image
-consists of two layers; `fdd5d7827f33` and `a3ed95caeb02`.
-
-Layers can be reused by images. For example, the `debian:jessie` image shares
-both layers with `debian:latest`. Pulling the `debian:jessie` image therefore
-only pulls its metadata, but not its layers, because all layers are already
-present locally:
-
-    $ docker pull debian:jessie
-
-    jessie: Pulling from library/debian
-    fdd5d7827f33: Already exists
-    a3ed95caeb02: Already exists
-    Digest: sha256:a9c958be96d7d40df920e7041608f2f017af81800ca5ad23e327bc402626b58e
-    Status: Downloaded newer image for debian:jessie
-
-To see which images are present locally, use the **docker-images(1)**
-command:
-
-    $ docker images
-
-    REPOSITORY   TAG      IMAGE ID        CREATED      SIZE
-    debian       jessie   f50f9524513f    5 days ago   125.1 MB
-    debian       latest   f50f9524513f    5 days ago   125.1 MB
-
-Docker uses a content-addressable image store, and the image ID is a SHA256
-digest covering the image's configuration and layers. In the example above,
-`debian:jessie` and `debian:latest` have the same image ID because they are
-actually the *same* image tagged with different names. Because they are the
-same image, their layers are stored only once and do not consume extra disk
-space.
-
-For more information about images, layers, and the content-addressable store,
-refer to [understand images, containers, and storage drivers](https://docs.docker.com/engine/userguide/storagedriver/imagesandcontainers/)
-in the online documentation.
-
-
-## Pull an image by digest (immutable identifier)
-
-So far, you've pulled images by their name (and "tag"). Using names and tags is
-a convenient way to work with images. When using tags, you can `docker pull` an
-image again to make sure you have the most up-to-date version of that image.
-For example, `docker pull ubuntu:14.04` pulls the latest version of the Ubuntu
-14.04 image.
-
-In some cases you don't want images to be updated to newer versions, but prefer
-to use a fixed version of an image. Docker enables you to pull an image by its
-*digest*. When pulling an image by digest, you specify *exactly* which version
-of an image to pull. Doing so, allows you to "pin" an image to that version,
-and guarantee that the image you're using is always the same.
-
-To know the digest of an image, pull the image first. Let's pull the latest
-`ubuntu:14.04` image from Docker Hub:
-
-    $ docker pull ubuntu:14.04
-
-    14.04: Pulling from library/ubuntu
-    5a132a7e7af1: Pull complete
-    fd2731e4c50c: Pull complete
-    28a2f68d1120: Pull complete
-    a3ed95caeb02: Pull complete
-    Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Status: Downloaded newer image for ubuntu:14.04
-
-Docker prints the digest of the image after the pull has finished. In the example
-above, the digest of the image is:
-
-    sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-Docker also prints the digest of an image when *pushing* to a registry. This
-may be useful if you want to pin to a version of the image you just pushed.
-
-A digest takes the place of the tag when pulling an image, for example, to 
-pull the above image by digest, run the following command:
-
-    $ docker pull ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-    sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2: Pulling from library/ubuntu
-    5a132a7e7af1: Already exists
-    fd2731e4c50c: Already exists
-    28a2f68d1120: Already exists
-    a3ed95caeb02: Already exists
-    Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Status: Downloaded newer image for ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-Digest can also be used in the `FROM` of a Dockerfile, for example:
-
-    FROM ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    MAINTAINER some maintainer <maintainer@example.com>
-
-> **Note**: Using this feature "pins" an image to a specific version in time.
-> Docker will therefore not pull updated versions of an image, which may include 
-> security updates. If you want to pull an updated image, you need to change the
-> digest accordingly.
-
-## Pulling from a different registry
-
-By default, `docker pull` pulls images from Docker Hub. It is also possible to
-manually specify the path of a registry to pull from. For example, if you have
-set up a local registry, you can specify its path to pull from it. A registry
-path is similar to a URL, but does not contain a protocol specifier (`https://`).
-
-The following command pulls the `testing/test-image` image from a local registry
-listening on port 5000 (`myregistry.local:5000`):
-
-    $ docker pull myregistry.local:5000/testing/test-image
-
-Registry credentials are managed by **docker-login(1)**.
-
-Docker uses the `https://` protocol to communicate with a registry, unless the
-registry is allowed to be accessed over an insecure connection. Refer to the
-[insecure registries](https://docs.docker.com/engine/reference/commandline/daemon/#insecure-registries)
-section in the online documentation for more information.
-
-
-## Pull a repository with multiple images
-
-By default, `docker pull` pulls a *single* image from the registry. A repository
-can contain multiple images. To pull all images from a repository, provide the
-`-a` (or `--all-tags`) option when using `docker pull`.
-
-This command pulls all images from the `fedora` repository:
-
-    $ docker pull --all-tags fedora
-
-    Pulling repository fedora
-    ad57ef8d78d7: Download complete
-    105182bb5e8b: Download complete
-    511136ea3c5a: Download complete
-    73bd853d2ea5: Download complete
-    ....
-
-    Status: Downloaded newer image for fedora
-
-After the pull has completed use the `docker images` command to see the
-images that were pulled. The example below shows all the `fedora` images
-that are present locally:
-
-    $ docker images fedora
-
-    REPOSITORY   TAG         IMAGE ID        CREATED      SIZE
-    fedora       rawhide     ad57ef8d78d7    5 days ago   359.3 MB
-    fedora       20          105182bb5e8b    5 days ago   372.7 MB
-    fedora       heisenbug   105182bb5e8b    5 days ago   372.7 MB
-    fedora       latest      105182bb5e8b    5 days ago   372.7 MB
-
-
-## Canceling a pull
-
-Killing the `docker pull` process, for example by pressing `CTRL-c` while it is
-running in a terminal, will terminate the pull operation.
-
-    $ docker pull fedora
-
-    Using default tag: latest
-    latest: Pulling from library/fedora
-    a3ed95caeb02: Pulling fs layer
-    236608c7b546: Pulling fs layer
-    ^C
-
-> **Note**: Technically, the Engine terminates a pull operation when the
-> connection between the Docker Engine daemon and the Docker Engine client
-> initiating the pull is lost. If the connection with the Engine daemon is
-> lost for other reasons than a manual interaction, the pull is also aborted.
-
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-August 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by John Willis <john.willis@docker.com>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
-September 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-push.1.md b/installer/vendor/github.com/docker/docker/man/docker-push.1.md
deleted file mode 100644
index 847e66d2e4..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-push.1.md
+++ /dev/null
@@ -1,63 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-push - Push an image or a repository to a registry
-
-# SYNOPSIS
-**docker push**
-[**--help**]
-NAME[:TAG] | [REGISTRY_HOST[:REGISTRY_PORT]/]NAME[:TAG]
-
-# DESCRIPTION
-
-Use `docker push` to share your images to the [Docker Hub](https://hub.docker.com)
-registry or to a self-hosted one.
-
-Refer to **docker-tag(1)** for more information about valid image and tag names.
-
-Killing the **docker push** process, for example by pressing **CTRL-c** while it
-is running in a terminal, terminates the push operation.
-
-Registry credentials are managed by **docker-login(1)**.
-
-
-# OPTIONS
-
-**--disable-content-trust**
-  Skip image verification (default true)
-
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-## Pushing a new image to a registry
-
-First save the new image by finding the container ID (using **docker ps**)
-and then committing it to a new image name.  Note that only a-z0-9-_. are
-allowed when naming images:
-
-    # docker commit c16378f943fe rhel-httpd
-
-Now, push the image to the registry using the image ID. In this example the
-registry is on host named `registry-host` and listening on port `5000`. To do
-this, tag the image with the host name or IP address, and the port of the
-registry:
-
-    # docker tag rhel-httpd registry-host:5000/myadmin/rhel-httpd
-    # docker push registry-host:5000/myadmin/rhel-httpd
-
-Check that this worked by running:
-
-    # docker images
-
-You should see both `rhel-httpd` and `registry-host:5000/myadmin/rhel-httpd`
-listed.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
-June 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-rename.1.md b/installer/vendor/github.com/docker/docker/man/docker-rename.1.md
deleted file mode 100644
index eaeea5c6e0..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-rename.1.md
+++ /dev/null
@@ -1,15 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% OCTOBER 2014
-# NAME
-docker-rename - Rename a container
-
-# SYNOPSIS
-**docker rename**
-CONTAINER NEW_NAME
-
-# OPTIONS
-There are no available options.
-
-# DESCRIPTION
-Rename a container.  Container may be running, paused or stopped.
diff --git a/installer/vendor/github.com/docker/docker/man/docker-restart.1.md b/installer/vendor/github.com/docker/docker/man/docker-restart.1.md
deleted file mode 100644
index 271c4eee1b..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-restart.1.md
+++ /dev/null
@@ -1,26 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-restart - Restart one or more containers
-
-# SYNOPSIS
-**docker restart**
-[**--help**]
-[**-t**|**--time**[=*10*]]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-Restart each container listed.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-t**, **--time**=*10*
-   Number of seconds to try to stop for before killing the container. Once killed it will then be restarted. Default is 10 seconds.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-rm.1.md b/installer/vendor/github.com/docker/docker/man/docker-rm.1.md
deleted file mode 100644
index 2105288d0d..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-rm.1.md
+++ /dev/null
@@ -1,72 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-rm - Remove one or more containers
-
-# SYNOPSIS
-**docker rm**
-[**-f**|**--force**]
-[**-l**|**--link**]
-[**-v**|**--volumes**]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-**docker rm** will remove one or more containers from the host node. The
-container name or ID can be used. This does not remove images. You cannot
-remove a running container unless you use the **-f** option. To see all
-containers on a host use the **docker ps -a** command.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-f**, **--force**=*true*|*false*
-   Force the removal of a running container (uses SIGKILL). The default is *false*.
-
-**-l**, **--link**=*true*|*false*
-   Remove the specified link and not the underlying container. The default is *false*.
-
-**-v**, **--volumes**=*true*|*false*
-   Remove the volumes associated with the container. The default is *false*.
-
-# EXAMPLES
-
-## Removing a container using its ID
-
-To remove a container using its ID, find either from a **docker ps -a**
-command, or use the ID returned from the **docker run** command, or retrieve
-it from a file used to store it using the **docker run --cidfile**:
-
-    docker rm abebf7571666
-
-## Removing a container using the container name
-
-The name of the container can be found using the **docker ps -a**
-command. The use that name as follows:
-
-    docker rm hopeful_morse
-
-## Removing a container and all associated volumes
-
-    $ docker rm -v redis
-    redis
-
-This command will remove the container and any volumes associated with it.
-Note that if a volume was specified with a name, it will not be removed.
-
-    $ docker create -v awesome:/foo -v /bar --name hello redis
-    hello
-    $ docker rm -v hello
-
-In this example, the volume for `/foo` will remain in tact, but the volume for
-`/bar` will be removed. The same behavior holds for volumes inherited with
-`--volumes-from`.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-August 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-rmi.1.md b/installer/vendor/github.com/docker/docker/man/docker-rmi.1.md
deleted file mode 100644
index 35bf8aac6a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-rmi.1.md
+++ /dev/null
@@ -1,42 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-rmi - Remove one or more images
-
-# SYNOPSIS
-**docker rmi**
-[**-f**|**--force**]
-[**--help**]
-[**--no-prune**]
-IMAGE [IMAGE...]
-
-# DESCRIPTION
-
-Removes one or more images from the host node. This does not remove images from
-a registry. You cannot remove an image of a running container unless you use the
-**-f** option. To see all images on a host use the **docker images** command.
-
-# OPTIONS
-**-f**, **--force**=*true*|*false*
-   Force removal of the image. The default is *false*.
-
-**--help**
-  Print usage statement
-
-**--no-prune**=*true*|*false*
-   Do not delete untagged parents. The default is *false*.
-
-# EXAMPLES
-
-## Removing an image
-
-Here is an example of removing an image:
-
-    docker rmi fedora/httpd
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-run.1.md b/installer/vendor/github.com/docker/docker/man/docker-run.1.md
deleted file mode 100644
index 8c1018a1e2..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-run.1.md
+++ /dev/null
@@ -1,1055 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-run - Run a command in a new container
-
-# SYNOPSIS
-**docker run**
-[**-a**|**--attach**[=*[]*]]
-[**--add-host**[=*[]*]]
-[**--blkio-weight**[=*[BLKIO-WEIGHT]*]]
-[**--blkio-weight-device**[=*[]*]]
-[**--cpu-shares**[=*0*]]
-[**--cap-add**[=*[]*]]
-[**--cap-drop**[=*[]*]]
-[**--cgroup-parent**[=*CGROUP-PATH*]]
-[**--cidfile**[=*CIDFILE*]]
-[**--cpu-count**[=*0*]]
-[**--cpu-percent**[=*0*]]
-[**--cpu-period**[=*0*]]
-[**--cpu-quota**[=*0*]]
-[**--cpu-rt-period**[=*0*]]
-[**--cpu-rt-runtime**[=*0*]]
-[**--cpus**[=*0.0*]]
-[**--cpuset-cpus**[=*CPUSET-CPUS*]]
-[**--cpuset-mems**[=*CPUSET-MEMS*]]
-[**-d**|**--detach**]
-[**--detach-keys**[=*[]*]]
-[**--device**[=*[]*]]
-[**--device-read-bps**[=*[]*]]
-[**--device-read-iops**[=*[]*]]
-[**--device-write-bps**[=*[]*]]
-[**--device-write-iops**[=*[]*]]
-[**--dns**[=*[]*]]
-[**--dns-option**[=*[]*]]
-[**--dns-search**[=*[]*]]
-[**-e**|**--env**[=*[]*]]
-[**--entrypoint**[=*ENTRYPOINT*]]
-[**--env-file**[=*[]*]]
-[**--expose**[=*[]*]]
-[**--group-add**[=*[]*]]
-[**-h**|**--hostname**[=*HOSTNAME*]]
-[**--help**]
-[**--init**]
-[**--init-path**[=*[]*]]
-[**-i**|**--interactive**]
-[**--ip**[=*IPv4-ADDRESS*]]
-[**--ip6**[=*IPv6-ADDRESS*]]
-[**--ipc**[=*IPC*]]
-[**--isolation**[=*default*]]
-[**--kernel-memory**[=*KERNEL-MEMORY*]]
-[**-l**|**--label**[=*[]*]]
-[**--label-file**[=*[]*]]
-[**--link**[=*[]*]]
-[**--link-local-ip**[=*[]*]]
-[**--log-driver**[=*[]*]]
-[**--log-opt**[=*[]*]]
-[**-m**|**--memory**[=*MEMORY*]]
-[**--mac-address**[=*MAC-ADDRESS*]]
-[**--memory-reservation**[=*MEMORY-RESERVATION*]]
-[**--memory-swap**[=*LIMIT*]]
-[**--memory-swappiness**[=*MEMORY-SWAPPINESS*]]
-[**--name**[=*NAME*]]
-[**--network-alias**[=*[]*]]
-[**--network**[=*"bridge"*]]
-[**--oom-kill-disable**]
-[**--oom-score-adj**[=*0*]]
-[**-P**|**--publish-all**]
-[**-p**|**--publish**[=*[]*]]
-[**--pid**[=*[PID]*]]
-[**--userns**[=*[]*]]
-[**--pids-limit**[=*PIDS_LIMIT*]]
-[**--privileged**]
-[**--read-only**]
-[**--restart**[=*RESTART*]]
-[**--rm**]
-[**--security-opt**[=*[]*]]
-[**--storage-opt**[=*[]*]]
-[**--stop-signal**[=*SIGNAL*]]
-[**--stop-timeout**[=*TIMEOUT*]]
-[**--shm-size**[=*[]*]]
-[**--sig-proxy**[=*true*]]
-[**--sysctl**[=*[]*]]
-[**-t**|**--tty**]
-[**--tmpfs**[=*[CONTAINER-DIR[:<OPTIONS>]*]]
-[**-u**|**--user**[=*USER*]]
-[**--ulimit**[=*[]*]]
-[**--uts**[=*[]*]]
-[**-v**|**--volume**[=*[[HOST-DIR:]CONTAINER-DIR[:OPTIONS]]*]]
-[**--volume-driver**[=*DRIVER*]]
-[**--volumes-from**[=*[]*]]
-[**-w**|**--workdir**[=*WORKDIR*]]
-IMAGE [COMMAND] [ARG...]
-
-# DESCRIPTION
-
-Run a process in a new container. **docker run** starts a process with its own
-file system, its own networking, and its own isolated process tree. The IMAGE
-which starts the process may define defaults related to the process that will be
-run in the container, the networking to expose, and more, but **docker run**
-gives final control to the operator or administrator who starts the container
-from the image. For that reason **docker run** has more options than any other
-Docker command.
-
-If the IMAGE is not already loaded then **docker run** will pull the IMAGE, and
-all image dependencies, from the repository in the same way running **docker
-pull** IMAGE, before it starts the container from that image.
-
-# OPTIONS
-**-a**, **--attach**=[]
-   Attach to STDIN, STDOUT or STDERR.
-
-   In foreground mode (the default when **-d**
-is not specified), **docker run** can start the process in the container
-and attach the console to the process's standard input, output, and standard
-error. It can even pretend to be a TTY (this is what most commandline
-executables expect) and pass along signals. The **-a** option can be set for
-each of stdin, stdout, and stderr.
-
-**--add-host**=[]
-   Add a custom host-to-IP mapping (host:ip)
-
-   Add a line to /etc/hosts. The format is hostname:ip.  The **--add-host**
-option can be set multiple times.
-
-**--blkio-weight**=*0*
-   Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-
-**--blkio-weight-device**=[]
-   Block IO weight (relative device weight, format: `DEVICE_NAME:WEIGHT`).
-
-**--cpu-shares**=*0*
-   CPU shares (relative weight)
-
-   By default, all containers get the same proportion of CPU cycles. This proportion
-can be modified by changing the container's CPU share weighting relative
-to the weighting of all other running containers.
-
-To modify the proportion from the default of 1024, use the **--cpu-shares**
-flag to set the weighting to 2 or higher.
-
-The proportion will only apply when CPU-intensive processes are running.
-When tasks in one container are idle, other containers can use the
-left-over CPU time. The actual amount of CPU time will vary depending on
-the number of containers running on the system.
-
-For example, consider three containers, one has a cpu-share of 1024 and
-two others have a cpu-share setting of 512. When processes in all three
-containers attempt to use 100% of CPU, the first container would receive
-50% of the total CPU time. If you add a fourth container with a cpu-share
-of 1024, the first container only gets 33% of the CPU. The remaining containers
-receive 16.5%, 16.5% and 33% of the CPU.
-
-On a multi-core system, the shares of CPU time are distributed over all CPU
-cores. Even if a container is limited to less than 100% of CPU time, it can
-use 100% of each individual CPU core.
-
-For example, consider a system with more than three cores. If you start one
-container **{C0}** with **-c=512** running one process, and another container
-**{C1}** with **-c=1024** running two processes, this can result in the following
-division of CPU shares:
-
-    PID    container	CPU	CPU share
-    100    {C0}		0	100% of CPU0
-    101    {C1}		1	100% of CPU1
-    102    {C1}		2	100% of CPU2
-
-**--cap-add**=[]
-   Add Linux capabilities
-
-**--cap-drop**=[]
-   Drop Linux capabilities
-
-**--cgroup-parent**=""
-   Path to cgroups under which the cgroup for the container will be created. If the path is not absolute, the path is considered to be relative to the cgroups path of the init process. Cgroups will be created if they do not already exist.
-
-**--cidfile**=""
-   Write the container ID to the file
-
-**--cpu-count**=*0*
-    Limit the number of CPUs available for execution by the container.
-    
-    On Windows Server containers, this is approximated as a percentage of total CPU usage.
-
-    On Windows Server containers, the processor resource controls are mutually exclusive, the order of precedence is CPUCount first, then CPUShares, and CPUPercent last.
-
-**--cpu-percent**=*0*
-    Limit the percentage of CPU available for execution by a container running on a Windows daemon.
-
-    On Windows Server containers, the processor resource controls are mutually exclusive, the order of precedence is CPUCount first, then CPUShares, and CPUPercent last.
-
-**--cpu-period**=*0*
-   Limit the CPU CFS (Completely Fair Scheduler) period
-
-   Limit the container's CPU usage. This flag tell the kernel to restrict the container's CPU usage to the period you specify.
-
-**--cpuset-cpus**=""
-   CPUs in which to allow execution (0-3, 0,1)
-
-**--cpuset-mems**=""
-   Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-
-   If you have four memory nodes on your system (0-3), use `--cpuset-mems=0,1`
-then processes in your Docker container will only use memory from the first
-two memory nodes.
-
-**--cpu-quota**=*0*
-   Limit the CPU CFS (Completely Fair Scheduler) quota
-
-   Limit the container's CPU usage. By default, containers run with the full
-CPU resource. This flag tell the kernel to restrict the container's CPU usage
-to the quota you specify.
-
-**--cpu-rt-period**=0
-   Limit the CPU real-time period in microseconds
-
-   Limit the container's Real Time CPU usage. This flag tell the kernel to restrict the container's Real Time CPU usage to the period you specify.
-
-**--cpu-rt-runtime**=0
-   Limit the CPU real-time runtime in microseconds
-
-   Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex:
-   Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks.
-
-   The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup.
-
-**--cpus**=0.0
-   Number of CPUs. The default is *0.0* which means no limit.
-
-**-d**, **--detach**=*true*|*false*
-   Detached mode: run the container in the background and print the new container ID. The default is *false*.
-
-   At any time you can run **docker ps** in
-the other shell to view a list of the running containers. You can reattach to a
-detached container with **docker attach**. If you choose to run a container in
-the detached mode, then you cannot use the **-rm** option.
-
-   When attached in the tty mode, you can detach from the container (and leave it
-running) using a configurable key sequence. The default sequence is `CTRL-p CTRL-q`.
-You configure the key sequence using the **--detach-keys** option or a configuration file.
-See **config-json(5)** for documentation on using a configuration file.
-
-**--detach-keys**=""
-   Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**--device**=[]
-   Add a host device to the container (e.g. --device=/dev/sdc:/dev/xvdc:rwm)
-
-**--device-read-bps**=[]
-   Limit read rate from a device (e.g. --device-read-bps=/dev/sda:1mb)
-
-**--device-read-iops**=[]
-   Limit read rate from a device (e.g. --device-read-iops=/dev/sda:1000)
-
-**--device-write-bps**=[]
-   Limit write rate to a device (e.g. --device-write-bps=/dev/sda:1mb)
-
-**--device-write-iops**=[]
-   Limit write rate to a device (e.g. --device-write-iops=/dev/sda:1000)
-
-**--dns-search**=[]
-   Set custom DNS search domains (Use --dns-search=. if you don't wish to set the search domain)
-
-**--dns-option**=[]
-   Set custom DNS options
-
-**--dns**=[]
-   Set custom DNS servers
-
-   This option can be used to override the DNS
-configuration passed to the container. Typically this is necessary when the
-host DNS configuration is invalid for the container (e.g., 127.0.0.1). When this
-is the case the **--dns** flags is necessary for every run.
-
-**-e**, **--env**=[]
-   Set environment variables
-
-   This option allows you to specify arbitrary
-environment variables that are available for the process that will be launched
-inside of the container.
-
-**--entrypoint**=""
-   Overwrite the default ENTRYPOINT of the image
-
-   This option allows you to overwrite the default entrypoint of the image that
-is set in the Dockerfile. The ENTRYPOINT of an image is similar to a COMMAND
-because it specifies what executable to run when the container starts, but it is
-(purposely) more difficult to override. The ENTRYPOINT gives a container its
-default nature or behavior, so that when you set an ENTRYPOINT you can run the
-container as if it were that binary, complete with default options, and you can
-pass in more options via the COMMAND. But, sometimes an operator may want to run
-something else inside the container, so you can override the default ENTRYPOINT
-at runtime by using a **--entrypoint** and a string to specify the new
-ENTRYPOINT.
-
-**--env-file**=[]
-   Read in a line delimited file of environment variables
-
-**--expose**=[]
-   Expose a port, or a range of ports (e.g. --expose=3300-3310) informs Docker
-that the container listens on the specified network ports at runtime. Docker
-uses this information to interconnect containers using links and to set up port
-redirection on the host system.
-
-**--group-add**=[]
-   Add additional groups to run as
-
-**-h**, **--hostname**=""
-   Container host name
-
-   Sets the container host name that is available inside the container.
-
-**--help**
-   Print usage statement
-
-**--init**
-   Run an init inside the container that forwards signals and reaps processes
-
-**--init-path**=""
-   Path to the docker-init binary
-
-**-i**, **--interactive**=*true*|*false*
-   Keep STDIN open even if not attached. The default is *false*.
-
-   When set to true, keep stdin open even if not attached. The default is false.
-
-**--ip**=""
-   Sets the container's interface IPv4 address (e.g. 172.23.0.9)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
-**--ip6**=""
-   Sets the container's interface IPv6 address (e.g. 2001:db8::1b99)
-
-   It can only be used in conjunction with **--network** for user-defined networks
-
-**--ipc**=""
-   Default is to create a private IPC namespace (POSIX SysV IPC) for the container
-                               'container:<name|id>': reuses another container shared memory, semaphores and message queues
-                               'host': use the host shared memory,semaphores and message queues inside the container.  Note: the host mode gives the container full access to local shared memory and is therefore considered insecure.
-
-**--isolation**="*default*"
-   Isolation specifies the type of isolation technology used by containers. Note
-that the default on Windows server is `process`, and the default on Windows client
-is `hyperv`. Linux only supports `default`.
-
-**-l**, **--label**=[]
-   Set metadata on the container (e.g., --label com.example.key=value)
-
-**--kernel-memory**=""
-   Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)
-
-   Constrains the kernel memory available to a container. If a limit of 0
-is specified (not using `--kernel-memory`), the container's kernel memory
-is not limited. If you specify a limit, it may be rounded up to a multiple
-of the operating system's page size and the value can be very large,
-millions of trillions.
-
-**--label-file**=[]
-   Read in a line delimited file of labels
-
-**--link**=[]
-   Add link to another container in the form of <name or id>:alias or just <name or id>
-in which case the alias will match the name
-
-   If the operator
-uses **--link** when starting the new client container, then the client
-container can access the exposed port via a private networking interface. Docker
-will set some environment variables in the client container to help indicate
-which interface and port to use.
-
-**--link-local-ip**=[]
-   Add one or more link-local IPv4/IPv6 addresses to the container's interface
-
-**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*"
-  Logging driver for the container. Default is defined by daemon `--log-driver` flag.
-  **Warning**: the `docker logs` command works only for the `json-file` and
-  `journald` logging drivers.
-
-**--log-opt**=[]
-  Logging driver specific options.
-
-**-m**, **--memory**=""
-   Memory limit (format: <number>[<unit>], where unit = b, k, m or g)
-
-   Allows you to constrain the memory available to a container. If the host
-supports swap memory, then the **-m** memory setting can be larger than physical
-RAM. If a limit of 0 is specified (not using **-m**), the container's memory is
-not limited. The actual limit may be rounded up to a multiple of the operating
-system's page size (the value would be very large, that's millions of trillions).
-
-**--memory-reservation**=""
-   Memory soft limit (format: <number>[<unit>], where unit = b, k, m or g)
-
-   After setting memory reservation, when the system detects memory contention
-or low memory, containers are forced to restrict their consumption to their
-reservation. So you should always set the value below **--memory**, otherwise the
-hard limit will take precedence. By default, memory reservation will be the same
-as memory limit.
-
-**--memory-swap**="LIMIT"
-   A limit value equal to memory plus swap. Must be used with the  **-m**
-(**--memory**) flag. The swap `LIMIT` should always be larger than **-m**
-(**--memory**) value.  By default, the swap `LIMIT` will be set to double
-the value of --memory.
-
-   The format of `LIMIT` is `<number>[<unit>]`. Unit can be `b` (bytes),
-`k` (kilobytes), `m` (megabytes), or `g` (gigabytes). If you don't specify a
-unit, `b` is used. Set LIMIT to `-1` to enable unlimited swap.
-
-**--mac-address**=""
-   Container MAC address (e.g. 92:d0:c6:0a:29:33)
-
-   Remember that the MAC address in an Ethernet network must be unique.
-The IPv6 link-local address will be based on the device's MAC address
-according to RFC4862.
-
-**--name**=""
-   Assign a name to the container
-
-   The operator can identify a container in three ways:
-    UUID long identifier (“f78375b1c487e03c9438c729345e54db9d20cfa2ac1fc3494b6eb60872e74778”)
-    UUID short identifier (“f78375b1c487”)
-    Name (“jonah”)
-
-   The UUID identifiers come from the Docker daemon, and if a name is not assigned
-to the container with **--name** then the daemon will also generate a random
-string name. The name is useful when defining links (see **--link**) (or any
-other place you need to identify a container). This works for both background
-and foreground Docker containers.
-
-**--network**="*bridge*"
-   Set the Network mode for the container
-                               'bridge': create a network stack on the default Docker bridge
-                               'none': no networking
-                               'container:<name|id>': reuse another container's network stack
-                               'host': use the Docker host network stack. Note: the host mode gives the container full access to local system services such as D-bus and is therefore considered insecure.
-                               '<network-name>|<network-id>': connect to a user-defined network
-
-**--network-alias**=[]
-   Add network-scoped alias for the container
-
-**--oom-kill-disable**=*true*|*false*
-   Whether to disable OOM Killer for the container or not.
-
-**--oom-score-adj**=""
-   Tune the host's OOM preferences for containers (accepts -1000 to 1000)
-
-**-P**, **--publish-all**=*true*|*false*
-   Publish all exposed ports to random ports on the host interfaces. The default is *false*.
-
-   When set to true publish all exposed ports to the host interfaces. The
-default is false. If the operator uses -P (or -p) then Docker will make the
-exposed port accessible on the host and the ports will be available to any
-client that can reach the host. When using -P, Docker will bind any exposed
-port to a random port on the host within an *ephemeral port range* defined by
-`/proc/sys/net/ipv4/ip_local_port_range`. To find the mapping between the host
-ports and the exposed ports, use `docker port`.
-
-**-p**, **--publish**=[]
-   Publish a container's port, or range of ports, to the host.
-
-   Format: `ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort`
-Both hostPort and containerPort can be specified as a range of ports.
-When specifying ranges for both, the number of container ports in the range must match the number of host ports in the range.
-(e.g., `docker run -p 1234-1236:1222-1224 --name thisWorks -t busybox`
-but not `docker run -p 1230-1236:1230-1240 --name RangeContainerPortsBiggerThanRangeHostPorts -t busybox`)
-With ip: `docker run -p 127.0.0.1:$HOSTPORT:$CONTAINERPORT --name CONTAINER -t someimage`
-Use `docker port` to see the actual mapping: `docker port CONTAINER $CONTAINERPORT`
-
-**--pid**=""
-   Set the PID mode for the container
-   Default is to create a private PID namespace for the container
-                               'container:<name|id>': join another container's PID namespace
-                               'host': use the host's PID namespace for the container. Note: the host mode gives the container full access to local PID and is therefore considered insecure.
-
-**--userns**=""
-   Set the usernamespace mode for the container when `userns-remap` option is enabled.
-     **host**: use the host usernamespace and enable all privileged options (e.g., `pid=host` or `--privileged`).
-
-**--pids-limit**=""
-   Tune the container's pids limit. Set `-1` to have unlimited pids for the container.
-
-**--uts**=*host*
-   Set the UTS mode for the container
-     **host**: use the host's UTS namespace inside the container.
-     Note: the host mode gives the container access to changing the host's hostname and is therefore considered insecure.
-
-**--privileged**=*true*|*false*
-   Give extended privileges to this container. The default is *false*.
-
-   By default, Docker containers are
-“unprivileged” (=false) and cannot, for example, run a Docker daemon inside the
-Docker container. This is because by default a container is not allowed to
-access any devices. A “privileged” container is given access to all devices.
-
-   When the operator executes **docker run --privileged**, Docker will enable access
-to all devices on the host as well as set some configuration in AppArmor to
-allow the container nearly all the same access to the host as processes running
-outside of a container on the host.
-
-**--read-only**=*true*|*false*
-   Mount the container's root filesystem as read only.
-
-   By default a container will have its root filesystem writable allowing processes
-to write files anywhere.  By specifying the `--read-only` flag the container will have
-its root filesystem mounted as read only prohibiting any writes.
-
-**--restart**="*no*"
-   Restart policy to apply when a container exits (no, on-failure[:max-retry], always, unless-stopped).
-
-**--rm**=*true*|*false*
-   Automatically remove the container when it exits. The default is *false*.
-   `--rm` flag can work together with `-d`, and auto-removal will be done on daemon side. Note that it's
-incompatible with any restart policy other than `none`.
-
-**--security-opt**=[]
-   Security Options
-
-    "label=user:USER"   : Set the label user for the container
-    "label=role:ROLE"   : Set the label role for the container
-    "label=type:TYPE"   : Set the label type for the container
-    "label=level:LEVEL" : Set the label level for the container
-    "label=disable"     : Turn off label confinement for the container
-    "no-new-privileges" : Disable container processes from gaining additional privileges
-
-    "seccomp=unconfined" : Turn off seccomp confinement for the container
-    "seccomp=profile.json :  White listed syscalls seccomp Json file to be used as a seccomp filter
-
-    "apparmor=unconfined" : Turn off apparmor confinement for the container
-    "apparmor=your-profile" : Set the apparmor confinement profile for the container
-
-**--storage-opt**=[]
-   Storage driver options per container
-
-   $ docker run -it --storage-opt size=120G fedora /bin/bash
-
-   This (size) will allow to set the container rootfs size to 120G at creation time.
-   This option is only available for the `devicemapper`, `btrfs`, `overlay2`  and `zfs` graph drivers.
-   For the `devicemapper`, `btrfs` and `zfs` storage drivers, user cannot pass a size less than the Default BaseFS Size.
-   For the `overlay2` storage driver, the size option is only available if the backing fs is `xfs` and mounted with the `pquota` mount option.
-   Under these conditions, user can pass any size less then the backing fs size.
-
-**--stop-signal**=*SIGTERM*
-  Signal to stop a container. Default is SIGTERM.
-
-**--stop-timeout**=*10*
-  Timeout (in seconds) to stop a container. Default is 10.
-
-**--shm-size**=""
-   Size of `/dev/shm`. The format is `<number><unit>`.
-   `number` must be greater than `0`.  Unit is optional and can be `b` (bytes), `k` (kilobytes), `m`(megabytes), or `g` (gigabytes).
-   If you omit the unit, the system uses bytes. If you omit the size entirely, the system uses `64m`.
-
-**--sysctl**=SYSCTL
-  Configure namespaced kernel parameters at runtime
-
-  IPC Namespace - current sysctls allowed:
-
-  kernel.msgmax, kernel.msgmnb, kernel.msgmni, kernel.sem, kernel.shmall, kernel.shmmax, kernel.shmmni, kernel.shm_rmid_forced
-  Sysctls beginning with fs.mqueue.*
-
-  If you use the `--ipc=host` option these sysctls will not be allowed.
-
-  Network Namespace - current sysctls allowed:
-      Sysctls beginning with net.*
-
-  If you use the `--network=host` option these sysctls will not be allowed.
-
-**--sig-proxy**=*true*|*false*
-   Proxy received signals to the process (non-TTY mode only). SIGCHLD, SIGSTOP, and SIGKILL are not proxied. The default is *true*.
-
-**--memory-swappiness**=""
-   Tune a container's memory swappiness behavior. Accepts an integer between 0 and 100.
-
-**-t**, **--tty**=*true*|*false*
-   Allocate a pseudo-TTY. The default is *false*.
-
-   When set to true Docker can allocate a pseudo-tty and attach to the standard
-input of any container. This can be used, for example, to run a throwaway
-interactive shell. The default is false.
-
-The **-t** option is incompatible with a redirection of the docker client
-standard input.
-
-**--tmpfs**=[] Create a tmpfs mount
-
-   Mount a temporary filesystem (`tmpfs`) mount into a container, for example:
-
-   $ docker run -d --tmpfs /tmp:rw,size=787448k,mode=1777 my_image
-
-   This command mounts a `tmpfs` at `/tmp` within the container.  The supported mount
-options are the same as the Linux default `mount` flags. If you do not specify
-any options, the systems uses the following options:
-`rw,noexec,nosuid,nodev,size=65536k`.
-
-**-u**, **--user**=""
-   Sets the username or UID used and optionally the groupname or GID for the specified command.
-
-   The followings examples are all valid:
-   --user [user | user:group | uid | uid:gid | user:gid | uid:group ]
-
-   Without this argument the command will be run as root in the container.
-
-**--ulimit**=[]
-    Ulimit options
-
-**-v**|**--volume**[=*[[HOST-DIR:]CONTAINER-DIR[:OPTIONS]]*]
-   Create a bind mount. If you specify, ` -v /HOST-DIR:/CONTAINER-DIR`, Docker
-   bind mounts `/HOST-DIR` in the host to `/CONTAINER-DIR` in the Docker
-   container. If 'HOST-DIR' is omitted,  Docker automatically creates the new
-   volume on the host.  The `OPTIONS` are a comma delimited list and can be:
-
-   * [rw|ro]
-   * [z|Z]
-   * [`[r]shared`|`[r]slave`|`[r]private`]
-   * [nocopy]
-
-The `CONTAINER-DIR` must be an absolute path such as `/src/docs`. The `HOST-DIR`
-can be an absolute path or a `name` value. A `name` value must start with an
-alphanumeric character, followed by `a-z0-9`, `_` (underscore), `.` (period) or
-`-` (hyphen). An absolute path starts with a `/` (forward slash).
-
-If you supply a `HOST-DIR` that is an absolute path,  Docker bind-mounts to the
-path you specify. If you supply a `name`, Docker creates a named volume by that
-`name`. For example, you can specify either `/foo` or `foo` for a `HOST-DIR`
-value. If you supply the `/foo` value, Docker creates a bind-mount. If you
-supply the `foo` specification, Docker creates a named volume.
-
-You can specify multiple  **-v** options to mount one or more mounts to a
-container. To use these same mounts in other containers, specify the
-**--volumes-from** option also.
-
-You can add `:ro` or `:rw` suffix to a volume to mount it  read-only or
-read-write mode, respectively. By default, the volumes are mounted read-write.
-See examples.
-
-Labeling systems like SELinux require that proper labels are placed on volume
-content mounted into a container. Without a label, the security system might
-prevent the processes running inside the container from using the content. By
-default, Docker does not change the labels set by the OS.
-
-To change a label in the container context, you can add either of two suffixes
-`:z` or `:Z` to the volume mount. These suffixes tell Docker to relabel file
-objects on the shared volumes. The `z` option tells Docker that two containers
-share the volume content. As a result, Docker labels the content with a shared
-content label. Shared volume labels allow all containers to read/write content.
-The `Z` option tells Docker to label the content with a private unshared label.
-Only the current container can use a private volume.
-
-By default bind mounted volumes are `private`. That means any mounts done
-inside container will not be visible on host and vice-a-versa. One can change
-this behavior by specifying a volume mount propagation property. Making a
-volume `shared` mounts done under that volume inside container will be
-visible on host and vice-a-versa. Making a volume `slave` enables only one
-way mount propagation and that is mounts done on host under that volume
-will be visible inside container but not the other way around.
-
-To control mount propagation property of volume one can use `:[r]shared`,
-`:[r]slave` or `:[r]private` propagation flag. Propagation property can
-be specified only for bind mounted volumes and not for internal volumes or
-named volumes. For mount propagation to work source mount point (mount point
-where source dir is mounted on) has to have right propagation properties. For
-shared volumes, source mount point has to be shared. And for slave volumes,
-source mount has to be either shared or slave.
-
-Use `df <source-dir>` to figure out the source mount and then use
-`findmnt -o TARGET,PROPAGATION <source-mount-dir>` to figure out propagation
-properties of source mount. If `findmnt` utility is not available, then one
-can look at mount entry for source mount point in `/proc/self/mountinfo`. Look
-at `optional fields` and see if any propagaion properties are specified.
-`shared:X` means mount is `shared`, `master:X` means mount is `slave` and if
-nothing is there that means mount is `private`.
-
-To change propagation properties of a mount point use `mount` command. For
-example, if one wants to bind mount source directory `/foo` one can do
-`mount --bind /foo /foo` and `mount --make-private --make-shared /foo`. This
-will convert /foo into a `shared` mount point. Alternatively one can directly
-change propagation properties of source mount. Say `/` is source mount for
-`/foo`, then use `mount --make-shared /` to convert `/` into a `shared` mount.
-
-> **Note**:
-> When using systemd to manage the Docker daemon's start and stop, in the systemd
-> unit file there is an option to control mount propagation for the Docker daemon
-> itself, called `MountFlags`. The value of this setting may cause Docker to not
-> see mount propagation changes made on the mount point. For example, if this value
-> is `slave`, you may not be able to use the `shared` or `rshared` propagation on
-> a volume.
-
-To disable automatic copying of data from the container path to the volume, use
-the `nocopy` flag. The `nocopy` flag can be set on bind mounts and named volumes.
-
-**--volume-driver**=""
-   Container's volume driver. This driver creates volumes specified either from
-   a Dockerfile's `VOLUME` instruction or from the `docker run -v` flag.
-   See **docker-volume-create(1)** for full details.
-
-**--volumes-from**=[]
-   Mount volumes from the specified container(s)
-
-   Mounts already mounted volumes from a source container onto another
-   container. You must supply the source's container-id. To share
-   a volume, use the **--volumes-from** option when running
-   the target container. You can share volumes even if the source container
-   is not running.
-
-   By default, Docker mounts the volumes in the same mode (read-write or
-   read-only) as it is mounted in the source container. Optionally, you
-   can change this by suffixing the container-id with either the `:ro` or
-   `:rw ` keyword.
-
-   If the location of the volume from the source container overlaps with
-   data residing on a target container, then the volume hides
-   that data on the target.
-
-**-w**, **--workdir**=""
-   Working directory inside the container
-
-   The default working directory for
-running binaries within a container is the root directory (/). The developer can
-set a different default with the Dockerfile WORKDIR instruction. The operator
-can override the working directory by using the **-w** option.
-
-# Exit Status
-
-The exit code from `docker run` gives information about why the container
-failed to run or why it exited.  When `docker run` exits with a non-zero code,
-the exit codes follow the `chroot` standard, see below:
-
-**_125_** if the error is with Docker daemon **_itself_** 
-
-    $ docker run --foo busybox; echo $?
-    # flag provided but not defined: --foo
-      See 'docker run --help'.
-      125
-
-**_126_** if the **_contained command_** cannot be invoked
-
-    $ docker run busybox /etc; echo $?
-    # exec: "/etc": permission denied
-      docker: Error response from daemon: Contained command could not be invoked
-      126
-
-**_127_** if the **_contained command_** cannot be found
-
-    $ docker run busybox foo; echo $?
-    # exec: "foo": executable file not found in $PATH
-      docker: Error response from daemon: Contained command not found or does not exist
-      127
-
-**_Exit code_** of **_contained command_** otherwise 
-    
-    $ docker run busybox /bin/sh -c 'exit 3' 
-    # 3
-
-# EXAMPLES
-
-## Running container in read-only mode
-
-During container image development, containers often need to write to the image
-content.  Installing packages into /usr, for example.  In production,
-applications seldom need to write to the image.  Container applications write
-to volumes if they need to write to file systems at all.  Applications can be
-made more secure by running them in read-only mode using the --read-only switch.
-This protects the containers image from modification. Read only containers may
-still need to write temporary data.  The best way to handle this is to mount
-tmpfs directories on /run and /tmp.
-
-    # docker run --read-only --tmpfs /run --tmpfs /tmp -i -t fedora /bin/bash
-
-## Exposing log messages from the container to the host's log
-
-If you want messages that are logged in your container to show up in the host's
-syslog/journal then you should bind mount the /dev/log directory as follows.
-
-    # docker run -v /dev/log:/dev/log -i -t fedora /bin/bash
-
-From inside the container you can test this by sending a message to the log.
-
-    (bash)# logger "Hello from my container"
-
-Then exit and check the journal.
-
-    # exit
-
-    # journalctl -b | grep Hello
-
-This should list the message sent to logger.
-
-## Attaching to one or more from STDIN, STDOUT, STDERR
-
-If you do not specify -a then Docker will attach everything (stdin,stdout,stderr)
-. You can specify to which of the three standard streams (stdin, stdout, stderr)
-you'd like to connect instead, as in:
-
-    # docker run -a stdin -a stdout -i -t fedora /bin/bash
-
-## Sharing IPC between containers
-
-Using shm_server.c available here: https://www.cs.cf.ac.uk/Dave/C/node27.html
-
-Testing `--ipc=host` mode:
-
-Host shows a shared memory segment with 7 pids attached, happens to be from httpd:
-
-```
- $ sudo ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
- 0x01128e25 0          root       600        1000       7                       
-```
-
-Now run a regular container, and it correctly does NOT see the shared memory segment from the host:
-
-```
- $ docker run -it shm ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
-```
-
-Run a container with the new `--ipc=host` option, and it now sees the shared memory segment from the host httpd:
-
- ```
- $ docker run -it --ipc=host shm ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
- 0x01128e25 0          root       600        1000       7                   
-```
-Testing `--ipc=container:CONTAINERID` mode:
-
-Start a container with a program to create a shared memory segment:
-```
- $ docker run -it shm bash
- $ sudo shm/shm_server &
- $ sudo ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
- 0x0000162e 0          root       666        27         1                       
-```
-Create a 2nd container correctly shows no shared memory segment from 1st container:
-```
- $ docker run shm ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
-```
-
-Create a 3rd container using the new --ipc=container:CONTAINERID option, now it shows the shared memory segment from the first:
-
-```
- $ docker run -it --ipc=container:ed735b2264ac shm ipcs -m
- $ sudo ipcs -m
-
- ------ Shared Memory Segments --------
- key        shmid      owner      perms      bytes      nattch     status      
- 0x0000162e 0          root       666        27         1
-```
-
-## Linking Containers
-
-> **Note**: This section describes linking between containers on the
-> default (bridge) network, also known as "legacy links". Using `--link`
-> on user-defined networks uses the DNS-based discovery, which does not add
-> entries to `/etc/hosts`, and does not set environment variables for
-> discovery.
-
-The link feature allows multiple containers to communicate with each other. For
-example, a container whose Dockerfile has exposed port 80 can be run and named
-as follows:
-
-    # docker run --name=link-test -d -i -t fedora/httpd
-
-A second container, in this case called linker, can communicate with the httpd
-container, named link-test, by running with the **--link=<name>:<alias>**
-
-    # docker run -t -i --link=link-test:lt --name=linker fedora /bin/bash
-
-Now the container linker is linked to container link-test with the alias lt.
-Running the **env** command in the linker container shows environment variables
- with the LT (alias) context (**LT_**)
-
-    # env
-    HOSTNAME=668231cb0978
-    TERM=xterm
-    LT_PORT_80_TCP=tcp://172.17.0.3:80
-    LT_PORT_80_TCP_PORT=80
-    LT_PORT_80_TCP_PROTO=tcp
-    LT_PORT=tcp://172.17.0.3:80
-    PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-    PWD=/
-    LT_NAME=/linker/lt
-    SHLVL=1
-    HOME=/
-    LT_PORT_80_TCP_ADDR=172.17.0.3
-    _=/usr/bin/env
-
-When linking two containers Docker will use the exposed ports of the container
-to create a secure tunnel for the parent to access.
-
-If a container is connected to the default bridge network and `linked`
-with other containers, then the container's `/etc/hosts` file is updated
-with the linked container's name.
-
-> **Note** Since Docker may live update the container's `/etc/hosts` file, there
-may be situations when processes inside the container can end up reading an
-empty or incomplete `/etc/hosts` file. In most cases, retrying the read again
-should fix the problem.
-
-
-## Mapping Ports for External Usage
-
-The exposed port of an application can be mapped to a host port using the **-p**
-flag. For example, an httpd port 80 can be mapped to the host port 8080 using the
-following:
-
-    # docker run -p 8080:80 -d -i -t fedora/httpd
-
-## Creating and Mounting a Data Volume Container
-
-Many applications require the sharing of persistent data across several
-containers. Docker allows you to create a Data Volume Container that other
-containers can mount from. For example, create a named container that contains
-directories /var/volume1 and /tmp/volume2. The image will need to contain these
-directories so a couple of RUN mkdir instructions might be required for you
-fedora-data image:
-
-    # docker run --name=data -v /var/volume1 -v /tmp/volume2 -i -t fedora-data true
-    # docker run --volumes-from=data --name=fedora-container1 -i -t fedora bash
-
-Multiple --volumes-from parameters will bring together multiple data volumes from
-multiple containers. And it's possible to mount the volumes that came from the
-DATA container in yet another container via the fedora-container1 intermediary
-container, allowing to abstract the actual data source from users of that data:
-
-    # docker run --volumes-from=fedora-container1 --name=fedora-container2 -i -t fedora bash
-
-## Mounting External Volumes
-
-To mount a host directory as a container volume, specify the absolute path to
-the directory and the absolute path for the container directory separated by a
-colon:
-
-    # docker run -v /var/db:/data1 -i -t fedora bash
-
-When using SELinux, be aware that the host has no knowledge of container SELinux
-policy. Therefore, in the above example, if SELinux policy is enforced, the
-`/var/db` directory is not writable to the container. A "Permission Denied"
-message will occur and an avc: message in the host's syslog.
-
-
-To work around this, at time of writing this man page, the following command
-needs to be run in order for the proper SELinux policy type label to be attached
-to the host directory:
-
-    # chcon -Rt svirt_sandbox_file_t /var/db
-
-
-Now, writing to the /data1 volume in the container will be allowed and the
-changes will also be reflected on the host in /var/db.
-
-## Using alternative security labeling
-
-You can override the default labeling scheme for each container by specifying
-the `--security-opt` flag. For example, you can specify the MCS/MLS level, a
-requirement for MLS systems. Specifying the level in the following command
-allows you to share the same content between containers.
-
-    # docker run --security-opt label=level:s0:c100,c200 -i -t fedora bash
-
-An MLS example might be:
-
-    # docker run --security-opt label=level:TopSecret -i -t rhel7 bash
-
-To disable the security labeling for this container versus running with the
-`--permissive` flag, use the following command:
-
-    # docker run --security-opt label=disable -i -t fedora bash
-
-If you want a tighter security policy on the processes within a container,
-you can specify an alternate type for the container. You could run a container
-that is only allowed to listen on Apache ports by executing the following
-command:
-
-    # docker run --security-opt label=type:svirt_apache_t -i -t centos bash
-
-Note:
-
-You would have to write policy defining a `svirt_apache_t` type.
-
-## Setting device weight
-
-If you want to set `/dev/sda` device weight to `200`, you can specify the device
-weight by `--blkio-weight-device` flag. Use the following command:
-
-   # docker run -it --blkio-weight-device "/dev/sda:200" ubuntu
-
-## Specify isolation technology for container (--isolation)
-
-This option is useful in situations where you are running Docker containers on
-Microsoft Windows. The `--isolation <value>` option sets a container's isolation
-technology. On Linux, the only supported is the `default` option which uses
-Linux namespaces. These two commands are equivalent on Linux:
-
-```
-$ docker run -d busybox top
-$ docker run -d --isolation default busybox top
-```
-
-On Microsoft Windows, can take any of these values:
-
-* `default`: Use the value specified by the Docker daemon's `--exec-opt` . If the `daemon` does not specify an isolation technology, Microsoft Windows uses `process` as its default value.
-* `process`: Namespace isolation only.
-* `hyperv`: Hyper-V hypervisor partition-based isolation.
-
-In practice, when running on Microsoft Windows without a `daemon` option set,  these two commands are equivalent:
-
-```
-$ docker run -d --isolation default busybox top
-$ docker run -d --isolation process busybox top
-```
-
-If you have set the `--exec-opt isolation=hyperv` option on the Docker `daemon`, any of these commands also result in `hyperv` isolation:
-
-```
-$ docker run -d --isolation default busybox top
-$ docker run -d --isolation hyperv busybox top
-```
-
-## Setting Namespaced Kernel Parameters (Sysctls)
-
-The `--sysctl` sets namespaced kernel parameters (sysctls) in the
-container. For example, to turn on IP forwarding in the containers
-network namespace, run this command:
-
-    $ docker run --sysctl net.ipv4.ip_forward=1 someimage
-
-Note:
-
-Not all sysctls are namespaced. Docker does not support changing sysctls
-inside of a container that also modify the host system. As the kernel 
-evolves we expect to see more sysctls become namespaced.
-
-See the definition of the `--sysctl` option above for the current list of 
-supported sysctls.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-November 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-save.1.md b/installer/vendor/github.com/docker/docker/man/docker-save.1.md
deleted file mode 100644
index 1d1de8a1df..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-save.1.md
+++ /dev/null
@@ -1,45 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-save - Save one or more images to a tar archive (streamed to STDOUT by default)
-
-# SYNOPSIS
-**docker save**
-[**--help**]
-[**-o**|**--output**[=*OUTPUT*]]
-IMAGE [IMAGE...]
-
-# DESCRIPTION
-Produces a tarred repository to the standard output stream. Contains all
-parent layers, and all tags + versions, or specified repo:tag.
-
-Stream to a file instead of STDOUT by using **-o**.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-o**, **--output**=""
-   Write to a file, instead of STDOUT
-
-# EXAMPLES
-
-Save all fedora repository images to a fedora-all.tar and save the latest
-fedora image to a fedora-latest.tar:
-
-    $ docker save fedora > fedora-all.tar
-    $ docker save --output=fedora-latest.tar fedora:latest
-    $ ls -sh fedora-all.tar
-    721M fedora-all.tar
-    $ ls -sh fedora-latest.tar
-    367M fedora-latest.tar
-
-# See also
-**docker-load(1)** to load an image from a tar archive on STDIN.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-November 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-search.1.md b/installer/vendor/github.com/docker/docker/man/docker-search.1.md
deleted file mode 100644
index ad8bbc78b2..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-search.1.md
+++ /dev/null
@@ -1,70 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-search - Search the Docker Hub for images
-
-# SYNOPSIS
-**docker search**
-[**-f**|**--filter**[=*[]*]]
-[**--help**]
-[**--limit**[=*LIMIT*]]
-[**--no-trunc**]
-TERM
-
-# DESCRIPTION
-
-Search Docker Hub for images that match the specified `TERM`. The table
-of images returned displays the name, description (truncated by default), number
-of stars awarded, whether the image is official, and whether it is automated.
-
-*Note* - Search queries will only return up to 25 results
-
-# OPTIONS
-
-**-f**, **--filter**=[]
-   Filter output based on these conditions:
-   - stars=<numberOfStar>
-   - is-automated=(true|false)
-   - is-official=(true|false)
-
-**--help**
-  Print usage statement
-
-**--limit**=*LIMIT*
-  Maximum returned search results. The default is 25.
-
-**--no-trunc**=*true*|*false*
-   Don't truncate output. The default is *false*.
-
-# EXAMPLES
-
-## Search Docker Hub for ranked images
-
-Search a registry for the term 'fedora' and only display those images
-ranked 3 or higher:
-
-    $ docker search --filter=stars=3 fedora
-    NAME                  DESCRIPTION                                    STARS OFFICIAL  AUTOMATED
-    mattdm/fedora         A basic Fedora image corresponding roughly...  50
-    fedora                (Semi) Official Fedora base image.             38
-    mattdm/fedora-small   A small Fedora image on which to build. Co...  8
-    goldmann/wildfly      A WildFly application server running on a ...  3               [OK]
-
-## Search Docker Hub for automated images
-
-Search Docker Hub for the term 'fedora' and only display automated images
-ranked 1 or higher:
-
-    $ docker search --filter=is-automated=true --filter=stars=1 fedora
-    NAME               DESCRIPTION                                     STARS OFFICIAL  AUTOMATED
-    goldmann/wildfly   A WildFly application server running on a ...   3               [OK]
-    tutum/fedora-20    Fedora 20 image with SSH access. For the r...   1               [OK]
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
-April 2016, updated by Vincent Demeester <vincent@sbr.pm>
-
diff --git a/installer/vendor/github.com/docker/docker/man/docker-start.1.md b/installer/vendor/github.com/docker/docker/man/docker-start.1.md
deleted file mode 100644
index c00b0a1668..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-start.1.md
+++ /dev/null
@@ -1,39 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-start - Start one or more containers
-
-# SYNOPSIS
-**docker start**
-[**-a**|**--attach**]
-[**--detach-keys**[=*[]*]]
-[**--help**]
-[**-i**|**--interactive**]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-Start one or more containers.
-
-# OPTIONS
-**-a**, **--attach**=*true*|*false*
-   Attach container's STDOUT and STDERR and forward all signals to the
-   process. The default is *false*.
-
-**--detach-keys**=""
-   Override the key sequence for detaching a container. Format is a single character `[a-Z]` or `ctrl-<value>` where `<value>` is one of: `a-z`, `@`, `^`, `[`, `,` or `_`.
-
-**--help**
-  Print usage statement
-
-**-i**, **--interactive**=*true*|*false*
-   Attach container's STDIN. The default is *false*.
-
-# See also
-**docker-stop(1)** to stop a container.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-stats.1.md b/installer/vendor/github.com/docker/docker/man/docker-stats.1.md
deleted file mode 100644
index 0f022cd412..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-stats.1.md
+++ /dev/null
@@ -1,57 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-stats - Display a live stream of one or more containers' resource usage statistics
-
-# SYNOPSIS
-**docker stats**
-[**-a**|**--all**]
-[**--help**]
-[**--no-stream**]
-[**--format[="*TEMPLATE*"]**]
-[CONTAINER...]
-
-# DESCRIPTION
-
-Display a live stream of one or more containers' resource usage statistics
-
-# OPTIONS
-**-a**, **--all**=*true*|*false*
-   Show all containers. Only running containers are shown by default. The default is *false*.
-
-**--help**
-  Print usage statement
-
-**--no-stream**=*true*|*false*
-  Disable streaming stats and only pull the first result, default setting is false.
-
-**--format**="*TEMPLATE*"
-   Pretty-print containers statistics using a Go template.
-   Valid placeholders:
-      .Container - Container name or ID.
-      .Name - Container name.
-      .ID - Container ID.
-      .CPUPerc - CPU percentage.
-      .MemUsage - Memory usage.
-      .NetIO - Network IO.
-      .BlockIO - Block IO.
-      .MemPerc - Memory percentage (Not available on Windows).
-      .PIDs - Number of PIDs (Not available on Windows).
-
-# EXAMPLES
-
-Running `docker stats` on all running containers
-
-    $ docker stats
-    CONTAINER           CPU %               MEM USAGE / LIMIT     MEM %               NET I/O             BLOCK I/O
-    1285939c1fd3        0.07%               796 KiB / 64 MiB        1.21%               788 B / 648 B       3.568 MB / 512 KB
-    9c76f7834ae2        0.07%               2.746 MiB / 64 MiB      4.29%               1.266 KB / 648 B    12.4 MB / 0 B
-    d1ea048f04e4        0.03%               4.583 MiB / 64 MiB      6.30%               2.854 KB / 648 B    27.7 MB / 0 B
-
-Running `docker stats` on multiple containers by name and id.
-
-    $ docker stats fervent_panini 5acfcb1b4fd1
-    CONTAINER           CPU %               MEM USAGE/LIMIT     MEM %               NET I/O
-    5acfcb1b4fd1        0.00%               115.2 MiB/1.045 GiB   11.03%              1.422 kB/648 B
-    fervent_panini      0.02%               11.08 MiB/1.045 GiB   1.06%               648 B/648 B
diff --git a/installer/vendor/github.com/docker/docker/man/docker-stop.1.md b/installer/vendor/github.com/docker/docker/man/docker-stop.1.md
deleted file mode 100644
index fa377c92c4..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-stop.1.md
+++ /dev/null
@@ -1,30 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-stop - Stop a container by sending SIGTERM and then SIGKILL after a grace period
-
-# SYNOPSIS
-**docker stop**
-[**--help**]
-[**-t**|**--time**[=*10*]]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-Stop a container (Send SIGTERM, and then SIGKILL after
- grace period)
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**-t**, **--time**=*10*
-  Number of seconds to wait for the container to stop before killing it. Default is 10 seconds.
-
-#See also
-**docker-start(1)** to restart a stopped container.
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-tag.1.md b/installer/vendor/github.com/docker/docker/man/docker-tag.1.md
deleted file mode 100644
index 7f27e1b0e1..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-tag.1.md
+++ /dev/null
@@ -1,76 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-tag - Create a tag `TARGET_IMAGE` that refers to `SOURCE_IMAGE`
-
-# SYNOPSIS
-**docker tag**
-[**--help**]
-SOURCE_NAME[:TAG] TARGET_NAME[:TAG]
-
-# DESCRIPTION
-Assigns a new alias to an image in a registry. An alias refers to the
-entire image name including the optional `TAG` after the ':'. 
-
-# "OPTIONS"
-**--help**
-   Print usage statement.
-
-**NAME**
-   The image name which is made up of slash-separated name components, 
-   optionally prefixed by a registry hostname. The hostname must comply with 
-   standard DNS rules, but may not contain underscores. If a hostname is 
-   present, it may optionally be followed by a port number in the format 
-   `:8080`. If not present, the command uses Docker's public registry located at
-   `registry-1.docker.io` by default. Name components may contain lowercase 
-   characters, digits and separators. A separator is defined as a period, one or 
-   two underscores, or one or more dashes. A name component may not start or end 
-   with a separator.
-
-**TAG**
-   The tag assigned to the image to version and distinguish images with the same
-   name. The tag name may contain lowercase and uppercase characters, digits, 
-   underscores, periods and dashes. A tag name may not start with a period or a 
-   dash and may contain a maximum of 128 characters.
-
-# EXAMPLES
-
-## Tagging an image referenced by ID
-
-To tag a local image with ID "0e5574283393" into the "fedora" repository with 
-"version1.0":
-
-    docker tag 0e5574283393 fedora/httpd:version1.0
-
-## Tagging an image referenced by Name
-
-To tag a local image with name "httpd" into the "fedora" repository with 
-"version1.0":
-
-    docker tag httpd fedora/httpd:version1.0
-
-Note that since the tag name is not specified, the alias is created for an
-existing local version `httpd:latest`.
-
-## Tagging an image referenced by Name and Tag
-
-To tag a local image with name "httpd" and tag "test" into the "fedora"
-repository with "version1.0.test":
-
-    docker tag httpd:test fedora/httpd:version1.0.test
-
-## Tagging an image for a private repository
-
-To push an image to a private registry and not the central Docker
-registry you must tag it with the registry hostname and port (if needed).
-
-    docker tag 0e5574283393 myregistryhost:5000/fedora/httpd:version1.0
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-July 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-April 2015, updated by Mary Anthony for v2 <mary@docker.com>
-June 2015, updated by Sally O'Malley <somalley@redhat.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-top.1.md b/installer/vendor/github.com/docker/docker/man/docker-top.1.md
deleted file mode 100644
index a666f7cd37..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-top.1.md
+++ /dev/null
@@ -1,36 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-top - Display the running processes of a container
-
-# SYNOPSIS
-**docker top**
-[**--help**]
-CONTAINER [ps OPTIONS]
-
-# DESCRIPTION
-
-Display the running process of the container. ps-OPTION can be any of the options you would pass to a Linux ps command.
-
-All displayed information is from host's point of view.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-Run **docker top** with the ps option of -x:
-
-    $ docker top 8601afda2b -x
-    PID      TTY       STAT       TIME         COMMAND
-    16623    ?         Ss         0:00         sleep 99999
-
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-June 2015, updated by Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
-December 2015, updated by Pavel Pospisil <pospispa@gmail.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-unpause.1.md b/installer/vendor/github.com/docker/docker/man/docker-unpause.1.md
deleted file mode 100644
index e6fd3c4e01..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-unpause.1.md
+++ /dev/null
@@ -1,28 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-unpause - Unpause all processes within one or more containers
-
-# SYNOPSIS
-**docker unpause**
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-The `docker unpause` command un-suspends all processes in the specified containers.
-On Linux, it does this using the cgroups freezer.
-
-See the [cgroups freezer documentation]
-(https://www.kernel.org/doc/Documentation/cgroup-v1/freezer-subsystem.txt) for
-further details.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# See also
-**docker-pause(1)** to pause all processes within one or more containers.
-
-# HISTORY
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-update.1.md b/installer/vendor/github.com/docker/docker/man/docker-update.1.md
deleted file mode 100644
index 85f3dd07c1..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-update.1.md
+++ /dev/null
@@ -1,171 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-update - Update configuration of one or more containers
-
-# SYNOPSIS
-**docker update**
-[**--blkio-weight**[=*[BLKIO-WEIGHT]*]]
-[**--cpu-shares**[=*0*]]
-[**--cpu-period**[=*0*]]
-[**--cpu-quota**[=*0*]]
-[**--cpu-rt-period**[=*0*]]
-[**--cpu-rt-runtime**[=*0*]]
-[**--cpuset-cpus**[=*CPUSET-CPUS*]]
-[**--cpuset-mems**[=*CPUSET-MEMS*]]
-[**--help**]
-[**--kernel-memory**[=*KERNEL-MEMORY*]]
-[**-m**|**--memory**[=*MEMORY*]]
-[**--memory-reservation**[=*MEMORY-RESERVATION*]]
-[**--memory-swap**[=*MEMORY-SWAP*]]
-[**--restart**[=*""*]]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-The **docker update** command dynamically updates container configuration.
-You can use this command to prevent containers from consuming too many 
-resources from their Docker host.  With a single command, you can place 
-limits on a single container or on many. To specify more than one container,
-provide space-separated list of container names or IDs.
-
-With the exception of the **--kernel-memory** option, you can specify these
-options on a running or a stopped container. On kernel version older than
-4.6, You can only update **--kernel-memory** on a stopped container or on
-a running container with kernel memory initialized.
-
-# OPTIONS
-
-**--blkio-weight**=0
-   Block IO weight (relative weight) accepts a weight value between 10 and 1000.
-
-**--cpu-shares**=0
-   CPU shares (relative weight)
-
-**--cpu-period**=0
-   Limit the CPU CFS (Completely Fair Scheduler) period
-
-   Limit the container's CPU usage. This flag tell the kernel to restrict the container's CPU usage to the period you specify.
-
-**--cpu-quota**=0
-   Limit the CPU CFS (Completely Fair Scheduler) quota
-
-**--cpu-rt-period**=0
-   Limit the CPU real-time period in microseconds
-
-   Limit the container's Real Time CPU usage. This flag tell the kernel to restrict the container's Real Time CPU usage to the period you specify.
-
-**--cpu-rt-runtime**=0
-   Limit the CPU real-time runtime in microseconds
-
-   Limit the containers Real Time CPU usage. This flag tells the kernel to limit the amount of time in a given CPU period Real Time tasks may consume. Ex:
-   Period of 1,000,000us and Runtime of 950,000us means that this container could consume 95% of available CPU and leave the remaining 5% to normal priority tasks.
-
-   The sum of all runtimes across containers cannot exceed the amount allotted to the parent cgroup.
-
-**--cpuset-cpus**=""
-   CPUs in which to allow execution (0-3, 0,1)
-
-**--cpuset-mems**=""
-   Memory nodes(MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.
-
-**--help**
-   Print usage statement
-
-**--kernel-memory**=""
-   Kernel memory limit (format: `<number>[<unit>]`, where unit = b, k, m or g)
-
-   Note that on kernel version older than 4.6, you can not update kernel memory on
-   a running container if the container is started without kernel memory initialized,
-   in this case, it can only be updated after it's stopped. The new setting takes
-   effect when the container is started.
-
-**-m**, **--memory**=""
-   Memory limit (format: <number><optional unit>, where unit = b, k, m or g)
-
-   Note that the memory should be smaller than the already set swap memory limit.
-   If you want update a memory limit bigger than the already set swap memory limit,
-   you should update swap memory limit at the same time. If you don't set swap memory 
-   limit on docker create/run but only memory limit, the swap memory is double
-   the memory limit.
-
-**--memory-reservation**=""
-   Memory soft limit (format: <number>[<unit>], where unit = b, k, m or g)
-
-**--memory-swap**=""
-   Total memory limit (memory + swap)
-
-**--restart**=""
-   Restart policy to apply when a container exits (no, on-failure[:max-retry], always, unless-stopped).
-
-# EXAMPLES
-
-The following sections illustrate ways to use this command.
-
-### Update a container's cpu-shares
-
-To limit a container's cpu-shares to 512, first identify the container
-name or ID. You can use **docker ps** to find these values. You can also
-use the ID returned from the **docker run** command.  Then, do the following:
-
-```bash
-$ docker update --cpu-shares 512 abebf7571666
-```
-
-### Update a container with cpu-shares and memory
-
-To update multiple resource configurations for multiple containers:
-
-```bash
-$ docker update --cpu-shares 512 -m 300M abebf7571666 hopeful_morse
-```
-
-### Update a container's kernel memory constraints
-
-You can update a container's kernel memory limit using the **--kernel-memory**
-option. On kernel version older than 4.6, this option can be updated on a
-running container only if the container was started with **--kernel-memory**.
-If the container was started *without* **--kernel-memory** you need to stop
-the container before updating kernel memory.
-
-For example, if you started a container with this command:
-
-```bash
-$ docker run -dit --name test --kernel-memory 50M ubuntu bash
-```
-
-You can update kernel memory while the container is running:
-
-```bash
-$ docker update --kernel-memory 80M test
-```
-
-If you started a container *without* kernel memory initialized:
-
-```bash
-$ docker run -dit --name test2 --memory 300M ubuntu bash
-```
-
-Update kernel memory of running container `test2` will fail. You need to stop
-the container before updating the **--kernel-memory** setting. The next time you
-start it, the container uses the new value.
-
-Kernel version newer than (include) 4.6 does not have this limitation, you
-can use `--kernel-memory` the same way as other options.
-
-### Update a container's restart policy
-
-You can change a container's restart policy on a running container. The new
-restart policy takes effect instantly after you run `docker update` on a
-container.
-
-To update restart policy for one or more containers:
-
-```bash
-$ docker update --restart=on-failure:3 abebf7571666 hopeful_morse
-```
-
-Note that if the container is started with "--rm" flag, you cannot update the restart
-policy for it. The `AutoRemove` and `RestartPolicy` are mutually exclusive for the
-container.
diff --git a/installer/vendor/github.com/docker/docker/man/docker-version.1.md b/installer/vendor/github.com/docker/docker/man/docker-version.1.md
deleted file mode 100644
index 1838f82052..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-version.1.md
+++ /dev/null
@@ -1,62 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2015
-# NAME
-docker-version - Show the Docker version information.
-
-# SYNOPSIS
-**docker version**
-[**--help**]
-[**-f**|**--format**[=*FORMAT*]]
-
-# DESCRIPTION
-This command displays version information for both the Docker client and 
-daemon. 
-
-# OPTIONS
-**--help**
-    Print usage statement
-
-**-f**, **--format**=""
-    Format the output using the given Go template.
-
-# EXAMPLES
-
-## Display Docker version information
-
-The default output:
-
-    $ docker version
-	Client:
-	 Version:      1.8.0
-	 API version:  1.20
-	 Go version:   go1.4.2
-	 Git commit:   f5bae0a
-	 Built:        Tue Jun 23 17:56:00 UTC 2015
-	 OS/Arch:      linux/amd64
-
-	Server:
-	 Version:      1.8.0
-	 API version:  1.20
-	 Go version:   go1.4.2
-	 Git commit:   f5bae0a
-	 Built:        Tue Jun 23 17:56:00 UTC 2015
-	 OS/Arch:      linux/amd64
-
-Get server version:
-
-    $ docker version --format '{{.Server.Version}}'
-	1.8.0
-
-Dump raw data:
-
-To view all available fields, you can use the format `{{json .}}`.
-
-    $ docker version --format '{{json .}}'
-    {"Client":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"},"ServerOK":true,"Server":{"Version":"1.8.0","ApiVersion":"1.20","GitCommit":"f5bae0a","GoVersion":"go1.4.2","Os":"linux","Arch":"amd64","KernelVersion":"3.13.2-gentoo","BuildTime":"Tue Jun 23 17:56:00 UTC 2015"}}
-
-	
-# HISTORY
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
-June 2015, updated by John Howard <jhoward@microsoft.com>
-June 2015, updated by Patrick Hemmer <patrick.hemmer@gmail.com>
diff --git a/installer/vendor/github.com/docker/docker/man/docker-wait.1.md b/installer/vendor/github.com/docker/docker/man/docker-wait.1.md
deleted file mode 100644
index 678800966b..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker-wait.1.md
+++ /dev/null
@@ -1,30 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% Docker Community
-% JUNE 2014
-# NAME
-docker-wait - Block until one or more containers stop, then print their exit codes
-
-# SYNOPSIS
-**docker wait**
-[**--help**]
-CONTAINER [CONTAINER...]
-
-# DESCRIPTION
-
-Block until one or more containers stop, then print their exit codes.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-# EXAMPLES
-
-    $ docker run -d fedora sleep 99
-    079b83f558a2bc52ecad6b2a5de13622d584e6bb1aea058c11b36511e85e7622
-    $ docker wait 079b83f558a2bc
-    0
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com)
-based on docker.com source material and internal work.
-June 2014, updated by Sven Dowideit <SvenDowideit@home.org.au>
diff --git a/installer/vendor/github.com/docker/docker/man/docker.1.md b/installer/vendor/github.com/docker/docker/man/docker.1.md
deleted file mode 100644
index 2a96184439..0000000000
--- a/installer/vendor/github.com/docker/docker/man/docker.1.md
+++ /dev/null
@@ -1,237 +0,0 @@
-% DOCKER(1) Docker User Manuals
-% William Henry
-% APRIL 2014
-# NAME
-docker \- Docker image and container command line interface
-
-# SYNOPSIS
-**docker** [OPTIONS] COMMAND [ARG...]
-
-**docker** daemon [--help|...]
-
-**docker** [--help|-v|--version]
-
-# DESCRIPTION
-is a client for interacting with the daemon (see **dockerd(8)**) through the CLI.
-
-The Docker CLI has over 30 commands. The commands are listed below and each has
-its own man page which explain usage and arguments.
-
-To see the man page for a command run **man docker <command>**.
-
-# OPTIONS
-**--help**
-  Print usage statement
-
-**--config**=""
-  Specifies the location of the Docker client configuration files. The default is '~/.docker'.
-
-**-D**, **--debug**=*true*|*false*
-  Enable debug mode. Default is false.
-
-**-H**, **--host**=[*unix:///var/run/docker.sock*]: tcp://[host]:[port][path] to bind or
-unix://[/path/to/socket] to use.
-  The socket(s) to bind to in daemon mode specified using one or more
-  tcp://host:port/path, unix:///path/to/socket, fd://* or fd://socketfd.
-  If the tcp port is not specified, then it will default to either `2375` when
-  `--tls` is off, or `2376` when `--tls` is on, or `--tlsverify` is specified.
-
-**-l**, **--log-level**="*debug*|*info*|*warn*|*error*|*fatal*"
-  Set the logging level. Default is `info`.
-
-**--tls**=*true*|*false*
-  Use TLS; implied by --tlsverify. Default is false.
-
-**--tlscacert**=*~/.docker/ca.pem*
-  Trust certs signed only by this CA.
-
-**--tlscert**=*~/.docker/cert.pem*
-  Path to TLS certificate file.
-
-**--tlskey**=*~/.docker/key.pem*
-  Path to TLS key file.
-
-**--tlsverify**=*true*|*false*
-  Use TLS and verify the remote (daemon: verify client, client: verify daemon).
-  Default is false.
-
-**-v**, **--version**=*true*|*false*
-  Print version information and quit. Default is false.
-
-# COMMANDS
-**attach**
-  Attach to a running container
-  See **docker-attach(1)** for full documentation on the **attach** command.
-
-**build**
-  Build an image from a Dockerfile
-  See **docker-build(1)** for full documentation on the **build** command.
-
-**commit**
-  Create a new image from a container's changes
-  See **docker-commit(1)** for full documentation on the **commit** command.
-
-**cp**
-  Copy files/folders between a container and the local filesystem
-  See **docker-cp(1)** for full documentation on the **cp** command.
-
-**create**
-  Create a new container
-  See **docker-create(1)** for full documentation on the **create** command.
-
-**diff**
-  Inspect changes on a container's filesystem
-  See **docker-diff(1)** for full documentation on the **diff** command.
-
-**events**
-  Get real time events from the server
-  See **docker-events(1)** for full documentation on the **events** command.
-
-**exec**
-  Run a command in a running container
-  See **docker-exec(1)** for full documentation on the **exec** command.
-
-**export**
-  Stream the contents of a container as a tar archive
-  See **docker-export(1)** for full documentation on the **export** command.
-
-**history**
-  Show the history of an image
-  See **docker-history(1)** for full documentation on the **history** command.
-
-**images**
-  List images
-  See **docker-images(1)** for full documentation on the **images** command.
-
-**import**
-  Create a new filesystem image from the contents of a tarball
-  See **docker-import(1)** for full documentation on the **import** command.
-
-**info**
-  Display system-wide information
-  See **docker-info(1)** for full documentation on the **info** command.
-
-**inspect**
-  Return low-level information on a container or image
-  See **docker-inspect(1)** for full documentation on the **inspect** command.
-
-**kill**
-  Kill a running container (which includes the wrapper process and everything
-inside it)
-  See **docker-kill(1)** for full documentation on the **kill** command.
-
-**load**
-  Load an image from a tar archive
-  See **docker-load(1)** for full documentation on the **load** command.
-
-**login**
-  Log in to a Docker Registry
-  See **docker-login(1)** for full documentation on the **login** command.
-
-**logout**
-  Log the user out of a Docker Registry
-  See **docker-logout(1)** for full documentation on the **logout** command.
-
-**logs**
-  Fetch the logs of a container
-  See **docker-logs(1)** for full documentation on the **logs** command.
-
-**pause**
-  Pause all processes within a container
-  See **docker-pause(1)** for full documentation on the **pause** command.
-
-**port**
-  Lookup the public-facing port which is NAT-ed to PRIVATE_PORT
-  See **docker-port(1)** for full documentation on the **port** command.
-
-**ps**
-  List containers
-  See **docker-ps(1)** for full documentation on the **ps** command.
-
-**pull**
-  Pull an image or a repository from a Docker Registry
-  See **docker-pull(1)** for full documentation on the **pull** command.
-
-**push**
-  Push an image or a repository to a Docker Registry
-  See **docker-push(1)** for full documentation on the **push** command.
-
-**rename**
-  Rename a container.
-  See **docker-rename(1)** for full documentation on the **rename** command.
-
-**restart**
-  Restart one or more containers
-  See **docker-restart(1)** for full documentation on the **restart** command.
-
-**rm**
-  Remove one or more containers
-  See **docker-rm(1)** for full documentation on the **rm** command.
-
-**rmi**
-  Remove one or more images
-  See **docker-rmi(1)** for full documentation on the **rmi** command.
-
-**run**
-  Run a command in a new container
-  See **docker-run(1)** for full documentation on the **run** command.
-
-**save**
-  Save an image to a tar archive
-  See **docker-save(1)** for full documentation on the **save** command.
-
-**search**
-  Search for an image in the Docker index
-  See **docker-search(1)** for full documentation on the **search** command.
-
-**start**
-  Start a container
-  See **docker-start(1)** for full documentation on the **start** command.
-
-**stats**
-  Display a live stream of one or more containers' resource usage statistics
-  See **docker-stats(1)** for full documentation on the **stats** command.
-
-**stop**
-  Stop a container
-  See **docker-stop(1)** for full documentation on the **stop** command.
-
-**tag**
-  Tag an image into a repository
-  See **docker-tag(1)** for full documentation on the **tag** command.
-
-**top**
-  Lookup the running processes of a container
-  See **docker-top(1)** for full documentation on the **top** command.
-
-**unpause**
-  Unpause all processes within a container
-  See **docker-unpause(1)** for full documentation on the **unpause** command.
-
-**version**
-  Show the Docker version information
-  See **docker-version(1)** for full documentation on the **version** command.
-
-**wait**
-  Block until a container stops, then print its exit code
-  See **docker-wait(1)** for full documentation on the **wait** command.
-
-
-# RUNTIME EXECUTION OPTIONS
-
-Use the **--exec-opt** flags to specify options to the execution driver.
-The following options are available:
-
-#### native.cgroupdriver
-Specifies the management of the container's `cgroups`. You can specify `cgroupfs`
-or `systemd`. If you specify `systemd` and it is not available, the system errors
-out.
-
-#### Client
-For specific client examples please see the man page for the specific Docker
-command. For example:
-
-    man docker-run
-
-# HISTORY
-April 2014, Originally compiled by William Henry (whenry at redhat dot com) based on docker.com source material and internal work.
diff --git a/installer/vendor/github.com/docker/docker/man/dockerd.8.md b/installer/vendor/github.com/docker/docker/man/dockerd.8.md
deleted file mode 100644
index 761dc6b9be..0000000000
--- a/installer/vendor/github.com/docker/docker/man/dockerd.8.md
+++ /dev/null
@@ -1,710 +0,0 @@
-% DOCKER(8) Docker User Manuals
-% Shishir Mahajan
-% SEPTEMBER 2015
-# NAME
-dockerd - Enable daemon mode
-
-# SYNOPSIS
-**dockerd**
-[**--add-runtime**[=*[]*]]
-[**--api-cors-header**=[=*API-CORS-HEADER*]]
-[**--authorization-plugin**[=*[]*]]
-[**-b**|**--bridge**[=*BRIDGE*]]
-[**--bip**[=*BIP*]]
-[**--cgroup-parent**[=*[]*]]
-[**--cluster-store**[=*[]*]]
-[**--cluster-advertise**[=*[]*]]
-[**--cluster-store-opt**[=*map[]*]]
-[**--config-file**[=*/etc/docker/daemon.json*]]
-[**--containerd**[=*SOCKET-PATH*]]
-[**-D**|**--debug**]
-[**--default-gateway**[=*DEFAULT-GATEWAY*]]
-[**--default-gateway-v6**[=*DEFAULT-GATEWAY-V6*]]
-[**--default-runtime**[=*runc*]]
-[**--default-ulimit**[=*[]*]]
-[**--disable-legacy-registry**]
-[**--dns**[=*[]*]]
-[**--dns-opt**[=*[]*]]
-[**--dns-search**[=*[]*]]
-[**--exec-opt**[=*[]*]]
-[**--exec-root**[=*/var/run/docker*]]
-[**--experimental**[=*false*]]
-[**--fixed-cidr**[=*FIXED-CIDR*]]
-[**--fixed-cidr-v6**[=*FIXED-CIDR-V6*]]
-[**-G**|**--group**[=*docker*]]
-[**-g**|**--graph**[=*/var/lib/docker*]]
-[**-H**|**--host**[=*[]*]]
-[**--help**]
-[**--icc**[=*true*]]
-[**--init**[=*false*]]
-[**--init-path**[=*""*]]
-[**--insecure-registry**[=*[]*]]
-[**--ip**[=*0.0.0.0*]]
-[**--ip-forward**[=*true*]]
-[**--ip-masq**[=*true*]]
-[**--iptables**[=*true*]]
-[**--ipv6**]
-[**--isolation**[=*default*]]
-[**-l**|**--log-level**[=*info*]]
-[**--label**[=*[]*]]
-[**--live-restore**[=*false*]]
-[**--log-driver**[=*json-file*]]
-[**--log-opt**[=*map[]*]]
-[**--mtu**[=*0*]]
-[**--max-concurrent-downloads**[=*3*]]
-[**--max-concurrent-uploads**[=*5*]]
-[**-p**|**--pidfile**[=*/var/run/docker.pid*]]
-[**--raw-logs**]
-[**--registry-mirror**[=*[]*]]
-[**-s**|**--storage-driver**[=*STORAGE-DRIVER*]]
-[**--seccomp-profile**[=*SECCOMP-PROFILE-PATH*]]
-[**--selinux-enabled**]
-[**--shutdown-timeout**[=*15*]]
-[**--storage-opt**[=*[]*]]
-[**--swarm-default-advertise-addr**[=*IP|INTERFACE*]]
-[**--tls**]
-[**--tlscacert**[=*~/.docker/ca.pem*]]
-[**--tlscert**[=*~/.docker/cert.pem*]]
-[**--tlskey**[=*~/.docker/key.pem*]]
-[**--tlsverify**]
-[**--userland-proxy**[=*true*]]
-[**--userland-proxy-path**[=*""*]]
-[**--userns-remap**[=*default*]]
-
-# DESCRIPTION
-**dockerd** is used for starting the Docker daemon (i.e., to command the daemon
-to manage images, containers etc).  So **dockerd** is a server, as a daemon.
-
-To run the Docker daemon you can specify **dockerd**.
-You can check the daemon options using **dockerd --help**.
-Daemon options should be specified after the **dockerd** keyword in the
-following format.
-
-**dockerd [OPTIONS]**
-
-# OPTIONS
-
-**--add-runtime**=[]
-  Runtimes can be registered with the daemon either via the
-configuration file or using the `--add-runtime` command line argument.
-
-  The following is an example adding 2 runtimes via the configuration:
-
-```json
-{
-	"default-runtime": "runc",
-	"runtimes": {
-		"runc": {
-			"path": "runc"
-		},
-		"custom": {
-			"path": "/usr/local/bin/my-runc-replacement",
-			"runtimeArgs": [
-				"--debug"
-			]
-		}
-	}
-}
-```
-
-  This is the same example via the command line:
-
-```bash
-$ sudo dockerd --add-runtime runc=runc --add-runtime custom=/usr/local/bin/my-runc-replacement
-```
-
-  **Note**: defining runtime arguments via the command line is not supported.
-
-**--api-cors-header**=""
-  Set CORS headers in the Engine API. Default is cors disabled. Give urls like
-  "http://foo, http://bar, ...". Give "*" to allow all.
-
-**--authorization-plugin**=""
-  Set authorization plugins to load
-
-**-b**, **--bridge**=""
-  Attach containers to a pre\-existing network bridge; use 'none' to disable
-  container networking
-
-**--bip**=""
-  Use the provided CIDR notation address for the dynamically created bridge
-  (docker0); Mutually exclusive of \-b
-
-**--cgroup-parent**=""
-  Set parent cgroup for all containers. Default is "/docker" for fs cgroup
-  driver and "system.slice" for systemd cgroup driver.
-
-**--cluster-store**=""
-  URL of the distributed storage backend
-
-**--cluster-advertise**=""
-  Specifies the 'host:port' or `interface:port` combination that this
-  particular daemon instance should use when advertising itself to the cluster.
-  The daemon is reached through this value.
-
-**--cluster-store-opt**=""
-  Specifies options for the Key/Value store.
-
-**--config-file**="/etc/docker/daemon.json"
-  Specifies the JSON file path to load the configuration from.
-
-**--containerd**=""
-  Path to containerd socket.
-
-**-D**, **--debug**=*true*|*false*
-  Enable debug mode. Default is false.
-
-**--default-gateway**=""
-  IPv4 address of the container default gateway; this address must be part of
-  the bridge subnet (which is defined by \-b or \--bip)
-
-**--default-gateway-v6**=""
-  IPv6 address of the container default gateway
-
-**--default-runtime**="runc"
-  Set default runtime if there're more than one specified by `--add-runtime`.
-
-**--default-ulimit**=[]
-  Default ulimits for containers.
-
-**--disable-legacy-registry**=*true*|*false*
-  Disable contacting legacy registries
-
-**--dns**=""
-  Force Docker to use specific DNS servers
-
-**--dns-opt**=""
-  DNS options to use.
-
-**--dns-search**=[]
-  DNS search domains to use.
-
-**--exec-opt**=[]
-  Set runtime execution options. See RUNTIME EXECUTION OPTIONS.
-
-**--exec-root**=""
-  Path to use as the root of the Docker execution state files. Default is
-  `/var/run/docker`.
-
-**--experimental**=""
-  Enable the daemon experimental features.
-
-**--fixed-cidr**=""
-  IPv4 subnet for fixed IPs (e.g., 10.20.0.0/16); this subnet must be nested in
-  the bridge subnet (which is defined by \-b or \-\-bip).
-
-**--fixed-cidr-v6**=""
-  IPv6 subnet for global IPv6 addresses (e.g., 2a00:1450::/64)
-
-**-G**, **--group**=""
-  Group to assign the unix socket specified by -H when running in daemon mode.
-  use '' (the empty string) to disable setting of a group. Default is `docker`.
-
-**-g**, **--graph**=""
-  Path to use as the root of the Docker runtime. Default is `/var/lib/docker`.
-
-**-H**, **--host**=[*unix:///var/run/docker.sock*]: tcp://[host:port] to bind or
-unix://[/path/to/socket] to use.
-  The socket(s) to bind to in daemon mode specified using one or more
-  tcp://host:port, unix:///path/to/socket, fd://* or fd://socketfd.
-
-**--help**
-  Print usage statement
-
-**--icc**=*true*|*false*
-  Allow unrestricted inter\-container and Docker daemon host communication. If
-  disabled, containers can still be linked together using the **--link** option
-  (see **docker-run(1)**). Default is true.
-
-**--init**
-  Run an init process inside containers for signal forwarding and process
-  reaping.
-
-**--init-path**
-  Path to the docker-init binary.
-
-**--insecure-registry**=[]
-  Enable insecure registry communication, i.e., enable un-encrypted and/or
-  untrusted communication.
-
-  List of insecure registries can contain an element with CIDR notation to
-  specify a whole subnet. Insecure registries accept HTTP and/or accept HTTPS
-  with certificates from unknown CAs.
-
-  Enabling `--insecure-registry` is useful when running a local registry.
-  However, because its use creates security vulnerabilities it should ONLY be
-  enabled for testing purposes.  For increased security, users should add their
-  CA to their system's list of trusted CAs instead of using
-  `--insecure-registry`.
-
-**--ip**=""
-  Default IP address to use when binding container ports. Default is `0.0.0.0`.
-
-**--ip-forward**=*true*|*false*
-  Enables IP forwarding on the Docker host. The default is `true`. This flag
-  interacts with the IP forwarding setting on your host system's kernel. If
-  your system has IP forwarding disabled, this setting enables it. If your
-  system has IP forwarding enabled, setting this flag to `--ip-forward=false`
-  has no effect.
-
-  This setting will also enable IPv6 forwarding if you have both
-  `--ip-forward=true` and `--fixed-cidr-v6` set. Note that this may reject
-  Router Advertisements and interfere with the host's existing IPv6
-  configuration. For more information, please consult the documentation about
-  "Advanced Networking - IPv6".
-
-**--ip-masq**=*true*|*false*
-  Enable IP masquerading for bridge's IP range. Default is true.
-
-**--iptables**=*true*|*false*
-  Enable Docker's addition of iptables rules. Default is true.
-
-**--ipv6**=*true*|*false*
-  Enable IPv6 support. Default is false. Docker will create an IPv6-enabled
-  bridge with address fe80::1 which will allow you to create IPv6-enabled
-  containers. Use together with `--fixed-cidr-v6` to provide globally routable
-  IPv6 addresses. IPv6 forwarding will be enabled if not used with
-  `--ip-forward=false`. This may collide with your host's current IPv6
-  settings. For more information please consult the documentation about
-  "Advanced Networking - IPv6".
-
-**--isolation**="*default*"
-   Isolation specifies the type of isolation technology used by containers.
-   Note that the default on Windows server is `process`, and the default on
-   Windows client is `hyperv`. Linux only supports `default`.
-
-**-l**, **--log-level**="*debug*|*info*|*warn*|*error*|*fatal*"
-  Set the logging level. Default is `info`.
-
-**--label**="[]"
-  Set key=value labels to the daemon (displayed in `docker info`)
-
-**--live-restore**=*false*
-  Enable live restore of running containers when the daemon starts so that they
-  are not restarted. This option is applicable only for docker daemon running
-  on Linux host.
-
-**--log-driver**="*json-file*|*syslog*|*journald*|*gelf*|*fluentd*|*awslogs*|*splunk*|*etwlogs*|*gcplogs*|*none*"
-  Default driver for container logs. Default is `json-file`.
-  **Warning**: `docker logs` command works only for `json-file` logging driver.
-
-**--log-opt**=[]
-  Logging driver specific options.
-
-**--mtu**=*0*
-  Set the containers network mtu. Default is `0`.
-
-**--max-concurrent-downloads**=*3*
-  Set the max concurrent downloads for each pull. Default is `3`.
-
-**--max-concurrent-uploads**=*5*
-  Set the max concurrent uploads for each push. Default is `5`.
-
-**-p**, **--pidfile**=""
-  Path to use for daemon PID file. Default is `/var/run/docker.pid`
-
-**--raw-logs**
-  Output daemon logs in full timestamp format without ANSI coloring. If this
-  flag is not set, the daemon outputs condensed, colorized logs if a terminal
-  is detected, or full ("raw") output otherwise.
-
-**--registry-mirror**=*<scheme>://<host>*
-  Prepend a registry mirror to be used for image pulls. May be specified
-  multiple times.
-
-**-s**, **--storage-driver**=""
-  Force the Docker runtime to use a specific storage driver.
-
-**--seccomp-profile**=""
-  Path to seccomp profile.
-
-**--selinux-enabled**=*true*|*false*
-  Enable selinux support. Default is false.
-
-**--shutdown-timeout**=*15*
-  Set the shutdown timeout value in seconds. Default is `15`.
-
-**--storage-opt**=[]
-  Set storage driver options. See STORAGE DRIVER OPTIONS.
-
-**--swarm-default-advertise-addr**=*IP|INTERFACE*
-  Set default address or interface for swarm to advertise as its
-  externally-reachable address to other cluster members. This can be a
-  hostname, an IP address, or an interface such as `eth0`. A port cannot be
-  specified with this option.
-
-**--tls**=*true*|*false*
-  Use TLS; implied by --tlsverify. Default is false.
-
-**--tlscacert**=*~/.docker/ca.pem*
-  Trust certs signed only by this CA.
-
-**--tlscert**=*~/.docker/cert.pem*
-  Path to TLS certificate file.
-
-**--tlskey**=*~/.docker/key.pem*
-  Path to TLS key file.
-
-**--tlsverify**=*true*|*false*
-  Use TLS and verify the remote (daemon: verify client, client: verify daemon).
-  Default is false.
-
-**--userland-proxy**=*true*|*false*
-  Rely on a userland proxy implementation for inter-container and
-  outside-to-container loopback communications. Default is true.
-
-**--userland-proxy-path**=""
-  Path to the userland proxy binary.
-
-**--userns-remap**=*default*|*uid:gid*|*user:group*|*user*|*uid*
-  Enable user namespaces for containers on the daemon. Specifying "default"
-  will cause a new user and group to be created to handle UID and GID range
-  remapping for the user namespace mappings used for contained processes.
-  Specifying a user (or uid) and optionally a group (or gid) will cause the
-  daemon to lookup the user and group's subordinate ID ranges for use as the
-  user namespace mappings for contained processes.
-
-# STORAGE DRIVER OPTIONS
-
-Docker uses storage backends (known as "graphdrivers" in the Docker
-internals) to create writable containers from images.  Many of these
-backends use operating system level technologies and can be
-configured.
-
-Specify options to the storage backend with **--storage-opt** flags. The
-backends that currently take options are *devicemapper*, *zfs* and *btrfs*.
-Options for *devicemapper* are prefixed with *dm*, options for *zfs*
-start with *zfs* and options for *btrfs* start with *btrfs*.
-
-Specifically for devicemapper, the default is a "loopback" model which
-requires no pre-configuration, but is extremely inefficient.  Do not
-use it in production.
-
-To make the best use of Docker with the devicemapper backend, you must
-have a recent version of LVM.  Use `lvm` to create a thin pool; for
-more information see `man lvmthin`.  Then, use `--storage-opt
-dm.thinpooldev` to tell the Docker engine to use that pool for
-allocating images and container snapshots.
-
-## Devicemapper options
-
-#### dm.thinpooldev
-
-Specifies a custom block storage device to use for the thin pool.
-
-If using a block device for device mapper storage, it is best to use `lvm`
-to create and manage the thin-pool volume. This volume is then handed to Docker
-to exclusively create snapshot volumes needed for images and containers.
-
-Managing the thin-pool outside of Engine makes for the most feature-rich
-method of having Docker utilize device mapper thin provisioning as the
-backing storage for Docker containers. The highlights of the lvm-based
-thin-pool management feature include: automatic or interactive thin-pool
-resize support, dynamically changing thin-pool features, automatic thinp
-metadata checking when lvm activates the thin-pool, etc.
-
-As a fallback if no thin pool is provided, loopback files are
-created. Loopback is very slow, but can be used without any
-pre-configuration of storage. It is strongly recommended that you do
-not use loopback in production. Ensure your Engine daemon has a
-`--storage-opt dm.thinpooldev` argument provided.
-
-Example use:
-
-   $ dockerd \
-         --storage-opt dm.thinpooldev=/dev/mapper/thin-pool
-
-#### dm.basesize
-
-Specifies the size to use when creating the base device, which limits
-the size of images and containers. The default value is 10G. Note,
-thin devices are inherently "sparse", so a 10G device which is mostly
-empty doesn't use 10 GB of space on the pool. However, the filesystem
-will use more space for base images the larger the device
-is.
-
-The base device size can be increased at daemon restart which will allow
-all future images and containers (based on those new images) to be of the
-new base device size.
-
-Example use: `dockerd --storage-opt dm.basesize=50G`
-
-This will increase the base device size to 50G. The Docker daemon will throw an
-error if existing base device size is larger than 50G. A user can use
-this option to expand the base device size however shrinking is not permitted.
-
-This value affects the system-wide "base" empty filesystem that may already
-be initialized and inherited by pulled images. Typically, a change to this
-value requires additional steps to take effect:
-
-        $ sudo service docker stop
-        $ sudo rm -rf /var/lib/docker
-        $ sudo service docker start
-
-Example use: `dockerd --storage-opt dm.basesize=20G`
-
-#### dm.fs
-
-Specifies the filesystem type to use for the base device. The
-supported options are `ext4` and `xfs`. The default is `ext4`.
-
-Example use: `dockerd --storage-opt dm.fs=xfs`
-
-#### dm.mkfsarg
-
-Specifies extra mkfs arguments to be used when creating the base device.
-
-Example use: `dockerd --storage-opt "dm.mkfsarg=-O ^has_journal"`
-
-#### dm.mountopt
-
-Specifies extra mount options used when mounting the thin devices.
-
-Example use: `dockerd --storage-opt dm.mountopt=nodiscard`
-
-#### dm.use_deferred_removal
-
-Enables use of deferred device removal if `libdm` and the kernel driver
-support the mechanism.
-
-Deferred device removal means that if device is busy when devices are
-being removed/deactivated, then a deferred removal is scheduled on
-device. And devices automatically go away when last user of the device
-exits.
-
-For example, when a container exits, its associated thin device is removed. If
-that device has leaked into some other mount namespace and can't be removed,
-the container exit still succeeds and this option causes the system to schedule
-the device for deferred removal. It does not wait in a loop trying to remove a
-busy device.
-
-Example use: `dockerd --storage-opt dm.use_deferred_removal=true`
-
-#### dm.use_deferred_deletion
-
-Enables use of deferred device deletion for thin pool devices. By default,
-thin pool device deletion is synchronous. Before a container is deleted, the
-Docker daemon removes any associated devices. If the storage driver can not
-remove a device, the container deletion fails and daemon returns.
-
-`Error deleting container: Error response from daemon: Cannot destroy container`
-
-To avoid this failure, enable both deferred device deletion and deferred
-device removal on the daemon.
-
-`dockerd --storage-opt dm.use_deferred_deletion=true --storage-opt dm.use_deferred_removal=true`
-
-With these two options enabled, if a device is busy when the driver is
-deleting a container, the driver marks the device as deleted. Later, when the
-device isn't in use, the driver deletes it.
-
-In general it should be safe to enable this option by default. It will help
-when unintentional leaking of mount point happens across multiple mount
-namespaces.
-
-#### dm.loopdatasize
-
-**Note**: This option configures devicemapper loopback, which should not be
-used in production.
-
-Specifies the size to use when creating the loopback file for the "data" device
-which is used for the thin pool. The default size is 100G. The file is sparse,
-so it will not initially take up this much space.
-
-Example use: `dockerd --storage-opt dm.loopdatasize=200G`
-
-#### dm.loopmetadatasize
-
-**Note**: This option configures devicemapper loopback, which should not be
-used in production.
-
-Specifies the size to use when creating the loopback file for the "metadata"
-device which is used for the thin pool. The default size is 2G. The file is
-sparse, so it will not initially take up this much space.
-
-Example use: `dockerd --storage-opt dm.loopmetadatasize=4G`
-
-#### dm.datadev
-
-(Deprecated, use `dm.thinpooldev`)
-
-Specifies a custom blockdevice to use for data for a Docker-managed thin pool.
-It is better to use `dm.thinpooldev` - see the documentation for it above for
-discussion of the advantages.
-
-#### dm.metadatadev
-
-(Deprecated, use `dm.thinpooldev`)
-
-Specifies a custom blockdevice to use for metadata for a Docker-managed thin
-pool.  See `dm.datadev` for why this is deprecated.
-
-#### dm.blocksize
-
-Specifies a custom blocksize to use for the thin pool.  The default
-blocksize is 64K.
-
-Example use: `dockerd --storage-opt dm.blocksize=512K`
-
-#### dm.blkdiscard
-
-Enables or disables the use of `blkdiscard` when removing devicemapper devices.
-This is disabled by default due to the additional latency, but as a special
-case with loopback devices it will be enabled, in order to re-sparsify the
-loopback file on image/container removal.
-
-Disabling this on loopback can lead to *much* faster container removal times,
-but it also prevents the space used in `/var/lib/docker` directory from being
-returned to the system for other use when containers are removed.
-
-Example use: `dockerd --storage-opt dm.blkdiscard=false`
-
-#### dm.override_udev_sync_check
-
-By default, the devicemapper backend attempts to synchronize with the `udev`
-device manager for the Linux kernel.  This option allows disabling that
-synchronization, to continue even though the configuration may be buggy.
-
-To view the `udev` sync support of a Docker daemon that is using the
-`devicemapper` driver, run:
-
-        $ docker info
-        [...]
-         Udev Sync Supported: true
-        [...]
-
-When `udev` sync support is `true`, then `devicemapper` and `udev` can
-coordinate the activation and deactivation of devices for containers.
-
-When `udev` sync support is `false`, a race condition occurs between the
-`devicemapper` and `udev` during create and cleanup. The race condition results
-in errors and failures. (For information on these failures, see
-[docker#4036](https://github.com/docker/docker/issues/4036))
-
-To allow the `docker` daemon to start, regardless of whether `udev` sync is
-`false`, set `dm.override_udev_sync_check` to true:
-
-        $ dockerd --storage-opt dm.override_udev_sync_check=true
-
-When this value is `true`, the driver continues and simply warns you the errors
-are happening.
-
-**Note**: The ideal is to pursue a `docker` daemon and environment that does
-support synchronizing with `udev`. For further discussion on this topic, see
-[docker#4036](https://github.com/docker/docker/issues/4036).
-Otherwise, set this flag for migrating existing Docker daemons to a daemon with
-a supported environment.
-
-#### dm.min_free_space
-
-Specifies the min free space percent in a thin pool require for new device
-creation to succeed. This check applies to both free data space as well
-as free metadata space. Valid values are from 0% - 99%. Value 0% disables
-free space checking logic. If user does not specify a value for this option,
-the Engine uses a default value of 10%.
-
-Whenever a new a thin pool device is created (during `docker pull` or during
-container creation), the Engine checks if the minimum free space is available.
-If the space is unavailable, then device creation fails and any relevant
-`docker` operation fails.
-
-To recover from this error, you must create more free space in the thin pool to
-recover from the error. You can create free space by deleting some images and
-containers from tge thin pool. You can also add more storage to the thin pool.
-
-To add more space to an LVM (logical volume management) thin pool, just add
-more storage to the  group container thin pool; this should automatically
-resolve any errors. If your configuration uses loop devices, then stop the
-Engine daemon, grow the size of loop files and restart the daemon to resolve
-the issue.
-
-Example use:: `dockerd --storage-opt dm.min_free_space=10%`
-
-#### dm.xfs_nospace_max_retries
-
-Specifies the maximum number of retries XFS should attempt to complete IO when
-ENOSPC (no space) error is returned by underlying storage device.
-
-By default XFS retries infinitely for IO to finish and this can result in
-unkillable process. To change this behavior one can set xfs_nospace_max_retries
-to say 0 and XFS will not retry IO after getting ENOSPC and will shutdown
-filesystem.
-
-Example use:
-
-    $ sudo dockerd --storage-opt dm.xfs_nospace_max_retries=0
-
-
-## ZFS options
-
-#### zfs.fsname
-
-Set zfs filesystem under which docker will create its own datasets.  By default
-docker will pick up the zfs filesystem where docker graph (`/var/lib/docker`)
-is located.
-
-Example use: `dockerd -s zfs --storage-opt zfs.fsname=zroot/docker`
-
-## Btrfs options
-
-#### btrfs.min_space
-
-Specifies the mininum size to use when creating the subvolume which is used for
-containers. If user uses disk quota for btrfs when creating or running a
-container with **--storage-opt size** option, docker should ensure the **size**
-cannot be smaller than **btrfs.min_space**.
-
-Example use: `docker daemon -s btrfs --storage-opt btrfs.min_space=10G`
-
-# CLUSTER STORE OPTIONS
-
-The daemon uses libkv to advertise the node within the cluster.  Some Key/Value
-backends support mutual TLS, and the client TLS settings used by the daemon can
-be configured using the **--cluster-store-opt** flag, specifying the paths to
-PEM encoded files.
-
-#### kv.cacertfile
-
-Specifies the path to a local file with PEM encoded CA certificates to trust
-
-#### kv.certfile
-
-Specifies the path to a local file with a PEM encoded certificate.  This
-certificate is used as the client cert for communication with the Key/Value
-store.
-
-#### kv.keyfile
-
-Specifies the path to a local file with a PEM encoded private key.  This
-private key is used as the client key for communication with the Key/Value
-store.
-
-# Access authorization
-
-Docker's access authorization can be extended by authorization plugins that
-your organization can purchase or build themselves. You can install one or more
-authorization plugins when you start the Docker `daemon` using the
-`--authorization-plugin=PLUGIN_ID` option.
-
-```bash
-dockerd --authorization-plugin=plugin1 --authorization-plugin=plugin2,...
-```
-
-The `PLUGIN_ID` value is either the plugin's name or a path to its
-specification file. The plugin's implementation determines whether you can
-specify a name or path. Consult with your Docker administrator to get
-information about the plugins available to you.
-
-Once a plugin is installed, requests made to the `daemon` through the command
-line or Docker's Engine API are allowed or denied by the plugin.  If you have
-multiple plugins installed, at least one must allow the request for it to
-complete.
-
-For information about how to create an authorization plugin, see [authorization
-plugin](https://docs.docker.com/engine/extend/authorization/) section in the
-Docker extend section of this documentation.
-
-
-# HISTORY
-Sept 2015, Originally compiled by Shishir Mahajan <shishir.mahajan@redhat.com>
-based on docker.com source material and internal work.
diff --git a/installer/vendor/github.com/docker/docker/man/generate.go b/installer/vendor/github.com/docker/docker/man/generate.go
deleted file mode 100644
index f21614d94a..0000000000
--- a/installer/vendor/github.com/docker/docker/man/generate.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/docker/docker/cli/command"
-	"github.com/docker/docker/cli/command/commands"
-	"github.com/docker/docker/pkg/term"
-	"github.com/spf13/cobra"
-	"github.com/spf13/cobra/doc"
-)
-
-func generateManPages(path string) error {
-	header := &doc.GenManHeader{
-		Title:   "DOCKER",
-		Section: "1",
-		Source:  "Docker Community",
-	}
-
-	stdin, stdout, stderr := term.StdStreams()
-	dockerCli := command.NewDockerCli(stdin, stdout, stderr)
-	cmd := &cobra.Command{Use: "docker"}
-	commands.AddCommands(cmd, dockerCli)
-
-	cmd.DisableAutoGenTag = true
-	return doc.GenManTreeFromOpts(cmd, doc.GenManTreeOptions{
-		Header:           header,
-		Path:             path,
-		CommandSeparator: "-",
-	})
-}
-
-func main() {
-	path := "/tmp"
-	if len(os.Args) > 1 {
-		path = os.Args[1]
-	}
-	fmt.Printf("Generating man pages into %s\n", path)
-	if err := generateManPages(path); err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to generate man pages: %s\n", err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/man/generate.sh b/installer/vendor/github.com/docker/docker/man/generate.sh
deleted file mode 100755
index e4126ba4ac..0000000000
--- a/installer/vendor/github.com/docker/docker/man/generate.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-#
-# Generate man pages for docker/docker
-#
-
-set -eu
-
-mkdir -p ./man/man1
-
-# Generate man pages from cobra commands
-go build -o /tmp/gen-manpages ./man
-/tmp/gen-manpages ./man/man1
-
-# Generate legacy pages from markdown
-./man/md2man-all.sh -q
diff --git a/installer/vendor/github.com/docker/docker/man/glide.lock b/installer/vendor/github.com/docker/docker/man/glide.lock
deleted file mode 100644
index 5ec765a4c6..0000000000
--- a/installer/vendor/github.com/docker/docker/man/glide.lock
+++ /dev/null
@@ -1,52 +0,0 @@
-hash: ead3ea293a6143fe41069ebec814bf197d8c43a92cc7666b1f7e21a419b46feb
-updated: 2016-06-20T21:53:35.420817456Z
-imports:
-- name: github.com/BurntSushi/toml
-  version: f0aeabca5a127c4078abb8c8d64298b147264b55
-- name: github.com/cpuguy83/go-md2man
-  version: a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
-  subpackages:
-  - md2man
-- name: github.com/fsnotify/fsnotify
-  version: 30411dbcefb7a1da7e84f75530ad3abe4011b4f8
-- name: github.com/hashicorp/hcl
-  version: da486364306ed66c218be9b7953e19173447c18b
-  subpackages:
-  - hcl/ast
-  - hcl/parser
-  - hcl/token
-  - json/parser
-  - hcl/scanner
-  - hcl/strconv
-  - json/scanner
-  - json/token
-- name: github.com/inconshreveable/mousetrap
-  version: 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-- name: github.com/magiconair/properties
-  version: c265cfa48dda6474e208715ca93e987829f572f8
-- name: github.com/mitchellh/mapstructure
-  version: d2dd0262208475919e1a362f675cfc0e7c10e905
-- name: github.com/russross/blackfriday
-  version: 1d6b8e9301e720b08a8938b8c25c018285885438
-- name: github.com/shurcooL/sanitized_anchor_name
-  version: 10ef21a441db47d8b13ebcc5fd2310f636973c77
-- name: github.com/spf13/cast
-  version: 27b586b42e29bec072fe7379259cc719e1289da6
-- name: github.com/spf13/jwalterweatherman
-  version: 33c24e77fb80341fe7130ee7c594256ff08ccc46
-- name: github.com/spf13/pflag
-  version: dabebe21bf790f782ea4c7bbd2efc430de182afd
-- name: github.com/spf13/viper
-  version: c1ccc378a054ea8d4e38d8c67f6938d4760b53dd
-- name: golang.org/x/sys
-  version: 62bee037599929a6e9146f29d10dd5208c43507d
-  subpackages:
-  - unix
-- name: gopkg.in/yaml.v2
-  version: a83829b6f1293c91addabc89d0571c246397bbf4
-- name: github.com/spf13/cobra
-  repo: https://github.com/dnephin/cobra
-  subpackages:
-  - doc
-  version: v1.3
-devImports: []
diff --git a/installer/vendor/github.com/docker/docker/man/glide.yaml b/installer/vendor/github.com/docker/docker/man/glide.yaml
deleted file mode 100644
index e99b2670d8..0000000000
--- a/installer/vendor/github.com/docker/docker/man/glide.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-package: github.com/docker/docker/man
-import:
-- package: github.com/cpuguy83/go-md2man
-  subpackages:
-  - md2man
-- package: github.com/inconshreveable/mousetrap
-- package: github.com/spf13/pflag
-- package: github.com/spf13/viper
-- package: github.com/spf13/cobra
-  repo: https://github.com/dnephin/cobra
-  subpackages:
-  - doc
diff --git a/installer/vendor/github.com/docker/docker/man/md2man-all.sh b/installer/vendor/github.com/docker/docker/man/md2man-all.sh
deleted file mode 100755
index 97c65c93bc..0000000000
--- a/installer/vendor/github.com/docker/docker/man/md2man-all.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-set -e
-
-# get into this script's directory
-cd "$(dirname "$(readlink -f "$BASH_SOURCE")")"
-
-[ "$1" = '-q' ] || {
-	set -x
-	pwd
-}
-
-for FILE in *.md; do
-	base="$(basename "$FILE")"
-	name="${base%.md}"
-	num="${name##*.}"
-	if [ -z "$num" -o "$name" = "$num" ]; then
-		# skip files that aren't of the format xxxx.N.md (like README.md)
-		continue
-	fi
-	mkdir -p "./man${num}"
-	go-md2man -in "$FILE" -out "./man${num}/${name}"
-done
diff --git a/installer/vendor/github.com/docker/docker/migrate/v1/migratev1.go b/installer/vendor/github.com/docker/docker/migrate/v1/migratev1.go
deleted file mode 100644
index bc42dd2ca4..0000000000
--- a/installer/vendor/github.com/docker/docker/migrate/v1/migratev1.go
+++ /dev/null
@@ -1,504 +0,0 @@
-package v1
-
-import (
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"sync"
-	"time"
-
-	"encoding/json"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/image"
-	imagev1 "github.com/docker/docker/image/v1"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/reference"
-)
-
-type graphIDRegistrar interface {
-	RegisterByGraphID(string, layer.ChainID, layer.DiffID, string, int64) (layer.Layer, error)
-	Release(layer.Layer) ([]layer.Metadata, error)
-}
-
-type graphIDMounter interface {
-	CreateRWLayerByGraphID(string, string, layer.ChainID) error
-}
-
-type checksumCalculator interface {
-	ChecksumForGraphID(id, parent, oldTarDataPath, newTarDataPath string) (diffID layer.DiffID, size int64, err error)
-}
-
-const (
-	graphDirName                 = "graph"
-	tarDataFileName              = "tar-data.json.gz"
-	migrationFileName            = ".migration-v1-images.json"
-	migrationTagsFileName        = ".migration-v1-tags"
-	migrationDiffIDFileName      = ".migration-diffid"
-	migrationSizeFileName        = ".migration-size"
-	migrationTarDataFileName     = ".migration-tardata"
-	containersDirName            = "containers"
-	configFileNameLegacy         = "config.json"
-	configFileName               = "config.v2.json"
-	repositoriesFilePrefixLegacy = "repositories-"
-)
-
-var (
-	errUnsupported = errors.New("migration is not supported")
-)
-
-// Migrate takes an old graph directory and transforms the metadata into the
-// new format.
-func Migrate(root, driverName string, ls layer.Store, is image.Store, rs reference.Store, ms metadata.Store) error {
-	graphDir := filepath.Join(root, graphDirName)
-	if _, err := os.Lstat(graphDir); os.IsNotExist(err) {
-		return nil
-	}
-
-	mappings, err := restoreMappings(root)
-	if err != nil {
-		return err
-	}
-
-	if cc, ok := ls.(checksumCalculator); ok {
-		CalculateLayerChecksums(root, cc, mappings)
-	}
-
-	if registrar, ok := ls.(graphIDRegistrar); !ok {
-		return errUnsupported
-	} else if err := migrateImages(root, registrar, is, ms, mappings); err != nil {
-		return err
-	}
-
-	err = saveMappings(root, mappings)
-	if err != nil {
-		return err
-	}
-
-	if mounter, ok := ls.(graphIDMounter); !ok {
-		return errUnsupported
-	} else if err := migrateContainers(root, mounter, is, mappings); err != nil {
-		return err
-	}
-
-	if err := migrateRefs(root, driverName, rs, mappings); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// CalculateLayerChecksums walks an old graph directory and calculates checksums
-// for each layer. These checksums are later used for migration.
-func CalculateLayerChecksums(root string, ls checksumCalculator, mappings map[string]image.ID) {
-	graphDir := filepath.Join(root, graphDirName)
-	// spawn some extra workers also for maximum performance because the process is bounded by both cpu and io
-	workers := runtime.NumCPU() * 3
-	workQueue := make(chan string, workers)
-
-	wg := sync.WaitGroup{}
-
-	for i := 0; i < workers; i++ {
-		wg.Add(1)
-		go func() {
-			for id := range workQueue {
-				start := time.Now()
-				if err := calculateLayerChecksum(graphDir, id, ls); err != nil {
-					logrus.Errorf("could not calculate checksum for %q, %q", id, err)
-				}
-				elapsed := time.Since(start)
-				logrus.Debugf("layer %s took %.2f seconds", id, elapsed.Seconds())
-			}
-			wg.Done()
-		}()
-	}
-
-	dir, err := ioutil.ReadDir(graphDir)
-	if err != nil {
-		logrus.Errorf("could not read directory %q", graphDir)
-		return
-	}
-	for _, v := range dir {
-		v1ID := v.Name()
-		if err := imagev1.ValidateID(v1ID); err != nil {
-			continue
-		}
-		if _, ok := mappings[v1ID]; ok { // support old migrations without helper files
-			continue
-		}
-		workQueue <- v1ID
-	}
-	close(workQueue)
-	wg.Wait()
-}
-
-func calculateLayerChecksum(graphDir, id string, ls checksumCalculator) error {
-	diffIDFile := filepath.Join(graphDir, id, migrationDiffIDFileName)
-	if _, err := os.Lstat(diffIDFile); err == nil {
-		return nil
-	} else if !os.IsNotExist(err) {
-		return err
-	}
-
-	parent, err := getParent(filepath.Join(graphDir, id))
-	if err != nil {
-		return err
-	}
-
-	diffID, size, err := ls.ChecksumForGraphID(id, parent, filepath.Join(graphDir, id, tarDataFileName), filepath.Join(graphDir, id, migrationTarDataFileName))
-	if err != nil {
-		return err
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(graphDir, id, migrationSizeFileName), []byte(strconv.Itoa(int(size))), 0600); err != nil {
-		return err
-	}
-
-	if err := ioutils.AtomicWriteFile(filepath.Join(graphDir, id, migrationDiffIDFileName), []byte(diffID), 0600); err != nil {
-		return err
-	}
-
-	logrus.Infof("calculated checksum for layer %s: %s", id, diffID)
-	return nil
-}
-
-func restoreMappings(root string) (map[string]image.ID, error) {
-	mappings := make(map[string]image.ID)
-
-	mfile := filepath.Join(root, migrationFileName)
-	f, err := os.Open(mfile)
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	} else if err == nil {
-		err := json.NewDecoder(f).Decode(&mappings)
-		if err != nil {
-			f.Close()
-			return nil, err
-		}
-		f.Close()
-	}
-
-	return mappings, nil
-}
-
-func saveMappings(root string, mappings map[string]image.ID) error {
-	mfile := filepath.Join(root, migrationFileName)
-	f, err := os.OpenFile(mfile, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := json.NewEncoder(f).Encode(mappings); err != nil {
-		return err
-	}
-	return nil
-}
-
-func migrateImages(root string, ls graphIDRegistrar, is image.Store, ms metadata.Store, mappings map[string]image.ID) error {
-	graphDir := filepath.Join(root, graphDirName)
-
-	dir, err := ioutil.ReadDir(graphDir)
-	if err != nil {
-		return err
-	}
-	for _, v := range dir {
-		v1ID := v.Name()
-		if err := imagev1.ValidateID(v1ID); err != nil {
-			continue
-		}
-		if _, exists := mappings[v1ID]; exists {
-			continue
-		}
-		if err := migrateImage(v1ID, root, ls, is, ms, mappings); err != nil {
-			continue
-		}
-	}
-
-	return nil
-}
-
-func migrateContainers(root string, ls graphIDMounter, is image.Store, imageMappings map[string]image.ID) error {
-	containersDir := filepath.Join(root, containersDirName)
-	dir, err := ioutil.ReadDir(containersDir)
-	if err != nil {
-		return err
-	}
-	for _, v := range dir {
-		id := v.Name()
-
-		if _, err := os.Stat(filepath.Join(containersDir, id, configFileName)); err == nil {
-			continue
-		}
-
-		containerJSON, err := ioutil.ReadFile(filepath.Join(containersDir, id, configFileNameLegacy))
-		if err != nil {
-			logrus.Errorf("migrate container error: %v", err)
-			continue
-		}
-
-		var c map[string]*json.RawMessage
-		if err := json.Unmarshal(containerJSON, &c); err != nil {
-			logrus.Errorf("migrate container error: %v", err)
-			continue
-		}
-
-		imageStrJSON, ok := c["Image"]
-		if !ok {
-			return fmt.Errorf("invalid container configuration for %v", id)
-		}
-
-		var image string
-		if err := json.Unmarshal([]byte(*imageStrJSON), &image); err != nil {
-			logrus.Errorf("migrate container error: %v", err)
-			continue
-		}
-
-		imageID, ok := imageMappings[image]
-		if !ok {
-			logrus.Errorf("image not migrated %v", imageID) // non-fatal error
-			continue
-		}
-
-		c["Image"] = rawJSON(imageID)
-
-		containerJSON, err = json.Marshal(c)
-		if err != nil {
-			return err
-		}
-
-		if err := ioutil.WriteFile(filepath.Join(containersDir, id, configFileName), containerJSON, 0600); err != nil {
-			return err
-		}
-
-		img, err := is.Get(imageID)
-		if err != nil {
-			return err
-		}
-
-		if err := ls.CreateRWLayerByGraphID(id, id, img.RootFS.ChainID()); err != nil {
-			logrus.Errorf("migrate container error: %v", err)
-			continue
-		}
-
-		logrus.Infof("migrated container %s to point to %s", id, imageID)
-
-	}
-	return nil
-}
-
-type refAdder interface {
-	AddTag(ref reference.Named, id digest.Digest, force bool) error
-	AddDigest(ref reference.Canonical, id digest.Digest, force bool) error
-}
-
-func migrateRefs(root, driverName string, rs refAdder, mappings map[string]image.ID) error {
-	migrationFile := filepath.Join(root, migrationTagsFileName)
-	if _, err := os.Lstat(migrationFile); !os.IsNotExist(err) {
-		return err
-	}
-
-	type repositories struct {
-		Repositories map[string]map[string]string
-	}
-
-	var repos repositories
-
-	f, err := os.Open(filepath.Join(root, repositoriesFilePrefixLegacy+driverName))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	defer f.Close()
-	if err := json.NewDecoder(f).Decode(&repos); err != nil {
-		return err
-	}
-
-	for name, repo := range repos.Repositories {
-		for tag, id := range repo {
-			if strongID, exists := mappings[id]; exists {
-				ref, err := reference.WithName(name)
-				if err != nil {
-					logrus.Errorf("migrate tags: invalid name %q, %q", name, err)
-					continue
-				}
-				if dgst, err := digest.ParseDigest(tag); err == nil {
-					canonical, err := reference.WithDigest(reference.TrimNamed(ref), dgst)
-					if err != nil {
-						logrus.Errorf("migrate tags: invalid digest %q, %q", dgst, err)
-						continue
-					}
-					if err := rs.AddDigest(canonical, strongID.Digest(), false); err != nil {
-						logrus.Errorf("can't migrate digest %q for %q, err: %q", ref.String(), strongID, err)
-					}
-				} else {
-					tagRef, err := reference.WithTag(ref, tag)
-					if err != nil {
-						logrus.Errorf("migrate tags: invalid tag %q, %q", tag, err)
-						continue
-					}
-					if err := rs.AddTag(tagRef, strongID.Digest(), false); err != nil {
-						logrus.Errorf("can't migrate tag %q for %q, err: %q", ref.String(), strongID, err)
-					}
-				}
-				logrus.Infof("migrated tag %s:%s to point to %s", name, tag, strongID)
-			}
-		}
-	}
-
-	mf, err := os.Create(migrationFile)
-	if err != nil {
-		return err
-	}
-	mf.Close()
-
-	return nil
-}
-
-func getParent(confDir string) (string, error) {
-	jsonFile := filepath.Join(confDir, "json")
-	imageJSON, err := ioutil.ReadFile(jsonFile)
-	if err != nil {
-		return "", err
-	}
-	var parent struct {
-		Parent   string
-		ParentID digest.Digest `json:"parent_id"`
-	}
-	if err := json.Unmarshal(imageJSON, &parent); err != nil {
-		return "", err
-	}
-	if parent.Parent == "" && parent.ParentID != "" { // v1.9
-		parent.Parent = parent.ParentID.Hex()
-	}
-	// compatibilityID for parent
-	parentCompatibilityID, err := ioutil.ReadFile(filepath.Join(confDir, "parent"))
-	if err == nil && len(parentCompatibilityID) > 0 {
-		parent.Parent = string(parentCompatibilityID)
-	}
-	return parent.Parent, nil
-}
-
-func migrateImage(id, root string, ls graphIDRegistrar, is image.Store, ms metadata.Store, mappings map[string]image.ID) (err error) {
-	defer func() {
-		if err != nil {
-			logrus.Errorf("migration failed for %v, err: %v", id, err)
-		}
-	}()
-
-	parent, err := getParent(filepath.Join(root, graphDirName, id))
-	if err != nil {
-		return err
-	}
-
-	var parentID image.ID
-	if parent != "" {
-		var exists bool
-		if parentID, exists = mappings[parent]; !exists {
-			if err := migrateImage(parent, root, ls, is, ms, mappings); err != nil {
-				// todo: fail or allow broken chains?
-				return err
-			}
-			parentID = mappings[parent]
-		}
-	}
-
-	rootFS := image.NewRootFS()
-	var history []image.History
-
-	if parentID != "" {
-		parentImg, err := is.Get(parentID)
-		if err != nil {
-			return err
-		}
-
-		rootFS = parentImg.RootFS
-		history = parentImg.History
-	}
-
-	diffIDData, err := ioutil.ReadFile(filepath.Join(root, graphDirName, id, migrationDiffIDFileName))
-	if err != nil {
-		return err
-	}
-	diffID, err := digest.ParseDigest(string(diffIDData))
-	if err != nil {
-		return err
-	}
-
-	sizeStr, err := ioutil.ReadFile(filepath.Join(root, graphDirName, id, migrationSizeFileName))
-	if err != nil {
-		return err
-	}
-	size, err := strconv.ParseInt(string(sizeStr), 10, 64)
-	if err != nil {
-		return err
-	}
-
-	layer, err := ls.RegisterByGraphID(id, rootFS.ChainID(), layer.DiffID(diffID), filepath.Join(root, graphDirName, id, migrationTarDataFileName), size)
-	if err != nil {
-		return err
-	}
-	logrus.Infof("migrated layer %s to %s", id, layer.DiffID())
-
-	jsonFile := filepath.Join(root, graphDirName, id, "json")
-	imageJSON, err := ioutil.ReadFile(jsonFile)
-	if err != nil {
-		return err
-	}
-
-	h, err := imagev1.HistoryFromConfig(imageJSON, false)
-	if err != nil {
-		return err
-	}
-	history = append(history, h)
-
-	rootFS.Append(layer.DiffID())
-
-	config, err := imagev1.MakeConfigFromV1Config(imageJSON, rootFS, history)
-	if err != nil {
-		return err
-	}
-	strongID, err := is.Create(config)
-	if err != nil {
-		return err
-	}
-	logrus.Infof("migrated image %s to %s", id, strongID)
-
-	if parentID != "" {
-		if err := is.SetParent(strongID, parentID); err != nil {
-			return err
-		}
-	}
-
-	checksum, err := ioutil.ReadFile(filepath.Join(root, graphDirName, id, "checksum"))
-	if err == nil { // best effort
-		dgst, err := digest.ParseDigest(string(checksum))
-		if err == nil {
-			V2MetadataService := metadata.NewV2MetadataService(ms)
-			V2MetadataService.Add(layer.DiffID(), metadata.V2Metadata{Digest: dgst})
-		}
-	}
-	_, err = ls.Release(layer)
-	if err != nil {
-		return err
-	}
-
-	mappings[id] = strongID
-	return
-}
-
-func rawJSON(value interface{}) *json.RawMessage {
-	jsonval, err := json.Marshal(value)
-	if err != nil {
-		return nil
-	}
-	return (*json.RawMessage)(&jsonval)
-}
diff --git a/installer/vendor/github.com/docker/docker/migrate/v1/migratev1_test.go b/installer/vendor/github.com/docker/docker/migrate/v1/migratev1_test.go
deleted file mode 100644
index be82fdc75e..0000000000
--- a/installer/vendor/github.com/docker/docker/migrate/v1/migratev1_test.go
+++ /dev/null
@@ -1,438 +0,0 @@
-package v1
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/distribution/metadata"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/reference"
-)
-
-func TestMigrateRefs(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "migrate-tags")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	ioutil.WriteFile(filepath.Join(tmpdir, "repositories-generic"), []byte(`{"Repositories":{"busybox":{"latest":"b3ca410aa2c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108","sha256:16a2a52884c2a9481ed267c2d46483eac7693b813a63132368ab098a71303f8a":"b3ca410aa2c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108"},"registry":{"2":"5d165b8e4b203685301c815e95663231691d383fd5e3d3185d1ce3f8dddead3d","latest":"8d5547a9f329b1d3f93198cd661fb5117e5a96b721c5cf9a2c389e7dd4877128"}}}`), 0600)
-
-	ta := &mockTagAdder{}
-	err = migrateRefs(tmpdir, "generic", ta, map[string]image.ID{
-		"5d165b8e4b203685301c815e95663231691d383fd5e3d3185d1ce3f8dddead3d": image.ID("sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"),
-		"b3ca410aa2c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108": image.ID("sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"),
-		"abcdef3434c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108": image.ID("sha256:56434342345ae68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae"),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := map[string]string{
-		"busybox:latest": "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9",
-		"busybox@sha256:16a2a52884c2a9481ed267c2d46483eac7693b813a63132368ab098a71303f8a": "sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9",
-		"registry:2": "sha256:2c26b46b68ffc68ff99b453c1d30413413422d706483bfa0f98a5e886266e7ae",
-	}
-
-	if !reflect.DeepEqual(expected, ta.refs) {
-		t.Fatalf("Invalid migrated tags: expected %q, got %q", expected, ta.refs)
-	}
-
-	// second migration is no-op
-	ioutil.WriteFile(filepath.Join(tmpdir, "repositories-generic"), []byte(`{"Repositories":{"busybox":{"latest":"b3ca410aa2c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108"`), 0600)
-	err = migrateRefs(tmpdir, "generic", ta, map[string]image.ID{
-		"b3ca410aa2c115c05969a7b2c8cf8a9fcf62c1340ed6a601c9ee50df337ec108": image.ID("sha256:fcde2b2edba56bf408601fb721fe9b5c338d10ee429ea04fae5511b68fbf8fb9"),
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(expected, ta.refs) {
-		t.Fatalf("Invalid migrated tags: expected %q, got %q", expected, ta.refs)
-	}
-}
-
-func TestMigrateContainers(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	if runtime.GOARCH != "amd64" {
-		t.Skip("Test tailored to amd64 architecture")
-	}
-	tmpdir, err := ioutil.TempDir("", "migrate-containers")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	err = addContainer(tmpdir, `{"State":{"Running":false,"Paused":false,"Restarting":false,"OOMKilled":false,"Dead":false,"Pid":0,"ExitCode":0,"Error":"","StartedAt":"2015-11-10T21:42:40.604267436Z","FinishedAt":"2015-11-10T21:42:41.869265487Z"},"ID":"f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c","Created":"2015-11-10T21:42:40.433831551Z","Path":"sh","Args":[],"Config":{"Hostname":"f780ee3f80e6","Domainname":"","User":"","AttachStdin":true,"AttachStdout":true,"AttachStderr":true,"Tty":true,"OpenStdin":true,"StdinOnce":true,"Env":null,"Cmd":["sh"],"Image":"busybox","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":{}},"Image":"2c5ac3f849df8627fcf2822727f87c57f38b7129d3604fbc11d861fe856ff093","NetworkSettings":{"Bridge":"","EndpointID":"","Gateway":"","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"HairpinMode":false,"IPAddress":"","IPPrefixLen":0,"IPv6Gateway":"","LinkLocalIPv6Address":"","LinkLocalIPv6PrefixLen":0,"MacAddress":"","NetworkID":"","PortMapping":null,"Ports":null,"SandboxKey":"","SecondaryIPAddresses":null,"SecondaryIPv6Addresses":null},"ResolvConfPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/resolv.conf","HostnamePath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/hostname","HostsPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/hosts","LogPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c-json.log","Name":"/determined_euclid","Driver":"overlay","ExecDriver":"native-0.2","MountLabel":"","ProcessLabel":"","RestartCount":0,"UpdateDns":false,"HasBeenStartedBefore":false,"MountPoints":{},"Volumes":{},"VolumesRW":{},"AppArmorProfile":""}`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// container with invalid image
-	err = addContainer(tmpdir, `{"State":{"Running":false,"Paused":false,"Restarting":false,"OOMKilled":false,"Dead":false,"Pid":0,"ExitCode":0,"Error":"","StartedAt":"2015-11-10T21:42:40.604267436Z","FinishedAt":"2015-11-10T21:42:41.869265487Z"},"ID":"e780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c","Created":"2015-11-10T21:42:40.433831551Z","Path":"sh","Args":[],"Config":{"Hostname":"f780ee3f80e6","Domainname":"","User":"","AttachStdin":true,"AttachStdout":true,"AttachStderr":true,"Tty":true,"OpenStdin":true,"StdinOnce":true,"Env":null,"Cmd":["sh"],"Image":"busybox","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":{}},"Image":"4c5ac3f849df8627fcf2822727f87c57f38b7129d3604fbc11d861fe856ff093","NetworkSettings":{"Bridge":"","EndpointID":"","Gateway":"","GlobalIPv6Address":"","GlobalIPv6PrefixLen":0,"HairpinMode":false,"IPAddress":"","IPPrefixLen":0,"IPv6Gateway":"","LinkLocalIPv6Address":"","LinkLocalIPv6PrefixLen":0,"MacAddress":"","NetworkID":"","PortMapping":null,"Ports":null,"SandboxKey":"","SecondaryIPAddresses":null,"SecondaryIPv6Addresses":null},"ResolvConfPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/resolv.conf","HostnamePath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/hostname","HostsPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/hosts","LogPath":"/var/lib/docker/containers/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c/f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c-json.log","Name":"/determined_euclid","Driver":"overlay","ExecDriver":"native-0.2","MountLabel":"","ProcessLabel":"","RestartCount":0,"UpdateDns":false,"HasBeenStartedBefore":false,"MountPoints":{},"Volumes":{},"VolumesRW":{},"AppArmorProfile":""}`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ls := &mockMounter{}
-
-	ifs, err := image.NewFSStoreBackend(filepath.Join(tmpdir, "imagedb"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := image.NewImageStore(ifs, ls)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	imgID, err := is.Create([]byte(`{"architecture":"amd64","config":{"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Cmd":["sh"],"Entrypoint":null,"Env":null,"Hostname":"23304fc829f9","Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Labels":null,"OnBuild":null,"OpenStdin":false,"StdinOnce":false,"Tty":false,"Volumes":null,"WorkingDir":"","Domainname":"","User":""},"container":"349b014153779e30093d94f6df2a43c7a0a164e05aa207389917b540add39b51","container_config":{"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Cmd":["/bin/sh","-c","#(nop) CMD [\"sh\"]"],"Entrypoint":null,"Env":null,"Hostname":"23304fc829f9","Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Labels":null,"OnBuild":null,"OpenStdin":false,"StdinOnce":false,"Tty":false,"Volumes":null,"WorkingDir":"","Domainname":"","User":""},"created":"2015-10-31T22:22:55.613815829Z","docker_version":"1.8.2","history":[{"created":"2015-10-31T22:22:54.690851953Z","created_by":"/bin/sh -c #(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"},{"created":"2015-10-31T22:22:55.613815829Z","created_by":"/bin/sh -c #(nop) CMD [\"sh\"]"}],"os":"linux","rootfs":{"type":"layers","diff_ids":["sha256:c6f988f4874bb0add23a778f753c65efe992244e148a1d2ec2a8b664fb66bbd1","sha256:5f70bf18a086007016e948b04aed3b82103a36bea41755b6cddfaf10ace3c6ef"]}}`))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = migrateContainers(tmpdir, ls, is, map[string]image.ID{
-		"2c5ac3f849df8627fcf2822727f87c57f38b7129d3604fbc11d861fe856ff093": imgID,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := []mountInfo{{
-		"f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c",
-		"f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c",
-		"sha256:c3191d32a37d7159b2e30830937d2e30268ad6c375a773a8994911a3aba9b93f",
-	}}
-	if !reflect.DeepEqual(expected, ls.mounts) {
-		t.Fatalf("invalid mounts: expected %q, got %q", expected, ls.mounts)
-	}
-
-	if actual, expected := ls.count, 0; actual != expected {
-		t.Fatalf("invalid active mounts: expected %d, got %d", expected, actual)
-	}
-
-	config2, err := ioutil.ReadFile(filepath.Join(tmpdir, "containers", "f780ee3f80e66e9b432a57049597118a66aab8932be88e5628d4c824edbee37c", "config.v2.json"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	var config struct{ Image string }
-	err = json.Unmarshal(config2, &config)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if actual, expected := config.Image, string(imgID); actual != expected {
-		t.Fatalf("invalid image pointer in migrated config: expected %q, got %q", expected, actual)
-	}
-
-}
-
-func TestMigrateImages(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	if runtime.GOARCH != "amd64" {
-		t.Skip("Test tailored to amd64 architecture")
-	}
-	tmpdir, err := ioutil.TempDir("", "migrate-images")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	// busybox from 1.9
-	id1, err := addImage(tmpdir, `{"architecture":"amd64","config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"container":"23304fc829f9b9349416f6eb1afec162907eba3a328f51d53a17f8986f865d65","container_config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"],"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2015-10-31T22:22:54.690851953Z","docker_version":"1.8.2","layer_id":"sha256:55dc925c23d1ed82551fd018c27ac3ee731377b6bad3963a2a4e76e753d70e57","os":"linux"}`, "", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	id2, err := addImage(tmpdir, `{"architecture":"amd64","config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["sh"],"Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"container":"349b014153779e30093d94f6df2a43c7a0a164e05aa207389917b540add39b51","container_config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) CMD [\"sh\"]"],"Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Volumes":null,"WorkingDir":"","Entrypoint":null,"OnBuild":null,"Labels":null},"created":"2015-10-31T22:22:55.613815829Z","docker_version":"1.8.2","layer_id":"sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4","os":"linux","parent_id":"sha256:039b63dd2cbaa10d6015ea574392530571ed8d7b174090f032211285a71881d0"}`, id1, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ls := &mockRegistrar{}
-
-	ifs, err := image.NewFSStoreBackend(filepath.Join(tmpdir, "imagedb"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	is, err := image.NewImageStore(ifs, ls)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ms, err := metadata.NewFSMetadataStore(filepath.Join(tmpdir, "distribution"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	mappings := make(map[string]image.ID)
-
-	err = migrateImages(tmpdir, ls, is, ms, mappings)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := map[string]image.ID{
-		id1: image.ID("sha256:ca406eaf9c26898414ff5b7b3a023c33310759d6203be0663dbf1b3a712f432d"),
-		id2: image.ID("sha256:a488bec94bb96b26a968f913d25ef7d8d204d727ca328b52b4b059c7d03260b6"),
-	}
-
-	if !reflect.DeepEqual(mappings, expected) {
-		t.Fatalf("invalid image mappings: expected %q, got %q", expected, mappings)
-	}
-
-	if actual, expected := ls.count, 2; actual != expected {
-		t.Fatalf("invalid register count: expected %q, got %q", expected, actual)
-	}
-	ls.count = 0
-
-	// next images are busybox from 1.8.2
-	_, err = addImage(tmpdir, `{"id":"17583c7dd0dae6244203b8029733bdb7d17fccbb2b5d93e2b24cf48b8bfd06e2","parent":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","created":"2015-10-31T22:22:55.613815829Z","container":"349b014153779e30093d94f6df2a43c7a0a164e05aa207389917b540add39b51","container_config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"PublishService":"","Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) CMD [\"sh\"]"],"Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Volumes":null,"VolumeDriver":"","WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":null},"docker_version":"1.8.2","config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"PublishService":"","Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["sh"],"Image":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","Volumes":null,"VolumeDriver":"","WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":null},"architecture":"amd64","os":"linux","Size":0}`, "", "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = addImage(tmpdir, `{"id":"d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498","created":"2015-10-31T22:22:54.690851953Z","container":"23304fc829f9b9349416f6eb1afec162907eba3a328f51d53a17f8986f865d65","container_config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"PublishService":"","Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":["/bin/sh","-c","#(nop) ADD file:a3bc1e842b69636f9df5256c49c5374fb4eef1e281fe3f282c65fb853ee171c5 in /"],"Image":"","Volumes":null,"VolumeDriver":"","WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":null},"docker_version":"1.8.2","config":{"Hostname":"23304fc829f9","Domainname":"","User":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"PublishService":"","Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"VolumeDriver":"","WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"MacAddress":"","OnBuild":null,"Labels":null},"architecture":"amd64","os":"linux","Size":1108935}`, "", "sha256:55dc925c23d1ed82551fd018c27ac3ee731377b6bad3963a2a4e76e753d70e57")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = migrateImages(tmpdir, ls, is, ms, mappings)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected["d1592a710ac323612bd786fa8ac20727c58d8a67847e5a65177c594f43919498"] = image.ID("sha256:c091bb33854e57e6902b74c08719856d30b5593c7db6143b2b48376b8a588395")
-	expected["17583c7dd0dae6244203b8029733bdb7d17fccbb2b5d93e2b24cf48b8bfd06e2"] = image.ID("sha256:d963020e755ff2715b936065949472c1f8a6300144b922992a1a421999e71f07")
-
-	if actual, expected := ls.count, 2; actual != expected {
-		t.Fatalf("invalid register count: expected %q, got %q", expected, actual)
-	}
-
-	v2MetadataService := metadata.NewV2MetadataService(ms)
-	receivedMetadata, err := v2MetadataService.GetMetadata(layer.EmptyLayer.DiffID())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedMetadata := []metadata.V2Metadata{
-		{Digest: digest.Digest("sha256:55dc925c23d1ed82551fd018c27ac3ee731377b6bad3963a2a4e76e753d70e57")},
-		{Digest: digest.Digest("sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4")},
-	}
-
-	if !reflect.DeepEqual(expectedMetadata, receivedMetadata) {
-		t.Fatalf("invalid metadata: expected %q, got %q", expectedMetadata, receivedMetadata)
-	}
-
-}
-
-func TestMigrateUnsupported(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "migrate-empty")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	err = os.MkdirAll(filepath.Join(tmpdir, "graph"), 0700)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = Migrate(tmpdir, "generic", nil, nil, nil, nil)
-	if err != errUnsupported {
-		t.Fatalf("expected unsupported error, got %q", err)
-	}
-}
-
-func TestMigrateEmptyDir(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "migrate-empty")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	err = Migrate(tmpdir, "generic", nil, nil, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func addImage(dest, jsonConfig, parent, checksum string) (string, error) {
-	var config struct{ ID string }
-	if err := json.Unmarshal([]byte(jsonConfig), &config); err != nil {
-		return "", err
-	}
-	if config.ID == "" {
-		b := make([]byte, 32)
-		rand.Read(b)
-		config.ID = hex.EncodeToString(b)
-	}
-	contDir := filepath.Join(dest, "graph", config.ID)
-	if err := os.MkdirAll(contDir, 0700); err != nil {
-		return "", err
-	}
-	if err := ioutil.WriteFile(filepath.Join(contDir, "json"), []byte(jsonConfig), 0600); err != nil {
-		return "", err
-	}
-	if checksum != "" {
-		if err := ioutil.WriteFile(filepath.Join(contDir, "checksum"), []byte(checksum), 0600); err != nil {
-			return "", err
-		}
-	}
-	if err := ioutil.WriteFile(filepath.Join(contDir, ".migration-diffid"), []byte(layer.EmptyLayer.DiffID()), 0600); err != nil {
-		return "", err
-	}
-	if err := ioutil.WriteFile(filepath.Join(contDir, ".migration-size"), []byte("0"), 0600); err != nil {
-		return "", err
-	}
-	if parent != "" {
-		if err := ioutil.WriteFile(filepath.Join(contDir, "parent"), []byte(parent), 0600); err != nil {
-			return "", err
-		}
-	}
-	if checksum != "" {
-		if err := ioutil.WriteFile(filepath.Join(contDir, "checksum"), []byte(checksum), 0600); err != nil {
-			return "", err
-		}
-	}
-	return config.ID, nil
-}
-
-func addContainer(dest, jsonConfig string) error {
-	var config struct{ ID string }
-	if err := json.Unmarshal([]byte(jsonConfig), &config); err != nil {
-		return err
-	}
-	contDir := filepath.Join(dest, "containers", config.ID)
-	if err := os.MkdirAll(contDir, 0700); err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(filepath.Join(contDir, "config.json"), []byte(jsonConfig), 0600); err != nil {
-		return err
-	}
-	return nil
-}
-
-type mockTagAdder struct {
-	refs map[string]string
-}
-
-func (t *mockTagAdder) AddTag(ref reference.Named, id digest.Digest, force bool) error {
-	if t.refs == nil {
-		t.refs = make(map[string]string)
-	}
-	t.refs[ref.String()] = id.String()
-	return nil
-}
-func (t *mockTagAdder) AddDigest(ref reference.Canonical, id digest.Digest, force bool) error {
-	return t.AddTag(ref, id, force)
-}
-
-type mockRegistrar struct {
-	layers map[layer.ChainID]*mockLayer
-	count  int
-}
-
-func (r *mockRegistrar) RegisterByGraphID(graphID string, parent layer.ChainID, diffID layer.DiffID, tarDataFile string, size int64) (layer.Layer, error) {
-	r.count++
-	l := &mockLayer{}
-	if parent != "" {
-		p, exists := r.layers[parent]
-		if !exists {
-			return nil, fmt.Errorf("invalid parent %q", parent)
-		}
-		l.parent = p
-		l.diffIDs = append(l.diffIDs, p.diffIDs...)
-	}
-	l.diffIDs = append(l.diffIDs, diffID)
-	if r.layers == nil {
-		r.layers = make(map[layer.ChainID]*mockLayer)
-	}
-	r.layers[l.ChainID()] = l
-	return l, nil
-}
-func (r *mockRegistrar) Release(l layer.Layer) ([]layer.Metadata, error) {
-	return nil, nil
-}
-func (r *mockRegistrar) Get(layer.ChainID) (layer.Layer, error) {
-	return nil, nil
-}
-
-type mountInfo struct {
-	name, graphID, parent string
-}
-type mockMounter struct {
-	mounts []mountInfo
-	count  int
-}
-
-func (r *mockMounter) CreateRWLayerByGraphID(name string, graphID string, parent layer.ChainID) error {
-	r.mounts = append(r.mounts, mountInfo{name, graphID, string(parent)})
-	return nil
-}
-func (r *mockMounter) Unmount(string) error {
-	r.count--
-	return nil
-}
-func (r *mockMounter) Get(layer.ChainID) (layer.Layer, error) {
-	return nil, nil
-}
-
-func (r *mockMounter) Release(layer.Layer) ([]layer.Metadata, error) {
-	return nil, nil
-}
-
-type mockLayer struct {
-	diffIDs []layer.DiffID
-	parent  *mockLayer
-}
-
-func (l *mockLayer) TarStream() (io.ReadCloser, error) {
-	return nil, nil
-}
-func (l *mockLayer) TarStreamFrom(layer.ChainID) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (l *mockLayer) ChainID() layer.ChainID {
-	return layer.CreateChainID(l.diffIDs)
-}
-
-func (l *mockLayer) DiffID() layer.DiffID {
-	return l.diffIDs[len(l.diffIDs)-1]
-}
-
-func (l *mockLayer) Parent() layer.Layer {
-	if l.parent == nil {
-		return nil
-	}
-	return l.parent
-}
-
-func (l *mockLayer) Size() (int64, error) {
-	return 0, nil
-}
-
-func (l *mockLayer) DiffSize() (int64, error) {
-	return 0, nil
-}
-
-func (l *mockLayer) Metadata() (map[string]string, error) {
-	return nil, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/defaults_linux.go b/installer/vendor/github.com/docker/docker/oci/defaults_linux.go
deleted file mode 100644
index 8b3ce7281b..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/defaults_linux.go
+++ /dev/null
@@ -1,168 +0,0 @@
-package oci
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func sPtr(s string) *string      { return &s }
-func iPtr(i int64) *int64        { return &i }
-func u32Ptr(i int64) *uint32     { u := uint32(i); return &u }
-func fmPtr(i int64) *os.FileMode { fm := os.FileMode(i); return &fm }
-
-// DefaultSpec returns default oci spec used by docker.
-func DefaultSpec() specs.Spec {
-	s := specs.Spec{
-		Version: specs.Version,
-		Platform: specs.Platform{
-			OS:   runtime.GOOS,
-			Arch: runtime.GOARCH,
-		},
-	}
-	s.Mounts = []specs.Mount{
-		{
-			Destination: "/proc",
-			Type:        "proc",
-			Source:      "proc",
-			Options:     []string{"nosuid", "noexec", "nodev"},
-		},
-		{
-			Destination: "/dev",
-			Type:        "tmpfs",
-			Source:      "tmpfs",
-			Options:     []string{"nosuid", "strictatime", "mode=755"},
-		},
-		{
-			Destination: "/dev/pts",
-			Type:        "devpts",
-			Source:      "devpts",
-			Options:     []string{"nosuid", "noexec", "newinstance", "ptmxmode=0666", "mode=0620", "gid=5"},
-		},
-		{
-			Destination: "/sys",
-			Type:        "sysfs",
-			Source:      "sysfs",
-			Options:     []string{"nosuid", "noexec", "nodev", "ro"},
-		},
-		{
-			Destination: "/sys/fs/cgroup",
-			Type:        "cgroup",
-			Source:      "cgroup",
-			Options:     []string{"ro", "nosuid", "noexec", "nodev"},
-		},
-		{
-			Destination: "/dev/mqueue",
-			Type:        "mqueue",
-			Source:      "mqueue",
-			Options:     []string{"nosuid", "noexec", "nodev"},
-		},
-	}
-	s.Process.Capabilities = []string{
-		"CAP_CHOWN",
-		"CAP_DAC_OVERRIDE",
-		"CAP_FSETID",
-		"CAP_FOWNER",
-		"CAP_MKNOD",
-		"CAP_NET_RAW",
-		"CAP_SETGID",
-		"CAP_SETUID",
-		"CAP_SETFCAP",
-		"CAP_SETPCAP",
-		"CAP_NET_BIND_SERVICE",
-		"CAP_SYS_CHROOT",
-		"CAP_KILL",
-		"CAP_AUDIT_WRITE",
-	}
-
-	s.Linux = &specs.Linux{
-		MaskedPaths: []string{
-			"/proc/kcore",
-			"/proc/latency_stats",
-			"/proc/timer_list",
-			"/proc/timer_stats",
-			"/proc/sched_debug",
-			"/sys/firmware",
-		},
-		ReadonlyPaths: []string{
-			"/proc/asound",
-			"/proc/bus",
-			"/proc/fs",
-			"/proc/irq",
-			"/proc/sys",
-			"/proc/sysrq-trigger",
-		},
-		Namespaces: []specs.Namespace{
-			{Type: "mount"},
-			{Type: "network"},
-			{Type: "uts"},
-			{Type: "pid"},
-			{Type: "ipc"},
-		},
-		// Devices implicitly contains the following devices:
-		// null, zero, full, random, urandom, tty, console, and ptmx.
-		// ptmx is a bind-mount or symlink of the container's ptmx.
-		// See also: https://github.com/opencontainers/runtime-spec/blob/master/config-linux.md#default-devices
-		Devices: []specs.Device{},
-		Resources: &specs.Resources{
-			Devices: []specs.DeviceCgroup{
-				{
-					Allow:  false,
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(1),
-					Minor:  iPtr(5),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(1),
-					Minor:  iPtr(3),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(1),
-					Minor:  iPtr(9),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(1),
-					Minor:  iPtr(8),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(5),
-					Minor:  iPtr(0),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  true,
-					Type:   sPtr("c"),
-					Major:  iPtr(5),
-					Minor:  iPtr(1),
-					Access: sPtr("rwm"),
-				},
-				{
-					Allow:  false,
-					Type:   sPtr("c"),
-					Major:  iPtr(10),
-					Minor:  iPtr(229),
-					Access: sPtr("rwm"),
-				},
-			},
-		},
-	}
-
-	return s
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/defaults_solaris.go b/installer/vendor/github.com/docker/docker/oci/defaults_solaris.go
deleted file mode 100644
index 85c8b68e16..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/defaults_solaris.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package oci
-
-import (
-	"runtime"
-
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// DefaultSpec returns default oci spec used by docker.
-func DefaultSpec() specs.Spec {
-	s := specs.Spec{
-		Version: "0.6.0",
-		Platform: specs.Platform{
-			OS:   "SunOS",
-			Arch: runtime.GOARCH,
-		},
-	}
-	s.Solaris = &specs.Solaris{}
-	return s
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/defaults_windows.go b/installer/vendor/github.com/docker/docker/oci/defaults_windows.go
deleted file mode 100644
index ab51904ec4..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/defaults_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package oci
-
-import (
-	"runtime"
-
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// DefaultSpec returns default spec used by docker.
-func DefaultSpec() specs.Spec {
-	return specs.Spec{
-		Version: specs.Version,
-		Platform: specs.Platform{
-			OS:   runtime.GOOS,
-			Arch: runtime.GOARCH,
-		},
-		Windows: &specs.Windows{},
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/devices_linux.go b/installer/vendor/github.com/docker/docker/oci/devices_linux.go
deleted file mode 100644
index 2840d2586a..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/devices_linux.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package oci
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/opencontainers/runc/libcontainer/configs"
-	"github.com/opencontainers/runc/libcontainer/devices"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Device transforms a libcontainer configs.Device to a specs.Device object.
-func Device(d *configs.Device) specs.Device {
-	return specs.Device{
-		Type:     string(d.Type),
-		Path:     d.Path,
-		Major:    d.Major,
-		Minor:    d.Minor,
-		FileMode: fmPtr(int64(d.FileMode)),
-		UID:      u32Ptr(int64(d.Uid)),
-		GID:      u32Ptr(int64(d.Gid)),
-	}
-}
-
-func deviceCgroup(d *configs.Device) specs.DeviceCgroup {
-	t := string(d.Type)
-	return specs.DeviceCgroup{
-		Allow:  true,
-		Type:   &t,
-		Major:  &d.Major,
-		Minor:  &d.Minor,
-		Access: &d.Permissions,
-	}
-}
-
-// DevicesFromPath computes a list of devices and device permissions from paths (pathOnHost and pathInContainer) and cgroup permissions.
-func DevicesFromPath(pathOnHost, pathInContainer, cgroupPermissions string) (devs []specs.Device, devPermissions []specs.DeviceCgroup, err error) {
-	resolvedPathOnHost := pathOnHost
-
-	// check if it is a symbolic link
-	if src, e := os.Lstat(pathOnHost); e == nil && src.Mode()&os.ModeSymlink == os.ModeSymlink {
-		if linkedPathOnHost, e := filepath.EvalSymlinks(pathOnHost); e == nil {
-			resolvedPathOnHost = linkedPathOnHost
-		}
-	}
-
-	device, err := devices.DeviceFromPath(resolvedPathOnHost, cgroupPermissions)
-	// if there was no error, return the device
-	if err == nil {
-		device.Path = pathInContainer
-		return append(devs, Device(device)), append(devPermissions, deviceCgroup(device)), nil
-	}
-
-	// if the device is not a device node
-	// try to see if it's a directory holding many devices
-	if err == devices.ErrNotADevice {
-
-		// check if it is a directory
-		if src, e := os.Stat(resolvedPathOnHost); e == nil && src.IsDir() {
-
-			// mount the internal devices recursively
-			filepath.Walk(resolvedPathOnHost, func(dpath string, f os.FileInfo, e error) error {
-				childDevice, e := devices.DeviceFromPath(dpath, cgroupPermissions)
-				if e != nil {
-					// ignore the device
-					return nil
-				}
-
-				// add the device to userSpecified devices
-				childDevice.Path = strings.Replace(dpath, resolvedPathOnHost, pathInContainer, 1)
-				devs = append(devs, Device(childDevice))
-				devPermissions = append(devPermissions, deviceCgroup(childDevice))
-
-				return nil
-			})
-		}
-	}
-
-	if len(devs) > 0 {
-		return devs, devPermissions, nil
-	}
-
-	return devs, devPermissions, fmt.Errorf("error gathering device information while adding custom device %q: %s", pathOnHost, err)
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/devices_unsupported.go b/installer/vendor/github.com/docker/docker/oci/devices_unsupported.go
deleted file mode 100644
index 6252cab536..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/devices_unsupported.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// +build !linux
-
-package oci
-
-import (
-	"errors"
-
-	"github.com/opencontainers/runc/libcontainer/configs"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// Device transforms a libcontainer configs.Device to a specs.Device object.
-// Not implemented
-func Device(d *configs.Device) specs.Device { return specs.Device{} }
-
-// DevicesFromPath computes a list of devices and device permissions from paths (pathOnHost and pathInContainer) and cgroup permissions.
-// Not implemented
-func DevicesFromPath(pathOnHost, pathInContainer, cgroupPermissions string) (devs []specs.Device, devPermissions []specs.DeviceCgroup, err error) {
-	return nil, nil, errors.New("oci/devices: unsupported platform")
-}
diff --git a/installer/vendor/github.com/docker/docker/oci/namespaces.go b/installer/vendor/github.com/docker/docker/oci/namespaces.go
deleted file mode 100644
index 4902482498..0000000000
--- a/installer/vendor/github.com/docker/docker/oci/namespaces.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package oci
-
-import specs "github.com/opencontainers/runtime-spec/specs-go"
-
-// RemoveNamespace removes the `nsType` namespace from OCI spec `s`
-func RemoveNamespace(s *specs.Spec, nsType specs.NamespaceType) {
-	idx := -1
-	for i, n := range s.Linux.Namespaces {
-		if n.Type == nsType {
-			idx = i
-		}
-	}
-	if idx >= 0 {
-		s.Linux.Namespaces = append(s.Linux.Namespaces[:idx], s.Linux.Namespaces[idx+1:]...)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/hosts.go b/installer/vendor/github.com/docker/docker/opts/hosts.go
deleted file mode 100644
index 266df1e537..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/hosts.go
+++ /dev/null
@@ -1,151 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"net"
-	"net/url"
-	"strconv"
-	"strings"
-)
-
-var (
-	// DefaultHTTPPort Default HTTP Port used if only the protocol is provided to -H flag e.g. docker daemon -H tcp://
-	// These are the IANA registered port numbers for use with Docker
-	// see http://www.iana.org/assignments/service-names-port-numbers/service-names-port-numbers.xhtml?search=docker
-	DefaultHTTPPort = 2375 // Default HTTP Port
-	// DefaultTLSHTTPPort Default HTTP Port used when TLS enabled
-	DefaultTLSHTTPPort = 2376 // Default TLS encrypted HTTP Port
-	// DefaultUnixSocket Path for the unix socket.
-	// Docker daemon by default always listens on the default unix socket
-	DefaultUnixSocket = "/var/run/docker.sock"
-	// DefaultTCPHost constant defines the default host string used by docker on Windows
-	DefaultTCPHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultHTTPPort)
-	// DefaultTLSHost constant defines the default host string used by docker for TLS sockets
-	DefaultTLSHost = fmt.Sprintf("tcp://%s:%d", DefaultHTTPHost, DefaultTLSHTTPPort)
-	// DefaultNamedPipe defines the default named pipe used by docker on Windows
-	DefaultNamedPipe = `//./pipe/docker_engine`
-)
-
-// ValidateHost validates that the specified string is a valid host and returns it.
-func ValidateHost(val string) (string, error) {
-	host := strings.TrimSpace(val)
-	// The empty string means default and is not handled by parseDockerDaemonHost
-	if host != "" {
-		_, err := parseDockerDaemonHost(host)
-		if err != nil {
-			return val, err
-		}
-	}
-	// Note: unlike most flag validators, we don't return the mutated value here
-	//       we need to know what the user entered later (using ParseHost) to adjust for tls
-	return val, nil
-}
-
-// ParseHost and set defaults for a Daemon host string
-func ParseHost(defaultToTLS bool, val string) (string, error) {
-	host := strings.TrimSpace(val)
-	if host == "" {
-		if defaultToTLS {
-			host = DefaultTLSHost
-		} else {
-			host = DefaultHost
-		}
-	} else {
-		var err error
-		host, err = parseDockerDaemonHost(host)
-		if err != nil {
-			return val, err
-		}
-	}
-	return host, nil
-}
-
-// parseDockerDaemonHost parses the specified address and returns an address that will be used as the host.
-// Depending of the address specified, this may return one of the global Default* strings defined in hosts.go.
-func parseDockerDaemonHost(addr string) (string, error) {
-	addrParts := strings.SplitN(addr, "://", 2)
-	if len(addrParts) == 1 && addrParts[0] != "" {
-		addrParts = []string{"tcp", addrParts[0]}
-	}
-
-	switch addrParts[0] {
-	case "tcp":
-		return ParseTCPAddr(addrParts[1], DefaultTCPHost)
-	case "unix":
-		return parseSimpleProtoAddr("unix", addrParts[1], DefaultUnixSocket)
-	case "npipe":
-		return parseSimpleProtoAddr("npipe", addrParts[1], DefaultNamedPipe)
-	case "fd":
-		return addr, nil
-	default:
-		return "", fmt.Errorf("Invalid bind address format: %s", addr)
-	}
-}
-
-// parseSimpleProtoAddr parses and validates that the specified address is a valid
-// socket address for simple protocols like unix and npipe. It returns a formatted
-// socket address, either using the address parsed from addr, or the contents of
-// defaultAddr if addr is a blank string.
-func parseSimpleProtoAddr(proto, addr, defaultAddr string) (string, error) {
-	addr = strings.TrimPrefix(addr, proto+"://")
-	if strings.Contains(addr, "://") {
-		return "", fmt.Errorf("Invalid proto, expected %s: %s", proto, addr)
-	}
-	if addr == "" {
-		addr = defaultAddr
-	}
-	return fmt.Sprintf("%s://%s", proto, addr), nil
-}
-
-// ParseTCPAddr parses and validates that the specified address is a valid TCP
-// address. It returns a formatted TCP address, either using the address parsed
-// from tryAddr, or the contents of defaultAddr if tryAddr is a blank string.
-// tryAddr is expected to have already been Trim()'d
-// defaultAddr must be in the full `tcp://host:port` form
-func ParseTCPAddr(tryAddr string, defaultAddr string) (string, error) {
-	if tryAddr == "" || tryAddr == "tcp://" {
-		return defaultAddr, nil
-	}
-	addr := strings.TrimPrefix(tryAddr, "tcp://")
-	if strings.Contains(addr, "://") || addr == "" {
-		return "", fmt.Errorf("Invalid proto, expected tcp: %s", tryAddr)
-	}
-
-	defaultAddr = strings.TrimPrefix(defaultAddr, "tcp://")
-	defaultHost, defaultPort, err := net.SplitHostPort(defaultAddr)
-	if err != nil {
-		return "", err
-	}
-	// url.Parse fails for trailing colon on IPv6 brackets on Go 1.5, but
-	// not 1.4. See https://github.com/golang/go/issues/12200 and
-	// https://github.com/golang/go/issues/6530.
-	if strings.HasSuffix(addr, "]:") {
-		addr += defaultPort
-	}
-
-	u, err := url.Parse("tcp://" + addr)
-	if err != nil {
-		return "", err
-	}
-	host, port, err := net.SplitHostPort(u.Host)
-	if err != nil {
-		// try port addition once
-		host, port, err = net.SplitHostPort(net.JoinHostPort(u.Host, defaultPort))
-	}
-	if err != nil {
-		return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
-	}
-
-	if host == "" {
-		host = defaultHost
-	}
-	if port == "" {
-		port = defaultPort
-	}
-	p, err := strconv.Atoi(port)
-	if err != nil && p == 0 {
-		return "", fmt.Errorf("Invalid bind address format: %s", tryAddr)
-	}
-
-	return fmt.Sprintf("tcp://%s%s", net.JoinHostPort(host, port), u.Path), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/hosts_test.go b/installer/vendor/github.com/docker/docker/opts/hosts_test.go
deleted file mode 100644
index a5bec30d4c..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/hosts_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"testing"
-)
-
-func TestParseHost(t *testing.T) {
-	invalid := []string{
-		"something with spaces",
-		"://",
-		"unknown://",
-		"tcp://:port",
-		"tcp://invalid:port",
-	}
-
-	valid := map[string]string{
-		"":                         DefaultHost,
-		" ":                        DefaultHost,
-		"  ":                       DefaultHost,
-		"fd://":                    "fd://",
-		"fd://something":           "fd://something",
-		"tcp://host:":              fmt.Sprintf("tcp://host:%d", DefaultHTTPPort),
-		"tcp://":                   DefaultTCPHost,
-		"tcp://:2375":              fmt.Sprintf("tcp://%s:2375", DefaultHTTPHost),
-		"tcp://:2376":              fmt.Sprintf("tcp://%s:2376", DefaultHTTPHost),
-		"tcp://0.0.0.0:8080":       "tcp://0.0.0.0:8080",
-		"tcp://192.168.0.0:12000":  "tcp://192.168.0.0:12000",
-		"tcp://192.168:8080":       "tcp://192.168:8080",
-		"tcp://0.0.0.0:1234567890": "tcp://0.0.0.0:1234567890", // yeah it's valid :P
-		" tcp://:7777/path ":       fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost),
-		"tcp://docker.com:2375":    "tcp://docker.com:2375",
-		"unix://":                  "unix://" + DefaultUnixSocket,
-		"unix://path/to/socket":    "unix://path/to/socket",
-		"npipe://":                 "npipe://" + DefaultNamedPipe,
-		"npipe:////./pipe/foo":     "npipe:////./pipe/foo",
-	}
-
-	for _, value := range invalid {
-		if _, err := ParseHost(false, value); err == nil {
-			t.Errorf("Expected an error for %v, got [nil]", value)
-		}
-	}
-
-	for value, expected := range valid {
-		if actual, err := ParseHost(false, value); err != nil || actual != expected {
-			t.Errorf("Expected for %v [%v], got [%v, %v]", value, expected, actual, err)
-		}
-	}
-}
-
-func TestParseDockerDaemonHost(t *testing.T) {
-	invalids := map[string]string{
-
-		"tcp:a.b.c.d":                   "Invalid bind address format: tcp:a.b.c.d",
-		"tcp:a.b.c.d/path":              "Invalid bind address format: tcp:a.b.c.d/path",
-		"udp://127.0.0.1":               "Invalid bind address format: udp://127.0.0.1",
-		"udp://127.0.0.1:2375":          "Invalid bind address format: udp://127.0.0.1:2375",
-		"tcp://unix:///run/docker.sock": "Invalid proto, expected tcp: unix:///run/docker.sock",
-		" tcp://:7777/path ":            "Invalid bind address format:  tcp://:7777/path ",
-		"":                              "Invalid bind address format: ",
-	}
-	valids := map[string]string{
-		"0.0.0.1:":                    "tcp://0.0.0.1:2375",
-		"0.0.0.1:5555":                "tcp://0.0.0.1:5555",
-		"0.0.0.1:5555/path":           "tcp://0.0.0.1:5555/path",
-		"[::1]:":                      "tcp://[::1]:2375",
-		"[::1]:5555/path":             "tcp://[::1]:5555/path",
-		"[0:0:0:0:0:0:0:1]:":          "tcp://[0:0:0:0:0:0:0:1]:2375",
-		"[0:0:0:0:0:0:0:1]:5555/path": "tcp://[0:0:0:0:0:0:0:1]:5555/path",
-		":6666":                   fmt.Sprintf("tcp://%s:6666", DefaultHTTPHost),
-		":6666/path":              fmt.Sprintf("tcp://%s:6666/path", DefaultHTTPHost),
-		"tcp://":                  DefaultTCPHost,
-		"tcp://:7777":             fmt.Sprintf("tcp://%s:7777", DefaultHTTPHost),
-		"tcp://:7777/path":        fmt.Sprintf("tcp://%s:7777/path", DefaultHTTPHost),
-		"unix:///run/docker.sock": "unix:///run/docker.sock",
-		"unix://":                 "unix://" + DefaultUnixSocket,
-		"fd://":                   "fd://",
-		"fd://something":          "fd://something",
-		"localhost:":              "tcp://localhost:2375",
-		"localhost:5555":          "tcp://localhost:5555",
-		"localhost:5555/path":     "tcp://localhost:5555/path",
-	}
-	for invalidAddr, expectedError := range invalids {
-		if addr, err := parseDockerDaemonHost(invalidAddr); err == nil || err.Error() != expectedError {
-			t.Errorf("tcp %v address expected error %q return, got %q and addr %v", invalidAddr, expectedError, err, addr)
-		}
-	}
-	for validAddr, expectedAddr := range valids {
-		if addr, err := parseDockerDaemonHost(validAddr); err != nil || addr != expectedAddr {
-			t.Errorf("%v -> expected %v, got (%v) addr (%v)", validAddr, expectedAddr, err, addr)
-		}
-	}
-}
-
-func TestParseTCP(t *testing.T) {
-	var (
-		defaultHTTPHost = "tcp://127.0.0.1:2376"
-	)
-	invalids := map[string]string{
-		"tcp:a.b.c.d":          "Invalid bind address format: tcp:a.b.c.d",
-		"tcp:a.b.c.d/path":     "Invalid bind address format: tcp:a.b.c.d/path",
-		"udp://127.0.0.1":      "Invalid proto, expected tcp: udp://127.0.0.1",
-		"udp://127.0.0.1:2375": "Invalid proto, expected tcp: udp://127.0.0.1:2375",
-	}
-	valids := map[string]string{
-		"":                            defaultHTTPHost,
-		"tcp://":                      defaultHTTPHost,
-		"0.0.0.1:":                    "tcp://0.0.0.1:2376",
-		"0.0.0.1:5555":                "tcp://0.0.0.1:5555",
-		"0.0.0.1:5555/path":           "tcp://0.0.0.1:5555/path",
-		":6666":                       "tcp://127.0.0.1:6666",
-		":6666/path":                  "tcp://127.0.0.1:6666/path",
-		"tcp://:7777":                 "tcp://127.0.0.1:7777",
-		"tcp://:7777/path":            "tcp://127.0.0.1:7777/path",
-		"[::1]:":                      "tcp://[::1]:2376",
-		"[::1]:5555":                  "tcp://[::1]:5555",
-		"[::1]:5555/path":             "tcp://[::1]:5555/path",
-		"[0:0:0:0:0:0:0:1]:":          "tcp://[0:0:0:0:0:0:0:1]:2376",
-		"[0:0:0:0:0:0:0:1]:5555":      "tcp://[0:0:0:0:0:0:0:1]:5555",
-		"[0:0:0:0:0:0:0:1]:5555/path": "tcp://[0:0:0:0:0:0:0:1]:5555/path",
-		"localhost:":                  "tcp://localhost:2376",
-		"localhost:5555":              "tcp://localhost:5555",
-		"localhost:5555/path":         "tcp://localhost:5555/path",
-	}
-	for invalidAddr, expectedError := range invalids {
-		if addr, err := ParseTCPAddr(invalidAddr, defaultHTTPHost); err == nil || err.Error() != expectedError {
-			t.Errorf("tcp %v address expected error %v return, got %s and addr %v", invalidAddr, expectedError, err, addr)
-		}
-	}
-	for validAddr, expectedAddr := range valids {
-		if addr, err := ParseTCPAddr(validAddr, defaultHTTPHost); err != nil || addr != expectedAddr {
-			t.Errorf("%v -> expected %v, got %v and addr %v", validAddr, expectedAddr, err, addr)
-		}
-	}
-}
-
-func TestParseInvalidUnixAddrInvalid(t *testing.T) {
-	if _, err := parseSimpleProtoAddr("unix", "tcp://127.0.0.1", "unix:///var/run/docker.sock"); err == nil || err.Error() != "Invalid proto, expected unix: tcp://127.0.0.1" {
-		t.Fatalf("Expected an error, got %v", err)
-	}
-	if _, err := parseSimpleProtoAddr("unix", "unix://tcp://127.0.0.1", "/var/run/docker.sock"); err == nil || err.Error() != "Invalid proto, expected unix: tcp://127.0.0.1" {
-		t.Fatalf("Expected an error, got %v", err)
-	}
-	if v, err := parseSimpleProtoAddr("unix", "", "/var/run/docker.sock"); err != nil || v != "unix:///var/run/docker.sock" {
-		t.Fatalf("Expected an %v, got %v", v, "unix:///var/run/docker.sock")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/hosts_unix.go b/installer/vendor/github.com/docker/docker/opts/hosts_unix.go
deleted file mode 100644
index 611407a9d9..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/hosts_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package opts
-
-import "fmt"
-
-// DefaultHost constant defines the default host string used by docker on other hosts than Windows
-var DefaultHost = fmt.Sprintf("unix://%s", DefaultUnixSocket)
diff --git a/installer/vendor/github.com/docker/docker/opts/hosts_windows.go b/installer/vendor/github.com/docker/docker/opts/hosts_windows.go
deleted file mode 100644
index 7c239e00f1..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/hosts_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build windows
-
-package opts
-
-// DefaultHost constant defines the default host string used by docker on Windows
-var DefaultHost = "npipe://" + DefaultNamedPipe
diff --git a/installer/vendor/github.com/docker/docker/opts/ip.go b/installer/vendor/github.com/docker/docker/opts/ip.go
deleted file mode 100644
index fb03b50111..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/ip.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"net"
-)
-
-// IPOpt holds an IP. It is used to store values from CLI flags.
-type IPOpt struct {
-	*net.IP
-}
-
-// NewIPOpt creates a new IPOpt from a reference net.IP and a
-// string representation of an IP. If the string is not a valid
-// IP it will fallback to the specified reference.
-func NewIPOpt(ref *net.IP, defaultVal string) *IPOpt {
-	o := &IPOpt{
-		IP: ref,
-	}
-	o.Set(defaultVal)
-	return o
-}
-
-// Set sets an IPv4 or IPv6 address from a given string. If the given
-// string is not parseable as an IP address it returns an error.
-func (o *IPOpt) Set(val string) error {
-	ip := net.ParseIP(val)
-	if ip == nil {
-		return fmt.Errorf("%s is not an ip address", val)
-	}
-	*o.IP = ip
-	return nil
-}
-
-// String returns the IP address stored in the IPOpt. If stored IP is a
-// nil pointer, it returns an empty string.
-func (o *IPOpt) String() string {
-	if *o.IP == nil {
-		return ""
-	}
-	return o.IP.String()
-}
-
-// Type returns the type of the option
-func (o *IPOpt) Type() string {
-	return "ip"
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/ip_test.go b/installer/vendor/github.com/docker/docker/opts/ip_test.go
deleted file mode 100644
index 1027d84a05..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/ip_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package opts
-
-import (
-	"net"
-	"testing"
-)
-
-func TestIpOptString(t *testing.T) {
-	addresses := []string{"", "0.0.0.0"}
-	var ip net.IP
-
-	for _, address := range addresses {
-		stringAddress := NewIPOpt(&ip, address).String()
-		if stringAddress != address {
-			t.Fatalf("IpOpt string should be `%s`, not `%s`", address, stringAddress)
-		}
-	}
-}
-
-func TestNewIpOptInvalidDefaultVal(t *testing.T) {
-	ip := net.IPv4(127, 0, 0, 1)
-	defaultVal := "Not an ip"
-
-	ipOpt := NewIPOpt(&ip, defaultVal)
-
-	expected := "127.0.0.1"
-	if ipOpt.String() != expected {
-		t.Fatalf("Expected [%v], got [%v]", expected, ipOpt.String())
-	}
-}
-
-func TestNewIpOptValidDefaultVal(t *testing.T) {
-	ip := net.IPv4(127, 0, 0, 1)
-	defaultVal := "192.168.1.1"
-
-	ipOpt := NewIPOpt(&ip, defaultVal)
-
-	expected := "192.168.1.1"
-	if ipOpt.String() != expected {
-		t.Fatalf("Expected [%v], got [%v]", expected, ipOpt.String())
-	}
-}
-
-func TestIpOptSetInvalidVal(t *testing.T) {
-	ip := net.IPv4(127, 0, 0, 1)
-	ipOpt := &IPOpt{IP: &ip}
-
-	invalidIP := "invalid ip"
-	expectedError := "invalid ip is not an ip address"
-	err := ipOpt.Set(invalidIP)
-	if err == nil || err.Error() != expectedError {
-		t.Fatalf("Expected an Error with [%v], got [%v]", expectedError, err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/mount.go b/installer/vendor/github.com/docker/docker/opts/mount.go
deleted file mode 100644
index ce6383ddca..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/mount.go
+++ /dev/null
@@ -1,171 +0,0 @@
-package opts
-
-import (
-	"encoding/csv"
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/go-units"
-)
-
-// MountOpt is a Value type for parsing mounts
-type MountOpt struct {
-	values []mounttypes.Mount
-}
-
-// Set a new mount value
-func (m *MountOpt) Set(value string) error {
-	csvReader := csv.NewReader(strings.NewReader(value))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return err
-	}
-
-	mount := mounttypes.Mount{}
-
-	volumeOptions := func() *mounttypes.VolumeOptions {
-		if mount.VolumeOptions == nil {
-			mount.VolumeOptions = &mounttypes.VolumeOptions{
-				Labels: make(map[string]string),
-			}
-		}
-		if mount.VolumeOptions.DriverConfig == nil {
-			mount.VolumeOptions.DriverConfig = &mounttypes.Driver{}
-		}
-		return mount.VolumeOptions
-	}
-
-	bindOptions := func() *mounttypes.BindOptions {
-		if mount.BindOptions == nil {
-			mount.BindOptions = new(mounttypes.BindOptions)
-		}
-		return mount.BindOptions
-	}
-
-	tmpfsOptions := func() *mounttypes.TmpfsOptions {
-		if mount.TmpfsOptions == nil {
-			mount.TmpfsOptions = new(mounttypes.TmpfsOptions)
-		}
-		return mount.TmpfsOptions
-	}
-
-	setValueOnMap := func(target map[string]string, value string) {
-		parts := strings.SplitN(value, "=", 2)
-		if len(parts) == 1 {
-			target[value] = ""
-		} else {
-			target[parts[0]] = parts[1]
-		}
-	}
-
-	mount.Type = mounttypes.TypeVolume // default to volume mounts
-	// Set writable as the default
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-		key := strings.ToLower(parts[0])
-
-		if len(parts) == 1 {
-			switch key {
-			case "readonly", "ro":
-				mount.ReadOnly = true
-				continue
-			case "volume-nocopy":
-				volumeOptions().NoCopy = true
-				continue
-			}
-		}
-
-		if len(parts) != 2 {
-			return fmt.Errorf("invalid field '%s' must be a key=value pair", field)
-		}
-
-		value := parts[1]
-		switch key {
-		case "type":
-			mount.Type = mounttypes.Type(strings.ToLower(value))
-		case "source", "src":
-			mount.Source = value
-		case "target", "dst", "destination":
-			mount.Target = value
-		case "readonly", "ro":
-			mount.ReadOnly, err = strconv.ParseBool(value)
-			if err != nil {
-				return fmt.Errorf("invalid value for %s: %s", key, value)
-			}
-		case "bind-propagation":
-			bindOptions().Propagation = mounttypes.Propagation(strings.ToLower(value))
-		case "volume-nocopy":
-			volumeOptions().NoCopy, err = strconv.ParseBool(value)
-			if err != nil {
-				return fmt.Errorf("invalid value for populate: %s", value)
-			}
-		case "volume-label":
-			setValueOnMap(volumeOptions().Labels, value)
-		case "volume-driver":
-			volumeOptions().DriverConfig.Name = value
-		case "volume-opt":
-			if volumeOptions().DriverConfig.Options == nil {
-				volumeOptions().DriverConfig.Options = make(map[string]string)
-			}
-			setValueOnMap(volumeOptions().DriverConfig.Options, value)
-		case "tmpfs-size":
-			sizeBytes, err := units.RAMInBytes(value)
-			if err != nil {
-				return fmt.Errorf("invalid value for %s: %s", key, value)
-			}
-			tmpfsOptions().SizeBytes = sizeBytes
-		case "tmpfs-mode":
-			ui64, err := strconv.ParseUint(value, 8, 32)
-			if err != nil {
-				return fmt.Errorf("invalid value for %s: %s", key, value)
-			}
-			tmpfsOptions().Mode = os.FileMode(ui64)
-		default:
-			return fmt.Errorf("unexpected key '%s' in '%s'", key, field)
-		}
-	}
-
-	if mount.Type == "" {
-		return fmt.Errorf("type is required")
-	}
-
-	if mount.Target == "" {
-		return fmt.Errorf("target is required")
-	}
-
-	if mount.VolumeOptions != nil && mount.Type != mounttypes.TypeVolume {
-		return fmt.Errorf("cannot mix 'volume-*' options with mount type '%s'", mount.Type)
-	}
-	if mount.BindOptions != nil && mount.Type != mounttypes.TypeBind {
-		return fmt.Errorf("cannot mix 'bind-*' options with mount type '%s'", mount.Type)
-	}
-	if mount.TmpfsOptions != nil && mount.Type != mounttypes.TypeTmpfs {
-		return fmt.Errorf("cannot mix 'tmpfs-*' options with mount type '%s'", mount.Type)
-	}
-
-	m.values = append(m.values, mount)
-	return nil
-}
-
-// Type returns the type of this option
-func (m *MountOpt) Type() string {
-	return "mount"
-}
-
-// String returns a string repr of this option
-func (m *MountOpt) String() string {
-	mounts := []string{}
-	for _, mount := range m.values {
-		repr := fmt.Sprintf("%s %s %s", mount.Type, mount.Source, mount.Target)
-		mounts = append(mounts, repr)
-	}
-	return strings.Join(mounts, ", ")
-}
-
-// Value returns the mounts
-func (m *MountOpt) Value() []mounttypes.Mount {
-	return m.values
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/mount_test.go b/installer/vendor/github.com/docker/docker/opts/mount_test.go
deleted file mode 100644
index 59606c38e2..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/mount_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package opts
-
-import (
-	"os"
-	"testing"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestMountOptString(t *testing.T) {
-	mount := MountOpt{
-		values: []mounttypes.Mount{
-			{
-				Type:   mounttypes.TypeBind,
-				Source: "/home/path",
-				Target: "/target",
-			},
-			{
-				Type:   mounttypes.TypeVolume,
-				Source: "foo",
-				Target: "/target/foo",
-			},
-		},
-	}
-	expected := "bind /home/path /target, volume foo /target/foo"
-	assert.Equal(t, mount.String(), expected)
-}
-
-func TestMountOptSetBindNoErrorBind(t *testing.T) {
-	for _, testcase := range []string{
-		// tests several aliases that should have same result.
-		"type=bind,target=/target,source=/source",
-		"type=bind,src=/source,dst=/target",
-		"type=bind,source=/source,dst=/target",
-		"type=bind,src=/source,target=/target",
-	} {
-		var mount MountOpt
-
-		assert.NilError(t, mount.Set(testcase))
-
-		mounts := mount.Value()
-		assert.Equal(t, len(mounts), 1)
-		assert.Equal(t, mounts[0], mounttypes.Mount{
-			Type:   mounttypes.TypeBind,
-			Source: "/source",
-			Target: "/target",
-		})
-	}
-}
-
-func TestMountOptSetVolumeNoError(t *testing.T) {
-	for _, testcase := range []string{
-		// tests several aliases that should have same result.
-		"type=volume,target=/target,source=/source",
-		"type=volume,src=/source,dst=/target",
-		"type=volume,source=/source,dst=/target",
-		"type=volume,src=/source,target=/target",
-	} {
-		var mount MountOpt
-
-		assert.NilError(t, mount.Set(testcase))
-
-		mounts := mount.Value()
-		assert.Equal(t, len(mounts), 1)
-		assert.Equal(t, mounts[0], mounttypes.Mount{
-			Type:   mounttypes.TypeVolume,
-			Source: "/source",
-			Target: "/target",
-		})
-	}
-}
-
-// TestMountOptDefaultType ensures that a mount without the type defaults to a
-// volume mount.
-func TestMountOptDefaultType(t *testing.T) {
-	var mount MountOpt
-	assert.NilError(t, mount.Set("target=/target,source=/foo"))
-	assert.Equal(t, mount.values[0].Type, mounttypes.TypeVolume)
-}
-
-func TestMountOptSetErrorNoTarget(t *testing.T) {
-	var mount MountOpt
-	assert.Error(t, mount.Set("type=volume,source=/foo"), "target is required")
-}
-
-func TestMountOptSetErrorInvalidKey(t *testing.T) {
-	var mount MountOpt
-	assert.Error(t, mount.Set("type=volume,bogus=foo"), "unexpected key 'bogus'")
-}
-
-func TestMountOptSetErrorInvalidField(t *testing.T) {
-	var mount MountOpt
-	assert.Error(t, mount.Set("type=volume,bogus"), "invalid field 'bogus'")
-}
-
-func TestMountOptSetErrorInvalidReadOnly(t *testing.T) {
-	var mount MountOpt
-	assert.Error(t, mount.Set("type=volume,readonly=no"), "invalid value for readonly: no")
-	assert.Error(t, mount.Set("type=volume,readonly=invalid"), "invalid value for readonly: invalid")
-}
-
-func TestMountOptDefaultEnableReadOnly(t *testing.T) {
-	var m MountOpt
-	assert.NilError(t, m.Set("type=bind,target=/foo,source=/foo"))
-	assert.Equal(t, m.values[0].ReadOnly, false)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=bind,target=/foo,source=/foo,readonly"))
-	assert.Equal(t, m.values[0].ReadOnly, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=bind,target=/foo,source=/foo,readonly=1"))
-	assert.Equal(t, m.values[0].ReadOnly, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=bind,target=/foo,source=/foo,readonly=true"))
-	assert.Equal(t, m.values[0].ReadOnly, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=bind,target=/foo,source=/foo,readonly=0"))
-	assert.Equal(t, m.values[0].ReadOnly, false)
-}
-
-func TestMountOptVolumeNoCopy(t *testing.T) {
-	var m MountOpt
-	assert.NilError(t, m.Set("type=volume,target=/foo,volume-nocopy"))
-	assert.Equal(t, m.values[0].Source, "")
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=volume,target=/foo,source=foo"))
-	assert.Equal(t, m.values[0].VolumeOptions == nil, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=volume,target=/foo,source=foo,volume-nocopy=true"))
-	assert.Equal(t, m.values[0].VolumeOptions != nil, true)
-	assert.Equal(t, m.values[0].VolumeOptions.NoCopy, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=volume,target=/foo,source=foo,volume-nocopy"))
-	assert.Equal(t, m.values[0].VolumeOptions != nil, true)
-	assert.Equal(t, m.values[0].VolumeOptions.NoCopy, true)
-
-	m = MountOpt{}
-	assert.NilError(t, m.Set("type=volume,target=/foo,source=foo,volume-nocopy=1"))
-	assert.Equal(t, m.values[0].VolumeOptions != nil, true)
-	assert.Equal(t, m.values[0].VolumeOptions.NoCopy, true)
-}
-
-func TestMountOptTypeConflict(t *testing.T) {
-	var m MountOpt
-	assert.Error(t, m.Set("type=bind,target=/foo,source=/foo,volume-nocopy=true"), "cannot mix")
-	assert.Error(t, m.Set("type=volume,target=/foo,source=/foo,bind-propagation=rprivate"), "cannot mix")
-}
-
-func TestMountOptSetTmpfsNoError(t *testing.T) {
-	for _, testcase := range []string{
-		// tests several aliases that should have same result.
-		"type=tmpfs,target=/target,tmpfs-size=1m,tmpfs-mode=0700",
-		"type=tmpfs,target=/target,tmpfs-size=1MB,tmpfs-mode=700",
-	} {
-		var mount MountOpt
-
-		assert.NilError(t, mount.Set(testcase))
-
-		mounts := mount.Value()
-		assert.Equal(t, len(mounts), 1)
-		assert.DeepEqual(t, mounts[0], mounttypes.Mount{
-			Type:   mounttypes.TypeTmpfs,
-			Target: "/target",
-			TmpfsOptions: &mounttypes.TmpfsOptions{
-				SizeBytes: 1024 * 1024, // not 1000 * 1000
-				Mode:      os.FileMode(0700),
-			},
-		})
-	}
-}
-
-func TestMountOptSetTmpfsError(t *testing.T) {
-	var m MountOpt
-	assert.Error(t, m.Set("type=tmpfs,target=/foo,tmpfs-size=foo"), "invalid value for tmpfs-size")
-	assert.Error(t, m.Set("type=tmpfs,target=/foo,tmpfs-mode=foo"), "invalid value for tmpfs-mode")
-	assert.Error(t, m.Set("type=tmpfs"), "target is required")
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/opts.go b/installer/vendor/github.com/docker/docker/opts/opts.go
deleted file mode 100644
index ae851537ec..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/opts.go
+++ /dev/null
@@ -1,360 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"math/big"
-	"net"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/api/types/filters"
-)
-
-var (
-	alphaRegexp  = regexp.MustCompile(`[a-zA-Z]`)
-	domainRegexp = regexp.MustCompile(`^(:?(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9]))(:?\.(:?[a-zA-Z0-9]|(:?[a-zA-Z0-9][a-zA-Z0-9\-]*[a-zA-Z0-9])))*)\.?\s*$`)
-)
-
-// ListOpts holds a list of values and a validation function.
-type ListOpts struct {
-	values    *[]string
-	validator ValidatorFctType
-}
-
-// NewListOpts creates a new ListOpts with the specified validator.
-func NewListOpts(validator ValidatorFctType) ListOpts {
-	var values []string
-	return *NewListOptsRef(&values, validator)
-}
-
-// NewListOptsRef creates a new ListOpts with the specified values and validator.
-func NewListOptsRef(values *[]string, validator ValidatorFctType) *ListOpts {
-	return &ListOpts{
-		values:    values,
-		validator: validator,
-	}
-}
-
-func (opts *ListOpts) String() string {
-	return fmt.Sprintf("%v", []string((*opts.values)))
-}
-
-// Set validates if needed the input value and adds it to the
-// internal slice.
-func (opts *ListOpts) Set(value string) error {
-	if opts.validator != nil {
-		v, err := opts.validator(value)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	(*opts.values) = append((*opts.values), value)
-	return nil
-}
-
-// Delete removes the specified element from the slice.
-func (opts *ListOpts) Delete(key string) {
-	for i, k := range *opts.values {
-		if k == key {
-			(*opts.values) = append((*opts.values)[:i], (*opts.values)[i+1:]...)
-			return
-		}
-	}
-}
-
-// GetMap returns the content of values in a map in order to avoid
-// duplicates.
-func (opts *ListOpts) GetMap() map[string]struct{} {
-	ret := make(map[string]struct{})
-	for _, k := range *opts.values {
-		ret[k] = struct{}{}
-	}
-	return ret
-}
-
-// GetAll returns the values of slice.
-func (opts *ListOpts) GetAll() []string {
-	return (*opts.values)
-}
-
-// GetAllOrEmpty returns the values of the slice
-// or an empty slice when there are no values.
-func (opts *ListOpts) GetAllOrEmpty() []string {
-	v := *opts.values
-	if v == nil {
-		return make([]string, 0)
-	}
-	return v
-}
-
-// Get checks the existence of the specified key.
-func (opts *ListOpts) Get(key string) bool {
-	for _, k := range *opts.values {
-		if k == key {
-			return true
-		}
-	}
-	return false
-}
-
-// Len returns the amount of element in the slice.
-func (opts *ListOpts) Len() int {
-	return len((*opts.values))
-}
-
-// Type returns a string name for this Option type
-func (opts *ListOpts) Type() string {
-	return "list"
-}
-
-// NamedOption is an interface that list and map options
-// with names implement.
-type NamedOption interface {
-	Name() string
-}
-
-// NamedListOpts is a ListOpts with a configuration name.
-// This struct is useful to keep reference to the assigned
-// field name in the internal configuration struct.
-type NamedListOpts struct {
-	name string
-	ListOpts
-}
-
-var _ NamedOption = &NamedListOpts{}
-
-// NewNamedListOptsRef creates a reference to a new NamedListOpts struct.
-func NewNamedListOptsRef(name string, values *[]string, validator ValidatorFctType) *NamedListOpts {
-	return &NamedListOpts{
-		name:     name,
-		ListOpts: *NewListOptsRef(values, validator),
-	}
-}
-
-// Name returns the name of the NamedListOpts in the configuration.
-func (o *NamedListOpts) Name() string {
-	return o.name
-}
-
-// MapOpts holds a map of values and a validation function.
-type MapOpts struct {
-	values    map[string]string
-	validator ValidatorFctType
-}
-
-// Set validates if needed the input value and add it to the
-// internal map, by splitting on '='.
-func (opts *MapOpts) Set(value string) error {
-	if opts.validator != nil {
-		v, err := opts.validator(value)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	vals := strings.SplitN(value, "=", 2)
-	if len(vals) == 1 {
-		(opts.values)[vals[0]] = ""
-	} else {
-		(opts.values)[vals[0]] = vals[1]
-	}
-	return nil
-}
-
-// GetAll returns the values of MapOpts as a map.
-func (opts *MapOpts) GetAll() map[string]string {
-	return opts.values
-}
-
-func (opts *MapOpts) String() string {
-	return fmt.Sprintf("%v", map[string]string((opts.values)))
-}
-
-// Type returns a string name for this Option type
-func (opts *MapOpts) Type() string {
-	return "map"
-}
-
-// NewMapOpts creates a new MapOpts with the specified map of values and a validator.
-func NewMapOpts(values map[string]string, validator ValidatorFctType) *MapOpts {
-	if values == nil {
-		values = make(map[string]string)
-	}
-	return &MapOpts{
-		values:    values,
-		validator: validator,
-	}
-}
-
-// NamedMapOpts is a MapOpts struct with a configuration name.
-// This struct is useful to keep reference to the assigned
-// field name in the internal configuration struct.
-type NamedMapOpts struct {
-	name string
-	MapOpts
-}
-
-var _ NamedOption = &NamedMapOpts{}
-
-// NewNamedMapOpts creates a reference to a new NamedMapOpts struct.
-func NewNamedMapOpts(name string, values map[string]string, validator ValidatorFctType) *NamedMapOpts {
-	return &NamedMapOpts{
-		name:    name,
-		MapOpts: *NewMapOpts(values, validator),
-	}
-}
-
-// Name returns the name of the NamedMapOpts in the configuration.
-func (o *NamedMapOpts) Name() string {
-	return o.name
-}
-
-// ValidatorFctType defines a validator function that returns a validated string and/or an error.
-type ValidatorFctType func(val string) (string, error)
-
-// ValidatorFctListType defines a validator function that returns a validated list of string and/or an error
-type ValidatorFctListType func(val string) ([]string, error)
-
-// ValidateIPAddress validates an Ip address.
-func ValidateIPAddress(val string) (string, error) {
-	var ip = net.ParseIP(strings.TrimSpace(val))
-	if ip != nil {
-		return ip.String(), nil
-	}
-	return "", fmt.Errorf("%s is not an ip address", val)
-}
-
-// ValidateDNSSearch validates domain for resolvconf search configuration.
-// A zero length domain is represented by a dot (.).
-func ValidateDNSSearch(val string) (string, error) {
-	if val = strings.Trim(val, " "); val == "." {
-		return val, nil
-	}
-	return validateDomain(val)
-}
-
-func validateDomain(val string) (string, error) {
-	if alphaRegexp.FindString(val) == "" {
-		return "", fmt.Errorf("%s is not a valid domain", val)
-	}
-	ns := domainRegexp.FindSubmatch([]byte(val))
-	if len(ns) > 0 && len(ns[1]) < 255 {
-		return string(ns[1]), nil
-	}
-	return "", fmt.Errorf("%s is not a valid domain", val)
-}
-
-// ValidateLabel validates that the specified string is a valid label, and returns it.
-// Labels are in the form on key=value.
-func ValidateLabel(val string) (string, error) {
-	if strings.Count(val, "=") < 1 {
-		return "", fmt.Errorf("bad attribute format: %s", val)
-	}
-	return val, nil
-}
-
-// ValidateSysctl validates a sysctl and returns it.
-func ValidateSysctl(val string) (string, error) {
-	validSysctlMap := map[string]bool{
-		"kernel.msgmax":          true,
-		"kernel.msgmnb":          true,
-		"kernel.msgmni":          true,
-		"kernel.sem":             true,
-		"kernel.shmall":          true,
-		"kernel.shmmax":          true,
-		"kernel.shmmni":          true,
-		"kernel.shm_rmid_forced": true,
-	}
-	validSysctlPrefixes := []string{
-		"net.",
-		"fs.mqueue.",
-	}
-	arr := strings.Split(val, "=")
-	if len(arr) < 2 {
-		return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
-	}
-	if validSysctlMap[arr[0]] {
-		return val, nil
-	}
-
-	for _, vp := range validSysctlPrefixes {
-		if strings.HasPrefix(arr[0], vp) {
-			return val, nil
-		}
-	}
-	return "", fmt.Errorf("sysctl '%s' is not whitelisted", val)
-}
-
-// FilterOpt is a flag type for validating filters
-type FilterOpt struct {
-	filter filters.Args
-}
-
-// NewFilterOpt returns a new FilterOpt
-func NewFilterOpt() FilterOpt {
-	return FilterOpt{filter: filters.NewArgs()}
-}
-
-func (o *FilterOpt) String() string {
-	repr, err := filters.ToParam(o.filter)
-	if err != nil {
-		return "invalid filters"
-	}
-	return repr
-}
-
-// Set sets the value of the opt by parsing the command line value
-func (o *FilterOpt) Set(value string) error {
-	var err error
-	o.filter, err = filters.ParseFlag(value, o.filter)
-	return err
-}
-
-// Type returns the option type
-func (o *FilterOpt) Type() string {
-	return "filter"
-}
-
-// Value returns the value of this option
-func (o *FilterOpt) Value() filters.Args {
-	return o.filter
-}
-
-// NanoCPUs is a type for fixed point fractional number.
-type NanoCPUs int64
-
-// String returns the string format of the number
-func (c *NanoCPUs) String() string {
-	return big.NewRat(c.Value(), 1e9).FloatString(3)
-}
-
-// Set sets the value of the NanoCPU by passing a string
-func (c *NanoCPUs) Set(value string) error {
-	cpus, err := ParseCPUs(value)
-	*c = NanoCPUs(cpus)
-	return err
-}
-
-// Type returns the type
-func (c *NanoCPUs) Type() string {
-	return "decimal"
-}
-
-// Value returns the value in int64
-func (c *NanoCPUs) Value() int64 {
-	return int64(*c)
-}
-
-// ParseCPUs takes a string ratio and returns an integer value of nano cpus
-func ParseCPUs(value string) (int64, error) {
-	cpu, ok := new(big.Rat).SetString(value)
-	if !ok {
-		return 0, fmt.Errorf("failed to parse %v as a rational number", value)
-	}
-	nano := cpu.Mul(cpu, big.NewRat(1e9, 1))
-	if !nano.IsInt() {
-		return 0, fmt.Errorf("value is too precise")
-	}
-	return nano.Num().Int64(), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/opts_test.go b/installer/vendor/github.com/docker/docker/opts/opts_test.go
deleted file mode 100644
index 9f41e47864..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/opts_test.go
+++ /dev/null
@@ -1,232 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func TestValidateIPAddress(t *testing.T) {
-	if ret, err := ValidateIPAddress(`1.2.3.4`); err != nil || ret == "" {
-		t.Fatalf("ValidateIPAddress(`1.2.3.4`) got %s %s", ret, err)
-	}
-
-	if ret, err := ValidateIPAddress(`127.0.0.1`); err != nil || ret == "" {
-		t.Fatalf("ValidateIPAddress(`127.0.0.1`) got %s %s", ret, err)
-	}
-
-	if ret, err := ValidateIPAddress(`::1`); err != nil || ret == "" {
-		t.Fatalf("ValidateIPAddress(`::1`) got %s %s", ret, err)
-	}
-
-	if ret, err := ValidateIPAddress(`127`); err == nil || ret != "" {
-		t.Fatalf("ValidateIPAddress(`127`) got %s %s", ret, err)
-	}
-
-	if ret, err := ValidateIPAddress(`random invalid string`); err == nil || ret != "" {
-		t.Fatalf("ValidateIPAddress(`random invalid string`) got %s %s", ret, err)
-	}
-
-}
-
-func TestMapOpts(t *testing.T) {
-	tmpMap := make(map[string]string)
-	o := NewMapOpts(tmpMap, logOptsValidator)
-	o.Set("max-size=1")
-	if o.String() != "map[max-size:1]" {
-		t.Errorf("%s != [map[max-size:1]", o.String())
-	}
-
-	o.Set("max-file=2")
-	if len(tmpMap) != 2 {
-		t.Errorf("map length %d != 2", len(tmpMap))
-	}
-
-	if tmpMap["max-file"] != "2" {
-		t.Errorf("max-file = %s != 2", tmpMap["max-file"])
-	}
-
-	if tmpMap["max-size"] != "1" {
-		t.Errorf("max-size = %s != 1", tmpMap["max-size"])
-	}
-	if o.Set("dummy-val=3") == nil {
-		t.Errorf("validator is not being called")
-	}
-}
-
-func TestListOptsWithoutValidator(t *testing.T) {
-	o := NewListOpts(nil)
-	o.Set("foo")
-	if o.String() != "[foo]" {
-		t.Errorf("%s != [foo]", o.String())
-	}
-	o.Set("bar")
-	if o.Len() != 2 {
-		t.Errorf("%d != 2", o.Len())
-	}
-	o.Set("bar")
-	if o.Len() != 3 {
-		t.Errorf("%d != 3", o.Len())
-	}
-	if !o.Get("bar") {
-		t.Error("o.Get(\"bar\") == false")
-	}
-	if o.Get("baz") {
-		t.Error("o.Get(\"baz\") == true")
-	}
-	o.Delete("foo")
-	if o.String() != "[bar bar]" {
-		t.Errorf("%s != [bar bar]", o.String())
-	}
-	listOpts := o.GetAll()
-	if len(listOpts) != 2 || listOpts[0] != "bar" || listOpts[1] != "bar" {
-		t.Errorf("Expected [[bar bar]], got [%v]", listOpts)
-	}
-	mapListOpts := o.GetMap()
-	if len(mapListOpts) != 1 {
-		t.Errorf("Expected [map[bar:{}]], got [%v]", mapListOpts)
-	}
-
-}
-
-func TestListOptsWithValidator(t *testing.T) {
-	// Re-using logOptsvalidator (used by MapOpts)
-	o := NewListOpts(logOptsValidator)
-	o.Set("foo")
-	if o.String() != "[]" {
-		t.Errorf("%s != []", o.String())
-	}
-	o.Set("foo=bar")
-	if o.String() != "[]" {
-		t.Errorf("%s != []", o.String())
-	}
-	o.Set("max-file=2")
-	if o.Len() != 1 {
-		t.Errorf("%d != 1", o.Len())
-	}
-	if !o.Get("max-file=2") {
-		t.Error("o.Get(\"max-file=2\") == false")
-	}
-	if o.Get("baz") {
-		t.Error("o.Get(\"baz\") == true")
-	}
-	o.Delete("max-file=2")
-	if o.String() != "[]" {
-		t.Errorf("%s != []", o.String())
-	}
-}
-
-func TestValidateDNSSearch(t *testing.T) {
-	valid := []string{
-		`.`,
-		`a`,
-		`a.`,
-		`1.foo`,
-		`17.foo`,
-		`foo.bar`,
-		`foo.bar.baz`,
-		`foo.bar.`,
-		`foo.bar.baz`,
-		`foo1.bar2`,
-		`foo1.bar2.baz`,
-		`1foo.2bar.`,
-		`1foo.2bar.baz`,
-		`foo-1.bar-2`,
-		`foo-1.bar-2.baz`,
-		`foo-1.bar-2.`,
-		`foo-1.bar-2.baz`,
-		`1-foo.2-bar`,
-		`1-foo.2-bar.baz`,
-		`1-foo.2-bar.`,
-		`1-foo.2-bar.baz`,
-	}
-
-	invalid := []string{
-		``,
-		` `,
-		`  `,
-		`17`,
-		`17.`,
-		`.17`,
-		`17-.`,
-		`17-.foo`,
-		`.foo`,
-		`foo-.bar`,
-		`-foo.bar`,
-		`foo.bar-`,
-		`foo.bar-.baz`,
-		`foo.-bar`,
-		`foo.-bar.baz`,
-		`foo.bar.baz.this.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbethis.should.fail.on.long.name.beause.it.is.longer.thanisshouldbe`,
-	}
-
-	for _, domain := range valid {
-		if ret, err := ValidateDNSSearch(domain); err != nil || ret == "" {
-			t.Fatalf("ValidateDNSSearch(`"+domain+"`) got %s %s", ret, err)
-		}
-	}
-
-	for _, domain := range invalid {
-		if ret, err := ValidateDNSSearch(domain); err == nil || ret != "" {
-			t.Fatalf("ValidateDNSSearch(`"+domain+"`) got %s %s", ret, err)
-		}
-	}
-}
-
-func TestValidateLabel(t *testing.T) {
-	if _, err := ValidateLabel("label"); err == nil || err.Error() != "bad attribute format: label" {
-		t.Fatalf("Expected an error [bad attribute format: label], go %v", err)
-	}
-	if actual, err := ValidateLabel("key1=value1"); err != nil || actual != "key1=value1" {
-		t.Fatalf("Expected [key1=value1], got [%v,%v]", actual, err)
-	}
-	// Validate it's working with more than one =
-	if actual, err := ValidateLabel("key1=value1=value2"); err != nil {
-		t.Fatalf("Expected [key1=value1=value2], got [%v,%v]", actual, err)
-	}
-	// Validate it's working with one more
-	if actual, err := ValidateLabel("key1=value1=value2=value3"); err != nil {
-		t.Fatalf("Expected [key1=value1=value2=value2], got [%v,%v]", actual, err)
-	}
-}
-
-func logOptsValidator(val string) (string, error) {
-	allowedKeys := map[string]string{"max-size": "1", "max-file": "2"}
-	vals := strings.Split(val, "=")
-	if allowedKeys[vals[0]] != "" {
-		return val, nil
-	}
-	return "", fmt.Errorf("invalid key %s", vals[0])
-}
-
-func TestNamedListOpts(t *testing.T) {
-	var v []string
-	o := NewNamedListOptsRef("foo-name", &v, nil)
-
-	o.Set("foo")
-	if o.String() != "[foo]" {
-		t.Errorf("%s != [foo]", o.String())
-	}
-	if o.Name() != "foo-name" {
-		t.Errorf("%s != foo-name", o.Name())
-	}
-	if len(v) != 1 {
-		t.Errorf("expected foo to be in the values, got %v", v)
-	}
-}
-
-func TestNamedMapOpts(t *testing.T) {
-	tmpMap := make(map[string]string)
-	o := NewNamedMapOpts("max-name", tmpMap, nil)
-
-	o.Set("max-size=1")
-	if o.String() != "map[max-size:1]" {
-		t.Errorf("%s != [map[max-size:1]", o.String())
-	}
-	if o.Name() != "max-name" {
-		t.Errorf("%s != max-name", o.Name())
-	}
-	if _, exist := tmpMap["max-size"]; !exist {
-		t.Errorf("expected map-size to be in the values, got %v", tmpMap)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/opts_unix.go b/installer/vendor/github.com/docker/docker/opts/opts_unix.go
deleted file mode 100644
index f1ce844a8f..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/opts_unix.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// +build !windows
-
-package opts
-
-// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080
-const DefaultHTTPHost = "localhost"
diff --git a/installer/vendor/github.com/docker/docker/opts/opts_windows.go b/installer/vendor/github.com/docker/docker/opts/opts_windows.go
deleted file mode 100644
index ebe40c969c..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/opts_windows.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package opts
-
-// TODO Windows. Identify bug in GOLang 1.5.1+ and/or Windows Server 2016 TP5.
-// @jhowardmsft, @swernli.
-//
-// On Windows, this mitigates a problem with the default options of running
-// a docker client against a local docker daemon on TP5.
-//
-// What was found that if the default host is "localhost", even if the client
-// (and daemon as this is local) is not physically on a network, and the DNS
-// cache is flushed (ipconfig /flushdns), then the client will pause for
-// exactly one second when connecting to the daemon for calls. For example
-// using docker run windowsservercore cmd, the CLI will send a create followed
-// by an attach. You see the delay between the attach finishing and the attach
-// being seen by the daemon.
-//
-// Here's some daemon debug logs with additional debug spew put in. The
-// AfterWriteJSON log is the very last thing the daemon does as part of the
-// create call. The POST /attach is the second CLI call. Notice the second
-// time gap.
-//
-// time="2015-11-06T13:38:37.259627400-08:00" level=debug msg="After createRootfs"
-// time="2015-11-06T13:38:37.263626300-08:00" level=debug msg="After setHostConfig"
-// time="2015-11-06T13:38:37.267631200-08:00" level=debug msg="before createContainerPl...."
-// time="2015-11-06T13:38:37.271629500-08:00" level=debug msg=ToDiskLocking....
-// time="2015-11-06T13:38:37.275643200-08:00" level=debug msg="loggin event...."
-// time="2015-11-06T13:38:37.277627600-08:00" level=debug msg="logged event...."
-// time="2015-11-06T13:38:37.279631800-08:00" level=debug msg="In defer func"
-// time="2015-11-06T13:38:37.282628100-08:00" level=debug msg="After daemon.create"
-// time="2015-11-06T13:38:37.286651700-08:00" level=debug msg="return 2"
-// time="2015-11-06T13:38:37.289629500-08:00" level=debug msg="Returned from daemon.ContainerCreate"
-// time="2015-11-06T13:38:37.311629100-08:00" level=debug msg="After WriteJSON"
-// ... 1 second gap here....
-// time="2015-11-06T13:38:38.317866200-08:00" level=debug msg="Calling POST /v1.22/containers/984758282b842f779e805664b2c95d563adc9a979c8a3973e68c807843ee4757/attach"
-// time="2015-11-06T13:38:38.326882500-08:00" level=info msg="POST /v1.22/containers/984758282b842f779e805664b2c95d563adc9a979c8a3973e68c807843ee4757/attach?stderr=1&stdin=1&stdout=1&stream=1"
-//
-// We suspect this is either a bug introduced in GOLang 1.5.1, or that a change
-// in GOLang 1.5.1 (from 1.4.3) is exposing a bug in Windows. In theory,
-// the Windows networking stack is supposed to resolve "localhost" internally,
-// without hitting DNS, or even reading the hosts file (which is why localhost
-// is commented out in the hosts file on Windows).
-//
-// We have validated that working around this using the actual IPv4 localhost
-// address does not cause the delay.
-//
-// This does not occur with the docker client built with 1.4.3 on the same
-// Windows build, regardless of whether the daemon is built using 1.5.1
-// or 1.4.3. It does not occur on Linux. We also verified we see the same thing
-// on a cross-compiled Windows binary (from Linux).
-//
-// Final note: This is a mitigation, not a 'real' fix. It is still susceptible
-// to the delay if a user were to do 'docker run -H=tcp://localhost:2375...'
-// explicitly.
-
-// DefaultHTTPHost Default HTTP Host used if only port is provided to -H flag e.g. docker daemon -H tcp://:8080
-const DefaultHTTPHost = "127.0.0.1"
diff --git a/installer/vendor/github.com/docker/docker/opts/port.go b/installer/vendor/github.com/docker/docker/opts/port.go
deleted file mode 100644
index 020a5d1e1c..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/port.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package opts
-
-import (
-	"encoding/csv"
-	"fmt"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/go-connections/nat"
-)
-
-const (
-	portOptTargetPort    = "target"
-	portOptPublishedPort = "published"
-	portOptProtocol      = "protocol"
-	portOptMode          = "mode"
-)
-
-// PortOpt represents a port config in swarm mode.
-type PortOpt struct {
-	ports []swarm.PortConfig
-}
-
-// Set a new port value
-func (p *PortOpt) Set(value string) error {
-	longSyntax, err := regexp.MatchString(`\w+=\w+(,\w+=\w+)*`, value)
-	if err != nil {
-		return err
-	}
-	if longSyntax {
-		csvReader := csv.NewReader(strings.NewReader(value))
-		fields, err := csvReader.Read()
-		if err != nil {
-			return err
-		}
-
-		pConfig := swarm.PortConfig{}
-		for _, field := range fields {
-			parts := strings.SplitN(field, "=", 2)
-			if len(parts) != 2 {
-				return fmt.Errorf("invalid field %s", field)
-			}
-
-			key := strings.ToLower(parts[0])
-			value := strings.ToLower(parts[1])
-
-			switch key {
-			case portOptProtocol:
-				if value != string(swarm.PortConfigProtocolTCP) && value != string(swarm.PortConfigProtocolUDP) {
-					return fmt.Errorf("invalid protocol value %s", value)
-				}
-
-				pConfig.Protocol = swarm.PortConfigProtocol(value)
-			case portOptMode:
-				if value != string(swarm.PortConfigPublishModeIngress) && value != string(swarm.PortConfigPublishModeHost) {
-					return fmt.Errorf("invalid publish mode value %s", value)
-				}
-
-				pConfig.PublishMode = swarm.PortConfigPublishMode(value)
-			case portOptTargetPort:
-				tPort, err := strconv.ParseUint(value, 10, 16)
-				if err != nil {
-					return err
-				}
-
-				pConfig.TargetPort = uint32(tPort)
-			case portOptPublishedPort:
-				pPort, err := strconv.ParseUint(value, 10, 16)
-				if err != nil {
-					return err
-				}
-
-				pConfig.PublishedPort = uint32(pPort)
-			default:
-				return fmt.Errorf("invalid field key %s", key)
-			}
-		}
-
-		if pConfig.TargetPort == 0 {
-			return fmt.Errorf("missing mandatory field %q", portOptTargetPort)
-		}
-
-		if pConfig.PublishMode == "" {
-			pConfig.PublishMode = swarm.PortConfigPublishModeIngress
-		}
-
-		if pConfig.Protocol == "" {
-			pConfig.Protocol = swarm.PortConfigProtocolTCP
-		}
-
-		p.ports = append(p.ports, pConfig)
-	} else {
-		// short syntax
-		portConfigs := []swarm.PortConfig{}
-		// We can ignore errors because the format was already validated by ValidatePort
-		ports, portBindings, _ := nat.ParsePortSpecs([]string{value})
-
-		for port := range ports {
-			portConfigs = append(portConfigs, ConvertPortToPortConfig(port, portBindings)...)
-		}
-		p.ports = append(p.ports, portConfigs...)
-	}
-	return nil
-}
-
-// Type returns the type of this option
-func (p *PortOpt) Type() string {
-	return "port"
-}
-
-// String returns a string repr of this option
-func (p *PortOpt) String() string {
-	ports := []string{}
-	for _, port := range p.ports {
-		repr := fmt.Sprintf("%v:%v/%s/%s", port.PublishedPort, port.TargetPort, port.Protocol, port.PublishMode)
-		ports = append(ports, repr)
-	}
-	return strings.Join(ports, ", ")
-}
-
-// Value returns the ports
-func (p *PortOpt) Value() []swarm.PortConfig {
-	return p.ports
-}
-
-// ConvertPortToPortConfig converts ports to the swarm type
-func ConvertPortToPortConfig(
-	port nat.Port,
-	portBindings map[nat.Port][]nat.PortBinding,
-) []swarm.PortConfig {
-	ports := []swarm.PortConfig{}
-
-	for _, binding := range portBindings[port] {
-		hostPort, _ := strconv.ParseUint(binding.HostPort, 10, 16)
-		ports = append(ports, swarm.PortConfig{
-			//TODO Name: ?
-			Protocol:      swarm.PortConfigProtocol(strings.ToLower(port.Proto())),
-			TargetPort:    uint32(port.Int()),
-			PublishedPort: uint32(hostPort),
-			PublishMode:   swarm.PortConfigPublishModeIngress,
-		})
-	}
-	return ports
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/port_test.go b/installer/vendor/github.com/docker/docker/opts/port_test.go
deleted file mode 100644
index 67bcf8f1d9..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/port_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package opts
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/swarm"
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestPortOptValidSimpleSyntax(t *testing.T) {
-	testCases := []struct {
-		value    string
-		expected []swarm.PortConfig
-	}{
-		{
-			value: "80",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:    "tcp",
-					TargetPort:  80,
-					PublishMode: swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "80:8080",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    8080,
-					PublishedPort: 80,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "8080:80/tcp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    80,
-					PublishedPort: 8080,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "80:8080/udp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "udp",
-					TargetPort:    8080,
-					PublishedPort: 80,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "80-81:8080-8081/tcp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    8080,
-					PublishedPort: 80,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-				{
-					Protocol:      "tcp",
-					TargetPort:    8081,
-					PublishedPort: 81,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "80-82:8080-8082/udp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "udp",
-					TargetPort:    8080,
-					PublishedPort: 80,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-				{
-					Protocol:      "udp",
-					TargetPort:    8081,
-					PublishedPort: 81,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-				{
-					Protocol:      "udp",
-					TargetPort:    8082,
-					PublishedPort: 82,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-	}
-	for _, tc := range testCases {
-		var port PortOpt
-		assert.NilError(t, port.Set(tc.value))
-		assert.Equal(t, len(port.Value()), len(tc.expected))
-		for _, expectedPortConfig := range tc.expected {
-			assertContains(t, port.Value(), expectedPortConfig)
-		}
-	}
-}
-
-func TestPortOptValidComplexSyntax(t *testing.T) {
-	testCases := []struct {
-		value    string
-		expected []swarm.PortConfig
-	}{
-		{
-			value: "target=80",
-			expected: []swarm.PortConfig{
-				{
-					TargetPort:  80,
-					Protocol:    "tcp",
-					PublishMode: swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "target=80,protocol=tcp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:    "tcp",
-					TargetPort:  80,
-					PublishMode: swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "target=80,published=8080,protocol=tcp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    80,
-					PublishedPort: 8080,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "published=80,target=8080,protocol=tcp",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    8080,
-					PublishedPort: 80,
-					PublishMode:   swarm.PortConfigPublishModeIngress,
-				},
-			},
-		},
-		{
-			value: "target=80,published=8080,protocol=tcp,mode=host",
-			expected: []swarm.PortConfig{
-				{
-					Protocol:      "tcp",
-					TargetPort:    80,
-					PublishedPort: 8080,
-					PublishMode:   "host",
-				},
-			},
-		},
-		{
-			value: "target=80,published=8080,mode=host",
-			expected: []swarm.PortConfig{
-				{
-					TargetPort:    80,
-					PublishedPort: 8080,
-					PublishMode:   "host",
-					Protocol:      "tcp",
-				},
-			},
-		},
-		{
-			value: "target=80,published=8080,mode=ingress",
-			expected: []swarm.PortConfig{
-				{
-					TargetPort:    80,
-					PublishedPort: 8080,
-					PublishMode:   "ingress",
-					Protocol:      "tcp",
-				},
-			},
-		},
-	}
-	for _, tc := range testCases {
-		var port PortOpt
-		assert.NilError(t, port.Set(tc.value))
-		assert.Equal(t, len(port.Value()), len(tc.expected))
-		for _, expectedPortConfig := range tc.expected {
-			assertContains(t, port.Value(), expectedPortConfig)
-		}
-	}
-}
-
-func TestPortOptInvalidComplexSyntax(t *testing.T) {
-	testCases := []struct {
-		value         string
-		expectedError string
-	}{
-		{
-			value:         "invalid,target=80",
-			expectedError: "invalid field",
-		},
-		{
-			value:         "invalid=field",
-			expectedError: "invalid field",
-		},
-		{
-			value:         "protocol=invalid",
-			expectedError: "invalid protocol value",
-		},
-		{
-			value:         "target=invalid",
-			expectedError: "invalid syntax",
-		},
-		{
-			value:         "published=invalid",
-			expectedError: "invalid syntax",
-		},
-		{
-			value:         "mode=invalid",
-			expectedError: "invalid publish mode value",
-		},
-		{
-			value:         "published=8080,protocol=tcp,mode=ingress",
-			expectedError: "missing mandatory field",
-		},
-		{
-			value:         `target=80,protocol="tcp,mode=ingress"`,
-			expectedError: "non-quoted-field",
-		},
-		{
-			value:         `target=80,"protocol=tcp,mode=ingress"`,
-			expectedError: "invalid protocol value",
-		},
-	}
-	for _, tc := range testCases {
-		var port PortOpt
-		assert.Error(t, port.Set(tc.value), tc.expectedError)
-	}
-}
-
-func assertContains(t *testing.T, portConfigs []swarm.PortConfig, expected swarm.PortConfig) {
-	var contains = false
-	for _, portConfig := range portConfigs {
-		if portConfig == expected {
-			contains = true
-			break
-		}
-	}
-	if !contains {
-		t.Errorf("expected %v to contain %v, did not", portConfigs, expected)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/quotedstring.go b/installer/vendor/github.com/docker/docker/opts/quotedstring.go
deleted file mode 100644
index fb1e5374bc..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/quotedstring.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package opts
-
-// QuotedString is a string that may have extra quotes around the value. The
-// quotes are stripped from the value.
-type QuotedString struct {
-	value *string
-}
-
-// Set sets a new value
-func (s *QuotedString) Set(val string) error {
-	*s.value = trimQuotes(val)
-	return nil
-}
-
-// Type returns the type of the value
-func (s *QuotedString) Type() string {
-	return "string"
-}
-
-func (s *QuotedString) String() string {
-	return string(*s.value)
-}
-
-func trimQuotes(value string) string {
-	lastIndex := len(value) - 1
-	for _, char := range []byte{'\'', '"'} {
-		if value[0] == char && value[lastIndex] == char {
-			return value[1:lastIndex]
-		}
-	}
-	return value
-}
-
-// NewQuotedString returns a new quoted string option
-func NewQuotedString(value *string) *QuotedString {
-	return &QuotedString{value: value}
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/quotedstring_test.go b/installer/vendor/github.com/docker/docker/opts/quotedstring_test.go
deleted file mode 100644
index 0ebf04bbe0..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/quotedstring_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package opts
-
-import (
-	"github.com/docker/docker/pkg/testutil/assert"
-	"testing"
-)
-
-func TestQuotedStringSetWithQuotes(t *testing.T) {
-	value := ""
-	qs := NewQuotedString(&value)
-	assert.NilError(t, qs.Set("\"something\""))
-	assert.Equal(t, qs.String(), "something")
-	assert.Equal(t, value, "something")
-}
-
-func TestQuotedStringSetWithMismatchedQuotes(t *testing.T) {
-	value := ""
-	qs := NewQuotedString(&value)
-	assert.NilError(t, qs.Set("\"something'"))
-	assert.Equal(t, qs.String(), "\"something'")
-}
-
-func TestQuotedStringSetWithNoQuotes(t *testing.T) {
-	value := ""
-	qs := NewQuotedString(&value)
-	assert.NilError(t, qs.Set("something"))
-	assert.Equal(t, qs.String(), "something")
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/secret.go b/installer/vendor/github.com/docker/docker/opts/secret.go
deleted file mode 100644
index 1fefcf8434..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/secret.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package opts
-
-import (
-	"encoding/csv"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-)
-
-// SecretOpt is a Value type for parsing secrets
-type SecretOpt struct {
-	values []*types.SecretRequestOption
-}
-
-// Set a new secret value
-func (o *SecretOpt) Set(value string) error {
-	csvReader := csv.NewReader(strings.NewReader(value))
-	fields, err := csvReader.Read()
-	if err != nil {
-		return err
-	}
-
-	options := &types.SecretRequestOption{
-		Source: "",
-		Target: "",
-		UID:    "0",
-		GID:    "0",
-		Mode:   0444,
-	}
-
-	// support a simple syntax of --secret foo
-	if len(fields) == 1 {
-		options.Source = fields[0]
-		options.Target = fields[0]
-		o.values = append(o.values, options)
-		return nil
-	}
-
-	for _, field := range fields {
-		parts := strings.SplitN(field, "=", 2)
-		key := strings.ToLower(parts[0])
-
-		if len(parts) != 2 {
-			return fmt.Errorf("invalid field '%s' must be a key=value pair", field)
-		}
-
-		value := parts[1]
-		switch key {
-		case "source", "src":
-			options.Source = value
-		case "target":
-			tDir, _ := filepath.Split(value)
-			if tDir != "" {
-				return fmt.Errorf("target must not be a path")
-			}
-			options.Target = value
-		case "uid":
-			options.UID = value
-		case "gid":
-			options.GID = value
-		case "mode":
-			m, err := strconv.ParseUint(value, 0, 32)
-			if err != nil {
-				return fmt.Errorf("invalid mode specified: %v", err)
-			}
-
-			options.Mode = os.FileMode(m)
-		default:
-			if len(fields) == 1 && value == "" {
-
-			} else {
-				return fmt.Errorf("invalid field in secret request: %s", key)
-			}
-		}
-	}
-
-	if options.Source == "" {
-		return fmt.Errorf("source is required")
-	}
-
-	o.values = append(o.values, options)
-	return nil
-}
-
-// Type returns the type of this option
-func (o *SecretOpt) Type() string {
-	return "secret"
-}
-
-// String returns a string repr of this option
-func (o *SecretOpt) String() string {
-	secrets := []string{}
-	for _, secret := range o.values {
-		repr := fmt.Sprintf("%s -> %s", secret.Source, secret.Target)
-		secrets = append(secrets, repr)
-	}
-	return strings.Join(secrets, ", ")
-}
-
-// Value returns the secret requests
-func (o *SecretOpt) Value() []*types.SecretRequestOption {
-	return o.values
-}
diff --git a/installer/vendor/github.com/docker/docker/opts/secret_test.go b/installer/vendor/github.com/docker/docker/opts/secret_test.go
deleted file mode 100644
index d978c86e22..0000000000
--- a/installer/vendor/github.com/docker/docker/opts/secret_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package opts
-
-import (
-	"os"
-	"testing"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestSecretOptionsSimple(t *testing.T) {
-	var opt SecretOpt
-
-	testCase := "app-secret"
-	assert.NilError(t, opt.Set(testCase))
-
-	reqs := opt.Value()
-	assert.Equal(t, len(reqs), 1)
-	req := reqs[0]
-	assert.Equal(t, req.Source, "app-secret")
-	assert.Equal(t, req.Target, "app-secret")
-	assert.Equal(t, req.UID, "0")
-	assert.Equal(t, req.GID, "0")
-}
-
-func TestSecretOptionsSourceTarget(t *testing.T) {
-	var opt SecretOpt
-
-	testCase := "source=foo,target=testing"
-	assert.NilError(t, opt.Set(testCase))
-
-	reqs := opt.Value()
-	assert.Equal(t, len(reqs), 1)
-	req := reqs[0]
-	assert.Equal(t, req.Source, "foo")
-	assert.Equal(t, req.Target, "testing")
-}
-
-func TestSecretOptionsShorthand(t *testing.T) {
-	var opt SecretOpt
-
-	testCase := "src=foo,target=testing"
-	assert.NilError(t, opt.Set(testCase))
-
-	reqs := opt.Value()
-	assert.Equal(t, len(reqs), 1)
-	req := reqs[0]
-	assert.Equal(t, req.Source, "foo")
-}
-
-func TestSecretOptionsCustomUidGid(t *testing.T) {
-	var opt SecretOpt
-
-	testCase := "source=foo,target=testing,uid=1000,gid=1001"
-	assert.NilError(t, opt.Set(testCase))
-
-	reqs := opt.Value()
-	assert.Equal(t, len(reqs), 1)
-	req := reqs[0]
-	assert.Equal(t, req.Source, "foo")
-	assert.Equal(t, req.Target, "testing")
-	assert.Equal(t, req.UID, "1000")
-	assert.Equal(t, req.GID, "1001")
-}
-
-func TestSecretOptionsCustomMode(t *testing.T) {
-	var opt SecretOpt
-
-	testCase := "source=foo,target=testing,uid=1000,gid=1001,mode=0444"
-	assert.NilError(t, opt.Set(testCase))
-
-	reqs := opt.Value()
-	assert.Equal(t, len(reqs), 1)
-	req := reqs[0]
-	assert.Equal(t, req.Source, "foo")
-	assert.Equal(t, req.Target, "testing")
-	assert.Equal(t, req.UID, "1000")
-	assert.Equal(t, req.GID, "1001")
-	assert.Equal(t, req.Mode, os.FileMode(0444))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/README.md b/installer/vendor/github.com/docker/docker/pkg/README.md
deleted file mode 100644
index c4b78a8ad8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/README.md
+++ /dev/null
@@ -1,11 +0,0 @@
-pkg/ is a collection of utility packages used by the Docker project without being specific to its internals.
-
-Utility packages are kept separate from the docker core codebase to keep it as small and concise as possible.
-If some utilities grow larger and their APIs stabilize, they may be moved to their own repository under the
-Docker organization, to facilitate re-use by other projects. However that is not the priority.
-
-The directory `pkg` is named after the same directory in the camlistore project. Since Brad is a core
-Go maintainer, we thought it made sense to copy his methods for organizing Go code :) Thanks Brad!
-
-Because utility packages are small and neatly separated from the rest of the codebase, they are a good
-place to start for aspiring maintainers and contributors. Get in touch if you want to help maintain them!
diff --git a/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser.go b/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser.go
deleted file mode 100644
index ffcc5647a9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Package aaparser is a convenience package interacting with `apparmor_parser`.
-package aaparser
-
-import (
-	"fmt"
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-const (
-	binary = "apparmor_parser"
-)
-
-// GetVersion returns the major and minor version of apparmor_parser.
-func GetVersion() (int, error) {
-	output, err := cmd("", "--version")
-	if err != nil {
-		return -1, err
-	}
-
-	return parseVersion(output)
-}
-
-// LoadProfile runs `apparmor_parser -r` on a specified apparmor profile to
-// replace the profile.
-func LoadProfile(profilePath string) error {
-	_, err := cmd("", "-r", profilePath)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// cmd runs `apparmor_parser` with the passed arguments.
-func cmd(dir string, arg ...string) (string, error) {
-	c := exec.Command(binary, arg...)
-	c.Dir = dir
-
-	output, err := c.CombinedOutput()
-	if err != nil {
-		return "", fmt.Errorf("running `%s %s` failed with output: %s\nerror: %v", c.Path, strings.Join(c.Args, " "), string(output), err)
-	}
-
-	return string(output), nil
-}
-
-// parseVersion takes the output from `apparmor_parser --version` and returns
-// a representation of the {major, minor, patch} version as a single number of
-// the form MMmmPPP {major, minor, patch}.
-func parseVersion(output string) (int, error) {
-	// output is in the form of the following:
-	// AppArmor parser version 2.9.1
-	// Copyright (C) 1999-2008 Novell Inc.
-	// Copyright 2009-2012 Canonical Ltd.
-
-	lines := strings.SplitN(output, "\n", 2)
-	words := strings.Split(lines[0], " ")
-	version := words[len(words)-1]
-
-	// split by major minor version
-	v := strings.Split(version, ".")
-	if len(v) == 0 || len(v) > 3 {
-		return -1, fmt.Errorf("parsing version failed for output: `%s`", output)
-	}
-
-	// Default the versions to 0.
-	var majorVersion, minorVersion, patchLevel int
-
-	majorVersion, err := strconv.Atoi(v[0])
-	if err != nil {
-		return -1, err
-	}
-
-	if len(v) > 1 {
-		minorVersion, err = strconv.Atoi(v[1])
-		if err != nil {
-			return -1, err
-		}
-	}
-	if len(v) > 2 {
-		patchLevel, err = strconv.Atoi(v[2])
-		if err != nil {
-			return -1, err
-		}
-	}
-
-	// major*10^5 + minor*10^3 + patch*10^0
-	numericVersion := majorVersion*1e5 + minorVersion*1e3 + patchLevel
-	return numericVersion, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser_test.go b/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser_test.go
deleted file mode 100644
index 69bc8d2fd8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/aaparser/aaparser_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package aaparser
-
-import (
-	"testing"
-)
-
-type versionExpected struct {
-	output  string
-	version int
-}
-
-func TestParseVersion(t *testing.T) {
-	versions := []versionExpected{
-		{
-			output: `AppArmor parser version 2.10
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 210000,
-		},
-		{
-			output: `AppArmor parser version 2.8
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 208000,
-		},
-		{
-			output: `AppArmor parser version 2.20
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 220000,
-		},
-		{
-			output: `AppArmor parser version 2.05
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 205000,
-		},
-		{
-			output: `AppArmor parser version 2.9.95
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 209095,
-		},
-		{
-			output: `AppArmor parser version 3.14.159
-Copyright (C) 1999-2008 Novell Inc.
-Copyright 2009-2012 Canonical Ltd.
-
-`,
-			version: 314159,
-		},
-	}
-
-	for _, v := range versions {
-		version, err := parseVersion(v.output)
-		if err != nil {
-			t.Fatalf("expected error to be nil for %#v, got: %v", v, err)
-		}
-		if version != v.version {
-			t.Fatalf("expected version to be %d, was %d, for: %#v\n", v.version, version, v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/README.md b/installer/vendor/github.com/docker/docker/pkg/archive/README.md
deleted file mode 100644
index 7307d9694f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This code provides helper functions for dealing with archive files.
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive.go
deleted file mode 100644
index 3261c4f498..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive.go
+++ /dev/null
@@ -1,1175 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bufio"
-	"bytes"
-	"compress/bzip2"
-	"compress/gzip"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/fileutils"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/promise"
-	"github.com/docker/docker/pkg/system"
-)
-
-type (
-	// Compression is the state represents if compressed or not.
-	Compression int
-	// WhiteoutFormat is the format of whiteouts unpacked
-	WhiteoutFormat int
-	// TarChownOptions wraps the chown options UID and GID.
-	TarChownOptions struct {
-		UID, GID int
-	}
-
-	// TarOptions wraps the tar options.
-	TarOptions struct {
-		IncludeFiles     []string
-		ExcludePatterns  []string
-		Compression      Compression
-		NoLchown         bool
-		UIDMaps          []idtools.IDMap
-		GIDMaps          []idtools.IDMap
-		ChownOpts        *TarChownOptions
-		IncludeSourceDir bool
-		// WhiteoutFormat is the expected on disk format for whiteout files.
-		// This format will be converted to the standard format on pack
-		// and from the standard format on unpack.
-		WhiteoutFormat WhiteoutFormat
-		// When unpacking, specifies whether overwriting a directory with a
-		// non-directory is allowed and vice versa.
-		NoOverwriteDirNonDir bool
-		// For each include when creating an archive, the included name will be
-		// replaced with the matching name from this map.
-		RebaseNames map[string]string
-		InUserNS    bool
-	}
-
-	// Archiver allows the reuse of most utility functions of this package
-	// with a pluggable Untar function. Also, to facilitate the passing of
-	// specific id mappings for untar, an archiver can be created with maps
-	// which will then be passed to Untar operations
-	Archiver struct {
-		Untar   func(io.Reader, string, *TarOptions) error
-		UIDMaps []idtools.IDMap
-		GIDMaps []idtools.IDMap
-	}
-
-	// breakoutError is used to differentiate errors related to breaking out
-	// When testing archive breakout in the unit tests, this error is expected
-	// in order for the test to pass.
-	breakoutError error
-)
-
-var (
-	// ErrNotImplemented is the error message of function not implemented.
-	ErrNotImplemented = errors.New("Function not implemented")
-	defaultArchiver   = &Archiver{Untar: Untar, UIDMaps: nil, GIDMaps: nil}
-)
-
-const (
-	// HeaderSize is the size in bytes of a tar header
-	HeaderSize = 512
-)
-
-const (
-	// Uncompressed represents the uncompressed.
-	Uncompressed Compression = iota
-	// Bzip2 is bzip2 compression algorithm.
-	Bzip2
-	// Gzip is gzip compression algorithm.
-	Gzip
-	// Xz is xz compression algorithm.
-	Xz
-)
-
-const (
-	// AUFSWhiteoutFormat is the default format for whiteouts
-	AUFSWhiteoutFormat WhiteoutFormat = iota
-	// OverlayWhiteoutFormat formats whiteout according to the overlay
-	// standard.
-	OverlayWhiteoutFormat
-)
-
-// IsArchive checks for the magic bytes of a tar or any supported compression
-// algorithm.
-func IsArchive(header []byte) bool {
-	compression := DetectCompression(header)
-	if compression != Uncompressed {
-		return true
-	}
-	r := tar.NewReader(bytes.NewBuffer(header))
-	_, err := r.Next()
-	return err == nil
-}
-
-// IsArchivePath checks if the (possibly compressed) file at the given path
-// starts with a tar file header.
-func IsArchivePath(path string) bool {
-	file, err := os.Open(path)
-	if err != nil {
-		return false
-	}
-	defer file.Close()
-	rdr, err := DecompressStream(file)
-	if err != nil {
-		return false
-	}
-	r := tar.NewReader(rdr)
-	_, err = r.Next()
-	return err == nil
-}
-
-// DetectCompression detects the compression algorithm of the source.
-func DetectCompression(source []byte) Compression {
-	for compression, m := range map[Compression][]byte{
-		Bzip2: {0x42, 0x5A, 0x68},
-		Gzip:  {0x1F, 0x8B, 0x08},
-		Xz:    {0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00},
-	} {
-		if len(source) < len(m) {
-			logrus.Debug("Len too short")
-			continue
-		}
-		if bytes.Compare(m, source[:len(m)]) == 0 {
-			return compression
-		}
-	}
-	return Uncompressed
-}
-
-func xzDecompress(archive io.Reader) (io.ReadCloser, <-chan struct{}, error) {
-	args := []string{"xz", "-d", "-c", "-q"}
-
-	return cmdStream(exec.Command(args[0], args[1:]...), archive)
-}
-
-// DecompressStream decompresses the archive and returns a ReaderCloser with the decompressed archive.
-func DecompressStream(archive io.Reader) (io.ReadCloser, error) {
-	p := pools.BufioReader32KPool
-	buf := p.Get(archive)
-	bs, err := buf.Peek(10)
-	if err != nil && err != io.EOF {
-		// Note: we'll ignore any io.EOF error because there are some odd
-		// cases where the layer.tar file will be empty (zero bytes) and
-		// that results in an io.EOF from the Peek() call. So, in those
-		// cases we'll just treat it as a non-compressed stream and
-		// that means just create an empty layer.
-		// See Issue 18170
-		return nil, err
-	}
-
-	compression := DetectCompression(bs)
-	switch compression {
-	case Uncompressed:
-		readBufWrapper := p.NewReadCloserWrapper(buf, buf)
-		return readBufWrapper, nil
-	case Gzip:
-		gzReader, err := gzip.NewReader(buf)
-		if err != nil {
-			return nil, err
-		}
-		readBufWrapper := p.NewReadCloserWrapper(buf, gzReader)
-		return readBufWrapper, nil
-	case Bzip2:
-		bz2Reader := bzip2.NewReader(buf)
-		readBufWrapper := p.NewReadCloserWrapper(buf, bz2Reader)
-		return readBufWrapper, nil
-	case Xz:
-		xzReader, chdone, err := xzDecompress(buf)
-		if err != nil {
-			return nil, err
-		}
-		readBufWrapper := p.NewReadCloserWrapper(buf, xzReader)
-		return ioutils.NewReadCloserWrapper(readBufWrapper, func() error {
-			<-chdone
-			return readBufWrapper.Close()
-		}), nil
-	default:
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	}
-}
-
-// CompressStream compresseses the dest with specified compression algorithm.
-func CompressStream(dest io.Writer, compression Compression) (io.WriteCloser, error) {
-	p := pools.BufioWriter32KPool
-	buf := p.Get(dest)
-	switch compression {
-	case Uncompressed:
-		writeBufWrapper := p.NewWriteCloserWrapper(buf, buf)
-		return writeBufWrapper, nil
-	case Gzip:
-		gzWriter := gzip.NewWriter(dest)
-		writeBufWrapper := p.NewWriteCloserWrapper(buf, gzWriter)
-		return writeBufWrapper, nil
-	case Bzip2, Xz:
-		// archive/bzip2 does not support writing, and there is no xz support at all
-		// However, this is not a problem as docker only currently generates gzipped tars
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	default:
-		return nil, fmt.Errorf("Unsupported compression format %s", (&compression).Extension())
-	}
-}
-
-// Extension returns the extension of a file that uses the specified compression algorithm.
-func (compression *Compression) Extension() string {
-	switch *compression {
-	case Uncompressed:
-		return "tar"
-	case Bzip2:
-		return "tar.bz2"
-	case Gzip:
-		return "tar.gz"
-	case Xz:
-		return "tar.xz"
-	}
-	return ""
-}
-
-type tarWhiteoutConverter interface {
-	ConvertWrite(*tar.Header, string, os.FileInfo) (*tar.Header, error)
-	ConvertRead(*tar.Header, string) (bool, error)
-}
-
-type tarAppender struct {
-	TarWriter *tar.Writer
-	Buffer    *bufio.Writer
-
-	// for hardlink mapping
-	SeenFiles map[uint64]string
-	UIDMaps   []idtools.IDMap
-	GIDMaps   []idtools.IDMap
-
-	// For packing and unpacking whiteout files in the
-	// non standard format. The whiteout files defined
-	// by the AUFS standard are used as the tar whiteout
-	// standard.
-	WhiteoutConverter tarWhiteoutConverter
-}
-
-// canonicalTarName provides a platform-independent and consistent posix-style
-//path for files and directories to be archived regardless of the platform.
-func canonicalTarName(name string, isDir bool) (string, error) {
-	name, err := CanonicalTarNameForPath(name)
-	if err != nil {
-		return "", err
-	}
-
-	// suffix with '/' for directories
-	if isDir && !strings.HasSuffix(name, "/") {
-		name += "/"
-	}
-	return name, nil
-}
-
-// addTarFile adds to the tar archive a file from `path` as `name`
-func (ta *tarAppender) addTarFile(path, name string) error {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return err
-	}
-
-	link := ""
-	if fi.Mode()&os.ModeSymlink != 0 {
-		if link, err = os.Readlink(path); err != nil {
-			return err
-		}
-	}
-
-	hdr, err := tar.FileInfoHeader(fi, link)
-	if err != nil {
-		return err
-	}
-	hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
-
-	name, err = canonicalTarName(name, fi.IsDir())
-	if err != nil {
-		return fmt.Errorf("tar: cannot canonicalize path: %v", err)
-	}
-	hdr.Name = name
-
-	inode, err := setHeaderForSpecialDevice(hdr, ta, name, fi.Sys())
-	if err != nil {
-		return err
-	}
-
-	// if it's not a directory and has more than 1 link,
-	// it's hard linked, so set the type flag accordingly
-	if !fi.IsDir() && hasHardlinks(fi) {
-		// a link should have a name that it links too
-		// and that linked name should be first in the tar archive
-		if oldpath, ok := ta.SeenFiles[inode]; ok {
-			hdr.Typeflag = tar.TypeLink
-			hdr.Linkname = oldpath
-			hdr.Size = 0 // This Must be here for the writer math to add up!
-		} else {
-			ta.SeenFiles[inode] = name
-		}
-	}
-
-	capability, _ := system.Lgetxattr(path, "security.capability")
-	if capability != nil {
-		hdr.Xattrs = make(map[string]string)
-		hdr.Xattrs["security.capability"] = string(capability)
-	}
-
-	//handle re-mapping container ID mappings back to host ID mappings before
-	//writing tar headers/files. We skip whiteout files because they were written
-	//by the kernel and already have proper ownership relative to the host
-	if !strings.HasPrefix(filepath.Base(hdr.Name), WhiteoutPrefix) && (ta.UIDMaps != nil || ta.GIDMaps != nil) {
-		uid, gid, err := getFileUIDGID(fi.Sys())
-		if err != nil {
-			return err
-		}
-		xUID, err := idtools.ToContainer(uid, ta.UIDMaps)
-		if err != nil {
-			return err
-		}
-		xGID, err := idtools.ToContainer(gid, ta.GIDMaps)
-		if err != nil {
-			return err
-		}
-		hdr.Uid = xUID
-		hdr.Gid = xGID
-	}
-
-	if ta.WhiteoutConverter != nil {
-		wo, err := ta.WhiteoutConverter.ConvertWrite(hdr, path, fi)
-		if err != nil {
-			return err
-		}
-
-		// If a new whiteout file exists, write original hdr, then
-		// replace hdr with wo to be written after. Whiteouts should
-		// always be written after the original. Note the original
-		// hdr may have been updated to be a whiteout with returning
-		// a whiteout header
-		if wo != nil {
-			if err := ta.TarWriter.WriteHeader(hdr); err != nil {
-				return err
-			}
-			if hdr.Typeflag == tar.TypeReg && hdr.Size > 0 {
-				return fmt.Errorf("tar: cannot use whiteout for non-empty file")
-			}
-			hdr = wo
-		}
-	}
-
-	if err := ta.TarWriter.WriteHeader(hdr); err != nil {
-		return err
-	}
-
-	if hdr.Typeflag == tar.TypeReg && hdr.Size > 0 {
-		// We use system.OpenSequential to ensure we use sequential file
-		// access on Windows to avoid depleting the standby list.
-		// On Linux, this equates to a regular os.Open.
-		file, err := system.OpenSequential(path)
-		if err != nil {
-			return err
-		}
-
-		ta.Buffer.Reset(ta.TarWriter)
-		defer ta.Buffer.Reset(nil)
-		_, err = io.Copy(ta.Buffer, file)
-		file.Close()
-		if err != nil {
-			return err
-		}
-		err = ta.Buffer.Flush()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func createTarFile(path, extractDir string, hdr *tar.Header, reader io.Reader, Lchown bool, chownOpts *TarChownOptions, inUserns bool) error {
-	// hdr.Mode is in linux format, which we can use for sycalls,
-	// but for os.Foo() calls we need the mode converted to os.FileMode,
-	// so use hdrInfo.Mode() (they differ for e.g. setuid bits)
-	hdrInfo := hdr.FileInfo()
-
-	switch hdr.Typeflag {
-	case tar.TypeDir:
-		// Create directory unless it exists as a directory already.
-		// In that case we just want to merge the two
-		if fi, err := os.Lstat(path); !(err == nil && fi.IsDir()) {
-			if err := os.Mkdir(path, hdrInfo.Mode()); err != nil {
-				return err
-			}
-		}
-
-	case tar.TypeReg, tar.TypeRegA:
-		// Source is regular file. We use system.OpenFileSequential to use sequential
-		// file access to avoid depleting the standby list on Windows.
-		// On Linux, this equates to a regular os.OpenFile
-		file, err := system.OpenFileSequential(path, os.O_CREATE|os.O_WRONLY, hdrInfo.Mode())
-		if err != nil {
-			return err
-		}
-		if _, err := io.Copy(file, reader); err != nil {
-			file.Close()
-			return err
-		}
-		file.Close()
-
-	case tar.TypeBlock, tar.TypeChar:
-		if inUserns { // cannot create devices in a userns
-			return nil
-		}
-		// Handle this is an OS-specific way
-		if err := handleTarTypeBlockCharFifo(hdr, path); err != nil {
-			return err
-		}
-
-	case tar.TypeFifo:
-		// Handle this is an OS-specific way
-		if err := handleTarTypeBlockCharFifo(hdr, path); err != nil {
-			return err
-		}
-
-	case tar.TypeLink:
-		targetPath := filepath.Join(extractDir, hdr.Linkname)
-		// check for hardlink breakout
-		if !strings.HasPrefix(targetPath, extractDir) {
-			return breakoutError(fmt.Errorf("invalid hardlink %q -> %q", targetPath, hdr.Linkname))
-		}
-		if err := os.Link(targetPath, path); err != nil {
-			return err
-		}
-
-	case tar.TypeSymlink:
-		// 	path 				-> hdr.Linkname = targetPath
-		// e.g. /extractDir/path/to/symlink 	-> ../2/file	= /extractDir/path/2/file
-		targetPath := filepath.Join(filepath.Dir(path), hdr.Linkname)
-
-		// the reason we don't need to check symlinks in the path (with FollowSymlinkInScope) is because
-		// that symlink would first have to be created, which would be caught earlier, at this very check:
-		if !strings.HasPrefix(targetPath, extractDir) {
-			return breakoutError(fmt.Errorf("invalid symlink %q -> %q", path, hdr.Linkname))
-		}
-		if err := os.Symlink(hdr.Linkname, path); err != nil {
-			return err
-		}
-
-	case tar.TypeXGlobalHeader:
-		logrus.Debug("PAX Global Extended Headers found and ignored")
-		return nil
-
-	default:
-		return fmt.Errorf("Unhandled tar header type %d\n", hdr.Typeflag)
-	}
-
-	// Lchown is not supported on Windows.
-	if Lchown && runtime.GOOS != "windows" {
-		if chownOpts == nil {
-			chownOpts = &TarChownOptions{UID: hdr.Uid, GID: hdr.Gid}
-		}
-		if err := os.Lchown(path, chownOpts.UID, chownOpts.GID); err != nil {
-			return err
-		}
-	}
-
-	var errors []string
-	for key, value := range hdr.Xattrs {
-		if err := system.Lsetxattr(path, key, []byte(value), 0); err != nil {
-			if err == syscall.ENOTSUP {
-				// We ignore errors here because not all graphdrivers support
-				// xattrs *cough* old versions of AUFS *cough*. However only
-				// ENOTSUP should be emitted in that case, otherwise we still
-				// bail.
-				errors = append(errors, err.Error())
-				continue
-			}
-			return err
-		}
-
-	}
-
-	if len(errors) > 0 {
-		logrus.WithFields(logrus.Fields{
-			"errors": errors,
-		}).Warn("ignored xattrs in archive: underlying filesystem doesn't support them")
-	}
-
-	// There is no LChmod, so ignore mode for symlink. Also, this
-	// must happen after chown, as that can modify the file mode
-	if err := handleLChmod(hdr, path, hdrInfo); err != nil {
-		return err
-	}
-
-	aTime := hdr.AccessTime
-	if aTime.Before(hdr.ModTime) {
-		// Last access time should never be before last modified time.
-		aTime = hdr.ModTime
-	}
-
-	// system.Chtimes doesn't support a NOFOLLOW flag atm
-	if hdr.Typeflag == tar.TypeLink {
-		if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
-			if err := system.Chtimes(path, aTime, hdr.ModTime); err != nil {
-				return err
-			}
-		}
-	} else if hdr.Typeflag != tar.TypeSymlink {
-		if err := system.Chtimes(path, aTime, hdr.ModTime); err != nil {
-			return err
-		}
-	} else {
-		ts := []syscall.Timespec{timeToTimespec(aTime), timeToTimespec(hdr.ModTime)}
-		if err := system.LUtimesNano(path, ts); err != nil && err != system.ErrNotSupportedPlatform {
-			return err
-		}
-	}
-	return nil
-}
-
-// Tar creates an archive from the directory at `path`, and returns it as a
-// stream of bytes.
-func Tar(path string, compression Compression) (io.ReadCloser, error) {
-	return TarWithOptions(path, &TarOptions{Compression: compression})
-}
-
-// TarWithOptions creates an archive from the directory at `path`, only including files whose relative
-// paths are included in `options.IncludeFiles` (if non-nil) or not in `options.ExcludePatterns`.
-func TarWithOptions(srcPath string, options *TarOptions) (io.ReadCloser, error) {
-
-	// Fix the source path to work with long path names. This is a no-op
-	// on platforms other than Windows.
-	srcPath = fixVolumePathPrefix(srcPath)
-
-	patterns, patDirs, exceptions, err := fileutils.CleanPatterns(options.ExcludePatterns)
-
-	if err != nil {
-		return nil, err
-	}
-
-	pipeReader, pipeWriter := io.Pipe()
-
-	compressWriter, err := CompressStream(pipeWriter, options.Compression)
-	if err != nil {
-		return nil, err
-	}
-
-	go func() {
-		ta := &tarAppender{
-			TarWriter:         tar.NewWriter(compressWriter),
-			Buffer:            pools.BufioWriter32KPool.Get(nil),
-			SeenFiles:         make(map[uint64]string),
-			UIDMaps:           options.UIDMaps,
-			GIDMaps:           options.GIDMaps,
-			WhiteoutConverter: getWhiteoutConverter(options.WhiteoutFormat),
-		}
-
-		defer func() {
-			// Make sure to check the error on Close.
-			if err := ta.TarWriter.Close(); err != nil {
-				logrus.Errorf("Can't close tar writer: %s", err)
-			}
-			if err := compressWriter.Close(); err != nil {
-				logrus.Errorf("Can't close compress writer: %s", err)
-			}
-			if err := pipeWriter.Close(); err != nil {
-				logrus.Errorf("Can't close pipe writer: %s", err)
-			}
-		}()
-
-		// this buffer is needed for the duration of this piped stream
-		defer pools.BufioWriter32KPool.Put(ta.Buffer)
-
-		// In general we log errors here but ignore them because
-		// during e.g. a diff operation the container can continue
-		// mutating the filesystem and we can see transient errors
-		// from this
-
-		stat, err := os.Lstat(srcPath)
-		if err != nil {
-			return
-		}
-
-		if !stat.IsDir() {
-			// We can't later join a non-dir with any includes because the
-			// 'walk' will error if "file/." is stat-ed and "file" is not a
-			// directory. So, we must split the source path and use the
-			// basename as the include.
-			if len(options.IncludeFiles) > 0 {
-				logrus.Warn("Tar: Can't archive a file with includes")
-			}
-
-			dir, base := SplitPathDirEntry(srcPath)
-			srcPath = dir
-			options.IncludeFiles = []string{base}
-		}
-
-		if len(options.IncludeFiles) == 0 {
-			options.IncludeFiles = []string{"."}
-		}
-
-		seen := make(map[string]bool)
-
-		for _, include := range options.IncludeFiles {
-			rebaseName := options.RebaseNames[include]
-
-			walkRoot := getWalkRoot(srcPath, include)
-			filepath.Walk(walkRoot, func(filePath string, f os.FileInfo, err error) error {
-				if err != nil {
-					logrus.Errorf("Tar: Can't stat file %s to tar: %s", srcPath, err)
-					return nil
-				}
-
-				relFilePath, err := filepath.Rel(srcPath, filePath)
-				if err != nil || (!options.IncludeSourceDir && relFilePath == "." && f.IsDir()) {
-					// Error getting relative path OR we are looking
-					// at the source directory path. Skip in both situations.
-					return nil
-				}
-
-				if options.IncludeSourceDir && include == "." && relFilePath != "." {
-					relFilePath = strings.Join([]string{".", relFilePath}, string(filepath.Separator))
-				}
-
-				skip := false
-
-				// If "include" is an exact match for the current file
-				// then even if there's an "excludePatterns" pattern that
-				// matches it, don't skip it. IOW, assume an explicit 'include'
-				// is asking for that file no matter what - which is true
-				// for some files, like .dockerignore and Dockerfile (sometimes)
-				if include != relFilePath {
-					skip, err = fileutils.OptimizedMatches(relFilePath, patterns, patDirs)
-					if err != nil {
-						logrus.Errorf("Error matching %s: %v", relFilePath, err)
-						return err
-					}
-				}
-
-				if skip {
-					// If we want to skip this file and its a directory
-					// then we should first check to see if there's an
-					// excludes pattern (eg !dir/file) that starts with this
-					// dir. If so then we can't skip this dir.
-
-					// Its not a dir then so we can just return/skip.
-					if !f.IsDir() {
-						return nil
-					}
-
-					// No exceptions (!...) in patterns so just skip dir
-					if !exceptions {
-						return filepath.SkipDir
-					}
-
-					dirSlash := relFilePath + string(filepath.Separator)
-
-					for _, pat := range patterns {
-						if pat[0] != '!' {
-							continue
-						}
-						pat = pat[1:] + string(filepath.Separator)
-						if strings.HasPrefix(pat, dirSlash) {
-							// found a match - so can't skip this dir
-							return nil
-						}
-					}
-
-					// No matching exclusion dir so just skip dir
-					return filepath.SkipDir
-				}
-
-				if seen[relFilePath] {
-					return nil
-				}
-				seen[relFilePath] = true
-
-				// Rename the base resource.
-				if rebaseName != "" {
-					var replacement string
-					if rebaseName != string(filepath.Separator) {
-						// Special case the root directory to replace with an
-						// empty string instead so that we don't end up with
-						// double slashes in the paths.
-						replacement = rebaseName
-					}
-
-					relFilePath = strings.Replace(relFilePath, include, replacement, 1)
-				}
-
-				if err := ta.addTarFile(filePath, relFilePath); err != nil {
-					logrus.Errorf("Can't add file %s to tar: %s", filePath, err)
-					// if pipe is broken, stop writing tar stream to it
-					if err == io.ErrClosedPipe {
-						return err
-					}
-				}
-				return nil
-			})
-		}
-	}()
-
-	return pipeReader, nil
-}
-
-// Unpack unpacks the decompressedArchive to dest with options.
-func Unpack(decompressedArchive io.Reader, dest string, options *TarOptions) error {
-	tr := tar.NewReader(decompressedArchive)
-	trBuf := pools.BufioReader32KPool.Get(nil)
-	defer pools.BufioReader32KPool.Put(trBuf)
-
-	var dirs []*tar.Header
-	remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps)
-	if err != nil {
-		return err
-	}
-	whiteoutConverter := getWhiteoutConverter(options.WhiteoutFormat)
-
-	// Iterate through the files in the archive.
-loop:
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		// Normalize name, for safety and for a simple is-root check
-		// This keeps "../" as-is, but normalizes "/../" to "/". Or Windows:
-		// This keeps "..\" as-is, but normalizes "\..\" to "\".
-		hdr.Name = filepath.Clean(hdr.Name)
-
-		for _, exclude := range options.ExcludePatterns {
-			if strings.HasPrefix(hdr.Name, exclude) {
-				continue loop
-			}
-		}
-
-		// After calling filepath.Clean(hdr.Name) above, hdr.Name will now be in
-		// the filepath format for the OS on which the daemon is running. Hence
-		// the check for a slash-suffix MUST be done in an OS-agnostic way.
-		if !strings.HasSuffix(hdr.Name, string(os.PathSeparator)) {
-			// Not the root directory, ensure that the parent directory exists
-			parent := filepath.Dir(hdr.Name)
-			parentPath := filepath.Join(dest, parent)
-			if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
-				err = idtools.MkdirAllNewAs(parentPath, 0777, remappedRootUID, remappedRootGID)
-				if err != nil {
-					return err
-				}
-			}
-		}
-
-		path := filepath.Join(dest, hdr.Name)
-		rel, err := filepath.Rel(dest, path)
-		if err != nil {
-			return err
-		}
-		if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
-			return breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
-		}
-
-		// If path exits we almost always just want to remove and replace it
-		// The only exception is when it is a directory *and* the file from
-		// the layer is also a directory. Then we want to merge them (i.e.
-		// just apply the metadata from the layer).
-		if fi, err := os.Lstat(path); err == nil {
-			if options.NoOverwriteDirNonDir && fi.IsDir() && hdr.Typeflag != tar.TypeDir {
-				// If NoOverwriteDirNonDir is true then we cannot replace
-				// an existing directory with a non-directory from the archive.
-				return fmt.Errorf("cannot overwrite directory %q with non-directory %q", path, dest)
-			}
-
-			if options.NoOverwriteDirNonDir && !fi.IsDir() && hdr.Typeflag == tar.TypeDir {
-				// If NoOverwriteDirNonDir is true then we cannot replace
-				// an existing non-directory with a directory from the archive.
-				return fmt.Errorf("cannot overwrite non-directory %q with directory %q", path, dest)
-			}
-
-			if fi.IsDir() && hdr.Name == "." {
-				continue
-			}
-
-			if !(fi.IsDir() && hdr.Typeflag == tar.TypeDir) {
-				if err := os.RemoveAll(path); err != nil {
-					return err
-				}
-			}
-		}
-		trBuf.Reset(tr)
-
-		// if the options contain a uid & gid maps, convert header uid/gid
-		// entries using the maps such that lchown sets the proper mapped
-		// uid/gid after writing the file. We only perform this mapping if
-		// the file isn't already owned by the remapped root UID or GID, as
-		// that specific uid/gid has no mapping from container -> host, and
-		// those files already have the proper ownership for inside the
-		// container.
-		if hdr.Uid != remappedRootUID {
-			xUID, err := idtools.ToHost(hdr.Uid, options.UIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Uid = xUID
-		}
-		if hdr.Gid != remappedRootGID {
-			xGID, err := idtools.ToHost(hdr.Gid, options.GIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Gid = xGID
-		}
-
-		if whiteoutConverter != nil {
-			writeFile, err := whiteoutConverter.ConvertRead(hdr, path)
-			if err != nil {
-				return err
-			}
-			if !writeFile {
-				continue
-			}
-		}
-
-		if err := createTarFile(path, dest, hdr, trBuf, !options.NoLchown, options.ChownOpts, options.InUserNS); err != nil {
-			return err
-		}
-
-		// Directory mtimes must be handled at the end to avoid further
-		// file creation in them to modify the directory mtime
-		if hdr.Typeflag == tar.TypeDir {
-			dirs = append(dirs, hdr)
-		}
-	}
-
-	for _, hdr := range dirs {
-		path := filepath.Join(dest, hdr.Name)
-
-		if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Untar reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive may be compressed with one of the following algorithms:
-//  identity (uncompressed), gzip, bzip2, xz.
-// FIXME: specify behavior when target path exists vs. doesn't exist.
-func Untar(tarArchive io.Reader, dest string, options *TarOptions) error {
-	return untarHandler(tarArchive, dest, options, true)
-}
-
-// UntarUncompressed reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive must be an uncompressed stream.
-func UntarUncompressed(tarArchive io.Reader, dest string, options *TarOptions) error {
-	return untarHandler(tarArchive, dest, options, false)
-}
-
-// Handler for teasing out the automatic decompression
-func untarHandler(tarArchive io.Reader, dest string, options *TarOptions, decompress bool) error {
-	if tarArchive == nil {
-		return fmt.Errorf("Empty archive")
-	}
-	dest = filepath.Clean(dest)
-	if options == nil {
-		options = &TarOptions{}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-
-	r := tarArchive
-	if decompress {
-		decompressedArchive, err := DecompressStream(tarArchive)
-		if err != nil {
-			return err
-		}
-		defer decompressedArchive.Close()
-		r = decompressedArchive
-	}
-
-	return Unpack(r, dest, options)
-}
-
-// TarUntar is a convenience function which calls Tar and Untar, with the output of one piped into the other.
-// If either Tar or Untar fails, TarUntar aborts and returns the error.
-func (archiver *Archiver) TarUntar(src, dst string) error {
-	logrus.Debugf("TarUntar(%s %s)", src, dst)
-	archive, err := TarWithOptions(src, &TarOptions{Compression: Uncompressed})
-	if err != nil {
-		return err
-	}
-	defer archive.Close()
-
-	var options *TarOptions
-	if archiver.UIDMaps != nil || archiver.GIDMaps != nil {
-		options = &TarOptions{
-			UIDMaps: archiver.UIDMaps,
-			GIDMaps: archiver.GIDMaps,
-		}
-	}
-	return archiver.Untar(archive, dst, options)
-}
-
-// TarUntar is a convenience function which calls Tar and Untar, with the output of one piped into the other.
-// If either Tar or Untar fails, TarUntar aborts and returns the error.
-func TarUntar(src, dst string) error {
-	return defaultArchiver.TarUntar(src, dst)
-}
-
-// UntarPath untar a file from path to a destination, src is the source tar file path.
-func (archiver *Archiver) UntarPath(src, dst string) error {
-	archive, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer archive.Close()
-	var options *TarOptions
-	if archiver.UIDMaps != nil || archiver.GIDMaps != nil {
-		options = &TarOptions{
-			UIDMaps: archiver.UIDMaps,
-			GIDMaps: archiver.GIDMaps,
-		}
-	}
-	return archiver.Untar(archive, dst, options)
-}
-
-// UntarPath is a convenience function which looks for an archive
-// at filesystem path `src`, and unpacks it at `dst`.
-func UntarPath(src, dst string) error {
-	return defaultArchiver.UntarPath(src, dst)
-}
-
-// CopyWithTar creates a tar archive of filesystem path `src`, and
-// unpacks it at filesystem path `dst`.
-// The archive is streamed directly with fixed buffering and no
-// intermediary disk IO.
-func (archiver *Archiver) CopyWithTar(src, dst string) error {
-	srcSt, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-	if !srcSt.IsDir() {
-		return archiver.CopyFileWithTar(src, dst)
-	}
-
-	// if this archiver is set up with ID mapping we need to create
-	// the new destination directory with the remapped root UID/GID pair
-	// as owner
-	rootUID, rootGID, err := idtools.GetRootUIDGID(archiver.UIDMaps, archiver.GIDMaps)
-	if err != nil {
-		return err
-	}
-	// Create dst, copy src's content into it
-	logrus.Debugf("Creating dest directory: %s", dst)
-	if err := idtools.MkdirAllNewAs(dst, 0755, rootUID, rootGID); err != nil {
-		return err
-	}
-	logrus.Debugf("Calling TarUntar(%s, %s)", src, dst)
-	return archiver.TarUntar(src, dst)
-}
-
-// CopyWithTar creates a tar archive of filesystem path `src`, and
-// unpacks it at filesystem path `dst`.
-// The archive is streamed directly with fixed buffering and no
-// intermediary disk IO.
-func CopyWithTar(src, dst string) error {
-	return defaultArchiver.CopyWithTar(src, dst)
-}
-
-// CopyFileWithTar emulates the behavior of the 'cp' command-line
-// for a single file. It copies a regular file from path `src` to
-// path `dst`, and preserves all its metadata.
-func (archiver *Archiver) CopyFileWithTar(src, dst string) (err error) {
-	logrus.Debugf("CopyFileWithTar(%s, %s)", src, dst)
-	srcSt, err := os.Stat(src)
-	if err != nil {
-		return err
-	}
-
-	if srcSt.IsDir() {
-		return fmt.Errorf("Can't copy a directory")
-	}
-
-	// Clean up the trailing slash. This must be done in an operating
-	// system specific manner.
-	if dst[len(dst)-1] == os.PathSeparator {
-		dst = filepath.Join(dst, filepath.Base(src))
-	}
-	// Create the holding directory if necessary
-	if err := system.MkdirAll(filepath.Dir(dst), 0700); err != nil {
-		return err
-	}
-
-	r, w := io.Pipe()
-	errC := promise.Go(func() error {
-		defer w.Close()
-
-		srcF, err := os.Open(src)
-		if err != nil {
-			return err
-		}
-		defer srcF.Close()
-
-		hdr, err := tar.FileInfoHeader(srcSt, "")
-		if err != nil {
-			return err
-		}
-		hdr.Name = filepath.Base(dst)
-		hdr.Mode = int64(chmodTarEntry(os.FileMode(hdr.Mode)))
-
-		remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(archiver.UIDMaps, archiver.GIDMaps)
-		if err != nil {
-			return err
-		}
-
-		// only perform mapping if the file being copied isn't already owned by the
-		// uid or gid of the remapped root in the container
-		if remappedRootUID != hdr.Uid {
-			xUID, err := idtools.ToHost(hdr.Uid, archiver.UIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Uid = xUID
-		}
-		if remappedRootGID != hdr.Gid {
-			xGID, err := idtools.ToHost(hdr.Gid, archiver.GIDMaps)
-			if err != nil {
-				return err
-			}
-			hdr.Gid = xGID
-		}
-
-		tw := tar.NewWriter(w)
-		defer tw.Close()
-		if err := tw.WriteHeader(hdr); err != nil {
-			return err
-		}
-		if _, err := io.Copy(tw, srcF); err != nil {
-			return err
-		}
-		return nil
-	})
-	defer func() {
-		if er := <-errC; err == nil && er != nil {
-			err = er
-		}
-	}()
-
-	err = archiver.Untar(r, filepath.Dir(dst), nil)
-	if err != nil {
-		r.CloseWithError(err)
-	}
-	return err
-}
-
-// CopyFileWithTar emulates the behavior of the 'cp' command-line
-// for a single file. It copies a regular file from path `src` to
-// path `dst`, and preserves all its metadata.
-//
-// Destination handling is in an operating specific manner depending
-// where the daemon is running. If `dst` ends with a trailing slash
-// the final destination path will be `dst/base(src)`  (Linux) or
-// `dst\base(src)` (Windows).
-func CopyFileWithTar(src, dst string) (err error) {
-	return defaultArchiver.CopyFileWithTar(src, dst)
-}
-
-// cmdStream executes a command, and returns its stdout as a stream.
-// If the command fails to run or doesn't complete successfully, an error
-// will be returned, including anything written on stderr.
-func cmdStream(cmd *exec.Cmd, input io.Reader) (io.ReadCloser, <-chan struct{}, error) {
-	chdone := make(chan struct{})
-	cmd.Stdin = input
-	pipeR, pipeW := io.Pipe()
-	cmd.Stdout = pipeW
-	var errBuf bytes.Buffer
-	cmd.Stderr = &errBuf
-
-	// Run the command and return the pipe
-	if err := cmd.Start(); err != nil {
-		return nil, nil, err
-	}
-
-	// Copy stdout to the returned pipe
-	go func() {
-		if err := cmd.Wait(); err != nil {
-			pipeW.CloseWithError(fmt.Errorf("%s: %s", err, errBuf.String()))
-		} else {
-			pipeW.Close()
-		}
-		close(chdone)
-	}()
-
-	return pipeR, chdone, nil
-}
-
-// NewTempArchive reads the content of src into a temporary file, and returns the contents
-// of that file as an archive. The archive can only be read once - as soon as reading completes,
-// the file will be deleted.
-func NewTempArchive(src io.Reader, dir string) (*TempArchive, error) {
-	f, err := ioutil.TempFile(dir, "")
-	if err != nil {
-		return nil, err
-	}
-	if _, err := io.Copy(f, src); err != nil {
-		return nil, err
-	}
-	if _, err := f.Seek(0, 0); err != nil {
-		return nil, err
-	}
-	st, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	size := st.Size()
-	return &TempArchive{File: f, Size: size}, nil
-}
-
-// TempArchive is a temporary archive. The archive can only be read once - as soon as reading completes,
-// the file will be deleted.
-type TempArchive struct {
-	*os.File
-	Size   int64 // Pre-computed from Stat().Size() as a convenience
-	read   int64
-	closed bool
-}
-
-// Close closes the underlying file if it's still open, or does a no-op
-// to allow callers to try to close the TempArchive multiple times safely.
-func (archive *TempArchive) Close() error {
-	if archive.closed {
-		return nil
-	}
-
-	archive.closed = true
-
-	return archive.File.Close()
-}
-
-func (archive *TempArchive) Read(data []byte) (int, error) {
-	n, err := archive.File.Read(data)
-	archive.read += int64(n)
-	if err != nil || archive.read == archive.Size {
-		archive.Close()
-		os.Remove(archive.File.Name())
-	}
-	return n, err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux.go
deleted file mode 100644
index 6b2a31ff1f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {
-	if format == OverlayWhiteoutFormat {
-		return overlayWhiteoutConverter{}
-	}
-	return nil
-}
-
-type overlayWhiteoutConverter struct{}
-
-func (overlayWhiteoutConverter) ConvertWrite(hdr *tar.Header, path string, fi os.FileInfo) (wo *tar.Header, err error) {
-	// convert whiteouts to AUFS format
-	if fi.Mode()&os.ModeCharDevice != 0 && hdr.Devmajor == 0 && hdr.Devminor == 0 {
-		// we just rename the file and make it normal
-		dir, filename := filepath.Split(hdr.Name)
-		hdr.Name = filepath.Join(dir, WhiteoutPrefix+filename)
-		hdr.Mode = 0600
-		hdr.Typeflag = tar.TypeReg
-		hdr.Size = 0
-	}
-
-	if fi.Mode()&os.ModeDir != 0 {
-		// convert opaque dirs to AUFS format by writing an empty file with the prefix
-		opaque, err := system.Lgetxattr(path, "trusted.overlay.opaque")
-		if err != nil {
-			return nil, err
-		}
-		if len(opaque) == 1 && opaque[0] == 'y' {
-			if hdr.Xattrs != nil {
-				delete(hdr.Xattrs, "trusted.overlay.opaque")
-			}
-
-			// create a header for the whiteout file
-			// it should inherit some properties from the parent, but be a regular file
-			wo = &tar.Header{
-				Typeflag:   tar.TypeReg,
-				Mode:       hdr.Mode & int64(os.ModePerm),
-				Name:       filepath.Join(hdr.Name, WhiteoutOpaqueDir),
-				Size:       0,
-				Uid:        hdr.Uid,
-				Uname:      hdr.Uname,
-				Gid:        hdr.Gid,
-				Gname:      hdr.Gname,
-				AccessTime: hdr.AccessTime,
-				ChangeTime: hdr.ChangeTime,
-			}
-		}
-	}
-
-	return
-}
-
-func (overlayWhiteoutConverter) ConvertRead(hdr *tar.Header, path string) (bool, error) {
-	base := filepath.Base(path)
-	dir := filepath.Dir(path)
-
-	// if a directory is marked as opaque by the AUFS special file, we need to translate that to overlay
-	if base == WhiteoutOpaqueDir {
-		if err := syscall.Setxattr(dir, "trusted.overlay.opaque", []byte{'y'}, 0); err != nil {
-			return false, err
-		}
-
-		// don't write the file itself
-		return false, nil
-	}
-
-	// if a file was deleted and we are using overlay, we need to create a character device
-	if strings.HasPrefix(base, WhiteoutPrefix) {
-		originalBase := base[len(WhiteoutPrefix):]
-		originalPath := filepath.Join(dir, originalBase)
-
-		if err := syscall.Mknod(originalPath, syscall.S_IFCHR, 0); err != nil {
-			return false, err
-		}
-		if err := os.Chown(originalPath, hdr.Uid, hdr.Gid); err != nil {
-			return false, err
-		}
-
-		// don't write the file itself
-		return false, nil
-	}
-
-	return true, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux_test.go
deleted file mode 100644
index d5f046e9df..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_linux_test.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package archive
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// setupOverlayTestDir creates files in a directory with overlay whiteouts
-// Tree layout
-// .
-// ├── d1     # opaque, 0700
-// │   └── f1 # empty file, 0600
-// ├── d2     # opaque, 0750
-// │   └── f1 # empty file, 0660
-// └── d3     # 0700
-//     └── f1 # whiteout, 0644
-func setupOverlayTestDir(t *testing.T, src string) {
-	// Create opaque directory containing single file and permission 0700
-	if err := os.Mkdir(filepath.Join(src, "d1"), 0700); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := system.Lsetxattr(filepath.Join(src, "d1"), "trusted.overlay.opaque", []byte("y"), 0); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(src, "d1", "f1"), []byte{}, 0600); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create another opaque directory containing single file but with permission 0750
-	if err := os.Mkdir(filepath.Join(src, "d2"), 0750); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := system.Lsetxattr(filepath.Join(src, "d2"), "trusted.overlay.opaque", []byte("y"), 0); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := ioutil.WriteFile(filepath.Join(src, "d2", "f1"), []byte{}, 0660); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create regular directory with deleted file
-	if err := os.Mkdir(filepath.Join(src, "d3"), 0700); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := system.Mknod(filepath.Join(src, "d3", "f1"), syscall.S_IFCHR, 0); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func checkOpaqueness(t *testing.T, path string, opaque string) {
-	xattrOpaque, err := system.Lgetxattr(path, "trusted.overlay.opaque")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(xattrOpaque) != opaque {
-		t.Fatalf("Unexpected opaque value: %q, expected %q", string(xattrOpaque), opaque)
-	}
-
-}
-
-func checkOverlayWhiteout(t *testing.T, path string) {
-	stat, err := os.Stat(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	statT, ok := stat.Sys().(*syscall.Stat_t)
-	if !ok {
-		t.Fatalf("Unexpected type: %t, expected *syscall.Stat_t", stat.Sys())
-	}
-	if statT.Rdev != 0 {
-		t.Fatalf("Non-zero device number for whiteout")
-	}
-}
-
-func checkFileMode(t *testing.T, path string, perm os.FileMode) {
-	stat, err := os.Stat(path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if stat.Mode() != perm {
-		t.Fatalf("Unexpected file mode for %s: %o, expected %o", path, stat.Mode(), perm)
-	}
-}
-
-func TestOverlayTarUntar(t *testing.T) {
-	oldmask, err := system.Umask(0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer system.Umask(oldmask)
-
-	src, err := ioutil.TempDir("", "docker-test-overlay-tar-src")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(src)
-
-	setupOverlayTestDir(t, src)
-
-	dst, err := ioutil.TempDir("", "docker-test-overlay-tar-dst")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dst)
-
-	options := &TarOptions{
-		Compression:    Uncompressed,
-		WhiteoutFormat: OverlayWhiteoutFormat,
-	}
-	archive, err := TarWithOptions(src, options)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer archive.Close()
-
-	if err := Untar(archive, dst, options); err != nil {
-		t.Fatal(err)
-	}
-
-	checkFileMode(t, filepath.Join(dst, "d1"), 0700|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d2"), 0750|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d3"), 0700|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d1", "f1"), 0600)
-	checkFileMode(t, filepath.Join(dst, "d2", "f1"), 0660)
-	checkFileMode(t, filepath.Join(dst, "d3", "f1"), os.ModeCharDevice|os.ModeDevice)
-
-	checkOpaqueness(t, filepath.Join(dst, "d1"), "y")
-	checkOpaqueness(t, filepath.Join(dst, "d2"), "y")
-	checkOpaqueness(t, filepath.Join(dst, "d3"), "")
-	checkOverlayWhiteout(t, filepath.Join(dst, "d3", "f1"))
-}
-
-func TestOverlayTarAUFSUntar(t *testing.T) {
-	oldmask, err := system.Umask(0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer system.Umask(oldmask)
-
-	src, err := ioutil.TempDir("", "docker-test-overlay-tar-src")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(src)
-
-	setupOverlayTestDir(t, src)
-
-	dst, err := ioutil.TempDir("", "docker-test-overlay-tar-dst")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dst)
-
-	archive, err := TarWithOptions(src, &TarOptions{
-		Compression:    Uncompressed,
-		WhiteoutFormat: OverlayWhiteoutFormat,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer archive.Close()
-
-	if err := Untar(archive, dst, &TarOptions{
-		Compression:    Uncompressed,
-		WhiteoutFormat: AUFSWhiteoutFormat,
-	}); err != nil {
-		t.Fatal(err)
-	}
-
-	checkFileMode(t, filepath.Join(dst, "d1"), 0700|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d1", WhiteoutOpaqueDir), 0700)
-	checkFileMode(t, filepath.Join(dst, "d2"), 0750|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d2", WhiteoutOpaqueDir), 0750)
-	checkFileMode(t, filepath.Join(dst, "d3"), 0700|os.ModeDir)
-	checkFileMode(t, filepath.Join(dst, "d1", "f1"), 0600)
-	checkFileMode(t, filepath.Join(dst, "d2", "f1"), 0660)
-	checkFileMode(t, filepath.Join(dst, "d3", WhiteoutPrefix+"f1"), 0600)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_other.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_other.go
deleted file mode 100644
index 54acbf2856..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_other.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !linux
-
-package archive
-
-func getWhiteoutConverter(format WhiteoutFormat) tarWhiteoutConverter {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_test.go
deleted file mode 100644
index b883be33ed..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_test.go
+++ /dev/null
@@ -1,1162 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-var tmp string
-
-func init() {
-	tmp = "/tmp/"
-	if runtime.GOOS == "windows" {
-		tmp = os.Getenv("TEMP") + `\`
-	}
-}
-
-func TestIsArchiveNilHeader(t *testing.T) {
-	out := IsArchive(nil)
-	if out {
-		t.Fatalf("isArchive should return false as nil is not a valid archive header")
-	}
-}
-
-func TestIsArchiveInvalidHeader(t *testing.T) {
-	header := []byte{0x00, 0x01, 0x02}
-	out := IsArchive(header)
-	if out {
-		t.Fatalf("isArchive should return false as %s is not a valid archive header", header)
-	}
-}
-
-func TestIsArchiveBzip2(t *testing.T) {
-	header := []byte{0x42, 0x5A, 0x68}
-	out := IsArchive(header)
-	if !out {
-		t.Fatalf("isArchive should return true as %s is a bz2 header", header)
-	}
-}
-
-func TestIsArchive7zip(t *testing.T) {
-	header := []byte{0x50, 0x4b, 0x03, 0x04}
-	out := IsArchive(header)
-	if out {
-		t.Fatalf("isArchive should return false as %s is a 7z header and it is not supported", header)
-	}
-}
-
-func TestIsArchivePathDir(t *testing.T) {
-	cmd := exec.Command("sh", "-c", "mkdir -p /tmp/archivedir")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Fail to create an archive file for test : %s.", output)
-	}
-	if IsArchivePath(tmp + "archivedir") {
-		t.Fatalf("Incorrectly recognised directory as an archive")
-	}
-}
-
-func TestIsArchivePathInvalidFile(t *testing.T) {
-	cmd := exec.Command("sh", "-c", "dd if=/dev/zero bs=1024 count=1 of=/tmp/archive && gzip --stdout /tmp/archive > /tmp/archive.gz")
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Fail to create an archive file for test : %s.", output)
-	}
-	if IsArchivePath(tmp + "archive") {
-		t.Fatalf("Incorrectly recognised invalid tar path as archive")
-	}
-	if IsArchivePath(tmp + "archive.gz") {
-		t.Fatalf("Incorrectly recognised invalid compressed tar path as archive")
-	}
-}
-
-func TestIsArchivePathTar(t *testing.T) {
-	var whichTar string
-	if runtime.GOOS == "solaris" {
-		whichTar = "gtar"
-	} else {
-		whichTar = "tar"
-	}
-	cmdStr := fmt.Sprintf("touch /tmp/archivedata && %s -cf /tmp/archive /tmp/archivedata && gzip --stdout /tmp/archive > /tmp/archive.gz", whichTar)
-	cmd := exec.Command("sh", "-c", cmdStr)
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Fail to create an archive file for test : %s.", output)
-	}
-	if !IsArchivePath(tmp + "/archive") {
-		t.Fatalf("Did not recognise valid tar path as archive")
-	}
-	if !IsArchivePath(tmp + "archive.gz") {
-		t.Fatalf("Did not recognise valid compressed tar path as archive")
-	}
-}
-
-func testDecompressStream(t *testing.T, ext, compressCommand string) {
-	cmd := exec.Command("sh", "-c",
-		fmt.Sprintf("touch /tmp/archive && %s /tmp/archive", compressCommand))
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Fatalf("Failed to create an archive file for test : %s.", output)
-	}
-	filename := "archive." + ext
-	archive, err := os.Open(tmp + filename)
-	if err != nil {
-		t.Fatalf("Failed to open file %s: %v", filename, err)
-	}
-	defer archive.Close()
-
-	r, err := DecompressStream(archive)
-	if err != nil {
-		t.Fatalf("Failed to decompress %s: %v", filename, err)
-	}
-	if _, err = ioutil.ReadAll(r); err != nil {
-		t.Fatalf("Failed to read the decompressed stream: %v ", err)
-	}
-	if err = r.Close(); err != nil {
-		t.Fatalf("Failed to close the decompressed stream: %v ", err)
-	}
-}
-
-func TestDecompressStreamGzip(t *testing.T) {
-	testDecompressStream(t, "gz", "gzip -f")
-}
-
-func TestDecompressStreamBzip2(t *testing.T) {
-	testDecompressStream(t, "bz2", "bzip2 -f")
-}
-
-func TestDecompressStreamXz(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("Xz not present in msys2")
-	}
-	testDecompressStream(t, "xz", "xz -f")
-}
-
-func TestCompressStreamXzUnsuported(t *testing.T) {
-	dest, err := os.Create(tmp + "dest")
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-	defer dest.Close()
-
-	_, err = CompressStream(dest, Xz)
-	if err == nil {
-		t.Fatalf("Should fail as xz is unsupported for compression format.")
-	}
-}
-
-func TestCompressStreamBzip2Unsupported(t *testing.T) {
-	dest, err := os.Create(tmp + "dest")
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-	defer dest.Close()
-
-	_, err = CompressStream(dest, Xz)
-	if err == nil {
-		t.Fatalf("Should fail as xz is unsupported for compression format.")
-	}
-}
-
-func TestCompressStreamInvalid(t *testing.T) {
-	dest, err := os.Create(tmp + "dest")
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-	defer dest.Close()
-
-	_, err = CompressStream(dest, -1)
-	if err == nil {
-		t.Fatalf("Should fail as xz is unsupported for compression format.")
-	}
-}
-
-func TestExtensionInvalid(t *testing.T) {
-	compression := Compression(-1)
-	output := compression.Extension()
-	if output != "" {
-		t.Fatalf("The extension of an invalid compression should be an empty string.")
-	}
-}
-
-func TestExtensionUncompressed(t *testing.T) {
-	compression := Uncompressed
-	output := compression.Extension()
-	if output != "tar" {
-		t.Fatalf("The extension of an uncompressed archive should be 'tar'.")
-	}
-}
-func TestExtensionBzip2(t *testing.T) {
-	compression := Bzip2
-	output := compression.Extension()
-	if output != "tar.bz2" {
-		t.Fatalf("The extension of a bzip2 archive should be 'tar.bz2'")
-	}
-}
-func TestExtensionGzip(t *testing.T) {
-	compression := Gzip
-	output := compression.Extension()
-	if output != "tar.gz" {
-		t.Fatalf("The extension of a bzip2 archive should be 'tar.gz'")
-	}
-}
-func TestExtensionXz(t *testing.T) {
-	compression := Xz
-	output := compression.Extension()
-	if output != "tar.xz" {
-		t.Fatalf("The extension of a bzip2 archive should be 'tar.xz'")
-	}
-}
-
-func TestCmdStreamLargeStderr(t *testing.T) {
-	cmd := exec.Command("sh", "-c", "dd if=/dev/zero bs=1k count=1000 of=/dev/stderr; echo hello")
-	out, _, err := cmdStream(cmd, nil)
-	if err != nil {
-		t.Fatalf("Failed to start command: %s", err)
-	}
-	errCh := make(chan error)
-	go func() {
-		_, err := io.Copy(ioutil.Discard, out)
-		errCh <- err
-	}()
-	select {
-	case err := <-errCh:
-		if err != nil {
-			t.Fatalf("Command should not have failed (err=%.100s...)", err)
-		}
-	case <-time.After(5 * time.Second):
-		t.Fatalf("Command did not complete in 5 seconds; probable deadlock")
-	}
-}
-
-func TestCmdStreamBad(t *testing.T) {
-	// TODO Windows: Figure out why this is failing in CI but not locally
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows CI machines")
-	}
-	badCmd := exec.Command("sh", "-c", "echo hello; echo >&2 error couldn\\'t reverse the phase pulser; exit 1")
-	out, _, err := cmdStream(badCmd, nil)
-	if err != nil {
-		t.Fatalf("Failed to start command: %s", err)
-	}
-	if output, err := ioutil.ReadAll(out); err == nil {
-		t.Fatalf("Command should have failed")
-	} else if err.Error() != "exit status 1: error couldn't reverse the phase pulser\n" {
-		t.Fatalf("Wrong error value (%s)", err)
-	} else if s := string(output); s != "hello\n" {
-		t.Fatalf("Command output should be '%s', not '%s'", "hello\\n", output)
-	}
-}
-
-func TestCmdStreamGood(t *testing.T) {
-	cmd := exec.Command("sh", "-c", "echo hello; exit 0")
-	out, _, err := cmdStream(cmd, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if output, err := ioutil.ReadAll(out); err != nil {
-		t.Fatalf("Command should not have failed (err=%s)", err)
-	} else if s := string(output); s != "hello\n" {
-		t.Fatalf("Command output should be '%s', not '%s'", "hello\\n", output)
-	}
-}
-
-func TestUntarPathWithInvalidDest(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempFolder)
-	invalidDestFolder := filepath.Join(tempFolder, "invalidDest")
-	// Create a src file
-	srcFile := filepath.Join(tempFolder, "src")
-	tarFile := filepath.Join(tempFolder, "src.tar")
-	os.Create(srcFile)
-	os.Create(invalidDestFolder) // being a file (not dir) should cause an error
-
-	// Translate back to Unix semantics as next exec.Command is run under sh
-	srcFileU := srcFile
-	tarFileU := tarFile
-	if runtime.GOOS == "windows" {
-		tarFileU = "/tmp/" + filepath.Base(filepath.Dir(tarFile)) + "/src.tar"
-		srcFileU = "/tmp/" + filepath.Base(filepath.Dir(srcFile)) + "/src"
-	}
-
-	cmd := exec.Command("sh", "-c", "tar cf "+tarFileU+" "+srcFileU)
-	_, err = cmd.CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = UntarPath(tarFile, invalidDestFolder)
-	if err == nil {
-		t.Fatalf("UntarPath with invalid destination path should throw an error.")
-	}
-}
-
-func TestUntarPathWithInvalidSrc(t *testing.T) {
-	dest, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-	defer os.RemoveAll(dest)
-	err = UntarPath("/invalid/path", dest)
-	if err == nil {
-		t.Fatalf("UntarPath with invalid src path should throw an error.")
-	}
-}
-
-func TestUntarPath(t *testing.T) {
-	tmpFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpFolder)
-	srcFile := filepath.Join(tmpFolder, "src")
-	tarFile := filepath.Join(tmpFolder, "src.tar")
-	os.Create(filepath.Join(tmpFolder, "src"))
-
-	destFolder := filepath.Join(tmpFolder, "dest")
-	err = os.MkdirAll(destFolder, 0740)
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-
-	// Translate back to Unix semantics as next exec.Command is run under sh
-	srcFileU := srcFile
-	tarFileU := tarFile
-	if runtime.GOOS == "windows" {
-		tarFileU = "/tmp/" + filepath.Base(filepath.Dir(tarFile)) + "/src.tar"
-		srcFileU = "/tmp/" + filepath.Base(filepath.Dir(srcFile)) + "/src"
-	}
-	cmd := exec.Command("sh", "-c", "tar cf "+tarFileU+" "+srcFileU)
-	_, err = cmd.CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = UntarPath(tarFile, destFolder)
-	if err != nil {
-		t.Fatalf("UntarPath shouldn't throw an error, %s.", err)
-	}
-	expectedFile := filepath.Join(destFolder, srcFileU)
-	_, err = os.Stat(expectedFile)
-	if err != nil {
-		t.Fatalf("Destination folder should contain the source file but did not.")
-	}
-}
-
-// Do the same test as above but with the destination as file, it should fail
-func TestUntarPathWithDestinationFile(t *testing.T) {
-	tmpFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpFolder)
-	srcFile := filepath.Join(tmpFolder, "src")
-	tarFile := filepath.Join(tmpFolder, "src.tar")
-	os.Create(filepath.Join(tmpFolder, "src"))
-
-	// Translate back to Unix semantics as next exec.Command is run under sh
-	srcFileU := srcFile
-	tarFileU := tarFile
-	if runtime.GOOS == "windows" {
-		tarFileU = "/tmp/" + filepath.Base(filepath.Dir(tarFile)) + "/src.tar"
-		srcFileU = "/tmp/" + filepath.Base(filepath.Dir(srcFile)) + "/src"
-	}
-	cmd := exec.Command("sh", "-c", "tar cf "+tarFileU+" "+srcFileU)
-	_, err = cmd.CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-	destFile := filepath.Join(tmpFolder, "dest")
-	_, err = os.Create(destFile)
-	if err != nil {
-		t.Fatalf("Fail to create the destination file")
-	}
-	err = UntarPath(tarFile, destFile)
-	if err == nil {
-		t.Fatalf("UntarPath should throw an error if the destination if a file")
-	}
-}
-
-// Do the same test as above but with the destination folder already exists
-// and the destination file is a directory
-// It's working, see https://github.com/docker/docker/issues/10040
-func TestUntarPathWithDestinationSrcFileAsFolder(t *testing.T) {
-	tmpFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpFolder)
-	srcFile := filepath.Join(tmpFolder, "src")
-	tarFile := filepath.Join(tmpFolder, "src.tar")
-	os.Create(srcFile)
-
-	// Translate back to Unix semantics as next exec.Command is run under sh
-	srcFileU := srcFile
-	tarFileU := tarFile
-	if runtime.GOOS == "windows" {
-		tarFileU = "/tmp/" + filepath.Base(filepath.Dir(tarFile)) + "/src.tar"
-		srcFileU = "/tmp/" + filepath.Base(filepath.Dir(srcFile)) + "/src"
-	}
-
-	cmd := exec.Command("sh", "-c", "tar cf "+tarFileU+" "+srcFileU)
-	_, err = cmd.CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-	destFolder := filepath.Join(tmpFolder, "dest")
-	err = os.MkdirAll(destFolder, 0740)
-	if err != nil {
-		t.Fatalf("Fail to create the destination folder")
-	}
-	// Let's create a folder that will has the same path as the extracted file (from tar)
-	destSrcFileAsFolder := filepath.Join(destFolder, srcFileU)
-	err = os.MkdirAll(destSrcFileAsFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = UntarPath(tarFile, destFolder)
-	if err != nil {
-		t.Fatalf("UntarPath should throw not throw an error if the extracted file already exists and is a folder")
-	}
-}
-
-func TestCopyWithTarInvalidSrc(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(nil)
-	}
-	destFolder := filepath.Join(tempFolder, "dest")
-	invalidSrc := filepath.Join(tempFolder, "doesnotexists")
-	err = os.MkdirAll(destFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = CopyWithTar(invalidSrc, destFolder)
-	if err == nil {
-		t.Fatalf("archiver.CopyWithTar with invalid src path should throw an error.")
-	}
-}
-
-func TestCopyWithTarInexistentDestWillCreateIt(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(nil)
-	}
-	srcFolder := filepath.Join(tempFolder, "src")
-	inexistentDestFolder := filepath.Join(tempFolder, "doesnotexists")
-	err = os.MkdirAll(srcFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = CopyWithTar(srcFolder, inexistentDestFolder)
-	if err != nil {
-		t.Fatalf("CopyWithTar with an inexistent folder shouldn't fail.")
-	}
-	_, err = os.Stat(inexistentDestFolder)
-	if err != nil {
-		t.Fatalf("CopyWithTar with an inexistent folder should create it.")
-	}
-}
-
-// Test CopyWithTar with a file as src
-func TestCopyWithTarSrcFile(t *testing.T) {
-	folder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(folder)
-	dest := filepath.Join(folder, "dest")
-	srcFolder := filepath.Join(folder, "src")
-	src := filepath.Join(folder, filepath.Join("src", "src"))
-	err = os.MkdirAll(srcFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.MkdirAll(dest, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ioutil.WriteFile(src, []byte("content"), 0777)
-	err = CopyWithTar(src, dest)
-	if err != nil {
-		t.Fatalf("archiver.CopyWithTar shouldn't throw an error, %s.", err)
-	}
-	_, err = os.Stat(dest)
-	// FIXME Check the content
-	if err != nil {
-		t.Fatalf("Destination file should be the same as the source.")
-	}
-}
-
-// Test CopyWithTar with a folder as src
-func TestCopyWithTarSrcFolder(t *testing.T) {
-	folder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(folder)
-	dest := filepath.Join(folder, "dest")
-	src := filepath.Join(folder, filepath.Join("src", "folder"))
-	err = os.MkdirAll(src, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.MkdirAll(dest, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ioutil.WriteFile(filepath.Join(src, "file"), []byte("content"), 0777)
-	err = CopyWithTar(src, dest)
-	if err != nil {
-		t.Fatalf("archiver.CopyWithTar shouldn't throw an error, %s.", err)
-	}
-	_, err = os.Stat(dest)
-	// FIXME Check the content (the file inside)
-	if err != nil {
-		t.Fatalf("Destination folder should contain the source file but did not.")
-	}
-}
-
-func TestCopyFileWithTarInvalidSrc(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempFolder)
-	destFolder := filepath.Join(tempFolder, "dest")
-	err = os.MkdirAll(destFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	invalidFile := filepath.Join(tempFolder, "doesnotexists")
-	err = CopyFileWithTar(invalidFile, destFolder)
-	if err == nil {
-		t.Fatalf("archiver.CopyWithTar with invalid src path should throw an error.")
-	}
-}
-
-func TestCopyFileWithTarInexistentDestWillCreateIt(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(nil)
-	}
-	defer os.RemoveAll(tempFolder)
-	srcFile := filepath.Join(tempFolder, "src")
-	inexistentDestFolder := filepath.Join(tempFolder, "doesnotexists")
-	_, err = os.Create(srcFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = CopyFileWithTar(srcFile, inexistentDestFolder)
-	if err != nil {
-		t.Fatalf("CopyWithTar with an inexistent folder shouldn't fail.")
-	}
-	_, err = os.Stat(inexistentDestFolder)
-	if err != nil {
-		t.Fatalf("CopyWithTar with an inexistent folder should create it.")
-	}
-	// FIXME Test the src file and content
-}
-
-func TestCopyFileWithTarSrcFolder(t *testing.T) {
-	folder, err := ioutil.TempDir("", "docker-archive-copyfilewithtar-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(folder)
-	dest := filepath.Join(folder, "dest")
-	src := filepath.Join(folder, "srcfolder")
-	err = os.MkdirAll(src, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.MkdirAll(dest, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = CopyFileWithTar(src, dest)
-	if err == nil {
-		t.Fatalf("CopyFileWithTar should throw an error with a folder.")
-	}
-}
-
-func TestCopyFileWithTarSrcFile(t *testing.T) {
-	folder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(folder)
-	dest := filepath.Join(folder, "dest")
-	srcFolder := filepath.Join(folder, "src")
-	src := filepath.Join(folder, filepath.Join("src", "src"))
-	err = os.MkdirAll(srcFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = os.MkdirAll(dest, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ioutil.WriteFile(src, []byte("content"), 0777)
-	err = CopyWithTar(src, dest+"/")
-	if err != nil {
-		t.Fatalf("archiver.CopyFileWithTar shouldn't throw an error, %s.", err)
-	}
-	_, err = os.Stat(dest)
-	if err != nil {
-		t.Fatalf("Destination folder should contain the source file but did not.")
-	}
-}
-
-func TestTarFiles(t *testing.T) {
-	// TODO Windows: Figure out how to port this test.
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	// try without hardlinks
-	if err := checkNoChanges(1000, false); err != nil {
-		t.Fatal(err)
-	}
-	// try with hardlinks
-	if err := checkNoChanges(1000, true); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func checkNoChanges(fileNum int, hardlinks bool) error {
-	srcDir, err := ioutil.TempDir("", "docker-test-srcDir")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(srcDir)
-
-	destDir, err := ioutil.TempDir("", "docker-test-destDir")
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(destDir)
-
-	_, err = prepareUntarSourceDirectory(fileNum, srcDir, hardlinks)
-	if err != nil {
-		return err
-	}
-
-	err = TarUntar(srcDir, destDir)
-	if err != nil {
-		return err
-	}
-
-	changes, err := ChangesDirs(destDir, srcDir)
-	if err != nil {
-		return err
-	}
-	if len(changes) > 0 {
-		return fmt.Errorf("with %d files and %v hardlinks: expected 0 changes, got %d", fileNum, hardlinks, len(changes))
-	}
-	return nil
-}
-
-func tarUntar(t *testing.T, origin string, options *TarOptions) ([]Change, error) {
-	archive, err := TarWithOptions(origin, options)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer archive.Close()
-
-	buf := make([]byte, 10)
-	if _, err := archive.Read(buf); err != nil {
-		return nil, err
-	}
-	wrap := io.MultiReader(bytes.NewReader(buf), archive)
-
-	detectedCompression := DetectCompression(buf)
-	compression := options.Compression
-	if detectedCompression.Extension() != compression.Extension() {
-		return nil, fmt.Errorf("Wrong compression detected. Actual compression: %s, found %s", compression.Extension(), detectedCompression.Extension())
-	}
-
-	tmp, err := ioutil.TempDir("", "docker-test-untar")
-	if err != nil {
-		return nil, err
-	}
-	defer os.RemoveAll(tmp)
-	if err := Untar(wrap, tmp, nil); err != nil {
-		return nil, err
-	}
-	if _, err := os.Stat(tmp); err != nil {
-		return nil, err
-	}
-
-	return ChangesDirs(origin, tmp)
-}
-
-func TestTarUntar(t *testing.T) {
-	// TODO Windows: Figure out how to fix this test.
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	origin, err := ioutil.TempDir("", "docker-test-untar-origin")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	if err := ioutil.WriteFile(filepath.Join(origin, "1"), []byte("hello world"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(origin, "2"), []byte("welcome!"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(origin, "3"), []byte("will be ignored"), 0700); err != nil {
-		t.Fatal(err)
-	}
-
-	for _, c := range []Compression{
-		Uncompressed,
-		Gzip,
-	} {
-		changes, err := tarUntar(t, origin, &TarOptions{
-			Compression:     c,
-			ExcludePatterns: []string{"3"},
-		})
-
-		if err != nil {
-			t.Fatalf("Error tar/untar for compression %s: %s", c.Extension(), err)
-		}
-
-		if len(changes) != 1 || changes[0].Path != "/3" {
-			t.Fatalf("Unexpected differences after tarUntar: %v", changes)
-		}
-	}
-}
-
-func TestTarWithOptions(t *testing.T) {
-	// TODO Windows: Figure out how to fix this test.
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	origin, err := ioutil.TempDir("", "docker-test-untar-origin")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ioutil.TempDir(origin, "folder"); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	if err := ioutil.WriteFile(filepath.Join(origin, "1"), []byte("hello world"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(origin, "2"), []byte("welcome!"), 0700); err != nil {
-		t.Fatal(err)
-	}
-
-	cases := []struct {
-		opts       *TarOptions
-		numChanges int
-	}{
-		{&TarOptions{IncludeFiles: []string{"1"}}, 2},
-		{&TarOptions{ExcludePatterns: []string{"2"}}, 1},
-		{&TarOptions{ExcludePatterns: []string{"1", "folder*"}}, 2},
-		{&TarOptions{IncludeFiles: []string{"1", "1"}}, 2},
-		{&TarOptions{IncludeFiles: []string{"1"}, RebaseNames: map[string]string{"1": "test"}}, 4},
-	}
-	for _, testCase := range cases {
-		changes, err := tarUntar(t, origin, testCase.opts)
-		if err != nil {
-			t.Fatalf("Error tar/untar when testing inclusion/exclusion: %s", err)
-		}
-		if len(changes) != testCase.numChanges {
-			t.Errorf("Expected %d changes, got %d for %+v:",
-				testCase.numChanges, len(changes), testCase.opts)
-		}
-	}
-}
-
-// Some tar archives such as http://haproxy.1wt.eu/download/1.5/src/devel/haproxy-1.5-dev21.tar.gz
-// use PAX Global Extended Headers.
-// Failing prevents the archives from being uncompressed during ADD
-func TestTypeXGlobalHeaderDoesNotFail(t *testing.T) {
-	hdr := tar.Header{Typeflag: tar.TypeXGlobalHeader}
-	tmpDir, err := ioutil.TempDir("", "docker-test-archive-pax-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-	err = createTarFile(filepath.Join(tmpDir, "pax_global_header"), tmpDir, &hdr, nil, true, nil, false)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Some tar have both GNU specific (huge uid) and Ustar specific (long name) things.
-// Not supposed to happen (should use PAX instead of Ustar for long name) but it does and it should still work.
-func TestUntarUstarGnuConflict(t *testing.T) {
-	f, err := os.Open("testdata/broken.tar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-
-	found := false
-	tr := tar.NewReader(f)
-	// Iterate through the files in the archive.
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		if hdr.Name == "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm" {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Fatalf("%s not found in the archive", "root/.cpanm/work/1395823785.24209/Plack-1.0030/blib/man3/Plack::Middleware::LighttpdScriptNameFix.3pm")
-	}
-}
-
-func prepareUntarSourceDirectory(numberOfFiles int, targetPath string, makeLinks bool) (int, error) {
-	fileData := []byte("fooo")
-	for n := 0; n < numberOfFiles; n++ {
-		fileName := fmt.Sprintf("file-%d", n)
-		if err := ioutil.WriteFile(filepath.Join(targetPath, fileName), fileData, 0700); err != nil {
-			return 0, err
-		}
-		if makeLinks {
-			if err := os.Link(filepath.Join(targetPath, fileName), filepath.Join(targetPath, fileName+"-link")); err != nil {
-				return 0, err
-			}
-		}
-	}
-	totalSize := numberOfFiles * len(fileData)
-	return totalSize, nil
-}
-
-func BenchmarkTarUntar(b *testing.B) {
-	origin, err := ioutil.TempDir("", "docker-test-untar-origin")
-	if err != nil {
-		b.Fatal(err)
-	}
-	tempDir, err := ioutil.TempDir("", "docker-test-untar-destination")
-	if err != nil {
-		b.Fatal(err)
-	}
-	target := filepath.Join(tempDir, "dest")
-	n, err := prepareUntarSourceDirectory(100, origin, false)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	defer os.RemoveAll(tempDir)
-
-	b.ResetTimer()
-	b.SetBytes(int64(n))
-	for n := 0; n < b.N; n++ {
-		err := TarUntar(origin, target)
-		if err != nil {
-			b.Fatal(err)
-		}
-		os.RemoveAll(target)
-	}
-}
-
-func BenchmarkTarUntarWithLinks(b *testing.B) {
-	origin, err := ioutil.TempDir("", "docker-test-untar-origin")
-	if err != nil {
-		b.Fatal(err)
-	}
-	tempDir, err := ioutil.TempDir("", "docker-test-untar-destination")
-	if err != nil {
-		b.Fatal(err)
-	}
-	target := filepath.Join(tempDir, "dest")
-	n, err := prepareUntarSourceDirectory(100, origin, true)
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	defer os.RemoveAll(tempDir)
-
-	b.ResetTimer()
-	b.SetBytes(int64(n))
-	for n := 0; n < b.N; n++ {
-		err := TarUntar(origin, target)
-		if err != nil {
-			b.Fatal(err)
-		}
-		os.RemoveAll(target)
-	}
-}
-
-func TestUntarInvalidFilenames(t *testing.T) {
-	// TODO Windows: Figure out how to fix this test.
-	if runtime.GOOS == "windows" {
-		t.Skip("Passes but hits breakoutError: platform and architecture is not supported")
-	}
-	for i, headers := range [][]*tar.Header{
-		{
-			{
-				Name:     "../victim/dotdot",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{
-			{
-				// Note the leading slash
-				Name:     "/../victim/slash-dotdot",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("untar", "docker-TestUntarInvalidFilenames", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestUntarHardlinkToSymlink(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	if runtime.GOOS == "windows" {
-		t.Skip("hardlinks on Windows")
-	}
-	for i, headers := range [][]*tar.Header{
-		{
-			{
-				Name:     "symlink1",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "regfile",
-				Mode:     0644,
-			},
-			{
-				Name:     "symlink2",
-				Typeflag: tar.TypeLink,
-				Linkname: "symlink1",
-				Mode:     0644,
-			},
-			{
-				Name:     "regfile",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("untar", "docker-TestUntarHardlinkToSymlink", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestUntarInvalidHardlink(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	if runtime.GOOS == "windows" {
-		t.Skip("hardlinks on Windows")
-	}
-	for i, headers := range [][]*tar.Header{
-		{ // try reading victim/hello (../)
-			{
-				Name:     "dotdot",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (/../)
-			{
-				Name:     "slash-dotdot",
-				Typeflag: tar.TypeLink,
-				// Note the leading slash
-				Linkname: "/../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try writing victim/file
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim/file",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (hardlink, symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "symlink",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // Try reading victim/hello (hardlink, hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "hardlink",
-				Typeflag: tar.TypeLink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // Try removing victim directory (hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("untar", "docker-TestUntarInvalidHardlink", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestUntarInvalidSymlink(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	if runtime.GOOS == "windows" {
-		t.Skip("hardlinks on Windows")
-	}
-	for i, headers := range [][]*tar.Header{
-		{ // try reading victim/hello (../)
-			{
-				Name:     "dotdot",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (/../)
-			{
-				Name:     "slash-dotdot",
-				Typeflag: tar.TypeSymlink,
-				// Note the leading slash
-				Linkname: "/../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try writing victim/file
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim/file",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (symlink, symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "symlink",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (symlink, hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "hardlink",
-				Typeflag: tar.TypeLink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try removing victim directory (symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{ // try writing to victim/newdir/newfile with a symlink in the path
-			{
-				// this header needs to be before the next one, or else there is an error
-				Name:     "dir/loophole",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "dir/loophole/newdir/newfile",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("untar", "docker-TestUntarInvalidSymlink", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestTempArchiveCloseMultipleTimes(t *testing.T) {
-	reader := ioutil.NopCloser(strings.NewReader("hello"))
-	tempArchive, err := NewTempArchive(reader, "")
-	buf := make([]byte, 10)
-	n, err := tempArchive.Read(buf)
-	if n != 5 {
-		t.Fatalf("Expected to read 5 bytes. Read %d instead", n)
-	}
-	for i := 0; i < 3; i++ {
-		if err = tempArchive.Close(); err != nil {
-			t.Fatalf("i=%d. Unexpected error closing temp archive: %v", i, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
deleted file mode 100644
index 7083f2fa53..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"archive/tar"
-	"errors"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/docker/docker/pkg/system"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return srcPath
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a separate function as this is platform specific. On Linux, we
-// can't use filepath.Join(srcPath,include) because this will clean away
-// a trailing "." or "/" which may be important.
-func getWalkRoot(srcPath string, include string) string {
-	return srcPath + string(filepath.Separator) + include
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	return p, nil // already unix-style
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	return perm // noop for unix as golang APIs provide perm bits correctly
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (inode uint64, err error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		err = errors.New("cannot convert stat value to syscall.Stat_t")
-		return
-	}
-
-	inode = uint64(s.Ino)
-
-	// Currently go does not fill in the major/minors
-	if s.Mode&syscall.S_IFBLK != 0 ||
-		s.Mode&syscall.S_IFCHR != 0 {
-		hdr.Devmajor = int64(major(uint64(s.Rdev)))
-		hdr.Devminor = int64(minor(uint64(s.Rdev)))
-	}
-
-	return
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		return -1, -1, errors.New("cannot convert stat value to syscall.Stat_t")
-	}
-	return int(s.Uid), int(s.Gid), nil
-}
-
-func major(device uint64) uint64 {
-	return (device >> 8) & 0xfff
-}
-
-func minor(device uint64) uint64 {
-	return (device & 0xff) | ((device >> 12) & 0xfff00)
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-	if rsystem.RunningInUserNS() {
-		// cannot create a device if running in user namespace
-		return nil
-	}
-
-	mode := uint32(hdr.Mode & 07777)
-	switch hdr.Typeflag {
-	case tar.TypeBlock:
-		mode |= syscall.S_IFBLK
-	case tar.TypeChar:
-		mode |= syscall.S_IFCHR
-	case tar.TypeFifo:
-		mode |= syscall.S_IFIFO
-	}
-
-	if err := system.Mknod(path, mode, int(system.Mkdev(hdr.Devmajor, hdr.Devminor))); err != nil {
-		return err
-	}
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	if hdr.Typeflag == tar.TypeLink {
-		if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
-			if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-				return err
-			}
-		}
-	} else if hdr.Typeflag != tar.TypeSymlink {
-		if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix_test.go
deleted file mode 100644
index 4eeafdd128..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_unix_test.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"syscall"
-	"testing"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func TestCanonicalTarNameForPath(t *testing.T) {
-	cases := []struct{ in, expected string }{
-		{"foo", "foo"},
-		{"foo/bar", "foo/bar"},
-		{"foo/dir/", "foo/dir/"},
-	}
-	for _, v := range cases {
-		if out, err := CanonicalTarNameForPath(v.in); err != nil {
-			t.Fatalf("cannot get canonical name for path: %s: %v", v.in, err)
-		} else if out != v.expected {
-			t.Fatalf("wrong canonical tar name. expected:%s got:%s", v.expected, out)
-		}
-	}
-}
-
-func TestCanonicalTarName(t *testing.T) {
-	cases := []struct {
-		in       string
-		isDir    bool
-		expected string
-	}{
-		{"foo", false, "foo"},
-		{"foo", true, "foo/"},
-		{"foo/bar", false, "foo/bar"},
-		{"foo/bar", true, "foo/bar/"},
-	}
-	for _, v := range cases {
-		if out, err := canonicalTarName(v.in, v.isDir); err != nil {
-			t.Fatalf("cannot get canonical name for path: %s: %v", v.in, err)
-		} else if out != v.expected {
-			t.Fatalf("wrong canonical tar name. expected:%s got:%s", v.expected, out)
-		}
-	}
-}
-
-func TestChmodTarEntry(t *testing.T) {
-	cases := []struct {
-		in, expected os.FileMode
-	}{
-		{0000, 0000},
-		{0777, 0777},
-		{0644, 0644},
-		{0755, 0755},
-		{0444, 0444},
-	}
-	for _, v := range cases {
-		if out := chmodTarEntry(v.in); out != v.expected {
-			t.Fatalf("wrong chmod. expected:%v got:%v", v.expected, out)
-		}
-	}
-}
-
-func TestTarWithHardLink(t *testing.T) {
-	origin, err := ioutil.TempDir("", "docker-test-tar-hardlink")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	if err := ioutil.WriteFile(filepath.Join(origin, "1"), []byte("hello world"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Link(filepath.Join(origin, "1"), filepath.Join(origin, "2")); err != nil {
-		t.Fatal(err)
-	}
-
-	var i1, i2 uint64
-	if i1, err = getNlink(filepath.Join(origin, "1")); err != nil {
-		t.Fatal(err)
-	}
-	// sanity check that we can hardlink
-	if i1 != 2 {
-		t.Skipf("skipping since hardlinks don't work here; expected 2 links, got %d", i1)
-	}
-
-	dest, err := ioutil.TempDir("", "docker-test-tar-hardlink-dest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dest)
-
-	// we'll do this in two steps to separate failure
-	fh, err := Tar(origin, Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// ensure we can read the whole thing with no error, before writing back out
-	buf, err := ioutil.ReadAll(fh)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bRdr := bytes.NewReader(buf)
-	err = Untar(bRdr, dest, &TarOptions{Compression: Uncompressed})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if i1, err = getInode(filepath.Join(dest, "1")); err != nil {
-		t.Fatal(err)
-	}
-	if i2, err = getInode(filepath.Join(dest, "2")); err != nil {
-		t.Fatal(err)
-	}
-
-	if i1 != i2 {
-		t.Errorf("expected matching inodes, but got %d and %d", i1, i2)
-	}
-}
-
-func getNlink(path string) (uint64, error) {
-	stat, err := os.Stat(path)
-	if err != nil {
-		return 0, err
-	}
-	statT, ok := stat.Sys().(*syscall.Stat_t)
-	if !ok {
-		return 0, fmt.Errorf("expected type *syscall.Stat_t, got %t", stat.Sys())
-	}
-	// We need this conversion on ARM64
-	return uint64(statT.Nlink), nil
-}
-
-func getInode(path string) (uint64, error) {
-	stat, err := os.Stat(path)
-	if err != nil {
-		return 0, err
-	}
-	statT, ok := stat.Sys().(*syscall.Stat_t)
-	if !ok {
-		return 0, fmt.Errorf("expected type *syscall.Stat_t, got %t", stat.Sys())
-	}
-	return statT.Ino, nil
-}
-
-func TestTarWithBlockCharFifo(t *testing.T) {
-	origin, err := ioutil.TempDir("", "docker-test-tar-hardlink")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	if err := ioutil.WriteFile(filepath.Join(origin, "1"), []byte("hello world"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := system.Mknod(filepath.Join(origin, "2"), syscall.S_IFBLK, int(system.Mkdev(int64(12), int64(5)))); err != nil {
-		t.Fatal(err)
-	}
-	if err := system.Mknod(filepath.Join(origin, "3"), syscall.S_IFCHR, int(system.Mkdev(int64(12), int64(5)))); err != nil {
-		t.Fatal(err)
-	}
-	if err := system.Mknod(filepath.Join(origin, "4"), syscall.S_IFIFO, int(system.Mkdev(int64(12), int64(5)))); err != nil {
-		t.Fatal(err)
-	}
-
-	dest, err := ioutil.TempDir("", "docker-test-tar-hardlink-dest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dest)
-
-	// we'll do this in two steps to separate failure
-	fh, err := Tar(origin, Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// ensure we can read the whole thing with no error, before writing back out
-	buf, err := ioutil.ReadAll(fh)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bRdr := bytes.NewReader(buf)
-	err = Untar(bRdr, dest, &TarOptions{Compression: Uncompressed})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := ChangesDirs(origin, dest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(changes) > 0 {
-		t.Fatalf("Tar with special device (block, char, fifo) should keep them (recreate them when untar) : %v", changes)
-	}
-}
-
-// TestTarUntarWithXattr is Unix as Lsetxattr is not supported on Windows
-func TestTarUntarWithXattr(t *testing.T) {
-	if runtime.GOOS == "solaris" {
-		t.Skip()
-	}
-	origin, err := ioutil.TempDir("", "docker-test-untar-origin")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(origin)
-	if err := ioutil.WriteFile(filepath.Join(origin, "1"), []byte("hello world"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(origin, "2"), []byte("welcome!"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(origin, "3"), []byte("will be ignored"), 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := system.Lsetxattr(filepath.Join(origin, "2"), "security.capability", []byte{0x00}, 0); err != nil {
-		t.Fatal(err)
-	}
-
-	for _, c := range []Compression{
-		Uncompressed,
-		Gzip,
-	} {
-		changes, err := tarUntar(t, origin, &TarOptions{
-			Compression:     c,
-			ExcludePatterns: []string{"3"},
-		})
-
-		if err != nil {
-			t.Fatalf("Error tar/untar for compression %s: %s", c.Extension(), err)
-		}
-
-		if len(changes) != 1 || changes[0].Path != "/3" {
-			t.Fatalf("Unexpected differences after tarUntar: %v", changes)
-		}
-		capability, _ := system.Lgetxattr(filepath.Join(origin, "2"), "security.capability")
-		if capability == nil && capability[0] != 0x00 {
-			t.Fatalf("Untar should have kept the 'security.capability' xattr.")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows.go
deleted file mode 100644
index 5c3a1be340..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// +build windows
-
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/longpath"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return longpath.AddPrefix(srcPath)
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a separate function as this is platform specific.
-func getWalkRoot(srcPath string, include string) string {
-	return filepath.Join(srcPath, include)
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	// windows: convert windows style relative path with backslashes
-	// into forward slashes. Since windows does not allow '/' or '\'
-	// in file names, it is mostly safe to replace however we must
-	// check just in case
-	if strings.Contains(p, "/") {
-		return "", fmt.Errorf("Windows path contains forward slash: %s", p)
-	}
-	return strings.Replace(p, string(os.PathSeparator), "/", -1), nil
-
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	perm &= 0755
-	// Add the x bit: make everything +x from windows
-	perm |= 0111
-
-	return perm
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, ta *tarAppender, name string, stat interface{}) (inode uint64, err error) {
-	// do nothing. no notion of Rdev, Inode, Nlink in stat on Windows
-	return
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	return nil
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	// no notion of file ownership mapping yet on Windows
-	return 0, 0, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows_test.go
deleted file mode 100644
index 0c6733d6bd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/archive_windows_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// +build windows
-
-package archive
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestCopyFileWithInvalidDest(t *testing.T) {
-	// TODO Windows: This is currently failing. Not sure what has
-	// recently changed in CopyWithTar as used to pass. Further investigation
-	// is required.
-	t.Skip("Currently fails")
-	folder, err := ioutil.TempDir("", "docker-archive-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(folder)
-	dest := "c:dest"
-	srcFolder := filepath.Join(folder, "src")
-	src := filepath.Join(folder, "src", "src")
-	err = os.MkdirAll(srcFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ioutil.WriteFile(src, []byte("content"), 0777)
-	err = CopyWithTar(src, dest)
-	if err == nil {
-		t.Fatalf("archiver.CopyWithTar should throw an error on invalid dest.")
-	}
-}
-
-func TestCanonicalTarNameForPath(t *testing.T) {
-	cases := []struct {
-		in, expected string
-		shouldFail   bool
-	}{
-		{"foo", "foo", false},
-		{"foo/bar", "___", true}, // unix-styled windows path must fail
-		{`foo\bar`, "foo/bar", false},
-	}
-	for _, v := range cases {
-		if out, err := CanonicalTarNameForPath(v.in); err != nil && !v.shouldFail {
-			t.Fatalf("cannot get canonical name for path: %s: %v", v.in, err)
-		} else if v.shouldFail && err == nil {
-			t.Fatalf("canonical path call should have failed with error. in=%s out=%s", v.in, out)
-		} else if !v.shouldFail && out != v.expected {
-			t.Fatalf("wrong canonical tar name. expected:%s got:%s", v.expected, out)
-		}
-	}
-}
-
-func TestCanonicalTarName(t *testing.T) {
-	cases := []struct {
-		in       string
-		isDir    bool
-		expected string
-	}{
-		{"foo", false, "foo"},
-		{"foo", true, "foo/"},
-		{`foo\bar`, false, "foo/bar"},
-		{`foo\bar`, true, "foo/bar/"},
-	}
-	for _, v := range cases {
-		if out, err := canonicalTarName(v.in, v.isDir); err != nil {
-			t.Fatalf("cannot get canonical name for path: %s: %v", v.in, err)
-		} else if out != v.expected {
-			t.Fatalf("wrong canonical tar name. expected:%s got:%s", v.expected, out)
-		}
-	}
-}
-
-func TestChmodTarEntry(t *testing.T) {
-	cases := []struct {
-		in, expected os.FileMode
-	}{
-		{0000, 0111},
-		{0777, 0755},
-		{0644, 0755},
-		{0755, 0755},
-		{0444, 0555},
-	}
-	for _, v := range cases {
-		if out := chmodTarEntry(v.in); out != v.expected {
-			t.Fatalf("wrong chmod. expected:%v got:%v", v.expected, out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes.go
deleted file mode 100644
index c07d55cbd9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes.go
+++ /dev/null
@@ -1,446 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/system"
-)
-
-// ChangeType represents the change type.
-type ChangeType int
-
-const (
-	// ChangeModify represents the modify operation.
-	ChangeModify = iota
-	// ChangeAdd represents the add operation.
-	ChangeAdd
-	// ChangeDelete represents the delete operation.
-	ChangeDelete
-)
-
-func (c ChangeType) String() string {
-	switch c {
-	case ChangeModify:
-		return "C"
-	case ChangeAdd:
-		return "A"
-	case ChangeDelete:
-		return "D"
-	}
-	return ""
-}
-
-// Change represents a change, it wraps the change type and path.
-// It describes changes of the files in the path respect to the
-// parent layers. The change could be modify, add, delete.
-// This is used for layer diff.
-type Change struct {
-	Path string
-	Kind ChangeType
-}
-
-func (change *Change) String() string {
-	return fmt.Sprintf("%s %s", change.Kind, change.Path)
-}
-
-// for sort.Sort
-type changesByPath []Change
-
-func (c changesByPath) Less(i, j int) bool { return c[i].Path < c[j].Path }
-func (c changesByPath) Len() int           { return len(c) }
-func (c changesByPath) Swap(i, j int)      { c[j], c[i] = c[i], c[j] }
-
-// Gnu tar and the go tar writer don't have sub-second mtime
-// precision, which is problematic when we apply changes via tar
-// files, we handle this by comparing for exact times, *or* same
-// second count and either a or b having exactly 0 nanoseconds
-func sameFsTime(a, b time.Time) bool {
-	return a == b ||
-		(a.Unix() == b.Unix() &&
-			(a.Nanosecond() == 0 || b.Nanosecond() == 0))
-}
-
-func sameFsTimeSpec(a, b syscall.Timespec) bool {
-	return a.Sec == b.Sec &&
-		(a.Nsec == b.Nsec || a.Nsec == 0 || b.Nsec == 0)
-}
-
-// Changes walks the path rw and determines changes for the files in the path,
-// with respect to the parent layers
-func Changes(layers []string, rw string) ([]Change, error) {
-	return changes(layers, rw, aufsDeletedFile, aufsMetadataSkip)
-}
-
-func aufsMetadataSkip(path string) (skip bool, err error) {
-	skip, err = filepath.Match(string(os.PathSeparator)+WhiteoutMetaPrefix+"*", path)
-	if err != nil {
-		skip = true
-	}
-	return
-}
-
-func aufsDeletedFile(root, path string, fi os.FileInfo) (string, error) {
-	f := filepath.Base(path)
-
-	// If there is a whiteout, then the file was removed
-	if strings.HasPrefix(f, WhiteoutPrefix) {
-		originalFile := f[len(WhiteoutPrefix):]
-		return filepath.Join(filepath.Dir(path), originalFile), nil
-	}
-
-	return "", nil
-}
-
-type skipChange func(string) (bool, error)
-type deleteChange func(string, string, os.FileInfo) (string, error)
-
-func changes(layers []string, rw string, dc deleteChange, sc skipChange) ([]Change, error) {
-	var (
-		changes     []Change
-		changedDirs = make(map[string]struct{})
-	)
-
-	err := filepath.Walk(rw, func(path string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Rebase path
-		path, err = filepath.Rel(rw, path)
-		if err != nil {
-			return err
-		}
-
-		// As this runs on the daemon side, file paths are OS specific.
-		path = filepath.Join(string(os.PathSeparator), path)
-
-		// Skip root
-		if path == string(os.PathSeparator) {
-			return nil
-		}
-
-		if sc != nil {
-			if skip, err := sc(path); skip {
-				return err
-			}
-		}
-
-		change := Change{
-			Path: path,
-		}
-
-		deletedFile, err := dc(rw, path, f)
-		if err != nil {
-			return err
-		}
-
-		// Find out what kind of modification happened
-		if deletedFile != "" {
-			change.Path = deletedFile
-			change.Kind = ChangeDelete
-		} else {
-			// Otherwise, the file was added
-			change.Kind = ChangeAdd
-
-			// ...Unless it already existed in a top layer, in which case, it's a modification
-			for _, layer := range layers {
-				stat, err := os.Stat(filepath.Join(layer, path))
-				if err != nil && !os.IsNotExist(err) {
-					return err
-				}
-				if err == nil {
-					// The file existed in the top layer, so that's a modification
-
-					// However, if it's a directory, maybe it wasn't actually modified.
-					// If you modify /foo/bar/baz, then /foo will be part of the changed files only because it's the parent of bar
-					if stat.IsDir() && f.IsDir() {
-						if f.Size() == stat.Size() && f.Mode() == stat.Mode() && sameFsTime(f.ModTime(), stat.ModTime()) {
-							// Both directories are the same, don't record the change
-							return nil
-						}
-					}
-					change.Kind = ChangeModify
-					break
-				}
-			}
-		}
-
-		// If /foo/bar/file.txt is modified, then /foo/bar must be part of the changed files.
-		// This block is here to ensure the change is recorded even if the
-		// modify time, mode and size of the parent directory in the rw and ro layers are all equal.
-		// Check https://github.com/docker/docker/pull/13590 for details.
-		if f.IsDir() {
-			changedDirs[path] = struct{}{}
-		}
-		if change.Kind == ChangeAdd || change.Kind == ChangeDelete {
-			parent := filepath.Dir(path)
-			if _, ok := changedDirs[parent]; !ok && parent != "/" {
-				changes = append(changes, Change{Path: parent, Kind: ChangeModify})
-				changedDirs[parent] = struct{}{}
-			}
-		}
-
-		// Record change
-		changes = append(changes, change)
-		return nil
-	})
-	if err != nil && !os.IsNotExist(err) {
-		return nil, err
-	}
-	return changes, nil
-}
-
-// FileInfo describes the information of a file.
-type FileInfo struct {
-	parent     *FileInfo
-	name       string
-	stat       *system.StatT
-	children   map[string]*FileInfo
-	capability []byte
-	added      bool
-}
-
-// LookUp looks up the file information of a file.
-func (info *FileInfo) LookUp(path string) *FileInfo {
-	// As this runs on the daemon side, file paths are OS specific.
-	parent := info
-	if path == string(os.PathSeparator) {
-		return info
-	}
-
-	pathElements := strings.Split(path, string(os.PathSeparator))
-	for _, elem := range pathElements {
-		if elem != "" {
-			child := parent.children[elem]
-			if child == nil {
-				return nil
-			}
-			parent = child
-		}
-	}
-	return parent
-}
-
-func (info *FileInfo) path() string {
-	if info.parent == nil {
-		// As this runs on the daemon side, file paths are OS specific.
-		return string(os.PathSeparator)
-	}
-	return filepath.Join(info.parent.path(), info.name)
-}
-
-func (info *FileInfo) addChanges(oldInfo *FileInfo, changes *[]Change) {
-
-	sizeAtEntry := len(*changes)
-
-	if oldInfo == nil {
-		// add
-		change := Change{
-			Path: info.path(),
-			Kind: ChangeAdd,
-		}
-		*changes = append(*changes, change)
-		info.added = true
-	}
-
-	// We make a copy so we can modify it to detect additions
-	// also, we only recurse on the old dir if the new info is a directory
-	// otherwise any previous delete/change is considered recursive
-	oldChildren := make(map[string]*FileInfo)
-	if oldInfo != nil && info.isDir() {
-		for k, v := range oldInfo.children {
-			oldChildren[k] = v
-		}
-	}
-
-	for name, newChild := range info.children {
-		oldChild, _ := oldChildren[name]
-		if oldChild != nil {
-			// change?
-			oldStat := oldChild.stat
-			newStat := newChild.stat
-			// Note: We can't compare inode or ctime or blocksize here, because these change
-			// when copying a file into a container. However, that is not generally a problem
-			// because any content change will change mtime, and any status change should
-			// be visible when actually comparing the stat fields. The only time this
-			// breaks down is if some code intentionally hides a change by setting
-			// back mtime
-			if statDifferent(oldStat, newStat) ||
-				bytes.Compare(oldChild.capability, newChild.capability) != 0 {
-				change := Change{
-					Path: newChild.path(),
-					Kind: ChangeModify,
-				}
-				*changes = append(*changes, change)
-				newChild.added = true
-			}
-
-			// Remove from copy so we can detect deletions
-			delete(oldChildren, name)
-		}
-
-		newChild.addChanges(oldChild, changes)
-	}
-	for _, oldChild := range oldChildren {
-		// delete
-		change := Change{
-			Path: oldChild.path(),
-			Kind: ChangeDelete,
-		}
-		*changes = append(*changes, change)
-	}
-
-	// If there were changes inside this directory, we need to add it, even if the directory
-	// itself wasn't changed. This is needed to properly save and restore filesystem permissions.
-	// As this runs on the daemon side, file paths are OS specific.
-	if len(*changes) > sizeAtEntry && info.isDir() && !info.added && info.path() != string(os.PathSeparator) {
-		change := Change{
-			Path: info.path(),
-			Kind: ChangeModify,
-		}
-		// Let's insert the directory entry before the recently added entries located inside this dir
-		*changes = append(*changes, change) // just to resize the slice, will be overwritten
-		copy((*changes)[sizeAtEntry+1:], (*changes)[sizeAtEntry:])
-		(*changes)[sizeAtEntry] = change
-	}
-
-}
-
-// Changes add changes to file information.
-func (info *FileInfo) Changes(oldInfo *FileInfo) []Change {
-	var changes []Change
-
-	info.addChanges(oldInfo, &changes)
-
-	return changes
-}
-
-func newRootFileInfo() *FileInfo {
-	// As this runs on the daemon side, file paths are OS specific.
-	root := &FileInfo{
-		name:     string(os.PathSeparator),
-		children: make(map[string]*FileInfo),
-	}
-	return root
-}
-
-// ChangesDirs compares two directories and generates an array of Change objects describing the changes.
-// If oldDir is "", then all files in newDir will be Add-Changes.
-func ChangesDirs(newDir, oldDir string) ([]Change, error) {
-	var (
-		oldRoot, newRoot *FileInfo
-	)
-	if oldDir == "" {
-		emptyDir, err := ioutil.TempDir("", "empty")
-		if err != nil {
-			return nil, err
-		}
-		defer os.Remove(emptyDir)
-		oldDir = emptyDir
-	}
-	oldRoot, newRoot, err := collectFileInfoForChanges(oldDir, newDir)
-	if err != nil {
-		return nil, err
-	}
-
-	return newRoot.Changes(oldRoot), nil
-}
-
-// ChangesSize calculates the size in bytes of the provided changes, based on newDir.
-func ChangesSize(newDir string, changes []Change) int64 {
-	var (
-		size int64
-		sf   = make(map[uint64]struct{})
-	)
-	for _, change := range changes {
-		if change.Kind == ChangeModify || change.Kind == ChangeAdd {
-			file := filepath.Join(newDir, change.Path)
-			fileInfo, err := os.Lstat(file)
-			if err != nil {
-				logrus.Errorf("Can not stat %q: %s", file, err)
-				continue
-			}
-
-			if fileInfo != nil && !fileInfo.IsDir() {
-				if hasHardlinks(fileInfo) {
-					inode := getIno(fileInfo)
-					if _, ok := sf[inode]; !ok {
-						size += fileInfo.Size()
-						sf[inode] = struct{}{}
-					}
-				} else {
-					size += fileInfo.Size()
-				}
-			}
-		}
-	}
-	return size
-}
-
-// ExportChanges produces an Archive from the provided changes, relative to dir.
-func ExportChanges(dir string, changes []Change, uidMaps, gidMaps []idtools.IDMap) (io.ReadCloser, error) {
-	reader, writer := io.Pipe()
-	go func() {
-		ta := &tarAppender{
-			TarWriter: tar.NewWriter(writer),
-			Buffer:    pools.BufioWriter32KPool.Get(nil),
-			SeenFiles: make(map[uint64]string),
-			UIDMaps:   uidMaps,
-			GIDMaps:   gidMaps,
-		}
-		// this buffer is needed for the duration of this piped stream
-		defer pools.BufioWriter32KPool.Put(ta.Buffer)
-
-		sort.Sort(changesByPath(changes))
-
-		// In general we log errors here but ignore them because
-		// during e.g. a diff operation the container can continue
-		// mutating the filesystem and we can see transient errors
-		// from this
-		for _, change := range changes {
-			if change.Kind == ChangeDelete {
-				whiteOutDir := filepath.Dir(change.Path)
-				whiteOutBase := filepath.Base(change.Path)
-				whiteOut := filepath.Join(whiteOutDir, WhiteoutPrefix+whiteOutBase)
-				timestamp := time.Now()
-				hdr := &tar.Header{
-					Name:       whiteOut[1:],
-					Size:       0,
-					ModTime:    timestamp,
-					AccessTime: timestamp,
-					ChangeTime: timestamp,
-				}
-				if err := ta.TarWriter.WriteHeader(hdr); err != nil {
-					logrus.Debugf("Can't write whiteout header: %s", err)
-				}
-			} else {
-				path := filepath.Join(dir, change.Path)
-				if err := ta.addTarFile(path, change.Path[1:]); err != nil {
-					logrus.Debugf("Can't add file %s to tar: %s", path, err)
-				}
-			}
-		}
-
-		// Make sure to check the error on Close.
-		if err := ta.TarWriter.Close(); err != nil {
-			logrus.Debugf("Can't close layer: %s", err)
-		}
-		if err := writer.Close(); err != nil {
-			logrus.Debugf("failed close Changes writer: %s", err)
-		}
-	}()
-	return reader, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_linux.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_linux.go
deleted file mode 100644
index fc5a9dfdb9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_linux.go
+++ /dev/null
@@ -1,312 +0,0 @@
-package archive
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"syscall"
-	"unsafe"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// walker is used to implement collectFileInfoForChanges on linux. Where this
-// method in general returns the entire contents of two directory trees, we
-// optimize some FS calls out on linux. In particular, we take advantage of the
-// fact that getdents(2) returns the inode of each file in the directory being
-// walked, which, when walking two trees in parallel to generate a list of
-// changes, can be used to prune subtrees without ever having to lstat(2) them
-// directly. Eliminating stat calls in this way can save up to seconds on large
-// images.
-type walker struct {
-	dir1  string
-	dir2  string
-	root1 *FileInfo
-	root2 *FileInfo
-}
-
-// collectFileInfoForChanges returns a complete representation of the trees
-// rooted at dir1 and dir2, with one important exception: any subtree or
-// leaf where the inode and device numbers are an exact match between dir1
-// and dir2 will be pruned from the results. This method is *only* to be used
-// to generating a list of changes between the two directories, as it does not
-// reflect the full contents.
-func collectFileInfoForChanges(dir1, dir2 string) (*FileInfo, *FileInfo, error) {
-	w := &walker{
-		dir1:  dir1,
-		dir2:  dir2,
-		root1: newRootFileInfo(),
-		root2: newRootFileInfo(),
-	}
-
-	i1, err := os.Lstat(w.dir1)
-	if err != nil {
-		return nil, nil, err
-	}
-	i2, err := os.Lstat(w.dir2)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if err := w.walk("/", i1, i2); err != nil {
-		return nil, nil, err
-	}
-
-	return w.root1, w.root2, nil
-}
-
-// Given a FileInfo, its path info, and a reference to the root of the tree
-// being constructed, register this file with the tree.
-func walkchunk(path string, fi os.FileInfo, dir string, root *FileInfo) error {
-	if fi == nil {
-		return nil
-	}
-	parent := root.LookUp(filepath.Dir(path))
-	if parent == nil {
-		return fmt.Errorf("collectFileInfoForChanges: Unexpectedly no parent for %s", path)
-	}
-	info := &FileInfo{
-		name:     filepath.Base(path),
-		children: make(map[string]*FileInfo),
-		parent:   parent,
-	}
-	cpath := filepath.Join(dir, path)
-	stat, err := system.FromStatT(fi.Sys().(*syscall.Stat_t))
-	if err != nil {
-		return err
-	}
-	info.stat = stat
-	info.capability, _ = system.Lgetxattr(cpath, "security.capability") // lgetxattr(2): fs access
-	parent.children[info.name] = info
-	return nil
-}
-
-// Walk a subtree rooted at the same path in both trees being iterated. For
-// example, /docker/overlay/1234/a/b/c/d and /docker/overlay/8888/a/b/c/d
-func (w *walker) walk(path string, i1, i2 os.FileInfo) (err error) {
-	// Register these nodes with the return trees, unless we're still at the
-	// (already-created) roots:
-	if path != "/" {
-		if err := walkchunk(path, i1, w.dir1, w.root1); err != nil {
-			return err
-		}
-		if err := walkchunk(path, i2, w.dir2, w.root2); err != nil {
-			return err
-		}
-	}
-
-	is1Dir := i1 != nil && i1.IsDir()
-	is2Dir := i2 != nil && i2.IsDir()
-
-	sameDevice := false
-	if i1 != nil && i2 != nil {
-		si1 := i1.Sys().(*syscall.Stat_t)
-		si2 := i2.Sys().(*syscall.Stat_t)
-		if si1.Dev == si2.Dev {
-			sameDevice = true
-		}
-	}
-
-	// If these files are both non-existent, or leaves (non-dirs), we are done.
-	if !is1Dir && !is2Dir {
-		return nil
-	}
-
-	// Fetch the names of all the files contained in both directories being walked:
-	var names1, names2 []nameIno
-	if is1Dir {
-		names1, err = readdirnames(filepath.Join(w.dir1, path)) // getdents(2): fs access
-		if err != nil {
-			return err
-		}
-	}
-	if is2Dir {
-		names2, err = readdirnames(filepath.Join(w.dir2, path)) // getdents(2): fs access
-		if err != nil {
-			return err
-		}
-	}
-
-	// We have lists of the files contained in both parallel directories, sorted
-	// in the same order. Walk them in parallel, generating a unique merged list
-	// of all items present in either or both directories.
-	var names []string
-	ix1 := 0
-	ix2 := 0
-
-	for {
-		if ix1 >= len(names1) {
-			break
-		}
-		if ix2 >= len(names2) {
-			break
-		}
-
-		ni1 := names1[ix1]
-		ni2 := names2[ix2]
-
-		switch bytes.Compare([]byte(ni1.name), []byte(ni2.name)) {
-		case -1: // ni1 < ni2 -- advance ni1
-			// we will not encounter ni1 in names2
-			names = append(names, ni1.name)
-			ix1++
-		case 0: // ni1 == ni2
-			if ni1.ino != ni2.ino || !sameDevice {
-				names = append(names, ni1.name)
-			}
-			ix1++
-			ix2++
-		case 1: // ni1 > ni2 -- advance ni2
-			// we will not encounter ni2 in names1
-			names = append(names, ni2.name)
-			ix2++
-		}
-	}
-	for ix1 < len(names1) {
-		names = append(names, names1[ix1].name)
-		ix1++
-	}
-	for ix2 < len(names2) {
-		names = append(names, names2[ix2].name)
-		ix2++
-	}
-
-	// For each of the names present in either or both of the directories being
-	// iterated, stat the name under each root, and recurse the pair of them:
-	for _, name := range names {
-		fname := filepath.Join(path, name)
-		var cInfo1, cInfo2 os.FileInfo
-		if is1Dir {
-			cInfo1, err = os.Lstat(filepath.Join(w.dir1, fname)) // lstat(2): fs access
-			if err != nil && !os.IsNotExist(err) {
-				return err
-			}
-		}
-		if is2Dir {
-			cInfo2, err = os.Lstat(filepath.Join(w.dir2, fname)) // lstat(2): fs access
-			if err != nil && !os.IsNotExist(err) {
-				return err
-			}
-		}
-		if err = w.walk(fname, cInfo1, cInfo2); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// {name,inode} pairs used to support the early-pruning logic of the walker type
-type nameIno struct {
-	name string
-	ino  uint64
-}
-
-type nameInoSlice []nameIno
-
-func (s nameInoSlice) Len() int           { return len(s) }
-func (s nameInoSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s nameInoSlice) Less(i, j int) bool { return s[i].name < s[j].name }
-
-// readdirnames is a hacked-apart version of the Go stdlib code, exposing inode
-// numbers further up the stack when reading directory contents. Unlike
-// os.Readdirnames, which returns a list of filenames, this function returns a
-// list of {filename,inode} pairs.
-func readdirnames(dirname string) (names []nameIno, err error) {
-	var (
-		size = 100
-		buf  = make([]byte, 4096)
-		nbuf int
-		bufp int
-		nb   int
-	)
-
-	f, err := os.Open(dirname)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	names = make([]nameIno, 0, size) // Empty with room to grow.
-	for {
-		// Refill the buffer if necessary
-		if bufp >= nbuf {
-			bufp = 0
-			nbuf, err = syscall.ReadDirent(int(f.Fd()), buf) // getdents on linux
-			if nbuf < 0 {
-				nbuf = 0
-			}
-			if err != nil {
-				return nil, os.NewSyscallError("readdirent", err)
-			}
-			if nbuf <= 0 {
-				break // EOF
-			}
-		}
-
-		// Drain the buffer
-		nb, names = parseDirent(buf[bufp:nbuf], names)
-		bufp += nb
-	}
-
-	sl := nameInoSlice(names)
-	sort.Sort(sl)
-	return sl, nil
-}
-
-// parseDirent is a minor modification of syscall.ParseDirent (linux version)
-// which returns {name,inode} pairs instead of just names.
-func parseDirent(buf []byte, names []nameIno) (consumed int, newnames []nameIno) {
-	origlen := len(buf)
-	for len(buf) > 0 {
-		dirent := (*syscall.Dirent)(unsafe.Pointer(&buf[0]))
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		names = append(names, nameIno{name, dirent.Ino})
-	}
-	return origlen - len(buf), names
-}
-
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
-// OverlayChanges walks the path rw and determines changes for the files in the path,
-// with respect to the parent layers
-func OverlayChanges(layers []string, rw string) ([]Change, error) {
-	return changes(layers, rw, overlayDeletedFile, nil)
-}
-
-func overlayDeletedFile(root, path string, fi os.FileInfo) (string, error) {
-	if fi.Mode()&os.ModeCharDevice != 0 {
-		s := fi.Sys().(*syscall.Stat_t)
-		if major(uint64(s.Rdev)) == 0 && minor(uint64(s.Rdev)) == 0 {
-			return path, nil
-		}
-	}
-	if fi.Mode()&os.ModeDir != 0 {
-		opaque, err := system.Lgetxattr(filepath.Join(root, path), "trusted.overlay.opaque")
-		if err != nil {
-			return "", err
-		}
-		if len(opaque) == 1 && opaque[0] == 'y' {
-			return path, nil
-		}
-	}
-
-	return "", nil
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_other.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_other.go
deleted file mode 100644
index da70ed37c4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_other.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build !linux
-
-package archive
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func collectFileInfoForChanges(oldDir, newDir string) (*FileInfo, *FileInfo, error) {
-	var (
-		oldRoot, newRoot *FileInfo
-		err1, err2       error
-		errs             = make(chan error, 2)
-	)
-	go func() {
-		oldRoot, err1 = collectFileInfo(oldDir)
-		errs <- err1
-	}()
-	go func() {
-		newRoot, err2 = collectFileInfo(newDir)
-		errs <- err2
-	}()
-
-	// block until both routines have returned
-	for i := 0; i < 2; i++ {
-		if err := <-errs; err != nil {
-			return nil, nil, err
-		}
-	}
-
-	return oldRoot, newRoot, nil
-}
-
-func collectFileInfo(sourceDir string) (*FileInfo, error) {
-	root := newRootFileInfo()
-
-	err := filepath.Walk(sourceDir, func(path string, f os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		// Rebase path
-		relPath, err := filepath.Rel(sourceDir, path)
-		if err != nil {
-			return err
-		}
-
-		// As this runs on the daemon side, file paths are OS specific.
-		relPath = filepath.Join(string(os.PathSeparator), relPath)
-
-		// See https://github.com/golang/go/issues/9168 - bug in filepath.Join.
-		// Temporary workaround. If the returned path starts with two backslashes,
-		// trim it down to a single backslash. Only relevant on Windows.
-		if runtime.GOOS == "windows" {
-			if strings.HasPrefix(relPath, `\\`) {
-				relPath = relPath[1:]
-			}
-		}
-
-		if relPath == string(os.PathSeparator) {
-			return nil
-		}
-
-		parent := root.LookUp(filepath.Dir(relPath))
-		if parent == nil {
-			return fmt.Errorf("collectFileInfo: Unexpectedly no parent for %s", relPath)
-		}
-
-		info := &FileInfo{
-			name:     filepath.Base(relPath),
-			children: make(map[string]*FileInfo),
-			parent:   parent,
-		}
-
-		s, err := system.Lstat(path)
-		if err != nil {
-			return err
-		}
-		info.stat = s
-
-		info.capability, _ = system.Lgetxattr(path, "security.capability")
-
-		parent.children[info.name] = info
-
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return root, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_posix_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_posix_test.go
deleted file mode 100644
index 095102e578..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_posix_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"runtime"
-	"sort"
-	"testing"
-)
-
-func TestHardLinkOrder(t *testing.T) {
-	//TODO Should run for Solaris
-	if runtime.GOOS == "solaris" {
-		t.Skip("gcp failures on Solaris")
-	}
-	names := []string{"file1.txt", "file2.txt", "file3.txt"}
-	msg := []byte("Hey y'all")
-
-	// Create dir
-	src, err := ioutil.TempDir("", "docker-hardlink-test-src-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(src)
-	for _, name := range names {
-		func() {
-			fh, err := os.Create(path.Join(src, name))
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer fh.Close()
-			if _, err = fh.Write(msg); err != nil {
-				t.Fatal(err)
-			}
-		}()
-	}
-	// Create dest, with changes that includes hardlinks
-	dest, err := ioutil.TempDir("", "docker-hardlink-test-dest-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	os.RemoveAll(dest) // we just want the name, at first
-	if err := copyDir(src, dest); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dest)
-	for _, name := range names {
-		for i := 0; i < 5; i++ {
-			if err := os.Link(path.Join(dest, name), path.Join(dest, fmt.Sprintf("%s.link%d", name, i))); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	// get changes
-	changes, err := ChangesDirs(dest, src)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// sort
-	sort.Sort(changesByPath(changes))
-
-	// ExportChanges
-	ar, err := ExportChanges(dest, changes, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	hdrs, err := walkHeaders(ar)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// reverse sort
-	sort.Sort(sort.Reverse(changesByPath(changes)))
-	// ExportChanges
-	arRev, err := ExportChanges(dest, changes, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	hdrsRev, err := walkHeaders(arRev)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// line up the two sets
-	sort.Sort(tarHeaders(hdrs))
-	sort.Sort(tarHeaders(hdrsRev))
-
-	// compare Size and LinkName
-	for i := range hdrs {
-		if hdrs[i].Name != hdrsRev[i].Name {
-			t.Errorf("headers - expected name %q; but got %q", hdrs[i].Name, hdrsRev[i].Name)
-		}
-		if hdrs[i].Size != hdrsRev[i].Size {
-			t.Errorf("headers - %q expected size %d; but got %d", hdrs[i].Name, hdrs[i].Size, hdrsRev[i].Size)
-		}
-		if hdrs[i].Typeflag != hdrsRev[i].Typeflag {
-			t.Errorf("headers - %q expected type %d; but got %d", hdrs[i].Name, hdrs[i].Typeflag, hdrsRev[i].Typeflag)
-		}
-		if hdrs[i].Linkname != hdrsRev[i].Linkname {
-			t.Errorf("headers - %q expected linkname %q; but got %q", hdrs[i].Name, hdrs[i].Linkname, hdrsRev[i].Linkname)
-		}
-	}
-
-}
-
-type tarHeaders []tar.Header
-
-func (th tarHeaders) Len() int           { return len(th) }
-func (th tarHeaders) Swap(i, j int)      { th[j], th[i] = th[i], th[j] }
-func (th tarHeaders) Less(i, j int) bool { return th[i].Name < th[j].Name }
-
-func walkHeaders(r io.Reader) ([]tar.Header, error) {
-	t := tar.NewReader(r)
-	headers := []tar.Header{}
-	for {
-		hdr, err := t.Next()
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return headers, err
-		}
-		headers = append(headers, *hdr)
-	}
-	return headers, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_test.go
deleted file mode 100644
index eae1d022c7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_test.go
+++ /dev/null
@@ -1,572 +0,0 @@
-package archive
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path"
-	"runtime"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func max(x, y int) int {
-	if x >= y {
-		return x
-	}
-	return y
-}
-
-func copyDir(src, dst string) error {
-	cmd := exec.Command("cp", "-a", src, dst)
-	if runtime.GOOS == "solaris" {
-		cmd = exec.Command("gcp", "-a", src, dst)
-	}
-
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-	return nil
-}
-
-type FileType uint32
-
-const (
-	Regular FileType = iota
-	Dir
-	Symlink
-)
-
-type FileData struct {
-	filetype    FileType
-	path        string
-	contents    string
-	permissions os.FileMode
-}
-
-func createSampleDir(t *testing.T, root string) {
-	files := []FileData{
-		{Regular, "file1", "file1\n", 0600},
-		{Regular, "file2", "file2\n", 0666},
-		{Regular, "file3", "file3\n", 0404},
-		{Regular, "file4", "file4\n", 0600},
-		{Regular, "file5", "file5\n", 0600},
-		{Regular, "file6", "file6\n", 0600},
-		{Regular, "file7", "file7\n", 0600},
-		{Dir, "dir1", "", 0740},
-		{Regular, "dir1/file1-1", "file1-1\n", 01444},
-		{Regular, "dir1/file1-2", "file1-2\n", 0666},
-		{Dir, "dir2", "", 0700},
-		{Regular, "dir2/file2-1", "file2-1\n", 0666},
-		{Regular, "dir2/file2-2", "file2-2\n", 0666},
-		{Dir, "dir3", "", 0700},
-		{Regular, "dir3/file3-1", "file3-1\n", 0666},
-		{Regular, "dir3/file3-2", "file3-2\n", 0666},
-		{Dir, "dir4", "", 0700},
-		{Regular, "dir4/file3-1", "file4-1\n", 0666},
-		{Regular, "dir4/file3-2", "file4-2\n", 0666},
-		{Symlink, "symlink1", "target1", 0666},
-		{Symlink, "symlink2", "target2", 0666},
-		{Symlink, "symlink3", root + "/file1", 0666},
-		{Symlink, "symlink4", root + "/symlink3", 0666},
-		{Symlink, "dirSymlink", root + "/dir1", 0740},
-	}
-
-	now := time.Now()
-	for _, info := range files {
-		p := path.Join(root, info.path)
-		if info.filetype == Dir {
-			if err := os.MkdirAll(p, info.permissions); err != nil {
-				t.Fatal(err)
-			}
-		} else if info.filetype == Regular {
-			if err := ioutil.WriteFile(p, []byte(info.contents), info.permissions); err != nil {
-				t.Fatal(err)
-			}
-		} else if info.filetype == Symlink {
-			if err := os.Symlink(info.contents, p); err != nil {
-				t.Fatal(err)
-			}
-		}
-
-		if info.filetype != Symlink {
-			// Set a consistent ctime, atime for all files and dirs
-			if err := system.Chtimes(p, now, now); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestChangeString(t *testing.T) {
-	modifiyChange := Change{"change", ChangeModify}
-	toString := modifiyChange.String()
-	if toString != "C change" {
-		t.Fatalf("String() of a change with ChangeModifiy Kind should have been %s but was %s", "C change", toString)
-	}
-	addChange := Change{"change", ChangeAdd}
-	toString = addChange.String()
-	if toString != "A change" {
-		t.Fatalf("String() of a change with ChangeAdd Kind should have been %s but was %s", "A change", toString)
-	}
-	deleteChange := Change{"change", ChangeDelete}
-	toString = deleteChange.String()
-	if toString != "D change" {
-		t.Fatalf("String() of a change with ChangeDelete Kind should have been %s but was %s", "D change", toString)
-	}
-}
-
-func TestChangesWithNoChanges(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	if runtime.GOOS == "windows" {
-		t.Skip("symlinks on Windows")
-	}
-	rwLayer, err := ioutil.TempDir("", "docker-changes-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rwLayer)
-	layer, err := ioutil.TempDir("", "docker-changes-test-layer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(layer)
-	createSampleDir(t, layer)
-	changes, err := Changes([]string{layer}, rwLayer)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(changes) != 0 {
-		t.Fatalf("Changes with no difference should have detect no changes, but detected %d", len(changes))
-	}
-}
-
-func TestChangesWithChanges(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	if runtime.GOOS == "windows" {
-		t.Skip("symlinks on Windows")
-	}
-	// Mock the readonly layer
-	layer, err := ioutil.TempDir("", "docker-changes-test-layer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(layer)
-	createSampleDir(t, layer)
-	os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)
-
-	// Mock the RW layer
-	rwLayer, err := ioutil.TempDir("", "docker-changes-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rwLayer)
-
-	// Create a folder in RW layer
-	dir1 := path.Join(rwLayer, "dir1")
-	os.MkdirAll(dir1, 0740)
-	deletedFile := path.Join(dir1, ".wh.file1-2")
-	ioutil.WriteFile(deletedFile, []byte{}, 0600)
-	modifiedFile := path.Join(dir1, "file1-1")
-	ioutil.WriteFile(modifiedFile, []byte{0x00}, 01444)
-	// Let's add a subfolder for a newFile
-	subfolder := path.Join(dir1, "subfolder")
-	os.MkdirAll(subfolder, 0740)
-	newFile := path.Join(subfolder, "newFile")
-	ioutil.WriteFile(newFile, []byte{}, 0740)
-
-	changes, err := Changes([]string{layer}, rwLayer)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedChanges := []Change{
-		{"/dir1", ChangeModify},
-		{"/dir1/file1-1", ChangeModify},
-		{"/dir1/file1-2", ChangeDelete},
-		{"/dir1/subfolder", ChangeModify},
-		{"/dir1/subfolder/newFile", ChangeAdd},
-	}
-	checkChanges(expectedChanges, changes, t)
-}
-
-// See https://github.com/docker/docker/pull/13590
-func TestChangesWithChangesGH13590(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	if runtime.GOOS == "windows" {
-		t.Skip("symlinks on Windows")
-	}
-	baseLayer, err := ioutil.TempDir("", "docker-changes-test.")
-	defer os.RemoveAll(baseLayer)
-
-	dir3 := path.Join(baseLayer, "dir1/dir2/dir3")
-	os.MkdirAll(dir3, 07400)
-
-	file := path.Join(dir3, "file.txt")
-	ioutil.WriteFile(file, []byte("hello"), 0666)
-
-	layer, err := ioutil.TempDir("", "docker-changes-test2.")
-	defer os.RemoveAll(layer)
-
-	// Test creating a new file
-	if err := copyDir(baseLayer+"/dir1", layer+"/"); err != nil {
-		t.Fatalf("Cmd failed: %q", err)
-	}
-
-	os.Remove(path.Join(layer, "dir1/dir2/dir3/file.txt"))
-	file = path.Join(layer, "dir1/dir2/dir3/file1.txt")
-	ioutil.WriteFile(file, []byte("bye"), 0666)
-
-	changes, err := Changes([]string{baseLayer}, layer)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedChanges := []Change{
-		{"/dir1/dir2/dir3", ChangeModify},
-		{"/dir1/dir2/dir3/file1.txt", ChangeAdd},
-	}
-	checkChanges(expectedChanges, changes, t)
-
-	// Now test changing a file
-	layer, err = ioutil.TempDir("", "docker-changes-test3.")
-	defer os.RemoveAll(layer)
-
-	if err := copyDir(baseLayer+"/dir1", layer+"/"); err != nil {
-		t.Fatalf("Cmd failed: %q", err)
-	}
-
-	file = path.Join(layer, "dir1/dir2/dir3/file.txt")
-	ioutil.WriteFile(file, []byte("bye"), 0666)
-
-	changes, err = Changes([]string{baseLayer}, layer)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedChanges = []Change{
-		{"/dir1/dir2/dir3/file.txt", ChangeModify},
-	}
-	checkChanges(expectedChanges, changes, t)
-}
-
-// Create a directory, copy it, make sure we report no changes between the two
-func TestChangesDirsEmpty(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	// TODO Should work for Solaris
-	if runtime.GOOS == "windows" || runtime.GOOS == "solaris" {
-		t.Skip("symlinks on Windows; gcp failure on Solaris")
-	}
-	src, err := ioutil.TempDir("", "docker-changes-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(src)
-	createSampleDir(t, src)
-	dst := src + "-copy"
-	if err := copyDir(src, dst); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dst)
-	changes, err := ChangesDirs(dst, src)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(changes) != 0 {
-		t.Fatalf("Reported changes for identical dirs: %v", changes)
-	}
-	os.RemoveAll(src)
-	os.RemoveAll(dst)
-}
-
-func mutateSampleDir(t *testing.T, root string) {
-	// Remove a regular file
-	if err := os.RemoveAll(path.Join(root, "file1")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove a directory
-	if err := os.RemoveAll(path.Join(root, "dir1")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Remove a symlink
-	if err := os.RemoveAll(path.Join(root, "symlink1")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Rewrite a file
-	if err := ioutil.WriteFile(path.Join(root, "file2"), []byte("fileNN\n"), 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	// Replace a file
-	if err := os.RemoveAll(path.Join(root, "file3")); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(path.Join(root, "file3"), []byte("fileMM\n"), 0404); err != nil {
-		t.Fatal(err)
-	}
-
-	// Touch file
-	if err := system.Chtimes(path.Join(root, "file4"), time.Now().Add(time.Second), time.Now().Add(time.Second)); err != nil {
-		t.Fatal(err)
-	}
-
-	// Replace file with dir
-	if err := os.RemoveAll(path.Join(root, "file5")); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(path.Join(root, "file5"), 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create new file
-	if err := ioutil.WriteFile(path.Join(root, "filenew"), []byte("filenew\n"), 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create new dir
-	if err := os.MkdirAll(path.Join(root, "dirnew"), 0766); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a new symlink
-	if err := os.Symlink("targetnew", path.Join(root, "symlinknew")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Change a symlink
-	if err := os.RemoveAll(path.Join(root, "symlink2")); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Symlink("target2change", path.Join(root, "symlink2")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Replace dir with file
-	if err := os.RemoveAll(path.Join(root, "dir2")); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(path.Join(root, "dir2"), []byte("dir2\n"), 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	// Touch dir
-	if err := system.Chtimes(path.Join(root, "dir3"), time.Now().Add(time.Second), time.Now().Add(time.Second)); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChangesDirsMutated(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	// TODO Should work for Solaris
-	if runtime.GOOS == "windows" || runtime.GOOS == "solaris" {
-		t.Skip("symlinks on Windows; gcp failures on Solaris")
-	}
-	src, err := ioutil.TempDir("", "docker-changes-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	createSampleDir(t, src)
-	dst := src + "-copy"
-	if err := copyDir(src, dst); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(src)
-	defer os.RemoveAll(dst)
-
-	mutateSampleDir(t, dst)
-
-	changes, err := ChangesDirs(dst, src)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sort.Sort(changesByPath(changes))
-
-	expectedChanges := []Change{
-		{"/dir1", ChangeDelete},
-		{"/dir2", ChangeModify},
-		{"/dirnew", ChangeAdd},
-		{"/file1", ChangeDelete},
-		{"/file2", ChangeModify},
-		{"/file3", ChangeModify},
-		{"/file4", ChangeModify},
-		{"/file5", ChangeModify},
-		{"/filenew", ChangeAdd},
-		{"/symlink1", ChangeDelete},
-		{"/symlink2", ChangeModify},
-		{"/symlinknew", ChangeAdd},
-	}
-
-	for i := 0; i < max(len(changes), len(expectedChanges)); i++ {
-		if i >= len(expectedChanges) {
-			t.Fatalf("unexpected change %s\n", changes[i].String())
-		}
-		if i >= len(changes) {
-			t.Fatalf("no change for expected change %s\n", expectedChanges[i].String())
-		}
-		if changes[i].Path == expectedChanges[i].Path {
-			if changes[i] != expectedChanges[i] {
-				t.Fatalf("Wrong change for %s, expected %s, got %s\n", changes[i].Path, changes[i].String(), expectedChanges[i].String())
-			}
-		} else if changes[i].Path < expectedChanges[i].Path {
-			t.Fatalf("unexpected change %s\n", changes[i].String())
-		} else {
-			t.Fatalf("no change for expected change %s != %s\n", expectedChanges[i].String(), changes[i].String())
-		}
-	}
-}
-
-func TestApplyLayer(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	// TODO Should work for Solaris
-	if runtime.GOOS == "windows" || runtime.GOOS == "solaris" {
-		t.Skip("symlinks on Windows; gcp failures on Solaris")
-	}
-	src, err := ioutil.TempDir("", "docker-changes-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	createSampleDir(t, src)
-	defer os.RemoveAll(src)
-	dst := src + "-copy"
-	if err := copyDir(src, dst); err != nil {
-		t.Fatal(err)
-	}
-	mutateSampleDir(t, dst)
-	defer os.RemoveAll(dst)
-
-	changes, err := ChangesDirs(dst, src)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layer, err := ExportChanges(dst, changes, nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	layerCopy, err := NewTempArchive(layer, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := ApplyLayer(src, layerCopy); err != nil {
-		t.Fatal(err)
-	}
-
-	changes2, err := ChangesDirs(src, dst)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(changes2) != 0 {
-		t.Fatalf("Unexpected differences after reapplying mutation: %v", changes2)
-	}
-}
-
-func TestChangesSizeWithHardlinks(t *testing.T) {
-	// TODO Windows. There may be a way of running this, but turning off for now
-	// as createSampleDir uses symlinks.
-	if runtime.GOOS == "windows" {
-		t.Skip("hardlinks on Windows")
-	}
-	srcDir, err := ioutil.TempDir("", "docker-test-srcDir")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(srcDir)
-
-	destDir, err := ioutil.TempDir("", "docker-test-destDir")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(destDir)
-
-	creationSize, err := prepareUntarSourceDirectory(100, destDir, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	changes, err := ChangesDirs(destDir, srcDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	got := ChangesSize(destDir, changes)
-	if got != int64(creationSize) {
-		t.Errorf("Expected %d bytes of changes, got %d", creationSize, got)
-	}
-}
-
-func TestChangesSizeWithNoChanges(t *testing.T) {
-	size := ChangesSize("/tmp", nil)
-	if size != 0 {
-		t.Fatalf("ChangesSizes with no changes should be 0, was %d", size)
-	}
-}
-
-func TestChangesSizeWithOnlyDeleteChanges(t *testing.T) {
-	changes := []Change{
-		{Path: "deletedPath", Kind: ChangeDelete},
-	}
-	size := ChangesSize("/tmp", changes)
-	if size != 0 {
-		t.Fatalf("ChangesSizes with only delete changes should be 0, was %d", size)
-	}
-}
-
-func TestChangesSize(t *testing.T) {
-	parentPath, err := ioutil.TempDir("", "docker-changes-test")
-	defer os.RemoveAll(parentPath)
-	addition := path.Join(parentPath, "addition")
-	if err := ioutil.WriteFile(addition, []byte{0x01, 0x01, 0x01}, 0744); err != nil {
-		t.Fatal(err)
-	}
-	modification := path.Join(parentPath, "modification")
-	if err = ioutil.WriteFile(modification, []byte{0x01, 0x01, 0x01}, 0744); err != nil {
-		t.Fatal(err)
-	}
-	changes := []Change{
-		{Path: "addition", Kind: ChangeAdd},
-		{Path: "modification", Kind: ChangeModify},
-	}
-	size := ChangesSize(parentPath, changes)
-	if size != 6 {
-		t.Fatalf("Expected 6 bytes of changes, got %d", size)
-	}
-}
-
-func checkChanges(expectedChanges, changes []Change, t *testing.T) {
-	sort.Sort(changesByPath(expectedChanges))
-	sort.Sort(changesByPath(changes))
-	for i := 0; i < max(len(changes), len(expectedChanges)); i++ {
-		if i >= len(expectedChanges) {
-			t.Fatalf("unexpected change %s\n", changes[i].String())
-		}
-		if i >= len(changes) {
-			t.Fatalf("no change for expected change %s\n", expectedChanges[i].String())
-		}
-		if changes[i].Path == expectedChanges[i].Path {
-			if changes[i] != expectedChanges[i] {
-				t.Fatalf("Wrong change for %s, expected %s, got %s\n", changes[i].Path, changes[i].String(), expectedChanges[i].String())
-			}
-		} else if changes[i].Path < expectedChanges[i].Path {
-			t.Fatalf("unexpected change %s\n", changes[i].String())
-		} else {
-			t.Fatalf("no change for expected change %s != %s\n", expectedChanges[i].String(), changes[i].String())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_unix.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
deleted file mode 100644
index 3778b732cf..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_unix.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"os"
-	"syscall"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
-	// Don't look at size for dirs, its not a good measure of change
-	if oldStat.Mode() != newStat.Mode() ||
-		oldStat.UID() != newStat.UID() ||
-		oldStat.GID() != newStat.GID() ||
-		oldStat.Rdev() != newStat.Rdev() ||
-		// Don't look at size for dirs, its not a good measure of change
-		(oldStat.Mode()&syscall.S_IFDIR != syscall.S_IFDIR &&
-			(!sameFsTimeSpec(oldStat.Mtim(), newStat.Mtim()) || (oldStat.Size() != newStat.Size()))) {
-		return true
-	}
-	return false
-}
-
-func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.Mode()&syscall.S_IFDIR != 0
-}
-
-func getIno(fi os.FileInfo) uint64 {
-	return uint64(fi.Sys().(*syscall.Stat_t).Ino)
-}
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return fi.Sys().(*syscall.Stat_t).Nlink > 1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/changes_windows.go b/installer/vendor/github.com/docker/docker/pkg/archive/changes_windows.go
deleted file mode 100644
index af94243fc4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/changes_windows.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package archive
-
-import (
-	"os"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-func statDifferent(oldStat *system.StatT, newStat *system.StatT) bool {
-
-	// Don't look at size for dirs, its not a good measure of change
-	if oldStat.ModTime() != newStat.ModTime() ||
-		oldStat.Mode() != newStat.Mode() ||
-		oldStat.Size() != newStat.Size() && !oldStat.IsDir() {
-		return true
-	}
-	return false
-}
-
-func (info *FileInfo) isDir() bool {
-	return info.parent == nil || info.stat.IsDir()
-}
-
-func getIno(fi os.FileInfo) (inode uint64) {
-	return
-}
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/copy.go b/installer/vendor/github.com/docker/docker/pkg/archive/copy.go
deleted file mode 100644
index 0614c67cec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/copy.go
+++ /dev/null
@@ -1,458 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"errors"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/system"
-)
-
-// Errors used or returned by this file.
-var (
-	ErrNotDirectory      = errors.New("not a directory")
-	ErrDirNotExists      = errors.New("no such directory")
-	ErrCannotCopyDir     = errors.New("cannot copy directory")
-	ErrInvalidCopySource = errors.New("invalid copy source content")
-)
-
-// PreserveTrailingDotOrSeparator returns the given cleaned path (after
-// processing using any utility functions from the path or filepath stdlib
-// packages) and appends a trailing `/.` or `/` if its corresponding  original
-// path (from before being processed by utility functions from the path or
-// filepath stdlib packages) ends with a trailing `/.` or `/`. If the cleaned
-// path already ends in a `.` path segment, then another is not added. If the
-// clean path already ends in a path separator, then another is not added.
-func PreserveTrailingDotOrSeparator(cleanedPath, originalPath string) string {
-	// Ensure paths are in platform semantics
-	cleanedPath = normalizePath(cleanedPath)
-	originalPath = normalizePath(originalPath)
-
-	if !specifiesCurrentDir(cleanedPath) && specifiesCurrentDir(originalPath) {
-		if !hasTrailingPathSeparator(cleanedPath) {
-			// Add a separator if it doesn't already end with one (a cleaned
-			// path would only end in a separator if it is the root).
-			cleanedPath += string(filepath.Separator)
-		}
-		cleanedPath += "."
-	}
-
-	if !hasTrailingPathSeparator(cleanedPath) && hasTrailingPathSeparator(originalPath) {
-		cleanedPath += string(filepath.Separator)
-	}
-
-	return cleanedPath
-}
-
-// assertsDirectory returns whether the given path is
-// asserted to be a directory, i.e., the path ends with
-// a trailing '/' or `/.`, assuming a path separator of `/`.
-func assertsDirectory(path string) bool {
-	return hasTrailingPathSeparator(path) || specifiesCurrentDir(path)
-}
-
-// hasTrailingPathSeparator returns whether the given
-// path ends with the system's path separator character.
-func hasTrailingPathSeparator(path string) bool {
-	return len(path) > 0 && os.IsPathSeparator(path[len(path)-1])
-}
-
-// specifiesCurrentDir returns whether the given path specifies
-// a "current directory", i.e., the last path segment is `.`.
-func specifiesCurrentDir(path string) bool {
-	return filepath.Base(path) == "."
-}
-
-// SplitPathDirEntry splits the given path between its directory name and its
-// basename by first cleaning the path but preserves a trailing "." if the
-// original path specified the current directory.
-func SplitPathDirEntry(path string) (dir, base string) {
-	cleanedPath := filepath.Clean(normalizePath(path))
-
-	if specifiesCurrentDir(path) {
-		cleanedPath += string(filepath.Separator) + "."
-	}
-
-	return filepath.Dir(cleanedPath), filepath.Base(cleanedPath)
-}
-
-// TarResource archives the resource described by the given CopyInfo to a Tar
-// archive. A non-nil error is returned if sourcePath does not exist or is
-// asserted to be a directory but exists as another type of file.
-//
-// This function acts as a convenient wrapper around TarWithOptions, which
-// requires a directory as the source path. TarResource accepts either a
-// directory or a file path and correctly sets the Tar options.
-func TarResource(sourceInfo CopyInfo) (content io.ReadCloser, err error) {
-	return TarResourceRebase(sourceInfo.Path, sourceInfo.RebaseName)
-}
-
-// TarResourceRebase is like TarResource but renames the first path element of
-// items in the resulting tar archive to match the given rebaseName if not "".
-func TarResourceRebase(sourcePath, rebaseName string) (content io.ReadCloser, err error) {
-	sourcePath = normalizePath(sourcePath)
-	if _, err = os.Lstat(sourcePath); err != nil {
-		// Catches the case where the source does not exist or is not a
-		// directory if asserted to be a directory, as this also causes an
-		// error.
-		return
-	}
-
-	// Separate the source path between its directory and
-	// the entry in that directory which we are archiving.
-	sourceDir, sourceBase := SplitPathDirEntry(sourcePath)
-
-	filter := []string{sourceBase}
-
-	logrus.Debugf("copying %q from %q", sourceBase, sourceDir)
-
-	return TarWithOptions(sourceDir, &TarOptions{
-		Compression:      Uncompressed,
-		IncludeFiles:     filter,
-		IncludeSourceDir: true,
-		RebaseNames: map[string]string{
-			sourceBase: rebaseName,
-		},
-	})
-}
-
-// CopyInfo holds basic info about the source
-// or destination path of a copy operation.
-type CopyInfo struct {
-	Path       string
-	Exists     bool
-	IsDir      bool
-	RebaseName string
-}
-
-// CopyInfoSourcePath stats the given path to create a CopyInfo
-// struct representing that resource for the source of an archive copy
-// operation. The given path should be an absolute local path. A source path
-// has all symlinks evaluated that appear before the last path separator ("/"
-// on Unix). As it is to be a copy source, the path must exist.
-func CopyInfoSourcePath(path string, followLink bool) (CopyInfo, error) {
-	// normalize the file path and then evaluate the symbol link
-	// we will use the target file instead of the symbol link if
-	// followLink is set
-	path = normalizePath(path)
-
-	resolvedPath, rebaseName, err := ResolveHostSourcePath(path, followLink)
-	if err != nil {
-		return CopyInfo{}, err
-	}
-
-	stat, err := os.Lstat(resolvedPath)
-	if err != nil {
-		return CopyInfo{}, err
-	}
-
-	return CopyInfo{
-		Path:       resolvedPath,
-		Exists:     true,
-		IsDir:      stat.IsDir(),
-		RebaseName: rebaseName,
-	}, nil
-}
-
-// CopyInfoDestinationPath stats the given path to create a CopyInfo
-// struct representing that resource for the destination of an archive copy
-// operation. The given path should be an absolute local path.
-func CopyInfoDestinationPath(path string) (info CopyInfo, err error) {
-	maxSymlinkIter := 10 // filepath.EvalSymlinks uses 255, but 10 already seems like a lot.
-	path = normalizePath(path)
-	originalPath := path
-
-	stat, err := os.Lstat(path)
-
-	if err == nil && stat.Mode()&os.ModeSymlink == 0 {
-		// The path exists and is not a symlink.
-		return CopyInfo{
-			Path:   path,
-			Exists: true,
-			IsDir:  stat.IsDir(),
-		}, nil
-	}
-
-	// While the path is a symlink.
-	for n := 0; err == nil && stat.Mode()&os.ModeSymlink != 0; n++ {
-		if n > maxSymlinkIter {
-			// Don't follow symlinks more than this arbitrary number of times.
-			return CopyInfo{}, errors.New("too many symlinks in " + originalPath)
-		}
-
-		// The path is a symbolic link. We need to evaluate it so that the
-		// destination of the copy operation is the link target and not the
-		// link itself. This is notably different than CopyInfoSourcePath which
-		// only evaluates symlinks before the last appearing path separator.
-		// Also note that it is okay if the last path element is a broken
-		// symlink as the copy operation should create the target.
-		var linkTarget string
-
-		linkTarget, err = os.Readlink(path)
-		if err != nil {
-			return CopyInfo{}, err
-		}
-
-		if !system.IsAbs(linkTarget) {
-			// Join with the parent directory.
-			dstParent, _ := SplitPathDirEntry(path)
-			linkTarget = filepath.Join(dstParent, linkTarget)
-		}
-
-		path = linkTarget
-		stat, err = os.Lstat(path)
-	}
-
-	if err != nil {
-		// It's okay if the destination path doesn't exist. We can still
-		// continue the copy operation if the parent directory exists.
-		if !os.IsNotExist(err) {
-			return CopyInfo{}, err
-		}
-
-		// Ensure destination parent dir exists.
-		dstParent, _ := SplitPathDirEntry(path)
-
-		parentDirStat, err := os.Lstat(dstParent)
-		if err != nil {
-			return CopyInfo{}, err
-		}
-		if !parentDirStat.IsDir() {
-			return CopyInfo{}, ErrNotDirectory
-		}
-
-		return CopyInfo{Path: path}, nil
-	}
-
-	// The path exists after resolving symlinks.
-	return CopyInfo{
-		Path:   path,
-		Exists: true,
-		IsDir:  stat.IsDir(),
-	}, nil
-}
-
-// PrepareArchiveCopy prepares the given srcContent archive, which should
-// contain the archived resource described by srcInfo, to the destination
-// described by dstInfo. Returns the possibly modified content archive along
-// with the path to the destination directory which it should be extracted to.
-func PrepareArchiveCopy(srcContent io.Reader, srcInfo, dstInfo CopyInfo) (dstDir string, content io.ReadCloser, err error) {
-	// Ensure in platform semantics
-	srcInfo.Path = normalizePath(srcInfo.Path)
-	dstInfo.Path = normalizePath(dstInfo.Path)
-
-	// Separate the destination path between its directory and base
-	// components in case the source archive contents need to be rebased.
-	dstDir, dstBase := SplitPathDirEntry(dstInfo.Path)
-	_, srcBase := SplitPathDirEntry(srcInfo.Path)
-
-	switch {
-	case dstInfo.Exists && dstInfo.IsDir:
-		// The destination exists as a directory. No alteration
-		// to srcContent is needed as its contents can be
-		// simply extracted to the destination directory.
-		return dstInfo.Path, ioutil.NopCloser(srcContent), nil
-	case dstInfo.Exists && srcInfo.IsDir:
-		// The destination exists as some type of file and the source
-		// content is a directory. This is an error condition since
-		// you cannot copy a directory to an existing file location.
-		return "", nil, ErrCannotCopyDir
-	case dstInfo.Exists:
-		// The destination exists as some type of file and the source content
-		// is also a file. The source content entry will have to be renamed to
-		// have a basename which matches the destination path's basename.
-		if len(srcInfo.RebaseName) != 0 {
-			srcBase = srcInfo.RebaseName
-		}
-		return dstDir, RebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	case srcInfo.IsDir:
-		// The destination does not exist and the source content is an archive
-		// of a directory. The archive should be extracted to the parent of
-		// the destination path instead, and when it is, the directory that is
-		// created as a result should take the name of the destination path.
-		// The source content entries will have to be renamed to have a
-		// basename which matches the destination path's basename.
-		if len(srcInfo.RebaseName) != 0 {
-			srcBase = srcInfo.RebaseName
-		}
-		return dstDir, RebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	case assertsDirectory(dstInfo.Path):
-		// The destination does not exist and is asserted to be created as a
-		// directory, but the source content is not a directory. This is an
-		// error condition since you cannot create a directory from a file
-		// source.
-		return "", nil, ErrDirNotExists
-	default:
-		// The last remaining case is when the destination does not exist, is
-		// not asserted to be a directory, and the source content is not an
-		// archive of a directory. It this case, the destination file will need
-		// to be created when the archive is extracted and the source content
-		// entry will have to be renamed to have a basename which matches the
-		// destination path's basename.
-		if len(srcInfo.RebaseName) != 0 {
-			srcBase = srcInfo.RebaseName
-		}
-		return dstDir, RebaseArchiveEntries(srcContent, srcBase, dstBase), nil
-	}
-
-}
-
-// RebaseArchiveEntries rewrites the given srcContent archive replacing
-// an occurrence of oldBase with newBase at the beginning of entry names.
-func RebaseArchiveEntries(srcContent io.Reader, oldBase, newBase string) io.ReadCloser {
-	if oldBase == string(os.PathSeparator) {
-		// If oldBase specifies the root directory, use an empty string as
-		// oldBase instead so that newBase doesn't replace the path separator
-		// that all paths will start with.
-		oldBase = ""
-	}
-
-	rebased, w := io.Pipe()
-
-	go func() {
-		srcTar := tar.NewReader(srcContent)
-		rebasedTar := tar.NewWriter(w)
-
-		for {
-			hdr, err := srcTar.Next()
-			if err == io.EOF {
-				// Signals end of archive.
-				rebasedTar.Close()
-				w.Close()
-				return
-			}
-			if err != nil {
-				w.CloseWithError(err)
-				return
-			}
-
-			hdr.Name = strings.Replace(hdr.Name, oldBase, newBase, 1)
-
-			if err = rebasedTar.WriteHeader(hdr); err != nil {
-				w.CloseWithError(err)
-				return
-			}
-
-			if _, err = io.Copy(rebasedTar, srcTar); err != nil {
-				w.CloseWithError(err)
-				return
-			}
-		}
-	}()
-
-	return rebased
-}
-
-// CopyResource performs an archive copy from the given source path to the
-// given destination path. The source path MUST exist and the destination
-// path's parent directory must exist.
-func CopyResource(srcPath, dstPath string, followLink bool) error {
-	var (
-		srcInfo CopyInfo
-		err     error
-	)
-
-	// Ensure in platform semantics
-	srcPath = normalizePath(srcPath)
-	dstPath = normalizePath(dstPath)
-
-	// Clean the source and destination paths.
-	srcPath = PreserveTrailingDotOrSeparator(filepath.Clean(srcPath), srcPath)
-	dstPath = PreserveTrailingDotOrSeparator(filepath.Clean(dstPath), dstPath)
-
-	if srcInfo, err = CopyInfoSourcePath(srcPath, followLink); err != nil {
-		return err
-	}
-
-	content, err := TarResource(srcInfo)
-	if err != nil {
-		return err
-	}
-	defer content.Close()
-
-	return CopyTo(content, srcInfo, dstPath)
-}
-
-// CopyTo handles extracting the given content whose
-// entries should be sourced from srcInfo to dstPath.
-func CopyTo(content io.Reader, srcInfo CopyInfo, dstPath string) error {
-	// The destination path need not exist, but CopyInfoDestinationPath will
-	// ensure that at least the parent directory exists.
-	dstInfo, err := CopyInfoDestinationPath(normalizePath(dstPath))
-	if err != nil {
-		return err
-	}
-
-	dstDir, copyArchive, err := PrepareArchiveCopy(content, srcInfo, dstInfo)
-	if err != nil {
-		return err
-	}
-	defer copyArchive.Close()
-
-	options := &TarOptions{
-		NoLchown:             true,
-		NoOverwriteDirNonDir: true,
-	}
-
-	return Untar(copyArchive, dstDir, options)
-}
-
-// ResolveHostSourcePath decides real path need to be copied with parameters such as
-// whether to follow symbol link or not, if followLink is true, resolvedPath will return
-// link target of any symbol link file, else it will only resolve symlink of directory
-// but return symbol link file itself without resolving.
-func ResolveHostSourcePath(path string, followLink bool) (resolvedPath, rebaseName string, err error) {
-	if followLink {
-		resolvedPath, err = filepath.EvalSymlinks(path)
-		if err != nil {
-			return
-		}
-
-		resolvedPath, rebaseName = GetRebaseName(path, resolvedPath)
-	} else {
-		dirPath, basePath := filepath.Split(path)
-
-		// if not follow symbol link, then resolve symbol link of parent dir
-		var resolvedDirPath string
-		resolvedDirPath, err = filepath.EvalSymlinks(dirPath)
-		if err != nil {
-			return
-		}
-		// resolvedDirPath will have been cleaned (no trailing path separators) so
-		// we can manually join it with the base path element.
-		resolvedPath = resolvedDirPath + string(filepath.Separator) + basePath
-		if hasTrailingPathSeparator(path) && filepath.Base(path) != filepath.Base(resolvedPath) {
-			rebaseName = filepath.Base(path)
-		}
-	}
-	return resolvedPath, rebaseName, nil
-}
-
-// GetRebaseName normalizes and compares path and resolvedPath,
-// return completed resolved path and rebased file name
-func GetRebaseName(path, resolvedPath string) (string, string) {
-	// linkTarget will have been cleaned (no trailing path separators and dot) so
-	// we can manually join it with them
-	var rebaseName string
-	if specifiesCurrentDir(path) && !specifiesCurrentDir(resolvedPath) {
-		resolvedPath += string(filepath.Separator) + "."
-	}
-
-	if hasTrailingPathSeparator(path) && !hasTrailingPathSeparator(resolvedPath) {
-		resolvedPath += string(filepath.Separator)
-	}
-
-	if filepath.Base(path) != filepath.Base(resolvedPath) {
-		// In the case where the path had a trailing separator and a symlink
-		// evaluation has changed the last path component, we will need to
-		// rebase the name in the archive that is being copied to match the
-		// originally requested name.
-		rebaseName = filepath.Base(path)
-	}
-	return resolvedPath, rebaseName
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix.go b/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix.go
deleted file mode 100644
index e305b5e4af..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !windows
-
-package archive
-
-import (
-	"path/filepath"
-)
-
-func normalizePath(path string) string {
-	return filepath.ToSlash(path)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix_test.go
deleted file mode 100644
index ecbfc172b0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/copy_unix_test.go
+++ /dev/null
@@ -1,978 +0,0 @@
-// +build !windows
-
-// TODO Windows: Some of these tests may be salvagable and portable to Windows.
-
-package archive
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func removeAllPaths(paths ...string) {
-	for _, path := range paths {
-		os.RemoveAll(path)
-	}
-}
-
-func getTestTempDirs(t *testing.T) (tmpDirA, tmpDirB string) {
-	var err error
-
-	if tmpDirA, err = ioutil.TempDir("", "archive-copy-test"); err != nil {
-		t.Fatal(err)
-	}
-
-	if tmpDirB, err = ioutil.TempDir("", "archive-copy-test"); err != nil {
-		t.Fatal(err)
-	}
-
-	return
-}
-
-func isNotDir(err error) bool {
-	return strings.Contains(err.Error(), "not a directory")
-}
-
-func joinTrailingSep(pathElements ...string) string {
-	joined := filepath.Join(pathElements...)
-
-	return fmt.Sprintf("%s%c", joined, filepath.Separator)
-}
-
-func fileContentsEqual(t *testing.T, filenameA, filenameB string) (err error) {
-	t.Logf("checking for equal file contents: %q and %q\n", filenameA, filenameB)
-
-	fileA, err := os.Open(filenameA)
-	if err != nil {
-		return
-	}
-	defer fileA.Close()
-
-	fileB, err := os.Open(filenameB)
-	if err != nil {
-		return
-	}
-	defer fileB.Close()
-
-	hasher := sha256.New()
-
-	if _, err = io.Copy(hasher, fileA); err != nil {
-		return
-	}
-
-	hashA := hasher.Sum(nil)
-	hasher.Reset()
-
-	if _, err = io.Copy(hasher, fileB); err != nil {
-		return
-	}
-
-	hashB := hasher.Sum(nil)
-
-	if !bytes.Equal(hashA, hashB) {
-		err = fmt.Errorf("file content hashes not equal - expected %s, got %s", hex.EncodeToString(hashA), hex.EncodeToString(hashB))
-	}
-
-	return
-}
-
-func dirContentsEqual(t *testing.T, newDir, oldDir string) (err error) {
-	t.Logf("checking for equal directory contents: %q and %q\n", newDir, oldDir)
-
-	var changes []Change
-
-	if changes, err = ChangesDirs(newDir, oldDir); err != nil {
-		return
-	}
-
-	if len(changes) != 0 {
-		err = fmt.Errorf("expected no changes between directories, but got: %v", changes)
-	}
-
-	return
-}
-
-func logDirContents(t *testing.T, dirPath string) {
-	logWalkedPaths := filepath.WalkFunc(func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			t.Errorf("stat error for path %q: %s", path, err)
-			return nil
-		}
-
-		if info.IsDir() {
-			path = joinTrailingSep(path)
-		}
-
-		t.Logf("\t%s", path)
-
-		return nil
-	})
-
-	t.Logf("logging directory contents: %q", dirPath)
-
-	if err := filepath.Walk(dirPath, logWalkedPaths); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testCopyHelper(t *testing.T, srcPath, dstPath string) (err error) {
-	t.Logf("copying from %q to %q (not follow symbol link)", srcPath, dstPath)
-
-	return CopyResource(srcPath, dstPath, false)
-}
-
-func testCopyHelperFSym(t *testing.T, srcPath, dstPath string) (err error) {
-	t.Logf("copying from %q to %q (follow symbol link)", srcPath, dstPath)
-
-	return CopyResource(srcPath, dstPath, true)
-}
-
-// Basic assumptions about SRC and DST:
-// 1. SRC must exist.
-// 2. If SRC ends with a trailing separator, it must be a directory.
-// 3. DST parent directory must exist.
-// 4. If DST exists as a file, it must not end with a trailing separator.
-
-// First get these easy error cases out of the way.
-
-// Test for error when SRC does not exist.
-func TestCopyErrSrcNotExists(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	if _, err := CopyInfoSourcePath(filepath.Join(tmpDirA, "file1"), false); !os.IsNotExist(err) {
-		t.Fatalf("expected IsNotExist error, but got %T: %s", err, err)
-	}
-}
-
-// Test for error when SRC ends in a trailing
-// path separator but it exists as a file.
-func TestCopyErrSrcNotDir(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	if _, err := CopyInfoSourcePath(joinTrailingSep(tmpDirA, "file1"), false); !isNotDir(err) {
-		t.Fatalf("expected IsNotDir error, but got %T: %s", err, err)
-	}
-}
-
-// Test for error when SRC is a valid file or directory,
-// but the DST parent directory does not exist.
-func TestCopyErrDstParentNotExists(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcInfo := CopyInfo{Path: filepath.Join(tmpDirA, "file1"), Exists: true, IsDir: false}
-
-	// Try with a file source.
-	content, err := TarResource(srcInfo)
-	if err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-	defer content.Close()
-
-	// Copy to a file whose parent does not exist.
-	if err = CopyTo(content, srcInfo, filepath.Join(tmpDirB, "fakeParentDir", "file1")); err == nil {
-		t.Fatal("expected IsNotExist error, but got nil instead")
-	}
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("expected IsNotExist error, but got %T: %s", err, err)
-	}
-
-	// Try with a directory source.
-	srcInfo = CopyInfo{Path: filepath.Join(tmpDirA, "dir1"), Exists: true, IsDir: true}
-
-	content, err = TarResource(srcInfo)
-	if err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-	defer content.Close()
-
-	// Copy to a directory whose parent does not exist.
-	if err = CopyTo(content, srcInfo, joinTrailingSep(tmpDirB, "fakeParentDir", "fakeDstDir")); err == nil {
-		t.Fatal("expected IsNotExist error, but got nil instead")
-	}
-
-	if !os.IsNotExist(err) {
-		t.Fatalf("expected IsNotExist error, but got %T: %s", err, err)
-	}
-}
-
-// Test for error when DST ends in a trailing
-// path separator but exists as a file.
-func TestCopyErrDstNotDir(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	// Try with a file source.
-	srcInfo := CopyInfo{Path: filepath.Join(tmpDirA, "file1"), Exists: true, IsDir: false}
-
-	content, err := TarResource(srcInfo)
-	if err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-	defer content.Close()
-
-	if err = CopyTo(content, srcInfo, joinTrailingSep(tmpDirB, "file1")); err == nil {
-		t.Fatal("expected IsNotDir error, but got nil instead")
-	}
-
-	if !isNotDir(err) {
-		t.Fatalf("expected IsNotDir error, but got %T: %s", err, err)
-	}
-
-	// Try with a directory source.
-	srcInfo = CopyInfo{Path: filepath.Join(tmpDirA, "dir1"), Exists: true, IsDir: true}
-
-	content, err = TarResource(srcInfo)
-	if err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-	defer content.Close()
-
-	if err = CopyTo(content, srcInfo, joinTrailingSep(tmpDirB, "file1")); err == nil {
-		t.Fatal("expected IsNotDir error, but got nil instead")
-	}
-
-	if !isNotDir(err) {
-		t.Fatalf("expected IsNotDir error, but got %T: %s", err, err)
-	}
-}
-
-// Possibilities are reduced to the remaining 10 cases:
-//
-//  case | srcIsDir | onlyDirContents | dstExists | dstIsDir | dstTrSep | action
-// ===================================================================================================
-//   A   |  no      |  -              |  no       |  -       |  no      |  create file
-//   B   |  no      |  -              |  no       |  -       |  yes     |  error
-//   C   |  no      |  -              |  yes      |  no      |  -       |  overwrite file
-//   D   |  no      |  -              |  yes      |  yes     |  -       |  create file in dst dir
-//   E   |  yes     |  no             |  no       |  -       |  -       |  create dir, copy contents
-//   F   |  yes     |  no             |  yes      |  no      |  -       |  error
-//   G   |  yes     |  no             |  yes      |  yes     |  -       |  copy dir and contents
-//   H   |  yes     |  yes            |  no       |  -       |  -       |  create dir, copy contents
-//   I   |  yes     |  yes            |  yes      |  no      |  -       |  error
-//   J   |  yes     |  yes            |  yes      |  yes     |  -       |  copy dir contents
-//
-
-// A. SRC specifies a file and DST (no trailing path separator) doesn't
-//    exist. This should create a file with the name DST and copy the
-//    contents of the source file into it.
-func TestCopyCaseA(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcPath := filepath.Join(tmpDirA, "file1")
-	dstPath := filepath.Join(tmpDirB, "itWorks.txt")
-
-	var err error
-
-	if err = testCopyHelper(t, srcPath, dstPath); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, srcPath, dstPath); err != nil {
-		t.Fatal(err)
-	}
-	os.Remove(dstPath)
-
-	symlinkPath := filepath.Join(tmpDirA, "symlink3")
-	symlinkPath1 := filepath.Join(tmpDirA, "symlink4")
-	linkTarget := filepath.Join(tmpDirA, "file1")
-
-	if err = testCopyHelperFSym(t, symlinkPath, dstPath); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, linkTarget, dstPath); err != nil {
-		t.Fatal(err)
-	}
-	os.Remove(dstPath)
-	if err = testCopyHelperFSym(t, symlinkPath1, dstPath); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, linkTarget, dstPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// B. SRC specifies a file and DST (with trailing path separator) doesn't
-//    exist. This should cause an error because the copy operation cannot
-//    create a directory when copying a single file.
-func TestCopyCaseB(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcPath := filepath.Join(tmpDirA, "file1")
-	dstDir := joinTrailingSep(tmpDirB, "testDir")
-
-	var err error
-
-	if err = testCopyHelper(t, srcPath, dstDir); err == nil {
-		t.Fatal("expected ErrDirNotExists error, but got nil instead")
-	}
-
-	if err != ErrDirNotExists {
-		t.Fatalf("expected ErrDirNotExists error, but got %T: %s", err, err)
-	}
-
-	symlinkPath := filepath.Join(tmpDirA, "symlink3")
-
-	if err = testCopyHelperFSym(t, symlinkPath, dstDir); err == nil {
-		t.Fatal("expected ErrDirNotExists error, but got nil instead")
-	}
-	if err != ErrDirNotExists {
-		t.Fatalf("expected ErrDirNotExists error, but got %T: %s", err, err)
-	}
-
-}
-
-// C. SRC specifies a file and DST exists as a file. This should overwrite
-//    the file at DST with the contents of the source file.
-func TestCopyCaseC(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcPath := filepath.Join(tmpDirA, "file1")
-	dstPath := filepath.Join(tmpDirB, "file2")
-
-	var err error
-
-	// Ensure they start out different.
-	if err = fileContentsEqual(t, srcPath, dstPath); err == nil {
-		t.Fatal("expected different file contents")
-	}
-
-	if err = testCopyHelper(t, srcPath, dstPath); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, srcPath, dstPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// C. Symbol link following version:
-//    SRC specifies a file and DST exists as a file. This should overwrite
-//    the file at DST with the contents of the source file.
-func TestCopyCaseCFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	symlinkPathBad := filepath.Join(tmpDirA, "symlink1")
-	symlinkPath := filepath.Join(tmpDirA, "symlink3")
-	linkTarget := filepath.Join(tmpDirA, "file1")
-	dstPath := filepath.Join(tmpDirB, "file2")
-
-	var err error
-
-	// first to test broken link
-	if err = testCopyHelperFSym(t, symlinkPathBad, dstPath); err == nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	// test symbol link -> symbol link -> target
-	// Ensure they start out different.
-	if err = fileContentsEqual(t, linkTarget, dstPath); err == nil {
-		t.Fatal("expected different file contents")
-	}
-
-	if err = testCopyHelperFSym(t, symlinkPath, dstPath); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, linkTarget, dstPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// D. SRC specifies a file and DST exists as a directory. This should place
-//    a copy of the source file inside it using the basename from SRC. Ensure
-//    this works whether DST has a trailing path separator or not.
-func TestCopyCaseD(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcPath := filepath.Join(tmpDirA, "file1")
-	dstDir := filepath.Join(tmpDirB, "dir1")
-	dstPath := filepath.Join(dstDir, "file1")
-
-	var err error
-
-	// Ensure that dstPath doesn't exist.
-	if _, err = os.Stat(dstPath); !os.IsNotExist(err) {
-		t.Fatalf("did not expect dstPath %q to exist", dstPath)
-	}
-
-	if err = testCopyHelper(t, srcPath, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, srcPath, dstPath); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir1")
-
-	if err = testCopyHelper(t, srcPath, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, srcPath, dstPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// D. Symbol link following version:
-//    SRC specifies a file and DST exists as a directory. This should place
-//    a copy of the source file inside it using the basename from SRC. Ensure
-//    this works whether DST has a trailing path separator or not.
-func TestCopyCaseDFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcPath := filepath.Join(tmpDirA, "symlink4")
-	linkTarget := filepath.Join(tmpDirA, "file1")
-	dstDir := filepath.Join(tmpDirB, "dir1")
-	dstPath := filepath.Join(dstDir, "symlink4")
-
-	var err error
-
-	// Ensure that dstPath doesn't exist.
-	if _, err = os.Stat(dstPath); !os.IsNotExist(err) {
-		t.Fatalf("did not expect dstPath %q to exist", dstPath)
-	}
-
-	if err = testCopyHelperFSym(t, srcPath, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, linkTarget, dstPath); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir1")
-
-	if err = testCopyHelperFSym(t, srcPath, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = fileContentsEqual(t, linkTarget, dstPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// E. SRC specifies a directory and DST does not exist. This should create a
-//    directory at DST and copy the contents of the SRC directory into the DST
-//    directory. Ensure this works whether DST has a trailing path separator or
-//    not.
-func TestCopyCaseE(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcDir := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "testDir")
-
-	var err error
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "testDir")
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// E. Symbol link following version:
-//    SRC specifies a directory and DST does not exist. This should create a
-//    directory at DST and copy the contents of the SRC directory into the DST
-//    directory. Ensure this works whether DST has a trailing path separator or
-//    not.
-func TestCopyCaseEFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcDir := filepath.Join(tmpDirA, "dirSymlink")
-	linkTarget := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "testDir")
-
-	var err error
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "testDir")
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// F. SRC specifies a directory and DST exists as a file. This should cause an
-//    error as it is not possible to overwrite a file with a directory.
-func TestCopyCaseF(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := filepath.Join(tmpDirA, "dir1")
-	symSrcDir := filepath.Join(tmpDirA, "dirSymlink")
-	dstFile := filepath.Join(tmpDirB, "file1")
-
-	var err error
-
-	if err = testCopyHelper(t, srcDir, dstFile); err == nil {
-		t.Fatal("expected ErrCannotCopyDir error, but got nil instead")
-	}
-
-	if err != ErrCannotCopyDir {
-		t.Fatalf("expected ErrCannotCopyDir error, but got %T: %s", err, err)
-	}
-
-	// now test with symbol link
-	if err = testCopyHelperFSym(t, symSrcDir, dstFile); err == nil {
-		t.Fatal("expected ErrCannotCopyDir error, but got nil instead")
-	}
-
-	if err != ErrCannotCopyDir {
-		t.Fatalf("expected ErrCannotCopyDir error, but got %T: %s", err, err)
-	}
-}
-
-// G. SRC specifies a directory and DST exists as a directory. This should copy
-//    the SRC directory and all its contents to the DST directory. Ensure this
-//    works whether DST has a trailing path separator or not.
-func TestCopyCaseG(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "dir2")
-	resultDir := filepath.Join(dstDir, "dir1")
-
-	var err error
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, resultDir, srcDir); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir2")
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, resultDir, srcDir); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// G. Symbol link version:
-//    SRC specifies a directory and DST exists as a directory. This should copy
-//    the SRC directory and all its contents to the DST directory. Ensure this
-//    works whether DST has a trailing path separator or not.
-func TestCopyCaseGFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := filepath.Join(tmpDirA, "dirSymlink")
-	linkTarget := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "dir2")
-	resultDir := filepath.Join(dstDir, "dirSymlink")
-
-	var err error
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, resultDir, linkTarget); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir2")
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, resultDir, linkTarget); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// H. SRC specifies a directory's contents only and DST does not exist. This
-//    should create a directory at DST and copy the contents of the SRC
-//    directory (but not the directory itself) into the DST directory. Ensure
-//    this works whether DST has a trailing path separator or not.
-func TestCopyCaseH(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcDir := joinTrailingSep(tmpDirA, "dir1") + "."
-	dstDir := filepath.Join(tmpDirB, "testDir")
-
-	var err error
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "testDir")
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-}
-
-// H. Symbol link following version:
-//    SRC specifies a directory's contents only and DST does not exist. This
-//    should create a directory at DST and copy the contents of the SRC
-//    directory (but not the directory itself) into the DST directory. Ensure
-//    this works whether DST has a trailing path separator or not.
-func TestCopyCaseHFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-
-	srcDir := joinTrailingSep(tmpDirA, "dirSymlink") + "."
-	linkTarget := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "testDir")
-
-	var err error
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "testDir")
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Log("dir contents not equal")
-		logDirContents(t, tmpDirA)
-		logDirContents(t, tmpDirB)
-		t.Fatal(err)
-	}
-}
-
-// I. SRC specifies a directory's contents only and DST exists as a file. This
-//    should cause an error as it is not possible to overwrite a file with a
-//    directory.
-func TestCopyCaseI(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := joinTrailingSep(tmpDirA, "dir1") + "."
-	symSrcDir := filepath.Join(tmpDirB, "dirSymlink")
-	dstFile := filepath.Join(tmpDirB, "file1")
-
-	var err error
-
-	if err = testCopyHelper(t, srcDir, dstFile); err == nil {
-		t.Fatal("expected ErrCannotCopyDir error, but got nil instead")
-	}
-
-	if err != ErrCannotCopyDir {
-		t.Fatalf("expected ErrCannotCopyDir error, but got %T: %s", err, err)
-	}
-
-	// now try with symbol link of dir
-	if err = testCopyHelperFSym(t, symSrcDir, dstFile); err == nil {
-		t.Fatal("expected ErrCannotCopyDir error, but got nil instead")
-	}
-
-	if err != ErrCannotCopyDir {
-		t.Fatalf("expected ErrCannotCopyDir error, but got %T: %s", err, err)
-	}
-}
-
-// J. SRC specifies a directory's contents only and DST exists as a directory.
-//    This should copy the contents of the SRC directory (but not the directory
-//    itself) into the DST directory. Ensure this works whether DST has a
-//    trailing path separator or not.
-func TestCopyCaseJ(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := joinTrailingSep(tmpDirA, "dir1") + "."
-	dstDir := filepath.Join(tmpDirB, "dir5")
-
-	var err error
-
-	// first to create an empty dir
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir5")
-
-	if err = testCopyHelper(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, srcDir); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// J. Symbol link following version:
-//    SRC specifies a directory's contents only and DST exists as a directory.
-//    This should copy the contents of the SRC directory (but not the directory
-//    itself) into the DST directory. Ensure this works whether DST has a
-//    trailing path separator or not.
-func TestCopyCaseJFSym(t *testing.T) {
-	tmpDirA, tmpDirB := getTestTempDirs(t)
-	defer removeAllPaths(tmpDirA, tmpDirB)
-
-	// Load A and B with some sample files and directories.
-	createSampleDir(t, tmpDirA)
-	createSampleDir(t, tmpDirB)
-
-	srcDir := joinTrailingSep(tmpDirA, "dirSymlink") + "."
-	linkTarget := filepath.Join(tmpDirA, "dir1")
-	dstDir := filepath.Join(tmpDirB, "dir5")
-
-	var err error
-
-	// first to create an empty dir
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Fatal(err)
-	}
-
-	// Now try again but using a trailing path separator for dstDir.
-
-	if err = os.RemoveAll(dstDir); err != nil {
-		t.Fatalf("unable to remove dstDir: %s", err)
-	}
-
-	if err = os.MkdirAll(dstDir, os.FileMode(0755)); err != nil {
-		t.Fatalf("unable to make dstDir: %s", err)
-	}
-
-	dstDir = joinTrailingSep(tmpDirB, "dir5")
-
-	if err = testCopyHelperFSym(t, srcDir, dstDir); err != nil {
-		t.Fatalf("unexpected error %T: %s", err, err)
-	}
-
-	if err = dirContentsEqual(t, dstDir, linkTarget); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/copy_windows.go b/installer/vendor/github.com/docker/docker/pkg/archive/copy_windows.go
deleted file mode 100644
index 2b775b45c4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/copy_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package archive
-
-import (
-	"path/filepath"
-)
-
-func normalizePath(path string) string {
-	return filepath.FromSlash(path)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/diff.go b/installer/vendor/github.com/docker/docker/pkg/archive/diff.go
deleted file mode 100644
index 9e1a58c499..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/diff.go
+++ /dev/null
@@ -1,279 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/system"
-)
-
-// UnpackLayer unpack `layer` to a `dest`. The stream `layer` can be
-// compressed or uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func UnpackLayer(dest string, layer io.Reader, options *TarOptions) (size int64, err error) {
-	tr := tar.NewReader(layer)
-	trBuf := pools.BufioReader32KPool.Get(tr)
-	defer pools.BufioReader32KPool.Put(trBuf)
-
-	var dirs []*tar.Header
-	unpackedPaths := make(map[string]struct{})
-
-	if options == nil {
-		options = &TarOptions{}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-	remappedRootUID, remappedRootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps)
-	if err != nil {
-		return 0, err
-	}
-
-	aufsTempdir := ""
-	aufsHardlinks := make(map[string]*tar.Header)
-
-	if options == nil {
-		options = &TarOptions{}
-	}
-	// Iterate through the files in the archive.
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			break
-		}
-		if err != nil {
-			return 0, err
-		}
-
-		size += hdr.Size
-
-		// Normalize name, for safety and for a simple is-root check
-		hdr.Name = filepath.Clean(hdr.Name)
-
-		// Windows does not support filenames with colons in them. Ignore
-		// these files. This is not a problem though (although it might
-		// appear that it is). Let's suppose a client is running docker pull.
-		// The daemon it points to is Windows. Would it make sense for the
-		// client to be doing a docker pull Ubuntu for example (which has files
-		// with colons in the name under /usr/share/man/man3)? No, absolutely
-		// not as it would really only make sense that they were pulling a
-		// Windows image. However, for development, it is necessary to be able
-		// to pull Linux images which are in the repository.
-		//
-		// TODO Windows. Once the registry is aware of what images are Windows-
-		// specific or Linux-specific, this warning should be changed to an error
-		// to cater for the situation where someone does manage to upload a Linux
-		// image but have it tagged as Windows inadvertently.
-		if runtime.GOOS == "windows" {
-			if strings.Contains(hdr.Name, ":") {
-				logrus.Warnf("Windows: Ignoring %s (is this a Linux image?)", hdr.Name)
-				continue
-			}
-		}
-
-		// Note as these operations are platform specific, so must the slash be.
-		if !strings.HasSuffix(hdr.Name, string(os.PathSeparator)) {
-			// Not the root directory, ensure that the parent directory exists.
-			// This happened in some tests where an image had a tarfile without any
-			// parent directories.
-			parent := filepath.Dir(hdr.Name)
-			parentPath := filepath.Join(dest, parent)
-
-			if _, err := os.Lstat(parentPath); err != nil && os.IsNotExist(err) {
-				err = system.MkdirAll(parentPath, 0600)
-				if err != nil {
-					return 0, err
-				}
-			}
-		}
-
-		// Skip AUFS metadata dirs
-		if strings.HasPrefix(hdr.Name, WhiteoutMetaPrefix) {
-			// Regular files inside /.wh..wh.plnk can be used as hardlink targets
-			// We don't want this directory, but we need the files in them so that
-			// such hardlinks can be resolved.
-			if strings.HasPrefix(hdr.Name, WhiteoutLinkDir) && hdr.Typeflag == tar.TypeReg {
-				basename := filepath.Base(hdr.Name)
-				aufsHardlinks[basename] = hdr
-				if aufsTempdir == "" {
-					if aufsTempdir, err = ioutil.TempDir("", "dockerplnk"); err != nil {
-						return 0, err
-					}
-					defer os.RemoveAll(aufsTempdir)
-				}
-				if err := createTarFile(filepath.Join(aufsTempdir, basename), dest, hdr, tr, true, nil, options.InUserNS); err != nil {
-					return 0, err
-				}
-			}
-
-			if hdr.Name != WhiteoutOpaqueDir {
-				continue
-			}
-		}
-		path := filepath.Join(dest, hdr.Name)
-		rel, err := filepath.Rel(dest, path)
-		if err != nil {
-			return 0, err
-		}
-
-		// Note as these operations are platform specific, so must the slash be.
-		if strings.HasPrefix(rel, ".."+string(os.PathSeparator)) {
-			return 0, breakoutError(fmt.Errorf("%q is outside of %q", hdr.Name, dest))
-		}
-		base := filepath.Base(path)
-
-		if strings.HasPrefix(base, WhiteoutPrefix) {
-			dir := filepath.Dir(path)
-			if base == WhiteoutOpaqueDir {
-				_, err := os.Lstat(dir)
-				if err != nil {
-					return 0, err
-				}
-				err = filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-					if err != nil {
-						if os.IsNotExist(err) {
-							err = nil // parent was deleted
-						}
-						return err
-					}
-					if path == dir {
-						return nil
-					}
-					if _, exists := unpackedPaths[path]; !exists {
-						err := os.RemoveAll(path)
-						return err
-					}
-					return nil
-				})
-				if err != nil {
-					return 0, err
-				}
-			} else {
-				originalBase := base[len(WhiteoutPrefix):]
-				originalPath := filepath.Join(dir, originalBase)
-				if err := os.RemoveAll(originalPath); err != nil {
-					return 0, err
-				}
-			}
-		} else {
-			// If path exits we almost always just want to remove and replace it.
-			// The only exception is when it is a directory *and* the file from
-			// the layer is also a directory. Then we want to merge them (i.e.
-			// just apply the metadata from the layer).
-			if fi, err := os.Lstat(path); err == nil {
-				if !(fi.IsDir() && hdr.Typeflag == tar.TypeDir) {
-					if err := os.RemoveAll(path); err != nil {
-						return 0, err
-					}
-				}
-			}
-
-			trBuf.Reset(tr)
-			srcData := io.Reader(trBuf)
-			srcHdr := hdr
-
-			// Hard links into /.wh..wh.plnk don't work, as we don't extract that directory, so
-			// we manually retarget these into the temporary files we extracted them into
-			if hdr.Typeflag == tar.TypeLink && strings.HasPrefix(filepath.Clean(hdr.Linkname), WhiteoutLinkDir) {
-				linkBasename := filepath.Base(hdr.Linkname)
-				srcHdr = aufsHardlinks[linkBasename]
-				if srcHdr == nil {
-					return 0, fmt.Errorf("Invalid aufs hardlink")
-				}
-				tmpFile, err := os.Open(filepath.Join(aufsTempdir, linkBasename))
-				if err != nil {
-					return 0, err
-				}
-				defer tmpFile.Close()
-				srcData = tmpFile
-			}
-
-			// if the options contain a uid & gid maps, convert header uid/gid
-			// entries using the maps such that lchown sets the proper mapped
-			// uid/gid after writing the file. We only perform this mapping if
-			// the file isn't already owned by the remapped root UID or GID, as
-			// that specific uid/gid has no mapping from container -> host, and
-			// those files already have the proper ownership for inside the
-			// container.
-			if srcHdr.Uid != remappedRootUID {
-				xUID, err := idtools.ToHost(srcHdr.Uid, options.UIDMaps)
-				if err != nil {
-					return 0, err
-				}
-				srcHdr.Uid = xUID
-			}
-			if srcHdr.Gid != remappedRootGID {
-				xGID, err := idtools.ToHost(srcHdr.Gid, options.GIDMaps)
-				if err != nil {
-					return 0, err
-				}
-				srcHdr.Gid = xGID
-			}
-			if err := createTarFile(path, dest, srcHdr, srcData, true, nil, options.InUserNS); err != nil {
-				return 0, err
-			}
-
-			// Directory mtimes must be handled at the end to avoid further
-			// file creation in them to modify the directory mtime
-			if hdr.Typeflag == tar.TypeDir {
-				dirs = append(dirs, hdr)
-			}
-			unpackedPaths[path] = struct{}{}
-		}
-	}
-
-	for _, hdr := range dirs {
-		path := filepath.Join(dest, hdr.Name)
-		if err := system.Chtimes(path, hdr.AccessTime, hdr.ModTime); err != nil {
-			return 0, err
-		}
-	}
-
-	return size, nil
-}
-
-// ApplyLayer parses a diff in the standard layer format from `layer`,
-// and applies it to the directory `dest`. The stream `layer` can be
-// compressed or uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyLayer(dest string, layer io.Reader) (int64, error) {
-	return applyLayerHandler(dest, layer, &TarOptions{}, true)
-}
-
-// ApplyUncompressedLayer parses a diff in the standard layer format from
-// `layer`, and applies it to the directory `dest`. The stream `layer`
-// can only be uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyUncompressedLayer(dest string, layer io.Reader, options *TarOptions) (int64, error) {
-	return applyLayerHandler(dest, layer, options, false)
-}
-
-// do the bulk load of ApplyLayer, but allow for not calling DecompressStream
-func applyLayerHandler(dest string, layer io.Reader, options *TarOptions, decompress bool) (int64, error) {
-	dest = filepath.Clean(dest)
-
-	// We need to be able to set any perms
-	oldmask, err := system.Umask(0)
-	if err != nil {
-		return 0, err
-	}
-	defer system.Umask(oldmask) // ignore err, ErrNotSupportedPlatform
-
-	if decompress {
-		layer, err = DecompressStream(layer)
-		if err != nil {
-			return 0, err
-		}
-	}
-	return UnpackLayer(dest, layer, options)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/diff_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/diff_test.go
deleted file mode 100644
index 8167941ac0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/diff_test.go
+++ /dev/null
@@ -1,386 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-func TestApplyLayerInvalidFilenames(t *testing.T) {
-	// TODO Windows: Figure out how to fix this test.
-	if runtime.GOOS == "windows" {
-		t.Skip("Passes but hits breakoutError: platform and architecture is not supported")
-	}
-	for i, headers := range [][]*tar.Header{
-		{
-			{
-				Name:     "../victim/dotdot",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{
-			{
-				// Note the leading slash
-				Name:     "/../victim/slash-dotdot",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("applylayer", "docker-TestApplyLayerInvalidFilenames", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestApplyLayerInvalidHardlink(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("TypeLink support on Windows")
-	}
-	for i, headers := range [][]*tar.Header{
-		{ // try reading victim/hello (../)
-			{
-				Name:     "dotdot",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (/../)
-			{
-				Name:     "slash-dotdot",
-				Typeflag: tar.TypeLink,
-				// Note the leading slash
-				Linkname: "/../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try writing victim/file
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim/file",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (hardlink, symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "symlink",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // Try reading victim/hello (hardlink, hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "hardlink",
-				Typeflag: tar.TypeLink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // Try removing victim directory (hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeLink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("applylayer", "docker-TestApplyLayerInvalidHardlink", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestApplyLayerInvalidSymlink(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("TypeSymLink support on Windows")
-	}
-	for i, headers := range [][]*tar.Header{
-		{ // try reading victim/hello (../)
-			{
-				Name:     "dotdot",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (/../)
-			{
-				Name:     "slash-dotdot",
-				Typeflag: tar.TypeSymlink,
-				// Note the leading slash
-				Linkname: "/../victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try writing victim/file
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim/file",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (symlink, symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "symlink",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try reading victim/hello (symlink, hardlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "hardlink",
-				Typeflag: tar.TypeLink,
-				Linkname: "loophole-victim/hello",
-				Mode:     0644,
-			},
-		},
-		{ // try removing victim directory (symlink)
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeSymlink,
-				Linkname: "../victim",
-				Mode:     0755,
-			},
-			{
-				Name:     "loophole-victim",
-				Typeflag: tar.TypeReg,
-				Mode:     0644,
-			},
-		},
-	} {
-		if err := testBreakout("applylayer", "docker-TestApplyLayerInvalidSymlink", headers); err != nil {
-			t.Fatalf("i=%d. %v", i, err)
-		}
-	}
-}
-
-func TestApplyLayerWhiteouts(t *testing.T) {
-	// TODO Windows: Figure out why this test fails
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-
-	wd, err := ioutil.TempDir("", "graphdriver-test-whiteouts")
-	if err != nil {
-		return
-	}
-	defer os.RemoveAll(wd)
-
-	base := []string{
-		".baz",
-		"bar/",
-		"bar/bax",
-		"bar/bay/",
-		"baz",
-		"foo/",
-		"foo/.abc",
-		"foo/.bcd/",
-		"foo/.bcd/a",
-		"foo/cde/",
-		"foo/cde/def",
-		"foo/cde/efg",
-		"foo/fgh",
-		"foobar",
-	}
-
-	type tcase struct {
-		change, expected []string
-	}
-
-	tcases := []tcase{
-		{
-			base,
-			base,
-		},
-		{
-			[]string{
-				".bay",
-				".wh.baz",
-				"foo/",
-				"foo/.bce",
-				"foo/.wh..wh..opq",
-				"foo/cde/",
-				"foo/cde/efg",
-			},
-			[]string{
-				".bay",
-				".baz",
-				"bar/",
-				"bar/bax",
-				"bar/bay/",
-				"foo/",
-				"foo/.bce",
-				"foo/cde/",
-				"foo/cde/efg",
-				"foobar",
-			},
-		},
-		{
-			[]string{
-				".bay",
-				".wh..baz",
-				".wh.foobar",
-				"foo/",
-				"foo/.abc",
-				"foo/.wh.cde",
-				"bar/",
-			},
-			[]string{
-				".bay",
-				"bar/",
-				"bar/bax",
-				"bar/bay/",
-				"foo/",
-				"foo/.abc",
-				"foo/.bce",
-			},
-		},
-		{
-			[]string{
-				".abc",
-				".wh..wh..opq",
-				"foobar",
-			},
-			[]string{
-				".abc",
-				"foobar",
-			},
-		},
-	}
-
-	for i, tc := range tcases {
-		l, err := makeTestLayer(tc.change)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		_, err = UnpackLayer(wd, l, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = l.Close()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		paths, err := readDirContents(wd)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if !reflect.DeepEqual(tc.expected, paths) {
-			t.Fatalf("invalid files for layer %d: expected %q, got %q", i, tc.expected, paths)
-		}
-	}
-
-}
-
-func makeTestLayer(paths []string) (rc io.ReadCloser, err error) {
-	tmpDir, err := ioutil.TempDir("", "graphdriver-test-mklayer")
-	if err != nil {
-		return
-	}
-	defer func() {
-		if err != nil {
-			os.RemoveAll(tmpDir)
-		}
-	}()
-	for _, p := range paths {
-		if p[len(p)-1] == filepath.Separator {
-			if err = os.MkdirAll(filepath.Join(tmpDir, p), 0700); err != nil {
-				return
-			}
-		} else {
-			if err = ioutil.WriteFile(filepath.Join(tmpDir, p), nil, 0600); err != nil {
-				return
-			}
-		}
-	}
-	archive, err := Tar(tmpDir, Uncompressed)
-	if err != nil {
-		return
-	}
-	return ioutils.NewReadCloserWrapper(archive, func() error {
-		err := archive.Close()
-		os.RemoveAll(tmpDir)
-		return err
-	}), nil
-}
-
-func readDirContents(root string) ([]string, error) {
-	var files []string
-	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if path == root {
-			return nil
-		}
-		rel, err := filepath.Rel(root, path)
-		if err != nil {
-			return err
-		}
-		if info.IsDir() {
-			rel = rel + "/"
-		}
-		files = append(files, rel)
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-	return files, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/example_changes.go b/installer/vendor/github.com/docker/docker/pkg/archive/example_changes.go
deleted file mode 100644
index cedd46a408..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/example_changes.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build ignore
-
-// Simple tool to create an archive stream from an old and new directory
-//
-// By default it will stream the comparison of two temporary directories with junk files
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/archive"
-)
-
-var (
-	flDebug  = flag.Bool("D", false, "debugging output")
-	flNewDir = flag.String("newdir", "", "")
-	flOldDir = flag.String("olddir", "", "")
-	log      = logrus.New()
-)
-
-func main() {
-	flag.Usage = func() {
-		fmt.Println("Produce a tar from comparing two directory paths. By default a demo tar is created of around 200 files (including hardlinks)")
-		fmt.Printf("%s [OPTIONS]\n", os.Args[0])
-		flag.PrintDefaults()
-	}
-	flag.Parse()
-	log.Out = os.Stderr
-	if (len(os.Getenv("DEBUG")) > 0) || *flDebug {
-		logrus.SetLevel(logrus.DebugLevel)
-	}
-	var newDir, oldDir string
-
-	if len(*flNewDir) == 0 {
-		var err error
-		newDir, err = ioutil.TempDir("", "docker-test-newDir")
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer os.RemoveAll(newDir)
-		if _, err := prepareUntarSourceDirectory(100, newDir, true); err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		newDir = *flNewDir
-	}
-
-	if len(*flOldDir) == 0 {
-		oldDir, err := ioutil.TempDir("", "docker-test-oldDir")
-		if err != nil {
-			log.Fatal(err)
-		}
-		defer os.RemoveAll(oldDir)
-	} else {
-		oldDir = *flOldDir
-	}
-
-	changes, err := archive.ChangesDirs(newDir, oldDir)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	a, err := archive.ExportChanges(newDir, changes)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer a.Close()
-
-	i, err := io.Copy(os.Stdout, a)
-	if err != nil && err != io.EOF {
-		log.Fatal(err)
-	}
-	fmt.Fprintf(os.Stderr, "wrote archive of %d bytes", i)
-}
-
-func prepareUntarSourceDirectory(numberOfFiles int, targetPath string, makeLinks bool) (int, error) {
-	fileData := []byte("fooo")
-	for n := 0; n < numberOfFiles; n++ {
-		fileName := fmt.Sprintf("file-%d", n)
-		if err := ioutil.WriteFile(path.Join(targetPath, fileName), fileData, 0700); err != nil {
-			return 0, err
-		}
-		if makeLinks {
-			if err := os.Link(path.Join(targetPath, fileName), path.Join(targetPath, fileName+"-link")); err != nil {
-				return 0, err
-			}
-		}
-	}
-	totalSize := numberOfFiles * len(fileData)
-	return totalSize, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/testdata/broken.tar b/installer/vendor/github.com/docker/docker/pkg/archive/testdata/broken.tar
deleted file mode 100644
index 8f10ea6b87..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/archive/testdata/broken.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/time_linux.go b/installer/vendor/github.com/docker/docker/pkg/archive/time_linux.go
deleted file mode 100644
index 3448569b1e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/time_linux.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package archive
-
-import (
-	"syscall"
-	"time"
-)
-
-func timeToTimespec(time time.Time) (ts syscall.Timespec) {
-	if time.IsZero() {
-		// Return UTIME_OMIT special value
-		ts.Sec = 0
-		ts.Nsec = ((1 << 30) - 2)
-		return
-	}
-	return syscall.NsecToTimespec(time.UnixNano())
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/time_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/archive/time_unsupported.go
deleted file mode 100644
index e85aac0540..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/time_unsupported.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !linux
-
-package archive
-
-import (
-	"syscall"
-	"time"
-)
-
-func timeToTimespec(time time.Time) (ts syscall.Timespec) {
-	nsec := int64(0)
-	if !time.IsZero() {
-		nsec = time.UnixNano()
-	}
-	return syscall.NsecToTimespec(nsec)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/utils_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/utils_test.go
deleted file mode 100644
index 01b9e92d1c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/utils_test.go
+++ /dev/null
@@ -1,166 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"time"
-)
-
-var testUntarFns = map[string]func(string, io.Reader) error{
-	"untar": func(dest string, r io.Reader) error {
-		return Untar(r, dest, nil)
-	},
-	"applylayer": func(dest string, r io.Reader) error {
-		_, err := ApplyLayer(dest, r)
-		return err
-	},
-}
-
-// testBreakout is a helper function that, within the provided `tmpdir` directory,
-// creates a `victim` folder with a generated `hello` file in it.
-// `untar` extracts to a directory named `dest`, the tar file created from `headers`.
-//
-// Here are the tested scenarios:
-// - removed `victim` folder				(write)
-// - removed files from `victim` folder			(write)
-// - new files in `victim` folder			(write)
-// - modified files in `victim` folder			(write)
-// - file in `dest` with same content as `victim/hello` (read)
-//
-// When using testBreakout make sure you cover one of the scenarios listed above.
-func testBreakout(untarFn string, tmpdir string, headers []*tar.Header) error {
-	tmpdir, err := ioutil.TempDir("", tmpdir)
-	if err != nil {
-		return err
-	}
-	defer os.RemoveAll(tmpdir)
-
-	dest := filepath.Join(tmpdir, "dest")
-	if err := os.Mkdir(dest, 0755); err != nil {
-		return err
-	}
-
-	victim := filepath.Join(tmpdir, "victim")
-	if err := os.Mkdir(victim, 0755); err != nil {
-		return err
-	}
-	hello := filepath.Join(victim, "hello")
-	helloData, err := time.Now().MarshalText()
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile(hello, helloData, 0644); err != nil {
-		return err
-	}
-	helloStat, err := os.Stat(hello)
-	if err != nil {
-		return err
-	}
-
-	reader, writer := io.Pipe()
-	go func() {
-		t := tar.NewWriter(writer)
-		for _, hdr := range headers {
-			t.WriteHeader(hdr)
-		}
-		t.Close()
-	}()
-
-	untar := testUntarFns[untarFn]
-	if untar == nil {
-		return fmt.Errorf("could not find untar function %q in testUntarFns", untarFn)
-	}
-	if err := untar(dest, reader); err != nil {
-		if _, ok := err.(breakoutError); !ok {
-			// If untar returns an error unrelated to an archive breakout,
-			// then consider this an unexpected error and abort.
-			return err
-		}
-		// Here, untar detected the breakout.
-		// Let's move on verifying that indeed there was no breakout.
-		fmt.Printf("breakoutError: %v\n", err)
-	}
-
-	// Check victim folder
-	f, err := os.Open(victim)
-	if err != nil {
-		// codepath taken if victim folder was removed
-		return fmt.Errorf("archive breakout: error reading %q: %v", victim, err)
-	}
-	defer f.Close()
-
-	// Check contents of victim folder
-	//
-	// We are only interested in getting 2 files from the victim folder, because if all is well
-	// we expect only one result, the `hello` file. If there is a second result, it cannot
-	// hold the same name `hello` and we assume that a new file got created in the victim folder.
-	// That is enough to detect an archive breakout.
-	names, err := f.Readdirnames(2)
-	if err != nil {
-		// codepath taken if victim is not a folder
-		return fmt.Errorf("archive breakout: error reading directory content of %q: %v", victim, err)
-	}
-	for _, name := range names {
-		if name != "hello" {
-			// codepath taken if new file was created in victim folder
-			return fmt.Errorf("archive breakout: new file %q", name)
-		}
-	}
-
-	// Check victim/hello
-	f, err = os.Open(hello)
-	if err != nil {
-		// codepath taken if read permissions were removed
-		return fmt.Errorf("archive breakout: could not lstat %q: %v", hello, err)
-	}
-	defer f.Close()
-	b, err := ioutil.ReadAll(f)
-	if err != nil {
-		return err
-	}
-	fi, err := f.Stat()
-	if err != nil {
-		return err
-	}
-	if helloStat.IsDir() != fi.IsDir() ||
-		// TODO: cannot check for fi.ModTime() change
-		helloStat.Mode() != fi.Mode() ||
-		helloStat.Size() != fi.Size() ||
-		!bytes.Equal(helloData, b) {
-		// codepath taken if hello has been modified
-		return fmt.Errorf("archive breakout: file %q has been modified. Contents: expected=%q, got=%q. FileInfo: expected=%#v, got=%#v", hello, helloData, b, helloStat, fi)
-	}
-
-	// Check that nothing in dest/ has the same content as victim/hello.
-	// Since victim/hello was generated with time.Now(), it is safe to assume
-	// that any file whose content matches exactly victim/hello, managed somehow
-	// to access victim/hello.
-	return filepath.Walk(dest, func(path string, info os.FileInfo, err error) error {
-		if info.IsDir() {
-			if err != nil {
-				// skip directory if error
-				return filepath.SkipDir
-			}
-			// enter directory
-			return nil
-		}
-		if err != nil {
-			// skip file if error
-			return nil
-		}
-		b, err := ioutil.ReadFile(path)
-		if err != nil {
-			// Houston, we have a problem. Aborting (space)walk.
-			return err
-		}
-		if bytes.Equal(helloData, b) {
-			return fmt.Errorf("archive breakout: file %q has been accessed via %q", hello, path)
-		}
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/whiteouts.go b/installer/vendor/github.com/docker/docker/pkg/archive/whiteouts.go
deleted file mode 100644
index d20478a10d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/whiteouts.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package archive
-
-// Whiteouts are files with a special meaning for the layered filesystem.
-// Docker uses AUFS whiteout files inside exported archives. In other
-// filesystems these files are generated/handled on tar creation/extraction.
-
-// WhiteoutPrefix prefix means file is a whiteout. If this is followed by a
-// filename this means that file has been removed from the base layer.
-const WhiteoutPrefix = ".wh."
-
-// WhiteoutMetaPrefix prefix means whiteout has a special meaning and is not
-// for removing an actual file. Normally these files are excluded from exported
-// archives.
-const WhiteoutMetaPrefix = WhiteoutPrefix + WhiteoutPrefix
-
-// WhiteoutLinkDir is a directory AUFS uses for storing hardlink links to other
-// layers. Normally these should not go into exported archives and all changed
-// hardlinks should be copied to the top layer.
-const WhiteoutLinkDir = WhiteoutMetaPrefix + "plnk"
-
-// WhiteoutOpaqueDir file means directory has been made opaque - meaning
-// readdir calls to this directory do not follow to lower layers.
-const WhiteoutOpaqueDir = WhiteoutMetaPrefix + ".opq"
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/wrap.go b/installer/vendor/github.com/docker/docker/pkg/archive/wrap.go
deleted file mode 100644
index b39d12c878..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/wrap.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"io"
-)
-
-// Generate generates a new archive from the content provided
-// as input.
-//
-// `files` is a sequence of path/content pairs. A new file is
-// added to the archive for each pair.
-// If the last pair is incomplete, the file is created with an
-// empty content. For example:
-//
-// Generate("foo.txt", "hello world", "emptyfile")
-//
-// The above call will return an archive with 2 files:
-//  * ./foo.txt with content "hello world"
-//  * ./empty with empty content
-//
-// FIXME: stream content instead of buffering
-// FIXME: specify permissions and other archive metadata
-func Generate(input ...string) (io.Reader, error) {
-	files := parseStringPairs(input...)
-	buf := new(bytes.Buffer)
-	tw := tar.NewWriter(buf)
-	for _, file := range files {
-		name, content := file[0], file[1]
-		hdr := &tar.Header{
-			Name: name,
-			Size: int64(len(content)),
-		}
-		if err := tw.WriteHeader(hdr); err != nil {
-			return nil, err
-		}
-		if _, err := tw.Write([]byte(content)); err != nil {
-			return nil, err
-		}
-	}
-	if err := tw.Close(); err != nil {
-		return nil, err
-	}
-	return buf, nil
-}
-
-func parseStringPairs(input ...string) (output [][2]string) {
-	output = make([][2]string, 0, len(input)/2+1)
-	for i := 0; i < len(input); i += 2 {
-		var pair [2]string
-		pair[0] = input[i]
-		if i+1 < len(input) {
-			pair[1] = input[i+1]
-		}
-		output = append(output, pair)
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/archive/wrap_test.go b/installer/vendor/github.com/docker/docker/pkg/archive/wrap_test.go
deleted file mode 100644
index 46ab36697a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/archive/wrap_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"io"
-	"testing"
-)
-
-func TestGenerateEmptyFile(t *testing.T) {
-	archive, err := Generate("emptyFile")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if archive == nil {
-		t.Fatal("The generated archive should not be nil.")
-	}
-
-	expectedFiles := [][]string{
-		{"emptyFile", ""},
-	}
-
-	tr := tar.NewReader(archive)
-	actualFiles := make([][]string, 0, 10)
-	i := 0
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		buf := new(bytes.Buffer)
-		buf.ReadFrom(tr)
-		content := buf.String()
-		actualFiles = append(actualFiles, []string{hdr.Name, content})
-		i++
-	}
-	if len(actualFiles) != len(expectedFiles) {
-		t.Fatalf("Number of expected file %d, got %d.", len(expectedFiles), len(actualFiles))
-	}
-	for i := 0; i < len(expectedFiles); i++ {
-		actual := actualFiles[i]
-		expected := expectedFiles[i]
-		if actual[0] != expected[0] {
-			t.Fatalf("Expected name '%s', Actual name '%s'", expected[0], actual[0])
-		}
-		if actual[1] != expected[1] {
-			t.Fatalf("Expected content '%s', Actual content '%s'", expected[1], actual[1])
-		}
-	}
-}
-
-func TestGenerateWithContent(t *testing.T) {
-	archive, err := Generate("file", "content")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if archive == nil {
-		t.Fatal("The generated archive should not be nil.")
-	}
-
-	expectedFiles := [][]string{
-		{"file", "content"},
-	}
-
-	tr := tar.NewReader(archive)
-	actualFiles := make([][]string, 0, 10)
-	i := 0
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		buf := new(bytes.Buffer)
-		buf.ReadFrom(tr)
-		content := buf.String()
-		actualFiles = append(actualFiles, []string{hdr.Name, content})
-		i++
-	}
-	if len(actualFiles) != len(expectedFiles) {
-		t.Fatalf("Number of expected file %d, got %d.", len(expectedFiles), len(actualFiles))
-	}
-	for i := 0; i < len(expectedFiles); i++ {
-		actual := actualFiles[i]
-		expected := expectedFiles[i]
-		if actual[0] != expected[0] {
-			t.Fatalf("Expected name '%s', Actual name '%s'", expected[0], actual[0])
-		}
-		if actual[1] != expected[1] {
-			t.Fatalf("Expected content '%s', Actual content '%s'", expected[1], actual[1])
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/api.go b/installer/vendor/github.com/docker/docker/pkg/authorization/api.go
deleted file mode 100644
index 05c75f1a67..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/api.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package authorization
-
-import (
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-)
-
-const (
-	// AuthZApiRequest is the url for daemon request authorization
-	AuthZApiRequest = "AuthZPlugin.AuthZReq"
-
-	// AuthZApiResponse is the url for daemon response authorization
-	AuthZApiResponse = "AuthZPlugin.AuthZRes"
-
-	// AuthZApiImplements is the name of the interface all AuthZ plugins implement
-	AuthZApiImplements = "authz"
-)
-
-// PeerCertificate is a wrapper around x509.Certificate which provides a sane
-// enconding/decoding to/from PEM format and JSON.
-type PeerCertificate x509.Certificate
-
-// MarshalJSON returns the JSON encoded pem bytes of a PeerCertificate.
-func (pc *PeerCertificate) MarshalJSON() ([]byte, error) {
-	b := pem.EncodeToMemory(&pem.Block{Type: "CERTIFICATE", Bytes: pc.Raw})
-	return json.Marshal(b)
-}
-
-// UnmarshalJSON populates a new PeerCertificate struct from JSON data.
-func (pc *PeerCertificate) UnmarshalJSON(b []byte) error {
-	var buf []byte
-	if err := json.Unmarshal(b, &buf); err != nil {
-		return err
-	}
-	derBytes, _ := pem.Decode(buf)
-	c, err := x509.ParseCertificate(derBytes.Bytes)
-	if err != nil {
-		return err
-	}
-	*pc = PeerCertificate(*c)
-	return nil
-}
-
-// Request holds data required for authZ plugins
-type Request struct {
-	// User holds the user extracted by AuthN mechanism
-	User string `json:"User,omitempty"`
-
-	// UserAuthNMethod holds the mechanism used to extract user details (e.g., krb)
-	UserAuthNMethod string `json:"UserAuthNMethod,omitempty"`
-
-	// RequestMethod holds the HTTP method (GET/POST/PUT)
-	RequestMethod string `json:"RequestMethod,omitempty"`
-
-	// RequestUri holds the full HTTP uri (e.g., /v1.21/version)
-	RequestURI string `json:"RequestUri,omitempty"`
-
-	// RequestBody stores the raw request body sent to the docker daemon
-	RequestBody []byte `json:"RequestBody,omitempty"`
-
-	// RequestHeaders stores the raw request headers sent to the docker daemon
-	RequestHeaders map[string]string `json:"RequestHeaders,omitempty"`
-
-	// RequestPeerCertificates stores the request's TLS peer certificates in PEM format
-	RequestPeerCertificates []*PeerCertificate `json:"RequestPeerCertificates,omitempty"`
-
-	// ResponseStatusCode stores the status code returned from docker daemon
-	ResponseStatusCode int `json:"ResponseStatusCode,omitempty"`
-
-	// ResponseBody stores the raw response body sent from docker daemon
-	ResponseBody []byte `json:"ResponseBody,omitempty"`
-
-	// ResponseHeaders stores the response headers sent to the docker daemon
-	ResponseHeaders map[string]string `json:"ResponseHeaders,omitempty"`
-}
-
-// Response represents authZ plugin response
-type Response struct {
-	// Allow indicating whether the user is allowed or not
-	Allow bool `json:"Allow"`
-
-	// Msg stores the authorization message
-	Msg string `json:"Msg,omitempty"`
-
-	// Err stores a message in case there's an error
-	Err string `json:"Err,omitempty"`
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/authz.go b/installer/vendor/github.com/docker/docker/pkg/authorization/authz.go
deleted file mode 100644
index dc9a9ae56f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/authz.go
+++ /dev/null
@@ -1,186 +0,0 @@
-package authorization
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-const maxBodySize = 1048576 // 1MB
-
-// NewCtx creates new authZ context, it is used to store authorization information related to a specific docker
-// REST http session
-// A context provides two method:
-// Authenticate Request:
-// Call authZ plugins with current REST request and AuthN response
-// Request contains full HTTP packet sent to the docker daemon
-// https://docs.docker.com/engine/reference/api/
-//
-// Authenticate Response:
-// Call authZ plugins with full info about current REST request, REST response and AuthN response
-// The response from this method may contains content that overrides the daemon response
-// This allows authZ plugins to filter privileged content
-//
-// If multiple authZ plugins are specified, the block/allow decision is based on ANDing all plugin results
-// For response manipulation, the response from each plugin is piped between plugins. Plugin execution order
-// is determined according to daemon parameters
-func NewCtx(authZPlugins []Plugin, user, userAuthNMethod, requestMethod, requestURI string) *Ctx {
-	return &Ctx{
-		plugins:         authZPlugins,
-		user:            user,
-		userAuthNMethod: userAuthNMethod,
-		requestMethod:   requestMethod,
-		requestURI:      requestURI,
-	}
-}
-
-// Ctx stores a single request-response interaction context
-type Ctx struct {
-	user            string
-	userAuthNMethod string
-	requestMethod   string
-	requestURI      string
-	plugins         []Plugin
-	// authReq stores the cached request object for the current transaction
-	authReq *Request
-}
-
-// AuthZRequest authorized the request to the docker daemon using authZ plugins
-func (ctx *Ctx) AuthZRequest(w http.ResponseWriter, r *http.Request) error {
-	var body []byte
-	if sendBody(ctx.requestURI, r.Header) && r.ContentLength > 0 && r.ContentLength < maxBodySize {
-		var err error
-		body, r.Body, err = drainBody(r.Body)
-		if err != nil {
-			return err
-		}
-	}
-
-	var h bytes.Buffer
-	if err := r.Header.Write(&h); err != nil {
-		return err
-	}
-
-	ctx.authReq = &Request{
-		User:            ctx.user,
-		UserAuthNMethod: ctx.userAuthNMethod,
-		RequestMethod:   ctx.requestMethod,
-		RequestURI:      ctx.requestURI,
-		RequestBody:     body,
-		RequestHeaders:  headers(r.Header),
-	}
-
-	if r.TLS != nil {
-		for _, c := range r.TLS.PeerCertificates {
-			pc := PeerCertificate(*c)
-			ctx.authReq.RequestPeerCertificates = append(ctx.authReq.RequestPeerCertificates, &pc)
-		}
-	}
-
-	for _, plugin := range ctx.plugins {
-		logrus.Debugf("AuthZ request using plugin %s", plugin.Name())
-
-		authRes, err := plugin.AuthZRequest(ctx.authReq)
-		if err != nil {
-			return fmt.Errorf("plugin %s failed with error: %s", plugin.Name(), err)
-		}
-
-		if !authRes.Allow {
-			return newAuthorizationError(plugin.Name(), authRes.Msg)
-		}
-	}
-
-	return nil
-}
-
-// AuthZResponse authorized and manipulates the response from docker daemon using authZ plugins
-func (ctx *Ctx) AuthZResponse(rm ResponseModifier, r *http.Request) error {
-	ctx.authReq.ResponseStatusCode = rm.StatusCode()
-	ctx.authReq.ResponseHeaders = headers(rm.Header())
-
-	if sendBody(ctx.requestURI, rm.Header()) {
-		ctx.authReq.ResponseBody = rm.RawBody()
-	}
-
-	for _, plugin := range ctx.plugins {
-		logrus.Debugf("AuthZ response using plugin %s", plugin.Name())
-
-		authRes, err := plugin.AuthZResponse(ctx.authReq)
-		if err != nil {
-			return fmt.Errorf("plugin %s failed with error: %s", plugin.Name(), err)
-		}
-
-		if !authRes.Allow {
-			return newAuthorizationError(plugin.Name(), authRes.Msg)
-		}
-	}
-
-	rm.FlushAll()
-
-	return nil
-}
-
-// drainBody dump the body (if its length is less than 1MB) without modifying the request state
-func drainBody(body io.ReadCloser) ([]byte, io.ReadCloser, error) {
-	bufReader := bufio.NewReaderSize(body, maxBodySize)
-	newBody := ioutils.NewReadCloserWrapper(bufReader, func() error { return body.Close() })
-
-	data, err := bufReader.Peek(maxBodySize)
-	// Body size exceeds max body size
-	if err == nil {
-		logrus.Warnf("Request body is larger than: '%d' skipping body", maxBodySize)
-		return nil, newBody, nil
-	}
-	// Body size is less than maximum size
-	if err == io.EOF {
-		return data, newBody, nil
-	}
-	// Unknown error
-	return nil, newBody, err
-}
-
-// sendBody returns true when request/response body should be sent to AuthZPlugin
-func sendBody(url string, header http.Header) bool {
-	// Skip body for auth endpoint
-	if strings.HasSuffix(url, "/auth") {
-		return false
-	}
-
-	// body is sent only for text or json messages
-	return header.Get("Content-Type") == "application/json"
-}
-
-// headers returns flatten version of the http headers excluding authorization
-func headers(header http.Header) map[string]string {
-	v := make(map[string]string, 0)
-	for k, values := range header {
-		// Skip authorization headers
-		if strings.EqualFold(k, "Authorization") || strings.EqualFold(k, "X-Registry-Config") || strings.EqualFold(k, "X-Registry-Auth") {
-			continue
-		}
-		for _, val := range values {
-			v[k] = val
-		}
-	}
-	return v
-}
-
-// authorizationError represents an authorization deny error
-type authorizationError struct {
-	error
-}
-
-// HTTPErrorStatusCode returns the authorization error status code (forbidden)
-func (e authorizationError) HTTPErrorStatusCode() int {
-	return http.StatusForbidden
-}
-
-func newAuthorizationError(plugin, msg string) authorizationError {
-	return authorizationError{error: fmt.Errorf("authorization denied by plugin %s: %s", plugin, msg)}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/authz_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/authorization/authz_unix_test.go
deleted file mode 100644
index a787f3cd8c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/authz_unix_test.go
+++ /dev/null
@@ -1,282 +0,0 @@
-// +build !windows
-
-// TODO Windows: This uses a Unix socket for testing. This might be possible
-// to port to Windows using a named pipe instead.
-
-package authorization
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"path"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/gorilla/mux"
-)
-
-const (
-	pluginAddress = "authz-test-plugin.sock"
-)
-
-func TestAuthZRequestPluginError(t *testing.T) {
-	server := authZPluginTestServer{t: t}
-	server.start()
-	defer server.stop()
-
-	authZPlugin := createTestPlugin(t)
-
-	request := Request{
-		User:           "user",
-		RequestBody:    []byte("sample body"),
-		RequestURI:     "www.authz.com/auth",
-		RequestMethod:  "GET",
-		RequestHeaders: map[string]string{"header": "value"},
-	}
-	server.replayResponse = Response{
-		Err: "an error",
-	}
-
-	actualResponse, err := authZPlugin.AuthZRequest(&request)
-	if err != nil {
-		t.Fatalf("Failed to authorize request %v", err)
-	}
-
-	if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
-		t.Fatal("Response must be equal")
-	}
-	if !reflect.DeepEqual(request, server.recordedRequest) {
-		t.Fatal("Requests must be equal")
-	}
-}
-
-func TestAuthZRequestPlugin(t *testing.T) {
-	server := authZPluginTestServer{t: t}
-	server.start()
-	defer server.stop()
-
-	authZPlugin := createTestPlugin(t)
-
-	request := Request{
-		User:           "user",
-		RequestBody:    []byte("sample body"),
-		RequestURI:     "www.authz.com/auth",
-		RequestMethod:  "GET",
-		RequestHeaders: map[string]string{"header": "value"},
-	}
-	server.replayResponse = Response{
-		Allow: true,
-		Msg:   "Sample message",
-	}
-
-	actualResponse, err := authZPlugin.AuthZRequest(&request)
-	if err != nil {
-		t.Fatalf("Failed to authorize request %v", err)
-	}
-
-	if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
-		t.Fatal("Response must be equal")
-	}
-	if !reflect.DeepEqual(request, server.recordedRequest) {
-		t.Fatal("Requests must be equal")
-	}
-}
-
-func TestAuthZResponsePlugin(t *testing.T) {
-	server := authZPluginTestServer{t: t}
-	server.start()
-	defer server.stop()
-
-	authZPlugin := createTestPlugin(t)
-
-	request := Request{
-		User:        "user",
-		RequestURI:  "someting.com/auth",
-		RequestBody: []byte("sample body"),
-	}
-	server.replayResponse = Response{
-		Allow: true,
-		Msg:   "Sample message",
-	}
-
-	actualResponse, err := authZPlugin.AuthZResponse(&request)
-	if err != nil {
-		t.Fatalf("Failed to authorize request %v", err)
-	}
-
-	if !reflect.DeepEqual(server.replayResponse, *actualResponse) {
-		t.Fatal("Response must be equal")
-	}
-	if !reflect.DeepEqual(request, server.recordedRequest) {
-		t.Fatal("Requests must be equal")
-	}
-}
-
-func TestResponseModifier(t *testing.T) {
-	r := httptest.NewRecorder()
-	m := NewResponseModifier(r)
-	m.Header().Set("h1", "v1")
-	m.Write([]byte("body"))
-	m.WriteHeader(http.StatusInternalServerError)
-
-	m.FlushAll()
-	if r.Header().Get("h1") != "v1" {
-		t.Fatalf("Header value must exists %s", r.Header().Get("h1"))
-	}
-	if !reflect.DeepEqual(r.Body.Bytes(), []byte("body")) {
-		t.Fatalf("Body value must exists %s", r.Body.Bytes())
-	}
-	if r.Code != http.StatusInternalServerError {
-		t.Fatalf("Status code must be correct %d", r.Code)
-	}
-}
-
-func TestDrainBody(t *testing.T) {
-	tests := []struct {
-		length             int // length is the message length send to drainBody
-		expectedBodyLength int // expectedBodyLength is the expected body length after drainBody is called
-	}{
-		{10, 10}, // Small message size
-		{maxBodySize - 1, maxBodySize - 1}, // Max message size
-		{maxBodySize * 2, 0},               // Large message size (skip copying body)
-
-	}
-
-	for _, test := range tests {
-		msg := strings.Repeat("a", test.length)
-		body, closer, err := drainBody(ioutil.NopCloser(bytes.NewReader([]byte(msg))))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(body) != test.expectedBodyLength {
-			t.Fatalf("Body must be copied, actual length: '%d'", len(body))
-		}
-		if closer == nil {
-			t.Fatal("Closer must not be nil")
-		}
-		modified, err := ioutil.ReadAll(closer)
-		if err != nil {
-			t.Fatalf("Error must not be nil: '%v'", err)
-		}
-		if len(modified) != len(msg) {
-			t.Fatalf("Result should not be truncated. Original length: '%d', new length: '%d'", len(msg), len(modified))
-		}
-	}
-}
-
-func TestResponseModifierOverride(t *testing.T) {
-	r := httptest.NewRecorder()
-	m := NewResponseModifier(r)
-	m.Header().Set("h1", "v1")
-	m.Write([]byte("body"))
-	m.WriteHeader(http.StatusInternalServerError)
-
-	overrideHeader := make(http.Header)
-	overrideHeader.Add("h1", "v2")
-	overrideHeaderBytes, err := json.Marshal(overrideHeader)
-	if err != nil {
-		t.Fatalf("override header failed %v", err)
-	}
-
-	m.OverrideHeader(overrideHeaderBytes)
-	m.OverrideBody([]byte("override body"))
-	m.OverrideStatusCode(http.StatusNotFound)
-	m.FlushAll()
-	if r.Header().Get("h1") != "v2" {
-		t.Fatalf("Header value must exists %s", r.Header().Get("h1"))
-	}
-	if !reflect.DeepEqual(r.Body.Bytes(), []byte("override body")) {
-		t.Fatalf("Body value must exists %s", r.Body.Bytes())
-	}
-	if r.Code != http.StatusNotFound {
-		t.Fatalf("Status code must be correct %d", r.Code)
-	}
-}
-
-// createTestPlugin creates a new sample authorization plugin
-func createTestPlugin(t *testing.T) *authorizationPlugin {
-	pwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client, err := plugins.NewClient("unix:///"+path.Join(pwd, pluginAddress), &tlsconfig.Options{InsecureSkipVerify: true})
-	if err != nil {
-		t.Fatalf("Failed to create client %v", err)
-	}
-
-	return &authorizationPlugin{name: "plugin", plugin: client}
-}
-
-// AuthZPluginTestServer is a simple server that implements the authZ plugin interface
-type authZPluginTestServer struct {
-	listener net.Listener
-	t        *testing.T
-	// request stores the request sent from the daemon to the plugin
-	recordedRequest Request
-	// response stores the response sent from the plugin to the daemon
-	replayResponse Response
-	server         *httptest.Server
-}
-
-// start starts the test server that implements the plugin
-func (t *authZPluginTestServer) start() {
-	r := mux.NewRouter()
-	l, err := net.Listen("unix", pluginAddress)
-	if err != nil {
-		t.t.Fatal(err)
-	}
-	t.listener = l
-	r.HandleFunc("/Plugin.Activate", t.activate)
-	r.HandleFunc("/"+AuthZApiRequest, t.auth)
-	r.HandleFunc("/"+AuthZApiResponse, t.auth)
-	t.server = &httptest.Server{
-		Listener: l,
-		Config: &http.Server{
-			Handler: r,
-			Addr:    pluginAddress,
-		},
-	}
-	t.server.Start()
-}
-
-// stop stops the test server that implements the plugin
-func (t *authZPluginTestServer) stop() {
-	t.server.Close()
-	os.Remove(pluginAddress)
-	if t.listener != nil {
-		t.listener.Close()
-	}
-}
-
-// auth is a used to record/replay the authentication api messages
-func (t *authZPluginTestServer) auth(w http.ResponseWriter, r *http.Request) {
-	t.recordedRequest = Request{}
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		t.t.Fatal(err)
-	}
-	r.Body.Close()
-	json.Unmarshal(body, &t.recordedRequest)
-	b, err := json.Marshal(t.replayResponse)
-	if err != nil {
-		t.t.Fatal(err)
-	}
-	w.Write(b)
-}
-
-func (t *authZPluginTestServer) activate(w http.ResponseWriter, r *http.Request) {
-	b, err := json.Marshal(plugins.Manifest{Implements: []string{AuthZApiImplements}})
-	if err != nil {
-		t.t.Fatal(err)
-	}
-	w.Write(b)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/middleware.go b/installer/vendor/github.com/docker/docker/pkg/authorization/middleware.go
deleted file mode 100644
index 52890dd360..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/middleware.go
+++ /dev/null
@@ -1,84 +0,0 @@
-package authorization
-
-import (
-	"net/http"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/plugingetter"
-	"golang.org/x/net/context"
-)
-
-// Middleware uses a list of plugins to
-// handle authorization in the API requests.
-type Middleware struct {
-	mu      sync.Mutex
-	plugins []Plugin
-}
-
-// NewMiddleware creates a new Middleware
-// with a slice of plugins names.
-func NewMiddleware(names []string, pg plugingetter.PluginGetter) *Middleware {
-	SetPluginGetter(pg)
-	return &Middleware{
-		plugins: newPlugins(names),
-	}
-}
-
-// SetPlugins sets the plugin used for authorization
-func (m *Middleware) SetPlugins(names []string) {
-	m.mu.Lock()
-	m.plugins = newPlugins(names)
-	m.mu.Unlock()
-}
-
-// WrapHandler returns a new handler function wrapping the previous one in the request chain.
-func (m *Middleware) WrapHandler(handler func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error) func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-	return func(ctx context.Context, w http.ResponseWriter, r *http.Request, vars map[string]string) error {
-
-		m.mu.Lock()
-		plugins := m.plugins
-		m.mu.Unlock()
-		if len(plugins) == 0 {
-			return handler(ctx, w, r, vars)
-		}
-
-		user := ""
-		userAuthNMethod := ""
-
-		// Default authorization using existing TLS connection credentials
-		// FIXME: Non trivial authorization mechanisms (such as advanced certificate validations, kerberos support
-		// and ldap) will be extracted using AuthN feature, which is tracked under:
-		// https://github.com/docker/docker/pull/20883
-		if r.TLS != nil && len(r.TLS.PeerCertificates) > 0 {
-			user = r.TLS.PeerCertificates[0].Subject.CommonName
-			userAuthNMethod = "TLS"
-		}
-
-		authCtx := NewCtx(plugins, user, userAuthNMethod, r.Method, r.RequestURI)
-
-		if err := authCtx.AuthZRequest(w, r); err != nil {
-			logrus.Errorf("AuthZRequest for %s %s returned error: %s", r.Method, r.RequestURI, err)
-			return err
-		}
-
-		rw := NewResponseModifier(w)
-
-		var errD error
-
-		if errD = handler(ctx, rw, r, vars); errD != nil {
-			logrus.Errorf("Handler for %s %s returned error: %s", r.Method, r.RequestURI, errD)
-		}
-
-		if err := authCtx.AuthZResponse(rw, r); errD == nil && err != nil {
-			logrus.Errorf("AuthZResponse for %s %s returned error: %s", r.Method, r.RequestURI, err)
-			return err
-		}
-
-		if errD != nil {
-			return errD
-		}
-
-		return nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/plugin.go b/installer/vendor/github.com/docker/docker/pkg/authorization/plugin.go
deleted file mode 100644
index 4b1c71bd4b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/plugin.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package authorization
-
-import (
-	"sync"
-
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/plugins"
-)
-
-// Plugin allows third party plugins to authorize requests and responses
-// in the context of docker API
-type Plugin interface {
-	// Name returns the registered plugin name
-	Name() string
-
-	// AuthZRequest authorizes the request from the client to the daemon
-	AuthZRequest(*Request) (*Response, error)
-
-	// AuthZResponse authorizes the response from the daemon to the client
-	AuthZResponse(*Request) (*Response, error)
-}
-
-// newPlugins constructs and initializes the authorization plugins based on plugin names
-func newPlugins(names []string) []Plugin {
-	plugins := []Plugin{}
-	pluginsMap := make(map[string]struct{})
-	for _, name := range names {
-		if _, ok := pluginsMap[name]; ok {
-			continue
-		}
-		pluginsMap[name] = struct{}{}
-		plugins = append(plugins, newAuthorizationPlugin(name))
-	}
-	return plugins
-}
-
-var getter plugingetter.PluginGetter
-
-// SetPluginGetter sets the plugingetter
-func SetPluginGetter(pg plugingetter.PluginGetter) {
-	getter = pg
-}
-
-// GetPluginGetter gets the plugingetter
-func GetPluginGetter() plugingetter.PluginGetter {
-	return getter
-}
-
-// authorizationPlugin is an internal adapter to docker plugin system
-type authorizationPlugin struct {
-	plugin *plugins.Client
-	name   string
-	once   sync.Once
-}
-
-func newAuthorizationPlugin(name string) Plugin {
-	return &authorizationPlugin{name: name}
-}
-
-func (a *authorizationPlugin) Name() string {
-	return a.name
-}
-
-func (a *authorizationPlugin) AuthZRequest(authReq *Request) (*Response, error) {
-	if err := a.initPlugin(); err != nil {
-		return nil, err
-	}
-
-	authRes := &Response{}
-	if err := a.plugin.Call(AuthZApiRequest, authReq, authRes); err != nil {
-		return nil, err
-	}
-
-	return authRes, nil
-}
-
-func (a *authorizationPlugin) AuthZResponse(authReq *Request) (*Response, error) {
-	if err := a.initPlugin(); err != nil {
-		return nil, err
-	}
-
-	authRes := &Response{}
-	if err := a.plugin.Call(AuthZApiResponse, authReq, authRes); err != nil {
-		return nil, err
-	}
-
-	return authRes, nil
-}
-
-// initPlugin initializes the authorization plugin if needed
-func (a *authorizationPlugin) initPlugin() error {
-	// Lazy loading of plugins
-	var err error
-	a.once.Do(func() {
-		if a.plugin == nil {
-			var plugin plugingetter.CompatPlugin
-			var e error
-
-			if pg := GetPluginGetter(); pg != nil {
-				plugin, e = pg.Get(a.name, AuthZApiImplements, plugingetter.LOOKUP)
-			} else {
-				plugin, e = plugins.Get(a.name, AuthZApiImplements)
-			}
-			if e != nil {
-				err = e
-				return
-			}
-			a.plugin = plugin.Client()
-		}
-	})
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/authorization/response.go b/installer/vendor/github.com/docker/docker/pkg/authorization/response.go
deleted file mode 100644
index 129bf2f417..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/authorization/response.go
+++ /dev/null
@@ -1,203 +0,0 @@
-package authorization
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"net"
-	"net/http"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// ResponseModifier allows authorization plugins to read and modify the content of the http.response
-type ResponseModifier interface {
-	http.ResponseWriter
-	http.Flusher
-	http.CloseNotifier
-
-	// RawBody returns the current http content
-	RawBody() []byte
-
-	// RawHeaders returns the current content of the http headers
-	RawHeaders() ([]byte, error)
-
-	// StatusCode returns the current status code
-	StatusCode() int
-
-	// OverrideBody replaces the body of the HTTP reply
-	OverrideBody(b []byte)
-
-	// OverrideHeader replaces the headers of the HTTP reply
-	OverrideHeader(b []byte) error
-
-	// OverrideStatusCode replaces the status code of the HTTP reply
-	OverrideStatusCode(statusCode int)
-
-	// FlushAll flushes all data to the HTTP response
-	FlushAll() error
-
-	// Hijacked indicates the response has been hijacked by the Docker daemon
-	Hijacked() bool
-}
-
-// NewResponseModifier creates a wrapper to an http.ResponseWriter to allow inspecting and modifying the content
-func NewResponseModifier(rw http.ResponseWriter) ResponseModifier {
-	return &responseModifier{rw: rw, header: make(http.Header)}
-}
-
-// responseModifier is used as an adapter to http.ResponseWriter in order to manipulate and explore
-// the http request/response from docker daemon
-type responseModifier struct {
-	// The original response writer
-	rw http.ResponseWriter
-	// body holds the response body
-	body []byte
-	// header holds the response header
-	header http.Header
-	// statusCode holds the response status code
-	statusCode int
-	// hijacked indicates the request has been hijacked
-	hijacked bool
-}
-
-func (rm *responseModifier) Hijacked() bool {
-	return rm.hijacked
-}
-
-// WriterHeader stores the http status code
-func (rm *responseModifier) WriteHeader(s int) {
-
-	// Use original request if hijacked
-	if rm.hijacked {
-		rm.rw.WriteHeader(s)
-		return
-	}
-
-	rm.statusCode = s
-}
-
-// Header returns the internal http header
-func (rm *responseModifier) Header() http.Header {
-
-	// Use original header if hijacked
-	if rm.hijacked {
-		return rm.rw.Header()
-	}
-
-	return rm.header
-}
-
-// StatusCode returns the http status code
-func (rm *responseModifier) StatusCode() int {
-	return rm.statusCode
-}
-
-// OverrideBody replaces the body of the HTTP response
-func (rm *responseModifier) OverrideBody(b []byte) {
-	rm.body = b
-}
-
-// OverrideStatusCode replaces the status code of the HTTP response
-func (rm *responseModifier) OverrideStatusCode(statusCode int) {
-	rm.statusCode = statusCode
-}
-
-// OverrideHeader replaces the headers of the HTTP response
-func (rm *responseModifier) OverrideHeader(b []byte) error {
-	header := http.Header{}
-	if err := json.Unmarshal(b, &header); err != nil {
-		return err
-	}
-	rm.header = header
-	return nil
-}
-
-// Write stores the byte array inside content
-func (rm *responseModifier) Write(b []byte) (int, error) {
-
-	if rm.hijacked {
-		return rm.rw.Write(b)
-	}
-
-	rm.body = append(rm.body, b...)
-	return len(b), nil
-}
-
-// Body returns the response body
-func (rm *responseModifier) RawBody() []byte {
-	return rm.body
-}
-
-func (rm *responseModifier) RawHeaders() ([]byte, error) {
-	var b bytes.Buffer
-	if err := rm.header.Write(&b); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-// Hijack returns the internal connection of the wrapped http.ResponseWriter
-func (rm *responseModifier) Hijack() (net.Conn, *bufio.ReadWriter, error) {
-
-	rm.hijacked = true
-	rm.FlushAll()
-
-	hijacker, ok := rm.rw.(http.Hijacker)
-	if !ok {
-		return nil, nil, fmt.Errorf("Internal response writer doesn't support the Hijacker interface")
-	}
-	return hijacker.Hijack()
-}
-
-// CloseNotify uses the internal close notify API of the wrapped http.ResponseWriter
-func (rm *responseModifier) CloseNotify() <-chan bool {
-	closeNotifier, ok := rm.rw.(http.CloseNotifier)
-	if !ok {
-		logrus.Error("Internal response writer doesn't support the CloseNotifier interface")
-		return nil
-	}
-	return closeNotifier.CloseNotify()
-}
-
-// Flush uses the internal flush API of the wrapped http.ResponseWriter
-func (rm *responseModifier) Flush() {
-	flusher, ok := rm.rw.(http.Flusher)
-	if !ok {
-		logrus.Error("Internal response writer doesn't support the Flusher interface")
-		return
-	}
-
-	rm.FlushAll()
-	flusher.Flush()
-}
-
-// FlushAll flushes all data to the HTTP response
-func (rm *responseModifier) FlushAll() error {
-	// Copy the header
-	for k, vv := range rm.header {
-		for _, v := range vv {
-			rm.rw.Header().Add(k, v)
-		}
-	}
-
-	// Copy the status code
-	// Also WriteHeader needs to be done after all the headers
-	// have been copied (above).
-	if rm.statusCode > 0 {
-		rm.rw.WriteHeader(rm.statusCode)
-	}
-
-	var err error
-	if len(rm.body) > 0 {
-		// Write body
-		_, err = rm.rw.Write(rm.body)
-	}
-
-	// Clean previous data
-	rm.body = nil
-	rm.statusCode = 0
-	rm.header = http.Header{}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered.go b/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered.go
deleted file mode 100644
index 784d65d6fe..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package broadcaster
-
-import (
-	"io"
-	"sync"
-)
-
-// Unbuffered accumulates multiple io.WriteCloser by stream.
-type Unbuffered struct {
-	mu      sync.Mutex
-	writers []io.WriteCloser
-}
-
-// Add adds new io.WriteCloser.
-func (w *Unbuffered) Add(writer io.WriteCloser) {
-	w.mu.Lock()
-	w.writers = append(w.writers, writer)
-	w.mu.Unlock()
-}
-
-// Write writes bytes to all writers. Failed writers will be evicted during
-// this call.
-func (w *Unbuffered) Write(p []byte) (n int, err error) {
-	w.mu.Lock()
-	var evict []int
-	for i, sw := range w.writers {
-		if n, err := sw.Write(p); err != nil || n != len(p) {
-			// On error, evict the writer
-			evict = append(evict, i)
-		}
-	}
-	for n, i := range evict {
-		w.writers = append(w.writers[:i-n], w.writers[i-n+1:]...)
-	}
-	w.mu.Unlock()
-	return len(p), nil
-}
-
-// Clean closes and removes all writers. Last non-eol-terminated part of data
-// will be saved.
-func (w *Unbuffered) Clean() error {
-	w.mu.Lock()
-	for _, sw := range w.writers {
-		sw.Close()
-	}
-	w.writers = nil
-	w.mu.Unlock()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered_test.go b/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered_test.go
deleted file mode 100644
index 9f8e72bc0f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/broadcaster/unbuffered_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-package broadcaster
-
-import (
-	"bytes"
-	"errors"
-	"strings"
-
-	"testing"
-)
-
-type dummyWriter struct {
-	buffer      bytes.Buffer
-	failOnWrite bool
-}
-
-func (dw *dummyWriter) Write(p []byte) (n int, err error) {
-	if dw.failOnWrite {
-		return 0, errors.New("Fake fail")
-	}
-	return dw.buffer.Write(p)
-}
-
-func (dw *dummyWriter) String() string {
-	return dw.buffer.String()
-}
-
-func (dw *dummyWriter) Close() error {
-	return nil
-}
-
-func TestUnbuffered(t *testing.T) {
-	writer := new(Unbuffered)
-
-	// Test 1: Both bufferA and bufferB should contain "foo"
-	bufferA := &dummyWriter{}
-	writer.Add(bufferA)
-	bufferB := &dummyWriter{}
-	writer.Add(bufferB)
-	writer.Write([]byte("foo"))
-
-	if bufferA.String() != "foo" {
-		t.Errorf("Buffer contains %v", bufferA.String())
-	}
-
-	if bufferB.String() != "foo" {
-		t.Errorf("Buffer contains %v", bufferB.String())
-	}
-
-	// Test2: bufferA and bufferB should contain "foobar",
-	// while bufferC should only contain "bar"
-	bufferC := &dummyWriter{}
-	writer.Add(bufferC)
-	writer.Write([]byte("bar"))
-
-	if bufferA.String() != "foobar" {
-		t.Errorf("Buffer contains %v", bufferA.String())
-	}
-
-	if bufferB.String() != "foobar" {
-		t.Errorf("Buffer contains %v", bufferB.String())
-	}
-
-	if bufferC.String() != "bar" {
-		t.Errorf("Buffer contains %v", bufferC.String())
-	}
-
-	// Test3: Test eviction on failure
-	bufferA.failOnWrite = true
-	writer.Write([]byte("fail"))
-	if bufferA.String() != "foobar" {
-		t.Errorf("Buffer contains %v", bufferA.String())
-	}
-	if bufferC.String() != "barfail" {
-		t.Errorf("Buffer contains %v", bufferC.String())
-	}
-	// Even though we reset the flag, no more writes should go in there
-	bufferA.failOnWrite = false
-	writer.Write([]byte("test"))
-	if bufferA.String() != "foobar" {
-		t.Errorf("Buffer contains %v", bufferA.String())
-	}
-	if bufferC.String() != "barfailtest" {
-		t.Errorf("Buffer contains %v", bufferC.String())
-	}
-
-	// Test4: Test eviction on multiple simultaneous failures
-	bufferB.failOnWrite = true
-	bufferC.failOnWrite = true
-	bufferD := &dummyWriter{}
-	writer.Add(bufferD)
-	writer.Write([]byte("yo"))
-	writer.Write([]byte("ink"))
-	if strings.Contains(bufferB.String(), "yoink") {
-		t.Errorf("bufferB received write. contents: %q", bufferB)
-	}
-	if strings.Contains(bufferC.String(), "yoink") {
-		t.Errorf("bufferC received write. contents: %q", bufferC)
-	}
-	if g, w := bufferD.String(), "yoink"; g != w {
-		t.Errorf("bufferD = %q, want %q", g, w)
-	}
-
-	writer.Clean()
-}
-
-type devNullCloser int
-
-func (d devNullCloser) Close() error {
-	return nil
-}
-
-func (d devNullCloser) Write(buf []byte) (int, error) {
-	return len(buf), nil
-}
-
-// This test checks for races. It is only useful when run with the race detector.
-func TestRaceUnbuffered(t *testing.T) {
-	writer := new(Unbuffered)
-	c := make(chan bool)
-	go func() {
-		writer.Add(devNullCloser(0))
-		c <- true
-	}()
-	writer.Write([]byte("hello"))
-	<-c
-}
-
-func BenchmarkUnbuffered(b *testing.B) {
-	writer := new(Unbuffered)
-	setUpWriter := func() {
-		for i := 0; i < 100; i++ {
-			writer.Add(devNullCloser(0))
-			writer.Add(devNullCloser(0))
-			writer.Add(devNullCloser(0))
-		}
-	}
-	testLine := "Line that thinks that it is log line from docker"
-	var buf bytes.Buffer
-	for i := 0; i < 100; i++ {
-		buf.Write([]byte(testLine + "\n"))
-	}
-	// line without eol
-	buf.Write([]byte(testLine))
-	testText := buf.Bytes()
-	b.SetBytes(int64(5 * len(testText)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		setUpWriter()
-		b.StartTimer()
-
-		for j := 0; j < 5; j++ {
-			if _, err := writer.Write(testText); err != nil {
-				b.Fatal(err)
-			}
-		}
-
-		b.StopTimer()
-		writer.Clean()
-		b.StartTimer()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive.go
deleted file mode 100644
index a7814f5b90..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package chrootarchive
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/idtools"
-)
-
-var chrootArchiver = &archive.Archiver{Untar: Untar}
-
-// Untar reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive may be compressed with one of the following algorithms:
-//  identity (uncompressed), gzip, bzip2, xz.
-func Untar(tarArchive io.Reader, dest string, options *archive.TarOptions) error {
-	return untarHandler(tarArchive, dest, options, true)
-}
-
-// UntarUncompressed reads a stream of bytes from `archive`, parses it as a tar archive,
-// and unpacks it into the directory at `dest`.
-// The archive must be an uncompressed stream.
-func UntarUncompressed(tarArchive io.Reader, dest string, options *archive.TarOptions) error {
-	return untarHandler(tarArchive, dest, options, false)
-}
-
-// Handler for teasing out the automatic decompression
-func untarHandler(tarArchive io.Reader, dest string, options *archive.TarOptions, decompress bool) error {
-
-	if tarArchive == nil {
-		return fmt.Errorf("Empty archive")
-	}
-	if options == nil {
-		options = &archive.TarOptions{}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-
-	rootUID, rootGID, err := idtools.GetRootUIDGID(options.UIDMaps, options.GIDMaps)
-	if err != nil {
-		return err
-	}
-
-	dest = filepath.Clean(dest)
-	if _, err := os.Stat(dest); os.IsNotExist(err) {
-		if err := idtools.MkdirAllNewAs(dest, 0755, rootUID, rootGID); err != nil {
-			return err
-		}
-	}
-
-	r := ioutil.NopCloser(tarArchive)
-	if decompress {
-		decompressedArchive, err := archive.DecompressStream(tarArchive)
-		if err != nil {
-			return err
-		}
-		defer decompressedArchive.Close()
-		r = decompressedArchive
-	}
-
-	return invokeUnpack(r, dest, options)
-}
-
-// TarUntar is a convenience function which calls Tar and Untar, with the output of one piped into the other.
-// If either Tar or Untar fails, TarUntar aborts and returns the error.
-func TarUntar(src, dst string) error {
-	return chrootArchiver.TarUntar(src, dst)
-}
-
-// CopyWithTar creates a tar archive of filesystem path `src`, and
-// unpacks it at filesystem path `dst`.
-// The archive is streamed directly with fixed buffering and no
-// intermediary disk IO.
-func CopyWithTar(src, dst string) error {
-	return chrootArchiver.CopyWithTar(src, dst)
-}
-
-// CopyFileWithTar emulates the behavior of the 'cp' command-line
-// for a single file. It copies a regular file from path `src` to
-// path `dst`, and preserves all its metadata.
-//
-// If `dst` ends with a trailing slash '/' ('\' on Windows), the final
-// destination path will be `dst/base(src)` or `dst\base(src)`
-func CopyFileWithTar(src, dst string) (err error) {
-	return chrootArchiver.CopyFileWithTar(src, dst)
-}
-
-// UntarPath is a convenience function which looks for an archive
-// at filesystem path `src`, and unpacks it at `dst`.
-func UntarPath(src, dst string) error {
-	return chrootArchiver.UntarPath(src, dst)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_test.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_test.go
deleted file mode 100644
index d2d7e621f5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_test.go
+++ /dev/null
@@ -1,394 +0,0 @@
-package chrootarchive
-
-import (
-	"bytes"
-	"fmt"
-	"hash/crc32"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/docker/pkg/system"
-)
-
-func init() {
-	reexec.Init()
-}
-
-func TestChrootTarUntar(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(src, "lolo"), []byte("hello lolo"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	stream, err := archive.Tar(src, archive.Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dest := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(dest, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := Untar(stream, dest, &archive.TarOptions{ExcludePatterns: []string{"lolo"}}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// gh#10426: Verify the fix for having a huge excludes list (like on `docker load` with large # of
-// local images)
-func TestChrootUntarWithHugeExcludesList(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootUntarHugeExcludes")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(src, "toto"), []byte("hello toto"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	stream, err := archive.Tar(src, archive.Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dest := filepath.Join(tmpdir, "dest")
-	if err := system.MkdirAll(dest, 0700); err != nil {
-		t.Fatal(err)
-	}
-	options := &archive.TarOptions{}
-	//65534 entries of 64-byte strings ~= 4MB of environment space which should overflow
-	//on most systems when passed via environment or command line arguments
-	excludes := make([]string, 65534, 65534)
-	for i := 0; i < 65534; i++ {
-		excludes[i] = strings.Repeat(string(i), 64)
-	}
-	options.ExcludePatterns = excludes
-	if err := Untar(stream, dest, options); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootUntarEmptyArchive(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootUntarEmptyArchive")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := Untar(nil, tmpdir, nil); err == nil {
-		t.Fatal("expected error on empty archive")
-	}
-}
-
-func prepareSourceDirectory(numberOfFiles int, targetPath string, makeSymLinks bool) (int, error) {
-	fileData := []byte("fooo")
-	for n := 0; n < numberOfFiles; n++ {
-		fileName := fmt.Sprintf("file-%d", n)
-		if err := ioutil.WriteFile(filepath.Join(targetPath, fileName), fileData, 0700); err != nil {
-			return 0, err
-		}
-		if makeSymLinks {
-			if err := os.Symlink(filepath.Join(targetPath, fileName), filepath.Join(targetPath, fileName+"-link")); err != nil {
-				return 0, err
-			}
-		}
-	}
-	totalSize := numberOfFiles * len(fileData)
-	return totalSize, nil
-}
-
-func getHash(filename string) (uint32, error) {
-	stream, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return 0, err
-	}
-	hash := crc32.NewIEEE()
-	hash.Write(stream)
-	return hash.Sum32(), nil
-}
-
-func compareDirectories(src string, dest string) error {
-	changes, err := archive.ChangesDirs(dest, src)
-	if err != nil {
-		return err
-	}
-	if len(changes) > 0 {
-		return fmt.Errorf("Unexpected differences after untar: %v", changes)
-	}
-	return nil
-}
-
-func compareFiles(src string, dest string) error {
-	srcHash, err := getHash(src)
-	if err != nil {
-		return err
-	}
-	destHash, err := getHash(dest)
-	if err != nil {
-		return err
-	}
-	if srcHash != destHash {
-		return fmt.Errorf("%s is different from %s", src, dest)
-	}
-	return nil
-}
-
-func TestChrootTarUntarWithSymlink(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootTarUntarWithSymlink")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := prepareSourceDirectory(10, src, false); err != nil {
-		t.Fatal(err)
-	}
-	dest := filepath.Join(tmpdir, "dest")
-	if err := TarUntar(src, dest); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareDirectories(src, dest); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootCopyWithTar(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" || runtime.GOOS == "solaris" {
-		t.Skip("Failing on Windows and Solaris")
-	}
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootCopyWithTar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := prepareSourceDirectory(10, src, true); err != nil {
-		t.Fatal(err)
-	}
-
-	// Copy directory
-	dest := filepath.Join(tmpdir, "dest")
-	if err := CopyWithTar(src, dest); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareDirectories(src, dest); err != nil {
-		t.Fatal(err)
-	}
-
-	// Copy file
-	srcfile := filepath.Join(src, "file-1")
-	dest = filepath.Join(tmpdir, "destFile")
-	destfile := filepath.Join(dest, "file-1")
-	if err := CopyWithTar(srcfile, destfile); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareFiles(srcfile, destfile); err != nil {
-		t.Fatal(err)
-	}
-
-	// Copy symbolic link
-	srcLinkfile := filepath.Join(src, "file-1-link")
-	dest = filepath.Join(tmpdir, "destSymlink")
-	destLinkfile := filepath.Join(dest, "file-1-link")
-	if err := CopyWithTar(srcLinkfile, destLinkfile); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareFiles(srcLinkfile, destLinkfile); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootCopyFileWithTar(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootCopyFileWithTar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := prepareSourceDirectory(10, src, true); err != nil {
-		t.Fatal(err)
-	}
-
-	// Copy directory
-	dest := filepath.Join(tmpdir, "dest")
-	if err := CopyFileWithTar(src, dest); err == nil {
-		t.Fatal("Expected error on copying directory")
-	}
-
-	// Copy file
-	srcfile := filepath.Join(src, "file-1")
-	dest = filepath.Join(tmpdir, "destFile")
-	destfile := filepath.Join(dest, "file-1")
-	if err := CopyFileWithTar(srcfile, destfile); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareFiles(srcfile, destfile); err != nil {
-		t.Fatal(err)
-	}
-
-	// Copy symbolic link
-	srcLinkfile := filepath.Join(src, "file-1-link")
-	dest = filepath.Join(tmpdir, "destSymlink")
-	destLinkfile := filepath.Join(dest, "file-1-link")
-	if err := CopyFileWithTar(srcLinkfile, destLinkfile); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareFiles(srcLinkfile, destLinkfile); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootUntarPath(t *testing.T) {
-	// TODO Windows: Figure out why this is failing
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows")
-	}
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootUntarPath")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := prepareSourceDirectory(10, src, false); err != nil {
-		t.Fatal(err)
-	}
-	dest := filepath.Join(tmpdir, "dest")
-	// Untar a directory
-	if err := UntarPath(src, dest); err == nil {
-		t.Fatal("Expected error on untaring a directory")
-	}
-
-	// Untar a tar file
-	stream, err := archive.Tar(src, archive.Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-	buf := new(bytes.Buffer)
-	buf.ReadFrom(stream)
-	tarfile := filepath.Join(tmpdir, "src.tar")
-	if err := ioutil.WriteFile(tarfile, buf.Bytes(), 0644); err != nil {
-		t.Fatal(err)
-	}
-	if err := UntarPath(tarfile, dest); err != nil {
-		t.Fatal(err)
-	}
-	if err := compareDirectories(src, dest); err != nil {
-		t.Fatal(err)
-	}
-}
-
-type slowEmptyTarReader struct {
-	size      int
-	offset    int
-	chunkSize int
-}
-
-// Read is a slow reader of an empty tar (like the output of "tar c --files-from /dev/null")
-func (s *slowEmptyTarReader) Read(p []byte) (int, error) {
-	time.Sleep(100 * time.Millisecond)
-	count := s.chunkSize
-	if len(p) < s.chunkSize {
-		count = len(p)
-	}
-	for i := 0; i < count; i++ {
-		p[i] = 0
-	}
-	s.offset += count
-	if s.offset > s.size {
-		return count, io.EOF
-	}
-	return count, nil
-}
-
-func TestChrootUntarEmptyArchiveFromSlowReader(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootUntarEmptyArchiveFromSlowReader")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	dest := filepath.Join(tmpdir, "dest")
-	if err := system.MkdirAll(dest, 0700); err != nil {
-		t.Fatal(err)
-	}
-	stream := &slowEmptyTarReader{size: 10240, chunkSize: 1024}
-	if err := Untar(stream, dest, nil); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootApplyEmptyArchiveFromSlowReader(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootApplyEmptyArchiveFromSlowReader")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	dest := filepath.Join(tmpdir, "dest")
-	if err := system.MkdirAll(dest, 0700); err != nil {
-		t.Fatal(err)
-	}
-	stream := &slowEmptyTarReader{size: 10240, chunkSize: 1024}
-	if _, err := ApplyLayer(dest, stream); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestChrootApplyDotDotFile(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "docker-TestChrootApplyDotDotFile")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	src := filepath.Join(tmpdir, "src")
-	if err := system.MkdirAll(src, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(filepath.Join(src, "..gitme"), []byte(""), 0644); err != nil {
-		t.Fatal(err)
-	}
-	stream, err := archive.Tar(src, archive.Uncompressed)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dest := filepath.Join(tmpdir, "dest")
-	if err := system.MkdirAll(dest, 0700); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ApplyLayer(dest, stream); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_unix.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_unix.go
deleted file mode 100644
index f2325abd74..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_unix.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// +build !windows
-
-package chrootarchive
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"runtime"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-)
-
-// untar is the entry-point for docker-untar on re-exec. This is not used on
-// Windows as it does not support chroot, hence no point sandboxing through
-// chroot and rexec.
-func untar() {
-	runtime.LockOSThread()
-	flag.Parse()
-
-	var options *archive.TarOptions
-
-	//read the options from the pipe "ExtraFiles"
-	if err := json.NewDecoder(os.NewFile(3, "options")).Decode(&options); err != nil {
-		fatal(err)
-	}
-
-	if err := chroot(flag.Arg(0)); err != nil {
-		fatal(err)
-	}
-
-	if err := archive.Unpack(os.Stdin, "/", options); err != nil {
-		fatal(err)
-	}
-	// fully consume stdin in case it is zero padded
-	if _, err := flush(os.Stdin); err != nil {
-		fatal(err)
-	}
-
-	os.Exit(0)
-}
-
-func invokeUnpack(decompressedArchive io.Reader, dest string, options *archive.TarOptions) error {
-
-	// We can't pass a potentially large exclude list directly via cmd line
-	// because we easily overrun the kernel's max argument/environment size
-	// when the full image list is passed (e.g. when this is used by
-	// `docker load`). We will marshall the options via a pipe to the
-	// child
-	r, w, err := os.Pipe()
-	if err != nil {
-		return fmt.Errorf("Untar pipe failure: %v", err)
-	}
-
-	cmd := reexec.Command("docker-untar", dest)
-	cmd.Stdin = decompressedArchive
-
-	cmd.ExtraFiles = append(cmd.ExtraFiles, r)
-	output := bytes.NewBuffer(nil)
-	cmd.Stdout = output
-	cmd.Stderr = output
-
-	if err := cmd.Start(); err != nil {
-		return fmt.Errorf("Untar error on re-exec cmd: %v", err)
-	}
-	//write the options to the pipe for the untar exec to read
-	if err := json.NewEncoder(w).Encode(options); err != nil {
-		return fmt.Errorf("Untar json encode to pipe failed: %v", err)
-	}
-	w.Close()
-
-	if err := cmd.Wait(); err != nil {
-		// when `xz -d -c -q | docker-untar ...` failed on docker-untar side,
-		// we need to exhaust `xz`'s output, otherwise the `xz` side will be
-		// pending on write pipe forever
-		io.Copy(ioutil.Discard, decompressedArchive)
-
-		return fmt.Errorf("Error processing tar file(%v): %s", err, output)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_windows.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_windows.go
deleted file mode 100644
index 0a500ed5c2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/archive_windows.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package chrootarchive
-
-import (
-	"io"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/longpath"
-)
-
-// chroot is not supported by Windows
-func chroot(path string) error {
-	return nil
-}
-
-func invokeUnpack(decompressedArchive io.ReadCloser,
-	dest string,
-	options *archive.TarOptions) error {
-	// Windows is different to Linux here because Windows does not support
-	// chroot. Hence there is no point sandboxing a chrooted process to
-	// do the unpack. We call inline instead within the daemon process.
-	return archive.Unpack(decompressedArchive, longpath.AddPrefix(dest), options)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go
deleted file mode 100644
index f9d7fed633..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_linux.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package chrootarchive
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/docker/docker/pkg/mount"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-)
-
-// chroot on linux uses pivot_root instead of chroot
-// pivot_root takes a new root and an old root.
-// Old root must be a sub-dir of new root, it is where the current rootfs will reside after the call to pivot_root.
-// New root is where the new rootfs is set to.
-// Old root is removed after the call to pivot_root so it is no longer available under the new root.
-// This is similar to how libcontainer sets up a container's rootfs
-func chroot(path string) (err error) {
-	// if the engine is running in a user namespace we need to use actual chroot
-	if rsystem.RunningInUserNS() {
-		return realChroot(path)
-	}
-	if err := syscall.Unshare(syscall.CLONE_NEWNS); err != nil {
-		return fmt.Errorf("Error creating mount namespace before pivot: %v", err)
-	}
-
-	// make everything in new ns private
-	if err := mount.MakeRPrivate("/"); err != nil {
-		return err
-	}
-
-	if mounted, _ := mount.Mounted(path); !mounted {
-		if err := mount.Mount(path, path, "bind", "rbind,rw"); err != nil {
-			return realChroot(path)
-		}
-	}
-
-	// setup oldRoot for pivot_root
-	pivotDir, err := ioutil.TempDir(path, ".pivot_root")
-	if err != nil {
-		return fmt.Errorf("Error setting up pivot dir: %v", err)
-	}
-
-	var mounted bool
-	defer func() {
-		if mounted {
-			// make sure pivotDir is not mounted before we try to remove it
-			if errCleanup := syscall.Unmount(pivotDir, syscall.MNT_DETACH); errCleanup != nil {
-				if err == nil {
-					err = errCleanup
-				}
-				return
-			}
-		}
-
-		errCleanup := os.Remove(pivotDir)
-		// pivotDir doesn't exist if pivot_root failed and chroot+chdir was successful
-		// because we already cleaned it up on failed pivot_root
-		if errCleanup != nil && !os.IsNotExist(errCleanup) {
-			errCleanup = fmt.Errorf("Error cleaning up after pivot: %v", errCleanup)
-			if err == nil {
-				err = errCleanup
-			}
-		}
-	}()
-
-	if err := syscall.PivotRoot(path, pivotDir); err != nil {
-		// If pivot fails, fall back to the normal chroot after cleaning up temp dir
-		if err := os.Remove(pivotDir); err != nil {
-			return fmt.Errorf("Error cleaning up after failed pivot: %v", err)
-		}
-		return realChroot(path)
-	}
-	mounted = true
-
-	// This is the new path for where the old root (prior to the pivot) has been moved to
-	// This dir contains the rootfs of the caller, which we need to remove so it is not visible during extraction
-	pivotDir = filepath.Join("/", filepath.Base(pivotDir))
-
-	if err := syscall.Chdir("/"); err != nil {
-		return fmt.Errorf("Error changing to new root: %v", err)
-	}
-
-	// Make the pivotDir (where the old root lives) private so it can be unmounted without propagating to the host
-	if err := syscall.Mount("", pivotDir, "", syscall.MS_PRIVATE|syscall.MS_REC, ""); err != nil {
-		return fmt.Errorf("Error making old root private after pivot: %v", err)
-	}
-
-	// Now unmount the old root so it's no longer visible from the new root
-	if err := syscall.Unmount(pivotDir, syscall.MNT_DETACH); err != nil {
-		return fmt.Errorf("Error while unmounting old root after pivot: %v", err)
-	}
-	mounted = false
-
-	return nil
-}
-
-func realChroot(path string) error {
-	if err := syscall.Chroot(path); err != nil {
-		return fmt.Errorf("Error after fallback to chroot: %v", err)
-	}
-	if err := syscall.Chdir("/"); err != nil {
-		return fmt.Errorf("Error changing to new root after chroot: %v", err)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go
deleted file mode 100644
index 16354bf648..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/chroot_unix.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !windows,!linux
-
-package chrootarchive
-
-import "syscall"
-
-func chroot(path string) error {
-	if err := syscall.Chroot(path); err != nil {
-		return err
-	}
-	return syscall.Chdir("/")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff.go
deleted file mode 100644
index 49acad79ff..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package chrootarchive
-
-import (
-	"io"
-
-	"github.com/docker/docker/pkg/archive"
-)
-
-// ApplyLayer parses a diff in the standard layer format from `layer`,
-// and applies it to the directory `dest`. The stream `layer` can only be
-// uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyLayer(dest string, layer io.Reader) (size int64, err error) {
-	return applyLayerHandler(dest, layer, &archive.TarOptions{}, true)
-}
-
-// ApplyUncompressedLayer parses a diff in the standard layer format from
-// `layer`, and applies it to the directory `dest`. The stream `layer`
-// can only be uncompressed.
-// Returns the size in bytes of the contents of the layer.
-func ApplyUncompressedLayer(dest string, layer io.Reader, options *archive.TarOptions) (int64, error) {
-	return applyLayerHandler(dest, layer, options, false)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_unix.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_unix.go
deleted file mode 100644
index eb0aacc3ab..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_unix.go
+++ /dev/null
@@ -1,130 +0,0 @@
-//+build !windows
-
-package chrootarchive
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/reexec"
-	"github.com/docker/docker/pkg/system"
-	rsystem "github.com/opencontainers/runc/libcontainer/system"
-)
-
-type applyLayerResponse struct {
-	LayerSize int64 `json:"layerSize"`
-}
-
-// applyLayer is the entry-point for docker-applylayer on re-exec. This is not
-// used on Windows as it does not support chroot, hence no point sandboxing
-// through chroot and rexec.
-func applyLayer() {
-
-	var (
-		tmpDir  = ""
-		err     error
-		options *archive.TarOptions
-	)
-	runtime.LockOSThread()
-	flag.Parse()
-
-	inUserns := rsystem.RunningInUserNS()
-	if err := chroot(flag.Arg(0)); err != nil {
-		fatal(err)
-	}
-
-	// We need to be able to set any perms
-	oldmask, err := system.Umask(0)
-	defer system.Umask(oldmask)
-	if err != nil {
-		fatal(err)
-	}
-
-	if err := json.Unmarshal([]byte(os.Getenv("OPT")), &options); err != nil {
-		fatal(err)
-	}
-
-	if inUserns {
-		options.InUserNS = true
-	}
-
-	if tmpDir, err = ioutil.TempDir("/", "temp-docker-extract"); err != nil {
-		fatal(err)
-	}
-
-	os.Setenv("TMPDIR", tmpDir)
-	size, err := archive.UnpackLayer("/", os.Stdin, options)
-	os.RemoveAll(tmpDir)
-	if err != nil {
-		fatal(err)
-	}
-
-	encoder := json.NewEncoder(os.Stdout)
-	if err := encoder.Encode(applyLayerResponse{size}); err != nil {
-		fatal(fmt.Errorf("unable to encode layerSize JSON: %s", err))
-	}
-
-	if _, err := flush(os.Stdin); err != nil {
-		fatal(err)
-	}
-
-	os.Exit(0)
-}
-
-// applyLayerHandler parses a diff in the standard layer format from `layer`, and
-// applies it to the directory `dest`. Returns the size in bytes of the
-// contents of the layer.
-func applyLayerHandler(dest string, layer io.Reader, options *archive.TarOptions, decompress bool) (size int64, err error) {
-	dest = filepath.Clean(dest)
-	if decompress {
-		decompressed, err := archive.DecompressStream(layer)
-		if err != nil {
-			return 0, err
-		}
-		defer decompressed.Close()
-
-		layer = decompressed
-	}
-	if options == nil {
-		options = &archive.TarOptions{}
-		if rsystem.RunningInUserNS() {
-			options.InUserNS = true
-		}
-	}
-	if options.ExcludePatterns == nil {
-		options.ExcludePatterns = []string{}
-	}
-
-	data, err := json.Marshal(options)
-	if err != nil {
-		return 0, fmt.Errorf("ApplyLayer json encode: %v", err)
-	}
-
-	cmd := reexec.Command("docker-applyLayer", dest)
-	cmd.Stdin = layer
-	cmd.Env = append(cmd.Env, fmt.Sprintf("OPT=%s", data))
-
-	outBuf, errBuf := new(bytes.Buffer), new(bytes.Buffer)
-	cmd.Stdout, cmd.Stderr = outBuf, errBuf
-
-	if err = cmd.Run(); err != nil {
-		return 0, fmt.Errorf("ApplyLayer %s stdout: %s stderr: %s", err, outBuf, errBuf)
-	}
-
-	// Stdout should be a valid JSON struct representing an applyLayerResponse.
-	response := applyLayerResponse{}
-	decoder := json.NewDecoder(outBuf)
-	if err = decoder.Decode(&response); err != nil {
-		return 0, fmt.Errorf("unable to decode ApplyLayer JSON response: %s", err)
-	}
-
-	return response.LayerSize, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_windows.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_windows.go
deleted file mode 100644
index 9dd9988de0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/diff_windows.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package chrootarchive
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/longpath"
-)
-
-// applyLayerHandler parses a diff in the standard layer format from `layer`, and
-// applies it to the directory `dest`. Returns the size in bytes of the
-// contents of the layer.
-func applyLayerHandler(dest string, layer io.Reader, options *archive.TarOptions, decompress bool) (size int64, err error) {
-	dest = filepath.Clean(dest)
-
-	// Ensure it is a Windows-style volume path
-	dest = longpath.AddPrefix(dest)
-
-	if decompress {
-		decompressed, err := archive.DecompressStream(layer)
-		if err != nil {
-			return 0, err
-		}
-		defer decompressed.Close()
-
-		layer = decompressed
-	}
-
-	tmpDir, err := ioutil.TempDir(os.Getenv("temp"), "temp-docker-extract")
-	if err != nil {
-		return 0, fmt.Errorf("ApplyLayer failed to create temp-docker-extract under %s. %s", dest, err)
-	}
-
-	s, err := archive.UnpackLayer(dest, layer, nil)
-	os.RemoveAll(tmpDir)
-	if err != nil {
-		return 0, fmt.Errorf("ApplyLayer %s failed UnpackLayer to %s", err, dest)
-	}
-
-	return s, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_unix.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_unix.go
deleted file mode 100644
index 4f637f17b8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_unix.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build !windows
-
-package chrootarchive
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/docker/docker/pkg/reexec"
-)
-
-func init() {
-	reexec.Register("docker-applyLayer", applyLayer)
-	reexec.Register("docker-untar", untar)
-}
-
-func fatal(err error) {
-	fmt.Fprint(os.Stderr, err)
-	os.Exit(1)
-}
-
-// flush consumes all the bytes from the reader discarding
-// any errors
-func flush(r io.Reader) (bytes int64, err error) {
-	return io.Copy(ioutil.Discard, r)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_windows.go b/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_windows.go
deleted file mode 100644
index fa17c9bf83..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/chrootarchive/init_windows.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package chrootarchive
-
-func init() {
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper.go
deleted file mode 100644
index 94b55306f1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper.go
+++ /dev/null
@@ -1,828 +0,0 @@
-// +build linux
-
-package devicemapper
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-	"syscall"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// DevmapperLogger defines methods for logging with devicemapper.
-type DevmapperLogger interface {
-	DMLog(level int, file string, line int, dmError int, message string)
-}
-
-const (
-	deviceCreate TaskType = iota
-	deviceReload
-	deviceRemove
-	deviceRemoveAll
-	deviceSuspend
-	deviceResume
-	deviceInfo
-	deviceDeps
-	deviceRename
-	deviceVersion
-	deviceStatus
-	deviceTable
-	deviceWaitevent
-	deviceList
-	deviceClear
-	deviceMknodes
-	deviceListVersions
-	deviceTargetMsg
-	deviceSetGeometry
-)
-
-const (
-	addNodeOnResume AddNodeType = iota
-	addNodeOnCreate
-)
-
-// List of errors returned when using devicemapper.
-var (
-	ErrTaskRun              = errors.New("dm_task_run failed")
-	ErrTaskSetName          = errors.New("dm_task_set_name failed")
-	ErrTaskSetMessage       = errors.New("dm_task_set_message failed")
-	ErrTaskSetAddNode       = errors.New("dm_task_set_add_node failed")
-	ErrTaskSetRo            = errors.New("dm_task_set_ro failed")
-	ErrTaskAddTarget        = errors.New("dm_task_add_target failed")
-	ErrTaskSetSector        = errors.New("dm_task_set_sector failed")
-	ErrTaskGetDeps          = errors.New("dm_task_get_deps failed")
-	ErrTaskGetInfo          = errors.New("dm_task_get_info failed")
-	ErrTaskGetDriverVersion = errors.New("dm_task_get_driver_version failed")
-	ErrTaskDeferredRemove   = errors.New("dm_task_deferred_remove failed")
-	ErrTaskSetCookie        = errors.New("dm_task_set_cookie failed")
-	ErrNilCookie            = errors.New("cookie ptr can't be nil")
-	ErrGetBlockSize         = errors.New("Can't get block size")
-	ErrUdevWait             = errors.New("wait on udev cookie failed")
-	ErrSetDevDir            = errors.New("dm_set_dev_dir failed")
-	ErrGetLibraryVersion    = errors.New("dm_get_library_version failed")
-	ErrCreateRemoveTask     = errors.New("Can't create task of type deviceRemove")
-	ErrRunRemoveDevice      = errors.New("running RemoveDevice failed")
-	ErrInvalidAddNode       = errors.New("Invalid AddNode type")
-	ErrBusy                 = errors.New("Device is Busy")
-	ErrDeviceIDExists       = errors.New("Device Id Exists")
-	ErrEnxio                = errors.New("No such device or address")
-)
-
-var (
-	dmSawBusy  bool
-	dmSawExist bool
-	dmSawEnxio bool // No Such Device or Address
-)
-
-type (
-	// Task represents a devicemapper task (like lvcreate, etc.) ; a task is needed for each ioctl
-	// command to execute.
-	Task struct {
-		unmanaged *cdmTask
-	}
-	// Deps represents dependents (layer) of a device.
-	Deps struct {
-		Count  uint32
-		Filler uint32
-		Device []uint64
-	}
-	// Info represents information about a device.
-	Info struct {
-		Exists         int
-		Suspended      int
-		LiveTable      int
-		InactiveTable  int
-		OpenCount      int32
-		EventNr        uint32
-		Major          uint32
-		Minor          uint32
-		ReadOnly       int
-		TargetCount    int32
-		DeferredRemove int
-	}
-	// TaskType represents a type of task
-	TaskType int
-	// AddNodeType represents a type of node to be added
-	AddNodeType int
-)
-
-// DeviceIDExists returns whether error conveys the information about device Id already
-// exist or not. This will be true if device creation or snap creation
-// operation fails if device or snap device already exists in pool.
-// Current implementation is little crude as it scans the error string
-// for exact pattern match. Replacing it with more robust implementation
-// is desirable.
-func DeviceIDExists(err error) bool {
-	return fmt.Sprint(err) == fmt.Sprint(ErrDeviceIDExists)
-}
-
-func (t *Task) destroy() {
-	if t != nil {
-		DmTaskDestroy(t.unmanaged)
-		runtime.SetFinalizer(t, nil)
-	}
-}
-
-// TaskCreateNamed is a convenience function for TaskCreate when a name
-// will be set on the task as well
-func TaskCreateNamed(t TaskType, name string) (*Task, error) {
-	task := TaskCreate(t)
-	if task == nil {
-		return nil, fmt.Errorf("devicemapper: Can't create task of type %d", int(t))
-	}
-	if err := task.setName(name); err != nil {
-		return nil, fmt.Errorf("devicemapper: Can't set task name %s", name)
-	}
-	return task, nil
-}
-
-// TaskCreate initializes a devicemapper task of tasktype
-func TaskCreate(tasktype TaskType) *Task {
-	Ctask := DmTaskCreate(int(tasktype))
-	if Ctask == nil {
-		return nil
-	}
-	task := &Task{unmanaged: Ctask}
-	runtime.SetFinalizer(task, (*Task).destroy)
-	return task
-}
-
-func (t *Task) run() error {
-	if res := DmTaskRun(t.unmanaged); res != 1 {
-		return ErrTaskRun
-	}
-	return nil
-}
-
-func (t *Task) setName(name string) error {
-	if res := DmTaskSetName(t.unmanaged, name); res != 1 {
-		return ErrTaskSetName
-	}
-	return nil
-}
-
-func (t *Task) setMessage(message string) error {
-	if res := DmTaskSetMessage(t.unmanaged, message); res != 1 {
-		return ErrTaskSetMessage
-	}
-	return nil
-}
-
-func (t *Task) setSector(sector uint64) error {
-	if res := DmTaskSetSector(t.unmanaged, sector); res != 1 {
-		return ErrTaskSetSector
-	}
-	return nil
-}
-
-func (t *Task) setCookie(cookie *uint, flags uint16) error {
-	if cookie == nil {
-		return ErrNilCookie
-	}
-	if res := DmTaskSetCookie(t.unmanaged, cookie, flags); res != 1 {
-		return ErrTaskSetCookie
-	}
-	return nil
-}
-
-func (t *Task) setAddNode(addNode AddNodeType) error {
-	if addNode != addNodeOnResume && addNode != addNodeOnCreate {
-		return ErrInvalidAddNode
-	}
-	if res := DmTaskSetAddNode(t.unmanaged, addNode); res != 1 {
-		return ErrTaskSetAddNode
-	}
-	return nil
-}
-
-func (t *Task) setRo() error {
-	if res := DmTaskSetRo(t.unmanaged); res != 1 {
-		return ErrTaskSetRo
-	}
-	return nil
-}
-
-func (t *Task) addTarget(start, size uint64, ttype, params string) error {
-	if res := DmTaskAddTarget(t.unmanaged, start, size,
-		ttype, params); res != 1 {
-		return ErrTaskAddTarget
-	}
-	return nil
-}
-
-func (t *Task) getDeps() (*Deps, error) {
-	var deps *Deps
-	if deps = DmTaskGetDeps(t.unmanaged); deps == nil {
-		return nil, ErrTaskGetDeps
-	}
-	return deps, nil
-}
-
-func (t *Task) getInfo() (*Info, error) {
-	info := &Info{}
-	if res := DmTaskGetInfo(t.unmanaged, info); res != 1 {
-		return nil, ErrTaskGetInfo
-	}
-	return info, nil
-}
-
-func (t *Task) getInfoWithDeferred() (*Info, error) {
-	info := &Info{}
-	if res := DmTaskGetInfoWithDeferred(t.unmanaged, info); res != 1 {
-		return nil, ErrTaskGetInfo
-	}
-	return info, nil
-}
-
-func (t *Task) getDriverVersion() (string, error) {
-	res := DmTaskGetDriverVersion(t.unmanaged)
-	if res == "" {
-		return "", ErrTaskGetDriverVersion
-	}
-	return res, nil
-}
-
-func (t *Task) getNextTarget(next unsafe.Pointer) (nextPtr unsafe.Pointer, start uint64,
-	length uint64, targetType string, params string) {
-
-	return DmGetNextTarget(t.unmanaged, next, &start, &length,
-			&targetType, &params),
-		start, length, targetType, params
-}
-
-// UdevWait waits for any processes that are waiting for udev to complete the specified cookie.
-func UdevWait(cookie *uint) error {
-	if res := DmUdevWait(*cookie); res != 1 {
-		logrus.Debugf("devicemapper: Failed to wait on udev cookie %d", *cookie)
-		return ErrUdevWait
-	}
-	return nil
-}
-
-// LogInitVerbose is an interface to initialize the verbose logger for the device mapper library.
-func LogInitVerbose(level int) {
-	DmLogInitVerbose(level)
-}
-
-var dmLogger DevmapperLogger
-
-// LogInit initializes the logger for the device mapper library.
-func LogInit(logger DevmapperLogger) {
-	dmLogger = logger
-	LogWithErrnoInit()
-}
-
-// SetDevDir sets the dev folder for the device mapper library (usually /dev).
-func SetDevDir(dir string) error {
-	if res := DmSetDevDir(dir); res != 1 {
-		logrus.Debug("devicemapper: Error dm_set_dev_dir")
-		return ErrSetDevDir
-	}
-	return nil
-}
-
-// GetLibraryVersion returns the device mapper library version.
-func GetLibraryVersion() (string, error) {
-	var version string
-	if res := DmGetLibraryVersion(&version); res != 1 {
-		return "", ErrGetLibraryVersion
-	}
-	return version, nil
-}
-
-// UdevSyncSupported returns whether device-mapper is able to sync with udev
-//
-// This is essential otherwise race conditions can arise where both udev and
-// device-mapper attempt to create and destroy devices.
-func UdevSyncSupported() bool {
-	return DmUdevGetSyncSupport() != 0
-}
-
-// UdevSetSyncSupport allows setting whether the udev sync should be enabled.
-// The return bool indicates the state of whether the sync is enabled.
-func UdevSetSyncSupport(enable bool) bool {
-	if enable {
-		DmUdevSetSyncSupport(1)
-	} else {
-		DmUdevSetSyncSupport(0)
-	}
-
-	return UdevSyncSupported()
-}
-
-// CookieSupported returns whether the version of device-mapper supports the
-// use of cookie's in the tasks.
-// This is largely a lower level call that other functions use.
-func CookieSupported() bool {
-	return DmCookieSupported() != 0
-}
-
-// RemoveDevice is a useful helper for cleaning up a device.
-func RemoveDevice(name string) error {
-	task, err := TaskCreateNamed(deviceRemove, name)
-	if task == nil {
-		return err
-	}
-
-	var cookie uint
-	if err := task.setCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("devicemapper: Can not set cookie: %s", err)
-	}
-	defer UdevWait(&cookie)
-
-	dmSawBusy = false // reset before the task is run
-	if err = task.run(); err != nil {
-		if dmSawBusy {
-			return ErrBusy
-		}
-		return fmt.Errorf("devicemapper: Error running RemoveDevice %s", err)
-	}
-
-	return nil
-}
-
-// RemoveDeviceDeferred is a useful helper for cleaning up a device, but deferred.
-func RemoveDeviceDeferred(name string) error {
-	logrus.Debugf("devicemapper: RemoveDeviceDeferred START(%s)", name)
-	defer logrus.Debugf("devicemapper: RemoveDeviceDeferred END(%s)", name)
-	task, err := TaskCreateNamed(deviceRemove, name)
-	if task == nil {
-		return err
-	}
-
-	if err := DmTaskDeferredRemove(task.unmanaged); err != 1 {
-		return ErrTaskDeferredRemove
-	}
-
-	// set a task cookie and disable library fallback, or else libdevmapper will
-	// disable udev dm rules and delete the symlink under /dev/mapper by itself,
-	// even if the removal is deferred by the kernel.
-	var cookie uint
-	var flags uint16
-	flags = DmUdevDisableLibraryFallback
-	if err := task.setCookie(&cookie, flags); err != nil {
-		return fmt.Errorf("devicemapper: Can not set cookie: %s", err)
-	}
-
-	// libdevmapper and udev relies on System V semaphore for synchronization,
-	// semaphores created in `task.setCookie` will be cleaned up in `UdevWait`.
-	// So these two function call must come in pairs, otherwise semaphores will
-	// be leaked, and the  limit of number of semaphores defined in `/proc/sys/kernel/sem`
-	// will be reached, which will eventually make all follwing calls to 'task.SetCookie'
-	// fail.
-	// this call will not wait for the deferred removal's final executing, since no
-	// udev event will be generated, and the semaphore's value will not be incremented
-	// by udev, what UdevWait is just cleaning up the semaphore.
-	defer UdevWait(&cookie)
-
-	if err = task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running RemoveDeviceDeferred %s", err)
-	}
-
-	return nil
-}
-
-// CancelDeferredRemove cancels a deferred remove for a device.
-func CancelDeferredRemove(deviceName string) error {
-	task, err := TaskCreateNamed(deviceTargetMsg, deviceName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.setSector(0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set sector %s", err)
-	}
-
-	if err := task.setMessage(fmt.Sprintf("@cancel_deferred_remove")); err != nil {
-		return fmt.Errorf("devicemapper: Can't set message %s", err)
-	}
-
-	dmSawBusy = false
-	dmSawEnxio = false
-	if err := task.run(); err != nil {
-		// A device might be being deleted already
-		if dmSawBusy {
-			return ErrBusy
-		} else if dmSawEnxio {
-			return ErrEnxio
-		}
-		return fmt.Errorf("devicemapper: Error running CancelDeferredRemove %s", err)
-
-	}
-	return nil
-}
-
-// GetBlockDeviceSize returns the size of a block device identified by the specified file.
-func GetBlockDeviceSize(file *os.File) (uint64, error) {
-	size, err := ioctlBlkGetSize64(file.Fd())
-	if err != nil {
-		logrus.Errorf("devicemapper: Error getblockdevicesize: %s", err)
-		return 0, ErrGetBlockSize
-	}
-	return uint64(size), nil
-}
-
-// BlockDeviceDiscard runs discard for the given path.
-// This is used as a workaround for the kernel not discarding block so
-// on the thin pool when we remove a thinp device, so we do it
-// manually
-func BlockDeviceDiscard(path string) error {
-	file, err := os.OpenFile(path, os.O_RDWR, 0)
-	if err != nil {
-		return err
-	}
-	defer file.Close()
-
-	size, err := GetBlockDeviceSize(file)
-	if err != nil {
-		return err
-	}
-
-	if err := ioctlBlkDiscard(file.Fd(), 0, size); err != nil {
-		return err
-	}
-
-	// Without this sometimes the remove of the device that happens after
-	// discard fails with EBUSY.
-	syscall.Sync()
-
-	return nil
-}
-
-// CreatePool is the programmatic example of "dmsetup create".
-// It creates a device with the specified poolName, data and metadata file and block size.
-func CreatePool(poolName string, dataFile, metadataFile *os.File, poolBlockSize uint32) error {
-	task, err := TaskCreateNamed(deviceCreate, poolName)
-	if task == nil {
-		return err
-	}
-
-	size, err := GetBlockDeviceSize(dataFile)
-	if err != nil {
-		return fmt.Errorf("devicemapper: Can't get data size %s", err)
-	}
-
-	params := fmt.Sprintf("%s %s %d 32768 1 skip_block_zeroing", metadataFile.Name(), dataFile.Name(), poolBlockSize)
-	if err := task.addTarget(0, size/512, "thin-pool", params); err != nil {
-		return fmt.Errorf("devicemapper: Can't add target %s", err)
-	}
-
-	var cookie uint
-	var flags uint16
-	flags = DmUdevDisableSubsystemRulesFlag | DmUdevDisableDiskRulesFlag | DmUdevDisableOtherRulesFlag
-	if err := task.setCookie(&cookie, flags); err != nil {
-		return fmt.Errorf("devicemapper: Can't set cookie %s", err)
-	}
-	defer UdevWait(&cookie)
-
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running deviceCreate (CreatePool) %s", err)
-	}
-
-	return nil
-}
-
-// ReloadPool is the programmatic example of "dmsetup reload".
-// It reloads the table with the specified poolName, data and metadata file and block size.
-func ReloadPool(poolName string, dataFile, metadataFile *os.File, poolBlockSize uint32) error {
-	task, err := TaskCreateNamed(deviceReload, poolName)
-	if task == nil {
-		return err
-	}
-
-	size, err := GetBlockDeviceSize(dataFile)
-	if err != nil {
-		return fmt.Errorf("devicemapper: Can't get data size %s", err)
-	}
-
-	params := fmt.Sprintf("%s %s %d 32768 1 skip_block_zeroing", metadataFile.Name(), dataFile.Name(), poolBlockSize)
-	if err := task.addTarget(0, size/512, "thin-pool", params); err != nil {
-		return fmt.Errorf("devicemapper: Can't add target %s", err)
-	}
-
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running deviceCreate %s", err)
-	}
-
-	return nil
-}
-
-// GetDeps is the programmatic example of "dmsetup deps".
-// It outputs a list of devices referenced by the live table for the specified device.
-func GetDeps(name string) (*Deps, error) {
-	task, err := TaskCreateNamed(deviceDeps, name)
-	if task == nil {
-		return nil, err
-	}
-	if err := task.run(); err != nil {
-		return nil, err
-	}
-	return task.getDeps()
-}
-
-// GetInfo is the programmatic example of "dmsetup info".
-// It outputs some brief information about the device.
-func GetInfo(name string) (*Info, error) {
-	task, err := TaskCreateNamed(deviceInfo, name)
-	if task == nil {
-		return nil, err
-	}
-	if err := task.run(); err != nil {
-		return nil, err
-	}
-	return task.getInfo()
-}
-
-// GetInfoWithDeferred is the programmatic example of "dmsetup info", but deferred.
-// It outputs some brief information about the device.
-func GetInfoWithDeferred(name string) (*Info, error) {
-	task, err := TaskCreateNamed(deviceInfo, name)
-	if task == nil {
-		return nil, err
-	}
-	if err := task.run(); err != nil {
-		return nil, err
-	}
-	return task.getInfoWithDeferred()
-}
-
-// GetDriverVersion is the programmatic example of "dmsetup version".
-// It outputs version information of the driver.
-func GetDriverVersion() (string, error) {
-	task := TaskCreate(deviceVersion)
-	if task == nil {
-		return "", fmt.Errorf("devicemapper: Can't create deviceVersion task")
-	}
-	if err := task.run(); err != nil {
-		return "", err
-	}
-	return task.getDriverVersion()
-}
-
-// GetStatus is the programmatic example of "dmsetup status".
-// It outputs status information for the specified device name.
-func GetStatus(name string) (uint64, uint64, string, string, error) {
-	task, err := TaskCreateNamed(deviceStatus, name)
-	if task == nil {
-		logrus.Debugf("devicemapper: GetStatus() Error TaskCreateNamed: %s", err)
-		return 0, 0, "", "", err
-	}
-	if err := task.run(); err != nil {
-		logrus.Debugf("devicemapper: GetStatus() Error Run: %s", err)
-		return 0, 0, "", "", err
-	}
-
-	devinfo, err := task.getInfo()
-	if err != nil {
-		logrus.Debugf("devicemapper: GetStatus() Error GetInfo: %s", err)
-		return 0, 0, "", "", err
-	}
-	if devinfo.Exists == 0 {
-		logrus.Debugf("devicemapper: GetStatus() Non existing device %s", name)
-		return 0, 0, "", "", fmt.Errorf("devicemapper: Non existing device %s", name)
-	}
-
-	_, start, length, targetType, params := task.getNextTarget(unsafe.Pointer(nil))
-	return start, length, targetType, params, nil
-}
-
-// GetTable is the programmatic example for "dmsetup table".
-// It outputs the current table for the specified device name.
-func GetTable(name string) (uint64, uint64, string, string, error) {
-	task, err := TaskCreateNamed(deviceTable, name)
-	if task == nil {
-		logrus.Debugf("devicemapper: GetTable() Error TaskCreateNamed: %s", err)
-		return 0, 0, "", "", err
-	}
-	if err := task.run(); err != nil {
-		logrus.Debugf("devicemapper: GetTable() Error Run: %s", err)
-		return 0, 0, "", "", err
-	}
-
-	devinfo, err := task.getInfo()
-	if err != nil {
-		logrus.Debugf("devicemapper: GetTable() Error GetInfo: %s", err)
-		return 0, 0, "", "", err
-	}
-	if devinfo.Exists == 0 {
-		logrus.Debugf("devicemapper: GetTable() Non existing device %s", name)
-		return 0, 0, "", "", fmt.Errorf("devicemapper: Non existing device %s", name)
-	}
-
-	_, start, length, targetType, params := task.getNextTarget(unsafe.Pointer(nil))
-	return start, length, targetType, params, nil
-}
-
-// SetTransactionID sets a transaction id for the specified device name.
-func SetTransactionID(poolName string, oldID uint64, newID uint64) error {
-	task, err := TaskCreateNamed(deviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.setSector(0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set sector %s", err)
-	}
-
-	if err := task.setMessage(fmt.Sprintf("set_transaction_id %d %d", oldID, newID)); err != nil {
-		return fmt.Errorf("devicemapper: Can't set message %s", err)
-	}
-
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running SetTransactionID %s", err)
-	}
-	return nil
-}
-
-// SuspendDevice is the programmatic example of "dmsetup suspend".
-// It suspends the specified device.
-func SuspendDevice(name string) error {
-	task, err := TaskCreateNamed(deviceSuspend, name)
-	if task == nil {
-		return err
-	}
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running deviceSuspend %s", err)
-	}
-	return nil
-}
-
-// ResumeDevice is the programmatic example of "dmsetup resume".
-// It un-suspends the specified device.
-func ResumeDevice(name string) error {
-	task, err := TaskCreateNamed(deviceResume, name)
-	if task == nil {
-		return err
-	}
-
-	var cookie uint
-	if err := task.setCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set cookie %s", err)
-	}
-	defer UdevWait(&cookie)
-
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running deviceResume %s", err)
-	}
-
-	return nil
-}
-
-// CreateDevice creates a device with the specified poolName with the specified device id.
-func CreateDevice(poolName string, deviceID int) error {
-	logrus.Debugf("devicemapper: CreateDevice(poolName=%v, deviceID=%v)", poolName, deviceID)
-	task, err := TaskCreateNamed(deviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.setSector(0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set sector %s", err)
-	}
-
-	if err := task.setMessage(fmt.Sprintf("create_thin %d", deviceID)); err != nil {
-		return fmt.Errorf("devicemapper: Can't set message %s", err)
-	}
-
-	dmSawExist = false // reset before the task is run
-	if err := task.run(); err != nil {
-		// Caller wants to know about ErrDeviceIDExists so that it can try with a different device id.
-		if dmSawExist {
-			return ErrDeviceIDExists
-		}
-
-		return fmt.Errorf("devicemapper: Error running CreateDevice %s", err)
-
-	}
-	return nil
-}
-
-// DeleteDevice deletes a device with the specified poolName with the specified device id.
-func DeleteDevice(poolName string, deviceID int) error {
-	task, err := TaskCreateNamed(deviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.setSector(0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set sector %s", err)
-	}
-
-	if err := task.setMessage(fmt.Sprintf("delete %d", deviceID)); err != nil {
-		return fmt.Errorf("devicemapper: Can't set message %s", err)
-	}
-
-	dmSawBusy = false
-	if err := task.run(); err != nil {
-		if dmSawBusy {
-			return ErrBusy
-		}
-		return fmt.Errorf("devicemapper: Error running DeleteDevice %s", err)
-	}
-	return nil
-}
-
-// ActivateDevice activates the device identified by the specified
-// poolName, name and deviceID with the specified size.
-func ActivateDevice(poolName string, name string, deviceID int, size uint64) error {
-	return activateDevice(poolName, name, deviceID, size, "")
-}
-
-// ActivateDeviceWithExternal activates the device identified by the specified
-// poolName, name and deviceID with the specified size.
-func ActivateDeviceWithExternal(poolName string, name string, deviceID int, size uint64, external string) error {
-	return activateDevice(poolName, name, deviceID, size, external)
-}
-
-func activateDevice(poolName string, name string, deviceID int, size uint64, external string) error {
-	task, err := TaskCreateNamed(deviceCreate, name)
-	if task == nil {
-		return err
-	}
-
-	var params string
-	if len(external) > 0 {
-		params = fmt.Sprintf("%s %d %s", poolName, deviceID, external)
-	} else {
-		params = fmt.Sprintf("%s %d", poolName, deviceID)
-	}
-	if err := task.addTarget(0, size/512, "thin", params); err != nil {
-		return fmt.Errorf("devicemapper: Can't add target %s", err)
-	}
-	if err := task.setAddNode(addNodeOnCreate); err != nil {
-		return fmt.Errorf("devicemapper: Can't add node %s", err)
-	}
-
-	var cookie uint
-	if err := task.setCookie(&cookie, 0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set cookie %s", err)
-	}
-
-	defer UdevWait(&cookie)
-
-	if err := task.run(); err != nil {
-		return fmt.Errorf("devicemapper: Error running deviceCreate (ActivateDevice) %s", err)
-	}
-
-	return nil
-}
-
-// CreateSnapDeviceRaw creates a snapshot device. Caller needs to suspend and resume the origin device if it is active.
-func CreateSnapDeviceRaw(poolName string, deviceID int, baseDeviceID int) error {
-	task, err := TaskCreateNamed(deviceTargetMsg, poolName)
-	if task == nil {
-		return err
-	}
-
-	if err := task.setSector(0); err != nil {
-		return fmt.Errorf("devicemapper: Can't set sector %s", err)
-	}
-
-	if err := task.setMessage(fmt.Sprintf("create_snap %d %d", deviceID, baseDeviceID)); err != nil {
-		return fmt.Errorf("devicemapper: Can't set message %s", err)
-	}
-
-	dmSawExist = false // reset before the task is run
-	if err := task.run(); err != nil {
-		// Caller wants to know about ErrDeviceIDExists so that it can try with a different device id.
-		if dmSawExist {
-			return ErrDeviceIDExists
-		}
-		return fmt.Errorf("devicemapper: Error running deviceCreate (createSnapDevice) %s", err)
-	}
-
-	return nil
-}
-
-// CreateSnapDevice creates a snapshot based on the device identified by the baseName and baseDeviceId,
-func CreateSnapDevice(poolName string, deviceID int, baseName string, baseDeviceID int) error {
-	devinfo, _ := GetInfo(baseName)
-	doSuspend := devinfo != nil && devinfo.Exists != 0
-
-	if doSuspend {
-		if err := SuspendDevice(baseName); err != nil {
-			return err
-		}
-	}
-
-	if err := CreateSnapDeviceRaw(poolName, deviceID, baseDeviceID); err != nil {
-		if doSuspend {
-			if err2 := ResumeDevice(baseName); err2 != nil {
-				return fmt.Errorf("CreateSnapDeviceRaw Error: (%v): ResumeDevice Error: (%v)", err, err2)
-			}
-		}
-		return err
-	}
-
-	if doSuspend {
-		if err := ResumeDevice(baseName); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_log.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_log.go
deleted file mode 100644
index 8477e36fec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_log.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build linux
-
-package devicemapper
-
-import "C"
-
-import (
-	"strings"
-)
-
-// Due to the way cgo works this has to be in a separate file, as devmapper.go has
-// definitions in the cgo block, which is incompatible with using "//export"
-
-// DevmapperLogCallback exports the devmapper log callback for cgo.
-//export DevmapperLogCallback
-func DevmapperLogCallback(level C.int, file *C.char, line C.int, dmErrnoOrClass C.int, message *C.char) {
-	msg := C.GoString(message)
-	if level < 7 {
-		if strings.Contains(msg, "busy") {
-			dmSawBusy = true
-		}
-
-		if strings.Contains(msg, "File exists") {
-			dmSawExist = true
-		}
-
-		if strings.Contains(msg, "No such device or address") {
-			dmSawEnxio = true
-		}
-	}
-
-	if dmLogger != nil {
-		dmLogger.DMLog(int(level), C.GoString(file), int(line), int(dmErrnoOrClass), msg)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper.go
deleted file mode 100644
index 91fbc85b3a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper.go
+++ /dev/null
@@ -1,251 +0,0 @@
-// +build linux
-
-package devicemapper
-
-/*
-#cgo LDFLAGS: -L. -ldevmapper
-#include <libdevmapper.h>
-#include <linux/fs.h>   // FIXME: present only for BLKGETSIZE64, maybe we can remove it?
-
-// FIXME: Can't we find a way to do the logging in pure Go?
-extern void DevmapperLogCallback(int level, char *file, int line, int dm_errno_or_class, char *str);
-
-static void	log_cb(int level, const char *file, int line, int dm_errno_or_class, const char *f, ...)
-{
-  char buffer[256];
-  va_list ap;
-
-  va_start(ap, f);
-  vsnprintf(buffer, 256, f, ap);
-  va_end(ap);
-
-  DevmapperLogCallback(level, (char *)file, line, dm_errno_or_class, buffer);
-}
-
-static void	log_with_errno_init()
-{
-  dm_log_with_errno_init(log_cb);
-}
-*/
-import "C"
-
-import (
-	"reflect"
-	"unsafe"
-)
-
-type (
-	cdmTask C.struct_dm_task
-)
-
-// IOCTL consts
-const (
-	BlkGetSize64 = C.BLKGETSIZE64
-	BlkDiscard   = C.BLKDISCARD
-)
-
-// Devicemapper cookie flags.
-const (
-	DmUdevDisableSubsystemRulesFlag = C.DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG
-	DmUdevDisableDiskRulesFlag      = C.DM_UDEV_DISABLE_DISK_RULES_FLAG
-	DmUdevDisableOtherRulesFlag     = C.DM_UDEV_DISABLE_OTHER_RULES_FLAG
-	DmUdevDisableLibraryFallback    = C.DM_UDEV_DISABLE_LIBRARY_FALLBACK
-)
-
-// DeviceMapper mapped functions.
-var (
-	DmGetLibraryVersion       = dmGetLibraryVersionFct
-	DmGetNextTarget           = dmGetNextTargetFct
-	DmLogInitVerbose          = dmLogInitVerboseFct
-	DmSetDevDir               = dmSetDevDirFct
-	DmTaskAddTarget           = dmTaskAddTargetFct
-	DmTaskCreate              = dmTaskCreateFct
-	DmTaskDestroy             = dmTaskDestroyFct
-	DmTaskGetDeps             = dmTaskGetDepsFct
-	DmTaskGetInfo             = dmTaskGetInfoFct
-	DmTaskGetDriverVersion    = dmTaskGetDriverVersionFct
-	DmTaskRun                 = dmTaskRunFct
-	DmTaskSetAddNode          = dmTaskSetAddNodeFct
-	DmTaskSetCookie           = dmTaskSetCookieFct
-	DmTaskSetMessage          = dmTaskSetMessageFct
-	DmTaskSetName             = dmTaskSetNameFct
-	DmTaskSetRo               = dmTaskSetRoFct
-	DmTaskSetSector           = dmTaskSetSectorFct
-	DmUdevWait                = dmUdevWaitFct
-	DmUdevSetSyncSupport      = dmUdevSetSyncSupportFct
-	DmUdevGetSyncSupport      = dmUdevGetSyncSupportFct
-	DmCookieSupported         = dmCookieSupportedFct
-	LogWithErrnoInit          = logWithErrnoInitFct
-	DmTaskDeferredRemove      = dmTaskDeferredRemoveFct
-	DmTaskGetInfoWithDeferred = dmTaskGetInfoWithDeferredFct
-)
-
-func free(p *C.char) {
-	C.free(unsafe.Pointer(p))
-}
-
-func dmTaskDestroyFct(task *cdmTask) {
-	C.dm_task_destroy((*C.struct_dm_task)(task))
-}
-
-func dmTaskCreateFct(taskType int) *cdmTask {
-	return (*cdmTask)(C.dm_task_create(C.int(taskType)))
-}
-
-func dmTaskRunFct(task *cdmTask) int {
-	ret, _ := C.dm_task_run((*C.struct_dm_task)(task))
-	return int(ret)
-}
-
-func dmTaskSetNameFct(task *cdmTask, name string) int {
-	Cname := C.CString(name)
-	defer free(Cname)
-
-	return int(C.dm_task_set_name((*C.struct_dm_task)(task), Cname))
-}
-
-func dmTaskSetMessageFct(task *cdmTask, message string) int {
-	Cmessage := C.CString(message)
-	defer free(Cmessage)
-
-	return int(C.dm_task_set_message((*C.struct_dm_task)(task), Cmessage))
-}
-
-func dmTaskSetSectorFct(task *cdmTask, sector uint64) int {
-	return int(C.dm_task_set_sector((*C.struct_dm_task)(task), C.uint64_t(sector)))
-}
-
-func dmTaskSetCookieFct(task *cdmTask, cookie *uint, flags uint16) int {
-	cCookie := C.uint32_t(*cookie)
-	defer func() {
-		*cookie = uint(cCookie)
-	}()
-	return int(C.dm_task_set_cookie((*C.struct_dm_task)(task), &cCookie, C.uint16_t(flags)))
-}
-
-func dmTaskSetAddNodeFct(task *cdmTask, addNode AddNodeType) int {
-	return int(C.dm_task_set_add_node((*C.struct_dm_task)(task), C.dm_add_node_t(addNode)))
-}
-
-func dmTaskSetRoFct(task *cdmTask) int {
-	return int(C.dm_task_set_ro((*C.struct_dm_task)(task)))
-}
-
-func dmTaskAddTargetFct(task *cdmTask,
-	start, size uint64, ttype, params string) int {
-
-	Cttype := C.CString(ttype)
-	defer free(Cttype)
-
-	Cparams := C.CString(params)
-	defer free(Cparams)
-
-	return int(C.dm_task_add_target((*C.struct_dm_task)(task), C.uint64_t(start), C.uint64_t(size), Cttype, Cparams))
-}
-
-func dmTaskGetDepsFct(task *cdmTask) *Deps {
-	Cdeps := C.dm_task_get_deps((*C.struct_dm_task)(task))
-	if Cdeps == nil {
-		return nil
-	}
-
-	// golang issue: https://github.com/golang/go/issues/11925
-	hdr := reflect.SliceHeader{
-		Data: uintptr(unsafe.Pointer(uintptr(unsafe.Pointer(Cdeps)) + unsafe.Sizeof(*Cdeps))),
-		Len:  int(Cdeps.count),
-		Cap:  int(Cdeps.count),
-	}
-	devices := *(*[]C.uint64_t)(unsafe.Pointer(&hdr))
-
-	deps := &Deps{
-		Count:  uint32(Cdeps.count),
-		Filler: uint32(Cdeps.filler),
-	}
-	for _, device := range devices {
-		deps.Device = append(deps.Device, uint64(device))
-	}
-	return deps
-}
-
-func dmTaskGetInfoFct(task *cdmTask, info *Info) int {
-	Cinfo := C.struct_dm_info{}
-	defer func() {
-		info.Exists = int(Cinfo.exists)
-		info.Suspended = int(Cinfo.suspended)
-		info.LiveTable = int(Cinfo.live_table)
-		info.InactiveTable = int(Cinfo.inactive_table)
-		info.OpenCount = int32(Cinfo.open_count)
-		info.EventNr = uint32(Cinfo.event_nr)
-		info.Major = uint32(Cinfo.major)
-		info.Minor = uint32(Cinfo.minor)
-		info.ReadOnly = int(Cinfo.read_only)
-		info.TargetCount = int32(Cinfo.target_count)
-	}()
-	return int(C.dm_task_get_info((*C.struct_dm_task)(task), &Cinfo))
-}
-
-func dmTaskGetDriverVersionFct(task *cdmTask) string {
-	buffer := C.malloc(128)
-	defer C.free(buffer)
-	res := C.dm_task_get_driver_version((*C.struct_dm_task)(task), (*C.char)(buffer), 128)
-	if res == 0 {
-		return ""
-	}
-	return C.GoString((*C.char)(buffer))
-}
-
-func dmGetNextTargetFct(task *cdmTask, next unsafe.Pointer, start, length *uint64, target, params *string) unsafe.Pointer {
-	var (
-		Cstart, Clength      C.uint64_t
-		CtargetType, Cparams *C.char
-	)
-	defer func() {
-		*start = uint64(Cstart)
-		*length = uint64(Clength)
-		*target = C.GoString(CtargetType)
-		*params = C.GoString(Cparams)
-	}()
-
-	nextp := C.dm_get_next_target((*C.struct_dm_task)(task), next, &Cstart, &Clength, &CtargetType, &Cparams)
-	return nextp
-}
-
-func dmUdevSetSyncSupportFct(syncWithUdev int) {
-	(C.dm_udev_set_sync_support(C.int(syncWithUdev)))
-}
-
-func dmUdevGetSyncSupportFct() int {
-	return int(C.dm_udev_get_sync_support())
-}
-
-func dmUdevWaitFct(cookie uint) int {
-	return int(C.dm_udev_wait(C.uint32_t(cookie)))
-}
-
-func dmCookieSupportedFct() int {
-	return int(C.dm_cookie_supported())
-}
-
-func dmLogInitVerboseFct(level int) {
-	C.dm_log_init_verbose(C.int(level))
-}
-
-func logWithErrnoInitFct() {
-	C.log_with_errno_init()
-}
-
-func dmSetDevDirFct(dir string) int {
-	Cdir := C.CString(dir)
-	defer free(Cdir)
-
-	return int(C.dm_set_dev_dir(Cdir))
-}
-
-func dmGetLibraryVersionFct(version *string) int {
-	buffer := C.CString(string(make([]byte, 128)))
-	defer free(buffer)
-	defer func() {
-		*version = C.GoString(buffer)
-	}()
-	return int(C.dm_get_library_version(buffer, 128))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_deferred_remove.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_deferred_remove.go
deleted file mode 100644
index dc361eab76..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_deferred_remove.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// +build linux,!libdm_no_deferred_remove
-
-package devicemapper
-
-/*
-#cgo LDFLAGS: -L. -ldevmapper
-#include <libdevmapper.h>
-*/
-import "C"
-
-// LibraryDeferredRemovalSupport is supported when statically linked.
-const LibraryDeferredRemovalSupport = true
-
-func dmTaskDeferredRemoveFct(task *cdmTask) int {
-	return int(C.dm_task_deferred_remove((*C.struct_dm_task)(task)))
-}
-
-func dmTaskGetInfoWithDeferredFct(task *cdmTask, info *Info) int {
-	Cinfo := C.struct_dm_info{}
-	defer func() {
-		info.Exists = int(Cinfo.exists)
-		info.Suspended = int(Cinfo.suspended)
-		info.LiveTable = int(Cinfo.live_table)
-		info.InactiveTable = int(Cinfo.inactive_table)
-		info.OpenCount = int32(Cinfo.open_count)
-		info.EventNr = uint32(Cinfo.event_nr)
-		info.Major = uint32(Cinfo.major)
-		info.Minor = uint32(Cinfo.minor)
-		info.ReadOnly = int(Cinfo.read_only)
-		info.TargetCount = int32(Cinfo.target_count)
-		info.DeferredRemove = int(Cinfo.deferred_remove)
-	}()
-	return int(C.dm_task_get_info((*C.struct_dm_task)(task), &Cinfo))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
deleted file mode 100644
index 8249ccf854..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/devmapper_wrapper_no_deferred_remove.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build linux,libdm_no_deferred_remove
-
-package devicemapper
-
-// LibraryDeferredRemovalSupport is not supported when statically linked.
-const LibraryDeferredRemovalSupport = false
-
-func dmTaskDeferredRemoveFct(task *cdmTask) int {
-	// Error. Nobody should be calling it.
-	return -1
-}
-
-func dmTaskGetInfoWithDeferredFct(task *cdmTask, info *Info) int {
-	return -1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/ioctl.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/ioctl.go
deleted file mode 100644
index 581b57eb86..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/ioctl.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build linux
-
-package devicemapper
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func ioctlBlkGetSize64(fd uintptr) (int64, error) {
-	var size int64
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, BlkGetSize64, uintptr(unsafe.Pointer(&size))); err != 0 {
-		return 0, err
-	}
-	return size, nil
-}
-
-func ioctlBlkDiscard(fd uintptr, offset, length uint64) error {
-	var r [2]uint64
-	r[0] = offset
-	r[1] = length
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, BlkDiscard, uintptr(unsafe.Pointer(&r[0]))); err != 0 {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/devicemapper/log.go b/installer/vendor/github.com/docker/docker/pkg/devicemapper/log.go
deleted file mode 100644
index cee5e54549..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/devicemapper/log.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package devicemapper
-
-// definitions from lvm2 lib/log/log.h
-const (
-	LogLevelFatal  = 2 + iota // _LOG_FATAL
-	LogLevelErr               // _LOG_ERR
-	LogLevelWarn              // _LOG_WARN
-	LogLevelNotice            // _LOG_NOTICE
-	LogLevelInfo              // _LOG_INFO
-	LogLevelDebug             // _LOG_DEBUG
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/directory/directory.go b/installer/vendor/github.com/docker/docker/pkg/directory/directory.go
deleted file mode 100644
index 1715ef45d9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/directory/directory.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package directory
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-)
-
-// MoveToSubdir moves all contents of a directory to a subdirectory underneath the original path
-func MoveToSubdir(oldpath, subdir string) error {
-
-	infos, err := ioutil.ReadDir(oldpath)
-	if err != nil {
-		return err
-	}
-	for _, info := range infos {
-		if info.Name() != subdir {
-			oldName := filepath.Join(oldpath, info.Name())
-			newName := filepath.Join(oldpath, subdir, info.Name())
-			if err := os.Rename(oldName, newName); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/directory/directory_test.go b/installer/vendor/github.com/docker/docker/pkg/directory/directory_test.go
deleted file mode 100644
index 2b7a4657be..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/directory/directory_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package directory
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"testing"
-)
-
-// Size of an empty directory should be 0
-func TestSizeEmpty(t *testing.T) {
-	var dir string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "testSizeEmptyDirectory"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-
-	var size int64
-	if size, _ = Size(dir); size != 0 {
-		t.Fatalf("empty directory has size: %d", size)
-	}
-}
-
-// Size of a directory with one empty file should be 0
-func TestSizeEmptyFile(t *testing.T) {
-	var dir string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "testSizeEmptyFile"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-
-	var file *os.File
-	if file, err = ioutil.TempFile(dir, "file"); err != nil {
-		t.Fatalf("failed to create file: %s", err)
-	}
-
-	var size int64
-	if size, _ = Size(file.Name()); size != 0 {
-		t.Fatalf("directory with one file has size: %d", size)
-	}
-}
-
-// Size of a directory with one 5-byte file should be 5
-func TestSizeNonemptyFile(t *testing.T) {
-	var dir string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "testSizeNonemptyFile"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-
-	var file *os.File
-	if file, err = ioutil.TempFile(dir, "file"); err != nil {
-		t.Fatalf("failed to create file: %s", err)
-	}
-
-	d := []byte{97, 98, 99, 100, 101}
-	file.Write(d)
-
-	var size int64
-	if size, _ = Size(file.Name()); size != 5 {
-		t.Fatalf("directory with one 5-byte file has size: %d", size)
-	}
-}
-
-// Size of a directory with one empty directory should be 0
-func TestSizeNestedDirectoryEmpty(t *testing.T) {
-	var dir string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "testSizeNestedDirectoryEmpty"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-	if dir, err = ioutil.TempDir(dir, "nested"); err != nil {
-		t.Fatalf("failed to create nested directory: %s", err)
-	}
-
-	var size int64
-	if size, _ = Size(dir); size != 0 {
-		t.Fatalf("directory with one empty directory has size: %d", size)
-	}
-}
-
-// Test directory with 1 file and 1 empty directory
-func TestSizeFileAndNestedDirectoryEmpty(t *testing.T) {
-	var dir string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "testSizeFileAndNestedDirectoryEmpty"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-	if dir, err = ioutil.TempDir(dir, "nested"); err != nil {
-		t.Fatalf("failed to create nested directory: %s", err)
-	}
-
-	var file *os.File
-	if file, err = ioutil.TempFile(dir, "file"); err != nil {
-		t.Fatalf("failed to create file: %s", err)
-	}
-
-	d := []byte{100, 111, 99, 107, 101, 114}
-	file.Write(d)
-
-	var size int64
-	if size, _ = Size(dir); size != 6 {
-		t.Fatalf("directory with 6-byte file and empty directory has size: %d", size)
-	}
-}
-
-// Test directory with 1 file and 1 non-empty directory
-func TestSizeFileAndNestedDirectoryNonempty(t *testing.T) {
-	var dir, dirNested string
-	var err error
-	if dir, err = ioutil.TempDir(os.TempDir(), "TestSizeFileAndNestedDirectoryNonempty"); err != nil {
-		t.Fatalf("failed to create directory: %s", err)
-	}
-	if dirNested, err = ioutil.TempDir(dir, "nested"); err != nil {
-		t.Fatalf("failed to create nested directory: %s", err)
-	}
-
-	var file *os.File
-	if file, err = ioutil.TempFile(dir, "file"); err != nil {
-		t.Fatalf("failed to create file: %s", err)
-	}
-
-	data := []byte{100, 111, 99, 107, 101, 114}
-	file.Write(data)
-
-	var nestedFile *os.File
-	if nestedFile, err = ioutil.TempFile(dirNested, "file"); err != nil {
-		t.Fatalf("failed to create file in nested directory: %s", err)
-	}
-
-	nestedData := []byte{100, 111, 99, 107, 101, 114}
-	nestedFile.Write(nestedData)
-
-	var size int64
-	if size, _ = Size(dir); size != 12 {
-		t.Fatalf("directory with 6-byte file and nested directory with 6-byte file has size: %d", size)
-	}
-}
-
-// Test migration of directory to a subdir underneath itself
-func TestMoveToSubdir(t *testing.T) {
-	var outerDir, subDir string
-	var err error
-
-	if outerDir, err = ioutil.TempDir(os.TempDir(), "TestMoveToSubdir"); err != nil {
-		t.Fatalf("failed to create directory: %v", err)
-	}
-
-	if subDir, err = ioutil.TempDir(outerDir, "testSub"); err != nil {
-		t.Fatalf("failed to create subdirectory: %v", err)
-	}
-
-	// write 4 temp files in the outer dir to get moved
-	filesList := []string{"a", "b", "c", "d"}
-	for _, fName := range filesList {
-		if file, err := os.Create(filepath.Join(outerDir, fName)); err != nil {
-			t.Fatalf("couldn't create temp file %q: %v", fName, err)
-		} else {
-			file.WriteString(fName)
-			file.Close()
-		}
-	}
-
-	if err = MoveToSubdir(outerDir, filepath.Base(subDir)); err != nil {
-		t.Fatalf("Error during migration of content to subdirectory: %v", err)
-	}
-	// validate that the files were moved to the subdirectory
-	infos, err := ioutil.ReadDir(subDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(infos) != 4 {
-		t.Fatalf("Should be four files in the subdir after the migration: actual length: %d", len(infos))
-	}
-	var results []string
-	for _, info := range infos {
-		results = append(results, info.Name())
-	}
-	sort.Sort(sort.StringSlice(results))
-	if !reflect.DeepEqual(filesList, results) {
-		t.Fatalf("Results after migration do not equal list of files: expected: %v, got: %v", filesList, results)
-	}
-}
-
-// Test a non-existing directory
-func TestSizeNonExistingDirectory(t *testing.T) {
-	if _, err := Size("/thisdirectoryshouldnotexist/TestSizeNonExistingDirectory"); err == nil {
-		t.Fatalf("error is expected")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/directory/directory_unix.go b/installer/vendor/github.com/docker/docker/pkg/directory/directory_unix.go
deleted file mode 100644
index 397251bdb8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/directory/directory_unix.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build linux freebsd solaris
-
-package directory
-
-import (
-	"os"
-	"path/filepath"
-	"syscall"
-)
-
-// Size walks a directory tree and returns its total size in bytes.
-func Size(dir string) (size int64, err error) {
-	data := make(map[uint64]struct{})
-	err = filepath.Walk(dir, func(d string, fileInfo os.FileInfo, err error) error {
-		if err != nil {
-			// if dir does not exist, Size() returns the error.
-			// if dir/x disappeared while walking, Size() ignores dir/x.
-			if os.IsNotExist(err) && d != dir {
-				return nil
-			}
-			return err
-		}
-
-		// Ignore directory sizes
-		if fileInfo == nil {
-			return nil
-		}
-
-		s := fileInfo.Size()
-		if fileInfo.IsDir() || s == 0 {
-			return nil
-		}
-
-		// Check inode to handle hard links correctly
-		inode := fileInfo.Sys().(*syscall.Stat_t).Ino
-		// inode is not a uint64 on all platforms. Cast it to avoid issues.
-		if _, exists := data[uint64(inode)]; exists {
-			return nil
-		}
-		// inode is not a uint64 on all platforms. Cast it to avoid issues.
-		data[uint64(inode)] = struct{}{}
-
-		size += s
-
-		return nil
-	})
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/directory/directory_windows.go b/installer/vendor/github.com/docker/docker/pkg/directory/directory_windows.go
deleted file mode 100644
index 6fb0917c4c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/directory/directory_windows.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build windows
-
-package directory
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// Size walks a directory tree and returns its total size in bytes.
-func Size(dir string) (size int64, err error) {
-	err = filepath.Walk(dir, func(d string, fileInfo os.FileInfo, err error) error {
-		if err != nil {
-			// if dir does not exist, Size() returns the error.
-			// if dir/x disappeared while walking, Size() ignores dir/x.
-			if os.IsNotExist(err) && d != dir {
-				return nil
-			}
-			return err
-		}
-
-		// Ignore directory sizes
-		if fileInfo == nil {
-			return nil
-		}
-
-		s := fileInfo.Size()
-		if fileInfo.IsDir() || s == 0 {
-			return nil
-		}
-
-		size += s
-
-		return nil
-	})
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/README.md b/installer/vendor/github.com/docker/docker/pkg/discovery/README.md
deleted file mode 100644
index 39777c2171..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/README.md
+++ /dev/null
@@ -1,41 +0,0 @@
----
-page_title: Docker discovery
-page_description: discovery
-page_keywords: docker, clustering, discovery
----
-
-# Discovery
-
-Docker comes with multiple Discovery backends.
-
-## Backends
-
-### Using etcd
-
-Point your Docker Engine instances to a common etcd instance. You can specify
-the address Docker uses to advertise the node using the `--cluster-advertise`
-flag.
-
-```bash
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store etcd://<etcd_ip1>,<etcd_ip2>/<path>
-```
-
-### Using consul
-
-Point your Docker Engine instances to a common Consul instance. You can specify
-the address Docker uses to advertise the node using the `--cluster-advertise`
-flag.
-
-```bash
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store consul://<consul_ip>/<path>
-```
-
-### Using zookeeper
-
-Point your Docker Engine instances to a common Zookeeper instance. You can specify
-the address Docker uses to advertise the node using the `--cluster-advertise`
-flag.
-
-```bash
-$ docker daemon -H=<node_ip:2376> --cluster-advertise=<node_ip:2376> --cluster-store zk://<zk_addr1>,<zk_addr2>/<path>
-```
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/backends.go b/installer/vendor/github.com/docker/docker/pkg/discovery/backends.go
deleted file mode 100644
index 2eab550e29..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/backends.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package discovery
-
-import (
-	"fmt"
-	"net"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var (
-	// Backends is a global map of discovery backends indexed by their
-	// associated scheme.
-	backends = make(map[string]Backend)
-)
-
-// Register makes a discovery backend available by the provided scheme.
-// If Register is called twice with the same scheme an error is returned.
-func Register(scheme string, d Backend) error {
-	if _, exists := backends[scheme]; exists {
-		return fmt.Errorf("scheme already registered %s", scheme)
-	}
-	logrus.WithField("name", scheme).Debugf("Registering discovery service")
-	backends[scheme] = d
-	return nil
-}
-
-func parse(rawurl string) (string, string) {
-	parts := strings.SplitN(rawurl, "://", 2)
-
-	// nodes:port,node2:port => nodes://node1:port,node2:port
-	if len(parts) == 1 {
-		return "nodes", parts[0]
-	}
-	return parts[0], parts[1]
-}
-
-// ParseAdvertise parses the --cluster-advertise daemon config which accepts
-// <ip-address>:<port> or <interface-name>:<port>
-func ParseAdvertise(advertise string) (string, error) {
-	var (
-		iface *net.Interface
-		addrs []net.Addr
-		err   error
-	)
-
-	addr, port, err := net.SplitHostPort(advertise)
-
-	if err != nil {
-		return "", fmt.Errorf("invalid --cluster-advertise configuration: %s: %v", advertise, err)
-	}
-
-	ip := net.ParseIP(addr)
-	// If it is a valid ip-address, use it as is
-	if ip != nil {
-		return advertise, nil
-	}
-
-	// If advertise is a valid interface name, get the valid IPv4 address and use it to advertise
-	ifaceName := addr
-	iface, err = net.InterfaceByName(ifaceName)
-	if err != nil {
-		return "", fmt.Errorf("invalid cluster advertise IP address or interface name (%s) : %v", advertise, err)
-	}
-
-	addrs, err = iface.Addrs()
-	if err != nil {
-		return "", fmt.Errorf("unable to get advertise IP address from interface (%s) : %v", advertise, err)
-	}
-
-	if len(addrs) == 0 {
-		return "", fmt.Errorf("no available advertise IP address in interface (%s)", advertise)
-	}
-
-	addr = ""
-	for _, a := range addrs {
-		ip, _, err := net.ParseCIDR(a.String())
-		if err != nil {
-			return "", fmt.Errorf("error deriving advertise ip-address in interface (%s) : %v", advertise, err)
-		}
-		if ip.To4() == nil || ip.IsLoopback() {
-			continue
-		}
-		addr = ip.String()
-		break
-	}
-	if addr == "" {
-		return "", fmt.Errorf("could not find a valid ip-address in interface %s", advertise)
-	}
-
-	addr = net.JoinHostPort(addr, port)
-	return addr, nil
-}
-
-// New returns a new Discovery given a URL, heartbeat and ttl settings.
-// Returns an error if the URL scheme is not supported.
-func New(rawurl string, heartbeat time.Duration, ttl time.Duration, clusterOpts map[string]string) (Backend, error) {
-	scheme, uri := parse(rawurl)
-	if backend, exists := backends[scheme]; exists {
-		logrus.WithFields(logrus.Fields{"name": scheme, "uri": uri}).Debugf("Initializing discovery service")
-		err := backend.Initialize(uri, heartbeat, ttl, clusterOpts)
-		return backend, err
-	}
-
-	return nil, ErrNotSupported
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/discovery.go b/installer/vendor/github.com/docker/docker/pkg/discovery/discovery.go
deleted file mode 100644
index ca7f587458..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/discovery.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package discovery
-
-import (
-	"errors"
-	"time"
-)
-
-var (
-	// ErrNotSupported is returned when a discovery service is not supported.
-	ErrNotSupported = errors.New("discovery service not supported")
-
-	// ErrNotImplemented is returned when discovery feature is not implemented
-	// by discovery backend.
-	ErrNotImplemented = errors.New("not implemented in this discovery service")
-)
-
-// Watcher provides watching over a cluster for nodes joining and leaving.
-type Watcher interface {
-	// Watch the discovery for entry changes.
-	// Returns a channel that will receive changes or an error.
-	// Providing a non-nil stopCh can be used to stop watching.
-	Watch(stopCh <-chan struct{}) (<-chan Entries, <-chan error)
-}
-
-// Backend is implemented by discovery backends which manage cluster entries.
-type Backend interface {
-	// Watcher must be provided by every backend.
-	Watcher
-
-	// Initialize the discovery with URIs, a heartbeat, a ttl and optional settings.
-	Initialize(string, time.Duration, time.Duration, map[string]string) error
-
-	// Register to the discovery.
-	Register(string) error
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/discovery_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/discovery_test.go
deleted file mode 100644
index 6084f3ef0d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/discovery_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-package discovery
-
-import (
-	"testing"
-
-	"github.com/go-check/check"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-type DiscoverySuite struct{}
-
-var _ = check.Suite(&DiscoverySuite{})
-
-func (s *DiscoverySuite) TestNewEntry(c *check.C) {
-	entry, err := NewEntry("127.0.0.1:2375")
-	c.Assert(err, check.IsNil)
-	c.Assert(entry.Equals(&Entry{Host: "127.0.0.1", Port: "2375"}), check.Equals, true)
-	c.Assert(entry.String(), check.Equals, "127.0.0.1:2375")
-
-	entry, err = NewEntry("[2001:db8:0:f101::2]:2375")
-	c.Assert(err, check.IsNil)
-	c.Assert(entry.Equals(&Entry{Host: "2001:db8:0:f101::2", Port: "2375"}), check.Equals, true)
-	c.Assert(entry.String(), check.Equals, "[2001:db8:0:f101::2]:2375")
-
-	_, err = NewEntry("127.0.0.1")
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DiscoverySuite) TestParse(c *check.C) {
-	scheme, uri := parse("127.0.0.1:2375")
-	c.Assert(scheme, check.Equals, "nodes")
-	c.Assert(uri, check.Equals, "127.0.0.1:2375")
-
-	scheme, uri = parse("localhost:2375")
-	c.Assert(scheme, check.Equals, "nodes")
-	c.Assert(uri, check.Equals, "localhost:2375")
-
-	scheme, uri = parse("scheme://127.0.0.1:2375")
-	c.Assert(scheme, check.Equals, "scheme")
-	c.Assert(uri, check.Equals, "127.0.0.1:2375")
-
-	scheme, uri = parse("scheme://localhost:2375")
-	c.Assert(scheme, check.Equals, "scheme")
-	c.Assert(uri, check.Equals, "localhost:2375")
-
-	scheme, uri = parse("")
-	c.Assert(scheme, check.Equals, "nodes")
-	c.Assert(uri, check.Equals, "")
-}
-
-func (s *DiscoverySuite) TestCreateEntries(c *check.C) {
-	entries, err := CreateEntries(nil)
-	c.Assert(entries, check.DeepEquals, Entries{})
-	c.Assert(err, check.IsNil)
-
-	entries, err = CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", "[2001:db8:0:f101::2]:2375", ""})
-	c.Assert(err, check.IsNil)
-	expected := Entries{
-		&Entry{Host: "127.0.0.1", Port: "2375"},
-		&Entry{Host: "127.0.0.2", Port: "2375"},
-		&Entry{Host: "2001:db8:0:f101::2", Port: "2375"},
-	}
-	c.Assert(entries.Equals(expected), check.Equals, true)
-
-	_, err = CreateEntries([]string{"127.0.0.1", "127.0.0.2"})
-	c.Assert(err, check.NotNil)
-}
-
-func (s *DiscoverySuite) TestContainsEntry(c *check.C) {
-	entries, err := CreateEntries([]string{"127.0.0.1:2375", "127.0.0.2:2375", ""})
-	c.Assert(err, check.IsNil)
-	c.Assert(entries.Contains(&Entry{Host: "127.0.0.1", Port: "2375"}), check.Equals, true)
-	c.Assert(entries.Contains(&Entry{Host: "127.0.0.3", Port: "2375"}), check.Equals, false)
-}
-
-func (s *DiscoverySuite) TestEntriesEquality(c *check.C) {
-	entries := Entries{
-		&Entry{Host: "127.0.0.1", Port: "2375"},
-		&Entry{Host: "127.0.0.2", Port: "2375"},
-	}
-
-	// Same
-	c.Assert(entries.Equals(Entries{
-		&Entry{Host: "127.0.0.1", Port: "2375"},
-		&Entry{Host: "127.0.0.2", Port: "2375"},
-	}), check.
-		Equals, true)
-
-	// Different size
-	c.Assert(entries.Equals(Entries{
-		&Entry{Host: "127.0.0.1", Port: "2375"},
-		&Entry{Host: "127.0.0.2", Port: "2375"},
-		&Entry{Host: "127.0.0.3", Port: "2375"},
-	}), check.
-		Equals, false)
-
-	// Different content
-	c.Assert(entries.Equals(Entries{
-		&Entry{Host: "127.0.0.1", Port: "2375"},
-		&Entry{Host: "127.0.0.42", Port: "2375"},
-	}), check.
-		Equals, false)
-
-}
-
-func (s *DiscoverySuite) TestEntriesDiff(c *check.C) {
-	entry1 := &Entry{Host: "1.1.1.1", Port: "1111"}
-	entry2 := &Entry{Host: "2.2.2.2", Port: "2222"}
-	entry3 := &Entry{Host: "3.3.3.3", Port: "3333"}
-	entries := Entries{entry1, entry2}
-
-	// No diff
-	added, removed := entries.Diff(Entries{entry2, entry1})
-	c.Assert(added, check.HasLen, 0)
-	c.Assert(removed, check.HasLen, 0)
-
-	// Add
-	added, removed = entries.Diff(Entries{entry2, entry3, entry1})
-	c.Assert(added, check.HasLen, 1)
-	c.Assert(added.Contains(entry3), check.Equals, true)
-	c.Assert(removed, check.HasLen, 0)
-
-	// Remove
-	added, removed = entries.Diff(Entries{entry2})
-	c.Assert(added, check.HasLen, 0)
-	c.Assert(removed, check.HasLen, 1)
-	c.Assert(removed.Contains(entry1), check.Equals, true)
-
-	// Add and remove
-	added, removed = entries.Diff(Entries{entry1, entry3})
-	c.Assert(added, check.HasLen, 1)
-	c.Assert(added.Contains(entry3), check.Equals, true)
-	c.Assert(removed, check.HasLen, 1)
-	c.Assert(removed.Contains(entry2), check.Equals, true)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/entry.go b/installer/vendor/github.com/docker/docker/pkg/discovery/entry.go
deleted file mode 100644
index ce23bbf89b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/entry.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package discovery
-
-import "net"
-
-// NewEntry creates a new entry.
-func NewEntry(url string) (*Entry, error) {
-	host, port, err := net.SplitHostPort(url)
-	if err != nil {
-		return nil, err
-	}
-	return &Entry{host, port}, nil
-}
-
-// An Entry represents a host.
-type Entry struct {
-	Host string
-	Port string
-}
-
-// Equals returns true if cmp contains the same data.
-func (e *Entry) Equals(cmp *Entry) bool {
-	return e.Host == cmp.Host && e.Port == cmp.Port
-}
-
-// String returns the string form of an entry.
-func (e *Entry) String() string {
-	return net.JoinHostPort(e.Host, e.Port)
-}
-
-// Entries is a list of *Entry with some helpers.
-type Entries []*Entry
-
-// Equals returns true if cmp contains the same data.
-func (e Entries) Equals(cmp Entries) bool {
-	// Check if the file has really changed.
-	if len(e) != len(cmp) {
-		return false
-	}
-	for i := range e {
-		if !e[i].Equals(cmp[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// Contains returns true if the Entries contain a given Entry.
-func (e Entries) Contains(entry *Entry) bool {
-	for _, curr := range e {
-		if curr.Equals(entry) {
-			return true
-		}
-	}
-	return false
-}
-
-// Diff compares two entries and returns the added and removed entries.
-func (e Entries) Diff(cmp Entries) (Entries, Entries) {
-	added := Entries{}
-	for _, entry := range cmp {
-		if !e.Contains(entry) {
-			added = append(added, entry)
-		}
-	}
-
-	removed := Entries{}
-	for _, entry := range e {
-		if !cmp.Contains(entry) {
-			removed = append(removed, entry)
-		}
-	}
-
-	return added, removed
-}
-
-// CreateEntries returns an array of entries based on the given addresses.
-func CreateEntries(addrs []string) (Entries, error) {
-	entries := Entries{}
-	if addrs == nil {
-		return entries, nil
-	}
-
-	for _, addr := range addrs {
-		if len(addr) == 0 {
-			continue
-		}
-		entry, err := NewEntry(addr)
-		if err != nil {
-			return nil, err
-		}
-		entries = append(entries, entry)
-	}
-	return entries, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/file/file.go b/installer/vendor/github.com/docker/docker/pkg/discovery/file/file.go
deleted file mode 100644
index 2b8e27b754..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/file/file.go
+++ /dev/null
@@ -1,107 +0,0 @@
-package file
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/discovery"
-)
-
-// Discovery is exported
-type Discovery struct {
-	heartbeat time.Duration
-	path      string
-}
-
-func init() {
-	Init()
-}
-
-// Init is exported
-func Init() {
-	discovery.Register("file", &Discovery{})
-}
-
-// Initialize is exported
-func (s *Discovery) Initialize(path string, heartbeat time.Duration, ttl time.Duration, _ map[string]string) error {
-	s.path = path
-	s.heartbeat = heartbeat
-	return nil
-}
-
-func parseFileContent(content []byte) []string {
-	var result []string
-	for _, line := range strings.Split(strings.TrimSpace(string(content)), "\n") {
-		line = strings.TrimSpace(line)
-		// Ignoring line starts with #
-		if strings.HasPrefix(line, "#") {
-			continue
-		}
-		// Inlined # comment also ignored.
-		if strings.Contains(line, "#") {
-			line = line[0:strings.Index(line, "#")]
-			// Trim additional spaces caused by above stripping.
-			line = strings.TrimSpace(line)
-		}
-		result = append(result, discovery.Generate(line)...)
-	}
-	return result
-}
-
-func (s *Discovery) fetch() (discovery.Entries, error) {
-	fileContent, err := ioutil.ReadFile(s.path)
-	if err != nil {
-		return nil, fmt.Errorf("failed to read '%s': %v", s.path, err)
-	}
-	return discovery.CreateEntries(parseFileContent(fileContent))
-}
-
-// Watch is exported
-func (s *Discovery) Watch(stopCh <-chan struct{}) (<-chan discovery.Entries, <-chan error) {
-	ch := make(chan discovery.Entries)
-	errCh := make(chan error)
-	ticker := time.NewTicker(s.heartbeat)
-
-	go func() {
-		defer close(errCh)
-		defer close(ch)
-
-		// Send the initial entries if available.
-		currentEntries, err := s.fetch()
-		if err != nil {
-			errCh <- err
-		} else {
-			ch <- currentEntries
-		}
-
-		// Periodically send updates.
-		for {
-			select {
-			case <-ticker.C:
-				newEntries, err := s.fetch()
-				if err != nil {
-					errCh <- err
-					continue
-				}
-
-				// Check if the file has really changed.
-				if !newEntries.Equals(currentEntries) {
-					ch <- newEntries
-				}
-				currentEntries = newEntries
-			case <-stopCh:
-				ticker.Stop()
-				return
-			}
-		}
-	}()
-
-	return ch, errCh
-}
-
-// Register is exported
-func (s *Discovery) Register(addr string) error {
-	return discovery.ErrNotImplemented
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/file/file_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/file/file_test.go
deleted file mode 100644
index 667f00ba0d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/file/file_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package file
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/docker/docker/pkg/discovery"
-
-	"github.com/go-check/check"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-type DiscoverySuite struct{}
-
-var _ = check.Suite(&DiscoverySuite{})
-
-func (s *DiscoverySuite) TestInitialize(c *check.C) {
-	d := &Discovery{}
-	d.Initialize("/path/to/file", 1000, 0, nil)
-	c.Assert(d.path, check.Equals, "/path/to/file")
-}
-
-func (s *DiscoverySuite) TestNew(c *check.C) {
-	d, err := discovery.New("file:///path/to/file", 0, 0, nil)
-	c.Assert(err, check.IsNil)
-	c.Assert(d.(*Discovery).path, check.Equals, "/path/to/file")
-}
-
-func (s *DiscoverySuite) TestContent(c *check.C) {
-	data := `
-1.1.1.[1:2]:1111
-2.2.2.[2:4]:2222
-`
-	ips := parseFileContent([]byte(data))
-	c.Assert(ips, check.HasLen, 5)
-	c.Assert(ips[0], check.Equals, "1.1.1.1:1111")
-	c.Assert(ips[1], check.Equals, "1.1.1.2:1111")
-	c.Assert(ips[2], check.Equals, "2.2.2.2:2222")
-	c.Assert(ips[3], check.Equals, "2.2.2.3:2222")
-	c.Assert(ips[4], check.Equals, "2.2.2.4:2222")
-}
-
-func (s *DiscoverySuite) TestRegister(c *check.C) {
-	discovery := &Discovery{path: "/path/to/file"}
-	c.Assert(discovery.Register("0.0.0.0"), check.NotNil)
-}
-
-func (s *DiscoverySuite) TestParsingContentsWithComments(c *check.C) {
-	data := `
-### test ###
-1.1.1.1:1111 # inline comment
-# 2.2.2.2:2222
-      ### empty line with comment
-    3.3.3.3:3333
-### test ###
-`
-	ips := parseFileContent([]byte(data))
-	c.Assert(ips, check.HasLen, 2)
-	c.Assert("1.1.1.1:1111", check.Equals, ips[0])
-	c.Assert("3.3.3.3:3333", check.Equals, ips[1])
-}
-
-func (s *DiscoverySuite) TestWatch(c *check.C) {
-	data := `
-1.1.1.1:1111
-2.2.2.2:2222
-`
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
-		&discovery.Entry{Host: "2.2.2.2", Port: "2222"},
-	}
-
-	// Create a temporary file and remove it.
-	tmp, err := ioutil.TempFile(os.TempDir(), "discovery-file-test")
-	c.Assert(err, check.IsNil)
-	c.Assert(tmp.Close(), check.IsNil)
-	c.Assert(os.Remove(tmp.Name()), check.IsNil)
-
-	// Set up file discovery.
-	d := &Discovery{}
-	d.Initialize(tmp.Name(), 1000, 0, nil)
-	stopCh := make(chan struct{})
-	ch, errCh := d.Watch(stopCh)
-
-	// Make sure it fires errors since the file doesn't exist.
-	c.Assert(<-errCh, check.NotNil)
-	// We have to drain the error channel otherwise Watch will get stuck.
-	go func() {
-		for range errCh {
-		}
-	}()
-
-	// Write the file and make sure we get the expected value back.
-	c.Assert(ioutil.WriteFile(tmp.Name(), []byte(data), 0600), check.IsNil)
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	// Add a new entry and look it up.
-	expected = append(expected, &discovery.Entry{Host: "3.3.3.3", Port: "3333"})
-	f, err := os.OpenFile(tmp.Name(), os.O_APPEND|os.O_WRONLY, 0600)
-	c.Assert(err, check.IsNil)
-	c.Assert(f, check.NotNil)
-	_, err = f.WriteString("\n3.3.3.3:3333\n")
-	c.Assert(err, check.IsNil)
-	f.Close()
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	// Stop and make sure it closes all channels.
-	close(stopCh)
-	c.Assert(<-ch, check.IsNil)
-	c.Assert(<-errCh, check.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/generator.go b/installer/vendor/github.com/docker/docker/pkg/discovery/generator.go
deleted file mode 100644
index d22298298f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/generator.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package discovery
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-)
-
-// Generate takes care of IP generation
-func Generate(pattern string) []string {
-	re, _ := regexp.Compile(`\[(.+):(.+)\]`)
-	submatch := re.FindStringSubmatch(pattern)
-	if submatch == nil {
-		return []string{pattern}
-	}
-
-	from, err := strconv.Atoi(submatch[1])
-	if err != nil {
-		return []string{pattern}
-	}
-	to, err := strconv.Atoi(submatch[2])
-	if err != nil {
-		return []string{pattern}
-	}
-
-	template := re.ReplaceAllString(pattern, "%d")
-
-	var result []string
-	for val := from; val <= to; val++ {
-		entry := fmt.Sprintf(template, val)
-		result = append(result, entry)
-	}
-
-	return result
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/generator_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/generator_test.go
deleted file mode 100644
index 6281c46665..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/generator_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package discovery
-
-import (
-	"github.com/go-check/check"
-)
-
-func (s *DiscoverySuite) TestGeneratorNotGenerate(c *check.C) {
-	ips := Generate("127.0.0.1")
-	c.Assert(len(ips), check.Equals, 1)
-	c.Assert(ips[0], check.Equals, "127.0.0.1")
-}
-
-func (s *DiscoverySuite) TestGeneratorWithPortNotGenerate(c *check.C) {
-	ips := Generate("127.0.0.1:8080")
-	c.Assert(len(ips), check.Equals, 1)
-	c.Assert(ips[0], check.Equals, "127.0.0.1:8080")
-}
-
-func (s *DiscoverySuite) TestGeneratorMatchFailedNotGenerate(c *check.C) {
-	ips := Generate("127.0.0.[1]")
-	c.Assert(len(ips), check.Equals, 1)
-	c.Assert(ips[0], check.Equals, "127.0.0.[1]")
-}
-
-func (s *DiscoverySuite) TestGeneratorWithPort(c *check.C) {
-	ips := Generate("127.0.0.[1:11]:2375")
-	c.Assert(len(ips), check.Equals, 11)
-	c.Assert(ips[0], check.Equals, "127.0.0.1:2375")
-	c.Assert(ips[1], check.Equals, "127.0.0.2:2375")
-	c.Assert(ips[2], check.Equals, "127.0.0.3:2375")
-	c.Assert(ips[3], check.Equals, "127.0.0.4:2375")
-	c.Assert(ips[4], check.Equals, "127.0.0.5:2375")
-	c.Assert(ips[5], check.Equals, "127.0.0.6:2375")
-	c.Assert(ips[6], check.Equals, "127.0.0.7:2375")
-	c.Assert(ips[7], check.Equals, "127.0.0.8:2375")
-	c.Assert(ips[8], check.Equals, "127.0.0.9:2375")
-	c.Assert(ips[9], check.Equals, "127.0.0.10:2375")
-	c.Assert(ips[10], check.Equals, "127.0.0.11:2375")
-}
-
-func (s *DiscoverySuite) TestGenerateWithMalformedInputAtRangeStart(c *check.C) {
-	malformedInput := "127.0.0.[x:11]:2375"
-	ips := Generate(malformedInput)
-	c.Assert(len(ips), check.Equals, 1)
-	c.Assert(ips[0], check.Equals, malformedInput)
-}
-
-func (s *DiscoverySuite) TestGenerateWithMalformedInputAtRangeEnd(c *check.C) {
-	malformedInput := "127.0.0.[1:x]:2375"
-	ips := Generate(malformedInput)
-	c.Assert(len(ips), check.Equals, 1)
-	c.Assert(ips[0], check.Equals, malformedInput)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv.go b/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv.go
deleted file mode 100644
index 77eee7d454..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package kv
-
-import (
-	"fmt"
-	"path"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/discovery"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/docker/libkv"
-	"github.com/docker/libkv/store"
-	"github.com/docker/libkv/store/consul"
-	"github.com/docker/libkv/store/etcd"
-	"github.com/docker/libkv/store/zookeeper"
-)
-
-const (
-	defaultDiscoveryPath = "docker/nodes"
-)
-
-// Discovery is exported
-type Discovery struct {
-	backend   store.Backend
-	store     store.Store
-	heartbeat time.Duration
-	ttl       time.Duration
-	prefix    string
-	path      string
-}
-
-func init() {
-	Init()
-}
-
-// Init is exported
-func Init() {
-	// Register to libkv
-	zookeeper.Register()
-	consul.Register()
-	etcd.Register()
-
-	// Register to internal discovery service
-	discovery.Register("zk", &Discovery{backend: store.ZK})
-	discovery.Register("consul", &Discovery{backend: store.CONSUL})
-	discovery.Register("etcd", &Discovery{backend: store.ETCD})
-}
-
-// Initialize is exported
-func (s *Discovery) Initialize(uris string, heartbeat time.Duration, ttl time.Duration, clusterOpts map[string]string) error {
-	var (
-		parts = strings.SplitN(uris, "/", 2)
-		addrs = strings.Split(parts[0], ",")
-		err   error
-	)
-
-	// A custom prefix to the path can be optionally used.
-	if len(parts) == 2 {
-		s.prefix = parts[1]
-	}
-
-	s.heartbeat = heartbeat
-	s.ttl = ttl
-
-	// Use a custom path if specified in discovery options
-	dpath := defaultDiscoveryPath
-	if clusterOpts["kv.path"] != "" {
-		dpath = clusterOpts["kv.path"]
-	}
-
-	s.path = path.Join(s.prefix, dpath)
-
-	var config *store.Config
-	if clusterOpts["kv.cacertfile"] != "" && clusterOpts["kv.certfile"] != "" && clusterOpts["kv.keyfile"] != "" {
-		logrus.Info("Initializing discovery with TLS")
-		tlsConfig, err := tlsconfig.Client(tlsconfig.Options{
-			CAFile:   clusterOpts["kv.cacertfile"],
-			CertFile: clusterOpts["kv.certfile"],
-			KeyFile:  clusterOpts["kv.keyfile"],
-		})
-		if err != nil {
-			return err
-		}
-		config = &store.Config{
-			// Set ClientTLS to trigger https (bug in libkv/etcd)
-			ClientTLS: &store.ClientTLSConfig{
-				CACertFile: clusterOpts["kv.cacertfile"],
-				CertFile:   clusterOpts["kv.certfile"],
-				KeyFile:    clusterOpts["kv.keyfile"],
-			},
-			// The actual TLS config that will be used
-			TLS: tlsConfig,
-		}
-	} else {
-		logrus.Info("Initializing discovery without TLS")
-	}
-
-	// Creates a new store, will ignore options given
-	// if not supported by the chosen store
-	s.store, err = libkv.NewStore(s.backend, addrs, config)
-	return err
-}
-
-// Watch the store until either there's a store error or we receive a stop request.
-// Returns false if we shouldn't attempt watching the store anymore (stop request received).
-func (s *Discovery) watchOnce(stopCh <-chan struct{}, watchCh <-chan []*store.KVPair, discoveryCh chan discovery.Entries, errCh chan error) bool {
-	for {
-		select {
-		case pairs := <-watchCh:
-			if pairs == nil {
-				return true
-			}
-
-			logrus.WithField("discovery", s.backend).Debugf("Watch triggered with %d nodes", len(pairs))
-
-			// Convert `KVPair` into `discovery.Entry`.
-			addrs := make([]string, len(pairs))
-			for _, pair := range pairs {
-				addrs = append(addrs, string(pair.Value))
-			}
-
-			entries, err := discovery.CreateEntries(addrs)
-			if err != nil {
-				errCh <- err
-			} else {
-				discoveryCh <- entries
-			}
-		case <-stopCh:
-			// We were requested to stop watching.
-			return false
-		}
-	}
-}
-
-// Watch is exported
-func (s *Discovery) Watch(stopCh <-chan struct{}) (<-chan discovery.Entries, <-chan error) {
-	ch := make(chan discovery.Entries)
-	errCh := make(chan error)
-
-	go func() {
-		defer close(ch)
-		defer close(errCh)
-
-		// Forever: Create a store watch, watch until we get an error and then try again.
-		// Will only stop if we receive a stopCh request.
-		for {
-			// Create the path to watch if it does not exist yet
-			exists, err := s.store.Exists(s.path)
-			if err != nil {
-				errCh <- err
-			}
-			if !exists {
-				if err := s.store.Put(s.path, []byte(""), &store.WriteOptions{IsDir: true}); err != nil {
-					errCh <- err
-				}
-			}
-
-			// Set up a watch.
-			watchCh, err := s.store.WatchTree(s.path, stopCh)
-			if err != nil {
-				errCh <- err
-			} else {
-				if !s.watchOnce(stopCh, watchCh, ch, errCh) {
-					return
-				}
-			}
-
-			// If we get here it means the store watch channel was closed. This
-			// is unexpected so let's retry later.
-			errCh <- fmt.Errorf("Unexpected watch error")
-			time.Sleep(s.heartbeat)
-		}
-	}()
-	return ch, errCh
-}
-
-// Register is exported
-func (s *Discovery) Register(addr string) error {
-	opts := &store.WriteOptions{TTL: s.ttl}
-	return s.store.Put(path.Join(s.path, addr), []byte(addr), opts)
-}
-
-// Store returns the underlying store used by KV discovery.
-func (s *Discovery) Store() store.Store {
-	return s.store
-}
-
-// Prefix returns the store prefix
-func (s *Discovery) Prefix() string {
-	return s.prefix
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv_test.go
deleted file mode 100644
index dab3939dd0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/kv/kv_test.go
+++ /dev/null
@@ -1,324 +0,0 @@
-package kv
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"path"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/discovery"
-	"github.com/docker/libkv"
-	"github.com/docker/libkv/store"
-
-	"github.com/go-check/check"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-type DiscoverySuite struct{}
-
-var _ = check.Suite(&DiscoverySuite{})
-
-func (ds *DiscoverySuite) TestInitialize(c *check.C) {
-	storeMock := &FakeStore{
-		Endpoints: []string{"127.0.0.1"},
-	}
-	d := &Discovery{backend: store.CONSUL}
-	d.Initialize("127.0.0.1", 0, 0, nil)
-	d.store = storeMock
-
-	s := d.store.(*FakeStore)
-	c.Assert(s.Endpoints, check.HasLen, 1)
-	c.Assert(s.Endpoints[0], check.Equals, "127.0.0.1")
-	c.Assert(d.path, check.Equals, defaultDiscoveryPath)
-
-	storeMock = &FakeStore{
-		Endpoints: []string{"127.0.0.1:1234"},
-	}
-	d = &Discovery{backend: store.CONSUL}
-	d.Initialize("127.0.0.1:1234/path", 0, 0, nil)
-	d.store = storeMock
-
-	s = d.store.(*FakeStore)
-	c.Assert(s.Endpoints, check.HasLen, 1)
-	c.Assert(s.Endpoints[0], check.Equals, "127.0.0.1:1234")
-	c.Assert(d.path, check.Equals, "path/"+defaultDiscoveryPath)
-
-	storeMock = &FakeStore{
-		Endpoints: []string{"127.0.0.1:1234", "127.0.0.2:1234", "127.0.0.3:1234"},
-	}
-	d = &Discovery{backend: store.CONSUL}
-	d.Initialize("127.0.0.1:1234,127.0.0.2:1234,127.0.0.3:1234/path", 0, 0, nil)
-	d.store = storeMock
-
-	s = d.store.(*FakeStore)
-	c.Assert(s.Endpoints, check.HasLen, 3)
-	c.Assert(s.Endpoints[0], check.Equals, "127.0.0.1:1234")
-	c.Assert(s.Endpoints[1], check.Equals, "127.0.0.2:1234")
-	c.Assert(s.Endpoints[2], check.Equals, "127.0.0.3:1234")
-
-	c.Assert(d.path, check.Equals, "path/"+defaultDiscoveryPath)
-}
-
-// Extremely limited mock store so we can test initialization
-type Mock struct {
-	// Endpoints passed to InitializeMock
-	Endpoints []string
-
-	// Options passed to InitializeMock
-	Options *store.Config
-}
-
-func NewMock(endpoints []string, options *store.Config) (store.Store, error) {
-	s := &Mock{}
-	s.Endpoints = endpoints
-	s.Options = options
-	return s, nil
-}
-func (s *Mock) Put(key string, value []byte, opts *store.WriteOptions) error {
-	return errors.New("Put not supported")
-}
-func (s *Mock) Get(key string) (*store.KVPair, error) {
-	return nil, errors.New("Get not supported")
-}
-func (s *Mock) Delete(key string) error {
-	return errors.New("Delete not supported")
-}
-
-// Exists mock
-func (s *Mock) Exists(key string) (bool, error) {
-	return false, errors.New("Exists not supported")
-}
-
-// Watch mock
-func (s *Mock) Watch(key string, stopCh <-chan struct{}) (<-chan *store.KVPair, error) {
-	return nil, errors.New("Watch not supported")
-}
-
-// WatchTree mock
-func (s *Mock) WatchTree(prefix string, stopCh <-chan struct{}) (<-chan []*store.KVPair, error) {
-	return nil, errors.New("WatchTree not supported")
-}
-
-// NewLock mock
-func (s *Mock) NewLock(key string, options *store.LockOptions) (store.Locker, error) {
-	return nil, errors.New("NewLock not supported")
-}
-
-// List mock
-func (s *Mock) List(prefix string) ([]*store.KVPair, error) {
-	return nil, errors.New("List not supported")
-}
-
-// DeleteTree mock
-func (s *Mock) DeleteTree(prefix string) error {
-	return errors.New("DeleteTree not supported")
-}
-
-// AtomicPut mock
-func (s *Mock) AtomicPut(key string, value []byte, previous *store.KVPair, opts *store.WriteOptions) (bool, *store.KVPair, error) {
-	return false, nil, errors.New("AtomicPut not supported")
-}
-
-// AtomicDelete mock
-func (s *Mock) AtomicDelete(key string, previous *store.KVPair) (bool, error) {
-	return false, errors.New("AtomicDelete not supported")
-}
-
-// Close mock
-func (s *Mock) Close() {
-	return
-}
-
-func (ds *DiscoverySuite) TestInitializeWithCerts(c *check.C) {
-	cert := `-----BEGIN CERTIFICATE-----
-MIIDCDCCAfKgAwIBAgIICifG7YeiQOEwCwYJKoZIhvcNAQELMBIxEDAOBgNVBAMT
-B1Rlc3QgQ0EwHhcNMTUxMDAxMjMwMDAwWhcNMjAwOTI5MjMwMDAwWjASMRAwDgYD
-VQQDEwdUZXN0IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA1wRC
-O+flnLTK5ImjTurNRHwSejuqGbc4CAvpB0hS+z0QlSs4+zE9h80aC4hz+6caRpds
-+J908Q+RvAittMHbpc7VjbZP72G6fiXk7yPPl6C10HhRSoSi3nY+B7F2E8cuz14q
-V2e+ejhWhSrBb/keyXpcyjoW1BOAAJ2TIclRRkICSCZrpXUyXxAvzXfpFXo1RhSb
-UywN11pfiCQzDUN7sPww9UzFHuAHZHoyfTr27XnJYVUerVYrCPq8vqfn//01qz55
-Xs0hvzGdlTFXhuabFtQnKFH5SNwo/fcznhB7rePOwHojxOpXTBepUCIJLbtNnWFT
-V44t9gh5IqIWtoBReQIDAQABo2YwZDAOBgNVHQ8BAf8EBAMCAAYwEgYDVR0TAQH/
-BAgwBgEB/wIBAjAdBgNVHQ4EFgQUZKUI8IIjIww7X/6hvwggQK4bD24wHwYDVR0j
-BBgwFoAUZKUI8IIjIww7X/6hvwggQK4bD24wCwYJKoZIhvcNAQELA4IBAQDES2cz
-7sCQfDCxCIWH7X8kpi/JWExzUyQEJ0rBzN1m3/x8ySRxtXyGekimBqQwQdFqlwMI
-xzAQKkh3ue8tNSzRbwqMSyH14N1KrSxYS9e9szJHfUasoTpQGPmDmGIoRJuq1h6M
-ej5x1SCJ7GWCR6xEXKUIE9OftXm9TdFzWa7Ja3OHz/mXteii8VXDuZ5ACq6EE5bY
-8sP4gcICfJ5fTrpTlk9FIqEWWQrCGa5wk95PGEj+GJpNogjXQ97wVoo/Y3p1brEn
-t5zjN9PAq4H1fuCMdNNA+p1DHNwd+ELTxcMAnb2ajwHvV6lKPXutrTFc4umJToBX
-FpTxDmJHEV4bzUzh
------END CERTIFICATE-----
-`
-	key := `-----BEGIN RSA PRIVATE KEY-----
-MIIEpQIBAAKCAQEA1wRCO+flnLTK5ImjTurNRHwSejuqGbc4CAvpB0hS+z0QlSs4
-+zE9h80aC4hz+6caRpds+J908Q+RvAittMHbpc7VjbZP72G6fiXk7yPPl6C10HhR
-SoSi3nY+B7F2E8cuz14qV2e+ejhWhSrBb/keyXpcyjoW1BOAAJ2TIclRRkICSCZr
-pXUyXxAvzXfpFXo1RhSbUywN11pfiCQzDUN7sPww9UzFHuAHZHoyfTr27XnJYVUe
-rVYrCPq8vqfn//01qz55Xs0hvzGdlTFXhuabFtQnKFH5SNwo/fcznhB7rePOwHoj
-xOpXTBepUCIJLbtNnWFTV44t9gh5IqIWtoBReQIDAQABAoIBAHSWipORGp/uKFXj
-i/mut776x8ofsAxhnLBARQr93ID+i49W8H7EJGkOfaDjTICYC1dbpGrri61qk8sx
-qX7p3v/5NzKwOIfEpirgwVIqSNYe/ncbxnhxkx6tXtUtFKmEx40JskvSpSYAhmmO
-1XSx0E/PWaEN/nLgX/f1eWJIlxlQkk3QeqL+FGbCXI48DEtlJ9+MzMu4pAwZTpj5
-5qtXo5JJ0jRGfJVPAOznRsYqv864AhMdMIWguzk6EGnbaCWwPcfcn+h9a5LMdony
-MDHfBS7bb5tkF3+AfnVY3IBMVx7YlsD9eAyajlgiKu4zLbwTRHjXgShy+4Oussz0
-ugNGnkECgYEA/hi+McrZC8C4gg6XqK8+9joD8tnyDZDz88BQB7CZqABUSwvjDqlP
-L8hcwo/lzvjBNYGkqaFPUICGWKjeCtd8pPS2DCVXxDQX4aHF1vUur0uYNncJiV3N
-XQz4Iemsa6wnKf6M67b5vMXICw7dw0HZCdIHD1hnhdtDz0uVpeevLZ8CgYEA2KCT
-Y43lorjrbCgMqtlefkr3GJA9dey+hTzCiWEOOqn9RqGoEGUday0sKhiLofOgmN2B
-LEukpKIey8s+Q/cb6lReajDVPDsMweX8i7hz3Wa4Ugp4Xa5BpHqu8qIAE2JUZ7bU
-t88aQAYE58pUF+/Lq1QzAQdrjjzQBx6SrBxieecCgYEAvukoPZEC8mmiN1VvbTX+
-QFHmlZha3QaDxChB+QUe7bMRojEUL/fVnzkTOLuVFqSfxevaI/km9n0ac5KtAchV
-xjp2bTnBb5EUQFqjopYktWA+xO07JRJtMfSEmjZPbbay1kKC7rdTfBm961EIHaRj
-xZUf6M+rOE8964oGrdgdLlECgYEA046GQmx6fh7/82FtdZDRQp9tj3SWQUtSiQZc
-qhO59Lq8mjUXz+MgBuJXxkiwXRpzlbaFB0Bca1fUoYw8o915SrDYf/Zu2OKGQ/qa
-V81sgiVmDuEgycR7YOlbX6OsVUHrUlpwhY3hgfMe6UtkMvhBvHF/WhroBEIJm1pV
-PXZ/CbMCgYEApNWVktFBjOaYfY6SNn4iSts1jgsQbbpglg3kT7PLKjCAhI6lNsbk
-dyT7ut01PL6RaW4SeQWtrJIVQaM6vF3pprMKqlc5XihOGAmVqH7rQx9rtQB5TicL
-BFrwkQE4HQtQBV60hYQUzzlSk44VFDz+jxIEtacRHaomDRh2FtOTz+I=
------END RSA PRIVATE KEY-----
-`
-	certFile, err := ioutil.TempFile("", "cert")
-	c.Assert(err, check.IsNil)
-	defer os.Remove(certFile.Name())
-	certFile.Write([]byte(cert))
-	certFile.Close()
-	keyFile, err := ioutil.TempFile("", "key")
-	c.Assert(err, check.IsNil)
-	defer os.Remove(keyFile.Name())
-	keyFile.Write([]byte(key))
-	keyFile.Close()
-
-	libkv.AddStore("mock", NewMock)
-	d := &Discovery{backend: "mock"}
-	err = d.Initialize("127.0.0.3:1234", 0, 0, map[string]string{
-		"kv.cacertfile": certFile.Name(),
-		"kv.certfile":   certFile.Name(),
-		"kv.keyfile":    keyFile.Name(),
-	})
-	c.Assert(err, check.IsNil)
-	s := d.store.(*Mock)
-	c.Assert(s.Options.TLS, check.NotNil)
-	c.Assert(s.Options.TLS.RootCAs, check.NotNil)
-	c.Assert(s.Options.TLS.Certificates, check.HasLen, 1)
-}
-
-func (ds *DiscoverySuite) TestWatch(c *check.C) {
-	mockCh := make(chan []*store.KVPair)
-
-	storeMock := &FakeStore{
-		Endpoints:  []string{"127.0.0.1:1234"},
-		mockKVChan: mockCh,
-	}
-
-	d := &Discovery{backend: store.CONSUL}
-	d.Initialize("127.0.0.1:1234/path", 0, 0, nil)
-	d.store = storeMock
-
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
-		&discovery.Entry{Host: "2.2.2.2", Port: "2222"},
-	}
-	kvs := []*store.KVPair{
-		{Key: path.Join("path", defaultDiscoveryPath, "1.1.1.1"), Value: []byte("1.1.1.1:1111")},
-		{Key: path.Join("path", defaultDiscoveryPath, "2.2.2.2"), Value: []byte("2.2.2.2:2222")},
-	}
-
-	stopCh := make(chan struct{})
-	ch, errCh := d.Watch(stopCh)
-
-	// It should fire an error since the first WatchTree call failed.
-	c.Assert(<-errCh, check.ErrorMatches, "test error")
-	// We have to drain the error channel otherwise Watch will get stuck.
-	go func() {
-		for range errCh {
-		}
-	}()
-
-	// Push the entries into the store channel and make sure discovery emits.
-	mockCh <- kvs
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	// Add a new entry.
-	expected = append(expected, &discovery.Entry{Host: "3.3.3.3", Port: "3333"})
-	kvs = append(kvs, &store.KVPair{Key: path.Join("path", defaultDiscoveryPath, "3.3.3.3"), Value: []byte("3.3.3.3:3333")})
-	mockCh <- kvs
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	close(mockCh)
-	// Give it enough time to call WatchTree.
-	time.Sleep(3 * time.Second)
-
-	// Stop and make sure it closes all channels.
-	close(stopCh)
-	c.Assert(<-ch, check.IsNil)
-	c.Assert(<-errCh, check.IsNil)
-}
-
-// FakeStore implements store.Store methods. It mocks all store
-// function in a simple, naive way.
-type FakeStore struct {
-	Endpoints  []string
-	Options    *store.Config
-	mockKVChan <-chan []*store.KVPair
-
-	watchTreeCallCount int
-}
-
-func (s *FakeStore) Put(key string, value []byte, options *store.WriteOptions) error {
-	return nil
-}
-
-func (s *FakeStore) Get(key string) (*store.KVPair, error) {
-	return nil, nil
-}
-
-func (s *FakeStore) Delete(key string) error {
-	return nil
-}
-
-func (s *FakeStore) Exists(key string) (bool, error) {
-	return true, nil
-}
-
-func (s *FakeStore) Watch(key string, stopCh <-chan struct{}) (<-chan *store.KVPair, error) {
-	return nil, nil
-}
-
-// WatchTree will fail the first time, and return the mockKVchan afterwards.
-// This is the behavior we need for testing.. If we need 'moar', should update this.
-func (s *FakeStore) WatchTree(directory string, stopCh <-chan struct{}) (<-chan []*store.KVPair, error) {
-	if s.watchTreeCallCount == 0 {
-		s.watchTreeCallCount = 1
-		return nil, errors.New("test error")
-	}
-	// First calls error
-	return s.mockKVChan, nil
-}
-
-func (s *FakeStore) NewLock(key string, options *store.LockOptions) (store.Locker, error) {
-	return nil, nil
-}
-
-func (s *FakeStore) List(directory string) ([]*store.KVPair, error) {
-	return []*store.KVPair{}, nil
-}
-
-func (s *FakeStore) DeleteTree(directory string) error {
-	return nil
-}
-
-func (s *FakeStore) AtomicPut(key string, value []byte, previous *store.KVPair, options *store.WriteOptions) (bool, *store.KVPair, error) {
-	return true, nil, nil
-}
-
-func (s *FakeStore) AtomicDelete(key string, previous *store.KVPair) (bool, error) {
-	return true, nil
-}
-
-func (s *FakeStore) Close() {
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory.go b/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory.go
deleted file mode 100644
index ba8b1f55f3..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package memory
-
-import (
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/discovery"
-)
-
-// Discovery implements a discovery backend that keeps
-// data in memory.
-type Discovery struct {
-	heartbeat time.Duration
-	values    []string
-	mu        sync.Mutex
-}
-
-func init() {
-	Init()
-}
-
-// Init registers the memory backend on demand.
-func Init() {
-	discovery.Register("memory", &Discovery{})
-}
-
-// Initialize sets the heartbeat for the memory backend.
-func (s *Discovery) Initialize(_ string, heartbeat time.Duration, _ time.Duration, _ map[string]string) error {
-	s.heartbeat = heartbeat
-	s.values = make([]string, 0)
-	return nil
-}
-
-// Watch sends periodic discovery updates to a channel.
-func (s *Discovery) Watch(stopCh <-chan struct{}) (<-chan discovery.Entries, <-chan error) {
-	ch := make(chan discovery.Entries)
-	errCh := make(chan error)
-	ticker := time.NewTicker(s.heartbeat)
-
-	go func() {
-		defer close(errCh)
-		defer close(ch)
-
-		// Send the initial entries if available.
-		var currentEntries discovery.Entries
-		var err error
-
-		s.mu.Lock()
-		if len(s.values) > 0 {
-			currentEntries, err = discovery.CreateEntries(s.values)
-		}
-		s.mu.Unlock()
-
-		if err != nil {
-			errCh <- err
-		} else if currentEntries != nil {
-			ch <- currentEntries
-		}
-
-		// Periodically send updates.
-		for {
-			select {
-			case <-ticker.C:
-				s.mu.Lock()
-				newEntries, err := discovery.CreateEntries(s.values)
-				s.mu.Unlock()
-				if err != nil {
-					errCh <- err
-					continue
-				}
-
-				// Check if the file has really changed.
-				if !newEntries.Equals(currentEntries) {
-					ch <- newEntries
-				}
-				currentEntries = newEntries
-			case <-stopCh:
-				ticker.Stop()
-				return
-			}
-		}
-	}()
-
-	return ch, errCh
-}
-
-// Register adds a new address to the discovery.
-func (s *Discovery) Register(addr string) error {
-	s.mu.Lock()
-	s.values = append(s.values, addr)
-	s.mu.Unlock()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory_test.go
deleted file mode 100644
index c2da0a068e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/memory/memory_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package memory
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/discovery"
-	"github.com/go-check/check"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-type discoverySuite struct{}
-
-var _ = check.Suite(&discoverySuite{})
-
-func (s *discoverySuite) TestWatch(c *check.C) {
-	d := &Discovery{}
-	d.Initialize("foo", 1000, 0, nil)
-	stopCh := make(chan struct{})
-	ch, errCh := d.Watch(stopCh)
-
-	// We have to drain the error channel otherwise Watch will get stuck.
-	go func() {
-		for range errCh {
-		}
-	}()
-
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
-	}
-
-	c.Assert(d.Register("1.1.1.1:1111"), check.IsNil)
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	expected = discovery.Entries{
-		&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
-		&discovery.Entry{Host: "2.2.2.2", Port: "2222"},
-	}
-
-	c.Assert(d.Register("2.2.2.2:2222"), check.IsNil)
-	c.Assert(<-ch, check.DeepEquals, expected)
-
-	// Stop and make sure it closes all channels.
-	close(stopCh)
-	c.Assert(<-ch, check.IsNil)
-	c.Assert(<-errCh, check.IsNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes.go b/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes.go
deleted file mode 100644
index c0e3c07b22..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package nodes
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/discovery"
-)
-
-// Discovery is exported
-type Discovery struct {
-	entries discovery.Entries
-}
-
-func init() {
-	Init()
-}
-
-// Init is exported
-func Init() {
-	discovery.Register("nodes", &Discovery{})
-}
-
-// Initialize is exported
-func (s *Discovery) Initialize(uris string, _ time.Duration, _ time.Duration, _ map[string]string) error {
-	for _, input := range strings.Split(uris, ",") {
-		for _, ip := range discovery.Generate(input) {
-			entry, err := discovery.NewEntry(ip)
-			if err != nil {
-				return fmt.Errorf("%s, please check you are using the correct discovery (missing token:// ?)", err.Error())
-			}
-			s.entries = append(s.entries, entry)
-		}
-	}
-
-	return nil
-}
-
-// Watch is exported
-func (s *Discovery) Watch(stopCh <-chan struct{}) (<-chan discovery.Entries, <-chan error) {
-	ch := make(chan discovery.Entries)
-	go func() {
-		defer close(ch)
-		ch <- s.entries
-		<-stopCh
-	}()
-	return ch, nil
-}
-
-// Register is exported
-func (s *Discovery) Register(addr string) error {
-	return discovery.ErrNotImplemented
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes_test.go b/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes_test.go
deleted file mode 100644
index e26568cf54..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/discovery/nodes/nodes_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-package nodes
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/discovery"
-
-	"github.com/go-check/check"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-type DiscoverySuite struct{}
-
-var _ = check.Suite(&DiscoverySuite{})
-
-func (s *DiscoverySuite) TestInitialize(c *check.C) {
-	d := &Discovery{}
-	d.Initialize("1.1.1.1:1111,2.2.2.2:2222", 0, 0, nil)
-	c.Assert(len(d.entries), check.Equals, 2)
-	c.Assert(d.entries[0].String(), check.Equals, "1.1.1.1:1111")
-	c.Assert(d.entries[1].String(), check.Equals, "2.2.2.2:2222")
-}
-
-func (s *DiscoverySuite) TestInitializeWithPattern(c *check.C) {
-	d := &Discovery{}
-	d.Initialize("1.1.1.[1:2]:1111,2.2.2.[2:4]:2222", 0, 0, nil)
-	c.Assert(len(d.entries), check.Equals, 5)
-	c.Assert(d.entries[0].String(), check.Equals, "1.1.1.1:1111")
-	c.Assert(d.entries[1].String(), check.Equals, "1.1.1.2:1111")
-	c.Assert(d.entries[2].String(), check.Equals, "2.2.2.2:2222")
-	c.Assert(d.entries[3].String(), check.Equals, "2.2.2.3:2222")
-	c.Assert(d.entries[4].String(), check.Equals, "2.2.2.4:2222")
-}
-
-func (s *DiscoverySuite) TestWatch(c *check.C) {
-	d := &Discovery{}
-	d.Initialize("1.1.1.1:1111,2.2.2.2:2222", 0, 0, nil)
-	expected := discovery.Entries{
-		&discovery.Entry{Host: "1.1.1.1", Port: "1111"},
-		&discovery.Entry{Host: "2.2.2.2", Port: "2222"},
-	}
-	ch, _ := d.Watch(nil)
-	c.Assert(expected.Equals(<-ch), check.Equals, true)
-}
-
-func (s *DiscoverySuite) TestRegister(c *check.C) {
-	d := &Discovery{}
-	c.Assert(d.Register("0.0.0.0"), check.NotNil)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/filenotify/filenotify.go b/installer/vendor/github.com/docker/docker/pkg/filenotify/filenotify.go
deleted file mode 100644
index 7a81cbda95..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/filenotify/filenotify.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Package filenotify provides a mechanism for watching file(s) for changes.
-// Generally leans on fsnotify, but provides a poll-based notifier which fsnotify does not support.
-// These are wrapped up in a common interface so that either can be used interchangeably in your code.
-package filenotify
-
-import "github.com/fsnotify/fsnotify"
-
-// FileWatcher is an interface for implementing file notification watchers
-type FileWatcher interface {
-	Events() <-chan fsnotify.Event
-	Errors() <-chan error
-	Add(name string) error
-	Remove(name string) error
-	Close() error
-}
-
-// New tries to use an fs-event watcher, and falls back to the poller if there is an error
-func New() (FileWatcher, error) {
-	if watcher, err := NewEventWatcher(); err == nil {
-		return watcher, nil
-	}
-	return NewPollingWatcher(), nil
-}
-
-// NewPollingWatcher returns a poll-based file watcher
-func NewPollingWatcher() FileWatcher {
-	return &filePoller{
-		events: make(chan fsnotify.Event),
-		errors: make(chan error),
-	}
-}
-
-// NewEventWatcher returns an fs-event based file watcher
-func NewEventWatcher() (FileWatcher, error) {
-	watcher, err := fsnotify.NewWatcher()
-	if err != nil {
-		return nil, err
-	}
-	return &fsNotifyWatcher{watcher}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/filenotify/fsnotify.go b/installer/vendor/github.com/docker/docker/pkg/filenotify/fsnotify.go
deleted file mode 100644
index 5d08a997a0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/filenotify/fsnotify.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package filenotify
-
-import "github.com/fsnotify/fsnotify"
-
-// fsNotifyWatcher wraps the fsnotify package to satisfy the FileNotifer interface
-type fsNotifyWatcher struct {
-	*fsnotify.Watcher
-}
-
-// Events returns the fsnotify event channel receiver
-func (w *fsNotifyWatcher) Events() <-chan fsnotify.Event {
-	return w.Watcher.Events
-}
-
-// Errors returns the fsnotify error channel receiver
-func (w *fsNotifyWatcher) Errors() <-chan error {
-	return w.Watcher.Errors
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/filenotify/poller.go b/installer/vendor/github.com/docker/docker/pkg/filenotify/poller.go
deleted file mode 100644
index dc5ccd0f7f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/filenotify/poller.go
+++ /dev/null
@@ -1,204 +0,0 @@
-package filenotify
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/fsnotify/fsnotify"
-)
-
-var (
-	// errPollerClosed is returned when the poller is closed
-	errPollerClosed = errors.New("poller is closed")
-	// errNoSuchPoller is returned when trying to remove a watch that doesn't exist
-	errNoSuchWatch = errors.New("poller does not exist")
-)
-
-// watchWaitTime is the time to wait between file poll loops
-const watchWaitTime = 200 * time.Millisecond
-
-// filePoller is used to poll files for changes, especially in cases where fsnotify
-// can't be run (e.g. when inotify handles are exhausted)
-// filePoller satisfies the FileWatcher interface
-type filePoller struct {
-	// watches is the list of files currently being polled, close the associated channel to stop the watch
-	watches map[string]chan struct{}
-	// events is the channel to listen to for watch events
-	events chan fsnotify.Event
-	// errors is the channel to listen to for watch errors
-	errors chan error
-	// mu locks the poller for modification
-	mu sync.Mutex
-	// closed is used to specify when the poller has already closed
-	closed bool
-}
-
-// Add adds a filename to the list of watches
-// once added the file is polled for changes in a separate goroutine
-func (w *filePoller) Add(name string) error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-
-	if w.closed == true {
-		return errPollerClosed
-	}
-
-	f, err := os.Open(name)
-	if err != nil {
-		return err
-	}
-	fi, err := os.Stat(name)
-	if err != nil {
-		return err
-	}
-
-	if w.watches == nil {
-		w.watches = make(map[string]chan struct{})
-	}
-	if _, exists := w.watches[name]; exists {
-		return fmt.Errorf("watch exists")
-	}
-	chClose := make(chan struct{})
-	w.watches[name] = chClose
-
-	go w.watch(f, fi, chClose)
-	return nil
-}
-
-// Remove stops and removes watch with the specified name
-func (w *filePoller) Remove(name string) error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.remove(name)
-}
-
-func (w *filePoller) remove(name string) error {
-	if w.closed == true {
-		return errPollerClosed
-	}
-
-	chClose, exists := w.watches[name]
-	if !exists {
-		return errNoSuchWatch
-	}
-	close(chClose)
-	delete(w.watches, name)
-	return nil
-}
-
-// Events returns the event channel
-// This is used for notifications on events about watched files
-func (w *filePoller) Events() <-chan fsnotify.Event {
-	return w.events
-}
-
-// Errors returns the errors channel
-// This is used for notifications about errors on watched files
-func (w *filePoller) Errors() <-chan error {
-	return w.errors
-}
-
-// Close closes the poller
-// All watches are stopped, removed, and the poller cannot be added to
-func (w *filePoller) Close() error {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-
-	if w.closed {
-		return nil
-	}
-
-	w.closed = true
-	for name := range w.watches {
-		w.remove(name)
-		delete(w.watches, name)
-	}
-	return nil
-}
-
-// sendEvent publishes the specified event to the events channel
-func (w *filePoller) sendEvent(e fsnotify.Event, chClose <-chan struct{}) error {
-	select {
-	case w.events <- e:
-	case <-chClose:
-		return fmt.Errorf("closed")
-	}
-	return nil
-}
-
-// sendErr publishes the specified error to the errors channel
-func (w *filePoller) sendErr(e error, chClose <-chan struct{}) error {
-	select {
-	case w.errors <- e:
-	case <-chClose:
-		return fmt.Errorf("closed")
-	}
-	return nil
-}
-
-// watch is responsible for polling the specified file for changes
-// upon finding changes to a file or errors, sendEvent/sendErr is called
-func (w *filePoller) watch(f *os.File, lastFi os.FileInfo, chClose chan struct{}) {
-	defer f.Close()
-	for {
-		time.Sleep(watchWaitTime)
-		select {
-		case <-chClose:
-			logrus.Debugf("watch for %s closed", f.Name())
-			return
-		default:
-		}
-
-		fi, err := os.Stat(f.Name())
-		if err != nil {
-			// if we got an error here and lastFi is not set, we can presume that nothing has changed
-			// This should be safe since before `watch()` is called, a stat is performed, there is any error `watch` is not called
-			if lastFi == nil {
-				continue
-			}
-			// If it doesn't exist at this point, it must have been removed
-			// no need to send the error here since this is a valid operation
-			if os.IsNotExist(err) {
-				if err := w.sendEvent(fsnotify.Event{Op: fsnotify.Remove, Name: f.Name()}, chClose); err != nil {
-					return
-				}
-				lastFi = nil
-				continue
-			}
-			// at this point, send the error
-			if err := w.sendErr(err, chClose); err != nil {
-				return
-			}
-			continue
-		}
-
-		if lastFi == nil {
-			if err := w.sendEvent(fsnotify.Event{Op: fsnotify.Create, Name: fi.Name()}, chClose); err != nil {
-				return
-			}
-			lastFi = fi
-			continue
-		}
-
-		if fi.Mode() != lastFi.Mode() {
-			if err := w.sendEvent(fsnotify.Event{Op: fsnotify.Chmod, Name: fi.Name()}, chClose); err != nil {
-				return
-			}
-			lastFi = fi
-			continue
-		}
-
-		if fi.ModTime() != lastFi.ModTime() || fi.Size() != lastFi.Size() {
-			if err := w.sendEvent(fsnotify.Event{Op: fsnotify.Write, Name: fi.Name()}, chClose); err != nil {
-				return
-			}
-			lastFi = fi
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/filenotify/poller_test.go b/installer/vendor/github.com/docker/docker/pkg/filenotify/poller_test.go
deleted file mode 100644
index b4c7825112..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/filenotify/poller_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package filenotify
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"github.com/fsnotify/fsnotify"
-)
-
-func TestPollerAddRemove(t *testing.T) {
-	w := NewPollingWatcher()
-
-	if err := w.Add("no-such-file"); err == nil {
-		t.Fatal("should have gotten error when adding a non-existent file")
-	}
-	if err := w.Remove("no-such-file"); err == nil {
-		t.Fatal("should have gotten error when removing non-existent watch")
-	}
-
-	f, err := ioutil.TempFile("", "asdf")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(f.Name())
-
-	if err := w.Add(f.Name()); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := w.Remove(f.Name()); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPollerEvent(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("No chmod on Windows")
-	}
-	w := NewPollingWatcher()
-
-	f, err := ioutil.TempFile("", "test-poller")
-	if err != nil {
-		t.Fatal("error creating temp file")
-	}
-	defer os.RemoveAll(f.Name())
-	f.Close()
-
-	if err := w.Add(f.Name()); err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-w.Events():
-		t.Fatal("got event before anything happened")
-	case <-w.Errors():
-		t.Fatal("got error before anything happened")
-	default:
-	}
-
-	if err := ioutil.WriteFile(f.Name(), []byte("hello"), 644); err != nil {
-		t.Fatal(err)
-	}
-	if err := assertEvent(w, fsnotify.Write); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Chmod(f.Name(), 600); err != nil {
-		t.Fatal(err)
-	}
-	if err := assertEvent(w, fsnotify.Chmod); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := os.Remove(f.Name()); err != nil {
-		t.Fatal(err)
-	}
-	if err := assertEvent(w, fsnotify.Remove); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPollerClose(t *testing.T) {
-	w := NewPollingWatcher()
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-	// test double-close
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	f, err := ioutil.TempFile("", "asdf")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(f.Name())
-	if err := w.Add(f.Name()); err == nil {
-		t.Fatal("should have gotten error adding watch for closed watcher")
-	}
-}
-
-func assertEvent(w FileWatcher, eType fsnotify.Op) error {
-	var err error
-	select {
-	case e := <-w.Events():
-		if e.Op != eType {
-			err = fmt.Errorf("got wrong event type, expected %q: %v", eType, e)
-		}
-	case e := <-w.Errors():
-		err = fmt.Errorf("got unexpected error waiting for events %v: %v", eType, e)
-	case <-time.After(watchWaitTime * 3):
-		err = fmt.Errorf("timeout waiting for event %v", eType)
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils.go
deleted file mode 100644
index c63ae75ce8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils.go
+++ /dev/null
@@ -1,283 +0,0 @@
-package fileutils
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"text/scanner"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// exclusion returns true if the specified pattern is an exclusion
-func exclusion(pattern string) bool {
-	return pattern[0] == '!'
-}
-
-// empty returns true if the specified pattern is empty
-func empty(pattern string) bool {
-	return pattern == ""
-}
-
-// CleanPatterns takes a slice of patterns returns a new
-// slice of patterns cleaned with filepath.Clean, stripped
-// of any empty patterns and lets the caller know whether the
-// slice contains any exception patterns (prefixed with !).
-func CleanPatterns(patterns []string) ([]string, [][]string, bool, error) {
-	// Loop over exclusion patterns and:
-	// 1. Clean them up.
-	// 2. Indicate whether we are dealing with any exception rules.
-	// 3. Error if we see a single exclusion marker on its own (!).
-	cleanedPatterns := []string{}
-	patternDirs := [][]string{}
-	exceptions := false
-	for _, pattern := range patterns {
-		// Eliminate leading and trailing whitespace.
-		pattern = strings.TrimSpace(pattern)
-		if empty(pattern) {
-			continue
-		}
-		if exclusion(pattern) {
-			if len(pattern) == 1 {
-				return nil, nil, false, errors.New("Illegal exclusion pattern: !")
-			}
-			exceptions = true
-		}
-		pattern = filepath.Clean(pattern)
-		cleanedPatterns = append(cleanedPatterns, pattern)
-		if exclusion(pattern) {
-			pattern = pattern[1:]
-		}
-		patternDirs = append(patternDirs, strings.Split(pattern, string(os.PathSeparator)))
-	}
-
-	return cleanedPatterns, patternDirs, exceptions, nil
-}
-
-// Matches returns true if file matches any of the patterns
-// and isn't excluded by any of the subsequent patterns.
-func Matches(file string, patterns []string) (bool, error) {
-	file = filepath.Clean(file)
-
-	if file == "." {
-		// Don't let them exclude everything, kind of silly.
-		return false, nil
-	}
-
-	patterns, patDirs, _, err := CleanPatterns(patterns)
-	if err != nil {
-		return false, err
-	}
-
-	return OptimizedMatches(file, patterns, patDirs)
-}
-
-// OptimizedMatches is basically the same as fileutils.Matches() but optimized for archive.go.
-// It will assume that the inputs have been preprocessed and therefore the function
-// doesn't need to do as much error checking and clean-up. This was done to avoid
-// repeating these steps on each file being checked during the archive process.
-// The more generic fileutils.Matches() can't make these assumptions.
-func OptimizedMatches(file string, patterns []string, patDirs [][]string) (bool, error) {
-	matched := false
-	file = filepath.FromSlash(file)
-	parentPath := filepath.Dir(file)
-	parentPathDirs := strings.Split(parentPath, string(os.PathSeparator))
-
-	for i, pattern := range patterns {
-		negative := false
-
-		if exclusion(pattern) {
-			negative = true
-			pattern = pattern[1:]
-		}
-
-		match, err := regexpMatch(pattern, file)
-		if err != nil {
-			return false, fmt.Errorf("Error in pattern (%s): %s", pattern, err)
-		}
-
-		if !match && parentPath != "." {
-			// Check to see if the pattern matches one of our parent dirs.
-			if len(patDirs[i]) <= len(parentPathDirs) {
-				match, _ = regexpMatch(strings.Join(patDirs[i], string(os.PathSeparator)),
-					strings.Join(parentPathDirs[:len(patDirs[i])], string(os.PathSeparator)))
-			}
-		}
-
-		if match {
-			matched = !negative
-		}
-	}
-
-	if matched {
-		logrus.Debugf("Skipping excluded path: %s", file)
-	}
-
-	return matched, nil
-}
-
-// regexpMatch tries to match the logic of filepath.Match but
-// does so using regexp logic. We do this so that we can expand the
-// wildcard set to include other things, like "**" to mean any number
-// of directories.  This means that we should be backwards compatible
-// with filepath.Match(). We'll end up supporting more stuff, due to
-// the fact that we're using regexp, but that's ok - it does no harm.
-//
-// As per the comment in golangs filepath.Match, on Windows, escaping
-// is disabled. Instead, '\\' is treated as path separator.
-func regexpMatch(pattern, path string) (bool, error) {
-	regStr := "^"
-
-	// Do some syntax checking on the pattern.
-	// filepath's Match() has some really weird rules that are inconsistent
-	// so instead of trying to dup their logic, just call Match() for its
-	// error state and if there is an error in the pattern return it.
-	// If this becomes an issue we can remove this since its really only
-	// needed in the error (syntax) case - which isn't really critical.
-	if _, err := filepath.Match(pattern, path); err != nil {
-		return false, err
-	}
-
-	// Go through the pattern and convert it to a regexp.
-	// We use a scanner so we can support utf-8 chars.
-	var scan scanner.Scanner
-	scan.Init(strings.NewReader(pattern))
-
-	sl := string(os.PathSeparator)
-	escSL := sl
-	if sl == `\` {
-		escSL += `\`
-	}
-
-	for scan.Peek() != scanner.EOF {
-		ch := scan.Next()
-
-		if ch == '*' {
-			if scan.Peek() == '*' {
-				// is some flavor of "**"
-				scan.Next()
-
-				if scan.Peek() == scanner.EOF {
-					// is "**EOF" - to align with .gitignore just accept all
-					regStr += ".*"
-				} else {
-					// is "**"
-					regStr += "((.*" + escSL + ")|([^" + escSL + "]*))"
-				}
-
-				// Treat **/ as ** so eat the "/"
-				if string(scan.Peek()) == sl {
-					scan.Next()
-				}
-			} else {
-				// is "*" so map it to anything but "/"
-				regStr += "[^" + escSL + "]*"
-			}
-		} else if ch == '?' {
-			// "?" is any char except "/"
-			regStr += "[^" + escSL + "]"
-		} else if ch == '.' || ch == '$' {
-			// Escape some regexp special chars that have no meaning
-			// in golang's filepath.Match
-			regStr += `\` + string(ch)
-		} else if ch == '\\' {
-			// escape next char. Note that a trailing \ in the pattern
-			// will be left alone (but need to escape it)
-			if sl == `\` {
-				// On windows map "\" to "\\", meaning an escaped backslash,
-				// and then just continue because filepath.Match on
-				// Windows doesn't allow escaping at all
-				regStr += escSL
-				continue
-			}
-			if scan.Peek() != scanner.EOF {
-				regStr += `\` + string(scan.Next())
-			} else {
-				regStr += `\`
-			}
-		} else {
-			regStr += string(ch)
-		}
-	}
-
-	regStr += "$"
-
-	res, err := regexp.MatchString(regStr, path)
-
-	// Map regexp's error to filepath's so no one knows we're not using filepath
-	if err != nil {
-		err = filepath.ErrBadPattern
-	}
-
-	return res, err
-}
-
-// CopyFile copies from src to dst until either EOF is reached
-// on src or an error occurs. It verifies src exists and removes
-// the dst if it exists.
-func CopyFile(src, dst string) (int64, error) {
-	cleanSrc := filepath.Clean(src)
-	cleanDst := filepath.Clean(dst)
-	if cleanSrc == cleanDst {
-		return 0, nil
-	}
-	sf, err := os.Open(cleanSrc)
-	if err != nil {
-		return 0, err
-	}
-	defer sf.Close()
-	if err := os.Remove(cleanDst); err != nil && !os.IsNotExist(err) {
-		return 0, err
-	}
-	df, err := os.Create(cleanDst)
-	if err != nil {
-		return 0, err
-	}
-	defer df.Close()
-	return io.Copy(df, sf)
-}
-
-// ReadSymlinkedDirectory returns the target directory of a symlink.
-// The target of the symbolic link may not be a file.
-func ReadSymlinkedDirectory(path string) (string, error) {
-	var realPath string
-	var err error
-	if realPath, err = filepath.Abs(path); err != nil {
-		return "", fmt.Errorf("unable to get absolute path for %s: %s", path, err)
-	}
-	if realPath, err = filepath.EvalSymlinks(realPath); err != nil {
-		return "", fmt.Errorf("failed to canonicalise path for %s: %s", path, err)
-	}
-	realPathInfo, err := os.Stat(realPath)
-	if err != nil {
-		return "", fmt.Errorf("failed to stat target '%s' of '%s': %s", realPath, path, err)
-	}
-	if !realPathInfo.Mode().IsDir() {
-		return "", fmt.Errorf("canonical path points to a file '%s'", realPath)
-	}
-	return realPath, nil
-}
-
-// CreateIfNotExists creates a file or a directory only if it does not already exist.
-func CreateIfNotExists(path string, isDir bool) error {
-	if _, err := os.Stat(path); err != nil {
-		if os.IsNotExist(err) {
-			if isDir {
-				return os.MkdirAll(path, 0755)
-			}
-			if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-				return err
-			}
-			f, err := os.OpenFile(path, os.O_CREATE, 0755)
-			if err != nil {
-				return err
-			}
-			f.Close()
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go
deleted file mode 100644
index ccd648fac3..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_darwin.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package fileutils
-
-import (
-	"os"
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-// GetTotalUsedFds returns the number of used File Descriptors by
-// executing `lsof -p PID`
-func GetTotalUsedFds() int {
-	pid := os.Getpid()
-
-	cmd := exec.Command("lsof", "-p", strconv.Itoa(pid))
-
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return -1
-	}
-
-	outputStr := strings.TrimSpace(string(output))
-
-	fds := strings.Split(outputStr, "\n")
-
-	return len(fds) - 1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go
deleted file mode 100644
index 0f2cb7ab93..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_solaris.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package fileutils
-
-// GetTotalUsedFds Returns the number of used File Descriptors.
-// On Solaris these limits are per process and not systemwide
-func GetTotalUsedFds() int {
-	return -1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_test.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_test.go
deleted file mode 100644
index 6df1be89bb..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_test.go
+++ /dev/null
@@ -1,585 +0,0 @@
-package fileutils
-
-import (
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// CopyFile with invalid src
-func TestCopyFileWithInvalidSrc(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	defer os.RemoveAll(tempFolder)
-	if err != nil {
-		t.Fatal(err)
-	}
-	bytes, err := CopyFile("/invalid/file/path", path.Join(tempFolder, "dest"))
-	if err == nil {
-		t.Fatal("Should have fail to copy an invalid src file")
-	}
-	if bytes != 0 {
-		t.Fatal("Should have written 0 bytes")
-	}
-
-}
-
-// CopyFile with invalid dest
-func TestCopyFileWithInvalidDest(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	defer os.RemoveAll(tempFolder)
-	if err != nil {
-		t.Fatal(err)
-	}
-	src := path.Join(tempFolder, "file")
-	err = ioutil.WriteFile(src, []byte("content"), 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	bytes, err := CopyFile(src, path.Join(tempFolder, "/invalid/dest/path"))
-	if err == nil {
-		t.Fatal("Should have fail to copy an invalid src file")
-	}
-	if bytes != 0 {
-		t.Fatal("Should have written 0 bytes")
-	}
-
-}
-
-// CopyFile with same src and dest
-func TestCopyFileWithSameSrcAndDest(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	defer os.RemoveAll(tempFolder)
-	if err != nil {
-		t.Fatal(err)
-	}
-	file := path.Join(tempFolder, "file")
-	err = ioutil.WriteFile(file, []byte("content"), 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	bytes, err := CopyFile(file, file)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if bytes != 0 {
-		t.Fatal("Should have written 0 bytes as it is the same file.")
-	}
-}
-
-// CopyFile with same src and dest but path is different and not clean
-func TestCopyFileWithSameSrcAndDestWithPathNameDifferent(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	defer os.RemoveAll(tempFolder)
-	if err != nil {
-		t.Fatal(err)
-	}
-	testFolder := path.Join(tempFolder, "test")
-	err = os.MkdirAll(testFolder, 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	file := path.Join(testFolder, "file")
-	sameFile := testFolder + "/../test/file"
-	err = ioutil.WriteFile(file, []byte("content"), 0740)
-	if err != nil {
-		t.Fatal(err)
-	}
-	bytes, err := CopyFile(file, sameFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if bytes != 0 {
-		t.Fatal("Should have written 0 bytes as it is the same file.")
-	}
-}
-
-func TestCopyFile(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	defer os.RemoveAll(tempFolder)
-	if err != nil {
-		t.Fatal(err)
-	}
-	src := path.Join(tempFolder, "src")
-	dest := path.Join(tempFolder, "dest")
-	ioutil.WriteFile(src, []byte("content"), 0777)
-	ioutil.WriteFile(dest, []byte("destContent"), 0777)
-	bytes, err := CopyFile(src, dest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if bytes != 7 {
-		t.Fatalf("Should have written %d bytes but wrote %d", 7, bytes)
-	}
-	actual, err := ioutil.ReadFile(dest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(actual) != "content" {
-		t.Fatalf("Dest content was '%s', expected '%s'", string(actual), "content")
-	}
-}
-
-// Reading a symlink to a directory must return the directory
-func TestReadSymlinkedDirectoryExistingDirectory(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	var err error
-	if err = os.Mkdir("/tmp/testReadSymlinkToExistingDirectory", 0777); err != nil {
-		t.Errorf("failed to create directory: %s", err)
-	}
-
-	if err = os.Symlink("/tmp/testReadSymlinkToExistingDirectory", "/tmp/dirLinkTest"); err != nil {
-		t.Errorf("failed to create symlink: %s", err)
-	}
-
-	var path string
-	if path, err = ReadSymlinkedDirectory("/tmp/dirLinkTest"); err != nil {
-		t.Fatalf("failed to read symlink to directory: %s", err)
-	}
-
-	if path != "/tmp/testReadSymlinkToExistingDirectory" {
-		t.Fatalf("symlink returned unexpected directory: %s", path)
-	}
-
-	if err = os.Remove("/tmp/testReadSymlinkToExistingDirectory"); err != nil {
-		t.Errorf("failed to remove temporary directory: %s", err)
-	}
-
-	if err = os.Remove("/tmp/dirLinkTest"); err != nil {
-		t.Errorf("failed to remove symlink: %s", err)
-	}
-}
-
-// Reading a non-existing symlink must fail
-func TestReadSymlinkedDirectoryNonExistingSymlink(t *testing.T) {
-	var path string
-	var err error
-	if path, err = ReadSymlinkedDirectory("/tmp/test/foo/Non/ExistingPath"); err == nil {
-		t.Fatalf("error expected for non-existing symlink")
-	}
-
-	if path != "" {
-		t.Fatalf("expected empty path, but '%s' was returned", path)
-	}
-}
-
-// Reading a symlink to a file must fail
-func TestReadSymlinkedDirectoryToFile(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	var err error
-	var file *os.File
-
-	if file, err = os.Create("/tmp/testReadSymlinkToFile"); err != nil {
-		t.Fatalf("failed to create file: %s", err)
-	}
-
-	file.Close()
-
-	if err = os.Symlink("/tmp/testReadSymlinkToFile", "/tmp/fileLinkTest"); err != nil {
-		t.Errorf("failed to create symlink: %s", err)
-	}
-
-	var path string
-	if path, err = ReadSymlinkedDirectory("/tmp/fileLinkTest"); err == nil {
-		t.Fatalf("ReadSymlinkedDirectory on a symlink to a file should've failed")
-	}
-
-	if path != "" {
-		t.Fatalf("path should've been empty: %s", path)
-	}
-
-	if err = os.Remove("/tmp/testReadSymlinkToFile"); err != nil {
-		t.Errorf("failed to remove file: %s", err)
-	}
-
-	if err = os.Remove("/tmp/fileLinkTest"); err != nil {
-		t.Errorf("failed to remove symlink: %s", err)
-	}
-}
-
-func TestWildcardMatches(t *testing.T) {
-	match, _ := Matches("fileutils.go", []string{"*"})
-	if match != true {
-		t.Errorf("failed to get a wildcard match, got %v", match)
-	}
-}
-
-// A simple pattern match should return true.
-func TestPatternMatches(t *testing.T) {
-	match, _ := Matches("fileutils.go", []string{"*.go"})
-	if match != true {
-		t.Errorf("failed to get a match, got %v", match)
-	}
-}
-
-// An exclusion followed by an inclusion should return true.
-func TestExclusionPatternMatchesPatternBefore(t *testing.T) {
-	match, _ := Matches("fileutils.go", []string{"!fileutils.go", "*.go"})
-	if match != true {
-		t.Errorf("failed to get true match on exclusion pattern, got %v", match)
-	}
-}
-
-// A folder pattern followed by an exception should return false.
-func TestPatternMatchesFolderExclusions(t *testing.T) {
-	match, _ := Matches("docs/README.md", []string{"docs", "!docs/README.md"})
-	if match != false {
-		t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
-	}
-}
-
-// A folder pattern followed by an exception should return false.
-func TestPatternMatchesFolderWithSlashExclusions(t *testing.T) {
-	match, _ := Matches("docs/README.md", []string{"docs/", "!docs/README.md"})
-	if match != false {
-		t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
-	}
-}
-
-// A folder pattern followed by an exception should return false.
-func TestPatternMatchesFolderWildcardExclusions(t *testing.T) {
-	match, _ := Matches("docs/README.md", []string{"docs/*", "!docs/README.md"})
-	if match != false {
-		t.Errorf("failed to get a false match on exclusion pattern, got %v", match)
-	}
-}
-
-// A pattern followed by an exclusion should return false.
-func TestExclusionPatternMatchesPatternAfter(t *testing.T) {
-	match, _ := Matches("fileutils.go", []string{"*.go", "!fileutils.go"})
-	if match != false {
-		t.Errorf("failed to get false match on exclusion pattern, got %v", match)
-	}
-}
-
-// A filename evaluating to . should return false.
-func TestExclusionPatternMatchesWholeDirectory(t *testing.T) {
-	match, _ := Matches(".", []string{"*.go"})
-	if match != false {
-		t.Errorf("failed to get false match on ., got %v", match)
-	}
-}
-
-// A single ! pattern should return an error.
-func TestSingleExclamationError(t *testing.T) {
-	_, err := Matches("fileutils.go", []string{"!"})
-	if err == nil {
-		t.Errorf("failed to get an error for a single exclamation point, got %v", err)
-	}
-}
-
-// A string preceded with a ! should return true from Exclusion.
-func TestExclusion(t *testing.T) {
-	exclusion := exclusion("!")
-	if !exclusion {
-		t.Errorf("failed to get true for a single !, got %v", exclusion)
-	}
-}
-
-// Matches with no patterns
-func TestMatchesWithNoPatterns(t *testing.T) {
-	matches, err := Matches("/any/path/there", []string{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if matches {
-		t.Fatalf("Should not have match anything")
-	}
-}
-
-// Matches with malformed patterns
-func TestMatchesWithMalformedPatterns(t *testing.T) {
-	matches, err := Matches("/any/path/there", []string{"["})
-	if err == nil {
-		t.Fatal("Should have failed because of a malformed syntax in the pattern")
-	}
-	if matches {
-		t.Fatalf("Should not have match anything")
-	}
-}
-
-// Test lots of variants of patterns & strings
-func TestMatches(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	tests := []struct {
-		pattern string
-		text    string
-		pass    bool
-	}{
-		{"**", "file", true},
-		{"**", "file/", true},
-		{"**/", "file", true}, // weird one
-		{"**/", "file/", true},
-		{"**", "/", true},
-		{"**/", "/", true},
-		{"**", "dir/file", true},
-		{"**/", "dir/file", false},
-		{"**", "dir/file/", true},
-		{"**/", "dir/file/", true},
-		{"**/**", "dir/file", true},
-		{"**/**", "dir/file/", true},
-		{"dir/**", "dir/file", true},
-		{"dir/**", "dir/file/", true},
-		{"dir/**", "dir/dir2/file", true},
-		{"dir/**", "dir/dir2/file/", true},
-		{"**/dir2/*", "dir/dir2/file", true},
-		{"**/dir2/*", "dir/dir2/file/", false},
-		{"**/dir2/**", "dir/dir2/dir3/file", true},
-		{"**/dir2/**", "dir/dir2/dir3/file/", true},
-		{"**file", "file", true},
-		{"**file", "dir/file", true},
-		{"**/file", "dir/file", true},
-		{"**file", "dir/dir/file", true},
-		{"**/file", "dir/dir/file", true},
-		{"**/file*", "dir/dir/file", true},
-		{"**/file*", "dir/dir/file.txt", true},
-		{"**/file*txt", "dir/dir/file.txt", true},
-		{"**/file*.txt", "dir/dir/file.txt", true},
-		{"**/file*.txt*", "dir/dir/file.txt", true},
-		{"**/**/*.txt", "dir/dir/file.txt", true},
-		{"**/**/*.txt2", "dir/dir/file.txt", false},
-		{"**/*.txt", "file.txt", true},
-		{"**/**/*.txt", "file.txt", true},
-		{"a**/*.txt", "a/file.txt", true},
-		{"a**/*.txt", "a/dir/file.txt", true},
-		{"a**/*.txt", "a/dir/dir/file.txt", true},
-		{"a/*.txt", "a/dir/file.txt", false},
-		{"a/*.txt", "a/file.txt", true},
-		{"a/*.txt**", "a/file.txt", true},
-		{"a[b-d]e", "ae", false},
-		{"a[b-d]e", "ace", true},
-		{"a[b-d]e", "aae", false},
-		{"a[^b-d]e", "aze", true},
-		{".*", ".foo", true},
-		{".*", "foo", false},
-		{"abc.def", "abcdef", false},
-		{"abc.def", "abc.def", true},
-		{"abc.def", "abcZdef", false},
-		{"abc?def", "abcZdef", true},
-		{"abc?def", "abcdef", false},
-		{"a\\*b", "a*b", true},
-		{"a\\", "a", false},
-		{"a\\", "a\\", false},
-		{"a\\\\", "a\\", true},
-		{"**/foo/bar", "foo/bar", true},
-		{"**/foo/bar", "dir/foo/bar", true},
-		{"**/foo/bar", "dir/dir2/foo/bar", true},
-		{"abc/**", "abc", false},
-		{"abc/**", "abc/def", true},
-		{"abc/**", "abc/def/ghi", true},
-	}
-
-	for _, test := range tests {
-		res, _ := regexpMatch(test.pattern, test.text)
-		if res != test.pass {
-			t.Fatalf("Failed: %v - res:%v", test, res)
-		}
-	}
-}
-
-// An empty string should return true from Empty.
-func TestEmpty(t *testing.T) {
-	empty := empty("")
-	if !empty {
-		t.Errorf("failed to get true for an empty string, got %v", empty)
-	}
-}
-
-func TestCleanPatterns(t *testing.T) {
-	cleaned, _, _, _ := CleanPatterns([]string{"docs", "config"})
-	if len(cleaned) != 2 {
-		t.Errorf("expected 2 element slice, got %v", len(cleaned))
-	}
-}
-
-func TestCleanPatternsStripEmptyPatterns(t *testing.T) {
-	cleaned, _, _, _ := CleanPatterns([]string{"docs", "config", ""})
-	if len(cleaned) != 2 {
-		t.Errorf("expected 2 element slice, got %v", len(cleaned))
-	}
-}
-
-func TestCleanPatternsExceptionFlag(t *testing.T) {
-	_, _, exceptions, _ := CleanPatterns([]string{"docs", "!docs/README.md"})
-	if !exceptions {
-		t.Errorf("expected exceptions to be true, got %v", exceptions)
-	}
-}
-
-func TestCleanPatternsLeadingSpaceTrimmed(t *testing.T) {
-	_, _, exceptions, _ := CleanPatterns([]string{"docs", "  !docs/README.md"})
-	if !exceptions {
-		t.Errorf("expected exceptions to be true, got %v", exceptions)
-	}
-}
-
-func TestCleanPatternsTrailingSpaceTrimmed(t *testing.T) {
-	_, _, exceptions, _ := CleanPatterns([]string{"docs", "!docs/README.md  "})
-	if !exceptions {
-		t.Errorf("expected exceptions to be true, got %v", exceptions)
-	}
-}
-
-func TestCleanPatternsErrorSingleException(t *testing.T) {
-	_, _, _, err := CleanPatterns([]string{"!"})
-	if err == nil {
-		t.Errorf("expected error on single exclamation point, got %v", err)
-	}
-}
-
-func TestCleanPatternsFolderSplit(t *testing.T) {
-	_, dirs, _, _ := CleanPatterns([]string{"docs/config/CONFIG.md"})
-	if dirs[0][0] != "docs" {
-		t.Errorf("expected first element in dirs slice to be docs, got %v", dirs[0][1])
-	}
-	if dirs[0][1] != "config" {
-		t.Errorf("expected first element in dirs slice to be config, got %v", dirs[0][1])
-	}
-}
-
-func TestCreateIfNotExistsDir(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempFolder)
-
-	folderToCreate := filepath.Join(tempFolder, "tocreate")
-
-	if err := CreateIfNotExists(folderToCreate, true); err != nil {
-		t.Fatal(err)
-	}
-	fileinfo, err := os.Stat(folderToCreate)
-	if err != nil {
-		t.Fatalf("Should have create a folder, got %v", err)
-	}
-
-	if !fileinfo.IsDir() {
-		t.Fatalf("Should have been a dir, seems it's not")
-	}
-}
-
-func TestCreateIfNotExistsFile(t *testing.T) {
-	tempFolder, err := ioutil.TempDir("", "docker-fileutils-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempFolder)
-
-	fileToCreate := filepath.Join(tempFolder, "file/to/create")
-
-	if err := CreateIfNotExists(fileToCreate, false); err != nil {
-		t.Fatal(err)
-	}
-	fileinfo, err := os.Stat(fileToCreate)
-	if err != nil {
-		t.Fatalf("Should have create a file, got %v", err)
-	}
-
-	if fileinfo.IsDir() {
-		t.Fatalf("Should have been a file, seems it's not")
-	}
-}
-
-// These matchTests are stolen from go's filepath Match tests.
-type matchTest struct {
-	pattern, s string
-	match      bool
-	err        error
-}
-
-var matchTests = []matchTest{
-	{"abc", "abc", true, nil},
-	{"*", "abc", true, nil},
-	{"*c", "abc", true, nil},
-	{"a*", "a", true, nil},
-	{"a*", "abc", true, nil},
-	{"a*", "ab/c", false, nil},
-	{"a*/b", "abc/b", true, nil},
-	{"a*/b", "a/c/b", false, nil},
-	{"a*b*c*d*e*/f", "axbxcxdxe/f", true, nil},
-	{"a*b*c*d*e*/f", "axbxcxdxexxx/f", true, nil},
-	{"a*b*c*d*e*/f", "axbxcxdxe/xxx/f", false, nil},
-	{"a*b*c*d*e*/f", "axbxcxdxexxx/fff", false, nil},
-	{"a*b?c*x", "abxbbxdbxebxczzx", true, nil},
-	{"a*b?c*x", "abxbbxdbxebxczzy", false, nil},
-	{"ab[c]", "abc", true, nil},
-	{"ab[b-d]", "abc", true, nil},
-	{"ab[e-g]", "abc", false, nil},
-	{"ab[^c]", "abc", false, nil},
-	{"ab[^b-d]", "abc", false, nil},
-	{"ab[^e-g]", "abc", true, nil},
-	{"a\\*b", "a*b", true, nil},
-	{"a\\*b", "ab", false, nil},
-	{"a?b", "a☺b", true, nil},
-	{"a[^a]b", "a☺b", true, nil},
-	{"a???b", "a☺b", false, nil},
-	{"a[^a][^a][^a]b", "a☺b", false, nil},
-	{"[a-ζ]*", "α", true, nil},
-	{"*[a-ζ]", "A", false, nil},
-	{"a?b", "a/b", false, nil},
-	{"a*b", "a/b", false, nil},
-	{"[\\]a]", "]", true, nil},
-	{"[\\-]", "-", true, nil},
-	{"[x\\-]", "x", true, nil},
-	{"[x\\-]", "-", true, nil},
-	{"[x\\-]", "z", false, nil},
-	{"[\\-x]", "x", true, nil},
-	{"[\\-x]", "-", true, nil},
-	{"[\\-x]", "a", false, nil},
-	{"[]a]", "]", false, filepath.ErrBadPattern},
-	{"[-]", "-", false, filepath.ErrBadPattern},
-	{"[x-]", "x", false, filepath.ErrBadPattern},
-	{"[x-]", "-", false, filepath.ErrBadPattern},
-	{"[x-]", "z", false, filepath.ErrBadPattern},
-	{"[-x]", "x", false, filepath.ErrBadPattern},
-	{"[-x]", "-", false, filepath.ErrBadPattern},
-	{"[-x]", "a", false, filepath.ErrBadPattern},
-	{"\\", "a", false, filepath.ErrBadPattern},
-	{"[a-b-c]", "a", false, filepath.ErrBadPattern},
-	{"[", "a", false, filepath.ErrBadPattern},
-	{"[^", "a", false, filepath.ErrBadPattern},
-	{"[^bc", "a", false, filepath.ErrBadPattern},
-	{"a[", "a", false, filepath.ErrBadPattern}, // was nil but IMO its wrong
-	{"a[", "ab", false, filepath.ErrBadPattern},
-	{"*x", "xxx", true, nil},
-}
-
-func errp(e error) string {
-	if e == nil {
-		return "<nil>"
-	}
-	return e.Error()
-}
-
-// TestMatch test's our version of filepath.Match, called regexpMatch.
-func TestMatch(t *testing.T) {
-	for _, tt := range matchTests {
-		pattern := tt.pattern
-		s := tt.s
-		if runtime.GOOS == "windows" {
-			if strings.Index(pattern, "\\") >= 0 {
-				// no escape allowed on windows.
-				continue
-			}
-			pattern = filepath.Clean(pattern)
-			s = filepath.Clean(s)
-		}
-		ok, err := regexpMatch(pattern, s)
-		if ok != tt.match || err != tt.err {
-			t.Fatalf("Match(%#q, %#q) = %v, %q want %v, %q", pattern, s, ok, errp(err), tt.match, errp(tt.err))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_unix.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
deleted file mode 100644
index d5c3abf568..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_unix.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build linux freebsd
-
-package fileutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// GetTotalUsedFds Returns the number of used File Descriptors by
-// reading it via /proc filesystem.
-func GetTotalUsedFds() int {
-	if fds, err := ioutil.ReadDir(fmt.Sprintf("/proc/%d/fd", os.Getpid())); err != nil {
-		logrus.Errorf("Error opening /proc/%d/fd: %s", os.Getpid(), err)
-	} else {
-		return len(fds)
-	}
-	return -1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_windows.go b/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
deleted file mode 100644
index 5ec21cace5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fileutils/fileutils_windows.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package fileutils
-
-// GetTotalUsedFds Returns the number of used File Descriptors. Not supported
-// on Windows.
-func GetTotalUsedFds() int {
-	return -1
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux.go b/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux.go
deleted file mode 100644
index 9fd054e77f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// +build linux
-
-package fsutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-func locateDummyIfEmpty(path string) (string, error) {
-	children, err := ioutil.ReadDir(path)
-	if err != nil {
-		return "", err
-	}
-	if len(children) != 0 {
-		return "", nil
-	}
-	dummyFile, err := ioutil.TempFile(path, "fsutils-dummy")
-	if err != nil {
-		return "", err
-	}
-	name := dummyFile.Name()
-	if err = dummyFile.Close(); err != nil {
-		return name, err
-	}
-	return name, nil
-}
-
-// SupportsDType returns whether the filesystem mounted on path supports d_type
-func SupportsDType(path string) (bool, error) {
-	// locate dummy so that we have at least one dirent
-	dummy, err := locateDummyIfEmpty(path)
-	if err != nil {
-		return false, err
-	}
-	if dummy != "" {
-		defer os.Remove(dummy)
-	}
-
-	visited := 0
-	supportsDType := true
-	fn := func(ent *syscall.Dirent) bool {
-		visited++
-		if ent.Type == syscall.DT_UNKNOWN {
-			supportsDType = false
-			// stop iteration
-			return true
-		}
-		// continue iteration
-		return false
-	}
-	if err = iterateReadDir(path, fn); err != nil {
-		return false, err
-	}
-	if visited == 0 {
-		return false, fmt.Errorf("did not hit any dirent during iteration %s", path)
-	}
-	return supportsDType, nil
-}
-
-func iterateReadDir(path string, fn func(*syscall.Dirent) bool) error {
-	d, err := os.Open(path)
-	if err != nil {
-		return err
-	}
-	defer d.Close()
-	fd := int(d.Fd())
-	buf := make([]byte, 4096)
-	for {
-		nbytes, err := syscall.ReadDirent(fd, buf)
-		if err != nil {
-			return err
-		}
-		if nbytes == 0 {
-			break
-		}
-		for off := 0; off < nbytes; {
-			ent := (*syscall.Dirent)(unsafe.Pointer(&buf[off]))
-			if stop := fn(ent); stop {
-				return nil
-			}
-			off += int(ent.Reclen)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux_test.go
deleted file mode 100644
index 4a648239c0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/fsutils/fsutils_linux_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// +build linux
-
-package fsutils
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"syscall"
-	"testing"
-)
-
-func testSupportsDType(t *testing.T, expected bool, mkfsCommand string, mkfsArg ...string) {
-	// check whether mkfs is installed
-	if _, err := exec.LookPath(mkfsCommand); err != nil {
-		t.Skipf("%s not installed: %v", mkfsCommand, err)
-	}
-
-	// create a sparse image
-	imageSize := int64(32 * 1024 * 1024)
-	imageFile, err := ioutil.TempFile("", "fsutils-image")
-	if err != nil {
-		t.Fatal(err)
-	}
-	imageFileName := imageFile.Name()
-	defer os.Remove(imageFileName)
-	if _, err = imageFile.Seek(imageSize-1, 0); err != nil {
-		t.Fatal(err)
-	}
-	if _, err = imageFile.Write([]byte{0}); err != nil {
-		t.Fatal(err)
-	}
-	if err = imageFile.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	// create a mountpoint
-	mountpoint, err := ioutil.TempDir("", "fsutils-mountpoint")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(mountpoint)
-
-	// format the image
-	args := append(mkfsArg, imageFileName)
-	t.Logf("Executing `%s %v`", mkfsCommand, args)
-	out, err := exec.Command(mkfsCommand, args...).CombinedOutput()
-	if len(out) > 0 {
-		t.Log(string(out))
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// loopback-mount the image.
-	// for ease of setting up loopback device, we use os/exec rather than syscall.Mount
-	out, err = exec.Command("mount", "-o", "loop", imageFileName, mountpoint).CombinedOutput()
-	if len(out) > 0 {
-		t.Log(string(out))
-	}
-	if err != nil {
-		t.Skip("skipping the test because mount failed")
-	}
-	defer func() {
-		if err := syscall.Unmount(mountpoint, 0); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// check whether it supports d_type
-	result, err := SupportsDType(mountpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("Supports d_type: %v", result)
-	if result != expected {
-		t.Fatalf("expected %v, got %v", expected, result)
-	}
-}
-
-func TestSupportsDTypeWithFType0XFS(t *testing.T) {
-	testSupportsDType(t, false, "mkfs.xfs", "-m", "crc=0", "-n", "ftype=0")
-}
-
-func TestSupportsDTypeWithFType1XFS(t *testing.T) {
-	testSupportsDType(t, true, "mkfs.xfs", "-m", "crc=0", "-n", "ftype=1")
-}
-
-func TestSupportsDTypeWithExt4(t *testing.T) {
-	testSupportsDType(t, true, "mkfs.ext4")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils.go b/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils.go
deleted file mode 100644
index ded091f2a2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package gitutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/symlink"
-	"github.com/docker/docker/pkg/urlutil"
-)
-
-// Clone clones a repository into a newly created directory which
-// will be under "docker-build-git"
-func Clone(remoteURL string) (string, error) {
-	if !urlutil.IsGitTransport(remoteURL) {
-		remoteURL = "https://" + remoteURL
-	}
-	root, err := ioutil.TempDir("", "docker-build-git")
-	if err != nil {
-		return "", err
-	}
-
-	u, err := url.Parse(remoteURL)
-	if err != nil {
-		return "", err
-	}
-
-	fragment := u.Fragment
-	clone := cloneArgs(u, root)
-
-	if output, err := git(clone...); err != nil {
-		return "", fmt.Errorf("Error trying to use git: %s (%s)", err, output)
-	}
-
-	return checkoutGit(fragment, root)
-}
-
-func cloneArgs(remoteURL *url.URL, root string) []string {
-	args := []string{"clone", "--recursive"}
-	shallow := len(remoteURL.Fragment) == 0
-
-	if shallow && strings.HasPrefix(remoteURL.Scheme, "http") {
-		res, err := http.Head(fmt.Sprintf("%s/info/refs?service=git-upload-pack", remoteURL))
-		if err != nil || res.Header.Get("Content-Type") != "application/x-git-upload-pack-advertisement" {
-			shallow = false
-		}
-	}
-
-	if shallow {
-		args = append(args, "--depth", "1")
-	}
-
-	if remoteURL.Fragment != "" {
-		remoteURL.Fragment = ""
-	}
-
-	return append(args, remoteURL.String(), root)
-}
-
-func checkoutGit(fragment, root string) (string, error) {
-	refAndDir := strings.SplitN(fragment, ":", 2)
-
-	if len(refAndDir[0]) != 0 {
-		if output, err := gitWithinDir(root, "checkout", refAndDir[0]); err != nil {
-			return "", fmt.Errorf("Error trying to use git: %s (%s)", err, output)
-		}
-	}
-
-	if len(refAndDir) > 1 && len(refAndDir[1]) != 0 {
-		newCtx, err := symlink.FollowSymlinkInScope(filepath.Join(root, refAndDir[1]), root)
-		if err != nil {
-			return "", fmt.Errorf("Error setting git context, %q not within git root: %s", refAndDir[1], err)
-		}
-
-		fi, err := os.Stat(newCtx)
-		if err != nil {
-			return "", err
-		}
-		if !fi.IsDir() {
-			return "", fmt.Errorf("Error setting git context, not a directory: %s", newCtx)
-		}
-		root = newCtx
-	}
-
-	return root, nil
-}
-
-func gitWithinDir(dir string, args ...string) ([]byte, error) {
-	a := []string{"--work-tree", dir, "--git-dir", filepath.Join(dir, ".git")}
-	return git(append(a, args...)...)
-}
-
-func git(args ...string) ([]byte, error) {
-	return exec.Command("git", args...).CombinedOutput()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils_test.go b/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils_test.go
deleted file mode 100644
index d197058d20..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/gitutils/gitutils_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package gitutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestCloneArgsSmartHttp(t *testing.T) {
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-	serverURL, _ := url.Parse(server.URL)
-
-	serverURL.Path = "/repo.git"
-	gitURL := serverURL.String()
-
-	mux.HandleFunc("/repo.git/info/refs", func(w http.ResponseWriter, r *http.Request) {
-		q := r.URL.Query().Get("service")
-		w.Header().Set("Content-Type", fmt.Sprintf("application/x-%s-advertisement", q))
-	})
-
-	args := cloneArgs(serverURL, "/tmp")
-	exp := []string{"clone", "--recursive", "--depth", "1", gitURL, "/tmp"}
-	if !reflect.DeepEqual(args, exp) {
-		t.Fatalf("Expected %v, got %v", exp, args)
-	}
-}
-
-func TestCloneArgsDumbHttp(t *testing.T) {
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-	serverURL, _ := url.Parse(server.URL)
-
-	serverURL.Path = "/repo.git"
-	gitURL := serverURL.String()
-
-	mux.HandleFunc("/repo.git/info/refs", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain")
-	})
-
-	args := cloneArgs(serverURL, "/tmp")
-	exp := []string{"clone", "--recursive", gitURL, "/tmp"}
-	if !reflect.DeepEqual(args, exp) {
-		t.Fatalf("Expected %v, got %v", exp, args)
-	}
-}
-
-func TestCloneArgsGit(t *testing.T) {
-	u, _ := url.Parse("git://github.com/docker/docker")
-	args := cloneArgs(u, "/tmp")
-	exp := []string{"clone", "--recursive", "--depth", "1", "git://github.com/docker/docker", "/tmp"}
-	if !reflect.DeepEqual(args, exp) {
-		t.Fatalf("Expected %v, got %v", exp, args)
-	}
-}
-
-func TestCloneArgsStripFragment(t *testing.T) {
-	u, _ := url.Parse("git://github.com/docker/docker#test")
-	args := cloneArgs(u, "/tmp")
-	exp := []string{"clone", "--recursive", "git://github.com/docker/docker", "/tmp"}
-	if !reflect.DeepEqual(args, exp) {
-		t.Fatalf("Expected %v, got %v", exp, args)
-	}
-}
-
-func gitGetConfig(name string) string {
-	b, err := git([]string{"config", "--get", name}...)
-	if err != nil {
-		// since we are interested in empty or non empty string,
-		// we can safely ignore the err here.
-		return ""
-	}
-	return strings.TrimSpace(string(b))
-}
-
-func TestCheckoutGit(t *testing.T) {
-	root, err := ioutil.TempDir("", "docker-build-git-checkout")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(root)
-
-	autocrlf := gitGetConfig("core.autocrlf")
-	if !(autocrlf == "true" || autocrlf == "false" ||
-		autocrlf == "input" || autocrlf == "") {
-		t.Logf("unknown core.autocrlf value: \"%s\"", autocrlf)
-	}
-	eol := "\n"
-	if autocrlf == "true" {
-		eol = "\r\n"
-	}
-
-	gitDir := filepath.Join(root, "repo")
-	_, err = git("init", gitDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "config", "user.email", "test@docker.com"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "config", "user.name", "Docker test"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ioutil.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	subDir := filepath.Join(gitDir, "subdir")
-	if err = os.Mkdir(subDir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ioutil.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 5000"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	if runtime.GOOS != "windows" {
-		if err = os.Symlink("../subdir", filepath.Join(gitDir, "parentlink")); err != nil {
-			t.Fatal(err)
-		}
-
-		if err = os.Symlink("/subdir", filepath.Join(gitDir, "absolutelink")); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if _, err = gitWithinDir(gitDir, "add", "-A"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "commit", "-am", "First commit"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "checkout", "-b", "test"); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ioutil.WriteFile(filepath.Join(gitDir, "Dockerfile"), []byte("FROM scratch\nEXPOSE 3000"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = ioutil.WriteFile(filepath.Join(subDir, "Dockerfile"), []byte("FROM busybox\nEXPOSE 5000"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "add", "-A"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "commit", "-am", "Branch commit"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = gitWithinDir(gitDir, "checkout", "master"); err != nil {
-		t.Fatal(err)
-	}
-
-	type singleCase struct {
-		frag string
-		exp  string
-		fail bool
-	}
-
-	cases := []singleCase{
-		{"", "FROM scratch", false},
-		{"master", "FROM scratch", false},
-		{":subdir", "FROM scratch" + eol + "EXPOSE 5000", false},
-		{":nosubdir", "", true},   // missing directory error
-		{":Dockerfile", "", true}, // not a directory error
-		{"master:nosubdir", "", true},
-		{"master:subdir", "FROM scratch" + eol + "EXPOSE 5000", false},
-		{"master:../subdir", "", true},
-		{"test", "FROM scratch" + eol + "EXPOSE 3000", false},
-		{"test:", "FROM scratch" + eol + "EXPOSE 3000", false},
-		{"test:subdir", "FROM busybox" + eol + "EXPOSE 5000", false},
-	}
-
-	if runtime.GOOS != "windows" {
-		// Windows GIT (2.7.1 x64) does not support parentlink/absolutelink. Sample output below
-		// 	git --work-tree .\repo --git-dir .\repo\.git add -A
-		//	error: readlink("absolutelink"): Function not implemented
-		// 	error: unable to index file absolutelink
-		// 	fatal: adding files failed
-		cases = append(cases, singleCase{frag: "master:absolutelink", exp: "FROM scratch" + eol + "EXPOSE 5000", fail: false})
-		cases = append(cases, singleCase{frag: "master:parentlink", exp: "FROM scratch" + eol + "EXPOSE 5000", fail: false})
-	}
-
-	for _, c := range cases {
-		r, err := checkoutGit(c.frag, gitDir)
-
-		fail := err != nil
-		if fail != c.fail {
-			t.Fatalf("Expected %v failure, error was %v\n", c.fail, err)
-		}
-		if c.fail {
-			continue
-		}
-
-		b, err := ioutil.ReadFile(filepath.Join(r, "Dockerfile"))
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if string(b) != c.exp {
-			t.Fatalf("Expected %v, was %v\n", c.exp, string(b))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/conn_sqlite3_linux.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/conn_sqlite3_linux.go
deleted file mode 100644
index 8e61ff3b4f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/conn_sqlite3_linux.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build cgo
-
-package graphdb
-
-import (
-	"database/sql"
-
-	_ "github.com/mattn/go-sqlite3" // registers sqlite
-)
-
-// NewSqliteConn opens a connection to a sqlite
-// database.
-func NewSqliteConn(root string) (*Database, error) {
-	conn, err := sql.Open("sqlite3", root)
-	if err != nil {
-		return nil, err
-	}
-	return NewDatabase(conn)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux.go
deleted file mode 100644
index eca433fa85..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux.go
+++ /dev/null
@@ -1,551 +0,0 @@
-package graphdb
-
-import (
-	"database/sql"
-	"fmt"
-	"path"
-	"strings"
-	"sync"
-)
-
-const (
-	createEntityTable = `
-    CREATE TABLE IF NOT EXISTS entity (
-        id text NOT NULL PRIMARY KEY
-    );`
-
-	createEdgeTable = `
-    CREATE TABLE IF NOT EXISTS edge (
-        "entity_id" text NOT NULL,
-        "parent_id" text NULL,
-        "name" text NOT NULL,
-        CONSTRAINT "parent_fk" FOREIGN KEY ("parent_id") REFERENCES "entity" ("id"),
-        CONSTRAINT "entity_fk" FOREIGN KEY ("entity_id") REFERENCES "entity" ("id")
-        );
-    `
-
-	createEdgeIndices = `
-    CREATE UNIQUE INDEX IF NOT EXISTS "name_parent_ix" ON "edge" (parent_id, name);
-    `
-)
-
-// Entity with a unique id.
-type Entity struct {
-	id string
-}
-
-// An Edge connects two entities together.
-type Edge struct {
-	EntityID string
-	Name     string
-	ParentID string
-}
-
-// Entities stores the list of entities.
-type Entities map[string]*Entity
-
-// Edges stores the relationships between entities.
-type Edges []*Edge
-
-// WalkFunc is a function invoked to process an individual entity.
-type WalkFunc func(fullPath string, entity *Entity) error
-
-// Database is a graph database for storing entities and their relationships.
-type Database struct {
-	conn *sql.DB
-	mux  sync.RWMutex
-}
-
-// IsNonUniqueNameError processes the error to check if it's caused by
-// a constraint violation.
-// This is necessary because the error isn't the same across various
-// sqlite versions.
-func IsNonUniqueNameError(err error) bool {
-	str := err.Error()
-	// sqlite 3.7.17-1ubuntu1 returns:
-	// Set failure: Abort due to constraint violation: columns parent_id, name are not unique
-	if strings.HasSuffix(str, "name are not unique") {
-		return true
-	}
-	// sqlite-3.8.3-1.fc20 returns:
-	// Set failure: Abort due to constraint violation: UNIQUE constraint failed: edge.parent_id, edge.name
-	if strings.Contains(str, "UNIQUE constraint failed") && strings.Contains(str, "edge.name") {
-		return true
-	}
-	// sqlite-3.6.20-1.el6 returns:
-	// Set failure: Abort due to constraint violation: constraint failed
-	if strings.HasSuffix(str, "constraint failed") {
-		return true
-	}
-	return false
-}
-
-// NewDatabase creates a new graph database initialized with a root entity.
-func NewDatabase(conn *sql.DB) (*Database, error) {
-	if conn == nil {
-		return nil, fmt.Errorf("Database connection cannot be nil")
-	}
-	db := &Database{conn: conn}
-
-	// Create root entities
-	tx, err := conn.Begin()
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := tx.Exec(createEntityTable); err != nil {
-		return nil, err
-	}
-	if _, err := tx.Exec(createEdgeTable); err != nil {
-		return nil, err
-	}
-	if _, err := tx.Exec(createEdgeIndices); err != nil {
-		return nil, err
-	}
-
-	if _, err := tx.Exec("DELETE FROM entity where id = ?", "0"); err != nil {
-		tx.Rollback()
-		return nil, err
-	}
-
-	if _, err := tx.Exec("INSERT INTO entity (id) VALUES (?);", "0"); err != nil {
-		tx.Rollback()
-		return nil, err
-	}
-
-	if _, err := tx.Exec("DELETE FROM edge where entity_id=? and name=?", "0", "/"); err != nil {
-		tx.Rollback()
-		return nil, err
-	}
-
-	if _, err := tx.Exec("INSERT INTO edge (entity_id, name) VALUES(?,?);", "0", "/"); err != nil {
-		tx.Rollback()
-		return nil, err
-	}
-
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-
-	return db, nil
-}
-
-// Close the underlying connection to the database.
-func (db *Database) Close() error {
-	return db.conn.Close()
-}
-
-// Set the entity id for a given path.
-func (db *Database) Set(fullPath, id string) (*Entity, error) {
-	db.mux.Lock()
-	defer db.mux.Unlock()
-
-	tx, err := db.conn.Begin()
-	if err != nil {
-		return nil, err
-	}
-
-	var entityID string
-	if err := tx.QueryRow("SELECT id FROM entity WHERE id = ?;", id).Scan(&entityID); err != nil {
-		if err == sql.ErrNoRows {
-			if _, err := tx.Exec("INSERT INTO entity (id) VALUES(?);", id); err != nil {
-				tx.Rollback()
-				return nil, err
-			}
-		} else {
-			tx.Rollback()
-			return nil, err
-		}
-	}
-	e := &Entity{id}
-
-	parentPath, name := splitPath(fullPath)
-	if err := db.setEdge(parentPath, name, e, tx); err != nil {
-		tx.Rollback()
-		return nil, err
-	}
-
-	if err := tx.Commit(); err != nil {
-		return nil, err
-	}
-	return e, nil
-}
-
-// Exists returns true if a name already exists in the database.
-func (db *Database) Exists(name string) bool {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	e, err := db.get(name)
-	if err != nil {
-		return false
-	}
-	return e != nil
-}
-
-func (db *Database) setEdge(parentPath, name string, e *Entity, tx *sql.Tx) error {
-	parent, err := db.get(parentPath)
-	if err != nil {
-		return err
-	}
-	if parent.id == e.id {
-		return fmt.Errorf("Cannot set self as child")
-	}
-
-	if _, err := tx.Exec("INSERT INTO edge (parent_id, name, entity_id) VALUES (?,?,?);", parent.id, name, e.id); err != nil {
-		return err
-	}
-	return nil
-}
-
-// RootEntity returns the root "/" entity for the database.
-func (db *Database) RootEntity() *Entity {
-	return &Entity{
-		id: "0",
-	}
-}
-
-// Get returns the entity for a given path.
-func (db *Database) Get(name string) *Entity {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	e, err := db.get(name)
-	if err != nil {
-		return nil
-	}
-	return e
-}
-
-func (db *Database) get(name string) (*Entity, error) {
-	e := db.RootEntity()
-	// We always know the root name so return it if
-	// it is requested
-	if name == "/" {
-		return e, nil
-	}
-
-	parts := split(name)
-	for i := 1; i < len(parts); i++ {
-		p := parts[i]
-		if p == "" {
-			continue
-		}
-
-		next := db.child(e, p)
-		if next == nil {
-			return nil, fmt.Errorf("Cannot find child for %s", name)
-		}
-		e = next
-	}
-	return e, nil
-
-}
-
-// List all entities by from the name.
-// The key will be the full path of the entity.
-func (db *Database) List(name string, depth int) Entities {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	out := Entities{}
-	e, err := db.get(name)
-	if err != nil {
-		return out
-	}
-
-	children, err := db.children(e, name, depth, nil)
-	if err != nil {
-		return out
-	}
-
-	for _, c := range children {
-		out[c.FullPath] = c.Entity
-	}
-	return out
-}
-
-// Walk through the child graph of an entity, calling walkFunc for each child entity.
-// It is safe for walkFunc to call graph functions.
-func (db *Database) Walk(name string, walkFunc WalkFunc, depth int) error {
-	children, err := db.Children(name, depth)
-	if err != nil {
-		return err
-	}
-
-	// Note: the database lock must not be held while calling walkFunc
-	for _, c := range children {
-		if err := walkFunc(c.FullPath, c.Entity); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// Children returns the children of the specified entity.
-func (db *Database) Children(name string, depth int) ([]WalkMeta, error) {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	e, err := db.get(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return db.children(e, name, depth, nil)
-}
-
-// Parents returns the parents of a specified entity.
-func (db *Database) Parents(name string) ([]string, error) {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	e, err := db.get(name)
-	if err != nil {
-		return nil, err
-	}
-	return db.parents(e)
-}
-
-// Refs returns the reference count for a specified id.
-func (db *Database) Refs(id string) int {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	var count int
-	if err := db.conn.QueryRow("SELECT COUNT(*) FROM edge WHERE entity_id = ?;", id).Scan(&count); err != nil {
-		return 0
-	}
-	return count
-}
-
-// RefPaths returns all the id's path references.
-func (db *Database) RefPaths(id string) Edges {
-	db.mux.RLock()
-	defer db.mux.RUnlock()
-
-	refs := Edges{}
-
-	rows, err := db.conn.Query("SELECT name, parent_id FROM edge WHERE entity_id = ?;", id)
-	if err != nil {
-		return refs
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var name string
-		var parentID string
-		if err := rows.Scan(&name, &parentID); err != nil {
-			return refs
-		}
-		refs = append(refs, &Edge{
-			EntityID: id,
-			Name:     name,
-			ParentID: parentID,
-		})
-	}
-	return refs
-}
-
-// Delete the reference to an entity at a given path.
-func (db *Database) Delete(name string) error {
-	db.mux.Lock()
-	defer db.mux.Unlock()
-
-	if name == "/" {
-		return fmt.Errorf("Cannot delete root entity")
-	}
-
-	parentPath, n := splitPath(name)
-	parent, err := db.get(parentPath)
-	if err != nil {
-		return err
-	}
-
-	if _, err := db.conn.Exec("DELETE FROM edge WHERE parent_id = ? AND name = ?;", parent.id, n); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Purge removes the entity with the specified id
-// Walk the graph to make sure all references to the entity
-// are removed and return the number of references removed
-func (db *Database) Purge(id string) (int, error) {
-	db.mux.Lock()
-	defer db.mux.Unlock()
-
-	tx, err := db.conn.Begin()
-	if err != nil {
-		return -1, err
-	}
-
-	// Delete all edges
-	rows, err := tx.Exec("DELETE FROM edge WHERE entity_id = ?;", id)
-	if err != nil {
-		tx.Rollback()
-		return -1, err
-	}
-	changes, err := rows.RowsAffected()
-	if err != nil {
-		return -1, err
-	}
-
-	// Clear who's using this id as parent
-	refs, err := tx.Exec("DELETE FROM edge WHERE parent_id = ?;", id)
-	if err != nil {
-		tx.Rollback()
-		return -1, err
-	}
-	refsCount, err := refs.RowsAffected()
-	if err != nil {
-		return -1, err
-	}
-
-	// Delete entity
-	if _, err := tx.Exec("DELETE FROM entity where id = ?;", id); err != nil {
-		tx.Rollback()
-		return -1, err
-	}
-
-	if err := tx.Commit(); err != nil {
-		return -1, err
-	}
-
-	return int(changes + refsCount), nil
-}
-
-// Rename an edge for a given path
-func (db *Database) Rename(currentName, newName string) error {
-	db.mux.Lock()
-	defer db.mux.Unlock()
-
-	parentPath, name := splitPath(currentName)
-	newParentPath, newEdgeName := splitPath(newName)
-
-	if parentPath != newParentPath {
-		return fmt.Errorf("Cannot rename when root paths do not match %s != %s", parentPath, newParentPath)
-	}
-
-	parent, err := db.get(parentPath)
-	if err != nil {
-		return err
-	}
-
-	rows, err := db.conn.Exec("UPDATE edge SET name = ? WHERE parent_id = ? AND name = ?;", newEdgeName, parent.id, name)
-	if err != nil {
-		return err
-	}
-	i, err := rows.RowsAffected()
-	if err != nil {
-		return err
-	}
-	if i == 0 {
-		return fmt.Errorf("Cannot locate edge for %s %s", parent.id, name)
-	}
-	return nil
-}
-
-// WalkMeta stores the walk metadata.
-type WalkMeta struct {
-	Parent   *Entity
-	Entity   *Entity
-	FullPath string
-	Edge     *Edge
-}
-
-func (db *Database) children(e *Entity, name string, depth int, entities []WalkMeta) ([]WalkMeta, error) {
-	if e == nil {
-		return entities, nil
-	}
-
-	rows, err := db.conn.Query("SELECT entity_id, name FROM edge where parent_id = ?;", e.id)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var entityID, entityName string
-		if err := rows.Scan(&entityID, &entityName); err != nil {
-			return nil, err
-		}
-		child := &Entity{entityID}
-		edge := &Edge{
-			ParentID: e.id,
-			Name:     entityName,
-			EntityID: child.id,
-		}
-
-		meta := WalkMeta{
-			Parent:   e,
-			Entity:   child,
-			FullPath: path.Join(name, edge.Name),
-			Edge:     edge,
-		}
-
-		entities = append(entities, meta)
-
-		if depth != 0 {
-			nDepth := depth
-			if depth != -1 {
-				nDepth--
-			}
-			entities, err = db.children(child, meta.FullPath, nDepth, entities)
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	return entities, nil
-}
-
-func (db *Database) parents(e *Entity) (parents []string, err error) {
-	if e == nil {
-		return parents, nil
-	}
-
-	rows, err := db.conn.Query("SELECT parent_id FROM edge where entity_id = ?;", e.id)
-	if err != nil {
-		return nil, err
-	}
-	defer rows.Close()
-
-	for rows.Next() {
-		var parentID string
-		if err := rows.Scan(&parentID); err != nil {
-			return nil, err
-		}
-		parents = append(parents, parentID)
-	}
-
-	return parents, nil
-}
-
-// Return the entity based on the parent path and name.
-func (db *Database) child(parent *Entity, name string) *Entity {
-	var id string
-	if err := db.conn.QueryRow("SELECT entity_id FROM edge WHERE parent_id = ? AND name = ?;", parent.id, name).Scan(&id); err != nil {
-		return nil
-	}
-	return &Entity{id}
-}
-
-// ID returns the id used to reference this entity.
-func (e *Entity) ID() string {
-	return e.id
-}
-
-// Paths returns the paths sorted by depth.
-func (e Entities) Paths() []string {
-	out := make([]string, len(e))
-	var i int
-	for k := range e {
-		out[i] = k
-		i++
-	}
-	sortByDepth(out)
-
-	return out
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux_test.go
deleted file mode 100644
index f0fb074b4d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/graphdb_linux_test.go
+++ /dev/null
@@ -1,721 +0,0 @@
-package graphdb
-
-import (
-	"database/sql"
-	"fmt"
-	"os"
-	"path"
-	"runtime"
-	"strconv"
-	"testing"
-
-	_ "github.com/mattn/go-sqlite3"
-)
-
-func newTestDb(t *testing.T) (*Database, string) {
-	p := path.Join(os.TempDir(), "sqlite.db")
-	conn, err := sql.Open("sqlite3", p)
-	db, err := NewDatabase(conn)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return db, p
-}
-
-func destroyTestDb(dbPath string) {
-	os.Remove(dbPath)
-}
-
-func TestNewDatabase(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	if db == nil {
-		t.Fatal("Database should not be nil")
-	}
-	db.Close()
-	defer destroyTestDb(dbpath)
-}
-
-func TestCreateRootEntity(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-	root := db.RootEntity()
-	if root == nil {
-		t.Fatal("Root entity should not be nil")
-	}
-}
-
-func TestGetRootEntity(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	e := db.Get("/")
-	if e == nil {
-		t.Fatal("Entity should not be nil")
-	}
-	if e.ID() != "0" {
-		t.Fatalf("Entity id should be 0, got %s", e.ID())
-	}
-}
-
-func TestSetEntityWithDifferentName(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/test", "1")
-	if _, err := db.Set("/other", "1"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSetDuplicateEntity(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	if _, err := db.Set("/foo", "42"); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/foo", "43"); err == nil {
-		t.Fatalf("Creating an entry with a duplicate path did not cause an error")
-	}
-}
-
-func TestCreateChild(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	child, err := db.Set("/db", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if child == nil {
-		t.Fatal("Child should not be nil")
-	}
-	if child.ID() != "1" {
-		t.Fail()
-	}
-}
-
-func TestParents(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	for i := 1; i < 6; i++ {
-		a := strconv.Itoa(i)
-		if _, err := db.Set("/"+a, a); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	for i := 6; i < 11; i++ {
-		a := strconv.Itoa(i)
-		p := strconv.Itoa(i - 5)
-
-		key := fmt.Sprintf("/%s/%s", p, a)
-
-		if _, err := db.Set(key, a); err != nil {
-			t.Fatal(err)
-		}
-
-		parents, err := db.Parents(key)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(parents) != 1 {
-			t.Fatalf("Expected 1 entry for %s got %d", key, len(parents))
-		}
-
-		if parents[0] != p {
-			t.Fatalf("ID %s received, %s expected", parents[0], p)
-		}
-	}
-}
-
-func TestChildren(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	str := "/"
-	for i := 1; i < 6; i++ {
-		a := strconv.Itoa(i)
-		if _, err := db.Set(str+a, a); err != nil {
-			t.Fatal(err)
-		}
-
-		str = str + a + "/"
-	}
-
-	str = "/"
-	for i := 10; i < 30; i++ { // 20 entities
-		a := strconv.Itoa(i)
-		if _, err := db.Set(str+a, a); err != nil {
-			t.Fatal(err)
-		}
-
-		str = str + a + "/"
-	}
-	entries, err := db.Children("/", 5)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(entries) != 11 {
-		t.Fatalf("Expect 11 entries for / got %d", len(entries))
-	}
-
-	entries, err = db.Children("/", 20)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(entries) != 25 {
-		t.Fatalf("Expect 25 entries for / got %d", len(entries))
-	}
-}
-
-func TestListAllRootChildren(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	for i := 1; i < 6; i++ {
-		a := strconv.Itoa(i)
-		if _, err := db.Set("/"+a, a); err != nil {
-			t.Fatal(err)
-		}
-	}
-	entries := db.List("/", -1)
-	if len(entries) != 5 {
-		t.Fatalf("Expect 5 entries for / got %d", len(entries))
-	}
-}
-
-func TestListAllSubChildren(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	_, err := db.Set("/webapp", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child2, err := db.Set("/db", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child4, err := db.Set("/logs", "4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/db/logs", child4.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child3, err := db.Set("/sentry", "3")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/sentry", child3.ID()); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/db", child2.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	entries := db.List("/webapp", 1)
-	if len(entries) != 3 {
-		t.Fatalf("Expect 3 entries for / got %d", len(entries))
-	}
-
-	entries = db.List("/webapp", 0)
-	if len(entries) != 2 {
-		t.Fatalf("Expect 2 entries for / got %d", len(entries))
-	}
-}
-
-func TestAddSelfAsChild(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	child, err := db.Set("/test", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/test/other", child.ID()); err == nil {
-		t.Fatal("Error should not be nil")
-	}
-}
-
-func TestAddChildToNonExistentRoot(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	if _, err := db.Set("/myapp", "1"); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := db.Set("/myapp/proxy/db", "2"); err == nil {
-		t.Fatal("Error should not be nil")
-	}
-}
-
-func TestWalkAll(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-	_, err := db.Set("/webapp", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child2, err := db.Set("/db", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child4, err := db.Set("/db/logs", "4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/logs", child4.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child3, err := db.Set("/sentry", "3")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/sentry", child3.ID()); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/db", child2.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child5, err := db.Set("/gograph", "5")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/same-ref-diff-name", child5.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Walk("/", func(p string, e *Entity) error {
-		t.Logf("Path: %s Entity: %s", p, e.ID())
-		return nil
-	}, -1); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetEntityByPath(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-	_, err := db.Set("/webapp", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child2, err := db.Set("/db", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child4, err := db.Set("/logs", "4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/db/logs", child4.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child3, err := db.Set("/sentry", "3")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/sentry", child3.ID()); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/db", child2.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child5, err := db.Set("/gograph", "5")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/same-ref-diff-name", child5.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	entity := db.Get("/webapp/db/logs")
-	if entity == nil {
-		t.Fatal("Entity should not be nil")
-	}
-	if entity.ID() != "4" {
-		t.Fatalf("Expected to get entity with id 4, got %s", entity.ID())
-	}
-}
-
-func TestEnitiesPaths(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-	_, err := db.Set("/webapp", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child2, err := db.Set("/db", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child4, err := db.Set("/logs", "4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/db/logs", child4.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child3, err := db.Set("/sentry", "3")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/sentry", child3.ID()); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/db", child2.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child5, err := db.Set("/gograph", "5")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/same-ref-diff-name", child5.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	out := db.List("/", -1)
-	for _, p := range out.Paths() {
-		t.Log(p)
-	}
-}
-
-func TestDeleteRootEntity(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	if err := db.Delete("/"); err == nil {
-		t.Fatal("Error should not be nil")
-	}
-}
-
-func TestDeleteEntity(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-	_, err := db.Set("/webapp", "1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child2, err := db.Set("/db", "2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	child4, err := db.Set("/logs", "4")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/db/logs", child4.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child3, err := db.Set("/sentry", "3")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/sentry", child3.ID()); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/db", child2.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	child5, err := db.Set("/gograph", "5")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := db.Set("/webapp/same-ref-diff-name", child5.ID()); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := db.Delete("/webapp/sentry"); err != nil {
-		t.Fatal(err)
-	}
-	entity := db.Get("/webapp/sentry")
-	if entity != nil {
-		t.Fatal("Entity /webapp/sentry should be nil")
-	}
-}
-
-func TestCountRefs(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/webapp", "1")
-
-	if db.Refs("1") != 1 {
-		t.Fatal("Expect reference count to be 1")
-	}
-
-	db.Set("/db", "2")
-	db.Set("/webapp/db", "2")
-	if db.Refs("2") != 2 {
-		t.Fatal("Expect reference count to be 2")
-	}
-}
-
-func TestPurgeId(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/webapp", "1")
-
-	if c := db.Refs("1"); c != 1 {
-		t.Fatalf("Expect reference count to be 1, got %d", c)
-	}
-
-	db.Set("/db", "2")
-	db.Set("/webapp/db", "2")
-
-	count, err := db.Purge("2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if count != 2 {
-		t.Fatalf("Expected 2 references to be removed, got %d", count)
-	}
-}
-
-// Regression test https://github.com/docker/docker/issues/12334
-func TestPurgeIdRefPaths(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/webapp", "1")
-	db.Set("/db", "2")
-
-	db.Set("/db/webapp", "1")
-
-	if c := db.Refs("1"); c != 2 {
-		t.Fatalf("Expected 2 reference for webapp, got %d", c)
-	}
-	if c := db.Refs("2"); c != 1 {
-		t.Fatalf("Expected 1 reference for db, got %d", c)
-	}
-
-	if rp := db.RefPaths("2"); len(rp) != 1 {
-		t.Fatalf("Expected 1 reference path for db, got %d", len(rp))
-	}
-
-	count, err := db.Purge("2")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if count != 2 {
-		t.Fatalf("Expected 2 rows to be removed, got %d", count)
-	}
-
-	if c := db.Refs("2"); c != 0 {
-		t.Fatalf("Expected 0 reference for db, got %d", c)
-	}
-	if c := db.Refs("1"); c != 1 {
-		t.Fatalf("Expected 1 reference for webapp, got %d", c)
-	}
-}
-
-func TestRename(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/webapp", "1")
-
-	if db.Refs("1") != 1 {
-		t.Fatal("Expect reference count to be 1")
-	}
-
-	db.Set("/db", "2")
-	db.Set("/webapp/db", "2")
-
-	if db.Get("/webapp/db") == nil {
-		t.Fatal("Cannot find entity at path /webapp/db")
-	}
-
-	if err := db.Rename("/webapp/db", "/webapp/newdb"); err != nil {
-		t.Fatal(err)
-	}
-	if db.Get("/webapp/db") != nil {
-		t.Fatal("Entity should not exist at /webapp/db")
-	}
-	if db.Get("/webapp/newdb") == nil {
-		t.Fatal("Cannot find entity at path /webapp/newdb")
-	}
-
-}
-
-func TestCreateMultipleNames(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/db", "1")
-	if _, err := db.Set("/myapp", "1"); err != nil {
-		t.Fatal(err)
-	}
-
-	db.Walk("/", func(p string, e *Entity) error {
-		t.Logf("%s\n", p)
-		return nil
-	}, -1)
-}
-
-func TestRefPaths(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/webapp", "1")
-
-	db.Set("/db", "2")
-	db.Set("/webapp/db", "2")
-
-	refs := db.RefPaths("2")
-	if len(refs) != 2 {
-		t.Fatalf("Expected reference count to be 2, got %d", len(refs))
-	}
-}
-
-func TestExistsTrue(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/testing", "1")
-
-	if !db.Exists("/testing") {
-		t.Fatalf("/tesing should exist")
-	}
-}
-
-func TestExistsFalse(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/toerhe", "1")
-
-	if db.Exists("/testing") {
-		t.Fatalf("/tesing should not exist")
-	}
-
-}
-
-func TestGetNameWithTrailingSlash(t *testing.T) {
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	db.Set("/todo", "1")
-
-	e := db.Get("/todo/")
-	if e == nil {
-		t.Fatalf("Entity should not be nil")
-	}
-}
-
-func TestConcurrentWrites(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-	db, dbpath := newTestDb(t)
-	defer destroyTestDb(dbpath)
-
-	errs := make(chan error, 2)
-
-	save := func(name string, id string) {
-		if _, err := db.Set(fmt.Sprintf("/%s", name), id); err != nil {
-			errs <- err
-		}
-		errs <- nil
-	}
-	purge := func(id string) {
-		if _, err := db.Purge(id); err != nil {
-			errs <- err
-		}
-		errs <- nil
-	}
-
-	save("/1", "1")
-
-	go purge("1")
-	go save("/2", "2")
-
-	any := false
-	for i := 0; i < 2; i++ {
-		if err := <-errs; err != nil {
-			any = true
-			t.Log(err)
-		}
-	}
-	if any {
-		t.Fail()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux.go
deleted file mode 100644
index c07df077d8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package graphdb
-
-import "sort"
-
-type pathSorter struct {
-	paths []string
-	by    func(i, j string) bool
-}
-
-func sortByDepth(paths []string) {
-	s := &pathSorter{paths, func(i, j string) bool {
-		return PathDepth(i) > PathDepth(j)
-	}}
-	sort.Sort(s)
-}
-
-func (s *pathSorter) Len() int {
-	return len(s.paths)
-}
-
-func (s *pathSorter) Swap(i, j int) {
-	s.paths[i], s.paths[j] = s.paths[j], s.paths[i]
-}
-
-func (s *pathSorter) Less(i, j int) bool {
-	return s.by(s.paths[i], s.paths[j])
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux_test.go
deleted file mode 100644
index ddf2266f60..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/sort_linux_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package graphdb
-
-import (
-	"testing"
-)
-
-func TestSort(t *testing.T) {
-	paths := []string{
-		"/",
-		"/myreallylongname",
-		"/app/db",
-	}
-
-	sortByDepth(paths)
-
-	if len(paths) != 3 {
-		t.Fatalf("Expected 3 parts got %d", len(paths))
-	}
-
-	if paths[0] != "/app/db" {
-		t.Fatalf("Expected /app/db got %s", paths[0])
-	}
-	if paths[1] != "/myreallylongname" {
-		t.Fatalf("Expected /myreallylongname got %s", paths[1])
-	}
-	if paths[2] != "/" {
-		t.Fatalf("Expected / got %s", paths[2])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/unsupported.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/unsupported.go
deleted file mode 100644
index 2b8ba71724..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/unsupported.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// +build !cgo !linux
-
-package graphdb
diff --git a/installer/vendor/github.com/docker/docker/pkg/graphdb/utils_linux.go b/installer/vendor/github.com/docker/docker/pkg/graphdb/utils_linux.go
deleted file mode 100644
index 9edd79c35e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/graphdb/utils_linux.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package graphdb
-
-import (
-	"path"
-	"strings"
-)
-
-// Split p on /
-func split(p string) []string {
-	return strings.Split(p, "/")
-}
-
-// PathDepth returns the depth or number of / in a given path
-func PathDepth(p string) int {
-	parts := split(p)
-	if len(parts) == 2 && parts[1] == "" {
-		return 1
-	}
-	return len(parts)
-}
-
-func splitPath(p string) (parent, name string) {
-	if p[0] != '/' {
-		p = "/" + p
-	}
-	parent, name = path.Split(p)
-	l := len(parent)
-	if parent[l-1] == '/' {
-		parent = parent[:l-1]
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/homedir/homedir.go b/installer/vendor/github.com/docker/docker/pkg/homedir/homedir.go
deleted file mode 100644
index 8154e83f0c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/homedir/homedir.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package homedir
-
-import (
-	"os"
-	"runtime"
-
-	"github.com/opencontainers/runc/libcontainer/user"
-)
-
-// Key returns the env var name for the user's home dir based on
-// the platform being run on
-func Key() string {
-	if runtime.GOOS == "windows" {
-		return "USERPROFILE"
-	}
-	return "HOME"
-}
-
-// Get returns the home directory of the current user with the help of
-// environment variables depending on the target operating system.
-// Returned path should be used with "path/filepath" to form new paths.
-func Get() string {
-	home := os.Getenv(Key())
-	if home == "" && runtime.GOOS != "windows" {
-		if u, err := user.CurrentUser(); err == nil {
-			return u.Home
-		}
-	}
-	return home
-}
-
-// GetShortcutString returns the string that is shortcut to user's home directory
-// in the native shell of the platform running on.
-func GetShortcutString() string {
-	if runtime.GOOS == "windows" {
-		return "%USERPROFILE%" // be careful while using in format functions
-	}
-	return "~"
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/homedir/homedir_test.go b/installer/vendor/github.com/docker/docker/pkg/homedir/homedir_test.go
deleted file mode 100644
index 7a95cb2bd7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/homedir/homedir_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package homedir
-
-import (
-	"path/filepath"
-	"testing"
-)
-
-func TestGet(t *testing.T) {
-	home := Get()
-	if home == "" {
-		t.Fatal("returned home directory is empty")
-	}
-
-	if !filepath.IsAbs(home) {
-		t.Fatalf("returned path is not absolute: %s", home)
-	}
-}
-
-func TestGetShortcutString(t *testing.T) {
-	shortcut := GetShortcutString()
-	if shortcut == "" {
-		t.Fatal("returned shortcut string is empty")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/httputils.go b/installer/vendor/github.com/docker/docker/pkg/httputils/httputils.go
deleted file mode 100644
index d7dc43877d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/httputils.go
+++ /dev/null
@@ -1,56 +0,0 @@
-package httputils
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"regexp"
-	"strings"
-
-	"github.com/docker/docker/pkg/jsonmessage"
-)
-
-var (
-	headerRegexp     = regexp.MustCompile(`^(?:(.+)/(.+?))\((.+)\).*$`)
-	errInvalidHeader = errors.New("Bad header, should be in format `docker/version (platform)`")
-)
-
-// Download requests a given URL and returns an io.Reader.
-func Download(url string) (resp *http.Response, err error) {
-	if resp, err = http.Get(url); err != nil {
-		return nil, err
-	}
-	if resp.StatusCode >= 400 {
-		return nil, fmt.Errorf("Got HTTP status code >= 400: %s", resp.Status)
-	}
-	return resp, nil
-}
-
-// NewHTTPRequestError returns a JSON response error.
-func NewHTTPRequestError(msg string, res *http.Response) error {
-	return &jsonmessage.JSONError{
-		Message: msg,
-		Code:    res.StatusCode,
-	}
-}
-
-// ServerHeader contains the server information.
-type ServerHeader struct {
-	App string // docker
-	Ver string // 1.8.0-dev
-	OS  string // windows or linux
-}
-
-// ParseServerHeader extracts pieces from an HTTP server header
-// which is in the format "docker/version (os)" eg docker/1.8.0-dev (windows).
-func ParseServerHeader(hdr string) (*ServerHeader, error) {
-	matches := headerRegexp.FindStringSubmatch(hdr)
-	if len(matches) != 4 {
-		return nil, errInvalidHeader
-	}
-	return &ServerHeader{
-		App: strings.TrimSpace(matches[1]),
-		Ver: strings.TrimSpace(matches[2]),
-		OS:  strings.TrimSpace(matches[3]),
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/httputils_test.go b/installer/vendor/github.com/docker/docker/pkg/httputils/httputils_test.go
deleted file mode 100644
index d35d082156..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/httputils_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package httputils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-)
-
-func TestDownload(t *testing.T) {
-	expected := "Hello, docker !"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, expected)
-	}))
-	defer ts.Close()
-	response, err := Download(ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	actual, err := ioutil.ReadAll(response.Body)
-	response.Body.Close()
-
-	if err != nil || string(actual) != expected {
-		t.Fatalf("Expected the response %q, got err:%v, response:%v, actual:%s", expected, err, response, string(actual))
-	}
-}
-
-func TestDownload400Errors(t *testing.T) {
-	expectedError := "Got HTTP status code >= 400: 403 Forbidden"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// 403
-		http.Error(w, "something failed (forbidden)", http.StatusForbidden)
-	}))
-	defer ts.Close()
-	// Expected status code = 403
-	if _, err := Download(ts.URL); err == nil || err.Error() != expectedError {
-		t.Fatalf("Expected the the error %q, got %v", expectedError, err)
-	}
-}
-
-func TestDownloadOtherErrors(t *testing.T) {
-	if _, err := Download("I'm not an url.."); err == nil || !strings.Contains(err.Error(), "unsupported protocol scheme") {
-		t.Fatalf("Expected an error with 'unsupported protocol scheme', got %v", err)
-	}
-}
-
-func TestNewHTTPRequestError(t *testing.T) {
-	errorMessage := "Some error message"
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		// 403
-		http.Error(w, errorMessage, http.StatusForbidden)
-	}))
-	defer ts.Close()
-	httpResponse, err := http.Get(ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := NewHTTPRequestError(errorMessage, httpResponse); err.Error() != errorMessage {
-		t.Fatalf("Expected err to be %q, got %v", errorMessage, err)
-	}
-}
-
-func TestParseServerHeader(t *testing.T) {
-	inputs := map[string][]string{
-		"bad header":           {"error"},
-		"(bad header)":         {"error"},
-		"(without/spaces)":     {"error"},
-		"(header/with spaces)": {"error"},
-		"foo/bar (baz)":        {"foo", "bar", "baz"},
-		"foo/bar":              {"error"},
-		"foo":                  {"error"},
-		"foo/bar (baz space)":           {"foo", "bar", "baz space"},
-		"  f  f  /  b  b  (  b  s  )  ": {"f  f", "b  b", "b  s"},
-		"foo/bar (baz) ignore":          {"foo", "bar", "baz"},
-		"foo/bar ()":                    {"error"},
-		"foo/bar()":                     {"error"},
-		"foo/bar(baz)":                  {"foo", "bar", "baz"},
-		"foo/bar/zzz(baz)":              {"foo/bar", "zzz", "baz"},
-		"foo/bar(baz/abc)":              {"foo", "bar", "baz/abc"},
-		"foo/bar(baz (abc))":            {"foo", "bar", "baz (abc)"},
-	}
-
-	for header, values := range inputs {
-		serverHeader, err := ParseServerHeader(header)
-		if err != nil {
-			if err != errInvalidHeader {
-				t.Fatalf("Failed to parse %q, and got some unexpected error: %q", header, err)
-			}
-			if values[0] == "error" {
-				continue
-			}
-			t.Fatalf("Header %q failed to parse when it shouldn't have", header)
-		}
-		if values[0] == "error" {
-			t.Fatalf("Header %q parsed ok when it should have failed(%q).", header, serverHeader)
-		}
-
-		if serverHeader.App != values[0] {
-			t.Fatalf("Expected serverHeader.App for %q to equal %q, got %q", header, values[0], serverHeader.App)
-		}
-
-		if serverHeader.Ver != values[1] {
-			t.Fatalf("Expected serverHeader.Ver for %q to equal %q, got %q", header, values[1], serverHeader.Ver)
-		}
-
-		if serverHeader.OS != values[2] {
-			t.Fatalf("Expected serverHeader.OS for %q to equal %q, got %q", header, values[2], serverHeader.OS)
-		}
-
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype.go b/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype.go
deleted file mode 100644
index d5cf34e4f2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package httputils
-
-import (
-	"mime"
-	"net/http"
-)
-
-// MimeTypes stores the MIME content type.
-var MimeTypes = struct {
-	TextPlain   string
-	Tar         string
-	OctetStream string
-}{"text/plain", "application/tar", "application/octet-stream"}
-
-// DetectContentType returns a best guess representation of the MIME
-// content type for the bytes at c.  The value detected by
-// http.DetectContentType is guaranteed not be nil, defaulting to
-// application/octet-stream when a better guess cannot be made. The
-// result of this detection is then run through mime.ParseMediaType()
-// which separates the actual MIME string from any parameters.
-func DetectContentType(c []byte) (string, map[string]string, error) {
-
-	ct := http.DetectContentType(c)
-	contentType, args, err := mime.ParseMediaType(ct)
-	if err != nil {
-		return "", nil, err
-	}
-
-	return contentType, args, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype_test.go b/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype_test.go
deleted file mode 100644
index 9de433ee8c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/mimetype_test.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package httputils
-
-import (
-	"testing"
-)
-
-func TestDetectContentType(t *testing.T) {
-	input := []byte("That is just a plain text")
-
-	if contentType, _, err := DetectContentType(input); err != nil || contentType != "text/plain" {
-		t.Errorf("TestDetectContentType failed")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader.go b/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader.go
deleted file mode 100644
index bebc8608cd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package httputils
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-)
-
-type resumableRequestReader struct {
-	client          *http.Client
-	request         *http.Request
-	lastRange       int64
-	totalSize       int64
-	currentResponse *http.Response
-	failures        uint32
-	maxFailures     uint32
-}
-
-// ResumableRequestReader makes it possible to resume reading a request's body transparently
-// maxfail is the number of times we retry to make requests again (not resumes)
-// totalsize is the total length of the body; auto detect if not provided
-func ResumableRequestReader(c *http.Client, r *http.Request, maxfail uint32, totalsize int64) io.ReadCloser {
-	return &resumableRequestReader{client: c, request: r, maxFailures: maxfail, totalSize: totalsize}
-}
-
-// ResumableRequestReaderWithInitialResponse makes it possible to resume
-// reading the body of an already initiated request.
-func ResumableRequestReaderWithInitialResponse(c *http.Client, r *http.Request, maxfail uint32, totalsize int64, initialResponse *http.Response) io.ReadCloser {
-	return &resumableRequestReader{client: c, request: r, maxFailures: maxfail, totalSize: totalsize, currentResponse: initialResponse}
-}
-
-func (r *resumableRequestReader) Read(p []byte) (n int, err error) {
-	if r.client == nil || r.request == nil {
-		return 0, fmt.Errorf("client and request can't be nil\n")
-	}
-	isFreshRequest := false
-	if r.lastRange != 0 && r.currentResponse == nil {
-		readRange := fmt.Sprintf("bytes=%d-%d", r.lastRange, r.totalSize)
-		r.request.Header.Set("Range", readRange)
-		time.Sleep(5 * time.Second)
-	}
-	if r.currentResponse == nil {
-		r.currentResponse, err = r.client.Do(r.request)
-		isFreshRequest = true
-	}
-	if err != nil && r.failures+1 != r.maxFailures {
-		r.cleanUpResponse()
-		r.failures++
-		time.Sleep(5 * time.Duration(r.failures) * time.Second)
-		return 0, nil
-	} else if err != nil {
-		r.cleanUpResponse()
-		return 0, err
-	}
-	if r.currentResponse.StatusCode == 416 && r.lastRange == r.totalSize && r.currentResponse.ContentLength == 0 {
-		r.cleanUpResponse()
-		return 0, io.EOF
-	} else if r.currentResponse.StatusCode != 206 && r.lastRange != 0 && isFreshRequest {
-		r.cleanUpResponse()
-		return 0, fmt.Errorf("the server doesn't support byte ranges")
-	}
-	if r.totalSize == 0 {
-		r.totalSize = r.currentResponse.ContentLength
-	} else if r.totalSize <= 0 {
-		r.cleanUpResponse()
-		return 0, fmt.Errorf("failed to auto detect content length")
-	}
-	n, err = r.currentResponse.Body.Read(p)
-	r.lastRange += int64(n)
-	if err != nil {
-		r.cleanUpResponse()
-	}
-	if err != nil && err != io.EOF {
-		logrus.Infof("encountered error during pull and clearing it before resume: %s", err)
-		err = nil
-	}
-	return n, err
-}
-
-func (r *resumableRequestReader) Close() error {
-	r.cleanUpResponse()
-	r.client = nil
-	r.request = nil
-	return nil
-}
-
-func (r *resumableRequestReader) cleanUpResponse() {
-	if r.currentResponse != nil {
-		r.currentResponse.Body.Close()
-		r.currentResponse = nil
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader_test.go b/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader_test.go
deleted file mode 100644
index 5a2906db77..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/httputils/resumablerequestreader_test.go
+++ /dev/null
@@ -1,307 +0,0 @@
-package httputils
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"strings"
-	"testing"
-)
-
-func TestResumableRequestHeaderSimpleErrors(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, "Hello, world !")
-	}))
-	defer ts.Close()
-
-	client := &http.Client{}
-
-	var req *http.Request
-	req, err := http.NewRequest("GET", ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedError := "client and request can't be nil\n"
-	resreq := &resumableRequestReader{}
-	_, err = resreq.Read([]byte{})
-	if err == nil || err.Error() != expectedError {
-		t.Fatalf("Expected an error with '%s', got %v.", expectedError, err)
-	}
-
-	resreq = &resumableRequestReader{
-		client:    client,
-		request:   req,
-		totalSize: -1,
-	}
-	expectedError = "failed to auto detect content length"
-	_, err = resreq.Read([]byte{})
-	if err == nil || err.Error() != expectedError {
-		t.Fatalf("Expected an error with '%s', got %v.", expectedError, err)
-	}
-
-}
-
-// Not too much failures, bails out after some wait
-func TestResumableRequestHeaderNotTooMuchFailures(t *testing.T) {
-	client := &http.Client{}
-
-	var badReq *http.Request
-	badReq, err := http.NewRequest("GET", "I'm not an url", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resreq := &resumableRequestReader{
-		client:      client,
-		request:     badReq,
-		failures:    0,
-		maxFailures: 2,
-	}
-	read, err := resreq.Read([]byte{})
-	if err != nil || read != 0 {
-		t.Fatalf("Expected no error and no byte read, got err:%v, read:%v.", err, read)
-	}
-}
-
-// Too much failures, returns the error
-func TestResumableRequestHeaderTooMuchFailures(t *testing.T) {
-	client := &http.Client{}
-
-	var badReq *http.Request
-	badReq, err := http.NewRequest("GET", "I'm not an url", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resreq := &resumableRequestReader{
-		client:      client,
-		request:     badReq,
-		failures:    0,
-		maxFailures: 1,
-	}
-	defer resreq.Close()
-
-	expectedError := `Get I%27m%20not%20an%20url: unsupported protocol scheme ""`
-	read, err := resreq.Read([]byte{})
-	if err == nil || err.Error() != expectedError || read != 0 {
-		t.Fatalf("Expected the error '%s', got err:%v, read:%v.", expectedError, err, read)
-	}
-}
-
-type errorReaderCloser struct{}
-
-func (errorReaderCloser) Close() error { return nil }
-
-func (errorReaderCloser) Read(p []byte) (n int, err error) {
-	return 0, fmt.Errorf("An error occurred")
-}
-
-// If an unknown error is encountered, return 0, nil and log it
-func TestResumableRequestReaderWithReadError(t *testing.T) {
-	var req *http.Request
-	req, err := http.NewRequest("GET", "", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-
-	response := &http.Response{
-		Status:        "500 Internal Server",
-		StatusCode:    500,
-		ContentLength: 0,
-		Close:         true,
-		Body:          errorReaderCloser{},
-	}
-
-	resreq := &resumableRequestReader{
-		client:          client,
-		request:         req,
-		currentResponse: response,
-		lastRange:       1,
-		totalSize:       1,
-	}
-	defer resreq.Close()
-
-	buf := make([]byte, 1)
-	read, err := resreq.Read(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if read != 0 {
-		t.Fatalf("Expected to have read nothing, but read %v", read)
-	}
-}
-
-func TestResumableRequestReaderWithEOFWith416Response(t *testing.T) {
-	var req *http.Request
-	req, err := http.NewRequest("GET", "", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-
-	response := &http.Response{
-		Status:        "416 Requested Range Not Satisfiable",
-		StatusCode:    416,
-		ContentLength: 0,
-		Close:         true,
-		Body:          ioutil.NopCloser(strings.NewReader("")),
-	}
-
-	resreq := &resumableRequestReader{
-		client:          client,
-		request:         req,
-		currentResponse: response,
-		lastRange:       1,
-		totalSize:       1,
-	}
-	defer resreq.Close()
-
-	buf := make([]byte, 1)
-	_, err = resreq.Read(buf)
-	if err == nil || err != io.EOF {
-		t.Fatalf("Expected an io.EOF error, got %v", err)
-	}
-}
-
-func TestResumableRequestReaderWithServerDoesntSupportByteRanges(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Header.Get("Range") == "" {
-			t.Fatalf("Expected a Range HTTP header, got nothing")
-		}
-	}))
-	defer ts.Close()
-
-	var req *http.Request
-	req, err := http.NewRequest("GET", ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-
-	resreq := &resumableRequestReader{
-		client:    client,
-		request:   req,
-		lastRange: 1,
-	}
-	defer resreq.Close()
-
-	buf := make([]byte, 2)
-	_, err = resreq.Read(buf)
-	if err == nil || err.Error() != "the server doesn't support byte ranges" {
-		t.Fatalf("Expected an error 'the server doesn't support byte ranges', got %v", err)
-	}
-}
-
-func TestResumableRequestReaderWithZeroTotalSize(t *testing.T) {
-
-	srvtxt := "some response text data"
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, srvtxt)
-	}))
-	defer ts.Close()
-
-	var req *http.Request
-	req, err := http.NewRequest("GET", ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-	retries := uint32(5)
-
-	resreq := ResumableRequestReader(client, req, retries, 0)
-	defer resreq.Close()
-
-	data, err := ioutil.ReadAll(resreq)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resstr := strings.TrimSuffix(string(data), "\n")
-
-	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
-	}
-}
-
-func TestResumableRequestReader(t *testing.T) {
-
-	srvtxt := "some response text data"
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, srvtxt)
-	}))
-	defer ts.Close()
-
-	var req *http.Request
-	req, err := http.NewRequest("GET", ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-	retries := uint32(5)
-	imgSize := int64(len(srvtxt))
-
-	resreq := ResumableRequestReader(client, req, retries, imgSize)
-	defer resreq.Close()
-
-	data, err := ioutil.ReadAll(resreq)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resstr := strings.TrimSuffix(string(data), "\n")
-
-	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
-	}
-}
-
-func TestResumableRequestReaderWithInitialResponse(t *testing.T) {
-
-	srvtxt := "some response text data"
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintln(w, srvtxt)
-	}))
-	defer ts.Close()
-
-	var req *http.Request
-	req, err := http.NewRequest("GET", ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	client := &http.Client{}
-	retries := uint32(5)
-	imgSize := int64(len(srvtxt))
-
-	res, err := client.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resreq := ResumableRequestReaderWithInitialResponse(client, req, retries, imgSize, res)
-	defer resreq.Close()
-
-	data, err := ioutil.ReadAll(resreq)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	resstr := strings.TrimSuffix(string(data), "\n")
-
-	if resstr != srvtxt {
-		t.Errorf("resstr != srvtxt")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/installer/vendor/github.com/docker/docker/pkg/idtools/idtools.go
deleted file mode 100644
index 6bca466286..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools.go
+++ /dev/null
@@ -1,197 +0,0 @@
-package idtools
-
-import (
-	"bufio"
-	"fmt"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// IDMap contains a single entry for user namespace range remapping. An array
-// of IDMap entries represents the structure that will be provided to the Linux
-// kernel for creating a user namespace.
-type IDMap struct {
-	ContainerID int `json:"container_id"`
-	HostID      int `json:"host_id"`
-	Size        int `json:"size"`
-}
-
-type subIDRange struct {
-	Start  int
-	Length int
-}
-
-type ranges []subIDRange
-
-func (e ranges) Len() int           { return len(e) }
-func (e ranges) Swap(i, j int)      { e[i], e[j] = e[j], e[i] }
-func (e ranges) Less(i, j int) bool { return e[i].Start < e[j].Start }
-
-const (
-	subuidFileName string = "/etc/subuid"
-	subgidFileName string = "/etc/subgid"
-)
-
-// MkdirAllAs creates a directory (include any along the path) and then modifies
-// ownership to the requested uid/gid.  If the directory already exists, this
-// function will still change ownership to the requested uid/gid pair.
-func MkdirAllAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, true, true)
-}
-
-// MkdirAllNewAs creates a directory (include any along the path) and then modifies
-// ownership ONLY of newly created directories to the requested uid/gid. If the
-// directories along the path exist, no change of ownership will be performed
-func MkdirAllNewAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, true, false)
-}
-
-// MkdirAs creates a directory and then modifies ownership to the requested uid/gid.
-// If the directory already exists, this function still changes ownership
-func MkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int) error {
-	return mkdirAs(path, mode, ownerUID, ownerGID, false, true)
-}
-
-// GetRootUIDGID retrieves the remapped root uid/gid pair from the set of maps.
-// If the maps are empty, then the root uid/gid will default to "real" 0/0
-func GetRootUIDGID(uidMap, gidMap []IDMap) (int, int, error) {
-	var uid, gid int
-
-	if uidMap != nil {
-		xUID, err := ToHost(0, uidMap)
-		if err != nil {
-			return -1, -1, err
-		}
-		uid = xUID
-	}
-	if gidMap != nil {
-		xGID, err := ToHost(0, gidMap)
-		if err != nil {
-			return -1, -1, err
-		}
-		gid = xGID
-	}
-	return uid, gid, nil
-}
-
-// ToContainer takes an id mapping, and uses it to translate a
-// host ID to the remapped ID. If no map is provided, then the translation
-// assumes a 1-to-1 mapping and returns the passed in id
-func ToContainer(hostID int, idMap []IDMap) (int, error) {
-	if idMap == nil {
-		return hostID, nil
-	}
-	for _, m := range idMap {
-		if (hostID >= m.HostID) && (hostID <= (m.HostID + m.Size - 1)) {
-			contID := m.ContainerID + (hostID - m.HostID)
-			return contID, nil
-		}
-	}
-	return -1, fmt.Errorf("Host ID %d cannot be mapped to a container ID", hostID)
-}
-
-// ToHost takes an id mapping and a remapped ID, and translates the
-// ID to the mapped host ID. If no map is provided, then the translation
-// assumes a 1-to-1 mapping and returns the passed in id #
-func ToHost(contID int, idMap []IDMap) (int, error) {
-	if idMap == nil {
-		return contID, nil
-	}
-	for _, m := range idMap {
-		if (contID >= m.ContainerID) && (contID <= (m.ContainerID + m.Size - 1)) {
-			hostID := m.HostID + (contID - m.ContainerID)
-			return hostID, nil
-		}
-	}
-	return -1, fmt.Errorf("Container ID %d cannot be mapped to a host ID", contID)
-}
-
-// CreateIDMappings takes a requested user and group name and
-// using the data from /etc/sub{uid,gid} ranges, creates the
-// proper uid and gid remapping ranges for that user/group pair
-func CreateIDMappings(username, groupname string) ([]IDMap, []IDMap, error) {
-	subuidRanges, err := parseSubuid(username)
-	if err != nil {
-		return nil, nil, err
-	}
-	subgidRanges, err := parseSubgid(groupname)
-	if err != nil {
-		return nil, nil, err
-	}
-	if len(subuidRanges) == 0 {
-		return nil, nil, fmt.Errorf("No subuid ranges found for user %q", username)
-	}
-	if len(subgidRanges) == 0 {
-		return nil, nil, fmt.Errorf("No subgid ranges found for group %q", groupname)
-	}
-
-	return createIDMap(subuidRanges), createIDMap(subgidRanges), nil
-}
-
-func createIDMap(subidRanges ranges) []IDMap {
-	idMap := []IDMap{}
-
-	// sort the ranges by lowest ID first
-	sort.Sort(subidRanges)
-	containerID := 0
-	for _, idrange := range subidRanges {
-		idMap = append(idMap, IDMap{
-			ContainerID: containerID,
-			HostID:      idrange.Start,
-			Size:        idrange.Length,
-		})
-		containerID = containerID + idrange.Length
-	}
-	return idMap
-}
-
-func parseSubuid(username string) (ranges, error) {
-	return parseSubidFile(subuidFileName, username)
-}
-
-func parseSubgid(username string) (ranges, error) {
-	return parseSubidFile(subgidFileName, username)
-}
-
-// parseSubidFile will read the appropriate file (/etc/subuid or /etc/subgid)
-// and return all found ranges for a specified username. If the special value
-// "ALL" is supplied for username, then all ranges in the file will be returned
-func parseSubidFile(path, username string) (ranges, error) {
-	var rangeList ranges
-
-	subidFile, err := os.Open(path)
-	if err != nil {
-		return rangeList, err
-	}
-	defer subidFile.Close()
-
-	s := bufio.NewScanner(subidFile)
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return rangeList, err
-		}
-
-		text := strings.TrimSpace(s.Text())
-		if text == "" || strings.HasPrefix(text, "#") {
-			continue
-		}
-		parts := strings.Split(text, ":")
-		if len(parts) != 3 {
-			return rangeList, fmt.Errorf("Cannot parse subuid/gid information: Format not correct for %s file", path)
-		}
-		if parts[0] == username || username == "ALL" {
-			startid, err := strconv.Atoi(parts[1])
-			if err != nil {
-				return rangeList, fmt.Errorf("String to int conversion failed during subuid/gid parsing of %s: %v", path, err)
-			}
-			length, err := strconv.Atoi(parts[2])
-			if err != nil {
-				return rangeList, fmt.Errorf("String to int conversion failed during subuid/gid parsing of %s: %v", path, err)
-			}
-			rangeList = append(rangeList, subIDRange{startid, length})
-		}
-	}
-	return rangeList, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go b/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go
deleted file mode 100644
index f9eb31c3ec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// +build !windows
-
-package idtools
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/docker/docker/pkg/system"
-	"github.com/opencontainers/runc/libcontainer/user"
-)
-
-var (
-	entOnce   sync.Once
-	getentCmd string
-)
-
-func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {
-	// make an array containing the original path asked for, plus (for mkAll == true)
-	// all path components leading up to the complete path that don't exist before we MkdirAll
-	// so that we can chown all of them properly at the end.  If chownExisting is false, we won't
-	// chown the full directory path if it exists
-	var paths []string
-	if _, err := os.Stat(path); err != nil && os.IsNotExist(err) {
-		paths = []string{path}
-	} else if err == nil && chownExisting {
-		if err := os.Chown(path, ownerUID, ownerGID); err != nil {
-			return err
-		}
-		// short-circuit--we were called with an existing directory and chown was requested
-		return nil
-	} else if err == nil {
-		// nothing to do; directory path fully exists already and chown was NOT requested
-		return nil
-	}
-
-	if mkAll {
-		// walk back to "/" looking for directories which do not exist
-		// and add them to the paths array for chown after creation
-		dirPath := path
-		for {
-			dirPath = filepath.Dir(dirPath)
-			if dirPath == "/" {
-				break
-			}
-			if _, err := os.Stat(dirPath); err != nil && os.IsNotExist(err) {
-				paths = append(paths, dirPath)
-			}
-		}
-		if err := system.MkdirAll(path, mode); err != nil && !os.IsExist(err) {
-			return err
-		}
-	} else {
-		if err := os.Mkdir(path, mode); err != nil && !os.IsExist(err) {
-			return err
-		}
-	}
-	// even if it existed, we will chown the requested path + any subpaths that
-	// didn't exist when we called MkdirAll
-	for _, pathComponent := range paths {
-		if err := os.Chown(pathComponent, ownerUID, ownerGID); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// CanAccess takes a valid (existing) directory and a uid, gid pair and determines
-// if that uid, gid pair has access (execute bit) to the directory
-func CanAccess(path string, uid, gid int) bool {
-	statInfo, err := system.Stat(path)
-	if err != nil {
-		return false
-	}
-	fileMode := os.FileMode(statInfo.Mode())
-	permBits := fileMode.Perm()
-	return accessible(statInfo.UID() == uint32(uid),
-		statInfo.GID() == uint32(gid), permBits)
-}
-
-func accessible(isOwner, isGroup bool, perms os.FileMode) bool {
-	if isOwner && (perms&0100 == 0100) {
-		return true
-	}
-	if isGroup && (perms&0010 == 0010) {
-		return true
-	}
-	if perms&0001 == 0001 {
-		return true
-	}
-	return false
-}
-
-// LookupUser uses traditional local system files lookup (from libcontainer/user) on a username,
-// followed by a call to `getent` for supporting host configured non-files passwd and group dbs
-func LookupUser(username string) (user.User, error) {
-	// first try a local system files lookup using existing capabilities
-	usr, err := user.LookupUser(username)
-	if err == nil {
-		return usr, nil
-	}
-	// local files lookup failed; attempt to call `getent` to query configured passwd dbs
-	usr, err = getentUser(fmt.Sprintf("%s %s", "passwd", username))
-	if err != nil {
-		return user.User{}, err
-	}
-	return usr, nil
-}
-
-// LookupUID uses traditional local system files lookup (from libcontainer/user) on a uid,
-// followed by a call to `getent` for supporting host configured non-files passwd and group dbs
-func LookupUID(uid int) (user.User, error) {
-	// first try a local system files lookup using existing capabilities
-	usr, err := user.LookupUid(uid)
-	if err == nil {
-		return usr, nil
-	}
-	// local files lookup failed; attempt to call `getent` to query configured passwd dbs
-	return getentUser(fmt.Sprintf("%s %d", "passwd", uid))
-}
-
-func getentUser(args string) (user.User, error) {
-	reader, err := callGetent(args)
-	if err != nil {
-		return user.User{}, err
-	}
-	users, err := user.ParsePasswd(reader)
-	if err != nil {
-		return user.User{}, err
-	}
-	if len(users) == 0 {
-		return user.User{}, fmt.Errorf("getent failed to find passwd entry for %q", strings.Split(args, " ")[1])
-	}
-	return users[0], nil
-}
-
-// LookupGroup uses traditional local system files lookup (from libcontainer/user) on a group name,
-// followed by a call to `getent` for supporting host configured non-files passwd and group dbs
-func LookupGroup(groupname string) (user.Group, error) {
-	// first try a local system files lookup using existing capabilities
-	group, err := user.LookupGroup(groupname)
-	if err == nil {
-		return group, nil
-	}
-	// local files lookup failed; attempt to call `getent` to query configured group dbs
-	return getentGroup(fmt.Sprintf("%s %s", "group", groupname))
-}
-
-// LookupGID uses traditional local system files lookup (from libcontainer/user) on a group ID,
-// followed by a call to `getent` for supporting host configured non-files passwd and group dbs
-func LookupGID(gid int) (user.Group, error) {
-	// first try a local system files lookup using existing capabilities
-	group, err := user.LookupGid(gid)
-	if err == nil {
-		return group, nil
-	}
-	// local files lookup failed; attempt to call `getent` to query configured group dbs
-	return getentGroup(fmt.Sprintf("%s %d", "group", gid))
-}
-
-func getentGroup(args string) (user.Group, error) {
-	reader, err := callGetent(args)
-	if err != nil {
-		return user.Group{}, err
-	}
-	groups, err := user.ParseGroup(reader)
-	if err != nil {
-		return user.Group{}, err
-	}
-	if len(groups) == 0 {
-		return user.Group{}, fmt.Errorf("getent failed to find groups entry for %q", strings.Split(args, " ")[1])
-	}
-	return groups[0], nil
-}
-
-func callGetent(args string) (io.Reader, error) {
-	entOnce.Do(func() { getentCmd, _ = resolveBinary("getent") })
-	// if no `getent` command on host, can't do anything else
-	if getentCmd == "" {
-		return nil, fmt.Errorf("")
-	}
-	out, err := execCmd(getentCmd, args)
-	if err != nil {
-		exitCode, errC := system.GetExitCode(err)
-		if errC != nil {
-			return nil, err
-		}
-		switch exitCode {
-		case 1:
-			return nil, fmt.Errorf("getent reported invalid parameters/database unknown")
-		case 2:
-			terms := strings.Split(args, " ")
-			return nil, fmt.Errorf("getent unable to find entry %q in %s database", terms[1], terms[0])
-		case 3:
-			return nil, fmt.Errorf("getent database doesn't support enumeration")
-		default:
-			return nil, err
-		}
-
-	}
-	return bytes.NewReader(out), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix_test.go
deleted file mode 100644
index 540d3079ee..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_unix_test.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// +build !windows
-
-package idtools
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-)
-
-type node struct {
-	uid int
-	gid int
-}
-
-func TestMkdirAllAs(t *testing.T) {
-	dirName, err := ioutil.TempDir("", "mkdirall")
-	if err != nil {
-		t.Fatalf("Couldn't create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dirName)
-
-	testTree := map[string]node{
-		"usr":              {0, 0},
-		"usr/bin":          {0, 0},
-		"lib":              {33, 33},
-		"lib/x86_64":       {45, 45},
-		"lib/x86_64/share": {1, 1},
-	}
-
-	if err := buildTree(dirName, testTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test adding a directory to a pre-existing dir; only the new dir is owned by the uid/gid
-	if err := MkdirAllAs(filepath.Join(dirName, "usr", "share"), 0755, 99, 99); err != nil {
-		t.Fatal(err)
-	}
-	testTree["usr/share"] = node{99, 99}
-	verifyTree, err := readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test 2-deep new directories--both should be owned by the uid/gid pair
-	if err := MkdirAllAs(filepath.Join(dirName, "lib", "some", "other"), 0755, 101, 101); err != nil {
-		t.Fatal(err)
-	}
-	testTree["lib/some"] = node{101, 101}
-	testTree["lib/some/other"] = node{101, 101}
-	verifyTree, err = readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test a directory that already exists; should be chowned, but nothing else
-	if err := MkdirAllAs(filepath.Join(dirName, "usr"), 0755, 102, 102); err != nil {
-		t.Fatal(err)
-	}
-	testTree["usr"] = node{102, 102}
-	verifyTree, err = readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestMkdirAllNewAs(t *testing.T) {
-
-	dirName, err := ioutil.TempDir("", "mkdirnew")
-	if err != nil {
-		t.Fatalf("Couldn't create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dirName)
-
-	testTree := map[string]node{
-		"usr":              {0, 0},
-		"usr/bin":          {0, 0},
-		"lib":              {33, 33},
-		"lib/x86_64":       {45, 45},
-		"lib/x86_64/share": {1, 1},
-	}
-
-	if err := buildTree(dirName, testTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test adding a directory to a pre-existing dir; only the new dir is owned by the uid/gid
-	if err := MkdirAllNewAs(filepath.Join(dirName, "usr", "share"), 0755, 99, 99); err != nil {
-		t.Fatal(err)
-	}
-	testTree["usr/share"] = node{99, 99}
-	verifyTree, err := readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test 2-deep new directories--both should be owned by the uid/gid pair
-	if err := MkdirAllNewAs(filepath.Join(dirName, "lib", "some", "other"), 0755, 101, 101); err != nil {
-		t.Fatal(err)
-	}
-	testTree["lib/some"] = node{101, 101}
-	testTree["lib/some/other"] = node{101, 101}
-	verifyTree, err = readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test a directory that already exists; should NOT be chowned
-	if err := MkdirAllNewAs(filepath.Join(dirName, "usr"), 0755, 102, 102); err != nil {
-		t.Fatal(err)
-	}
-	verifyTree, err = readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestMkdirAs(t *testing.T) {
-
-	dirName, err := ioutil.TempDir("", "mkdir")
-	if err != nil {
-		t.Fatalf("Couldn't create temp dir: %v", err)
-	}
-	defer os.RemoveAll(dirName)
-
-	testTree := map[string]node{
-		"usr": {0, 0},
-	}
-	if err := buildTree(dirName, testTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// test a directory that already exists; should just chown to the requested uid/gid
-	if err := MkdirAs(filepath.Join(dirName, "usr"), 0755, 99, 99); err != nil {
-		t.Fatal(err)
-	}
-	testTree["usr"] = node{99, 99}
-	verifyTree, err := readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-
-	// create a subdir under a dir which doesn't exist--should fail
-	if err := MkdirAs(filepath.Join(dirName, "usr", "bin", "subdir"), 0755, 102, 102); err == nil {
-		t.Fatalf("Trying to create a directory with Mkdir where the parent doesn't exist should have failed")
-	}
-
-	// create a subdir under an existing dir; should only change the ownership of the new subdir
-	if err := MkdirAs(filepath.Join(dirName, "usr", "bin"), 0755, 102, 102); err != nil {
-		t.Fatal(err)
-	}
-	testTree["usr/bin"] = node{102, 102}
-	verifyTree, err = readTree(dirName, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := compareTrees(testTree, verifyTree); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func buildTree(base string, tree map[string]node) error {
-	for path, node := range tree {
-		fullPath := filepath.Join(base, path)
-		if err := os.MkdirAll(fullPath, 0755); err != nil {
-			return fmt.Errorf("Couldn't create path: %s; error: %v", fullPath, err)
-		}
-		if err := os.Chown(fullPath, node.uid, node.gid); err != nil {
-			return fmt.Errorf("Couldn't chown path: %s; error: %v", fullPath, err)
-		}
-	}
-	return nil
-}
-
-func readTree(base, root string) (map[string]node, error) {
-	tree := make(map[string]node)
-
-	dirInfos, err := ioutil.ReadDir(base)
-	if err != nil {
-		return nil, fmt.Errorf("Couldn't read directory entries for %q: %v", base, err)
-	}
-
-	for _, info := range dirInfos {
-		s := &syscall.Stat_t{}
-		if err := syscall.Stat(filepath.Join(base, info.Name()), s); err != nil {
-			return nil, fmt.Errorf("Can't stat file %q: %v", filepath.Join(base, info.Name()), err)
-		}
-		tree[filepath.Join(root, info.Name())] = node{int(s.Uid), int(s.Gid)}
-		if info.IsDir() {
-			// read the subdirectory
-			subtree, err := readTree(filepath.Join(base, info.Name()), filepath.Join(root, info.Name()))
-			if err != nil {
-				return nil, err
-			}
-			for path, nodeinfo := range subtree {
-				tree[path] = nodeinfo
-			}
-		}
-	}
-	return tree, nil
-}
-
-func compareTrees(left, right map[string]node) error {
-	if len(left) != len(right) {
-		return fmt.Errorf("Trees aren't the same size")
-	}
-	for path, nodeLeft := range left {
-		if nodeRight, ok := right[path]; ok {
-			if nodeRight.uid != nodeLeft.uid || nodeRight.gid != nodeLeft.gid {
-				// mismatch
-				return fmt.Errorf("mismatched ownership for %q: expected: %d:%d, got: %d:%d", path,
-					nodeLeft.uid, nodeLeft.gid, nodeRight.uid, nodeRight.gid)
-			}
-			continue
-		}
-		return fmt.Errorf("right tree didn't contain path %q", path)
-	}
-	return nil
-}
-
-func TestParseSubidFileWithNewlinesAndComments(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "parsesubid")
-	if err != nil {
-		t.Fatal(err)
-	}
-	fnamePath := filepath.Join(tmpDir, "testsubuid")
-	fcontent := `tss:100000:65536
-# empty default subuid/subgid file
-
-dockremap:231072:65536`
-	if err := ioutil.WriteFile(fnamePath, []byte(fcontent), 0644); err != nil {
-		t.Fatal(err)
-	}
-	ranges, err := parseSubidFile(fnamePath, "dockremap")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(ranges) != 1 {
-		t.Fatalf("wanted 1 element in ranges, got %d instead", len(ranges))
-	}
-	if ranges[0].Start != 231072 {
-		t.Fatalf("wanted 231072, got %d instead", ranges[0].Start)
-	}
-	if ranges[0].Length != 65536 {
-		t.Fatalf("wanted 65536, got %d instead", ranges[0].Length)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go b/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go
deleted file mode 100644
index 49f67e78c1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/idtools_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build windows
-
-package idtools
-
-import (
-	"os"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// Platforms such as Windows do not support the UID/GID concept. So make this
-// just a wrapper around system.MkdirAll.
-func mkdirAs(path string, mode os.FileMode, ownerUID, ownerGID int, mkAll, chownExisting bool) error {
-	if err := system.MkdirAll(path, mode); err != nil && !os.IsExist(err) {
-		return err
-	}
-	return nil
-}
-
-// CanAccess takes a valid (existing) directory and a uid, gid pair and determines
-// if that uid, gid pair has access (execute bit) to the directory
-// Windows does not require/support this function, so always return true
-func CanAccess(path string, uid, gid int) bool {
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go b/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
deleted file mode 100644
index 9da7975e2c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_linux.go
+++ /dev/null
@@ -1,164 +0,0 @@
-package idtools
-
-import (
-	"fmt"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-)
-
-// add a user and/or group to Linux /etc/passwd, /etc/group using standard
-// Linux distribution commands:
-// adduser --system --shell /bin/false --disabled-login --disabled-password --no-create-home --group <username>
-// useradd -r -s /bin/false <username>
-
-var (
-	once        sync.Once
-	userCommand string
-
-	cmdTemplates = map[string]string{
-		"adduser": "--system --shell /bin/false --no-create-home --disabled-login --disabled-password --group %s",
-		"useradd": "-r -s /bin/false %s",
-		"usermod": "-%s %d-%d %s",
-	}
-
-	idOutRegexp = regexp.MustCompile(`uid=([0-9]+).*gid=([0-9]+)`)
-	// default length for a UID/GID subordinate range
-	defaultRangeLen   = 65536
-	defaultRangeStart = 100000
-	userMod           = "usermod"
-)
-
-// AddNamespaceRangesUser takes a username and uses the standard system
-// utility to create a system user/group pair used to hold the
-// /etc/sub{uid,gid} ranges which will be used for user namespace
-// mapping ranges in containers.
-func AddNamespaceRangesUser(name string) (int, int, error) {
-	if err := addUser(name); err != nil {
-		return -1, -1, fmt.Errorf("Error adding user %q: %v", name, err)
-	}
-
-	// Query the system for the created uid and gid pair
-	out, err := execCmd("id", name)
-	if err != nil {
-		return -1, -1, fmt.Errorf("Error trying to find uid/gid for new user %q: %v", name, err)
-	}
-	matches := idOutRegexp.FindStringSubmatch(strings.TrimSpace(string(out)))
-	if len(matches) != 3 {
-		return -1, -1, fmt.Errorf("Can't find uid, gid from `id` output: %q", string(out))
-	}
-	uid, err := strconv.Atoi(matches[1])
-	if err != nil {
-		return -1, -1, fmt.Errorf("Can't convert found uid (%s) to int: %v", matches[1], err)
-	}
-	gid, err := strconv.Atoi(matches[2])
-	if err != nil {
-		return -1, -1, fmt.Errorf("Can't convert found gid (%s) to int: %v", matches[2], err)
-	}
-
-	// Now we need to create the subuid/subgid ranges for our new user/group (system users
-	// do not get auto-created ranges in subuid/subgid)
-
-	if err := createSubordinateRanges(name); err != nil {
-		return -1, -1, fmt.Errorf("Couldn't create subordinate ID ranges: %v", err)
-	}
-	return uid, gid, nil
-}
-
-func addUser(userName string) error {
-	once.Do(func() {
-		// set up which commands are used for adding users/groups dependent on distro
-		if _, err := resolveBinary("adduser"); err == nil {
-			userCommand = "adduser"
-		} else if _, err := resolveBinary("useradd"); err == nil {
-			userCommand = "useradd"
-		}
-	})
-	if userCommand == "" {
-		return fmt.Errorf("Cannot add user; no useradd/adduser binary found")
-	}
-	args := fmt.Sprintf(cmdTemplates[userCommand], userName)
-	out, err := execCmd(userCommand, args)
-	if err != nil {
-		return fmt.Errorf("Failed to add user with error: %v; output: %q", err, string(out))
-	}
-	return nil
-}
-
-func createSubordinateRanges(name string) error {
-
-	// first, we should verify that ranges weren't automatically created
-	// by the distro tooling
-	ranges, err := parseSubuid(name)
-	if err != nil {
-		return fmt.Errorf("Error while looking for subuid ranges for user %q: %v", name, err)
-	}
-	if len(ranges) == 0 {
-		// no UID ranges; let's create one
-		startID, err := findNextUIDRange()
-		if err != nil {
-			return fmt.Errorf("Can't find available subuid range: %v", err)
-		}
-		out, err := execCmd(userMod, fmt.Sprintf(cmdTemplates[userMod], "v", startID, startID+defaultRangeLen-1, name))
-		if err != nil {
-			return fmt.Errorf("Unable to add subuid range to user: %q; output: %s, err: %v", name, out, err)
-		}
-	}
-
-	ranges, err = parseSubgid(name)
-	if err != nil {
-		return fmt.Errorf("Error while looking for subgid ranges for user %q: %v", name, err)
-	}
-	if len(ranges) == 0 {
-		// no GID ranges; let's create one
-		startID, err := findNextGIDRange()
-		if err != nil {
-			return fmt.Errorf("Can't find available subgid range: %v", err)
-		}
-		out, err := execCmd(userMod, fmt.Sprintf(cmdTemplates[userMod], "w", startID, startID+defaultRangeLen-1, name))
-		if err != nil {
-			return fmt.Errorf("Unable to add subgid range to user: %q; output: %s, err: %v", name, out, err)
-		}
-	}
-	return nil
-}
-
-func findNextUIDRange() (int, error) {
-	ranges, err := parseSubuid("ALL")
-	if err != nil {
-		return -1, fmt.Errorf("Couldn't parse all ranges in /etc/subuid file: %v", err)
-	}
-	sort.Sort(ranges)
-	return findNextRangeStart(ranges)
-}
-
-func findNextGIDRange() (int, error) {
-	ranges, err := parseSubgid("ALL")
-	if err != nil {
-		return -1, fmt.Errorf("Couldn't parse all ranges in /etc/subgid file: %v", err)
-	}
-	sort.Sort(ranges)
-	return findNextRangeStart(ranges)
-}
-
-func findNextRangeStart(rangeList ranges) (int, error) {
-	startID := defaultRangeStart
-	for _, arange := range rangeList {
-		if wouldOverlap(arange, startID) {
-			startID = arange.Start + arange.Length
-		}
-	}
-	return startID, nil
-}
-
-func wouldOverlap(arange subIDRange, ID int) bool {
-	low := ID
-	high := ID + defaultRangeLen
-	if (low >= arange.Start && low <= arange.Start+arange.Length) ||
-		(high <= arange.Start+arange.Length && high >= arange.Start) {
-		return true
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
deleted file mode 100644
index d98b354cbd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/usergroupadd_unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux
-
-package idtools
-
-import "fmt"
-
-// AddNamespaceRangesUser takes a name and finds an unused uid, gid pair
-// and calls the appropriate helper function to add the group and then
-// the user to the group in /etc/group and /etc/passwd respectively.
-func AddNamespaceRangesUser(name string) (int, int, error) {
-	return -1, -1, fmt.Errorf("No support for adding users or groups on this OS")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/idtools/utils_unix.go b/installer/vendor/github.com/docker/docker/pkg/idtools/utils_unix.go
deleted file mode 100644
index 9703ecbd9d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/idtools/utils_unix.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build !windows
-
-package idtools
-
-import (
-	"fmt"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func resolveBinary(binname string) (string, error) {
-	binaryPath, err := exec.LookPath(binname)
-	if err != nil {
-		return "", err
-	}
-	resolvedPath, err := filepath.EvalSymlinks(binaryPath)
-	if err != nil {
-		return "", err
-	}
-	//only return no error if the final resolved binary basename
-	//matches what was searched for
-	if filepath.Base(resolvedPath) == binname {
-		return resolvedPath, nil
-	}
-	return "", fmt.Errorf("Binary %q does not resolve to a binary of that name in $PATH (%q)", binname, resolvedPath)
-}
-
-func execCmd(cmd, args string) ([]byte, error) {
-	execCmd := exec.Command(cmd, strings.Split(args, " ")...)
-	return execCmd.CombinedOutput()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/integration/checker/checker.go b/installer/vendor/github.com/docker/docker/pkg/integration/checker/checker.go
deleted file mode 100644
index d1b703a599..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/integration/checker/checker.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Package checker provides Docker specific implementations of the go-check.Checker interface.
-package checker
-
-import (
-	"github.com/go-check/check"
-	"github.com/vdemeester/shakers"
-)
-
-// As a commodity, we bring all check.Checker variables into the current namespace to avoid having
-// to think about check.X versus checker.X.
-var (
-	DeepEquals   = check.DeepEquals
-	ErrorMatches = check.ErrorMatches
-	FitsTypeOf   = check.FitsTypeOf
-	HasLen       = check.HasLen
-	Implements   = check.Implements
-	IsNil        = check.IsNil
-	Matches      = check.Matches
-	Not          = check.Not
-	NotNil       = check.NotNil
-	PanicMatches = check.PanicMatches
-	Panics       = check.Panics
-
-	Contains           = shakers.Contains
-	ContainsAny        = shakers.ContainsAny
-	Count              = shakers.Count
-	Equals             = shakers.Equals
-	EqualFold          = shakers.EqualFold
-	False              = shakers.False
-	GreaterOrEqualThan = shakers.GreaterOrEqualThan
-	GreaterThan        = shakers.GreaterThan
-	HasPrefix          = shakers.HasPrefix
-	HasSuffix          = shakers.HasSuffix
-	Index              = shakers.Index
-	IndexAny           = shakers.IndexAny
-	IsAfter            = shakers.IsAfter
-	IsBefore           = shakers.IsBefore
-	IsBetween          = shakers.IsBetween
-	IsLower            = shakers.IsLower
-	IsUpper            = shakers.IsUpper
-	LessOrEqualThan    = shakers.LessOrEqualThan
-	LessThan           = shakers.LessThan
-	TimeEquals         = shakers.TimeEquals
-	True               = shakers.True
-	TimeIgnore         = shakers.TimeIgnore
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command.go b/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command.go
deleted file mode 100644
index 76d04e8df5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command.go
+++ /dev/null
@@ -1,294 +0,0 @@
-package cmd
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/system"
-	"github.com/go-check/check"
-)
-
-type testingT interface {
-	Fatalf(string, ...interface{})
-}
-
-const (
-	// None is a token to inform Result.Assert that the output should be empty
-	None string = "<NOTHING>"
-)
-
-type lockedBuffer struct {
-	m   sync.RWMutex
-	buf bytes.Buffer
-}
-
-func (buf *lockedBuffer) Write(b []byte) (int, error) {
-	buf.m.Lock()
-	defer buf.m.Unlock()
-	return buf.buf.Write(b)
-}
-
-func (buf *lockedBuffer) String() string {
-	buf.m.RLock()
-	defer buf.m.RUnlock()
-	return buf.buf.String()
-}
-
-// Result stores the result of running a command
-type Result struct {
-	Cmd      *exec.Cmd
-	ExitCode int
-	Error    error
-	// Timeout is true if the command was killed because it ran for too long
-	Timeout   bool
-	outBuffer *lockedBuffer
-	errBuffer *lockedBuffer
-}
-
-// Assert compares the Result against the Expected struct, and fails the test if
-// any of the expcetations are not met.
-func (r *Result) Assert(t testingT, exp Expected) {
-	err := r.Compare(exp)
-	if err == nil {
-		return
-	}
-
-	_, file, line, _ := runtime.Caller(1)
-	t.Fatalf("at %s:%d\n%s", filepath.Base(file), line, err.Error())
-}
-
-// Compare returns an formatted error with the command, stdout, stderr, exit
-// code, and any failed expectations
-func (r *Result) Compare(exp Expected) error {
-	errors := []string{}
-	add := func(format string, args ...interface{}) {
-		errors = append(errors, fmt.Sprintf(format, args...))
-	}
-
-	if exp.ExitCode != r.ExitCode {
-		add("ExitCode was %d expected %d", r.ExitCode, exp.ExitCode)
-	}
-	if exp.Timeout != r.Timeout {
-		if exp.Timeout {
-			add("Expected command to timeout")
-		} else {
-			add("Expected command to finish, but it hit the timeout")
-		}
-	}
-	if !matchOutput(exp.Out, r.Stdout()) {
-		add("Expected stdout to contain %q", exp.Out)
-	}
-	if !matchOutput(exp.Err, r.Stderr()) {
-		add("Expected stderr to contain %q", exp.Err)
-	}
-	switch {
-	// If a non-zero exit code is expected there is going to be an error.
-	// Don't require an error message as well as an exit code because the
-	// error message is going to be "exit status <code> which is not useful
-	case exp.Error == "" && exp.ExitCode != 0:
-	case exp.Error == "" && r.Error != nil:
-		add("Expected no error")
-	case exp.Error != "" && r.Error == nil:
-		add("Expected error to contain %q, but there was no error", exp.Error)
-	case exp.Error != "" && !strings.Contains(r.Error.Error(), exp.Error):
-		add("Expected error to contain %q", exp.Error)
-	}
-
-	if len(errors) == 0 {
-		return nil
-	}
-	return fmt.Errorf("%s\nFailures:\n%s\n", r, strings.Join(errors, "\n"))
-}
-
-func matchOutput(expected string, actual string) bool {
-	switch expected {
-	case None:
-		return actual == ""
-	default:
-		return strings.Contains(actual, expected)
-	}
-}
-
-func (r *Result) String() string {
-	var timeout string
-	if r.Timeout {
-		timeout = " (timeout)"
-	}
-
-	return fmt.Sprintf(`
-Command: %s
-ExitCode: %d%s, Error: %s
-Stdout: %v
-Stderr: %v
-`,
-		strings.Join(r.Cmd.Args, " "),
-		r.ExitCode,
-		timeout,
-		r.Error,
-		r.Stdout(),
-		r.Stderr())
-}
-
-// Expected is the expected output from a Command. This struct is compared to a
-// Result struct by Result.Assert().
-type Expected struct {
-	ExitCode int
-	Timeout  bool
-	Error    string
-	Out      string
-	Err      string
-}
-
-// Success is the default expected result
-var Success = Expected{}
-
-// Stdout returns the stdout of the process as a string
-func (r *Result) Stdout() string {
-	return r.outBuffer.String()
-}
-
-// Stderr returns the stderr of the process as a string
-func (r *Result) Stderr() string {
-	return r.errBuffer.String()
-}
-
-// Combined returns the stdout and stderr combined into a single string
-func (r *Result) Combined() string {
-	return r.outBuffer.String() + r.errBuffer.String()
-}
-
-// SetExitError sets Error and ExitCode based on Error
-func (r *Result) SetExitError(err error) {
-	if err == nil {
-		return
-	}
-	r.Error = err
-	r.ExitCode = system.ProcessExitCode(err)
-}
-
-type matches struct{}
-
-// Info returns the CheckerInfo
-func (m *matches) Info() *check.CheckerInfo {
-	return &check.CheckerInfo{
-		Name:   "CommandMatches",
-		Params: []string{"result", "expected"},
-	}
-}
-
-// Check compares a result against the expected
-func (m *matches) Check(params []interface{}, names []string) (bool, string) {
-	result, ok := params[0].(*Result)
-	if !ok {
-		return false, fmt.Sprintf("result must be a *Result, not %T", params[0])
-	}
-	expected, ok := params[1].(Expected)
-	if !ok {
-		return false, fmt.Sprintf("expected must be an Expected, not %T", params[1])
-	}
-
-	err := result.Compare(expected)
-	if err == nil {
-		return true, ""
-	}
-	return false, err.Error()
-}
-
-// Matches is a gocheck.Checker for comparing a Result against an Expected
-var Matches = &matches{}
-
-// Cmd contains the arguments and options for a process to run as part of a test
-// suite.
-type Cmd struct {
-	Command []string
-	Timeout time.Duration
-	Stdin   io.Reader
-	Stdout  io.Writer
-	Dir     string
-	Env     []string
-}
-
-// RunCmd runs a command and returns a Result
-func RunCmd(cmd Cmd) *Result {
-	result := StartCmd(cmd)
-	if result.Error != nil {
-		return result
-	}
-	return WaitOnCmd(cmd.Timeout, result)
-}
-
-// RunCommand parses a command line and runs it, returning a result
-func RunCommand(command string, args ...string) *Result {
-	return RunCmd(Cmd{Command: append([]string{command}, args...)})
-}
-
-// StartCmd starts a command, but doesn't wait for it to finish
-func StartCmd(cmd Cmd) *Result {
-	result := buildCmd(cmd)
-	if result.Error != nil {
-		return result
-	}
-	result.SetExitError(result.Cmd.Start())
-	return result
-}
-
-func buildCmd(cmd Cmd) *Result {
-	var execCmd *exec.Cmd
-	switch len(cmd.Command) {
-	case 1:
-		execCmd = exec.Command(cmd.Command[0])
-	default:
-		execCmd = exec.Command(cmd.Command[0], cmd.Command[1:]...)
-	}
-	outBuffer := new(lockedBuffer)
-	errBuffer := new(lockedBuffer)
-
-	execCmd.Stdin = cmd.Stdin
-	execCmd.Dir = cmd.Dir
-	execCmd.Env = cmd.Env
-	if cmd.Stdout != nil {
-		execCmd.Stdout = io.MultiWriter(outBuffer, cmd.Stdout)
-	} else {
-		execCmd.Stdout = outBuffer
-	}
-	execCmd.Stderr = errBuffer
-	return &Result{
-		Cmd:       execCmd,
-		outBuffer: outBuffer,
-		errBuffer: errBuffer,
-	}
-}
-
-// WaitOnCmd waits for a command to complete. If timeout is non-nil then
-// only wait until the timeout.
-func WaitOnCmd(timeout time.Duration, result *Result) *Result {
-	if timeout == time.Duration(0) {
-		result.SetExitError(result.Cmd.Wait())
-		return result
-	}
-
-	done := make(chan error, 1)
-	// Wait for command to exit in a goroutine
-	go func() {
-		done <- result.Cmd.Wait()
-	}()
-
-	select {
-	case <-time.After(timeout):
-		killErr := result.Cmd.Process.Kill()
-		if killErr != nil {
-			fmt.Printf("failed to kill (pid=%d): %v\n", result.Cmd.Process.Pid, killErr)
-		}
-		result.Timeout = true
-	case err := <-done:
-		result.SetExitError(err)
-	}
-	return result
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command_test.go b/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command_test.go
deleted file mode 100644
index df23442079..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/integration/cmd/command_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package cmd
-
-import (
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-func TestRunCommand(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	var cmd string
-	if runtime.GOOS == "solaris" {
-		cmd = "gls"
-	} else {
-		cmd = "ls"
-	}
-	result := RunCommand(cmd)
-	result.Assert(t, Expected{})
-
-	result = RunCommand("doesnotexists")
-	expectedError := `exec: "doesnotexists": executable file not found`
-	result.Assert(t, Expected{ExitCode: 127, Error: expectedError})
-
-	result = RunCommand(cmd, "-z")
-	result.Assert(t, Expected{
-		ExitCode: 2,
-		Error:    "exit status 2",
-		Err:      "invalid option",
-	})
-	assert.Contains(t, result.Combined(), "invalid option")
-}
-
-func TestRunCommandWithCombined(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	result := RunCommand("ls", "-a")
-	result.Assert(t, Expected{})
-
-	assert.Contains(t, result.Combined(), "..")
-	assert.Contains(t, result.Stdout(), "..")
-}
-
-func TestRunCommandWithTimeoutFinished(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	result := RunCmd(Cmd{
-		Command: []string{"ls", "-a"},
-		Timeout: 50 * time.Millisecond,
-	})
-	result.Assert(t, Expected{Out: ".."})
-}
-
-func TestRunCommandWithTimeoutKilled(t *testing.T) {
-	// TODO Windows: Port this test
-	if runtime.GOOS == "windows" {
-		t.Skip("Needs porting to Windows")
-	}
-
-	command := []string{"sh", "-c", "while true ; do echo 1 ; sleep .5 ; done"}
-	result := RunCmd(Cmd{Command: command, Timeout: 1250 * time.Millisecond})
-	result.Assert(t, Expected{Timeout: true})
-
-	ones := strings.Split(result.Stdout(), "\n")
-	assert.Equal(t, len(ones), 4)
-}
-
-func TestRunCommandWithErrors(t *testing.T) {
-	result := RunCommand("/foobar")
-	result.Assert(t, Expected{Error: "foobar", ExitCode: 127})
-}
-
-func TestRunCommandWithStdoutStderr(t *testing.T) {
-	result := RunCommand("echo", "hello", "world")
-	result.Assert(t, Expected{Out: "hello world\n", Err: None})
-}
-
-func TestRunCommandWithStdoutStderrError(t *testing.T) {
-	result := RunCommand("doesnotexists")
-
-	expected := `exec: "doesnotexists": executable file not found`
-	result.Assert(t, Expected{Out: None, Err: None, ExitCode: 127, Error: expected})
-
-	switch runtime.GOOS {
-	case "windows":
-		expected = "ls: unknown option"
-	case "solaris":
-		expected = "gls: invalid option"
-	default:
-		expected = "ls: invalid option"
-	}
-
-	var cmd string
-	if runtime.GOOS == "solaris" {
-		cmd = "gls"
-	} else {
-		cmd = "ls"
-	}
-	result = RunCommand(cmd, "-z")
-	result.Assert(t, Expected{
-		Out:      None,
-		Err:      expected,
-		ExitCode: 2,
-		Error:    "exit status 2",
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/integration/utils.go b/installer/vendor/github.com/docker/docker/pkg/integration/utils.go
deleted file mode 100644
index f2089c43c4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/integration/utils.go
+++ /dev/null
@@ -1,227 +0,0 @@
-package integration
-
-import (
-	"archive/tar"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"syscall"
-	"time"
-
-	icmd "github.com/docker/docker/pkg/integration/cmd"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/docker/docker/pkg/system"
-)
-
-// IsKilled process the specified error and returns whether the process was killed or not.
-func IsKilled(err error) bool {
-	if exitErr, ok := err.(*exec.ExitError); ok {
-		status, ok := exitErr.Sys().(syscall.WaitStatus)
-		if !ok {
-			return false
-		}
-		// status.ExitStatus() is required on Windows because it does not
-		// implement Signal() nor Signaled(). Just check it had a bad exit
-		// status could mean it was killed (and in tests we do kill)
-		return (status.Signaled() && status.Signal() == os.Kill) || status.ExitStatus() != 0
-	}
-	return false
-}
-
-func runCommandWithOutput(cmd *exec.Cmd) (output string, exitCode int, err error) {
-	exitCode = 0
-	out, err := cmd.CombinedOutput()
-	exitCode = system.ProcessExitCode(err)
-	output = string(out)
-	return
-}
-
-// RunCommandPipelineWithOutput runs the array of commands with the output
-// of each pipelined with the following (like cmd1 | cmd2 | cmd3 would do).
-// It returns the final output, the exitCode different from 0 and the error
-// if something bad happened.
-func RunCommandPipelineWithOutput(cmds ...*exec.Cmd) (output string, exitCode int, err error) {
-	if len(cmds) < 2 {
-		return "", 0, errors.New("pipeline does not have multiple cmds")
-	}
-
-	// connect stdin of each cmd to stdout pipe of previous cmd
-	for i, cmd := range cmds {
-		if i > 0 {
-			prevCmd := cmds[i-1]
-			cmd.Stdin, err = prevCmd.StdoutPipe()
-
-			if err != nil {
-				return "", 0, fmt.Errorf("cannot set stdout pipe for %s: %v", cmd.Path, err)
-			}
-		}
-	}
-
-	// start all cmds except the last
-	for _, cmd := range cmds[:len(cmds)-1] {
-		if err = cmd.Start(); err != nil {
-			return "", 0, fmt.Errorf("starting %s failed with error: %v", cmd.Path, err)
-		}
-	}
-
-	defer func() {
-		var pipeErrMsgs []string
-		// wait all cmds except the last to release their resources
-		for _, cmd := range cmds[:len(cmds)-1] {
-			if pipeErr := cmd.Wait(); pipeErr != nil {
-				pipeErrMsgs = append(pipeErrMsgs, fmt.Sprintf("command %s failed with error: %v", cmd.Path, pipeErr))
-			}
-		}
-		if len(pipeErrMsgs) > 0 && err == nil {
-			err = fmt.Errorf("pipelineError from Wait: %v", strings.Join(pipeErrMsgs, ", "))
-		}
-	}()
-
-	// wait on last cmd
-	return runCommandWithOutput(cmds[len(cmds)-1])
-}
-
-// ConvertSliceOfStringsToMap converts a slices of string in a map
-// with the strings as key and an empty string as values.
-func ConvertSliceOfStringsToMap(input []string) map[string]struct{} {
-	output := make(map[string]struct{})
-	for _, v := range input {
-		output[v] = struct{}{}
-	}
-	return output
-}
-
-// CompareDirectoryEntries compares two sets of FileInfo (usually taken from a directory)
-// and returns an error if different.
-func CompareDirectoryEntries(e1 []os.FileInfo, e2 []os.FileInfo) error {
-	var (
-		e1Entries = make(map[string]struct{})
-		e2Entries = make(map[string]struct{})
-	)
-	for _, e := range e1 {
-		e1Entries[e.Name()] = struct{}{}
-	}
-	for _, e := range e2 {
-		e2Entries[e.Name()] = struct{}{}
-	}
-	if !reflect.DeepEqual(e1Entries, e2Entries) {
-		return fmt.Errorf("entries differ")
-	}
-	return nil
-}
-
-// ListTar lists the entries of a tar.
-func ListTar(f io.Reader) ([]string, error) {
-	tr := tar.NewReader(f)
-	var entries []string
-
-	for {
-		th, err := tr.Next()
-		if err == io.EOF {
-			// end of tar archive
-			return entries, nil
-		}
-		if err != nil {
-			return entries, err
-		}
-		entries = append(entries, th.Name)
-	}
-}
-
-// RandomTmpDirPath provides a temporary path with rand string appended.
-// does not create or checks if it exists.
-func RandomTmpDirPath(s string, platform string) string {
-	tmp := "/tmp"
-	if platform == "windows" {
-		tmp = os.Getenv("TEMP")
-	}
-	path := filepath.Join(tmp, fmt.Sprintf("%s.%s", s, stringutils.GenerateRandomAlphaOnlyString(10)))
-	if platform == "windows" {
-		return filepath.FromSlash(path) // Using \
-	}
-	return filepath.ToSlash(path) // Using /
-}
-
-// ConsumeWithSpeed reads chunkSize bytes from reader before sleeping
-// for interval duration. Returns total read bytes. Send true to the
-// stop channel to return before reading to EOF on the reader.
-func ConsumeWithSpeed(reader io.Reader, chunkSize int, interval time.Duration, stop chan bool) (n int, err error) {
-	buffer := make([]byte, chunkSize)
-	for {
-		var readBytes int
-		readBytes, err = reader.Read(buffer)
-		n += readBytes
-		if err != nil {
-			if err == io.EOF {
-				err = nil
-			}
-			return
-		}
-		select {
-		case <-stop:
-			return
-		case <-time.After(interval):
-		}
-	}
-}
-
-// ParseCgroupPaths parses 'procCgroupData', which is output of '/proc/<pid>/cgroup', and returns
-// a map which cgroup name as key and path as value.
-func ParseCgroupPaths(procCgroupData string) map[string]string {
-	cgroupPaths := map[string]string{}
-	for _, line := range strings.Split(procCgroupData, "\n") {
-		parts := strings.Split(line, ":")
-		if len(parts) != 3 {
-			continue
-		}
-		cgroupPaths[parts[1]] = parts[2]
-	}
-	return cgroupPaths
-}
-
-// ChannelBuffer holds a chan of byte array that can be populate in a goroutine.
-type ChannelBuffer struct {
-	C chan []byte
-}
-
-// Write implements Writer.
-func (c *ChannelBuffer) Write(b []byte) (int, error) {
-	c.C <- b
-	return len(b), nil
-}
-
-// Close closes the go channel.
-func (c *ChannelBuffer) Close() error {
-	close(c.C)
-	return nil
-}
-
-// ReadTimeout reads the content of the channel in the specified byte array with
-// the specified duration as timeout.
-func (c *ChannelBuffer) ReadTimeout(p []byte, n time.Duration) (int, error) {
-	select {
-	case b := <-c.C:
-		return copy(p[0:], b), nil
-	case <-time.After(n):
-		return -1, fmt.Errorf("timeout reading from channel")
-	}
-}
-
-// RunAtDifferentDate runs the specified function with the given time.
-// It changes the date of the system, which can led to weird behaviors.
-func RunAtDifferentDate(date time.Time, block func()) {
-	// Layout for date. MMDDhhmmYYYY
-	const timeLayout = "010203042006"
-	// Ensure we bring time back to now
-	now := time.Now().Format(timeLayout)
-	defer icmd.RunCommand("date", now)
-
-	icmd.RunCommand("date", date.Format(timeLayout))
-	block()
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/integration/utils_test.go b/installer/vendor/github.com/docker/docker/pkg/integration/utils_test.go
deleted file mode 100644
index 0b2ef4aff5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/integration/utils_test.go
+++ /dev/null
@@ -1,363 +0,0 @@
-package integration
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestIsKilledFalseWithNonKilledProcess(t *testing.T) {
-	var lsCmd *exec.Cmd
-	if runtime.GOOS != "windows" {
-		lsCmd = exec.Command("ls")
-	} else {
-		lsCmd = exec.Command("cmd", "/c", "dir")
-	}
-
-	err := lsCmd.Run()
-	if IsKilled(err) {
-		t.Fatalf("Expected the ls command to not be killed, was.")
-	}
-}
-
-func TestIsKilledTrueWithKilledProcess(t *testing.T) {
-	var longCmd *exec.Cmd
-	if runtime.GOOS != "windows" {
-		longCmd = exec.Command("top")
-	} else {
-		longCmd = exec.Command("powershell", "while ($true) { sleep 1 }")
-	}
-
-	// Start a command
-	err := longCmd.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Capture the error when *dying*
-	done := make(chan error, 1)
-	go func() {
-		done <- longCmd.Wait()
-	}()
-	// Then kill it
-	longCmd.Process.Kill()
-	// Get the error
-	err = <-done
-	if !IsKilled(err) {
-		t.Fatalf("Expected the command to be killed, was not.")
-	}
-}
-
-func TestRunCommandPipelineWithOutputWithNotEnoughCmds(t *testing.T) {
-	_, _, err := RunCommandPipelineWithOutput(exec.Command("ls"))
-	expectedError := "pipeline does not have multiple cmds"
-	if err == nil || err.Error() != expectedError {
-		t.Fatalf("Expected an error with %s, got err:%s", expectedError, err)
-	}
-}
-
-func TestRunCommandPipelineWithOutputErrors(t *testing.T) {
-	p := "$PATH"
-	if runtime.GOOS == "windows" {
-		p = "%PATH%"
-	}
-	cmd1 := exec.Command("ls")
-	cmd1.Stdout = os.Stdout
-	cmd2 := exec.Command("anything really")
-	_, _, err := RunCommandPipelineWithOutput(cmd1, cmd2)
-	if err == nil || err.Error() != "cannot set stdout pipe for anything really: exec: Stdout already set" {
-		t.Fatalf("Expected an error, got %v", err)
-	}
-
-	cmdWithError := exec.Command("doesnotexists")
-	cmdCat := exec.Command("cat")
-	_, _, err = RunCommandPipelineWithOutput(cmdWithError, cmdCat)
-	if err == nil || err.Error() != `starting doesnotexists failed with error: exec: "doesnotexists": executable file not found in `+p {
-		t.Fatalf("Expected an error, got %v", err)
-	}
-}
-
-func TestRunCommandPipelineWithOutput(t *testing.T) {
-	//TODO: Should run on Solaris
-	if runtime.GOOS == "solaris" {
-		t.Skip()
-	}
-	cmds := []*exec.Cmd{
-		// Print 2 characters
-		exec.Command("echo", "-n", "11"),
-		// Count the number or char from stdin (previous command)
-		exec.Command("wc", "-m"),
-	}
-	out, exitCode, err := RunCommandPipelineWithOutput(cmds...)
-	expectedOutput := "2\n"
-	if out != expectedOutput || exitCode != 0 || err != nil {
-		t.Fatalf("Expected %s for commands %v, got out:%s, exitCode:%d, err:%v", expectedOutput, cmds, out, exitCode, err)
-	}
-}
-
-func TestConvertSliceOfStringsToMap(t *testing.T) {
-	input := []string{"a", "b"}
-	actual := ConvertSliceOfStringsToMap(input)
-	for _, key := range input {
-		if _, ok := actual[key]; !ok {
-			t.Fatalf("Expected output to contains key %s, did not: %v", key, actual)
-		}
-	}
-}
-
-func TestCompareDirectoryEntries(t *testing.T) {
-	tmpFolder, err := ioutil.TempDir("", "integration-cli-utils-compare-directories")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpFolder)
-
-	file1 := filepath.Join(tmpFolder, "file1")
-	file2 := filepath.Join(tmpFolder, "file2")
-	os.Create(file1)
-	os.Create(file2)
-
-	fi1, err := os.Stat(file1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fi1bis, err := os.Stat(file1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fi2, err := os.Stat(file2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cases := []struct {
-		e1          []os.FileInfo
-		e2          []os.FileInfo
-		shouldError bool
-	}{
-		// Empty directories
-		{
-			[]os.FileInfo{},
-			[]os.FileInfo{},
-			false,
-		},
-		// Same FileInfos
-		{
-			[]os.FileInfo{fi1},
-			[]os.FileInfo{fi1},
-			false,
-		},
-		// Different FileInfos but same names
-		{
-			[]os.FileInfo{fi1},
-			[]os.FileInfo{fi1bis},
-			false,
-		},
-		// Different FileInfos, different names
-		{
-			[]os.FileInfo{fi1},
-			[]os.FileInfo{fi2},
-			true,
-		},
-	}
-	for _, elt := range cases {
-		err := CompareDirectoryEntries(elt.e1, elt.e2)
-		if elt.shouldError && err == nil {
-			t.Fatalf("Should have return an error, did not with %v and %v", elt.e1, elt.e2)
-		}
-		if !elt.shouldError && err != nil {
-			t.Fatalf("Should have not returned an error, but did : %v with %v and %v", err, elt.e1, elt.e2)
-		}
-	}
-}
-
-// FIXME make an "unhappy path" test for ListTar without "panicking" :-)
-func TestListTar(t *testing.T) {
-	// TODO Windows: Figure out why this fails. Should be portable.
-	if runtime.GOOS == "windows" {
-		t.Skip("Failing on Windows - needs further investigation")
-	}
-	tmpFolder, err := ioutil.TempDir("", "integration-cli-utils-list-tar")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpFolder)
-
-	// Let's create a Tar file
-	srcFile := filepath.Join(tmpFolder, "src")
-	tarFile := filepath.Join(tmpFolder, "src.tar")
-	os.Create(srcFile)
-	cmd := exec.Command("sh", "-c", "tar cf "+tarFile+" "+srcFile)
-	_, err = cmd.CombinedOutput()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	reader, err := os.Open(tarFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer reader.Close()
-
-	entries, err := ListTar(reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(entries) != 1 && entries[0] != "src" {
-		t.Fatalf("Expected a tar file with 1 entry (%s), got %v", srcFile, entries)
-	}
-}
-
-func TestRandomTmpDirPath(t *testing.T) {
-	path := RandomTmpDirPath("something", runtime.GOOS)
-
-	prefix := "/tmp/something"
-	if runtime.GOOS == "windows" {
-		prefix = os.Getenv("TEMP") + `\something`
-	}
-	expectedSize := len(prefix) + 11
-
-	if !strings.HasPrefix(path, prefix) {
-		t.Fatalf("Expected generated path to have '%s' as prefix, got %s'", prefix, path)
-	}
-	if len(path) != expectedSize {
-		t.Fatalf("Expected generated path to be %d, got %d", expectedSize, len(path))
-	}
-}
-
-func TestConsumeWithSpeed(t *testing.T) {
-	reader := strings.NewReader("1234567890")
-	chunksize := 2
-
-	bytes1, err := ConsumeWithSpeed(reader, chunksize, 1*time.Second, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if bytes1 != 10 {
-		t.Fatalf("Expected to have read 10 bytes, got %d", bytes1)
-	}
-
-}
-
-func TestConsumeWithSpeedWithStop(t *testing.T) {
-	reader := strings.NewReader("1234567890")
-	chunksize := 2
-
-	stopIt := make(chan bool)
-
-	go func() {
-		time.Sleep(1 * time.Millisecond)
-		stopIt <- true
-	}()
-
-	bytes1, err := ConsumeWithSpeed(reader, chunksize, 20*time.Millisecond, stopIt)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if bytes1 != 2 {
-		t.Fatalf("Expected to have read 2 bytes, got %d", bytes1)
-	}
-
-}
-
-func TestParseCgroupPathsEmpty(t *testing.T) {
-	cgroupMap := ParseCgroupPaths("")
-	if len(cgroupMap) != 0 {
-		t.Fatalf("Expected an empty map, got %v", cgroupMap)
-	}
-	cgroupMap = ParseCgroupPaths("\n")
-	if len(cgroupMap) != 0 {
-		t.Fatalf("Expected an empty map, got %v", cgroupMap)
-	}
-	cgroupMap = ParseCgroupPaths("something:else\nagain:here")
-	if len(cgroupMap) != 0 {
-		t.Fatalf("Expected an empty map, got %v", cgroupMap)
-	}
-}
-
-func TestParseCgroupPaths(t *testing.T) {
-	cgroupMap := ParseCgroupPaths("2:memory:/a\n1:cpuset:/b")
-	if len(cgroupMap) != 2 {
-		t.Fatalf("Expected a map with 2 entries, got %v", cgroupMap)
-	}
-	if value, ok := cgroupMap["memory"]; !ok || value != "/a" {
-		t.Fatalf("Expected cgroupMap to contains an entry for 'memory' with value '/a', got %v", cgroupMap)
-	}
-	if value, ok := cgroupMap["cpuset"]; !ok || value != "/b" {
-		t.Fatalf("Expected cgroupMap to contains an entry for 'cpuset' with value '/b', got %v", cgroupMap)
-	}
-}
-
-func TestChannelBufferTimeout(t *testing.T) {
-	expected := "11"
-
-	buf := &ChannelBuffer{make(chan []byte, 1)}
-	defer buf.Close()
-
-	done := make(chan struct{}, 1)
-	go func() {
-		time.Sleep(100 * time.Millisecond)
-		io.Copy(buf, strings.NewReader(expected))
-		done <- struct{}{}
-	}()
-
-	// Wait long enough
-	b := make([]byte, 2)
-	_, err := buf.ReadTimeout(b, 50*time.Millisecond)
-	if err == nil && err.Error() != "timeout reading from channel" {
-		t.Fatalf("Expected an error, got %s", err)
-	}
-	<-done
-}
-
-func TestChannelBuffer(t *testing.T) {
-	expected := "11"
-
-	buf := &ChannelBuffer{make(chan []byte, 1)}
-	defer buf.Close()
-
-	go func() {
-		time.Sleep(100 * time.Millisecond)
-		io.Copy(buf, strings.NewReader(expected))
-	}()
-
-	// Wait long enough
-	b := make([]byte, 2)
-	_, err := buf.ReadTimeout(b, 200*time.Millisecond)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if string(b) != expected {
-		t.Fatalf("Expected '%s', got '%s'", expected, string(b))
-	}
-}
-
-// FIXME doesn't work
-// func TestRunAtDifferentDate(t *testing.T) {
-// 	var date string
-
-// 	// Layout for date. MMDDhhmmYYYY
-// 	const timeLayout = "20060102"
-// 	expectedDate := "20100201"
-// 	theDate, err := time.Parse(timeLayout, expectedDate)
-// 	if err != nil {
-// 		t.Fatal(err)
-// 	}
-
-// 	RunAtDifferentDate(theDate, func() {
-// 		cmd := exec.Command("date", "+%Y%M%d")
-// 		out, err := cmd.Output()
-// 		if err != nil {
-// 			t.Fatal(err)
-// 		}
-// 		date = string(out)
-// 	})
-// }
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/buffer_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/buffer_test.go
deleted file mode 100644
index 41098fa6e7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/buffer_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestFixedBufferWrite(t *testing.T) {
-	buf := &fixedBuffer{buf: make([]byte, 0, 64)}
-	n, err := buf.Write([]byte("hello"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != 5 {
-		t.Fatalf("expected 5 bytes written, got %d", n)
-	}
-
-	if string(buf.buf[:5]) != "hello" {
-		t.Fatalf("expected \"hello\", got %q", string(buf.buf[:5]))
-	}
-
-	n, err = buf.Write(bytes.Repeat([]byte{1}, 64))
-	if err != errBufferFull {
-		t.Fatalf("expected errBufferFull, got %v - %v", err, buf.buf[:64])
-	}
-}
-
-func TestFixedBufferRead(t *testing.T) {
-	buf := &fixedBuffer{buf: make([]byte, 0, 64)}
-	if _, err := buf.Write([]byte("hello world")); err != nil {
-		t.Fatal(err)
-	}
-
-	b := make([]byte, 5)
-	n, err := buf.Read(b)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != 5 {
-		t.Fatalf("expected 5 bytes read, got %d - %s", n, buf.String())
-	}
-
-	if string(b) != "hello" {
-		t.Fatalf("expected \"hello\", got %q", string(b))
-	}
-
-	n, err = buf.Read(b)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != 5 {
-		t.Fatalf("expected 5 bytes read, got %d", n)
-	}
-
-	if string(b) != " worl" {
-		t.Fatalf("expected \" worl\", got %s", string(b))
-	}
-
-	b = b[:1]
-	n, err = buf.Read(b)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != 1 {
-		t.Fatalf("expected 1 byte read, got %d - %s", n, buf.String())
-	}
-
-	if string(b) != "d" {
-		t.Fatalf("expected \"d\", got %s", string(b))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/bytespipe_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/bytespipe_test.go
deleted file mode 100644
index 300fb5f6d5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/bytespipe_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-package ioutils
-
-import (
-	"crypto/sha1"
-	"encoding/hex"
-	"math/rand"
-	"testing"
-	"time"
-)
-
-func TestBytesPipeRead(t *testing.T) {
-	buf := NewBytesPipe()
-	buf.Write([]byte("12"))
-	buf.Write([]byte("34"))
-	buf.Write([]byte("56"))
-	buf.Write([]byte("78"))
-	buf.Write([]byte("90"))
-	rd := make([]byte, 4)
-	n, err := buf.Read(rd)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != 4 {
-		t.Fatalf("Wrong number of bytes read: %d, should be %d", n, 4)
-	}
-	if string(rd) != "1234" {
-		t.Fatalf("Read %s, but must be %s", rd, "1234")
-	}
-	n, err = buf.Read(rd)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != 4 {
-		t.Fatalf("Wrong number of bytes read: %d, should be %d", n, 4)
-	}
-	if string(rd) != "5678" {
-		t.Fatalf("Read %s, but must be %s", rd, "5679")
-	}
-	n, err = buf.Read(rd)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != 2 {
-		t.Fatalf("Wrong number of bytes read: %d, should be %d", n, 2)
-	}
-	if string(rd[:n]) != "90" {
-		t.Fatalf("Read %s, but must be %s", rd, "90")
-	}
-}
-
-func TestBytesPipeWrite(t *testing.T) {
-	buf := NewBytesPipe()
-	buf.Write([]byte("12"))
-	buf.Write([]byte("34"))
-	buf.Write([]byte("56"))
-	buf.Write([]byte("78"))
-	buf.Write([]byte("90"))
-	if buf.buf[0].String() != "1234567890" {
-		t.Fatalf("Buffer %q, must be %q", buf.buf[0].String(), "1234567890")
-	}
-}
-
-// Write and read in different speeds/chunk sizes and check valid data is read.
-func TestBytesPipeWriteRandomChunks(t *testing.T) {
-	cases := []struct{ iterations, writesPerLoop, readsPerLoop int }{
-		{100, 10, 1},
-		{1000, 10, 5},
-		{1000, 100, 0},
-		{1000, 5, 6},
-		{10000, 50, 25},
-	}
-
-	testMessage := []byte("this is a random string for testing")
-	// random slice sizes to read and write
-	writeChunks := []int{25, 35, 15, 20}
-	readChunks := []int{5, 45, 20, 25}
-
-	for _, c := range cases {
-		// first pass: write directly to hash
-		hash := sha1.New()
-		for i := 0; i < c.iterations*c.writesPerLoop; i++ {
-			if _, err := hash.Write(testMessage[:writeChunks[i%len(writeChunks)]]); err != nil {
-				t.Fatal(err)
-			}
-		}
-		expected := hex.EncodeToString(hash.Sum(nil))
-
-		// write/read through buffer
-		buf := NewBytesPipe()
-		hash.Reset()
-
-		done := make(chan struct{})
-
-		go func() {
-			// random delay before read starts
-			<-time.After(time.Duration(rand.Intn(10)) * time.Millisecond)
-			for i := 0; ; i++ {
-				p := make([]byte, readChunks[(c.iterations*c.readsPerLoop+i)%len(readChunks)])
-				n, _ := buf.Read(p)
-				if n == 0 {
-					break
-				}
-				hash.Write(p[:n])
-			}
-
-			close(done)
-		}()
-
-		for i := 0; i < c.iterations; i++ {
-			for w := 0; w < c.writesPerLoop; w++ {
-				buf.Write(testMessage[:writeChunks[(i*c.writesPerLoop+w)%len(writeChunks)]])
-			}
-		}
-		buf.Close()
-		<-done
-
-		actual := hex.EncodeToString(hash.Sum(nil))
-
-		if expected != actual {
-			t.Fatalf("BytesPipe returned invalid data. Expected checksum %v, got %v", expected, actual)
-		}
-
-	}
-}
-
-func BenchmarkBytesPipeWrite(b *testing.B) {
-	testData := []byte("pretty short line, because why not?")
-	for i := 0; i < b.N; i++ {
-		readBuf := make([]byte, 1024)
-		buf := NewBytesPipe()
-		go func() {
-			var err error
-			for err == nil {
-				_, err = buf.Read(readBuf)
-			}
-		}()
-		for j := 0; j < 1000; j++ {
-			buf.Write(testData)
-		}
-		buf.Close()
-	}
-}
-
-func BenchmarkBytesPipeRead(b *testing.B) {
-	rd := make([]byte, 512)
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		buf := NewBytesPipe()
-		for j := 0; j < 500; j++ {
-			buf.Write(make([]byte, 1024))
-		}
-		b.StartTimer()
-		for j := 0; j < 1000; j++ {
-			if n, _ := buf.Read(rd); n != 512 {
-				b.Fatalf("Wrong number of bytes: %d", n)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/fmt_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/fmt_test.go
deleted file mode 100644
index 8968863296..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/fmt_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package ioutils
-
-import "testing"
-
-func TestFprintfIfNotEmpty(t *testing.T) {
-	wc := NewWriteCounter(&NopWriter{})
-	n, _ := FprintfIfNotEmpty(wc, "foo%s", "")
-
-	if wc.Count != 0 || n != 0 {
-		t.Errorf("Wrong count: %v vs. %v vs. 0", wc.Count, n)
-	}
-
-	n, _ = FprintfIfNotEmpty(wc, "foo%s", "bar")
-	if wc.Count != 6 || n != 6 {
-		t.Errorf("Wrong count: %v vs. %v vs. 6", wc.Count, n)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/fswriters_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/fswriters_test.go
deleted file mode 100644
index c4d1419306..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/fswriters_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-)
-
-var (
-	testMode os.FileMode = 0640
-)
-
-func init() {
-	// Windows does not support full Linux file mode
-	if runtime.GOOS == "windows" {
-		testMode = 0666
-	}
-}
-
-func TestAtomicWriteToFile(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "atomic-writers-test")
-	if err != nil {
-		t.Fatalf("Error when creating temporary directory: %s", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	expected := []byte("barbaz")
-	if err := AtomicWriteFile(filepath.Join(tmpDir, "foo"), expected, testMode); err != nil {
-		t.Fatalf("Error writing to file: %v", err)
-	}
-
-	actual, err := ioutil.ReadFile(filepath.Join(tmpDir, "foo"))
-	if err != nil {
-		t.Fatalf("Error reading from file: %v", err)
-	}
-
-	if bytes.Compare(actual, expected) != 0 {
-		t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
-	}
-
-	st, err := os.Stat(filepath.Join(tmpDir, "foo"))
-	if err != nil {
-		t.Fatalf("Error statting file: %v", err)
-	}
-	if expected := os.FileMode(testMode); st.Mode() != expected {
-		t.Fatalf("Mode mismatched, expected %o, got %o", expected, st.Mode())
-	}
-}
-
-func TestAtomicWriteSetCommit(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "atomic-writerset-test")
-	if err != nil {
-		t.Fatalf("Error when creating temporary directory: %s", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	if err := os.Mkdir(filepath.Join(tmpDir, "tmp"), 0700); err != nil {
-		t.Fatalf("Error creating tmp directory: %s", err)
-	}
-
-	targetDir := filepath.Join(tmpDir, "target")
-	ws, err := NewAtomicWriteSet(filepath.Join(tmpDir, "tmp"))
-	if err != nil {
-		t.Fatalf("Error creating atomic write set: %s", err)
-	}
-
-	expected := []byte("barbaz")
-	if err := ws.WriteFile("foo", expected, testMode); err != nil {
-		t.Fatalf("Error writing to file: %v", err)
-	}
-
-	if _, err := ioutil.ReadFile(filepath.Join(targetDir, "foo")); err == nil {
-		t.Fatalf("Expected error reading file where should not exist")
-	}
-
-	if err := ws.Commit(targetDir); err != nil {
-		t.Fatalf("Error committing file: %s", err)
-	}
-
-	actual, err := ioutil.ReadFile(filepath.Join(targetDir, "foo"))
-	if err != nil {
-		t.Fatalf("Error reading from file: %v", err)
-	}
-
-	if bytes.Compare(actual, expected) != 0 {
-		t.Fatalf("Data mismatch, expected %q, got %q", expected, actual)
-	}
-
-	st, err := os.Stat(filepath.Join(targetDir, "foo"))
-	if err != nil {
-		t.Fatalf("Error statting file: %v", err)
-	}
-	if expected := os.FileMode(testMode); st.Mode() != expected {
-		t.Fatalf("Mode mismatched, expected %o, got %o", expected, st.Mode())
-	}
-
-}
-
-func TestAtomicWriteSetCancel(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "atomic-writerset-test")
-	if err != nil {
-		t.Fatalf("Error when creating temporary directory: %s", err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	if err := os.Mkdir(filepath.Join(tmpDir, "tmp"), 0700); err != nil {
-		t.Fatalf("Error creating tmp directory: %s", err)
-	}
-
-	ws, err := NewAtomicWriteSet(filepath.Join(tmpDir, "tmp"))
-	if err != nil {
-		t.Fatalf("Error creating atomic write set: %s", err)
-	}
-
-	expected := []byte("barbaz")
-	if err := ws.WriteFile("foo", expected, testMode); err != nil {
-		t.Fatalf("Error writing to file: %v", err)
-	}
-
-	if err := ws.Cancel(); err != nil {
-		t.Fatalf("Error committing file: %s", err)
-	}
-
-	if _, err := ioutil.ReadFile(filepath.Join(tmpDir, "target", "foo")); err == nil {
-		t.Fatalf("Expected error reading file where should not exist")
-	} else if !os.IsNotExist(err) {
-		t.Fatalf("Unexpected error reading file: %s", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/multireader_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/multireader_test.go
deleted file mode 100644
index 65309a9565..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/multireader_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-)
-
-func TestMultiReadSeekerReadAll(t *testing.T) {
-	str := "hello world"
-	s1 := strings.NewReader(str + " 1")
-	s2 := strings.NewReader(str + " 2")
-	s3 := strings.NewReader(str + " 3")
-	mr := MultiReadSeeker(s1, s2, s3)
-
-	expectedSize := int64(s1.Len() + s2.Len() + s3.Len())
-
-	b, err := ioutil.ReadAll(mr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := "hello world 1hello world 2hello world 3"
-	if string(b) != expected {
-		t.Fatalf("ReadAll failed, got: %q, expected %q", string(b), expected)
-	}
-
-	size, err := mr.Seek(0, os.SEEK_END)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if size != expectedSize {
-		t.Fatalf("reader size does not match, got %d, expected %d", size, expectedSize)
-	}
-
-	// Reset the position and read again
-	pos, err := mr.Seek(0, os.SEEK_SET)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pos != 0 {
-		t.Fatalf("expected position to be set to 0, got %d", pos)
-	}
-
-	b, err = ioutil.ReadAll(mr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if string(b) != expected {
-		t.Fatalf("ReadAll failed, got: %q, expected %q", string(b), expected)
-	}
-}
-
-func TestMultiReadSeekerReadEach(t *testing.T) {
-	str := "hello world"
-	s1 := strings.NewReader(str + " 1")
-	s2 := strings.NewReader(str + " 2")
-	s3 := strings.NewReader(str + " 3")
-	mr := MultiReadSeeker(s1, s2, s3)
-
-	var totalBytes int64
-	for i, s := range []*strings.Reader{s1, s2, s3} {
-		sLen := int64(s.Len())
-		buf := make([]byte, s.Len())
-		expected := []byte(fmt.Sprintf("%s %d", str, i+1))
-
-		if _, err := mr.Read(buf); err != nil && err != io.EOF {
-			t.Fatal(err)
-		}
-
-		if !bytes.Equal(buf, expected) {
-			t.Fatalf("expected %q to be %q", string(buf), string(expected))
-		}
-
-		pos, err := mr.Seek(0, os.SEEK_CUR)
-		if err != nil {
-			t.Fatalf("iteration: %d, error: %v", i+1, err)
-		}
-
-		// check that the total bytes read is the current position of the seeker
-		totalBytes += sLen
-		if pos != totalBytes {
-			t.Fatalf("expected current position to be: %d, got: %d, iteration: %d", totalBytes, pos, i+1)
-		}
-
-		// This tests not only that SEEK_SET and SEEK_CUR give the same values, but that the next iteration is in the expected position as well
-		newPos, err := mr.Seek(pos, os.SEEK_SET)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if newPos != pos {
-			t.Fatalf("expected to get same position when calling SEEK_SET with value from SEEK_CUR, cur: %d, set: %d", pos, newPos)
-		}
-	}
-}
-
-func TestMultiReadSeekerReadSpanningChunks(t *testing.T) {
-	str := "hello world"
-	s1 := strings.NewReader(str + " 1")
-	s2 := strings.NewReader(str + " 2")
-	s3 := strings.NewReader(str + " 3")
-	mr := MultiReadSeeker(s1, s2, s3)
-
-	buf := make([]byte, s1.Len()+3)
-	_, err := mr.Read(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// expected is the contents of s1 + 3 bytes from s2, ie, the `hel` at the end of this string
-	expected := "hello world 1hel"
-	if string(buf) != expected {
-		t.Fatalf("expected %s to be %s", string(buf), expected)
-	}
-}
-
-func TestMultiReadSeekerNegativeSeek(t *testing.T) {
-	str := "hello world"
-	s1 := strings.NewReader(str + " 1")
-	s2 := strings.NewReader(str + " 2")
-	s3 := strings.NewReader(str + " 3")
-	mr := MultiReadSeeker(s1, s2, s3)
-
-	s1Len := s1.Len()
-	s2Len := s2.Len()
-	s3Len := s3.Len()
-
-	s, err := mr.Seek(int64(-1*s3.Len()), os.SEEK_END)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if s != int64(s1Len+s2Len) {
-		t.Fatalf("expected %d to be %d", s, s1.Len()+s2.Len())
-	}
-
-	buf := make([]byte, s3Len)
-	if _, err := mr.Read(buf); err != nil && err != io.EOF {
-		t.Fatal(err)
-	}
-	expected := fmt.Sprintf("%s %d", str, 3)
-	if string(buf) != fmt.Sprintf("%s %d", str, 3) {
-		t.Fatalf("expected %q to be %q", string(buf), expected)
-	}
-}
-
-func TestMultiReadSeekerCurAfterSet(t *testing.T) {
-	str := "hello world"
-	s1 := strings.NewReader(str + " 1")
-	s2 := strings.NewReader(str + " 2")
-	s3 := strings.NewReader(str + " 3")
-	mr := MultiReadSeeker(s1, s2, s3)
-
-	mid := int64(s1.Len() + s2.Len()/2)
-
-	size, err := mr.Seek(mid, os.SEEK_SET)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if size != mid {
-		t.Fatalf("reader size does not match, got %d, expected %d", size, mid)
-	}
-
-	size, err = mr.Seek(3, os.SEEK_CUR)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if size != mid+3 {
-		t.Fatalf("reader size does not match, got %d, expected %d", size, mid+3)
-	}
-	size, err = mr.Seek(5, os.SEEK_CUR)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if size != mid+8 {
-		t.Fatalf("reader size does not match, got %d, expected %d", size, mid+8)
-	}
-
-	size, err = mr.Seek(10, os.SEEK_CUR)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if size != mid+18 {
-		t.Fatalf("reader size does not match, got %d, expected %d", size, mid+18)
-	}
-}
-
-func TestMultiReadSeekerSmallReads(t *testing.T) {
-	readers := []io.ReadSeeker{}
-	for i := 0; i < 10; i++ {
-		integer := make([]byte, 4, 4)
-		binary.BigEndian.PutUint32(integer, uint32(i))
-		readers = append(readers, bytes.NewReader(integer))
-	}
-
-	reader := MultiReadSeeker(readers...)
-	for i := 0; i < 10; i++ {
-		var integer uint32
-		if err := binary.Read(reader, binary.BigEndian, &integer); err != nil {
-			t.Fatalf("Read from NewMultiReadSeeker failed: %v", err)
-		}
-		if uint32(i) != integer {
-			t.Fatalf("Read wrong value from NewMultiReadSeeker: %d != %d", i, integer)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/readers_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/readers_test.go
deleted file mode 100644
index 9abc1054df..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/readers_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package ioutils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-// Implement io.Reader
-type errorReader struct{}
-
-func (r *errorReader) Read(p []byte) (int, error) {
-	return 0, fmt.Errorf("Error reader always fail.")
-}
-
-func TestReadCloserWrapperClose(t *testing.T) {
-	reader := strings.NewReader("A string reader")
-	wrapper := NewReadCloserWrapper(reader, func() error {
-		return fmt.Errorf("This will be called when closing")
-	})
-	err := wrapper.Close()
-	if err == nil || !strings.Contains(err.Error(), "This will be called when closing") {
-		t.Fatalf("readCloserWrapper should have call the anonymous func and thus, fail.")
-	}
-}
-
-func TestReaderErrWrapperReadOnError(t *testing.T) {
-	called := false
-	reader := &errorReader{}
-	wrapper := NewReaderErrWrapper(reader, func() {
-		called = true
-	})
-	_, err := wrapper.Read([]byte{})
-	if err == nil || !strings.Contains(err.Error(), "Error reader always fail.") {
-		t.Fatalf("readErrWrapper should returned an error")
-	}
-	if !called {
-		t.Fatalf("readErrWrapper should have call the anonymous function on failure")
-	}
-}
-
-func TestReaderErrWrapperRead(t *testing.T) {
-	reader := strings.NewReader("a string reader.")
-	wrapper := NewReaderErrWrapper(reader, func() {
-		t.Fatalf("readErrWrapper should not have called the anonymous function")
-	})
-	// Read 20 byte (should be ok with the string above)
-	num, err := wrapper.Read(make([]byte, 20))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if num != 16 {
-		t.Fatalf("readerErrWrapper should have read 16 byte, but read %d", num)
-	}
-}
-
-func TestHashData(t *testing.T) {
-	reader := strings.NewReader("hash-me")
-	actual, err := HashData(reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := "sha256:4d11186aed035cc624d553e10db358492c84a7cd6b9670d92123c144930450aa"
-	if actual != expected {
-		t.Fatalf("Expecting %s, got %s", expected, actual)
-	}
-}
-
-type perpetualReader struct{}
-
-func (p *perpetualReader) Read(buf []byte) (n int, err error) {
-	for i := 0; i != len(buf); i++ {
-		buf[i] = 'a'
-	}
-	return len(buf), nil
-}
-
-func TestCancelReadCloser(t *testing.T) {
-	ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	cancelReadCloser := NewCancelReadCloser(ctx, ioutil.NopCloser(&perpetualReader{}))
-	for {
-		var buf [128]byte
-		_, err := cancelReadCloser.Read(buf[:])
-		if err == context.DeadlineExceeded {
-			break
-		} else if err != nil {
-			t.Fatalf("got unexpected error: %v", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/ioutils/writers_test.go b/installer/vendor/github.com/docker/docker/pkg/ioutils/writers_test.go
deleted file mode 100644
index 564b1cd4f5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/ioutils/writers_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package ioutils
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-)
-
-func TestWriteCloserWrapperClose(t *testing.T) {
-	called := false
-	writer := bytes.NewBuffer([]byte{})
-	wrapper := NewWriteCloserWrapper(writer, func() error {
-		called = true
-		return nil
-	})
-	if err := wrapper.Close(); err != nil {
-		t.Fatal(err)
-	}
-	if !called {
-		t.Fatalf("writeCloserWrapper should have call the anonymous function.")
-	}
-}
-
-func TestNopWriteCloser(t *testing.T) {
-	writer := bytes.NewBuffer([]byte{})
-	wrapper := NopWriteCloser(writer)
-	if err := wrapper.Close(); err != nil {
-		t.Fatal("NopWriteCloser always return nil on Close.")
-	}
-
-}
-
-func TestNopWriter(t *testing.T) {
-	nw := &NopWriter{}
-	l, err := nw.Write([]byte{'c'})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if l != 1 {
-		t.Fatalf("Expected 1 got %d", l)
-	}
-}
-
-func TestWriteCounter(t *testing.T) {
-	dummy1 := "This is a dummy string."
-	dummy2 := "This is another dummy string."
-	totalLength := int64(len(dummy1) + len(dummy2))
-
-	reader1 := strings.NewReader(dummy1)
-	reader2 := strings.NewReader(dummy2)
-
-	var buffer bytes.Buffer
-	wc := NewWriteCounter(&buffer)
-
-	reader1.WriteTo(wc)
-	reader2.WriteTo(wc)
-
-	if wc.Count != totalLength {
-		t.Errorf("Wrong count: %d vs. %d", wc.Count, totalLength)
-	}
-
-	if buffer.String() != dummy1+dummy2 {
-		t.Error("Wrong message written")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go
deleted file mode 100644
index 4734c31119..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package jsonlog
-
-import (
-	"encoding/json"
-	"fmt"
-	"time"
-)
-
-// JSONLog represents a log message, typically a single entry from a given log stream.
-// JSONLogs can be easily serialized to and from JSON and support custom formatting.
-type JSONLog struct {
-	// Log is the log message
-	Log string `json:"log,omitempty"`
-	// Stream is the log source
-	Stream string `json:"stream,omitempty"`
-	// Created is the created timestamp of log
-	Created time.Time `json:"time"`
-	// Attrs is the list of extra attributes provided by the user
-	Attrs map[string]string `json:"attrs,omitempty"`
-}
-
-// Format returns the log formatted according to format
-// If format is nil, returns the log message
-// If format is json, returns the log marshaled in json format
-// By default, returns the log with the log time formatted according to format.
-func (jl *JSONLog) Format(format string) (string, error) {
-	if format == "" {
-		return jl.Log, nil
-	}
-	if format == "json" {
-		m, err := json.Marshal(jl)
-		return string(m), err
-	}
-	return fmt.Sprintf("%s %s", jl.Created.Format(format), jl.Log), nil
-}
-
-// Reset resets the log to nil.
-func (jl *JSONLog) Reset() {
-	jl.Log = ""
-	jl.Stream = ""
-	jl.Created = time.Time{}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go
deleted file mode 100644
index 83ce684a8e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// This code was initially generated by ffjson <https://github.com/pquerna/ffjson>
-// This code was generated via the following steps:
-// $ go get -u github.com/pquerna/ffjson
-// $ make BIND_DIR=. shell
-// $ ffjson pkg/jsonlog/jsonlog.go
-// $ mv pkg/jsonglog/jsonlog_ffjson.go pkg/jsonlog/jsonlog_marshalling.go
-//
-// It has been modified to improve the performance of time marshalling to JSON
-// and to clean it up.
-// Should this code need to be regenerated when the JSONLog struct is changed,
-// the relevant changes which have been made are:
-// import (
-//        "bytes"
-//-
-//        "unicode/utf8"
-// )
-//
-// func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-//@@ -20,13 +16,13 @@ func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-//        }
-//        return buf.Bytes(), nil
-// }
-//+
-// func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//-       var err error
-//-       var obj []byte
-//-       var first bool = true
-//-       _ = obj
-//-       _ = err
-//-       _ = first
-//+       var (
-//+               err       error
-//+               timestamp string
-//+               first     bool = true
-//+       )
-//        buf.WriteString(`{`)
-//        if len(mj.Log) != 0 {
-//                if first == true {
-//@@ -52,11 +48,11 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//                buf.WriteString(`,`)
-//        }
-//        buf.WriteString(`"time":`)
-//-       obj, err = mj.Created.MarshalJSON()
-//+       timestamp, err = FastTimeMarshalJSON(mj.Created)
-//        if err != nil {
-//                return err
-//        }
-//-       buf.Write(obj)
-//+       buf.WriteString(timestamp)
-//        buf.WriteString(`}`)
-//        return nil
-// }
-// @@ -81,9 +81,10 @@ func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-//         if len(mj.Log) != 0 {
-// -                if first == true {
-// -                       first = false
-// -               } else {
-// -                       buf.WriteString(`,`)
-// -               }
-// +               first = false
-//                 buf.WriteString(`"log":`)
-//                 ffjsonWriteJSONString(buf, mj.Log)
-//         }
-
-package jsonlog
-
-import (
-	"bytes"
-	"unicode/utf8"
-)
-
-// MarshalJSON marshals the JSONLog.
-func (mj *JSONLog) MarshalJSON() ([]byte, error) {
-	var buf bytes.Buffer
-	buf.Grow(1024)
-	if err := mj.MarshalJSONBuf(&buf); err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-// MarshalJSONBuf marshals the JSONLog and stores the result to a bytes.Buffer.
-func (mj *JSONLog) MarshalJSONBuf(buf *bytes.Buffer) error {
-	var (
-		err       error
-		timestamp string
-		first     = true
-	)
-	buf.WriteString(`{`)
-	if len(mj.Log) != 0 {
-		first = false
-		buf.WriteString(`"log":`)
-		ffjsonWriteJSONString(buf, mj.Log)
-	}
-	if len(mj.Stream) != 0 {
-		if first {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"stream":`)
-		ffjsonWriteJSONString(buf, mj.Stream)
-	}
-	if !first {
-		buf.WriteString(`,`)
-	}
-	buf.WriteString(`"time":`)
-	timestamp, err = FastTimeMarshalJSON(mj.Created)
-	if err != nil {
-		return err
-	}
-	buf.WriteString(timestamp)
-	buf.WriteString(`}`)
-	return nil
-}
-
-func ffjsonWriteJSONString(buf *bytes.Buffer, s string) {
-	const hex = "0123456789abcdef"
-
-	buf.WriteByte('"')
-	start := 0
-	for i := 0; i < len(s); {
-		if b := s[i]; b < utf8.RuneSelf {
-			if 0x20 <= b && b != '\\' && b != '"' && b != '<' && b != '>' && b != '&' {
-				i++
-				continue
-			}
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			switch b {
-			case '\\', '"':
-				buf.WriteByte('\\')
-				buf.WriteByte(b)
-			case '\n':
-				buf.WriteByte('\\')
-				buf.WriteByte('n')
-			case '\r':
-				buf.WriteByte('\\')
-				buf.WriteByte('r')
-			default:
-
-				buf.WriteString(`\u00`)
-				buf.WriteByte(hex[b>>4])
-				buf.WriteByte(hex[b&0xF])
-			}
-			i++
-			start = i
-			continue
-		}
-		c, size := utf8.DecodeRuneInString(s[i:])
-		if c == utf8.RuneError && size == 1 {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\ufffd`)
-			i += size
-			start = i
-			continue
-		}
-
-		if c == '\u2028' || c == '\u2029' {
-			if start < i {
-				buf.WriteString(s[start:i])
-			}
-			buf.WriteString(`\u202`)
-			buf.WriteByte(hex[c&0xF])
-			i += size
-			start = i
-			continue
-		}
-		i += size
-	}
-	if start < len(s) {
-		buf.WriteString(s[start:])
-	}
-	buf.WriteByte('"')
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling_test.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling_test.go
deleted file mode 100644
index 3edb271410..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlog_marshalling_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package jsonlog
-
-import (
-	"regexp"
-	"testing"
-)
-
-func TestJSONLogMarshalJSON(t *testing.T) {
-	logs := map[*JSONLog]string{
-		&JSONLog{Log: `"A log line with \\"`}:           `^{\"log\":\"\\\"A log line with \\\\\\\\\\\"\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: "A log line"}:                     `^{\"log\":\"A log line\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: "A log line with \r"}:             `^{\"log\":\"A log line with \\r\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: "A log line with & < >"}:          `^{\"log\":\"A log line with \\u0026 \\u003c \\u003e\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: "A log line with utf8 : 🚀 ψ ω β"}: `^{\"log\":\"A log line with utf8 : 🚀 ψ ω β\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Stream: "stdout"}:                      `^{\"stream\":\"stdout\",\"time\":\".{20,}\"}$`,
-		&JSONLog{}:                                      `^{\"time\":\".{20,}\"}$`,
-		// These ones are a little weird
-		&JSONLog{Log: "\u2028 \u2029"}:      `^{\"log\":\"\\u2028 \\u2029\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: string([]byte{0xaF})}: `^{\"log\":\"\\ufffd\",\"time\":\".{20,}\"}$`,
-		&JSONLog{Log: string([]byte{0x7F})}: `^{\"log\":\"\x7f\",\"time\":\".{20,}\"}$`,
-	}
-	for jsonLog, expression := range logs {
-		data, err := jsonLog.MarshalJSON()
-		if err != nil {
-			t.Fatal(err)
-		}
-		res := string(data)
-		t.Logf("Result of WriteLog: %q", res)
-		logRe := regexp.MustCompile(expression)
-		if !logRe.MatchString(res) {
-			t.Fatalf("Log line not in expected format [%v]: %q", expression, res)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go
deleted file mode 100644
index df522c0d66..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package jsonlog
-
-import (
-	"bytes"
-	"encoding/json"
-	"unicode/utf8"
-)
-
-// JSONLogs is based on JSONLog.
-// It allows marshalling JSONLog from Log as []byte
-// and an already marshalled Created timestamp.
-type JSONLogs struct {
-	Log     []byte `json:"log,omitempty"`
-	Stream  string `json:"stream,omitempty"`
-	Created string `json:"time"`
-
-	// json-encoded bytes
-	RawAttrs json.RawMessage `json:"attrs,omitempty"`
-}
-
-// MarshalJSONBuf is based on the same method from JSONLog
-// It has been modified to take into account the necessary changes.
-func (mj *JSONLogs) MarshalJSONBuf(buf *bytes.Buffer) error {
-	var first = true
-
-	buf.WriteString(`{`)
-	if len(mj.Log) != 0 {
-		first = false
-		buf.WriteString(`"log":`)
-		ffjsonWriteJSONBytesAsString(buf, mj.Log)
-	}
-	if len(mj.Stream) != 0 {
-		if first == true {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"stream":`)
-		ffjsonWriteJSONString(buf, mj.Stream)
-	}
-	if len(mj.RawAttrs) > 0 {
-		if first {
-			first = false
-		} else {
-			buf.WriteString(`,`)
-		}
-		buf.WriteString(`"attrs":`)
-		buf.Write(mj.RawAttrs)
-	}
-	if !first {
-		buf.WriteString(`,`)
-	}
-	buf.WriteString(`"time":`)
-	buf.WriteString(mj.Created)
-	buf.WriteString(`}`)
-	return nil
-}
-
-// This is based on ffjsonWriteJSONBytesAsString. It has been changed
-// to accept a string passed as a slice of bytes.
-func ffjsonWriteJSONBytesAsString(buf *bytes.Buffer, s []byte) {
-	const hex = "0123456789abcdef"
-
-	buf.WriteByte('"')
-	start := 0
-	for i := 0; i < len(s); {
-		if b := s[i]; b < utf8.RuneSelf {
-			if 0x20 <= b && b != '\\' && b != '"' && b != '<' && b != '>' && b != '&' {
-				i++
-				continue
-			}
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			switch b {
-			case '\\', '"':
-				buf.WriteByte('\\')
-				buf.WriteByte(b)
-			case '\n':
-				buf.WriteByte('\\')
-				buf.WriteByte('n')
-			case '\r':
-				buf.WriteByte('\\')
-				buf.WriteByte('r')
-			default:
-
-				buf.WriteString(`\u00`)
-				buf.WriteByte(hex[b>>4])
-				buf.WriteByte(hex[b&0xF])
-			}
-			i++
-			start = i
-			continue
-		}
-		c, size := utf8.DecodeRune(s[i:])
-		if c == utf8.RuneError && size == 1 {
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			buf.WriteString(`\ufffd`)
-			i += size
-			start = i
-			continue
-		}
-
-		if c == '\u2028' || c == '\u2029' {
-			if start < i {
-				buf.Write(s[start:i])
-			}
-			buf.WriteString(`\u202`)
-			buf.WriteByte(hex[c&0xF])
-			i += size
-			start = i
-			continue
-		}
-		i += size
-	}
-	if start < len(s) {
-		buf.Write(s[start:])
-	}
-	buf.WriteByte('"')
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes_test.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes_test.go
deleted file mode 100644
index 6d6ad21583..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/jsonlogbytes_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package jsonlog
-
-import (
-	"bytes"
-	"regexp"
-	"testing"
-)
-
-func TestJSONLogsMarshalJSONBuf(t *testing.T) {
-	logs := map[*JSONLogs]string{
-		&JSONLogs{Log: []byte(`"A log line with \\"`)}:           `^{\"log\":\"\\\"A log line with \\\\\\\\\\\"\",\"time\":}$`,
-		&JSONLogs{Log: []byte("A log line")}:                     `^{\"log\":\"A log line\",\"time\":}$`,
-		&JSONLogs{Log: []byte("A log line with \r")}:             `^{\"log\":\"A log line with \\r\",\"time\":}$`,
-		&JSONLogs{Log: []byte("A log line with & < >")}:          `^{\"log\":\"A log line with \\u0026 \\u003c \\u003e\",\"time\":}$`,
-		&JSONLogs{Log: []byte("A log line with utf8 : 🚀 ψ ω β")}: `^{\"log\":\"A log line with utf8 : 🚀 ψ ω β\",\"time\":}$`,
-		&JSONLogs{Stream: "stdout"}:                              `^{\"stream\":\"stdout\",\"time\":}$`,
-		&JSONLogs{Stream: "stdout", Log: []byte("A log line")}:   `^{\"log\":\"A log line\",\"stream\":\"stdout\",\"time\":}$`,
-		&JSONLogs{Created: "time"}:                               `^{\"time\":time}$`,
-		&JSONLogs{}:                                              `^{\"time\":}$`,
-		// These ones are a little weird
-		&JSONLogs{Log: []byte("\u2028 \u2029")}: `^{\"log\":\"\\u2028 \\u2029\",\"time\":}$`,
-		&JSONLogs{Log: []byte{0xaF}}:            `^{\"log\":\"\\ufffd\",\"time\":}$`,
-		&JSONLogs{Log: []byte{0x7F}}:            `^{\"log\":\"\x7f\",\"time\":}$`,
-		// with raw attributes
-		&JSONLogs{Log: []byte("A log line"), RawAttrs: []byte(`{"hello":"world","value":1234}`)}: `^{\"log\":\"A log line\",\"attrs\":{\"hello\":\"world\",\"value\":1234},\"time\":}$`,
-	}
-	for jsonLog, expression := range logs {
-		var buf bytes.Buffer
-		if err := jsonLog.MarshalJSONBuf(&buf); err != nil {
-			t.Fatal(err)
-		}
-		res := buf.String()
-		t.Logf("Result of WriteLog: %q", res)
-		logRe := regexp.MustCompile(expression)
-		if !logRe.MatchString(res) {
-			t.Fatalf("Log line not in expected format [%v]: %q", expression, res)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go
deleted file mode 100644
index 2117338149..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Package jsonlog provides helper functions to parse and print time (time.Time) as JSON.
-package jsonlog
-
-import (
-	"errors"
-	"time"
-)
-
-const (
-	// RFC3339NanoFixed is our own version of RFC339Nano because we want one
-	// that pads the nano seconds part with zeros to ensure
-	// the timestamps are aligned in the logs.
-	RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
-	// JSONFormat is the format used by FastMarshalJSON
-	JSONFormat = `"` + time.RFC3339Nano + `"`
-)
-
-// FastTimeMarshalJSON avoids one of the extra allocations that
-// time.MarshalJSON is making.
-func FastTimeMarshalJSON(t time.Time) (string, error) {
-	if y := t.Year(); y < 0 || y >= 10000 {
-		// RFC 3339 is clear that years are 4 digits exactly.
-		// See golang.org/issue/4556#c15 for more discussion.
-		return "", errors.New("time.MarshalJSON: year outside of range [0,9999]")
-	}
-	return t.Format(JSONFormat), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling_test.go b/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling_test.go
deleted file mode 100644
index 02d0302c4a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonlog/time_marshalling_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package jsonlog
-
-import (
-	"testing"
-	"time"
-)
-
-// Testing to ensure 'year' fields is between 0 and 9999
-func TestFastTimeMarshalJSONWithInvalidDate(t *testing.T) {
-	aTime := time.Date(-1, 1, 1, 0, 0, 0, 0, time.Local)
-	json, err := FastTimeMarshalJSON(aTime)
-	if err == nil {
-		t.Fatalf("FastTimeMarshalJSON should throw an error, but was '%v'", json)
-	}
-	anotherTime := time.Date(10000, 1, 1, 0, 0, 0, 0, time.Local)
-	json, err = FastTimeMarshalJSON(anotherTime)
-	if err == nil {
-		t.Fatalf("FastTimeMarshalJSON should throw an error, but was '%v'", json)
-	}
-
-}
-
-func TestFastTimeMarshalJSON(t *testing.T) {
-	aTime := time.Date(2015, 5, 29, 11, 1, 2, 3, time.UTC)
-	json, err := FastTimeMarshalJSON(aTime)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := "\"2015-05-29T11:01:02.000000003Z\""
-	if json != expected {
-		t.Fatalf("Expected %v, got %v", expected, json)
-	}
-
-	location, err := time.LoadLocation("Europe/Paris")
-	if err != nil {
-		t.Fatal(err)
-	}
-	aTime = time.Date(2015, 5, 29, 11, 1, 2, 3, location)
-	json, err = FastTimeMarshalJSON(aTime)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected = "\"2015-05-29T11:01:02.000000003+02:00\""
-	if json != expected {
-		t.Fatalf("Expected %v, got %v", expected, json)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go b/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
deleted file mode 100644
index 5481433c56..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
+++ /dev/null
@@ -1,225 +0,0 @@
-package jsonmessage
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/go-units"
-)
-
-// JSONError wraps a concrete Code and Message, `Code` is
-// is an integer error code, `Message` is the error message.
-type JSONError struct {
-	Code    int    `json:"code,omitempty"`
-	Message string `json:"message,omitempty"`
-}
-
-func (e *JSONError) Error() string {
-	return e.Message
-}
-
-// JSONProgress describes a Progress. terminalFd is the fd of the current terminal,
-// Start is the initial value for the operation. Current is the current status and
-// value of the progress made towards Total. Total is the end value describing when
-// we made 100% progress for an operation.
-type JSONProgress struct {
-	terminalFd uintptr
-	Current    int64 `json:"current,omitempty"`
-	Total      int64 `json:"total,omitempty"`
-	Start      int64 `json:"start,omitempty"`
-}
-
-func (p *JSONProgress) String() string {
-	var (
-		width       = 200
-		pbBox       string
-		numbersBox  string
-		timeLeftBox string
-	)
-
-	ws, err := term.GetWinsize(p.terminalFd)
-	if err == nil {
-		width = int(ws.Width)
-	}
-
-	if p.Current <= 0 && p.Total <= 0 {
-		return ""
-	}
-	current := units.HumanSize(float64(p.Current))
-	if p.Total <= 0 {
-		return fmt.Sprintf("%8v", current)
-	}
-	total := units.HumanSize(float64(p.Total))
-	percentage := int(float64(p.Current)/float64(p.Total)*100) / 2
-	if percentage > 50 {
-		percentage = 50
-	}
-	if width > 110 {
-		// this number can't be negative gh#7136
-		numSpaces := 0
-		if 50-percentage > 0 {
-			numSpaces = 50 - percentage
-		}
-		pbBox = fmt.Sprintf("[%s>%s] ", strings.Repeat("=", percentage), strings.Repeat(" ", numSpaces))
-	}
-
-	numbersBox = fmt.Sprintf("%8v/%v", current, total)
-
-	if p.Current > p.Total {
-		// remove total display if the reported current is wonky.
-		numbersBox = fmt.Sprintf("%8v", current)
-	}
-
-	if p.Current > 0 && p.Start > 0 && percentage < 50 {
-		fromStart := time.Now().UTC().Sub(time.Unix(p.Start, 0))
-		perEntry := fromStart / time.Duration(p.Current)
-		left := time.Duration(p.Total-p.Current) * perEntry
-		left = (left / time.Second) * time.Second
-
-		if width > 50 {
-			timeLeftBox = " " + left.String()
-		}
-	}
-	return pbBox + numbersBox + timeLeftBox
-}
-
-// JSONMessage defines a message struct. It describes
-// the created time, where it from, status, ID of the
-// message. It's used for docker events.
-type JSONMessage struct {
-	Stream          string        `json:"stream,omitempty"`
-	Status          string        `json:"status,omitempty"`
-	Progress        *JSONProgress `json:"progressDetail,omitempty"`
-	ProgressMessage string        `json:"progress,omitempty"` //deprecated
-	ID              string        `json:"id,omitempty"`
-	From            string        `json:"from,omitempty"`
-	Time            int64         `json:"time,omitempty"`
-	TimeNano        int64         `json:"timeNano,omitempty"`
-	Error           *JSONError    `json:"errorDetail,omitempty"`
-	ErrorMessage    string        `json:"error,omitempty"` //deprecated
-	// Aux contains out-of-band data, such as digests for push signing.
-	Aux *json.RawMessage `json:"aux,omitempty"`
-}
-
-// Display displays the JSONMessage to `out`. `isTerminal` describes if `out`
-// is a terminal. If this is the case, it will erase the entire current line
-// when displaying the progressbar.
-func (jm *JSONMessage) Display(out io.Writer, isTerminal bool) error {
-	if jm.Error != nil {
-		if jm.Error.Code == 401 {
-			return fmt.Errorf("Authentication is required.")
-		}
-		return jm.Error
-	}
-	var endl string
-	if isTerminal && jm.Stream == "" && jm.Progress != nil {
-		// <ESC>[2K = erase entire current line
-		fmt.Fprintf(out, "%c[2K\r", 27)
-		endl = "\r"
-	} else if jm.Progress != nil && jm.Progress.String() != "" { //disable progressbar in non-terminal
-		return nil
-	}
-	if jm.TimeNano != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(0, jm.TimeNano).Format(jsonlog.RFC3339NanoFixed))
-	} else if jm.Time != 0 {
-		fmt.Fprintf(out, "%s ", time.Unix(jm.Time, 0).Format(jsonlog.RFC3339NanoFixed))
-	}
-	if jm.ID != "" {
-		fmt.Fprintf(out, "%s: ", jm.ID)
-	}
-	if jm.From != "" {
-		fmt.Fprintf(out, "(from %s) ", jm.From)
-	}
-	if jm.Progress != nil && isTerminal {
-		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.Progress.String(), endl)
-	} else if jm.ProgressMessage != "" { //deprecated
-		fmt.Fprintf(out, "%s %s%s", jm.Status, jm.ProgressMessage, endl)
-	} else if jm.Stream != "" {
-		fmt.Fprintf(out, "%s%s", jm.Stream, endl)
-	} else {
-		fmt.Fprintf(out, "%s%s\n", jm.Status, endl)
-	}
-	return nil
-}
-
-// DisplayJSONMessagesStream displays a json message stream from `in` to `out`, `isTerminal`
-// describes if `out` is a terminal. If this is the case, it will print `\n` at the end of
-// each line and move the cursor while displaying.
-func DisplayJSONMessagesStream(in io.Reader, out io.Writer, terminalFd uintptr, isTerminal bool, auxCallback func(*json.RawMessage)) error {
-	var (
-		dec = json.NewDecoder(in)
-		ids = make(map[string]int)
-	)
-	for {
-		diff := 0
-		var jm JSONMessage
-		if err := dec.Decode(&jm); err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-
-		if jm.Aux != nil {
-			if auxCallback != nil {
-				auxCallback(jm.Aux)
-			}
-			continue
-		}
-
-		if jm.Progress != nil {
-			jm.Progress.terminalFd = terminalFd
-		}
-		if jm.ID != "" && (jm.Progress != nil || jm.ProgressMessage != "") {
-			line, ok := ids[jm.ID]
-			if !ok {
-				// NOTE: This approach of using len(id) to
-				// figure out the number of lines of history
-				// only works as long as we clear the history
-				// when we output something that's not
-				// accounted for in the map, such as a line
-				// with no ID.
-				line = len(ids)
-				ids[jm.ID] = line
-				if isTerminal {
-					fmt.Fprintf(out, "\n")
-				}
-			}
-			diff = len(ids) - line
-			if isTerminal && diff > 0 {
-				fmt.Fprintf(out, "%c[%dA", 27, diff)
-			}
-		} else {
-			// When outputting something that isn't progress
-			// output, clear the history of previous lines. We
-			// don't want progress entries from some previous
-			// operation to be updated (for example, pull -a
-			// with multiple tags).
-			ids = make(map[string]int)
-		}
-		err := jm.Display(out, isTerminal)
-		if jm.ID != "" && isTerminal && diff > 0 {
-			fmt.Fprintf(out, "%c[%dB", 27, diff)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type stream interface {
-	io.Writer
-	FD() uintptr
-	IsTerminal() bool
-}
-
-// DisplayJSONMessagesToStream prints json messages to the output stream
-func DisplayJSONMessagesToStream(in io.Reader, stream stream, auxCallback func(*json.RawMessage)) error {
-	return DisplayJSONMessagesStream(in, stream, stream.FD(), stream.IsTerminal(), auxCallback)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage_test.go b/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage_test.go
deleted file mode 100644
index c6c5b0ed2a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage_test.go
+++ /dev/null
@@ -1,245 +0,0 @@
-package jsonmessage
-
-import (
-	"bytes"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/jsonlog"
-	"github.com/docker/docker/pkg/term"
-)
-
-func TestError(t *testing.T) {
-	je := JSONError{404, "Not found"}
-	if je.Error() != "Not found" {
-		t.Fatalf("Expected 'Not found' got '%s'", je.Error())
-	}
-}
-
-func TestProgress(t *testing.T) {
-	termsz, err := term.GetWinsize(0)
-	if err != nil {
-		// we can safely ignore the err here
-		termsz = nil
-	}
-	jp := JSONProgress{}
-	if jp.String() != "" {
-		t.Fatalf("Expected empty string, got '%s'", jp.String())
-	}
-
-	expected := "     1 B"
-	jp2 := JSONProgress{Current: 1}
-	if jp2.String() != expected {
-		t.Fatalf("Expected %q, got %q", expected, jp2.String())
-	}
-
-	expectedStart := "[==========>                                        ]     20 B/100 B"
-	if termsz != nil && termsz.Width <= 110 {
-		expectedStart = "    20 B/100 B"
-	}
-	jp3 := JSONProgress{Current: 20, Total: 100, Start: time.Now().Unix()}
-	// Just look at the start of the string
-	// (the remaining time is really hard to test -_-)
-	if jp3.String()[:len(expectedStart)] != expectedStart {
-		t.Fatalf("Expected to start with %q, got %q", expectedStart, jp3.String())
-	}
-
-	expected = "[=========================>                         ]     50 B/100 B"
-	if termsz != nil && termsz.Width <= 110 {
-		expected = "    50 B/100 B"
-	}
-	jp4 := JSONProgress{Current: 50, Total: 100}
-	if jp4.String() != expected {
-		t.Fatalf("Expected %q, got %q", expected, jp4.String())
-	}
-
-	// this number can't be negative gh#7136
-	expected = "[==================================================>]     50 B"
-	if termsz != nil && termsz.Width <= 110 {
-		expected = "    50 B"
-	}
-	jp5 := JSONProgress{Current: 50, Total: 40}
-	if jp5.String() != expected {
-		t.Fatalf("Expected %q, got %q", expected, jp5.String())
-	}
-}
-
-func TestJSONMessageDisplay(t *testing.T) {
-	now := time.Now()
-	messages := map[JSONMessage][]string{
-		// Empty
-		JSONMessage{}: {"\n", "\n"},
-		// Status
-		JSONMessage{
-			Status: "status",
-		}: {
-			"status\n",
-			"status\n",
-		},
-		// General
-		JSONMessage{
-			Time:   now.Unix(),
-			ID:     "ID",
-			From:   "From",
-			Status: "status",
-		}: {
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(now.Unix(), 0).Format(jsonlog.RFC3339NanoFixed)),
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(now.Unix(), 0).Format(jsonlog.RFC3339NanoFixed)),
-		},
-		// General, with nano precision time
-		JSONMessage{
-			TimeNano: now.UnixNano(),
-			ID:       "ID",
-			From:     "From",
-			Status:   "status",
-		}: {
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(0, now.UnixNano()).Format(jsonlog.RFC3339NanoFixed)),
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(0, now.UnixNano()).Format(jsonlog.RFC3339NanoFixed)),
-		},
-		// General, with both times Nano is preferred
-		JSONMessage{
-			Time:     now.Unix(),
-			TimeNano: now.UnixNano(),
-			ID:       "ID",
-			From:     "From",
-			Status:   "status",
-		}: {
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(0, now.UnixNano()).Format(jsonlog.RFC3339NanoFixed)),
-			fmt.Sprintf("%v ID: (from From) status\n", time.Unix(0, now.UnixNano()).Format(jsonlog.RFC3339NanoFixed)),
-		},
-		// Stream over status
-		JSONMessage{
-			Status: "status",
-			Stream: "stream",
-		}: {
-			"stream",
-			"stream",
-		},
-		// With progress message
-		JSONMessage{
-			Status:          "status",
-			ProgressMessage: "progressMessage",
-		}: {
-			"status progressMessage",
-			"status progressMessage",
-		},
-		// With progress, stream empty
-		JSONMessage{
-			Status:   "status",
-			Stream:   "",
-			Progress: &JSONProgress{Current: 1},
-		}: {
-			"",
-			fmt.Sprintf("%c[2K\rstatus      1 B\r", 27),
-		},
-	}
-
-	// The tests :)
-	for jsonMessage, expectedMessages := range messages {
-		// Without terminal
-		data := bytes.NewBuffer([]byte{})
-		if err := jsonMessage.Display(data, false); err != nil {
-			t.Fatal(err)
-		}
-		if data.String() != expectedMessages[0] {
-			t.Fatalf("Expected [%v], got [%v]", expectedMessages[0], data.String())
-		}
-		// With terminal
-		data = bytes.NewBuffer([]byte{})
-		if err := jsonMessage.Display(data, true); err != nil {
-			t.Fatal(err)
-		}
-		if data.String() != expectedMessages[1] {
-			t.Fatalf("Expected [%v], got [%v]", expectedMessages[1], data.String())
-		}
-	}
-}
-
-// Test JSONMessage with an Error. It will return an error with the text as error, not the meaning of the HTTP code.
-func TestJSONMessageDisplayWithJSONError(t *testing.T) {
-	data := bytes.NewBuffer([]byte{})
-	jsonMessage := JSONMessage{Error: &JSONError{404, "Can't find it"}}
-
-	err := jsonMessage.Display(data, true)
-	if err == nil || err.Error() != "Can't find it" {
-		t.Fatalf("Expected a JSONError 404, got [%v]", err)
-	}
-
-	jsonMessage = JSONMessage{Error: &JSONError{401, "Anything"}}
-	err = jsonMessage.Display(data, true)
-	if err == nil || err.Error() != "Authentication is required." {
-		t.Fatalf("Expected an error [Authentication is required.], got [%v]", err)
-	}
-}
-
-func TestDisplayJSONMessagesStreamInvalidJSON(t *testing.T) {
-	var (
-		inFd uintptr
-	)
-	data := bytes.NewBuffer([]byte{})
-	reader := strings.NewReader("This is not a 'valid' JSON []")
-	inFd, _ = term.GetFdInfo(reader)
-
-	if err := DisplayJSONMessagesStream(reader, data, inFd, false, nil); err == nil && err.Error()[:17] != "invalid character" {
-		t.Fatalf("Should have thrown an error (invalid character in ..), got [%v]", err)
-	}
-}
-
-func TestDisplayJSONMessagesStream(t *testing.T) {
-	var (
-		inFd uintptr
-	)
-
-	messages := map[string][]string{
-		// empty string
-		"": {
-			"",
-			""},
-		// Without progress & ID
-		"{ \"status\": \"status\" }": {
-			"status\n",
-			"status\n",
-		},
-		// Without progress, with ID
-		"{ \"id\": \"ID\",\"status\": \"status\" }": {
-			"ID: status\n",
-			fmt.Sprintf("ID: status\n"),
-		},
-		// With progress
-		"{ \"id\": \"ID\", \"status\": \"status\", \"progress\": \"ProgressMessage\" }": {
-			"ID: status ProgressMessage",
-			fmt.Sprintf("\n%c[%dAID: status ProgressMessage%c[%dB", 27, 1, 27, 1),
-		},
-		// With progressDetail
-		"{ \"id\": \"ID\", \"status\": \"status\", \"progressDetail\": { \"Current\": 1} }": {
-			"", // progressbar is disabled in non-terminal
-			fmt.Sprintf("\n%c[%dA%c[2K\rID: status      1 B\r%c[%dB", 27, 1, 27, 27, 1),
-		},
-	}
-	for jsonMessage, expectedMessages := range messages {
-		data := bytes.NewBuffer([]byte{})
-		reader := strings.NewReader(jsonMessage)
-		inFd, _ = term.GetFdInfo(reader)
-
-		// Without terminal
-		if err := DisplayJSONMessagesStream(reader, data, inFd, false, nil); err != nil {
-			t.Fatal(err)
-		}
-		if data.String() != expectedMessages[0] {
-			t.Fatalf("Expected an [%v], got [%v]", expectedMessages[0], data.String())
-		}
-
-		// With terminal
-		data = bytes.NewBuffer([]byte{})
-		reader = strings.NewReader(jsonMessage)
-		if err := DisplayJSONMessagesStream(reader, data, inFd, true, nil); err != nil {
-			t.Fatal(err)
-		}
-		if data.String() != expectedMessages[1] {
-			t.Fatalf("Expected an [%v], got [%v]", expectedMessages[1], data.String())
-		}
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_solaris.go b/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_solaris.go
deleted file mode 100644
index ff833e3741..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_solaris.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package listeners
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-
-	"github.com/docker/go-connections/sockets"
-)
-
-// Init creates new listeners for the server.
-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) (ls []net.Listener, err error) {
-	switch proto {
-	case "tcp":
-		l, err := sockets.NewTCPSocket(addr, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, l)
-	case "unix":
-		l, err := sockets.NewUnixSocket(addr, socketGroup)
-		if err != nil {
-			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)
-		}
-		ls = append(ls, l)
-	default:
-		return nil, fmt.Errorf("Invalid protocol format: %q", proto)
-	}
-
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_unix.go b/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_unix.go
deleted file mode 100644
index 1bcae7aa3e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_unix.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// +build !windows,!solaris
-
-package listeners
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-	"strconv"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/coreos/go-systemd/activation"
-	"github.com/docker/go-connections/sockets"
-)
-
-// Init creates new listeners for the server.
-// TODO: Clean up the fact that socketGroup and tlsConfig aren't always used.
-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listener, error) {
-	ls := []net.Listener{}
-
-	switch proto {
-	case "fd":
-		fds, err := listenFD(addr, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, fds...)
-	case "tcp":
-		l, err := sockets.NewTCPSocket(addr, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, l)
-	case "unix":
-		l, err := sockets.NewUnixSocket(addr, socketGroup)
-		if err != nil {
-			return nil, fmt.Errorf("can't create unix socket %s: %v", addr, err)
-		}
-		ls = append(ls, l)
-	default:
-		return nil, fmt.Errorf("invalid protocol format: %q", proto)
-	}
-
-	return ls, nil
-}
-
-// listenFD returns the specified socket activated files as a slice of
-// net.Listeners or all of the activated files if "*" is given.
-func listenFD(addr string, tlsConfig *tls.Config) ([]net.Listener, error) {
-	var (
-		err       error
-		listeners []net.Listener
-	)
-	// socket activation
-	if tlsConfig != nil {
-		listeners, err = activation.TLSListeners(false, tlsConfig)
-	} else {
-		listeners, err = activation.Listeners(false)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	if len(listeners) == 0 {
-		return nil, fmt.Errorf("no sockets found via socket activation: make sure the service was started by systemd")
-	}
-
-	// default to all fds just like unix:// and tcp://
-	if addr == "" || addr == "*" {
-		return listeners, nil
-	}
-
-	fdNum, err := strconv.Atoi(addr)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse systemd fd address: should be a number: %v", addr)
-	}
-	fdOffset := fdNum - 3
-	if len(listeners) < int(fdOffset)+1 {
-		return nil, fmt.Errorf("too few socket activated files passed in by systemd")
-	}
-	if listeners[fdOffset] == nil {
-		return nil, fmt.Errorf("failed to listen on systemd activated file: fd %d", fdOffset+3)
-	}
-	for i, ls := range listeners {
-		if i == fdOffset || ls == nil {
-			continue
-		}
-		if err := ls.Close(); err != nil {
-			// TODO: We shouldn't log inside a library. Remove this or error out.
-			logrus.Errorf("failed to close systemd activated file: fd %d: %v", fdOffset+3, err)
-		}
-	}
-	return []net.Listener{listeners[fdOffset]}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_windows.go b/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_windows.go
deleted file mode 100644
index 5b5a470fc6..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/listeners/listeners_windows.go
+++ /dev/null
@@ -1,54 +0,0 @@
-package listeners
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net"
-	"strings"
-
-	"github.com/Microsoft/go-winio"
-	"github.com/docker/go-connections/sockets"
-)
-
-// Init creates new listeners for the server.
-func Init(proto, addr, socketGroup string, tlsConfig *tls.Config) ([]net.Listener, error) {
-	ls := []net.Listener{}
-
-	switch proto {
-	case "tcp":
-		l, err := sockets.NewTCPSocket(addr, tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, l)
-
-	case "npipe":
-		// allow Administrators and SYSTEM, plus whatever additional users or groups were specified
-		sddl := "D:P(A;;GA;;;BA)(A;;GA;;;SY)"
-		if socketGroup != "" {
-			for _, g := range strings.Split(socketGroup, ",") {
-				sid, err := winio.LookupSidByName(g)
-				if err != nil {
-					return nil, err
-				}
-				sddl += fmt.Sprintf("(A;;GRGW;;;%s)", sid)
-			}
-		}
-		c := winio.PipeConfig{
-			SecurityDescriptor: sddl,
-			MessageMode:        true,  // Use message mode so that CloseWrite() is supported
-			InputBufferSize:    65536, // Use 64KB buffers to improve performance
-			OutputBufferSize:   65536,
-		}
-		l, err := winio.ListenPipe(addr, &c)
-		if err != nil {
-			return nil, err
-		}
-		ls = append(ls, l)
-
-	default:
-		return nil, fmt.Errorf("invalid protocol format: windows only supports tcp and npipe")
-	}
-
-	return ls, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/locker/README.md b/installer/vendor/github.com/docker/docker/pkg/locker/README.md
deleted file mode 100644
index e84a815cc5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/locker/README.md
+++ /dev/null
@@ -1,65 +0,0 @@
-Locker
-=====
-
-locker provides a mechanism for creating finer-grained locking to help
-free up more global locks to handle other tasks.
-
-The implementation looks close to a sync.Mutex, however the user must provide a
-reference to use to refer to the underlying lock when locking and unlocking,
-and unlock may generate an error.
-
-If a lock with a given name does not exist when `Lock` is called, one is
-created.
-Lock references are automatically cleaned up on `Unlock` if nothing else is
-waiting for the lock.
-
-
-## Usage
-
-```go
-package important
-
-import (
-	"sync"
-	"time"
-
-	"github.com/docker/docker/pkg/locker"
-)
-
-type important struct {
-	locks *locker.Locker
-	data  map[string]interface{}
-	mu    sync.Mutex
-}
-
-func (i *important) Get(name string) interface{} {
-	i.locks.Lock(name)
-	defer i.locks.Unlock(name)
-	return data[name]
-}
-
-func (i *important) Create(name string, data interface{}) {
-	i.locks.Lock(name)
-	defer i.locks.Unlock(name)
-
-	i.createImportant(data)
-
-	s.mu.Lock()
-	i.data[name] = data
-	s.mu.Unlock()
-}
-
-func (i *important) createImportant(data interface{}) {
-	time.Sleep(10 * time.Second)
-}
-```
-
-For functions dealing with a given name, always lock at the beginning of the
-function (or before doing anything with the underlying state), this ensures any
-other function that is dealing with the same name will block.
-
-When needing to modify the underlying data, use the global lock to ensure nothing
-else is modfying it at the same time.
-Since name lock is already in place, no reads will occur while the modification
-is being performed.
-
diff --git a/installer/vendor/github.com/docker/docker/pkg/locker/locker.go b/installer/vendor/github.com/docker/docker/pkg/locker/locker.go
deleted file mode 100644
index 0b22ddfab8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/locker/locker.go
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Package locker provides a mechanism for creating finer-grained locking to help
-free up more global locks to handle other tasks.
-
-The implementation looks close to a sync.Mutex, however the user must provide a
-reference to use to refer to the underlying lock when locking and unlocking,
-and unlock may generate an error.
-
-If a lock with a given name does not exist when `Lock` is called, one is
-created.
-Lock references are automatically cleaned up on `Unlock` if nothing else is
-waiting for the lock.
-*/
-package locker
-
-import (
-	"errors"
-	"sync"
-	"sync/atomic"
-)
-
-// ErrNoSuchLock is returned when the requested lock does not exist
-var ErrNoSuchLock = errors.New("no such lock")
-
-// Locker provides a locking mechanism based on the passed in reference name
-type Locker struct {
-	mu    sync.Mutex
-	locks map[string]*lockCtr
-}
-
-// lockCtr is used by Locker to represent a lock with a given name.
-type lockCtr struct {
-	mu sync.Mutex
-	// waiters is the number of waiters waiting to acquire the lock
-	// this is int32 instead of uint32 so we can add `-1` in `dec()`
-	waiters int32
-}
-
-// inc increments the number of waiters waiting for the lock
-func (l *lockCtr) inc() {
-	atomic.AddInt32(&l.waiters, 1)
-}
-
-// dec decrements the number of waiters waiting on the lock
-func (l *lockCtr) dec() {
-	atomic.AddInt32(&l.waiters, -1)
-}
-
-// count gets the current number of waiters
-func (l *lockCtr) count() int32 {
-	return atomic.LoadInt32(&l.waiters)
-}
-
-// Lock locks the mutex
-func (l *lockCtr) Lock() {
-	l.mu.Lock()
-}
-
-// Unlock unlocks the mutex
-func (l *lockCtr) Unlock() {
-	l.mu.Unlock()
-}
-
-// New creates a new Locker
-func New() *Locker {
-	return &Locker{
-		locks: make(map[string]*lockCtr),
-	}
-}
-
-// Lock locks a mutex with the given name. If it doesn't exist, one is created
-func (l *Locker) Lock(name string) {
-	l.mu.Lock()
-	if l.locks == nil {
-		l.locks = make(map[string]*lockCtr)
-	}
-
-	nameLock, exists := l.locks[name]
-	if !exists {
-		nameLock = &lockCtr{}
-		l.locks[name] = nameLock
-	}
-
-	// increment the nameLock waiters while inside the main mutex
-	// this makes sure that the lock isn't deleted if `Lock` and `Unlock` are called concurrently
-	nameLock.inc()
-	l.mu.Unlock()
-
-	// Lock the nameLock outside the main mutex so we don't block other operations
-	// once locked then we can decrement the number of waiters for this lock
-	nameLock.Lock()
-	nameLock.dec()
-}
-
-// Unlock unlocks the mutex with the given name
-// If the given lock is not being waited on by any other callers, it is deleted
-func (l *Locker) Unlock(name string) error {
-	l.mu.Lock()
-	nameLock, exists := l.locks[name]
-	if !exists {
-		l.mu.Unlock()
-		return ErrNoSuchLock
-	}
-
-	if nameLock.count() == 0 {
-		delete(l.locks, name)
-	}
-	nameLock.Unlock()
-
-	l.mu.Unlock()
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/locker/locker_test.go b/installer/vendor/github.com/docker/docker/pkg/locker/locker_test.go
deleted file mode 100644
index 5a297dd47b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/locker/locker_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-package locker
-
-import (
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestLockCounter(t *testing.T) {
-	l := &lockCtr{}
-	l.inc()
-
-	if l.waiters != 1 {
-		t.Fatal("counter inc failed")
-	}
-
-	l.dec()
-	if l.waiters != 0 {
-		t.Fatal("counter dec failed")
-	}
-}
-
-func TestLockerLock(t *testing.T) {
-	l := New()
-	l.Lock("test")
-	ctr := l.locks["test"]
-
-	if ctr.count() != 0 {
-		t.Fatalf("expected waiters to be 0, got :%d", ctr.waiters)
-	}
-
-	chDone := make(chan struct{})
-	go func() {
-		l.Lock("test")
-		close(chDone)
-	}()
-
-	chWaiting := make(chan struct{})
-	go func() {
-		for range time.Tick(1 * time.Millisecond) {
-			if ctr.count() == 1 {
-				close(chWaiting)
-				break
-			}
-		}
-	}()
-
-	select {
-	case <-chWaiting:
-	case <-time.After(3 * time.Second):
-		t.Fatal("timed out waiting for lock waiters to be incremented")
-	}
-
-	select {
-	case <-chDone:
-		t.Fatal("lock should not have returned while it was still held")
-	default:
-	}
-
-	if err := l.Unlock("test"); err != nil {
-		t.Fatal(err)
-	}
-
-	select {
-	case <-chDone:
-	case <-time.After(3 * time.Second):
-		t.Fatalf("lock should have completed")
-	}
-
-	if ctr.count() != 0 {
-		t.Fatalf("expected waiters to be 0, got: %d", ctr.count())
-	}
-}
-
-func TestLockerUnlock(t *testing.T) {
-	l := New()
-
-	l.Lock("test")
-	l.Unlock("test")
-
-	chDone := make(chan struct{})
-	go func() {
-		l.Lock("test")
-		close(chDone)
-	}()
-
-	select {
-	case <-chDone:
-	case <-time.After(3 * time.Second):
-		t.Fatalf("lock should not be blocked")
-	}
-}
-
-func TestLockerConcurrency(t *testing.T) {
-	l := New()
-
-	var wg sync.WaitGroup
-	for i := 0; i <= 10000; i++ {
-		wg.Add(1)
-		go func() {
-			l.Lock("test")
-			// if there is a concurrency issue, will very likely panic here
-			l.Unlock("test")
-			wg.Done()
-		}()
-	}
-
-	chDone := make(chan struct{})
-	go func() {
-		wg.Wait()
-		close(chDone)
-	}()
-
-	select {
-	case <-chDone:
-	case <-time.After(10 * time.Second):
-		t.Fatal("timeout waiting for locks to complete")
-	}
-
-	// Since everything has unlocked this should not exist anymore
-	if ctr, exists := l.locks["test"]; exists {
-		t.Fatalf("lock should not exist: %v", ctr)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/longpath/longpath_test.go b/installer/vendor/github.com/docker/docker/pkg/longpath/longpath_test.go
deleted file mode 100644
index 01865eff09..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/longpath/longpath_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package longpath
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestStandardLongPath(t *testing.T) {
-	c := `C:\simple\path`
-	longC := AddPrefix(c)
-	if !strings.EqualFold(longC, `\\?\C:\simple\path`) {
-		t.Errorf("Wrong long path returned. Original = %s ; Long = %s", c, longC)
-	}
-}
-
-func TestUNCLongPath(t *testing.T) {
-	c := `\\server\share\path`
-	longC := AddPrefix(c)
-	if !strings.EqualFold(longC, `\\?\UNC\server\share\path`) {
-		t.Errorf("Wrong UNC long path returned. Original = %s ; Long = %s", c, longC)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/loopback/attach_loopback.go b/installer/vendor/github.com/docker/docker/pkg/loopback/attach_loopback.go
deleted file mode 100644
index 971f45eb48..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/loopback/attach_loopback.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// +build linux
-
-package loopback
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// Loopback related errors
-var (
-	ErrAttachLoopbackDevice   = errors.New("loopback attach failed")
-	ErrGetLoopbackBackingFile = errors.New("Unable to get loopback backing file")
-	ErrSetCapacity            = errors.New("Unable set loopback capacity")
-)
-
-func stringToLoopName(src string) [LoNameSize]uint8 {
-	var dst [LoNameSize]uint8
-	copy(dst[:], src[:])
-	return dst
-}
-
-func getNextFreeLoopbackIndex() (int, error) {
-	f, err := os.OpenFile("/dev/loop-control", os.O_RDONLY, 0644)
-	if err != nil {
-		return 0, err
-	}
-	defer f.Close()
-
-	index, err := ioctlLoopCtlGetFree(f.Fd())
-	if index < 0 {
-		index = 0
-	}
-	return index, err
-}
-
-func openNextAvailableLoopback(index int, sparseFile *os.File) (loopFile *os.File, err error) {
-	// Start looking for a free /dev/loop
-	for {
-		target := fmt.Sprintf("/dev/loop%d", index)
-		index++
-
-		fi, err := os.Stat(target)
-		if err != nil {
-			if os.IsNotExist(err) {
-				logrus.Error("There are no more loopback devices available.")
-			}
-			return nil, ErrAttachLoopbackDevice
-		}
-
-		if fi.Mode()&os.ModeDevice != os.ModeDevice {
-			logrus.Errorf("Loopback device %s is not a block device.", target)
-			continue
-		}
-
-		// OpenFile adds O_CLOEXEC
-		loopFile, err = os.OpenFile(target, os.O_RDWR, 0644)
-		if err != nil {
-			logrus.Errorf("Error opening loopback device: %s", err)
-			return nil, ErrAttachLoopbackDevice
-		}
-
-		// Try to attach to the loop file
-		if err := ioctlLoopSetFd(loopFile.Fd(), sparseFile.Fd()); err != nil {
-			loopFile.Close()
-
-			// If the error is EBUSY, then try the next loopback
-			if err != syscall.EBUSY {
-				logrus.Errorf("Cannot set up loopback device %s: %s", target, err)
-				return nil, ErrAttachLoopbackDevice
-			}
-
-			// Otherwise, we keep going with the loop
-			continue
-		}
-		// In case of success, we finished. Break the loop.
-		break
-	}
-
-	// This can't happen, but let's be sure
-	if loopFile == nil {
-		logrus.Errorf("Unreachable code reached! Error attaching %s to a loopback device.", sparseFile.Name())
-		return nil, ErrAttachLoopbackDevice
-	}
-
-	return loopFile, nil
-}
-
-// AttachLoopDevice attaches the given sparse file to the next
-// available loopback device. It returns an opened *os.File.
-func AttachLoopDevice(sparseName string) (loop *os.File, err error) {
-
-	// Try to retrieve the next available loopback device via syscall.
-	// If it fails, we discard error and start looping for a
-	// loopback from index 0.
-	startIndex, err := getNextFreeLoopbackIndex()
-	if err != nil {
-		logrus.Debugf("Error retrieving the next available loopback: %s", err)
-	}
-
-	// OpenFile adds O_CLOEXEC
-	sparseFile, err := os.OpenFile(sparseName, os.O_RDWR, 0644)
-	if err != nil {
-		logrus.Errorf("Error opening sparse file %s: %s", sparseName, err)
-		return nil, ErrAttachLoopbackDevice
-	}
-	defer sparseFile.Close()
-
-	loopFile, err := openNextAvailableLoopback(startIndex, sparseFile)
-	if err != nil {
-		return nil, err
-	}
-
-	// Set the status of the loopback device
-	loopInfo := &loopInfo64{
-		loFileName: stringToLoopName(loopFile.Name()),
-		loOffset:   0,
-		loFlags:    LoFlagsAutoClear,
-	}
-
-	if err := ioctlLoopSetStatus64(loopFile.Fd(), loopInfo); err != nil {
-		logrus.Errorf("Cannot set up loopback device info: %s", err)
-
-		// If the call failed, then free the loopback device
-		if err := ioctlLoopClrFd(loopFile.Fd()); err != nil {
-			logrus.Error("Error while cleaning up the loopback device")
-		}
-		loopFile.Close()
-		return nil, ErrAttachLoopbackDevice
-	}
-
-	return loopFile, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/loopback/ioctl.go b/installer/vendor/github.com/docker/docker/pkg/loopback/ioctl.go
deleted file mode 100644
index 0714eb5f87..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/loopback/ioctl.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build linux
-
-package loopback
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func ioctlLoopCtlGetFree(fd uintptr) (int, error) {
-	index, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, LoopCtlGetFree, 0)
-	if err != 0 {
-		return 0, err
-	}
-	return int(index), nil
-}
-
-func ioctlLoopSetFd(loopFd, sparseFd uintptr) error {
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetFd, sparseFd); err != 0 {
-		return err
-	}
-	return nil
-}
-
-func ioctlLoopSetStatus64(loopFd uintptr, loopInfo *loopInfo64) error {
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 {
-		return err
-	}
-	return nil
-}
-
-func ioctlLoopClrFd(loopFd uintptr) error {
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopClrFd, 0); err != 0 {
-		return err
-	}
-	return nil
-}
-
-func ioctlLoopGetStatus64(loopFd uintptr) (*loopInfo64, error) {
-	loopInfo := &loopInfo64{}
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopGetStatus64, uintptr(unsafe.Pointer(loopInfo))); err != 0 {
-		return nil, err
-	}
-	return loopInfo, nil
-}
-
-func ioctlLoopSetCapacity(loopFd uintptr, value int) error {
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, loopFd, LoopSetCapacity, uintptr(value)); err != 0 {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/loopback/loop_wrapper.go b/installer/vendor/github.com/docker/docker/pkg/loopback/loop_wrapper.go
deleted file mode 100644
index e1100ce156..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/loopback/loop_wrapper.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// +build linux
-
-package loopback
-
-/*
-#include <linux/loop.h> // FIXME: present only for defines, maybe we can remove it?
-
-#ifndef LOOP_CTL_GET_FREE
-  #define LOOP_CTL_GET_FREE 0x4C82
-#endif
-
-#ifndef LO_FLAGS_PARTSCAN
-  #define LO_FLAGS_PARTSCAN 8
-#endif
-
-*/
-import "C"
-
-type loopInfo64 struct {
-	loDevice         uint64 /* ioctl r/o */
-	loInode          uint64 /* ioctl r/o */
-	loRdevice        uint64 /* ioctl r/o */
-	loOffset         uint64
-	loSizelimit      uint64 /* bytes, 0 == max available */
-	loNumber         uint32 /* ioctl r/o */
-	loEncryptType    uint32
-	loEncryptKeySize uint32 /* ioctl w/o */
-	loFlags          uint32 /* ioctl r/o */
-	loFileName       [LoNameSize]uint8
-	loCryptName      [LoNameSize]uint8
-	loEncryptKey     [LoKeySize]uint8 /* ioctl w/o */
-	loInit           [2]uint64
-}
-
-// IOCTL consts
-const (
-	LoopSetFd       = C.LOOP_SET_FD
-	LoopCtlGetFree  = C.LOOP_CTL_GET_FREE
-	LoopGetStatus64 = C.LOOP_GET_STATUS64
-	LoopSetStatus64 = C.LOOP_SET_STATUS64
-	LoopClrFd       = C.LOOP_CLR_FD
-	LoopSetCapacity = C.LOOP_SET_CAPACITY
-)
-
-// LOOP consts.
-const (
-	LoFlagsAutoClear = C.LO_FLAGS_AUTOCLEAR
-	LoFlagsReadOnly  = C.LO_FLAGS_READ_ONLY
-	LoFlagsPartScan  = C.LO_FLAGS_PARTSCAN
-	LoKeySize        = C.LO_KEY_SIZE
-	LoNameSize       = C.LO_NAME_SIZE
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/loopback/loopback.go b/installer/vendor/github.com/docker/docker/pkg/loopback/loopback.go
deleted file mode 100644
index bc0479284c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/loopback/loopback.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build linux
-
-package loopback
-
-import (
-	"fmt"
-	"os"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-)
-
-func getLoopbackBackingFile(file *os.File) (uint64, uint64, error) {
-	loopInfo, err := ioctlLoopGetStatus64(file.Fd())
-	if err != nil {
-		logrus.Errorf("Error get loopback backing file: %s", err)
-		return 0, 0, ErrGetLoopbackBackingFile
-	}
-	return loopInfo.loDevice, loopInfo.loInode, nil
-}
-
-// SetCapacity reloads the size for the loopback device.
-func SetCapacity(file *os.File) error {
-	if err := ioctlLoopSetCapacity(file.Fd(), 0); err != nil {
-		logrus.Errorf("Error loopbackSetCapacity: %s", err)
-		return ErrSetCapacity
-	}
-	return nil
-}
-
-// FindLoopDeviceFor returns a loopback device file for the specified file which
-// is backing file of a loop back device.
-func FindLoopDeviceFor(file *os.File) *os.File {
-	stat, err := file.Stat()
-	if err != nil {
-		return nil
-	}
-	targetInode := stat.Sys().(*syscall.Stat_t).Ino
-	targetDevice := stat.Sys().(*syscall.Stat_t).Dev
-
-	for i := 0; true; i++ {
-		path := fmt.Sprintf("/dev/loop%d", i)
-
-		file, err := os.OpenFile(path, os.O_RDWR, 0)
-		if err != nil {
-			if os.IsNotExist(err) {
-				return nil
-			}
-
-			// Ignore all errors until the first not-exist
-			// we want to continue looking for the file
-			continue
-		}
-
-		dev, inode, err := getLoopbackBackingFile(file)
-		if err == nil && dev == targetDevice && inode == targetInode {
-			return file
-		}
-		file.Close()
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/flags.go b/installer/vendor/github.com/docker/docker/pkg/mount/flags.go
deleted file mode 100644
index 607dbed43a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/flags.go
+++ /dev/null
@@ -1,149 +0,0 @@
-package mount
-
-import (
-	"fmt"
-	"strings"
-)
-
-var flags = map[string]struct {
-	clear bool
-	flag  int
-}{
-	"defaults":      {false, 0},
-	"ro":            {false, RDONLY},
-	"rw":            {true, RDONLY},
-	"suid":          {true, NOSUID},
-	"nosuid":        {false, NOSUID},
-	"dev":           {true, NODEV},
-	"nodev":         {false, NODEV},
-	"exec":          {true, NOEXEC},
-	"noexec":        {false, NOEXEC},
-	"sync":          {false, SYNCHRONOUS},
-	"async":         {true, SYNCHRONOUS},
-	"dirsync":       {false, DIRSYNC},
-	"remount":       {false, REMOUNT},
-	"mand":          {false, MANDLOCK},
-	"nomand":        {true, MANDLOCK},
-	"atime":         {true, NOATIME},
-	"noatime":       {false, NOATIME},
-	"diratime":      {true, NODIRATIME},
-	"nodiratime":    {false, NODIRATIME},
-	"bind":          {false, BIND},
-	"rbind":         {false, RBIND},
-	"unbindable":    {false, UNBINDABLE},
-	"runbindable":   {false, RUNBINDABLE},
-	"private":       {false, PRIVATE},
-	"rprivate":      {false, RPRIVATE},
-	"shared":        {false, SHARED},
-	"rshared":       {false, RSHARED},
-	"slave":         {false, SLAVE},
-	"rslave":        {false, RSLAVE},
-	"relatime":      {false, RELATIME},
-	"norelatime":    {true, RELATIME},
-	"strictatime":   {false, STRICTATIME},
-	"nostrictatime": {true, STRICTATIME},
-}
-
-var validFlags = map[string]bool{
-	"":          true,
-	"size":      true,
-	"mode":      true,
-	"uid":       true,
-	"gid":       true,
-	"nr_inodes": true,
-	"nr_blocks": true,
-	"mpol":      true,
-}
-
-var propagationFlags = map[string]bool{
-	"bind":        true,
-	"rbind":       true,
-	"unbindable":  true,
-	"runbindable": true,
-	"private":     true,
-	"rprivate":    true,
-	"shared":      true,
-	"rshared":     true,
-	"slave":       true,
-	"rslave":      true,
-}
-
-// MergeTmpfsOptions merge mount options to make sure there is no duplicate.
-func MergeTmpfsOptions(options []string) ([]string, error) {
-	// We use collisions maps to remove duplicates.
-	// For flag, the key is the flag value (the key for propagation flag is -1)
-	// For data=value, the key is the data
-	flagCollisions := map[int]bool{}
-	dataCollisions := map[string]bool{}
-
-	var newOptions []string
-	// We process in reverse order
-	for i := len(options) - 1; i >= 0; i-- {
-		option := options[i]
-		if option == "defaults" {
-			continue
-		}
-		if f, ok := flags[option]; ok && f.flag != 0 {
-			// There is only one propagation mode
-			key := f.flag
-			if propagationFlags[option] {
-				key = -1
-			}
-			// Check to see if there is collision for flag
-			if !flagCollisions[key] {
-				// We prepend the option and add to collision map
-				newOptions = append([]string{option}, newOptions...)
-				flagCollisions[key] = true
-			}
-			continue
-		}
-		opt := strings.SplitN(option, "=", 2)
-		if len(opt) != 2 || !validFlags[opt[0]] {
-			return nil, fmt.Errorf("Invalid tmpfs option %q", opt)
-		}
-		if !dataCollisions[opt[0]] {
-			// We prepend the option and add to collision map
-			newOptions = append([]string{option}, newOptions...)
-			dataCollisions[opt[0]] = true
-		}
-	}
-
-	return newOptions, nil
-}
-
-// Parse fstab type mount options into mount() flags
-// and device specific data
-func parseOptions(options string) (int, string) {
-	var (
-		flag int
-		data []string
-	)
-
-	for _, o := range strings.Split(options, ",") {
-		// If the option does not exist in the flags table or the flag
-		// is not supported on the platform,
-		// then it is a data value for a specific fs type
-		if f, exists := flags[o]; exists && f.flag != 0 {
-			if f.clear {
-				flag &= ^f.flag
-			} else {
-				flag |= f.flag
-			}
-		} else {
-			data = append(data, o)
-		}
-	}
-	return flag, strings.Join(data, ",")
-}
-
-// ParseTmpfsOptions parse fstab type mount options into flags and data
-func ParseTmpfsOptions(options string) (int, string, error) {
-	flags, data := parseOptions(options)
-	for _, o := range strings.Split(data, ",") {
-		opt := strings.SplitN(o, "=", 2)
-		if !validFlags[opt[0]] {
-			return 0, "", fmt.Errorf("Invalid tmpfs option %q", opt)
-		}
-	}
-	return flags, data, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go
deleted file mode 100644
index f166cb2f77..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/flags_freebsd.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build freebsd,cgo
-
-package mount
-
-/*
-#include <sys/mount.h>
-*/
-import "C"
-
-const (
-	// RDONLY will mount the filesystem as read-only.
-	RDONLY = C.MNT_RDONLY
-
-	// NOSUID will not allow set-user-identifier or set-group-identifier bits to
-	// take effect.
-	NOSUID = C.MNT_NOSUID
-
-	// NOEXEC will not allow execution of any binaries on the mounted file system.
-	NOEXEC = C.MNT_NOEXEC
-
-	// SYNCHRONOUS will allow any I/O to the file system to be done synchronously.
-	SYNCHRONOUS = C.MNT_SYNCHRONOUS
-
-	// NOATIME will not update the file access time when reading from a file.
-	NOATIME = C.MNT_NOATIME
-)
-
-// These flags are unsupported.
-const (
-	BIND        = 0
-	DIRSYNC     = 0
-	MANDLOCK    = 0
-	NODEV       = 0
-	NODIRATIME  = 0
-	UNBINDABLE  = 0
-	RUNBINDABLE = 0
-	PRIVATE     = 0
-	RPRIVATE    = 0
-	SHARED      = 0
-	RSHARED     = 0
-	SLAVE       = 0
-	RSLAVE      = 0
-	RBIND       = 0
-	RELATIVE    = 0
-	RELATIME    = 0
-	REMOUNT     = 0
-	STRICTATIME = 0
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/flags_linux.go b/installer/vendor/github.com/docker/docker/pkg/mount/flags_linux.go
deleted file mode 100644
index dc696dce90..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/flags_linux.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package mount
-
-import (
-	"syscall"
-)
-
-const (
-	// RDONLY will mount the file system read-only.
-	RDONLY = syscall.MS_RDONLY
-
-	// NOSUID will not allow set-user-identifier or set-group-identifier bits to
-	// take effect.
-	NOSUID = syscall.MS_NOSUID
-
-	// NODEV will not interpret character or block special devices on the file
-	// system.
-	NODEV = syscall.MS_NODEV
-
-	// NOEXEC will not allow execution of any binaries on the mounted file system.
-	NOEXEC = syscall.MS_NOEXEC
-
-	// SYNCHRONOUS will allow I/O to the file system to be done synchronously.
-	SYNCHRONOUS = syscall.MS_SYNCHRONOUS
-
-	// DIRSYNC will force all directory updates within the file system to be done
-	// synchronously. This affects the following system calls: create, link,
-	// unlink, symlink, mkdir, rmdir, mknod and rename.
-	DIRSYNC = syscall.MS_DIRSYNC
-
-	// REMOUNT will attempt to remount an already-mounted file system. This is
-	// commonly used to change the mount flags for a file system, especially to
-	// make a readonly file system writeable. It does not change device or mount
-	// point.
-	REMOUNT = syscall.MS_REMOUNT
-
-	// MANDLOCK will force mandatory locks on a filesystem.
-	MANDLOCK = syscall.MS_MANDLOCK
-
-	// NOATIME will not update the file access time when reading from a file.
-	NOATIME = syscall.MS_NOATIME
-
-	// NODIRATIME will not update the directory access time.
-	NODIRATIME = syscall.MS_NODIRATIME
-
-	// BIND remounts a subtree somewhere else.
-	BIND = syscall.MS_BIND
-
-	// RBIND remounts a subtree and all possible submounts somewhere else.
-	RBIND = syscall.MS_BIND | syscall.MS_REC
-
-	// UNBINDABLE creates a mount which cannot be cloned through a bind operation.
-	UNBINDABLE = syscall.MS_UNBINDABLE
-
-	// RUNBINDABLE marks the entire mount tree as UNBINDABLE.
-	RUNBINDABLE = syscall.MS_UNBINDABLE | syscall.MS_REC
-
-	// PRIVATE creates a mount which carries no propagation abilities.
-	PRIVATE = syscall.MS_PRIVATE
-
-	// RPRIVATE marks the entire mount tree as PRIVATE.
-	RPRIVATE = syscall.MS_PRIVATE | syscall.MS_REC
-
-	// SLAVE creates a mount which receives propagation from its master, but not
-	// vice versa.
-	SLAVE = syscall.MS_SLAVE
-
-	// RSLAVE marks the entire mount tree as SLAVE.
-	RSLAVE = syscall.MS_SLAVE | syscall.MS_REC
-
-	// SHARED creates a mount which provides the ability to create mirrors of
-	// that mount such that mounts and unmounts within any of the mirrors
-	// propagate to the other mirrors.
-	SHARED = syscall.MS_SHARED
-
-	// RSHARED marks the entire mount tree as SHARED.
-	RSHARED = syscall.MS_SHARED | syscall.MS_REC
-
-	// RELATIME updates inode access times relative to modify or change time.
-	RELATIME = syscall.MS_RELATIME
-
-	// STRICTATIME allows to explicitly request full atime updates.  This makes
-	// it possible for the kernel to default to relatime or noatime but still
-	// allow userspace to override it.
-	STRICTATIME = syscall.MS_STRICTATIME
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go
deleted file mode 100644
index 5564f7b3cd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/flags_unsupported.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build !linux,!freebsd freebsd,!cgo solaris,!cgo
-
-package mount
-
-// These flags are unsupported.
-const (
-	BIND        = 0
-	DIRSYNC     = 0
-	MANDLOCK    = 0
-	NOATIME     = 0
-	NODEV       = 0
-	NODIRATIME  = 0
-	NOEXEC      = 0
-	NOSUID      = 0
-	UNBINDABLE  = 0
-	RUNBINDABLE = 0
-	PRIVATE     = 0
-	RPRIVATE    = 0
-	SHARED      = 0
-	RSHARED     = 0
-	SLAVE       = 0
-	RSLAVE      = 0
-	RBIND       = 0
-	RELATIME    = 0
-	RELATIVE    = 0
-	REMOUNT     = 0
-	STRICTATIME = 0
-	SYNCHRONOUS = 0
-	RDONLY      = 0
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mount.go b/installer/vendor/github.com/docker/docker/pkg/mount/mount.go
deleted file mode 100644
index 66ac4bf472..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mount.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package mount
-
-import (
-	"time"
-)
-
-// GetMounts retrieves a list of mounts for the current running process.
-func GetMounts() ([]*Info, error) {
-	return parseMountTable()
-}
-
-// Mounted determines if a specified mountpoint has been mounted.
-// On Linux it looks at /proc/self/mountinfo and on Solaris at mnttab.
-func Mounted(mountpoint string) (bool, error) {
-	entries, err := parseMountTable()
-	if err != nil {
-		return false, err
-	}
-
-	// Search the table for the mountpoint
-	for _, e := range entries {
-		if e.Mountpoint == mountpoint {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
-// Mount will mount filesystem according to the specified configuration, on the
-// condition that the target path is *not* already mounted. Options must be
-// specified like the mount or fstab unix commands: "opt1=val1,opt2=val2". See
-// flags.go for supported option flags.
-func Mount(device, target, mType, options string) error {
-	flag, _ := parseOptions(options)
-	if flag&REMOUNT != REMOUNT {
-		if mounted, err := Mounted(target); err != nil || mounted {
-			return err
-		}
-	}
-	return ForceMount(device, target, mType, options)
-}
-
-// ForceMount will mount a filesystem according to the specified configuration,
-// *regardless* if the target path is not already mounted. Options must be
-// specified like the mount or fstab unix commands: "opt1=val1,opt2=val2". See
-// flags.go for supported option flags.
-func ForceMount(device, target, mType, options string) error {
-	flag, data := parseOptions(options)
-	if err := mount(device, target, mType, uintptr(flag), data); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Unmount will unmount the target filesystem, so long as it is mounted.
-func Unmount(target string) error {
-	if mounted, err := Mounted(target); err != nil || !mounted {
-		return err
-	}
-	return ForceUnmount(target)
-}
-
-// ForceUnmount will force an unmount of the target filesystem, regardless if
-// it is mounted or not.
-func ForceUnmount(target string) (err error) {
-	// Simple retry logic for unmount
-	for i := 0; i < 10; i++ {
-		if err = unmount(target, 0); err == nil {
-			return nil
-		}
-		time.Sleep(100 * time.Millisecond)
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mount_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/mount/mount_unix_test.go
deleted file mode 100644
index 253aff3b8e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mount_unix_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// +build !windows,!solaris
-
-package mount
-
-import (
-	"os"
-	"path"
-	"testing"
-)
-
-func TestMountOptionsParsing(t *testing.T) {
-	options := "noatime,ro,size=10k"
-
-	flag, data := parseOptions(options)
-
-	if data != "size=10k" {
-		t.Fatalf("Expected size=10 got %s", data)
-	}
-
-	expectedFlag := NOATIME | RDONLY
-
-	if flag != expectedFlag {
-		t.Fatalf("Expected %d got %d", expectedFlag, flag)
-	}
-}
-
-func TestMounted(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir  = path.Join(tmp, "source")
-		targetDir  = path.Join(tmp, "target")
-		sourcePath = path.Join(sourceDir, "file.txt")
-		targetPath = path.Join(targetDir, "file.txt")
-	)
-
-	os.Mkdir(sourceDir, 0777)
-	os.Mkdir(targetDir, 0777)
-
-	f, err := os.Create(sourcePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.WriteString("hello")
-	f.Close()
-
-	f, err = os.Create(targetPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	mounted, err := Mounted(targetDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !mounted {
-		t.Fatalf("Expected %s to be mounted", targetDir)
-	}
-	if _, err := os.Stat(targetDir); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestMountReadonly(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir  = path.Join(tmp, "source")
-		targetDir  = path.Join(tmp, "target")
-		sourcePath = path.Join(sourceDir, "file.txt")
-		targetPath = path.Join(targetDir, "file.txt")
-	)
-
-	os.Mkdir(sourceDir, 0777)
-	os.Mkdir(targetDir, 0777)
-
-	f, err := os.Create(sourcePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.WriteString("hello")
-	f.Close()
-
-	f, err = os.Create(targetPath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	if err := Mount(sourceDir, targetDir, "none", "bind,ro"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	f, err = os.OpenFile(targetPath, os.O_RDWR, 0777)
-	if err == nil {
-		t.Fatal("Should not be able to open a ro file as rw")
-	}
-}
-
-func TestGetMounts(t *testing.T) {
-	mounts, err := GetMounts()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	root := false
-	for _, entry := range mounts {
-		if entry.Mountpoint == "/" {
-			root = true
-		}
-	}
-
-	if !root {
-		t.Fatal("/ should be mounted at least")
-	}
-}
-
-func TestMergeTmpfsOptions(t *testing.T) {
-	options := []string{"noatime", "ro", "size=10k", "defaults", "atime", "defaults", "rw", "rprivate", "size=1024k", "slave"}
-	expected := []string{"atime", "rw", "size=1024k", "slave"}
-	merged, err := MergeTmpfsOptions(options)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(expected) != len(merged) {
-		t.Fatalf("Expected %s got %s", expected, merged)
-	}
-	for index := range merged {
-		if merged[index] != expected[index] {
-			t.Fatalf("Expected %s for the %dth option, got %s", expected, index, merged)
-		}
-	}
-
-	options = []string{"noatime", "ro", "size=10k", "atime", "rw", "rprivate", "size=1024k", "slave", "size"}
-	_, err = MergeTmpfsOptions(options)
-	if err == nil {
-		t.Fatal("Expected error got nil")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go
deleted file mode 100644
index bb870e6f59..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_freebsd.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package mount
-
-/*
-#include <errno.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/_iovec.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-*/
-import "C"
-
-import (
-	"fmt"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-func allocateIOVecs(options []string) []C.struct_iovec {
-	out := make([]C.struct_iovec, len(options))
-	for i, option := range options {
-		out[i].iov_base = unsafe.Pointer(C.CString(option))
-		out[i].iov_len = C.size_t(len(option) + 1)
-	}
-	return out
-}
-
-func mount(device, target, mType string, flag uintptr, data string) error {
-	isNullFS := false
-
-	xs := strings.Split(data, ",")
-	for _, x := range xs {
-		if x == "bind" {
-			isNullFS = true
-		}
-	}
-
-	options := []string{"fspath", target}
-	if isNullFS {
-		options = append(options, "fstype", "nullfs", "target", device)
-	} else {
-		options = append(options, "fstype", mType, "from", device)
-	}
-	rawOptions := allocateIOVecs(options)
-	for _, rawOption := range rawOptions {
-		defer C.free(rawOption.iov_base)
-	}
-
-	if errno := C.nmount(&rawOptions[0], C.uint(len(options)), C.int(flag)); errno != 0 {
-		reason := C.GoString(C.strerror(*C.__error()))
-		return fmt.Errorf("Failed to call nmount: %s", reason)
-	}
-	return nil
-}
-
-func unmount(target string, flag int) error {
-	return syscall.Unmount(target, flag)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go b/installer/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go
deleted file mode 100644
index dd4280c777..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_linux.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package mount
-
-import (
-	"syscall"
-)
-
-func mount(device, target, mType string, flag uintptr, data string) error {
-	if err := syscall.Mount(device, target, mType, flag, data); err != nil {
-		return err
-	}
-
-	// If we have a bind mount or remount, remount...
-	if flag&syscall.MS_BIND == syscall.MS_BIND && flag&syscall.MS_RDONLY == syscall.MS_RDONLY {
-		return syscall.Mount(device, target, mType, flag|syscall.MS_REMOUNT, data)
-	}
-	return nil
-}
-
-func unmount(target string, flag int) error {
-	return syscall.Unmount(target, flag)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_solaris.go b/installer/vendor/github.com/docker/docker/pkg/mount/mounter_solaris.go
deleted file mode 100644
index c684aa81fc..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_solaris.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build solaris,cgo
-
-package mount
-
-import (
-	"golang.org/x/sys/unix"
-	"unsafe"
-)
-
-// #include <stdlib.h>
-// #include <stdio.h>
-// #include <sys/mount.h>
-// int Mount(const char *spec, const char *dir, int mflag,
-// char *fstype, char *dataptr, int datalen, char *optptr, int optlen) {
-//     return mount(spec, dir, mflag, fstype, dataptr, datalen, optptr, optlen);
-// }
-import "C"
-
-func mount(device, target, mType string, flag uintptr, data string) error {
-	spec := C.CString(device)
-	dir := C.CString(target)
-	fstype := C.CString(mType)
-	_, err := C.Mount(spec, dir, C.int(flag), fstype, nil, 0, nil, 0)
-	C.free(unsafe.Pointer(spec))
-	C.free(unsafe.Pointer(dir))
-	C.free(unsafe.Pointer(fstype))
-	return err
-}
-
-func unmount(target string, flag int) error {
-	err := unix.Unmount(target, flag)
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go
deleted file mode 100644
index a2a3bb457f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mounter_unsupported.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build !linux,!freebsd,!solaris freebsd,!cgo solaris,!cgo
-
-package mount
-
-func mount(device, target, mType string, flag uintptr, data string) error {
-	panic("Not implemented")
-}
-
-func unmount(target string, flag int) error {
-	panic("Not implemented")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo.go
deleted file mode 100644
index e3fc3535e9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package mount
-
-// Info reveals information about a particular mounted filesystem. This
-// struct is populated from the content in the /proc/<pid>/mountinfo file.
-type Info struct {
-	// ID is a unique identifier of the mount (may be reused after umount).
-	ID int
-
-	// Parent indicates the ID of the mount parent (or of self for the top of the
-	// mount tree).
-	Parent int
-
-	// Major indicates one half of the device ID which identifies the device class.
-	Major int
-
-	// Minor indicates one half of the device ID which identifies a specific
-	// instance of device.
-	Minor int
-
-	// Root of the mount within the filesystem.
-	Root string
-
-	// Mountpoint indicates the mount point relative to the process's root.
-	Mountpoint string
-
-	// Opts represents mount-specific options.
-	Opts string
-
-	// Optional represents optional fields.
-	Optional string
-
-	// Fstype indicates the type of filesystem, such as EXT3.
-	Fstype string
-
-	// Source indicates filesystem specific information or "none".
-	Source string
-
-	// VfsOpts represents per super block options.
-	VfsOpts string
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
deleted file mode 100644
index 4f32edcd90..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_freebsd.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package mount
-
-/*
-#include <sys/param.h>
-#include <sys/ucred.h>
-#include <sys/mount.h>
-*/
-import "C"
-
-import (
-	"fmt"
-	"reflect"
-	"unsafe"
-)
-
-// Parse /proc/self/mountinfo because comparing Dev and ino does not work from
-// bind mounts.
-func parseMountTable() ([]*Info, error) {
-	var rawEntries *C.struct_statfs
-
-	count := int(C.getmntinfo(&rawEntries, C.MNT_WAIT))
-	if count == 0 {
-		return nil, fmt.Errorf("Failed to call getmntinfo")
-	}
-
-	var entries []C.struct_statfs
-	header := (*reflect.SliceHeader)(unsafe.Pointer(&entries))
-	header.Cap = count
-	header.Len = count
-	header.Data = uintptr(unsafe.Pointer(rawEntries))
-
-	var out []*Info
-	for _, entry := range entries {
-		var mountinfo Info
-		mountinfo.Mountpoint = C.GoString(&entry.f_mntonname[0])
-		mountinfo.Source = C.GoString(&entry.f_mntfromname[0])
-		mountinfo.Fstype = C.GoString(&entry.f_fstypename[0])
-		out = append(out, &mountinfo)
-	}
-	return out, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
deleted file mode 100644
index be69fee1d7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// +build linux
-
-package mount
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-)
-
-const (
-	/* 36 35 98:0 /mnt1 /mnt2 rw,noatime master:1 - ext3 /dev/root rw,errors=continue
-	   (1)(2)(3)   (4)   (5)      (6)      (7)   (8) (9)   (10)         (11)
-
-	   (1) mount ID:  unique identifier of the mount (may be reused after umount)
-	   (2) parent ID:  ID of parent (or of self for the top of the mount tree)
-	   (3) major:minor:  value of st_dev for files on filesystem
-	   (4) root:  root of the mount within the filesystem
-	   (5) mount point:  mount point relative to the process's root
-	   (6) mount options:  per mount options
-	   (7) optional fields:  zero or more fields of the form "tag[:value]"
-	   (8) separator:  marks the end of the optional fields
-	   (9) filesystem type:  name of filesystem of the form "type[.subtype]"
-	   (10) mount source:  filesystem specific information or "none"
-	   (11) super options:  per super block options*/
-	mountinfoFormat = "%d %d %d:%d %s %s %s %s"
-)
-
-// Parse /proc/self/mountinfo because comparing Dev and ino does not work from
-// bind mounts
-func parseMountTable() ([]*Info, error) {
-	f, err := os.Open("/proc/self/mountinfo")
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	return parseInfoFile(f)
-}
-
-func parseInfoFile(r io.Reader) ([]*Info, error) {
-	var (
-		s   = bufio.NewScanner(r)
-		out = []*Info{}
-	)
-
-	for s.Scan() {
-		if err := s.Err(); err != nil {
-			return nil, err
-		}
-
-		var (
-			p              = &Info{}
-			text           = s.Text()
-			optionalFields string
-		)
-
-		if _, err := fmt.Sscanf(text, mountinfoFormat,
-			&p.ID, &p.Parent, &p.Major, &p.Minor,
-			&p.Root, &p.Mountpoint, &p.Opts, &optionalFields); err != nil {
-			return nil, fmt.Errorf("Scanning '%s' failed: %s", text, err)
-		}
-		// Safe as mountinfo encodes mountpoints with spaces as \040.
-		index := strings.Index(text, " - ")
-		postSeparatorFields := strings.Fields(text[index+3:])
-		if len(postSeparatorFields) < 3 {
-			return nil, fmt.Errorf("Error found less than 3 fields post '-' in %q", text)
-		}
-
-		if optionalFields != "-" {
-			p.Optional = optionalFields
-		}
-
-		p.Fstype = postSeparatorFields[0]
-		p.Source = postSeparatorFields[1]
-		p.VfsOpts = strings.Join(postSeparatorFields[2:], " ")
-		out = append(out, p)
-	}
-	return out, nil
-}
-
-// PidMountInfo collects the mounts for a specific process ID. If the process
-// ID is unknown, it is better to use `GetMounts` which will inspect
-// "/proc/self/mountinfo" instead.
-func PidMountInfo(pid int) ([]*Info, error) {
-	f, err := os.Open(fmt.Sprintf("/proc/%d/mountinfo", pid))
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	return parseInfoFile(f)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go
deleted file mode 100644
index bd100e1d49..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_linux_test.go
+++ /dev/null
@@ -1,476 +0,0 @@
-// +build linux
-
-package mount
-
-import (
-	"bytes"
-	"testing"
-)
-
-const (
-	fedoraMountinfo = `15 35 0:3 / /proc rw,nosuid,nodev,noexec,relatime shared:5 - proc proc rw
-    16 35 0:14 / /sys rw,nosuid,nodev,noexec,relatime shared:6 - sysfs sysfs rw,seclabel
-    17 35 0:5 / /dev rw,nosuid shared:2 - devtmpfs devtmpfs rw,seclabel,size=8056484k,nr_inodes=2014121,mode=755
-    18 16 0:15 / /sys/kernel/security rw,nosuid,nodev,noexec,relatime shared:7 - securityfs securityfs rw
-    19 16 0:13 / /sys/fs/selinux rw,relatime shared:8 - selinuxfs selinuxfs rw
-    20 17 0:16 / /dev/shm rw,nosuid,nodev shared:3 - tmpfs tmpfs rw,seclabel
-    21 17 0:10 / /dev/pts rw,nosuid,noexec,relatime shared:4 - devpts devpts rw,seclabel,gid=5,mode=620,ptmxmode=000
-    22 35 0:17 / /run rw,nosuid,nodev shared:21 - tmpfs tmpfs rw,seclabel,mode=755
-    23 16 0:18 / /sys/fs/cgroup rw,nosuid,nodev,noexec shared:9 - tmpfs tmpfs rw,seclabel,mode=755
-    24 23 0:19 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime shared:10 - cgroup cgroup rw,xattr,release_agent=/usr/lib/systemd/systemd-cgroups-agent,name=systemd
-    25 16 0:20 / /sys/fs/pstore rw,nosuid,nodev,noexec,relatime shared:20 - pstore pstore rw
-    26 23 0:21 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime shared:11 - cgroup cgroup rw,cpuset,clone_children
-    27 23 0:22 / /sys/fs/cgroup/cpu,cpuacct rw,nosuid,nodev,noexec,relatime shared:12 - cgroup cgroup rw,cpuacct,cpu,clone_children
-    28 23 0:23 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime shared:13 - cgroup cgroup rw,memory,clone_children
-    29 23 0:24 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime shared:14 - cgroup cgroup rw,devices,clone_children
-    30 23 0:25 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime shared:15 - cgroup cgroup rw,freezer,clone_children
-    31 23 0:26 / /sys/fs/cgroup/net_cls rw,nosuid,nodev,noexec,relatime shared:16 - cgroup cgroup rw,net_cls,clone_children
-    32 23 0:27 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime shared:17 - cgroup cgroup rw,blkio,clone_children
-    33 23 0:28 / /sys/fs/cgroup/perf_event rw,nosuid,nodev,noexec,relatime shared:18 - cgroup cgroup rw,perf_event,clone_children
-    34 23 0:29 / /sys/fs/cgroup/hugetlb rw,nosuid,nodev,noexec,relatime shared:19 - cgroup cgroup rw,hugetlb,clone_children
-    35 1 253:2 / / rw,relatime shared:1 - ext4 /dev/mapper/ssd-root--f20 rw,seclabel,data=ordered
-    36 15 0:30 / /proc/sys/fs/binfmt_misc rw,relatime shared:22 - autofs systemd-1 rw,fd=38,pgrp=1,timeout=300,minproto=5,maxproto=5,direct
-    37 17 0:12 / /dev/mqueue rw,relatime shared:23 - mqueue mqueue rw,seclabel
-    38 35 0:31 / /tmp rw shared:24 - tmpfs tmpfs rw,seclabel
-    39 17 0:32 / /dev/hugepages rw,relatime shared:25 - hugetlbfs hugetlbfs rw,seclabel
-    40 16 0:7 / /sys/kernel/debug rw,relatime shared:26 - debugfs debugfs rw
-    41 16 0:33 / /sys/kernel/config rw,relatime shared:27 - configfs configfs rw
-    42 35 0:34 / /var/lib/nfs/rpc_pipefs rw,relatime shared:28 - rpc_pipefs sunrpc rw
-    43 15 0:35 / /proc/fs/nfsd rw,relatime shared:29 - nfsd sunrpc rw
-    45 35 8:17 / /boot rw,relatime shared:30 - ext4 /dev/sdb1 rw,seclabel,data=ordered
-    46 35 253:4 / /home rw,relatime shared:31 - ext4 /dev/mapper/ssd-home rw,seclabel,data=ordered
-    47 35 253:5 / /var/lib/libvirt/images rw,noatime,nodiratime shared:32 - ext4 /dev/mapper/ssd-virt rw,seclabel,discard,data=ordered
-    48 35 253:12 / /mnt/old rw,relatime shared:33 - ext4 /dev/mapper/HelpDeskRHEL6-FedoraRoot rw,seclabel,data=ordered
-    121 22 0:36 / /run/user/1000/gvfs rw,nosuid,nodev,relatime shared:104 - fuse.gvfsd-fuse gvfsd-fuse rw,user_id=1000,group_id=1000
-    124 16 0:37 / /sys/fs/fuse/connections rw,relatime shared:107 - fusectl fusectl rw
-    165 38 253:3 / /tmp/mnt rw,relatime shared:147 - ext4 /dev/mapper/ssd-root rw,seclabel,data=ordered
-    167 35 253:15 / /var/lib/docker/devicemapper/mnt/aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,relatime shared:149 - ext4 /dev/mapper/docker-253:2-425882-aae4076022f0e2b80a2afbf8fc6df450c52080191fcef7fb679a73e6f073e5c2 rw,seclabel,discard,stripe=16,data=ordered
-    171 35 253:16 / /var/lib/docker/devicemapper/mnt/c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,relatime shared:153 - ext4 /dev/mapper/docker-253:2-425882-c71be651f114db95180e472f7871b74fa597ee70a58ccc35cb87139ddea15373 rw,seclabel,discard,stripe=16,data=ordered
-    175 35 253:17 / /var/lib/docker/devicemapper/mnt/1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,relatime shared:157 - ext4 /dev/mapper/docker-253:2-425882-1bac6ab72862d2d5626560df6197cf12036b82e258c53d981fa29adce6f06c3c rw,seclabel,discard,stripe=16,data=ordered
-    179 35 253:18 / /var/lib/docker/devicemapper/mnt/d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,relatime shared:161 - ext4 /dev/mapper/docker-253:2-425882-d710a357d77158e80d5b2c55710ae07c94e76d34d21ee7bae65ce5418f739b09 rw,seclabel,discard,stripe=16,data=ordered
-    183 35 253:19 / /var/lib/docker/devicemapper/mnt/6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,relatime shared:165 - ext4 /dev/mapper/docker-253:2-425882-6479f52366114d5f518db6837254baab48fab39f2ac38d5099250e9a6ceae6c7 rw,seclabel,discard,stripe=16,data=ordered
-    187 35 253:20 / /var/lib/docker/devicemapper/mnt/8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,relatime shared:169 - ext4 /dev/mapper/docker-253:2-425882-8d9df91c4cca5aef49eeb2725292aab324646f723a7feab56be34c2ad08268e1 rw,seclabel,discard,stripe=16,data=ordered
-    191 35 253:21 / /var/lib/docker/devicemapper/mnt/c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,relatime shared:173 - ext4 /dev/mapper/docker-253:2-425882-c8240b768603d32e920d365dc9d1dc2a6af46cd23e7ae819947f969e1b4ec661 rw,seclabel,discard,stripe=16,data=ordered
-    195 35 253:22 / /var/lib/docker/devicemapper/mnt/2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,relatime shared:177 - ext4 /dev/mapper/docker-253:2-425882-2eb3a01278380bbf3ed12d86ac629eaa70a4351301ee307a5cabe7b5f3b1615f rw,seclabel,discard,stripe=16,data=ordered
-    199 35 253:23 / /var/lib/docker/devicemapper/mnt/37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,relatime shared:181 - ext4 /dev/mapper/docker-253:2-425882-37a17fb7c9d9b80821235d5f2662879bd3483915f245f9b49cdaa0e38779b70b rw,seclabel,discard,stripe=16,data=ordered
-    203 35 253:24 / /var/lib/docker/devicemapper/mnt/aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,relatime shared:185 - ext4 /dev/mapper/docker-253:2-425882-aea459ae930bf1de913e2f29428fd80ee678a1e962d4080019d9f9774331ee2b rw,seclabel,discard,stripe=16,data=ordered
-    207 35 253:25 / /var/lib/docker/devicemapper/mnt/928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,relatime shared:189 - ext4 /dev/mapper/docker-253:2-425882-928ead0bc06c454bd9f269e8585aeae0a6bd697f46dc8754c2a91309bc810882 rw,seclabel,discard,stripe=16,data=ordered
-    211 35 253:26 / /var/lib/docker/devicemapper/mnt/0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,relatime shared:193 - ext4 /dev/mapper/docker-253:2-425882-0f284d18481d671644706e7a7244cbcf63d590d634cc882cb8721821929d0420 rw,seclabel,discard,stripe=16,data=ordered
-    215 35 253:27 / /var/lib/docker/devicemapper/mnt/d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,relatime shared:197 - ext4 /dev/mapper/docker-253:2-425882-d9dd16722ab34c38db2733e23f69e8f4803ce59658250dd63e98adff95d04919 rw,seclabel,discard,stripe=16,data=ordered
-    219 35 253:28 / /var/lib/docker/devicemapper/mnt/bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,relatime shared:201 - ext4 /dev/mapper/docker-253:2-425882-bc4500479f18c2c08c21ad5282e5f826a016a386177d9874c2764751c031d634 rw,seclabel,discard,stripe=16,data=ordered
-    223 35 253:29 / /var/lib/docker/devicemapper/mnt/7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,relatime shared:205 - ext4 /dev/mapper/docker-253:2-425882-7770c8b24eb3d5cc159a065910076938910d307ab2f5d94e1dc3b24c06ee2c8a rw,seclabel,discard,stripe=16,data=ordered
-    227 35 253:30 / /var/lib/docker/devicemapper/mnt/c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,relatime shared:209 - ext4 /dev/mapper/docker-253:2-425882-c280cd3d0bf0aa36b478b292279671624cceafc1a67eaa920fa1082601297adf rw,seclabel,discard,stripe=16,data=ordered
-    231 35 253:31 / /var/lib/docker/devicemapper/mnt/8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,relatime shared:213 - ext4 /dev/mapper/docker-253:2-425882-8b59a7d9340279f09fea67fd6ad89ddef711e9e7050eb647984f8b5ef006335f rw,seclabel,discard,stripe=16,data=ordered
-    235 35 253:32 / /var/lib/docker/devicemapper/mnt/1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,relatime shared:217 - ext4 /dev/mapper/docker-253:2-425882-1a28059f29eda821578b1bb27a60cc71f76f846a551abefabce6efd0146dce9f rw,seclabel,discard,stripe=16,data=ordered
-    239 35 253:33 / /var/lib/docker/devicemapper/mnt/e9aa60c60128cad1 rw,relatime shared:221 - ext4 /dev/mapper/docker-253:2-425882-e9aa60c60128cad1 rw,seclabel,discard,stripe=16,data=ordered
-    243 35 253:34 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,relatime shared:225 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d-init rw,seclabel,discard,stripe=16,data=ordered
-    247 35 253:35 / /var/lib/docker/devicemapper/mnt/5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,relatime shared:229 - ext4 /dev/mapper/docker-253:2-425882-5fec11304b6f4713fea7b6ccdcc1adc0a1966187f590fe25a8227428a8df275d rw,seclabel,discard,stripe=16,data=ordered
-    31 21 0:23 / /DATA/foo_bla_bla rw,relatime - cifs //foo/BLA\040BLA\040BLA/ rw,sec=ntlm,cache=loose,unc=\\foo\BLA BLA BLA,username=my_login,domain=mydomain.com,uid=12345678,forceuid,gid=12345678,forcegid,addr=10.1.30.10,file_mode=0755,dir_mode=0755,nounix,rsize=61440,wsize=65536,actimeo=1`
-
-	ubuntuMountInfo = `15 20 0:14 / /sys rw,nosuid,nodev,noexec,relatime - sysfs sysfs rw
-16 20 0:3 / /proc rw,nosuid,nodev,noexec,relatime - proc proc rw
-17 20 0:5 / /dev rw,relatime - devtmpfs udev rw,size=1015140k,nr_inodes=253785,mode=755
-18 17 0:11 / /dev/pts rw,nosuid,noexec,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=000
-19 20 0:15 / /run rw,nosuid,noexec,relatime - tmpfs tmpfs rw,size=205044k,mode=755
-20 1 253:0 / / rw,relatime - ext4 /dev/disk/by-label/DOROOT rw,errors=remount-ro,data=ordered
-21 15 0:16 / /sys/fs/cgroup rw,relatime - tmpfs none rw,size=4k,mode=755
-22 15 0:17 / /sys/fs/fuse/connections rw,relatime - fusectl none rw
-23 15 0:6 / /sys/kernel/debug rw,relatime - debugfs none rw
-24 15 0:10 / /sys/kernel/security rw,relatime - securityfs none rw
-25 19 0:18 / /run/lock rw,nosuid,nodev,noexec,relatime - tmpfs none rw,size=5120k
-26 21 0:19 / /sys/fs/cgroup/cpuset rw,relatime - cgroup cgroup rw,cpuset,clone_children
-27 19 0:20 / /run/shm rw,nosuid,nodev,relatime - tmpfs none rw
-28 21 0:21 / /sys/fs/cgroup/cpu rw,relatime - cgroup cgroup rw,cpu
-29 19 0:22 / /run/user rw,nosuid,nodev,noexec,relatime - tmpfs none rw,size=102400k,mode=755
-30 15 0:23 / /sys/fs/pstore rw,relatime - pstore none rw
-31 21 0:24 / /sys/fs/cgroup/cpuacct rw,relatime - cgroup cgroup rw,cpuacct
-32 21 0:25 / /sys/fs/cgroup/memory rw,relatime - cgroup cgroup rw,memory
-33 21 0:26 / /sys/fs/cgroup/devices rw,relatime - cgroup cgroup rw,devices
-34 21 0:27 / /sys/fs/cgroup/freezer rw,relatime - cgroup cgroup rw,freezer
-35 21 0:28 / /sys/fs/cgroup/blkio rw,relatime - cgroup cgroup rw,blkio
-36 21 0:29 / /sys/fs/cgroup/perf_event rw,relatime - cgroup cgroup rw,perf_event
-37 21 0:30 / /sys/fs/cgroup/hugetlb rw,relatime - cgroup cgroup rw,hugetlb
-38 21 0:31 / /sys/fs/cgroup/systemd rw,nosuid,nodev,noexec,relatime - cgroup systemd rw,name=systemd
-39 20 0:32 / /var/lib/docker/aufs/mnt/b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc rw,relatime - aufs none rw,si=caafa54fdc06525
-40 20 0:33 / /var/lib/docker/aufs/mnt/2eed44ac7ce7c75af04f088ed6cb4ce9d164801e91d78c6db65d7ef6d572bba8-init rw,relatime - aufs none rw,si=caafa54f882b525
-41 20 0:34 / /var/lib/docker/aufs/mnt/2eed44ac7ce7c75af04f088ed6cb4ce9d164801e91d78c6db65d7ef6d572bba8 rw,relatime - aufs none rw,si=caafa54f8829525
-42 20 0:35 / /var/lib/docker/aufs/mnt/16f4d7e96dd612903f425bfe856762f291ff2e36a8ecd55a2209b7d7cd81c30b rw,relatime - aufs none rw,si=caafa54f882d525
-43 20 0:36 / /var/lib/docker/aufs/mnt/63ca08b75d7438a9469a5954e003f48ffede73541f6286ce1cb4d7dd4811da7e-init rw,relatime - aufs none rw,si=caafa54f882f525
-44 20 0:37 / /var/lib/docker/aufs/mnt/63ca08b75d7438a9469a5954e003f48ffede73541f6286ce1cb4d7dd4811da7e rw,relatime - aufs none rw,si=caafa54f88ba525
-45 20 0:38 / /var/lib/docker/aufs/mnt/283f35a910233c756409313be71ecd8fcfef0df57108b8d740b61b3e88860452 rw,relatime - aufs none rw,si=caafa54f88b8525
-46 20 0:39 / /var/lib/docker/aufs/mnt/2c6c7253d4090faa3886871fb21bd660609daeb0206588c0602007f7d0f254b1-init rw,relatime - aufs none rw,si=caafa54f88be525
-47 20 0:40 / /var/lib/docker/aufs/mnt/2c6c7253d4090faa3886871fb21bd660609daeb0206588c0602007f7d0f254b1 rw,relatime - aufs none rw,si=caafa54f882c525
-48 20 0:41 / /var/lib/docker/aufs/mnt/de2b538c97d6366cc80e8658547c923ea1d042f85580df379846f36a4df7049d rw,relatime - aufs none rw,si=caafa54f85bb525
-49 20 0:42 / /var/lib/docker/aufs/mnt/94a3d8ed7c27e5b0aa71eba46c736bfb2742afda038e74f2dd6035fb28415b49-init rw,relatime - aufs none rw,si=caafa54fdc00525
-50 20 0:43 / /var/lib/docker/aufs/mnt/94a3d8ed7c27e5b0aa71eba46c736bfb2742afda038e74f2dd6035fb28415b49 rw,relatime - aufs none rw,si=caafa54fbaec525
-51 20 0:44 / /var/lib/docker/aufs/mnt/6ac1cace985c9fc9bea32234de8b36dba49bdd5e29a2972b327ff939d78a6274 rw,relatime - aufs none rw,si=caafa54f8e1a525
-52 20 0:45 / /var/lib/docker/aufs/mnt/dff147033e3a0ef061e1de1ad34256b523d4a8c1fa6bba71a0ab538e8628ff0b-init rw,relatime - aufs none rw,si=caafa54f8e1d525
-53 20 0:46 / /var/lib/docker/aufs/mnt/dff147033e3a0ef061e1de1ad34256b523d4a8c1fa6bba71a0ab538e8628ff0b rw,relatime - aufs none rw,si=caafa54f8e1b525
-54 20 0:47 / /var/lib/docker/aufs/mnt/cabb117d997f0f93519185aea58389a9762770b7496ed0b74a3e4a083fa45902 rw,relatime - aufs none rw,si=caafa54f810a525
-55 20 0:48 / /var/lib/docker/aufs/mnt/e1c8a94ffaa9d532bbbdc6ef771ce8a6c2c06757806ecaf8b68e9108fec65f33-init rw,relatime - aufs none rw,si=caafa54f8529525
-56 20 0:49 / /var/lib/docker/aufs/mnt/e1c8a94ffaa9d532bbbdc6ef771ce8a6c2c06757806ecaf8b68e9108fec65f33 rw,relatime - aufs none rw,si=caafa54f852f525
-57 20 0:50 / /var/lib/docker/aufs/mnt/16a1526fa445b84ce84f89506d219e87fa488a814063baf045d88b02f21166b3 rw,relatime - aufs none rw,si=caafa54f9e1d525
-58 20 0:51 / /var/lib/docker/aufs/mnt/57b9c92e1e368fa7dbe5079f7462e917777829caae732828b003c355fe49da9f-init rw,relatime - aufs none rw,si=caafa54f854d525
-59 20 0:52 / /var/lib/docker/aufs/mnt/57b9c92e1e368fa7dbe5079f7462e917777829caae732828b003c355fe49da9f rw,relatime - aufs none rw,si=caafa54f854e525
-60 20 0:53 / /var/lib/docker/aufs/mnt/e370c3e286bea027917baa0e4d251262681a472a87056e880dfd0513516dffd9 rw,relatime - aufs none rw,si=caafa54f840a525
-61 20 0:54 / /var/lib/docker/aufs/mnt/6b00d3b4f32b41997ec07412b5e18204f82fbe643e7122251cdeb3582abd424e-init rw,relatime - aufs none rw,si=caafa54f8408525
-62 20 0:55 / /var/lib/docker/aufs/mnt/6b00d3b4f32b41997ec07412b5e18204f82fbe643e7122251cdeb3582abd424e rw,relatime - aufs none rw,si=caafa54f8409525
-63 20 0:56 / /var/lib/docker/aufs/mnt/abd0b5ea5d355a67f911475e271924a5388ee60c27185fcd60d095afc4a09dc7 rw,relatime - aufs none rw,si=caafa54f9eb1525
-64 20 0:57 / /var/lib/docker/aufs/mnt/336222effc3f7b89867bb39ff7792ae5412c35c749f127c29159d046b6feedd2-init rw,relatime - aufs none rw,si=caafa54f85bf525
-65 20 0:58 / /var/lib/docker/aufs/mnt/336222effc3f7b89867bb39ff7792ae5412c35c749f127c29159d046b6feedd2 rw,relatime - aufs none rw,si=caafa54f85b8525
-66 20 0:59 / /var/lib/docker/aufs/mnt/912e1bf28b80a09644503924a8a1a4fb8ed10b808ca847bda27a369919aa52fa rw,relatime - aufs none rw,si=caafa54fbaea525
-67 20 0:60 / /var/lib/docker/aufs/mnt/386f722875013b4a875118367abc783fc6617a3cb7cf08b2b4dcf550b4b9c576-init rw,relatime - aufs none rw,si=caafa54f8472525
-68 20 0:61 / /var/lib/docker/aufs/mnt/386f722875013b4a875118367abc783fc6617a3cb7cf08b2b4dcf550b4b9c576 rw,relatime - aufs none rw,si=caafa54f8474525
-69 20 0:62 / /var/lib/docker/aufs/mnt/5aaebb79ef3097dfca377889aeb61a0c9d5e3795117d2b08d0751473c671dfb2 rw,relatime - aufs none rw,si=caafa54f8c5e525
-70 20 0:63 / /var/lib/docker/aufs/mnt/5ba3e493279d01277d583600b81c7c079e691b73c3a2bdea8e4b12a35a418be2-init rw,relatime - aufs none rw,si=caafa54f8c3b525
-71 20 0:64 / /var/lib/docker/aufs/mnt/5ba3e493279d01277d583600b81c7c079e691b73c3a2bdea8e4b12a35a418be2 rw,relatime - aufs none rw,si=caafa54f8c3d525
-72 20 0:65 / /var/lib/docker/aufs/mnt/2777f0763da4de93f8bebbe1595cc77f739806a158657b033eca06f827b6028a rw,relatime - aufs none rw,si=caafa54f8c3e525
-73 20 0:66 / /var/lib/docker/aufs/mnt/5d7445562acf73c6f0ae34c3dd0921d7457de1ba92a587d9e06a44fa209eeb3e-init rw,relatime - aufs none rw,si=caafa54f8c39525
-74 20 0:67 / /var/lib/docker/aufs/mnt/5d7445562acf73c6f0ae34c3dd0921d7457de1ba92a587d9e06a44fa209eeb3e rw,relatime - aufs none rw,si=caafa54f854f525
-75 20 0:68 / /var/lib/docker/aufs/mnt/06400b526ec18b66639c96efc41a84f4ae0b117cb28dafd56be420651b4084a0 rw,relatime - aufs none rw,si=caafa54f840b525
-76 20 0:69 / /var/lib/docker/aufs/mnt/e051d45ec42d8e3e1cc57bb39871a40de486dc123522e9c067fbf2ca6a357785-init rw,relatime - aufs none rw,si=caafa54fdddf525
-77 20 0:70 / /var/lib/docker/aufs/mnt/e051d45ec42d8e3e1cc57bb39871a40de486dc123522e9c067fbf2ca6a357785 rw,relatime - aufs none rw,si=caafa54f854b525
-78 20 0:71 / /var/lib/docker/aufs/mnt/1ff414fa93fd61ec81b0ab7b365a841ff6545accae03cceac702833aaeaf718f rw,relatime - aufs none rw,si=caafa54f8d85525
-79 20 0:72 / /var/lib/docker/aufs/mnt/c661b2f871dd5360e46a2aebf8f970f6d39a2ff64e06979aa0361227c88128b8-init rw,relatime - aufs none rw,si=caafa54f8da3525
-80 20 0:73 / /var/lib/docker/aufs/mnt/c661b2f871dd5360e46a2aebf8f970f6d39a2ff64e06979aa0361227c88128b8 rw,relatime - aufs none rw,si=caafa54f8da2525
-81 20 0:74 / /var/lib/docker/aufs/mnt/b68b1d4fe4d30016c552398e78b379a39f651661d8e1fa5f2460c24a5e723420 rw,relatime - aufs none rw,si=caafa54f8d81525
-82 20 0:75 / /var/lib/docker/aufs/mnt/c5c5979c936cd0153a4c626fa9d69ce4fce7d924cc74fa68b025d2f585031739-init rw,relatime - aufs none rw,si=caafa54f8da1525
-83 20 0:76 / /var/lib/docker/aufs/mnt/c5c5979c936cd0153a4c626fa9d69ce4fce7d924cc74fa68b025d2f585031739 rw,relatime - aufs none rw,si=caafa54f8da0525
-84 20 0:77 / /var/lib/docker/aufs/mnt/53e10b0329afc0e0d3322d31efaed4064139dc7027fe6ae445cffd7104bcc94f rw,relatime - aufs none rw,si=caafa54f8c35525
-85 20 0:78 / /var/lib/docker/aufs/mnt/3bfafd09ff2603e2165efacc2215c1f51afabba6c42d04a68cc2df0e8cc31494-init rw,relatime - aufs none rw,si=caafa54f8db8525
-86 20 0:79 / /var/lib/docker/aufs/mnt/3bfafd09ff2603e2165efacc2215c1f51afabba6c42d04a68cc2df0e8cc31494 rw,relatime - aufs none rw,si=caafa54f8dba525
-87 20 0:80 / /var/lib/docker/aufs/mnt/90fdd2c03eeaf65311f88f4200e18aef6d2772482712d9aea01cd793c64781b5 rw,relatime - aufs none rw,si=caafa54f8315525
-88 20 0:81 / /var/lib/docker/aufs/mnt/7bdf2591c06c154ceb23f5e74b1d03b18fbf6fe96e35fbf539b82d446922442f-init rw,relatime - aufs none rw,si=caafa54f8fc6525
-89 20 0:82 / /var/lib/docker/aufs/mnt/7bdf2591c06c154ceb23f5e74b1d03b18fbf6fe96e35fbf539b82d446922442f rw,relatime - aufs none rw,si=caafa54f8468525
-90 20 0:83 / /var/lib/docker/aufs/mnt/8cf9a993f50f3305abad3da268c0fc44ff78a1e7bba595ef9de963497496c3f9 rw,relatime - aufs none rw,si=caafa54f8c59525
-91 20 0:84 / /var/lib/docker/aufs/mnt/ecc896fd74b21840a8d35e8316b92a08b1b9c83d722a12acff847e9f0ff17173-init rw,relatime - aufs none rw,si=caafa54f846a525
-92 20 0:85 / /var/lib/docker/aufs/mnt/ecc896fd74b21840a8d35e8316b92a08b1b9c83d722a12acff847e9f0ff17173 rw,relatime - aufs none rw,si=caafa54f846b525
-93 20 0:86 / /var/lib/docker/aufs/mnt/d8c8288ec920439a48b5796bab5883ee47a019240da65e8d8f33400c31bac5df rw,relatime - aufs none rw,si=caafa54f8dbf525
-94 20 0:87 / /var/lib/docker/aufs/mnt/ecba66710bcd03199b9398e46c005cd6b68d0266ec81dc8b722a29cc417997c6-init rw,relatime - aufs none rw,si=caafa54f810f525
-95 20 0:88 / /var/lib/docker/aufs/mnt/ecba66710bcd03199b9398e46c005cd6b68d0266ec81dc8b722a29cc417997c6 rw,relatime - aufs none rw,si=caafa54fbae9525
-96 20 0:89 / /var/lib/docker/aufs/mnt/befc1c67600df449dddbe796c0d06da7caff1d2bbff64cde1f0ba82d224996b5 rw,relatime - aufs none rw,si=caafa54f8dab525
-97 20 0:90 / /var/lib/docker/aufs/mnt/c9f470e73d2742629cdc4084a1b2c1a8302914f2aa0d0ec4542371df9a050562-init rw,relatime - aufs none rw,si=caafa54fdc02525
-98 20 0:91 / /var/lib/docker/aufs/mnt/c9f470e73d2742629cdc4084a1b2c1a8302914f2aa0d0ec4542371df9a050562 rw,relatime - aufs none rw,si=caafa54f9eb0525
-99 20 0:92 / /var/lib/docker/aufs/mnt/2a31f10029f04ff9d4381167a9b739609853d7220d55a56cb654779a700ee246 rw,relatime - aufs none rw,si=caafa54f8c37525
-100 20 0:93 / /var/lib/docker/aufs/mnt/8c4261b8e3e4b21ebba60389bd64b6261217e7e6b9fd09e201d5a7f6760f6927-init rw,relatime - aufs none rw,si=caafa54fd173525
-101 20 0:94 / /var/lib/docker/aufs/mnt/8c4261b8e3e4b21ebba60389bd64b6261217e7e6b9fd09e201d5a7f6760f6927 rw,relatime - aufs none rw,si=caafa54f8108525
-102 20 0:95 / /var/lib/docker/aufs/mnt/eaa0f57403a3dc685268f91df3fbcd7a8423cee50e1a9ee5c3e1688d9d676bb4 rw,relatime - aufs none rw,si=caafa54f852d525
-103 20 0:96 / /var/lib/docker/aufs/mnt/9cfe69a2cbffd9bfc7f396d4754f6fe5cc457ef417b277797be3762dfe955a6b-init rw,relatime - aufs none rw,si=caafa54f8d80525
-104 20 0:97 / /var/lib/docker/aufs/mnt/9cfe69a2cbffd9bfc7f396d4754f6fe5cc457ef417b277797be3762dfe955a6b rw,relatime - aufs none rw,si=caafa54f8fc3525
-105 20 0:98 / /var/lib/docker/aufs/mnt/d1b322ae17613c6adee84e709641a9244ac56675244a89a64dc0075075fcbb83 rw,relatime - aufs none rw,si=caafa54f8c58525
-106 20 0:99 / /var/lib/docker/aufs/mnt/d46c2a8e9da7e91ab34fd9c192851c246a4e770a46720bda09e55c7554b9dbbd-init rw,relatime - aufs none rw,si=caafa54f8c63525
-107 20 0:100 / /var/lib/docker/aufs/mnt/d46c2a8e9da7e91ab34fd9c192851c246a4e770a46720bda09e55c7554b9dbbd rw,relatime - aufs none rw,si=caafa54f8c67525
-108 20 0:101 / /var/lib/docker/aufs/mnt/bc9d2a264158f83a617a069bf17cbbf2a2ba453db7d3951d9dc63cc1558b1c2b rw,relatime - aufs none rw,si=caafa54f8dbe525
-109 20 0:102 / /var/lib/docker/aufs/mnt/9e6abb8d72bbeb4d5cf24b96018528015ba830ce42b4859965bd482cbd034e99-init rw,relatime - aufs none rw,si=caafa54f9e0d525
-110 20 0:103 / /var/lib/docker/aufs/mnt/9e6abb8d72bbeb4d5cf24b96018528015ba830ce42b4859965bd482cbd034e99 rw,relatime - aufs none rw,si=caafa54f9e1b525
-111 20 0:104 / /var/lib/docker/aufs/mnt/d4dca7b02569c732e740071e1c654d4ad282de5c41edb619af1f0aafa618be26 rw,relatime - aufs none rw,si=caafa54f8dae525
-112 20 0:105 / /var/lib/docker/aufs/mnt/fea63da40fa1c5ffbad430dde0bc64a8fc2edab09a051fff55b673c40a08f6b7-init rw,relatime - aufs none rw,si=caafa54f8c5c525
-113 20 0:106 / /var/lib/docker/aufs/mnt/fea63da40fa1c5ffbad430dde0bc64a8fc2edab09a051fff55b673c40a08f6b7 rw,relatime - aufs none rw,si=caafa54fd172525
-114 20 0:107 / /var/lib/docker/aufs/mnt/e60c57499c0b198a6734f77f660cdbbd950a5b78aa23f470ca4f0cfcc376abef rw,relatime - aufs none rw,si=caafa54909c4525
-115 20 0:108 / /var/lib/docker/aufs/mnt/099c78e7ccd9c8717471bb1bbfff838c0a9913321ba2f214fbeaf92c678e5b35-init rw,relatime - aufs none rw,si=caafa54909c3525
-116 20 0:109 / /var/lib/docker/aufs/mnt/099c78e7ccd9c8717471bb1bbfff838c0a9913321ba2f214fbeaf92c678e5b35 rw,relatime - aufs none rw,si=caafa54909c7525
-117 20 0:110 / /var/lib/docker/aufs/mnt/2997be666d58b9e71469759bcb8bd9608dad0e533a1a7570a896919ba3388825 rw,relatime - aufs none rw,si=caafa54f8557525
-118 20 0:111 / /var/lib/docker/aufs/mnt/730694eff438ef20569df38dfb38a920969d7ff2170cc9aa7cb32a7ed8147a93-init rw,relatime - aufs none rw,si=caafa54c6e88525
-119 20 0:112 / /var/lib/docker/aufs/mnt/730694eff438ef20569df38dfb38a920969d7ff2170cc9aa7cb32a7ed8147a93 rw,relatime - aufs none rw,si=caafa54c6e8e525
-120 20 0:113 / /var/lib/docker/aufs/mnt/a672a1e2f2f051f6e19ed1dfbe80860a2d774174c49f7c476695f5dd1d5b2f67 rw,relatime - aufs none rw,si=caafa54c6e15525
-121 20 0:114 / /var/lib/docker/aufs/mnt/aba3570e17859f76cf29d282d0d150659c6bd80780fdc52a465ba05245c2a420-init rw,relatime - aufs none rw,si=caafa54f8dad525
-122 20 0:115 / /var/lib/docker/aufs/mnt/aba3570e17859f76cf29d282d0d150659c6bd80780fdc52a465ba05245c2a420 rw,relatime - aufs none rw,si=caafa54f8d84525
-123 20 0:116 / /var/lib/docker/aufs/mnt/2abc86007aca46fb4a817a033e2a05ccacae40b78ea4b03f8ea616b9ada40e2e rw,relatime - aufs none rw,si=caafa54c6e8b525
-124 20 0:117 / /var/lib/docker/aufs/mnt/36352f27f7878e648367a135bd1ec3ed497adcb8ac13577ee892a0bd921d2374-init rw,relatime - aufs none rw,si=caafa54c6e8d525
-125 20 0:118 / /var/lib/docker/aufs/mnt/36352f27f7878e648367a135bd1ec3ed497adcb8ac13577ee892a0bd921d2374 rw,relatime - aufs none rw,si=caafa54f8c34525
-126 20 0:119 / /var/lib/docker/aufs/mnt/2f95ca1a629cea8363b829faa727dd52896d5561f2c96ddee4f697ea2fc872c2 rw,relatime - aufs none rw,si=caafa54c6e8a525
-127 20 0:120 / /var/lib/docker/aufs/mnt/f108c8291654f179ef143a3e07de2b5a34adbc0b28194a0ab17742b6db9a7fb2-init rw,relatime - aufs none rw,si=caafa54f8e19525
-128 20 0:121 / /var/lib/docker/aufs/mnt/f108c8291654f179ef143a3e07de2b5a34adbc0b28194a0ab17742b6db9a7fb2 rw,relatime - aufs none rw,si=caafa54fa8c6525
-129 20 0:122 / /var/lib/docker/aufs/mnt/c1d04dfdf8cccb3676d5a91e84e9b0781ce40623d127d038bcfbe4c761b27401 rw,relatime - aufs none rw,si=caafa54f8c30525
-130 20 0:123 / /var/lib/docker/aufs/mnt/3f4898ffd0e1239aeebf1d1412590cdb7254207fa3883663e2c40cf772e5f05a-init rw,relatime - aufs none rw,si=caafa54c6e1a525
-131 20 0:124 / /var/lib/docker/aufs/mnt/3f4898ffd0e1239aeebf1d1412590cdb7254207fa3883663e2c40cf772e5f05a rw,relatime - aufs none rw,si=caafa54c6e1c525
-132 20 0:125 / /var/lib/docker/aufs/mnt/5ae3b6fccb1539fc02d420e86f3e9637bef5b711fed2ca31a2f426c8f5deddbf rw,relatime - aufs none rw,si=caafa54c4fea525
-133 20 0:126 / /var/lib/docker/aufs/mnt/310bfaf80d57020f2e73b06aeffb0b9b0ca2f54895f88bf5e4d1529ccac58fe0-init rw,relatime - aufs none rw,si=caafa54c6e1e525
-134 20 0:127 / /var/lib/docker/aufs/mnt/310bfaf80d57020f2e73b06aeffb0b9b0ca2f54895f88bf5e4d1529ccac58fe0 rw,relatime - aufs none rw,si=caafa54fa8c0525
-135 20 0:128 / /var/lib/docker/aufs/mnt/f382bd5aaccaf2d04a59089ac7cb12ec87efd769fd0c14d623358fbfd2a3f896 rw,relatime - aufs none rw,si=caafa54c4fec525
-136 20 0:129 / /var/lib/docker/aufs/mnt/50d45e9bb2d779bc6362824085564c7578c231af5ae3b3da116acf7e17d00735-init rw,relatime - aufs none rw,si=caafa54c4fef525
-137 20 0:130 / /var/lib/docker/aufs/mnt/50d45e9bb2d779bc6362824085564c7578c231af5ae3b3da116acf7e17d00735 rw,relatime - aufs none rw,si=caafa54c4feb525
-138 20 0:131 / /var/lib/docker/aufs/mnt/a9c5ee0854dc083b6bf62b7eb1e5291aefbb10702289a446471ce73aba0d5d7d rw,relatime - aufs none rw,si=caafa54909c6525
-139 20 0:134 / /var/lib/docker/aufs/mnt/03a613e7bd5078819d1fd92df4e671c0127559a5e0b5a885cc8d5616875162f0-init rw,relatime - aufs none rw,si=caafa54804fe525
-140 20 0:135 / /var/lib/docker/aufs/mnt/03a613e7bd5078819d1fd92df4e671c0127559a5e0b5a885cc8d5616875162f0 rw,relatime - aufs none rw,si=caafa54804fa525
-141 20 0:136 / /var/lib/docker/aufs/mnt/7ec3277e5c04c907051caf9c9c35889f5fcd6463e5485971b25404566830bb70 rw,relatime - aufs none rw,si=caafa54804f9525
-142 20 0:139 / /var/lib/docker/aufs/mnt/26b5b5d71d79a5b2bfcf8bc4b2280ee829f261eb886745dd90997ed410f7e8b8-init rw,relatime - aufs none rw,si=caafa54c6ef6525
-143 20 0:140 / /var/lib/docker/aufs/mnt/26b5b5d71d79a5b2bfcf8bc4b2280ee829f261eb886745dd90997ed410f7e8b8 rw,relatime - aufs none rw,si=caafa54c6ef5525
-144 20 0:356 / /var/lib/docker/aufs/mnt/e6ecde9e2c18cd3c75f424c67b6d89685cfee0fc67abf2cb6bdc0867eb998026 rw,relatime - aufs none rw,si=caafa548068e525`
-
-	gentooMountinfo = `15 1 8:6 / / rw,noatime,nodiratime - ext4 /dev/sda6 rw,data=ordered
-16 15 0:3 / /proc rw,nosuid,nodev,noexec,relatime - proc proc rw
-17 15 0:14 / /run rw,nosuid,nodev,relatime - tmpfs tmpfs rw,size=3292172k,mode=755
-18 15 0:5 / /dev rw,nosuid,relatime - devtmpfs udev rw,size=10240k,nr_inodes=4106451,mode=755
-19 18 0:12 / /dev/mqueue rw,nosuid,nodev,noexec,relatime - mqueue mqueue rw
-20 18 0:10 / /dev/pts rw,nosuid,noexec,relatime - devpts devpts rw,gid=5,mode=620,ptmxmode=000
-21 18 0:15 / /dev/shm rw,nosuid,nodev,noexec,relatime - tmpfs shm rw
-22 15 0:16 / /sys rw,nosuid,nodev,noexec,relatime - sysfs sysfs rw
-23 22 0:7 / /sys/kernel/debug rw,nosuid,nodev,noexec,relatime - debugfs debugfs rw
-24 22 0:17 / /sys/fs/cgroup rw,nosuid,nodev,noexec,relatime - tmpfs cgroup_root rw,size=10240k,mode=755
-25 24 0:18 / /sys/fs/cgroup/openrc rw,nosuid,nodev,noexec,relatime - cgroup openrc rw,release_agent=/lib64/rc/sh/cgroup-release-agent.sh,name=openrc
-26 24 0:19 / /sys/fs/cgroup/cpuset rw,nosuid,nodev,noexec,relatime - cgroup cpuset rw,cpuset,clone_children
-27 24 0:20 / /sys/fs/cgroup/cpu rw,nosuid,nodev,noexec,relatime - cgroup cpu rw,cpu,clone_children
-28 24 0:21 / /sys/fs/cgroup/cpuacct rw,nosuid,nodev,noexec,relatime - cgroup cpuacct rw,cpuacct,clone_children
-29 24 0:22 / /sys/fs/cgroup/memory rw,nosuid,nodev,noexec,relatime - cgroup memory rw,memory,clone_children
-30 24 0:23 / /sys/fs/cgroup/devices rw,nosuid,nodev,noexec,relatime - cgroup devices rw,devices,clone_children
-31 24 0:24 / /sys/fs/cgroup/freezer rw,nosuid,nodev,noexec,relatime - cgroup freezer rw,freezer,clone_children
-32 24 0:25 / /sys/fs/cgroup/blkio rw,nosuid,nodev,noexec,relatime - cgroup blkio rw,blkio,clone_children
-33 15 8:1 / /boot rw,noatime,nodiratime - vfat /dev/sda1 rw,fmask=0022,dmask=0022,codepage=437,iocharset=iso8859-1,shortname=mixed,errors=remount-ro
-34 15 8:18 / /mnt/xfs rw,noatime,nodiratime - xfs /dev/sdb2 rw,attr2,inode64,noquota
-35 15 0:26 / /tmp rw,relatime - tmpfs tmpfs rw
-36 16 0:27 / /proc/sys/fs/binfmt_misc rw,nosuid,nodev,noexec,relatime - binfmt_misc binfmt_misc rw
-42 15 0:33 / /var/lib/nfs/rpc_pipefs rw,relatime - rpc_pipefs rpc_pipefs rw
-43 16 0:34 / /proc/fs/nfsd rw,nosuid,nodev,noexec,relatime - nfsd nfsd rw
-44 15 0:35 / /home/tianon/.gvfs rw,nosuid,nodev,relatime - fuse.gvfs-fuse-daemon gvfs-fuse-daemon rw,user_id=1000,group_id=1000
-68 15 0:3336 / /var/lib/docker/aufs/mnt/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd rw,relatime - aufs none rw,si=9b4a7640128db39c
-86 68 8:6 /var/lib/docker/containers/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/config.env /var/lib/docker/aufs/mnt/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/.dockerenv rw,noatime,nodiratime - ext4 /dev/sda6 rw,data=ordered
-87 68 8:6 /etc/resolv.conf /var/lib/docker/aufs/mnt/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/etc/resolv.conf rw,noatime,nodiratime - ext4 /dev/sda6 rw,data=ordered
-88 68 8:6 /var/lib/docker/containers/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/hostname /var/lib/docker/aufs/mnt/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/etc/hostname rw,noatime,nodiratime - ext4 /dev/sda6 rw,data=ordered
-89 68 8:6 /var/lib/docker/containers/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/hosts /var/lib/docker/aufs/mnt/3597a1a6d6298c1decc339ebb90aad6f7d6ba2e15af3131b1f85e7ee4787a0cd/etc/hosts rw,noatime,nodiratime - ext4 /dev/sda6 rw,data=ordered
-38 15 0:3384 / /var/lib/docker/aufs/mnt/0292005a9292401bb5197657f2b682d97d8edcb3b72b5e390d2a680139985b55 rw,relatime - aufs none rw,si=9b4a7642b584939c
-39 15 0:3385 / /var/lib/docker/aufs/mnt/59db98c889de5f71b70cfb82c40cbe47b64332f0f56042a2987a9e5df6e5e3aa rw,relatime - aufs none rw,si=9b4a7642b584e39c
-40 15 0:3386 / /var/lib/docker/aufs/mnt/0545f0f2b6548eb9601d08f35a08f5a0a385407d36027a28f58e06e9f61e0278 rw,relatime - aufs none rw,si=9b4a7642b584b39c
-41 15 0:3387 / /var/lib/docker/aufs/mnt/d882cfa16d1aa8fe0331a36e79be3d80b151e49f24fc39a39c3fed1735d5feb5 rw,relatime - aufs none rw,si=9b4a76453040039c
-45 15 0:3388 / /var/lib/docker/aufs/mnt/055ca3befcb1626e74f5344b3398724ff05c0de0e20021683d04305c9e70a3f6 rw,relatime - aufs none rw,si=9b4a76453040739c
-46 15 0:3389 / /var/lib/docker/aufs/mnt/b899e4567a351745d4285e7f1c18fdece75d877deb3041981cd290be348b7aa6 rw,relatime - aufs none rw,si=9b4a7647def4039c
-47 15 0:3390 / /var/lib/docker/aufs/mnt/067ca040292c58954c5129f953219accfae0d40faca26b4d05e76ca76a998f16 rw,relatime - aufs none rw,si=9b4a7647def4239c
-48 15 0:3391 / /var/lib/docker/aufs/mnt/8c995e7cb6e5082742daeea720e340b021d288d25d92e0412c03d200df308a11 rw,relatime - aufs none rw,si=9b4a764479c1639c
-49 15 0:3392 / /var/lib/docker/aufs/mnt/07cc54dfae5b45300efdacdd53cc72c01b9044956a86ce7bff42d087e426096d rw,relatime - aufs none rw,si=9b4a764479c1739c
-50 15 0:3393 / /var/lib/docker/aufs/mnt/0a9c95cf4c589c05b06baa79150b0cc1d8e7102759fe3ce4afaabb8247ca4f85 rw,relatime - aufs none rw,si=9b4a7644059c839c
-51 15 0:3394 / /var/lib/docker/aufs/mnt/468fa98cececcf4e226e8370f18f4f848d63faf287fb8321a07f73086441a3a0 rw,relatime - aufs none rw,si=9b4a7644059ca39c
-52 15 0:3395 / /var/lib/docker/aufs/mnt/0b826192231c5ce066fffb5beff4397337b5fc19a377aa7c6282c7c0ce7f111f rw,relatime - aufs none rw,si=9b4a764479c1339c
-53 15 0:3396 / /var/lib/docker/aufs/mnt/93b8ba1b772fbe79709b909c43ea4b2c30d712e53548f467db1ffdc7a384f196 rw,relatime - aufs none rw,si=9b4a7640798a739c
-54 15 0:3397 / /var/lib/docker/aufs/mnt/0c0d0acfb506859b12ef18cdfef9ebed0b43a611482403564224bde9149d373c rw,relatime - aufs none rw,si=9b4a7640798a039c
-55 15 0:3398 / /var/lib/docker/aufs/mnt/33648c39ab6c7c74af0243d6d6a81b052e9e25ad1e04b19892eb2dde013e358b rw,relatime - aufs none rw,si=9b4a7644b439b39c
-56 15 0:3399 / /var/lib/docker/aufs/mnt/0c12bea97a1c958a3c739fb148536c1c89351d48e885ecda8f0499b5cc44407e rw,relatime - aufs none rw,si=9b4a7640798a239c
-57 15 0:3400 / /var/lib/docker/aufs/mnt/ed443988ce125f172d7512e84a4de2627405990fd767a16adefa8ce700c19ce8 rw,relatime - aufs none rw,si=9b4a7644c8ed339c
-59 15 0:3402 / /var/lib/docker/aufs/mnt/f61612c324ff3c924d3f7a82fb00a0f8d8f73c248c41897061949e9f5ab7e3b1 rw,relatime - aufs none rw,si=9b4a76442810c39c
-60 15 0:3403 / /var/lib/docker/aufs/mnt/0f1ee55c6c4e25027b80de8e64b8b6fb542b3b41aa0caab9261da75752e22bfd rw,relatime - aufs none rw,si=9b4a76442810e39c
-61 15 0:3404 / /var/lib/docker/aufs/mnt/956f6cc4af5785cb3ee6963dcbca668219437d9b28f513290b1453ac64a34f97 rw,relatime - aufs none rw,si=9b4a7644303ec39c
-62 15 0:3405 / /var/lib/docker/aufs/mnt/1099769158c4b4773e2569e38024e8717e400f87a002c41d8cf47cb81b051ba6 rw,relatime - aufs none rw,si=9b4a7644303ee39c
-63 15 0:3406 / /var/lib/docker/aufs/mnt/11890ceb98d4442595b676085cd7b21550ab85c5df841e0fba997ff54e3d522d rw,relatime - aufs none rw,si=9b4a7644303ed39c
-64 15 0:3407 / /var/lib/docker/aufs/mnt/acdb90dc378e8ed2420b43a6d291f1c789a081cd1904018780cc038fcd7aae53 rw,relatime - aufs none rw,si=9b4a76434be2139c
-65 15 0:3408 / /var/lib/docker/aufs/mnt/120e716f19d4714fbe63cc1ed246204f2c1106eefebc6537ba2587d7e7711959 rw,relatime - aufs none rw,si=9b4a76434be2339c
-66 15 0:3409 / /var/lib/docker/aufs/mnt/b197b7fffb61d89e0ba1c40de9a9fc0d912e778b3c1bd828cf981ff37c1963bc rw,relatime - aufs none rw,si=9b4a76434be2039c
-70 15 0:3412 / /var/lib/docker/aufs/mnt/1434b69d2e1bb18a9f0b96b9cdac30132b2688f5d1379f68a39a5e120c2f93eb rw,relatime - aufs none rw,si=9b4a76434be2639c
-71 15 0:3413 / /var/lib/docker/aufs/mnt/16006e83caf33ab5eb0cd6afc92ea2ee8edeff897496b0bb3ec3a75b767374b3 rw,relatime - aufs none rw,si=9b4a7644d790439c
-72 15 0:3414 / /var/lib/docker/aufs/mnt/55bfa5f44e94d27f91f79ba901b118b15098449165c87abf1b53ffff147ff164 rw,relatime - aufs none rw,si=9b4a7644d790239c
-73 15 0:3415 / /var/lib/docker/aufs/mnt/1912b97a07ab21ccd98a2a27bc779bf3cf364a3138afa3c3e6f7f169a3c3eab5 rw,relatime - aufs none rw,si=9b4a76441822739c
-76 15 0:3418 / /var/lib/docker/aufs/mnt/1a7c3292e8879bd91ffd9282e954f643b1db5683093574c248ff14a9609f2f56 rw,relatime - aufs none rw,si=9b4a76438cb7239c
-77 15 0:3419 / /var/lib/docker/aufs/mnt/bb1faaf0d076ddba82c2318305a85f490dafa4e8a8640a8db8ed657c439120cc rw,relatime - aufs none rw,si=9b4a76438cb7339c
-78 15 0:3420 / /var/lib/docker/aufs/mnt/1ab869f21d2241a73ac840c7f988490313f909ac642eba71d092204fec66dd7c rw,relatime - aufs none rw,si=9b4a76438cb7639c
-79 15 0:3421 / /var/lib/docker/aufs/mnt/fd7245b2cfe3890fa5f5b452260e4edf9e7fb7746532ed9d83f7a0d7dbaa610e rw,relatime - aufs none rw,si=9b4a7644bdc0139c
-80 15 0:3422 / /var/lib/docker/aufs/mnt/1e5686c5301f26b9b3cd24e322c608913465cc6c5d0dcd7c5e498d1314747d61 rw,relatime - aufs none rw,si=9b4a7644bdc0639c
-81 15 0:3423 / /var/lib/docker/aufs/mnt/52edf6ee6e40bfec1e9301a4d4a92ab83d144e2ae4ce5099e99df6138cb844bf rw,relatime - aufs none rw,si=9b4a7644bdc0239c
-82 15 0:3424 / /var/lib/docker/aufs/mnt/1ea10fb7085d28cda4904657dff0454e52598d28e1d77e4f2965bbc3666e808f rw,relatime - aufs none rw,si=9b4a76438cb7139c
-83 15 0:3425 / /var/lib/docker/aufs/mnt/9c03e98c3593946dbd4087f8d83f9ca262f4a2efdc952ce60690838b9ba6c526 rw,relatime - aufs none rw,si=9b4a76443020639c
-84 15 0:3426 / /var/lib/docker/aufs/mnt/220a2344d67437602c6d2cee9a98c46be13f82c2a8063919dd2fad52bf2fb7dd rw,relatime - aufs none rw,si=9b4a76434bff339c
-94 15 0:3427 / /var/lib/docker/aufs/mnt/3b32876c5b200312c50baa476ff342248e88c8ea96e6a1032cd53a88738a1cf2 rw,relatime - aufs none rw,si=9b4a76434bff139c
-95 15 0:3428 / /var/lib/docker/aufs/mnt/23ee2b8b0d4ae8db6f6d1e168e2c6f79f8a18f953b09f65e0d22cc1e67a3a6fa rw,relatime - aufs none rw,si=9b4a7646c305c39c
-96 15 0:3429 / /var/lib/docker/aufs/mnt/e86e6daa70b61b57945fa178222615f3c3d6bcef12c9f28e9f8623d44dc2d429 rw,relatime - aufs none rw,si=9b4a7646c305f39c
-97 15 0:3430 / /var/lib/docker/aufs/mnt/2413d07623e80860bb2e9e306fbdee699afd07525785c025c591231e864aa162 rw,relatime - aufs none rw,si=9b4a76434bff039c
-98 15 0:3431 / /var/lib/docker/aufs/mnt/adfd622eb22340fc80b429e5564b125668e260bf9068096c46dd59f1386a4b7d rw,relatime - aufs none rw,si=9b4a7646a7a1039c
-102 15 0:3435 / /var/lib/docker/aufs/mnt/27cd92e7a91d02e2d6b44d16679a00fb6d169b19b88822891084e7fd1a84882d rw,relatime - aufs none rw,si=9b4a7646f25ec39c
-103 15 0:3436 / /var/lib/docker/aufs/mnt/27dfdaf94cfbf45055c748293c37dd68d9140240bff4c646cb09216015914a88 rw,relatime - aufs none rw,si=9b4a7646732f939c
-104 15 0:3437 / /var/lib/docker/aufs/mnt/5ed7524aff68dfbf0fc601cbaeac01bab14391850a973dabf3653282a627920f rw,relatime - aufs none rw,si=9b4a7646732f839c
-105 15 0:3438 / /var/lib/docker/aufs/mnt/2a0d4767e536beb5785b60e071e3ac8e5e812613ab143a9627bee77d0c9ab062 rw,relatime - aufs none rw,si=9b4a7646732fe39c
-106 15 0:3439 / /var/lib/docker/aufs/mnt/dea3fc045d9f4ae51ba952450b948a822cf85c39411489ca5224f6d9a8d02bad rw,relatime - aufs none rw,si=9b4a764012ad839c
-107 15 0:3440 / /var/lib/docker/aufs/mnt/2d140a787160798da60cb67c21b1210054ad4dafecdcf832f015995b9aa99cfd rw,relatime - aufs none rw,si=9b4a764012add39c
-108 15 0:3441 / /var/lib/docker/aufs/mnt/cb190b2a8e984475914430fbad2382e0d20b9b659f8ef83ae8d170cc672e519c rw,relatime - aufs none rw,si=9b4a76454d9c239c
-109 15 0:3442 / /var/lib/docker/aufs/mnt/2f4a012d5a7ffd90256a6e9aa479054b3dddbc3c6a343f26dafbf3196890223b rw,relatime - aufs none rw,si=9b4a76454d9c439c
-110 15 0:3443 / /var/lib/docker/aufs/mnt/63cc77904b80c4ffbf49cb974c5d8733dc52ad7640d3ae87554b325d7312d87f rw,relatime - aufs none rw,si=9b4a76454d9c339c
-111 15 0:3444 / /var/lib/docker/aufs/mnt/30333e872c451482ea2d235ff2192e875bd234006b238ae2bdde3b91a86d7522 rw,relatime - aufs none rw,si=9b4a76422cebf39c
-112 15 0:3445 / /var/lib/docker/aufs/mnt/6c54fc1125da3925cae65b5c9a98f3be55b0a2c2666082e5094a4ba71beb5bff rw,relatime - aufs none rw,si=9b4a7646dd5a439c
-113 15 0:3446 / /var/lib/docker/aufs/mnt/3087d48cb01cda9d0a83a9ca301e6ea40e8593d18c4921be4794c91a420ab9a3 rw,relatime - aufs none rw,si=9b4a7646dd5a739c
-114 15 0:3447 / /var/lib/docker/aufs/mnt/cc2607462a8f55b179a749b144c3fdbb50678e1a4f3065ea04e283e9b1f1d8e2 rw,relatime - aufs none rw,si=9b4a7646dd5a239c
-117 15 0:3450 / /var/lib/docker/aufs/mnt/310c5e8392b29e8658a22e08d96d63936633b7e2c38e8d220047928b00a03d24 rw,relatime - aufs none rw,si=9b4a7647932d739c
-118 15 0:3451 / /var/lib/docker/aufs/mnt/38a1f0029406ba9c3b6058f2f406d8a1d23c855046cf355c91d87d446fcc1460 rw,relatime - aufs none rw,si=9b4a76445abc939c
-119 15 0:3452 / /var/lib/docker/aufs/mnt/42e109ab7914ae997a11ccd860fd18e4d488c50c044c3240423ce15774b8b62e rw,relatime - aufs none rw,si=9b4a76445abca39c
-120 15 0:3453 / /var/lib/docker/aufs/mnt/365d832af0402d052b389c1e9c0d353b48487533d20cd4351df8e24ec4e4f9d8 rw,relatime - aufs none rw,si=9b4a7644066aa39c
-121 15 0:3454 / /var/lib/docker/aufs/mnt/d3fa8a24d695b6cda9b64f96188f701963d28bef0473343f8b212df1a2cf1d2b rw,relatime - aufs none rw,si=9b4a7644066af39c
-122 15 0:3455 / /var/lib/docker/aufs/mnt/37d4f491919abc49a15d0c7a7cc8383f087573525d7d288accd14f0b4af9eae0 rw,relatime - aufs none rw,si=9b4a7644066ad39c
-123 15 0:3456 / /var/lib/docker/aufs/mnt/93902707fe12cbdd0068ce73f2baad4b3a299189b1b19cb5f8a2025e106ae3f5 rw,relatime - aufs none rw,si=9b4a76444445f39c
-126 15 0:3459 / /var/lib/docker/aufs/mnt/3b49291670a625b9bbb329ffba99bf7fa7abff80cefef040f8b89e2b3aad4f9f rw,relatime - aufs none rw,si=9b4a7640798a339c
-127 15 0:3460 / /var/lib/docker/aufs/mnt/8d9c7b943cc8f854f4d0d4ec19f7c16c13b0cc4f67a41472a072648610cecb59 rw,relatime - aufs none rw,si=9b4a76427383039c
-128 15 0:3461 / /var/lib/docker/aufs/mnt/3b6c90036526c376307df71d49c9f5fce334c01b926faa6a78186842de74beac rw,relatime - aufs none rw,si=9b4a7644badd439c
-130 15 0:3463 / /var/lib/docker/aufs/mnt/7b24158eeddfb5d31b7e932e406ea4899fd728344335ff8e0765e89ddeb351dd rw,relatime - aufs none rw,si=9b4a7644badd539c
-131 15 0:3464 / /var/lib/docker/aufs/mnt/3ead6dd5773765c74850cf6c769f21fe65c29d622ffa712664f9f5b80364ce27 rw,relatime - aufs none rw,si=9b4a7642f469939c
-132 15 0:3465 / /var/lib/docker/aufs/mnt/3f825573b29547744a37b65597a9d6d15a8350be4429b7038d126a4c9a8e178f rw,relatime - aufs none rw,si=9b4a7642f469c39c
-133 15 0:3466 / /var/lib/docker/aufs/mnt/f67aaaeb3681e5dcb99a41f847087370bd1c206680cb8c7b6a9819fd6c97a331 rw,relatime - aufs none rw,si=9b4a7647cc25939c
-134 15 0:3467 / /var/lib/docker/aufs/mnt/41afe6cfb3c1fc2280b869db07699da88552786e28793f0bc048a265c01bd942 rw,relatime - aufs none rw,si=9b4a7647cc25c39c
-135 15 0:3468 / /var/lib/docker/aufs/mnt/b8092ea59da34a40b120e8718c3ae9fa8436996edc4fc50e4b99c72dfd81e1af rw,relatime - aufs none rw,si=9b4a76445abc439c
-136 15 0:3469 / /var/lib/docker/aufs/mnt/42c69d2cc179e2684458bb8596a9da6dad182c08eae9b74d5f0e615b399f75a5 rw,relatime - aufs none rw,si=9b4a76455ddbe39c
-137 15 0:3470 / /var/lib/docker/aufs/mnt/ea0871954acd2d62a211ac60e05969622044d4c74597870c4f818fbb0c56b09b rw,relatime - aufs none rw,si=9b4a76455ddbf39c
-138 15 0:3471 / /var/lib/docker/aufs/mnt/4307906b275ab3fc971786b3841ae3217ac85b6756ddeb7ad4ba09cd044c2597 rw,relatime - aufs none rw,si=9b4a76455ddb839c
-139 15 0:3472 / /var/lib/docker/aufs/mnt/4390b872928c53500a5035634f3421622ed6299dc1472b631fc45de9f56dc180 rw,relatime - aufs none rw,si=9b4a76402f2fd39c
-140 15 0:3473 / /var/lib/docker/aufs/mnt/6bb41e78863b85e4aa7da89455314855c8c3bda64e52a583bab15dc1fa2e80c2 rw,relatime - aufs none rw,si=9b4a76402f2fa39c
-141 15 0:3474 / /var/lib/docker/aufs/mnt/4444f583c2a79c66608f4673a32c9c812154f027045fbd558c2d69920c53f835 rw,relatime - aufs none rw,si=9b4a764479dbd39c
-142 15 0:3475 / /var/lib/docker/aufs/mnt/6f11883af4a05ea362e0c54df89058da4859f977efd07b6f539e1f55c1d2a668 rw,relatime - aufs none rw,si=9b4a76402f30b39c
-143 15 0:3476 / /var/lib/docker/aufs/mnt/453490dd32e7c2e9ef906f995d8fb3c2753923d1a5e0ba3fd3296e2e4dc238e7 rw,relatime - aufs none rw,si=9b4a76402f30c39c
-144 15 0:3477 / /var/lib/docker/aufs/mnt/45e5945735ee102b5e891c91650c57ec4b52bb53017d68f02d50ea8a6e230610 rw,relatime - aufs none rw,si=9b4a76423260739c
-147 15 0:3480 / /var/lib/docker/aufs/mnt/4727a64a5553a1125f315b96bed10d3073d6988225a292cce732617c925b56ab rw,relatime - aufs none rw,si=9b4a76443030339c
-150 15 0:3483 / /var/lib/docker/aufs/mnt/4e348b5187b9a567059306afc72d42e0ec5c893b0d4abd547526d5f9b6fb4590 rw,relatime - aufs none rw,si=9b4a7644f5d8c39c
-151 15 0:3484 / /var/lib/docker/aufs/mnt/4efc616bfbc3f906718b052da22e4335f8e9f91ee9b15866ed3a8029645189ef rw,relatime - aufs none rw,si=9b4a7644f5d8939c
-152 15 0:3485 / /var/lib/docker/aufs/mnt/83e730ae9754d5adb853b64735472d98dfa17136b8812ac9cfcd1eba7f4e7d2d rw,relatime - aufs none rw,si=9b4a76469aa7139c
-153 15 0:3486 / /var/lib/docker/aufs/mnt/4fc5ba8a5b333be2b7eefacccb626772eeec0ae8a6975112b56c9fb36c0d342f rw,relatime - aufs none rw,si=9b4a7640128dc39c
-154 15 0:3487 / /var/lib/docker/aufs/mnt/50200d5edff5dfe8d1ef3c78b0bbd709793ac6e936aa16d74ff66f7ea577b6f9 rw,relatime - aufs none rw,si=9b4a7640128da39c
-155 15 0:3488 / /var/lib/docker/aufs/mnt/51e5e51604361448f0b9777f38329f414bc5ba9cf238f26d465ff479bd574b61 rw,relatime - aufs none rw,si=9b4a76444f68939c
-156 15 0:3489 / /var/lib/docker/aufs/mnt/52a142149aa98bba83df8766bbb1c629a97b9799944ead90dd206c4bdf0b8385 rw,relatime - aufs none rw,si=9b4a76444f68b39c
-157 15 0:3490 / /var/lib/docker/aufs/mnt/52dd21a94a00f58a1ed489312fcfffb91578089c76c5650364476f1d5de031bc rw,relatime - aufs none rw,si=9b4a76444f68f39c
-158 15 0:3491 / /var/lib/docker/aufs/mnt/ee562415ddaad353ed22c88d0ca768a0c74bfba6333b6e25c46849ee22d990da rw,relatime - aufs none rw,si=9b4a7640128d839c
-159 15 0:3492 / /var/lib/docker/aufs/mnt/db47a9e87173f7554f550c8a01891de79cf12acdd32e01f95c1a527a08bdfb2c rw,relatime - aufs none rw,si=9b4a764405a1d39c
-160 15 0:3493 / /var/lib/docker/aufs/mnt/55e827bf6d44d930ec0b827c98356eb8b68c3301e2d60d1429aa72e05b4c17df rw,relatime - aufs none rw,si=9b4a764405a1a39c
-162 15 0:3495 / /var/lib/docker/aufs/mnt/578dc4e0a87fc37ec081ca098430499a59639c09f6f12a8f48de29828a091aa6 rw,relatime - aufs none rw,si=9b4a76406d7d439c
-163 15 0:3496 / /var/lib/docker/aufs/mnt/728cc1cb04fa4bc6f7bf7a90980beda6d8fc0beb71630874c0747b994efb0798 rw,relatime - aufs none rw,si=9b4a76444f20e39c
-164 15 0:3497 / /var/lib/docker/aufs/mnt/5850cc4bd9b55aea46c7ad598f1785117607974084ea643580f58ce3222e683a rw,relatime - aufs none rw,si=9b4a7644a824239c
-165 15 0:3498 / /var/lib/docker/aufs/mnt/89443b3f766d5a37bc8b84e29da8b84e6a3ea8486d3cf154e2aae1816516e4a8 rw,relatime - aufs none rw,si=9b4a7644a824139c
-166 15 0:3499 / /var/lib/docker/aufs/mnt/f5ae8fd5a41a337907d16515bc3162525154b59c32314c695ecd092c3b47943d rw,relatime - aufs none rw,si=9b4a7644a824439c
-167 15 0:3500 / /var/lib/docker/aufs/mnt/5a430854f2a03a9e5f7cbc9f3fb46a8ebca526a5b3f435236d8295e5998798f5 rw,relatime - aufs none rw,si=9b4a7647fc82439c
-168 15 0:3501 / /var/lib/docker/aufs/mnt/eda16901ae4cead35070c39845cbf1e10bd6b8cb0ffa7879ae2d8a186e460f91 rw,relatime - aufs none rw,si=9b4a76441e0df39c
-169 15 0:3502 / /var/lib/docker/aufs/mnt/5a593721430c2a51b119ff86a7e06ea2b37e3b4131f8f1344d402b61b0c8d868 rw,relatime - aufs none rw,si=9b4a764248bad39c
-170 15 0:3503 / /var/lib/docker/aufs/mnt/d662ad0a30fbfa902e0962108685b9330597e1ee2abb16dc9462eb5a67fdd23f rw,relatime - aufs none rw,si=9b4a764248bae39c
-171 15 0:3504 / /var/lib/docker/aufs/mnt/5bc9de5c79812843fb36eee96bef1ddba812407861f572e33242f4ee10da2c15 rw,relatime - aufs none rw,si=9b4a764248ba839c
-172 15 0:3505 / /var/lib/docker/aufs/mnt/5e763de8e9b0f7d58d2e12a341e029ab4efb3b99788b175090d8209e971156c1 rw,relatime - aufs none rw,si=9b4a764248baa39c
-173 15 0:3506 / /var/lib/docker/aufs/mnt/b4431dc2739936f1df6387e337f5a0c99cf051900c896bd7fd46a870ce61c873 rw,relatime - aufs none rw,si=9b4a76401263539c
-174 15 0:3507 / /var/lib/docker/aufs/mnt/5f37830e5a02561ab8c67ea3113137ba69f67a60e41c05cb0e7a0edaa1925b24 rw,relatime - aufs none rw,si=9b4a76401263639c
-184 15 0:3508 / /var/lib/docker/aufs/mnt/62ea10b957e6533538a4633a1e1d678502f50ddcdd354b2ca275c54dd7a7793a rw,relatime - aufs none rw,si=9b4a76401263039c
-187 15 0:3509 / /var/lib/docker/aufs/mnt/d56ee9d44195fe390e042fda75ec15af5132adb6d5c69468fa8792f4e54a6953 rw,relatime - aufs none rw,si=9b4a76401263239c
-188 15 0:3510 / /var/lib/docker/aufs/mnt/6a300930673174549c2b62f36c933f0332a20735978c007c805a301f897146c5 rw,relatime - aufs none rw,si=9b4a76455d4c539c
-189 15 0:3511 / /var/lib/docker/aufs/mnt/64496c45c84d348c24d410015456d101601c30cab4d1998c395591caf7e57a70 rw,relatime - aufs none rw,si=9b4a76455d4c639c
-190 15 0:3512 / /var/lib/docker/aufs/mnt/65a6a645883fe97a7422cd5e71ebe0bc17c8e6302a5361edf52e89747387e908 rw,relatime - aufs none rw,si=9b4a76455d4c039c
-191 15 0:3513 / /var/lib/docker/aufs/mnt/672be40695f7b6e13b0a3ed9fc996c73727dede3481f58155950fcfad57ed616 rw,relatime - aufs none rw,si=9b4a76455d4c239c
-192 15 0:3514 / /var/lib/docker/aufs/mnt/d42438acb2bfb2169e1c0d8e917fc824f7c85d336dadb0b0af36dfe0f001b3ba rw,relatime - aufs none rw,si=9b4a7642bfded39c
-193 15 0:3515 / /var/lib/docker/aufs/mnt/b48a54abf26d01cb2ddd908b1ed6034d17397c1341bf0eb2b251a3e5b79be854 rw,relatime - aufs none rw,si=9b4a7642bfdee39c
-194 15 0:3516 / /var/lib/docker/aufs/mnt/76f27134491f052bfb87f59092126e53ef875d6851990e59195a9da16a9412f8 rw,relatime - aufs none rw,si=9b4a7642bfde839c
-195 15 0:3517 / /var/lib/docker/aufs/mnt/6bd626a5462b4f8a8e1cc7d10351326dca97a59b2758e5ea549a4f6350ce8a90 rw,relatime - aufs none rw,si=9b4a7642bfdea39c
-196 15 0:3518 / /var/lib/docker/aufs/mnt/f1fe3549dbd6f5ca615e9139d9b53f0c83a3b825565df37628eacc13e70cbd6d rw,relatime - aufs none rw,si=9b4a7642bfdf539c
-197 15 0:3519 / /var/lib/docker/aufs/mnt/6d0458c8426a9e93d58d0625737e6122e725c9408488ed9e3e649a9984e15c34 rw,relatime - aufs none rw,si=9b4a7642bfdf639c
-198 15 0:3520 / /var/lib/docker/aufs/mnt/6e4c97db83aa82145c9cf2bafc20d500c0b5389643b689e3ae84188c270a48c5 rw,relatime - aufs none rw,si=9b4a7642bfdf039c
-199 15 0:3521 / /var/lib/docker/aufs/mnt/eb94d6498f2c5969eaa9fa11ac2934f1ab90ef88e2d002258dca08e5ba74ea27 rw,relatime - aufs none rw,si=9b4a7642bfdf239c
-200 15 0:3522 / /var/lib/docker/aufs/mnt/fe3f88f0c511608a2eec5f13a98703aa16e55dbf930309723d8a37101f539fe1 rw,relatime - aufs none rw,si=9b4a7642bfc3539c
-201 15 0:3523 / /var/lib/docker/aufs/mnt/6f40c229fb9cad85fabf4b64a2640a5403ec03fe5ac1a57d0609fb8b606b9c83 rw,relatime - aufs none rw,si=9b4a7642bfc3639c
-202 15 0:3524 / /var/lib/docker/aufs/mnt/7513e9131f7a8acf58ff15248237feb767c78732ca46e159f4d791e6ef031dbc rw,relatime - aufs none rw,si=9b4a7642bfc3039c
-203 15 0:3525 / /var/lib/docker/aufs/mnt/79f48b00aa713cdf809c6bb7c7cb911b66e9a8076c81d6c9d2504139984ea2da rw,relatime - aufs none rw,si=9b4a7642bfc3239c
-204 15 0:3526 / /var/lib/docker/aufs/mnt/c3680418350d11358f0a96c676bc5aa74fa00a7c89e629ef5909d3557b060300 rw,relatime - aufs none rw,si=9b4a7642f47cd39c
-205 15 0:3527 / /var/lib/docker/aufs/mnt/7a1744dd350d7fcc0cccb6f1757ca4cbe5453f203a5888b0f1014d96ad5a5ef9 rw,relatime - aufs none rw,si=9b4a7642f47ce39c
-206 15 0:3528 / /var/lib/docker/aufs/mnt/7fa99662db046be9f03c33c35251afda9ccdc0085636bbba1d90592cec3ff68d rw,relatime - aufs none rw,si=9b4a7642f47c839c
-207 15 0:3529 / /var/lib/docker/aufs/mnt/f815021ef20da9c9b056bd1d52d8aaf6e2c0c19f11122fc793eb2b04eb995e35 rw,relatime - aufs none rw,si=9b4a7642f47ca39c
-208 15 0:3530 / /var/lib/docker/aufs/mnt/801086ae3110192d601dfcebdba2db92e86ce6b6a9dba6678ea04488e4513669 rw,relatime - aufs none rw,si=9b4a7642dc6dd39c
-209 15 0:3531 / /var/lib/docker/aufs/mnt/822ba7db69f21daddda87c01cfbfbf73013fc03a879daf96d16cdde6f9b1fbd6 rw,relatime - aufs none rw,si=9b4a7642dc6de39c
-210 15 0:3532 / /var/lib/docker/aufs/mnt/834227c1a950fef8cae3827489129d0dd220541e60c6b731caaa765bf2e6a199 rw,relatime - aufs none rw,si=9b4a7642dc6d839c
-211 15 0:3533 / /var/lib/docker/aufs/mnt/83dccbc385299bd1c7cf19326e791b33a544eea7b4cdfb6db70ea94eed4389fb rw,relatime - aufs none rw,si=9b4a7642dc6da39c
-212 15 0:3534 / /var/lib/docker/aufs/mnt/f1b8e6f0e7c8928b5dcdab944db89306ebcae3e0b32f9ff40d2daa8329f21600 rw,relatime - aufs none rw,si=9b4a7645a126039c
-213 15 0:3535 / /var/lib/docker/aufs/mnt/970efb262c7a020c2404cbcc5b3259efba0d110a786079faeef05bc2952abf3a rw,relatime - aufs none rw,si=9b4a7644c8ed139c
-214 15 0:3536 / /var/lib/docker/aufs/mnt/84b6d73af7450f3117a77e15a5ca1255871fea6182cd8e8a7be6bc744be18c2c rw,relatime - aufs none rw,si=9b4a76406559139c
-215 15 0:3537 / /var/lib/docker/aufs/mnt/88be2716e026bc681b5e63fe7942068773efbd0b6e901ca7ba441412006a96b6 rw,relatime - aufs none rw,si=9b4a76406559339c
-216 15 0:3538 / /var/lib/docker/aufs/mnt/c81939aa166ce50cd8bca5cfbbcc420a78e0318dd5cd7c755209b9166a00a752 rw,relatime - aufs none rw,si=9b4a76406559239c
-217 15 0:3539 / /var/lib/docker/aufs/mnt/e0f241645d64b7dc5ff6a8414087cca226be08fb54ce987d1d1f6350c57083aa rw,relatime - aufs none rw,si=9b4a7647cfc0f39c
-218 15 0:3540 / /var/lib/docker/aufs/mnt/e10e2bf75234ed51d8a6a4bb39e465404fecbe318e54400d3879cdb2b0679c78 rw,relatime - aufs none rw,si=9b4a7647cfc0939c
-219 15 0:3541 / /var/lib/docker/aufs/mnt/8f71d74c8cfc3228b82564aa9f09b2e576cff0083ddfb6aa5cb350346063f080 rw,relatime - aufs none rw,si=9b4a7647cfc0a39c
-220 15 0:3542 / /var/lib/docker/aufs/mnt/9159f1eba2aef7f5205cc18d015cda7f5933cd29bba3b1b8aed5ccb5824c69ee rw,relatime - aufs none rw,si=9b4a76468cedd39c
-221 15 0:3543 / /var/lib/docker/aufs/mnt/932cad71e652e048e500d9fbb5b8ea4fc9a269d42a3134ce527ceef42a2be56b rw,relatime - aufs none rw,si=9b4a76468cede39c
-222 15 0:3544 / /var/lib/docker/aufs/mnt/bf1e1b5f529e8943cc0144ee86dbaaa37885c1ddffcef29537e0078ee7dd316a rw,relatime - aufs none rw,si=9b4a76468ced839c
-223 15 0:3545 / /var/lib/docker/aufs/mnt/949d93ecf3322e09f858ce81d5f4b434068ec44ff84c375de03104f7b45ee955 rw,relatime - aufs none rw,si=9b4a76468ceda39c
-224 15 0:3546 / /var/lib/docker/aufs/mnt/d65c6087f92dc2a3841b5251d2fe9ca07d4c6e5b021597692479740816e4e2a1 rw,relatime - aufs none rw,si=9b4a7645a126239c
-225 15 0:3547 / /var/lib/docker/aufs/mnt/98a0153119d0651c193d053d254f6e16a68345a141baa80c87ae487e9d33f290 rw,relatime - aufs none rw,si=9b4a7640787cf39c
-226 15 0:3548 / /var/lib/docker/aufs/mnt/99daf7fe5847c017392f6e59aa9706b3dfdd9e6d1ba11dae0f7fffde0a60b5e5 rw,relatime - aufs none rw,si=9b4a7640787c839c
-227 15 0:3549 / /var/lib/docker/aufs/mnt/9ad1f2fe8a5599d4e10c5a6effa7f03d932d4e92ee13149031a372087a359079 rw,relatime - aufs none rw,si=9b4a7640787ca39c
-228 15 0:3550 / /var/lib/docker/aufs/mnt/c26d64494da782ddac26f8370d86ac93e7c1666d88a7b99110fc86b35ea6a85d rw,relatime - aufs none rw,si=9b4a7642fc6b539c
-229 15 0:3551 / /var/lib/docker/aufs/mnt/a49e4a8275133c230ec640997f35f172312eb0ea5bd2bbe10abf34aae98f30eb rw,relatime - aufs none rw,si=9b4a7642fc6b639c
-230 15 0:3552 / /var/lib/docker/aufs/mnt/b5e2740c867ed843025f49d84e8d769de9e8e6039b3c8cb0735b5bf358994bc7 rw,relatime - aufs none rw,si=9b4a7642fc6b039c
-231 15 0:3553 / /var/lib/docker/aufs/mnt/a826fdcf3a7039b30570054579b65763db605a314275d7aef31b872c13311b4b rw,relatime - aufs none rw,si=9b4a7642fc6b239c
-232 15 0:3554 / /var/lib/docker/aufs/mnt/addf3025babf5e43b5a3f4a0da7ad863dda3c01fb8365c58fd8d28bb61dc11bc rw,relatime - aufs none rw,si=9b4a76407871d39c
-233 15 0:3555 / /var/lib/docker/aufs/mnt/c5b6c6813ab3e5ebdc6d22cb2a3d3106a62095f2c298be52b07a3b0fa20ff690 rw,relatime - aufs none rw,si=9b4a76407871e39c
-234 15 0:3556 / /var/lib/docker/aufs/mnt/af0609eaaf64e2392060cb46f5a9f3d681a219bb4c651d4f015bf573fbe6c4cf rw,relatime - aufs none rw,si=9b4a76407871839c
-235 15 0:3557 / /var/lib/docker/aufs/mnt/e7f20e3c37ecad39cd90a97cd3549466d0d106ce4f0a930b8495442634fa4a1f rw,relatime - aufs none rw,si=9b4a76407871a39c
-237 15 0:3559 / /var/lib/docker/aufs/mnt/b57a53d440ffd0c1295804fa68cdde35d2fed5409484627e71b9c37e4249fd5c rw,relatime - aufs none rw,si=9b4a76444445a39c
-238 15 0:3560 / /var/lib/docker/aufs/mnt/b5e7d7b8f35e47efbba3d80c5d722f5e7bd43e54c824e54b4a4b351714d36d42 rw,relatime - aufs none rw,si=9b4a7647932d439c
-239 15 0:3561 / /var/lib/docker/aufs/mnt/f1b136def157e9465640658f277f3347de593c6ae76412a2e79f7002f091cae2 rw,relatime - aufs none rw,si=9b4a76445abcd39c
-240 15 0:3562 / /var/lib/docker/aufs/mnt/b750fe79269d2ec9a3c593ef05b4332b1d1a02a62b4accb2c21d589ff2f5f2dc rw,relatime - aufs none rw,si=9b4a7644403b339c
-241 15 0:3563 / /var/lib/docker/aufs/mnt/b89b140cdbc95063761864e0a23346207fa27ee4c5c63a1ae85c9069a9d9cf1d rw,relatime - aufs none rw,si=9b4a7644aa19739c
-242 15 0:3564 / /var/lib/docker/aufs/mnt/bc6a69ed51c07f5228f6b4f161c892e6a949c0e7e86a9c3432049d4c0e5cd298 rw,relatime - aufs none rw,si=9b4a7644aa19139c
-243 15 0:3565 / /var/lib/docker/aufs/mnt/be4e2ba3f136933e239f7cf3d136f484fb9004f1fbdfee24a62a2c7b0ab30670 rw,relatime - aufs none rw,si=9b4a7644aa19339c
-244 15 0:3566 / /var/lib/docker/aufs/mnt/e04ca1a4a5171e30d20f0c92f90a50b8b6f8600af5459c4b4fb25e42e864dfe1 rw,relatime - aufs none rw,si=9b4a7647932d139c
-245 15 0:3567 / /var/lib/docker/aufs/mnt/be61576b31db893129aaffcd3dcb5ce35e49c4b71b30c392a78609a45c7323d8 rw,relatime - aufs none rw,si=9b4a7642d85f739c
-246 15 0:3568 / /var/lib/docker/aufs/mnt/dda42c191e56becf672327658ab84fcb563322db3764b91c2fefe4aaef04c624 rw,relatime - aufs none rw,si=9b4a7642d85f139c
-247 15 0:3569 / /var/lib/docker/aufs/mnt/c0a7995053330f3d88969247a2e72b07e2dd692133f5668a4a35ea3905561072 rw,relatime - aufs none rw,si=9b4a7642d85f339c
-249 15 0:3571 / /var/lib/docker/aufs/mnt/c3594b2e5f08c59ff5ed338a1ba1eceeeb1f7fc5d180068338110c00b1eb8502 rw,relatime - aufs none rw,si=9b4a7642738c739c
-250 15 0:3572 / /var/lib/docker/aufs/mnt/c58dce03a0ab0a7588393880379dc3bce9f96ec08ed3f99cf1555260ff0031e8 rw,relatime - aufs none rw,si=9b4a7642738c139c
-251 15 0:3573 / /var/lib/docker/aufs/mnt/c73e9f1d109c9d14cb36e1c7489df85649be3911116d76c2fd3648ec8fd94e23 rw,relatime - aufs none rw,si=9b4a7642738c339c
-252 15 0:3574 / /var/lib/docker/aufs/mnt/c9eef28c344877cd68aa09e543c0710ab2b305a0ff96dbb859bfa7808c3e8d01 rw,relatime - aufs none rw,si=9b4a7642d85f439c
-253 15 0:3575 / /var/lib/docker/aufs/mnt/feb67148f548d70cb7484f2aaad2a86051cd6867a561741a2f13b552457d666e rw,relatime - aufs none rw,si=9b4a76468c55739c
-254 15 0:3576 / /var/lib/docker/aufs/mnt/cdf1f96c36d35a96041a896bf398ec0f7dc3b0fb0643612a0f4b6ff96e04e1bb rw,relatime - aufs none rw,si=9b4a76468c55139c
-255 15 0:3577 / /var/lib/docker/aufs/mnt/ec6e505872353268451ac4bc034c1df00f3bae4a3ea2261c6e48f7bd5417c1b3 rw,relatime - aufs none rw,si=9b4a76468c55339c
-256 15 0:3578 / /var/lib/docker/aufs/mnt/d6dc8aca64efd90e0bc10274001882d0efb310d42ccbf5712b99b169053b8b1a rw,relatime - aufs none rw,si=9b4a7642738c439c
-257 15 0:3579 / /var/lib/docker/aufs/mnt/d712594e2ff6eaeb895bfd150d694bd1305fb927e7a186b2dab7df2ea95f8f81 rw,relatime - aufs none rw,si=9b4a76401268f39c
-259 15 0:3581 / /var/lib/docker/aufs/mnt/dbfa1174cd78cde2d7410eae442af0b416c4a0e6f87ed4ff1e9f169a0029abc0 rw,relatime - aufs none rw,si=9b4a76401268b39c
-260 15 0:3582 / /var/lib/docker/aufs/mnt/e883f5a82316d7856fbe93ee8c0af5a920b7079619dd95c4ffd88bbd309d28dd rw,relatime - aufs none rw,si=9b4a76468c55439c
-261 15 0:3583 / /var/lib/docker/aufs/mnt/fdec3eff581c4fc2b09f87befa2fa021f3f2d373bea636a87f1fb5b367d6347a rw,relatime - aufs none rw,si=9b4a7644aa1af39c
-262 15 0:3584 / /var/lib/docker/aufs/mnt/ef764e26712184653067ecf7afea18a80854c41331ca0f0ef03e1bacf90a6ffc rw,relatime - aufs none rw,si=9b4a7644aa1a939c
-263 15 0:3585 / /var/lib/docker/aufs/mnt/f3176b40c41fce8ce6942936359a2001a6f1b5c1bb40ee224186db0789ec2f76 rw,relatime - aufs none rw,si=9b4a7644aa1ab39c
-264 15 0:3586 / /var/lib/docker/aufs/mnt/f5daf06785d3565c6dd18ea7d953d9a8b9606107781e63270fe0514508736e6a rw,relatime - aufs none rw,si=9b4a76401268c39c
-58 15 0:3587 / /var/lib/docker/aufs/mnt/cde8c40f6524b7361af4f5ad05bb857dc9ee247c20852ba666195c0739e3a2b8-init rw,relatime - aufs none rw,si=9b4a76444445839c
-67 15 0:3588 / /var/lib/docker/aufs/mnt/cde8c40f6524b7361af4f5ad05bb857dc9ee247c20852ba666195c0739e3a2b8 rw,relatime - aufs none rw,si=9b4a7644badd339c
-265 15 0:3610 / /var/lib/docker/aufs/mnt/e812472cd2c8c4748d1ef71fac4e77e50d661b9349abe66ce3e23511ed44f414 rw,relatime - aufs none rw,si=9b4a76427937d39c
-270 15 0:3615 / /var/lib/docker/aufs/mnt/997636e7c5c9d0d1376a217e295c14c205350b62bc12052804fb5f90abe6f183 rw,relatime - aufs none rw,si=9b4a76406540739c
-273 15 0:3618 / /var/lib/docker/aufs/mnt/d5794d080417b6e52e69227c3873e0e4c1ff0d5a845ebe3860ec2f89a47a2a1e rw,relatime - aufs none rw,si=9b4a76454814039c
-278 15 0:3623 / /var/lib/docker/aufs/mnt/586bdd48baced671bb19bc4d294ec325f26c55545ae267db426424f157d59c48 rw,relatime - aufs none rw,si=9b4a7644b439f39c
-281 15 0:3626 / /var/lib/docker/aufs/mnt/69739d022f89f8586908bbd5edbbdd95ea5256356f177f9ffcc6ef9c0ea752d2 rw,relatime - aufs none rw,si=9b4a7644a0f1b39c
-286 15 0:3631 / /var/lib/docker/aufs/mnt/ff28c27d5f894363993622de26d5dd352dba072f219e4691d6498c19bbbc15a9 rw,relatime - aufs none rw,si=9b4a7642265b339c
-289 15 0:3634 / /var/lib/docker/aufs/mnt/aa128fe0e64fdede333aa48fd9de39530c91a9244a0f0649a3c411c61e372daa rw,relatime - aufs none rw,si=9b4a764012ada39c
-99 15 8:33 / /media/REMOVE\040ME rw,nosuid,nodev,relatime - fuseblk /dev/sdc1 rw,user_id=0,group_id=0,allow_other,blksize=4096`
-)
-
-func TestParseFedoraMountinfo(t *testing.T) {
-	r := bytes.NewBuffer([]byte(fedoraMountinfo))
-	_, err := parseInfoFile(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseUbuntuMountinfo(t *testing.T) {
-	r := bytes.NewBuffer([]byte(ubuntuMountInfo))
-	_, err := parseInfoFile(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseGentooMountinfo(t *testing.T) {
-	r := bytes.NewBuffer([]byte(gentooMountinfo))
-	_, err := parseInfoFile(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseFedoraMountinfoFields(t *testing.T) {
-	r := bytes.NewBuffer([]byte(fedoraMountinfo))
-	infos, err := parseInfoFile(r)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expectedLength := 58
-	if len(infos) != expectedLength {
-		t.Fatalf("Expected %d entries, got %d", expectedLength, len(infos))
-	}
-	mi := Info{
-		ID:         15,
-		Parent:     35,
-		Major:      0,
-		Minor:      3,
-		Root:       "/",
-		Mountpoint: "/proc",
-		Opts:       "rw,nosuid,nodev,noexec,relatime",
-		Optional:   "shared:5",
-		Fstype:     "proc",
-		Source:     "proc",
-		VfsOpts:    "rw",
-	}
-
-	if *infos[0] != mi {
-		t.Fatalf("expected %#v, got %#v", mi, infos[0])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_solaris.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_solaris.go
deleted file mode 100644
index ad9ab57f8b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_solaris.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build solaris,cgo
-
-package mount
-
-/*
-#include <stdio.h>
-#include <sys/mnttab.h>
-*/
-import "C"
-
-import (
-	"fmt"
-)
-
-func parseMountTable() ([]*Info, error) {
-	mnttab := C.fopen(C.CString(C.MNTTAB), C.CString("r"))
-	if mnttab == nil {
-		return nil, fmt.Errorf("Failed to open %s", C.MNTTAB)
-	}
-
-	var out []*Info
-	var mp C.struct_mnttab
-
-	ret := C.getmntent(mnttab, &mp)
-	for ret == 0 {
-		var mountinfo Info
-		mountinfo.Mountpoint = C.GoString(mp.mnt_mountp)
-		mountinfo.Source = C.GoString(mp.mnt_special)
-		mountinfo.Fstype = C.GoString(mp.mnt_fstype)
-		mountinfo.Opts = C.GoString(mp.mnt_mntopts)
-		out = append(out, &mountinfo)
-		ret = C.getmntent(mnttab, &mp)
-	}
-
-	C.fclose(mnttab)
-	return out, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
deleted file mode 100644
index 7fbcf19214..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !windows,!linux,!freebsd,!solaris freebsd,!cgo solaris,!cgo
-
-package mount
-
-import (
-	"fmt"
-	"runtime"
-)
-
-func parseMountTable() ([]*Info, error) {
-	return nil, fmt.Errorf("mount.parseMountTable is not implemented on %s/%s", runtime.GOOS, runtime.GOARCH)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_windows.go b/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_windows.go
deleted file mode 100644
index dab8a37ed0..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/mountinfo_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package mount
-
-func parseMountTable() ([]*Info, error) {
-	// Do NOT return an error!
-	return nil, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go b/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
deleted file mode 100644
index 8ceec84bc6..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// +build linux
-
-package mount
-
-// MakeShared ensures a mounted filesystem has the SHARED mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeShared(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "shared")
-}
-
-// MakeRShared ensures a mounted filesystem has the RSHARED mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeRShared(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rshared")
-}
-
-// MakePrivate ensures a mounted filesystem has the PRIVATE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakePrivate(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "private")
-}
-
-// MakeRPrivate ensures a mounted filesystem has the RPRIVATE mount option
-// enabled. See the supported options in flags.go for further reference.
-func MakeRPrivate(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rprivate")
-}
-
-// MakeSlave ensures a mounted filesystem has the SLAVE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeSlave(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "slave")
-}
-
-// MakeRSlave ensures a mounted filesystem has the RSLAVE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeRSlave(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rslave")
-}
-
-// MakeUnbindable ensures a mounted filesystem has the UNBINDABLE mount option
-// enabled. See the supported options in flags.go for further reference.
-func MakeUnbindable(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "unbindable")
-}
-
-// MakeRUnbindable ensures a mounted filesystem has the RUNBINDABLE mount
-// option enabled. See the supported options in flags.go for further reference.
-func MakeRUnbindable(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "runbindable")
-}
-
-func ensureMountedAs(mountPoint, options string) error {
-	mounted, err := Mounted(mountPoint)
-	if err != nil {
-		return err
-	}
-
-	if !mounted {
-		if err := Mount(mountPoint, mountPoint, "none", "bind,rw"); err != nil {
-			return err
-		}
-	}
-	if _, err = Mounted(mountPoint); err != nil {
-		return err
-	}
-
-	return ForceMount("", mountPoint, "none", options)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go
deleted file mode 100644
index c1837942e3..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_linux_test.go
+++ /dev/null
@@ -1,331 +0,0 @@
-// +build linux
-
-package mount
-
-import (
-	"os"
-	"path"
-	"syscall"
-	"testing"
-)
-
-// nothing is propagated in or out
-func TestSubtreePrivate(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir   = path.Join(tmp, "source")
-		targetDir   = path.Join(tmp, "target")
-		outside1Dir = path.Join(tmp, "outside1")
-		outside2Dir = path.Join(tmp, "outside2")
-
-		outside1Path      = path.Join(outside1Dir, "file.txt")
-		outside2Path      = path.Join(outside2Dir, "file.txt")
-		outside1CheckPath = path.Join(targetDir, "a", "file.txt")
-		outside2CheckPath = path.Join(sourceDir, "b", "file.txt")
-	)
-	if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(targetDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(outside1Dir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(outside2Dir, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := createFile(outside1Path); err != nil {
-		t.Fatal(err)
-	}
-	if err := createFile(outside2Path); err != nil {
-		t.Fatal(err)
-	}
-
-	// mount the shared directory to a target
-	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// next, make the target private
-	if err := MakePrivate(targetDir); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// mount in an outside path to a mounted path inside the _source_
-	if err := Mount(outside1Dir, path.Join(sourceDir, "a"), "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(path.Join(sourceDir, "a")); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// check that this file _does_not_ show in the _target_
-	if _, err := os.Stat(outside1CheckPath); err != nil && !os.IsNotExist(err) {
-		t.Fatal(err)
-	} else if err == nil {
-		t.Fatalf("%q should not be visible, but is", outside1CheckPath)
-	}
-
-	// next mount outside2Dir into the _target_
-	if err := Mount(outside2Dir, path.Join(targetDir, "b"), "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(path.Join(targetDir, "b")); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// check that this file _does_not_ show in the _source_
-	if _, err := os.Stat(outside2CheckPath); err != nil && !os.IsNotExist(err) {
-		t.Fatal(err)
-	} else if err == nil {
-		t.Fatalf("%q should not be visible, but is", outside2CheckPath)
-	}
-}
-
-// Testing that when a target is a shared mount,
-// then child mounts propagate to the source
-func TestSubtreeShared(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir  = path.Join(tmp, "source")
-		targetDir  = path.Join(tmp, "target")
-		outsideDir = path.Join(tmp, "outside")
-
-		outsidePath     = path.Join(outsideDir, "file.txt")
-		sourceCheckPath = path.Join(sourceDir, "a", "file.txt")
-	)
-
-	if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(targetDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(outsideDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := createFile(outsidePath); err != nil {
-		t.Fatal(err)
-	}
-
-	// mount the source as shared
-	if err := MakeShared(sourceDir); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(sourceDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// mount the shared directory to a target
-	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// mount in an outside path to a mounted path inside the target
-	if err := Mount(outsideDir, path.Join(targetDir, "a"), "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(path.Join(targetDir, "a")); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// NOW, check that the file from the outside directory is available in the source directory
-	if _, err := os.Stat(sourceCheckPath); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// testing that mounts to a shared source show up in the slave target,
-// and that mounts into a slave target do _not_ show up in the shared source
-func TestSubtreeSharedSlave(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir   = path.Join(tmp, "source")
-		targetDir   = path.Join(tmp, "target")
-		outside1Dir = path.Join(tmp, "outside1")
-		outside2Dir = path.Join(tmp, "outside2")
-
-		outside1Path      = path.Join(outside1Dir, "file.txt")
-		outside2Path      = path.Join(outside2Dir, "file.txt")
-		outside1CheckPath = path.Join(targetDir, "a", "file.txt")
-		outside2CheckPath = path.Join(sourceDir, "b", "file.txt")
-	)
-	if err := os.MkdirAll(path.Join(sourceDir, "a"), 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(path.Join(sourceDir, "b"), 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(targetDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(outside1Dir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Mkdir(outside2Dir, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := createFile(outside1Path); err != nil {
-		t.Fatal(err)
-	}
-	if err := createFile(outside2Path); err != nil {
-		t.Fatal(err)
-	}
-
-	// mount the source as shared
-	if err := MakeShared(sourceDir); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(sourceDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// mount the shared directory to a target
-	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// next, make the target slave
-	if err := MakeSlave(targetDir); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// mount in an outside path to a mounted path inside the _source_
-	if err := Mount(outside1Dir, path.Join(sourceDir, "a"), "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(path.Join(sourceDir, "a")); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// check that this file _does_ show in the _target_
-	if _, err := os.Stat(outside1CheckPath); err != nil {
-		t.Fatal(err)
-	}
-
-	// next mount outside2Dir into the _target_
-	if err := Mount(outside2Dir, path.Join(targetDir, "b"), "none", "bind,rw"); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(path.Join(targetDir, "b")); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// check that this file _does_not_ show in the _source_
-	if _, err := os.Stat(outside2CheckPath); err != nil && !os.IsNotExist(err) {
-		t.Fatal(err)
-	} else if err == nil {
-		t.Fatalf("%q should not be visible, but is", outside2CheckPath)
-	}
-}
-
-func TestSubtreeUnbindable(t *testing.T) {
-	tmp := path.Join(os.TempDir(), "mount-tests")
-	if err := os.MkdirAll(tmp, 0777); err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmp)
-
-	var (
-		sourceDir = path.Join(tmp, "source")
-		targetDir = path.Join(tmp, "target")
-	)
-	if err := os.MkdirAll(sourceDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.MkdirAll(targetDir, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	// next, make the source unbindable
-	if err := MakeUnbindable(sourceDir); err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := Unmount(sourceDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	// then attempt to mount it to target. It should fail
-	if err := Mount(sourceDir, targetDir, "none", "bind,rw"); err != nil && err != syscall.EINVAL {
-		t.Fatal(err)
-	} else if err == nil {
-		t.Fatalf("%q should not have been bindable", sourceDir)
-	}
-	defer func() {
-		if err := Unmount(targetDir); err != nil {
-			t.Fatal(err)
-		}
-	}()
-}
-
-func createFile(path string) error {
-	f, err := os.Create(path)
-	if err != nil {
-		return err
-	}
-	f.WriteString("hello world!")
-	return f.Close()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_solaris.go b/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_solaris.go
deleted file mode 100644
index 09f6b03cbc..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/mount/sharedsubtree_solaris.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// +build solaris
-
-package mount
-
-// MakeShared ensures a mounted filesystem has the SHARED mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeShared(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "shared")
-}
-
-// MakeRShared ensures a mounted filesystem has the RSHARED mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeRShared(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rshared")
-}
-
-// MakePrivate ensures a mounted filesystem has the PRIVATE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakePrivate(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "private")
-}
-
-// MakeRPrivate ensures a mounted filesystem has the RPRIVATE mount option
-// enabled. See the supported options in flags.go for further reference.
-func MakeRPrivate(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rprivate")
-}
-
-// MakeSlave ensures a mounted filesystem has the SLAVE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeSlave(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "slave")
-}
-
-// MakeRSlave ensures a mounted filesystem has the RSLAVE mount option enabled.
-// See the supported options in flags.go for further reference.
-func MakeRSlave(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "rslave")
-}
-
-// MakeUnbindable ensures a mounted filesystem has the UNBINDABLE mount option
-// enabled. See the supported options in flags.go for further reference.
-func MakeUnbindable(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "unbindable")
-}
-
-// MakeRUnbindable ensures a mounted filesystem has the RUNBINDABLE mount
-// option enabled. See the supported options in flags.go for further reference.
-func MakeRUnbindable(mountPoint string) error {
-	return ensureMountedAs(mountPoint, "runbindable")
-}
-
-func ensureMountedAs(mountPoint, options string) error {
-	// TODO: Solaris does not support bind mounts.
-	// Evaluate lofs and also look at the relevant
-	// mount flags to be supported.
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/cmd/names-generator/main.go b/installer/vendor/github.com/docker/docker/pkg/namesgenerator/cmd/names-generator/main.go
deleted file mode 100644
index 18a939b70b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/cmd/names-generator/main.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/pkg/namesgenerator"
-)
-
-func main() {
-	fmt.Println(namesgenerator.GetRandomName(0))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go b/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go
deleted file mode 100644
index cfb8157d69..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator.go
+++ /dev/null
@@ -1,590 +0,0 @@
-package namesgenerator
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/pkg/random"
-)
-
-var (
-	left = [...]string{
-		"admiring",
-		"adoring",
-		"affectionate",
-		"agitated",
-		"amazing",
-		"angry",
-		"awesome",
-		"blissful",
-		"boring",
-		"brave",
-		"clever",
-		"cocky",
-		"compassionate",
-		"competent",
-		"condescending",
-		"confident",
-		"cranky",
-		"dazzling",
-		"determined",
-		"distracted",
-		"dreamy",
-		"eager",
-		"ecstatic",
-		"elastic",
-		"elated",
-		"elegant",
-		"eloquent",
-		"epic",
-		"fervent",
-		"festive",
-		"flamboyant",
-		"focused",
-		"friendly",
-		"frosty",
-		"gallant",
-		"gifted",
-		"goofy",
-		"gracious",
-		"happy",
-		"hardcore",
-		"heuristic",
-		"hopeful",
-		"hungry",
-		"infallible",
-		"inspiring",
-		"jolly",
-		"jovial",
-		"keen",
-		"kickass",
-		"kind",
-		"laughing",
-		"loving",
-		"lucid",
-		"mystifying",
-		"modest",
-		"musing",
-		"naughty",
-		"nervous",
-		"nifty",
-		"nostalgic",
-		"objective",
-		"optimistic",
-		"peaceful",
-		"pedantic",
-		"pensive",
-		"practical",
-		"priceless",
-		"quirky",
-		"quizzical",
-		"relaxed",
-		"reverent",
-		"romantic",
-		"sad",
-		"serene",
-		"sharp",
-		"silly",
-		"sleepy",
-		"stoic",
-		"stupefied",
-		"suspicious",
-		"tender",
-		"thirsty",
-		"trusting",
-		"unruffled",
-		"upbeat",
-		"vibrant",
-		"vigilant",
-		"wizardly",
-		"wonderful",
-		"xenodochial",
-		"youthful",
-		"zealous",
-		"zen",
-	}
-
-	// Docker, starting from 0.7.x, generates names from notable scientists and hackers.
-	// Please, for any amazing man that you add to the list, consider adding an equally amazing woman to it, and vice versa.
-	right = [...]string{
-		// Muhammad ibn Jābir al-Ḥarrānī al-Battānī was a founding father of astronomy. https://en.wikipedia.org/wiki/Mu%E1%B8%A5ammad_ibn_J%C4%81bir_al-%E1%B8%A4arr%C4%81n%C4%AB_al-Batt%C4%81n%C4%AB
-		"albattani",
-
-		// Frances E. Allen, became the first female IBM Fellow in 1989. In 2006, she became the first female recipient of the ACM's Turing Award. https://en.wikipedia.org/wiki/Frances_E._Allen
-		"allen",
-
-		// June Almeida - Scottish virologist who took the first pictures of the rubella virus - https://en.wikipedia.org/wiki/June_Almeida
-		"almeida",
-
-		// Maria Gaetana Agnesi - Italian mathematician, philosopher, theologian and humanitarian. She was the first woman to write a mathematics handbook and the first woman appointed as a Mathematics Professor at a University. https://en.wikipedia.org/wiki/Maria_Gaetana_Agnesi
-		"agnesi",
-
-		// Archimedes was a physicist, engineer and mathematician who invented too many things to list them here. https://en.wikipedia.org/wiki/Archimedes
-		"archimedes",
-
-		// Maria Ardinghelli - Italian translator, mathematician and physicist - https://en.wikipedia.org/wiki/Maria_Ardinghelli
-		"ardinghelli",
-
-		// Aryabhata - Ancient Indian mathematician-astronomer during 476-550 CE https://en.wikipedia.org/wiki/Aryabhata
-		"aryabhata",
-
-		// Wanda Austin - Wanda Austin is the President and CEO of The Aerospace Corporation, a leading architect for the US security space programs. https://en.wikipedia.org/wiki/Wanda_Austin
-		"austin",
-
-		// Charles Babbage invented the concept of a programmable computer. https://en.wikipedia.org/wiki/Charles_Babbage.
-		"babbage",
-
-		// Stefan Banach - Polish mathematician, was one of the founders of modern functional analysis. https://en.wikipedia.org/wiki/Stefan_Banach
-		"banach",
-
-		// John Bardeen co-invented the transistor - https://en.wikipedia.org/wiki/John_Bardeen
-		"bardeen",
-
-		// Jean Bartik, born Betty Jean Jennings, was one of the original programmers for the ENIAC computer. https://en.wikipedia.org/wiki/Jean_Bartik
-		"bartik",
-
-		// Laura Bassi, the world's first female professor https://en.wikipedia.org/wiki/Laura_Bassi
-		"bassi",
-
-		// Hugh Beaver, British engineer, founder of the Guinness Book of World Records https://en.wikipedia.org/wiki/Hugh_Beaver
-		"beaver",
-
-		// Alexander Graham Bell - an eminent Scottish-born scientist, inventor, engineer and innovator who is credited with inventing the first practical telephone - https://en.wikipedia.org/wiki/Alexander_Graham_Bell
-		"bell",
-
-		// Homi J Bhabha - was an Indian nuclear physicist, founding director, and professor of physics at the Tata Institute of Fundamental Research. Colloquially known as "father of Indian nuclear programme"- https://en.wikipedia.org/wiki/Homi_J._Bhabha
-		"bhabha",
-
-		// Bhaskara II - Ancient Indian mathematician-astronomer whose work on calculus predates Newton and Leibniz by over half a millennium - https://en.wikipedia.org/wiki/Bh%C4%81skara_II#Calculus
-		"bhaskara",
-
-		// Elizabeth Blackwell - American doctor and first American woman to receive a medical degree - https://en.wikipedia.org/wiki/Elizabeth_Blackwell
-		"blackwell",
-
-		// Niels Bohr is the father of quantum theory. https://en.wikipedia.org/wiki/Niels_Bohr.
-		"bohr",
-
-		// Kathleen Booth, she's credited with writing the first assembly language. https://en.wikipedia.org/wiki/Kathleen_Booth
-		"booth",
-
-		// Anita Borg - Anita Borg was the founding director of the Institute for Women and Technology (IWT). https://en.wikipedia.org/wiki/Anita_Borg
-		"borg",
-
-		// Satyendra Nath Bose - He provided the foundation for Bose–Einstein statistics and the theory of the Bose–Einstein condensate. - https://en.wikipedia.org/wiki/Satyendra_Nath_Bose
-		"bose",
-
-		// Evelyn Boyd Granville - She was one of the first African-American woman to receive a Ph.D. in mathematics; she earned it in 1949 from Yale University. https://en.wikipedia.org/wiki/Evelyn_Boyd_Granville
-		"boyd",
-
-		// Brahmagupta - Ancient Indian mathematician during 598-670 CE who gave rules to compute with zero - https://en.wikipedia.org/wiki/Brahmagupta#Zero
-		"brahmagupta",
-
-		// Walter Houser Brattain co-invented the transistor - https://en.wikipedia.org/wiki/Walter_Houser_Brattain
-		"brattain",
-
-		// Emmett Brown invented time travel. https://en.wikipedia.org/wiki/Emmett_Brown (thanks Brian Goff)
-		"brown",
-
-		// Rachel Carson - American marine biologist and conservationist, her book Silent Spring and other writings are credited with advancing the global environmental movement. https://en.wikipedia.org/wiki/Rachel_Carson
-		"carson",
-
-		// Subrahmanyan Chandrasekhar - Astrophysicist known for his mathematical theory on different stages and evolution in structures of the stars. He has won nobel prize for physics - https://en.wikipedia.org/wiki/Subrahmanyan_Chandrasekhar
-		"chandrasekhar",
-
-		//Claude Shannon - The father of information theory and founder of digital circuit design theory. (https://en.wikipedia.org/wiki/Claude_Shannon)
-		"shannon",
-
-		// Joan Clarke - Bletchley Park code breaker during the Second World War who pioneered techniques that remained top secret for decades. Also an accomplished numismatist https://en.wikipedia.org/wiki/Joan_Clarke
-		"clarke",
-
-		// Jane Colden - American botanist widely considered the first female American botanist - https://en.wikipedia.org/wiki/Jane_Colden
-		"colden",
-
-		// Gerty Theresa Cori - American biochemist who became the third woman—and first American woman—to win a Nobel Prize in science, and the first woman to be awarded the Nobel Prize in Physiology or Medicine. Cori was born in Prague. https://en.wikipedia.org/wiki/Gerty_Cori
-		"cori",
-
-		// Seymour Roger Cray was an American electrical engineer and supercomputer architect who designed a series of computers that were the fastest in the world for decades. https://en.wikipedia.org/wiki/Seymour_Cray
-		"cray",
-
-		// This entry reflects a husband and wife team who worked together:
-		// Joan Curran was a Welsh scientist who developed radar and invented chaff, a radar countermeasure. https://en.wikipedia.org/wiki/Joan_Curran
-		// Samuel Curran was an Irish physicist who worked alongside his wife during WWII and invented the proximity fuse. https://en.wikipedia.org/wiki/Samuel_Curran
-		"curran",
-
-		// Marie Curie discovered radioactivity. https://en.wikipedia.org/wiki/Marie_Curie.
-		"curie",
-
-		// Charles Darwin established the principles of natural evolution. https://en.wikipedia.org/wiki/Charles_Darwin.
-		"darwin",
-
-		// Leonardo Da Vinci invented too many things to list here. https://en.wikipedia.org/wiki/Leonardo_da_Vinci.
-		"davinci",
-
-		// Edsger Wybe Dijkstra was a Dutch computer scientist and mathematical scientist. https://en.wikipedia.org/wiki/Edsger_W._Dijkstra.
-		"dijkstra",
-
-		// Donna Dubinsky - played an integral role in the development of personal digital assistants (PDAs) serving as CEO of Palm, Inc. and co-founding Handspring. https://en.wikipedia.org/wiki/Donna_Dubinsky
-		"dubinsky",
-
-		// Annie Easley - She was a leading member of the team which developed software for the Centaur rocket stage and one of the first African-Americans in her field. https://en.wikipedia.org/wiki/Annie_Easley
-		"easley",
-
-		// Thomas Alva Edison, prolific inventor https://en.wikipedia.org/wiki/Thomas_Edison
-		"edison",
-
-		// Albert Einstein invented the general theory of relativity. https://en.wikipedia.org/wiki/Albert_Einstein
-		"einstein",
-
-		// Gertrude Elion - American biochemist, pharmacologist and the 1988 recipient of the Nobel Prize in Medicine - https://en.wikipedia.org/wiki/Gertrude_Elion
-		"elion",
-
-		// Douglas Engelbart gave the mother of all demos: https://en.wikipedia.org/wiki/Douglas_Engelbart
-		"engelbart",
-
-		// Euclid invented geometry. https://en.wikipedia.org/wiki/Euclid
-		"euclid",
-
-		// Leonhard Euler invented large parts of modern mathematics. https://de.wikipedia.org/wiki/Leonhard_Euler
-		"euler",
-
-		// Pierre de Fermat pioneered several aspects of modern mathematics. https://en.wikipedia.org/wiki/Pierre_de_Fermat
-		"fermat",
-
-		// Enrico Fermi invented the first nuclear reactor. https://en.wikipedia.org/wiki/Enrico_Fermi.
-		"fermi",
-
-		// Richard Feynman was a key contributor to quantum mechanics and particle physics. https://en.wikipedia.org/wiki/Richard_Feynman
-		"feynman",
-
-		// Benjamin Franklin is famous for his experiments in electricity and the invention of the lightning rod.
-		"franklin",
-
-		// Galileo was a founding father of modern astronomy, and faced politics and obscurantism to establish scientific truth.  https://en.wikipedia.org/wiki/Galileo_Galilei
-		"galileo",
-
-		// William Henry "Bill" Gates III is an American business magnate, philanthropist, investor, computer programmer, and inventor. https://en.wikipedia.org/wiki/Bill_Gates
-		"gates",
-
-		// Adele Goldberg, was one of the designers and developers of the Smalltalk language. https://en.wikipedia.org/wiki/Adele_Goldberg_(computer_scientist)
-		"goldberg",
-
-		// Adele Goldstine, born Adele Katz, wrote the complete technical description for the first electronic digital computer, ENIAC. https://en.wikipedia.org/wiki/Adele_Goldstine
-		"goldstine",
-
-		// Shafi Goldwasser is a computer scientist known for creating theoretical foundations of modern cryptography. Winner of 2012 ACM Turing Award. https://en.wikipedia.org/wiki/Shafi_Goldwasser
-		"goldwasser",
-
-		// James Golick, all around gangster.
-		"golick",
-
-		// Jane Goodall - British primatologist, ethologist, and anthropologist who is considered to be the world's foremost expert on chimpanzees - https://en.wikipedia.org/wiki/Jane_Goodall
-		"goodall",
-
-		// Lois Haibt - American computer scientist, part of the team at IBM that developed FORTRAN - https://en.wikipedia.org/wiki/Lois_Haibt
-		"haibt",
-
-		// Margaret Hamilton - Director of the Software Engineering Division of the MIT Instrumentation Laboratory, which developed on-board flight software for the Apollo space program. https://en.wikipedia.org/wiki/Margaret_Hamilton_(scientist)
-		"hamilton",
-
-		// Stephen Hawking pioneered the field of cosmology by combining general relativity and quantum mechanics. https://en.wikipedia.org/wiki/Stephen_Hawking
-		"hawking",
-
-		// Werner Heisenberg was a founding father of quantum mechanics. https://en.wikipedia.org/wiki/Werner_Heisenberg
-		"heisenberg",
-
-		// Jaroslav Heyrovský was the inventor of the polarographic method, father of the electroanalytical method, and recipient of the Nobel Prize in 1959. His main field of work was polarography. https://en.wikipedia.org/wiki/Jaroslav_Heyrovsk%C3%BD
-		"heyrovsky",
-
-		// Dorothy Hodgkin was a British biochemist, credited with the development of protein crystallography. She was awarded the Nobel Prize in Chemistry in 1964. https://en.wikipedia.org/wiki/Dorothy_Hodgkin
-		"hodgkin",
-
-		// Erna Schneider Hoover revolutionized modern communication by inventing a computerized telephone switching method. https://en.wikipedia.org/wiki/Erna_Schneider_Hoover
-		"hoover",
-
-		// Grace Hopper developed the first compiler for a computer programming language and  is credited with popularizing the term "debugging" for fixing computer glitches. https://en.wikipedia.org/wiki/Grace_Hopper
-		"hopper",
-
-		// Frances Hugle, she was an American scientist, engineer, and inventor who contributed to the understanding of semiconductors, integrated circuitry, and the unique electrical principles of microscopic materials. https://en.wikipedia.org/wiki/Frances_Hugle
-		"hugle",
-
-		// Hypatia - Greek Alexandrine Neoplatonist philosopher in Egypt who was one of the earliest mothers of mathematics - https://en.wikipedia.org/wiki/Hypatia
-		"hypatia",
-
-		// Yeong-Sil Jang was a Korean scientist and astronomer during the Joseon Dynasty; he invented the first metal printing press and water gauge. https://en.wikipedia.org/wiki/Jang_Yeong-sil
-		"jang",
-
-		// Betty Jennings - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Jean_Bartik
-		"jennings",
-
-		// Mary Lou Jepsen, was the founder and chief technology officer of One Laptop Per Child (OLPC), and the founder of Pixel Qi. https://en.wikipedia.org/wiki/Mary_Lou_Jepsen
-		"jepsen",
-
-		// Irène Joliot-Curie - French scientist who was awarded the Nobel Prize for Chemistry in 1935. Daughter of Marie and Pierre Curie. https://en.wikipedia.org/wiki/Ir%C3%A8ne_Joliot-Curie
-		"joliot",
-
-		// Karen Spärck Jones came up with the concept of inverse document frequency, which is used in most search engines today. https://en.wikipedia.org/wiki/Karen_Sp%C3%A4rck_Jones
-		"jones",
-
-		// A. P. J. Abdul Kalam - is an Indian scientist aka Missile Man of India for his work on the development of ballistic missile and launch vehicle technology - https://en.wikipedia.org/wiki/A._P._J._Abdul_Kalam
-		"kalam",
-
-		// Susan Kare, created the icons and many of the interface elements for the original Apple Macintosh in the 1980s, and was an original employee of NeXT, working as the Creative Director. https://en.wikipedia.org/wiki/Susan_Kare
-		"kare",
-
-		// Mary Kenneth Keller, Sister Mary Kenneth Keller became the first American woman to earn a PhD in Computer Science in 1965. https://en.wikipedia.org/wiki/Mary_Kenneth_Keller
-		"keller",
-
-		// Har Gobind Khorana - Indian-American biochemist who shared the 1968 Nobel Prize for Physiology - https://en.wikipedia.org/wiki/Har_Gobind_Khorana
-		"khorana",
-
-		// Jack Kilby invented silicone integrated circuits and gave Silicon Valley its name. - https://en.wikipedia.org/wiki/Jack_Kilby
-		"kilby",
-
-		// Maria Kirch - German astronomer and first woman to discover a comet - https://en.wikipedia.org/wiki/Maria_Margarethe_Kirch
-		"kirch",
-
-		// Donald Knuth - American computer scientist, author of "The Art of Computer Programming" and creator of the TeX typesetting system. https://en.wikipedia.org/wiki/Donald_Knuth
-		"knuth",
-
-		// Sophie Kowalevski - Russian mathematician responsible for important original contributions to analysis, differential equations and mechanics - https://en.wikipedia.org/wiki/Sofia_Kovalevskaya
-		"kowalevski",
-
-		// Marie-Jeanne de Lalande - French astronomer, mathematician and cataloguer of stars - https://en.wikipedia.org/wiki/Marie-Jeanne_de_Lalande
-		"lalande",
-
-		// Hedy Lamarr - Actress and inventor. The principles of her work are now incorporated into modern Wi-Fi, CDMA and Bluetooth technology. https://en.wikipedia.org/wiki/Hedy_Lamarr
-		"lamarr",
-
-		// Leslie B. Lamport - American computer scientist. Lamport is best known for his seminal work in distributed systems and was the winner of the 2013 Turing Award. https://en.wikipedia.org/wiki/Leslie_Lamport
-		"lamport",
-
-		// Mary Leakey - British paleoanthropologist who discovered the first fossilized Proconsul skull - https://en.wikipedia.org/wiki/Mary_Leakey
-		"leakey",
-
-		// Henrietta Swan Leavitt - she was an American astronomer who discovered the relation between the luminosity and the period of Cepheid variable stars. https://en.wikipedia.org/wiki/Henrietta_Swan_Leavitt
-		"leavitt",
-
-		//Daniel Lewin -  Mathematician, Akamai co-founder, soldier, 9/11 victim-- Developed optimization techniques for routing traffic on the internet. Died attempting to stop the 9-11 hijackers. https://en.wikipedia.org/wiki/Daniel_Lewin
-		"lewin",
-
-		// Ruth Lichterman - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Ruth_Teitelbaum
-		"lichterman",
-
-		// Barbara Liskov - co-developed the Liskov substitution principle. Liskov was also the winner of the Turing Prize in 2008. - https://en.wikipedia.org/wiki/Barbara_Liskov
-		"liskov",
-
-		// Ada Lovelace invented the first algorithm. https://en.wikipedia.org/wiki/Ada_Lovelace (thanks James Turnbull)
-		"lovelace",
-
-		// Auguste and Louis Lumière - the first filmmakers in history - https://en.wikipedia.org/wiki/Auguste_and_Louis_Lumi%C3%A8re
-		"lumiere",
-
-		// Mahavira - Ancient Indian mathematician during 9th century AD who discovered basic algebraic identities - https://en.wikipedia.org/wiki/Mah%C4%81v%C4%ABra_(mathematician)
-		"mahavira",
-
-		// Maria Mayer - American theoretical physicist and Nobel laureate in Physics for proposing the nuclear shell model of the atomic nucleus - https://en.wikipedia.org/wiki/Maria_Mayer
-		"mayer",
-
-		// John McCarthy invented LISP: https://en.wikipedia.org/wiki/John_McCarthy_(computer_scientist)
-		"mccarthy",
-
-		// Barbara McClintock - a distinguished American cytogeneticist, 1983 Nobel Laureate in Physiology or Medicine for discovering transposons. https://en.wikipedia.org/wiki/Barbara_McClintock
-		"mcclintock",
-
-		// Malcolm McLean invented the modern shipping container: https://en.wikipedia.org/wiki/Malcom_McLean
-		"mclean",
-
-		// Kay McNulty - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Kathleen_Antonelli
-		"mcnulty",
-
-		// Lise Meitner - Austrian/Swedish physicist who was involved in the discovery of nuclear fission. The element meitnerium is named after her - https://en.wikipedia.org/wiki/Lise_Meitner
-		"meitner",
-
-		// Carla Meninsky, was the game designer and programmer for Atari 2600 games Dodge 'Em and Warlords. https://en.wikipedia.org/wiki/Carla_Meninsky
-		"meninsky",
-
-		// Johanna Mestorf - German prehistoric archaeologist and first female museum director in Germany - https://en.wikipedia.org/wiki/Johanna_Mestorf
-		"mestorf",
-
-		// Marvin Minsky - Pioneer in Artificial Intelligence, co-founder of the MIT's AI Lab, won the Turing Award in 1969. https://en.wikipedia.org/wiki/Marvin_Minsky
-		"minsky",
-
-		// Maryam Mirzakhani - an Iranian mathematician and the first woman to win the Fields Medal. https://en.wikipedia.org/wiki/Maryam_Mirzakhani
-		"mirzakhani",
-
-		// Samuel Morse - contributed to the invention of a single-wire telegraph system based on European telegraphs and was a co-developer of the Morse code - https://en.wikipedia.org/wiki/Samuel_Morse
-		"morse",
-
-		// Ian Murdock - founder of the Debian project - https://en.wikipedia.org/wiki/Ian_Murdock
-		"murdock",
-
-		// Isaac Newton invented classic mechanics and modern optics. https://en.wikipedia.org/wiki/Isaac_Newton
-		"newton",
-
-		// Florence Nightingale, more prominently known as a nurse, was also the first female member of the Royal Statistical Society and a pioneer in statistical graphics https://en.wikipedia.org/wiki/Florence_Nightingale#Statistics_and_sanitary_reform
-		"nightingale",
-
-		// Alfred Nobel - a Swedish chemist, engineer, innovator, and armaments manufacturer (inventor of dynamite) - https://en.wikipedia.org/wiki/Alfred_Nobel
-		"nobel",
-
-		// Emmy Noether, German mathematician. Noether's Theorem is named after her. https://en.wikipedia.org/wiki/Emmy_Noether
-		"noether",
-
-		// Poppy Northcutt. Poppy Northcutt was the first woman to work as part of NASA’s Mission Control. http://www.businessinsider.com/poppy-northcutt-helped-apollo-astronauts-2014-12?op=1
-		"northcutt",
-
-		// Robert Noyce invented silicone integrated circuits and gave Silicon Valley its name. - https://en.wikipedia.org/wiki/Robert_Noyce
-		"noyce",
-
-		// Panini - Ancient Indian linguist and grammarian from 4th century CE who worked on the world's first formal system - https://en.wikipedia.org/wiki/P%C4%81%E1%B9%87ini#Comparison_with_modern_formal_systems
-		"panini",
-
-		// Ambroise Pare invented modern surgery. https://en.wikipedia.org/wiki/Ambroise_Par%C3%A9
-		"pare",
-
-		// Louis Pasteur discovered vaccination, fermentation and pasteurization. https://en.wikipedia.org/wiki/Louis_Pasteur.
-		"pasteur",
-
-		// Cecilia Payne-Gaposchkin was an astronomer and astrophysicist who, in 1925, proposed in her Ph.D. thesis an explanation for the composition of stars in terms of the relative abundances of hydrogen and helium. https://en.wikipedia.org/wiki/Cecilia_Payne-Gaposchkin
-		"payne",
-
-		// Radia Perlman is a software designer and network engineer and most famous for her invention of the spanning-tree protocol (STP). https://en.wikipedia.org/wiki/Radia_Perlman
-		"perlman",
-
-		// Rob Pike was a key contributor to Unix, Plan 9, the X graphic system, utf-8, and the Go programming language. https://en.wikipedia.org/wiki/Rob_Pike
-		"pike",
-
-		// Henri Poincaré made fundamental contributions in several fields of mathematics. https://en.wikipedia.org/wiki/Henri_Poincar%C3%A9
-		"poincare",
-
-		// Laura Poitras is a director and producer whose work, made possible by open source crypto tools, advances the causes of truth and freedom of information by reporting disclosures by whistleblowers such as Edward Snowden. https://en.wikipedia.org/wiki/Laura_Poitras
-		"poitras",
-
-		// Claudius Ptolemy - a Greco-Egyptian writer of Alexandria, known as a mathematician, astronomer, geographer, astrologer, and poet of a single epigram in the Greek Anthology - https://en.wikipedia.org/wiki/Ptolemy
-		"ptolemy",
-
-		// C. V. Raman - Indian physicist who won the Nobel Prize in 1930 for proposing the Raman effect. - https://en.wikipedia.org/wiki/C._V._Raman
-		"raman",
-
-		// Srinivasa Ramanujan - Indian mathematician and autodidact who made extraordinary contributions to mathematical analysis, number theory, infinite series, and continued fractions. - https://en.wikipedia.org/wiki/Srinivasa_Ramanujan
-		"ramanujan",
-
-		// Sally Kristen Ride was an American physicist and astronaut. She was the first American woman in space, and the youngest American astronaut. https://en.wikipedia.org/wiki/Sally_Ride
-		"ride",
-
-		// Rita Levi-Montalcini - Won Nobel Prize in Physiology or Medicine jointly with colleague Stanley Cohen for the discovery of nerve growth factor (https://en.wikipedia.org/wiki/Rita_Levi-Montalcini)
-		"montalcini",
-
-		// Dennis Ritchie - co-creator of UNIX and the C programming language. - https://en.wikipedia.org/wiki/Dennis_Ritchie
-		"ritchie",
-
-		// Wilhelm Conrad Röntgen - German physicist who was awarded the first Nobel Prize in Physics in 1901 for the discovery of X-rays (Röntgen rays). https://en.wikipedia.org/wiki/Wilhelm_R%C3%B6ntgen
-		"roentgen",
-
-		// Rosalind Franklin - British biophysicist and X-ray crystallographer whose research was critical to the understanding of DNA - https://en.wikipedia.org/wiki/Rosalind_Franklin
-		"rosalind",
-
-		// Meghnad Saha - Indian astrophysicist best known for his development of the Saha equation, used to describe chemical and physical conditions in stars - https://en.wikipedia.org/wiki/Meghnad_Saha
-		"saha",
-
-		// Jean E. Sammet developed FORMAC, the first widely used computer language for symbolic manipulation of mathematical formulas. https://en.wikipedia.org/wiki/Jean_E._Sammet
-		"sammet",
-
-		// Carol Shaw - Originally an Atari employee, Carol Shaw is said to be the first female video game designer. https://en.wikipedia.org/wiki/Carol_Shaw_(video_game_designer)
-		"shaw",
-
-		// Dame Stephanie "Steve" Shirley - Founded a software company in 1962 employing women working from home. https://en.wikipedia.org/wiki/Steve_Shirley
-		"shirley",
-
-		// William Shockley co-invented the transistor - https://en.wikipedia.org/wiki/William_Shockley
-		"shockley",
-
-		// Françoise Barré-Sinoussi - French virologist and Nobel Prize Laureate in Physiology or Medicine; her work was fundamental in identifying HIV as the cause of AIDS. https://en.wikipedia.org/wiki/Fran%C3%A7oise_Barr%C3%A9-Sinoussi
-		"sinoussi",
-
-		// Betty Snyder - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Betty_Holberton
-		"snyder",
-
-		// Frances Spence - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Frances_Spence
-		"spence",
-
-		// Richard Matthew Stallman - the founder of the Free Software movement, the GNU project, the Free Software Foundation, and the League for Programming Freedom. He also invented the concept of copyleft to protect the ideals of this movement, and enshrined this concept in the widely-used GPL (General Public License) for software. https://en.wikiquote.org/wiki/Richard_Stallman
-		"stallman",
-
-		// Michael Stonebraker is a database research pioneer and architect of Ingres, Postgres, VoltDB and SciDB. Winner of 2014 ACM Turing Award. https://en.wikipedia.org/wiki/Michael_Stonebraker
-		"stonebraker",
-
-		// Janese Swanson (with others) developed the first of the Carmen Sandiego games. She went on to found Girl Tech. https://en.wikipedia.org/wiki/Janese_Swanson
-		"swanson",
-
-		// Aaron Swartz was influential in creating RSS, Markdown, Creative Commons, Reddit, and much of the internet as we know it today. He was devoted to freedom of information on the web. https://en.wikiquote.org/wiki/Aaron_Swartz
-		"swartz",
-
-		// Bertha Swirles was a theoretical physicist who made a number of contributions to early quantum theory. https://en.wikipedia.org/wiki/Bertha_Swirles
-		"swirles",
-
-		// Nikola Tesla invented the AC electric system and every gadget ever used by a James Bond villain. https://en.wikipedia.org/wiki/Nikola_Tesla
-		"tesla",
-
-		// Ken Thompson - co-creator of UNIX and the C programming language - https://en.wikipedia.org/wiki/Ken_Thompson
-		"thompson",
-
-		// Linus Torvalds invented Linux and Git. https://en.wikipedia.org/wiki/Linus_Torvalds
-		"torvalds",
-
-		// Alan Turing was a founding father of computer science. https://en.wikipedia.org/wiki/Alan_Turing.
-		"turing",
-
-		// Varahamihira - Ancient Indian mathematician who discovered trigonometric formulae during 505-587 CE - https://en.wikipedia.org/wiki/Var%C4%81hamihira#Contributions
-		"varahamihira",
-
-		// Sir Mokshagundam Visvesvaraya - is a notable Indian engineer.  He is a recipient of the Indian Republic's highest honour, the Bharat Ratna, in 1955. On his birthday, 15 September is celebrated as Engineer's Day in India in his memory - https://en.wikipedia.org/wiki/Visvesvaraya
-		"visvesvaraya",
-
-		// Christiane Nüsslein-Volhard - German biologist, won Nobel Prize in Physiology or Medicine in 1995 for research on the genetic control of embryonic development. https://en.wikipedia.org/wiki/Christiane_N%C3%BCsslein-Volhard
-		"volhard",
-
-		// Marlyn Wescoff - one of the original programmers of the ENIAC. https://en.wikipedia.org/wiki/ENIAC - https://en.wikipedia.org/wiki/Marlyn_Meltzer
-		"wescoff",
-
-		// Andrew Wiles - Notable British mathematician who proved the enigmatic Fermat's Last Theorem - https://en.wikipedia.org/wiki/Andrew_Wiles
-		"wiles",
-
-		// Roberta Williams, did pioneering work in graphical adventure games for personal computers, particularly the King's Quest series. https://en.wikipedia.org/wiki/Roberta_Williams
-		"williams",
-
-		// Sophie Wilson designed the first Acorn Micro-Computer and the instruction set for ARM processors. https://en.wikipedia.org/wiki/Sophie_Wilson
-		"wilson",
-
-		// Jeannette Wing - co-developed the Liskov substitution principle. - https://en.wikipedia.org/wiki/Jeannette_Wing
-		"wing",
-
-		// Steve Wozniak invented the Apple I and Apple II. https://en.wikipedia.org/wiki/Steve_Wozniak
-		"wozniak",
-
-		// The Wright brothers, Orville and Wilbur - credited with inventing and building the world's first successful airplane and making the first controlled, powered and sustained heavier-than-air human flight - https://en.wikipedia.org/wiki/Wright_brothers
-		"wright",
-
-		// Rosalyn Sussman Yalow - Rosalyn Sussman Yalow was an American medical physicist, and a co-winner of the 1977 Nobel Prize in Physiology or Medicine for development of the radioimmunoassay technique. https://en.wikipedia.org/wiki/Rosalyn_Sussman_Yalow
-		"yalow",
-
-		// Ada Yonath - an Israeli crystallographer, the first woman from the Middle East to win a Nobel prize in the sciences. https://en.wikipedia.org/wiki/Ada_Yonath
-		"yonath",
-	}
-)
-
-// GetRandomName generates a random name from the list of adjectives and surnames in this package
-// formatted as "adjective_surname". For example 'focused_turing'. If retry is non-zero, a random
-// integer between 0 and 10 will be added to the end of the name, e.g `focused_turing3`
-func GetRandomName(retry int) string {
-	rnd := random.Rand
-begin:
-	name := fmt.Sprintf("%s_%s", left[rnd.Intn(len(left))], right[rnd.Intn(len(right))])
-	if name == "boring_wozniak" /* Steve Wozniak is not boring */ {
-		goto begin
-	}
-
-	if retry > 0 {
-		name = fmt.Sprintf("%s%d", name, rnd.Intn(10))
-	}
-	return name
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator_test.go b/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator_test.go
deleted file mode 100644
index d1a94977d7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/namesgenerator/names-generator_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package namesgenerator
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestNameFormat(t *testing.T) {
-	name := GetRandomName(0)
-	if !strings.Contains(name, "_") {
-		t.Fatalf("Generated name does not contain an underscore")
-	}
-	if strings.ContainsAny(name, "0123456789") {
-		t.Fatalf("Generated name contains numbers!")
-	}
-}
-
-func TestNameRetries(t *testing.T) {
-	name := GetRandomName(1)
-	if !strings.Contains(name, "_") {
-		t.Fatalf("Generated name does not contain an underscore")
-	}
-	if !strings.ContainsAny(name, "0123456789") {
-		t.Fatalf("Generated name doesn't contain a number")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel.go
deleted file mode 100644
index 7738fc7411..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// +build !windows
-
-// Package kernel provides helper function to get, parse and compare kernel
-// versions for different platforms.
-package kernel
-
-import (
-	"errors"
-	"fmt"
-)
-
-// VersionInfo holds information about the kernel.
-type VersionInfo struct {
-	Kernel int    // Version of the kernel (e.g. 4.1.2-generic -> 4)
-	Major  int    // Major part of the kernel version (e.g. 4.1.2-generic -> 1)
-	Minor  int    // Minor part of the kernel version (e.g. 4.1.2-generic -> 2)
-	Flavor string // Flavor of the kernel version (e.g. 4.1.2-generic -> generic)
-}
-
-func (k *VersionInfo) String() string {
-	return fmt.Sprintf("%d.%d.%d%s", k.Kernel, k.Major, k.Minor, k.Flavor)
-}
-
-// CompareKernelVersion compares two kernel.VersionInfo structs.
-// Returns -1 if a < b, 0 if a == b, 1 it a > b
-func CompareKernelVersion(a, b VersionInfo) int {
-	if a.Kernel < b.Kernel {
-		return -1
-	} else if a.Kernel > b.Kernel {
-		return 1
-	}
-
-	if a.Major < b.Major {
-		return -1
-	} else if a.Major > b.Major {
-		return 1
-	}
-
-	if a.Minor < b.Minor {
-		return -1
-	} else if a.Minor > b.Minor {
-		return 1
-	}
-
-	return 0
-}
-
-// ParseRelease parses a string and creates a VersionInfo based on it.
-func ParseRelease(release string) (*VersionInfo, error) {
-	var (
-		kernel, major, minor, parsed int
-		flavor, partial              string
-	)
-
-	// Ignore error from Sscanf to allow an empty flavor.  Instead, just
-	// make sure we got all the version numbers.
-	parsed, _ = fmt.Sscanf(release, "%d.%d%s", &kernel, &major, &partial)
-	if parsed < 2 {
-		return nil, errors.New("Can't parse kernel version " + release)
-	}
-
-	// sometimes we have 3.12.25-gentoo, but sometimes we just have 3.12-1-amd64
-	parsed, _ = fmt.Sscanf(partial, ".%d%s", &minor, &flavor)
-	if parsed < 1 {
-		flavor = partial
-	}
-
-	return &VersionInfo{
-		Kernel: kernel,
-		Major:  major,
-		Minor:  minor,
-		Flavor: flavor,
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_darwin.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_darwin.go
deleted file mode 100644
index 71f205b285..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_darwin.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// +build darwin
-
-// Package kernel provides helper function to get, parse and compare kernel
-// versions for different platforms.
-package kernel
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-
-	"github.com/mattn/go-shellwords"
-)
-
-// GetKernelVersion gets the current kernel version.
-func GetKernelVersion() (*VersionInfo, error) {
-	release, err := getRelease()
-	if err != nil {
-		return nil, err
-	}
-
-	return ParseRelease(release)
-}
-
-// getRelease uses `system_profiler SPSoftwareDataType` to get OSX kernel version
-func getRelease() (string, error) {
-	cmd := exec.Command("system_profiler", "SPSoftwareDataType")
-	osName, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-
-	var release string
-	data := strings.Split(string(osName), "\n")
-	for _, line := range data {
-		if strings.Contains(line, "Kernel Version") {
-			// It has the format like '      Kernel Version: Darwin 14.5.0'
-			content := strings.SplitN(line, ":", 2)
-			if len(content) != 2 {
-				return "", fmt.Errorf("Kernel Version is invalid")
-			}
-
-			prettyNames, err := shellwords.Parse(content[1])
-			if err != nil {
-				return "", fmt.Errorf("Kernel Version is invalid: %s", err.Error())
-			}
-
-			if len(prettyNames) != 2 {
-				return "", fmt.Errorf("Kernel Version needs to be 'Darwin x.x.x' ")
-			}
-			release = prettyNames[1]
-		}
-	}
-
-	return release, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix.go
deleted file mode 100644
index 744d5e1f83..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build linux freebsd solaris
-
-// Package kernel provides helper function to get, parse and compare kernel
-// versions for different platforms.
-package kernel
-
-import (
-	"bytes"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// GetKernelVersion gets the current kernel version.
-func GetKernelVersion() (*VersionInfo, error) {
-	uts, err := uname()
-	if err != nil {
-		return nil, err
-	}
-
-	release := make([]byte, len(uts.Release))
-
-	i := 0
-	for _, c := range uts.Release {
-		release[i] = byte(c)
-		i++
-	}
-
-	// Remove the \x00 from the release for Atoi to parse correctly
-	release = release[:bytes.IndexByte(release, 0)]
-
-	return ParseRelease(string(release))
-}
-
-// CheckKernelVersion checks if current kernel is newer than (or equal to)
-// the given version.
-func CheckKernelVersion(k, major, minor int) bool {
-	if v, err := GetKernelVersion(); err != nil {
-		logrus.Warnf("error getting kernel version: %s", err)
-	} else {
-		if CompareKernelVersion(*v, VersionInfo{Kernel: k, Major: major, Minor: minor}) < 0 {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix_test.go
deleted file mode 100644
index dc8c0e307b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_unix_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// +build !windows
-
-package kernel
-
-import (
-	"fmt"
-	"testing"
-)
-
-func assertParseRelease(t *testing.T, release string, b *VersionInfo, result int) {
-	var (
-		a *VersionInfo
-	)
-	a, _ = ParseRelease(release)
-
-	if r := CompareKernelVersion(*a, *b); r != result {
-		t.Fatalf("Unexpected kernel version comparison result for (%v,%v). Found %d, expected %d", release, b, r, result)
-	}
-	if a.Flavor != b.Flavor {
-		t.Fatalf("Unexpected parsed kernel flavor.  Found %s, expected %s", a.Flavor, b.Flavor)
-	}
-}
-
-// TestParseRelease tests the ParseRelease() function
-func TestParseRelease(t *testing.T) {
-	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 3, Major: 8, Minor: 0}, 0)
-	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
-	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
-	assertParseRelease(t, "3.8.0-19-generic", &VersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
-	assertParseRelease(t, "3.12.8tag", &VersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
-	assertParseRelease(t, "3.12-1-amd64", &VersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
-	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)
-	// Errors
-	invalids := []string{
-		"3",
-		"a",
-		"a.a",
-		"a.a.a-a",
-	}
-	for _, invalid := range invalids {
-		expectedMessage := fmt.Sprintf("Can't parse kernel version %v", invalid)
-		if _, err := ParseRelease(invalid); err == nil || err.Error() != expectedMessage {
-
-		}
-	}
-}
-
-func assertKernelVersion(t *testing.T, a, b VersionInfo, result int) {
-	if r := CompareKernelVersion(a, b); r != result {
-		t.Fatalf("Unexpected kernel version comparison result. Found %d, expected %d", r, result)
-	}
-}
-
-// TestCompareKernelVersion tests the CompareKernelVersion() function
-func TestCompareKernelVersion(t *testing.T) {
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		0)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		-1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		VersionInfo{Kernel: 2, Major: 6, Minor: 0},
-		1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		0)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 5},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 0, Minor: 20},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		-1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 7, Minor: 20},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		-1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
-		VersionInfo{Kernel: 3, Major: 7, Minor: 0},
-		1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		1)
-	assertKernelVersion(t,
-		VersionInfo{Kernel: 3, Major: 8, Minor: 0},
-		VersionInfo{Kernel: 3, Major: 8, Minor: 20},
-		-1)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_windows.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_windows.go
deleted file mode 100644
index 80fab8ff64..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/kernel_windows.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// +build windows
-
-package kernel
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-)
-
-// VersionInfo holds information about the kernel.
-type VersionInfo struct {
-	kvi   string // Version of the kernel (e.g. 6.1.7601.17592 -> 6)
-	major int    // Major part of the kernel version (e.g. 6.1.7601.17592 -> 1)
-	minor int    // Minor part of the kernel version (e.g. 6.1.7601.17592 -> 7601)
-	build int    // Build number of the kernel version (e.g. 6.1.7601.17592 -> 17592)
-}
-
-func (k *VersionInfo) String() string {
-	return fmt.Sprintf("%d.%d %d (%s)", k.major, k.minor, k.build, k.kvi)
-}
-
-// GetKernelVersion gets the current kernel version.
-func GetKernelVersion() (*VersionInfo, error) {
-
-	var (
-		h         syscall.Handle
-		dwVersion uint32
-		err       error
-	)
-
-	KVI := &VersionInfo{"Unknown", 0, 0, 0}
-
-	if err = syscall.RegOpenKeyEx(syscall.HKEY_LOCAL_MACHINE,
-		syscall.StringToUTF16Ptr(`SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\`),
-		0,
-		syscall.KEY_READ,
-		&h); err != nil {
-		return KVI, err
-	}
-	defer syscall.RegCloseKey(h)
-
-	var buf [1 << 10]uint16
-	var typ uint32
-	n := uint32(len(buf) * 2) // api expects array of bytes, not uint16
-
-	if err = syscall.RegQueryValueEx(h,
-		syscall.StringToUTF16Ptr("BuildLabEx"),
-		nil,
-		&typ,
-		(*byte)(unsafe.Pointer(&buf[0])),
-		&n); err != nil {
-		return KVI, err
-	}
-
-	KVI.kvi = syscall.UTF16ToString(buf[:])
-
-	// Important - docker.exe MUST be manifested for this API to return
-	// the correct information.
-	if dwVersion, err = syscall.GetVersion(); err != nil {
-		return KVI, err
-	}
-
-	KVI.major = int(dwVersion & 0xFF)
-	KVI.minor = int((dwVersion & 0XFF00) >> 8)
-	KVI.build = int((dwVersion & 0xFFFF0000) >> 16)
-
-	return KVI, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_linux.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_linux.go
deleted file mode 100644
index bb9b32641e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_linux.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package kernel
-
-import (
-	"syscall"
-)
-
-// Utsname represents the system name structure.
-// It is passthrough for syscall.Utsname in order to make it portable with
-// other platforms where it is not available.
-type Utsname syscall.Utsname
-
-func uname() (*syscall.Utsname, error) {
-	uts := &syscall.Utsname{}
-
-	if err := syscall.Uname(uts); err != nil {
-		return nil, err
-	}
-	return uts, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_solaris.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_solaris.go
deleted file mode 100644
index 49370bd3dd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_solaris.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package kernel
-
-import (
-	"golang.org/x/sys/unix"
-)
-
-func uname() (*unix.Utsname, error) {
-	uts := &unix.Utsname{}
-
-	if err := unix.Uname(uts); err != nil {
-		return nil, err
-	}
-	return uts, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_unsupported.go
deleted file mode 100644
index 1da3f239fa..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/kernel/uname_unsupported.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build !linux,!solaris
-
-package kernel
-
-import (
-	"errors"
-)
-
-// Utsname represents the system name structure.
-// It is defined here to make it portable as it is available on linux but not
-// on windows.
-type Utsname struct {
-	Release [65]byte
-}
-
-func uname() (*Utsname, error) {
-	return nil, errors.New("Kernel version detection is available only on linux")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_linux.go b/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_linux.go
deleted file mode 100644
index e04a3499af..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_linux.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Package operatingsystem provides helper function to get the operating system
-// name for different platforms.
-package operatingsystem
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"strings"
-
-	"github.com/mattn/go-shellwords"
-)
-
-var (
-	// file to use to detect if the daemon is running in a container
-	proc1Cgroup = "/proc/1/cgroup"
-
-	// file to check to determine Operating System
-	etcOsRelease = "/etc/os-release"
-
-	// used by stateless systems like Clear Linux
-	altOsRelease = "/usr/lib/os-release"
-)
-
-// GetOperatingSystem gets the name of the current operating system.
-func GetOperatingSystem() (string, error) {
-	osReleaseFile, err := os.Open(etcOsRelease)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return "", fmt.Errorf("Error opening %s: %v", etcOsRelease, err)
-		}
-		osReleaseFile, err = os.Open(altOsRelease)
-		if err != nil {
-			return "", fmt.Errorf("Error opening %s: %v", altOsRelease, err)
-		}
-	}
-	defer osReleaseFile.Close()
-
-	var prettyName string
-	scanner := bufio.NewScanner(osReleaseFile)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.HasPrefix(line, "PRETTY_NAME=") {
-			data := strings.SplitN(line, "=", 2)
-			prettyNames, err := shellwords.Parse(data[1])
-			if err != nil {
-				return "", fmt.Errorf("PRETTY_NAME is invalid: %s", err.Error())
-			}
-			if len(prettyNames) != 1 {
-				return "", fmt.Errorf("PRETTY_NAME needs to be enclosed by quotes if they have spaces: %s", data[1])
-			}
-			prettyName = prettyNames[0]
-		}
-	}
-	if prettyName != "" {
-		return prettyName, nil
-	}
-	// If not set, defaults to PRETTY_NAME="Linux"
-	// c.f. http://www.freedesktop.org/software/systemd/man/os-release.html
-	return "Linux", nil
-}
-
-// IsContainerized returns true if we are running inside a container.
-func IsContainerized() (bool, error) {
-	b, err := ioutil.ReadFile(proc1Cgroup)
-	if err != nil {
-		return false, err
-	}
-	for _, line := range bytes.Split(b, []byte{'\n'}) {
-		if len(line) > 0 && !bytes.HasSuffix(line, []byte{'/'}) && !bytes.HasSuffix(line, []byte("init.scope")) {
-			return true, nil
-		}
-	}
-	return false, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_solaris.go b/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_solaris.go
deleted file mode 100644
index d08ad14860..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_solaris.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build solaris,cgo
-
-package operatingsystem
-
-/*
-#include <zone.h>
-*/
-import "C"
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-)
-
-var etcOsRelease = "/etc/release"
-
-// GetOperatingSystem gets the name of the current operating system.
-func GetOperatingSystem() (string, error) {
-	b, err := ioutil.ReadFile(etcOsRelease)
-	if err != nil {
-		return "", err
-	}
-	if i := bytes.Index(b, []byte("\n")); i >= 0 {
-		b = bytes.Trim(b[:i], " ")
-		return string(b), nil
-	}
-	return "", errors.New("release not found")
-}
-
-// IsContainerized returns true if we are running inside a container.
-func IsContainerized() (bool, error) {
-	if C.getzoneid() != 0 {
-		return true, nil
-	}
-	return false, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix.go b/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix.go
deleted file mode 100644
index bc91c3c533..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build freebsd darwin
-
-package operatingsystem
-
-import (
-	"errors"
-	"os/exec"
-)
-
-// GetOperatingSystem gets the name of the current operating system.
-func GetOperatingSystem() (string, error) {
-	cmd := exec.Command("uname", "-s")
-	osName, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-	return string(osName), nil
-}
-
-// IsContainerized returns true if we are running inside a container.
-// No-op on FreeBSD and Darwin, always returns false.
-func IsContainerized() (bool, error) {
-	// TODO: Implement jail detection for freeBSD
-	return false, errors.New("Cannot detect if we are in container")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix_test.go
deleted file mode 100644
index e7120c65c4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_unix_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// +build linux freebsd
-
-package operatingsystem
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestGetOperatingSystem(t *testing.T) {
-	var backup = etcOsRelease
-
-	invalids := []struct {
-		content       string
-		errorExpected string
-	}{
-		{
-			`PRETTY_NAME=Source Mage GNU/Linux
-PRETTY_NAME=Ubuntu 14.04.LTS`,
-			"PRETTY_NAME needs to be enclosed by quotes if they have spaces: Source Mage GNU/Linux",
-		},
-		{
-			`PRETTY_NAME="Ubuntu Linux
-PRETTY_NAME=Ubuntu 14.04.LTS`,
-			"PRETTY_NAME is invalid: invalid command line string",
-		},
-		{
-			`PRETTY_NAME=Ubuntu'
-PRETTY_NAME=Ubuntu 14.04.LTS`,
-			"PRETTY_NAME is invalid: invalid command line string",
-		},
-		{
-			`PRETTY_NAME'
-PRETTY_NAME=Ubuntu 14.04.LTS`,
-			"PRETTY_NAME needs to be enclosed by quotes if they have spaces: Ubuntu 14.04.LTS",
-		},
-	}
-
-	valids := []struct {
-		content  string
-		expected string
-	}{
-		{
-			`NAME="Ubuntu"
-PRETTY_NAME_AGAIN="Ubuntu 14.04.LTS"
-VERSION="14.04, Trusty Tahr"
-ID=ubuntu
-ID_LIKE=debian
-VERSION_ID="14.04"
-HOME_URL="http://www.ubuntu.com/"
-SUPPORT_URL="http://help.ubuntu.com/"
-BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"`,
-			"Linux",
-		},
-		{
-			`NAME="Ubuntu"
-VERSION="14.04, Trusty Tahr"
-ID=ubuntu
-ID_LIKE=debian
-VERSION_ID="14.04"
-HOME_URL="http://www.ubuntu.com/"
-SUPPORT_URL="http://help.ubuntu.com/"
-BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"`,
-			"Linux",
-		},
-		{
-			`NAME=Gentoo
-ID=gentoo
-PRETTY_NAME="Gentoo/Linux"
-ANSI_COLOR="1;32"
-HOME_URL="http://www.gentoo.org/"
-SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
-BUG_REPORT_URL="https://bugs.gentoo.org/"
-`,
-			"Gentoo/Linux",
-		},
-		{
-			`NAME="Ubuntu"
-VERSION="14.04, Trusty Tahr"
-ID=ubuntu
-ID_LIKE=debian
-PRETTY_NAME="Ubuntu 14.04 LTS"
-VERSION_ID="14.04"
-HOME_URL="http://www.ubuntu.com/"
-SUPPORT_URL="http://help.ubuntu.com/"
-BUG_REPORT_URL="http://bugs.launchpad.net/ubuntu/"`,
-			"Ubuntu 14.04 LTS",
-		},
-		{
-			`NAME="Ubuntu"
-VERSION="14.04, Trusty Tahr"
-ID=ubuntu
-ID_LIKE=debian
-PRETTY_NAME='Ubuntu 14.04 LTS'`,
-			"Ubuntu 14.04 LTS",
-		},
-		{
-			`PRETTY_NAME=Source
-NAME="Source Mage"`,
-			"Source",
-		},
-		{
-			`PRETTY_NAME=Source
-PRETTY_NAME="Source Mage"`,
-			"Source Mage",
-		},
-	}
-
-	dir := os.TempDir()
-	etcOsRelease = filepath.Join(dir, "etcOsRelease")
-
-	defer func() {
-		os.Remove(etcOsRelease)
-		etcOsRelease = backup
-	}()
-
-	for _, elt := range invalids {
-		if err := ioutil.WriteFile(etcOsRelease, []byte(elt.content), 0600); err != nil {
-			t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
-		}
-		s, err := GetOperatingSystem()
-		if err == nil || err.Error() != elt.errorExpected {
-			t.Fatalf("Expected an error %q, got %q (err: %v)", elt.errorExpected, s, err)
-		}
-	}
-
-	for _, elt := range valids {
-		if err := ioutil.WriteFile(etcOsRelease, []byte(elt.content), 0600); err != nil {
-			t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
-		}
-		s, err := GetOperatingSystem()
-		if err != nil || s != elt.expected {
-			t.Fatalf("Expected %q, got %q (err: %v)", elt.expected, s, err)
-		}
-	}
-}
-
-func TestIsContainerized(t *testing.T) {
-	var (
-		backup                                = proc1Cgroup
-		nonContainerizedProc1Cgroupsystemd226 = []byte(`9:memory:/init.scope
-8:net_cls,net_prio:/
-7:cpuset:/
-6:freezer:/
-5:devices:/init.scope
-4:blkio:/init.scope
-3:cpu,cpuacct:/init.scope
-2:perf_event:/
-1:name=systemd:/init.scope
-`)
-		nonContainerizedProc1Cgroup = []byte(`14:name=systemd:/
-13:hugetlb:/
-12:net_prio:/
-11:perf_event:/
-10:bfqio:/
-9:blkio:/
-8:net_cls:/
-7:freezer:/
-6:devices:/
-5:memory:/
-4:cpuacct:/
-3:cpu:/
-2:cpuset:/
-`)
-		containerizedProc1Cgroup = []byte(`9:perf_event:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-8:blkio:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-7:net_cls:/
-6:freezer:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-5:devices:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-4:memory:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-3:cpuacct:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-2:cpu:/docker/3cef1b53c50b0fa357d994f8a1a8cd783c76bbf4f5dd08b226e38a8bd331338d
-1:cpuset:/`)
-	)
-
-	dir := os.TempDir()
-	proc1Cgroup = filepath.Join(dir, "proc1Cgroup")
-
-	defer func() {
-		os.Remove(proc1Cgroup)
-		proc1Cgroup = backup
-	}()
-
-	if err := ioutil.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroup, 0600); err != nil {
-		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
-	}
-	inContainer, err := IsContainerized()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if inContainer {
-		t.Fatal("Wrongly assuming containerized")
-	}
-
-	if err := ioutil.WriteFile(proc1Cgroup, nonContainerizedProc1Cgroupsystemd226, 0600); err != nil {
-		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
-	}
-	inContainer, err = IsContainerized()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if inContainer {
-		t.Fatal("Wrongly assuming containerized for systemd /init.scope cgroup layout")
-	}
-
-	if err := ioutil.WriteFile(proc1Cgroup, containerizedProc1Cgroup, 0600); err != nil {
-		t.Fatalf("failed to write to %s: %v", proc1Cgroup, err)
-	}
-	inContainer, err = IsContainerized()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !inContainer {
-		t.Fatal("Wrongly assuming non-containerized")
-	}
-}
-
-func TestOsReleaseFallback(t *testing.T) {
-	var backup = etcOsRelease
-	var altBackup = altOsRelease
-	dir := os.TempDir()
-	etcOsRelease = filepath.Join(dir, "etcOsRelease")
-	altOsRelease = filepath.Join(dir, "altOsRelease")
-
-	defer func() {
-		os.Remove(dir)
-		etcOsRelease = backup
-		altOsRelease = altBackup
-	}()
-	content := `NAME=Gentoo
-ID=gentoo
-PRETTY_NAME="Gentoo/Linux"
-ANSI_COLOR="1;32"
-HOME_URL="http://www.gentoo.org/"
-SUPPORT_URL="http://www.gentoo.org/main/en/support.xml"
-BUG_REPORT_URL="https://bugs.gentoo.org/"
-`
-	if err := ioutil.WriteFile(altOsRelease, []byte(content), 0600); err != nil {
-		t.Fatalf("failed to write to %s: %v", etcOsRelease, err)
-	}
-	s, err := GetOperatingSystem()
-	if err != nil || s != "Gentoo/Linux" {
-		t.Fatalf("Expected %q, got %q (err: %v)", "Gentoo/Linux", s, err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_windows.go b/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_windows.go
deleted file mode 100644
index 3c86b6af9c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/operatingsystem/operatingsystem_windows.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package operatingsystem
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// See https://code.google.com/p/go/source/browse/src/pkg/mime/type_windows.go?r=d14520ac25bf6940785aabb71f5be453a286f58c
-// for a similar sample
-
-// GetOperatingSystem gets the name of the current operating system.
-func GetOperatingSystem() (string, error) {
-
-	var h syscall.Handle
-
-	// Default return value
-	ret := "Unknown Operating System"
-
-	if err := syscall.RegOpenKeyEx(syscall.HKEY_LOCAL_MACHINE,
-		syscall.StringToUTF16Ptr(`SOFTWARE\\Microsoft\\Windows NT\\CurrentVersion\\`),
-		0,
-		syscall.KEY_READ,
-		&h); err != nil {
-		return ret, err
-	}
-	defer syscall.RegCloseKey(h)
-
-	var buf [1 << 10]uint16
-	var typ uint32
-	n := uint32(len(buf) * 2) // api expects array of bytes, not uint16
-
-	if err := syscall.RegQueryValueEx(h,
-		syscall.StringToUTF16Ptr("ProductName"),
-		nil,
-		&typ,
-		(*byte)(unsafe.Pointer(&buf[0])),
-		&n); err != nil {
-		return ret, err
-	}
-	ret = syscall.UTF16ToString(buf[:])
-
-	return ret, nil
-}
-
-// IsContainerized returns true if we are running inside a container.
-// No-op on Windows, always returns false.
-func IsContainerized() (bool, error) {
-	return false, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/parsers.go b/installer/vendor/github.com/docker/docker/pkg/parsers/parsers.go
deleted file mode 100644
index acc897168f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/parsers.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Package parsers provides helper functions to parse and validate different type
-// of string. It can be hosts, unix addresses, tcp addresses, filters, kernel
-// operating system versions.
-package parsers
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-)
-
-// ParseKeyValueOpt parses and validates the specified string as a key/value pair (key=value)
-func ParseKeyValueOpt(opt string) (string, string, error) {
-	parts := strings.SplitN(opt, "=", 2)
-	if len(parts) != 2 {
-		return "", "", fmt.Errorf("Unable to parse key/value option: %s", opt)
-	}
-	return strings.TrimSpace(parts[0]), strings.TrimSpace(parts[1]), nil
-}
-
-// ParseUintList parses and validates the specified string as the value
-// found in some cgroup file (e.g. `cpuset.cpus`, `cpuset.mems`), which could be
-// one of the formats below. Note that duplicates are actually allowed in the
-// input string. It returns a `map[int]bool` with available elements from `val`
-// set to `true`.
-// Supported formats:
-//     7
-//     1-6
-//     0,3-4,7,8-10
-//     0-0,0,1-7
-//     03,1-3      <- this is gonna get parsed as [1,2,3]
-//     3,2,1
-//     0-2,3,1
-func ParseUintList(val string) (map[int]bool, error) {
-	if val == "" {
-		return map[int]bool{}, nil
-	}
-
-	availableInts := make(map[int]bool)
-	split := strings.Split(val, ",")
-	errInvalidFormat := fmt.Errorf("invalid format: %s", val)
-
-	for _, r := range split {
-		if !strings.Contains(r, "-") {
-			v, err := strconv.Atoi(r)
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			availableInts[v] = true
-		} else {
-			split := strings.SplitN(r, "-", 2)
-			min, err := strconv.Atoi(split[0])
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			max, err := strconv.Atoi(split[1])
-			if err != nil {
-				return nil, errInvalidFormat
-			}
-			if max < min {
-				return nil, errInvalidFormat
-			}
-			for i := min; i <= max; i++ {
-				availableInts[i] = true
-			}
-		}
-	}
-	return availableInts, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/parsers/parsers_test.go b/installer/vendor/github.com/docker/docker/pkg/parsers/parsers_test.go
deleted file mode 100644
index 7f19e90279..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/parsers/parsers_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package parsers
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestParseKeyValueOpt(t *testing.T) {
-	invalids := map[string]string{
-		"":    "Unable to parse key/value option: ",
-		"key": "Unable to parse key/value option: key",
-	}
-	for invalid, expectedError := range invalids {
-		if _, _, err := ParseKeyValueOpt(invalid); err == nil || err.Error() != expectedError {
-			t.Fatalf("Expected error %v for %v, got %v", expectedError, invalid, err)
-		}
-	}
-	valids := map[string][]string{
-		"key=value":               {"key", "value"},
-		" key = value ":           {"key", "value"},
-		"key=value1=value2":       {"key", "value1=value2"},
-		" key = value1 = value2 ": {"key", "value1 = value2"},
-	}
-	for valid, expectedKeyValue := range valids {
-		key, value, err := ParseKeyValueOpt(valid)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if key != expectedKeyValue[0] || value != expectedKeyValue[1] {
-			t.Fatalf("Expected {%v: %v} got {%v: %v}", expectedKeyValue[0], expectedKeyValue[1], key, value)
-		}
-	}
-}
-
-func TestParseUintList(t *testing.T) {
-	valids := map[string]map[int]bool{
-		"":             {},
-		"7":            {7: true},
-		"1-6":          {1: true, 2: true, 3: true, 4: true, 5: true, 6: true},
-		"0-7":          {0: true, 1: true, 2: true, 3: true, 4: true, 5: true, 6: true, 7: true},
-		"0,3-4,7,8-10": {0: true, 3: true, 4: true, 7: true, 8: true, 9: true, 10: true},
-		"0-0,0,1-4":    {0: true, 1: true, 2: true, 3: true, 4: true},
-		"03,1-3":       {1: true, 2: true, 3: true},
-		"3,2,1":        {1: true, 2: true, 3: true},
-		"0-2,3,1":      {0: true, 1: true, 2: true, 3: true},
-	}
-	for k, v := range valids {
-		out, err := ParseUintList(k)
-		if err != nil {
-			t.Fatalf("Expected not to fail, got %v", err)
-		}
-		if !reflect.DeepEqual(out, v) {
-			t.Fatalf("Expected %v, got %v", v, out)
-		}
-	}
-
-	invalids := []string{
-		"this",
-		"1--",
-		"1-10,,10",
-		"10-1",
-		"-1",
-		"-1,0",
-	}
-	for _, v := range invalids {
-		if out, err := ParseUintList(v); err == nil {
-			t.Fatalf("Expected failure with %s but got %v", v, out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile.go b/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile.go
deleted file mode 100644
index d832fea7a2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Package pidfile provides structure and helper functions to create and remove
-// PID file. A PID file is usually a file used to store the process ID of a
-// running process.
-package pidfile
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// PIDFile is a file used to store the process ID of a running process.
-type PIDFile struct {
-	path string
-}
-
-func checkPIDFileAlreadyExists(path string) error {
-	if pidByte, err := ioutil.ReadFile(path); err == nil {
-		pidString := strings.TrimSpace(string(pidByte))
-		if pid, err := strconv.Atoi(pidString); err == nil {
-			if processExists(pid) {
-				return fmt.Errorf("pid file found, ensure docker is not running or delete %s", path)
-			}
-		}
-	}
-	return nil
-}
-
-// New creates a PIDfile using the specified path.
-func New(path string) (*PIDFile, error) {
-	if err := checkPIDFileAlreadyExists(path); err != nil {
-		return nil, err
-	}
-	// Note MkdirAll returns nil if a directory already exists
-	if err := system.MkdirAll(filepath.Dir(path), os.FileMode(0755)); err != nil {
-		return nil, err
-	}
-	if err := ioutil.WriteFile(path, []byte(fmt.Sprintf("%d", os.Getpid())), 0644); err != nil {
-		return nil, err
-	}
-
-	return &PIDFile{path: path}, nil
-}
-
-// Remove removes the PIDFile.
-func (file PIDFile) Remove() error {
-	if err := os.Remove(file.path); err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_darwin.go b/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_darwin.go
deleted file mode 100644
index 5c1cd7ab85..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_darwin.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build darwin
-
-package pidfile
-
-import (
-	"syscall"
-)
-
-func processExists(pid int) bool {
-	// OS X does not have a proc filesystem.
-	// Use kill -0 pid to judge if the process exists.
-	err := syscall.Kill(pid, 0)
-	if err != nil {
-		return false
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_test.go b/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_test.go
deleted file mode 100644
index 73e8af76db..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package pidfile
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestNewAndRemove(t *testing.T) {
-	dir, err := ioutil.TempDir(os.TempDir(), "test-pidfile")
-	if err != nil {
-		t.Fatal("Could not create test directory")
-	}
-
-	path := filepath.Join(dir, "testfile")
-	file, err := New(path)
-	if err != nil {
-		t.Fatal("Could not create test file", err)
-	}
-
-	_, err = New(path)
-	if err == nil {
-		t.Fatal("Test file creation not blocked")
-	}
-
-	if err := file.Remove(); err != nil {
-		t.Fatal("Could not delete created test file")
-	}
-}
-
-func TestRemoveInvalidPath(t *testing.T) {
-	file := PIDFile{path: filepath.Join("foo", "bar")}
-
-	if err := file.Remove(); err == nil {
-		t.Fatal("Non-existing file doesn't give an error on delete")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_unix.go b/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_unix.go
deleted file mode 100644
index 1bf5221e3b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_unix.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !windows,!darwin
-
-package pidfile
-
-import (
-	"os"
-	"path/filepath"
-	"strconv"
-)
-
-func processExists(pid int) bool {
-	if _, err := os.Stat(filepath.Join("/proc", strconv.Itoa(pid))); err == nil {
-		return true
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_windows.go b/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_windows.go
deleted file mode 100644
index ae489c627a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pidfile/pidfile_windows.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package pidfile
-
-import "syscall"
-
-const (
-	processQueryLimitedInformation = 0x1000
-
-	stillActive = 259
-)
-
-func processExists(pid int) bool {
-	h, err := syscall.OpenProcess(processQueryLimitedInformation, false, uint32(pid))
-	if err != nil {
-		return false
-	}
-	var c uint32
-	err = syscall.GetExitCodeProcess(h, &c)
-	syscall.Close(h)
-	if err != nil {
-		return c == stillActive
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_linux.go b/installer/vendor/github.com/docker/docker/pkg/platform/architecture_linux.go
deleted file mode 100644
index 2cdc2c5918..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_linux.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Package platform provides helper function to get the runtime architecture
-// for different platforms.
-package platform
-
-import (
-	"syscall"
-)
-
-// runtimeArchitecture gets the name of the current architecture (x86, x86_64, …)
-func runtimeArchitecture() (string, error) {
-	utsname := &syscall.Utsname{}
-	if err := syscall.Uname(utsname); err != nil {
-		return "", err
-	}
-	return charsToString(utsname.Machine), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_unix.go b/installer/vendor/github.com/docker/docker/pkg/platform/architecture_unix.go
deleted file mode 100644
index 45bbcf1535..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_unix.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// +build freebsd solaris darwin
-
-// Package platform provides helper function to get the runtime architecture
-// for different platforms.
-package platform
-
-import (
-	"os/exec"
-	"strings"
-)
-
-// runtimeArchitecture gets the name of the current architecture (x86, x86_64, i86pc, sun4v, ...)
-func runtimeArchitecture() (string, error) {
-	cmd := exec.Command("/usr/bin/uname", "-m")
-	machine, err := cmd.Output()
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(machine)), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_windows.go b/installer/vendor/github.com/docker/docker/pkg/platform/architecture_windows.go
deleted file mode 100644
index c5f684ddfa..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/architecture_windows.go
+++ /dev/null
@@ -1,60 +0,0 @@
-package platform
-
-import (
-	"fmt"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	modkernel32       = windows.NewLazySystemDLL("kernel32.dll")
-	procGetSystemInfo = modkernel32.NewProc("GetSystemInfo")
-)
-
-// see http://msdn.microsoft.com/en-us/library/windows/desktop/ms724958(v=vs.85).aspx
-type systeminfo struct {
-	wProcessorArchitecture      uint16
-	wReserved                   uint16
-	dwPageSize                  uint32
-	lpMinimumApplicationAddress uintptr
-	lpMaximumApplicationAddress uintptr
-	dwActiveProcessorMask       uintptr
-	dwNumberOfProcessors        uint32
-	dwProcessorType             uint32
-	dwAllocationGranularity     uint32
-	wProcessorLevel             uint16
-	wProcessorRevision          uint16
-}
-
-// Constants
-const (
-	ProcessorArchitecture64   = 9 // PROCESSOR_ARCHITECTURE_AMD64
-	ProcessorArchitectureIA64 = 6 // PROCESSOR_ARCHITECTURE_IA64
-	ProcessorArchitecture32   = 0 // PROCESSOR_ARCHITECTURE_INTEL
-	ProcessorArchitectureArm  = 5 // PROCESSOR_ARCHITECTURE_ARM
-)
-
-// runtimeArchitecture gets the name of the current architecture (x86, x86_64, …)
-func runtimeArchitecture() (string, error) {
-	var sysinfo systeminfo
-	syscall.Syscall(procGetSystemInfo.Addr(), 1, uintptr(unsafe.Pointer(&sysinfo)), 0, 0)
-	switch sysinfo.wProcessorArchitecture {
-	case ProcessorArchitecture64, ProcessorArchitectureIA64:
-		return "x86_64", nil
-	case ProcessorArchitecture32:
-		return "i686", nil
-	case ProcessorArchitectureArm:
-		return "arm", nil
-	default:
-		return "", fmt.Errorf("Unknown processor architecture")
-	}
-}
-
-// NumProcs returns the number of processors on the system
-func NumProcs() uint32 {
-	var sysinfo systeminfo
-	syscall.Syscall(procGetSystemInfo.Addr(), 1, uintptr(unsafe.Pointer(&sysinfo)), 0, 0)
-	return sysinfo.dwNumberOfProcessors
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/platform.go b/installer/vendor/github.com/docker/docker/pkg/platform/platform.go
deleted file mode 100644
index e4b03122f4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/platform.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package platform
-
-import (
-	"runtime"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var (
-	// Architecture holds the runtime architecture of the process.
-	Architecture string
-	// OSType holds the runtime operating system type (Linux, …) of the process.
-	OSType string
-)
-
-func init() {
-	var err error
-	Architecture, err = runtimeArchitecture()
-	if err != nil {
-		logrus.Errorf("Could not read system architecture info: %v", err)
-	}
-	OSType = runtime.GOOS
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/utsname_int8.go b/installer/vendor/github.com/docker/docker/pkg/platform/utsname_int8.go
deleted file mode 100644
index 5dcbadfdfe..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/utsname_int8.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux,386 linux,amd64 linux,arm64
-// see golang's sources src/syscall/ztypes_linux_*.go that use int8
-
-package platform
-
-// Convert the OS/ARCH-specific utsname.Machine to string
-// given as an array of signed int8
-func charsToString(ca [65]int8) string {
-	s := make([]byte, len(ca))
-	var lens int
-	for ; lens < len(ca); lens++ {
-		if ca[lens] == 0 {
-			break
-		}
-		s[lens] = uint8(ca[lens])
-	}
-	return string(s[0:lens])
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/platform/utsname_uint8.go b/installer/vendor/github.com/docker/docker/pkg/platform/utsname_uint8.go
deleted file mode 100644
index c9875cf6e6..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/platform/utsname_uint8.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// +build linux,arm linux,ppc64 linux,ppc64le s390x
-// see golang's sources src/syscall/ztypes_linux_*.go that use uint8
-
-package platform
-
-// Convert the OS/ARCH-specific utsname.Machine to string
-// given as an array of unsigned uint8
-func charsToString(ca [65]uint8) string {
-	s := make([]byte, len(ca))
-	var lens int
-	for ; lens < len(ca); lens++ {
-		if ca[lens] == 0 {
-			break
-		}
-		s[lens] = ca[lens]
-	}
-	return string(s[0:lens])
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugingetter/getter.go b/installer/vendor/github.com/docker/docker/pkg/plugingetter/getter.go
deleted file mode 100644
index dde5f66035..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugingetter/getter.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package plugingetter
-
-import "github.com/docker/docker/pkg/plugins"
-
-const (
-	// LOOKUP doesn't update RefCount
-	LOOKUP = 0
-	// ACQUIRE increments RefCount
-	ACQUIRE = 1
-	// RELEASE decrements RefCount
-	RELEASE = -1
-)
-
-// CompatPlugin is a abstraction to handle both v2(new) and v1(legacy) plugins.
-type CompatPlugin interface {
-	Client() *plugins.Client
-	Name() string
-	BasePath() string
-	IsV1() bool
-}
-
-// CountedPlugin is a plugin which is reference counted.
-type CountedPlugin interface {
-	Acquire()
-	Release()
-	CompatPlugin
-}
-
-// PluginGetter is the interface implemented by Store
-type PluginGetter interface {
-	Get(name, capability string, mode int) (CompatPlugin, error)
-	GetAllByCap(capability string) ([]CompatPlugin, error)
-	GetAllManagedPluginsByCap(capability string) []CompatPlugin
-	Handle(capability string, callback func(string, *plugins.Client))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/client.go b/installer/vendor/github.com/docker/docker/pkg/plugins/client.go
deleted file mode 100644
index e8e730eb58..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/client.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package plugins
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/plugins/transport"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-const (
-	defaultTimeOut = 30
-)
-
-func newTransport(addr string, tlsConfig *tlsconfig.Options) (transport.Transport, error) {
-	tr := &http.Transport{}
-
-	if tlsConfig != nil {
-		c, err := tlsconfig.Client(*tlsConfig)
-		if err != nil {
-			return nil, err
-		}
-		tr.TLSClientConfig = c
-	}
-
-	u, err := url.Parse(addr)
-	if err != nil {
-		return nil, err
-	}
-	socket := u.Host
-	if socket == "" {
-		// valid local socket addresses have the host empty.
-		socket = u.Path
-	}
-	if err := sockets.ConfigureTransport(tr, u.Scheme, socket); err != nil {
-		return nil, err
-	}
-	scheme := httpScheme(u)
-
-	return transport.NewHTTPTransport(tr, scheme, socket), nil
-}
-
-// NewClient creates a new plugin client (http).
-func NewClient(addr string, tlsConfig *tlsconfig.Options) (*Client, error) {
-	clientTransport, err := newTransport(addr, tlsConfig)
-	if err != nil {
-		return nil, err
-	}
-	return newClientWithTransport(clientTransport, 0), nil
-}
-
-// NewClientWithTimeout creates a new plugin client (http).
-func NewClientWithTimeout(addr string, tlsConfig *tlsconfig.Options, timeoutInSecs int) (*Client, error) {
-	clientTransport, err := newTransport(addr, tlsConfig)
-	if err != nil {
-		return nil, err
-	}
-	return newClientWithTransport(clientTransport, timeoutInSecs), nil
-}
-
-// newClientWithTransport creates a new plugin client with a given transport.
-func newClientWithTransport(tr transport.Transport, timeoutInSecs int) *Client {
-	return &Client{
-		http: &http.Client{
-			Transport: tr,
-			Timeout:   time.Duration(timeoutInSecs) * time.Second,
-		},
-		requestFactory: tr,
-	}
-}
-
-// Client represents a plugin client.
-type Client struct {
-	http           *http.Client // http client to use
-	requestFactory transport.RequestFactory
-}
-
-// Call calls the specified method with the specified arguments for the plugin.
-// It will retry for 30 seconds if a failure occurs when calling.
-func (c *Client) Call(serviceMethod string, args interface{}, ret interface{}) error {
-	var buf bytes.Buffer
-	if args != nil {
-		if err := json.NewEncoder(&buf).Encode(args); err != nil {
-			return err
-		}
-	}
-	body, err := c.callWithRetry(serviceMethod, &buf, true)
-	if err != nil {
-		return err
-	}
-	defer body.Close()
-	if ret != nil {
-		if err := json.NewDecoder(body).Decode(&ret); err != nil {
-			logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err)
-			return err
-		}
-	}
-	return nil
-}
-
-// Stream calls the specified method with the specified arguments for the plugin and returns the response body
-func (c *Client) Stream(serviceMethod string, args interface{}) (io.ReadCloser, error) {
-	var buf bytes.Buffer
-	if err := json.NewEncoder(&buf).Encode(args); err != nil {
-		return nil, err
-	}
-	return c.callWithRetry(serviceMethod, &buf, true)
-}
-
-// SendFile calls the specified method, and passes through the IO stream
-func (c *Client) SendFile(serviceMethod string, data io.Reader, ret interface{}) error {
-	body, err := c.callWithRetry(serviceMethod, data, true)
-	if err != nil {
-		return err
-	}
-	defer body.Close()
-	if err := json.NewDecoder(body).Decode(&ret); err != nil {
-		logrus.Errorf("%s: error reading plugin resp: %v", serviceMethod, err)
-		return err
-	}
-	return nil
-}
-
-func (c *Client) callWithRetry(serviceMethod string, data io.Reader, retry bool) (io.ReadCloser, error) {
-	req, err := c.requestFactory.NewRequest(serviceMethod, data)
-	if err != nil {
-		return nil, err
-	}
-
-	var retries int
-	start := time.Now()
-
-	for {
-		resp, err := c.http.Do(req)
-		if err != nil {
-			if !retry {
-				return nil, err
-			}
-
-			timeOff := backoff(retries)
-			if abort(start, timeOff) {
-				return nil, err
-			}
-			retries++
-			logrus.Warnf("Unable to connect to plugin: %s%s: %v, retrying in %v", req.URL.Host, req.URL.Path, err, timeOff)
-			time.Sleep(timeOff)
-			continue
-		}
-
-		if resp.StatusCode != http.StatusOK {
-			b, err := ioutil.ReadAll(resp.Body)
-			resp.Body.Close()
-			if err != nil {
-				return nil, &statusError{resp.StatusCode, serviceMethod, err.Error()}
-			}
-
-			// Plugins' Response(s) should have an Err field indicating what went
-			// wrong. Try to unmarshal into ResponseErr. Otherwise fallback to just
-			// return the string(body)
-			type responseErr struct {
-				Err string
-			}
-			remoteErr := responseErr{}
-			if err := json.Unmarshal(b, &remoteErr); err == nil {
-				if remoteErr.Err != "" {
-					return nil, &statusError{resp.StatusCode, serviceMethod, remoteErr.Err}
-				}
-			}
-			// old way...
-			return nil, &statusError{resp.StatusCode, serviceMethod, string(b)}
-		}
-		return resp.Body, nil
-	}
-}
-
-func backoff(retries int) time.Duration {
-	b, max := 1, defaultTimeOut
-	for b < max && retries > 0 {
-		b *= 2
-		retries--
-	}
-	if b > max {
-		b = max
-	}
-	return time.Duration(b) * time.Second
-}
-
-func abort(start time.Time, timeOff time.Duration) bool {
-	return timeOff+time.Since(start) >= time.Duration(defaultTimeOut)*time.Second
-}
-
-func httpScheme(u *url.URL) string {
-	scheme := u.Scheme
-	if scheme != "https" {
-		scheme = "http"
-	}
-	return scheme
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/client_test.go b/installer/vendor/github.com/docker/docker/pkg/plugins/client_test.go
deleted file mode 100644
index 9faad86a15..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/client_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package plugins
-
-import (
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/pkg/plugins/transport"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-var (
-	mux    *http.ServeMux
-	server *httptest.Server
-)
-
-func setupRemotePluginServer() string {
-	mux = http.NewServeMux()
-	server = httptest.NewServer(mux)
-	return server.URL
-}
-
-func teardownRemotePluginServer() {
-	if server != nil {
-		server.Close()
-	}
-}
-
-func TestFailedConnection(t *testing.T) {
-	c, _ := NewClient("tcp://127.0.0.1:1", &tlsconfig.Options{InsecureSkipVerify: true})
-	_, err := c.callWithRetry("Service.Method", nil, false)
-	if err == nil {
-		t.Fatal("Unexpected successful connection")
-	}
-}
-
-func TestEchoInputOutput(t *testing.T) {
-	addr := setupRemotePluginServer()
-	defer teardownRemotePluginServer()
-
-	m := Manifest{[]string{"VolumeDriver", "NetworkDriver"}}
-
-	mux.HandleFunc("/Test.Echo", func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "POST" {
-			t.Fatalf("Expected POST, got %s\n", r.Method)
-		}
-
-		header := w.Header()
-		header.Set("Content-Type", transport.VersionMimetype)
-
-		io.Copy(w, r.Body)
-	})
-
-	c, _ := NewClient(addr, &tlsconfig.Options{InsecureSkipVerify: true})
-	var output Manifest
-	err := c.Call("Test.Echo", m, &output)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(output, m) {
-		t.Fatalf("Expected %v, was %v\n", m, output)
-	}
-	err = c.Call("Test.Echo", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestBackoff(t *testing.T) {
-	cases := []struct {
-		retries    int
-		expTimeOff time.Duration
-	}{
-		{0, time.Duration(1)},
-		{1, time.Duration(2)},
-		{2, time.Duration(4)},
-		{4, time.Duration(16)},
-		{6, time.Duration(30)},
-		{10, time.Duration(30)},
-	}
-
-	for _, c := range cases {
-		s := c.expTimeOff * time.Second
-		if d := backoff(c.retries); d != s {
-			t.Fatalf("Retry %v, expected %v, was %v\n", c.retries, s, d)
-		}
-	}
-}
-
-func TestAbortRetry(t *testing.T) {
-	cases := []struct {
-		timeOff  time.Duration
-		expAbort bool
-	}{
-		{time.Duration(1), false},
-		{time.Duration(2), false},
-		{time.Duration(10), false},
-		{time.Duration(30), true},
-		{time.Duration(40), true},
-	}
-
-	for _, c := range cases {
-		s := c.timeOff * time.Second
-		if a := abort(time.Now(), s); a != c.expAbort {
-			t.Fatalf("Duration %v, expected %v, was %v\n", c.timeOff, s, a)
-		}
-	}
-}
-
-func TestClientScheme(t *testing.T) {
-	cases := map[string]string{
-		"tcp://127.0.0.1:8080":          "http",
-		"unix:///usr/local/plugins/foo": "http",
-		"http://127.0.0.1:8080":         "http",
-		"https://127.0.0.1:8080":        "https",
-	}
-
-	for addr, scheme := range cases {
-		u, err := url.Parse(addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		s := httpScheme(u)
-
-		if s != scheme {
-			t.Fatalf("URL scheme mismatch, expected %s, got %s", scheme, s)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery.go b/installer/vendor/github.com/docker/docker/pkg/plugins/discovery.go
deleted file mode 100644
index e99581c573..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package plugins
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-)
-
-var (
-	// ErrNotFound plugin not found
-	ErrNotFound = errors.New("plugin not found")
-	socketsPath = "/run/docker/plugins"
-)
-
-// localRegistry defines a registry that is local (using unix socket).
-type localRegistry struct{}
-
-func newLocalRegistry() localRegistry {
-	return localRegistry{}
-}
-
-// Scan scans all the plugin paths and returns all the names it found
-func Scan() ([]string, error) {
-	var names []string
-	if err := filepath.Walk(socketsPath, func(path string, fi os.FileInfo, err error) error {
-		if err != nil {
-			return nil
-		}
-
-		if fi.Mode()&os.ModeSocket != 0 {
-			name := strings.TrimSuffix(fi.Name(), filepath.Ext(fi.Name()))
-			names = append(names, name)
-		}
-		return nil
-	}); err != nil {
-		return nil, err
-	}
-
-	for _, path := range specsPaths {
-		if err := filepath.Walk(path, func(p string, fi os.FileInfo, err error) error {
-			if err != nil || fi.IsDir() {
-				return nil
-			}
-			name := strings.TrimSuffix(fi.Name(), filepath.Ext(fi.Name()))
-			names = append(names, name)
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-	}
-	return names, nil
-}
-
-// Plugin returns the plugin registered with the given name (or returns an error).
-func (l *localRegistry) Plugin(name string) (*Plugin, error) {
-	socketpaths := pluginPaths(socketsPath, name, ".sock")
-
-	for _, p := range socketpaths {
-		if fi, err := os.Stat(p); err == nil && fi.Mode()&os.ModeSocket != 0 {
-			return NewLocalPlugin(name, "unix://"+p), nil
-		}
-	}
-
-	var txtspecpaths []string
-	for _, p := range specsPaths {
-		txtspecpaths = append(txtspecpaths, pluginPaths(p, name, ".spec")...)
-		txtspecpaths = append(txtspecpaths, pluginPaths(p, name, ".json")...)
-	}
-
-	for _, p := range txtspecpaths {
-		if _, err := os.Stat(p); err == nil {
-			if strings.HasSuffix(p, ".json") {
-				return readPluginJSONInfo(name, p)
-			}
-			return readPluginInfo(name, p)
-		}
-	}
-	return nil, ErrNotFound
-}
-
-func readPluginInfo(name, path string) (*Plugin, error) {
-	content, err := ioutil.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-	addr := strings.TrimSpace(string(content))
-
-	u, err := url.Parse(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(u.Scheme) == 0 {
-		return nil, fmt.Errorf("Unknown protocol")
-	}
-
-	return NewLocalPlugin(name, addr), nil
-}
-
-func readPluginJSONInfo(name, path string) (*Plugin, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-
-	var p Plugin
-	if err := json.NewDecoder(f).Decode(&p); err != nil {
-		return nil, err
-	}
-	p.name = name
-	if p.TLSConfig != nil && len(p.TLSConfig.CAFile) == 0 {
-		p.TLSConfig.InsecureSkipVerify = true
-	}
-	p.activateWait = sync.NewCond(&sync.Mutex{})
-
-	return &p, nil
-}
-
-func pluginPaths(base, name, ext string) []string {
-	return []string{
-		filepath.Join(base, name+ext),
-		filepath.Join(base, name, name+ext),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_test.go b/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_test.go
deleted file mode 100644
index 03f9d00319..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-package plugins
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func Setup(t *testing.T) (string, func()) {
-	tmpdir, err := ioutil.TempDir("", "docker-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	backup := socketsPath
-	socketsPath = tmpdir
-	specsPaths = []string{tmpdir}
-
-	return tmpdir, func() {
-		socketsPath = backup
-		os.RemoveAll(tmpdir)
-	}
-}
-
-func TestFileSpecPlugin(t *testing.T) {
-	tmpdir, unregister := Setup(t)
-	defer unregister()
-
-	cases := []struct {
-		path string
-		name string
-		addr string
-		fail bool
-	}{
-		// TODO Windows: Factor out the unix:// variants.
-		{filepath.Join(tmpdir, "echo.spec"), "echo", "unix://var/lib/docker/plugins/echo.sock", false},
-		{filepath.Join(tmpdir, "echo", "echo.spec"), "echo", "unix://var/lib/docker/plugins/echo.sock", false},
-		{filepath.Join(tmpdir, "foo.spec"), "foo", "tcp://localhost:8080", false},
-		{filepath.Join(tmpdir, "foo", "foo.spec"), "foo", "tcp://localhost:8080", false},
-		{filepath.Join(tmpdir, "bar.spec"), "bar", "localhost:8080", true}, // unknown transport
-	}
-
-	for _, c := range cases {
-		if err := os.MkdirAll(filepath.Dir(c.path), 0755); err != nil {
-			t.Fatal(err)
-		}
-		if err := ioutil.WriteFile(c.path, []byte(c.addr), 0644); err != nil {
-			t.Fatal(err)
-		}
-
-		r := newLocalRegistry()
-		p, err := r.Plugin(c.name)
-		if c.fail && err == nil {
-			continue
-		}
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if p.name != c.name {
-			t.Fatalf("Expected plugin `%s`, got %s\n", c.name, p.name)
-		}
-
-		if p.Addr != c.addr {
-			t.Fatalf("Expected plugin addr `%s`, got %s\n", c.addr, p.Addr)
-		}
-
-		if p.TLSConfig.InsecureSkipVerify != true {
-			t.Fatalf("Expected TLS verification to be skipped")
-		}
-	}
-}
-
-func TestFileJSONSpecPlugin(t *testing.T) {
-	tmpdir, unregister := Setup(t)
-	defer unregister()
-
-	p := filepath.Join(tmpdir, "example.json")
-	spec := `{
-  "Name": "plugin-example",
-  "Addr": "https://example.com/docker/plugin",
-  "TLSConfig": {
-    "CAFile": "/usr/shared/docker/certs/example-ca.pem",
-    "CertFile": "/usr/shared/docker/certs/example-cert.pem",
-    "KeyFile": "/usr/shared/docker/certs/example-key.pem"
-	}
-}`
-
-	if err := ioutil.WriteFile(p, []byte(spec), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	r := newLocalRegistry()
-	plugin, err := r.Plugin("example")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected, actual := "example", plugin.name; expected != actual {
-		t.Fatalf("Expected plugin %q, got %s\n", expected, actual)
-	}
-
-	if plugin.Addr != "https://example.com/docker/plugin" {
-		t.Fatalf("Expected plugin addr `https://example.com/docker/plugin`, got %s\n", plugin.Addr)
-	}
-
-	if plugin.TLSConfig.CAFile != "/usr/shared/docker/certs/example-ca.pem" {
-		t.Fatalf("Expected plugin CA `/usr/shared/docker/certs/example-ca.pem`, got %s\n", plugin.TLSConfig.CAFile)
-	}
-
-	if plugin.TLSConfig.CertFile != "/usr/shared/docker/certs/example-cert.pem" {
-		t.Fatalf("Expected plugin Certificate `/usr/shared/docker/certs/example-cert.pem`, got %s\n", plugin.TLSConfig.CertFile)
-	}
-
-	if plugin.TLSConfig.KeyFile != "/usr/shared/docker/certs/example-key.pem" {
-		t.Fatalf("Expected plugin Key `/usr/shared/docker/certs/example-key.pem`, got %s\n", plugin.TLSConfig.KeyFile)
-	}
-}
-
-func TestFileJSONSpecPluginWithoutTLSConfig(t *testing.T) {
-	tmpdir, unregister := Setup(t)
-	defer unregister()
-
-	p := filepath.Join(tmpdir, "example.json")
-	spec := `{
-  "Name": "plugin-example",
-  "Addr": "https://example.com/docker/plugin"
-}`
-
-	if err := ioutil.WriteFile(p, []byte(spec), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	r := newLocalRegistry()
-	plugin, err := r.Plugin("example")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if expected, actual := "example", plugin.name; expected != actual {
-		t.Fatalf("Expected plugin %q, got %s\n", expected, actual)
-	}
-
-	if plugin.Addr != "https://example.com/docker/plugin" {
-		t.Fatalf("Expected plugin addr `https://example.com/docker/plugin`, got %s\n", plugin.Addr)
-	}
-
-	if plugin.TLSConfig != nil {
-		t.Fatalf("Expected plugin TLSConfig nil, got %v\n", plugin.TLSConfig)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix.go b/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix.go
deleted file mode 100644
index 693a47e394..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// +build !windows
-
-package plugins
-
-var specsPaths = []string{"/etc/docker/plugins", "/usr/lib/docker/plugins"}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix_test.go
deleted file mode 100644
index 3e2d506b97..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_unix_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// +build !windows
-
-package plugins
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-)
-
-func TestLocalSocket(t *testing.T) {
-	// TODO Windows: Enable a similar version for Windows named pipes
-	tmpdir, unregister := Setup(t)
-	defer unregister()
-
-	cases := []string{
-		filepath.Join(tmpdir, "echo.sock"),
-		filepath.Join(tmpdir, "echo", "echo.sock"),
-	}
-
-	for _, c := range cases {
-		if err := os.MkdirAll(filepath.Dir(c), 0755); err != nil {
-			t.Fatal(err)
-		}
-
-		l, err := net.Listen("unix", c)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		r := newLocalRegistry()
-		p, err := r.Plugin("echo")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		pp, err := r.Plugin("echo")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(p, pp) {
-			t.Fatalf("Expected %v, was %v\n", p, pp)
-		}
-
-		if p.name != "echo" {
-			t.Fatalf("Expected plugin `echo`, got %s\n", p.name)
-		}
-
-		addr := fmt.Sprintf("unix://%s", c)
-		if p.Addr != addr {
-			t.Fatalf("Expected plugin addr `%s`, got %s\n", addr, p.Addr)
-		}
-		if p.TLSConfig.InsecureSkipVerify != true {
-			t.Fatalf("Expected TLS verification to be skipped")
-		}
-		l.Close()
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_windows.go b/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_windows.go
deleted file mode 100644
index d7c1fe4942..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/discovery_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package plugins
-
-import (
-	"os"
-	"path/filepath"
-)
-
-var specsPaths = []string{filepath.Join(os.Getenv("programdata"), "docker", "plugins")}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/errors.go b/installer/vendor/github.com/docker/docker/pkg/plugins/errors.go
deleted file mode 100644
index 7988471026..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/errors.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package plugins
-
-import (
-	"fmt"
-	"net/http"
-)
-
-type statusError struct {
-	status int
-	method string
-	err    string
-}
-
-// Error returns a formatted string for this error type
-func (e *statusError) Error() string {
-	return fmt.Sprintf("%s: %v", e.method, e.err)
-}
-
-// IsNotFound indicates if the passed in error is from an http.StatusNotFound from the plugin
-func IsNotFound(err error) bool {
-	return isStatusError(err, http.StatusNotFound)
-}
-
-func isStatusError(err error, status int) bool {
-	if err == nil {
-		return false
-	}
-	e, ok := err.(*statusError)
-	if !ok {
-		return false
-	}
-	return e.status == status
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/plugin_test.go b/installer/vendor/github.com/docker/docker/pkg/plugins/plugin_test.go
deleted file mode 100644
index b19c0d52f1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/plugin_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package plugins
-
-import (
-	"errors"
-	"path/filepath"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-)
-
-// regression test for deadlock in handlers
-func TestPluginAddHandler(t *testing.T) {
-	// make a plugin which is pre-activated
-	p := &Plugin{activateWait: sync.NewCond(&sync.Mutex{})}
-	p.Manifest = &Manifest{Implements: []string{"bananas"}}
-	storage.plugins["qwerty"] = p
-
-	testActive(t, p)
-	Handle("bananas", func(_ string, _ *Client) {})
-	testActive(t, p)
-}
-
-func TestPluginWaitBadPlugin(t *testing.T) {
-	p := &Plugin{activateWait: sync.NewCond(&sync.Mutex{})}
-	p.activateErr = errors.New("some junk happened")
-	testActive(t, p)
-}
-
-func testActive(t *testing.T, p *Plugin) {
-	done := make(chan struct{})
-	go func() {
-		p.waitActive()
-		close(done)
-	}()
-
-	select {
-	case <-time.After(100 * time.Millisecond):
-		_, f, l, _ := runtime.Caller(1)
-		t.Fatalf("%s:%d: deadlock in waitActive", filepath.Base(f), l)
-	case <-done:
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/README.md b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/README.md
deleted file mode 100644
index 0418a3e00a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/README.md
+++ /dev/null
@@ -1,58 +0,0 @@
-Plugin RPC Generator
-====================
-
-Generates go code from a Go interface definition for proxying between the plugin
-API and the subsystem being extended.
-
-## Usage
-
-Given an interface definition:
-
-```go
-type volumeDriver interface {
-	Create(name string, opts opts) (err error)
-	Remove(name string) (err error)
-	Path(name string) (mountpoint string, err error)
-	Mount(name string) (mountpoint string, err error)
-	Unmount(name string) (err error)
-}
-```
-
-**Note**: All function options and return values must be named in the definition.
-
-Run the generator:
-
-```bash
-$ pluginrpc-gen --type volumeDriver --name VolumeDriver -i volumes/drivers/extpoint.go -o volumes/drivers/proxy.go
-```
-
-Where:
-- `--type` is the name of the interface to use
-- `--name` is the subsystem that the plugin "Implements"
-- `-i` is the input file containing the interface definition
-- `-o` is the output file where the the generated code should go
-
-**Note**: The generated code will use the same package name as the one defined in the input file
-
-Optionally, you can skip functions on the interface that should not be
-implemented in the generated proxy code by passing in the function name to `--skip`.
-This flag can be specified multiple times.
-
-You can also add build tags that should be prepended to the generated code by
-supplying `--tag`. This flag can be specified multiple times.
-
-## Known issues
-
-## go-generate
-
-You can also use this with go-generate, which is pretty awesome.  
-To do so, place the code at the top of the file which contains the interface
-definition (i.e., the input file):
-
-```go
-//go:generate pluginrpc-gen -i $GOFILE -o proxy.go -type volumeDriver -name VolumeDriver
-```
-
-Then cd to the package dir and run `go generate`
-
-**Note**: the `pluginrpc-gen` binary must be within your `$PATH`
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/foo.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/foo.go
deleted file mode 100644
index 5695dcc2d4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/foo.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package foo
-
-import (
-	"fmt"
-
-	aliasedio "io"
-
-	"github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture"
-)
-
-var (
-	errFakeImport = fmt.Errorf("just to import fmt for imports tests")
-)
-
-type wobble struct {
-	Some      string
-	Val       string
-	Inception *wobble
-}
-
-// Fooer is an empty interface used for tests.
-type Fooer interface{}
-
-// Fooer2 is an interface used for tests.
-type Fooer2 interface {
-	Foo()
-}
-
-// Fooer3 is an interface used for tests.
-type Fooer3 interface {
-	Foo()
-	Bar(a string)
-	Baz(a string) (err error)
-	Qux(a, b string) (val string, err error)
-	Wobble() (w *wobble)
-	Wiggle() (w wobble)
-	WiggleWobble(a []*wobble, b []wobble, c map[string]*wobble, d map[*wobble]wobble, e map[string][]wobble, f []*otherfixture.Spaceship) (g map[*wobble]wobble, h [][]*wobble, i otherfixture.Spaceship, j *otherfixture.Spaceship, k map[*otherfixture.Spaceship]otherfixture.Spaceship, l []otherfixture.Spaceship)
-}
-
-// Fooer4 is an interface used for tests.
-type Fooer4 interface {
-	Foo() error
-}
-
-// Bar is an interface used for tests.
-type Bar interface {
-	Boo(a string, b string) (s string, err error)
-}
-
-// Fooer5 is an interface used for tests.
-type Fooer5 interface {
-	Foo()
-	Bar
-}
-
-// Fooer6 is an interface used for tests.
-type Fooer6 interface {
-	Foo(a otherfixture.Spaceship)
-}
-
-// Fooer7 is an interface used for tests.
-type Fooer7 interface {
-	Foo(a *otherfixture.Spaceship)
-}
-
-// Fooer8 is an interface used for tests.
-type Fooer8 interface {
-	Foo(a map[string]otherfixture.Spaceship)
-}
-
-// Fooer9 is an interface used for tests.
-type Fooer9 interface {
-	Foo(a map[string]*otherfixture.Spaceship)
-}
-
-// Fooer10 is an interface used for tests.
-type Fooer10 interface {
-	Foo(a []otherfixture.Spaceship)
-}
-
-// Fooer11 is an interface used for tests.
-type Fooer11 interface {
-	Foo(a []*otherfixture.Spaceship)
-}
-
-// Fooer12 is an interface used for tests.
-type Fooer12 interface {
-	Foo(a aliasedio.Reader)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture/spaceship.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture/spaceship.go
deleted file mode 100644
index 1937d1786c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/fixtures/otherfixture/spaceship.go
+++ /dev/null
@@ -1,4 +0,0 @@
-package otherfixture
-
-// Spaceship is a fixture for tests
-type Spaceship struct{}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/main.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/main.go
deleted file mode 100644
index e77a7d45ff..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/main.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"os"
-	"unicode"
-	"unicode/utf8"
-)
-
-type stringSet struct {
-	values map[string]struct{}
-}
-
-func (s stringSet) String() string {
-	return ""
-}
-
-func (s stringSet) Set(value string) error {
-	s.values[value] = struct{}{}
-	return nil
-}
-func (s stringSet) GetValues() map[string]struct{} {
-	return s.values
-}
-
-var (
-	typeName   = flag.String("type", "", "interface type to generate plugin rpc proxy for")
-	rpcName    = flag.String("name", *typeName, "RPC name, set if different from type")
-	inputFile  = flag.String("i", "", "input file path")
-	outputFile = flag.String("o", *inputFile+"_proxy.go", "output file path")
-
-	skipFuncs   map[string]struct{}
-	flSkipFuncs = stringSet{make(map[string]struct{})}
-
-	flBuildTags = stringSet{make(map[string]struct{})}
-)
-
-func errorOut(msg string, err error) {
-	if err == nil {
-		return
-	}
-	fmt.Fprintf(os.Stderr, "%s: %v\n", msg, err)
-	os.Exit(1)
-}
-
-func checkFlags() error {
-	if *outputFile == "" {
-		return fmt.Errorf("missing required flag `-o`")
-	}
-	if *inputFile == "" {
-		return fmt.Errorf("missing required flag `-i`")
-	}
-	return nil
-}
-
-func main() {
-	flag.Var(flSkipFuncs, "skip", "skip parsing for function")
-	flag.Var(flBuildTags, "tag", "build tags to add to generated files")
-	flag.Parse()
-	skipFuncs = flSkipFuncs.GetValues()
-
-	errorOut("error", checkFlags())
-
-	pkg, err := Parse(*inputFile, *typeName)
-	errorOut(fmt.Sprintf("error parsing requested type %s", *typeName), err)
-
-	var analysis = struct {
-		InterfaceType string
-		RPCName       string
-		BuildTags     map[string]struct{}
-		*ParsedPkg
-	}{toLower(*typeName), *rpcName, flBuildTags.GetValues(), pkg}
-	var buf bytes.Buffer
-
-	errorOut("parser error", generatedTempl.Execute(&buf, analysis))
-	src, err := format.Source(buf.Bytes())
-	errorOut("error formatting generated source:\n"+buf.String(), err)
-	errorOut("error writing file", ioutil.WriteFile(*outputFile, src, 0644))
-}
-
-func toLower(s string) string {
-	if s == "" {
-		return ""
-	}
-	r, n := utf8.DecodeRuneInString(s)
-	return string(unicode.ToLower(r)) + s[n:]
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser.go
deleted file mode 100644
index 6c547e18cf..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser.go
+++ /dev/null
@@ -1,263 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"path"
-	"reflect"
-	"strings"
-)
-
-var errBadReturn = errors.New("found return arg with no name: all args must be named")
-
-type errUnexpectedType struct {
-	expected string
-	actual   interface{}
-}
-
-func (e errUnexpectedType) Error() string {
-	return fmt.Sprintf("got wrong type expecting %s, got: %v", e.expected, reflect.TypeOf(e.actual))
-}
-
-// ParsedPkg holds information about a package that has been parsed,
-// its name and the list of functions.
-type ParsedPkg struct {
-	Name      string
-	Functions []function
-	Imports   []importSpec
-}
-
-type function struct {
-	Name    string
-	Args    []arg
-	Returns []arg
-	Doc     string
-}
-
-type arg struct {
-	Name            string
-	ArgType         string
-	PackageSelector string
-}
-
-func (a *arg) String() string {
-	return a.Name + " " + a.ArgType
-}
-
-type importSpec struct {
-	Name string
-	Path string
-}
-
-func (s *importSpec) String() string {
-	var ss string
-	if len(s.Name) != 0 {
-		ss += s.Name
-	}
-	ss += s.Path
-	return ss
-}
-
-// Parse parses the given file for an interface definition with the given name.
-func Parse(filePath string, objName string) (*ParsedPkg, error) {
-	fs := token.NewFileSet()
-	pkg, err := parser.ParseFile(fs, filePath, nil, parser.AllErrors)
-	if err != nil {
-		return nil, err
-	}
-	p := &ParsedPkg{}
-	p.Name = pkg.Name.Name
-	obj, exists := pkg.Scope.Objects[objName]
-	if !exists {
-		return nil, fmt.Errorf("could not find object %s in %s", objName, filePath)
-	}
-	if obj.Kind != ast.Typ {
-		return nil, fmt.Errorf("exected type, got %s", obj.Kind)
-	}
-	spec, ok := obj.Decl.(*ast.TypeSpec)
-	if !ok {
-		return nil, errUnexpectedType{"*ast.TypeSpec", obj.Decl}
-	}
-	iface, ok := spec.Type.(*ast.InterfaceType)
-	if !ok {
-		return nil, errUnexpectedType{"*ast.InterfaceType", spec.Type}
-	}
-
-	p.Functions, err = parseInterface(iface)
-	if err != nil {
-		return nil, err
-	}
-
-	// figure out what imports will be needed
-	imports := make(map[string]importSpec)
-	for _, f := range p.Functions {
-		args := append(f.Args, f.Returns...)
-		for _, arg := range args {
-			if len(arg.PackageSelector) == 0 {
-				continue
-			}
-
-			for _, i := range pkg.Imports {
-				if i.Name != nil {
-					if i.Name.Name != arg.PackageSelector {
-						continue
-					}
-					imports[i.Path.Value] = importSpec{Name: arg.PackageSelector, Path: i.Path.Value}
-					break
-				}
-
-				_, name := path.Split(i.Path.Value)
-				splitName := strings.Split(name, "-")
-				if len(splitName) > 1 {
-					name = splitName[len(splitName)-1]
-				}
-				// import paths have quotes already added in, so need to remove them for name comparison
-				name = strings.TrimPrefix(name, `"`)
-				name = strings.TrimSuffix(name, `"`)
-				if name == arg.PackageSelector {
-					imports[i.Path.Value] = importSpec{Path: i.Path.Value}
-					break
-				}
-			}
-		}
-	}
-
-	for _, spec := range imports {
-		p.Imports = append(p.Imports, spec)
-	}
-
-	return p, nil
-}
-
-func parseInterface(iface *ast.InterfaceType) ([]function, error) {
-	var functions []function
-	for _, field := range iface.Methods.List {
-		switch f := field.Type.(type) {
-		case *ast.FuncType:
-			method, err := parseFunc(field)
-			if err != nil {
-				return nil, err
-			}
-			if method == nil {
-				continue
-			}
-			functions = append(functions, *method)
-		case *ast.Ident:
-			spec, ok := f.Obj.Decl.(*ast.TypeSpec)
-			if !ok {
-				return nil, errUnexpectedType{"*ast.TypeSpec", f.Obj.Decl}
-			}
-			iface, ok := spec.Type.(*ast.InterfaceType)
-			if !ok {
-				return nil, errUnexpectedType{"*ast.TypeSpec", spec.Type}
-			}
-			funcs, err := parseInterface(iface)
-			if err != nil {
-				fmt.Println(err)
-				continue
-			}
-			functions = append(functions, funcs...)
-		default:
-			return nil, errUnexpectedType{"*astFuncType or *ast.Ident", f}
-		}
-	}
-	return functions, nil
-}
-
-func parseFunc(field *ast.Field) (*function, error) {
-	f := field.Type.(*ast.FuncType)
-	method := &function{Name: field.Names[0].Name}
-	if _, exists := skipFuncs[method.Name]; exists {
-		fmt.Println("skipping:", method.Name)
-		return nil, nil
-	}
-	if f.Params != nil {
-		args, err := parseArgs(f.Params.List)
-		if err != nil {
-			return nil, err
-		}
-		method.Args = args
-	}
-	if f.Results != nil {
-		returns, err := parseArgs(f.Results.List)
-		if err != nil {
-			return nil, fmt.Errorf("error parsing function returns for %q: %v", method.Name, err)
-		}
-		method.Returns = returns
-	}
-	return method, nil
-}
-
-func parseArgs(fields []*ast.Field) ([]arg, error) {
-	var args []arg
-	for _, f := range fields {
-		if len(f.Names) == 0 {
-			return nil, errBadReturn
-		}
-		for _, name := range f.Names {
-			p, err := parseExpr(f.Type)
-			if err != nil {
-				return nil, err
-			}
-			args = append(args, arg{name.Name, p.value, p.pkg})
-		}
-	}
-	return args, nil
-}
-
-type parsedExpr struct {
-	value string
-	pkg   string
-}
-
-func parseExpr(e ast.Expr) (parsedExpr, error) {
-	var parsed parsedExpr
-	switch i := e.(type) {
-	case *ast.Ident:
-		parsed.value += i.Name
-	case *ast.StarExpr:
-		p, err := parseExpr(i.X)
-		if err != nil {
-			return parsed, err
-		}
-		parsed.value += "*"
-		parsed.value += p.value
-		parsed.pkg = p.pkg
-	case *ast.SelectorExpr:
-		p, err := parseExpr(i.X)
-		if err != nil {
-			return parsed, err
-		}
-		parsed.pkg = p.value
-		parsed.value += p.value + "."
-		parsed.value += i.Sel.Name
-	case *ast.MapType:
-		parsed.value += "map["
-		p, err := parseExpr(i.Key)
-		if err != nil {
-			return parsed, err
-		}
-		parsed.value += p.value
-		parsed.value += "]"
-		p, err = parseExpr(i.Value)
-		if err != nil {
-			return parsed, err
-		}
-		parsed.value += p.value
-		parsed.pkg = p.pkg
-	case *ast.ArrayType:
-		parsed.value += "[]"
-		p, err := parseExpr(i.Elt)
-		if err != nil {
-			return parsed, err
-		}
-		parsed.value += p.value
-		parsed.pkg = p.pkg
-	default:
-		return parsed, errUnexpectedType{"*ast.Ident or *ast.StarExpr", i}
-	}
-	return parsed, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser_test.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser_test.go
deleted file mode 100644
index a1b1ac9567..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/parser_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-const testFixture = "fixtures/foo.go"
-
-func TestParseEmptyInterface(t *testing.T) {
-	pkg, err := Parse(testFixture, "Fooer")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertName(t, "foo", pkg.Name)
-	assertNum(t, 0, len(pkg.Functions))
-}
-
-func TestParseNonInterfaceType(t *testing.T) {
-	_, err := Parse(testFixture, "wobble")
-	if _, ok := err.(errUnexpectedType); !ok {
-		t.Fatal("expected type error when parsing non-interface type")
-	}
-}
-
-func TestParseWithOneFunction(t *testing.T) {
-	pkg, err := Parse(testFixture, "Fooer2")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertName(t, "foo", pkg.Name)
-	assertNum(t, 1, len(pkg.Functions))
-	assertName(t, "Foo", pkg.Functions[0].Name)
-	assertNum(t, 0, len(pkg.Functions[0].Args))
-	assertNum(t, 0, len(pkg.Functions[0].Returns))
-}
-
-func TestParseWithMultipleFuncs(t *testing.T) {
-	pkg, err := Parse(testFixture, "Fooer3")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertName(t, "foo", pkg.Name)
-	assertNum(t, 7, len(pkg.Functions))
-
-	f := pkg.Functions[0]
-	assertName(t, "Foo", f.Name)
-	assertNum(t, 0, len(f.Args))
-	assertNum(t, 0, len(f.Returns))
-
-	f = pkg.Functions[1]
-	assertName(t, "Bar", f.Name)
-	assertNum(t, 1, len(f.Args))
-	assertNum(t, 0, len(f.Returns))
-	arg := f.Args[0]
-	assertName(t, "a", arg.Name)
-	assertName(t, "string", arg.ArgType)
-
-	f = pkg.Functions[2]
-	assertName(t, "Baz", f.Name)
-	assertNum(t, 1, len(f.Args))
-	assertNum(t, 1, len(f.Returns))
-	arg = f.Args[0]
-	assertName(t, "a", arg.Name)
-	assertName(t, "string", arg.ArgType)
-	arg = f.Returns[0]
-	assertName(t, "err", arg.Name)
-	assertName(t, "error", arg.ArgType)
-
-	f = pkg.Functions[3]
-	assertName(t, "Qux", f.Name)
-	assertNum(t, 2, len(f.Args))
-	assertNum(t, 2, len(f.Returns))
-	arg = f.Args[0]
-	assertName(t, "a", f.Args[0].Name)
-	assertName(t, "string", f.Args[0].ArgType)
-	arg = f.Args[1]
-	assertName(t, "b", arg.Name)
-	assertName(t, "string", arg.ArgType)
-	arg = f.Returns[0]
-	assertName(t, "val", arg.Name)
-	assertName(t, "string", arg.ArgType)
-	arg = f.Returns[1]
-	assertName(t, "err", arg.Name)
-	assertName(t, "error", arg.ArgType)
-
-	f = pkg.Functions[4]
-	assertName(t, "Wobble", f.Name)
-	assertNum(t, 0, len(f.Args))
-	assertNum(t, 1, len(f.Returns))
-	arg = f.Returns[0]
-	assertName(t, "w", arg.Name)
-	assertName(t, "*wobble", arg.ArgType)
-
-	f = pkg.Functions[5]
-	assertName(t, "Wiggle", f.Name)
-	assertNum(t, 0, len(f.Args))
-	assertNum(t, 1, len(f.Returns))
-	arg = f.Returns[0]
-	assertName(t, "w", arg.Name)
-	assertName(t, "wobble", arg.ArgType)
-
-	f = pkg.Functions[6]
-	assertName(t, "WiggleWobble", f.Name)
-	assertNum(t, 6, len(f.Args))
-	assertNum(t, 6, len(f.Returns))
-	expectedArgs := [][]string{
-		{"a", "[]*wobble"},
-		{"b", "[]wobble"},
-		{"c", "map[string]*wobble"},
-		{"d", "map[*wobble]wobble"},
-		{"e", "map[string][]wobble"},
-		{"f", "[]*otherfixture.Spaceship"},
-	}
-	for i, arg := range f.Args {
-		assertName(t, expectedArgs[i][0], arg.Name)
-		assertName(t, expectedArgs[i][1], arg.ArgType)
-	}
-	expectedReturns := [][]string{
-		{"g", "map[*wobble]wobble"},
-		{"h", "[][]*wobble"},
-		{"i", "otherfixture.Spaceship"},
-		{"j", "*otherfixture.Spaceship"},
-		{"k", "map[*otherfixture.Spaceship]otherfixture.Spaceship"},
-		{"l", "[]otherfixture.Spaceship"},
-	}
-	for i, ret := range f.Returns {
-		assertName(t, expectedReturns[i][0], ret.Name)
-		assertName(t, expectedReturns[i][1], ret.ArgType)
-	}
-}
-
-func TestParseWithUnamedReturn(t *testing.T) {
-	_, err := Parse(testFixture, "Fooer4")
-	if !strings.HasSuffix(err.Error(), errBadReturn.Error()) {
-		t.Fatalf("expected ErrBadReturn, got %v", err)
-	}
-}
-
-func TestEmbeddedInterface(t *testing.T) {
-	pkg, err := Parse(testFixture, "Fooer5")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertName(t, "foo", pkg.Name)
-	assertNum(t, 2, len(pkg.Functions))
-
-	f := pkg.Functions[0]
-	assertName(t, "Foo", f.Name)
-	assertNum(t, 0, len(f.Args))
-	assertNum(t, 0, len(f.Returns))
-
-	f = pkg.Functions[1]
-	assertName(t, "Boo", f.Name)
-	assertNum(t, 2, len(f.Args))
-	assertNum(t, 2, len(f.Returns))
-
-	arg := f.Args[0]
-	assertName(t, "a", arg.Name)
-	assertName(t, "string", arg.ArgType)
-
-	arg = f.Args[1]
-	assertName(t, "b", arg.Name)
-	assertName(t, "string", arg.ArgType)
-
-	arg = f.Returns[0]
-	assertName(t, "s", arg.Name)
-	assertName(t, "string", arg.ArgType)
-
-	arg = f.Returns[1]
-	assertName(t, "err", arg.Name)
-	assertName(t, "error", arg.ArgType)
-}
-
-func TestParsedImports(t *testing.T) {
-	cases := []string{"Fooer6", "Fooer7", "Fooer8", "Fooer9", "Fooer10", "Fooer11"}
-	for _, testCase := range cases {
-		pkg, err := Parse(testFixture, testCase)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		assertNum(t, 1, len(pkg.Imports))
-		importPath := strings.Split(pkg.Imports[0].Path, "/")
-		assertName(t, "otherfixture\"", importPath[len(importPath)-1])
-		assertName(t, "", pkg.Imports[0].Name)
-	}
-}
-
-func TestAliasedImports(t *testing.T) {
-	pkg, err := Parse(testFixture, "Fooer12")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	assertNum(t, 1, len(pkg.Imports))
-	assertName(t, "aliasedio", pkg.Imports[0].Name)
-}
-
-func assertName(t *testing.T, expected, actual string) {
-	if expected != actual {
-		fatalOut(t, fmt.Sprintf("expected name to be `%s`, got: %s", expected, actual))
-	}
-}
-
-func assertNum(t *testing.T, expected, actual int) {
-	if expected != actual {
-		fatalOut(t, fmt.Sprintf("expected number to be %d, got: %d", expected, actual))
-	}
-}
-
-func fatalOut(t *testing.T, msg string) {
-	_, file, ln, _ := runtime.Caller(2)
-	t.Fatalf("%s:%d: %s", filepath.Base(file), ln, msg)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/template.go b/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/template.go
deleted file mode 100644
index 50ed9293c1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/pluginrpc-gen/template.go
+++ /dev/null
@@ -1,118 +0,0 @@
-package main
-
-import (
-	"strings"
-	"text/template"
-)
-
-func printArgs(args []arg) string {
-	var argStr []string
-	for _, arg := range args {
-		argStr = append(argStr, arg.String())
-	}
-	return strings.Join(argStr, ", ")
-}
-
-func buildImports(specs []importSpec) string {
-	if len(specs) == 0 {
-		return `import "errors"`
-	}
-	imports := "import(\n"
-	imports += "\t\"errors\"\n"
-	for _, i := range specs {
-		imports += "\t" + i.String() + "\n"
-	}
-	imports += ")"
-	return imports
-}
-
-func marshalType(t string) string {
-	switch t {
-	case "error":
-		// convert error types to plain strings to ensure the values are encoded/decoded properly
-		return "string"
-	default:
-		return t
-	}
-}
-
-func isErr(t string) bool {
-	switch t {
-	case "error":
-		return true
-	default:
-		return false
-	}
-}
-
-// Need to use this helper due to issues with go-vet
-func buildTag(s string) string {
-	return "+build " + s
-}
-
-var templFuncs = template.FuncMap{
-	"printArgs":   printArgs,
-	"marshalType": marshalType,
-	"isErr":       isErr,
-	"lower":       strings.ToLower,
-	"title":       title,
-	"tag":         buildTag,
-	"imports":     buildImports,
-}
-
-func title(s string) string {
-	if strings.ToLower(s) == "id" {
-		return "ID"
-	}
-	return strings.Title(s)
-}
-
-var generatedTempl = template.Must(template.New("rpc_cient").Funcs(templFuncs).Parse(`
-// generated code - DO NOT EDIT
-{{ range $k, $v := .BuildTags }}
-	// {{ tag $k }} {{ end }}
-
-package {{ .Name }}
-
-{{ imports .Imports }}
-
-type client interface{
-	Call(string, interface{}, interface{}) error
-}
-
-type {{ .InterfaceType }}Proxy struct {
-	client
-}
-
-{{ range .Functions }}
-	type {{ $.InterfaceType }}Proxy{{ .Name }}Request struct{
-		{{ range .Args }}
-			{{ title .Name }} {{ .ArgType }} {{ end }}
-	}
-
-	type {{ $.InterfaceType }}Proxy{{ .Name }}Response struct{
-		{{ range .Returns }}
-			{{ title .Name }} {{ marshalType .ArgType }} {{ end }}
-	}
-
-	func (pp *{{ $.InterfaceType }}Proxy) {{ .Name }}({{ printArgs .Args }}) ({{ printArgs .Returns }}) {
-		var(
-			req {{ $.InterfaceType }}Proxy{{ .Name }}Request
-			ret {{ $.InterfaceType }}Proxy{{ .Name }}Response
-		)
-		{{ range .Args }}
-			req.{{ title .Name }} = {{ lower .Name }} {{ end }}
-		if err = pp.Call("{{ $.RPCName }}.{{ .Name }}", req, &ret); err != nil {
-			return
-		}
-		{{ range $r := .Returns }}
-			{{ if isErr .ArgType }}
-				if ret.{{ title .Name }} != "" {
-					{{ lower .Name }} = errors.New(ret.{{ title .Name }})
-				} {{ end }}
-			{{ if isErr .ArgType | not }} {{ lower .Name }} = ret.{{ title .Name }} {{ end }} {{ end }}
-
-		return
-	}
-{{ end }}
-`))
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins.go b/installer/vendor/github.com/docker/docker/pkg/plugins/plugins.go
deleted file mode 100644
index c0059cba75..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Package plugins provides structures and helper functions to manage Docker
-// plugins.
-//
-// Docker discovers plugins by looking for them in the plugin directory whenever
-// a user or container tries to use one by name. UNIX domain socket files must
-// be located under /run/docker/plugins, whereas spec files can be located
-// either under /etc/docker/plugins or /usr/lib/docker/plugins. This is handled
-// by the Registry interface, which lets you list all plugins or get a plugin by
-// its name if it exists.
-//
-// The plugins need to implement an HTTP server and bind this to the UNIX socket
-// or the address specified in the spec files.
-// A handshake is send at /Plugin.Activate, and plugins are expected to return
-// a Manifest with a list of of Docker subsystems which this plugin implements.
-//
-// In order to use a plugins, you can use the ``Get`` with the name of the
-// plugin and the subsystem it implements.
-//
-//	plugin, err := plugins.Get("example", "VolumeDriver")
-//	if err != nil {
-//		return fmt.Errorf("Error looking up volume plugin example: %v", err)
-//	}
-package plugins
-
-import (
-	"errors"
-	"sync"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-var (
-	// ErrNotImplements is returned if the plugin does not implement the requested driver.
-	ErrNotImplements = errors.New("Plugin does not implement the requested driver")
-)
-
-type plugins struct {
-	sync.Mutex
-	plugins map[string]*Plugin
-}
-
-type extpointHandlers struct {
-	sync.RWMutex
-	extpointHandlers map[string][]func(string, *Client)
-}
-
-var (
-	storage  = plugins{plugins: make(map[string]*Plugin)}
-	handlers = extpointHandlers{extpointHandlers: make(map[string][]func(string, *Client))}
-)
-
-// Manifest lists what a plugin implements.
-type Manifest struct {
-	// List of subsystem the plugin implements.
-	Implements []string
-}
-
-// Plugin is the definition of a docker plugin.
-type Plugin struct {
-	// Name of the plugin
-	name string
-	// Address of the plugin
-	Addr string
-	// TLS configuration of the plugin
-	TLSConfig *tlsconfig.Options
-	// Client attached to the plugin
-	client *Client
-	// Manifest of the plugin (see above)
-	Manifest *Manifest `json:"-"`
-
-	// wait for activation to finish
-	activateWait *sync.Cond
-	// error produced by activation
-	activateErr error
-	// keeps track of callback handlers run against this plugin
-	handlersRun bool
-}
-
-// Name returns the name of the plugin.
-func (p *Plugin) Name() string {
-	return p.name
-}
-
-// Client returns a ready-to-use plugin client that can be used to communicate with the plugin.
-func (p *Plugin) Client() *Client {
-	return p.client
-}
-
-// IsV1 returns true for V1 plugins and false otherwise.
-func (p *Plugin) IsV1() bool {
-	return true
-}
-
-// NewLocalPlugin creates a new local plugin.
-func NewLocalPlugin(name, addr string) *Plugin {
-	return &Plugin{
-		name: name,
-		Addr: addr,
-		// TODO: change to nil
-		TLSConfig:    &tlsconfig.Options{InsecureSkipVerify: true},
-		activateWait: sync.NewCond(&sync.Mutex{}),
-	}
-}
-
-func (p *Plugin) activate() error {
-	p.activateWait.L.Lock()
-
-	if p.activated() {
-		p.runHandlers()
-		p.activateWait.L.Unlock()
-		return p.activateErr
-	}
-
-	p.activateErr = p.activateWithLock()
-
-	p.runHandlers()
-	p.activateWait.L.Unlock()
-	p.activateWait.Broadcast()
-	return p.activateErr
-}
-
-// runHandlers runs the registered handlers for the implemented plugin types
-// This should only be run after activation, and while the activation lock is held.
-func (p *Plugin) runHandlers() {
-	if !p.activated() {
-		return
-	}
-
-	handlers.RLock()
-	if !p.handlersRun {
-		for _, iface := range p.Manifest.Implements {
-			hdlrs, handled := handlers.extpointHandlers[iface]
-			if !handled {
-				continue
-			}
-			for _, handler := range hdlrs {
-				handler(p.name, p.client)
-			}
-		}
-		p.handlersRun = true
-	}
-	handlers.RUnlock()
-
-}
-
-// activated returns if the plugin has already been activated.
-// This should only be called with the activation lock held
-func (p *Plugin) activated() bool {
-	return p.Manifest != nil
-}
-
-func (p *Plugin) activateWithLock() error {
-	c, err := NewClient(p.Addr, p.TLSConfig)
-	if err != nil {
-		return err
-	}
-	p.client = c
-
-	m := new(Manifest)
-	if err = p.client.Call("Plugin.Activate", nil, m); err != nil {
-		return err
-	}
-
-	p.Manifest = m
-	return nil
-}
-
-func (p *Plugin) waitActive() error {
-	p.activateWait.L.Lock()
-	for !p.activated() && p.activateErr == nil {
-		p.activateWait.Wait()
-	}
-	p.activateWait.L.Unlock()
-	return p.activateErr
-}
-
-func (p *Plugin) implements(kind string) bool {
-	if p.Manifest == nil {
-		return false
-	}
-	for _, driver := range p.Manifest.Implements {
-		if driver == kind {
-			return true
-		}
-	}
-	return false
-}
-
-func load(name string) (*Plugin, error) {
-	return loadWithRetry(name, true)
-}
-
-func loadWithRetry(name string, retry bool) (*Plugin, error) {
-	registry := newLocalRegistry()
-	start := time.Now()
-
-	var retries int
-	for {
-		pl, err := registry.Plugin(name)
-		if err != nil {
-			if !retry {
-				return nil, err
-			}
-
-			timeOff := backoff(retries)
-			if abort(start, timeOff) {
-				return nil, err
-			}
-			retries++
-			logrus.Warnf("Unable to locate plugin: %s, retrying in %v", name, timeOff)
-			time.Sleep(timeOff)
-			continue
-		}
-
-		storage.Lock()
-		if pl, exists := storage.plugins[name]; exists {
-			storage.Unlock()
-			return pl, pl.activate()
-		}
-		storage.plugins[name] = pl
-		storage.Unlock()
-
-		err = pl.activate()
-
-		if err != nil {
-			storage.Lock()
-			delete(storage.plugins, name)
-			storage.Unlock()
-		}
-
-		return pl, err
-	}
-}
-
-func get(name string) (*Plugin, error) {
-	storage.Lock()
-	pl, ok := storage.plugins[name]
-	storage.Unlock()
-	if ok {
-		return pl, pl.activate()
-	}
-	return load(name)
-}
-
-// Get returns the plugin given the specified name and requested implementation.
-func Get(name, imp string) (*Plugin, error) {
-	pl, err := get(name)
-	if err != nil {
-		return nil, err
-	}
-	if err := pl.waitActive(); err == nil && pl.implements(imp) {
-		logrus.Debugf("%s implements: %s", name, imp)
-		return pl, nil
-	}
-	return nil, ErrNotImplements
-}
-
-// Handle adds the specified function to the extpointHandlers.
-func Handle(iface string, fn func(string, *Client)) {
-	handlers.Lock()
-	hdlrs, ok := handlers.extpointHandlers[iface]
-	if !ok {
-		hdlrs = []func(string, *Client){}
-	}
-
-	hdlrs = append(hdlrs, fn)
-	handlers.extpointHandlers[iface] = hdlrs
-
-	storage.Lock()
-	for _, p := range storage.plugins {
-		p.activateWait.L.Lock()
-		if p.activated() && p.implements(iface) {
-			p.handlersRun = false
-		}
-		p.activateWait.L.Unlock()
-	}
-	storage.Unlock()
-
-	handlers.Unlock()
-}
-
-// GetAll returns all the plugins for the specified implementation
-func GetAll(imp string) ([]*Plugin, error) {
-	pluginNames, err := Scan()
-	if err != nil {
-		return nil, err
-	}
-
-	type plLoad struct {
-		pl  *Plugin
-		err error
-	}
-
-	chPl := make(chan *plLoad, len(pluginNames))
-	var wg sync.WaitGroup
-	for _, name := range pluginNames {
-		storage.Lock()
-		pl, ok := storage.plugins[name]
-		storage.Unlock()
-		if ok {
-			chPl <- &plLoad{pl, nil}
-			continue
-		}
-
-		wg.Add(1)
-		go func(name string) {
-			defer wg.Done()
-			pl, err := loadWithRetry(name, false)
-			chPl <- &plLoad{pl, err}
-		}(name)
-	}
-
-	wg.Wait()
-	close(chPl)
-
-	var out []*Plugin
-	for pl := range chPl {
-		if pl.err != nil {
-			logrus.Error(pl.err)
-			continue
-		}
-		if err := pl.pl.waitActive(); err == nil && pl.pl.implements(imp) {
-			out = append(out, pl.pl)
-		}
-	}
-	return out, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_linux.go b/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_linux.go
deleted file mode 100644
index 9c5a0b5632..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_linux.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package plugins
-
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For v1 plugins, this always returns the host's root directory.
-func (p *Plugin) BasePath() string {
-	return "/"
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_windows.go b/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_windows.go
deleted file mode 100644
index 3c8d8feb83..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/plugins_windows.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package plugins
-
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For Windows v1 plugins, this returns an empty string, since the plugin is already aware
-// of the absolute path of the mount.
-func (p *Plugin) BasePath() string {
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/transport/http.go b/installer/vendor/github.com/docker/docker/pkg/plugins/transport/http.go
deleted file mode 100644
index 5be146af65..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/transport/http.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package transport
-
-import (
-	"io"
-	"net/http"
-)
-
-// httpTransport holds an http.RoundTripper
-// and information about the scheme and address the transport
-// sends request to.
-type httpTransport struct {
-	http.RoundTripper
-	scheme string
-	addr   string
-}
-
-// NewHTTPTransport creates a new httpTransport.
-func NewHTTPTransport(r http.RoundTripper, scheme, addr string) Transport {
-	return httpTransport{
-		RoundTripper: r,
-		scheme:       scheme,
-		addr:         addr,
-	}
-}
-
-// NewRequest creates a new http.Request and sets the URL
-// scheme and address with the transport's fields.
-func (t httpTransport) NewRequest(path string, data io.Reader) (*http.Request, error) {
-	req, err := newHTTPRequest(path, data)
-	if err != nil {
-		return nil, err
-	}
-	req.URL.Scheme = t.scheme
-	req.URL.Host = t.addr
-	return req, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/plugins/transport/transport.go b/installer/vendor/github.com/docker/docker/pkg/plugins/transport/transport.go
deleted file mode 100644
index d7f1e2100c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/plugins/transport/transport.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package transport
-
-import (
-	"io"
-	"net/http"
-	"strings"
-)
-
-// VersionMimetype is the Content-Type the engine sends to plugins.
-const VersionMimetype = "application/vnd.docker.plugins.v1.2+json"
-
-// RequestFactory defines an interface that
-// transports can implement to create new requests.
-type RequestFactory interface {
-	NewRequest(path string, data io.Reader) (*http.Request, error)
-}
-
-// Transport defines an interface that plugin transports
-// must implement.
-type Transport interface {
-	http.RoundTripper
-	RequestFactory
-}
-
-// newHTTPRequest creates a new request with a path and a body.
-func newHTTPRequest(path string, data io.Reader) (*http.Request, error) {
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-	req, err := http.NewRequest("POST", path, data)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Add("Accept", VersionMimetype)
-	return req, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pools/pools.go b/installer/vendor/github.com/docker/docker/pkg/pools/pools.go
deleted file mode 100644
index 5c5aead698..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pools/pools.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Package pools provides a collection of pools which provide various
-// data types with buffers. These can be used to lower the number of
-// memory allocations and reuse buffers.
-//
-// New pools should be added to this package to allow them to be
-// shared across packages.
-//
-// Utility functions which operate on pools should be added to this
-// package to allow them to be reused.
-package pools
-
-import (
-	"bufio"
-	"io"
-	"sync"
-
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-var (
-	// BufioReader32KPool is a pool which returns bufio.Reader with a 32K buffer.
-	BufioReader32KPool = newBufioReaderPoolWithSize(buffer32K)
-	// BufioWriter32KPool is a pool which returns bufio.Writer with a 32K buffer.
-	BufioWriter32KPool = newBufioWriterPoolWithSize(buffer32K)
-)
-
-const buffer32K = 32 * 1024
-
-// BufioReaderPool is a bufio reader that uses sync.Pool.
-type BufioReaderPool struct {
-	pool sync.Pool
-}
-
-// newBufioReaderPoolWithSize is unexported because new pools should be
-// added here to be shared where required.
-func newBufioReaderPoolWithSize(size int) *BufioReaderPool {
-	return &BufioReaderPool{
-		pool: sync.Pool{
-			New: func() interface{} { return bufio.NewReaderSize(nil, size) },
-		},
-	}
-}
-
-// Get returns a bufio.Reader which reads from r. The buffer size is that of the pool.
-func (bufPool *BufioReaderPool) Get(r io.Reader) *bufio.Reader {
-	buf := bufPool.pool.Get().(*bufio.Reader)
-	buf.Reset(r)
-	return buf
-}
-
-// Put puts the bufio.Reader back into the pool.
-func (bufPool *BufioReaderPool) Put(b *bufio.Reader) {
-	b.Reset(nil)
-	bufPool.pool.Put(b)
-}
-
-// Copy is a convenience wrapper which uses a buffer to avoid allocation in io.Copy.
-func Copy(dst io.Writer, src io.Reader) (written int64, err error) {
-	buf := BufioReader32KPool.Get(src)
-	written, err = io.Copy(dst, buf)
-	BufioReader32KPool.Put(buf)
-	return
-}
-
-// NewReadCloserWrapper returns a wrapper which puts the bufio.Reader back
-// into the pool and closes the reader if it's an io.ReadCloser.
-func (bufPool *BufioReaderPool) NewReadCloserWrapper(buf *bufio.Reader, r io.Reader) io.ReadCloser {
-	return ioutils.NewReadCloserWrapper(r, func() error {
-		if readCloser, ok := r.(io.ReadCloser); ok {
-			readCloser.Close()
-		}
-		bufPool.Put(buf)
-		return nil
-	})
-}
-
-// BufioWriterPool is a bufio writer that uses sync.Pool.
-type BufioWriterPool struct {
-	pool sync.Pool
-}
-
-// newBufioWriterPoolWithSize is unexported because new pools should be
-// added here to be shared where required.
-func newBufioWriterPoolWithSize(size int) *BufioWriterPool {
-	return &BufioWriterPool{
-		pool: sync.Pool{
-			New: func() interface{} { return bufio.NewWriterSize(nil, size) },
-		},
-	}
-}
-
-// Get returns a bufio.Writer which writes to w. The buffer size is that of the pool.
-func (bufPool *BufioWriterPool) Get(w io.Writer) *bufio.Writer {
-	buf := bufPool.pool.Get().(*bufio.Writer)
-	buf.Reset(w)
-	return buf
-}
-
-// Put puts the bufio.Writer back into the pool.
-func (bufPool *BufioWriterPool) Put(b *bufio.Writer) {
-	b.Reset(nil)
-	bufPool.pool.Put(b)
-}
-
-// NewWriteCloserWrapper returns a wrapper which puts the bufio.Writer back
-// into the pool and closes the writer if it's an io.Writecloser.
-func (bufPool *BufioWriterPool) NewWriteCloserWrapper(buf *bufio.Writer, w io.Writer) io.WriteCloser {
-	return ioutils.NewWriteCloserWrapper(w, func() error {
-		buf.Flush()
-		if writeCloser, ok := w.(io.WriteCloser); ok {
-			writeCloser.Close()
-		}
-		bufPool.Put(buf)
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pools/pools_test.go b/installer/vendor/github.com/docker/docker/pkg/pools/pools_test.go
deleted file mode 100644
index 1661b780c9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pools/pools_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package pools
-
-import (
-	"bufio"
-	"bytes"
-	"io"
-	"strings"
-	"testing"
-)
-
-func TestBufioReaderPoolGetWithNoReaderShouldCreateOne(t *testing.T) {
-	reader := BufioReader32KPool.Get(nil)
-	if reader == nil {
-		t.Fatalf("BufioReaderPool should have create a bufio.Reader but did not.")
-	}
-}
-
-func TestBufioReaderPoolPutAndGet(t *testing.T) {
-	sr := bufio.NewReader(strings.NewReader("foobar"))
-	reader := BufioReader32KPool.Get(sr)
-	if reader == nil {
-		t.Fatalf("BufioReaderPool should not return a nil reader.")
-	}
-	// verify the first 3 byte
-	buf1 := make([]byte, 3)
-	_, err := reader.Read(buf1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual := string(buf1); actual != "foo" {
-		t.Fatalf("The first letter should have been 'foo' but was %v", actual)
-	}
-	BufioReader32KPool.Put(reader)
-	// Try to read the next 3 bytes
-	_, err = sr.Read(make([]byte, 3))
-	if err == nil || err != io.EOF {
-		t.Fatalf("The buffer should have been empty, issue an EOF error.")
-	}
-}
-
-type simpleReaderCloser struct {
-	io.Reader
-	closed bool
-}
-
-func (r *simpleReaderCloser) Close() error {
-	r.closed = true
-	return nil
-}
-
-func TestNewReadCloserWrapperWithAReadCloser(t *testing.T) {
-	br := bufio.NewReader(strings.NewReader(""))
-	sr := &simpleReaderCloser{
-		Reader: strings.NewReader("foobar"),
-		closed: false,
-	}
-	reader := BufioReader32KPool.NewReadCloserWrapper(br, sr)
-	if reader == nil {
-		t.Fatalf("NewReadCloserWrapper should not return a nil reader.")
-	}
-	// Verify the content of reader
-	buf := make([]byte, 3)
-	_, err := reader.Read(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual := string(buf); actual != "foo" {
-		t.Fatalf("The first 3 letter should have been 'foo' but were %v", actual)
-	}
-	reader.Close()
-	// Read 3 more bytes "bar"
-	_, err = reader.Read(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if actual := string(buf); actual != "bar" {
-		t.Fatalf("The first 3 letter should have been 'bar' but were %v", actual)
-	}
-	if !sr.closed {
-		t.Fatalf("The ReaderCloser should have been closed, it is not.")
-	}
-}
-
-func TestBufioWriterPoolGetWithNoReaderShouldCreateOne(t *testing.T) {
-	writer := BufioWriter32KPool.Get(nil)
-	if writer == nil {
-		t.Fatalf("BufioWriterPool should have create a bufio.Writer but did not.")
-	}
-}
-
-func TestBufioWriterPoolPutAndGet(t *testing.T) {
-	buf := new(bytes.Buffer)
-	bw := bufio.NewWriter(buf)
-	writer := BufioWriter32KPool.Get(bw)
-	if writer == nil {
-		t.Fatalf("BufioReaderPool should not return a nil writer.")
-	}
-	written, err := writer.Write([]byte("foobar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if written != 6 {
-		t.Fatalf("Should have written 6 bytes, but wrote %v bytes", written)
-	}
-	// Make sure we Flush all the way ?
-	writer.Flush()
-	bw.Flush()
-	if len(buf.Bytes()) != 6 {
-		t.Fatalf("The buffer should contain 6 bytes ('foobar') but contains %v ('%v')", buf.Bytes(), string(buf.Bytes()))
-	}
-	// Reset the buffer
-	buf.Reset()
-	BufioWriter32KPool.Put(writer)
-	// Try to write something
-	if _, err = writer.Write([]byte("barfoo")); err != nil {
-		t.Fatal(err)
-	}
-	// If we now try to flush it, it should panic (the writer is nil)
-	// recover it
-	defer func() {
-		if r := recover(); r == nil {
-			t.Fatal("Trying to flush the writter should have 'paniced', did not.")
-		}
-	}()
-	writer.Flush()
-}
-
-type simpleWriterCloser struct {
-	io.Writer
-	closed bool
-}
-
-func (r *simpleWriterCloser) Close() error {
-	r.closed = true
-	return nil
-}
-
-func TestNewWriteCloserWrapperWithAWriteCloser(t *testing.T) {
-	buf := new(bytes.Buffer)
-	bw := bufio.NewWriter(buf)
-	sw := &simpleWriterCloser{
-		Writer: new(bytes.Buffer),
-		closed: false,
-	}
-	bw.Flush()
-	writer := BufioWriter32KPool.NewWriteCloserWrapper(bw, sw)
-	if writer == nil {
-		t.Fatalf("BufioReaderPool should not return a nil writer.")
-	}
-	written, err := writer.Write([]byte("foobar"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if written != 6 {
-		t.Fatalf("Should have written 6 bytes, but wrote %v bytes", written)
-	}
-	writer.Close()
-	if !sw.closed {
-		t.Fatalf("The ReaderCloser should have been closed, it is not.")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/progress/progressreader_test.go b/installer/vendor/github.com/docker/docker/pkg/progress/progressreader_test.go
deleted file mode 100644
index b14d401561..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/progress/progressreader_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package progress
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestOutputOnPrematureClose(t *testing.T) {
-	content := []byte("TESTING")
-	reader := ioutil.NopCloser(bytes.NewReader(content))
-	progressChan := make(chan Progress, 10)
-
-	pr := NewProgressReader(reader, ChanOutput(progressChan), int64(len(content)), "Test", "Read")
-
-	part := make([]byte, 4, 4)
-	_, err := io.ReadFull(pr, part)
-	if err != nil {
-		pr.Close()
-		t.Fatal(err)
-	}
-
-drainLoop:
-	for {
-		select {
-		case <-progressChan:
-		default:
-			break drainLoop
-		}
-	}
-
-	pr.Close()
-
-	select {
-	case <-progressChan:
-	default:
-		t.Fatalf("Expected some output when closing prematurely")
-	}
-}
-
-func TestCompleteSilently(t *testing.T) {
-	content := []byte("TESTING")
-	reader := ioutil.NopCloser(bytes.NewReader(content))
-	progressChan := make(chan Progress, 10)
-
-	pr := NewProgressReader(reader, ChanOutput(progressChan), int64(len(content)), "Test", "Read")
-
-	out, err := ioutil.ReadAll(pr)
-	if err != nil {
-		pr.Close()
-		t.Fatal(err)
-	}
-	if string(out) != "TESTING" {
-		pr.Close()
-		t.Fatalf("Unexpected output %q from reader", string(out))
-	}
-
-drainLoop:
-	for {
-		select {
-		case <-progressChan:
-		default:
-			break drainLoop
-		}
-	}
-
-	pr.Close()
-
-	select {
-	case <-progressChan:
-		t.Fatalf("Should have closed silently when read is complete")
-	default:
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/promise/promise.go b/installer/vendor/github.com/docker/docker/pkg/promise/promise.go
deleted file mode 100644
index dd52b9082f..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/promise/promise.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package promise
-
-// Go is a basic promise implementation: it wraps calls a function in a goroutine,
-// and returns a channel which will later return the function's return value.
-func Go(f func() error) chan error {
-	ch := make(chan error, 1)
-	go func() {
-		ch <- f()
-	}()
-	return ch
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/pubsub/publisher_test.go b/installer/vendor/github.com/docker/docker/pkg/pubsub/publisher_test.go
deleted file mode 100644
index d6b0a1d59a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/pubsub/publisher_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package pubsub
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-func TestSendToOneSub(t *testing.T) {
-	p := NewPublisher(100*time.Millisecond, 10)
-	c := p.Subscribe()
-
-	p.Publish("hi")
-
-	msg := <-c
-	if msg.(string) != "hi" {
-		t.Fatalf("expected message hi but received %v", msg)
-	}
-}
-
-func TestSendToMultipleSubs(t *testing.T) {
-	p := NewPublisher(100*time.Millisecond, 10)
-	subs := []chan interface{}{}
-	subs = append(subs, p.Subscribe(), p.Subscribe(), p.Subscribe())
-
-	p.Publish("hi")
-
-	for _, c := range subs {
-		msg := <-c
-		if msg.(string) != "hi" {
-			t.Fatalf("expected message hi but received %v", msg)
-		}
-	}
-}
-
-func TestEvictOneSub(t *testing.T) {
-	p := NewPublisher(100*time.Millisecond, 10)
-	s1 := p.Subscribe()
-	s2 := p.Subscribe()
-
-	p.Evict(s1)
-	p.Publish("hi")
-	if _, ok := <-s1; ok {
-		t.Fatal("expected s1 to not receive the published message")
-	}
-
-	msg := <-s2
-	if msg.(string) != "hi" {
-		t.Fatalf("expected message hi but received %v", msg)
-	}
-}
-
-func TestClosePublisher(t *testing.T) {
-	p := NewPublisher(100*time.Millisecond, 10)
-	subs := []chan interface{}{}
-	subs = append(subs, p.Subscribe(), p.Subscribe(), p.Subscribe())
-	p.Close()
-
-	for _, c := range subs {
-		if _, ok := <-c; ok {
-			t.Fatal("expected all subscriber channels to be closed")
-		}
-	}
-}
-
-const sampleText = "test"
-
-type testSubscriber struct {
-	dataCh chan interface{}
-	ch     chan error
-}
-
-func (s *testSubscriber) Wait() error {
-	return <-s.ch
-}
-
-func newTestSubscriber(p *Publisher) *testSubscriber {
-	ts := &testSubscriber{
-		dataCh: p.Subscribe(),
-		ch:     make(chan error),
-	}
-	go func() {
-		for data := range ts.dataCh {
-			s, ok := data.(string)
-			if !ok {
-				ts.ch <- fmt.Errorf("Unexpected type %T", data)
-				break
-			}
-			if s != sampleText {
-				ts.ch <- fmt.Errorf("Unexpected text %s", s)
-				break
-			}
-		}
-		close(ts.ch)
-	}()
-	return ts
-}
-
-// for testing with -race
-func TestPubSubRace(t *testing.T) {
-	p := NewPublisher(0, 1024)
-	var subs [](*testSubscriber)
-	for j := 0; j < 50; j++ {
-		subs = append(subs, newTestSubscriber(p))
-	}
-	for j := 0; j < 1000; j++ {
-		p.Publish(sampleText)
-	}
-	time.AfterFunc(1*time.Second, func() {
-		for _, s := range subs {
-			p.Evict(s.dataCh)
-		}
-	})
-	for _, s := range subs {
-		s.Wait()
-	}
-}
-
-func BenchmarkPubSub(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		p := NewPublisher(0, 1024)
-		var subs [](*testSubscriber)
-		for j := 0; j < 50; j++ {
-			subs = append(subs, newTestSubscriber(p))
-		}
-		b.StartTimer()
-		for j := 0; j < 1000; j++ {
-			p.Publish(sampleText)
-		}
-		time.AfterFunc(1*time.Second, func() {
-			for _, s := range subs {
-				p.Evict(s.dataCh)
-			}
-		})
-		for _, s := range subs {
-			if err := s.Wait(); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/random/random.go b/installer/vendor/github.com/docker/docker/pkg/random/random.go
deleted file mode 100644
index 70de4d1304..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/random/random.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package random
-
-import (
-	cryptorand "crypto/rand"
-	"io"
-	"math"
-	"math/big"
-	"math/rand"
-	"sync"
-	"time"
-)
-
-// Rand is a global *rand.Rand instance, which initialized with NewSource() source.
-var Rand = rand.New(NewSource())
-
-// Reader is a global, shared instance of a pseudorandom bytes generator.
-// It doesn't consume entropy.
-var Reader io.Reader = &reader{rnd: Rand}
-
-// copypaste from standard math/rand
-type lockedSource struct {
-	lk  sync.Mutex
-	src rand.Source
-}
-
-func (r *lockedSource) Int63() (n int64) {
-	r.lk.Lock()
-	n = r.src.Int63()
-	r.lk.Unlock()
-	return
-}
-
-func (r *lockedSource) Seed(seed int64) {
-	r.lk.Lock()
-	r.src.Seed(seed)
-	r.lk.Unlock()
-}
-
-// NewSource returns math/rand.Source safe for concurrent use and initialized
-// with current unix-nano timestamp
-func NewSource() rand.Source {
-	var seed int64
-	if cryptoseed, err := cryptorand.Int(cryptorand.Reader, big.NewInt(math.MaxInt64)); err != nil {
-		// This should not happen, but worst-case fallback to time-based seed.
-		seed = time.Now().UnixNano()
-	} else {
-		seed = cryptoseed.Int64()
-	}
-	return &lockedSource{
-		src: rand.NewSource(seed),
-	}
-}
-
-type reader struct {
-	rnd *rand.Rand
-}
-
-func (r *reader) Read(b []byte) (int, error) {
-	i := 0
-	for {
-		val := r.rnd.Int63()
-		for val > 0 {
-			b[i] = byte(val)
-			i++
-			if i == len(b) {
-				return i, nil
-			}
-			val >>= 8
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/random/random_test.go b/installer/vendor/github.com/docker/docker/pkg/random/random_test.go
deleted file mode 100644
index cf405f78cb..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/random/random_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package random
-
-import (
-	"math/rand"
-	"sync"
-	"testing"
-)
-
-// for go test -v -race
-func TestConcurrency(t *testing.T) {
-	rnd := rand.New(NewSource())
-	var wg sync.WaitGroup
-
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			rnd.Int63()
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/README.md b/installer/vendor/github.com/docker/docker/pkg/reexec/README.md
deleted file mode 100644
index 45592ce85a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-## reexec
-
-The `reexec` package facilitates the busybox style reexec of the docker binary that we require because 
-of the forking limitations of using Go.  Handlers can be registered with a name and the argv 0 of 
-the exec of the binary will be used to find and execute custom init paths.
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/command_linux.go b/installer/vendor/github.com/docker/docker/pkg/reexec/command_linux.go
deleted file mode 100644
index 34ae2a9dcd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/command_linux.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build linux
-
-package reexec
-
-import (
-	"os/exec"
-	"syscall"
-)
-
-// Self returns the path to the current process's binary.
-// Returns "/proc/self/exe".
-func Self() string {
-	return "/proc/self/exe"
-}
-
-// Command returns *exec.Cmd which has Path as current binary. Also it setting
-// SysProcAttr.Pdeathsig to SIGTERM.
-// This will use the in-memory version (/proc/self/exe) of the current binary,
-// it is thus safe to delete or replace the on-disk binary (os.Args[0]).
-func Command(args ...string) *exec.Cmd {
-	return &exec.Cmd{
-		Path: Self(),
-		Args: args,
-		SysProcAttr: &syscall.SysProcAttr{
-			Pdeathsig: syscall.SIGTERM,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/command_unix.go b/installer/vendor/github.com/docker/docker/pkg/reexec/command_unix.go
deleted file mode 100644
index 778a720e3b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/command_unix.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build freebsd solaris darwin
-
-package reexec
-
-import (
-	"os/exec"
-)
-
-// Self returns the path to the current process's binary.
-// Uses os.Args[0].
-func Self() string {
-	return naiveSelf()
-}
-
-// Command returns *exec.Cmd which has Path as current binary.
-// For example if current binary is "docker" at "/usr/bin/", then cmd.Path will
-// be set to "/usr/bin/docker".
-func Command(args ...string) *exec.Cmd {
-	return &exec.Cmd{
-		Path: Self(),
-		Args: args,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go
deleted file mode 100644
index 76edd82427..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/command_unsupported.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux,!windows,!freebsd,!solaris,!darwin
-
-package reexec
-
-import (
-	"os/exec"
-)
-
-// Command is unsupported on operating systems apart from Linux, Windows, Solaris and Darwin.
-func Command(args ...string) *exec.Cmd {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/command_windows.go b/installer/vendor/github.com/docker/docker/pkg/reexec/command_windows.go
deleted file mode 100644
index ca871c4227..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/command_windows.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// +build windows
-
-package reexec
-
-import (
-	"os/exec"
-)
-
-// Self returns the path to the current process's binary.
-// Uses os.Args[0].
-func Self() string {
-	return naiveSelf()
-}
-
-// Command returns *exec.Cmd which has Path as current binary.
-// For example if current binary is "docker.exe" at "C:\", then cmd.Path will
-// be set to "C:\docker.exe".
-func Command(args ...string) *exec.Cmd {
-	return &exec.Cmd{
-		Path: Self(),
-		Args: args,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/reexec/reexec.go b/installer/vendor/github.com/docker/docker/pkg/reexec/reexec.go
deleted file mode 100644
index c56671d919..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/reexec/reexec.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package reexec
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-var registeredInitializers = make(map[string]func())
-
-// Register adds an initialization func under the specified name
-func Register(name string, initializer func()) {
-	if _, exists := registeredInitializers[name]; exists {
-		panic(fmt.Sprintf("reexec func already registered under name %q", name))
-	}
-
-	registeredInitializers[name] = initializer
-}
-
-// Init is called as the first part of the exec process and returns true if an
-// initialization function was called.
-func Init() bool {
-	initializer, exists := registeredInitializers[os.Args[0]]
-	if exists {
-		initializer()
-
-		return true
-	}
-	return false
-}
-
-func naiveSelf() string {
-	name := os.Args[0]
-	if filepath.Base(name) == name {
-		if lp, err := exec.LookPath(name); err == nil {
-			return lp
-		}
-	}
-	// handle conversion of relative paths to absolute
-	if absName, err := filepath.Abs(name); err == nil {
-		return absName
-	}
-	// if we couldn't get absolute name, return original
-	// (NOTE: Go only errors on Abs() if os.Getwd fails)
-	return name
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/registrar/registrar.go b/installer/vendor/github.com/docker/docker/pkg/registrar/registrar.go
deleted file mode 100644
index 1e75ee995b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/registrar/registrar.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Package registrar provides name registration. It reserves a name to a given key.
-package registrar
-
-import (
-	"errors"
-	"sync"
-)
-
-var (
-	// ErrNameReserved is an error which is returned when a name is requested to be reserved that already is reserved
-	ErrNameReserved = errors.New("name is reserved")
-	// ErrNameNotReserved is an error which is returned when trying to find a name that is not reserved
-	ErrNameNotReserved = errors.New("name is not reserved")
-	// ErrNoSuchKey is returned when trying to find the names for a key which is not known
-	ErrNoSuchKey = errors.New("provided key does not exist")
-)
-
-// Registrar stores indexes a list of keys and their registered names as well as indexes names and the key that they are registered to
-// Names must be unique.
-// Registrar is safe for concurrent access.
-type Registrar struct {
-	idx   map[string][]string
-	names map[string]string
-	mu    sync.Mutex
-}
-
-// NewRegistrar creates a new Registrar with the an empty index
-func NewRegistrar() *Registrar {
-	return &Registrar{
-		idx:   make(map[string][]string),
-		names: make(map[string]string),
-	}
-}
-
-// Reserve registers a key to a name
-// Reserve is idempotent
-// Attempting to reserve a key to a name that already exists results in an `ErrNameReserved`
-// A name reservation is globally unique
-func (r *Registrar) Reserve(name, key string) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	if k, exists := r.names[name]; exists {
-		if k != key {
-			return ErrNameReserved
-		}
-		return nil
-	}
-
-	r.idx[key] = append(r.idx[key], name)
-	r.names[name] = key
-	return nil
-}
-
-// Release releases the reserved name
-// Once released, a name can be reserved again
-func (r *Registrar) Release(name string) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	key, exists := r.names[name]
-	if !exists {
-		return
-	}
-
-	for i, n := range r.idx[key] {
-		if n != name {
-			continue
-		}
-		r.idx[key] = append(r.idx[key][:i], r.idx[key][i+1:]...)
-		break
-	}
-
-	delete(r.names, name)
-
-	if len(r.idx[key]) == 0 {
-		delete(r.idx, key)
-	}
-}
-
-// Delete removes all reservations for the passed in key.
-// All names reserved to this key are released.
-func (r *Registrar) Delete(key string) {
-	r.mu.Lock()
-	for _, name := range r.idx[key] {
-		delete(r.names, name)
-	}
-	delete(r.idx, key)
-	r.mu.Unlock()
-}
-
-// GetNames lists all the reserved names for the given key
-func (r *Registrar) GetNames(key string) ([]string, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-
-	names, exists := r.idx[key]
-	if !exists {
-		return nil, ErrNoSuchKey
-	}
-	return names, nil
-}
-
-// Get returns the key that the passed in name is reserved to
-func (r *Registrar) Get(name string) (string, error) {
-	r.mu.Lock()
-	key, exists := r.names[name]
-	r.mu.Unlock()
-
-	if !exists {
-		return "", ErrNameNotReserved
-	}
-	return key, nil
-}
-
-// GetAll returns all registered names
-func (r *Registrar) GetAll() map[string][]string {
-	out := make(map[string][]string)
-
-	r.mu.Lock()
-	// copy index into out
-	for id, names := range r.idx {
-		out[id] = names
-	}
-	r.mu.Unlock()
-	return out
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/registrar/registrar_test.go b/installer/vendor/github.com/docker/docker/pkg/registrar/registrar_test.go
deleted file mode 100644
index 0c1ef312ae..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/registrar/registrar_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package registrar
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestReserve(t *testing.T) {
-	r := NewRegistrar()
-
-	obj := "test1"
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-
-	obj2 := "test2"
-	err := r.Reserve("test", obj2)
-	if err == nil {
-		t.Fatalf("expected error when reserving an already reserved name to another object")
-	}
-	if err != ErrNameReserved {
-		t.Fatal("expected `ErrNameReserved` error when attempting to reserve an already reserved name")
-	}
-}
-
-func TestRelease(t *testing.T) {
-	r := NewRegistrar()
-	obj := "testing"
-
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-	r.Release("test")
-	r.Release("test") // Ensure there is no panic here
-
-	if err := r.Reserve("test", obj); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNames(t *testing.T) {
-	r := NewRegistrar()
-	obj := "testing"
-	names := []string{"test1", "test2"}
-
-	for _, name := range names {
-		if err := r.Reserve(name, obj); err != nil {
-			t.Fatal(err)
-		}
-	}
-	r.Reserve("test3", "other")
-
-	names2, err := r.GetNames(obj)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(names, names2) {
-		t.Fatalf("Exepected: %v, Got: %v", names, names2)
-	}
-}
-
-func TestDelete(t *testing.T) {
-	r := NewRegistrar()
-	obj := "testing"
-	names := []string{"test1", "test2"}
-	for _, name := range names {
-		if err := r.Reserve(name, obj); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	r.Reserve("test3", "other")
-	r.Delete(obj)
-
-	_, err := r.GetNames(obj)
-	if err == nil {
-		t.Fatal("expected error getting names for deleted key")
-	}
-
-	if err != ErrNoSuchKey {
-		t.Fatal("expected `ErrNoSuchKey`")
-	}
-}
-
-func TestGet(t *testing.T) {
-	r := NewRegistrar()
-	obj := "testing"
-	name := "test"
-
-	_, err := r.Get(name)
-	if err == nil {
-		t.Fatal("expected error when key does not exist")
-	}
-	if err != ErrNameNotReserved {
-		t.Fatal(err)
-	}
-
-	if err := r.Reserve(name, obj); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err = r.Get(name); err != nil {
-		t.Fatal(err)
-	}
-
-	r.Delete(obj)
-	_, err = r.Get(name)
-	if err == nil {
-		t.Fatal("expected error when key does not exist")
-	}
-	if err != ErrNameNotReserved {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/README.md b/installer/vendor/github.com/docker/docker/pkg/signal/README.md
deleted file mode 100644
index 2b237a5942..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This package provides helper functions for dealing with signals across various operating systems
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal.go
deleted file mode 100644
index 68bb77cf58..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Package signal provides helper functions for dealing with signals across
-// various operating systems.
-package signal
-
-import (
-	"fmt"
-	"os"
-	"os/signal"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-// CatchAll catches all signals and relays them to the specified channel.
-func CatchAll(sigc chan os.Signal) {
-	handledSigs := []os.Signal{}
-	for _, s := range SignalMap {
-		handledSigs = append(handledSigs, s)
-	}
-	signal.Notify(sigc, handledSigs...)
-}
-
-// StopCatch stops catching the signals and closes the specified channel.
-func StopCatch(sigc chan os.Signal) {
-	signal.Stop(sigc)
-	close(sigc)
-}
-
-// ParseSignal translates a string to a valid syscall signal.
-// It returns an error if the signal map doesn't include the given signal.
-func ParseSignal(rawSignal string) (syscall.Signal, error) {
-	s, err := strconv.Atoi(rawSignal)
-	if err == nil {
-		if s == 0 {
-			return -1, fmt.Errorf("Invalid signal: %s", rawSignal)
-		}
-		return syscall.Signal(s), nil
-	}
-	signal, ok := SignalMap[strings.TrimPrefix(strings.ToUpper(rawSignal), "SIG")]
-	if !ok {
-		return -1, fmt.Errorf("Invalid signal: %s", rawSignal)
-	}
-	return signal, nil
-}
-
-// ValidSignalForPlatform returns true if a signal is valid on the platform
-func ValidSignalForPlatform(sig syscall.Signal) bool {
-	for _, v := range SignalMap {
-		if v == sig {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_darwin.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_darwin.go
deleted file mode 100644
index 946de87e94..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_darwin.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package signal
-
-import (
-	"syscall"
-)
-
-// SignalMap is a map of Darwin signals.
-var SignalMap = map[string]syscall.Signal{
-	"ABRT":   syscall.SIGABRT,
-	"ALRM":   syscall.SIGALRM,
-	"BUG":    syscall.SIGBUS,
-	"CHLD":   syscall.SIGCHLD,
-	"CONT":   syscall.SIGCONT,
-	"EMT":    syscall.SIGEMT,
-	"FPE":    syscall.SIGFPE,
-	"HUP":    syscall.SIGHUP,
-	"ILL":    syscall.SIGILL,
-	"INFO":   syscall.SIGINFO,
-	"INT":    syscall.SIGINT,
-	"IO":     syscall.SIGIO,
-	"IOT":    syscall.SIGIOT,
-	"KILL":   syscall.SIGKILL,
-	"PIPE":   syscall.SIGPIPE,
-	"PROF":   syscall.SIGPROF,
-	"QUIT":   syscall.SIGQUIT,
-	"SEGV":   syscall.SIGSEGV,
-	"STOP":   syscall.SIGSTOP,
-	"SYS":    syscall.SIGSYS,
-	"TERM":   syscall.SIGTERM,
-	"TRAP":   syscall.SIGTRAP,
-	"TSTP":   syscall.SIGTSTP,
-	"TTIN":   syscall.SIGTTIN,
-	"TTOU":   syscall.SIGTTOU,
-	"URG":    syscall.SIGURG,
-	"USR1":   syscall.SIGUSR1,
-	"USR2":   syscall.SIGUSR2,
-	"VTALRM": syscall.SIGVTALRM,
-	"WINCH":  syscall.SIGWINCH,
-	"XCPU":   syscall.SIGXCPU,
-	"XFSZ":   syscall.SIGXFSZ,
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_freebsd.go
deleted file mode 100644
index 6b9569bb75..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_freebsd.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package signal
-
-import (
-	"syscall"
-)
-
-// SignalMap is a map of FreeBSD signals.
-var SignalMap = map[string]syscall.Signal{
-	"ABRT":   syscall.SIGABRT,
-	"ALRM":   syscall.SIGALRM,
-	"BUF":    syscall.SIGBUS,
-	"CHLD":   syscall.SIGCHLD,
-	"CONT":   syscall.SIGCONT,
-	"EMT":    syscall.SIGEMT,
-	"FPE":    syscall.SIGFPE,
-	"HUP":    syscall.SIGHUP,
-	"ILL":    syscall.SIGILL,
-	"INFO":   syscall.SIGINFO,
-	"INT":    syscall.SIGINT,
-	"IO":     syscall.SIGIO,
-	"IOT":    syscall.SIGIOT,
-	"KILL":   syscall.SIGKILL,
-	"LWP":    syscall.SIGLWP,
-	"PIPE":   syscall.SIGPIPE,
-	"PROF":   syscall.SIGPROF,
-	"QUIT":   syscall.SIGQUIT,
-	"SEGV":   syscall.SIGSEGV,
-	"STOP":   syscall.SIGSTOP,
-	"SYS":    syscall.SIGSYS,
-	"TERM":   syscall.SIGTERM,
-	"THR":    syscall.SIGTHR,
-	"TRAP":   syscall.SIGTRAP,
-	"TSTP":   syscall.SIGTSTP,
-	"TTIN":   syscall.SIGTTIN,
-	"TTOU":   syscall.SIGTTOU,
-	"URG":    syscall.SIGURG,
-	"USR1":   syscall.SIGUSR1,
-	"USR2":   syscall.SIGUSR2,
-	"VTALRM": syscall.SIGVTALRM,
-	"WINCH":  syscall.SIGWINCH,
-	"XCPU":   syscall.SIGXCPU,
-	"XFSZ":   syscall.SIGXFSZ,
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_linux.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_linux.go
deleted file mode 100644
index d418cbe9e3..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_linux.go
+++ /dev/null
@@ -1,80 +0,0 @@
-package signal
-
-import (
-	"syscall"
-)
-
-const (
-	sigrtmin = 34
-	sigrtmax = 64
-)
-
-// SignalMap is a map of Linux signals.
-var SignalMap = map[string]syscall.Signal{
-	"ABRT":     syscall.SIGABRT,
-	"ALRM":     syscall.SIGALRM,
-	"BUS":      syscall.SIGBUS,
-	"CHLD":     syscall.SIGCHLD,
-	"CLD":      syscall.SIGCLD,
-	"CONT":     syscall.SIGCONT,
-	"FPE":      syscall.SIGFPE,
-	"HUP":      syscall.SIGHUP,
-	"ILL":      syscall.SIGILL,
-	"INT":      syscall.SIGINT,
-	"IO":       syscall.SIGIO,
-	"IOT":      syscall.SIGIOT,
-	"KILL":     syscall.SIGKILL,
-	"PIPE":     syscall.SIGPIPE,
-	"POLL":     syscall.SIGPOLL,
-	"PROF":     syscall.SIGPROF,
-	"PWR":      syscall.SIGPWR,
-	"QUIT":     syscall.SIGQUIT,
-	"SEGV":     syscall.SIGSEGV,
-	"STKFLT":   syscall.SIGSTKFLT,
-	"STOP":     syscall.SIGSTOP,
-	"SYS":      syscall.SIGSYS,
-	"TERM":     syscall.SIGTERM,
-	"TRAP":     syscall.SIGTRAP,
-	"TSTP":     syscall.SIGTSTP,
-	"TTIN":     syscall.SIGTTIN,
-	"TTOU":     syscall.SIGTTOU,
-	"UNUSED":   syscall.SIGUNUSED,
-	"URG":      syscall.SIGURG,
-	"USR1":     syscall.SIGUSR1,
-	"USR2":     syscall.SIGUSR2,
-	"VTALRM":   syscall.SIGVTALRM,
-	"WINCH":    syscall.SIGWINCH,
-	"XCPU":     syscall.SIGXCPU,
-	"XFSZ":     syscall.SIGXFSZ,
-	"RTMIN":    sigrtmin,
-	"RTMIN+1":  sigrtmin + 1,
-	"RTMIN+2":  sigrtmin + 2,
-	"RTMIN+3":  sigrtmin + 3,
-	"RTMIN+4":  sigrtmin + 4,
-	"RTMIN+5":  sigrtmin + 5,
-	"RTMIN+6":  sigrtmin + 6,
-	"RTMIN+7":  sigrtmin + 7,
-	"RTMIN+8":  sigrtmin + 8,
-	"RTMIN+9":  sigrtmin + 9,
-	"RTMIN+10": sigrtmin + 10,
-	"RTMIN+11": sigrtmin + 11,
-	"RTMIN+12": sigrtmin + 12,
-	"RTMIN+13": sigrtmin + 13,
-	"RTMIN+14": sigrtmin + 14,
-	"RTMIN+15": sigrtmin + 15,
-	"RTMAX-14": sigrtmax - 14,
-	"RTMAX-13": sigrtmax - 13,
-	"RTMAX-12": sigrtmax - 12,
-	"RTMAX-11": sigrtmax - 11,
-	"RTMAX-10": sigrtmax - 10,
-	"RTMAX-9":  sigrtmax - 9,
-	"RTMAX-8":  sigrtmax - 8,
-	"RTMAX-7":  sigrtmax - 7,
-	"RTMAX-6":  sigrtmax - 6,
-	"RTMAX-5":  sigrtmax - 5,
-	"RTMAX-4":  sigrtmax - 4,
-	"RTMAX-3":  sigrtmax - 3,
-	"RTMAX-2":  sigrtmax - 2,
-	"RTMAX-1":  sigrtmax - 1,
-	"RTMAX":    sigrtmax,
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_solaris.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_solaris.go
deleted file mode 100644
index 89576b9e3b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_solaris.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package signal
-
-import (
-	"syscall"
-)
-
-// SignalMap is a map of Solaris signals.
-// SIGINFO and SIGTHR not defined for Solaris
-var SignalMap = map[string]syscall.Signal{
-	"ABRT":   syscall.SIGABRT,
-	"ALRM":   syscall.SIGALRM,
-	"BUF":    syscall.SIGBUS,
-	"CHLD":   syscall.SIGCHLD,
-	"CONT":   syscall.SIGCONT,
-	"EMT":    syscall.SIGEMT,
-	"FPE":    syscall.SIGFPE,
-	"HUP":    syscall.SIGHUP,
-	"ILL":    syscall.SIGILL,
-	"INT":    syscall.SIGINT,
-	"IO":     syscall.SIGIO,
-	"IOT":    syscall.SIGIOT,
-	"KILL":   syscall.SIGKILL,
-	"LWP":    syscall.SIGLWP,
-	"PIPE":   syscall.SIGPIPE,
-	"PROF":   syscall.SIGPROF,
-	"QUIT":   syscall.SIGQUIT,
-	"SEGV":   syscall.SIGSEGV,
-	"STOP":   syscall.SIGSTOP,
-	"SYS":    syscall.SIGSYS,
-	"TERM":   syscall.SIGTERM,
-	"TRAP":   syscall.SIGTRAP,
-	"TSTP":   syscall.SIGTSTP,
-	"TTIN":   syscall.SIGTTIN,
-	"TTOU":   syscall.SIGTTOU,
-	"URG":    syscall.SIGURG,
-	"USR1":   syscall.SIGUSR1,
-	"USR2":   syscall.SIGUSR2,
-	"VTALRM": syscall.SIGVTALRM,
-	"WINCH":  syscall.SIGWINCH,
-	"XCPU":   syscall.SIGXCPU,
-	"XFSZ":   syscall.SIGXFSZ,
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_unix.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_unix.go
deleted file mode 100644
index 5d058fd56b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_unix.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build !windows
-
-package signal
-
-import (
-	"syscall"
-)
-
-// Signals used in cli/command (no windows equivalent, use
-// invalid signals so they don't get handled)
-
-const (
-	// SIGCHLD is a signal sent to a process when a child process terminates, is interrupted, or resumes after being interrupted.
-	SIGCHLD = syscall.SIGCHLD
-	// SIGWINCH is a signal sent to a process when its controlling terminal changes its size
-	SIGWINCH = syscall.SIGWINCH
-	// SIGPIPE is a signal sent to a process when a pipe is written to before the other end is open for reading
-	SIGPIPE = syscall.SIGPIPE
-	// DefaultStopSignal is the syscall signal used to stop a container in unix systems.
-	DefaultStopSignal = "SIGTERM"
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_unsupported.go
deleted file mode 100644
index c592d37dfe..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_unsupported.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !linux,!darwin,!freebsd,!windows,!solaris
-
-package signal
-
-import (
-	"syscall"
-)
-
-// SignalMap is an empty map of signals for unsupported platform.
-var SignalMap = map[string]syscall.Signal{}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/signal_windows.go b/installer/vendor/github.com/docker/docker/pkg/signal/signal_windows.go
deleted file mode 100644
index 440f2700e2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/signal_windows.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// +build windows
-
-package signal
-
-import (
-	"syscall"
-)
-
-// Signals used in cli/command (no windows equivalent, use
-// invalid signals so they don't get handled)
-const (
-	SIGCHLD  = syscall.Signal(0xff)
-	SIGWINCH = syscall.Signal(0xff)
-	SIGPIPE  = syscall.Signal(0xff)
-	// DefaultStopSignal is the syscall signal used to stop a container in windows systems.
-	DefaultStopSignal = "15"
-)
-
-// SignalMap is a map of "supported" signals. As per the comment in GOLang's
-// ztypes_windows.go: "More invented values for signals". Windows doesn't
-// really support signals in any way, shape or form that Unix does.
-//
-// We have these so that docker kill can be used to gracefully (TERM) and
-// forcibly (KILL) terminate a container on Windows.
-var SignalMap = map[string]syscall.Signal{
-	"KILL": syscall.SIGKILL,
-	"TERM": syscall.SIGTERM,
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/signal/trap.go b/installer/vendor/github.com/docker/docker/pkg/signal/trap.go
deleted file mode 100644
index 638a1ab66c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/signal/trap.go
+++ /dev/null
@@ -1,103 +0,0 @@
-package signal
-
-import (
-	"fmt"
-	"os"
-	gosignal "os/signal"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync/atomic"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/pkg/errors"
-)
-
-// Trap sets up a simplified signal "trap", appropriate for common
-// behavior expected from a vanilla unix command-line tool in general
-// (and the Docker engine in particular).
-//
-// * If SIGINT or SIGTERM are received, `cleanup` is called, then the process is terminated.
-// * If SIGINT or SIGTERM are received 3 times before cleanup is complete, then cleanup is
-//   skipped and the process is terminated immediately (allows force quit of stuck daemon)
-// * A SIGQUIT always causes an exit without cleanup, with a goroutine dump preceding exit.
-// * Ignore SIGPIPE events. These are generated by systemd when journald is restarted while
-//   the docker daemon is not restarted and also running under systemd.
-//   Fixes https://github.com/docker/docker/issues/19728
-//
-func Trap(cleanup func()) {
-	c := make(chan os.Signal, 1)
-	// we will handle INT, TERM, QUIT, SIGPIPE here
-	signals := []os.Signal{os.Interrupt, syscall.SIGTERM, syscall.SIGQUIT, syscall.SIGPIPE}
-	gosignal.Notify(c, signals...)
-	go func() {
-		interruptCount := uint32(0)
-		for sig := range c {
-			if sig == syscall.SIGPIPE {
-				continue
-			}
-
-			go func(sig os.Signal) {
-				logrus.Infof("Processing signal '%v'", sig)
-				switch sig {
-				case os.Interrupt, syscall.SIGTERM:
-					if atomic.LoadUint32(&interruptCount) < 3 {
-						// Initiate the cleanup only once
-						if atomic.AddUint32(&interruptCount, 1) == 1 {
-							// Call the provided cleanup handler
-							cleanup()
-							os.Exit(0)
-						} else {
-							return
-						}
-					} else {
-						// 3 SIGTERM/INT signals received; force exit without cleanup
-						logrus.Info("Forcing docker daemon shutdown without cleanup; 3 interrupts received")
-					}
-				case syscall.SIGQUIT:
-					DumpStacks("")
-					logrus.Info("Forcing docker daemon shutdown without cleanup on SIGQUIT")
-				}
-				//for the SIGINT/TERM, and SIGQUIT non-clean shutdown case, exit with 128 + signal #
-				os.Exit(128 + int(sig.(syscall.Signal)))
-			}(sig)
-		}
-	}()
-}
-
-const stacksLogNameTemplate = "goroutine-stacks-%s.log"
-
-// DumpStacks appends the runtime stack into file in dir and returns full path
-// to that file.
-func DumpStacks(dir string) (string, error) {
-	var (
-		buf       []byte
-		stackSize int
-	)
-	bufferLen := 16384
-	for stackSize == len(buf) {
-		buf = make([]byte, bufferLen)
-		stackSize = runtime.Stack(buf, true)
-		bufferLen *= 2
-	}
-	buf = buf[:stackSize]
-	var f *os.File
-	if dir != "" {
-		path := filepath.Join(dir, fmt.Sprintf(stacksLogNameTemplate, strings.Replace(time.Now().Format(time.RFC3339), ":", "", -1)))
-		var err error
-		f, err = os.OpenFile(path, os.O_CREATE|os.O_WRONLY, 0666)
-		if err != nil {
-			return "", errors.Wrap(err, "failed to open file to write the goroutine stacks")
-		}
-		defer f.Close()
-		defer f.Sync()
-	} else {
-		f = os.Stderr
-	}
-	if _, err := f.Write(buf); err != nil {
-		return "", errors.Wrap(err, "failed to write goroutine stacks")
-	}
-	return f.Name(), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
deleted file mode 100644
index be20765457..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
+++ /dev/null
@@ -1,174 +0,0 @@
-package stdcopy
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"sync"
-)
-
-// StdType is the type of standard stream
-// a writer can multiplex to.
-type StdType byte
-
-const (
-	// Stdin represents standard input stream type.
-	Stdin StdType = iota
-	// Stdout represents standard output stream type.
-	Stdout
-	// Stderr represents standard error steam type.
-	Stderr
-
-	stdWriterPrefixLen = 8
-	stdWriterFdIndex   = 0
-	stdWriterSizeIndex = 4
-
-	startingBufLen = 32*1024 + stdWriterPrefixLen + 1
-)
-
-var bufPool = &sync.Pool{New: func() interface{} { return bytes.NewBuffer(nil) }}
-
-// stdWriter is wrapper of io.Writer with extra customized info.
-type stdWriter struct {
-	io.Writer
-	prefix byte
-}
-
-// Write sends the buffer to the underneath writer.
-// It inserts the prefix header before the buffer,
-// so stdcopy.StdCopy knows where to multiplex the output.
-// It makes stdWriter to implement io.Writer.
-func (w *stdWriter) Write(p []byte) (n int, err error) {
-	if w == nil || w.Writer == nil {
-		return 0, errors.New("Writer not instantiated")
-	}
-	if p == nil {
-		return 0, nil
-	}
-
-	header := [stdWriterPrefixLen]byte{stdWriterFdIndex: w.prefix}
-	binary.BigEndian.PutUint32(header[stdWriterSizeIndex:], uint32(len(p)))
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Write(header[:])
-	buf.Write(p)
-
-	n, err = w.Writer.Write(buf.Bytes())
-	n -= stdWriterPrefixLen
-	if n < 0 {
-		n = 0
-	}
-
-	buf.Reset()
-	bufPool.Put(buf)
-	return
-}
-
-// NewStdWriter instantiates a new Writer.
-// Everything written to it will be encapsulated using a custom format,
-// and written to the underlying `w` stream.
-// This allows multiple write streams (e.g. stdout and stderr) to be muxed into a single connection.
-// `t` indicates the id of the stream to encapsulate.
-// It can be stdcopy.Stdin, stdcopy.Stdout, stdcopy.Stderr.
-func NewStdWriter(w io.Writer, t StdType) io.Writer {
-	return &stdWriter{
-		Writer: w,
-		prefix: byte(t),
-	}
-}
-
-// StdCopy is a modified version of io.Copy.
-//
-// StdCopy will demultiplex `src`, assuming that it contains two streams,
-// previously multiplexed together using a StdWriter instance.
-// As it reads from `src`, StdCopy will write to `dstout` and `dsterr`.
-//
-// StdCopy will read until it hits EOF on `src`. It will then return a nil error.
-// In other words: if `err` is non nil, it indicates a real underlying error.
-//
-// `written` will hold the total number of bytes written to `dstout` and `dsterr`.
-func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, err error) {
-	var (
-		buf       = make([]byte, startingBufLen)
-		bufLen    = len(buf)
-		nr, nw    int
-		er, ew    error
-		out       io.Writer
-		frameSize int
-	)
-
-	for {
-		// Make sure we have at least a full header
-		for nr < stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < stdWriterPrefixLen {
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				return 0, er
-			}
-		}
-
-		// Check the first byte to know where to write
-		switch StdType(buf[stdWriterFdIndex]) {
-		case Stdin:
-			fallthrough
-		case Stdout:
-			// Write on stdout
-			out = dstout
-		case Stderr:
-			// Write on stderr
-			out = dsterr
-		default:
-			return 0, fmt.Errorf("Unrecognized input header: %d", buf[stdWriterFdIndex])
-		}
-
-		// Retrieve the size of the frame
-		frameSize = int(binary.BigEndian.Uint32(buf[stdWriterSizeIndex : stdWriterSizeIndex+4]))
-
-		// Check if the buffer is big enough to read the frame.
-		// Extend it if necessary.
-		if frameSize+stdWriterPrefixLen > bufLen {
-			buf = append(buf, make([]byte, frameSize+stdWriterPrefixLen-bufLen+1)...)
-			bufLen = len(buf)
-		}
-
-		// While the amount of bytes read is less than the size of the frame + header, we keep reading
-		for nr < frameSize+stdWriterPrefixLen {
-			var nr2 int
-			nr2, er = src.Read(buf[nr:])
-			nr += nr2
-			if er == io.EOF {
-				if nr < frameSize+stdWriterPrefixLen {
-					return written, nil
-				}
-				break
-			}
-			if er != nil {
-				return 0, er
-			}
-		}
-
-		// Write the retrieved frame (without header)
-		nw, ew = out.Write(buf[stdWriterPrefixLen : frameSize+stdWriterPrefixLen])
-		if ew != nil {
-			return 0, ew
-		}
-		// If the frame has not been fully written: error
-		if nw != frameSize {
-			return 0, io.ErrShortWrite
-		}
-		written += int64(nw)
-
-		// Move the rest of the buffer to the beginning
-		copy(buf, buf[frameSize+stdWriterPrefixLen:])
-		// Move the index
-		nr -= frameSize + stdWriterPrefixLen
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy_test.go b/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy_test.go
deleted file mode 100644
index 3137a75239..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy_test.go
+++ /dev/null
@@ -1,260 +0,0 @@
-package stdcopy
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"io/ioutil"
-	"strings"
-	"testing"
-)
-
-func TestNewStdWriter(t *testing.T) {
-	writer := NewStdWriter(ioutil.Discard, Stdout)
-	if writer == nil {
-		t.Fatalf("NewStdWriter with an invalid StdType should not return nil.")
-	}
-}
-
-func TestWriteWithUnitializedStdWriter(t *testing.T) {
-	writer := stdWriter{
-		Writer: nil,
-		prefix: byte(Stdout),
-	}
-	n, err := writer.Write([]byte("Something here"))
-	if n != 0 || err == nil {
-		t.Fatalf("Should fail when given an uncomplete or uninitialized StdWriter")
-	}
-}
-
-func TestWriteWithNilBytes(t *testing.T) {
-	writer := NewStdWriter(ioutil.Discard, Stdout)
-	n, err := writer.Write(nil)
-	if err != nil {
-		t.Fatalf("Shouldn't have fail when given no data")
-	}
-	if n > 0 {
-		t.Fatalf("Write should have written 0 byte, but has written %d", n)
-	}
-}
-
-func TestWrite(t *testing.T) {
-	writer := NewStdWriter(ioutil.Discard, Stdout)
-	data := []byte("Test StdWrite.Write")
-	n, err := writer.Write(data)
-	if err != nil {
-		t.Fatalf("Error while writing with StdWrite")
-	}
-	if n != len(data) {
-		t.Fatalf("Write should have written %d byte but wrote %d.", len(data), n)
-	}
-}
-
-type errWriter struct {
-	n   int
-	err error
-}
-
-func (f *errWriter) Write(buf []byte) (int, error) {
-	return f.n, f.err
-}
-
-func TestWriteWithWriterError(t *testing.T) {
-	expectedError := errors.New("expected")
-	expectedReturnedBytes := 10
-	writer := NewStdWriter(&errWriter{
-		n:   stdWriterPrefixLen + expectedReturnedBytes,
-		err: expectedError}, Stdout)
-	data := []byte("This won't get written, sigh")
-	n, err := writer.Write(data)
-	if err != expectedError {
-		t.Fatalf("Didn't get expected error.")
-	}
-	if n != expectedReturnedBytes {
-		t.Fatalf("Didn't get expected written bytes %d, got %d.",
-			expectedReturnedBytes, n)
-	}
-}
-
-func TestWriteDoesNotReturnNegativeWrittenBytes(t *testing.T) {
-	writer := NewStdWriter(&errWriter{n: -1}, Stdout)
-	data := []byte("This won't get written, sigh")
-	actual, _ := writer.Write(data)
-	if actual != 0 {
-		t.Fatalf("Expected returned written bytes equal to 0, got %d", actual)
-	}
-}
-
-func getSrcBuffer(stdOutBytes, stdErrBytes []byte) (buffer *bytes.Buffer, err error) {
-	buffer = new(bytes.Buffer)
-	dstOut := NewStdWriter(buffer, Stdout)
-	_, err = dstOut.Write(stdOutBytes)
-	if err != nil {
-		return
-	}
-	dstErr := NewStdWriter(buffer, Stderr)
-	_, err = dstErr.Write(stdErrBytes)
-	return
-}
-
-func TestStdCopyWriteAndRead(t *testing.T) {
-	stdOutBytes := []byte(strings.Repeat("o", startingBufLen))
-	stdErrBytes := []byte(strings.Repeat("e", startingBufLen))
-	buffer, err := getSrcBuffer(stdOutBytes, stdErrBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	written, err := StdCopy(ioutil.Discard, ioutil.Discard, buffer)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expectedTotalWritten := len(stdOutBytes) + len(stdErrBytes)
-	if written != int64(expectedTotalWritten) {
-		t.Fatalf("Expected to have total of %d bytes written, got %d", expectedTotalWritten, written)
-	}
-}
-
-type customReader struct {
-	n            int
-	err          error
-	totalCalls   int
-	correctCalls int
-	src          *bytes.Buffer
-}
-
-func (f *customReader) Read(buf []byte) (int, error) {
-	f.totalCalls++
-	if f.totalCalls <= f.correctCalls {
-		return f.src.Read(buf)
-	}
-	return f.n, f.err
-}
-
-func TestStdCopyReturnsErrorReadingHeader(t *testing.T) {
-	expectedError := errors.New("error")
-	reader := &customReader{
-		err: expectedError}
-	written, err := StdCopy(ioutil.Discard, ioutil.Discard, reader)
-	if written != 0 {
-		t.Fatalf("Expected 0 bytes read, got %d", written)
-	}
-	if err != expectedError {
-		t.Fatalf("Didn't get expected error")
-	}
-}
-
-func TestStdCopyReturnsErrorReadingFrame(t *testing.T) {
-	expectedError := errors.New("error")
-	stdOutBytes := []byte(strings.Repeat("o", startingBufLen))
-	stdErrBytes := []byte(strings.Repeat("e", startingBufLen))
-	buffer, err := getSrcBuffer(stdOutBytes, stdErrBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	reader := &customReader{
-		correctCalls: 1,
-		n:            stdWriterPrefixLen + 1,
-		err:          expectedError,
-		src:          buffer}
-	written, err := StdCopy(ioutil.Discard, ioutil.Discard, reader)
-	if written != 0 {
-		t.Fatalf("Expected 0 bytes read, got %d", written)
-	}
-	if err != expectedError {
-		t.Fatalf("Didn't get expected error")
-	}
-}
-
-func TestStdCopyDetectsCorruptedFrame(t *testing.T) {
-	stdOutBytes := []byte(strings.Repeat("o", startingBufLen))
-	stdErrBytes := []byte(strings.Repeat("e", startingBufLen))
-	buffer, err := getSrcBuffer(stdOutBytes, stdErrBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	reader := &customReader{
-		correctCalls: 1,
-		n:            stdWriterPrefixLen + 1,
-		err:          io.EOF,
-		src:          buffer}
-	written, err := StdCopy(ioutil.Discard, ioutil.Discard, reader)
-	if written != startingBufLen {
-		t.Fatalf("Expected %d bytes read, got %d", startingBufLen, written)
-	}
-	if err != nil {
-		t.Fatal("Didn't get nil error")
-	}
-}
-
-func TestStdCopyWithInvalidInputHeader(t *testing.T) {
-	dstOut := NewStdWriter(ioutil.Discard, Stdout)
-	dstErr := NewStdWriter(ioutil.Discard, Stderr)
-	src := strings.NewReader("Invalid input")
-	_, err := StdCopy(dstOut, dstErr, src)
-	if err == nil {
-		t.Fatal("StdCopy with invalid input header should fail.")
-	}
-}
-
-func TestStdCopyWithCorruptedPrefix(t *testing.T) {
-	data := []byte{0x01, 0x02, 0x03}
-	src := bytes.NewReader(data)
-	written, err := StdCopy(nil, nil, src)
-	if err != nil {
-		t.Fatalf("StdCopy should not return an error with corrupted prefix.")
-	}
-	if written != 0 {
-		t.Fatalf("StdCopy should have written 0, but has written %d", written)
-	}
-}
-
-func TestStdCopyReturnsWriteErrors(t *testing.T) {
-	stdOutBytes := []byte(strings.Repeat("o", startingBufLen))
-	stdErrBytes := []byte(strings.Repeat("e", startingBufLen))
-	buffer, err := getSrcBuffer(stdOutBytes, stdErrBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expectedError := errors.New("expected")
-
-	dstOut := &errWriter{err: expectedError}
-
-	written, err := StdCopy(dstOut, ioutil.Discard, buffer)
-	if written != 0 {
-		t.Fatalf("StdCopy should have written 0, but has written %d", written)
-	}
-	if err != expectedError {
-		t.Fatalf("Didn't get expected error, got %v", err)
-	}
-}
-
-func TestStdCopyDetectsNotFullyWrittenFrames(t *testing.T) {
-	stdOutBytes := []byte(strings.Repeat("o", startingBufLen))
-	stdErrBytes := []byte(strings.Repeat("e", startingBufLen))
-	buffer, err := getSrcBuffer(stdOutBytes, stdErrBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-	dstOut := &errWriter{n: startingBufLen - 10}
-
-	written, err := StdCopy(dstOut, ioutil.Discard, buffer)
-	if written != 0 {
-		t.Fatalf("StdCopy should have return 0 written bytes, but returned %d", written)
-	}
-	if err != io.ErrShortWrite {
-		t.Fatalf("Didn't get expected io.ErrShortWrite error")
-	}
-}
-
-func BenchmarkWrite(b *testing.B) {
-	w := NewStdWriter(ioutil.Discard, Stdout)
-	data := []byte("Test line for testing stdwriter performance\n")
-	data = bytes.Repeat(data, 100)
-	b.SetBytes(int64(len(data)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		if _, err := w.Write(data); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter.go b/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter.go
deleted file mode 100644
index ce6ea79dee..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Package streamformatter provides helper functions to format a stream.
-package streamformatter
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/docker/docker/pkg/jsonmessage"
-	"github.com/docker/docker/pkg/progress"
-)
-
-// StreamFormatter formats a stream, optionally using JSON.
-type StreamFormatter struct {
-	json bool
-}
-
-// NewStreamFormatter returns a simple StreamFormatter
-func NewStreamFormatter() *StreamFormatter {
-	return &StreamFormatter{}
-}
-
-// NewJSONStreamFormatter returns a StreamFormatter configured to stream json
-func NewJSONStreamFormatter() *StreamFormatter {
-	return &StreamFormatter{true}
-}
-
-const streamNewline = "\r\n"
-
-var streamNewlineBytes = []byte(streamNewline)
-
-// FormatStream formats the specified stream.
-func (sf *StreamFormatter) FormatStream(str string) []byte {
-	if sf.json {
-		b, err := json.Marshal(&jsonmessage.JSONMessage{Stream: str})
-		if err != nil {
-			return sf.FormatError(err)
-		}
-		return append(b, streamNewlineBytes...)
-	}
-	return []byte(str + "\r")
-}
-
-// FormatStatus formats the specified objects according to the specified format (and id).
-func (sf *StreamFormatter) FormatStatus(id, format string, a ...interface{}) []byte {
-	str := fmt.Sprintf(format, a...)
-	if sf.json {
-		b, err := json.Marshal(&jsonmessage.JSONMessage{ID: id, Status: str})
-		if err != nil {
-			return sf.FormatError(err)
-		}
-		return append(b, streamNewlineBytes...)
-	}
-	return []byte(str + streamNewline)
-}
-
-// FormatError formats the specified error.
-func (sf *StreamFormatter) FormatError(err error) []byte {
-	if sf.json {
-		jsonError, ok := err.(*jsonmessage.JSONError)
-		if !ok {
-			jsonError = &jsonmessage.JSONError{Message: err.Error()}
-		}
-		if b, err := json.Marshal(&jsonmessage.JSONMessage{Error: jsonError, ErrorMessage: err.Error()}); err == nil {
-			return append(b, streamNewlineBytes...)
-		}
-		return []byte("{\"error\":\"format error\"}" + streamNewline)
-	}
-	return []byte("Error: " + err.Error() + streamNewline)
-}
-
-// FormatProgress formats the progress information for a specified action.
-func (sf *StreamFormatter) FormatProgress(id, action string, progress *jsonmessage.JSONProgress, aux interface{}) []byte {
-	if progress == nil {
-		progress = &jsonmessage.JSONProgress{}
-	}
-	if sf.json {
-		var auxJSON *json.RawMessage
-		if aux != nil {
-			auxJSONBytes, err := json.Marshal(aux)
-			if err != nil {
-				return nil
-			}
-			auxJSON = new(json.RawMessage)
-			*auxJSON = auxJSONBytes
-		}
-		b, err := json.Marshal(&jsonmessage.JSONMessage{
-			Status:          action,
-			ProgressMessage: progress.String(),
-			Progress:        progress,
-			ID:              id,
-			Aux:             auxJSON,
-		})
-		if err != nil {
-			return nil
-		}
-		return append(b, streamNewlineBytes...)
-	}
-	endl := "\r"
-	if progress.String() == "" {
-		endl += "\n"
-	}
-	return []byte(action + " " + progress.String() + endl)
-}
-
-// NewProgressOutput returns a progress.Output object that can be passed to
-// progress.NewProgressReader.
-func (sf *StreamFormatter) NewProgressOutput(out io.Writer, newLines bool) progress.Output {
-	return &progressOutput{
-		sf:       sf,
-		out:      out,
-		newLines: newLines,
-	}
-}
-
-type progressOutput struct {
-	sf       *StreamFormatter
-	out      io.Writer
-	newLines bool
-}
-
-// WriteProgress formats progress information from a ProgressReader.
-func (out *progressOutput) WriteProgress(prog progress.Progress) error {
-	var formatted []byte
-	if prog.Message != "" {
-		formatted = out.sf.FormatStatus(prog.ID, prog.Message)
-	} else {
-		jsonProgress := jsonmessage.JSONProgress{Current: prog.Current, Total: prog.Total}
-		formatted = out.sf.FormatProgress(prog.ID, prog.Action, &jsonProgress, prog.Aux)
-	}
-	_, err := out.out.Write(formatted)
-	if err != nil {
-		return err
-	}
-
-	if out.newLines && prog.LastUpdate {
-		_, err = out.out.Write(out.sf.FormatStatus("", ""))
-		return err
-	}
-
-	return nil
-}
-
-// StdoutFormatter is a streamFormatter that writes to the standard output.
-type StdoutFormatter struct {
-	io.Writer
-	*StreamFormatter
-}
-
-func (sf *StdoutFormatter) Write(buf []byte) (int, error) {
-	formattedBuf := sf.StreamFormatter.FormatStream(string(buf))
-	n, err := sf.Writer.Write(formattedBuf)
-	if n != len(formattedBuf) {
-		return n, io.ErrShortWrite
-	}
-	return len(buf), err
-}
-
-// StderrFormatter is a streamFormatter that writes to the standard error.
-type StderrFormatter struct {
-	io.Writer
-	*StreamFormatter
-}
-
-func (sf *StderrFormatter) Write(buf []byte) (int, error) {
-	formattedBuf := sf.StreamFormatter.FormatStream("\033[91m" + string(buf) + "\033[0m")
-	n, err := sf.Writer.Write(formattedBuf)
-	if n != len(formattedBuf) {
-		return n, io.ErrShortWrite
-	}
-	return len(buf), err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter_test.go b/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter_test.go
deleted file mode 100644
index 93ec90f5f7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/streamformatter/streamformatter_test.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package streamformatter
-
-import (
-	"encoding/json"
-	"errors"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/jsonmessage"
-)
-
-func TestFormatStream(t *testing.T) {
-	sf := NewStreamFormatter()
-	res := sf.FormatStream("stream")
-	if string(res) != "stream"+"\r" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestFormatJSONStatus(t *testing.T) {
-	sf := NewStreamFormatter()
-	res := sf.FormatStatus("ID", "%s%d", "a", 1)
-	if string(res) != "a1\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestFormatSimpleError(t *testing.T) {
-	sf := NewStreamFormatter()
-	res := sf.FormatError(errors.New("Error for formatter"))
-	if string(res) != "Error: Error for formatter\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestJSONFormatStream(t *testing.T) {
-	sf := NewJSONStreamFormatter()
-	res := sf.FormatStream("stream")
-	if string(res) != `{"stream":"stream"}`+"\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestJSONFormatStatus(t *testing.T) {
-	sf := NewJSONStreamFormatter()
-	res := sf.FormatStatus("ID", "%s%d", "a", 1)
-	if string(res) != `{"status":"a1","id":"ID"}`+"\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestJSONFormatSimpleError(t *testing.T) {
-	sf := NewJSONStreamFormatter()
-	res := sf.FormatError(errors.New("Error for formatter"))
-	if string(res) != `{"errorDetail":{"message":"Error for formatter"},"error":"Error for formatter"}`+"\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestJSONFormatJSONError(t *testing.T) {
-	sf := NewJSONStreamFormatter()
-	err := &jsonmessage.JSONError{Code: 50, Message: "Json error"}
-	res := sf.FormatError(err)
-	if string(res) != `{"errorDetail":{"code":50,"message":"Json error"},"error":"Json error"}`+"\r\n" {
-		t.Fatalf("%q", res)
-	}
-}
-
-func TestJSONFormatProgress(t *testing.T) {
-	sf := NewJSONStreamFormatter()
-	progress := &jsonmessage.JSONProgress{
-		Current: 15,
-		Total:   30,
-		Start:   1,
-	}
-	res := sf.FormatProgress("id", "action", progress, nil)
-	msg := &jsonmessage.JSONMessage{}
-	if err := json.Unmarshal(res, msg); err != nil {
-		t.Fatal(err)
-	}
-	if msg.ID != "id" {
-		t.Fatalf("ID must be 'id', got: %s", msg.ID)
-	}
-	if msg.Status != "action" {
-		t.Fatalf("Status must be 'action', got: %s", msg.Status)
-	}
-
-	// The progress will always be in the format of:
-	// [=========================>                         ]     15 B/30 B 404933h7m11s
-	// The last entry '404933h7m11s' is the timeLeftBox.
-	// However, the timeLeftBox field may change as progress.String() depends on time.Now().
-	// Therefore, we have to strip the timeLeftBox from the strings to do the comparison.
-
-	// Compare the progress strings before the timeLeftBox
-	expectedProgress := "[=========================>                         ]     15 B/30 B"
-	// if terminal column is <= 110, expectedProgressShort is expected.
-	expectedProgressShort := "    15 B/30 B"
-	if !(strings.HasPrefix(msg.ProgressMessage, expectedProgress) ||
-		strings.HasPrefix(msg.ProgressMessage, expectedProgressShort)) {
-		t.Fatalf("ProgressMessage without the timeLeftBox must be %s or %s, got: %s",
-			expectedProgress, expectedProgressShort, msg.ProgressMessage)
-	}
-
-	if !reflect.DeepEqual(msg.Progress, progress) {
-		t.Fatal("Original progress not equals progress from FormatProgress")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringid/README.md b/installer/vendor/github.com/docker/docker/pkg/stringid/README.md
deleted file mode 100644
index 37a5098fd9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringid/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This package provides helper functions for dealing with string identifiers
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringid/stringid.go b/installer/vendor/github.com/docker/docker/pkg/stringid/stringid.go
deleted file mode 100644
index fa35d8bad5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringid/stringid.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Package stringid provides helper functions for dealing with string identifiers
-package stringid
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"io"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/pkg/random"
-)
-
-const shortLen = 12
-
-var validShortID = regexp.MustCompile("^[a-z0-9]{12}$")
-
-// IsShortID determines if an arbitrary string *looks like* a short ID.
-func IsShortID(id string) bool {
-	return validShortID.MatchString(id)
-}
-
-// TruncateID returns a shorthand version of a string identifier for convenience.
-// A collision with other shorthands is very unlikely, but possible.
-// In case of a collision a lookup with TruncIndex.Get() will fail, and the caller
-// will need to use a longer prefix, or the full-length Id.
-func TruncateID(id string) string {
-	if i := strings.IndexRune(id, ':'); i >= 0 {
-		id = id[i+1:]
-	}
-	if len(id) > shortLen {
-		id = id[:shortLen]
-	}
-	return id
-}
-
-func generateID(crypto bool) string {
-	b := make([]byte, 32)
-	r := random.Reader
-	if crypto {
-		r = rand.Reader
-	}
-	for {
-		if _, err := io.ReadFull(r, b); err != nil {
-			panic(err) // This shouldn't happen
-		}
-		id := hex.EncodeToString(b)
-		// if we try to parse the truncated for as an int and we don't have
-		// an error then the value is all numeric and causes issues when
-		// used as a hostname. ref #3869
-		if _, err := strconv.ParseInt(TruncateID(id), 10, 64); err == nil {
-			continue
-		}
-		return id
-	}
-}
-
-// GenerateRandomID returns a unique id.
-func GenerateRandomID() string {
-	return generateID(true)
-}
-
-// GenerateNonCryptoID generates unique id without using cryptographically
-// secure sources of random.
-// It helps you to save entropy.
-func GenerateNonCryptoID() string {
-	return generateID(false)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringid/stringid_test.go b/installer/vendor/github.com/docker/docker/pkg/stringid/stringid_test.go
deleted file mode 100644
index 8ff6b4383d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringid/stringid_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package stringid
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestGenerateRandomID(t *testing.T) {
-	id := GenerateRandomID()
-
-	if len(id) != 64 {
-		t.Fatalf("Id returned is incorrect: %s", id)
-	}
-}
-
-func TestGenerateNonCryptoID(t *testing.T) {
-	id := GenerateNonCryptoID()
-
-	if len(id) != 64 {
-		t.Fatalf("Id returned is incorrect: %s", id)
-	}
-}
-
-func TestShortenId(t *testing.T) {
-	id := "90435eec5c4e124e741ef731e118be2fc799a68aba0466ec17717f24ce2ae6a2"
-	truncID := TruncateID(id)
-	if truncID != "90435eec5c4e" {
-		t.Fatalf("Id returned is incorrect: truncate on %s returned %s", id, truncID)
-	}
-}
-
-func TestShortenSha256Id(t *testing.T) {
-	id := "sha256:4e38e38c8ce0b8d9041a9c4fefe786631d1416225e13b0bfe8cfa2321aec4bba"
-	truncID := TruncateID(id)
-	if truncID != "4e38e38c8ce0" {
-		t.Fatalf("Id returned is incorrect: truncate on %s returned %s", id, truncID)
-	}
-}
-
-func TestShortenIdEmpty(t *testing.T) {
-	id := ""
-	truncID := TruncateID(id)
-	if len(truncID) > len(id) {
-		t.Fatalf("Id returned is incorrect: truncate on %s returned %s", id, truncID)
-	}
-}
-
-func TestShortenIdInvalid(t *testing.T) {
-	id := "1234"
-	truncID := TruncateID(id)
-	if len(truncID) != len(id) {
-		t.Fatalf("Id returned is incorrect: truncate on %s returned %s", id, truncID)
-	}
-}
-
-func TestIsShortIDNonHex(t *testing.T) {
-	id := "some non-hex value"
-	if IsShortID(id) {
-		t.Fatalf("%s is not a short ID", id)
-	}
-}
-
-func TestIsShortIDNotCorrectSize(t *testing.T) {
-	id := strings.Repeat("a", shortLen+1)
-	if IsShortID(id) {
-		t.Fatalf("%s is not a short ID", id)
-	}
-	id = strings.Repeat("a", shortLen-1)
-	if IsShortID(id) {
-		t.Fatalf("%s is not a short ID", id)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringutils/README.md b/installer/vendor/github.com/docker/docker/pkg/stringutils/README.md
deleted file mode 100644
index b3e454573c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringutils/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This package provides helper functions for dealing with strings
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils.go b/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils.go
deleted file mode 100644
index 8e1c812d7a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Package stringutils provides helper functions for dealing with strings.
-package stringutils
-
-import (
-	"bytes"
-	"math/rand"
-	"strings"
-
-	"github.com/docker/docker/pkg/random"
-)
-
-// GenerateRandomAlphaOnlyString generates an alphabetical random string with length n.
-func GenerateRandomAlphaOnlyString(n int) string {
-	// make a really long string
-	letters := []byte("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ")
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = letters[random.Rand.Intn(len(letters))]
-	}
-	return string(b)
-}
-
-// GenerateRandomASCIIString generates an ASCII random string with length n.
-func GenerateRandomASCIIString(n int) string {
-	chars := "abcdefghijklmnopqrstuvwxyz" +
-		"ABCDEFGHIJKLMNOPQRSTUVWXYZ" +
-		"~!@#$%^&*()-_+={}[]\\|<,>.?/\"';:` "
-	res := make([]byte, n)
-	for i := 0; i < n; i++ {
-		res[i] = chars[rand.Intn(len(chars))]
-	}
-	return string(res)
-}
-
-// Ellipsis truncates a string to fit within maxlen, and appends ellipsis (...).
-// For maxlen of 3 and lower, no ellipsis is appended.
-func Ellipsis(s string, maxlen int) string {
-	r := []rune(s)
-	if len(r) <= maxlen {
-		return s
-	}
-	if maxlen <= 3 {
-		return string(r[:maxlen])
-	}
-	return string(r[:maxlen-3]) + "..."
-}
-
-// Truncate truncates a string to maxlen.
-func Truncate(s string, maxlen int) string {
-	r := []rune(s)
-	if len(r) <= maxlen {
-		return s
-	}
-	return string(r[:maxlen])
-}
-
-// InSlice tests whether a string is contained in a slice of strings or not.
-// Comparison is case insensitive
-func InSlice(slice []string, s string) bool {
-	for _, ss := range slice {
-		if strings.ToLower(s) == strings.ToLower(ss) {
-			return true
-		}
-	}
-	return false
-}
-
-func quote(word string, buf *bytes.Buffer) {
-	// Bail out early for "simple" strings
-	if word != "" && !strings.ContainsAny(word, "\\'\"`${[|&;<>()~*?! \t\n") {
-		buf.WriteString(word)
-		return
-	}
-
-	buf.WriteString("'")
-
-	for i := 0; i < len(word); i++ {
-		b := word[i]
-		if b == '\'' {
-			// Replace literal ' with a close ', a \', and a open '
-			buf.WriteString("'\\''")
-		} else {
-			buf.WriteByte(b)
-		}
-	}
-
-	buf.WriteString("'")
-}
-
-// ShellQuoteArguments takes a list of strings and escapes them so they will be
-// handled right when passed as arguments to a program via a shell
-func ShellQuoteArguments(args []string) string {
-	var buf bytes.Buffer
-	for i, arg := range args {
-		if i != 0 {
-			buf.WriteByte(' ')
-		}
-		quote(arg, &buf)
-	}
-	return buf.String()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils_test.go b/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils_test.go
deleted file mode 100644
index 8af2bdcc0b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/stringutils/stringutils_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package stringutils
-
-import "testing"
-
-func testLengthHelper(generator func(int) string, t *testing.T) {
-	expectedLength := 20
-	s := generator(expectedLength)
-	if len(s) != expectedLength {
-		t.Fatalf("Length of %s was %d but expected length %d", s, len(s), expectedLength)
-	}
-}
-
-func testUniquenessHelper(generator func(int) string, t *testing.T) {
-	repeats := 25
-	set := make(map[string]struct{}, repeats)
-	for i := 0; i < repeats; i = i + 1 {
-		str := generator(64)
-		if len(str) != 64 {
-			t.Fatalf("Id returned is incorrect: %s", str)
-		}
-		if _, ok := set[str]; ok {
-			t.Fatalf("Random number is repeated")
-		}
-		set[str] = struct{}{}
-	}
-}
-
-func isASCII(s string) bool {
-	for _, c := range s {
-		if c > 127 {
-			return false
-		}
-	}
-	return true
-}
-
-func TestGenerateRandomAlphaOnlyStringLength(t *testing.T) {
-	testLengthHelper(GenerateRandomAlphaOnlyString, t)
-}
-
-func TestGenerateRandomAlphaOnlyStringUniqueness(t *testing.T) {
-	testUniquenessHelper(GenerateRandomAlphaOnlyString, t)
-}
-
-func TestGenerateRandomAsciiStringLength(t *testing.T) {
-	testLengthHelper(GenerateRandomASCIIString, t)
-}
-
-func TestGenerateRandomAsciiStringUniqueness(t *testing.T) {
-	testUniquenessHelper(GenerateRandomASCIIString, t)
-}
-
-func TestGenerateRandomAsciiStringIsAscii(t *testing.T) {
-	str := GenerateRandomASCIIString(64)
-	if !isASCII(str) {
-		t.Fatalf("%s contained non-ascii characters", str)
-	}
-}
-
-func TestEllipsis(t *testing.T) {
-	str := "t🐳ststring"
-	newstr := Ellipsis(str, 3)
-	if newstr != "t🐳s" {
-		t.Fatalf("Expected t🐳s, got %s", newstr)
-	}
-	newstr = Ellipsis(str, 8)
-	if newstr != "t🐳sts..." {
-		t.Fatalf("Expected tests..., got %s", newstr)
-	}
-	newstr = Ellipsis(str, 20)
-	if newstr != "t🐳ststring" {
-		t.Fatalf("Expected t🐳ststring, got %s", newstr)
-	}
-}
-
-func TestTruncate(t *testing.T) {
-	str := "t🐳ststring"
-	newstr := Truncate(str, 4)
-	if newstr != "t🐳st" {
-		t.Fatalf("Expected t🐳st, got %s", newstr)
-	}
-	newstr = Truncate(str, 20)
-	if newstr != "t🐳ststring" {
-		t.Fatalf("Expected t🐳ststring, got %s", newstr)
-	}
-}
-
-func TestInSlice(t *testing.T) {
-	slice := []string{"t🐳st", "in", "slice"}
-
-	test := InSlice(slice, "t🐳st")
-	if !test {
-		t.Fatalf("Expected string t🐳st to be in slice")
-	}
-	test = InSlice(slice, "SLICE")
-	if !test {
-		t.Fatalf("Expected string SLICE to be in slice")
-	}
-	test = InSlice(slice, "notinslice")
-	if test {
-		t.Fatalf("Expected string notinslice not to be in slice")
-	}
-}
-
-func TestShellQuoteArgumentsEmpty(t *testing.T) {
-	actual := ShellQuoteArguments([]string{})
-	expected := ""
-	if actual != expected {
-		t.Fatalf("Expected an empty string")
-	}
-}
-
-func TestShellQuoteArguments(t *testing.T) {
-	simpleString := "simpleString"
-	complexString := "This is a 'more' complex $tring with some special char *"
-	actual := ShellQuoteArguments([]string{simpleString, complexString})
-	expected := "simpleString 'This is a '\\''more'\\'' complex $tring with some special char *'"
-	if actual != expected {
-		t.Fatalf("Expected \"%v\", got \"%v\"", expected, actual)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/symlink/README.md b/installer/vendor/github.com/docker/docker/pkg/symlink/README.md
deleted file mode 100644
index 8dba54fd08..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/symlink/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Package symlink implements EvalSymlinksInScope which is an extension of filepath.EvalSymlinks,
-as well as a Windows long-path aware version of filepath.EvalSymlinks
-from the [Go standard library](https://golang.org/pkg/path/filepath).
-
-The code from filepath.EvalSymlinks has been adapted in fs.go.
-Please read the LICENSE.BSD file that governs fs.go and LICENSE.APACHE for fs_test.go.
diff --git a/installer/vendor/github.com/docker/docker/pkg/symlink/fs.go b/installer/vendor/github.com/docker/docker/pkg/symlink/fs.go
deleted file mode 100644
index f6bc2231f6..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/symlink/fs.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE.BSD file.
-
-// This code is a modified version of path/filepath/symlink.go from the Go standard library.
-
-package symlink
-
-import (
-	"bytes"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// FollowSymlinkInScope is a wrapper around evalSymlinksInScope that returns an
-// absolute path. This function handles paths in a platform-agnostic manner.
-func FollowSymlinkInScope(path, root string) (string, error) {
-	path, err := filepath.Abs(filepath.FromSlash(path))
-	if err != nil {
-		return "", err
-	}
-	root, err = filepath.Abs(filepath.FromSlash(root))
-	if err != nil {
-		return "", err
-	}
-	return evalSymlinksInScope(path, root)
-}
-
-// evalSymlinksInScope will evaluate symlinks in `path` within a scope `root` and return
-// a result guaranteed to be contained within the scope `root`, at the time of the call.
-// Symlinks in `root` are not evaluated and left as-is.
-// Errors encountered while attempting to evaluate symlinks in path will be returned.
-// Non-existing paths are valid and do not constitute an error.
-// `path` has to contain `root` as a prefix, or else an error will be returned.
-// Trying to break out from `root` does not constitute an error.
-//
-// Example:
-//   If /foo/bar -> /outside,
-//   FollowSymlinkInScope("/foo/bar", "/foo") == "/foo/outside" instead of "/oustide"
-//
-// IMPORTANT: it is the caller's responsibility to call evalSymlinksInScope *after* relevant symlinks
-// are created and not to create subsequently, additional symlinks that could potentially make a
-// previously-safe path, unsafe. Example: if /foo/bar does not exist, evalSymlinksInScope("/foo/bar", "/foo")
-// would return "/foo/bar". If one makes /foo/bar a symlink to /baz subsequently, then "/foo/bar" should
-// no longer be considered safely contained in "/foo".
-func evalSymlinksInScope(path, root string) (string, error) {
-	root = filepath.Clean(root)
-	if path == root {
-		return path, nil
-	}
-	if !strings.HasPrefix(path, root) {
-		return "", errors.New("evalSymlinksInScope: " + path + " is not in " + root)
-	}
-	const maxIter = 255
-	originalPath := path
-	// given root of "/a" and path of "/a/b/../../c" we want path to be "/b/../../c"
-	path = path[len(root):]
-	if root == string(filepath.Separator) {
-		path = string(filepath.Separator) + path
-	}
-	if !strings.HasPrefix(path, string(filepath.Separator)) {
-		return "", errors.New("evalSymlinksInScope: " + path + " is not in " + root)
-	}
-	path = filepath.Clean(path)
-	// consume path by taking each frontmost path element,
-	// expanding it if it's a symlink, and appending it to b
-	var b bytes.Buffer
-	// b here will always be considered to be the "current absolute path inside
-	// root" when we append paths to it, we also append a slash and use
-	// filepath.Clean after the loop to trim the trailing slash
-	for n := 0; path != ""; n++ {
-		if n > maxIter {
-			return "", errors.New("evalSymlinksInScope: too many links in " + originalPath)
-		}
-
-		// find next path component, p
-		i := strings.IndexRune(path, filepath.Separator)
-		var p string
-		if i == -1 {
-			p, path = path, ""
-		} else {
-			p, path = path[:i], path[i+1:]
-		}
-
-		if p == "" {
-			continue
-		}
-
-		// this takes a b.String() like "b/../" and a p like "c" and turns it
-		// into "/b/../c" which then gets filepath.Cleaned into "/c" and then
-		// root gets prepended and we Clean again (to remove any trailing slash
-		// if the first Clean gave us just "/")
-		cleanP := filepath.Clean(string(filepath.Separator) + b.String() + p)
-		if isDriveOrRoot(cleanP) {
-			// never Lstat "/" itself, or drive letters on Windows
-			b.Reset()
-			continue
-		}
-		fullP := filepath.Clean(root + cleanP)
-
-		fi, err := os.Lstat(fullP)
-		if os.IsNotExist(err) {
-			// if p does not exist, accept it
-			b.WriteString(p)
-			b.WriteRune(filepath.Separator)
-			continue
-		}
-		if err != nil {
-			return "", err
-		}
-		if fi.Mode()&os.ModeSymlink == 0 {
-			b.WriteString(p)
-			b.WriteRune(filepath.Separator)
-			continue
-		}
-
-		// it's a symlink, put it at the front of path
-		dest, err := os.Readlink(fullP)
-		if err != nil {
-			return "", err
-		}
-		if system.IsAbs(dest) {
-			b.Reset()
-		}
-		path = dest + string(filepath.Separator) + path
-	}
-
-	// see note above on "fullP := ..." for why this is double-cleaned and
-	// what's happening here
-	return filepath.Clean(root + filepath.Clean(string(filepath.Separator)+b.String())), nil
-}
-
-// EvalSymlinks returns the path name after the evaluation of any symbolic
-// links.
-// If path is relative the result will be relative to the current directory,
-// unless one of the components is an absolute symbolic link.
-// This version has been updated to support long paths prepended with `\\?\`.
-func EvalSymlinks(path string) (string, error) {
-	return evalSymlinks(path)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix.go b/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix.go
deleted file mode 100644
index 22708273d6..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build !windows
-
-package symlink
-
-import (
-	"path/filepath"
-)
-
-func evalSymlinks(path string) (string, error) {
-	return filepath.EvalSymlinks(path)
-}
-
-func isDriveOrRoot(p string) bool {
-	return p == string(filepath.Separator)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix_test.go
deleted file mode 100644
index 7085c0b666..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_unix_test.go
+++ /dev/null
@@ -1,407 +0,0 @@
-// +build !windows
-
-// Licensed under the Apache License, Version 2.0; See LICENSE.APACHE
-
-package symlink
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// TODO Windows: This needs some serious work to port to Windows. For now,
-// turning off testing in this package.
-
-type dirOrLink struct {
-	path   string
-	target string
-}
-
-func makeFs(tmpdir string, fs []dirOrLink) error {
-	for _, s := range fs {
-		s.path = filepath.Join(tmpdir, s.path)
-		if s.target == "" {
-			os.MkdirAll(s.path, 0755)
-			continue
-		}
-		if err := os.MkdirAll(filepath.Dir(s.path), 0755); err != nil {
-			return err
-		}
-		if err := os.Symlink(s.target, s.path); err != nil && !os.IsExist(err) {
-			return err
-		}
-	}
-	return nil
-}
-
-func testSymlink(tmpdir, path, expected, scope string) error {
-	rewrite, err := FollowSymlinkInScope(filepath.Join(tmpdir, path), filepath.Join(tmpdir, scope))
-	if err != nil {
-		return err
-	}
-	expected, err = filepath.Abs(filepath.Join(tmpdir, expected))
-	if err != nil {
-		return err
-	}
-	if expected != rewrite {
-		return fmt.Errorf("Expected %q got %q", expected, rewrite)
-	}
-	return nil
-}
-
-func TestFollowSymlinkAbsolute(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkAbsolute")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/d", target: "/b"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/a/d/c/data", "testdata/b/c/data", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkRelativePath(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativePath")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/i", target: "a"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/i", "testdata/fs/a", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkSkipSymlinksOutsideScope(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkSkipSymlinksOutsideScope")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "linkdir", target: "realdir"},
-		{path: "linkdir/foo/bar"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "linkdir/foo/bar", "linkdir/foo/bar", "linkdir/foo"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkInvalidScopePathPair(t *testing.T) {
-	if _, err := FollowSymlinkInScope("toto", "testdata"); err == nil {
-		t.Fatal("expected an error")
-	}
-}
-
-func TestFollowSymlinkLastLink(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkLastLink")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/d", target: "/b"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/a/d", "testdata/b", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkRelativeLinkChangeScope(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativeLinkChangeScope")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/e", target: "../b"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/a/e/c/data", "testdata/fs/b/c/data", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-	// avoid letting allowing symlink e lead us to ../b
-	// normalize to the "testdata/fs/a"
-	if err := testSymlink(tmpdir, "testdata/fs/a/e", "testdata/fs/a/b", "testdata/fs/a"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkDeepRelativeLinkChangeScope(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkDeepRelativeLinkChangeScope")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/a/f", target: "../../../../test"}}); err != nil {
-		t.Fatal(err)
-	}
-	// avoid letting symlink f lead us out of the "testdata" scope
-	// we don't normalize because symlink f is in scope and there is no
-	// information leak
-	if err := testSymlink(tmpdir, "testdata/fs/a/f", "testdata/test", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-	// avoid letting symlink f lead us out of the "testdata/fs" scope
-	// we don't normalize because symlink f is in scope and there is no
-	// information leak
-	if err := testSymlink(tmpdir, "testdata/fs/a/f", "testdata/fs/test", "testdata/fs"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkRelativeLinkChain(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativeLinkChain")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	// avoid letting symlink g (pointed at by symlink h) take out of scope
-	// TODO: we should probably normalize to scope here because ../[....]/root
-	// is out of scope and we leak information
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "testdata/fs/b/h", target: "../g"},
-		{path: "testdata/fs/g", target: "../../../../../../../../../../../../root"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/b/h", "testdata/root", "testdata"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkBreakoutPath(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkBreakoutPath")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	// avoid letting symlink -> ../directory/file escape from scope
-	// normalize to "testdata/fs/j"
-	if err := makeFs(tmpdir, []dirOrLink{{path: "testdata/fs/j/k", target: "../i/a"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "testdata/fs/j/k", "testdata/fs/j/i/a", "testdata/fs/j"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkToRoot(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkToRoot")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	// make sure we don't allow escaping to /
-	// normalize to dir
-	if err := makeFs(tmpdir, []dirOrLink{{path: "foo", target: "/"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkSlashDotdot(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkSlashDotdot")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	tmpdir = filepath.Join(tmpdir, "dir", "subdir")
-
-	// make sure we don't allow escaping to /
-	// normalize to dir
-	if err := makeFs(tmpdir, []dirOrLink{{path: "foo", target: "/../../"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkDotdot(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkDotdot")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-	tmpdir = filepath.Join(tmpdir, "dir", "subdir")
-
-	// make sure we stay in scope without leaking information
-	// this also checks for escaping to /
-	// normalize to dir
-	if err := makeFs(tmpdir, []dirOrLink{{path: "foo", target: "../../"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "foo", "", ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkRelativePath2(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRelativePath2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{{path: "bar/foo", target: "baz/target"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "bar/foo", "bar/baz/target", ""); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkScopeLink(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkScopeLink")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "root2"},
-		{path: "root", target: "root2"},
-		{path: "root2/foo", target: "../bar"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/foo", "root/bar", "root"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkRootScope(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkRootScope")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	expected, err := filepath.EvalSymlinks(tmpdir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	rewrite, err := FollowSymlinkInScope(tmpdir, "/")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if rewrite != expected {
-		t.Fatalf("expected %q got %q", expected, rewrite)
-	}
-}
-
-func TestFollowSymlinkEmpty(t *testing.T) {
-	res, err := FollowSymlinkInScope("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if res != wd {
-		t.Fatalf("expected %q got %q", wd, res)
-	}
-}
-
-func TestFollowSymlinkCircular(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkCircular")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{{path: "root/foo", target: "foo"}}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/foo", "", "root"); err == nil {
-		t.Fatal("expected an error for foo -> foo")
-	}
-
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "root/bar", target: "baz"},
-		{path: "root/baz", target: "../bak"},
-		{path: "root/bak", target: "/bar"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/foo", "", "root"); err == nil {
-		t.Fatal("expected an error for bar -> baz -> bak -> bar")
-	}
-}
-
-func TestFollowSymlinkComplexChainWithTargetPathsContainingLinks(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkComplexChainWithTargetPathsContainingLinks")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "root2"},
-		{path: "root", target: "root2"},
-		{path: "root/a", target: "r/s"},
-		{path: "root/r", target: "../root/t"},
-		{path: "root/root/t/s/b", target: "/../u"},
-		{path: "root/u/c", target: "."},
-		{path: "root/u/x/y", target: "../v"},
-		{path: "root/u/v", target: "/../w"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/a/b/c/x/y/z", "root/w/z", "root"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkBreakoutNonExistent(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkBreakoutNonExistent")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "root/slash", target: "/"},
-		{path: "root/sym", target: "/idontexist/../slash"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/sym/file", "root/file", "root"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestFollowSymlinkNoLexicalCleaning(t *testing.T) {
-	tmpdir, err := ioutil.TempDir("", "TestFollowSymlinkNoLexicalCleaning")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpdir)
-
-	if err := makeFs(tmpdir, []dirOrLink{
-		{path: "root/sym", target: "/foo/bar"},
-		{path: "root/hello", target: "/sym/../baz"},
-	}); err != nil {
-		t.Fatal(err)
-	}
-	if err := testSymlink(tmpdir, "root/hello", "root/foo/baz", "root"); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_windows.go b/installer/vendor/github.com/docker/docker/pkg/symlink/fs_windows.go
deleted file mode 100644
index 241e531f9d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/symlink/fs_windows.go
+++ /dev/null
@@ -1,169 +0,0 @@
-package symlink
-
-import (
-	"bytes"
-	"errors"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"github.com/docker/docker/pkg/longpath"
-)
-
-func toShort(path string) (string, error) {
-	p, err := syscall.UTF16FromString(path)
-	if err != nil {
-		return "", err
-	}
-	b := p // GetShortPathName says we can reuse buffer
-	n, err := syscall.GetShortPathName(&p[0], &b[0], uint32(len(b)))
-	if err != nil {
-		return "", err
-	}
-	if n > uint32(len(b)) {
-		b = make([]uint16, n)
-		if _, err = syscall.GetShortPathName(&p[0], &b[0], uint32(len(b))); err != nil {
-			return "", err
-		}
-	}
-	return syscall.UTF16ToString(b), nil
-}
-
-func toLong(path string) (string, error) {
-	p, err := syscall.UTF16FromString(path)
-	if err != nil {
-		return "", err
-	}
-	b := p // GetLongPathName says we can reuse buffer
-	n, err := syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
-	if err != nil {
-		return "", err
-	}
-	if n > uint32(len(b)) {
-		b = make([]uint16, n)
-		n, err = syscall.GetLongPathName(&p[0], &b[0], uint32(len(b)))
-		if err != nil {
-			return "", err
-		}
-	}
-	b = b[:n]
-	return syscall.UTF16ToString(b), nil
-}
-
-func evalSymlinks(path string) (string, error) {
-	path, err := walkSymlinks(path)
-	if err != nil {
-		return "", err
-	}
-
-	p, err := toShort(path)
-	if err != nil {
-		return "", err
-	}
-	p, err = toLong(p)
-	if err != nil {
-		return "", err
-	}
-	// syscall.GetLongPathName does not change the case of the drive letter,
-	// but the result of EvalSymlinks must be unique, so we have
-	// EvalSymlinks(`c:\a`) == EvalSymlinks(`C:\a`).
-	// Make drive letter upper case.
-	if len(p) >= 2 && p[1] == ':' && 'a' <= p[0] && p[0] <= 'z' {
-		p = string(p[0]+'A'-'a') + p[1:]
-	} else if len(p) >= 6 && p[5] == ':' && 'a' <= p[4] && p[4] <= 'z' {
-		p = p[:3] + string(p[4]+'A'-'a') + p[5:]
-	}
-	return filepath.Clean(p), nil
-}
-
-const utf8RuneSelf = 0x80
-
-func walkSymlinks(path string) (string, error) {
-	const maxIter = 255
-	originalPath := path
-	// consume path by taking each frontmost path element,
-	// expanding it if it's a symlink, and appending it to b
-	var b bytes.Buffer
-	for n := 0; path != ""; n++ {
-		if n > maxIter {
-			return "", errors.New("EvalSymlinks: too many links in " + originalPath)
-		}
-
-		// A path beginning with `\\?\` represents the root, so automatically
-		// skip that part and begin processing the next segment.
-		if strings.HasPrefix(path, longpath.Prefix) {
-			b.WriteString(longpath.Prefix)
-			path = path[4:]
-			continue
-		}
-
-		// find next path component, p
-		var i = -1
-		for j, c := range path {
-			if c < utf8RuneSelf && os.IsPathSeparator(uint8(c)) {
-				i = j
-				break
-			}
-		}
-		var p string
-		if i == -1 {
-			p, path = path, ""
-		} else {
-			p, path = path[:i], path[i+1:]
-		}
-
-		if p == "" {
-			if b.Len() == 0 {
-				// must be absolute path
-				b.WriteRune(filepath.Separator)
-			}
-			continue
-		}
-
-		// If this is the first segment after the long path prefix, accept the
-		// current segment as a volume root or UNC share and move on to the next.
-		if b.String() == longpath.Prefix {
-			b.WriteString(p)
-			b.WriteRune(filepath.Separator)
-			continue
-		}
-
-		fi, err := os.Lstat(b.String() + p)
-		if err != nil {
-			return "", err
-		}
-		if fi.Mode()&os.ModeSymlink == 0 {
-			b.WriteString(p)
-			if path != "" || (b.Len() == 2 && len(p) == 2 && p[1] == ':') {
-				b.WriteRune(filepath.Separator)
-			}
-			continue
-		}
-
-		// it's a symlink, put it at the front of path
-		dest, err := os.Readlink(b.String() + p)
-		if err != nil {
-			return "", err
-		}
-		if filepath.IsAbs(dest) || os.IsPathSeparator(dest[0]) {
-			b.Reset()
-		}
-		path = dest + string(filepath.Separator) + path
-	}
-	return filepath.Clean(b.String()), nil
-}
-
-func isDriveOrRoot(p string) bool {
-	if p == string(filepath.Separator) {
-		return true
-	}
-
-	length := len(p)
-	if length >= 2 {
-		if p[length-1] == ':' && (('a' <= p[length-2] && p[length-2] <= 'z') || ('A' <= p[length-2] && p[length-2] <= 'Z')) {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/README.md b/installer/vendor/github.com/docker/docker/pkg/sysinfo/README.md
deleted file mode 100644
index c1530cef0d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/README.md
+++ /dev/null
@@ -1 +0,0 @@
-SysInfo stores information about which features a kernel supports.
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu.go
deleted file mode 100644
index aeb1a3a804..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build !linux,!windows
-
-package sysinfo
-
-import (
-	"runtime"
-)
-
-// NumCPU returns the number of CPUs
-func NumCPU() int {
-	return runtime.NumCPU()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_linux.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_linux.go
deleted file mode 100644
index 5eacd35121..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_linux.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build linux
-
-package sysinfo
-
-import (
-	"runtime"
-	"syscall"
-	"unsafe"
-)
-
-// numCPU queries the system for the count of threads available
-// for use to this process.
-//
-// Issues two syscalls.
-// Returns 0 on errors. Use |runtime.NumCPU| in that case.
-func numCPU() int {
-	// Gets the affinity mask for a process: The very one invoking this function.
-	pid, _, _ := syscall.RawSyscall(syscall.SYS_GETPID, 0, 0, 0)
-
-	var mask [1024 / 64]uintptr
-	_, _, err := syscall.RawSyscall(syscall.SYS_SCHED_GETAFFINITY, pid, uintptr(len(mask)*8), uintptr(unsafe.Pointer(&mask[0])))
-	if err != 0 {
-		return 0
-	}
-
-	// For every available thread a bit is set in the mask.
-	ncpu := 0
-	for _, e := range mask {
-		if e == 0 {
-			continue
-		}
-		ncpu += int(popcnt(uint64(e)))
-	}
-	return ncpu
-}
-
-// NumCPU returns the number of CPUs which are currently online
-func NumCPU() int {
-	if ncpu := numCPU(); ncpu > 0 {
-		return ncpu
-	}
-	return runtime.NumCPU()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_windows.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_windows.go
deleted file mode 100644
index 1d89dd5503..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/numcpu_windows.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build windows
-
-package sysinfo
-
-import (
-	"runtime"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	kernel32               = windows.NewLazySystemDLL("kernel32.dll")
-	getCurrentProcess      = kernel32.NewProc("GetCurrentProcess")
-	getProcessAffinityMask = kernel32.NewProc("GetProcessAffinityMask")
-)
-
-func numCPU() int {
-	// Gets the affinity mask for a process
-	var mask, sysmask uintptr
-	currentProcess, _, _ := getCurrentProcess.Call()
-	ret, _, _ := getProcessAffinityMask.Call(currentProcess, uintptr(unsafe.Pointer(&mask)), uintptr(unsafe.Pointer(&sysmask)))
-	if ret == 0 {
-		return 0
-	}
-	// For every available thread a bit is set in the mask.
-	ncpu := int(popcnt(uint64(mask)))
-	return ncpu
-}
-
-// NumCPU returns the number of CPUs which are currently online
-func NumCPU() int {
-	if ncpu := numCPU(); ncpu > 0 {
-		return ncpu
-	}
-	return runtime.NumCPU()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo.go
deleted file mode 100644
index f046de4b16..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo.go
+++ /dev/null
@@ -1,144 +0,0 @@
-package sysinfo
-
-import "github.com/docker/docker/pkg/parsers"
-
-// SysInfo stores information about which features a kernel supports.
-// TODO Windows: Factor out platform specific capabilities.
-type SysInfo struct {
-	// Whether the kernel supports AppArmor or not
-	AppArmor bool
-	// Whether the kernel supports Seccomp or not
-	Seccomp bool
-
-	cgroupMemInfo
-	cgroupCPUInfo
-	cgroupBlkioInfo
-	cgroupCpusetInfo
-	cgroupPids
-
-	// Whether IPv4 forwarding is supported or not, if this was disabled, networking will not work
-	IPv4ForwardingDisabled bool
-
-	// Whether bridge-nf-call-iptables is supported or not
-	BridgeNFCallIPTablesDisabled bool
-
-	// Whether bridge-nf-call-ip6tables is supported or not
-	BridgeNFCallIP6TablesDisabled bool
-
-	// Whether the cgroup has the mountpoint of "devices" or not
-	CgroupDevicesEnabled bool
-}
-
-type cgroupMemInfo struct {
-	// Whether memory limit is supported or not
-	MemoryLimit bool
-
-	// Whether swap limit is supported or not
-	SwapLimit bool
-
-	// Whether soft limit is supported or not
-	MemoryReservation bool
-
-	// Whether OOM killer disable is supported or not
-	OomKillDisable bool
-
-	// Whether memory swappiness is supported or not
-	MemorySwappiness bool
-
-	// Whether kernel memory limit is supported or not
-	KernelMemory bool
-}
-
-type cgroupCPUInfo struct {
-	// Whether CPU shares is supported or not
-	CPUShares bool
-
-	// Whether CPU CFS(Completely Fair Scheduler) period is supported or not
-	CPUCfsPeriod bool
-
-	// Whether CPU CFS(Completely Fair Scheduler) quota is supported or not
-	CPUCfsQuota bool
-
-	// Whether CPU real-time period is supported or not
-	CPURealtimePeriod bool
-
-	// Whether CPU real-time runtime is supported or not
-	CPURealtimeRuntime bool
-}
-
-type cgroupBlkioInfo struct {
-	// Whether Block IO weight is supported or not
-	BlkioWeight bool
-
-	// Whether Block IO weight_device is supported or not
-	BlkioWeightDevice bool
-
-	// Whether Block IO read limit in bytes per second is supported or not
-	BlkioReadBpsDevice bool
-
-	// Whether Block IO write limit in bytes per second is supported or not
-	BlkioWriteBpsDevice bool
-
-	// Whether Block IO read limit in IO per second is supported or not
-	BlkioReadIOpsDevice bool
-
-	// Whether Block IO write limit in IO per second is supported or not
-	BlkioWriteIOpsDevice bool
-}
-
-type cgroupCpusetInfo struct {
-	// Whether Cpuset is supported or not
-	Cpuset bool
-
-	// Available Cpuset's cpus
-	Cpus string
-
-	// Available Cpuset's memory nodes
-	Mems string
-}
-
-type cgroupPids struct {
-	// Whether Pids Limit is supported or not
-	PidsLimit bool
-}
-
-// IsCpusetCpusAvailable returns `true` if the provided string set is contained
-// in cgroup's cpuset.cpus set, `false` otherwise.
-// If error is not nil a parsing error occurred.
-func (c cgroupCpusetInfo) IsCpusetCpusAvailable(provided string) (bool, error) {
-	return isCpusetListAvailable(provided, c.Cpus)
-}
-
-// IsCpusetMemsAvailable returns `true` if the provided string set is contained
-// in cgroup's cpuset.mems set, `false` otherwise.
-// If error is not nil a parsing error occurred.
-func (c cgroupCpusetInfo) IsCpusetMemsAvailable(provided string) (bool, error) {
-	return isCpusetListAvailable(provided, c.Mems)
-}
-
-func isCpusetListAvailable(provided, available string) (bool, error) {
-	parsedProvided, err := parsers.ParseUintList(provided)
-	if err != nil {
-		return false, err
-	}
-	parsedAvailable, err := parsers.ParseUintList(available)
-	if err != nil {
-		return false, err
-	}
-	for k := range parsedProvided {
-		if !parsedAvailable[k] {
-			return false, nil
-		}
-	}
-	return true, nil
-}
-
-// Returns bit count of 1, used by NumCPU
-func popcnt(x uint64) (n byte) {
-	x -= (x >> 1) & 0x5555555555555555
-	x = (x>>2)&0x3333333333333333 + x&0x3333333333333333
-	x += x >> 4
-	x &= 0x0f0f0f0f0f0f0f0f
-	x *= 0x0101010101010101
-	return byte(x >> 56)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux.go
deleted file mode 100644
index 7ad84a8309..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux.go
+++ /dev/null
@@ -1,259 +0,0 @@
-package sysinfo
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"strings"
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/opencontainers/runc/libcontainer/cgroups"
-)
-
-const (
-	// SeccompModeFilter refers to the syscall argument SECCOMP_MODE_FILTER.
-	SeccompModeFilter = uintptr(2)
-)
-
-func findCgroupMountpoints() (map[string]string, error) {
-	cgMounts, err := cgroups.GetCgroupMounts(false)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to parse cgroup information: %v", err)
-	}
-	mps := make(map[string]string)
-	for _, m := range cgMounts {
-		for _, ss := range m.Subsystems {
-			mps[ss] = m.Mountpoint
-		}
-	}
-	return mps, nil
-}
-
-// New returns a new SysInfo, using the filesystem to detect which features
-// the kernel supports. If `quiet` is `false` warnings are printed in logs
-// whenever an error occurs or misconfigurations are present.
-func New(quiet bool) *SysInfo {
-	sysInfo := &SysInfo{}
-	cgMounts, err := findCgroupMountpoints()
-	if err != nil {
-		logrus.Warnf("Failed to parse cgroup information: %v", err)
-	} else {
-		sysInfo.cgroupMemInfo = checkCgroupMem(cgMounts, quiet)
-		sysInfo.cgroupCPUInfo = checkCgroupCPU(cgMounts, quiet)
-		sysInfo.cgroupBlkioInfo = checkCgroupBlkioInfo(cgMounts, quiet)
-		sysInfo.cgroupCpusetInfo = checkCgroupCpusetInfo(cgMounts, quiet)
-		sysInfo.cgroupPids = checkCgroupPids(quiet)
-	}
-
-	_, ok := cgMounts["devices"]
-	sysInfo.CgroupDevicesEnabled = ok
-
-	sysInfo.IPv4ForwardingDisabled = !readProcBool("/proc/sys/net/ipv4/ip_forward")
-	sysInfo.BridgeNFCallIPTablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-iptables")
-	sysInfo.BridgeNFCallIP6TablesDisabled = !readProcBool("/proc/sys/net/bridge/bridge-nf-call-ip6tables")
-
-	// Check if AppArmor is supported.
-	if _, err := os.Stat("/sys/kernel/security/apparmor"); !os.IsNotExist(err) {
-		sysInfo.AppArmor = true
-	}
-
-	// Check if Seccomp is supported, via CONFIG_SECCOMP.
-	if _, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, syscall.PR_GET_SECCOMP, 0, 0); err != syscall.EINVAL {
-		// Make sure the kernel has CONFIG_SECCOMP_FILTER.
-		if _, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, syscall.PR_SET_SECCOMP, SeccompModeFilter, 0); err != syscall.EINVAL {
-			sysInfo.Seccomp = true
-		}
-	}
-
-	return sysInfo
-}
-
-// checkCgroupMem reads the memory information from the memory cgroup mount point.
-func checkCgroupMem(cgMounts map[string]string, quiet bool) cgroupMemInfo {
-	mountPoint, ok := cgMounts["memory"]
-	if !ok {
-		if !quiet {
-			logrus.Warn("Your kernel does not support cgroup memory limit")
-		}
-		return cgroupMemInfo{}
-	}
-
-	swapLimit := cgroupEnabled(mountPoint, "memory.memsw.limit_in_bytes")
-	if !quiet && !swapLimit {
-		logrus.Warn("Your kernel does not support swap memory limit")
-	}
-	memoryReservation := cgroupEnabled(mountPoint, "memory.soft_limit_in_bytes")
-	if !quiet && !memoryReservation {
-		logrus.Warn("Your kernel does not support memory reservation")
-	}
-	oomKillDisable := cgroupEnabled(mountPoint, "memory.oom_control")
-	if !quiet && !oomKillDisable {
-		logrus.Warn("Your kernel does not support oom control")
-	}
-	memorySwappiness := cgroupEnabled(mountPoint, "memory.swappiness")
-	if !quiet && !memorySwappiness {
-		logrus.Warn("Your kernel does not support memory swappiness")
-	}
-	kernelMemory := cgroupEnabled(mountPoint, "memory.kmem.limit_in_bytes")
-	if !quiet && !kernelMemory {
-		logrus.Warn("Your kernel does not support kernel memory limit")
-	}
-
-	return cgroupMemInfo{
-		MemoryLimit:       true,
-		SwapLimit:         swapLimit,
-		MemoryReservation: memoryReservation,
-		OomKillDisable:    oomKillDisable,
-		MemorySwappiness:  memorySwappiness,
-		KernelMemory:      kernelMemory,
-	}
-}
-
-// checkCgroupCPU reads the cpu information from the cpu cgroup mount point.
-func checkCgroupCPU(cgMounts map[string]string, quiet bool) cgroupCPUInfo {
-	mountPoint, ok := cgMounts["cpu"]
-	if !ok {
-		if !quiet {
-			logrus.Warn("Unable to find cpu cgroup in mounts")
-		}
-		return cgroupCPUInfo{}
-	}
-
-	cpuShares := cgroupEnabled(mountPoint, "cpu.shares")
-	if !quiet && !cpuShares {
-		logrus.Warn("Your kernel does not support cgroup cpu shares")
-	}
-
-	cpuCfsPeriod := cgroupEnabled(mountPoint, "cpu.cfs_period_us")
-	if !quiet && !cpuCfsPeriod {
-		logrus.Warn("Your kernel does not support cgroup cfs period")
-	}
-
-	cpuCfsQuota := cgroupEnabled(mountPoint, "cpu.cfs_quota_us")
-	if !quiet && !cpuCfsQuota {
-		logrus.Warn("Your kernel does not support cgroup cfs quotas")
-	}
-
-	cpuRealtimePeriod := cgroupEnabled(mountPoint, "cpu.rt_period_us")
-	if !quiet && !cpuRealtimePeriod {
-		logrus.Warn("Your kernel does not support cgroup rt period")
-	}
-
-	cpuRealtimeRuntime := cgroupEnabled(mountPoint, "cpu.rt_runtime_us")
-	if !quiet && !cpuRealtimeRuntime {
-		logrus.Warn("Your kernel does not support cgroup rt runtime")
-	}
-
-	return cgroupCPUInfo{
-		CPUShares:          cpuShares,
-		CPUCfsPeriod:       cpuCfsPeriod,
-		CPUCfsQuota:        cpuCfsQuota,
-		CPURealtimePeriod:  cpuRealtimePeriod,
-		CPURealtimeRuntime: cpuRealtimeRuntime,
-	}
-}
-
-// checkCgroupBlkioInfo reads the blkio information from the blkio cgroup mount point.
-func checkCgroupBlkioInfo(cgMounts map[string]string, quiet bool) cgroupBlkioInfo {
-	mountPoint, ok := cgMounts["blkio"]
-	if !ok {
-		if !quiet {
-			logrus.Warn("Unable to find blkio cgroup in mounts")
-		}
-		return cgroupBlkioInfo{}
-	}
-
-	weight := cgroupEnabled(mountPoint, "blkio.weight")
-	if !quiet && !weight {
-		logrus.Warn("Your kernel does not support cgroup blkio weight")
-	}
-
-	weightDevice := cgroupEnabled(mountPoint, "blkio.weight_device")
-	if !quiet && !weightDevice {
-		logrus.Warn("Your kernel does not support cgroup blkio weight_device")
-	}
-
-	readBpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.read_bps_device")
-	if !quiet && !readBpsDevice {
-		logrus.Warn("Your kernel does not support cgroup blkio throttle.read_bps_device")
-	}
-
-	writeBpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.write_bps_device")
-	if !quiet && !writeBpsDevice {
-		logrus.Warn("Your kernel does not support cgroup blkio throttle.write_bps_device")
-	}
-	readIOpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.read_iops_device")
-	if !quiet && !readIOpsDevice {
-		logrus.Warn("Your kernel does not support cgroup blkio throttle.read_iops_device")
-	}
-
-	writeIOpsDevice := cgroupEnabled(mountPoint, "blkio.throttle.write_iops_device")
-	if !quiet && !writeIOpsDevice {
-		logrus.Warn("Your kernel does not support cgroup blkio throttle.write_iops_device")
-	}
-	return cgroupBlkioInfo{
-		BlkioWeight:          weight,
-		BlkioWeightDevice:    weightDevice,
-		BlkioReadBpsDevice:   readBpsDevice,
-		BlkioWriteBpsDevice:  writeBpsDevice,
-		BlkioReadIOpsDevice:  readIOpsDevice,
-		BlkioWriteIOpsDevice: writeIOpsDevice,
-	}
-}
-
-// checkCgroupCpusetInfo reads the cpuset information from the cpuset cgroup mount point.
-func checkCgroupCpusetInfo(cgMounts map[string]string, quiet bool) cgroupCpusetInfo {
-	mountPoint, ok := cgMounts["cpuset"]
-	if !ok {
-		if !quiet {
-			logrus.Warn("Unable to find cpuset cgroup in mounts")
-		}
-		return cgroupCpusetInfo{}
-	}
-
-	cpus, err := ioutil.ReadFile(path.Join(mountPoint, "cpuset.cpus"))
-	if err != nil {
-		return cgroupCpusetInfo{}
-	}
-
-	mems, err := ioutil.ReadFile(path.Join(mountPoint, "cpuset.mems"))
-	if err != nil {
-		return cgroupCpusetInfo{}
-	}
-
-	return cgroupCpusetInfo{
-		Cpuset: true,
-		Cpus:   strings.TrimSpace(string(cpus)),
-		Mems:   strings.TrimSpace(string(mems)),
-	}
-}
-
-// checkCgroupPids reads the pids information from the pids cgroup mount point.
-func checkCgroupPids(quiet bool) cgroupPids {
-	_, err := cgroups.FindCgroupMountpoint("pids")
-	if err != nil {
-		if !quiet {
-			logrus.Warn(err)
-		}
-		return cgroupPids{}
-	}
-
-	return cgroupPids{
-		PidsLimit: true,
-	}
-}
-
-func cgroupEnabled(mountPoint, name string) bool {
-	_, err := os.Stat(path.Join(mountPoint, name))
-	return err == nil
-}
-
-func readProcBool(path string) bool {
-	val, err := ioutil.ReadFile(path)
-	if err != nil {
-		return false
-	}
-	return strings.TrimSpace(string(val)) == "1"
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux_test.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux_test.go
deleted file mode 100644
index fae0fdffbb..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_linux_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package sysinfo
-
-import (
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-)
-
-func TestReadProcBool(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "test-sysinfo-proc")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpDir)
-
-	procFile := filepath.Join(tmpDir, "read-proc-bool")
-	if err := ioutil.WriteFile(procFile, []byte("1"), 644); err != nil {
-		t.Fatal(err)
-	}
-
-	if !readProcBool(procFile) {
-		t.Fatal("expected proc bool to be true, got false")
-	}
-
-	if err := ioutil.WriteFile(procFile, []byte("0"), 644); err != nil {
-		t.Fatal(err)
-	}
-	if readProcBool(procFile) {
-		t.Fatal("expected proc bool to be false, got false")
-	}
-
-	if readProcBool(path.Join(tmpDir, "no-exist")) {
-		t.Fatal("should be false for non-existent entry")
-	}
-
-}
-
-func TestCgroupEnabled(t *testing.T) {
-	cgroupDir, err := ioutil.TempDir("", "cgroup-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(cgroupDir)
-
-	if cgroupEnabled(cgroupDir, "test") {
-		t.Fatal("cgroupEnabled should be false")
-	}
-
-	if err := ioutil.WriteFile(path.Join(cgroupDir, "test"), []byte{}, 644); err != nil {
-		t.Fatal(err)
-	}
-
-	if !cgroupEnabled(cgroupDir, "test") {
-		t.Fatal("cgroupEnabled should be true")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_solaris.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_solaris.go
deleted file mode 100644
index c858d57e08..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_solaris.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// +build solaris,cgo
-
-package sysinfo
-
-import (
-	"bytes"
-	"os/exec"
-	"strconv"
-	"strings"
-)
-
-/*
-#cgo LDFLAGS: -llgrp
-#include <unistd.h>
-#include <stdlib.h>
-#include <sys/lgrp_user.h>
-int getLgrpCount() {
-	lgrp_cookie_t lgrpcookie = LGRP_COOKIE_NONE;
-	uint_t nlgrps;
-
-	if ((lgrpcookie = lgrp_init(LGRP_VIEW_OS)) == LGRP_COOKIE_NONE) {
-		return -1;
-	}
-	nlgrps = lgrp_nlgrps(lgrpcookie);
-	return nlgrps;
-}
-*/
-import "C"
-
-// IsCPUSharesAvailable returns whether CPUShares setting is supported.
-// We need FSS to be set as default scheduling class to support CPU Shares
-func IsCPUSharesAvailable() bool {
-	cmd := exec.Command("/usr/sbin/dispadmin", "-d")
-	outBuf := new(bytes.Buffer)
-	errBuf := new(bytes.Buffer)
-	cmd.Stderr = errBuf
-	cmd.Stdout = outBuf
-
-	if err := cmd.Run(); err != nil {
-		return false
-	}
-	return (strings.Contains(outBuf.String(), "FSS"))
-}
-
-// New returns a new SysInfo, using the filesystem to detect which features
-// the kernel supports.
-//NOTE Solaris: If we change the below capabilities be sure
-// to update verifyPlatformContainerSettings() in daemon_solaris.go
-func New(quiet bool) *SysInfo {
-	sysInfo := &SysInfo{}
-	sysInfo.cgroupMemInfo = setCgroupMem(quiet)
-	sysInfo.cgroupCPUInfo = setCgroupCPU(quiet)
-	sysInfo.cgroupBlkioInfo = setCgroupBlkioInfo(quiet)
-	sysInfo.cgroupCpusetInfo = setCgroupCPUsetInfo(quiet)
-
-	sysInfo.IPv4ForwardingDisabled = false
-
-	sysInfo.AppArmor = false
-
-	return sysInfo
-}
-
-// setCgroupMem reads the memory information for Solaris.
-func setCgroupMem(quiet bool) cgroupMemInfo {
-
-	return cgroupMemInfo{
-		MemoryLimit:       true,
-		SwapLimit:         true,
-		MemoryReservation: false,
-		OomKillDisable:    false,
-		MemorySwappiness:  false,
-		KernelMemory:      false,
-	}
-}
-
-// setCgroupCPU reads the cpu information for Solaris.
-func setCgroupCPU(quiet bool) cgroupCPUInfo {
-
-	return cgroupCPUInfo{
-		CPUShares:          true,
-		CPUCfsPeriod:       false,
-		CPUCfsQuota:        true,
-		CPURealtimePeriod:  false,
-		CPURealtimeRuntime: false,
-	}
-}
-
-// blkio switches are not supported in Solaris.
-func setCgroupBlkioInfo(quiet bool) cgroupBlkioInfo {
-
-	return cgroupBlkioInfo{
-		BlkioWeight:       false,
-		BlkioWeightDevice: false,
-	}
-}
-
-// setCgroupCPUsetInfo reads the cpuset information for Solaris.
-func setCgroupCPUsetInfo(quiet bool) cgroupCpusetInfo {
-
-	return cgroupCpusetInfo{
-		Cpuset: true,
-		Cpus:   getCPUCount(),
-		Mems:   getLgrpCount(),
-	}
-}
-
-func getCPUCount() string {
-	ncpus := C.sysconf(C._SC_NPROCESSORS_ONLN)
-	if ncpus <= 0 {
-		return ""
-	}
-	return strconv.FormatInt(int64(ncpus), 16)
-}
-
-func getLgrpCount() string {
-	nlgrps := C.getLgrpCount()
-	if nlgrps <= 0 {
-		return ""
-	}
-	return strconv.FormatInt(int64(nlgrps), 16)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_test.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_test.go
deleted file mode 100644
index b61fbcf541..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package sysinfo
-
-import "testing"
-
-func TestIsCpusetListAvailable(t *testing.T) {
-	cases := []struct {
-		provided  string
-		available string
-		res       bool
-		err       bool
-	}{
-		{"1", "0-4", true, false},
-		{"01,3", "0-4", true, false},
-		{"", "0-7", true, false},
-		{"1--42", "0-7", false, true},
-		{"1-42", "00-1,8,,9", false, true},
-		{"1,41-42", "43,45", false, false},
-		{"0-3", "", false, false},
-	}
-	for _, c := range cases {
-		r, err := isCpusetListAvailable(c.provided, c.available)
-		if (c.err && err == nil) && r != c.res {
-			t.Fatalf("Expected pair: %v, %v for %s, %s. Got %v, %v instead", c.res, c.err, c.provided, c.available, (c.err && err == nil), r)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_unix.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_unix.go
deleted file mode 100644
index 45f3ef1c65..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_unix.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build !linux,!solaris,!windows
-
-package sysinfo
-
-// New returns an empty SysInfo for non linux nor solaris for now.
-func New(quiet bool) *SysInfo {
-	sysInfo := &SysInfo{}
-	return sysInfo
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_windows.go b/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_windows.go
deleted file mode 100644
index 4e6255bc59..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/sysinfo/sysinfo_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build windows
-
-package sysinfo
-
-// New returns an empty SysInfo for windows for now.
-func New(quiet bool) *SysInfo {
-	sysInfo := &SysInfo{}
-	return sysInfo
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes.go
deleted file mode 100644
index 7637f12e1a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package system
-
-import (
-	"os"
-	"syscall"
-	"time"
-	"unsafe"
-)
-
-var (
-	maxTime time.Time
-)
-
-func init() {
-	if unsafe.Sizeof(syscall.Timespec{}.Nsec) == 8 {
-		// This is a 64 bit timespec
-		// os.Chtimes limits time to the following
-		maxTime = time.Unix(0, 1<<63-1)
-	} else {
-		// This is a 32 bit timespec
-		maxTime = time.Unix(1<<31-1, 0)
-	}
-}
-
-// Chtimes changes the access time and modified time of a file at the given path
-func Chtimes(name string, atime time.Time, mtime time.Time) error {
-	unixMinTime := time.Unix(0, 0)
-	unixMaxTime := maxTime
-
-	// If the modified time is prior to the Unix Epoch, or after the
-	// end of Unix Time, os.Chtimes has undefined behavior
-	// default to Unix Epoch in this case, just in case
-
-	if atime.Before(unixMinTime) || atime.After(unixMaxTime) {
-		atime = unixMinTime
-	}
-
-	if mtime.Before(unixMinTime) || mtime.After(unixMaxTime) {
-		mtime = unixMinTime
-	}
-
-	if err := os.Chtimes(name, atime, mtime); err != nil {
-		return err
-	}
-
-	// Take platform specific action for setting create time.
-	if err := setCTime(name, mtime); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_test.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes_test.go
deleted file mode 100644
index 5c87df32a2..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-package system
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-)
-
-// prepareTempFile creates a temporary file in a temporary directory.
-func prepareTempFile(t *testing.T) (string, string) {
-	dir, err := ioutil.TempDir("", "docker-system-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	file := filepath.Join(dir, "exist")
-	if err := ioutil.WriteFile(file, []byte("hello"), 0644); err != nil {
-		t.Fatal(err)
-	}
-	return file, dir
-}
-
-// TestChtimes tests Chtimes on a tempfile. Test only mTime, because aTime is OS dependent
-func TestChtimes(t *testing.T) {
-	file, dir := prepareTempFile(t)
-	defer os.RemoveAll(dir)
-
-	beforeUnixEpochTime := time.Unix(0, 0).Add(-100 * time.Second)
-	unixEpochTime := time.Unix(0, 0)
-	afterUnixEpochTime := time.Unix(100, 0)
-	unixMaxTime := maxTime
-
-	// Test both aTime and mTime set to Unix Epoch
-	Chtimes(file, unixEpochTime, unixEpochTime)
-
-	f, err := os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if f.ModTime() != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, f.ModTime())
-	}
-
-	// Test aTime before Unix Epoch and mTime set to Unix Epoch
-	Chtimes(file, beforeUnixEpochTime, unixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if f.ModTime() != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, f.ModTime())
-	}
-
-	// Test aTime set to Unix Epoch and mTime before Unix Epoch
-	Chtimes(file, unixEpochTime, beforeUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if f.ModTime() != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, f.ModTime())
-	}
-
-	// Test both aTime and mTime set to after Unix Epoch (valid time)
-	Chtimes(file, afterUnixEpochTime, afterUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if f.ModTime() != afterUnixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", afterUnixEpochTime, f.ModTime())
-	}
-
-	// Test both aTime and mTime set to Unix max time
-	Chtimes(file, unixMaxTime, unixMaxTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if f.ModTime().Truncate(time.Second) != unixMaxTime.Truncate(time.Second) {
-		t.Fatalf("Expected: %s, got: %s", unixMaxTime.Truncate(time.Second), f.ModTime().Truncate(time.Second))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go
deleted file mode 100644
index 09d58bcbfd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"time"
-)
-
-//setCTime will set the create time on a file. On Unix, the create
-//time is updated as a side effect of setting the modified time, so
-//no action is required.
-func setCTime(path string, ctime time.Time) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix_test.go
deleted file mode 100644
index 6ec9a7173c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_unix_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"os"
-	"syscall"
-	"testing"
-	"time"
-)
-
-// TestChtimesLinux tests Chtimes access time on a tempfile on Linux
-func TestChtimesLinux(t *testing.T) {
-	file, dir := prepareTempFile(t)
-	defer os.RemoveAll(dir)
-
-	beforeUnixEpochTime := time.Unix(0, 0).Add(-100 * time.Second)
-	unixEpochTime := time.Unix(0, 0)
-	afterUnixEpochTime := time.Unix(100, 0)
-	unixMaxTime := maxTime
-
-	// Test both aTime and mTime set to Unix Epoch
-	Chtimes(file, unixEpochTime, unixEpochTime)
-
-	f, err := os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stat := f.Sys().(*syscall.Stat_t)
-	aTime := time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test aTime before Unix Epoch and mTime set to Unix Epoch
-	Chtimes(file, beforeUnixEpochTime, unixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stat = f.Sys().(*syscall.Stat_t)
-	aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test aTime set to Unix Epoch and mTime before Unix Epoch
-	Chtimes(file, unixEpochTime, beforeUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stat = f.Sys().(*syscall.Stat_t)
-	aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test both aTime and mTime set to after Unix Epoch (valid time)
-	Chtimes(file, afterUnixEpochTime, afterUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stat = f.Sys().(*syscall.Stat_t)
-	aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-	if aTime != afterUnixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", afterUnixEpochTime, aTime)
-	}
-
-	// Test both aTime and mTime set to Unix max time
-	Chtimes(file, unixMaxTime, unixMaxTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	stat = f.Sys().(*syscall.Stat_t)
-	aTime = time.Unix(int64(stat.Atim.Sec), int64(stat.Atim.Nsec))
-	if aTime.Truncate(time.Second) != unixMaxTime.Truncate(time.Second) {
-		t.Fatalf("Expected: %s, got: %s", unixMaxTime.Truncate(time.Second), aTime.Truncate(time.Second))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go
deleted file mode 100644
index 2945868465..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"syscall"
-	"time"
-)
-
-//setCTime will set the create time on a file. On Windows, this requires
-//calling SetFileTime and explicitly including the create time.
-func setCTime(path string, ctime time.Time) error {
-	ctimespec := syscall.NsecToTimespec(ctime.UnixNano())
-	pathp, e := syscall.UTF16PtrFromString(path)
-	if e != nil {
-		return e
-	}
-	h, e := syscall.CreateFile(pathp,
-		syscall.FILE_WRITE_ATTRIBUTES, syscall.FILE_SHARE_WRITE, nil,
-		syscall.OPEN_EXISTING, syscall.FILE_FLAG_BACKUP_SEMANTICS, 0)
-	if e != nil {
-		return e
-	}
-	defer syscall.Close(h)
-	c := syscall.NsecToFiletime(syscall.TimespecToNsec(ctimespec))
-	return syscall.SetFileTime(h, &c, nil, nil)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows_test.go b/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows_test.go
deleted file mode 100644
index 72d8a10619..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/chtimes_windows_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"syscall"
-	"testing"
-	"time"
-)
-
-// TestChtimesWindows tests Chtimes access time on a tempfile on Windows
-func TestChtimesWindows(t *testing.T) {
-	file, dir := prepareTempFile(t)
-	defer os.RemoveAll(dir)
-
-	beforeUnixEpochTime := time.Unix(0, 0).Add(-100 * time.Second)
-	unixEpochTime := time.Unix(0, 0)
-	afterUnixEpochTime := time.Unix(100, 0)
-	unixMaxTime := maxTime
-
-	// Test both aTime and mTime set to Unix Epoch
-	Chtimes(file, unixEpochTime, unixEpochTime)
-
-	f, err := os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	aTime := time.Unix(0, f.Sys().(*syscall.Win32FileAttributeData).LastAccessTime.Nanoseconds())
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test aTime before Unix Epoch and mTime set to Unix Epoch
-	Chtimes(file, beforeUnixEpochTime, unixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	aTime = time.Unix(0, f.Sys().(*syscall.Win32FileAttributeData).LastAccessTime.Nanoseconds())
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test aTime set to Unix Epoch and mTime before Unix Epoch
-	Chtimes(file, unixEpochTime, beforeUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	aTime = time.Unix(0, f.Sys().(*syscall.Win32FileAttributeData).LastAccessTime.Nanoseconds())
-	if aTime != unixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", unixEpochTime, aTime)
-	}
-
-	// Test both aTime and mTime set to after Unix Epoch (valid time)
-	Chtimes(file, afterUnixEpochTime, afterUnixEpochTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	aTime = time.Unix(0, f.Sys().(*syscall.Win32FileAttributeData).LastAccessTime.Nanoseconds())
-	if aTime != afterUnixEpochTime {
-		t.Fatalf("Expected: %s, got: %s", afterUnixEpochTime, aTime)
-	}
-
-	// Test both aTime and mTime set to Unix max time
-	Chtimes(file, unixMaxTime, unixMaxTime)
-
-	f, err = os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	aTime = time.Unix(0, f.Sys().(*syscall.Win32FileAttributeData).LastAccessTime.Nanoseconds())
-	if aTime.Truncate(time.Second) != unixMaxTime.Truncate(time.Second) {
-		t.Fatalf("Expected: %s, got: %s", unixMaxTime.Truncate(time.Second), aTime.Truncate(time.Second))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/errors.go b/installer/vendor/github.com/docker/docker/pkg/system/errors.go
deleted file mode 100644
index 288318985e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/errors.go
+++ /dev/null
@@ -1,10 +0,0 @@
-package system
-
-import (
-	"errors"
-)
-
-var (
-	// ErrNotSupportedPlatform means the platform is not supported.
-	ErrNotSupportedPlatform = errors.New("platform and architecture is not supported")
-)
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/events_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/events_windows.go
deleted file mode 100644
index 3ec6d22151..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/events_windows.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package system
-
-// This file implements syscalls for Win32 events which are not implemented
-// in golang.
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	procCreateEvent = modkernel32.NewProc("CreateEventW")
-	procOpenEvent   = modkernel32.NewProc("OpenEventW")
-	procSetEvent    = modkernel32.NewProc("SetEvent")
-	procResetEvent  = modkernel32.NewProc("ResetEvent")
-	procPulseEvent  = modkernel32.NewProc("PulseEvent")
-)
-
-// CreateEvent implements win32 CreateEventW func in golang. It will create an event object.
-func CreateEvent(eventAttributes *syscall.SecurityAttributes, manualReset bool, initialState bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if manualReset {
-		_p1 = 1
-	}
-	var _p2 uint32
-	if initialState {
-		_p2 = 1
-	}
-	r0, _, e1 := procCreateEvent.Call(uintptr(unsafe.Pointer(eventAttributes)), uintptr(_p1), uintptr(_p2), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// OpenEvent implements win32 OpenEventW func in golang. It opens an event object.
-func OpenEvent(desiredAccess uint32, inheritHandle bool, name string) (handle syscall.Handle, err error) {
-	namep, _ := syscall.UTF16PtrFromString(name)
-	var _p1 uint32
-	if inheritHandle {
-		_p1 = 1
-	}
-	r0, _, e1 := procOpenEvent.Call(uintptr(desiredAccess), uintptr(_p1), uintptr(unsafe.Pointer(namep)))
-	use(unsafe.Pointer(namep))
-	handle = syscall.Handle(r0)
-	if handle == syscall.InvalidHandle {
-		err = e1
-	}
-	return
-}
-
-// SetEvent implements win32 SetEvent func in golang.
-func SetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procSetEvent)
-}
-
-// ResetEvent implements win32 ResetEvent func in golang.
-func ResetEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procResetEvent)
-}
-
-// PulseEvent implements win32 PulseEvent func in golang.
-func PulseEvent(handle syscall.Handle) (err error) {
-	return setResetPulse(handle, procPulseEvent)
-}
-
-func setResetPulse(handle syscall.Handle, proc *windows.LazyProc) (err error) {
-	r0, _, _ := proc.Call(uintptr(handle))
-	if r0 != 0 {
-		err = syscall.Errno(r0)
-	}
-	return
-}
-
-var temp unsafe.Pointer
-
-// use ensures a variable is kept alive without the GC freeing while still needed
-func use(p unsafe.Pointer) {
-	temp = p
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/exitcode.go b/installer/vendor/github.com/docker/docker/pkg/system/exitcode.go
deleted file mode 100644
index 60f0514b1d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/exitcode.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package system
-
-import (
-	"fmt"
-	"os/exec"
-	"syscall"
-)
-
-// GetExitCode returns the ExitStatus of the specified error if its type is
-// exec.ExitError, returns 0 and an error otherwise.
-func GetExitCode(err error) (int, error) {
-	exitCode := 0
-	if exiterr, ok := err.(*exec.ExitError); ok {
-		if procExit, ok := exiterr.Sys().(syscall.WaitStatus); ok {
-			return procExit.ExitStatus(), nil
-		}
-	}
-	return exitCode, fmt.Errorf("failed to get exit code")
-}
-
-// ProcessExitCode process the specified error and returns the exit status code
-// if the error was of type exec.ExitError, returns nothing otherwise.
-func ProcessExitCode(err error) (exitCode int) {
-	if err != nil {
-		var exiterr error
-		if exitCode, exiterr = GetExitCode(err); exiterr != nil {
-			// TODO: Fix this so we check the error's text.
-			// we've failed to retrieve exit code, so we set it to 127
-			exitCode = 127
-		}
-	}
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/filesys.go b/installer/vendor/github.com/docker/docker/pkg/system/filesys.go
deleted file mode 100644
index 810c794786..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/filesys.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"os"
-	"path/filepath"
-)
-
-// MkdirAllWithACL is a wrapper for MkdirAll that creates a directory
-// ACL'd for Builtin Administrators and Local System.
-func MkdirAllWithACL(path string, perm os.FileMode) error {
-	return MkdirAll(path, perm)
-}
-
-// MkdirAll creates a directory named path along with any necessary parents,
-// with permission specified by attribute perm for all dir created.
-func MkdirAll(path string, perm os.FileMode) error {
-	return os.MkdirAll(path, perm)
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs.
-func IsAbs(path string) bool {
-	return filepath.IsAbs(path)
-}
-
-// The functions below here are wrappers for the equivalents in the os package.
-// They are passthrough on Unix platforms, and only relevant on Windows.
-
-// CreateSequential creates the named file with mode 0666 (before umask), truncating
-// it if it already exists. If successful, methods on the returned
-// File can be used for I/O; the associated file descriptor has mode
-// O_RDWR.
-// If there is an error, it will be of type *PathError.
-func CreateSequential(name string) (*os.File, error) {
-	return os.Create(name)
-}
-
-// OpenSequential opens the named file for reading. If successful, methods on
-// the returned file can be used for reading; the associated file
-// descriptor has mode O_RDONLY.
-// If there is an error, it will be of type *PathError.
-func OpenSequential(name string) (*os.File, error) {
-	return os.Open(name)
-}
-
-// OpenFileSequential is the generalized open call; most users will use Open
-// or Create instead. It opens the named file with specified flag
-// (O_RDONLY etc.) and perm, (0666 etc.) if applicable. If successful,
-// methods on the returned File can be used for I/O.
-// If there is an error, it will be of type *PathError.
-func OpenFileSequential(name string, flag int, perm os.FileMode) (*os.File, error) {
-	return os.OpenFile(name, flag, perm)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/filesys_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/filesys_windows.go
deleted file mode 100644
index 6094f01fd4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/filesys_windows.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	winio "github.com/Microsoft/go-winio"
-)
-
-// MkdirAllWithACL is a wrapper for MkdirAll that creates a directory
-// ACL'd for Builtin Administrators and Local System.
-func MkdirAllWithACL(path string, perm os.FileMode) error {
-	return mkdirall(path, true)
-}
-
-// MkdirAll implementation that is volume path aware for Windows.
-func MkdirAll(path string, _ os.FileMode) error {
-	return mkdirall(path, false)
-}
-
-// mkdirall is a custom version of os.MkdirAll modified for use on Windows
-// so that it is both volume path aware, and can create a directory with
-// a DACL.
-func mkdirall(path string, adminAndLocalSystem bool) error {
-	if re := regexp.MustCompile(`^\\\\\?\\Volume{[a-z0-9-]+}$`); re.MatchString(path) {
-		return nil
-	}
-
-	// The rest of this method is largely copied from os.MkdirAll and should be kept
-	// as-is to ensure compatibility.
-
-	// Fast path: if we can tell whether path is a directory or file, stop with success or error.
-	dir, err := os.Stat(path)
-	if err == nil {
-		if dir.IsDir() {
-			return nil
-		}
-		return &os.PathError{
-			Op:   "mkdir",
-			Path: path,
-			Err:  syscall.ENOTDIR,
-		}
-	}
-
-	// Slow path: make sure parent exists and then call Mkdir for path.
-	i := len(path)
-	for i > 0 && os.IsPathSeparator(path[i-1]) { // Skip trailing path separator.
-		i--
-	}
-
-	j := i
-	for j > 0 && !os.IsPathSeparator(path[j-1]) { // Scan backward over element.
-		j--
-	}
-
-	if j > 1 {
-		// Create parent
-		err = mkdirall(path[0:j-1], false)
-		if err != nil {
-			return err
-		}
-	}
-
-	// Parent now exists; invoke os.Mkdir or mkdirWithACL and use its result.
-	if adminAndLocalSystem {
-		err = mkdirWithACL(path)
-	} else {
-		err = os.Mkdir(path, 0)
-	}
-
-	if err != nil {
-		// Handle arguments like "foo/." by
-		// double-checking that directory doesn't exist.
-		dir, err1 := os.Lstat(path)
-		if err1 == nil && dir.IsDir() {
-			return nil
-		}
-		return err
-	}
-	return nil
-}
-
-// mkdirWithACL creates a new directory. If there is an error, it will be of
-// type *PathError. .
-//
-// This is a modified and combined version of os.Mkdir and syscall.Mkdir
-// in golang to cater for creating a directory am ACL permitting full
-// access, with inheritance, to any subfolder/file for Built-in Administrators
-// and Local System.
-func mkdirWithACL(name string) error {
-	sa := syscall.SecurityAttributes{Length: 0}
-	sddl := "D:P(A;OICI;GA;;;BA)(A;OICI;GA;;;SY)"
-	sd, err := winio.SddlToSecurityDescriptor(sddl)
-	if err != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: err}
-	}
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	sa.SecurityDescriptor = uintptr(unsafe.Pointer(&sd[0]))
-
-	namep, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: err}
-	}
-
-	e := syscall.CreateDirectory(namep, &sa)
-	if e != nil {
-		return &os.PathError{Op: "mkdir", Path: name, Err: e}
-	}
-	return nil
-}
-
-// IsAbs is a platform-specific wrapper for filepath.IsAbs. On Windows,
-// golang filepath.IsAbs does not consider a path \windows\system32 as absolute
-// as it doesn't start with a drive-letter/colon combination. However, in
-// docker we need to verify things such as WORKDIR /windows/system32 in
-// a Dockerfile (which gets translated to \windows\system32 when being processed
-// by the daemon. This SHOULD be treated as absolute from a docker processing
-// perspective.
-func IsAbs(path string) bool {
-	if !filepath.IsAbs(path) {
-		if !strings.HasPrefix(path, string(os.PathSeparator)) {
-			return false
-		}
-	}
-	return true
-}
-
-// The origin of the functions below here are the golang OS and syscall packages,
-// slightly modified to only cope with files, not directories due to the
-// specific use case.
-//
-// The alteration is to allow a file on Windows to be opened with
-// FILE_FLAG_SEQUENTIAL_SCAN (particular for docker load), to avoid eating
-// the standby list, particularly when accessing large files such as layer.tar.
-
-// CreateSequential creates the named file with mode 0666 (before umask), truncating
-// it if it already exists. If successful, methods on the returned
-// File can be used for I/O; the associated file descriptor has mode
-// O_RDWR.
-// If there is an error, it will be of type *PathError.
-func CreateSequential(name string) (*os.File, error) {
-	return OpenFileSequential(name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0)
-}
-
-// OpenSequential opens the named file for reading. If successful, methods on
-// the returned file can be used for reading; the associated file
-// descriptor has mode O_RDONLY.
-// If there is an error, it will be of type *PathError.
-func OpenSequential(name string) (*os.File, error) {
-	return OpenFileSequential(name, os.O_RDONLY, 0)
-}
-
-// OpenFileSequential is the generalized open call; most users will use Open
-// or Create instead.
-// If there is an error, it will be of type *PathError.
-func OpenFileSequential(name string, flag int, _ os.FileMode) (*os.File, error) {
-	if name == "" {
-		return nil, &os.PathError{Op: "open", Path: name, Err: syscall.ENOENT}
-	}
-	r, errf := syscallOpenFileSequential(name, flag, 0)
-	if errf == nil {
-		return r, nil
-	}
-	return nil, &os.PathError{Op: "open", Path: name, Err: errf}
-}
-
-func syscallOpenFileSequential(name string, flag int, _ os.FileMode) (file *os.File, err error) {
-	r, e := syscallOpenSequential(name, flag|syscall.O_CLOEXEC, 0)
-	if e != nil {
-		return nil, e
-	}
-	return os.NewFile(uintptr(r), name), nil
-}
-
-func makeInheritSa() *syscall.SecurityAttributes {
-	var sa syscall.SecurityAttributes
-	sa.Length = uint32(unsafe.Sizeof(sa))
-	sa.InheritHandle = 1
-	return &sa
-}
-
-func syscallOpenSequential(path string, mode int, _ uint32) (fd syscall.Handle, err error) {
-	if len(path) == 0 {
-		return syscall.InvalidHandle, syscall.ERROR_FILE_NOT_FOUND
-	}
-	pathp, err := syscall.UTF16PtrFromString(path)
-	if err != nil {
-		return syscall.InvalidHandle, err
-	}
-	var access uint32
-	switch mode & (syscall.O_RDONLY | syscall.O_WRONLY | syscall.O_RDWR) {
-	case syscall.O_RDONLY:
-		access = syscall.GENERIC_READ
-	case syscall.O_WRONLY:
-		access = syscall.GENERIC_WRITE
-	case syscall.O_RDWR:
-		access = syscall.GENERIC_READ | syscall.GENERIC_WRITE
-	}
-	if mode&syscall.O_CREAT != 0 {
-		access |= syscall.GENERIC_WRITE
-	}
-	if mode&syscall.O_APPEND != 0 {
-		access &^= syscall.GENERIC_WRITE
-		access |= syscall.FILE_APPEND_DATA
-	}
-	sharemode := uint32(syscall.FILE_SHARE_READ | syscall.FILE_SHARE_WRITE)
-	var sa *syscall.SecurityAttributes
-	if mode&syscall.O_CLOEXEC == 0 {
-		sa = makeInheritSa()
-	}
-	var createmode uint32
-	switch {
-	case mode&(syscall.O_CREAT|syscall.O_EXCL) == (syscall.O_CREAT | syscall.O_EXCL):
-		createmode = syscall.CREATE_NEW
-	case mode&(syscall.O_CREAT|syscall.O_TRUNC) == (syscall.O_CREAT | syscall.O_TRUNC):
-		createmode = syscall.CREATE_ALWAYS
-	case mode&syscall.O_CREAT == syscall.O_CREAT:
-		createmode = syscall.OPEN_ALWAYS
-	case mode&syscall.O_TRUNC == syscall.O_TRUNC:
-		createmode = syscall.TRUNCATE_EXISTING
-	default:
-		createmode = syscall.OPEN_EXISTING
-	}
-	// Use FILE_FLAG_SEQUENTIAL_SCAN rather than FILE_ATTRIBUTE_NORMAL as implemented in golang.
-	//https://msdn.microsoft.com/en-us/library/windows/desktop/aa363858(v=vs.85).aspx
-	const fileFlagSequentialScan = 0x08000000 // FILE_FLAG_SEQUENTIAL_SCAN
-	h, e := syscall.CreateFile(pathp, access, sharemode, sa, createmode, fileFlagSequentialScan, 0)
-	return h, e
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/lstat.go b/installer/vendor/github.com/docker/docker/pkg/system/lstat.go
deleted file mode 100644
index bd23c4d50b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/lstat.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Lstat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Lstat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Lstat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/lstat_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/system/lstat_unix_test.go
deleted file mode 100644
index 062cf53bfe..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/lstat_unix_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import (
-	"os"
-	"testing"
-)
-
-// TestLstat tests Lstat for existing and non existing files
-func TestLstat(t *testing.T) {
-	file, invalid, _, dir := prepareFiles(t)
-	defer os.RemoveAll(dir)
-
-	statFile, err := Lstat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if statFile == nil {
-		t.Fatal("returned empty stat for existing file")
-	}
-
-	statInvalid, err := Lstat(invalid)
-	if err == nil {
-		t.Fatal("did not return error for non-existing file")
-	}
-	if statInvalid != nil {
-		t.Fatal("returned non-nil stat for non-existing file")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/lstat_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/lstat_windows.go
deleted file mode 100644
index 49e87eb40b..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/lstat_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-)
-
-// Lstat calls os.Lstat to get a fileinfo interface back.
-// This is then copied into our own locally defined structure.
-// Note the Linux version uses fromStatT to do the copy back,
-// but that not strictly necessary when already in an OS specific module.
-func Lstat(path string) (*StatT, error) {
-	fi, err := os.Lstat(path)
-	if err != nil {
-		return nil, err
-	}
-
-	return &StatT{
-		name:    fi.Name(),
-		size:    fi.Size(),
-		mode:    fi.Mode(),
-		modTime: fi.ModTime(),
-		isDir:   fi.IsDir()}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo.go
deleted file mode 100644
index 3b6e947e67..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package system
-
-// MemInfo contains memory statistics of the host system.
-type MemInfo struct {
-	// Total usable RAM (i.e. physical RAM minus a few reserved bits and the
-	// kernel binary code).
-	MemTotal int64
-
-	// Amount of free memory.
-	MemFree int64
-
-	// Total amount of swap space available.
-	SwapTotal int64
-
-	// Amount of swap space that is currently unused.
-	SwapFree int64
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go
deleted file mode 100644
index 385f1d5e73..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_linux.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package system
-
-import (
-	"bufio"
-	"io"
-	"os"
-	"strconv"
-	"strings"
-
-	"github.com/docker/go-units"
-)
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-// MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	file, err := os.Open("/proc/meminfo")
-	if err != nil {
-		return nil, err
-	}
-	defer file.Close()
-	return parseMemInfo(file)
-}
-
-// parseMemInfo parses the /proc/meminfo file into
-// a MemInfo object given an io.Reader to the file.
-// Throws error if there are problems reading from the file
-func parseMemInfo(reader io.Reader) (*MemInfo, error) {
-	meminfo := &MemInfo{}
-	scanner := bufio.NewScanner(reader)
-	for scanner.Scan() {
-		// Expected format: ["MemTotal:", "1234", "kB"]
-		parts := strings.Fields(scanner.Text())
-
-		// Sanity checks: Skip malformed entries.
-		if len(parts) < 3 || parts[2] != "kB" {
-			continue
-		}
-
-		// Convert to bytes.
-		size, err := strconv.Atoi(parts[1])
-		if err != nil {
-			continue
-		}
-		bytes := int64(size) * units.KiB
-
-		switch parts[0] {
-		case "MemTotal:":
-			meminfo.MemTotal = bytes
-		case "MemFree:":
-			meminfo.MemFree = bytes
-		case "SwapTotal:":
-			meminfo.SwapTotal = bytes
-		case "SwapFree:":
-			meminfo.SwapFree = bytes
-		}
-
-	}
-
-	// Handle errors that may have occurred during the reading of the file.
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-
-	return meminfo, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go
deleted file mode 100644
index 7f4f84f73a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_solaris.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// +build solaris,cgo
-
-package system
-
-import (
-	"fmt"
-	"unsafe"
-)
-
-// #cgo LDFLAGS: -lkstat
-// #include <unistd.h>
-// #include <stdlib.h>
-// #include <stdio.h>
-// #include <kstat.h>
-// #include <sys/swap.h>
-// #include <sys/param.h>
-// struct swaptable *allocSwaptable(int num) {
-//	struct swaptable *st;
-//	struct swapent *swapent;
-// 	st = (struct swaptable *)malloc(num * sizeof(swapent_t) + sizeof (int));
-//	swapent = st->swt_ent;
-//	for (int i = 0; i < num; i++,swapent++) {
-//		swapent->ste_path = (char *)malloc(MAXPATHLEN * sizeof (char));
-//	}
-//	st->swt_n = num;
-//	return st;
-//}
-// void freeSwaptable (struct swaptable *st) {
-//	struct swapent *swapent = st->swt_ent;
-//	for (int i = 0; i < st->swt_n; i++,swapent++) {
-//		free(swapent->ste_path);
-//	}
-//	free(st);
-// }
-// swapent_t getSwapEnt(swapent_t *ent, int i) {
-//	return ent[i];
-// }
-// int64_t getPpKernel() {
-//	int64_t pp_kernel = 0;
-//	kstat_ctl_t *ksc;
-//	kstat_t *ks;
-//	kstat_named_t *knp;
-//	kid_t kid;
-//
-//	if ((ksc = kstat_open()) == NULL) {
-//		return -1;
-//	}
-//	if ((ks = kstat_lookup(ksc, "unix", 0, "system_pages")) == NULL) {
-//		return -1;
-//	}
-//	if (((kid = kstat_read(ksc, ks, NULL)) == -1) ||
-//	    ((knp = kstat_data_lookup(ks, "pp_kernel")) == NULL)) {
-//		return -1;
-//	}
-//	switch (knp->data_type) {
-//	case KSTAT_DATA_UINT64:
-//		pp_kernel = knp->value.ui64;
-//		break;
-//	case KSTAT_DATA_UINT32:
-//		pp_kernel = knp->value.ui32;
-//		break;
-//	}
-//	pp_kernel *= sysconf(_SC_PAGESIZE);
-//	return (pp_kernel > 0 ? pp_kernel : -1);
-// }
-import "C"
-
-// Get the system memory info using sysconf same as prtconf
-func getTotalMem() int64 {
-	pagesize := C.sysconf(C._SC_PAGESIZE)
-	npages := C.sysconf(C._SC_PHYS_PAGES)
-	return int64(pagesize * npages)
-}
-
-func getFreeMem() int64 {
-	pagesize := C.sysconf(C._SC_PAGESIZE)
-	npages := C.sysconf(C._SC_AVPHYS_PAGES)
-	return int64(pagesize * npages)
-}
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-
-	ppKernel := C.getPpKernel()
-	MemTotal := getTotalMem()
-	MemFree := getFreeMem()
-	SwapTotal, SwapFree, err := getSysSwap()
-
-	if ppKernel < 0 || MemTotal < 0 || MemFree < 0 || SwapTotal < 0 ||
-		SwapFree < 0 {
-		return nil, fmt.Errorf("error getting system memory info %v\n", err)
-	}
-
-	meminfo := &MemInfo{}
-	// Total memory is total physical memory less than memory locked by kernel
-	meminfo.MemTotal = MemTotal - int64(ppKernel)
-	meminfo.MemFree = MemFree
-	meminfo.SwapTotal = SwapTotal
-	meminfo.SwapFree = SwapFree
-
-	return meminfo, nil
-}
-
-func getSysSwap() (int64, int64, error) {
-	var tSwap int64
-	var fSwap int64
-	var diskblksPerPage int64
-	num, err := C.swapctl(C.SC_GETNSWP, nil)
-	if err != nil {
-		return -1, -1, err
-	}
-	st := C.allocSwaptable(num)
-	_, err = C.swapctl(C.SC_LIST, unsafe.Pointer(st))
-	if err != nil {
-		C.freeSwaptable(st)
-		return -1, -1, err
-	}
-
-	diskblksPerPage = int64(C.sysconf(C._SC_PAGESIZE) >> C.DEV_BSHIFT)
-	for i := 0; i < int(num); i++ {
-		swapent := C.getSwapEnt(&st.swt_ent[0], C.int(i))
-		tSwap += int64(swapent.ste_pages) * diskblksPerPage
-		fSwap += int64(swapent.ste_free) * diskblksPerPage
-	}
-	C.freeSwaptable(st)
-	return tSwap, fSwap, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unix_test.go
deleted file mode 100644
index 44f5562882..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unix_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/docker/go-units"
-)
-
-// TestMemInfo tests parseMemInfo with a static meminfo string
-func TestMemInfo(t *testing.T) {
-	const input = `
-	MemTotal:      1 kB
-	MemFree:       2 kB
-	SwapTotal:     3 kB
-	SwapFree:      4 kB
-	Malformed1:
-	Malformed2:    1
-	Malformed3:    2 MB
-	Malformed4:    X kB
-	`
-	meminfo, err := parseMemInfo(strings.NewReader(input))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if meminfo.MemTotal != 1*units.KiB {
-		t.Fatalf("Unexpected MemTotal: %d", meminfo.MemTotal)
-	}
-	if meminfo.MemFree != 2*units.KiB {
-		t.Fatalf("Unexpected MemFree: %d", meminfo.MemFree)
-	}
-	if meminfo.SwapTotal != 3*units.KiB {
-		t.Fatalf("Unexpected SwapTotal: %d", meminfo.SwapTotal)
-	}
-	if meminfo.SwapFree != 4*units.KiB {
-		t.Fatalf("Unexpected SwapFree: %d", meminfo.SwapFree)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go
deleted file mode 100644
index 3ce019dffd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_unsupported.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !linux,!windows,!solaris
-
-package system
-
-// ReadMemInfo is not supported on platforms other than linux and windows.
-func ReadMemInfo() (*MemInfo, error) {
-	return nil, ErrNotSupportedPlatform
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go
deleted file mode 100644
index 883944a4c5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/meminfo_windows.go
+++ /dev/null
@@ -1,45 +0,0 @@
-package system
-
-import (
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var (
-	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
-
-	procGlobalMemoryStatusEx = modkernel32.NewProc("GlobalMemoryStatusEx")
-)
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366589(v=vs.85).aspx
-// https://msdn.microsoft.com/en-us/library/windows/desktop/aa366770(v=vs.85).aspx
-type memorystatusex struct {
-	dwLength                uint32
-	dwMemoryLoad            uint32
-	ullTotalPhys            uint64
-	ullAvailPhys            uint64
-	ullTotalPageFile        uint64
-	ullAvailPageFile        uint64
-	ullTotalVirtual         uint64
-	ullAvailVirtual         uint64
-	ullAvailExtendedVirtual uint64
-}
-
-// ReadMemInfo retrieves memory statistics of the host system and returns a
-//  MemInfo type.
-func ReadMemInfo() (*MemInfo, error) {
-	msi := &memorystatusex{
-		dwLength: 64,
-	}
-	r1, _, _ := procGlobalMemoryStatusEx.Call(uintptr(unsafe.Pointer(msi)))
-	if r1 == 0 {
-		return &MemInfo{}, nil
-	}
-	return &MemInfo{
-		MemTotal:  int64(msi.ullTotalPhys),
-		MemFree:   int64(msi.ullAvailPhys),
-		SwapTotal: int64(msi.ullTotalPageFile),
-		SwapFree:  int64(msi.ullAvailPageFile),
-	}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/mknod.go b/installer/vendor/github.com/docker/docker/pkg/system/mknod.go
deleted file mode 100644
index 73958182b4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/mknod.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Mknod creates a filesystem node (file, device special file or named pipe) named path
-// with attributes specified by mode and dev.
-func Mknod(path string, mode uint32, dev int) error {
-	return syscall.Mknod(path, mode, dev)
-}
-
-// Mkdev is used to build the value of linux devices (in /dev/) which specifies major
-// and minor number of the newly created device special file.
-// Linux device nodes are a bit weird due to backwards compat with 16 bit device nodes.
-// They are, from low to high: the lower 8 bits of the minor, then 12 bits of the major,
-// then the top 12 bits of the minor.
-func Mkdev(major int64, minor int64) uint32 {
-	return uint32(((minor & 0xfff00) << 12) | ((major & 0xfff) << 8) | (minor & 0xff))
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/mknod_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/mknod_windows.go
deleted file mode 100644
index 2e863c0215..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/mknod_windows.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build windows
-
-package system
-
-// Mknod is not implemented on Windows.
-func Mknod(path string, mode uint32, dev int) error {
-	return ErrNotSupportedPlatform
-}
-
-// Mkdev is not implemented on Windows.
-func Mkdev(major int64, minor int64) uint32 {
-	panic("Mkdev not implemented on Windows.")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/path_unix.go b/installer/vendor/github.com/docker/docker/pkg/system/path_unix.go
deleted file mode 100644
index c607c4db09..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/path_unix.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !windows
-
-package system
-
-// DefaultPathEnv is unix style list of directories to search for
-// executables. Each directory is separated from the next by a colon
-// ':' character .
-const DefaultPathEnv = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-
-// CheckSystemDriveAndRemoveDriveLetter verifies that a path, if it includes a drive letter,
-// is the system drive. This is a no-op on Linux.
-func CheckSystemDriveAndRemoveDriveLetter(path string) (string, error) {
-	return path, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/path_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/path_windows.go
deleted file mode 100644
index cbfe2c1576..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/path_windows.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-// DefaultPathEnv is deliberately empty on Windows as the default path will be set by
-// the container. Docker has no context of what the default path should be.
-const DefaultPathEnv = ""
-
-// CheckSystemDriveAndRemoveDriveLetter verifies and manipulates a Windows path.
-// This is used, for example, when validating a user provided path in docker cp.
-// If a drive letter is supplied, it must be the system drive. The drive letter
-// is always removed. Also, it translates it to OS semantics (IOW / to \). We
-// need the path in this syntax so that it can ultimately be contatenated with
-// a Windows long-path which doesn't support drive-letters. Examples:
-// C:			--> Fail
-// C:\			--> \
-// a			--> a
-// /a			--> \a
-// d:\			--> Fail
-func CheckSystemDriveAndRemoveDriveLetter(path string) (string, error) {
-	if len(path) == 2 && string(path[1]) == ":" {
-		return "", fmt.Errorf("No relative path specified in %q", path)
-	}
-	if !filepath.IsAbs(path) || len(path) < 2 {
-		return filepath.FromSlash(path), nil
-	}
-	if string(path[1]) == ":" && !strings.EqualFold(string(path[0]), "c") {
-		return "", fmt.Errorf("The specified path is not on the system drive (C:)")
-	}
-	return filepath.FromSlash(path[2:]), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/path_windows_test.go b/installer/vendor/github.com/docker/docker/pkg/system/path_windows_test.go
deleted file mode 100644
index eccb26aaea..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/path_windows_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// +build windows
-
-package system
-
-import "testing"
-
-// TestCheckSystemDriveAndRemoveDriveLetter tests CheckSystemDriveAndRemoveDriveLetter
-func TestCheckSystemDriveAndRemoveDriveLetter(t *testing.T) {
-	// Fails if not C drive.
-	path, err := CheckSystemDriveAndRemoveDriveLetter(`d:\`)
-	if err == nil || (err != nil && err.Error() != "The specified path is not on the system drive (C:)") {
-		t.Fatalf("Expected error for d:")
-	}
-
-	// Single character is unchanged
-	if path, err = CheckSystemDriveAndRemoveDriveLetter("z"); err != nil {
-		t.Fatalf("Single character should pass")
-	}
-	if path != "z" {
-		t.Fatalf("Single character should be unchanged")
-	}
-
-	// Two characters without colon is unchanged
-	if path, err = CheckSystemDriveAndRemoveDriveLetter("AB"); err != nil {
-		t.Fatalf("2 characters without colon should pass")
-	}
-	if path != "AB" {
-		t.Fatalf("2 characters without colon should be unchanged")
-	}
-
-	// Abs path without drive letter
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`\l`); err != nil {
-		t.Fatalf("abs path no drive letter should pass")
-	}
-	if path != `\l` {
-		t.Fatalf("abs path without drive letter should be unchanged")
-	}
-
-	// Abs path without drive letter, linux style
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`/l`); err != nil {
-		t.Fatalf("abs path no drive letter linux style should pass")
-	}
-	if path != `\l` {
-		t.Fatalf("abs path without drive letter linux failed %s", path)
-	}
-
-	// Drive-colon should be stripped
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`c:\`); err != nil {
-		t.Fatalf("An absolute path should pass")
-	}
-	if path != `\` {
-		t.Fatalf(`An absolute path should have been shortened to \ %s`, path)
-	}
-
-	// Verify with a linux-style path
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`c:/`); err != nil {
-		t.Fatalf("An absolute path should pass")
-	}
-	if path != `\` {
-		t.Fatalf(`A linux style absolute path should have been shortened to \ %s`, path)
-	}
-
-	// Failure on c:
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`c:`); err == nil {
-		t.Fatalf("c: should fail")
-	}
-	if err.Error() != `No relative path specified in "c:"` {
-		t.Fatalf(path, err)
-	}
-
-	// Failure on d:
-	if path, err = CheckSystemDriveAndRemoveDriveLetter(`d:`); err == nil {
-		t.Fatalf("c: should fail")
-	}
-	if err.Error() != `No relative path specified in "d:"` {
-		t.Fatalf(path, err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat.go b/installer/vendor/github.com/docker/docker/pkg/system/stat.go
deleted file mode 100644
index 087034c5ec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// StatT type contains status of a file. It contains metadata
-// like permission, owner, group, size, etc about a file.
-type StatT struct {
-	mode uint32
-	uid  uint32
-	gid  uint32
-	rdev uint64
-	size int64
-	mtim syscall.Timespec
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() uint32 {
-	return s.mode
-}
-
-// UID returns file's user id of owner.
-func (s StatT) UID() uint32 {
-	return s.uid
-}
-
-// GID returns file's group id of owner.
-func (s StatT) GID() uint32 {
-	return s.gid
-}
-
-// Rdev returns file's device ID (if it's special file).
-func (s StatT) Rdev() uint64 {
-	return s.rdev
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mtim returns file's last modification time.
-func (s StatT) Mtim() syscall.Timespec {
-	return s.mtim
-}
-
-// GetLastModification returns file's last modification time.
-func (s StatT) GetLastModification() syscall.Timespec {
-	return s.Mtim()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_darwin.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_darwin.go
deleted file mode 100644
index f0742f59e5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_darwin.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT creates a system.StatT type from a syscall.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
-
-// FromStatT loads a system.StatT from a syscall.Stat_t.
-func FromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return fromStatT(s)
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go
deleted file mode 100644
index d0fb6f1519..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_freebsd.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
-
-// Stat takes a path to a file and returns
-// a system.Stat_t type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_linux.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_linux.go
deleted file mode 100644
index 8b1eded138..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_linux.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT converts a syscall.Stat_t type to a system.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: s.Mode,
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: s.Rdev,
-		mtim: s.Mtim}, nil
-}
-
-// FromStatT exists only on linux, and loads a system.StatT from a
-// syscal.Stat_t.
-func FromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return fromStatT(s)
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go
deleted file mode 100644
index 3c3b71fb21..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_openbsd.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT creates a system.StatT type from a syscall.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtim}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_solaris.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_solaris.go
deleted file mode 100644
index 0216985a25..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_solaris.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// +build solaris
-
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT creates a system.StatT type from a syscall.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtim}, nil
-}
-
-// FromStatT loads a system.StatT from a syscal.Stat_t.
-func FromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return fromStatT(s)
-}
-
-// Stat takes a path to a file and returns
-// a system.StatT type pertaining to that file.
-//
-// Throws an error if the file does not exist
-func Stat(path string) (*StatT, error) {
-	s := &syscall.Stat_t{}
-	if err := syscall.Stat(path, s); err != nil {
-		return nil, err
-	}
-	return fromStatT(s)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_unix_test.go
deleted file mode 100644
index dee8d30a19..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_unix_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import (
-	"os"
-	"syscall"
-	"testing"
-)
-
-// TestFromStatT tests fromStatT for a tempfile
-func TestFromStatT(t *testing.T) {
-	file, _, _, dir := prepareFiles(t)
-	defer os.RemoveAll(dir)
-
-	stat := &syscall.Stat_t{}
-	err := syscall.Lstat(file, stat)
-
-	s, err := fromStatT(stat)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if stat.Mode != s.Mode() {
-		t.Fatal("got invalid mode")
-	}
-	if stat.Uid != s.UID() {
-		t.Fatal("got invalid uid")
-	}
-	if stat.Gid != s.GID() {
-		t.Fatal("got invalid gid")
-	}
-	if stat.Rdev != s.Rdev() {
-		t.Fatal("got invalid rdev")
-	}
-	if stat.Mtim != s.Mtim() {
-		t.Fatal("got invalid mtim")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_unsupported.go
deleted file mode 100644
index 5d85f523cf..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_unsupported.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build !linux,!windows,!freebsd,!solaris,!openbsd,!darwin
-
-package system
-
-import (
-	"syscall"
-)
-
-// fromStatT creates a system.StatT type from a syscall.Stat_t type
-func fromStatT(s *syscall.Stat_t) (*StatT, error) {
-	return &StatT{size: s.Size,
-		mode: uint32(s.Mode),
-		uid:  s.Uid,
-		gid:  s.Gid,
-		rdev: uint64(s.Rdev),
-		mtim: s.Mtimespec}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/stat_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/stat_windows.go
deleted file mode 100644
index 39490c625c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/stat_windows.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// +build windows
-
-package system
-
-import (
-	"os"
-	"time"
-)
-
-// StatT type contains status of a file. It contains metadata
-// like name, permission, size, etc about a file.
-type StatT struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-	isDir   bool
-}
-
-// Name returns file's name.
-func (s StatT) Name() string {
-	return s.name
-}
-
-// Size returns file's size.
-func (s StatT) Size() int64 {
-	return s.size
-}
-
-// Mode returns file's permission mode.
-func (s StatT) Mode() os.FileMode {
-	return s.mode
-}
-
-// ModTime returns file's last modification time.
-func (s StatT) ModTime() time.Time {
-	return s.modTime
-}
-
-// IsDir returns whether file is actually a directory.
-func (s StatT) IsDir() bool {
-	return s.isDir
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/syscall_unix.go b/installer/vendor/github.com/docker/docker/pkg/system/syscall_unix.go
deleted file mode 100644
index 3ae9128468..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/syscall_unix.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import "syscall"
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall.
-func Unmount(dest string) error {
-	return syscall.Unmount(dest, 0)
-}
-
-// CommandLineToArgv should not be used on Unix.
-// It simply returns commandLine in the only element in the returned array.
-func CommandLineToArgv(commandLine string) ([]string, error) {
-	return []string{commandLine}, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
deleted file mode 100644
index 1f311874f4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var (
-	ntuserApiset      = syscall.NewLazyDLL("ext-ms-win-ntuser-window-l1-1-0")
-	procGetVersionExW = modkernel32.NewProc("GetVersionExW")
-)
-
-// OSVersion is a wrapper for Windows version information
-// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724439(v=vs.85).aspx
-type OSVersion struct {
-	Version      uint32
-	MajorVersion uint8
-	MinorVersion uint8
-	Build        uint16
-}
-
-// https://msdn.microsoft.com/en-us/library/windows/desktop/ms724833(v=vs.85).aspx
-type osVersionInfoEx struct {
-	OSVersionInfoSize uint32
-	MajorVersion      uint32
-	MinorVersion      uint32
-	BuildNumber       uint32
-	PlatformID        uint32
-	CSDVersion        [128]uint16
-	ServicePackMajor  uint16
-	ServicePackMinor  uint16
-	SuiteMask         uint16
-	ProductType       byte
-	Reserve           byte
-}
-
-// GetOSVersion gets the operating system version on Windows. Note that
-// docker.exe must be manifested to get the correct version information.
-func GetOSVersion() OSVersion {
-	var err error
-	osv := OSVersion{}
-	osv.Version, err = syscall.GetVersion()
-	if err != nil {
-		// GetVersion never fails.
-		panic(err)
-	}
-	osv.MajorVersion = uint8(osv.Version & 0xFF)
-	osv.MinorVersion = uint8(osv.Version >> 8 & 0xFF)
-	osv.Build = uint16(osv.Version >> 16)
-	return osv
-}
-
-// IsWindowsClient returns true if the SKU is client
-// @engine maintainers - this function should not be removed or modified as it
-// is used to enforce licensing restrictions on Windows.
-func IsWindowsClient() bool {
-	osviex := &osVersionInfoEx{OSVersionInfoSize: 284}
-	r1, _, err := procGetVersionExW.Call(uintptr(unsafe.Pointer(osviex)))
-	if r1 == 0 {
-		logrus.Warnf("GetVersionExW failed - assuming server SKU: %v", err)
-		return false
-	}
-	const verNTWorkstation = 0x00000001
-	return osviex.ProductType == verNTWorkstation
-}
-
-// Unmount is a platform-specific helper function to call
-// the unmount syscall. Not supported on Windows
-func Unmount(dest string) error {
-	return nil
-}
-
-// CommandLineToArgv wraps the Windows syscall to turn a commandline into an argument array.
-func CommandLineToArgv(commandLine string) ([]string, error) {
-	var argc int32
-
-	argsPtr, err := syscall.UTF16PtrFromString(commandLine)
-	if err != nil {
-		return nil, err
-	}
-
-	argv, err := syscall.CommandLineToArgv(argsPtr, &argc)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.LocalFree(syscall.Handle(uintptr(unsafe.Pointer(argv))))
-
-	newArgs := make([]string, argc)
-	for i, v := range (*argv)[:argc] {
-		newArgs[i] = string(syscall.UTF16ToString((*v)[:]))
-	}
-
-	return newArgs, nil
-}
-
-// HasWin32KSupport determines whether containers that depend on win32k can
-// run on this machine. Win32k is the driver used to implement windowing.
-func HasWin32KSupport() bool {
-	// For now, check for ntuser API support on the host. In the future, a host
-	// may support win32k in containers even if the host does not support ntuser
-	// APIs.
-	return ntuserApiset.Load() == nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows_test.go b/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows_test.go
deleted file mode 100644
index 4886b2b9b4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/syscall_windows_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package system
-
-import "testing"
-
-func TestHasWin32KSupport(t *testing.T) {
-	s := HasWin32KSupport() // make sure this doesn't panic
-
-	t.Logf("win32k: %v", s) // will be different on different platforms -- informative only
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/umask.go b/installer/vendor/github.com/docker/docker/pkg/system/umask.go
deleted file mode 100644
index 3d0146b01a..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/umask.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !windows
-
-package system
-
-import (
-	"syscall"
-)
-
-// Umask sets current process's file mode creation mask to newmask
-// and returns oldmask.
-func Umask(newmask int) (oldmask int, err error) {
-	return syscall.Umask(newmask), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/umask_windows.go b/installer/vendor/github.com/docker/docker/pkg/system/umask_windows.go
deleted file mode 100644
index 13f1de1769..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/umask_windows.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build windows
-
-package system
-
-// Umask is not supported on the windows platform.
-func Umask(newmask int) (oldmask int, err error) {
-	// should not be called on cli code path
-	return 0, ErrNotSupportedPlatform
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go
deleted file mode 100644
index e2eac3b553..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/utimes_freebsd.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the specified path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall(syscall.SYS_LUTIMES, uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/utimes_linux.go b/installer/vendor/github.com/docker/docker/pkg/system/utimes_linux.go
deleted file mode 100644
index fc8a1aba95..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/utimes_linux.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// LUtimesNano is used to change access and modification time of the specified path.
-// It's used for symbol link file because syscall.UtimesNano doesn't support a NOFOLLOW flag atm.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	// These are not currently available in syscall
-	atFdCwd := -100
-	atSymLinkNoFollow := 0x100
-
-	var _path *byte
-	_path, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-
-	if _, _, err := syscall.Syscall6(syscall.SYS_UTIMENSAT, uintptr(atFdCwd), uintptr(unsafe.Pointer(_path)), uintptr(unsafe.Pointer(&ts[0])), uintptr(atSymLinkNoFollow), 0, 0); err != 0 && err != syscall.ENOSYS {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/utimes_unix_test.go b/installer/vendor/github.com/docker/docker/pkg/system/utimes_unix_test.go
deleted file mode 100644
index a73ed118c9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/utimes_unix_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// +build linux freebsd
-
-package system
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-)
-
-// prepareFiles creates files for testing in the temp directory
-func prepareFiles(t *testing.T) (string, string, string, string) {
-	dir, err := ioutil.TempDir("", "docker-system-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	file := filepath.Join(dir, "exist")
-	if err := ioutil.WriteFile(file, []byte("hello"), 0644); err != nil {
-		t.Fatal(err)
-	}
-
-	invalid := filepath.Join(dir, "doesnt-exist")
-
-	symlink := filepath.Join(dir, "symlink")
-	if err := os.Symlink(file, symlink); err != nil {
-		t.Fatal(err)
-	}
-
-	return file, invalid, symlink, dir
-}
-
-func TestLUtimesNano(t *testing.T) {
-	file, invalid, symlink, dir := prepareFiles(t)
-	defer os.RemoveAll(dir)
-
-	before, err := os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ts := []syscall.Timespec{{Sec: 0, Nsec: 0}, {Sec: 0, Nsec: 0}}
-	if err := LUtimesNano(symlink, ts); err != nil {
-		t.Fatal(err)
-	}
-
-	symlinkInfo, err := os.Lstat(symlink)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if before.ModTime().Unix() == symlinkInfo.ModTime().Unix() {
-		t.Fatal("The modification time of the symlink should be different")
-	}
-
-	fileInfo, err := os.Stat(file)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if before.ModTime().Unix() != fileInfo.ModTime().Unix() {
-		t.Fatal("The modification time of the file should be same")
-	}
-
-	if err := LUtimesNano(invalid, ts); err == nil {
-		t.Fatal("Doesn't return an error on a non-existing file")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go
deleted file mode 100644
index 139714544d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/utimes_unsupported.go
+++ /dev/null
@@ -1,10 +0,0 @@
-// +build !linux,!freebsd
-
-package system
-
-import "syscall"
-
-// LUtimesNano is only supported on linux and freebsd.
-func LUtimesNano(path string, ts []syscall.Timespec) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go b/installer/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go
deleted file mode 100644
index d2e2c05799..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/xattrs_linux.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package system
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// Lgetxattr retrieves the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-// It will returns a nil slice and nil error if the xattr is not set.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return nil, err
-	}
-
-	dest := make([]byte, 128)
-	destBytes := unsafe.Pointer(&dest[0])
-	sz, _, errno := syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	if errno == syscall.ENODATA {
-		return nil, nil
-	}
-	if errno == syscall.ERANGE {
-		dest = make([]byte, sz)
-		destBytes := unsafe.Pointer(&dest[0])
-		sz, _, errno = syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(destBytes), uintptr(len(dest)), 0, 0)
-	}
-	if errno != 0 {
-		return nil, errno
-	}
-
-	return dest[:sz], nil
-}
-
-var _zero uintptr
-
-// Lsetxattr sets the value of the extended attribute identified by attr
-// and associated with the given path in the file system.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	pathBytes, err := syscall.BytePtrFromString(path)
-	if err != nil {
-		return err
-	}
-	attrBytes, err := syscall.BytePtrFromString(attr)
-	if err != nil {
-		return err
-	}
-	var dataBytes unsafe.Pointer
-	if len(data) > 0 {
-		dataBytes = unsafe.Pointer(&data[0])
-	} else {
-		dataBytes = unsafe.Pointer(&_zero)
-	}
-	_, _, errno := syscall.Syscall6(syscall.SYS_LSETXATTR, uintptr(unsafe.Pointer(pathBytes)), uintptr(unsafe.Pointer(attrBytes)), uintptr(dataBytes), uintptr(len(data)), uintptr(flags), 0)
-	if errno != 0 {
-		return errno
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go b/installer/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go
deleted file mode 100644
index 0114f2227c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/system/xattrs_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build !linux
-
-package system
-
-// Lgetxattr is not supported on platforms other than linux.
-func Lgetxattr(path string, attr string) ([]byte, error) {
-	return nil, ErrNotSupportedPlatform
-}
-
-// Lsetxattr is not supported on platforms other than linux.
-func Lsetxattr(path string, attr string, data []byte, flags int) error {
-	return ErrNotSupportedPlatform
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile.go b/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile.go
deleted file mode 100644
index 09eb393ab7..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Package tailfile provides helper functions to read the nth lines of any
-// ReadSeeker.
-package tailfile
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"os"
-)
-
-const blockSize = 1024
-
-var eol = []byte("\n")
-
-// ErrNonPositiveLinesNumber is an error returned if the lines number was negative.
-var ErrNonPositiveLinesNumber = errors.New("The number of lines to extract from the file must be positive")
-
-//TailFile returns last n lines of reader f (could be a fil).
-func TailFile(f io.ReadSeeker, n int) ([][]byte, error) {
-	if n <= 0 {
-		return nil, ErrNonPositiveLinesNumber
-	}
-	size, err := f.Seek(0, os.SEEK_END)
-	if err != nil {
-		return nil, err
-	}
-	block := -1
-	var data []byte
-	var cnt int
-	for {
-		var b []byte
-		step := int64(block * blockSize)
-		left := size + step // how many bytes to beginning
-		if left < 0 {
-			if _, err := f.Seek(0, os.SEEK_SET); err != nil {
-				return nil, err
-			}
-			b = make([]byte, blockSize+left)
-			if _, err := f.Read(b); err != nil {
-				return nil, err
-			}
-			data = append(b, data...)
-			break
-		} else {
-			b = make([]byte, blockSize)
-			if _, err := f.Seek(left, os.SEEK_SET); err != nil {
-				return nil, err
-			}
-			if _, err := f.Read(b); err != nil {
-				return nil, err
-			}
-			data = append(b, data...)
-		}
-		cnt += bytes.Count(b, eol)
-		if cnt > n {
-			break
-		}
-		block--
-	}
-	lines := bytes.Split(data, eol)
-	if n < len(lines) {
-		return lines[len(lines)-n-1 : len(lines)-1], nil
-	}
-	return lines[:len(lines)-1], nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile_test.go b/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile_test.go
deleted file mode 100644
index 31217c036c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tailfile/tailfile_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-package tailfile
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-func TestTailFile(t *testing.T) {
-	f, err := ioutil.TempFile("", "tail-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	defer os.RemoveAll(f.Name())
-	testFile := []byte(`first line
-second line
-third line
-fourth line
-fifth line
-next first line
-next second line
-next third line
-next fourth line
-next fifth line
-last first line
-next first line
-next second line
-next third line
-next fourth line
-next fifth line
-next first line
-next second line
-next third line
-next fourth line
-next fifth line
-last second line
-last third line
-last fourth line
-last fifth line
-truncated line`)
-	if _, err := f.Write(testFile); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := f.Seek(0, os.SEEK_SET); err != nil {
-		t.Fatal(err)
-	}
-	expected := []string{"last fourth line", "last fifth line"}
-	res, err := TailFile(f, 2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, l := range res {
-		t.Logf("%s", l)
-		if expected[i] != string(l) {
-			t.Fatalf("Expected line %s, got %s", expected[i], l)
-		}
-	}
-}
-
-func TestTailFileManyLines(t *testing.T) {
-	f, err := ioutil.TempFile("", "tail-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	defer os.RemoveAll(f.Name())
-	testFile := []byte(`first line
-second line
-truncated line`)
-	if _, err := f.Write(testFile); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := f.Seek(0, os.SEEK_SET); err != nil {
-		t.Fatal(err)
-	}
-	expected := []string{"first line", "second line"}
-	res, err := TailFile(f, 10000)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, l := range res {
-		t.Logf("%s", l)
-		if expected[i] != string(l) {
-			t.Fatalf("Expected line %s, got %s", expected[i], l)
-		}
-	}
-}
-
-func TestTailEmptyFile(t *testing.T) {
-	f, err := ioutil.TempFile("", "tail-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	defer os.RemoveAll(f.Name())
-	res, err := TailFile(f, 10000)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(res) != 0 {
-		t.Fatal("Must be empty slice from empty file")
-	}
-}
-
-func TestTailNegativeN(t *testing.T) {
-	f, err := ioutil.TempFile("", "tail-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	defer os.RemoveAll(f.Name())
-	testFile := []byte(`first line
-second line
-truncated line`)
-	if _, err := f.Write(testFile); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := f.Seek(0, os.SEEK_SET); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := TailFile(f, -1); err != ErrNonPositiveLinesNumber {
-		t.Fatalf("Expected ErrNonPositiveLinesNumber, got %s", err)
-	}
-	if _, err := TailFile(f, 0); err != ErrNonPositiveLinesNumber {
-		t.Fatalf("Expected ErrNonPositiveLinesNumber, got %s", err)
-	}
-}
-
-func BenchmarkTail(b *testing.B) {
-	f, err := ioutil.TempFile("", "tail-test")
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer f.Close()
-	defer os.RemoveAll(f.Name())
-	for i := 0; i < 10000; i++ {
-		if _, err := f.Write([]byte("tailfile pretty interesting line\n")); err != nil {
-			b.Fatal(err)
-		}
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		if _, err := TailFile(f, 1000); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context.go
deleted file mode 100644
index b42983e984..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package tarsum
-
-// BuilderContext is an interface extending TarSum by adding the Remove method.
-// In general there was concern about adding this method to TarSum itself
-// so instead it is being added just to "BuilderContext" which will then
-// only be used during the .dockerignore file processing
-// - see builder/evaluator.go
-type BuilderContext interface {
-	TarSum
-	Remove(string)
-}
-
-func (bc *tarSum) Remove(filename string) {
-	for i, fis := range bc.sums {
-		if fis.Name() == filename {
-			bc.sums = append(bc.sums[:i], bc.sums[i+1:]...)
-			// Note, we don't just return because there could be
-			// more than one with this name
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context_test.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context_test.go
deleted file mode 100644
index f54bf3a1bd..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/builder_context_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package tarsum
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"testing"
-)
-
-// Try to remove tarsum (in the BuilderContext) that do not exists, won't change a thing
-func TestTarSumRemoveNonExistent(t *testing.T) {
-	filename := "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar"
-	reader, err := os.Open(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer reader.Close()
-
-	ts, err := NewTarSum(reader, false, Version0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Read and discard bytes so that it populates sums
-	_, err = io.Copy(ioutil.Discard, ts)
-	if err != nil {
-		t.Errorf("failed to read from %s: %s", filename, err)
-	}
-
-	expected := len(ts.GetSums())
-
-	ts.(BuilderContext).Remove("")
-	ts.(BuilderContext).Remove("Anything")
-
-	if len(ts.GetSums()) != expected {
-		t.Fatalf("Expected %v sums, go %v.", expected, ts.GetSums())
-	}
-}
-
-// Remove a tarsum (in the BuilderContext)
-func TestTarSumRemove(t *testing.T) {
-	filename := "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar"
-	reader, err := os.Open(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer reader.Close()
-
-	ts, err := NewTarSum(reader, false, Version0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Read and discard bytes so that it populates sums
-	_, err = io.Copy(ioutil.Discard, ts)
-	if err != nil {
-		t.Errorf("failed to read from %s: %s", filename, err)
-	}
-
-	expected := len(ts.GetSums()) - 1
-
-	ts.(BuilderContext).Remove("etc/sudoers")
-
-	if len(ts.GetSums()) != expected {
-		t.Fatalf("Expected %v sums, go %v.", expected, len(ts.GetSums()))
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums.go
deleted file mode 100644
index 5abf5e7ba3..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package tarsum
-
-import "sort"
-
-// FileInfoSumInterface provides an interface for accessing file checksum
-// information within a tar file. This info is accessed through interface
-// so the actual name and sum cannot be melded with.
-type FileInfoSumInterface interface {
-	// File name
-	Name() string
-	// Checksum of this particular file and its headers
-	Sum() string
-	// Position of file in the tar
-	Pos() int64
-}
-
-type fileInfoSum struct {
-	name string
-	sum  string
-	pos  int64
-}
-
-func (fis fileInfoSum) Name() string {
-	return fis.name
-}
-func (fis fileInfoSum) Sum() string {
-	return fis.sum
-}
-func (fis fileInfoSum) Pos() int64 {
-	return fis.pos
-}
-
-// FileInfoSums provides a list of FileInfoSumInterfaces.
-type FileInfoSums []FileInfoSumInterface
-
-// GetFile returns the first FileInfoSumInterface with a matching name.
-func (fis FileInfoSums) GetFile(name string) FileInfoSumInterface {
-	for i := range fis {
-		if fis[i].Name() == name {
-			return fis[i]
-		}
-	}
-	return nil
-}
-
-// GetAllFile returns a FileInfoSums with all matching names.
-func (fis FileInfoSums) GetAllFile(name string) FileInfoSums {
-	f := FileInfoSums{}
-	for i := range fis {
-		if fis[i].Name() == name {
-			f = append(f, fis[i])
-		}
-	}
-	return f
-}
-
-// GetDuplicatePaths returns a FileInfoSums with all duplicated paths.
-func (fis FileInfoSums) GetDuplicatePaths() (dups FileInfoSums) {
-	seen := make(map[string]int, len(fis)) // allocate earl. no need to grow this map.
-	for i := range fis {
-		f := fis[i]
-		if _, ok := seen[f.Name()]; ok {
-			dups = append(dups, f)
-		} else {
-			seen[f.Name()] = 0
-		}
-	}
-	return dups
-}
-
-// Len returns the size of the FileInfoSums.
-func (fis FileInfoSums) Len() int { return len(fis) }
-
-// Swap swaps two FileInfoSum values if a FileInfoSums list.
-func (fis FileInfoSums) Swap(i, j int) { fis[i], fis[j] = fis[j], fis[i] }
-
-// SortByPos sorts FileInfoSums content by position.
-func (fis FileInfoSums) SortByPos() {
-	sort.Sort(byPos{fis})
-}
-
-// SortByNames sorts FileInfoSums content by name.
-func (fis FileInfoSums) SortByNames() {
-	sort.Sort(byName{fis})
-}
-
-// SortBySums sorts FileInfoSums content by sums.
-func (fis FileInfoSums) SortBySums() {
-	dups := fis.GetDuplicatePaths()
-	if len(dups) > 0 {
-		sort.Sort(bySum{fis, dups})
-	} else {
-		sort.Sort(bySum{fis, nil})
-	}
-}
-
-// byName is a sort.Sort helper for sorting by file names.
-// If names are the same, order them by their appearance in the tar archive
-type byName struct{ FileInfoSums }
-
-func (bn byName) Less(i, j int) bool {
-	if bn.FileInfoSums[i].Name() == bn.FileInfoSums[j].Name() {
-		return bn.FileInfoSums[i].Pos() < bn.FileInfoSums[j].Pos()
-	}
-	return bn.FileInfoSums[i].Name() < bn.FileInfoSums[j].Name()
-}
-
-// bySum is a sort.Sort helper for sorting by the sums of all the fileinfos in the tar archive
-type bySum struct {
-	FileInfoSums
-	dups FileInfoSums
-}
-
-func (bs bySum) Less(i, j int) bool {
-	if bs.dups != nil && bs.FileInfoSums[i].Name() == bs.FileInfoSums[j].Name() {
-		return bs.FileInfoSums[i].Pos() < bs.FileInfoSums[j].Pos()
-	}
-	return bs.FileInfoSums[i].Sum() < bs.FileInfoSums[j].Sum()
-}
-
-// byPos is a sort.Sort helper for sorting by the sums of all the fileinfos by their original order
-type byPos struct{ FileInfoSums }
-
-func (bp byPos) Less(i, j int) bool {
-	return bp.FileInfoSums[i].Pos() < bp.FileInfoSums[j].Pos()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums_test.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums_test.go
deleted file mode 100644
index bb700d8bde..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/fileinfosums_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package tarsum
-
-import "testing"
-
-func newFileInfoSums() FileInfoSums {
-	return FileInfoSums{
-		fileInfoSum{name: "file3", sum: "2abcdef1234567890", pos: 2},
-		fileInfoSum{name: "dup1", sum: "deadbeef1", pos: 5},
-		fileInfoSum{name: "file1", sum: "0abcdef1234567890", pos: 0},
-		fileInfoSum{name: "file4", sum: "3abcdef1234567890", pos: 3},
-		fileInfoSum{name: "dup1", sum: "deadbeef0", pos: 4},
-		fileInfoSum{name: "file2", sum: "1abcdef1234567890", pos: 1},
-	}
-}
-
-func TestSortFileInfoSums(t *testing.T) {
-	dups := newFileInfoSums().GetAllFile("dup1")
-	if len(dups) != 2 {
-		t.Errorf("expected length 2, got %d", len(dups))
-	}
-	dups.SortByNames()
-	if dups[0].Pos() != 4 {
-		t.Errorf("sorted dups should be ordered by position. Expected 4, got %d", dups[0].Pos())
-	}
-
-	fis := newFileInfoSums()
-	expected := "0abcdef1234567890"
-	fis.SortBySums()
-	got := fis[0].Sum()
-	if got != expected {
-		t.Errorf("Expected %q, got %q", expected, got)
-	}
-
-	fis = newFileInfoSums()
-	expected = "dup1"
-	fis.SortByNames()
-	gotFis := fis[0]
-	if gotFis.Name() != expected {
-		t.Errorf("Expected %q, got %q", expected, gotFis.Name())
-	}
-	// since a duplicate is first, ensure it is ordered first by position too
-	if gotFis.Pos() != 4 {
-		t.Errorf("Expected %d, got %d", 4, gotFis.Pos())
-	}
-
-	fis = newFileInfoSums()
-	fis.SortByPos()
-	if fis[0].Pos() != 0 {
-		t.Errorf("sorted fileInfoSums by Pos should order them by position.")
-	}
-
-	fis = newFileInfoSums()
-	expected = "deadbeef1"
-	gotFileInfoSum := fis.GetFile("dup1")
-	if gotFileInfoSum.Sum() != expected {
-		t.Errorf("Expected %q, got %q", expected, gotFileInfoSum)
-	}
-	if fis.GetFile("noPresent") != nil {
-		t.Errorf("Should have return nil if name not found.")
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum.go
deleted file mode 100644
index 154788db82..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Package tarsum provides algorithms to perform checksum calculation on
-// filesystem layers.
-//
-// The transportation of filesystems, regarding Docker, is done with tar(1)
-// archives. There are a variety of tar serialization formats [2], and a key
-// concern here is ensuring a repeatable checksum given a set of inputs from a
-// generic tar archive. Types of transportation include distribution to and from a
-// registry endpoint, saving and loading through commands or Docker daemon APIs,
-// transferring the build context from client to Docker daemon, and committing the
-// filesystem of a container to become an image.
-//
-// As tar archives are used for transit, but not preserved in many situations, the
-// focus of the algorithm is to ensure the integrity of the preserved filesystem,
-// while maintaining a deterministic accountability. This includes neither
-// constraining the ordering or manipulation of the files during the creation or
-// unpacking of the archive, nor include additional metadata state about the file
-// system attributes.
-package tarsum
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"crypto"
-	"crypto/sha256"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"hash"
-	"io"
-	"path"
-	"strings"
-)
-
-const (
-	buf8K  = 8 * 1024
-	buf16K = 16 * 1024
-	buf32K = 32 * 1024
-)
-
-// NewTarSum creates a new interface for calculating a fixed time checksum of a
-// tar archive.
-//
-// This is used for calculating checksums of layers of an image, in some cases
-// including the byte payload of the image's json metadata as well, and for
-// calculating the checksums for buildcache.
-func NewTarSum(r io.Reader, dc bool, v Version) (TarSum, error) {
-	return NewTarSumHash(r, dc, v, DefaultTHash)
-}
-
-// NewTarSumHash creates a new TarSum, providing a THash to use rather than
-// the DefaultTHash.
-func NewTarSumHash(r io.Reader, dc bool, v Version, tHash THash) (TarSum, error) {
-	headerSelector, err := getTarHeaderSelector(v)
-	if err != nil {
-		return nil, err
-	}
-	ts := &tarSum{Reader: r, DisableCompression: dc, tarSumVersion: v, headerSelector: headerSelector, tHash: tHash}
-	err = ts.initTarSum()
-	return ts, err
-}
-
-// NewTarSumForLabel creates a new TarSum using the provided TarSum version+hash label.
-func NewTarSumForLabel(r io.Reader, disableCompression bool, label string) (TarSum, error) {
-	parts := strings.SplitN(label, "+", 2)
-	if len(parts) != 2 {
-		return nil, errors.New("tarsum label string should be of the form: {tarsum_version}+{hash_name}")
-	}
-
-	versionName, hashName := parts[0], parts[1]
-
-	version, ok := tarSumVersionsByName[versionName]
-	if !ok {
-		return nil, fmt.Errorf("unknown TarSum version name: %q", versionName)
-	}
-
-	hashConfig, ok := standardHashConfigs[hashName]
-	if !ok {
-		return nil, fmt.Errorf("unknown TarSum hash name: %q", hashName)
-	}
-
-	tHash := NewTHash(hashConfig.name, hashConfig.hash.New)
-
-	return NewTarSumHash(r, disableCompression, version, tHash)
-}
-
-// TarSum is the generic interface for calculating fixed time
-// checksums of a tar archive.
-type TarSum interface {
-	io.Reader
-	GetSums() FileInfoSums
-	Sum([]byte) string
-	Version() Version
-	Hash() THash
-}
-
-// tarSum struct is the structure for a Version0 checksum calculation.
-type tarSum struct {
-	io.Reader
-	tarR               *tar.Reader
-	tarW               *tar.Writer
-	writer             writeCloseFlusher
-	bufTar             *bytes.Buffer
-	bufWriter          *bytes.Buffer
-	bufData            []byte
-	h                  hash.Hash
-	tHash              THash
-	sums               FileInfoSums
-	fileCounter        int64
-	currentFile        string
-	finished           bool
-	first              bool
-	DisableCompression bool              // false by default. When false, the output gzip compressed.
-	tarSumVersion      Version           // this field is not exported so it can not be mutated during use
-	headerSelector     tarHeaderSelector // handles selecting and ordering headers for files in the archive
-}
-
-func (ts tarSum) Hash() THash {
-	return ts.tHash
-}
-
-func (ts tarSum) Version() Version {
-	return ts.tarSumVersion
-}
-
-// THash provides a hash.Hash type generator and its name.
-type THash interface {
-	Hash() hash.Hash
-	Name() string
-}
-
-// NewTHash is a convenience method for creating a THash.
-func NewTHash(name string, h func() hash.Hash) THash {
-	return simpleTHash{n: name, h: h}
-}
-
-type tHashConfig struct {
-	name string
-	hash crypto.Hash
-}
-
-var (
-	// NOTE: DO NOT include MD5 or SHA1, which are considered insecure.
-	standardHashConfigs = map[string]tHashConfig{
-		"sha256": {name: "sha256", hash: crypto.SHA256},
-		"sha512": {name: "sha512", hash: crypto.SHA512},
-	}
-)
-
-// DefaultTHash is default TarSum hashing algorithm - "sha256".
-var DefaultTHash = NewTHash("sha256", sha256.New)
-
-type simpleTHash struct {
-	n string
-	h func() hash.Hash
-}
-
-func (sth simpleTHash) Name() string    { return sth.n }
-func (sth simpleTHash) Hash() hash.Hash { return sth.h() }
-
-func (ts *tarSum) encodeHeader(h *tar.Header) error {
-	for _, elem := range ts.headerSelector.selectHeaders(h) {
-		if _, err := ts.h.Write([]byte(elem[0] + elem[1])); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (ts *tarSum) initTarSum() error {
-	ts.bufTar = bytes.NewBuffer([]byte{})
-	ts.bufWriter = bytes.NewBuffer([]byte{})
-	ts.tarR = tar.NewReader(ts.Reader)
-	ts.tarW = tar.NewWriter(ts.bufTar)
-	if !ts.DisableCompression {
-		ts.writer = gzip.NewWriter(ts.bufWriter)
-	} else {
-		ts.writer = &nopCloseFlusher{Writer: ts.bufWriter}
-	}
-	if ts.tHash == nil {
-		ts.tHash = DefaultTHash
-	}
-	ts.h = ts.tHash.Hash()
-	ts.h.Reset()
-	ts.first = true
-	ts.sums = FileInfoSums{}
-	return nil
-}
-
-func (ts *tarSum) Read(buf []byte) (int, error) {
-	if ts.finished {
-		return ts.bufWriter.Read(buf)
-	}
-	if len(ts.bufData) < len(buf) {
-		switch {
-		case len(buf) <= buf8K:
-			ts.bufData = make([]byte, buf8K)
-		case len(buf) <= buf16K:
-			ts.bufData = make([]byte, buf16K)
-		case len(buf) <= buf32K:
-			ts.bufData = make([]byte, buf32K)
-		default:
-			ts.bufData = make([]byte, len(buf))
-		}
-	}
-	buf2 := ts.bufData[:len(buf)]
-
-	n, err := ts.tarR.Read(buf2)
-	if err != nil {
-		if err == io.EOF {
-			if _, err := ts.h.Write(buf2[:n]); err != nil {
-				return 0, err
-			}
-			if !ts.first {
-				ts.sums = append(ts.sums, fileInfoSum{name: ts.currentFile, sum: hex.EncodeToString(ts.h.Sum(nil)), pos: ts.fileCounter})
-				ts.fileCounter++
-				ts.h.Reset()
-			} else {
-				ts.first = false
-			}
-
-			currentHeader, err := ts.tarR.Next()
-			if err != nil {
-				if err == io.EOF {
-					if err := ts.tarW.Close(); err != nil {
-						return 0, err
-					}
-					if _, err := io.Copy(ts.writer, ts.bufTar); err != nil {
-						return 0, err
-					}
-					if err := ts.writer.Close(); err != nil {
-						return 0, err
-					}
-					ts.finished = true
-					return n, nil
-				}
-				return n, err
-			}
-			ts.currentFile = path.Clean(currentHeader.Name)
-			if err := ts.encodeHeader(currentHeader); err != nil {
-				return 0, err
-			}
-			if err := ts.tarW.WriteHeader(currentHeader); err != nil {
-				return 0, err
-			}
-			if _, err := ts.tarW.Write(buf2[:n]); err != nil {
-				return 0, err
-			}
-			ts.tarW.Flush()
-			if _, err := io.Copy(ts.writer, ts.bufTar); err != nil {
-				return 0, err
-			}
-			ts.writer.Flush()
-
-			return ts.bufWriter.Read(buf)
-		}
-		return n, err
-	}
-
-	// Filling the hash buffer
-	if _, err = ts.h.Write(buf2[:n]); err != nil {
-		return 0, err
-	}
-
-	// Filling the tar writer
-	if _, err = ts.tarW.Write(buf2[:n]); err != nil {
-		return 0, err
-	}
-	ts.tarW.Flush()
-
-	// Filling the output writer
-	if _, err = io.Copy(ts.writer, ts.bufTar); err != nil {
-		return 0, err
-	}
-	ts.writer.Flush()
-
-	return ts.bufWriter.Read(buf)
-}
-
-func (ts *tarSum) Sum(extra []byte) string {
-	ts.sums.SortBySums()
-	h := ts.tHash.Hash()
-	if extra != nil {
-		h.Write(extra)
-	}
-	for _, fis := range ts.sums {
-		h.Write([]byte(fis.Sum()))
-	}
-	checksum := ts.Version().String() + "+" + ts.tHash.Name() + ":" + hex.EncodeToString(h.Sum(nil))
-	return checksum
-}
-
-func (ts *tarSum) GetSums() FileInfoSums {
-	return ts.sums
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_spec.md b/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_spec.md
deleted file mode 100644
index 89b2e49f98..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_spec.md
+++ /dev/null
@@ -1,230 +0,0 @@
-page_title: TarSum checksum specification
-page_description: Documentation for algorithms used in the TarSum checksum calculation
-page_keywords: docker, checksum, validation, tarsum
-
-# TarSum Checksum Specification
-
-## Abstract
-
-This document describes the algorithms used in performing the TarSum checksum
-calculation on filesystem layers, the need for this method over existing
-methods, and the versioning of this calculation.
-
-## Warning
-
-This checksum algorithm is for best-effort comparison of file trees with fuzzy logic.
-
-This is _not_ a cryptographic attestation, and should not be considered secure.
-
-## Introduction
-
-The transportation of filesystems, regarding Docker, is done with tar(1)
-archives. There are a variety of tar serialization formats [2], and a key
-concern here is ensuring a repeatable checksum given a set of inputs from a
-generic tar archive. Types of transportation include distribution to and from a
-registry endpoint, saving and loading through commands or Docker daemon APIs,
-transferring the build context from client to Docker daemon, and committing the
-filesystem of a container to become an image.
-
-As tar archives are used for transit, but not preserved in many situations, the
-focus of the algorithm is to ensure the integrity of the preserved filesystem,
-while maintaining a deterministic accountability. This includes neither
-constraining the ordering or manipulation of the files during the creation or
-unpacking of the archive, nor include additional metadata state about the file
-system attributes.
-
-## Intended Audience
-
-This document is outlining the methods used for consistent checksum calculation
-for filesystems transported via tar archives.
-
-Auditing these methodologies is an open and iterative process. This document
-should accommodate the review of source code. Ultimately, this document should
-be the starting point of further refinements to the algorithm and its future
-versions.
-
-## Concept
-
-The checksum mechanism must ensure the integrity and assurance of the
-filesystem payload.
-
-## Checksum Algorithm Profile
-
-A checksum mechanism must define the following operations and attributes:
-
-* Associated hashing cipher - used to checksum each file payload and attribute
-  information.
-* Checksum list - each file of the filesystem archive has its checksum
-  calculated from the payload and attributes of the file. The final checksum is
-  calculated from this list, with specific ordering.
-* Version - as the algorithm adapts to requirements, there are behaviors of the
-  algorithm to manage by versioning.
-* Archive being calculated - the tar archive having its checksum calculated
-
-## Elements of TarSum checksum
-
-The calculated sum output is a text string. The elements included in the output
-of the calculated sum comprise the information needed for validation of the sum
-(TarSum version and hashing cipher used) and the expected checksum in hexadecimal
-form.
-
-There are two delimiters used:
-* '+' separates TarSum version from hashing cipher
-* ':' separates calculation mechanics from expected hash
-
-Example:
-
-```
-	"tarsum.v1+sha256:220a60ecd4a3c32c282622a625a54db9ba0ff55b5ba9c29c7064a2bc358b6a3e"
-	|         |       \                                                               |
-	|         |        \                                                              |
-	|_version_|_cipher__|__                                                           |
-	|                      \                                                          |
-	|_calculation_mechanics_|______________________expected_sum_______________________|
-```
-
-## Versioning
-
-Versioning was introduced [0] to accommodate differences in calculation needed,
-and ability to maintain reverse compatibility.
-
-The general algorithm will be describe further in the 'Calculation'.
-
-### Version0
-
-This is the initial version of TarSum.
-
-Its element in the TarSum checksum string is `tarsum`.
-
-### Version1
-
-Its element in the TarSum checksum is `tarsum.v1`.
-
-The notable changes in this version:
-* Exclusion of file `mtime` from the file information headers, in each file
-  checksum calculation
-* Inclusion of extended attributes (`xattrs`. Also seen as `SCHILY.xattr.` prefixed Pax
-  tar file info headers) keys and values in each file checksum calculation
-
-### VersionDev
-
-*Do not use unless validating refinements to the checksum algorithm*
-
-Its element in the TarSum checksum is `tarsum.dev`.
-
-This is a floating place holder for a next version and grounds for testing
-changes. The methods used for calculation are subject to change without notice,
-and this version is for testing and not for production use.
-
-## Ciphers
-
-The official default and standard hashing cipher used in the calculation mechanic
-is `sha256`. This refers to SHA256 hash algorithm as defined in FIPS 180-4.
-
-Though the TarSum algorithm itself is not exclusively bound to the single
-hashing cipher `sha256`, support for alternate hashing ciphers was later added
-[1]. Use cases for alternate cipher could include future-proofing TarSum
-checksum format and using faster cipher hashes for tar filesystem checksums.
-
-## Calculation
-
-### Requirement
-
-As mentioned earlier, the calculation is such that it takes into consideration
-the lifecycle of the tar archive. In that the tar archive is not an immutable,
-permanent artifact. Otherwise options like relying on a known hashing cipher
-checksum of the archive itself would be reliable enough. The tar archive of the
-filesystem is used as a transportation medium for Docker images, and the
-archive is discarded once its contents are extracted. Therefore, for consistent
-validation items such as order of files in the tar archive and time stamps are
-subject to change once an image is received.
-
-### Process
-
-The method is typically iterative due to reading tar info headers from the
-archive stream, though this is not a strict requirement.
-
-#### Files
-
-Each file in the tar archive have their contents (headers and body) checksummed
-individually using the designated associated hashing cipher. The ordered
-headers of the file are written to the checksum calculation first, and then the
-payload of the file body.
-
-The resulting checksum of the file is appended to the list of file sums. The
-sum is encoded as a string of the hexadecimal digest. Additionally, the file
-name and position in the archive is kept as reference for special ordering.
-
-#### Headers
-
-The following headers are read, in this
-order ( and the corresponding representation of its value):
-* 'name' - string
-* 'mode' - string of the base10 integer
-* 'uid' - string of the integer
-* 'gid' - string of the integer
-* 'size' - string of the integer
-* 'mtime' (_Version0 only_) - string of integer of the seconds since 1970-01-01 00:00:00 UTC
-* 'typeflag' - string of the char
-* 'linkname' - string
-* 'uname' - string
-* 'gname' - string
-* 'devmajor' - string of the integer
-* 'devminor' - string of the integer
-
-For >= Version1, the extended attribute headers ("SCHILY.xattr." prefixed pax
-headers) included after the above list. These xattrs key/values are first
-sorted by the keys.
-
-#### Header Format
-
-The ordered headers are written to the hash in the format of
-
-	"{.key}{.value}"
-
-with no newline.
-
-#### Body
-
-After the order headers of the file have been added to the checksum for the
-file, the body of the file is written to the hash.
-
-#### List of file sums
-
-The list of file sums is sorted by the string of the hexadecimal digest.
-
-If there are two files in the tar with matching paths, the order of occurrence
-for that path is reflected for the sums of the corresponding file header and
-body.
-
-#### Final Checksum
-
-Begin with a fresh or initial state of the associated hash cipher. If there is
-additional payload to include in the TarSum calculation for the archive, it is
-written first. Then each checksum from the ordered list of file sums is written
-to the hash.
-
-The resulting digest is formatted per the Elements of TarSum checksum,
-including the TarSum version, the associated hash cipher and the hexadecimal
-encoded checksum digest.
-
-## Security Considerations
-
-The initial version of TarSum has undergone one update that could invalidate
-handcrafted tar archives. The tar archive format supports appending of files
-with same names as prior files in the archive. The latter file will clobber the
-prior file of the same path. Due to this the algorithm now accounts for files
-with matching paths, and orders the list of file sums accordingly [3].
-
-## Footnotes
-
-* [0] Versioning https://github.com/docker/docker/commit/747f89cd327db9d50251b17797c4d825162226d0
-* [1] Alternate ciphers https://github.com/docker/docker/commit/4e9925d780665149b8bc940d5ba242ada1973c4e
-* [2] Tar http://en.wikipedia.org/wiki/Tar_%28computing%29
-* [3] Name collision https://github.com/docker/docker/commit/c5e6362c53cbbc09ddbabd5a7323e04438b57d31
-
-## Acknowledgments
-
-Joffrey F (shin-) and Guillaume J. Charmes (creack) on the initial work of the
-TarSum calculation.
-
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_test.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_test.go
deleted file mode 100644
index 86df0e2b89..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/tarsum_test.go
+++ /dev/null
@@ -1,664 +0,0 @@
-package tarsum
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"crypto/md5"
-	"crypto/rand"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"encoding/hex"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-)
-
-type testLayer struct {
-	filename string
-	options  *sizedOptions
-	jsonfile string
-	gzip     bool
-	tarsum   string
-	version  Version
-	hash     THash
-}
-
-var testLayers = []testLayer{
-	{
-		filename: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar",
-		jsonfile: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json",
-		version:  Version0,
-		tarsum:   "tarsum+sha256:4095cc12fa5fdb1ab2760377e1cd0c4ecdd3e61b4f9b82319d96fcea6c9a41c6"},
-	{
-		filename: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar",
-		jsonfile: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json",
-		version:  VersionDev,
-		tarsum:   "tarsum.dev+sha256:db56e35eec6ce65ba1588c20ba6b1ea23743b59e81fb6b7f358ccbde5580345c"},
-	{
-		filename: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar",
-		jsonfile: "testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json",
-		gzip:     true,
-		tarsum:   "tarsum+sha256:4095cc12fa5fdb1ab2760377e1cd0c4ecdd3e61b4f9b82319d96fcea6c9a41c6"},
-	{
-		// Tests existing version of TarSum when xattrs are present
-		filename: "testdata/xattr/layer.tar",
-		jsonfile: "testdata/xattr/json",
-		version:  Version0,
-		tarsum:   "tarsum+sha256:07e304a8dbcb215b37649fde1a699f8aeea47e60815707f1cdf4d55d25ff6ab4"},
-	{
-		// Tests next version of TarSum when xattrs are present
-		filename: "testdata/xattr/layer.tar",
-		jsonfile: "testdata/xattr/json",
-		version:  VersionDev,
-		tarsum:   "tarsum.dev+sha256:6c58917892d77b3b357b0f9ad1e28e1f4ae4de3a8006bd3beb8beda214d8fd16"},
-	{
-		filename: "testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar",
-		jsonfile: "testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json",
-		tarsum:   "tarsum+sha256:c66bd5ec9f87b8f4c6135ca37684618f486a3dd1d113b138d0a177bfa39c2571"},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+sha256:8bf12d7e67c51ee2e8306cba569398b1b9f419969521a12ffb9d8875e8836738"},
-	{
-		// this tar has two files with the same path
-		filename: "testdata/collision/collision-0.tar",
-		tarsum:   "tarsum+sha256:08653904a68d3ab5c59e65ef58c49c1581caa3c34744f8d354b3f575ea04424a"},
-	{
-		// this tar has the same two files (with the same path), but reversed order. ensuring is has different hash than above
-		filename: "testdata/collision/collision-1.tar",
-		tarsum:   "tarsum+sha256:b51c13fbefe158b5ce420d2b930eef54c5cd55c50a2ee4abdddea8fa9f081e0d"},
-	{
-		// this tar has newer of collider-0.tar, ensuring is has different hash
-		filename: "testdata/collision/collision-2.tar",
-		tarsum:   "tarsum+sha256:381547080919bb82691e995508ae20ed33ce0f6948d41cafbeb70ce20c73ee8e"},
-	{
-		// this tar has newer of collider-1.tar, ensuring is has different hash
-		filename: "testdata/collision/collision-3.tar",
-		tarsum:   "tarsum+sha256:f886e431c08143164a676805205979cd8fa535dfcef714db5515650eea5a7c0f"},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+md5:0d7529ec7a8360155b48134b8e599f53",
-		hash:    md5THash,
-	},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+sha1:f1fee39c5925807ff75ef1925e7a23be444ba4df",
-		hash:    sha1Hash,
-	},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+sha224:6319390c0b061d639085d8748b14cd55f697cf9313805218b21cf61c",
-		hash:    sha224Hash,
-	},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+sha384:a578ce3ce29a2ae03b8ed7c26f47d0f75b4fc849557c62454be4b5ffd66ba021e713b48ce71e947b43aab57afd5a7636",
-		hash:    sha384Hash,
-	},
-	{
-		options: &sizedOptions{1, 1024 * 1024, false, false}, // a 1mb file (in memory)
-		tarsum:  "tarsum+sha512:e9bfb90ca5a4dfc93c46ee061a5cf9837de6d2fdf82544d6460d3147290aecfabf7b5e415b9b6e72db9b8941f149d5d69fb17a394cbfaf2eac523bd9eae21855",
-		hash:    sha512Hash,
-	},
-}
-
-type sizedOptions struct {
-	num      int64
-	size     int64
-	isRand   bool
-	realFile bool
-}
-
-// make a tar:
-// * num is the number of files the tar should have
-// * size is the bytes per file
-// * isRand is whether the contents of the files should be a random chunk (otherwise it's all zeros)
-// * realFile will write to a TempFile, instead of an in memory buffer
-func sizedTar(opts sizedOptions) io.Reader {
-	var (
-		fh  io.ReadWriter
-		err error
-	)
-	if opts.realFile {
-		fh, err = ioutil.TempFile("", "tarsum")
-		if err != nil {
-			return nil
-		}
-	} else {
-		fh = bytes.NewBuffer([]byte{})
-	}
-	tarW := tar.NewWriter(fh)
-	defer tarW.Close()
-	for i := int64(0); i < opts.num; i++ {
-		err := tarW.WriteHeader(&tar.Header{
-			Name: fmt.Sprintf("/testdata%d", i),
-			Mode: 0755,
-			Uid:  0,
-			Gid:  0,
-			Size: opts.size,
-		})
-		if err != nil {
-			return nil
-		}
-		var rBuf []byte
-		if opts.isRand {
-			rBuf = make([]byte, 8)
-			_, err = rand.Read(rBuf)
-			if err != nil {
-				return nil
-			}
-		} else {
-			rBuf = []byte{0, 0, 0, 0, 0, 0, 0, 0}
-		}
-
-		for i := int64(0); i < opts.size/int64(8); i++ {
-			tarW.Write(rBuf)
-		}
-	}
-	return fh
-}
-
-func emptyTarSum(gzip bool) (TarSum, error) {
-	reader, writer := io.Pipe()
-	tarWriter := tar.NewWriter(writer)
-
-	// Immediately close tarWriter and write-end of the
-	// Pipe in a separate goroutine so we don't block.
-	go func() {
-		tarWriter.Close()
-		writer.Close()
-	}()
-
-	return NewTarSum(reader, !gzip, Version0)
-}
-
-// Test errors on NewTarsumForLabel
-func TestNewTarSumForLabelInvalid(t *testing.T) {
-	reader := strings.NewReader("")
-
-	if _, err := NewTarSumForLabel(reader, true, "invalidlabel"); err == nil {
-		t.Fatalf("Expected an error, got nothing.")
-	}
-
-	if _, err := NewTarSumForLabel(reader, true, "invalid+sha256"); err == nil {
-		t.Fatalf("Expected an error, got nothing.")
-	}
-	if _, err := NewTarSumForLabel(reader, true, "tarsum.v1+invalid"); err == nil {
-		t.Fatalf("Expected an error, got nothing.")
-	}
-}
-
-func TestNewTarSumForLabel(t *testing.T) {
-
-	layer := testLayers[0]
-
-	reader, err := os.Open(layer.filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer reader.Close()
-
-	label := strings.Split(layer.tarsum, ":")[0]
-	ts, err := NewTarSumForLabel(reader, false, label)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Make sure it actually worked by reading a little bit of it
-	nbByteToRead := 8 * 1024
-	dBuf := make([]byte, nbByteToRead)
-	_, err = ts.Read(dBuf)
-	if err != nil {
-		t.Errorf("failed to read %vKB from %s: %s", nbByteToRead, layer.filename, err)
-	}
-}
-
-// TestEmptyTar tests that tarsum does not fail to read an empty tar
-// and correctly returns the hex digest of an empty hash.
-func TestEmptyTar(t *testing.T) {
-	// Test without gzip.
-	ts, err := emptyTarSum(false)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	zeroBlock := make([]byte, 1024)
-	buf := new(bytes.Buffer)
-
-	n, err := io.Copy(buf, ts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n != int64(len(zeroBlock)) || !bytes.Equal(buf.Bytes(), zeroBlock) {
-		t.Fatalf("tarSum did not write the correct number of zeroed bytes: %d", n)
-	}
-
-	expectedSum := ts.Version().String() + "+sha256:" + hex.EncodeToString(sha256.New().Sum(nil))
-	resultSum := ts.Sum(nil)
-
-	if resultSum != expectedSum {
-		t.Fatalf("expected [%s] but got [%s]", expectedSum, resultSum)
-	}
-
-	// Test with gzip.
-	ts, err = emptyTarSum(true)
-	if err != nil {
-		t.Fatal(err)
-	}
-	buf.Reset()
-
-	n, err = io.Copy(buf, ts)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	bufgz := new(bytes.Buffer)
-	gz := gzip.NewWriter(bufgz)
-	n, err = io.Copy(gz, bytes.NewBuffer(zeroBlock))
-	gz.Close()
-	gzBytes := bufgz.Bytes()
-
-	if n != int64(len(zeroBlock)) || !bytes.Equal(buf.Bytes(), gzBytes) {
-		t.Fatalf("tarSum did not write the correct number of gzipped-zeroed bytes: %d", n)
-	}
-
-	resultSum = ts.Sum(nil)
-
-	if resultSum != expectedSum {
-		t.Fatalf("expected [%s] but got [%s]", expectedSum, resultSum)
-	}
-
-	// Test without ever actually writing anything.
-	if ts, err = NewTarSum(bytes.NewReader([]byte{}), true, Version0); err != nil {
-		t.Fatal(err)
-	}
-
-	resultSum = ts.Sum(nil)
-
-	if resultSum != expectedSum {
-		t.Fatalf("expected [%s] but got [%s]", expectedSum, resultSum)
-	}
-}
-
-var (
-	md5THash   = NewTHash("md5", md5.New)
-	sha1Hash   = NewTHash("sha1", sha1.New)
-	sha224Hash = NewTHash("sha224", sha256.New224)
-	sha384Hash = NewTHash("sha384", sha512.New384)
-	sha512Hash = NewTHash("sha512", sha512.New)
-)
-
-// Test all the build-in read size : buf8K, buf16K, buf32K and more
-func TestTarSumsReadSize(t *testing.T) {
-	// Test always on the same layer (that is big enough)
-	layer := testLayers[0]
-
-	for i := 0; i < 5; i++ {
-
-		reader, err := os.Open(layer.filename)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer reader.Close()
-
-		ts, err := NewTarSum(reader, false, layer.version)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Read and discard bytes so that it populates sums
-		nbByteToRead := (i + 1) * 8 * 1024
-		dBuf := make([]byte, nbByteToRead)
-		_, err = ts.Read(dBuf)
-		if err != nil {
-			t.Errorf("failed to read %vKB from %s: %s", nbByteToRead, layer.filename, err)
-			continue
-		}
-	}
-}
-
-func TestTarSums(t *testing.T) {
-	for _, layer := range testLayers {
-		var (
-			fh  io.Reader
-			err error
-		)
-		if len(layer.filename) > 0 {
-			fh, err = os.Open(layer.filename)
-			if err != nil {
-				t.Errorf("failed to open %s: %s", layer.filename, err)
-				continue
-			}
-		} else if layer.options != nil {
-			fh = sizedTar(*layer.options)
-		} else {
-			// What else is there to test?
-			t.Errorf("what to do with %#v", layer)
-			continue
-		}
-		if file, ok := fh.(*os.File); ok {
-			defer file.Close()
-		}
-
-		var ts TarSum
-		if layer.hash == nil {
-			//                           double negatives!
-			ts, err = NewTarSum(fh, !layer.gzip, layer.version)
-		} else {
-			ts, err = NewTarSumHash(fh, !layer.gzip, layer.version, layer.hash)
-		}
-		if err != nil {
-			t.Errorf("%q :: %q", err, layer.filename)
-			continue
-		}
-
-		// Read variable number of bytes to test dynamic buffer
-		dBuf := make([]byte, 1)
-		_, err = ts.Read(dBuf)
-		if err != nil {
-			t.Errorf("failed to read 1B from %s: %s", layer.filename, err)
-			continue
-		}
-		dBuf = make([]byte, 16*1024)
-		_, err = ts.Read(dBuf)
-		if err != nil {
-			t.Errorf("failed to read 16KB from %s: %s", layer.filename, err)
-			continue
-		}
-
-		// Read and discard remaining bytes
-		_, err = io.Copy(ioutil.Discard, ts)
-		if err != nil {
-			t.Errorf("failed to copy from %s: %s", layer.filename, err)
-			continue
-		}
-		var gotSum string
-		if len(layer.jsonfile) > 0 {
-			jfh, err := os.Open(layer.jsonfile)
-			if err != nil {
-				t.Errorf("failed to open %s: %s", layer.jsonfile, err)
-				continue
-			}
-			defer jfh.Close()
-
-			buf, err := ioutil.ReadAll(jfh)
-			if err != nil {
-				t.Errorf("failed to readAll %s: %s", layer.jsonfile, err)
-				continue
-			}
-			gotSum = ts.Sum(buf)
-		} else {
-			gotSum = ts.Sum(nil)
-		}
-
-		if layer.tarsum != gotSum {
-			t.Errorf("expecting [%s], but got [%s]", layer.tarsum, gotSum)
-		}
-		var expectedHashName string
-		if layer.hash != nil {
-			expectedHashName = layer.hash.Name()
-		} else {
-			expectedHashName = DefaultTHash.Name()
-		}
-		if expectedHashName != ts.Hash().Name() {
-			t.Errorf("expecting hash [%v], but got [%s]", expectedHashName, ts.Hash().Name())
-		}
-	}
-}
-
-func TestIteration(t *testing.T) {
-	headerTests := []struct {
-		expectedSum string // TODO(vbatts) it would be nice to get individual sums of each
-		version     Version
-		hdr         *tar.Header
-		data        []byte
-	}{
-		{
-			"tarsum+sha256:626c4a2e9a467d65c33ae81f7f3dedd4de8ccaee72af73223c4bc4718cbc7bbd",
-			Version0,
-			&tar.Header{
-				Name:     "file.txt",
-				Size:     0,
-				Typeflag: tar.TypeReg,
-				Devminor: 0,
-				Devmajor: 0,
-			},
-			[]byte(""),
-		},
-		{
-			"tarsum.dev+sha256:6ffd43a1573a9913325b4918e124ee982a99c0f3cba90fc032a65f5e20bdd465",
-			VersionDev,
-			&tar.Header{
-				Name:     "file.txt",
-				Size:     0,
-				Typeflag: tar.TypeReg,
-				Devminor: 0,
-				Devmajor: 0,
-			},
-			[]byte(""),
-		},
-		{
-			"tarsum.dev+sha256:b38166c059e11fb77bef30bf16fba7584446e80fcc156ff46d47e36c5305d8ef",
-			VersionDev,
-			&tar.Header{
-				Name:     "another.txt",
-				Uid:      1000,
-				Gid:      1000,
-				Uname:    "slartibartfast",
-				Gname:    "users",
-				Size:     4,
-				Typeflag: tar.TypeReg,
-				Devminor: 0,
-				Devmajor: 0,
-			},
-			[]byte("test"),
-		},
-		{
-			"tarsum.dev+sha256:4cc2e71ac5d31833ab2be9b4f7842a14ce595ec96a37af4ed08f87bc374228cd",
-			VersionDev,
-			&tar.Header{
-				Name:     "xattrs.txt",
-				Uid:      1000,
-				Gid:      1000,
-				Uname:    "slartibartfast",
-				Gname:    "users",
-				Size:     4,
-				Typeflag: tar.TypeReg,
-				Xattrs: map[string]string{
-					"user.key1": "value1",
-					"user.key2": "value2",
-				},
-			},
-			[]byte("test"),
-		},
-		{
-			"tarsum.dev+sha256:65f4284fa32c0d4112dd93c3637697805866415b570587e4fd266af241503760",
-			VersionDev,
-			&tar.Header{
-				Name:     "xattrs.txt",
-				Uid:      1000,
-				Gid:      1000,
-				Uname:    "slartibartfast",
-				Gname:    "users",
-				Size:     4,
-				Typeflag: tar.TypeReg,
-				Xattrs: map[string]string{
-					"user.KEY1": "value1", // adding different case to ensure different sum
-					"user.key2": "value2",
-				},
-			},
-			[]byte("test"),
-		},
-		{
-			"tarsum+sha256:c12bb6f1303a9ddbf4576c52da74973c00d14c109bcfa76b708d5da1154a07fa",
-			Version0,
-			&tar.Header{
-				Name:     "xattrs.txt",
-				Uid:      1000,
-				Gid:      1000,
-				Uname:    "slartibartfast",
-				Gname:    "users",
-				Size:     4,
-				Typeflag: tar.TypeReg,
-				Xattrs: map[string]string{
-					"user.NOT": "CALCULATED",
-				},
-			},
-			[]byte("test"),
-		},
-	}
-	for _, htest := range headerTests {
-		s, err := renderSumForHeader(htest.version, htest.hdr, htest.data)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if s != htest.expectedSum {
-			t.Errorf("expected sum: %q, got: %q", htest.expectedSum, s)
-		}
-	}
-
-}
-
-func renderSumForHeader(v Version, h *tar.Header, data []byte) (string, error) {
-	buf := bytes.NewBuffer(nil)
-	// first build our test tar
-	tw := tar.NewWriter(buf)
-	if err := tw.WriteHeader(h); err != nil {
-		return "", err
-	}
-	if _, err := tw.Write(data); err != nil {
-		return "", err
-	}
-	tw.Close()
-
-	ts, err := NewTarSum(buf, true, v)
-	if err != nil {
-		return "", err
-	}
-	tr := tar.NewReader(ts)
-	for {
-		hdr, err := tr.Next()
-		if hdr == nil || err == io.EOF {
-			// Signals the end of the archive.
-			break
-		}
-		if err != nil {
-			return "", err
-		}
-		if _, err = io.Copy(ioutil.Discard, tr); err != nil {
-			return "", err
-		}
-	}
-	return ts.Sum(nil), nil
-}
-
-func Benchmark9kTar(b *testing.B) {
-	buf := bytes.NewBuffer([]byte{})
-	fh, err := os.Open("testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar")
-	if err != nil {
-		b.Error(err)
-		return
-	}
-	defer fh.Close()
-
-	n, err := io.Copy(buf, fh)
-	if err != nil {
-		b.Error(err)
-		return
-	}
-
-	reader := bytes.NewReader(buf.Bytes())
-
-	b.SetBytes(n)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		reader.Seek(0, 0)
-		ts, err := NewTarSum(reader, true, Version0)
-		if err != nil {
-			b.Error(err)
-			return
-		}
-		io.Copy(ioutil.Discard, ts)
-		ts.Sum(nil)
-	}
-}
-
-func Benchmark9kTarGzip(b *testing.B) {
-	buf := bytes.NewBuffer([]byte{})
-	fh, err := os.Open("testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar")
-	if err != nil {
-		b.Error(err)
-		return
-	}
-	defer fh.Close()
-
-	n, err := io.Copy(buf, fh)
-	if err != nil {
-		b.Error(err)
-		return
-	}
-
-	reader := bytes.NewReader(buf.Bytes())
-
-	b.SetBytes(n)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		reader.Seek(0, 0)
-		ts, err := NewTarSum(reader, false, Version0)
-		if err != nil {
-			b.Error(err)
-			return
-		}
-		io.Copy(ioutil.Discard, ts)
-		ts.Sum(nil)
-	}
-}
-
-// this is a single big file in the tar archive
-func Benchmark1mbSingleFileTar(b *testing.B) {
-	benchmarkTar(b, sizedOptions{1, 1024 * 1024, true, true}, false)
-}
-
-// this is a single big file in the tar archive
-func Benchmark1mbSingleFileTarGzip(b *testing.B) {
-	benchmarkTar(b, sizedOptions{1, 1024 * 1024, true, true}, true)
-}
-
-// this is 1024 1k files in the tar archive
-func Benchmark1kFilesTar(b *testing.B) {
-	benchmarkTar(b, sizedOptions{1024, 1024, true, true}, false)
-}
-
-// this is 1024 1k files in the tar archive
-func Benchmark1kFilesTarGzip(b *testing.B) {
-	benchmarkTar(b, sizedOptions{1024, 1024, true, true}, true)
-}
-
-func benchmarkTar(b *testing.B, opts sizedOptions, isGzip bool) {
-	var fh *os.File
-	tarReader := sizedTar(opts)
-	if br, ok := tarReader.(*os.File); ok {
-		fh = br
-	}
-	defer os.Remove(fh.Name())
-	defer fh.Close()
-
-	b.SetBytes(opts.size * opts.num)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		ts, err := NewTarSum(fh, !isGzip, Version0)
-		if err != nil {
-			b.Error(err)
-			return
-		}
-		io.Copy(ioutil.Discard, ts)
-		ts.Sum(nil)
-		fh.Seek(0, 0)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
deleted file mode 100644
index 48e2af349c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457","parent":"def3f9165934325dfd027c86530b2ea49bb57a0963eb1336b3a0415ff6fd56de","created":"2014-04-07T02:45:52.610504484Z","container":"e0f07f8d72cae171a3dcc35859960e7e956e0628bce6fedc4122bf55b2c287c7","container_config":{"Hostname":"88807319f25e","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/bin/sh","-c","sed -ri 's/^(%wheel.*)(ALL)$/\\1NOPASSWD: \\2/' /etc/sudoers"],"Image":"def3f9165934325dfd027c86530b2ea49bb57a0963eb1336b3a0415ff6fd56de","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":[]},"docker_version":"0.9.1-dev","config":{"Hostname":"88807319f25e","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":null,"Image":"def3f9165934325dfd027c86530b2ea49bb57a0963eb1336b3a0415ff6fd56de","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":[]},"architecture":"amd64","os":"linux","Size":3425}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar
deleted file mode 100644
index dfd5c204ae..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/46af0962ab5afeb5ce6740d4d91652e69206fc991fd5328c1a94d364ad00e457/layer.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
deleted file mode 100644
index af57be01ff..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158","comment":"Imported from -","created":"2013-06-13T14:03:50.821769-07:00","container_config":{"Hostname":"","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":null,"Cmd":null,"Image":"","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":null},"docker_version":"0.4.0","architecture":"x86_64","Size":0}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar
deleted file mode 100644
index 880b3f2c56..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/511136ea3c5a64f264b78b5433614aec563103b4d4702f3ba7d4d2698e22c158/layer.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-0.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-0.tar
deleted file mode 100644
index 1c636b3bc7..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-0.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-1.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-1.tar
deleted file mode 100644
index b411be9785..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-1.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-2.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-2.tar
deleted file mode 100644
index 7b5c04a964..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-2.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-3.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-3.tar
deleted file mode 100644
index f8c64586d2..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/collision/collision-3.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/json b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/json
deleted file mode 100644
index 288441a940..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/json
+++ /dev/null
@@ -1 +0,0 @@
-{"id":"4439c3c7f847954100b42b267e7e5529cac1d6934db082f65795c5ca2e594d93","parent":"73b164f4437db87e96e90083c73a6592f549646ae2ec00ed33c6b9b49a5c4470","created":"2014-05-16T17:19:44.091534414Z","container":"5f92fb06cc58f357f0cde41394e2bbbb664e663974b2ac1693ab07b7a306749b","container_config":{"Hostname":"9565c6517a0e","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"Cpuset":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":["/bin/sh","-c","setcap 'cap_setgid,cap_setuid+ep' ./file \u0026\u0026 getcap ./file"],"Image":"73b164f4437db87e96e90083c73a6592f549646ae2ec00ed33c6b9b49a5c4470","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":[]},"docker_version":"0.11.1-dev","config":{"Hostname":"9565c6517a0e","Domainname":"","User":"","Memory":0,"MemorySwap":0,"CpuShares":0,"Cpuset":"","AttachStdin":false,"AttachStdout":false,"AttachStderr":false,"ExposedPorts":null,"Tty":false,"OpenStdin":false,"StdinOnce":false,"Env":["HOME=/","PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"],"Cmd":null,"Image":"73b164f4437db87e96e90083c73a6592f549646ae2ec00ed33c6b9b49a5c4470","Volumes":null,"WorkingDir":"","Entrypoint":null,"NetworkDisabled":false,"OnBuild":[]},"architecture":"amd64","os":"linux","Size":0}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/layer.tar b/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/layer.tar
deleted file mode 100644
index 819351d42f..0000000000
Binary files a/installer/vendor/github.com/docker/docker/pkg/tarsum/testdata/xattr/layer.tar and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning.go
deleted file mode 100644
index 2882286854..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning.go
+++ /dev/null
@@ -1,150 +0,0 @@
-package tarsum
-
-import (
-	"archive/tar"
-	"errors"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// Version is used for versioning of the TarSum algorithm
-// based on the prefix of the hash used
-// i.e. "tarsum+sha256:e58fcf7418d4390dec8e8fb69d88c06ec07039d651fedd3aa72af9972e7d046b"
-type Version int
-
-// Prefix of "tarsum"
-const (
-	Version0 Version = iota
-	Version1
-	// VersionDev this constant will be either the latest or an unsettled next-version of the TarSum calculation
-	VersionDev
-)
-
-// VersionLabelForChecksum returns the label for the given tarsum
-// checksum, i.e., everything before the first `+` character in
-// the string or an empty string if no label separator is found.
-func VersionLabelForChecksum(checksum string) string {
-	// Checksums are in the form: {versionLabel}+{hashID}:{hex}
-	sepIndex := strings.Index(checksum, "+")
-	if sepIndex < 0 {
-		return ""
-	}
-	return checksum[:sepIndex]
-}
-
-// GetVersions gets a list of all known tarsum versions.
-func GetVersions() []Version {
-	v := []Version{}
-	for k := range tarSumVersions {
-		v = append(v, k)
-	}
-	return v
-}
-
-var (
-	tarSumVersions = map[Version]string{
-		Version0:   "tarsum",
-		Version1:   "tarsum.v1",
-		VersionDev: "tarsum.dev",
-	}
-	tarSumVersionsByName = map[string]Version{
-		"tarsum":     Version0,
-		"tarsum.v1":  Version1,
-		"tarsum.dev": VersionDev,
-	}
-)
-
-func (tsv Version) String() string {
-	return tarSumVersions[tsv]
-}
-
-// GetVersionFromTarsum returns the Version from the provided string.
-func GetVersionFromTarsum(tarsum string) (Version, error) {
-	tsv := tarsum
-	if strings.Contains(tarsum, "+") {
-		tsv = strings.SplitN(tarsum, "+", 2)[0]
-	}
-	for v, s := range tarSumVersions {
-		if s == tsv {
-			return v, nil
-		}
-	}
-	return -1, ErrNotVersion
-}
-
-// Errors that may be returned by functions in this package
-var (
-	ErrNotVersion            = errors.New("string does not include a TarSum Version")
-	ErrVersionNotImplemented = errors.New("TarSum Version is not yet implemented")
-)
-
-// tarHeaderSelector is the interface which different versions
-// of tarsum should use for selecting and ordering tar headers
-// for each item in the archive.
-type tarHeaderSelector interface {
-	selectHeaders(h *tar.Header) (orderedHeaders [][2]string)
-}
-
-type tarHeaderSelectFunc func(h *tar.Header) (orderedHeaders [][2]string)
-
-func (f tarHeaderSelectFunc) selectHeaders(h *tar.Header) (orderedHeaders [][2]string) {
-	return f(h)
-}
-
-func v0TarHeaderSelect(h *tar.Header) (orderedHeaders [][2]string) {
-	return [][2]string{
-		{"name", h.Name},
-		{"mode", strconv.FormatInt(h.Mode, 10)},
-		{"uid", strconv.Itoa(h.Uid)},
-		{"gid", strconv.Itoa(h.Gid)},
-		{"size", strconv.FormatInt(h.Size, 10)},
-		{"mtime", strconv.FormatInt(h.ModTime.UTC().Unix(), 10)},
-		{"typeflag", string([]byte{h.Typeflag})},
-		{"linkname", h.Linkname},
-		{"uname", h.Uname},
-		{"gname", h.Gname},
-		{"devmajor", strconv.FormatInt(h.Devmajor, 10)},
-		{"devminor", strconv.FormatInt(h.Devminor, 10)},
-	}
-}
-
-func v1TarHeaderSelect(h *tar.Header) (orderedHeaders [][2]string) {
-	// Get extended attributes.
-	xAttrKeys := make([]string, len(h.Xattrs))
-	for k := range h.Xattrs {
-		xAttrKeys = append(xAttrKeys, k)
-	}
-	sort.Strings(xAttrKeys)
-
-	// Make the slice with enough capacity to hold the 11 basic headers
-	// we want from the v0 selector plus however many xattrs we have.
-	orderedHeaders = make([][2]string, 0, 11+len(xAttrKeys))
-
-	// Copy all headers from v0 excluding the 'mtime' header (the 5th element).
-	v0headers := v0TarHeaderSelect(h)
-	orderedHeaders = append(orderedHeaders, v0headers[0:5]...)
-	orderedHeaders = append(orderedHeaders, v0headers[6:]...)
-
-	// Finally, append the sorted xattrs.
-	for _, k := range xAttrKeys {
-		orderedHeaders = append(orderedHeaders, [2]string{k, h.Xattrs[k]})
-	}
-
-	return
-}
-
-var registeredHeaderSelectors = map[Version]tarHeaderSelectFunc{
-	Version0:   v0TarHeaderSelect,
-	Version1:   v1TarHeaderSelect,
-	VersionDev: v1TarHeaderSelect,
-}
-
-func getTarHeaderSelector(v Version) (tarHeaderSelector, error) {
-	headerSelector, ok := registeredHeaderSelectors[v]
-	if !ok {
-		return nil, ErrVersionNotImplemented
-	}
-
-	return headerSelector, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning_test.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning_test.go
deleted file mode 100644
index 88e0a5783c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/versioning_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-package tarsum
-
-import (
-	"testing"
-)
-
-func TestVersionLabelForChecksum(t *testing.T) {
-	version := VersionLabelForChecksum("tarsum+sha256:deadbeef")
-	if version != "tarsum" {
-		t.Fatalf("Version should have been 'tarsum', was %v", version)
-	}
-	version = VersionLabelForChecksum("tarsum.v1+sha256:deadbeef")
-	if version != "tarsum.v1" {
-		t.Fatalf("Version should have been 'tarsum.v1', was %v", version)
-	}
-	version = VersionLabelForChecksum("something+somethingelse")
-	if version != "something" {
-		t.Fatalf("Version should have been 'something', was %v", version)
-	}
-	version = VersionLabelForChecksum("invalidChecksum")
-	if version != "" {
-		t.Fatalf("Version should have been empty, was %v", version)
-	}
-}
-
-func TestVersion(t *testing.T) {
-	expected := "tarsum"
-	var v Version
-	if v.String() != expected {
-		t.Errorf("expected %q, got %q", expected, v.String())
-	}
-
-	expected = "tarsum.v1"
-	v = 1
-	if v.String() != expected {
-		t.Errorf("expected %q, got %q", expected, v.String())
-	}
-
-	expected = "tarsum.dev"
-	v = 2
-	if v.String() != expected {
-		t.Errorf("expected %q, got %q", expected, v.String())
-	}
-}
-
-func TestGetVersion(t *testing.T) {
-	testSet := []struct {
-		Str      string
-		Expected Version
-	}{
-		{"tarsum+sha256:e58fcf7418d4390dec8e8fb69d88c06ec07039d651fedd3aa72af9972e7d046b", Version0},
-		{"tarsum+sha256", Version0},
-		{"tarsum", Version0},
-		{"tarsum.dev", VersionDev},
-		{"tarsum.dev+sha256:deadbeef", VersionDev},
-	}
-
-	for _, ts := range testSet {
-		v, err := GetVersionFromTarsum(ts.Str)
-		if err != nil {
-			t.Fatalf("%q : %s", err, ts.Str)
-		}
-		if v != ts.Expected {
-			t.Errorf("expected %d (%q), got %d (%q)", ts.Expected, ts.Expected, v, v)
-		}
-	}
-
-	// test one that does not exist, to ensure it errors
-	str := "weak+md5:abcdeabcde"
-	_, err := GetVersionFromTarsum(str)
-	if err != ErrNotVersion {
-		t.Fatalf("%q : %s", err, str)
-	}
-}
-
-func TestGetVersions(t *testing.T) {
-	expected := []Version{
-		Version0,
-		Version1,
-		VersionDev,
-	}
-	versions := GetVersions()
-	if len(versions) != len(expected) {
-		t.Fatalf("Expected %v versions, got %v", len(expected), len(versions))
-	}
-	if !containsVersion(versions, expected[0]) || !containsVersion(versions, expected[1]) || !containsVersion(versions, expected[2]) {
-		t.Fatalf("Expected [%v], got [%v]", expected, versions)
-	}
-}
-
-func containsVersion(versions []Version, version Version) bool {
-	for _, v := range versions {
-		if v == version {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tarsum/writercloser.go b/installer/vendor/github.com/docker/docker/pkg/tarsum/writercloser.go
deleted file mode 100644
index 9727ecde3e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tarsum/writercloser.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package tarsum
-
-import (
-	"io"
-)
-
-type writeCloseFlusher interface {
-	io.WriteCloser
-	Flush() error
-}
-
-type nopCloseFlusher struct {
-	io.Writer
-}
-
-func (n *nopCloseFlusher) Close() error {
-	return nil
-}
-
-func (n *nopCloseFlusher) Flush() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/ascii.go b/installer/vendor/github.com/docker/docker/pkg/term/ascii.go
deleted file mode 100644
index f5262bccf5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/ascii.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package term
-
-import (
-	"fmt"
-	"strings"
-)
-
-// ASCII list the possible supported ASCII key sequence
-var ASCII = []string{
-	"ctrl-@",
-	"ctrl-a",
-	"ctrl-b",
-	"ctrl-c",
-	"ctrl-d",
-	"ctrl-e",
-	"ctrl-f",
-	"ctrl-g",
-	"ctrl-h",
-	"ctrl-i",
-	"ctrl-j",
-	"ctrl-k",
-	"ctrl-l",
-	"ctrl-m",
-	"ctrl-n",
-	"ctrl-o",
-	"ctrl-p",
-	"ctrl-q",
-	"ctrl-r",
-	"ctrl-s",
-	"ctrl-t",
-	"ctrl-u",
-	"ctrl-v",
-	"ctrl-w",
-	"ctrl-x",
-	"ctrl-y",
-	"ctrl-z",
-	"ctrl-[",
-	"ctrl-\\",
-	"ctrl-]",
-	"ctrl-^",
-	"ctrl-_",
-}
-
-// ToBytes converts a string representing a suite of key-sequence to the corresponding ASCII code.
-func ToBytes(keys string) ([]byte, error) {
-	codes := []byte{}
-next:
-	for _, key := range strings.Split(keys, ",") {
-		if len(key) != 1 {
-			for code, ctrl := range ASCII {
-				if ctrl == key {
-					codes = append(codes, byte(code))
-					continue next
-				}
-			}
-			if key == "DEL" {
-				codes = append(codes, 127)
-			} else {
-				return nil, fmt.Errorf("Unknown character: '%s'", key)
-			}
-		} else {
-			codes = append(codes, byte(key[0]))
-		}
-	}
-	return codes, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/ascii_test.go b/installer/vendor/github.com/docker/docker/pkg/term/ascii_test.go
deleted file mode 100644
index 4a1e7f302c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/ascii_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package term
-
-import "testing"
-
-func TestToBytes(t *testing.T) {
-	codes, err := ToBytes("ctrl-a,a")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(codes) != 2 {
-		t.Fatalf("Expected 2 codes, got %d", len(codes))
-	}
-	if codes[0] != 1 || codes[1] != 97 {
-		t.Fatalf("Expected '1' '97', got '%d' '%d'", codes[0], codes[1])
-	}
-
-	codes, err = ToBytes("shift-z")
-	if err == nil {
-		t.Fatalf("Expected error, got none")
-	}
-
-	codes, err = ToBytes("ctrl-@,ctrl-[,~,ctrl-o")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(codes) != 4 {
-		t.Fatalf("Expected 4 codes, got %d", len(codes))
-	}
-	if codes[0] != 0 || codes[1] != 27 || codes[2] != 126 || codes[3] != 15 {
-		t.Fatalf("Expected '0' '27' '126', '15', got '%d' '%d' '%d' '%d'", codes[0], codes[1], codes[2], codes[3])
-	}
-
-	codes, err = ToBytes("DEL,+")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(codes) != 2 {
-		t.Fatalf("Expected 2 codes, got %d", len(codes))
-	}
-	if codes[0] != 127 || codes[1] != 43 {
-		t.Fatalf("Expected '127 '43'', got '%d' '%d'", codes[0], codes[1])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go b/installer/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
deleted file mode 100644
index 59dac5ba8e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/tc_linux_cgo.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// +build linux,cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// #include <termios.h>
-import "C"
-
-// Termios is the Unix API for terminal I/O.
-// It is passthrough for syscall.Termios in order to make it portable with
-// other platforms where it is not available or handled differently.
-type Termios syscall.Termios
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	C.cfmakeraw((*C.struct_termios)(unsafe.Pointer(&newState)))
-	if err := tcset(fd, &newState); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcgetattr(C.int(fd), (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcsetattr(C.int(fd), C.TCSANOW, (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/tc_other.go b/installer/vendor/github.com/docker/docker/pkg/term/tc_other.go
deleted file mode 100644
index 750d7c3f60..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/tc_other.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// +build !windows
-// +build !linux !cgo
-// +build !solaris !cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(p)))
-	return err
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(p)))
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go b/installer/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go
deleted file mode 100644
index c9139d0ca8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/tc_solaris_cgo.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build solaris,cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// #include <termios.h>
-import "C"
-
-// Termios is the Unix API for terminal I/O.
-// It is passthrough for syscall.Termios in order to make it portable with
-// other platforms where it is not available or handled differently.
-type Termios syscall.Termios
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON | syscall.IXANY)
-	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)
-	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)
-	newState.Cflag |= syscall.CS8
-
-	/*
-		VMIN is the minimum number of characters that needs to be read in non-canonical mode for it to be returned
-		Since VMIN is overloaded with another element in canonical mode when we switch modes it defaults to 4. It
-		needs to be explicitly set to 1.
-	*/
-	newState.Cc[C.VMIN] = 1
-	newState.Cc[C.VTIME] = 0
-
-	if err := tcset(fd, &newState); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
-
-func tcget(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcgetattr(C.int(fd), (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
-
-func tcset(fd uintptr, p *Termios) syscall.Errno {
-	ret, err := C.tcsetattr(C.int(fd), C.TCSANOW, (*C.struct_termios)(unsafe.Pointer(p)))
-	if ret != 0 {
-		return err.(syscall.Errno)
-	}
-	return 0
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/term.go b/installer/vendor/github.com/docker/docker/pkg/term/term.go
deleted file mode 100644
index fe59faa949..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/term.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// +build !windows
-
-// Package term provides structures and helper functions to work with
-// terminal (state, sizes).
-package term
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-	"syscall"
-)
-
-var (
-	// ErrInvalidState is returned if the state of the terminal is invalid.
-	ErrInvalidState = errors.New("Invalid terminal state")
-)
-
-// State represents the state of the terminal.
-type State struct {
-	termios Termios
-}
-
-// Winsize represents the size of the terminal window.
-type Winsize struct {
-	Height uint16
-	Width  uint16
-	x      uint16
-	y      uint16
-}
-
-// StdStreams returns the standard streams (stdin, stdout, stedrr).
-func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
-	return os.Stdin, os.Stdout, os.Stderr
-}
-
-// GetFdInfo returns the file descriptor for an os.File and indicates whether the file represents a terminal.
-func GetFdInfo(in interface{}) (uintptr, bool) {
-	var inFd uintptr
-	var isTerminalIn bool
-	if file, ok := in.(*os.File); ok {
-		inFd = file.Fd()
-		isTerminalIn = IsTerminal(inFd)
-	}
-	return inFd, isTerminalIn
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd uintptr) bool {
-	var termios Termios
-	return tcget(fd, &termios) == 0
-}
-
-// RestoreTerminal restores the terminal connected to the given file descriptor
-// to a previous state.
-func RestoreTerminal(fd uintptr, state *State) error {
-	if state == nil {
-		return ErrInvalidState
-	}
-	if err := tcset(fd, &state.termios); err != 0 {
-		return err
-	}
-	return nil
-}
-
-// SaveState saves the state of the terminal connected to the given file descriptor.
-func SaveState(fd uintptr) (*State, error) {
-	var oldState State
-	if err := tcget(fd, &oldState.termios); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
-
-// DisableEcho applies the specified state to the terminal connected to the file
-// descriptor, with echo disabled.
-func DisableEcho(fd uintptr, state *State) error {
-	newState := state.termios
-	newState.Lflag &^= syscall.ECHO
-
-	if err := tcset(fd, &newState); err != 0 {
-		return err
-	}
-	handleInterrupt(fd, state)
-	return nil
-}
-
-// SetRawTerminal puts the terminal connected to the given file descriptor into
-// raw mode and returns the previous state. On UNIX, this puts both the input
-// and output into raw mode. On Windows, it only puts the input into raw mode.
-func SetRawTerminal(fd uintptr) (*State, error) {
-	oldState, err := MakeRaw(fd)
-	if err != nil {
-		return nil, err
-	}
-	handleInterrupt(fd, oldState)
-	return oldState, err
-}
-
-// SetRawTerminalOutput puts the output of terminal connected to the given file
-// descriptor into raw mode. On UNIX, this does nothing and returns nil for the
-// state. On Windows, it disables LF -> CRLF translation.
-func SetRawTerminalOutput(fd uintptr) (*State, error) {
-	return nil, nil
-}
-
-func handleInterrupt(fd uintptr, state *State) {
-	sigchan := make(chan os.Signal, 1)
-	signal.Notify(sigchan, os.Interrupt)
-	go func() {
-		for range sigchan {
-			// quit cleanly and the new terminal item is on a new line
-			fmt.Println()
-			signal.Stop(sigchan)
-			close(sigchan)
-			RestoreTerminal(fd, state)
-			os.Exit(1)
-		}
-	}()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/term_solaris.go b/installer/vendor/github.com/docker/docker/pkg/term/term_solaris.go
deleted file mode 100644
index 112debbec5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/term_solaris.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// +build solaris
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-/*
-#include <unistd.h>
-#include <stropts.h>
-#include <termios.h>
-
-// Small wrapper to get rid of variadic args of ioctl()
-int my_ioctl(int fd, int cmd, struct winsize *ws) {
-	return ioctl(fd, cmd, ws);
-}
-*/
-import "C"
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	ws := &Winsize{}
-	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCGWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))
-	// Skip retval = 0
-	if ret == 0 {
-		return ws, nil
-	}
-	return ws, err
-}
-
-// SetWinsize tries to set the specified window size for the specified file descriptor.
-func SetWinsize(fd uintptr, ws *Winsize) error {
-	ret, err := C.my_ioctl(C.int(fd), C.int(syscall.TIOCSWINSZ), (*C.struct_winsize)(unsafe.Pointer(ws)))
-	// Skip retval = 0
-	if ret == 0 {
-		return nil
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/term_unix.go b/installer/vendor/github.com/docker/docker/pkg/term/term_unix.go
deleted file mode 100644
index ddf87a0e58..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/term_unix.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// +build !solaris,!windows
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	ws := &Winsize{}
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(ws)))
-	// Skipp errno = 0
-	if err == 0 {
-		return ws, nil
-	}
-	return ws, err
-}
-
-// SetWinsize tries to set the specified window size for the specified file descriptor.
-func SetWinsize(fd uintptr, ws *Winsize) error {
-	_, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(syscall.TIOCSWINSZ), uintptr(unsafe.Pointer(ws)))
-	// Skipp errno = 0
-	if err == 0 {
-		return nil
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/term_windows.go b/installer/vendor/github.com/docker/docker/pkg/term/term_windows.go
deleted file mode 100644
index a91f07e482..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/term_windows.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// +build windows
-
-package term
-
-import (
-	"io"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/Azure/go-ansiterm/winterm"
-	"github.com/docker/docker/pkg/term/windows"
-)
-
-// State holds the console mode for the terminal.
-type State struct {
-	mode uint32
-}
-
-// Winsize is used for window size.
-type Winsize struct {
-	Height uint16
-	Width  uint16
-}
-
-const (
-	// https://msdn.microsoft.com/en-us/library/windows/desktop/ms683167(v=vs.85).aspx
-	enableVirtualTerminalInput      = 0x0200
-	enableVirtualTerminalProcessing = 0x0004
-	disableNewlineAutoReturn        = 0x0008
-)
-
-// vtInputSupported is true if enableVirtualTerminalInput is supported by the console
-var vtInputSupported bool
-
-// StdStreams returns the standard streams (stdin, stdout, stedrr).
-func StdStreams() (stdIn io.ReadCloser, stdOut, stdErr io.Writer) {
-	// Turn on VT handling on all std handles, if possible. This might
-	// fail, in which case we will fall back to terminal emulation.
-	var emulateStdin, emulateStdout, emulateStderr bool
-	fd := os.Stdin.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate that enableVirtualTerminalInput is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalInput); err != nil {
-			emulateStdin = true
-		} else {
-			vtInputSupported = true
-		}
-		// Unconditionally set the console mode back even on failure because SetConsoleMode
-		// remembers invalid bits on input handles.
-		winterm.SetConsoleMode(fd, mode)
-	}
-
-	fd = os.Stdout.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate disableNewlineAutoReturn is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing|disableNewlineAutoReturn); err != nil {
-			emulateStdout = true
-		} else {
-			winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing)
-		}
-	}
-
-	fd = os.Stderr.Fd()
-	if mode, err := winterm.GetConsoleMode(fd); err == nil {
-		// Validate disableNewlineAutoReturn is supported, but do not set it.
-		if err = winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing|disableNewlineAutoReturn); err != nil {
-			emulateStderr = true
-		} else {
-			winterm.SetConsoleMode(fd, mode|enableVirtualTerminalProcessing)
-		}
-	}
-
-	if os.Getenv("ConEmuANSI") == "ON" || os.Getenv("ConsoleZVersion") != "" {
-		// The ConEmu and ConsoleZ terminals emulate ANSI on output streams well.
-		emulateStdin = true
-		emulateStdout = false
-		emulateStderr = false
-	}
-
-	if emulateStdin {
-		stdIn = windows.NewAnsiReader(syscall.STD_INPUT_HANDLE)
-	} else {
-		stdIn = os.Stdin
-	}
-
-	if emulateStdout {
-		stdOut = windows.NewAnsiWriter(syscall.STD_OUTPUT_HANDLE)
-	} else {
-		stdOut = os.Stdout
-	}
-
-	if emulateStderr {
-		stdErr = windows.NewAnsiWriter(syscall.STD_ERROR_HANDLE)
-	} else {
-		stdErr = os.Stderr
-	}
-
-	return
-}
-
-// GetFdInfo returns the file descriptor for an os.File and indicates whether the file represents a terminal.
-func GetFdInfo(in interface{}) (uintptr, bool) {
-	return windows.GetHandleInfo(in)
-}
-
-// GetWinsize returns the window size based on the specified file descriptor.
-func GetWinsize(fd uintptr) (*Winsize, error) {
-	info, err := winterm.GetConsoleScreenBufferInfo(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	winsize := &Winsize{
-		Width:  uint16(info.Window.Right - info.Window.Left + 1),
-		Height: uint16(info.Window.Bottom - info.Window.Top + 1),
-	}
-
-	return winsize, nil
-}
-
-// IsTerminal returns true if the given file descriptor is a terminal.
-func IsTerminal(fd uintptr) bool {
-	return windows.IsConsole(fd)
-}
-
-// RestoreTerminal restores the terminal connected to the given file descriptor
-// to a previous state.
-func RestoreTerminal(fd uintptr, state *State) error {
-	return winterm.SetConsoleMode(fd, state.mode)
-}
-
-// SaveState saves the state of the terminal connected to the given file descriptor.
-func SaveState(fd uintptr) (*State, error) {
-	mode, e := winterm.GetConsoleMode(fd)
-	if e != nil {
-		return nil, e
-	}
-
-	return &State{mode: mode}, nil
-}
-
-// DisableEcho disables echo for the terminal connected to the given file descriptor.
-// -- See https://msdn.microsoft.com/en-us/library/windows/desktop/ms683462(v=vs.85).aspx
-func DisableEcho(fd uintptr, state *State) error {
-	mode := state.mode
-	mode &^= winterm.ENABLE_ECHO_INPUT
-	mode |= winterm.ENABLE_PROCESSED_INPUT | winterm.ENABLE_LINE_INPUT
-	err := winterm.SetConsoleMode(fd, mode)
-	if err != nil {
-		return err
-	}
-
-	// Register an interrupt handler to catch and restore prior state
-	restoreAtInterrupt(fd, state)
-	return nil
-}
-
-// SetRawTerminal puts the terminal connected to the given file descriptor into
-// raw mode and returns the previous state. On UNIX, this puts both the input
-// and output into raw mode. On Windows, it only puts the input into raw mode.
-func SetRawTerminal(fd uintptr) (*State, error) {
-	state, err := MakeRaw(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	// Register an interrupt handler to catch and restore prior state
-	restoreAtInterrupt(fd, state)
-	return state, err
-}
-
-// SetRawTerminalOutput puts the output of terminal connected to the given file
-// descriptor into raw mode. On UNIX, this does nothing and returns nil for the
-// state. On Windows, it disables LF -> CRLF translation.
-func SetRawTerminalOutput(fd uintptr) (*State, error) {
-	state, err := SaveState(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	// Ignore failures, since disableNewlineAutoReturn might not be supported on this
-	// version of Windows.
-	winterm.SetConsoleMode(fd, state.mode|disableNewlineAutoReturn)
-	return state, err
-}
-
-// MakeRaw puts the terminal (Windows Console) connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	state, err := SaveState(fd)
-	if err != nil {
-		return nil, err
-	}
-
-	mode := state.mode
-
-	// See
-	// -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms686033(v=vs.85).aspx
-	// -- https://msdn.microsoft.com/en-us/library/windows/desktop/ms683462(v=vs.85).aspx
-
-	// Disable these modes
-	mode &^= winterm.ENABLE_ECHO_INPUT
-	mode &^= winterm.ENABLE_LINE_INPUT
-	mode &^= winterm.ENABLE_MOUSE_INPUT
-	mode &^= winterm.ENABLE_WINDOW_INPUT
-	mode &^= winterm.ENABLE_PROCESSED_INPUT
-
-	// Enable these modes
-	mode |= winterm.ENABLE_EXTENDED_FLAGS
-	mode |= winterm.ENABLE_INSERT_MODE
-	mode |= winterm.ENABLE_QUICK_EDIT_MODE
-	if vtInputSupported {
-		mode |= enableVirtualTerminalInput
-	}
-
-	err = winterm.SetConsoleMode(fd, mode)
-	if err != nil {
-		return nil, err
-	}
-	return state, nil
-}
-
-func restoreAtInterrupt(fd uintptr, state *State) {
-	sigchan := make(chan os.Signal, 1)
-	signal.Notify(sigchan, os.Interrupt)
-
-	go func() {
-		_ = <-sigchan
-		RestoreTerminal(fd, state)
-		os.Exit(0)
-	}()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/termios_darwin.go b/installer/vendor/github.com/docker/docker/pkg/term/termios_darwin.go
deleted file mode 100644
index 480db900ac..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/termios_darwin.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint64
-	Oflag  uint64
-	Cflag  uint64
-	Lflag  uint64
-	Cc     [20]byte
-	Ispeed uint64
-	Ospeed uint64
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go b/installer/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
deleted file mode 100644
index ed843ad69c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/termios_freebsd.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/termios_linux.go b/installer/vendor/github.com/docker/docker/pkg/term/termios_linux.go
deleted file mode 100644
index 22921b6aef..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/termios_linux.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build !cgo
-
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TCGETS
-	setTermios = syscall.TCSETS
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, getTermios, uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-
-	newState.Iflag &^= (syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON)
-	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= (syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN)
-	newState.Cflag &^= (syscall.CSIZE | syscall.PARENB)
-	newState.Cflag |= syscall.CS8
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, setTermios, uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-	return &oldState, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go b/installer/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go
deleted file mode 100644
index ed843ad69c..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/termios_openbsd.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package term
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	getTermios = syscall.TIOCGETA
-	setTermios = syscall.TIOCSETA
-)
-
-// Termios magic numbers, passthrough to the ones defined in syscall.
-const (
-	IGNBRK = syscall.IGNBRK
-	PARMRK = syscall.PARMRK
-	INLCR  = syscall.INLCR
-	IGNCR  = syscall.IGNCR
-	ECHONL = syscall.ECHONL
-	CSIZE  = syscall.CSIZE
-	ICRNL  = syscall.ICRNL
-	ISTRIP = syscall.ISTRIP
-	PARENB = syscall.PARENB
-	ECHO   = syscall.ECHO
-	ICANON = syscall.ICANON
-	ISIG   = syscall.ISIG
-	IXON   = syscall.IXON
-	BRKINT = syscall.BRKINT
-	INPCK  = syscall.INPCK
-	OPOST  = syscall.OPOST
-	CS8    = syscall.CS8
-	IEXTEN = syscall.IEXTEN
-)
-
-// Termios is the Unix API for terminal I/O.
-type Termios struct {
-	Iflag  uint32
-	Oflag  uint32
-	Cflag  uint32
-	Lflag  uint32
-	Cc     [20]byte
-	Ispeed uint32
-	Ospeed uint32
-}
-
-// MakeRaw put the terminal connected to the given file descriptor into raw
-// mode and returns the previous state of the terminal so that it can be
-// restored.
-func MakeRaw(fd uintptr) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(getTermios), uintptr(unsafe.Pointer(&oldState.termios))); err != 0 {
-		return nil, err
-	}
-
-	newState := oldState.termios
-	newState.Iflag &^= (IGNBRK | BRKINT | PARMRK | ISTRIP | INLCR | IGNCR | ICRNL | IXON)
-	newState.Oflag &^= OPOST
-	newState.Lflag &^= (ECHO | ECHONL | ICANON | ISIG | IEXTEN)
-	newState.Cflag &^= (CSIZE | PARENB)
-	newState.Cflag |= CS8
-	newState.Cc[syscall.VMIN] = 1
-	newState.Cc[syscall.VTIME] = 0
-
-	if _, _, err := syscall.Syscall(syscall.SYS_IOCTL, fd, uintptr(setTermios), uintptr(unsafe.Pointer(&newState))); err != 0 {
-		return nil, err
-	}
-
-	return &oldState, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go b/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go
deleted file mode 100644
index cb0b88356d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_reader.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"unsafe"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-const (
-	escapeSequence = ansiterm.KEY_ESC_CSI
-)
-
-// ansiReader wraps a standard input file (e.g., os.Stdin) providing ANSI sequence translation.
-type ansiReader struct {
-	file     *os.File
-	fd       uintptr
-	buffer   []byte
-	cbBuffer int
-	command  []byte
-}
-
-// NewAnsiReader returns an io.ReadCloser that provides VT100 terminal emulation on top of a
-// Windows console input handle.
-func NewAnsiReader(nFile int) io.ReadCloser {
-	initLogger()
-	file, fd := winterm.GetStdFile(nFile)
-	return &ansiReader{
-		file:    file,
-		fd:      fd,
-		command: make([]byte, 0, ansiterm.ANSI_MAX_CMD_LENGTH),
-		buffer:  make([]byte, 0),
-	}
-}
-
-// Close closes the wrapped file.
-func (ar *ansiReader) Close() (err error) {
-	return ar.file.Close()
-}
-
-// Fd returns the file descriptor of the wrapped file.
-func (ar *ansiReader) Fd() uintptr {
-	return ar.fd
-}
-
-// Read reads up to len(p) bytes of translated input events into p.
-func (ar *ansiReader) Read(p []byte) (int, error) {
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	// Previously read bytes exist, read as much as we can and return
-	if len(ar.buffer) > 0 {
-		logger.Debugf("Reading previously cached bytes")
-
-		originalLength := len(ar.buffer)
-		copiedLength := copy(p, ar.buffer)
-
-		if copiedLength == originalLength {
-			ar.buffer = make([]byte, 0, len(p))
-		} else {
-			ar.buffer = ar.buffer[copiedLength:]
-		}
-
-		logger.Debugf("Read from cache p[%d]: % x", copiedLength, p)
-		return copiedLength, nil
-	}
-
-	// Read and translate key events
-	events, err := readInputEvents(ar.fd, len(p))
-	if err != nil {
-		return 0, err
-	} else if len(events) == 0 {
-		logger.Debug("No input events detected")
-		return 0, nil
-	}
-
-	keyBytes := translateKeyEvents(events, []byte(escapeSequence))
-
-	// Save excess bytes and right-size keyBytes
-	if len(keyBytes) > len(p) {
-		logger.Debugf("Received %d keyBytes, only room for %d bytes", len(keyBytes), len(p))
-		ar.buffer = keyBytes[len(p):]
-		keyBytes = keyBytes[:len(p)]
-	} else if len(keyBytes) == 0 {
-		logger.Debug("No key bytes returned from the translator")
-		return 0, nil
-	}
-
-	copiedLength := copy(p, keyBytes)
-	if copiedLength != len(keyBytes) {
-		return 0, errors.New("unexpected copy length encountered")
-	}
-
-	logger.Debugf("Read        p[%d]: % x", copiedLength, p)
-	logger.Debugf("Read keyBytes[%d]: % x", copiedLength, keyBytes)
-	return copiedLength, nil
-}
-
-// readInputEvents polls until at least one event is available.
-func readInputEvents(fd uintptr, maxBytes int) ([]winterm.INPUT_RECORD, error) {
-	// Determine the maximum number of records to retrieve
-	// -- Cast around the type system to obtain the size of a single INPUT_RECORD.
-	//    unsafe.Sizeof requires an expression vs. a type-reference; the casting
-	//    tricks the type system into believing it has such an expression.
-	recordSize := int(unsafe.Sizeof(*((*winterm.INPUT_RECORD)(unsafe.Pointer(&maxBytes)))))
-	countRecords := maxBytes / recordSize
-	if countRecords > ansiterm.MAX_INPUT_EVENTS {
-		countRecords = ansiterm.MAX_INPUT_EVENTS
-	} else if countRecords == 0 {
-		countRecords = 1
-	}
-	logger.Debugf("[windows] readInputEvents: Reading %v records (buffer size %v, record size %v)", countRecords, maxBytes, recordSize)
-
-	// Wait for and read input events
-	events := make([]winterm.INPUT_RECORD, countRecords)
-	nEvents := uint32(0)
-	eventsExist, err := winterm.WaitForSingleObject(fd, winterm.WAIT_INFINITE)
-	if err != nil {
-		return nil, err
-	}
-
-	if eventsExist {
-		err = winterm.ReadConsoleInput(fd, events, &nEvents)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Return a slice restricted to the number of returned records
-	logger.Debugf("[windows] readInputEvents: Read %v events", nEvents)
-	return events[:nEvents], nil
-}
-
-// KeyEvent Translation Helpers
-
-var arrowKeyMapPrefix = map[uint16]string{
-	winterm.VK_UP:    "%s%sA",
-	winterm.VK_DOWN:  "%s%sB",
-	winterm.VK_RIGHT: "%s%sC",
-	winterm.VK_LEFT:  "%s%sD",
-}
-
-var keyMapPrefix = map[uint16]string{
-	winterm.VK_UP:     "\x1B[%sA",
-	winterm.VK_DOWN:   "\x1B[%sB",
-	winterm.VK_RIGHT:  "\x1B[%sC",
-	winterm.VK_LEFT:   "\x1B[%sD",
-	winterm.VK_HOME:   "\x1B[1%s~", // showkey shows ^[[1
-	winterm.VK_END:    "\x1B[4%s~", // showkey shows ^[[4
-	winterm.VK_INSERT: "\x1B[2%s~",
-	winterm.VK_DELETE: "\x1B[3%s~",
-	winterm.VK_PRIOR:  "\x1B[5%s~",
-	winterm.VK_NEXT:   "\x1B[6%s~",
-	winterm.VK_F1:     "",
-	winterm.VK_F2:     "",
-	winterm.VK_F3:     "\x1B[13%s~",
-	winterm.VK_F4:     "\x1B[14%s~",
-	winterm.VK_F5:     "\x1B[15%s~",
-	winterm.VK_F6:     "\x1B[17%s~",
-	winterm.VK_F7:     "\x1B[18%s~",
-	winterm.VK_F8:     "\x1B[19%s~",
-	winterm.VK_F9:     "\x1B[20%s~",
-	winterm.VK_F10:    "\x1B[21%s~",
-	winterm.VK_F11:    "\x1B[23%s~",
-	winterm.VK_F12:    "\x1B[24%s~",
-}
-
-// translateKeyEvents converts the input events into the appropriate ANSI string.
-func translateKeyEvents(events []winterm.INPUT_RECORD, escapeSequence []byte) []byte {
-	var buffer bytes.Buffer
-	for _, event := range events {
-		if event.EventType == winterm.KEY_EVENT && event.KeyEvent.KeyDown != 0 {
-			buffer.WriteString(keyToString(&event.KeyEvent, escapeSequence))
-		}
-	}
-
-	return buffer.Bytes()
-}
-
-// keyToString maps the given input event record to the corresponding string.
-func keyToString(keyEvent *winterm.KEY_EVENT_RECORD, escapeSequence []byte) string {
-	if keyEvent.UnicodeChar == 0 {
-		return formatVirtualKey(keyEvent.VirtualKeyCode, keyEvent.ControlKeyState, escapeSequence)
-	}
-
-	_, alt, control := getControlKeys(keyEvent.ControlKeyState)
-	if control {
-		// TODO(azlinux): Implement following control sequences
-		// <Ctrl>-D  Signals the end of input from the keyboard; also exits current shell.
-		// <Ctrl>-H  Deletes the first character to the left of the cursor. Also called the ERASE key.
-		// <Ctrl>-Q  Restarts printing after it has been stopped with <Ctrl>-s.
-		// <Ctrl>-S  Suspends printing on the screen (does not stop the program).
-		// <Ctrl>-U  Deletes all characters on the current line. Also called the KILL key.
-		// <Ctrl>-E  Quits current command and creates a core
-
-	}
-
-	// <Alt>+Key generates ESC N Key
-	if !control && alt {
-		return ansiterm.KEY_ESC_N + strings.ToLower(string(keyEvent.UnicodeChar))
-	}
-
-	return string(keyEvent.UnicodeChar)
-}
-
-// formatVirtualKey converts a virtual key (e.g., up arrow) into the appropriate ANSI string.
-func formatVirtualKey(key uint16, controlState uint32, escapeSequence []byte) string {
-	shift, alt, control := getControlKeys(controlState)
-	modifier := getControlKeysModifier(shift, alt, control)
-
-	if format, ok := arrowKeyMapPrefix[key]; ok {
-		return fmt.Sprintf(format, escapeSequence, modifier)
-	}
-
-	if format, ok := keyMapPrefix[key]; ok {
-		return fmt.Sprintf(format, modifier)
-	}
-
-	return ""
-}
-
-// getControlKeys extracts the shift, alt, and ctrl key states.
-func getControlKeys(controlState uint32) (shift, alt, control bool) {
-	shift = 0 != (controlState & winterm.SHIFT_PRESSED)
-	alt = 0 != (controlState & (winterm.LEFT_ALT_PRESSED | winterm.RIGHT_ALT_PRESSED))
-	control = 0 != (controlState & (winterm.LEFT_CTRL_PRESSED | winterm.RIGHT_CTRL_PRESSED))
-	return shift, alt, control
-}
-
-// getControlKeysModifier returns the ANSI modifier for the given combination of control keys.
-func getControlKeysModifier(shift, alt, control bool) string {
-	if shift && alt && control {
-		return ansiterm.KEY_CONTROL_PARAM_8
-	}
-	if alt && control {
-		return ansiterm.KEY_CONTROL_PARAM_7
-	}
-	if shift && control {
-		return ansiterm.KEY_CONTROL_PARAM_6
-	}
-	if control {
-		return ansiterm.KEY_CONTROL_PARAM_5
-	}
-	if shift && alt {
-		return ansiterm.KEY_CONTROL_PARAM_4
-	}
-	if alt {
-		return ansiterm.KEY_CONTROL_PARAM_3
-	}
-	if shift {
-		return ansiterm.KEY_CONTROL_PARAM_2
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go b/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go
deleted file mode 100644
index a3ce5697d9..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/windows/ansi_writer.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"io"
-	"os"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-// ansiWriter wraps a standard output file (e.g., os.Stdout) providing ANSI sequence translation.
-type ansiWriter struct {
-	file           *os.File
-	fd             uintptr
-	infoReset      *winterm.CONSOLE_SCREEN_BUFFER_INFO
-	command        []byte
-	escapeSequence []byte
-	inAnsiSequence bool
-	parser         *ansiterm.AnsiParser
-}
-
-// NewAnsiWriter returns an io.Writer that provides VT100 terminal emulation on top of a
-// Windows console output handle.
-func NewAnsiWriter(nFile int) io.Writer {
-	initLogger()
-	file, fd := winterm.GetStdFile(nFile)
-	info, err := winterm.GetConsoleScreenBufferInfo(fd)
-	if err != nil {
-		return nil
-	}
-
-	parser := ansiterm.CreateParser("Ground", winterm.CreateWinEventHandler(fd, file))
-	logger.Infof("newAnsiWriter: parser %p", parser)
-
-	aw := &ansiWriter{
-		file:           file,
-		fd:             fd,
-		infoReset:      info,
-		command:        make([]byte, 0, ansiterm.ANSI_MAX_CMD_LENGTH),
-		escapeSequence: []byte(ansiterm.KEY_ESC_CSI),
-		parser:         parser,
-	}
-
-	logger.Infof("newAnsiWriter: aw.parser %p", aw.parser)
-	logger.Infof("newAnsiWriter: %v", aw)
-	return aw
-}
-
-func (aw *ansiWriter) Fd() uintptr {
-	return aw.fd
-}
-
-// Write writes len(p) bytes from p to the underlying data stream.
-func (aw *ansiWriter) Write(p []byte) (total int, err error) {
-	if len(p) == 0 {
-		return 0, nil
-	}
-
-	logger.Infof("Write: % x", p)
-	logger.Infof("Write: %s", string(p))
-	return aw.parser.Parse(p)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/windows/console.go b/installer/vendor/github.com/docker/docker/pkg/term/windows/console.go
deleted file mode 100644
index ca5c3b2e53..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/windows/console.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build windows
-
-package windows
-
-import (
-	"os"
-
-	"github.com/Azure/go-ansiterm/winterm"
-)
-
-// GetHandleInfo returns file descriptor and bool indicating whether the file is a console.
-func GetHandleInfo(in interface{}) (uintptr, bool) {
-	switch t := in.(type) {
-	case *ansiReader:
-		return t.Fd(), true
-	case *ansiWriter:
-		return t.Fd(), true
-	}
-
-	var inFd uintptr
-	var isTerminal bool
-
-	if file, ok := in.(*os.File); ok {
-		inFd = file.Fd()
-		isTerminal = IsConsole(inFd)
-	}
-	return inFd, isTerminal
-}
-
-// IsConsole returns true if the given file descriptor is a Windows Console.
-// The code assumes that GetConsoleMode will return an error for file descriptors that are not a console.
-func IsConsole(fd uintptr) bool {
-	_, e := winterm.GetConsoleMode(fd)
-	return e == nil
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/windows/windows.go b/installer/vendor/github.com/docker/docker/pkg/term/windows/windows.go
deleted file mode 100644
index ce4cb5990e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/windows/windows.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// These files implement ANSI-aware input and output streams for use by the Docker Windows client.
-// When asked for the set of standard streams (e.g., stdin, stdout, stderr), the code will create
-// and return pseudo-streams that convert ANSI sequences to / from Windows Console API calls.
-
-package windows
-
-import (
-	"io/ioutil"
-	"os"
-	"sync"
-
-	ansiterm "github.com/Azure/go-ansiterm"
-	"github.com/Sirupsen/logrus"
-)
-
-var logger *logrus.Logger
-var initOnce sync.Once
-
-func initLogger() {
-	initOnce.Do(func() {
-		logFile := ioutil.Discard
-
-		if isDebugEnv := os.Getenv(ansiterm.LogEnv); isDebugEnv == "1" {
-			logFile, _ = os.Create("ansiReaderWriter.log")
-		}
-
-		logger = &logrus.Logger{
-			Out:       logFile,
-			Formatter: new(logrus.TextFormatter),
-			Level:     logrus.DebugLevel,
-		}
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/term/windows/windows_test.go b/installer/vendor/github.com/docker/docker/pkg/term/windows/windows_test.go
deleted file mode 100644
index 52aeab54ec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/term/windows/windows_test.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// This file is necessary to pass the Docker tests.
-
-package windows
diff --git a/installer/vendor/github.com/docker/docker/pkg/testutil/assert/assert.go b/installer/vendor/github.com/docker/docker/pkg/testutil/assert/assert.go
deleted file mode 100644
index 6da8518a5e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/testutil/assert/assert.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Package assert contains functions for making assertions in unit tests
-package assert
-
-import (
-	"fmt"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-// TestingT is an interface which defines the methods of testing.T that are
-// required by this package
-type TestingT interface {
-	Fatalf(string, ...interface{})
-}
-
-// Equal compare the actual value to the expected value and fails the test if
-// they are not equal.
-func Equal(t TestingT, actual, expected interface{}) {
-	if expected != actual {
-		fatal(t, "Expected '%v' (%T) got '%v' (%T)", expected, expected, actual, actual)
-	}
-}
-
-//EqualStringSlice compares two slices and fails the test if they do not contain
-// the same items.
-func EqualStringSlice(t TestingT, actual, expected []string) {
-	if len(actual) != len(expected) {
-		fatal(t, "Expected (length %d): %q\nActual (length %d): %q",
-			len(expected), expected, len(actual), actual)
-	}
-	for i, item := range actual {
-		if item != expected[i] {
-			fatal(t, "Slices differ at element %d, expected %q got %q",
-				i, expected[i], item)
-		}
-	}
-}
-
-// NilError asserts that the error is nil, otherwise it fails the test.
-func NilError(t TestingT, err error) {
-	if err != nil {
-		fatal(t, "Expected no error, got: %s", err.Error())
-	}
-}
-
-// DeepEqual compare the actual value to the expected value and fails the test if
-// they are not "deeply equal".
-func DeepEqual(t TestingT, actual, expected interface{}) {
-	if !reflect.DeepEqual(actual, expected) {
-		fatal(t, "Expected (%T):\n%v\n\ngot (%T):\n%s\n",
-			expected, spew.Sdump(expected), actual, spew.Sdump(actual))
-	}
-}
-
-// Error asserts that error is not nil, and contains the expected text,
-// otherwise it fails the test.
-func Error(t TestingT, err error, contains string) {
-	if err == nil {
-		fatal(t, "Expected an error, but error was nil")
-	}
-
-	if !strings.Contains(err.Error(), contains) {
-		fatal(t, "Expected error to contain '%s', got '%s'", contains, err.Error())
-	}
-}
-
-// Contains asserts that the string contains a substring, otherwise it fails the
-// test.
-func Contains(t TestingT, actual, contains string) {
-	if !strings.Contains(actual, contains) {
-		fatal(t, "Expected '%s' to contain '%s'", actual, contains)
-	}
-}
-
-// NotNil fails the test if the object is nil
-func NotNil(t TestingT, obj interface{}) {
-	if obj == nil {
-		fatal(t, "Expected non-nil value.")
-	}
-}
-
-func fatal(t TestingT, format string, args ...interface{}) {
-	t.Fatalf(errorSource()+format, args...)
-}
-
-// See testing.decorate()
-func errorSource() string {
-	_, filename, line, ok := runtime.Caller(3)
-	if !ok {
-		return ""
-	}
-	return fmt.Sprintf("%s:%d: ", filepath.Base(filename), line)
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/testutil/pkg.go b/installer/vendor/github.com/docker/docker/pkg/testutil/pkg.go
deleted file mode 100644
index 110b2e6a79..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/testutil/pkg.go
+++ /dev/null
@@ -1 +0,0 @@
-package testutil
diff --git a/installer/vendor/github.com/docker/docker/pkg/testutil/tempfile/tempfile.go b/installer/vendor/github.com/docker/docker/pkg/testutil/tempfile/tempfile.go
deleted file mode 100644
index 0e09d99dae..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/testutil/tempfile/tempfile.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package tempfile
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/docker/docker/pkg/testutil/assert"
-)
-
-// TempFile is a temporary file that can be used with unit tests. TempFile
-// reduces the boilerplate setup required in each test case by handling
-// setup errors.
-type TempFile struct {
-	File *os.File
-}
-
-// NewTempFile returns a new temp file with contents
-func NewTempFile(t assert.TestingT, prefix string, content string) *TempFile {
-	file, err := ioutil.TempFile("", prefix+"-")
-	assert.NilError(t, err)
-
-	_, err = file.Write([]byte(content))
-	assert.NilError(t, err)
-	file.Close()
-	return &TempFile{File: file}
-}
-
-// Name returns the filename
-func (f *TempFile) Name() string {
-	return f.File.Name()
-}
-
-// Remove removes the file
-func (f *TempFile) Remove() {
-	os.Remove(f.Name())
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go b/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go
deleted file mode 100644
index e4dec3a5d1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build go1.8
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.7 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return c.Clone()
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go b/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go
deleted file mode 100644
index 0b816650ec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go16.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// +build go1.6,!go1.7
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.6 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                     c.Rand,
-		Time:                     c.Time,
-		Certificates:             c.Certificates,
-		NameToCertificate:        c.NameToCertificate,
-		GetCertificate:           c.GetCertificate,
-		RootCAs:                  c.RootCAs,
-		NextProtos:               c.NextProtos,
-		ServerName:               c.ServerName,
-		ClientAuth:               c.ClientAuth,
-		ClientCAs:                c.ClientCAs,
-		InsecureSkipVerify:       c.InsecureSkipVerify,
-		CipherSuites:             c.CipherSuites,
-		PreferServerCipherSuites: c.PreferServerCipherSuites,
-		SessionTicketsDisabled:   c.SessionTicketsDisabled,
-		SessionTicketKey:         c.SessionTicketKey,
-		ClientSessionCache:       c.ClientSessionCache,
-		MinVersion:               c.MinVersion,
-		MaxVersion:               c.MaxVersion,
-		CurvePreferences:         c.CurvePreferences,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go b/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go
deleted file mode 100644
index 0d5b448fec..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/tlsconfig/tlsconfig_clone_go17.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// +build go1.7,!go1.8
-
-package tlsconfig
-
-import "crypto/tls"
-
-// Clone returns a clone of tls.Config. This function is provided for
-// compatibility for go1.7 that doesn't include this method in stdlib.
-func Clone(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                        c.Rand,
-		Time:                        c.Time,
-		Certificates:                c.Certificates,
-		NameToCertificate:           c.NameToCertificate,
-		GetCertificate:              c.GetCertificate,
-		RootCAs:                     c.RootCAs,
-		NextProtos:                  c.NextProtos,
-		ServerName:                  c.ServerName,
-		ClientAuth:                  c.ClientAuth,
-		ClientCAs:                   c.ClientCAs,
-		InsecureSkipVerify:          c.InsecureSkipVerify,
-		CipherSuites:                c.CipherSuites,
-		PreferServerCipherSuites:    c.PreferServerCipherSuites,
-		SessionTicketsDisabled:      c.SessionTicketsDisabled,
-		SessionTicketKey:            c.SessionTicketKey,
-		ClientSessionCache:          c.ClientSessionCache,
-		MinVersion:                  c.MinVersion,
-		MaxVersion:                  c.MaxVersion,
-		CurvePreferences:            c.CurvePreferences,
-		DynamicRecordSizingDisabled: c.DynamicRecordSizingDisabled,
-		Renegotiation:               c.Renegotiation,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex.go b/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex.go
deleted file mode 100644
index 02610b8b7e..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Package truncindex provides a general 'index tree', used by Docker
-// in order to be able to reference containers by only a few unambiguous
-// characters of their id.
-package truncindex
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-	"sync"
-
-	"github.com/tchap/go-patricia/patricia"
-)
-
-var (
-	// ErrEmptyPrefix is an error returned if the prefix was empty.
-	ErrEmptyPrefix = errors.New("Prefix can't be empty")
-
-	// ErrIllegalChar is returned when a space is in the ID
-	ErrIllegalChar = errors.New("illegal character: ' '")
-
-	// ErrNotExist is returned when ID or its prefix not found in index.
-	ErrNotExist = errors.New("ID does not exist")
-)
-
-// ErrAmbiguousPrefix is returned if the prefix was ambiguous
-// (multiple ids for the prefix).
-type ErrAmbiguousPrefix struct {
-	prefix string
-}
-
-func (e ErrAmbiguousPrefix) Error() string {
-	return fmt.Sprintf("Multiple IDs found with provided prefix: %s", e.prefix)
-}
-
-// TruncIndex allows the retrieval of string identifiers by any of their unique prefixes.
-// This is used to retrieve image and container IDs by more convenient shorthand prefixes.
-type TruncIndex struct {
-	sync.RWMutex
-	trie *patricia.Trie
-	ids  map[string]struct{}
-}
-
-// NewTruncIndex creates a new TruncIndex and initializes with a list of IDs.
-func NewTruncIndex(ids []string) (idx *TruncIndex) {
-	idx = &TruncIndex{
-		ids: make(map[string]struct{}),
-
-		// Change patricia max prefix per node length,
-		// because our len(ID) always 64
-		trie: patricia.NewTrie(patricia.MaxPrefixPerNode(64)),
-	}
-	for _, id := range ids {
-		idx.addID(id)
-	}
-	return
-}
-
-func (idx *TruncIndex) addID(id string) error {
-	if strings.Contains(id, " ") {
-		return ErrIllegalChar
-	}
-	if id == "" {
-		return ErrEmptyPrefix
-	}
-	if _, exists := idx.ids[id]; exists {
-		return fmt.Errorf("id already exists: '%s'", id)
-	}
-	idx.ids[id] = struct{}{}
-	if inserted := idx.trie.Insert(patricia.Prefix(id), struct{}{}); !inserted {
-		return fmt.Errorf("failed to insert id: %s", id)
-	}
-	return nil
-}
-
-// Add adds a new ID to the TruncIndex.
-func (idx *TruncIndex) Add(id string) error {
-	idx.Lock()
-	defer idx.Unlock()
-	if err := idx.addID(id); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Delete removes an ID from the TruncIndex. If there are multiple IDs
-// with the given prefix, an error is thrown.
-func (idx *TruncIndex) Delete(id string) error {
-	idx.Lock()
-	defer idx.Unlock()
-	if _, exists := idx.ids[id]; !exists || id == "" {
-		return fmt.Errorf("no such id: '%s'", id)
-	}
-	delete(idx.ids, id)
-	if deleted := idx.trie.Delete(patricia.Prefix(id)); !deleted {
-		return fmt.Errorf("no such id: '%s'", id)
-	}
-	return nil
-}
-
-// Get retrieves an ID from the TruncIndex. If there are multiple IDs
-// with the given prefix, an error is thrown.
-func (idx *TruncIndex) Get(s string) (string, error) {
-	if s == "" {
-		return "", ErrEmptyPrefix
-	}
-	var (
-		id string
-	)
-	subTreeVisitFunc := func(prefix patricia.Prefix, item patricia.Item) error {
-		if id != "" {
-			// we haven't found the ID if there are two or more IDs
-			id = ""
-			return ErrAmbiguousPrefix{prefix: string(prefix)}
-		}
-		id = string(prefix)
-		return nil
-	}
-
-	idx.RLock()
-	defer idx.RUnlock()
-	if err := idx.trie.VisitSubtree(patricia.Prefix(s), subTreeVisitFunc); err != nil {
-		return "", err
-	}
-	if id != "" {
-		return id, nil
-	}
-	return "", ErrNotExist
-}
-
-// Iterate iterates over all stored IDs, and passes each of them to the given handler.
-func (idx *TruncIndex) Iterate(handler func(id string)) {
-	idx.trie.Visit(func(prefix patricia.Prefix, item patricia.Item) error {
-		handler(string(prefix))
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex_test.go b/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex_test.go
deleted file mode 100644
index 8197baf7d4..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/truncindex/truncindex_test.go
+++ /dev/null
@@ -1,429 +0,0 @@
-package truncindex
-
-import (
-	"math/rand"
-	"testing"
-
-	"github.com/docker/docker/pkg/stringid"
-)
-
-// Test the behavior of TruncIndex, an index for querying IDs from a non-conflicting prefix.
-func TestTruncIndex(t *testing.T) {
-	ids := []string{}
-	index := NewTruncIndex(ids)
-	// Get on an empty index
-	if _, err := index.Get("foobar"); err == nil {
-		t.Fatal("Get on an empty index should return an error")
-	}
-
-	// Spaces should be illegal in an id
-	if err := index.Add("I have a space"); err == nil {
-		t.Fatalf("Adding an id with ' ' should return an error")
-	}
-
-	id := "99b36c2c326ccc11e726eee6ee78a0baf166ef96"
-	// Add an id
-	if err := index.Add(id); err != nil {
-		t.Fatal(err)
-	}
-
-	// Add an empty id (should fail)
-	if err := index.Add(""); err == nil {
-		t.Fatalf("Adding an empty id should return an error")
-	}
-
-	// Get a non-existing id
-	assertIndexGet(t, index, "abracadabra", "", true)
-	// Get an empty id
-	assertIndexGet(t, index, "", "", true)
-	// Get the exact id
-	assertIndexGet(t, index, id, id, false)
-	// The first letter should match
-	assertIndexGet(t, index, id[:1], id, false)
-	// The first half should match
-	assertIndexGet(t, index, id[:len(id)/2], id, false)
-	// The second half should NOT match
-	assertIndexGet(t, index, id[len(id)/2:], "", true)
-
-	id2 := id[:6] + "blabla"
-	// Add an id
-	if err := index.Add(id2); err != nil {
-		t.Fatal(err)
-	}
-	// Both exact IDs should work
-	assertIndexGet(t, index, id, id, false)
-	assertIndexGet(t, index, id2, id2, false)
-
-	// 6 characters or less should conflict
-	assertIndexGet(t, index, id[:6], "", true)
-	assertIndexGet(t, index, id[:4], "", true)
-	assertIndexGet(t, index, id[:1], "", true)
-
-	// An ambiguous id prefix should return an error
-	if _, err := index.Get(id[:4]); err == nil {
-		t.Fatal("An ambiguous id prefix should return an error")
-	}
-
-	// 7 characters should NOT conflict
-	assertIndexGet(t, index, id[:7], id, false)
-	assertIndexGet(t, index, id2[:7], id2, false)
-
-	// Deleting a non-existing id should return an error
-	if err := index.Delete("non-existing"); err == nil {
-		t.Fatalf("Deleting a non-existing id should return an error")
-	}
-
-	// Deleting an empty id should return an error
-	if err := index.Delete(""); err == nil {
-		t.Fatal("Deleting an empty id should return an error")
-	}
-
-	// Deleting id2 should remove conflicts
-	if err := index.Delete(id2); err != nil {
-		t.Fatal(err)
-	}
-	// id2 should no longer work
-	assertIndexGet(t, index, id2, "", true)
-	assertIndexGet(t, index, id2[:7], "", true)
-	assertIndexGet(t, index, id2[:11], "", true)
-
-	// conflicts between id and id2 should be gone
-	assertIndexGet(t, index, id[:6], id, false)
-	assertIndexGet(t, index, id[:4], id, false)
-	assertIndexGet(t, index, id[:1], id, false)
-
-	// non-conflicting substrings should still not conflict
-	assertIndexGet(t, index, id[:7], id, false)
-	assertIndexGet(t, index, id[:15], id, false)
-	assertIndexGet(t, index, id, id, false)
-
-	assertIndexIterate(t)
-}
-
-func assertIndexIterate(t *testing.T) {
-	ids := []string{
-		"19b36c2c326ccc11e726eee6ee78a0baf166ef96",
-		"28b36c2c326ccc11e726eee6ee78a0baf166ef96",
-		"37b36c2c326ccc11e726eee6ee78a0baf166ef96",
-		"46b36c2c326ccc11e726eee6ee78a0baf166ef96",
-	}
-
-	index := NewTruncIndex(ids)
-
-	index.Iterate(func(targetId string) {
-		for _, id := range ids {
-			if targetId == id {
-				return
-			}
-		}
-
-		t.Fatalf("An unknown ID '%s'", targetId)
-	})
-}
-
-func assertIndexGet(t *testing.T, index *TruncIndex, input, expectedResult string, expectError bool) {
-	if result, err := index.Get(input); err != nil && !expectError {
-		t.Fatalf("Unexpected error getting '%s': %s", input, err)
-	} else if err == nil && expectError {
-		t.Fatalf("Getting '%s' should return an error, not '%s'", input, result)
-	} else if result != expectedResult {
-		t.Fatalf("Getting '%s' returned '%s' instead of '%s'", input, result, expectedResult)
-	}
-}
-
-func BenchmarkTruncIndexAdd100(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 100; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexAdd250(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 250; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexAdd500(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 500; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexGet100(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 100; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	index := NewTruncIndex([]string{})
-	for _, id := range testSet {
-		if err := index.Add(id); err != nil {
-			b.Fatal(err)
-		}
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexGet250(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 250; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	index := NewTruncIndex([]string{})
-	for _, id := range testSet {
-		if err := index.Add(id); err != nil {
-			b.Fatal(err)
-		}
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexGet500(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 500; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	index := NewTruncIndex([]string{})
-	for _, id := range testSet {
-		if err := index.Add(id); err != nil {
-			b.Fatal(err)
-		}
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexDelete100(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 100; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		b.StartTimer()
-		for _, id := range testSet {
-			if err := index.Delete(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexDelete250(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 250; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		b.StartTimer()
-		for _, id := range testSet {
-			if err := index.Delete(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexDelete500(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 500; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		b.StopTimer()
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		b.StartTimer()
-		for _, id := range testSet {
-			if err := index.Delete(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexNew100(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 100; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		NewTruncIndex(testSet)
-	}
-}
-
-func BenchmarkTruncIndexNew250(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 250; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		NewTruncIndex(testSet)
-	}
-}
-
-func BenchmarkTruncIndexNew500(b *testing.B) {
-	var testSet []string
-	for i := 0; i < 500; i++ {
-		testSet = append(testSet, stringid.GenerateNonCryptoID())
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		NewTruncIndex(testSet)
-	}
-}
-
-func BenchmarkTruncIndexAddGet100(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 500; i++ {
-		id := stringid.GenerateNonCryptoID()
-		testSet = append(testSet, id)
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexAddGet250(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 500; i++ {
-		id := stringid.GenerateNonCryptoID()
-		testSet = append(testSet, id)
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
-
-func BenchmarkTruncIndexAddGet500(b *testing.B) {
-	var testSet []string
-	var testKeys []string
-	for i := 0; i < 500; i++ {
-		id := stringid.GenerateNonCryptoID()
-		testSet = append(testSet, id)
-		l := rand.Intn(12) + 12
-		testKeys = append(testKeys, id[:l])
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		index := NewTruncIndex([]string{})
-		for _, id := range testSet {
-			if err := index.Add(id); err != nil {
-				b.Fatal(err)
-			}
-		}
-		for _, id := range testKeys {
-			if res, err := index.Get(id); err != nil {
-				b.Fatal(res, err)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil.go b/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil.go
deleted file mode 100644
index 44152873b1..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Package urlutil provides helper function to check urls kind.
-// It supports http urls, git urls and transport url (tcp://, …)
-package urlutil
-
-import (
-	"regexp"
-	"strings"
-)
-
-var (
-	validPrefixes = map[string][]string{
-		"url":       {"http://", "https://"},
-		"git":       {"git://", "github.com/", "git@"},
-		"transport": {"tcp://", "tcp+tls://", "udp://", "unix://", "unixgram://"},
-	}
-	urlPathWithFragmentSuffix = regexp.MustCompile(".git(?:#.+)?$")
-)
-
-// IsURL returns true if the provided str is an HTTP(S) URL.
-func IsURL(str string) bool {
-	return checkURL(str, "url")
-}
-
-// IsGitURL returns true if the provided str is a git repository URL.
-func IsGitURL(str string) bool {
-	if IsURL(str) && urlPathWithFragmentSuffix.MatchString(str) {
-		return true
-	}
-	return checkURL(str, "git")
-}
-
-// IsGitTransport returns true if the provided str is a git transport by inspecting
-// the prefix of the string for known protocols used in git.
-func IsGitTransport(str string) bool {
-	return IsURL(str) || strings.HasPrefix(str, "git://") || strings.HasPrefix(str, "git@")
-}
-
-// IsTransportURL returns true if the provided str is a transport (tcp, tcp+tls, udp, unix) URL.
-func IsTransportURL(str string) bool {
-	return checkURL(str, "transport")
-}
-
-func checkURL(str, kind string) bool {
-	for _, prefix := range validPrefixes[kind] {
-		if strings.HasPrefix(str, prefix) {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil_test.go b/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil_test.go
deleted file mode 100644
index 75eb464fe5..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/urlutil/urlutil_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package urlutil
-
-import "testing"
-
-var (
-	gitUrls = []string{
-		"git://github.com/docker/docker",
-		"git@github.com:docker/docker.git",
-		"git@bitbucket.org:atlassianlabs/atlassian-docker.git",
-		"https://github.com/docker/docker.git",
-		"http://github.com/docker/docker.git",
-		"http://github.com/docker/docker.git#branch",
-		"http://github.com/docker/docker.git#:dir",
-	}
-	incompleteGitUrls = []string{
-		"github.com/docker/docker",
-	}
-	invalidGitUrls = []string{
-		"http://github.com/docker/docker.git:#branch",
-	}
-	transportUrls = []string{
-		"tcp://example.com",
-		"tcp+tls://example.com",
-		"udp://example.com",
-		"unix:///example",
-		"unixgram:///example",
-	}
-)
-
-func TestValidGitTransport(t *testing.T) {
-	for _, url := range gitUrls {
-		if IsGitTransport(url) == false {
-			t.Fatalf("%q should be detected as valid Git prefix", url)
-		}
-	}
-
-	for _, url := range incompleteGitUrls {
-		if IsGitTransport(url) == true {
-			t.Fatalf("%q should not be detected as valid Git prefix", url)
-		}
-	}
-}
-
-func TestIsGIT(t *testing.T) {
-	for _, url := range gitUrls {
-		if IsGitURL(url) == false {
-			t.Fatalf("%q should be detected as valid Git url", url)
-		}
-	}
-
-	for _, url := range incompleteGitUrls {
-		if IsGitURL(url) == false {
-			t.Fatalf("%q should be detected as valid Git url", url)
-		}
-	}
-
-	for _, url := range invalidGitUrls {
-		if IsGitURL(url) == true {
-			t.Fatalf("%q should not be detected as valid Git prefix", url)
-		}
-	}
-}
-
-func TestIsTransport(t *testing.T) {
-	for _, url := range transportUrls {
-		if IsTransportURL(url) == false {
-			t.Fatalf("%q should be detected as valid Transport url", url)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/useragent/README.md b/installer/vendor/github.com/docker/docker/pkg/useragent/README.md
deleted file mode 100644
index d9cb367d10..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/useragent/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This package provides helper functions to pack version information into a single User-Agent header.
diff --git a/installer/vendor/github.com/docker/docker/pkg/useragent/useragent.go b/installer/vendor/github.com/docker/docker/pkg/useragent/useragent.go
deleted file mode 100644
index 1137db51b8..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/useragent/useragent.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Package useragent provides helper functions to pack
-// version information into a single User-Agent header.
-package useragent
-
-import (
-	"strings"
-)
-
-// VersionInfo is used to model UserAgent versions.
-type VersionInfo struct {
-	Name    string
-	Version string
-}
-
-func (vi *VersionInfo) isValid() bool {
-	const stopChars = " \t\r\n/"
-	name := vi.Name
-	vers := vi.Version
-	if len(name) == 0 || strings.ContainsAny(name, stopChars) {
-		return false
-	}
-	if len(vers) == 0 || strings.ContainsAny(vers, stopChars) {
-		return false
-	}
-	return true
-}
-
-// AppendVersions converts versions to a string and appends the string to the string base.
-//
-// Each VersionInfo will be converted to a string in the format of
-// "product/version", where the "product" is get from the name field, while
-// version is get from the version field. Several pieces of version information
-// will be concatenated and separated by space.
-//
-// Example:
-// AppendVersions("base", VersionInfo{"foo", "1.0"}, VersionInfo{"bar", "2.0"})
-// results in "base foo/1.0 bar/2.0".
-func AppendVersions(base string, versions ...VersionInfo) string {
-	if len(versions) == 0 {
-		return base
-	}
-
-	verstrs := make([]string, 0, 1+len(versions))
-	if len(base) > 0 {
-		verstrs = append(verstrs, base)
-	}
-
-	for _, v := range versions {
-		if !v.isValid() {
-			continue
-		}
-		verstrs = append(verstrs, v.Name+"/"+v.Version)
-	}
-	return strings.Join(verstrs, " ")
-}
diff --git a/installer/vendor/github.com/docker/docker/pkg/useragent/useragent_test.go b/installer/vendor/github.com/docker/docker/pkg/useragent/useragent_test.go
deleted file mode 100644
index 0ad7243a6d..0000000000
--- a/installer/vendor/github.com/docker/docker/pkg/useragent/useragent_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package useragent
-
-import "testing"
-
-func TestVersionInfo(t *testing.T) {
-	vi := VersionInfo{"foo", "bar"}
-	if !vi.isValid() {
-		t.Fatalf("VersionInfo should be valid")
-	}
-	vi = VersionInfo{"", "bar"}
-	if vi.isValid() {
-		t.Fatalf("Expected VersionInfo to be invalid")
-	}
-	vi = VersionInfo{"foo", ""}
-	if vi.isValid() {
-		t.Fatalf("Expected VersionInfo to be invalid")
-	}
-}
-
-func TestAppendVersions(t *testing.T) {
-	vis := []VersionInfo{
-		{"foo", "1.0"},
-		{"bar", "0.1"},
-		{"pi", "3.1.4"},
-	}
-	v := AppendVersions("base", vis...)
-	expect := "base foo/1.0 bar/0.1 pi/3.1.4"
-	if v != expect {
-		t.Fatalf("expected %q, got %q", expect, v)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/backend_linux.go b/installer/vendor/github.com/docker/docker/plugin/backend_linux.go
deleted file mode 100644
index 33200d8efa..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/backend_linux.go
+++ /dev/null
@@ -1,790 +0,0 @@
-// +build linux
-
-package plugin
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema2"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/distribution"
-	progressutils "github.com/docker/docker/distribution/utils"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/chrootarchive"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/pools"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/plugin/v2"
-	"github.com/docker/docker/reference"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-// Disable deactivates a plugin. This means resources (volumes, networks) cant use them.
-func (pm *Manager) Disable(refOrID string, config *types.PluginDisableConfig) error {
-	p, err := pm.config.Store.GetV2Plugin(refOrID)
-	if err != nil {
-		return err
-	}
-	pm.mu.RLock()
-	c := pm.cMap[p]
-	pm.mu.RUnlock()
-
-	if !config.ForceDisable && p.GetRefCount() > 0 {
-		return fmt.Errorf("plugin %s is in use", p.Name())
-	}
-
-	if err := pm.disable(p, c); err != nil {
-		return err
-	}
-	pm.config.LogPluginEvent(p.GetID(), refOrID, "disable")
-	return nil
-}
-
-// Enable activates a plugin, which implies that they are ready to be used by containers.
-func (pm *Manager) Enable(refOrID string, config *types.PluginEnableConfig) error {
-	p, err := pm.config.Store.GetV2Plugin(refOrID)
-	if err != nil {
-		return err
-	}
-
-	c := &controller{timeoutInSecs: config.Timeout}
-	if err := pm.enable(p, c, false); err != nil {
-		return err
-	}
-	pm.config.LogPluginEvent(p.GetID(), refOrID, "enable")
-	return nil
-}
-
-// Inspect examines a plugin config
-func (pm *Manager) Inspect(refOrID string) (tp *types.Plugin, err error) {
-	p, err := pm.config.Store.GetV2Plugin(refOrID)
-	if err != nil {
-		return nil, err
-	}
-
-	return &p.PluginObj, nil
-}
-
-func (pm *Manager) pull(ctx context.Context, ref reference.Named, config *distribution.ImagePullConfig, outStream io.Writer) error {
-	if outStream != nil {
-		// Include a buffer so that slow client connections don't affect
-		// transfer performance.
-		progressChan := make(chan progress.Progress, 100)
-
-		writesDone := make(chan struct{})
-
-		defer func() {
-			close(progressChan)
-			<-writesDone
-		}()
-
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithCancel(ctx)
-
-		go func() {
-			progressutils.WriteDistributionProgress(cancelFunc, outStream, progressChan)
-			close(writesDone)
-		}()
-
-		config.ProgressOutput = progress.ChanOutput(progressChan)
-	} else {
-		config.ProgressOutput = progress.DiscardOutput()
-	}
-	return distribution.Pull(ctx, ref, config)
-}
-
-type tempConfigStore struct {
-	config       []byte
-	configDigest digest.Digest
-}
-
-func (s *tempConfigStore) Put(c []byte) (digest.Digest, error) {
-	dgst := digest.FromBytes(c)
-
-	s.config = c
-	s.configDigest = dgst
-
-	return dgst, nil
-}
-
-func (s *tempConfigStore) Get(d digest.Digest) ([]byte, error) {
-	if d != s.configDigest {
-		return nil, digest.ErrDigestNotFound
-	}
-	return s.config, nil
-}
-
-func (s *tempConfigStore) RootFSFromConfig(c []byte) (*image.RootFS, error) {
-	return configToRootFS(c)
-}
-
-func computePrivileges(c types.PluginConfig) (types.PluginPrivileges, error) {
-	var privileges types.PluginPrivileges
-	if c.Network.Type != "null" && c.Network.Type != "bridge" && c.Network.Type != "" {
-		privileges = append(privileges, types.PluginPrivilege{
-			Name:        "network",
-			Description: "permissions to access a network",
-			Value:       []string{c.Network.Type},
-		})
-	}
-	for _, mount := range c.Mounts {
-		if mount.Source != nil {
-			privileges = append(privileges, types.PluginPrivilege{
-				Name:        "mount",
-				Description: "host path to mount",
-				Value:       []string{*mount.Source},
-			})
-		}
-	}
-	for _, device := range c.Linux.Devices {
-		if device.Path != nil {
-			privileges = append(privileges, types.PluginPrivilege{
-				Name:        "device",
-				Description: "host device to access",
-				Value:       []string{*device.Path},
-			})
-		}
-	}
-	if c.Linux.AllowAllDevices {
-		privileges = append(privileges, types.PluginPrivilege{
-			Name:        "allow-all-devices",
-			Description: "allow 'rwm' access to all devices",
-			Value:       []string{"true"},
-		})
-	}
-	if len(c.Linux.Capabilities) > 0 {
-		privileges = append(privileges, types.PluginPrivilege{
-			Name:        "capabilities",
-			Description: "list of additional capabilities required",
-			Value:       c.Linux.Capabilities,
-		})
-	}
-
-	return privileges, nil
-}
-
-// Privileges pulls a plugin config and computes the privileges required to install it.
-func (pm *Manager) Privileges(ctx context.Context, ref reference.Named, metaHeader http.Header, authConfig *types.AuthConfig) (types.PluginPrivileges, error) {
-	// create image store instance
-	cs := &tempConfigStore{}
-
-	// DownloadManager not defined because only pulling configuration.
-	pluginPullConfig := &distribution.ImagePullConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeader,
-			AuthConfig:       authConfig,
-			RegistryService:  pm.config.RegistryService,
-			ImageEventLogger: func(string, string, string) {},
-			ImageStore:       cs,
-		},
-		Schema2Types: distribution.PluginTypes,
-	}
-
-	if err := pm.pull(ctx, ref, pluginPullConfig, nil); err != nil {
-		return nil, err
-	}
-
-	if cs.config == nil {
-		return nil, errors.New("no configuration pulled")
-	}
-	var config types.PluginConfig
-	if err := json.Unmarshal(cs.config, &config); err != nil {
-		return nil, err
-	}
-
-	return computePrivileges(config)
-}
-
-// Upgrade upgrades a plugin
-func (pm *Manager) Upgrade(ctx context.Context, ref reference.Named, name string, metaHeader http.Header, authConfig *types.AuthConfig, privileges types.PluginPrivileges, outStream io.Writer) (err error) {
-	p, err := pm.config.Store.GetV2Plugin(name)
-	if err != nil {
-		return errors.Wrap(err, "plugin must be installed before upgrading")
-	}
-
-	if p.IsEnabled() {
-		return fmt.Errorf("plugin must be disabled before upgrading")
-	}
-
-	pm.muGC.RLock()
-	defer pm.muGC.RUnlock()
-
-	// revalidate because Pull is public
-	nameref, err := reference.ParseNamed(name)
-	if err != nil {
-		return errors.Wrapf(err, "failed to parse %q", name)
-	}
-	name = reference.WithDefaultTag(nameref).String()
-
-	tmpRootFSDir, err := ioutil.TempDir(pm.tmpDir(), ".rootfs")
-	defer os.RemoveAll(tmpRootFSDir)
-
-	dm := &downloadManager{
-		tmpDir:    tmpRootFSDir,
-		blobStore: pm.blobStore,
-	}
-
-	pluginPullConfig := &distribution.ImagePullConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeader,
-			AuthConfig:       authConfig,
-			RegistryService:  pm.config.RegistryService,
-			ImageEventLogger: pm.config.LogPluginEvent,
-			ImageStore:       dm,
-		},
-		DownloadManager: dm, // todo: reevaluate if possible to substitute distribution/xfer dependencies instead
-		Schema2Types:    distribution.PluginTypes,
-	}
-
-	err = pm.pull(ctx, ref, pluginPullConfig, outStream)
-	if err != nil {
-		go pm.GC()
-		return err
-	}
-
-	if err := pm.upgradePlugin(p, dm.configDigest, dm.blobs, tmpRootFSDir, &privileges); err != nil {
-		return err
-	}
-	p.PluginObj.PluginReference = ref.String()
-	return nil
-}
-
-// Pull pulls a plugin, check if the correct privileges are provided and install the plugin.
-func (pm *Manager) Pull(ctx context.Context, ref reference.Named, name string, metaHeader http.Header, authConfig *types.AuthConfig, privileges types.PluginPrivileges, outStream io.Writer) (err error) {
-	pm.muGC.RLock()
-	defer pm.muGC.RUnlock()
-
-	// revalidate because Pull is public
-	nameref, err := reference.ParseNamed(name)
-	if err != nil {
-		return errors.Wrapf(err, "failed to parse %q", name)
-	}
-	name = reference.WithDefaultTag(nameref).String()
-
-	if err := pm.config.Store.validateName(name); err != nil {
-		return err
-	}
-
-	tmpRootFSDir, err := ioutil.TempDir(pm.tmpDir(), ".rootfs")
-	defer os.RemoveAll(tmpRootFSDir)
-
-	dm := &downloadManager{
-		tmpDir:    tmpRootFSDir,
-		blobStore: pm.blobStore,
-	}
-
-	pluginPullConfig := &distribution.ImagePullConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeader,
-			AuthConfig:       authConfig,
-			RegistryService:  pm.config.RegistryService,
-			ImageEventLogger: pm.config.LogPluginEvent,
-			ImageStore:       dm,
-		},
-		DownloadManager: dm, // todo: reevaluate if possible to substitute distribution/xfer dependencies instead
-		Schema2Types:    distribution.PluginTypes,
-	}
-
-	err = pm.pull(ctx, ref, pluginPullConfig, outStream)
-	if err != nil {
-		go pm.GC()
-		return err
-	}
-
-	p, err := pm.createPlugin(name, dm.configDigest, dm.blobs, tmpRootFSDir, &privileges)
-	if err != nil {
-		return err
-	}
-	p.PluginObj.PluginReference = ref.String()
-
-	return nil
-}
-
-// List displays the list of plugins and associated metadata.
-func (pm *Manager) List() ([]types.Plugin, error) {
-	plugins := pm.config.Store.GetAll()
-	out := make([]types.Plugin, 0, len(plugins))
-	for _, p := range plugins {
-		out = append(out, p.PluginObj)
-	}
-	return out, nil
-}
-
-// Push pushes a plugin to the store.
-func (pm *Manager) Push(ctx context.Context, name string, metaHeader http.Header, authConfig *types.AuthConfig, outStream io.Writer) error {
-	p, err := pm.config.Store.GetV2Plugin(name)
-	if err != nil {
-		return err
-	}
-
-	ref, err := reference.ParseNamed(p.Name())
-	if err != nil {
-		return errors.Wrapf(err, "plugin has invalid name %v for push", p.Name())
-	}
-
-	var po progress.Output
-	if outStream != nil {
-		// Include a buffer so that slow client connections don't affect
-		// transfer performance.
-		progressChan := make(chan progress.Progress, 100)
-
-		writesDone := make(chan struct{})
-
-		defer func() {
-			close(progressChan)
-			<-writesDone
-		}()
-
-		var cancelFunc context.CancelFunc
-		ctx, cancelFunc = context.WithCancel(ctx)
-
-		go func() {
-			progressutils.WriteDistributionProgress(cancelFunc, outStream, progressChan)
-			close(writesDone)
-		}()
-
-		po = progress.ChanOutput(progressChan)
-	} else {
-		po = progress.DiscardOutput()
-	}
-
-	// TODO: replace these with manager
-	is := &pluginConfigStore{
-		pm:     pm,
-		plugin: p,
-	}
-	ls := &pluginLayerProvider{
-		pm:     pm,
-		plugin: p,
-	}
-	rs := &pluginReference{
-		name:     ref,
-		pluginID: p.Config,
-	}
-
-	uploadManager := xfer.NewLayerUploadManager(3)
-
-	imagePushConfig := &distribution.ImagePushConfig{
-		Config: distribution.Config{
-			MetaHeaders:      metaHeader,
-			AuthConfig:       authConfig,
-			ProgressOutput:   po,
-			RegistryService:  pm.config.RegistryService,
-			ReferenceStore:   rs,
-			ImageEventLogger: pm.config.LogPluginEvent,
-			ImageStore:       is,
-			RequireSchema2:   true,
-		},
-		ConfigMediaType: schema2.MediaTypePluginConfig,
-		LayerStore:      ls,
-		UploadManager:   uploadManager,
-	}
-
-	return distribution.Push(ctx, ref, imagePushConfig)
-}
-
-type pluginReference struct {
-	name     reference.Named
-	pluginID digest.Digest
-}
-
-func (r *pluginReference) References(id digest.Digest) []reference.Named {
-	if r.pluginID != id {
-		return nil
-	}
-	return []reference.Named{r.name}
-}
-
-func (r *pluginReference) ReferencesByName(ref reference.Named) []reference.Association {
-	return []reference.Association{
-		{
-			Ref: r.name,
-			ID:  r.pluginID,
-		},
-	}
-}
-
-func (r *pluginReference) Get(ref reference.Named) (digest.Digest, error) {
-	if r.name.String() != ref.String() {
-		return digest.Digest(""), reference.ErrDoesNotExist
-	}
-	return r.pluginID, nil
-}
-
-func (r *pluginReference) AddTag(ref reference.Named, id digest.Digest, force bool) error {
-	// Read only, ignore
-	return nil
-}
-func (r *pluginReference) AddDigest(ref reference.Canonical, id digest.Digest, force bool) error {
-	// Read only, ignore
-	return nil
-}
-func (r *pluginReference) Delete(ref reference.Named) (bool, error) {
-	// Read only, ignore
-	return false, nil
-}
-
-type pluginConfigStore struct {
-	pm     *Manager
-	plugin *v2.Plugin
-}
-
-func (s *pluginConfigStore) Put([]byte) (digest.Digest, error) {
-	return digest.Digest(""), errors.New("cannot store config on push")
-}
-
-func (s *pluginConfigStore) Get(d digest.Digest) ([]byte, error) {
-	if s.plugin.Config != d {
-		return nil, errors.New("plugin not found")
-	}
-	rwc, err := s.pm.blobStore.Get(d)
-	if err != nil {
-		return nil, err
-	}
-	defer rwc.Close()
-	return ioutil.ReadAll(rwc)
-}
-
-func (s *pluginConfigStore) RootFSFromConfig(c []byte) (*image.RootFS, error) {
-	return configToRootFS(c)
-}
-
-type pluginLayerProvider struct {
-	pm     *Manager
-	plugin *v2.Plugin
-}
-
-func (p *pluginLayerProvider) Get(id layer.ChainID) (distribution.PushLayer, error) {
-	rootFS := rootFSFromPlugin(p.plugin.PluginObj.Config.Rootfs)
-	var i int
-	for i = 1; i <= len(rootFS.DiffIDs); i++ {
-		if layer.CreateChainID(rootFS.DiffIDs[:i]) == id {
-			break
-		}
-	}
-	if i > len(rootFS.DiffIDs) {
-		return nil, errors.New("layer not found")
-	}
-	return &pluginLayer{
-		pm:      p.pm,
-		diffIDs: rootFS.DiffIDs[:i],
-		blobs:   p.plugin.Blobsums[:i],
-	}, nil
-}
-
-type pluginLayer struct {
-	pm      *Manager
-	diffIDs []layer.DiffID
-	blobs   []digest.Digest
-}
-
-func (l *pluginLayer) ChainID() layer.ChainID {
-	return layer.CreateChainID(l.diffIDs)
-}
-
-func (l *pluginLayer) DiffID() layer.DiffID {
-	return l.diffIDs[len(l.diffIDs)-1]
-}
-
-func (l *pluginLayer) Parent() distribution.PushLayer {
-	if len(l.diffIDs) == 1 {
-		return nil
-	}
-	return &pluginLayer{
-		pm:      l.pm,
-		diffIDs: l.diffIDs[:len(l.diffIDs)-1],
-		blobs:   l.blobs[:len(l.diffIDs)-1],
-	}
-}
-
-func (l *pluginLayer) Open() (io.ReadCloser, error) {
-	return l.pm.blobStore.Get(l.blobs[len(l.diffIDs)-1])
-}
-
-func (l *pluginLayer) Size() (int64, error) {
-	return l.pm.blobStore.Size(l.blobs[len(l.diffIDs)-1])
-}
-
-func (l *pluginLayer) MediaType() string {
-	return schema2.MediaTypeLayer
-}
-
-func (l *pluginLayer) Release() {
-	// Nothing needs to be release, no references held
-}
-
-// Remove deletes plugin's root directory.
-func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error {
-	p, err := pm.config.Store.GetV2Plugin(name)
-	pm.mu.RLock()
-	c := pm.cMap[p]
-	pm.mu.RUnlock()
-
-	if err != nil {
-		return err
-	}
-
-	if !config.ForceRemove {
-		if p.GetRefCount() > 0 {
-			return fmt.Errorf("plugin %s is in use", p.Name())
-		}
-		if p.IsEnabled() {
-			return fmt.Errorf("plugin %s is enabled", p.Name())
-		}
-	}
-
-	if p.IsEnabled() {
-		if err := pm.disable(p, c); err != nil {
-			logrus.Errorf("failed to disable plugin '%s': %s", p.Name(), err)
-		}
-	}
-
-	defer func() {
-		go pm.GC()
-	}()
-
-	id := p.GetID()
-	pm.config.Store.Remove(p)
-	pluginDir := filepath.Join(pm.config.Root, id)
-	if err := recursiveUnmount(pm.config.Root); err != nil {
-		logrus.WithField("dir", pm.config.Root).WithField("id", id).Warn(err)
-	}
-	if err := os.RemoveAll(pluginDir); err != nil {
-		logrus.Warnf("unable to remove %q from plugin remove: %v", pluginDir, err)
-	}
-	pm.config.LogPluginEvent(id, name, "remove")
-	return nil
-}
-
-func getMounts(root string) ([]string, error) {
-	infos, err := mount.GetMounts()
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to read mount table while performing recursive unmount")
-	}
-
-	var mounts []string
-	for _, m := range infos {
-		if strings.HasPrefix(m.Mountpoint, root) {
-			mounts = append(mounts, m.Mountpoint)
-		}
-	}
-
-	return mounts, nil
-}
-
-func recursiveUnmount(root string) error {
-	mounts, err := getMounts(root)
-	if err != nil {
-		return err
-	}
-
-	// sort in reverse-lexicographic order so the root mount will always be last
-	sort.Sort(sort.Reverse(sort.StringSlice(mounts)))
-
-	for i, m := range mounts {
-		if err := mount.Unmount(m); err != nil {
-			if i == len(mounts)-1 {
-				return errors.Wrapf(err, "error performing recursive unmount on %s", root)
-			}
-			logrus.WithError(err).WithField("mountpoint", m).Warn("could not unmount")
-		}
-	}
-
-	return nil
-}
-
-// Set sets plugin args
-func (pm *Manager) Set(name string, args []string) error {
-	p, err := pm.config.Store.GetV2Plugin(name)
-	if err != nil {
-		return err
-	}
-	if err := p.Set(args); err != nil {
-		return err
-	}
-	return pm.save(p)
-}
-
-// CreateFromContext creates a plugin from the given pluginDir which contains
-// both the rootfs and the config.json and a repoName with optional tag.
-func (pm *Manager) CreateFromContext(ctx context.Context, tarCtx io.ReadCloser, options *types.PluginCreateOptions) (err error) {
-	pm.muGC.RLock()
-	defer pm.muGC.RUnlock()
-
-	ref, err := reference.ParseNamed(options.RepoName)
-	if err != nil {
-		return errors.Wrapf(err, "failed to parse reference %v", options.RepoName)
-	}
-	if _, ok := ref.(reference.Canonical); ok {
-		return errors.Errorf("canonical references are not permitted")
-	}
-	taggedRef := reference.WithDefaultTag(ref)
-	name := taggedRef.String()
-
-	if err := pm.config.Store.validateName(name); err != nil { // fast check, real check is in createPlugin()
-		return err
-	}
-
-	tmpRootFSDir, err := ioutil.TempDir(pm.tmpDir(), ".rootfs")
-	defer os.RemoveAll(tmpRootFSDir)
-	if err != nil {
-		return errors.Wrap(err, "failed to create temp directory")
-	}
-	var configJSON []byte
-	rootFS := splitConfigRootFSFromTar(tarCtx, &configJSON)
-
-	rootFSBlob, err := pm.blobStore.New()
-	if err != nil {
-		return err
-	}
-	defer rootFSBlob.Close()
-	gzw := gzip.NewWriter(rootFSBlob)
-	layerDigester := digest.Canonical.New()
-	rootFSReader := io.TeeReader(rootFS, io.MultiWriter(gzw, layerDigester.Hash()))
-
-	if err := chrootarchive.Untar(rootFSReader, tmpRootFSDir, nil); err != nil {
-		return err
-	}
-	if err := rootFS.Close(); err != nil {
-		return err
-	}
-
-	if configJSON == nil {
-		return errors.New("config not found")
-	}
-
-	if err := gzw.Close(); err != nil {
-		return errors.Wrap(err, "error closing gzip writer")
-	}
-
-	var config types.PluginConfig
-	if err := json.Unmarshal(configJSON, &config); err != nil {
-		return errors.Wrap(err, "failed to parse config")
-	}
-
-	if err := pm.validateConfig(config); err != nil {
-		return err
-	}
-
-	pm.mu.Lock()
-	defer pm.mu.Unlock()
-
-	rootFSBlobsum, err := rootFSBlob.Commit()
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			go pm.GC()
-		}
-	}()
-
-	config.Rootfs = &types.PluginConfigRootfs{
-		Type:    "layers",
-		DiffIds: []string{layerDigester.Digest().String()},
-	}
-
-	configBlob, err := pm.blobStore.New()
-	if err != nil {
-		return err
-	}
-	defer configBlob.Close()
-	if err := json.NewEncoder(configBlob).Encode(config); err != nil {
-		return errors.Wrap(err, "error encoding json config")
-	}
-	configBlobsum, err := configBlob.Commit()
-	if err != nil {
-		return err
-	}
-
-	p, err := pm.createPlugin(name, configBlobsum, []digest.Digest{rootFSBlobsum}, tmpRootFSDir, nil)
-	if err != nil {
-		return err
-	}
-	p.PluginObj.PluginReference = taggedRef.String()
-
-	pm.config.LogPluginEvent(p.PluginObj.ID, name, "create")
-
-	return nil
-}
-
-func (pm *Manager) validateConfig(config types.PluginConfig) error {
-	return nil // TODO:
-}
-
-func splitConfigRootFSFromTar(in io.ReadCloser, config *[]byte) io.ReadCloser {
-	pr, pw := io.Pipe()
-	go func() {
-		tarReader := tar.NewReader(in)
-		tarWriter := tar.NewWriter(pw)
-		defer in.Close()
-
-		hasRootFS := false
-
-		for {
-			hdr, err := tarReader.Next()
-			if err == io.EOF {
-				if !hasRootFS {
-					pw.CloseWithError(errors.Wrap(err, "no rootfs found"))
-					return
-				}
-				// Signals end of archive.
-				tarWriter.Close()
-				pw.Close()
-				return
-			}
-			if err != nil {
-				pw.CloseWithError(errors.Wrap(err, "failed to read from tar"))
-				return
-			}
-
-			content := io.Reader(tarReader)
-			name := path.Clean(hdr.Name)
-			if path.IsAbs(name) {
-				name = name[1:]
-			}
-			if name == configFileName {
-				dt, err := ioutil.ReadAll(content)
-				if err != nil {
-					pw.CloseWithError(errors.Wrapf(err, "failed to read %s", configFileName))
-					return
-				}
-				*config = dt
-			}
-			if parts := strings.Split(name, "/"); len(parts) != 0 && parts[0] == rootFSFileName {
-				hdr.Name = path.Clean(path.Join(parts[1:]...))
-				if hdr.Typeflag == tar.TypeLink && strings.HasPrefix(strings.ToLower(hdr.Linkname), rootFSFileName+"/") {
-					hdr.Linkname = hdr.Linkname[len(rootFSFileName)+1:]
-				}
-				if err := tarWriter.WriteHeader(hdr); err != nil {
-					pw.CloseWithError(errors.Wrap(err, "error writing tar header"))
-					return
-				}
-				if _, err := pools.Copy(tarWriter, content); err != nil {
-					pw.CloseWithError(errors.Wrap(err, "error copying tar data"))
-					return
-				}
-				hasRootFS = true
-			} else {
-				io.Copy(ioutil.Discard, content)
-			}
-		}
-	}()
-	return pr
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/backend_unsupported.go b/installer/vendor/github.com/docker/docker/plugin/backend_unsupported.go
deleted file mode 100644
index 66e6dab9e8..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/backend_unsupported.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// +build !linux
-
-package plugin
-
-import (
-	"errors"
-	"io"
-	"net/http"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/reference"
-	"golang.org/x/net/context"
-)
-
-var errNotSupported = errors.New("plugins are not supported on this platform")
-
-// Disable deactivates a plugin, which implies that they cannot be used by containers.
-func (pm *Manager) Disable(name string, config *types.PluginDisableConfig) error {
-	return errNotSupported
-}
-
-// Enable activates a plugin, which implies that they are ready to be used by containers.
-func (pm *Manager) Enable(name string, config *types.PluginEnableConfig) error {
-	return errNotSupported
-}
-
-// Inspect examines a plugin config
-func (pm *Manager) Inspect(refOrID string) (tp *types.Plugin, err error) {
-	return nil, errNotSupported
-}
-
-// Privileges pulls a plugin config and computes the privileges required to install it.
-func (pm *Manager) Privileges(ctx context.Context, ref reference.Named, metaHeader http.Header, authConfig *types.AuthConfig) (types.PluginPrivileges, error) {
-	return nil, errNotSupported
-}
-
-// Pull pulls a plugin, check if the correct privileges are provided and install the plugin.
-func (pm *Manager) Pull(ctx context.Context, ref reference.Named, name string, metaHeader http.Header, authConfig *types.AuthConfig, privileges types.PluginPrivileges, out io.Writer) error {
-	return errNotSupported
-}
-
-// Upgrade pulls a plugin, check if the correct privileges are provided and install the plugin.
-func (pm *Manager) Upgrade(ctx context.Context, ref reference.Named, name string, metaHeader http.Header, authConfig *types.AuthConfig, privileges types.PluginPrivileges, outStream io.Writer) error {
-	return errNotSupported
-}
-
-// List displays the list of plugins and associated metadata.
-func (pm *Manager) List() ([]types.Plugin, error) {
-	return nil, errNotSupported
-}
-
-// Push pushes a plugin to the store.
-func (pm *Manager) Push(ctx context.Context, name string, metaHeader http.Header, authConfig *types.AuthConfig, out io.Writer) error {
-	return errNotSupported
-}
-
-// Remove deletes plugin's root directory.
-func (pm *Manager) Remove(name string, config *types.PluginRmConfig) error {
-	return errNotSupported
-}
-
-// Set sets plugin args
-func (pm *Manager) Set(name string, args []string) error {
-	return errNotSupported
-}
-
-// CreateFromContext creates a plugin from the given pluginDir which contains
-// both the rootfs and the config.json and a repoName with optional tag.
-func (pm *Manager) CreateFromContext(ctx context.Context, tarCtx io.ReadCloser, options *types.PluginCreateOptions) error {
-	return errNotSupported
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/blobstore.go b/installer/vendor/github.com/docker/docker/plugin/blobstore.go
deleted file mode 100644
index dc9e598e04..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/blobstore.go
+++ /dev/null
@@ -1,181 +0,0 @@
-package plugin
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/pkg/errors"
-	"golang.org/x/net/context"
-)
-
-type blobstore interface {
-	New() (WriteCommitCloser, error)
-	Get(dgst digest.Digest) (io.ReadCloser, error)
-	Size(dgst digest.Digest) (int64, error)
-}
-
-type basicBlobStore struct {
-	path string
-}
-
-func newBasicBlobStore(p string) (*basicBlobStore, error) {
-	tmpdir := filepath.Join(p, "tmp")
-	if err := os.MkdirAll(tmpdir, 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to mkdir %v", p)
-	}
-	return &basicBlobStore{path: p}, nil
-}
-
-func (b *basicBlobStore) New() (WriteCommitCloser, error) {
-	f, err := ioutil.TempFile(filepath.Join(b.path, "tmp"), ".insertion")
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to create temp file")
-	}
-	return newInsertion(f), nil
-}
-
-func (b *basicBlobStore) Get(dgst digest.Digest) (io.ReadCloser, error) {
-	return os.Open(filepath.Join(b.path, string(dgst.Algorithm()), dgst.Hex()))
-}
-
-func (b *basicBlobStore) Size(dgst digest.Digest) (int64, error) {
-	stat, err := os.Stat(filepath.Join(b.path, string(dgst.Algorithm()), dgst.Hex()))
-	if err != nil {
-		return 0, err
-	}
-	return stat.Size(), nil
-}
-
-func (b *basicBlobStore) gc(whitelist map[digest.Digest]struct{}) {
-	for _, alg := range []string{string(digest.Canonical)} {
-		items, err := ioutil.ReadDir(filepath.Join(b.path, alg))
-		if err != nil {
-			continue
-		}
-		for _, fi := range items {
-			if _, exists := whitelist[digest.Digest(alg+":"+fi.Name())]; !exists {
-				p := filepath.Join(b.path, alg, fi.Name())
-				err := os.RemoveAll(p)
-				logrus.Debugf("cleaned up blob %v: %v", p, err)
-			}
-		}
-	}
-
-}
-
-// WriteCommitCloser defines object that can be committed to blobstore.
-type WriteCommitCloser interface {
-	io.WriteCloser
-	Commit() (digest.Digest, error)
-}
-
-type insertion struct {
-	io.Writer
-	f        *os.File
-	digester digest.Digester
-	closed   bool
-}
-
-func newInsertion(tempFile *os.File) *insertion {
-	digester := digest.Canonical.New()
-	return &insertion{f: tempFile, digester: digester, Writer: io.MultiWriter(tempFile, digester.Hash())}
-}
-
-func (i *insertion) Commit() (digest.Digest, error) {
-	p := i.f.Name()
-	d := filepath.Join(filepath.Join(p, "../../"))
-	i.f.Sync()
-	defer os.RemoveAll(p)
-	if err := i.f.Close(); err != nil {
-		return "", err
-	}
-	i.closed = true
-	dgst := i.digester.Digest()
-	if err := os.MkdirAll(filepath.Join(d, string(dgst.Algorithm())), 0700); err != nil {
-		return "", errors.Wrapf(err, "failed to mkdir %v", d)
-	}
-	if err := os.Rename(p, filepath.Join(d, string(dgst.Algorithm()), dgst.Hex())); err != nil {
-		return "", errors.Wrapf(err, "failed to rename %v", p)
-	}
-	return dgst, nil
-}
-
-func (i *insertion) Close() error {
-	if i.closed {
-		return nil
-	}
-	defer os.RemoveAll(i.f.Name())
-	return i.f.Close()
-}
-
-type downloadManager struct {
-	blobStore    blobstore
-	tmpDir       string
-	blobs        []digest.Digest
-	configDigest digest.Digest
-}
-
-func (dm *downloadManager) Download(ctx context.Context, initialRootFS image.RootFS, layers []xfer.DownloadDescriptor, progressOutput progress.Output) (image.RootFS, func(), error) {
-	for _, l := range layers {
-		b, err := dm.blobStore.New()
-		if err != nil {
-			return initialRootFS, nil, err
-		}
-		defer b.Close()
-		rc, _, err := l.Download(ctx, progressOutput)
-		if err != nil {
-			return initialRootFS, nil, errors.Wrap(err, "failed to download")
-		}
-		defer rc.Close()
-		r := io.TeeReader(rc, b)
-		inflatedLayerData, err := archive.DecompressStream(r)
-		if err != nil {
-			return initialRootFS, nil, err
-		}
-		digester := digest.Canonical.New()
-		if _, err := archive.ApplyLayer(dm.tmpDir, io.TeeReader(inflatedLayerData, digester.Hash())); err != nil {
-			return initialRootFS, nil, err
-		}
-		initialRootFS.Append(layer.DiffID(digester.Digest()))
-		d, err := b.Commit()
-		if err != nil {
-			return initialRootFS, nil, err
-		}
-		dm.blobs = append(dm.blobs, d)
-	}
-	return initialRootFS, nil, nil
-}
-
-func (dm *downloadManager) Put(dt []byte) (digest.Digest, error) {
-	b, err := dm.blobStore.New()
-	if err != nil {
-		return "", err
-	}
-	defer b.Close()
-	n, err := b.Write(dt)
-	if err != nil {
-		return "", err
-	}
-	if n != len(dt) {
-		return "", io.ErrShortWrite
-	}
-	d, err := b.Commit()
-	dm.configDigest = d
-	return d, err
-}
-
-func (dm *downloadManager) Get(d digest.Digest) ([]byte, error) {
-	return nil, digest.ErrDigestNotFound
-}
-func (dm *downloadManager) RootFSFromConfig(c []byte) (*image.RootFS, error) {
-	return configToRootFS(c)
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/defs.go b/installer/vendor/github.com/docker/docker/plugin/defs.go
deleted file mode 100644
index 927f639166..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/defs.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package plugin
-
-import (
-	"sync"
-
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/plugin/v2"
-)
-
-// Store manages the plugin inventory in memory and on-disk
-type Store struct {
-	sync.RWMutex
-	plugins map[string]*v2.Plugin
-	/* handlers are necessary for transition path of legacy plugins
-	 * to the new model. Legacy plugins use Handle() for registering an
-	 * activation callback.*/
-	handlers map[string][]func(string, *plugins.Client)
-}
-
-// NewStore creates a Store.
-func NewStore(libRoot string) *Store {
-	return &Store{
-		plugins:  make(map[string]*v2.Plugin),
-		handlers: make(map[string][]func(string, *plugins.Client)),
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/manager.go b/installer/vendor/github.com/docker/docker/plugin/manager.go
deleted file mode 100644
index f260aa61a7..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/manager.go
+++ /dev/null
@@ -1,347 +0,0 @@
-package plugin
-
-import (
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"strings"
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/image"
-	"github.com/docker/docker/layer"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/plugin/v2"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/registry"
-	"github.com/pkg/errors"
-)
-
-const configFileName = "config.json"
-const rootFSFileName = "rootfs"
-
-var validFullID = regexp.MustCompile(`^([a-f0-9]{64})$`)
-
-func (pm *Manager) restorePlugin(p *v2.Plugin) error {
-	if p.IsEnabled() {
-		return pm.restore(p)
-	}
-	return nil
-}
-
-type eventLogger func(id, name, action string)
-
-// ManagerConfig defines configuration needed to start new manager.
-type ManagerConfig struct {
-	Store              *Store // remove
-	Executor           libcontainerd.Remote
-	RegistryService    registry.Service
-	LiveRestoreEnabled bool // TODO: remove
-	LogPluginEvent     eventLogger
-	Root               string
-	ExecRoot           string
-}
-
-// Manager controls the plugin subsystem.
-type Manager struct {
-	config           ManagerConfig
-	mu               sync.RWMutex // protects cMap
-	muGC             sync.RWMutex // protects blobstore deletions
-	cMap             map[*v2.Plugin]*controller
-	containerdClient libcontainerd.Client
-	blobStore        *basicBlobStore
-}
-
-// controller represents the manager's control on a plugin.
-type controller struct {
-	restart       bool
-	exitChan      chan bool
-	timeoutInSecs int
-}
-
-// pluginRegistryService ensures that all resolved repositories
-// are of the plugin class.
-type pluginRegistryService struct {
-	registry.Service
-}
-
-func (s pluginRegistryService) ResolveRepository(name reference.Named) (repoInfo *registry.RepositoryInfo, err error) {
-	repoInfo, err = s.Service.ResolveRepository(name)
-	if repoInfo != nil {
-		repoInfo.Class = "plugin"
-	}
-	return
-}
-
-// NewManager returns a new plugin manager.
-func NewManager(config ManagerConfig) (*Manager, error) {
-	if config.RegistryService != nil {
-		config.RegistryService = pluginRegistryService{config.RegistryService}
-	}
-	manager := &Manager{
-		config: config,
-	}
-	if err := os.MkdirAll(manager.config.Root, 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to mkdir %v", manager.config.Root)
-	}
-	if err := os.MkdirAll(manager.config.ExecRoot, 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to mkdir %v", manager.config.ExecRoot)
-	}
-	if err := os.MkdirAll(manager.tmpDir(), 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to mkdir %v", manager.tmpDir())
-	}
-	var err error
-	manager.containerdClient, err = config.Executor.Client(manager) // todo: move to another struct
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to create containerd client")
-	}
-	manager.blobStore, err = newBasicBlobStore(filepath.Join(manager.config.Root, "storage/blobs"))
-	if err != nil {
-		return nil, err
-	}
-
-	manager.cMap = make(map[*v2.Plugin]*controller)
-	if err := manager.reload(); err != nil {
-		return nil, errors.Wrap(err, "failed to restore plugins")
-	}
-	return manager, nil
-}
-
-func (pm *Manager) tmpDir() string {
-	return filepath.Join(pm.config.Root, "tmp")
-}
-
-// StateChanged updates plugin internals using libcontainerd events.
-func (pm *Manager) StateChanged(id string, e libcontainerd.StateInfo) error {
-	logrus.Debugf("plugin state changed %s %#v", id, e)
-
-	switch e.State {
-	case libcontainerd.StateExit:
-		p, err := pm.config.Store.GetV2Plugin(id)
-		if err != nil {
-			return err
-		}
-
-		pm.mu.RLock()
-		c := pm.cMap[p]
-
-		if c.exitChan != nil {
-			close(c.exitChan)
-		}
-		restart := c.restart
-		pm.mu.RUnlock()
-
-		os.RemoveAll(filepath.Join(pm.config.ExecRoot, id))
-
-		if p.PropagatedMount != "" {
-			if err := mount.Unmount(p.PropagatedMount); err != nil {
-				logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)
-			}
-			propRoot := filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
-			if err := mount.Unmount(propRoot); err != nil {
-				logrus.Warn("Could not unmount %s: %v", propRoot, err)
-			}
-		}
-
-		if restart {
-			pm.enable(p, c, true)
-		}
-	}
-
-	return nil
-}
-
-func (pm *Manager) reload() error { // todo: restore
-	dir, err := ioutil.ReadDir(pm.config.Root)
-	if err != nil {
-		return errors.Wrapf(err, "failed to read %v", pm.config.Root)
-	}
-	plugins := make(map[string]*v2.Plugin)
-	for _, v := range dir {
-		if validFullID.MatchString(v.Name()) {
-			p, err := pm.loadPlugin(v.Name())
-			if err != nil {
-				return err
-			}
-			plugins[p.GetID()] = p
-		}
-	}
-
-	pm.config.Store.SetAll(plugins)
-
-	var wg sync.WaitGroup
-	wg.Add(len(plugins))
-	for _, p := range plugins {
-		c := &controller{} // todo: remove this
-		pm.cMap[p] = c
-		go func(p *v2.Plugin) {
-			defer wg.Done()
-			if err := pm.restorePlugin(p); err != nil {
-				logrus.Errorf("failed to restore plugin '%s': %s", p.Name(), err)
-				return
-			}
-
-			if p.Rootfs != "" {
-				p.Rootfs = filepath.Join(pm.config.Root, p.PluginObj.ID, "rootfs")
-			}
-
-			// We should only enable rootfs propagation for certain plugin types that need it.
-			for _, typ := range p.PluginObj.Config.Interface.Types {
-				if (typ.Capability == "volumedriver" || typ.Capability == "graphdriver") && typ.Prefix == "docker" && strings.HasPrefix(typ.Version, "1.") {
-					if p.PluginObj.Config.PropagatedMount != "" {
-						propRoot := filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
-
-						// check if we need to migrate an older propagated mount from before
-						// these mounts were stored outside the plugin rootfs
-						if _, err := os.Stat(propRoot); os.IsNotExist(err) {
-							if _, err := os.Stat(p.PropagatedMount); err == nil {
-								// make sure nothing is mounted here
-								// don't care about errors
-								mount.Unmount(p.PropagatedMount)
-								if err := os.Rename(p.PropagatedMount, propRoot); err != nil {
-									logrus.WithError(err).WithField("dir", propRoot).Error("error migrating propagated mount storage")
-								}
-								if err := os.MkdirAll(p.PropagatedMount, 0755); err != nil {
-									logrus.WithError(err).WithField("dir", p.PropagatedMount).Error("error migrating propagated mount storage")
-								}
-							}
-						}
-
-						if err := os.MkdirAll(propRoot, 0755); err != nil {
-							logrus.Errorf("failed to create PropagatedMount directory at %s: %v", propRoot, err)
-						}
-						// TODO: sanitize PropagatedMount and prevent breakout
-						p.PropagatedMount = filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)
-						if err := os.MkdirAll(p.PropagatedMount, 0755); err != nil {
-							logrus.Errorf("failed to create PropagatedMount directory at %s: %v", p.PropagatedMount, err)
-							return
-						}
-					}
-				}
-			}
-
-			pm.save(p)
-			requiresManualRestore := !pm.config.LiveRestoreEnabled && p.IsEnabled()
-
-			if requiresManualRestore {
-				// if liveRestore is not enabled, the plugin will be stopped now so we should enable it
-				if err := pm.enable(p, c, true); err != nil {
-					logrus.Errorf("failed to enable plugin '%s': %s", p.Name(), err)
-				}
-			}
-		}(p)
-	}
-	wg.Wait()
-	return nil
-}
-
-func (pm *Manager) loadPlugin(id string) (*v2.Plugin, error) {
-	p := filepath.Join(pm.config.Root, id, configFileName)
-	dt, err := ioutil.ReadFile(p)
-	if err != nil {
-		return nil, errors.Wrapf(err, "error reading %v", p)
-	}
-	var plugin v2.Plugin
-	if err := json.Unmarshal(dt, &plugin); err != nil {
-		return nil, errors.Wrapf(err, "error decoding %v", p)
-	}
-	return &plugin, nil
-}
-
-func (pm *Manager) save(p *v2.Plugin) error {
-	pluginJSON, err := json.Marshal(p)
-	if err != nil {
-		return errors.Wrap(err, "failed to marshal plugin json")
-	}
-	if err := ioutils.AtomicWriteFile(filepath.Join(pm.config.Root, p.GetID(), configFileName), pluginJSON, 0600); err != nil {
-		return errors.Wrap(err, "failed to write atomically plugin json")
-	}
-	return nil
-}
-
-// GC cleans up unrefrenced blobs. This is recommended to run in a goroutine
-func (pm *Manager) GC() {
-	pm.muGC.Lock()
-	defer pm.muGC.Unlock()
-
-	whitelist := make(map[digest.Digest]struct{})
-	for _, p := range pm.config.Store.GetAll() {
-		whitelist[p.Config] = struct{}{}
-		for _, b := range p.Blobsums {
-			whitelist[b] = struct{}{}
-		}
-	}
-
-	pm.blobStore.gc(whitelist)
-}
-
-type logHook struct{ id string }
-
-func (logHook) Levels() []logrus.Level {
-	return logrus.AllLevels
-}
-
-func (l logHook) Fire(entry *logrus.Entry) error {
-	entry.Data = logrus.Fields{"plugin": l.id}
-	return nil
-}
-
-func attachToLog(id string) func(libcontainerd.IOPipe) error {
-	return func(iop libcontainerd.IOPipe) error {
-		iop.Stdin.Close()
-
-		logger := logrus.New()
-		logger.Hooks.Add(logHook{id})
-		// TODO: cache writer per id
-		w := logger.Writer()
-		go func() {
-			io.Copy(w, iop.Stdout)
-		}()
-		go func() {
-			// TODO: update logrus and use logger.WriterLevel
-			io.Copy(w, iop.Stderr)
-		}()
-		return nil
-	}
-}
-
-func validatePrivileges(requiredPrivileges, privileges types.PluginPrivileges) error {
-	// todo: make a better function that doesn't check order
-	if !reflect.DeepEqual(privileges, requiredPrivileges) {
-		return errors.New("incorrect privileges")
-	}
-	return nil
-}
-
-func configToRootFS(c []byte) (*image.RootFS, error) {
-	var pluginConfig types.PluginConfig
-	if err := json.Unmarshal(c, &pluginConfig); err != nil {
-		return nil, err
-	}
-	// validation for empty rootfs is in distribution code
-	if pluginConfig.Rootfs == nil {
-		return nil, nil
-	}
-
-	return rootFSFromPlugin(pluginConfig.Rootfs), nil
-}
-
-func rootFSFromPlugin(pluginfs *types.PluginConfigRootfs) *image.RootFS {
-	rootFS := image.RootFS{
-		Type:    pluginfs.Type,
-		DiffIDs: make([]layer.DiffID, len(pluginfs.DiffIds)),
-	}
-	for i := range pluginfs.DiffIds {
-		rootFS.DiffIDs[i] = layer.DiffID(pluginfs.DiffIds[i])
-	}
-
-	return &rootFS
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/manager_linux.go b/installer/vendor/github.com/docker/docker/plugin/manager_linux.go
deleted file mode 100644
index ad66616628..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/manager_linux.go
+++ /dev/null
@@ -1,284 +0,0 @@
-// +build linux
-
-package plugin
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"syscall"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/daemon/initlayer"
-	"github.com/docker/docker/libcontainerd"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/plugin/v2"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
-)
-
-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
-	p.Rootfs = filepath.Join(pm.config.Root, p.PluginObj.ID, "rootfs")
-	if p.IsEnabled() && !force {
-		return fmt.Errorf("plugin %s is already enabled", p.Name())
-	}
-	spec, err := p.InitSpec(pm.config.ExecRoot)
-	if err != nil {
-		return err
-	}
-
-	c.restart = true
-	c.exitChan = make(chan bool)
-
-	pm.mu.Lock()
-	pm.cMap[p] = c
-	pm.mu.Unlock()
-
-	var propRoot string
-	if p.PropagatedMount != "" {
-		propRoot = filepath.Join(filepath.Dir(p.Rootfs), "propagated-mount")
-
-		if err := os.MkdirAll(propRoot, 0755); err != nil {
-			logrus.Errorf("failed to create PropagatedMount directory at %s: %v", propRoot, err)
-		}
-
-		if err := mount.MakeRShared(propRoot); err != nil {
-			return errors.Wrap(err, "error setting up propagated mount dir")
-		}
-
-		if err := mount.Mount(propRoot, p.PropagatedMount, "none", "rbind"); err != nil {
-			return errors.Wrap(err, "error creating mount for propagated mount")
-		}
-	}
-
-	if err := initlayer.Setup(filepath.Join(pm.config.Root, p.PluginObj.ID, rootFSFileName), 0, 0); err != nil {
-		return errors.WithStack(err)
-	}
-
-	if err := pm.containerdClient.Create(p.GetID(), "", "", specs.Spec(*spec), attachToLog(p.GetID())); err != nil {
-		if p.PropagatedMount != "" {
-			if err := mount.Unmount(p.PropagatedMount); err != nil {
-				logrus.Warnf("Could not unmount %s: %v", p.PropagatedMount, err)
-			}
-			if err := mount.Unmount(propRoot); err != nil {
-				logrus.Warnf("Could not unmount %s: %v", propRoot, err)
-			}
-		}
-		return errors.WithStack(err)
-	}
-
-	return pm.pluginPostStart(p, c)
-}
-
-func (pm *Manager) pluginPostStart(p *v2.Plugin, c *controller) error {
-	client, err := plugins.NewClientWithTimeout("unix://"+filepath.Join(pm.config.ExecRoot, p.GetID(), p.GetSocket()), nil, c.timeoutInSecs)
-	if err != nil {
-		c.restart = false
-		shutdownPlugin(p, c, pm.containerdClient)
-		return errors.WithStack(err)
-	}
-
-	p.SetPClient(client)
-	pm.config.Store.SetState(p, true)
-	pm.config.Store.CallHandler(p)
-
-	return pm.save(p)
-}
-
-func (pm *Manager) restore(p *v2.Plugin) error {
-	if err := pm.containerdClient.Restore(p.GetID(), attachToLog(p.GetID())); err != nil {
-		return err
-	}
-
-	if pm.config.LiveRestoreEnabled {
-		c := &controller{}
-		if pids, _ := pm.containerdClient.GetPidsForContainer(p.GetID()); len(pids) == 0 {
-			// plugin is not running, so follow normal startup procedure
-			return pm.enable(p, c, true)
-		}
-
-		c.exitChan = make(chan bool)
-		c.restart = true
-		pm.mu.Lock()
-		pm.cMap[p] = c
-		pm.mu.Unlock()
-		return pm.pluginPostStart(p, c)
-	}
-
-	return nil
-}
-
-func shutdownPlugin(p *v2.Plugin, c *controller, containerdClient libcontainerd.Client) {
-	pluginID := p.GetID()
-
-	err := containerdClient.Signal(pluginID, int(syscall.SIGTERM))
-	if err != nil {
-		logrus.Errorf("Sending SIGTERM to plugin failed with error: %v", err)
-	} else {
-		select {
-		case <-c.exitChan:
-			logrus.Debug("Clean shutdown of plugin")
-		case <-time.After(time.Second * 10):
-			logrus.Debug("Force shutdown plugin")
-			if err := containerdClient.Signal(pluginID, int(syscall.SIGKILL)); err != nil {
-				logrus.Errorf("Sending SIGKILL to plugin failed with error: %v", err)
-			}
-		}
-	}
-}
-
-func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
-	if !p.IsEnabled() {
-		return fmt.Errorf("plugin %s is already disabled", p.Name())
-	}
-
-	c.restart = false
-	shutdownPlugin(p, c, pm.containerdClient)
-	pm.config.Store.SetState(p, false)
-	return pm.save(p)
-}
-
-// Shutdown stops all plugins and called during daemon shutdown.
-func (pm *Manager) Shutdown() {
-	plugins := pm.config.Store.GetAll()
-	for _, p := range plugins {
-		pm.mu.RLock()
-		c := pm.cMap[p]
-		pm.mu.RUnlock()
-
-		if pm.config.LiveRestoreEnabled && p.IsEnabled() {
-			logrus.Debug("Plugin active when liveRestore is set, skipping shutdown")
-			continue
-		}
-		if pm.containerdClient != nil && p.IsEnabled() {
-			c.restart = false
-			shutdownPlugin(p, c, pm.containerdClient)
-		}
-	}
-}
-
-func (pm *Manager) upgradePlugin(p *v2.Plugin, configDigest digest.Digest, blobsums []digest.Digest, tmpRootFSDir string, privileges *types.PluginPrivileges) (err error) {
-	config, err := pm.setupNewPlugin(configDigest, blobsums, privileges)
-	if err != nil {
-		return err
-	}
-
-	pdir := filepath.Join(pm.config.Root, p.PluginObj.ID)
-	orig := filepath.Join(pdir, "rootfs")
-	backup := orig + "-old"
-	if err := os.Rename(orig, backup); err != nil {
-		return err
-	}
-
-	defer func() {
-		if err != nil {
-			if rmErr := os.RemoveAll(orig); rmErr != nil && !os.IsNotExist(rmErr) {
-				logrus.WithError(rmErr).WithField("dir", backup).Error("error cleaning up after failed upgrade")
-				return
-			}
-
-			if err := os.Rename(backup, orig); err != nil {
-				err = errors.Wrap(err, "error restoring old plugin root on upgrade failure")
-			}
-			if rmErr := os.RemoveAll(tmpRootFSDir); rmErr != nil && !os.IsNotExist(rmErr) {
-				logrus.WithError(rmErr).WithField("plugin", p.Name()).Errorf("error cleaning up plugin upgrade dir: %s", tmpRootFSDir)
-			}
-		} else {
-			if rmErr := os.RemoveAll(backup); rmErr != nil && !os.IsNotExist(rmErr) {
-				logrus.WithError(rmErr).WithField("dir", backup).Error("error cleaning up old plugin root after successful upgrade")
-			}
-
-			p.Config = configDigest
-			p.Blobsums = blobsums
-		}
-	}()
-
-	if err := os.Rename(tmpRootFSDir, orig); err != nil {
-		return errors.Wrap(err, "error upgrading")
-	}
-
-	p.PluginObj.Config = config
-	err = pm.save(p)
-	return errors.Wrap(err, "error saving upgraded plugin config")
-}
-
-func (pm *Manager) setupNewPlugin(configDigest digest.Digest, blobsums []digest.Digest, privileges *types.PluginPrivileges) (types.PluginConfig, error) {
-	configRC, err := pm.blobStore.Get(configDigest)
-	if err != nil {
-		return types.PluginConfig{}, err
-	}
-	defer configRC.Close()
-
-	var config types.PluginConfig
-	dec := json.NewDecoder(configRC)
-	if err := dec.Decode(&config); err != nil {
-		return types.PluginConfig{}, errors.Wrapf(err, "failed to parse config")
-	}
-	if dec.More() {
-		return types.PluginConfig{}, errors.New("invalid config json")
-	}
-
-	requiredPrivileges, err := computePrivileges(config)
-	if err != nil {
-		return types.PluginConfig{}, err
-	}
-	if privileges != nil {
-		if err := validatePrivileges(requiredPrivileges, *privileges); err != nil {
-			return types.PluginConfig{}, err
-		}
-	}
-
-	return config, nil
-}
-
-// createPlugin creates a new plugin. take lock before calling.
-func (pm *Manager) createPlugin(name string, configDigest digest.Digest, blobsums []digest.Digest, rootFSDir string, privileges *types.PluginPrivileges) (p *v2.Plugin, err error) {
-	if err := pm.config.Store.validateName(name); err != nil { // todo: this check is wrong. remove store
-		return nil, err
-	}
-
-	config, err := pm.setupNewPlugin(configDigest, blobsums, privileges)
-	if err != nil {
-		return nil, err
-	}
-
-	p = &v2.Plugin{
-		PluginObj: types.Plugin{
-			Name:   name,
-			ID:     stringid.GenerateRandomID(),
-			Config: config,
-		},
-		Config:   configDigest,
-		Blobsums: blobsums,
-	}
-	p.InitEmptySettings()
-
-	pdir := filepath.Join(pm.config.Root, p.PluginObj.ID)
-	if err := os.MkdirAll(pdir, 0700); err != nil {
-		return nil, errors.Wrapf(err, "failed to mkdir %v", pdir)
-	}
-
-	defer func() {
-		if err != nil {
-			os.RemoveAll(pdir)
-		}
-	}()
-
-	if err := os.Rename(rootFSDir, filepath.Join(pdir, rootFSFileName)); err != nil {
-		return nil, errors.Wrap(err, "failed to rename rootfs")
-	}
-
-	if err := pm.save(p); err != nil {
-		return nil, err
-	}
-
-	pm.config.Store.Add(p) // todo: remove
-
-	return p, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/manager_solaris.go b/installer/vendor/github.com/docker/docker/plugin/manager_solaris.go
deleted file mode 100644
index 72ccae72d3..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/manager_solaris.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/plugin/v2"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) initSpec(p *v2.Plugin) (*specs.Spec, error) {
-	return nil, fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) restore(p *v2.Plugin) error {
-	return fmt.Errorf("Not implemented")
-}
-
-// Shutdown plugins
-func (pm *Manager) Shutdown() {
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/manager_windows.go b/installer/vendor/github.com/docker/docker/plugin/manager_windows.go
deleted file mode 100644
index 4469a671f7..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/manager_windows.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// +build windows
-
-package plugin
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/plugin/v2"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) initSpec(p *v2.Plugin) (*specs.Spec, error) {
-	return nil, fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) disable(p *v2.Plugin, c *controller) error {
-	return fmt.Errorf("Not implemented")
-}
-
-func (pm *Manager) restore(p *v2.Plugin) error {
-	return fmt.Errorf("Not implemented")
-}
-
-// Shutdown plugins
-func (pm *Manager) Shutdown() {
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/store.go b/installer/vendor/github.com/docker/docker/plugin/store.go
deleted file mode 100644
index b7a96a950a..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/store.go
+++ /dev/null
@@ -1,263 +0,0 @@
-package plugin
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/docker/plugin/v2"
-	"github.com/docker/docker/reference"
-	"github.com/pkg/errors"
-)
-
-/* allowV1PluginsFallback determines daemon's support for V1 plugins.
- * When the time comes to remove support for V1 plugins, flipping
- * this bool is all that will be needed.
- */
-const allowV1PluginsFallback bool = true
-
-/* defaultAPIVersion is the version of the plugin API for volume, network,
-   IPAM and authz. This is a very stable API. When we update this API, then
-   pluginType should include a version. eg "networkdriver/2.0".
-*/
-const defaultAPIVersion string = "1.0"
-
-// ErrNotFound indicates that a plugin was not found locally.
-type ErrNotFound string
-
-func (name ErrNotFound) Error() string { return fmt.Sprintf("plugin %q not found", string(name)) }
-
-// ErrAmbiguous indicates that a plugin was not found locally.
-type ErrAmbiguous string
-
-func (name ErrAmbiguous) Error() string {
-	return fmt.Sprintf("multiple plugins found for %q", string(name))
-}
-
-// GetV2Plugin retreives a plugin by name, id or partial ID.
-func (ps *Store) GetV2Plugin(refOrID string) (*v2.Plugin, error) {
-	ps.RLock()
-	defer ps.RUnlock()
-
-	id, err := ps.resolvePluginID(refOrID)
-	if err != nil {
-		return nil, err
-	}
-
-	p, idOk := ps.plugins[id]
-	if !idOk {
-		return nil, errors.WithStack(ErrNotFound(id))
-	}
-
-	return p, nil
-}
-
-// validateName returns error if name is already reserved. always call with lock and full name
-func (ps *Store) validateName(name string) error {
-	for _, p := range ps.plugins {
-		if p.Name() == name {
-			return errors.Errorf("plugin %q already exists", name)
-		}
-	}
-	return nil
-}
-
-// GetAll retreives all plugins.
-func (ps *Store) GetAll() map[string]*v2.Plugin {
-	ps.RLock()
-	defer ps.RUnlock()
-	return ps.plugins
-}
-
-// SetAll initialized plugins during daemon restore.
-func (ps *Store) SetAll(plugins map[string]*v2.Plugin) {
-	ps.Lock()
-	defer ps.Unlock()
-	ps.plugins = plugins
-}
-
-func (ps *Store) getAllByCap(capability string) []plugingetter.CompatPlugin {
-	ps.RLock()
-	defer ps.RUnlock()
-
-	result := make([]plugingetter.CompatPlugin, 0, 1)
-	for _, p := range ps.plugins {
-		if p.IsEnabled() {
-			if _, err := p.FilterByCap(capability); err == nil {
-				result = append(result, p)
-			}
-		}
-	}
-	return result
-}
-
-// SetState sets the active state of the plugin and updates plugindb.
-func (ps *Store) SetState(p *v2.Plugin, state bool) {
-	ps.Lock()
-	defer ps.Unlock()
-
-	p.PluginObj.Enabled = state
-}
-
-// Add adds a plugin to memory and plugindb.
-// An error will be returned if there is a collision.
-func (ps *Store) Add(p *v2.Plugin) error {
-	ps.Lock()
-	defer ps.Unlock()
-
-	if v, exist := ps.plugins[p.GetID()]; exist {
-		return fmt.Errorf("plugin %q has the same ID %s as %q", p.Name(), p.GetID(), v.Name())
-	}
-	ps.plugins[p.GetID()] = p
-	return nil
-}
-
-// Remove removes a plugin from memory and plugindb.
-func (ps *Store) Remove(p *v2.Plugin) {
-	ps.Lock()
-	delete(ps.plugins, p.GetID())
-	ps.Unlock()
-}
-
-// Get returns an enabled plugin matching the given name and capability.
-func (ps *Store) Get(name, capability string, mode int) (plugingetter.CompatPlugin, error) {
-	var (
-		p   *v2.Plugin
-		err error
-	)
-
-	// Lookup using new model.
-	if ps != nil {
-		p, err = ps.GetV2Plugin(name)
-		if err == nil {
-			p.AddRefCount(mode)
-			if p.IsEnabled() {
-				return p.FilterByCap(capability)
-			}
-			// Plugin was found but it is disabled, so we should not fall back to legacy plugins
-			// but we should error out right away
-			return nil, ErrNotFound(name)
-		}
-		if _, ok := errors.Cause(err).(ErrNotFound); !ok {
-			return nil, err
-		}
-	}
-
-	// Lookup using legacy model.
-	if allowV1PluginsFallback {
-		p, err := plugins.Get(name, capability)
-		if err != nil {
-			return nil, fmt.Errorf("legacy plugin: %v", err)
-		}
-		return p, nil
-	}
-
-	return nil, err
-}
-
-// GetAllManagedPluginsByCap returns a list of managed plugins matching the given capability.
-func (ps *Store) GetAllManagedPluginsByCap(capability string) []plugingetter.CompatPlugin {
-	return ps.getAllByCap(capability)
-}
-
-// GetAllByCap returns a list of enabled plugins matching the given capability.
-func (ps *Store) GetAllByCap(capability string) ([]plugingetter.CompatPlugin, error) {
-	result := make([]plugingetter.CompatPlugin, 0, 1)
-
-	/* Daemon start always calls plugin.Init thereby initializing a store.
-	 * So store on experimental builds can never be nil, even while
-	 * handling legacy plugins. However, there are legacy plugin unit
-	 * tests where the volume subsystem directly talks with the plugin,
-	 * bypassing the daemon. For such tests, this check is necessary.
-	 */
-	if ps != nil {
-		ps.RLock()
-		result = ps.getAllByCap(capability)
-		ps.RUnlock()
-	}
-
-	// Lookup with legacy model
-	if allowV1PluginsFallback {
-		pl, err := plugins.GetAll(capability)
-		if err != nil {
-			return nil, fmt.Errorf("legacy plugin: %v", err)
-		}
-		for _, p := range pl {
-			result = append(result, p)
-		}
-	}
-	return result, nil
-}
-
-// Handle sets a callback for a given capability. It is only used by network
-// and ipam drivers during plugin registration. The callback registers the
-// driver with the subsystem (network, ipam).
-func (ps *Store) Handle(capability string, callback func(string, *plugins.Client)) {
-	pluginType := fmt.Sprintf("docker.%s/%s", strings.ToLower(capability), defaultAPIVersion)
-
-	// Register callback with new plugin model.
-	ps.Lock()
-	handlers, ok := ps.handlers[pluginType]
-	if !ok {
-		handlers = []func(string, *plugins.Client){}
-	}
-	handlers = append(handlers, callback)
-	ps.handlers[pluginType] = handlers
-	ps.Unlock()
-
-	// Register callback with legacy plugin model.
-	if allowV1PluginsFallback {
-		plugins.Handle(capability, callback)
-	}
-}
-
-// CallHandler calls the registered callback. It is invoked during plugin enable.
-func (ps *Store) CallHandler(p *v2.Plugin) {
-	for _, typ := range p.GetTypes() {
-		for _, handler := range ps.handlers[typ.String()] {
-			handler(p.Name(), p.Client())
-		}
-	}
-}
-
-func (ps *Store) resolvePluginID(idOrName string) (string, error) {
-	ps.RLock() // todo: fix
-	defer ps.RUnlock()
-
-	if validFullID.MatchString(idOrName) {
-		return idOrName, nil
-	}
-
-	ref, err := reference.ParseNamed(idOrName)
-	if err != nil {
-		return "", errors.WithStack(ErrNotFound(idOrName))
-	}
-	if _, ok := ref.(reference.Canonical); ok {
-		logrus.Warnf("canonical references cannot be resolved: %v", ref.String())
-		return "", errors.WithStack(ErrNotFound(idOrName))
-	}
-
-	fullRef := reference.WithDefaultTag(ref)
-
-	for _, p := range ps.plugins {
-		if p.PluginObj.Name == fullRef.String() {
-			return p.PluginObj.ID, nil
-		}
-	}
-
-	var found *v2.Plugin
-	for id, p := range ps.plugins { // this can be optimized
-		if strings.HasPrefix(id, idOrName) {
-			if found != nil {
-				return "", errors.WithStack(ErrAmbiguous(idOrName))
-			}
-			found = p
-		}
-	}
-	if found == nil {
-		return "", errors.WithStack(ErrNotFound(idOrName))
-	}
-	return found.PluginObj.ID, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/store_test.go b/installer/vendor/github.com/docker/docker/plugin/store_test.go
deleted file mode 100644
index 6b1f6a9418..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/store_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package plugin
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/plugin/v2"
-)
-
-func TestFilterByCapNeg(t *testing.T) {
-	p := v2.Plugin{PluginObj: types.Plugin{Name: "test:latest"}}
-	iType := types.PluginInterfaceType{"volumedriver", "docker", "1.0"}
-	i := types.PluginConfigInterface{"plugins.sock", []types.PluginInterfaceType{iType}}
-	p.PluginObj.Config.Interface = i
-
-	_, err := p.FilterByCap("foobar")
-	if err == nil {
-		t.Fatalf("expected inadequate error, got %v", err)
-	}
-}
-
-func TestFilterByCapPos(t *testing.T) {
-	p := v2.Plugin{PluginObj: types.Plugin{Name: "test:latest"}}
-
-	iType := types.PluginInterfaceType{"volumedriver", "docker", "1.0"}
-	i := types.PluginConfigInterface{"plugins.sock", []types.PluginInterfaceType{iType}}
-	p.PluginObj.Config.Interface = i
-
-	_, err := p.FilterByCap("volumedriver")
-	if err != nil {
-		t.Fatalf("expected no error, got %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/v2/plugin.go b/installer/vendor/github.com/docker/docker/plugin/v2/plugin.go
deleted file mode 100644
index 93b489a14b..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/v2/plugin.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package v2
-
-import (
-	"fmt"
-	"strings"
-	"sync"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/pkg/plugins"
-)
-
-// Plugin represents an individual plugin.
-type Plugin struct {
-	mu              sync.RWMutex
-	PluginObj       types.Plugin `json:"plugin"` // todo: embed struct
-	pClient         *plugins.Client
-	refCount        int
-	PropagatedMount string // TODO: make private
-	Rootfs          string // TODO: make private
-
-	Config   digest.Digest
-	Blobsums []digest.Digest
-}
-
-const defaultPluginRuntimeDestination = "/run/docker/plugins"
-
-// ErrInadequateCapability indicates that the plugin did not have the requested capability.
-type ErrInadequateCapability struct {
-	cap string
-}
-
-func (e ErrInadequateCapability) Error() string {
-	return fmt.Sprintf("plugin does not provide %q capability", e.cap)
-}
-
-// BasePath returns the path to which all paths returned by the plugin are relative to.
-// For Plugin objects this returns the host path of the plugin container's rootfs.
-func (p *Plugin) BasePath() string {
-	return p.Rootfs
-}
-
-// Client returns the plugin client.
-func (p *Plugin) Client() *plugins.Client {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.pClient
-}
-
-// SetPClient set the plugin client.
-func (p *Plugin) SetPClient(client *plugins.Client) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	p.pClient = client
-}
-
-// IsV1 returns true for V1 plugins and false otherwise.
-func (p *Plugin) IsV1() bool {
-	return false
-}
-
-// Name returns the plugin name.
-func (p *Plugin) Name() string {
-	return p.PluginObj.Name
-}
-
-// FilterByCap query the plugin for a given capability.
-func (p *Plugin) FilterByCap(capability string) (*Plugin, error) {
-	capability = strings.ToLower(capability)
-	for _, typ := range p.PluginObj.Config.Interface.Types {
-		if typ.Capability == capability && typ.Prefix == "docker" {
-			return p, nil
-		}
-	}
-	return nil, ErrInadequateCapability{capability}
-}
-
-// InitEmptySettings initializes empty settings for a plugin.
-func (p *Plugin) InitEmptySettings() {
-	p.PluginObj.Settings.Mounts = make([]types.PluginMount, len(p.PluginObj.Config.Mounts))
-	copy(p.PluginObj.Settings.Mounts, p.PluginObj.Config.Mounts)
-	p.PluginObj.Settings.Devices = make([]types.PluginDevice, len(p.PluginObj.Config.Linux.Devices))
-	copy(p.PluginObj.Settings.Devices, p.PluginObj.Config.Linux.Devices)
-	p.PluginObj.Settings.Env = make([]string, 0, len(p.PluginObj.Config.Env))
-	for _, env := range p.PluginObj.Config.Env {
-		if env.Value != nil {
-			p.PluginObj.Settings.Env = append(p.PluginObj.Settings.Env, fmt.Sprintf("%s=%s", env.Name, *env.Value))
-		}
-	}
-	p.PluginObj.Settings.Args = make([]string, len(p.PluginObj.Config.Args.Value))
-	copy(p.PluginObj.Settings.Args, p.PluginObj.Config.Args.Value)
-}
-
-// Set is used to pass arguments to the plugin.
-func (p *Plugin) Set(args []string) error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	if p.PluginObj.Enabled {
-		return fmt.Errorf("cannot set on an active plugin, disable plugin before setting")
-	}
-
-	sets, err := newSettables(args)
-	if err != nil {
-		return err
-	}
-
-	// TODO(vieux): lots of code duplication here, needs to be refactored.
-
-next:
-	for _, s := range sets {
-		// range over all the envs in the config
-		for _, env := range p.PluginObj.Config.Env {
-			// found the env in the config
-			if env.Name == s.name {
-				// is it settable ?
-				if ok, err := s.isSettable(allowedSettableFieldsEnv, env.Settable); err != nil {
-					return err
-				} else if !ok {
-					return fmt.Errorf("%q is not settable", s.prettyName())
-				}
-				// is it, so lets update the settings in memory
-				updateSettingsEnv(&p.PluginObj.Settings.Env, &s)
-				continue next
-			}
-		}
-
-		// range over all the mounts in the config
-		for _, mount := range p.PluginObj.Config.Mounts {
-			// found the mount in the config
-			if mount.Name == s.name {
-				// is it settable ?
-				if ok, err := s.isSettable(allowedSettableFieldsMounts, mount.Settable); err != nil {
-					return err
-				} else if !ok {
-					return fmt.Errorf("%q is not settable", s.prettyName())
-				}
-
-				// it is, so lets update the settings in memory
-				*mount.Source = s.value
-				continue next
-			}
-		}
-
-		// range over all the devices in the config
-		for _, device := range p.PluginObj.Config.Linux.Devices {
-			// found the device in the config
-			if device.Name == s.name {
-				// is it settable ?
-				if ok, err := s.isSettable(allowedSettableFieldsDevices, device.Settable); err != nil {
-					return err
-				} else if !ok {
-					return fmt.Errorf("%q is not settable", s.prettyName())
-				}
-
-				// it is, so lets update the settings in memory
-				*device.Path = s.value
-				continue next
-			}
-		}
-
-		// found the name in the config
-		if p.PluginObj.Config.Args.Name == s.name {
-			// is it settable ?
-			if ok, err := s.isSettable(allowedSettableFieldsArgs, p.PluginObj.Config.Args.Settable); err != nil {
-				return err
-			} else if !ok {
-				return fmt.Errorf("%q is not settable", s.prettyName())
-			}
-
-			// it is, so lets update the settings in memory
-			p.PluginObj.Settings.Args = strings.Split(s.value, " ")
-			continue next
-		}
-
-		return fmt.Errorf("setting %q not found in the plugin configuration", s.name)
-	}
-
-	return nil
-}
-
-// IsEnabled returns the active state of the plugin.
-func (p *Plugin) IsEnabled() bool {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.PluginObj.Enabled
-}
-
-// GetID returns the plugin's ID.
-func (p *Plugin) GetID() string {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.PluginObj.ID
-}
-
-// GetSocket returns the plugin socket.
-func (p *Plugin) GetSocket() string {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.PluginObj.Config.Interface.Socket
-}
-
-// GetTypes returns the interface types of a plugin.
-func (p *Plugin) GetTypes() []types.PluginInterfaceType {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.PluginObj.Config.Interface.Types
-}
-
-// GetRefCount returns the reference count.
-func (p *Plugin) GetRefCount() int {
-	p.mu.RLock()
-	defer p.mu.RUnlock()
-
-	return p.refCount
-}
-
-// AddRefCount adds to reference count.
-func (p *Plugin) AddRefCount(count int) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	p.refCount += count
-}
-
-// Acquire increments the plugin's reference count
-// This should be followed up by `Release()` when the plugin is no longer in use.
-func (p *Plugin) Acquire() {
-	p.AddRefCount(plugingetter.ACQUIRE)
-}
-
-// Release decrements the plugin's reference count
-// This should only be called when the plugin is no longer in use, e.g. with
-// via `Acquire()` or getter.Get("name", "type", plugingetter.ACQUIRE)
-func (p *Plugin) Release() {
-	p.AddRefCount(plugingetter.RELEASE)
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/v2/plugin_linux.go b/installer/vendor/github.com/docker/docker/plugin/v2/plugin_linux.go
deleted file mode 100644
index e980e7f29a..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/v2/plugin_linux.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// +build linux
-
-package v2
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/oci"
-	"github.com/docker/docker/pkg/system"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/pkg/errors"
-)
-
-// InitSpec creates an OCI spec from the plugin's config.
-func (p *Plugin) InitSpec(execRoot string) (*specs.Spec, error) {
-	s := oci.DefaultSpec()
-	s.Root = specs.Root{
-		Path:     p.Rootfs,
-		Readonly: false, // TODO: all plugins should be readonly? settable in config?
-	}
-
-	userMounts := make(map[string]struct{}, len(p.PluginObj.Settings.Mounts))
-	for _, m := range p.PluginObj.Settings.Mounts {
-		userMounts[m.Destination] = struct{}{}
-	}
-
-	execRoot = filepath.Join(execRoot, p.PluginObj.ID)
-	if err := os.MkdirAll(execRoot, 0700); err != nil {
-		return nil, errors.WithStack(err)
-	}
-
-	mounts := append(p.PluginObj.Config.Mounts, types.PluginMount{
-		Source:      &execRoot,
-		Destination: defaultPluginRuntimeDestination,
-		Type:        "bind",
-		Options:     []string{"rbind", "rshared"},
-	})
-
-	if p.PluginObj.Config.Network.Type != "" {
-		// TODO: if net == bridge, use libnetwork controller to create a new plugin-specific bridge, bind mount /etc/hosts and /etc/resolv.conf look at the docker code (allocateNetwork, initialize)
-		if p.PluginObj.Config.Network.Type == "host" {
-			oci.RemoveNamespace(&s, specs.NamespaceType("network"))
-		}
-		etcHosts := "/etc/hosts"
-		resolvConf := "/etc/resolv.conf"
-		mounts = append(mounts,
-			types.PluginMount{
-				Source:      &etcHosts,
-				Destination: etcHosts,
-				Type:        "bind",
-				Options:     []string{"rbind", "ro"},
-			},
-			types.PluginMount{
-				Source:      &resolvConf,
-				Destination: resolvConf,
-				Type:        "bind",
-				Options:     []string{"rbind", "ro"},
-			})
-	}
-
-	for _, mnt := range mounts {
-		m := specs.Mount{
-			Destination: mnt.Destination,
-			Type:        mnt.Type,
-			Options:     mnt.Options,
-		}
-		if mnt.Source == nil {
-			return nil, errors.New("mount source is not specified")
-		}
-		m.Source = *mnt.Source
-		s.Mounts = append(s.Mounts, m)
-	}
-
-	for i, m := range s.Mounts {
-		if strings.HasPrefix(m.Destination, "/dev/") {
-			if _, ok := userMounts[m.Destination]; ok {
-				s.Mounts = append(s.Mounts[:i], s.Mounts[i+1:]...)
-			}
-		}
-	}
-
-	if p.PluginObj.Config.PropagatedMount != "" {
-		p.PropagatedMount = filepath.Join(p.Rootfs, p.PluginObj.Config.PropagatedMount)
-		s.Linux.RootfsPropagation = "rshared"
-	}
-
-	if p.PluginObj.Config.Linux.AllowAllDevices {
-		rwm := "rwm"
-		s.Linux.Resources.Devices = []specs.DeviceCgroup{{Allow: true, Access: &rwm}}
-	}
-	for _, dev := range p.PluginObj.Settings.Devices {
-		path := *dev.Path
-		d, dPermissions, err := oci.DevicesFromPath(path, path, "rwm")
-		if err != nil {
-			return nil, errors.WithStack(err)
-		}
-		s.Linux.Devices = append(s.Linux.Devices, d...)
-		s.Linux.Resources.Devices = append(s.Linux.Resources.Devices, dPermissions...)
-	}
-
-	envs := make([]string, 1, len(p.PluginObj.Settings.Env)+1)
-	envs[0] = "PATH=" + system.DefaultPathEnv
-	envs = append(envs, p.PluginObj.Settings.Env...)
-
-	args := append(p.PluginObj.Config.Entrypoint, p.PluginObj.Settings.Args...)
-	cwd := p.PluginObj.Config.WorkDir
-	if len(cwd) == 0 {
-		cwd = "/"
-	}
-	s.Process.Terminal = false
-	s.Process.Args = args
-	s.Process.Cwd = cwd
-	s.Process.Env = envs
-
-	s.Process.Capabilities = append(s.Process.Capabilities, p.PluginObj.Config.Linux.Capabilities...)
-
-	return &s, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/v2/plugin_unsupported.go b/installer/vendor/github.com/docker/docker/plugin/v2/plugin_unsupported.go
deleted file mode 100644
index e60fb8311e..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/v2/plugin_unsupported.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// +build !linux
-
-package v2
-
-import (
-	"errors"
-
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// InitSpec creates an OCI spec from the plugin's config.
-func (p *Plugin) InitSpec(execRoot string) (*specs.Spec, error) {
-	return nil, errors.New("not supported")
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/v2/settable.go b/installer/vendor/github.com/docker/docker/plugin/v2/settable.go
deleted file mode 100644
index 79c6befc24..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/v2/settable.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package v2
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-)
-
-type settable struct {
-	name  string
-	field string
-	value string
-}
-
-var (
-	allowedSettableFieldsEnv     = []string{"value"}
-	allowedSettableFieldsArgs    = []string{"value"}
-	allowedSettableFieldsDevices = []string{"path"}
-	allowedSettableFieldsMounts  = []string{"source"}
-
-	errMultipleFields = errors.New("multiple fields are settable, one must be specified")
-	errInvalidFormat  = errors.New("invalid format, must be <name>[.<field>][=<value>]")
-)
-
-func newSettables(args []string) ([]settable, error) {
-	sets := make([]settable, 0, len(args))
-	for _, arg := range args {
-		set, err := newSettable(arg)
-		if err != nil {
-			return nil, err
-		}
-		sets = append(sets, set)
-	}
-	return sets, nil
-}
-
-func newSettable(arg string) (settable, error) {
-	var set settable
-	if i := strings.Index(arg, "="); i == 0 {
-		return set, errInvalidFormat
-	} else if i < 0 {
-		set.name = arg
-	} else {
-		set.name = arg[:i]
-		set.value = arg[i+1:]
-	}
-
-	if i := strings.LastIndex(set.name, "."); i > 0 {
-		set.field = set.name[i+1:]
-		set.name = arg[:i]
-	}
-
-	return set, nil
-}
-
-// prettyName return name.field if there is a field, otherwise name.
-func (set *settable) prettyName() string {
-	if set.field != "" {
-		return fmt.Sprintf("%s.%s", set.name, set.field)
-	}
-	return set.name
-}
-
-func (set *settable) isSettable(allowedSettableFields []string, settable []string) (bool, error) {
-	if set.field == "" {
-		if len(settable) == 1 {
-			// if field is not specified and there only one settable, default to it.
-			set.field = settable[0]
-		} else if len(settable) > 1 {
-			return false, errMultipleFields
-		}
-	}
-
-	isAllowed := false
-	for _, allowedSettableField := range allowedSettableFields {
-		if set.field == allowedSettableField {
-			isAllowed = true
-			break
-		}
-	}
-
-	if isAllowed {
-		for _, settableField := range settable {
-			if set.field == settableField {
-				return true, nil
-			}
-		}
-	}
-
-	return false, nil
-}
-
-func updateSettingsEnv(env *[]string, set *settable) {
-	for i, e := range *env {
-		if parts := strings.SplitN(e, "=", 2); parts[0] == set.name {
-			(*env)[i] = fmt.Sprintf("%s=%s", set.name, set.value)
-			return
-		}
-	}
-
-	*env = append(*env, fmt.Sprintf("%s=%s", set.name, set.value))
-}
diff --git a/installer/vendor/github.com/docker/docker/plugin/v2/settable_test.go b/installer/vendor/github.com/docker/docker/plugin/v2/settable_test.go
deleted file mode 100644
index 7183f3a679..0000000000
--- a/installer/vendor/github.com/docker/docker/plugin/v2/settable_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package v2
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestNewSettable(t *testing.T) {
-	contexts := []struct {
-		arg   string
-		name  string
-		field string
-		value string
-		err   error
-	}{
-		{"name=value", "name", "", "value", nil},
-		{"name", "name", "", "", nil},
-		{"name.field=value", "name", "field", "value", nil},
-		{"name.field", "name", "field", "", nil},
-		{"=value", "", "", "", errInvalidFormat},
-		{"=", "", "", "", errInvalidFormat},
-	}
-
-	for _, c := range contexts {
-		s, err := newSettable(c.arg)
-		if err != c.err {
-			t.Fatalf("expected error to be %v, got %v", c.err, err)
-		}
-
-		if s.name != c.name {
-			t.Fatalf("expected name to be %q, got %q", c.name, s.name)
-		}
-
-		if s.field != c.field {
-			t.Fatalf("expected field to be %q, got %q", c.field, s.field)
-		}
-
-		if s.value != c.value {
-			t.Fatalf("expected value to be %q, got %q", c.value, s.value)
-		}
-
-	}
-}
-
-func TestIsSettable(t *testing.T) {
-	contexts := []struct {
-		allowedSettableFields []string
-		set                   settable
-		settable              []string
-		result                bool
-		err                   error
-	}{
-		{allowedSettableFieldsEnv, settable{}, []string{}, false, nil},
-		{allowedSettableFieldsEnv, settable{field: "value"}, []string{}, false, nil},
-		{allowedSettableFieldsEnv, settable{}, []string{"value"}, true, nil},
-		{allowedSettableFieldsEnv, settable{field: "value"}, []string{"value"}, true, nil},
-		{allowedSettableFieldsEnv, settable{field: "foo"}, []string{"value"}, false, nil},
-		{allowedSettableFieldsEnv, settable{field: "foo"}, []string{"foo"}, false, nil},
-		{allowedSettableFieldsEnv, settable{}, []string{"value1", "value2"}, false, errMultipleFields},
-	}
-
-	for _, c := range contexts {
-		if res, err := c.set.isSettable(c.allowedSettableFields, c.settable); res != c.result {
-			t.Fatalf("expected result to be %t, got %t", c.result, res)
-		} else if err != c.err {
-			t.Fatalf("expected error to be %v, got %v", c.err, err)
-		}
-	}
-}
-
-func TestUpdateSettinsEnv(t *testing.T) {
-	contexts := []struct {
-		env    []string
-		set    settable
-		newEnv []string
-	}{
-		{[]string{}, settable{name: "DEBUG", value: "1"}, []string{"DEBUG=1"}},
-		{[]string{"DEBUG=0"}, settable{name: "DEBUG", value: "1"}, []string{"DEBUG=1"}},
-		{[]string{"FOO=0"}, settable{name: "DEBUG", value: "1"}, []string{"FOO=0", "DEBUG=1"}},
-		{[]string{"FOO=0", "DEBUG=0"}, settable{name: "DEBUG", value: "1"}, []string{"FOO=0", "DEBUG=1"}},
-		{[]string{"FOO=0", "DEBUG=0", "BAR=1"}, settable{name: "DEBUG", value: "1"}, []string{"FOO=0", "DEBUG=1", "BAR=1"}},
-	}
-
-	for _, c := range contexts {
-		updateSettingsEnv(&c.env, &c.set)
-
-		if !reflect.DeepEqual(c.env, c.newEnv) {
-			t.Fatalf("expected env to be %q, got %q", c.newEnv, c.env)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/poule.yml b/installer/vendor/github.com/docker/docker/poule.yml
deleted file mode 100644
index 61aab4551b..0000000000
--- a/installer/vendor/github.com/docker/docker/poule.yml
+++ /dev/null
@@ -1,88 +0,0 @@
-# Add a "status/0-triage" to every newly opened pull request.
-- triggers:
-      pull_request: [ opened ]
-  operations:
-      - type:       label
-        settings: {
-            patterns: {
-                status/0-triage:     [ ".*" ],
-            }
-        }
-
-# For every newly created or modified issue, assign label based on matching regexp using the `label`
-# operation, as well as an Engine-specific version label using `version-label`.
-- triggers:
-      issues:       [ edited, opened, reopened ]
-  operations:
-      - type:       label
-        settings: {
-            patterns: {
-                area/builder:        [ "dockerfile", "docker build" ],
-                area/distribution:   [ "docker login", "docker logout", "docker pull", "docker push", "docker search" ],
-                area/plugins:        [ "docker plugin" ],
-                area/networking:     [ "docker network", "ipvs", "vxlan" ],
-                area/runtime:        [ "oci runtime error" ],
-                area/security/trust: [ "docker_content_trust" ],
-                area/swarm:          [ "docker node", "docker service", "docker swarm" ],
-                platform/desktop:    [ "docker for mac", "docker for windows" ],
-                platform/freebsd:    [ "freebsd" ],
-                platform/windows:    [ "nanoserver", "windowsservercore", "windows server" ],
-            }
-        }
-      - type:       version-label
-
-# When a pull request is closed, attach it to the currently active milestone.
-- triggers:
-      pull_request: [ closed ]
-  operations:
-      - type:       version-milestone
-
-# Labeling a PR with `rebuild/<configuration>` triggers a rebuild job for the associated
-# configuration. The label is automatically removed after the rebuild is initiated. There's no such
-# thing as "templating" in this configuration, so we need one operation for each type of
-# configuration that can be triggered.
-- triggers:
-      pull_request: [ labeled ]
-  operations:
-      - type:       rebuild
-        settings: {
-            # When configurations are empty, the `rebuild` operation rebuilds all the currently
-            # known statuses for that pull request.
-            configurations: [],
-            label:          "rebuild/*",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ arm ],
-            label:          "rebuild/arm",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ experimental ],
-            label:          "rebuild/experimental",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ janky ],
-            label:          "rebuild/janky",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ userns ],
-            label:          "rebuild/userns",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ vendor ],
-            label:          "rebuild/vendor",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ win2lin ],
-            label:          "rebuild/win2lin",
-        }
-      - type:       rebuild
-        settings: {
-            configurations: [ windowsRS1 ],
-            label:          "rebuild/windowsRS1",
-        }
diff --git a/installer/vendor/github.com/docker/docker/profiles/apparmor/apparmor.go b/installer/vendor/github.com/docker/docker/profiles/apparmor/apparmor.go
deleted file mode 100644
index 5132ebe008..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/apparmor/apparmor.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// +build linux
-
-package apparmor
-
-import (
-	"bufio"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/docker/docker/pkg/aaparser"
-	"github.com/docker/docker/utils/templates"
-)
-
-var (
-	// profileDirectory is the file store for apparmor profiles and macros.
-	profileDirectory = "/etc/apparmor.d"
-)
-
-// profileData holds information about the given profile for generation.
-type profileData struct {
-	// Name is profile name.
-	Name string
-	// Imports defines the apparmor functions to import, before defining the profile.
-	Imports []string
-	// InnerImports defines the apparmor functions to import in the profile.
-	InnerImports []string
-	// Version is the {major, minor, patch} version of apparmor_parser as a single number.
-	Version int
-}
-
-// generateDefault creates an apparmor profile from ProfileData.
-func (p *profileData) generateDefault(out io.Writer) error {
-	compiled, err := templates.NewParse("apparmor_profile", baseTemplate)
-	if err != nil {
-		return err
-	}
-
-	if macroExists("tunables/global") {
-		p.Imports = append(p.Imports, "#include <tunables/global>")
-	} else {
-		p.Imports = append(p.Imports, "@{PROC}=/proc/")
-	}
-
-	if macroExists("abstractions/base") {
-		p.InnerImports = append(p.InnerImports, "#include <abstractions/base>")
-	}
-
-	ver, err := aaparser.GetVersion()
-	if err != nil {
-		return err
-	}
-	p.Version = ver
-
-	if err := compiled.Execute(out, p); err != nil {
-		return err
-	}
-	return nil
-}
-
-// macrosExists checks if the passed macro exists.
-func macroExists(m string) bool {
-	_, err := os.Stat(path.Join(profileDirectory, m))
-	return err == nil
-}
-
-// InstallDefault generates a default profile in a temp directory determined by
-// os.TempDir(), then loads the profile into the kernel using 'apparmor_parser'.
-func InstallDefault(name string) error {
-	p := profileData{
-		Name: name,
-	}
-
-	// Install to a temporary directory.
-	f, err := ioutil.TempFile("", name)
-	if err != nil {
-		return err
-	}
-	profilePath := f.Name()
-
-	defer f.Close()
-	defer os.Remove(profilePath)
-
-	if err := p.generateDefault(f); err != nil {
-		f.Close()
-		return err
-	}
-
-	if err := aaparser.LoadProfile(profilePath); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// IsLoaded checks if a profile with the given name has been loaded into the
-// kernel.
-func IsLoaded(name string) (bool, error) {
-	file, err := os.Open("/sys/kernel/security/apparmor/profiles")
-	if err != nil {
-		return false, err
-	}
-	defer file.Close()
-
-	r := bufio.NewReader(file)
-	for {
-		p, err := r.ReadString('\n')
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return false, err
-		}
-		if strings.HasPrefix(p, name+" ") {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/apparmor/template.go b/installer/vendor/github.com/docker/docker/profiles/apparmor/template.go
deleted file mode 100644
index c5ea4584de..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/apparmor/template.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// +build linux
-
-package apparmor
-
-// baseTemplate defines the default apparmor profile for containers.
-const baseTemplate = `
-{{range $value := .Imports}}
-{{$value}}
-{{end}}
-
-profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
-{{range $value := .InnerImports}}
-  {{$value}}
-{{end}}
-
-  network,
-  capability,
-  file,
-  umount,
-
-  deny @{PROC}/* w,   # deny write for all files directly in /proc (not in a subdir)
-  # deny write to files not in /proc/<number>/** or /proc/sys/**
-  deny @{PROC}/{[^1-9],[^1-9][^0-9],[^1-9s][^0-9y][^0-9s],[^1-9][^0-9][^0-9][^0-9]*}/** w,
-  deny @{PROC}/sys/[^k]** w,  # deny /proc/sys except /proc/sys/k* (effectively /proc/sys/kernel)
-  deny @{PROC}/sys/kernel/{?,??,[^s][^h][^m]**} w,  # deny everything except shm* in /proc/sys/kernel/
-  deny @{PROC}/sysrq-trigger rwklx,
-  deny @{PROC}/mem rwklx,
-  deny @{PROC}/kmem rwklx,
-  deny @{PROC}/kcore rwklx,
-
-  deny mount,
-
-  deny /sys/[^f]*/** wklx,
-  deny /sys/f[^s]*/** wklx,
-  deny /sys/fs/[^c]*/** wklx,
-  deny /sys/fs/c[^g]*/** wklx,
-  deny /sys/fs/cg[^r]*/** wklx,
-  deny /sys/firmware/** rwklx,
-  deny /sys/kernel/security/** rwklx,
-
-{{if ge .Version 208095}}
-  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
-  ptrace (trace,read) peer={{.Name}},
-{{end}}
-}
-`
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/default.json b/installer/vendor/github.com/docker/docker/profiles/seccomp/default.json
deleted file mode 100755
index ac129d3a31..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/default.json
+++ /dev/null
@@ -1,698 +0,0 @@
-{
-	"defaultAction": "SCMP_ACT_ERRNO",
-	"archMap": [
-		{
-			"architecture": "SCMP_ARCH_X86_64",
-			"subArchitectures": [
-				"SCMP_ARCH_X86",
-				"SCMP_ARCH_X32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_AARCH64",
-			"subArchitectures": [
-				"SCMP_ARCH_ARM"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPS64",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPS",
-				"SCMP_ARCH_MIPS64N32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPS64N32",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPS",
-				"SCMP_ARCH_MIPS64"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPSEL64",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPSEL",
-				"SCMP_ARCH_MIPSEL64N32"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_MIPSEL64N32",
-			"subArchitectures": [
-				"SCMP_ARCH_MIPSEL",
-				"SCMP_ARCH_MIPSEL64"
-			]
-		},
-		{
-			"architecture": "SCMP_ARCH_S390X",
-			"subArchitectures": [
-				"SCMP_ARCH_S390"
-			]
-		}
-	],
-	"syscalls": [
-		{
-			"names": [
-				"accept",
-				"accept4",
-				"access",
-				"alarm",
-				"alarm",
-				"bind",
-				"brk",
-				"capget",
-				"capset",
-				"chdir",
-				"chmod",
-				"chown",
-				"chown32",
-				"clock_getres",
-				"clock_gettime",
-				"clock_nanosleep",
-				"close",
-				"connect",
-				"copy_file_range",
-				"creat",
-				"dup",
-				"dup2",
-				"dup3",
-				"epoll_create",
-				"epoll_create1",
-				"epoll_ctl",
-				"epoll_ctl_old",
-				"epoll_pwait",
-				"epoll_wait",
-				"epoll_wait_old",
-				"eventfd",
-				"eventfd2",
-				"execve",
-				"execveat",
-				"exit",
-				"exit_group",
-				"faccessat",
-				"fadvise64",
-				"fadvise64_64",
-				"fallocate",
-				"fanotify_mark",
-				"fchdir",
-				"fchmod",
-				"fchmodat",
-				"fchown",
-				"fchown32",
-				"fchownat",
-				"fcntl",
-				"fcntl64",
-				"fdatasync",
-				"fgetxattr",
-				"flistxattr",
-				"flock",
-				"fork",
-				"fremovexattr",
-				"fsetxattr",
-				"fstat",
-				"fstat64",
-				"fstatat64",
-				"fstatfs",
-				"fstatfs64",
-				"fsync",
-				"ftruncate",
-				"ftruncate64",
-				"futex",
-				"futimesat",
-				"getcpu",
-				"getcwd",
-				"getdents",
-				"getdents64",
-				"getegid",
-				"getegid32",
-				"geteuid",
-				"geteuid32",
-				"getgid",
-				"getgid32",
-				"getgroups",
-				"getgroups32",
-				"getitimer",
-				"getpeername",
-				"getpgid",
-				"getpgrp",
-				"getpid",
-				"getppid",
-				"getpriority",
-				"getrandom",
-				"getresgid",
-				"getresgid32",
-				"getresuid",
-				"getresuid32",
-				"getrlimit",
-				"get_robust_list",
-				"getrusage",
-				"getsid",
-				"getsockname",
-				"getsockopt",
-				"get_thread_area",
-				"gettid",
-				"gettimeofday",
-				"getuid",
-				"getuid32",
-				"getxattr",
-				"inotify_add_watch",
-				"inotify_init",
-				"inotify_init1",
-				"inotify_rm_watch",
-				"io_cancel",
-				"ioctl",
-				"io_destroy",
-				"io_getevents",
-				"ioprio_get",
-				"ioprio_set",
-				"io_setup",
-				"io_submit",
-				"ipc",
-				"kill",
-				"lchown",
-				"lchown32",
-				"lgetxattr",
-				"link",
-				"linkat",
-				"listen",
-				"listxattr",
-				"llistxattr",
-				"_llseek",
-				"lremovexattr",
-				"lseek",
-				"lsetxattr",
-				"lstat",
-				"lstat64",
-				"madvise",
-				"memfd_create",
-				"mincore",
-				"mkdir",
-				"mkdirat",
-				"mknod",
-				"mknodat",
-				"mlock",
-				"mlock2",
-				"mlockall",
-				"mmap",
-				"mmap2",
-				"mprotect",
-				"mq_getsetattr",
-				"mq_notify",
-				"mq_open",
-				"mq_timedreceive",
-				"mq_timedsend",
-				"mq_unlink",
-				"mremap",
-				"msgctl",
-				"msgget",
-				"msgrcv",
-				"msgsnd",
-				"msync",
-				"munlock",
-				"munlockall",
-				"munmap",
-				"nanosleep",
-				"newfstatat",
-				"_newselect",
-				"open",
-				"openat",
-				"pause",
-				"pipe",
-				"pipe2",
-				"poll",
-				"ppoll",
-				"prctl",
-				"pread64",
-				"preadv",
-				"prlimit64",
-				"pselect6",
-				"pwrite64",
-				"pwritev",
-				"read",
-				"readahead",
-				"readlink",
-				"readlinkat",
-				"readv",
-				"recv",
-				"recvfrom",
-				"recvmmsg",
-				"recvmsg",
-				"remap_file_pages",
-				"removexattr",
-				"rename",
-				"renameat",
-				"renameat2",
-				"restart_syscall",
-				"rmdir",
-				"rt_sigaction",
-				"rt_sigpending",
-				"rt_sigprocmask",
-				"rt_sigqueueinfo",
-				"rt_sigreturn",
-				"rt_sigsuspend",
-				"rt_sigtimedwait",
-				"rt_tgsigqueueinfo",
-				"sched_getaffinity",
-				"sched_getattr",
-				"sched_getparam",
-				"sched_get_priority_max",
-				"sched_get_priority_min",
-				"sched_getscheduler",
-				"sched_rr_get_interval",
-				"sched_setaffinity",
-				"sched_setattr",
-				"sched_setparam",
-				"sched_setscheduler",
-				"sched_yield",
-				"seccomp",
-				"select",
-				"semctl",
-				"semget",
-				"semop",
-				"semtimedop",
-				"send",
-				"sendfile",
-				"sendfile64",
-				"sendmmsg",
-				"sendmsg",
-				"sendto",
-				"setfsgid",
-				"setfsgid32",
-				"setfsuid",
-				"setfsuid32",
-				"setgid",
-				"setgid32",
-				"setgroups",
-				"setgroups32",
-				"setitimer",
-				"setpgid",
-				"setpriority",
-				"setregid",
-				"setregid32",
-				"setresgid",
-				"setresgid32",
-				"setresuid",
-				"setresuid32",
-				"setreuid",
-				"setreuid32",
-				"setrlimit",
-				"set_robust_list",
-				"setsid",
-				"setsockopt",
-				"set_thread_area",
-				"set_tid_address",
-				"setuid",
-				"setuid32",
-				"setxattr",
-				"shmat",
-				"shmctl",
-				"shmdt",
-				"shmget",
-				"shutdown",
-				"sigaltstack",
-				"signalfd",
-				"signalfd4",
-				"sigreturn",
-				"socket",
-				"socketcall",
-				"socketpair",
-				"splice",
-				"stat",
-				"stat64",
-				"statfs",
-				"statfs64",
-				"symlink",
-				"symlinkat",
-				"sync",
-				"sync_file_range",
-				"syncfs",
-				"sysinfo",
-				"syslog",
-				"tee",
-				"tgkill",
-				"time",
-				"timer_create",
-				"timer_delete",
-				"timerfd_create",
-				"timerfd_gettime",
-				"timerfd_settime",
-				"timer_getoverrun",
-				"timer_gettime",
-				"timer_settime",
-				"times",
-				"tkill",
-				"truncate",
-				"truncate64",
-				"ugetrlimit",
-				"umask",
-				"uname",
-				"unlink",
-				"unlinkat",
-				"utime",
-				"utimensat",
-				"utimes",
-				"vfork",
-				"vmsplice",
-				"wait4",
-				"waitid",
-				"waitpid",
-				"write",
-				"writev"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 0,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 8,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"personality"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 4294967295,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"arm_fadvise64_64",
-				"arm_sync_file_range",
-				"breakpoint",
-				"cacheflush",
-				"set_tls"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"arm",
-					"arm64"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"arch_prctl"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"amd64",
-					"x32"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"modify_ldt"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"amd64",
-					"x32",
-					"x86"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"s390_pci_mmio_read",
-				"s390_pci_mmio_write",
-				"s390_runtime_instr"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"open_by_handle_at"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_DAC_READ_SEARCH"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"bpf",
-				"clone",
-				"fanotify_init",
-				"lookup_dcookie",
-				"mount",
-				"name_to_handle_at",
-				"perf_event_open",
-				"setdomainname",
-				"sethostname",
-				"setns",
-				"umount",
-				"umount2",
-				"unshare"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"clone"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 0,
-					"value": 2080505856,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_MASKED_EQ"
-				}
-			],
-			"comment": "",
-			"includes": {},
-			"excludes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				],
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			}
-		},
-		{
-			"names": [
-				"clone"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [
-				{
-					"index": 1,
-					"value": 2080505856,
-					"valueTwo": 0,
-					"op": "SCMP_CMP_MASKED_EQ"
-				}
-			],
-			"comment": "s390 parameter ordering for clone is different",
-			"includes": {
-				"arches": [
-					"s390",
-					"s390x"
-				]
-			},
-			"excludes": {
-				"caps": [
-					"CAP_SYS_ADMIN"
-				]
-			}
-		},
-		{
-			"names": [
-				"reboot"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_BOOT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"chroot"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_CHROOT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"delete_module",
-				"init_module",
-				"finit_module",
-				"query_module"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_MODULE"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"acct"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_PACCT"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"kcmp",
-				"process_vm_readv",
-				"process_vm_writev",
-				"ptrace"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_PTRACE"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"iopl",
-				"ioperm"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_RAWIO"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"settimeofday",
-				"stime",
-				"adjtimex"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_TIME"
-				]
-			},
-			"excludes": {}
-		},
-		{
-			"names": [
-				"vhangup"
-			],
-			"action": "SCMP_ACT_ALLOW",
-			"args": [],
-			"comment": "",
-			"includes": {
-				"caps": [
-					"CAP_SYS_TTY_CONFIG"
-				]
-			},
-			"excludes": {}
-		}
-	]
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/fixtures/example.json b/installer/vendor/github.com/docker/docker/profiles/seccomp/fixtures/example.json
deleted file mode 100755
index 674ca50fd9..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/fixtures/example.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-    "defaultAction": "SCMP_ACT_ERRNO",
-    "syscalls": [
-        {
-            "name": "clone",
-            "action": "SCMP_ACT_ALLOW",
-            "args": [
-                {
-                    "index": 0,
-                    "value": 2080505856,
-                    "valueTwo": 0,
-                    "op": "SCMP_CMP_MASKED_EQ"
-                }
-            ]
-        },
-        {
-            "name": "open",
-            "action": "SCMP_ACT_ALLOW",
-            "args": []
-        },
-        {
-            "name": "close",
-            "action": "SCMP_ACT_ALLOW",
-            "args": []
-        }
-    ]
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/generate.go b/installer/vendor/github.com/docker/docker/profiles/seccomp/generate.go
deleted file mode 100644
index 32f22bb375..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/generate.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/profiles/seccomp"
-)
-
-// saves the default seccomp profile as a json file so people can use it as a
-// base for their own custom profiles
-func main() {
-	wd, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	f := filepath.Join(wd, "default.json")
-
-	// write the default profile to the file
-	b, err := json.MarshalIndent(seccomp.DefaultProfile(), "", "\t")
-	if err != nil {
-		panic(err)
-	}
-
-	if err := ioutil.WriteFile(f, b, 0644); err != nil {
-		panic(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp.go b/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp.go
deleted file mode 100644
index a54ef50a8b..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// +build linux
-
-package seccomp
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/stringutils"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	libseccomp "github.com/seccomp/libseccomp-golang"
-)
-
-//go:generate go run -tags 'seccomp' generate.go
-
-// GetDefaultProfile returns the default seccomp profile.
-func GetDefaultProfile(rs *specs.Spec) (*specs.Seccomp, error) {
-	return setupSeccomp(DefaultProfile(), rs)
-}
-
-// LoadProfile takes a file path and decodes the seccomp profile.
-func LoadProfile(body string, rs *specs.Spec) (*specs.Seccomp, error) {
-	var config types.Seccomp
-	if err := json.Unmarshal([]byte(body), &config); err != nil {
-		return nil, fmt.Errorf("Decoding seccomp profile failed: %v", err)
-	}
-	return setupSeccomp(&config, rs)
-}
-
-var nativeToSeccomp = map[string]types.Arch{
-	"amd64":       types.ArchX86_64,
-	"arm64":       types.ArchAARCH64,
-	"mips64":      types.ArchMIPS64,
-	"mips64n32":   types.ArchMIPS64N32,
-	"mipsel64":    types.ArchMIPSEL64,
-	"mipsel64n32": types.ArchMIPSEL64N32,
-	"s390x":       types.ArchS390X,
-}
-
-func setupSeccomp(config *types.Seccomp, rs *specs.Spec) (*specs.Seccomp, error) {
-	if config == nil {
-		return nil, nil
-	}
-
-	// No default action specified, no syscalls listed, assume seccomp disabled
-	if config.DefaultAction == "" && len(config.Syscalls) == 0 {
-		return nil, nil
-	}
-
-	newConfig := &specs.Seccomp{}
-
-	var arch string
-	var native, err = libseccomp.GetNativeArch()
-	if err == nil {
-		arch = native.String()
-	}
-
-	if len(config.Architectures) != 0 && len(config.ArchMap) != 0 {
-		return nil, errors.New("'architectures' and 'archMap' were specified in the seccomp profile, use either 'architectures' or 'archMap'")
-	}
-
-	// if config.Architectures == 0 then libseccomp will figure out the architecture to use
-	if len(config.Architectures) != 0 {
-		for _, a := range config.Architectures {
-			newConfig.Architectures = append(newConfig.Architectures, specs.Arch(a))
-		}
-	}
-
-	if len(config.ArchMap) != 0 {
-		for _, a := range config.ArchMap {
-			seccompArch, ok := nativeToSeccomp[arch]
-			if ok {
-				if a.Arch == seccompArch {
-					newConfig.Architectures = append(newConfig.Architectures, specs.Arch(a.Arch))
-					for _, sa := range a.SubArches {
-						newConfig.Architectures = append(newConfig.Architectures, specs.Arch(sa))
-					}
-					break
-				}
-			}
-		}
-	}
-
-	newConfig.DefaultAction = specs.Action(config.DefaultAction)
-
-Loop:
-	// Loop through all syscall blocks and convert them to libcontainer format after filtering them
-	for _, call := range config.Syscalls {
-		if len(call.Excludes.Arches) > 0 {
-			if stringutils.InSlice(call.Excludes.Arches, arch) {
-				continue Loop
-			}
-		}
-		if len(call.Excludes.Caps) > 0 {
-			for _, c := range call.Excludes.Caps {
-				if stringutils.InSlice(rs.Process.Capabilities, c) {
-					continue Loop
-				}
-			}
-		}
-		if len(call.Includes.Arches) > 0 {
-			if !stringutils.InSlice(call.Includes.Arches, arch) {
-				continue Loop
-			}
-		}
-		if len(call.Includes.Caps) > 0 {
-			for _, c := range call.Includes.Caps {
-				if !stringutils.InSlice(rs.Process.Capabilities, c) {
-					continue Loop
-				}
-			}
-		}
-
-		if call.Name != "" && len(call.Names) != 0 {
-			return nil, errors.New("'name' and 'names' were specified in the seccomp profile, use either 'name' or 'names'")
-		}
-
-		if call.Name != "" {
-			newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall(call.Name, call.Action, call.Args))
-		}
-
-		for _, n := range call.Names {
-			newConfig.Syscalls = append(newConfig.Syscalls, createSpecsSyscall(n, call.Action, call.Args))
-		}
-	}
-
-	return newConfig, nil
-}
-
-func createSpecsSyscall(name string, action types.Action, args []*types.Arg) specs.Syscall {
-	newCall := specs.Syscall{
-		Name:   name,
-		Action: specs.Action(action),
-	}
-
-	// Loop through all the arguments of the syscall and convert them
-	for _, arg := range args {
-		newArg := specs.Arg{
-			Index:    arg.Index,
-			Value:    arg.Value,
-			ValueTwo: arg.ValueTwo,
-			Op:       specs.Operator(arg.Op),
-		}
-
-		newCall.Args = append(newCall.Args, newArg)
-	}
-	return newCall
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_default.go b/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_default.go
deleted file mode 100644
index b84de820b7..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_default.go
+++ /dev/null
@@ -1,604 +0,0 @@
-// +build linux,seccomp
-
-package seccomp
-
-import (
-	"syscall"
-
-	"github.com/docker/docker/api/types"
-)
-
-func arches() []types.Architecture {
-	return []types.Architecture{
-		{
-			Arch:      types.ArchX86_64,
-			SubArches: []types.Arch{types.ArchX86, types.ArchX32},
-		},
-		{
-			Arch:      types.ArchAARCH64,
-			SubArches: []types.Arch{types.ArchARM},
-		},
-		{
-			Arch:      types.ArchMIPS64,
-			SubArches: []types.Arch{types.ArchMIPS, types.ArchMIPS64N32},
-		},
-		{
-			Arch:      types.ArchMIPS64N32,
-			SubArches: []types.Arch{types.ArchMIPS, types.ArchMIPS64},
-		},
-		{
-			Arch:      types.ArchMIPSEL64,
-			SubArches: []types.Arch{types.ArchMIPSEL, types.ArchMIPSEL64N32},
-		},
-		{
-			Arch:      types.ArchMIPSEL64N32,
-			SubArches: []types.Arch{types.ArchMIPSEL, types.ArchMIPSEL64},
-		},
-		{
-			Arch:      types.ArchS390X,
-			SubArches: []types.Arch{types.ArchS390},
-		},
-	}
-}
-
-// DefaultProfile defines the whitelist for the default seccomp profile.
-func DefaultProfile() *types.Seccomp {
-	syscalls := []*types.Syscall{
-		{
-			Names: []string{
-				"accept",
-				"accept4",
-				"access",
-				"alarm",
-				"alarm",
-				"bind",
-				"brk",
-				"capget",
-				"capset",
-				"chdir",
-				"chmod",
-				"chown",
-				"chown32",
-				"clock_getres",
-				"clock_gettime",
-				"clock_nanosleep",
-				"close",
-				"connect",
-				"copy_file_range",
-				"creat",
-				"dup",
-				"dup2",
-				"dup3",
-				"epoll_create",
-				"epoll_create1",
-				"epoll_ctl",
-				"epoll_ctl_old",
-				"epoll_pwait",
-				"epoll_wait",
-				"epoll_wait_old",
-				"eventfd",
-				"eventfd2",
-				"execve",
-				"execveat",
-				"exit",
-				"exit_group",
-				"faccessat",
-				"fadvise64",
-				"fadvise64_64",
-				"fallocate",
-				"fanotify_mark",
-				"fchdir",
-				"fchmod",
-				"fchmodat",
-				"fchown",
-				"fchown32",
-				"fchownat",
-				"fcntl",
-				"fcntl64",
-				"fdatasync",
-				"fgetxattr",
-				"flistxattr",
-				"flock",
-				"fork",
-				"fremovexattr",
-				"fsetxattr",
-				"fstat",
-				"fstat64",
-				"fstatat64",
-				"fstatfs",
-				"fstatfs64",
-				"fsync",
-				"ftruncate",
-				"ftruncate64",
-				"futex",
-				"futimesat",
-				"getcpu",
-				"getcwd",
-				"getdents",
-				"getdents64",
-				"getegid",
-				"getegid32",
-				"geteuid",
-				"geteuid32",
-				"getgid",
-				"getgid32",
-				"getgroups",
-				"getgroups32",
-				"getitimer",
-				"getpeername",
-				"getpgid",
-				"getpgrp",
-				"getpid",
-				"getppid",
-				"getpriority",
-				"getrandom",
-				"getresgid",
-				"getresgid32",
-				"getresuid",
-				"getresuid32",
-				"getrlimit",
-				"get_robust_list",
-				"getrusage",
-				"getsid",
-				"getsockname",
-				"getsockopt",
-				"get_thread_area",
-				"gettid",
-				"gettimeofday",
-				"getuid",
-				"getuid32",
-				"getxattr",
-				"inotify_add_watch",
-				"inotify_init",
-				"inotify_init1",
-				"inotify_rm_watch",
-				"io_cancel",
-				"ioctl",
-				"io_destroy",
-				"io_getevents",
-				"ioprio_get",
-				"ioprio_set",
-				"io_setup",
-				"io_submit",
-				"ipc",
-				"kill",
-				"lchown",
-				"lchown32",
-				"lgetxattr",
-				"link",
-				"linkat",
-				"listen",
-				"listxattr",
-				"llistxattr",
-				"_llseek",
-				"lremovexattr",
-				"lseek",
-				"lsetxattr",
-				"lstat",
-				"lstat64",
-				"madvise",
-				"memfd_create",
-				"mincore",
-				"mkdir",
-				"mkdirat",
-				"mknod",
-				"mknodat",
-				"mlock",
-				"mlock2",
-				"mlockall",
-				"mmap",
-				"mmap2",
-				"mprotect",
-				"mq_getsetattr",
-				"mq_notify",
-				"mq_open",
-				"mq_timedreceive",
-				"mq_timedsend",
-				"mq_unlink",
-				"mremap",
-				"msgctl",
-				"msgget",
-				"msgrcv",
-				"msgsnd",
-				"msync",
-				"munlock",
-				"munlockall",
-				"munmap",
-				"nanosleep",
-				"newfstatat",
-				"_newselect",
-				"open",
-				"openat",
-				"pause",
-				"pipe",
-				"pipe2",
-				"poll",
-				"ppoll",
-				"prctl",
-				"pread64",
-				"preadv",
-				"prlimit64",
-				"pselect6",
-				"pwrite64",
-				"pwritev",
-				"read",
-				"readahead",
-				"readlink",
-				"readlinkat",
-				"readv",
-				"recv",
-				"recvfrom",
-				"recvmmsg",
-				"recvmsg",
-				"remap_file_pages",
-				"removexattr",
-				"rename",
-				"renameat",
-				"renameat2",
-				"restart_syscall",
-				"rmdir",
-				"rt_sigaction",
-				"rt_sigpending",
-				"rt_sigprocmask",
-				"rt_sigqueueinfo",
-				"rt_sigreturn",
-				"rt_sigsuspend",
-				"rt_sigtimedwait",
-				"rt_tgsigqueueinfo",
-				"sched_getaffinity",
-				"sched_getattr",
-				"sched_getparam",
-				"sched_get_priority_max",
-				"sched_get_priority_min",
-				"sched_getscheduler",
-				"sched_rr_get_interval",
-				"sched_setaffinity",
-				"sched_setattr",
-				"sched_setparam",
-				"sched_setscheduler",
-				"sched_yield",
-				"seccomp",
-				"select",
-				"semctl",
-				"semget",
-				"semop",
-				"semtimedop",
-				"send",
-				"sendfile",
-				"sendfile64",
-				"sendmmsg",
-				"sendmsg",
-				"sendto",
-				"setfsgid",
-				"setfsgid32",
-				"setfsuid",
-				"setfsuid32",
-				"setgid",
-				"setgid32",
-				"setgroups",
-				"setgroups32",
-				"setitimer",
-				"setpgid",
-				"setpriority",
-				"setregid",
-				"setregid32",
-				"setresgid",
-				"setresgid32",
-				"setresuid",
-				"setresuid32",
-				"setreuid",
-				"setreuid32",
-				"setrlimit",
-				"set_robust_list",
-				"setsid",
-				"setsockopt",
-				"set_thread_area",
-				"set_tid_address",
-				"setuid",
-				"setuid32",
-				"setxattr",
-				"shmat",
-				"shmctl",
-				"shmdt",
-				"shmget",
-				"shutdown",
-				"sigaltstack",
-				"signalfd",
-				"signalfd4",
-				"sigreturn",
-				"socket",
-				"socketcall",
-				"socketpair",
-				"splice",
-				"stat",
-				"stat64",
-				"statfs",
-				"statfs64",
-				"symlink",
-				"symlinkat",
-				"sync",
-				"sync_file_range",
-				"syncfs",
-				"sysinfo",
-				"syslog",
-				"tee",
-				"tgkill",
-				"time",
-				"timer_create",
-				"timer_delete",
-				"timerfd_create",
-				"timerfd_gettime",
-				"timerfd_settime",
-				"timer_getoverrun",
-				"timer_gettime",
-				"timer_settime",
-				"times",
-				"tkill",
-				"truncate",
-				"truncate64",
-				"ugetrlimit",
-				"umask",
-				"uname",
-				"unlink",
-				"unlinkat",
-				"utime",
-				"utimensat",
-				"utimes",
-				"vfork",
-				"vmsplice",
-				"wait4",
-				"waitid",
-				"waitpid",
-				"write",
-				"writev",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-		},
-		{
-			Names:  []string{"personality"},
-			Action: types.ActAllow,
-			Args: []*types.Arg{
-				{
-					Index: 0,
-					Value: 0x0,
-					Op:    types.OpEqualTo,
-				},
-			},
-		},
-		{
-			Names:  []string{"personality"},
-			Action: types.ActAllow,
-			Args: []*types.Arg{
-				{
-					Index: 0,
-					Value: 0x0008,
-					Op:    types.OpEqualTo,
-				},
-			},
-		},
-		{
-			Names:  []string{"personality"},
-			Action: types.ActAllow,
-			Args: []*types.Arg{
-				{
-					Index: 0,
-					Value: 0xffffffff,
-					Op:    types.OpEqualTo,
-				},
-			},
-		},
-		{
-			Names: []string{
-				"arm_fadvise64_64",
-				"arm_sync_file_range",
-				"breakpoint",
-				"cacheflush",
-				"set_tls",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Arches: []string{"arm", "arm64"},
-			},
-		},
-		{
-			Names: []string{
-				"arch_prctl",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Arches: []string{"amd64", "x32"},
-			},
-		},
-		{
-			Names: []string{
-				"modify_ldt",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Arches: []string{"amd64", "x32", "x86"},
-			},
-		},
-		{
-			Names: []string{
-				"s390_pci_mmio_read",
-				"s390_pci_mmio_write",
-				"s390_runtime_instr",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Arches: []string{"s390", "s390x"},
-			},
-		},
-		{
-			Names: []string{
-				"open_by_handle_at",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_DAC_READ_SEARCH"},
-			},
-		},
-		{
-			Names: []string{
-				"bpf",
-				"clone",
-				"fanotify_init",
-				"lookup_dcookie",
-				"mount",
-				"name_to_handle_at",
-				"perf_event_open",
-				"setdomainname",
-				"sethostname",
-				"setns",
-				"umount",
-				"umount2",
-				"unshare",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_ADMIN"},
-			},
-		},
-		{
-			Names: []string{
-				"clone",
-			},
-			Action: types.ActAllow,
-			Args: []*types.Arg{
-				{
-					Index:    0,
-					Value:    syscall.CLONE_NEWNS | syscall.CLONE_NEWUTS | syscall.CLONE_NEWIPC | syscall.CLONE_NEWUSER | syscall.CLONE_NEWPID | syscall.CLONE_NEWNET,
-					ValueTwo: 0,
-					Op:       types.OpMaskedEqual,
-				},
-			},
-			Excludes: types.Filter{
-				Caps:   []string{"CAP_SYS_ADMIN"},
-				Arches: []string{"s390", "s390x"},
-			},
-		},
-		{
-			Names: []string{
-				"clone",
-			},
-			Action: types.ActAllow,
-			Args: []*types.Arg{
-				{
-					Index:    1,
-					Value:    syscall.CLONE_NEWNS | syscall.CLONE_NEWUTS | syscall.CLONE_NEWIPC | syscall.CLONE_NEWUSER | syscall.CLONE_NEWPID | syscall.CLONE_NEWNET,
-					ValueTwo: 0,
-					Op:       types.OpMaskedEqual,
-				},
-			},
-			Comment: "s390 parameter ordering for clone is different",
-			Includes: types.Filter{
-				Arches: []string{"s390", "s390x"},
-			},
-			Excludes: types.Filter{
-				Caps: []string{"CAP_SYS_ADMIN"},
-			},
-		},
-		{
-			Names: []string{
-				"reboot",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_BOOT"},
-			},
-		},
-		{
-			Names: []string{
-				"chroot",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_CHROOT"},
-			},
-		},
-		{
-			Names: []string{
-				"delete_module",
-				"init_module",
-				"finit_module",
-				"query_module",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_MODULE"},
-			},
-		},
-		{
-			Names: []string{
-				"acct",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_PACCT"},
-			},
-		},
-		{
-			Names: []string{
-				"kcmp",
-				"process_vm_readv",
-				"process_vm_writev",
-				"ptrace",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_PTRACE"},
-			},
-		},
-		{
-			Names: []string{
-				"iopl",
-				"ioperm",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_RAWIO"},
-			},
-		},
-		{
-			Names: []string{
-				"settimeofday",
-				"stime",
-				"adjtimex",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_TIME"},
-			},
-		},
-		{
-			Names: []string{
-				"vhangup",
-			},
-			Action: types.ActAllow,
-			Args:   []*types.Arg{},
-			Includes: types.Filter{
-				Caps: []string{"CAP_SYS_TTY_CONFIG"},
-			},
-		},
-	}
-
-	return &types.Seccomp{
-		DefaultAction: types.ActErrno,
-		ArchMap:       arches(),
-		Syscalls:      syscalls,
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_test.go b/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_test.go
deleted file mode 100644
index 134692147b..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// +build linux
-
-package seccomp
-
-import (
-	"io/ioutil"
-	"testing"
-
-	"github.com/docker/docker/oci"
-)
-
-func TestLoadProfile(t *testing.T) {
-	f, err := ioutil.ReadFile("fixtures/example.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	rs := oci.DefaultSpec()
-	if _, err := LoadProfile(string(f), &rs); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestLoadDefaultProfile(t *testing.T) {
-	f, err := ioutil.ReadFile("default.json")
-	if err != nil {
-		t.Fatal(err)
-	}
-	rs := oci.DefaultSpec()
-	if _, err := LoadProfile(string(f), &rs); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_unsupported.go b/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_unsupported.go
deleted file mode 100644
index f84b20b6d9..0000000000
--- a/installer/vendor/github.com/docker/docker/profiles/seccomp/seccomp_unsupported.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build linux,!seccomp
-
-package seccomp
-
-import (
-	"github.com/docker/docker/api/types"
-	"github.com/opencontainers/runtime-spec/specs-go"
-)
-
-// DefaultProfile returns a nil pointer on unsupported systems.
-func DefaultProfile(rs *specs.Spec) *types.Seccomp {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/project/ARM.md b/installer/vendor/github.com/docker/docker/project/ARM.md
deleted file mode 100644
index c4d21bf27a..0000000000
--- a/installer/vendor/github.com/docker/docker/project/ARM.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# ARM support
-
-The ARM support should be considered experimental. It will be extended step by step in the coming weeks.
-
-Building a Docker Development Image works in the same fashion as for Intel platform (x86-64).
-Currently we have initial support for 32bit ARMv7 devices.
-
-To work with the Docker Development Image you have to clone the Docker/Docker repo on a supported device.
-It needs to have a Docker Engine installed to build the Docker Development Image.
-
-From the root of the Docker/Docker repo one can use make to execute the following make targets:
-- make validate
-- make binary
-- make build
-- make deb
-- make bundles
-- make default
-- make shell
-- make test-unit
-- make test-integration-cli
-- make
-
-The Makefile does include logic to determine on which OS and architecture the Docker Development Image is built.
-Based on OS and architecture it chooses the correct Dockerfile.
-For the ARM 32bit architecture it uses `Dockerfile.armhf`.
-
-So for example in order to build a Docker binary one has to  
-1. clone the Docker/Docker repository on an ARM device `git clone git@github.com:docker/docker.git`  
-2. change into the checked out repository with `cd docker`  
-3. execute `make binary` to create a Docker Engine binary for ARM  
-
-## Kernel modules
-A few libnetwork integration tests require that the kernel be
-configured with "dummy" network interface and has the module
-loaded. However, the dummy module may be not loaded automatically.
-
-To load the kernel module permanently, run these commands as `root`.
-
-    modprobe dummy
-    echo "dummy" >> /etc/modules
-
-On some systems you also have to sync your kernel modules.
-
-    oc-sync-kernel-modules
-    depmod
diff --git a/installer/vendor/github.com/docker/docker/project/BRANCHES-AND-TAGS.md b/installer/vendor/github.com/docker/docker/project/BRANCHES-AND-TAGS.md
deleted file mode 100644
index 1c6f232524..0000000000
--- a/installer/vendor/github.com/docker/docker/project/BRANCHES-AND-TAGS.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Branches and tags
-=================
-
-Note: details of the release process for the Engine are documented in the
-[RELEASE-CHECKLIST](https://github.com/docker/docker/blob/master/project/RELEASE-CHECKLIST.md).
-
-# Branches
-
-The docker/docker repository should normally have only three living branches at all time, including
-the regular `master` branch:
-
-## `docs` branch
-
-The `docs` branch supports documentation updates between product releases. This branch allow us to
-decouple documentation releases from product releases.
-
-## `release` branch
-
-The `release` branch contains the last _released_ version of the code for the project.
-
-The `release` branch is only updated at each public release of the project. The mechanism for this
-is that the release is materialized by a pull request against the `release` branch which lives for
-the duration of the code freeze period. When this pull request is merged, the `release` branch gets
-updated, and its new state is tagged accordingly.
-
-# Tags
-
-Any public release of a compiled binary, with the logical exception of nightly builds, should have
-a corresponding tag in the repository.
-
-The general format of a tag is `vX.Y.Z[-suffix[N]]`:
-
-- All of `X`, `Y`, `Z` must be specified (example: `v1.0.0`)
-- First release candidate for version `1.8.0` should be tagged `v1.8.0-rc1`
-- Second alpha release of a product should be tagged `v1.0.0-alpha1`
diff --git a/installer/vendor/github.com/docker/docker/project/GOVERNANCE.md b/installer/vendor/github.com/docker/docker/project/GOVERNANCE.md
deleted file mode 100644
index 6ae7baf743..0000000000
--- a/installer/vendor/github.com/docker/docker/project/GOVERNANCE.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Docker Governance Advisory Board Meetings
-
-In the spirit of openness, Docker created a Governance Advisory Board, and committed to make all materials and notes from the meetings of this group public.
-All output from the meetings should be considered proposals only, and are subject to the review and approval of the community and the project leadership.
-
-The materials from the first Docker Governance Advisory Board meeting, held on October 28, 2014, are available at 
-[Google Docs Folder](https://goo.gl/Alfj8r)
-
-These include:
-
-* First Meeting Notes 
-* DGAB Charter 
-* Presentation 1: Introductory Presentation, including State of The Project  
-* Presentation 2: Overall Contribution Structure/Docker Project Core Proposal 
-* Presentation 3: Long Term Roadmap/Statement of Direction 
- 
-
diff --git a/installer/vendor/github.com/docker/docker/project/IRC-ADMINISTRATION.md b/installer/vendor/github.com/docker/docker/project/IRC-ADMINISTRATION.md
deleted file mode 100644
index 824a14bd51..0000000000
--- a/installer/vendor/github.com/docker/docker/project/IRC-ADMINISTRATION.md
+++ /dev/null
@@ -1,37 +0,0 @@
-# Freenode IRC Administration Guidelines and Tips
-
-This is not meant to be a general "Here's how to IRC" document, so if you're
-looking for that, check Google instead. ♥
-
-If you've been charged with helping maintain one of Docker's now many IRC
-channels, this might turn out to be useful.  If there's information that you
-wish you'd known about how a particular channel is organized, you should add
-deets here! :)
-
-## `ChanServ`
-
-Most channel maintenance happens by talking to Freenode's `ChanServ` bot.  For
-example, `/msg ChanServ ACCESS <channel> LIST` will show you a list of everyone
-with "access" privileges for a particular channel.
-
-A similar command is used to give someone a particular access level.  For
-example, to add a new maintainer to the `#docker-maintainers` access list so
-that they can contribute to the discussions (after they've been merged
-appropriately in a `MAINTAINERS` file, of course), one would use `/msg ChanServ
-ACCESS #docker-maintainers ADD <nick> maintainer`.
-
-To setup a new channel with a similar `maintainer` access template, use a
-command like `/msg ChanServ TEMPLATE <channel> maintainer +AV` (`+A` for letting
-them view the `ACCESS LIST`, `+V` for auto-voice; see `/msg ChanServ HELP FLAGS`
-for more details).
-
-## Troubleshooting
-
-The most common cause of not-getting-auto-`+v` woes is people not being
-`IDENTIFY`ed with `NickServ` (or their current nickname not being `GROUP`ed with
-their main nickname) -- often manifested by `ChanServ` responding to an `ACCESS
-ADD` request with something like `xyz is not registered.`.
-
-This is easily fixed by doing `/msg NickServ IDENTIFY OldNick SecretPassword`
-followed by `/msg NickServ GROUP` to group the two nicknames together.  See
-`/msg NickServ HELP GROUP` for more information.
diff --git a/installer/vendor/github.com/docker/docker/project/ISSUE-TRIAGE.md b/installer/vendor/github.com/docker/docker/project/ISSUE-TRIAGE.md
deleted file mode 100644
index 95cb2f1b95..0000000000
--- a/installer/vendor/github.com/docker/docker/project/ISSUE-TRIAGE.md
+++ /dev/null
@@ -1,132 +0,0 @@
-Triaging of issues
-------------------
-
-Triage provides an important way to contribute to an open source project.  Triage helps ensure issues resolve quickly by:
-
-- Describing the issue's intent and purpose is conveyed precisely. This is necessary because it can be difficult for an issue to explain how an end user experiences a problem and what actions they took.
-- Giving a contributor the information they need before they commit to resolving an issue.
-- Lowering the issue count by preventing duplicate issues.
-- Streamlining the development process by preventing duplicate discussions.
-
-If you don't have time to code, consider helping with triage. The community will thank you for saving them time by spending some of yours.
-
-### 1. Ensure the issue contains basic information
-
-Before triaging an issue very far, make sure that the issue's author provided the standard issue information. This will help you make an educated recommendation on how this to categorize the issue. Standard information that *must* be included in most issues are things such as:
-
--   the output of `docker version`
--   the output of `docker info`
--   the output of `uname -a`
--   a reproducible case if this is a bug, Dockerfiles FTW
--   host distribution and version ( ubuntu 14.04, RHEL, fedora 23 )
--   page URL if this is a docs issue or the name of a man page
-
-Depending on the issue, you might not feel all this information is needed. Use your best judgement.  If you cannot triage an issue using what its author provided, explain kindly to the author that they must provide the above information to clarify the problem.
-
-If the author provides the standard information but you are still unable to triage the issue, request additional information. Do this kindly and politely because you are asking for more of the author's time.
-
-If the author does not respond requested information within the timespan of a week, close the issue with a kind note stating that the author can request for the issue to be
-reopened when the necessary information is provided.
-
-### 2. Classify the Issue
-
-An issue can have multiple of the following labels. Typically, a properly classified issues should
-have:
-
-- One label identifying its kind (`kind/*`).
-- One or multiple labels identifying the functional areas of interest (`area/*`).
-- Where applicable, one label categorizing its difficulty (`exp/*`).
-
-#### Issue kind
-
-| Kind             | Description                                                                                                                     |
-|------------------|---------------------------------------------------------------------------------------------------------------------------------|
-| kind/bug         | Bugs are bugs. The cause may or may not be known at triage time so debugging should be taken account into the time estimate.    |
-| kind/enhancement | Enhancement are not bugs or new features but can drastically improve usability or performance of a project component.           |
-| kind/feature     | Functionality or other elements that the project does not currently support.  Features are new and shiny.                       |
-| kind/question    | Contains a user or contributor question requiring a response.                                                                   |
-
-#### Functional area
-
-| Area                      |
-|---------------------------|
-| area/api                  |
-| area/builder              |
-| area/bundles              |
-| area/cli                  |
-| area/daemon               |
-| area/distribution         |
-| area/docs                 |
-| area/kernel               |
-| area/logging              |
-| area/networking           |
-| area/plugins              |
-| area/project              |
-| area/runtime              |
-| area/security             |
-| area/security/apparmor    |
-| area/security/seccomp     |
-| area/security/selinux     |
-| area/security/trust       |
-| area/storage              |
-| area/storage/aufs         |
-| area/storage/btrfs        |
-| area/storage/devicemapper |
-| area/storage/overlay      |
-| area/storage/zfs          |
-| area/swarm                |
-| area/testing              |
-| area/volumes              |
-
-#### Platform
-
-| Platform                  |
-|---------------------------|
-| platform/arm              |
-| platform/darwin           |
-| platform/ibm-power        |
-| platform/ibm-z            |
-| platform/windows          |
-
-#### Experience level
-
-Experience level is a way for a contributor to find an issue based on their
-skill set.  Experience types are applied to the issue or pull request using
-labels.
-
-| Level            | Experience level guideline                                                                                                                                                  |
-|------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| exp/beginner     | New to Docker, and possibly Golang, and is looking to help while learning the basics.                                                                                       |
-| exp/intermediate | Comfortable with golang and understands the core concepts of Docker and looking to dive deeper into the project.                                                            |
-| exp/expert       | Proficient with Docker and Golang and has been following, and active in, the community to understand the rationale behind design decisions and where the project is headed. |
-
-As the table states, these labels are meant as guidelines. You might have
-written a whole plugin for Docker in a personal project and never contributed to
-Docker. With that kind of experience, you could take on an <strong
-class="gh-label expert">exp/expert</strong> level task.
-
-#### Triage status
-
-To communicate the triage status with other collaborators, you can apply status
-labels to issues. These labels prevent duplicating effort.
-
-| Status                        | Description                                                                                                                                                                 |
-|-------------------------------|-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
-| status/confirmed              | You triaged the issue, and were able to reproduce the issue. Always leave a comment how you reproduced, so that the person working on resolving the issue has a way to set up a test-case.
-| status/accepted               | Apply to enhancements / feature requests that we think are good to have. Adding this label helps contributors find things to work on.
-| status/more-info-needed       | Apply this to issues that are missing information (e.g. no `docker version` or `docker info` output, or no steps to reproduce), or require feedback from the reporter. If the issue is not updated after a week, it can generally be closed.
-| status/needs-attention        | Apply this label if an issue (or PR) needs more eyes.
-
-### 3. Prioritizing issue
-
-When, and only when, an issue is attached to a specific milestone, the issue can be labeled with the
-following labels to indicate their degree of priority (from more urgent to less urgent).
-
-| Priority    | Description                                                                                                                       |
-|-------------|-----------------------------------------------------------------------------------------------------------------------------------|
-| priority/P0 | Urgent: Security, critical bugs, blocking issues. P0 basically means drop everything you are doing until this issue is addressed. |
-| priority/P1 | Important: P1 issues are a top priority and a must-have for the next release.                                                     |
-| priority/P2 | Normal priority: default priority applied.                                                                                        |
-| priority/P3 | Best effort: those are nice to have / minor issues.                                                                               |
-
-And that's it. That should be all the information required for a new or existing contributor to come in an resolve an issue.
diff --git a/installer/vendor/github.com/docker/docker/project/PACKAGE-REPO-MAINTENANCE.md b/installer/vendor/github.com/docker/docker/project/PACKAGE-REPO-MAINTENANCE.md
deleted file mode 100644
index 3763f8798b..0000000000
--- a/installer/vendor/github.com/docker/docker/project/PACKAGE-REPO-MAINTENANCE.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Apt & Yum Repository Maintenance
-## A maintainer's guide to managing Docker's package repos
-
-### How to clean up old experimental debs and rpms
-
-We release debs and rpms for experimental nightly, so these can build up.
-To remove old experimental debs and rpms, and _ONLY_ keep the latest, follow the
-steps below.
-
-1. Checkout docker master
-
-2. Run clean scripts
-
-```bash
-docker build --rm --force-rm -t docker-dev:master .
-docker run --rm -it --privileged \
-    -v /path/to/your/repos/dir:/volumes/repos \
-    -v $HOME/.gnupg:/root/.gnupg \
-    -e GPG_PASSPHRASE \
-    -e DOCKER_RELEASE_DIR=/volumes/repos \
-    docker-dev:master hack/make.sh clean-apt-repo clean-yum-repo generate-index-listing sign-repos
-```
-
-3. Upload the changed repos to `s3` (if you host on s3)
-
-4. Purge the cache, PURGE the cache, PURGE THE CACHE!
-
-### How to get out of a sticky situation
-
-Sh\*t happens. We know. Below are steps to get out of any "hash-sum mismatch" or
-"gpg sig error" or the likes error that might happen to the apt repo.
-
-**NOTE:** These are apt repo specific, have had no experimence with anything similar
-happening to the yum repo in the past so you can rest easy.
-
-For each step listed below, move on to the next if the previous didn't work.
-Otherwise CELEBRATE!
-
-1. Purge the cache.
-
-2. Did you remember to sign the debs after releasing?
-
-Re-sign the repo with your gpg key:
-
-```bash
-docker build --rm --force-rm -t docker-dev:master .
-docker run --rm -it --privileged \
-    -v /path/to/your/repos/dir:/volumes/repos \
-    -v $HOME/.gnupg:/root/.gnupg \
-    -e GPG_PASSPHRASE \
-    -e DOCKER_RELEASE_DIR=/volumes/repos \
-    docker-dev:master hack/make.sh sign-repos
-```
-
-Upload the changed repo to `s3` (if that is where you host)
-
-PURGE THE CACHE.
-
-3. Run Jess' magical, save all, only in case of extreme emergencies, "you are
-going to have to break this glass to get it" script.
-
-```bash
-docker build --rm --force-rm -t docker-dev:master .
-docker run --rm -it --privileged \
-    -v /path/to/your/repos/dir:/volumes/repos \
-    -v $HOME/.gnupg:/root/.gnupg \
-    -e GPG_PASSPHRASE \
-    -e DOCKER_RELEASE_DIR=/volumes/repos \
-    docker-dev:master hack/make.sh update-apt-repo generate-index-listing sign-repos
-```
-
-4. Upload the changed repo to `s3` (if that is where you host)
-
-PURGE THE CACHE.
diff --git a/installer/vendor/github.com/docker/docker/project/PACKAGERS.md b/installer/vendor/github.com/docker/docker/project/PACKAGERS.md
deleted file mode 100644
index 46ea8e7b20..0000000000
--- a/installer/vendor/github.com/docker/docker/project/PACKAGERS.md
+++ /dev/null
@@ -1,307 +0,0 @@
-# Dear Packager,
-
-If you are looking to make Docker available on your favorite software
-distribution, this document is for you. It summarizes the requirements for
-building and running the Docker client and the Docker daemon.
-
-## Getting Started
-
-We want to help you package Docker successfully. Before doing any packaging, a
-good first step is to introduce yourself on the [docker-dev mailing
-list](https://groups.google.com/d/forum/docker-dev), explain what you're trying
-to achieve, and tell us how we can help. Don't worry, we don't bite! There might
-even be someone already working on packaging for the same distro!
-
-You can also join the IRC channel - #docker and #docker-dev on Freenode are both
-active and friendly.
-
-We like to refer to Tianon ("@tianon" on GitHub and "tianon" on IRC) as our
-"Packagers Relations", since he's always working to make sure our packagers have
-a good, healthy upstream to work with (both in our communication and in our
-build scripts). If you're having any kind of trouble, feel free to ping him
-directly. He also likes to keep track of what distributions we have packagers
-for, so feel free to reach out to him even just to say "Hi!"
-
-## Package Name
-
-If possible, your package should be called "docker". If that name is already
-taken, a second choice is "docker-engine". Another possible choice is "docker.io".
-
-## Official Build vs Distro Build
-
-The Docker project maintains its own build and release toolchain. It is pretty
-neat and entirely based on Docker (surprise!). This toolchain is the canonical
-way to build Docker. We encourage you to give it a try, and if the circumstances
-allow you to use it, we recommend that you do.
-
-You might not be able to use the official build toolchain - usually because your
-distribution has a toolchain and packaging policy of its own. We get it! Your
-house, your rules. The rest of this document should give you the information you
-need to package Docker your way, without denaturing it in the process.
-
-## Build Dependencies
-
-To build Docker, you will need the following:
-
-* A recent version of Git and Mercurial
-* Go version 1.6 or later
-* A clean checkout of the source added to a valid [Go
-  workspace](https://golang.org/doc/code.html#Workspaces) under the path
-  *src/github.com/docker/docker* (unless you plan to use `AUTO_GOPATH`,
-  explained in more detail below)
-
-To build the Docker daemon, you will additionally need:
-
-* An amd64/x86_64 machine running Linux
-* SQLite version 3.7.9 or later
-* libdevmapper version 1.02.68-cvs (2012-01-26) or later from lvm2 version
-  2.02.89 or later
-* btrfs-progs version 3.16.1 or later (unless using an older version is
-  absolutely necessary, in which case 3.8 is the minimum)
-* libseccomp version 2.2.1 or later (for build tag seccomp)
-
-Be sure to also check out Docker's Dockerfile for the most up-to-date list of
-these build-time dependencies.
-
-### Go Dependencies
-
-All Go dependencies are vendored under "./vendor". They are used by the official
-build, so the source of truth for the current version of each dependency is
-whatever is in "./vendor".
-
-To use the vendored dependencies, simply make sure the path to "./vendor" is
-included in `GOPATH` (or use `AUTO_GOPATH`, as explained below).
-
-If you would rather (or must, due to distro policy) package these dependencies
-yourself, take a look at "vendor.conf" for an easy-to-parse list of the
-exact version for each.
-
-NOTE: if you're not able to package the exact version (to the exact commit) of a
-given dependency, please get in touch so we can remediate! Who knows what
-discrepancies can be caused by even the slightest deviation. We promise to do
-our best to make everybody happy.
-
-## Stripping Binaries
-
-Please, please, please do not strip any compiled binaries. This is really
-important.
-
-In our own testing, stripping the resulting binaries sometimes results in a
-binary that appears to work, but more often causes random panics, segfaults, and
-other issues. Even if the binary appears to work, please don't strip.
-
-See the following quotes from Dave Cheney, which explain this position better
-from the upstream Golang perspective.
-
-### [go issue #5855, comment #3](https://code.google.com/p/go/issues/detail?id=5855#c3)
-
-> Super super important: Do not strip go binaries or archives. It isn't tested,
-> often breaks, and doesn't work.
-
-### [launchpad golang issue #1200255, comment #8](https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1200255/comments/8)
-
-> To quote myself: "Please do not strip Go binaries, it is not supported, not
-> tested, is often broken, and doesn't do what you want"
->
-> To unpack that a bit
->
-> * not supported, as in, we don't support it, and recommend against it when
->   asked
-> * not tested, we don't test stripped binaries as part of the build CI process
-> * is often broken, stripping a go binary will produce anywhere from no, to
->   subtle, to outright execution failure, see above
-
-### [launchpad golang issue #1200255, comment #13](https://bugs.launchpad.net/ubuntu/+source/golang/+bug/1200255/comments/13)
-
-> To clarify my previous statements.
->
-> * I do not disagree with the debian policy, it is there for a good reason
-> * Having said that, it stripping Go binaries doesn't work, and nobody is
->   looking at making it work, so there is that.
->
-> Thanks for patching the build formula.
-
-## Building Docker
-
-Please use our build script ("./hack/make.sh") for all your compilation of
-Docker. If there's something you need that it isn't doing, or something it could
-be doing to make your life as a packager easier, please get in touch with Tianon
-and help us rectify the situation. Chances are good that other packagers have
-probably run into the same problems and a fix might already be in the works, but
-none of us will know for sure unless you harass Tianon about it. :)
-
-All the commands listed within this section should be run with the Docker source
-checkout as the current working directory.
-
-### `AUTO_GOPATH`
-
-If you'd rather not be bothered with the hassles that setting up `GOPATH`
-appropriately can be, and prefer to just get a "build that works", you should
-add something similar to this to whatever script or process you're using to
-build Docker:
-
-```bash
-export AUTO_GOPATH=1
-```
-
-This will cause the build scripts to set up a reasonable `GOPATH` that
-automatically and properly includes both docker/docker from the local
-directory, and the local "./vendor" directory as necessary.
-
-### `DOCKER_BUILDTAGS`
-
-If you're building a binary that may need to be used on platforms that include
-AppArmor, you will need to set `DOCKER_BUILDTAGS` as follows:
-```bash
-export DOCKER_BUILDTAGS='apparmor'
-```
-
-If you're building a binary that may need to be used on platforms that include
-SELinux, you will need to use the `selinux` build tag:
-```bash
-export DOCKER_BUILDTAGS='selinux'
-```
-
-If you're building a binary that may need to be used on platforms that include
-seccomp, you will need to use the `seccomp` build tag:
-```bash
-export DOCKER_BUILDTAGS='seccomp'
-```
-
-There are build tags for disabling graphdrivers as well. By default, support
-for all graphdrivers are built in.
-
-To disable btrfs:
-```bash
-export DOCKER_BUILDTAGS='exclude_graphdriver_btrfs'
-```
-
-To disable devicemapper:
-```bash
-export DOCKER_BUILDTAGS='exclude_graphdriver_devicemapper'
-```
-
-To disable aufs:
-```bash
-export DOCKER_BUILDTAGS='exclude_graphdriver_aufs'
-```
-
-NOTE: if you need to set more than one build tag, space separate them:
-```bash
-export DOCKER_BUILDTAGS='apparmor selinux exclude_graphdriver_aufs'
-```
-
-### Static Daemon
-
-If it is feasible within the constraints of your distribution, you should
-seriously consider packaging Docker as a single static binary. A good comparison
-is Busybox, which is often packaged statically as a feature to enable mass
-portability. Because of the unique way Docker operates, being similarly static
-is a "feature".
-
-To build a static Docker daemon binary, run the following command (first
-ensuring that all the necessary libraries are available in static form for
-linking - see the "Build Dependencies" section above, and the relevant lines
-within Docker's own Dockerfile that set up our official build environment):
-
-```bash
-./hack/make.sh binary
-```
-
-This will create a static binary under
-"./bundles/$VERSION/binary/docker-$VERSION", where "$VERSION" is the contents of
-the file "./VERSION". This binary is usually installed somewhere like
-"/usr/bin/docker".
-
-### Dynamic Daemon / Client-only Binary
-
-If you are only interested in a Docker client binary, you can build using:
-
-```bash
-./hack/make.sh binary-client
-```
-
-If you need to (due to distro policy, distro library availability, or for other
-reasons) create a dynamically compiled daemon binary, or if you are only
-interested in creating a client binary for Docker, use something similar to the
-following:
-
-```bash
-./hack/make.sh dynbinary-client
-```
-
-This will create "./bundles/$VERSION/dynbinary-client/docker-$VERSION", which for
-client-only builds is the important file to grab and install as appropriate.
-
-## System Dependencies
-
-### Runtime Dependencies
-
-To function properly, the Docker daemon needs the following software to be
-installed and available at runtime:
-
-* iptables version 1.4 or later
-* procps (or similar provider of a "ps" executable)
-* e2fsprogs version 1.4.12 or later (in use: mkfs.ext4, tune2fs)
-* xfsprogs (in use: mkfs.xfs)
-* XZ Utils version 4.9 or later
-* a [properly
-  mounted](https://github.com/tianon/cgroupfs-mount/blob/master/cgroupfs-mount)
-  cgroupfs hierarchy (having a single, all-encompassing "cgroup" mount point
-  [is](https://github.com/docker/docker/issues/2683)
-  [not](https://github.com/docker/docker/issues/3485)
-  [sufficient](https://github.com/docker/docker/issues/4568))
-
-Additionally, the Docker client needs the following software to be installed and
-available at runtime:
-
-* Git version 1.7 or later
-
-### Kernel Requirements
-
-The Docker daemon has very specific kernel requirements. Most pre-packaged
-kernels already include the necessary options enabled. If you are building your
-own kernel, you will either need to discover the options necessary via trial and
-error, or check out the [Gentoo
-ebuild](https://github.com/tianon/docker-overlay/blob/master/app-emulation/docker/docker-9999.ebuild),
-in which a list is maintained (and if there are any issues or discrepancies in
-that list, please contact Tianon so they can be rectified).
-
-Note that in client mode, there are no specific kernel requirements, and that
-the client will even run on alternative platforms such as Mac OS X / Darwin.
-
-### Optional Dependencies
-
-Some of Docker's features are activated by using optional command-line flags or
-by having support for them in the kernel or userspace. A few examples include:
-
-* AUFS graph driver (requires AUFS patches/support enabled in the kernel, and at
-  least the "auplink" utility from aufs-tools)
-* BTRFS graph driver (requires BTRFS support enabled in the kernel)
-* ZFS graph driver (requires userspace zfs-utils and a corresponding kernel module)
-* Libseccomp to allow running seccomp profiles with containers
-
-## Daemon Init Script
-
-Docker expects to run as a daemon at machine startup. Your package will need to
-include a script for your distro's process supervisor of choice. Be sure to
-check out the "contrib/init" folder in case a suitable init script already
-exists (and if one does not, contact Tianon about whether it might be
-appropriate for your distro's init script to live there too!).
-
-In general, Docker should be run as root, similar to the following:
-
-```bash
-docker daemon
-```
-
-Generally, a `DOCKER_OPTS` variable of some kind is available for adding more
-flags (such as changing the graph driver to use BTRFS, switching the location of
-"/var/lib/docker", etc).
-
-## Communicate
-
-As a final note, please do feel free to reach out to Tianon at any time for
-pretty much anything. He really does love hearing from our packagers and wants
-to make sure we're not being a "hostile upstream". As should be a given, we
-appreciate the work our packagers do to make sure we have broad distribution!
diff --git a/installer/vendor/github.com/docker/docker/project/PATCH-RELEASES.md b/installer/vendor/github.com/docker/docker/project/PATCH-RELEASES.md
deleted file mode 100644
index 548db9ab4d..0000000000
--- a/installer/vendor/github.com/docker/docker/project/PATCH-RELEASES.md
+++ /dev/null
@@ -1,68 +0,0 @@
-# Docker patch (bugfix) release process
-
-Patch releases (the 'Z' in vX.Y.Z) are intended to fix major issues in a
-release. Docker open source projects follow these procedures when creating a
-patch release;
-
-After each release (both "major" (vX.Y.0) and "patch" releases (vX.Y.Z)), a
-patch release milestone (vX.Y.Z + 1) is created.
-
-The creation of a patch release milestone is no obligation to actually
-*create* a patch release. The purpose of these milestones is to collect
-issues and pull requests that can *justify* a patch release;
-
-- Any maintainer is allowed to add issues and PR's to the milestone, when
-  doing so, preferably leave a comment on the issue or PR explaining *why*
-  you think it should be considered for inclusion in a patch release.
-- Issues introduced in version vX.Y.0 get added to milestone X.Y.Z+1
-- Only *regressions* should be added. Issues *discovered* in version vX.Y.0,
-  but already present in version vX.Y-1.Z should not be added, unless
-  critical.
-- Patch releases can *only* contain bug-fixes. New features should
-  *never* be added to a patch release.
-
-The release captain of the "major" (X.Y.0) release, is also responsible for
-patch releases. The release captain, together with another maintainer, will
-review issues and PRs on the milestone, and assigns `priority/`labels. These
-review sessions take place on a weekly basis, more frequent if needed:
-
-- A P0 priority is assigned to critical issues. A maintainer *must* be
-  assigned to these issues. Maintainers should strive to fix a P0 within a week.
-- A P1 priority is assigned to major issues, but not critical. A maintainer
-  *must* be assigned to these issues.
-- P2 and P3 priorities are assigned to other issues. A maintainer can be
-  assigned.
-- Non-critical issues and PR's can be removed from the milestone. Minor
-  changes, such as typo-fixes or omissions in the documentation can be
-  considered for inclusion in a patch release.
-
-## Deciding if a patch release should be done
-
-- Only a P0 can justify to proceed with the patch release.
-- P1, P2, and P3 issues/PR's should not influence the decision, and
-  should be moved to the X.Y.Z+1 milestone, or removed from the
-  milestone.
-
-> **Note**: If the next "major" release is imminent, the release captain
-> can decide to cancel a patch release, and include the patches in the
-> upcoming major release.
-
-> **Note**: Security releases are also "patch releases", but follow
-> a different procedure. Security releases are developed in a private
-> repository, released and tested under embargo before they become
-> publicly available.
-
-## Deciding on the content of a patch release
-
-When the criteria for moving forward with a patch release are met, the release
-manager will decide on the exact content of the release.
-
-- Fixes to all P0 issues *must* be included in the release.
-- Fixes to *some* P1, P2, and P3 issues *may* be included as part of the patch
-  release depending on the severity of the issue and the risk associated with
-  the patch.
-
-Any code delivered as part of a patch release should make life easier for a
-significant amount of users with zero chance of degrading anybody's experience.
-A good rule of thumb for that is to limit cherry-picking to small patches, which
-fix well-understood issues, and which come with verifiable tests.
diff --git a/installer/vendor/github.com/docker/docker/project/PRINCIPLES.md b/installer/vendor/github.com/docker/docker/project/PRINCIPLES.md
deleted file mode 100644
index 53f03018ec..0000000000
--- a/installer/vendor/github.com/docker/docker/project/PRINCIPLES.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Docker principles
-
-In the design and development of Docker we try to follow these principles:
-
-(Work in progress)
-
-* Don't try to replace every tool. Instead, be an ingredient to improve them.
-* Less code is better.
-* Fewer components are better. Do you really need to add one more class?
-* 50 lines of straightforward, readable code is better than 10 lines of magic that nobody can understand.
-* Don't do later what you can do now. "//FIXME: refactor" is not acceptable in new code.
-* When hesitating between 2 options, choose the one that is easier to reverse.
-* No is temporary, Yes is forever. If you're not sure about a new feature, say no. You can change your mind later.
-* Containers must be portable to the greatest possible number of machines. Be suspicious of any change which makes machines less interchangeable.
-* The less moving parts in a container, the better.
-* Don't merge it unless you document it.
-* Don't document it unless you can keep it up-to-date.
-* Don't merge it unless you test it!
-* Everyone's problem is slightly different. Focus on the part that is the same for everyone, and solve that.
diff --git a/installer/vendor/github.com/docker/docker/project/README.md b/installer/vendor/github.com/docker/docker/project/README.md
deleted file mode 100644
index 3ed68cf297..0000000000
--- a/installer/vendor/github.com/docker/docker/project/README.md
+++ /dev/null
@@ -1,24 +0,0 @@
-# Hacking on Docker
-
-The `project/` directory holds information and tools for everyone involved in the process of creating and
-distributing Docker, specifically:
-
-## Guides
-
-If you're a *contributor* or aspiring contributor, you should read [CONTRIBUTORS.md](../CONTRIBUTING.md).
-
-If you're a *maintainer* or aspiring maintainer, you should read [MAINTAINERS](../MAINTAINERS).
-
-If you're a *packager* or aspiring packager, you should read [PACKAGERS.md](./PACKAGERS.md).
-
-If you're a maintainer in charge of a *release*, you should read [RELEASE-CHECKLIST.md](./RELEASE-CHECKLIST.md).
-
-## Roadmap
-
-A high-level roadmap is available at [ROADMAP.md](../ROADMAP.md).
-
-
-## Build tools
-
-[hack/make.sh](../hack/make.sh) is the primary build tool for docker. It is used for compiling the official binary,
-running the test suite, and pushing releases.
diff --git a/installer/vendor/github.com/docker/docker/project/RELEASE-CHECKLIST.md b/installer/vendor/github.com/docker/docker/project/RELEASE-CHECKLIST.md
deleted file mode 100644
index 84848cae2b..0000000000
--- a/installer/vendor/github.com/docker/docker/project/RELEASE-CHECKLIST.md
+++ /dev/null
@@ -1,518 +0,0 @@
-# Release Checklist
-## A maintainer's guide to releasing Docker
-
-So you're in charge of a Docker release? Cool. Here's what to do.
-
-If your experience deviates from this document, please document the changes
-to keep it up-to-date.
-
-It is important to note that this document assumes that the git remote in your
-repository that corresponds to "https://github.com/docker/docker" is named
-"origin".  If yours is not (for example, if you've chosen to name it "upstream"
-or something similar instead), be sure to adjust the listed snippets for your
-local environment accordingly.  If you are not sure what your upstream remote is
-named, use a command like `git remote -v` to find out.
-
-If you don't have an upstream remote, you can add one easily using something
-like:
-
-```bash
-export GITHUBUSER="YOUR_GITHUB_USER"
-git remote add origin https://github.com/docker/docker.git
-git remote add $GITHUBUSER git@github.com:$GITHUBUSER/docker.git
-```
-
-### 1. Pull from master and create a release branch
-
-All releases version numbers will be of the form: vX.Y.Z  where X is the major
-version number, Y is the minor version number and Z is the patch release version number.
-
-#### Major releases
-
-The release branch name is just vX.Y because it's going to be the basis for all .Z releases.
-
-```bash
-export BASE=vX.Y
-export VERSION=vX.Y.Z
-git fetch origin
-git checkout --track origin/master
-git checkout -b release/$BASE
-```
-
-This new branch is going to be the base for the release. We need to push it to origin so we
-can track the cherry-picked changes and the version bump:
-
-```bash
-git push origin release/$BASE
-```
-
-When you have the major release branch in origin, we need to create the bump fork branch
-that we'll push to our fork:
-
-```bash
-git checkout -b bump_$VERSION
-```
-
-#### Patch releases
-
-If we have the release branch in origin, we can create the forked bump branch from it directly:
-
-```bash
-export VERSION=vX.Y.Z
-export PATCH=vX.Y.Z+1
-git fetch origin
-git checkout --track origin/release/$BASE
-git checkout -b bump_$PATCH
-```
-
-We cherry-pick only the commits we want into the bump branch:
-
-```bash
-# get the commits ids we want to cherry-pick
-git log
-# cherry-pick the commits starting from the oldest one, without including merge commits
-git cherry-pick -s -x <commit-id>
-git cherry-pick -s -x <commit-id>
-...
-```
-
-### 2. Update the VERSION files and API version on master
-
-We don't want to stop contributions to master just because we are releasing.
-So, after the release branch is up, we bump the VERSION and API version to mark
-the start of the "next" release.
-
-#### 2.1 Update the VERSION files
-
-Update the content of the `VERSION` file to be the next minor (incrementing Y)
-and add the `-dev` suffix. For example, after the release branch for 1.5.0 is
-created, the `VERSION` file gets updated to `1.6.0-dev` (as in "1.6.0 in the
-making").
-
-#### 2.2 Update API version on master
-
-We don't want API changes to go to the now frozen API version. Create a new
-entry in `docs/reference/api/` by copying the latest and bumping the version
-number (in both the file's name and content), and submit this in a PR against
-master.
-
-### 3. Update CHANGELOG.md
-
-You can run this command for reference with git 2.0:
-
-```bash
-git fetch --tags
-LAST_VERSION=$(git tag -l --sort=-version:refname "v*" | grep -E 'v[0-9\.]+$' | head -1)
-git log --stat $LAST_VERSION..bump_$VERSION
-```
-
-If you don't have git 2.0 but have a sort command that supports `-V`:
-```bash
-git fetch --tags
-LAST_VERSION=$(git tag -l | grep -E 'v[0-9\.]+$' | sort -rV | head -1)
-git log --stat $LAST_VERSION..bump_$VERSION
-```
-
-If releasing a major version (X or Y increased in vX.Y.Z), simply listing notable user-facing features is sufficient.
-```markdown
-#### Notable features since <last major version>
-* New docker command to do something useful
-* Engine API change (deprecating old version)
-* Performance improvements in some usecases
-* ...
-```
-
-For minor releases (only Z increases in vX.Y.Z), provide a list of user-facing changes.
-Each change should be listed under a category heading formatted as `#### CATEGORY`.
-
-`CATEGORY` should describe which part of the project is affected.
-  Valid categories are:
-  * Builder
-  * Documentation
-  * Hack
-  * Packaging
-  * Engine API
-  * Runtime
-  * Other (please use this category sparingly)
-
-Each change should be formatted as `BULLET DESCRIPTION`, given:
-
-* BULLET: either `-`, `+` or `*`, to indicate a bugfix, new feature or
-  upgrade, respectively.
-
-* DESCRIPTION: a concise description of the change that is relevant to the
-  end-user, using the present tense. Changes should be described in terms
-  of how they affect the user, for example "Add new feature X which allows Y",
-  "Fix bug which caused X", "Increase performance of Y".
-
-EXAMPLES:
-
-```markdown
-## 0.3.6 (1995-12-25)
-
-#### Builder
-
-+ 'docker build -t FOO .' applies the tag FOO to the newly built image
-
-#### Engine API
-
-- Fix a bug in the optional unix socket transport
-
-#### Runtime
-
-* Improve detection of kernel version
-```
-
-If you need a list of contributors between the last major release and the
-current bump branch, use something like:
-```bash
-git log --format='%aN <%aE>' v0.7.0...bump_v0.8.0 | sort -uf
-```
-Obviously, you'll need to adjust version numbers as necessary.  If you just need
-a count, add a simple `| wc -l`.
-
-### 4. Change the contents of the VERSION file
-
-Before the big thing, you'll want to make successive release candidates and get
-people to test. The release candidate number `N` should be part of the version:
-
-```bash
-export RC_VERSION=${VERSION}-rcN
-echo ${RC_VERSION#v} > VERSION
-```
-
-### 5. Test the docs
-
-Make sure that your tree includes documentation for any modified or
-new features, syntax or semantic changes.
-
-To test locally:
-
-```bash
-make docs
-```
-
-To make a shared test at https://beta-docs.docker.io:
-
-(You will need the `awsconfig` file added to the `docs/` dir)
-
-```bash
-make AWS_S3_BUCKET=beta-docs.docker.io BUILD_ROOT=yes docs-release
-```
-
-### 6. Commit and create a pull request to the "release" branch
-
-```bash
-git add VERSION CHANGELOG.md
-git commit -m "Bump version to $VERSION"
-git push $GITHUBUSER bump_$VERSION
-echo "https://github.com/$GITHUBUSER/docker/compare/docker:release/$BASE...$GITHUBUSER:bump_$VERSION?expand=1"
-```
-
-That last command will give you the proper link to visit to ensure that you
-open the PR against the "release" branch instead of accidentally against
-"master" (like so many brave souls before you already have).
-
-### 7. Create a PR to update the AUTHORS file for the release
-
-Update the AUTHORS file, by running the `hack/generate-authors.sh` on the
-release branch. To prevent duplicate entries, you may need to update the
-`.mailmap` file accordingly.
-
-### 8. Build release candidate rpms and debs
-
-**NOTE**: It will be a lot faster if you pass a different graphdriver with
-`DOCKER_GRAPHDRIVER` than `vfs`.
-
-```bash
-docker build -t docker .
-docker run \
-    --rm -t --privileged \
-    -e DOCKER_GRAPHDRIVER=aufs \
-    -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \
-    docker \
-    hack/make.sh binary build-deb build-rpm
-```
-
-### 9. Publish release candidate rpms and debs
-
-With the rpms and debs you built from the last step you can release them on the
-same server, or ideally, move them to a dedicated release box via scp into
-another docker/docker directory in bundles. This next step assumes you have
-a checkout of the docker source code at the same commit you used to build, with
-the artifacts from the last step in `bundles`.
-
-**NOTE:** If you put a space before the command your `.bash_history` will not
-save it. (for the `GPG_PASSPHRASE`).
-
-```bash
-docker build -t docker .
-docker run --rm -it --privileged \
-    -v /volumes/repos:/volumes/repos \
-    -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \
-    -v $HOME/.gnupg:/root/.gnupg \
-    -e DOCKER_RELEASE_DIR=/volumes/repos \
-    -e GPG_PASSPHRASE \
-    -e KEEPBUNDLE=1 \
-    docker \
-    hack/make.sh release-deb release-rpm sign-repos generate-index-listing
-```
-
-### 10. Upload the changed repos to wherever you host
-
-For example, above we bind mounted `/volumes/repos` as the storage for
-`DOCKER_RELEASE_DIR`. In this case `/volumes/repos/apt` can be synced with
-a specific s3 bucket for the apt repo and `/volumes/repos/yum` can be synced with
-a s3 bucket for the yum repo.
-
-### 11. Publish release candidate binaries
-
-To run this you will need access to the release credentials. Get them from the
-Core maintainers.
-
-```bash
-docker build -t docker .
-
-# static binaries are still pushed to s3
-docker run \
-    -e AWS_S3_BUCKET=test.docker.com \
-    -e AWS_ACCESS_KEY_ID \
-    -e AWS_SECRET_ACCESS_KEY \
-    -e AWS_DEFAULT_REGION \
-    -i -t --privileged \
-    docker \
-    hack/release.sh
-```
-
-It will run the test suite, build the binaries and upload to the specified bucket,
-so this is a good time to verify that you're running against **test**.docker.com.
-
-### 12. Purge the cache!
-
-After the binaries are uploaded to test.docker.com and the packages are on
-apt.dockerproject.org and yum.dockerproject.org, make sure
-they get tested in both Ubuntu and Debian for any obvious installation
-issues or runtime issues.
-
-If everything looks good, it's time to create a git tag for this candidate:
-
-```bash
-git tag -a $RC_VERSION -m $RC_VERSION bump_$VERSION
-git push origin $RC_VERSION
-```
-
-Announcing on multiple medias is the best way to get some help testing! An easy
-way to get some useful links for sharing:
-
-```bash
-echo "Ubuntu/Debian: curl -sSL https://test.docker.com/ | sh"
-echo "Linux 64bit binary: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}"
-echo "Darwin/OSX 64bit client binary: https://test.docker.com/builds/Darwin/x86_64/docker-${VERSION#v}"
-echo "Linux 64bit tgz: https://test.docker.com/builds/Linux/x86_64/docker-${VERSION#v}.tgz"
-echo "Windows 64bit client binary: https://test.docker.com/builds/Windows/x86_64/docker-${VERSION#v}.exe"
-echo "Windows 32bit client binary: https://test.docker.com/builds/Windows/i386/docker-${VERSION#v}.exe"
-```
-
-We recommend announcing the release candidate on:
-
-- IRC on #docker, #docker-dev, #docker-maintainers
-- In a comment on the pull request to notify subscribed people on GitHub
-- The [docker-dev](https://groups.google.com/forum/#!forum/docker-dev) group
-- The [docker-maintainers](https://groups.google.com/a/dockerproject.org/forum/#!forum/maintainers) group
-- Any social media that can bring some attention to the release candidate
-
-### 13. Iterate on successive release candidates
-
-Spend several days along with the community explicitly investing time and
-resources to try and break Docker in every possible way, documenting any
-findings pertinent to the release.  This time should be spent testing and
-finding ways in which the release might have caused various features or upgrade
-environments to have issues, not coding.  During this time, the release is in
-code freeze, and any additional code changes will be pushed out to the next
-release.
-
-It should include various levels of breaking Docker, beyond just using Docker
-by the book.
-
-Any issues found may still remain issues for this release, but they should be
-documented and give appropriate warnings.
-
-During this phase, the `bump_$VERSION` branch will keep evolving as you will
-produce new release candidates. The frequency of new candidates is up to the
-release manager: use your best judgement taking into account the severity of
-reported issues, testers availability, and time to scheduled release date.
-
-Each time you'll want to produce a new release candidate, you will start by
-adding commits to the branch, usually by cherry-picking from master:
-
-```bash
-git cherry-pick -s -x -m0 <commit_id>
-```
-
-You want your "bump commit" (the one that updates the CHANGELOG and VERSION
-files) to remain on top, so you'll have to `git rebase -i` to bring it back up.
-
-Now that your bump commit is back on top, you will need to update the CHANGELOG
-file (if appropriate for this particular release candidate), and update the
-VERSION file to increment the RC number:
-
-```bash
-export RC_VERSION=$VERSION-rcN
-echo $RC_VERSION > VERSION
-```
-
-You can now amend your last commit and update the bump branch:
-
-```bash
-git commit --amend
-git push -f $GITHUBUSER bump_$VERSION
-```
-
-Repeat step 6 to tag the code, publish new binaries, announce availability, and
-get help testing.
-
-### 14. Finalize the bump branch
-
-When you're happy with the quality of a release candidate, you can move on and
-create the real thing.
-
-You will first have to amend the "bump commit" to drop the release candidate
-suffix in the VERSION file:
-
-```bash
-echo $VERSION > VERSION
-git add VERSION
-git commit --amend
-```
-
-You will then repeat step 6 to publish the binaries to test
-
-### 15. Get 2 other maintainers to validate the pull request
-
-### 16. Build final rpms and debs
-
-```bash
-docker build -t docker .
-docker run \
-    --rm -t --privileged \
-    -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \
-    docker \
-    hack/make.sh binary build-deb build-rpm
-```
-
-### 17. Publish final rpms and debs
-
-With the rpms and debs you built from the last step you can release them on the
-same server, or ideally, move them to a dedicated release box via scp into
-another docker/docker directory in bundles. This next step assumes you have
-a checkout of the docker source code at the same commit you used to build, with
-the artifacts from the last step in `bundles`.
-
-**NOTE:** If you put a space before the command your `.bash_history` will not
-save it. (for the `GPG_PASSPHRASE`).
-
-```bash
-docker build -t docker .
-docker run --rm -it --privileged \
-    -v /volumes/repos:/volumes/repos \
-    -v $(pwd)/bundles:/go/src/github.com/docker/docker/bundles \
-    -v $HOME/.gnupg:/root/.gnupg \
-    -e DOCKER_RELEASE_DIR=/volumes/repos \
-    -e GPG_PASSPHRASE \
-    -e KEEPBUNDLE=1 \
-    docker \
-    hack/make.sh release-deb release-rpm sign-repos generate-index-listing
-```
-
-### 18. Upload the changed repos to wherever you host
-
-For example, above we bind mounted `/volumes/repos` as the storage for
-`DOCKER_RELEASE_DIR`. In this case `/volumes/repos/apt` can be synced with
-a specific s3 bucket for the apt repo and `/volumes/repos/yum` can be synced with
-a s3 bucket for the yum repo.
-
-### 19. Publish final binaries
-
-Once they're tested and reasonably believed to be working, run against
-get.docker.com:
-
-```bash
-docker build -t docker .
-# static binaries are still pushed to s3
-docker run \
-    -e AWS_S3_BUCKET=get.docker.com \
-    -e AWS_ACCESS_KEY_ID \
-    -e AWS_SECRET_ACCESS_KEY \
-    -e AWS_DEFAULT_REGION \
-    -i -t --privileged \
-    docker \
-    hack/release.sh
-```
-
-### 20. Purge the cache!
-
-### 21. Apply tag and create release
-
-It's very important that we don't make the tag until after the official
-release is uploaded to get.docker.com!
-
-```bash
-git tag -a $VERSION -m $VERSION bump_$VERSION
-git push origin $VERSION
-```
-
-Once the tag is pushed, go to GitHub and create a [new release](https://github.com/docker/docker/releases/new).
-If the tag is for an RC make sure you check `This is a pre-release` at the bottom of the form.
-
-Select the tag that you just pushed as the version and paste the changelog in the description of the release.
-You can see examples in this two links:
-
-https://github.com/docker/docker/releases/tag/v1.8.0
-https://github.com/docker/docker/releases/tag/v1.8.0-rc3
-
-### 22. Go to github to merge the `bump_$VERSION` branch into release
-
-Don't forget to push that pretty blue button to delete the leftover
-branch afterwards!
-
-### 23. Update the docs branch
-
-You will need to point the docs branch to the newly created release tag:
-
-```bash
-git checkout origin/docs
-git reset --hard origin/$VERSION
-git push -f origin docs
-```
-
-The docs will appear on https://docs.docker.com/ (though there may be cached
-versions, so its worth checking http://docs.docker.com.s3-website-us-east-1.amazonaws.com/).
-For more information about documentation releases, see `docs/README.md`.
-
-Note that the new docs will not appear live on the site until the cache (a complex,
-distributed CDN system) is flushed. The `make docs-release` command will do this
-_if_ the `DISTRIBUTION_ID` is set correctly - this will take at least 15 minutes to run
-and you can check its progress with the CDN Cloudfront Chrome addon.
-
-### 24. Create a new pull request to merge your bump commit back into master
-
-```bash
-git checkout master
-git fetch
-git reset --hard origin/master
-git cherry-pick -s -x $VERSION
-git push $GITHUBUSER merge_release_$VERSION
-echo "https://github.com/$GITHUBUSER/docker/compare/docker:master...$GITHUBUSER:merge_release_$VERSION?expand=1"
-```
-
-Again, get two maintainers to validate, then merge, then push that pretty
-blue button to delete your branch.
-
-### 25. Rejoice and Evangelize!
-
-Congratulations! You're done.
-
-Go forth and announce the glad tidings of the new release in `#docker`,
-`#docker-dev`, on the [dev mailing list](https://groups.google.com/forum/#!forum/docker-dev),
-the [announce mailing list](https://groups.google.com/forum/#!forum/docker-announce),
-and on Twitter!
diff --git a/installer/vendor/github.com/docker/docker/project/RELEASE-PROCESS.md b/installer/vendor/github.com/docker/docker/project/RELEASE-PROCESS.md
deleted file mode 100644
index d764e9d007..0000000000
--- a/installer/vendor/github.com/docker/docker/project/RELEASE-PROCESS.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# Docker Release Process
-
-This document describes how the Docker project is released. The Docker project
-release process targets the Engine, Compose, Kitematic, Machine, Swarm,
-Distribution, Notary and their underlying dependencies (libnetwork, libkv,
-etc...).
-
-Step-by-step technical details of the process are described in 
-[RELEASE-CHECKLIST.md](https://github.com/docker/docker/blob/master/project/RELEASE-CHECKLIST.md).
-
-## Release cycle
-
-The Docker project follows a **time-based release cycle** and ships every nine
-weeks. A release cycle starts the same day the previous release cycle ends.
-
-The first six weeks of the cycle are dedicated to development and review. During
-this phase, new features and bugfixes submitted to any of the projects are
-**eligible** to be shipped as part of the next release. No changeset submitted
-during this period is however guaranteed to be merged for the current release
-cycle.
-
-## The freeze period
-
-Six weeks after the beginning of the cycle, the codebase is officially frozen
-and the codebase reaches a state close to the final release. A Release Candidate
-(RC) gets created at the same time. The freeze period is used to find bugs and
-get feedback on the state of the RC before the release.
-
-During this freeze period, while the `master` branch will continue its normal
-development cycle, no new features are accepted into the RC. As bugs are fixed
-in `master` the release owner will selectively 'cherry-pick' critical ones to
-be included into the RC. As the RC changes, new ones are made available for the
-community to test and review.
-
-This period lasts for three weeks.
-
-## How to maximize chances of being merged before the freeze date?
-
-First of all, there is never a guarantee that a specific changeset is going to
-be merged. However there are different actions to follow to maximize the chances
-for a changeset to be merged:
-
-- The team gives priority to review the PRs aligned with the Roadmap (usually
-defined by a ROADMAP.md file at the root of the repository).
-- The earlier a PR is opened, the more time the maintainers have to review. For
-example, if a PR is opened the day before the freeze date, it’s very unlikely
-that it will be merged for the release.
-- Constant communication with the maintainers (mailing-list, IRC, Github issues,
-etc.) allows to get early feedback on the design before getting into the
-implementation, which usually reduces the time needed to discuss a changeset.
-- If the code is commented, fully tested and by extension follows every single
-rules defined by the [CONTRIBUTING guide](
-https://github.com/docker/docker/blob/master/CONTRIBUTING.md), this will help
-the maintainers by speeding up the review.
-
-## The release
-
-At the end of the freeze (nine weeks after the start of the cycle), all the
-projects are released together.
-
-```
-                                        Codebase              Release
-Start of                                is frozen             (end of the
-the Cycle                               (7th week)            9th week)
-+---------------------------------------+---------------------+
-|                                       |                     |
-|           Development phase           |    Freeze phase     |
-|                                       |                     |
-+---------------------------------------+---------------------+
-                   6 weeks                      3 weeks
-<---------------------------------------><-------------------->
-```
-
-## Exceptions
-
-If a critical issue is found at the end of the freeze period and more time is
-needed to address it, the release will be pushed back. When a release gets
-pushed back, the next release cycle gets delayed as well.
diff --git a/installer/vendor/github.com/docker/docker/project/REVIEWING.md b/installer/vendor/github.com/docker/docker/project/REVIEWING.md
deleted file mode 100644
index 51ef4c59de..0000000000
--- a/installer/vendor/github.com/docker/docker/project/REVIEWING.md
+++ /dev/null
@@ -1,246 +0,0 @@
-# Pull request reviewing process
-
-## Labels
-
-Labels are carefully picked to optimize for:
-
- - Readability: maintainers must immediately know the state of a PR
- - Filtering simplicity: different labels represent many different aspects of
-   the reviewing work, and can even be targeted at different maintainers groups.
-
-A pull request should only be attributed labels documented in this section: other labels that may
-exist on the repository should apply to issues.
-
-### DCO labels
-
- * `dco/no`: automatically set by a bot when one of the commits lacks proper signature
-
-### Status labels
-
- * `status/0-triage`
- * `status/1-design-review`
- * `status/2-code-review`
- * `status/3-docs-review`
- * `status/4-ready-to-merge`
-
-Special status labels:
-
- * `status/failing-ci`: indicates that the PR in its current state fails the test suite
- * `status/needs-attention`: calls for a collective discussion during a review session
-
-### Impact labels (apply to merged pull requests)
-
- * `impact/api`
- * `impact/changelog`
- * `impact/cli`
- * `impact/deprecation`
- * `impact/distribution`
- * `impact/dockerfile`
-
-### Process labels (apply to merged pull requests)
-
-Process labels are to assist in preparing (patch) releases. These labels should only be used for pull requests.
-
-Label                           | Use for
-------------------------------- | -------------------------------------------------------------------------
-`process/cherry-pick`           | PRs that should be cherry-picked in the bump/release branch. These pull-requests must also be assigned to a milestone.
-`process/cherry-picked`         | PRs that have been cherry-picked. This label is helpful to find PR's that have been added to release-candidates, and to update the change log
-`process/docs-cherry-pick`      | PRs that should be cherry-picked in the docs branch. Only apply this label for changes that apply to the *current* release, and generic documentation fixes, such as Markdown and spelling fixes.
-`process/docs-cherry-picked`    | PRs that have been cherry-picked in the docs branch
-`process/merge-to-master`       | PRs that are opened directly on the bump/release branch, but also need to be merged back to "master"
-`process/merged-to-master`      | PRs that have been merged back to "master"
-
-
-## Workflow
-
-An opened pull request can be in 1 of 5 distinct states, for each of which there is a corresponding
-label that needs to be applied.
-
-### Triage - `status/0-triage`
-
-Maintainers are expected to triage new incoming pull requests by removing the `status/0-triage`
-label and adding the correct labels (e.g. `status/1-design-review`) before any other interaction
-with the PR. The starting label may potentially skip some steps depending on the kind of pull
-request: use your best judgement.
-
-Maintainers should perform an initial, high-level, overview of the pull request before moving it to
-the next appropriate stage:
-
- - Has DCO
- - Contains sufficient justification (e.g., usecases) for the proposed change
- - References the Github issue it fixes (if any) in the commit or the first Github comment
-
-Possible transitions from this state:
-
- * Close: e.g., unresponsive contributor without DCO
- * `status/1-design-review`: general case
- * `status/2-code-review`: e.g. trivial bugfix
- * `status/3-docs-review`: non-proposal documentation-only change
-
-### Design review - `status/1-design-review`
-
-Maintainers are expected to comment on the design of the pull request.  Review of documentation is
-expected only in the context of design validation, not for stylistic changes.
-
-Ideally, documentation should reflect the expected behavior of the code.  No code review should
-take place in this step.
-
-There are no strict rules on the way a design is validated: we usually aim for a consensus,
-although a single maintainer approval is often sufficient for obviously reasonable changes. In
-general, strong disagreement expressed by any of the maintainers should not be taken lightly.
-
-Once design is approved, a maintainer should make sure to remove this label and add the next one.
-
-Possible transitions from this state:
-
- * Close: design rejected
- * `status/2-code-review`: general case
- * `status/3-docs-review`: proposals with only documentation changes
-
-### Code review - `status/2-code-review`
-
-Maintainers are expected to review the code and ensure that it is good quality and in accordance
-with the documentation in the PR.
-
-New testcases are expected to be added. Ideally, those testcases should fail when the new code is
-absent, and pass when present. The testcases should strive to test as many variants, code paths, as
-possible to ensure maximum coverage.
-
-Changes to code must be reviewed and approved (LGTM'd) by a minimum of two code maintainers. When
-the author of a PR is a maintainer, he still needs the approval of two other maintainers.
-
-Once code is approved according to the rules of the subsystem, a maintainer should make sure to
-remove this label and add the next one. If documentation is absent but expected, maintainers should
-ask for documentation and move to status `status/3-docs-review` for docs maintainer to follow.
-
-Possible transitions from this state:
-
- * Close
- * `status/1-design-review`: new design concerns are raised
- * `status/3-docs-review`: general case
- * `status/4-ready-to-merge`: change not impacting documentation
-
-### Docs review - `status/3-docs-review`
-
-Maintainers are expected to review the documentation in its bigger context, ensuring consistency,
-completeness, validity, and breadth of coverage across all existing and new documentation.
-
-They should ask for any editorial change that makes the documentation more consistent and easier to
-understand.
-
-The docker/docker repository only contains _reference documentation_, all
-"narrative" documentation is kept in a [unified documentation
-repository](https://github.com/docker/docker.github.io). Reviewers must
-therefore verify which parts of the documentation need to be updated. Any
-contribution that may require changing the narrative should get the
-`impact/documentation` label: this is the signal for documentation maintainers
-that a change will likely need to happen on the unified documentation
-repository. When in doubt, it’s better to add the label and leave it to
-documentation maintainers to decide whether it’s ok to skip. In all cases,
-leave a comment to explain what documentation changes you think might be needed.
-
-- If the pull request does not impact the documentation at all, the docs review
-  step is skipped, and the pull request is ready to merge.
-- If the changes in
-  the pull request require changes to the reference documentation (either
-  command-line reference, or API reference), those changes must be included as
-  part of the pull request and will be reviewed now. Keep in mind that the
-  narrative documentation may contain output examples of commands, so may need
-  to be updated as well, in which case the `impact/documentation` label must
-  be applied.
-- If the PR has the `impact/documentation` label, merging is delayed until a
-  documentation maintainer acknowledges that a corresponding documentation PR
-  (or issue) is opened on the documentation repository. Once a documentation
-  maintainer acknowledges the change, she/he will move the PR to `status/4-merge`
-  for a code maintainer to push the green button.
-
-Changes and additions to docs must be reviewed and approved (LGTM'd) by a minimum of two docs
-sub-project maintainers. If the docs change originates with a docs maintainer, only one additional
-LGTM is required (since we assume a docs maintainer approves of their own PR).
-
-Once documentation is approved, a maintainer should make sure to remove this label and
-add the next one.
-
-Possible transitions from this state:
-
- * Close
- * `status/1-design-review`: new design concerns are raised
- * `status/2-code-review`: requires more code changes
- * `status/4-ready-to-merge`: general case
-
-### Merge - `status/4-ready-to-merge`
-
-Maintainers are expected to merge this pull request as soon as possible. They can ask for a rebase
-or carry the pull request themselves.
-
-Possible transitions from this state:
-
- * Merge: general case
- * Close: carry PR
-
-After merging a pull request, the maintainer should consider applying one or multiple impact labels
-to ease future classification:
-
- * `impact/api` signifies the patch impacted the Engine API
- * `impact/changelog` signifies the change is significant enough to make it in the changelog
- * `impact/cli` signifies the patch impacted a CLI command
- * `impact/dockerfile` signifies the patch impacted the Dockerfile syntax
- * `impact/deprecation` signifies the patch participates in deprecating an existing feature
-
-### Close
-
-If a pull request is closed it is expected that sufficient justification will be provided. In
-particular, if there are alternative ways of achieving the same net result then those needs to be
-spelled out. If the pull request is trying to solve a use case that is not one that we (as a
-community) want to support then a justification for why should be provided.
-
-The number of maintainers it takes to decide and close a PR is deliberately left unspecified. We
-assume that the group of maintainers is bound by mutual trust and respect, and that opposition from
-any single maintainer should be taken into consideration. Similarly, we expect maintainers to
-justify their reasoning and to accept debating.
-
-## Escalation process
-
-Despite the previously described reviewing process, some PR might not show any progress for various
-reasons:
-
- - No strong opinion for or against the proposed patch
- - Debates about the proper way to solve the problem at hand
- - Lack of consensus
- - ...
-
-All these will eventually lead to stalled PR, where no apparent progress is made across several
-weeks, or even months.
-
-Maintainers should use their best judgement and apply the `status/needs-attention` label. It must
-be used sparingly, as each PR with such label will be discussed by a group of maintainers during a
-review session. The goal of that session is to agree on one of the following outcomes for the PR:
-
- * Close, explaining the rationale for not pursuing further
- * Continue, either by pushing the PR further in the workflow, or by deciding to carry the patch
-   (ideally, a maintainer should be immediately assigned to make sure that the PR keeps continued
-   attention)
- * Escalate to Solomon by formulating a few specific questions on which his answers will allow
-   maintainers to decide.
-
-## Milestones
-
-Typically, every merged pull request get shipped naturally with the next release cut from the
-`master` branch (either the next minor or major version, as indicated by the
-[`VERSION`](https://github.com/docker/docker/blob/master/VERSION) file at the root of the
-repository). However, the time-based nature of the release process provides no guarantee that a
-given pull request will get merged in time. In other words, all open pull requests are implicitly
-considered part of the next minor or major release milestone, and this won't be materialized on
-GitHub.
-
-A merged pull request must be attached to the milestone corresponding to the release in which it
-will be shipped: this is both useful for tracking, and to help the release manager with the
-changelog generation.
-
-An open pull request may exceptionally get attached to a milestone to express a particular intent to
-get it merged in time for that release. This may for example be the case for an important feature to
-be included in a minor release, or a critical bugfix to be included in a patch release.
-
-Finally, and as documented by the [`PATCH-RELEASES.md`](PATCH-RELEASES.md) process, the existence of
-a milestone is not a guarantee that a release will happen, as some milestones will be created purely
-for the purpose of bookkeeping
diff --git a/installer/vendor/github.com/docker/docker/project/TOOLS.md b/installer/vendor/github.com/docker/docker/project/TOOLS.md
deleted file mode 100644
index 26303c3021..0000000000
--- a/installer/vendor/github.com/docker/docker/project/TOOLS.md
+++ /dev/null
@@ -1,63 +0,0 @@
-# Tools
-
-This page describes the tools we use and infrastructure that is in place for
-the Docker project.
-
-### CI
-
-The Docker project uses [Jenkins](https://jenkins.dockerproject.org/) as our
-continuous integration server. Each Pull Request to Docker is tested by running the 
-equivalent of `make all`. We chose Jenkins because we can host it ourselves and
-we run Docker in Docker to test.
-
-#### Leeroy
-
-Leeroy is a Go application which integrates Jenkins with 
-GitHub pull requests. Leeroy uses 
-[GitHub hooks](https://developer.github.com/v3/repos/hooks/) 
-to listen for pull request notifications and starts jobs on your Jenkins 
-server.  Using the Jenkins
-[notification plugin][https://wiki.jenkins-ci.org/display/JENKINS/Notification+Plugin],
-Leeroy updates the pull request using GitHub's 
-[status API](https://developer.github.com/v3/repos/statuses/)
-with pending, success, failure, or error statuses.
-
-The leeroy repository is maintained at
-[github.com/docker/leeroy](https://github.com/docker/leeroy).
-
-#### GordonTheTurtle IRC Bot
-
-The GordonTheTurtle IRC Bot lives in the
-[#docker-maintainers](https://botbot.me/freenode/docker-maintainers/) channel
-on Freenode. He is built in Go and is based off the project at
-[github.com/fabioxgn/go-bot](https://github.com/fabioxgn/go-bot). 
-
-His main command is `!rebuild`, which rebuilds a given Pull Request for a repository.
-This command works by integrating with Leroy. He has a few other commands too, such 
-as `!gif` or `!godoc`, but we are always looking for more fun commands to add.
-
-The gordon-bot repository is maintained at
-[github.com/docker/gordon-bot](https://github.com/docker/gordon-bot)
-
-### NSQ
-
-We use [NSQ](https://github.com/bitly/nsq) for various aspects of the project
-infrastructure.
-
-#### Hooks
-
-The hooks project,
-[github.com/crosbymichael/hooks](https://github.com/crosbymichael/hooks),
-is a small Go application that manages web hooks from github, hub.docker.com, or
-other third party services.
-
-It can be used for listening to github webhooks & pushing them to a queue,
-archiving hooks to rethinkdb for processing, and broadcasting hooks to various
-jobs.
-
-#### Docker Master Binaries
-
-One of the things queued from the Hooks are the building of the Master
-Binaries. This happens on every push to the master branch of Docker. The
-repository for this is maintained at
-[github.com/docker/docker-bb](https://github.com/docker/docker-bb).
diff --git a/installer/vendor/github.com/docker/docker/reference/reference.go b/installer/vendor/github.com/docker/docker/reference/reference.go
deleted file mode 100644
index 996fc50704..0000000000
--- a/installer/vendor/github.com/docker/docker/reference/reference.go
+++ /dev/null
@@ -1,216 +0,0 @@
-package reference
-
-import (
-	"errors"
-	"fmt"
-	"strings"
-
-	"github.com/docker/distribution/digest"
-	distreference "github.com/docker/distribution/reference"
-	"github.com/docker/docker/image/v1"
-)
-
-const (
-	// DefaultTag defines the default tag used when performing images related actions and no tag or digest is specified
-	DefaultTag = "latest"
-	// DefaultHostname is the default built-in hostname
-	DefaultHostname = "docker.io"
-	// LegacyDefaultHostname is automatically converted to DefaultHostname
-	LegacyDefaultHostname = "index.docker.io"
-	// DefaultRepoPrefix is the prefix used for default repositories in default host
-	DefaultRepoPrefix = "library/"
-)
-
-// Named is an object with a full name
-type Named interface {
-	// Name returns normalized repository name, like "ubuntu".
-	Name() string
-	// String returns full reference, like "ubuntu@sha256:abcdef..."
-	String() string
-	// FullName returns full repository name with hostname, like "docker.io/library/ubuntu"
-	FullName() string
-	// Hostname returns hostname for the reference, like "docker.io"
-	Hostname() string
-	// RemoteName returns the repository component of the full name, like "library/ubuntu"
-	RemoteName() string
-}
-
-// NamedTagged is an object including a name and tag.
-type NamedTagged interface {
-	Named
-	Tag() string
-}
-
-// Canonical reference is an object with a fully unique
-// name including a name with hostname and digest
-type Canonical interface {
-	Named
-	Digest() digest.Digest
-}
-
-// ParseNamed parses s and returns a syntactically valid reference implementing
-// the Named interface. The reference must have a name, otherwise an error is
-// returned.
-// If an error was encountered it is returned, along with a nil Reference.
-func ParseNamed(s string) (Named, error) {
-	named, err := distreference.ParseNamed(s)
-	if err != nil {
-		return nil, fmt.Errorf("Error parsing reference: %q is not a valid repository/tag: %s", s, err)
-	}
-	r, err := WithName(named.Name())
-	if err != nil {
-		return nil, err
-	}
-	if canonical, isCanonical := named.(distreference.Canonical); isCanonical {
-		return WithDigest(r, canonical.Digest())
-	}
-	if tagged, isTagged := named.(distreference.NamedTagged); isTagged {
-		return WithTag(r, tagged.Tag())
-	}
-	return r, nil
-}
-
-// TrimNamed removes any tag or digest from the named reference
-func TrimNamed(ref Named) Named {
-	return &namedRef{distreference.TrimNamed(ref)}
-}
-
-// WithName returns a named object representing the given string. If the input
-// is invalid ErrReferenceInvalidFormat will be returned.
-func WithName(name string) (Named, error) {
-	name, err := normalize(name)
-	if err != nil {
-		return nil, err
-	}
-	if err := validateName(name); err != nil {
-		return nil, err
-	}
-	r, err := distreference.WithName(name)
-	if err != nil {
-		return nil, err
-	}
-	return &namedRef{r}, nil
-}
-
-// WithTag combines the name from "name" and the tag from "tag" to form a
-// reference incorporating both the name and the tag.
-func WithTag(name Named, tag string) (NamedTagged, error) {
-	r, err := distreference.WithTag(name, tag)
-	if err != nil {
-		return nil, err
-	}
-	return &taggedRef{namedRef{r}}, nil
-}
-
-// WithDigest combines the name from "name" and the digest from "digest" to form
-// a reference incorporating both the name and the digest.
-func WithDigest(name Named, digest digest.Digest) (Canonical, error) {
-	r, err := distreference.WithDigest(name, digest)
-	if err != nil {
-		return nil, err
-	}
-	return &canonicalRef{namedRef{r}}, nil
-}
-
-type namedRef struct {
-	distreference.Named
-}
-type taggedRef struct {
-	namedRef
-}
-type canonicalRef struct {
-	namedRef
-}
-
-func (r *namedRef) FullName() string {
-	hostname, remoteName := splitHostname(r.Name())
-	return hostname + "/" + remoteName
-}
-func (r *namedRef) Hostname() string {
-	hostname, _ := splitHostname(r.Name())
-	return hostname
-}
-func (r *namedRef) RemoteName() string {
-	_, remoteName := splitHostname(r.Name())
-	return remoteName
-}
-func (r *taggedRef) Tag() string {
-	return r.namedRef.Named.(distreference.NamedTagged).Tag()
-}
-func (r *canonicalRef) Digest() digest.Digest {
-	return r.namedRef.Named.(distreference.Canonical).Digest()
-}
-
-// WithDefaultTag adds a default tag to a reference if it only has a repo name.
-func WithDefaultTag(ref Named) Named {
-	if IsNameOnly(ref) {
-		ref, _ = WithTag(ref, DefaultTag)
-	}
-	return ref
-}
-
-// IsNameOnly returns true if reference only contains a repo name.
-func IsNameOnly(ref Named) bool {
-	if _, ok := ref.(NamedTagged); ok {
-		return false
-	}
-	if _, ok := ref.(Canonical); ok {
-		return false
-	}
-	return true
-}
-
-// ParseIDOrReference parses string for an image ID or a reference. ID can be
-// without a default prefix.
-func ParseIDOrReference(idOrRef string) (digest.Digest, Named, error) {
-	if err := v1.ValidateID(idOrRef); err == nil {
-		idOrRef = "sha256:" + idOrRef
-	}
-	if dgst, err := digest.ParseDigest(idOrRef); err == nil {
-		return dgst, nil, nil
-	}
-	ref, err := ParseNamed(idOrRef)
-	return "", ref, err
-}
-
-// splitHostname splits a repository name to hostname and remotename string.
-// If no valid hostname is found, the default hostname is used. Repository name
-// needs to be already validated before.
-func splitHostname(name string) (hostname, remoteName string) {
-	i := strings.IndexRune(name, '/')
-	if i == -1 || (!strings.ContainsAny(name[:i], ".:") && name[:i] != "localhost") {
-		hostname, remoteName = DefaultHostname, name
-	} else {
-		hostname, remoteName = name[:i], name[i+1:]
-	}
-	if hostname == LegacyDefaultHostname {
-		hostname = DefaultHostname
-	}
-	if hostname == DefaultHostname && !strings.ContainsRune(remoteName, '/') {
-		remoteName = DefaultRepoPrefix + remoteName
-	}
-	return
-}
-
-// normalize returns a repository name in its normalized form, meaning it
-// will not contain default hostname nor library/ prefix for official images.
-func normalize(name string) (string, error) {
-	host, remoteName := splitHostname(name)
-	if strings.ToLower(remoteName) != remoteName {
-		return "", errors.New("invalid reference format: repository name must be lowercase")
-	}
-	if host == DefaultHostname {
-		if strings.HasPrefix(remoteName, DefaultRepoPrefix) {
-			return strings.TrimPrefix(remoteName, DefaultRepoPrefix), nil
-		}
-		return remoteName, nil
-	}
-	return name, nil
-}
-
-func validateName(name string) error {
-	if err := v1.ValidateID(name); err == nil {
-		return fmt.Errorf("Invalid repository name (%s), cannot specify 64-byte hexadecimal strings", name)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/reference/reference_test.go b/installer/vendor/github.com/docker/docker/reference/reference_test.go
deleted file mode 100644
index ff35ba3da2..0000000000
--- a/installer/vendor/github.com/docker/docker/reference/reference_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package reference
-
-import (
-	"testing"
-
-	"github.com/docker/distribution/digest"
-)
-
-func TestValidateReferenceName(t *testing.T) {
-	validRepoNames := []string{
-		"docker/docker",
-		"library/debian",
-		"debian",
-		"docker.io/docker/docker",
-		"docker.io/library/debian",
-		"docker.io/debian",
-		"index.docker.io/docker/docker",
-		"index.docker.io/library/debian",
-		"index.docker.io/debian",
-		"127.0.0.1:5000/docker/docker",
-		"127.0.0.1:5000/library/debian",
-		"127.0.0.1:5000/debian",
-		"thisisthesongthatneverendsitgoesonandonandonthisisthesongthatnev",
-	}
-	invalidRepoNames := []string{
-		"https://github.com/docker/docker",
-		"docker/Docker",
-		"-docker",
-		"-docker/docker",
-		"-docker.io/docker/docker",
-		"docker///docker",
-		"docker.io/docker/Docker",
-		"docker.io/docker///docker",
-		"1a3f5e7d9c1b3a5f7e9d1c3b5a7f9e1d3c5b7a9f1e3d5d7c9b1a3f5e7d9c1b3a",
-		"docker.io/1a3f5e7d9c1b3a5f7e9d1c3b5a7f9e1d3c5b7a9f1e3d5d7c9b1a3f5e7d9c1b3a",
-	}
-
-	for _, name := range invalidRepoNames {
-		_, err := ParseNamed(name)
-		if err == nil {
-			t.Fatalf("Expected invalid repo name for %q", name)
-		}
-	}
-
-	for _, name := range validRepoNames {
-		_, err := ParseNamed(name)
-		if err != nil {
-			t.Fatalf("Error parsing repo name %s, got: %q", name, err)
-		}
-	}
-}
-
-func TestValidateRemoteName(t *testing.T) {
-	validRepositoryNames := []string{
-		// Sanity check.
-		"docker/docker",
-
-		// Allow 64-character non-hexadecimal names (hexadecimal names are forbidden).
-		"thisisthesongthatneverendsitgoesonandonandonthisisthesongthatnev",
-
-		// Allow embedded hyphens.
-		"docker-rules/docker",
-
-		// Allow multiple hyphens as well.
-		"docker---rules/docker",
-
-		//Username doc and image name docker being tested.
-		"doc/docker",
-
-		// single character names are now allowed.
-		"d/docker",
-		"jess/t",
-
-		// Consecutive underscores.
-		"dock__er/docker",
-	}
-	for _, repositoryName := range validRepositoryNames {
-		_, err := ParseNamed(repositoryName)
-		if err != nil {
-			t.Errorf("Repository name should be valid: %v. Error: %v", repositoryName, err)
-		}
-	}
-
-	invalidRepositoryNames := []string{
-		// Disallow capital letters.
-		"docker/Docker",
-
-		// Only allow one slash.
-		"docker///docker",
-
-		// Disallow 64-character hexadecimal.
-		"1a3f5e7d9c1b3a5f7e9d1c3b5a7f9e1d3c5b7a9f1e3d5d7c9b1a3f5e7d9c1b3a",
-
-		// Disallow leading and trailing hyphens in namespace.
-		"-docker/docker",
-		"docker-/docker",
-		"-docker-/docker",
-
-		// Don't allow underscores everywhere (as opposed to hyphens).
-		"____/____",
-
-		"_docker/_docker",
-
-		// Disallow consecutive periods.
-		"dock..er/docker",
-		"dock_.er/docker",
-		"dock-.er/docker",
-
-		// No repository.
-		"docker/",
-
-		//namespace too long
-		"this_is_not_a_valid_namespace_because_its_lenth_is_greater_than_255_this_is_not_a_valid_namespace_because_its_lenth_is_greater_than_255_this_is_not_a_valid_namespace_because_its_lenth_is_greater_than_255_this_is_not_a_valid_namespace_because_its_lenth_is_greater_than_255/docker",
-	}
-	for _, repositoryName := range invalidRepositoryNames {
-		if _, err := ParseNamed(repositoryName); err == nil {
-			t.Errorf("Repository name should be invalid: %v", repositoryName)
-		}
-	}
-}
-
-func TestParseRepositoryInfo(t *testing.T) {
-	type tcase struct {
-		RemoteName, NormalizedName, FullName, AmbiguousName, Hostname string
-	}
-
-	tcases := []tcase{
-		{
-			RemoteName:     "fooo/bar",
-			NormalizedName: "fooo/bar",
-			FullName:       "docker.io/fooo/bar",
-			AmbiguousName:  "index.docker.io/fooo/bar",
-			Hostname:       "docker.io",
-		},
-		{
-			RemoteName:     "library/ubuntu",
-			NormalizedName: "ubuntu",
-			FullName:       "docker.io/library/ubuntu",
-			AmbiguousName:  "library/ubuntu",
-			Hostname:       "docker.io",
-		},
-		{
-			RemoteName:     "nonlibrary/ubuntu",
-			NormalizedName: "nonlibrary/ubuntu",
-			FullName:       "docker.io/nonlibrary/ubuntu",
-			AmbiguousName:  "",
-			Hostname:       "docker.io",
-		},
-		{
-			RemoteName:     "other/library",
-			NormalizedName: "other/library",
-			FullName:       "docker.io/other/library",
-			AmbiguousName:  "",
-			Hostname:       "docker.io",
-		},
-		{
-			RemoteName:     "private/moonbase",
-			NormalizedName: "127.0.0.1:8000/private/moonbase",
-			FullName:       "127.0.0.1:8000/private/moonbase",
-			AmbiguousName:  "",
-			Hostname:       "127.0.0.1:8000",
-		},
-		{
-			RemoteName:     "privatebase",
-			NormalizedName: "127.0.0.1:8000/privatebase",
-			FullName:       "127.0.0.1:8000/privatebase",
-			AmbiguousName:  "",
-			Hostname:       "127.0.0.1:8000",
-		},
-		{
-			RemoteName:     "private/moonbase",
-			NormalizedName: "example.com/private/moonbase",
-			FullName:       "example.com/private/moonbase",
-			AmbiguousName:  "",
-			Hostname:       "example.com",
-		},
-		{
-			RemoteName:     "privatebase",
-			NormalizedName: "example.com/privatebase",
-			FullName:       "example.com/privatebase",
-			AmbiguousName:  "",
-			Hostname:       "example.com",
-		},
-		{
-			RemoteName:     "private/moonbase",
-			NormalizedName: "example.com:8000/private/moonbase",
-			FullName:       "example.com:8000/private/moonbase",
-			AmbiguousName:  "",
-			Hostname:       "example.com:8000",
-		},
-		{
-			RemoteName:     "privatebasee",
-			NormalizedName: "example.com:8000/privatebasee",
-			FullName:       "example.com:8000/privatebasee",
-			AmbiguousName:  "",
-			Hostname:       "example.com:8000",
-		},
-		{
-			RemoteName:     "library/ubuntu-12.04-base",
-			NormalizedName: "ubuntu-12.04-base",
-			FullName:       "docker.io/library/ubuntu-12.04-base",
-			AmbiguousName:  "index.docker.io/library/ubuntu-12.04-base",
-			Hostname:       "docker.io",
-		},
-	}
-
-	for _, tcase := range tcases {
-		refStrings := []string{tcase.NormalizedName, tcase.FullName}
-		if tcase.AmbiguousName != "" {
-			refStrings = append(refStrings, tcase.AmbiguousName)
-		}
-
-		var refs []Named
-		for _, r := range refStrings {
-			named, err := ParseNamed(r)
-			if err != nil {
-				t.Fatal(err)
-			}
-			refs = append(refs, named)
-			named, err = WithName(r)
-			if err != nil {
-				t.Fatal(err)
-			}
-			refs = append(refs, named)
-		}
-
-		for _, r := range refs {
-			if expected, actual := tcase.NormalizedName, r.Name(); expected != actual {
-				t.Fatalf("Invalid normalized reference for %q. Expected %q, got %q", r, expected, actual)
-			}
-			if expected, actual := tcase.FullName, r.FullName(); expected != actual {
-				t.Fatalf("Invalid normalized reference for %q. Expected %q, got %q", r, expected, actual)
-			}
-			if expected, actual := tcase.Hostname, r.Hostname(); expected != actual {
-				t.Fatalf("Invalid hostname for %q. Expected %q, got %q", r, expected, actual)
-			}
-			if expected, actual := tcase.RemoteName, r.RemoteName(); expected != actual {
-				t.Fatalf("Invalid remoteName for %q. Expected %q, got %q", r, expected, actual)
-			}
-
-		}
-	}
-}
-
-func TestParseReferenceWithTagAndDigest(t *testing.T) {
-	ref, err := ParseNamed("busybox:latest@sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, isTagged := ref.(NamedTagged); isTagged {
-		t.Fatalf("Reference from %q should not support tag", ref)
-	}
-	if _, isCanonical := ref.(Canonical); !isCanonical {
-		t.Fatalf("Reference from %q should not support digest", ref)
-	}
-	if expected, actual := "busybox@sha256:86e0e091d0da6bde2456dbb48306f3956bbeb2eae1b5b9a43045843f69fe4aaa", ref.String(); actual != expected {
-		t.Fatalf("Invalid parsed reference for %q: expected %q, got %q", ref, expected, actual)
-	}
-}
-
-func TestInvalidReferenceComponents(t *testing.T) {
-	if _, err := WithName("-foo"); err == nil {
-		t.Fatal("Expected WithName to detect invalid name")
-	}
-	ref, err := WithName("busybox")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := WithTag(ref, "-foo"); err == nil {
-		t.Fatal("Expected WithName to detect invalid tag")
-	}
-	if _, err := WithDigest(ref, digest.Digest("foo")); err == nil {
-		t.Fatal("Expected WithName to detect invalid digest")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/reference/store.go b/installer/vendor/github.com/docker/docker/reference/store.go
deleted file mode 100644
index 71ca236c9c..0000000000
--- a/installer/vendor/github.com/docker/docker/reference/store.go
+++ /dev/null
@@ -1,286 +0,0 @@
-package reference
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"sort"
-	"sync"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/ioutils"
-)
-
-var (
-	// ErrDoesNotExist is returned if a reference is not found in the
-	// store.
-	ErrDoesNotExist = errors.New("reference does not exist")
-)
-
-// An Association is a tuple associating a reference with an image ID.
-type Association struct {
-	Ref Named
-	ID  digest.Digest
-}
-
-// Store provides the set of methods which can operate on a tag store.
-type Store interface {
-	References(id digest.Digest) []Named
-	ReferencesByName(ref Named) []Association
-	AddTag(ref Named, id digest.Digest, force bool) error
-	AddDigest(ref Canonical, id digest.Digest, force bool) error
-	Delete(ref Named) (bool, error)
-	Get(ref Named) (digest.Digest, error)
-}
-
-type store struct {
-	mu sync.RWMutex
-	// jsonPath is the path to the file where the serialized tag data is
-	// stored.
-	jsonPath string
-	// Repositories is a map of repositories, indexed by name.
-	Repositories map[string]repository
-	// referencesByIDCache is a cache of references indexed by ID, to speed
-	// up References.
-	referencesByIDCache map[digest.Digest]map[string]Named
-}
-
-// Repository maps tags to digests. The key is a stringified Reference,
-// including the repository name.
-type repository map[string]digest.Digest
-
-type lexicalRefs []Named
-
-func (a lexicalRefs) Len() int           { return len(a) }
-func (a lexicalRefs) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a lexicalRefs) Less(i, j int) bool { return a[i].String() < a[j].String() }
-
-type lexicalAssociations []Association
-
-func (a lexicalAssociations) Len() int           { return len(a) }
-func (a lexicalAssociations) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a lexicalAssociations) Less(i, j int) bool { return a[i].Ref.String() < a[j].Ref.String() }
-
-// NewReferenceStore creates a new reference store, tied to a file path where
-// the set of references are serialized in JSON format.
-func NewReferenceStore(jsonPath string) (Store, error) {
-	abspath, err := filepath.Abs(jsonPath)
-	if err != nil {
-		return nil, err
-	}
-
-	store := &store{
-		jsonPath:            abspath,
-		Repositories:        make(map[string]repository),
-		referencesByIDCache: make(map[digest.Digest]map[string]Named),
-	}
-	// Load the json file if it exists, otherwise create it.
-	if err := store.reload(); os.IsNotExist(err) {
-		if err := store.save(); err != nil {
-			return nil, err
-		}
-	} else if err != nil {
-		return nil, err
-	}
-	return store, nil
-}
-
-// AddTag adds a tag reference to the store. If force is set to true, existing
-// references can be overwritten. This only works for tags, not digests.
-func (store *store) AddTag(ref Named, id digest.Digest, force bool) error {
-	if _, isCanonical := ref.(Canonical); isCanonical {
-		return errors.New("refusing to create a tag with a digest reference")
-	}
-	return store.addReference(WithDefaultTag(ref), id, force)
-}
-
-// AddDigest adds a digest reference to the store.
-func (store *store) AddDigest(ref Canonical, id digest.Digest, force bool) error {
-	return store.addReference(ref, id, force)
-}
-
-func (store *store) addReference(ref Named, id digest.Digest, force bool) error {
-	if ref.Name() == string(digest.Canonical) {
-		return errors.New("refusing to create an ambiguous tag using digest algorithm as name")
-	}
-
-	store.mu.Lock()
-	defer store.mu.Unlock()
-
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists || repository == nil {
-		repository = make(map[string]digest.Digest)
-		store.Repositories[ref.Name()] = repository
-	}
-
-	refStr := ref.String()
-	oldID, exists := repository[refStr]
-
-	if exists {
-		// force only works for tags
-		if digested, isDigest := ref.(Canonical); isDigest {
-			return fmt.Errorf("Cannot overwrite digest %s", digested.Digest().String())
-		}
-
-		if !force {
-			return fmt.Errorf("Conflict: Tag %s is already set to image %s, if you want to replace it, please use -f option", ref.String(), oldID.String())
-		}
-
-		if store.referencesByIDCache[oldID] != nil {
-			delete(store.referencesByIDCache[oldID], refStr)
-			if len(store.referencesByIDCache[oldID]) == 0 {
-				delete(store.referencesByIDCache, oldID)
-			}
-		}
-	}
-
-	repository[refStr] = id
-	if store.referencesByIDCache[id] == nil {
-		store.referencesByIDCache[id] = make(map[string]Named)
-	}
-	store.referencesByIDCache[id][refStr] = ref
-
-	return store.save()
-}
-
-// Delete deletes a reference from the store. It returns true if a deletion
-// happened, or false otherwise.
-func (store *store) Delete(ref Named) (bool, error) {
-	ref = WithDefaultTag(ref)
-
-	store.mu.Lock()
-	defer store.mu.Unlock()
-
-	repoName := ref.Name()
-
-	repository, exists := store.Repositories[repoName]
-	if !exists {
-		return false, ErrDoesNotExist
-	}
-
-	refStr := ref.String()
-	if id, exists := repository[refStr]; exists {
-		delete(repository, refStr)
-		if len(repository) == 0 {
-			delete(store.Repositories, repoName)
-		}
-		if store.referencesByIDCache[id] != nil {
-			delete(store.referencesByIDCache[id], refStr)
-			if len(store.referencesByIDCache[id]) == 0 {
-				delete(store.referencesByIDCache, id)
-			}
-		}
-		return true, store.save()
-	}
-
-	return false, ErrDoesNotExist
-}
-
-// Get retrieves an item from the store by reference
-func (store *store) Get(ref Named) (digest.Digest, error) {
-	ref = WithDefaultTag(ref)
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists || repository == nil {
-		return "", ErrDoesNotExist
-	}
-
-	id, exists := repository[ref.String()]
-	if !exists {
-		return "", ErrDoesNotExist
-	}
-
-	return id, nil
-}
-
-// References returns a slice of references to the given ID. The slice
-// will be nil if there are no references to this ID.
-func (store *store) References(id digest.Digest) []Named {
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	// Convert the internal map to an array for two reasons:
-	// 1) We must not return a mutable
-	// 2) It would be ugly to expose the extraneous map keys to callers.
-
-	var references []Named
-	for _, ref := range store.referencesByIDCache[id] {
-		references = append(references, ref)
-	}
-
-	sort.Sort(lexicalRefs(references))
-
-	return references
-}
-
-// ReferencesByName returns the references for a given repository name.
-// If there are no references known for this repository name,
-// ReferencesByName returns nil.
-func (store *store) ReferencesByName(ref Named) []Association {
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists {
-		return nil
-	}
-
-	var associations []Association
-	for refStr, refID := range repository {
-		ref, err := ParseNamed(refStr)
-		if err != nil {
-			// Should never happen
-			return nil
-		}
-		associations = append(associations,
-			Association{
-				Ref: ref,
-				ID:  refID,
-			})
-	}
-
-	sort.Sort(lexicalAssociations(associations))
-
-	return associations
-}
-
-func (store *store) save() error {
-	// Store the json
-	jsonData, err := json.Marshal(store)
-	if err != nil {
-		return err
-	}
-	return ioutils.AtomicWriteFile(store.jsonPath, jsonData, 0600)
-}
-
-func (store *store) reload() error {
-	f, err := os.Open(store.jsonPath)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := json.NewDecoder(f).Decode(&store); err != nil {
-		return err
-	}
-
-	for _, repository := range store.Repositories {
-		for refStr, refID := range repository {
-			ref, err := ParseNamed(refStr)
-			if err != nil {
-				// Should never happen
-				continue
-			}
-			if store.referencesByIDCache[refID] == nil {
-				store.referencesByIDCache[refID] = make(map[string]Named)
-			}
-			store.referencesByIDCache[refID][refStr] = ref
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/reference/store_test.go b/installer/vendor/github.com/docker/docker/reference/store_test.go
deleted file mode 100644
index dd1d253d8e..0000000000
--- a/installer/vendor/github.com/docker/docker/reference/store_test.go
+++ /dev/null
@@ -1,356 +0,0 @@
-package reference
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-)
-
-var (
-	saveLoadTestCases = map[string]digest.Digest{
-		"registry:5000/foobar:HEAD":                                                        "sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6",
-		"registry:5000/foobar:alternate":                                                   "sha256:ae300ebc4a4f00693702cfb0a5e0b7bc527b353828dc86ad09fb95c8a681b793",
-		"registry:5000/foobar:latest":                                                      "sha256:6153498b9ac00968d71b66cca4eac37e990b5f9eb50c26877eb8799c8847451b",
-		"registry:5000/foobar:master":                                                      "sha256:6c9917af4c4e05001b346421959d7ea81b6dc9d25718466a37a6add865dfd7fc",
-		"jess/hollywood:latest":                                                            "sha256:ae7a5519a0a55a2d4ef20ddcbd5d0ca0888a1f7ab806acc8e2a27baf46f529fe",
-		"registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6": "sha256:24126a56805beb9711be5f4590cc2eb55ab8d4a85ebd618eed72bb19fc50631c",
-		"busybox:latest": "sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c",
-	}
-
-	marshalledSaveLoadTestCases = []byte(`{"Repositories":{"busybox":{"busybox:latest":"sha256:91e54dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c"},"jess/hollywood":{"jess/hollywood:latest":"sha256:ae7a5519a0a55a2d4ef20ddcbd5d0ca0888a1f7ab806acc8e2a27baf46f529fe"},"registry":{"registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6":"sha256:24126a56805beb9711be5f4590cc2eb55ab8d4a85ebd618eed72bb19fc50631c"},"registry:5000/foobar":{"registry:5000/foobar:HEAD":"sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6","registry:5000/foobar:alternate":"sha256:ae300ebc4a4f00693702cfb0a5e0b7bc527b353828dc86ad09fb95c8a681b793","registry:5000/foobar:latest":"sha256:6153498b9ac00968d71b66cca4eac37e990b5f9eb50c26877eb8799c8847451b","registry:5000/foobar:master":"sha256:6c9917af4c4e05001b346421959d7ea81b6dc9d25718466a37a6add865dfd7fc"}}}`)
-)
-
-func TestLoad(t *testing.T) {
-	jsonFile, err := ioutil.TempFile("", "tag-store-test")
-	if err != nil {
-		t.Fatalf("error creating temp file: %v", err)
-	}
-	defer os.RemoveAll(jsonFile.Name())
-
-	// Write canned json to the temp file
-	_, err = jsonFile.Write(marshalledSaveLoadTestCases)
-	if err != nil {
-		t.Fatalf("error writing to temp file: %v", err)
-	}
-	jsonFile.Close()
-
-	store, err := NewReferenceStore(jsonFile.Name())
-	if err != nil {
-		t.Fatalf("error creating tag store: %v", err)
-	}
-
-	for refStr, expectedID := range saveLoadTestCases {
-		ref, err := ParseNamed(refStr)
-		if err != nil {
-			t.Fatalf("failed to parse reference: %v", err)
-		}
-		id, err := store.Get(ref)
-		if err != nil {
-			t.Fatalf("could not find reference %s: %v", refStr, err)
-		}
-		if id != expectedID {
-			t.Fatalf("expected %s - got %s", expectedID, id)
-		}
-	}
-}
-
-func TestSave(t *testing.T) {
-	jsonFile, err := ioutil.TempFile("", "tag-store-test")
-	if err != nil {
-		t.Fatalf("error creating temp file: %v", err)
-	}
-	_, err = jsonFile.Write([]byte(`{}`))
-	jsonFile.Close()
-	defer os.RemoveAll(jsonFile.Name())
-
-	store, err := NewReferenceStore(jsonFile.Name())
-	if err != nil {
-		t.Fatalf("error creating tag store: %v", err)
-	}
-
-	for refStr, id := range saveLoadTestCases {
-		ref, err := ParseNamed(refStr)
-		if err != nil {
-			t.Fatalf("failed to parse reference: %v", err)
-		}
-		if canonical, ok := ref.(Canonical); ok {
-			err = store.AddDigest(canonical, id, false)
-			if err != nil {
-				t.Fatalf("could not add digest reference %s: %v", refStr, err)
-			}
-		} else {
-			err = store.AddTag(ref, id, false)
-			if err != nil {
-				t.Fatalf("could not add reference %s: %v", refStr, err)
-			}
-		}
-	}
-
-	jsonBytes, err := ioutil.ReadFile(jsonFile.Name())
-	if err != nil {
-		t.Fatalf("could not read json file: %v", err)
-	}
-
-	if !bytes.Equal(jsonBytes, marshalledSaveLoadTestCases) {
-		t.Fatalf("save output did not match expectations\nexpected:\n%s\ngot:\n%s", marshalledSaveLoadTestCases, jsonBytes)
-	}
-}
-
-func TestAddDeleteGet(t *testing.T) {
-	jsonFile, err := ioutil.TempFile("", "tag-store-test")
-	if err != nil {
-		t.Fatalf("error creating temp file: %v", err)
-	}
-	_, err = jsonFile.Write([]byte(`{}`))
-	jsonFile.Close()
-	defer os.RemoveAll(jsonFile.Name())
-
-	store, err := NewReferenceStore(jsonFile.Name())
-	if err != nil {
-		t.Fatalf("error creating tag store: %v", err)
-	}
-
-	testImageID1 := digest.Digest("sha256:9655aef5fd742a1b4e1b7b163aa9f1c76c186304bf39102283d80927c916ca9c")
-	testImageID2 := digest.Digest("sha256:9655aef5fd742a1b4e1b7b163aa9f1c76c186304bf39102283d80927c916ca9d")
-	testImageID3 := digest.Digest("sha256:9655aef5fd742a1b4e1b7b163aa9f1c76c186304bf39102283d80927c916ca9e")
-
-	// Try adding a reference with no tag or digest
-	nameOnly, err := WithName("username/repo")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddTag(nameOnly, testImageID1, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	// Add a few references
-	ref1, err := ParseNamed("username/repo1:latest")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddTag(ref1, testImageID1, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	ref2, err := ParseNamed("username/repo1:old")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddTag(ref2, testImageID2, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	ref3, err := ParseNamed("username/repo1:alias")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddTag(ref3, testImageID1, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	ref4, err := ParseNamed("username/repo2:latest")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddTag(ref4, testImageID2, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	ref5, err := ParseNamed("username/repo3@sha256:58153dfb11794fad694460162bf0cb0a4fa710cfa3f60979c177d920813e267c")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if err = store.AddDigest(ref5.(Canonical), testImageID2, false); err != nil {
-		t.Fatalf("error adding to store: %v", err)
-	}
-
-	// Attempt to overwrite with force == false
-	if err = store.AddTag(ref4, testImageID3, false); err == nil || !strings.HasPrefix(err.Error(), "Conflict:") {
-		t.Fatalf("did not get expected error on overwrite attempt - got %v", err)
-	}
-	// Repeat to overwrite with force == true
-	if err = store.AddTag(ref4, testImageID3, true); err != nil {
-		t.Fatalf("failed to force tag overwrite: %v", err)
-	}
-
-	// Check references so far
-	id, err := store.Get(nameOnly)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID1 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID1.String())
-	}
-
-	id, err = store.Get(ref1)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID1 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID1.String())
-	}
-
-	id, err = store.Get(ref2)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID2 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID2.String())
-	}
-
-	id, err = store.Get(ref3)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID1 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID1.String())
-	}
-
-	id, err = store.Get(ref4)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID3 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID3.String())
-	}
-
-	id, err = store.Get(ref5)
-	if err != nil {
-		t.Fatalf("Get returned error: %v", err)
-	}
-	if id != testImageID2 {
-		t.Fatalf("id mismatch: got %s instead of %s", id.String(), testImageID3.String())
-	}
-
-	// Get should return ErrDoesNotExist for a nonexistent repo
-	nonExistRepo, err := ParseNamed("username/nonexistrepo:latest")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if _, err = store.Get(nonExistRepo); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Get")
-	}
-
-	// Get should return ErrDoesNotExist for a nonexistent tag
-	nonExistTag, err := ParseNamed("username/repo1:nonexist")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	if _, err = store.Get(nonExistTag); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Get")
-	}
-
-	// Check References
-	refs := store.References(testImageID1)
-	if len(refs) != 3 {
-		t.Fatal("unexpected number of references")
-	}
-	// Looking for the references in this order verifies that they are
-	// returned lexically sorted.
-	if refs[0].String() != ref3.String() {
-		t.Fatalf("unexpected reference: %v", refs[0].String())
-	}
-	if refs[1].String() != ref1.String() {
-		t.Fatalf("unexpected reference: %v", refs[1].String())
-	}
-	if refs[2].String() != nameOnly.String()+":latest" {
-		t.Fatalf("unexpected reference: %v", refs[2].String())
-	}
-
-	// Check ReferencesByName
-	repoName, err := WithName("username/repo1")
-	if err != nil {
-		t.Fatalf("could not parse reference: %v", err)
-	}
-	associations := store.ReferencesByName(repoName)
-	if len(associations) != 3 {
-		t.Fatal("unexpected number of associations")
-	}
-	// Looking for the associations in this order verifies that they are
-	// returned lexically sorted.
-	if associations[0].Ref.String() != ref3.String() {
-		t.Fatalf("unexpected reference: %v", associations[0].Ref.String())
-	}
-	if associations[0].ID != testImageID1 {
-		t.Fatalf("unexpected reference: %v", associations[0].Ref.String())
-	}
-	if associations[1].Ref.String() != ref1.String() {
-		t.Fatalf("unexpected reference: %v", associations[1].Ref.String())
-	}
-	if associations[1].ID != testImageID1 {
-		t.Fatalf("unexpected reference: %v", associations[1].Ref.String())
-	}
-	if associations[2].Ref.String() != ref2.String() {
-		t.Fatalf("unexpected reference: %v", associations[2].Ref.String())
-	}
-	if associations[2].ID != testImageID2 {
-		t.Fatalf("unexpected reference: %v", associations[2].Ref.String())
-	}
-
-	// Delete should return ErrDoesNotExist for a nonexistent repo
-	if _, err = store.Delete(nonExistRepo); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Delete")
-	}
-
-	// Delete should return ErrDoesNotExist for a nonexistent tag
-	if _, err = store.Delete(nonExistTag); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Delete")
-	}
-
-	// Delete a few references
-	if deleted, err := store.Delete(ref1); err != nil || deleted != true {
-		t.Fatal("Delete failed")
-	}
-	if _, err := store.Get(ref1); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Get")
-	}
-	if deleted, err := store.Delete(ref5); err != nil || deleted != true {
-		t.Fatal("Delete failed")
-	}
-	if _, err := store.Get(ref5); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Get")
-	}
-	if deleted, err := store.Delete(nameOnly); err != nil || deleted != true {
-		t.Fatal("Delete failed")
-	}
-	if _, err := store.Get(nameOnly); err != ErrDoesNotExist {
-		t.Fatal("Expected ErrDoesNotExist from Get")
-	}
-}
-
-func TestInvalidTags(t *testing.T) {
-	tmpDir, err := ioutil.TempDir("", "tag-store-test")
-	defer os.RemoveAll(tmpDir)
-
-	store, err := NewReferenceStore(filepath.Join(tmpDir, "repositories.json"))
-	if err != nil {
-		t.Fatalf("error creating tag store: %v", err)
-	}
-	id := digest.Digest("sha256:470022b8af682154f57a2163d030eb369549549cba00edc69e1b99b46bb924d6")
-
-	// sha256 as repo name
-	ref, err := ParseNamed("sha256:abc")
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = store.AddTag(ref, id, true)
-	if err == nil {
-		t.Fatalf("expected setting tag %q to fail", ref)
-	}
-
-	// setting digest as a tag
-	ref, err = ParseNamed("registry@sha256:367eb40fd0330a7e464777121e39d2f5b3e8e23a1e159342e53ab05c9e4d94e6")
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = store.AddTag(ref, id, true)
-	if err == nil {
-		t.Fatalf("expected setting digest %q to fail", ref)
-	}
-
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/auth.go b/installer/vendor/github.com/docker/docker/registry/auth.go
deleted file mode 100644
index 8cadd51ba0..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/auth.go
+++ /dev/null
@@ -1,303 +0,0 @@
-package registry
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/distribution/registry/client/auth/challenge"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-)
-
-const (
-	// AuthClientID is used the ClientID used for the token server
-	AuthClientID = "docker"
-)
-
-// loginV1 tries to register/login to the v1 registry server.
-func loginV1(authConfig *types.AuthConfig, apiEndpoint APIEndpoint, userAgent string) (string, string, error) {
-	registryEndpoint, err := apiEndpoint.ToV1Endpoint(userAgent, nil)
-	if err != nil {
-		return "", "", err
-	}
-
-	serverAddress := registryEndpoint.String()
-
-	logrus.Debugf("attempting v1 login to registry endpoint %s", serverAddress)
-
-	if serverAddress == "" {
-		return "", "", fmt.Errorf("Server Error: Server Address not set.")
-	}
-
-	loginAgainstOfficialIndex := serverAddress == IndexServer
-
-	req, err := http.NewRequest("GET", serverAddress+"users/", nil)
-	if err != nil {
-		return "", "", err
-	}
-	req.SetBasicAuth(authConfig.Username, authConfig.Password)
-	resp, err := registryEndpoint.client.Do(req)
-	if err != nil {
-		// fallback when request could not be completed
-		return "", "", fallbackError{
-			err: err,
-		}
-	}
-	defer resp.Body.Close()
-	body, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", "", err
-	}
-	if resp.StatusCode == http.StatusOK {
-		return "Login Succeeded", "", nil
-	} else if resp.StatusCode == http.StatusUnauthorized {
-		if loginAgainstOfficialIndex {
-			return "", "", fmt.Errorf("Wrong login/password, please try again. Haven't got a Docker ID? Create one at https://hub.docker.com")
-		}
-		return "", "", fmt.Errorf("Wrong login/password, please try again")
-	} else if resp.StatusCode == http.StatusForbidden {
-		if loginAgainstOfficialIndex {
-			return "", "", fmt.Errorf("Login: Account is not active. Please check your e-mail for a confirmation link.")
-		}
-		// *TODO: Use registry configuration to determine what this says, if anything?
-		return "", "", fmt.Errorf("Login: Account is not active. Please see the documentation of the registry %s for instructions how to activate it.", serverAddress)
-	} else if resp.StatusCode == http.StatusInternalServerError { // Issue #14326
-		logrus.Errorf("%s returned status code %d. Response Body :\n%s", req.URL.String(), resp.StatusCode, body)
-		return "", "", fmt.Errorf("Internal Server Error")
-	}
-	return "", "", fmt.Errorf("Login: %s (Code: %d; Headers: %s)", body,
-		resp.StatusCode, resp.Header)
-}
-
-type loginCredentialStore struct {
-	authConfig *types.AuthConfig
-}
-
-func (lcs loginCredentialStore) Basic(*url.URL) (string, string) {
-	return lcs.authConfig.Username, lcs.authConfig.Password
-}
-
-func (lcs loginCredentialStore) RefreshToken(*url.URL, string) string {
-	return lcs.authConfig.IdentityToken
-}
-
-func (lcs loginCredentialStore) SetRefreshToken(u *url.URL, service, token string) {
-	lcs.authConfig.IdentityToken = token
-}
-
-type staticCredentialStore struct {
-	auth *types.AuthConfig
-}
-
-// NewStaticCredentialStore returns a credential store
-// which always returns the same credential values.
-func NewStaticCredentialStore(auth *types.AuthConfig) auth.CredentialStore {
-	return staticCredentialStore{
-		auth: auth,
-	}
-}
-
-func (scs staticCredentialStore) Basic(*url.URL) (string, string) {
-	if scs.auth == nil {
-		return "", ""
-	}
-	return scs.auth.Username, scs.auth.Password
-}
-
-func (scs staticCredentialStore) RefreshToken(*url.URL, string) string {
-	if scs.auth == nil {
-		return ""
-	}
-	return scs.auth.IdentityToken
-}
-
-func (scs staticCredentialStore) SetRefreshToken(*url.URL, string, string) {
-}
-
-type fallbackError struct {
-	err error
-}
-
-func (err fallbackError) Error() string {
-	return err.err.Error()
-}
-
-// loginV2 tries to login to the v2 registry server. The given registry
-// endpoint will be pinged to get authorization challenges. These challenges
-// will be used to authenticate against the registry to validate credentials.
-func loginV2(authConfig *types.AuthConfig, endpoint APIEndpoint, userAgent string) (string, string, error) {
-	logrus.Debugf("attempting v2 login to registry endpoint %s", strings.TrimRight(endpoint.URL.String(), "/")+"/v2/")
-
-	modifiers := DockerHeaders(userAgent, nil)
-	authTransport := transport.NewTransport(NewTransport(endpoint.TLSConfig), modifiers...)
-
-	credentialAuthConfig := *authConfig
-	creds := loginCredentialStore{
-		authConfig: &credentialAuthConfig,
-	}
-
-	loginClient, foundV2, err := v2AuthHTTPClient(endpoint.URL, authTransport, modifiers, creds, nil)
-	if err != nil {
-		return "", "", err
-	}
-
-	endpointStr := strings.TrimRight(endpoint.URL.String(), "/") + "/v2/"
-	req, err := http.NewRequest("GET", endpointStr, nil)
-	if err != nil {
-		if !foundV2 {
-			err = fallbackError{err: err}
-		}
-		return "", "", err
-	}
-
-	resp, err := loginClient.Do(req)
-	if err != nil {
-		if !foundV2 {
-			err = fallbackError{err: err}
-		}
-		return "", "", err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		// TODO(dmcgowan): Attempt to further interpret result, status code and error code string
-		err := fmt.Errorf("login attempt to %s failed with status: %d %s", endpointStr, resp.StatusCode, http.StatusText(resp.StatusCode))
-		if !foundV2 {
-			err = fallbackError{err: err}
-		}
-		return "", "", err
-	}
-
-	return "Login Succeeded", credentialAuthConfig.IdentityToken, nil
-
-}
-
-func v2AuthHTTPClient(endpoint *url.URL, authTransport http.RoundTripper, modifiers []transport.RequestModifier, creds auth.CredentialStore, scopes []auth.Scope) (*http.Client, bool, error) {
-	challengeManager, foundV2, err := PingV2Registry(endpoint, authTransport)
-	if err != nil {
-		if !foundV2 {
-			err = fallbackError{err: err}
-		}
-		return nil, foundV2, err
-	}
-
-	tokenHandlerOptions := auth.TokenHandlerOptions{
-		Transport:     authTransport,
-		Credentials:   creds,
-		OfflineAccess: true,
-		ClientID:      AuthClientID,
-		Scopes:        scopes,
-	}
-	tokenHandler := auth.NewTokenHandlerWithOptions(tokenHandlerOptions)
-	basicHandler := auth.NewBasicHandler(creds)
-	modifiers = append(modifiers, auth.NewAuthorizer(challengeManager, tokenHandler, basicHandler))
-	tr := transport.NewTransport(authTransport, modifiers...)
-
-	return &http.Client{
-		Transport: tr,
-		Timeout:   15 * time.Second,
-	}, foundV2, nil
-
-}
-
-// ConvertToHostname converts a registry url which has http|https prepended
-// to just an hostname.
-func ConvertToHostname(url string) string {
-	stripped := url
-	if strings.HasPrefix(url, "http://") {
-		stripped = strings.TrimPrefix(url, "http://")
-	} else if strings.HasPrefix(url, "https://") {
-		stripped = strings.TrimPrefix(url, "https://")
-	}
-
-	nameParts := strings.SplitN(stripped, "/", 2)
-
-	return nameParts[0]
-}
-
-// ResolveAuthConfig matches an auth configuration to a server address or a URL
-func ResolveAuthConfig(authConfigs map[string]types.AuthConfig, index *registrytypes.IndexInfo) types.AuthConfig {
-	configKey := GetAuthConfigKey(index)
-	// First try the happy case
-	if c, found := authConfigs[configKey]; found || index.Official {
-		return c
-	}
-
-	// Maybe they have a legacy config file, we will iterate the keys converting
-	// them to the new format and testing
-	for registry, ac := range authConfigs {
-		if configKey == ConvertToHostname(registry) {
-			return ac
-		}
-	}
-
-	// When all else fails, return an empty auth config
-	return types.AuthConfig{}
-}
-
-// PingResponseError is used when the response from a ping
-// was received but invalid.
-type PingResponseError struct {
-	Err error
-}
-
-func (err PingResponseError) Error() string {
-	return err.Err.Error()
-}
-
-// PingV2Registry attempts to ping a v2 registry and on success return a
-// challenge manager for the supported authentication types and
-// whether v2 was confirmed by the response. If a response is received but
-// cannot be interpreted a PingResponseError will be returned.
-func PingV2Registry(endpoint *url.URL, transport http.RoundTripper) (challenge.Manager, bool, error) {
-	var (
-		foundV2   = false
-		v2Version = auth.APIVersion{
-			Type:    "registry",
-			Version: "2.0",
-		}
-	)
-
-	pingClient := &http.Client{
-		Transport: transport,
-		Timeout:   15 * time.Second,
-	}
-	endpointStr := strings.TrimRight(endpoint.String(), "/") + "/v2/"
-	req, err := http.NewRequest("GET", endpointStr, nil)
-	if err != nil {
-		return nil, false, err
-	}
-	resp, err := pingClient.Do(req)
-	if err != nil {
-		return nil, false, err
-	}
-	defer resp.Body.Close()
-
-	versions := auth.APIVersions(resp, DefaultRegistryVersionHeader)
-	for _, pingVersion := range versions {
-		if pingVersion == v2Version {
-			// The version header indicates we're definitely
-			// talking to a v2 registry. So don't allow future
-			// fallbacks to the v1 protocol.
-
-			foundV2 = true
-			break
-		}
-	}
-
-	challengeManager := challenge.NewSimpleManager()
-	if err := challengeManager.AddResponse(resp); err != nil {
-		return nil, foundV2, PingResponseError{
-			Err: err,
-		}
-	}
-
-	return challengeManager, foundV2, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/auth_test.go b/installer/vendor/github.com/docker/docker/registry/auth_test.go
deleted file mode 100644
index 9ab71aa4fb..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/auth_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// +build !solaris
-
-// TODO: Support Solaris
-
-package registry
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-)
-
-func buildAuthConfigs() map[string]types.AuthConfig {
-	authConfigs := map[string]types.AuthConfig{}
-
-	for _, registry := range []string{"testIndex", IndexServer} {
-		authConfigs[registry] = types.AuthConfig{
-			Username: "docker-user",
-			Password: "docker-pass",
-		}
-	}
-
-	return authConfigs
-}
-
-func TestSameAuthDataPostSave(t *testing.T) {
-	authConfigs := buildAuthConfigs()
-	authConfig := authConfigs["testIndex"]
-	if authConfig.Username != "docker-user" {
-		t.Fail()
-	}
-	if authConfig.Password != "docker-pass" {
-		t.Fail()
-	}
-	if authConfig.Auth != "" {
-		t.Fail()
-	}
-}
-
-func TestResolveAuthConfigIndexServer(t *testing.T) {
-	authConfigs := buildAuthConfigs()
-	indexConfig := authConfigs[IndexServer]
-
-	officialIndex := &registrytypes.IndexInfo{
-		Official: true,
-	}
-	privateIndex := &registrytypes.IndexInfo{
-		Official: false,
-	}
-
-	resolved := ResolveAuthConfig(authConfigs, officialIndex)
-	assertEqual(t, resolved, indexConfig, "Expected ResolveAuthConfig to return IndexServer")
-
-	resolved = ResolveAuthConfig(authConfigs, privateIndex)
-	assertNotEqual(t, resolved, indexConfig, "Expected ResolveAuthConfig to not return IndexServer")
-}
-
-func TestResolveAuthConfigFullURL(t *testing.T) {
-	authConfigs := buildAuthConfigs()
-
-	registryAuth := types.AuthConfig{
-		Username: "foo-user",
-		Password: "foo-pass",
-	}
-	localAuth := types.AuthConfig{
-		Username: "bar-user",
-		Password: "bar-pass",
-	}
-	officialAuth := types.AuthConfig{
-		Username: "baz-user",
-		Password: "baz-pass",
-	}
-	authConfigs[IndexServer] = officialAuth
-
-	expectedAuths := map[string]types.AuthConfig{
-		"registry.example.com": registryAuth,
-		"localhost:8000":       localAuth,
-		"registry.com":         localAuth,
-	}
-
-	validRegistries := map[string][]string{
-		"registry.example.com": {
-			"https://registry.example.com/v1/",
-			"http://registry.example.com/v1/",
-			"registry.example.com",
-			"registry.example.com/v1/",
-		},
-		"localhost:8000": {
-			"https://localhost:8000/v1/",
-			"http://localhost:8000/v1/",
-			"localhost:8000",
-			"localhost:8000/v1/",
-		},
-		"registry.com": {
-			"https://registry.com/v1/",
-			"http://registry.com/v1/",
-			"registry.com",
-			"registry.com/v1/",
-		},
-	}
-
-	for configKey, registries := range validRegistries {
-		configured, ok := expectedAuths[configKey]
-		if !ok {
-			t.Fail()
-		}
-		index := &registrytypes.IndexInfo{
-			Name: configKey,
-		}
-		for _, registry := range registries {
-			authConfigs[registry] = configured
-			resolved := ResolveAuthConfig(authConfigs, index)
-			if resolved.Username != configured.Username || resolved.Password != configured.Password {
-				t.Errorf("%s -> %v != %v\n", registry, resolved, configured)
-			}
-			delete(authConfigs, registry)
-			resolved = ResolveAuthConfig(authConfigs, index)
-			if resolved.Username == configured.Username || resolved.Password == configured.Password {
-				t.Errorf("%s -> %v == %v\n", registry, resolved, configured)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/config.go b/installer/vendor/github.com/docker/docker/registry/config.go
deleted file mode 100644
index 9a4f6a9251..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/config.go
+++ /dev/null
@@ -1,305 +0,0 @@
-package registry
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"net/url"
-	"strings"
-
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/reference"
-	"github.com/spf13/pflag"
-)
-
-// ServiceOptions holds command line options.
-type ServiceOptions struct {
-	Mirrors            []string `json:"registry-mirrors,omitempty"`
-	InsecureRegistries []string `json:"insecure-registries,omitempty"`
-
-	// V2Only controls access to legacy registries.  If it is set to true via the
-	// command line flag the daemon will not attempt to contact v1 legacy registries
-	V2Only bool `json:"disable-legacy-registry,omitempty"`
-}
-
-// serviceConfig holds daemon configuration for the registry service.
-type serviceConfig struct {
-	registrytypes.ServiceConfig
-	V2Only bool
-}
-
-var (
-	// DefaultNamespace is the default namespace
-	DefaultNamespace = "docker.io"
-	// DefaultRegistryVersionHeader is the name of the default HTTP header
-	// that carries Registry version info
-	DefaultRegistryVersionHeader = "Docker-Distribution-Api-Version"
-
-	// IndexHostname is the index hostname
-	IndexHostname = "index.docker.io"
-	// IndexServer is used for user auth and image search
-	IndexServer = "https://" + IndexHostname + "/v1/"
-	// IndexName is the name of the index
-	IndexName = "docker.io"
-
-	// NotaryServer is the endpoint serving the Notary trust server
-	NotaryServer = "https://notary.docker.io"
-
-	// DefaultV2Registry is the URI of the default v2 registry
-	DefaultV2Registry = &url.URL{
-		Scheme: "https",
-		Host:   "registry-1.docker.io",
-	}
-)
-
-var (
-	// ErrInvalidRepositoryName is an error returned if the repository name did
-	// not have the correct form
-	ErrInvalidRepositoryName = errors.New("Invalid repository name (ex: \"registry.domain.tld/myrepos\")")
-
-	emptyServiceConfig = newServiceConfig(ServiceOptions{})
-)
-
-// for mocking in unit tests
-var lookupIP = net.LookupIP
-
-// InstallCliFlags adds command-line options to the top-level flag parser for
-// the current process.
-func (options *ServiceOptions) InstallCliFlags(flags *pflag.FlagSet) {
-	mirrors := opts.NewNamedListOptsRef("registry-mirrors", &options.Mirrors, ValidateMirror)
-	insecureRegistries := opts.NewNamedListOptsRef("insecure-registries", &options.InsecureRegistries, ValidateIndexName)
-
-	flags.Var(mirrors, "registry-mirror", "Preferred Docker registry mirror")
-	flags.Var(insecureRegistries, "insecure-registry", "Enable insecure registry communication")
-
-	options.installCliPlatformFlags(flags)
-}
-
-// newServiceConfig returns a new instance of ServiceConfig
-func newServiceConfig(options ServiceOptions) *serviceConfig {
-	config := &serviceConfig{
-		ServiceConfig: registrytypes.ServiceConfig{
-			InsecureRegistryCIDRs: make([]*registrytypes.NetIPNet, 0),
-			IndexConfigs:          make(map[string]*registrytypes.IndexInfo, 0),
-			// Hack: Bypass setting the mirrors to IndexConfigs since they are going away
-			// and Mirrors are only for the official registry anyways.
-			Mirrors: options.Mirrors,
-		},
-		V2Only: options.V2Only,
-	}
-
-	config.LoadInsecureRegistries(options.InsecureRegistries)
-
-	return config
-}
-
-// LoadInsecureRegistries loads insecure registries to config
-func (config *serviceConfig) LoadInsecureRegistries(registries []string) error {
-	// Localhost is by default considered as an insecure registry
-	// This is a stop-gap for people who are running a private registry on localhost (especially on Boot2docker).
-	//
-	// TODO: should we deprecate this once it is easier for people to set up a TLS registry or change
-	// daemon flags on boot2docker?
-	registries = append(registries, "127.0.0.0/8")
-
-	// Store original InsecureRegistryCIDRs and IndexConfigs
-	// Clean InsecureRegistryCIDRs and IndexConfigs in config, as passed registries has all insecure registry info.
-	originalCIDRs := config.ServiceConfig.InsecureRegistryCIDRs
-	originalIndexInfos := config.ServiceConfig.IndexConfigs
-
-	config.ServiceConfig.InsecureRegistryCIDRs = make([]*registrytypes.NetIPNet, 0)
-	config.ServiceConfig.IndexConfigs = make(map[string]*registrytypes.IndexInfo, 0)
-
-skip:
-	for _, r := range registries {
-		// validate insecure registry
-		if _, err := ValidateIndexName(r); err != nil {
-			// before returning err, roll back to original data
-			config.ServiceConfig.InsecureRegistryCIDRs = originalCIDRs
-			config.ServiceConfig.IndexConfigs = originalIndexInfos
-			return err
-		}
-		// Check if CIDR was passed to --insecure-registry
-		_, ipnet, err := net.ParseCIDR(r)
-		if err == nil {
-			// Valid CIDR. If ipnet is already in config.InsecureRegistryCIDRs, skip.
-			data := (*registrytypes.NetIPNet)(ipnet)
-			for _, value := range config.InsecureRegistryCIDRs {
-				if value.IP.String() == data.IP.String() && value.Mask.String() == data.Mask.String() {
-					continue skip
-				}
-			}
-			// ipnet is not found, add it in config.InsecureRegistryCIDRs
-			config.InsecureRegistryCIDRs = append(config.InsecureRegistryCIDRs, data)
-
-		} else {
-			// Assume `host:port` if not CIDR.
-			config.IndexConfigs[r] = &registrytypes.IndexInfo{
-				Name:     r,
-				Mirrors:  make([]string, 0),
-				Secure:   false,
-				Official: false,
-			}
-		}
-	}
-
-	// Configure public registry.
-	config.IndexConfigs[IndexName] = &registrytypes.IndexInfo{
-		Name:     IndexName,
-		Mirrors:  config.Mirrors,
-		Secure:   true,
-		Official: true,
-	}
-
-	return nil
-}
-
-// isSecureIndex returns false if the provided indexName is part of the list of insecure registries
-// Insecure registries accept HTTP and/or accept HTTPS with certificates from unknown CAs.
-//
-// The list of insecure registries can contain an element with CIDR notation to specify a whole subnet.
-// If the subnet contains one of the IPs of the registry specified by indexName, the latter is considered
-// insecure.
-//
-// indexName should be a URL.Host (`host:port` or `host`) where the `host` part can be either a domain name
-// or an IP address. If it is a domain name, then it will be resolved in order to check if the IP is contained
-// in a subnet. If the resolving is not successful, isSecureIndex will only try to match hostname to any element
-// of insecureRegistries.
-func isSecureIndex(config *serviceConfig, indexName string) bool {
-	// Check for configured index, first.  This is needed in case isSecureIndex
-	// is called from anything besides newIndexInfo, in order to honor per-index configurations.
-	if index, ok := config.IndexConfigs[indexName]; ok {
-		return index.Secure
-	}
-
-	host, _, err := net.SplitHostPort(indexName)
-	if err != nil {
-		// assume indexName is of the form `host` without the port and go on.
-		host = indexName
-	}
-
-	addrs, err := lookupIP(host)
-	if err != nil {
-		ip := net.ParseIP(host)
-		if ip != nil {
-			addrs = []net.IP{ip}
-		}
-
-		// if ip == nil, then `host` is neither an IP nor it could be looked up,
-		// either because the index is unreachable, or because the index is behind an HTTP proxy.
-		// So, len(addrs) == 0 and we're not aborting.
-	}
-
-	// Try CIDR notation only if addrs has any elements, i.e. if `host`'s IP could be determined.
-	for _, addr := range addrs {
-		for _, ipnet := range config.InsecureRegistryCIDRs {
-			// check if the addr falls in the subnet
-			if (*net.IPNet)(ipnet).Contains(addr) {
-				return false
-			}
-		}
-	}
-
-	return true
-}
-
-// ValidateMirror validates an HTTP(S) registry mirror
-func ValidateMirror(val string) (string, error) {
-	uri, err := url.Parse(val)
-	if err != nil {
-		return "", fmt.Errorf("%s is not a valid URI", val)
-	}
-
-	if uri.Scheme != "http" && uri.Scheme != "https" {
-		return "", fmt.Errorf("Unsupported scheme %s", uri.Scheme)
-	}
-
-	if uri.Path != "" || uri.RawQuery != "" || uri.Fragment != "" {
-		return "", fmt.Errorf("Unsupported path/query/fragment at end of the URI")
-	}
-
-	return fmt.Sprintf("%s://%s/", uri.Scheme, uri.Host), nil
-}
-
-// ValidateIndexName validates an index name.
-func ValidateIndexName(val string) (string, error) {
-	if val == reference.LegacyDefaultHostname {
-		val = reference.DefaultHostname
-	}
-	if strings.HasPrefix(val, "-") || strings.HasSuffix(val, "-") {
-		return "", fmt.Errorf("Invalid index name (%s). Cannot begin or end with a hyphen.", val)
-	}
-	return val, nil
-}
-
-func validateNoScheme(reposName string) error {
-	if strings.Contains(reposName, "://") {
-		// It cannot contain a scheme!
-		return ErrInvalidRepositoryName
-	}
-	return nil
-}
-
-// newIndexInfo returns IndexInfo configuration from indexName
-func newIndexInfo(config *serviceConfig, indexName string) (*registrytypes.IndexInfo, error) {
-	var err error
-	indexName, err = ValidateIndexName(indexName)
-	if err != nil {
-		return nil, err
-	}
-
-	// Return any configured index info, first.
-	if index, ok := config.IndexConfigs[indexName]; ok {
-		return index, nil
-	}
-
-	// Construct a non-configured index info.
-	index := &registrytypes.IndexInfo{
-		Name:     indexName,
-		Mirrors:  make([]string, 0),
-		Official: false,
-	}
-	index.Secure = isSecureIndex(config, indexName)
-	return index, nil
-}
-
-// GetAuthConfigKey special-cases using the full index address of the official
-// index as the AuthConfig key, and uses the (host)name[:port] for private indexes.
-func GetAuthConfigKey(index *registrytypes.IndexInfo) string {
-	if index.Official {
-		return IndexServer
-	}
-	return index.Name
-}
-
-// newRepositoryInfo validates and breaks down a repository name into a RepositoryInfo
-func newRepositoryInfo(config *serviceConfig, name reference.Named) (*RepositoryInfo, error) {
-	index, err := newIndexInfo(config, name.Hostname())
-	if err != nil {
-		return nil, err
-	}
-	official := !strings.ContainsRune(name.Name(), '/')
-	return &RepositoryInfo{
-		Named:    name,
-		Index:    index,
-		Official: official,
-	}, nil
-}
-
-// ParseRepositoryInfo performs the breakdown of a repository name into a RepositoryInfo, but
-// lacks registry configuration.
-func ParseRepositoryInfo(reposName reference.Named) (*RepositoryInfo, error) {
-	return newRepositoryInfo(emptyServiceConfig, reposName)
-}
-
-// ParseSearchIndexInfo will use repository name to get back an indexInfo.
-func ParseSearchIndexInfo(reposName string) (*registrytypes.IndexInfo, error) {
-	indexName, _ := splitReposSearchTerm(reposName)
-
-	indexInfo, err := newIndexInfo(emptyServiceConfig, indexName)
-	if err != nil {
-		return nil, err
-	}
-	return indexInfo, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/config_test.go b/installer/vendor/github.com/docker/docker/registry/config_test.go
deleted file mode 100644
index 25578a7f2b..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/config_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package registry
-
-import (
-	"testing"
-)
-
-func TestValidateMirror(t *testing.T) {
-	valid := []string{
-		"http://mirror-1.com",
-		"https://mirror-1.com",
-		"http://localhost",
-		"https://localhost",
-		"http://localhost:5000",
-		"https://localhost:5000",
-		"http://127.0.0.1",
-		"https://127.0.0.1",
-		"http://127.0.0.1:5000",
-		"https://127.0.0.1:5000",
-	}
-
-	invalid := []string{
-		"!invalid!://%as%",
-		"ftp://mirror-1.com",
-		"http://mirror-1.com/",
-		"http://mirror-1.com/?q=foo",
-		"http://mirror-1.com/v1/",
-		"http://mirror-1.com/v1/?q=foo",
-		"http://mirror-1.com/v1/?q=foo#frag",
-		"http://mirror-1.com?q=foo",
-		"https://mirror-1.com#frag",
-		"https://mirror-1.com/",
-		"https://mirror-1.com/#frag",
-		"https://mirror-1.com/v1/",
-		"https://mirror-1.com/v1/#",
-		"https://mirror-1.com?q",
-	}
-
-	for _, address := range valid {
-		if ret, err := ValidateMirror(address); err != nil || ret == "" {
-			t.Errorf("ValidateMirror(`"+address+"`) got %s %s", ret, err)
-		}
-	}
-
-	for _, address := range invalid {
-		if ret, err := ValidateMirror(address); err == nil || ret != "" {
-			t.Errorf("ValidateMirror(`"+address+"`) got %s %s", ret, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/config_unix.go b/installer/vendor/github.com/docker/docker/registry/config_unix.go
deleted file mode 100644
index d692e8ef50..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/config_unix.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// +build !windows
-
-package registry
-
-import (
-	"github.com/spf13/pflag"
-)
-
-var (
-	// CertsDir is the directory where certificates are stored
-	CertsDir = "/etc/docker/certs.d"
-)
-
-// cleanPath is used to ensure that a directory name is valid on the target
-// platform. It will be passed in something *similar* to a URL such as
-// https:/index.docker.io/v1. Not all platforms support directory names
-// which contain those characters (such as : on Windows)
-func cleanPath(s string) string {
-	return s
-}
-
-// installCliPlatformFlags handles any platform specific flags for the service.
-func (options *ServiceOptions) installCliPlatformFlags(flags *pflag.FlagSet) {
-	flags.BoolVar(&options.V2Only, "disable-legacy-registry", false, "Disable contacting legacy registries")
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/config_windows.go b/installer/vendor/github.com/docker/docker/registry/config_windows.go
deleted file mode 100644
index d1b313dc1e..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/config_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package registry
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/spf13/pflag"
-)
-
-// CertsDir is the directory where certificates are stored
-var CertsDir = os.Getenv("programdata") + `\docker\certs.d`
-
-// cleanPath is used to ensure that a directory name is valid on the target
-// platform. It will be passed in something *similar* to a URL such as
-// https:\index.docker.io\v1. Not all platforms support directory names
-// which contain those characters (such as : on Windows)
-func cleanPath(s string) string {
-	return filepath.FromSlash(strings.Replace(s, ":", "", -1))
-}
-
-// installCliPlatformFlags handles any platform specific flags for the service.
-func (options *ServiceOptions) installCliPlatformFlags(flags *pflag.FlagSet) {
-	// No Windows specific flags.
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/endpoint_test.go b/installer/vendor/github.com/docker/docker/registry/endpoint_test.go
deleted file mode 100644
index 8451d3f678..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/endpoint_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package registry
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"testing"
-)
-
-func TestEndpointParse(t *testing.T) {
-	testData := []struct {
-		str      string
-		expected string
-	}{
-		{IndexServer, IndexServer},
-		{"http://0.0.0.0:5000/v1/", "http://0.0.0.0:5000/v1/"},
-		{"http://0.0.0.0:5000", "http://0.0.0.0:5000/v1/"},
-		{"0.0.0.0:5000", "https://0.0.0.0:5000/v1/"},
-		{"http://0.0.0.0:5000/nonversion/", "http://0.0.0.0:5000/nonversion/v1/"},
-		{"http://0.0.0.0:5000/v0/", "http://0.0.0.0:5000/v0/v1/"},
-	}
-	for _, td := range testData {
-		e, err := newV1EndpointFromStr(td.str, nil, "", nil)
-		if err != nil {
-			t.Errorf("%q: %s", td.str, err)
-		}
-		if e == nil {
-			t.Logf("something's fishy, endpoint for %q is nil", td.str)
-			continue
-		}
-		if e.String() != td.expected {
-			t.Errorf("expected %q, got %q", td.expected, e.String())
-		}
-	}
-}
-
-func TestEndpointParseInvalid(t *testing.T) {
-	testData := []string{
-		"http://0.0.0.0:5000/v2/",
-	}
-	for _, td := range testData {
-		e, err := newV1EndpointFromStr(td, nil, "", nil)
-		if err == nil {
-			t.Errorf("expected error parsing %q: parsed as %q", td, e)
-		}
-	}
-}
-
-// Ensure that a registry endpoint that responds with a 401 only is determined
-// to be a valid v1 registry endpoint
-func TestValidateEndpoint(t *testing.T) {
-	requireBasicAuthHandler := http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Add("WWW-Authenticate", `Basic realm="localhost"`)
-		w.WriteHeader(http.StatusUnauthorized)
-	})
-
-	// Make a test server which should validate as a v1 server.
-	testServer := httptest.NewServer(requireBasicAuthHandler)
-	defer testServer.Close()
-
-	testServerURL, err := url.Parse(testServer.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testEndpoint := V1Endpoint{
-		URL:    testServerURL,
-		client: HTTPClient(NewTransport(nil)),
-	}
-
-	if err = validateEndpoint(&testEndpoint); err != nil {
-		t.Fatal(err)
-	}
-
-	if testEndpoint.URL.Scheme != "http" {
-		t.Fatalf("expecting to validate endpoint as http, got url %s", testEndpoint.String())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/endpoint_v1.go b/installer/vendor/github.com/docker/docker/registry/endpoint_v1.go
deleted file mode 100644
index 6bcf8c935d..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/endpoint_v1.go
+++ /dev/null
@@ -1,198 +0,0 @@
-package registry
-
-import (
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/transport"
-	registrytypes "github.com/docker/docker/api/types/registry"
-)
-
-// V1Endpoint stores basic information about a V1 registry endpoint.
-type V1Endpoint struct {
-	client   *http.Client
-	URL      *url.URL
-	IsSecure bool
-}
-
-// NewV1Endpoint parses the given address to return a registry endpoint.
-func NewV1Endpoint(index *registrytypes.IndexInfo, userAgent string, metaHeaders http.Header) (*V1Endpoint, error) {
-	tlsConfig, err := newTLSConfig(index.Name, index.Secure)
-	if err != nil {
-		return nil, err
-	}
-
-	endpoint, err := newV1EndpointFromStr(GetAuthConfigKey(index), tlsConfig, userAgent, metaHeaders)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := validateEndpoint(endpoint); err != nil {
-		return nil, err
-	}
-
-	return endpoint, nil
-}
-
-func validateEndpoint(endpoint *V1Endpoint) error {
-	logrus.Debugf("pinging registry endpoint %s", endpoint)
-
-	// Try HTTPS ping to registry
-	endpoint.URL.Scheme = "https"
-	if _, err := endpoint.Ping(); err != nil {
-		if endpoint.IsSecure {
-			// If registry is secure and HTTPS failed, show user the error and tell them about `--insecure-registry`
-			// in case that's what they need. DO NOT accept unknown CA certificates, and DO NOT fallback to HTTP.
-			return fmt.Errorf("invalid registry endpoint %s: %v. If this private registry supports only HTTP or HTTPS with an unknown CA certificate, please add `--insecure-registry %s` to the daemon's arguments. In the case of HTTPS, if you have access to the registry's CA certificate, no need for the flag; simply place the CA certificate at /etc/docker/certs.d/%s/ca.crt", endpoint, err, endpoint.URL.Host, endpoint.URL.Host)
-		}
-
-		// If registry is insecure and HTTPS failed, fallback to HTTP.
-		logrus.Debugf("Error from registry %q marked as insecure: %v. Insecurely falling back to HTTP", endpoint, err)
-		endpoint.URL.Scheme = "http"
-
-		var err2 error
-		if _, err2 = endpoint.Ping(); err2 == nil {
-			return nil
-		}
-
-		return fmt.Errorf("invalid registry endpoint %q. HTTPS attempt: %v. HTTP attempt: %v", endpoint, err, err2)
-	}
-
-	return nil
-}
-
-func newV1Endpoint(address url.URL, tlsConfig *tls.Config, userAgent string, metaHeaders http.Header) (*V1Endpoint, error) {
-	endpoint := &V1Endpoint{
-		IsSecure: (tlsConfig == nil || !tlsConfig.InsecureSkipVerify),
-		URL:      new(url.URL),
-	}
-
-	*endpoint.URL = address
-
-	// TODO(tiborvass): make sure a ConnectTimeout transport is used
-	tr := NewTransport(tlsConfig)
-	endpoint.client = HTTPClient(transport.NewTransport(tr, DockerHeaders(userAgent, metaHeaders)...))
-	return endpoint, nil
-}
-
-// trimV1Address trims the version off the address and returns the
-// trimmed address or an error if there is a non-V1 version.
-func trimV1Address(address string) (string, error) {
-	var (
-		chunks        []string
-		apiVersionStr string
-	)
-
-	if strings.HasSuffix(address, "/") {
-		address = address[:len(address)-1]
-	}
-
-	chunks = strings.Split(address, "/")
-	apiVersionStr = chunks[len(chunks)-1]
-	if apiVersionStr == "v1" {
-		return strings.Join(chunks[:len(chunks)-1], "/"), nil
-	}
-
-	for k, v := range apiVersions {
-		if k != APIVersion1 && apiVersionStr == v {
-			return "", fmt.Errorf("unsupported V1 version path %s", apiVersionStr)
-		}
-	}
-
-	return address, nil
-}
-
-func newV1EndpointFromStr(address string, tlsConfig *tls.Config, userAgent string, metaHeaders http.Header) (*V1Endpoint, error) {
-	if !strings.HasPrefix(address, "http://") && !strings.HasPrefix(address, "https://") {
-		address = "https://" + address
-	}
-
-	address, err := trimV1Address(address)
-	if err != nil {
-		return nil, err
-	}
-
-	uri, err := url.Parse(address)
-	if err != nil {
-		return nil, err
-	}
-
-	endpoint, err := newV1Endpoint(*uri, tlsConfig, userAgent, metaHeaders)
-	if err != nil {
-		return nil, err
-	}
-
-	return endpoint, nil
-}
-
-// Get the formatted URL for the root of this registry Endpoint
-func (e *V1Endpoint) String() string {
-	return e.URL.String() + "/v1/"
-}
-
-// Path returns a formatted string for the URL
-// of this endpoint with the given path appended.
-func (e *V1Endpoint) Path(path string) string {
-	return e.URL.String() + "/v1/" + path
-}
-
-// Ping returns a PingResult which indicates whether the registry is standalone or not.
-func (e *V1Endpoint) Ping() (PingResult, error) {
-	logrus.Debugf("attempting v1 ping for registry endpoint %s", e)
-
-	if e.String() == IndexServer {
-		// Skip the check, we know this one is valid
-		// (and we never want to fallback to http in case of error)
-		return PingResult{Standalone: false}, nil
-	}
-
-	req, err := http.NewRequest("GET", e.Path("_ping"), nil)
-	if err != nil {
-		return PingResult{Standalone: false}, err
-	}
-
-	resp, err := e.client.Do(req)
-	if err != nil {
-		return PingResult{Standalone: false}, err
-	}
-
-	defer resp.Body.Close()
-
-	jsonString, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return PingResult{Standalone: false}, fmt.Errorf("error while reading the http response: %s", err)
-	}
-
-	// If the header is absent, we assume true for compatibility with earlier
-	// versions of the registry. default to true
-	info := PingResult{
-		Standalone: true,
-	}
-	if err := json.Unmarshal(jsonString, &info); err != nil {
-		logrus.Debugf("Error unmarshalling the _ping PingResult: %s", err)
-		// don't stop here. Just assume sane defaults
-	}
-	if hdr := resp.Header.Get("X-Docker-Registry-Version"); hdr != "" {
-		logrus.Debugf("Registry version header: '%s'", hdr)
-		info.Version = hdr
-	}
-	logrus.Debugf("PingResult.Version: %q", info.Version)
-
-	standalone := resp.Header.Get("X-Docker-Registry-Standalone")
-	logrus.Debugf("Registry standalone header: '%s'", standalone)
-	// Accepted values are "true" (case-insensitive) and "1".
-	if strings.EqualFold(standalone, "true") || standalone == "1" {
-		info.Standalone = true
-	} else if len(standalone) > 0 {
-		// there is a header set, and it is not "true" or "1", so assume fails
-		info.Standalone = false
-	}
-	logrus.Debugf("PingResult.Standalone: %t", info.Standalone)
-	return info, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/registry.go b/installer/vendor/github.com/docker/docker/registry/registry.go
deleted file mode 100644
index 17fa97ce3d..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/registry.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Package registry contains client primitives to interact with a remote Docker registry.
-package registry
-
-import (
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/go-connections/sockets"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-var (
-	// ErrAlreadyExists is an error returned if an image being pushed
-	// already exists on the remote side
-	ErrAlreadyExists = errors.New("Image already exists")
-)
-
-func newTLSConfig(hostname string, isSecure bool) (*tls.Config, error) {
-	// PreferredServerCipherSuites should have no effect
-	tlsConfig := tlsconfig.ServerDefault()
-
-	tlsConfig.InsecureSkipVerify = !isSecure
-
-	if isSecure && CertsDir != "" {
-		hostDir := filepath.Join(CertsDir, cleanPath(hostname))
-		logrus.Debugf("hostDir: %s", hostDir)
-		if err := ReadCertsDirectory(tlsConfig, hostDir); err != nil {
-			return nil, err
-		}
-	}
-
-	return tlsConfig, nil
-}
-
-func hasFile(files []os.FileInfo, name string) bool {
-	for _, f := range files {
-		if f.Name() == name {
-			return true
-		}
-	}
-	return false
-}
-
-// ReadCertsDirectory reads the directory for TLS certificates
-// including roots and certificate pairs and updates the
-// provided TLS configuration.
-func ReadCertsDirectory(tlsConfig *tls.Config, directory string) error {
-	fs, err := ioutil.ReadDir(directory)
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-
-	for _, f := range fs {
-		if strings.HasSuffix(f.Name(), ".crt") {
-			if tlsConfig.RootCAs == nil {
-				systemPool, err := tlsconfig.SystemCertPool()
-				if err != nil {
-					return fmt.Errorf("unable to get system cert pool: %v", err)
-				}
-				tlsConfig.RootCAs = systemPool
-			}
-			logrus.Debugf("crt: %s", filepath.Join(directory, f.Name()))
-			data, err := ioutil.ReadFile(filepath.Join(directory, f.Name()))
-			if err != nil {
-				return err
-			}
-			tlsConfig.RootCAs.AppendCertsFromPEM(data)
-		}
-		if strings.HasSuffix(f.Name(), ".cert") {
-			certName := f.Name()
-			keyName := certName[:len(certName)-5] + ".key"
-			logrus.Debugf("cert: %s", filepath.Join(directory, f.Name()))
-			if !hasFile(fs, keyName) {
-				return fmt.Errorf("Missing key %s for client certificate %s. Note that CA certificates should use the extension .crt.", keyName, certName)
-			}
-			cert, err := tls.LoadX509KeyPair(filepath.Join(directory, certName), filepath.Join(directory, keyName))
-			if err != nil {
-				return err
-			}
-			tlsConfig.Certificates = append(tlsConfig.Certificates, cert)
-		}
-		if strings.HasSuffix(f.Name(), ".key") {
-			keyName := f.Name()
-			certName := keyName[:len(keyName)-4] + ".cert"
-			logrus.Debugf("key: %s", filepath.Join(directory, f.Name()))
-			if !hasFile(fs, certName) {
-				return fmt.Errorf("Missing client certificate %s for key %s", certName, keyName)
-			}
-		}
-	}
-
-	return nil
-}
-
-// DockerHeaders returns request modifiers with a User-Agent and metaHeaders
-func DockerHeaders(userAgent string, metaHeaders http.Header) []transport.RequestModifier {
-	modifiers := []transport.RequestModifier{}
-	if userAgent != "" {
-		modifiers = append(modifiers, transport.NewHeaderRequestModifier(http.Header{
-			"User-Agent": []string{userAgent},
-		}))
-	}
-	if metaHeaders != nil {
-		modifiers = append(modifiers, transport.NewHeaderRequestModifier(metaHeaders))
-	}
-	return modifiers
-}
-
-// HTTPClient returns an HTTP client structure which uses the given transport
-// and contains the necessary headers for redirected requests
-func HTTPClient(transport http.RoundTripper) *http.Client {
-	return &http.Client{
-		Transport:     transport,
-		CheckRedirect: addRequiredHeadersToRedirectedRequests,
-	}
-}
-
-func trustedLocation(req *http.Request) bool {
-	var (
-		trusteds = []string{"docker.com", "docker.io"}
-		hostname = strings.SplitN(req.Host, ":", 2)[0]
-	)
-	if req.URL.Scheme != "https" {
-		return false
-	}
-
-	for _, trusted := range trusteds {
-		if hostname == trusted || strings.HasSuffix(hostname, "."+trusted) {
-			return true
-		}
-	}
-	return false
-}
-
-// addRequiredHeadersToRedirectedRequests adds the necessary redirection headers
-// for redirected requests
-func addRequiredHeadersToRedirectedRequests(req *http.Request, via []*http.Request) error {
-	if via != nil && via[0] != nil {
-		if trustedLocation(req) && trustedLocation(via[0]) {
-			req.Header = via[0].Header
-			return nil
-		}
-		for k, v := range via[0].Header {
-			if k != "Authorization" {
-				for _, vv := range v {
-					req.Header.Add(k, vv)
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// NewTransport returns a new HTTP transport. If tlsConfig is nil, it uses the
-// default TLS configuration.
-func NewTransport(tlsConfig *tls.Config) *http.Transport {
-	if tlsConfig == nil {
-		tlsConfig = tlsconfig.ServerDefault()
-	}
-
-	direct := &net.Dialer{
-		Timeout:   30 * time.Second,
-		KeepAlive: 30 * time.Second,
-		DualStack: true,
-	}
-
-	base := &http.Transport{
-		Proxy:               http.ProxyFromEnvironment,
-		Dial:                direct.Dial,
-		TLSHandshakeTimeout: 10 * time.Second,
-		TLSClientConfig:     tlsConfig,
-		// TODO(dmcgowan): Call close idle connections when complete and use keep alive
-		DisableKeepAlives: true,
-	}
-
-	proxyDialer, err := sockets.DialerFromEnvironment(direct)
-	if err == nil {
-		base.Dial = proxyDialer.Dial
-	}
-	return base
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/registry_mock_test.go b/installer/vendor/github.com/docker/docker/registry/registry_mock_test.go
deleted file mode 100644
index 21fc1fdcc7..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/registry_mock_test.go
+++ /dev/null
@@ -1,478 +0,0 @@
-// +build !solaris
-
-package registry
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/reference"
-	"github.com/gorilla/mux"
-
-	"github.com/Sirupsen/logrus"
-)
-
-var (
-	testHTTPServer  *httptest.Server
-	testHTTPSServer *httptest.Server
-	testLayers      = map[string]map[string]string{
-		"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20": {
-			"json": `{"id":"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
-				"comment":"test base image","created":"2013-03-23T12:53:11.10432-07:00",
-				"container_config":{"Hostname":"","User":"","Memory":0,"MemorySwap":0,
-				"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,
-				"Tty":false,"OpenStdin":false,"StdinOnce":false,
-				"Env":null,"Cmd":null,"Dns":null,"Image":"","Volumes":null,
-				"VolumesFrom":"","Entrypoint":null},"Size":424242}`,
-			"checksum_simple": "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37",
-			"checksum_tarsum": "tarsum+sha256:4409a0685741ca86d38df878ed6f8cbba4c99de5dc73cd71aef04be3bb70be7c",
-			"ancestry":        `["77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20"]`,
-			"layer": string([]byte{
-				0x1f, 0x8b, 0x08, 0x08, 0x0e, 0xb0, 0xee, 0x51, 0x02, 0x03, 0x6c, 0x61, 0x79, 0x65,
-				0x72, 0x2e, 0x74, 0x61, 0x72, 0x00, 0xed, 0xd2, 0x31, 0x0e, 0xc2, 0x30, 0x0c, 0x05,
-				0x50, 0xcf, 0x9c, 0xc2, 0x27, 0x48, 0xed, 0x38, 0x4e, 0xce, 0x13, 0x44, 0x2b, 0x66,
-				0x62, 0x24, 0x8e, 0x4f, 0xa0, 0x15, 0x63, 0xb6, 0x20, 0x21, 0xfc, 0x96, 0xbf, 0x78,
-				0xb0, 0xf5, 0x1d, 0x16, 0x98, 0x8e, 0x88, 0x8a, 0x2a, 0xbe, 0x33, 0xef, 0x49, 0x31,
-				0xed, 0x79, 0x40, 0x8e, 0x5c, 0x44, 0x85, 0x88, 0x33, 0x12, 0x73, 0x2c, 0x02, 0xa8,
-				0xf0, 0x05, 0xf7, 0x66, 0xf5, 0xd6, 0x57, 0x69, 0xd7, 0x7a, 0x19, 0xcd, 0xf5, 0xb1,
-				0x6d, 0x1b, 0x1f, 0xf9, 0xba, 0xe3, 0x93, 0x3f, 0x22, 0x2c, 0xb6, 0x36, 0x0b, 0xf6,
-				0xb0, 0xa9, 0xfd, 0xe7, 0x94, 0x46, 0xfd, 0xeb, 0xd1, 0x7f, 0x2c, 0xc4, 0xd2, 0xfb,
-				0x97, 0xfe, 0x02, 0x80, 0xe4, 0xfd, 0x4f, 0x77, 0xae, 0x6d, 0x3d, 0x81, 0x73, 0xce,
-				0xb9, 0x7f, 0xf3, 0x04, 0x41, 0xc1, 0xab, 0xc6, 0x00, 0x0a, 0x00, 0x00,
-			}),
-		},
-		"42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d": {
-			"json": `{"id":"42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
-				"parent":"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
-				"comment":"test base image","created":"2013-03-23T12:55:11.10432-07:00",
-				"container_config":{"Hostname":"","User":"","Memory":0,"MemorySwap":0,
-				"CpuShares":0,"AttachStdin":false,"AttachStdout":false,"AttachStderr":false,
-				"Tty":false,"OpenStdin":false,"StdinOnce":false,
-				"Env":null,"Cmd":null,"Dns":null,"Image":"","Volumes":null,
-				"VolumesFrom":"","Entrypoint":null},"Size":424242}`,
-			"checksum_simple": "sha256:bea7bf2e4bacd479344b737328db47b18880d09096e6674165533aa994f5e9f2",
-			"checksum_tarsum": "tarsum+sha256:68fdb56fb364f074eec2c9b3f85ca175329c4dcabc4a6a452b7272aa613a07a2",
-			"ancestry": `["42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
-				"77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20"]`,
-			"layer": string([]byte{
-				0x1f, 0x8b, 0x08, 0x08, 0xbd, 0xb3, 0xee, 0x51, 0x02, 0x03, 0x6c, 0x61, 0x79, 0x65,
-				0x72, 0x2e, 0x74, 0x61, 0x72, 0x00, 0xed, 0xd1, 0x31, 0x0e, 0xc2, 0x30, 0x0c, 0x05,
-				0x50, 0xcf, 0x9c, 0xc2, 0x27, 0x48, 0x9d, 0x38, 0x8e, 0xcf, 0x53, 0x51, 0xaa, 0x56,
-				0xea, 0x44, 0x82, 0xc4, 0xf1, 0x09, 0xb4, 0xea, 0x98, 0x2d, 0x48, 0x08, 0xbf, 0xe5,
-				0x2f, 0x1e, 0xfc, 0xf5, 0xdd, 0x00, 0xdd, 0x11, 0x91, 0x8a, 0xe0, 0x27, 0xd3, 0x9e,
-				0x14, 0xe2, 0x9e, 0x07, 0xf4, 0xc1, 0x2b, 0x0b, 0xfb, 0xa4, 0x82, 0xe4, 0x3d, 0x93,
-				0x02, 0x0a, 0x7c, 0xc1, 0x23, 0x97, 0xf1, 0x5e, 0x5f, 0xc9, 0xcb, 0x38, 0xb5, 0xee,
-				0xea, 0xd9, 0x3c, 0xb7, 0x4b, 0xbe, 0x7b, 0x9c, 0xf9, 0x23, 0xdc, 0x50, 0x6e, 0xb9,
-				0xb8, 0xf2, 0x2c, 0x5d, 0xf7, 0x4f, 0x31, 0xb6, 0xf6, 0x4f, 0xc7, 0xfe, 0x41, 0x55,
-				0x63, 0xdd, 0x9f, 0x89, 0x09, 0x90, 0x6c, 0xff, 0xee, 0xae, 0xcb, 0xba, 0x4d, 0x17,
-				0x30, 0xc6, 0x18, 0xf3, 0x67, 0x5e, 0xc1, 0xed, 0x21, 0x5d, 0x00, 0x0a, 0x00, 0x00,
-			}),
-		},
-	}
-	testRepositories = map[string]map[string]string{
-		"foo42/bar": {
-			"latest": "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
-			"test":   "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
-		},
-	}
-	mockHosts = map[string][]net.IP{
-		"":            {net.ParseIP("0.0.0.0")},
-		"localhost":   {net.ParseIP("127.0.0.1"), net.ParseIP("::1")},
-		"example.com": {net.ParseIP("42.42.42.42")},
-		"other.com":   {net.ParseIP("43.43.43.43")},
-	}
-)
-
-func init() {
-	r := mux.NewRouter()
-
-	// /v1/
-	r.HandleFunc("/v1/_ping", handlerGetPing).Methods("GET")
-	r.HandleFunc("/v1/images/{image_id:[^/]+}/{action:json|layer|ancestry}", handlerGetImage).Methods("GET")
-	r.HandleFunc("/v1/images/{image_id:[^/]+}/{action:json|layer|checksum}", handlerPutImage).Methods("PUT")
-	r.HandleFunc("/v1/repositories/{repository:.+}/tags", handlerGetDeleteTags).Methods("GET", "DELETE")
-	r.HandleFunc("/v1/repositories/{repository:.+}/tags/{tag:.+}", handlerGetTag).Methods("GET")
-	r.HandleFunc("/v1/repositories/{repository:.+}/tags/{tag:.+}", handlerPutTag).Methods("PUT")
-	r.HandleFunc("/v1/users{null:.*}", handlerUsers).Methods("GET", "POST", "PUT")
-	r.HandleFunc("/v1/repositories/{repository:.+}{action:/images|/}", handlerImages).Methods("GET", "PUT", "DELETE")
-	r.HandleFunc("/v1/repositories/{repository:.+}/auth", handlerAuth).Methods("PUT")
-	r.HandleFunc("/v1/search", handlerSearch).Methods("GET")
-
-	// /v2/
-	r.HandleFunc("/v2/version", handlerGetPing).Methods("GET")
-
-	testHTTPServer = httptest.NewServer(handlerAccessLog(r))
-	testHTTPSServer = httptest.NewTLSServer(handlerAccessLog(r))
-
-	// override net.LookupIP
-	lookupIP = func(host string) ([]net.IP, error) {
-		if host == "127.0.0.1" {
-			// I believe in future Go versions this will fail, so let's fix it later
-			return net.LookupIP(host)
-		}
-		for h, addrs := range mockHosts {
-			if host == h {
-				return addrs, nil
-			}
-			for _, addr := range addrs {
-				if addr.String() == host {
-					return []net.IP{addr}, nil
-				}
-			}
-		}
-		return nil, errors.New("lookup: no such host")
-	}
-}
-
-func handlerAccessLog(handler http.Handler) http.Handler {
-	logHandler := func(w http.ResponseWriter, r *http.Request) {
-		logrus.Debugf("%s \"%s %s\"", r.RemoteAddr, r.Method, r.URL)
-		handler.ServeHTTP(w, r)
-	}
-	return http.HandlerFunc(logHandler)
-}
-
-func makeURL(req string) string {
-	return testHTTPServer.URL + req
-}
-
-func makeHTTPSURL(req string) string {
-	return testHTTPSServer.URL + req
-}
-
-func makeIndex(req string) *registrytypes.IndexInfo {
-	index := &registrytypes.IndexInfo{
-		Name: makeURL(req),
-	}
-	return index
-}
-
-func makeHTTPSIndex(req string) *registrytypes.IndexInfo {
-	index := &registrytypes.IndexInfo{
-		Name: makeHTTPSURL(req),
-	}
-	return index
-}
-
-func makePublicIndex() *registrytypes.IndexInfo {
-	index := &registrytypes.IndexInfo{
-		Name:     IndexServer,
-		Secure:   true,
-		Official: true,
-	}
-	return index
-}
-
-func makeServiceConfig(mirrors []string, insecureRegistries []string) *serviceConfig {
-	options := ServiceOptions{
-		Mirrors:            mirrors,
-		InsecureRegistries: insecureRegistries,
-	}
-
-	return newServiceConfig(options)
-}
-
-func writeHeaders(w http.ResponseWriter) {
-	h := w.Header()
-	h.Add("Server", "docker-tests/mock")
-	h.Add("Expires", "-1")
-	h.Add("Content-Type", "application/json")
-	h.Add("Pragma", "no-cache")
-	h.Add("Cache-Control", "no-cache")
-	h.Add("X-Docker-Registry-Version", "0.0.0")
-	h.Add("X-Docker-Registry-Config", "mock")
-}
-
-func writeResponse(w http.ResponseWriter, message interface{}, code int) {
-	writeHeaders(w)
-	w.WriteHeader(code)
-	body, err := json.Marshal(message)
-	if err != nil {
-		io.WriteString(w, err.Error())
-		return
-	}
-	w.Write(body)
-}
-
-func readJSON(r *http.Request, dest interface{}) error {
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(body, dest)
-}
-
-func apiError(w http.ResponseWriter, message string, code int) {
-	body := map[string]string{
-		"error": message,
-	}
-	writeResponse(w, body, code)
-}
-
-func assertEqual(t *testing.T, a interface{}, b interface{}, message string) {
-	if a == b {
-		return
-	}
-	if len(message) == 0 {
-		message = fmt.Sprintf("%v != %v", a, b)
-	}
-	t.Fatal(message)
-}
-
-func assertNotEqual(t *testing.T, a interface{}, b interface{}, message string) {
-	if a != b {
-		return
-	}
-	if len(message) == 0 {
-		message = fmt.Sprintf("%v == %v", a, b)
-	}
-	t.Fatal(message)
-}
-
-// Similar to assertEqual, but does not stop test
-func checkEqual(t *testing.T, a interface{}, b interface{}, messagePrefix string) {
-	if a == b {
-		return
-	}
-	message := fmt.Sprintf("%v != %v", a, b)
-	if len(messagePrefix) != 0 {
-		message = messagePrefix + ": " + message
-	}
-	t.Error(message)
-}
-
-// Similar to assertNotEqual, but does not stop test
-func checkNotEqual(t *testing.T, a interface{}, b interface{}, messagePrefix string) {
-	if a != b {
-		return
-	}
-	message := fmt.Sprintf("%v == %v", a, b)
-	if len(messagePrefix) != 0 {
-		message = messagePrefix + ": " + message
-	}
-	t.Error(message)
-}
-
-func requiresAuth(w http.ResponseWriter, r *http.Request) bool {
-	writeCookie := func() {
-		value := fmt.Sprintf("FAKE-SESSION-%d", time.Now().UnixNano())
-		cookie := &http.Cookie{Name: "session", Value: value, MaxAge: 3600}
-		http.SetCookie(w, cookie)
-		//FIXME(sam): this should be sent only on Index routes
-		value = fmt.Sprintf("FAKE-TOKEN-%d", time.Now().UnixNano())
-		w.Header().Add("X-Docker-Token", value)
-	}
-	if len(r.Cookies()) > 0 {
-		writeCookie()
-		return true
-	}
-	if len(r.Header.Get("Authorization")) > 0 {
-		writeCookie()
-		return true
-	}
-	w.Header().Add("WWW-Authenticate", "token")
-	apiError(w, "Wrong auth", 401)
-	return false
-}
-
-func handlerGetPing(w http.ResponseWriter, r *http.Request) {
-	writeResponse(w, true, 200)
-}
-
-func handlerGetImage(w http.ResponseWriter, r *http.Request) {
-	if !requiresAuth(w, r) {
-		return
-	}
-	vars := mux.Vars(r)
-	layer, exists := testLayers[vars["image_id"]]
-	if !exists {
-		http.NotFound(w, r)
-		return
-	}
-	writeHeaders(w)
-	layerSize := len(layer["layer"])
-	w.Header().Add("X-Docker-Size", strconv.Itoa(layerSize))
-	io.WriteString(w, layer[vars["action"]])
-}
-
-func handlerPutImage(w http.ResponseWriter, r *http.Request) {
-	if !requiresAuth(w, r) {
-		return
-	}
-	vars := mux.Vars(r)
-	imageID := vars["image_id"]
-	action := vars["action"]
-	layer, exists := testLayers[imageID]
-	if !exists {
-		if action != "json" {
-			http.NotFound(w, r)
-			return
-		}
-		layer = make(map[string]string)
-		testLayers[imageID] = layer
-	}
-	if checksum := r.Header.Get("X-Docker-Checksum"); checksum != "" {
-		if checksum != layer["checksum_simple"] && checksum != layer["checksum_tarsum"] {
-			apiError(w, "Wrong checksum", 400)
-			return
-		}
-	}
-	body, err := ioutil.ReadAll(r.Body)
-	if err != nil {
-		apiError(w, fmt.Sprintf("Error: %s", err), 500)
-		return
-	}
-	layer[action] = string(body)
-	writeResponse(w, true, 200)
-}
-
-func handlerGetDeleteTags(w http.ResponseWriter, r *http.Request) {
-	if !requiresAuth(w, r) {
-		return
-	}
-	repositoryName, err := reference.WithName(mux.Vars(r)["repository"])
-	if err != nil {
-		apiError(w, "Could not parse repository", 400)
-		return
-	}
-	tags, exists := testRepositories[repositoryName.String()]
-	if !exists {
-		apiError(w, "Repository not found", 404)
-		return
-	}
-	if r.Method == "DELETE" {
-		delete(testRepositories, repositoryName.String())
-		writeResponse(w, true, 200)
-		return
-	}
-	writeResponse(w, tags, 200)
-}
-
-func handlerGetTag(w http.ResponseWriter, r *http.Request) {
-	if !requiresAuth(w, r) {
-		return
-	}
-	vars := mux.Vars(r)
-	repositoryName, err := reference.WithName(vars["repository"])
-	if err != nil {
-		apiError(w, "Could not parse repository", 400)
-		return
-	}
-	tagName := vars["tag"]
-	tags, exists := testRepositories[repositoryName.String()]
-	if !exists {
-		apiError(w, "Repository not found", 404)
-		return
-	}
-	tag, exists := tags[tagName]
-	if !exists {
-		apiError(w, "Tag not found", 404)
-		return
-	}
-	writeResponse(w, tag, 200)
-}
-
-func handlerPutTag(w http.ResponseWriter, r *http.Request) {
-	if !requiresAuth(w, r) {
-		return
-	}
-	vars := mux.Vars(r)
-	repositoryName, err := reference.WithName(vars["repository"])
-	if err != nil {
-		apiError(w, "Could not parse repository", 400)
-		return
-	}
-	tagName := vars["tag"]
-	tags, exists := testRepositories[repositoryName.String()]
-	if !exists {
-		tags = make(map[string]string)
-		testRepositories[repositoryName.String()] = tags
-	}
-	tagValue := ""
-	readJSON(r, tagValue)
-	tags[tagName] = tagValue
-	writeResponse(w, true, 200)
-}
-
-func handlerUsers(w http.ResponseWriter, r *http.Request) {
-	code := 200
-	if r.Method == "POST" {
-		code = 201
-	} else if r.Method == "PUT" {
-		code = 204
-	}
-	writeResponse(w, "", code)
-}
-
-func handlerImages(w http.ResponseWriter, r *http.Request) {
-	u, _ := url.Parse(testHTTPServer.URL)
-	w.Header().Add("X-Docker-Endpoints", fmt.Sprintf("%s 	,  %s ", u.Host, "test.example.com"))
-	w.Header().Add("X-Docker-Token", fmt.Sprintf("FAKE-SESSION-%d", time.Now().UnixNano()))
-	if r.Method == "PUT" {
-		if strings.HasSuffix(r.URL.Path, "images") {
-			writeResponse(w, "", 204)
-			return
-		}
-		writeResponse(w, "", 200)
-		return
-	}
-	if r.Method == "DELETE" {
-		writeResponse(w, "", 204)
-		return
-	}
-	images := []map[string]string{}
-	for imageID, layer := range testLayers {
-		image := make(map[string]string)
-		image["id"] = imageID
-		image["checksum"] = layer["checksum_tarsum"]
-		image["Tag"] = "latest"
-		images = append(images, image)
-	}
-	writeResponse(w, images, 200)
-}
-
-func handlerAuth(w http.ResponseWriter, r *http.Request) {
-	writeResponse(w, "OK", 200)
-}
-
-func handlerSearch(w http.ResponseWriter, r *http.Request) {
-	result := &registrytypes.SearchResults{
-		Query:      "fakequery",
-		NumResults: 1,
-		Results:    []registrytypes.SearchResult{{Name: "fakeimage", StarCount: 42}},
-	}
-	writeResponse(w, result, 200)
-}
-
-func TestPing(t *testing.T) {
-	res, err := http.Get(makeURL("/v1/_ping"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, res.StatusCode, 200, "")
-	assertEqual(t, res.Header.Get("X-Docker-Registry-Config"), "mock",
-		"This is not a Mocked Registry")
-}
-
-/* Uncomment this to test Mocked Registry locally with curl
- * WARNING: Don't push on the repos uncommented, it'll block the tests
- *
-func TestWait(t *testing.T) {
-	logrus.Println("Test HTTP server ready and waiting:", testHTTPServer.URL)
-	c := make(chan int)
-	<-c
-}
-
-//*/
diff --git a/installer/vendor/github.com/docker/docker/registry/registry_test.go b/installer/vendor/github.com/docker/docker/registry/registry_test.go
deleted file mode 100644
index 786dfbed40..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/registry_test.go
+++ /dev/null
@@ -1,875 +0,0 @@
-// +build !solaris
-
-package registry
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/docker/distribution/registry/client/transport"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/reference"
-)
-
-var (
-	token = []string{"fake-token"}
-)
-
-const (
-	imageID = "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d"
-	REPO    = "foo42/bar"
-)
-
-func spawnTestRegistrySession(t *testing.T) *Session {
-	authConfig := &types.AuthConfig{}
-	endpoint, err := NewV1Endpoint(makeIndex("/v1/"), "", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	userAgent := "docker test client"
-	var tr http.RoundTripper = debugTransport{NewTransport(nil), t.Log}
-	tr = transport.NewTransport(AuthTransport(tr, authConfig, false), DockerHeaders(userAgent, nil)...)
-	client := HTTPClient(tr)
-	r, err := NewSession(client, authConfig, endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// In a normal scenario for the v1 registry, the client should send a `X-Docker-Token: true`
-	// header while authenticating, in order to retrieve a token that can be later used to
-	// perform authenticated actions.
-	//
-	// The mock v1 registry does not support that, (TODO(tiborvass): support it), instead,
-	// it will consider authenticated any request with the header `X-Docker-Token: fake-token`.
-	//
-	// Because we know that the client's transport is an `*authTransport` we simply cast it,
-	// in order to set the internal cached token to the fake token, and thus send that fake token
-	// upon every subsequent requests.
-	r.client.Transport.(*authTransport).token = token
-	return r
-}
-
-func TestPingRegistryEndpoint(t *testing.T) {
-	testPing := func(index *registrytypes.IndexInfo, expectedStandalone bool, assertMessage string) {
-		ep, err := NewV1Endpoint(index, "", nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		regInfo, err := ep.Ping()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		assertEqual(t, regInfo.Standalone, expectedStandalone, assertMessage)
-	}
-
-	testPing(makeIndex("/v1/"), true, "Expected standalone to be true (default)")
-	testPing(makeHTTPSIndex("/v1/"), true, "Expected standalone to be true (default)")
-	testPing(makePublicIndex(), false, "Expected standalone to be false for public index")
-}
-
-func TestEndpoint(t *testing.T) {
-	// Simple wrapper to fail test if err != nil
-	expandEndpoint := func(index *registrytypes.IndexInfo) *V1Endpoint {
-		endpoint, err := NewV1Endpoint(index, "", nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		return endpoint
-	}
-
-	assertInsecureIndex := func(index *registrytypes.IndexInfo) {
-		index.Secure = true
-		_, err := NewV1Endpoint(index, "", nil)
-		assertNotEqual(t, err, nil, index.Name+": Expected error for insecure index")
-		assertEqual(t, strings.Contains(err.Error(), "insecure-registry"), true, index.Name+": Expected insecure-registry  error for insecure index")
-		index.Secure = false
-	}
-
-	assertSecureIndex := func(index *registrytypes.IndexInfo) {
-		index.Secure = true
-		_, err := NewV1Endpoint(index, "", nil)
-		assertNotEqual(t, err, nil, index.Name+": Expected cert error for secure index")
-		assertEqual(t, strings.Contains(err.Error(), "certificate signed by unknown authority"), true, index.Name+": Expected cert error for secure index")
-		index.Secure = false
-	}
-
-	index := &registrytypes.IndexInfo{}
-	index.Name = makeURL("/v1/")
-	endpoint := expandEndpoint(index)
-	assertEqual(t, endpoint.String(), index.Name, "Expected endpoint to be "+index.Name)
-	assertInsecureIndex(index)
-
-	index.Name = makeURL("")
-	endpoint = expandEndpoint(index)
-	assertEqual(t, endpoint.String(), index.Name+"/v1/", index.Name+": Expected endpoint to be "+index.Name+"/v1/")
-	assertInsecureIndex(index)
-
-	httpURL := makeURL("")
-	index.Name = strings.SplitN(httpURL, "://", 2)[1]
-	endpoint = expandEndpoint(index)
-	assertEqual(t, endpoint.String(), httpURL+"/v1/", index.Name+": Expected endpoint to be "+httpURL+"/v1/")
-	assertInsecureIndex(index)
-
-	index.Name = makeHTTPSURL("/v1/")
-	endpoint = expandEndpoint(index)
-	assertEqual(t, endpoint.String(), index.Name, "Expected endpoint to be "+index.Name)
-	assertSecureIndex(index)
-
-	index.Name = makeHTTPSURL("")
-	endpoint = expandEndpoint(index)
-	assertEqual(t, endpoint.String(), index.Name+"/v1/", index.Name+": Expected endpoint to be "+index.Name+"/v1/")
-	assertSecureIndex(index)
-
-	httpsURL := makeHTTPSURL("")
-	index.Name = strings.SplitN(httpsURL, "://", 2)[1]
-	endpoint = expandEndpoint(index)
-	assertEqual(t, endpoint.String(), httpsURL+"/v1/", index.Name+": Expected endpoint to be "+httpsURL+"/v1/")
-	assertSecureIndex(index)
-
-	badEndpoints := []string{
-		"http://127.0.0.1/v1/",
-		"https://127.0.0.1/v1/",
-		"http://127.0.0.1",
-		"https://127.0.0.1",
-		"127.0.0.1",
-	}
-	for _, address := range badEndpoints {
-		index.Name = address
-		_, err := NewV1Endpoint(index, "", nil)
-		checkNotEqual(t, err, nil, "Expected error while expanding bad endpoint")
-	}
-}
-
-func TestGetRemoteHistory(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	hist, err := r.GetRemoteHistory(imageID, makeURL("/v1/"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, len(hist), 2, "Expected 2 images in history")
-	assertEqual(t, hist[0], imageID, "Expected "+imageID+"as first ancestry")
-	assertEqual(t, hist[1], "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
-		"Unexpected second ancestry")
-}
-
-func TestLookupRemoteImage(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	err := r.LookupRemoteImage(imageID, makeURL("/v1/"))
-	assertEqual(t, err, nil, "Expected error of remote lookup to nil")
-	if err := r.LookupRemoteImage("abcdef", makeURL("/v1/")); err == nil {
-		t.Fatal("Expected error of remote lookup to not nil")
-	}
-}
-
-func TestGetRemoteImageJSON(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	json, size, err := r.GetRemoteImageJSON(imageID, makeURL("/v1/"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, size, int64(154), "Expected size 154")
-	if len(json) == 0 {
-		t.Fatal("Expected non-empty json")
-	}
-
-	_, _, err = r.GetRemoteImageJSON("abcdef", makeURL("/v1/"))
-	if err == nil {
-		t.Fatal("Expected image not found error")
-	}
-}
-
-func TestGetRemoteImageLayer(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	data, err := r.GetRemoteImageLayer(imageID, makeURL("/v1/"), 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if data == nil {
-		t.Fatal("Expected non-nil data result")
-	}
-
-	_, err = r.GetRemoteImageLayer("abcdef", makeURL("/v1/"), 0)
-	if err == nil {
-		t.Fatal("Expected image not found error")
-	}
-}
-
-func TestGetRemoteTag(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	repoRef, err := reference.ParseNamed(REPO)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tag, err := r.GetRemoteTag([]string{makeURL("/v1/")}, repoRef, "test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, tag, imageID, "Expected tag test to map to "+imageID)
-
-	bazRef, err := reference.ParseNamed("foo42/baz")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = r.GetRemoteTag([]string{makeURL("/v1/")}, bazRef, "foo")
-	if err != ErrRepoNotFound {
-		t.Fatal("Expected ErrRepoNotFound error when fetching tag for bogus repo")
-	}
-}
-
-func TestGetRemoteTags(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	repoRef, err := reference.ParseNamed(REPO)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tags, err := r.GetRemoteTags([]string{makeURL("/v1/")}, repoRef)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, len(tags), 2, "Expected two tags")
-	assertEqual(t, tags["latest"], imageID, "Expected tag latest to map to "+imageID)
-	assertEqual(t, tags["test"], imageID, "Expected tag test to map to "+imageID)
-
-	bazRef, err := reference.ParseNamed("foo42/baz")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = r.GetRemoteTags([]string{makeURL("/v1/")}, bazRef)
-	if err != ErrRepoNotFound {
-		t.Fatal("Expected ErrRepoNotFound error when fetching tags for bogus repo")
-	}
-}
-
-func TestGetRepositoryData(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	parsedURL, err := url.Parse(makeURL("/v1/"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	host := "http://" + parsedURL.Host + "/v1/"
-	repoRef, err := reference.ParseNamed(REPO)
-	if err != nil {
-		t.Fatal(err)
-	}
-	data, err := r.GetRepositoryData(repoRef)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assertEqual(t, len(data.ImgList), 2, "Expected 2 images in ImgList")
-	assertEqual(t, len(data.Endpoints), 2,
-		fmt.Sprintf("Expected 2 endpoints in Endpoints, found %d instead", len(data.Endpoints)))
-	assertEqual(t, data.Endpoints[0], host,
-		fmt.Sprintf("Expected first endpoint to be %s but found %s instead", host, data.Endpoints[0]))
-	assertEqual(t, data.Endpoints[1], "http://test.example.com/v1/",
-		fmt.Sprintf("Expected first endpoint to be http://test.example.com/v1/ but found %s instead", data.Endpoints[1]))
-
-}
-
-func TestPushImageJSONRegistry(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	imgData := &ImgData{
-		ID:       "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
-		Checksum: "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37",
-	}
-
-	err := r.PushImageJSONRegistry(imgData, []byte{0x42, 0xdf, 0x0}, makeURL("/v1/"))
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPushImageLayerRegistry(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	layer := strings.NewReader("")
-	_, _, err := r.PushImageLayerRegistry(imageID, layer, makeURL("/v1/"), []byte{})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestParseRepositoryInfo(t *testing.T) {
-	type staticRepositoryInfo struct {
-		Index         *registrytypes.IndexInfo
-		RemoteName    string
-		CanonicalName string
-		LocalName     string
-		Official      bool
-	}
-
-	expectedRepoInfos := map[string]staticRepositoryInfo{
-		"fooo/bar": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "fooo/bar",
-			LocalName:     "fooo/bar",
-			CanonicalName: "docker.io/fooo/bar",
-			Official:      false,
-		},
-		"library/ubuntu": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "library/ubuntu",
-			LocalName:     "ubuntu",
-			CanonicalName: "docker.io/library/ubuntu",
-			Official:      true,
-		},
-		"nonlibrary/ubuntu": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "nonlibrary/ubuntu",
-			LocalName:     "nonlibrary/ubuntu",
-			CanonicalName: "docker.io/nonlibrary/ubuntu",
-			Official:      false,
-		},
-		"ubuntu": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "library/ubuntu",
-			LocalName:     "ubuntu",
-			CanonicalName: "docker.io/library/ubuntu",
-			Official:      true,
-		},
-		"other/library": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "other/library",
-			LocalName:     "other/library",
-			CanonicalName: "docker.io/other/library",
-			Official:      false,
-		},
-		"127.0.0.1:8000/private/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "127.0.0.1:8000",
-				Official: false,
-			},
-			RemoteName:    "private/moonbase",
-			LocalName:     "127.0.0.1:8000/private/moonbase",
-			CanonicalName: "127.0.0.1:8000/private/moonbase",
-			Official:      false,
-		},
-		"127.0.0.1:8000/privatebase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "127.0.0.1:8000",
-				Official: false,
-			},
-			RemoteName:    "privatebase",
-			LocalName:     "127.0.0.1:8000/privatebase",
-			CanonicalName: "127.0.0.1:8000/privatebase",
-			Official:      false,
-		},
-		"localhost:8000/private/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "localhost:8000",
-				Official: false,
-			},
-			RemoteName:    "private/moonbase",
-			LocalName:     "localhost:8000/private/moonbase",
-			CanonicalName: "localhost:8000/private/moonbase",
-			Official:      false,
-		},
-		"localhost:8000/privatebase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "localhost:8000",
-				Official: false,
-			},
-			RemoteName:    "privatebase",
-			LocalName:     "localhost:8000/privatebase",
-			CanonicalName: "localhost:8000/privatebase",
-			Official:      false,
-		},
-		"example.com/private/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "example.com",
-				Official: false,
-			},
-			RemoteName:    "private/moonbase",
-			LocalName:     "example.com/private/moonbase",
-			CanonicalName: "example.com/private/moonbase",
-			Official:      false,
-		},
-		"example.com/privatebase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "example.com",
-				Official: false,
-			},
-			RemoteName:    "privatebase",
-			LocalName:     "example.com/privatebase",
-			CanonicalName: "example.com/privatebase",
-			Official:      false,
-		},
-		"example.com:8000/private/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "example.com:8000",
-				Official: false,
-			},
-			RemoteName:    "private/moonbase",
-			LocalName:     "example.com:8000/private/moonbase",
-			CanonicalName: "example.com:8000/private/moonbase",
-			Official:      false,
-		},
-		"example.com:8000/privatebase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "example.com:8000",
-				Official: false,
-			},
-			RemoteName:    "privatebase",
-			LocalName:     "example.com:8000/privatebase",
-			CanonicalName: "example.com:8000/privatebase",
-			Official:      false,
-		},
-		"localhost/private/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "localhost",
-				Official: false,
-			},
-			RemoteName:    "private/moonbase",
-			LocalName:     "localhost/private/moonbase",
-			CanonicalName: "localhost/private/moonbase",
-			Official:      false,
-		},
-		"localhost/privatebase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     "localhost",
-				Official: false,
-			},
-			RemoteName:    "privatebase",
-			LocalName:     "localhost/privatebase",
-			CanonicalName: "localhost/privatebase",
-			Official:      false,
-		},
-		IndexName + "/public/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "public/moonbase",
-			LocalName:     "public/moonbase",
-			CanonicalName: "docker.io/public/moonbase",
-			Official:      false,
-		},
-		"index." + IndexName + "/public/moonbase": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "public/moonbase",
-			LocalName:     "public/moonbase",
-			CanonicalName: "docker.io/public/moonbase",
-			Official:      false,
-		},
-		"ubuntu-12.04-base": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "library/ubuntu-12.04-base",
-			LocalName:     "ubuntu-12.04-base",
-			CanonicalName: "docker.io/library/ubuntu-12.04-base",
-			Official:      true,
-		},
-		IndexName + "/ubuntu-12.04-base": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "library/ubuntu-12.04-base",
-			LocalName:     "ubuntu-12.04-base",
-			CanonicalName: "docker.io/library/ubuntu-12.04-base",
-			Official:      true,
-		},
-		"index." + IndexName + "/ubuntu-12.04-base": {
-			Index: &registrytypes.IndexInfo{
-				Name:     IndexName,
-				Official: true,
-			},
-			RemoteName:    "library/ubuntu-12.04-base",
-			LocalName:     "ubuntu-12.04-base",
-			CanonicalName: "docker.io/library/ubuntu-12.04-base",
-			Official:      true,
-		},
-	}
-
-	for reposName, expectedRepoInfo := range expectedRepoInfos {
-		named, err := reference.WithName(reposName)
-		if err != nil {
-			t.Error(err)
-		}
-
-		repoInfo, err := ParseRepositoryInfo(named)
-		if err != nil {
-			t.Error(err)
-		} else {
-			checkEqual(t, repoInfo.Index.Name, expectedRepoInfo.Index.Name, reposName)
-			checkEqual(t, repoInfo.RemoteName(), expectedRepoInfo.RemoteName, reposName)
-			checkEqual(t, repoInfo.Name(), expectedRepoInfo.LocalName, reposName)
-			checkEqual(t, repoInfo.FullName(), expectedRepoInfo.CanonicalName, reposName)
-			checkEqual(t, repoInfo.Index.Official, expectedRepoInfo.Index.Official, reposName)
-			checkEqual(t, repoInfo.Official, expectedRepoInfo.Official, reposName)
-		}
-	}
-}
-
-func TestNewIndexInfo(t *testing.T) {
-	testIndexInfo := func(config *serviceConfig, expectedIndexInfos map[string]*registrytypes.IndexInfo) {
-		for indexName, expectedIndexInfo := range expectedIndexInfos {
-			index, err := newIndexInfo(config, indexName)
-			if err != nil {
-				t.Fatal(err)
-			} else {
-				checkEqual(t, index.Name, expectedIndexInfo.Name, indexName+" name")
-				checkEqual(t, index.Official, expectedIndexInfo.Official, indexName+" is official")
-				checkEqual(t, index.Secure, expectedIndexInfo.Secure, indexName+" is secure")
-				checkEqual(t, len(index.Mirrors), len(expectedIndexInfo.Mirrors), indexName+" mirrors")
-			}
-		}
-	}
-
-	config := newServiceConfig(ServiceOptions{})
-	noMirrors := []string{}
-	expectedIndexInfos := map[string]*registrytypes.IndexInfo{
-		IndexName: {
-			Name:     IndexName,
-			Official: true,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-		"index." + IndexName: {
-			Name:     IndexName,
-			Official: true,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-		"example.com": {
-			Name:     "example.com",
-			Official: false,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-		"127.0.0.1:5000": {
-			Name:     "127.0.0.1:5000",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-	}
-	testIndexInfo(config, expectedIndexInfos)
-
-	publicMirrors := []string{"http://mirror1.local", "http://mirror2.local"}
-	config = makeServiceConfig(publicMirrors, []string{"example.com"})
-
-	expectedIndexInfos = map[string]*registrytypes.IndexInfo{
-		IndexName: {
-			Name:     IndexName,
-			Official: true,
-			Secure:   true,
-			Mirrors:  publicMirrors,
-		},
-		"index." + IndexName: {
-			Name:     IndexName,
-			Official: true,
-			Secure:   true,
-			Mirrors:  publicMirrors,
-		},
-		"example.com": {
-			Name:     "example.com",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"example.com:5000": {
-			Name:     "example.com:5000",
-			Official: false,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-		"127.0.0.1": {
-			Name:     "127.0.0.1",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"127.0.0.1:5000": {
-			Name:     "127.0.0.1:5000",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"other.com": {
-			Name:     "other.com",
-			Official: false,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-	}
-	testIndexInfo(config, expectedIndexInfos)
-
-	config = makeServiceConfig(nil, []string{"42.42.0.0/16"})
-	expectedIndexInfos = map[string]*registrytypes.IndexInfo{
-		"example.com": {
-			Name:     "example.com",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"example.com:5000": {
-			Name:     "example.com:5000",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"127.0.0.1": {
-			Name:     "127.0.0.1",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"127.0.0.1:5000": {
-			Name:     "127.0.0.1:5000",
-			Official: false,
-			Secure:   false,
-			Mirrors:  noMirrors,
-		},
-		"other.com": {
-			Name:     "other.com",
-			Official: false,
-			Secure:   true,
-			Mirrors:  noMirrors,
-		},
-	}
-	testIndexInfo(config, expectedIndexInfos)
-}
-
-func TestMirrorEndpointLookup(t *testing.T) {
-	containsMirror := func(endpoints []APIEndpoint) bool {
-		for _, pe := range endpoints {
-			if pe.URL.Host == "my.mirror" {
-				return true
-			}
-		}
-		return false
-	}
-	s := DefaultService{config: makeServiceConfig([]string{"my.mirror"}, nil)}
-
-	imageName, err := reference.WithName(IndexName + "/test/image")
-	if err != nil {
-		t.Error(err)
-	}
-	pushAPIEndpoints, err := s.LookupPushEndpoints(imageName.Hostname())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if containsMirror(pushAPIEndpoints) {
-		t.Fatal("Push endpoint should not contain mirror")
-	}
-
-	pullAPIEndpoints, err := s.LookupPullEndpoints(imageName.Hostname())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !containsMirror(pullAPIEndpoints) {
-		t.Fatal("Pull endpoint should contain mirror")
-	}
-}
-
-func TestPushRegistryTag(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	repoRef, err := reference.ParseNamed(REPO)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = r.PushRegistryTag(repoRef, imageID, "stable", makeURL("/v1/"))
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestPushImageJSONIndex(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	imgData := []*ImgData{
-		{
-			ID:       "77dbf71da1d00e3fbddc480176eac8994025630c6590d11cfc8fe1209c2a1d20",
-			Checksum: "sha256:1ac330d56e05eef6d438586545ceff7550d3bdcb6b19961f12c5ba714ee1bb37",
-		},
-		{
-			ID:       "42d718c941f5c532ac049bf0b0ab53f0062f09a03afd4aa4a02c098e46032b9d",
-			Checksum: "sha256:bea7bf2e4bacd479344b737328db47b18880d09096e6674165533aa994f5e9f2",
-		},
-	}
-	repoRef, err := reference.ParseNamed(REPO)
-	if err != nil {
-		t.Fatal(err)
-	}
-	repoData, err := r.PushImageJSONIndex(repoRef, imgData, false, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if repoData == nil {
-		t.Fatal("Expected RepositoryData object")
-	}
-	repoData, err = r.PushImageJSONIndex(repoRef, imgData, true, []string{r.indexEndpoint.String()})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if repoData == nil {
-		t.Fatal("Expected RepositoryData object")
-	}
-}
-
-func TestSearchRepositories(t *testing.T) {
-	r := spawnTestRegistrySession(t)
-	results, err := r.SearchRepositories("fakequery", 25)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if results == nil {
-		t.Fatal("Expected non-nil SearchResults object")
-	}
-	assertEqual(t, results.NumResults, 1, "Expected 1 search results")
-	assertEqual(t, results.Query, "fakequery", "Expected 'fakequery' as query")
-	assertEqual(t, results.Results[0].StarCount, 42, "Expected 'fakeimage' to have 42 stars")
-}
-
-func TestTrustedLocation(t *testing.T) {
-	for _, url := range []string{"http://example.com", "https://example.com:7777", "http://docker.io", "http://test.docker.com", "https://fakedocker.com"} {
-		req, _ := http.NewRequest("GET", url, nil)
-		if trustedLocation(req) == true {
-			t.Fatalf("'%s' shouldn't be detected as a trusted location", url)
-		}
-	}
-
-	for _, url := range []string{"https://docker.io", "https://test.docker.com:80"} {
-		req, _ := http.NewRequest("GET", url, nil)
-		if trustedLocation(req) == false {
-			t.Fatalf("'%s' should be detected as a trusted location", url)
-		}
-	}
-}
-
-func TestAddRequiredHeadersToRedirectedRequests(t *testing.T) {
-	for _, urls := range [][]string{
-		{"http://docker.io", "https://docker.com"},
-		{"https://foo.docker.io:7777", "http://bar.docker.com"},
-		{"https://foo.docker.io", "https://example.com"},
-	} {
-		reqFrom, _ := http.NewRequest("GET", urls[0], nil)
-		reqFrom.Header.Add("Content-Type", "application/json")
-		reqFrom.Header.Add("Authorization", "super_secret")
-		reqTo, _ := http.NewRequest("GET", urls[1], nil)
-
-		addRequiredHeadersToRedirectedRequests(reqTo, []*http.Request{reqFrom})
-
-		if len(reqTo.Header) != 1 {
-			t.Fatalf("Expected 1 headers, got %d", len(reqTo.Header))
-		}
-
-		if reqTo.Header.Get("Content-Type") != "application/json" {
-			t.Fatal("'Content-Type' should be 'application/json'")
-		}
-
-		if reqTo.Header.Get("Authorization") != "" {
-			t.Fatal("'Authorization' should be empty")
-		}
-	}
-
-	for _, urls := range [][]string{
-		{"https://docker.io", "https://docker.com"},
-		{"https://foo.docker.io:7777", "https://bar.docker.com"},
-	} {
-		reqFrom, _ := http.NewRequest("GET", urls[0], nil)
-		reqFrom.Header.Add("Content-Type", "application/json")
-		reqFrom.Header.Add("Authorization", "super_secret")
-		reqTo, _ := http.NewRequest("GET", urls[1], nil)
-
-		addRequiredHeadersToRedirectedRequests(reqTo, []*http.Request{reqFrom})
-
-		if len(reqTo.Header) != 2 {
-			t.Fatalf("Expected 2 headers, got %d", len(reqTo.Header))
-		}
-
-		if reqTo.Header.Get("Content-Type") != "application/json" {
-			t.Fatal("'Content-Type' should be 'application/json'")
-		}
-
-		if reqTo.Header.Get("Authorization") != "super_secret" {
-			t.Fatal("'Authorization' should be 'super_secret'")
-		}
-	}
-}
-
-func TestIsSecureIndex(t *testing.T) {
-	tests := []struct {
-		addr               string
-		insecureRegistries []string
-		expected           bool
-	}{
-		{IndexName, nil, true},
-		{"example.com", []string{}, true},
-		{"example.com", []string{"example.com"}, false},
-		{"localhost", []string{"localhost:5000"}, false},
-		{"localhost:5000", []string{"localhost:5000"}, false},
-		{"localhost", []string{"example.com"}, false},
-		{"127.0.0.1:5000", []string{"127.0.0.1:5000"}, false},
-		{"localhost", nil, false},
-		{"localhost:5000", nil, false},
-		{"127.0.0.1", nil, false},
-		{"localhost", []string{"example.com"}, false},
-		{"127.0.0.1", []string{"example.com"}, false},
-		{"example.com", nil, true},
-		{"example.com", []string{"example.com"}, false},
-		{"127.0.0.1", []string{"example.com"}, false},
-		{"127.0.0.1:5000", []string{"example.com"}, false},
-		{"example.com:5000", []string{"42.42.0.0/16"}, false},
-		{"example.com", []string{"42.42.0.0/16"}, false},
-		{"example.com:5000", []string{"42.42.42.42/8"}, false},
-		{"127.0.0.1:5000", []string{"127.0.0.0/8"}, false},
-		{"42.42.42.42:5000", []string{"42.1.1.1/8"}, false},
-		{"invalid.domain.com", []string{"42.42.0.0/16"}, true},
-		{"invalid.domain.com", []string{"invalid.domain.com"}, false},
-		{"invalid.domain.com:5000", []string{"invalid.domain.com"}, true},
-		{"invalid.domain.com:5000", []string{"invalid.domain.com:5000"}, false},
-	}
-	for _, tt := range tests {
-		config := makeServiceConfig(nil, tt.insecureRegistries)
-		if sec := isSecureIndex(config, tt.addr); sec != tt.expected {
-			t.Errorf("isSecureIndex failed for %q %v, expected %v got %v", tt.addr, tt.insecureRegistries, tt.expected, sec)
-		}
-	}
-}
-
-type debugTransport struct {
-	http.RoundTripper
-	log func(...interface{})
-}
-
-func (tr debugTransport) RoundTrip(req *http.Request) (*http.Response, error) {
-	dump, err := httputil.DumpRequestOut(req, false)
-	if err != nil {
-		tr.log("could not dump request")
-	}
-	tr.log(string(dump))
-	resp, err := tr.RoundTripper.RoundTrip(req)
-	if err != nil {
-		return nil, err
-	}
-	dump, err = httputil.DumpResponse(resp, false)
-	if err != nil {
-		tr.log("could not dump response")
-	}
-	tr.log(string(dump))
-	return resp, err
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/service.go b/installer/vendor/github.com/docker/docker/registry/service.go
deleted file mode 100644
index 596a9c7e5f..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/service.go
+++ /dev/null
@@ -1,304 +0,0 @@
-package registry
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/client/auth"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/reference"
-)
-
-const (
-	// DefaultSearchLimit is the default value for maximum number of returned search results.
-	DefaultSearchLimit = 25
-)
-
-// Service is the interface defining what a registry service should implement.
-type Service interface {
-	Auth(ctx context.Context, authConfig *types.AuthConfig, userAgent string) (status, token string, err error)
-	LookupPullEndpoints(hostname string) (endpoints []APIEndpoint, err error)
-	LookupPushEndpoints(hostname string) (endpoints []APIEndpoint, err error)
-	ResolveRepository(name reference.Named) (*RepositoryInfo, error)
-	Search(ctx context.Context, term string, limit int, authConfig *types.AuthConfig, userAgent string, headers map[string][]string) (*registrytypes.SearchResults, error)
-	ServiceConfig() *registrytypes.ServiceConfig
-	TLSConfig(hostname string) (*tls.Config, error)
-	LoadInsecureRegistries([]string) error
-}
-
-// DefaultService is a registry service. It tracks configuration data such as a list
-// of mirrors.
-type DefaultService struct {
-	config *serviceConfig
-	mu     sync.Mutex
-}
-
-// NewService returns a new instance of DefaultService ready to be
-// installed into an engine.
-func NewService(options ServiceOptions) *DefaultService {
-	return &DefaultService{
-		config: newServiceConfig(options),
-	}
-}
-
-// ServiceConfig returns the public registry service configuration.
-func (s *DefaultService) ServiceConfig() *registrytypes.ServiceConfig {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	servConfig := registrytypes.ServiceConfig{
-		InsecureRegistryCIDRs: make([]*(registrytypes.NetIPNet), 0),
-		IndexConfigs:          make(map[string]*(registrytypes.IndexInfo)),
-		Mirrors:               make([]string, 0),
-	}
-
-	// construct a new ServiceConfig which will not retrieve s.Config directly,
-	// and look up items in s.config with mu locked
-	servConfig.InsecureRegistryCIDRs = append(servConfig.InsecureRegistryCIDRs, s.config.ServiceConfig.InsecureRegistryCIDRs...)
-
-	for key, value := range s.config.ServiceConfig.IndexConfigs {
-		servConfig.IndexConfigs[key] = value
-	}
-
-	servConfig.Mirrors = append(servConfig.Mirrors, s.config.ServiceConfig.Mirrors...)
-
-	return &servConfig
-}
-
-// LoadInsecureRegistries loads insecure registries for Service
-func (s *DefaultService) LoadInsecureRegistries(registries []string) error {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	return s.config.LoadInsecureRegistries(registries)
-}
-
-// Auth contacts the public registry with the provided credentials,
-// and returns OK if authentication was successful.
-// It can be used to verify the validity of a client's credentials.
-func (s *DefaultService) Auth(ctx context.Context, authConfig *types.AuthConfig, userAgent string) (status, token string, err error) {
-	// TODO Use ctx when searching for repositories
-	serverAddress := authConfig.ServerAddress
-	if serverAddress == "" {
-		serverAddress = IndexServer
-	}
-	if !strings.HasPrefix(serverAddress, "https://") && !strings.HasPrefix(serverAddress, "http://") {
-		serverAddress = "https://" + serverAddress
-	}
-	u, err := url.Parse(serverAddress)
-	if err != nil {
-		return "", "", fmt.Errorf("unable to parse server address: %v", err)
-	}
-
-	endpoints, err := s.LookupPushEndpoints(u.Host)
-	if err != nil {
-		return "", "", err
-	}
-
-	for _, endpoint := range endpoints {
-		login := loginV2
-		if endpoint.Version == APIVersion1 {
-			login = loginV1
-		}
-
-		status, token, err = login(authConfig, endpoint, userAgent)
-		if err == nil {
-			return
-		}
-		if fErr, ok := err.(fallbackError); ok {
-			err = fErr.err
-			logrus.Infof("Error logging in to %s endpoint, trying next endpoint: %v", endpoint.Version, err)
-			continue
-		}
-		return "", "", err
-	}
-
-	return "", "", err
-}
-
-// splitReposSearchTerm breaks a search term into an index name and remote name
-func splitReposSearchTerm(reposName string) (string, string) {
-	nameParts := strings.SplitN(reposName, "/", 2)
-	var indexName, remoteName string
-	if len(nameParts) == 1 || (!strings.Contains(nameParts[0], ".") &&
-		!strings.Contains(nameParts[0], ":") && nameParts[0] != "localhost") {
-		// This is a Docker Index repos (ex: samalba/hipache or ubuntu)
-		// 'docker.io'
-		indexName = IndexName
-		remoteName = reposName
-	} else {
-		indexName = nameParts[0]
-		remoteName = nameParts[1]
-	}
-	return indexName, remoteName
-}
-
-// Search queries the public registry for images matching the specified
-// search terms, and returns the results.
-func (s *DefaultService) Search(ctx context.Context, term string, limit int, authConfig *types.AuthConfig, userAgent string, headers map[string][]string) (*registrytypes.SearchResults, error) {
-	// TODO Use ctx when searching for repositories
-	if err := validateNoScheme(term); err != nil {
-		return nil, err
-	}
-
-	indexName, remoteName := splitReposSearchTerm(term)
-
-	// Search is a long-running operation, just lock s.config to avoid block others.
-	s.mu.Lock()
-	index, err := newIndexInfo(s.config, indexName)
-	s.mu.Unlock()
-
-	if err != nil {
-		return nil, err
-	}
-
-	// *TODO: Search multiple indexes.
-	endpoint, err := NewV1Endpoint(index, userAgent, http.Header(headers))
-	if err != nil {
-		return nil, err
-	}
-
-	var client *http.Client
-	if authConfig != nil && authConfig.IdentityToken != "" && authConfig.Username != "" {
-		creds := NewStaticCredentialStore(authConfig)
-		scopes := []auth.Scope{
-			auth.RegistryScope{
-				Name:    "catalog",
-				Actions: []string{"search"},
-			},
-		}
-
-		modifiers := DockerHeaders(userAgent, nil)
-		v2Client, foundV2, err := v2AuthHTTPClient(endpoint.URL, endpoint.client.Transport, modifiers, creds, scopes)
-		if err != nil {
-			if fErr, ok := err.(fallbackError); ok {
-				logrus.Errorf("Cannot use identity token for search, v2 auth not supported: %v", fErr.err)
-			} else {
-				return nil, err
-			}
-		} else if foundV2 {
-			// Copy non transport http client features
-			v2Client.Timeout = endpoint.client.Timeout
-			v2Client.CheckRedirect = endpoint.client.CheckRedirect
-			v2Client.Jar = endpoint.client.Jar
-
-			logrus.Debugf("using v2 client for search to %s", endpoint.URL)
-			client = v2Client
-		}
-	}
-
-	if client == nil {
-		client = endpoint.client
-		if err := authorizeClient(client, authConfig, endpoint); err != nil {
-			return nil, err
-		}
-	}
-
-	r := newSession(client, authConfig, endpoint)
-
-	if index.Official {
-		localName := remoteName
-		if strings.HasPrefix(localName, "library/") {
-			// If pull "library/foo", it's stored locally under "foo"
-			localName = strings.SplitN(localName, "/", 2)[1]
-		}
-
-		return r.SearchRepositories(localName, limit)
-	}
-	return r.SearchRepositories(remoteName, limit)
-}
-
-// ResolveRepository splits a repository name into its components
-// and configuration of the associated registry.
-func (s *DefaultService) ResolveRepository(name reference.Named) (*RepositoryInfo, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-	return newRepositoryInfo(s.config, name)
-}
-
-// APIEndpoint represents a remote API endpoint
-type APIEndpoint struct {
-	Mirror       bool
-	URL          *url.URL
-	Version      APIVersion
-	Official     bool
-	TrimHostname bool
-	TLSConfig    *tls.Config
-}
-
-// ToV1Endpoint returns a V1 API endpoint based on the APIEndpoint
-func (e APIEndpoint) ToV1Endpoint(userAgent string, metaHeaders http.Header) (*V1Endpoint, error) {
-	return newV1Endpoint(*e.URL, e.TLSConfig, userAgent, metaHeaders)
-}
-
-// TLSConfig constructs a client TLS configuration based on server defaults
-func (s *DefaultService) TLSConfig(hostname string) (*tls.Config, error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	return newTLSConfig(hostname, isSecureIndex(s.config, hostname))
-}
-
-// tlsConfig constructs a client TLS configuration based on server defaults
-func (s *DefaultService) tlsConfig(hostname string) (*tls.Config, error) {
-	return newTLSConfig(hostname, isSecureIndex(s.config, hostname))
-}
-
-func (s *DefaultService) tlsConfigForMirror(mirrorURL *url.URL) (*tls.Config, error) {
-	return s.tlsConfig(mirrorURL.Host)
-}
-
-// LookupPullEndpoints creates a list of endpoints to try to pull from, in order of preference.
-// It gives preference to v2 endpoints over v1, mirrors over the actual
-// registry, and HTTPS over plain HTTP.
-func (s *DefaultService) LookupPullEndpoints(hostname string) (endpoints []APIEndpoint, err error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	return s.lookupEndpoints(hostname)
-}
-
-// LookupPushEndpoints creates a list of endpoints to try to push to, in order of preference.
-// It gives preference to v2 endpoints over v1, and HTTPS over plain HTTP.
-// Mirrors are not included.
-func (s *DefaultService) LookupPushEndpoints(hostname string) (endpoints []APIEndpoint, err error) {
-	s.mu.Lock()
-	defer s.mu.Unlock()
-
-	allEndpoints, err := s.lookupEndpoints(hostname)
-	if err == nil {
-		for _, endpoint := range allEndpoints {
-			if !endpoint.Mirror {
-				endpoints = append(endpoints, endpoint)
-			}
-		}
-	}
-	return endpoints, err
-}
-
-func (s *DefaultService) lookupEndpoints(hostname string) (endpoints []APIEndpoint, err error) {
-	endpoints, err = s.lookupV2Endpoints(hostname)
-	if err != nil {
-		return nil, err
-	}
-
-	if s.config.V2Only {
-		return endpoints, nil
-	}
-
-	legacyEndpoints, err := s.lookupV1Endpoints(hostname)
-	if err != nil {
-		return nil, err
-	}
-	endpoints = append(endpoints, legacyEndpoints...)
-
-	return endpoints, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/service_v1.go b/installer/vendor/github.com/docker/docker/registry/service_v1.go
deleted file mode 100644
index 1d251aec6e..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/service_v1.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package registry
-
-import "net/url"
-
-func (s *DefaultService) lookupV1Endpoints(hostname string) (endpoints []APIEndpoint, err error) {
-	if hostname == DefaultNamespace || hostname == DefaultV2Registry.Host || hostname == IndexHostname {
-		return []APIEndpoint{}, nil
-	}
-
-	tlsConfig, err := s.tlsConfig(hostname)
-	if err != nil {
-		return nil, err
-	}
-
-	endpoints = []APIEndpoint{
-		{
-			URL: &url.URL{
-				Scheme: "https",
-				Host:   hostname,
-			},
-			Version:      APIVersion1,
-			TrimHostname: true,
-			TLSConfig:    tlsConfig,
-		},
-	}
-
-	if tlsConfig.InsecureSkipVerify {
-		endpoints = append(endpoints, APIEndpoint{ // or this
-			URL: &url.URL{
-				Scheme: "http",
-				Host:   hostname,
-			},
-			Version:      APIVersion1,
-			TrimHostname: true,
-			// used to check if supposed to be secure via InsecureSkipVerify
-			TLSConfig: tlsConfig,
-		})
-	}
-	return endpoints, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/service_v1_test.go b/installer/vendor/github.com/docker/docker/registry/service_v1_test.go
deleted file mode 100644
index bd15dfffb8..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/service_v1_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package registry
-
-import "testing"
-
-func TestLookupV1Endpoints(t *testing.T) {
-	s := NewService(ServiceOptions{})
-
-	cases := []struct {
-		hostname    string
-		expectedLen int
-	}{
-		{"example.com", 1},
-		{DefaultNamespace, 0},
-		{DefaultV2Registry.Host, 0},
-		{IndexHostname, 0},
-	}
-
-	for _, c := range cases {
-		if ret, err := s.lookupV1Endpoints(c.hostname); err != nil || len(ret) != c.expectedLen {
-			t.Errorf("lookupV1Endpoints(`"+c.hostname+"`) returned %+v and %+v", ret, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/service_v2.go b/installer/vendor/github.com/docker/docker/registry/service_v2.go
deleted file mode 100644
index 228d745f8c..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/service_v2.go
+++ /dev/null
@@ -1,78 +0,0 @@
-package registry
-
-import (
-	"net/url"
-	"strings"
-
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-func (s *DefaultService) lookupV2Endpoints(hostname string) (endpoints []APIEndpoint, err error) {
-	tlsConfig := tlsconfig.ServerDefault()
-	if hostname == DefaultNamespace || hostname == IndexHostname {
-		// v2 mirrors
-		for _, mirror := range s.config.Mirrors {
-			if !strings.HasPrefix(mirror, "http://") && !strings.HasPrefix(mirror, "https://") {
-				mirror = "https://" + mirror
-			}
-			mirrorURL, err := url.Parse(mirror)
-			if err != nil {
-				return nil, err
-			}
-			mirrorTLSConfig, err := s.tlsConfigForMirror(mirrorURL)
-			if err != nil {
-				return nil, err
-			}
-			endpoints = append(endpoints, APIEndpoint{
-				URL: mirrorURL,
-				// guess mirrors are v2
-				Version:      APIVersion2,
-				Mirror:       true,
-				TrimHostname: true,
-				TLSConfig:    mirrorTLSConfig,
-			})
-		}
-		// v2 registry
-		endpoints = append(endpoints, APIEndpoint{
-			URL:          DefaultV2Registry,
-			Version:      APIVersion2,
-			Official:     true,
-			TrimHostname: true,
-			TLSConfig:    tlsConfig,
-		})
-
-		return endpoints, nil
-	}
-
-	tlsConfig, err = s.tlsConfig(hostname)
-	if err != nil {
-		return nil, err
-	}
-
-	endpoints = []APIEndpoint{
-		{
-			URL: &url.URL{
-				Scheme: "https",
-				Host:   hostname,
-			},
-			Version:      APIVersion2,
-			TrimHostname: true,
-			TLSConfig:    tlsConfig,
-		},
-	}
-
-	if tlsConfig.InsecureSkipVerify {
-		endpoints = append(endpoints, APIEndpoint{
-			URL: &url.URL{
-				Scheme: "http",
-				Host:   hostname,
-			},
-			Version:      APIVersion2,
-			TrimHostname: true,
-			// used to check if supposed to be secure via InsecureSkipVerify
-			TLSConfig: tlsConfig,
-		})
-	}
-
-	return endpoints, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/session.go b/installer/vendor/github.com/docker/docker/registry/session.go
deleted file mode 100644
index 72e286ab44..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/session.go
+++ /dev/null
@@ -1,783 +0,0 @@
-package registry
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"errors"
-	"sync"
-	// this is required for some certificates
-	_ "crypto/sha512"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/cookiejar"
-	"net/url"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/distribution/registry/api/errcode"
-	"github.com/docker/docker/api/types"
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/pkg/httputils"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/tarsum"
-	"github.com/docker/docker/reference"
-)
-
-var (
-	// ErrRepoNotFound is returned if the repository didn't exist on the
-	// remote side
-	ErrRepoNotFound = errors.New("Repository not found")
-)
-
-// A Session is used to communicate with a V1 registry
-type Session struct {
-	indexEndpoint *V1Endpoint
-	client        *http.Client
-	// TODO(tiborvass): remove authConfig
-	authConfig *types.AuthConfig
-	id         string
-}
-
-type authTransport struct {
-	http.RoundTripper
-	*types.AuthConfig
-
-	alwaysSetBasicAuth bool
-	token              []string
-
-	mu     sync.Mutex                      // guards modReq
-	modReq map[*http.Request]*http.Request // original -> modified
-}
-
-// AuthTransport handles the auth layer when communicating with a v1 registry (private or official)
-//
-// For private v1 registries, set alwaysSetBasicAuth to true.
-//
-// For the official v1 registry, if there isn't already an Authorization header in the request,
-// but there is an X-Docker-Token header set to true, then Basic Auth will be used to set the Authorization header.
-// After sending the request with the provided base http.RoundTripper, if an X-Docker-Token header, representing
-// a token, is present in the response, then it gets cached and sent in the Authorization header of all subsequent
-// requests.
-//
-// If the server sends a token without the client having requested it, it is ignored.
-//
-// This RoundTripper also has a CancelRequest method important for correct timeout handling.
-func AuthTransport(base http.RoundTripper, authConfig *types.AuthConfig, alwaysSetBasicAuth bool) http.RoundTripper {
-	if base == nil {
-		base = http.DefaultTransport
-	}
-	return &authTransport{
-		RoundTripper:       base,
-		AuthConfig:         authConfig,
-		alwaysSetBasicAuth: alwaysSetBasicAuth,
-		modReq:             make(map[*http.Request]*http.Request),
-	}
-}
-
-// cloneRequest returns a clone of the provided *http.Request.
-// The clone is a shallow copy of the struct and its Header map.
-func cloneRequest(r *http.Request) *http.Request {
-	// shallow copy of the struct
-	r2 := new(http.Request)
-	*r2 = *r
-	// deep copy of the Header
-	r2.Header = make(http.Header, len(r.Header))
-	for k, s := range r.Header {
-		r2.Header[k] = append([]string(nil), s...)
-	}
-
-	return r2
-}
-
-// RoundTrip changes an HTTP request's headers to add the necessary
-// authentication-related headers
-func (tr *authTransport) RoundTrip(orig *http.Request) (*http.Response, error) {
-	// Authorization should not be set on 302 redirect for untrusted locations.
-	// This logic mirrors the behavior in addRequiredHeadersToRedirectedRequests.
-	// As the authorization logic is currently implemented in RoundTrip,
-	// a 302 redirect is detected by looking at the Referrer header as go http package adds said header.
-	// This is safe as Docker doesn't set Referrer in other scenarios.
-	if orig.Header.Get("Referer") != "" && !trustedLocation(orig) {
-		return tr.RoundTripper.RoundTrip(orig)
-	}
-
-	req := cloneRequest(orig)
-	tr.mu.Lock()
-	tr.modReq[orig] = req
-	tr.mu.Unlock()
-
-	if tr.alwaysSetBasicAuth {
-		if tr.AuthConfig == nil {
-			return nil, errors.New("unexpected error: empty auth config")
-		}
-		req.SetBasicAuth(tr.Username, tr.Password)
-		return tr.RoundTripper.RoundTrip(req)
-	}
-
-	// Don't override
-	if req.Header.Get("Authorization") == "" {
-		if req.Header.Get("X-Docker-Token") == "true" && tr.AuthConfig != nil && len(tr.Username) > 0 {
-			req.SetBasicAuth(tr.Username, tr.Password)
-		} else if len(tr.token) > 0 {
-			req.Header.Set("Authorization", "Token "+strings.Join(tr.token, ","))
-		}
-	}
-	resp, err := tr.RoundTripper.RoundTrip(req)
-	if err != nil {
-		delete(tr.modReq, orig)
-		return nil, err
-	}
-	if len(resp.Header["X-Docker-Token"]) > 0 {
-		tr.token = resp.Header["X-Docker-Token"]
-	}
-	resp.Body = &ioutils.OnEOFReader{
-		Rc: resp.Body,
-		Fn: func() {
-			tr.mu.Lock()
-			delete(tr.modReq, orig)
-			tr.mu.Unlock()
-		},
-	}
-	return resp, nil
-}
-
-// CancelRequest cancels an in-flight request by closing its connection.
-func (tr *authTransport) CancelRequest(req *http.Request) {
-	type canceler interface {
-		CancelRequest(*http.Request)
-	}
-	if cr, ok := tr.RoundTripper.(canceler); ok {
-		tr.mu.Lock()
-		modReq := tr.modReq[req]
-		delete(tr.modReq, req)
-		tr.mu.Unlock()
-		cr.CancelRequest(modReq)
-	}
-}
-
-func authorizeClient(client *http.Client, authConfig *types.AuthConfig, endpoint *V1Endpoint) error {
-	var alwaysSetBasicAuth bool
-
-	// If we're working with a standalone private registry over HTTPS, send Basic Auth headers
-	// alongside all our requests.
-	if endpoint.String() != IndexServer && endpoint.URL.Scheme == "https" {
-		info, err := endpoint.Ping()
-		if err != nil {
-			return err
-		}
-		if info.Standalone && authConfig != nil {
-			logrus.Debugf("Endpoint %s is eligible for private registry. Enabling decorator.", endpoint.String())
-			alwaysSetBasicAuth = true
-		}
-	}
-
-	// Annotate the transport unconditionally so that v2 can
-	// properly fallback on v1 when an image is not found.
-	client.Transport = AuthTransport(client.Transport, authConfig, alwaysSetBasicAuth)
-
-	jar, err := cookiejar.New(nil)
-	if err != nil {
-		return errors.New("cookiejar.New is not supposed to return an error")
-	}
-	client.Jar = jar
-
-	return nil
-}
-
-func newSession(client *http.Client, authConfig *types.AuthConfig, endpoint *V1Endpoint) *Session {
-	return &Session{
-		authConfig:    authConfig,
-		client:        client,
-		indexEndpoint: endpoint,
-		id:            stringid.GenerateRandomID(),
-	}
-}
-
-// NewSession creates a new session
-// TODO(tiborvass): remove authConfig param once registry client v2 is vendored
-func NewSession(client *http.Client, authConfig *types.AuthConfig, endpoint *V1Endpoint) (*Session, error) {
-	if err := authorizeClient(client, authConfig, endpoint); err != nil {
-		return nil, err
-	}
-
-	return newSession(client, authConfig, endpoint), nil
-}
-
-// ID returns this registry session's ID.
-func (r *Session) ID() string {
-	return r.id
-}
-
-// GetRemoteHistory retrieves the history of a given image from the registry.
-// It returns a list of the parent's JSON files (including the requested image).
-func (r *Session) GetRemoteHistory(imgID, registry string) ([]string, error) {
-	res, err := r.client.Get(registry + "images/" + imgID + "/ancestry")
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != 200 {
-		if res.StatusCode == 401 {
-			return nil, errcode.ErrorCodeUnauthorized.WithArgs()
-		}
-		return nil, httputils.NewHTTPRequestError(fmt.Sprintf("Server error: %d trying to fetch remote history for %s", res.StatusCode, imgID), res)
-	}
-
-	var history []string
-	if err := json.NewDecoder(res.Body).Decode(&history); err != nil {
-		return nil, fmt.Errorf("Error while reading the http response: %v", err)
-	}
-
-	logrus.Debugf("Ancestry: %v", history)
-	return history, nil
-}
-
-// LookupRemoteImage checks if an image exists in the registry
-func (r *Session) LookupRemoteImage(imgID, registry string) error {
-	res, err := r.client.Get(registry + "images/" + imgID + "/json")
-	if err != nil {
-		return err
-	}
-	res.Body.Close()
-	if res.StatusCode != 200 {
-		return httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d", res.StatusCode), res)
-	}
-	return nil
-}
-
-// GetRemoteImageJSON retrieves an image's JSON metadata from the registry.
-func (r *Session) GetRemoteImageJSON(imgID, registry string) ([]byte, int64, error) {
-	res, err := r.client.Get(registry + "images/" + imgID + "/json")
-	if err != nil {
-		return nil, -1, fmt.Errorf("Failed to download json: %s", err)
-	}
-	defer res.Body.Close()
-	if res.StatusCode != 200 {
-		return nil, -1, httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d", res.StatusCode), res)
-	}
-	// if the size header is not present, then set it to '-1'
-	imageSize := int64(-1)
-	if hdr := res.Header.Get("X-Docker-Size"); hdr != "" {
-		imageSize, err = strconv.ParseInt(hdr, 10, 64)
-		if err != nil {
-			return nil, -1, err
-		}
-	}
-
-	jsonString, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return nil, -1, fmt.Errorf("Failed to parse downloaded json: %v (%s)", err, jsonString)
-	}
-	return jsonString, imageSize, nil
-}
-
-// GetRemoteImageLayer retrieves an image layer from the registry
-func (r *Session) GetRemoteImageLayer(imgID, registry string, imgSize int64) (io.ReadCloser, error) {
-	var (
-		statusCode = 0
-		res        *http.Response
-		err        error
-		imageURL   = fmt.Sprintf("%simages/%s/layer", registry, imgID)
-	)
-
-	req, err := http.NewRequest("GET", imageURL, nil)
-	if err != nil {
-		return nil, fmt.Errorf("Error while getting from the server: %v", err)
-	}
-	statusCode = 0
-	res, err = r.client.Do(req)
-	if err != nil {
-		logrus.Debugf("Error contacting registry %s: %v", registry, err)
-		// the only case err != nil && res != nil is https://golang.org/src/net/http/client.go#L515
-		if res != nil {
-			if res.Body != nil {
-				res.Body.Close()
-			}
-			statusCode = res.StatusCode
-		}
-		return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
-			statusCode, imgID)
-	}
-
-	if res.StatusCode != 200 {
-		res.Body.Close()
-		return nil, fmt.Errorf("Server error: Status %d while fetching image layer (%s)",
-			res.StatusCode, imgID)
-	}
-
-	if res.Header.Get("Accept-Ranges") == "bytes" && imgSize > 0 {
-		logrus.Debug("server supports resume")
-		return httputils.ResumableRequestReaderWithInitialResponse(r.client, req, 5, imgSize, res), nil
-	}
-	logrus.Debug("server doesn't support resume")
-	return res.Body, nil
-}
-
-// GetRemoteTag retrieves the tag named in the askedTag argument from the given
-// repository. It queries each of the registries supplied in the registries
-// argument, and returns data from the first one that answers the query
-// successfully.
-func (r *Session) GetRemoteTag(registries []string, repositoryRef reference.Named, askedTag string) (string, error) {
-	repository := repositoryRef.RemoteName()
-
-	if strings.Count(repository, "/") == 0 {
-		// This will be removed once the registry supports auto-resolution on
-		// the "library" namespace
-		repository = "library/" + repository
-	}
-	for _, host := range registries {
-		endpoint := fmt.Sprintf("%srepositories/%s/tags/%s", host, repository, askedTag)
-		res, err := r.client.Get(endpoint)
-		if err != nil {
-			return "", err
-		}
-
-		logrus.Debugf("Got status code %d from %s", res.StatusCode, endpoint)
-		defer res.Body.Close()
-
-		if res.StatusCode == 404 {
-			return "", ErrRepoNotFound
-		}
-		if res.StatusCode != 200 {
-			continue
-		}
-
-		var tagID string
-		if err := json.NewDecoder(res.Body).Decode(&tagID); err != nil {
-			return "", err
-		}
-		return tagID, nil
-	}
-	return "", fmt.Errorf("Could not reach any registry endpoint")
-}
-
-// GetRemoteTags retrieves all tags from the given repository. It queries each
-// of the registries supplied in the registries argument, and returns data from
-// the first one that answers the query successfully. It returns a map with
-// tag names as the keys and image IDs as the values.
-func (r *Session) GetRemoteTags(registries []string, repositoryRef reference.Named) (map[string]string, error) {
-	repository := repositoryRef.RemoteName()
-
-	if strings.Count(repository, "/") == 0 {
-		// This will be removed once the registry supports auto-resolution on
-		// the "library" namespace
-		repository = "library/" + repository
-	}
-	for _, host := range registries {
-		endpoint := fmt.Sprintf("%srepositories/%s/tags", host, repository)
-		res, err := r.client.Get(endpoint)
-		if err != nil {
-			return nil, err
-		}
-
-		logrus.Debugf("Got status code %d from %s", res.StatusCode, endpoint)
-		defer res.Body.Close()
-
-		if res.StatusCode == 404 {
-			return nil, ErrRepoNotFound
-		}
-		if res.StatusCode != 200 {
-			continue
-		}
-
-		result := make(map[string]string)
-		if err := json.NewDecoder(res.Body).Decode(&result); err != nil {
-			return nil, err
-		}
-		return result, nil
-	}
-	return nil, fmt.Errorf("Could not reach any registry endpoint")
-}
-
-func buildEndpointsList(headers []string, indexEp string) ([]string, error) {
-	var endpoints []string
-	parsedURL, err := url.Parse(indexEp)
-	if err != nil {
-		return nil, err
-	}
-	var urlScheme = parsedURL.Scheme
-	// The registry's URL scheme has to match the Index'
-	for _, ep := range headers {
-		epList := strings.Split(ep, ",")
-		for _, epListElement := range epList {
-			endpoints = append(
-				endpoints,
-				fmt.Sprintf("%s://%s/v1/", urlScheme, strings.TrimSpace(epListElement)))
-		}
-	}
-	return endpoints, nil
-}
-
-// GetRepositoryData returns lists of images and endpoints for the repository
-func (r *Session) GetRepositoryData(name reference.Named) (*RepositoryData, error) {
-	repositoryTarget := fmt.Sprintf("%srepositories/%s/images", r.indexEndpoint.String(), name.RemoteName())
-
-	logrus.Debugf("[registry] Calling GET %s", repositoryTarget)
-
-	req, err := http.NewRequest("GET", repositoryTarget, nil)
-	if err != nil {
-		return nil, err
-	}
-	// this will set basic auth in r.client.Transport and send cached X-Docker-Token headers for all subsequent requests
-	req.Header.Set("X-Docker-Token", "true")
-	res, err := r.client.Do(req)
-	if err != nil {
-		// check if the error is because of i/o timeout
-		// and return a non-obtuse error message for users
-		// "Get https://index.docker.io/v1/repositories/library/busybox/images: i/o timeout"
-		// was a top search on the docker user forum
-		if isTimeout(err) {
-			return nil, fmt.Errorf("Network timed out while trying to connect to %s. You may want to check your internet connection or if you are behind a proxy.", repositoryTarget)
-		}
-		return nil, fmt.Errorf("Error while pulling image: %v", err)
-	}
-	defer res.Body.Close()
-	if res.StatusCode == 401 {
-		return nil, errcode.ErrorCodeUnauthorized.WithArgs()
-	}
-	// TODO: Right now we're ignoring checksums in the response body.
-	// In the future, we need to use them to check image validity.
-	if res.StatusCode == 404 {
-		return nil, httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code: %d", res.StatusCode), res)
-	} else if res.StatusCode != 200 {
-		errBody, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			logrus.Debugf("Error reading response body: %s", err)
-		}
-		return nil, httputils.NewHTTPRequestError(fmt.Sprintf("Error: Status %d trying to pull repository %s: %q", res.StatusCode, name.RemoteName(), errBody), res)
-	}
-
-	var endpoints []string
-	if res.Header.Get("X-Docker-Endpoints") != "" {
-		endpoints, err = buildEndpointsList(res.Header["X-Docker-Endpoints"], r.indexEndpoint.String())
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		// Assume the endpoint is on the same host
-		endpoints = append(endpoints, fmt.Sprintf("%s://%s/v1/", r.indexEndpoint.URL.Scheme, req.URL.Host))
-	}
-
-	remoteChecksums := []*ImgData{}
-	if err := json.NewDecoder(res.Body).Decode(&remoteChecksums); err != nil {
-		return nil, err
-	}
-
-	// Forge a better object from the retrieved data
-	imgsData := make(map[string]*ImgData, len(remoteChecksums))
-	for _, elem := range remoteChecksums {
-		imgsData[elem.ID] = elem
-	}
-
-	return &RepositoryData{
-		ImgList:   imgsData,
-		Endpoints: endpoints,
-	}, nil
-}
-
-// PushImageChecksumRegistry uploads checksums for an image
-func (r *Session) PushImageChecksumRegistry(imgData *ImgData, registry string) error {
-	u := registry + "images/" + imgData.ID + "/checksum"
-
-	logrus.Debugf("[registry] Calling PUT %s", u)
-
-	req, err := http.NewRequest("PUT", u, nil)
-	if err != nil {
-		return err
-	}
-	req.Header.Set("X-Docker-Checksum", imgData.Checksum)
-	req.Header.Set("X-Docker-Checksum-Payload", imgData.ChecksumPayload)
-
-	res, err := r.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("Failed to upload metadata: %v", err)
-	}
-	defer res.Body.Close()
-	if len(res.Cookies()) > 0 {
-		r.client.Jar.SetCookies(req.URL, res.Cookies())
-	}
-	if res.StatusCode != 200 {
-		errBody, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("HTTP code %d while uploading metadata and error when trying to parse response body: %s", res.StatusCode, err)
-		}
-		var jsonBody map[string]string
-		if err := json.Unmarshal(errBody, &jsonBody); err != nil {
-			errBody = []byte(err.Error())
-		} else if jsonBody["error"] == "Image already exists" {
-			return ErrAlreadyExists
-		}
-		return fmt.Errorf("HTTP code %d while uploading metadata: %q", res.StatusCode, errBody)
-	}
-	return nil
-}
-
-// PushImageJSONRegistry pushes JSON metadata for a local image to the registry
-func (r *Session) PushImageJSONRegistry(imgData *ImgData, jsonRaw []byte, registry string) error {
-
-	u := registry + "images/" + imgData.ID + "/json"
-
-	logrus.Debugf("[registry] Calling PUT %s", u)
-
-	req, err := http.NewRequest("PUT", u, bytes.NewReader(jsonRaw))
-	if err != nil {
-		return err
-	}
-	req.Header.Add("Content-type", "application/json")
-
-	res, err := r.client.Do(req)
-	if err != nil {
-		return fmt.Errorf("Failed to upload metadata: %s", err)
-	}
-	defer res.Body.Close()
-	if res.StatusCode == 401 && strings.HasPrefix(registry, "http://") {
-		return httputils.NewHTTPRequestError("HTTP code 401, Docker will not send auth headers over HTTP.", res)
-	}
-	if res.StatusCode != 200 {
-		errBody, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d while uploading metadata and error when trying to parse response body: %s", res.StatusCode, err), res)
-		}
-		var jsonBody map[string]string
-		if err := json.Unmarshal(errBody, &jsonBody); err != nil {
-			errBody = []byte(err.Error())
-		} else if jsonBody["error"] == "Image already exists" {
-			return ErrAlreadyExists
-		}
-		return httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d while uploading metadata: %q", res.StatusCode, errBody), res)
-	}
-	return nil
-}
-
-// PushImageLayerRegistry sends the checksum of an image layer to the registry
-func (r *Session) PushImageLayerRegistry(imgID string, layer io.Reader, registry string, jsonRaw []byte) (checksum string, checksumPayload string, err error) {
-	u := registry + "images/" + imgID + "/layer"
-
-	logrus.Debugf("[registry] Calling PUT %s", u)
-
-	tarsumLayer, err := tarsum.NewTarSum(layer, false, tarsum.Version0)
-	if err != nil {
-		return "", "", err
-	}
-	h := sha256.New()
-	h.Write(jsonRaw)
-	h.Write([]byte{'\n'})
-	checksumLayer := io.TeeReader(tarsumLayer, h)
-
-	req, err := http.NewRequest("PUT", u, checksumLayer)
-	if err != nil {
-		return "", "", err
-	}
-	req.Header.Add("Content-Type", "application/octet-stream")
-	req.ContentLength = -1
-	req.TransferEncoding = []string{"chunked"}
-	res, err := r.client.Do(req)
-	if err != nil {
-		return "", "", fmt.Errorf("Failed to upload layer: %v", err)
-	}
-	if rc, ok := layer.(io.Closer); ok {
-		if err := rc.Close(); err != nil {
-			return "", "", err
-		}
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode != 200 {
-		errBody, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return "", "", httputils.NewHTTPRequestError(fmt.Sprintf("HTTP code %d while uploading metadata and error when trying to parse response body: %s", res.StatusCode, err), res)
-		}
-		return "", "", httputils.NewHTTPRequestError(fmt.Sprintf("Received HTTP code %d while uploading layer: %q", res.StatusCode, errBody), res)
-	}
-
-	checksumPayload = "sha256:" + hex.EncodeToString(h.Sum(nil))
-	return tarsumLayer.Sum(jsonRaw), checksumPayload, nil
-}
-
-// PushRegistryTag pushes a tag on the registry.
-// Remote has the format '<user>/<repo>
-func (r *Session) PushRegistryTag(remote reference.Named, revision, tag, registry string) error {
-	// "jsonify" the string
-	revision = "\"" + revision + "\""
-	path := fmt.Sprintf("repositories/%s/tags/%s", remote.RemoteName(), tag)
-
-	req, err := http.NewRequest("PUT", registry+path, strings.NewReader(revision))
-	if err != nil {
-		return err
-	}
-	req.Header.Add("Content-type", "application/json")
-	req.ContentLength = int64(len(revision))
-	res, err := r.client.Do(req)
-	if err != nil {
-		return err
-	}
-	res.Body.Close()
-	if res.StatusCode != 200 && res.StatusCode != 201 {
-		return httputils.NewHTTPRequestError(fmt.Sprintf("Internal server error: %d trying to push tag %s on %s", res.StatusCode, tag, remote.RemoteName()), res)
-	}
-	return nil
-}
-
-// PushImageJSONIndex uploads an image list to the repository
-func (r *Session) PushImageJSONIndex(remote reference.Named, imgList []*ImgData, validate bool, regs []string) (*RepositoryData, error) {
-	cleanImgList := []*ImgData{}
-	if validate {
-		for _, elem := range imgList {
-			if elem.Checksum != "" {
-				cleanImgList = append(cleanImgList, elem)
-			}
-		}
-	} else {
-		cleanImgList = imgList
-	}
-
-	imgListJSON, err := json.Marshal(cleanImgList)
-	if err != nil {
-		return nil, err
-	}
-	var suffix string
-	if validate {
-		suffix = "images"
-	}
-	u := fmt.Sprintf("%srepositories/%s/%s", r.indexEndpoint.String(), remote.RemoteName(), suffix)
-	logrus.Debugf("[registry] PUT %s", u)
-	logrus.Debugf("Image list pushed to index:\n%s", imgListJSON)
-	headers := map[string][]string{
-		"Content-type": {"application/json"},
-		// this will set basic auth in r.client.Transport and send cached X-Docker-Token headers for all subsequent requests
-		"X-Docker-Token": {"true"},
-	}
-	if validate {
-		headers["X-Docker-Endpoints"] = regs
-	}
-
-	// Redirect if necessary
-	var res *http.Response
-	for {
-		if res, err = r.putImageRequest(u, headers, imgListJSON); err != nil {
-			return nil, err
-		}
-		if !shouldRedirect(res) {
-			break
-		}
-		res.Body.Close()
-		u = res.Header.Get("Location")
-		logrus.Debugf("Redirected to %s", u)
-	}
-	defer res.Body.Close()
-
-	if res.StatusCode == 401 {
-		return nil, errcode.ErrorCodeUnauthorized.WithArgs()
-	}
-
-	var tokens, endpoints []string
-	if !validate {
-		if res.StatusCode != 200 && res.StatusCode != 201 {
-			errBody, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				logrus.Debugf("Error reading response body: %s", err)
-			}
-			return nil, httputils.NewHTTPRequestError(fmt.Sprintf("Error: Status %d trying to push repository %s: %q", res.StatusCode, remote.RemoteName(), errBody), res)
-		}
-		tokens = res.Header["X-Docker-Token"]
-		logrus.Debugf("Auth token: %v", tokens)
-
-		if res.Header.Get("X-Docker-Endpoints") == "" {
-			return nil, fmt.Errorf("Index response didn't contain any endpoints")
-		}
-		endpoints, err = buildEndpointsList(res.Header["X-Docker-Endpoints"], r.indexEndpoint.String())
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		if res.StatusCode != 204 {
-			errBody, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				logrus.Debugf("Error reading response body: %s", err)
-			}
-			return nil, httputils.NewHTTPRequestError(fmt.Sprintf("Error: Status %d trying to push checksums %s: %q", res.StatusCode, remote.RemoteName(), errBody), res)
-		}
-	}
-
-	return &RepositoryData{
-		Endpoints: endpoints,
-	}, nil
-}
-
-func (r *Session) putImageRequest(u string, headers map[string][]string, body []byte) (*http.Response, error) {
-	req, err := http.NewRequest("PUT", u, bytes.NewReader(body))
-	if err != nil {
-		return nil, err
-	}
-	req.ContentLength = int64(len(body))
-	for k, v := range headers {
-		req.Header[k] = v
-	}
-	response, err := r.client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	return response, nil
-}
-
-func shouldRedirect(response *http.Response) bool {
-	return response.StatusCode >= 300 && response.StatusCode < 400
-}
-
-// SearchRepositories performs a search against the remote repository
-func (r *Session) SearchRepositories(term string, limit int) (*registrytypes.SearchResults, error) {
-	if limit < 1 || limit > 100 {
-		return nil, fmt.Errorf("Limit %d is outside the range of [1, 100]", limit)
-	}
-	logrus.Debugf("Index server: %s", r.indexEndpoint)
-	u := r.indexEndpoint.String() + "search?q=" + url.QueryEscape(term) + "&n=" + url.QueryEscape(fmt.Sprintf("%d", limit))
-
-	req, err := http.NewRequest("GET", u, nil)
-	if err != nil {
-		return nil, fmt.Errorf("Error while getting from the server: %v", err)
-	}
-	// Have the AuthTransport send authentication, when logged in.
-	req.Header.Set("X-Docker-Token", "true")
-	res, err := r.client.Do(req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != 200 {
-		return nil, httputils.NewHTTPRequestError(fmt.Sprintf("Unexpected status code %d", res.StatusCode), res)
-	}
-	result := new(registrytypes.SearchResults)
-	return result, json.NewDecoder(res.Body).Decode(result)
-}
-
-// GetAuthConfig returns the authentication settings for a session
-// TODO(tiborvass): remove this once registry client v2 is vendored
-func (r *Session) GetAuthConfig(withPasswd bool) *types.AuthConfig {
-	password := ""
-	if withPasswd {
-		password = r.authConfig.Password
-	}
-	return &types.AuthConfig{
-		Username: r.authConfig.Username,
-		Password: password,
-	}
-}
-
-func isTimeout(err error) bool {
-	type timeout interface {
-		Timeout() bool
-	}
-	e := err
-	switch urlErr := err.(type) {
-	case *url.Error:
-		e = urlErr.Err
-	}
-	t, ok := e.(timeout)
-	return ok && t.Timeout()
-}
diff --git a/installer/vendor/github.com/docker/docker/registry/types.go b/installer/vendor/github.com/docker/docker/registry/types.go
deleted file mode 100644
index 49c123a3e2..0000000000
--- a/installer/vendor/github.com/docker/docker/registry/types.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package registry
-
-import (
-	registrytypes "github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/reference"
-)
-
-// RepositoryData tracks the image list, list of endpoints, and list of tokens
-// for a repository
-type RepositoryData struct {
-	// ImgList is a list of images in the repository
-	ImgList map[string]*ImgData
-	// Endpoints is a list of endpoints returned in X-Docker-Endpoints
-	Endpoints []string
-	// Tokens is currently unused (remove it?)
-	Tokens []string
-}
-
-// ImgData is used to transfer image checksums to and from the registry
-type ImgData struct {
-	// ID is an opaque string that identifies the image
-	ID              string `json:"id"`
-	Checksum        string `json:"checksum,omitempty"`
-	ChecksumPayload string `json:"-"`
-	Tag             string `json:",omitempty"`
-}
-
-// PingResult contains the information returned when pinging a registry. It
-// indicates the registry's version and whether the registry claims to be a
-// standalone registry.
-type PingResult struct {
-	// Version is the registry version supplied by the registry in an HTTP
-	// header
-	Version string `json:"version"`
-	// Standalone is set to true if the registry indicates it is a
-	// standalone registry in the X-Docker-Registry-Standalone
-	// header
-	Standalone bool `json:"standalone"`
-}
-
-// APIVersion is an integral representation of an API version (presently
-// either 1 or 2)
-type APIVersion int
-
-func (av APIVersion) String() string {
-	return apiVersions[av]
-}
-
-// API Version identifiers.
-const (
-	_                      = iota
-	APIVersion1 APIVersion = iota
-	APIVersion2
-)
-
-var apiVersions = map[APIVersion]string{
-	APIVersion1: "v1",
-	APIVersion2: "v2",
-}
-
-// RepositoryInfo describes a repository
-type RepositoryInfo struct {
-	reference.Named
-	// Index points to registry information
-	Index *registrytypes.IndexInfo
-	// Official indicates whether the repository is considered official.
-	// If the registry is official, and the normalized name does not
-	// contain a '/' (e.g. "foo"), then it is considered an official repo.
-	Official bool
-	// Class represents the class of the repository, such as "plugin"
-	// or "image".
-	Class string
-}
diff --git a/installer/vendor/github.com/docker/docker/restartmanager/restartmanager.go b/installer/vendor/github.com/docker/docker/restartmanager/restartmanager.go
deleted file mode 100644
index 570fc93802..0000000000
--- a/installer/vendor/github.com/docker/docker/restartmanager/restartmanager.go
+++ /dev/null
@@ -1,128 +0,0 @@
-package restartmanager
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-const (
-	backoffMultiplier = 2
-	defaultTimeout    = 100 * time.Millisecond
-)
-
-// ErrRestartCanceled is returned when the restart manager has been
-// canceled and will no longer restart the container.
-var ErrRestartCanceled = errors.New("restart canceled")
-
-// RestartManager defines object that controls container restarting rules.
-type RestartManager interface {
-	Cancel() error
-	ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool, executionDuration time.Duration) (bool, chan error, error)
-}
-
-type restartManager struct {
-	sync.Mutex
-	sync.Once
-	policy       container.RestartPolicy
-	restartCount int
-	timeout      time.Duration
-	active       bool
-	cancel       chan struct{}
-	canceled     bool
-}
-
-// New returns a new restartmanager based on a policy.
-func New(policy container.RestartPolicy, restartCount int) RestartManager {
-	return &restartManager{policy: policy, restartCount: restartCount, cancel: make(chan struct{})}
-}
-
-func (rm *restartManager) SetPolicy(policy container.RestartPolicy) {
-	rm.Lock()
-	rm.policy = policy
-	rm.Unlock()
-}
-
-func (rm *restartManager) ShouldRestart(exitCode uint32, hasBeenManuallyStopped bool, executionDuration time.Duration) (bool, chan error, error) {
-	if rm.policy.IsNone() {
-		return false, nil, nil
-	}
-	rm.Lock()
-	unlockOnExit := true
-	defer func() {
-		if unlockOnExit {
-			rm.Unlock()
-		}
-	}()
-
-	if rm.canceled {
-		return false, nil, ErrRestartCanceled
-	}
-
-	if rm.active {
-		return false, nil, fmt.Errorf("invalid call on active restartmanager")
-	}
-	// if the container ran for more than 10s, regardless of status and policy reset the
-	// the timeout back to the default.
-	if executionDuration.Seconds() >= 10 {
-		rm.timeout = 0
-	}
-	if rm.timeout == 0 {
-		rm.timeout = defaultTimeout
-	} else {
-		rm.timeout *= backoffMultiplier
-	}
-
-	var restart bool
-	switch {
-	case rm.policy.IsAlways():
-		restart = true
-	case rm.policy.IsUnlessStopped() && !hasBeenManuallyStopped:
-		restart = true
-	case rm.policy.IsOnFailure():
-		// the default value of 0 for MaximumRetryCount means that we will not enforce a maximum count
-		if max := rm.policy.MaximumRetryCount; max == 0 || rm.restartCount < max {
-			restart = exitCode != 0
-		}
-	}
-
-	if !restart {
-		rm.active = false
-		return false, nil, nil
-	}
-
-	rm.restartCount++
-
-	unlockOnExit = false
-	rm.active = true
-	rm.Unlock()
-
-	ch := make(chan error)
-	go func() {
-		select {
-		case <-rm.cancel:
-			ch <- ErrRestartCanceled
-			close(ch)
-		case <-time.After(rm.timeout):
-			rm.Lock()
-			close(ch)
-			rm.active = false
-			rm.Unlock()
-		}
-	}()
-
-	return true, ch, nil
-}
-
-func (rm *restartManager) Cancel() error {
-	rm.Do(func() {
-		rm.Lock()
-		rm.canceled = true
-		close(rm.cancel)
-		rm.Unlock()
-	})
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/restartmanager/restartmanager_test.go b/installer/vendor/github.com/docker/docker/restartmanager/restartmanager_test.go
deleted file mode 100644
index 20eced54d3..0000000000
--- a/installer/vendor/github.com/docker/docker/restartmanager/restartmanager_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package restartmanager
-
-import (
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-func TestRestartManagerTimeout(t *testing.T) {
-	rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager)
-	should, _, err := rm.ShouldRestart(0, false, 1*time.Second)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !should {
-		t.Fatal("container should be restarted")
-	}
-	if rm.timeout != 100*time.Millisecond {
-		t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout)
-	}
-}
-
-func TestRestartManagerTimeoutReset(t *testing.T) {
-	rm := New(container.RestartPolicy{Name: "always"}, 0).(*restartManager)
-	rm.timeout = 5 * time.Second
-	_, _, err := rm.ShouldRestart(0, false, 10*time.Second)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if rm.timeout != 100*time.Millisecond {
-		t.Fatalf("restart manager should have a timeout of 100ms but has %s", rm.timeout)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/compare.go b/installer/vendor/github.com/docker/docker/runconfig/compare.go
deleted file mode 100644
index 708922f986..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/compare.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package runconfig
-
-import "github.com/docker/docker/api/types/container"
-
-// Compare two Config struct. Do not compare the "Image" nor "Hostname" fields
-// If OpenStdin is set, then it differs
-func Compare(a, b *container.Config) bool {
-	if a == nil || b == nil ||
-		a.OpenStdin || b.OpenStdin {
-		return false
-	}
-	if a.AttachStdout != b.AttachStdout ||
-		a.AttachStderr != b.AttachStderr ||
-		a.User != b.User ||
-		a.OpenStdin != b.OpenStdin ||
-		a.Tty != b.Tty {
-		return false
-	}
-
-	if len(a.Cmd) != len(b.Cmd) ||
-		len(a.Env) != len(b.Env) ||
-		len(a.Labels) != len(b.Labels) ||
-		len(a.ExposedPorts) != len(b.ExposedPorts) ||
-		len(a.Entrypoint) != len(b.Entrypoint) ||
-		len(a.Volumes) != len(b.Volumes) {
-		return false
-	}
-
-	for i := 0; i < len(a.Cmd); i++ {
-		if a.Cmd[i] != b.Cmd[i] {
-			return false
-		}
-	}
-	for i := 0; i < len(a.Env); i++ {
-		if a.Env[i] != b.Env[i] {
-			return false
-		}
-	}
-	for k, v := range a.Labels {
-		if v != b.Labels[k] {
-			return false
-		}
-	}
-	for k := range a.ExposedPorts {
-		if _, exists := b.ExposedPorts[k]; !exists {
-			return false
-		}
-	}
-
-	for i := 0; i < len(a.Entrypoint); i++ {
-		if a.Entrypoint[i] != b.Entrypoint[i] {
-			return false
-		}
-	}
-	for key := range a.Volumes {
-		if _, exists := b.Volumes[key]; !exists {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/compare_test.go b/installer/vendor/github.com/docker/docker/runconfig/compare_test.go
deleted file mode 100644
index 6370d7a887..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/compare_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package runconfig
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/go-connections/nat"
-)
-
-// Just to make life easier
-func newPortNoError(proto, port string) nat.Port {
-	p, _ := nat.NewPort(proto, port)
-	return p
-}
-
-func TestCompare(t *testing.T) {
-	ports1 := make(nat.PortSet)
-	ports1[newPortNoError("tcp", "1111")] = struct{}{}
-	ports1[newPortNoError("tcp", "2222")] = struct{}{}
-	ports2 := make(nat.PortSet)
-	ports2[newPortNoError("tcp", "3333")] = struct{}{}
-	ports2[newPortNoError("tcp", "4444")] = struct{}{}
-	ports3 := make(nat.PortSet)
-	ports3[newPortNoError("tcp", "1111")] = struct{}{}
-	ports3[newPortNoError("tcp", "2222")] = struct{}{}
-	ports3[newPortNoError("tcp", "5555")] = struct{}{}
-	volumes1 := make(map[string]struct{})
-	volumes1["/test1"] = struct{}{}
-	volumes2 := make(map[string]struct{})
-	volumes2["/test2"] = struct{}{}
-	volumes3 := make(map[string]struct{})
-	volumes3["/test1"] = struct{}{}
-	volumes3["/test3"] = struct{}{}
-	envs1 := []string{"ENV1=value1", "ENV2=value2"}
-	envs2 := []string{"ENV1=value1", "ENV3=value3"}
-	entrypoint1 := strslice.StrSlice{"/bin/sh", "-c"}
-	entrypoint2 := strslice.StrSlice{"/bin/sh", "-d"}
-	entrypoint3 := strslice.StrSlice{"/bin/sh", "-c", "echo"}
-	cmd1 := strslice.StrSlice{"/bin/sh", "-c"}
-	cmd2 := strslice.StrSlice{"/bin/sh", "-d"}
-	cmd3 := strslice.StrSlice{"/bin/sh", "-c", "echo"}
-	labels1 := map[string]string{"LABEL1": "value1", "LABEL2": "value2"}
-	labels2 := map[string]string{"LABEL1": "value1", "LABEL2": "value3"}
-	labels3 := map[string]string{"LABEL1": "value1", "LABEL2": "value2", "LABEL3": "value3"}
-
-	sameConfigs := map[*container.Config]*container.Config{
-		// Empty config
-		&container.Config{}: {},
-		// Does not compare hostname, domainname & image
-		&container.Config{
-			Hostname:   "host1",
-			Domainname: "domain1",
-			Image:      "image1",
-			User:       "user",
-		}: {
-			Hostname:   "host2",
-			Domainname: "domain2",
-			Image:      "image2",
-			User:       "user",
-		},
-		// only OpenStdin
-		&container.Config{OpenStdin: false}: {OpenStdin: false},
-		// only env
-		&container.Config{Env: envs1}: {Env: envs1},
-		// only cmd
-		&container.Config{Cmd: cmd1}: {Cmd: cmd1},
-		// only labels
-		&container.Config{Labels: labels1}: {Labels: labels1},
-		// only exposedPorts
-		&container.Config{ExposedPorts: ports1}: {ExposedPorts: ports1},
-		// only entrypoints
-		&container.Config{Entrypoint: entrypoint1}: {Entrypoint: entrypoint1},
-		// only volumes
-		&container.Config{Volumes: volumes1}: {Volumes: volumes1},
-	}
-	differentConfigs := map[*container.Config]*container.Config{
-		nil: nil,
-		&container.Config{
-			Hostname:   "host1",
-			Domainname: "domain1",
-			Image:      "image1",
-			User:       "user1",
-		}: {
-			Hostname:   "host1",
-			Domainname: "domain1",
-			Image:      "image1",
-			User:       "user2",
-		},
-		// only OpenStdin
-		&container.Config{OpenStdin: false}: {OpenStdin: true},
-		&container.Config{OpenStdin: true}:  {OpenStdin: false},
-		// only env
-		&container.Config{Env: envs1}: {Env: envs2},
-		// only cmd
-		&container.Config{Cmd: cmd1}: {Cmd: cmd2},
-		// not the same number of parts
-		&container.Config{Cmd: cmd1}: {Cmd: cmd3},
-		// only labels
-		&container.Config{Labels: labels1}: {Labels: labels2},
-		// not the same number of labels
-		&container.Config{Labels: labels1}: {Labels: labels3},
-		// only exposedPorts
-		&container.Config{ExposedPorts: ports1}: {ExposedPorts: ports2},
-		// not the same number of ports
-		&container.Config{ExposedPorts: ports1}: {ExposedPorts: ports3},
-		// only entrypoints
-		&container.Config{Entrypoint: entrypoint1}: {Entrypoint: entrypoint2},
-		// not the same number of parts
-		&container.Config{Entrypoint: entrypoint1}: {Entrypoint: entrypoint3},
-		// only volumes
-		&container.Config{Volumes: volumes1}: {Volumes: volumes2},
-		// not the same number of labels
-		&container.Config{Volumes: volumes1}: {Volumes: volumes3},
-	}
-	for config1, config2 := range sameConfigs {
-		if !Compare(config1, config2) {
-			t.Fatalf("Compare should be true for [%v] and [%v]", config1, config2)
-		}
-	}
-	for config1, config2 := range differentConfigs {
-		if Compare(config1, config2) {
-			t.Fatalf("Compare should be false for [%v] and [%v]", config1, config2)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/config.go b/installer/vendor/github.com/docker/docker/runconfig/config.go
deleted file mode 100644
index 508681cfe0..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/config.go
+++ /dev/null
@@ -1,97 +0,0 @@
-package runconfig
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/pkg/sysinfo"
-	"github.com/docker/docker/volume"
-)
-
-// ContainerDecoder implements httputils.ContainerDecoder
-// calling DecodeContainerConfig.
-type ContainerDecoder struct{}
-
-// DecodeConfig makes ContainerDecoder to implement httputils.ContainerDecoder
-func (r ContainerDecoder) DecodeConfig(src io.Reader) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
-	return DecodeContainerConfig(src)
-}
-
-// DecodeHostConfig makes ContainerDecoder to implement httputils.ContainerDecoder
-func (r ContainerDecoder) DecodeHostConfig(src io.Reader) (*container.HostConfig, error) {
-	return DecodeHostConfig(src)
-}
-
-// DecodeContainerConfig decodes a json encoded config into a ContainerConfigWrapper
-// struct and returns both a Config and a HostConfig struct
-// Be aware this function is not checking whether the resulted structs are nil,
-// it's your business to do so
-func DecodeContainerConfig(src io.Reader) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
-	var w ContainerConfigWrapper
-
-	decoder := json.NewDecoder(src)
-	if err := decoder.Decode(&w); err != nil {
-		return nil, nil, nil, err
-	}
-
-	hc := w.getHostConfig()
-
-	// Perform platform-specific processing of Volumes and Binds.
-	if w.Config != nil && hc != nil {
-
-		// Initialize the volumes map if currently nil
-		if w.Config.Volumes == nil {
-			w.Config.Volumes = make(map[string]struct{})
-		}
-
-		// Now validate all the volumes and binds
-		if err := validateMountSettings(w.Config, hc); err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	// Certain parameters need daemon-side validation that cannot be done
-	// on the client, as only the daemon knows what is valid for the platform.
-	if err := ValidateNetMode(w.Config, hc); err != nil {
-		return nil, nil, nil, err
-	}
-
-	// Validate isolation
-	if err := ValidateIsolation(hc); err != nil {
-		return nil, nil, nil, err
-	}
-
-	// Validate QoS
-	if err := ValidateQoS(hc); err != nil {
-		return nil, nil, nil, err
-	}
-
-	// Validate Resources
-	if err := ValidateResources(hc, sysinfo.New(true)); err != nil {
-		return nil, nil, nil, err
-	}
-	return w.Config, hc, w.NetworkingConfig, nil
-}
-
-// validateMountSettings validates each of the volumes and bind settings
-// passed by the caller to ensure they are valid.
-func validateMountSettings(c *container.Config, hc *container.HostConfig) error {
-	// it is ok to have len(hc.Mounts) > 0 && (len(hc.Binds) > 0 || len (c.Volumes) > 0 || len (hc.Tmpfs) > 0 )
-
-	// Ensure all volumes and binds are valid.
-	for spec := range c.Volumes {
-		if _, err := volume.ParseMountRaw(spec, hc.VolumeDriver); err != nil {
-			return fmt.Errorf("invalid volume spec %q: %v", spec, err)
-		}
-	}
-	for _, spec := range hc.Binds {
-		if _, err := volume.ParseMountRaw(spec, hc.VolumeDriver); err != nil {
-			return fmt.Errorf("invalid bind mount spec %q: %v", spec, err)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/config_test.go b/installer/vendor/github.com/docker/docker/runconfig/config_test.go
deleted file mode 100644
index f1f9de5950..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/config_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-package runconfig
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/strslice"
-)
-
-type f struct {
-	file       string
-	entrypoint strslice.StrSlice
-}
-
-func TestDecodeContainerConfig(t *testing.T) {
-
-	var (
-		fixtures []f
-		image    string
-	)
-
-	//TODO: Should run for Solaris
-	if runtime.GOOS == "solaris" {
-		t.Skip()
-	}
-
-	if runtime.GOOS != "windows" {
-		image = "ubuntu"
-		fixtures = []f{
-			{"fixtures/unix/container_config_1_14.json", strslice.StrSlice{}},
-			{"fixtures/unix/container_config_1_17.json", strslice.StrSlice{"bash"}},
-			{"fixtures/unix/container_config_1_19.json", strslice.StrSlice{"bash"}},
-		}
-	} else {
-		image = "windows"
-		fixtures = []f{
-			{"fixtures/windows/container_config_1_19.json", strslice.StrSlice{"cmd"}},
-		}
-	}
-
-	for _, f := range fixtures {
-		b, err := ioutil.ReadFile(f.file)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		c, h, _, err := DecodeContainerConfig(bytes.NewReader(b))
-		if err != nil {
-			t.Fatal(fmt.Errorf("Error parsing %s: %v", f, err))
-		}
-
-		if c.Image != image {
-			t.Fatalf("Expected %s image, found %s\n", image, c.Image)
-		}
-
-		if len(c.Entrypoint) != len(f.entrypoint) {
-			t.Fatalf("Expected %v, found %v\n", f.entrypoint, c.Entrypoint)
-		}
-
-		if h != nil && h.Memory != 1000 {
-			t.Fatalf("Expected memory to be 1000, found %d\n", h.Memory)
-		}
-	}
-}
-
-// TestDecodeContainerConfigIsolation validates isolation passed
-// to the daemon in the hostConfig structure. Note this is platform specific
-// as to what level of container isolation is supported.
-func TestDecodeContainerConfigIsolation(t *testing.T) {
-
-	// An invalid isolation level
-	if _, _, _, err := callDecodeContainerConfigIsolation("invalid"); err != nil {
-		if !strings.Contains(err.Error(), `invalid --isolation: "invalid"`) {
-			t.Fatal(err)
-		}
-	}
-
-	// Blank isolation (== default)
-	if _, _, _, err := callDecodeContainerConfigIsolation(""); err != nil {
-		t.Fatal("Blank isolation should have succeeded")
-	}
-
-	// Default isolation
-	if _, _, _, err := callDecodeContainerConfigIsolation("default"); err != nil {
-		t.Fatal("default isolation should have succeeded")
-	}
-
-	// Process isolation (Valid on Windows only)
-	if runtime.GOOS == "windows" {
-		if _, _, _, err := callDecodeContainerConfigIsolation("process"); err != nil {
-			t.Fatal("process isolation should have succeeded")
-		}
-	} else {
-		if _, _, _, err := callDecodeContainerConfigIsolation("process"); err != nil {
-			if !strings.Contains(err.Error(), `invalid --isolation: "process"`) {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	// Hyper-V Containers isolation (Valid on Windows only)
-	if runtime.GOOS == "windows" {
-		if _, _, _, err := callDecodeContainerConfigIsolation("hyperv"); err != nil {
-			t.Fatal("hyperv isolation should have succeeded")
-		}
-	} else {
-		if _, _, _, err := callDecodeContainerConfigIsolation("hyperv"); err != nil {
-			if !strings.Contains(err.Error(), `invalid --isolation: "hyperv"`) {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-// callDecodeContainerConfigIsolation is a utility function to call
-// DecodeContainerConfig for validating isolation
-func callDecodeContainerConfigIsolation(isolation string) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
-	var (
-		b   []byte
-		err error
-	)
-	w := ContainerConfigWrapper{
-		Config: &container.Config{},
-		HostConfig: &container.HostConfig{
-			NetworkMode: "none",
-			Isolation:   container.Isolation(isolation)},
-	}
-	if b, err = json.Marshal(w); err != nil {
-		return nil, nil, nil, fmt.Errorf("Error on marshal %s", err.Error())
-	}
-	return DecodeContainerConfig(bytes.NewReader(b))
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/config_unix.go b/installer/vendor/github.com/docker/docker/runconfig/config_unix.go
deleted file mode 100644
index 4ccfc73be2..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/config_unix.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build !windows
-
-package runconfig
-
-import (
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-)
-
-// ContainerConfigWrapper is a Config wrapper that holds the container Config (portable)
-// and the corresponding HostConfig (non-portable).
-type ContainerConfigWrapper struct {
-	*container.Config
-	InnerHostConfig       *container.HostConfig          `json:"HostConfig,omitempty"`
-	Cpuset                string                         `json:",omitempty"` // Deprecated. Exported for backwards compatibility.
-	NetworkingConfig      *networktypes.NetworkingConfig `json:"NetworkingConfig,omitempty"`
-	*container.HostConfig                                // Deprecated. Exported to read attributes from json that are not in the inner host config structure.
-}
-
-// getHostConfig gets the HostConfig of the Config.
-// It's mostly there to handle Deprecated fields of the ContainerConfigWrapper
-func (w *ContainerConfigWrapper) getHostConfig() *container.HostConfig {
-	hc := w.HostConfig
-
-	if hc == nil && w.InnerHostConfig != nil {
-		hc = w.InnerHostConfig
-	} else if w.InnerHostConfig != nil {
-		if hc.Memory != 0 && w.InnerHostConfig.Memory == 0 {
-			w.InnerHostConfig.Memory = hc.Memory
-		}
-		if hc.MemorySwap != 0 && w.InnerHostConfig.MemorySwap == 0 {
-			w.InnerHostConfig.MemorySwap = hc.MemorySwap
-		}
-		if hc.CPUShares != 0 && w.InnerHostConfig.CPUShares == 0 {
-			w.InnerHostConfig.CPUShares = hc.CPUShares
-		}
-		if hc.CpusetCpus != "" && w.InnerHostConfig.CpusetCpus == "" {
-			w.InnerHostConfig.CpusetCpus = hc.CpusetCpus
-		}
-
-		if hc.VolumeDriver != "" && w.InnerHostConfig.VolumeDriver == "" {
-			w.InnerHostConfig.VolumeDriver = hc.VolumeDriver
-		}
-
-		hc = w.InnerHostConfig
-	}
-
-	if hc != nil {
-		if w.Cpuset != "" && hc.CpusetCpus == "" {
-			hc.CpusetCpus = w.Cpuset
-		}
-	}
-
-	// Make sure NetworkMode has an acceptable value. We do this to ensure
-	// backwards compatible API behavior.
-	hc = SetDefaultNetModeIfBlank(hc)
-
-	return hc
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/config_windows.go b/installer/vendor/github.com/docker/docker/runconfig/config_windows.go
deleted file mode 100644
index f2361b554b..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/config_windows.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package runconfig
-
-import (
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-)
-
-// ContainerConfigWrapper is a Config wrapper that holds the container Config (portable)
-// and the corresponding HostConfig (non-portable).
-type ContainerConfigWrapper struct {
-	*container.Config
-	HostConfig       *container.HostConfig          `json:"HostConfig,omitempty"`
-	NetworkingConfig *networktypes.NetworkingConfig `json:"NetworkingConfig,omitempty"`
-}
-
-// getHostConfig gets the HostConfig of the Config.
-func (w *ContainerConfigWrapper) getHostConfig() *container.HostConfig {
-	return w.HostConfig
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/errors.go b/installer/vendor/github.com/docker/docker/runconfig/errors.go
deleted file mode 100644
index bb72c1699c..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/errors.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package runconfig
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/errors"
-)
-
-var (
-	// ErrConflictContainerNetworkAndLinks conflict between --net=container and links
-	ErrConflictContainerNetworkAndLinks = fmt.Errorf("Conflicting options: container type network can't be used with links. This would result in undefined behavior")
-	// ErrConflictUserDefinedNetworkAndLinks conflict between --net=<NETWORK> and links
-	ErrConflictUserDefinedNetworkAndLinks = fmt.Errorf("Conflicting options: networking can't be used with links. This would result in undefined behavior")
-	// ErrConflictSharedNetwork conflict between private and other networks
-	ErrConflictSharedNetwork = fmt.Errorf("Container sharing network namespace with another container or host cannot be connected to any other network")
-	// ErrConflictHostNetwork conflict from being disconnected from host network or connected to host network.
-	ErrConflictHostNetwork = fmt.Errorf("Container cannot be disconnected from host network or connected to host network")
-	// ErrConflictNoNetwork conflict between private and other networks
-	ErrConflictNoNetwork = fmt.Errorf("Container cannot be connected to multiple networks with one of the networks in private (none) mode")
-	// ErrConflictNetworkAndDNS conflict between --dns and the network mode
-	ErrConflictNetworkAndDNS = fmt.Errorf("Conflicting options: dns and the network mode")
-	// ErrConflictNetworkHostname conflict between the hostname and the network mode
-	ErrConflictNetworkHostname = fmt.Errorf("Conflicting options: hostname and the network mode")
-	// ErrConflictHostNetworkAndLinks conflict between --net=host and links
-	ErrConflictHostNetworkAndLinks = fmt.Errorf("Conflicting options: host type networking can't be used with links. This would result in undefined behavior")
-	// ErrConflictContainerNetworkAndMac conflict between the mac address and the network mode
-	ErrConflictContainerNetworkAndMac = fmt.Errorf("Conflicting options: mac-address and the network mode")
-	// ErrConflictNetworkHosts conflict between add-host and the network mode
-	ErrConflictNetworkHosts = fmt.Errorf("Conflicting options: custom host-to-IP mapping and the network mode")
-	// ErrConflictNetworkPublishPorts conflict between the publish options and the network mode
-	ErrConflictNetworkPublishPorts = fmt.Errorf("Conflicting options: port publishing and the container type network mode")
-	// ErrConflictNetworkExposePorts conflict between the expose option and the network mode
-	ErrConflictNetworkExposePorts = fmt.Errorf("Conflicting options: port exposing and the container type network mode")
-	// ErrUnsupportedNetworkAndIP conflict between network mode and requested ip address
-	ErrUnsupportedNetworkAndIP = fmt.Errorf("User specified IP address is supported on user defined networks only")
-	// ErrUnsupportedNetworkNoSubnetAndIP conflict between network with no configured subnet and requested ip address
-	ErrUnsupportedNetworkNoSubnetAndIP = fmt.Errorf("User specified IP address is supported only when connecting to networks with user configured subnets")
-	// ErrUnsupportedNetworkAndAlias conflict between network mode and alias
-	ErrUnsupportedNetworkAndAlias = fmt.Errorf("Network-scoped alias is supported only for containers in user defined networks")
-	// ErrConflictUTSHostname conflict between the hostname and the UTS mode
-	ErrConflictUTSHostname = fmt.Errorf("Conflicting options: hostname and the UTS mode")
-)
-
-func conflictError(err error) error {
-	return errors.NewRequestConflictError(err)
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_14.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_14.json
deleted file mode 100644
index b08334c095..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_14.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-     "Hostname":"",
-     "Domainname": "",
-     "User":"",
-     "Memory": 1000,
-     "MemorySwap":0,
-     "CpuShares": 512,
-     "Cpuset": "0,1",
-     "AttachStdin":false,
-     "AttachStdout":true,
-     "AttachStderr":true,
-     "PortSpecs":null,
-     "Tty":false,
-     "OpenStdin":false,
-     "StdinOnce":false,
-     "Env":null,
-     "Cmd":[
-             "bash"
-     ],
-     "Image":"ubuntu",
-     "Volumes":{
-             "/tmp": {}
-     },
-     "WorkingDir":"",
-     "NetworkDisabled": false,
-     "ExposedPorts":{
-             "22/tcp": {}
-     },
-     "RestartPolicy": { "Name": "always" }
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_17.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_17.json
deleted file mode 100644
index 0d780877b4..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_17.json
+++ /dev/null
@@ -1,50 +0,0 @@
-{
-     "Hostname": "",
-     "Domainname": "",
-     "User": "",
-     "Memory": 1000,
-     "MemorySwap": 0,
-     "CpuShares": 512,
-     "Cpuset": "0,1",
-     "AttachStdin": false,
-     "AttachStdout": true,
-     "AttachStderr": true,
-     "Tty": false,
-     "OpenStdin": false,
-     "StdinOnce": false,
-     "Env": null,
-     "Cmd": [
-             "date"
-     ],
-     "Entrypoint": "bash",
-     "Image": "ubuntu",
-     "Volumes": {
-             "/tmp": {}
-     },
-     "WorkingDir": "",
-     "NetworkDisabled": false,
-     "MacAddress": "12:34:56:78:9a:bc",
-     "ExposedPorts": {
-             "22/tcp": {}
-     },
-     "SecurityOpt": [""],
-     "HostConfig": {
-       "Binds": ["/tmp:/tmp"],
-       "Links": ["redis3:redis"],
-       "LxcConf": {"lxc.utsname":"docker"},
-       "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-       "PublishAllPorts": false,
-       "Privileged": false,
-       "ReadonlyRootfs": false,
-       "Dns": ["8.8.8.8"],
-       "DnsSearch": [""],
-       "DnsOptions": [""],
-       "ExtraHosts": null,
-       "VolumesFrom": ["parent", "other:ro"],
-       "CapAdd": ["NET_ADMIN"],
-       "CapDrop": ["MKNOD"],
-       "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-       "NetworkMode": "bridge",
-       "Devices": []
-    }
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_19.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_19.json
deleted file mode 100644
index de49cf3242..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_config_1_19.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-     "Hostname": "",
-     "Domainname": "",
-     "User": "",
-     "AttachStdin": false,
-     "AttachStdout": true,
-     "AttachStderr": true,
-     "Tty": false,
-     "OpenStdin": false,
-     "StdinOnce": false,
-     "Env": null,
-     "Cmd": [
-             "date"
-     ],
-     "Entrypoint": "bash",
-     "Image": "ubuntu",
-     "Labels": {
-             "com.example.vendor": "Acme",
-             "com.example.license": "GPL",
-             "com.example.version": "1.0"
-     },
-     "Volumes": {
-             "/tmp": {}
-     },
-     "WorkingDir": "",
-     "NetworkDisabled": false,
-     "MacAddress": "12:34:56:78:9a:bc",
-     "ExposedPorts": {
-             "22/tcp": {}
-     },
-     "HostConfig": {
-       "Binds": ["/tmp:/tmp"],
-       "Links": ["redis3:redis"],
-       "LxcConf": {"lxc.utsname":"docker"},
-       "Memory": 1000,
-       "MemorySwap": 0,
-       "CpuShares": 512,
-       "CpusetCpus": "0,1",
-       "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-       "PublishAllPorts": false,
-       "Privileged": false,
-       "ReadonlyRootfs": false,
-       "Dns": ["8.8.8.8"],
-       "DnsSearch": [""],
-       "DnsOptions": [""],
-       "ExtraHosts": null,
-       "VolumesFrom": ["parent", "other:ro"],
-       "CapAdd": ["NET_ADMIN"],
-       "CapDrop": ["MKNOD"],
-       "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-       "NetworkMode": "bridge",
-       "Devices": [],
-       "Ulimits": [{}],
-       "LogConfig": { "Type": "json-file", "Config": {} },
-       "SecurityOpt": [""],
-       "CgroupParent": ""
-    }
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_14.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_14.json
deleted file mode 100644
index c72ac91cab..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_14.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "Binds": ["/tmp:/tmp"],
-    "ContainerIDFile": "",
-    "LxcConf": [],
-    "Privileged": false,
-    "PortBindings": {
-        "80/tcp": [
-            {
-                "HostIp": "0.0.0.0",
-                "HostPort": "49153"
-            }
-        ]
-    },
-    "Links": ["/name:alias"],
-    "PublishAllPorts": false,
-    "CapAdd": ["NET_ADMIN"],
-    "CapDrop": ["MKNOD"]
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_19.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_19.json
deleted file mode 100644
index 5ca8aa7e19..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/unix/container_hostconfig_1_19.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "Binds": ["/tmp:/tmp"],
-    "Links": ["redis3:redis"],
-    "LxcConf": {"lxc.utsname":"docker"},
-    "Memory": 0,
-    "MemorySwap": 0,
-    "CpuShares": 512,
-    "CpuPeriod": 100000,
-    "CpusetCpus": "0,1",
-    "CpusetMems": "0,1",
-    "BlkioWeight": 300,
-    "OomKillDisable": false,
-    "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-    "PublishAllPorts": false,
-    "Privileged": false,
-    "ReadonlyRootfs": false,
-    "Dns": ["8.8.8.8"],
-    "DnsSearch": [""],
-    "ExtraHosts": null,
-    "VolumesFrom": ["parent", "other:ro"],
-    "CapAdd": ["NET_ADMIN"],
-    "CapDrop": ["MKNOD"],
-    "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-    "NetworkMode": "bridge",
-    "Devices": [],
-    "Ulimits": [{}],
-    "LogConfig": { "Type": "json-file", "Config": {} },
-    "SecurityOpt": [""],
-    "CgroupParent": ""
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/fixtures/windows/container_config_1_19.json b/installer/vendor/github.com/docker/docker/runconfig/fixtures/windows/container_config_1_19.json
deleted file mode 100644
index 724320c760..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/fixtures/windows/container_config_1_19.json
+++ /dev/null
@@ -1,58 +0,0 @@
-{
-     "Hostname": "",
-     "Domainname": "",
-     "User": "",
-     "AttachStdin": false,
-     "AttachStdout": true,
-     "AttachStderr": true,
-     "Tty": false,
-     "OpenStdin": false,
-     "StdinOnce": false,
-     "Env": null,
-     "Cmd": [
-             "date"
-     ],
-     "Entrypoint": "cmd",
-     "Image": "windows",
-     "Labels": {
-             "com.example.vendor": "Acme",
-             "com.example.license": "GPL",
-             "com.example.version": "1.0"
-     },
-     "Volumes": {
-             "c:/windows": {}
-     },
-     "WorkingDir": "",
-     "NetworkDisabled": false,
-     "MacAddress": "12:34:56:78:9a:bc",
-     "ExposedPorts": {
-             "22/tcp": {}
-     },
-     "HostConfig": {
-       "Binds": ["c:/windows:d:/tmp"],
-       "Links": ["redis3:redis"],
-       "LxcConf": {"lxc.utsname":"docker"},
-       "Memory": 1000,
-       "MemorySwap": 0,
-       "CpuShares": 512,
-       "CpusetCpus": "0,1",
-       "PortBindings": { "22/tcp": [{ "HostPort": "11022" }] },
-       "PublishAllPorts": false,
-       "Privileged": false,
-       "ReadonlyRootfs": false,
-       "Dns": ["8.8.8.8"],
-       "DnsSearch": [""],
-       "DnsOptions": [""],
-       "ExtraHosts": null,
-       "VolumesFrom": ["parent", "other:ro"],
-       "CapAdd": ["NET_ADMIN"],
-       "CapDrop": ["MKNOD"],
-       "RestartPolicy": { "Name": "", "MaximumRetryCount": 0 },
-       "NetworkMode": "default",
-       "Devices": [],
-       "Ulimits": [{}],
-       "LogConfig": { "Type": "json-file", "Config": {} },
-       "SecurityOpt": [""],
-       "CgroupParent": ""
-    }
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/hostconfig.go b/installer/vendor/github.com/docker/docker/runconfig/hostconfig.go
deleted file mode 100644
index 2b81d02c20..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/hostconfig.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package runconfig
-
-import (
-	"encoding/json"
-	"io"
-
-	"github.com/docker/docker/api/types/container"
-)
-
-// DecodeHostConfig creates a HostConfig based on the specified Reader.
-// It assumes the content of the reader will be JSON, and decodes it.
-func DecodeHostConfig(src io.Reader) (*container.HostConfig, error) {
-	decoder := json.NewDecoder(src)
-
-	var w ContainerConfigWrapper
-	if err := decoder.Decode(&w); err != nil {
-		return nil, err
-	}
-
-	hc := w.getHostConfig()
-	return hc, nil
-}
-
-// SetDefaultNetModeIfBlank changes the NetworkMode in a HostConfig structure
-// to default if it is not populated. This ensures backwards compatibility after
-// the validation of the network mode was moved from the docker CLI to the
-// docker daemon.
-func SetDefaultNetModeIfBlank(hc *container.HostConfig) *container.HostConfig {
-	if hc != nil {
-		if hc.NetworkMode == container.NetworkMode("") {
-			hc.NetworkMode = container.NetworkMode("default")
-		}
-	}
-	return hc
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_solaris.go b/installer/vendor/github.com/docker/docker/runconfig/hostconfig_solaris.go
deleted file mode 100644
index 83ad32ecc7..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_solaris.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package runconfig
-
-import (
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// DefaultDaemonNetworkMode returns the default network stack the daemon should
-// use.
-func DefaultDaemonNetworkMode() container.NetworkMode {
-	return container.NetworkMode("bridge")
-}
-
-// IsPreDefinedNetwork indicates if a network is predefined by the daemon
-func IsPreDefinedNetwork(network string) bool {
-	return false
-}
-
-// ValidateNetMode ensures that the various combinations of requested
-// network settings are valid.
-func ValidateNetMode(c *container.Config, hc *container.HostConfig) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	return nil
-}
-
-// ValidateIsolation performs platform specific validation of the
-// isolation level in the hostconfig structure.
-// This setting is currently discarded for Solaris so this is a no-op.
-func ValidateIsolation(hc *container.HostConfig) error {
-	return nil
-}
-
-// ValidateQoS performs platform specific validation of the QoS settings
-func ValidateQoS(hc *container.HostConfig) error {
-	return nil
-}
-
-// ValidateResources performs platform specific validation of the resource settings
-func ValidateResources(hc *container.HostConfig, si *sysinfo.SysInfo) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_test.go b/installer/vendor/github.com/docker/docker/runconfig/hostconfig_test.go
deleted file mode 100644
index a6a2b34fc1..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// +build !windows
-
-package runconfig
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"testing"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// TODO Windows: This will need addressing for a Windows daemon.
-func TestNetworkModeTest(t *testing.T) {
-	networkModes := map[container.NetworkMode][]bool{
-		// private, bridge, host, container, none, default
-		"":                         {true, false, false, false, false, false},
-		"something:weird":          {true, false, false, false, false, false},
-		"bridge":                   {true, true, false, false, false, false},
-		DefaultDaemonNetworkMode(): {true, true, false, false, false, false},
-		"host":           {false, false, true, false, false, false},
-		"container:name": {false, false, false, true, false, false},
-		"none":           {true, false, false, false, true, false},
-		"default":        {true, false, false, false, false, true},
-	}
-	networkModeNames := map[container.NetworkMode]string{
-		"":                         "",
-		"something:weird":          "something:weird",
-		"bridge":                   "bridge",
-		DefaultDaemonNetworkMode(): "bridge",
-		"host":           "host",
-		"container:name": "container",
-		"none":           "none",
-		"default":        "default",
-	}
-	for networkMode, state := range networkModes {
-		if networkMode.IsPrivate() != state[0] {
-			t.Fatalf("NetworkMode.IsPrivate for %v should have been %v but was %v", networkMode, state[0], networkMode.IsPrivate())
-		}
-		if networkMode.IsBridge() != state[1] {
-			t.Fatalf("NetworkMode.IsBridge for %v should have been %v but was %v", networkMode, state[1], networkMode.IsBridge())
-		}
-		if networkMode.IsHost() != state[2] {
-			t.Fatalf("NetworkMode.IsHost for %v should have been %v but was %v", networkMode, state[2], networkMode.IsHost())
-		}
-		if networkMode.IsContainer() != state[3] {
-			t.Fatalf("NetworkMode.IsContainer for %v should have been %v but was %v", networkMode, state[3], networkMode.IsContainer())
-		}
-		if networkMode.IsNone() != state[4] {
-			t.Fatalf("NetworkMode.IsNone for %v should have been %v but was %v", networkMode, state[4], networkMode.IsNone())
-		}
-		if networkMode.IsDefault() != state[5] {
-			t.Fatalf("NetworkMode.IsDefault for %v should have been %v but was %v", networkMode, state[5], networkMode.IsDefault())
-		}
-		if networkMode.NetworkName() != networkModeNames[networkMode] {
-			t.Fatalf("Expected name %v, got %v", networkModeNames[networkMode], networkMode.NetworkName())
-		}
-	}
-}
-
-func TestIpcModeTest(t *testing.T) {
-	ipcModes := map[container.IpcMode][]bool{
-		// private, host, container, valid
-		"":                         {true, false, false, true},
-		"something:weird":          {true, false, false, false},
-		":weird":                   {true, false, false, true},
-		"host":                     {false, true, false, true},
-		"container:name":           {false, false, true, true},
-		"container:name:something": {false, false, true, false},
-		"container:":               {false, false, true, false},
-	}
-	for ipcMode, state := range ipcModes {
-		if ipcMode.IsPrivate() != state[0] {
-			t.Fatalf("IpcMode.IsPrivate for %v should have been %v but was %v", ipcMode, state[0], ipcMode.IsPrivate())
-		}
-		if ipcMode.IsHost() != state[1] {
-			t.Fatalf("IpcMode.IsHost for %v should have been %v but was %v", ipcMode, state[1], ipcMode.IsHost())
-		}
-		if ipcMode.IsContainer() != state[2] {
-			t.Fatalf("IpcMode.IsContainer for %v should have been %v but was %v", ipcMode, state[2], ipcMode.IsContainer())
-		}
-		if ipcMode.Valid() != state[3] {
-			t.Fatalf("IpcMode.Valid for %v should have been %v but was %v", ipcMode, state[3], ipcMode.Valid())
-		}
-	}
-	containerIpcModes := map[container.IpcMode]string{
-		"":                      "",
-		"something":             "",
-		"something:weird":       "weird",
-		"container":             "",
-		"container:":            "",
-		"container:name":        "name",
-		"container:name1:name2": "name1:name2",
-	}
-	for ipcMode, container := range containerIpcModes {
-		if ipcMode.Container() != container {
-			t.Fatalf("Expected %v for %v but was %v", container, ipcMode, ipcMode.Container())
-		}
-	}
-}
-
-func TestUTSModeTest(t *testing.T) {
-	utsModes := map[container.UTSMode][]bool{
-		// private, host, valid
-		"":                {true, false, true},
-		"something:weird": {true, false, false},
-		"host":            {false, true, true},
-		"host:name":       {true, false, true},
-	}
-	for utsMode, state := range utsModes {
-		if utsMode.IsPrivate() != state[0] {
-			t.Fatalf("UtsMode.IsPrivate for %v should have been %v but was %v", utsMode, state[0], utsMode.IsPrivate())
-		}
-		if utsMode.IsHost() != state[1] {
-			t.Fatalf("UtsMode.IsHost for %v should have been %v but was %v", utsMode, state[1], utsMode.IsHost())
-		}
-		if utsMode.Valid() != state[2] {
-			t.Fatalf("UtsMode.Valid for %v should have been %v but was %v", utsMode, state[2], utsMode.Valid())
-		}
-	}
-}
-
-func TestUsernsModeTest(t *testing.T) {
-	usrensMode := map[container.UsernsMode][]bool{
-		// private, host, valid
-		"":                {true, false, true},
-		"something:weird": {true, false, false},
-		"host":            {false, true, true},
-		"host:name":       {true, false, true},
-	}
-	for usernsMode, state := range usrensMode {
-		if usernsMode.IsPrivate() != state[0] {
-			t.Fatalf("UsernsMode.IsPrivate for %v should have been %v but was %v", usernsMode, state[0], usernsMode.IsPrivate())
-		}
-		if usernsMode.IsHost() != state[1] {
-			t.Fatalf("UsernsMode.IsHost for %v should have been %v but was %v", usernsMode, state[1], usernsMode.IsHost())
-		}
-		if usernsMode.Valid() != state[2] {
-			t.Fatalf("UsernsMode.Valid for %v should have been %v but was %v", usernsMode, state[2], usernsMode.Valid())
-		}
-	}
-}
-
-func TestPidModeTest(t *testing.T) {
-	pidModes := map[container.PidMode][]bool{
-		// private, host, valid
-		"":                {true, false, true},
-		"something:weird": {true, false, false},
-		"host":            {false, true, true},
-		"host:name":       {true, false, true},
-	}
-	for pidMode, state := range pidModes {
-		if pidMode.IsPrivate() != state[0] {
-			t.Fatalf("PidMode.IsPrivate for %v should have been %v but was %v", pidMode, state[0], pidMode.IsPrivate())
-		}
-		if pidMode.IsHost() != state[1] {
-			t.Fatalf("PidMode.IsHost for %v should have been %v but was %v", pidMode, state[1], pidMode.IsHost())
-		}
-		if pidMode.Valid() != state[2] {
-			t.Fatalf("PidMode.Valid for %v should have been %v but was %v", pidMode, state[2], pidMode.Valid())
-		}
-	}
-}
-
-func TestRestartPolicy(t *testing.T) {
-	restartPolicies := map[container.RestartPolicy][]bool{
-		// none, always, failure
-		container.RestartPolicy{}:                {true, false, false},
-		container.RestartPolicy{"something", 0}:  {false, false, false},
-		container.RestartPolicy{"no", 0}:         {true, false, false},
-		container.RestartPolicy{"always", 0}:     {false, true, false},
-		container.RestartPolicy{"on-failure", 0}: {false, false, true},
-	}
-	for restartPolicy, state := range restartPolicies {
-		if restartPolicy.IsNone() != state[0] {
-			t.Fatalf("RestartPolicy.IsNone for %v should have been %v but was %v", restartPolicy, state[0], restartPolicy.IsNone())
-		}
-		if restartPolicy.IsAlways() != state[1] {
-			t.Fatalf("RestartPolicy.IsAlways for %v should have been %v but was %v", restartPolicy, state[1], restartPolicy.IsAlways())
-		}
-		if restartPolicy.IsOnFailure() != state[2] {
-			t.Fatalf("RestartPolicy.IsOnFailure for %v should have been %v but was %v", restartPolicy, state[2], restartPolicy.IsOnFailure())
-		}
-	}
-}
-func TestDecodeHostConfig(t *testing.T) {
-	fixtures := []struct {
-		file string
-	}{
-		{"fixtures/unix/container_hostconfig_1_14.json"},
-		{"fixtures/unix/container_hostconfig_1_19.json"},
-	}
-
-	for _, f := range fixtures {
-		b, err := ioutil.ReadFile(f.file)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		c, err := DecodeHostConfig(bytes.NewReader(b))
-		if err != nil {
-			t.Fatal(fmt.Errorf("Error parsing %s: %v", f, err))
-		}
-
-		if c.Privileged != false {
-			t.Fatalf("Expected privileged false, found %v\n", c.Privileged)
-		}
-
-		if l := len(c.Binds); l != 1 {
-			t.Fatalf("Expected 1 bind, found %d\n", l)
-		}
-
-		if len(c.CapAdd) != 1 && c.CapAdd[0] != "NET_ADMIN" {
-			t.Fatalf("Expected CapAdd NET_ADMIN, got %v", c.CapAdd)
-		}
-
-		if len(c.CapDrop) != 1 && c.CapDrop[0] != "NET_ADMIN" {
-			t.Fatalf("Expected CapDrop MKNOD, got %v", c.CapDrop)
-		}
-	}
-}
-
-func TestValidateResources(t *testing.T) {
-	type resourceTest struct {
-		ConfigCPURealtimePeriod   int64
-		ConfigCPURealtimeRuntime  int64
-		SysInfoCPURealtimePeriod  bool
-		SysInfoCPURealtimeRuntime bool
-		ErrorExpected             bool
-		FailureMsg                string
-	}
-
-	tests := []resourceTest{
-		{
-			ConfigCPURealtimePeriod:   1000,
-			ConfigCPURealtimeRuntime:  1000,
-			SysInfoCPURealtimePeriod:  true,
-			SysInfoCPURealtimeRuntime: true,
-			ErrorExpected:             false,
-			FailureMsg:                "Expected valid configuration",
-		},
-		{
-			ConfigCPURealtimePeriod:   5000,
-			ConfigCPURealtimeRuntime:  5000,
-			SysInfoCPURealtimePeriod:  false,
-			SysInfoCPURealtimeRuntime: true,
-			ErrorExpected:             true,
-			FailureMsg:                "Expected failure when cpu-rt-period is set but kernel doesn't support it",
-		},
-		{
-			ConfigCPURealtimePeriod:   5000,
-			ConfigCPURealtimeRuntime:  5000,
-			SysInfoCPURealtimePeriod:  true,
-			SysInfoCPURealtimeRuntime: false,
-			ErrorExpected:             true,
-			FailureMsg:                "Expected failure when cpu-rt-runtime is set but kernel doesn't support it",
-		},
-		{
-			ConfigCPURealtimePeriod:   5000,
-			ConfigCPURealtimeRuntime:  10000,
-			SysInfoCPURealtimePeriod:  true,
-			SysInfoCPURealtimeRuntime: false,
-			ErrorExpected:             true,
-			FailureMsg:                "Expected failure when cpu-rt-runtime is greater than cpu-rt-period",
-		},
-	}
-
-	for _, rt := range tests {
-		var hc container.HostConfig
-		hc.Resources.CPURealtimePeriod = rt.ConfigCPURealtimePeriod
-		hc.Resources.CPURealtimeRuntime = rt.ConfigCPURealtimeRuntime
-
-		var si sysinfo.SysInfo
-		si.CPURealtimePeriod = rt.SysInfoCPURealtimePeriod
-		si.CPURealtimeRuntime = rt.SysInfoCPURealtimeRuntime
-
-		if err := ValidateResources(&hc, &si); (err != nil) != rt.ErrorExpected {
-			t.Fatal(rt.FailureMsg, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_unix.go b/installer/vendor/github.com/docker/docker/runconfig/hostconfig_unix.go
deleted file mode 100644
index 6e2b7f5ff7..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_unix.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// +build !windows,!solaris
-
-package runconfig
-
-import (
-	"fmt"
-	"runtime"
-	"strings"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// DefaultDaemonNetworkMode returns the default network stack the daemon should
-// use.
-func DefaultDaemonNetworkMode() container.NetworkMode {
-	return container.NetworkMode("bridge")
-}
-
-// IsPreDefinedNetwork indicates if a network is predefined by the daemon
-func IsPreDefinedNetwork(network string) bool {
-	n := container.NetworkMode(network)
-	return n.IsBridge() || n.IsHost() || n.IsNone() || n.IsDefault() || network == "ingress"
-}
-
-// ValidateNetMode ensures that the various combinations of requested
-// network settings are valid.
-func ValidateNetMode(c *container.Config, hc *container.HostConfig) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-	parts := strings.Split(string(hc.NetworkMode), ":")
-	if parts[0] == "container" {
-		if len(parts) < 2 || parts[1] == "" {
-			return fmt.Errorf("--net: invalid net mode: invalid container format container:<name|id>")
-		}
-	}
-
-	if hc.NetworkMode.IsContainer() && c.Hostname != "" {
-		return ErrConflictNetworkHostname
-	}
-
-	if hc.UTSMode.IsHost() && c.Hostname != "" {
-		return ErrConflictUTSHostname
-	}
-
-	if hc.NetworkMode.IsHost() && len(hc.Links) > 0 {
-		return ErrConflictHostNetworkAndLinks
-	}
-
-	if hc.NetworkMode.IsContainer() && len(hc.Links) > 0 {
-		return ErrConflictContainerNetworkAndLinks
-	}
-
-	if hc.NetworkMode.IsContainer() && len(hc.DNS) > 0 {
-		return ErrConflictNetworkAndDNS
-	}
-
-	if hc.NetworkMode.IsContainer() && len(hc.ExtraHosts) > 0 {
-		return ErrConflictNetworkHosts
-	}
-
-	if (hc.NetworkMode.IsContainer() || hc.NetworkMode.IsHost()) && c.MacAddress != "" {
-		return ErrConflictContainerNetworkAndMac
-	}
-
-	if hc.NetworkMode.IsContainer() && (len(hc.PortBindings) > 0 || hc.PublishAllPorts == true) {
-		return ErrConflictNetworkPublishPorts
-	}
-
-	if hc.NetworkMode.IsContainer() && len(c.ExposedPorts) > 0 {
-		return ErrConflictNetworkExposePorts
-	}
-	return nil
-}
-
-// ValidateIsolation performs platform specific validation of
-// isolation in the hostconfig structure. Linux only supports "default"
-// which is LXC container isolation
-func ValidateIsolation(hc *container.HostConfig) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-	if !hc.Isolation.IsValid() {
-		return fmt.Errorf("invalid --isolation: %q - %s only supports 'default'", hc.Isolation, runtime.GOOS)
-	}
-	return nil
-}
-
-// ValidateQoS performs platform specific validation of the QoS settings
-func ValidateQoS(hc *container.HostConfig) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-
-	if hc.IOMaximumBandwidth != 0 {
-		return fmt.Errorf("invalid QoS settings: %s does not support --io-maxbandwidth", runtime.GOOS)
-	}
-
-	if hc.IOMaximumIOps != 0 {
-		return fmt.Errorf("invalid QoS settings: %s does not support --io-maxiops", runtime.GOOS)
-	}
-	return nil
-}
-
-// ValidateResources performs platform specific validation of the resource settings
-// cpu-rt-runtime and cpu-rt-period can not be greater than their parent, cpu-rt-runtime requires sys_nice
-func ValidateResources(hc *container.HostConfig, si *sysinfo.SysInfo) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-
-	if hc.Resources.CPURealtimePeriod > 0 && !si.CPURealtimePeriod {
-		return fmt.Errorf("invalid --cpu-rt-period: Your kernel does not support cgroup rt period")
-	}
-
-	if hc.Resources.CPURealtimeRuntime > 0 && !si.CPURealtimeRuntime {
-		return fmt.Errorf("invalid --cpu-rt-runtime: Your kernel does not support cgroup rt runtime")
-	}
-
-	if hc.Resources.CPURealtimePeriod != 0 && hc.Resources.CPURealtimeRuntime != 0 && hc.Resources.CPURealtimeRuntime > hc.Resources.CPURealtimePeriod {
-		return fmt.Errorf("invalid --cpu-rt-runtime: rt runtime cannot be higher than rt period")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_windows.go b/installer/vendor/github.com/docker/docker/runconfig/hostconfig_windows.go
deleted file mode 100644
index 91bd6dcc3c..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/hostconfig_windows.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package runconfig
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/pkg/sysinfo"
-)
-
-// DefaultDaemonNetworkMode returns the default network stack the daemon should
-// use.
-func DefaultDaemonNetworkMode() container.NetworkMode {
-	return container.NetworkMode("nat")
-}
-
-// IsPreDefinedNetwork indicates if a network is predefined by the daemon
-func IsPreDefinedNetwork(network string) bool {
-	return !container.NetworkMode(network).IsUserDefined()
-}
-
-// ValidateNetMode ensures that the various combinations of requested
-// network settings are valid.
-func ValidateNetMode(c *container.Config, hc *container.HostConfig) error {
-	if hc == nil {
-		return nil
-	}
-	parts := strings.Split(string(hc.NetworkMode), ":")
-	if len(parts) > 1 {
-		return fmt.Errorf("invalid --net: %s", hc.NetworkMode)
-	}
-	return nil
-}
-
-// ValidateIsolation performs platform specific validation of the
-// isolation in the hostconfig structure. Windows supports 'default' (or
-// blank), 'process', or 'hyperv'.
-func ValidateIsolation(hc *container.HostConfig) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-	if !hc.Isolation.IsValid() {
-		return fmt.Errorf("invalid --isolation: %q. Windows supports 'default', 'process', or 'hyperv'", hc.Isolation)
-	}
-	return nil
-}
-
-// ValidateQoS performs platform specific validation of the Qos settings
-func ValidateQoS(hc *container.HostConfig) error {
-	return nil
-}
-
-// ValidateResources performs platform specific validation of the resource settings
-func ValidateResources(hc *container.HostConfig, si *sysinfo.SysInfo) error {
-	// We may not be passed a host config, such as in the case of docker commit
-	if hc == nil {
-		return nil
-	}
-
-	if hc.Resources.CPURealtimePeriod != 0 {
-		return fmt.Errorf("invalid --cpu-rt-period: Windows does not support this feature")
-	}
-	if hc.Resources.CPURealtimeRuntime != 0 {
-		return fmt.Errorf("invalid --cpu-rt-runtime: Windows does not support this feature")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/envfile.go b/installer/vendor/github.com/docker/docker/runconfig/opts/envfile.go
deleted file mode 100644
index f723799215..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/envfile.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package opts
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"os"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-// ParseEnvFile reads a file with environment variables enumerated by lines
-//
-// ``Environment variable names used by the utilities in the Shell and
-// Utilities volume of IEEE Std 1003.1-2001 consist solely of uppercase
-// letters, digits, and the '_' (underscore) from the characters defined in
-// Portable Character Set and do not begin with a digit. *But*, other
-// characters may be permitted by an implementation; applications shall
-// tolerate the presence of such names.''
-// -- http://pubs.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html
-//
-// As of #16585, it's up to application inside docker to validate or not
-// environment variables, that's why we just strip leading whitespace and
-// nothing more.
-func ParseEnvFile(filename string) ([]string, error) {
-	fh, err := os.Open(filename)
-	if err != nil {
-		return []string{}, err
-	}
-	defer fh.Close()
-
-	lines := []string{}
-	scanner := bufio.NewScanner(fh)
-	currentLine := 0
-	utf8bom := []byte{0xEF, 0xBB, 0xBF}
-	for scanner.Scan() {
-		scannedBytes := scanner.Bytes()
-		if !utf8.Valid(scannedBytes) {
-			return []string{}, fmt.Errorf("env file %s contains invalid utf8 bytes at line %d: %v", filename, currentLine+1, scannedBytes)
-		}
-		// We trim UTF8 BOM
-		if currentLine == 0 {
-			scannedBytes = bytes.TrimPrefix(scannedBytes, utf8bom)
-		}
-		// trim the line from all leading whitespace first
-		line := strings.TrimLeftFunc(string(scannedBytes), unicode.IsSpace)
-		currentLine++
-		// line is not empty, and not starting with '#'
-		if len(line) > 0 && !strings.HasPrefix(line, "#") {
-			data := strings.SplitN(line, "=", 2)
-
-			// trim the front of a variable, but nothing else
-			variable := strings.TrimLeft(data[0], whiteSpaces)
-			if strings.ContainsAny(variable, whiteSpaces) {
-				return []string{}, ErrBadEnvVariable{fmt.Sprintf("variable '%s' has white spaces", variable)}
-			}
-
-			if len(data) > 1 {
-
-				// pass the value through, no trimming
-				lines = append(lines, fmt.Sprintf("%s=%s", variable, data[1]))
-			} else {
-				// if only a pass-through variable is given, clean it up.
-				lines = append(lines, fmt.Sprintf("%s=%s", strings.TrimSpace(line), os.Getenv(line)))
-			}
-		}
-	}
-	return lines, scanner.Err()
-}
-
-var whiteSpaces = " \t"
-
-// ErrBadEnvVariable typed error for bad environment variable
-type ErrBadEnvVariable struct {
-	msg string
-}
-
-func (e ErrBadEnvVariable) Error() string {
-	return fmt.Sprintf("poorly formatted environment: %s", e.msg)
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/envfile_test.go b/installer/vendor/github.com/docker/docker/runconfig/opts/envfile_test.go
deleted file mode 100644
index 5dd7078bc0..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/envfile_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-package opts
-
-import (
-	"bufio"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func tmpFileWithContent(content string, t *testing.T) string {
-	tmpFile, err := ioutil.TempFile("", "envfile-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer tmpFile.Close()
-
-	tmpFile.WriteString(content)
-	return tmpFile.Name()
-}
-
-// Test ParseEnvFile for a file with a few well formatted lines
-func TestParseEnvFileGoodFile(t *testing.T) {
-	content := `foo=bar
-    baz=quux
-# comment
-
-_foobar=foobaz
-with.dots=working
-and_underscore=working too
-`
-	// Adding a newline + a line with pure whitespace.
-	// This is being done like this instead of the block above
-	// because it's common for editors to trim trailing whitespace
-	// from lines, which becomes annoying since that's the
-	// exact thing we need to test.
-	content += "\n    \t  "
-	tmpFile := tmpFileWithContent(content, t)
-	defer os.Remove(tmpFile)
-
-	lines, err := ParseEnvFile(tmpFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedLines := []string{
-		"foo=bar",
-		"baz=quux",
-		"_foobar=foobaz",
-		"with.dots=working",
-		"and_underscore=working too",
-	}
-
-	if !reflect.DeepEqual(lines, expectedLines) {
-		t.Fatal("lines not equal to expected_lines")
-	}
-}
-
-// Test ParseEnvFile for an empty file
-func TestParseEnvFileEmptyFile(t *testing.T) {
-	tmpFile := tmpFileWithContent("", t)
-	defer os.Remove(tmpFile)
-
-	lines, err := ParseEnvFile(tmpFile)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(lines) != 0 {
-		t.Fatal("lines not empty; expected empty")
-	}
-}
-
-// Test ParseEnvFile for a non existent file
-func TestParseEnvFileNonExistentFile(t *testing.T) {
-	_, err := ParseEnvFile("foo_bar_baz")
-	if err == nil {
-		t.Fatal("ParseEnvFile succeeded; expected failure")
-	}
-	if _, ok := err.(*os.PathError); !ok {
-		t.Fatalf("Expected a PathError, got [%v]", err)
-	}
-}
-
-// Test ParseEnvFile for a badly formatted file
-func TestParseEnvFileBadlyFormattedFile(t *testing.T) {
-	content := `foo=bar
-    f   =quux
-`
-
-	tmpFile := tmpFileWithContent(content, t)
-	defer os.Remove(tmpFile)
-
-	_, err := ParseEnvFile(tmpFile)
-	if err == nil {
-		t.Fatalf("Expected an ErrBadEnvVariable, got nothing")
-	}
-	if _, ok := err.(ErrBadEnvVariable); !ok {
-		t.Fatalf("Expected an ErrBadEnvVariable, got [%v]", err)
-	}
-	expectedMessage := "poorly formatted environment: variable 'f   ' has white spaces"
-	if err.Error() != expectedMessage {
-		t.Fatalf("Expected [%v], got [%v]", expectedMessage, err.Error())
-	}
-}
-
-// Test ParseEnvFile for a file with a line exceeding bufio.MaxScanTokenSize
-func TestParseEnvFileLineTooLongFile(t *testing.T) {
-	content := strings.Repeat("a", bufio.MaxScanTokenSize+42)
-	content = fmt.Sprint("foo=", content)
-
-	tmpFile := tmpFileWithContent(content, t)
-	defer os.Remove(tmpFile)
-
-	_, err := ParseEnvFile(tmpFile)
-	if err == nil {
-		t.Fatal("ParseEnvFile succeeded; expected failure")
-	}
-}
-
-// ParseEnvFile with a random file, pass through
-func TestParseEnvFileRandomFile(t *testing.T) {
-	content := `first line
-another invalid line`
-	tmpFile := tmpFileWithContent(content, t)
-	defer os.Remove(tmpFile)
-
-	_, err := ParseEnvFile(tmpFile)
-
-	if err == nil {
-		t.Fatalf("Expected an ErrBadEnvVariable, got nothing")
-	}
-	if _, ok := err.(ErrBadEnvVariable); !ok {
-		t.Fatalf("Expected an ErrBadEnvvariable, got [%v]", err)
-	}
-	expectedMessage := "poorly formatted environment: variable 'first line' has white spaces"
-	if err.Error() != expectedMessage {
-		t.Fatalf("Expected [%v], got [%v]", expectedMessage, err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16.env b/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16.env
deleted file mode 100755
index 3a73358fff..0000000000
Binary files a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16.env and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16be.env b/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16be.env
deleted file mode 100755
index e523da7af4..0000000000
Binary files a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf16be.env and /dev/null differ
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf8.env b/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf8.env
deleted file mode 100755
index 1ce45055b7..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/utf8.env
+++ /dev/null
@@ -1,3 +0,0 @@
-FOO=BAR
-HELLO=您好
-BAR=FOO
\ No newline at end of file
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.env b/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.env
deleted file mode 100644
index 3afbdc81c2..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.env
+++ /dev/null
@@ -1 +0,0 @@
-ENV1=value1
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.label b/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.label
deleted file mode 100644
index b4208bdf8f..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/fixtures/valid.label
+++ /dev/null
@@ -1 +0,0 @@
-LABEL1=value1
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/opts.go b/installer/vendor/github.com/docker/docker/runconfig/opts/opts.go
deleted file mode 100644
index cae0432f05..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/opts.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-	"strings"
-
-	fopts "github.com/docker/docker/opts"
-)
-
-// ValidateAttach validates that the specified string is a valid attach option.
-func ValidateAttach(val string) (string, error) {
-	s := strings.ToLower(val)
-	for _, str := range []string{"stdin", "stdout", "stderr"} {
-		if s == str {
-			return s, nil
-		}
-	}
-	return val, fmt.Errorf("valid streams are STDIN, STDOUT and STDERR")
-}
-
-// ValidateEnv validates an environment variable and returns it.
-// If no value is specified, it returns the current value using os.Getenv.
-//
-// As on ParseEnvFile and related to #16585, environment variable names
-// are not validate what so ever, it's up to application inside docker
-// to validate them or not.
-//
-// The only validation here is to check if name is empty, per #25099
-func ValidateEnv(val string) (string, error) {
-	arr := strings.Split(val, "=")
-	if arr[0] == "" {
-		return "", fmt.Errorf("invalid environment variable: %s", val)
-	}
-	if len(arr) > 1 {
-		return val, nil
-	}
-	if !doesEnvExist(val) {
-		return val, nil
-	}
-	return fmt.Sprintf("%s=%s", val, os.Getenv(val)), nil
-}
-
-func doesEnvExist(name string) bool {
-	for _, entry := range os.Environ() {
-		parts := strings.SplitN(entry, "=", 2)
-		if runtime.GOOS == "windows" {
-			// Environment variable are case-insensitive on Windows. PaTh, path and PATH are equivalent.
-			if strings.EqualFold(parts[0], name) {
-				return true
-			}
-		}
-		if parts[0] == name {
-			return true
-		}
-	}
-	return false
-}
-
-// ValidateExtraHost validates that the specified string is a valid extrahost and returns it.
-// ExtraHost is in the form of name:ip where the ip has to be a valid ip (IPv4 or IPv6).
-func ValidateExtraHost(val string) (string, error) {
-	// allow for IPv6 addresses in extra hosts by only splitting on first ":"
-	arr := strings.SplitN(val, ":", 2)
-	if len(arr) != 2 || len(arr[0]) == 0 {
-		return "", fmt.Errorf("bad format for add-host: %q", val)
-	}
-	if _, err := fopts.ValidateIPAddress(arr[1]); err != nil {
-		return "", fmt.Errorf("invalid IP address in add-host: %q", arr[1])
-	}
-	return val, nil
-}
-
-// ValidateMACAddress validates a MAC address.
-func ValidateMACAddress(val string) (string, error) {
-	_, err := net.ParseMAC(strings.TrimSpace(val))
-	if err != nil {
-		return "", err
-	}
-	return val, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/opts_test.go b/installer/vendor/github.com/docker/docker/runconfig/opts/opts_test.go
deleted file mode 100644
index 43f8730fc4..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/opts_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func TestValidateAttach(t *testing.T) {
-	valid := []string{
-		"stdin",
-		"stdout",
-		"stderr",
-		"STDIN",
-		"STDOUT",
-		"STDERR",
-	}
-	if _, err := ValidateAttach("invalid"); err == nil {
-		t.Fatalf("Expected error with [valid streams are STDIN, STDOUT and STDERR], got nothing")
-	}
-
-	for _, attach := range valid {
-		value, err := ValidateAttach(attach)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if value != strings.ToLower(attach) {
-			t.Fatalf("Expected [%v], got [%v]", attach, value)
-		}
-	}
-}
-
-func TestValidateEnv(t *testing.T) {
-	valids := map[string]string{
-		"a":                   "a",
-		"something":           "something",
-		"_=a":                 "_=a",
-		"env1=value1":         "env1=value1",
-		"_env1=value1":        "_env1=value1",
-		"env2=value2=value3":  "env2=value2=value3",
-		"env3=abc!qwe":        "env3=abc!qwe",
-		"env_4=value 4":       "env_4=value 4",
-		"PATH":                fmt.Sprintf("PATH=%v", os.Getenv("PATH")),
-		"PATH=something":      "PATH=something",
-		"asd!qwe":             "asd!qwe",
-		"1asd":                "1asd",
-		"123":                 "123",
-		"some space":          "some space",
-		"  some space before": "  some space before",
-		"some space after  ":  "some space after  ",
-	}
-	// Environment variables are case in-sensitive on Windows
-	if runtime.GOOS == "windows" {
-		valids["PaTh"] = fmt.Sprintf("PaTh=%v", os.Getenv("PATH"))
-	}
-	for value, expected := range valids {
-		actual, err := ValidateEnv(value)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if actual != expected {
-			t.Fatalf("Expected [%v], got [%v]", expected, actual)
-		}
-	}
-}
-
-func TestValidateExtraHosts(t *testing.T) {
-	valid := []string{
-		`myhost:192.168.0.1`,
-		`thathost:10.0.2.1`,
-		`anipv6host:2003:ab34:e::1`,
-		`ipv6local:::1`,
-	}
-
-	invalid := map[string]string{
-		`myhost:192.notanipaddress.1`:  `invalid IP`,
-		`thathost-nosemicolon10.0.0.1`: `bad format`,
-		`anipv6host:::::1`:             `invalid IP`,
-		`ipv6local:::0::`:              `invalid IP`,
-	}
-
-	for _, extrahost := range valid {
-		if _, err := ValidateExtraHost(extrahost); err != nil {
-			t.Fatalf("ValidateExtraHost(`"+extrahost+"`) should succeed: error %v", err)
-		}
-	}
-
-	for extraHost, expectedError := range invalid {
-		if _, err := ValidateExtraHost(extraHost); err == nil {
-			t.Fatalf("ValidateExtraHost(`%q`) should have failed validation", extraHost)
-		} else {
-			if !strings.Contains(err.Error(), expectedError) {
-				t.Fatalf("ValidateExtraHost(`%q`) error should contain %q", extraHost, expectedError)
-			}
-		}
-	}
-}
-
-func TestValidateMACAddress(t *testing.T) {
-	if _, err := ValidateMACAddress(`92:d0:c6:0a:29:33`); err != nil {
-		t.Fatalf("ValidateMACAddress(`92:d0:c6:0a:29:33`) got %s", err)
-	}
-
-	if _, err := ValidateMACAddress(`92:d0:c6:0a:33`); err == nil {
-		t.Fatalf("ValidateMACAddress(`92:d0:c6:0a:33`) succeeded; expected failure on invalid MAC")
-	}
-
-	if _, err := ValidateMACAddress(`random invalid string`); err == nil {
-		t.Fatalf("ValidateMACAddress(`random invalid string`) succeeded; expected failure on invalid MAC")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/parse.go b/installer/vendor/github.com/docker/docker/runconfig/opts/parse.go
deleted file mode 100644
index 71a89277ec..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/parse.go
+++ /dev/null
@@ -1,995 +0,0 @@
-package opts
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/opts"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/go-connections/nat"
-	units "github.com/docker/go-units"
-	"github.com/spf13/pflag"
-)
-
-// ContainerOptions is a data object with all the options for creating a container
-type ContainerOptions struct {
-	attach             opts.ListOpts
-	volumes            opts.ListOpts
-	tmpfs              opts.ListOpts
-	blkioWeightDevice  WeightdeviceOpt
-	deviceReadBps      ThrottledeviceOpt
-	deviceWriteBps     ThrottledeviceOpt
-	links              opts.ListOpts
-	aliases            opts.ListOpts
-	linkLocalIPs       opts.ListOpts
-	deviceReadIOps     ThrottledeviceOpt
-	deviceWriteIOps    ThrottledeviceOpt
-	env                opts.ListOpts
-	labels             opts.ListOpts
-	devices            opts.ListOpts
-	ulimits            *UlimitOpt
-	sysctls            *opts.MapOpts
-	publish            opts.ListOpts
-	expose             opts.ListOpts
-	dns                opts.ListOpts
-	dnsSearch          opts.ListOpts
-	dnsOptions         opts.ListOpts
-	extraHosts         opts.ListOpts
-	volumesFrom        opts.ListOpts
-	envFile            opts.ListOpts
-	capAdd             opts.ListOpts
-	capDrop            opts.ListOpts
-	groupAdd           opts.ListOpts
-	securityOpt        opts.ListOpts
-	storageOpt         opts.ListOpts
-	labelsFile         opts.ListOpts
-	loggingOpts        opts.ListOpts
-	privileged         bool
-	pidMode            string
-	utsMode            string
-	usernsMode         string
-	publishAll         bool
-	stdin              bool
-	tty                bool
-	oomKillDisable     bool
-	oomScoreAdj        int
-	containerIDFile    string
-	entrypoint         string
-	hostname           string
-	memoryString       string
-	memoryReservation  string
-	memorySwap         string
-	kernelMemory       string
-	user               string
-	workingDir         string
-	cpuCount           int64
-	cpuShares          int64
-	cpuPercent         int64
-	cpuPeriod          int64
-	cpuRealtimePeriod  int64
-	cpuRealtimeRuntime int64
-	cpuQuota           int64
-	cpus               opts.NanoCPUs
-	cpusetCpus         string
-	cpusetMems         string
-	blkioWeight        uint16
-	ioMaxBandwidth     string
-	ioMaxIOps          uint64
-	swappiness         int64
-	netMode            string
-	macAddress         string
-	ipv4Address        string
-	ipv6Address        string
-	ipcMode            string
-	pidsLimit          int64
-	restartPolicy      string
-	readonlyRootfs     bool
-	loggingDriver      string
-	cgroupParent       string
-	volumeDriver       string
-	stopSignal         string
-	stopTimeout        int
-	isolation          string
-	shmSize            string
-	noHealthcheck      bool
-	healthCmd          string
-	healthInterval     time.Duration
-	healthTimeout      time.Duration
-	healthRetries      int
-	runtime            string
-	autoRemove         bool
-	init               bool
-	initPath           string
-	credentialSpec     string
-
-	Image string
-	Args  []string
-}
-
-// AddFlags adds all command line flags that will be used by Parse to the FlagSet
-func AddFlags(flags *pflag.FlagSet) *ContainerOptions {
-	copts := &ContainerOptions{
-		aliases:           opts.NewListOpts(nil),
-		attach:            opts.NewListOpts(ValidateAttach),
-		blkioWeightDevice: NewWeightdeviceOpt(ValidateWeightDevice),
-		capAdd:            opts.NewListOpts(nil),
-		capDrop:           opts.NewListOpts(nil),
-		dns:               opts.NewListOpts(opts.ValidateIPAddress),
-		dnsOptions:        opts.NewListOpts(nil),
-		dnsSearch:         opts.NewListOpts(opts.ValidateDNSSearch),
-		deviceReadBps:     NewThrottledeviceOpt(ValidateThrottleBpsDevice),
-		deviceReadIOps:    NewThrottledeviceOpt(ValidateThrottleIOpsDevice),
-		deviceWriteBps:    NewThrottledeviceOpt(ValidateThrottleBpsDevice),
-		deviceWriteIOps:   NewThrottledeviceOpt(ValidateThrottleIOpsDevice),
-		devices:           opts.NewListOpts(ValidateDevice),
-		env:               opts.NewListOpts(ValidateEnv),
-		envFile:           opts.NewListOpts(nil),
-		expose:            opts.NewListOpts(nil),
-		extraHosts:        opts.NewListOpts(ValidateExtraHost),
-		groupAdd:          opts.NewListOpts(nil),
-		labels:            opts.NewListOpts(ValidateEnv),
-		labelsFile:        opts.NewListOpts(nil),
-		linkLocalIPs:      opts.NewListOpts(nil),
-		links:             opts.NewListOpts(ValidateLink),
-		loggingOpts:       opts.NewListOpts(nil),
-		publish:           opts.NewListOpts(nil),
-		securityOpt:       opts.NewListOpts(nil),
-		storageOpt:        opts.NewListOpts(nil),
-		sysctls:           opts.NewMapOpts(nil, opts.ValidateSysctl),
-		tmpfs:             opts.NewListOpts(nil),
-		ulimits:           NewUlimitOpt(nil),
-		volumes:           opts.NewListOpts(nil),
-		volumesFrom:       opts.NewListOpts(nil),
-	}
-
-	// General purpose flags
-	flags.VarP(&copts.attach, "attach", "a", "Attach to STDIN, STDOUT or STDERR")
-	flags.Var(&copts.devices, "device", "Add a host device to the container")
-	flags.VarP(&copts.env, "env", "e", "Set environment variables")
-	flags.Var(&copts.envFile, "env-file", "Read in a file of environment variables")
-	flags.StringVar(&copts.entrypoint, "entrypoint", "", "Overwrite the default ENTRYPOINT of the image")
-	flags.Var(&copts.groupAdd, "group-add", "Add additional groups to join")
-	flags.StringVarP(&copts.hostname, "hostname", "h", "", "Container host name")
-	flags.BoolVarP(&copts.stdin, "interactive", "i", false, "Keep STDIN open even if not attached")
-	flags.VarP(&copts.labels, "label", "l", "Set meta data on a container")
-	flags.Var(&copts.labelsFile, "label-file", "Read in a line delimited file of labels")
-	flags.BoolVar(&copts.readonlyRootfs, "read-only", false, "Mount the container's root filesystem as read only")
-	flags.StringVar(&copts.restartPolicy, "restart", "no", "Restart policy to apply when a container exits")
-	flags.StringVar(&copts.stopSignal, "stop-signal", signal.DefaultStopSignal, fmt.Sprintf("Signal to stop a container, %v by default", signal.DefaultStopSignal))
-	flags.IntVar(&copts.stopTimeout, "stop-timeout", 0, "Timeout (in seconds) to stop a container")
-	flags.SetAnnotation("stop-timeout", "version", []string{"1.25"})
-	flags.Var(copts.sysctls, "sysctl", "Sysctl options")
-	flags.BoolVarP(&copts.tty, "tty", "t", false, "Allocate a pseudo-TTY")
-	flags.Var(copts.ulimits, "ulimit", "Ulimit options")
-	flags.StringVarP(&copts.user, "user", "u", "", "Username or UID (format: <name|uid>[:<group|gid>])")
-	flags.StringVarP(&copts.workingDir, "workdir", "w", "", "Working directory inside the container")
-	flags.BoolVar(&copts.autoRemove, "rm", false, "Automatically remove the container when it exits")
-
-	// Security
-	flags.Var(&copts.capAdd, "cap-add", "Add Linux capabilities")
-	flags.Var(&copts.capDrop, "cap-drop", "Drop Linux capabilities")
-	flags.BoolVar(&copts.privileged, "privileged", false, "Give extended privileges to this container")
-	flags.Var(&copts.securityOpt, "security-opt", "Security Options")
-	flags.StringVar(&copts.usernsMode, "userns", "", "User namespace to use")
-	flags.StringVar(&copts.credentialSpec, "credentialspec", "", "Credential spec for managed service account (Windows only)")
-
-	// Network and port publishing flag
-	flags.Var(&copts.extraHosts, "add-host", "Add a custom host-to-IP mapping (host:ip)")
-	flags.Var(&copts.dns, "dns", "Set custom DNS servers")
-	// We allow for both "--dns-opt" and "--dns-option", although the latter is the recommended way.
-	// This is to be consistent with service create/update
-	flags.Var(&copts.dnsOptions, "dns-opt", "Set DNS options")
-	flags.Var(&copts.dnsOptions, "dns-option", "Set DNS options")
-	flags.MarkHidden("dns-opt")
-	flags.Var(&copts.dnsSearch, "dns-search", "Set custom DNS search domains")
-	flags.Var(&copts.expose, "expose", "Expose a port or a range of ports")
-	flags.StringVar(&copts.ipv4Address, "ip", "", "Container IPv4 address (e.g. 172.30.100.104)")
-	flags.StringVar(&copts.ipv6Address, "ip6", "", "Container IPv6 address (e.g. 2001:db8::33)")
-	flags.Var(&copts.links, "link", "Add link to another container")
-	flags.Var(&copts.linkLocalIPs, "link-local-ip", "Container IPv4/IPv6 link-local addresses")
-	flags.StringVar(&copts.macAddress, "mac-address", "", "Container MAC address (e.g. 92:d0:c6:0a:29:33)")
-	flags.VarP(&copts.publish, "publish", "p", "Publish a container's port(s) to the host")
-	flags.BoolVarP(&copts.publishAll, "publish-all", "P", false, "Publish all exposed ports to random ports")
-	// We allow for both "--net" and "--network", although the latter is the recommended way.
-	flags.StringVar(&copts.netMode, "net", "default", "Connect a container to a network")
-	flags.StringVar(&copts.netMode, "network", "default", "Connect a container to a network")
-	flags.MarkHidden("net")
-	// We allow for both "--net-alias" and "--network-alias", although the latter is the recommended way.
-	flags.Var(&copts.aliases, "net-alias", "Add network-scoped alias for the container")
-	flags.Var(&copts.aliases, "network-alias", "Add network-scoped alias for the container")
-	flags.MarkHidden("net-alias")
-
-	// Logging and storage
-	flags.StringVar(&copts.loggingDriver, "log-driver", "", "Logging driver for the container")
-	flags.StringVar(&copts.volumeDriver, "volume-driver", "", "Optional volume driver for the container")
-	flags.Var(&copts.loggingOpts, "log-opt", "Log driver options")
-	flags.Var(&copts.storageOpt, "storage-opt", "Storage driver options for the container")
-	flags.Var(&copts.tmpfs, "tmpfs", "Mount a tmpfs directory")
-	flags.Var(&copts.volumesFrom, "volumes-from", "Mount volumes from the specified container(s)")
-	flags.VarP(&copts.volumes, "volume", "v", "Bind mount a volume")
-
-	// Health-checking
-	flags.StringVar(&copts.healthCmd, "health-cmd", "", "Command to run to check health")
-	flags.DurationVar(&copts.healthInterval, "health-interval", 0, "Time between running the check (ns|us|ms|s|m|h) (default 0s)")
-	flags.IntVar(&copts.healthRetries, "health-retries", 0, "Consecutive failures needed to report unhealthy")
-	flags.DurationVar(&copts.healthTimeout, "health-timeout", 0, "Maximum time to allow one check to run (ns|us|ms|s|m|h) (default 0s)")
-	flags.BoolVar(&copts.noHealthcheck, "no-healthcheck", false, "Disable any container-specified HEALTHCHECK")
-
-	// Resource management
-	flags.Uint16Var(&copts.blkioWeight, "blkio-weight", 0, "Block IO (relative weight), between 10 and 1000, or 0 to disable (default 0)")
-	flags.Var(&copts.blkioWeightDevice, "blkio-weight-device", "Block IO weight (relative device weight)")
-	flags.StringVar(&copts.containerIDFile, "cidfile", "", "Write the container ID to the file")
-	flags.StringVar(&copts.cpusetCpus, "cpuset-cpus", "", "CPUs in which to allow execution (0-3, 0,1)")
-	flags.StringVar(&copts.cpusetMems, "cpuset-mems", "", "MEMs in which to allow execution (0-3, 0,1)")
-	flags.Int64Var(&copts.cpuCount, "cpu-count", 0, "CPU count (Windows only)")
-	flags.Int64Var(&copts.cpuPercent, "cpu-percent", 0, "CPU percent (Windows only)")
-	flags.Int64Var(&copts.cpuPeriod, "cpu-period", 0, "Limit CPU CFS (Completely Fair Scheduler) period")
-	flags.Int64Var(&copts.cpuQuota, "cpu-quota", 0, "Limit CPU CFS (Completely Fair Scheduler) quota")
-	flags.Int64Var(&copts.cpuRealtimePeriod, "cpu-rt-period", 0, "Limit CPU real-time period in microseconds")
-	flags.Int64Var(&copts.cpuRealtimeRuntime, "cpu-rt-runtime", 0, "Limit CPU real-time runtime in microseconds")
-	flags.Int64VarP(&copts.cpuShares, "cpu-shares", "c", 0, "CPU shares (relative weight)")
-	flags.Var(&copts.cpus, "cpus", "Number of CPUs")
-	flags.Var(&copts.deviceReadBps, "device-read-bps", "Limit read rate (bytes per second) from a device")
-	flags.Var(&copts.deviceReadIOps, "device-read-iops", "Limit read rate (IO per second) from a device")
-	flags.Var(&copts.deviceWriteBps, "device-write-bps", "Limit write rate (bytes per second) to a device")
-	flags.Var(&copts.deviceWriteIOps, "device-write-iops", "Limit write rate (IO per second) to a device")
-	flags.StringVar(&copts.ioMaxBandwidth, "io-maxbandwidth", "", "Maximum IO bandwidth limit for the system drive (Windows only)")
-	flags.Uint64Var(&copts.ioMaxIOps, "io-maxiops", 0, "Maximum IOps limit for the system drive (Windows only)")
-	flags.StringVar(&copts.kernelMemory, "kernel-memory", "", "Kernel memory limit")
-	flags.StringVarP(&copts.memoryString, "memory", "m", "", "Memory limit")
-	flags.StringVar(&copts.memoryReservation, "memory-reservation", "", "Memory soft limit")
-	flags.StringVar(&copts.memorySwap, "memory-swap", "", "Swap limit equal to memory plus swap: '-1' to enable unlimited swap")
-	flags.Int64Var(&copts.swappiness, "memory-swappiness", -1, "Tune container memory swappiness (0 to 100)")
-	flags.BoolVar(&copts.oomKillDisable, "oom-kill-disable", false, "Disable OOM Killer")
-	flags.IntVar(&copts.oomScoreAdj, "oom-score-adj", 0, "Tune host's OOM preferences (-1000 to 1000)")
-	flags.Int64Var(&copts.pidsLimit, "pids-limit", 0, "Tune container pids limit (set -1 for unlimited)")
-
-	// Low-level execution (cgroups, namespaces, ...)
-	flags.StringVar(&copts.cgroupParent, "cgroup-parent", "", "Optional parent cgroup for the container")
-	flags.StringVar(&copts.ipcMode, "ipc", "", "IPC namespace to use")
-	flags.StringVar(&copts.isolation, "isolation", "", "Container isolation technology")
-	flags.StringVar(&copts.pidMode, "pid", "", "PID namespace to use")
-	flags.StringVar(&copts.shmSize, "shm-size", "", "Size of /dev/shm, default value is 64MB")
-	flags.StringVar(&copts.utsMode, "uts", "", "UTS namespace to use")
-	flags.StringVar(&copts.runtime, "runtime", "", "Runtime to use for this container")
-
-	flags.BoolVar(&copts.init, "init", false, "Run an init inside the container that forwards signals and reaps processes")
-	flags.StringVar(&copts.initPath, "init-path", "", "Path to the docker-init binary")
-	return copts
-}
-
-// Parse parses the args for the specified command and generates a Config,
-// a HostConfig and returns them with the specified command.
-// If the specified args are not valid, it will return an error.
-func Parse(flags *pflag.FlagSet, copts *ContainerOptions) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
-	var (
-		attachStdin  = copts.attach.Get("stdin")
-		attachStdout = copts.attach.Get("stdout")
-		attachStderr = copts.attach.Get("stderr")
-	)
-
-	// Validate the input mac address
-	if copts.macAddress != "" {
-		if _, err := ValidateMACAddress(copts.macAddress); err != nil {
-			return nil, nil, nil, fmt.Errorf("%s is not a valid mac address", copts.macAddress)
-		}
-	}
-	if copts.stdin {
-		attachStdin = true
-	}
-	// If -a is not set, attach to stdout and stderr
-	if copts.attach.Len() == 0 {
-		attachStdout = true
-		attachStderr = true
-	}
-
-	var err error
-
-	var memory int64
-	if copts.memoryString != "" {
-		memory, err = units.RAMInBytes(copts.memoryString)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	var memoryReservation int64
-	if copts.memoryReservation != "" {
-		memoryReservation, err = units.RAMInBytes(copts.memoryReservation)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	var memorySwap int64
-	if copts.memorySwap != "" {
-		if copts.memorySwap == "-1" {
-			memorySwap = -1
-		} else {
-			memorySwap, err = units.RAMInBytes(copts.memorySwap)
-			if err != nil {
-				return nil, nil, nil, err
-			}
-		}
-	}
-
-	var kernelMemory int64
-	if copts.kernelMemory != "" {
-		kernelMemory, err = units.RAMInBytes(copts.kernelMemory)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	swappiness := copts.swappiness
-	if swappiness != -1 && (swappiness < 0 || swappiness > 100) {
-		return nil, nil, nil, fmt.Errorf("invalid value: %d. Valid memory swappiness range is 0-100", swappiness)
-	}
-
-	var shmSize int64
-	if copts.shmSize != "" {
-		shmSize, err = units.RAMInBytes(copts.shmSize)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-	}
-
-	// TODO FIXME units.RAMInBytes should have a uint64 version
-	var maxIOBandwidth int64
-	if copts.ioMaxBandwidth != "" {
-		maxIOBandwidth, err = units.RAMInBytes(copts.ioMaxBandwidth)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-		if maxIOBandwidth < 0 {
-			return nil, nil, nil, fmt.Errorf("invalid value: %s. Maximum IO Bandwidth must be positive", copts.ioMaxBandwidth)
-		}
-	}
-
-	var binds []string
-	volumes := copts.volumes.GetMap()
-	// add any bind targets to the list of container volumes
-	for bind := range copts.volumes.GetMap() {
-		if arr := volumeSplitN(bind, 2); len(arr) > 1 {
-			// after creating the bind mount we want to delete it from the copts.volumes values because
-			// we do not want bind mounts being committed to image configs
-			binds = append(binds, bind)
-			// We should delete from the map (`volumes`) here, as deleting from copts.volumes will not work if
-			// there are duplicates entries.
-			delete(volumes, bind)
-		}
-	}
-
-	// Can't evaluate options passed into --tmpfs until we actually mount
-	tmpfs := make(map[string]string)
-	for _, t := range copts.tmpfs.GetAll() {
-		if arr := strings.SplitN(t, ":", 2); len(arr) > 1 {
-			tmpfs[arr[0]] = arr[1]
-		} else {
-			tmpfs[arr[0]] = ""
-		}
-	}
-
-	var (
-		runCmd     strslice.StrSlice
-		entrypoint strslice.StrSlice
-	)
-
-	if len(copts.Args) > 0 {
-		runCmd = strslice.StrSlice(copts.Args)
-	}
-
-	if copts.entrypoint != "" {
-		entrypoint = strslice.StrSlice{copts.entrypoint}
-	} else if flags.Changed("entrypoint") {
-		// if `--entrypoint=` is parsed then Entrypoint is reset
-		entrypoint = []string{""}
-	}
-
-	ports, portBindings, err := nat.ParsePortSpecs(copts.publish.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	// Merge in exposed ports to the map of published ports
-	for _, e := range copts.expose.GetAll() {
-		if strings.Contains(e, ":") {
-			return nil, nil, nil, fmt.Errorf("invalid port format for --expose: %s", e)
-		}
-		//support two formats for expose, original format <portnum>/[<proto>] or <startport-endport>/[<proto>]
-		proto, port := nat.SplitProtoPort(e)
-		//parse the start and end port and create a sequence of ports to expose
-		//if expose a port, the start and end port are the same
-		start, end, err := nat.ParsePortRange(port)
-		if err != nil {
-			return nil, nil, nil, fmt.Errorf("invalid range format for --expose: %s, error: %s", e, err)
-		}
-		for i := start; i <= end; i++ {
-			p, err := nat.NewPort(proto, strconv.FormatUint(i, 10))
-			if err != nil {
-				return nil, nil, nil, err
-			}
-			if _, exists := ports[p]; !exists {
-				ports[p] = struct{}{}
-			}
-		}
-	}
-
-	// parse device mappings
-	deviceMappings := []container.DeviceMapping{}
-	for _, device := range copts.devices.GetAll() {
-		deviceMapping, err := ParseDevice(device)
-		if err != nil {
-			return nil, nil, nil, err
-		}
-		deviceMappings = append(deviceMappings, deviceMapping)
-	}
-
-	// collect all the environment variables for the container
-	envVariables, err := ReadKVStrings(copts.envFile.GetAll(), copts.env.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	// collect all the labels for the container
-	labels, err := ReadKVStrings(copts.labelsFile.GetAll(), copts.labels.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	ipcMode := container.IpcMode(copts.ipcMode)
-	if !ipcMode.Valid() {
-		return nil, nil, nil, fmt.Errorf("--ipc: invalid IPC mode")
-	}
-
-	pidMode := container.PidMode(copts.pidMode)
-	if !pidMode.Valid() {
-		return nil, nil, nil, fmt.Errorf("--pid: invalid PID mode")
-	}
-
-	utsMode := container.UTSMode(copts.utsMode)
-	if !utsMode.Valid() {
-		return nil, nil, nil, fmt.Errorf("--uts: invalid UTS mode")
-	}
-
-	usernsMode := container.UsernsMode(copts.usernsMode)
-	if !usernsMode.Valid() {
-		return nil, nil, nil, fmt.Errorf("--userns: invalid USER mode")
-	}
-
-	restartPolicy, err := ParseRestartPolicy(copts.restartPolicy)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	loggingOpts, err := parseLoggingOpts(copts.loggingDriver, copts.loggingOpts.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	securityOpts, err := parseSecurityOpts(copts.securityOpt.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	storageOpts, err := parseStorageOpts(copts.storageOpt.GetAll())
-	if err != nil {
-		return nil, nil, nil, err
-	}
-
-	// Healthcheck
-	var healthConfig *container.HealthConfig
-	haveHealthSettings := copts.healthCmd != "" ||
-		copts.healthInterval != 0 ||
-		copts.healthTimeout != 0 ||
-		copts.healthRetries != 0
-	if copts.noHealthcheck {
-		if haveHealthSettings {
-			return nil, nil, nil, fmt.Errorf("--no-healthcheck conflicts with --health-* options")
-		}
-		test := strslice.StrSlice{"NONE"}
-		healthConfig = &container.HealthConfig{Test: test}
-	} else if haveHealthSettings {
-		var probe strslice.StrSlice
-		if copts.healthCmd != "" {
-			args := []string{"CMD-SHELL", copts.healthCmd}
-			probe = strslice.StrSlice(args)
-		}
-		if copts.healthInterval < 0 {
-			return nil, nil, nil, fmt.Errorf("--health-interval cannot be negative")
-		}
-		if copts.healthTimeout < 0 {
-			return nil, nil, nil, fmt.Errorf("--health-timeout cannot be negative")
-		}
-
-		healthConfig = &container.HealthConfig{
-			Test:     probe,
-			Interval: copts.healthInterval,
-			Timeout:  copts.healthTimeout,
-			Retries:  copts.healthRetries,
-		}
-	}
-
-	resources := container.Resources{
-		CgroupParent:         copts.cgroupParent,
-		Memory:               memory,
-		MemoryReservation:    memoryReservation,
-		MemorySwap:           memorySwap,
-		MemorySwappiness:     &copts.swappiness,
-		KernelMemory:         kernelMemory,
-		OomKillDisable:       &copts.oomKillDisable,
-		NanoCPUs:             copts.cpus.Value(),
-		CPUCount:             copts.cpuCount,
-		CPUPercent:           copts.cpuPercent,
-		CPUShares:            copts.cpuShares,
-		CPUPeriod:            copts.cpuPeriod,
-		CpusetCpus:           copts.cpusetCpus,
-		CpusetMems:           copts.cpusetMems,
-		CPUQuota:             copts.cpuQuota,
-		CPURealtimePeriod:    copts.cpuRealtimePeriod,
-		CPURealtimeRuntime:   copts.cpuRealtimeRuntime,
-		PidsLimit:            copts.pidsLimit,
-		BlkioWeight:          copts.blkioWeight,
-		BlkioWeightDevice:    copts.blkioWeightDevice.GetList(),
-		BlkioDeviceReadBps:   copts.deviceReadBps.GetList(),
-		BlkioDeviceWriteBps:  copts.deviceWriteBps.GetList(),
-		BlkioDeviceReadIOps:  copts.deviceReadIOps.GetList(),
-		BlkioDeviceWriteIOps: copts.deviceWriteIOps.GetList(),
-		IOMaximumIOps:        copts.ioMaxIOps,
-		IOMaximumBandwidth:   uint64(maxIOBandwidth),
-		Ulimits:              copts.ulimits.GetList(),
-		Devices:              deviceMappings,
-	}
-
-	config := &container.Config{
-		Hostname:     copts.hostname,
-		ExposedPorts: ports,
-		User:         copts.user,
-		Tty:          copts.tty,
-		// TODO: deprecated, it comes from -n, --networking
-		// it's still needed internally to set the network to disabled
-		// if e.g. bridge is none in daemon opts, and in inspect
-		NetworkDisabled: false,
-		OpenStdin:       copts.stdin,
-		AttachStdin:     attachStdin,
-		AttachStdout:    attachStdout,
-		AttachStderr:    attachStderr,
-		Env:             envVariables,
-		Cmd:             runCmd,
-		Image:           copts.Image,
-		Volumes:         volumes,
-		MacAddress:      copts.macAddress,
-		Entrypoint:      entrypoint,
-		WorkingDir:      copts.workingDir,
-		Labels:          ConvertKVStringsToMap(labels),
-		Healthcheck:     healthConfig,
-	}
-	if flags.Changed("stop-signal") {
-		config.StopSignal = copts.stopSignal
-	}
-	if flags.Changed("stop-timeout") {
-		config.StopTimeout = &copts.stopTimeout
-	}
-
-	hostConfig := &container.HostConfig{
-		Binds:           binds,
-		ContainerIDFile: copts.containerIDFile,
-		OomScoreAdj:     copts.oomScoreAdj,
-		AutoRemove:      copts.autoRemove,
-		Privileged:      copts.privileged,
-		PortBindings:    portBindings,
-		Links:           copts.links.GetAll(),
-		PublishAllPorts: copts.publishAll,
-		// Make sure the dns fields are never nil.
-		// New containers don't ever have those fields nil,
-		// but pre created containers can still have those nil values.
-		// See https://github.com/docker/docker/pull/17779
-		// for a more detailed explanation on why we don't want that.
-		DNS:            copts.dns.GetAllOrEmpty(),
-		DNSSearch:      copts.dnsSearch.GetAllOrEmpty(),
-		DNSOptions:     copts.dnsOptions.GetAllOrEmpty(),
-		ExtraHosts:     copts.extraHosts.GetAll(),
-		VolumesFrom:    copts.volumesFrom.GetAll(),
-		NetworkMode:    container.NetworkMode(copts.netMode),
-		IpcMode:        ipcMode,
-		PidMode:        pidMode,
-		UTSMode:        utsMode,
-		UsernsMode:     usernsMode,
-		CapAdd:         strslice.StrSlice(copts.capAdd.GetAll()),
-		CapDrop:        strslice.StrSlice(copts.capDrop.GetAll()),
-		GroupAdd:       copts.groupAdd.GetAll(),
-		RestartPolicy:  restartPolicy,
-		SecurityOpt:    securityOpts,
-		StorageOpt:     storageOpts,
-		ReadonlyRootfs: copts.readonlyRootfs,
-		LogConfig:      container.LogConfig{Type: copts.loggingDriver, Config: loggingOpts},
-		VolumeDriver:   copts.volumeDriver,
-		Isolation:      container.Isolation(copts.isolation),
-		ShmSize:        shmSize,
-		Resources:      resources,
-		Tmpfs:          tmpfs,
-		Sysctls:        copts.sysctls.GetAll(),
-		Runtime:        copts.runtime,
-	}
-
-	// only set this value if the user provided the flag, else it should default to nil
-	if flags.Changed("init") {
-		hostConfig.Init = &copts.init
-	}
-
-	// When allocating stdin in attached mode, close stdin at client disconnect
-	if config.OpenStdin && config.AttachStdin {
-		config.StdinOnce = true
-	}
-
-	networkingConfig := &networktypes.NetworkingConfig{
-		EndpointsConfig: make(map[string]*networktypes.EndpointSettings),
-	}
-
-	if copts.ipv4Address != "" || copts.ipv6Address != "" || copts.linkLocalIPs.Len() > 0 {
-		epConfig := &networktypes.EndpointSettings{}
-		networkingConfig.EndpointsConfig[string(hostConfig.NetworkMode)] = epConfig
-
-		epConfig.IPAMConfig = &networktypes.EndpointIPAMConfig{
-			IPv4Address: copts.ipv4Address,
-			IPv6Address: copts.ipv6Address,
-		}
-
-		if copts.linkLocalIPs.Len() > 0 {
-			epConfig.IPAMConfig.LinkLocalIPs = make([]string, copts.linkLocalIPs.Len())
-			copy(epConfig.IPAMConfig.LinkLocalIPs, copts.linkLocalIPs.GetAll())
-		}
-	}
-
-	if hostConfig.NetworkMode.IsUserDefined() && len(hostConfig.Links) > 0 {
-		epConfig := networkingConfig.EndpointsConfig[string(hostConfig.NetworkMode)]
-		if epConfig == nil {
-			epConfig = &networktypes.EndpointSettings{}
-		}
-		epConfig.Links = make([]string, len(hostConfig.Links))
-		copy(epConfig.Links, hostConfig.Links)
-		networkingConfig.EndpointsConfig[string(hostConfig.NetworkMode)] = epConfig
-	}
-
-	if copts.aliases.Len() > 0 {
-		epConfig := networkingConfig.EndpointsConfig[string(hostConfig.NetworkMode)]
-		if epConfig == nil {
-			epConfig = &networktypes.EndpointSettings{}
-		}
-		epConfig.Aliases = make([]string, copts.aliases.Len())
-		copy(epConfig.Aliases, copts.aliases.GetAll())
-		networkingConfig.EndpointsConfig[string(hostConfig.NetworkMode)] = epConfig
-	}
-
-	return config, hostConfig, networkingConfig, nil
-}
-
-// ReadKVStrings reads a file of line terminated key=value pairs, and overrides any keys
-// present in the file with additional pairs specified in the override parameter
-func ReadKVStrings(files []string, override []string) ([]string, error) {
-	envVariables := []string{}
-	for _, ef := range files {
-		parsedVars, err := ParseEnvFile(ef)
-		if err != nil {
-			return nil, err
-		}
-		envVariables = append(envVariables, parsedVars...)
-	}
-	// parse the '-e' and '--env' after, to allow override
-	envVariables = append(envVariables, override...)
-
-	return envVariables, nil
-}
-
-// ConvertKVStringsToMap converts ["key=value"] to {"key":"value"}
-func ConvertKVStringsToMap(values []string) map[string]string {
-	result := make(map[string]string, len(values))
-	for _, value := range values {
-		kv := strings.SplitN(value, "=", 2)
-		if len(kv) == 1 {
-			result[kv[0]] = ""
-		} else {
-			result[kv[0]] = kv[1]
-		}
-	}
-
-	return result
-}
-
-// ConvertKVStringsToMapWithNil converts ["key=value"] to {"key":"value"}
-// but set unset keys to nil - meaning the ones with no "=" in them.
-// We use this in cases where we need to distinguish between
-//   FOO=  and FOO
-// where the latter case just means FOO was mentioned but not given a value
-func ConvertKVStringsToMapWithNil(values []string) map[string]*string {
-	result := make(map[string]*string, len(values))
-	for _, value := range values {
-		kv := strings.SplitN(value, "=", 2)
-		if len(kv) == 1 {
-			result[kv[0]] = nil
-		} else {
-			result[kv[0]] = &kv[1]
-		}
-	}
-
-	return result
-}
-
-func parseLoggingOpts(loggingDriver string, loggingOpts []string) (map[string]string, error) {
-	loggingOptsMap := ConvertKVStringsToMap(loggingOpts)
-	if loggingDriver == "none" && len(loggingOpts) > 0 {
-		return map[string]string{}, fmt.Errorf("invalid logging opts for driver %s", loggingDriver)
-	}
-	return loggingOptsMap, nil
-}
-
-// takes a local seccomp daemon, reads the file contents for sending to the daemon
-func parseSecurityOpts(securityOpts []string) ([]string, error) {
-	for key, opt := range securityOpts {
-		con := strings.SplitN(opt, "=", 2)
-		if len(con) == 1 && con[0] != "no-new-privileges" {
-			if strings.Contains(opt, ":") {
-				con = strings.SplitN(opt, ":", 2)
-			} else {
-				return securityOpts, fmt.Errorf("Invalid --security-opt: %q", opt)
-			}
-		}
-		if con[0] == "seccomp" && con[1] != "unconfined" {
-			f, err := ioutil.ReadFile(con[1])
-			if err != nil {
-				return securityOpts, fmt.Errorf("opening seccomp profile (%s) failed: %v", con[1], err)
-			}
-			b := bytes.NewBuffer(nil)
-			if err := json.Compact(b, f); err != nil {
-				return securityOpts, fmt.Errorf("compacting json for seccomp profile (%s) failed: %v", con[1], err)
-			}
-			securityOpts[key] = fmt.Sprintf("seccomp=%s", b.Bytes())
-		}
-	}
-
-	return securityOpts, nil
-}
-
-// parses storage options per container into a map
-func parseStorageOpts(storageOpts []string) (map[string]string, error) {
-	m := make(map[string]string)
-	for _, option := range storageOpts {
-		if strings.Contains(option, "=") {
-			opt := strings.SplitN(option, "=", 2)
-			m[opt[0]] = opt[1]
-		} else {
-			return nil, fmt.Errorf("invalid storage option")
-		}
-	}
-	return m, nil
-}
-
-// ParseRestartPolicy returns the parsed policy or an error indicating what is incorrect
-func ParseRestartPolicy(policy string) (container.RestartPolicy, error) {
-	p := container.RestartPolicy{}
-
-	if policy == "" {
-		return p, nil
-	}
-
-	parts := strings.Split(policy, ":")
-
-	if len(parts) > 2 {
-		return p, fmt.Errorf("invalid restart policy format")
-	}
-	if len(parts) == 2 {
-		count, err := strconv.Atoi(parts[1])
-		if err != nil {
-			return p, fmt.Errorf("maximum retry count must be an integer")
-		}
-
-		p.MaximumRetryCount = count
-	}
-
-	p.Name = parts[0]
-
-	return p, nil
-}
-
-// ParseDevice parses a device mapping string to a container.DeviceMapping struct
-func ParseDevice(device string) (container.DeviceMapping, error) {
-	src := ""
-	dst := ""
-	permissions := "rwm"
-	arr := strings.Split(device, ":")
-	switch len(arr) {
-	case 3:
-		permissions = arr[2]
-		fallthrough
-	case 2:
-		if ValidDeviceMode(arr[1]) {
-			permissions = arr[1]
-		} else {
-			dst = arr[1]
-		}
-		fallthrough
-	case 1:
-		src = arr[0]
-	default:
-		return container.DeviceMapping{}, fmt.Errorf("invalid device specification: %s", device)
-	}
-
-	if dst == "" {
-		dst = src
-	}
-
-	deviceMapping := container.DeviceMapping{
-		PathOnHost:        src,
-		PathInContainer:   dst,
-		CgroupPermissions: permissions,
-	}
-	return deviceMapping, nil
-}
-
-// ParseLink parses and validates the specified string as a link format (name:alias)
-func ParseLink(val string) (string, string, error) {
-	if val == "" {
-		return "", "", fmt.Errorf("empty string specified for links")
-	}
-	arr := strings.Split(val, ":")
-	if len(arr) > 2 {
-		return "", "", fmt.Errorf("bad format for links: %s", val)
-	}
-	if len(arr) == 1 {
-		return val, val, nil
-	}
-	// This is kept because we can actually get a HostConfig with links
-	// from an already created container and the format is not `foo:bar`
-	// but `/foo:/c1/bar`
-	if strings.HasPrefix(arr[0], "/") {
-		_, alias := path.Split(arr[1])
-		return arr[0][1:], alias, nil
-	}
-	return arr[0], arr[1], nil
-}
-
-// ValidateLink validates that the specified string has a valid link format (containerName:alias).
-func ValidateLink(val string) (string, error) {
-	if _, _, err := ParseLink(val); err != nil {
-		return val, err
-	}
-	return val, nil
-}
-
-// ValidDeviceMode checks if the mode for device is valid or not.
-// Valid mode is a composition of r (read), w (write), and m (mknod).
-func ValidDeviceMode(mode string) bool {
-	var legalDeviceMode = map[rune]bool{
-		'r': true,
-		'w': true,
-		'm': true,
-	}
-	if mode == "" {
-		return false
-	}
-	for _, c := range mode {
-		if !legalDeviceMode[c] {
-			return false
-		}
-		legalDeviceMode[c] = false
-	}
-	return true
-}
-
-// ValidateDevice validates a path for devices
-// It will make sure 'val' is in the form:
-//    [host-dir:]container-path[:mode]
-// It also validates the device mode.
-func ValidateDevice(val string) (string, error) {
-	return validatePath(val, ValidDeviceMode)
-}
-
-func validatePath(val string, validator func(string) bool) (string, error) {
-	var containerPath string
-	var mode string
-
-	if strings.Count(val, ":") > 2 {
-		return val, fmt.Errorf("bad format for path: %s", val)
-	}
-
-	split := strings.SplitN(val, ":", 3)
-	if split[0] == "" {
-		return val, fmt.Errorf("bad format for path: %s", val)
-	}
-	switch len(split) {
-	case 1:
-		containerPath = split[0]
-		val = path.Clean(containerPath)
-	case 2:
-		if isValid := validator(split[1]); isValid {
-			containerPath = split[0]
-			mode = split[1]
-			val = fmt.Sprintf("%s:%s", path.Clean(containerPath), mode)
-		} else {
-			containerPath = split[1]
-			val = fmt.Sprintf("%s:%s", split[0], path.Clean(containerPath))
-		}
-	case 3:
-		containerPath = split[1]
-		mode = split[2]
-		if isValid := validator(split[2]); !isValid {
-			return val, fmt.Errorf("bad mode specified: %s", mode)
-		}
-		val = fmt.Sprintf("%s:%s:%s", split[0], containerPath, mode)
-	}
-
-	if !path.IsAbs(containerPath) {
-		return val, fmt.Errorf("%s is not an absolute path", containerPath)
-	}
-	return val, nil
-}
-
-// volumeSplitN splits raw into a maximum of n parts, separated by a separator colon.
-// A separator colon is the last `:` character in the regex `[:\\]?[a-zA-Z]:` (note `\\` is `\` escaped).
-// In Windows driver letter appears in two situations:
-// a. `^[a-zA-Z]:` (A colon followed  by `^[a-zA-Z]:` is OK as colon is the separator in volume option)
-// b. A string in the format like `\\?\C:\Windows\...` (UNC).
-// Therefore, a driver letter can only follow either a `:` or `\\`
-// This allows to correctly split strings such as `C:\foo:D:\:rw` or `/tmp/q:/foo`.
-func volumeSplitN(raw string, n int) []string {
-	var array []string
-	if len(raw) == 0 || raw[0] == ':' {
-		// invalid
-		return nil
-	}
-	// numberOfParts counts the number of parts separated by a separator colon
-	numberOfParts := 0
-	// left represents the left-most cursor in raw, updated at every `:` character considered as a separator.
-	left := 0
-	// right represents the right-most cursor in raw incremented with the loop. Note this
-	// starts at index 1 as index 0 is already handle above as a special case.
-	for right := 1; right < len(raw); right++ {
-		// stop parsing if reached maximum number of parts
-		if n >= 0 && numberOfParts >= n {
-			break
-		}
-		if raw[right] != ':' {
-			continue
-		}
-		potentialDriveLetter := raw[right-1]
-		if (potentialDriveLetter >= 'A' && potentialDriveLetter <= 'Z') || (potentialDriveLetter >= 'a' && potentialDriveLetter <= 'z') {
-			if right > 1 {
-				beforePotentialDriveLetter := raw[right-2]
-				// Only `:` or `\\` are checked (`/` could fall into the case of `/tmp/q:/foo`)
-				if beforePotentialDriveLetter != ':' && beforePotentialDriveLetter != '\\' {
-					// e.g. `C:` is not preceded by any delimiter, therefore it was not a drive letter but a path ending with `C:`.
-					array = append(array, raw[left:right])
-					left = right + 1
-					numberOfParts++
-				}
-				// else, `C:` is considered as a drive letter and not as a delimiter, so we continue parsing.
-			}
-			// if right == 1, then `C:` is the beginning of the raw string, therefore `:` is again not considered a delimiter and we continue parsing.
-		} else {
-			// if `:` is not preceded by a potential drive letter, then consider it as a delimiter.
-			array = append(array, raw[left:right])
-			left = right + 1
-			numberOfParts++
-		}
-	}
-	// need to take care of the last part
-	if left < len(raw) {
-		if n >= 0 && numberOfParts >= n {
-			// if the maximum number of parts is reached, just append the rest to the last part
-			// left-1 is at the last `:` that needs to be included since not considered a separator.
-			array[n-1] += raw[left-1:]
-		} else {
-			array = append(array, raw[left:])
-		}
-	}
-	return array
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/parse_test.go b/installer/vendor/github.com/docker/docker/runconfig/opts/parse_test.go
deleted file mode 100644
index a1be379ae8..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/parse_test.go
+++ /dev/null
@@ -1,894 +0,0 @@
-package opts
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	networktypes "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/go-connections/nat"
-	"github.com/spf13/pflag"
-)
-
-func parseRun(args []string) (*container.Config, *container.HostConfig, *networktypes.NetworkingConfig, error) {
-	flags := pflag.NewFlagSet("run", pflag.ContinueOnError)
-	flags.SetOutput(ioutil.Discard)
-	flags.Usage = nil
-	copts := AddFlags(flags)
-	if err := flags.Parse(args); err != nil {
-		return nil, nil, nil, err
-	}
-	return Parse(flags, copts)
-}
-
-func parse(t *testing.T, args string) (*container.Config, *container.HostConfig, error) {
-	config, hostConfig, _, err := parseRun(strings.Split(args+" ubuntu bash", " "))
-	return config, hostConfig, err
-}
-
-func mustParse(t *testing.T, args string) (*container.Config, *container.HostConfig) {
-	config, hostConfig, err := parse(t, args)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return config, hostConfig
-}
-
-func TestParseRunLinks(t *testing.T) {
-	if _, hostConfig := mustParse(t, "--link a:b"); len(hostConfig.Links) == 0 || hostConfig.Links[0] != "a:b" {
-		t.Fatalf("Error parsing links. Expected []string{\"a:b\"}, received: %v", hostConfig.Links)
-	}
-	if _, hostConfig := mustParse(t, "--link a:b --link c:d"); len(hostConfig.Links) < 2 || hostConfig.Links[0] != "a:b" || hostConfig.Links[1] != "c:d" {
-		t.Fatalf("Error parsing links. Expected []string{\"a:b\", \"c:d\"}, received: %v", hostConfig.Links)
-	}
-	if _, hostConfig := mustParse(t, ""); len(hostConfig.Links) != 0 {
-		t.Fatalf("Error parsing links. No link expected, received: %v", hostConfig.Links)
-	}
-}
-
-func TestParseRunAttach(t *testing.T) {
-	if config, _ := mustParse(t, "-a stdin"); !config.AttachStdin || config.AttachStdout || config.AttachStderr {
-		t.Fatalf("Error parsing attach flags. Expect only Stdin enabled. Received: in: %v, out: %v, err: %v", config.AttachStdin, config.AttachStdout, config.AttachStderr)
-	}
-	if config, _ := mustParse(t, "-a stdin -a stdout"); !config.AttachStdin || !config.AttachStdout || config.AttachStderr {
-		t.Fatalf("Error parsing attach flags. Expect only Stdin and Stdout enabled. Received: in: %v, out: %v, err: %v", config.AttachStdin, config.AttachStdout, config.AttachStderr)
-	}
-	if config, _ := mustParse(t, "-a stdin -a stdout -a stderr"); !config.AttachStdin || !config.AttachStdout || !config.AttachStderr {
-		t.Fatalf("Error parsing attach flags. Expect all attach enabled. Received: in: %v, out: %v, err: %v", config.AttachStdin, config.AttachStdout, config.AttachStderr)
-	}
-	if config, _ := mustParse(t, ""); config.AttachStdin || !config.AttachStdout || !config.AttachStderr {
-		t.Fatalf("Error parsing attach flags. Expect Stdin disabled. Received: in: %v, out: %v, err: %v", config.AttachStdin, config.AttachStdout, config.AttachStderr)
-	}
-	if config, _ := mustParse(t, "-i"); !config.AttachStdin || !config.AttachStdout || !config.AttachStderr {
-		t.Fatalf("Error parsing attach flags. Expect Stdin enabled. Received: in: %v, out: %v, err: %v", config.AttachStdin, config.AttachStdout, config.AttachStderr)
-	}
-
-	if _, _, err := parse(t, "-a"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a invalid"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a invalid` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a invalid -a stdout"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a stdout -a invalid` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a stdout -a stderr -d"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a stdout -a stderr -d` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a stdin -d"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a stdin -d` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a stdout -d"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a stdout -d` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-a stderr -d"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-a stderr -d` should be an error but is not")
-	}
-	if _, _, err := parse(t, "-d --rm"); err == nil {
-		t.Fatalf("Error parsing attach flags, `-d --rm` should be an error but is not")
-	}
-}
-
-func TestParseRunVolumes(t *testing.T) {
-
-	// A single volume
-	arr, tryit := setupPlatformVolume([]string{`/tmp`}, []string{`c:\tmp`})
-	if config, hostConfig := mustParse(t, tryit); hostConfig.Binds != nil {
-		t.Fatalf("Error parsing volume flags, %q should not mount-bind anything. Received %v", tryit, hostConfig.Binds)
-	} else if _, exists := config.Volumes[arr[0]]; !exists {
-		t.Fatalf("Error parsing volume flags, %q is missing from volumes. Received %v", tryit, config.Volumes)
-	}
-
-	// Two volumes
-	arr, tryit = setupPlatformVolume([]string{`/tmp`, `/var`}, []string{`c:\tmp`, `c:\var`})
-	if config, hostConfig := mustParse(t, tryit); hostConfig.Binds != nil {
-		t.Fatalf("Error parsing volume flags, %q should not mount-bind anything. Received %v", tryit, hostConfig.Binds)
-	} else if _, exists := config.Volumes[arr[0]]; !exists {
-		t.Fatalf("Error parsing volume flags, %s is missing from volumes. Received %v", arr[0], config.Volumes)
-	} else if _, exists := config.Volumes[arr[1]]; !exists {
-		t.Fatalf("Error parsing volume flags, %s is missing from volumes. Received %v", arr[1], config.Volumes)
-	}
-
-	// A single bind-mount
-	arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp`}, []string{os.Getenv("TEMP") + `:c:\containerTmp`})
-	if config, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || hostConfig.Binds[0] != arr[0] {
-		t.Fatalf("Error parsing volume flags, %q should mount-bind the path before the colon into the path after the colon. Received %v %v", arr[0], hostConfig.Binds, config.Volumes)
-	}
-
-	// Two bind-mounts.
-	arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp`, `/hostVar:/containerVar`}, []string{os.Getenv("ProgramData") + `:c:\ContainerPD`, os.Getenv("TEMP") + `:c:\containerTmp`})
-	if _, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || compareRandomizedStrings(hostConfig.Binds[0], hostConfig.Binds[1], arr[0], arr[1]) != nil {
-		t.Fatalf("Error parsing volume flags, `%s and %s` did not mount-bind correctly. Received %v", arr[0], arr[1], hostConfig.Binds)
-	}
-
-	// Two bind-mounts, first read-only, second read-write.
-	// TODO Windows: The Windows version uses read-write as that's the only mode it supports. Can change this post TP4
-	arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp:ro`, `/hostVar:/containerVar:rw`}, []string{os.Getenv("TEMP") + `:c:\containerTmp:rw`, os.Getenv("ProgramData") + `:c:\ContainerPD:rw`})
-	if _, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || compareRandomizedStrings(hostConfig.Binds[0], hostConfig.Binds[1], arr[0], arr[1]) != nil {
-		t.Fatalf("Error parsing volume flags, `%s and %s` did not mount-bind correctly. Received %v", arr[0], arr[1], hostConfig.Binds)
-	}
-
-	// Similar to previous test but with alternate modes which are only supported by Linux
-	if runtime.GOOS != "windows" {
-		arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp:ro,Z`, `/hostVar:/containerVar:rw,Z`}, []string{})
-		if _, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || compareRandomizedStrings(hostConfig.Binds[0], hostConfig.Binds[1], arr[0], arr[1]) != nil {
-			t.Fatalf("Error parsing volume flags, `%s and %s` did not mount-bind correctly. Received %v", arr[0], arr[1], hostConfig.Binds)
-		}
-
-		arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp:Z`, `/hostVar:/containerVar:z`}, []string{})
-		if _, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || compareRandomizedStrings(hostConfig.Binds[0], hostConfig.Binds[1], arr[0], arr[1]) != nil {
-			t.Fatalf("Error parsing volume flags, `%s and %s` did not mount-bind correctly. Received %v", arr[0], arr[1], hostConfig.Binds)
-		}
-	}
-
-	// One bind mount and one volume
-	arr, tryit = setupPlatformVolume([]string{`/hostTmp:/containerTmp`, `/containerVar`}, []string{os.Getenv("TEMP") + `:c:\containerTmp`, `c:\containerTmp`})
-	if config, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || len(hostConfig.Binds) > 1 || hostConfig.Binds[0] != arr[0] {
-		t.Fatalf("Error parsing volume flags, %s and %s should only one and only one bind mount %s. Received %s", arr[0], arr[1], arr[0], hostConfig.Binds)
-	} else if _, exists := config.Volumes[arr[1]]; !exists {
-		t.Fatalf("Error parsing volume flags %s and %s. %s is missing from volumes. Received %v", arr[0], arr[1], arr[1], config.Volumes)
-	}
-
-	// Root to non-c: drive letter (Windows specific)
-	if runtime.GOOS == "windows" {
-		arr, tryit = setupPlatformVolume([]string{}, []string{os.Getenv("SystemDrive") + `\:d:`})
-		if config, hostConfig := mustParse(t, tryit); hostConfig.Binds == nil || len(hostConfig.Binds) > 1 || hostConfig.Binds[0] != arr[0] || len(config.Volumes) != 0 {
-			t.Fatalf("Error parsing %s. Should have a single bind mount and no volumes", arr[0])
-		}
-	}
-
-}
-
-// This tests the cases for binds which are generated through
-// DecodeContainerConfig rather than Parse()
-func TestDecodeContainerConfigVolumes(t *testing.T) {
-
-	// Root to root
-	bindsOrVols, _ := setupPlatformVolume([]string{`/:/`}, []string{os.Getenv("SystemDrive") + `\:c:\`})
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	// No destination path
-	bindsOrVols, _ = setupPlatformVolume([]string{`/tmp:`}, []string{os.Getenv("TEMP") + `\:`})
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	//	// No destination path or mode
-	bindsOrVols, _ = setupPlatformVolume([]string{`/tmp::`}, []string{os.Getenv("TEMP") + `\::`})
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	// A whole lot of nothing
-	bindsOrVols = []string{`:`}
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	// A whole lot of nothing with no mode
-	bindsOrVols = []string{`::`}
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	// Too much including an invalid mode
-	wTmp := os.Getenv("TEMP")
-	bindsOrVols, _ = setupPlatformVolume([]string{`/tmp:/tmp:/tmp:/tmp`}, []string{wTmp + ":" + wTmp + ":" + wTmp + ":" + wTmp})
-	if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-		t.Fatalf("binds %v should have failed", bindsOrVols)
-	}
-	if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-		t.Fatalf("volume %v should have failed", bindsOrVols)
-	}
-
-	// Windows specific error tests
-	if runtime.GOOS == "windows" {
-		// Volume which does not include a drive letter
-		bindsOrVols = []string{`\tmp`}
-		if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-			t.Fatalf("binds %v should have failed", bindsOrVols)
-		}
-		if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-			t.Fatalf("volume %v should have failed", bindsOrVols)
-		}
-
-		// Root to C-Drive
-		bindsOrVols = []string{os.Getenv("SystemDrive") + `\:c:`}
-		if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-			t.Fatalf("binds %v should have failed", bindsOrVols)
-		}
-		if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-			t.Fatalf("volume %v should have failed", bindsOrVols)
-		}
-
-		// Container path that does not include a drive letter
-		bindsOrVols = []string{`c:\windows:\somewhere`}
-		if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-			t.Fatalf("binds %v should have failed", bindsOrVols)
-		}
-		if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-			t.Fatalf("volume %v should have failed", bindsOrVols)
-		}
-	}
-
-	// Linux-specific error tests
-	if runtime.GOOS != "windows" {
-		// Just root
-		bindsOrVols = []string{`/`}
-		if _, _, err := callDecodeContainerConfig(nil, bindsOrVols); err == nil {
-			t.Fatalf("binds %v should have failed", bindsOrVols)
-		}
-		if _, _, err := callDecodeContainerConfig(bindsOrVols, nil); err == nil {
-			t.Fatalf("volume %v should have failed", bindsOrVols)
-		}
-
-		// A single volume that looks like a bind mount passed in Volumes.
-		// This should be handled as a bind mount, not a volume.
-		vols := []string{`/foo:/bar`}
-		if config, hostConfig, err := callDecodeContainerConfig(vols, nil); err != nil {
-			t.Fatal("Volume /foo:/bar should have succeeded as a volume name")
-		} else if hostConfig.Binds != nil {
-			t.Fatalf("Error parsing volume flags, /foo:/bar should not mount-bind anything. Received %v", hostConfig.Binds)
-		} else if _, exists := config.Volumes[vols[0]]; !exists {
-			t.Fatalf("Error parsing volume flags, /foo:/bar is missing from volumes. Received %v", config.Volumes)
-		}
-
-	}
-}
-
-// callDecodeContainerConfig is a utility function used by TestDecodeContainerConfigVolumes
-// to call DecodeContainerConfig. It effectively does what a client would
-// do when calling the daemon by constructing a JSON stream of a
-// ContainerConfigWrapper which is populated by the set of volume specs
-// passed into it. It returns a config and a hostconfig which can be
-// validated to ensure DecodeContainerConfig has manipulated the structures
-// correctly.
-func callDecodeContainerConfig(volumes []string, binds []string) (*container.Config, *container.HostConfig, error) {
-	var (
-		b   []byte
-		err error
-		c   *container.Config
-		h   *container.HostConfig
-	)
-	w := runconfig.ContainerConfigWrapper{
-		Config: &container.Config{
-			Volumes: map[string]struct{}{},
-		},
-		HostConfig: &container.HostConfig{
-			NetworkMode: "none",
-			Binds:       binds,
-		},
-	}
-	for _, v := range volumes {
-		w.Config.Volumes[v] = struct{}{}
-	}
-	if b, err = json.Marshal(w); err != nil {
-		return nil, nil, fmt.Errorf("Error on marshal %s", err.Error())
-	}
-	c, h, _, err = runconfig.DecodeContainerConfig(bytes.NewReader(b))
-	if err != nil {
-		return nil, nil, fmt.Errorf("Error parsing %s: %v", string(b), err)
-	}
-	if c == nil || h == nil {
-		return nil, nil, fmt.Errorf("Empty config or hostconfig")
-	}
-
-	return c, h, err
-}
-
-// check if (a == c && b == d) || (a == d && b == c)
-// because maps are randomized
-func compareRandomizedStrings(a, b, c, d string) error {
-	if a == c && b == d {
-		return nil
-	}
-	if a == d && b == c {
-		return nil
-	}
-	return fmt.Errorf("strings don't match")
-}
-
-// setupPlatformVolume takes two arrays of volume specs - a Unix style
-// spec and a Windows style spec. Depending on the platform being unit tested,
-// it returns one of them, along with a volume string that would be passed
-// on the docker CLI (eg -v /bar -v /foo).
-func setupPlatformVolume(u []string, w []string) ([]string, string) {
-	var a []string
-	if runtime.GOOS == "windows" {
-		a = w
-	} else {
-		a = u
-	}
-	s := ""
-	for _, v := range a {
-		s = s + "-v " + v + " "
-	}
-	return a, s
-}
-
-// Simple parse with MacAddress validation
-func TestParseWithMacAddress(t *testing.T) {
-	invalidMacAddress := "--mac-address=invalidMacAddress"
-	validMacAddress := "--mac-address=92:d0:c6:0a:29:33"
-	if _, _, _, err := parseRun([]string{invalidMacAddress, "img", "cmd"}); err != nil && err.Error() != "invalidMacAddress is not a valid mac address" {
-		t.Fatalf("Expected an error with %v mac-address, got %v", invalidMacAddress, err)
-	}
-	if config, _ := mustParse(t, validMacAddress); config.MacAddress != "92:d0:c6:0a:29:33" {
-		t.Fatalf("Expected the config to have '92:d0:c6:0a:29:33' as MacAddress, got '%v'", config.MacAddress)
-	}
-}
-
-func TestParseWithMemory(t *testing.T) {
-	invalidMemory := "--memory=invalid"
-	validMemory := "--memory=1G"
-	if _, _, _, err := parseRun([]string{invalidMemory, "img", "cmd"}); err != nil && err.Error() != "invalid size: 'invalid'" {
-		t.Fatalf("Expected an error with '%v' Memory, got '%v'", invalidMemory, err)
-	}
-	if _, hostconfig := mustParse(t, validMemory); hostconfig.Memory != 1073741824 {
-		t.Fatalf("Expected the config to have '1G' as Memory, got '%v'", hostconfig.Memory)
-	}
-}
-
-func TestParseWithMemorySwap(t *testing.T) {
-	invalidMemory := "--memory-swap=invalid"
-	validMemory := "--memory-swap=1G"
-	anotherValidMemory := "--memory-swap=-1"
-	if _, _, _, err := parseRun([]string{invalidMemory, "img", "cmd"}); err == nil || err.Error() != "invalid size: 'invalid'" {
-		t.Fatalf("Expected an error with '%v' MemorySwap, got '%v'", invalidMemory, err)
-	}
-	if _, hostconfig := mustParse(t, validMemory); hostconfig.MemorySwap != 1073741824 {
-		t.Fatalf("Expected the config to have '1073741824' as MemorySwap, got '%v'", hostconfig.MemorySwap)
-	}
-	if _, hostconfig := mustParse(t, anotherValidMemory); hostconfig.MemorySwap != -1 {
-		t.Fatalf("Expected the config to have '-1' as MemorySwap, got '%v'", hostconfig.MemorySwap)
-	}
-}
-
-func TestParseHostname(t *testing.T) {
-	validHostnames := map[string]string{
-		"hostname":    "hostname",
-		"host-name":   "host-name",
-		"hostname123": "hostname123",
-		"123hostname": "123hostname",
-		"hostname-of-63-bytes-long-should-be-valid-and-without-any-error": "hostname-of-63-bytes-long-should-be-valid-and-without-any-error",
-	}
-	hostnameWithDomain := "--hostname=hostname.domainname"
-	hostnameWithDomainTld := "--hostname=hostname.domainname.tld"
-	for hostname, expectedHostname := range validHostnames {
-		if config, _ := mustParse(t, fmt.Sprintf("--hostname=%s", hostname)); config.Hostname != expectedHostname {
-			t.Fatalf("Expected the config to have 'hostname' as hostname, got '%v'", config.Hostname)
-		}
-	}
-	if config, _ := mustParse(t, hostnameWithDomain); config.Hostname != "hostname.domainname" && config.Domainname != "" {
-		t.Fatalf("Expected the config to have 'hostname' as hostname.domainname, got '%v'", config.Hostname)
-	}
-	if config, _ := mustParse(t, hostnameWithDomainTld); config.Hostname != "hostname.domainname.tld" && config.Domainname != "" {
-		t.Fatalf("Expected the config to have 'hostname' as hostname.domainname.tld, got '%v'", config.Hostname)
-	}
-}
-
-func TestParseWithExpose(t *testing.T) {
-	invalids := map[string]string{
-		":":                   "invalid port format for --expose: :",
-		"8080:9090":           "invalid port format for --expose: 8080:9090",
-		"/tcp":                "invalid range format for --expose: /tcp, error: Empty string specified for ports.",
-		"/udp":                "invalid range format for --expose: /udp, error: Empty string specified for ports.",
-		"NaN/tcp":             `invalid range format for --expose: NaN/tcp, error: strconv.ParseUint: parsing "NaN": invalid syntax`,
-		"NaN-NaN/tcp":         `invalid range format for --expose: NaN-NaN/tcp, error: strconv.ParseUint: parsing "NaN": invalid syntax`,
-		"8080-NaN/tcp":        `invalid range format for --expose: 8080-NaN/tcp, error: strconv.ParseUint: parsing "NaN": invalid syntax`,
-		"1234567890-8080/tcp": `invalid range format for --expose: 1234567890-8080/tcp, error: strconv.ParseUint: parsing "1234567890": value out of range`,
-	}
-	valids := map[string][]nat.Port{
-		"8080/tcp":      {"8080/tcp"},
-		"8080/udp":      {"8080/udp"},
-		"8080/ncp":      {"8080/ncp"},
-		"8080-8080/udp": {"8080/udp"},
-		"8080-8082/tcp": {"8080/tcp", "8081/tcp", "8082/tcp"},
-	}
-	for expose, expectedError := range invalids {
-		if _, _, _, err := parseRun([]string{fmt.Sprintf("--expose=%v", expose), "img", "cmd"}); err == nil || err.Error() != expectedError {
-			t.Fatalf("Expected error '%v' with '--expose=%v', got '%v'", expectedError, expose, err)
-		}
-	}
-	for expose, exposedPorts := range valids {
-		config, _, _, err := parseRun([]string{fmt.Sprintf("--expose=%v", expose), "img", "cmd"})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(config.ExposedPorts) != len(exposedPorts) {
-			t.Fatalf("Expected %v exposed port, got %v", len(exposedPorts), len(config.ExposedPorts))
-		}
-		for _, port := range exposedPorts {
-			if _, ok := config.ExposedPorts[port]; !ok {
-				t.Fatalf("Expected %v, got %v", exposedPorts, config.ExposedPorts)
-			}
-		}
-	}
-	// Merge with actual published port
-	config, _, _, err := parseRun([]string{"--publish=80", "--expose=80-81/tcp", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.ExposedPorts) != 2 {
-		t.Fatalf("Expected 2 exposed ports, got %v", config.ExposedPorts)
-	}
-	ports := []nat.Port{"80/tcp", "81/tcp"}
-	for _, port := range ports {
-		if _, ok := config.ExposedPorts[port]; !ok {
-			t.Fatalf("Expected %v, got %v", ports, config.ExposedPorts)
-		}
-	}
-}
-
-func TestParseDevice(t *testing.T) {
-	valids := map[string]container.DeviceMapping{
-		"/dev/snd": {
-			PathOnHost:        "/dev/snd",
-			PathInContainer:   "/dev/snd",
-			CgroupPermissions: "rwm",
-		},
-		"/dev/snd:rw": {
-			PathOnHost:        "/dev/snd",
-			PathInContainer:   "/dev/snd",
-			CgroupPermissions: "rw",
-		},
-		"/dev/snd:/something": {
-			PathOnHost:        "/dev/snd",
-			PathInContainer:   "/something",
-			CgroupPermissions: "rwm",
-		},
-		"/dev/snd:/something:rw": {
-			PathOnHost:        "/dev/snd",
-			PathInContainer:   "/something",
-			CgroupPermissions: "rw",
-		},
-	}
-	for device, deviceMapping := range valids {
-		_, hostconfig, _, err := parseRun([]string{fmt.Sprintf("--device=%v", device), "img", "cmd"})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if len(hostconfig.Devices) != 1 {
-			t.Fatalf("Expected 1 devices, got %v", hostconfig.Devices)
-		}
-		if hostconfig.Devices[0] != deviceMapping {
-			t.Fatalf("Expected %v, got %v", deviceMapping, hostconfig.Devices)
-		}
-	}
-
-}
-
-func TestParseModes(t *testing.T) {
-	// ipc ko
-	if _, _, _, err := parseRun([]string{"--ipc=container:", "img", "cmd"}); err == nil || err.Error() != "--ipc: invalid IPC mode" {
-		t.Fatalf("Expected an error with message '--ipc: invalid IPC mode', got %v", err)
-	}
-	// ipc ok
-	_, hostconfig, _, err := parseRun([]string{"--ipc=host", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !hostconfig.IpcMode.Valid() {
-		t.Fatalf("Expected a valid IpcMode, got %v", hostconfig.IpcMode)
-	}
-	// pid ko
-	if _, _, _, err := parseRun([]string{"--pid=container:", "img", "cmd"}); err == nil || err.Error() != "--pid: invalid PID mode" {
-		t.Fatalf("Expected an error with message '--pid: invalid PID mode', got %v", err)
-	}
-	// pid ok
-	_, hostconfig, _, err = parseRun([]string{"--pid=host", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !hostconfig.PidMode.Valid() {
-		t.Fatalf("Expected a valid PidMode, got %v", hostconfig.PidMode)
-	}
-	// uts ko
-	if _, _, _, err := parseRun([]string{"--uts=container:", "img", "cmd"}); err == nil || err.Error() != "--uts: invalid UTS mode" {
-		t.Fatalf("Expected an error with message '--uts: invalid UTS mode', got %v", err)
-	}
-	// uts ok
-	_, hostconfig, _, err = parseRun([]string{"--uts=host", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !hostconfig.UTSMode.Valid() {
-		t.Fatalf("Expected a valid UTSMode, got %v", hostconfig.UTSMode)
-	}
-	// shm-size ko
-	if _, _, _, err = parseRun([]string{"--shm-size=a128m", "img", "cmd"}); err == nil || err.Error() != "invalid size: 'a128m'" {
-		t.Fatalf("Expected an error with message 'invalid size: a128m', got %v", err)
-	}
-	// shm-size ok
-	_, hostconfig, _, err = parseRun([]string{"--shm-size=128m", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if hostconfig.ShmSize != 134217728 {
-		t.Fatalf("Expected a valid ShmSize, got %d", hostconfig.ShmSize)
-	}
-}
-
-func TestParseRestartPolicy(t *testing.T) {
-	invalids := map[string]string{
-		"always:2:3":         "invalid restart policy format",
-		"on-failure:invalid": "maximum retry count must be an integer",
-	}
-	valids := map[string]container.RestartPolicy{
-		"": {},
-		"always": {
-			Name:              "always",
-			MaximumRetryCount: 0,
-		},
-		"on-failure:1": {
-			Name:              "on-failure",
-			MaximumRetryCount: 1,
-		},
-	}
-	for restart, expectedError := range invalids {
-		if _, _, _, err := parseRun([]string{fmt.Sprintf("--restart=%s", restart), "img", "cmd"}); err == nil || err.Error() != expectedError {
-			t.Fatalf("Expected an error with message '%v' for %v, got %v", expectedError, restart, err)
-		}
-	}
-	for restart, expected := range valids {
-		_, hostconfig, _, err := parseRun([]string{fmt.Sprintf("--restart=%v", restart), "img", "cmd"})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if hostconfig.RestartPolicy != expected {
-			t.Fatalf("Expected %v, got %v", expected, hostconfig.RestartPolicy)
-		}
-	}
-}
-
-func TestParseHealth(t *testing.T) {
-	checkOk := func(args ...string) *container.HealthConfig {
-		config, _, _, err := parseRun(args)
-		if err != nil {
-			t.Fatalf("%#v: %v", args, err)
-		}
-		return config.Healthcheck
-	}
-	checkError := func(expected string, args ...string) {
-		config, _, _, err := parseRun(args)
-		if err == nil {
-			t.Fatalf("Expected error, but got %#v", config)
-		}
-		if err.Error() != expected {
-			t.Fatalf("Expected %#v, got %#v", expected, err)
-		}
-	}
-	health := checkOk("--no-healthcheck", "img", "cmd")
-	if health == nil || len(health.Test) != 1 || health.Test[0] != "NONE" {
-		t.Fatalf("--no-healthcheck failed: %#v", health)
-	}
-
-	health = checkOk("--health-cmd=/check.sh -q", "img", "cmd")
-	if len(health.Test) != 2 || health.Test[0] != "CMD-SHELL" || health.Test[1] != "/check.sh -q" {
-		t.Fatalf("--health-cmd: got %#v", health.Test)
-	}
-	if health.Timeout != 0 {
-		t.Fatalf("--health-cmd: timeout = %f", health.Timeout)
-	}
-
-	checkError("--no-healthcheck conflicts with --health-* options",
-		"--no-healthcheck", "--health-cmd=/check.sh -q", "img", "cmd")
-
-	health = checkOk("--health-timeout=2s", "--health-retries=3", "--health-interval=4.5s", "img", "cmd")
-	if health.Timeout != 2*time.Second || health.Retries != 3 || health.Interval != 4500*time.Millisecond {
-		t.Fatalf("--health-*: got %#v", health)
-	}
-}
-
-func TestParseLoggingOpts(t *testing.T) {
-	// logging opts ko
-	if _, _, _, err := parseRun([]string{"--log-driver=none", "--log-opt=anything", "img", "cmd"}); err == nil || err.Error() != "invalid logging opts for driver none" {
-		t.Fatalf("Expected an error with message 'invalid logging opts for driver none', got %v", err)
-	}
-	// logging opts ok
-	_, hostconfig, _, err := parseRun([]string{"--log-driver=syslog", "--log-opt=something", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if hostconfig.LogConfig.Type != "syslog" || len(hostconfig.LogConfig.Config) != 1 {
-		t.Fatalf("Expected a 'syslog' LogConfig with one config, got %v", hostconfig.RestartPolicy)
-	}
-}
-
-func TestParseEnvfileVariables(t *testing.T) {
-	e := "open nonexistent: no such file or directory"
-	if runtime.GOOS == "windows" {
-		e = "open nonexistent: The system cannot find the file specified."
-	}
-	// env ko
-	if _, _, _, err := parseRun([]string{"--env-file=nonexistent", "img", "cmd"}); err == nil || err.Error() != e {
-		t.Fatalf("Expected an error with message '%s', got %v", e, err)
-	}
-	// env ok
-	config, _, _, err := parseRun([]string{"--env-file=fixtures/valid.env", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.Env) != 1 || config.Env[0] != "ENV1=value1" {
-		t.Fatalf("Expected a config with [ENV1=value1], got %v", config.Env)
-	}
-	config, _, _, err = parseRun([]string{"--env-file=fixtures/valid.env", "--env=ENV2=value2", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.Env) != 2 || config.Env[0] != "ENV1=value1" || config.Env[1] != "ENV2=value2" {
-		t.Fatalf("Expected a config with [ENV1=value1 ENV2=value2], got %v", config.Env)
-	}
-}
-
-func TestParseEnvfileVariablesWithBOMUnicode(t *testing.T) {
-	// UTF8 with BOM
-	config, _, _, err := parseRun([]string{"--env-file=fixtures/utf8.env", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	env := []string{"FOO=BAR", "HELLO=" + string([]byte{0xe6, 0x82, 0xa8, 0xe5, 0xa5, 0xbd}), "BAR=FOO"}
-	if len(config.Env) != len(env) {
-		t.Fatalf("Expected a config with %d env variables, got %v: %v", len(env), len(config.Env), config.Env)
-	}
-	for i, v := range env {
-		if config.Env[i] != v {
-			t.Fatalf("Expected a config with [%s], got %v", v, []byte(config.Env[i]))
-		}
-	}
-
-	// UTF16 with BOM
-	e := "contains invalid utf8 bytes at line"
-	if _, _, _, err := parseRun([]string{"--env-file=fixtures/utf16.env", "img", "cmd"}); err == nil || !strings.Contains(err.Error(), e) {
-		t.Fatalf("Expected an error with message '%s', got %v", e, err)
-	}
-	// UTF16BE with BOM
-	if _, _, _, err := parseRun([]string{"--env-file=fixtures/utf16be.env", "img", "cmd"}); err == nil || !strings.Contains(err.Error(), e) {
-		t.Fatalf("Expected an error with message '%s', got %v", e, err)
-	}
-}
-
-func TestParseLabelfileVariables(t *testing.T) {
-	e := "open nonexistent: no such file or directory"
-	if runtime.GOOS == "windows" {
-		e = "open nonexistent: The system cannot find the file specified."
-	}
-	// label ko
-	if _, _, _, err := parseRun([]string{"--label-file=nonexistent", "img", "cmd"}); err == nil || err.Error() != e {
-		t.Fatalf("Expected an error with message '%s', got %v", e, err)
-	}
-	// label ok
-	config, _, _, err := parseRun([]string{"--label-file=fixtures/valid.label", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.Labels) != 1 || config.Labels["LABEL1"] != "value1" {
-		t.Fatalf("Expected a config with [LABEL1:value1], got %v", config.Labels)
-	}
-	config, _, _, err = parseRun([]string{"--label-file=fixtures/valid.label", "--label=LABEL2=value2", "img", "cmd"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.Labels) != 2 || config.Labels["LABEL1"] != "value1" || config.Labels["LABEL2"] != "value2" {
-		t.Fatalf("Expected a config with [LABEL1:value1 LABEL2:value2], got %v", config.Labels)
-	}
-}
-
-func TestParseEntryPoint(t *testing.T) {
-	config, _, _, err := parseRun([]string{"--entrypoint=anything", "cmd", "img"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(config.Entrypoint) != 1 && config.Entrypoint[0] != "anything" {
-		t.Fatalf("Expected entrypoint 'anything', got %v", config.Entrypoint)
-	}
-}
-
-func TestValidateLink(t *testing.T) {
-	valid := []string{
-		"name",
-		"dcdfbe62ecd0:alias",
-		"7a67485460b7642516a4ad82ecefe7f57d0c4916f530561b71a50a3f9c4e33da",
-		"angry_torvalds:linus",
-	}
-	invalid := map[string]string{
-		"":               "empty string specified for links",
-		"too:much:of:it": "bad format for links: too:much:of:it",
-	}
-
-	for _, link := range valid {
-		if _, err := ValidateLink(link); err != nil {
-			t.Fatalf("ValidateLink(`%q`) should succeed: error %q", link, err)
-		}
-	}
-
-	for link, expectedError := range invalid {
-		if _, err := ValidateLink(link); err == nil {
-			t.Fatalf("ValidateLink(`%q`) should have failed validation", link)
-		} else {
-			if !strings.Contains(err.Error(), expectedError) {
-				t.Fatalf("ValidateLink(`%q`) error should contain %q", link, expectedError)
-			}
-		}
-	}
-}
-
-func TestParseLink(t *testing.T) {
-	name, alias, err := ParseLink("name:alias")
-	if err != nil {
-		t.Fatalf("Expected not to error out on a valid name:alias format but got: %v", err)
-	}
-	if name != "name" {
-		t.Fatalf("Link name should have been name, got %s instead", name)
-	}
-	if alias != "alias" {
-		t.Fatalf("Link alias should have been alias, got %s instead", alias)
-	}
-	// short format definition
-	name, alias, err = ParseLink("name")
-	if err != nil {
-		t.Fatalf("Expected not to error out on a valid name only format but got: %v", err)
-	}
-	if name != "name" {
-		t.Fatalf("Link name should have been name, got %s instead", name)
-	}
-	if alias != "name" {
-		t.Fatalf("Link alias should have been name, got %s instead", alias)
-	}
-	// empty string link definition is not allowed
-	if _, _, err := ParseLink(""); err == nil || !strings.Contains(err.Error(), "empty string specified for links") {
-		t.Fatalf("Expected error 'empty string specified for links' but got: %v", err)
-	}
-	// more than two colons are not allowed
-	if _, _, err := ParseLink("link:alias:wrong"); err == nil || !strings.Contains(err.Error(), "bad format for links: link:alias:wrong") {
-		t.Fatalf("Expected error 'bad format for links: link:alias:wrong' but got: %v", err)
-	}
-}
-
-func TestValidateDevice(t *testing.T) {
-	valid := []string{
-		"/home",
-		"/home:/home",
-		"/home:/something/else",
-		"/with space",
-		"/home:/with space",
-		"relative:/absolute-path",
-		"hostPath:/containerPath:r",
-		"/hostPath:/containerPath:rw",
-		"/hostPath:/containerPath:mrw",
-	}
-	invalid := map[string]string{
-		"":        "bad format for path: ",
-		"./":      "./ is not an absolute path",
-		"../":     "../ is not an absolute path",
-		"/:../":   "../ is not an absolute path",
-		"/:path":  "path is not an absolute path",
-		":":       "bad format for path: :",
-		"/tmp:":   " is not an absolute path",
-		":test":   "bad format for path: :test",
-		":/test":  "bad format for path: :/test",
-		"tmp:":    " is not an absolute path",
-		":test:":  "bad format for path: :test:",
-		"::":      "bad format for path: ::",
-		":::":     "bad format for path: :::",
-		"/tmp:::": "bad format for path: /tmp:::",
-		":/tmp::": "bad format for path: :/tmp::",
-		"path:ro": "ro is not an absolute path",
-		"path:rr": "rr is not an absolute path",
-		"a:/b:ro": "bad mode specified: ro",
-		"a:/b:rr": "bad mode specified: rr",
-	}
-
-	for _, path := range valid {
-		if _, err := ValidateDevice(path); err != nil {
-			t.Fatalf("ValidateDevice(`%q`) should succeed: error %q", path, err)
-		}
-	}
-
-	for path, expectedError := range invalid {
-		if _, err := ValidateDevice(path); err == nil {
-			t.Fatalf("ValidateDevice(`%q`) should have failed validation", path)
-		} else {
-			if err.Error() != expectedError {
-				t.Fatalf("ValidateDevice(`%q`) error should contain %q, got %q", path, expectedError, err.Error())
-			}
-		}
-	}
-}
-
-func TestVolumeSplitN(t *testing.T) {
-	for _, x := range []struct {
-		input    string
-		n        int
-		expected []string
-	}{
-		{`C:\foo:d:`, -1, []string{`C:\foo`, `d:`}},
-		{`:C:\foo:d:`, -1, nil},
-		{`/foo:/bar:ro`, 3, []string{`/foo`, `/bar`, `ro`}},
-		{`/foo:/bar:ro`, 2, []string{`/foo`, `/bar:ro`}},
-		{`C:\foo\:/foo`, -1, []string{`C:\foo\`, `/foo`}},
-
-		{`d:\`, -1, []string{`d:\`}},
-		{`d:`, -1, []string{`d:`}},
-		{`d:\path`, -1, []string{`d:\path`}},
-		{`d:\path with space`, -1, []string{`d:\path with space`}},
-		{`d:\pathandmode:rw`, -1, []string{`d:\pathandmode`, `rw`}},
-		{`c:\:d:\`, -1, []string{`c:\`, `d:\`}},
-		{`c:\windows\:d:`, -1, []string{`c:\windows\`, `d:`}},
-		{`c:\windows:d:\s p a c e`, -1, []string{`c:\windows`, `d:\s p a c e`}},
-		{`c:\windows:d:\s p a c e:RW`, -1, []string{`c:\windows`, `d:\s p a c e`, `RW`}},
-		{`c:\program files:d:\s p a c e i n h o s t d i r`, -1, []string{`c:\program files`, `d:\s p a c e i n h o s t d i r`}},
-		{`0123456789name:d:`, -1, []string{`0123456789name`, `d:`}},
-		{`MiXeDcAsEnAmE:d:`, -1, []string{`MiXeDcAsEnAmE`, `d:`}},
-		{`name:D:`, -1, []string{`name`, `D:`}},
-		{`name:D::rW`, -1, []string{`name`, `D:`, `rW`}},
-		{`name:D::RW`, -1, []string{`name`, `D:`, `RW`}},
-		{`c:/:d:/forward/slashes/are/good/too`, -1, []string{`c:/`, `d:/forward/slashes/are/good/too`}},
-		{`c:\Windows`, -1, []string{`c:\Windows`}},
-		{`c:\Program Files (x86)`, -1, []string{`c:\Program Files (x86)`}},
-
-		{``, -1, nil},
-		{`.`, -1, []string{`.`}},
-		{`..\`, -1, []string{`..\`}},
-		{`c:\:..\`, -1, []string{`c:\`, `..\`}},
-		{`c:\:d:\:xyzzy`, -1, []string{`c:\`, `d:\`, `xyzzy`}},
-
-		// Cover directories with one-character name
-		{`/tmp/x/y:/foo/x/y`, -1, []string{`/tmp/x/y`, `/foo/x/y`}},
-	} {
-		res := volumeSplitN(x.input, x.n)
-		if len(res) < len(x.expected) {
-			t.Fatalf("input: %v, expected: %v, got: %v", x.input, x.expected, res)
-		}
-		for i, e := range res {
-			if e != x.expected[i] {
-				t.Fatalf("input: %v, expected: %v, got: %v", x.input, x.expected, res)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/runtime.go b/installer/vendor/github.com/docker/docker/runconfig/opts/runtime.go
deleted file mode 100644
index 4361b3ce09..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/runtime.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-)
-
-// RuntimeOpt defines a map of Runtimes
-type RuntimeOpt struct {
-	name             string
-	stockRuntimeName string
-	values           *map[string]types.Runtime
-}
-
-// NewNamedRuntimeOpt creates a new RuntimeOpt
-func NewNamedRuntimeOpt(name string, ref *map[string]types.Runtime, stockRuntime string) *RuntimeOpt {
-	if ref == nil {
-		ref = &map[string]types.Runtime{}
-	}
-	return &RuntimeOpt{name: name, values: ref, stockRuntimeName: stockRuntime}
-}
-
-// Name returns the name of the NamedListOpts in the configuration.
-func (o *RuntimeOpt) Name() string {
-	return o.name
-}
-
-// Set validates and updates the list of Runtimes
-func (o *RuntimeOpt) Set(val string) error {
-	parts := strings.SplitN(val, "=", 2)
-	if len(parts) != 2 {
-		return fmt.Errorf("invalid runtime argument: %s", val)
-	}
-
-	parts[0] = strings.TrimSpace(parts[0])
-	parts[1] = strings.TrimSpace(parts[1])
-	if parts[0] == "" || parts[1] == "" {
-		return fmt.Errorf("invalid runtime argument: %s", val)
-	}
-
-	parts[0] = strings.ToLower(parts[0])
-	if parts[0] == o.stockRuntimeName {
-		return fmt.Errorf("runtime name '%s' is reserved", o.stockRuntimeName)
-	}
-
-	if _, ok := (*o.values)[parts[0]]; ok {
-		return fmt.Errorf("runtime '%s' was already defined", parts[0])
-	}
-
-	(*o.values)[parts[0]] = types.Runtime{Path: parts[1]}
-
-	return nil
-}
-
-// String returns Runtime values as a string.
-func (o *RuntimeOpt) String() string {
-	var out []string
-	for k := range *o.values {
-		out = append(out, k)
-	}
-
-	return fmt.Sprintf("%v", out)
-}
-
-// GetMap returns a map of Runtimes (name: path)
-func (o *RuntimeOpt) GetMap() map[string]types.Runtime {
-	if o.values != nil {
-		return *o.values
-	}
-
-	return map[string]types.Runtime{}
-}
-
-// Type returns the type of the option
-func (o *RuntimeOpt) Type() string {
-	return "runtime"
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/throttledevice.go b/installer/vendor/github.com/docker/docker/runconfig/opts/throttledevice.go
deleted file mode 100644
index 5024324298..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/throttledevice.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types/blkiodev"
-	"github.com/docker/go-units"
-)
-
-// ValidatorThrottleFctType defines a validator function that returns a validated struct and/or an error.
-type ValidatorThrottleFctType func(val string) (*blkiodev.ThrottleDevice, error)
-
-// ValidateThrottleBpsDevice validates that the specified string has a valid device-rate format.
-func ValidateThrottleBpsDevice(val string) (*blkiodev.ThrottleDevice, error) {
-	split := strings.SplitN(val, ":", 2)
-	if len(split) != 2 {
-		return nil, fmt.Errorf("bad format: %s", val)
-	}
-	if !strings.HasPrefix(split[0], "/dev/") {
-		return nil, fmt.Errorf("bad format for device path: %s", val)
-	}
-	rate, err := units.RAMInBytes(split[1])
-	if err != nil {
-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)
-	}
-	if rate < 0 {
-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>[<unit>]. Number must be a positive integer. Unit is optional and can be kb, mb, or gb", val)
-	}
-
-	return &blkiodev.ThrottleDevice{
-		Path: split[0],
-		Rate: uint64(rate),
-	}, nil
-}
-
-// ValidateThrottleIOpsDevice validates that the specified string has a valid device-rate format.
-func ValidateThrottleIOpsDevice(val string) (*blkiodev.ThrottleDevice, error) {
-	split := strings.SplitN(val, ":", 2)
-	if len(split) != 2 {
-		return nil, fmt.Errorf("bad format: %s", val)
-	}
-	if !strings.HasPrefix(split[0], "/dev/") {
-		return nil, fmt.Errorf("bad format for device path: %s", val)
-	}
-	rate, err := strconv.ParseUint(split[1], 10, 64)
-	if err != nil {
-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)
-	}
-	if rate < 0 {
-		return nil, fmt.Errorf("invalid rate for device: %s. The correct format is <device-path>:<number>. Number must be a positive integer", val)
-	}
-
-	return &blkiodev.ThrottleDevice{
-		Path: split[0],
-		Rate: uint64(rate),
-	}, nil
-}
-
-// ThrottledeviceOpt defines a map of ThrottleDevices
-type ThrottledeviceOpt struct {
-	values    []*blkiodev.ThrottleDevice
-	validator ValidatorThrottleFctType
-}
-
-// NewThrottledeviceOpt creates a new ThrottledeviceOpt
-func NewThrottledeviceOpt(validator ValidatorThrottleFctType) ThrottledeviceOpt {
-	values := []*blkiodev.ThrottleDevice{}
-	return ThrottledeviceOpt{
-		values:    values,
-		validator: validator,
-	}
-}
-
-// Set validates a ThrottleDevice and sets its name as a key in ThrottledeviceOpt
-func (opt *ThrottledeviceOpt) Set(val string) error {
-	var value *blkiodev.ThrottleDevice
-	if opt.validator != nil {
-		v, err := opt.validator(val)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	(opt.values) = append((opt.values), value)
-	return nil
-}
-
-// String returns ThrottledeviceOpt values as a string.
-func (opt *ThrottledeviceOpt) String() string {
-	var out []string
-	for _, v := range opt.values {
-		out = append(out, v.String())
-	}
-
-	return fmt.Sprintf("%v", out)
-}
-
-// GetList returns a slice of pointers to ThrottleDevices.
-func (opt *ThrottledeviceOpt) GetList() []*blkiodev.ThrottleDevice {
-	var throttledevice []*blkiodev.ThrottleDevice
-	throttledevice = append(throttledevice, opt.values...)
-
-	return throttledevice
-}
-
-// Type returns the option type
-func (opt *ThrottledeviceOpt) Type() string {
-	return "throttled-device"
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit.go b/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit.go
deleted file mode 100644
index 5adfe30851..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit.go
+++ /dev/null
@@ -1,57 +0,0 @@
-package opts
-
-import (
-	"fmt"
-
-	"github.com/docker/go-units"
-)
-
-// UlimitOpt defines a map of Ulimits
-type UlimitOpt struct {
-	values *map[string]*units.Ulimit
-}
-
-// NewUlimitOpt creates a new UlimitOpt
-func NewUlimitOpt(ref *map[string]*units.Ulimit) *UlimitOpt {
-	if ref == nil {
-		ref = &map[string]*units.Ulimit{}
-	}
-	return &UlimitOpt{ref}
-}
-
-// Set validates a Ulimit and sets its name as a key in UlimitOpt
-func (o *UlimitOpt) Set(val string) error {
-	l, err := units.ParseUlimit(val)
-	if err != nil {
-		return err
-	}
-
-	(*o.values)[l.Name] = l
-
-	return nil
-}
-
-// String returns Ulimit values as a string.
-func (o *UlimitOpt) String() string {
-	var out []string
-	for _, v := range *o.values {
-		out = append(out, v.String())
-	}
-
-	return fmt.Sprintf("%v", out)
-}
-
-// GetList returns a slice of pointers to Ulimits.
-func (o *UlimitOpt) GetList() []*units.Ulimit {
-	var ulimits []*units.Ulimit
-	for _, v := range *o.values {
-		ulimits = append(ulimits, v)
-	}
-
-	return ulimits
-}
-
-// Type returns the option type
-func (o *UlimitOpt) Type() string {
-	return "ulimit"
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit_test.go b/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit_test.go
deleted file mode 100644
index 0aa3facdfb..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/ulimit_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package opts
-
-import (
-	"testing"
-
-	"github.com/docker/go-units"
-)
-
-func TestUlimitOpt(t *testing.T) {
-	ulimitMap := map[string]*units.Ulimit{
-		"nofile": {"nofile", 1024, 512},
-	}
-
-	ulimitOpt := NewUlimitOpt(&ulimitMap)
-
-	expected := "[nofile=512:1024]"
-	if ulimitOpt.String() != expected {
-		t.Fatalf("Expected %v, got %v", expected, ulimitOpt)
-	}
-
-	// Valid ulimit append to opts
-	if err := ulimitOpt.Set("core=1024:1024"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Invalid ulimit type returns an error and do not append to opts
-	if err := ulimitOpt.Set("notavalidtype=1024:1024"); err == nil {
-		t.Fatalf("Expected error on invalid ulimit type")
-	}
-	expected = "[nofile=512:1024 core=1024:1024]"
-	expected2 := "[core=1024:1024 nofile=512:1024]"
-	result := ulimitOpt.String()
-	if result != expected && result != expected2 {
-		t.Fatalf("Expected %v or %v, got %v", expected, expected2, ulimitOpt)
-	}
-
-	// And test GetList
-	ulimits := ulimitOpt.GetList()
-	if len(ulimits) != 2 {
-		t.Fatalf("Expected a ulimit list of 2, got %v", ulimits)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/runconfig/opts/weightdevice.go b/installer/vendor/github.com/docker/docker/runconfig/opts/weightdevice.go
deleted file mode 100644
index 2a5da6da08..0000000000
--- a/installer/vendor/github.com/docker/docker/runconfig/opts/weightdevice.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package opts
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types/blkiodev"
-)
-
-// ValidatorWeightFctType defines a validator function that returns a validated struct and/or an error.
-type ValidatorWeightFctType func(val string) (*blkiodev.WeightDevice, error)
-
-// ValidateWeightDevice validates that the specified string has a valid device-weight format.
-func ValidateWeightDevice(val string) (*blkiodev.WeightDevice, error) {
-	split := strings.SplitN(val, ":", 2)
-	if len(split) != 2 {
-		return nil, fmt.Errorf("bad format: %s", val)
-	}
-	if !strings.HasPrefix(split[0], "/dev/") {
-		return nil, fmt.Errorf("bad format for device path: %s", val)
-	}
-	weight, err := strconv.ParseUint(split[1], 10, 0)
-	if err != nil {
-		return nil, fmt.Errorf("invalid weight for device: %s", val)
-	}
-	if weight > 0 && (weight < 10 || weight > 1000) {
-		return nil, fmt.Errorf("invalid weight for device: %s", val)
-	}
-
-	return &blkiodev.WeightDevice{
-		Path:   split[0],
-		Weight: uint16(weight),
-	}, nil
-}
-
-// WeightdeviceOpt defines a map of WeightDevices
-type WeightdeviceOpt struct {
-	values    []*blkiodev.WeightDevice
-	validator ValidatorWeightFctType
-}
-
-// NewWeightdeviceOpt creates a new WeightdeviceOpt
-func NewWeightdeviceOpt(validator ValidatorWeightFctType) WeightdeviceOpt {
-	values := []*blkiodev.WeightDevice{}
-	return WeightdeviceOpt{
-		values:    values,
-		validator: validator,
-	}
-}
-
-// Set validates a WeightDevice and sets its name as a key in WeightdeviceOpt
-func (opt *WeightdeviceOpt) Set(val string) error {
-	var value *blkiodev.WeightDevice
-	if opt.validator != nil {
-		v, err := opt.validator(val)
-		if err != nil {
-			return err
-		}
-		value = v
-	}
-	(opt.values) = append((opt.values), value)
-	return nil
-}
-
-// String returns WeightdeviceOpt values as a string.
-func (opt *WeightdeviceOpt) String() string {
-	var out []string
-	for _, v := range opt.values {
-		out = append(out, v.String())
-	}
-
-	return fmt.Sprintf("%v", out)
-}
-
-// GetList returns a slice of pointers to WeightDevices.
-func (opt *WeightdeviceOpt) GetList() []*blkiodev.WeightDevice {
-	var weightdevice []*blkiodev.WeightDevice
-	for _, v := range opt.values {
-		weightdevice = append(weightdevice, v)
-	}
-
-	return weightdevice
-}
-
-// Type returns the option type
-func (opt *WeightdeviceOpt) Type() string {
-	return "weighted-device"
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/debug.go b/installer/vendor/github.com/docker/docker/utils/debug.go
deleted file mode 100644
index d203891129..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/debug.go
+++ /dev/null
@@ -1,26 +0,0 @@
-package utils
-
-import (
-	"os"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// EnableDebug sets the DEBUG env var to true
-// and makes the logger to log at debug level.
-func EnableDebug() {
-	os.Setenv("DEBUG", "1")
-	logrus.SetLevel(logrus.DebugLevel)
-}
-
-// DisableDebug sets the DEBUG env var to false
-// and makes the logger to log at info level.
-func DisableDebug() {
-	os.Setenv("DEBUG", "")
-	logrus.SetLevel(logrus.InfoLevel)
-}
-
-// IsDebugEnabled checks whether the debug flag is set or not.
-func IsDebugEnabled() bool {
-	return os.Getenv("DEBUG") != ""
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/debug_test.go b/installer/vendor/github.com/docker/docker/utils/debug_test.go
deleted file mode 100644
index 6f9c4dfbb0..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/debug_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package utils
-
-import (
-	"os"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-)
-
-func TestEnableDebug(t *testing.T) {
-	defer func() {
-		os.Setenv("DEBUG", "")
-		logrus.SetLevel(logrus.InfoLevel)
-	}()
-	EnableDebug()
-	if os.Getenv("DEBUG") != "1" {
-		t.Fatalf("expected DEBUG=1, got %s\n", os.Getenv("DEBUG"))
-	}
-	if logrus.GetLevel() != logrus.DebugLevel {
-		t.Fatalf("expected log level %v, got %v\n", logrus.DebugLevel, logrus.GetLevel())
-	}
-}
-
-func TestDisableDebug(t *testing.T) {
-	DisableDebug()
-	if os.Getenv("DEBUG") != "" {
-		t.Fatalf("expected DEBUG=\"\", got %s\n", os.Getenv("DEBUG"))
-	}
-	if logrus.GetLevel() != logrus.InfoLevel {
-		t.Fatalf("expected log level %v, got %v\n", logrus.InfoLevel, logrus.GetLevel())
-	}
-}
-
-func TestDebugEnabled(t *testing.T) {
-	EnableDebug()
-	if !IsDebugEnabled() {
-		t.Fatal("expected debug enabled, got false")
-	}
-	DisableDebug()
-	if IsDebugEnabled() {
-		t.Fatal("expected debug disabled, got true")
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/names.go b/installer/vendor/github.com/docker/docker/utils/names.go
deleted file mode 100644
index 632062819c..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/names.go
+++ /dev/null
@@ -1,9 +0,0 @@
-package utils
-
-import "regexp"
-
-// RestrictedNameChars collects the characters allowed to represent a name, normally used to validate container and volume names.
-const RestrictedNameChars = `[a-zA-Z0-9][a-zA-Z0-9_.-]`
-
-// RestrictedNamePattern is a regular expression to validate names against the collection of restricted characters.
-var RestrictedNamePattern = regexp.MustCompile(`^` + RestrictedNameChars + `+$`)
diff --git a/installer/vendor/github.com/docker/docker/utils/process_unix.go b/installer/vendor/github.com/docker/docker/utils/process_unix.go
deleted file mode 100644
index fc0b1c8b74..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/process_unix.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build linux freebsd solaris
-
-package utils
-
-import (
-	"syscall"
-)
-
-// IsProcessAlive returns true if process with a given pid is running.
-func IsProcessAlive(pid int) bool {
-	err := syscall.Kill(pid, syscall.Signal(0))
-	if err == nil || err == syscall.EPERM {
-		return true
-	}
-
-	return false
-}
-
-// KillProcess force-stops a process.
-func KillProcess(pid int) {
-	syscall.Kill(pid, syscall.SIGKILL)
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/process_windows.go b/installer/vendor/github.com/docker/docker/utils/process_windows.go
deleted file mode 100644
index 03cb855197..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/process_windows.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package utils
-
-// IsProcessAlive returns true if process with a given pid is running.
-func IsProcessAlive(pid int) bool {
-	// TODO Windows containerd. Not sure this is needed
-	//	p, err := os.FindProcess(pid)
-	//	if err == nil {
-	//		return true
-	//	}
-	return false
-}
-
-// KillProcess force-stops a process.
-func KillProcess(pid int) {
-	// TODO Windows containerd. Not sure this is needed
-	//	p, err := os.FindProcess(pid)
-	//	if err == nil {
-	//		p.Kill()
-	//	}
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/templates/templates.go b/installer/vendor/github.com/docker/docker/utils/templates/templates.go
deleted file mode 100644
index 91c376f38f..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/templates/templates.go
+++ /dev/null
@@ -1,42 +0,0 @@
-package templates
-
-import (
-	"encoding/json"
-	"strings"
-	"text/template"
-)
-
-// basicFunctions are the set of initial
-// functions provided to every template.
-var basicFunctions = template.FuncMap{
-	"json": func(v interface{}) string {
-		a, _ := json.Marshal(v)
-		return string(a)
-	},
-	"split": strings.Split,
-	"join":  strings.Join,
-	"title": strings.Title,
-	"lower": strings.ToLower,
-	"upper": strings.ToUpper,
-	"pad":   padWithSpace,
-}
-
-// Parse creates a new annonymous template with the basic functions
-// and parses the given format.
-func Parse(format string) (*template.Template, error) {
-	return NewParse("", format)
-}
-
-// NewParse creates a new tagged template with the basic functions
-// and parses the given format.
-func NewParse(tag, format string) (*template.Template, error) {
-	return template.New(tag).Funcs(basicFunctions).Parse(format)
-}
-
-// padWithSpace adds whitespace to the input if the input is non-empty
-func padWithSpace(source string, prefix, suffix int) string {
-	if source == "" {
-		return source
-	}
-	return strings.Repeat(" ", prefix) + source + strings.Repeat(" ", suffix)
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/templates/templates_test.go b/installer/vendor/github.com/docker/docker/utils/templates/templates_test.go
deleted file mode 100644
index dd42901aed..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/templates/templates_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-package templates
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestParseStringFunctions(t *testing.T) {
-	tm, err := Parse(`{{join (split . ":") "/"}}`)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var b bytes.Buffer
-	if err := tm.Execute(&b, "text:with:colon"); err != nil {
-		t.Fatal(err)
-	}
-	want := "text/with/colon"
-	if b.String() != want {
-		t.Fatalf("expected %s, got %s", want, b.String())
-	}
-}
-
-func TestNewParse(t *testing.T) {
-	tm, err := NewParse("foo", "this is a {{ . }}")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var b bytes.Buffer
-	if err := tm.Execute(&b, "string"); err != nil {
-		t.Fatal(err)
-	}
-	want := "this is a string"
-	if b.String() != want {
-		t.Fatalf("expected %s, got %s", want, b.String())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/utils.go b/installer/vendor/github.com/docker/docker/utils/utils.go
deleted file mode 100644
index d3dd00abf4..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/utils.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package utils
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/stringid"
-)
-
-var globalTestID string
-
-// TestDirectory creates a new temporary directory and returns its path.
-// The contents of directory at path `templateDir` is copied into the
-// new directory.
-func TestDirectory(templateDir string) (dir string, err error) {
-	if globalTestID == "" {
-		globalTestID = stringid.GenerateNonCryptoID()[:4]
-	}
-	prefix := fmt.Sprintf("docker-test%s-%s-", globalTestID, GetCallerName(2))
-	if prefix == "" {
-		prefix = "docker-test-"
-	}
-	dir, err = ioutil.TempDir("", prefix)
-	if err = os.Remove(dir); err != nil {
-		return
-	}
-	if templateDir != "" {
-		if err = archive.CopyWithTar(templateDir, dir); err != nil {
-			return
-		}
-	}
-	return
-}
-
-// GetCallerName introspects the call stack and returns the name of the
-// function `depth` levels down in the stack.
-func GetCallerName(depth int) string {
-	// Use the caller function name as a prefix.
-	// This helps trace temp directories back to their test.
-	pc, _, _, _ := runtime.Caller(depth + 1)
-	callerLongName := runtime.FuncForPC(pc).Name()
-	parts := strings.Split(callerLongName, ".")
-	callerShortName := parts[len(parts)-1]
-	return callerShortName
-}
-
-// ReplaceOrAppendEnvValues returns the defaults with the overrides either
-// replaced by env key or appended to the list
-func ReplaceOrAppendEnvValues(defaults, overrides []string) []string {
-	cache := make(map[string]int, len(defaults))
-	for i, e := range defaults {
-		parts := strings.SplitN(e, "=", 2)
-		cache[parts[0]] = i
-	}
-
-	for _, value := range overrides {
-		// Values w/o = means they want this env to be removed/unset.
-		if !strings.Contains(value, "=") {
-			if i, exists := cache[value]; exists {
-				defaults[i] = "" // Used to indicate it should be removed
-			}
-			continue
-		}
-
-		// Just do a normal set/update
-		parts := strings.SplitN(value, "=", 2)
-		if i, exists := cache[parts[0]]; exists {
-			defaults[i] = value
-		} else {
-			defaults = append(defaults, value)
-		}
-	}
-
-	// Now remove all entries that we want to "unset"
-	for i := 0; i < len(defaults); i++ {
-		if defaults[i] == "" {
-			defaults = append(defaults[:i], defaults[i+1:]...)
-			i--
-		}
-	}
-
-	return defaults
-}
diff --git a/installer/vendor/github.com/docker/docker/utils/utils_test.go b/installer/vendor/github.com/docker/docker/utils/utils_test.go
deleted file mode 100644
index ab3911e8b3..0000000000
--- a/installer/vendor/github.com/docker/docker/utils/utils_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package utils
-
-import "testing"
-
-func TestReplaceAndAppendEnvVars(t *testing.T) {
-	var (
-		d = []string{"HOME=/"}
-		o = []string{"HOME=/root", "TERM=xterm"}
-	)
-
-	env := ReplaceOrAppendEnvValues(d, o)
-	if len(env) != 2 {
-		t.Fatalf("expected len of 2 got %d", len(env))
-	}
-	if env[0] != "HOME=/root" {
-		t.Fatalf("expected HOME=/root got '%s'", env[0])
-	}
-	if env[1] != "TERM=xterm" {
-		t.Fatalf("expected TERM=xterm got '%s'", env[1])
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/vendor.conf b/installer/vendor/github.com/docker/docker/vendor.conf
deleted file mode 100644
index bb7718bc42..0000000000
--- a/installer/vendor/github.com/docker/docker/vendor.conf
+++ /dev/null
@@ -1,140 +0,0 @@
-# the following lines are in sorted order, FYI
-github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62
-github.com/Microsoft/hcsshim v0.5.9
-github.com/Microsoft/go-winio v0.3.8
-github.com/Sirupsen/logrus v0.11.0
-github.com/davecgh/go-spew 6d212800a42e8ab5c146b8ace3490ee17e5225f9
-github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a
-github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git
-github.com/gorilla/context v1.1
-github.com/gorilla/mux v1.1
-github.com/kr/pty 5cf931ef8f
-github.com/mattn/go-shellwords v1.0.0
-github.com/mattn/go-sqlite3 v1.1.0
-github.com/tchap/go-patricia v2.2.6
-github.com/vdemeester/shakers 24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
-# forked golang.org/x/net package includes a patch for lazy loading trace templates
-golang.org/x/net 2beffdc2e92c8a3027590f898fe88f69af48a3f8 https://github.com/tonistiigi/net.git
-golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
-github.com/docker/go-units 8a7beacffa3009a9ac66bad506b18ffdd110cf97
-github.com/docker/go-connections ecb4cb2dd420ada7df7f2593d6c25441f65f69f2
-
-github.com/RackSec/srslog 456df3a81436d29ba874f3590eeeee25d666f8a5
-github.com/imdario/mergo 0.2.1
-
-#get libnetwork packages
-github.com/docker/libnetwork 45b40861e677e37cf27bc184eca5af92f8cdd32d
-github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894
-github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80
-github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec
-github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b
-github.com/hashicorp/memberlist 88ac4de0d1a0ca6def284b571342db3b777a4c37
-github.com/hashicorp/go-multierror fcdddc395df1ddf4247c69bd436e84cfa0733f7e
-github.com/hashicorp/serf 598c54895cc5a7b1a24a398d635e8c0ea0959870
-github.com/docker/libkv 1d8431073ae03cdaedb198a89722f3aab6d418ef
-github.com/vishvananda/netns 604eaf189ee867d8c147fafc28def2394e878d25
-github.com/vishvananda/netlink 482f7a52b758233521878cb6c5904b6bd63f3457
-github.com/BurntSushi/toml f706d00e3de6abe700c994cdd545a1a4915af060
-github.com/samuel/go-zookeeper d0e0d8e11f318e000a8cc434616d69e329edc374
-github.com/deckarep/golang-set ef32fa3046d9f249d399f98ebaf9be944430fd1d
-github.com/coreos/etcd 3a49cbb769ebd8d1dd25abb1e83386e9883a5707
-github.com/ugorji/go f1f1a805ed361a0e078bb537e4ea78cd37dcf065
-github.com/hashicorp/consul v0.5.2
-github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904
-github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7
-
-# get graph and distribution packages
-github.com/docker/distribution 28602af35aceda2f8d571bad7ca37a54cf0250bc
-github.com/vbatts/tar-split v0.10.1
-
-# get go-zfs packages
-github.com/mistifyio/go-zfs 22c9b32c84eb0d0c6f4043b6e90fc94073de92fa
-github.com/pborman/uuid v1.0
-
-# get desired notary commit, might also need to be updated in Dockerfile
-github.com/docker/notary v0.4.2
-
-google.golang.org/grpc v1.0.2
-github.com/miekg/pkcs11 df8ae6ca730422dba20c768ff38ef7d79077a59f
-github.com/docker/go v1.5.1-1-1-gbaf439e
-github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
-
-# When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly
-github.com/opencontainers/runc 9df8b306d01f59d3a8029be411de015b7304dd8f https://github.com/docker/runc.git # libcontainer
-github.com/opencontainers/runtime-spec 1c7c27d043c2a5e513a44084d2b10d77d1402b8c # specs
-github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
-# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
-github.com/coreos/go-systemd v4
-github.com/godbus/dbus v4.0.0
-github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
-github.com/golang/protobuf 1f49d83d9aa00e6ce4fc8258c71cc7786aec968a
-
-# gelf logging driver deps
-github.com/Graylog2/go-gelf aab2f594e4585d43468ac57287b0dece9d806883
-
-github.com/fluent/fluent-logger-golang v1.2.1
-# fluent-logger-golang deps
-github.com/philhofer/fwd 899e4efba8eaa1fea74175308f3fae18ff3319fa
-github.com/tinylib/msgp 75ee40d2601edf122ef667e2a07d600d4c44490c
-
-# fsnotify
-github.com/fsnotify/fsnotify v1.2.11
-
-# awslogs deps
-github.com/aws/aws-sdk-go v1.4.22
-github.com/go-ini/ini 060d7da055ba6ec5ea7a31f116332fe5efa04ce0
-github.com/jmespath/go-jmespath 0b12d6b521d83fc7f755e7cfc1b1fbdd35a01a74
-
-# logentries
-github.com/bsphere/le_go d3308aafe090956bc89a65f0769f58251a1b4f03
-
-# gcplogs deps
-golang.org/x/oauth2 2baa8a1b9338cf13d9eeb27696d761155fa480be
-google.golang.org/api dc6d2353af16e2a2b0ff6986af051d473a4ed468
-google.golang.org/cloud dae7e3d993bc3812a2185af60552bb6b847e52a0
-
-# native credentials
-github.com/docker/docker-credential-helpers f72c04f1d8e71959a6d103f808c50ccbad79b9fd
-
-# containerd
-github.com/docker/containerd aa8187dbd3b7ad67d8e5e3a15115d3eef43a7ed1
-github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4
-
-# cluster
-github.com/docker/swarmkit 1c7f003d75f091d5f7051ed982594420e4515f77
-github.com/golang/mock bd3c8e81be01eef76d4b503f5e687d2d1354d2d9
-github.com/gogo/protobuf v0.3
-github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
-github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e
-golang.org/x/crypto 3fbbcd23f1cb824e69491a5930cfeff09b12f4d2
-golang.org/x/time a4bde12657593d5e90d0533a3e4fd95e635124cb
-github.com/mreiferson/go-httpclient 63fe23f7434723dc904c901043af07931f293c47
-github.com/hashicorp/go-memdb 608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87
-github.com/hashicorp/go-immutable-radix 8e8ed81f8f0bf1bdd829593fdd5c29922c1ea990
-github.com/hashicorp/golang-lru a0d98a5f288019575c6d1f4bb1573fef2d1fcdc4
-github.com/coreos/pkg fa29b1d70f0beaddd4c7021607cc3c3be8ce94b8
-github.com/pivotal-golang/clock 3fd3c1944c59d9742e1cd333672181cd1a6f9fa0
-github.com/prometheus/client_golang 52437c81da6b127a9925d17eb3a382a2e5fd395e
-github.com/beorn7/perks 4c0e84591b9aa9e6dcfdf3e020114cd81f89d5f9
-github.com/prometheus/client_model fa8ad6fec33561be4280a8f0514318c79d7f6cb6
-github.com/prometheus/common ebdfc6da46522d58825777cf1f90490a5b1ef1d8
-github.com/prometheus/procfs abf152e5f3e97f2fafac028d2cc06c1feb87ffa5
-bitbucket.org/ww/goautoneg 75cd24fc2f2c2a2088577d12123ddee5f54e0675
-github.com/matttproud/golang_protobuf_extensions fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a
-github.com/pkg/errors 839d9e913e063e28dfd0e6c7b7512793e0a48be9
-
-# cli
-github.com/spf13/cobra v1.5 https://github.com/dnephin/cobra.git
-github.com/spf13/pflag dabebe21bf790f782ea4c7bbd2efc430de182afd
-github.com/inconshreveable/mousetrap 76626ae9c91c4f2a10f34cad8ce83ea42c93bb75
-github.com/flynn-archive/go-shlex 3f9db97f856818214da2e1057f8ad84803971cff
-
-# metrics
-github.com/docker/go-metrics 86138d05f285fd9737a99bee2d9be30866b59d72
-
-# composefile
-github.com/mitchellh/mapstructure f3009df150dadf309fdee4a54ed65c124afad715
-github.com/xeipuuv/gojsonpointer e0fe6f68307607d540ed8eac07a342c33fa1b54a
-github.com/xeipuuv/gojsonreference e02fc20de94c78484cd5ffb007f8af96be030a45
-github.com/xeipuuv/gojsonschema 93e72a773fade158921402d6a24c819b48aba29d
-gopkg.in/yaml.v2 a83829b6f1293c91addabc89d0571c246397bbf4
diff --git a/installer/vendor/github.com/docker/docker/volume/drivers/adapter.go b/installer/vendor/github.com/docker/docker/volume/drivers/adapter.go
deleted file mode 100644
index 62ef7dfe60..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/drivers/adapter.go
+++ /dev/null
@@ -1,177 +0,0 @@
-package volumedrivers
-
-import (
-	"errors"
-	"path/filepath"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/volume"
-)
-
-var (
-	errNoSuchVolume = errors.New("no such volume")
-)
-
-type volumeDriverAdapter struct {
-	name         string
-	baseHostPath string
-	capabilities *volume.Capability
-	proxy        *volumeDriverProxy
-}
-
-func (a *volumeDriverAdapter) Name() string {
-	return a.name
-}
-
-func (a *volumeDriverAdapter) Create(name string, opts map[string]string) (volume.Volume, error) {
-	if err := a.proxy.Create(name, opts); err != nil {
-		return nil, err
-	}
-	return &volumeAdapter{
-		proxy:        a.proxy,
-		name:         name,
-		driverName:   a.name,
-		baseHostPath: a.baseHostPath,
-	}, nil
-}
-
-func (a *volumeDriverAdapter) Remove(v volume.Volume) error {
-	return a.proxy.Remove(v.Name())
-}
-
-func hostPath(baseHostPath, path string) string {
-	if baseHostPath != "" {
-		path = filepath.Join(baseHostPath, path)
-	}
-	return path
-}
-
-func (a *volumeDriverAdapter) List() ([]volume.Volume, error) {
-	ls, err := a.proxy.List()
-	if err != nil {
-		return nil, err
-	}
-
-	var out []volume.Volume
-	for _, vp := range ls {
-		out = append(out, &volumeAdapter{
-			proxy:        a.proxy,
-			name:         vp.Name,
-			baseHostPath: a.baseHostPath,
-			driverName:   a.name,
-			eMount:       hostPath(a.baseHostPath, vp.Mountpoint),
-		})
-	}
-	return out, nil
-}
-
-func (a *volumeDriverAdapter) Get(name string) (volume.Volume, error) {
-	v, err := a.proxy.Get(name)
-	if err != nil {
-		return nil, err
-	}
-
-	// plugin may have returned no volume and no error
-	if v == nil {
-		return nil, errNoSuchVolume
-	}
-
-	return &volumeAdapter{
-		proxy:        a.proxy,
-		name:         v.Name,
-		driverName:   a.Name(),
-		eMount:       v.Mountpoint,
-		status:       v.Status,
-		baseHostPath: a.baseHostPath,
-	}, nil
-}
-
-func (a *volumeDriverAdapter) Scope() string {
-	cap := a.getCapabilities()
-	return cap.Scope
-}
-
-func (a *volumeDriverAdapter) getCapabilities() volume.Capability {
-	if a.capabilities != nil {
-		return *a.capabilities
-	}
-	cap, err := a.proxy.Capabilities()
-	if err != nil {
-		// `GetCapabilities` is a not a required endpoint.
-		// On error assume it's a local-only driver
-		logrus.Warnf("Volume driver %s returned an error while trying to query its capabilities, using default capabilties: %v", a.name, err)
-		return volume.Capability{Scope: volume.LocalScope}
-	}
-
-	// don't spam the warn log below just because the plugin didn't provide a scope
-	if len(cap.Scope) == 0 {
-		cap.Scope = volume.LocalScope
-	}
-
-	cap.Scope = strings.ToLower(cap.Scope)
-	if cap.Scope != volume.LocalScope && cap.Scope != volume.GlobalScope {
-		logrus.Warnf("Volume driver %q returned an invalid scope: %q", a.Name(), cap.Scope)
-		cap.Scope = volume.LocalScope
-	}
-
-	a.capabilities = &cap
-	return cap
-}
-
-type volumeAdapter struct {
-	proxy        *volumeDriverProxy
-	name         string
-	baseHostPath string
-	driverName   string
-	eMount       string // ephemeral host volume path
-	status       map[string]interface{}
-}
-
-type proxyVolume struct {
-	Name       string
-	Mountpoint string
-	Status     map[string]interface{}
-}
-
-func (a *volumeAdapter) Name() string {
-	return a.name
-}
-
-func (a *volumeAdapter) DriverName() string {
-	return a.driverName
-}
-
-func (a *volumeAdapter) Path() string {
-	if len(a.eMount) == 0 {
-		mountpoint, _ := a.proxy.Path(a.name)
-		a.eMount = hostPath(a.baseHostPath, mountpoint)
-	}
-	return a.eMount
-}
-
-func (a *volumeAdapter) CachedPath() string {
-	return a.eMount
-}
-
-func (a *volumeAdapter) Mount(id string) (string, error) {
-	mountpoint, err := a.proxy.Mount(a.name, id)
-	a.eMount = hostPath(a.baseHostPath, mountpoint)
-	return a.eMount, err
-}
-
-func (a *volumeAdapter) Unmount(id string) error {
-	err := a.proxy.Unmount(a.name, id)
-	if err == nil {
-		a.eMount = ""
-	}
-	return err
-}
-
-func (a *volumeAdapter) Status() map[string]interface{} {
-	out := make(map[string]interface{}, len(a.status))
-	for k, v := range a.status {
-		out[k] = v
-	}
-	return out
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/drivers/extpoint.go b/installer/vendor/github.com/docker/docker/volume/drivers/extpoint.go
deleted file mode 100644
index 576dee8a1b..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/drivers/extpoint.go
+++ /dev/null
@@ -1,215 +0,0 @@
-//go:generate pluginrpc-gen -i $GOFILE -o proxy.go -type volumeDriver -name VolumeDriver
-
-package volumedrivers
-
-import (
-	"fmt"
-	"sync"
-
-	"github.com/docker/docker/pkg/locker"
-	getter "github.com/docker/docker/pkg/plugingetter"
-	"github.com/docker/docker/volume"
-)
-
-// currently created by hand. generation tool would generate this like:
-// $ extpoint-gen Driver > volume/extpoint.go
-
-var drivers = &driverExtpoint{
-	extensions: make(map[string]volume.Driver),
-	driverLock: &locker.Locker{},
-}
-
-const extName = "VolumeDriver"
-
-// NewVolumeDriver returns a driver has the given name mapped on the given client.
-func NewVolumeDriver(name string, baseHostPath string, c client) volume.Driver {
-	proxy := &volumeDriverProxy{c}
-	return &volumeDriverAdapter{name: name, baseHostPath: baseHostPath, proxy: proxy}
-}
-
-// volumeDriver defines the available functions that volume plugins must implement.
-// This interface is only defined to generate the proxy objects.
-// It's not intended to be public or reused.
-type volumeDriver interface {
-	// Create a volume with the given name
-	Create(name string, opts map[string]string) (err error)
-	// Remove the volume with the given name
-	Remove(name string) (err error)
-	// Get the mountpoint of the given volume
-	Path(name string) (mountpoint string, err error)
-	// Mount the given volume and return the mountpoint
-	Mount(name, id string) (mountpoint string, err error)
-	// Unmount the given volume
-	Unmount(name, id string) (err error)
-	// List lists all the volumes known to the driver
-	List() (volumes []*proxyVolume, err error)
-	// Get retrieves the volume with the requested name
-	Get(name string) (volume *proxyVolume, err error)
-	// Capabilities gets the list of capabilities of the driver
-	Capabilities() (capabilities volume.Capability, err error)
-}
-
-type driverExtpoint struct {
-	extensions map[string]volume.Driver
-	sync.Mutex
-	driverLock   *locker.Locker
-	plugingetter getter.PluginGetter
-}
-
-// RegisterPluginGetter sets the plugingetter
-func RegisterPluginGetter(plugingetter getter.PluginGetter) {
-	drivers.plugingetter = plugingetter
-}
-
-// Register associates the given driver to the given name, checking if
-// the name is already associated
-func Register(extension volume.Driver, name string) bool {
-	if name == "" {
-		return false
-	}
-
-	drivers.Lock()
-	defer drivers.Unlock()
-
-	_, exists := drivers.extensions[name]
-	if exists {
-		return false
-	}
-
-	if err := validateDriver(extension); err != nil {
-		return false
-	}
-
-	drivers.extensions[name] = extension
-
-	return true
-}
-
-// Unregister dissociates the name from its driver, if the association exists.
-func Unregister(name string) bool {
-	drivers.Lock()
-	defer drivers.Unlock()
-
-	_, exists := drivers.extensions[name]
-	if !exists {
-		return false
-	}
-	delete(drivers.extensions, name)
-	return true
-}
-
-// lookup returns the driver associated with the given name. If a
-// driver with the given name has not been registered it checks if
-// there is a VolumeDriver plugin available with the given name.
-func lookup(name string, mode int) (volume.Driver, error) {
-	drivers.driverLock.Lock(name)
-	defer drivers.driverLock.Unlock(name)
-
-	drivers.Lock()
-	ext, ok := drivers.extensions[name]
-	drivers.Unlock()
-	if ok {
-		return ext, nil
-	}
-	if drivers.plugingetter != nil {
-		p, err := drivers.plugingetter.Get(name, extName, mode)
-		if err != nil {
-			return nil, fmt.Errorf("Error looking up volume plugin %s: %v", name, err)
-		}
-
-		d := NewVolumeDriver(p.Name(), p.BasePath(), p.Client())
-		if err := validateDriver(d); err != nil {
-			return nil, err
-		}
-
-		if p.IsV1() {
-			drivers.Lock()
-			drivers.extensions[name] = d
-			drivers.Unlock()
-		}
-		return d, nil
-	}
-	return nil, fmt.Errorf("Error looking up volume plugin %s", name)
-}
-
-func validateDriver(vd volume.Driver) error {
-	scope := vd.Scope()
-	if scope != volume.LocalScope && scope != volume.GlobalScope {
-		return fmt.Errorf("Driver %q provided an invalid capability scope: %s", vd.Name(), scope)
-	}
-	return nil
-}
-
-// GetDriver returns a volume driver by its name.
-// If the driver is empty, it looks for the local driver.
-func GetDriver(name string) (volume.Driver, error) {
-	if name == "" {
-		name = volume.DefaultDriverName
-	}
-	return lookup(name, getter.LOOKUP)
-}
-
-// CreateDriver returns a volume driver by its name and increments RefCount.
-// If the driver is empty, it looks for the local driver.
-func CreateDriver(name string) (volume.Driver, error) {
-	if name == "" {
-		name = volume.DefaultDriverName
-	}
-	return lookup(name, getter.ACQUIRE)
-}
-
-// RemoveDriver returns a volume driver by its name and decrements RefCount..
-// If the driver is empty, it looks for the local driver.
-func RemoveDriver(name string) (volume.Driver, error) {
-	if name == "" {
-		name = volume.DefaultDriverName
-	}
-	return lookup(name, getter.RELEASE)
-}
-
-// GetDriverList returns list of volume drivers registered.
-// If no driver is registered, empty string list will be returned.
-func GetDriverList() []string {
-	var driverList []string
-	drivers.Lock()
-	for driverName := range drivers.extensions {
-		driverList = append(driverList, driverName)
-	}
-	drivers.Unlock()
-	return driverList
-}
-
-// GetAllDrivers lists all the registered drivers
-func GetAllDrivers() ([]volume.Driver, error) {
-	var plugins []getter.CompatPlugin
-	if drivers.plugingetter != nil {
-		var err error
-		plugins, err = drivers.plugingetter.GetAllByCap(extName)
-		if err != nil {
-			return nil, fmt.Errorf("error listing plugins: %v", err)
-		}
-	}
-	var ds []volume.Driver
-
-	drivers.Lock()
-	defer drivers.Unlock()
-
-	for _, d := range drivers.extensions {
-		ds = append(ds, d)
-	}
-
-	for _, p := range plugins {
-		name := p.Name()
-		ext, ok := drivers.extensions[name]
-		if ok {
-			continue
-		}
-
-		ext = NewVolumeDriver(name, p.BasePath(), p.Client())
-		if p.IsV1() {
-			drivers.extensions[name] = ext
-		}
-		ds = append(ds, ext)
-	}
-	return ds, nil
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/drivers/extpoint_test.go b/installer/vendor/github.com/docker/docker/volume/drivers/extpoint_test.go
deleted file mode 100644
index 428b0752f2..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/drivers/extpoint_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package volumedrivers
-
-import (
-	"testing"
-
-	volumetestutils "github.com/docker/docker/volume/testutils"
-)
-
-func TestGetDriver(t *testing.T) {
-	_, err := GetDriver("missing")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-	Register(volumetestutils.NewFakeDriver("fake"), "fake")
-
-	d, err := GetDriver("fake")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if d.Name() != "fake" {
-		t.Fatalf("Expected fake driver, got %s\n", d.Name())
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/drivers/proxy.go b/installer/vendor/github.com/docker/docker/volume/drivers/proxy.go
deleted file mode 100644
index b23db6258f..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/drivers/proxy.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// generated code - DO NOT EDIT
-
-package volumedrivers
-
-import (
-	"errors"
-
-	"github.com/docker/docker/volume"
-)
-
-type client interface {
-	Call(string, interface{}, interface{}) error
-}
-
-type volumeDriverProxy struct {
-	client
-}
-
-type volumeDriverProxyCreateRequest struct {
-	Name string
-	Opts map[string]string
-}
-
-type volumeDriverProxyCreateResponse struct {
-	Err string
-}
-
-func (pp *volumeDriverProxy) Create(name string, opts map[string]string) (err error) {
-	var (
-		req volumeDriverProxyCreateRequest
-		ret volumeDriverProxyCreateResponse
-	)
-
-	req.Name = name
-	req.Opts = opts
-	if err = pp.Call("VolumeDriver.Create", req, &ret); err != nil {
-		return
-	}
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyRemoveRequest struct {
-	Name string
-}
-
-type volumeDriverProxyRemoveResponse struct {
-	Err string
-}
-
-func (pp *volumeDriverProxy) Remove(name string) (err error) {
-	var (
-		req volumeDriverProxyRemoveRequest
-		ret volumeDriverProxyRemoveResponse
-	)
-
-	req.Name = name
-	if err = pp.Call("VolumeDriver.Remove", req, &ret); err != nil {
-		return
-	}
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyPathRequest struct {
-	Name string
-}
-
-type volumeDriverProxyPathResponse struct {
-	Mountpoint string
-	Err        string
-}
-
-func (pp *volumeDriverProxy) Path(name string) (mountpoint string, err error) {
-	var (
-		req volumeDriverProxyPathRequest
-		ret volumeDriverProxyPathResponse
-	)
-
-	req.Name = name
-	if err = pp.Call("VolumeDriver.Path", req, &ret); err != nil {
-		return
-	}
-
-	mountpoint = ret.Mountpoint
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyMountRequest struct {
-	Name string
-	ID   string
-}
-
-type volumeDriverProxyMountResponse struct {
-	Mountpoint string
-	Err        string
-}
-
-func (pp *volumeDriverProxy) Mount(name string, id string) (mountpoint string, err error) {
-	var (
-		req volumeDriverProxyMountRequest
-		ret volumeDriverProxyMountResponse
-	)
-
-	req.Name = name
-	req.ID = id
-	if err = pp.Call("VolumeDriver.Mount", req, &ret); err != nil {
-		return
-	}
-
-	mountpoint = ret.Mountpoint
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyUnmountRequest struct {
-	Name string
-	ID   string
-}
-
-type volumeDriverProxyUnmountResponse struct {
-	Err string
-}
-
-func (pp *volumeDriverProxy) Unmount(name string, id string) (err error) {
-	var (
-		req volumeDriverProxyUnmountRequest
-		ret volumeDriverProxyUnmountResponse
-	)
-
-	req.Name = name
-	req.ID = id
-	if err = pp.Call("VolumeDriver.Unmount", req, &ret); err != nil {
-		return
-	}
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyListRequest struct {
-}
-
-type volumeDriverProxyListResponse struct {
-	Volumes []*proxyVolume
-	Err     string
-}
-
-func (pp *volumeDriverProxy) List() (volumes []*proxyVolume, err error) {
-	var (
-		req volumeDriverProxyListRequest
-		ret volumeDriverProxyListResponse
-	)
-
-	if err = pp.Call("VolumeDriver.List", req, &ret); err != nil {
-		return
-	}
-
-	volumes = ret.Volumes
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyGetRequest struct {
-	Name string
-}
-
-type volumeDriverProxyGetResponse struct {
-	Volume *proxyVolume
-	Err    string
-}
-
-func (pp *volumeDriverProxy) Get(name string) (volume *proxyVolume, err error) {
-	var (
-		req volumeDriverProxyGetRequest
-		ret volumeDriverProxyGetResponse
-	)
-
-	req.Name = name
-	if err = pp.Call("VolumeDriver.Get", req, &ret); err != nil {
-		return
-	}
-
-	volume = ret.Volume
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
-
-type volumeDriverProxyCapabilitiesRequest struct {
-}
-
-type volumeDriverProxyCapabilitiesResponse struct {
-	Capabilities volume.Capability
-	Err          string
-}
-
-func (pp *volumeDriverProxy) Capabilities() (capabilities volume.Capability, err error) {
-	var (
-		req volumeDriverProxyCapabilitiesRequest
-		ret volumeDriverProxyCapabilitiesResponse
-	)
-
-	if err = pp.Call("VolumeDriver.Capabilities", req, &ret); err != nil {
-		return
-	}
-
-	capabilities = ret.Capabilities
-
-	if ret.Err != "" {
-		err = errors.New(ret.Err)
-	}
-
-	return
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/drivers/proxy_test.go b/installer/vendor/github.com/docker/docker/volume/drivers/proxy_test.go
deleted file mode 100644
index b78c46a036..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/drivers/proxy_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-package volumedrivers
-
-import (
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/plugins"
-	"github.com/docker/go-connections/tlsconfig"
-)
-
-func TestVolumeRequestError(t *testing.T) {
-	mux := http.NewServeMux()
-	server := httptest.NewServer(mux)
-	defer server.Close()
-
-	mux.HandleFunc("/VolumeDriver.Create", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot create volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Remove", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot remove volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Mount", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot mount volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Unmount", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot unmount volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Path", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Unknown volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.List", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot list volumes"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Get", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		fmt.Fprintln(w, `{"Err": "Cannot get volume"}`)
-	})
-
-	mux.HandleFunc("/VolumeDriver.Capabilities", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/vnd.docker.plugins.v1+json")
-		http.Error(w, "error", 500)
-	})
-
-	u, _ := url.Parse(server.URL)
-	client, err := plugins.NewClient("tcp://"+u.Host, &tlsconfig.Options{InsecureSkipVerify: true})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	driver := volumeDriverProxy{client}
-
-	if err = driver.Create("volume", nil); err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-
-	if !strings.Contains(err.Error(), "Cannot create volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	_, err = driver.Mount("volume", "123")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-
-	if !strings.Contains(err.Error(), "Cannot mount volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	err = driver.Unmount("volume", "123")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-
-	if !strings.Contains(err.Error(), "Cannot unmount volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	err = driver.Remove("volume")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-
-	if !strings.Contains(err.Error(), "Cannot remove volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	_, err = driver.Path("volume")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-
-	if !strings.Contains(err.Error(), "Unknown volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	_, err = driver.List()
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-	if !strings.Contains(err.Error(), "Cannot list volumes") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	_, err = driver.Get("volume")
-	if err == nil {
-		t.Fatal("Expected error, was nil")
-	}
-	if !strings.Contains(err.Error(), "Cannot get volume") {
-		t.Fatalf("Unexpected error: %v\n", err)
-	}
-
-	_, err = driver.Capabilities()
-	if err == nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/local/local.go b/installer/vendor/github.com/docker/docker/volume/local/local.go
deleted file mode 100644
index 62c45e69ea..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/local/local.go
+++ /dev/null
@@ -1,364 +0,0 @@
-// Package local provides the default implementation for volumes. It
-// is used to mount data volume containers and directories local to
-// the host server.
-package local
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync"
-
-	"github.com/pkg/errors"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/docker/docker/utils"
-	"github.com/docker/docker/volume"
-)
-
-// VolumeDataPathName is the name of the directory where the volume data is stored.
-// It uses a very distinctive name to avoid collisions migrating data between
-// Docker versions.
-const (
-	VolumeDataPathName = "_data"
-	volumesPathName    = "volumes"
-)
-
-var (
-	// ErrNotFound is the typed error returned when the requested volume name can't be found
-	ErrNotFound = fmt.Errorf("volume not found")
-	// volumeNameRegex ensures the name assigned for the volume is valid.
-	// This name is used to create the bind directory, so we need to avoid characters that
-	// would make the path to escape the root directory.
-	volumeNameRegex = utils.RestrictedNamePattern
-)
-
-type validationError struct {
-	error
-}
-
-func (validationError) IsValidationError() bool {
-	return true
-}
-
-type activeMount struct {
-	count   uint64
-	mounted bool
-}
-
-// New instantiates a new Root instance with the provided scope. Scope
-// is the base path that the Root instance uses to store its
-// volumes. The base path is created here if it does not exist.
-func New(scope string, rootUID, rootGID int) (*Root, error) {
-	rootDirectory := filepath.Join(scope, volumesPathName)
-
-	if err := idtools.MkdirAllAs(rootDirectory, 0700, rootUID, rootGID); err != nil {
-		return nil, err
-	}
-
-	r := &Root{
-		scope:   scope,
-		path:    rootDirectory,
-		volumes: make(map[string]*localVolume),
-		rootUID: rootUID,
-		rootGID: rootGID,
-	}
-
-	dirs, err := ioutil.ReadDir(rootDirectory)
-	if err != nil {
-		return nil, err
-	}
-
-	mountInfos, err := mount.GetMounts()
-	if err != nil {
-		logrus.Debugf("error looking up mounts for local volume cleanup: %v", err)
-	}
-
-	for _, d := range dirs {
-		if !d.IsDir() {
-			continue
-		}
-
-		name := filepath.Base(d.Name())
-		v := &localVolume{
-			driverName: r.Name(),
-			name:       name,
-			path:       r.DataPath(name),
-		}
-		r.volumes[name] = v
-		optsFilePath := filepath.Join(rootDirectory, name, "opts.json")
-		if b, err := ioutil.ReadFile(optsFilePath); err == nil {
-			opts := optsConfig{}
-			if err := json.Unmarshal(b, &opts); err != nil {
-				return nil, errors.Wrapf(err, "error while unmarshaling volume options for volume: %s", name)
-			}
-			// Make sure this isn't an empty optsConfig.
-			// This could be empty due to buggy behavior in older versions of Docker.
-			if !reflect.DeepEqual(opts, optsConfig{}) {
-				v.opts = &opts
-			}
-
-			// unmount anything that may still be mounted (for example, from an unclean shutdown)
-			for _, info := range mountInfos {
-				if info.Mountpoint == v.path {
-					mount.Unmount(v.path)
-					break
-				}
-			}
-		}
-	}
-
-	return r, nil
-}
-
-// Root implements the Driver interface for the volume package and
-// manages the creation/removal of volumes. It uses only standard vfs
-// commands to create/remove dirs within its provided scope.
-type Root struct {
-	m       sync.Mutex
-	scope   string
-	path    string
-	volumes map[string]*localVolume
-	rootUID int
-	rootGID int
-}
-
-// List lists all the volumes
-func (r *Root) List() ([]volume.Volume, error) {
-	var ls []volume.Volume
-	r.m.Lock()
-	for _, v := range r.volumes {
-		ls = append(ls, v)
-	}
-	r.m.Unlock()
-	return ls, nil
-}
-
-// DataPath returns the constructed path of this volume.
-func (r *Root) DataPath(volumeName string) string {
-	return filepath.Join(r.path, volumeName, VolumeDataPathName)
-}
-
-// Name returns the name of Root, defined in the volume package in the DefaultDriverName constant.
-func (r *Root) Name() string {
-	return volume.DefaultDriverName
-}
-
-// Create creates a new volume.Volume with the provided name, creating
-// the underlying directory tree required for this volume in the
-// process.
-func (r *Root) Create(name string, opts map[string]string) (volume.Volume, error) {
-	if err := r.validateName(name); err != nil {
-		return nil, err
-	}
-
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	v, exists := r.volumes[name]
-	if exists {
-		return v, nil
-	}
-
-	path := r.DataPath(name)
-	if err := idtools.MkdirAllAs(path, 0755, r.rootUID, r.rootGID); err != nil {
-		if os.IsExist(err) {
-			return nil, fmt.Errorf("volume already exists under %s", filepath.Dir(path))
-		}
-		return nil, errors.Wrapf(err, "error while creating volume path '%s'", path)
-	}
-
-	var err error
-	defer func() {
-		if err != nil {
-			os.RemoveAll(filepath.Dir(path))
-		}
-	}()
-
-	v = &localVolume{
-		driverName: r.Name(),
-		name:       name,
-		path:       path,
-	}
-
-	if len(opts) != 0 {
-		if err = setOpts(v, opts); err != nil {
-			return nil, err
-		}
-		var b []byte
-		b, err = json.Marshal(v.opts)
-		if err != nil {
-			return nil, err
-		}
-		if err = ioutil.WriteFile(filepath.Join(filepath.Dir(path), "opts.json"), b, 600); err != nil {
-			return nil, errors.Wrap(err, "error while persisting volume options")
-		}
-	}
-
-	r.volumes[name] = v
-	return v, nil
-}
-
-// Remove removes the specified volume and all underlying data. If the
-// given volume does not belong to this driver and an error is
-// returned. The volume is reference counted, if all references are
-// not released then the volume is not removed.
-func (r *Root) Remove(v volume.Volume) error {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	lv, ok := v.(*localVolume)
-	if !ok {
-		return fmt.Errorf("unknown volume type %T", v)
-	}
-
-	realPath, err := filepath.EvalSymlinks(lv.path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			return err
-		}
-		realPath = filepath.Dir(lv.path)
-	}
-
-	if !r.scopedPath(realPath) {
-		return fmt.Errorf("Unable to remove a directory of out the Docker root %s: %s", r.scope, realPath)
-	}
-
-	if err := removePath(realPath); err != nil {
-		return err
-	}
-
-	delete(r.volumes, lv.name)
-	return removePath(filepath.Dir(lv.path))
-}
-
-func removePath(path string) error {
-	if err := os.RemoveAll(path); err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return errors.Wrapf(err, "error removing volume path '%s'", path)
-	}
-	return nil
-}
-
-// Get looks up the volume for the given name and returns it if found
-func (r *Root) Get(name string) (volume.Volume, error) {
-	r.m.Lock()
-	v, exists := r.volumes[name]
-	r.m.Unlock()
-	if !exists {
-		return nil, ErrNotFound
-	}
-	return v, nil
-}
-
-// Scope returns the local volume scope
-func (r *Root) Scope() string {
-	return volume.LocalScope
-}
-
-func (r *Root) validateName(name string) error {
-	if len(name) == 1 {
-		return validationError{fmt.Errorf("volume name is too short, names should be at least two alphanumeric characters")}
-	}
-	if !volumeNameRegex.MatchString(name) {
-		return validationError{fmt.Errorf("%q includes invalid characters for a local volume name, only %q are allowed. If you intented to pass a host directory, use absolute path", name, utils.RestrictedNameChars)}
-	}
-	return nil
-}
-
-// localVolume implements the Volume interface from the volume package and
-// represents the volumes created by Root.
-type localVolume struct {
-	m sync.Mutex
-	// unique name of the volume
-	name string
-	// path is the path on the host where the data lives
-	path string
-	// driverName is the name of the driver that created the volume.
-	driverName string
-	// opts is the parsed list of options used to create the volume
-	opts *optsConfig
-	// active refcounts the active mounts
-	active activeMount
-}
-
-// Name returns the name of the given Volume.
-func (v *localVolume) Name() string {
-	return v.name
-}
-
-// DriverName returns the driver that created the given Volume.
-func (v *localVolume) DriverName() string {
-	return v.driverName
-}
-
-// Path returns the data location.
-func (v *localVolume) Path() string {
-	return v.path
-}
-
-// Mount implements the localVolume interface, returning the data location.
-func (v *localVolume) Mount(id string) (string, error) {
-	v.m.Lock()
-	defer v.m.Unlock()
-	if v.opts != nil {
-		if !v.active.mounted {
-			if err := v.mount(); err != nil {
-				return "", err
-			}
-			v.active.mounted = true
-		}
-		v.active.count++
-	}
-	return v.path, nil
-}
-
-// Umount is for satisfying the localVolume interface and does not do anything in this driver.
-func (v *localVolume) Unmount(id string) error {
-	v.m.Lock()
-	defer v.m.Unlock()
-	if v.opts != nil {
-		v.active.count--
-		if v.active.count == 0 {
-			if err := mount.Unmount(v.path); err != nil {
-				v.active.count++
-				return errors.Wrapf(err, "error while unmounting volume path '%s'", v.path)
-			}
-			v.active.mounted = false
-		}
-	}
-	return nil
-}
-
-func validateOpts(opts map[string]string) error {
-	for opt := range opts {
-		if !validOpts[opt] {
-			return validationError{fmt.Errorf("invalid option key: %q", opt)}
-		}
-	}
-	return nil
-}
-
-func (v *localVolume) Status() map[string]interface{} {
-	return nil
-}
-
-// getAddress finds out address/hostname from options
-func getAddress(opts string) string {
-	optsList := strings.Split(opts, ",")
-	for i := 0; i < len(optsList); i++ {
-		if strings.HasPrefix(optsList[i], "addr=") {
-			addr := (strings.SplitN(optsList[i], "=", 2)[1])
-			return addr
-		}
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/local/local_test.go b/installer/vendor/github.com/docker/docker/volume/local/local_test.go
deleted file mode 100644
index f5a519b883..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/local/local_test.go
+++ /dev/null
@@ -1,344 +0,0 @@
-package local
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/pkg/mount"
-)
-
-func TestGetAddress(t *testing.T) {
-	cases := map[string]string{
-		"addr=11.11.11.1":   "11.11.11.1",
-		" ":                 "",
-		"addr=":             "",
-		"addr=2001:db8::68": "2001:db8::68",
-	}
-	for name, success := range cases {
-		v := getAddress(name)
-		if v != success {
-			t.Errorf("Test case failed for %s actual: %s expected : %s", name, v, success)
-		}
-	}
-
-}
-
-func TestRemove(t *testing.T) {
-	// TODO Windows: Investigate why this test fails on Windows under CI
-	//               but passes locally.
-	if runtime.GOOS == "windows" {
-		t.Skip("Test failing on Windows CI")
-	}
-	rootDir, err := ioutil.TempDir("", "local-volume-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	r, err := New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vol, err := r.Create("testing", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := r.Remove(vol); err != nil {
-		t.Fatal(err)
-	}
-
-	vol, err = r.Create("testing2", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := os.RemoveAll(vol.Path()); err != nil {
-		t.Fatal(err)
-	}
-
-	if err := r.Remove(vol); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := os.Stat(vol.Path()); err != nil && !os.IsNotExist(err) {
-		t.Fatal("volume dir not removed")
-	}
-
-	if l, _ := r.List(); len(l) != 0 {
-		t.Fatal("expected there to be no volumes")
-	}
-}
-
-func TestInitializeWithVolumes(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "local-volume-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	r, err := New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vol, err := r.Create("testing", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	r, err = New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	v, err := r.Get(vol.Name())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if v.Path() != vol.Path() {
-		t.Fatal("expected to re-initialize root with existing volumes")
-	}
-}
-
-func TestCreate(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "local-volume-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	r, err := New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cases := map[string]bool{
-		"name":                  true,
-		"name-with-dash":        true,
-		"name_with_underscore":  true,
-		"name/with/slash":       false,
-		"name/with/../../slash": false,
-		"./name":                false,
-		"../name":               false,
-		"./":                    false,
-		"../":                   false,
-		"~":                     false,
-		".":                     false,
-		"..":                    false,
-		"...":                   false,
-	}
-
-	for name, success := range cases {
-		v, err := r.Create(name, nil)
-		if success {
-			if err != nil {
-				t.Fatal(err)
-			}
-			if v.Name() != name {
-				t.Fatalf("Expected volume with name %s, got %s", name, v.Name())
-			}
-		} else {
-			if err == nil {
-				t.Fatalf("Expected error creating volume with name %s, got nil", name)
-			}
-		}
-	}
-
-	r, err = New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestValidateName(t *testing.T) {
-	r := &Root{}
-	names := map[string]bool{
-		"x":           false,
-		"/testvol":    false,
-		"thing.d":     true,
-		"hello-world": true,
-		"./hello":     false,
-		".hello":      false,
-	}
-
-	for vol, expected := range names {
-		err := r.validateName(vol)
-		if expected && err != nil {
-			t.Fatalf("expected %s to be valid got %v", vol, err)
-		}
-		if !expected && err == nil {
-			t.Fatalf("expected %s to be invalid", vol)
-		}
-	}
-}
-
-func TestCreateWithOpts(t *testing.T) {
-	if runtime.GOOS == "windows" || runtime.GOOS == "solaris" {
-		t.Skip()
-	}
-	rootDir, err := ioutil.TempDir("", "local-volume-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	r, err := New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := r.Create("test", map[string]string{"invalidopt": "notsupported"}); err == nil {
-		t.Fatal("expected invalid opt to cause error")
-	}
-
-	vol, err := r.Create("test", map[string]string{"device": "tmpfs", "type": "tmpfs", "o": "size=1m,uid=1000"})
-	if err != nil {
-		t.Fatal(err)
-	}
-	v := vol.(*localVolume)
-
-	dir, err := v.Mount("1234")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if err := v.Unmount("1234"); err != nil {
-			t.Fatal(err)
-		}
-	}()
-
-	mountInfos, err := mount.GetMounts()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var found bool
-	for _, info := range mountInfos {
-		if info.Mountpoint == dir {
-			found = true
-			if info.Fstype != "tmpfs" {
-				t.Fatalf("expected tmpfs mount, got %q", info.Fstype)
-			}
-			if info.Source != "tmpfs" {
-				t.Fatalf("expected tmpfs mount, got %q", info.Source)
-			}
-			if !strings.Contains(info.VfsOpts, "uid=1000") {
-				t.Fatalf("expected mount info to have uid=1000: %q", info.VfsOpts)
-			}
-			if !strings.Contains(info.VfsOpts, "size=1024k") {
-				t.Fatalf("expected mount info to have size=1024k: %q", info.VfsOpts)
-			}
-			break
-		}
-	}
-
-	if !found {
-		t.Fatal("mount not found")
-	}
-
-	if v.active.count != 1 {
-		t.Fatalf("Expected active mount count to be 1, got %d", v.active.count)
-	}
-
-	// test double mount
-	if _, err := v.Mount("1234"); err != nil {
-		t.Fatal(err)
-	}
-	if v.active.count != 2 {
-		t.Fatalf("Expected active mount count to be 2, got %d", v.active.count)
-	}
-
-	if err := v.Unmount("1234"); err != nil {
-		t.Fatal(err)
-	}
-	if v.active.count != 1 {
-		t.Fatalf("Expected active mount count to be 1, got %d", v.active.count)
-	}
-
-	mounted, err := mount.Mounted(v.path)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !mounted {
-		t.Fatal("expected mount to still be active")
-	}
-
-	r, err = New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	v2, exists := r.volumes["test"]
-	if !exists {
-		t.Fatal("missing volume on restart")
-	}
-
-	if !reflect.DeepEqual(v.opts, v2.opts) {
-		t.Fatal("missing volume options on restart")
-	}
-}
-
-func TestRealodNoOpts(t *testing.T) {
-	rootDir, err := ioutil.TempDir("", "volume-test-reload-no-opts")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(rootDir)
-
-	r, err := New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := r.Create("test1", nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := r.Create("test2", nil); err != nil {
-		t.Fatal(err)
-	}
-	// make sure a file with `null` (.e.g. empty opts map from older daemon) is ok
-	if err := ioutil.WriteFile(filepath.Join(rootDir, "test2"), []byte("null"), 600); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := r.Create("test3", nil); err != nil {
-		t.Fatal(err)
-	}
-	// make sure an empty opts file doesn't break us too
-	if err := ioutil.WriteFile(filepath.Join(rootDir, "test3"), nil, 600); err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := r.Create("test4", map[string]string{}); err != nil {
-		t.Fatal(err)
-	}
-
-	r, err = New(rootDir, 0, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, name := range []string{"test1", "test2", "test3", "test4"} {
-		v, err := r.Get(name)
-		if err != nil {
-			t.Fatal(err)
-		}
-		lv, ok := v.(*localVolume)
-		if !ok {
-			t.Fatalf("expected *localVolume got: %v", reflect.TypeOf(v))
-		}
-		if lv.opts != nil {
-			t.Fatalf("expected opts to be nil, got: %v", lv.opts)
-		}
-		if _, err := lv.Mount("1234"); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/local/local_unix.go b/installer/vendor/github.com/docker/docker/volume/local/local_unix.go
deleted file mode 100644
index fb08862cef..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/local/local_unix.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// +build linux freebsd solaris
-
-// Package local provides the default implementation for volumes. It
-// is used to mount data volume containers and directories local to
-// the host server.
-package local
-
-import (
-	"fmt"
-	"net"
-	"path/filepath"
-	"strings"
-
-	"github.com/pkg/errors"
-
-	"github.com/docker/docker/pkg/mount"
-)
-
-var (
-	oldVfsDir = filepath.Join("vfs", "dir")
-
-	validOpts = map[string]bool{
-		"type":   true, // specify the filesystem type for mount, e.g. nfs
-		"o":      true, // generic mount options
-		"device": true, // device to mount from
-	}
-)
-
-type optsConfig struct {
-	MountType   string
-	MountOpts   string
-	MountDevice string
-}
-
-func (o *optsConfig) String() string {
-	return fmt.Sprintf("type='%s' device='%s' o='%s'", o.MountType, o.MountDevice, o.MountOpts)
-}
-
-// scopedPath verifies that the path where the volume is located
-// is under Docker's root and the valid local paths.
-func (r *Root) scopedPath(realPath string) bool {
-	// Volumes path for Docker version >= 1.7
-	if strings.HasPrefix(realPath, filepath.Join(r.scope, volumesPathName)) && realPath != filepath.Join(r.scope, volumesPathName) {
-		return true
-	}
-
-	// Volumes path for Docker version < 1.7
-	if strings.HasPrefix(realPath, filepath.Join(r.scope, oldVfsDir)) {
-		return true
-	}
-
-	return false
-}
-
-func setOpts(v *localVolume, opts map[string]string) error {
-	if len(opts) == 0 {
-		return nil
-	}
-	if err := validateOpts(opts); err != nil {
-		return err
-	}
-
-	v.opts = &optsConfig{
-		MountType:   opts["type"],
-		MountOpts:   opts["o"],
-		MountDevice: opts["device"],
-	}
-	return nil
-}
-
-func (v *localVolume) mount() error {
-	if v.opts.MountDevice == "" {
-		return fmt.Errorf("missing device in volume options")
-	}
-	mountOpts := v.opts.MountOpts
-	if v.opts.MountType == "nfs" {
-		if addrValue := getAddress(v.opts.MountOpts); addrValue != "" && net.ParseIP(addrValue).To4() == nil {
-			ipAddr, err := net.ResolveIPAddr("ip", addrValue)
-			if err != nil {
-				return errors.Wrapf(err, "error resolving passed in nfs address")
-			}
-			mountOpts = strings.Replace(mountOpts, "addr="+addrValue, "addr="+ipAddr.String(), 1)
-		}
-	}
-	err := mount.Mount(v.opts.MountDevice, v.path, v.opts.MountType, mountOpts)
-	return errors.Wrapf(err, "error while mounting volume with options: %s", v.opts)
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/local/local_windows.go b/installer/vendor/github.com/docker/docker/volume/local/local_windows.go
deleted file mode 100644
index 1bdb368a0f..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/local/local_windows.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Package local provides the default implementation for volumes. It
-// is used to mount data volume containers and directories local to
-// the host server.
-package local
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-type optsConfig struct{}
-
-var validOpts map[string]bool
-
-// scopedPath verifies that the path where the volume is located
-// is under Docker's root and the valid local paths.
-func (r *Root) scopedPath(realPath string) bool {
-	if strings.HasPrefix(realPath, filepath.Join(r.scope, volumesPathName)) && realPath != filepath.Join(r.scope, volumesPathName) {
-		return true
-	}
-	return false
-}
-
-func setOpts(v *localVolume, opts map[string]string) error {
-	if len(opts) > 0 {
-		return fmt.Errorf("options are not supported on this platform")
-	}
-	return nil
-}
-
-func (v *localVolume) mount() error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/db.go b/installer/vendor/github.com/docker/docker/volume/store/db.go
deleted file mode 100644
index c5fd1643f5..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/db.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package store
-
-import (
-	"encoding/json"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/boltdb/bolt"
-	"github.com/pkg/errors"
-)
-
-var volumeBucketName = []byte("volumes")
-
-type volumeMetadata struct {
-	Name    string
-	Driver  string
-	Labels  map[string]string
-	Options map[string]string
-}
-
-func (s *VolumeStore) setMeta(name string, meta volumeMetadata) error {
-	return s.db.Update(func(tx *bolt.Tx) error {
-		return setMeta(tx, name, meta)
-	})
-}
-
-func setMeta(tx *bolt.Tx, name string, meta volumeMetadata) error {
-	metaJSON, err := json.Marshal(meta)
-	if err != nil {
-		return err
-	}
-	b := tx.Bucket(volumeBucketName)
-	return errors.Wrap(b.Put([]byte(name), metaJSON), "error setting volume metadata")
-}
-
-func (s *VolumeStore) getMeta(name string) (volumeMetadata, error) {
-	var meta volumeMetadata
-	err := s.db.View(func(tx *bolt.Tx) error {
-		return getMeta(tx, name, &meta)
-	})
-	return meta, err
-}
-
-func getMeta(tx *bolt.Tx, name string, meta *volumeMetadata) error {
-	b := tx.Bucket(volumeBucketName)
-	val := b.Get([]byte(name))
-	if string(val) == "" {
-		return nil
-	}
-	if err := json.Unmarshal(val, meta); err != nil {
-		return errors.Wrap(err, "error unmarshaling volume metadata")
-	}
-	return nil
-}
-
-func (s *VolumeStore) removeMeta(name string) error {
-	return s.db.Update(func(tx *bolt.Tx) error {
-		return removeMeta(tx, name)
-	})
-}
-
-func removeMeta(tx *bolt.Tx, name string) error {
-	b := tx.Bucket(volumeBucketName)
-	return errors.Wrap(b.Delete([]byte(name)), "error removing volume metadata")
-}
-
-// listMeta is used during restore to get the list of volume metadata
-// from the on-disk database.
-// Any errors that occur are only logged.
-func listMeta(tx *bolt.Tx) []volumeMetadata {
-	var ls []volumeMetadata
-	b := tx.Bucket(volumeBucketName)
-	b.ForEach(func(k, v []byte) error {
-		if len(v) == 0 {
-			// don't try to unmarshal an empty value
-			return nil
-		}
-
-		var m volumeMetadata
-		if err := json.Unmarshal(v, &m); err != nil {
-			// Just log the error
-			logrus.Errorf("Error while reading volume metadata for volume %q: %v", string(k), err)
-			return nil
-		}
-		ls = append(ls, m)
-		return nil
-	})
-	return ls
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/errors.go b/installer/vendor/github.com/docker/docker/volume/store/errors.go
deleted file mode 100644
index 980175f29c..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/errors.go
+++ /dev/null
@@ -1,76 +0,0 @@
-package store
-
-import (
-	"strings"
-
-	"github.com/pkg/errors"
-)
-
-var (
-	// errVolumeInUse is a typed error returned when trying to remove a volume that is currently in use by a container
-	errVolumeInUse = errors.New("volume is in use")
-	// errNoSuchVolume is a typed error returned if the requested volume doesn't exist in the volume store
-	errNoSuchVolume = errors.New("no such volume")
-	// errInvalidName is a typed error returned when creating a volume with a name that is not valid on the platform
-	errInvalidName = errors.New("volume name is not valid on this platform")
-	// errNameConflict is a typed error returned on create when a volume exists with the given name, but for a different driver
-	errNameConflict = errors.New("volume name must be unique")
-)
-
-// OpErr is the error type returned by functions in the store package. It describes
-// the operation, volume name, and error.
-type OpErr struct {
-	// Err is the error that occurred during the operation.
-	Err error
-	// Op is the operation which caused the error, such as "create", or "list".
-	Op string
-	// Name is the name of the resource being requested for this op, typically the volume name or the driver name.
-	Name string
-	// Refs is the list of references associated with the resource.
-	Refs []string
-}
-
-// Error satisfies the built-in error interface type.
-func (e *OpErr) Error() string {
-	if e == nil {
-		return "<nil>"
-	}
-	s := e.Op
-	if e.Name != "" {
-		s = s + " " + e.Name
-	}
-
-	s = s + ": " + e.Err.Error()
-	if len(e.Refs) > 0 {
-		s = s + " - " + "[" + strings.Join(e.Refs, ", ") + "]"
-	}
-	return s
-}
-
-// IsInUse returns a boolean indicating whether the error indicates that a
-// volume is in use
-func IsInUse(err error) bool {
-	return isErr(err, errVolumeInUse)
-}
-
-// IsNotExist returns a boolean indicating whether the error indicates that the volume does not exist
-func IsNotExist(err error) bool {
-	return isErr(err, errNoSuchVolume)
-}
-
-// IsNameConflict returns a boolean indicating whether the error indicates that a
-// volume name is already taken
-func IsNameConflict(err error) bool {
-	return isErr(err, errNameConflict)
-}
-
-func isErr(err error, expected error) bool {
-	err = errors.Cause(err)
-	switch pe := err.(type) {
-	case nil:
-		return false
-	case *OpErr:
-		err = errors.Cause(pe.Err)
-	}
-	return err == expected
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/restore.go b/installer/vendor/github.com/docker/docker/volume/store/restore.go
deleted file mode 100644
index c0c5b519bc..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/restore.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package store
-
-import (
-	"sync"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/boltdb/bolt"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-)
-
-// restore is called when a new volume store is created.
-// It's primary purpose is to ensure that all drivers' refcounts are set based
-// on known volumes after a restart.
-// This only attempts to track volumes that are actually stored in the on-disk db.
-// It does not probe the available drivers to find anything that may have been added
-// out of band.
-func (s *VolumeStore) restore() {
-	var ls []volumeMetadata
-	s.db.View(func(tx *bolt.Tx) error {
-		ls = listMeta(tx)
-		return nil
-	})
-
-	chRemove := make(chan *volumeMetadata, len(ls))
-	var wg sync.WaitGroup
-	for _, meta := range ls {
-		wg.Add(1)
-		// this is potentially a very slow operation, so do it in a goroutine
-		go func(meta volumeMetadata) {
-			defer wg.Done()
-
-			var v volume.Volume
-			var err error
-			if meta.Driver != "" {
-				v, err = lookupVolume(meta.Driver, meta.Name)
-				if err != nil && err != errNoSuchVolume {
-					logrus.WithError(err).WithField("driver", meta.Driver).WithField("volume", meta.Name).Warn("Error restoring volume")
-					return
-				}
-				if v == nil {
-					// doesn't exist in the driver, remove it from the db
-					chRemove <- &meta
-					return
-				}
-			} else {
-				v, err = s.getVolume(meta.Name)
-				if err != nil {
-					if err == errNoSuchVolume {
-						chRemove <- &meta
-					}
-					return
-				}
-
-				meta.Driver = v.DriverName()
-				if err := s.setMeta(v.Name(), meta); err != nil {
-					logrus.WithError(err).WithField("driver", meta.Driver).WithField("volume", v.Name()).Warn("Error updating volume metadata on restore")
-				}
-			}
-
-			// increment driver refcount
-			volumedrivers.CreateDriver(meta.Driver)
-
-			// cache the volume
-			s.globalLock.Lock()
-			s.options[v.Name()] = meta.Options
-			s.labels[v.Name()] = meta.Labels
-			s.names[v.Name()] = v
-			s.globalLock.Unlock()
-		}(meta)
-	}
-
-	wg.Wait()
-	close(chRemove)
-	s.db.Update(func(tx *bolt.Tx) error {
-		for meta := range chRemove {
-			if err := removeMeta(tx, meta.Name); err != nil {
-				logrus.WithField("volume", meta.Name).Warnf("Error removing stale entry from volume db: %v", err)
-			}
-		}
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/store.go b/installer/vendor/github.com/docker/docker/volume/store/store.go
deleted file mode 100644
index 38afd86f45..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/store.go
+++ /dev/null
@@ -1,649 +0,0 @@
-package store
-
-import (
-	"net"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-
-	"github.com/pkg/errors"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/boltdb/bolt"
-	"github.com/docker/docker/pkg/locker"
-	"github.com/docker/docker/volume"
-	"github.com/docker/docker/volume/drivers"
-)
-
-const (
-	volumeDataDir = "volumes"
-)
-
-type volumeWrapper struct {
-	volume.Volume
-	labels  map[string]string
-	scope   string
-	options map[string]string
-}
-
-func (v volumeWrapper) Options() map[string]string {
-	options := map[string]string{}
-	for key, value := range v.options {
-		options[key] = value
-	}
-	return options
-}
-
-func (v volumeWrapper) Labels() map[string]string {
-	return v.labels
-}
-
-func (v volumeWrapper) Scope() string {
-	return v.scope
-}
-
-func (v volumeWrapper) CachedPath() string {
-	if vv, ok := v.Volume.(interface {
-		CachedPath() string
-	}); ok {
-		return vv.CachedPath()
-	}
-	return v.Volume.Path()
-}
-
-// New initializes a VolumeStore to keep
-// reference counting of volumes in the system.
-func New(rootPath string) (*VolumeStore, error) {
-	vs := &VolumeStore{
-		locks:   &locker.Locker{},
-		names:   make(map[string]volume.Volume),
-		refs:    make(map[string][]string),
-		labels:  make(map[string]map[string]string),
-		options: make(map[string]map[string]string),
-	}
-
-	if rootPath != "" {
-		// initialize metadata store
-		volPath := filepath.Join(rootPath, volumeDataDir)
-		if err := os.MkdirAll(volPath, 750); err != nil {
-			return nil, err
-		}
-
-		dbPath := filepath.Join(volPath, "metadata.db")
-
-		var err error
-		vs.db, err = bolt.Open(dbPath, 0600, &bolt.Options{Timeout: 1 * time.Second})
-		if err != nil {
-			return nil, errors.Wrap(err, "error while opening volume store metadata database")
-		}
-
-		// initialize volumes bucket
-		if err := vs.db.Update(func(tx *bolt.Tx) error {
-			if _, err := tx.CreateBucketIfNotExists(volumeBucketName); err != nil {
-				return errors.Wrap(err, "error while setting up volume store metadata database")
-			}
-			return nil
-		}); err != nil {
-			return nil, err
-		}
-	}
-
-	vs.restore()
-
-	return vs, nil
-}
-
-func (s *VolumeStore) getNamed(name string) (volume.Volume, bool) {
-	s.globalLock.RLock()
-	v, exists := s.names[name]
-	s.globalLock.RUnlock()
-	return v, exists
-}
-
-func (s *VolumeStore) setNamed(v volume.Volume, ref string) {
-	s.globalLock.Lock()
-	s.names[v.Name()] = v
-	if len(ref) > 0 {
-		s.refs[v.Name()] = append(s.refs[v.Name()], ref)
-	}
-	s.globalLock.Unlock()
-}
-
-// getRefs gets the list of refs for a given name
-// Callers of this function are expected to hold the name lock.
-func (s *VolumeStore) getRefs(name string) []string {
-	s.globalLock.RLock()
-	refs := s.refs[name]
-	s.globalLock.RUnlock()
-	return refs
-}
-
-// Purge allows the cleanup of internal data on docker in case
-// the internal data is out of sync with volumes driver plugins.
-func (s *VolumeStore) Purge(name string) {
-	s.globalLock.Lock()
-	v, exists := s.names[name]
-	if exists {
-		if _, err := volumedrivers.RemoveDriver(v.DriverName()); err != nil {
-			logrus.Error("Error dereferencing volume driver: %v", err)
-		}
-	}
-	if err := s.removeMeta(name); err != nil {
-		logrus.Errorf("Error removing volume metadata for volume %q: %v", name, err)
-	}
-	delete(s.names, name)
-	delete(s.refs, name)
-	delete(s.labels, name)
-	delete(s.options, name)
-	s.globalLock.Unlock()
-}
-
-// VolumeStore is a struct that stores the list of volumes available and keeps track of their usage counts
-type VolumeStore struct {
-	// locks ensures that only one action is being performed on a particular volume at a time without locking the entire store
-	// since actions on volumes can be quite slow, this ensures the store is free to handle requests for other volumes.
-	locks *locker.Locker
-	// globalLock is used to protect access to mutable structures used by the store object
-	globalLock sync.RWMutex
-	// names stores the volume name -> volume relationship.
-	// This is used for making lookups faster so we don't have to probe all drivers
-	names map[string]volume.Volume
-	// refs stores the volume name and the list of things referencing it
-	refs map[string][]string
-	// labels stores volume labels for each volume
-	labels map[string]map[string]string
-	// options stores volume options for each volume
-	options map[string]map[string]string
-	db      *bolt.DB
-}
-
-// List proxies to all registered volume drivers to get the full list of volumes
-// If a driver returns a volume that has name which conflicts with another volume from a different driver,
-// the first volume is chosen and the conflicting volume is dropped.
-func (s *VolumeStore) List() ([]volume.Volume, []string, error) {
-	vols, warnings, err := s.list()
-	if err != nil {
-		return nil, nil, &OpErr{Err: err, Op: "list"}
-	}
-	var out []volume.Volume
-
-	for _, v := range vols {
-		name := normaliseVolumeName(v.Name())
-
-		s.locks.Lock(name)
-		storedV, exists := s.getNamed(name)
-		// Note: it's not safe to populate the cache here because the volume may have been
-		// deleted before we acquire a lock on its name
-		if exists && storedV.DriverName() != v.DriverName() {
-			logrus.Warnf("Volume name %s already exists for driver %s, not including volume returned by %s", v.Name(), storedV.DriverName(), v.DriverName())
-			s.locks.Unlock(v.Name())
-			continue
-		}
-
-		out = append(out, v)
-		s.locks.Unlock(v.Name())
-	}
-	return out, warnings, nil
-}
-
-// list goes through each volume driver and asks for its list of volumes.
-func (s *VolumeStore) list() ([]volume.Volume, []string, error) {
-	var (
-		ls       []volume.Volume
-		warnings []string
-	)
-
-	drivers, err := volumedrivers.GetAllDrivers()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	type vols struct {
-		vols       []volume.Volume
-		err        error
-		driverName string
-	}
-	chVols := make(chan vols, len(drivers))
-
-	for _, vd := range drivers {
-		go func(d volume.Driver) {
-			vs, err := d.List()
-			if err != nil {
-				chVols <- vols{driverName: d.Name(), err: &OpErr{Err: err, Name: d.Name(), Op: "list"}}
-				return
-			}
-			for i, v := range vs {
-				s.globalLock.RLock()
-				vs[i] = volumeWrapper{v, s.labels[v.Name()], d.Scope(), s.options[v.Name()]}
-				s.globalLock.RUnlock()
-			}
-
-			chVols <- vols{vols: vs}
-		}(vd)
-	}
-
-	badDrivers := make(map[string]struct{})
-	for i := 0; i < len(drivers); i++ {
-		vs := <-chVols
-
-		if vs.err != nil {
-			warnings = append(warnings, vs.err.Error())
-			badDrivers[vs.driverName] = struct{}{}
-			logrus.Warn(vs.err)
-		}
-		ls = append(ls, vs.vols...)
-	}
-
-	if len(badDrivers) > 0 {
-		s.globalLock.RLock()
-		for _, v := range s.names {
-			if _, exists := badDrivers[v.DriverName()]; exists {
-				ls = append(ls, v)
-			}
-		}
-		s.globalLock.RUnlock()
-	}
-	return ls, warnings, nil
-}
-
-// CreateWithRef creates a volume with the given name and driver and stores the ref
-// This ensures there's no race between creating a volume and then storing a reference.
-func (s *VolumeStore) CreateWithRef(name, driverName, ref string, opts, labels map[string]string) (volume.Volume, error) {
-	name = normaliseVolumeName(name)
-	s.locks.Lock(name)
-	defer s.locks.Unlock(name)
-
-	v, err := s.create(name, driverName, opts, labels)
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "create"}
-	}
-
-	s.setNamed(v, ref)
-	return v, nil
-}
-
-// Create creates a volume with the given name and driver.
-// This is just like CreateWithRef() except we don't store a reference while holding the lock.
-func (s *VolumeStore) Create(name, driverName string, opts, labels map[string]string) (volume.Volume, error) {
-	return s.CreateWithRef(name, driverName, "", opts, labels)
-}
-
-// checkConflict checks the local cache for name collisions with the passed in name,
-// for existing volumes with the same name but in a different driver.
-// This is used by `Create` as a best effort to prevent name collisions for volumes.
-// If a matching volume is found that is not a conflict that is returned so the caller
-// does not need to perform an additional lookup.
-// When no matching volume is found, both returns will be nil
-//
-// Note: This does not probe all the drivers for name collisions because v1 plugins
-// are very slow, particularly if the plugin is down, and cause other issues,
-// particularly around locking the store.
-// TODO(cpuguy83): With v2 plugins this shouldn't be a problem. Could also potentially
-// use a connect timeout for this kind of check to ensure we aren't blocking for a
-// long time.
-func (s *VolumeStore) checkConflict(name, driverName string) (volume.Volume, error) {
-	// check the local cache
-	v, _ := s.getNamed(name)
-	if v == nil {
-		return nil, nil
-	}
-
-	vDriverName := v.DriverName()
-	var conflict bool
-	if driverName != "" {
-		// Retrieve canonical driver name to avoid inconsistencies (for example
-		// "plugin" vs. "plugin:latest")
-		vd, err := volumedrivers.GetDriver(driverName)
-		if err != nil {
-			return nil, err
-		}
-
-		if vDriverName != vd.Name() {
-			conflict = true
-		}
-	}
-
-	// let's check if the found volume ref
-	// is stale by checking with the driver if it still exists
-	exists, err := volumeExists(v)
-	if err != nil {
-		return nil, errors.Wrapf(errNameConflict, "found reference to volume '%s' in driver '%s', but got an error while checking the driver: %v", name, vDriverName, err)
-	}
-
-	if exists {
-		if conflict {
-			return nil, errors.Wrapf(errNameConflict, "driver '%s' already has volume '%s'", vDriverName, name)
-		}
-		return v, nil
-	}
-
-	if len(s.getRefs(v.Name())) > 0 {
-		// Containers are referencing this volume but it doesn't seem to exist anywhere.
-		// Return a conflict error here, the user can fix this with `docker volume rm -f`
-		return nil, errors.Wrapf(errNameConflict, "found references to volume '%s' in driver '%s' but the volume was not found in the driver -- you may need to remove containers referencing this volume or force remove the volume to re-create it", name, vDriverName)
-	}
-
-	// doesn't exist, so purge it from the cache
-	s.Purge(name)
-	return nil, nil
-}
-
-// volumeExists returns if the volume is still present in the driver.
-// An error is returned if there was an issue communicating with the driver.
-func volumeExists(v volume.Volume) (bool, error) {
-	exists, err := lookupVolume(v.DriverName(), v.Name())
-	if err != nil {
-		return false, err
-	}
-	return exists != nil, nil
-}
-
-// create asks the given driver to create a volume with the name/opts.
-// If a volume with the name is already known, it will ask the stored driver for the volume.
-// If the passed in driver name does not match the driver name which is stored
-//  for the given volume name, an error is returned after checking if the reference is stale.
-// If the reference is stale, it will be purged and this create can continue.
-// It is expected that callers of this function hold any necessary locks.
-func (s *VolumeStore) create(name, driverName string, opts, labels map[string]string) (volume.Volume, error) {
-	// Validate the name in a platform-specific manner
-	valid, err := volume.IsVolumeNameValid(name)
-	if err != nil {
-		return nil, err
-	}
-	if !valid {
-		return nil, &OpErr{Err: errInvalidName, Name: name, Op: "create"}
-	}
-
-	v, err := s.checkConflict(name, driverName)
-	if err != nil {
-		return nil, err
-	}
-
-	if v != nil {
-		return v, nil
-	}
-
-	// Since there isn't a specified driver name, let's see if any of the existing drivers have this volume name
-	if driverName == "" {
-		v, _ := s.getVolume(name)
-		if v != nil {
-			return v, nil
-		}
-	}
-
-	vd, err := volumedrivers.CreateDriver(driverName)
-
-	if err != nil {
-		return nil, &OpErr{Op: "create", Name: name, Err: err}
-	}
-
-	logrus.Debugf("Registering new volume reference: driver %q, name %q", vd.Name(), name)
-
-	if v, _ := vd.Get(name); v != nil {
-		return v, nil
-	}
-	v, err = vd.Create(name, opts)
-	if err != nil {
-		return nil, err
-	}
-	s.globalLock.Lock()
-	s.labels[name] = labels
-	s.options[name] = opts
-	s.globalLock.Unlock()
-
-	metadata := volumeMetadata{
-		Name:    name,
-		Driver:  vd.Name(),
-		Labels:  labels,
-		Options: opts,
-	}
-
-	if err := s.setMeta(name, metadata); err != nil {
-		return nil, err
-	}
-	return volumeWrapper{v, labels, vd.Scope(), opts}, nil
-}
-
-// GetWithRef gets a volume with the given name from the passed in driver and stores the ref
-// This is just like Get(), but we store the reference while holding the lock.
-// This makes sure there are no races between checking for the existence of a volume and adding a reference for it
-func (s *VolumeStore) GetWithRef(name, driverName, ref string) (volume.Volume, error) {
-	name = normaliseVolumeName(name)
-	s.locks.Lock(name)
-	defer s.locks.Unlock(name)
-
-	vd, err := volumedrivers.GetDriver(driverName)
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "get"}
-	}
-
-	v, err := vd.Get(name)
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "get"}
-	}
-
-	s.setNamed(v, ref)
-
-	s.globalLock.RLock()
-	defer s.globalLock.RUnlock()
-	return volumeWrapper{v, s.labels[name], vd.Scope(), s.options[name]}, nil
-}
-
-// Get looks if a volume with the given name exists and returns it if so
-func (s *VolumeStore) Get(name string) (volume.Volume, error) {
-	name = normaliseVolumeName(name)
-	s.locks.Lock(name)
-	defer s.locks.Unlock(name)
-
-	v, err := s.getVolume(name)
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "get"}
-	}
-	s.setNamed(v, "")
-	return v, nil
-}
-
-// getVolume requests the volume, if the driver info is stored it just accesses that driver,
-// if the driver is unknown it probes all drivers until it finds the first volume with that name.
-// it is expected that callers of this function hold any necessary locks
-func (s *VolumeStore) getVolume(name string) (volume.Volume, error) {
-	var meta volumeMetadata
-	meta, err := s.getMeta(name)
-	if err != nil {
-		return nil, err
-	}
-
-	driverName := meta.Driver
-	if driverName == "" {
-		s.globalLock.RLock()
-		v, exists := s.names[name]
-		s.globalLock.RUnlock()
-		if exists {
-			meta.Driver = v.DriverName()
-			if err := s.setMeta(name, meta); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	if meta.Driver != "" {
-		vol, err := lookupVolume(meta.Driver, name)
-		if err != nil {
-			return nil, err
-		}
-		if vol == nil {
-			s.Purge(name)
-			return nil, errNoSuchVolume
-		}
-
-		var scope string
-		vd, err := volumedrivers.GetDriver(meta.Driver)
-		if err == nil {
-			scope = vd.Scope()
-		}
-		return volumeWrapper{vol, meta.Labels, scope, meta.Options}, nil
-	}
-
-	logrus.Debugf("Probing all drivers for volume with name: %s", name)
-	drivers, err := volumedrivers.GetAllDrivers()
-	if err != nil {
-		return nil, err
-	}
-
-	for _, d := range drivers {
-		v, err := d.Get(name)
-		if err != nil || v == nil {
-			continue
-		}
-		meta.Driver = v.DriverName()
-		if err := s.setMeta(name, meta); err != nil {
-			return nil, err
-		}
-		return volumeWrapper{v, meta.Labels, d.Scope(), meta.Options}, nil
-	}
-	return nil, errNoSuchVolume
-}
-
-// lookupVolume gets the specified volume from the specified driver.
-// This will only return errors related to communications with the driver.
-// If the driver returns an error that is not communication related the
-//   error is logged but not returned.
-// If the volume is not found it will return `nil, nil``
-func lookupVolume(driverName, volumeName string) (volume.Volume, error) {
-	vd, err := volumedrivers.GetDriver(driverName)
-	if err != nil {
-		return nil, errors.Wrapf(err, "error while checking if volume %q exists in driver %q", volumeName, driverName)
-	}
-	v, err := vd.Get(volumeName)
-	if err != nil {
-		err = errors.Cause(err)
-		if _, ok := err.(net.Error); ok {
-			return nil, errors.Wrapf(err, "error while checking if volume %q exists in driver %q", v.Name(), v.DriverName())
-		}
-
-		// At this point, the error could be anything from the driver, such as "no such volume"
-		// Let's not check an error here, and instead check if the driver returned a volume
-		logrus.WithError(err).WithField("driver", driverName).WithField("volume", volumeName).Warnf("Error while looking up volume")
-	}
-	return v, nil
-}
-
-// Remove removes the requested volume. A volume is not removed if it has any refs
-func (s *VolumeStore) Remove(v volume.Volume) error {
-	name := normaliseVolumeName(v.Name())
-	s.locks.Lock(name)
-	defer s.locks.Unlock(name)
-
-	refs := s.getRefs(name)
-	if len(refs) > 0 {
-		return &OpErr{Err: errVolumeInUse, Name: v.Name(), Op: "remove", Refs: refs}
-	}
-
-	vd, err := volumedrivers.GetDriver(v.DriverName())
-	if err != nil {
-		return &OpErr{Err: err, Name: vd.Name(), Op: "remove"}
-	}
-
-	logrus.Debugf("Removing volume reference: driver %s, name %s", v.DriverName(), name)
-	vol := unwrapVolume(v)
-	if err := vd.Remove(vol); err != nil {
-		return &OpErr{Err: err, Name: name, Op: "remove"}
-	}
-
-	s.Purge(name)
-	return nil
-}
-
-// Dereference removes the specified reference to the volume
-func (s *VolumeStore) Dereference(v volume.Volume, ref string) {
-	s.locks.Lock(v.Name())
-	defer s.locks.Unlock(v.Name())
-
-	s.globalLock.Lock()
-	defer s.globalLock.Unlock()
-	var refs []string
-
-	for _, r := range s.refs[v.Name()] {
-		if r != ref {
-			refs = append(refs, r)
-		}
-	}
-	s.refs[v.Name()] = refs
-}
-
-// Refs gets the current list of refs for the given volume
-func (s *VolumeStore) Refs(v volume.Volume) []string {
-	s.locks.Lock(v.Name())
-	defer s.locks.Unlock(v.Name())
-
-	refs := s.getRefs(v.Name())
-	refsOut := make([]string, len(refs))
-	copy(refsOut, refs)
-	return refsOut
-}
-
-// FilterByDriver returns the available volumes filtered by driver name
-func (s *VolumeStore) FilterByDriver(name string) ([]volume.Volume, error) {
-	vd, err := volumedrivers.GetDriver(name)
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "list"}
-	}
-	ls, err := vd.List()
-	if err != nil {
-		return nil, &OpErr{Err: err, Name: name, Op: "list"}
-	}
-	for i, v := range ls {
-		options := map[string]string{}
-		s.globalLock.RLock()
-		for key, value := range s.options[v.Name()] {
-			options[key] = value
-		}
-		ls[i] = volumeWrapper{v, s.labels[v.Name()], vd.Scope(), options}
-		s.globalLock.RUnlock()
-	}
-	return ls, nil
-}
-
-// FilterByUsed returns the available volumes filtered by if they are in use or not.
-// `used=true` returns only volumes that are being used, while `used=false` returns
-// only volumes that are not being used.
-func (s *VolumeStore) FilterByUsed(vols []volume.Volume, used bool) []volume.Volume {
-	return s.filter(vols, func(v volume.Volume) bool {
-		s.locks.Lock(v.Name())
-		l := len(s.getRefs(v.Name()))
-		s.locks.Unlock(v.Name())
-		if (used && l > 0) || (!used && l == 0) {
-			return true
-		}
-		return false
-	})
-}
-
-// filterFunc defines a function to allow filter volumes in the store
-type filterFunc func(vol volume.Volume) bool
-
-// filter returns the available volumes filtered by a filterFunc function
-func (s *VolumeStore) filter(vols []volume.Volume, f filterFunc) []volume.Volume {
-	var ls []volume.Volume
-	for _, v := range vols {
-		if f(v) {
-			ls = append(ls, v)
-		}
-	}
-	return ls
-}
-
-func unwrapVolume(v volume.Volume) volume.Volume {
-	if vol, ok := v.(volumeWrapper); ok {
-		return vol.Volume
-	}
-
-	return v
-}
-
-// Shutdown releases all resources used by the volume store
-// It does not make any changes to volumes, drivers, etc.
-func (s *VolumeStore) Shutdown() error {
-	return s.db.Close()
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/store_test.go b/installer/vendor/github.com/docker/docker/volume/store/store_test.go
deleted file mode 100644
index b52f720ca1..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/store_test.go
+++ /dev/null
@@ -1,234 +0,0 @@
-package store
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/volume/drivers"
-	volumetestutils "github.com/docker/docker/volume/testutils"
-)
-
-func TestCreate(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	defer volumedrivers.Unregister("fake")
-	dir, err := ioutil.TempDir("", "test-create")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	v, err := s.Create("fake1", "fake", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v.Name() != "fake1" {
-		t.Fatalf("Expected fake1 volume, got %v", v)
-	}
-	if l, _, _ := s.List(); len(l) != 1 {
-		t.Fatalf("Expected 1 volume in the store, got %v: %v", len(l), l)
-	}
-
-	if _, err := s.Create("none", "none", nil, nil); err == nil {
-		t.Fatalf("Expected unknown driver error, got nil")
-	}
-
-	_, err = s.Create("fakeerror", "fake", map[string]string{"error": "create error"}, nil)
-	expected := &OpErr{Op: "create", Name: "fakeerror", Err: errors.New("create error")}
-	if err != nil && err.Error() != expected.Error() {
-		t.Fatalf("Expected create fakeError: create error, got %v", err)
-	}
-}
-
-func TestRemove(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
-	defer volumedrivers.Unregister("fake")
-	defer volumedrivers.Unregister("noop")
-	dir, err := ioutil.TempDir("", "test-remove")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// doing string compare here since this error comes directly from the driver
-	expected := "no such volume"
-	if err := s.Remove(volumetestutils.NoopVolume{}); err == nil || !strings.Contains(err.Error(), expected) {
-		t.Fatalf("Expected error %q, got %v", expected, err)
-	}
-
-	v, err := s.CreateWithRef("fake1", "fake", "fake", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if err := s.Remove(v); !IsInUse(err) {
-		t.Fatalf("Expected ErrVolumeInUse error, got %v", err)
-	}
-	s.Dereference(v, "fake")
-	if err := s.Remove(v); err != nil {
-		t.Fatal(err)
-	}
-	if l, _, _ := s.List(); len(l) != 0 {
-		t.Fatalf("Expected 0 volumes in the store, got %v, %v", len(l), l)
-	}
-}
-
-func TestList(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake2"), "fake2")
-	defer volumedrivers.Unregister("fake")
-	defer volumedrivers.Unregister("fake2")
-	dir, err := ioutil.TempDir("", "test-list")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.Create("test", "fake", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.Create("test2", "fake2", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	ls, _, err := s.List()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(ls) != 2 {
-		t.Fatalf("expected 2 volumes, got: %d", len(ls))
-	}
-	if err := s.Shutdown(); err != nil {
-		t.Fatal(err)
-	}
-
-	// and again with a new store
-	s, err = New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ls, _, err = s.List()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(ls) != 2 {
-		t.Fatalf("expected 2 volumes, got: %d", len(ls))
-	}
-}
-
-func TestFilterByDriver(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
-	defer volumedrivers.Unregister("fake")
-	defer volumedrivers.Unregister("noop")
-	dir, err := ioutil.TempDir("", "test-filter-driver")
-	if err != nil {
-		t.Fatal(err)
-	}
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := s.Create("fake1", "fake", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.Create("fake2", "fake", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.Create("fake3", "noop", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if l, _ := s.FilterByDriver("fake"); len(l) != 2 {
-		t.Fatalf("Expected 2 volumes, got %v, %v", len(l), l)
-	}
-
-	if l, _ := s.FilterByDriver("noop"); len(l) != 1 {
-		t.Fatalf("Expected 1 volume, got %v, %v", len(l), l)
-	}
-}
-
-func TestFilterByUsed(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	volumedrivers.Register(volumetestutils.NewFakeDriver("noop"), "noop")
-	dir, err := ioutil.TempDir("", "test-filter-used")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := s.CreateWithRef("fake1", "fake", "volReference", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := s.Create("fake2", "fake", nil, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	vols, _, err := s.List()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dangling := s.FilterByUsed(vols, false)
-	if len(dangling) != 1 {
-		t.Fatalf("expected 1 danging volume, got %v", len(dangling))
-	}
-	if dangling[0].Name() != "fake2" {
-		t.Fatalf("expected danging volume fake2, got %s", dangling[0].Name())
-	}
-
-	used := s.FilterByUsed(vols, true)
-	if len(used) != 1 {
-		t.Fatalf("expected 1 used volume, got %v", len(used))
-	}
-	if used[0].Name() != "fake1" {
-		t.Fatalf("expected used volume fake1, got %s", used[0].Name())
-	}
-}
-
-func TestDerefMultipleOfSameRef(t *testing.T) {
-	volumedrivers.Register(volumetestutils.NewFakeDriver("fake"), "fake")
-	dir, err := ioutil.TempDir("", "test-same-deref")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s, err := New(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	v, err := s.CreateWithRef("fake1", "fake", "volReference", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if _, err := s.GetWithRef("fake1", "fake", "volReference"); err != nil {
-		t.Fatal(err)
-	}
-
-	s.Dereference(v, "volReference")
-	if err := s.Remove(v); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/store_unix.go b/installer/vendor/github.com/docker/docker/volume/store/store_unix.go
deleted file mode 100644
index 8ebc1f20c7..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/store_unix.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build linux freebsd solaris
-
-package store
-
-// normaliseVolumeName is a platform specific function to normalise the name
-// of a volume. This is a no-op on Unix-like platforms
-func normaliseVolumeName(name string) string {
-	return name
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/store/store_windows.go b/installer/vendor/github.com/docker/docker/volume/store/store_windows.go
deleted file mode 100644
index 8601cdd5cf..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/store/store_windows.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package store
-
-import "strings"
-
-// normaliseVolumeName is a platform specific function to normalise the name
-// of a volume. On Windows, as NTFS is case insensitive, under
-// c:\ProgramData\Docker\Volumes\, the folders John and john would be synonymous.
-// Hence we can't allow the volume "John" and "john" to be created as separate
-// volumes.
-func normaliseVolumeName(name string) string {
-	return strings.ToLower(name)
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/testutils/testutils.go b/installer/vendor/github.com/docker/docker/volume/testutils/testutils.go
deleted file mode 100644
index 2dbac02fdb..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/testutils/testutils.go
+++ /dev/null
@@ -1,116 +0,0 @@
-package testutils
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/volume"
-)
-
-// NoopVolume is a volume that doesn't perform any operation
-type NoopVolume struct{}
-
-// Name is the name of the volume
-func (NoopVolume) Name() string { return "noop" }
-
-// DriverName is the name of the driver
-func (NoopVolume) DriverName() string { return "noop" }
-
-// Path is the filesystem path to the volume
-func (NoopVolume) Path() string { return "noop" }
-
-// Mount mounts the volume in the container
-func (NoopVolume) Mount(_ string) (string, error) { return "noop", nil }
-
-// Unmount unmounts the volume from the container
-func (NoopVolume) Unmount(_ string) error { return nil }
-
-// Status proivdes low-level details about the volume
-func (NoopVolume) Status() map[string]interface{} { return nil }
-
-// FakeVolume is a fake volume with a random name
-type FakeVolume struct {
-	name       string
-	driverName string
-}
-
-// NewFakeVolume creates a new fake volume for testing
-func NewFakeVolume(name string, driverName string) volume.Volume {
-	return FakeVolume{name: name, driverName: driverName}
-}
-
-// Name is the name of the volume
-func (f FakeVolume) Name() string { return f.name }
-
-// DriverName is the name of the driver
-func (f FakeVolume) DriverName() string { return f.driverName }
-
-// Path is the filesystem path to the volume
-func (FakeVolume) Path() string { return "fake" }
-
-// Mount mounts the volume in the container
-func (FakeVolume) Mount(_ string) (string, error) { return "fake", nil }
-
-// Unmount unmounts the volume from the container
-func (FakeVolume) Unmount(_ string) error { return nil }
-
-// Status proivdes low-level details about the volume
-func (FakeVolume) Status() map[string]interface{} { return nil }
-
-// FakeDriver is a driver that generates fake volumes
-type FakeDriver struct {
-	name string
-	vols map[string]volume.Volume
-}
-
-// NewFakeDriver creates a new FakeDriver with the specified name
-func NewFakeDriver(name string) volume.Driver {
-	return &FakeDriver{
-		name: name,
-		vols: make(map[string]volume.Volume),
-	}
-}
-
-// Name is the name of the driver
-func (d *FakeDriver) Name() string { return d.name }
-
-// Create initializes a fake volume.
-// It returns an error if the options include an "error" key with a message
-func (d *FakeDriver) Create(name string, opts map[string]string) (volume.Volume, error) {
-	if opts != nil && opts["error"] != "" {
-		return nil, fmt.Errorf(opts["error"])
-	}
-	v := NewFakeVolume(name, d.name)
-	d.vols[name] = v
-	return v, nil
-}
-
-// Remove deletes a volume.
-func (d *FakeDriver) Remove(v volume.Volume) error {
-	if _, exists := d.vols[v.Name()]; !exists {
-		return fmt.Errorf("no such volume")
-	}
-	delete(d.vols, v.Name())
-	return nil
-}
-
-// List lists the volumes
-func (d *FakeDriver) List() ([]volume.Volume, error) {
-	var vols []volume.Volume
-	for _, v := range d.vols {
-		vols = append(vols, v)
-	}
-	return vols, nil
-}
-
-// Get gets the volume
-func (d *FakeDriver) Get(name string) (volume.Volume, error) {
-	if v, exists := d.vols[name]; exists {
-		return v, nil
-	}
-	return nil, fmt.Errorf("no such volume")
-}
-
-// Scope returns the local scope
-func (*FakeDriver) Scope() string {
-	return "local"
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/validate.go b/installer/vendor/github.com/docker/docker/volume/validate.go
deleted file mode 100644
index 27a8c5d5b0..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/validate.go
+++ /dev/null
@@ -1,125 +0,0 @@
-package volume
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/docker/docker/api/types/mount"
-)
-
-var errBindNotExist = errors.New("bind source path does not exist")
-
-type validateOpts struct {
-	skipBindSourceCheck   bool
-	skipAbsolutePathCheck bool
-}
-
-func validateMountConfig(mnt *mount.Mount, options ...func(*validateOpts)) error {
-	opts := validateOpts{}
-	for _, o := range options {
-		o(&opts)
-	}
-
-	if len(mnt.Target) == 0 {
-		return &errMountConfig{mnt, errMissingField("Target")}
-	}
-
-	if err := validateNotRoot(mnt.Target); err != nil {
-		return &errMountConfig{mnt, err}
-	}
-
-	if !opts.skipAbsolutePathCheck {
-		if err := validateAbsolute(mnt.Target); err != nil {
-			return &errMountConfig{mnt, err}
-		}
-	}
-
-	switch mnt.Type {
-	case mount.TypeBind:
-		if len(mnt.Source) == 0 {
-			return &errMountConfig{mnt, errMissingField("Source")}
-		}
-		// Don't error out just because the propagation mode is not supported on the platform
-		if opts := mnt.BindOptions; opts != nil {
-			if len(opts.Propagation) > 0 && len(propagationModes) > 0 {
-				if _, ok := propagationModes[opts.Propagation]; !ok {
-					return &errMountConfig{mnt, fmt.Errorf("invalid propagation mode: %s", opts.Propagation)}
-				}
-			}
-		}
-		if mnt.VolumeOptions != nil {
-			return &errMountConfig{mnt, errExtraField("VolumeOptions")}
-		}
-
-		if err := validateAbsolute(mnt.Source); err != nil {
-			return &errMountConfig{mnt, err}
-		}
-
-		// Do not allow binding to non-existent path
-		if !opts.skipBindSourceCheck {
-			fi, err := os.Stat(mnt.Source)
-			if err != nil {
-				if !os.IsNotExist(err) {
-					return &errMountConfig{mnt, err}
-				}
-				return &errMountConfig{mnt, errBindNotExist}
-			}
-			if err := validateStat(fi); err != nil {
-				return &errMountConfig{mnt, err}
-			}
-		}
-	case mount.TypeVolume:
-		if mnt.BindOptions != nil {
-			return &errMountConfig{mnt, errExtraField("BindOptions")}
-		}
-
-		if len(mnt.Source) == 0 && mnt.ReadOnly {
-			return &errMountConfig{mnt, fmt.Errorf("must not set ReadOnly mode when using anonymous volumes")}
-		}
-
-		if len(mnt.Source) != 0 {
-			if valid, err := IsVolumeNameValid(mnt.Source); !valid {
-				if err == nil {
-					err = errors.New("invalid volume name")
-				}
-				return &errMountConfig{mnt, err}
-			}
-		}
-	case mount.TypeTmpfs:
-		if len(mnt.Source) != 0 {
-			return &errMountConfig{mnt, errExtraField("Source")}
-		}
-		if _, err := ConvertTmpfsOptions(mnt.TmpfsOptions, mnt.ReadOnly); err != nil {
-			return &errMountConfig{mnt, err}
-		}
-	default:
-		return &errMountConfig{mnt, errors.New("mount type unknown")}
-	}
-	return nil
-}
-
-type errMountConfig struct {
-	mount *mount.Mount
-	err   error
-}
-
-func (e *errMountConfig) Error() string {
-	return fmt.Sprintf("invalid mount config for type %q: %v", e.mount.Type, e.err.Error())
-}
-
-func errExtraField(name string) error {
-	return fmt.Errorf("field %s must not be specified", name)
-}
-func errMissingField(name string) error {
-	return fmt.Errorf("field %s must not be empty", name)
-}
-
-func validateAbsolute(p string) error {
-	p = convertSlash(p)
-	if filepath.IsAbs(p) {
-		return nil
-	}
-	return fmt.Errorf("invalid mount path: '%s' mount path must be absolute", p)
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/validate_test.go b/installer/vendor/github.com/docker/docker/volume/validate_test.go
deleted file mode 100644
index 8732500fc0..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/validate_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package volume
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/mount"
-)
-
-func TestValidateMount(t *testing.T) {
-	testDir, err := ioutil.TempDir("", "test-validate-mount")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(testDir)
-
-	cases := []struct {
-		input    mount.Mount
-		expected error
-	}{
-		{mount.Mount{Type: mount.TypeVolume}, errMissingField("Target")},
-		{mount.Mount{Type: mount.TypeVolume, Target: testDestinationPath, Source: "hello"}, nil},
-		{mount.Mount{Type: mount.TypeVolume, Target: testDestinationPath}, nil},
-		{mount.Mount{Type: mount.TypeBind}, errMissingField("Target")},
-		{mount.Mount{Type: mount.TypeBind, Target: testDestinationPath}, errMissingField("Source")},
-		{mount.Mount{Type: mount.TypeBind, Target: testDestinationPath, Source: testSourcePath, VolumeOptions: &mount.VolumeOptions{}}, errExtraField("VolumeOptions")},
-		{mount.Mount{Type: mount.TypeBind, Source: testSourcePath, Target: testDestinationPath}, errBindNotExist},
-		{mount.Mount{Type: mount.TypeBind, Source: testDir, Target: testDestinationPath}, nil},
-		{mount.Mount{Type: "invalid", Target: testDestinationPath}, errors.New("mount type unknown")},
-	}
-	for i, x := range cases {
-		err := validateMountConfig(&x.input)
-		if err == nil && x.expected == nil {
-			continue
-		}
-		if (err == nil && x.expected != nil) || (x.expected == nil && err != nil) || !strings.Contains(err.Error(), x.expected.Error()) {
-			t.Fatalf("expected %q, got %q, case: %d", x.expected, err, i)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/validate_test_unix.go b/installer/vendor/github.com/docker/docker/volume/validate_test_unix.go
deleted file mode 100644
index dd1de2f643..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/validate_test_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package volume
-
-var (
-	testDestinationPath = "/foo"
-	testSourcePath      = "/foo"
-)
diff --git a/installer/vendor/github.com/docker/docker/volume/validate_test_windows.go b/installer/vendor/github.com/docker/docker/volume/validate_test_windows.go
deleted file mode 100644
index d5f86ac850..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/validate_test_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package volume
-
-var (
-	testDestinationPath = `c:\foo`
-	testSourcePath      = `c:\foo`
-)
diff --git a/installer/vendor/github.com/docker/docker/volume/volume.go b/installer/vendor/github.com/docker/docker/volume/volume.go
deleted file mode 100644
index f3227fe485..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume.go
+++ /dev/null
@@ -1,323 +0,0 @@
-package volume
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-	"github.com/docker/docker/pkg/idtools"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/opencontainers/runc/libcontainer/label"
-	"github.com/pkg/errors"
-)
-
-// DefaultDriverName is the driver name used for the driver
-// implemented in the local package.
-const DefaultDriverName = "local"
-
-// Scopes define if a volume has is cluster-wide (global) or local only.
-// Scopes are returned by the volume driver when it is queried for capabilities and then set on a volume
-const (
-	LocalScope  = "local"
-	GlobalScope = "global"
-)
-
-// Driver is for creating and removing volumes.
-type Driver interface {
-	// Name returns the name of the volume driver.
-	Name() string
-	// Create makes a new volume with the given id.
-	Create(name string, opts map[string]string) (Volume, error)
-	// Remove deletes the volume.
-	Remove(vol Volume) (err error)
-	// List lists all the volumes the driver has
-	List() ([]Volume, error)
-	// Get retrieves the volume with the requested name
-	Get(name string) (Volume, error)
-	// Scope returns the scope of the driver (e.g. `global` or `local`).
-	// Scope determines how the driver is handled at a cluster level
-	Scope() string
-}
-
-// Capability defines a set of capabilities that a driver is able to handle.
-type Capability struct {
-	// Scope is the scope of the driver, `global` or `local`
-	// A `global` scope indicates that the driver manages volumes across the cluster
-	// A `local` scope indicates that the driver only manages volumes resources local to the host
-	// Scope is declared by the driver
-	Scope string
-}
-
-// Volume is a place to store data. It is backed by a specific driver, and can be mounted.
-type Volume interface {
-	// Name returns the name of the volume
-	Name() string
-	// DriverName returns the name of the driver which owns this volume.
-	DriverName() string
-	// Path returns the absolute path to the volume.
-	Path() string
-	// Mount mounts the volume and returns the absolute path to
-	// where it can be consumed.
-	Mount(id string) (string, error)
-	// Unmount unmounts the volume when it is no longer in use.
-	Unmount(id string) error
-	// Status returns low-level status information about a volume
-	Status() map[string]interface{}
-}
-
-// DetailedVolume wraps a Volume with user-defined labels, options, and cluster scope (e.g., `local` or `global`)
-type DetailedVolume interface {
-	Labels() map[string]string
-	Options() map[string]string
-	Scope() string
-	Volume
-}
-
-// MountPoint is the intersection point between a volume and a container. It
-// specifies which volume is to be used and where inside a container it should
-// be mounted.
-type MountPoint struct {
-	// Source is the source path of the mount.
-	// E.g. `mount --bind /foo /bar`, `/foo` is the `Source`.
-	Source string
-	// Destination is the path relative to the container root (`/`) to the mount point
-	// It is where the `Source` is mounted to
-	Destination string
-	// RW is set to true when the mountpoint should be mounted as read-write
-	RW bool
-	// Name is the name reference to the underlying data defined by `Source`
-	// e.g., the volume name
-	Name string
-	// Driver is the volume driver used to create the volume (if it is a volume)
-	Driver string
-	// Type of mount to use, see `Type<foo>` definitions in github.com/docker/docker/api/types/mount
-	Type mounttypes.Type `json:",omitempty"`
-	// Volume is the volume providing data to this mountpoint.
-	// This is nil unless `Type` is set to `TypeVolume`
-	Volume Volume `json:"-"`
-
-	// Mode is the comma separated list of options supplied by the user when creating
-	// the bind/volume mount.
-	// Note Mode is not used on Windows
-	Mode string `json:"Relabel,omitempty"` // Originally field was `Relabel`"
-
-	// Propagation describes how the mounts are propagated from the host into the
-	// mount point, and vice-versa.
-	// See https://www.kernel.org/doc/Documentation/filesystems/sharedsubtree.txt
-	// Note Propagation is not used on Windows
-	Propagation mounttypes.Propagation `json:",omitempty"` // Mount propagation string
-
-	// Specifies if data should be copied from the container before the first mount
-	// Use a pointer here so we can tell if the user set this value explicitly
-	// This allows us to error out when the user explicitly enabled copy but we can't copy due to the volume being populated
-	CopyData bool `json:"-"`
-	// ID is the opaque ID used to pass to the volume driver.
-	// This should be set by calls to `Mount` and unset by calls to `Unmount`
-	ID string `json:",omitempty"`
-
-	// Sepc is a copy of the API request that created this mount.
-	Spec mounttypes.Mount
-}
-
-// Setup sets up a mount point by either mounting the volume if it is
-// configured, or creating the source directory if supplied.
-func (m *MountPoint) Setup(mountLabel string, rootUID, rootGID int) (string, error) {
-	if m.Volume != nil {
-		id := m.ID
-		if id == "" {
-			id = stringid.GenerateNonCryptoID()
-		}
-		path, err := m.Volume.Mount(id)
-		if err != nil {
-			return "", errors.Wrapf(err, "error while mounting volume '%s'", m.Source)
-		}
-		m.ID = id
-		return path, nil
-	}
-	if len(m.Source) == 0 {
-		return "", fmt.Errorf("Unable to setup mount point, neither source nor volume defined")
-	}
-	// system.MkdirAll() produces an error if m.Source exists and is a file (not a directory),
-	if m.Type == mounttypes.TypeBind {
-		// idtools.MkdirAllNewAs() produces an error if m.Source exists and is a file (not a directory)
-		// also, makes sure that if the directory is created, the correct remapped rootUID/rootGID will own it
-		if err := idtools.MkdirAllNewAs(m.Source, 0755, rootUID, rootGID); err != nil {
-			if perr, ok := err.(*os.PathError); ok {
-				if perr.Err != syscall.ENOTDIR {
-					return "", errors.Wrapf(err, "error while creating mount source path '%s'", m.Source)
-				}
-			}
-		}
-	}
-	if label.RelabelNeeded(m.Mode) {
-		if err := label.Relabel(m.Source, mountLabel, label.IsShared(m.Mode)); err != nil {
-			return "", errors.Wrapf(err, "error setting label on mount source '%s'", m.Source)
-		}
-	}
-	return m.Source, nil
-}
-
-// Path returns the path of a volume in a mount point.
-func (m *MountPoint) Path() string {
-	if m.Volume != nil {
-		return m.Volume.Path()
-	}
-	return m.Source
-}
-
-// ParseVolumesFrom ensures that the supplied volumes-from is valid.
-func ParseVolumesFrom(spec string) (string, string, error) {
-	if len(spec) == 0 {
-		return "", "", fmt.Errorf("volumes-from specification cannot be an empty string")
-	}
-
-	specParts := strings.SplitN(spec, ":", 2)
-	id := specParts[0]
-	mode := "rw"
-
-	if len(specParts) == 2 {
-		mode = specParts[1]
-		if !ValidMountMode(mode) {
-			return "", "", errInvalidMode(mode)
-		}
-		// For now don't allow propagation properties while importing
-		// volumes from data container. These volumes will inherit
-		// the same propagation property as of the original volume
-		// in data container. This probably can be relaxed in future.
-		if HasPropagation(mode) {
-			return "", "", errInvalidMode(mode)
-		}
-		// Do not allow copy modes on volumes-from
-		if _, isSet := getCopyMode(mode); isSet {
-			return "", "", errInvalidMode(mode)
-		}
-	}
-	return id, mode, nil
-}
-
-// ParseMountRaw parses a raw volume spec (e.g. `-v /foo:/bar:shared`) into a
-// structured spec. Once the raw spec is parsed it relies on `ParseMountSpec` to
-// validate the spec and create a MountPoint
-func ParseMountRaw(raw, volumeDriver string) (*MountPoint, error) {
-	arr, err := splitRawSpec(convertSlash(raw))
-	if err != nil {
-		return nil, err
-	}
-
-	var spec mounttypes.Mount
-	var mode string
-	switch len(arr) {
-	case 1:
-		// Just a destination path in the container
-		spec.Target = arr[0]
-	case 2:
-		if ValidMountMode(arr[1]) {
-			// Destination + Mode is not a valid volume - volumes
-			// cannot include a mode. eg /foo:rw
-			return nil, errInvalidSpec(raw)
-		}
-		// Host Source Path or Name + Destination
-		spec.Source = arr[0]
-		spec.Target = arr[1]
-	case 3:
-		// HostSourcePath+DestinationPath+Mode
-		spec.Source = arr[0]
-		spec.Target = arr[1]
-		mode = arr[2]
-	default:
-		return nil, errInvalidSpec(raw)
-	}
-
-	if !ValidMountMode(mode) {
-		return nil, errInvalidMode(mode)
-	}
-
-	if filepath.IsAbs(spec.Source) {
-		spec.Type = mounttypes.TypeBind
-	} else {
-		spec.Type = mounttypes.TypeVolume
-	}
-
-	spec.ReadOnly = !ReadWrite(mode)
-
-	// cannot assume that if a volume driver is passed in that we should set it
-	if volumeDriver != "" && spec.Type == mounttypes.TypeVolume {
-		spec.VolumeOptions = &mounttypes.VolumeOptions{
-			DriverConfig: &mounttypes.Driver{Name: volumeDriver},
-		}
-	}
-
-	if copyData, isSet := getCopyMode(mode); isSet {
-		if spec.VolumeOptions == nil {
-			spec.VolumeOptions = &mounttypes.VolumeOptions{}
-		}
-		spec.VolumeOptions.NoCopy = !copyData
-	}
-	if HasPropagation(mode) {
-		spec.BindOptions = &mounttypes.BindOptions{
-			Propagation: GetPropagation(mode),
-		}
-	}
-
-	mp, err := ParseMountSpec(spec, platformRawValidationOpts...)
-	if mp != nil {
-		mp.Mode = mode
-	}
-	if err != nil {
-		err = fmt.Errorf("%v: %v", errInvalidSpec(raw), err)
-	}
-	return mp, err
-}
-
-// ParseMountSpec reads a mount config, validates it, and configures a mountpoint from it.
-func ParseMountSpec(cfg mounttypes.Mount, options ...func(*validateOpts)) (*MountPoint, error) {
-	if err := validateMountConfig(&cfg, options...); err != nil {
-		return nil, err
-	}
-	mp := &MountPoint{
-		RW:          !cfg.ReadOnly,
-		Destination: clean(convertSlash(cfg.Target)),
-		Type:        cfg.Type,
-		Spec:        cfg,
-	}
-
-	switch cfg.Type {
-	case mounttypes.TypeVolume:
-		if cfg.Source == "" {
-			mp.Name = stringid.GenerateNonCryptoID()
-		} else {
-			mp.Name = cfg.Source
-		}
-		mp.CopyData = DefaultCopyMode
-
-		if cfg.VolumeOptions != nil {
-			if cfg.VolumeOptions.DriverConfig != nil {
-				mp.Driver = cfg.VolumeOptions.DriverConfig.Name
-			}
-			if cfg.VolumeOptions.NoCopy {
-				mp.CopyData = false
-			}
-		}
-	case mounttypes.TypeBind:
-		mp.Source = clean(convertSlash(cfg.Source))
-		if cfg.BindOptions != nil {
-			if len(cfg.BindOptions.Propagation) > 0 {
-				mp.Propagation = cfg.BindOptions.Propagation
-			}
-		}
-	case mounttypes.TypeTmpfs:
-		// NOP
-	}
-	return mp, nil
-}
-
-func errInvalidMode(mode string) error {
-	return fmt.Errorf("invalid mode: %v", mode)
-}
-
-func errInvalidSpec(spec string) error {
-	return fmt.Errorf("invalid volume specification: '%s'", spec)
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_copy.go b/installer/vendor/github.com/docker/docker/volume/volume_copy.go
deleted file mode 100644
index 77f06a0d1f..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_copy.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package volume
-
-import "strings"
-
-// {<copy mode>=isEnabled}
-var copyModes = map[string]bool{
-	"nocopy": false,
-}
-
-func copyModeExists(mode string) bool {
-	_, exists := copyModes[mode]
-	return exists
-}
-
-// GetCopyMode gets the copy mode from the mode string for mounts
-func getCopyMode(mode string) (bool, bool) {
-	for _, o := range strings.Split(mode, ",") {
-		if isEnabled, exists := copyModes[o]; exists {
-			return isEnabled, true
-		}
-	}
-	return DefaultCopyMode, false
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_copy_unix.go b/installer/vendor/github.com/docker/docker/volume/volume_copy_unix.go
deleted file mode 100644
index ad66e17637..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_copy_unix.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// +build !windows
-
-package volume
-
-const (
-	// DefaultCopyMode is the copy mode used by default for normal/named volumes
-	DefaultCopyMode = true
-)
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_copy_windows.go b/installer/vendor/github.com/docker/docker/volume/volume_copy_windows.go
deleted file mode 100644
index 798638c878..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_copy_windows.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package volume
-
-const (
-	// DefaultCopyMode is the copy mode used by default for normal/named volumes
-	DefaultCopyMode = false
-)
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_linux.go b/installer/vendor/github.com/docker/docker/volume/volume_linux.go
deleted file mode 100644
index d4b4d800b2..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_linux.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// +build linux
-
-package volume
-
-import (
-	"fmt"
-	"strings"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-)
-
-// ConvertTmpfsOptions converts *mounttypes.TmpfsOptions to the raw option string
-// for mount(2).
-func ConvertTmpfsOptions(opt *mounttypes.TmpfsOptions, readOnly bool) (string, error) {
-	var rawOpts []string
-	if readOnly {
-		rawOpts = append(rawOpts, "ro")
-	}
-
-	if opt != nil && opt.Mode != 0 {
-		rawOpts = append(rawOpts, fmt.Sprintf("mode=%o", opt.Mode))
-	}
-
-	if opt != nil && opt.SizeBytes != 0 {
-		// calculate suffix here, making this linux specific, but that is
-		// okay, since API is that way anyways.
-
-		// we do this by finding the suffix that divides evenly into the
-		// value, returing the value itself, with no suffix, if it fails.
-		//
-		// For the most part, we don't enforce any semantic to this values.
-		// The operating system will usually align this and enforce minimum
-		// and maximums.
-		var (
-			size   = opt.SizeBytes
-			suffix string
-		)
-		for _, r := range []struct {
-			suffix  string
-			divisor int64
-		}{
-			{"g", 1 << 30},
-			{"m", 1 << 20},
-			{"k", 1 << 10},
-		} {
-			if size%r.divisor == 0 {
-				size = size / r.divisor
-				suffix = r.suffix
-				break
-			}
-		}
-
-		rawOpts = append(rawOpts, fmt.Sprintf("size=%d%s", size, suffix))
-	}
-	return strings.Join(rawOpts, ","), nil
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_linux_test.go b/installer/vendor/github.com/docker/docker/volume/volume_linux_test.go
deleted file mode 100644
index 40ce5525a3..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_linux_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build linux
-
-package volume
-
-import (
-	"strings"
-	"testing"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-)
-
-func TestConvertTmpfsOptions(t *testing.T) {
-	type testCase struct {
-		opt                  mounttypes.TmpfsOptions
-		readOnly             bool
-		expectedSubstrings   []string
-		unexpectedSubstrings []string
-	}
-	cases := []testCase{
-		{
-			opt:                  mounttypes.TmpfsOptions{SizeBytes: 1024 * 1024, Mode: 0700},
-			readOnly:             false,
-			expectedSubstrings:   []string{"size=1m", "mode=700"},
-			unexpectedSubstrings: []string{"ro"},
-		},
-		{
-			opt:                  mounttypes.TmpfsOptions{},
-			readOnly:             true,
-			expectedSubstrings:   []string{"ro"},
-			unexpectedSubstrings: []string{},
-		},
-	}
-	for _, c := range cases {
-		data, err := ConvertTmpfsOptions(&c.opt, c.readOnly)
-		if err != nil {
-			t.Fatalf("could not convert %+v (readOnly: %v) to string: %v",
-				c.opt, c.readOnly, err)
-		}
-		t.Logf("data=%q", data)
-		for _, s := range c.expectedSubstrings {
-			if !strings.Contains(data, s) {
-				t.Fatalf("expected substring: %s, got %v (case=%+v)", s, data, c)
-			}
-		}
-		for _, s := range c.unexpectedSubstrings {
-			if strings.Contains(data, s) {
-				t.Fatalf("unexpected substring: %s, got %v (case=%+v)", s, data, c)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux.go b/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux.go
deleted file mode 100644
index 1de57ab52b..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// +build linux
-
-package volume
-
-import (
-	"strings"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-)
-
-// DefaultPropagationMode defines what propagation mode should be used by
-// default if user has not specified one explicitly.
-// propagation modes
-const DefaultPropagationMode = mounttypes.PropagationRPrivate
-
-var propagationModes = map[mounttypes.Propagation]bool{
-	mounttypes.PropagationPrivate:  true,
-	mounttypes.PropagationRPrivate: true,
-	mounttypes.PropagationSlave:    true,
-	mounttypes.PropagationRSlave:   true,
-	mounttypes.PropagationShared:   true,
-	mounttypes.PropagationRShared:  true,
-}
-
-// GetPropagation extracts and returns the mount propagation mode. If there
-// are no specifications, then by default it is "private".
-func GetPropagation(mode string) mounttypes.Propagation {
-	for _, o := range strings.Split(mode, ",") {
-		prop := mounttypes.Propagation(o)
-		if propagationModes[prop] {
-			return prop
-		}
-	}
-	return DefaultPropagationMode
-}
-
-// HasPropagation checks if there is a valid propagation mode present in
-// passed string. Returns true if a valid propagation mode specifier is
-// present, false otherwise.
-func HasPropagation(mode string) bool {
-	for _, o := range strings.Split(mode, ",") {
-		if propagationModes[mounttypes.Propagation(o)] {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux_test.go b/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux_test.go
deleted file mode 100644
index 46d0265062..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_propagation_linux_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// +build linux
-
-package volume
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestParseMountRawPropagation(t *testing.T) {
-	var (
-		valid   []string
-		invalid map[string]string
-	)
-
-	valid = []string{
-		"/hostPath:/containerPath:shared",
-		"/hostPath:/containerPath:rshared",
-		"/hostPath:/containerPath:slave",
-		"/hostPath:/containerPath:rslave",
-		"/hostPath:/containerPath:private",
-		"/hostPath:/containerPath:rprivate",
-		"/hostPath:/containerPath:ro,shared",
-		"/hostPath:/containerPath:ro,slave",
-		"/hostPath:/containerPath:ro,private",
-		"/hostPath:/containerPath:ro,z,shared",
-		"/hostPath:/containerPath:ro,Z,slave",
-		"/hostPath:/containerPath:Z,ro,slave",
-		"/hostPath:/containerPath:slave,Z,ro",
-		"/hostPath:/containerPath:Z,slave,ro",
-		"/hostPath:/containerPath:slave,ro,Z",
-		"/hostPath:/containerPath:rslave,ro,Z",
-		"/hostPath:/containerPath:ro,rshared,Z",
-		"/hostPath:/containerPath:ro,Z,rprivate",
-	}
-	invalid = map[string]string{
-		"/path:/path:ro,rshared,rslave":   `invalid mode`,
-		"/path:/path:ro,z,rshared,rslave": `invalid mode`,
-		"/path:shared":                    "invalid volume specification",
-		"/path:slave":                     "invalid volume specification",
-		"/path:private":                   "invalid volume specification",
-		"name:/absolute-path:shared":      "invalid volume specification",
-		"name:/absolute-path:rshared":     "invalid volume specification",
-		"name:/absolute-path:slave":       "invalid volume specification",
-		"name:/absolute-path:rslave":      "invalid volume specification",
-		"name:/absolute-path:private":     "invalid volume specification",
-		"name:/absolute-path:rprivate":    "invalid volume specification",
-	}
-
-	for _, path := range valid {
-		if _, err := ParseMountRaw(path, "local"); err != nil {
-			t.Fatalf("ParseMountRaw(`%q`) should succeed: error %q", path, err)
-		}
-	}
-
-	for path, expectedError := range invalid {
-		if _, err := ParseMountRaw(path, "local"); err == nil {
-			t.Fatalf("ParseMountRaw(`%q`) should have failed validation. Err %v", path, err)
-		} else {
-			if !strings.Contains(err.Error(), expectedError) {
-				t.Fatalf("ParseMountRaw(`%q`) error should contain %q, got %v", path, expectedError, err.Error())
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_propagation_unsupported.go b/installer/vendor/github.com/docker/docker/volume/volume_propagation_unsupported.go
deleted file mode 100644
index 7311ffc2e0..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_propagation_unsupported.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build !linux
-
-package volume
-
-import mounttypes "github.com/docker/docker/api/types/mount"
-
-// DefaultPropagationMode is used only in linux. In other cases it returns
-// empty string.
-const DefaultPropagationMode mounttypes.Propagation = ""
-
-// propagation modes not supported on this platform.
-var propagationModes = map[mounttypes.Propagation]bool{}
-
-// GetPropagation is not supported. Return empty string.
-func GetPropagation(mode string) mounttypes.Propagation {
-	return DefaultPropagationMode
-}
-
-// HasPropagation checks if there is a valid propagation mode present in
-// passed string. Returns true if a valid propagation mode specifier is
-// present, false otherwise.
-func HasPropagation(mode string) bool {
-	return false
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_test.go b/installer/vendor/github.com/docker/docker/volume/volume_test.go
deleted file mode 100644
index 54df38053f..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_test.go
+++ /dev/null
@@ -1,269 +0,0 @@
-package volume
-
-import (
-	"io/ioutil"
-	"os"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/docker/docker/api/types/mount"
-)
-
-func TestParseMountRaw(t *testing.T) {
-	var (
-		valid   []string
-		invalid map[string]string
-	)
-
-	if runtime.GOOS == "windows" {
-		valid = []string{
-			`d:\`,
-			`d:`,
-			`d:\path`,
-			`d:\path with space`,
-			// TODO Windows post TP5 - readonly support `d:\pathandmode:ro`,
-			`c:\:d:\`,
-			`c:\windows\:d:`,
-			`c:\windows:d:\s p a c e`,
-			`c:\windows:d:\s p a c e:RW`,
-			`c:\program files:d:\s p a c e i n h o s t d i r`,
-			`0123456789name:d:`,
-			`MiXeDcAsEnAmE:d:`,
-			`name:D:`,
-			`name:D::rW`,
-			`name:D::RW`,
-			// TODO Windows post TP5 - readonly support `name:D::RO`,
-			`c:/:d:/forward/slashes/are/good/too`,
-			// TODO Windows post TP5 - readonly support `c:/:d:/including with/spaces:ro`,
-			`c:\Windows`,             // With capital
-			`c:\Program Files (x86)`, // With capitals and brackets
-		}
-		invalid = map[string]string{
-			``:                                 "invalid volume specification: ",
-			`.`:                                "invalid volume specification: ",
-			`..\`:                              "invalid volume specification: ",
-			`c:\:..\`:                          "invalid volume specification: ",
-			`c:\:d:\:xyzzy`:                    "invalid volume specification: ",
-			`c:`:                               "cannot be `c:`",
-			`c:\`:                              "cannot be `c:`",
-			`c:\notexist:d:`:                   `source path does not exist`,
-			`c:\windows\system32\ntdll.dll:d:`: `source path must be a directory`,
-			`name<:d:`:                         `invalid volume specification`,
-			`name>:d:`:                         `invalid volume specification`,
-			`name::d:`:                         `invalid volume specification`,
-			`name":d:`:                         `invalid volume specification`,
-			`name\:d:`:                         `invalid volume specification`,
-			`name*:d:`:                         `invalid volume specification`,
-			`name|:d:`:                         `invalid volume specification`,
-			`name?:d:`:                         `invalid volume specification`,
-			`name/:d:`:                         `invalid volume specification`,
-			`d:\pathandmode:rw`:                `invalid volume specification`,
-			`con:d:`:                           `cannot be a reserved word for Windows filenames`,
-			`PRN:d:`:                           `cannot be a reserved word for Windows filenames`,
-			`aUx:d:`:                           `cannot be a reserved word for Windows filenames`,
-			`nul:d:`:                           `cannot be a reserved word for Windows filenames`,
-			`com1:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com2:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com3:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com4:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com5:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com6:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com7:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com8:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`com9:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt1:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt2:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt3:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt4:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt5:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt6:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt7:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt8:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`lpt9:d:`:                          `cannot be a reserved word for Windows filenames`,
-			`c:\windows\system32\ntdll.dll`:    `Only directories can be mapped on this platform`,
-		}
-
-	} else {
-		valid = []string{
-			"/home",
-			"/home:/home",
-			"/home:/something/else",
-			"/with space",
-			"/home:/with space",
-			"relative:/absolute-path",
-			"hostPath:/containerPath:ro",
-			"/hostPath:/containerPath:rw",
-			"/rw:/ro",
-		}
-		invalid = map[string]string{
-			"":                "invalid volume specification",
-			"./":              "mount path must be absolute",
-			"../":             "mount path must be absolute",
-			"/:../":           "mount path must be absolute",
-			"/:path":          "mount path must be absolute",
-			":":               "invalid volume specification",
-			"/tmp:":           "invalid volume specification",
-			":test":           "invalid volume specification",
-			":/test":          "invalid volume specification",
-			"tmp:":            "invalid volume specification",
-			":test:":          "invalid volume specification",
-			"::":              "invalid volume specification",
-			":::":             "invalid volume specification",
-			"/tmp:::":         "invalid volume specification",
-			":/tmp::":         "invalid volume specification",
-			"/path:rw":        "invalid volume specification",
-			"/path:ro":        "invalid volume specification",
-			"/rw:rw":          "invalid volume specification",
-			"path:ro":         "invalid volume specification",
-			"/path:/path:sw":  `invalid mode`,
-			"/path:/path:rwz": `invalid mode`,
-		}
-	}
-
-	for _, path := range valid {
-		if _, err := ParseMountRaw(path, "local"); err != nil {
-			t.Fatalf("ParseMountRaw(`%q`) should succeed: error %q", path, err)
-		}
-	}
-
-	for path, expectedError := range invalid {
-		if mp, err := ParseMountRaw(path, "local"); err == nil {
-			t.Fatalf("ParseMountRaw(`%q`) should have failed validation. Err '%v' - MP: %v", path, err, mp)
-		} else {
-			if !strings.Contains(err.Error(), expectedError) {
-				t.Fatalf("ParseMountRaw(`%q`) error should contain %q, got %v", path, expectedError, err.Error())
-			}
-		}
-	}
-}
-
-// testParseMountRaw is a structure used by TestParseMountRawSplit for
-// specifying test cases for the ParseMountRaw() function.
-type testParseMountRaw struct {
-	bind      string
-	driver    string
-	expDest   string
-	expSource string
-	expName   string
-	expDriver string
-	expRW     bool
-	fail      bool
-}
-
-func TestParseMountRawSplit(t *testing.T) {
-	var cases []testParseMountRaw
-	if runtime.GOOS == "windows" {
-		cases = []testParseMountRaw{
-			{`c:\:d:`, "local", `d:`, `c:\`, ``, "", true, false},
-			{`c:\:d:\`, "local", `d:\`, `c:\`, ``, "", true, false},
-			// TODO Windows post TP5 - Add readonly support {`c:\:d:\:ro`, "local", `d:\`, `c:\`, ``, "", false, false},
-			{`c:\:d:\:rw`, "local", `d:\`, `c:\`, ``, "", true, false},
-			{`c:\:d:\:foo`, "local", `d:\`, `c:\`, ``, "", false, true},
-			{`name:d::rw`, "local", `d:`, ``, `name`, "local", true, false},
-			{`name:d:`, "local", `d:`, ``, `name`, "local", true, false},
-			// TODO Windows post TP5 - Add readonly support {`name:d::ro`, "local", `d:`, ``, `name`, "local", false, false},
-			{`name:c:`, "", ``, ``, ``, "", true, true},
-			{`driver/name:c:`, "", ``, ``, ``, "", true, true},
-		}
-	} else {
-		cases = []testParseMountRaw{
-			{"/tmp:/tmp1", "", "/tmp1", "/tmp", "", "", true, false},
-			{"/tmp:/tmp2:ro", "", "/tmp2", "/tmp", "", "", false, false},
-			{"/tmp:/tmp3:rw", "", "/tmp3", "/tmp", "", "", true, false},
-			{"/tmp:/tmp4:foo", "", "", "", "", "", false, true},
-			{"name:/named1", "", "/named1", "", "name", "", true, false},
-			{"name:/named2", "external", "/named2", "", "name", "external", true, false},
-			{"name:/named3:ro", "local", "/named3", "", "name", "local", false, false},
-			{"local/name:/tmp:rw", "", "/tmp", "", "local/name", "", true, false},
-			{"/tmp:tmp", "", "", "", "", "", true, true},
-		}
-	}
-
-	for i, c := range cases {
-		t.Logf("case %d", i)
-		m, err := ParseMountRaw(c.bind, c.driver)
-		if c.fail {
-			if err == nil {
-				t.Fatalf("Expected error, was nil, for spec %s\n", c.bind)
-			}
-			continue
-		}
-
-		if m == nil || err != nil {
-			t.Fatalf("ParseMountRaw failed for spec '%s', driver '%s', error '%v'", c.bind, c.driver, err.Error())
-			continue
-		}
-
-		if m.Destination != c.expDest {
-			t.Fatalf("Expected destination '%s, was %s', for spec '%s'", c.expDest, m.Destination, c.bind)
-		}
-
-		if m.Source != c.expSource {
-			t.Fatalf("Expected source '%s', was '%s', for spec '%s'", c.expSource, m.Source, c.bind)
-		}
-
-		if m.Name != c.expName {
-			t.Fatalf("Expected name '%s', was '%s' for spec '%s'", c.expName, m.Name, c.bind)
-		}
-
-		if m.Driver != c.expDriver {
-			t.Fatalf("Expected driver '%s', was '%s', for spec '%s'", c.expDriver, m.Driver, c.bind)
-		}
-
-		if m.RW != c.expRW {
-			t.Fatalf("Expected RW '%v', was '%v' for spec '%s'", c.expRW, m.RW, c.bind)
-		}
-	}
-}
-
-func TestParseMountSpec(t *testing.T) {
-	type c struct {
-		input    mount.Mount
-		expected MountPoint
-	}
-	testDir, err := ioutil.TempDir("", "test-mount-config")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(testDir)
-
-	cases := []c{
-		{mount.Mount{Type: mount.TypeBind, Source: testDir, Target: testDestinationPath, ReadOnly: true}, MountPoint{Type: mount.TypeBind, Source: testDir, Destination: testDestinationPath}},
-		{mount.Mount{Type: mount.TypeBind, Source: testDir, Target: testDestinationPath}, MountPoint{Type: mount.TypeBind, Source: testDir, Destination: testDestinationPath, RW: true}},
-		{mount.Mount{Type: mount.TypeBind, Source: testDir + string(os.PathSeparator), Target: testDestinationPath, ReadOnly: true}, MountPoint{Type: mount.TypeBind, Source: testDir, Destination: testDestinationPath}},
-		{mount.Mount{Type: mount.TypeBind, Source: testDir, Target: testDestinationPath + string(os.PathSeparator), ReadOnly: true}, MountPoint{Type: mount.TypeBind, Source: testDir, Destination: testDestinationPath}},
-		{mount.Mount{Type: mount.TypeVolume, Target: testDestinationPath}, MountPoint{Type: mount.TypeVolume, Destination: testDestinationPath, RW: true, CopyData: DefaultCopyMode}},
-		{mount.Mount{Type: mount.TypeVolume, Target: testDestinationPath + string(os.PathSeparator)}, MountPoint{Type: mount.TypeVolume, Destination: testDestinationPath, RW: true, CopyData: DefaultCopyMode}},
-	}
-
-	for i, c := range cases {
-		t.Logf("case %d", i)
-		mp, err := ParseMountSpec(c.input)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if c.expected.Type != mp.Type {
-			t.Fatalf("Expected mount types to match. Expected: '%s', Actual: '%s'", c.expected.Type, mp.Type)
-		}
-		if c.expected.Destination != mp.Destination {
-			t.Fatalf("Expected mount destination to match. Expected: '%s', Actual: '%s'", c.expected.Destination, mp.Destination)
-		}
-		if c.expected.Source != mp.Source {
-			t.Fatalf("Expected mount source to match. Expected: '%s', Actual: '%s'", c.expected.Source, mp.Source)
-		}
-		if c.expected.RW != mp.RW {
-			t.Fatalf("Expected mount writable to match. Expected: '%v', Actual: '%v'", c.expected.RW, mp.RW)
-		}
-		if c.expected.Propagation != mp.Propagation {
-			t.Fatalf("Expected mount propagation to match. Expected: '%v', Actual: '%s'", c.expected.Propagation, mp.Propagation)
-		}
-		if c.expected.Driver != mp.Driver {
-			t.Fatalf("Expected mount driver to match. Expected: '%v', Actual: '%s'", c.expected.Driver, mp.Driver)
-		}
-		if c.expected.CopyData != mp.CopyData {
-			t.Fatalf("Expected mount copy data to match. Expected: '%v', Actual: '%v'", c.expected.CopyData, mp.CopyData)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_unix.go b/installer/vendor/github.com/docker/docker/volume/volume_unix.go
deleted file mode 100644
index 0256ebb2ba..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_unix.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// +build linux freebsd darwin solaris
-
-package volume
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-)
-
-var platformRawValidationOpts = []func(o *validateOpts){
-	// need to make sure to not error out if the bind source does not exist on unix
-	// this is supported for historical reasons, the path will be automatically
-	// created later.
-	func(o *validateOpts) { o.skipBindSourceCheck = true },
-}
-
-// read-write modes
-var rwModes = map[string]bool{
-	"rw": true,
-	"ro": true,
-}
-
-// label modes
-var labelModes = map[string]bool{
-	"Z": true,
-	"z": true,
-}
-
-// BackwardsCompatible decides whether this mount point can be
-// used in old versions of Docker or not.
-// Only bind mounts and local volumes can be used in old versions of Docker.
-func (m *MountPoint) BackwardsCompatible() bool {
-	return len(m.Source) > 0 || m.Driver == DefaultDriverName
-}
-
-// HasResource checks whether the given absolute path for a container is in
-// this mount point. If the relative path starts with `../` then the resource
-// is outside of this mount point, but we can't simply check for this prefix
-// because it misses `..` which is also outside of the mount, so check both.
-func (m *MountPoint) HasResource(absolutePath string) bool {
-	relPath, err := filepath.Rel(m.Destination, absolutePath)
-	return err == nil && relPath != ".." && !strings.HasPrefix(relPath, fmt.Sprintf("..%c", filepath.Separator))
-}
-
-// IsVolumeNameValid checks a volume name in a platform specific manner.
-func IsVolumeNameValid(name string) (bool, error) {
-	return true, nil
-}
-
-// ValidMountMode will make sure the mount mode is valid.
-// returns if it's a valid mount mode or not.
-func ValidMountMode(mode string) bool {
-	if mode == "" {
-		return true
-	}
-
-	rwModeCount := 0
-	labelModeCount := 0
-	propagationModeCount := 0
-	copyModeCount := 0
-
-	for _, o := range strings.Split(mode, ",") {
-		switch {
-		case rwModes[o]:
-			rwModeCount++
-		case labelModes[o]:
-			labelModeCount++
-		case propagationModes[mounttypes.Propagation(o)]:
-			propagationModeCount++
-		case copyModeExists(o):
-			copyModeCount++
-		default:
-			return false
-		}
-	}
-
-	// Only one string for each mode is allowed.
-	if rwModeCount > 1 || labelModeCount > 1 || propagationModeCount > 1 || copyModeCount > 1 {
-		return false
-	}
-	return true
-}
-
-// ReadWrite tells you if a mode string is a valid read-write mode or not.
-// If there are no specifications w.r.t read write mode, then by default
-// it returns true.
-func ReadWrite(mode string) bool {
-	if !ValidMountMode(mode) {
-		return false
-	}
-
-	for _, o := range strings.Split(mode, ",") {
-		if o == "ro" {
-			return false
-		}
-	}
-	return true
-}
-
-func validateNotRoot(p string) error {
-	p = filepath.Clean(convertSlash(p))
-	if p == "/" {
-		return fmt.Errorf("invalid specification: destination can't be '/'")
-	}
-	return nil
-}
-
-func validateCopyMode(mode bool) error {
-	return nil
-}
-
-func convertSlash(p string) string {
-	return filepath.ToSlash(p)
-}
-
-func splitRawSpec(raw string) ([]string, error) {
-	if strings.Count(raw, ":") > 2 {
-		return nil, errInvalidSpec(raw)
-	}
-
-	arr := strings.SplitN(raw, ":", 3)
-	if arr[0] == "" {
-		return nil, errInvalidSpec(raw)
-	}
-	return arr, nil
-}
-
-func clean(p string) string {
-	return filepath.Clean(p)
-}
-
-func validateStat(fi os.FileInfo) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_unsupported.go b/installer/vendor/github.com/docker/docker/volume/volume_unsupported.go
deleted file mode 100644
index ff9d6afa27..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_unsupported.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// +build !linux
-
-package volume
-
-import (
-	"fmt"
-	"runtime"
-
-	mounttypes "github.com/docker/docker/api/types/mount"
-)
-
-// ConvertTmpfsOptions converts *mounttypes.TmpfsOptions to the raw option string
-// for mount(2).
-func ConvertTmpfsOptions(opt *mounttypes.TmpfsOptions, readOnly bool) (string, error) {
-	return "", fmt.Errorf("%s does not support tmpfs", runtime.GOOS)
-}
diff --git a/installer/vendor/github.com/docker/docker/volume/volume_windows.go b/installer/vendor/github.com/docker/docker/volume/volume_windows.go
deleted file mode 100644
index 22f6fc7a14..0000000000
--- a/installer/vendor/github.com/docker/docker/volume/volume_windows.go
+++ /dev/null
@@ -1,201 +0,0 @@
-package volume
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strings"
-)
-
-// read-write modes
-var rwModes = map[string]bool{
-	"rw": true,
-}
-
-// read-only modes
-var roModes = map[string]bool{
-	"ro": true,
-}
-
-var platformRawValidationOpts = []func(*validateOpts){
-	// filepath.IsAbs is weird on Windows:
-	//	`c:` is not considered an absolute path
-	//	`c:\` is considered an absolute path
-	// In any case, the regex matching below ensures absolute paths
-	// TODO: consider this a bug with filepath.IsAbs (?)
-	func(o *validateOpts) { o.skipAbsolutePathCheck = true },
-}
-
-const (
-	// Spec should be in the format [source:]destination[:mode]
-	//
-	// Examples: c:\foo bar:d:rw
-	//           c:\foo:d:\bar
-	//           myname:d:
-	//           d:\
-	//
-	// Explanation of this regex! Thanks @thaJeztah on IRC and gist for help. See
-	// https://gist.github.com/thaJeztah/6185659e4978789fb2b2. A good place to
-	// test is https://regex-golang.appspot.com/assets/html/index.html
-	//
-	// Useful link for referencing named capturing groups:
-	// http://stackoverflow.com/questions/20750843/using-named-matches-from-go-regex
-	//
-	// There are three match groups: source, destination and mode.
-	//
-
-	// RXHostDir is the first option of a source
-	RXHostDir = `[a-z]:\\(?:[^\\/:*?"<>|\r\n]+\\?)*`
-	// RXName is the second option of a source
-	RXName = `[^\\/:*?"<>|\r\n]+`
-	// RXReservedNames are reserved names not possible on Windows
-	RXReservedNames = `(con)|(prn)|(nul)|(aux)|(com[1-9])|(lpt[1-9])`
-
-	// RXSource is the combined possibilities for a source
-	RXSource = `((?P<source>((` + RXHostDir + `)|(` + RXName + `))):)?`
-
-	// Source. Can be either a host directory, a name, or omitted:
-	//  HostDir:
-	//    -  Essentially using the folder solution from
-	//       https://www.safaribooksonline.com/library/view/regular-expressions-cookbook/9781449327453/ch08s18.html
-	//       but adding case insensitivity.
-	//    -  Must be an absolute path such as c:\path
-	//    -  Can include spaces such as `c:\program files`
-	//    -  And then followed by a colon which is not in the capture group
-	//    -  And can be optional
-	//  Name:
-	//    -  Must not contain invalid NTFS filename characters (https://msdn.microsoft.com/en-us/library/windows/desktop/aa365247(v=vs.85).aspx)
-	//    -  And then followed by a colon which is not in the capture group
-	//    -  And can be optional
-
-	// RXDestination is the regex expression for the mount destination
-	RXDestination = `(?P<destination>([a-z]):((?:\\[^\\/:*?"<>\r\n]+)*\\?))`
-	// Destination (aka container path):
-	//    -  Variation on hostdir but can be a drive followed by colon as well
-	//    -  If a path, must be absolute. Can include spaces
-	//    -  Drive cannot be c: (explicitly checked in code, not RegEx)
-
-	// RXMode is the regex expression for the mode of the mount
-	// Mode (optional):
-	//    -  Hopefully self explanatory in comparison to above regex's.
-	//    -  Colon is not in the capture group
-	RXMode = `(:(?P<mode>(?i)ro|rw))?`
-)
-
-// BackwardsCompatible decides whether this mount point can be
-// used in old versions of Docker or not.
-// Windows volumes are never backwards compatible.
-func (m *MountPoint) BackwardsCompatible() bool {
-	return false
-}
-
-func splitRawSpec(raw string) ([]string, error) {
-	specExp := regexp.MustCompile(`^` + RXSource + RXDestination + RXMode + `$`)
-	match := specExp.FindStringSubmatch(strings.ToLower(raw))
-
-	// Must have something back
-	if len(match) == 0 {
-		return nil, errInvalidSpec(raw)
-	}
-
-	var split []string
-	matchgroups := make(map[string]string)
-	// Pull out the sub expressions from the named capture groups
-	for i, name := range specExp.SubexpNames() {
-		matchgroups[name] = strings.ToLower(match[i])
-	}
-	if source, exists := matchgroups["source"]; exists {
-		if source != "" {
-			split = append(split, source)
-		}
-	}
-	if destination, exists := matchgroups["destination"]; exists {
-		if destination != "" {
-			split = append(split, destination)
-		}
-	}
-	if mode, exists := matchgroups["mode"]; exists {
-		if mode != "" {
-			split = append(split, mode)
-		}
-	}
-	// Fix #26329. If the destination appears to be a file, and the source is null,
-	// it may be because we've fallen through the possible naming regex and hit a
-	// situation where the user intention was to map a file into a container through
-	// a local volume, but this is not supported by the platform.
-	if matchgroups["source"] == "" && matchgroups["destination"] != "" {
-		validName, err := IsVolumeNameValid(matchgroups["destination"])
-		if err != nil {
-			return nil, err
-		}
-		if !validName {
-			if fi, err := os.Stat(matchgroups["destination"]); err == nil {
-				if !fi.IsDir() {
-					return nil, fmt.Errorf("file '%s' cannot be mapped. Only directories can be mapped on this platform", matchgroups["destination"])
-				}
-			}
-		}
-	}
-	return split, nil
-}
-
-// IsVolumeNameValid checks a volume name in a platform specific manner.
-func IsVolumeNameValid(name string) (bool, error) {
-	nameExp := regexp.MustCompile(`^` + RXName + `$`)
-	if !nameExp.MatchString(name) {
-		return false, nil
-	}
-	nameExp = regexp.MustCompile(`^` + RXReservedNames + `$`)
-	if nameExp.MatchString(name) {
-		return false, fmt.Errorf("volume name %q cannot be a reserved word for Windows filenames", name)
-	}
-	return true, nil
-}
-
-// ValidMountMode will make sure the mount mode is valid.
-// returns if it's a valid mount mode or not.
-func ValidMountMode(mode string) bool {
-	if mode == "" {
-		return true
-	}
-	return roModes[strings.ToLower(mode)] || rwModes[strings.ToLower(mode)]
-}
-
-// ReadWrite tells you if a mode string is a valid read-write mode or not.
-func ReadWrite(mode string) bool {
-	return rwModes[strings.ToLower(mode)] || mode == ""
-}
-
-func validateNotRoot(p string) error {
-	p = strings.ToLower(convertSlash(p))
-	if p == "c:" || p == `c:\` {
-		return fmt.Errorf("destination path cannot be `c:` or `c:\\`: %v", p)
-	}
-	return nil
-}
-
-func validateCopyMode(mode bool) error {
-	if mode {
-		return fmt.Errorf("Windows does not support copying image path content")
-	}
-	return nil
-}
-
-func convertSlash(p string) string {
-	return filepath.FromSlash(p)
-}
-
-func clean(p string) string {
-	if match, _ := regexp.MatchString("^[a-z]:$", p); match {
-		return p
-	}
-	return filepath.Clean(p)
-}
-
-func validateStat(fi os.FileInfo) error {
-	if !fi.IsDir() {
-		return fmt.Errorf("source path must be a directory")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/docker/go-units/CONTRIBUTING.md b/installer/vendor/github.com/docker/go-units/CONTRIBUTING.md
deleted file mode 100644
index 9ea86d784e..0000000000
--- a/installer/vendor/github.com/docker/go-units/CONTRIBUTING.md
+++ /dev/null
@@ -1,67 +0,0 @@
-# Contributing to go-units
-
-Want to hack on go-units? Awesome! Here are instructions to get you started.
-
-go-units is a part of the [Docker](https://www.docker.com) project, and follows
-the same rules and principles. If you're already familiar with the way
-Docker does things, you'll feel right at home.
-
-Otherwise, go read Docker's
-[contributions guidelines](https://github.com/docker/docker/blob/master/CONTRIBUTING.md),
-[issue triaging](https://github.com/docker/docker/blob/master/project/ISSUE-TRIAGE.md),
-[review process](https://github.com/docker/docker/blob/master/project/REVIEWING.md) and
-[branches and tags](https://github.com/docker/docker/blob/master/project/BRANCHES-AND-TAGS.md).
-
-### Sign your work
-
-The sign-off is a simple line at the end of the explanation for the patch. Your
-signature certifies that you wrote the patch or otherwise have the right to pass
-it on as an open-source patch. The rules are pretty simple: if you can certify
-the below (from [developercertificate.org](http://developercertificate.org/)):
-
-```
-Developer Certificate of Origin
-Version 1.1
-
-Copyright (C) 2004, 2006 The Linux Foundation and its contributors.
-660 York Street, Suite 102,
-San Francisco, CA 94110 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-Developer's Certificate of Origin 1.1
-
-By making a contribution to this project, I certify that:
-
-(a) The contribution was created in whole or in part by me and I
-    have the right to submit it under the open source license
-    indicated in the file; or
-
-(b) The contribution is based upon previous work that, to the best
-    of my knowledge, is covered under an appropriate open source
-    license and I have the right under that license to submit that
-    work with modifications, whether created in whole or in part
-    by me, under the same open source license (unless I am
-    permitted to submit under a different license), as indicated
-    in the file; or
-
-(c) The contribution was provided directly to me by some other
-    person who certified (a), (b) or (c) and I have not modified
-    it.
-
-(d) I understand and agree that this project and the contribution
-    are public and that a record of the contribution (including all
-    personal information I submit with it, including my sign-off) is
-    maintained indefinitely and may be redistributed consistent with
-    this project or the open source license(s) involved.
-```
-
-Then you just add a line to every git commit message:
-
-    Signed-off-by: Joe Smith <joe.smith@email.com>
-
-Use your real name (sorry, no pseudonyms or anonymous contributions.)
-
-If you set your `user.name` and `user.email` git configs, you can sign your
-commit automatically with `git commit -s`.
diff --git a/installer/vendor/github.com/docker/go-units/MAINTAINERS b/installer/vendor/github.com/docker/go-units/MAINTAINERS
deleted file mode 100644
index 477be8b214..0000000000
--- a/installer/vendor/github.com/docker/go-units/MAINTAINERS
+++ /dev/null
@@ -1,27 +0,0 @@
-# go-connections maintainers file
-#
-# This file describes who runs the docker/go-connections project and how.
-# This is a living document - if you see something out of date or missing, speak up!
-#
-# It is structured to be consumable by both humans and programs.
-# To extract its contents programmatically, use any TOML-compliant parser.
-#
-# This file is compiled into the MAINTAINERS file in docker/opensource.
-#
-[Org]
-	[Org."Core maintainers"]
-		people = [
-			"calavera",
-		]
-
-[people]
-
-# A reference list of all people associated with the project.
-# All other sections should refer to people by their canonical key
-# in the people section.
-
-	# ADD YOURSELF HERE IN ALPHABETICAL ORDER
-	[people.calavera]
-	Name = "David Calavera"
-	Email = "david.calavera@gmail.com"
-	GitHub = "calavera"
diff --git a/installer/vendor/github.com/docker/go-units/README.md b/installer/vendor/github.com/docker/go-units/README.md
deleted file mode 100644
index 4f70a4e134..0000000000
--- a/installer/vendor/github.com/docker/go-units/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-[![GoDoc](https://godoc.org/github.com/docker/go-units?status.svg)](https://godoc.org/github.com/docker/go-units)
-
-# Introduction
-
-go-units is a library to transform human friendly measurements into machine friendly values.
-
-## Usage
-
-See the [docs in godoc](https://godoc.org/github.com/docker/go-units) for examples and documentation.
-
-## Copyright and license
-
-Copyright © 2015 Docker, Inc.
-
-go-units is licensed under the Apache License, Version 2.0.
-See [LICENSE](LICENSE) for the full text of the license.
diff --git a/installer/vendor/github.com/docker/go-units/circle.yml b/installer/vendor/github.com/docker/go-units/circle.yml
deleted file mode 100644
index 9043b35478..0000000000
--- a/installer/vendor/github.com/docker/go-units/circle.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-dependencies:
-  post:
-    # install golint
-    - go get github.com/golang/lint/golint
-
-test:
-  pre:
-    # run analysis before tests
-    - go vet ./...
-    - test -z "$(golint ./... | tee /dev/stderr)"
-    - test -z "$(gofmt -s -l . | tee /dev/stderr)"
diff --git a/installer/vendor/github.com/docker/go-units/duration_test.go b/installer/vendor/github.com/docker/go-units/duration_test.go
deleted file mode 100644
index e436c383f7..0000000000
--- a/installer/vendor/github.com/docker/go-units/duration_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"testing"
-	"time"
-)
-
-func ExampleHumanDuration() {
-	fmt.Println(HumanDuration(450 * time.Millisecond))
-	fmt.Println(HumanDuration(47 * time.Second))
-	fmt.Println(HumanDuration(1 * time.Minute))
-	fmt.Println(HumanDuration(3 * time.Minute))
-	fmt.Println(HumanDuration(35 * time.Minute))
-	fmt.Println(HumanDuration(35*time.Minute + 40*time.Second))
-	fmt.Println(HumanDuration(1 * time.Hour))
-	fmt.Println(HumanDuration(1*time.Hour + 45*time.Minute))
-	fmt.Println(HumanDuration(3 * time.Hour))
-	fmt.Println(HumanDuration(3*time.Hour + 59*time.Minute))
-	fmt.Println(HumanDuration(3*time.Hour + 60*time.Minute))
-	fmt.Println(HumanDuration(24 * time.Hour))
-	fmt.Println(HumanDuration(24*time.Hour + 12*time.Hour))
-	fmt.Println(HumanDuration(2 * 24 * time.Hour))
-	fmt.Println(HumanDuration(7 * 24 * time.Hour))
-	fmt.Println(HumanDuration(13*24*time.Hour + 5*time.Hour))
-	fmt.Println(HumanDuration(2 * 7 * 24 * time.Hour))
-	fmt.Println(HumanDuration(2*7*24*time.Hour + 4*24*time.Hour))
-	fmt.Println(HumanDuration(3 * 7 * 24 * time.Hour))
-	fmt.Println(HumanDuration(4 * 7 * 24 * time.Hour))
-	fmt.Println(HumanDuration(4*7*24*time.Hour + 3*24*time.Hour))
-	fmt.Println(HumanDuration(1 * 30 * 24 * time.Hour))
-	fmt.Println(HumanDuration(1*30*24*time.Hour + 2*7*24*time.Hour))
-	fmt.Println(HumanDuration(2 * 30 * 24 * time.Hour))
-	fmt.Println(HumanDuration(3*30*24*time.Hour + 1*7*24*time.Hour))
-	fmt.Println(HumanDuration(5*30*24*time.Hour + 2*7*24*time.Hour))
-	fmt.Println(HumanDuration(13 * 30 * 24 * time.Hour))
-	fmt.Println(HumanDuration(23 * 30 * 24 * time.Hour))
-	fmt.Println(HumanDuration(24 * 30 * 24 * time.Hour))
-	fmt.Println(HumanDuration(24*30*24*time.Hour + 2*7*24*time.Hour))
-	fmt.Println(HumanDuration(3*365*24*time.Hour + 2*30*24*time.Hour))
-}
-
-func TestHumanDuration(t *testing.T) {
-	// Useful duration abstractions
-	day := 24 * time.Hour
-	week := 7 * day
-	month := 30 * day
-	year := 365 * day
-
-	assertEquals(t, "Less than a second", HumanDuration(450*time.Millisecond))
-	assertEquals(t, "1 second", HumanDuration(1*time.Second))
-	assertEquals(t, "45 seconds", HumanDuration(45*time.Second))
-	assertEquals(t, "46 seconds", HumanDuration(46*time.Second))
-	assertEquals(t, "59 seconds", HumanDuration(59*time.Second))
-	assertEquals(t, "About a minute", HumanDuration(60*time.Second))
-	assertEquals(t, "About a minute", HumanDuration(1*time.Minute))
-	assertEquals(t, "3 minutes", HumanDuration(3*time.Minute))
-	assertEquals(t, "35 minutes", HumanDuration(35*time.Minute))
-	assertEquals(t, "35 minutes", HumanDuration(35*time.Minute+40*time.Second))
-	assertEquals(t, "45 minutes", HumanDuration(45*time.Minute))
-	assertEquals(t, "45 minutes", HumanDuration(45*time.Minute+40*time.Second))
-	assertEquals(t, "About an hour", HumanDuration(46*time.Minute))
-	assertEquals(t, "About an hour", HumanDuration(59*time.Minute))
-	assertEquals(t, "About an hour", HumanDuration(1*time.Hour))
-	assertEquals(t, "About an hour", HumanDuration(1*time.Hour+29*time.Minute))
-	assertEquals(t, "2 hours", HumanDuration(1*time.Hour+31*time.Minute))
-	assertEquals(t, "2 hours", HumanDuration(1*time.Hour+59*time.Minute))
-	assertEquals(t, "3 hours", HumanDuration(3*time.Hour))
-	assertEquals(t, "3 hours", HumanDuration(3*time.Hour+29*time.Minute))
-	assertEquals(t, "4 hours", HumanDuration(3*time.Hour+31*time.Minute))
-	assertEquals(t, "4 hours", HumanDuration(3*time.Hour+59*time.Minute))
-	assertEquals(t, "4 hours", HumanDuration(3*time.Hour+60*time.Minute))
-	assertEquals(t, "24 hours", HumanDuration(24*time.Hour))
-	assertEquals(t, "36 hours", HumanDuration(1*day+12*time.Hour))
-	assertEquals(t, "2 days", HumanDuration(2*day))
-	assertEquals(t, "7 days", HumanDuration(7*day))
-	assertEquals(t, "13 days", HumanDuration(13*day+5*time.Hour))
-	assertEquals(t, "2 weeks", HumanDuration(2*week))
-	assertEquals(t, "2 weeks", HumanDuration(2*week+4*day))
-	assertEquals(t, "3 weeks", HumanDuration(3*week))
-	assertEquals(t, "4 weeks", HumanDuration(4*week))
-	assertEquals(t, "4 weeks", HumanDuration(4*week+3*day))
-	assertEquals(t, "4 weeks", HumanDuration(1*month))
-	assertEquals(t, "6 weeks", HumanDuration(1*month+2*week))
-	assertEquals(t, "2 months", HumanDuration(2*month))
-	assertEquals(t, "2 months", HumanDuration(2*month+2*week))
-	assertEquals(t, "3 months", HumanDuration(3*month))
-	assertEquals(t, "3 months", HumanDuration(3*month+1*week))
-	assertEquals(t, "5 months", HumanDuration(5*month+2*week))
-	assertEquals(t, "13 months", HumanDuration(13*month))
-	assertEquals(t, "23 months", HumanDuration(23*month))
-	assertEquals(t, "24 months", HumanDuration(24*month))
-	assertEquals(t, "2 years", HumanDuration(24*month+2*week))
-	assertEquals(t, "3 years", HumanDuration(3*year+2*month))
-}
diff --git a/installer/vendor/github.com/docker/go-units/size.go b/installer/vendor/github.com/docker/go-units/size.go
index 44616c2718..85f6ab0715 100644
--- a/installer/vendor/github.com/docker/go-units/size.go
+++ b/installer/vendor/github.com/docker/go-units/size.go
@@ -31,7 +31,7 @@ type unitMap map[string]int64
 var (
 	decimalMap = unitMap{"k": KB, "m": MB, "g": GB, "t": TB, "p": PB}
 	binaryMap  = unitMap{"k": KiB, "m": MiB, "g": GiB, "t": TiB, "p": PiB}
-	sizeRegex  = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[bB]?$`)
+	sizeRegex  = regexp.MustCompile(`^(\d+(\.\d+)*) ?([kKmMgGtTpP])?[iI]?[bB]?$`)
 )
 
 var decimapAbbrs = []string{"B", "kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"}
diff --git a/installer/vendor/github.com/docker/go-units/size_test.go b/installer/vendor/github.com/docker/go-units/size_test.go
deleted file mode 100644
index 8923e50761..0000000000
--- a/installer/vendor/github.com/docker/go-units/size_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-func ExampleBytesSize() {
-	fmt.Println(BytesSize(1024))
-	fmt.Println(BytesSize(1024 * 1024))
-	fmt.Println(BytesSize(1048576))
-	fmt.Println(BytesSize(2 * MiB))
-	fmt.Println(BytesSize(3.42 * GiB))
-	fmt.Println(BytesSize(5.372 * TiB))
-	fmt.Println(BytesSize(2.22 * PiB))
-}
-
-func ExampleHumanSize() {
-	fmt.Println(HumanSize(1000))
-	fmt.Println(HumanSize(1024))
-	fmt.Println(HumanSize(1000000))
-	fmt.Println(HumanSize(1048576))
-	fmt.Println(HumanSize(2 * MB))
-	fmt.Println(HumanSize(float64(3.42 * GB)))
-	fmt.Println(HumanSize(float64(5.372 * TB)))
-	fmt.Println(HumanSize(float64(2.22 * PB)))
-}
-
-func ExampleFromHumanSize() {
-	fmt.Println(FromHumanSize("32"))
-	fmt.Println(FromHumanSize("32b"))
-	fmt.Println(FromHumanSize("32B"))
-	fmt.Println(FromHumanSize("32k"))
-	fmt.Println(FromHumanSize("32K"))
-	fmt.Println(FromHumanSize("32kb"))
-	fmt.Println(FromHumanSize("32Kb"))
-	fmt.Println(FromHumanSize("32Mb"))
-	fmt.Println(FromHumanSize("32Gb"))
-	fmt.Println(FromHumanSize("32Tb"))
-	fmt.Println(FromHumanSize("32Pb"))
-}
-
-func ExampleRAMInBytes() {
-	fmt.Println(RAMInBytes("32"))
-	fmt.Println(RAMInBytes("32b"))
-	fmt.Println(RAMInBytes("32B"))
-	fmt.Println(RAMInBytes("32k"))
-	fmt.Println(RAMInBytes("32K"))
-	fmt.Println(RAMInBytes("32kb"))
-	fmt.Println(RAMInBytes("32Kb"))
-	fmt.Println(RAMInBytes("32Mb"))
-	fmt.Println(RAMInBytes("32Gb"))
-	fmt.Println(RAMInBytes("32Tb"))
-	fmt.Println(RAMInBytes("32Pb"))
-	fmt.Println(RAMInBytes("32PB"))
-	fmt.Println(RAMInBytes("32P"))
-}
-
-func TestBytesSize(t *testing.T) {
-	assertEquals(t, "1KiB", BytesSize(1024))
-	assertEquals(t, "1MiB", BytesSize(1024*1024))
-	assertEquals(t, "1MiB", BytesSize(1048576))
-	assertEquals(t, "2MiB", BytesSize(2*MiB))
-	assertEquals(t, "3.42GiB", BytesSize(3.42*GiB))
-	assertEquals(t, "5.372TiB", BytesSize(5.372*TiB))
-	assertEquals(t, "2.22PiB", BytesSize(2.22*PiB))
-	assertEquals(t, "1.049e+06YiB", BytesSize(KiB*KiB*KiB*KiB*KiB*PiB))
-}
-
-func TestHumanSize(t *testing.T) {
-	assertEquals(t, "1kB", HumanSize(1000))
-	assertEquals(t, "1.024kB", HumanSize(1024))
-	assertEquals(t, "1MB", HumanSize(1000000))
-	assertEquals(t, "1.049MB", HumanSize(1048576))
-	assertEquals(t, "2MB", HumanSize(2*MB))
-	assertEquals(t, "3.42GB", HumanSize(float64(3.42*GB)))
-	assertEquals(t, "5.372TB", HumanSize(float64(5.372*TB)))
-	assertEquals(t, "2.22PB", HumanSize(float64(2.22*PB)))
-	assertEquals(t, "1e+04YB", HumanSize(float64(10000000000000*PB)))
-}
-
-func TestFromHumanSize(t *testing.T) {
-	assertSuccessEquals(t, 32, FromHumanSize, "32")
-	assertSuccessEquals(t, 32, FromHumanSize, "32b")
-	assertSuccessEquals(t, 32, FromHumanSize, "32B")
-	assertSuccessEquals(t, 32*KB, FromHumanSize, "32k")
-	assertSuccessEquals(t, 32*KB, FromHumanSize, "32K")
-	assertSuccessEquals(t, 32*KB, FromHumanSize, "32kb")
-	assertSuccessEquals(t, 32*KB, FromHumanSize, "32Kb")
-	assertSuccessEquals(t, 32*MB, FromHumanSize, "32Mb")
-	assertSuccessEquals(t, 32*GB, FromHumanSize, "32Gb")
-	assertSuccessEquals(t, 32*TB, FromHumanSize, "32Tb")
-	assertSuccessEquals(t, 32*PB, FromHumanSize, "32Pb")
-
-	assertSuccessEquals(t, 32.5*KB, FromHumanSize, "32.5kB")
-	assertSuccessEquals(t, 32.5*KB, FromHumanSize, "32.5 kB")
-	assertSuccessEquals(t, 32, FromHumanSize, "32.5 B")
-
-	assertError(t, FromHumanSize, "")
-	assertError(t, FromHumanSize, "hello")
-	assertError(t, FromHumanSize, "-32")
-	assertError(t, FromHumanSize, ".3kB")
-	assertError(t, FromHumanSize, " 32 ")
-	assertError(t, FromHumanSize, "32m b")
-	assertError(t, FromHumanSize, "32bm")
-}
-
-func TestRAMInBytes(t *testing.T) {
-	assertSuccessEquals(t, 32, RAMInBytes, "32")
-	assertSuccessEquals(t, 32, RAMInBytes, "32b")
-	assertSuccessEquals(t, 32, RAMInBytes, "32B")
-	assertSuccessEquals(t, 32*KiB, RAMInBytes, "32k")
-	assertSuccessEquals(t, 32*KiB, RAMInBytes, "32K")
-	assertSuccessEquals(t, 32*KiB, RAMInBytes, "32kb")
-	assertSuccessEquals(t, 32*KiB, RAMInBytes, "32Kb")
-	assertSuccessEquals(t, 32*MiB, RAMInBytes, "32Mb")
-	assertSuccessEquals(t, 32*GiB, RAMInBytes, "32Gb")
-	assertSuccessEquals(t, 32*TiB, RAMInBytes, "32Tb")
-	assertSuccessEquals(t, 32*PiB, RAMInBytes, "32Pb")
-	assertSuccessEquals(t, 32*PiB, RAMInBytes, "32PB")
-	assertSuccessEquals(t, 32*PiB, RAMInBytes, "32P")
-
-	assertSuccessEquals(t, 32, RAMInBytes, "32.3")
-	tmp := 32.3 * MiB
-	assertSuccessEquals(t, int64(tmp), RAMInBytes, "32.3 mb")
-
-	assertError(t, RAMInBytes, "")
-	assertError(t, RAMInBytes, "hello")
-	assertError(t, RAMInBytes, "-32")
-	assertError(t, RAMInBytes, " 32 ")
-	assertError(t, RAMInBytes, "32m b")
-	assertError(t, RAMInBytes, "32bm")
-}
-
-func assertEquals(t *testing.T, expected, actual interface{}) {
-	if expected != actual {
-		t.Errorf("Expected '%v' but got '%v'", expected, actual)
-	}
-}
-
-// func that maps to the parse function signatures as testing abstraction
-type parseFn func(string) (int64, error)
-
-// Define 'String()' for pretty-print
-func (fn parseFn) String() string {
-	fnName := runtime.FuncForPC(reflect.ValueOf(fn).Pointer()).Name()
-	return fnName[strings.LastIndex(fnName, ".")+1:]
-}
-
-func assertSuccessEquals(t *testing.T, expected int64, fn parseFn, arg string) {
-	res, err := fn(arg)
-	if err != nil || res != expected {
-		t.Errorf("%s(\"%s\") -> expected '%d' but got '%d' with error '%v'", fn, arg, expected, res, err)
-	}
-}
-
-func assertError(t *testing.T, fn parseFn, arg string) {
-	res, err := fn(arg)
-	if err == nil && res != -1 {
-		t.Errorf("%s(\"%s\") -> expected error but got '%d'", fn, arg, res)
-	}
-}
diff --git a/installer/vendor/github.com/docker/go-units/ulimit_test.go b/installer/vendor/github.com/docker/go-units/ulimit_test.go
deleted file mode 100644
index 902e02369a..0000000000
--- a/installer/vendor/github.com/docker/go-units/ulimit_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-package units
-
-import (
-	"fmt"
-	"strconv"
-	"testing"
-)
-
-func ExampleParseUlimit() {
-	fmt.Println(ParseUlimit("nofile=512:1024"))
-	fmt.Println(ParseUlimit("nofile=1024"))
-	fmt.Println(ParseUlimit("cpu=2:4"))
-	fmt.Println(ParseUlimit("cpu=6"))
-}
-
-func TestParseUlimitValid(t *testing.T) {
-	u1 := &Ulimit{"nofile", 1024, 512}
-	if u2, _ := ParseUlimit("nofile=512:1024"); *u1 != *u2 {
-		t.Fatalf("expected %q, but got %q", u1, u2)
-	}
-}
-
-func TestParseUlimitInvalidLimitType(t *testing.T) {
-	if _, err := ParseUlimit("notarealtype=1024:1024"); err == nil {
-		t.Fatalf("expected error on invalid ulimit type")
-	}
-}
-
-func TestParseUlimitBadFormat(t *testing.T) {
-	if _, err := ParseUlimit("nofile:1024:1024"); err == nil {
-		t.Fatal("expected error on bad syntax")
-	}
-
-	if _, err := ParseUlimit("nofile"); err == nil {
-		t.Fatal("expected error on bad syntax")
-	}
-
-	if _, err := ParseUlimit("nofile="); err == nil {
-		t.Fatal("expected error on bad syntax")
-	}
-	if _, err := ParseUlimit("nofile=:"); err == nil {
-		t.Fatal("expected error on bad syntax")
-	}
-	if _, err := ParseUlimit("nofile=:1024"); err == nil {
-		t.Fatal("expected error on bad syntax")
-	}
-}
-
-func TestParseUlimitHardLessThanSoft(t *testing.T) {
-	if _, err := ParseUlimit("nofile=1024:1"); err == nil {
-		t.Fatal("expected error on hard limit less than soft limit")
-	}
-}
-
-func TestParseUlimitInvalidValueType(t *testing.T) {
-	if _, err := ParseUlimit("nofile=asdf"); err == nil {
-		t.Fatal("expected error on bad value type, but got no error")
-	} else if _, ok := err.(*strconv.NumError); !ok {
-		t.Fatalf("expected error on bad value type, but got `%s`", err)
-	}
-
-	if _, err := ParseUlimit("nofile=1024:asdf"); err == nil {
-		t.Fatal("expected error on bad value type, but got no error")
-	} else if _, ok := err.(*strconv.NumError); !ok {
-		t.Fatalf("expected error on bad value type, but got `%s`", err)
-	}
-}
-
-func TestParseUlimitTooManyValueArgs(t *testing.T) {
-	if _, err := ParseUlimit("nofile=1024:1:50"); err == nil {
-		t.Fatalf("expected error on more than two value arguments")
-	}
-}
-
-func TestUlimitStringOutput(t *testing.T) {
-	u := &Ulimit{"nofile", 1024, 512}
-	if s := u.String(); s != "nofile=512:1024" {
-		t.Fatal("expected String to return nofile=512:1024, but got", s)
-	}
-}
-
-func TestGetRlimit(t *testing.T) {
-	tt := []struct {
-		ulimit Ulimit
-		rlimit Rlimit
-	}{
-		{Ulimit{"core", 10, 12}, Rlimit{rlimitCore, 10, 12}},
-		{Ulimit{"cpu", 1, 10}, Rlimit{rlimitCPU, 1, 10}},
-		{Ulimit{"data", 5, 0}, Rlimit{rlimitData, 5, 0}},
-		{Ulimit{"fsize", 2, 2}, Rlimit{rlimitFsize, 2, 2}},
-		{Ulimit{"locks", 0, 0}, Rlimit{rlimitLocks, 0, 0}},
-		{Ulimit{"memlock", 10, 10}, Rlimit{rlimitMemlock, 10, 10}},
-		{Ulimit{"msgqueue", 9, 1}, Rlimit{rlimitMsgqueue, 9, 1}},
-		{Ulimit{"nice", 9, 9}, Rlimit{rlimitNice, 9, 9}},
-		{Ulimit{"nofile", 4, 100}, Rlimit{rlimitNofile, 4, 100}},
-		{Ulimit{"nproc", 5, 5}, Rlimit{rlimitNproc, 5, 5}},
-		{Ulimit{"rss", 0, 5}, Rlimit{rlimitRss, 0, 5}},
-		{Ulimit{"rtprio", 100, 65}, Rlimit{rlimitRtprio, 100, 65}},
-		{Ulimit{"rttime", 55, 102}, Rlimit{rlimitRttime, 55, 102}},
-		{Ulimit{"sigpending", 14, 20}, Rlimit{rlimitSigpending, 14, 20}},
-		{Ulimit{"stack", 1, 1}, Rlimit{rlimitStack, 1, 1}},
-	}
-
-	for _, te := range tt {
-		res, err := te.ulimit.GetRlimit()
-		if err != nil {
-			t.Errorf("expected not to fail: %s", err)
-		}
-		if res.Type != te.rlimit.Type {
-			t.Errorf("expected Type to be %d but got %d",
-				te.rlimit.Type, res.Type)
-		}
-		if res.Soft != te.rlimit.Soft {
-			t.Errorf("expected Soft to be %d but got %d",
-				te.rlimit.Soft, res.Soft)
-		}
-		if res.Hard != te.rlimit.Hard {
-			t.Errorf("expected Hard to be %d but got %d",
-				te.rlimit.Hard, res.Hard)
-		}
-
-	}
-}
-
-func TestGetRlimitBadUlimitName(t *testing.T) {
-	name := "bla"
-	uLimit := Ulimit{name, 0, 0}
-	if _, err := uLimit.GetRlimit(); err == nil {
-		t.Error("expected error on bad Ulimit name")
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/.gitignore b/installer/vendor/github.com/dustin/go-humanize/.gitignore
deleted file mode 100644
index 05b40514a7..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-#*
-*.[568]
-*.a
-*~
-[568].out
-_*
diff --git a/installer/vendor/github.com/dustin/go-humanize/.travis.yml b/installer/vendor/github.com/dustin/go-humanize/.travis.yml
deleted file mode 100644
index ffa87400a8..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-sudo: false
-language: go
-go:
-  - 1.3.3
-  - 1.5.4
-  - 1.6.2
-  - tip
-matrix:
-  allow_failures:
-    - go: tip
-  fast_finish: true
-install:
-  - # Do nothing. This is needed to prevent default install action "go get -t -v ./..." from happening here (we want it to happen inside script step).
-script:
-  - go get -t -v ./...
-  - diff -u <(echo -n) <(gofmt -d -s .)
-  - go tool vet .
-  - go test -v -race ./...
diff --git a/installer/vendor/github.com/dustin/go-humanize/README.markdown b/installer/vendor/github.com/dustin/go-humanize/README.markdown
deleted file mode 100644
index f69d3c870d..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/README.markdown
+++ /dev/null
@@ -1,92 +0,0 @@
-# Humane Units [![Build Status](https://travis-ci.org/dustin/go-humanize.svg?branch=master)](https://travis-ci.org/dustin/go-humanize) [![GoDoc](https://godoc.org/github.com/dustin/go-humanize?status.svg)](https://godoc.org/github.com/dustin/go-humanize)
-
-Just a few functions for helping humanize times and sizes.
-
-`go get` it as `github.com/dustin/go-humanize`, import it as
-`"github.com/dustin/go-humanize"`, use it as `humanize`.
-
-See [godoc](https://godoc.org/github.com/dustin/go-humanize) for
-complete documentation.
-
-## Sizes
-
-This lets you take numbers like `82854982` and convert them to useful
-strings like, `83 MB` or `79 MiB` (whichever you prefer).
-
-Example:
-
-```go
-fmt.Printf("That file is %s.", humanize.Bytes(82854982)) // That file is 83 MB.
-```
-
-## Times
-
-This lets you take a `time.Time` and spit it out in relative terms.
-For example, `12 seconds ago` or `3 days from now`.
-
-Example:
-
-```go
-fmt.Printf("This was touched %s.", humanize.Time(someTimeInstance)) // This was touched 7 hours ago.
-```
-
-Thanks to Kyle Lemons for the time implementation from an IRC
-conversation one day. It's pretty neat.
-
-## Ordinals
-
-From a [mailing list discussion][odisc] where a user wanted to be able
-to label ordinals.
-
-    0 -> 0th
-    1 -> 1st
-    2 -> 2nd
-    3 -> 3rd
-    4 -> 4th
-    [...]
-
-Example:
-
-```go
-fmt.Printf("You're my %s best friend.", humanize.Ordinal(193)) // You are my 193rd best friend.
-```
-
-## Commas
-
-Want to shove commas into numbers? Be my guest.
-
-    0 -> 0
-    100 -> 100
-    1000 -> 1,000
-    1000000000 -> 1,000,000,000
-    -100000 -> -100,000
-
-Example:
-
-```go
-fmt.Printf("You owe $%s.\n", humanize.Comma(6582491)) // You owe $6,582,491.
-```
-
-## Ftoa
-
-Nicer float64 formatter that removes trailing zeros.
-
-```go
-fmt.Printf("%f", 2.24)                // 2.240000
-fmt.Printf("%s", humanize.Ftoa(2.24)) // 2.24
-fmt.Printf("%f", 2.0)                 // 2.000000
-fmt.Printf("%s", humanize.Ftoa(2.0))  // 2
-```
-
-## SI notation
-
-Format numbers with [SI notation][sinotation].
-
-Example:
-
-```go
-humanize.SI(0.00000000223, "M") // 2.23 nM
-```
-
-[odisc]: https://groups.google.com/d/topic/golang-nuts/l8NhI74jl-4/discussion
-[sinotation]: http://en.wikipedia.org/wiki/Metric_prefix
diff --git a/installer/vendor/github.com/dustin/go-humanize/bigbytes_test.go b/installer/vendor/github.com/dustin/go-humanize/bigbytes_test.go
deleted file mode 100644
index 236ad0806d..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/bigbytes_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-package humanize
-
-import (
-	"math/big"
-	"testing"
-)
-
-func TestBigByteParsing(t *testing.T) {
-	tests := []struct {
-		in  string
-		exp uint64
-	}{
-		{"42", 42},
-		{"42MB", 42000000},
-		{"42MiB", 44040192},
-		{"42mb", 42000000},
-		{"42mib", 44040192},
-		{"42MIB", 44040192},
-		{"42 MB", 42000000},
-		{"42 MiB", 44040192},
-		{"42 mb", 42000000},
-		{"42 mib", 44040192},
-		{"42 MIB", 44040192},
-		{"42.5MB", 42500000},
-		{"42.5MiB", 44564480},
-		{"42.5 MB", 42500000},
-		{"42.5 MiB", 44564480},
-		// No need to say B
-		{"42M", 42000000},
-		{"42Mi", 44040192},
-		{"42m", 42000000},
-		{"42mi", 44040192},
-		{"42MI", 44040192},
-		{"42 M", 42000000},
-		{"42 Mi", 44040192},
-		{"42 m", 42000000},
-		{"42 mi", 44040192},
-		{"42 MI", 44040192},
-		{"42.5M", 42500000},
-		{"42.5Mi", 44564480},
-		{"42.5 M", 42500000},
-		{"42.5 Mi", 44564480},
-		{"1,005.03 MB", 1005030000},
-		// Large testing, breaks when too much larger than
-		// this.
-		{"12.5 EB", uint64(12.5 * float64(EByte))},
-		{"12.5 E", uint64(12.5 * float64(EByte))},
-		{"12.5 EiB", uint64(12.5 * float64(EiByte))},
-	}
-
-	for _, p := range tests {
-		got, err := ParseBigBytes(p.in)
-		if err != nil {
-			t.Errorf("Couldn't parse %v: %v", p.in, err)
-		} else {
-			if got.Uint64() != p.exp {
-				t.Errorf("Expected %v for %v, got %v",
-					p.exp, p.in, got)
-			}
-		}
-	}
-}
-
-func TestBigByteErrors(t *testing.T) {
-	got, err := ParseBigBytes("84 JB")
-	if err == nil {
-		t.Errorf("Expected error, got %v", got)
-	}
-	got, err = ParseBigBytes("")
-	if err == nil {
-		t.Errorf("Expected error parsing nothing")
-	}
-}
-
-func bbyte(in uint64) string {
-	return BigBytes((&big.Int{}).SetUint64(in))
-}
-
-func bibyte(in uint64) string {
-	return BigIBytes((&big.Int{}).SetUint64(in))
-}
-
-func TestBigBytes(t *testing.T) {
-	testList{
-		{"bytes(0)", bbyte(0), "0 B"},
-		{"bytes(1)", bbyte(1), "1 B"},
-		{"bytes(803)", bbyte(803), "803 B"},
-		{"bytes(999)", bbyte(999), "999 B"},
-
-		{"bytes(1024)", bbyte(1024), "1.0 kB"},
-		{"bytes(1MB - 1)", bbyte(MByte - Byte), "1000 kB"},
-
-		{"bytes(1MB)", bbyte(1024 * 1024), "1.0 MB"},
-		{"bytes(1GB - 1K)", bbyte(GByte - KByte), "1000 MB"},
-
-		{"bytes(1GB)", bbyte(GByte), "1.0 GB"},
-		{"bytes(1TB - 1M)", bbyte(TByte - MByte), "1000 GB"},
-
-		{"bytes(1TB)", bbyte(TByte), "1.0 TB"},
-		{"bytes(1PB - 1T)", bbyte(PByte - TByte), "999 TB"},
-
-		{"bytes(1PB)", bbyte(PByte), "1.0 PB"},
-		{"bytes(1PB - 1T)", bbyte(EByte - PByte), "999 PB"},
-
-		{"bytes(1EB)", bbyte(EByte), "1.0 EB"},
-		// Overflows.
-		// {"bytes(1EB - 1P)", Bytes((KByte*EByte)-PByte), "1023EB"},
-
-		{"bytes(0)", bibyte(0), "0 B"},
-		{"bytes(1)", bibyte(1), "1 B"},
-		{"bytes(803)", bibyte(803), "803 B"},
-		{"bytes(1023)", bibyte(1023), "1023 B"},
-
-		{"bytes(1024)", bibyte(1024), "1.0 KiB"},
-		{"bytes(1MB - 1)", bibyte(MiByte - IByte), "1024 KiB"},
-
-		{"bytes(1MB)", bibyte(1024 * 1024), "1.0 MiB"},
-		{"bytes(1GB - 1K)", bibyte(GiByte - KiByte), "1024 MiB"},
-
-		{"bytes(1GB)", bibyte(GiByte), "1.0 GiB"},
-		{"bytes(1TB - 1M)", bibyte(TiByte - MiByte), "1024 GiB"},
-
-		{"bytes(1TB)", bibyte(TiByte), "1.0 TiB"},
-		{"bytes(1PB - 1T)", bibyte(PiByte - TiByte), "1023 TiB"},
-
-		{"bytes(1PB)", bibyte(PiByte), "1.0 PiB"},
-		{"bytes(1PB - 1T)", bibyte(EiByte - PiByte), "1023 PiB"},
-
-		{"bytes(1EiB)", bibyte(EiByte), "1.0 EiB"},
-		// Overflows.
-		// {"bytes(1EB - 1P)", bibyte((KIByte*EIByte)-PiByte), "1023EB"},
-
-		{"bytes(5.5GiB)", bibyte(5.5 * GiByte), "5.5 GiB"},
-
-		{"bytes(5.5GB)", bbyte(5.5 * GByte), "5.5 GB"},
-	}.validate(t)
-}
-
-func TestVeryBigBytes(t *testing.T) {
-	b, _ := (&big.Int{}).SetString("15347691069326346944512", 10)
-	s := BigBytes(b)
-	if s != "15 ZB" {
-		t.Errorf("Expected 15 ZB, got %v", s)
-	}
-	s = BigIBytes(b)
-	if s != "13 ZiB" {
-		t.Errorf("Expected 13 ZiB, got %v", s)
-	}
-
-	b, _ = (&big.Int{}).SetString("15716035654990179271180288", 10)
-	s = BigBytes(b)
-	if s != "16 YB" {
-		t.Errorf("Expected 16 YB, got %v", s)
-	}
-	s = BigIBytes(b)
-	if s != "13 YiB" {
-		t.Errorf("Expected 13 YiB, got %v", s)
-	}
-}
-
-func TestVeryVeryBigBytes(t *testing.T) {
-	b, _ := (&big.Int{}).SetString("16093220510709943573688614912", 10)
-	s := BigBytes(b)
-	if s != "16093 YB" {
-		t.Errorf("Expected 16093 YB, got %v", s)
-	}
-	s = BigIBytes(b)
-	if s != "13312 YiB" {
-		t.Errorf("Expected 13312 YiB, got %v", s)
-	}
-}
-
-func TestParseVeryBig(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-	}{
-		{"16 ZB", "16000000000000000000000"},
-		{"16 ZiB", "18889465931478580854784"},
-		{"16.5 ZB", "16500000000000000000000"},
-		{"16.5 ZiB", "19479761741837286506496"},
-		{"16 Z", "16000000000000000000000"},
-		{"16 Zi", "18889465931478580854784"},
-		{"16.5 Z", "16500000000000000000000"},
-		{"16.5 Zi", "19479761741837286506496"},
-
-		{"16 YB", "16000000000000000000000000"},
-		{"16 YiB", "19342813113834066795298816"},
-		{"16.5 YB", "16500000000000000000000000"},
-		{"16.5 YiB", "19947276023641381382651904"},
-		{"16 Y", "16000000000000000000000000"},
-		{"16 Yi", "19342813113834066795298816"},
-		{"16.5 Y", "16500000000000000000000000"},
-		{"16.5 Yi", "19947276023641381382651904"},
-	}
-
-	for _, test := range tests {
-		x, err := ParseBigBytes(test.in)
-		if err != nil {
-			t.Errorf("Error parsing %q: %v", test.in, err)
-			continue
-		}
-
-		if x.String() != test.out {
-			t.Errorf("Expected %q for %q, got %v", test.out, test.in, x)
-		}
-	}
-}
-
-func BenchmarkParseBigBytes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseBigBytes("16.5 Z")
-	}
-}
-
-func BenchmarkBigBytes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		bibyte(16.5 * GByte)
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/bytes_test.go b/installer/vendor/github.com/dustin/go-humanize/bytes_test.go
deleted file mode 100644
index 0bb811c701..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/bytes_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-package humanize
-
-import (
-	"testing"
-)
-
-func TestByteParsing(t *testing.T) {
-	tests := []struct {
-		in  string
-		exp uint64
-	}{
-		{"42", 42},
-		{"42MB", 42000000},
-		{"42MiB", 44040192},
-		{"42mb", 42000000},
-		{"42mib", 44040192},
-		{"42MIB", 44040192},
-		{"42 MB", 42000000},
-		{"42 MiB", 44040192},
-		{"42 mb", 42000000},
-		{"42 mib", 44040192},
-		{"42 MIB", 44040192},
-		{"42.5MB", 42500000},
-		{"42.5MiB", 44564480},
-		{"42.5 MB", 42500000},
-		{"42.5 MiB", 44564480},
-		// No need to say B
-		{"42M", 42000000},
-		{"42Mi", 44040192},
-		{"42m", 42000000},
-		{"42mi", 44040192},
-		{"42MI", 44040192},
-		{"42 M", 42000000},
-		{"42 Mi", 44040192},
-		{"42 m", 42000000},
-		{"42 mi", 44040192},
-		{"42 MI", 44040192},
-		{"42.5M", 42500000},
-		{"42.5Mi", 44564480},
-		{"42.5 M", 42500000},
-		{"42.5 Mi", 44564480},
-		// Bug #42
-		{"1,005.03 MB", 1005030000},
-		// Large testing, breaks when too much larger than
-		// this.
-		{"12.5 EB", uint64(12.5 * float64(EByte))},
-		{"12.5 E", uint64(12.5 * float64(EByte))},
-		{"12.5 EiB", uint64(12.5 * float64(EiByte))},
-	}
-
-	for _, p := range tests {
-		got, err := ParseBytes(p.in)
-		if err != nil {
-			t.Errorf("Couldn't parse %v: %v", p.in, err)
-		}
-		if got != p.exp {
-			t.Errorf("Expected %v for %v, got %v",
-				p.exp, p.in, got)
-		}
-	}
-}
-
-func TestByteErrors(t *testing.T) {
-	got, err := ParseBytes("84 JB")
-	if err == nil {
-		t.Errorf("Expected error, got %v", got)
-	}
-	got, err = ParseBytes("")
-	if err == nil {
-		t.Errorf("Expected error parsing nothing")
-	}
-	got, err = ParseBytes("16 EiB")
-	if err == nil {
-		t.Errorf("Expected error, got %v", got)
-	}
-}
-
-func TestBytes(t *testing.T) {
-	testList{
-		{"bytes(0)", Bytes(0), "0 B"},
-		{"bytes(1)", Bytes(1), "1 B"},
-		{"bytes(803)", Bytes(803), "803 B"},
-		{"bytes(999)", Bytes(999), "999 B"},
-
-		{"bytes(1024)", Bytes(1024), "1.0 kB"},
-		{"bytes(9999)", Bytes(9999), "10 kB"},
-		{"bytes(1MB - 1)", Bytes(MByte - Byte), "1000 kB"},
-
-		{"bytes(1MB)", Bytes(1024 * 1024), "1.0 MB"},
-		{"bytes(1GB - 1K)", Bytes(GByte - KByte), "1000 MB"},
-
-		{"bytes(1GB)", Bytes(GByte), "1.0 GB"},
-		{"bytes(1TB - 1M)", Bytes(TByte - MByte), "1000 GB"},
-		{"bytes(10MB)", Bytes(9999 * 1000), "10 MB"},
-
-		{"bytes(1TB)", Bytes(TByte), "1.0 TB"},
-		{"bytes(1PB - 1T)", Bytes(PByte - TByte), "999 TB"},
-
-		{"bytes(1PB)", Bytes(PByte), "1.0 PB"},
-		{"bytes(1PB - 1T)", Bytes(EByte - PByte), "999 PB"},
-
-		{"bytes(1EB)", Bytes(EByte), "1.0 EB"},
-		// Overflows.
-		// {"bytes(1EB - 1P)", Bytes((KByte*EByte)-PByte), "1023EB"},
-
-		{"bytes(0)", IBytes(0), "0 B"},
-		{"bytes(1)", IBytes(1), "1 B"},
-		{"bytes(803)", IBytes(803), "803 B"},
-		{"bytes(1023)", IBytes(1023), "1023 B"},
-
-		{"bytes(1024)", IBytes(1024), "1.0 KiB"},
-		{"bytes(1MB - 1)", IBytes(MiByte - IByte), "1024 KiB"},
-
-		{"bytes(1MB)", IBytes(1024 * 1024), "1.0 MiB"},
-		{"bytes(1GB - 1K)", IBytes(GiByte - KiByte), "1024 MiB"},
-
-		{"bytes(1GB)", IBytes(GiByte), "1.0 GiB"},
-		{"bytes(1TB - 1M)", IBytes(TiByte - MiByte), "1024 GiB"},
-
-		{"bytes(1TB)", IBytes(TiByte), "1.0 TiB"},
-		{"bytes(1PB - 1T)", IBytes(PiByte - TiByte), "1023 TiB"},
-
-		{"bytes(1PB)", IBytes(PiByte), "1.0 PiB"},
-		{"bytes(1PB - 1T)", IBytes(EiByte - PiByte), "1023 PiB"},
-
-		{"bytes(1EiB)", IBytes(EiByte), "1.0 EiB"},
-		// Overflows.
-		// {"bytes(1EB - 1P)", IBytes((KIByte*EIByte)-PiByte), "1023EB"},
-
-		{"bytes(5.5GiB)", IBytes(5.5 * GiByte), "5.5 GiB"},
-
-		{"bytes(5.5GB)", Bytes(5.5 * GByte), "5.5 GB"},
-	}.validate(t)
-}
-
-func BenchmarkParseBytes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseBytes("16.5 GB")
-	}
-}
-
-func BenchmarkBytes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Bytes(16.5 * GByte)
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/comma.go b/installer/vendor/github.com/dustin/go-humanize/comma.go
index eb285cb951..520ae3e57d 100644
--- a/installer/vendor/github.com/dustin/go-humanize/comma.go
+++ b/installer/vendor/github.com/dustin/go-humanize/comma.go
@@ -15,7 +15,7 @@ import (
 func Comma(v int64) string {
 	sign := ""
 
-	// minin64 can't be negated to a usable value, so it has to be special cased.
+	// Min int64 can't be negated to a usable value, so it has to be special cased.
 	if v == math.MinInt64 {
 		return "-9,223,372,036,854,775,808"
 	}
@@ -76,6 +76,14 @@ func Commaf(v float64) string {
 	return buf.String()
 }
 
+// CommafWithDigits works like the Commaf but limits the resulting
+// string to the given number of decimal places.
+//
+// e.g. CommafWithDigits(834142.32, 1) -> 834,142.3
+func CommafWithDigits(f float64, decimals int) string {
+	return stripTrailingDigits(Commaf(f), decimals)
+}
+
 // BigComma produces a string form of the given big.Int in base 10
 // with commas after every three orders of magnitude.
 func BigComma(b *big.Int) string {
diff --git a/installer/vendor/github.com/dustin/go-humanize/comma_test.go b/installer/vendor/github.com/dustin/go-humanize/comma_test.go
deleted file mode 100644
index 89daca5fb0..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/comma_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-package humanize
-
-import (
-	"math"
-	"math/big"
-	"testing"
-)
-
-func TestCommas(t *testing.T) {
-	testList{
-		{"0", Comma(0), "0"},
-		{"10", Comma(10), "10"},
-		{"100", Comma(100), "100"},
-		{"1,000", Comma(1000), "1,000"},
-		{"10,000", Comma(10000), "10,000"},
-		{"100,000", Comma(100000), "100,000"},
-		{"10,000,000", Comma(10000000), "10,000,000"},
-		{"10,100,000", Comma(10100000), "10,100,000"},
-		{"10,010,000", Comma(10010000), "10,010,000"},
-		{"10,001,000", Comma(10001000), "10,001,000"},
-		{"123,456,789", Comma(123456789), "123,456,789"},
-		{"maxint", Comma(9.223372e+18), "9,223,372,000,000,000,000"},
-		{"math.maxint", Comma(math.MaxInt64), "9,223,372,036,854,775,807"},
-		{"math.minint", Comma(math.MinInt64), "-9,223,372,036,854,775,808"},
-		{"minint", Comma(-9.223372e+18), "-9,223,372,000,000,000,000"},
-		{"-123,456,789", Comma(-123456789), "-123,456,789"},
-		{"-10,100,000", Comma(-10100000), "-10,100,000"},
-		{"-10,010,000", Comma(-10010000), "-10,010,000"},
-		{"-10,001,000", Comma(-10001000), "-10,001,000"},
-		{"-10,000,000", Comma(-10000000), "-10,000,000"},
-		{"-100,000", Comma(-100000), "-100,000"},
-		{"-10,000", Comma(-10000), "-10,000"},
-		{"-1,000", Comma(-1000), "-1,000"},
-		{"-100", Comma(-100), "-100"},
-		{"-10", Comma(-10), "-10"},
-	}.validate(t)
-}
-
-func TestCommafs(t *testing.T) {
-	testList{
-		{"0", Commaf(0), "0"},
-		{"10.11", Commaf(10.11), "10.11"},
-		{"100", Commaf(100), "100"},
-		{"1,000", Commaf(1000), "1,000"},
-		{"10,000", Commaf(10000), "10,000"},
-		{"100,000", Commaf(100000), "100,000"},
-		{"834,142.32", Commaf(834142.32), "834,142.32"},
-		{"10,000,000", Commaf(10000000), "10,000,000"},
-		{"10,100,000", Commaf(10100000), "10,100,000"},
-		{"10,010,000", Commaf(10010000), "10,010,000"},
-		{"10,001,000", Commaf(10001000), "10,001,000"},
-		{"123,456,789", Commaf(123456789), "123,456,789"},
-		{"maxf64", Commaf(math.MaxFloat64), "179,769,313,486,231,570,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000"},
-		{"minf64", Commaf(math.SmallestNonzeroFloat64), "0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000005"},
-		{"-123,456,789", Commaf(-123456789), "-123,456,789"},
-		{"-10,100,000", Commaf(-10100000), "-10,100,000"},
-		{"-10,010,000", Commaf(-10010000), "-10,010,000"},
-		{"-10,001,000", Commaf(-10001000), "-10,001,000"},
-		{"-10,000,000", Commaf(-10000000), "-10,000,000"},
-		{"-100,000", Commaf(-100000), "-100,000"},
-		{"-10,000", Commaf(-10000), "-10,000"},
-		{"-1,000", Commaf(-1000), "-1,000"},
-		{"-100.11", Commaf(-100.11), "-100.11"},
-		{"-10", Commaf(-10), "-10"},
-	}.validate(t)
-}
-
-func BenchmarkCommas(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Comma(1234567890)
-	}
-}
-
-func BenchmarkCommaf(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Commaf(1234567890.83584)
-	}
-}
-
-func BenchmarkBigCommas(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		BigComma(big.NewInt(1234567890))
-	}
-}
-
-func bigComma(i int64) string {
-	return BigComma(big.NewInt(i))
-}
-
-func TestBigCommas(t *testing.T) {
-	testList{
-		{"0", bigComma(0), "0"},
-		{"10", bigComma(10), "10"},
-		{"100", bigComma(100), "100"},
-		{"1,000", bigComma(1000), "1,000"},
-		{"10,000", bigComma(10000), "10,000"},
-		{"100,000", bigComma(100000), "100,000"},
-		{"10,000,000", bigComma(10000000), "10,000,000"},
-		{"10,100,000", bigComma(10100000), "10,100,000"},
-		{"10,010,000", bigComma(10010000), "10,010,000"},
-		{"10,001,000", bigComma(10001000), "10,001,000"},
-		{"123,456,789", bigComma(123456789), "123,456,789"},
-		{"maxint", bigComma(9.223372e+18), "9,223,372,000,000,000,000"},
-		{"minint", bigComma(-9.223372e+18), "-9,223,372,000,000,000,000"},
-		{"-123,456,789", bigComma(-123456789), "-123,456,789"},
-		{"-10,100,000", bigComma(-10100000), "-10,100,000"},
-		{"-10,010,000", bigComma(-10010000), "-10,010,000"},
-		{"-10,001,000", bigComma(-10001000), "-10,001,000"},
-		{"-10,000,000", bigComma(-10000000), "-10,000,000"},
-		{"-100,000", bigComma(-100000), "-100,000"},
-		{"-10,000", bigComma(-10000), "-10,000"},
-		{"-1,000", bigComma(-1000), "-1,000"},
-		{"-100", bigComma(-100), "-100"},
-		{"-10", bigComma(-10), "-10"},
-	}.validate(t)
-}
-
-func TestVeryBigCommas(t *testing.T) {
-	tests := []struct{ in, exp string }{
-		{
-			"84889279597249724975972597249849757294578485",
-			"84,889,279,597,249,724,975,972,597,249,849,757,294,578,485",
-		},
-		{
-			"-84889279597249724975972597249849757294578485",
-			"-84,889,279,597,249,724,975,972,597,249,849,757,294,578,485",
-		},
-	}
-	for _, test := range tests {
-		n, _ := (&big.Int{}).SetString(test.in, 10)
-		got := BigComma(n)
-		if test.exp != got {
-			t.Errorf("Expected %q, got %q", test.exp, got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/commaf_test.go b/installer/vendor/github.com/dustin/go-humanize/commaf_test.go
deleted file mode 100644
index 21f7f9e5f7..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/commaf_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// +build go1.6
-
-package humanize
-
-import (
-	"math"
-	"math/big"
-	"testing"
-)
-
-func BenchmarkBigCommaf(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Commaf(1234567890.83584)
-	}
-}
-
-func TestBigCommafs(t *testing.T) {
-	testList{
-		{"0", BigCommaf(big.NewFloat(0)), "0"},
-		{"10.11", BigCommaf(big.NewFloat(10.11)), "10.11"},
-		{"100", BigCommaf(big.NewFloat(100)), "100"},
-		{"1,000", BigCommaf(big.NewFloat(1000)), "1,000"},
-		{"10,000", BigCommaf(big.NewFloat(10000)), "10,000"},
-		{"100,000", BigCommaf(big.NewFloat(100000)), "100,000"},
-		{"834,142.32", BigCommaf(big.NewFloat(834142.32)), "834,142.32"},
-		{"10,000,000", BigCommaf(big.NewFloat(10000000)), "10,000,000"},
-		{"10,100,000", BigCommaf(big.NewFloat(10100000)), "10,100,000"},
-		{"10,010,000", BigCommaf(big.NewFloat(10010000)), "10,010,000"},
-		{"10,001,000", BigCommaf(big.NewFloat(10001000)), "10,001,000"},
-		{"123,456,789", BigCommaf(big.NewFloat(123456789)), "123,456,789"},
-		{"maxf64", BigCommaf(big.NewFloat(math.MaxFloat64)), "179,769,313,486,231,570,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000"},
-		{"minf64", BigCommaf(big.NewFloat(math.SmallestNonzeroFloat64)), "0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004940656458412465"},
-		{"-123,456,789", BigCommaf(big.NewFloat(-123456789)), "-123,456,789"},
-		{"-10,100,000", BigCommaf(big.NewFloat(-10100000)), "-10,100,000"},
-		{"-10,010,000", BigCommaf(big.NewFloat(-10010000)), "-10,010,000"},
-		{"-10,001,000", BigCommaf(big.NewFloat(-10001000)), "-10,001,000"},
-		{"-10,000,000", BigCommaf(big.NewFloat(-10000000)), "-10,000,000"},
-		{"-100,000", BigCommaf(big.NewFloat(-100000)), "-100,000"},
-		{"-10,000", BigCommaf(big.NewFloat(-10000)), "-10,000"},
-		{"-1,000", BigCommaf(big.NewFloat(-1000)), "-1,000"},
-		{"-100.11", BigCommaf(big.NewFloat(-100.11)), "-100.11"},
-		{"-10", BigCommaf(big.NewFloat(-10)), "-10"},
-	}.validate(t)
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/common_test.go b/installer/vendor/github.com/dustin/go-humanize/common_test.go
deleted file mode 100644
index fc7db15164..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/common_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package humanize
-
-import (
-	"testing"
-)
-
-type testList []struct {
-	name, got, exp string
-}
-
-func (tl testList) validate(t *testing.T) {
-	for _, test := range tl {
-		if test.got != test.exp {
-			t.Errorf("On %v, expected '%v', but got '%v'",
-				test.name, test.exp, test.got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/ftoa.go b/installer/vendor/github.com/dustin/go-humanize/ftoa.go
index c76190b106..1c62b640d4 100644
--- a/installer/vendor/github.com/dustin/go-humanize/ftoa.go
+++ b/installer/vendor/github.com/dustin/go-humanize/ftoa.go
@@ -1,6 +1,9 @@
 package humanize
 
-import "strconv"
+import (
+	"strconv"
+	"strings"
+)
 
 func stripTrailingZeros(s string) string {
 	offset := len(s) - 1
@@ -17,7 +20,27 @@ func stripTrailingZeros(s string) string {
 	return s[:offset+1]
 }
 
+func stripTrailingDigits(s string, digits int) string {
+	if i := strings.Index(s, "."); i >= 0 {
+		if digits <= 0 {
+			return s[:i]
+		}
+		i++
+		if i+digits >= len(s) {
+			return s
+		}
+		return s[:i+digits]
+	}
+	return s
+}
+
 // Ftoa converts a float to a string with no trailing zeros.
 func Ftoa(num float64) string {
 	return stripTrailingZeros(strconv.FormatFloat(num, 'f', 6, 64))
 }
+
+// FtoaWithDigits converts a float to a string but limits the resulting string
+// to the given number of decimal places, and no trailing zeros.
+func FtoaWithDigits(num float64, digits int) string {
+	return stripTrailingZeros(stripTrailingDigits(strconv.FormatFloat(num, 'f', 6, 64), digits))
+}
diff --git a/installer/vendor/github.com/dustin/go-humanize/ftoa_test.go b/installer/vendor/github.com/dustin/go-humanize/ftoa_test.go
deleted file mode 100644
index 276d411b76..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/ftoa_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package humanize
-
-import (
-	"fmt"
-	"regexp"
-	"strconv"
-	"testing"
-)
-
-func TestFtoa(t *testing.T) {
-	testList{
-		{"200", Ftoa(200), "200"},
-		{"2", Ftoa(2), "2"},
-		{"2.2", Ftoa(2.2), "2.2"},
-		{"2.02", Ftoa(2.02), "2.02"},
-		{"200.02", Ftoa(200.02), "200.02"},
-	}.validate(t)
-}
-
-func BenchmarkFtoaRegexTrailing(b *testing.B) {
-	trailingZerosRegex := regexp.MustCompile(`\.?0+$`)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		trailingZerosRegex.ReplaceAllString("2.00000", "")
-		trailingZerosRegex.ReplaceAllString("2.0000", "")
-		trailingZerosRegex.ReplaceAllString("2.000", "")
-		trailingZerosRegex.ReplaceAllString("2.00", "")
-		trailingZerosRegex.ReplaceAllString("2.0", "")
-		trailingZerosRegex.ReplaceAllString("2", "")
-	}
-}
-
-func BenchmarkFtoaFunc(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		stripTrailingZeros("2.00000")
-		stripTrailingZeros("2.0000")
-		stripTrailingZeros("2.000")
-		stripTrailingZeros("2.00")
-		stripTrailingZeros("2.0")
-		stripTrailingZeros("2")
-	}
-}
-
-func BenchmarkFmtF(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_ = fmt.Sprintf("%f", 2.03584)
-	}
-}
-
-func BenchmarkStrconvF(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		strconv.FormatFloat(2.03584, 'f', 6, 64)
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/number_test.go b/installer/vendor/github.com/dustin/go-humanize/number_test.go
deleted file mode 100644
index 516f3378d6..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/number_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-package humanize
-
-import (
-	"math"
-	"testing"
-)
-
-type TestStruct struct {
-	name      string
-	format    string
-	num       float64
-	formatted string
-}
-
-func TestFormatFloat(t *testing.T) {
-	tests := []TestStruct{
-		{"default", "", 12345.6789, "12,345.68"},
-		{"#", "#", 12345.6789, "12345.678900000"},
-		{"#.", "#.", 12345.6789, "12346"},
-		{"#,#", "#,#", 12345.6789, "12345,7"},
-		{"#,##", "#,##", 12345.6789, "12345,68"},
-		{"#,###", "#,###", 12345.6789, "12345,679"},
-		{"#,###.", "#,###.", 12345.6789, "12,346"},
-		{"#,###.##", "#,###.##", 12345.6789, "12,345.68"},
-		{"#,###.###", "#,###.###", 12345.6789, "12,345.679"},
-		{"#,###.####", "#,###.####", 12345.6789, "12,345.6789"},
-		{"#.###,######", "#.###,######", 12345.6789, "12.345,678900"},
-		{"bug46", "#,###.##", 52746220055.92342, "52,746,220,055.92"},
-		{"#\u202f###,##", "#\u202f###,##", 12345.6789, "12 345,68"},
-
-		// special cases
-		{"NaN", "#", math.NaN(), "NaN"},
-		{"+Inf", "#", math.Inf(1), "Infinity"},
-		{"-Inf", "#", math.Inf(-1), "-Infinity"},
-		{"signStr <= -0.000000001", "", -0.000000002, "-0.00"},
-		{"signStr = 0", "", 0, "0.00"},
-		{"Format directive must start with +", "+000", 12345.6789, "+12345.678900000"},
-	}
-
-	for _, test := range tests {
-		got := FormatFloat(test.format, test.num)
-		if got != test.formatted {
-			t.Errorf("On %v (%v, %v), got %v, wanted %v",
-				test.name, test.format, test.num, got, test.formatted)
-		}
-	}
-	// Test a single integer
-	got := FormatInteger("#", 12345)
-	if got != "12345.000000000" {
-		t.Errorf("On %v (%v, %v), got %v, wanted %v",
-			"integerTest", "#", 12345, got, "12345.000000000")
-	}
-	// Test the things that could panic
-	panictests := []TestStruct{
-		{"RenderFloat(): invalid positive sign directive", "-", 12345.6789, "12,345.68"},
-		{"RenderFloat(): thousands separator directive must be followed by 3 digit-specifiers", "0.01", 12345.6789, "12,345.68"},
-	}
-	for _, test := range panictests {
-		didPanic := false
-		var message interface{}
-		func() {
-
-			defer func() {
-				if message = recover(); message != nil {
-					didPanic = true
-				}
-			}()
-
-			// call the target function
-			_ = FormatFloat(test.format, test.num)
-
-		}()
-		if didPanic != true {
-			t.Errorf("On %v, should have panic and did not.",
-				test.name)
-		}
-	}
-
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/ordinals_test.go b/installer/vendor/github.com/dustin/go-humanize/ordinals_test.go
deleted file mode 100644
index 51d85ee7a0..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/ordinals_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package humanize
-
-import (
-	"testing"
-)
-
-func TestOrdinals(t *testing.T) {
-	testList{
-		{"0", Ordinal(0), "0th"},
-		{"1", Ordinal(1), "1st"},
-		{"2", Ordinal(2), "2nd"},
-		{"3", Ordinal(3), "3rd"},
-		{"4", Ordinal(4), "4th"},
-		{"10", Ordinal(10), "10th"},
-		{"11", Ordinal(11), "11th"},
-		{"12", Ordinal(12), "12th"},
-		{"13", Ordinal(13), "13th"},
-		{"101", Ordinal(101), "101st"},
-		{"102", Ordinal(102), "102nd"},
-		{"103", Ordinal(103), "103rd"},
-	}.validate(t)
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/si.go b/installer/vendor/github.com/dustin/go-humanize/si.go
index b24e48169f..ae659e0e49 100644
--- a/installer/vendor/github.com/dustin/go-humanize/si.go
+++ b/installer/vendor/github.com/dustin/go-humanize/si.go
@@ -93,6 +93,16 @@ func SI(input float64, unit string) string {
 	return Ftoa(value) + " " + prefix + unit
 }
 
+// SIWithDigits works like SI but limits the resulting string to the
+// given number of decimal places.
+//
+// e.g. SIWithDigits(1000000, 0, "B") -> 1 MB
+// e.g. SIWithDigits(2.2345e-12, 2, "F") -> 2.23 pF
+func SIWithDigits(input float64, decimals int, unit string) string {
+	value, prefix := ComputeSI(input)
+	return FtoaWithDigits(value, decimals) + " " + prefix + unit
+}
+
 var errInvalid = errors.New("invalid input")
 
 // ParseSI parses an SI string back into the number and unit.
diff --git a/installer/vendor/github.com/dustin/go-humanize/si_test.go b/installer/vendor/github.com/dustin/go-humanize/si_test.go
deleted file mode 100644
index bc5bac6698..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/si_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package humanize
-
-import (
-	"math"
-	"testing"
-)
-
-func TestSI(t *testing.T) {
-	tests := []struct {
-		name      string
-		num       float64
-		formatted string
-	}{
-		{"e-24", 1e-24, "1 yF"},
-		{"e-21", 1e-21, "1 zF"},
-		{"e-18", 1e-18, "1 aF"},
-		{"e-15", 1e-15, "1 fF"},
-		{"e-12", 1e-12, "1 pF"},
-		{"e-12", 2.2345e-12, "2.2345 pF"},
-		{"e-12", 2.23e-12, "2.23 pF"},
-		{"e-11", 2.23e-11, "22.3 pF"},
-		{"e-10", 2.2e-10, "220 pF"},
-		{"e-9", 2.2e-9, "2.2 nF"},
-		{"e-8", 2.2e-8, "22 nF"},
-		{"e-7", 2.2e-7, "220 nF"},
-		{"e-6", 2.2e-6, "2.2 µF"},
-		{"e-6", 1e-6, "1 µF"},
-		{"e-5", 2.2e-5, "22 µF"},
-		{"e-4", 2.2e-4, "220 µF"},
-		{"e-3", 2.2e-3, "2.2 mF"},
-		{"e-2", 2.2e-2, "22 mF"},
-		{"e-1", 2.2e-1, "220 mF"},
-		{"e+0", 2.2e-0, "2.2 F"},
-		{"e+0", 2.2, "2.2 F"},
-		{"e+1", 2.2e+1, "22 F"},
-		{"0", 0, "0 F"},
-		{"e+1", 22, "22 F"},
-		{"e+2", 2.2e+2, "220 F"},
-		{"e+2", 220, "220 F"},
-		{"e+3", 2.2e+3, "2.2 kF"},
-		{"e+3", 2200, "2.2 kF"},
-		{"e+4", 2.2e+4, "22 kF"},
-		{"e+4", 22000, "22 kF"},
-		{"e+5", 2.2e+5, "220 kF"},
-		{"e+6", 2.2e+6, "2.2 MF"},
-		{"e+6", 1e+6, "1 MF"},
-		{"e+7", 2.2e+7, "22 MF"},
-		{"e+8", 2.2e+8, "220 MF"},
-		{"e+9", 2.2e+9, "2.2 GF"},
-		{"e+10", 2.2e+10, "22 GF"},
-		{"e+11", 2.2e+11, "220 GF"},
-		{"e+12", 2.2e+12, "2.2 TF"},
-		{"e+15", 2.2e+15, "2.2 PF"},
-		{"e+18", 2.2e+18, "2.2 EF"},
-		{"e+21", 2.2e+21, "2.2 ZF"},
-		{"e+24", 2.2e+24, "2.2 YF"},
-
-		// special case
-		{"1F", 1000 * 1000, "1 MF"},
-		{"1F", 1e6, "1 MF"},
-
-		// negative number
-		{"-100 F", -100, "-100 F"},
-	}
-
-	for _, test := range tests {
-		got := SI(test.num, "F")
-		if got != test.formatted {
-			t.Errorf("On %v (%v), got %v, wanted %v",
-				test.name, test.num, got, test.formatted)
-		}
-
-		gotf, gotu, err := ParseSI(test.formatted)
-		if err != nil {
-			t.Errorf("Error parsing %v (%v): %v", test.name, test.formatted, err)
-			continue
-		}
-
-		if math.Abs(1-(gotf/test.num)) > 0.01 {
-			t.Errorf("On %v (%v), got %v, wanted %v (±%v)",
-				test.name, test.formatted, gotf, test.num,
-				math.Abs(1-(gotf/test.num)))
-		}
-		if gotu != "F" {
-			t.Errorf("On %v (%v), expected unit F, got %v",
-				test.name, test.formatted, gotu)
-		}
-	}
-
-	// Parse error
-	gotf, gotu, err := ParseSI("x1.21JW") // 1.21 jigga whats
-	if err == nil {
-		t.Errorf("Expected error on x1.21JW, got %v %v", gotf, gotu)
-	}
-}
-
-func BenchmarkParseSI(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		ParseSI("2.2346ZB")
-	}
-}
diff --git a/installer/vendor/github.com/dustin/go-humanize/times.go b/installer/vendor/github.com/dustin/go-humanize/times.go
index b311f11c80..dd3fbf5efc 100644
--- a/installer/vendor/github.com/dustin/go-humanize/times.go
+++ b/installer/vendor/github.com/dustin/go-humanize/times.go
@@ -91,7 +91,7 @@ func CustomRelTime(a, b time.Time, albl, blbl string, magnitudes []RelTimeMagnit
 	}
 
 	n := sort.Search(len(magnitudes), func(i int) bool {
-		return magnitudes[i].D >= diff
+		return magnitudes[i].D > diff
 	})
 
 	if n >= len(magnitudes) {
diff --git a/installer/vendor/github.com/dustin/go-humanize/times_test.go b/installer/vendor/github.com/dustin/go-humanize/times_test.go
deleted file mode 100644
index c90a71b1a7..0000000000
--- a/installer/vendor/github.com/dustin/go-humanize/times_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-package humanize
-
-import (
-	"math"
-	"testing"
-	"time"
-)
-
-func TestPast(t *testing.T) {
-	now := time.Now()
-	testList{
-		{"now", Time(now), "now"},
-		{"1 second ago", Time(now.Add(-1 * time.Second)), "1 second ago"},
-		{"12 seconds ago", Time(now.Add(-12 * time.Second)), "12 seconds ago"},
-		{"30 seconds ago", Time(now.Add(-30 * time.Second)), "30 seconds ago"},
-		{"45 seconds ago", Time(now.Add(-45 * time.Second)), "45 seconds ago"},
-		{"1 minute ago", Time(now.Add(-63 * time.Second)), "1 minute ago"},
-		{"15 minutes ago", Time(now.Add(-15 * time.Minute)), "15 minutes ago"},
-		{"1 hour ago", Time(now.Add(-63 * time.Minute)), "1 hour ago"},
-		{"2 hours ago", Time(now.Add(-2 * time.Hour)), "2 hours ago"},
-		{"21 hours ago", Time(now.Add(-21 * time.Hour)), "21 hours ago"},
-		{"1 day ago", Time(now.Add(-26 * time.Hour)), "1 day ago"},
-		{"2 days ago", Time(now.Add(-49 * time.Hour)), "2 days ago"},
-		{"3 days ago", Time(now.Add(-3 * Day)), "3 days ago"},
-		{"1 week ago (1)", Time(now.Add(-7 * Day)), "1 week ago"},
-		{"1 week ago (2)", Time(now.Add(-12 * Day)), "1 week ago"},
-		{"2 weeks ago", Time(now.Add(-15 * Day)), "2 weeks ago"},
-		{"1 month ago", Time(now.Add(-39 * Day)), "1 month ago"},
-		{"3 months ago", Time(now.Add(-99 * Day)), "3 months ago"},
-		{"1 year ago (1)", Time(now.Add(-365 * Day)), "1 year ago"},
-		{"1 year ago (1)", Time(now.Add(-400 * Day)), "1 year ago"},
-		{"2 years ago (1)", Time(now.Add(-548 * Day)), "2 years ago"},
-		{"2 years ago (2)", Time(now.Add(-725 * Day)), "2 years ago"},
-		{"2 years ago (3)", Time(now.Add(-800 * Day)), "2 years ago"},
-		{"3 years ago", Time(now.Add(-3 * Year)), "3 years ago"},
-		{"long ago", Time(now.Add(-LongTime)), "a long while ago"},
-	}.validate(t)
-}
-
-func TestFuture(t *testing.T) {
-	// Add a little time so that these things properly line up in
-	// the future.
-	now := time.Now().Add(time.Millisecond * 250)
-	testList{
-		{"now", Time(now), "now"},
-		{"1 second from now", Time(now.Add(+1 * time.Second)), "1 second from now"},
-		{"12 seconds from now", Time(now.Add(+12 * time.Second)), "12 seconds from now"},
-		{"30 seconds from now", Time(now.Add(+30 * time.Second)), "30 seconds from now"},
-		{"45 seconds from now", Time(now.Add(+45 * time.Second)), "45 seconds from now"},
-		{"15 minutes from now", Time(now.Add(+15 * time.Minute)), "15 minutes from now"},
-		{"2 hours from now", Time(now.Add(+2 * time.Hour)), "2 hours from now"},
-		{"21 hours from now", Time(now.Add(+21 * time.Hour)), "21 hours from now"},
-		{"1 day from now", Time(now.Add(+26 * time.Hour)), "1 day from now"},
-		{"2 days from now", Time(now.Add(+49 * time.Hour)), "2 days from now"},
-		{"3 days from now", Time(now.Add(+3 * Day)), "3 days from now"},
-		{"1 week from now (1)", Time(now.Add(+7 * Day)), "1 week from now"},
-		{"1 week from now (2)", Time(now.Add(+12 * Day)), "1 week from now"},
-		{"2 weeks from now", Time(now.Add(+15 * Day)), "2 weeks from now"},
-		{"1 month from now", Time(now.Add(+30 * Day)), "1 month from now"},
-		{"1 year from now", Time(now.Add(+365 * Day)), "1 year from now"},
-		{"2 years from now", Time(now.Add(+2 * Year)), "2 years from now"},
-		{"a while from now", Time(now.Add(+LongTime)), "a long while from now"},
-	}.validate(t)
-}
-
-func TestRange(t *testing.T) {
-	start := time.Time{}
-	end := time.Unix(math.MaxInt64, math.MaxInt64)
-	x := RelTime(start, end, "ago", "from now")
-	if x != "a long while from now" {
-		t.Errorf("Expected a long while from now, got %q", x)
-	}
-}
-
-func TestCustomRelTime(t *testing.T) {
-	now := time.Now().Add(time.Millisecond * 250)
-	magnitudes := []RelTimeMagnitude{
-		{time.Second, "now", time.Second},
-		{2 * time.Second, "1 second %s", 1},
-		{time.Minute, "%d seconds %s", time.Second},
-		{Day - time.Second, "%d minutes %s", time.Minute},
-		{Day, "%d hours %s", time.Hour},
-		{2 * Day, "1 day %s", 1},
-		{Week, "%d days %s", Day},
-		{2 * Week, "1 week %s", 1},
-		{6 * Month, "%d weeks %s", Week},
-		{Year, "%d months %s", Month},
-	}
-	customRelTime := func(then time.Time) string {
-		return CustomRelTime(then, time.Now(), "ago", "from now", magnitudes)
-	}
-	testList{
-		{"now", customRelTime(now), "now"},
-		{"1 second from now", customRelTime(now.Add(+1 * time.Second)), "1 second from now"},
-		{"12 seconds from now", customRelTime(now.Add(+12 * time.Second)), "12 seconds from now"},
-		{"30 seconds from now", customRelTime(now.Add(+30 * time.Second)), "30 seconds from now"},
-		{"45 seconds from now", customRelTime(now.Add(+45 * time.Second)), "45 seconds from now"},
-		{"15 minutes from now", customRelTime(now.Add(+15 * time.Minute)), "15 minutes from now"},
-		{"2 hours from now", customRelTime(now.Add(+2 * time.Hour)), "120 minutes from now"},
-		{"21 hours from now", customRelTime(now.Add(+21 * time.Hour)), "1260 minutes from now"},
-		{"1 day from now", customRelTime(now.Add(+26 * time.Hour)), "1 day from now"},
-		{"2 days from now", customRelTime(now.Add(+49 * time.Hour)), "2 days from now"},
-		{"3 days from now", customRelTime(now.Add(+3 * Day)), "3 days from now"},
-		{"1 week from now (1)", customRelTime(now.Add(+7 * Day)), "1 week from now"},
-		{"1 week from now (2)", customRelTime(now.Add(+12 * Day)), "1 week from now"},
-		{"2 weeks from now", customRelTime(now.Add(+15 * Day)), "2 weeks from now"},
-		{"1 month from now", customRelTime(now.Add(+30 * Day)), "4 weeks from now"},
-		{"6 months from now", customRelTime(now.Add(+6*Month - time.Second)), "25 weeks from now"},
-		{"1 year from now", customRelTime(now.Add(+365 * Day)), "12 months from now"},
-		{"2 years from now", customRelTime(now.Add(+2 * Year)), "24 months from now"},
-		{"a while from now", customRelTime(now.Add(+LongTime)), "444 months from now"},
-	}.validate(t)
-}
diff --git a/installer/vendor/github.com/gizak/termui/.gitignore b/installer/vendor/github.com/gizak/termui/.gitignore
deleted file mode 100644
index 8b156b0202..0000000000
--- a/installer/vendor/github.com/gizak/termui/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
-.DS_Store
-/vendor
diff --git a/installer/vendor/github.com/gizak/termui/.travis.yml b/installer/vendor/github.com/gizak/termui/.travis.yml
deleted file mode 100644
index 206e887409..0000000000
--- a/installer/vendor/github.com/gizak/termui/.travis.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-language: go
-
-go:
-  - tip
-
-script: go test -v ./
\ No newline at end of file
diff --git a/installer/vendor/github.com/gizak/termui/README.md b/installer/vendor/github.com/gizak/termui/README.md
deleted file mode 100644
index d5f3d9a8f1..0000000000
--- a/installer/vendor/github.com/gizak/termui/README.md
+++ /dev/null
@@ -1,151 +0,0 @@
-# termui [![Build Status](https://travis-ci.org/gizak/termui.svg?branch=master)](https://travis-ci.org/gizak/termui) [![Doc Status](https://godoc.org/github.com/gizak/termui?status.png)](https://godoc.org/github.com/gizak/termui)
-
-<img src="./_example/dashboard.gif" alt="demo cast under osx 10.10; Terminal.app; Menlo Regular 12pt.)" width="80%">
-
-`termui` is a cross-platform, easy-to-compile, and fully-customizable terminal dashboard. It is inspired by [blessed-contrib](https://github.com/yaronn/blessed-contrib), but purely in Go.
-
-Now version v2 has arrived! It brings new event system, new theme system, new `Buffer` interface and specific colour text rendering. (some docs are missing, but it will be completed soon!)
-
-## Installation
-
-`master` mirrors v2 branch, to install:
-
-	go get -u github.com/gizak/termui
-
-It is recommanded to use locked deps by using [glide](https://glide.sh): move to `termui` src directory then run `glide up`.
-
-For the compatible reason, you can choose to install the legacy version of `termui`:
-
-	go get gopkg.in/gizak/termui.v1
-
-## Usage
-
-### Layout
-
-To use `termui`, the very first thing you may want to know is how to manage layout. `termui` offers two ways of doing this, known as absolute layout and grid layout.
-
-__Absolute layout__
-
-Each widget has an underlying block structure which basically is a box model. It has border, label and padding properties. A border of a widget can be chosen to hide or display (with its border label), you can pick a different front/back colour for the border as well. To display such a widget at a specific location in terminal window, you need to assign `.X`, `.Y`, `.Height`, `.Width` values for each widget before sending it to `.Render`. Let's demonstrate these by a code snippet:
-
-`````go
-	import ui "github.com/gizak/termui" // <- ui shortcut, optional
-
-	func main() {
-		err := ui.Init()
-		if err != nil {
-			panic(err)
-		}
-		defer ui.Close()
-
-		p := ui.NewPar(":PRESS q TO QUIT DEMO")
-		p.Height = 3
-		p.Width = 50
-		p.TextFgColor = ui.ColorWhite
-		p.BorderLabel = "Text Box"
-		p.BorderFg = ui.ColorCyan
-
-		g := ui.NewGauge()
-		g.Percent = 50
-		g.Width = 50
-		g.Height = 3
-		g.Y = 11
-		g.BorderLabel = "Gauge"
-		g.BarColor = ui.ColorRed
-		g.BorderFg = ui.ColorWhite
-		g.BorderLabelFg = ui.ColorCyan
-
-		ui.Render(p, g) // feel free to call Render, it's async and non-block
-
-		// event handler...
-	}
-`````
-
-Note that components can be overlapped (I'd rather call this a feature...), `Render(rs ...Renderer)` renders its args from left to right (i.e. each component's weight is arising from left to right).
-
-__Grid layout:__
-
-<img src="./_example/grid.gif" alt="grid" width="60%">
-
-Grid layout uses [12 columns grid system](http://www.w3schools.com/bootstrap/bootstrap_grid_system.asp) with expressive syntax. To use `Grid`, all we need to do is build a widget tree consisting of `Row`s and `Col`s (Actually a `Col` is also a `Row` but with a widget endpoint attached).
-
-```go
-	import ui "github.com/gizak/termui"
-	// init and create widgets...
-
-	// build
-	ui.Body.AddRows(
-		ui.NewRow(
-			ui.NewCol(6, 0, widget0),
-			ui.NewCol(6, 0, widget1)),
-		ui.NewRow(
-			ui.NewCol(3, 0, widget2),
-			ui.NewCol(3, 0, widget30, widget31, widget32),
-			ui.NewCol(6, 0, widget4)))
-
-	// calculate layout
-	ui.Body.Align()
-
-	ui.Render(ui.Body)
-```
-
-### Events
-
-`termui` ships with a http-like event mux handling system. All events are channeled up from different sources (typing, click, windows resize, custom event) and then encoded as universal `Event` object. `Event.Path` indicates the event type and `Event.Data` stores the event data struct. Add a handler to a certain event is easy as below:
-
-```go
-	// handle key q pressing
-	ui.Handle("/sys/kbd/q", func(ui.Event) {
-		// press q to quit
-		ui.StopLoop()
-	})
-
-	ui.Handle("/sys/kbd/C-x", func(ui.Event) {
-		// handle Ctrl + x combination
-	})
-
-	ui.Handle("/sys/kbd", func(ui.Event) {
-		// handle all other key pressing
-	})
-
-	// handle a 1s timer
-	ui.Handle("/timer/1s", func(e ui.Event) {
-		t := e.Data.(ui.EvtTimer)
-		// t is a EvtTimer
-		if t.Count%2 ==0 {
-			// do something
-		}
-	})
-
-	ui.Loop() // block until StopLoop is called
-```
-
-### Widgets
-
-Click image to see the corresponding demo codes.
-
-[<img src="./_example/par.png" alt="par" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/par.go)
-[<img src="./_example/list.png" alt="list" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/list.go)
-[<img src="./_example/gauge.png" alt="gauge" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/gauge.go)
-[<img src="./_example/linechart.png" alt="linechart" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/linechart.go)
-[<img src="./_example/barchart.png" alt="barchart" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/barchart.go)
-[<img src="./_example/mbarchart.png" alt="barchart" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/mbarchart.go)
-[<img src="./_example/sparklines.png" alt="sparklines" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/sparklines.go)
-[<img src="./_example/table.png" alt="table" type="image/png" width="45%">](https://github.com/gizak/termui/blob/master/_example/table.go)
-
-## GoDoc
-
-[godoc](https://godoc.org/github.com/gizak/termui)
-
-## TODO
-
-- [x] Grid layout
-- [x] Event system
-- [x] Canvas widget
-- [x] Refine APIs
-- [ ] Focusable widgets
-
-## Changelog
-
-## License
-This library is under the [MIT License](http://opensource.org/licenses/MIT)
diff --git a/installer/vendor/github.com/gizak/termui/_docs/about.md b/installer/vendor/github.com/gizak/termui/_docs/about.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/gizak/termui/_docs/components.md b/installer/vendor/github.com/gizak/termui/_docs/components.md
deleted file mode 100644
index 4e0239f3e0..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/components.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Overview
----
-
-Bufferer
----
-
-Block
----
-
-BarChart
----
-
-Canvas
----
-
-Gauge
----
-
-LineChart
----
-
-MBarChart
----
-
-Par
----
-
-Sparkline
----
-
-Sparklines
----
diff --git a/installer/vendor/github.com/gizak/termui/_docs/events.md b/installer/vendor/github.com/gizak/termui/_docs/events.md
deleted file mode 100644
index 45aa04c3fb..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/events.md
+++ /dev/null
@@ -1,14 +0,0 @@
-Event System
----
-
-Keyboard Events
----
-
-Mouse Events
----
-
-Window Events
----
-
-Custom Events
----
diff --git a/installer/vendor/github.com/gizak/termui/_docs/img/dashboard.gif b/installer/vendor/github.com/gizak/termui/_docs/img/dashboard.gif
deleted file mode 100644
index 4bab47020a..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_docs/img/dashboard.gif and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_docs/img/demo1.png b/installer/vendor/github.com/gizak/termui/_docs/img/demo1.png
deleted file mode 100644
index cc35f49dec..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_docs/img/demo1.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_docs/index.md b/installer/vendor/github.com/gizak/termui/_docs/index.md
deleted file mode 100644
index 27690678fe..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/index.md
+++ /dev/null
@@ -1,15 +0,0 @@
-[termui]() is a cross-platform, easy-to-compile, and fully-customizable terminal dashboard. It aims to provide a terminal front end for your applications with less struggle:
-
-> ![dashboard](img/dashboard.gif)
->
-> _cast under osx 10.10; Terminal.app; Menlo Regular 12pt._
-
-This guide describes the essential parts used to build a interface, which includes:
-
-- Installation & Usage
-- Layout System
-- Event System
-- Theming
-- Components
-
-[Quickstart](quickstart.md) is the way to go for starters and [Recipes](recipes.md) contains some practical resolutions you might need.
diff --git a/installer/vendor/github.com/gizak/termui/_docs/layouts.md b/installer/vendor/github.com/gizak/termui/_docs/layouts.md
deleted file mode 100644
index b260736501..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/layouts.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Overview
----
-
-termui offers two layout system: [Absolute]() and [Grid](). The two concept actually spawned from Web:
-
-- The __Absolute layout__ is a plain coordination system, like [CSS position property](https://developer.mozilla.org/en/docs/Web/CSS/position) `position: absolute`. You will need manually assign `.X`, `.Y`, `.Width` and `.Height` to a component.
-- The __Grid system__ actually is a simplified version of [the 12 columns CSS grid system](http://www.w3schools.com/bootstrap/bootstrap_grid_system.asp) on terminal. You do not need to bother setting positions and width properties, these values will be synced up according to their containers.
-
-!!! note
-	`Align` property can help you set your component position based on terminal window. Find more at [Magic Variables](#magic-variables)
-
-__Cons and pros:__
-
-- Use of Absolute layout gives you maximum control over how to arrange your components, while you have
-to put a little more effort to set things up. Fortunately there are some "magic variables" may help you out.
-- Grid layout can save you some time, it adjusts components location and size based on it's container. But note that you do need to set `.Height` property to each components because termui can not decide it for you.
-
-
-Absolute Layout
----
-
-Grid Layout
----
-
-Magic Variables
----
diff --git a/installer/vendor/github.com/gizak/termui/_docs/quickstart.md b/installer/vendor/github.com/gizak/termui/_docs/quickstart.md
deleted file mode 100644
index 207019f6ff..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/quickstart.md
+++ /dev/null
@@ -1,80 +0,0 @@
-Installation
----
-
-Since [termui](https://github.com/gizak/termui) is a Go lib, we will need a working Go environment to begin with. If you have not set it up, there is a great intro you can follow up: [How to write Go code](https://golang.org/doc/code.html).
-
-Once you have the environment set up, you can proceed to install termui by the following command:
-
-`go get github.com/gizak/termui`
-
-The current version of termui is v2. If you are working with the old version of termui or the new version does not seem right to you, you can always go back to v1 version by:
-
-`go get gopkg.in/gizak/termui.v1`
-
-!!! note
-	v2 has many features implemented which you can not find in v1, such as new event system and asynchronous rendering. To find more about versions difference in section [Versions](versions.md).
-
-
-Usage
----
-
-Let's throw an simple example to get our feet wet:
-
-```go
-package main
-
-import ui "github.com/gizak/termui" // use ui as an alias
-
-func main() {
-	err := ui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	p := ui.NewPar(":PRESS q TO QUIT DEMO")
-	p.Height = 3
-	p.Width = 50
-	p.TextFgColor = ui.ColorWhite
-	p.BorderLabel = "Text Box"
-	p.BorderFg = ui.ColorCyan
-
-	ui.Render(p) // feel free to call Render, it's async and non-block
-
-    ui.Handle("/sys/kbd/q",func(e ui.Event){
-		ui.StopLoop()
-	})
-
-	ui.Loop()
-}
-```
-There are only around 20 lines for the main function. Break this down into 4 parts:
-
-1. __Init termui__:
-   `ui.Init()`  initializes the termui. From this point, termui will take over your terminal display.
-   `ui.Close()` closes resources and cleans up your terminal content. Make sure it is called before exit or you will end up with a messed up looking terminal.
-
-2. __Build your component__:
-   `ui.NewPar(:PRESS q TO QUIT DEMO)` returns a structure representing a paragraph component. You can assign position, size, text colour, border and many other properties to a component.
-
-3. __Draw your component on display__:
-   `ui.Render(p)` renders p onto terminal display.
-
-4. __Handle events__:
-   `ui.Handle("/sys/kbd/q", func(e Event))` registers an event handler for event: key q is pressed.
-   `ui.StopLoop()` exits the event listening loop invoked by `ui.Loop()`.
-   `ui.Loop()` makes the program stops at here and start listening & handling events. Call
-   `ui.StopLoop()` to leave the circle.
-
-The example code gives us:
-
-> ![example screenshot](img/demo1.png)
-
-Now you can press q to quit the program.
-
-After knowing of some basics, next we can discover more about:
-
-1. how to set component location in [Layouts](layouts.md)
-2. how to capture and handle events in [Events](events.md)
-3. the different [components](components.md)
-4. check out some real world examples in [recipes](recipes.md)
diff --git a/installer/vendor/github.com/gizak/termui/_docs/recipes.md b/installer/vendor/github.com/gizak/termui/_docs/recipes.md
deleted file mode 100644
index 3a169655a1..0000000000
--- a/installer/vendor/github.com/gizak/termui/_docs/recipes.md
+++ /dev/null
@@ -1 +0,0 @@
-_Sorry, it is still Work in Progress..._
diff --git a/installer/vendor/github.com/gizak/termui/_docs/themes.md b/installer/vendor/github.com/gizak/termui/_docs/themes.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/gizak/termui/_docs/versions.md b/installer/vendor/github.com/gizak/termui/_docs/versions.md
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/gizak/termui/_example/barchart.go b/installer/vendor/github.com/gizak/termui/_example/barchart.go
deleted file mode 100644
index aa2027420b..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/barchart.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	if err := termui.Init(); err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	bc := termui.NewBarChart()
-	data := []int{3, 2, 5, 3, 9, 5, 3, 2, 5, 8, 3, 2, 4, 5, 3, 2, 5, 7, 5, 3, 2, 6, 7, 4, 6, 3, 6, 7, 8, 3, 6, 4, 5, 3, 2, 4, 6, 4, 8, 5, 9, 4, 3, 6, 5, 3, 6}
-	bclabels := []string{"S0", "S1", "S2", "S3", "S4", "S5"}
-	bc.BorderLabel = "Bar Chart"
-	bc.Data = data
-	bc.Width = 26
-	bc.Height = 10
-	bc.DataLabels = bclabels
-	bc.TextColor = termui.ColorGreen
-	bc.BarColor = termui.ColorRed
-	bc.NumColor = termui.ColorYellow
-
-	termui.Render(bc)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/barchart.png b/installer/vendor/github.com/gizak/termui/_example/barchart.png
deleted file mode 100644
index 4c5f1cad37..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/barchart.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/dashboard.gif b/installer/vendor/github.com/gizak/termui/_example/dashboard.gif
deleted file mode 100644
index 4bab47020a..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/dashboard.gif and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/dashboard.go b/installer/vendor/github.com/gizak/termui/_example/dashboard.go
deleted file mode 100644
index bd51c27c65..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/dashboard.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import ui "github.com/gizak/termui"
-import "math"
-
-func main() {
-	if err := ui.Init(); err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	p := ui.NewPar(":PRESS q TO QUIT DEMO")
-	p.Height = 3
-	p.Width = 50
-	p.TextFgColor = ui.ColorWhite
-	p.BorderLabel = "Text Box"
-	p.BorderFg = ui.ColorCyan
-	p.Handle("/timer/1s", func(e ui.Event) {
-		cnt := e.Data.(ui.EvtTimer)
-		if cnt.Count%2 == 0 {
-			p.TextFgColor = ui.ColorRed
-		} else {
-			p.TextFgColor = ui.ColorWhite
-		}
-	})
-
-	strs := []string{"[0] gizak/termui", "[1] editbox.go", "[2] interrupt.go", "[3] keyboard.go", "[4] output.go", "[5] random_out.go", "[6] dashboard.go", "[7] nsf/termbox-go"}
-	list := ui.NewList()
-	list.Items = strs
-	list.ItemFgColor = ui.ColorYellow
-	list.BorderLabel = "List"
-	list.Height = 7
-	list.Width = 25
-	list.Y = 4
-
-	g := ui.NewGauge()
-	g.Percent = 50
-	g.Width = 50
-	g.Height = 3
-	g.Y = 11
-	g.BorderLabel = "Gauge"
-	g.BarColor = ui.ColorRed
-	g.BorderFg = ui.ColorWhite
-	g.BorderLabelFg = ui.ColorCyan
-
-	spark := ui.Sparkline{}
-	spark.Height = 1
-	spark.Title = "srv 0:"
-	spdata := []int{4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6, 4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6}
-	spark.Data = spdata
-	spark.LineColor = ui.ColorCyan
-	spark.TitleColor = ui.ColorWhite
-
-	spark1 := ui.Sparkline{}
-	spark1.Height = 1
-	spark1.Title = "srv 1:"
-	spark1.Data = spdata
-	spark1.TitleColor = ui.ColorWhite
-	spark1.LineColor = ui.ColorRed
-
-	sp := ui.NewSparklines(spark, spark1)
-	sp.Width = 25
-	sp.Height = 7
-	sp.BorderLabel = "Sparkline"
-	sp.Y = 4
-	sp.X = 25
-
-	sinps := (func() []float64 {
-		n := 220
-		ps := make([]float64, n)
-		for i := range ps {
-			ps[i] = 1 + math.Sin(float64(i)/5)
-		}
-		return ps
-	})()
-
-	lc := ui.NewLineChart()
-	lc.BorderLabel = "dot-mode Line Chart"
-	lc.Data = sinps
-	lc.Width = 50
-	lc.Height = 11
-	lc.X = 0
-	lc.Y = 14
-	lc.AxesColor = ui.ColorWhite
-	lc.LineColor = ui.ColorRed | ui.AttrBold
-	lc.Mode = "dot"
-
-	bc := ui.NewBarChart()
-	bcdata := []int{3, 2, 5, 3, 9, 5, 3, 2, 5, 8, 3, 2, 4, 5, 3, 2, 5, 7, 5, 3, 2, 6, 7, 4, 6, 3, 6, 7, 8, 3, 6, 4, 5, 3, 2, 4, 6, 4, 8, 5, 9, 4, 3, 6, 5, 3, 6}
-	bclabels := []string{"S0", "S1", "S2", "S3", "S4", "S5"}
-	bc.BorderLabel = "Bar Chart"
-	bc.Width = 26
-	bc.Height = 10
-	bc.X = 51
-	bc.Y = 0
-	bc.DataLabels = bclabels
-	bc.BarColor = ui.ColorGreen
-	bc.NumColor = ui.ColorBlack
-
-	lc1 := ui.NewLineChart()
-	lc1.BorderLabel = "braille-mode Line Chart"
-	lc1.Data = sinps
-	lc1.Width = 26
-	lc1.Height = 11
-	lc1.X = 51
-	lc1.Y = 14
-	lc1.AxesColor = ui.ColorWhite
-	lc1.LineColor = ui.ColorYellow | ui.AttrBold
-
-	p1 := ui.NewPar("Hey!\nI am a borderless block!")
-	p1.Border = false
-	p1.Width = 26
-	p1.Height = 2
-	p1.TextFgColor = ui.ColorMagenta
-	p1.X = 52
-	p1.Y = 11
-
-	draw := func(t int) {
-		g.Percent = t % 101
-		list.Items = strs[t%9:]
-		sp.Lines[0].Data = spdata[:30+t%50]
-		sp.Lines[1].Data = spdata[:35+t%50]
-		lc.Data = sinps[t/2%220:]
-		lc1.Data = sinps[2*t%220:]
-		bc.Data = bcdata[t/2%10:]
-		ui.Render(p, list, g, sp, lc, bc, lc1, p1)
-	}
-	ui.Handle("/sys/kbd/q", func(ui.Event) {
-		ui.StopLoop()
-	})
-	ui.Handle("/timer/1s", func(e ui.Event) {
-		t := e.Data.(ui.EvtTimer)
-		draw(int(t.Count))
-	})
-	ui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/gauge.go b/installer/vendor/github.com/gizak/termui/_example/gauge.go
deleted file mode 100644
index d05b77eb82..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/gauge.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	g0 := termui.NewGauge()
-	g0.Percent = 40
-	g0.Width = 50
-	g0.Height = 3
-	g0.BorderLabel = "Slim Gauge"
-	g0.BarColor = termui.ColorRed
-	g0.BorderFg = termui.ColorWhite
-	g0.BorderLabelFg = termui.ColorCyan
-
-	gg := termui.NewBlock()
-	gg.Width = 50
-	gg.Height = 5
-	gg.Y = 12
-	gg.BorderLabel = "TEST"
-	gg.Align()
-
-	g2 := termui.NewGauge()
-	g2.Percent = 60
-	g2.Width = 50
-	g2.Height = 3
-	g2.PercentColor = termui.ColorBlue
-	g2.Y = 3
-	g2.BorderLabel = "Slim Gauge"
-	g2.BarColor = termui.ColorYellow
-	g2.BorderFg = termui.ColorWhite
-
-	g1 := termui.NewGauge()
-	g1.Percent = 30
-	g1.Width = 50
-	g1.Height = 5
-	g1.Y = 6
-	g1.BorderLabel = "Big Gauge"
-	g1.PercentColor = termui.ColorYellow
-	g1.BarColor = termui.ColorGreen
-	g1.BorderFg = termui.ColorWhite
-	g1.BorderLabelFg = termui.ColorMagenta
-
-	g3 := termui.NewGauge()
-	g3.Percent = 50
-	g3.Width = 50
-	g3.Height = 3
-	g3.Y = 11
-	g3.BorderLabel = "Gauge with custom label"
-	g3.Label = "{{percent}}% (100MBs free)"
-	g3.LabelAlign = termui.AlignRight
-
-	g4 := termui.NewGauge()
-	g4.Percent = 50
-	g4.Width = 50
-	g4.Height = 3
-	g4.Y = 14
-	g4.BorderLabel = "Gauge"
-	g4.Label = "Gauge with custom highlighted label"
-	g4.PercentColor = termui.ColorYellow
-	g4.BarColor = termui.ColorGreen
-	g4.PercentColorHighlighted = termui.ColorBlack
-
-	termui.Render(g0, g1, g2, g3, g4)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-
-	termui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/gauge.png b/installer/vendor/github.com/gizak/termui/_example/gauge.png
deleted file mode 100644
index 40092435b5..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/gauge.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/grid.gif b/installer/vendor/github.com/gizak/termui/_example/grid.gif
deleted file mode 100644
index 7490043dea..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/grid.gif and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/grid.go b/installer/vendor/github.com/gizak/termui/_example/grid.go
deleted file mode 100644
index 4128909f31..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/grid.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import ui "github.com/gizak/termui"
-
-import "math"
-
-func main() {
-	if err := ui.Init(); err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	sinps := (func() []float64 {
-		n := 400
-		ps := make([]float64, n)
-		for i := range ps {
-			ps[i] = 1 + math.Sin(float64(i)/5)
-		}
-		return ps
-	})()
-	sinpsint := (func() []int {
-		ps := make([]int, len(sinps))
-		for i, v := range sinps {
-			ps[i] = int(100*v + 10)
-		}
-		return ps
-	})()
-
-	spark := ui.Sparkline{}
-	spark.Height = 8
-	spdata := sinpsint
-	spark.Data = spdata[:100]
-	spark.LineColor = ui.ColorCyan
-	spark.TitleColor = ui.ColorWhite
-
-	sp := ui.NewSparklines(spark)
-	sp.Height = 11
-	sp.BorderLabel = "Sparkline"
-
-	lc := ui.NewLineChart()
-	lc.BorderLabel = "braille-mode Line Chart"
-	lc.Data = sinps
-	lc.Height = 11
-	lc.AxesColor = ui.ColorWhite
-	lc.LineColor = ui.ColorYellow | ui.AttrBold
-
-	gs := make([]*ui.Gauge, 3)
-	for i := range gs {
-		gs[i] = ui.NewGauge()
-		//gs[i].LabelAlign = ui.AlignCenter
-		gs[i].Height = 2
-		gs[i].Border = false
-		gs[i].Percent = i * 10
-		gs[i].PaddingBottom = 1
-		gs[i].BarColor = ui.ColorRed
-	}
-
-	ls := ui.NewList()
-	ls.Border = false
-	ls.Items = []string{
-		"[1] Downloading File 1",
-		"", // == \newline
-		"[2] Downloading File 2",
-		"",
-		"[3] Uploading File 3",
-	}
-	ls.Height = 5
-
-	par := ui.NewPar("<> This row has 3 columns\n<- Widgets can be stacked up like left side\n<- Stacked widgets are treated as a single widget")
-	par.Height = 5
-	par.BorderLabel = "Demonstration"
-
-	// build layout
-	ui.Body.AddRows(
-		ui.NewRow(
-			ui.NewCol(6, 0, sp),
-			ui.NewCol(6, 0, lc)),
-		ui.NewRow(
-			ui.NewCol(3, 0, ls),
-			ui.NewCol(3, 0, gs[0], gs[1], gs[2]),
-			ui.NewCol(6, 0, par)))
-
-	// calculate layout
-	ui.Body.Align()
-
-	ui.Render(ui.Body)
-
-	ui.Handle("/sys/kbd/q", func(ui.Event) {
-		ui.StopLoop()
-	})
-	ui.Handle("/timer/1s", func(e ui.Event) {
-		t := e.Data.(ui.EvtTimer)
-		i := t.Count
-		if i > 103 {
-			ui.StopLoop()
-			return
-		}
-
-		for _, g := range gs {
-			g.Percent = (g.Percent + 3) % 100
-		}
-
-		sp.Lines[0].Data = spdata[:100+i]
-		lc.Data = sinps[2*i:]
-		ui.Render(ui.Body)
-	})
-
-	ui.Handle("/sys/wnd/resize", func(e ui.Event) {
-		ui.Body.Width = ui.TermWidth()
-		ui.Body.Align()
-		ui.Clear()
-		ui.Render(ui.Body)
-	})
-
-	ui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/linechart.go b/installer/vendor/github.com/gizak/termui/_example/linechart.go
deleted file mode 100644
index 7411403811..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/linechart.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"math"
-
-	"github.com/gizak/termui"
-)
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	sinps := (func() []float64 {
-		n := 220
-		ps := make([]float64, n)
-		for i := range ps {
-			ps[i] = 1 + math.Sin(float64(i)/5)
-		}
-		return ps
-	})()
-
-	lc0 := termui.NewLineChart()
-	lc0.BorderLabel = "braille-mode Line Chart"
-	lc0.Data = sinps
-	lc0.Width = 50
-	lc0.Height = 12
-	lc0.X = 0
-	lc0.Y = 0
-	lc0.AxesColor = termui.ColorWhite
-	lc0.LineColor = termui.ColorGreen | termui.AttrBold
-
-	lc1 := termui.NewLineChart()
-	lc1.BorderLabel = "dot-mode Line Chart"
-	lc1.Mode = "dot"
-	lc1.Data = sinps
-	lc1.Width = 26
-	lc1.Height = 12
-	lc1.X = 51
-	lc1.DotStyle = '+'
-	lc1.AxesColor = termui.ColorWhite
-	lc1.LineColor = termui.ColorYellow | termui.AttrBold
-
-	lc2 := termui.NewLineChart()
-	lc2.BorderLabel = "dot-mode Line Chart"
-	lc2.Mode = "dot"
-	lc2.Data = sinps[4:]
-	lc2.Width = 77
-	lc2.Height = 16
-	lc2.X = 0
-	lc2.Y = 12
-	lc2.AxesColor = termui.ColorWhite
-	lc2.LineColor = termui.ColorCyan | termui.AttrBold
-
-	termui.Render(lc0, lc1, lc2)
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/linechart.png b/installer/vendor/github.com/gizak/termui/_example/linechart.png
deleted file mode 100644
index 24f3c97f9d..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/linechart.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/list.go b/installer/vendor/github.com/gizak/termui/_example/list.go
deleted file mode 100644
index 375029d2a7..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/list.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	strs := []string{
-		"[0] github.com/gizak/termui",
-		"[1] [你好，世界](fg-blue)",
-		"[2] [こんにちは世界](fg-red)",
-		"[3] [color output](fg-white,bg-green)",
-		"[4] output.go",
-		"[5] random_out.go",
-		"[6] dashboard.go",
-		"[7] nsf/termbox-go"}
-
-	ls := termui.NewList()
-	ls.Items = strs
-	ls.ItemFgColor = termui.ColorYellow
-	ls.BorderLabel = "List"
-	ls.Height = 7
-	ls.Width = 25
-	ls.Y = 0
-
-	termui.Render(ls)
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/list.png b/installer/vendor/github.com/gizak/termui/_example/list.png
deleted file mode 100644
index 7c5e27c64b..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/list.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/mbarchart.go b/installer/vendor/github.com/gizak/termui/_example/mbarchart.go
deleted file mode 100644
index 074cccfab6..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/mbarchart.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	bc := termui.NewMBarChart()
-	math := []int{90, 85, 90, 80}
-	english := []int{70, 85, 75, 60}
-	science := []int{75, 60, 80, 85}
-	compsci := []int{100, 100, 100, 100}
-	bc.Data[0] = math
-	bc.Data[1] = english
-	bc.Data[2] = science
-	bc.Data[3] = compsci
-	studentsName := []string{"Ken", "Rob", "Dennis", "Linus"}
-	bc.BorderLabel = "Student's Marks X-Axis=Name Y-Axis=Marks[Math,English,Science,ComputerScience] in %"
-	bc.Width = 100
-	bc.Height = 30
-	bc.Y = 0
-	bc.BarWidth = 10
-	bc.DataLabels = studentsName
-	bc.ShowScale = true //Show y_axis scale value (min and max)
-	bc.SetMax(400)
-
-	bc.TextColor = termui.ColorGreen    //this is color for label (x-axis)
-	bc.BarColor[3] = termui.ColorGreen  //BarColor for computerscience
-	bc.BarColor[1] = termui.ColorYellow //Bar Color for english
-	bc.NumColor[3] = termui.ColorRed    // Num color for computerscience
-	bc.NumColor[1] = termui.ColorRed    // num color for english
-
-	//Other colors are automatically populated, btw All the students seems do well in computerscience. :p
-
-	termui.Render(bc)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/mbarchart.png b/installer/vendor/github.com/gizak/termui/_example/mbarchart.png
deleted file mode 100644
index e51337e6eb..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/mbarchart.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/par.go b/installer/vendor/github.com/gizak/termui/_example/par.go
deleted file mode 100644
index d340fe45d0..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/par.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	par0 := termui.NewPar("Borderless Text")
-	par0.Height = 1
-	par0.Width = 20
-	par0.Y = 1
-	par0.Border = false
-
-	par1 := termui.NewPar("你好，世界。")
-	par1.Height = 3
-	par1.Width = 17
-	par1.X = 20
-	par1.BorderLabel = "标签"
-
-	par2 := termui.NewPar("Simple colored text\nwith label. It [can be](fg-red) multilined with \\n or [break automatically](fg-red,fg-bold)")
-	par2.Height = 5
-	par2.Width = 37
-	par2.Y = 4
-	par2.BorderLabel = "Multiline"
-	par2.BorderFg = termui.ColorYellow
-
-	par3 := termui.NewPar("Long text with label and it is auto trimmed.")
-	par3.Height = 3
-	par3.Width = 37
-	par3.Y = 9
-	par3.BorderLabel = "Auto Trim"
-
-	termui.Render(par0, par1, par2, par3)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/par.png b/installer/vendor/github.com/gizak/termui/_example/par.png
deleted file mode 100644
index b71fa7ccfb..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/par.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/sparklines.go b/installer/vendor/github.com/gizak/termui/_example/sparklines.go
deleted file mode 100644
index ba4ef71d6e..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/sparklines.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	data := []int{4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6}
-	spl0 := termui.NewSparkline()
-	spl0.Data = data[3:]
-	spl0.Title = "Sparkline 0"
-	spl0.LineColor = termui.ColorGreen
-
-	// single
-	spls0 := termui.NewSparklines(spl0)
-	spls0.Height = 2
-	spls0.Width = 20
-	spls0.Border = false
-
-	spl1 := termui.NewSparkline()
-	spl1.Data = data
-	spl1.Title = "Sparkline 1"
-	spl1.LineColor = termui.ColorRed
-
-	spl2 := termui.NewSparkline()
-	spl2.Data = data[5:]
-	spl2.Title = "Sparkline 2"
-	spl2.LineColor = termui.ColorMagenta
-
-	// group
-	spls1 := termui.NewSparklines(spl0, spl1, spl2)
-	spls1.Height = 8
-	spls1.Width = 20
-	spls1.Y = 3
-	spls1.BorderLabel = "Group Sparklines"
-
-	spl3 := termui.NewSparkline()
-	spl3.Data = data
-	spl3.Title = "Enlarged Sparkline"
-	spl3.Height = 8
-	spl3.LineColor = termui.ColorYellow
-
-	spls2 := termui.NewSparklines(spl3)
-	spls2.Height = 11
-	spls2.Width = 30
-	spls2.BorderFg = termui.ColorCyan
-	spls2.X = 21
-	spls2.BorderLabel = "Tweeked Sparkline"
-
-	termui.Render(spls0, spls1, spls2)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/sparklines.png b/installer/vendor/github.com/gizak/termui/_example/sparklines.png
deleted file mode 100644
index dd5641b24f..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/sparklines.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/table.go b/installer/vendor/github.com/gizak/termui/_example/table.go
deleted file mode 100644
index fb4991bdaf..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/table.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package main
-
-import "github.com/gizak/termui"
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-	rows1 := [][]string{
-		[]string{"header1", "header2", "header3"},
-		[]string{"你好吗", "Go-lang is so cool", "Im working on Ruby"},
-		[]string{"2016", "10", "11"},
-	}
-
-	table1 := termui.NewTable()
-	table1.Rows = rows1
-	table1.FgColor = termui.ColorWhite
-	table1.BgColor = termui.ColorDefault
-	table1.Y = 0
-	table1.X = 0
-	table1.Width = 62
-	table1.Height = 7
-
-	termui.Render(table1)
-
-	rows2 := [][]string{
-		[]string{"header1", "header2", "header3"},
-		[]string{"Foundations", "Go-lang is so cool", "Im working on Ruby"},
-		[]string{"2016", "11", "11"},
-	}
-
-	table2 := termui.NewTable()
-	table2.Rows = rows2
-	table2.FgColor = termui.ColorWhite
-	table2.BgColor = termui.ColorDefault
-	table2.TextAlign = termui.AlignCenter
-	table2.Separator = false
-	table2.Analysis()
-	table2.SetSize()
-	table2.BgColors[2] = termui.ColorRed
-	table2.Y = 10
-	table2.X = 0
-	table2.Border = true
-
-	termui.Render(table2)
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-	termui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/table.png b/installer/vendor/github.com/gizak/termui/_example/table.png
deleted file mode 100644
index 5781b1d612..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/table.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/tabs.go b/installer/vendor/github.com/gizak/termui/_example/tabs.go
deleted file mode 100644
index 25be23947c..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/tabs.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"github.com/gizak/termui"
-	"github.com/gizak/termui/extra"
-)
-
-func main() {
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-
-	header := termui.NewPar("Press q to quit, Press j or k to switch tabs")
-	header.Height = 1
-	header.Width = 50
-	header.Border = false
-	header.TextBgColor = termui.ColorBlue
-
-	tab1 := extra.NewTab("pierwszy")
-	par2 := termui.NewPar("Press q to quit\nPress j or k to switch tabs\n")
-	par2.Height = 5
-	par2.Width = 37
-	par2.Y = 0
-	par2.BorderLabel = "Keys"
-	par2.BorderFg = termui.ColorYellow
-	tab1.AddBlocks(par2)
-
-	tab2 := extra.NewTab("drugi")
-	bc := termui.NewBarChart()
-	data := []int{3, 2, 5, 3, 9, 5, 3, 2, 5, 8, 3, 2, 4, 5, 3, 2, 5, 7, 5, 3, 2, 6, 7, 4, 6, 3, 6, 7, 8, 3, 6, 4, 5, 3, 2, 4, 6, 4, 8, 5, 9, 4, 3, 6, 5, 3, 6}
-	bclabels := []string{"S0", "S1", "S2", "S3", "S4", "S5"}
-	bc.BorderLabel = "Bar Chart"
-	bc.Data = data
-	bc.Width = 26
-	bc.Height = 10
-	bc.DataLabels = bclabels
-	bc.TextColor = termui.ColorGreen
-	bc.BarColor = termui.ColorRed
-	bc.NumColor = termui.ColorYellow
-	tab2.AddBlocks(bc)
-
-	tab3 := extra.NewTab("trzeci")
-	tab4 := extra.NewTab("żółw")
-	tab5 := extra.NewTab("four")
-	tab6 := extra.NewTab("five")
-
-	tabpane := extra.NewTabpane()
-	tabpane.Y = 1
-	tabpane.Width = 30
-	tabpane.Border = true
-
-	tabpane.SetTabs(*tab1, *tab2, *tab3, *tab4, *tab5, *tab6)
-
-	termui.Render(header, tabpane)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-
-	termui.Handle("/sys/kbd/j", func(termui.Event) {
-		tabpane.SetActiveLeft()
-		termui.Clear()
-		termui.Render(header, tabpane)
-	})
-
-	termui.Handle("/sys/kbd/k", func(termui.Event) {
-		tabpane.SetActiveRight()
-		termui.Clear()
-		termui.Render(header, tabpane)
-	})
-
-	termui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/theme.go b/installer/vendor/github.com/gizak/termui/_example/theme.go
deleted file mode 100644
index f77a6d72d1..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/theme.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import ui "github.com/gizak/termui"
-import "math"
-
-import "time"
-
-func main() {
-	err := ui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	ui.UseTheme("helloworld")
-
-	p := ui.NewPar(":PRESS q TO QUIT DEMO")
-	p.Height = 3
-	p.Width = 50
-	p.BorderLabel = "Text Box"
-
-	strs := []string{"[0] gizak/termui", "[1] editbox.go", "[2] interrupt.go", "[3] keyboard.go", "[4] output.go", "[5] random_out.go", "[6] dashboard.go", "[7] nsf/termbox-go"}
-	list := ui.NewList()
-	list.Items = strs
-	list.BorderLabel = "List"
-	list.Height = 7
-	list.Width = 25
-	list.Y = 4
-
-	g := ui.NewGauge()
-	g.Percent = 50
-	g.Width = 50
-	g.Height = 3
-	g.Y = 11
-	g.BorderLabel = "Gauge"
-
-	spark := ui.NewSparkline()
-	spark.Title = "srv 0:"
-	spdata := []int{4, 2, 1, 6, 3, 9, 1, 4, 2, 15, 14, 9, 8, 6, 10, 13, 15, 12, 10, 5, 3, 6, 1, 7, 10, 10, 14, 13, 6}
-	spark.Data = spdata
-
-	spark1 := ui.NewSparkline()
-	spark1.Title = "srv 1:"
-	spark1.Data = spdata
-
-	sp := ui.NewSparklines(spark, spark1)
-	sp.Width = 25
-	sp.Height = 7
-	sp.BorderLabel = "Sparkline"
-	sp.Y = 4
-	sp.X = 25
-
-	lc := ui.NewLineChart()
-	sinps := (func() []float64 {
-		n := 100
-		ps := make([]float64, n)
-		for i := range ps {
-			ps[i] = 1 + math.Sin(float64(i)/4)
-		}
-		return ps
-	})()
-
-	lc.BorderLabel = "Line Chart"
-	lc.Data = sinps
-	lc.Width = 50
-	lc.Height = 11
-	lc.X = 0
-	lc.Y = 14
-	lc.Mode = "dot"
-
-	bc := ui.NewBarChart()
-	bcdata := []int{3, 2, 5, 3, 9, 5, 3, 2, 5, 8, 3, 2, 4, 5, 3, 2, 5, 7, 5, 3, 2, 6, 7, 4, 6, 3, 6, 7, 8, 3, 6, 4, 5, 3, 2, 4, 6, 4, 8, 5, 9, 4, 3, 6, 5, 3, 6}
-	bclabels := []string{"S0", "S1", "S2", "S3", "S4", "S5"}
-	bc.BorderLabel = "Bar Chart"
-	bc.Width = 26
-	bc.Height = 10
-	bc.X = 51
-	bc.Y = 0
-	bc.DataLabels = bclabels
-
-	lc1 := ui.NewLineChart()
-	lc1.BorderLabel = "Line Chart"
-	rndwalk := (func() []float64 {
-		n := 150
-		d := make([]float64, n)
-		for i := 1; i < n; i++ {
-			if i < 20 {
-				d[i] = d[i-1] + 0.01
-			}
-			if i > 20 {
-				d[i] = d[i-1] - 0.05
-			}
-		}
-		return d
-	})()
-	lc1.Data = rndwalk
-	lc1.Width = 26
-	lc1.Height = 11
-	lc1.X = 51
-	lc1.Y = 14
-
-	p1 := ui.NewPar("Hey!\nI am a borderless block!")
-	p1.HasBorder = false
-	p1.Width = 26
-	p1.Height = 2
-	p1.X = 52
-	p1.Y = 11
-
-	draw := func(t int) {
-		g.Percent = t % 101
-		list.Items = strs[t%9:]
-		sp.Lines[0].Data = spdata[t%10:]
-		sp.Lines[1].Data = spdata[t/2%10:]
-		lc.Data = sinps[t/2:]
-		lc1.Data = rndwalk[t:]
-		bc.Data = bcdata[t/2%10:]
-		ui.Render(p, list, g, sp, lc, bc, lc1, p1)
-	}
-
-	evt := ui.EventCh()
-	i := 0
-	for {
-		select {
-		case e := <-evt:
-			if e.Type == ui.EventKey && e.Ch == 'q' {
-				return
-			}
-		default:
-			draw(i)
-			i++
-			if i == 102 {
-				return
-			}
-			time.Sleep(time.Second / 2)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/themedefault.png b/installer/vendor/github.com/gizak/termui/_example/themedefault.png
deleted file mode 100644
index 23b574f966..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/themedefault.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/themehelloworld.png b/installer/vendor/github.com/gizak/termui/_example/themehelloworld.png
deleted file mode 100644
index eaf4d9303b..0000000000
Binary files a/installer/vendor/github.com/gizak/termui/_example/themehelloworld.png and /dev/null differ
diff --git a/installer/vendor/github.com/gizak/termui/_example/ttop.go b/installer/vendor/github.com/gizak/termui/_example/ttop.go
deleted file mode 100644
index f5c32fe686..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/ttop.go
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"regexp"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-
-	"github.com/gizak/termui"
-	"github.com/gizak/termui/extra"
-)
-
-const statFilePath = "/proc/stat"
-const meminfoFilePath = "/proc/meminfo"
-
-type CpuStat struct {
-	user   float32
-	nice   float32
-	system float32
-	idle   float32
-}
-
-type CpusStats struct {
-	stat map[string]CpuStat
-	proc map[string]CpuStat
-}
-
-func NewCpusStats(s map[string]CpuStat) *CpusStats {
-	return &CpusStats{stat: s, proc: make(map[string]CpuStat)}
-}
-
-func (cs *CpusStats) String() (ret string) {
-	for key, _ := range cs.proc {
-		ret += fmt.Sprintf("%s: %.2f %.2f %.2f %.2f\n", key, cs.proc[key].user, cs.proc[key].nice, cs.proc[key].system, cs.proc[key].idle)
-	}
-	return
-}
-
-func subCpuStat(m CpuStat, s CpuStat) CpuStat {
-	return CpuStat{user: m.user - s.user,
-		nice:   m.nice - s.nice,
-		system: m.system - s.system,
-		idle:   m.idle - s.idle}
-}
-
-func procCpuStat(c CpuStat) CpuStat {
-	sum := c.user + c.nice + c.system + c.idle
-	return CpuStat{user: c.user / sum * 100,
-		nice:   c.nice / sum * 100,
-		system: c.system / sum * 100,
-		idle:   c.idle / sum * 100}
-}
-
-func (cs *CpusStats) tick(ns map[string]CpuStat) {
-	for key, _ := range cs.stat {
-		proc := subCpuStat(ns[key], cs.stat[key])
-		cs.proc[key] = procCpuStat(proc)
-		cs.stat[key] = ns[key]
-	}
-}
-
-type errIntParser struct {
-	err error
-}
-
-func (eip *errIntParser) parse(s string) (ret int64) {
-	if eip.err != nil {
-		return 0
-	}
-	ret, eip.err = strconv.ParseInt(s, 10, 0)
-	return
-}
-
-type LineProcessor interface {
-	process(string) error
-	finalize() interface{}
-}
-
-type CpuLineProcessor struct {
-	m map[string]CpuStat
-}
-
-func (clp *CpuLineProcessor) process(line string) (err error) {
-	r := regexp.MustCompile("^cpu([0-9]*)")
-
-	if r.MatchString(line) {
-		tab := strings.Fields(line)
-		if len(tab) < 5 {
-			err = errors.New("cpu info line has not enough fields")
-			return
-		}
-		parser := errIntParser{}
-		cs := CpuStat{user: float32(parser.parse(tab[1])),
-			nice:   float32(parser.parse(tab[2])),
-			system: float32(parser.parse(tab[3])),
-			idle:   float32(parser.parse(tab[4]))}
-		clp.m[tab[0]] = cs
-		err = parser.err
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-func (clp *CpuLineProcessor) finalize() interface{} {
-	return clp.m
-}
-
-type MemStat struct {
-	total int64
-	free  int64
-}
-
-func (ms MemStat) String() (ret string) {
-	ret = fmt.Sprintf("TotalMem: %d, FreeMem: %d\n", ms.total, ms.free)
-	return
-}
-
-func (ms *MemStat) process(line string) (err error) {
-	rtotal := regexp.MustCompile("^MemTotal:")
-	rfree := regexp.MustCompile("^MemFree:")
-	var aux int64
-	if rtotal.MatchString(line) || rfree.MatchString(line) {
-		tab := strings.Fields(line)
-		if len(tab) < 3 {
-			err = errors.New("mem info line has not enough fields")
-			return
-		}
-		aux, err = strconv.ParseInt(tab[1], 10, 0)
-	}
-	if err != nil {
-		return
-	}
-
-	if rtotal.MatchString(line) {
-		ms.total = aux
-	}
-	if rfree.MatchString(line) {
-		ms.free = aux
-	}
-	return
-}
-
-func (ms *MemStat) finalize() interface{} {
-	return *ms
-}
-
-func processFileLines(filePath string, lp LineProcessor) (ret interface{}, err error) {
-	var statFile *os.File
-	statFile, err = os.Open(filePath)
-	if err != nil {
-		fmt.Printf("open: %v\n", err)
-	}
-	defer statFile.Close()
-
-	statFileReader := bufio.NewReader(statFile)
-
-	for {
-		var line string
-		line, err = statFileReader.ReadString('\n')
-		if err == io.EOF {
-			err = nil
-			break
-		}
-		if err != nil {
-			fmt.Printf("open: %v\n", err)
-			break
-		}
-		line = strings.TrimSpace(line)
-
-		err = lp.process(line)
-	}
-
-	ret = lp.finalize()
-	return
-}
-
-func getCpusStatsMap() (m map[string]CpuStat, err error) {
-	var aux interface{}
-	aux, err = processFileLines(statFilePath, &CpuLineProcessor{m: make(map[string]CpuStat)})
-	return aux.(map[string]CpuStat), err
-}
-
-func getMemStats() (ms MemStat, err error) {
-	var aux interface{}
-	aux, err = processFileLines(meminfoFilePath, &MemStat{})
-	return aux.(MemStat), err
-}
-
-type CpuTabElems struct {
-	GMap   map[string]*termui.Gauge
-	LChart *termui.LineChart
-}
-
-func NewCpuTabElems(width int) *CpuTabElems {
-	lc := termui.NewLineChart()
-	lc.Width = width
-	lc.Height = 12
-	lc.X = 0
-	lc.Mode = "dot"
-	lc.BorderLabel = "CPU"
-	return &CpuTabElems{GMap: make(map[string]*termui.Gauge),
-		LChart: lc}
-}
-
-func (cte *CpuTabElems) AddGauge(key string, Y int, width int) *termui.Gauge {
-	cte.GMap[key] = termui.NewGauge()
-	cte.GMap[key].Width = width
-	cte.GMap[key].Height = 3
-	cte.GMap[key].Y = Y
-	cte.GMap[key].BorderLabel = key
-	cte.GMap[key].Percent = 0 //int(val.user + val.nice + val.system)
-	return cte.GMap[key]
-}
-
-func (cte *CpuTabElems) Update(cs CpusStats) {
-	for key, val := range cs.proc {
-		p := int(val.user + val.nice + val.system)
-		cte.GMap[key].Percent = p
-		if key == "cpu" {
-			cte.LChart.Data = append(cte.LChart.Data, 0)
-			copy(cte.LChart.Data[1:], cte.LChart.Data[0:])
-			cte.LChart.Data[0] = float64(p)
-		}
-	}
-}
-
-type MemTabElems struct {
-	Gauge  *termui.Gauge
-	SLines *termui.Sparklines
-}
-
-func NewMemTabElems(width int) *MemTabElems {
-	g := termui.NewGauge()
-	g.Width = width
-	g.Height = 3
-	g.Y = 0
-
-	sline := termui.NewSparkline()
-	sline.Title = "MEM"
-	sline.Height = 8
-
-	sls := termui.NewSparklines(sline)
-	sls.Width = width
-	sls.Height = 12
-	sls.Y = 3
-	return &MemTabElems{Gauge: g, SLines: sls}
-}
-
-func (mte *MemTabElems) Update(ms MemStat) {
-	used := int((ms.total - ms.free) * 100 / ms.total)
-	mte.Gauge.Percent = used
-	mte.SLines.Lines[0].Data = append(mte.SLines.Lines[0].Data, 0)
-	copy(mte.SLines.Lines[0].Data[1:], mte.SLines.Lines[0].Data[0:])
-	mte.SLines.Lines[0].Data[0] = used
-	if len(mte.SLines.Lines[0].Data) > mte.SLines.Width-2 {
-		mte.SLines.Lines[0].Data = mte.SLines.Lines[0].Data[0 : mte.SLines.Width-2]
-	}
-}
-
-func main() {
-	if runtime.GOOS != "linux" {
-		panic("Currently works only on Linux")
-	}
-	err := termui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	termWidth := 70
-
-	//termui.UseTheme("helloworld")
-
-	header := termui.NewPar("Press q to quit, Press j or k to switch tabs")
-	header.Height = 1
-	header.Width = 50
-	header.Border = false
-	header.TextBgColor = termui.ColorBlue
-
-	tabCpu := extra.NewTab("CPU")
-	tabMem := extra.NewTab("MEM")
-
-	tabpane := extra.NewTabpane()
-	tabpane.Y = 1
-	tabpane.Width = 30
-	tabpane.Border = false
-
-	cs, errcs := getCpusStatsMap()
-	cpusStats := NewCpusStats(cs)
-
-	if errcs != nil {
-		panic("error")
-	}
-
-	cpuTabElems := NewCpuTabElems(termWidth)
-
-	Y := 0
-	cpuKeys := make([]string, 0, len(cs))
-	for key := range cs {
-		cpuKeys = append(cpuKeys, key)
-	}
-	sort.Strings(cpuKeys)
-	for _, key := range cpuKeys {
-		g := cpuTabElems.AddGauge(key, Y, termWidth)
-		Y += 3
-		tabCpu.AddBlocks(g)
-	}
-	cpuTabElems.LChart.Y = Y
-	tabCpu.AddBlocks(cpuTabElems.LChart)
-
-	memTabElems := NewMemTabElems(termWidth)
-	ms, errm := getMemStats()
-	if errm != nil {
-		panic(errm)
-	}
-	memTabElems.Update(ms)
-	tabMem.AddBlocks(memTabElems.Gauge)
-	tabMem.AddBlocks(memTabElems.SLines)
-
-	tabpane.SetTabs(*tabCpu, *tabMem)
-
-	termui.Render(header, tabpane)
-
-	termui.Handle("/sys/kbd/q", func(termui.Event) {
-		termui.StopLoop()
-	})
-
-	termui.Handle("/sys/kbd/j", func(termui.Event) {
-		tabpane.SetActiveLeft()
-		termui.Render(header, tabpane)
-	})
-
-	termui.Handle("/sys/kbd/k", func(termui.Event) {
-		tabpane.SetActiveRight()
-		termui.Render(header, tabpane)
-	})
-
-	termui.Handle("/timer/1s", func(e termui.Event) {
-		cs, errcs := getCpusStatsMap()
-		if errcs != nil {
-			panic(errcs)
-		}
-		cpusStats.tick(cs)
-		cpuTabElems.Update(*cpusStats)
-
-		ms, errm := getMemStats()
-		if errm != nil {
-			panic(errm)
-		}
-		memTabElems.Update(ms)
-		termui.Render(header, tabpane)
-	})
-
-	termui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/_example/wrappar.go b/installer/vendor/github.com/gizak/termui/_example/wrappar.go
deleted file mode 100644
index 07e842d0e9..0000000000
--- a/installer/vendor/github.com/gizak/termui/_example/wrappar.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package main
-
-import ui "github.com/gizak/termui"
-
-func main() {
-
-	err := ui.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer ui.Close()
-
-	p := ui.NewPar("Press q to QUIT THE DEMO. [There](fg-blue) are other things [that](fg-red) are going to fit in here I think. What do you think? Now is the time for all good [men to](bg-blue) come to the aid of their country. [This is going to be one really really really long line](fg-green) that is going to go together and stuffs and things. Let's see how this thing renders out.\n    Here is a new paragraph and stuffs and things. There should be a tab indent at the beginning of the paragraph. Let's see if that worked as well.")
-	p.WrapLength = 48 // this should be at least p.Width - 2
-	p.Height = 20
-	p.Width = 50
-	p.Y = 2
-	p.X = 20
-	p.TextFgColor = ui.ColorWhite
-	p.BorderLabel = "Text Box with Wrapping"
-	p.BorderFg = ui.ColorCyan
-	//p.Border = false
-
-	ui.Render(p)
-
-	ui.Handle("/sys/kbd/q", func(ui.Event) {
-		ui.StopLoop()
-	})
-
-	ui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/block_test.go b/installer/vendor/github.com/gizak/termui/block_test.go
deleted file mode 100644
index 81941790f3..0000000000
--- a/installer/vendor/github.com/gizak/termui/block_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import (
-	"testing"
-)
-
-func TestBlockFloat(t *testing.T) {
-	Init()
-	defer Close()
-
-	b := NewBlock()
-	b.X = 10
-	b.Y = 20
-
-	b.Float = AlignCenter
-	b.Align()
-}
-
-func TestBlockInnerBounds(t *testing.T) {
-	Init()
-	defer Close()
-
-	b := NewBlock()
-	b.X = 10
-	b.Y = 11
-	b.Width = 12
-	b.Height = 13
-
-	assert := func(name string, x, y, w, h int) {
-		t.Log(name)
-		area := b.InnerBounds()
-		cx := area.Min.X
-		cy := area.Min.Y
-		cw := area.Dx()
-		ch := area.Dy()
-
-		if cx != x {
-			t.Errorf("expected x to be %d but got %d", x, cx)
-		}
-		if cy != y {
-			t.Errorf("expected y to be %d but got %d\n%+v", y, cy, area)
-		}
-		if cw != w {
-			t.Errorf("expected width to be %d but got %d", w, cw)
-		}
-		if ch != h {
-			t.Errorf("expected height to be %d but got %d", h, ch)
-		}
-	}
-
-	b.Border = false
-	assert("no border, no padding", 10, 11, 12, 13)
-
-	b.Border = true
-	assert("border, no padding", 11, 12, 10, 11)
-
-	b.PaddingBottom = 2
-	assert("border, 2b padding", 11, 12, 10, 9)
-
-	b.PaddingTop = 3
-	assert("border, 2b 3t padding", 11, 15, 10, 6)
-
-	b.PaddingLeft = 4
-	assert("border, 2b 3t 4l padding", 15, 15, 6, 6)
-
-	b.PaddingRight = 5
-	assert("border, 2b 3t 4l 5r padding", 15, 15, 1, 6)
-}
diff --git a/installer/vendor/github.com/gizak/termui/buffer_test.go b/installer/vendor/github.com/gizak/termui/buffer_test.go
deleted file mode 100644
index aae9d08a0b..0000000000
--- a/installer/vendor/github.com/gizak/termui/buffer_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import (
-	"image"
-	"testing"
-)
-
-func TestBufferUnion(t *testing.T) {
-	b0 := NewBuffer()
-	b1 := NewBuffer()
-
-	b1.Area.Max.X = 100
-	b1.Area.Max.Y = 100
-	b0.Area.Max.X = 50
-	b0.Merge(b1)
-	if b0.Area.Max.X != 100 {
-		t.Errorf("Buffer.Merge unions Area failed: should:%v, actual %v,%v", image.Rect(0, 0, 50, 0).Union(image.Rect(0, 0, 100, 100)), b1.Area, b0.Area)
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/canvas_test.go b/installer/vendor/github.com/gizak/termui/canvas_test.go
deleted file mode 100644
index f73ce48b03..0000000000
--- a/installer/vendor/github.com/gizak/termui/canvas_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-// +build ignore
-
-package termui
-
-import (
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-func TestCanvasSet(t *testing.T) {
-	c := NewCanvas()
-	c.Set(0, 0)
-	c.Set(0, 1)
-	c.Set(0, 2)
-	c.Set(0, 3)
-	c.Set(1, 3)
-	c.Set(2, 3)
-	c.Set(3, 3)
-	c.Set(4, 3)
-	c.Set(5, 3)
-	spew.Dump(c)
-}
-
-func TestCanvasUnset(t *testing.T) {
-	c := NewCanvas()
-	c.Set(0, 0)
-	c.Set(0, 1)
-	c.Set(0, 2)
-	c.Unset(0, 2)
-	spew.Dump(c)
-	c.Unset(0, 3)
-	spew.Dump(c)
-}
-
-func TestCanvasBuffer(t *testing.T) {
-	c := NewCanvas()
-	c.Set(0, 0)
-	c.Set(0, 1)
-	c.Set(0, 2)
-	c.Set(0, 3)
-	c.Set(1, 3)
-	c.Set(2, 3)
-	c.Set(3, 3)
-	c.Set(4, 3)
-	c.Set(5, 3)
-	c.Set(6, 3)
-	c.Set(7, 2)
-	c.Set(8, 1)
-	c.Set(9, 0)
-	bufs := c.Buffer()
-	spew.Dump(bufs)
-}
diff --git a/installer/vendor/github.com/gizak/termui/config.py b/installer/vendor/github.com/gizak/termui/config.py
deleted file mode 100644
index 30fadcf868..0000000000
--- a/installer/vendor/github.com/gizak/termui/config.py
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env python3
-
-import re
-import os
-import io
-
-copyright = """// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-"""
-
-exclude_dirs = [".git", "_docs"]
-exclude_files = []
-include_dirs = [".", "debug", "extra", "test", "_example"]
-
-
-def is_target(fpath):
-    if os.path.splitext(fpath)[-1] == ".go":
-        return True
-    return False
-
-
-def update_copyright(fpath):
-    print("processing " + fpath)
-    f = io.open(fpath, 'r', encoding='utf-8')
-    fstr = f.read()
-    f.close()
-
-    # remove old
-    m = re.search('^// Copyright .+?\r?\n\r?\n', fstr, re.MULTILINE|re.DOTALL)
-    if m:
-        fstr = fstr[m.end():]
-
-    # add new
-    fstr = copyright + fstr
-    f = io.open(fpath, 'w',encoding='utf-8')
-    f.write(fstr)
-    f.close()
-
-
-def main():
-    for d in include_dirs:
-        files = [
-            os.path.join(d, f) for f in os.listdir(d)
-            if os.path.isfile(os.path.join(d, f))
-        ]
-        for f in files:
-            if is_target(f):
-                update_copyright(f)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/installer/vendor/github.com/gizak/termui/debug/debuger.go b/installer/vendor/github.com/gizak/termui/debug/debuger.go
deleted file mode 100644
index e239ef52e6..0000000000
--- a/installer/vendor/github.com/gizak/termui/debug/debuger.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package debug
-
-import (
-	"fmt"
-	"net/http"
-
-	"golang.org/x/net/websocket"
-)
-
-type Server struct {
-	Port string
-	Addr string
-	Path string
-	Msg  chan string
-	chs  []chan string
-}
-
-type Client struct {
-	Port string
-	Addr string
-	Path string
-	ws   *websocket.Conn
-}
-
-var defaultPort = ":8080"
-
-func NewServer() *Server {
-	return &Server{
-		Port: defaultPort,
-		Addr: "localhost",
-		Path: "/echo",
-		Msg:  make(chan string),
-		chs:  make([]chan string, 0),
-	}
-}
-
-func NewClient() Client {
-	return Client{
-		Port: defaultPort,
-		Addr: "localhost",
-		Path: "/echo",
-	}
-}
-
-func (c Client) ConnectAndListen() error {
-	ws, err := websocket.Dial("ws://"+c.Addr+c.Port+c.Path, "", "http://"+c.Addr)
-	if err != nil {
-		return err
-	}
-	defer ws.Close()
-
-	var m string
-	for {
-		err := websocket.Message.Receive(ws, &m)
-		if err != nil {
-			fmt.Print(err)
-			return err
-		}
-		fmt.Print(m)
-	}
-}
-
-func (s *Server) ListenAndServe() error {
-	http.Handle(s.Path, websocket.Handler(func(ws *websocket.Conn) {
-		defer ws.Close()
-
-		mc := make(chan string)
-		s.chs = append(s.chs, mc)
-
-		for m := range mc {
-			websocket.Message.Send(ws, m)
-		}
-	}))
-
-	go func() {
-		for msg := range s.Msg {
-			for _, c := range s.chs {
-				go func(a chan string) {
-					a <- msg
-				}(c)
-			}
-		}
-	}()
-
-	return http.ListenAndServe(s.Port, nil)
-}
-
-func (s *Server) Log(msg string) {
-	go func() { s.Msg <- msg }()
-}
-
-func (s *Server) Logf(format string, a ...interface{}) {
-	s.Log(fmt.Sprintf(format, a...))
-}
-
-var DefaultServer = NewServer()
-var DefaultClient = NewClient()
-
-func ListenAndServe() error {
-	return DefaultServer.ListenAndServe()
-}
-
-func ConnectAndListen() error {
-	return DefaultClient.ConnectAndListen()
-}
-
-func Log(msg string) {
-	DefaultServer.Log(msg)
-}
-
-func Logf(format string, a ...interface{}) {
-	DefaultServer.Logf(format, a...)
-}
diff --git a/installer/vendor/github.com/gizak/termui/events.go b/installer/vendor/github.com/gizak/termui/events.go
index 16d9bd9cc3..eb7319be4d 100644
--- a/installer/vendor/github.com/gizak/termui/events.go
+++ b/installer/vendor/github.com/gizak/termui/events.go
@@ -221,7 +221,6 @@ func findMatch(mux map[string]func(Event), path string) string {
 	return pattern
 
 }
-
 // Remove all existing defined Handlers from the map
 func (es *EvtStream) ResetHandlers() {
 	for Path, _ := range es.Handlers {
@@ -310,7 +309,7 @@ func NewTimerCh(du time.Duration) chan Event {
 	return t
 }
 
-var DefaultHandler = func(e Event) {
+var DefualtHandler = func(e Event) {
 }
 
 var usrEvtCh = make(chan Event)
diff --git a/installer/vendor/github.com/gizak/termui/events_test.go b/installer/vendor/github.com/gizak/termui/events_test.go
deleted file mode 100644
index 4e369e543a..0000000000
--- a/installer/vendor/github.com/gizak/termui/events_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import "testing"
-
-var ps = []string{
-	"",
-	"/",
-	"/a",
-	"/b",
-	"/a/c",
-	"/a/b",
-	"/a/b/c",
-	"/a/b/c/d",
-	"/a/b/c/d/"}
-
-func TestMatchScore(t *testing.T) {
-	chk := func(a, b string, s bool) {
-		if c := isPathMatch(a, b); c != s {
-			t.Errorf("\na:%s\nb:%s\nshould:%t\nactual:%t", a, b, s, c)
-		}
-	}
-
-	chk(ps[1], ps[1], true)
-	chk(ps[1], ps[2], true)
-	chk(ps[2], ps[1], false)
-	chk(ps[4], ps[1], false)
-	chk(ps[6], ps[2], false)
-	chk(ps[4], ps[5], false)
-}
-
-func TestCrtEvt(t *testing.T) {
-
-}
diff --git a/installer/vendor/github.com/gizak/termui/extra/tabpane.go b/installer/vendor/github.com/gizak/termui/extra/tabpane.go
deleted file mode 100644
index 879bb3bdf6..0000000000
--- a/installer/vendor/github.com/gizak/termui/extra/tabpane.go
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package extra
-
-import (
-	"unicode/utf8"
-
-	. "github.com/gizak/termui"
-)
-
-type Tab struct {
-	Label   string
-	RuneLen int
-	Blocks  []Bufferer
-}
-
-func NewTab(label string) *Tab {
-	return &Tab{
-		Label:   label,
-		RuneLen: utf8.RuneCount([]byte(label))}
-}
-
-func (tab *Tab) AddBlocks(rs ...Bufferer) {
-	for _, r := range rs {
-		tab.Blocks = append(tab.Blocks, r)
-	}
-}
-
-func (tab *Tab) Buffer() Buffer {
-	buf := NewBuffer()
-	for blockNum := 0; blockNum < len(tab.Blocks); blockNum++ {
-		b := tab.Blocks[blockNum]
-		buf.Merge(b.Buffer())
-	}
-	return buf
-}
-
-type Tabpane struct {
-	Block
-	Tabs           []Tab
-	activeTabIndex int
-	ActiveTabBg    Attribute
-	posTabText     []int
-	offTabText     int
-}
-
-func NewTabpane() *Tabpane {
-	tp := Tabpane{
-		Block:          *NewBlock(),
-		activeTabIndex: 0,
-		offTabText:     0,
-		ActiveTabBg:    ThemeAttr("bg.tab.active")}
-	return &tp
-}
-
-func (tp *Tabpane) SetTabs(tabs ...Tab) {
-	tp.Tabs = make([]Tab, len(tabs))
-	tp.posTabText = make([]int, len(tabs)+1)
-	off := 0
-	for i := 0; i < len(tp.Tabs); i++ {
-		tp.Tabs[i] = tabs[i]
-		tp.posTabText[i] = off
-		off += tp.Tabs[i].RuneLen + 1 //+1 for space between tabs
-	}
-	tp.posTabText[len(tabs)] = off - 1 //total length of Tab's text
-}
-
-func (tp *Tabpane) SetActiveLeft() {
-	if tp.activeTabIndex == 0 {
-		return
-	}
-	tp.activeTabIndex -= 1
-	if tp.posTabText[tp.activeTabIndex] < tp.offTabText {
-		tp.offTabText = tp.posTabText[tp.activeTabIndex]
-	}
-}
-
-func (tp *Tabpane) SetActiveRight() {
-	if tp.activeTabIndex == len(tp.Tabs)-1 {
-		return
-	}
-	tp.activeTabIndex += 1
-	endOffset := tp.posTabText[tp.activeTabIndex] + tp.Tabs[tp.activeTabIndex].RuneLen
-	if endOffset+tp.offTabText > tp.InnerWidth() {
-		tp.offTabText = endOffset - tp.InnerWidth()
-	}
-}
-
-// Checks if left and right tabs are fully visible
-// if only left tabs are not visible return -1
-// if only right tabs are not visible return 1
-// if both return 0
-// use only if fitsWidth() returns false
-func (tp *Tabpane) checkAlignment() int {
-	ret := 0
-	if tp.offTabText > 0 {
-		ret = -1
-	}
-	if tp.offTabText+tp.InnerWidth() < tp.posTabText[len(tp.Tabs)] {
-		ret += 1
-	}
-	return ret
-}
-
-// Checks if all tabs fits innerWidth of Tabpane
-func (tp *Tabpane) fitsWidth() bool {
-	return tp.InnerWidth() >= tp.posTabText[len(tp.Tabs)]
-}
-
-func (tp *Tabpane) align() {
-	if !tp.fitsWidth() && !tp.Border {
-		tp.PaddingLeft += 1
-		tp.PaddingRight += 1
-		tp.Block.Align()
-	}
-}
-
-// bridge the old Point stuct
-type point struct {
-	X  int
-	Y  int
-	Ch rune
-	Fg Attribute
-	Bg Attribute
-}
-
-func buf2pt(b Buffer) []point {
-	ps := make([]point, 0, len(b.CellMap))
-	for k, c := range b.CellMap {
-		ps = append(ps, point{X: k.X, Y: k.Y, Ch: c.Ch, Fg: c.Fg, Bg: c.Bg})
-	}
-
-	return ps
-}
-
-// Adds the point only if it is visible in Tabpane.
-// Point can be invisible if concatenation of Tab's texts is widther then
-// innerWidth of Tabpane
-func (tp *Tabpane) addPoint(ptab []point, charOffset *int, oftX *int, points ...point) []point {
-	if *charOffset < tp.offTabText || tp.offTabText+tp.InnerWidth() < *charOffset {
-		*charOffset++
-		return ptab
-	}
-	for _, p := range points {
-		p.X = *oftX
-		ptab = append(ptab, p)
-	}
-	*oftX++
-	*charOffset++
-	return ptab
-}
-
-// Draws the point and redraws upper and lower border points (if it has one)
-func (tp *Tabpane) drawPointWithBorder(p point, ch rune, chbord rune, chdown rune, chup rune) []point {
-	var addp []point
-	p.Ch = ch
-	if tp.Border {
-		p.Ch = chdown
-		p.Y = tp.InnerY() - 1
-		addp = append(addp, p)
-		p.Ch = chup
-		p.Y = tp.InnerY() + 1
-		addp = append(addp, p)
-		p.Ch = chbord
-	}
-	p.Y = tp.InnerY()
-	return append(addp, p)
-}
-
-func (tp *Tabpane) Buffer() Buffer {
-	if tp.Border {
-		tp.Height = 3
-	} else {
-		tp.Height = 1
-	}
-	if tp.Width > tp.posTabText[len(tp.Tabs)]+2 {
-		tp.Width = tp.posTabText[len(tp.Tabs)] + 2
-	}
-	buf := tp.Block.Buffer()
-	ps := []point{}
-
-	tp.align()
-	if tp.InnerHeight() <= 0 || tp.InnerWidth() <= 0 {
-		return NewBuffer()
-	}
-	oftX := tp.InnerX()
-	charOffset := 0
-	pt := point{Bg: tp.BorderBg, Fg: tp.BorderFg}
-	for i, tab := range tp.Tabs {
-
-		if i != 0 {
-			pt.X = oftX
-			pt.Y = tp.InnerY()
-			addp := tp.drawPointWithBorder(pt, ' ', VERTICAL_LINE, HORIZONTAL_DOWN, HORIZONTAL_UP)
-			ps = tp.addPoint(ps, &charOffset, &oftX, addp...)
-		}
-
-		if i == tp.activeTabIndex {
-			pt.Bg = tp.ActiveTabBg
-		}
-		rs := []rune(tab.Label)
-		for k := 0; k < len(rs); k++ {
-
-			addp := make([]point, 0, 2)
-			if i == tp.activeTabIndex && tp.Border {
-				pt.Ch = ' '
-				pt.Y = tp.InnerY() + 1
-				pt.Bg = tp.BorderBg
-				addp = append(addp, pt)
-				pt.Bg = tp.ActiveTabBg
-			}
-
-			pt.Y = tp.InnerY()
-			pt.Ch = rs[k]
-
-			addp = append(addp, pt)
-			ps = tp.addPoint(ps, &charOffset, &oftX, addp...)
-		}
-		pt.Bg = tp.BorderBg
-
-		if !tp.fitsWidth() {
-			all := tp.checkAlignment()
-			pt.X = tp.InnerX() - 1
-
-			pt.Ch = '*'
-			if tp.Border {
-				pt.Ch = VERTICAL_LINE
-			}
-			ps = append(ps, pt)
-
-			if all <= 0 {
-				addp := tp.drawPointWithBorder(pt, '<', '«', HORIZONTAL_LINE, HORIZONTAL_LINE)
-				ps = append(ps, addp...)
-			}
-
-			pt.X = tp.InnerX() + tp.InnerWidth()
-			pt.Ch = '*'
-			if tp.Border {
-				pt.Ch = VERTICAL_LINE
-			}
-			ps = append(ps, pt)
-			if all >= 0 {
-				addp := tp.drawPointWithBorder(pt, '>', '»', HORIZONTAL_LINE, HORIZONTAL_LINE)
-				ps = append(ps, addp...)
-			}
-		}
-
-		//draw tab content below the Tabpane
-		if i == tp.activeTabIndex {
-			blockPoints := buf2pt(tab.Buffer())
-			for i := 0; i < len(blockPoints); i++ {
-				blockPoints[i].Y += tp.Height + tp.Y
-			}
-			ps = append(ps, blockPoints...)
-		}
-	}
-
-	for _, v := range ps {
-		buf.Set(v.X, v.Y, NewCell(v.Ch, v.Fg, v.Bg))
-	}
-	buf.Sync()
-	return buf
-}
diff --git a/installer/vendor/github.com/gizak/termui/glide.lock b/installer/vendor/github.com/gizak/termui/glide.lock
deleted file mode 100644
index be5952d466..0000000000
--- a/installer/vendor/github.com/gizak/termui/glide.lock
+++ /dev/null
@@ -1,30 +0,0 @@
-hash: 7a754ba100256404a978b2fc8738aee337beb822458e4b6060399fb89ebd215c
-updated: 2016-11-03T17:39:24.323773674-04:00
-imports:
-- name: github.com/maruel/panicparse
-  version: ad661195ed0e88491e0f14be6613304e3b1141d6
-  subpackages:
-  - stack
-- name: github.com/mattn/go-runewidth
-  version: 737072b4e32b7a5018b4a7125da8d12de90e8045
-- name: github.com/mitchellh/go-wordwrap
-  version: ad45545899c7b13c020ea92b2072220eefad42b8
-- name: github.com/nsf/termbox-go
-  version: b6acae516ace002cb8105a89024544a1480655a5
-- name: golang.org/x/net
-  version: 569280fa63be4e201b975e5411e30a92178f0118
-  subpackages:
-  - websocket
-testImports:
-- name: github.com/davecgh/go-spew
-  version: 346938d642f2ec3594ed81d874461961cd0faa76
-  subpackages:
-  - spew
-- name: github.com/pmezard/go-difflib
-  version: d8ed2627bdf02c080bf22230dbb337003b7aba2d
-  subpackages:
-  - difflib
-- name: github.com/stretchr/testify
-  version: 976c720a22c8eb4eb6a0b4348ad85ad12491a506
-  subpackages:
-  - assert
diff --git a/installer/vendor/github.com/gizak/termui/glide.yaml b/installer/vendor/github.com/gizak/termui/glide.yaml
deleted file mode 100644
index a6812317f7..0000000000
--- a/installer/vendor/github.com/gizak/termui/glide.yaml
+++ /dev/null
@@ -1,9 +0,0 @@
-package: github.com/gizak/termui
-import:
-- package: github.com/mattn/go-runewidth
-- package: github.com/mitchellh/go-wordwrap
-- package: github.com/nsf/termbox-go
-- package: golang.org/x/net
-  subpackages:
-  - websocket
-- package: github.com/maruel/panicparse
diff --git a/installer/vendor/github.com/gizak/termui/grid.go b/installer/vendor/github.com/gizak/termui/grid.go
index 851489ddad..a950232253 100644
--- a/installer/vendor/github.com/gizak/termui/grid.go
+++ b/installer/vendor/github.com/gizak/termui/grid.go
@@ -48,7 +48,7 @@ func (r *Row) assignWidth(w int) {
 
 	accW := 0                            // acc span and offset
 	calcW := make([]int, len(r.Cols))    // calculated width
-	calcOftX := make([]int, len(r.Cols)) // computed start position of x
+	calcOftX := make([]int, len(r.Cols)) // computated start position of x
 
 	for i, c := range r.Cols {
 		accW += c.Span + c.Offset
@@ -266,7 +266,7 @@ func (g *Grid) Align() {
 	}
 }
 
-// Buffer implements Bufferer interface.
+// Buffer implments Bufferer interface.
 func (g Grid) Buffer() Buffer {
 	buf := NewBuffer()
 
diff --git a/installer/vendor/github.com/gizak/termui/grid_test.go b/installer/vendor/github.com/gizak/termui/grid_test.go
deleted file mode 100644
index 7b7b0b7e1d..0000000000
--- a/installer/vendor/github.com/gizak/termui/grid_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import (
-	"testing"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-var r *Row
-
-func TestRowWidth(t *testing.T) {
-	p0 := NewBlock()
-	p0.Height = 1
-	p1 := NewBlock()
-	p1.Height = 1
-	p2 := NewBlock()
-	p2.Height = 1
-	p3 := NewBlock()
-	p3.Height = 1
-
-	/* test against tree:
-
-	       r
-	     /  \
-	   0:w   1
-	        / \
-	     10:w 11
-	          /
-	        110:w
-	         /
-	       1100:w
-	*/
-
-	r = NewRow(
-		NewCol(6, 0, p0),
-		NewCol(6, 0,
-			NewRow(
-				NewCol(6, 0, p1),
-				NewCol(6, 0, p2, p3))))
-
-	r.assignWidth(100)
-	if r.Width != 100 ||
-		(r.Cols[0].Width) != 50 ||
-		(r.Cols[1].Width) != 50 ||
-		(r.Cols[1].Cols[0].Width) != 25 ||
-		(r.Cols[1].Cols[1].Width) != 25 ||
-		(r.Cols[1].Cols[1].Cols[0].Width) != 25 ||
-		(r.Cols[1].Cols[1].Cols[0].Cols[0].Width) != 25 {
-		t.Error("assignWidth fails")
-	}
-}
-
-func TestRowHeight(t *testing.T) {
-	spew.Dump()
-
-	if (r.solveHeight()) != 2 ||
-		(r.Cols[1].Cols[1].Height) != 2 ||
-		(r.Cols[1].Cols[1].Cols[0].Height) != 2 ||
-		(r.Cols[1].Cols[0].Height) != 1 {
-		t.Error("solveHeight fails")
-	}
-}
-
-func TestAssignXY(t *testing.T) {
-	r.assignX(0)
-	r.assignY(0)
-	if (r.Cols[0].X) != 0 ||
-		(r.Cols[1].Cols[0].X) != 50 ||
-		(r.Cols[1].Cols[1].X) != 75 ||
-		(r.Cols[1].Cols[1].Cols[0].X) != 75 ||
-		(r.Cols[1].Cols[0].Y) != 0 ||
-		(r.Cols[1].Cols[1].Cols[0].Y) != 0 ||
-		(r.Cols[1].Cols[1].Cols[0].Cols[0].Y) != 1 {
-		t.Error("assignXY fails")
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/helper_test.go b/installer/vendor/github.com/gizak/termui/helper_test.go
deleted file mode 100644
index 0b4b13ee4d..0000000000
--- a/installer/vendor/github.com/gizak/termui/helper_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestStr2Rune(t *testing.T) {
-	s := "你好,世界."
-	rs := str2runes(s)
-	if len(rs) != 6 {
-		t.Error(t)
-	}
-}
-
-func TestWidth(t *testing.T) {
-	s0 := "つのだ☆HIRO"
-	s1 := "11111111111"
-	// above not align for setting East Asian Ambiguous to wide!!
-
-	if strWidth(s0) != strWidth(s1) {
-		t.Error("str len failed")
-	}
-
-	len1 := []rune{'a', '2', '&', '｢', 'ｵ', '｡'} //will false: 'ᆵ', 'ᄚ', 'ᄒ'
-	for _, v := range len1 {
-		if charWidth(v) != 1 {
-			t.Error("len1 failed")
-		}
-	}
-
-	len2 := []rune{'漢', '字', '한', '자', '你', '好', 'だ', '。', '％', 'ｓ', 'Ｅ', 'ョ', '、', 'ヲ'}
-	for _, v := range len2 {
-		if charWidth(v) != 2 {
-			t.Error("len2 failed")
-		}
-	}
-}
-
-func TestTrim(t *testing.T) {
-	s := "つのだ☆HIRO"
-	if string(trimStr2Runes(s, 10)) != "つのだ☆HI"+dot {
-		t.Error("trim failed")
-	}
-	if string(trimStr2Runes(s, 11)) != "つのだ☆HIRO" {
-		t.Error("avoid tail trim failed")
-	}
-	if string(trimStr2Runes(s, 15)) != "つのだ☆HIRO" {
-		t.Error("avoid trim failed")
-	}
-}
-
-func TestTrimStrIfAppropriate_NoTrim(t *testing.T) {
-	assert.Equal(t, "hello", TrimStrIfAppropriate("hello", 5))
-}
-
-func TestTrimStrIfAppropriate(t *testing.T) {
-	assert.Equal(t, "hel…", TrimStrIfAppropriate("hello", 4))
-	assert.Equal(t, "h…", TrimStrIfAppropriate("hello", 2))
-}
-
-func TestStringToAttribute(t *testing.T) {
-	assert.Equal(t, ColorRed, StringToAttribute("ReD"))
-	assert.Equal(t, ColorRed|AttrBold, StringToAttribute("RED, bold"))
-}
diff --git a/installer/vendor/github.com/gizak/termui/linechart.go b/installer/vendor/github.com/gizak/termui/linechart.go
index 84e7e289d5..f7eea28bbe 100644
--- a/installer/vendor/github.com/gizak/termui/linechart.go
+++ b/installer/vendor/github.com/gizak/termui/linechart.go
@@ -35,7 +35,7 @@ var braillePatterns = map[[2]int]rune{
 var lSingleBraille = [4]rune{'\u2840', '⠄', '⠂', '⠁'}
 var rSingleBraille = [4]rune{'\u2880', '⠠', '⠐', '⠈'}
 
-// LineChart has two modes: braille(default) and dot. Using braille gives 2x capacity as dot mode,
+// LineChart has two modes: braille(default) and dot. Using braille gives 2x capicity as dot mode,
 // because one braille char can represent two data points.
 /*
   lc := termui.NewLineChart()
@@ -87,7 +87,7 @@ func NewLineChart() *LineChart {
 }
 
 // one cell contains two data points
-// so the capacity is 2x as dot-mode
+// so the capicity is 2x as dot-mode
 func (lc *LineChart) renderBraille() Buffer {
 	buf := NewBuffer()
 
diff --git a/installer/vendor/github.com/gizak/termui/list.go b/installer/vendor/github.com/gizak/termui/list.go
index 5a592152dc..ea6635eccc 100644
--- a/installer/vendor/github.com/gizak/termui/list.go
+++ b/installer/vendor/github.com/gizak/termui/list.go
@@ -14,7 +14,7 @@ import "strings"
   strs := []string{
 		"[0] github.com/gizak/termui",
 		"[1] editbox.go",
-		"[2] interrupt.go",
+		"[2] iterrupt.go",
 		"[3] keyboard.go",
 		"[4] output.go",
 		"[5] random_out.go",
diff --git a/installer/vendor/github.com/gizak/termui/mbarchart.go b/installer/vendor/github.com/gizak/termui/mbarchart.go
index 0ce6c45cfd..0f91e9713f 100644
--- a/installer/vendor/github.com/gizak/termui/mbarchart.go
+++ b/installer/vendor/github.com/gizak/termui/mbarchart.go
@@ -8,7 +8,7 @@ import (
 	"fmt"
 )
 
-// This is the implementation of multi-colored or stacked bar graph.  This is different from default barGraph which is implemented in bar.go
+// This is the implemetation of multi-colored or stacked bar graph.  This is different from default barGraph which is implemented in bar.go
 // Multi-Colored-BarChart creates multiple bars in a widget:
 /*
    bc := termui.NewMBarChart()
@@ -72,7 +72,7 @@ func (bc *MBarChart) layout() {
 	}
 	bc.numStack = DataLen
 
-	//We need to know what is the minimum size of data array data[0] could have 10 elements data[1] could have only 5, so we plot only 5 bar graphs
+	//We need to know what is the mimimum size of data array data[0] could have 10 elements data[1] could have only 5, so we plot only 5 bar graphs
 
 	for i := 0; i < DataLen; i++ {
 		if bc.minDataLen > len(bc.Data[i]) {
@@ -90,13 +90,13 @@ func (bc *MBarChart) layout() {
 
 	for i := 0; i < bc.numStack; i++ {
 		bc.dataNum[i] = make([][]rune, len(bc.Data[i]))
-		//For each stack of bar calculate the rune
+		//For each stack of bar calcualte the rune
 		for j := 0; j < LabelLen && i < bc.numBar; j++ {
 			n := bc.Data[i][j]
 			s := fmt.Sprint(n)
 			bc.dataNum[i][j] = trimStr2Runes(s, bc.BarWidth)
 		}
-		//If color is not defined by default then populate a color that is different from the previous bar
+		//If color is not defined by default then populate a color that is different from the prevous bar
 		if bc.BarColor[i] == ColorDefault && bc.NumColor[i] == ColorDefault {
 			if i == 0 {
 				bc.BarColor[i] = ColorBlack
diff --git a/installer/vendor/github.com/gizak/termui/mkdocs.yml b/installer/vendor/github.com/gizak/termui/mkdocs.yml
deleted file mode 100644
index 2ab45f064b..0000000000
--- a/installer/vendor/github.com/gizak/termui/mkdocs.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-pages:
-- Home: 'index.md'
-- Quickstart: 'quickstart.md'
-- Recipes: 'recipes.md'
-- References:
-    - Layouts: 'layouts.md'
-    - Components: 'components.md'
-    - Events: 'events.md'
-    - Themes: 'themes.md'
-- Versions: 'versions.md'
-- About: 'about.md'
-
-site_name: termui
-repo_url: https://github.com/gizak/termui/
-site_description: 'termui user guide'
-site_author: gizak
-
-docs_dir: '_docs'
-
-theme: readthedocs
-
-markdown_extensions:
-  - smarty
-  - admonition
-  - toc
-
-extra:
-    version: 1.0
diff --git a/installer/vendor/github.com/gizak/termui/par_test.go b/installer/vendor/github.com/gizak/termui/par_test.go
deleted file mode 100644
index 4d28f4d596..0000000000
--- a/installer/vendor/github.com/gizak/termui/par_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import "testing"
-
-func TestPar_NoBorderBackground(t *testing.T) {
-	par := NewPar("a")
-	par.Border = false
-	par.Bg = ColorBlue
-	par.TextBgColor = ColorBlue
-	par.Width = 2
-	par.Height = 2
-
-	pts := par.Buffer()
-	for _, p := range pts.CellMap {
-		t.Log(p)
-		if p.Bg != par.Bg {
-			t.Errorf("expected color to be %v but got %v", par.Bg, p.Bg)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/pos_test.go b/installer/vendor/github.com/gizak/termui/pos_test.go
deleted file mode 100644
index 448876b7af..0000000000
--- a/installer/vendor/github.com/gizak/termui/pos_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import (
-	"image"
-	"testing"
-)
-
-func TestAlignArea(t *testing.T) {
-	p := image.Rect(0, 0, 100, 100)
-	c := image.Rect(10, 10, 20, 20)
-
-	nc := AlignArea(p, c, AlignLeft)
-	if nc.Min.X != 0 || nc.Max.Y != 20 {
-		t.Errorf("AlignLeft failed:\n%+v", nc)
-	}
-
-	nc = AlignArea(p, c, AlignCenter)
-	if nc.Min.X != 45 || nc.Max.Y != 55 {
-		t.Error("AlignCenter failed")
-	}
-
-	nc = AlignArea(p, c, AlignBottom|AlignRight)
-	if nc.Min.X != 90 || nc.Max.Y != 100 {
-		t.Errorf("AlignBottom|AlignRight failed\n%+v", nc)
-	}
-}
-
-func TestMoveArea(t *testing.T) {
-	a := image.Rect(10, 10, 20, 20)
-	a = MoveArea(a, 5, 10)
-	if a.Min.X != 15 || a.Min.Y != 20 || a.Max.X != 25 || a.Max.Y != 30 {
-		t.Error("MoveArea failed")
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/render.go b/installer/vendor/github.com/gizak/termui/render.go
index b9d37d9386..5b58409833 100644
--- a/installer/vendor/github.com/gizak/termui/render.go
+++ b/installer/vendor/github.com/gizak/termui/render.go
@@ -51,7 +51,7 @@ func Init() error {
 	DefaultEvtStream.Merge("timer", NewTimerCh(time.Second))
 	DefaultEvtStream.Merge("custom", usrEvtCh)
 
-	DefaultEvtStream.Handle("/", DefaultHandler)
+	DefaultEvtStream.Handle("/", DefualtHandler)
 	DefaultEvtStream.Handle("/sys/wnd/resize", func(e Event) {
 		w := e.Data.(EvtWnd)
 		Body.Width = w.Width
diff --git a/installer/vendor/github.com/gizak/termui/sparkline.go b/installer/vendor/github.com/gizak/termui/sparkline.go
index 75e7c52119..d906e49dfc 100644
--- a/installer/vendor/github.com/gizak/termui/sparkline.go
+++ b/installer/vendor/github.com/gizak/termui/sparkline.go
@@ -51,7 +51,7 @@ func NewSparkline() Sparkline {
 		LineColor:  ThemeAttr("sparkline.line.fg")}
 }
 
-// NewSparklines return a new *Sparklines with given Sparkline(s), you can always add a new Sparkline later.
+// NewSparklines return a new *Spaklines with given Sparkline(s), you can always add a new Sparkline later.
 func NewSparklines(ss ...Sparkline) *Sparklines {
 	s := &Sparklines{Block: *NewBlock(), Lines: ss}
 	return s
diff --git a/installer/vendor/github.com/gizak/termui/test/runtest.go b/installer/vendor/github.com/gizak/termui/test/runtest.go
deleted file mode 100644
index 2451ce97ad..0000000000
--- a/installer/vendor/github.com/gizak/termui/test/runtest.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/gizak/termui"
-	"github.com/gizak/termui/debug"
-)
-
-func main() {
-	// run as client
-	if len(os.Args) > 1 {
-		fmt.Print(debug.ConnectAndListen())
-		return
-	}
-
-	// run as server
-	go func() { panic(debug.ListenAndServe()) }()
-
-	if err := termui.Init(); err != nil {
-		panic(err)
-	}
-	defer termui.Close()
-
-	//termui.UseTheme("helloworld")
-	b := termui.NewBlock()
-	b.Width = 20
-	b.Height = 20
-	b.Float = termui.AlignCenter
-	b.BorderLabel = "[HELLO](fg-red,bg-white) [WORLD](fg-blue,bg-green)"
-
-	termui.Render(b)
-
-	termui.Handle("/sys", func(e termui.Event) {
-		k, ok := e.Data.(termui.EvtKbd)
-		debug.Logf("->%v\n", e)
-		if ok && k.KeyStr == "q" {
-			termui.StopLoop()
-		}
-	})
-
-	termui.Handle(("/usr"), func(e termui.Event) {
-		debug.Logf("->%v\n", e)
-	})
-
-	termui.Handle("/timer/1s", func(e termui.Event) {
-		t := e.Data.(termui.EvtTimer)
-		termui.SendCustomEvt("/usr/t", t.Count)
-
-		if t.Count%2 == 0 {
-			b.BorderLabel = "[HELLO](fg-red,bg-green) [WORLD](fg-blue,bg-white)"
-		} else {
-			b.BorderLabel = "[HELLO](fg-blue,bg-white) [WORLD](fg-red,bg-green)"
-		}
-
-		termui.Render(b)
-
-	})
-
-	termui.Loop()
-}
diff --git a/installer/vendor/github.com/gizak/termui/textbuilder_test.go b/installer/vendor/github.com/gizak/termui/textbuilder_test.go
deleted file mode 100644
index 8f458ecee6..0000000000
--- a/installer/vendor/github.com/gizak/termui/textbuilder_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import "testing"
-
-func TestReadAttr(t *testing.T) {
-	m := MarkdownTxBuilder{}
-	m.baseFg = ColorCyan | AttrUnderline
-	m.baseBg = ColorBlue | AttrBold
-	fg, bg := m.readAttr("fg-red,bg-reverse")
-	if fg != ColorRed|AttrUnderline || bg != ColorBlue|AttrBold|AttrReverse {
-		t.Error("readAttr failed")
-	}
-}
-
-func TestMTBParse(t *testing.T) {
-	/*
-		str := func(cs []Cell) string {
-			rs := make([]rune, len(cs))
-			for i := range cs {
-				rs[i] = cs[i].Ch
-			}
-			return string(rs)
-		}
-	*/
-
-	tbls := [][]string{
-		{"hello world", "hello world"},
-		{"[hello](fg-red) world", "hello world"},
-		{"[[hello]](bg-red) world", "[hello] world"},
-		{"[1] hello world", "[1] hello world"},
-		{"[[1]](bg-white) [hello] world", "[1] [hello] world"},
-		{"[hello world]", "[hello world]"},
-		{"", ""},
-		{"[hello world)", "[hello world)"},
-		{"[0] [hello](bg-red)[ world](fg-blue)!", "[0] hello world!"},
-	}
-
-	m := MarkdownTxBuilder{}
-	m.baseFg = ColorWhite
-	m.baseBg = ColorDefault
-	for _, s := range tbls {
-		m.reset()
-		m.parse(s[0])
-		res := string(m.plainTx)
-		if s[1] != res {
-			t.Errorf("\ninput :%s\nshould:%s\noutput:%s", s[0], s[1], res)
-		}
-	}
-
-	m.reset()
-	m.parse("[0] [hello](bg-red)[ world](fg-blue)")
-	if len(m.markers) != 2 &&
-		m.markers[0].st == 4 &&
-		m.markers[0].ed == 11 &&
-		m.markers[0].fg == ColorWhite &&
-		m.markers[0].bg == ColorRed {
-		t.Error("markers dismatch")
-	}
-
-	m2 := NewMarkdownTxBuilder()
-	cs := m2.Build("[0] [hellob-e) wrd]fgblue)!", ColorWhite, ColorBlack)
-	cs = m2.Build("[0] [hello](bg-red) [world](fg-blue)!", ColorWhite, ColorBlack)
-	if cs[4].Ch != 'h' && cs[4].Bg != ColorRed && cs[4].Fg != ColorWhite {
-		t.Error("dismatch in Build")
-	}
-}
diff --git a/installer/vendor/github.com/gizak/termui/theme_test.go b/installer/vendor/github.com/gizak/termui/theme_test.go
deleted file mode 100644
index f3d327cfeb..0000000000
--- a/installer/vendor/github.com/gizak/termui/theme_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 Zack Guo <zack.y.guo@gmail.com>. All rights reserved.
-// Use of this source code is governed by a MIT license that can
-// be found in the LICENSE file.
-
-package termui
-
-import "testing"
-
-var cmap = map[string]Attribute{
-	"fg":           ColorWhite,
-	"bg":           ColorDefault,
-	"border.fg":    ColorWhite,
-	"label.fg":     ColorGreen,
-	"par.fg":       ColorYellow,
-	"par.label.bg": ColorWhite,
-}
-
-func TestLoopUpAttr(t *testing.T) {
-	tbl := []struct {
-		name   string
-		should Attribute
-	}{
-		{"par.label.bg", ColorWhite},
-		{"par.label.fg", ColorGreen},
-		{"par.bg", ColorDefault},
-		{"bar.border.fg", ColorWhite},
-		{"bar.label.bg", ColorDefault},
-	}
-
-	for _, v := range tbl {
-		if lookUpAttr(cmap, v.name) != v.should {
-			t.Error(v.name)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/go-yaml/yaml/.travis.yml b/installer/vendor/github.com/go-yaml/yaml/.travis.yml
deleted file mode 100644
index 004172a2e3..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-
-go:
-    - 1.4
-    - 1.5
-    - 1.6
-    - tip
-
-go_import_path: gopkg.in/yaml.v2
diff --git a/installer/vendor/github.com/go-yaml/yaml/NOTICE b/installer/vendor/github.com/go-yaml/yaml/NOTICE
new file mode 100644
index 0000000000..866d74a7ad
--- /dev/null
+++ b/installer/vendor/github.com/go-yaml/yaml/NOTICE
@@ -0,0 +1,13 @@
+Copyright 2011-2016 Canonical Ltd.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
diff --git a/installer/vendor/github.com/go-yaml/yaml/README.md b/installer/vendor/github.com/go-yaml/yaml/README.md
deleted file mode 100644
index 7a512d67c2..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# YAML support for the Go language
-
-Introduction
-------------
-
-The yaml package enables Go programs to comfortably encode and decode YAML
-values. It was developed within [Canonical](https://www.canonical.com) as
-part of the [juju](https://juju.ubuntu.com) project, and is based on a
-pure Go port of the well-known [libyaml](http://pyyaml.org/wiki/LibYAML)
-C library to parse and generate YAML data quickly and reliably.
-
-Compatibility
--------------
-
-The yaml package supports most of YAML 1.1 and 1.2, including support for
-anchors, tags, map merging, etc. Multi-document unmarshalling is not yet
-implemented, and base-60 floats from YAML 1.1 are purposefully not
-supported since they're a poor design and are gone in YAML 1.2.
-
-Installation and usage
-----------------------
-
-The import path for the package is *gopkg.in/yaml.v2*.
-
-To install it, run:
-
-    go get gopkg.in/yaml.v2
-
-API documentation
------------------
-
-If opened in a browser, the import path itself leads to the API documentation:
-
-  * [https://gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)
-
-API stability
--------------
-
-The package API for yaml v2 will remain stable as described in [gopkg.in](https://gopkg.in).
-
-
-License
--------
-
-The yaml package is licensed under the Apache License 2.0. Please see the LICENSE file for details.
-
-
-Example
--------
-
-Some more examples can be found in the "examples" folder.
-
-```Go
-package main
-
-import (
-        "fmt"
-        "log"
-
-        "gopkg.in/yaml.v2"
-)
-
-var data = `
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-`
-
-type T struct {
-        A string
-        B struct {
-                RenamedC int   `yaml:"c"`
-                D        []int `yaml:",flow"`
-        }
-}
-
-func main() {
-        t := T{}
-    
-        err := yaml.Unmarshal([]byte(data), &t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t:\n%v\n\n", t)
-    
-        d, err := yaml.Marshal(&t)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- t dump:\n%s\n\n", string(d))
-    
-        m := make(map[interface{}]interface{})
-    
-        err = yaml.Unmarshal([]byte(data), &m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m:\n%v\n\n", m)
-    
-        d, err = yaml.Marshal(&m)
-        if err != nil {
-                log.Fatalf("error: %v", err)
-        }
-        fmt.Printf("--- m dump:\n%s\n\n", string(d))
-}
-```
-
-This example will generate the following output:
-
-```
---- t:
-{Easy! {2 [3 4]}}
-
---- t dump:
-a: Easy!
-b:
-  c: 2
-  d: [3, 4]
-
-
---- m:
-map[a:Easy! b:map[c:2 d:[3 4]]]
-
---- m dump:
-a: Easy!
-b:
-  c: 2
-  d:
-  - 3
-  - 4
-```
-
diff --git a/installer/vendor/github.com/go-yaml/yaml/apic.go b/installer/vendor/github.com/go-yaml/yaml/apic.go
index 95ec014e8c..1f7e87e672 100644
--- a/installer/vendor/github.com/go-yaml/yaml/apic.go
+++ b/installer/vendor/github.com/go-yaml/yaml/apic.go
@@ -2,7 +2,6 @@ package yaml
 
 import (
 	"io"
-	"os"
 )
 
 func yaml_insert_token(parser *yaml_parser_t, pos int, token *yaml_token_t) {
@@ -48,9 +47,9 @@ func yaml_string_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err
 	return n, nil
 }
 
-// File read handler.
-func yaml_file_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
-	return parser.input_file.Read(buffer)
+// Reader read handler.
+func yaml_reader_read_handler(parser *yaml_parser_t, buffer []byte) (n int, err error) {
+	return parser.input_reader.Read(buffer)
 }
 
 // Set a string input.
@@ -64,12 +63,12 @@ func yaml_parser_set_input_string(parser *yaml_parser_t, input []byte) {
 }
 
 // Set a file input.
-func yaml_parser_set_input_file(parser *yaml_parser_t, file *os.File) {
+func yaml_parser_set_input_reader(parser *yaml_parser_t, r io.Reader) {
 	if parser.read_handler != nil {
 		panic("must set the input source only once")
 	}
-	parser.read_handler = yaml_file_read_handler
-	parser.input_file = file
+	parser.read_handler = yaml_reader_read_handler
+	parser.input_reader = r
 }
 
 // Set the source encoding.
@@ -81,14 +80,13 @@ func yaml_parser_set_encoding(parser *yaml_parser_t, encoding yaml_encoding_t) {
 }
 
 // Create a new emitter object.
-func yaml_emitter_initialize(emitter *yaml_emitter_t) bool {
+func yaml_emitter_initialize(emitter *yaml_emitter_t) {
 	*emitter = yaml_emitter_t{
 		buffer:     make([]byte, output_buffer_size),
 		raw_buffer: make([]byte, 0, output_raw_buffer_size),
 		states:     make([]yaml_emitter_state_t, 0, initial_stack_size),
 		events:     make([]yaml_event_t, 0, initial_queue_size),
 	}
-	return true
 }
 
 // Destroy an emitter object.
@@ -102,9 +100,10 @@ func yaml_string_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
 	return nil
 }
 
-// File write handler.
-func yaml_file_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
-	_, err := emitter.output_file.Write(buffer)
+// yaml_writer_write_handler uses emitter.output_writer to write the
+// emitted text.
+func yaml_writer_write_handler(emitter *yaml_emitter_t, buffer []byte) error {
+	_, err := emitter.output_writer.Write(buffer)
 	return err
 }
 
@@ -118,12 +117,12 @@ func yaml_emitter_set_output_string(emitter *yaml_emitter_t, output_buffer *[]by
 }
 
 // Set a file output.
-func yaml_emitter_set_output_file(emitter *yaml_emitter_t, file io.Writer) {
+func yaml_emitter_set_output_writer(emitter *yaml_emitter_t, w io.Writer) {
 	if emitter.write_handler != nil {
 		panic("must set the output target only once")
 	}
-	emitter.write_handler = yaml_file_write_handler
-	emitter.output_file = file
+	emitter.write_handler = yaml_writer_write_handler
+	emitter.output_writer = w
 }
 
 // Set the output encoding.
@@ -252,41 +251,41 @@ func yaml_emitter_set_break(emitter *yaml_emitter_t, line_break yaml_break_t) {
 //
 
 // Create STREAM-START.
-func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) bool {
+func yaml_stream_start_event_initialize(event *yaml_event_t, encoding yaml_encoding_t) {
 	*event = yaml_event_t{
 		typ:      yaml_STREAM_START_EVENT,
 		encoding: encoding,
 	}
-	return true
 }
 
 // Create STREAM-END.
-func yaml_stream_end_event_initialize(event *yaml_event_t) bool {
+func yaml_stream_end_event_initialize(event *yaml_event_t) {
 	*event = yaml_event_t{
 		typ: yaml_STREAM_END_EVENT,
 	}
-	return true
 }
 
 // Create DOCUMENT-START.
-func yaml_document_start_event_initialize(event *yaml_event_t, version_directive *yaml_version_directive_t,
-	tag_directives []yaml_tag_directive_t, implicit bool) bool {
+func yaml_document_start_event_initialize(
+	event *yaml_event_t,
+	version_directive *yaml_version_directive_t,
+	tag_directives []yaml_tag_directive_t,
+	implicit bool,
+) {
 	*event = yaml_event_t{
 		typ:               yaml_DOCUMENT_START_EVENT,
 		version_directive: version_directive,
 		tag_directives:    tag_directives,
 		implicit:          implicit,
 	}
-	return true
 }
 
 // Create DOCUMENT-END.
-func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) bool {
+func yaml_document_end_event_initialize(event *yaml_event_t, implicit bool) {
 	*event = yaml_event_t{
 		typ:      yaml_DOCUMENT_END_EVENT,
 		implicit: implicit,
 	}
-	return true
 }
 
 ///*
@@ -348,7 +347,7 @@ func yaml_sequence_end_event_initialize(event *yaml_event_t) bool {
 }
 
 // Create MAPPING-START.
-func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) bool {
+func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte, implicit bool, style yaml_mapping_style_t) {
 	*event = yaml_event_t{
 		typ:      yaml_MAPPING_START_EVENT,
 		anchor:   anchor,
@@ -356,15 +355,13 @@ func yaml_mapping_start_event_initialize(event *yaml_event_t, anchor, tag []byte
 		implicit: implicit,
 		style:    yaml_style_t(style),
 	}
-	return true
 }
 
 // Create MAPPING-END.
-func yaml_mapping_end_event_initialize(event *yaml_event_t) bool {
+func yaml_mapping_end_event_initialize(event *yaml_event_t) {
 	*event = yaml_event_t{
 		typ: yaml_MAPPING_END_EVENT,
 	}
-	return true
 }
 
 // Destroy an event object.
@@ -471,7 +468,7 @@ func yaml_event_delete(event *yaml_event_t) {
 //    } context
 //    tag_directive *yaml_tag_directive_t
 //
-//    context.error = YAML_NO_ERROR // Eliminate a compliler warning.
+//    context.error = YAML_NO_ERROR // Eliminate a compiler warning.
 //
 //    assert(document) // Non-NULL document object is expected.
 //
diff --git a/installer/vendor/github.com/go-yaml/yaml/decode.go b/installer/vendor/github.com/go-yaml/yaml/decode.go
index db1f5f2068..e4e56e28e0 100644
--- a/installer/vendor/github.com/go-yaml/yaml/decode.go
+++ b/installer/vendor/github.com/go-yaml/yaml/decode.go
@@ -4,6 +4,7 @@ import (
 	"encoding"
 	"encoding/base64"
 	"fmt"
+	"io"
 	"math"
 	"reflect"
 	"strconv"
@@ -22,19 +23,22 @@ type node struct {
 	kind         int
 	line, column int
 	tag          string
-	value        string
-	implicit     bool
-	children     []*node
-	anchors      map[string]*node
+	// For an alias node, alias holds the resolved alias.
+	alias    *node
+	value    string
+	implicit bool
+	children []*node
+	anchors  map[string]*node
 }
 
 // ----------------------------------------------------------------------------
 // Parser, produces a node tree out of a libyaml event stream.
 
 type parser struct {
-	parser yaml_parser_t
-	event  yaml_event_t
-	doc    *node
+	parser   yaml_parser_t
+	event    yaml_event_t
+	doc      *node
+	doneInit bool
 }
 
 func newParser(b []byte) *parser {
@@ -42,21 +46,30 @@ func newParser(b []byte) *parser {
 	if !yaml_parser_initialize(&p.parser) {
 		panic("failed to initialize YAML emitter")
 	}
-
 	if len(b) == 0 {
 		b = []byte{'\n'}
 	}
-
 	yaml_parser_set_input_string(&p.parser, b)
+	return &p
+}
 
-	p.skip()
-	if p.event.typ != yaml_STREAM_START_EVENT {
-		panic("expected stream start event, got " + strconv.Itoa(int(p.event.typ)))
+func newParserFromReader(r io.Reader) *parser {
+	p := parser{}
+	if !yaml_parser_initialize(&p.parser) {
+		panic("failed to initialize YAML emitter")
 	}
-	p.skip()
+	yaml_parser_set_input_reader(&p.parser, r)
 	return &p
 }
 
+func (p *parser) init() {
+	if p.doneInit {
+		return
+	}
+	p.expect(yaml_STREAM_START_EVENT)
+	p.doneInit = true
+}
+
 func (p *parser) destroy() {
 	if p.event.typ != yaml_NO_EVENT {
 		yaml_event_delete(&p.event)
@@ -64,16 +77,35 @@ func (p *parser) destroy() {
 	yaml_parser_delete(&p.parser)
 }
 
-func (p *parser) skip() {
-	if p.event.typ != yaml_NO_EVENT {
-		if p.event.typ == yaml_STREAM_END_EVENT {
-			failf("attempted to go past the end of stream; corrupted value?")
+// expect consumes an event from the event stream and
+// checks that it's of the expected type.
+func (p *parser) expect(e yaml_event_type_t) {
+	if p.event.typ == yaml_NO_EVENT {
+		if !yaml_parser_parse(&p.parser, &p.event) {
+			p.fail()
 		}
-		yaml_event_delete(&p.event)
+	}
+	if p.event.typ == yaml_STREAM_END_EVENT {
+		failf("attempted to go past the end of stream; corrupted value?")
+	}
+	if p.event.typ != e {
+		p.parser.problem = fmt.Sprintf("expected %s event but got %s", e, p.event.typ)
+		p.fail()
+	}
+	yaml_event_delete(&p.event)
+	p.event.typ = yaml_NO_EVENT
+}
+
+// peek peeks at the next event in the event stream,
+// puts the results into p.event and returns the event type.
+func (p *parser) peek() yaml_event_type_t {
+	if p.event.typ != yaml_NO_EVENT {
+		return p.event.typ
 	}
 	if !yaml_parser_parse(&p.parser, &p.event) {
 		p.fail()
 	}
+	return p.event.typ
 }
 
 func (p *parser) fail() {
@@ -81,6 +113,10 @@ func (p *parser) fail() {
 	var line int
 	if p.parser.problem_mark.line != 0 {
 		line = p.parser.problem_mark.line
+		// Scanner errors don't iterate line before returning error
+		if p.parser.error == yaml_SCANNER_ERROR {
+			line++
+		}
 	} else if p.parser.context_mark.line != 0 {
 		line = p.parser.context_mark.line
 	}
@@ -103,7 +139,8 @@ func (p *parser) anchor(n *node, anchor []byte) {
 }
 
 func (p *parser) parse() *node {
-	switch p.event.typ {
+	p.init()
+	switch p.peek() {
 	case yaml_SCALAR_EVENT:
 		return p.scalar()
 	case yaml_ALIAS_EVENT:
@@ -118,7 +155,7 @@ func (p *parser) parse() *node {
 		// Happens when attempting to decode an empty buffer.
 		return nil
 	default:
-		panic("attempted to parse unknown event: " + strconv.Itoa(int(p.event.typ)))
+		panic("attempted to parse unknown event: " + p.event.typ.String())
 	}
 }
 
@@ -134,19 +171,20 @@ func (p *parser) document() *node {
 	n := p.node(documentNode)
 	n.anchors = make(map[string]*node)
 	p.doc = n
-	p.skip()
+	p.expect(yaml_DOCUMENT_START_EVENT)
 	n.children = append(n.children, p.parse())
-	if p.event.typ != yaml_DOCUMENT_END_EVENT {
-		panic("expected end of document event but got " + strconv.Itoa(int(p.event.typ)))
-	}
-	p.skip()
+	p.expect(yaml_DOCUMENT_END_EVENT)
 	return n
 }
 
 func (p *parser) alias() *node {
 	n := p.node(aliasNode)
 	n.value = string(p.event.anchor)
-	p.skip()
+	n.alias = p.doc.anchors[n.value]
+	if n.alias == nil {
+		failf("unknown anchor '%s' referenced", n.value)
+	}
+	p.expect(yaml_ALIAS_EVENT)
 	return n
 }
 
@@ -156,29 +194,29 @@ func (p *parser) scalar() *node {
 	n.tag = string(p.event.tag)
 	n.implicit = p.event.implicit
 	p.anchor(n, p.event.anchor)
-	p.skip()
+	p.expect(yaml_SCALAR_EVENT)
 	return n
 }
 
 func (p *parser) sequence() *node {
 	n := p.node(sequenceNode)
 	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_SEQUENCE_END_EVENT {
+	p.expect(yaml_SEQUENCE_START_EVENT)
+	for p.peek() != yaml_SEQUENCE_END_EVENT {
 		n.children = append(n.children, p.parse())
 	}
-	p.skip()
+	p.expect(yaml_SEQUENCE_END_EVENT)
 	return n
 }
 
 func (p *parser) mapping() *node {
 	n := p.node(mappingNode)
 	p.anchor(n, p.event.anchor)
-	p.skip()
-	for p.event.typ != yaml_MAPPING_END_EVENT {
+	p.expect(yaml_MAPPING_START_EVENT)
+	for p.peek() != yaml_MAPPING_END_EVENT {
 		n.children = append(n.children, p.parse(), p.parse())
 	}
-	p.skip()
+	p.expect(yaml_MAPPING_END_EVENT)
 	return n
 }
 
@@ -187,7 +225,7 @@ func (p *parser) mapping() *node {
 
 type decoder struct {
 	doc     *node
-	aliases map[string]bool
+	aliases map[*node]bool
 	mapType reflect.Type
 	terrors []string
 	strict  bool
@@ -198,11 +236,13 @@ var (
 	durationType   = reflect.TypeOf(time.Duration(0))
 	defaultMapType = reflect.TypeOf(map[interface{}]interface{}{})
 	ifaceType      = defaultMapType.Elem()
+	timeType       = reflect.TypeOf(time.Time{})
+	ptrTimeType    = reflect.TypeOf(&time.Time{})
 )
 
 func newDecoder(strict bool) *decoder {
 	d := &decoder{mapType: defaultMapType, strict: strict}
-	d.aliases = make(map[string]bool)
+	d.aliases = make(map[*node]bool)
 	return d
 }
 
@@ -251,7 +291,7 @@ func (d *decoder) callUnmarshaler(n *node, u Unmarshaler) (good bool) {
 //
 // If n holds a null value, prepare returns before doing anything.
 func (d *decoder) prepare(n *node, out reflect.Value) (newout reflect.Value, unmarshaled, good bool) {
-	if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "" && n.implicit) {
+	if n.tag == yaml_NULL_TAG || n.kind == scalarNode && n.tag == "" && (n.value == "null" || n.value == "~" || n.value == "" && n.implicit) {
 		return out, false, false
 	}
 	again := true
@@ -308,16 +348,13 @@ func (d *decoder) document(n *node, out reflect.Value) (good bool) {
 }
 
 func (d *decoder) alias(n *node, out reflect.Value) (good bool) {
-	an, ok := d.doc.anchors[n.value]
-	if !ok {
-		failf("unknown anchor '%s' referenced", n.value)
-	}
-	if d.aliases[n.value] {
+	if d.aliases[n] {
+		// TODO this could actually be allowed in some circumstances.
 		failf("anchor '%s' value contains itself", n.value)
 	}
-	d.aliases[n.value] = true
-	good = d.unmarshal(an, out)
-	delete(d.aliases, n.value)
+	d.aliases[n] = true
+	good = d.unmarshal(n.alias, out)
+	delete(d.aliases, n)
 	return good
 }
 
@@ -329,7 +366,7 @@ func resetMap(out reflect.Value) {
 	}
 }
 
-func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
+func (d *decoder) scalar(n *node, out reflect.Value) bool {
 	var tag string
 	var resolved interface{}
 	if n.tag == "" && !n.implicit {
@@ -353,9 +390,26 @@ func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 		}
 		return true
 	}
-	if s, ok := resolved.(string); ok && out.CanAddr() {
-		if u, ok := out.Addr().Interface().(encoding.TextUnmarshaler); ok {
-			err := u.UnmarshalText([]byte(s))
+	if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() {
+		// We've resolved to exactly the type we want, so use that.
+		out.Set(resolvedv)
+		return true
+	}
+	// Perhaps we can use the value as a TextUnmarshaler to
+	// set its value.
+	if out.CanAddr() {
+		u, ok := out.Addr().Interface().(encoding.TextUnmarshaler)
+		if ok {
+			var text []byte
+			if tag == yaml_BINARY_TAG {
+				text = []byte(resolved.(string))
+			} else {
+				// We let any value be unmarshaled into TextUnmarshaler.
+				// That might be more lax than we'd like, but the
+				// TextUnmarshaler itself should bowl out any dubious values.
+				text = []byte(n.value)
+			}
+			err := u.UnmarshalText(text)
 			if err != nil {
 				fail(err)
 			}
@@ -366,46 +420,54 @@ func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 	case reflect.String:
 		if tag == yaml_BINARY_TAG {
 			out.SetString(resolved.(string))
-			good = true
-		} else if resolved != nil {
+			return true
+		}
+		if resolved != nil {
 			out.SetString(n.value)
-			good = true
+			return true
 		}
 	case reflect.Interface:
 		if resolved == nil {
 			out.Set(reflect.Zero(out.Type()))
+		} else if tag == yaml_TIMESTAMP_TAG {
+			// It looks like a timestamp but for backward compatibility
+			// reasons we set it as a string, so that code that unmarshals
+			// timestamp-like values into interface{} will continue to
+			// see a string and not a time.Time.
+			// TODO(v3) Drop this.
+			out.Set(reflect.ValueOf(n.value))
 		} else {
 			out.Set(reflect.ValueOf(resolved))
 		}
-		good = true
+		return true
 	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
 		switch resolved := resolved.(type) {
 		case int:
 			if !out.OverflowInt(int64(resolved)) {
 				out.SetInt(int64(resolved))
-				good = true
+				return true
 			}
 		case int64:
 			if !out.OverflowInt(resolved) {
 				out.SetInt(resolved)
-				good = true
+				return true
 			}
 		case uint64:
 			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
 				out.SetInt(int64(resolved))
-				good = true
+				return true
 			}
 		case float64:
 			if resolved <= math.MaxInt64 && !out.OverflowInt(int64(resolved)) {
 				out.SetInt(int64(resolved))
-				good = true
+				return true
 			}
 		case string:
 			if out.Type() == durationType {
 				d, err := time.ParseDuration(resolved)
 				if err == nil {
 					out.SetInt(int64(d))
-					good = true
+					return true
 				}
 			}
 		}
@@ -414,44 +476,49 @@ func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 		case int:
 			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
 				out.SetUint(uint64(resolved))
-				good = true
+				return true
 			}
 		case int64:
 			if resolved >= 0 && !out.OverflowUint(uint64(resolved)) {
 				out.SetUint(uint64(resolved))
-				good = true
+				return true
 			}
 		case uint64:
 			if !out.OverflowUint(uint64(resolved)) {
 				out.SetUint(uint64(resolved))
-				good = true
+				return true
 			}
 		case float64:
 			if resolved <= math.MaxUint64 && !out.OverflowUint(uint64(resolved)) {
 				out.SetUint(uint64(resolved))
-				good = true
+				return true
 			}
 		}
 	case reflect.Bool:
 		switch resolved := resolved.(type) {
 		case bool:
 			out.SetBool(resolved)
-			good = true
+			return true
 		}
 	case reflect.Float32, reflect.Float64:
 		switch resolved := resolved.(type) {
 		case int:
 			out.SetFloat(float64(resolved))
-			good = true
+			return true
 		case int64:
 			out.SetFloat(float64(resolved))
-			good = true
+			return true
 		case uint64:
 			out.SetFloat(float64(resolved))
-			good = true
+			return true
 		case float64:
 			out.SetFloat(resolved)
-			good = true
+			return true
+		}
+	case reflect.Struct:
+		if resolvedv := reflect.ValueOf(resolved); out.Type() == resolvedv.Type() {
+			out.Set(resolvedv)
+			return true
 		}
 	case reflect.Ptr:
 		if out.Type().Elem() == reflect.TypeOf(resolved) {
@@ -459,13 +526,11 @@ func (d *decoder) scalar(n *node, out reflect.Value) (good bool) {
 			elem := reflect.New(out.Type().Elem())
 			elem.Elem().Set(reflect.ValueOf(resolved))
 			out.Set(elem)
-			good = true
+			return true
 		}
 	}
-	if !good {
-		d.terror(n, tag, out)
-	}
-	return good
+	d.terror(n, tag, out)
+	return false
 }
 
 func settableValueOf(i interface{}) reflect.Value {
@@ -482,6 +547,10 @@ func (d *decoder) sequence(n *node, out reflect.Value) (good bool) {
 	switch out.Kind() {
 	case reflect.Slice:
 		out.Set(reflect.MakeSlice(out.Type(), l, l))
+	case reflect.Array:
+		if l != out.Len() {
+			failf("invalid array: want %d elements but got %d", out.Len(), l)
+		}
 	case reflect.Interface:
 		// No type hints. Will have to use a generic sequence.
 		iface = out
@@ -500,7 +569,9 @@ func (d *decoder) sequence(n *node, out reflect.Value) (good bool) {
 			j++
 		}
 	}
-	out.Set(out.Slice(0, j))
+	if out.Kind() != reflect.Array {
+		out.Set(out.Slice(0, j))
+	}
 	if iface.IsValid() {
 		iface.Set(out)
 	}
@@ -561,7 +632,7 @@ func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
 			}
 			e := reflect.New(et).Elem()
 			if d.unmarshal(n.children[i+1], e) {
-				out.SetMapIndex(k, e)
+				d.setMapIndex(n.children[i+1], out, k, e)
 			}
 		}
 	}
@@ -569,6 +640,14 @@ func (d *decoder) mapping(n *node, out reflect.Value) (good bool) {
 	return true
 }
 
+func (d *decoder) setMapIndex(n *node, out, k, v reflect.Value) {
+	if d.strict && out.MapIndex(k) != zeroValue {
+		d.terrors = append(d.terrors, fmt.Sprintf("line %d: key %#v already set in map", n.line+1, k.Interface()))
+		return
+	}
+	out.SetMapIndex(k, v)
+}
+
 func (d *decoder) mappingSlice(n *node, out reflect.Value) (good bool) {
 	outt := out.Type()
 	if outt.Elem() != mapItemType {
@@ -616,6 +695,10 @@ func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
 		elemType = inlineMap.Type().Elem()
 	}
 
+	var doneFields []bool
+	if d.strict {
+		doneFields = make([]bool, len(sinfo.FieldsList))
+	}
 	for i := 0; i < l; i += 2 {
 		ni := n.children[i]
 		if isMerge(ni) {
@@ -626,6 +709,13 @@ func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
 			continue
 		}
 		if info, ok := sinfo.FieldsMap[name.String()]; ok {
+			if d.strict {
+				if doneFields[info.Id] {
+					d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s already set in type %s", ni.line+1, name.String(), out.Type()))
+					continue
+				}
+				doneFields[info.Id] = true
+			}
 			var field reflect.Value
 			if info.Inline == nil {
 				field = out.Field(info.Num)
@@ -639,9 +729,9 @@ func (d *decoder) mappingStruct(n *node, out reflect.Value) (good bool) {
 			}
 			value := reflect.New(elemType).Elem()
 			d.unmarshal(n.children[i+1], value)
-			inlineMap.SetMapIndex(name, value)
+			d.setMapIndex(n.children[i+1], inlineMap, name, value)
 		} else if d.strict {
-			d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in struct %s", n.line+1, name.String(), out.Type()))
+			d.terrors = append(d.terrors, fmt.Sprintf("line %d: field %s not found in type %s", ni.line+1, name.String(), out.Type()))
 		}
 	}
 	return true
diff --git a/installer/vendor/github.com/go-yaml/yaml/decode_test.go b/installer/vendor/github.com/go-yaml/yaml/decode_test.go
deleted file mode 100644
index 713b1ee9c4..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/decode_test.go
+++ /dev/null
@@ -1,1017 +0,0 @@
-package yaml_test
-
-import (
-	"errors"
-	. "gopkg.in/check.v1"
-	"gopkg.in/yaml.v2"
-	"math"
-	"net"
-	"reflect"
-	"strings"
-	"time"
-)
-
-var unmarshalIntTest = 123
-
-var unmarshalTests = []struct {
-	data  string
-	value interface{}
-}{
-	{
-		"",
-		&struct{}{},
-	}, {
-		"{}", &struct{}{},
-	}, {
-		"v: hi",
-		map[string]string{"v": "hi"},
-	}, {
-		"v: hi", map[string]interface{}{"v": "hi"},
-	}, {
-		"v: true",
-		map[string]string{"v": "true"},
-	}, {
-		"v: true",
-		map[string]interface{}{"v": true},
-	}, {
-		"v: 10",
-		map[string]interface{}{"v": 10},
-	}, {
-		"v: 0b10",
-		map[string]interface{}{"v": 2},
-	}, {
-		"v: 0xA",
-		map[string]interface{}{"v": 10},
-	}, {
-		"v: 4294967296",
-		map[string]int64{"v": 4294967296},
-	}, {
-		"v: 0.1",
-		map[string]interface{}{"v": 0.1},
-	}, {
-		"v: .1",
-		map[string]interface{}{"v": 0.1},
-	}, {
-		"v: .Inf",
-		map[string]interface{}{"v": math.Inf(+1)},
-	}, {
-		"v: -.Inf",
-		map[string]interface{}{"v": math.Inf(-1)},
-	}, {
-		"v: -10",
-		map[string]interface{}{"v": -10},
-	}, {
-		"v: -.1",
-		map[string]interface{}{"v": -0.1},
-	},
-
-	// Simple values.
-	{
-		"123",
-		&unmarshalIntTest,
-	},
-
-	// Floats from spec
-	{
-		"canonical: 6.8523e+5",
-		map[string]interface{}{"canonical": 6.8523e+5},
-	}, {
-		"expo: 685.230_15e+03",
-		map[string]interface{}{"expo": 685.23015e+03},
-	}, {
-		"fixed: 685_230.15",
-		map[string]interface{}{"fixed": 685230.15},
-	}, {
-		"neginf: -.inf",
-		map[string]interface{}{"neginf": math.Inf(-1)},
-	}, {
-		"fixed: 685_230.15",
-		map[string]float64{"fixed": 685230.15},
-	},
-	//{"sexa: 190:20:30.15", map[string]interface{}{"sexa": 0}}, // Unsupported
-	//{"notanum: .NaN", map[string]interface{}{"notanum": math.NaN()}}, // Equality of NaN fails.
-
-	// Bools from spec
-	{
-		"canonical: y",
-		map[string]interface{}{"canonical": true},
-	}, {
-		"answer: NO",
-		map[string]interface{}{"answer": false},
-	}, {
-		"logical: True",
-		map[string]interface{}{"logical": true},
-	}, {
-		"option: on",
-		map[string]interface{}{"option": true},
-	}, {
-		"option: on",
-		map[string]bool{"option": true},
-	},
-	// Ints from spec
-	{
-		"canonical: 685230",
-		map[string]interface{}{"canonical": 685230},
-	}, {
-		"decimal: +685_230",
-		map[string]interface{}{"decimal": 685230},
-	}, {
-		"octal: 02472256",
-		map[string]interface{}{"octal": 685230},
-	}, {
-		"hexa: 0x_0A_74_AE",
-		map[string]interface{}{"hexa": 685230},
-	}, {
-		"bin: 0b1010_0111_0100_1010_1110",
-		map[string]interface{}{"bin": 685230},
-	}, {
-		"bin: -0b101010",
-		map[string]interface{}{"bin": -42},
-	}, {
-		"decimal: +685_230",
-		map[string]int{"decimal": 685230},
-	},
-
-	//{"sexa: 190:20:30", map[string]interface{}{"sexa": 0}}, // Unsupported
-
-	// Nulls from spec
-	{
-		"empty:",
-		map[string]interface{}{"empty": nil},
-	}, {
-		"canonical: ~",
-		map[string]interface{}{"canonical": nil},
-	}, {
-		"english: null",
-		map[string]interface{}{"english": nil},
-	}, {
-		"~: null key",
-		map[interface{}]string{nil: "null key"},
-	}, {
-		"empty:",
-		map[string]*bool{"empty": nil},
-	},
-
-	// Flow sequence
-	{
-		"seq: [A,B]",
-		map[string]interface{}{"seq": []interface{}{"A", "B"}},
-	}, {
-		"seq: [A,B,C,]",
-		map[string][]string{"seq": []string{"A", "B", "C"}},
-	}, {
-		"seq: [A,1,C]",
-		map[string][]string{"seq": []string{"A", "1", "C"}},
-	}, {
-		"seq: [A,1,C]",
-		map[string][]int{"seq": []int{1}},
-	}, {
-		"seq: [A,1,C]",
-		map[string]interface{}{"seq": []interface{}{"A", 1, "C"}},
-	},
-	// Block sequence
-	{
-		"seq:\n - A\n - B",
-		map[string]interface{}{"seq": []interface{}{"A", "B"}},
-	}, {
-		"seq:\n - A\n - B\n - C",
-		map[string][]string{"seq": []string{"A", "B", "C"}},
-	}, {
-		"seq:\n - A\n - 1\n - C",
-		map[string][]string{"seq": []string{"A", "1", "C"}},
-	}, {
-		"seq:\n - A\n - 1\n - C",
-		map[string][]int{"seq": []int{1}},
-	}, {
-		"seq:\n - A\n - 1\n - C",
-		map[string]interface{}{"seq": []interface{}{"A", 1, "C"}},
-	},
-
-	// Literal block scalar
-	{
-		"scalar: | # Comment\n\n literal\n\n \ttext\n\n",
-		map[string]string{"scalar": "\nliteral\n\n\ttext\n"},
-	},
-
-	// Folded block scalar
-	{
-		"scalar: > # Comment\n\n folded\n line\n \n next\n line\n  * one\n  * two\n\n last\n line\n\n",
-		map[string]string{"scalar": "\nfolded line\nnext line\n * one\n * two\n\nlast line\n"},
-	},
-
-	// Map inside interface with no type hints.
-	{
-		"a: {b: c}",
-		map[interface{}]interface{}{"a": map[interface{}]interface{}{"b": "c"}},
-	},
-
-	// Structs and type conversions.
-	{
-		"hello: world",
-		&struct{ Hello string }{"world"},
-	}, {
-		"a: {b: c}",
-		&struct{ A struct{ B string } }{struct{ B string }{"c"}},
-	}, {
-		"a: {b: c}",
-		&struct{ A *struct{ B string } }{&struct{ B string }{"c"}},
-	}, {
-		"a: {b: c}",
-		&struct{ A map[string]string }{map[string]string{"b": "c"}},
-	}, {
-		"a: {b: c}",
-		&struct{ A *map[string]string }{&map[string]string{"b": "c"}},
-	}, {
-		"a:",
-		&struct{ A map[string]string }{},
-	}, {
-		"a: 1",
-		&struct{ A int }{1},
-	}, {
-		"a: 1",
-		&struct{ A float64 }{1},
-	}, {
-		"a: 1.0",
-		&struct{ A int }{1},
-	}, {
-		"a: 1.0",
-		&struct{ A uint }{1},
-	}, {
-		"a: [1, 2]",
-		&struct{ A []int }{[]int{1, 2}},
-	}, {
-		"a: 1",
-		&struct{ B int }{0},
-	}, {
-		"a: 1",
-		&struct {
-			B int "a"
-		}{1},
-	}, {
-		"a: y",
-		&struct{ A bool }{true},
-	},
-
-	// Some cross type conversions
-	{
-		"v: 42",
-		map[string]uint{"v": 42},
-	}, {
-		"v: -42",
-		map[string]uint{},
-	}, {
-		"v: 4294967296",
-		map[string]uint64{"v": 4294967296},
-	}, {
-		"v: -4294967296",
-		map[string]uint64{},
-	},
-
-	// int
-	{
-		"int_max: 2147483647",
-		map[string]int{"int_max": math.MaxInt32},
-	},
-	{
-		"int_min: -2147483648",
-		map[string]int{"int_min": math.MinInt32},
-	},
-	{
-		"int_overflow: 9223372036854775808", // math.MaxInt64 + 1
-		map[string]int{},
-	},
-
-	// int64
-	{
-		"int64_max: 9223372036854775807",
-		map[string]int64{"int64_max": math.MaxInt64},
-	},
-	{
-		"int64_max_base2: 0b111111111111111111111111111111111111111111111111111111111111111",
-		map[string]int64{"int64_max_base2": math.MaxInt64},
-	},
-	{
-		"int64_min: -9223372036854775808",
-		map[string]int64{"int64_min": math.MinInt64},
-	},
-	{
-		"int64_neg_base2: -0b111111111111111111111111111111111111111111111111111111111111111",
-		map[string]int64{"int64_neg_base2": -math.MaxInt64},
-	},
-	{
-		"int64_overflow: 9223372036854775808", // math.MaxInt64 + 1
-		map[string]int64{},
-	},
-
-	// uint
-	{
-		"uint_min: 0",
-		map[string]uint{"uint_min": 0},
-	},
-	{
-		"uint_max: 4294967295",
-		map[string]uint{"uint_max": math.MaxUint32},
-	},
-	{
-		"uint_underflow: -1",
-		map[string]uint{},
-	},
-
-	// uint64
-	{
-		"uint64_min: 0",
-		map[string]uint{"uint64_min": 0},
-	},
-	{
-		"uint64_max: 18446744073709551615",
-		map[string]uint64{"uint64_max": math.MaxUint64},
-	},
-	{
-		"uint64_max_base2: 0b1111111111111111111111111111111111111111111111111111111111111111",
-		map[string]uint64{"uint64_max_base2": math.MaxUint64},
-	},
-	{
-		"uint64_maxint64: 9223372036854775807",
-		map[string]uint64{"uint64_maxint64": math.MaxInt64},
-	},
-	{
-		"uint64_underflow: -1",
-		map[string]uint64{},
-	},
-
-	// float32
-	{
-		"float32_max: 3.40282346638528859811704183484516925440e+38",
-		map[string]float32{"float32_max": math.MaxFloat32},
-	},
-	{
-		"float32_nonzero: 1.401298464324817070923729583289916131280e-45",
-		map[string]float32{"float32_nonzero": math.SmallestNonzeroFloat32},
-	},
-	{
-		"float32_maxuint64: 18446744073709551615",
-		map[string]float32{"float32_maxuint64": float32(math.MaxUint64)},
-	},
-	{
-		"float32_maxuint64+1: 18446744073709551616",
-		map[string]float32{"float32_maxuint64+1": float32(math.MaxUint64 + 1)},
-	},
-
-	// float64
-	{
-		"float64_max: 1.797693134862315708145274237317043567981e+308",
-		map[string]float64{"float64_max": math.MaxFloat64},
-	},
-	{
-		"float64_nonzero: 4.940656458412465441765687928682213723651e-324",
-		map[string]float64{"float64_nonzero": math.SmallestNonzeroFloat64},
-	},
-	{
-		"float64_maxuint64: 18446744073709551615",
-		map[string]float64{"float64_maxuint64": float64(math.MaxUint64)},
-	},
-	{
-		"float64_maxuint64+1: 18446744073709551616",
-		map[string]float64{"float64_maxuint64+1": float64(math.MaxUint64 + 1)},
-	},
-
-	// Overflow cases.
-	{
-		"v: 4294967297",
-		map[string]int32{},
-	}, {
-		"v: 128",
-		map[string]int8{},
-	},
-
-	// Quoted values.
-	{
-		"'1': '\"2\"'",
-		map[interface{}]interface{}{"1": "\"2\""},
-	}, {
-		"v:\n- A\n- 'B\n\n  C'\n",
-		map[string][]string{"v": []string{"A", "B\nC"}},
-	},
-
-	// Explicit tags.
-	{
-		"v: !!float '1.1'",
-		map[string]interface{}{"v": 1.1},
-	}, {
-		"v: !!null ''",
-		map[string]interface{}{"v": nil},
-	}, {
-		"%TAG !y! tag:yaml.org,2002:\n---\nv: !y!int '1'",
-		map[string]interface{}{"v": 1},
-	},
-
-	// Non-specific tag (Issue #75)
-	{
-		"v: ! test",
-		map[string]interface{}{"v": "test"},
-	},
-
-	// Anchors and aliases.
-	{
-		"a: &x 1\nb: &y 2\nc: *x\nd: *y\n",
-		&struct{ A, B, C, D int }{1, 2, 1, 2},
-	}, {
-		"a: &a {c: 1}\nb: *a",
-		&struct {
-			A, B struct {
-				C int
-			}
-		}{struct{ C int }{1}, struct{ C int }{1}},
-	}, {
-		"a: &a [1, 2]\nb: *a",
-		&struct{ B []int }{[]int{1, 2}},
-	}, {
-		"b: *a\na: &a {c: 1}",
-		&struct {
-			A, B struct {
-				C int
-			}
-		}{struct{ C int }{1}, struct{ C int }{1}},
-	},
-
-	// Bug #1133337
-	{
-		"foo: ''",
-		map[string]*string{"foo": new(string)},
-	}, {
-		"foo: null",
-		map[string]string{"foo": ""},
-	}, {
-		"foo: null",
-		map[string]interface{}{"foo": nil},
-	},
-
-	// Ignored field
-	{
-		"a: 1\nb: 2\n",
-		&struct {
-			A int
-			B int "-"
-		}{1, 0},
-	},
-
-	// Bug #1191981
-	{
-		"" +
-			"%YAML 1.1\n" +
-			"--- !!str\n" +
-			`"Generic line break (no glyph)\n\` + "\n" +
-			` Generic line break (glyphed)\n\` + "\n" +
-			` Line separator\u2028\` + "\n" +
-			` Paragraph separator\u2029"` + "\n",
-		"" +
-			"Generic line break (no glyph)\n" +
-			"Generic line break (glyphed)\n" +
-			"Line separator\u2028Paragraph separator\u2029",
-	},
-
-	// Struct inlining
-	{
-		"a: 1\nb: 2\nc: 3\n",
-		&struct {
-			A int
-			C inlineB `yaml:",inline"`
-		}{1, inlineB{2, inlineC{3}}},
-	},
-
-	// Map inlining
-	{
-		"a: 1\nb: 2\nc: 3\n",
-		&struct {
-			A int
-			C map[string]int `yaml:",inline"`
-		}{1, map[string]int{"b": 2, "c": 3}},
-	},
-
-	// bug 1243827
-	{
-		"a: -b_c",
-		map[string]interface{}{"a": "-b_c"},
-	},
-	{
-		"a: +b_c",
-		map[string]interface{}{"a": "+b_c"},
-	},
-	{
-		"a: 50cent_of_dollar",
-		map[string]interface{}{"a": "50cent_of_dollar"},
-	},
-
-	// Duration
-	{
-		"a: 3s",
-		map[string]time.Duration{"a": 3 * time.Second},
-	},
-
-	// Issue #24.
-	{
-		"a: <foo>",
-		map[string]string{"a": "<foo>"},
-	},
-
-	// Base 60 floats are obsolete and unsupported.
-	{
-		"a: 1:1\n",
-		map[string]string{"a": "1:1"},
-	},
-
-	// Binary data.
-	{
-		"a: !!binary gIGC\n",
-		map[string]string{"a": "\x80\x81\x82"},
-	}, {
-		"a: !!binary |\n  " + strings.Repeat("kJCQ", 17) + "kJ\n  CQ\n",
-		map[string]string{"a": strings.Repeat("\x90", 54)},
-	}, {
-		"a: !!binary |\n  " + strings.Repeat("A", 70) + "\n  ==\n",
-		map[string]string{"a": strings.Repeat("\x00", 52)},
-	},
-
-	// Ordered maps.
-	{
-		"{b: 2, a: 1, d: 4, c: 3, sub: {e: 5}}",
-		&yaml.MapSlice{{"b", 2}, {"a", 1}, {"d", 4}, {"c", 3}, {"sub", yaml.MapSlice{{"e", 5}}}},
-	},
-
-	// Issue #39.
-	{
-		"a:\n b:\n  c: d\n",
-		map[string]struct{ B interface{} }{"a": {map[interface{}]interface{}{"c": "d"}}},
-	},
-
-	// Custom map type.
-	{
-		"a: {b: c}",
-		M{"a": M{"b": "c"}},
-	},
-
-	// Support encoding.TextUnmarshaler.
-	{
-		"a: 1.2.3.4\n",
-		map[string]net.IP{"a": net.IPv4(1, 2, 3, 4)},
-	},
-	{
-		"a: 2015-02-24T18:19:39Z\n",
-		map[string]time.Time{"a": time.Unix(1424801979, 0).In(time.UTC)},
-	},
-
-	// Encode empty lists as zero-length slices.
-	{
-		"a: []",
-		&struct{ A []int }{[]int{}},
-	},
-
-	// UTF-16-LE
-	{
-		"\xff\xfe\xf1\x00o\x00\xf1\x00o\x00:\x00 \x00v\x00e\x00r\x00y\x00 \x00y\x00e\x00s\x00\n\x00",
-		M{"ñoño": "very yes"},
-	},
-	// UTF-16-LE with surrogate.
-	{
-		"\xff\xfe\xf1\x00o\x00\xf1\x00o\x00:\x00 \x00v\x00e\x00r\x00y\x00 \x00y\x00e\x00s\x00 \x00=\xd8\xd4\xdf\n\x00",
-		M{"ñoño": "very yes 🟔"},
-	},
-
-	// UTF-16-BE
-	{
-		"\xfe\xff\x00\xf1\x00o\x00\xf1\x00o\x00:\x00 \x00v\x00e\x00r\x00y\x00 \x00y\x00e\x00s\x00\n",
-		M{"ñoño": "very yes"},
-	},
-	// UTF-16-BE with surrogate.
-	{
-		"\xfe\xff\x00\xf1\x00o\x00\xf1\x00o\x00:\x00 \x00v\x00e\x00r\x00y\x00 \x00y\x00e\x00s\x00 \xd8=\xdf\xd4\x00\n",
-		M{"ñoño": "very yes 🟔"},
-	},
-
-	// YAML Float regex shouldn't match this
-	{
-		"a: 123456e1\n",
-		M{"a": "123456e1"},
-	}, {
-		"a: 123456E1\n",
-		M{"a": "123456E1"},
-	},
-}
-
-type M map[interface{}]interface{}
-
-type inlineB struct {
-	B       int
-	inlineC `yaml:",inline"`
-}
-
-type inlineC struct {
-	C int
-}
-
-func (s *S) TestUnmarshal(c *C) {
-	for i, item := range unmarshalTests {
-		c.Logf("test %d: %q", i, item.data)
-		t := reflect.ValueOf(item.value).Type()
-		var value interface{}
-		switch t.Kind() {
-		case reflect.Map:
-			value = reflect.MakeMap(t).Interface()
-		case reflect.String:
-			value = reflect.New(t).Interface()
-		case reflect.Ptr:
-			value = reflect.New(t.Elem()).Interface()
-		default:
-			c.Fatalf("missing case for %s", t)
-		}
-		err := yaml.Unmarshal([]byte(item.data), value)
-		if _, ok := err.(*yaml.TypeError); !ok {
-			c.Assert(err, IsNil)
-		}
-		if t.Kind() == reflect.String {
-			c.Assert(*value.(*string), Equals, item.value)
-		} else {
-			c.Assert(value, DeepEquals, item.value)
-		}
-	}
-}
-
-func (s *S) TestUnmarshalNaN(c *C) {
-	value := map[string]interface{}{}
-	err := yaml.Unmarshal([]byte("notanum: .NaN"), &value)
-	c.Assert(err, IsNil)
-	c.Assert(math.IsNaN(value["notanum"].(float64)), Equals, true)
-}
-
-var unmarshalErrorTests = []struct {
-	data, error string
-}{
-	{"v: !!float 'error'", "yaml: cannot decode !!str `error` as a !!float"},
-	{"v: [A,", "yaml: line 1: did not find expected node content"},
-	{"v:\n- [A,", "yaml: line 2: did not find expected node content"},
-	{"a: *b\n", "yaml: unknown anchor 'b' referenced"},
-	{"a: &a\n  b: *a\n", "yaml: anchor 'a' value contains itself"},
-	{"value: -", "yaml: block sequence entries are not allowed in this context"},
-	{"a: !!binary ==", "yaml: !!binary value contains invalid base64 data"},
-	{"{[.]}", `yaml: invalid map key: \[\]interface \{\}\{"\."\}`},
-	{"{{.}}", `yaml: invalid map key: map\[interface\ \{\}\]interface \{\}\{".":interface \{\}\(nil\)\}`},
-	{"%TAG !%79! tag:yaml.org,2002:\n---\nv: !%79!int '1'", "yaml: did not find expected whitespace"},
-}
-
-func (s *S) TestUnmarshalErrors(c *C) {
-	for _, item := range unmarshalErrorTests {
-		var value interface{}
-		err := yaml.Unmarshal([]byte(item.data), &value)
-		c.Assert(err, ErrorMatches, item.error, Commentf("Partial unmarshal: %#v", value))
-	}
-}
-
-var unmarshalerTests = []struct {
-	data, tag string
-	value     interface{}
-}{
-	{"_: {hi: there}", "!!map", map[interface{}]interface{}{"hi": "there"}},
-	{"_: [1,A]", "!!seq", []interface{}{1, "A"}},
-	{"_: 10", "!!int", 10},
-	{"_: null", "!!null", nil},
-	{`_: BAR!`, "!!str", "BAR!"},
-	{`_: "BAR!"`, "!!str", "BAR!"},
-	{"_: !!foo 'BAR!'", "!!foo", "BAR!"},
-	{`_: ""`, "!!str", ""},
-}
-
-var unmarshalerResult = map[int]error{}
-
-type unmarshalerType struct {
-	value interface{}
-}
-
-func (o *unmarshalerType) UnmarshalYAML(unmarshal func(v interface{}) error) error {
-	if err := unmarshal(&o.value); err != nil {
-		return err
-	}
-	if i, ok := o.value.(int); ok {
-		if result, ok := unmarshalerResult[i]; ok {
-			return result
-		}
-	}
-	return nil
-}
-
-type unmarshalerPointer struct {
-	Field *unmarshalerType "_"
-}
-
-type unmarshalerValue struct {
-	Field unmarshalerType "_"
-}
-
-func (s *S) TestUnmarshalerPointerField(c *C) {
-	for _, item := range unmarshalerTests {
-		obj := &unmarshalerPointer{}
-		err := yaml.Unmarshal([]byte(item.data), obj)
-		c.Assert(err, IsNil)
-		if item.value == nil {
-			c.Assert(obj.Field, IsNil)
-		} else {
-			c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
-			c.Assert(obj.Field.value, DeepEquals, item.value)
-		}
-	}
-}
-
-func (s *S) TestUnmarshalerValueField(c *C) {
-	for _, item := range unmarshalerTests {
-		obj := &unmarshalerValue{}
-		err := yaml.Unmarshal([]byte(item.data), obj)
-		c.Assert(err, IsNil)
-		c.Assert(obj.Field, NotNil, Commentf("Pointer not initialized (%#v)", item.value))
-		c.Assert(obj.Field.value, DeepEquals, item.value)
-	}
-}
-
-func (s *S) TestUnmarshalerWholeDocument(c *C) {
-	obj := &unmarshalerType{}
-	err := yaml.Unmarshal([]byte(unmarshalerTests[0].data), obj)
-	c.Assert(err, IsNil)
-	value, ok := obj.value.(map[interface{}]interface{})
-	c.Assert(ok, Equals, true, Commentf("value: %#v", obj.value))
-	c.Assert(value["_"], DeepEquals, unmarshalerTests[0].value)
-}
-
-func (s *S) TestUnmarshalerTypeError(c *C) {
-	unmarshalerResult[2] = &yaml.TypeError{[]string{"foo"}}
-	unmarshalerResult[4] = &yaml.TypeError{[]string{"bar"}}
-	defer func() {
-		delete(unmarshalerResult, 2)
-		delete(unmarshalerResult, 4)
-	}()
-
-	type T struct {
-		Before int
-		After  int
-		M      map[string]*unmarshalerType
-	}
-	var v T
-	data := `{before: A, m: {abc: 1, def: 2, ghi: 3, jkl: 4}, after: B}`
-	err := yaml.Unmarshal([]byte(data), &v)
-	c.Assert(err, ErrorMatches, ""+
-		"yaml: unmarshal errors:\n"+
-		"  line 1: cannot unmarshal !!str `A` into int\n"+
-		"  foo\n"+
-		"  bar\n"+
-		"  line 1: cannot unmarshal !!str `B` into int")
-	c.Assert(v.M["abc"], NotNil)
-	c.Assert(v.M["def"], IsNil)
-	c.Assert(v.M["ghi"], NotNil)
-	c.Assert(v.M["jkl"], IsNil)
-
-	c.Assert(v.M["abc"].value, Equals, 1)
-	c.Assert(v.M["ghi"].value, Equals, 3)
-}
-
-type proxyTypeError struct{}
-
-func (v *proxyTypeError) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var s string
-	var a int32
-	var b int64
-	if err := unmarshal(&s); err != nil {
-		panic(err)
-	}
-	if s == "a" {
-		if err := unmarshal(&b); err == nil {
-			panic("should have failed")
-		}
-		return unmarshal(&a)
-	}
-	if err := unmarshal(&a); err == nil {
-		panic("should have failed")
-	}
-	return unmarshal(&b)
-}
-
-func (s *S) TestUnmarshalerTypeErrorProxying(c *C) {
-	type T struct {
-		Before int
-		After  int
-		M      map[string]*proxyTypeError
-	}
-	var v T
-	data := `{before: A, m: {abc: a, def: b}, after: B}`
-	err := yaml.Unmarshal([]byte(data), &v)
-	c.Assert(err, ErrorMatches, ""+
-		"yaml: unmarshal errors:\n"+
-		"  line 1: cannot unmarshal !!str `A` into int\n"+
-		"  line 1: cannot unmarshal !!str `a` into int32\n"+
-		"  line 1: cannot unmarshal !!str `b` into int64\n"+
-		"  line 1: cannot unmarshal !!str `B` into int")
-}
-
-type failingUnmarshaler struct{}
-
-var failingErr = errors.New("failingErr")
-
-func (ft *failingUnmarshaler) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	return failingErr
-}
-
-func (s *S) TestUnmarshalerError(c *C) {
-	err := yaml.Unmarshal([]byte("a: b"), &failingUnmarshaler{})
-	c.Assert(err, Equals, failingErr)
-}
-
-type sliceUnmarshaler []int
-
-func (su *sliceUnmarshaler) UnmarshalYAML(unmarshal func(interface{}) error) error {
-	var slice []int
-	err := unmarshal(&slice)
-	if err == nil {
-		*su = slice
-		return nil
-	}
-
-	var intVal int
-	err = unmarshal(&intVal)
-	if err == nil {
-		*su = []int{intVal}
-		return nil
-	}
-
-	return err
-}
-
-func (s *S) TestUnmarshalerRetry(c *C) {
-	var su sliceUnmarshaler
-	err := yaml.Unmarshal([]byte("[1, 2, 3]"), &su)
-	c.Assert(err, IsNil)
-	c.Assert(su, DeepEquals, sliceUnmarshaler([]int{1, 2, 3}))
-
-	err = yaml.Unmarshal([]byte("1"), &su)
-	c.Assert(err, IsNil)
-	c.Assert(su, DeepEquals, sliceUnmarshaler([]int{1}))
-}
-
-// From http://yaml.org/type/merge.html
-var mergeTests = `
-anchors:
-  list:
-    - &CENTER { "x": 1, "y": 2 }
-    - &LEFT   { "x": 0, "y": 2 }
-    - &BIG    { "r": 10 }
-    - &SMALL  { "r": 1 }
-
-# All the following maps are equal:
-
-plain:
-  # Explicit keys
-  "x": 1
-  "y": 2
-  "r": 10
-  label: center/big
-
-mergeOne:
-  # Merge one map
-  << : *CENTER
-  "r": 10
-  label: center/big
-
-mergeMultiple:
-  # Merge multiple maps
-  << : [ *CENTER, *BIG ]
-  label: center/big
-
-override:
-  # Override
-  << : [ *BIG, *LEFT, *SMALL ]
-  "x": 1
-  label: center/big
-
-shortTag:
-  # Explicit short merge tag
-  !!merge "<<" : [ *CENTER, *BIG ]
-  label: center/big
-
-longTag:
-  # Explicit merge long tag
-  !<tag:yaml.org,2002:merge> "<<" : [ *CENTER, *BIG ]
-  label: center/big
-
-inlineMap:
-  # Inlined map 
-  << : {"x": 1, "y": 2, "r": 10}
-  label: center/big
-
-inlineSequenceMap:
-  # Inlined map in sequence
-  << : [ *CENTER, {"r": 10} ]
-  label: center/big
-`
-
-func (s *S) TestMerge(c *C) {
-	var want = map[interface{}]interface{}{
-		"x":     1,
-		"y":     2,
-		"r":     10,
-		"label": "center/big",
-	}
-
-	var m map[interface{}]interface{}
-	err := yaml.Unmarshal([]byte(mergeTests), &m)
-	c.Assert(err, IsNil)
-	for name, test := range m {
-		if name == "anchors" {
-			continue
-		}
-		c.Assert(test, DeepEquals, want, Commentf("test %q failed", name))
-	}
-}
-
-func (s *S) TestMergeStruct(c *C) {
-	type Data struct {
-		X, Y, R int
-		Label   string
-	}
-	want := Data{1, 2, 10, "center/big"}
-
-	var m map[string]Data
-	err := yaml.Unmarshal([]byte(mergeTests), &m)
-	c.Assert(err, IsNil)
-	for name, test := range m {
-		if name == "anchors" {
-			continue
-		}
-		c.Assert(test, Equals, want, Commentf("test %q failed", name))
-	}
-}
-
-var unmarshalNullTests = []func() interface{}{
-	func() interface{} { var v interface{}; v = "v"; return &v },
-	func() interface{} { var s = "s"; return &s },
-	func() interface{} { var s = "s"; sptr := &s; return &sptr },
-	func() interface{} { var i = 1; return &i },
-	func() interface{} { var i = 1; iptr := &i; return &iptr },
-	func() interface{} { m := map[string]int{"s": 1}; return &m },
-	func() interface{} { m := map[string]int{"s": 1}; return m },
-}
-
-func (s *S) TestUnmarshalNull(c *C) {
-	for _, test := range unmarshalNullTests {
-		item := test()
-		zero := reflect.Zero(reflect.TypeOf(item).Elem()).Interface()
-		err := yaml.Unmarshal([]byte("null"), item)
-		c.Assert(err, IsNil)
-		if reflect.TypeOf(item).Kind() == reflect.Map {
-			c.Assert(reflect.ValueOf(item).Interface(), DeepEquals, reflect.MakeMap(reflect.TypeOf(item)).Interface())
-		} else {
-			c.Assert(reflect.ValueOf(item).Elem().Interface(), DeepEquals, zero)
-		}
-	}
-}
-
-func (s *S) TestUnmarshalSliceOnPreset(c *C) {
-	// Issue #48.
-	v := struct{ A []int }{[]int{1}}
-	yaml.Unmarshal([]byte("a: [2]"), &v)
-	c.Assert(v.A, DeepEquals, []int{2})
-}
-
-func (s *S) TestUnmarshalStrict(c *C) {
-	v := struct{ A, B int }{}
-
-	err := yaml.UnmarshalStrict([]byte("a: 1\nb: 2"), &v)
-	c.Check(err, IsNil)
-	err = yaml.Unmarshal([]byte("a: 1\nb: 2\nc: 3"), &v)
-	c.Check(err, IsNil)
-	err = yaml.UnmarshalStrict([]byte("a: 1\nb: 2\nc: 3"), &v)
-	c.Check(err, ErrorMatches, "yaml: unmarshal errors:\n  line 1: field c not found in struct struct { A int; B int }")
-}
-
-//var data []byte
-//func init() {
-//	var err error
-//	data, err = ioutil.ReadFile("/tmp/file.yaml")
-//	if err != nil {
-//		panic(err)
-//	}
-//}
-//
-//func (s *S) BenchmarkUnmarshal(c *C) {
-//	var err error
-//	for i := 0; i < c.N; i++ {
-//		var v map[string]interface{}
-//		err = yaml.Unmarshal(data, &v)
-//	}
-//	if err != nil {
-//		panic(err)
-//	}
-//}
-//
-//func (s *S) BenchmarkMarshal(c *C) {
-//	var v map[string]interface{}
-//	yaml.Unmarshal(data, &v)
-//	c.ResetTimer()
-//	for i := 0; i < c.N; i++ {
-//		yaml.Marshal(&v)
-//	}
-//}
diff --git a/installer/vendor/github.com/go-yaml/yaml/emitterc.go b/installer/vendor/github.com/go-yaml/yaml/emitterc.go
index 41de8b856c..a1c2cc5262 100644
--- a/installer/vendor/github.com/go-yaml/yaml/emitterc.go
+++ b/installer/vendor/github.com/go-yaml/yaml/emitterc.go
@@ -2,6 +2,7 @@ package yaml
 
 import (
 	"bytes"
+	"fmt"
 )
 
 // Flush the buffer if needed.
@@ -664,7 +665,7 @@ func yaml_emitter_emit_node(emitter *yaml_emitter_t, event *yaml_event_t,
 		return yaml_emitter_emit_mapping_start(emitter, event)
 	default:
 		return yaml_emitter_set_emitter_error(emitter,
-			"expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS")
+			fmt.Sprintf("expected SCALAR, SEQUENCE-START, MAPPING-START, or ALIAS, but got %v", event.typ))
 	}
 }
 
@@ -842,7 +843,7 @@ func yaml_emitter_select_scalar_style(emitter *yaml_emitter_t, event *yaml_event
 	return true
 }
 
-// Write an achor.
+// Write an anchor.
 func yaml_emitter_process_anchor(emitter *yaml_emitter_t) bool {
 	if emitter.anchor_data.anchor == nil {
 		return true
@@ -995,9 +996,9 @@ func yaml_emitter_analyze_scalar(emitter *yaml_emitter_t, value []byte) bool {
 		space_break    = false
 
 		preceded_by_whitespace = false
-		followed_by_whitespace  = false
-		previous_space          = false
-		previous_break          = false
+		followed_by_whitespace = false
+		previous_space         = false
+		previous_break         = false
 	)
 
 	emitter.scalar_data.value = value
diff --git a/installer/vendor/github.com/go-yaml/yaml/encode.go b/installer/vendor/github.com/go-yaml/yaml/encode.go
index 84f8499551..a14435e82f 100644
--- a/installer/vendor/github.com/go-yaml/yaml/encode.go
+++ b/installer/vendor/github.com/go-yaml/yaml/encode.go
@@ -3,12 +3,14 @@ package yaml
 import (
 	"encoding"
 	"fmt"
+	"io"
 	"reflect"
 	"regexp"
 	"sort"
 	"strconv"
 	"strings"
 	"time"
+	"unicode/utf8"
 )
 
 type encoder struct {
@@ -16,25 +18,39 @@ type encoder struct {
 	event   yaml_event_t
 	out     []byte
 	flow    bool
+	// doneInit holds whether the initial stream_start_event has been
+	// emitted.
+	doneInit bool
 }
 
-func newEncoder() (e *encoder) {
-	e = &encoder{}
-	e.must(yaml_emitter_initialize(&e.emitter))
+func newEncoder() *encoder {
+	e := &encoder{}
+	yaml_emitter_initialize(&e.emitter)
 	yaml_emitter_set_output_string(&e.emitter, &e.out)
 	yaml_emitter_set_unicode(&e.emitter, true)
-	e.must(yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING))
-	e.emit()
-	e.must(yaml_document_start_event_initialize(&e.event, nil, nil, true))
-	e.emit()
 	return e
 }
 
-func (e *encoder) finish() {
-	e.must(yaml_document_end_event_initialize(&e.event, true))
+func newEncoderWithWriter(w io.Writer) *encoder {
+	e := &encoder{}
+	yaml_emitter_initialize(&e.emitter)
+	yaml_emitter_set_output_writer(&e.emitter, w)
+	yaml_emitter_set_unicode(&e.emitter, true)
+	return e
+}
+
+func (e *encoder) init() {
+	if e.doneInit {
+		return
+	}
+	yaml_stream_start_event_initialize(&e.event, yaml_UTF8_ENCODING)
 	e.emit()
+	e.doneInit = true
+}
+
+func (e *encoder) finish() {
 	e.emitter.open_ended = false
-	e.must(yaml_stream_end_event_initialize(&e.event))
+	yaml_stream_end_event_initialize(&e.event)
 	e.emit()
 }
 
@@ -44,9 +60,7 @@ func (e *encoder) destroy() {
 
 func (e *encoder) emit() {
 	// This will internally delete the e.event value.
-	if !yaml_emitter_emit(&e.emitter, &e.event) && e.event.typ != yaml_DOCUMENT_END_EVENT && e.event.typ != yaml_STREAM_END_EVENT {
-		e.must(false)
-	}
+	e.must(yaml_emitter_emit(&e.emitter, &e.event))
 }
 
 func (e *encoder) must(ok bool) {
@@ -59,13 +73,28 @@ func (e *encoder) must(ok bool) {
 	}
 }
 
+func (e *encoder) marshalDoc(tag string, in reflect.Value) {
+	e.init()
+	yaml_document_start_event_initialize(&e.event, nil, nil, true)
+	e.emit()
+	e.marshal(tag, in)
+	yaml_document_end_event_initialize(&e.event, true)
+	e.emit()
+}
+
 func (e *encoder) marshal(tag string, in reflect.Value) {
-	if !in.IsValid() {
+	if !in.IsValid() || in.Kind() == reflect.Ptr && in.IsNil() {
 		e.nilv()
 		return
 	}
 	iface := in.Interface()
-	if m, ok := iface.(Marshaler); ok {
+	switch m := iface.(type) {
+	case time.Time, *time.Time:
+		// Although time.Time implements TextMarshaler,
+		// we don't want to treat it as a string for YAML
+		// purposes because YAML has special support for
+		// timestamps.
+	case Marshaler:
 		v, err := m.MarshalYAML()
 		if err != nil {
 			fail(err)
@@ -75,31 +104,34 @@ func (e *encoder) marshal(tag string, in reflect.Value) {
 			return
 		}
 		in = reflect.ValueOf(v)
-	} else if m, ok := iface.(encoding.TextMarshaler); ok {
+	case encoding.TextMarshaler:
 		text, err := m.MarshalText()
 		if err != nil {
 			fail(err)
 		}
 		in = reflect.ValueOf(string(text))
+	case nil:
+		e.nilv()
+		return
 	}
 	switch in.Kind() {
 	case reflect.Interface:
-		if in.IsNil() {
-			e.nilv()
-		} else {
-			e.marshal(tag, in.Elem())
-		}
+		e.marshal(tag, in.Elem())
 	case reflect.Map:
 		e.mapv(tag, in)
 	case reflect.Ptr:
-		if in.IsNil() {
-			e.nilv()
+		if in.Type() == ptrTimeType {
+			e.timev(tag, in.Elem())
 		} else {
 			e.marshal(tag, in.Elem())
 		}
 	case reflect.Struct:
-		e.structv(tag, in)
-	case reflect.Slice:
+		if in.Type() == timeType {
+			e.timev(tag, in)
+		} else {
+			e.structv(tag, in)
+		}
+	case reflect.Slice, reflect.Array:
 		if in.Type().Elem() == mapItemType {
 			e.itemsv(tag, in)
 		} else {
@@ -191,10 +223,10 @@ func (e *encoder) mappingv(tag string, f func()) {
 		e.flow = false
 		style = yaml_FLOW_MAPPING_STYLE
 	}
-	e.must(yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style))
+	yaml_mapping_start_event_initialize(&e.event, nil, []byte(tag), implicit, style)
 	e.emit()
 	f()
-	e.must(yaml_mapping_end_event_initialize(&e.event))
+	yaml_mapping_end_event_initialize(&e.event)
 	e.emit()
 }
 
@@ -240,23 +272,36 @@ var base60float = regexp.MustCompile(`^[-+]?[0-9][0-9_]*(?::[0-5]?[0-9])+(?:\.[0
 func (e *encoder) stringv(tag string, in reflect.Value) {
 	var style yaml_scalar_style_t
 	s := in.String()
-	rtag, rs := resolve("", s)
-	if rtag == yaml_BINARY_TAG {
-		if tag == "" || tag == yaml_STR_TAG {
-			tag = rtag
-			s = rs.(string)
-		} else if tag == yaml_BINARY_TAG {
+	canUsePlain := true
+	switch {
+	case !utf8.ValidString(s):
+		if tag == yaml_BINARY_TAG {
 			failf("explicitly tagged !!binary data must be base64-encoded")
-		} else {
+		}
+		if tag != "" {
 			failf("cannot marshal invalid UTF-8 data as %s", shortTag(tag))
 		}
+		// It can't be encoded directly as YAML so use a binary tag
+		// and encode it as base64.
+		tag = yaml_BINARY_TAG
+		s = encodeBase64(s)
+	case tag == "":
+		// Check to see if it would resolve to a specific
+		// tag when encoded unquoted. If it doesn't,
+		// there's no need to quote it.
+		rtag, _ := resolve("", s)
+		canUsePlain = rtag == yaml_STR_TAG && !isBase60Float(s)
 	}
-	if tag == "" && (rtag != yaml_STR_TAG || isBase60Float(s)) {
-		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
-	} else if strings.Contains(s, "\n") {
+	// Note: it's possible for user code to emit invalid YAML
+	// if they explicitly specify a tag and a string containing
+	// text that's incompatible with that tag.
+	switch {
+	case strings.Contains(s, "\n"):
 		style = yaml_LITERAL_SCALAR_STYLE
-	} else {
+	case canUsePlain:
 		style = yaml_PLAIN_SCALAR_STYLE
+	default:
+		style = yaml_DOUBLE_QUOTED_SCALAR_STYLE
 	}
 	e.emitScalar(s, "", tag, style)
 }
@@ -281,9 +326,20 @@ func (e *encoder) uintv(tag string, in reflect.Value) {
 	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
 }
 
+func (e *encoder) timev(tag string, in reflect.Value) {
+	t := in.Interface().(time.Time)
+	s := t.Format(time.RFC3339Nano)
+	e.emitScalar(s, "", tag, yaml_PLAIN_SCALAR_STYLE)
+}
+
 func (e *encoder) floatv(tag string, in reflect.Value) {
-	// FIXME: Handle 64 bits here.
-	s := strconv.FormatFloat(float64(in.Float()), 'g', -1, 32)
+	// Issue #352: When formatting, use the precision of the underlying value
+	precision := 64
+	if in.Kind() == reflect.Float32 {
+		precision = 32
+	}
+
+	s := strconv.FormatFloat(in.Float(), 'g', -1, precision)
 	switch s {
 	case "+Inf":
 		s = ".inf"
diff --git a/installer/vendor/github.com/go-yaml/yaml/encode_test.go b/installer/vendor/github.com/go-yaml/yaml/encode_test.go
deleted file mode 100644
index 84099bd385..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/encode_test.go
+++ /dev/null
@@ -1,501 +0,0 @@
-package yaml_test
-
-import (
-	"fmt"
-	"math"
-	"strconv"
-	"strings"
-	"time"
-
-	. "gopkg.in/check.v1"
-	"gopkg.in/yaml.v2"
-	"net"
-	"os"
-)
-
-var marshalIntTest = 123
-
-var marshalTests = []struct {
-	value interface{}
-	data  string
-}{
-	{
-		nil,
-		"null\n",
-	}, {
-		&struct{}{},
-		"{}\n",
-	}, {
-		map[string]string{"v": "hi"},
-		"v: hi\n",
-	}, {
-		map[string]interface{}{"v": "hi"},
-		"v: hi\n",
-	}, {
-		map[string]string{"v": "true"},
-		"v: \"true\"\n",
-	}, {
-		map[string]string{"v": "false"},
-		"v: \"false\"\n",
-	}, {
-		map[string]interface{}{"v": true},
-		"v: true\n",
-	}, {
-		map[string]interface{}{"v": false},
-		"v: false\n",
-	}, {
-		map[string]interface{}{"v": 10},
-		"v: 10\n",
-	}, {
-		map[string]interface{}{"v": -10},
-		"v: -10\n",
-	}, {
-		map[string]uint{"v": 42},
-		"v: 42\n",
-	}, {
-		map[string]interface{}{"v": int64(4294967296)},
-		"v: 4294967296\n",
-	}, {
-		map[string]int64{"v": int64(4294967296)},
-		"v: 4294967296\n",
-	}, {
-		map[string]uint64{"v": 4294967296},
-		"v: 4294967296\n",
-	}, {
-		map[string]interface{}{"v": "10"},
-		"v: \"10\"\n",
-	}, {
-		map[string]interface{}{"v": 0.1},
-		"v: 0.1\n",
-	}, {
-		map[string]interface{}{"v": float64(0.1)},
-		"v: 0.1\n",
-	}, {
-		map[string]interface{}{"v": -0.1},
-		"v: -0.1\n",
-	}, {
-		map[string]interface{}{"v": math.Inf(+1)},
-		"v: .inf\n",
-	}, {
-		map[string]interface{}{"v": math.Inf(-1)},
-		"v: -.inf\n",
-	}, {
-		map[string]interface{}{"v": math.NaN()},
-		"v: .nan\n",
-	}, {
-		map[string]interface{}{"v": nil},
-		"v: null\n",
-	}, {
-		map[string]interface{}{"v": ""},
-		"v: \"\"\n",
-	}, {
-		map[string][]string{"v": []string{"A", "B"}},
-		"v:\n- A\n- B\n",
-	}, {
-		map[string][]string{"v": []string{"A", "B\nC"}},
-		"v:\n- A\n- |-\n  B\n  C\n",
-	}, {
-		map[string][]interface{}{"v": []interface{}{"A", 1, map[string][]int{"B": []int{2, 3}}}},
-		"v:\n- A\n- 1\n- B:\n  - 2\n  - 3\n",
-	}, {
-		map[string]interface{}{"a": map[interface{}]interface{}{"b": "c"}},
-		"a:\n  b: c\n",
-	}, {
-		map[string]interface{}{"a": "-"},
-		"a: '-'\n",
-	},
-
-	// Simple values.
-	{
-		&marshalIntTest,
-		"123\n",
-	},
-
-	// Structures
-	{
-		&struct{ Hello string }{"world"},
-		"hello: world\n",
-	}, {
-		&struct {
-			A struct {
-				B string
-			}
-		}{struct{ B string }{"c"}},
-		"a:\n  b: c\n",
-	}, {
-		&struct {
-			A *struct {
-				B string
-			}
-		}{&struct{ B string }{"c"}},
-		"a:\n  b: c\n",
-	}, {
-		&struct {
-			A *struct {
-				B string
-			}
-		}{},
-		"a: null\n",
-	}, {
-		&struct{ A int }{1},
-		"a: 1\n",
-	}, {
-		&struct{ A []int }{[]int{1, 2}},
-		"a:\n- 1\n- 2\n",
-	}, {
-		&struct {
-			B int "a"
-		}{1},
-		"a: 1\n",
-	}, {
-		&struct{ A bool }{true},
-		"a: true\n",
-	},
-
-	// Conditional flag
-	{
-		&struct {
-			A int "a,omitempty"
-			B int "b,omitempty"
-		}{1, 0},
-		"a: 1\n",
-	}, {
-		&struct {
-			A int "a,omitempty"
-			B int "b,omitempty"
-		}{0, 0},
-		"{}\n",
-	}, {
-		&struct {
-			A *struct{ X, y int } "a,omitempty,flow"
-		}{&struct{ X, y int }{1, 2}},
-		"a: {x: 1}\n",
-	}, {
-		&struct {
-			A *struct{ X, y int } "a,omitempty,flow"
-		}{nil},
-		"{}\n",
-	}, {
-		&struct {
-			A *struct{ X, y int } "a,omitempty,flow"
-		}{&struct{ X, y int }{}},
-		"a: {x: 0}\n",
-	}, {
-		&struct {
-			A struct{ X, y int } "a,omitempty,flow"
-		}{struct{ X, y int }{1, 2}},
-		"a: {x: 1}\n",
-	}, {
-		&struct {
-			A struct{ X, y int } "a,omitempty,flow"
-		}{struct{ X, y int }{0, 1}},
-		"{}\n",
-	}, {
-		&struct {
-			A float64 "a,omitempty"
-			B float64 "b,omitempty"
-		}{1, 0},
-		"a: 1\n",
-	},
-
-	// Flow flag
-	{
-		&struct {
-			A []int "a,flow"
-		}{[]int{1, 2}},
-		"a: [1, 2]\n",
-	}, {
-		&struct {
-			A map[string]string "a,flow"
-		}{map[string]string{"b": "c", "d": "e"}},
-		"a: {b: c, d: e}\n",
-	}, {
-		&struct {
-			A struct {
-				B, D string
-			} "a,flow"
-		}{struct{ B, D string }{"c", "e"}},
-		"a: {b: c, d: e}\n",
-	},
-
-	// Unexported field
-	{
-		&struct {
-			u int
-			A int
-		}{0, 1},
-		"a: 1\n",
-	},
-
-	// Ignored field
-	{
-		&struct {
-			A int
-			B int "-"
-		}{1, 2},
-		"a: 1\n",
-	},
-
-	// Struct inlining
-	{
-		&struct {
-			A int
-			C inlineB `yaml:",inline"`
-		}{1, inlineB{2, inlineC{3}}},
-		"a: 1\nb: 2\nc: 3\n",
-	},
-
-	// Map inlining
-	{
-		&struct {
-			A int
-			C map[string]int `yaml:",inline"`
-		}{1, map[string]int{"b": 2, "c": 3}},
-		"a: 1\nb: 2\nc: 3\n",
-	},
-
-	// Duration
-	{
-		map[string]time.Duration{"a": 3 * time.Second},
-		"a: 3s\n",
-	},
-
-	// Issue #24: bug in map merging logic.
-	{
-		map[string]string{"a": "<foo>"},
-		"a: <foo>\n",
-	},
-
-	// Issue #34: marshal unsupported base 60 floats quoted for compatibility
-	// with old YAML 1.1 parsers.
-	{
-		map[string]string{"a": "1:1"},
-		"a: \"1:1\"\n",
-	},
-
-	// Binary data.
-	{
-		map[string]string{"a": "\x00"},
-		"a: \"\\0\"\n",
-	}, {
-		map[string]string{"a": "\x80\x81\x82"},
-		"a: !!binary gIGC\n",
-	}, {
-		map[string]string{"a": strings.Repeat("\x90", 54)},
-		"a: !!binary |\n  " + strings.Repeat("kJCQ", 17) + "kJ\n  CQ\n",
-	},
-
-	// Ordered maps.
-	{
-		&yaml.MapSlice{{"b", 2}, {"a", 1}, {"d", 4}, {"c", 3}, {"sub", yaml.MapSlice{{"e", 5}}}},
-		"b: 2\na: 1\nd: 4\nc: 3\nsub:\n  e: 5\n",
-	},
-
-	// Encode unicode as utf-8 rather than in escaped form.
-	{
-		map[string]string{"a": "你好"},
-		"a: 你好\n",
-	},
-
-	// Support encoding.TextMarshaler.
-	{
-		map[string]net.IP{"a": net.IPv4(1, 2, 3, 4)},
-		"a: 1.2.3.4\n",
-	},
-	{
-		map[string]time.Time{"a": time.Unix(1424801979, 0)},
-		"a: 2015-02-24T18:19:39Z\n",
-	},
-
-	// Ensure strings containing ": " are quoted (reported as PR #43, but not reproducible).
-	{
-		map[string]string{"a": "b: c"},
-		"a: 'b: c'\n",
-	},
-
-	// Containing hash mark ('#') in string should be quoted
-	{
-		map[string]string{"a": "Hello #comment"},
-		"a: 'Hello #comment'\n",
-	},
-	{
-		map[string]string{"a": "你好 #comment"},
-		"a: '你好 #comment'\n",
-	},
-}
-
-func (s *S) TestMarshal(c *C) {
-	defer os.Setenv("TZ", os.Getenv("TZ"))
-	os.Setenv("TZ", "UTC")
-	for _, item := range marshalTests {
-		data, err := yaml.Marshal(item.value)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, item.data)
-	}
-}
-
-var marshalErrorTests = []struct {
-	value interface{}
-	error string
-	panic string
-}{{
-	value: &struct {
-		B       int
-		inlineB ",inline"
-	}{1, inlineB{2, inlineC{3}}},
-	panic: `Duplicated key 'b' in struct struct \{ B int; .*`,
-}, {
-	value: &struct {
-		A int
-		B map[string]int ",inline"
-	}{1, map[string]int{"a": 2}},
-	panic: `Can't have key "a" in inlined map; conflicts with struct field`,
-}}
-
-func (s *S) TestMarshalErrors(c *C) {
-	for _, item := range marshalErrorTests {
-		if item.panic != "" {
-			c.Assert(func() { yaml.Marshal(item.value) }, PanicMatches, item.panic)
-		} else {
-			_, err := yaml.Marshal(item.value)
-			c.Assert(err, ErrorMatches, item.error)
-		}
-	}
-}
-
-func (s *S) TestMarshalTypeCache(c *C) {
-	var data []byte
-	var err error
-	func() {
-		type T struct{ A int }
-		data, err = yaml.Marshal(&T{})
-		c.Assert(err, IsNil)
-	}()
-	func() {
-		type T struct{ B int }
-		data, err = yaml.Marshal(&T{})
-		c.Assert(err, IsNil)
-	}()
-	c.Assert(string(data), Equals, "b: 0\n")
-}
-
-var marshalerTests = []struct {
-	data  string
-	value interface{}
-}{
-	{"_:\n  hi: there\n", map[interface{}]interface{}{"hi": "there"}},
-	{"_:\n- 1\n- A\n", []interface{}{1, "A"}},
-	{"_: 10\n", 10},
-	{"_: null\n", nil},
-	{"_: BAR!\n", "BAR!"},
-}
-
-type marshalerType struct {
-	value interface{}
-}
-
-func (o marshalerType) MarshalText() ([]byte, error) {
-	panic("MarshalText called on type with MarshalYAML")
-}
-
-func (o marshalerType) MarshalYAML() (interface{}, error) {
-	return o.value, nil
-}
-
-type marshalerValue struct {
-	Field marshalerType "_"
-}
-
-func (s *S) TestMarshaler(c *C) {
-	for _, item := range marshalerTests {
-		obj := &marshalerValue{}
-		obj.Field.value = item.value
-		data, err := yaml.Marshal(obj)
-		c.Assert(err, IsNil)
-		c.Assert(string(data), Equals, string(item.data))
-	}
-}
-
-func (s *S) TestMarshalerWholeDocument(c *C) {
-	obj := &marshalerType{}
-	obj.value = map[string]string{"hello": "world!"}
-	data, err := yaml.Marshal(obj)
-	c.Assert(err, IsNil)
-	c.Assert(string(data), Equals, "hello: world!\n")
-}
-
-type failingMarshaler struct{}
-
-func (ft *failingMarshaler) MarshalYAML() (interface{}, error) {
-	return nil, failingErr
-}
-
-func (s *S) TestMarshalerError(c *C) {
-	_, err := yaml.Marshal(&failingMarshaler{})
-	c.Assert(err, Equals, failingErr)
-}
-
-func (s *S) TestSortedOutput(c *C) {
-	order := []interface{}{
-		false,
-		true,
-		1,
-		uint(1),
-		1.0,
-		1.1,
-		1.2,
-		2,
-		uint(2),
-		2.0,
-		2.1,
-		"",
-		".1",
-		".2",
-		".a",
-		"1",
-		"2",
-		"a!10",
-		"a/2",
-		"a/10",
-		"a~10",
-		"ab/1",
-		"b/1",
-		"b/01",
-		"b/2",
-		"b/02",
-		"b/3",
-		"b/03",
-		"b1",
-		"b01",
-		"b3",
-		"c2.10",
-		"c10.2",
-		"d1",
-		"d12",
-		"d12a",
-	}
-	m := make(map[interface{}]int)
-	for _, k := range order {
-		m[k] = 1
-	}
-	data, err := yaml.Marshal(m)
-	c.Assert(err, IsNil)
-	out := "\n" + string(data)
-	last := 0
-	for i, k := range order {
-		repr := fmt.Sprint(k)
-		if s, ok := k.(string); ok {
-			if _, err = strconv.ParseFloat(repr, 32); s == "" || err == nil {
-				repr = `"` + repr + `"`
-			}
-		}
-		index := strings.Index(out, "\n"+repr+":")
-		if index == -1 {
-			c.Fatalf("%#v is not in the output: %#v", k, out)
-		}
-		if index < last {
-			c.Fatalf("%#v was generated before %#v: %q", k, order[i-1], out)
-		}
-		last = index
-	}
-}
diff --git a/installer/vendor/github.com/go-yaml/yaml/example_embedded_test.go b/installer/vendor/github.com/go-yaml/yaml/example_embedded_test.go
deleted file mode 100644
index c8b241d549..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/example_embedded_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package yaml_test
-
-import (
-	"fmt"
-	"log"
-
-        "gopkg.in/yaml.v2"
-)
-
-// An example showing how to unmarshal embedded
-// structs from YAML.
-
-type StructA struct {
-	A string `yaml:"a"`
-}
-
-type StructB struct {
-	// Embedded structs are not treated as embedded in YAML by default. To do that,
-	// add the ",inline" annotation below
-	StructA   `yaml:",inline"`
-	B string `yaml:"b"`
-}
-
-var data = `
-a: a string from struct A
-b: a string from struct B
-`
-
-func ExampleUnmarshal_embedded() {
-	var b StructB
-
-	err := yaml.Unmarshal([]byte(data), &b)
-	if err != nil {
-		log.Fatal("cannot unmarshal data: %v", err)
-	}
-        fmt.Println(b.A)
-        fmt.Println(b.B)
-        // Output:
-        // a string from struct A
-        // a string from struct B
-}
diff --git a/installer/vendor/github.com/go-yaml/yaml/readerc.go b/installer/vendor/github.com/go-yaml/yaml/readerc.go
index f450791717..7c1f5fac3d 100644
--- a/installer/vendor/github.com/go-yaml/yaml/readerc.go
+++ b/installer/vendor/github.com/go-yaml/yaml/readerc.go
@@ -93,9 +93,18 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
 		panic("read handler must be set")
 	}
 
+	// [Go] This function was changed to guarantee the requested length size at EOF.
+	// The fact we need to do this is pretty awful, but the description above implies
+	// for that to be the case, and there are tests 
+
 	// If the EOF flag is set and the raw buffer is empty, do nothing.
 	if parser.eof && parser.raw_buffer_pos == len(parser.raw_buffer) {
-		return true
+		// [Go] ACTUALLY! Read the documentation of this function above.
+		// This is just broken. To return true, we need to have the
+		// given length in the buffer. Not doing that means every single
+		// check that calls this function to make sure the buffer has a
+		// given length is Go) panicking; or C) accessing invalid memory.
+		//return true
 	}
 
 	// Return if the buffer contains enough characters.
@@ -389,6 +398,15 @@ func yaml_parser_update_buffer(parser *yaml_parser_t, length int) bool {
 			break
 		}
 	}
+	// [Go] Read the documentation of this function above. To return true,
+	// we need to have the given length in the buffer. Not doing that means
+	// every single check that calls this function to make sure the buffer
+	// has a given length is Go) panicking; or C) accessing invalid memory.
+	// This happens here due to the EOF above breaking early.
+	for buffer_len < length {
+		parser.buffer[buffer_len] = 0
+		buffer_len++
+	}
 	parser.buffer = parser.buffer[:buffer_len]
 	return true
 }
diff --git a/installer/vendor/github.com/go-yaml/yaml/resolve.go b/installer/vendor/github.com/go-yaml/yaml/resolve.go
index 232313cc08..6c151db6fb 100644
--- a/installer/vendor/github.com/go-yaml/yaml/resolve.go
+++ b/installer/vendor/github.com/go-yaml/yaml/resolve.go
@@ -6,7 +6,7 @@ import (
 	"regexp"
 	"strconv"
 	"strings"
-	"unicode/utf8"
+	"time"
 )
 
 type resolveMapItem struct {
@@ -75,7 +75,7 @@ func longTag(tag string) string {
 
 func resolvableTag(tag string) bool {
 	switch tag {
-	case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG:
+	case "", yaml_STR_TAG, yaml_BOOL_TAG, yaml_INT_TAG, yaml_FLOAT_TAG, yaml_NULL_TAG, yaml_TIMESTAMP_TAG:
 		return true
 	}
 	return false
@@ -92,6 +92,19 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
 		switch tag {
 		case "", rtag, yaml_STR_TAG, yaml_BINARY_TAG:
 			return
+		case yaml_FLOAT_TAG:
+			if rtag == yaml_INT_TAG {
+				switch v := out.(type) {
+				case int64:
+					rtag = yaml_FLOAT_TAG
+					out = float64(v)
+					return
+				case int:
+					rtag = yaml_FLOAT_TAG
+					out = float64(v)
+					return
+				}
+			}
 		}
 		failf("cannot decode %s `%s` as a %s", shortTag(rtag), in, shortTag(tag))
 	}()
@@ -125,6 +138,15 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
 
 		case 'D', 'S':
 			// Int, float, or timestamp.
+			// Only try values as a timestamp if the value is unquoted or there's an explicit
+			// !!timestamp tag.
+			if tag == "" || tag == yaml_TIMESTAMP_TAG {
+				t, ok := parseTimestamp(in)
+				if ok {
+					return yaml_TIMESTAMP_TAG, t
+				}
+			}
+
 			plain := strings.Replace(in, "_", "", -1)
 			intv, err := strconv.ParseInt(plain, 0, 64)
 			if err == nil {
@@ -158,28 +180,20 @@ func resolve(tag string, in string) (rtag string, out interface{}) {
 					return yaml_INT_TAG, uintv
 				}
 			} else if strings.HasPrefix(plain, "-0b") {
-				intv, err := strconv.ParseInt(plain[3:], 2, 64)
+				intv, err := strconv.ParseInt("-" + plain[3:], 2, 64)
 				if err == nil {
-					if intv == int64(int(intv)) {
-						return yaml_INT_TAG, -int(intv)
+					if true || intv == int64(int(intv)) {
+						return yaml_INT_TAG, int(intv)
 					} else {
-						return yaml_INT_TAG, -intv
+						return yaml_INT_TAG, intv
 					}
 				}
 			}
-			// XXX Handle timestamps here.
-
 		default:
 			panic("resolveTable item not yet handled: " + string(rune(hint)) + " (with " + in + ")")
 		}
 	}
-	if tag == yaml_BINARY_TAG {
-		return yaml_BINARY_TAG, in
-	}
-	if utf8.ValidString(in) {
-		return yaml_STR_TAG, in
-	}
-	return yaml_BINARY_TAG, encodeBase64(in)
+	return yaml_STR_TAG, in
 }
 
 // encodeBase64 encodes s as base64 that is broken up into multiple lines
@@ -206,3 +220,39 @@ func encodeBase64(s string) string {
 	}
 	return string(out[:k])
 }
+
+// This is a subset of the formats allowed by the regular expression
+// defined at http://yaml.org/type/timestamp.html.
+var allowedTimestampFormats = []string{
+	"2006-1-2T15:4:5.999999999Z07:00", // RCF3339Nano with short date fields.
+	"2006-1-2t15:4:5.999999999Z07:00", // RFC3339Nano with short date fields and lower-case "t".
+	"2006-1-2 15:4:5.999999999",       // space separated with no time zone
+	"2006-1-2",                        // date only
+	// Notable exception: time.Parse cannot handle: "2001-12-14 21:59:43.10 -5"
+	// from the set of examples.
+}
+
+// parseTimestamp parses s as a timestamp string and
+// returns the timestamp and reports whether it succeeded.
+// Timestamp formats are defined at http://yaml.org/type/timestamp.html
+func parseTimestamp(s string) (time.Time, bool) {
+	// TODO write code to check all the formats supported by
+	// http://yaml.org/type/timestamp.html instead of using time.Parse.
+
+	// Quick check: all date formats start with YYYY-.
+	i := 0
+	for ; i < len(s); i++ {
+		if c := s[i]; c < '0' || c > '9' {
+			break
+		}
+	}
+	if i != 4 || i == len(s) || s[i] != '-' {
+		return time.Time{}, false
+	}
+	for _, format := range allowedTimestampFormats {
+		if t, err := time.Parse(format, s); err == nil {
+			return t, true
+		}
+	}
+	return time.Time{}, false
+}
diff --git a/installer/vendor/github.com/go-yaml/yaml/scannerc.go b/installer/vendor/github.com/go-yaml/yaml/scannerc.go
index 0744844558..077fd1dd2d 100644
--- a/installer/vendor/github.com/go-yaml/yaml/scannerc.go
+++ b/installer/vendor/github.com/go-yaml/yaml/scannerc.go
@@ -871,12 +871,6 @@ func yaml_parser_save_simple_key(parser *yaml_parser_t) bool {
 
 	required := parser.flow_level == 0 && parser.indent == parser.mark.column
 
-	// A simple key is required only when it is the first token in the current
-	// line.  Therefore it is always allowed.  But we add a check anyway.
-	if required && !parser.simple_key_allowed {
-		panic("should not happen")
-	}
-
 	//
 	// If the current position may start a simple key, save it.
 	//
@@ -2475,6 +2469,10 @@ func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, si
 			}
 		}
 
+		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
+			return false
+		}
+
 		// Check if we are at the end of the scalar.
 		if single {
 			if parser.buffer[parser.buffer_pos] == '\'' {
@@ -2487,10 +2485,6 @@ func yaml_parser_scan_flow_scalar(parser *yaml_parser_t, token *yaml_token_t, si
 		}
 
 		// Consume blank characters.
-		if parser.unread < 1 && !yaml_parser_update_buffer(parser, 1) {
-			return false
-		}
-
 		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
 			if is_blank(parser.buffer, parser.buffer_pos) {
 				// Consume a space or a tab character.
@@ -2592,19 +2586,10 @@ func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) b
 		// Consume non-blank characters.
 		for !is_blankz(parser.buffer, parser.buffer_pos) {
 
-			// Check for 'x:x' in the flow context. TODO: Fix the test "spec-08-13".
-			if parser.flow_level > 0 &&
-				parser.buffer[parser.buffer_pos] == ':' &&
-				!is_blankz(parser.buffer, parser.buffer_pos+1) {
-				yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-					start_mark, "found unexpected ':'")
-				return false
-			}
-
 			// Check for indicators that may end a plain scalar.
 			if (parser.buffer[parser.buffer_pos] == ':' && is_blankz(parser.buffer, parser.buffer_pos+1)) ||
 				(parser.flow_level > 0 &&
-					(parser.buffer[parser.buffer_pos] == ',' || parser.buffer[parser.buffer_pos] == ':' ||
+					(parser.buffer[parser.buffer_pos] == ',' ||
 						parser.buffer[parser.buffer_pos] == '?' || parser.buffer[parser.buffer_pos] == '[' ||
 						parser.buffer[parser.buffer_pos] == ']' || parser.buffer[parser.buffer_pos] == '{' ||
 						parser.buffer[parser.buffer_pos] == '}')) {
@@ -2656,10 +2641,10 @@ func yaml_parser_scan_plain_scalar(parser *yaml_parser_t, token *yaml_token_t) b
 		for is_blank(parser.buffer, parser.buffer_pos) || is_break(parser.buffer, parser.buffer_pos) {
 			if is_blank(parser.buffer, parser.buffer_pos) {
 
-				// Check for tab character that abuse indentation.
+				// Check for tab characters that abuse indentation.
 				if leading_blanks && parser.mark.column < indent && is_tab(parser.buffer, parser.buffer_pos) {
 					yaml_parser_set_scanner_error(parser, "while scanning a plain scalar",
-						start_mark, "found a tab character that violate indentation")
+						start_mark, "found a tab character that violates indentation")
 					return false
 				}
 
diff --git a/installer/vendor/github.com/go-yaml/yaml/sorter.go b/installer/vendor/github.com/go-yaml/yaml/sorter.go
index 5958822f9c..4c45e660a8 100644
--- a/installer/vendor/github.com/go-yaml/yaml/sorter.go
+++ b/installer/vendor/github.com/go-yaml/yaml/sorter.go
@@ -51,6 +51,15 @@ func (l keyList) Less(i, j int) bool {
 		}
 		var ai, bi int
 		var an, bn int64
+		if ar[i] == '0' || br[i] == '0' {
+			for j := i-1; j >= 0 && unicode.IsDigit(ar[j]); j-- {
+				if ar[j] != '0' {
+					an = 1
+					bn = 1
+					break
+				}
+			}
+		}
 		for ai = i; ai < len(ar) && unicode.IsDigit(ar[ai]); ai++ {
 			an = an*10 + int64(ar[ai]-'0')
 		}
diff --git a/installer/vendor/github.com/go-yaml/yaml/suite_test.go b/installer/vendor/github.com/go-yaml/yaml/suite_test.go
deleted file mode 100644
index c5cf1ed4f6..0000000000
--- a/installer/vendor/github.com/go-yaml/yaml/suite_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package yaml_test
-
-import (
-	. "gopkg.in/check.v1"
-	"testing"
-)
-
-func Test(t *testing.T) { TestingT(t) }
-
-type S struct{}
-
-var _ = Suite(&S{})
diff --git a/installer/vendor/github.com/go-yaml/yaml/writerc.go b/installer/vendor/github.com/go-yaml/yaml/writerc.go
index 190362f25d..a2dde608cb 100644
--- a/installer/vendor/github.com/go-yaml/yaml/writerc.go
+++ b/installer/vendor/github.com/go-yaml/yaml/writerc.go
@@ -18,72 +18,9 @@ func yaml_emitter_flush(emitter *yaml_emitter_t) bool {
 		return true
 	}
 
-	// If the output encoding is UTF-8, we don't need to recode the buffer.
-	if emitter.encoding == yaml_UTF8_ENCODING {
-		if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
-			return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
-		}
-		emitter.buffer_pos = 0
-		return true
-	}
-
-	// Recode the buffer into the raw buffer.
-	var low, high int
-	if emitter.encoding == yaml_UTF16LE_ENCODING {
-		low, high = 0, 1
-	} else {
-		high, low = 1, 0
-	}
-
-	pos := 0
-	for pos < emitter.buffer_pos {
-		// See the "reader.c" code for more details on UTF-8 encoding.  Note
-		// that we assume that the buffer contains a valid UTF-8 sequence.
-
-		// Read the next UTF-8 character.
-		octet := emitter.buffer[pos]
-
-		var w int
-		var value rune
-		switch {
-		case octet&0x80 == 0x00:
-			w, value = 1, rune(octet&0x7F)
-		case octet&0xE0 == 0xC0:
-			w, value = 2, rune(octet&0x1F)
-		case octet&0xF0 == 0xE0:
-			w, value = 3, rune(octet&0x0F)
-		case octet&0xF8 == 0xF0:
-			w, value = 4, rune(octet&0x07)
-		}
-		for k := 1; k < w; k++ {
-			octet = emitter.buffer[pos+k]
-			value = (value << 6) + (rune(octet) & 0x3F)
-		}
-		pos += w
-
-		// Write the character.
-		if value < 0x10000 {
-			var b [2]byte
-			b[high] = byte(value >> 8)
-			b[low] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1])
-		} else {
-			// Write the character using a surrogate pair (check "reader.c").
-			var b [4]byte
-			value -= 0x10000
-			b[high] = byte(0xD8 + (value >> 18))
-			b[low] = byte((value >> 10) & 0xFF)
-			b[high+2] = byte(0xDC + ((value >> 8) & 0xFF))
-			b[low+2] = byte(value & 0xFF)
-			emitter.raw_buffer = append(emitter.raw_buffer, b[0], b[1], b[2], b[3])
-		}
-	}
-
-	// Write the raw buffer.
-	if err := emitter.write_handler(emitter, emitter.raw_buffer); err != nil {
+	if err := emitter.write_handler(emitter, emitter.buffer[:emitter.buffer_pos]); err != nil {
 		return yaml_emitter_set_writer_error(emitter, "write error: "+err.Error())
 	}
 	emitter.buffer_pos = 0
-	emitter.raw_buffer = emitter.raw_buffer[:0]
 	return true
 }
diff --git a/installer/vendor/github.com/go-yaml/yaml/yaml.go b/installer/vendor/github.com/go-yaml/yaml/yaml.go
index bf18884e0e..de85aa4cdb 100644
--- a/installer/vendor/github.com/go-yaml/yaml/yaml.go
+++ b/installer/vendor/github.com/go-yaml/yaml/yaml.go
@@ -9,6 +9,7 @@ package yaml
 import (
 	"errors"
 	"fmt"
+	"io"
 	"reflect"
 	"strings"
 	"sync"
@@ -81,12 +82,58 @@ func Unmarshal(in []byte, out interface{}) (err error) {
 }
 
 // UnmarshalStrict is like Unmarshal except that any fields that are found
-// in the data that do not have corresponding struct members will result in
+// in the data that do not have corresponding struct members, or mapping
+// keys that are duplicates, will result in
 // an error.
 func UnmarshalStrict(in []byte, out interface{}) (err error) {
 	return unmarshal(in, out, true)
 }
 
+// A Decorder reads and decodes YAML values from an input stream.
+type Decoder struct {
+	strict bool
+	parser *parser
+}
+
+// NewDecoder returns a new decoder that reads from r.
+//
+// The decoder introduces its own buffering and may read
+// data from r beyond the YAML values requested.
+func NewDecoder(r io.Reader) *Decoder {
+	return &Decoder{
+		parser: newParserFromReader(r),
+	}
+}
+
+// SetStrict sets whether strict decoding behaviour is enabled when
+// decoding items in the data (see UnmarshalStrict). By default, decoding is not strict.
+func (dec *Decoder) SetStrict(strict bool) {
+	dec.strict = strict
+}
+
+// Decode reads the next YAML-encoded value from its input
+// and stores it in the value pointed to by v.
+//
+// See the documentation for Unmarshal for details about the
+// conversion of YAML into a Go value.
+func (dec *Decoder) Decode(v interface{}) (err error) {
+	d := newDecoder(dec.strict)
+	defer handleErr(&err)
+	node := dec.parser.parse()
+	if node == nil {
+		return io.EOF
+	}
+	out := reflect.ValueOf(v)
+	if out.Kind() == reflect.Ptr && !out.IsNil() {
+		out = out.Elem()
+	}
+	d.unmarshal(node, out)
+	if len(d.terrors) > 0 {
+		return &TypeError{d.terrors}
+	}
+	return nil
+}
+
 func unmarshal(in []byte, out interface{}, strict bool) (err error) {
 	defer handleErr(&err)
 	d := newDecoder(strict)
@@ -110,8 +157,8 @@ func unmarshal(in []byte, out interface{}, strict bool) (err error) {
 // of the generated document will reflect the structure of the value itself.
 // Maps and pointers (to struct, string, int, etc) are accepted as the in value.
 //
-// Struct fields are only unmarshalled if they are exported (have an upper case
-// first letter), and are unmarshalled using the field name lowercased as the
+// Struct fields are only marshalled if they are exported (have an upper case
+// first letter), and are marshalled using the field name lowercased as the
 // default key. Custom keys may be defined via the "yaml" name in the field
 // tag: the content preceding the first comma is used as the key, and the
 // following comma-separated options are used to tweak the marshalling process.
@@ -125,7 +172,10 @@ func unmarshal(in []byte, out interface{}, strict bool) (err error) {
 //
 //     omitempty    Only include the field if it's not set to the zero
 //                  value for the type or to empty slices or maps.
-//                  Does not apply to zero valued structs.
+//                  Zero valued structs will be omitted if all their public
+//                  fields are zero, unless they implement an IsZero
+//                  method (see the IsZeroer interface type), in which
+//                  case the field will be included if that method returns true.
 //
 //     flow         Marshal using a flow style (useful for structs,
 //                  sequences and maps).
@@ -140,7 +190,7 @@ func unmarshal(in []byte, out interface{}, strict bool) (err error) {
 // For example:
 //
 //     type T struct {
-//         F int "a,omitempty"
+//         F int `yaml:"a,omitempty"`
 //         B int
 //     }
 //     yaml.Marshal(&T{B: 2}) // Returns "b: 2\n"
@@ -150,12 +200,47 @@ func Marshal(in interface{}) (out []byte, err error) {
 	defer handleErr(&err)
 	e := newEncoder()
 	defer e.destroy()
-	e.marshal("", reflect.ValueOf(in))
+	e.marshalDoc("", reflect.ValueOf(in))
 	e.finish()
 	out = e.out
 	return
 }
 
+// An Encoder writes YAML values to an output stream.
+type Encoder struct {
+	encoder *encoder
+}
+
+// NewEncoder returns a new encoder that writes to w.
+// The Encoder should be closed after use to flush all data
+// to w.
+func NewEncoder(w io.Writer) *Encoder {
+	return &Encoder{
+		encoder: newEncoderWithWriter(w),
+	}
+}
+
+// Encode writes the YAML encoding of v to the stream.
+// If multiple items are encoded to the stream, the
+// second and subsequent document will be preceded
+// with a "---" document separator, but the first will not.
+//
+// See the documentation for Marshal for details about the conversion of Go
+// values to YAML.
+func (e *Encoder) Encode(v interface{}) (err error) {
+	defer handleErr(&err)
+	e.encoder.marshalDoc("", reflect.ValueOf(v))
+	return nil
+}
+
+// Close closes the encoder by writing any remaining data.
+// It does not write a stream terminating string "...".
+func (e *Encoder) Close() (err error) {
+	defer handleErr(&err)
+	e.encoder.finish()
+	return nil
+}
+
 func handleErr(err *error) {
 	if v := recover(); v != nil {
 		if e, ok := v.(yamlError); ok {
@@ -211,6 +296,9 @@ type fieldInfo struct {
 	Num       int
 	OmitEmpty bool
 	Flow      bool
+	// Id holds the unique field identifier, so we can cheaply
+	// check for field duplicates without maintaining an extra map.
+	Id int
 
 	// Inline holds the field index if the field is part of an inlined struct.
 	Inline []int
@@ -290,6 +378,7 @@ func getStructInfo(st reflect.Type) (*structInfo, error) {
 					} else {
 						finfo.Inline = append([]int{i}, finfo.Inline...)
 					}
+					finfo.Id = len(fieldsList)
 					fieldsMap[finfo.Key] = finfo
 					fieldsList = append(fieldsList, finfo)
 				}
@@ -311,11 +400,16 @@ func getStructInfo(st reflect.Type) (*structInfo, error) {
 			return nil, errors.New(msg)
 		}
 
+		info.Id = len(fieldsList)
 		fieldsList = append(fieldsList, info)
 		fieldsMap[info.Key] = info
 	}
 
-	sinfo = &structInfo{fieldsMap, fieldsList, inlineMap}
+	sinfo = &structInfo{
+		FieldsMap:  fieldsMap,
+		FieldsList: fieldsList,
+		InlineMap:  inlineMap,
+	}
 
 	fieldMapMutex.Lock()
 	structMap[st] = sinfo
@@ -323,8 +417,23 @@ func getStructInfo(st reflect.Type) (*structInfo, error) {
 	return sinfo, nil
 }
 
+// IsZeroer is used to check whether an object is zero to
+// determine whether it should be omitted when marshaling
+// with the omitempty flag. One notable implementation
+// is time.Time.
+type IsZeroer interface {
+	IsZero() bool
+}
+
 func isZero(v reflect.Value) bool {
-	switch v.Kind() {
+	kind := v.Kind()
+	if z, ok := v.Interface().(IsZeroer); ok {
+		if (kind == reflect.Ptr || kind == reflect.Interface) && v.IsNil() {
+			return true
+		}
+		return z.IsZero()
+	}
+	switch kind {
 	case reflect.String:
 		return len(v.String()) == 0
 	case reflect.Interface, reflect.Ptr:
diff --git a/installer/vendor/github.com/go-yaml/yaml/yamlh.go b/installer/vendor/github.com/go-yaml/yaml/yamlh.go
index 3caeca0491..e25cee563b 100644
--- a/installer/vendor/github.com/go-yaml/yaml/yamlh.go
+++ b/installer/vendor/github.com/go-yaml/yaml/yamlh.go
@@ -1,6 +1,7 @@
 package yaml
 
 import (
+	"fmt"
 	"io"
 )
 
@@ -239,6 +240,27 @@ const (
 	yaml_MAPPING_END_EVENT    // A MAPPING-END event.
 )
 
+var eventStrings = []string{
+	yaml_NO_EVENT:             "none",
+	yaml_STREAM_START_EVENT:   "stream start",
+	yaml_STREAM_END_EVENT:     "stream end",
+	yaml_DOCUMENT_START_EVENT: "document start",
+	yaml_DOCUMENT_END_EVENT:   "document end",
+	yaml_ALIAS_EVENT:          "alias",
+	yaml_SCALAR_EVENT:         "scalar",
+	yaml_SEQUENCE_START_EVENT: "sequence start",
+	yaml_SEQUENCE_END_EVENT:   "sequence end",
+	yaml_MAPPING_START_EVENT:  "mapping start",
+	yaml_MAPPING_END_EVENT:    "mapping end",
+}
+
+func (e yaml_event_type_t) String() string {
+	if e < 0 || int(e) >= len(eventStrings) {
+		return fmt.Sprintf("unknown event %d", e)
+	}
+	return eventStrings[e]
+}
+
 // The event structure.
 type yaml_event_t struct {
 
@@ -521,9 +543,9 @@ type yaml_parser_t struct {
 
 	read_handler yaml_read_handler_t // Read handler.
 
-	input_file io.Reader // File input data.
-	input      []byte    // String input data.
-	input_pos  int
+	input_reader io.Reader // File input data.
+	input        []byte    // String input data.
+	input_pos    int
 
 	eof bool // EOF flag
 
@@ -632,7 +654,7 @@ type yaml_emitter_t struct {
 	write_handler yaml_write_handler_t // Write handler.
 
 	output_buffer *[]byte   // String output data.
-	output_file   io.Writer // File output data.
+	output_writer io.Writer // File output data.
 
 	buffer     []byte // The working buffer.
 	buffer_pos int    // The current position of the buffer.
diff --git a/installer/vendor/github.com/golang/dep/.codeclimate.yml b/installer/vendor/github.com/golang/dep/.codeclimate.yml
deleted file mode 100644
index 8c322035f1..0000000000
--- a/installer/vendor/github.com/golang/dep/.codeclimate.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-engines:
-  gofmt:
-    enabled: true
-  govet:
-    enabled: true
-  golint:
-    enabled: true
-ratings:
-  paths:
-    - "**.go"
-exclude_paths:
-  - vendor/
-  - internal/gps/_testdata
-  - cmd/dep/testdata
-  - testdata
-  - internal/gps/internal/pb
diff --git a/installer/vendor/github.com/golang/dep/.gitattributes b/installer/vendor/github.com/golang/dep/.gitattributes
deleted file mode 100644
index d8df4ca60a..0000000000
--- a/installer/vendor/github.com/golang/dep/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-# Prevent problems comparing golden files on Windows
-**/testdata/** text eol=lf
diff --git a/installer/vendor/github.com/golang/dep/.github/CODEOWNERS b/installer/vendor/github.com/golang/dep/.github/CODEOWNERS
deleted file mode 100644
index dcc39bc1fa..0000000000
--- a/installer/vendor/github.com/golang/dep/.github/CODEOWNERS
+++ /dev/null
@@ -1,25 +0,0 @@
-# general
-* @sdboyer
-
-# init
-/cmd/dep/init*                          @carolynvs
-/cmd/dep/gopath_scanner*                @carolynvs
-/cmd/dep/root_analyzer*                 @carolynvs
-/cmd/dep/testdata/init                  @carolynvs
-/cmd/dep/testdata/harness_tests/init    @carolynvs
-/internal/importers                     @carolynvs
-/analyzer*                              @carolynvs
-/testdata/analyzer                      @carolynvs
-/internal/feedback                      @carolynvs
-
-# ensure
-/cmd/dep/ensure*                          @ibrasho
-/cmd/dep/testdata/harness_tests/ensure**  @ibrasho
-
-# status
-/cmd/dep/status*                          @darkowlzz
-/cmd/dep/testdata/harness_tests/status**  @darkowlzz
-/cmd/dep/graphviz*                        @darkowlzz
-
-# gps caching
-/internal/gps/source_cache* @jmank88
diff --git a/installer/vendor/github.com/golang/dep/.github/ISSUE_TEMPLATE.md b/installer/vendor/github.com/golang/dep/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index 3e612d9b2a..0000000000
--- a/installer/vendor/github.com/golang/dep/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-
-Thanks for filing an issue! If this is a question or feature request, just delete
-everything here and write out the request, providing as much context as you can.
-
--->
-
-### What version of `dep` are you using (`dep version`)?
-<!--
-  If you installed `dep` via `go get`, report the version instead with
-  `cd $GOPATH/src/github.com/golang/dep && git describe --tags`
--->
-
-### What `dep` command did you run?
-
-<!--
-
-Paste the output of the commands you ran in here, making sure to pass -v for maximum context.
-
-The output of `dep hash-inputs` may also be helpful to include.
-
--->
-
-### What did you expect to see?
-
-### What did you see instead?
diff --git a/installer/vendor/github.com/golang/dep/.github/PULL_REQUEST_TEMPLATE.md b/installer/vendor/github.com/golang/dep/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index c0668911ff..0000000000
--- a/installer/vendor/github.com/golang/dep/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,23 +0,0 @@
-<!--
-Work-in-progress PRs are welcome as a way to get early feedback - just prefix
-the title with [WIP].
-
-Add the change in the changelog (except for test changes and docs updates).
-Please edit CHANGELOG.md and add the change under the appropriate category (NEW
-FEATURES, IMPROVEMENTS & BUG FIXES) along with the PR number.
--->
-
-### What does this do / why do we need it?
-
-### What should your reviewer look out for in this PR?
-
-### Do you need help or clarification on anything?
-
-### Which issue(s) does this PR fix?
-
-<!--
-
-fixes #
-fixes #
-
--->
diff --git a/installer/vendor/github.com/golang/dep/.gitignore b/installer/vendor/github.com/golang/dep/.gitignore
deleted file mode 100644
index a7c3f4116e..0000000000
--- a/installer/vendor/github.com/golang/dep/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-# dep project generated files to ignore
-#  if you want to ignore files created by your editor/tools,
-#  please consider a global .gitignore https://help.github.com/articles/ignoring-files
-#  please do not open a pull request to add something created by your editor or tools
-/dep
-/testdep
-/dep.exe
-/licenseok
-/profile.out
-/coverage.txt
diff --git a/installer/vendor/github.com/golang/dep/.travis.yml b/installer/vendor/github.com/golang/dep/.travis.yml
deleted file mode 100644
index ff197a23e7..0000000000
--- a/installer/vendor/github.com/golang/dep/.travis.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-language: go
-sudo: false
-notifications:
-  email: false
-jobs:
-  include:
-    - stage: test
-      go_import_path: github.com/golang/dep
-      install:
-        - go get -u github.com/golang/lint/golint honnef.co/go/tools/cmd/megacheck
-        - npm install -g codeclimate-test-reporter
-      env:
-        - DEPTESTBYPASS501=1
-      os: linux
-      go: 1.9.x
-      script:
-        - go test -i ./...
-        - ./hack/lint.bash
-        - ./hack/validate-vendor.bash
-        - ./hack/validate-licence.bash
-        - ./hack/coverage.bash
-      after_success:
-        - codeclimate-test-reporter < coverage.txt
-    # YAML alias, for settings shared across the simpler builds
-    - &simple-test
-      go: 1.8.x
-      stage: test
-      go_import_path: github.com/golang/dep
-      install: skip
-      env:
-        - DEPTESTBYPASS501=1
-      script: go test -race $(go list ./... | grep -v vendor)
-    - <<: *simple-test
-      go: tip
-    - <<: *simple-test
-      os: osx
-      go: 1.9.x
-      install:
-        # brew takes horribly long to update itself despite the above caching
-        # attempt; only bzr install if it's not on the $PATH
-        - test $(which bzr) || brew install bzr
-      env:
-        - HOMEBREW_NO_AUTO_UPDATE=1
-        - DEPTESTBYPASS501=1
-      script:
-        # OSX as of El Capitan sets an exit trap that interacts poorly with how
-        # travis seems to spawn these shells; if set -e is set, then it can cause
-        # build failures. We're not doing that here, but retain the trap statement
-        # for future safety.
-        # Related: https://superuser.com/questions/1044130/why-am-i-having-how-can-i-fix-this-error-shell-session-update-command-not-f
-        - trap EXIT
-        - go test -race ./...
-    - go: 1.9.x
-      stage: deploy
-      go_import_path: github.com/golang/dep
-      install: skip
-      script: skip
-      before_deploy:
-        - ./hack/build-all.bash
-      deploy:
-        - provider: releases
-          api_key:
-            secure: fL9GX11J3JLizEBTPZHN32wuAT91eAJsGl0kjlAdIc6Lb/9UCe1XZGgFnpQFN4qo/S+omhHBDbM6Ty1xhNy7xmjDecpQGDU8Rmap9Oll0TuxqMigG+njOuPp5VUYPofPP0PGKdxAcYg+KaFM7x0o2rK+qA046NHwo2gH1BbE+bn55TZglEajEfc8j9iX4jt96KC7zlu+WiKArLmfUtlrI8m8ZYgbYcvFmlYjeCiEqlNhvNL59ejug9Rl0PLtPbamqVXkGLafYtekgPCb4WSxBiCt8pq5Rb5svk9YcdXpiaWQhZjMPAuKN6BrmN2lw1PiXzADUG5fjvNc8eo2HY70GD2utU9cAsY8VIafhoH5n6uM1WI8MHwDfd7P1PiQA3ZGQ8CPwk4q/8HSfQU9ap7vZgSF63pTIbtlviyIG67orOJE9PWWncl9olYM946UylZu6m3hWI/rmJxOeJ1UJjym/3GNPMRfKubaGhV/TyRdM0bKX4M0cXHU6k/ESVFupGXdKRt4RpvkD4/1Km6b2OShW6PNI+ifFspnJr7obkI7dm7ubySdnNz4lMv9WWymxRpMVc8hUAhuoDvXeZJq7pSnkjBEWDxIRoTkA93CU3/Rf7MFYCJMnGSqjcxWUpIfCAk2/r4BqL9NQnqBvvVt+MYi64QaD5n7ZF3dVbr6HZ2zjSU=
-          file:
-            - release/dep-linux-amd64
-            - release/dep-linux-amd64.sha256
-            - release/dep-darwin-amd64
-            - release/dep-darwin-amd64.sha256
-            - release/dep-windows-amd64
-            - release/dep-windows-amd64.sha256
-          skip_cleanup: true
-          on:
-            repo: golang/dep
-            branch: master
-            tags: true
diff --git a/installer/vendor/github.com/golang/dep/CHANGELOG.md b/installer/vendor/github.com/golang/dep/CHANGELOG.md
deleted file mode 100644
index 44540fabd6..0000000000
--- a/installer/vendor/github.com/golang/dep/CHANGELOG.md
+++ /dev/null
@@ -1,75 +0,0 @@
-# v0.3.2 (Unreleased)
-
-NEW FEATURES:
-
-* Add support for importing from [gvt](https://github.com/FiloSottile/gvt)
-and [gb](https://godoc.org/github.com/constabulary/gb/cmd/gb-vendor).
-(#1149)
-* Wildcard ignore support. (#1156)
-* Disable SourceManager lock by setting `DEPNOLOCK` environment variable.
-(#1206)
-* `dep ensure -no-vendor -dry-run` now exits with an error when changes would
-have to be made to `Gopkg.lock`. This is useful for CI. (#1256)
-
-BUG FIXES:
-
-* gps: Fix case mismatch error with multiple dependers. (#1233)
-* Skip broken `vendor` symlink rather than returning an error. (#1191)
-* Fix `status` shows incorrect reason for lock mismatch when ignoring packages.
-(#1216)
-
-IMPROVEMENTS:
-
-* Allow `dep ensure -add` and `-update` when lock is out-of-sync. (#1225)
-* gps: vcs: Dedupe git version list (#1212)
-* gps: Add prune functions to gps. (#1020)
-* gps: Skip broken vendor symlinks. (#1191)
-* `dep ensure -add` now concurrently fetches the source and adds the projects.
-(#1218)
-* File name case check is now performed on `Gopkg.toml` and `Gopkg.lock`.
-(#1114)
-* gps: gps now supports pruning. (#1020)
-* `dep ensure -update` now concurrently validates the passed project arguments.
-Improving performance when updating dependencies with `-update`. (#1175)
-* `dep status` now concurrently fetches repo info. Improving status performance.
-(#1135)
-* gps: Add SourceURLsForPath() to SourceManager. (#1166)
-* gps: Include output in error. (#1180)
-
-WIP:
-
-* gps: Process canonical import paths. (#1017)
-* gps: Persistent cache. (#1127, #1215)
-
-
-# v0.3.1
-
-* gps: Add satisfiability check for case variants (#1079)
-* Validate Project Roots in manifest (#1116)
-* gps: Properly separate sources for different gopkg.in versions & github
-(#1132)
-* gps: Add persistent BoltDB cache (#1098)
-* gps: Increase default subcommand timeout to 30s (#1087)
-* Fix importer [issue](https://github.com/golang/dep/issues/939) where the
-importer would drop the imported version of a project (#1100)
-* Import analyzer now always uses the same name, fixing the lock mismatch
-immediately after dep init issue (#1099)
-* Add support for importing from [govend](https://github.com/govend/govend)
-(#1040) and [LK4D4/vndr](https://github.com/LK4D4/vndr) (#978) based projects 
-* gps: gps no longer assumes that every git repo has a HEAD (#1053)
-* `os.Chmod` failures on Windows due to long path length has been fixed (#925)
-* Add `version` command (#996)
-* Drop support for building with go1.7 (#714)
-* gps: Parse abbreviated git revisions (#1027)
-* gps: Parallelize writing dep tree (#1021)
-* `status` now shows the progress in verbose mode (#1009, #1037)
-* Fix empty `Constraint` and `Version` in `status` json output (#976)
-* `status` table output now shows override constraints (#918)
-* gps: Display warning message every 15 seconds when lockfile is busy (#958)
-* gps: Hashing directory tree and tree verification (#959)
-* `ensure` now has `-vendor-only` mode to populate vendor/ without updating
-Gopkg.lock (#954)
-* Use fork of Masterminds/semver until
-Masterminds/semver [issue#59](https://github.com/Masterminds/semver/issues/59)
-is fixed upstream (#938)
-* gps: Ensure packages are deducible before attempting to solve (#697)
diff --git a/installer/vendor/github.com/golang/dep/CODE_OF_CONDUCT.md b/installer/vendor/github.com/golang/dep/CODE_OF_CONDUCT.md
deleted file mode 100644
index 660ee848e2..0000000000
--- a/installer/vendor/github.com/golang/dep/CODE_OF_CONDUCT.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of
-experience, nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-  advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, or to ban temporarily or permanently any
-contributor for other behaviors that they deem inappropriate, threatening,
-offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project team at sam (at) samboyer.org. All complaints
-will be reviewed and investigated and will result in a response that is deemed
-necessary and appropriate to the circumstances. The project team is obligated to
-maintain confidentiality with regard to the reporter of an incident. Further
-details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 1.4, available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
diff --git a/installer/vendor/github.com/golang/dep/CONTRIBUTING.md b/installer/vendor/github.com/golang/dep/CONTRIBUTING.md
deleted file mode 100644
index 879cf95d17..0000000000
--- a/installer/vendor/github.com/golang/dep/CONTRIBUTING.md
+++ /dev/null
@@ -1,109 +0,0 @@
-# Contributing to `dep`
-
-`dep` is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-Keep an eye on the [Roadmap](https://github.com/golang/dep/wiki/Roadmap) for a summary of where the project is, and where we're headed.
-
-## Filing issues
-
-Please check the existing issues and [FAQ](docs/FAQ.md) to see if your feedback has already been reported.
-
-When [filing an issue](https://github.com/golang/dep/issues/new), make sure to answer these five questions:
-
-1. What version of Go (`go version`) and `dep` (`git describe --tags`) are you using??
-3. What `dep` command did you run?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Let us know if you are interested in working on an issue by leaving a comment
-on the issue in GitHub. This helps avoid multiple people unknowingly 
-working on the same issue.
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-The
-[help wanted](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3A%22help%20wanted%22)
-label highlights issues that are well-suited for folks to jump in on. The
-[good first issue](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3A%22good%20first%20issue%22)
-label further identifies issues that are particularly well-sized for newcomers.
-
-Unless otherwise noted, the `dep` source files are distributed under
-the BSD-style license found in the LICENSE file.
-
-All submissions, including submissions by project members, require review. We
-use GitHub pull requests for this purpose. Consult [GitHub Help] for more
-information on using pull requests.
-
-We check `dep`'s own `vendor` directory into git. For any PR to `dep` where you're
-updating `Gopkg.toml`, make sure to run `dep ensure` and
-([for now](https://github.com/golang/dep/issues/944)) `dep prune` and commit all
-changes to `vendor`.
-
-[GitHub Help]: https://help.github.com/articles/about-pull-requests/
-
-## Contributor License Agreement
-
-Contributions to this project must be accompanied by a Contributor License
-Agreement. You (or your employer) retain the copyright to your contribution,
-this simply gives us permission to use and redistribute your contributions as
-part of the project. Head over to <https://cla.developers.google.com/> to see
-your current agreements on file or to sign a new one.
-
-You generally only need to submit a CLA once, so if you've already submitted one
-(even if it was for a different project), you probably don't need to do it
-again.
-
-## Maintainer's Guide
-
-`dep` has subsystem maintainers; this guide is intended for them in performing their work as a maintainer.
-
-### General guidelines
-
-* _Be kind, respectful, and inclusive_. Really live [that CoC](https://github.com/golang/dep/blob/master/CODE_OF_CONDUCT.md). We've developed a reputation as one of the most welcoming and supportive project environments in the Go community, and we want to keep that up!
-* The lines of responsibility between maintainership areas can be fuzzy. Get to know your fellow maintainers - it's important to work _with_ them when an issue falls in this grey area.
-* Remember, the long-term goal of `dep` is to disappear into the `go` toolchain. That's going to be a challenging process, no matter what. Minimizing that eventual difficulty should be a guiding light for all your decisions today.
-  * Try to match the toolchain's assumptions as closely as possible ([example](https://github.com/golang/dep/issues/564#issuecomment-300994599)), and avoid introducing new rules the toolchain would later have to incorporate.
-  * Every new flag or option in the metadata files is more exposed surface area that demands conversion later. Only add these with a clear design plan.
-  * `dep` is experimental, but increasingly only on a larger scale. Experiments need clear hypotheses and parameters for testing - nothing off-the-cuff.
-* Being a maintainer doesn't mean you're always right. Admitting when you've made a mistake keeps the code flowing, the environment health, and the respect level up.
-* It's fine if you need to step back from maintainership responsibilities - just, please, don't fade away! Let other maintainers know what's going on.
-
-### Issue management
-
-* We use [Zenhub](https://www.zenhub.com) to manage the queue, in addition to what we do with labels.
-  * You will need to install [ZenHub extension](https://www.zenhub.com/extension) to your browser to show the board.
-  * Pipelines, and [the board](https://github.com/golang/dep#boards) are one thing we try to utilize:
-    * **New Issues Pipeline**: When someone creates a new issue, it goes here first. Keep an eye out for issues that fall into your area. Add labels to them, and if it's something we should do, put it in the `Backlog` pipeline. If you aren't sure, throw it in the `Icebox`. It helps to sort this pipeline by date.
-    * **Icebox Pipeline**: Issues that we aren't immediately closing but aren't really ready to be prioritized and started on. It's not a wontfix bucket, but a "not sure if we should/can fix right now" bucket.
-    * **Backlog Pipeline**: Issues that we know we want to tackle. You can drag/drop up and down to prioritize issues.
-  * Marking dependencies/blockers is also quite useful where appropriate; please do that.
-  * We use epics and milestones in roughly the same way (because OSS projects don't have real sprints). Epics should be duplicated as milestones; if there's a main epic issue, it should contain a checklist of the relevant issues to complete it.
-* The `area:` labels correspond to maintainership areas. Apply yours to any issues or PRs that fall under your purview. It's to be expected that multiple `area:` labels may be applied to a single issue.
-* The [`help-wanted`](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Ahelp-wanted) and [`good-first-pr`](https://github.com/golang/dep/issues?q=is%3Aissue+is%3Aopen+label%3Agood-first-pr) labels are two of our most important tools for making the project accessible to newcomers - a key goal for our community. Here's how to use them well.
-  * `good-first-pr` should be applied when there's a very straightforward, self-contained task that is very unlikely to have any hidden complexity. The real purpose of these is to provide a "chink in the armor", providing newcomers a lens through which to start understanding the project.
-  * `help-wanted` should be applied to issues where there's a clear, stated goal, there is at most one significant question that needs answering, and it looks like the implementation won't be inordinately difficult, or disruptive to other parts of the system.
-    * `help-wanted` should also be applied to all `good-first-pr` issues - it's duplicative, but not doing so seems unfriendly.
-
-
-### Pull Requests
-
-* Try to make, and encourage, smaller pull requests.
-* [No is temporary. Yes is forever.](https://blog.jessfraz.com/post/the-art-of-closing/)
-* Long-running feature branches should generally be avoided. Discuss it with other maintainers first.
-* Unless it's trivial, don't merge your own PRs - ask another maintainer.
-* Commit messages should follow [Tim Pope's rules](http://tbaggery.com/2008/04/19/a-note-about-git-commit-messages.html).
-* Checklist for merging PRs:
-  * Does the PR pass [the code review comments](https://github.com/golang/go/wiki/CodeReviewComments)? (internalize these rules!)
-  * Are there tests to cover new or changed behavior? Prefer reliable tests > no tests > flaky tests.
-  * Does the first post in the PR contain "Fixes #..." text for any issues it resolves?
-  * Are any necessary follow-up issues _already_ posted, prior to merging?
-  * Does this change entail the updating of any docs?
-     * For docs kept in the repo, e.g. FAQ.md, docs changes _must_ be submitted as part of the same PR.
diff --git a/installer/vendor/github.com/golang/dep/Gopkg.lock b/installer/vendor/github.com/golang/dep/Gopkg.lock
deleted file mode 100644
index 835c753e86..0000000000
--- a/installer/vendor/github.com/golang/dep/Gopkg.lock
+++ /dev/null
@@ -1,100 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "parse-constraints-with-dash-in-pre"
-  name = "github.com/Masterminds/semver"
-  packages = ["."]
-  revision = "a93e51b5a57ef416dac8bb02d11407b6f55d8929"
-  source = "https://github.com/carolynvs/semver.git"
-
-[[projects]]
-  name = "github.com/Masterminds/vcs"
-  packages = ["."]
-  revision = "3084677c2c188840777bff30054f2b553729d329"
-  version = "v1.11.1"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/armon/go-radix"
-  packages = ["."]
-  revision = "4239b77079c7b5d1243b7b4736304ce8ddb6f0f2"
-
-[[projects]]
-  name = "github.com/boltdb/bolt"
-  packages = ["."]
-  revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
-  version = "v1.3.1"
-
-[[projects]]
-  branch = "v2"
-  name = "github.com/go-yaml/yaml"
-  packages = ["."]
-  revision = "cd8b52f8269e0feb286dfeef29f8fe4d5b397e0b"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/golang/protobuf"
-  packages = ["proto"]
-  revision = "5afd06f9d81a86d6e3bb7dc702d6bd148ea3ff23"
-
-[[projects]]
-  name = "github.com/jmank88/nuts"
-  packages = ["."]
-  revision = "a1e02c788669d022c325a8ee674f15360d7104f4"
-  version = "v0.2.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/nightlyone/lockfile"
-  packages = ["."]
-  revision = "e83dc5e7bba095e8d32fb2124714bf41f2a30cb5"
-
-[[projects]]
-  name = "github.com/pelletier/go-buffruneio"
-  packages = ["."]
-  revision = "c37440a7cf42ac63b919c752ca73a85067e05992"
-  version = "v0.2.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/pelletier/go-toml"
-  packages = ["."]
-  revision = "fe206efb84b2bc8e8cfafe6b4c1826622be969e3"
-
-[[projects]]
-  name = "github.com/pkg/errors"
-  packages = ["."]
-  revision = "645ef00459ed84a119197bfb8d8205042c6df63d"
-  version = "v0.8.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/constext"
-  packages = ["."]
-  revision = "836a144573533ea4da4e6929c235fd348aed1c80"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/net"
-  packages = ["context"]
-  revision = "66aacef3dd8a676686c7ae3716979581e8b03c47"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/sync"
-  packages = ["errgroup"]
-  revision = "f52d1811a62927559de87708c8913c1650ce4f26"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  revision = "bb24a47a89eac6c1227fbcb2ae37a8b9ed323366"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "05c1cd69be2c917c0cc4b32942830c2acfa044d8200fdc94716aae48a8083702"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/Gopkg.toml b/installer/vendor/github.com/golang/dep/Gopkg.toml
deleted file mode 100644
index 054a3cf59a..0000000000
--- a/installer/vendor/github.com/golang/dep/Gopkg.toml
+++ /dev/null
@@ -1,32 +0,0 @@
-[[constraint]]
-  branch = "parse-constraints-with-dash-in-pre"
-  name = "github.com/Masterminds/semver"
-  source = "https://github.com/carolynvs/semver.git"
-
-[[constraint]]
-  name = "github.com/Masterminds/vcs"
-  version = "1.11.0"
-
-[[constraint]]
-  branch = "v2"
-  name = "github.com/go-yaml/yaml"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/pelletier/go-toml"
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "0.8.0"
-
-[[constraint]]
-  name = "github.com/boltdb/bolt"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/jmank88/nuts"
-  version = "0.2.0"
-
-[[constraint]]
-  name = "github.com/golang/protobuf"
-  branch = "master"
diff --git a/installer/vendor/github.com/golang/dep/MAINTAINERS.md b/installer/vendor/github.com/golang/dep/MAINTAINERS.md
deleted file mode 100644
index 9b985c389e..0000000000
--- a/installer/vendor/github.com/golang/dep/MAINTAINERS.md
+++ /dev/null
@@ -1,17 +0,0 @@
-
-General maintainers:
-    sam boyer (@sdboyer)
-
-* dep
-  * `init` command: Carolyn Van Slyck (@carolynvs)
-  * `ensure` command: Ibrahim AshShohail (@ibrasho)
-  * `status` command: Sunny (@darkowlzz)
-  * testing harness: (vacant)
-* gps
-  * solver: (vacant)
-  * source manager: (vacant)
-  * root deduction: (vacant)
-  * source/vcs interaction: (vacant)
-  * caching: Jordan Krage (@jmank88)
-  * pkgtree: (vacant)
-  * versions and constraints: (vacant)
diff --git a/installer/vendor/github.com/golang/dep/README.md b/installer/vendor/github.com/golang/dep/README.md
deleted file mode 100644
index c6dae6e3cd..0000000000
--- a/installer/vendor/github.com/golang/dep/README.md
+++ /dev/null
@@ -1,276 +0,0 @@
-<p align="center"><img src="docs/img/DigbyShadows.png" width="360"></p>
-<p align="center">
-  <a href="https://travis-ci.org/golang/dep"><img src="https://travis-ci.org/golang/dep.svg?branch=master" alt="Build Status"></img></a>
-  <a href="https://ci.appveyor.com/project/golang/dep"><img src="https://ci.appveyor.com/api/projects/status/github/golang/dep?svg=true&branch=master&passingText=Windows%20-%20OK&failingText=Windows%20-%20failed&pendingText=Windows%20-%20pending" alt="Windows Build Status"></a>
-  <a href="https://codeclimate.com/github/golang/dep"><img src="https://codeclimate.com/github/golang/dep/badges/gpa.svg" alt="Code Climate"></img></a>
-  <a href="https://codeclimate.com/github/golang/dep/coverage"><img src="https://codeclimate.com/github/golang/dep/badges/coverage.svg" /></a>
-</p>
-
-## Dep
-
-`dep` is a prototype dependency management tool for Go. It requires Go 1.8 or newer to compile.
-
-`dep` is the official _experiment_, but not yet the official tool. Check out the [Roadmap](https://github.com/golang/dep/wiki/Roadmap) for more on what this means!
-
-## Current status
-
-`dep` is safe for production use. That means two things:
-
-* Any valid metadata file (`Gopkg.toml` and `Gopkg.lock`) will be readable and considered valid by any future version of `dep`.
-* The CLI UI is mostly stable. `dep init` and `dep ensure` are mostly set; `dep status` is likely to change a fair bit, and `dep prune` is [going to be absorbed into `dep ensure`](https://github.com/golang/dep/issues/944).
-
-That said, keep in mind the following:
-
-* `dep init` on an existing project can be a rocky experience - we try to automatically convert from other tools' metadata files, and that process is often complex and murky. Once your project is converted and you're using `dep ensure`, its behavior is quite stable.
-* `dep` still has nasty bugs, but in general these are comparable or fewer to other tools out there.
-* `dep` is [pretty slow right now](https://github.com/golang/dep/blob/master/docs/FAQ.md#why-is-dep-slow), especially on the first couple times you run it. Just know that there is a _lot_ of headroom for improvement, and work is actively underway.
-* `dep` is still changing rapidly. If you need stability (e.g. for CI), it's best to rely on a released version, not tip.
-* `dep`'s exported API interface will continue to change in unpredictable, backwards-incompatible ways until we tag a v1.0.0 release.
-
-## Context
-
-- [The Saga of Go Dependency Management](https://blog.gopheracademy.com/advent-2016/saga-go-dependency-management/)
-- Official Google Docs
-  - [Go Packaging Proposal Process](https://docs.google.com/document/d/18tNd8r5DV0yluCR7tPvkMTsWD_lYcRO7NhpNSDymRr8/edit)
-  - [User Stories](https://docs.google.com/document/d/1wT8e8wBHMrSRHY4UF_60GCgyWGqvYye4THvaDARPySs/edit)
-  - [Features](https://docs.google.com/document/d/1JNP6DgSK-c6KqveIhQk-n_HAw3hsZkL-okoleM43NgA/edit)
-  - [Design Space](https://docs.google.com/document/d/1TpQlQYovCoX9FkpgsoxzdvZplghudHAiQOame30A-v8/edit)
-- [Frequently Asked Questions](docs/FAQ.md)
-
-## Setup
-
-Grab the latest binary from the [releases](https://github.com/golang/dep/releases) page.
-
-On macOS you can install or upgrade to the latest released version with Homebrew:
-
-```sh
-$ brew install dep
-$ brew upgrade dep
-```
-
-If you're interested in hacking on `dep`, you can install via `go get`:
-
-```sh
-go get -u github.com/golang/dep/cmd/dep
-```
-
-To start managing dependencies using dep, run the following from your project's root directory:
-
-```sh
-$ dep init
-```
-
-This does the following:
-
-1. Look for [existing dependency management files](docs/FAQ.md#what-external-tools-are-supported) to convert
-1. Check if your dependencies use dep
-1. Identify your dependencies
-1. Back up your existing `vendor/` directory (if you have one) to
-`_vendor-TIMESTAMP/`
-1. Pick the highest compatible version for each dependency
-1. Generate [`Gopkg.toml`](docs/Gopkg.toml.md) ("manifest") and `Gopkg.lock` files
-1. Install the dependencies in `vendor/`
-
-## Usage
-
-There is one main subcommand you will use: `dep ensure`. `ensure` first checks that `Gopkg.lock` is consistent with `Gopkg.toml` and the `import`s in your code. If any
-changes are detected, `dep`'s solver works out a new `Gopkg.lock`. Then, `dep` checks if the contents of `vendor/` are what `Gopkg.lock` (the new one if applicable, else the existing one) says it should be, and rewrites `vendor/` as needed to bring it into line.
-
-In essence, `dep ensure` [works in two phases to keep four buckets of state in sync](https://youtu.be/5LtMb090AZI?t=20m4s):
-
-<img width="463" alt="states-flow" src="https://user-images.githubusercontent.com/21599/29223886-22dd2578-7e96-11e7-8b51-3637b9ddc715.png">
-
-
-_Note: until we ship [vendor verification](https://github.com/golang/dep/issues/121), we can't efficiently perform the `Gopkg.lock` <-> `vendor/` comparison, so `dep ensure` unconditionally regenerates all of `vendor/` to be safe._
-
-`dep ensure` is safe to run early and often. See the help text for more detailed
-usage instructions.
-
-```sh
-$ dep help ensure
-```
-
-### Installing dependencies
-
-(if your `vendor/` directory isn't [checked in with your code](docs/FAQ.md#should-i-commit-my-vendor-directory))
-
-<!-- may change with https://github.com/golang/dep/pull/489 -->
-
-```sh
-$ dep ensure
-```
-
-If a dependency already exists in your `vendor/` folder, dep will ensure it
-matches the constraints from the manifest. If the dependency is missing from
-`vendor/`, the latest version allowed by your manifest will be installed.
-
-### Adding a dependency
-
-```sh
-$ dep ensure -add github.com/foo/bar
-```
-
-This adds a version constraint to your `Gopkg.toml`, and updates `Gopkg.lock` and `vendor/`. Now, import and use the package in your code! ✨
-
-`dep ensure -add` has some subtle behavior variations depending on the project or package named, and the state of your tree. See `dep ensure -examples` for more information.
-
-### Changing dependencies
-
-If you want to:
-
-* Change the allowed `version`/`branch`/`revision`
-* Switch to using a fork
-
-for one or more dependencies, do the following:
-
-1. Manually edit your `Gopkg.toml`.
-1. Run
-
-    ```sh
-    $ dep ensure
-    ```
-
-### Checking the status of dependencies
-
-Run `dep status` to see the current status of all your dependencies.
-
-```sh
-$ dep status
-PROJECT                             CONSTRAINT     VERSION        REVISION  LATEST
-github.com/Masterminds/semver       branch 2.x     branch 2.x     139cc09   c2e7f6c
-github.com/Masterminds/vcs          ^1.11.0        v1.11.1        3084677   3084677
-github.com/armon/go-radix           *              branch master  4239b77   4239b77
-```
-
-On top of that, if you have added new imports to your project or modified `Gopkg.toml` without running `dep ensure` again, `dep status` will tell you there is a mismatch between `Gopkg.lock` and the current status of the project.
-
-```sh
-$ dep status
-Lock inputs-digest mismatch due to the following packages missing from the lock:
-
-PROJECT                         MISSING PACKAGES
-github.com/Masterminds/goutils  [github.com/Masterminds/goutils]
-
-This happens when a new import is added. Run `dep ensure` to install the missing packages.
-```
-
-As `dep status` suggests, run `dep ensure` to update your lockfile. Then run `dep status` again, and the lock mismatch should go away.
-
-### Visualizing dependencies
-
-Generate a visual representation of the dependency tree by piping the output of `dep status -dot` to [graphviz](http://www.graphviz.org/).
-#### Linux
-```
-$ sudo apt-get install graphviz
-$ dep status -dot | dot -T png | display
-```
-#### MacOS
-```
-$ brew install graphviz
-$ dep status -dot | dot -T png | open -f -a /Applications/Preview.app
-```
-#### Windows
-```
-> choco install graphviz.portable
-> dep status -dot | dot -T png -o status.png; start status.png
-```
-<p align="center"><img src="docs/img/StatusGraph.png"></p>
-
-### Updating dependencies
-
-Updating brings the version of a dependency in `Gopkg.lock` and `vendor/` to the latest version allowed by the constraints in `Gopkg.toml`.
-
-You can update just a targeted subset of dependencies (recommended):
-
-```sh
-$ dep ensure -update github.com/some/project github.com/other/project
-$ dep ensure -update github.com/another/project
-```
-
-Or you can update all your dependencies at once:
-
-```sh
-$ dep ensure -update
-```
-
-"Latest" means different things depending on the type of constraint in use. If you're depending on a `branch`, `dep` will update to the latest tip of that branch. If you're depending on a `version` using [a semver range](#semantic-versioning), it will update to the latest version in that range.
-
-### Removing dependencies
-
-1. Remove the `import`s and all usage from your code.
-1. Remove `[[constraint]]` rules from `Gopkg.toml` (if any).
-1. Run
-
-    ```sh
-    $ dep ensure
-    ```
-
-### Testing changes to a dependency
-
-Making changes in your `vendor/` directory directly is not recommended, as dep
-will overwrite any changes. Instead:
-
-1. Delete the dependency from the `vendor/` directory.
-
-    ```sh
-    rm -rf vendor/<dependency>
-    ```
-
-1. Add that dependency to your `GOPATH`, if it isn't already.
-
-    ```sh
-    $ go get <dependency>
-    ```
-
-1. Modify the dependency in `$GOPATH/src/<dependency>`.
-1. Test, build, etc.
-
-Don't run `dep ensure` until you're done. `dep ensure` will reinstall the
-dependency into `vendor/` based on your manifest, as if you were installing from
-scratch.
-
-This solution works for short-term use, but for something long-term, take a look
-at [virtualgo](https://github.com/GetStream/vg).
-
-To test out code that has been pushed as a new version, or to a branch or fork,
-see [changing dependencies](#changing-dependencies).
-
-## Semantic Versioning
-
-`dep ensure` a uses an external [semver library](https://github.com/Masterminds/semver) to interpret the version constraints you specify in the manifest. The comparison operators are:
-
-* `=`: equal
-* `!=`: not equal
-* `>`: greater than
-* `<`: less than
-* `>=`: greater than or equal to
-* `<=`: less than or equal to
-* `-`: literal range. Eg: 1.2 - 1.4.5 is equivalent to >= 1.2, <= 1.4.5
-* `~`: minor range. Eg: ~1.2.3 is equivalent to >= 1.2.3, < 1.3.0
-* `^`: major range. Eg: ^1.2.3 is equivalent to >= 1.2.3, < 2.0.0
-* `[xX*]`: wildcard. Eg: 1.2.x is equivalent to >= 1.2.0, < 1.3.0
-
-You might, for example, include a constraint in your manifest that specifies `version = "=2.0.0"` to pin a dependency to version 2.0.0, or constrain to minor releases with: `version = "2.*"`. Refer to the [semver library](https://github.com/Masterminds/semver) documentation for more info.
-
-**Note**: When you specify a version *without an operator*, `dep` automatically uses the `^` operator by default. `dep ensure` will interpret the given version as the min-boundry of a range, for example:
-
-* `1.2.3` becomes the range `>=1.2.3, <2.0.0`
-* `0.2.3` becomes the range `>=0.2.3, <0.3.0`
-* `0.0.3` becomes the range `>=0.0.3, <0.1.0`
-
-## Feedback
-
-Feedback is greatly appreciated.
-At this stage, the maintainers are most interested in feedback centered on the user experience (UX) of the tool.
-Do you have workflows that the tool supports well, or doesn't support at all?
-Do any of the commands have surprising effects, output, or results?
-Please check the existing issues and [FAQ](docs/FAQ.md) to see if your feedback has already been reported.
-If not, please file an issue, describing what you did or wanted to do, what you expected to happen, and what actually happened.
-
-## Contributing
-
-Contributions are greatly appreciated.
-The maintainers actively manage the issues list, and try to highlight issues suitable for newcomers.
-The project follows the typical GitHub pull request model.
-See [CONTRIBUTING.md](CONTRIBUTING.md) for more details.
-Before starting any work, please either comment on an existing issue, or file a new one.
diff --git a/installer/vendor/github.com/golang/dep/analyzer_notwindows_test.go b/installer/vendor/github.com/golang/dep/analyzer_notwindows_test.go
deleted file mode 100644
index 6b9dedb838..0000000000
--- a/installer/vendor/github.com/golang/dep/analyzer_notwindows_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !windows
-
-package dep
-
-import (
-	"io"
-	"os"
-)
-
-func makeUnreadable(path string) (io.Closer, error) {
-	err := os.Chmod(path, 0222)
-	if err != nil {
-		return nil, err
-	}
-	return closer{}, nil
-}
-
-type closer struct{}
-
-func (closer) Close() error { return nil }
diff --git a/installer/vendor/github.com/golang/dep/analyzer_test.go b/installer/vendor/github.com/golang/dep/analyzer_test.go
deleted file mode 100644
index 4e453620a4..0000000000
--- a/installer/vendor/github.com/golang/dep/analyzer_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestAnalyzerDeriveManifestAndLock(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("dep")
-	golden := filepath.Join("analyzer", ManifestName)
-	want := h.GetTestFileString(golden)
-	h.TempCopy(filepath.Join("dep", ManifestName), golden)
-
-	a := Analyzer{}
-
-	m, l, err := a.DeriveManifestAndLock(h.Path("dep"), "my/fake/project")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	got, err := m.(*Manifest).MarshalTOML()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if want != string(got) {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(golden, string(got)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Fatalf("expected %s\n got %s", want, string(got))
-		}
-	}
-
-	if l != nil {
-		t.Fatalf("expected lock to be nil, got: %#v", l)
-	}
-}
-
-func TestAnalyzerDeriveManifestAndLockDoesNotExist(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("dep")
-
-	a := Analyzer{}
-
-	m, l, err := a.DeriveManifestAndLock(h.Path("dep"), "my/fake/project")
-	if m != nil || l != nil || err != nil {
-		t.Fatalf("expected manifest & lock & err to be nil: m -> %#v l -> %#v err-> %#v", m, l, err)
-	}
-}
-
-func TestAnalyzerDeriveManifestAndLockCannotOpen(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("dep")
-
-	// Simulate an inaccessible manifest file.
-	h.TempFile(filepath.Join("dep", ManifestName), "")
-	closer, err := makeUnreadable(filepath.Join(h.Path("dep"), ManifestName))
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer closer.Close()
-
-	a := Analyzer{}
-
-	// Verify that the solver rejects the manifest, rather than treating it as
-	// offering no constraints.
-	m, l, err := a.DeriveManifestAndLock(h.Path("dep"), "my/fake/project")
-	if m != nil || l != nil || err == nil {
-		t.Fatalf("expected manifest & lock to be nil, err to be not nil: m -> %#v l -> %#v err -> %#v", m, l, err)
-	}
-}
-
-func TestAnalyzerDeriveManifestAndLockInvalidManifest(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("dep")
-
-	// Create a manifest with invalid contents
-	h.TempFile(filepath.Join("dep", ManifestName), "invalid manifest")
-
-	a := Analyzer{}
-
-	m, l, err := a.DeriveManifestAndLock(h.Path("dep"), "my/fake/project")
-	if m != nil || l != nil || err == nil {
-		t.Fatalf("expected manifest & lock & err to be nil: m -> %#v l -> %#v err-> %#v", m, l, err)
-	}
-}
-
-func TestAnalyzerInfo(t *testing.T) {
-	a := Analyzer{}
-
-	info := a.Info()
-
-	if info.Name != "dep" || info.Version != 1 {
-		t.Fatalf("expected name to be 'dep' and version to be 1: name -> %q vers -> %d", info.Name, info.Version)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/analyzer_windows_test.go b/installer/vendor/github.com/golang/dep/analyzer_windows_test.go
deleted file mode 100644
index 96eb02a405..0000000000
--- a/installer/vendor/github.com/golang/dep/analyzer_windows_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"io"
-	"os"
-	"syscall"
-)
-
-// makeUnreadable opens the file at path in exclusive mode. A file opened in
-// exclusive mode cannot be opened again until the exclusive mode file handle
-// is closed.
-func makeUnreadable(path string) (io.Closer, error) {
-	if len(path) == 0 {
-		return nil, syscall.ERROR_FILE_NOT_FOUND
-	}
-	pathp, err := syscall.UTF16PtrFromString(path)
-	if err != nil {
-		return nil, err
-	}
-	access := uint32(syscall.GENERIC_READ | syscall.GENERIC_WRITE)
-	sharemode := uint32(0) // no sharing == exclusive mode
-	sa := (*syscall.SecurityAttributes)(nil)
-	createmode := uint32(syscall.OPEN_EXISTING)
-	h, err := syscall.CreateFile(pathp, access, sharemode, sa, createmode, syscall.FILE_ATTRIBUTE_NORMAL, 0)
-	if err != nil {
-		return nil, err
-	}
-	return os.NewFile(uintptr(h), path), nil
-}
diff --git a/installer/vendor/github.com/golang/dep/appveyor.yml b/installer/vendor/github.com/golang/dep/appveyor.yml
deleted file mode 100644
index d494ea36dc..0000000000
--- a/installer/vendor/github.com/golang/dep/appveyor.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-version: "{build}"
-
-# Source Config
-clone_folder: c:\gopath\src\github.com\golang\dep
-
-# Build host
-
-environment:
-  GOPATH: c:\gopath
-  DEPTESTBYPASS501: 1
-  GOVERSION: 1.8
-
-init:
-  - git config --global core.autocrlf input
-
-# Build
-
-install:
-  # Install the specific Go version.
-  - rmdir c:\go /s /q
-  - appveyor DownloadFile https://storage.googleapis.com/golang/go%GOVERSION%.windows-amd64.msi
-  - msiexec /i go%GOVERSION%.windows-amd64.msi /q
-  - choco install bzr
-  - set Path=c:\go\bin;c:\gopath\bin;C:\Program Files (x86)\Bazaar\;C:\Program Files\Mercurial\%Path%
-  - go version
-  - go env
-
-build: false
-deploy: false
-
-test_script:
-  - go build github.com/golang/dep/cmd/dep
-  - for /f "" %%G in ('go list github.com/golang/dep/... ^| find /i /v "/vendor/"') do ( go test %%G & IF ERRORLEVEL == 1 EXIT 1)
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/dep_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/dep_test.go
deleted file mode 100644
index aad727686c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/dep_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-// The TestMain function creates a dep command for testing purposes and
-// deletes it after the tests have been run.
-// Most of this is taken from https://github.com/golang/go/blob/master/src/cmd/go/go_test.go and reused here.
-func TestMain(m *testing.M) {
-	args := []string{"build", "-o", "testdep" + test.ExeSuffix}
-	out, err := exec.Command("go", args...).CombinedOutput()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "building testdep failed: %v\n%s", err, out)
-		os.Exit(2)
-	}
-
-	// Don't let these environment variables confuse the test.
-	os.Unsetenv("GOPATH")
-	os.Unsetenv("GIT_ALLOW_PROTOCOL")
-	if home, ccacheDir := os.Getenv("HOME"), os.Getenv("CCACHE_DIR"); home != "" && ccacheDir == "" {
-		// On some systems the default C compiler is ccache.
-		// Setting HOME to a non-existent directory will break
-		// those systems.  Set CCACHE_DIR to cope.  Issue 17668.
-		os.Setenv("CCACHE_DIR", filepath.Join(home, ".ccache"))
-	}
-	os.Setenv("HOME", "/test-dep-home-does-not-exist")
-
-	r := m.Run()
-
-	os.Remove("testdep" + test.ExeSuffix)
-
-	os.Exit(r)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/ensure.go b/installer/vendor/github.com/golang/dep/cmd/dep/ensure.go
deleted file mode 100644
index 63e4868ad7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/ensure.go
+++ /dev/null
@@ -1,902 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-const ensureShortHelp = `Ensure a dependency is safely vendored in the project`
-const ensureLongHelp = `
-Project spec:
-
-  <import path>[:alt source URL][@<constraint>]
-
-
-Ensure gets a project into a complete, reproducible, and likely compilable state:
-
-  * All non-stdlib imports are fulfilled
-  * All rules in Gopkg.toml are respected
-  * Gopkg.lock records precise versions for all dependencies
-  * vendor/ is populated according to Gopkg.lock
-
-Ensure has fast techniques to determine that some of these steps may be
-unnecessary. If that determination is made, ensure may skip some steps. Flags
-may be passed to bypass these checks; -vendor-only will allow an out-of-date
-Gopkg.lock to populate vendor/, and -no-vendor will update Gopkg.lock (if
-needed), but never touch vendor/.
-
-The effect of passing project spec arguments varies slightly depending on the
-combination of flags that are passed.
-
-
-Examples:
-
-  dep ensure                                 Populate vendor from existing Gopkg.toml and Gopkg.lock
-  dep ensure -add github.com/pkg/foo         Introduce a named dependency at its newest version
-  dep ensure -add github.com/pkg/foo@^1.0.1  Introduce a named dependency with a particular constraint
-
-For more detailed usage examples, see dep ensure -examples.
-`
-const ensureExamples = `
-dep ensure
-
-    Solve the project's dependency graph, and place all dependencies in the
-    vendor folder. If a dependency is in the lock file, use the version
-    specified there. Otherwise, use the most recent version that can satisfy the
-    constraints in the manifest file.
-
-dep ensure -vendor-only
-
-    Write vendor/ from an exising Gopkg.lock file, without first verifying that
-    the lock is in sync with imports and Gopkg.toml. (This may be useful for
-    e.g. strategically layering a Docker images)
-
-dep ensure -add github.com/pkg/foo github.com/pkg/foo/bar
-
-    Introduce one or more dependencies, at their newest version, ensuring that
-    specific packages are present in Gopkg.lock and vendor/. Also, append a
-    corresponding constraint to Gopkg.toml.
-
-    Note: packages introduced in this way will disappear on the next "dep
-    ensure" if an import statement is not added first.
-
-dep ensure -add github.com/pkg/foo/subpkg@1.0.0 bitbucket.org/pkg/bar/baz@master
-
-    Append version constraints to Gopkg.toml for one or more packages, if no
-    such rules already exist.
-
-    If the named packages are not already imported, also ensure they are present
-    in Gopkg.lock and vendor/. As in the preceding example, packages introduced
-    in this way will disappear on the next "dep ensure" if an import statement
-    is not added first.
-
-dep ensure -add github.com/pkg/foo:git.internal.com/alt/foo
-
-    Specify an alternate location to treat as the upstream source for a dependency.
-
-dep ensure -update github.com/pkg/foo github.com/pkg/bar
-
-    Update a list of dependencies to the latest versions allowed by Gopkg.toml,
-    ignoring any versions recorded in Gopkg.lock. Write the results to
-    Gopkg.lock and vendor/.
-
-dep ensure -update
-
-    Update all dependencies to the latest versions allowed by Gopkg.toml,
-    ignoring any versions recorded in Gopkg.lock. Update the lock file with any
-    changes. (NOTE: Not recommended. Updating one/some dependencies at a time is
-    preferred.)
-
-dep ensure -update -no-vendor
-
-    As above, but only modify Gopkg.lock; leave vendor/ unchanged.
-
-dep ensure -no-vendor -dry-run
-
-    This fails with a non zero exit code if Gopkg.lock is not up to date with
-    the Gopkg.toml or the project imports. It can be useful to run this during
-    CI to check if Gopkg.lock is up to date.
-
-`
-
-var (
-	errUpdateArgsValidation = errors.New("update arguments validation failed")
-	errAddDepsFailed        = errors.New("adding dependencies failed")
-)
-
-func (cmd *ensureCommand) Name() string { return "ensure" }
-func (cmd *ensureCommand) Args() string {
-	return "[-update | -add] [-no-vendor | -vendor-only] [-dry-run] [<spec>...]"
-}
-func (cmd *ensureCommand) ShortHelp() string { return ensureShortHelp }
-func (cmd *ensureCommand) LongHelp() string  { return ensureLongHelp }
-func (cmd *ensureCommand) Hidden() bool      { return false }
-
-func (cmd *ensureCommand) Register(fs *flag.FlagSet) {
-	fs.BoolVar(&cmd.examples, "examples", false, "print detailed usage examples")
-	fs.BoolVar(&cmd.update, "update", false, "update the named dependencies (or all, if none are named) in Gopkg.lock to the latest allowed by Gopkg.toml")
-	fs.BoolVar(&cmd.add, "add", false, "add new dependencies, or populate Gopkg.toml with constraints for existing dependencies")
-	fs.BoolVar(&cmd.vendorOnly, "vendor-only", false, "populate vendor/ from Gopkg.lock without updating it first")
-	fs.BoolVar(&cmd.noVendor, "no-vendor", false, "update Gopkg.lock (if needed), but do not update vendor/")
-	fs.BoolVar(&cmd.dryRun, "dry-run", false, "only report the changes that would be made")
-}
-
-type ensureCommand struct {
-	examples   bool
-	update     bool
-	add        bool
-	noVendor   bool
-	vendorOnly bool
-	dryRun     bool
-}
-
-func (cmd *ensureCommand) Run(ctx *dep.Ctx, args []string) error {
-	if cmd.examples {
-		ctx.Err.Println(strings.TrimSpace(ensureExamples))
-		return nil
-	}
-
-	if err := cmd.validateFlags(); err != nil {
-		return err
-	}
-
-	p, err := ctx.LoadProject()
-	if err != nil {
-		return err
-	}
-
-	sm, err := ctx.SourceManager()
-	if err != nil {
-		return err
-	}
-	sm.UseDefaultSignalHandling()
-	defer sm.Release()
-
-	if err := dep.ValidateProjectRoots(ctx, p.Manifest, sm); err != nil {
-		return err
-	}
-
-	params := p.MakeParams()
-	if ctx.Verbose {
-		params.TraceLogger = ctx.Err
-	}
-
-	if cmd.vendorOnly {
-		return cmd.runVendorOnly(ctx, args, p, sm, params)
-	}
-
-	params.RootPackageTree, err = p.ParseRootPackageTree()
-	if err != nil {
-		return err
-	}
-
-	if fatal, err := checkErrors(params.RootPackageTree.Packages, p.Manifest.IgnoredPackages()); err != nil {
-		if fatal {
-			return err
-		} else if ctx.Verbose {
-			ctx.Out.Println(err)
-		}
-	}
-
-	if cmd.add {
-		return cmd.runAdd(ctx, args, p, sm, params)
-	} else if cmd.update {
-		return cmd.runUpdate(ctx, args, p, sm, params)
-	}
-	return cmd.runDefault(ctx, args, p, sm, params)
-}
-
-func (cmd *ensureCommand) validateFlags() error {
-	if cmd.add && cmd.update {
-		return errors.New("cannot pass both -add and -update")
-	}
-
-	if cmd.vendorOnly {
-		if cmd.update {
-			return errors.New("-vendor-only makes -update a no-op; cannot pass them together")
-		}
-		if cmd.add {
-			return errors.New("-vendor-only makes -add a no-op; cannot pass them together")
-		}
-		if cmd.noVendor {
-			// TODO(sdboyer) can't think of anything not snarky right now
-			return errors.New("really?")
-		}
-	}
-	return nil
-}
-
-func (cmd *ensureCommand) runDefault(ctx *dep.Ctx, args []string, p *dep.Project, sm gps.SourceManager, params gps.SolveParameters) error {
-	// Bare ensure doesn't take any args.
-	if len(args) != 0 {
-		return errors.New("dep ensure only takes spec arguments with -add or -update")
-	}
-
-	if err := ctx.ValidateParams(sm, params); err != nil {
-		return err
-	}
-
-	solver, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "prepare solver")
-	}
-
-	if p.Lock != nil && bytes.Equal(p.Lock.InputsDigest(), solver.HashInputs()) {
-		// Memo matches, so there's probably nothing to do.
-		if ctx.Verbose {
-			ctx.Out.Printf("%s was already in sync with imports and %s\n", dep.LockName, dep.ManifestName)
-		}
-
-		if cmd.noVendor {
-			// The user said not to touch vendor/, so definitely nothing to do.
-			return nil
-		}
-
-		// TODO(sdboyer) The desired behavior at this point is to determine
-		// whether it's necessary to write out vendor, or if it's already
-		// consistent with the lock. However, we haven't yet determined what
-		// that "verification" is supposed to look like (#121); in the meantime,
-		// we unconditionally write out vendor/ so that `dep ensure`'s behavior
-		// is maximally compatible with what it will eventually become.
-		sw, err := dep.NewSafeWriter(nil, p.Lock, p.Lock, dep.VendorAlways)
-		if err != nil {
-			return err
-		}
-
-		if cmd.dryRun {
-			return sw.PrintPreparedActions(ctx.Out, ctx.Verbose)
-		}
-
-		logger := ctx.Err
-		if !ctx.Verbose {
-			logger = log.New(ioutil.Discard, "", 0)
-		}
-		return errors.WithMessage(sw.Write(p.AbsRoot, sm, true, logger), "grouped write of manifest, lock and vendor")
-	}
-
-	if cmd.noVendor && cmd.dryRun {
-		return errors.New("Gopkg.lock was not up to date")
-	}
-
-	solution, err := solver.Solve()
-	if err != nil {
-		handleAllTheFailuresOfTheWorld(err)
-		return errors.Wrap(err, "ensure Solve()")
-	}
-
-	vendorBehavior := dep.VendorOnChanged
-	if cmd.noVendor {
-		vendorBehavior = dep.VendorNever
-	}
-	sw, err := dep.NewSafeWriter(nil, p.Lock, dep.LockFromSolution(solution), vendorBehavior)
-	if err != nil {
-		return err
-	}
-	if cmd.dryRun {
-		return sw.PrintPreparedActions(ctx.Out, ctx.Verbose)
-	}
-
-	logger := ctx.Err
-	if !ctx.Verbose {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-	return errors.Wrap(sw.Write(p.AbsRoot, sm, false, logger), "grouped write of manifest, lock and vendor")
-}
-
-func (cmd *ensureCommand) runVendorOnly(ctx *dep.Ctx, args []string, p *dep.Project, sm gps.SourceManager, params gps.SolveParameters) error {
-	if len(args) != 0 {
-		return errors.Errorf("dep ensure -vendor-only only populates vendor/ from %s; it takes no spec arguments", dep.LockName)
-	}
-
-	if p.Lock == nil {
-		return errors.Errorf("no %s exists from which to populate vendor/", dep.LockName)
-	}
-	// Pass the same lock as old and new so that the writer will observe no
-	// difference and choose not to write it out.
-	sw, err := dep.NewSafeWriter(nil, p.Lock, p.Lock, dep.VendorAlways)
-	if err != nil {
-		return err
-	}
-
-	if cmd.dryRun {
-		return sw.PrintPreparedActions(ctx.Out, ctx.Verbose)
-	}
-
-	logger := ctx.Err
-	if !ctx.Verbose {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-	return errors.WithMessage(sw.Write(p.AbsRoot, sm, true, logger), "grouped write of manifest, lock and vendor")
-}
-
-func (cmd *ensureCommand) runUpdate(ctx *dep.Ctx, args []string, p *dep.Project, sm gps.SourceManager, params gps.SolveParameters) error {
-	if p.Lock == nil {
-		return errors.Errorf("-update works by updating the versions recorded in %s, but %s does not exist", dep.LockName, dep.LockName)
-	}
-
-	if err := ctx.ValidateParams(sm, params); err != nil {
-		return err
-	}
-
-	// We'll need to discard this prepared solver as later work changes params,
-	// but solver preparation is cheap and worth doing up front in order to
-	// perform the fastpath check of hash comparison.
-	solver, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "fastpath solver prepare")
-	}
-
-	// Compare the hashes. If they're not equal, bail out and ask the user to
-	// run a straight `dep ensure` before updating. This is handholding the
-	// user a bit, but the extra effort required is minimal, and it ensures the
-	// user is isolating variables in the event of solve problems (was it the
-	// "pending" changes, or the -update that caused the problem?).
-	if !bytes.Equal(p.Lock.InputsDigest(), solver.HashInputs()) {
-		ctx.Out.Printf("Warning: %s is out of sync with %s or the project's imports.", dep.LockName, dep.ManifestName)
-	}
-
-	// When -update is specified without args, allow every dependency to change
-	// versions, regardless of the lock file.
-	if len(args) == 0 {
-		params.ChangeAll = true
-	}
-
-	if err := validateUpdateArgs(ctx, args, p, sm, &params); err != nil {
-		return err
-	}
-
-	// Re-prepare a solver now that our params are complete.
-	solver, err = gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "fastpath solver prepare")
-	}
-	solution, err := solver.Solve()
-	if err != nil {
-		// TODO(sdboyer) special handling for warning cases as described in spec
-		// - e.g., named projects did not upgrade even though newer versions
-		// were available.
-		handleAllTheFailuresOfTheWorld(err)
-		return errors.Wrap(err, "ensure Solve()")
-	}
-
-	sw, err := dep.NewSafeWriter(nil, p.Lock, dep.LockFromSolution(solution), dep.VendorOnChanged)
-	if err != nil {
-		return err
-	}
-	if cmd.dryRun {
-		return sw.PrintPreparedActions(ctx.Out, ctx.Verbose)
-	}
-
-	logger := ctx.Err
-	if !ctx.Verbose {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-	return errors.Wrap(sw.Write(p.AbsRoot, sm, false, logger), "grouped write of manifest, lock and vendor")
-}
-
-func (cmd *ensureCommand) runAdd(ctx *dep.Ctx, args []string, p *dep.Project, sm gps.SourceManager, params gps.SolveParameters) error {
-	if len(args) == 0 {
-		return errors.New("must specify at least one project or package to -add")
-	}
-
-	if err := ctx.ValidateParams(sm, params); err != nil {
-		return err
-	}
-
-	// We'll need to discard this prepared solver as later work changes params,
-	// but solver preparation is cheap and worth doing up front in order to
-	// perform the fastpath check of hash comparison.
-	solver, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "fastpath solver prepare")
-	}
-
-	// Compare the hashes. If they're not equal, bail out and ask the user to
-	// run a straight `dep ensure` before updating. This is handholding the
-	// user a bit, but the extra effort required is minimal, and it ensures the
-	// user is isolating variables in the event of solve problems (was it the
-	// "pending" changes, or the -add that caused the problem?).
-	if p.Lock != nil && !bytes.Equal(p.Lock.InputsDigest(), solver.HashInputs()) {
-		ctx.Out.Printf("Warning: %s is out of sync with %s or the project's imports.", dep.LockName, dep.ManifestName)
-	}
-
-	rm, _ := params.RootPackageTree.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
-
-	// TODO(sdboyer) re-enable this once we ToReachMap() intelligently filters out normally-excluded (_*, .*), dirs from errmap
-	//rm, errmap := params.RootPackageTree.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
-	// Having some problematic internal packages isn't cause for termination,
-	// but the user needs to be warned.
-	//for fail, err := range errmap {
-	//if _, is := err.Err.(*build.NoGoError); !is {
-	//ctx.Err.Printf("Warning: %s, %s", fail, err)
-	//}
-	//}
-
-	// Compile unique sets of 1) all external packages imported or required, and
-	// 2) the project roots under which they fall.
-	exmap := make(map[string]bool)
-	exrmap := make(map[gps.ProjectRoot]bool)
-
-	for _, ex := range append(rm.FlattenFn(paths.IsStandardImportPath), p.Manifest.Required...) {
-		exmap[ex] = true
-		root, err := sm.DeduceProjectRoot(ex)
-		if err != nil {
-			// This should be very uncommon to hit, as it entails that we
-			// couldn't deduce the root for an import, but that some previous
-			// solve run WAS able to deduce the root. It's most likely to occur
-			// if the user has e.g. not connected to their organization's VPN,
-			// and thus cannot access an internal go-get metadata service.
-			return errors.Wrapf(err, "could not deduce project root for %s", ex)
-		}
-		exrmap[root] = true
-	}
-
-	// Note: these flags are only partialy used by the latter parts of the
-	// algorithm; rather, it relies on inference. However, they remain in their
-	// entirety as future needs may make further use of them, being a handy,
-	// terse way of expressing the original context of the arg inputs.
-	type addType uint8
-	const (
-		// Straightforward case - this induces a temporary require, and thus
-		// a warning message about it being ephemeral.
-		isInManifest addType = 1 << iota
-		// If solving works, we'll pull this constraint from the in-memory
-		// manifest (where we recorded it earlier) and then append it to the
-		// manifest on disk.
-		isInImportsWithConstraint
-		// If solving works, we'll extract a constraint from the lock and
-		// append it into the manifest on disk, similar to init's behavior.
-		isInImportsNoConstraint
-		// This gets a message AND a hoist from the solution up into the
-		// manifest on disk.
-		isInNeither
-	)
-
-	type addInstruction struct {
-		id         gps.ProjectIdentifier
-		ephReq     map[string]bool
-		constraint gps.Constraint
-		typ        addType
-	}
-	addInstructions := make(map[gps.ProjectRoot]addInstruction)
-
-	// A mutex for limited access to addInstructions by goroutines.
-	var mutex sync.Mutex
-
-	// Channel for receiving all the errors.
-	errCh := make(chan error, len(args))
-
-	var wg sync.WaitGroup
-
-	ctx.Out.Println("Fetching sources...")
-
-	for i, arg := range args {
-		wg.Add(1)
-
-		if ctx.Verbose {
-			ctx.Err.Printf("(%d/%d) %s\n", i+1, len(args), arg)
-		}
-
-		go func(arg string) {
-			defer wg.Done()
-
-			pc, path, err := getProjectConstraint(arg, sm)
-			if err != nil {
-				// TODO(sdboyer) ensure these errors are contextualized in a sensible way for -add
-				errCh <- err
-				return
-			}
-
-			// check if the the parsed path is the current root path
-			if strings.EqualFold(string(p.ImportRoot), string(pc.Ident.ProjectRoot)) {
-				errCh <- errors.New("cannot add current project to itself")
-				return
-			}
-
-			inManifest := p.Manifest.HasConstraintsOn(pc.Ident.ProjectRoot)
-			inImports := exrmap[pc.Ident.ProjectRoot]
-			if inManifest && inImports {
-				errCh <- errors.Errorf("nothing to -add, %s is already in %s and the project's direct imports or required list", pc.Ident.ProjectRoot, dep.ManifestName)
-				return
-			}
-
-			err = sm.SyncSourceFor(pc.Ident)
-			if err != nil {
-				errCh <- errors.Wrapf(err, "failed to fetch source for %s", pc.Ident.ProjectRoot)
-				return
-			}
-
-			someConstraint := !gps.IsAny(pc.Constraint) || pc.Ident.Source != ""
-
-			// Obtain a lock for addInstructions
-			mutex.Lock()
-			defer mutex.Unlock()
-			instr, has := addInstructions[pc.Ident.ProjectRoot]
-			if has {
-				// Multiple packages from the same project were specified as
-				// arguments; make sure they agree on declared constraints.
-				// TODO(sdboyer) until we have a general method for checking constraint equality, only allow one to declare
-				if someConstraint {
-					if !gps.IsAny(instr.constraint) || instr.id.Source != "" {
-						errCh <- errors.Errorf("can only specify rules once per project being added; rules were given at least twice for %s", pc.Ident.ProjectRoot)
-						return
-					}
-					instr.constraint = pc.Constraint
-					instr.id = pc.Ident
-				}
-			} else {
-				instr.ephReq = make(map[string]bool)
-				instr.constraint = pc.Constraint
-				instr.id = pc.Ident
-			}
-
-			if inManifest {
-				if someConstraint {
-					errCh <- errors.Errorf("%s already contains rules for %s, cannot specify a version constraint or alternate source", dep.ManifestName, path)
-					return
-				}
-
-				instr.ephReq[path] = true
-				instr.typ |= isInManifest
-			} else if inImports {
-				if !someConstraint {
-					if exmap[path] {
-						errCh <- errors.Errorf("%s is already imported or required, so -add is only valid with a constraint", path)
-						return
-					}
-
-					// No constraints, but the package isn't imported; require it.
-					// TODO(sdboyer) this case seems like it's getting overly specific and risks muddying the water more than it helps
-					instr.ephReq[path] = true
-					instr.typ |= isInImportsNoConstraint
-				} else {
-					// Don't require on this branch if the path was a ProjectRoot;
-					// most common here will be the user adding constraints to
-					// something they already imported, and if they specify the
-					// root, there's a good chance they don't actually want to
-					// require the project's root package, but are just trying to
-					// indicate which project should receive the constraints.
-					if !exmap[path] && string(pc.Ident.ProjectRoot) != path {
-						instr.ephReq[path] = true
-					}
-					instr.typ |= isInImportsWithConstraint
-				}
-			} else {
-				instr.typ |= isInNeither
-				instr.ephReq[path] = true
-			}
-
-			addInstructions[pc.Ident.ProjectRoot] = instr
-		}(arg)
-	}
-
-	wg.Wait()
-	close(errCh)
-
-	// Newline after printing the fetching source output.
-	ctx.Err.Println()
-
-	// Log all the errors.
-	if len(errCh) > 0 {
-		ctx.Err.Printf("Failed to add the dependencies:\n\n")
-		for err := range errCh {
-			ctx.Err.Println("  ✗", err.Error())
-		}
-		ctx.Err.Println()
-		return errAddDepsFailed
-	}
-
-	// We're now sure all of our add instructions are individually and mutually
-	// valid, so it's safe to begin modifying the input parameters.
-	for pr, instr := range addInstructions {
-		// The arg processing logic above only adds to the ephReq list if
-		// that package definitely needs to be on that list, so we don't
-		// need to check instr.typ here - if it's in instr.ephReq, it
-		// definitely needs to be added to the manifest's required list.
-		for path := range instr.ephReq {
-			p.Manifest.Required = append(p.Manifest.Required, path)
-		}
-
-		// Only two branches can possibly be adding rules, though the
-		// isInNeither case may or may not have an empty constraint.
-		if instr.typ&(isInNeither|isInImportsWithConstraint) != 0 {
-			p.Manifest.Constraints[pr] = gps.ProjectProperties{
-				Source:     instr.id.Source,
-				Constraint: instr.constraint,
-			}
-		}
-	}
-
-	// Re-prepare a solver now that our params are complete.
-	solver, err = gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "fastpath solver prepare")
-	}
-	solution, err := solver.Solve()
-	if err != nil {
-		// TODO(sdboyer) detect if the failure was specifically about some of the -add arguments
-		handleAllTheFailuresOfTheWorld(err)
-		return errors.Wrap(err, "ensure Solve()")
-	}
-
-	// Prep post-actions and feedback from adds.
-	var reqlist []string
-	appender := dep.NewManifest()
-
-	for pr, instr := range addInstructions {
-		for path := range instr.ephReq {
-			reqlist = append(reqlist, path)
-		}
-
-		if instr.typ&isInManifest == 0 {
-			var pp gps.ProjectProperties
-			var found bool
-			for _, proj := range solution.Projects() {
-				// We compare just ProjectRoot instead of the whole
-				// ProjectIdentifier here because an empty source on the input side
-				// could have been converted into a source by the solver.
-				if proj.Ident().ProjectRoot == pr {
-					found = true
-					pp = getProjectPropertiesFromVersion(proj.Version())
-					break
-				}
-			}
-			if !found {
-				panic(fmt.Sprintf("unreachable: solution did not contain -add argument %s, but solver did not fail", pr))
-			}
-			pp.Source = instr.id.Source
-
-			if !gps.IsAny(instr.constraint) {
-				pp.Constraint = instr.constraint
-			}
-			appender.Constraints[pr] = pp
-		}
-	}
-
-	extra, err := appender.MarshalTOML()
-	if err != nil {
-		return errors.Wrap(err, "could not marshal manifest into TOML")
-	}
-	sort.Strings(reqlist)
-
-	sw, err := dep.NewSafeWriter(nil, p.Lock, dep.LockFromSolution(solution), dep.VendorOnChanged)
-	if err != nil {
-		return err
-	}
-
-	if cmd.dryRun {
-		return sw.PrintPreparedActions(ctx.Out, ctx.Verbose)
-	}
-
-	logger := ctx.Err
-	if !ctx.Verbose {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-	if err := errors.Wrap(sw.Write(p.AbsRoot, sm, true, logger), "grouped write of manifest, lock and vendor"); err != nil {
-		return err
-	}
-
-	// FIXME(sdboyer) manifest writes ABSOLUTELY need verification - follow up!
-	f, err := os.OpenFile(filepath.Join(p.AbsRoot, dep.ManifestName), os.O_APPEND|os.O_WRONLY, 0666)
-	if err != nil {
-		return errors.Wrapf(err, "opening %s failed", dep.ManifestName)
-	}
-
-	if _, err := f.Write(extra); err != nil {
-		f.Close()
-		return errors.Wrapf(err, "writing to %s failed", dep.ManifestName)
-	}
-
-	switch len(reqlist) {
-	case 0:
-		// nothing to tell the user
-	case 1:
-		if cmd.noVendor {
-			ctx.Out.Printf("%q is not imported by your project, and has been temporarily added to %s.\n", reqlist[0], dep.LockName)
-			ctx.Out.Printf("If you run \"dep ensure\" again before actually importing it, it will disappear from %s. Running \"dep ensure -vendor-only\" is safe, and will guarantee it is present in vendor/.", dep.LockName)
-		} else {
-			ctx.Out.Printf("%q is not imported by your project, and has been temporarily added to %s and vendor/.\n", reqlist[0], dep.LockName)
-			ctx.Out.Printf("If you run \"dep ensure\" again before actually importing it, it will disappear from %s and vendor/.", dep.LockName)
-		}
-	default:
-		if cmd.noVendor {
-			ctx.Out.Printf("The following packages are not imported by your project, and have been temporarily added to %s:\n", dep.LockName)
-			ctx.Out.Printf("\t%s\n", strings.Join(reqlist, "\n\t"))
-			ctx.Out.Printf("If you run \"dep ensure\" again before actually importing them, they will disappear from %s. Running \"dep ensure -vendor-only\" is safe, and will guarantee they are present in vendor/.", dep.LockName)
-		} else {
-			ctx.Out.Printf("The following packages are not imported by your project, and have been temporarily added to %s and vendor/:\n", dep.LockName)
-			ctx.Out.Printf("\t%s\n", strings.Join(reqlist, "\n\t"))
-			ctx.Out.Printf("If you run \"dep ensure\" again before actually importing them, they will disappear from %s and vendor/.", dep.LockName)
-		}
-	}
-
-	return errors.Wrapf(f.Close(), "closing %s", dep.ManifestName)
-}
-
-func getProjectConstraint(arg string, sm gps.SourceManager) (gps.ProjectConstraint, string, error) {
-	emptyPC := gps.ProjectConstraint{
-		Constraint: gps.Any(), // default to any; avoids panics later
-	}
-
-	// try to split on '@'
-	// When there is no `@`, use any version
-	var versionStr string
-	atIndex := strings.Index(arg, "@")
-	if atIndex > 0 {
-		parts := strings.SplitN(arg, "@", 2)
-		arg = parts[0]
-		versionStr = parts[1]
-	}
-
-	// TODO: if we decide to keep equals.....
-
-	// split on colon if there is a network location
-	var source string
-	colonIndex := strings.Index(arg, ":")
-	if colonIndex > 0 {
-		parts := strings.SplitN(arg, ":", 2)
-		arg = parts[0]
-		source = parts[1]
-	}
-
-	pr, err := sm.DeduceProjectRoot(arg)
-	if err != nil {
-		return emptyPC, "", errors.Wrapf(err, "could not infer project root from dependency path: %s", arg) // this should go through to the user
-	}
-
-	pi := gps.ProjectIdentifier{ProjectRoot: pr, Source: source}
-	c, err := sm.InferConstraint(versionStr, pi)
-	if err != nil {
-		return emptyPC, "", err
-	}
-	return gps.ProjectConstraint{Ident: pi, Constraint: c}, arg, nil
-}
-
-func checkErrors(m map[string]pkgtree.PackageOrErr, ignore *pkgtree.IgnoredRuleset) (fatal bool, err error) {
-	var (
-		noGoErrors    int
-		pkgtreeErrors = make(pkgtreeErrs, 0, len(m))
-	)
-
-	for ip, poe := range m {
-		if ignore.IsIgnored(ip) {
-			continue
-		}
-
-		if poe.Err != nil {
-			switch poe.Err.(type) {
-			case *build.NoGoError:
-				noGoErrors++
-			default:
-				pkgtreeErrors = append(pkgtreeErrors, poe.Err)
-			}
-		}
-	}
-
-	// If pkgtree was empty or all dirs lacked any Go code, return an error.
-	if len(m) == 0 || len(m) == noGoErrors {
-		return true, errors.New("no dirs contained any Go code")
-	}
-
-	// If all dirs contained build errors, return an error.
-	if len(m) == len(pkgtreeErrors) {
-		return true, errors.New("all dirs contained build errors")
-	}
-
-	// If all directories either had no Go files or caused a build error, return an error.
-	if len(m) == len(pkgtreeErrors)+noGoErrors {
-		return true, pkgtreeErrors
-	}
-
-	// If m contained some errors, return a warning with those errors.
-	if len(pkgtreeErrors) > 0 {
-		return false, pkgtreeErrors
-	}
-
-	return false, nil
-}
-
-type pkgtreeErrs []error
-
-func (e pkgtreeErrs) Error() string {
-	errs := make([]string, 0, len(e))
-
-	for _, err := range e {
-		errs = append(errs, err.Error())
-	}
-
-	return fmt.Sprintf("found %d errors in the package tree:\n%s", len(e), strings.Join(errs, "\n"))
-}
-
-func validateUpdateArgs(ctx *dep.Ctx, args []string, p *dep.Project, sm gps.SourceManager, params *gps.SolveParameters) error {
-	// Channel for receiving all the valid arguments.
-	argsCh := make(chan string, len(args))
-
-	// Channel for receiving all the validation errors.
-	errCh := make(chan error, len(args))
-
-	var wg sync.WaitGroup
-
-	// Allow any of specified project versions to change, regardless of the lock
-	// file.
-	for _, arg := range args {
-		wg.Add(1)
-
-		go func(arg string) {
-			defer wg.Done()
-
-			// Ensure the provided path has a deducible project root.
-			pc, path, err := getProjectConstraint(arg, sm)
-			if err != nil {
-				// TODO(sdboyer) ensure these errors are contextualized in a sensible way for -update
-				errCh <- err
-				return
-			}
-			if path != string(pc.Ident.ProjectRoot) {
-				// TODO(sdboyer): does this really merit an abortive error?
-				errCh <- errors.Errorf("%s is not a project root, try %s instead", path, pc.Ident.ProjectRoot)
-				return
-			}
-
-			if !p.Lock.HasProjectWithRoot(pc.Ident.ProjectRoot) {
-				errCh <- errors.Errorf("%s is not present in %s, cannot -update it", pc.Ident.ProjectRoot, dep.LockName)
-				return
-			}
-
-			if pc.Ident.Source != "" {
-				errCh <- errors.Errorf("cannot specify alternate sources on -update (%s)", pc.Ident.Source)
-				return
-			}
-
-			if !gps.IsAny(pc.Constraint) {
-				// TODO(sdboyer) constraints should be allowed to allow solves that
-				// target particular versions while remaining within declared constraints.
-				errCh <- errors.Errorf("version constraint %s passed for %s, but -update follows constraints declared in %s, not CLI arguments", pc.Constraint, pc.Ident.ProjectRoot, dep.ManifestName)
-				return
-			}
-
-			// Valid argument.
-			argsCh <- arg
-		}(arg)
-	}
-
-	wg.Wait()
-	close(errCh)
-	close(argsCh)
-
-	// Log all the errors.
-	if len(errCh) > 0 {
-		ctx.Err.Printf("Invalid arguments passed to ensure -update:\n\n")
-		for err := range errCh {
-			ctx.Err.Println("  ✗", err.Error())
-		}
-		ctx.Err.Println()
-		return errUpdateArgsValidation
-	}
-
-	// Add all the valid arguments to solve params.
-	for arg := range argsCh {
-		params.ToChange = append(params.ToChange, gps.ProjectRoot(arg))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/ensure_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/ensure_test.go
deleted file mode 100644
index e8cf300e87..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/ensure_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"errors"
-	"go/build"
-	"io/ioutil"
-	"log"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestInvalidEnsureFlagCombinations(t *testing.T) {
-	ec := &ensureCommand{
-		update: true,
-		add:    true,
-	}
-
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-add and -update together should fail validation")
-	}
-
-	ec.vendorOnly, ec.add = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -update should fail validation")
-	}
-
-	ec.add, ec.update = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -add should fail validation")
-	}
-
-	ec.noVendor, ec.add = true, false
-	if err := ec.validateFlags(); err == nil {
-		t.Error("-vendor-only with -no-vendor should fail validation")
-	}
-	ec.noVendor = false
-
-	// Also verify that the plain ensure path takes no args. This is a shady
-	// test, as lots of other things COULD return errors, and we don't check
-	// anything other than the error being non-nil. For now, it works well
-	// because a panic will quickly result if the initial arg length validation
-	// checks are incorrectly handled.
-	if err := ec.runDefault(nil, []string{"foo"}, nil, nil, gps.SolveParameters{}); err == nil {
-		t.Errorf("no args to plain ensure with -vendor-only")
-	}
-	ec.vendorOnly = false
-	if err := ec.runDefault(nil, []string{"foo"}, nil, nil, gps.SolveParameters{}); err == nil {
-		t.Errorf("no args to plain ensure")
-	}
-}
-
-func TestCheckErrors(t *testing.T) {
-	tt := []struct {
-		name        string
-		fatal       bool
-		pkgOrErrMap map[string]pkgtree.PackageOrErr
-	}{
-		{
-			name:  "noErrors",
-			fatal: false,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"mypkg": {
-					P: pkgtree.Package{},
-				},
-			},
-		},
-		{
-			name:  "hasErrors",
-			fatal: true,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"github.com/me/pkg": {
-					Err: &build.NoGoError{},
-				},
-				"github.com/someone/pkg": {
-					Err: errors.New("code is busted"),
-				},
-			},
-		},
-		{
-			name:  "onlyGoErrors",
-			fatal: false,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"github.com/me/pkg": {
-					Err: &build.NoGoError{},
-				},
-				"github.com/someone/pkg": {
-					P: pkgtree.Package{},
-				},
-			},
-		},
-		{
-			name:  "onlyBuildErrors",
-			fatal: false,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"github.com/me/pkg": {
-					Err: &build.NoGoError{},
-				},
-				"github.com/someone/pkg": {
-					P: pkgtree.Package{},
-				},
-			},
-		},
-		{
-			name:  "allGoErrors",
-			fatal: true,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"github.com/me/pkg": {
-					Err: &build.NoGoError{},
-				},
-			},
-		},
-		{
-			name:  "allMixedErrors",
-			fatal: true,
-			pkgOrErrMap: map[string]pkgtree.PackageOrErr{
-				"github.com/me/pkg": {
-					Err: &build.NoGoError{},
-				},
-				"github.com/someone/pkg": {
-					Err: errors.New("code is busted"),
-				},
-			},
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			fatal, err := checkErrors(tc.pkgOrErrMap, nil)
-			if tc.fatal != fatal {
-				t.Fatalf("expected fatal flag to be %T, got %T", tc.fatal, fatal)
-			}
-			if err == nil && fatal {
-				t.Fatal("unexpected fatal flag value while err is nil")
-			}
-		})
-	}
-}
-
-func TestValidateUpdateArgs(t *testing.T) {
-	cases := []struct {
-		name           string
-		args           []string
-		wantError      error
-		wantWarn       []string
-		lockedProjects []string
-	}{
-		{
-			name:      "empty args",
-			args:      []string{},
-			wantError: nil,
-		},
-		{
-			name:      "not project root",
-			args:      []string{"github.com/golang/dep/cmd"},
-			wantError: errUpdateArgsValidation,
-			wantWarn: []string{
-				"github.com/golang/dep/cmd is not a project root, try github.com/golang/dep instead",
-			},
-		},
-		{
-			name:      "not present in lock",
-			args:      []string{"github.com/golang/dep"},
-			wantError: errUpdateArgsValidation,
-			wantWarn: []string{
-				"github.com/golang/dep is not present in Gopkg.lock, cannot -update it",
-			},
-		},
-		{
-			name:      "cannot specify alternate sources",
-			args:      []string{"github.com/golang/dep:github.com/example/dep"},
-			wantError: errUpdateArgsValidation,
-			wantWarn: []string{
-				"cannot specify alternate sources on -update (github.com/example/dep)",
-			},
-			lockedProjects: []string{"github.com/golang/dep"},
-		},
-		{
-			name:      "version constraint passed",
-			args:      []string{"github.com/golang/dep@master"},
-			wantError: errUpdateArgsValidation,
-			wantWarn: []string{
-				"version constraint master passed for github.com/golang/dep, but -update follows constraints declared in Gopkg.toml, not CLI arguments",
-			},
-			lockedProjects: []string{"github.com/golang/dep"},
-		},
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	pwd := h.Path(".")
-
-	stderrOutput := &bytes.Buffer{}
-	errLogger := log.New(stderrOutput, "", 0)
-	ctx := &dep.Ctx{
-		GOPATH: pwd,
-		Out:    log.New(ioutil.Discard, "", 0),
-		Err:    errLogger,
-	}
-
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	p := new(dep.Project)
-	params := p.MakeParams()
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			// Empty the buffer for every case
-			stderrOutput.Reset()
-
-			// Fill up the locked projects
-			lockedProjects := []gps.LockedProject{}
-			for _, lp := range c.lockedProjects {
-				pi := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot(lp)}
-				lockedProjects = append(lockedProjects, gps.NewLockedProject(pi, gps.NewVersion("v1.0.0"), []string{}))
-			}
-
-			// Add lock to project
-			p.Lock = &dep.Lock{P: lockedProjects}
-
-			err := validateUpdateArgs(ctx, c.args, p, sm, &params)
-			if err != c.wantError {
-				t.Fatalf("Unexpected error while validating update args:\n\t(GOT): %v\n\t(WNT): %v", err, c.wantError)
-			}
-
-			warnings := stderrOutput.String()
-			for _, warn := range c.wantWarn {
-				if !strings.Contains(warnings, warn) {
-					t.Fatalf("Expected validateUpdateArgs errors to contain: %q", warn)
-				}
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner.go b/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner.go
deleted file mode 100644
index 77d14a0cd2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner.go
+++ /dev/null
@@ -1,386 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/golang/dep"
-	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-// gopathScanner supplies manifest/lock data by scanning the contents of GOPATH
-// It uses its results to fill-in any missing details left by the rootAnalyzer.
-type gopathScanner struct {
-	ctx        *dep.Ctx
-	directDeps map[string]bool
-	sm         gps.SourceManager
-
-	pd    projectData
-	origM *dep.Manifest
-	origL *dep.Lock
-}
-
-func newGopathScanner(ctx *dep.Ctx, directDeps map[string]bool, sm gps.SourceManager) *gopathScanner {
-	return &gopathScanner{
-		ctx:        ctx,
-		directDeps: directDeps,
-		sm:         sm,
-	}
-}
-
-// InitializeRootManifestAndLock performs analysis of the filesystem tree rooted
-// at path, with the root import path importRoot, to determine the project's
-// constraints. Respect any initial constraints defined in the root manifest and
-// lock.
-func (g *gopathScanner) InitializeRootManifestAndLock(rootM *dep.Manifest, rootL *dep.Lock) error {
-	var err error
-
-	g.ctx.Err.Println("Searching GOPATH for projects...")
-	g.pd, err = g.scanGopathForDependencies()
-	if err != nil {
-		return err
-	}
-
-	g.origM = dep.NewManifest()
-	g.origM.Constraints = g.pd.constraints
-
-	g.origL = &dep.Lock{
-		P: make([]gps.LockedProject, 0, len(g.pd.ondisk)),
-	}
-
-	for pr, v := range g.pd.ondisk {
-		// That we have to chop off these path prefixes is a symptom of
-		// a problem in gps itself
-		pkgs := make([]string, 0, len(g.pd.dependencies[pr]))
-		prslash := string(pr) + "/"
-		for _, pkg := range g.pd.dependencies[pr] {
-			if pkg == string(pr) {
-				pkgs = append(pkgs, ".")
-			} else {
-				pkgs = append(pkgs, trimPathPrefix(pkg, prslash))
-			}
-		}
-
-		g.origL.P = append(g.origL.P, gps.NewLockedProject(
-			gps.ProjectIdentifier{ProjectRoot: pr}, v, pkgs),
-		)
-	}
-
-	g.overlay(rootM, rootL)
-
-	return nil
-}
-
-// Fill in gaps in the root manifest/lock with data found from the GOPATH.
-func (g *gopathScanner) overlay(rootM *dep.Manifest, rootL *dep.Lock) {
-	for pkg, prj := range g.origM.Constraints {
-		if _, has := rootM.Constraints[pkg]; has {
-			continue
-		}
-		rootM.Constraints[pkg] = prj
-		v := g.pd.ondisk[pkg]
-
-		pi := gps.ProjectIdentifier{ProjectRoot: pkg, Source: prj.Source}
-		f := fb.NewConstraintFeedback(gps.ProjectConstraint{Ident: pi, Constraint: v}, fb.DepTypeDirect)
-		f.LogFeedback(g.ctx.Err)
-		f = fb.NewLockedProjectFeedback(gps.NewLockedProject(pi, v, nil), fb.DepTypeDirect)
-		f.LogFeedback(g.ctx.Err)
-	}
-
-	// Keep track of which projects have been locked
-	lockedProjects := map[gps.ProjectRoot]bool{}
-	for _, lp := range rootL.P {
-		lockedProjects[lp.Ident().ProjectRoot] = true
-	}
-
-	for _, lp := range g.origL.P {
-		pkg := lp.Ident().ProjectRoot
-		if _, isLocked := lockedProjects[pkg]; isLocked {
-			continue
-		}
-		rootL.P = append(rootL.P, lp)
-		lockedProjects[pkg] = true
-
-		if _, isDirect := g.directDeps[string(pkg)]; !isDirect {
-			f := fb.NewLockedProjectFeedback(lp, fb.DepTypeTransitive)
-			f.LogFeedback(g.ctx.Err)
-		}
-	}
-
-	// Identify projects whose version is unknown and will have to be solved for
-	var unlockedProjects []string
-	for pr := range g.pd.notondisk {
-		if _, isLocked := lockedProjects[pr]; isLocked {
-			continue
-		}
-		unlockedProjects = append(unlockedProjects, string(pr))
-	}
-	if len(unlockedProjects) > 0 {
-		g.ctx.Err.Printf("Following dependencies were not found in GOPATH. "+
-			"Dep will use the most recent versions of these projects.\n  %s",
-			strings.Join(unlockedProjects, "\n  "))
-	}
-}
-
-func trimPathPrefix(p1, p2 string) string {
-	if isPrefix, _ := fs.HasFilepathPrefix(p1, p2); isPrefix {
-		return p1[len(p2):]
-	}
-	return p1
-}
-
-// contains checks if a array of strings contains a value
-func contains(a []string, b string) bool {
-	for _, v := range a {
-		if b == v {
-			return true
-		}
-	}
-	return false
-}
-
-// getProjectPropertiesFromVersion takes a Version and returns a proper
-// ProjectProperties with Constraint value based on the provided version.
-func getProjectPropertiesFromVersion(v gps.Version) gps.ProjectProperties {
-	pp := gps.ProjectProperties{}
-
-	// extract version and ignore if it's revision only
-	switch tv := v.(type) {
-	case gps.PairedVersion:
-		v = tv.Unpair()
-	case gps.Revision:
-		return pp
-	}
-
-	switch v.Type() {
-	case gps.IsBranch, gps.IsVersion:
-		pp.Constraint = v
-	case gps.IsSemver:
-		c, err := gps.NewSemverConstraintIC(v.String())
-		if err != nil {
-			panic(err)
-		}
-		pp.Constraint = c
-	}
-
-	return pp
-}
-
-type projectData struct {
-	constraints  gps.ProjectConstraints          // constraints that could be found
-	dependencies map[gps.ProjectRoot][]string    // all dependencies (imports) found by project root
-	notondisk    map[gps.ProjectRoot]bool        // projects that were not found on disk
-	ondisk       map[gps.ProjectRoot]gps.Version // projects that were found on disk
-}
-
-func (g *gopathScanner) scanGopathForDependencies() (projectData, error) {
-	constraints := make(gps.ProjectConstraints)
-	dependencies := make(map[gps.ProjectRoot][]string)
-	packages := make(map[string]bool)
-	notondisk := make(map[gps.ProjectRoot]bool)
-	ondisk := make(map[gps.ProjectRoot]gps.Version)
-
-	var syncDepGroup sync.WaitGroup
-	syncDep := func(pr gps.ProjectRoot, sm gps.SourceManager) {
-		if err := sm.SyncSourceFor(gps.ProjectIdentifier{ProjectRoot: pr}); err != nil {
-			g.ctx.Err.Printf("%+v", errors.Wrapf(err, "Unable to cache %s", pr))
-		}
-		syncDepGroup.Done()
-	}
-
-	if len(g.directDeps) == 0 {
-		return projectData{}, nil
-	}
-
-	for ip := range g.directDeps {
-		pr, err := g.sm.DeduceProjectRoot(ip)
-		if err != nil {
-			return projectData{}, errors.Wrap(err, "sm.DeduceProjectRoot")
-		}
-
-		packages[ip] = true
-		if _, has := dependencies[pr]; has {
-			dependencies[pr] = append(dependencies[pr], ip)
-			continue
-		}
-		syncDepGroup.Add(1)
-		go syncDep(pr, g.sm)
-
-		dependencies[pr] = []string{ip}
-		abs, err := g.ctx.AbsForImport(string(pr))
-		if err != nil {
-			notondisk[pr] = true
-			continue
-		}
-		v, err := gps.VCSVersion(abs)
-		if err != nil {
-			notondisk[pr] = true
-			continue
-		}
-
-		ondisk[pr] = v
-		pp := getProjectPropertiesFromVersion(v)
-		if pp.Constraint != nil || pp.Source != "" {
-			constraints[pr] = pp
-		}
-	}
-
-	// Explore the packages we've found for transitive deps, either
-	// completing the lock or identifying (more) missing projects that we'll
-	// need to ask gps to solve for us.
-	colors := make(map[string]uint8)
-	const (
-		white uint8 = iota
-		grey
-		black
-	)
-
-	// cache of PackageTrees, so we don't parse projects more than once
-	ptrees := make(map[gps.ProjectRoot]pkgtree.PackageTree)
-
-	// depth-first traverser
-	var dft func(string) error
-	dft = func(pkg string) error {
-		switch colors[pkg] {
-		case white:
-			colors[pkg] = grey
-
-			pr, err := g.sm.DeduceProjectRoot(pkg)
-			if err != nil {
-				return errors.Wrap(err, "could not deduce project root for "+pkg)
-			}
-
-			// We already visited this project root earlier via some other
-			// pkg within it, and made the decision that it's not on disk.
-			// Respect that decision, and pop the stack.
-			if notondisk[pr] {
-				colors[pkg] = black
-				return nil
-			}
-
-			ptree, has := ptrees[pr]
-			if !has {
-				// It's fine if the root does not exist - it indicates that this
-				// project is not present in the workspace, and so we need to
-				// solve to deal with this dep.
-				r := filepath.Join(g.ctx.GOPATH, "src", string(pr))
-				fi, err := os.Stat(r)
-				if os.IsNotExist(err) || !fi.IsDir() {
-					colors[pkg] = black
-					notondisk[pr] = true
-					return nil
-				}
-
-				// We know the project is on disk; the question is whether we're
-				// first seeing it here, in the transitive exploration, or if it
-				// was found in the initial pass on direct imports. We know it's
-				// the former if there's no entry for it in the ondisk map.
-				if _, in := ondisk[pr]; !in {
-					abs, err := g.ctx.AbsForImport(string(pr))
-					if err != nil {
-						colors[pkg] = black
-						notondisk[pr] = true
-						return nil
-					}
-					v, err := gps.VCSVersion(abs)
-					if err != nil {
-						// Even if we know it's on disk, errors are still
-						// possible when trying to deduce version. If we
-						// encounter such an error, just treat the project as
-						// not being on disk; the solver will work it out.
-						colors[pkg] = black
-						notondisk[pr] = true
-						return nil
-					}
-					ondisk[pr] = v
-				}
-
-				ptree, err = pkgtree.ListPackages(r, string(pr))
-				if err != nil {
-					// Any error here other than an a nonexistent dir (which
-					// can't happen because we covered that case above) is
-					// probably critical, so bail out.
-					return errors.Wrap(err, "gps.ListPackages")
-				}
-				ptrees[pr] = ptree
-			}
-
-			// Get a reachmap that includes main pkgs (even though importing
-			// them is an error, what we're checking right now is simply whether
-			// there's a package with go code present on disk), and does not
-			// backpropagate errors (again, because our only concern right now
-			// is package existence).
-			rm, errmap := ptree.ToReachMap(true, false, false, nil)
-			reached, ok := rm[pkg]
-			if !ok {
-				colors[pkg] = black
-				// not on disk...
-				notondisk[pr] = true
-				return nil
-			}
-			if _, ok := errmap[pkg]; ok {
-				// The package is on disk, but contains some errors.
-				colors[pkg] = black
-				return nil
-			}
-
-			if deps, has := dependencies[pr]; has {
-				if !contains(deps, pkg) {
-					dependencies[pr] = append(deps, pkg)
-				}
-			} else {
-				dependencies[pr] = []string{pkg}
-				syncDepGroup.Add(1)
-				go syncDep(pr, g.sm)
-			}
-
-			// recurse
-			for _, rpkg := range reached.External {
-				if paths.IsStandardImportPath(rpkg) {
-					continue
-				}
-
-				err := dft(rpkg)
-				if err != nil {
-					// Bubble up any errors we encounter
-					return err
-				}
-			}
-
-			colors[pkg] = black
-		case grey:
-			return errors.Errorf("Import cycle detected on %s", pkg)
-		}
-		return nil
-	}
-
-	// run the depth-first traversal from the set of immediate external
-	// package imports we found in the current project
-	for pkg := range packages {
-		err := dft(pkg)
-		if err != nil {
-			return projectData{}, err // already errors.Wrap()'d internally
-		}
-	}
-
-	syncDepGroup.Wait()
-
-	pd := projectData{
-		constraints:  constraints,
-		dependencies: dependencies,
-		notondisk:    notondisk,
-		ondisk:       ondisk,
-	}
-	return pd, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner_test.go
deleted file mode 100644
index 142504ab4a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/gopath_scanner_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"io/ioutil"
-	"log"
-	"reflect"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-)
-
-const testProject1 string = "github.com/sdboyer/deptest"
-const testProject2 string = "github.com/sdboyer/deptestdos"
-
-// NewTestContext creates a unique context with its own GOPATH for a single test.
-func NewTestContext(h *test.Helper) *dep.Ctx {
-	h.TempDir("src")
-	pwd := h.Path(".")
-	discardLogger := log.New(ioutil.Discard, "", 0)
-
-	return &dep.Ctx{
-		GOPATH: pwd,
-		Out:    discardLogger,
-		Err:    discardLogger,
-	}
-}
-
-func TestGopathScanner_OverlayManifestConstraints(t *testing.T) {
-	h := test.NewHelper(t)
-	h.Parallel()
-	defer h.Cleanup()
-
-	ctx := NewTestContext(h)
-
-	pi1 := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot(testProject1)}
-	pi2 := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot(testProject2)}
-	v1 := gps.NewVersion("v1.0.0")
-	v2 := gps.NewVersion("v2.0.0")
-	v3 := gps.NewVersion("v3.0.0")
-	rootM := dep.NewManifest()
-	rootM.Constraints[pi1.ProjectRoot] = gps.ProjectProperties{Constraint: v1}
-	rootL := &dep.Lock{}
-	origM := dep.NewManifest()
-	origM.Constraints[pi1.ProjectRoot] = gps.ProjectProperties{Constraint: v2}
-	origM.Constraints[pi2.ProjectRoot] = gps.ProjectProperties{Constraint: v3}
-	gs := gopathScanner{
-		origM: origM,
-		origL: &dep.Lock{},
-		ctx:   ctx,
-		pd: projectData{
-			ondisk: map[gps.ProjectRoot]gps.Version{
-				pi1.ProjectRoot: v2,
-				pi2.ProjectRoot: v3,
-			},
-		},
-	}
-
-	gs.overlay(rootM, rootL)
-
-	dep, has := rootM.Constraints[pi1.ProjectRoot]
-	if !has {
-		t.Fatalf("Expected the root manifest to contain %s", pi1.ProjectRoot)
-	}
-	wantC := v1.String()
-	gotC := dep.Constraint.String()
-	if wantC != gotC {
-		t.Fatalf("Expected %s to be constrained to '%s', got '%s'", pi1.ProjectRoot, wantC, gotC)
-	}
-
-	dep, has = rootM.Constraints[pi2.ProjectRoot]
-	if !has {
-		t.Fatalf("Expected the root manifest to contain %s", pi2.ProjectRoot)
-	}
-	wantC = v3.String()
-	gotC = dep.Constraint.String()
-	if wantC != gotC {
-		t.Fatalf("Expected %s to be constrained to '%s', got '%s'", pi2.ProjectRoot, wantC, gotC)
-	}
-}
-
-func TestGopathScanner_OverlayLockProjects(t *testing.T) {
-	h := test.NewHelper(t)
-	h.Parallel()
-	defer h.Cleanup()
-
-	ctx := NewTestContext(h)
-
-	rootM := dep.NewManifest()
-	pi1 := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot(testProject1)}
-	pi2 := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot(testProject2)}
-	v1 := gps.NewVersion("v1.0.0")
-	v2 := gps.NewVersion("v2.0.0")
-	v3 := gps.NewVersion("v3.0.0")
-	rootL := &dep.Lock{
-		P: []gps.LockedProject{gps.NewLockedProject(pi1, v1, []string{})},
-	}
-	gs := gopathScanner{
-		origM: dep.NewManifest(),
-		origL: &dep.Lock{
-			P: []gps.LockedProject{
-				gps.NewLockedProject(pi1, v2, []string{}), // ignored, already exists in lock
-				gps.NewLockedProject(pi2, v3, []string{}), // should be added to the lock
-			},
-		},
-		ctx: ctx,
-		pd: projectData{
-			ondisk: map[gps.ProjectRoot]gps.Version{
-				pi1.ProjectRoot: v2,
-				pi2.ProjectRoot: v3,
-			},
-		},
-	}
-
-	gs.overlay(rootM, rootL)
-
-	if len(rootL.P) != 2 {
-		t.Fatalf("Expected the root manifest to contain 2 packages, got %d", len(rootL.P))
-	}
-
-	if rootL.P[0].Version() != v1 {
-		t.Fatalf("Expected %s to be locked to '%s', got '%s'", rootL.P[0].Ident().ProjectRoot, v1, rootL.P[0].Version())
-	}
-
-	if rootL.P[1].Version() != v3 {
-		t.Fatalf("Expected %s to be locked to '%s', got '%s'", rootL.P[1].Ident().ProjectRoot, v3, rootL.P[1].Version())
-	}
-}
-
-func TestContains(t *testing.T) {
-	t.Parallel()
-	a := []string{"a", "b", "abcd"}
-
-	if !contains(a, "a") {
-		t.Fatal("expected array to contain 'a'")
-	}
-	if contains(a, "d") {
-		t.Fatal("expected array to not contain 'd'")
-	}
-}
-
-func TestGetProjectPropertiesFromVersion(t *testing.T) {
-	t.Parallel()
-	wantSemver, _ := gps.NewSemverConstraintIC("v1.0.0")
-	cases := []struct {
-		version, want gps.Constraint
-	}{
-		{
-			version: gps.NewBranch("foo-branch"),
-			want:    gps.NewBranch("foo-branch"),
-		},
-		{
-			version: gps.NewVersion("foo-version"),
-			want:    gps.NewVersion("foo-version"),
-		},
-		{
-			version: gps.NewVersion("v1.0.0"),
-			want:    wantSemver,
-		},
-		{
-			version: gps.NewBranch("foo-branch").Pair("some-revision"),
-			want:    gps.NewBranch("foo-branch"),
-		},
-		{
-			version: gps.NewVersion("foo-version").Pair("some-revision"),
-			want:    gps.NewVersion("foo-version"),
-		},
-		{
-			version: gps.Revision("some-revision"),
-			want:    nil,
-		},
-		{
-			version: gps.NewVersion("v1.0.0").Pair("some-revision"),
-			want:    wantSemver,
-		},
-	}
-
-	for _, c := range cases {
-		actualProp := getProjectPropertiesFromVersion(c.version.(gps.Version))
-		if !reflect.DeepEqual(c.want, actualProp.Constraint) {
-			t.Fatalf("Constraints are not as expected: \n\t(GOT) %v\n\t(WNT) %v", actualProp.Constraint, c.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/graphviz.go b/installer/vendor/github.com/golang/dep/cmd/dep/graphviz.go
deleted file mode 100644
index b422ddde7e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/graphviz.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"hash/fnv"
-	"strings"
-)
-
-type graphviz struct {
-	ps []*gvnode
-	b  bytes.Buffer
-	h  map[string]uint32
-}
-
-type gvnode struct {
-	project  string
-	version  string
-	children []string
-}
-
-func (g graphviz) New() *graphviz {
-	ga := &graphviz{
-		ps: []*gvnode{},
-		h:  make(map[string]uint32),
-	}
-	return ga
-}
-
-func (g graphviz) output() bytes.Buffer {
-	g.b.WriteString("digraph {\n\tnode [shape=box];")
-
-	for _, gvp := range g.ps {
-		// Create node string
-		g.b.WriteString(fmt.Sprintf("\n\t%d [label=\"%s\"];", gvp.hash(), gvp.label()))
-	}
-
-	// Store relations to avoid duplication
-	rels := make(map[string]bool)
-
-	// Create relations
-	for _, dp := range g.ps {
-		for _, bsc := range dp.children {
-			for pr, hsh := range g.h {
-				if isPathPrefix(bsc, pr) {
-					r := fmt.Sprintf("\n\t%d -> %d", g.h[dp.project], hsh)
-
-					if _, ex := rels[r]; !ex {
-						g.b.WriteString(r + ";")
-						rels[r] = true
-					}
-
-				}
-			}
-		}
-	}
-
-	g.b.WriteString("\n}")
-	return g.b
-}
-
-func (g *graphviz) createNode(project, version string, children []string) {
-	pr := &gvnode{
-		project:  project,
-		version:  version,
-		children: children,
-	}
-
-	g.h[pr.project] = pr.hash()
-	g.ps = append(g.ps, pr)
-}
-
-func (dp gvnode) hash() uint32 {
-	h := fnv.New32a()
-	h.Write([]byte(dp.project))
-	return h.Sum32()
-}
-
-func (dp gvnode) label() string {
-	label := []string{dp.project}
-
-	if dp.version != "" {
-		label = append(label, dp.version)
-	}
-
-	return strings.Join(label, "\\n")
-}
-
-// isPathPrefix ensures that the literal string prefix is a path tree match and
-// guards against possibilities like this:
-//
-// github.com/sdboyer/foo
-// github.com/sdboyer/foobar/baz
-//
-// Verify that prefix is path match and either the input is the same length as
-// the match (in which case we know they're equal), or that the next character
-// is a "/". (Import paths are defined to always use "/", not the OS-specific
-// path separator.)
-func isPathPrefix(path, pre string) bool {
-	pathlen, prflen := len(path), len(pre)
-	if pathlen < prflen || path[0:prflen] != pre {
-		return false
-	}
-
-	return prflen == pathlen || strings.Index(path[prflen:], "/") == 0
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/graphviz_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/graphviz_test.go
deleted file mode 100644
index a7537f0074..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/graphviz_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestEmptyProject(t *testing.T) {
-	h := test.NewHelper(t)
-	h.Parallel()
-	defer h.Cleanup()
-
-	g := new(graphviz).New()
-
-	b := g.output()
-	want := h.GetTestFileString("graphviz/empty.dot")
-
-	if b.String() != want {
-		t.Fatalf("expected '%v', got '%v'", want, b.String())
-	}
-}
-
-func TestSimpleProject(t *testing.T) {
-	h := test.NewHelper(t)
-	h.Parallel()
-	defer h.Cleanup()
-
-	g := new(graphviz).New()
-
-	g.createNode("project", "", []string{"foo", "bar"})
-	g.createNode("foo", "master", []string{"bar"})
-	g.createNode("bar", "dev", []string{})
-
-	b := g.output()
-	want := h.GetTestFileString("graphviz/case1.dot")
-	if b.String() != want {
-		t.Fatalf("expected '%v', got '%v'", want, b.String())
-	}
-}
-
-func TestNoLinks(t *testing.T) {
-	h := test.NewHelper(t)
-	h.Parallel()
-	defer h.Cleanup()
-
-	g := new(graphviz).New()
-
-	g.createNode("project", "", []string{})
-
-	b := g.output()
-	want := h.GetTestFileString("graphviz/case2.dot")
-	if b.String() != want {
-		t.Fatalf("expected '%v', got '%v'", want, b.String())
-	}
-}
-
-func TestIsPathPrefix(t *testing.T) {
-	t.Parallel()
-
-	tcs := []struct {
-		path string
-		pre  string
-		want bool
-	}{
-		{"github.com/sdboyer/foo/bar", "github.com/sdboyer/foo", true},
-		{"github.com/sdboyer/foobar", "github.com/sdboyer/foo", false},
-		{"github.com/sdboyer/bar/foo", "github.com/sdboyer/foo", false},
-		{"golang.org/sdboyer/bar/foo", "github.com/sdboyer/foo", false},
-		{"golang.org/sdboyer/FOO", "github.com/sdboyer/foo", false},
-	}
-
-	for _, tc := range tcs {
-		r := isPathPrefix(tc.path, tc.pre)
-		if tc.want != r {
-			t.Fatalf("expected '%v', got '%v'", tc.want, r)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/hash_in.go b/installer/vendor/github.com/golang/dep/cmd/dep/hash_in.go
deleted file mode 100644
index 09ffbfb368..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/hash_in.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-func (cmd *hashinCommand) Name() string      { return "hash-inputs" }
-func (cmd *hashinCommand) Args() string      { return "" }
-func (cmd *hashinCommand) ShortHelp() string { return "" }
-func (cmd *hashinCommand) LongHelp() string  { return "" }
-func (cmd *hashinCommand) Hidden() bool      { return true }
-
-func (cmd *hashinCommand) Register(fs *flag.FlagSet) {}
-
-type hashinCommand struct{}
-
-func (hashinCommand) Run(ctx *dep.Ctx, args []string) error {
-	p, err := ctx.LoadProject()
-	if err != nil {
-		return err
-	}
-
-	sm, err := ctx.SourceManager()
-	if err != nil {
-		return err
-	}
-	sm.UseDefaultSignalHandling()
-	defer sm.Release()
-
-	params := p.MakeParams()
-	params.RootPackageTree, err = pkgtree.ListPackages(p.ResolvedAbsRoot, string(p.ImportRoot))
-	if err != nil {
-		return errors.Wrap(err, "gps.ListPackages")
-	}
-
-	s, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "prepare solver")
-	}
-	ctx.Out.Println(gps.HashingInputsAsString(s))
-	return nil
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/init.go b/installer/vendor/github.com/golang/dep/cmd/dep/init.go
deleted file mode 100644
index a4f6637d55..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/init.go
+++ /dev/null
@@ -1,251 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"time"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-const initShortHelp = `Initialize a new project with manifest and lock files`
-const initLongHelp = `
-Initialize the project at filepath root by parsing its dependencies, writing
-manifest and lock files, and vendoring the dependencies. If root isn't
-specified, use the current directory.
-
-When configuration for another dependency management tool is detected, it is
-imported into the initial manifest and lock. Use the -skip-tools flag to
-disable this behavior. The following external tools are supported:
-glide, godep, vndr, govend, gb, gvt.
-
-Any dependencies that are not constrained by external configuration use the
-GOPATH analysis below.
-
-By default, the dependencies are resolved over the network. A version will be
-selected from the versions available from the upstream source per the following
-algorithm:
-
- - Tags conforming to semver (sorted by semver rules)
- - Default branch(es) (sorted lexicographically)
- - Non-semver tags (sorted lexicographically)
-
-An alternate mode can be activated by passing -gopath. In this mode, the version
-of each dependency will reflect the current state of the GOPATH. If a dependency
-doesn't exist in the GOPATH, a version will be selected based on the above
-network version selection algorithm.
-
-A Gopkg.toml file will be written with inferred version constraints for all
-direct dependencies. Gopkg.lock will be written with precise versions, and
-vendor/ will be populated with the precise versions written to Gopkg.lock.
-`
-
-func (cmd *initCommand) Name() string      { return "init" }
-func (cmd *initCommand) Args() string      { return "[root]" }
-func (cmd *initCommand) ShortHelp() string { return initShortHelp }
-func (cmd *initCommand) LongHelp() string  { return initLongHelp }
-func (cmd *initCommand) Hidden() bool      { return false }
-
-func (cmd *initCommand) Register(fs *flag.FlagSet) {
-	fs.BoolVar(&cmd.noExamples, "no-examples", false, "don't include example in Gopkg.toml")
-	fs.BoolVar(&cmd.skipTools, "skip-tools", false, "skip importing configuration from other dependency managers")
-	fs.BoolVar(&cmd.gopath, "gopath", false, "search in GOPATH for dependencies")
-}
-
-type initCommand struct {
-	noExamples bool
-	skipTools  bool
-	gopath     bool
-}
-
-func (cmd *initCommand) Run(ctx *dep.Ctx, args []string) error {
-	if len(args) > 1 {
-		return errors.Errorf("too many args (%d)", len(args))
-	}
-
-	var root string
-	if len(args) <= 0 {
-		root = ctx.WorkingDir
-	} else {
-		root = args[0]
-		if !filepath.IsAbs(args[0]) {
-			root = filepath.Join(ctx.WorkingDir, args[0])
-		}
-		if err := os.MkdirAll(root, os.FileMode(0777)); err != nil {
-			return errors.Wrapf(err, "unable to create directory %s", root)
-		}
-	}
-
-	var err error
-	p := new(dep.Project)
-	if err = p.SetRoot(root); err != nil {
-		return errors.Wrap(err, "NewProject")
-	}
-
-	ctx.GOPATH, err = ctx.DetectProjectGOPATH(p)
-	if err != nil {
-		return errors.Wrapf(err, "ctx.DetectProjectGOPATH")
-	}
-
-	mf := filepath.Join(root, dep.ManifestName)
-	lf := filepath.Join(root, dep.LockName)
-	vpath := filepath.Join(root, "vendor")
-
-	mok, err := fs.IsRegular(mf)
-	if err != nil {
-		return err
-	}
-	if mok {
-		return errors.Errorf("manifest already exists: %s", mf)
-	}
-	// Manifest file does not exist.
-
-	lok, err := fs.IsRegular(lf)
-	if err != nil {
-		return err
-	}
-	if lok {
-		return errors.Errorf("invalid state: manifest %q does not exist, but lock %q does", mf, lf)
-	}
-
-	ip, err := ctx.ImportForAbs(root)
-	if err != nil {
-		return errors.Wrap(err, "root project import")
-	}
-	p.ImportRoot = gps.ProjectRoot(ip)
-
-	sm, err := ctx.SourceManager()
-	if err != nil {
-		return errors.Wrap(err, "getSourceManager")
-	}
-	sm.UseDefaultSignalHandling()
-	defer sm.Release()
-
-	if ctx.Verbose {
-		ctx.Out.Println("Getting direct dependencies...")
-	}
-	pkgT, directDeps, err := getDirectDependencies(sm, p)
-	if err != nil {
-		return err
-	}
-	if ctx.Verbose {
-		ctx.Out.Printf("Checked %d directories for packages.\nFound %d direct dependencies.\n", len(pkgT.Packages), len(directDeps))
-	}
-
-	// Initialize with imported data, then fill in the gaps using the GOPATH
-	rootAnalyzer := newRootAnalyzer(cmd.skipTools, ctx, directDeps, sm)
-	p.Manifest, p.Lock, err = rootAnalyzer.InitializeRootManifestAndLock(root, p.ImportRoot)
-	if err != nil {
-		return err
-	}
-
-	if cmd.gopath {
-		gs := newGopathScanner(ctx, directDeps, sm)
-		err = gs.InitializeRootManifestAndLock(p.Manifest, p.Lock)
-		if err != nil {
-			return err
-		}
-	}
-
-	rootAnalyzer.skipTools = true // Don't import external config during solve for now
-	copyLock := *p.Lock           // Copy lock before solving. Use this to separate new lock projects from solved lock
-
-	params := gps.SolveParameters{
-		RootDir:         root,
-		RootPackageTree: pkgT,
-		Manifest:        p.Manifest,
-		Lock:            p.Lock,
-		ProjectAnalyzer: rootAnalyzer,
-	}
-
-	if ctx.Verbose {
-		params.TraceLogger = ctx.Err
-	}
-
-	if err := ctx.ValidateParams(sm, params); err != nil {
-		return err
-	}
-
-	s, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "prepare solver")
-	}
-
-	soln, err := s.Solve()
-	if err != nil {
-		handleAllTheFailuresOfTheWorld(err)
-		return err
-	}
-	p.Lock = dep.LockFromSolution(soln)
-
-	rootAnalyzer.FinalizeRootManifestAndLock(p.Manifest, p.Lock, copyLock)
-
-	// Run gps.Prepare with appropriate constraint solutions from solve run
-	// to generate the final lock memo.
-	s, err = gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "prepare solver")
-	}
-
-	p.Lock.SolveMeta.InputsDigest = s.HashInputs()
-
-	// Pass timestamp (yyyyMMddHHmmss format) as suffix to backup name.
-	vendorbak, err := dep.BackupVendor(vpath, time.Now().Format("20060102150405"))
-	if err != nil {
-		return err
-	}
-	if vendorbak != "" {
-		ctx.Err.Printf("Old vendor backed up to %v", vendorbak)
-	}
-
-	sw, err := dep.NewSafeWriter(p.Manifest, nil, p.Lock, dep.VendorAlways)
-	if err != nil {
-		return err
-	}
-
-	logger := ctx.Err
-	if !ctx.Verbose {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-	if err := sw.Write(root, sm, !cmd.noExamples, logger); err != nil {
-		return errors.Wrap(err, "safe write of manifest and lock")
-	}
-
-	return nil
-}
-
-func getDirectDependencies(sm gps.SourceManager, p *dep.Project) (pkgtree.PackageTree, map[string]bool, error) {
-	pkgT, err := p.ParseRootPackageTree()
-	if err != nil {
-		return pkgtree.PackageTree{}, nil, err
-	}
-
-	directDeps := map[string]bool{}
-	rm, _ := pkgT.ToReachMap(true, true, false, nil)
-	for _, ip := range rm.FlattenFn(paths.IsStandardImportPath) {
-		pr, err := sm.DeduceProjectRoot(ip)
-		if err != nil {
-			return pkgtree.PackageTree{}, nil, err
-		}
-		directDeps[string(pr)] = true
-	}
-
-	return pkgT, directDeps, nil
-}
-
-// TODO solve failures can be really creative - we need to be similarly creative
-// in handling them and informing the user appropriately
-func handleAllTheFailuresOfTheWorld(err error) {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/init_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/init_test.go
deleted file mode 100644
index 18c2fb540f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/init_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestGetDirectDependencies_ConsolidatesRootProjects(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := NewTestContext(h)
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	testprj := "directdepstest"
-	testdir := filepath.Join("src", testprj)
-	h.TempDir(testdir)
-	h.TempCopy(filepath.Join(testdir, "main.go"), "init/directdeps/main.go")
-
-	testpath := h.Path(testdir)
-	prj := &dep.Project{AbsRoot: testpath, ResolvedAbsRoot: testpath, ImportRoot: gps.ProjectRoot(testprj)}
-
-	_, dd, err := getDirectDependencies(sm, prj)
-	h.Must(err)
-
-	wantpr := "github.com/carolynvs/deptest-subpkg"
-	if _, has := dd[wantpr]; !has {
-		t.Fatalf("Expected direct dependencies to contain %s, got %v", wantpr, dd)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/integration_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/integration_test.go
deleted file mode 100644
index cc9f959cc9..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/integration_test.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/test"
-	"github.com/golang/dep/internal/test/integration"
-)
-
-func TestIntegration(t *testing.T) {
-	t.Parallel()
-
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	relPath := filepath.Join("testdata", "harness_tests")
-	filepath.Walk(relPath, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			t.Fatal("error walking filepath")
-		}
-
-		if filepath.Base(path) != "testcase.json" {
-			return nil
-		}
-
-		parse := strings.Split(path, string(filepath.Separator))
-		testName := strings.Join(parse[2:len(parse)-1], "/")
-		t.Run(testName, func(t *testing.T) {
-			t.Parallel()
-
-			t.Run("external", testIntegration(testName, relPath, wd, execCmd))
-			t.Run("internal", testIntegration(testName, relPath, wd, runMain))
-		})
-
-		return nil
-	})
-}
-
-// execCmd is a test.RunFunc which runs the program in another process.
-func execCmd(prog string, args []string, stdout, stderr io.Writer, dir string, env []string) error {
-	cmd := exec.Command(prog, args...)
-	cmd.Stdout = stdout
-	cmd.Stderr = stderr
-	cmd.Env = env
-	cmd.Dir = dir
-	return cmd.Run()
-}
-
-// runMain is a test.RunFunc which runs the program in-process.
-func runMain(prog string, args []string, stdout, stderr io.Writer, dir string, env []string) (err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			switch r := r.(type) {
-			case error:
-				err = r
-			default:
-				err = fmt.Errorf("%v", r)
-			}
-		}
-	}()
-	m := &Config{
-		Args:       append([]string{prog}, args...),
-		Stdout:     stdout,
-		Stderr:     stderr,
-		WorkingDir: dir,
-		Env:        env,
-	}
-	if exitCode := m.Run(); exitCode != 0 {
-		err = fmt.Errorf("exit status %d", exitCode)
-	}
-	return
-}
-
-// testIntegration runs the test specified by <wd>/<relPath>/<name>/testcase.json
-func testIntegration(name, relPath, wd string, run integration.RunFunc) func(t *testing.T) {
-	return func(t *testing.T) {
-		t.Parallel()
-
-		// Set up environment
-		testCase := integration.NewTestCase(t, filepath.Join(wd, relPath), name)
-		testProj := integration.NewTestProject(t, testCase.InitialPath(), wd, run)
-		defer testProj.Cleanup()
-
-		// Create and checkout the vendor revisions
-		for ip, rev := range testCase.VendorInitial {
-			testProj.GetVendorGit(ip)
-			testProj.RunGit(testProj.VendorPath(ip), "checkout", rev)
-		}
-
-		// Create and checkout the import revisions
-		for ip, rev := range testCase.GopathInitial {
-			testProj.RunGo("get", ip)
-			testProj.RunGit(testProj.Path("src", ip), "checkout", rev)
-		}
-
-		// Run commands
-		testProj.RecordImportPaths()
-
-		var err error
-		for i, args := range testCase.Commands {
-			err = testProj.DoRun(args)
-			if err != nil && i < len(testCase.Commands)-1 {
-				t.Fatalf("cmd %s raised an unexpected error: %s", args[0], err.Error())
-			}
-		}
-
-		// Check error raised in final command
-		testCase.CompareError(err, testProj.GetStderr())
-
-		if *test.UpdateGolden {
-			testCase.UpdateOutput(testProj.GetStdout())
-		} else {
-			// Check output
-			testCase.CompareOutput(testProj.GetStdout())
-		}
-
-		// Check vendor paths
-		testProj.CompareImportPaths()
-		testCase.CompareVendorPaths(testProj.GetVendorPaths())
-
-		if *test.UpdateGolden {
-			// Update manifest and lock
-			testCase.UpdateFile(dep.ManifestName, testProj.ProjPath(dep.ManifestName))
-			testCase.UpdateFile(dep.LockName, testProj.ProjPath(dep.LockName))
-		} else {
-			// Check final manifest and lock
-			testCase.CompareFile(dep.ManifestName, testProj.ProjPath(dep.ManifestName))
-			testCase.CompareFile(dep.LockName, testProj.ProjPath(dep.LockName))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/main.go
deleted file mode 100644
index f465197028..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/main.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Command dep is a prototype dependency management tool.
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/golang/dep"
-)
-
-type command interface {
-	Name() string           // "foobar"
-	Args() string           // "<baz> [quux...]"
-	ShortHelp() string      // "Foo the first bar"
-	LongHelp() string       // "Foo the first bar meeting the following conditions..."
-	Register(*flag.FlagSet) // command-specific flags
-	Hidden() bool           // indicates whether the command should be hidden from help output
-	Run(*dep.Ctx, []string) error
-}
-
-func main() {
-	wd, err := os.Getwd()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, "failed to get working directory", err)
-		os.Exit(1)
-	}
-	c := &Config{
-		Args:       os.Args,
-		Stdout:     os.Stdout,
-		Stderr:     os.Stderr,
-		WorkingDir: wd,
-		Env:        os.Environ(),
-	}
-	os.Exit(c.Run())
-}
-
-// A Config specifies a full configuration for a dep execution.
-type Config struct {
-	WorkingDir     string    // Where to execute
-	Args           []string  // Command-line arguments, starting with the program name.
-	Env            []string  // Environment variables
-	Stdout, Stderr io.Writer // Log output
-}
-
-// Run executes a configuration and returns an exit code.
-func (c *Config) Run() (exitCode int) {
-	// Build the list of available commands.
-	commands := []command{
-		&initCommand{},
-		&statusCommand{},
-		&ensureCommand{},
-		&hashinCommand{},
-		&pruneCommand{},
-		&versionCommand{},
-	}
-
-	examples := [][2]string{
-		{
-			"dep init",
-			"set up a new project",
-		},
-		{
-			"dep ensure",
-			"install the project's dependencies",
-		},
-		{
-			"dep ensure -update",
-			"update the locked versions of all dependencies",
-		},
-		{
-			"dep ensure -add github.com/pkg/errors",
-			"add a dependency to the project",
-		},
-	}
-
-	outLogger := log.New(c.Stdout, "", 0)
-	errLogger := log.New(c.Stderr, "", 0)
-
-	usage := func() {
-		errLogger.Println("dep is a tool for managing dependencies for Go projects")
-		errLogger.Println()
-		errLogger.Println("Usage: dep <command>")
-		errLogger.Println()
-		errLogger.Println("Commands:")
-		errLogger.Println()
-		w := tabwriter.NewWriter(c.Stderr, 0, 4, 2, ' ', 0)
-		for _, cmd := range commands {
-			if !cmd.Hidden() {
-				fmt.Fprintf(w, "\t%s\t%s\n", cmd.Name(), cmd.ShortHelp())
-			}
-		}
-		w.Flush()
-		errLogger.Println()
-		errLogger.Println("Examples:")
-		for _, example := range examples {
-			fmt.Fprintf(w, "\t%s\t%s\n", example[0], example[1])
-		}
-		w.Flush()
-		errLogger.Println()
-		errLogger.Println("Use \"dep help [command]\" for more information about a command.")
-	}
-
-	cmdName, printCommandHelp, exit := parseArgs(c.Args)
-	if exit {
-		usage()
-		exitCode = 1
-		return
-	}
-
-	for _, cmd := range commands {
-		if cmd.Name() == cmdName {
-			// Build flag set with global flags in there.
-			fs := flag.NewFlagSet(cmdName, flag.ContinueOnError)
-			fs.SetOutput(c.Stderr)
-			verbose := fs.Bool("v", false, "enable verbose logging")
-
-			// Register the subcommand flags in there, too.
-			cmd.Register(fs)
-
-			// Override the usage text to something nicer.
-			resetUsage(errLogger, fs, cmdName, cmd.Args(), cmd.LongHelp())
-
-			if printCommandHelp {
-				fs.Usage()
-				exitCode = 1
-				return
-			}
-
-			// Parse the flags the user gave us.
-			// flag package automatically prints usage and error message in err != nil
-			// or if '-h' flag provided
-			if err := fs.Parse(c.Args[2:]); err != nil {
-				exitCode = 1
-				return
-			}
-
-			// Set up dep context.
-			ctx := &dep.Ctx{
-				Out:            outLogger,
-				Err:            errLogger,
-				Verbose:        *verbose,
-				DisableLocking: getEnv(c.Env, "DEPNOLOCK") != "",
-			}
-
-			GOPATHS := filepath.SplitList(getEnv(c.Env, "GOPATH"))
-			ctx.SetPaths(c.WorkingDir, GOPATHS...)
-
-			// Run the command with the post-flag-processing args.
-			if err := cmd.Run(ctx, fs.Args()); err != nil {
-				errLogger.Printf("%v\n", err)
-				exitCode = 1
-				return
-			}
-
-			// Easy peasy livin' breezy.
-			return
-		}
-	}
-
-	errLogger.Printf("dep: %s: no such command\n", cmdName)
-	usage()
-	exitCode = 1
-	return
-}
-
-func resetUsage(logger *log.Logger, fs *flag.FlagSet, name, args, longHelp string) {
-	var (
-		hasFlags   bool
-		flagBlock  bytes.Buffer
-		flagWriter = tabwriter.NewWriter(&flagBlock, 0, 4, 2, ' ', 0)
-	)
-	fs.VisitAll(func(f *flag.Flag) {
-		hasFlags = true
-		// Default-empty string vars should read "(default: <none>)"
-		// rather than the comparatively ugly "(default: )".
-		defValue := f.DefValue
-		if defValue == "" {
-			defValue = "<none>"
-		}
-		fmt.Fprintf(flagWriter, "\t-%s\t%s (default: %s)\n", f.Name, f.Usage, defValue)
-	})
-	flagWriter.Flush()
-	fs.Usage = func() {
-		logger.Printf("Usage: dep %s %s\n", name, args)
-		logger.Println()
-		logger.Println(strings.TrimSpace(longHelp))
-		logger.Println()
-		if hasFlags {
-			logger.Println("Flags:")
-			logger.Println()
-			logger.Println(flagBlock.String())
-		}
-	}
-}
-
-// parseArgs determines the name of the dep command and whether the user asked for
-// help to be printed.
-func parseArgs(args []string) (cmdName string, printCmdUsage bool, exit bool) {
-	isHelpArg := func() bool {
-		return strings.Contains(strings.ToLower(args[1]), "help") || strings.ToLower(args[1]) == "-h"
-	}
-
-	switch len(args) {
-	case 0, 1:
-		exit = true
-	case 2:
-		if isHelpArg() {
-			exit = true
-		}
-		cmdName = args[1]
-	default:
-		if isHelpArg() {
-			cmdName = args[2]
-			printCmdUsage = true
-		} else {
-			cmdName = args[1]
-		}
-	}
-	return cmdName, printCmdUsage, exit
-}
-
-// getEnv returns the last instance of an environment variable.
-func getEnv(env []string, key string) string {
-	for i := len(env) - 1; i >= 0; i-- {
-		v := env[i]
-		kv := strings.SplitN(v, "=", 2)
-		if kv[0] == key {
-			if len(kv) > 1 {
-				return kv[1]
-			}
-			return ""
-		}
-	}
-	return ""
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/prune.go b/installer/vendor/github.com/golang/dep/cmd/dep/prune.go
deleted file mode 100644
index db89f24b34..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/prune.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-const pruneShortHelp = `Prune the vendor tree of unused packages`
-const pruneLongHelp = `
-Prune is used to remove unused packages from your vendor tree.
-
-STABILITY NOTICE: this command creates problems for vendor/ verification. As
-such, it may be removed and/or moved out into a separate project later on.
-`
-
-type pruneCommand struct {
-}
-
-func (cmd *pruneCommand) Name() string      { return "prune" }
-func (cmd *pruneCommand) Args() string      { return "" }
-func (cmd *pruneCommand) ShortHelp() string { return pruneShortHelp }
-func (cmd *pruneCommand) LongHelp() string  { return pruneLongHelp }
-func (cmd *pruneCommand) Hidden() bool      { return false }
-
-func (cmd *pruneCommand) Register(fs *flag.FlagSet) {
-}
-
-func (cmd *pruneCommand) Run(ctx *dep.Ctx, args []string) error {
-	p, err := ctx.LoadProject()
-	if err != nil {
-		return err
-	}
-
-	sm, err := ctx.SourceManager()
-	if err != nil {
-		return err
-	}
-	sm.UseDefaultSignalHandling()
-	defer sm.Release()
-
-	// While the network churns on ListVersions() requests, statically analyze
-	// code from the current project.
-	ptree, err := pkgtree.ListPackages(p.ResolvedAbsRoot, string(p.ImportRoot))
-	if err != nil {
-		return errors.Wrap(err, "analysis of local packages failed: %v")
-	}
-
-	// Set up a solver in order to check the InputHash.
-	params := p.MakeParams()
-	params.RootPackageTree = ptree
-
-	if ctx.Verbose {
-		params.TraceLogger = ctx.Err
-	}
-
-	s, err := gps.Prepare(params, sm)
-	if err != nil {
-		return errors.Wrap(err, "could not set up solver for input hashing")
-	}
-
-	if p.Lock == nil {
-		return errors.Errorf("Gopkg.lock must exist for prune to know what files are safe to remove.")
-	}
-
-	if !bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.InputsDigest) {
-		return errors.Errorf("Gopkg.lock is out of sync; run dep ensure before pruning.")
-	}
-
-	pruneLogger := ctx.Err
-	if !ctx.Verbose {
-		pruneLogger = log.New(ioutil.Discard, "", 0)
-	}
-	return pruneProject(p, sm, pruneLogger)
-}
-
-// pruneProject removes unused packages from a project.
-func pruneProject(p *dep.Project, sm gps.SourceManager, logger *log.Logger) error {
-	td, err := ioutil.TempDir(os.TempDir(), "dep")
-	if err != nil {
-		return errors.Wrap(err, "error while creating temp dir for writing manifest/lock/vendor")
-	}
-	defer os.RemoveAll(td)
-
-	if err := gps.WriteDepTree(td, p.Lock, sm, true, logger); err != nil {
-		return err
-	}
-
-	var toKeep []string
-	for _, project := range p.Lock.Projects() {
-		projectRoot := string(project.Ident().ProjectRoot)
-		for _, pkg := range project.Packages() {
-			toKeep = append(toKeep, filepath.Join(projectRoot, pkg))
-		}
-	}
-
-	toDelete, err := calculatePrune(td, toKeep, logger)
-	if err != nil {
-		return err
-	}
-
-	if len(toDelete) > 0 {
-		logger.Println("Calculated the following directories to prune:")
-		for _, d := range toDelete {
-			logger.Printf("  %s\n", d)
-		}
-	} else {
-		logger.Println("No directories found to prune")
-	}
-
-	if err := deleteDirs(toDelete); err != nil {
-		return err
-	}
-
-	vpath := filepath.Join(p.AbsRoot, "vendor")
-	vendorbak := vpath + ".orig"
-	var failerr error
-	if _, err := os.Stat(vpath); err == nil {
-		// Move out the old vendor dir. just do it into an adjacent dir, to
-		// try to mitigate the possibility of a pointless cross-filesystem
-		// move with a temp directory.
-		if _, err := os.Stat(vendorbak); err == nil {
-			// If the adjacent dir already exists, bite the bullet and move
-			// to a proper tempdir.
-			vendorbak = filepath.Join(td, "vendor.orig")
-		}
-		failerr = fs.RenameWithFallback(vpath, vendorbak)
-		if failerr != nil {
-			goto fail
-		}
-	}
-
-	// Move in the new one.
-	failerr = fs.RenameWithFallback(td, vpath)
-	if failerr != nil {
-		goto fail
-	}
-
-	os.RemoveAll(vendorbak)
-
-	return nil
-
-fail:
-	fs.RenameWithFallback(vendorbak, vpath)
-	return failerr
-}
-
-func calculatePrune(vendorDir string, keep []string, logger *log.Logger) ([]string, error) {
-	logger.Println("Calculating prune. Checking the following packages:")
-	sort.Strings(keep)
-	toDelete := []string{}
-	err := filepath.Walk(vendorDir, func(path string, info os.FileInfo, err error) error {
-		if _, err := os.Lstat(path); err != nil {
-			return nil
-		}
-		if !info.IsDir() {
-			return nil
-		}
-		if path == vendorDir {
-			return nil
-		}
-
-		name := strings.TrimPrefix(path, vendorDir+string(filepath.Separator))
-		logger.Printf("  %s", name)
-		i := sort.Search(len(keep), func(i int) bool {
-			return name <= keep[i]
-		})
-		if i >= len(keep) || !strings.HasPrefix(keep[i], name) {
-			toDelete = append(toDelete, path)
-		}
-		return nil
-	})
-	return toDelete, err
-}
-
-func deleteDirs(toDelete []string) error {
-	// sort by length so we delete sub dirs first
-	sort.Sort(byLen(toDelete))
-	for _, path := range toDelete {
-		if err := os.RemoveAll(path); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type byLen []string
-
-func (a byLen) Len() int           { return len(a) }
-func (a byLen) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byLen) Less(i, j int) bool { return len(a[i]) > len(a[j]) }
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/prune_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/prune_test.go
deleted file mode 100644
index 8a9c1d1d96..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/prune_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"io/ioutil"
-	"log"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestCalculatePrune(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	vendorDir := "vendor"
-	h.TempDir(vendorDir)
-	h.TempDir(filepath.Join(vendorDir, "github.com/keep/pkg/sub"))
-	h.TempDir(filepath.Join(vendorDir, "github.com/prune/pkg/sub"))
-
-	toKeep := []string{
-		filepath.FromSlash("github.com/keep/pkg"),
-		filepath.FromSlash("github.com/keep/pkg/sub"),
-	}
-
-	discardLogger := log.New(ioutil.Discard, "", 0)
-
-	got, err := calculatePrune(h.Path(vendorDir), toKeep, discardLogger)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	sort.Sort(byLen(got))
-
-	want := []string{
-		h.Path(filepath.Join(vendorDir, "github.com/prune/pkg/sub")),
-		h.Path(filepath.Join(vendorDir, "github.com/prune/pkg")),
-		h.Path(filepath.Join(vendorDir, "github.com/prune")),
-	}
-
-	if !reflect.DeepEqual(want, got) {
-		t.Fatalf("calculated prune paths are not as expected.\n(WNT) %s\n(GOT) %s", want, got)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/root_analyzer.go b/installer/vendor/github.com/golang/dep/cmd/dep/root_analyzer.go
deleted file mode 100644
index c300eadad8..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/root_analyzer.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"io/ioutil"
-	"log"
-
-	"github.com/golang/dep"
-	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers"
-)
-
-// rootAnalyzer supplies manifest/lock data from both dep and external tool's
-// configuration files.
-// * When used on the root project, it imports only from external tools.
-// * When used by the solver for dependencies, it first looks for dep config,
-//   then external tools.
-type rootAnalyzer struct {
-	skipTools  bool
-	ctx        *dep.Ctx
-	sm         gps.SourceManager
-	directDeps map[string]bool
-}
-
-func newRootAnalyzer(skipTools bool, ctx *dep.Ctx, directDeps map[string]bool, sm gps.SourceManager) *rootAnalyzer {
-	return &rootAnalyzer{
-		skipTools:  skipTools,
-		ctx:        ctx,
-		sm:         sm,
-		directDeps: directDeps,
-	}
-}
-
-func (a *rootAnalyzer) InitializeRootManifestAndLock(dir string, pr gps.ProjectRoot) (rootM *dep.Manifest, rootL *dep.Lock, err error) {
-	if !a.skipTools {
-		rootM, rootL, err = a.importManifestAndLock(dir, pr, false)
-		if err != nil {
-			return
-		}
-	}
-
-	if rootM == nil {
-		rootM = dep.NewManifest()
-	}
-	if rootL == nil {
-		rootL = &dep.Lock{}
-	}
-
-	return
-}
-
-func (a *rootAnalyzer) importManifestAndLock(dir string, pr gps.ProjectRoot, suppressLogs bool) (*dep.Manifest, *dep.Lock, error) {
-	logger := a.ctx.Err
-	if suppressLogs {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-
-	for _, i := range importers.BuildAll(logger, a.ctx.Verbose, a.sm) {
-		if i.HasDepMetadata(dir) {
-			a.ctx.Err.Printf("Importing configuration from %s. These are only initial constraints, and are further refined during the solve process.", i.Name())
-			m, l, err := i.Import(dir, pr)
-			if err != nil {
-				return nil, nil, err
-			}
-			a.removeTransitiveDependencies(m)
-			return m, l, err
-		}
-	}
-
-	var emptyManifest = dep.NewManifest()
-
-	return emptyManifest, nil, nil
-}
-
-func (a *rootAnalyzer) removeTransitiveDependencies(m *dep.Manifest) {
-	for pr := range m.Constraints {
-		if _, isDirect := a.directDeps[string(pr)]; !isDirect {
-			delete(m.Constraints, pr)
-		}
-	}
-}
-
-// DeriveManifestAndLock evaluates a dependency for existing dependency manager
-// configuration (ours or external) and passes any configuration found back
-// to the solver.
-func (a *rootAnalyzer) DeriveManifestAndLock(dir string, pr gps.ProjectRoot) (gps.Manifest, gps.Lock, error) {
-	// Ignore other tools if we find dep configuration
-	var depAnalyzer dep.Analyzer
-	if depAnalyzer.HasDepMetadata(dir) {
-		return depAnalyzer.DeriveManifestAndLock(dir, pr)
-	}
-
-	if !a.skipTools {
-		// The assignment back to an interface prevents interface-based nil checks from failing later
-		var manifest gps.Manifest = gps.SimpleManifest{}
-		var lock gps.Lock
-		im, il, err := a.importManifestAndLock(dir, pr, true)
-		if im != nil {
-			manifest = im
-		}
-		if il != nil {
-			lock = il
-		}
-		return manifest, lock, err
-	}
-
-	return gps.SimpleManifest{}, nil, nil
-}
-
-func (a *rootAnalyzer) FinalizeRootManifestAndLock(m *dep.Manifest, l *dep.Lock, ol dep.Lock) {
-	// Iterate through the new projects in solved lock and add them to manifest
-	// if they are direct deps and log feedback for all the new projects.
-	for _, y := range l.Projects() {
-		var f *fb.ConstraintFeedback
-		pr := y.Ident().ProjectRoot
-		// New constraints: in new lock and dir dep but not in manifest
-		if _, ok := a.directDeps[string(pr)]; ok {
-			if _, ok := m.Constraints[pr]; !ok {
-				pp := getProjectPropertiesFromVersion(y.Version())
-				if pp.Constraint != nil {
-					m.Constraints[pr] = pp
-					pc := gps.ProjectConstraint{Ident: y.Ident(), Constraint: pp.Constraint}
-					f = fb.NewConstraintFeedback(pc, fb.DepTypeDirect)
-					f.LogFeedback(a.ctx.Err)
-				}
-				f = fb.NewLockedProjectFeedback(y, fb.DepTypeDirect)
-				f.LogFeedback(a.ctx.Err)
-			}
-		} else {
-			// New locked projects: in new lock but not in old lock
-			newProject := true
-			for _, opl := range ol.Projects() {
-				if pr == opl.Ident().ProjectRoot {
-					newProject = false
-				}
-			}
-			if newProject {
-				f = fb.NewLockedProjectFeedback(y, fb.DepTypeTransitive)
-				f.LogFeedback(a.ctx.Err)
-			}
-		}
-	}
-}
-
-// Info provides metadata on the analyzer algorithm used during solve.
-func (a *rootAnalyzer) Info() gps.ProjectAnalyzerInfo {
-	return gps.ProjectAnalyzerInfo{
-		Name:    "dep",
-		Version: 1,
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/status.go b/installer/vendor/github.com/golang/dep/cmd/dep/status.go
deleted file mode 100644
index ff5355f700..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/status.go
+++ /dev/null
@@ -1,645 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"sort"
-	"sync"
-	"text/tabwriter"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/gps/paths"
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/pkg/errors"
-)
-
-const statusShortHelp = `Report the status of the project's dependencies`
-const statusLongHelp = `
-With no arguments, print the status of each dependency of the project.
-
-  PROJECT     Import path
-  CONSTRAINT  Version constraint, from the manifest
-  VERSION     Version chosen, from the lock
-  REVISION    VCS revision of the chosen version
-  LATEST      Latest VCS revision available
-  PKGS USED   Number of packages from this project that are actually used
-
-With one or more explicitly specified packages, or with the -detailed flag,
-print an extended status output for each dependency of the project.
-
-  TODO    Another column description
-  FOOBAR  Another column description
-
-Status returns exit code zero if all dependencies are in a "good state".
-`
-
-const (
-	shortRev uint8 = iota
-	longRev
-)
-
-var (
-	errFailedUpdate        = errors.New("failed to fetch updates")
-	errFailedListPkg       = errors.New("failed to list packages")
-	errMultipleFailures    = errors.New("multiple sources of failure")
-	errInputDigestMismatch = errors.New("input-digest mismatch")
-)
-
-func (cmd *statusCommand) Name() string      { return "status" }
-func (cmd *statusCommand) Args() string      { return "[package...]" }
-func (cmd *statusCommand) ShortHelp() string { return statusShortHelp }
-func (cmd *statusCommand) LongHelp() string  { return statusLongHelp }
-func (cmd *statusCommand) Hidden() bool      { return false }
-
-func (cmd *statusCommand) Register(fs *flag.FlagSet) {
-	fs.BoolVar(&cmd.detailed, "detailed", false, "report more detailed status")
-	fs.BoolVar(&cmd.json, "json", false, "output in JSON format")
-	fs.StringVar(&cmd.template, "f", "", "output in text/template format")
-	fs.BoolVar(&cmd.dot, "dot", false, "output the dependency graph in GraphViz format")
-	fs.BoolVar(&cmd.old, "old", false, "only show out-of-date dependencies")
-	fs.BoolVar(&cmd.missing, "missing", false, "only show missing dependencies")
-	fs.BoolVar(&cmd.unused, "unused", false, "only show unused dependencies")
-	fs.BoolVar(&cmd.modified, "modified", false, "only show modified dependencies")
-}
-
-type statusCommand struct {
-	detailed bool
-	json     bool
-	template string
-	output   string
-	dot      bool
-	old      bool
-	missing  bool
-	unused   bool
-	modified bool
-}
-
-type outputter interface {
-	BasicHeader()
-	BasicLine(*BasicStatus)
-	BasicFooter()
-	MissingHeader()
-	MissingLine(*MissingStatus)
-	MissingFooter()
-}
-
-type tableOutput struct{ w *tabwriter.Writer }
-
-func (out *tableOutput) BasicHeader() {
-	fmt.Fprintf(out.w, "PROJECT\tCONSTRAINT\tVERSION\tREVISION\tLATEST\tPKGS USED\n")
-}
-
-func (out *tableOutput) BasicFooter() {
-	out.w.Flush()
-}
-
-func (out *tableOutput) BasicLine(bs *BasicStatus) {
-	fmt.Fprintf(out.w,
-		"%s\t%s\t%s\t%s\t%s\t%d\t\n",
-		bs.ProjectRoot,
-		bs.getConsolidatedConstraint(),
-		formatVersion(bs.Version),
-		formatVersion(bs.Revision),
-		bs.getConsolidatedLatest(shortRev),
-		bs.PackageCount,
-	)
-}
-
-func (out *tableOutput) MissingHeader() {
-	fmt.Fprintln(out.w, "PROJECT\tMISSING PACKAGES")
-}
-
-func (out *tableOutput) MissingLine(ms *MissingStatus) {
-	fmt.Fprintf(out.w,
-		"%s\t%s\t\n",
-		ms.ProjectRoot,
-		ms.MissingPackages,
-	)
-}
-
-func (out *tableOutput) MissingFooter() {
-	out.w.Flush()
-}
-
-type jsonOutput struct {
-	w       io.Writer
-	basic   []*rawStatus
-	missing []*MissingStatus
-}
-
-func (out *jsonOutput) BasicHeader() {
-	out.basic = []*rawStatus{}
-}
-
-func (out *jsonOutput) BasicFooter() {
-	json.NewEncoder(out.w).Encode(out.basic)
-}
-
-func (out *jsonOutput) BasicLine(bs *BasicStatus) {
-	out.basic = append(out.basic, bs.marshalJSON())
-}
-
-func (out *jsonOutput) MissingHeader() {
-	out.missing = []*MissingStatus{}
-}
-
-func (out *jsonOutput) MissingLine(ms *MissingStatus) {
-	out.missing = append(out.missing, ms)
-}
-
-func (out *jsonOutput) MissingFooter() {
-	json.NewEncoder(out.w).Encode(out.missing)
-}
-
-type dotOutput struct {
-	w io.Writer
-	o string
-	g *graphviz
-	p *dep.Project
-}
-
-func (out *dotOutput) BasicHeader() {
-	out.g = new(graphviz).New()
-
-	ptree, _ := out.p.ParseRootPackageTree()
-	// TODO(sdboyer) should be true, true, false, out.p.Manifest.IgnoredPackages()
-	prm, _ := ptree.ToReachMap(true, false, false, nil)
-
-	out.g.createNode(string(out.p.ImportRoot), "", prm.FlattenFn(paths.IsStandardImportPath))
-}
-
-func (out *dotOutput) BasicFooter() {
-	gvo := out.g.output()
-	fmt.Fprintf(out.w, gvo.String())
-}
-
-func (out *dotOutput) BasicLine(bs *BasicStatus) {
-	out.g.createNode(bs.ProjectRoot, bs.getConsolidatedVersion(), bs.Children)
-}
-
-func (out *dotOutput) MissingHeader()                {}
-func (out *dotOutput) MissingLine(ms *MissingStatus) {}
-func (out *dotOutput) MissingFooter()                {}
-
-func (cmd *statusCommand) Run(ctx *dep.Ctx, args []string) error {
-	p, err := ctx.LoadProject()
-	if err != nil {
-		return err
-	}
-
-	sm, err := ctx.SourceManager()
-	if err != nil {
-		return err
-	}
-	sm.UseDefaultSignalHandling()
-	defer sm.Release()
-
-	if err := dep.ValidateProjectRoots(ctx, p.Manifest, sm); err != nil {
-		return err
-	}
-
-	var buf bytes.Buffer
-	var out outputter
-	switch {
-	case cmd.modified:
-		return errors.Errorf("not implemented")
-	case cmd.unused:
-		return errors.Errorf("not implemented")
-	case cmd.missing:
-		return errors.Errorf("not implemented")
-	case cmd.old:
-		return errors.Errorf("not implemented")
-	case cmd.detailed:
-		return errors.Errorf("not implemented")
-	case cmd.json:
-		out = &jsonOutput{
-			w: &buf,
-		}
-	case cmd.dot:
-		out = &dotOutput{
-			p: p,
-			o: cmd.output,
-			w: &buf,
-		}
-	default:
-		out = &tableOutput{
-			w: tabwriter.NewWriter(&buf, 0, 4, 2, ' ', 0),
-		}
-	}
-
-	// Check if the lock file exists.
-	if p.Lock == nil {
-		return errors.Errorf("no Gopkg.lock found. Run `dep ensure` to generate lock file")
-	}
-
-	hasMissingPkgs, errCount, err := runStatusAll(ctx, out, p, sm)
-	if err != nil {
-		switch err {
-		case errFailedUpdate:
-			// Print the results with unknown data
-			ctx.Out.Println(buf.String())
-			// Print the help when in non-verbose mode
-			if !ctx.Verbose {
-				ctx.Out.Printf("The status of %d projects are unknown due to errors. Rerun with `-v` flag to see details.\n", errCount)
-			}
-		case errInputDigestMismatch:
-			// Tell the user why mismatch happened and how to resolve it.
-			if hasMissingPkgs {
-				ctx.Err.Printf("Lock inputs-digest mismatch due to the following packages missing from the lock:\n\n")
-				ctx.Out.Print(buf.String())
-				ctx.Err.Printf("\nThis happens when a new import is added. Run `dep ensure` to install the missing packages.\n")
-			} else {
-				ctx.Err.Printf("Lock inputs-digest mismatch. This happens when Gopkg.toml is modified.\n" +
-					"Run `dep ensure` to regenerate the inputs-digest.")
-			}
-		}
-
-		return err
-	}
-
-	// Print the status output
-	ctx.Out.Print(buf.String())
-
-	return nil
-}
-
-type rawStatus struct {
-	ProjectRoot  string
-	Constraint   string
-	Version      string
-	Revision     string
-	Latest       string
-	PackageCount int
-}
-
-// BasicStatus contains all the information reported about a single dependency
-// in the summary/list status output mode.
-type BasicStatus struct {
-	ProjectRoot  string
-	Children     []string
-	Constraint   gps.Constraint
-	Version      gps.UnpairedVersion
-	Revision     gps.Revision
-	Latest       gps.Version
-	PackageCount int
-	hasOverride  bool
-	hasError     bool
-}
-
-func (bs *BasicStatus) getConsolidatedConstraint() string {
-	var constraint string
-	if bs.Constraint != nil {
-		if v, ok := bs.Constraint.(gps.Version); ok {
-			constraint = formatVersion(v)
-		} else {
-			constraint = bs.Constraint.String()
-		}
-	}
-
-	if bs.hasOverride {
-		constraint += " (override)"
-	}
-
-	return constraint
-}
-
-func (bs *BasicStatus) getConsolidatedVersion() string {
-	version := formatVersion(bs.Revision)
-	if bs.Version != nil {
-		version = formatVersion(bs.Version)
-	}
-	return version
-}
-
-func (bs *BasicStatus) getConsolidatedLatest(revSize uint8) string {
-	latest := ""
-	if bs.Latest != nil {
-		switch revSize {
-		case shortRev:
-			latest = formatVersion(bs.Latest)
-		case longRev:
-			latest = bs.Latest.String()
-		}
-	}
-
-	if bs.hasError {
-		latest += "unknown"
-	}
-
-	return latest
-}
-
-func (bs *BasicStatus) marshalJSON() *rawStatus {
-	return &rawStatus{
-		ProjectRoot:  bs.ProjectRoot,
-		Constraint:   bs.getConsolidatedConstraint(),
-		Version:      formatVersion(bs.Version),
-		Revision:     string(bs.Revision),
-		Latest:       bs.getConsolidatedLatest(longRev),
-		PackageCount: bs.PackageCount,
-	}
-}
-
-// MissingStatus contains information about all the missing packages in a project.
-type MissingStatus struct {
-	ProjectRoot     string
-	MissingPackages []string
-}
-
-func runStatusAll(ctx *dep.Ctx, out outputter, p *dep.Project, sm gps.SourceManager) (hasMissingPkgs bool, errCount int, err error) {
-	// While the network churns on ListVersions() requests, statically analyze
-	// code from the current project.
-	ptree, err := p.ParseRootPackageTree()
-	if err != nil {
-		return false, 0, err
-	}
-
-	// Set up a solver in order to check the InputHash.
-	params := gps.SolveParameters{
-		ProjectAnalyzer: dep.Analyzer{},
-		RootDir:         p.AbsRoot,
-		RootPackageTree: ptree,
-		Manifest:        p.Manifest,
-		// Locks aren't a part of the input hash check, so we can omit it.
-	}
-
-	logger := ctx.Err
-	if ctx.Verbose {
-		params.TraceLogger = ctx.Err
-	} else {
-		logger = log.New(ioutil.Discard, "", 0)
-	}
-
-	if err := ctx.ValidateParams(sm, params); err != nil {
-		return false, 0, err
-	}
-
-	s, err := gps.Prepare(params, sm)
-	if err != nil {
-		return false, 0, errors.Wrapf(err, "could not set up solver for input hashing")
-	}
-
-	cm := collectConstraints(ptree, p, sm)
-
-	// Get the project list and sort it so that the printed output users see is
-	// deterministically ordered. (This may be superfluous if the lock is always
-	// written in alpha order, but it doesn't hurt to double down.)
-	slp := p.Lock.Projects()
-	sort.Slice(slp, func(i, j int) bool {
-		return slp[i].Ident().Less(slp[j].Ident())
-	})
-
-	if bytes.Equal(s.HashInputs(), p.Lock.SolveMeta.InputsDigest) {
-		// If these are equal, we're guaranteed that the lock is a transitively
-		// complete picture of all deps. That eliminates the need for at least
-		// some checks.
-
-		out.BasicHeader()
-
-		logger.Println("Checking upstream projects:")
-
-		// BasicStatus channel to collect all the BasicStatus.
-		bsCh := make(chan *BasicStatus, len(slp))
-
-		// Error channels to collect different errors.
-		errListPkgCh := make(chan error, len(slp))
-		errListVerCh := make(chan error, len(slp))
-
-		var wg sync.WaitGroup
-
-		for i, proj := range slp {
-			wg.Add(1)
-			logger.Printf("(%d/%d) %s\n", i+1, len(slp), proj.Ident().ProjectRoot)
-
-			go func(proj gps.LockedProject) {
-				bs := BasicStatus{
-					ProjectRoot:  string(proj.Ident().ProjectRoot),
-					PackageCount: len(proj.Packages()),
-				}
-
-				// Get children only for specific outputers
-				// in order to avoid slower status process.
-				switch out.(type) {
-				case *dotOutput:
-					ptr, err := sm.ListPackages(proj.Ident(), proj.Version())
-
-					if err != nil {
-						bs.hasError = true
-						errListPkgCh <- err
-					}
-
-					prm, _ := ptr.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
-					bs.Children = prm.FlattenFn(paths.IsStandardImportPath)
-				}
-
-				// Split apart the version from the lock into its constituent parts.
-				switch tv := proj.Version().(type) {
-				case gps.UnpairedVersion:
-					bs.Version = tv
-				case gps.Revision:
-					bs.Revision = tv
-				case gps.PairedVersion:
-					bs.Version = tv.Unpair()
-					bs.Revision = tv.Revision()
-				}
-
-				// Check if the manifest has an override for this project. If so,
-				// set that as the constraint.
-				if pp, has := p.Manifest.Ovr[proj.Ident().ProjectRoot]; has && pp.Constraint != nil {
-					bs.hasOverride = true
-					bs.Constraint = pp.Constraint
-				} else {
-					bs.Constraint = gps.Any()
-					for _, c := range cm[bs.ProjectRoot] {
-						bs.Constraint = c.Intersect(bs.Constraint)
-					}
-				}
-
-				// Only if we have a non-rev and non-plain version do/can we display
-				// anything wrt the version's updateability.
-				if bs.Version != nil && bs.Version.Type() != gps.IsVersion {
-					c, has := p.Manifest.Constraints[proj.Ident().ProjectRoot]
-					if !has {
-						c.Constraint = gps.Any()
-					}
-					// TODO: This constraint is only the constraint imposed by the
-					// current project, not by any transitive deps. As a result,
-					// transitive project deps will always show "any" here.
-					bs.Constraint = c.Constraint
-
-					vl, err := sm.ListVersions(proj.Ident())
-					if err == nil {
-						gps.SortPairedForUpgrade(vl)
-
-						for _, v := range vl {
-							// Because we've sorted the version list for
-							// upgrade, the first version we encounter that
-							// matches our constraint will be what we want.
-							if c.Constraint.Matches(v) {
-								bs.Latest = v.Revision()
-								break
-							}
-						}
-					} else {
-						// Failed to fetch version list (could happen due to
-						// network issue).
-						bs.hasError = true
-						errListVerCh <- err
-					}
-				}
-
-				bsCh <- &bs
-
-				wg.Done()
-			}(proj)
-		}
-
-		wg.Wait()
-		close(bsCh)
-		close(errListPkgCh)
-		close(errListVerCh)
-
-		// Newline after printing the status progress output.
-		logger.Println()
-
-		// List Packages errors. This would happen only for dot output.
-		if len(errListPkgCh) > 0 {
-			err = errFailedListPkg
-			if ctx.Verbose {
-				for err := range errListPkgCh {
-					ctx.Err.Println(err.Error())
-				}
-				ctx.Err.Println()
-			}
-		}
-
-		// List Version errors.
-		if len(errListVerCh) > 0 {
-			if err == nil {
-				err = errFailedUpdate
-			} else {
-				err = errMultipleFailures
-			}
-
-			// Count ListVersions error because we get partial results when
-			// this happens.
-			errCount = len(errListVerCh)
-			if ctx.Verbose {
-				for err := range errListVerCh {
-					ctx.Err.Println(err.Error())
-				}
-				ctx.Err.Println()
-			}
-		}
-
-		// A map of ProjectRoot and *BasicStatus. This is used in maintain the
-		// order of BasicStatus in output by collecting all the BasicStatus and
-		// then using them in order.
-		bsMap := make(map[string]*BasicStatus)
-		for bs := range bsCh {
-			bsMap[bs.ProjectRoot] = bs
-		}
-
-		// Use the collected BasicStatus in outputter.
-		for _, proj := range slp {
-			out.BasicLine(bsMap[string(proj.Ident().ProjectRoot)])
-		}
-
-		out.BasicFooter()
-
-		return false, errCount, err
-	}
-
-	// Hash digest mismatch may indicate that some deps are no longer
-	// needed, some are missing, or that some constraints or source
-	// locations have changed.
-	//
-	// It's possible for digests to not match, but still have a correct
-	// lock.
-	rm, _ := ptree.ToReachMap(true, true, false, p.Manifest.IgnoredPackages())
-
-	external := rm.FlattenFn(paths.IsStandardImportPath)
-	roots := make(map[gps.ProjectRoot][]string, len(external))
-
-	type fail struct {
-		ex  string
-		err error
-	}
-	var errs []fail
-	for _, e := range external {
-		root, err := sm.DeduceProjectRoot(e)
-		if err != nil {
-			errs = append(errs, fail{
-				ex:  e,
-				err: err,
-			})
-			continue
-		}
-
-		roots[root] = append(roots[root], e)
-	}
-
-	if len(errs) != 0 {
-		// TODO this is just a fix quick so staticcheck doesn't complain.
-		// Visually reconciling failure to deduce project roots with the rest of
-		// the mismatch output is a larger problem.
-		ctx.Err.Printf("Failed to deduce project roots for import paths:\n")
-		for _, fail := range errs {
-			ctx.Err.Printf("\t%s: %s\n", fail.ex, fail.err.Error())
-		}
-
-		return false, 0, errors.New("address issues with undeducible import paths to get more status information")
-	}
-
-	out.MissingHeader()
-
-outer:
-	for root, pkgs := range roots {
-		// TODO also handle the case where the project is present, but there
-		// are items missing from just the package list
-		for _, lp := range slp {
-			if lp.Ident().ProjectRoot == root {
-				continue outer
-			}
-		}
-
-		hasMissingPkgs = true
-		out.MissingLine(&MissingStatus{ProjectRoot: string(root), MissingPackages: pkgs})
-	}
-	out.MissingFooter()
-
-	// We are here because of an input-digest mismatch. Return error.
-	return hasMissingPkgs, 0, errInputDigestMismatch
-}
-
-func formatVersion(v gps.Version) string {
-	if v == nil {
-		return ""
-	}
-	switch v.Type() {
-	case gps.IsBranch:
-		return "branch " + v.String()
-	case gps.IsRevision:
-		r := v.String()
-		if len(r) > 7 {
-			r = r[:7]
-		}
-		return r
-	}
-	return v.String()
-}
-
-func collectConstraints(ptree pkgtree.PackageTree, p *dep.Project, sm gps.SourceManager) map[string][]gps.Constraint {
-	// TODO
-	return map[string][]gps.Constraint{}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/status_test.go b/installer/vendor/github.com/golang/dep/cmd/dep/status_test.go
deleted file mode 100644
index 151912a18c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/status_test.go
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"testing"
-	"text/tabwriter"
-
-	"strings"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-)
-
-func TestStatusFormatVersion(t *testing.T) {
-	t.Parallel()
-
-	tests := map[gps.Version]string{
-		nil: "",
-		gps.NewBranch("master"):        "branch master",
-		gps.NewVersion("1.0.0"):        "1.0.0",
-		gps.Revision("flooboofoobooo"): "flooboo",
-	}
-	for version, expected := range tests {
-		str := formatVersion(version)
-		if str != expected {
-			t.Fatalf("expected '%v', got '%v'", expected, str)
-		}
-	}
-}
-
-func TestBasicLine(t *testing.T) {
-	project := dep.Project{}
-	aSemverConstraint, _ := gps.NewSemverConstraint("1.2.3")
-
-	tests := []struct {
-		name            string
-		status          BasicStatus
-		wantDotStatus   []string
-		wantJSONStatus  []string
-		wantTableStatus []string
-	}{
-		{
-			name: "BasicStatus with ProjectRoot only",
-			status: BasicStatus{
-				ProjectRoot: "github.com/foo/bar",
-			},
-			wantDotStatus:   []string{`[label="github.com/foo/bar"];`},
-			wantJSONStatus:  []string{`"Version":""`, `"Revision":""`},
-			wantTableStatus: []string{`github.com/foo/bar                                         0`},
-		},
-		{
-			name: "BasicStatus with Revision",
-			status: BasicStatus{
-				ProjectRoot: "github.com/foo/bar",
-				Revision:    gps.Revision("flooboofoobooo"),
-			},
-			wantDotStatus:   []string{`[label="github.com/foo/bar\nflooboo"];`},
-			wantJSONStatus:  []string{`"Version":""`, `"Revision":"flooboofoobooo"`, `"Constraint":""`},
-			wantTableStatus: []string{`github.com/foo/bar                       flooboo           0`},
-		},
-		{
-			name: "BasicStatus with Version and Revision",
-			status: BasicStatus{
-				ProjectRoot: "github.com/foo/bar",
-				Version:     gps.NewVersion("1.0.0"),
-				Revision:    gps.Revision("flooboofoobooo"),
-			},
-			wantDotStatus:   []string{`[label="github.com/foo/bar\n1.0.0"];`},
-			wantJSONStatus:  []string{`"Version":"1.0.0"`, `"Revision":"flooboofoobooo"`, `"Constraint":""`},
-			wantTableStatus: []string{`github.com/foo/bar              1.0.0    flooboo           0`},
-		},
-		{
-			name: "BasicStatus with Constraint, Version and Revision",
-			status: BasicStatus{
-				ProjectRoot: "github.com/foo/bar",
-				Constraint:  aSemverConstraint,
-				Version:     gps.NewVersion("1.0.0"),
-				Revision:    gps.Revision("revxyz"),
-			},
-			wantDotStatus:   []string{`[label="github.com/foo/bar\n1.0.0"];`},
-			wantJSONStatus:  []string{`"Revision":"revxyz"`, `"Constraint":"1.2.3"`, `"Version":"1.0.0"`},
-			wantTableStatus: []string{`github.com/foo/bar  1.2.3       1.0.0    revxyz            0`},
-		},
-		{
-			name: "BasicStatus with update error",
-			status: BasicStatus{
-				ProjectRoot: "github.com/foo/bar",
-				hasError:    true,
-			},
-			wantDotStatus:   []string{`[label="github.com/foo/bar"];`},
-			wantJSONStatus:  []string{`"Version":""`, `"Revision":""`, `"Latest":"unknown"`},
-			wantTableStatus: []string{`github.com/foo/bar                                 unknown  0`},
-		},
-	}
-
-	for _, test := range tests {
-		t.Run(test.name, func(t *testing.T) {
-			var buf bytes.Buffer
-
-			dotout := &dotOutput{
-				p: &project,
-				w: &buf,
-			}
-			dotout.BasicHeader()
-			dotout.BasicLine(&test.status)
-			dotout.BasicFooter()
-
-			for _, wantStatus := range test.wantDotStatus {
-				if ok := strings.Contains(buf.String(), wantStatus); !ok {
-					t.Errorf("Did not find expected node status: \n\t(GOT) %v \n\t(WNT) %v", buf.String(), wantStatus)
-				}
-			}
-
-			buf.Reset()
-
-			jsonout := &jsonOutput{w: &buf}
-
-			jsonout.BasicHeader()
-			jsonout.BasicLine(&test.status)
-			jsonout.BasicFooter()
-
-			for _, wantStatus := range test.wantJSONStatus {
-				if ok := strings.Contains(buf.String(), wantStatus); !ok {
-					t.Errorf("Did not find expected JSON status: \n\t(GOT) %v \n\t(WNT) %v", buf.String(), wantStatus)
-				}
-			}
-
-			buf.Reset()
-
-			tabw := tabwriter.NewWriter(&buf, 0, 4, 2, ' ', 0)
-
-			tableout := &tableOutput{w: tabw}
-
-			tableout.BasicHeader()
-			tableout.BasicLine(&test.status)
-			tableout.BasicFooter()
-
-			for _, wantStatus := range test.wantTableStatus {
-				if ok := strings.Contains(buf.String(), wantStatus); !ok {
-					t.Errorf("Did not find expected Table status: \n\t(GOT) %v \n\t(WNT) %v", buf.String(), wantStatus)
-				}
-			}
-		})
-	}
-}
-
-func TestBasicStatusGetConsolidatedConstraint(t *testing.T) {
-	aSemverConstraint, _ := gps.NewSemverConstraint("1.2.1")
-
-	testCases := []struct {
-		name           string
-		basicStatus    BasicStatus
-		wantConstraint string
-	}{
-		{
-			name:           "empty BasicStatus",
-			basicStatus:    BasicStatus{},
-			wantConstraint: "",
-		},
-		{
-			name: "BasicStatus with Any Constraint",
-			basicStatus: BasicStatus{
-				Constraint: gps.Any(),
-			},
-			wantConstraint: "*",
-		},
-		{
-			name: "BasicStatus with Semver Constraint",
-			basicStatus: BasicStatus{
-				Constraint: aSemverConstraint,
-			},
-			wantConstraint: "1.2.1",
-		},
-		{
-			name: "BasicStatus with Override",
-			basicStatus: BasicStatus{
-				Constraint:  aSemverConstraint,
-				hasOverride: true,
-			},
-			wantConstraint: "1.2.1 (override)",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			if tc.basicStatus.getConsolidatedConstraint() != tc.wantConstraint {
-				t.Errorf("unexpected consolidated constraint: \n\t(GOT) %v \n\t(WNT) %v", tc.basicStatus.getConsolidatedConstraint(), tc.wantConstraint)
-			}
-		})
-	}
-}
-
-func TestBasicStatusGetConsolidatedVersion(t *testing.T) {
-	testCases := []struct {
-		name        string
-		basicStatus BasicStatus
-		wantVersion string
-	}{
-		{
-			name:        "empty BasicStatus",
-			basicStatus: BasicStatus{},
-			wantVersion: "",
-		},
-		{
-			name: "BasicStatus with Version and Revision",
-			basicStatus: BasicStatus{
-				Version:  gps.NewVersion("1.0.0"),
-				Revision: gps.Revision("revxyz"),
-			},
-			wantVersion: "1.0.0",
-		},
-		{
-			name: "BasicStatus with only Revision",
-			basicStatus: BasicStatus{
-				Revision: gps.Revision("revxyz"),
-			},
-			wantVersion: "revxyz",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			if tc.basicStatus.getConsolidatedVersion() != tc.wantVersion {
-				t.Errorf("unexpected consolidated version: \n\t(GOT) %v \n\t(WNT) %v", tc.basicStatus.getConsolidatedVersion(), tc.wantVersion)
-			}
-		})
-	}
-}
-
-func TestBasicStatusGetConsolidatedLatest(t *testing.T) {
-	testCases := []struct {
-		name        string
-		basicStatus BasicStatus
-		revSize     uint8
-		wantLatest  string
-	}{
-		{
-			name:        "empty BasicStatus",
-			basicStatus: BasicStatus{},
-			revSize:     shortRev,
-			wantLatest:  "",
-		},
-		{
-			name: "nil latest",
-			basicStatus: BasicStatus{
-				Latest: nil,
-			},
-			revSize:    shortRev,
-			wantLatest: "",
-		},
-		{
-			name: "with error",
-			basicStatus: BasicStatus{
-				hasError: true,
-			},
-			revSize:    shortRev,
-			wantLatest: "unknown",
-		},
-		{
-			name: "short latest",
-			basicStatus: BasicStatus{
-				Latest: gps.Revision("adummylonglongrevision"),
-			},
-			revSize:    shortRev,
-			wantLatest: "adummyl",
-		},
-		{
-			name: "long latest",
-			basicStatus: BasicStatus{
-				Latest: gps.Revision("adummylonglongrevision"),
-			},
-			revSize:    longRev,
-			wantLatest: "adummylonglongrevision",
-		},
-	}
-
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			gotRev := tc.basicStatus.getConsolidatedLatest(tc.revSize)
-			if gotRev != tc.wantLatest {
-				t.Errorf("unexpected consolidated latest: \n\t(GOT) %v \n\t(WNT) %v", gotRev, tc.wantLatest)
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case1.dot b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case1.dot
deleted file mode 100644
index 3de927271d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case1.dot
+++ /dev/null
@@ -1,9 +0,0 @@
-digraph {
-	node [shape=box];
-	4106060478 [label="project"];
-	2851307223 [label="foo\nmaster"];
-	1991736602 [label="bar\ndev"];
-	4106060478 -> 2851307223;
-	4106060478 -> 1991736602;
-	2851307223 -> 1991736602;
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case2.dot b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case2.dot
deleted file mode 100644
index df2d6a4792..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/case2.dot
+++ /dev/null
@@ -1,4 +0,0 @@
-digraph {
-	node [shape=box];
-	4106060478 [label="project"];
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/empty.dot b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/empty.dot
deleted file mode 100644
index 3eabc972dc..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/graphviz/empty.dot
+++ /dev/null
@@ -1,3 +0,0 @@
-digraph {
-	node [shape=box];
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/README.md b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/README.md
deleted file mode 100644
index 379caaa2db..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# golang/dep Integration Tests
-
-The `dep` integration tests use a consistent directory structure under `testdata`
-to set up the initial project state, run `dep` commands, then check against an
-expected final state to see if the test passes.
-
-The directory structure is as follows:
-
-    testdata/
-        harness_tests/
-            category1/
-                subcategory1/
-                    case1/
-                        testcase.json
-                        stdout.txt
-                        initial/
-                            file1.go
-                            Gopkg.toml
-                            ...
-                        final/
-                            Gopkg.toml
-                            Gopkg.lock
-                    case2/
-                    ...
-
-The test code itself simply walks down the directory tree, looking for
-`testcase.json` files.  These files can be as many levels down the tree as
-desired.  The test name will consist of the directory path from `testdata` to
-the test case directory itself.  In the above example, the test name would be
-`category1/subcategory1/case1`, and could be singled out with the `-run` option
-of `go test` (i.e.
-`go test github.com/golang/dep/cmd/dep -run Integration/category1/subcategory1/case1`).
-New tests can be added simply by adding a new directory with the json file to
-the `testdata` tree.  There is no need for code modification - the new test
-will be included automatically.
-
-The json file needs to be accompanied by `initial` and `final` directories. The
-`initial` is copied verbatim into the test project before the `dep` commands are
-run, and the `manifest` and `lock` files in `final`, if present, are used to
-compare against the test project results after the commands. The `stdout.txt` file
-is optional, and if present will be compared with command output.
-
-The `testcase.json` file has the following format:
-
-    {
-      "commands": [
-        ["init"],
-        ["ensure", "github.com/sdboyer/deptesttres"]
-      ],
-      "gopath-initial": {
-        "github.com/sdboyer/deptest": "v0.8.0",
-        "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"
-      },
-      "vendor-initial": {
-        "github.com/sdboyer/deptesttres": "v2.1.0",
-        "github.com/sdboyer/deptestquatro": "cf596baa11ea047ddf8797287451d36b861bab45"
-      },
-      "vendor-final": [
-        "github.com/sdboyer/deptest",
-        "github.com/sdboyer/deptestdos",
-        "github.com/sdboyer/deptesttres",
-        "github.com/sdboyer/deptestquatro"
-      ],
-      "error-expected": "something went wrong"
-    }
-
-All of the categories are optional - if the `imports` list for a test is empty,
-for example, it can be completely left out.
-
-The test procedure is as follows:
-
-1. Create a unique temporary directory (TMPDIR) as the test run's `GOPATH`
-2. Create `$TMPDIR/src/github.com/golang/notexist` as the current project
-3. Copy the contents of `initial` input directory to the project
-4. Fetch the repos and versions in `gopath-initial` into `$TMPDIR/src` directory
-5. Fetch the repos and versions in `vendor-initial` to the project's `vendor` directory
-6. Run `commands` on the project, in declaration order
-7. Ensure that, if any errors are raised, it is only by the final command and their string output matches `error-expected`
-8. Ensure that, if a stdout.txt file is present, the command's output matches (excluding trailing whitespace).
-9. Check the resulting files against those in the `final` input directory
-10. Check the `vendor` directory for the projects listed under `vendor-final`
-11. Check that there were no changes to `src` listings
-12. Clean up
-
-Note that for the remote fetches, only git repos are currently supported.
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.lock
deleted file mode 100644
index eddb25596a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "645b5b52e1bfb9e3db1cefde758485e009edfe5bad611b490582d94467f9c1b0"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.toml
deleted file mode 100644
index 7b51259127..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "0.8.1"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/testcase.json
deleted file mode 100644
index 182b683c41..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double-spec/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/sdboyer/deptest", "github.com/sdboyer/deptest@v0.8.1"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.lock
deleted file mode 100644
index d2b0ea3287..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = [".","subp"]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "432bc141db9511df4e1b5754c6c4d8cf4dd8b4f8d5a13fd7d189c17c14e000b7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.toml
deleted file mode 100644
index 13eaf7edb5..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/initial/main.go
deleted file mode 100644
index 84f99b6894..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	type a deptest.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/testcase.json
deleted file mode 100644
index 2e5161d01e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-double/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/sdboyer/deptesttres", "github.com/sdboyer/deptesttres/subp"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.lock
deleted file mode 100644
index eddb25596a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "645b5b52e1bfb9e3db1cefde758485e009edfe5bad611b490582d94467f9c1b0"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.toml
deleted file mode 100644
index 7b51259127..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "0.8.1"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/testcase.json
deleted file mode 100644
index 9f6fa3f3f1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new-spec/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/sdboyer/deptest@v0.8.1"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.lock
deleted file mode 100644
index 5531a3e128..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "8f0b74fd1169808bd0e31dd7ad6c601c7b8f7ef25eec9e8a45e72b8a384ebb5c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.toml
deleted file mode 100644
index caf0167782..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/testcase.json
deleted file mode 100644
index 3a8d221f93..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/all-new/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/sdboyer/deptest"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.lock
deleted file mode 100644
index a9d0374ee3..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "86240895e0ee5788e7e8bb56e0d77afd58009a491b69f6835e546db9e5dacfcd"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.toml
deleted file mode 100644
index 57787fb45e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/Gopkg.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/final/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.lock
deleted file mode 100644
index 2d6f4c0278..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "9a7bd6944c26792ab2e97fed1227cc402f0cc00465016836efbf04239596dd9f"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/main.go
deleted file mode 100644
index 7ad40aca5a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/initial/main.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/stdout.txt
deleted file mode 100644
index c0d7219848..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/stdout.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Warning: Gopkg.lock is out of sync with Gopkg.toml or the project's imports.
-Fetching sources...
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/testcase.json
deleted file mode 100644
index eb95e6f16a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/desync/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/sdboyer/deptesttres@master"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptestdos",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.lock
deleted file mode 100644
index 66ef021c68..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "342afd8c8a616d084eb7b67bf3a891710eca3ce5abc3cf60af0dae4ccfdcd001"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.toml
deleted file mode 100644
index bbc8cc1688..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/testcase.json
deleted file mode 100644
index 52cb46b132..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/double-diff-spec/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/sdboyer/deptest@0.8.1", "github.com/sdboyer/deptest@1.0.0"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptesttres"
-  ],
-  "error-expected": "can only specify rules once per project being added; rules were given at least twice for github.com/sdboyer/deptest"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.lock
deleted file mode 100644
index 66ef021c68..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "342afd8c8a616d084eb7b67bf3a891710eca3ce5abc3cf60af0dae4ccfdcd001"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.toml
deleted file mode 100644
index 598accd86c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/final/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptesttres"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.lock
deleted file mode 100644
index 66ef021c68..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "342afd8c8a616d084eb7b67bf3a891710eca3ce5abc3cf60af0dae4ccfdcd001"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.toml
deleted file mode 100644
index 598accd86c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptesttres"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/testcase.json
deleted file mode 100644
index a0d78d31b6..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists-manifest/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/sdboyer/deptest@1.0.0"]
-  ],
-  "error-expected": "Gopkg.toml already contains rules for github.com/sdboyer/deptest, cannot specify a version constraint"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/testcase.json
deleted file mode 100644
index e4ec92f9d3..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/exists/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/sdboyer/deptest"]
-  ],
-  "error-expected": "nothing to -add, github.com/sdboyer/deptest is already in Gopkg.toml and the project's direct imports or required list"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.lock
deleted file mode 100644
index 41dd2d4190..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "9b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/final/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.lock
deleted file mode 100644
index 41dd2d4190..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "9b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/testcase.json
deleted file mode 100644
index b8b36480f6..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/noarg/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add"]
-  ],
-  "error-expected": "must specify at least one project or package to -add"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/testcase.json
deleted file mode 100644
index 86727bb25a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case1/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/golang/notexist"]
-  ],
-  "error-expected": "cannot add current project to itself"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/final/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/final/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/initial/main.go
deleted file mode 100644
index 7a00113b17..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/initial/main.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-func main() {}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/testcase.json
deleted file mode 100644
index 490aab5e48..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/errs/self-add/case2/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"],
-    ["ensure", "-add", "github.com/golang/notexist"]
-  ],
-  "error-expected": "cannot add current project to itself"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.lock
deleted file mode 100644
index 66ef021c68..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "342afd8c8a616d084eb7b67bf3a891710eca3ce5abc3cf60af0dae4ccfdcd001"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.toml
deleted file mode 100644
index bbc8cc1688..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/testcase.json
deleted file mode 100644
index 69755349e4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-imports/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/sdboyer/deptesttres@master"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.lock
deleted file mode 100644
index e235bce702..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "d1fe1d4f4dd98b75908b524bd73d43a4b9e3ce0b9522ea6ce9d6c9ea15190c1d"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.toml
deleted file mode 100644
index 598accd86c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/final/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptesttres"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.lock
deleted file mode 100644
index 66ef021c68..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptesttres"
-  packages = ["."]
-  revision = "54aaeb0023e1f3dcf5f98f31dd8c565457945a12"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "342afd8c8a616d084eb7b67bf3a891710eca3ce5abc3cf60af0dae4ccfdcd001"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.toml
deleted file mode 100644
index 598accd86c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptesttres"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/main.go
deleted file mode 100644
index 8049e4ec2c..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptesttres"
-)
-
-func main() {
-	type a deptesttres.Bar
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/testcase.json
deleted file mode 100644
index 6a19d7c2b1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/add/exists-manifest-constraint/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-add", "github.com/sdboyer/deptest"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptesttres"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/final/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/testcase.json
deleted file mode 100644
index 6dc9735c09..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/lockless-vendoronly/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-vendor-only"]
-  ],
-  "error-expected": "no Gopkg.lock exists from which to populate vendor/"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/testcase.json
deleted file mode 100644
index f194308fe2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/errs/specargs/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "foobar.com/baz"]
-  ],
-  "error-expected": "dep ensure only takes spec arguments with -add or -update"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/testcase.json
deleted file mode 100644
index 21daf3e990..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-dry/testcase.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-dry-run"]
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/testcase.json
deleted file mode 100644
index f3bdbe7e90..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor-dry/testcase.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-no-vendor", "-dry-run"]
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/testcase.json
deleted file mode 100644
index 7692eecf88..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq-novendor/testcase.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-no-vendor"]
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/testcase.json
deleted file mode 100644
index 19da527090..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hasheq/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["ensure"]
-  ],
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/testcase.json
deleted file mode 100644
index 2e54069437..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-novendor-dry/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-no-vendor", "-dry-run"]
-  ],
-  "error-expected": "Gopkg.lock was not up to date"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/testcase.json
deleted file mode 100644
index 8a28875978..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/hashneq-vendoronly/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-vendor-only"]
-  ],
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.lock
deleted file mode 100644
index 11cb12c378..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.lock
+++ /dev/null
@@ -1,16 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  # manually modified hash digest, it will not match any known inputs
-  inputs-digest = "94b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/testcase.json
deleted file mode 100644
index 8a28875978..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/default/nocode-vendoronly/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-vendor-only"]
-  ],
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json
deleted file mode 100644
index 0cf0fd903b..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case1/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["init", "-skip-tools", "-no-examples"],
-    ["ensure", "-update"]
-  ],
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock
deleted file mode 100644
index a783451f80..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "e7725ea56516a42a641aaaf5d48754258d9f3c59949cb8a0e8a21b1ab6e07179"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/testcase.json
deleted file mode 100644
index 729de9d0f4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case2/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["ensure"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/README.md b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/README.md
deleted file mode 100644
index 34b1e0c1c2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/README.md
+++ /dev/null
@@ -1,2 +0,0 @@
-Validate that packages imported in an ignored package are not
-included in the manifest or lock.
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.lock
deleted file mode 100644
index d2153e3747..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "e5c16e09ed6f0a1a2b3cf472c34b7fd50861dd070e81d5e623f72e8173f0c065"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.toml
deleted file mode 100644
index d77e367c70..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/final/Gopkg.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-ignored = ["github.com/sdboyer/deptestdos"]
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.lock
deleted file mode 100644
index 5bfebb27d0..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "8114537cd7d93f5eacebdea7dfec0c3c10919d7f952d056e2a3142fee1c33aee"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.toml
deleted file mode 100644
index d77e367c70..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/Gopkg.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-ignored = ["github.com/sdboyer/deptestdos"]
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/samples/samples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/samples/samples.go
deleted file mode 100644
index 822fc93539..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/initial/samples/samples.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package samples
-
-import _ "github.com/sdboyer/deptestdos"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/testcase.json
deleted file mode 100644
index 729de9d0f4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/empty/case3/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["ensure"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json
deleted file mode 100644
index fede436ff2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case1/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools"],
-    ["ensure", "-update"]
-  ],
-  "error-expected": "no dirs contained any Go code",
-  "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/bar/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/bar/bar.go
deleted file mode 100644
index b007341e34..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/bar/bar.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/baz/.gitignore b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/initial/baz/.gitignore
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/testcase.json
deleted file mode 100644
index 5353ea6b34..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-errors/case2/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-    "commands": [
-        ["ensure"]
-    ],
-    "error-expected": "found 1 errors",
-    "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.lock
deleted file mode 100644
index 1e637dd503..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "5210e61a67f6e64dabb1eb8f28df2dbeeedfca1588c102067a6ec8a35e0b15f9"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.toml
deleted file mode 100644
index 5e109dd48f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/final/Gopkg.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-ignored = ["github.com/golang/notexist/samples*"]
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.toml
deleted file mode 100644
index 5e109dd48f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/Gopkg.toml
+++ /dev/null
@@ -1,5 +0,0 @@
-ignored = ["github.com/golang/notexist/samples*"]
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/main.go
deleted file mode 100644
index e23fcf34c5..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/samples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/samples.go
deleted file mode 100644
index d07de170f7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/samples.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package samples
-
-import _ "github.com/sdboyer/deptestdos"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/subsamples/subsamples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/subsamples/subsamples.go
deleted file mode 100644
index 5136538e6d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/initial/samples/subsamples/subsamples.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package subsamples
-
-import _ "github.com/sdboyer/dep-test"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/stdout.txt
deleted file mode 100644
index 74542e41e5..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/stdout.txt
+++ /dev/null
@@ -1,11 +0,0 @@
--CONSTRAINTS-
-github.com/sdboyer/deptest
-b-master
--IMPORTS/REQS-
-github.com/sdboyer/deptest
--IGNORES-
--OVERRIDES-
--ANALYZER-
-dep
-1
-
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/testcase.json
deleted file mode 100644
index 5641e85616..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-ignore/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["hash-inputs"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.lock
deleted file mode 100644
index 53e42dcc48..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "b02b7a80e20404724ba5dbffab28e772017b03800916327f58bff0da86071b6a"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.toml
deleted file mode 100644
index f54b63d573..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/final/Gopkg.toml
+++ /dev/null
@@ -1 +0,0 @@
-ignored = ["github.com/sdboyer/deptest*", "github.com/golang/notexist/samples*"]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.toml
deleted file mode 100644
index f54b63d573..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/Gopkg.toml
+++ /dev/null
@@ -1 +0,0 @@
-ignored = ["github.com/sdboyer/deptest*", "github.com/golang/notexist/samples*"]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/main.go
deleted file mode 100644
index e23fcf34c5..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/samples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/samples.go
deleted file mode 100644
index d07de170f7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/samples.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package samples
-
-import _ "github.com/sdboyer/deptestdos"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/subsamples/subsamples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/subsamples/subsamples.go
deleted file mode 100644
index 5136538e6d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/initial/samples/subsamples/subsamples.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package subsamples
-
-import _ "github.com/sdboyer/dep-test"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/stdout.txt
deleted file mode 100644
index a273de0e56..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/stdout.txt
+++ /dev/null
@@ -1,9 +0,0 @@
--CONSTRAINTS-
--IMPORTS/REQS-
--IGNORES-
-github.com/sdboyer/deptest*
--OVERRIDES-
--ANALYZER-
-dep
-1
-
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/testcase.json
deleted file mode 100644
index 4f16d1c611..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/pkg-ignored/wildcard-other-root/testcase.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["hash-inputs"]
-  ],
-  "error-expected": "",
-  "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock
deleted file mode 100644
index 1a7b1983f3..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock
deleted file mode 100644
index 7265a5552e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/testcase.json
deleted file mode 100644
index 07bc635269..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/case1/testcase.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update", "github.com/sdboyer/deptest"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.lock
deleted file mode 100644
index 1a7b1983f3..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/final/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.lock
deleted file mode 100644
index 41dd2d4190..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "9b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.toml
deleted file mode 100644
index 532da96a0d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "~0.8.0"
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/stdout.txt
deleted file mode 100644
index 9adb1974eb..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-Warning: Gopkg.lock is out of sync with Gopkg.toml or the project's imports.
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/testcase.json
deleted file mode 100644
index 81a7c2320d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/desync/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update"]
-  ],
-  "vendor-final": [
-      "github.com/sdboyer/deptest",
-      "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/final/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/main.go
deleted file mode 100644
index 1fe0d19d6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptest"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/testcase.json
deleted file mode 100644
index a69d08d0f6..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/lockless/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update"]
-  ],
-  "error-expected": "-update works by updating the versions recorded in Gopkg.lock, but Gopkg.lock does not exist"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/testcase.json
deleted file mode 100644
index 4b4b4fe059..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/nonroot-arg/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update", "github.com/sdboyer/deptest/subpkg"]
-  ],
-  "error-expected": "github.com/sdboyer/deptest/subpkg is not a project root, try github.com/sdboyer/deptest instead"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/testcase.json
deleted file mode 100644
index 0fda36edd2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/not-in-lock/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update", "github.com/sdboyer/deptesttres"]
-  ],
-  "error-expected": "github.com/sdboyer/deptesttres is not present in Gopkg.lock, cannot -update it"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/testcase.json
deleted file mode 100644
index 7332bc493d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-constraint/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update", "github.com/sdboyer/deptest:github.com/other/deptest"]
-  ],
-  "error-expected": "cannot specify alternate sources on -update (github.com/other/deptest)"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.toml
deleted file mode 100644
index 51ff69b358..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/main.go
deleted file mode 100644
index c5b8da51da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/initial/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-)
-
-func main() {
-	_ := deptest.Map["yo yo!"]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/testcase.json
deleted file mode 100644
index 27c8a5fc96..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/ensure/update/errs/spec-with-source/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["ensure", "-update", "github.com/sdboyer/deptest@1.0.0"]
-  ],
-  "error-expected": "version constraint ^1.0.0 passed for github.com/sdboyer/deptest, but -update follows constraints declared in"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock
deleted file mode 100644
index 15b4e08bac..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "a0196baa11ea047dd65037287451d36b861b00ea"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml
deleted file mode 100644
index bbd0a05ba9..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/foo/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/foo/bar.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/foo/bar.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/initial/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/testcase.json
deleted file mode 100644
index ad5663adf4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case1/testcase.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools", "-gopath"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "v0.8.0",
-    "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock
deleted file mode 100644
index 608d5a8d97..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ced51326ad990b11098d8076d0f7d72d89eee1ba6e8dacc7bc73be05cddac438"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml
deleted file mode 100644
index bea60bf6e6..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "0.8.0"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/foo/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/foo/bar.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/foo/bar.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/initial/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/testcase.json
deleted file mode 100644
index df64687209..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case2/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools", "-gopath"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "v0.8.0"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock
deleted file mode 100644
index c4f18284da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.lock
+++ /dev/null
@@ -1,20 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "a0196baa11ea047dd65037287451d36b861b00ea"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "af9a783a5430dabcaaf44683c09e2b729e1c0d61f13bfdf6677c4fd0b41387ca"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml
deleted file mode 100644
index a90dd2dadd..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/foo/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/foo/bar.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/foo/bar.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/initial/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/testcase.json
deleted file mode 100644
index 04cfb832e7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case3/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools", "-gopath"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.lock
deleted file mode 100644
index e076e162c8..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "a6ba2237d28d125b55fc6c86e94e33363f1dfd880d471118d36d7587398c30b4"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.toml
deleted file mode 100644
index d57fc4dad0..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/foo/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/foo/bar.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/foo/bar.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/initial/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/testcase.json
deleted file mode 100644
index 13cba35aeb..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/case4/testcase.json
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "gopath-initial": {
-    "github.com/sdboyer/deptestdos": "a0196baa11ea047dd65037287451d36b861b00ea"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/README.md b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/README.md
deleted file mode 100644
index 899680ac00..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Import glide config at project root.
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock
deleted file mode 100644
index 74aad6763b..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/carolynvs/deptest-subpkg"
-  packages = ["subby"]
-  revision = "6c41d90f78bb1015696a2ad591debfa8971512d5"
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "7efcfca7f138c3579d22b4ef788294649c734ea630124fb8fbb47acf8770b086"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.toml
deleted file mode 100644
index ba8a4248b5..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-ignored = ["github.com/golang/notexist/samples","github.com/sdboyer/dep-test"]
-
-[[constraint]]
-  name = "github.com/carolynvs/deptest-subpkg"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock
deleted file mode 100644
index 7a36a4a039..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.lock
+++ /dev/null
@@ -1,14 +0,0 @@
-hash: 16053c82a71f9bd509b05a4523df6bc418aed2083e4b8bd97a870bbc003256f8
-updated: 2017-03-07T17:02:32.214383898-06:00
-imports:
-- name: github.com/sdboyer/deptest
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: ff2948a2ac8f538c4ecd55962e919d1e13e74baf
-- name: github.com/sdboyer/deptestdos
-  version: 5c607206be5decd28e6263ffffdcee067266015e
-- name: github.com/carolynvs/deptest-subpkg/subby
-  version: 6c41d90f78bb1015696a2ad591debfa8971512d5
-testImports:
-- name: github.com/golang/lint
-  version: cb00e5669539f047b2f4c53a421a01b0c8e172c6
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml
deleted file mode 100644
index 64b8b6b620..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/glide.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-package: github.com/golang/notexist
-homepage: http://example.com
-license: MIT
-owners:
-- name: Sam Boyer
-  email: sdboyer@example.com
-  homepage: http://sdboyer.io
-ignore:
-- github.com/sdboyer/dep-test
-excludeDirs:
-- samples
-import:
-- package: github.com/sdboyer/deptest # This is a transitive dep and will be ignored
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: v1.0.0
-- package: github.com/sdboyer/deptestdos
-  version: v2.0.0
-- package: github.com/carolynvs/deptest-subpkg/subby
-testImport:
-- package: github.com/golang/lint
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go
deleted file mode 100644
index 5238b24923..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/main.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	_ "github.com/carolynvs/deptest-subpkg/subby"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/samples/samples.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/samples/samples.go
deleted file mode 100644
index 3e160f22fe..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/initial/samples/samples.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package samples
-
-import dt "github.com/carolynvs/go-dep-test"
-
-func Sample1() int {
-	var x = dt.Thing
-	return x
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json
deleted file mode 100644
index cf0d79080e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case1/testcase.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-gopath"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-    "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e"
-  },
-  "vendor-final": [
-    "github.com/carolynvs/deptest-subpkg",
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/README.md b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/README.md
deleted file mode 100644
index f6e3eaf4fa..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Ignore glide config at root when -skip-tools is specified.
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.lock
deleted file mode 100644
index ac445c05d2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1ed417a0bec57ffe988fae1cba8f3d49994fb893394d61844e0b3c96d69573fe"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.toml
deleted file mode 100644
index aaf78303fa..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.lock
deleted file mode 100644
index 1d29509927..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-hash: 16053c82a71f9bd509b05a4523df6bc418aed2083e4b8bd97a870bbc003256f8
-updated: 2017-03-07T17:02:32.214383898-06:00
-imports:
-- name: github.com/sdboyer/deptest
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: ff2948a2ac8f538c4ecd55962e919d1e13e74baf
-- name: github.com/sdboyer/deptestdos
-  version: 5c607206be5decd28e6263ffffdcee067266015e
-testImports:
-- name: github.com/golang/lint
-  version: cb00e5669539f047b2f4c53a421a01b0c8e172c6
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.yaml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.yaml
deleted file mode 100644
index ee269a398d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/glide.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-package: github.com/golang/notexist
-homepage: http://example.com
-license: MIT
-owners:
-- name: Sam Boyer
-  email: sdboyer@example.com
-  homepage: http://sdboyer.io
-ignore:
-- github.com/sdboyer/dep-test
-excludeDirs:
-- samples
-import:
-- package: github.com/sdboyer/deptest # This is a transitive dep and will be ignored
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: v1.0.0
-- package: github.com/sdboyer/deptestdos
-  version: v2.0.0
-testImport:
-- package: github.com/golang/lint
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/main.go
deleted file mode 100644
index 2b2c7c396e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/initial/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/testcase.json
deleted file mode 100644
index 39c7d874e7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case2/testcase.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools", "-gopath"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-    "github.com/sdboyer/deptestdos": "5c607206be5decd28e6263ffffdcee067266015e"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/README.md b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/README.md
deleted file mode 100644
index f46ccd1949..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/README.md
+++ /dev/null
@@ -1 +0,0 @@
-Import glide config in dependencies.
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.lock
deleted file mode 100644
index 440c282602..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/carolynvs/deptestglide"
-  packages = ["."]
-  revision = "aa7fea6e17ca281c6f210afb93fc3c98ef29a695"
-  version = "v0.1.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[solve-meta]
-  analyzer-name = "dep+import"
-  analyzer-version = 1
-  inputs-digest = "07eddb7ff09071bde95b019911e1fb30d91bddabbb23f4c797c6ce61b58cd7be"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.toml
deleted file mode 100644
index 9b31cba7ce..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/carolynvs/deptestglide"
-  version = "0.1.1"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/initial/main.go
deleted file mode 100644
index 3e509998f7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/initial/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/carolynvs/deptestglide"
-)
-
-func main() {
-	var x = deptestglide.MyFoo
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/testcase.json.ignore b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/testcase.json.ignore
deleted file mode 100644
index e3e5156036..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/glide/case3/testcase.json.ignore
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {},
-  "vendor-final": [
-    "github.com/carolynvs/deptestglide",
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.lock
deleted file mode 100644
index ac445c05d2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1ed417a0bec57ffe988fae1cba8f3d49994fb893394d61844e0b3c96d69573fe"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.toml
deleted file mode 100644
index aaf78303fa..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/Godeps/Godeps.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/Godeps/Godeps.json
deleted file mode 100644
index ee87370e5d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/Godeps/Godeps.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "ImportPath": "github.com/golang/notexist",
-  "GoVersion": "go1.8",
-  "GodepVersion": "vXYZ",
-  "Deps": [
-    {
-      "ImportPath": "github.com/sdboyer/deptest",
-      "Comment": "master",
-      "Rev": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-    },
-    {
-      "ImportPath": "github.com/sdboyer/deptestdos",
-      "Comment": "v2.0.0",
-      "Rev": "5c607206be5decd28e6263ffffdcee067266015e"
-    }
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/main.go
deleted file mode 100644
index 2b2c7c396e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/initial/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/testcase.json
deleted file mode 100644
index 017dc4cd55..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/godep/case1/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.lock
deleted file mode 100644
index ac445c05d2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1ed417a0bec57ffe988fae1cba8f3d49994fb893394d61844e0b3c96d69573fe"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.toml
deleted file mode 100644
index aaf78303fa..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/main.go
deleted file mode 100644
index 2b2c7c396e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/vendor.yml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/vendor.yml
deleted file mode 100644
index c5c933f61f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/initial/vendor.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-vendors:
-- path: github.com/sdboyer/deptest
-  rev: 3f4c3bea144e112a69bbe5d8d01c1b09a544253f
-- path: github.com/sdboyer/deptestdos
-  rev: 5c607206be5decd28e6263ffffdcee067266015e
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/testcase.json
deleted file mode 100644
index 017dc4cd55..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/govend/case1/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock
deleted file mode 100644
index 6b38e621f9..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,28 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  source = "https://github.com/carolynvs/deptest"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[[projects]]
-  branch = "v2"
-  name = "gopkg.in/yaml.v2"
-  packages = ["."]
-  revision = "f7716cbe52baa25d2e9b0d0da546fcf909fc16b4"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "9ee70d58a0bc986cfb1d57a351786e9cf1bfc2ca763ce17f601a6529aebe65d1"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml
deleted file mode 100644
index 4b67f82f25..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  source = "https://github.com/carolynvs/deptest"
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-
-[[constraint]]
-  branch = "v2"
-  name = "gopkg.in/yaml.v2"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go
deleted file mode 100644
index 6d893af2ff..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/initial/main.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-	"gopkg.in/yaml.v2"
-)
-
-func main() {
-	var a deptestdos.Bar
-	var b yaml.MapItem
-	var c deptest.Foo
-	fmt.Println(a, b, c)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json
deleted file mode 100644
index 017dc4cd55..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/gvt/case1/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/initial/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/testcase.json
deleted file mode 100644
index 3958059fbb..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/manifest-exists/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "commands": [
-    ["init"]
-  ],
-  "error-expected": "manifest already exists:",
-  "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.lock
deleted file mode 100644
index f9f6c4c7f8..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.lock
+++ /dev/null
@@ -1,14 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-memo = "af9a783a5430dabcaaf44683c09e2b729e1c0d61f13bfdf6677c4fd0b41387ca"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "a0196baa11ea047dd65037287451d36b861b00ea"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.toml
deleted file mode 100644
index a90dd2dadd..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/final/project_dir/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  branch = "master"
-  name = "github.com/sdboyer/deptest"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/foo/bar.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/foo/bar.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/foo/bar.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/main.go
deleted file mode 100644
index 150e0bd3df..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/initial/project_dir/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/testcase.json
deleted file mode 100644
index 6fa477b508..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/relative_path/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "commands": [
-    ["init", "-skip-tools", "project_dir"]
-  ],
-  "error-expected": "",
-  "init-path": "project_dir"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock
deleted file mode 100644
index c7f497e7a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.lock
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "14b07b05e0f01051b03887ab2bf80b516bc5510ea92f75f76c894b1745d8850c"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.toml
deleted file mode 100644
index e242e02114..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/.foo/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/.foo/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/.foo/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/_foo/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/_foo/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/_foo/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/lib.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/lib.go
deleted file mode 100644
index c1ed69fc65..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/lib.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "github.com/sdboyer/deptest"
-
-func Foo() deptest.Foo {
-	var y deptest.Foo
-
-	return y
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/testdata/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/testdata/main.go
deleted file mode 100644
index 83a4dfcd57..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/initial/testdata/main.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/golang/notexist/foo"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	y := foo.FooFunc()
-
-	fmt.Println(x, y)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json
deleted file mode 100644
index 0283a8839f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/skip-hidden/testcase.json
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples", "-skip-tools"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_h_flag/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_h_flag/testcase.json
deleted file mode 100644
index b954a4827a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_h_flag/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["init", "-h"]
-  ],
-  "error-expected": "Usage: dep init [root]"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_not_defined_flag/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_not_defined_flag/testcase.json
deleted file mode 100644
index 3d3591e971..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/usage/with_not_defined_flag/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["init", "-not-defined-flag"]
-  ],
-  "error-expected": "flag provided but not defined: -not-defined-flag\nUsage: dep init [root]"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.lock
deleted file mode 100644
index ac445c05d2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1ed417a0bec57ffe988fae1cba8f3d49994fb893394d61844e0b3c96d69573fe"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.toml
deleted file mode 100644
index aaf78303fa..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/final/Gopkg.toml
+++ /dev/null
@@ -1,4 +0,0 @@
-
-[[constraint]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "2.0.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/main.go
deleted file mode 100644
index 2b2c7c396e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	var x deptestdos.Bar
-	fmt.Println(x)
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/vendor.conf b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/vendor.conf
deleted file mode 100644
index d91f18b3e2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/initial/vendor.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# Comment on its own line
-github.com/sdboyer/deptest 3f4c3bea144e112a69bbe5d8d01c1b09a544253f https://github.com/sdboyer/deptest.git
-github.com/sdboyer/deptestdos v2.0.0
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/testcase.json
deleted file mode 100644
index 017dc4cd55..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/init/vndr/case1/testcase.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "commands": [
-    ["init", "-no-examples"]
-  ],
-  "error-expected": "",
-  "gopath-initial": {
-    "github.com/sdboyer/deptest": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  },
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/final/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/initial/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/testcase.json
deleted file mode 100644
index da6463ed6a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/prune/without_lock/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["prune"]
-  ],
-  "error-expected": "Gopkg.lock must exist"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock
deleted file mode 100644
index 77278d07bc..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.lock
deleted file mode 100644
index 04268862a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-memo = "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5"
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-            
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/stdout.txt
deleted file mode 100644
index 2dbc7914da..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/stdout.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-digraph {
-	node [shape=box];
-	388407825 [label="github.com/golang/notexist"];
-	2304687900 [label="github.com/sdboyer/deptest\nv0.8.0"];
-	2659405890 [label="github.com/sdboyer/deptestdos\nv2.0.0"];
-	388407825 -> 2304687900;
-	388407825 -> 2659405890;
-	2659405890 -> 2304687900;
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/testcase.json
deleted file mode 100644
index 9634c3981a..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/dot/testcase.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["status", "-dot"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock
deleted file mode 100644
index 77278d07bc..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.lock
deleted file mode 100644
index 04268862a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-memo = "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5"
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-            
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/stdout.txt
deleted file mode 100644
index e995757921..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/stdout.txt
+++ /dev/null
@@ -1 +0,0 @@
-[{"ProjectRoot":"github.com/sdboyer/deptest","Constraint":"^0.8.0","Version":"v0.8.0","Revision":"ff2948a2ac8f538c4ecd55962e919d1e13e74baf","Latest":"3f4c3bea144e112a69bbe5d8d01c1b09a544253f","PackageCount":1},{"ProjectRoot":"github.com/sdboyer/deptestdos","Constraint":"*","Version":"v2.0.0","Revision":"5c607206be5decd28e6263ffffdcee067266015e","Latest":"5c607206be5decd28e6263ffffdcee067266015e","PackageCount":1}]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/testcase.json
deleted file mode 100644
index 9e1a0643b7..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/json/testcase.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["status", "-json"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock
deleted file mode 100644
index 77278d07bc..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v0.8.0"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1b381263a360eafafe3ef7f9be626672668d17250a3c9a8debd169d1b5e2eebb"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.lock
deleted file mode 100644
index 04268862a1..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.lock
+++ /dev/null
@@ -1,13 +0,0 @@
-memo = "9a5243dd3fa20feeaa20398e7283d6c566532e2af1aae279a010df34793761c5"
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  version = "v0.8.0"
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  packages = ["."]
-            
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  version = "v2.0.0"
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  packages = ["."]
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.toml
deleted file mode 100644
index 94deb714a4..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[constraint]]
-  name = "github.com/sdboyer/deptest"
-  version = "^0.8.0"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/main.go
deleted file mode 100644
index 2eae5b511d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/initial/main.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/sdboyer/deptest"
-	"github.com/sdboyer/deptestdos"
-)
-
-func main() {
-	err := nil
-	if err != nil {
-		deptest.Map["yo yo!"]
-	}
-	deptestdos.diMeLo("whatev")
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/stdout.txt
deleted file mode 100644
index f77f65a927..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/stdout.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT                        CONSTRAINT  VERSION  REVISION  LATEST   PKGS USED
-github.com/sdboyer/deptest     ^0.8.0      v0.8.0   ff2948a   3f4c3be  1
-github.com/sdboyer/deptestdos  *           v2.0.0   5c60720   5c60720  1   
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/testcase.json
deleted file mode 100644
index e1f1eadeeb..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/case1/table/testcase.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["status"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.toml
deleted file mode 100644
index 418ac251f8..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/final/Gopkg.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-ignored = ["github.com/sdboyer/deptestdos"]
-
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.toml
deleted file mode 100644
index 418ac251f8..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/Gopkg.toml
+++ /dev/null
@@ -1,2 +0,0 @@
-ignored = ["github.com/sdboyer/deptestdos"]
-
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/main.go
deleted file mode 100644
index 6fa0454844..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptestdos"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/testcase.json
deleted file mode 100644
index dc1776d5f2..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/ignore_lock_mismatch/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "commands": [
-    ["status"]
-  ],
-  "error-expected": "This happens when Gopkg.toml is modified",
-  "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/final/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/final/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/Gopkg.lock
deleted file mode 100644
index bef2d0092e..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/Gopkg.lock
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "ab4fef131ee828e96ba67d31a7d690bd5f2f42040c6766b1b12fe856f87e0ff7"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/main.go
deleted file mode 100644
index 6fa0454844..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptestdos"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/testcase.json
deleted file mode 100644
index a1f7531975..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/missing_pkgs_lock_mismatch/testcase.json
+++ /dev/null
@@ -1,7 +0,0 @@
-{
-  "commands": [
-    ["status"]
-  ],
-  "error-expected": "due to the following packages missing from the lock",
-  "vendor-final": []
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.lock
deleted file mode 100644
index f987a57915..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1c4444f47ab5d5c484634d1a0c95d99beb879a37337bc0d7aecbd97cf79b6cb1"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.toml
deleted file mode 100644
index a612225457..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/final/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[override]]
-  name = "github.com/sdboyer/deptest"
-  version = "=0.8.1"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.lock b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.lock
deleted file mode 100644
index f987a57915..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.lock
+++ /dev/null
@@ -1,21 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-  version = "v0.8.1"
-
-[[projects]]
-  name = "github.com/sdboyer/deptestdos"
-  packages = ["."]
-  revision = "5c607206be5decd28e6263ffffdcee067266015e"
-  version = "v2.0.0"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "1c4444f47ab5d5c484634d1a0c95d99beb879a37337bc0d7aecbd97cf79b6cb1"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.toml
deleted file mode 100644
index a612225457..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/Gopkg.toml
+++ /dev/null
@@ -1,3 +0,0 @@
-[[override]]
-  name = "github.com/sdboyer/deptest"
-  version = "=0.8.1"
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/main.go
deleted file mode 100644
index 6ebfee7840..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/initial/main.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "github.com/sdboyer/deptestdos"
-)
-
-func main() {
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/stdout.txt b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/stdout.txt
deleted file mode 100644
index e3df72b63d..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/stdout.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-PROJECT                        CONSTRAINT    VERSION  REVISION  LATEST   PKGS USED
-github.com/sdboyer/deptest     * (override)  v0.8.1   3f4c3be   ff2948a  1
-github.com/sdboyer/deptestdos  *             v2.0.0   5c60720   5c60720  1
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/testcase.json
deleted file mode 100644
index e1f1eadeeb..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/override_constraint/testcase.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "commands": [
-    ["ensure"],
-    ["status"]
-  ],
-  "error-expected": "",
-  "vendor-final": [
-    "github.com/sdboyer/deptest",
-    "github.com/sdboyer/deptestdos"
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/final/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/final/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/initial/Gopkg.toml b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/initial/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/testcase.json b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/testcase.json
deleted file mode 100644
index 5de8112840..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/harness_tests/status/without_lock/testcase.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "commands": [
-    ["status"]
-  ],
-  "error-expected": "no Gopkg.lock found. Run `dep ensure` to generate lock file"
-}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/init/directdeps/main.go b/installer/vendor/github.com/golang/dep/cmd/dep/testdata/init/directdeps/main.go
deleted file mode 100644
index 3f8bc6981f..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/testdata/init/directdeps/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import _ "github.com/carolynvs/deptest-subpkg/subby"
-
-func main() {}
diff --git a/installer/vendor/github.com/golang/dep/cmd/dep/version.go b/installer/vendor/github.com/golang/dep/cmd/dep/version.go
deleted file mode 100644
index d7a3d33059..0000000000
--- a/installer/vendor/github.com/golang/dep/cmd/dep/version.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-	"runtime"
-
-	"github.com/golang/dep"
-)
-
-var (
-	version    = "devel"
-	buildDate  string
-	commitHash string
-)
-
-const versionHelp = `Show the dep version information`
-
-func (cmd *versionCommand) Name() string { return "version" }
-func (cmd *versionCommand) Args() string {
-	return ""
-}
-func (cmd *versionCommand) ShortHelp() string { return versionHelp }
-func (cmd *versionCommand) LongHelp() string  { return versionHelp }
-func (cmd *versionCommand) Hidden() bool      { return false }
-
-func (cmd *versionCommand) Register(fs *flag.FlagSet) {}
-
-type versionCommand struct{}
-
-func (cmd *versionCommand) Run(ctx *dep.Ctx, args []string) error {
-	ctx.Out.Printf(`dep:
- version     : %s
- build date  : %s
- git hash    : %s
- go version  : %s
- go compiler : %s
- platform    : %s/%s
-`, version, buildDate, commitHash,
-		runtime.Version(), runtime.Compiler, runtime.GOOS, runtime.GOARCH)
-	return nil
-}
diff --git a/installer/vendor/github.com/golang/dep/context_test.go b/installer/vendor/github.com/golang/dep/context_test.go
deleted file mode 100644
index 7e5eda6e25..0000000000
--- a/installer/vendor/github.com/golang/dep/context_test.go
+++ /dev/null
@@ -1,487 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"unicode"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func discardLogger() *log.Logger {
-	return log.New(ioutil.Discard, "", 0)
-}
-
-func TestCtx_ProjectImport(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-
-	h.Setenv("GOPATH", h.Path("."))
-	depCtx := &Ctx{GOPATH: h.Path(".")}
-
-	importPaths := []string{
-		"github.com/pkg/errors",
-		"my/silly/thing",
-	}
-
-	for _, want := range importPaths {
-		fullpath := filepath.Join(depCtx.GOPATH, "src", want)
-		h.TempDir(filepath.Join("src", want))
-		got, err := depCtx.ImportForAbs(fullpath)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got != want {
-			t.Fatalf("expected %s, got %s", want, got)
-		}
-	}
-
-	// test where it should return an error when directly within $GOPATH/src
-	got, err := depCtx.ImportForAbs(filepath.Join(depCtx.GOPATH, "src"))
-	if err == nil || !strings.Contains(err.Error(), "GOPATH/src") {
-		t.Fatalf("should have gotten an error for use directly in GOPATH/src, but got %s", got)
-	}
-
-	// test where it should return an error
-	got, err = depCtx.ImportForAbs("tra/la/la/la")
-	if err == nil {
-		t.Fatalf("should have gotten an error but did not for tra/la/la/la: %s", got)
-	}
-}
-
-func TestAbsoluteProjectRoot(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	h.Setenv("GOPATH", h.Path("."))
-	depCtx := &Ctx{GOPATH: h.Path(".")}
-
-	importPaths := map[string]bool{
-		"github.com/pkg/errors": true,
-		"my/silly/thing":        false,
-	}
-
-	for i, create := range importPaths {
-		if create {
-			h.TempDir(filepath.Join("src", i))
-		}
-	}
-
-	for i, ok := range importPaths {
-		got, err := depCtx.AbsForImport(i)
-		if ok {
-			h.Must(err)
-			want := h.Path(filepath.Join("src", i))
-			if got != want {
-				t.Fatalf("expected %s, got %q", want, got)
-			}
-			continue
-		}
-
-		if err == nil {
-			t.Fatalf("expected %s to fail", i)
-		}
-	}
-
-	// test that a file fails
-	h.TempFile("src/thing/thing.go", "hello world")
-	_, err := depCtx.AbsForImport("thing/thing.go")
-	if err == nil {
-		t.Fatal("error should not be nil for a file found")
-	}
-}
-
-func TestLoadProject(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir(filepath.Join("src", "test1", "sub"))
-	h.TempFile(filepath.Join("src", "test1", ManifestName), "")
-	h.TempFile(filepath.Join("src", "test1", LockName), `memo = "cdafe8641b28cd16fe025df278b0a49b9416859345d8b6ba0ace0272b74925ee"`)
-	h.TempDir(filepath.Join("src", "test2", "sub"))
-	h.TempFile(filepath.Join("src", "test2", ManifestName), "")
-
-	var testcases = []struct {
-		name string
-		lock bool
-		wd   string
-	}{
-		{"direct", true, filepath.Join("src", "test1")},
-		{"ascending", true, filepath.Join("src", "test1", "sub")},
-		{"without lock", false, filepath.Join("src", "test2")},
-		{"ascending without lock", false, filepath.Join("src", "test2", "sub")},
-	}
-
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			ctx := &Ctx{
-				Out: discardLogger(),
-				Err: discardLogger(),
-			}
-
-			err := ctx.SetPaths(h.Path(tc.wd), h.Path("."))
-			if err != nil {
-				t.Fatalf("%+v", err)
-			}
-
-			p, err := ctx.LoadProject()
-			switch {
-			case err != nil:
-				t.Fatalf("%s: LoadProject failed: %+v", tc.wd, err)
-			case p.Manifest == nil:
-				t.Fatalf("%s: Manifest file didn't load", tc.wd)
-			case tc.lock && p.Lock == nil:
-				t.Fatalf("%s: Lock file didn't load", tc.wd)
-			case !tc.lock && p.Lock != nil:
-				t.Fatalf("%s: Non-existent Lock file loaded", tc.wd)
-			}
-		})
-	}
-}
-
-func TestLoadProjectNotFoundErrors(t *testing.T) {
-	tg := test.NewHelper(t)
-	defer tg.Cleanup()
-
-	tg.TempDir("src")
-	tg.TempDir("src/test1")
-	tg.TempDir("src/test1/sub")
-	tg.Setenv("GOPATH", tg.Path("."))
-
-	var testcases = []struct {
-		lock  bool
-		start string
-		path  string
-	}{
-		{true, filepath.Join("src", "test1"), ""},        //direct
-		{true, filepath.Join("src", "test1", "sub"), ""}, //ascending
-	}
-
-	for _, testcase := range testcases {
-		ctx := &Ctx{GOPATHs: []string{tg.Path(".")}, WorkingDir: tg.Path(testcase.start)}
-
-		_, err := ctx.LoadProject()
-		if err == nil {
-			t.Errorf("%s: should have returned 'No Manifest Found' error", testcase.start)
-		}
-	}
-}
-
-func TestLoadProjectManifestParseError(t *testing.T) {
-	tg := test.NewHelper(t)
-	defer tg.Cleanup()
-
-	tg.TempDir("src")
-	tg.TempDir("src/test1")
-	tg.TempFile(filepath.Join("src/test1", ManifestName), `[[constraint]]`)
-	tg.TempFile(filepath.Join("src/test1", LockName), `memo = "cdafe8641b28cd16fe025df278b0a49b9416859345d8b6ba0ace0272b74925ee"\n\n[[projects]]`)
-	tg.Setenv("GOPATH", tg.Path("."))
-
-	path := filepath.Join("src", "test1")
-	tg.Cd(tg.Path(path))
-
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal("failed to get working directory", err)
-	}
-
-	ctx := &Ctx{
-		GOPATH:     tg.Path("."),
-		WorkingDir: wd,
-		Out:        discardLogger(),
-		Err:        discardLogger(),
-	}
-
-	_, err = ctx.LoadProject()
-	if err == nil {
-		t.Fatal("should have returned 'Manifest Syntax' error")
-	}
-}
-
-func TestLoadProjectLockParseError(t *testing.T) {
-	tg := test.NewHelper(t)
-	defer tg.Cleanup()
-
-	tg.TempDir("src")
-	tg.TempDir("src/test1")
-	tg.TempFile(filepath.Join("src/test1", ManifestName), `[[constraint]]`)
-	tg.TempFile(filepath.Join("src/test1", LockName), `memo = "cdafe8641b28cd16fe025df278b0a49b9416859345d8b6ba0ace0272b74925ee"\n\n[[projects]]`)
-	tg.Setenv("GOPATH", tg.Path("."))
-
-	path := filepath.Join("src", "test1")
-	tg.Cd(tg.Path(path))
-
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal("failed to get working directory", err)
-	}
-
-	ctx := &Ctx{
-		GOPATH:     tg.Path("."),
-		WorkingDir: wd,
-		Out:        discardLogger(),
-		Err:        discardLogger(),
-	}
-
-	_, err = ctx.LoadProject()
-	if err == nil {
-		t.Fatal("should have returned 'Lock Syntax' error")
-	}
-}
-
-func TestLoadProjectNoSrcDir(t *testing.T) {
-	tg := test.NewHelper(t)
-	defer tg.Cleanup()
-
-	tg.TempDir("test1")
-	tg.TempFile(filepath.Join("test1", ManifestName), `[[constraint]]`)
-	tg.TempFile(filepath.Join("test1", LockName), `memo = "cdafe8641b28cd16fe025df278b0a49b9416859345d8b6ba0ace0272b74925ee"\n\n[[projects]]`)
-	tg.Setenv("GOPATH", tg.Path("."))
-
-	ctx := &Ctx{GOPATH: tg.Path(".")}
-	path := filepath.Join("test1")
-	tg.Cd(tg.Path(path))
-
-	f, _ := os.OpenFile(filepath.Join(ctx.GOPATH, "src", "test1", LockName), os.O_WRONLY, os.ModePerm)
-	defer f.Close()
-
-	_, err := ctx.LoadProject()
-	if err == nil {
-		t.Fatal("should have returned 'Split Absolute Root' error (no 'src' dir present)")
-	}
-}
-
-func TestLoadProjectGopkgFilenames(t *testing.T) {
-	// We are trying to skip this test on file systems which are case-sensiive. We could
-	// have used `fs.IsCaseSensitiveFilesystem` for this check. However, the code we are
-	// testing also relies on `fs.IsCaseSensitiveFilesystem`. So a bug in
-	// `fs.IsCaseSensitiveFilesystem` could prevent this test from being run. This is the
-	// only scenario where we prefer the OS heuristic over doing the actual work of
-	// validating filesystem case sensitivity via `fs.IsCaseSensitiveFilesystem`.
-	if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-		t.Skip("skip this test on non-Windows, non-macOS")
-	}
-
-	// Here we test that a manifest filename with incorrect case throws an error. Similar
-	// error will also be thrown for the lock file as well which has been tested in
-	// `project_test.go#TestCheckGopkgFilenames`. So not repeating here.
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	invalidMfName := strings.ToLower(ManifestName)
-
-	wd := filepath.Join("src", "test")
-	h.TempFile(filepath.Join(wd, invalidMfName), "")
-
-	ctx := &Ctx{
-		Out: discardLogger(),
-		Err: discardLogger(),
-	}
-
-	err := ctx.SetPaths(h.Path(wd), h.Path("."))
-	if err != nil {
-		t.Fatalf("%+v", err)
-	}
-
-	_, err = ctx.LoadProject()
-
-	if err == nil {
-		t.Fatal("should have returned 'Manifest Filename' error")
-	}
-
-	expectedErrMsg := fmt.Sprintf(
-		"manifest filename %q does not match %q",
-		invalidMfName, ManifestName,
-	)
-
-	if err.Error() != expectedErrMsg {
-		t.Fatalf("unexpected error: %+v", err)
-	}
-}
-
-// TestCaseInsentitive is test for Windows. This should work even though set
-// difference letter cases in GOPATH.
-func TestCaseInsentitiveGOPATH(t *testing.T) {
-	if runtime.GOOS != "windows" {
-		t.Skip("skip this test on non-Windows")
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	h.TempDir("src/test1")
-	h.TempFile(filepath.Join("src/test1", ManifestName), `[[constraint]]`)
-
-	// Shuffle letter case
-	rs := []rune(strings.ToLower(h.Path(".")))
-	for i, r := range rs {
-		if unicode.IsLower(r) {
-			rs[i] = unicode.ToUpper(r)
-		} else {
-			rs[i] = unicode.ToLower(r)
-		}
-	}
-	gopath := string(rs)
-	h.Setenv("GOPATH", gopath)
-	wd := h.Path("src/test1")
-
-	depCtx := &Ctx{}
-	if err := depCtx.SetPaths(wd, gopath); err != nil {
-		t.Fatal(err)
-	}
-	if _, err := depCtx.LoadProject(); err != nil {
-		t.Fatal(err)
-	}
-
-	ip := "github.com/pkg/errors"
-	fullpath := filepath.Join(depCtx.GOPATH, "src", ip)
-	h.TempDir(filepath.Join("src", ip))
-	pr, err := depCtx.ImportForAbs(fullpath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pr != ip {
-		t.Fatalf("expected %s, got %s", ip, pr)
-	}
-}
-
-func TestDetectProjectGOPATH(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir(filepath.Join("sym", "symlink"))
-	h.TempDir(filepath.Join("go", "src", "sym", "path"))
-	h.TempDir(filepath.Join("go", "src", "real", "path"))
-	h.TempDir(filepath.Join("go-two", "src", "real", "path"))
-	h.TempDir(filepath.Join("go-two", "src", "sym"))
-
-	ctx := &Ctx{
-		GOPATHs: []string{h.Path("go"), h.Path("go-two")},
-	}
-
-	testcases := []struct {
-		name         string
-		root         string
-		resolvedRoot string
-		GOPATH       string
-		expectErr    bool
-	}{
-		{
-			name:         "project-with-no-AbsRoot",
-			root:         "",
-			resolvedRoot: filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			expectErr:    true,
-		},
-		{
-			name:         "project-with-no-ResolvedAbsRoot",
-			root:         filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			resolvedRoot: "",
-			expectErr:    true,
-		},
-		{
-			name:         "AbsRoot-is-not-within-any-GOPATH",
-			root:         filepath.Join(h.Path("."), "src", "real", "path"),
-			resolvedRoot: filepath.Join(h.Path("."), "src", "real", "path"),
-			expectErr:    true,
-		},
-		{
-			name:         "neither-AbsRoot-nor-ResolvedAbsRoot-are-in-any-GOPATH",
-			root:         filepath.Join(h.Path("."), "src", "sym", "path"),
-			resolvedRoot: filepath.Join(h.Path("."), "src", "real", "path"),
-			expectErr:    true,
-		},
-		{
-			name:         "both-AbsRoot-and-ResolvedAbsRoot-are-in-the-same-GOPATH",
-			root:         filepath.Join(ctx.GOPATHs[0], "src", "sym", "path"),
-			resolvedRoot: filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			expectErr:    true,
-		},
-		{
-			name:         "AbsRoot-and-ResolvedAbsRoot-are-each-within-a-different-GOPATH",
-			root:         filepath.Join(ctx.GOPATHs[0], "src", "sym", "path"),
-			resolvedRoot: filepath.Join(ctx.GOPATHs[1], "src", "real", "path"),
-			expectErr:    true,
-		},
-		{
-			name:         "AbsRoot-is-not-a-symlink",
-			root:         filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			resolvedRoot: filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			GOPATH:       ctx.GOPATHs[0],
-		},
-		{
-			name:         "AbsRoot-is-a-symlink-to-ResolvedAbsRoot",
-			root:         filepath.Join(h.Path("."), "sym", "symlink"),
-			resolvedRoot: filepath.Join(ctx.GOPATHs[0], "src", "real", "path"),
-			GOPATH:       ctx.GOPATHs[0],
-		},
-	}
-
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			project := &Project{
-				AbsRoot:         tc.root,
-				ResolvedAbsRoot: tc.resolvedRoot,
-			}
-
-			GOPATH, err := ctx.DetectProjectGOPATH(project)
-			if !tc.expectErr && err != nil {
-				t.Fatalf("%+v", err)
-			} else if tc.expectErr && err == nil {
-				t.Fatalf("expected an error, got nil and gopath %s", GOPATH)
-			}
-			if GOPATH != tc.GOPATH {
-				t.Errorf("expected GOPATH %s, got %s", tc.GOPATH, GOPATH)
-			}
-		})
-	}
-}
-
-func TestDetectGOPATH(t *testing.T) {
-	th := test.NewHelper(t)
-	defer th.Cleanup()
-
-	th.TempDir(filepath.Join("code", "src", "github.com", "username", "package"))
-	th.TempDir(filepath.Join("go", "src", "github.com", "username", "package"))
-	th.TempDir(filepath.Join("gotwo", "src", "github.com", "username", "package"))
-
-	ctx := &Ctx{GOPATHs: []string{
-		th.Path("go"),
-		th.Path("gotwo"),
-	}}
-
-	testcases := []struct {
-		GOPATH string
-		path   string
-		err    bool
-	}{
-		{th.Path("go"), th.Path(filepath.Join("go", "src", "github.com", "username", "package")), false},
-		{th.Path("go"), th.Path(filepath.Join("go", "src", "github.com", "username", "package")), false},
-		{th.Path("gotwo"), th.Path(filepath.Join("gotwo", "src", "github.com", "username", "package")), false},
-		{"", th.Path(filepath.Join("code", "src", "github.com", "username", "package")), true},
-	}
-
-	for _, tc := range testcases {
-		GOPATH, err := ctx.detectGOPATH(tc.path)
-		if tc.err && err == nil {
-			t.Error("expected error but got none")
-		}
-		if GOPATH != tc.GOPATH {
-			t.Errorf("expected GOPATH to be %s, got %s", GOPATH, tc.GOPATH)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/docs/FAQ.md b/installer/vendor/github.com/golang/dep/docs/FAQ.md
deleted file mode 100644
index 38c74b1262..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/FAQ.md
+++ /dev/null
@@ -1,445 +0,0 @@
-# FAQ
-
-_The first rule of FAQ is don't bikeshed the FAQ, leave that for
-[Create structure for managing docs](https://github.com/golang/dep/issues/331)._
-
-Please contribute to the FAQ! Found an explanation in an issue or pull request helpful?
-Summarize the question and quote the reply, linking back to the original comment.
-
-## Concepts
-* [Does `dep` replace `go get`?](#does-dep-replace-go-get)
-* [Why is it `dep ensure` instead of `dep install`?](#why-is-it-dep-ensure-instead-of-dep-install)
-* [What is a direct or transitive dependency?](#what-is-a-direct-or-transitive-dependency)
-
-## Configuration
-* [What is the difference between Gopkg.toml (the "manifest") and Gopkg.lock (the "lock")?](#what-is-the-difference-between-gopkgtoml-the-manifest-and-gopkglock-the-lock)
-* [How do I constrain a transitive dependency's version?](#how-do-i-constrain-a-transitive-dependencys-version)
-* [Can I put the manifest and lock in the vendor directory?](#can-i-put-the-manifest-and-lock-in-the-vendor-directory)
-* [How do I get `dep` to authenticate to a `git` repo?](#how-do-i-get-dep-to-authenticate-to-a-git-repo)
-* [How do I get `dep` to consume private `git` repos using a Github Token?](#how-do-i-get-dep-to-consume-private-git-repos-using-a-github-token)
-
-## Behavior
-* [How does `dep` decide what version of a dependency to use?](#how-does-dep-decide-what-version-of-a-dependency-to-use)
-* [What external tools are supported?](#what-external-tools-are-supported)
-* [Why is `dep` ignoring a version constraint in the manifest?](#why-is-dep-ignoring-a-version-constraint-in-the-manifest)
-* [Why did `dep` use a different revision for package X instead of the revision in the lock file?](#why-did-dep-use-a-different-revision-for-package-x-instead-of-the-revision-in-the-lock-file)
-* [Why is `dep` slow?](#why-is-dep-slow)
-* [How does `dep` handle symbolic links?](#how-does-dep-handle-symbolic-links)
-* [Does `dep` support relative imports?](#does-dep-support-relative-imports)
-* [How do I make `dep` resolve dependencies from my `GOPATH`?](#how-do-i-make-dep-resolve-dependencies-from-my-gopath)
-* [Will `dep` let me use git submodules to store dependencies in `vendor`?](#will-dep-let-me-use-git-submodules-to-store-dependencies-in-vendor)
-
-## Best Practices
-* [Should I commit my vendor directory?](#should-i-commit-my-vendor-directory)
-* [How do I roll releases that `dep` will be able to use?](#how-do-i-roll-releases-that-dep-will-be-able-to-use)
-* [What semver version should I use?](#what-semver-version-should-i-use)
-* [Is it OK to make backwards-incompatible changes now?](#is-it-ok-to-make-backwards-incompatible-changes-now)
-* [My dependers don't use `dep` yet. What should I do?](#my-dependers-dont-use-dep-yet-what-should-i-do)
-* [How do I configure a dependency that doesn't tag its releases?](#how-do-i-configure-a-dependency-that-doesnt-tag-its-releases)
-* [How do I use `dep` with Docker?](#how-do-i-use-dep-with-docker)
-
-## Concepts
-### Does `dep` replace `go get`?
-
-No. `dep` and `go get` serve mostly different purposes.
-
-Here are some suggestions for when you could use `dep` or `go get`:
-> I would say that dep doesn't replace go get, but they both can do similar things. Here's how I use them:
->
-> `go get`: I want to download the source code for a go project so that I can work on it myself, or to install a tool. This clones the repo under GOPATH for all to use.
->
-> `dep ensure`: I have imported a new dependency in my code and want to download the dependency so I can start using it. My workflow is "add the import to the code, and then run dep ensure so that the manifest/lock/vendor are updated". This clones the repo under my project's vendor directory, and remembers the revision used so that everyone who works on my project is guaranteed to be using the same version of dependencies.
-> 
-> [@carolynvs in #376](https://github.com/golang/dep/issues/376#issuecomment-293964655)
-
-> The long term vision is a sane, overall-consistent go tool. My general take is that `go get`
-> is for people consuming Go code, and dep-family commands are for people developing it.
-> 
-> [@sdboyer in #376](https://github.com/golang/dep/issues/376#issuecomment-294045873)
-
-### Why is it `dep ensure` instead of `dep install`?
-
-> Yeah, we went round and round on names. [A lot](https://gist.github.com/jessfraz/315db91b272441f510e81e449f675a8b).
->
-> The idea of "ensure" is roughly, "ensure that all my local states - code tree, manifest, lock, and vendor - are in sync with each other." When arguments are passed, it becomes "ensure this argument is satisfied, along with synchronization between all my local states."
->
-> We opted for this approach because we came to the conclusion that allowing the tool to perform partial work/exit in intermediate states ended up creating a tool that had more commands, had far more possible valid exit and input states, and was generally full of footguns. In this approach, the user has most of the same ultimate control, but exercises it differently (by modifying the code/manifest and re-running dep ensure).
-> 
-> [@sdboyer in #371](https://github.com/golang/dep/issues/371#issuecomment-293246832)
-
-### What is a direct or transitive dependency?
-* Direct dependencies are dependencies that are imported directly by your project: they appear in at least one import statement from your project.
-* Transitive dependencies are the dependencies of your dependencies. Necessary to compile but are not directly used by your code.
-
-## Configuration
-### What is the difference between `Gopkg.toml` (the "manifest") and `Gopkg.lock` (the "lock")?
-
-> The manifest describes user intent, and the lock describes computed outputs. There's flexibility in manifests that isn't present in locks..., as the "branch": "master" constraint will match whatever revision master HAPPENS to be at right now, whereas the lock is nailed down to a specific revision.
->
-> This flexibility is important because it allows us to provide easy commands (e.g. `dep ensure -update`) that can manage an update process for you, within the constraints you specify, AND because it allows your project, when imported by someone else, to collaboratively specify the constraints for your own dependencies.
-> 
-> [@sdboyer in #281](https://github.com/golang/dep/issues/281#issuecomment-284118314)
-
-## How do I constrain a transitive dependency's version?
-First, if you're wondering about this because you're trying to keep the version
-of the transitive dependency from changing, then you're working against `dep`'s
-design. The lock file, `Gopkg.lock`, will keep the selected version of the
-transitive dependency stable, unless you explicitly request an upgrade or it's
-impossible to find a solution without changing that version.
-
-If that isn't your use case and you still need to constrain a transitive
-dependency, you have a couple of options:
-
-1. Make the transitive dependency a direct one, either with a dummy import or an entry in the `required` list in `Gopkg.toml`.
-2. Use an override.
-
-Overrides are a sledgehammer, and should only be used as a last resort. While
-constraints and overrides are declared in the same way in `Gopkg.toml`, they
-behave differently:
-
-* Constraints:
-   1. Can be declared by any project's manifest, yours or a dependency
-   2. Apply only to direct dependencies of the project declaring the constraint
-   3. Must not conflict with the `constraint` entries declared in any other project's manifest
-* Overrides:
-   1. Are only utilized from the current/your project's manifest
-   2. Apply globally, to direct and transitive dependencies
-   3. Supersede constraints declared in all manifests, yours or a dependency's
-
-Overrides are also discussed with some visuals in [the gps docs](https://github.com/sdboyer/gps/wiki/gps-for-Implementors#overrides).
-
-## Can I put the manifest and lock in the vendor directory?
-No.
-
-> Placing these files inside `vendor/` would concretely bind us to `vendor/` in the long term.
-> We prefer to treat the `vendor/` as an implementation detail.
-> 
-> [@sdboyer on go package management list](https://groups.google.com/d/msg/go-package-management/et1qFUjrkP4/LQFCHP4WBQAJ)
-
-## How do I get dep to authenticate to a git repo?
-
-`dep` currently uses the `git` command under the hood, so configuring the credentials
-for each repository you wish to authenticate to will allow `dep` to use an
-authenticated repository.
-
-First, configure `git` to use the credentials option for the specific repository.
-
-For example, if you use gitlab, and you wish to access `https://gitlab.example.com/example/package.git`,
-then you would want to use the following configuration:
-
-```
-$ git config --global credential.https://gitlab.example.com.example yourusername
-```
-
-In the example the hostname `gitlab.example.com.username` string seems incorrect, but
-it's actually the hostname plus the name of the repo you are accessing which is `username`.
-The trailing 'yourusername' is the username you would use for the actual authentication.
-
-You also need to configure `git` with the authentication provider you wish to use. You can get
-a list of providers, with the command:
-
-```
-$ git help -a | grep credential-
-  credential-cache          remote-fd
-  credential-cache--daemon  remote-ftp
-  credential-osxkeychain    remote-ftps
-  credential-store          remote-http
-```
-
-You would then choose an appropriate provider. For example, to use the osxkeychain, you
-would use the following:
-
-```
-git config --global credential.helper osxkeychain
-```
-
-If you need to do this for a CI system, then you may want to use the "store" provider.
-Please see the documentation on how to configure that: https://git-scm.com/docs/git-credential-store
-
-After configuring `git`, you may need to use `git` manually once to have it store the
-credentials. Once you've checked out the repo manually, it will then use the stored
-credentials. This at least appears to be the behavior for the osxkeychain provider.
-
-### How do I get dep to consume private git repos using a Github Token?
-
-Another alternative to make `dep` work with private repos is to use a [Personal Github
-Token](https://help.github.com/articles/creating-a-personal-access-token-for-the-command-line/)
-and configure it inside the [`.netrc` file](https://www.gnu.org/software/inetutils/manual/html_node/The-_002enetrc-file.html)
-as the following example:
-```
-machine github.com
-    login [YOUR_GITHUB_TOKEN]
-```
-
-Once you have set that up, dep will automatically use that Token to authenticate to the repositories.
-
-## Behavior
-### How does `dep` decide what version of a dependency to use?
-
-The full algorithm is complex, but the most important thing to understand is
-that `dep` tries versions in a [certain
-order](https://godoc.org/github.com/golang/dep/internal/gps#SortForUpgrade),
-checking to see a version is acceptable according to specified constraints.
-
-- All semver versions come first, and sort mostly according to the semver 2.0
-  spec, with one exception:
-  - Semver versions with a prerelease are sorted after *all* non-prerelease
-    semver. Within this subset they are sorted first by their numerical
-    component, then lexicographically by their prerelease version.
-- The default branch(es) are next; the semantics of what "default branch" means
-  are specific to the underlying source type, but this is generally what you'd
-  get from a `go get`.
-- All other branches come next, sorted lexicographically.
-- All non-semver versions (tags) are next, sorted lexicographically.
-- Revisions, if any, are last, sorted lexicographically. Revisions do not
-  typically appear in version lists, so the only invariant we maintain is
-  determinism - deeper semantics, like chronology or topology, do not matter.
-
-So, given a slice of the following versions:
-
-- Branch: `master` `devel`
-- Semver tags: `v1.0.0` `v1.1.0` `v1.1.0-alpha1`
-- Non-semver tags: `footag`
-- Revision: `f6e74e8d`
-
-Sorting for upgrade will result in the following slice.
-
-`[v1.1.0 v1.0.0 v1.1.0-alpha1 footag devel master f6e74e8d]`
-
-There are a number of factors that can eliminate a version from consideration,
-the simplest of which is that it doesn't match a constraint. But if you're
-trying to figure out why `dep` is doing what it does, understanding that its
-basic action is to attempt versions in this order should help you to reason
-about what's going on.
-
-## What external tools are supported?
-During `dep init` configuration from other dependency managers is detected
-and imported, unless `-skip-tools` is specified.
-
-The following tools are supported: `glide`, `godep`, `vndr`, `govend`, `gb` and `gvt`.
-
-See [#186](https://github.com/golang/dep/issues/186#issuecomment-306363441) for
-how to add support for another tool.
-
-## Why is `dep` ignoring a version constraint in the manifest?
-Only your project's directly imported dependencies are affected by a `constraint` entry
-in the manifest. Transitive dependencies are unaffected. See [How do I constrain a transitive dependency's version](#how-do-i-constrain-a-transitive-dependencys-version)?
-
-## Why did `dep` use a different revision for package X instead of the revision in the lock file?
-Sometimes the revision specified in the lock file is no longer valid. There are a few
-ways this can occur:
-
-* When you generated the lock file, you had an unpushed commit in your local copy of package X's repository in your `GOPATH`. (This case will be going away soon)
-* After generating the lock file, new commits were force pushed to package X's repository, causing the commit revision in your lock file to no longer exist.
-
-To troubleshoot, you can revert dep's changes to your lock, and then run `dep ensure -v -n`.
-This retries the command in dry-run mode with verbose logs enabled. Check the output
-for a warning like the one below, indicating that a commit in the lock is no longer valid.
-
-```
-Unable to update checked out version: fatal: reference is not a tree: 4dfc6a8a7e15229398c0a018b6d7a078cccae9c8
-```
-
-> The lock file represents a set of precise, typically immutable versions for the entire transitive closure of dependencies for a project. But "the project" can be, and is, decomposed into just a bunch of arguments to an algorithm. When those inputs change, the lock may need to change as well.
->
-> Under most circumstances, if those arguments don't change, then the lock remains fine and correct. You've hit one one of the few cases where that guarantee doesn't apply. The fact that you ran dep ensure and it DID a solve is a product of some arguments changing; that solving failed because this particular commit had become stale is a separate problem.
-> 
-> [@sdboyer in #405](https://github.com/golang/dep/issues/405#issuecomment-295998489)
-
-## Why is `dep` slow?
-
-There are two things that really slow `dep` down. One is unavoidable; for the other, we have a plan.
-
-The unavoidable part is the initial clone. `dep` relies on a cache of local
-repositories (stored under `$GOPATH/pkg/dep`), which is populated on demand.
-Unfortunately, the first `dep` run, especially for a large project, may take a
-while, as all dependencies are cloned into the cache.
-
-Fortunately, this is just an _initial_ clone - pay it once, and you're done.
-The problem repeats itself a bit when you're running `dep` for the first time
-in a while and there's new changesets to fetch, but even then, these costs are
-only paid once per changeset.
-
-The other part is the work of retrieving information about dependencies. There are three parts to this:
-
-1. Getting an up-to-date list of versions from the upstream source
-2. Reading the `Gopkg.toml` for a particular version out of the local cache
-3. Parsing the tree of packages for import statements at a particular version
-
-The first requires one or more network calls; the second two usually mean
-something like a `git checkout`, and the third is a filesystem walk, plus
-loading and parsing `.go` files. All of these are expensive operations.
-
-Fortunately, we can cache the second and third. And that cache can be permanent
-when keyed on an immutable identifier for the version - like a git commit SHA1
-hash. The first is a bit trickier, but there are reasonable staleness tradeoffs
-we can consider to avoid the network entirely. There's an issue to [implement
-persistent caching](https://github.com/golang/dep/issues/431) that's the
-gateway to all of these improvements.
-
-There's another major performance issue that's much harder - the process of picking versions itself is an NP-complete problem in `dep`'s current design. This is a much trickier problem 😜
-
-## How does `dep` handle symbolic links?
-
-> because we're not crazy people who delight in inviting chaos into our lives, we need to work within one `GOPATH` at a time.
--[@sdboyer in #247](https://github.com/golang/dep/pull/247#issuecomment-284181879)
-
-Out of convenience, one might create a symlink to a directory within their `GOPATH/src`, e.g. `ln -s ~/go/src/github.com/user/awesome-project ~/Code/awesome-project`.
-
-When `dep` is invoked with a project root that is a symlink, it will be resolved according to the following rules:
-
-- If the symlink is outside `GOPATH` and links to a directory within a `GOPATH`, or vice versa, then `dep` will choose whichever path is within `GOPATH`.
-- If the symlink is within a `GOPATH` and the resolved path is within a *different* `GOPATH`, then an error is thrown.
-- If both the symlink and the resolved path are in the same `GOPATH`, then an error is thrown.
-- If neither the symlink nor the resolved path are in a `GOPATH`, then an error is thrown.
-
-This is the only symbolic link support that `dep` really intends to provide. In keeping with the general practices of the `go` tool, `dep` tends to either ignore symlinks (when walking) or copy the symlink itself, depending on the filesystem operation being performed.
-
-## Does `dep` support relative imports?
-
-No.
-> dep simply doesn't allow relative imports. this is one of the few places where we restrict a case that the toolchain itself allows. we disallow them only because:
-> 
-> * the toolchain already frowns heavily on them<br>
-> * it's worse for our case, as we start venturing into [dot dot hell](http://doc.cat-v.org/plan_9/4th_edition/papers/lexnames) territory when trying to prove that the import does not escape the tree of the project
-> 
-> [@sdboyer in #899](https://github.com/golang/dep/issues/899#issuecomment-317904001)
-
-For a refresher on Go's recommended workspace organization, see the ["How To Write Go Code"](https://golang.org/doc/code.html) article in the Go docs. Organizing your code this way gives you a unique import path for every package.
-
-## How do I make `dep` resolve dependencies from my `GOPATH`?
-
-`dep init` provides an option to scan the `GOPATH` for dependencies by doing
-`dep init -gopath`, which falls back to network mode when the packages are not
-found in `GOPATH`. `dep ensure` doesn't work with projects in `GOPATH`.
-
-## Will `dep` let me use git submodules to store dependencies in `vendor`?
-
-No, with just one tiny exception: `dep` preserves `/vendor/.git`, if it exists. This was added at [cockroachdb](https://github.com/cockroachdb/cockroach)'s request, who rely on it to keep `vendor` from bloating their primary repository. 
-
-The reasons why git submodules will not be a part of dep are best expressed as a pro/con list:
-
-**Pros**
-
-* git submodules provide a well-structured way of nesting repositories within repositories.
-
-**Cons**
-
-* The nesting that git submodules perform is no more powerful or expressive than what dep already does, but dep does it both more generally (for bzr and hg) and more domain-specifically (e.g. elimination of nested vendor directories).
-* Incorporating git submodules in any way would new fork new paths in the logic to handle the submodule cases, meaning nontrivial complexity increases.
-* dep does not currently know or care if the project it operates on is under version control. Relying on submodules would entail that dep start paying attention to that. That it would only be conditionally does not make it better - again, more forking paths in the logic, more complexity.
-* Incorporating submodules in a way that is at all visible to the user (and why else would you do it?) makes dep's workflows both more complicated and less predictable: _sometimes_ submodule-related actions are expected; _sometimes_ submodule-derived workflows are sufficient.
-* Nesting one repository within another implies that changes could, potentially, be made directly in that subrepository. This is directly contrary to dep's foundational principle that `vendor` is dead code, and directly modifying anything in there is an error.
-
-## Best Practices
-### Should I commit my vendor directory?
-
-It's up to you:
-
-**Pros**
-
-- It's the only way to get truly reproducible builds, as it guards against upstream renames,
-  deletes and commit history overwrites.
-- You don't need an extra `dep ensure` step to sync `vendor/` with Gopkg.lock after most operations,
-  such as `go get`, cloning, getting latest, merging, etc.
-
-**Cons**
-
-- Your repo will be bigger, potentially a lot bigger,
-  though `dep prune` can help minimize this problem.
-- PR diffs will include changes for files under `vendor/` when Gopkg.lock is modified,
-  however files in `vendor/` are [hidden by default](https://github.com/github/linguist/blob/v5.2.0/lib/linguist/generated.rb#L328) on Github.
-
-## How do I roll releases that `dep` will be able to use?
-
-In short: make sure you've committed your `Gopkg.toml` and `Gopkg.lock`, then
-just create a tag in your version control system and push it to the canonical
-location. `dep` is designed to work automatically with this sort of metadata
-from `git`, `bzr`, and `hg`.
-
-It's strongly preferred that you use [semver](http://semver.org)-compliant tag
-names. We hope to develop documentation soon that describes this more precisely,
-but in the meantime, the [npm](https://docs.npmjs.com/misc/semver) docs match
-our patterns pretty well.
-
-## What semver version should I use?
-
-This can be a nuanced question, and the community is going to have to work out
-some accepted standards for how semver should be applied to Go projects. At the
-highest level, though, these are the rules:
-
-* Below `v1.0.0`, anything goes. Use these releases to figure out what you want
-  your API to be.
-* Above `v1.0.0`, the general Go best practices continue to apply - don't make
-  backwards-incompatible changes - exported identifiers can be added to, but
-  not changed or removed.
-* If you must make a backwards-incompatible change, then bump the major version.
-
-It's important to note that having a `v1.0.0` does not preclude you from having
-alpha/beta/etc releases. The semver spec allows for [prerelease
-versions](http://semver.org/#spec-item-9), and `dep` is careful to _not_ allow
-such versions unless `Gopkg.toml` contains a range constraint that explicitly
-includes prereleases: if there exists a version `v1.0.1-alpha4`, then the
-constraint `>=1.0.0` will not match it, but `>=1.0.1-alpha1` will.
-
-Some work has been done towards [a tool
-to](https://github.com/bradleyfalzon/apicompat) that will analyze and compare
-your code with the last release, and suggest the next version you should use.
-
-## Is it OK to make backwards-incompatible changes now?
-
-Yes. But.
-
-`dep` will make it possible for the Go ecosystem to handle
-backwards-incompatible changes more gracefully. However, `dep` is not some
-magical panacea. Version and dependency management is hard, and dependency hell
-is real. The longstanding community wisdom about avoiding breaking changes
-remains important. Any `v1.0.0` release should be accompanied by a plan for how
-to avoid future breaking API changes.
-
-One good strategy may be to add to your API instead of changing it, deprecating
-old versions as you progress. Then, when the time is right, you can roll a new
-major version and clean out a bunch of deprecated symbols all at once.
-
-Note that providing an incremental migration path across breaking changes (i.e.,
-shims) is tricky, and something we [don't have a good answer for
-yet](https://groups.google.com/forum/#!topic/go-package-management/fp2uBMf6kq4).
-
-## My dependers don't use `dep` yet. What should I do?
-
-For the most part, you needn't do anything differently.
-
-The only possible issue is if your project is ever consumed as a library. If
-so, then you may want to be wary about committing your `vendor/` directory, as
-it can [cause
-problems](https://groups.google.com/d/msg/golang-nuts/AnMr9NL6dtc/UnyUUKcMCAAJ).
-If your dependers are using `dep`, this is not a concern, as `dep` takes care of
-stripping out nested `vendor` directories.
-
-## How do I configure a dependency that doesn't tag its releases?
-
-Add a constraint to `Gopkg.toml` that specifies `branch: "master"` (or whichever branch you need) in the `[[constraint]]` for that dependency. `dep ensure` will determine the current revision of your dependency's master branch, and place it in `Gopkg.lock` for you. See also: [What is the difference between Gopkg.toml and Gopkg.lock?](#what-is-the-difference-between-gopkgtoml-the-manifest-and-gopkglock-the-lock)
-
-## How do I use `dep` with Docker?
-
-`dep ensure -vendor-only` creates the vendor folder from a valid `Gopkg.toml` and `Gopkg.lock` without checking for Go code.
-This is especially useful for builds inside docker utilizing cache layers.
-
-Sample dockerfile:
-
-    FROM golang:1.9 AS builder
-
-    RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/vX.X.X/dep-linux-amd64 && chmod +x /usr/local/bin/dep
-
-    RUN mkdir -p /go/src/github.com/***
-    WORKDIR /go/src/github.com/***
-
-    COPY Gopkg.toml Gopkg.lock ./
-    # copies the Gopkg.toml and Gopkg.lock to WORKDIR
-
-    RUN dep ensure -vendor-only
-    # install the dependencies without checking for go code
-
-    ...
-
-
diff --git a/installer/vendor/github.com/golang/dep/docs/Gopkg.toml.md b/installer/vendor/github.com/golang/dep/docs/Gopkg.toml.md
deleted file mode 100644
index c17e14fe65..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/Gopkg.toml.md
+++ /dev/null
@@ -1,174 +0,0 @@
-# Gopkg.toml
-
-## `required`
-`required` lists a set of packages (not projects) that must be included in
-Gopkg.lock. This list is merged with the set of packages imported by the current
-project.
-```toml
-required = ["github.com/user/thing/cmd/thing"]
-```
-
-**Use this for:** linters, generators, and other development tools that
-
-* Are needed by your project
-* Aren't `import`ed by your project, [directly or transitively](FAQ.md#what-is-a-direct-or-transitive-dependency)
-* You don't want put in your `GOPATH`, and/or you want to lock the version
-
-Please note that this only pulls in the sources of these dependencies. It does not install or compile them. So, if you need the tool to be installed you should still run the following (manually or from a `Makefile`)  after each `dep ensure`:
-
-```bash
-cd vendor/pkg/to/install
-go install .
-```
-
-This only works reliably if this is the only project to install these executables. This is not enough if you want to be able to run a different version of the same executable depending on the project you're working. In that case you have to use a different `GOBIN` for each project, by doing something like this before running the above commands:
-
-```bash
-export GOBIN=$PWD/bin
-export PATH=$GOBIN:$PATH
-```
-
-You might also try [virtualgo](https://github.com/GetStream/vg), which installs dependencies in the `required` list automatically in a project specific `GOBIN`.
-
-## `ignored`
-`ignored` lists a set of packages (not projects) that are ignored when dep statically analyzes source code. Ignored packages can be in this project, or in a dependency.
-```toml
-ignored = ["github.com/user/project/badpkg"]
-```
-
-Use wildcard character (*) to define a package prefix to be ignored. Use this
-to ignore any package and their subpackages.
-```toml
-ignored = ["github.com/user/project/badpkg*"]
-```
-
-**Use this for:** preventing a package and any of that package's unique
-dependencies from being installed.
-
-## `metadata`
-`metadata` can exist at the root as well as under `constraint` and `override` declarations.
-
-`metadata` declarations are ignored by dep and are meant for usage by other independent systems.
-
-A `metadata` declaration at the root defines metadata about the project itself. While a `metadata` declaration under a `constraint` or an `override` defines metadata about that `constraint` or `override`.
-```toml
-[metadata]
-key1 = "value that convey data to other systems"
-system1-data = "value that is used by a system"
-system2-data = "value that is used by another system"
-```
-
-## `constraint`
-A `constraint` provides rules for how a [direct dependency](FAQ.md#what-is-a-direct-or-transitive-dependency) may be incorporated into the
-dependency graph.
-They are respected by dep whether coming from the Gopkg.toml of the current project or a dependency.
-```toml
-[[constraint]]
-  # Required: the root import path of the project being constrained.
-  name = "github.com/user/project"
-  # Recommended: the version constraint to enforce for the project.
-  # Only one of "branch", "version" or "revision" can be specified.
-  version = "1.0.0"
-  branch = "master"
-  revision = "abc123"
-
-  # Optional: an alternate location (URL or import path) for the project's source.
-  source = "https://github.com/myfork/package.git"
-
-  # Optional: metadata about the constraint or override that could be used by other independent systems
-  [metadata]
-  key1 = "value that convey data to other systems"
-  system1-data = "value that is used by a system"
-  system2-data = "value that is used by another system"
-```
-
-**Use this for:** having a [direct dependency](FAQ.md#what-is-a-direct-or-transitive-dependency)
-use a specific branch, version range, revision, or alternate source (such as a
-fork).
-
-## `override`
-An `override` has the same structure as a `constraint` declaration, but supersede all `constraint` declarations from all projects. Only `override` declarations from the current project's `Gopkg.toml` are applied.
-
-```toml
-[[override]]
-  # Required: the root import path of the project being constrained.
-  name = "github.com/user/project"
-  # Optional: specifying a version constraint override will cause all other constraints on this project to be ignored; only the overridden constraint needs to be satisfied. Again, only one of "branch", "version" or "revision" can be specified.
-  version = "1.0.0"
-  branch = "master"
-  revision = "abc123"
-  # Optional: specifying an alternate source location as an override will enforce that the alternate location is used for that project, regardless of what source location any dependent projects specify.
-  source = "https://github.com/myfork/package.git"
-
-  # Optional: metadata about the constraint or override that could be used by other independent systems
-  [metadata]
-  key1 = "value that convey data to other systems"
-  system1-data = "value that is used by a system"
-  system2-data = "value that is used by another system"
-```
-
-**Use this for:** all the same things as a [`constraint`](#constraint), but for
-[transitive dependencies](FAQ.md#what-is-a-direct-or-transitive-dependency).
-See [How do I constrain a transitive dependency's version?](FAQ.md#how-do-i-constrain-a-transitive-dependencys-version)
-for more details on how overrides differ from `constraint`s. _Overrides should
-be used cautiously, sparingly, and temporarily._
-
-## `version`
-
-`version` is a property of `constraint`s and `override`s. It is used to specify
-version constraint of a specific dependency.
-
-Internally, dep uses [Masterminds/semver](https://github.com/Masterminds/semver)
-to work with semver versioning.
-
-`~` and `=` operators can be used with the versions. When a version is specified
-without any operator, `dep` automatically adds a caret operator, `^`. The caret
-operator pins the left-most non-zero digit in the version. For example:
-```
-^1.2.3 means 1.2.3 <= X < 2.0.0
-^0.2.3 means 0.2.3 <= X < 0.3.0
-^0.0.3 means 0.0.3 <= X < 0.1.0
-```
-
-To pin a version of direct dependency in manifest, prefix the version with `=`.
-For example:
-```toml
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = "=0.8.0"
-```
-
-[Why is dep ignoring a version constraint in the manifest?](FAQ.md#why-is-dep-ignoring-a-version-constraint-in-the-manifest)
-
-# Example
-
-Here's an example of a sample Gopkg.toml with most of the elements
-
-```toml
-required = ["github.com/user/thing/cmd/thing"]
-
-ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-
-[metadata]
-codename = "foo"
-
-[[constraint]]
-  name = "github.com/user/project"
-  version = "1.0.0"
-
-  [metadata]
-  property1 = "value1"
-  property2 = 10
-
-[[constraint]]
-  name = "github.com/user/project2"
-  branch = "dev"
-  source = "github.com/myfork/project2"
-
-[[override]]
-  name = "github.com/x/y"
-  version = "2.4.0"
-
-  [metadata]
-  propertyX = "valueX"
-```
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.png
deleted file mode 100644
index e05dcf38f0..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.svg
deleted file mode 100644
index 84b63eca5e..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720.07 762.53"><defs><style>.cls-1{fill:#ced8d2;}.cls-2{fill:#1d1d1b;}.cls-3{fill:#ccbca8;}.cls-4{fill:#b7a38d;}.cls-5{fill:#b79765;}.cls-6{fill:#fff;}.cls-7{fill:#d7b89b;}.cls-8{opacity:0.27;}.cls-9{opacity:0.51;}.cls-10{fill:#e3fbfc;}.cls-11{opacity:0.39;}.cls-12{fill:none;stroke:#1d1d1b;stroke-linecap:round;stroke-linejoin:round;stroke-width:5px;}</style></defs><title>BoyeFlat</title><g id="BACKGROUND_OCLOR" data-name="BACKGROUND OCLOR"><path class="cls-1" d="M604,97c102.41,62,170.85,174.54,170.85,303,0,195.53-158.51,354-354,354s-354-158.51-354-354A352.48,352.48,0,0,1,139,185.68l6.95-8.83A356,356,0,0,1,220.64,108Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M774.33,418.17H743a2.5,2.5,0,0,1,0-5h31.33a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/></g><g id="COLOR"><path class="cls-3" d="M379.67,631.39l50.88-10.2,110.17-24.29,74.73-16.24-13.42-60L594.42,482H680l66-17.43V289l-50.12-6.6V177.1l-23.14-25.84-5.41-2.66L604,148V12.67L539,0,400,5V32H290L222,46V174.2l-83,2.89V312.74L80,314l-3.72,4.24,1,154.1,1.75,2,57.45,11.84,57.15-.53L343,454.5c-.07,0,4.24,22.37,4.47,23.62l4.68,24.73c1.64,8.67,3.73,18.35,2.53,27.22-.51,3.75-.49,7.66-.68,11.44-.17,3.33-.59,6.81,3.25,7.49,1.29.23,2.84-.51,3.7.5s.4,3.3.62,4.55c.37,2.13,1.11,4.34,1.52,6.52l2.81,14.86,5,26.61,5.49,29s.05.34.06.34Z" transform="translate(-60.79 2.5)"/><polygon class="cls-4" points="134.41 488.2 78.21 488.68 13.87 477.07 16.52 316.5 280.95 315.24 352.71 324.5 352.71 390.84 343.71 391 134.41 488.2"/><polygon class="cls-4" points="355.21 150.5 355.21 297.5 635.1 295.83 635.1 179.59 624.21 167 611.96 153.75 591.85 151.83 355.21 150.5"/><polygon class="cls-4" points="161.71 172.5 161.21 48.46 229.21 34.5 366.21 34.5 366.21 148.95 355.21 150.5 354.38 177.49 227.43 179.46 161.71 172.5"/><path class="cls-5" d="M345.88,628.62a19.34,19.34,0,0,0-3.63,1.85c-2.64,1.58-5.9,2.39-8.78,3.45-3.7,1.36-7.63,3.4-11.49,4.23L304,642l-23,.65-32.85-9.12-7.9,6.43-9.5,4.29-10.13,2L217.74,642l4.69-12.72,8.29-7.88-10.09-12.88-6.8-21.21c-.15-4.54-.28-9.09-.46-13.63-.3-7.38-4.83-1.22-7.93-5.12-2.19-2.75,1.31-8.37,2.14-11.07,1.07-3.46,3.65-6.93,4.39-10.37.4-1.85-.79-3.32-.72-5.08,0-1.19.59-1.75.76-2.79.45-2.78-.62-5.74-.77-8.51a117.36,117.36,0,0,0-1.67-11.85c-.45-2.87-.2-6.63-2.31-8.89-1.73-1.86-4.94-2-6.25-4.25-1.1-1.9.2-3.86,0-6-.46-5.23-3.43-9.56-5.81-14.05l-6.84-12.87-8.25-15.52-7.75-20.06,1.3-22.67L182,391.63l3.62-6.63-6.09-2.31-4.76-8.25-.58-11,2.6-4.53,6.43-3.44,5.21,1.25,9.51,9L222.55,355l38.54-8.5,1-7.65,2.74-5.2,5.88-1,3.44,2.58,4.14,9.6,24,.7,32,5.52L350,363.07l8.4-3.82L373.94,355l11.35.35,4.29,3.65L365.95,378.2l6.22,22,14.59,20.54,7.77,6.22-.82,12.28-.82,3.44L343,454.5c-.52.12,6.72,41.69,7.34,45.53.84,5.22,1.15,10.56,2.18,15.72a45.42,45.42,0,0,1,.49,8.61V535.8c0,3.16-.7,9.73,1.75,12.08,1.49,1.43,2.23-.07,3.76.62,2.49,1.13,3,8.54,3.63,11.14L365,572.22c1.27,5.54,3,11.17,3.86,16.79l6.24,40.78,3.37,3.93,3.22-.31.51,6.09-8.08,3.15c-7.9-3.34-15.36-6.95-21.87-12.71a6,6,0,0,0-1.84-1.28A6.58,6.58,0,0,0,345.88,628.62Z" transform="translate(-60.79 2.5)"/><path class="cls-6" d="M367.71,375s25.05-15.79,25.17-15.79,4.73,6.38,4.73,6.38l6.18,19.06-3.15,14-5.14,6.35-5.92,2.45-5.69-4.41-4.45-2.88.39-7.3L371,391.63Z" transform="translate(-60.79 2.5)"/><polygon class="cls-6" points="268 386.47 240.1 389.87 209.14 394.5 194.94 395.41 192.21 407.55 197.47 425.94 207.9 439.05 220.17 446.08 230.11 448.31 240.1 448.06 252.46 444.82 262.21 437.75 268.24 430.09 273.17 419.72 275.01 407.55 273.81 397.65 268 386.47"/><path class="cls-2" d="M362.47,402.31a4.84,4.84,0,0,0,1.79,1l3.11,1.18a10.32,10.32,0,0,0,3.91.92c2.44-.07,4.46-1.82,6.24-3.49a6,6,0,0,0,2.17-3.23A4.82,4.82,0,0,0,378,394.8c-2.45-2.47-7.94-4.68-11.46-3.35C363.61,392.55,359.91,399.72,362.47,402.31Z" transform="translate(-60.79 2.5)"/><path class="cls-7" d="M355,414.41c.84,3.95,4.6,7.43,8.59,6.85,2.93-.42,5.19-2.74,7.93-3.87,4.64-1.92,9.9-.21,14.92-.33a5,5,0,0,0,2-.35,3.89,3.89,0,0,0,1.84-4.23,10.3,10.3,0,0,0-2.31-4.34q-2.11-2.7-4.46-5.2c-1.22-1.3-3-2.65-4.61-1.88a6.15,6.15,0,0,0-1.74,1.69,7.77,7.77,0,0,1-7,2.48c-3.49-.58-7.21-4.17-10.76-2.09S354.24,410.71,355,414.41Z" transform="translate(-60.79 2.5)"/><g class="cls-8"><path class="cls-6" d="M368.81,388.34l-1.1-23.69s8.48-17.33,8.09-18,6.68-6.06,6.68-6.06l13-1,8.29,1.85,9.82,12.28,7.21,15.07L424.21,386l-4.71,21.73-6.39,11.59-8.61,4.11L390.36,422l-5.08-3.31,3.67-3.79v-5.42l-4-6.79-5.56-2.47-1.51-7.57Z" transform="translate(-60.79 2.5)"/></g><g class="cls-8"><polygon class="cls-6" points="226.66 366.6 237.24 361.46 250.18 361.46 265.7 366.6 279.96 384.01 285.01 395.42 287.35 407.55 286.4 422.15 279.23 440.12 268 452.2 253.91 456.94 235.27 454.47 220.17 446.08 208.28 425.94 205.61 398.57 213.7 378.9 226.66 366.6"/></g><g class="cls-9"><path class="cls-6" d="M409,439.75c2.36,4.34,2.22,12.12,2.69,17.5.09,1.06-.14,3.22.56,4,1.48,1.65,1-.36,2.56-.69.63-.14,1.51.46,1.75.39.58-.16,1.31-1.06,1.76-1.16,1.15-.24,3,.52,4.19,0,.76-.35,1-1.35,1.69-1.59.86-.31,1.44.2,2.31.08,1.47-.21,4-2,4.8-.05,1.43.12,1.21-1.24,2.15-1.49.72-.19,1.17.59,1.7.51.9-.12,3.54-.38,4.45-1,2.39-1.52,1-8.77.9-11.83A110.37,110.37,0,0,0,439,431.52c-2.13,0-4.39,1.84-6.54,2.33-5.92,1.36-12,1.57-17.91,3.15" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M536.5,417c-1.36,2.71.54,8.93,1.31,12,.62,2.48,1.22,5,1.73,7.46,1.31-.76,1.41-1.43,3-1.49a14.4,14.4,0,0,0,1.74.77c1.14.13,1.75-.4,2.77-.56,1.84-.29,4.55-.88,6.77-.28-2.06-4.24-3-8.94-3.79-13.6-.18-1,.13-3.81-.67-4.58C547.82,415.29,542.06,417.06,536.5,417Z" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M547.25,294.25c0,9.83-1.48,19.55-1.25,29.38,0,1-.43,3.13,0,4,1.14,2.17,1,.14,2.53.12s2.27,1.32,4.2,1.26c1.21,0,2.66-.62,4-.76,3.52-.36,8.43.88,11.46,2.23.67-11.62-.15-23.39-.24-34.95-.89,0-1.82,0-2.72,0" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M374.75,251c-.19,4,.75,8,.75,12,0,3.31-.18,6.68,0,10,.21,3.74.35,7.47.54,11.21,1.38.2,3.73-1.36,4.73-1,1.66.62.39,3.52,2.47,3.79,1.05.14,1.18-1.19,2-1.3s1.31.73,2,.73,1.89-.48,2.52-.4,1.11.91,1.41.91c4.59,0,3.49-6.39,3.58-10.1.13-5.21,1.23-10.28,1.25-15.49,0-1.39.84-6.83-.05-7.82-.59-.65-1.81-.24-2.59-.25-4.44,0-8.91.19-13.36.19" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M106.25,316.25c-1.22.56-1,9.29-1,11.36,0,3.62.17,7.29,0,10.9-.18,4,.39,8.06.28,12,1.35-.75,2.9-3.06,4.67-2.25.54.25.24,1.64,1,1.93.91.36,1.25-.45,2.07-.48,1.63-.05,2.85.13,4.37-.9,2.49-1.67,1.66-4,1.38-7a76.43,76.43,0,0,1,.5-16.47c.16-1.27,1.52-4.07.75-5.3-1.56-2.48-7.92.65-10.25-1.75" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M164.25,177.75c-1.19,3.13-.24,7.9-.49,11.31a68.35,68.35,0,0,0,.46,11.07c.29,3.43-.16,7.73,1.25,10.84,1-.46,1.46-1.42,2.82-1.47.78,0,2,.77,2.82,1,2.6.78,4.87,1.11,5.37-1.72,1.86-10.4-1.63-22.08,1-32.28" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M314.75,177.5c0,7.1,1,13.7,1.73,20.63.29,2.92-.35,7.68,1,10.32,1.16,2.23.77.49,2.85-.06,2.62-.7,1.29.93,3.27,1.47.61.17,2.79-.54,3.55-.66a40.06,40.06,0,0,0,4.08-.44c.39-.1,2-.76,2.13-.74.87.11,1.12.85,1.65,1,1.47.41,3.44.31,4.72,1.27,2.09-1.86,1.25-6.75,1.25-9.29a111.45,111.45,0,0,1,.28-11.35c.43-4.23,2.08-8.41,2-12.67,0,.13-.45.23-.75.54" transform="translate(-60.79 2.5)"/></g><path class="cls-6" d="M638.75,149.5c0,7.67-.1,15.3-.27,22.94.64-1.54,2.45-3.17,4.22-2.9.54,3.11,1,3.66,3.49,1.74,1.22,3.69,3.36-.27,4.8-1s3.29.33,4.75,0c2-.47,2.21-2.73,2.48-4.73.72-5.42,1.62-10.88,2.52-16.27" transform="translate(-60.79 2.5)"/><g class="cls-9"><path class="cls-6" d="M565.25,4.5c-1.2,3.83-.25,9.22-.25,13.24s-.2,8.22.13,12.26c.34,4.2,1,8.33,1.41,12.49.65-.46,1.79-2.75,2.71-2.77.62,0,1.28,1.34,2,1.55-.51-.15,2.6-.36,2.12-.27.58-.11,1.29.45,2.08-.47,0,.81.59,1.27.81,1.76a1.44,1.44,0,0,1,1.94-.08c1.62-2.72,1.09-7.6,1.24-10.71s.35-6.07.57-9.07c.26-3.51-1.82-10.46-.26-13.18" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M344,32c-.48,1,.06,2.92,0,4.3-.19,2.38-1.19,4.66-1.53,7-.46,3.24-.18,6.66-.18,9.93,0,4-.57,8.72.5,12.48,1.9-1.32,4.18-5.76,6.51-6,.23.57.47,2.78,1.23,3,1.51.34,1.67-2.51,2.77-2.78,1.7-.43,1.94,2.07,3.94.33,1,2.63,1.73,0,3-.48s2.08.81,3.71-.52c.4,1.15,1.06,2.27,2.23,2.45,1.38-2.07,1.35-4.43,1.62-6.86.37-3.41,1.16-6.53,1.19-10,0-4.25-.05-8.71,1.25-12.62" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M247.5,41.25c-.35,3.5,1.76,7.33,2.25,10.81.25,1.81.14,4,1.25,5.48,1.82-3,4.84,1.18,5.79-1,6.84,1.07,2.63-13.17,5-16.54" transform="translate(-60.79 2.5)"/></g><g class="cls-9"><path class="cls-6" d="M709.67,295.33c2.33,3.49,2,11.62,2,16a48.19,48.19,0,0,1-1.63,14c1.82-1.77,2.28-.66,4.27-.64,1.46,0,2.63.09,4.2,0,4.21-.25,4.85.8,4.83-4.4,0-9,1.83-19.42,1.67-27.6" transform="translate(-60.79 2.5)"/></g><path class="cls-5" d="M372.5,517.5c-1,0-4.6-.61-5.25-.27-1.44.77-.83,5.27-1.06,7.08a86.53,86.53,0,0,0-.65,15.65c3.48.21,7.31-1.35,10.34-2.82,2.46-1.19,7-2.37,8.37-5,1.23-2.26-.15-5.42-1.3-7.43C380.22,520,375.95,520.66,372.5,517.5Z" transform="translate(-60.79 2.5)"/><path class="cls-6" d="M364,513.75c-1.64,0-3.47.25-5-.4-1-.43-1.89-2-2.87-2.21-2.63-.57-3.64,4.44-3.93,6.55-.65,4.7,0,9.78-.21,14.56-.18,3.54-.83,7.5-.49,11,.27,2.77,5.17,7.86,7,3.79,2.07,0,2.24,1.42,4.13-.47,2.36-2.36,2.43-8.28,2.58-11.46A89.06,89.06,0,0,0,364,513.75Z" transform="translate(-60.79 2.5)"/><path class="cls-6" d="M346.75,488.75c-4.43-.36-9,1.44-13.25,2.5s-8.35,2.19-12.6,2.12a119.23,119.23,0,0,0-14.92.71c-9.72,1-19.31,3-29,4.43-8,1.18-16.07.42-24.15.8a160.73,160.73,0,0,1-21.67-.3c-3.36-.3-6.5-1.24-9.81-1.71s-7.16.62-10.52,0c-2.57-.5-10.5-4.42-12.24-.89-1.1,2.24,1.65,9,3.37,10.62,1.91,1.8,3.77,2.19,5.08,4.74s1.34,5.38,2.05,8a61.06,61.06,0,0,1,2,12c.21,3.07-.48,6-.26,9,.41,5.51-1.6,10.3-2.13,15.74-.27,2.81-1.92,4.91-2.43,7.58-.45,2.35-1.55,4.24.74,5.47,1.78,1,4.4.33,6.33.6,4.14.59,8.24,1.38,12.37,2.18,10.84,2.11,23,2.42,34,1.95a173.24,173.24,0,0,1,25.22.5c7.15.72,14.39,1.51,21.56,1.87s13.5.73,20.7-.13c4.43-.53,8.73-1,13.2-1.3,3.77-.21,7.17-.5,10.6-2,2.85-1.28,10.28-3.3,11-6.25.81-3.33-1.57-7.8-2-11.1-.3-2.5-.36-4.25-1.34-6.51-5.43.15-6.21-5.74-6.47-10.28-.19-3.35,1.7-6.78,2.08-10.14a70.7,70.7,0,0,0,.18-8.57c-.06-4.81-1.46-9.9-2.56-14.55-.51-2.15-4.41-14.24-4.69-14.24" transform="translate(-60.79 2.5)"/><path class="cls-6" d="M367.67,422.33c-.24-.33.24-.54-.26-.66-.48,7.73,6.38,11.62,12.85,8.57,5.41-2.54,7.2-11,.74-12.92A11.57,11.57,0,0,0,367.67,422.33Z" transform="translate(-60.79 2.5)"/><path class="cls-10" d="M231,391.5c-3,2.57-14.36,15.14-8,18.65C227.9,412.85,231.23,401.12,231,391.5Z" transform="translate(-60.79 2.5)"/><path class="cls-10" d="M230.5,419c-3.25,2.7-10.29,24.24-2.73,21.27C233.1,438.17,229.89,425.67,230.5,419Z" transform="translate(-60.79 2.5)"/></g><g id="DETAILS"><path class="cls-2" d="M391.56,572.73a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,0,1,.5,1.94l-33.32,8.69A1,1,0,0,1,391.56,572.73Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M398.8,603.88a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.1,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M398.8,603.88a1,1,0,0,1-.24-2c11.3-2.76,24.26-5.85,34.69-7.87a1,1,0,1,1,.38,2c-10.39,2-23.32,5.09-34.6,7.85A1,1,0,0,1,398.8,603.88Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M433.44,596a1,1,0,0,1-.92-.61c-2.65-6.23-4.23-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,0,1,1.92-.57c1.08,3.65,2,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M430.55,564.05a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,0,1,.5,1.94L430.8,564A1,1,0,0,1,430.55,564.05Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M437.79,595.21a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.11,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M437.79,595.21a1,1,0,0,1-.24-2c11.3-2.76,24.26-5.85,34.69-7.87a1,1,0,1,1,.38,2c-10.39,2-23.32,5.09-34.6,7.85A1,1,0,0,1,437.79,595.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M472.43,587.35a1,1,0,0,1-.92-.61c-2.65-6.23-4.24-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,0,1,1.92-.57c1.08,3.65,1.95,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M469.54,555.13a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,1,1,.5,1.94l-33.32,8.69A1,1,0,0,1,469.54,555.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M476.78,586.28a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.11,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M476.78,586.28a1,1,0,0,1-.24-2c11.31-2.76,24.27-5.86,34.69-7.87a1,1,0,0,1,.38,2c-10.38,2-23.31,5.09-34.6,7.85A1,1,0,0,1,476.78,586.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M511.42,578.43a1,1,0,0,1-.92-.61c-2.65-6.23-4.23-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,1,1,1.92-.57c1.08,3.65,1.95,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M411,594.15a1,1,0,0,1-1-.75,147.58,147.58,0,0,1-3-14.59,1,1,0,0,1,2-.3,146,146,0,0,0,2.94,14.39,1,1,0,0,1-1,1.25Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M404.8,579.33a.31.31,0,0,0,0,.19c0,.18.32.13.49,0a15.4,15.4,0,0,1,5.9-1.86,13.93,13.93,0,0,1-2.23-2.31c-.38-.46-1.53-2.3-2.17-2.28-.82,0-.82,2.22-.95,2.8A23.77,23.77,0,0,1,404.8,579.33Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M417.37,592.77a1,1,0,0,1-1-.75,147.58,147.58,0,0,1-3-14.59,1,1,0,0,1,2-.3,146,146,0,0,0,2.94,14.39,1,1,0,0,1-1,1.25Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M411.2,578a.31.31,0,0,0,0,.19c0,.18.32.13.49,0a15.4,15.4,0,0,1,5.9-1.86,13.93,13.93,0,0,1-2.23-2.31c-.38-.46-1.53-2.3-2.17-2.28-.82,0-.82,2.22-.95,2.8A23.77,23.77,0,0,1,411.2,578Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M408.18,597.66a1,1,0,0,1-.14-2,113.17,113.17,0,0,0,12.62-2.59,1,1,0,0,1,.51,1.93,115.38,115.38,0,0,1-12.84,2.63Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M455.14,587.53l-.29,0a3,3,0,0,1-2.33-2.1,16.6,16.6,0,0,1-.68-2l-2.24-7.76a1,1,0,1,1,1.92-.55l2.24,7.76a14.83,14.83,0,0,0,.59,1.77c.22.52.52.88.75.91a.8.8,0,0,0,.62-.44,4.3,4.3,0,0,0,.38-1.52,1,1,0,0,1,2,.26,6,6,0,0,1-.64,2.26A2.74,2.74,0,0,1,455.14,587.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M443.83,577.65a1.81,1.81,0,0,1-1.5-.64c-.86-1.07,0-2.7.28-3.23a9.06,9.06,0,0,1,5.24-4.79,13.43,13.43,0,0,1,5.21-.59,7.57,7.57,0,0,1,4.56,1.92c.75.55,2.14,1.58,2.24,3.18a1,1,0,0,1-.77,1c-3.13.75-6.31,1.44-9.45,2.06-.59.12-1.19.21-1.79.31a28,28,0,0,0-2.87.56A4.39,4.39,0,0,1,443.83,577.65Zm8.13-7.28a10.64,10.64,0,0,0-3.46.52,7.11,7.11,0,0,0-4.12,3.83,4.21,4.21,0,0,0-.38.92,3.18,3.18,0,0,0,.45-.09,29.36,29.36,0,0,1,3.08-.61c.58-.09,1.15-.18,1.72-.3,2.74-.54,5.51-1.14,8.25-1.78a6.36,6.36,0,0,0-1.07-.93,5.68,5.68,0,0,0-3.49-1.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M449.68,569.86a1,1,0,0,1-.95-.68l-.65-1.95a1,1,0,1,1,1.89-.64l.66,2a1,1,0,0,1-.95,1.32Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M487.63,569.34a7.54,7.54,0,0,1-2.89-.62,4.08,4.08,0,0,1-1.66-1.15,4.62,4.62,0,0,1-.81-2l-1.89-9.07a1,1,0,0,1,2-.41l1.89,9.07a3,3,0,0,0,.41,1.2,2.27,2.27,0,0,0,.87.55,5.12,5.12,0,0,0,2.67.42,2.93,2.93,0,0,0,2-1.2c.79-1.21.35-3-.12-4.65L488.21,555a1,1,0,0,1,1.92-.56l1.89,6.42c.6,2,1.14,4.39-.12,6.31a4.88,4.88,0,0,1-3.42,2.08A5.85,5.85,0,0,1,487.63,569.34Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M481.41,557a1,1,0,0,1-.38-1.93,10,10,0,0,1,2.29-.55l5.71-.89a1,1,0,1,1,.31,2l-5.71.89a8.28,8.28,0,0,0-1.84.43A1,1,0,0,1,481.41,557Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.11,579a1,1,0,0,1-1-.73c-.84-3-1.53-6.16-2.07-9.27a1,1,0,0,1,2-.34c.53,3,1.21,6.1,2,9.07a1,1,0,0,1-1,1.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M486.73,580.72a1,1,0,0,1-.4-1.92,11.07,11.07,0,0,1,2.91-.69l.95-.14a13.12,13.12,0,0,0,2.83-.84,1,1,0,1,1,.78,1.84,15.09,15.09,0,0,1-3.26,1l-1,.16a9.4,9.4,0,0,0-2.39.54A1,1,0,0,1,486.73,580.72Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M539.23,438.62h-.05a1,1,0,0,1-.92-.76,100.06,100.06,0,0,1-2.75-19.47,1,1,0,1,1,2-.08,98.07,98.07,0,0,0,2.08,16.38q.29-.45.62-.87a1,1,0,0,1,1.55,0,3,3,0,0,0,1.45,1.13.67.67,0,0,0,.6-.23,1,1,0,0,1,1.91-.48.66.66,0,0,0,.78.29,2.38,2.38,0,0,0,.25-.15,2.75,2.75,0,0,1,1-.43,2.79,2.79,0,0,1,1.72.3l.35.14h.05a1,1,0,0,1,1.57-.38,4,4,0,0,0,1.15.68c-1.13-6.06-2.51-12.14-4.09-18.09a1,1,0,1,1,1.93-.51c1.72,6.47,3.2,13.1,4.39,19.69a1,1,0,0,1-.23.83.94.94,0,0,1-.79.34,6.06,6.06,0,0,1-2.82-.83,2.28,2.28,0,0,1-1.79.15c-.17-.06-.34-.13-.52-.2a2,2,0,0,0-.52-.18,1.72,1.72,0,0,0-.28.16,4.4,4.4,0,0,1-.47.27,2.6,2.6,0,0,1-2,.06l-.29-.12,0,0a2.66,2.66,0,0,1-2.24.61,3.67,3.67,0,0,1-1.69-.87,10.64,10.64,0,0,0-.95,2A1,1,0,0,1,539.23,438.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M413.45,463.26a1,1,0,0,1-.8-.4c-1.36-1.8-1.36-4.11-1.36-6.14v-.54a34.58,34.58,0,0,0-3.39-14.73,1,1,0,1,1,1.8-.87,36.62,36.62,0,0,1,3.59,15.59v.55a13.41,13.41,0,0,0,.31,3.6l.66-.92a1,1,0,0,1,1.67.06.37.37,0,0,0,.31.11.38.38,0,0,0,.31-.12l.07-.15a2.15,2.15,0,0,1,.55-.8c1.06-.91,2.17-.05,2.7.36a3.14,3.14,0,0,0,.62.41.21.21,0,0,0,.19,0,3,3,0,0,0,1-1.69,1,1,0,0,1,1.81-.24,2,2,0,0,0,3.34-.39,1,1,0,0,1,1.69-.34,3.62,3.62,0,0,0,2.06,1.31.43.43,0,0,0,.31-.13,2.09,2.09,0,0,0,.27-.51,4.56,4.56,0,0,1,.43-.81,2.72,2.72,0,0,1,2.6-1.06,3,3,0,0,1,1.39.55l.45-.45a1,1,0,0,1,1.59.25.43.43,0,0,0,.78-.35,1,1,0,0,1,1.77-.91,2.4,2.4,0,0,0,.38.45l-1.72-21.17a1,1,0,0,1,2-.16l1.86,22.86a1,1,0,0,1-1.15,1.07A4.46,4.46,0,0,1,440,457a2.36,2.36,0,0,1-.95.8,2.48,2.48,0,0,1-2.26-.15l-.54.54a1,1,0,0,1-1.64-.35.78.78,0,0,0-.64-.4.79.79,0,0,0-.72.23,3,3,0,0,0-.23.46,3.62,3.62,0,0,1-.64,1.07,2.39,2.39,0,0,1-1.79.77,4.43,4.43,0,0,1-2.59-1.09,4,4,0,0,1-2.48,1.18,4.09,4.09,0,0,1-2.49-.47,3.7,3.7,0,0,1-1.47,1.51,2.18,2.18,0,0,1-1.77.1,4.43,4.43,0,0,1-1.15-.7l-.26-.2-.09.18a2.34,2.34,0,0,1-2,1.14,2.22,2.22,0,0,1-1-.18l-1,1.45a1,1,0,0,1-.8.42Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M568,334.05a2,2,0,0,1-1.63-.84q-.62-.86-1.14-1.78a2.62,2.62,0,0,1-1.57.53,3.26,3.26,0,0,1-2.43-1.15l-.8-.81a3.77,3.77,0,0,1-4.27.95,4,4,0,0,1-1.4-1.09l-.28.46a2.83,2.83,0,0,1-4.34.92l-1.78-1.15a13.94,13.94,0,0,1-1.61,1.75,2,2,0,0,1-3.34-1.73,114.37,114.37,0,0,0,.86-19.86c0-.71-.07-1.42-.11-2.13a46.28,46.28,0,0,1,.41-11.9,2,2,0,0,1,3.92.81,42.57,42.57,0,0,0-.33,10.87c0,.72.08,1.45.11,2.17a118.36,118.36,0,0,1-.32,15.26,2,2,0,0,1,.92.31l2.7,1.75,1.05-1.76a2,2,0,0,1,1.89-1,4,4,0,0,1,3,2.11l.21.31a4.35,4.35,0,0,0,.77-1.08,2,2,0,0,1,3.2-.48l1.59,1.62a2.92,2.92,0,0,1,2.11-1.48,2,2,0,0,1,1.14.17c.08-3.24-.09-6.52-.25-9.73-.35-7-.71-14.15,1.29-21.07a2,2,0,1,1,3.84,1.11c-1.81,6.28-1.48,12.83-1.13,19.77.27,5.39.55,11-.26,16.43a2,2,0,0,1-2,1.71Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M723.53,328.85a2,2,0,0,1-1.7-.94h0a3.37,3.37,0,0,1-1.62.17,3.55,3.55,0,0,1-1.3-.46,2,2,0,0,1-1.19.4,2,2,0,0,1-1.59-.77,4.51,4.51,0,0,0-1.65-1.3,8.46,8.46,0,0,1-2.29,2.39,2,2,0,0,1-3.14-1.52,48.11,48.11,0,0,1,.34-7.82c.06-.61.12-1.22.17-1.83a90.75,90.75,0,0,0-.81-22.43,2,2,0,0,1,3.95-.64,94.8,94.8,0,0,1,.84,23.42c-.06.62-.12,1.25-.18,1.87s-.15,1.48-.21,2.21a2,2,0,0,1,.52,0,8.49,8.49,0,0,1,3.76,1.46,3.43,3.43,0,0,0,4.1-.29h0c.07-9.84.45-19.76,1.14-29.55a2,2,0,0,1,4,.28c-.78,11.06-1.17,22.29-1.15,33.37a2,2,0,0,1-2,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M637.16,177a2,2,0,0,1-2-2.4,143.33,143.33,0,0,0,2.81-24,2,2,0,0,1,4,.13,147.05,147.05,0,0,1-1.22,14.67,2.79,2.79,0,0,1,2.14,1.26l1.59,2.13a3.5,3.5,0,0,1,.5-.66,3.06,3.06,0,0,1,4.17-.17l.15-.26a2,2,0,0,1,1.79-1,2,2,0,0,1,1.73,1.1q.29.58.56,1.17l1.26-1.74a2.6,2.6,0,0,1,2.63-1.2,63.58,63.58,0,0,0,2.49-16.74,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,67.58,67.58,0,0,1-4,22,2,2,0,0,1-2,1.32,2,2,0,0,1-1.54-.82l-1.84,2.54a3.31,3.31,0,0,0-4.89.84,2,2,0,0,1-1.91-.57l-.1-.11a3.58,3.58,0,0,1-.21.34,2,2,0,0,1-1.61.85,2.09,2.09,0,0,1-1.63-.81l-3-4.05L639,175.74A2,2,0,0,1,637.16,177Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M578.34,48.08a2,2,0,0,1-1-.25,5.11,5.11,0,0,1-2.11-2.27,3,3,0,0,1-1.94-.21,3.58,3.58,0,0,1-1.52-1.43,2,2,0,0,1-3.17-.08L568,43a18.65,18.65,0,0,0-.65,2.92,2,2,0,0,1-4-.28q0-18.63,0-37.26a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2q0,14.29,0,28.57h0a2,2,0,0,1,1.76.82l.71,1q.19-.25.41-.48a2,2,0,0,1,3.22.4l1,1.85a2,2,0,0,1,1.76-1.37c-.05-9.67.38-19.39,1.28-29a2,2,0,1,1,4,.38A288.91,288.91,0,0,0,580.34,46a2,2,0,0,1-2,2.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M341.35,72.24a2,2,0,0,1-2-2.07c.46-12.23,1.44-24.6,2.91-36.75a2,2,0,1,1,4,.48c-1,8.09-1.74,16.27-2.27,24.44a2,2,0,0,1,2.25-.33,11,11,0,0,1,2.36,1.58l.3-.64a2,2,0,0,1,3.7.19l.48,1.37a3.47,3.47,0,0,1,2.3-1.8,2,2,0,0,1,1.66.4l.16.15.08-.15a2,2,0,0,1,2.43-.89q.18-.64.32-1.28a2,2,0,0,1,3.93.11q0,.25.09.51a2,2,0,0,1,2-1.12l2.38-24.32a2,2,0,0,1,4,.39l-3.12,31.83a2,2,0,0,1-3.57,1,8.93,8.93,0,0,1-.56-.81,2,2,0,0,1-3-.59l-.26-.48q-.31.63-.65,1.25a9.33,9.33,0,0,0-4.17,1,2,2,0,0,1-1.71-.68l-.2-.24a3.67,3.67,0,0,1-1.7,1.06,2.83,2.83,0,0,1-2.46-.47,2.94,2.94,0,0,1-.64-.68,2,2,0,0,1-3.08-.44,6.92,6.92,0,0,0-.75-1,31,31,0,0,1-3.55,8A2,2,0,0,1,341.35,72.24Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M250.94,60a2,2,0,0,1-2-1.71L246.6,42.31a2,2,0,1,1,4-.58L252,51.65a2,2,0,0,1,1.31.75l.35.44a2,2,0,0,1,2.52.09,3.33,3.33,0,0,1,.47.5,2.46,2.46,0,0,1,.74-.33,2,2,0,0,1,1,0,2,2,0,0,1,1.21-.66c.05-4.25.07-8.52,0-12.75a2,2,0,0,1,2-2,2,2,0,0,1,2,2c0,5.9,0,11.88-.12,17.78a2,2,0,0,1-3,1.67,5.14,5.14,0,0,1-.61-.43,2,2,0,0,1-2.39-.14,2.66,2.66,0,0,1-1.36.08A3.1,3.1,0,0,1,255,58.1a2,2,0,0,1-1.1.3,2,2,0,0,1-1-.27,2,2,0,0,1-1.82,1.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.36,215.29h-.1a2,2,0,0,1-1.83-1.51c0-.09-.06-.22-.1-.37a2,2,0,0,1-2.54-.55,5.77,5.77,0,0,1-.38-.57,1.5,1.5,0,0,0-2,.7,2.42,2.42,0,0,1-2.31-1.24,3.3,3.3,0,0,1-.73.66,3.23,3.23,0,0,1-2.57.42,3.9,3.9,0,0,1-1.72-.94L326,212a7.25,7.25,0,0,0-3.9.33,2,2,0,0,1-1.52-.63q-.69-.73-1.3-1.52l-.78,1.1a2,2,0,0,1-3.63-1,286.61,286.61,0,0,1-.45-32.05,2,2,0,0,1,2.08-1.91,2,2,0,0,1,1.91,2.08c-.37,8.76-.33,17.62.13,26.4a2,2,0,0,1,2.54.87q.33.6.71,1.16a13.67,13.67,0,0,0,5.52-1.38,2,2,0,0,1,1.48,2v.13a3.09,3.09,0,0,1,3.68-1.4,2.81,2.81,0,0,1,.86.51l.5-1a2,2,0,0,1,3.78.82l0,.35a2,2,0,0,1,1,2,3.47,3.47,0,0,1,.74.11,50.87,50.87,0,0,0,.36-7.37v-.84a208.41,208.41,0,0,1,1.46-24.08,2,2,0,1,1,4,.47,204.43,204.43,0,0,0-1.43,23.61v.84c0,4.07,0,8.28-1.47,12.29A2,2,0,0,1,340.36,215.29Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.18,290.76a2.88,2.88,0,0,1-2.64-1.93,2,2,0,0,1-2.78-.7l-.18.21a2,2,0,0,1-3.18-.19q-.27-.4-.56-.78a16.48,16.48,0,0,0-.57,1.72,2,2,0,0,1-3.93-.47l-1-34.89a2,2,0,1,1,4-.12l.84,28.28a2,2,0,0,1,1.56.52q.68.62,1.29,1.31.2-.34.38-.69A2,2,0,0,1,383.1,282a2,2,0,0,1,1.77,1l.06.11a2,2,0,0,1,3.53.81l.19.87.92-1.57a2,2,0,0,1,3.72.89q0,.2,0,.39l.06,0c1.1-7.19,2-14.54,1.41-21.78,0-.57-.1-1.13-.16-1.7a28.16,28.16,0,0,1,0-7.76,2,2,0,1,1,3.94.7,24.78,24.78,0,0,0,.07,6.67c.06.59.12,1.18.16,1.76.73,8.92-.66,17.76-2,26.32a4,4,0,0,1-6.32.89,2.86,2.86,0,0,1-1.82,1.19A2.66,2.66,0,0,1,388.18,290.76Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M176,215.44a2,2,0,0,1-1.12-.34,8,8,0,0,1-1.65-1.5l-.06.07a2,2,0,0,1-3,.23q-.18-.17-.35-.36a2,2,0,0,1-2.12-.32q-.42-.37-.82-.77l0,.15a2,2,0,0,1-3.94-.14,198.32,198.32,0,0,1-1.3-35.58,2,2,0,1,1,4,.21,194.37,194.37,0,0,0,.65,29.33h.13a2,2,0,0,1,1.72,1,10,10,0,0,0,.56.9l.19-.32a2,2,0,0,1,3.55.21,2,2,0,0,1,2.92.93,2,2,0,0,1,.22-.25,104.51,104.51,0,0,0-.31-12.64c-.42-6.48-.85-13.19.58-19.75a2,2,0,1,1,3.91.85c-1.31,6-.92,12.15-.5,18.64a89.68,89.68,0,0,1,.08,15.77,2,2,0,0,1-1.27,1.64l-.2.61a2,2,0,0,1-1.9,1.38Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M105.57,354.11a2,2,0,0,1-2-2.32,82.63,82.63,0,0,0,.84-19.26c-.09-1.22-.21-2.43-.32-3.65a61.71,61.71,0,0,1-.39-10.8,2,2,0,1,1,4,.32,57.8,57.8,0,0,0,.39,10.1c.12,1.25.24,2.49.33,3.74a86.64,86.64,0,0,1,0,13.21l.17.05a2,2,0,0,1,1.25,1.26,2,2,0,0,1,3.41-.55,2,2,0,0,1,2.72-.39c-.92-8.6.7-17.35,2.13-25.16a2,2,0,0,1,3.93.72c-1.59,8.64-3.24,17.58-1.78,26.27.41,2.42-.13,4.09-1.6,4.95a2,2,0,0,1-2.71-.67,2,2,0,0,1-1.35-.21,2,2,0,0,1-2.37-.24l-.42-.4a3.82,3.82,0,0,1-2.09.58,3.71,3.71,0,0,1-1.5-.36l-.84,1.69A2,2,0,0,1,105.57,354.11Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M312.16,134.92a.81.81,0,0,1,0-1.62L340,133a.83.83,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M311.72,160.82a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.81.81,0,0,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.48,161.46h0c-8.56-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.48,161.46a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,1.62-.07c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M344.5,135.77a.81.81,0,0,1,0-1.62l27.89-.27a.81.81,0,1,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M344.06,161.67a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.81.81,0,0,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372.82,162.31h0c-8.55-.47-19.32-.58-28.72-.64a.81.81,0,0,1-.81-.81.8.8,0,0,1,.81-.81c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372.82,162.31a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.8.8,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.88,136.43a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.44,162.33a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.81.81,0,1,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M405.21,163h0c-8.57-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.41.05,20.2.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M405.21,163a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.84.84,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M323.19,155.57a.81.81,0,0,1-.81-.8,119.45,119.45,0,0,1,.53-12,.81.81,0,1,1,1.61.15,117.78,117.78,0,0,0-.52,11.88.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M321.06,142.69a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,321.06,142.69Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M328.49,155.74a.81.81,0,0,1-.81-.8,119.74,119.74,0,0,1,.53-12,.81.81,0,1,1,1.61.15,118.08,118.08,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M326.36,142.86a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,326.36,142.86Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M359.46,159.08a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.4,13.4,0,0,1-.14-1.71L357,148.6a.81.81,0,1,1,1.62-.06l.24,6.54a12,12,0,0,0,.12,1.51c.07.45.23.79.41.86a.65.65,0,0,0,.57-.23,3.52,3.52,0,0,0,.6-1.12.81.81,0,1,1,1.5.6,4.84,4.84,0,0,1-.94,1.65A2.32,2.32,0,0,1,359.46,159.08Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M364.67,149.6h0c-2.6,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a22.82,22.82,0,0,0-2.37-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.84,10.84,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,364.67,149.6Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.56.19,6.83.22a5.18,5.18,0,0,0-.66-.94,4.6,4.6,0,0,0-2.44-1.89,9.3,9.3,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.41,3.41,0,0,0-.48.65,2.61,2.61,0,0,0,.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M358.38,144.1a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.61-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M389.22,151.27l-.45,0a5.75,5.75,0,0,1-2.82-1.17,3.27,3.27,0,0,1-1.08-1.23,3.75,3.75,0,0,1-.23-1.76l.3-7.5a.82.82,0,0,1,.84-.78.81.81,0,0,1,.78.84l-.3,7.49a2.47,2.47,0,0,0,.09,1,1.72,1.72,0,0,0,.57.6,4.14,4.14,0,0,0,2,.86,2.37,2.37,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,1,1,1.62-.07l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,389.22,151.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M392.22,140.66h-.07l-4.66-.42a6.73,6.73,0,0,0-1.53,0,.81.81,0,0,1-.23-1.6,8.12,8.12,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.35,159.23a.81.81,0,0,1-.81-.79c-.06-2.56,0-5.14.2-7.69a.81.81,0,0,1,1.62.12c-.19,2.49-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M389.16,160.06q-.43,0-.86,0l-.83-.08a7.63,7.63,0,0,0-2,0,.81.81,0,0,1-.26-1.6,8.9,8.9,0,0,1,2.41,0l.78.07a10.65,10.65,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.24,12.24,0,0,1,389.16,160.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M436.16,110.93a.81.81,0,0,1,0-1.62L464,109a.85.85,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M435.72,136.83a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M464.49,137.47h0c-8.55-.47-19.32-.58-28.73-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M464.48,137.47a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75A.81.81,0,0,1,464,109a.84.84,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M468.5,111.78a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M468.06,137.69a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M496.82,138.33h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M496.82,138.33a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M500.89,112.44a.81.81,0,0,1,0-1.62l27.89-.27a.84.84,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M500.45,138.34a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M529.21,139h0c-8.55-.47-19.32-.59-28.73-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.22.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M529.21,139a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M447.2,131.58a.81.81,0,0,1-.81-.8,119.88,119.88,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.36,118.36,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M445.07,118.7a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,445.07,118.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M452.5,131.76a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M450.37,118.88a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,450.37,118.88Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M483.46,135.1a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.51,13.51,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78l.24,6.54a12.11,12.11,0,0,0,.12,1.51c.08.45.24.79.41.86a.64.64,0,0,0,.57-.23,3.54,3.54,0,0,0,.6-1.12.81.81,0,1,1,1.5.6,4.78,4.78,0,0,1-.94,1.65A2.32,2.32,0,0,1,483.46,135.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M488.68,125.61h0c-2.61,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a21.9,21.9,0,0,0-2.37-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.85,10.85,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,488.68,125.61Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.55.19,6.83.22a5.15,5.15,0,0,0-.66-.94,4.59,4.59,0,0,0-2.44-1.89,9.34,9.34,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.38,3.38,0,0,0-.48.65l.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M482.39,120.11a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.62-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M513.23,127.28l-.45,0a5.74,5.74,0,0,1-2.82-1.17,3.27,3.27,0,0,1-1.08-1.23,3.76,3.76,0,0,1-.23-1.76l.3-7.5a.85.85,0,0,1,.84-.78.81.81,0,0,1,.78.84l-.3,7.49a2.48,2.48,0,0,0,.09,1,1.84,1.84,0,0,0,.57.6,4.14,4.14,0,0,0,2,.86,2.39,2.39,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,.78-.84.8.8,0,0,1,.84.78l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,513.23,127.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M516.23,116.68h-.07l-4.66-.42a6.78,6.78,0,0,0-1.53,0,.81.81,0,1,1-.23-1.6,8.16,8.16,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M512.36,135.24a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.14.2-7.69a.82.82,0,0,1,.87-.75.81.81,0,0,1,.75.87c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M513.16,136.07q-.43,0-.86,0l-.83-.08a7.66,7.66,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.62,10.62,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.27,12.27,0,0,1,513.16,136.07Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.5,258.07a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.06,284a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M518.83,284.61h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M518.83,284.61a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M522.84,258.92a.81.81,0,0,1,0-1.62l27.89-.27a.79.79,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M522.4,284.82a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M551.17,285.46h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M551.17,285.46a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M555.23,259.58a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M554.79,285.48a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M583.56,286.12h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M583.55,286.12a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M501.54,278.72a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M499.41,265.84a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,499.41,265.84Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M506.84,278.89a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M504.71,266a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,504.71,266Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M537.81,282.23a1.86,1.86,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.51,13.51,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78l.24,6.54a12.11,12.11,0,0,0,.12,1.51c.08.45.24.79.41.86a.65.65,0,0,0,.57-.23,3.49,3.49,0,0,0,.6-1.12.81.81,0,1,1,1.51.6,4.85,4.85,0,0,1-.94,1.65A2.32,2.32,0,0,1,537.81,282.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M543,272.75h0c-2.6,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a23.26,23.26,0,0,0-2.38-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.88,10.88,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.76,3.76,0,0,1,1.13,2.94A.81.81,0,0,1,543,272.75Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.55.19,6.83.22a5.25,5.25,0,0,0-.66-.94,4.6,4.6,0,0,0-2.44-1.89,9.31,9.31,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.47,3.47,0,0,0-.48.65,2.52,2.52,0,0,0,.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M536.73,267.24a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.62-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567.57,274.42l-.45,0a5.76,5.76,0,0,1-2.82-1.17,3.26,3.26,0,0,1-1.08-1.23,3.8,3.8,0,0,1-.23-1.76l.3-7.49a.81.81,0,0,1,.81-.78h0a.81.81,0,0,1,.78.84l-.3,7.49a2.49,2.49,0,0,0,.09,1,1.85,1.85,0,0,0,.57.6,4.15,4.15,0,0,0,2,.86,2.37,2.37,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,1.62-.07l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,567.57,274.42Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M570.57,263.81h-.07l-4.66-.42a6.7,6.7,0,0,0-1.53,0,.81.81,0,1,1-.23-1.6,8.16,8.16,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M566.7,282.37a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.13.2-7.69a.82.82,0,0,1,.87-.75.81.81,0,0,1,.75.87c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567.51,283.21q-.43,0-.86,0l-.83-.08a7.59,7.59,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.58,10.58,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.27,12.27,0,0,1,567.51,283.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M587.27,441.82a.81.81,0,0,1,0-1.62l23.12-.22a.81.81,0,1,1,0,1.62l-23.12.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M610.83,468.41h0c-5.06-.28-11.42-.46-19.44-.56a.81.81,0,0,1,0-1.62h0c8,.1,14.43.28,19.51.56a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M610.82,468.41a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M614.84,442.72a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M614.4,468.62a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M643.17,469.26h0c-8.55-.47-19.32-.58-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M643.16,469.26a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.86.86,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M647.23,443.38a.81.81,0,0,1,0-1.62l27.89-.27a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.79,469.28a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.81.81,0,1,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M675.55,469.92h0c-8.57-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.41.05,20.2.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M675.55,469.92a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M593.54,462.51a.81.81,0,0,1-.81-.8,119.92,119.92,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.4,118.4,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M591.41,449.64a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,591.41,449.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M598.84,462.69a.81.81,0,0,1-.81-.8,119.87,119.87,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.37,118.37,0,0,0-.52,11.88.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M596.71,449.81a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,596.71,449.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M629.8,466a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.55,13.55,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.84.84,0,0,1,.84.78l.24,6.54a11.94,11.94,0,0,0,.12,1.51c.07.45.24.79.41.86a.64.64,0,0,0,.57-.23,3.49,3.49,0,0,0,.6-1.12.81.81,0,0,1,1.51.6,4.82,4.82,0,0,1-.94,1.65A2.32,2.32,0,0,1,629.8,466Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M635,456.54h0c-2.59,0-5.23-.11-7.83-.24-.48,0-1-.07-1.47-.11-.79-.07-1.6-.13-2.37-.12-1,0-1.71-.28-2-.89-.46-1,.53-2.12.86-2.48a7.32,7.32,0,0,1,5.06-2.73,10.87,10.87,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,635,456.54Zm-11.45-2.09c.76,0,1.53.07,2.28.13.47,0,.94.08,1.41.1,2.27.11,4.56.19,6.83.22a5.12,5.12,0,0,0-.66-.94,4.59,4.59,0,0,0-2.44-1.89,9.45,9.45,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.43,3.43,0,0,0-.48.65l.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M628.73,451a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,.74-.87.8.8,0,0,1,.87.74l.13,1.66a.81.81,0,0,1-.75.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M659.57,458.22l-.45,0A5.76,5.76,0,0,1,656.3,457a3.27,3.27,0,0,1-1.08-1.23A3.76,3.76,0,0,1,655,454l.3-7.49a.81.81,0,0,1,.81-.78h0a.81.81,0,0,1,.78.84l-.3,7.49a2.51,2.51,0,0,0,.09,1,1.72,1.72,0,0,0,.57.6,4.16,4.16,0,0,0,2,.86,2.39,2.39,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,659.57,458.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M662.57,447.61h-.07l-4.66-.42a6.67,6.67,0,0,0-1.53,0,.81.81,0,0,1-.23-1.6,8,8,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M658.7,466.17a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.14.2-7.69a.81.81,0,1,1,1.62.12c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M659.5,467c-.29,0-.57,0-.86,0l-.83-.08a7.66,7.66,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.54,10.54,0,0,0,2.38-.1.81.81,0,1,1,.25,1.6A12.16,12.16,0,0,1,659.5,467Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M649.15,174.82a1.5,1.5,0,0,1-1.06-2.56l1.28-1.28a1.5,1.5,0,0,1,2.12,2.12l-1.29,1.28A1.5,1.5,0,0,1,649.15,174.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.76,297.47a1.91,1.91,0,0,1-.54-.08c-.46-.14-2-.78-1.73-3.32a821.6,821.6,0,0,0,2-121.16,1.5,1.5,0,1,1,3-.17,824.54,824.54,0,0,1-1.89,120.89,1.64,1.64,0,0,1,.42.25,2.14,2.14,0,0,1,.42,2.58A1.82,1.82,0,0,1,646.76,297.47Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M720.11,472.24h0a1.5,1.5,0,0,1-1.49-1.51c.17-47.52-.5-95.68-2-143.15a1.5,1.5,0,0,1,1.45-1.55,1.48,1.48,0,0,1,1.55,1.45c1.5,47.5,2.17,95.7,2,143.26A1.5,1.5,0,0,1,720.11,472.24Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M580,590.51c-.85,0-2.61-.4-3.33-3.53l-34.2-149.63a1.5,1.5,0,0,1,2.92-.67L579.55,586a1.76,1.76,0,0,1,1.05,0,2.53,2.53,0,0,1,1.49,2.71,2,2,0,0,1-1.94,1.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M509.61,417.68a1.5,1.5,0,0,1-1.49-1.35c-.91-9-1.45-18.11-1.61-27.13a1.5,1.5,0,0,1,1.47-1.53h0a1.5,1.5,0,0,1,1.5,1.47c.16,8.93.69,18,1.59,26.88a1.5,1.5,0,0,1-1.34,1.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M172.54,314.24a1.5,1.5,0,0,1-1.5-1.4c-2.16-33.64-3.43-67.8-3.77-101.51a1.5,1.5,0,0,1,1.48-1.52h0a1.5,1.5,0,0,1,1.5,1.48c.34,33.66,1.61,67.76,3.77,101.35a1.5,1.5,0,0,1-1.4,1.59Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M102.22,479.3a1.5,1.5,0,0,1-1.5-1.5,976.48,976.48,0,0,1,8.15-126.63,1.5,1.5,0,0,1,3,.39,973.51,973.51,0,0,0-8.13,126.24,1.5,1.5,0,0,1-1.5,1.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M382.09,318.12a1.5,1.5,0,0,1-1.5-1.46,137.6,137.6,0,0,1,2.19-27.88,1.5,1.5,0,0,1,3,.54,134.6,134.6,0,0,0-2.15,27.27,1.5,1.5,0,0,1-1.46,1.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567,147.95h-.11a1.5,1.5,0,0,1-1.39-1.61c2.5-34.22,3.92-69,4.21-103.28a1.5,1.5,0,0,1,1.5-1.49h0a1.5,1.5,0,0,1,1.49,1.51c-.29,34.38-1.71,69.19-4.22,103.47A1.5,1.5,0,0,1,567,147.95Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M254.41,176.21a1.5,1.5,0,0,1-1.5-1.49l-.43-115.58A1.5,1.5,0,0,1,254,57.63h0a1.5,1.5,0,0,1,1.5,1.49l.43,115.58a1.5,1.5,0,0,1-1.49,1.51Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M323.06,194a.88.88,0,0,1-.34-1.68,20.41,20.41,0,0,0,8.61-6.82.88.88,0,1,1,1.42,1A21.88,21.88,0,0,1,323.4,194,.88.88,0,0,1,323.06,194Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M329.51,195.91a.88.88,0,0,1-.31-1.69,7.32,7.32,0,0,0,3.11-2.27.87.87,0,0,1,1.37,1.09,9.07,9.07,0,0,1-3.85,2.81A.88.88,0,0,1,329.51,195.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M383.94,269.31a.88.88,0,0,1-.59-1.52,18.54,18.54,0,0,0,4.38-6.13.87.87,0,1,1,1.6.7,20.31,20.31,0,0,1-4.8,6.71A.88.88,0,0,1,383.94,269.31Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M387,272.83a.87.87,0,0,1-.61-1.5l3-3a.87.87,0,0,1,1.22,1.25l-3,3A.87.87,0,0,1,387,272.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M550.94,316.28a.87.87,0,0,1-.46-1.62,10.51,10.51,0,0,0,4.81-7.27.88.88,0,0,1,1.73.26,12.29,12.29,0,0,1-5.62,8.49A.87.87,0,0,1,550.94,316.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M555.08,319.94a.88.88,0,0,1-.68-1.43l4.05-5a.88.88,0,0,1,1.36,1.11l-4.05,5A.87.87,0,0,1,555.08,319.94Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.36,158.78a.87.87,0,0,1-.72-1.36l6.27-9.32a.87.87,0,1,1,1.45,1l-6.27,9.32A.87.87,0,0,1,646.36,158.78Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M647.38,163.19a.88.88,0,0,1-.49-1.6,22.85,22.85,0,0,0,6.44-6.52.88.88,0,0,1,1.47,1,24.63,24.63,0,0,1-6.94,7A.87.87,0,0,1,647.38,163.19Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M715.47,312.87a.88.88,0,0,1-.23,0,.87.87,0,0,1-.61-1.08,45.45,45.45,0,0,0,1.57-9.31.87.87,0,0,1,1.75.11,47.17,47.17,0,0,1-1.63,9.67A.87.87,0,0,1,715.47,312.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M717.5,317.38a.87.87,0,0,1-.87-.87V314a.88.88,0,0,1,1.75,0v2.5A.87.87,0,0,1,717.5,317.38Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M569.57,20.39h-.13a.88.88,0,0,1-.74-1l.52-3.5a.87.87,0,1,1,1.73.26l-.52,3.5A.88.88,0,0,1,569.57,20.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M572.25,30a.86.86,0,0,1-.28,0,.88.88,0,0,1-.55-1.11A43.82,43.82,0,0,0,573.68,17a.91.91,0,0,1,.92-.83.87.87,0,0,1,.83.92,45.63,45.63,0,0,1-2.35,12.32A.88.88,0,0,1,572.25,30Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M351.81,47.69a.88.88,0,0,1-.63-1.48,27.74,27.74,0,0,0,5.53-8.54.87.87,0,1,1,1.62.66,29.07,29.07,0,0,1-5.89,9.08A.87.87,0,0,1,351.81,47.69Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M356.83,51.68a.88.88,0,0,1-.58-1.53A45.23,45.23,0,0,0,362,44.08a.87.87,0,1,1,1.38,1.08,47,47,0,0,1-5.94,6.3A.87.87,0,0,1,356.83,51.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M255.46,48.4a.87.87,0,0,1-.77-.46L253.09,45a.87.87,0,1,1,1.54-.83l1.59,2.95a.87.87,0,0,1-.77,1.29Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M173.55,192.77a.87.87,0,0,1-.4-.1,12.56,12.56,0,0,1-6.25-7.89.88.88,0,0,1,1.7-.43,10.78,10.78,0,0,0,5.36,6.77.88.88,0,0,1-.41,1.65Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M171.49,204.89a.87.87,0,0,1-.48-.15,10,10,0,0,1-4.38-8.8.88.88,0,1,1,1.75.11,8.22,8.22,0,0,0,3.6,7.23.87.87,0,0,1-.48,1.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M114,331.87a.88.88,0,0,1-.81-.53l-1.49-3.5a.88.88,0,0,1,1.61-.69l1.49,3.5a.87.87,0,0,1-.8,1.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M112.89,344.45a.88.88,0,0,1-.72-.38,24.28,24.28,0,0,1-3.57-7.84.87.87,0,0,1,1.7-.43,22.53,22.53,0,0,0,3.32,7.28.87.87,0,0,1-.72,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M190.82,374.17a.88.88,0,0,1-.82-.58,9.05,9.05,0,0,0-7.67-5.79.88.88,0,0,1,.12-1.75,10.85,10.85,0,0,1,9.19,6.94.87.87,0,0,1-.82,1.17Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M189.51,373.73a.87.87,0,0,1-.62-.25,4.18,4.18,0,0,0-5.15-.45.87.87,0,0,1-1-1.43,5.92,5.92,0,0,1,7.39.64.88.88,0,0,1-.62,1.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M269.07,343.71a.87.87,0,0,1-.86-.72,17.45,17.45,0,0,1-.2-4.76.88.88,0,0,1,1.74.17,15.71,15.71,0,0,0,.18,4.28.87.87,0,0,1-.71,1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M268.36,343.16a.87.87,0,0,1-.57-1.54l3.13-2.7a.87.87,0,1,1,1.14,1.33l-3.13,2.7A.87.87,0,0,1,268.36,343.16Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M377.93,433.36h-.11a.88.88,0,0,1-.76-1,26.76,26.76,0,0,0-1.74-14.15.88.88,0,1,1,1.63-.63,28.38,28.38,0,0,1,1.85,15A.88.88,0,0,1,377.93,433.36Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M420.89,450.7a1,1,0,0,1-.53-1.85l9.92-6.12a1,1,0,0,1,1,1.7l-9.92,6.12A1,1,0,0,1,420.89,450.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M424.36,453.7a1,1,0,0,1-.45-1.89l2.94-1.46a1,1,0,1,1,.89,1.79l-2.93,1.46A1,1,0,0,1,424.36,453.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M544.14,426.87a1,1,0,0,1-.45-1.89l2-1a1,1,0,1,1,.89,1.79l-2,1A1,1,0,0,1,544.14,426.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M545.1,431.23h-.49a1,1,0,0,1,0-2h.49a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M475.12,219.77a1,1,0,0,1,0-2A235.3,235.3,0,0,0,547,203.46a1,1,0,0,1,.69,1.88,237.28,237.28,0,0,1-72.48,14.43Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M510.53,226.27a1,1,0,0,1-.25-2l9.8-2.54a1,1,0,0,1,.5,1.94l-9.8,2.54A1,1,0,0,1,510.53,226.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M544.37,369.75a1,1,0,0,1-.07-2c16.71-1.22,32.23-8.25,47.24-15.05a1,1,0,0,1,.83,1.82c-14.46,6.55-30.85,14-47.92,15.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M580.71,394.05a1,1,0,0,1-.45-1.89l5.5-2.76a1,1,0,0,1,.9,1.79l-5.5,2.76A1,1,0,0,1,580.71,394.05Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M454.49,60.42a1,1,0,0,1,0-2,214.71,214.71,0,0,0,53.3-9.11,1,1,0,1,1,.58,1.91,216.68,216.68,0,0,1-53.8,9.19Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M327.29,102.14a1,1,0,0,1-.06-2,192.46,192.46,0,0,0,70.27-18,1,1,0,1,1,.86,1.81,194.47,194.47,0,0,1-71,18.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M432.07,510.83c-10.54,0-21-1.47-31.26-2.9a1,1,0,1,1,.28-2c12.26,1.72,24.94,3.49,37.49,2.68,13.92-.91,25.89-5.09,34.6-12.1a1,1,0,1,1,1.25,1.56c-9,7.27-21.39,11.6-35.73,12.54C436.49,510.76,434.28,510.83,432.07,510.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M450.56,528.21h-.06c-9.42-.56-19-.73-28.4-.49h0a1,1,0,0,1,0-2c9.48-.23,19.09-.06,28.57.5a1,1,0,0,1-.06,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M359,529.5a1,1,0,0,1-1-1,55.34,55.34,0,0,1,.78-8.08c.31-2.13.63-4.32.73-6.47a1,1,0,0,1,1-1,1,1,0,0,1,1,1,66.87,66.87,0,0,1-.74,6.67,53.91,53.91,0,0,0-.75,7.79,1,1,0,0,1-1,1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M357.5,544.5a1,1,0,0,1-1-1v-6a1,1,0,0,1,2,0v6A1,1,0,0,1,357.5,544.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M227.31,549.06c-4.17,0-11.51-.6-15.38-4.5a1.5,1.5,0,1,1,2.13-2.11c3.07,3.09,9.95,3.87,15.35,3.56a1.5,1.5,0,0,1,.17,3C229,549,228.26,549.06,227.31,549.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M227.5,541a1.46,1.46,0,0,1-.31,0,20.42,20.42,0,0,0-5.58-.47,1.5,1.5,0,0,1-.22-3,23.41,23.41,0,0,1,6.42.53,1.5,1.5,0,0,1-.31,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M328.5,560a1.5,1.5,0,0,1-.7-2.83c1.12-.59,2.3-1.27,3.42-2a1.5,1.5,0,1,1,1.57,2.56c-1.17.72-2.41,1.43-3.58,2A1.48,1.48,0,0,1,328.5,560Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340,561a1.5,1.5,0,0,1-.55-2.9,4.24,4.24,0,0,0,1.83-1.48,1.5,1.5,0,1,1,2.44,1.74,7.21,7.21,0,0,1-3.17,2.52A1.5,1.5,0,0,1,340,561Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M230.5,604a1.5,1.5,0,0,1-1.07-.45,8.85,8.85,0,0,1-2.42-4.84,1.5,1.5,0,0,1,3-.43,5.86,5.86,0,0,0,1.58,3.16A1.5,1.5,0,0,1,230.5,604Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M236.5,613a1.49,1.49,0,0,1-.89-.29,5.41,5.41,0,0,1-2.11-4.15,1.5,1.5,0,0,1,1.44-1.55,1.47,1.47,0,0,1,1.55,1.44,2.46,2.46,0,0,0,.89,1.85,1.5,1.5,0,0,1-.89,2.71Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M239.5,604.5a1.5,1.5,0,0,1-1.16-.55,3.88,3.88,0,0,1-.81-3.23,1.5,1.5,0,0,1,2.95.56.86.86,0,0,0,.19.77,1.5,1.5,0,0,1-1.16,2.45Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M184.5,419a1.5,1.5,0,0,1-1.48-1.25,8,8,0,0,1,.7-5,1.5,1.5,0,0,1,2.57,1.55,5.2,5.2,0,0,0-.3,3,1.5,1.5,0,0,1-1.23,1.73Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M186,431.5a1.5,1.5,0,0,1-1.22-.63,7.49,7.49,0,0,1-1.28-4.41,1.5,1.5,0,1,1,3,.07,4.53,4.53,0,0,0,.72,2.59A1.5,1.5,0,0,1,186,431.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M192,424.5a1.5,1.5,0,0,1-1.37-.9,14.86,14.86,0,0,1-1.11-3.89,1.5,1.5,0,1,1,3-.42,11.86,11.86,0,0,0,.89,3.11,1.5,1.5,0,0,1-1.37,2.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204.5,533h-36a1.5,1.5,0,0,1,0-3h36a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204,549.5H185.5a1.5,1.5,0,0,1,0-3H204a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M189.5,578.5c-6,0-12.13-.13-18-.25s-12-.25-18-.25a1.5,1.5,0,0,1,0-3c6,0,12.13.13,18,.25s12,.25,18,.25a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M194.74,597.1c-1.16,0-2.31,0-3.45-.05s-2.2,0-3.29,0a1.5,1.5,0,0,1,0-3h0c1.11,0,2.23,0,3.36,0a47.35,47.35,0,0,0,10.34-.52,1.5,1.5,0,0,1,.6,2.94A37.75,37.75,0,0,1,194.74,597.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204.57,643.61c-1.36,0-2.93-.29-3.46-1.53a1.5,1.5,0,0,1,2.52-1.56,6.25,6.25,0,0,0,2.15,0,1.5,1.5,0,0,1,.43,3A11.65,11.65,0,0,1,204.57,643.61Zm-.69-2.69h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M224.41,412a4.41,4.41,0,0,1-2.14-.58,4.94,4.94,0,0,1-2.65-4c-.63-6.22,8.66-15.66,10.4-17.13a1.5,1.5,0,0,1,2.47,1.11c.19,7.81-1.82,17.46-5.91,19.94A4.16,4.16,0,0,1,224.41,412Zm5-16.86c-3.19,3.51-7.12,8.94-6.81,12a2,2,0,0,0,1.11,1.64,1.14,1.14,0,0,0,1.3,0C227.15,407.56,229,401.53,229.42,395.18Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M226.47,442.05a3.21,3.21,0,0,1-2.82-1.63c-2.75-4.65,2.88-20.07,5.89-22.57a1.5,1.5,0,0,1,2.45,1.29,49.5,49.5,0,0,0,.16,7c.44,6.71.89,13.65-3.83,15.5A5.05,5.05,0,0,1,226.47,442.05ZM229,424.37c-2.07,4.91-4,12.42-2.8,14.52.07.11.18.3,1,0,2.69-1.05,2.27-7.41,1.94-12.52C229.11,425.68,229.07,425,229,424.37Z" transform="translate(-60.79 2.5)"/><g class="cls-11"><path class="cls-2" d="M659,528.67a1,1,0,0,1-.06-2l1.29-.08c4.56-.29,8.88-.57,13.44-.59h0a1,1,0,0,1,0,2c-4.5,0-8.79.29-13.32.58l-1.29.08Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M680.33,545.33H669.67a1,1,0,0,1,0-2h10.67a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M638.33,570H633a1,1,0,0,1,0-2h5.33a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M421,664.7c-.45,0-.91,0-1.36,0a1,1,0,0,1,.1-2,43.87,43.87,0,0,0,6.81-.34c1.22-.12,2.49-.25,3.75-.32a1,1,0,0,1,1.06.94,1,1,0,0,1-.94,1.06c-1.22.07-2.46.2-3.66.32A57,57,0,0,1,421,664.7Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M457.67,654a1,1,0,0,1-.36-1.93c3.28-1.27,7.31-1.07,11.22-.87,1.35.07,2.62.13,3.81.13a1,1,0,0,1,0,2c-1.25,0-2.54-.07-3.91-.14-3.69-.19-7.51-.38-10.39.74A1,1,0,0,1,457.67,654Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M503,674H490.33a1,1,0,1,1,0-2H503a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M340.77,690.77a22.36,22.36,0,0,1-6-.81,1,1,0,1,1,.54-1.93,21.35,21.35,0,0,0,7.64.63,1,1,0,0,1,.19,2Q341.92,690.77,340.77,690.77Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M393,700h-8a1,1,0,0,1,0-2h8a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M645,630.67h-7.33a1,1,0,0,1,0-2H645a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M731,508.67h-2.67a1,1,0,0,1,0-2H731a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M630.33,513.33a1,1,0,0,1-.35-1.94,11.21,11.21,0,0,1,4.38-.73,1,1,0,0,1,1,1,1,1,0,0,1-1,1,9.37,9.37,0,0,0-3.62.6A1,1,0,0,1,630.33,513.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M753,472h-2.67a1,1,0,1,1,0-2H753a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M765.67,446H763a1,1,0,0,1,0-2h2.67a1,1,0,1,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M111,505.33h-5.33a1,1,0,1,1,0-2H111a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M144.33,500.67h-4a1,1,0,1,1,0-2h4a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-2" d="M120.56,518.83a7.62,7.62,0,0,1-4.12-1,1,1,0,0,1,1.14-1.65,7.18,7.18,0,0,0,4.58.51,1,1,0,1,1,.38,2A10.47,10.47,0,0,1,120.56,518.83Z" transform="translate(-60.79 2.5)"/></g></g><g id="LINEART"><path class="cls-12" d="M145.95,176.85" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M255.72,395.42a2.5,2.5,0,0,1-.07-5c14.6-.4,26.34-2.39,38.77-4.49a316.57,316.57,0,0,1,34.2-4.45,2.5,2.5,0,0,1,.32,5,312.48,312.48,0,0,0-33.68,4.38c-12,2-24.51,4.16-39.46,4.56Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M365,378.9a2.5,2.5,0,0,1-1.06-4.76c5.28-2.48,9.35-5.59,13.65-8.88a95.33,95.33,0,0,1,12-8.2,2.5,2.5,0,0,1,2.42,4.38,91.32,91.32,0,0,0-11.39,7.8c-4.33,3.31-8.8,6.72-14.56,9.43A2.49,2.49,0,0,1,365,378.9Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M371.49,408.63a13.15,13.15,0,0,1-1.43-.08,12.82,12.82,0,0,1-8.47-4.94,9.18,9.18,0,0,1-1.83-7.18c1.23-6.66,9.76-7.66,14.6-7.21h0a9.63,9.63,0,0,1,4.79,1.55,8.4,8.4,0,0,1,3.17,7.19,11.07,11.07,0,0,1-6.4,9.79A11.23,11.23,0,0,1,371.49,408.63Zm.79-14.5c-3.31,0-7.17.89-7.6,3.21a4.26,4.26,0,0,0,.92,3.28,7.71,7.71,0,0,0,5,3,6.7,6.7,0,0,0,3.36-.42,6.08,6.08,0,0,0,3.38-5.35,3.59,3.59,0,0,0-1.08-3,5.2,5.2,0,0,0-2.35-.64h0C373.39,394.15,372.85,394.13,372.29,394.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M363.66,424.5a11.22,11.22,0,0,1-7.68-3,12.76,12.76,0,0,1-3.34-12.21,15.39,15.39,0,0,1,7.71-9.63,2.5,2.5,0,0,1,2.39,4.39,10.53,10.53,0,0,0-5.24,6.45,7.79,7.79,0,0,0,1.94,7.37,6.05,6.05,0,0,0,6.84,1,13.26,13.26,0,0,0,1.65-1.22,18.82,18.82,0,0,1,2.06-1.53c3.61-2.23,8-2,11.37-1.58,1.91.24,4,.51,5-.3s.89-3.23,0-5c-1.06-2.1-5.27-5.48-8-6.77a2.5,2.5,0,0,1,2.15-4.51c3.08,1.47,8.52,5.54,10.28,9s2,8.39-1.34,11.12c-2.66,2.14-6.14,1.7-8.68,1.37s-5.91-.53-8.19.87a14.67,14.67,0,0,0-1.52,1.14,17.46,17.46,0,0,1-2.31,1.68A10.19,10.19,0,0,1,363.66,424.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.27,435a8.13,8.13,0,0,1-4-1,13,13,0,0,1-3.16-2.74,12,12,0,0,1-1.82-2.39c-1.18-2.18-2.32-5.7-2-8.26a2.5,2.5,0,1,1,5,.56,11.53,11.53,0,0,0,1.46,5.31,8.1,8.1,0,0,0,1.12,1.4,8.88,8.88,0,0,0,1.92,1.75,4,4,0,0,0,4-.44,6.94,6.94,0,0,0,2.53-4.42,20.49,20.49,0,0,0-.59-7,2.5,2.5,0,1,1,4.89-1,24.37,24.37,0,0,1,.62,8.94,11.8,11.8,0,0,1-4.51,7.58A9.3,9.3,0,0,1,376.27,435Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.38,410.24a2.5,2.5,0,0,1-.38-5c5.57-.87,10.41-5.64,12.34-12.16,2.08-7,.34-14.44-1.48-19.41a28.74,28.74,0,0,0-3.29-6.64c-4.09-5.88-11.69-9.55-19.85-9.6h-.15c-9,0-17,4.08-22.08,7.51a2.5,2.5,0,0,1-2.79-4.15c8.19-5.51,16.84-8.38,25-8.36,9.76,0,18.92,4.55,23.93,11.74a33.58,33.58,0,0,1,3.88,7.78c3,8.15,3.54,16,1.58,22.56-2.48,8.36-8.9,14.52-16.37,15.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M291.58,645.16a94,94,0,0,1-26.67-3.83,95.29,95.29,0,0,1-38-21.85c-11.07-10.39-14.37-23.33-16.28-35.77a40.63,40.63,0,0,1,0-12.24,2.5,2.5,0,0,1,5,.53,35.69,35.69,0,0,0,0,11c2.05,13.35,5.35,24,14.76,32.88a89.3,89.3,0,0,0,82.71,21.78c2-.48,4-.93,6-1.37,10.24-2.28,19.91-4.44,28.15-10.85a2.5,2.5,0,0,1,3.07,3.95c-9.13,7.1-19.33,9.38-30.14,11.79-2,.44-3.95.88-5.94,1.36A97.5,97.5,0,0,1,291.58,645.16Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M200.22,497.51a2.5,2.5,0,0,1-2.21-1.33c-2.34-4.4-4.81-8.85-7.19-13.15-2.67-4.82-5.43-9.81-8-14.76-6.07-11.51-11.81-24-12.76-37.34-1-13.78,3-28.47,12.17-44.91,4.35-7.8,8.33-13.25,12.9-17.67a67.46,67.46,0,0,1,17.65-11.86c27.92-13.6,60.15-14.28,88-13.15,28.91,1.17,48.72,11.29,66.24,33.85a2.5,2.5,0,1,1-3.95,3.07c-16.52-21.27-35.21-30.82-62.49-31.92s-58.7-.46-85.61,12.65a62.58,62.58,0,0,0-16.36,11c-4.2,4.06-7.9,9.15-12,16.51C177.87,404,174.09,417.8,175,430.58c.88,12.41,6.39,24.33,12.2,35.36,2.59,4.91,5.34,9.87,8,14.67,2.39,4.32,4.87,8.79,7.23,13.22a2.5,2.5,0,0,1-2.21,3.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M261.89,349a2.49,2.49,0,0,1-1.67-.64,4.61,4.61,0,0,1-1.32-3.69,34.16,34.16,0,0,1,.75-6.35,12.71,12.71,0,0,1,2-5,8.89,8.89,0,0,1,9.85-3.06c3,1.06,5.42,3.7,7.23,8.08a43.72,43.72,0,0,1,2,5.84,2.5,2.5,0,0,1-4.84,1.25,38.8,38.8,0,0,0-1.73-5.17c-1.24-3-2.63-4.71-4.25-5.28a3.88,3.88,0,0,0-4.19,1.3,8.26,8.26,0,0,0-1.17,3.09,29.18,29.18,0,0,0-.64,5.42c0,.09,0,.16,0,.21a2.5,2.5,0,0,1-2,4Zm1.67-4.36h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M183.89,387.5a2.52,2.52,0,0,1-.41,0c-3.94-.65-7.3-3.73-9.72-8.89-2.67-5.71-3.34-11.18-1.95-15.82,1.62-5.36,7.07-10.44,13.41-9.67,5,.61,8.67,4.6,11.1,7.24l4.87,5.3a2.5,2.5,0,1,1-3.68,3.38l-4.87-5.3c-2.55-2.78-5.08-5.3-8-5.66-3.68-.45-7,2.84-8,6.15-1.31,4.35.2,9.06,1.69,12.25,1.17,2.51,3.17,5.61,6,6.08a2.5,2.5,0,0,1-.41,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M294.85,448.5A43.45,43.45,0,1,1,338.3,405,43.5,43.5,0,0,1,294.85,448.5Zm0-81.9A38.45,38.45,0,1,0,333.3,405,38.49,38.49,0,0,0,294.85,366.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M394.52,444.82a2.5,2.5,0,0,1-2.5-2.41c-.18-4.94-.79-11.63-1.59-17.47a4.05,4.05,0,0,1,0-1.16A2.53,2.53,0,0,1,392.5,421a2.46,2.46,0,0,1,2.86,2,4.07,4.07,0,0,1,0,1.28c.82,6,1.44,12.85,1.63,17.9a2.5,2.5,0,0,1-2.41,2.59Zm-4.09-20.91h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M375.87,636.22a2.5,2.5,0,0,1-2.46-2l-16-84.58a2.5,2.5,0,0,1,4.91-.93l15.56,82L537.75,595,500.12,420.84,344.73,456.22l10,56.84a2.5,2.5,0,0,1-4.92.87l-10.45-59.18a2.5,2.5,0,0,1,1.91-2.87l160.17-36.47a2.5,2.5,0,0,1,3,1.91l38.69,179a2.5,2.5,0,0,1-1.9,3L376.42,636.16A2.45,2.45,0,0,1,375.87,636.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M542.38,599.64a2.5,2.5,0,0,1-.49-5c23.54-4.76,47.28-10.1,70.61-15.88L578,417l-53.49,1.44c-6.61.18-13.44.36-20.07,1a2.5,2.5,0,0,1-.51-5c6.82-.7,13.74-.89,20.44-1.07L580,411.91a2.46,2.46,0,0,1,2.51,2l35.43,166.24a2.5,2.5,0,0,1-1.84,2.95c-24.16,6-48.78,11.58-73.18,16.51A2.48,2.48,0,0,1,542.38,599.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M339.58,545.66a2.5,2.5,0,0,1-.67-4.91A92.52,92.52,0,0,1,350.66,539l1.36-.16a2.5,2.5,0,0,1,.57,5l-1.36.15a94.18,94.18,0,0,0-11,1.58A2.5,2.5,0,0,1,339.58,545.66Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M365,542.15a2.5,2.5,0,0,1-.41-5c10.27-1.72,16.43-4,18.3-6.92a3.28,3.28,0,0,0,.4-2.81c-1-4-7.08-6.94-18-8.69a2.5,2.5,0,0,1,.79-4.94c8.44,1.36,19.9,4.12,22,12.38a8.33,8.33,0,0,1-1.05,6.79c-2.78,4.27-9.46,7.09-21.67,9.13A2.49,2.49,0,0,1,365,542.15Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M353,517.24l-.28,0A200,200,0,0,0,330.45,516a2.5,2.5,0,0,1,0-5,205,205,0,0,1,22.86,1.26,2.5,2.5,0,0,1-.27,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M374.91,644.09a19.3,19.3,0,0,1-7.71-1.6,35.5,35.5,0,0,1-5.75-3.38l-23.4-15.86a2.5,2.5,0,0,1,2.8-4.14L364.26,635a31.89,31.89,0,0,0,4.94,2.93,14.31,14.31,0,0,0,7.26,1.1,4.63,4.63,0,0,0,2.48-.81c1-.83,1-2.61.47-3.86a2.5,2.5,0,0,1,4.65-1.85c1.39,3.49.62,7.4-1.87,9.52a9.29,9.29,0,0,1-5.17,2A19.23,19.23,0,0,1,374.91,644.09Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M224.4,649.13a19.38,19.38,0,0,1-5.42-.75,5.09,5.09,0,0,1-3-2,5.2,5.2,0,0,1-.74-3c.17-10,7.38-17.73,14.76-24.76a2.5,2.5,0,1,1,3.45,3.62c-6.61,6.3-13.07,13.13-13.21,21.23v.08l.14,0c4.2,1.22,9.32.4,14-2.26,4.56-2.56,8.4-6.47,11.86-10.31a2.5,2.5,0,0,1,3.71,3.35c-3.75,4.16-7.94,8.4-13.13,11.32A25.75,25.75,0,0,1,224.4,649.13Zm-4.15-5.26h0Zm-.31-.44Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M559.82,416.91a2.5,2.5,0,0,1-2.5-2.5V390.84H404.5a2.5,2.5,0,0,1,0-5H559.82a2.5,2.5,0,0,1,2.5,2.5v26.08A2.5,2.5,0,0,1,559.82,416.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M447.94,433.1a2.5,2.5,0,0,1-2.5-2.5V388.34a2.5,2.5,0,0,1,5,0V430.6A2.5,2.5,0,0,1,447.94,433.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M682,484.5H594.42a2.5,2.5,0,1,1,0-5H679.5v-182h-243v90.84a2.5,2.5,0,0,1-5,0V295a2.5,2.5,0,0,1,2.5-2.5H682a2.5,2.5,0,0,1,2.5,2.5V482A2.5,2.5,0,0,1,682,484.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M682,484.5a2.5,2.5,0,0,1-.66-4.91l62.16-16.93V291.75l-61.27,5.74a2.5,2.5,0,1,1-.47-5l64-6A2.5,2.5,0,0,1,748.5,289V464.57a2.5,2.5,0,0,1-1.84,2.41l-64,17.43A2.52,2.52,0,0,1,682,484.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M598,297.5a2.5,2.5,0,0,1-2.5-2.5V150.5H417.66v142H434a2.5,2.5,0,0,1,0,5H415.16a2.5,2.5,0,0,1-2.5-2.5V148a2.5,2.5,0,0,1,2.5-2.5H598a2.5,2.5,0,0,1,2.5,2.5V295A2.5,2.5,0,0,1,598,297.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M670.74,151.74h0L598,150.5a2.5,2.5,0,1,1,.09-5l72.74,1.24a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M695.88,296.2a2.5,2.5,0,0,1-2.5-2.5V177.1a2.5,2.5,0,0,1,5,0V293.7A2.5,2.5,0,0,1,695.88,296.2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M604,150.5a2.5,2.5,0,0,1-2.5-2.5V16L541.5,3.1V148a2.5,2.5,0,0,1-5,0V0a2.5,2.5,0,0,1,.93-1.94,2.5,2.5,0,0,1,2.1-.5l65,14a2.5,2.5,0,0,1,2,2.44V148A2.5,2.5,0,0,1,604,150.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M400,30.5a2.5,2.5,0,0,1-2.5-2.5V5a2.5,2.5,0,0,1,2.41-2.5l139-5A2.51,2.51,0,0,1,541.5-.09a2.5,2.5,0,0,1-2.41,2.59L402.5,7.41V28A2.5,2.5,0,0,1,400,30.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,179.6H289.78l-68-5.1A2.5,2.5,0,0,1,219.5,172V46a2.5,2.5,0,0,1,2-2.45l68-14a2.49,2.49,0,0,1,.5-.05H427a2.5,2.5,0,0,1,2.5,2.5V148a2.5,2.5,0,0,1-5,0V34.5H290.25L224.5,48V169.68l65.56,4.92h125.1a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M290,179.6h0a2.5,2.5,0,0,1-2.5-2.5l0-145.1a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5l0,145.1A2.5,2.5,0,0,1,290,179.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M290,316.5H139a2.5,2.5,0,0,1-2.5-2.5V177.1a2.5,2.5,0,0,1,2.41-2.5L242,171a2.5,2.5,0,1,1,.17,5L141.5,179.51v132h146l0-59.5a2.5,2.5,0,0,1,.74-1.77,2.38,2.38,0,0,1,1.78-.72l125.16,1a2.5,2.5,0,1,1,0,5l-122.64-1,0,59.48A2.5,2.5,0,0,1,290,316.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M199.36,316.5a2.5,2.5,0,0,1-2.5-2.5V175a2.5,2.5,0,0,1,5,0V314A2.5,2.5,0,0,1,199.36,316.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,324.62H144l-.3,0L77,316.48a2.5,2.5,0,0,1,.3-5H139a2.5,2.5,0,0,1,0,5H118.54l25.61,3.12H369.87l-28.15-3.12H290a2.5,2.5,0,0,1,0-5h51.88l.27,0,73.31,8.12a2.5,2.5,0,0,1-.28,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M195.71,489.21H139a2.51,2.51,0,0,1-.5-.05L76.81,476.45a2.5,2.5,0,0,1-2-2.45V314a2.5,2.5,0,0,1,5,0V472l59.44,12.25h56.46a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M144,489.21a2.5,2.5,0,0,1-2.5-2.5V322.12a2.5,2.5,0,0,1,5,0v164.6A2.5,2.5,0,0,1,144,489.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,391a2.5,2.5,0,0,1-2.5-2.5V322.12a2.5,2.5,0,0,1,5,0V388.5A2.5,2.5,0,0,1,415.16,391Z" transform="translate(-60.79 2.5)"/><circle class="cls-2" cx="268" cy="397.88" r="4.97"/><circle class="cls-2" cx="332.92" cy="374.31" r="4.97"/><path class="cls-2" d="M746,291.5l-.33,0-50.12-6.6a2.5,2.5,0,1,1,.65-5l50.12,6.6a2.5,2.5,0,0,1-.32,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M260.2,516c-11.18,0-22.1-.85-32.78-1.67-5.72-.44-11.25-1.28-17.79-2.41-.42-.07-1.15-.13-1.93-.2-3.83-.31-6.88-.7-8.48-2.55-2.33-2.7-2.49-14.1-2.49-14.21a2.5,2.5,0,0,1,.76-1.78,2.43,2.43,0,0,1,1.81-.7,86.45,86.45,0,0,1,11.45,1.34c2.72.44,5.53.9,8.3,1.14,2.19.19,4.39.43,6.52.67,2.37.27,4.82.54,7.24.73,11.37.88,23.05.62,37.87-.85,4.78-.47,9.53-.91,14.27-1.34,8.69-.79,17.68-1.62,26.58-2.67,6.31-.75,12-1.48,17.45-2.22,4.9-.67,9.64-1.59,14.23-2.48l3-.57a2.5,2.5,0,0,1,.94,4.91l-3,.57c-4.65.9-9.46,1.83-14.5,2.52-5.46.75-11.2,1.48-17.54,2.23-9,1.06-18,1.89-26.71,2.69-4.73.43-9.47.87-14.23,1.34-15.12,1.5-27.08,1.76-38.75.86-2.5-.19-5-.47-7.41-.74-2.1-.23-4.26-.48-6.39-.66-3-.25-5.88-.73-8.69-1.18s-5.43-.89-8.12-1.12c.21,3.07.69,7.15,1.22,8.31.74.45,3.75.69,5.05.8.93.08,1.73.14,2.37.25,6.4,1.1,11.79,1.92,17.33,2.35,16.15,1.25,32.85,2.55,49.94.84,3.43-.34,7-.56,10.36-.78,4.63-.29,9.41-.59,14-1.2,3.91-.53,7.81-1.15,11.58-1.76a221.82,221.82,0,0,1,23.71-2.93c2.85-.15,5.73-.1,8.52-.05,1.38,0,2.75,0,4.11,0a2.5,2.5,0,0,1,0,5c-1.39,0-2.8,0-4.2,0-2.7,0-5.49-.1-8.17,0a215,215,0,0,0-23.18,2.88c-3.81.61-7.74,1.25-11.71,1.78-4.73.63-9.6.94-14.31,1.23-3.36.21-6.84.43-10.18.76C272.16,515.75,266.14,516,260.2,516Zm-57.09-10Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M312.32,579.89q-1.43,0-2.86,0c-15-.5-31.12-1.47-50.81-3.05-3.23-.26-6.56-.34-9.77-.42-3.72-.09-7.57-.19-11.4-.55a74,74,0,0,1-8.77-1.55c-2-.44-4.12-.9-6.18-1.21a55.21,55.21,0,0,0-9.94-.29c-2.27.07-4.62.13-7,0a2.5,2.5,0,0,1-2.38-2.36c-.21-3.82-.29-8.26,1.5-12.54a66.07,66.07,0,0,0,3.9-11.72,3.41,3.41,0,0,0-.06-2.55l-.09-.07a4.08,4.08,0,0,1-1.68-3.3,3.78,3.78,0,0,1,1.78-2.78l.12-.09c1.49-5.19-.17-11.18-1.78-17a76.62,76.62,0,0,1-2.05-8.66,2.5,2.5,0,0,1,4.94-.76,71.94,71.94,0,0,0,1.93,8.08c1.86,6.69,3.78,13.6,1.57,20.34a3.23,3.23,0,0,1-.73,1.2,3.74,3.74,0,0,1,.63,1.13,7.77,7.77,0,0,1,.32,5.48,70.61,70.61,0,0,1-4.19,12.63,19.26,19.26,0,0,0-1.21,8c1.44,0,2.85,0,4.33-.08a59.92,59.92,0,0,1,10.83.34c2.22.33,4.4.81,6.51,1.27a69.34,69.34,0,0,0,8.18,1.46c3.64.35,7.4.44,11,.53,3.29.08,6.68.16,10.05.43,19.61,1.58,35.68,2.55,50.57,3,12.67.43,25.17-2.26,37.24-4.86,7.23-1.55,12.09-2.88,14.44-3.93a2.5,2.5,0,0,1,2,4.56c-2.71,1.21-7.75,2.6-15.43,4.25C336.44,577.34,324.6,579.89,312.32,579.89Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372,620.83a2.49,2.49,0,0,1-1.73-.69c-1.32-1.27-2.55-2.67-3.74-4a39,39,0,0,0-5.07-5.14,2.5,2.5,0,0,1,3.07-3.94,43.31,43.31,0,0,1,5.76,5.79c1.17,1.33,2.27,2.59,3.43,3.71a2.5,2.5,0,0,1-1.73,4.31Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M357,551.65a5.21,5.21,0,0,1-2.67-1c-5.24-3.3-4.58-11.16-4.14-16.36.07-.8.13-1.54.16-2.18.06-1.23.14-2.47.22-3.7.17-2.67.34-5.43.34-8.11,0-.37-.07-1-.15-1.64-.32-2.75-.76-6.51,1.74-8.64a5,5,0,0,1,2.09-1,4.05,4.05,0,0,1,3.34.57,3.84,3.84,0,0,1,.47-.26,2.5,2.5,0,0,1,3.11.82l.07.09a3.77,3.77,0,0,1,5.15,1c1.64,2.09,1.54,5.24,1.47,7.55,0,.38,0,.72,0,1,0,4.07,0,8.45-.34,12.9,0,.57-.06,1.32-.08,2.17-.17,6.18-.56,11.92-3.51,14.29-.94.76-1.91,1.54-3.26,1.25a2.59,2.59,0,0,1-1.34-.75,2.73,2.73,0,0,1-2.64,2Zm-1.41-37.47a16,16,0,0,0,.13,3.87,20.36,20.36,0,0,1,.18,2.21c0,2.84-.18,5.68-.35,8.43-.08,1.21-.15,2.42-.21,3.64,0,.69-.1,1.49-.17,2.34-.28,3.34-.73,8.69,1.06,11l.18-.14a3.3,3.3,0,0,1,3.06-2,2.86,2.86,0,0,1,2.16.91c.92-2.23,1.07-7.73,1.13-9.73,0-.93,0-1.74.09-2.36.28-4.31.32-8.59.33-12.58,0-.35,0-.75,0-1.18a22.32,22.32,0,0,0-.07-3.18,2.63,2.63,0,0,1-3.27.36,2.5,2.5,0,0,1-3.7-.65l-.09-.14C355.94,514.73,355.76,514.44,355.59,514.19Zm4.89,30.51h0Zm-4.74-30.9h0Zm-1.62-1.9h0Z" transform="translate(-60.79 2.5)"/></g><g id="circle"><path class="cls-2" d="M153.52,177.1A349.71,349.71,0,0,1,222,114.31L221,102a6,6,0,0,0-3.76,1,361.7,361.7,0,0,0-75.95,70.06,6,6,0,0,0-1.31,4.4" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M139.38,195.21A344.77,344.77,0,0,0,72.79,400c0,191.91,156.13,348,348,348s348-156.13,348-348c0-121.6-61.55-232-164.86-296l.87-13a6,6,0,0,1,2.24.81A359.84,359.84,0,0,1,780.86,400,360.13,360.13,0,0,1,89.08,540.14,360.53,360.53,0,0,1,134.23,182a6,6,0,0,1,3.74-2.26Z" transform="translate(-60.79 2.5)"/></g><g id="layers"><g class="cls-8"><path class="cls-6" d="M368.81,388.34l-1.1-23.69s8.48-17.33,8.09-18,6.68-6.06,6.68-6.06l13-1,8.29,1.85,9.82,12.28,7.21,15.07L424.21,386l-4.71,21.73-6.39,11.59-8.61,4.11L390.36,422l-5.08-3.31,3.67-3.79v-5.42l-4-6.79-5.56-2.47-1.51-7.57Z" transform="translate(-60.79 2.5)"/></g><g class="cls-8"><polygon class="cls-6" points="226.66 366.6 237.24 361.46 250.18 361.46 265.7 366.6 279.96 384.01 285.01 395.42 287.35 407.55 286.4 422.15 279.23 440.12 268 452.2 253.91 456.94 235.27 454.47 220.17 446.08 208.28 425.94 205.61 398.57 213.7 378.9 226.66 366.6"/></g><path class="cls-2" d="M426,376.14c-2.08-12-7.08-22.86-14.06-30.5-7.32-8-16-11.61-24.38-10.16s-15.34,7.76-19.54,17.76c-3.34,7.95-4.62,17.52-3.76,27.46a26.09,26.09,0,0,0-17.18,6.73c-8.49-20.91-28.27-34.1-48.45-30.6-23.83,4.13-39.32,30-34.53,57.59,4.35,25.11,24,43.19,45.38,43.19a38.08,38.08,0,0,0,6.5-.56c11.63-2,21.63-9.18,28.14-20.17a55,55,0,0,0,6.39-37.42c-.32-1.87-.74-3.7-1.23-5.49a19.71,19.71,0,0,1,15.78-7.13c.22,1.27.63,3.21.91,4.42a3.06,3.06,0,0,0,6-1.36c-.26-1.15-.67-3.1-.87-4.24-1.89-10.9-1-21.56,2.6-30,3.37-8,8.67-13,14.95-14.1s13,1.85,18.82,8.26c6.2,6.78,10.66,16.52,12.54,27.41,3.81,22-4.06,41.81-17.54,44.14a13,13,0,0,1-3.13.12,23.62,23.62,0,0,1-10.67-3.64,11.5,11.5,0,0,0-1.58-1.14c-.49-.19-1.28.36-1.83.46a9.58,9.58,0,0,0-1.67.32,1.45,1.45,0,0,0-1,1.23,2.66,2.66,0,0,0,.7,1.39,13,13,0,0,1,.83,1.85c.22.45.71.67,1.13.94a28.53,28.53,0,0,0,15.33,4.73,17.49,17.49,0,0,0,3-.24C420.27,424.45,430.38,401.47,426,376.14Zm-87.14,57.62c-5.59,9.43-14.08,15.56-23.92,17.26-20.5,3.55-40.6-13.34-44.81-37.64s9-47,29.55-50.52a32.07,32.07,0,0,1,5.48-.47c18.49,0,35.5,16,39.33,38.11A48.84,48.84,0,0,1,338.85,433.76Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M309.47,458.61c-22.09,0-42-18.92-46.37-44-4.88-28.17,11-54.53,35.35-58.75,19.89-3.45,39.86,8.82,49,29.93a27.19,27.19,0,0,1,15.71-6,58.73,58.73,0,0,1,3.92-26.87c4.34-10.33,11.55-16.85,20.3-18.36s17.73,2.2,25.29,10.47c7.11,7.77,12.19,18.78,14.3,31h0c4.48,25.87-6,49.37-23.34,52.37a18.5,18.5,0,0,1-3.14.25,29.35,29.35,0,0,1-15.87-4.89l-.23-.14a3,3,0,0,1-1.25-1.2c-.13-.27-.23-.54-.33-.81a4.14,4.14,0,0,0-.42-.92l-.16-.22a2.91,2.91,0,0,1-.72-1.74,2.4,2.4,0,0,1,1.67-2.16,5.81,5.81,0,0,1,1.34-.29l.5-.07a3.31,3.31,0,0,0,.46-.17,2.52,2.52,0,0,1,1.92-.24,4.9,4.9,0,0,1,1.26.85,5.44,5.44,0,0,0,.5.39,21.77,21.77,0,0,0,3.33,1.76,21.47,21.47,0,0,0,6.86,1.72,12,12,0,0,0,2.89-.11c12.94-2.24,20.45-21.52,16.73-43-1.85-10.71-6.22-20.27-12.3-26.91-5.63-6.15-12-9-17.91-7.95s-11,5.82-14.2,13.51c-3.49,8.3-4.39,18.77-2.53,29.48.2,1.14.6,3.06.86,4.19a4.06,4.06,0,1,1-7.91,1.81c-.22-1-.53-2.43-.77-3.66a18.76,18.76,0,0,0-13.84,6.39c.45,1.71.82,3.41,1.11,5.07a56,56,0,0,1-6.51,38.1C338.31,448.64,328.07,456,316.15,458A39.24,39.24,0,0,1,309.47,458.61Zm-4.33-101.34a37.16,37.16,0,0,0-6.35.55c-23.28,4-38.41,29.35-33.72,56.44,4.18,24.15,23.27,42.36,44.4,42.36a37.25,37.25,0,0,0,6.33-.54c11.34-2,21.09-9,27.45-19.69a54,54,0,0,0,6.26-36.74c-.31-1.77-.71-3.58-1.21-5.4l-.14-.5.32-.4a20.76,20.76,0,0,1,16.59-7.5l.81,0,.14.79c.23,1.3.63,3.22.9,4.37a2.06,2.06,0,0,0,2.47,1.55,2.06,2.06,0,0,0,1.55-2.47c-.27-1.16-.68-3.13-.88-4.3-1.92-11.08-1-21.95,2.66-30.59,3.5-8.33,9.08-13.56,15.7-14.7s13.62,1.89,19.73,8.57C414.49,356,419,365.93,420.95,377c3.9,22.55-4.33,42.87-18.36,45.3a14,14,0,0,1-3.37.13,23.47,23.47,0,0,1-7.5-1.87,23.81,23.81,0,0,1-3.64-1.93,7.5,7.5,0,0,1-.69-.53,5.15,5.15,0,0,0-.63-.48,4.85,4.85,0,0,0-.5.19,4.3,4.3,0,0,1-.86.29l-.6.09a4.18,4.18,0,0,0-.89.18.65.65,0,0,0-.38.3,1.91,1.91,0,0,0,.33.55l.19.27a5.89,5.89,0,0,1,.65,1.35c.08.21.16.42.26.63a1.78,1.78,0,0,0,.49.36l.29.18a27.71,27.71,0,0,0,14.78,4.57,16.5,16.5,0,0,0,2.8-.22c16.26-2.82,26-25.27,21.71-50.06h0c-2.05-11.85-7-22.5-13.81-30-7.08-7.75-15.42-11.24-23.47-9.85S373,344,368.94,353.64c-3.27,7.78-4.54,17.11-3.68,27l.09,1.08h-1.09a25.09,25.09,0,0,0-16.52,6.47l-1.06,1-.54-1.33C338.55,369.1,322.28,357.27,305.14,357.27Zm4.32,95.22c-19,0-36.41-16.32-40.32-38.94-4.3-24.85,9.32-48,30.36-51.67a33.19,33.19,0,0,1,5.65-.49c19.14,0,36.48,16.74,40.32,38.94a49.84,49.84,0,0,1-5.75,33.94C334,444,325.23,450.25,315.1,452A33,33,0,0,1,309.46,452.49Zm-4.31-89.1a31.2,31.2,0,0,0-5.31.46c-20,3.46-32.85,25.6-28.73,49.36S294.8,453.49,314.76,450c9.55-1.65,17.8-7.61,23.23-16.79h0a47.84,47.84,0,0,0,5.5-32.58C339.81,379.42,323.32,363.39,305.14,363.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M371.49,408.63a13.15,13.15,0,0,1-1.43-.08,12.82,12.82,0,0,1-8.47-4.94,9.18,9.18,0,0,1-1.83-7.18c1.23-6.66,9.76-7.66,14.6-7.21h0a9.63,9.63,0,0,1,4.79,1.55,8.4,8.4,0,0,1,3.17,7.19,11.07,11.07,0,0,1-6.4,9.79A11.23,11.23,0,0,1,371.49,408.63Zm.79-14.5c-3.31,0-7.17.89-7.6,3.21a4.26,4.26,0,0,0,.92,3.28,7.71,7.71,0,0,0,5,3,6.7,6.7,0,0,0,3.36-.42,6.08,6.08,0,0,0,3.38-5.35,3.59,3.59,0,0,0-1.08-3,5.2,5.2,0,0,0-2.35-.64h0C373.39,394.15,372.85,394.13,372.29,394.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M363.66,424.5a11.22,11.22,0,0,1-7.68-3,12.76,12.76,0,0,1-3.34-12.21,15.39,15.39,0,0,1,7.71-9.63,2.5,2.5,0,0,1,2.39,4.39,10.53,10.53,0,0,0-5.24,6.45,7.79,7.79,0,0,0,1.94,7.37,6.05,6.05,0,0,0,6.84,1,13.26,13.26,0,0,0,1.65-1.22,18.82,18.82,0,0,1,2.06-1.53c3.61-2.23,8-2,11.37-1.58,1.91.24,4,.51,5-.3s.89-3.23,0-5c-1.06-2.1-5.27-5.48-8-6.77a2.5,2.5,0,0,1,2.15-4.51c3.08,1.47,8.52,5.54,10.28,9s2,8.39-1.34,11.12c-2.66,2.14-6.14,1.7-8.68,1.37s-5.91-.53-8.19.87a14.67,14.67,0,0,0-1.52,1.14,17.46,17.46,0,0,1-2.31,1.68A10.19,10.19,0,0,1,363.66,424.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.27,435a8.13,8.13,0,0,1-4-1,13,13,0,0,1-3.16-2.74,12,12,0,0,1-1.82-2.39c-1.18-2.18-2.32-5.7-2-8.26a2.5,2.5,0,1,1,5,.56,11.53,11.53,0,0,0,1.46,5.31,8.1,8.1,0,0,0,1.12,1.4,8.88,8.88,0,0,0,1.92,1.75,4,4,0,0,0,4-.44,6.94,6.94,0,0,0,2.53-4.42,20.49,20.49,0,0,0-.59-7,2.5,2.5,0,1,1,4.89-1,24.37,24.37,0,0,1,.62,8.94,11.8,11.8,0,0,1-4.51,7.58A9.3,9.3,0,0,1,376.27,435Z" transform="translate(-60.79 2.5)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.png
deleted file mode 100644
index 62e2af686a..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.svg
deleted file mode 100644
index 06a7fedc4d..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyFlatScene2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 725.13 841.56"><defs><style>.cls-1{fill:#1c1c1b;}.cls-2{fill:#ced8d2;}.cls-3{opacity:0.2;}.cls-4{opacity:0.45;}.cls-5{fill:#ccbca8;}.cls-6{fill:#b79765;}.cls-7{fill:#fff;}.cls-8{opacity:0.38;}.cls-9{fill:#f6d2a2;}.cls-10{fill:#b7a38d;}.cls-11{fill:#1d1d1b;}.cls-12{opacity:0.19;}</style></defs><title>BoyerFlatScene2</title><g id="Capa_10" data-name="Capa 10"><path class="cls-1" d="M764.83,322.58A357.59,357.59,0,0,0,608.13,193.31l.36-11,36.64-58.43a2.5,2.5,0,0,0-2.34-3.82l-24.27,2.17,11.87-36.4a2.5,2.5,0,0,0-1.76-3.2l-134.5-34a2.5,2.5,0,0,0-3.05,1.89l-21.16,96.39L429.15,79.7a2.51,2.51,0,0,0-2.31-1.2L276.83,89a2.5,2.5,0,0,0-2.15,3.41l3.72,9.52-17.26-4.35a2.5,2.5,0,0,0-2.5,4.06l53.29,61.29V202.7a3.52,3.52,0,0,0-3.42-.16,357.58,357.58,0,1,0,456.3,120Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M468.33,885.06a362.61,362.61,0,0,1-162-687q.32-.16.65-.29v-33l-52.07-59.88a7.5,7.5,0,0,1,7.49-12.19l7.84,2-.18-.47A7.5,7.5,0,0,1,276.48,84l150-10.5a7.49,7.49,0,0,1,6.93,3.59l34.28,56.48,18.48-84.19a7.5,7.5,0,0,1,9.15-5.67l134.51,34a7.5,7.5,0,0,1,5.29,9.6l-9.52,29.2L642.34,115a7.5,7.5,0,0,1,7,11.45l-35.92,57.28-.2,6.29a362.56,362.56,0,0,1-144.91,695ZM310,207.39a352.51,352.51,0,1,0,296.15-9.48L603,196.57l.51-15.82,34.68-55.31-26.8,2.39L624.8,86.77,495.4,54.06,472.12,160.13,425.66,83.6,280.58,93.76l6,15.39-18.95-4.78,49.29,56.69v50.56Z" transform="translate(-105.77 -43.5)"/></g><g id="background_color" data-name="background color"><path class="cls-2" d="M606.14,196.29C733.21,250,822.37,375.85,822.37,522.5c0,195.53-158.51,354-354,354s-354-158.51-354-354c0-138.66,79.71-258.7,195.81-316.8" transform="translate(-105.77 -43.5)"/></g><g id="background_shadows" data-name="background shadows"><g class="cls-3"><polygon points="655.41 575.12 531.59 650.5 494.43 631.06 496.06 597.66 556.54 578.75 655.41 575.12"/></g><g class="cls-3"><path d="M168.51,577.42l-52.39,5.17s20.59,65.66,26.2,78.18S178.74,727,185.62,737.5s37.45,40.32,37.45,40.32L383.61,705Z" transform="translate(-105.77 -43.5)"/></g></g><g id="Capa_9" data-name="Capa 9"><path class="cls-1" d="M770.15,537.19c-5.12,0-9.59-.48-13-1.76a2.5,2.5,0,0,1,1.78-4.67c7.58,2.88,23.89.83,38.27-1,8.92-1.12,17.34-2.18,23.83-2.18a2.5,2.5,0,0,1,0,5c-6.19,0-14.46,1-23.21,2.14C788.21,535.95,778.35,537.19,770.15,537.19Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M116.11,585.09a2.5,2.5,0,0,1-.58-4.93c12-2.85,23.67-3.07,36.58-3.07a2.5,2.5,0,0,1,0,5h0c-12.64,0-24,.21-35.42,2.93A2.48,2.48,0,0,1,116.11,585.09Z" transform="translate(-105.77 -43.5)"/><g class="cls-4"><path class="cls-1" d="M307.84,758.67h-4.67a2.5,2.5,0,0,1,0-5h4.67a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M348.51,782.67h-6a2.5,2.5,0,1,1,0-5h6a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M491.18,824.67h-2.67a2.5,2.5,0,1,1,0-5h2.67a2.5,2.5,0,1,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M546.51,806h-2.67a2.5,2.5,0,0,1,0-5h2.67a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M693.18,678.67a2.5,2.5,0,0,1-1-4.78,9.8,9.8,0,0,1,4.46-.89,2.5,2.5,0,0,1,2.41,2.59,2.53,2.53,0,0,1-2.59,2.41,4.85,4.85,0,0,0-2.2.44A2.49,2.49,0,0,1,693.18,678.67Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M671.17,663.33a2.5,2.5,0,0,1-.21-5l3.06-.29c1.43-.14,2.86-.28,4.3-.38a2.5,2.5,0,0,1,.36,5c-1.4.1-2.79.24-4.18.37l-3.13.29Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M743.84,654h-6a2.5,2.5,0,0,1,0-5h6a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M787.18,579.33h-8a2.5,2.5,0,0,1,0-5h8a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M628.13,800.15a18.45,18.45,0,0,1-6.49-1,2.5,2.5,0,1,1,1.73-4.69c2.16.8,4.77.7,7.54.59,1,0,2-.07,2.94-.07a2.5,2.5,0,0,1,0,5h-.09c-.87,0-1.75,0-2.65.07S629.13,800.15,628.13,800.15Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M302.11,802.76a25.61,25.61,0,0,1-6.21-.84,2.5,2.5,0,0,1,1.22-4.85,18.38,18.38,0,0,0,6.44.61,2.5,2.5,0,1,1,.57,5A17.58,17.58,0,0,1,302.11,802.76Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M354.79,816.06a18.53,18.53,0,0,1-8-1.64,2.5,2.5,0,0,1,2.15-4.51,14.84,14.84,0,0,0,7.42,1.1,2.5,2.5,0,0,1,.35,5Q355.72,816.06,354.79,816.06Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M239.84,748.67h-5.33a2.5,2.5,0,1,1,0-5h5.33a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g></g><g id="COLOR"><path class="cls-5" d="M636.94,672.51l.8-29.52,123.44-24.37V376.75L670.5,347.84,601.4,325l3.79-143.43L643,122.5,615,125,627.37,87,493.51,51,468.33,152.25,427,81,277,91.5l5.55,14.05L262,101.71,313.76,162l.69,106.83L247.51,274l-11.2-.75,8.12,48.44-1.59,103.56v2.92l-42.58,5.43V470.5l-50.82,8v45l-4.36,2,12.4,36-2,100.22,95.38,63.2c.75.5,131-19.64,131-19.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M488,791.08c1.73.41,3.46.83,5.22,1.13,6.25,1.07,11.6,2.26,18.06,1.63,15.87-1.55,33.24-1.7,48.46-6.84,9.3-3.14,17.6-8.61,25.79-14l21.6-14.3c7.14-4.73,14.35-9.51,20.21-15.76,3.07-3.27,6-7.1,10.28-8.44,3.42-1.07,6.91,0,10.21-1s6.54-3.75,8.88-6.16a28.13,28.13,0,0,0,8.11-19.64c-.06-4.51-1.64-9.52-5.69-11.52-5.15-2.55-8.9,1.34-12.27,4.65-2.85,2.8-5.23,7.7-7.65,2-1.27-3-1-5.72-1.82-8.82-2-7.49-2.87-17.1-6.28-24.09s-13.47-5.69-19.9-5c-3.27.35-6.28,2.14-9.35,2.57-5.08.73-10.24-.11-15.36.77-10,1.71-20.73,3.63-30.14,7.61-10.29,4.35-19,11.78-28.48,17.55-6.62,4-8.49,8.54-12.51,14.63-2.18,3.29-2.85,4.21-7.09,4.81a13.21,13.21,0,0,0-7.4,3,133.18,133.18,0,0,0-20,17.45A147.06,147.06,0,0,0,464.33,755c-2.47,4-4.95,7.94-7.57,11.93-2.18,3.31-7.21,7.6-8.2,11.21,4.48.44,9.38,4.8,13.63,6.63,4,1.74,8.69,4.48,13,5.08,2.75.39,5.59-.06,8.33.34C485,790.4,486.49,790.73,488,791.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M577.72,629.6q1.12-1.14,2.21-2.32c2.31-2.5,6.69-5.41,7.4-8.85a12.6,12.6,0,0,0-.2-4.62c-.49-2.9-4-13.59-1.07-15.25a6.65,6.65,0,0,1,2.48-.54c4.88-.6,8.84-4.32,11.51-8.45,7.67-11.89,6.78-30.25-1.48-41.48l-5.77-7.85a42.81,42.81,0,0,0-6.15-7.19,24.19,24.19,0,0,0-19.1-5.79c-5.24.6-10.62,1.84-15.71.44-6.12-1.68-10.55-6.81-15.62-10.61-11.44-8.57-26.51-10.51-40.81-10.52a6.36,6.36,0,0,1-3.58-.7,7.41,7.41,0,0,1-2-2.67,19.85,19.85,0,0,0-6.55-6.83,7,7,0,0,0-4.88-1.36,8.49,8.49,0,0,0-3.73,2.19c-2.45,2.07-5.11,4.3-6.63,7.19-1.34,2.55-.75,6.11-3.41,7.46-2.07,1.05-6.25,1-8.69,1.86q-6,2.11-11.86,4.63c-11.08,4.77-21.65,10.62-32.2,16.46-9.48,5.25-19.69,11.33-23.34,21.53-.76,2.13-2.21,3-3.16,5a22.16,22.16,0,0,0-23.17,2.28,10.31,10.31,0,0,0-4.1,5.86,10.86,10.86,0,0,0,1.44,6.8,28,28,0,0,0,16.12,13.78,4.73,4.73,0,0,1,2.38,1.28c1.42,1.8-.31,4.55-1,6.29a16.18,16.18,0,0,0-1.49,6.8v50.12c0,5.83.09,12,3.07,17,24.4.82,49.14-5.34,73.43-7.85,10.86-1.13,21.79-1.25,32.68-2,13.67-1,27.24-2.89,40.81-4.83,6.15-.88,12.4-1.86,18.23-4.11a93,93,0,0,0,25.29-15.26A110.36,110.36,0,0,0,577.72,629.6Z" transform="translate(-105.77 -43.5)"/><path class="cls-7" d="M551.14,648.24a67.44,67.44,0,0,1-9.66,4.38,66.76,66.76,0,0,1-13.13,2.49q-36.59,4.39-73.27,7.93c-22.21,2.14-43.57,6.23-65.86,7.06a40.19,40.19,0,0,0-15.61,3.34c-.16,3.1-.3,6.31.75,9.23s3.64,5.53,6.75,5.62a31.17,31.17,0,0,0,1.32,12.18,62.17,62.17,0,0,0,3.63,8.47c2.84,5.82,5.29,12.19,8.67,17.71,2.63,4.3,5.48,8.34,6.8,13.35,1.23,4.67,3.06,6.19,6.32,9.51,3.59,3.65,7.3,7.54,11,11.31,5.46,5.63,10.9,9.18,18,12.77,1.93,1,3.89,1.83,5.74,2.84,3.09,1.68,3.64,2.29,6.11-.71,3.95-4.81,7.13-10.25,11.23-14.92,3.41-3.88,6.75-7.86,9.78-12,4.73-6.42,9.78-12.61,14.9-18.73,4.32-5.16,10.41-8.76,15-13.52,2.82-2.94.35-3.06-.08-7.15-.74-7,2.48-24.26,12.5-18.55,3.65,2.08,4.47,6.22,7.77,7.92,1-2.83,4.22-5.08,6.75-6.63,4.12-2.52,7.95-5.48,12.35-7.42,6.86-3,13.52-6.36,20.46-9.1,7.16-2.83,14.43-6.14,22-7.72,8.37-1.74,16.44-1.92,25-2.34,6.53-.32,13.08-.12,19.43-1.12,0-1.92-3.18-4.81-4.48-6.45a70.75,70.75,0,0,0-5.79-6.52c-4.4-4.28-8.58-.64-12.84,2.51s-15.29,11-19.27,3.36c-4.43-8.46,2.81-15.4,10.76-15.85,4.41-.25,7.76.45,11.09,3.34,2.94,2.54,5,6.21,8.85,7.3,3.25-5.74-.65-13.37-5.28-16.92-5-3.86-11-3.82-15.33-8.71-1.53-1.75-3-6-5-7-2.57-1.27-4.3,2.26-6,4.44-4,5.2-7.54,10.85-13.37,14.23S557.26,645.07,551.14,648.24Z" transform="translate(-105.77 -43.5)"/><g class="cls-8"><path class="cls-7" d="M548.55,520.1a25.14,25.14,0,0,1,6.58-6.75,23.42,23.42,0,0,1,7.31-2.95,40.69,40.69,0,0,1,35.7,8.76c11.42,10,15.88,25.19,17.67,39.75.86,7,2.84,12.83,1.86,20a46.19,46.19,0,0,1-9.29,22.14,24.82,24.82,0,0,1-7.23,6.57c-4.26,2.37-9.29,2.79-14.15,3.17l-12.41,1c-3,.23-6.28.43-9-1-2.14-1.16-3.63-3.21-5-5.2C543.23,581.15,529,547.74,548.55,520.1Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-8"><path class="cls-7" d="M423.16,562.28a25.14,25.14,0,0,1,6.58-6.75c17.24-11.2,40.27-11.29,59.15-4.76,7.48,2.59,15,6.48,19.15,13.23,2.19,3.57,3.27,7.7,5.06,11.48,2.78,5.88,5.22,8.87,5.62,15.37.35,5.59,1.06,11.13,1.07,16.75,0,10.38-1.67,22-10.26,29-9.82,7.93-21.24,14.51-33.77,16-11.55,1.37-23.07-1.78-33.34-6.94-4.59-2.31-11.26-5.26-14.7-9.17-2.83-3.22-4.69-8.71-6.44-12.64C412.37,603.93,410,580.92,423.16,562.28Z" transform="translate(-105.77 -43.5)"/></g><path class="cls-9" d="M521.44,619.75a4.06,4.06,0,0,0,.1,2.17,3.59,3.59,0,0,0,1.47,1.52,10.39,10.39,0,0,0,11.8-.66c2.25-1.82,3.66-4.55,6-6.22,4.47-3.15,10.66-1.55,15.94-3a8.15,8.15,0,0,0,5.21-3.66c1.57-2.92.15-6.82-2.56-8.74s-6.3-2.16-9.56-1.52a7.14,7.14,0,0,0-2.58.94c-.5.33-.92.76-1.44,1.07a7.24,7.24,0,0,1-2.14.74,91,91,0,0,1-9.6,2.15c-1.8.21-4-.33-5.66.51C524.25,607.22,522.06,615.55,521.44,619.75Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M539.69,595.19a16.74,16.74,0,0,0-5.23,2.53,7.4,7.4,0,0,0-2.66,3.05,2.77,2.77,0,0,0-.21,1.58,3,3,0,0,0,1.52,1.83,8.09,8.09,0,0,0,4.66.9,34.56,34.56,0,0,0,4.74-.86,12.39,12.39,0,0,0,4.27-1.41,3.67,3.67,0,0,0,1.78-3.83,4.43,4.43,0,0,0-2.74-2.55,12.88,12.88,0,0,0-7.51-.78" transform="translate(-105.77 -43.5)"/><path class="cls-7" d="M538.59,620.55a4.57,4.57,0,0,0,.24,1.64c.34,1.06,2.86,5.74,4,6.17,3.37,1.25,12-3.91,12-7.67-.11-7-5.46-6-10.54-4.6C541.69,616.81,538.73,617.93,538.59,620.55Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M511.18,690.5c-9.54-4.09-12.13,7.26-11.68,14.67.27,4.56,1.43,7.6,6.67,7.33,4.82-.25,10.48-4.16,12.43-8.64S516.34,693.51,511.18,690.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M601.84,640.83c-4.64-2.27-18.77,2-20.76,7.33-5.05,13.47,13.34,13.65,20.77,9.07C608.25,653.3,614.29,646.82,601.84,640.83Z" transform="translate(-105.77 -43.5)"/><polygon class="cls-10" points="261.69 395.02 182.17 404.84 135.41 383.03 140.61 281.16 130.54 229.75 142.41 232.33 236.08 222.66 247.41 240.66 251.49 239.66 264.08 210.62 310.13 222.66 306.47 236.45 312.74 236 302.08 275.33 302.33 355.11 274.9 357.33 280.37 390.09 254.85 381.34 261.69 395.02"/></g><g id="DETAILS"><path class="cls-11" d="M652,604.19a1.5,1.5,0,0,1-.3-3l27.16-5.51a1.5,1.5,0,0,1,.6,2.94l-27.15,5.51A1.5,1.5,0,0,1,652,604.19Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M656.45,629.7a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,1.37-1.62,1.52,1.52,0,0,1,1.62,1.37c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M656.44,629.7a1.5,1.5,0,0,1-.27-3c9.22-1.72,19.79-3.64,28.25-4.79a1.5,1.5,0,0,1,.41,3c-8.4,1.15-18.92,3.05-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M684.63,624.91a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.81-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,0,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.37,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M683.75,598.95a1.5,1.5,0,0,1-.3-3l27.16-5.51a1.5,1.5,0,1,1,.6,2.94l-27.15,5.51A1.5,1.5,0,0,1,683.75,598.95Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M688.15,624.45a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,1.37-1.62,1.52,1.52,0,0,1,1.62,1.37c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M688.15,624.45a1.5,1.5,0,0,1-.27-3c9.21-1.72,19.77-3.64,28.25-4.79a1.5,1.5,0,0,1,.41,3c-8.42,1.15-18.93,3.06-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M716.33,619.67a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.81-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,1,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.37,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M715.47,593.5a1.5,1.5,0,0,1-.3-3L742.33,585a1.5,1.5,0,0,1,.6,2.94l-27.16,5.51A1.49,1.49,0,0,1,715.47,593.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M719.87,619a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,3-.25c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M719.87,619a1.5,1.5,0,0,1-.27-3c9.21-1.72,19.76-3.64,28.25-4.79a1.5,1.5,0,1,1,.4,3c-8.43,1.15-18.94,3.06-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M748.05,614.22a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.82-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,0,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.38,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M666.66,622.38a1.5,1.5,0,0,1-1.47-1.21,120.78,120.78,0,0,1-1.74-12,1.5,1.5,0,1,1,3-.28,118,118,0,0,0,1.7,11.69,1.5,1.5,0,0,1-1.47,1.79Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M662.34,609.44a.26.26,0,0,0,0,.15c0,.15.25.12.39.05a12.33,12.33,0,0,1,4.83-1.24,11.24,11.24,0,0,1-1.68-2c-.28-.39-1.12-1.92-1.64-1.94s-.76,1.76-.89,2.22A19.33,19.33,0,0,1,662.34,609.44Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M671.86,621.56a1.5,1.5,0,0,1-1.47-1.21,120.75,120.75,0,0,1-1.74-12,1.5,1.5,0,1,1,3-.28,117.9,117.9,0,0,0,1.7,11.69,1.5,1.5,0,0,1-1.18,1.76Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M667.54,608.61a.26.26,0,0,0,0,.15c0,.15.25.12.39.05a12.33,12.33,0,0,1,4.83-1.24,11.24,11.24,0,0,1-1.68-2c-.28-.39-1.12-1.92-1.64-1.94s-.76,1.76-.89,2.22A19.33,19.33,0,0,1,667.54,608.61Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M702.49,619a2.52,2.52,0,0,1-.46,0,3.11,3.11,0,0,1-2.3-2.24,14.26,14.26,0,0,1-.48-1.74l-1.45-6.37a1.5,1.5,0,1,1,2.93-.67l1.45,6.37a12.26,12.26,0,0,0,.35,1.31,5.84,5.84,0,0,0,.14-.61,1.5,1.5,0,0,1,2.95.56,5.49,5.49,0,0,1-.71,2A2.91,2.91,0,0,1,702.49,619Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M693.91,610.54a2.17,2.17,0,0,1-1.89-.87c-.61-.85-.49-2,.34-3.36a8.16,8.16,0,0,1,4.83-3.94,11.49,11.49,0,0,1,4.48-.26,6.73,6.73,0,0,1,3.94,1.92,4.41,4.41,0,0,1,1.9,3.2,1.5,1.5,0,0,1-1.23,1.49c-2.55.46-5.14.88-7.71,1.25-.48.07-1,.12-1.47.17a21.5,21.5,0,0,0-2.27.32A4.39,4.39,0,0,1,693.91,610.54ZM700,605a7.29,7.29,0,0,0-2,.25,4.76,4.76,0,0,0-2.72,2.06c.51-.07,1-.12,1.51-.18s.91-.09,1.36-.16c1.77-.25,3.56-.53,5.33-.83a3.56,3.56,0,0,0-2.16-1.06A11.39,11.39,0,0,0,700,605Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M698.86,604.5a1.5,1.5,0,0,1-1.45-1.11l-.44-1.6a1.5,1.5,0,1,1,2.89-.79l.44,1.6a1.5,1.5,0,0,1-1.45,1.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M729.58,605.81a6.59,6.59,0,0,1-2.87-.71,4,4,0,0,1-1.54-1.23,4.38,4.38,0,0,1-.67-2l-1.1-7.41a1.5,1.5,0,1,1,3-.44l1.1,7.41a2.64,2.64,0,0,0,.16.7,1.16,1.16,0,0,0,.41.26,3.42,3.42,0,0,0,1.76.39,1.67,1.67,0,0,0,1.19-.6c.52-.71.27-2,0-3.21l-1.22-5.27a1.5,1.5,0,1,1,2.92-.68l1.22,5.27c.31,1.32.88,3.77-.5,5.66a4.62,4.62,0,0,1-3.34,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M724.92,595.53a1.5,1.5,0,0,1-.49-2.92,8.6,8.6,0,0,1,2-.38l4.62-.46a1.5,1.5,0,0,1,.3,3l-4.62.46a6.16,6.16,0,0,0-1.34.23A1.5,1.5,0,0,1,724.92,595.53Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M730.91,613.71a1.5,1.5,0,0,1-1.46-1.19c-.54-2.52-1-5.09-1.25-7.65a1.5,1.5,0,1,1,3-.34c.28,2.46.68,4.93,1.2,7.36a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M728.12,615a1.5,1.5,0,0,1-.52-2.91,9.5,9.5,0,0,1,2.54-.46l.75-.07A9.73,9.73,0,0,0,733,611a1.5,1.5,0,1,1,1,2.82,12.73,12.73,0,0,1-2.81.67l-.85.08a7.07,7.07,0,0,0-1.76.29A1.49,1.49,0,0,1,728.12,615Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M500.65,218.38a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3l-27.59,2.52Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M502.24,244.21a1.5,1.5,0,0,1-1.47-1.19c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M502.24,244.21a1.5,1.5,0,0,1-.11-3c9.34-.71,20.05-1.46,28.61-1.69h0a1.5,1.5,0,0,1,0,3c-8.49.22-19.15,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M530.77,242.53a1.5,1.5,0,0,1-1.46-1.15C528,236,527.73,230,527.44,224.2c-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M532.74,216.62a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3l-27.59,2.52Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M534.33,242.45a1.5,1.5,0,0,1-1.47-1.19c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M534.33,242.45a1.5,1.5,0,0,1-.11-3c9.34-.71,20.05-1.46,28.61-1.69a1.5,1.5,0,0,1,.08,3c-8.49.22-19.15,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M562.86,240.77a1.5,1.5,0,0,1-1.46-1.15c-1.29-5.39-1.58-11.38-1.87-17.17-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M564.86,214.67a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3L565,214.66Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M566.45,240.5A1.5,1.5,0,0,1,565,239.3c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M566.45,240.5a1.5,1.5,0,0,1-.11-3c9.33-.71,20-1.46,28.61-1.69a1.5,1.5,0,0,1,.08,3c-8.51.22-19.16,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M595,238.81a1.5,1.5,0,0,1-1.46-1.15c-1.29-5.39-1.58-11.38-1.87-17.18-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M513.19,238.06a1.5,1.5,0,0,1-1.49-1.37,120.8,120.8,0,0,1-.42-12.11,1.52,1.52,0,0,1,1.52-1.48,1.5,1.5,0,0,1,1.48,1.52,118,118,0,0,0,.41,11.81,1.5,1.5,0,0,1-1.37,1.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M510.14,224.71a.26.26,0,0,0,0,.15c0,.15.24.14.38.09a12.33,12.33,0,0,1,4.93-.71,11.24,11.24,0,0,1-1.46-2.14c-.24-.42-.91-2-1.42-2.11s-.95,1.66-1.12,2.11A19.33,19.33,0,0,1,510.14,224.71Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M518.45,237.8a1.5,1.5,0,0,1-1.49-1.37,120.79,120.79,0,0,1-.42-12.11,1.5,1.5,0,0,1,1.5-1.48h0a1.5,1.5,0,0,1,1.48,1.52,118,118,0,0,0,.41,11.81,1.5,1.5,0,0,1-1.37,1.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M515.4,224.46a.26.26,0,0,0,0,.15c0,.15.24.14.38.09a12.33,12.33,0,0,1,4.93-.71,11.24,11.24,0,0,1-1.46-2.14c-.24-.42-.91-2-1.42-2.11s-.95,1.66-1.12,2.11A19.33,19.33,0,0,1,515.4,224.46Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M549.29,238.63a2.53,2.53,0,0,1-.73-.11,3.11,3.11,0,0,1-2-2.48,14,14,0,0,1-.28-1.78l-.75-6.5a1.5,1.5,0,1,1,3-.34l.74,6.49a12.42,12.42,0,0,0,.2,1.34,5.71,5.71,0,0,0,.21-.59,1.5,1.5,0,1,1,2.87.88,5.48,5.48,0,0,1-.93,2A3,3,0,0,1,549.29,238.63Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M541.83,229.26a2.3,2.3,0,0,1-2.2-1.1c-.51-.91-.27-2,.7-3.3a8.16,8.16,0,0,1,5.24-3.39,11.43,11.43,0,0,1,4.48.23,6.71,6.71,0,0,1,3.71,2.33,4.4,4.4,0,0,1,1.54,3.39,1.5,1.5,0,0,1-1.39,1.34c-2.58.18-5.21.32-7.8.4-.49,0-1,0-1.48,0a22.18,22.18,0,0,0-2.28.07Zm12-2h0Zm-6.65-2.92a6.64,6.64,0,0,0-1.09.09,4.76,4.76,0,0,0-2.93,1.75c.51,0,1,0,1.51,0s.92,0,1.37,0c1.79-.06,3.59-.14,5.39-.24a3.56,3.56,0,0,0-2-1.29A10,10,0,0,0,547.15,224.35Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M547.14,223.79a1.5,1.5,0,0,1-1.48-1.27l-.26-1.64a1.5,1.5,0,1,1,3-.47l.26,1.64a1.5,1.5,0,0,1-1.25,1.72Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M578,228.46h-.11a6.37,6.37,0,0,1-3.25-1,4,4,0,0,1-1.4-1.39,4.39,4.39,0,0,1-.46-2l-.29-7.49a1.5,1.5,0,0,1,3-.12l.29,7.49a2.64,2.64,0,0,0,.08.71,1.17,1.17,0,0,0,.38.3,3.4,3.4,0,0,0,1.7.58,1.69,1.69,0,0,0,1.25-.46c.6-.65.49-2,.35-3.19l-.64-5.37a1.5,1.5,0,0,1,3-.35l.64,5.37c.16,1.34.46,3.85-1.12,5.57A4.6,4.6,0,0,1,578,228.46Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M574,217.71a1.5,1.5,0,0,1-.33-3,8.77,8.77,0,0,1,2.05-.15l4.65,0a1.5,1.5,0,0,1,0,3h0l-4.64,0a6.15,6.15,0,0,0-1.35.08A1.53,1.53,0,0,1,574,217.71Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M578,236.44a1.5,1.5,0,0,1-1.49-1.35c-.26-2.55-.4-5.16-.41-7.74a1.5,1.5,0,0,1,1.49-1.51h0a1.5,1.5,0,0,1,1.5,1.49c0,2.48.14,5,.39,7.45a1.5,1.5,0,0,1-1.34,1.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M575.09,237.37a1.5,1.5,0,0,1-.36-3,9.55,9.55,0,0,1,2.58-.18h.75a9.75,9.75,0,0,0,2.19-.27,1.5,1.5,0,1,1,.71,2.92,12.81,12.81,0,0,1-2.87.36h-.85a7.06,7.06,0,0,0-1.79.1A1.52,1.52,0,0,1,575.09,237.37Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M266.5,686.83a1.5,1.5,0,0,1-.31-3l27.11-5.73a1.5,1.5,0,1,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,266.5,686.83Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M271.1,712.29a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.21-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.13a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,271.1,712.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M271.1,712.29a1.5,1.5,0,0,1-.29-3c9.18-1.79,19.71-3.79,28.21-5a1.5,1.5,0,0,1,.43,3c-8.43,1.22-18.92,3.21-28.07,5A1.46,1.46,0,0,1,271.1,712.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M299.24,707.28a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.84-.57-3.39-1.11-6.6-1.81-9.51a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.27,1.86,9.72.94,5.59,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M298.16,681.32a1.5,1.5,0,0,1-.31-3L325,672.62a1.5,1.5,0,0,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,298.16,681.32Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M302.77,706.79a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.22-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.13a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,302.77,706.79Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M302.77,706.79a1.5,1.5,0,0,1-.29-3c9.2-1.8,19.75-3.8,28.21-5a1.5,1.5,0,1,1,.43,3c-8.4,1.21-18.9,3.21-28.07,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M330.91,701.78a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.84-.57-3.39-1.11-6.6-1.81-9.51a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.27,1.86,9.72.94,5.58,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M329.83,675.62a1.5,1.5,0,0,1-.31-3l27.11-5.73a1.5,1.5,0,1,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,329.83,675.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M334.44,701.08a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.21-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.12a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,334.44,701.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M334.44,701.08a1.5,1.5,0,0,1-.29-3c9.19-1.79,19.74-3.8,28.21-5a1.5,1.5,0,0,1,.43,3c-8.41,1.22-18.91,3.21-28.07,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M362.58,696.07a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.83-.57-3.39-1.11-6.6-1.82-9.52a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.28,1.86,9.72.94,5.58,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M281.26,704.9a1.5,1.5,0,0,1-1.47-1.2c-.81-3.95-1.43-8-1.84-12a1.5,1.5,0,1,1,3-.3c.4,3.9,1,7.83,1.79,11.68a1.5,1.5,0,0,1-1.17,1.77A1.54,1.54,0,0,1,281.26,704.9Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M276.84,692a.26.26,0,0,0,0,.15c0,.15.25.12.39,0a12.33,12.33,0,0,1,4.82-1.28,11.24,11.24,0,0,1-1.7-2c-.29-.39-1.14-1.92-1.66-1.93s-.75,1.76-.87,2.23A19.33,19.33,0,0,1,276.84,692Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M286.45,704a1.5,1.5,0,0,1-1.47-1.2,120.91,120.91,0,0,1-1.84-12,1.5,1.5,0,1,1,3-.3,118,118,0,0,0,1.79,11.68,1.5,1.5,0,0,1-1.17,1.77A1.53,1.53,0,0,1,286.45,704Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M282,691.12a.26.26,0,0,0,0,.15c0,.15.25.12.39,0a12.33,12.33,0,0,1,4.82-1.28,11.24,11.24,0,0,1-1.7-2c-.29-.39-1.14-1.92-1.66-1.93s-.75,1.76-.87,2.23A19.33,19.33,0,0,1,282,691.12Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M317.05,701.25a2.49,2.49,0,0,1-.44,0,3.11,3.11,0,0,1-2.32-2.23,14.09,14.09,0,0,1-.49-1.73l-1.5-6.36a1.5,1.5,0,0,1,2.92-.69l1.5,6.36a12.44,12.44,0,0,0,.36,1.31,5.79,5.79,0,0,0,.13-.61,1.5,1.5,0,1,1,3,.54,5.42,5.42,0,0,1-.7,2.05A2.91,2.91,0,0,1,317.05,701.25Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M308.39,692.83a2.17,2.17,0,0,1-1.87-.86c-.61-.84-.51-2,.31-3.36a8.15,8.15,0,0,1,4.8-4,11.42,11.42,0,0,1,4.48-.3,6.72,6.72,0,0,1,4,1.88,4.4,4.4,0,0,1,1.93,3.18,1.5,1.5,0,0,1-1.22,1.49c-2.56.49-5.15.93-7.7,1.31-.48.07-1,.13-1.46.18a21.61,21.61,0,0,0-2.27.33A4.39,4.39,0,0,1,308.39,692.83Zm6.15-5.59a7.42,7.42,0,0,0-2.07.27,4.76,4.76,0,0,0-2.71,2.08c.51-.08,1-.13,1.51-.19s.91-.1,1.36-.17c1.76-.26,3.54-.56,5.32-.87a3.57,3.57,0,0,0-2.17-1A11.49,11.49,0,0,0,314.55,687.24Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M313.31,686.76a1.5,1.5,0,0,1-1.44-1.09l-.45-1.6a1.5,1.5,0,1,1,2.89-.81l.45,1.6a1.5,1.5,0,0,1-1.44,1.91Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M344,687.81a6.59,6.59,0,0,1-2.83-.68,3.93,3.93,0,0,1-1.55-1.22,4.38,4.38,0,0,1-.69-2l-1.16-7.4a1.5,1.5,0,0,1,3-.47l1.16,7.4a2.62,2.62,0,0,0,.17.69,1.14,1.14,0,0,0,.41.26,3.37,3.37,0,0,0,1.76.38,1.67,1.67,0,0,0,1.18-.61c.52-.72.26-2,0-3.21l-1.27-5.26A1.5,1.5,0,0,1,347,675l1.27,5.26c.32,1.32.91,3.77-.46,5.66a4.62,4.62,0,0,1-3.33,1.84Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M339.3,677.57a1.5,1.5,0,0,1-.5-2.91,8.62,8.62,0,0,1,2-.39l4.62-.5a1.5,1.5,0,1,1,.32,3l-4.62.5a6.21,6.21,0,0,0-1.34.24A1.49,1.49,0,0,1,339.3,677.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M345.44,695.71a1.5,1.5,0,0,1-1.46-1.17c-.56-2.51-1-5.08-1.31-7.64a1.5,1.5,0,1,1,3-.36c.3,2.46.73,4.93,1.26,7.35a1.5,1.5,0,0,1-1.47,1.83Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M342.65,697a1.5,1.5,0,0,1-.53-2.9,9.58,9.58,0,0,1,2.54-.48l.74-.08a9.78,9.78,0,0,0,2.15-.53,1.5,1.5,0,0,1,1,2.81,12.85,12.85,0,0,1-2.81.69l-.84.09a7.08,7.08,0,0,0-1.77.31A1.5,1.5,0,0,1,342.65,697Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M698.06,387.11a3.52,3.52,0,0,1-1.07-.17c-19.51-6.22-39-13.58-57.77-20.69-27.37-10.35-55.66-21.06-84.39-28.32a3.53,3.53,0,1,1,1.73-6.84c29.12,7.36,57.61,18.14,85.16,28.56,18.72,7.08,38.09,14.41,57.42,20.57a3.53,3.53,0,0,1-1.07,6.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M233.85,453.13a3.53,3.53,0,0,1-.9-6.94c12.29-3.27,24.88-6.06,37.4-8.29a3.53,3.53,0,0,1,1.24,6.95c-12.33,2.19-24.72,4.94-36.82,8.16A3.55,3.55,0,0,1,233.85,453.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M557.18,676.67a1.5,1.5,0,0,1-1.35-.85,43.4,43.4,0,0,1-1.72-4.29c-1-2.89-1.94-5.39-4.29-7.6a1.5,1.5,0,1,1,2.05-2.19c2.88,2.7,4,5.79,5.06,8.78a41,41,0,0,0,1.6,4,1.5,1.5,0,0,1-1.35,2.15Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M564.18,672.33a1.5,1.5,0,0,1-1.22-.62,9.23,9.23,0,0,1-1.36-4.23,12.75,12.75,0,0,0-.42-2.11,8.8,8.8,0,0,0-1.28-2.19,8.19,8.19,0,0,1-1.89-4.25,1.5,1.5,0,0,1,3-.18,5.7,5.7,0,0,0,1.34,2.7,11.35,11.35,0,0,1,1.68,3,15.14,15.14,0,0,1,.54,2.62,6.87,6.87,0,0,0,.83,2.91,1.5,1.5,0,0,1-1.22,2.38Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M411.84,735.33a1.5,1.5,0,0,1-.95-2.66c4.89-4,15-6.91,21.52-7.33a1.5,1.5,0,1,1,.19,3c-6.1.39-15.52,3.16-19.81,6.67A1.49,1.49,0,0,1,411.84,735.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M425.84,743a1.5,1.5,0,0,1-.73-2.81c.79-.43,1.54-.93,2.35-1.46a21.68,21.68,0,0,1,4.89-2.64,1.5,1.5,0,0,1,1,2.84,19.12,19.12,0,0,0-4.21,2.31c-.81.54-1.66,1.09-2.55,1.58A1.49,1.49,0,0,1,425.84,743Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,698.67h-.07a1.5,1.5,0,0,1-1.43-1.57c.16-3.24,3.28-9.69,5.4-12a1.5,1.5,0,1,1,2.19,2.05c-1.71,1.82-4.47,7.53-4.6,10A1.5,1.5,0,0,1,492.18,698.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,708.33a1.5,1.5,0,0,1-1.37-2.12,14.94,14.94,0,0,0,1.2-4.79,1.5,1.5,0,0,1,3,.14,17.83,17.83,0,0,1-1.46,5.88A1.5,1.5,0,0,1,492.18,708.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M488.84,783.33a1.5,1.5,0,0,1-.57-.11c-.86-.35-1.75-.69-2.57-1a1.5,1.5,0,1,1,1-2.84c.89.3,1.84.66,2.76,1a1.5,1.5,0,0,1-.57,2.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,776.67H492a9.22,9.22,0,0,1-3.59-1.2,1.5,1.5,0,1,1,1.51-2.59,6.19,6.19,0,0,0,2.41.8,1.5,1.5,0,0,1-.17,3Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M498.45,782.38a6.56,6.56,0,0,1-2.51-.49,1.5,1.5,0,0,1,1.14-2.78,3.67,3.67,0,0,0,1.9.23,1.5,1.5,0,1,1,.39,3A7.09,7.09,0,0,1,498.45,782.38Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M631.18,690.67a1.5,1.5,0,0,1-1.5-1.5v-3a1.5,1.5,0,0,1,3,0v3A1.5,1.5,0,0,1,631.18,690.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M632.51,700.67h-.21A1.5,1.5,0,0,1,631,699a2.59,2.59,0,0,0-.21-1.5,1.5,1.5,0,0,1,2.72-1.26,5.58,5.58,0,0,1,.46,3.17A1.5,1.5,0,0,1,632.51,700.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M627.18,696.33a1.5,1.5,0,0,1-1.5-1.5v-1.67a1.5,1.5,0,0,1,3,0v1.67A1.5,1.5,0,0,1,627.18,696.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M372.18,581.33a1.5,1.5,0,0,1-.72-2.82c3.81-2.08,14.85-4.39,18.79-.4a1.5,1.5,0,1,1-2.13,2.11c-2.49-2.52-11.85-.91-15.21.93A1.49,1.49,0,0,1,372.18,581.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M388.51,580.33a1.5,1.5,0,0,1-1.14-.52,24.8,24.8,0,0,0-5.8-4.47c-3.37-2.12-6.86-4.32-8.77-8.56a1.5,1.5,0,1,1,2.74-1.23c1.54,3.42,4.5,5.28,7.63,7.25a27.44,27.44,0,0,1,6.47,5.05,1.5,1.5,0,0,1-1.14,2.48Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M510.58,669.36l-1.18,0h-1.23a1.5,1.5,0,0,1,0-3h1.29a13.85,13.85,0,0,0,4-.29,1.5,1.5,0,1,1,.81,2.89A13.35,13.35,0,0,1,510.58,669.36Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M521.51,671.33h-2a1.5,1.5,0,0,1,0-3h2a1.5,1.5,0,0,1,0,3Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M549.17,628a1.5,1.5,0,0,1-1.47-1.21A30,30,0,0,0,543,616.46a1.5,1.5,0,1,1,2.31-1.92c2.25,2.71,4.66,8.39,5.32,11.67a1.5,1.5,0,0,1-1.18,1.76A1.46,1.46,0,0,1,549.17,628Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M268.51,659a1.5,1.5,0,0,1-1.5-1.5v-4.67a1.5,1.5,0,0,1,3,0v4.67A1.5,1.5,0,0,1,268.51,659Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M267.84,666.67a1.5,1.5,0,0,1-1.49-1.33,8.15,8.15,0,0,1,.41-3.67,1.5,1.5,0,0,1,2.83,1,5.18,5.18,0,0,0-.26,2.33,1.5,1.5,0,0,1-1.32,1.66Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M273.17,659.33a1.5,1.5,0,0,1-1.48-1.3,4.89,4.89,0,0,1,.48-2.88,1.5,1.5,0,1,1,2.68,1.35,1.89,1.89,0,0,0-.19,1.12,1.5,1.5,0,0,1-1.28,1.69Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M165.51,652.67a1.5,1.5,0,0,1-1.4-.95,33.38,33.38,0,0,1-2.1-13,1.5,1.5,0,0,1,3,.16,30.59,30.59,0,0,0,1.9,11.7,1.5,1.5,0,0,1-1.39,2.05Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M170.51,646.67a1.5,1.5,0,0,1-1.2-.59,17.13,17.13,0,0,1-1.55-2.73c-.19-.39-.38-.77-.57-1.13a1.5,1.5,0,0,1,2.65-1.42c.21.39.41.81.62,1.22a15.28,15.28,0,0,0,1.25,2.25,1.5,1.5,0,0,1-1.19,2.41Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M270.84,441.67h0a1.5,1.5,0,0,1-1.5-1.5,15.5,15.5,0,0,0-.58-3.65,27.65,27.65,0,0,1-.57-2.81,30,30,0,0,1-.21-3.51c0-.44,0-.87,0-1.29a1.5,1.5,0,0,1-1.85-.73,8.88,8.88,0,0,1-.72-2.27,3.93,3.93,0,0,1-.73.54,1.5,1.5,0,0,1-2.2-.92l-.08-.3-.06-.22c-.17.32-.34.63-.53.93a1.5,1.5,0,0,1-2.17.42,6.21,6.21,0,0,1-.52-.43,28.48,28.48,0,0,1,.58,7.39,1.5,1.5,0,1,1-3-.26,27.61,27.61,0,0,0-.63-7.12,35.76,35.76,0,0,1-.73-6.67,1.5,1.5,0,0,1,2.74-.82,18.52,18.52,0,0,1,1.35,2.49c.26.54.51,1.07.78,1.55.22-.52.42-1.09.62-1.72a1.5,1.5,0,0,1,2.46-.64,5.09,5.09,0,0,1,1.07,1.51c.07-.19.13-.37.2-.55a1.5,1.5,0,0,1,2.78,0,12.55,12.55,0,0,1,.71,2.64,1.41,1.41,0,0,1,.86-.25,1.5,1.5,0,0,1,1.4,1,19,19,0,0,1,.69,5.67,27.31,27.31,0,0,0,.18,3.17,24.77,24.77,0,0,0,.52,2.51,18,18,0,0,1,.67,4.36A1.5,1.5,0,0,1,270.84,441.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M206.51,695.33a1.5,1.5,0,0,1-1.41-1c-1.2-3.37-.75-7-.32-10.57a34.32,34.32,0,0,0,.4-6.41,2.38,2.38,0,0,1-1.44.28c-1.77-.24-2.37-2.24-3-4.35l0-.13a4.77,4.77,0,0,1-1.67,2.22,1.5,1.5,0,0,1-2.18-.57,15.46,15.46,0,0,1-1.05-3.23l-.14-.57-.12.56a21.28,21.28,0,0,1-.67,2.66,1.5,1.5,0,0,1-1.35,1,1.49,1.49,0,0,1-1.43-.89,38.93,38.93,0,0,1-2-6.27c-.21-.8-.41-1.59-.62-2.35-.15.79-.28,1.6-.42,2.43s-.23,1.4-.35,2.12-.29,1.44-.47,2.28c-.65,3-1.64,7.55-.66,9.66a1.5,1.5,0,0,1-2.72,1.26c-1.41-3-.38-7.76.45-11.56.17-.8.33-1.54.45-2.17s.24-1.38.35-2.06a31.06,31.06,0,0,1,1.81-7.32,1.5,1.5,0,0,1,2.72-.09,34.45,34.45,0,0,1,2.38,7.07l.26,1a7.69,7.69,0,0,1,1.07-2.13,1.5,1.5,0,0,1,1.13-.61,1.53,1.53,0,0,1,1.19.49,9.35,9.35,0,0,1,1.9,4.11,9.09,9.09,0,0,1,.77-1.8,1.5,1.5,0,0,1,2.42-.22,11.77,11.77,0,0,1,1.88,4.24c.17.57.4,1.33.61,1.85a8.94,8.94,0,0,0,.62-.88,1.5,1.5,0,0,1,2.69.34c1.09,3.36.65,6.94.23,10.41s-.8,6.49.17,9.19a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M455.51,328.33a1.5,1.5,0,0,1-1.5-1.43c0-.59-.09-1.18-.15-1.76a24.68,24.68,0,0,1-.18-2.65,1.5,1.5,0,0,1,3,0,21.91,21.91,0,0,0,.17,2.33c.07.64.13,1.28.17,1.93a1.5,1.5,0,0,1-1.43,1.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M455.51,339.67a1.5,1.5,0,0,1-1.5-1.5v-2a1.5,1.5,0,0,1,3,0v2A1.5,1.5,0,0,1,455.51,339.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M462.18,330.33a1.5,1.5,0,0,1-1.45-1.13c-.24-.93-.51-2.33-.69-3.47a1.5,1.5,0,1,1,3-.47c.17,1,.43,2.36.64,3.2a1.5,1.5,0,0,1-1.46,1.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M496.84,441h-.06a1.5,1.5,0,0,1-1.44-1.56v-.35a26,26,0,0,1,.71-6,1.5,1.5,0,0,1,2.88.83,23.86,23.86,0,0,0-.6,5.29v.36A1.5,1.5,0,0,1,496.84,441Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M497.18,450.33a1.5,1.5,0,0,1-1.27-2.3,1.23,1.23,0,0,0,.13-.9,1.5,1.5,0,1,1,2.94-.6,4.22,4.22,0,0,1-.53,3.1A1.5,1.5,0,0,1,497.18,450.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M636.84,488.33a1.5,1.5,0,0,1-1.31-2.22,10.57,10.57,0,0,1,2.73-3.13,1.5,1.5,0,1,1,1.83,2.38,7.6,7.6,0,0,0-1.94,2.2A1.5,1.5,0,0,1,636.84,488.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M743.18,547a1.5,1.5,0,0,1-1.28-2.28,17.16,17.16,0,0,0,1.4-3.36c.16-.46.31-.93.48-1.38a1.5,1.5,0,0,1,2.81,1c-.16.43-.3.86-.45,1.3a19.66,19.66,0,0,1-1.67,4A1.5,1.5,0,0,1,743.18,547Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M747.18,559a1.5,1.5,0,0,1-1-2.61.53.53,0,0,0,.18-.47,1.5,1.5,0,0,1,3-.18,3.52,3.52,0,0,1-1.15,2.87A1.49,1.49,0,0,1,747.18,559Z" transform="translate(-105.77 -43.5)"/></g><g id="LINEART"><path class="cls-1" d="M389.53,594.58a2.5,2.5,0,0,1-.54-.06l-.89-.19c-12.57-2.76-33.6-7.38-31.41-25.13.7-5.64,2.85-9.58,6.39-11.73,7-4.23,17.46-.3,25.87,2.86,2.22.83,4.31,1.62,6.1,2.16a2.5,2.5,0,1,1-1.46,4.78c-1.94-.59-4.1-1.4-6.4-2.26-7.4-2.78-16.62-6.24-21.52-3.26-2.2,1.33-3.51,4-4,8.06-1.51,12.21,12.77,16.39,27.52,19.63l.89.2a2.5,2.5,0,0,1-.54,4.94Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M586.6,621.13h-.12a2.5,2.5,0,0,1-2.37-2.62c.31-6.34.06-8.26-.76-14.61-.25-1.94-.6-4-1-6a2.5,2.5,0,0,1,4.9-1c.45,2.18.81,4.33,1.08,6.39a67.68,67.68,0,0,1,.8,15.5A2.5,2.5,0,0,1,586.6,621.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M384.51,562.5a2.5,2.5,0,0,1-2.11-3.83,92.9,92.9,0,0,1,26.15-27.28,106.28,106.28,0,0,1,34-15.26c4.37-1.1,8.81-2.41,13.1-3.68,8.43-2.49,17.14-5.07,26.13-6.25,1.59-.21,3.17-.44,4.75-.66,6.18-.88,12.57-1.8,19-1.59,8.11.27,13.78,2.23,20.9,5a72,72,0,0,1,29.78,21.5,2.5,2.5,0,0,1-3.83,3.22,67.07,67.07,0,0,0-27.75-20.05c-6.87-2.65-11.92-4.4-19.27-4.65-6-.2-11.92.65-18.16,1.54-1.6.23-3.2.46-4.8.67-8.59,1.13-17.12,3.65-25.36,6.09-4.34,1.28-8.82,2.61-13.3,3.73a101.32,101.32,0,0,0-32.41,14.54,87.87,87.87,0,0,0-24.72,25.8A2.5,2.5,0,0,1,384.51,562.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M378.15,676a2.5,2.5,0,0,1-2.48-2.17c-3.25-24.48-5.7-53.7.79-84.83a2.5,2.5,0,0,1,4.89,1c-6.33,30.4-3.92,59.1-.73,83.16a2.5,2.5,0,0,1-2.15,2.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.25,702.13a2.5,2.5,0,0,1-1.5-4.5A210.35,210.35,0,0,1,546.49,679a136.83,136.83,0,0,1,39.61-13.51c3.2-.56,6.43-.83,9.57-1.09a92.3,92.3,0,0,0,9.49-1.1,104.21,104.21,0,0,1,15.61-1.72l-.75-.81c-3.51-3.81-7.88-8.55-11.65-8.77a2.5,2.5,0,0,1,.29-5c5.79.33,10.71,5.66,15,10.37a49.59,49.59,0,0,0,4.7,4.71,2.5,2.5,0,0,1-1.56,4.45h-.06a98.51,98.51,0,0,0-20.7,1.67,97,97,0,0,1-10,1.17c-3,.25-6.14.5-9.1,1a131.83,131.83,0,0,0-38.16,13,205.28,205.28,0,0,0-28.06,18.21A2.49,2.49,0,0,1,519.25,702.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M445.87,782.45a2.5,2.5,0,0,1-1.79-.76c-2.5-2.57-6-4.44-9.79-6.42a61.91,61.91,0,0,1-8-4.77c-1.3-1-2.69-1.91-4.17-2.91a59.53,59.53,0,0,1-9.12-7.07,16.94,16.94,0,0,1-3.32-5.47,13.19,13.19,0,0,0-2-3.59,10.17,10.17,0,0,0-1.83-1.43,10.61,10.61,0,0,1-4.93-6.24,12.12,12.12,0,0,0-.93-2,61.62,61.62,0,0,1-3-5.52c-.79-1.56-1.53-3-2.4-4.48-.58-1-1.24-1.9-1.93-2.89-.57-.81-1.16-1.65-1.71-2.52-1.32-2.08-2.37-4.14-3.38-6.14-.52-1-1-2.06-1.61-3.1C381,708,379.4,699.4,378,689.9a2.5,2.5,0,1,1,4.95-.74c1.35,9,2.83,17.18,7.38,25.56.59,1.08,1.13,2.16,1.67,3.22,1,2,1.95,3.84,3.14,5.71.49.78,1,1.53,1.59,2.33.71,1,1.45,2.07,2.13,3.19,1,1.61,1.79,3.24,2.58,4.81a57.23,57.23,0,0,0,2.78,5.08,16.18,16.18,0,0,1,1.37,2.9,5.94,5.94,0,0,0,3.08,3.91,14.23,14.23,0,0,1,2.74,2.23,17.39,17.39,0,0,1,2.87,4.94,12.66,12.66,0,0,0,2.3,4,55.94,55.94,0,0,0,8.36,6.44c1.46,1,3,2,4.35,3a57.43,57.43,0,0,0,7.38,4.36,57,57,0,0,1,8.81,5.36c3-4.17,6.22-8.18,9.37-12.08a177.59,177.59,0,0,0,12.68-17c7.6-12.15,18.9-24.48,32.7-35.65a2.5,2.5,0,0,1,3.15,3.88C490,726.16,479,738.06,471.72,749.75a181.62,181.62,0,0,1-13,17.53c-3.67,4.54-7.46,9.23-10.75,14.08a2.5,2.5,0,0,1-1.85,1.09Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M518.09,796a170.73,170.73,0,0,1-28.22-2.37c-5.62.34-10.17-1.06-15-2.54-1.41-.43-2.87-.88-4.37-1.29a104,104,0,0,1-23.77-9.44,2.5,2.5,0,1,1,2.44-4.37,99,99,0,0,0,22.64,9c1.59.43,3.09.89,4.54,1.34,4.63,1.43,8.63,2.66,13.46,2.31a2.51,2.51,0,0,1,.6,0,162.56,162.56,0,0,0,38.24,2c12.47-.88,24.46-5.86,34.53-10.61a2.5,2.5,0,0,1,2.13,4.52c-10.49,5-23,10.14-36.31,11.08C525.44,795.85,521.79,796,518.09,796Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M579.89,776.93a2.5,2.5,0,0,1-1.2-4.7,168.65,168.65,0,0,0,16.36-10.06c3.14-2.2,6.54-4.29,9.82-6.3,7.82-4.8,15.91-9.76,21.57-16.9,18.62-23.46,11.39-59.13-7-77.71-1.25-1.26-2.29-2.46-3.21-3.52-2.36-2.71-4.06-4.66-7.51-5.89a2.5,2.5,0,0,1,1.68-4.71c4.69,1.67,7.08,4.41,9.61,7.32.92,1.05,1.86,2.14,3,3.28,10.43,10.51,17.37,25.4,19,40.85,1.78,16.35-2.36,31.79-11.64,43.49-6.22,7.83-14.68,13-22.87,18.05-3.37,2.07-6.55,4-9.56,6.13a173.37,173.37,0,0,1-16.84,10.35A2.49,2.49,0,0,1,579.89,776.93Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.17,513.92l-.39,0a2.5,2.5,0,0,1-2.09-2.85c1.1-7.09,5.21-16,13.17-17.81,7.2-1.64,14,4.06,16.22,13.56a2.5,2.5,0,0,1-4.87,1.12c-1.32-5.73-5.27-10.94-10.24-9.81-5.13,1.16-8.43,7.92-9.33,13.7A2.5,2.5,0,0,1,467.17,513.92Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M537.44,607.22h-.74c-4-.16-6.74-1.62-7.5-4s.57-5,4-7.56c2.92-2.24,11.31-4.41,15.13-1.5,1,.74,3,2.91,1.3,7.16S542.27,607.22,537.44,607.22Zm-3.33-5.55a10.86,10.86,0,0,0,6,.29c2.43-.46,4.36-1.49,4.79-2.56h0a2.43,2.43,0,0,0,.29-1.33c-1-1-7.07,0-9,1.52A8.16,8.16,0,0,0,534.12,601.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M461.94,640.88c-1.43,0-2.8,0-4.09-.05-14.46-.36-26.11-9.2-32.81-24.88a71.6,71.6,0,0,1-3.63-12.73,55.67,55.67,0,0,1-1.47-13c.18-9.12,3.38-16.86,10.38-25.08,4.1-4.82,12-9.22,18.08-11.46,20.17-7.44,48.23-1.52,57.84,19.15A94.12,94.12,0,0,1,511,586.68c3.92,13.69,2.82,25.54-3.26,35.23-4.81,7.67-14,13.74-25.16,16.67A82.12,82.12,0,0,1,461.94,640.88ZM466,555.62a46.28,46.28,0,0,0-15.89,2.71c-5.42,2-12.66,6.08-16,10-6.2,7.28-9,14-9.18,21.94h0a50.76,50.76,0,0,0,1.36,11.86A67.88,67.88,0,0,0,429.64,614c3.41,8,11.62,21.43,28.33,21.85,6.55.16,15.12.07,23.35-2.08,9.81-2.57,18.1-8,22.19-14.49,5.3-8.44,6.2-18.94,2.69-31.2a90.18,90.18,0,0,0-4.51-13.16C495.66,561.92,480.59,555.62,466,555.62Zm-43.57,34.61h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.07,655.25a61.92,61.92,0,0,1-23.16-4.39,51.53,51.53,0,0,1-28.79-28c-2.13-5-3.34-10.51-4.51-15.82a69.67,69.67,0,0,1-1.84-16.21h0c.2-11.39,4.16-21,12.81-31.27,5.09-6,14.91-11.5,22.39-14.27,19.5-7.21,44.36-3.48,60.45,9.07,12.67,9.89,16,25.19,18.73,37.49,6.14,28-10.29,53.73-39.07,61.25A67.41,67.41,0,0,1,467.07,655.25Zm-2-106.55a54.06,54.06,0,0,0-18.65,3.16c-6.6,2.45-15.41,7.42-19.45,12.21-7.54,8.91-11,17.19-11.15,26.84h0a62.8,62.8,0,0,0,1.68,14.57c1.1,5,2.23,10.16,4.11,14.57,10.56,24.83,38.53,32,60.69,26.17,25.38-6.63,39.34-28.39,34-52.91-3.12-14.23-6.3-25.72-16.18-33.44C490.8,552.63,477.77,548.7,465.08,548.7ZM412.3,590.85h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M578.15,615.43c-5.87,0-12-1.19-17.83-6.13-8-6.76-13.43-15.13-18.08-28a126.1,126.1,0,0,1-4.16-15.7,97.31,97.31,0,0,1-2.3-15.87A51.14,51.14,0,0,1,543,519.87c3.39-5.84,10.34-10.84,15.73-13.2,14.07-6.15,32.68-.86,45.25,12.87,9.54,10.41,12.86,25.54,15.52,37.7,3.71,16.92,2.33,31.23-4.12,42.55-7.37,12.93-19.3,14.13-28.88,15.1A82.79,82.79,0,0,1,578.15,615.43Zm-7-104.21a24,24,0,0,0-9.66,1.92c-4.33,1.9-10,6-12.45,10.27a44.47,44.47,0,0,0-6.25,26h0A90.27,90.27,0,0,0,545,564.08a121,121,0,0,0,3.9,14.81c4.26,11.78,8.89,19,16,25,6.42,5.41,13.41,4.71,20.81,4,10.88-1.09,18.35-2.49,23.53-11.58,5.56-9.75,6.69-22.39,3.36-37.54-3.16-14.41-6.19-26.09-13.84-34.44S580.64,511.22,571.19,511.22Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M583.65,599.89c-12.91,0-24.11-8.93-30.41-24.49-6.2-15.29-11.87-34.24-.67-45.15h0c.33-.32.68-.64,1-.95,9.59-8.13,26.29-5.09,35.28,2.74,12.16,10.58,16.24,24.2,18.63,36.13a28.15,28.15,0,0,1-4.45,22,23,23,0,0,1-16,9.47A28.62,28.62,0,0,1,583.65,599.89ZM556,533.84c-9.16,8.93-3.35,26.93,1.82,39.69,2.86,7.05,11.35,23.23,28.56,21.2A18,18,0,0,0,599,587.28a23.14,23.14,0,0,0,3.59-18.12c-3.15-15.74-8.23-25.71-17-33.34-7.45-6.48-21.33-9-28.78-2.69-.28.24-.54.47-.79.72Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M502.34,715.06a12.41,12.41,0,0,1-1.45-.08,2.5,2.5,0,1,1,.59-5c3.81.45,12.26-2.27,14.54-5.22,1.69-2.17.74-5.17.25-6.36a12.76,12.76,0,0,0-10.33-7.21l-2.56-.05a2.5,2.5,0,0,1,0-5h0l2.66.06a17.75,17.75,0,0,1,14.8,10.31c1.72,4.21,1.38,8.33-.93,11.31C516.83,711.92,508,715.06,502.34,715.06Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M567.78,785.4a11.33,11.33,0,0,1-5.54-1.29,6.36,6.36,0,0,1-2.08-1.92h0c-1.34-2-1.28-4.29-1.24-6.16a54.15,54.15,0,0,1,.73-7.32,57.41,57.41,0,0,1,3.61-13.28c1.85-4.36,7.79-13.46,14.3-13.77,2.15-.11,5.22.7,7.6,5.1a20.48,20.48,0,0,1,2.14,10c0,8.79-3.16,17.45-8.36,23.17-3,3.28-6.47,5.15-10.1,5.42C568.57,785.38,568.21,785.4,567.78,785.4Zm10.15-38.76h-.14c-3.3.16-8.17,6.56-9.94,10.73a52.57,52.57,0,0,0-3.27,12.13,49.13,49.13,0,0,0-.66,6.58c0,1.34-.07,2.65.36,3.28h0a1.35,1.35,0,0,0,.47.41,7.22,7.22,0,0,0,3.72.59c2.94-.22,5.3-2.18,6.77-3.79,4.32-4.76,7-12.36,7.06-19.83a15.72,15.72,0,0,0-1.53-7.62C579.51,746.83,578.42,746.65,577.93,746.65Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M638.39,738.56a8.38,8.38,0,0,1-2.86-.48,7.6,7.6,0,0,1-4.72-5.53,2.5,2.5,0,1,1,4.82-1.34c.49,1.77,1.3,2.06,1.6,2.17,3.61,1.3,12-4.53,14.77-6.45l.64-.44c4.49-3.09,7.55-11.34,8.59-18.14.57-3.7.06-8.38-2-10.17-.35-.3-1.41-1.21-4-.4-5.1,1.57-10.45,7.24-12.17,12.9a2.5,2.5,0,1,1-4.78-1.46C640.4,702,647.05,695,653.69,693c4.37-1.34,7.19,0,8.78,1.39,3.87,3.34,4.41,10,3.69,14.71-.4,2.64-2.81,16.08-10.69,21.5l-.63.43C649.12,735,643.25,738.56,638.39,738.56Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M447.81,618.41c-8.8,0-17.45-1.38-23.25-7.2a2.5,2.5,0,0,1,3.54-3.53c6.33,6.33,18,6.1,28.43,5.37,16.86-1.17,34.34-8.73,52-22.5a2.5,2.5,0,0,1,3.08,3.94c-18.43,14.39-36.84,22.31-54.71,23.54C453.9,618.24,450.84,618.41,447.81,618.41Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M566.29,578.89a30.83,30.83,0,0,1-11.69-2.11,2.5,2.5,0,0,1,1.9-4.62c13.85,5.69,37.34-3,43.33-16.07a2.5,2.5,0,0,1,4.54,2.09C598.86,570.2,581.39,578.89,566.29,578.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M556.63,603.14a2.49,2.49,0,0,1-1.14-.28,30.21,30.21,0,0,0-8.12-2.49,2.5,2.5,0,0,1,.78-4.94,34.78,34.78,0,0,1,9.62,3,2.5,2.5,0,0,1-1.14,4.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M529.43,626.73a8,8,0,0,1-6-2.45c-2.56-2.71-2.92-7-1-12,2.31-6.09,4.85-10,7.76-12A2.5,2.5,0,1,1,533,604.5c-2,1.35-4,4.58-5.88,9.6-.55,1.45-1.66,5,0,6.75s5,.78,7.32-.94c1-.71,1.89-1.55,2.86-2.43a17.66,17.66,0,0,1,14-6c1.06-.05,2.07-.1,3-.23,2.09-.27,4.7-1.25,5.3-3.11,0-.29,0-.8.06-1.22s0-.87.05-1a2.5,2.5,0,1,1,5,.57c0,.05,0,.3,0,.6a10.56,10.56,0,0,1-.18,2.17c-1.16,4.34-5.68,6.42-9.53,6.92-1.17.15-2.32.21-3.43.27a13,13,0,0,0-10.91,4.69c-1,.92-2.08,1.88-3.24,2.74A13.82,13.82,0,0,1,529.43,626.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.85,593.87a3.53,3.53,0,0,1-2.47-6,44.74,44.74,0,0,1,26.81-12.52,3.53,3.53,0,0,1,.7,7,37.66,37.66,0,0,0-22.57,10.54A3.52,3.52,0,0,1,519.85,593.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M491.51,718.37a2.5,2.5,0,0,1-1.68-.65,6.89,6.89,0,0,1-.56-.57,3.4,3.4,0,0,1-2,.17c-3.42-.68-4.15-5.85-4.29-7.42-.39-4.33,1.18-20.68,7.72-27h0a8.46,8.46,0,0,1,7.46-2.49,2.5,2.5,0,0,1,1.95,1.64,4.71,4.71,0,0,1,1.85,0,2.5,2.5,0,0,1,1.12.58,4.43,4.43,0,0,1,3.88,1.52c1.49,2.13.1,4.4-.56,5.5a5.42,5.42,0,0,0-.3.51,66.63,66.63,0,0,0-2.4,9.82l0,.23c-1.5,7.72-1.78,11.54-1.71,12.87a2.5,2.5,0,0,1-1.77,4.15c-1.32.06-2.6.05-3.84,0-1,0-1.92,0-2.87,0a2.5,2.5,0,0,1-1.74,1Zm-2.59-5.64h0Zm1-2.27a2.43,2.43,0,0,1,.38,0,2.5,2.5,0,0,1,2.06,1.9c1.4-.07,2.75-.06,4-.05H497a81.17,81.17,0,0,1,1.79-13l0-.22a71.26,71.26,0,0,1,2.62-10.6,5,5,0,0,1,.23-.54,2.51,2.51,0,0,1-1.52-.41l0,0c-.31.25-.62.48-.92.67a2.5,2.5,0,0,1-3.83-2.3c0-.09,0-.19,0-.29a4.89,4.89,0,0,0-1.19.87h0c-4.59,4.42-6.62,18.44-6.21,22.93a10.75,10.75,0,0,0,.28,1.64A2.5,2.5,0,0,1,489.94,710.45ZM500,712.29h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M374,676.5a2.5,2.5,0,0,1-.3-5c52.83-6.38,114.94-14,175.09-21.86a2.5,2.5,0,1,1,.65,5c-60.17,7.9-122.3,15.49-175.14,21.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M550.07,654.18a2.5,2.5,0,0,1-1.68-4.35c4.28-3.89,9.64-7.94,14.83-11.86,9.22-7,18.75-14.15,22.48-20.59a2.5,2.5,0,1,1,4.33,2.51c-4.24,7.32-14.18,14.82-23.79,22.08-5.1,3.85-10.37,7.83-14.48,11.57A2.49,2.49,0,0,1,550.07,654.18Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M378.4,692q-2,0-3.93,0a2.5,2.5,0,0,1-2.42-2.2,88.85,88.85,0,0,1-.51-15.92,2.5,2.5,0,1,1,5,.29,83.89,83.89,0,0,0,.24,12.87c12.87.14,25.88-1.39,38.49-2.87,16.89-2,38.15-4.31,58.71-6.56s41.89-4.58,58.8-6.57a2.5,2.5,0,1,1,.58,5c-16.93,2-38.23,4.32-58.83,6.57s-41.8,4.58-58.67,6.55C403.63,690.55,391,692,378.4,692Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,676a2.5,2.5,0,0,1-2.5-2.5V517.87l-33.42,6.51a2.5,2.5,0,1,1-1-4.91l36.4-7.09a2.5,2.5,0,0,1,3,2.45V673.51A2.5,2.5,0,0,1,637.74,676Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,645.49a2.5,2.5,0,0,1-.48-5l121.42-24V378.4L641.23,396a2.51,2.51,0,0,1-1.25-.13l-140.5-52.67a2.5,2.5,0,0,1,.53-4.82l101-14.1a2.52,2.52,0,0,1,1.08.08l159.83,48.76h0a2.49,2.49,0,0,1,1.42,1.16h0l0,0h0a2.49,2.49,0,0,1,.26,1.17V618.63a2.5,2.5,0,0,1-2,2.45L638.22,645.45A2.52,2.52,0,0,1,637.74,645.49ZM510.46,341.95l130.67,49,108.74-16.27L601.14,329.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M640.86,433a2.5,2.5,0,0,1-2.5-2.5v-37a2.5,2.5,0,0,1,5,0v37A2.5,2.5,0,0,1,640.86,433Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M500.36,393.33a2.5,2.5,0,0,1-2.5-2.5V344a2.5,2.5,0,0,1,5,0v46.83A2.5,2.5,0,0,1,500.36,393.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,517.35a2.51,2.51,0,0,1-2.41-3.21c.7-2.41,15.84-32.87,22.19-45.59l-113,13.94-16.81,30a2.5,2.5,0,1,1-4.36-2.44l17.42-31.1a2.5,2.5,0,0,1,1.88-1.26L661.54,463a2.5,2.5,0,0,1,2.54,3.6c-9.21,18.41-23.18,46.64-23.95,48.94A2.48,2.48,0,0,1,637.74,517.35Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.63,512.6a2.49,2.49,0,0,1-.93-.18L398.53,485.2a2.5,2.5,0,0,1-1.13-.9L357,425.58a2.5,2.5,0,0,1,3.05-3.71l120.36,52a2.49,2.49,0,0,1,1.07.87l19.66,28.47a2.5,2.5,0,1,1-4.11,2.84l-19.26-27.88L366,429.91l35.05,50.93,67.48,26.95a2.5,2.5,0,0,1-.93,4.82Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M396.21,500.85a2.5,2.5,0,0,1-2.5-2.5V480.93a2.5,2.5,0,0,1,5,0v17.42A2.5,2.5,0,0,1,396.21,500.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M287.51,543a2.47,2.47,0,0,1-.38,0,2.5,2.5,0,0,1-2.11-2.19l-8.71-77L151.94,480.69V522.5a2.5,2.5,0,0,1-5,0v-44a2.5,2.5,0,0,1,2.16-2.48l129.07-17.5a2.5,2.5,0,0,1,2.82,2.2l8,70.3,29.27-66.52a2.5,2.5,0,0,1,3.34-1.26l106.5,49.33a2.5,2.5,0,0,1,1.32,3.06l-3.65,10.88a2.5,2.5,0,1,1-4.74-1.59l2.94-8.76L321.77,468.84l-32,72.67A2.5,2.5,0,0,1,287.51,543Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M256.51,614.13a2.5,2.5,0,0,1-2.47-2.87l10-66.48a2.5,2.5,0,0,1,2.15-2.11L404.9,524.54a2.5,2.5,0,0,1,2.82,2.48v9.9a2.5,2.5,0,0,1-5,0v-7.06l-134,17.53-9.22,61.32,118-16a2.5,2.5,0,0,1,.67,5L256.84,614.11Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M256.51,614.13a2.5,2.5,0,0,1-1.15-.28l-99-51.63a2.5,2.5,0,0,1-1.2-1.37l-13.5-37.5A2.5,2.5,0,0,1,145,520.2l79.5,33.5a2.5,2.5,0,0,1,1.18,1l33,55.63a2.5,2.5,0,0,1-2.15,3.78Zm-97-55.89,90.35,47.12L221.78,558l-73.49-31Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M207.35,551.69a2.5,2.5,0,0,1-.17-5l59.16-4a2.5,2.5,0,0,1,.34,5l-59.16,4Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M252.51,728.5a2.5,2.5,0,0,1-1.38-.42l-97-64.28a2.5,2.5,0,0,1-1.12-2.13L155,560a2.5,2.5,0,0,1,2.5-2.45h.05A2.5,2.5,0,0,1,160,560L158,660.4l95,63,130.14-20.83a2.5,2.5,0,1,1,.79,4.94l-131.1,21A2.56,2.56,0,0,1,252.51,728.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M252.51,728.5h-.09a2.5,2.5,0,0,1-2.41-2.58l4-114.37a2.5,2.5,0,0,1,5,.17l-4,114.37A2.5,2.5,0,0,1,252.51,728.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M454.71,468a2.5,2.5,0,0,1-.2-5l52.56-4.31-1.75-65.17L383.58,403l5.43,32.6a2.5,2.5,0,0,1-4.93.82l-5.88-35.29a2.5,2.5,0,0,1,2.27-2.9l127.09-9.92a2.5,2.5,0,0,1,2.69,2.43l1.88,70.17a2.5,2.5,0,0,1-2.29,2.56L454.92,468Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M560.41,480.52a2.49,2.49,0,0,1-.79-.13l-50.78-17a2.5,2.5,0,0,1,1.59-4.74l50.78,17a2.5,2.5,0,0,1-.79,4.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M645.36,469.64a2.5,2.5,0,0,1-2.17-3.73l15-26.56L538,396.62l-26.32,57.8a2.5,2.5,0,0,1-4.55-2.07l27.28-59.88a2.5,2.5,0,0,1,3.11-1.32l125.14,44.48a2.5,2.5,0,0,1,1.34,3.59l-16.48,29.15A2.5,2.5,0,0,1,645.36,469.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M279,468a2.5,2.5,0,0,1-.28-5l95.89-11a2.5,2.5,0,1,1,.57,5L279.3,468Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M200.26,474.11a2.5,2.5,0,0,1-2.5-2.5v-38a2.5,2.5,0,0,1,5,0v38A2.5,2.5,0,0,1,200.26,474.11Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M259,466.15a2.49,2.49,0,0,1-1.14-.27l-58.72-30.05a2.5,2.5,0,0,1,.82-4.71l42.58-5.43a2.53,2.53,0,0,1,1.33.2l44.76,19.9L369,436.54a2.5,2.5,0,1,1,.57,5l-81,9.31a2.5,2.5,0,0,1-1.3-.2l-44.74-19.89-33.87,4.32,51.52,26.37a2.5,2.5,0,0,1-1.14,4.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M288.23,450.84a2.5,2.5,0,0,1-2.5-2.43l-3.4-116.85-35.44-6.85L245.34,428.2a2.5,2.5,0,0,1-2.5,2.46h0a2.5,2.5,0,0,1-2.46-2.54l1.59-106.47a2.5,2.5,0,0,1,3-2.42L285.24,327a2.5,2.5,0,0,1,2,2.38l3.46,118.85a2.5,2.5,0,0,1-2.43,2.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M408.1,401.12a2.5,2.5,0,0,1-2.5-2.5V320c-12.94.83-77.13,7.39-120.57,12a2.5,2.5,0,0,1-2.61-3.33l14.87-41.24a2.5,2.5,0,0,1,2.17-1.65L418.63,277a2.5,2.5,0,0,1,2.59,3.17L410.6,317.82v80.8A2.5,2.5,0,0,1,408.1,401.12ZM301.44,290.62l-13,36c9.27-1,33.4-3.49,57.35-5.92,17.84-1.81,32.09-3.21,42.37-4.18s15.31-1.42,18-1.52l9.23-32.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M357.46,286.49a2.5,2.5,0,0,1-2.35-3.34l11.34-31.79a2.5,2.5,0,0,1,3-1.56l47.09,13.64a2.5,2.5,0,0,1,1.72,3.06l-3.88,14.14a2.5,2.5,0,1,1-4.82-1.32l3.23-11.76-42.46-12.3-10.55,29.58A2.5,2.5,0,0,1,357.46,286.49Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M351.79,286.91a2.5,2.5,0,0,1-2.23-1.37L341,268.81l-94.43,9a2.5,2.5,0,1,1-.47-5l96.12-9.12a2.49,2.49,0,0,1,2.46,1.35L354,283.27a2.5,2.5,0,0,1-2.23,3.63Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M284.76,332a2.5,2.5,0,0,1-2.47-2.12l-6.65-43.51-36.22-10.81,7.47,45.74a2.5,2.5,0,0,1-4.93.81l-8.12-49.69a2.5,2.5,0,0,1,3.18-2.8L278.59,282a2.5,2.5,0,0,1,1.76,2l6.89,45.08a2.5,2.5,0,0,1-2.09,2.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M601.34,329.24h-.08a2.5,2.5,0,0,1-2.42-2.58l4.57-142.37-163.65,17.2a2.5,2.5,0,0,1-.52-5L605.75,179a2.5,2.5,0,0,1,2.76,2.57l-4.67,145.24A2.5,2.5,0,0,1,601.34,329.24Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M436.5,398.9h0a2.5,2.5,0,0,1-2.46-2.54l3-195.5-120-35.51V268.83a2.5,2.5,0,0,1-5,0V162a2.5,2.5,0,0,1,3.21-2.4l125.06,37A2.5,2.5,0,0,1,442,199l-3,197.4A2.5,2.5,0,0,1,436.5,398.9Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M439.51,201.5a2.5,2.5,0,0,1-2.08-3.88l41-62a2.5,2.5,0,0,1,1.86-1.11L642.79,120a2.5,2.5,0,0,1,2.34,3.82l-37,59a2.5,2.5,0,0,1-4.24-2.66l34.33-54.73L481.93,139.38l-40.34,61A2.5,2.5,0,0,1,439.51,201.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M403.51,157.5a2.5,2.5,0,0,1-.17-5l66.33-4.57,21.4-97.47a2.5,2.5,0,0,1,3.05-1.89l134.5,34a2.5,2.5,0,0,1,1.76,3.2l-13,40a2.5,2.5,0,1,1-4.75-1.55L624.8,86.77,495.4,54.06l-21.25,96.78a2.5,2.5,0,0,1-2.27,2l-68.2,4.7Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M436.62,200.64a2.5,2.5,0,0,1-1.94-.92l-54.58-67L267.65,104.37l48.68,56a2.5,2.5,0,1,1-3.77,3.28l-53.91-62a2.5,2.5,0,0,1,2.5-4.06l121,30.5a2.51,2.51,0,0,1,1.33.85l55.11,67.64a2.5,2.5,0,0,1-1.94,4.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M468.33,151.57a2.5,2.5,0,0,1-2.14-1.2L425.66,83.6,280.58,93.76l3.26,8.33a2.5,2.5,0,1,1-4.66,1.82l-4.5-11.5A2.5,2.5,0,0,1,276.83,89l150-10.5a2.51,2.51,0,0,1,2.31,1.2l41.32,68.07a2.5,2.5,0,0,1-2.13,3.8Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M522.51,687.33a2.5,2.5,0,0,1-2-4,77.06,77.06,0,0,1,20-18.5c2.69-1.64,26.72-16.06,40.51-16.42h.07a2.5,2.5,0,0,1,.07,5c-10.15.27-28.69,10-38,15.69a71.62,71.62,0,0,0-18.59,17.2A2.5,2.5,0,0,1,522.51,687.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M540.51,669.67a2.5,2.5,0,0,1-2-4,33.69,33.69,0,0,0,2.67-5.27c1.9-4.25,3.69-8.26,6.47-9.77A2.5,2.5,0,0,1,550,655c-1.29.7-3.09,4.74-4.29,7.41a35.3,35.3,0,0,1-3.23,6.22A2.5,2.5,0,0,1,540.51,669.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M558.51,659.67a2.49,2.49,0,0,1-1.23-.33c-.71-.4-1.68-.83-2.71-1.29-2.24-1-4.78-2.11-6.47-3.76a2.5,2.5,0,1,1,3.49-3.58,19.25,19.25,0,0,0,5,2.77c1.14.5,2.22,1,3.15,1.51a2.5,2.5,0,0,1-1.23,4.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M484.51,715c-.87,0-1.8,0-2.85-.08-5.32-.27-26.21-3.31-31.25-13.33-1.28-2.54-2.08-6.67,1.4-11.88,6-8.94,19.6-7.5,30.55-6.35,3.06.32,5.94.63,8.15.63a2.5,2.5,0,0,1,0,5c-2.47,0-5.48-.32-8.67-.65-9.62-1-21.58-2.28-25.87,4.15-1.74,2.61-2.1,4.85-1.09,6.85,3.33,6.61,19.51,10.2,27,10.58,1,0,1.82.07,2.6.07a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M593,628a2.5,2.5,0,0,1-2.32-1.57,19.54,19.54,0,0,0-4-5.67,2.5,2.5,0,0,1,3.54-3.53,24.33,24.33,0,0,1,5,7.33A2.5,2.5,0,0,1,593,628Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M572.5,655a2.61,2.61,0,0,1-.7-.1,2.54,2.54,0,0,1-1.71-3.13c.92-3.26,15-19.9,15.16-20.06a25.2,25.2,0,0,0,2.06-3,22,22,0,0,1,3.52-4.63,2.5,2.5,0,0,1,3.38,3.69,18.24,18.24,0,0,0-2.66,3.61A29.11,29.11,0,0,1,589,635c-3.08,3.56-13.32,16.19-14.16,18.23A2.44,2.44,0,0,1,572.5,655Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M614.19,654a2.49,2.49,0,0,1-.67-.09c-3.05-.85-4.95-3.27-6.78-5.6-1.67-2.13-3.25-4.14-5.5-4.68a32.78,32.78,0,0,0-4.7.14c-6.27.42-10.21.53-12.15-1.51a3.61,3.61,0,0,1-1-3,2.49,2.49,0,0,1,.64-1.4,2.39,2.39,0,0,1,.14-.65c1.66-4.44,6-7.31,12-7.88h0a23.37,23.37,0,0,1,9.1.94,18.94,18.94,0,0,1,11.2,10.37,14.19,14.19,0,0,1,0,11.89A2.5,2.5,0,0,1,614.19,654Zm-13.86-15.42a9.08,9.08,0,0,1,2.07.19c3.95.94,6.25,3.87,8.27,6.46a29.17,29.17,0,0,0,2,2.43,10.16,10.16,0,0,0-.84-5,14,14,0,0,0-8.15-7.58,18.26,18.26,0,0,0-7.08-.72h0a11,11,0,0,0-6.19,2.33,2.58,2.58,0,0,1,.36.61,2.45,2.45,0,0,1,.05,1.71h0c1.82,0,4-.14,5.32-.23C597.94,638.62,599.27,638.54,600.33,638.54Zm-3.91-6.71h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M590.08,663.44a11.54,11.54,0,0,1-8.33-3.41,8.64,8.64,0,0,1-2.31-6.88c.26-4.44,2.92-9.72,6.2-12.28a2.5,2.5,0,0,1,3.08,3.94,13.56,13.56,0,0,0-4.29,8.63,4,4,0,0,0,.84,3c4.68,4.63,11.85,0,14.71-2.27,1.12-.87,2.2-1.82,3.34-2.84a53.86,53.86,0,0,1,4.76-3.91,2.5,2.5,0,1,1,2.87,4.1,49.44,49.44,0,0,0-4.31,3.56c-1.15,1-2.34,2.08-3.59,3C598.52,661.66,594.05,663.44,590.08,663.44Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M608.54,636a2.49,2.49,0,0,1-1.28-.35c-3.93-2.35-12.45-5.87-15.18-5.62a2.5,2.5,0,0,1-.48-5c5-.49,15.66,4.78,18.23,6.31a2.5,2.5,0,0,1-1.29,4.65Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M545.57,631.36h-.23c-3.13-.2-4.86-3.22-6.24-5.64a11.71,11.71,0,0,0-1.85-2.72,2.5,2.5,0,0,1,2.52-4.32c1.6.94,2.65,2.77,3.67,4.55a13.1,13.1,0,0,0,2.12,3.07,20.3,20.3,0,0,0,2-1.2,15.74,15.74,0,0,1,1.92-1.13,34.39,34.39,0,0,1,3.19-1.28c-.36-.67-.75-1.35-1.17-2a24.07,24.07,0,0,1-2.75-5.82,2.5,2.5,0,0,1,4.82-1.31,20.12,20.12,0,0,0,2.23,4.59,25.17,25.17,0,0,1,2.71,5.64,2.5,2.5,0,0,1-2.16,3.19,17.73,17.73,0,0,0-4.84,1.59c-.21.1-.81.48-1.25.76C548.38,630.53,547,631.36,545.57,631.36Z" transform="translate(-105.77 -43.5)"/></g><g id="circle"><g class="cls-12"><path class="cls-7" d="M412.3,590.85c.19-10.39,3.77-19.35,12-29.06C429,556.25,438.5,551,445.2,548.55c18-6.67,41.77-3.38,57.05,8.54,11.26,8.79,14.51,22.08,17.45,35.46,5.89,26.81-10.08,50.17-36.51,57.08-25.62,6.69-54-2.76-64.83-28.2-2-4.68-3.14-9.87-4.31-15.2A66.21,66.21,0,0,1,412.3,590.85Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-12"><path class="cls-7" d="M539.3,549.54a47.78,47.78,0,0,1,6.72-27.9c3-5.17,9.47-9.71,14.09-11.74,12.44-5.44,29.58-.7,41.23,12,8.59,9.38,11.74,22.69,14.68,36.07,3.29,15,2.67,28.79-3.74,40-6.27,11-15.81,12.29-26.17,13.33-7.79.78-15.93,1.62-23.52-4.77-8-6.75-12.87-15-17-26.51a122.75,122.75,0,0,1-4-15.26A93.72,93.72,0,0,1,539.3,549.54Z" transform="translate(-105.77 -43.5)"/></g><path class="cls-1" d="M467.07,655.25a61.92,61.92,0,0,1-23.16-4.39,51.53,51.53,0,0,1-28.79-28c-2.13-5-3.34-10.51-4.51-15.82a69.67,69.67,0,0,1-1.84-16.21h0c.2-11.39,4.16-21,12.81-31.27,5.09-6,14.91-11.5,22.39-14.27,19.5-7.21,44.36-3.48,60.45,9.07,12.67,9.89,16,25.19,18.73,37.49,6.14,28-10.29,53.73-39.07,61.25A67.41,67.41,0,0,1,467.07,655.25Zm-2-106.55a54.06,54.06,0,0,0-18.65,3.16c-6.6,2.45-15.41,7.42-19.45,12.21-7.54,8.91-11,17.19-11.15,26.84h0a62.8,62.8,0,0,0,1.68,14.57c1.1,5,2.23,10.16,4.11,14.57,10.56,24.83,38.53,32,60.69,26.17,25.38-6.63,39.34-28.39,34-52.91-3.12-14.23-6.3-25.72-16.18-33.44C490.8,552.63,477.77,548.7,465.08,548.7ZM412.3,590.85h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M578.15,615.43c-5.87,0-12-1.19-17.83-6.13-8-6.76-13.43-15.13-18.08-28a126.1,126.1,0,0,1-4.16-15.7,97.31,97.31,0,0,1-2.3-15.87A51.14,51.14,0,0,1,543,519.87c3.39-5.84,10.34-10.84,15.73-13.2,14.07-6.15,32.68-.86,45.25,12.87,9.54,10.41,12.86,25.54,15.52,37.7,3.71,16.92,2.33,31.23-4.12,42.55-7.37,12.93-19.3,14.13-28.88,15.1A82.79,82.79,0,0,1,578.15,615.43Zm-7-104.21a24,24,0,0,0-9.66,1.92c-4.33,1.9-10,6-12.45,10.27a44.47,44.47,0,0,0-6.25,26h0A90.27,90.27,0,0,0,545,564.08a121,121,0,0,0,3.9,14.81c4.26,11.78,8.89,19,16,25,6.42,5.41,13.41,4.71,20.81,4,10.88-1.09,18.35-2.49,23.53-11.58,5.56-9.75,6.69-22.39,3.36-37.54-3.16-14.41-6.19-26.09-13.84-34.44S580.64,511.22,571.19,511.22Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.85,593.87a3.53,3.53,0,0,1-2.47-6,44.74,44.74,0,0,1,26.81-12.52,3.53,3.53,0,0,1,.7,7,37.66,37.66,0,0,0-22.57,10.54A3.52,3.52,0,0,1,519.85,593.87Z" transform="translate(-105.77 -43.5)"/><g class="cls-12"><path class="cls-7" d="M594.18,528.83c-2.91-2.27-6.89-1-6.33,3,.48,3.5,3.92,7.78,5.33,11.35,1.52,3.85,1.69,9.59,4.15,12.83,6.11,8,5.64-6.3,4.59-9.76C600,539.94,598.74,534.06,594.18,528.83Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-12"><path class="cls-7" d="M496.84,563.83c-1-3.57-9.51-2.83-8.77,1.67.41,2.44,3.62,5.41,4.9,7.54a40.24,40.24,0,0,1,4.21,9.12c1.7,5.77-.86,14.73,3.3,19.67,3.29,3.9,6.35,1.12,6.68-2.86.42-5.1-.18-10.25-.7-15.28C505.86,577.61,503,567.14,496.84,563.83Z" transform="translate(-105.77 -43.5)"/></g></g><g id="layers"><path class="cls-1" d="M468.33,880.06a357.61,357.61,0,0,1-159.8-677.52,3.53,3.53,0,1,1,3.16,6.31c-119.58,59.84-193.86,180-193.86,313.64C117.82,715.77,275.06,873,468.33,873S818.84,715.77,818.84,522.5a350,350,0,0,0-214.08-323,3.53,3.53,0,0,1,2.75-6.5,357.56,357.56,0,0,1-139.18,687Z" transform="translate(-105.77 -43.5)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.png
deleted file mode 100644
index 1b13ab4243..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.svg
deleted file mode 100644
index f579c37a7b..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Flat.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 688.25 700.83"><defs><style>.cls-1{fill:none;}.cls-2{fill:#474747;}.cls-3{opacity:0.2;}.cls-4{fill:#edc0e3;}.cls-5{fill:#e8e5e3;}.cls-6{fill:#aaa39f;}.cls-7{fill:#fff;}.cls-8{fill:#c4d8ba;}.cls-9{fill:#807e6e;}.cls-10{fill:#d7b89b;}.cls-11{fill:#efe6da;}.cls-12{opacity:0.44;}.cls-13{fill:#995967;}.cls-14{opacity:0.72;}.cls-15{fill:#829e93;}.cls-16{opacity:0.61;}.cls-17{fill:#a7d8bf;}.cls-18{opacity:0.59;}.cls-19{fill:#d1b288;}.cls-20{fill:#606282;}.cls-21{opacity:0.46;}.cls-22{fill:#51483e;}.cls-23{fill:#6e607f;}.cls-24{fill:#1d1d1b;}.cls-25{clip-path:url(#clip-path);}.cls-26{clip-path:url(#clip-path-2);}.cls-27{clip-path:url(#clip-path-3);}.cls-28{clip-path:url(#clip-path-4);}.cls-29{clip-path:url(#clip-path-5);}.cls-30{clip-path:url(#clip-path-6);}.cls-31{clip-path:url(#clip-path-7);}.cls-32{fill:#b79765;}.cls-33{fill:#e9e9f2;}.cls-34{fill:#3d3d3d;}.cls-35{opacity:0.68;}.cls-36{opacity:0.17;}.cls-37{opacity:0.36;}</style><clipPath id="clip-path" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M64.1,446.5,68,327c0-.74,110.68.57,120.76.64q30.51.22,61,.33c6.75,0,15.67-2.86,18.19,5,1.69,5.22-.25,11.23,0,16.58a66.07,66.07,0,0,0,2,13.25c1.3,5,2,6.21,0,10.75-3.71,8.44-8.65,15.92-13.38,24.23a58.76,58.76,0,0,0-4.67,11c-1.6,4.92-1.3,10.78-3.33,15.37s-6.67,8.57-9.26,12.9c-2.48,4.16-4.41,10-9.47,11.12-5.52,1.28-15.14-.81-21.12-.85q-24.31-.15-48.62-.34C152.13,446.9,64.12,445.91,64.1,446.5Z"/></clipPath><clipPath id="clip-path-2" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M547.52,426.07A19.5,19.5,0,0,1,543,417c-1.22-5.73-3.79-10.48-5.95-16-6.29-16.22-11.85-27-11.27-44.83.32-9.71.48-19.43,1-29.13,0-.74,110.68.57,120.76.64q30.51.22,61,.33c6.38,0,12.68-.67,19.06-.19,4,11.39,4.55,23,6.27,35.07,1.86,13.09,4.55,25.42,3.85,39-.63,12.08-.29,26.9-4,38.38-1.72,5.29-1.34,5.51-7.3,6.15-4.38.47-8.93-.24-13.33,0-15.44.84-30.18,1.06-45.52,1q-24.31-.15-48.63-.34c-11.71-.09-23.42-.23-35.13-.34-6.18-.06-16.86,2.13-22.47-.37-5.11-2.28-5.82-8.72-8.39-13.08A51.57,51.57,0,0,0,547.52,426.07Z"/></clipPath><clipPath id="clip-path-3" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M132.33,613.67c3-.92,8.1.34,11.5.67a101.15,101.15,0,0,0,14.08,0c8.09-.4,16.39-.28,24.51-.67a108.86,108.86,0,0,1,11.88-.28,17.65,17.65,0,0,0-1.35,4.55c-5.19-.07-3.06,3.59-1.4,6.15-3.62,1.72-3.81,5.09.74,5,0,2.42,0,5.84,1.7,7.78,1,1.1,2.72,1.61,3.56,2.78,1,1.36,1.07,3.37,1.7,4.94a22.28,22.28,0,0,0,6.36,8.73c5.62,4.73,13.19,6.71,20.4,7.06,3.64.18,7.32-.15,10.95,0,.35,7,1,14.28.22,21.25-.66,6.16-2.13,12.08-2.57,18.27-1.4-2.33-5.52-4.06-7.76-5.57-3.65-2.46-7.27-3.34-11.15-5.16-7.75-3.64-13.38-9.11-20.36-13.93-7.53-5.2-15.21-9-22.15-15.08a173,173,0,0,1-22.18-24c-2.75-3.56-6-6.48-8.67-10.07-2.39-3.16-6.59-7.57-8-11.09"/></clipPath><clipPath id="clip-path-4" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M661.33,612.33c-11.53,0-23.3,1.39-34.74,2.33-7.67.63-15.22-.38-22.87.06a6.61,6.61,0,0,0-.34,3.56c3.57.37,3.12,4.64.31,5.63,1.48.49,2.61,1.47,2.59,3-4.54.55-2.26,4.19-3.27,7.39-.52,1.64-1.08,1.92-2.16,3-.36.36-1.26-.21-1.77.39s-.45,1.93-.81,2.67c-2.6,5.29-5.11,10.83-10.45,13.92-4.11,2.37-9.38,3.66-13.82,5.25a32.68,32.68,0,0,1-12.27,2.13c-.65,4.82.62,10.54.62,15.51,0,6.61-.91,14,.34,20.42,4,.09,8.51-3.94,11.64-6.28,5.48-4.09,11.25-7.68,16.78-11.7,5.72-4.15,10.69-9,16.23-13.34s11.78-8.28,17-13.27c4.31-4.15,8.76-8.19,13.34-12,4.43-3.73,7.79-7.72,11.83-11.78C652.16,626.52,662.91,616.69,661.33,612.33Z"/></clipPath><clipPath id="clip-path-5" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M579.07,484.41c-.8,4.09-1.75,8.25-2.81,12.34-2.06,7.88-6.13,15.35-9.25,22.91-1.85,4.48-3.71,6.52-8.28,8.4.2-.08.35,8.66.44,9.64.36,3.72,1.64,7.27,2.7,10.83,2.2,7.37,3.58,13.61-1.5,20.06.48-.61,9.82,2.94,10.61,3.5,2.42,1.71,4.69,3.82,7.21,5.6a47.82,47.82,0,0,1,5.91,5.44c2.74,2.71,4.32,5.41,8.4,5.21,5.13-.25,10.46-1.11,15.65-.58,8,.83,16,.73,24,1.07s16.17-.83,24.31-.83c6.07,0,12.15,0,18.19-.26,5.07-.24,6.21.26,8.85-4.21,2.51-4.26,6.39-7.32,9.59-11,3.9-4.51,5.95-9.54,8.61-14.76,3.82-7.47,5.77-15.67,8-23.71,2.16-7.84,6.43-14.87,9.36-22.45,2.19-5.66,4.22-11.21,4.93-17.26a124.32,124.32,0,0,1,2.34-13.68c.62-2.7,1.77-6.43,1.27-9.27-38.84-2.08-78.82-1.69-117.78,0q-10.63.45-21.24,1.36c-2.39.21-8-.29-9.27,1.76C578.16,476.28,579.53,482,579.07,484.41Z"/></clipPath><clipPath id="clip-path-6" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M141.17,586c8.14.29,16,1.67,24.41,1.67,9.44,0,18.67.29,28-.17,3.4-.17,6.65-.41,10.06-.5,4.37-.12,4.93-2.93,8-6,6-5.95,13.79-9.37,20.88-13.73-1.29-5.55-4.27-8.69-4.28-14.83,0-7.27,4.87-15.19,3.32-22.24-.32-1.47-2.51-3-2.26-4.78s2.46-3.63,2.94-5.42c1-3.89.57-9.75-.41-13.59-1.61-6.29-7-10.59-8.18-17-.63-3.39-.23-6.81-.74-10.19-.35-2.34-1.66-4.32-1.71-6.81-7.93-.44-16-.07-24-.05-10.2,0-20.36-1.34-30.64-1.33-17.24,0-34.65,0-51.82-.67a289.65,289.65,0,0,0-39.92,1c-2,.2-6.86-.45-7.95,1.35-1.41,2.34,3.64,10,4.3,12.3,1.76,6,3.44,12,5.3,17.93,5.63,18.05,11.86,35.93,17.48,54,3,9.49,7.26,19.28,14.09,26.65,4.48,4.84,7.5,4.35,13.9,3.82S134.75,585.77,141.17,586Z"/></clipPath><clipPath id="clip-path-7" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M260.38,162.7c55.06.06,110.12.66,165.17.93s110,.24,164.94-1q11.49-.25,23-.58c6.76-.19,14.57.48,21.18-.81-2.12-2.56-2.84-5.8-5.31-8.27a49.21,49.21,0,0,0-8.75-6.93c-3.43-2.17-6.39-5.18-9.92-7.17s-7.45-3.18-10.4-6.06c-2.57-2.52-3.58-5.46-6.65-7.58-3.92-2.7-8.47-4.14-12.53-6.6-8.77-5.33-15.26-12.33-24.56-16.66-5.63-2.62-9.94-7.32-15.43-10-5.2-2.54-11.11-3.46-16.43-5.68C519,84,513.78,80.24,508,78.17c-11.9-4.27-24.91-5.63-37-9.42-6-1.89-11.6-2.33-17.86-2.73-6.58-.43-13.28-2.26-19.83-3.1a194.85,194.85,0,0,0-31.88-1.22c-4.19.15-7.08-1.83-11.21-1.81s-8.06,1.46-12.12,1.87c-10.28,1-20.62,1.18-30.91,2.28-16.38,1.76-32.39,8-48.07,12.63-10.5,3.1-21.41,6.09-31.32,10.75-9.51,4.47-18.42,10-27.82,14.64-9,4.48-18.56,8.06-26.82,13.94-3.55,2.52-6.66,5.4-10.63,7.35-4.14,2-8.49,3.57-12.18,6.41-7.21,5.55-14.07,12.07-21,17.93-2.51,2.12-15.05,10-10.75,14,2.39,2.2,12.65.55,15.86.57l17.34.12Q226.08,162.62,260.38,162.7Z"/></clipPath></defs><title>BoyerScene2Flat</title><g id="COLOR"><path class="cls-2" d="M411.55,62.33C592.55,69.76,737,218.85,737,401.67c0,187.57-152.06,339.62-339.62,339.62S57.75,589.24,57.75,401.67,209.81,62,397.38,62h3Z" transform="translate(-53.25 -44.96)"/><g class="cls-3"><path d="M411.55,62.33C592.55,69.76,737,218.85,737,401.67c0,187.57-152.06,339.62-339.62,339.62S57.75,589.24,57.75,401.67,209.81,62,397.38,62h3Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-4" d="M89.49,418.2c.15-3,.16-6,.34-9.05.16-2.72.88-5.49.78-8.19s-.8-5.19,2.15-6.53a49.56,49.56,0,0,1,10.52-3.06c5.41-1.11,11.86-.2,17.44-.35,6.67-.18,13.51,0,20.13-.73,5.79-.66,11.57,2.28,17.41.66,4.71-1.3,1.34-16.9.49-20.44-.92-3.87-2.37-5.83-4.24-9.25-1.77-3.25-2.63-4.83-5.59-7.05-3.61-2.71-6.83-5.59-11.24-7-4-1.23-9.3-.66-13.37-.25a149.55,149.55,0,0,0-15.43,2.48c-7.23,1.5-13.51-4.77-15.24-11.31a15.92,15.92,0,0,1-.43-6.7c.71-3.35,2.92-4.58,6.15-4.63,2,0,3.83-.42,5.79-.51s5.19-.69,6.93-.16c2.42.73,3.93,4.59,5.11,6.67.4.69.56,2.46,1.48,2.68s4.9-2.71,5.85-3.19c5.28-2.67,10.15-4.48,16.08-4.7,8.39-.31,16.79-.16,25.19,0,7.38.17,14.71.78,22.06.17,5-.41,9.91-.5,14.91-.5,5.15,0,10.31-.07,15.45.17,2.67.12,5.91.73,8.14,2.3,2,1.4,5.57,5,8.15,4.47,2.23-.5,3.46-3.4,5.18-4.67,3-2.22,7.08-2.77,10.8-2.43,3.53.32,6.58.76,8.5,3.85s.88,5.93-.23,9.07a54.25,54.25,0,0,1-6.23,12.12,3.82,3.82,0,0,0-2.87-1,13.92,13.92,0,0,1-5.53-1.33c-4.15-2.12-7.94-3.68-12.69-3.83a37.3,37.3,0,0,0-16,3.29c-4.25,1.8-9.81,4.19-13.05,7.58-6,6.26-6.8,14.53-7.53,22.8-.29,3.31-.68,6.73,0,10,.42,2,.9,2.61,3,2.63a68.9,68.9,0,0,0,10.13-.75c8.26-1.17,16.85-3.06,25.24-2.38,4.65.38,9.17.43,13.79,1.32,2.23.43,4.37,1.06,6.63,1.38a14.25,14.25,0,0,1,4,.83c.16,2.13-1.9,5-2.87,6.84-2.06,3.94-3.08,8.38-4.95,12.42a43.33,43.33,0,0,0-2.5,6.58c-.66,2.33-.74,5.27-1.67,7.46-1,2.4-3.9,4.89-5.55,7.09a105.22,105.22,0,0,1-7,8.37c-1.79,1.93-3.67,4.55-5.59,6.25-2.14,1.89-6.41.88-9.08.79-7.44-.26-14.64-1.68-22.17-1.13-6.64.49-13.72-.28-20.44-.32-7.34,0-14.67,0-22,.3-18.33.83-36.7-3.1-54.85-.54a26,26,0,0,1-6.08.2c-1.8-.16-4.23.14-4.82-1.77-.72-2.33.22-6.49.33-9C88.72,430.24,89.19,424.23,89.49,418.2Z" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M727.5,327.5c0-.64,0-1.28-.09-1.91-.34-5.38-.65-22.82-6.92-23.84-4.21-.69-9.54.16-13.88.16h-41c-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-126.07-1.17-191.59-1.17L68,327c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0H728" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M637.53,161.53c-3.9,0-7.8,0-11.68.17-120.91,3.89-243.85,1.14-365.47,1-34.45,0-68.81-.31-103.17-.56l-23.62,24.93c42.24.28,84.46.68,126.79.73,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M64.1,446.5c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0,20.81,0,51.3,2.07,72.11,2.07L730,470.8c-20.81,0-47.47.79-68.28.79-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-130.77-1-196.28-1" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M681,588.06c-6.91-.23-13.49-.4-19.3-.4-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-48.95-.05-97.73-.59-146.58-.85L131.17,613c43,.28,86.06.7,129.21.75,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M727.5,327.5c0-.64,0-1.28-.09-1.91-.34-5.38-.65-22.82-6.92-23.84-4.21-.69-9.54.16-13.88.16h-41c-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-126.07-1.17-191.59-1.17L68,327c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0H728" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M637.53,161.53c-3.9,0-7.8,0-11.68.17-120.91,3.89-243.85,1.14-365.47,1-34.45,0-68.81-.31-103.17-.56l-23.62,24.93c42.24.28,84.46.68,126.79.73,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M64.1,446.5c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0,20.81,0,51.3,2.07,72.11,2.07L730,470.8c-20.81,0-47.47.79-68.28.79-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-130.77-1-196.28-1" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M681,588.06c-6.91-.23-13.49-.4-19.3-.4-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-48.95-.05-97.73-.59-146.58-.85L131.17,613c43,.28,86.06.7,129.21.75,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M689.33,345.33c-15.88.07-27.4,7.39-33.93,21.91-3.35,7.46-4.21,16-1.49,23.75.63,1.79,2.24,7.45,4.14,8.28s7.59-1.84,9.76-1.94c4.4-.21,8.78-.44,13.16-.67,9.14-.47,19-2.15,28-.83,5.14.75,10.82,4.1,15.95,3.49,0-6.61,2.86-12.73,2.39-19.62-.37-5.43-3.36-10.23-6.19-14.69s-6.29-10.2-10.14-13.95C706.06,346.23,699.6,346.58,689.33,345.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M577.33,345.67c-8.13,2.74-16.2,6.05-22.67,12-7.18,6.59-8,16.39-8,25.65,0,5,.58,12.8,4,16.73,9.37-6.75,25.31-5.33,36.26-4.37,6,.52,11.95.82,17.84,1.91,3.54.65,7.58,1.86,11.19,1.37,1.49-6.31,5.31-10,5.06-17a39.76,39.76,0,0,0-5.5-18.32C607.56,350.39,597,346.33,577.33,345.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-8" d="M584.47,330.32c-2.69,1.39-5.71,4.62-8.4,5.3-3.34-7-9.64-7-16.73-6.62-4,.22-7-.06-6.67,4.58.38,5.94,3.06,14.31,9.5,16,5.45,1.42,10.87-1.23,16.15-2.22,6.6-1.23,12.53-1.2,18.85,1,14.85,5.24,21.87,18,21.17,33.56-.16,3.48,0,16.13-4.19,18.05-1.58.72-7.86-1.67-9.82-2-8-1.24-16-2.9-24.13-3.7s-14.79.94-22.37,3.32c-2.75.86-6.43,1.58-8.2,3.86s-2.1,6.88-2.3,9.51c-.45,5.79-2,12.06.31,17.62,1.53,3.63,4.42,6.53,7.44,8.93,3.53,2.82,4.78,5.89,6.65,10.07,14.65.9,29-2.15,43.76-2.28,9-.08,18-.93,26.84-1,9.1-.07,17.51,1.92,26.5,2.68,10.45.88,21,.63,31.53.81,9.78.17,19.79.78,29.48.75,4.8,0,2.74-3,2.71-7.43,0-5.1.57-10.23-.2-15.3-.52-3.43-1.15-6.67-1.35-10.15-.15-2.71-1.27-6.44-.67-9,.75-3.19,3.76-4.87,3.28-8.62-11.35-.63-22.56-1.38-33.94-1.38s-22.47,3.56-33.34,1.83c.18-4-1.47-7.84-1.67-11.83s-.33-8-.33-12c0-8.39,4.09-14.09,10.68-19.41,9.93-8,21.7-11.6,34.67-9.23,3.63.66,7.27,3.77,10.65,4.14,4.87.54,7.91-8.54,8.51-12.84,1.2-8.69-1.45-10.79-9.68-11.17-3.57-.16-6.87-.6-9.85,1.68s-5,5.72-8.22,7.79c-5.52-9.81-22.7-9.3-32.08-9.3-17.09,0-34.29.82-51.35,1.67-3.94.2-8-.88-11.91-1C590.64,326.75,588.76,328.11,584.47,330.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M638,393.67c-3.35,0-15.51-.26-14.36,5.67.5,2.58,6,4.42,8.19,4.83,3,.56,5.94.31,8.16-1.82C641.55,400.86,645.87,392.58,638,393.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M626,400.67c-8.15-1.58-12.48,17.44-3.33,18.33,3.87.38,6.87-2.06,10.41-2.92,4.88-1.19,10.23.45,15.19,0,5.93-.57,6.78-6.25,4-11.05-1.75-3-4.79-3.2-7.18-5.3-2,5.4-13.39,5.35-16.08,1" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M628,418.33c-.19,2.28-1.39,7.7-.18,9.85,1.32,2.33,6,2.67,8.35,2.49,2.92-.23,5.64-1.43,6.58-4.33.44-1.35,1.15-8,.59-9.17C641.86,414.17,631,415,628,418.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M183.67,393c-3.93,0-20.42-1.1-18.35,6,1.15,3.93,8.21,4.93,11.58,5C182.73,404.09,186.51,400.8,183.67,393Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M161.75,404.35c-1.93,2.57-4.11,7.18-2.35,10.26s6.5,4.14,9.6,3.32A43,43,0,0,1,179.5,416c3.4-.11,8.91,1.1,12-.37,7.94-3.79.72-11.47-3.41-14.71-3.25-2.55-3.86.42-6.92,2.25-2.62,1.56-5.68,2.94-8.67,1.7C168.19,403.07,166,398.74,161.75,404.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M168.33,417.33c0,7,.59,11.56,8.33,12.34,3.34.33,6.66.05,8.26-3.17,1-2.07,1.55-7.61.22-9.49C182.34,413.05,174.9,415.3,168.33,417.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M88.5,394.33a48.2,48.2,0,0,1-.21-22.53A27.33,27.33,0,0,1,96,358.64c2-2,3.92-4.38,6.43-5.77a53.9,53.9,0,0,1,8-3.24c6.09-2.19,12.16-3.64,18.69-3.3a36.48,36.48,0,0,1,10.33,2.26c2.89,1.05,4.92,3.18,7.24,5.1,2.08,1.72,4.25,2.94,5.92,5a29.06,29.06,0,0,1,3.73,6.56c2.84,6.42,3.69,12.08,3.68,19.05,0,1.77.92,6.87-.68,8.23-1.13,1-4.26-.81-5.46-1.24-3.84-1.37-8-1.5-12-1.5-9.57,0-19.67.27-29.12,1.88C104.76,393.07,96,393.51,88.5,394.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M196,392c-1.79-1.75-1.89-6.26-2-8.63a33.15,33.15,0,0,1,.46-8c.9-4.59,3.49-9.41,5.67-13.5,7.79-14.61,29.4-17.66,44-13.87,4.77,1.24,9.79,2.87,12.87,6.92,2.27,3,5.88,7.5,6.46,11.25" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M248.67,351.33c.78,1.44,2.61,2.29,3.84,3.33a44,44,0,0,1,4.62,4.63,40.35,40.35,0,0,1,5.83,8.8,52,52,0,0,1,3.62,7.83c.95,3.06-2.19,6-3.86,8.48-2.07,3.07-4.34,6.07-6.27,9.26-2.39-2.19-6.42-2.57-9.56-3.09a103.84,103.84,0,0,0-17.2-1.23c-10.86,0-21.52,2.53-32.37,2.67" transform="translate(-53.25 -44.96)"/><path class="cls-11" d="M180.17,162.33c-4.89,0-5.59-1.1-7.57-5.41-.55-1.2-2.47-4.28-2.28-5.58.35-2.33,3.06-3.08,5-4.35,6.52-4.23,12.36-9.33,18.49-14.16,7.48-5.9,15.18-10.77,23.17-15.93,5.58-3.61,11.35-6.67,17.1-10,11.44-6.63,24.34-10.63,36.4-16.08A352.56,352.56,0,0,1,347.35,66a242.15,242.15,0,0,1,28.52-3.37c3-.23,17.34-2.79,18.83,1,.22.58-.92,3.37-1,4.17-.23,1.6-.25,3.32-.33,4.91-.22,4.5-2.48,16.8.83,20.26,1.57,1.65,2.82.45,5.18,0,3.1-.59,6.36-.33,9.51-.33,6.7,0,13.33,0,20,.67,1.42.14,4.8-.14,5.55,1,.59.87-.24,4.17-.34,5.19-.67,6.65-.65,13.76-.68,20.51,0,10-.34,19.9-.28,29.86,0,2.6-1.23,9.56.09,11.76,1.22,2,4.81,1.58,6.81,2-.32-.07.52-32.62.49-35.66-.1-10.61-.77-21.25-.77-32,0-5-2-14.61.39-18.94,5-.32,9.91-.19,14.89-.44.14-2.75-1-7.18,1.38-8.28,3.14-1.44,9.33,1.6,12.88,1.38-.32,0,.45,22.21.45,24.2,0,5.69-.34,11.33-.59,17-.54,12.46.59,24.71.59,37.15,0,5.16-.47,10.06-.72,15.2-4.26.57-9.19-.62-13.58-.62-5.59,0-11.39-.35-16.94.24-15.7,1.69-32.27.91-48.16.09-10.62-.55-21.43.27-32.14.1-12.09-.19-24.18-.44-36.27-.44-29.6,0-59,1-88.57,1-8.16,0-16.68.73-24.62-.76-2.89-.54-5.9-1-8.74-1.49C193.6,160.38,186.58,162.33,180.17,162.33Z" transform="translate(-53.25 -44.96)"/><g class="cls-3"><path d="M440.17,158.78c-.13-10.26.36-20.52.26-30.82-.1-10.61-.77-21.25-.77-32,0-5-2-14.61.39-18.94,5-.32,9.91-.19,14.89-.44.14-2.75-1-7.18,1.38-8.28,3.14-1.44,9.33,1.6,12.88,1.38-.32,0,.45,22.21.45,24.2,0,5.69-.34,11.33-.59,17-.54,12.46.59,24.71.59,37.15,0,5.16-.47,10.06-.72,15.2,0,.76-19.65-.13-21.13-.32a10.14,10.14,0,0,0-4.14,0c-1.13.34-2.28,1.1-3.39.72Q440.2,161.24,440.17,158.78Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M303.55,161.86c-.81-12.51,1.83-24.9,2.8-37.33a114.16,114.16,0,0,0-.45-18.9c-.5-5.93.14-12.09.09-18.06q0-4.55-.21-9.1c8.46-5.27,18.63-7.23,28.31-9.56,7.08-1.7,14.13-3.37,21.41-1.81-3.48,13.14-.1,27-.06,40.58,0,3.35-.18,6.7-.33,10a355.09,355.09,0,0,0,.93,45.51c-.07-.88-31.13-.58-34.17-.58-1.33,0-18.28-.34-18.21.53Q303.59,162.53,303.55,161.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-14"><path class="cls-15" d="M239.27,163.84a64.66,64.66,0,0,0,2.63-13.77l4.88-41.94a19,19,0,0,1,1.28-5.73c1.72-3.78,6.3-4.89,9.83-6.3,4.23-1.69,8.45-3.38,12.6-5.26a188.12,188.12,0,0,1,24.76-9.16L294,102.77c-.4,6.47-1.61,13.54-.9,19.93a203.82,203.82,0,0,1,1.36,23.14c0,3.86-.17,7.72-.48,11.57s0,5.17-3.94,5.26c-8.35.18-16.71.58-25.05.71q-7,.11-14.07.19C247.54,163.6,242.35,165,239.27,163.84Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M180.17,162.33c-4.89,0-5.59-1.1-7.57-5.41-.55-1.2-2.47-4.28-2.28-5.58.35-2.33,3.06-3.08,5-4.35,6.52-4.23,12.36-9.33,18.49-14.16,7.48-5.9,15.18-10.77,23.17-15.93,5.58-3.61,11.35-6.67,17.1-10,4.47-2.59,9.16-5.63,14.1-7.05a1.67,1.67,0,0,1,1-.08c.77.26.74,1.35.55,2.14a479.38,479.38,0,0,0-8.47,47.41c-.42,3.28.1,9.24-1.38,12.13-1.2,2.34-5,2.19-7.76,2.21-7.81.06-15.73.68-23.45-.76-2.89-.54-5.9-1-8.74-1.49C193.6,160.38,186.58,162.33,180.17,162.33Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/><g class="cls-16"><path class="cls-17" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M92.25,301.5c0-6-.5-12-.5-18.06,0-5.5-1-10.71-.75-16.21s-.53-10.74,1.4-16c3.53-9.57,9.82-18.41,15.56-26.75,3.87-5.62,7.07-11.13,14-12.82q.13-.15,0,0a3.67,3.67,0,0,1-.62.54c3.43-.59,7-2.53,10.66-1.41,5.14,1.6,6.51,6.61,7.46,11.3,3.59,17.89,6,36.34,7.92,54.46.51,4.84.5,13.41,4.64,16.72,1.58-5.82,1-12.05.73-18-.09-2.2,1-6.55-1-8,0,0,1.38-62,1.31-63s9.69-2,9.69-2l8.44,1.41,1.06,4.33L174,195.93h20.67v14.55l12.33.13V195.93l19-.65s12.92,3.72,12.84,4.22.17,76.75.17,76.75l.47,16.25,16.16-28.11,31.47-48.05L297.25,201l11.54,8L310.67,188l13.09-.23L323.18,219l17.32.25L338.75,304l-28.66-1V213l-1.84-1L274,271l-11.25,20L253,302l-12-8.67-2,1.09,1.33,6.85Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-19" d="M92.25,301.5c0-6-.5-12-.5-18.06,0-5.5-1-10.71-.75-16.21s-.53-10.74,1.4-16c3.53-9.57,9.82-18.41,15.56-26.75,3.87-5.62,7.07-11.13,14-12.82q.13-.15,0,0a3.67,3.67,0,0,1-.62.54c3.43-.59,7-2.53,10.66-1.41,5.14,1.6,6.51,6.61,7.46,11.3,3.59,17.89,6,36.34,7.92,54.46.36,3.41.41,6.88,1.22,10.23s3,6.57,2.57,10.21c-.92,7-12.72,4.42-17.57,4.43l-21.11,0Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-14"><path class="cls-15" d="M310.09,301.5V253.82c0-17.45.39-34.95-.69-52.32-.06-1,1.2-13.52,1.27-13.52l13.09-.23L323.18,219l17.32.25L338.75,304l-28.66-1Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M253,302c-2.25-1.63-4.71-2.95-7-4.5-1.06-.72-5.47-2.36-5.74-3.5a2.51,2.51,0,0,1,.14-1.25c2.85-9.95,10.06-19.35,15.24-28.36l31.47-48.05L297.25,201c4.1,2.86,9.46,5.37,12.37,9.43a3.46,3.46,0,0,1-1.25,3.18c-3.48,2.74-5.36,7.38-7.58,11.2l-8.67,14.93-15.74,27.11L274,271l-11.25,20Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M153,295.9c-.63-6.8,0-13.85-.26-20.65-.09-2.2,1-6.55-1-8,0,0,1.38-62,1.31-63s9.69-2,9.69-2l8.44,1.41,1.06,4.33L174,195.93h20.67v14.55l12.33.13V195.93l19-.65s12.92,3.72,12.84,4.22.17,76.74.17,76.75c0,2.8.16,5.61.24,8.41.11,4-.6,8.55.14,12.4.4,2.11,2.31,3.77,2.05,6.09-10.6.4-21.52-1-32.17-1.15s-21.12,0-31.67.34c-7.47.26-15.09.63-22.26-1.48a3,3,0,0,1-1.46-.77,3,3,0,0,1-.55-1.55C153.19,297.68,153.08,296.79,153,295.9Z" transform="translate(-53.25 -44.96)"/></g><polygon class="cls-11" points="292.81 257.04 292.37 188.62 331.25 188.69 332.25 161.42 375.58 161.42 377.25 158.59 388.74 157.38 392.75 158.09 396.14 159.65 397.6 150.81 419.52 150.97 418.91 163.79 431.27 164.54 431.3 151.68 445.66 150.81 454.25 150.63 462.5 152.7 463.08 178.06 474.5 177.82 477.54 175.78 476.5 171.22 496 164.54 500.75 165.29 513 237.04 518.25 258.54 486.5 258.79 479.75 205.44 476.5 185.51 474.5 188.04 474.5 259.72 388.74 258.79 372.42 251.62 363.92 248.75 359.76 249.29 360.52 252.7 346.42 254.29 327.96 255.7 320.75 255.7 292.81 257.04"/><g class="cls-16"><path class="cls-17" d="M536.48,277.9,533,250.4c-1.67-10.25-2.32-20.24-3.6-30.5a7,7,0,0,1-.06-2c.57-3.44,8.49-4.49,11.35-5.47l8.57-2.94,4.75.75L566.25,282l5.25,21.5-31.75.25Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M473.47,293.73c-1.74-26.81.49-53.82-1.55-80.62a4.35,4.35,0,0,1,.27-2.4c1-1.92,12.33-1.69,12.33-1.21l0-12.86,14.36-.87,8.59-.19,8.25,2.08.58,25.36c2.8-.06,10.63-1.71,11.76,1.59a7.14,7.14,0,0,1,.21,2.63c-.69,16-.55,32.12-.55,48.19v29.24s-17.26-.19-18.27-.2l-18.3-.2-9.55-.1c-1.55,0-5.71,1.2-6.72,0a4.87,4.87,0,0,1-.81-2.69Q473.72,297.6,473.47,293.73Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M425.5,293.74a206.26,206.26,0,0,1-.69-22.25l.26-51.15a30.31,30.31,0,0,0-.76-8.51,7.25,7.25,0,0,1-.48-2.53c.14-1.71,1.71-2.93,3.28-3.62,5-2.2,9.39-2.75,14.88-3.33l4,.71,3.39,1.56,1.45-8.84,21.92.16c-.27,5.63.18,11.07-.14,16.67-.46,8.18-.88,16.36-1.09,24.55-.41,16.12,0,32.31,2.46,48.27.91,5.88,2.09,11.73,2.51,17.66.16,2.26-.67,1.84-2,1.84-.19,0-1.31-.76-1.64-.85-1.21-.34-3,0-4.25,0L455,303.89l-13-.14c-2,0-5.17-2.27-7-3.05-2.68-1.18-9-2.58-9.43-6Q425.55,294.23,425.5,293.74Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-19" d="M346.06,302l-.45-68.42,38.88.07,1-27.27h16.62c8.39,0,18.24-1.41,26.4.12a68.46,68.46,0,0,1-.41,12.13l-2.78,29.79c-.43,4.65-.87,9.3-.88,14,0,3.8.25,7.6.52,11.39.52,7.46,4,19.43,3.88,26.89-3.05.17-7.48-.41-10.33,0l-4.62-.25h0L400,300.5l-18.79.17H374Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M433.26,162.79c-.09-1.68-.12-3.36-.15-5l-.53-29.61a72.4,72.4,0,0,0-.4-7.61c-.31-2.49-.88-5-1-7.47-.28-6.72,2.75-13.46,1.35-20a1.53,1.53,0,0,0-.45-.93,1.6,1.6,0,0,0-1-.22c-7.26,0-14.53.07-21.78.32-2.6.09-4.76,1-7.28,1.19-2.21.18-6.4-.33-6.61,3-.06.92.31,2.07-.45,2.59-2.09-11,1.69-22.46-.31-33.48a3,3,0,0,0-.73-1.72,3.17,3.17,0,0,0-2.4-.51c-11.48.7-23,1.4-34.34,3.2a4.31,4.31,0,0,0-2.25.82c-1.21,1.08-1.59,5.31-2,6.89-.75,3.31.08,7.37.39,10.71,1.19,12.69.41,25.42.46,38.17q.08,19.88,1,39.74,20.06,1.58,40.21,1.38C398.23,164.17,433.25,162.64,433.26,162.79Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M714.75,284.75c1.42,1.82,1.16,5.24,1.75,7.45s2,3.71,2.85,5.67c2.21,5.24-8.77,4.26-11.58,4.29l-18.26.18-52,.51L635.34,210l-2.86-3.52S622.35,250.08,616.92,266s-12.28,36-12.28,36l-14.84-6.92-2.55,7.29L571.5,303.5l-2.5-97,.75-2.25,11.8-1.16H587l1.5,3.28-.12,6.5-1.13,54.83.25,23.8,26.19-77,5.56-13.75L620,194l13,3.25,2.34,2.5-1.1,4.5,18.27-1.2,2.69,3.45,1.1,2.25V195l8-.33s31,44.17,38.25,58.88" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-19" d="M714.75,284.75c1.42,1.82,1.16,5.24,1.75,7.45s2,3.71,2.85,5.67c2.21,5.24-8.77,4.26-11.58,4.29l-18.26.18-52,.51-1-42.75-.73-31.8-.27-11.63c0-1.28-.74-11.06-1.42-10.63,5.27-3.33,12.27-2.59,18.43-3l2.69,3.45,1.1,2.25V195l8-.33s31,44.17,38.25,58.88" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M635.34,199.75c-1.38,5.62-3.78,10.93-5.29,16.55-1.63,6.07-2.86,12.23-4.4,18.32-2.66,10.52-5.23,21.14-8.72,31.42-5.42,16-12.28,36-12.28,36l-14.84-6.92-2.55,7.29L571.5,303.5l-2.5-97,.75-2.25,11.8-1.16H587l1.5,3.28-.12,6.5-1.13,54.83.25,23.8,26.19-77,5.56-13.75L620,194l13,3.25Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M82,522.25l5.82-27.41,20.8,5.82,5.19,3.67L111.33,509l8.5-.68,4,.74,1.66-3V484.25l12.81-2.65h8l6.21.9,3.5.32.5,14.42L168,495.5l1.14-.66.11-13.09,16.5.75h5.91v9.65l1,2.69,5.11-5.88,4.59-.52,4.57.52,5.1.67.6,5.21,4.79-2.88,4.73-.25,3.63-1s7,15.41,8.11,18.2-.1,4.09-.1,4.09l-2,8.21L229.5,544.5l-2.88,12.27v5.56l2.63,3.86,2.76,1.43-13.26,8.62L206,587.76l-92.21.05Z" transform="translate(-53.25 -44.96)"/><g class="cls-21"><path class="cls-22" d="M82,522.25l5.82-27.41,20.8,5.82,5.19,3.67L111.33,509l8.5-.68,4,.74,1.66-3V484.25l12.81-2.65h8l6.21.9,3.5.32.5,14.42L168,495.5l1.14-.66.11-13.09,16.5.75h5.91v9.65l1,2.69,5.11-5.88,4.59-.52,4.57.52,5.1.67.6,5.21,4.79-2.88,4.73-.25,3.63-1s7,15.41,8.11,18.2-.1,4.09-.1,4.09l-2,8.21L229.5,544.5l-2.88,12.27v5.56l2.63,3.86,2.76,1.43-13.26,8.62L206,587.76l-92.21.05Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M592.09,588l14.61-9.7-.15,9.23,31.78.81,44.33-.81s8.87-18.31,18-38c9-19.49,18.24-40.34,19.36-46.2,2.25-11.78,0-5.95,0-5.95a36.4,36.4,0,0,1-5.55-.79c-1.25-.39-2.24-2.22-3.75-.67-.92.95-1,2.4-1.12,3.72-.61,7.11-3.47,13.81-5,20.78a67.44,67.44,0,0,0-1.42,17.29c.17,4.31.64,8.82-1.1,12.76s-5.5,6.72-7.62,10.51a101.78,101.78,0,0,1-.84-11.9q.65-29.68,1.3-59.37c-3.89.63-7.49-1.87-11.53-1.89a9.74,9.74,0,0,0-4.33.8,4.84,4.84,0,0,0-2.73,3.3,16.64,16.64,0,0,1-.3,2.3c-.25.74-1,1.39-1.76,1.09-1.23-.52-1.5-11.2-1.48-13-1.88-.13-20.08-1.41-20.08-1.38l-1.12,14.8-13.22,1s.25-13.54.33-14.21-31.5,1.57-31.5,1.57l-1.5,90.54-2-1.6-35.11-56.86-7.33,10.78-3,3,21.07,38.54" transform="translate(-53.25 -44.96)"/><path class="cls-11" d="M175.14,629.45a13.91,13.91,0,0,1,6.19,6.09l-.49-13.79a26.83,26.83,0,0,1,8.37,1.08,8.38,8.38,0,0,1-.92,4.7c1.39-.45,2.83.81,3.26,2.21a17.53,17.53,0,0,1,.27,4.36c.07,1.46.59,3.08,1.91,3.71.45.21,1,.29,1.42.49a5.55,5.55,0,0,1,2.35,2.88c2.91,5.91,6.45,12,12.24,15.11a28.83,28.83,0,0,0,8.88,2.75,78.46,78.46,0,0,0,10.7,1.11,9.41,9.41,0,0,1,4.68.93c1.89,1.17,2.62,3.54,3,5.73a62.61,62.61,0,0,1,.5,9.74v15.57c0,2.63-.39,5.87-2.83,6.85s-5.12-1.25-7.11-3.15a92.58,92.58,0,0,0-11-8.45c-7.57-5.3-15-10.82-22.31-16.47-8.51-6.58-16.64-13.72-25.3-20.1-6.14-4.53-9.18-8.39-8.43-16.6.31-3.47,1.82-3.48,5-3.79Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-23" d="M175.14,629.45a13.91,13.91,0,0,1,6.19,6.09l-.49-13.79a26.83,26.83,0,0,1,8.37,1.08,8.38,8.38,0,0,1-.92,4.7c1.39-.45,2.83.81,3.26,2.21a17.53,17.53,0,0,1,.27,4.36c.07,1.46.59,3.08,1.91,3.71.45.21,1,.29,1.42.49a5.55,5.55,0,0,1,2.35,2.88c2.91,5.91,6.45,12,12.24,15.11a28.83,28.83,0,0,0,8.88,2.75,78.46,78.46,0,0,0,10.7,1.11,9.41,9.41,0,0,1,4.68.93c1.89,1.17,2.62,3.54,3,5.73a62.61,62.61,0,0,1,.5,9.74v15.57c0,2.63-.39,5.87-2.83,6.85s-5.12-1.25-7.11-3.15a92.58,92.58,0,0,0-11-8.45c-7.57-5.3-15-10.82-22.31-16.47-8.51-6.58-16.64-13.72-25.3-20.1-6.14-4.53-9.18-8.39-8.43-16.6.31-3.47,1.82-3.48,5-3.79Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M560.6,661.45a34,34,0,0,0,27-8c4-3.55,7.13-8,10.2-12.41a101.21,101.21,0,0,0-3,33c5-2.15,10.08-4.38,13.87-8.25a42,42,0,0,0,5.77-8.14,71.54,71.54,0,0,0,6.35-12.44c.93-2.62,1.55-5.34,2.28-8a104.45,104.45,0,0,1,4.87-14,1.57,1.57,0,0,1,.44-.67,1.54,1.54,0,0,1,1-.19,25,25,0,0,1,13.82,5.09c-5.61,4.68-5.11,13.61-9.43,19.5a27.5,27.5,0,0,1-6.13,5.57q-18.32,13.5-37.27,26.11-9.35,6.22-18.84,12.22c-1.75,1.1-6.93,5.66-9,5.23-2.86-.6-1.62-6.71-1.62-8.86S561.4,661.57,560.6,661.45Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-23" d="M560.6,661.45a34,34,0,0,0,27-8c4-3.55,7.13-8,10.2-12.41a101.21,101.21,0,0,0-3,33c5-2.15,10.08-4.38,13.87-8.25a42,42,0,0,0,5.77-8.14,71.54,71.54,0,0,0,6.35-12.44c.93-2.62,1.55-5.34,2.28-8a104.45,104.45,0,0,1,4.87-14,1.57,1.57,0,0,1,.44-.67,1.54,1.54,0,0,1,1-.19,25,25,0,0,1,13.82,5.09c-5.61,4.68-5.11,13.61-9.43,19.5a27.5,27.5,0,0,1-6.13,5.57q-18.32,13.5-37.27,26.11-9.35,6.22-18.84,12.22c-1.75,1.1-6.93,5.66-9,5.23-2.86-.6-1.62-6.71-1.62-8.86S561.4,661.57,560.6,661.45Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M618.76,481.46c-3.58,0-7.92.36-9.5,3.58a9.59,9.59,0,0,0-.68,4.06l-2.13,98.17a180.81,180.81,0,0,0,34.45-.75c-2.21-6.75-2.28-14-2.32-21.09l-.17-28.76a101.28,101.28,0,0,1,.41-12c.47-4.13,1.45-8.2,1.66-12.35.25-4.95-.6-9.85-.78-14.79-.12-3.56,1.07-7.89-.42-11.27C636.27,479.39,624.51,481.52,618.76,481.46Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-23" d="M652.25,544q.42-27.32-.87-54.62c-.13-2.8,0-6.14,2.34-7.64a8,8,0,0,1,4.52-.82l11.28.18a2.46,2.46,0,0,1,3,2.44l1.86,9.92c1.53-.69,1.42-3.21,2.93-3.93a3.4,3.4,0,0,1,1.64-.2A117.76,117.76,0,0,1,694.3,491a1.45,1.45,0,0,1,1.53,1.88l-3.67,40.48a59.81,59.81,0,0,0-.35,9.87c.26,3.51,1.15,6.95,1.53,10.45a48.07,48.07,0,0,1-.17,10.79,10.67,10.67,0,0,1-.59,2.76,12.66,12.66,0,0,1-2.09,3.11,67.57,67.57,0,0,0-10.11,17.14,147.26,147.26,0,0,0-16.07-.7c-3.72,0-9.24,1.46-12.55-.81-2.9-2-2.75-5.51-2.27-8.6.83-5.29,1.67-10.51,2.07-15.86C652,555.68,652.16,549.82,652.25,544Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-21"><path class="cls-22" d="M590.16,587.71c-1.45-5.44-5.88-9.46-9.16-14-5.17-7.2-7.61-16.07-12.71-23.33a50.69,50.69,0,0,1-3.54-5.18c-.9-1.69-1.47-3.54-2.34-5.24-1-2-2.55-4-2.77-6.23a11.73,11.73,0,0,1,1.12-5.19c1.69-4.42,3.58-9.11,7.45-11.83,5.85,6.16,8.57,14.61,13.45,21.56,1.1,1.56,2.3,3,3.44,4.56A135.37,135.37,0,0,1,593.95,557q2.83,5,5.65,10,1.41,2.5,2.8,5c.74,1.34,2.23,3.11,2.42,4.65.31,2.54-3.39,4-5.15,5.19Q595.06,585,590.16,587.71Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-21"><path class="cls-22" d="M639.06,496.73c-1.32,8.89-1.12,17.92-.91,26.91l.18,7.91c.31,13.59.63,27.17.85,40.76a79.15,79.15,0,0,1-.68,14.6l11.23-1.48q1.41-23.59,1.67-47.24c.07-6.84.07-13.68.08-20.52v-8.08c0-2.4,0-4.79-.09-7.19-.06-1.61.23-4.24-.84-5.61S639.17,496,639.06,496.73Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M709.39,497.13a.65.65,0,0,0-.78.67l-3.88,25.33c-1,6.83-2.1,13.74-1.52,20.62,4.23-4.28,5.51-10.58,8.36-15.89,1.36-2.54,3.1-4.87,4.28-7.5a39.23,39.23,0,0,0,2.33-8.3c.85-4.17,2.49-9.42,1.85-13.69-.32-2.18-1.46-1.82-3.46-1.69Z" transform="translate(-53.25 -44.96)"/></g></g><g id="DETAILS"><path class="cls-24" d="M636.33,431.17a1.5,1.5,0,0,1-1.46-1.14c-.77-3.17-.62-6.77-.48-10.25.05-1.32.11-2.57.11-3.77a1.5,1.5,0,0,1,3,0c0,1.26-.05,2.6-.11,3.89-.13,3.28-.27,6.67.4,9.42a1.5,1.5,0,0,1-1.46,1.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M177.34,430.83h-.21a1.5,1.5,0,0,1-1.28-1.69,37.15,37.15,0,0,0-.09-7.5c-.13-1.65-.26-3.35-.26-5a1.5,1.5,0,0,1,3,0c0,1.5.12,3.07.25,4.73a39.23,39.23,0,0,1,.07,8.14A1.5,1.5,0,0,1,177.34,430.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M569,342.17a1.5,1.5,0,0,1-.73-.19c-.63-.35-1.23-.71-1.83-1.07-2.38-1.43-4.43-2.67-7.31-2.41a1.5,1.5,0,1,1-.27-3c3.84-.34,6.53,1.27,9.12,2.83.57.34,1.14.69,1.74,1a1.5,1.5,0,0,1-.73,2.81Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M569,341.5a1.5,1.5,0,0,1-1.42-1,17.5,17.5,0,0,1-.48-6.45c0-.7.07-1.39.07-2a1.5,1.5,0,0,1,3,0c0,.7,0,1.44-.07,2.19a15.14,15.14,0,0,0,.32,5.32,1.5,1.5,0,0,1-1.42,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M700.66,342.78a1.44,1.44,0,0,1-.71-.18,1.46,1.46,0,0,1-.59-2l0-.08c1.39-2.46,3.29-5.84,3.43-8.59a1.5,1.5,0,0,1,3,.15c-.18,3.46-2.28,7.19-3.81,9.91A1.58,1.58,0,0,1,700.66,342.78Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M701,343.83a1.5,1.5,0,0,1-.85-2.74,24.7,24.7,0,0,1,9.93-3.58,1.5,1.5,0,0,1,.5,3,21.84,21.84,0,0,0-8.74,3.09A1.49,1.49,0,0,1,701,343.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M242.33,343.5a1.5,1.5,0,0,1-1.32-2.21l.54-1c1.08-1.95,2.57-4.61,3-6.9a1.5,1.5,0,1,1,3,.52c-.49,2.79-2.11,5.71-3.3,7.84l-.52.95A1.5,1.5,0,0,1,242.33,343.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M243.26,342.84l-.4,0a1.5,1.5,0,1,1,.28-3,28.1,28.1,0,0,0,6.41-1.27,1.5,1.5,0,0,1,.9,2.86A32.77,32.77,0,0,1,243.26,342.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.33,344.17a1.5,1.5,0,0,1-1.41-1c-.71-1.92-4.84-5.23-6.7-5.36a1.5,1.5,0,0,1,.21-3c3.27.23,8.26,4.49,9.3,7.31a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M109.67,343.5a1.5,1.5,0,0,1-1.38-.9c-1-2.2-1.91-9.32.22-11.89a1.5,1.5,0,1,1,2.31,1.91c-1,1.17-.69,6.68.22,8.78a1.5,1.5,0,0,1-1.37,2.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.83,217.59c-3.24,0-6.29-.39-8.5-1.78a1.25,1.25,0,0,1,1.33-2.11c3,1.87,8.76,1.43,13.43,1.07,1.78-.14,3.47-.26,4.9-.26,3.17,0,6.77-.09,9.56-1.17a1.25,1.25,0,0,1,.9,2.33C234.27,216.9,230.38,217,227,217c-1.33,0-3,.12-4.71.26C220.18,217.42,218,217.59,215.83,217.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.7,222.35c-3.13,0-6.2-.35-8.59-1.77a1.25,1.25,0,1,1,1.28-2.15c3,1.77,7.8,1.49,12,1.24,1.43-.08,2.77-.16,4-.16.82,0,1.7,0,2.59.06,2.9.1,5.89.21,8-.71a1.25,1.25,0,1,1,1,2.29c-2.61,1.14-6,1-9.06.92-.86,0-1.71-.06-2.5-.06-1.15,0-2.47.08-3.86.16C219,222.25,217.34,222.35,215.7,222.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M220.25,211.33c-1.06,0-2.08-.74-3-2.2-1.12-1.69-1.28-6.22.52-7.53.38-.27,1.73-1,3.25.87A1.25,1.25,0,0,1,219,204a7.39,7.39,0,0,0,0,3,1.25,1.25,0,0,1,.73-.95,4.58,4.58,0,0,1,2.71-.3,1.25,1.25,0,0,1,1,1.47c-.59,3-1.82,3.82-2.75,4A2.33,2.33,0,0,1,220.25,211.33Zm-.47-2.92a1.84,1.84,0,0,0,.45.39,1.47,1.47,0,0,0,.22-.32A1.26,1.26,0,0,1,219.78,208.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M226.3,210.34a3.82,3.82,0,0,1-1-.15,2.84,2.84,0,0,1-2-2,8.61,8.61,0,0,1,1.22-6.48,3.12,3.12,0,0,0,1.05-.76,1.25,1.25,0,0,1,1.72.41c.31.5,2.64,5.81,1,8A2.38,2.38,0,0,1,226.3,210.34Zm-.38-5.79a5.77,5.77,0,0,0-.2,2.89c.09.31.19.33.23.34a1,1,0,0,0,.4.05C226.61,207.44,226.32,205.89,225.92,204.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M218.77,281.3c-4.57,0-9.06-.65-11-3.31a1.25,1.25,0,1,1,2-1.48c2.21,3,11.17,2.31,16,1.94,1.14-.09,2.15-.17,3-.2,3.06-.12,7.16-1.07,8.9-2.87a1.25,1.25,0,0,1,1.79,1.74c-2.39,2.46-7.2,3.49-10.6,3.63-.79,0-1.77.11-2.87.19C223.8,281.11,221.27,281.3,218.77,281.3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.15,285c-4.72,0-9.85-.19-14.16-2.12a1.25,1.25,0,1,1,1-2.28c4.34,1.95,9.67,1.92,14.82,1.9h1.82c2.67,0,8.25,0,10.18-2.09a1.25,1.25,0,1,1,1.84,1.69c-2.67,2.92-8.75,2.91-12,2.91h-3.49Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M260.15,291.5c-5.17,0-12.44-6.59-14.82-9.15a1.25,1.25,0,1,1,1.83-1.7c3.24,3.49,9.38,8.35,13,8.35h.11a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.75,289a1.24,1.24,0,0,1-.31,0c-5.06-1.3-11.1-5.88-14.85-9.85a1.25,1.25,0,0,1,1.82-1.72c3.38,3.59,9.1,8,13.65,9.15a1.25,1.25,0,0,1-.31,2.46Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M297.25,229.5l-.23,0c-4.42-.83-9.93-2.35-13.26-6.72a1.25,1.25,0,0,1,2-1.52c2.82,3.69,7.75,5,11.74,5.78a1.25,1.25,0,0,1-.23,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M299.5,227.5h0c-3.75,0-7.37-2.34-10.56-4.39a43.46,43.46,0,0,0-3.75-2.25,1.25,1.25,0,1,1,1.12-2.23,44.92,44.92,0,0,1,4,2.38c3,2,6.19,4,9.21,4a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M302.75,224.25h-.07c-4.22-.24-7.69-3.18-10.75-5.78-1.18-1-2.3-1.94-3.39-2.69a1.25,1.25,0,0,1,1.41-2.06,45.3,45.3,0,0,1,3.59,2.85c2.9,2.45,5.89,5,9.27,5.19a1.25,1.25,0,0,1-.07,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M225.2,288.58a84.79,84.79,0,0,1-18-1.61,1.25,1.25,0,0,1,.53-2.44c9,1.94,18.55,1.63,27.82,1.33l3.38-.11a1.25,1.25,0,0,1,.07,2.5l-3.37.11C232.21,288.47,228.71,288.58,225.2,288.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M203.42,226.89a23.26,23.26,0,0,1-6.81-1.45,1.25,1.25,0,0,1,.78-2.37c1.72.57,5.76,1.9,7.58,1.05a1.25,1.25,0,1,1,1.05,2.27A6.16,6.16,0,0,1,203.42,226.89Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M203.75,230.5h0a24.26,24.26,0,0,1-4.32-.53,19.58,19.58,0,0,0-3.91-.47h0a1.25,1.25,0,0,1,0-2.5,22.23,22.23,0,0,1,4.4.51,22.07,22.07,0,0,0,3.88.49,1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M204.21,291.25a17,17,0,0,1-3.78-.54,17.39,17.39,0,0,0-2.75-.47,1.25,1.25,0,0,1-1.17-1.32,1.24,1.24,0,0,1,1.32-1.17,19.55,19.55,0,0,1,3.15.52,13.65,13.65,0,0,0,3.48.48,1.25,1.25,0,0,1,.08,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.25,211.87c-.81,0-1.63,0-2.42-.06s-1.28-.05-1.83-.05a1.25,1.25,0,0,1,0-2.5h0c.58,0,1.23,0,1.93.05,2,.08,4.55.18,5.76-.42a1.25,1.25,0,0,1,1.11,2.24A10.66,10.66,0,0,1,183.25,211.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M182.34,216.06a6,6,0,0,1-3-.5,1.25,1.25,0,0,1,1.28-2.15,15.14,15.14,0,0,0,3.34.11l1.28,0a1.25,1.25,0,0,1,0,2.5l-1.2,0C183.43,216,182.86,216.06,182.34,216.06Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M184.5,286.5h-.25a1.25,1.25,0,0,1,0-2.5h.25a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M162.75,220.25a30,30,0,0,1-6.77-.53,1.25,1.25,0,1,1,.55-2.44,27.88,27.88,0,0,0,6.17.47l.05,1.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M160,229a1.25,1.25,0,0,1-.42-.07c-.27-.09-.63-.26-1-.45s-.71-.33-1.06-.47a1.25,1.25,0,0,1-2-.8,1.55,1.55,0,0,1,.56-1.52c.91-.7,2.12-.13,3.53.53.32.15.61.29.82.36A1.25,1.25,0,0,1,160,229Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M159,295.25a1.25,1.25,0,0,1-.73-2.26,7,7,0,0,1,2.65-1l.75-.18a1.25,1.25,0,1,1,.67,2.41l-.86.21a5.26,5.26,0,0,0-1.74.6A1.24,1.24,0,0,1,159,295.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M121.9,229.57a22.28,22.28,0,0,1-5.46-.61,1.25,1.25,0,0,1,.61-2.42,25,25,0,0,0,8.56.33l1-.09c2.75-.25,7.34-.67,9.07-2.21a1.25,1.25,0,1,1,1.66,1.87c-2.35,2.09-7.26,2.54-10.51,2.84l-1,.09C124.43,229.5,123.12,229.57,121.9,229.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M119,234.75a1.25,1.25,0,0,1,0-2.5c1.84,0,3.7-.15,5.49-.28,1.06-.08,2.13-.16,3.2-.22a1.25,1.25,0,0,1,.13,2.5c-1.05.05-2.1.13-3.14.21-1.84.14-3.74.28-5.67.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M130.92,292.79c-.6,0-1.2,0-1.75-.06l-.4,0a1.25,1.25,0,0,1-1-.66,1.87,1.87,0,0,1-.22-1.13,1.27,1.27,0,0,1,1.11-1.4,1.24,1.24,0,0,1,1.29.74c1.71.08,3.4.05,4.51-.94a1.25,1.25,0,1,1,1.67,1.86A7.39,7.39,0,0,1,130.92,292.79Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M100.65,293a16.77,16.77,0,0,1-6.1-1.1,1.25,1.25,0,0,1,.91-2.33,14.75,14.75,0,0,0,6,.92,1.25,1.25,0,1,1,.12,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M103,253.75H96.75a1.25,1.25,0,0,1,0-2.5H103a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M316.38,201.63a28.3,28.3,0,0,1-4.06-.39,1.25,1.25,0,1,1,.35-2.47h0c2.75.4,4.92.71,7.29-.4a1.25,1.25,0,1,1,1.06,2.26A10.62,10.62,0,0,1,316.38,201.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M315.5,206h0a4,4,0,0,1-2.92-1.45,1.25,1.25,0,1,1,1.92-1.6,1.47,1.47,0,0,0,1.08.55,1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.84,298.77a10.29,10.29,0,0,1-3-.57,8,8,0,0,0-2.3-.45,1.25,1.25,0,0,1-.06-2.5,9.52,9.52,0,0,1,3.08.55,7.1,7.1,0,0,0,2.6.45,1.25,1.25,0,1,1,.21,2.49Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M315.81,294a2,2,0,0,1-1.5-.7A1.25,1.25,0,0,1,316,291.5h0a1.25,1.25,0,0,1,.26,2.47A2.16,2.16,0,0,1,315.81,294Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M331.74,237.75a12.81,12.81,0,0,1-4.15-.82,1.25,1.25,0,1,1,.81-2.37,10.12,10.12,0,0,0,3.55.68,1.25,1.25,0,1,1,.09,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M367.76,250.38c-1,0-2,0-3-.07-1.61-.06-3.14-.07-4.72,0-2.81.1-5.73.2-8.4-1.19a1.25,1.25,0,1,1,1.15-2.22c2.1,1.09,4.56,1,7.17.91,1.64-.06,3.23,0,4.9,0,3,.1,6.07.21,8.68-.74a1.25,1.25,0,1,1,.85,2.35A19.37,19.37,0,0,1,367.76,250.38Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M366.25,253.75c-4,0-7.73-.17-11.37-.51a1.25,1.25,0,0,1,.23-2.49c3.56.33,7.2.49,11.13.49a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M404.37,234.9a10.12,10.12,0,0,1-2.15-.23,10.85,10.85,0,0,1-7.26-5,10.7,10.7,0,0,1-.75-8.67c1.15-3.67,5.93-7.72,10.18-7.23,7.43.77,10.94,7.22,10.61,11.58a10.23,10.23,0,0,1-4.18,7.39A10.8,10.8,0,0,1,404.37,234.9Zm-.69-18.68c-2.82,0-6.29,3-7.09,5.52a8.24,8.24,0,0,0,.53,6.67,8.39,8.39,0,0,0,5.63,3.82,8.13,8.13,0,0,0,6.57-1.51,7.74,7.74,0,0,0,3.18-5.57c.24-3.26-2.6-8.31-8.38-8.91h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M416.68,242.27c-2.57,0-5.17,0-7.74-.14-1.52-.07-3-.16-4.58-.25-3.16-.19-6.45-.35-9.62-.37-.59,0-1.3,0-2.08.07-2.88.14-6.14.3-7.83-.77a1.25,1.25,0,0,1,1.33-2.12c1,.64,4.24.49,6.38.39.89,0,1.67-.08,2.34-.08,3.22,0,6.48.19,9.63.38,1.52.09,3,.18,4.54.25,3.52.16,7.14.15,10.64.13h3.05a1.25,1.25,0,0,1,0,2.5h-6.07Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M432.44,215.28c-.42,0-.84,0-1.25,0a1.25,1.25,0,1,1,.12-2.5,57.87,57.87,0,0,0,8.39-.51c2.29-.25,4.45-.48,6.3-.49h0a1.25,1.25,0,0,1,0,2.5c-1.72,0-3.82.23-6,.47A72.52,72.52,0,0,1,432.44,215.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M430.5,219.5a1.25,1.25,0,0,1-.23-2.48,76.8,76.8,0,0,1,14.48-1,1.25,1.25,0,0,1,0,2.5,74.64,74.64,0,0,0-14,1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M456.75,222c-.43,0-.87,0-1.3,0a1.25,1.25,0,0,1-1.1-1.68c.67-1.81,1.26-3.74,1.83-5.61.72-2.38,1.47-4.84,2.42-7.15a1.25,1.25,0,0,1,2.27-.08,32.87,32.87,0,0,0,2.57,4c2.06,2.9,4.19,5.89,4,8.87a1.25,1.25,0,0,1-1.25,1.18h0a39.69,39.69,0,0,0-4.91.25C459.8,221.86,458.29,222,456.75,222ZM460,210.86c-.52,1.49-1,3-1.44,4.53-.41,1.35-.83,2.74-1.29,4.1,1.23,0,2.48-.14,3.77-.26s2.52-.23,3.81-.27c-.44-1.86-2-4-3.45-6.1C460.93,212.21,460.45,211.53,460,210.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M460.45,247.43a5.05,5.05,0,0,1-4.72-2.68c-1.77-3.28-.51-8.47,1.76-10.75a3.53,3.53,0,0,1,4.22-.91c3.38,1.05,5.33,5.14,5.2,8.38a5.74,5.74,0,0,1-4.7,5.77A8.85,8.85,0,0,1,460.45,247.43Zm-.21-12.19a1.42,1.42,0,0,0-1,.53c-1.57,1.58-2.5,5.64-1.33,7.8.24.45,1,1.8,3.79,1.23a3.28,3.28,0,0,0,2.7-3.41c.1-2.59-1.54-5.35-3.52-5.92a1.25,1.25,0,0,1-.24-.1A.86.86,0,0,0,460.24,235.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M461.06,273.63a15,15,0,0,1-3.85-.46,1.25,1.25,0,0,1-.92-1.17c0-.92-.15-1.86-.27-2.85a23.47,23.47,0,0,1-.27-4.48,1.27,1.27,0,0,1,.1-.42,12.49,12.49,0,0,1,7.33-6.77,3.17,3.17,0,0,1,2.82.29c1.53,1.12,1.8,4.45,1.75,9.83,0,.5,0,.9,0,1.15V269c.08,2.88-.22,3.68-3.23,4.32A16.94,16.94,0,0,1,461.06,273.63Zm-2.33-2.69a15.17,15.17,0,0,0,5.28-.11,8.3,8.3,0,0,0,1.24-.33,10.35,10.35,0,0,0,0-1.47v-.22c0-.28,0-.71,0-1.24.05-5.74-.38-7.41-.75-7.8-.79-.27-4.62,1.71-6.27,5.28a22.69,22.69,0,0,0,.27,3.79C458.59,269.53,458.67,270.23,458.73,270.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M499.19,228.22a9.21,9.21,0,0,1-1.77-.17c-4.48-.87-6.68-3.57-6.92-8.47-.19-3.88,1.83-10.92,6-13.49a6.41,6.41,0,0,1,6.88.07,1.25,1.25,0,0,1-1.23,2.18,4,4,0,0,0-4.34-.12c-3.12,1.93-5,8-4.8,11.24.19,3.77,1.56,5.49,4.9,6.14,2.67.52,5.84-.58,6.76-3.7.62-2.12-.39-6.15-2.41-7.65a2.53,2.53,0,0,0-3.18.08c-.92.6-2.12,3.18-2.24,5.5-.06,1.18.19,1.82.45,2a1,1,0,0,0,1.2.09,1.88,1.88,0,0,0,.89-1.13,1.29,1.29,0,0,1-.42-1.63,1.21,1.21,0,0,1,1.61-.56,2.32,2.32,0,0,1,1.32,2.15,4.19,4.19,0,0,1-2.43,3.49,3.43,3.43,0,0,1-3.74-.46c-1-.8-1.47-2.22-1.37-4.1.14-2.62,1.46-6.22,3.37-7.46a5,5,0,0,1,6,0c2.94,2.19,4.2,7.37,3.32,10.36A8,8,0,0,1,499.19,228.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M496.25,258.25A1.25,1.25,0,0,1,495,257a38,38,0,0,1,.89-8.09c.27-1.5.53-2.92.68-4.3.06-.55.09-1.32.12-2.21.12-3.34.26-7.49,2.26-9.16a1.25,1.25,0,0,1,1.93.44c.62,1.34,1.31,2.72,2,4.05.49,1,1,1.95,1.45,2.92.17.36.41.8.67,1.29,1.5,2.84,2.72,5.34,2.52,7.25-.26,2.38-2.82,3.8-5.29,5.17a15.92,15.92,0,0,0-3.27,2.14,1.25,1.25,0,0,1-1.36.28l-.07,0s0,.1,0,.15a1.25,1.25,0,0,1-1.2,1.3Zm3.59-10.6a39.39,39.39,0,0,0-.52,5.53c.54-.33,1.1-.64,1.66-.95l1-.58a1.24,1.24,0,0,1-.52-.4A12.68,12.68,0,0,1,499.84,247.65Zm-.17-4.88a1.25,1.25,0,0,1,1.06.59,16,16,0,0,1,1.44,3.39,11.14,11.14,0,0,0,1.32,3,1.24,1.24,0,0,1,.25.8A2.77,2.77,0,0,0,505,249c.14-1.3-1.35-4.12-2.24-5.81-.28-.52-.52-1-.71-1.37-.46-1-.95-1.93-1.43-2.89l-.93-1.86a32.17,32.17,0,0,0-.52,5.49v.33a1.24,1.24,0,0,1,.47-.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M493.31,296.12a1.23,1.23,0,0,1-1-.54c-.24-.34-.51-1,.32-1.93a1.25,1.25,0,0,1,1.77-.07,1.17,1.17,0,0,1,.15.17,1.25,1.25,0,0,1-.25,2.14A2.35,2.35,0,0,1,493.31,296.12Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M501.16,296a1.21,1.21,0,0,1-.92-.39c-.37-.42-.61-1.1.33-2a1.29,1.29,0,0,1,1.8,0,1.21,1.21,0,0,1,0,1.73l-.14.13a1.2,1.2,0,0,1-.17.17A1.4,1.4,0,0,1,501.16,296Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M507.58,295.18h-.17a1.33,1.33,0,0,1-1.16-1.3,1.37,1.37,0,1,1,2.67,0l0,.08C508.63,294.79,508.19,295.18,507.58,295.18Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M494.91,292.32c-1.58,0-3.16,0-4.72,0s-3.13,0-4.69,0a1.25,1.25,0,0,1,0-2.5c1.57,0,3.14,0,4.72,0a135.16,135.16,0,0,0,14.23-.34c.88-.08,1.9-.13,3-.18,2.7-.12,6.06-.26,7.75-1.14a1.25,1.25,0,1,1,1.14,2.22c-2.18,1.12-5.69,1.28-8.78,1.41-1,0-2,.09-2.86.17C501.45,292.25,498.17,292.32,494.91,292.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476.59,238.29l-2.13,0-2,0a1.25,1.25,0,1,1,0-2.5h0l2,0a37.3,37.3,0,0,0,8.23-.49,1.25,1.25,0,1,1,.54,2.44A31.24,31.24,0,0,1,476.59,238.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M482,243c-1.25,0-2.52-.07-3.74-.15a42.49,42.49,0,0,0-4.93-.11,1.25,1.25,0,0,1-.14-2.5,45.62,45.62,0,0,1,5.22.11c1.19.07,2.43.14,3.6.14a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M472.5,233a1.25,1.25,0,0,1,0-2.5c1.46,0,2.95-.13,4.39-.25a48.2,48.2,0,0,1,5.41-.25,1.25,1.25,0,0,1,1.21,1.29,1.27,1.27,0,0,1-1.29,1.21,45.31,45.31,0,0,0-5.12.24c-1.49.13-3,.26-4.59.26Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M473,227.25a1.25,1.25,0,0,1-.31-2.46,40.15,40.15,0,0,1,11.14-1,1.25,1.25,0,1,1-.15,2.5,37.41,37.41,0,0,0-10.36,1A1.25,1.25,0,0,1,473,227.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M518.75,239.75a1.25,1.25,0,0,1,0-2.5c2.07,0,5.69-.13,9-.25a1.25,1.25,0,1,1,.09,2.5C524.51,239.62,520.86,239.75,518.75,239.75Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M517.75,235.5a1.25,1.25,0,0,1-.19-2.49,39.94,39.94,0,0,1,6.62-.28l1.82,0a1.25,1.25,0,0,1,0,2.5l-1.85,0a38.16,38.16,0,0,0-6.21.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M542.16,236.15a7.76,7.76,0,0,1-.82,0,5.72,5.72,0,0,1-4.17-2.31,6.49,6.49,0,0,1-.72-5.35,3.89,3.89,0,0,1,2.29-2.58c3-1.57,8.68-3.08,11.54-1.37a3.39,3.39,0,0,1,1.72,2.66c.25,2.56-2.09,5.4-3.36,6.54A10.13,10.13,0,0,1,542.16,236.15Zm4.82-9.92a17.25,17.25,0,0,0-7.15,1.88l-.18.08a1.42,1.42,0,0,0-.82,1,4,4,0,0,0,.36,3.13,3.24,3.24,0,0,0,2.41,1.29,7.54,7.54,0,0,0,5.36-1.8c1.32-1.19,2.66-3.26,2.54-4.44a.91.91,0,0,0-.51-.75A4.07,4.07,0,0,0,547,226.23Zm-7.73.77h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M538.5,227.75a1.25,1.25,0,0,1-1-.45,4.76,4.76,0,0,1-.92-2,1.25,1.25,0,0,1,1.09-1.48,3.57,3.57,0,0,1,2.5.67,2.31,2.31,0,0,1-1.7,3.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M549.25,226a1.72,1.72,0,0,0-2.39-.31,1.25,1.25,0,0,1-.79-1.58,3.66,3.66,0,0,1,1.82-2.2,1.25,1.25,0,0,1,1.72.66,5.17,5.17,0,0,0,.29.57,5.47,5.47,0,0,1,.57,1.31,1.25,1.25,0,0,1-1.21,1.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M533,244a1.25,1.25,0,0,1-.51-2.39c4.39-1.94,9.74-3,14.45-4,1.23-.25,2.43-.5,3.59-.76l1.25-.28a41.06,41.06,0,0,1,5.87-1,1.25,1.25,0,1,1,.19,2.49,39.3,39.3,0,0,0-5.51,1l-1.26.29c-1.17.26-2.38.51-3.62.76-4.82,1-9.8,2-13.95,3.85A1.25,1.25,0,0,1,533,244Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M538.5,293.5a1.25,1.25,0,0,1,0-2.5,79.17,79.17,0,0,0,18.59-2.62c.84-.21,1.75-.38,2.72-.56a20.92,20.92,0,0,0,5.82-1.65,1.25,1.25,0,0,1,1.25,2.17,22,22,0,0,1-6.6,1.94c-.93.18-1.81.34-2.59.53a81.57,81.57,0,0,1-19.18,2.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M541.59,299.51h-.87a1.25,1.25,0,0,1,0-2.5h0c7.63.21,15.26-2.72,22.6-5.55l2.92-1.12a1.25,1.25,0,0,1,.88,2.34l-2.91,1.11C557,296.6,549.45,299.51,541.59,299.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M572.38,217.43a8,8,0,0,1-3.12-.53,1.25,1.25,0,0,1,1-2.3c1.75.74,4.88.13,7.64-.41a32.09,32.09,0,0,1,4.32-.66c.54,0,1.08-.08,1.63-.13a19.47,19.47,0,0,1,3.27-.14,1.25,1.25,0,0,1,1.16,1.33,1.23,1.23,0,0,1-1.33,1.16,17.49,17.49,0,0,0-2.85.13c-.58.06-1.17.11-1.75.14a30.63,30.63,0,0,0-4,.62A32.48,32.48,0,0,1,572.38,217.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M584.5,221H571a1.25,1.25,0,0,1,0-2.5h13.5a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.25,283.25c-2.46,0-4.94-.13-7.34-.26-2.84-.15-5.78-.31-8.63-.24h0a1.25,1.25,0,0,1,0-2.5c2.94-.07,5.93.09,8.82.24,2.37.13,4.82.26,7.21.26a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M588.5,286.75H572.75a1.25,1.25,0,0,1,0-2.5H588.5a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M632,210h-.12a37.79,37.79,0,0,1-14-4.64,1.25,1.25,0,1,1,1.18-2.2,35.33,35.33,0,0,0,13,4.36A1.25,1.25,0,0,1,632,210Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M631.25,215.75a1.25,1.25,0,0,1-.42-.07c-1.36-.49-2.75-1.08-4.22-1.71-3.66-1.56-7.44-3.17-10.88-3.22a1.25,1.25,0,1,1,0-2.5c3.93.05,7.94,1.76,11.82,3.42,1.44.61,2.79,1.19,4.08,1.66a1.25,1.25,0,0,1-.42,2.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.66,291.29a4.59,4.59,0,0,1-4.13-2.24,6.26,6.26,0,0,1,.39-6.52,4.15,4.15,0,0,1,4.34-1.75,1.25,1.25,0,0,1,.84.62,5,5,0,0,1-.73,9.86A6.58,6.58,0,0,1,599.66,291.29Zm-1.06-7.92a2,2,0,0,0-.66.61,3.81,3.81,0,0,0-.26,3.8,2.25,2.25,0,0,0,2.42,1,2.52,2.52,0,0,0-.52-5A1.25,1.25,0,0,1,598.6,283.37Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M639.25,294a1.25,1.25,0,0,1-.7-2.28c2.92-2,11-1.56,14.28-.67a1.25,1.25,0,1,1-.65,2.41c-3.16-.86-10.25-1-12.22.33A1.25,1.25,0,0,1,639.25,294Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M636,217.5a1.25,1.25,0,0,1-.61-2.34c3.3-1.83,11.37-3.43,15.33-1.81a1.25,1.25,0,1,1-.95,2.31c-3.11-1.27-10.41.15-13.17,1.69A1.25,1.25,0,0,1,636,217.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M643.45,235.79a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.64-5.27,5.59-4.85h0a5.23,5.23,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M645.13,254.09a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.65-5.27,5.59-4.85h0a5.22,5.22,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M644.82,272.38a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.65-5.26,5.59-4.85h0a5.22,5.22,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M675.75,217a1.25,1.25,0,0,1-.53-.12c-.87-.41-2.74-.3-4.24-.21-.65,0-1.26.07-1.79.07-1.54,0-3.14-.06-4.66-.13s-2.86-.12-4.29-.12a1.25,1.25,0,0,1,0-2.5h0c1.48,0,3,.07,4.39.13s2.95.12,4.42.12h.12c.49,0,1.05,0,1.65-.07,1.87-.11,4-.24,5.44.44a1.25,1.25,0,0,1-.53,2.38Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.5,228.25a1.26,1.26,0,0,1-.47-.09,13.36,13.36,0,0,0-3.59-.54l-1.28-.1a67.49,67.49,0,0,1-12.24-2.62,1.25,1.25,0,0,1-.44-2.18c2.77-2.21,6.45-3.5,10-4.74a49.15,49.15,0,0,0,6.44-2.59,1.25,1.25,0,0,1,1.16,2.21,51.72,51.72,0,0,1-6.78,2.73,47.88,47.88,0,0,0-7.06,2.89,53.81,53.81,0,0,0,9.15,1.8l1.22.09a14.9,14.9,0,0,1,4.35.72,1.25,1.25,0,0,1-.47,2.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M666.44,283.13c-4.71,0-5.74-.45-6.11-1.44a1.25,1.25,0,0,1,2.06-1.32c1.56.5,9.36.15,12.74,0,1.5-.07,2.72-.12,3.38-.13h0a1.25,1.25,0,0,1,.44.08,1.31,1.31,0,0,1,.91,1.26,1.29,1.29,0,0,1-.95,1.21,1.25,1.25,0,0,1-1.4,0l-2.28.1C671.4,283,668.55,283.13,666.44,283.13Zm12.8-.63h0Zm-16.58-1.7h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M239,158.58l-.21,0a73.4,73.4,0,0,1-10.64-2.37,57.77,57.77,0,0,1-5.62-2.28c-3.74-1.67-7.61-3.36-10.84-3.33a1.23,1.23,0,0,1-1.27-1.22,1.25,1.25,0,0,1,1.23-1.27c3.8-.07,7.92,1.76,11.91,3.54a56.19,56.19,0,0,0,5.36,2.19,71.43,71.43,0,0,0,10.3,2.29,1.25,1.25,0,0,1-.21,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M240.33,154.58h-.07a23.16,23.16,0,0,1-7.07-1.93c-.85-.33-1.73-.68-2.59-1-1.62-.55-3.37-1-5.22-1.47-4.74-1.21-9.64-2.47-13.21-5.61a1.25,1.25,0,1,1,1.65-1.87c3.12,2.75,7.72,3.93,12.17,5.06,1.81.46,3.69.94,5.4,1.52.92.31,1.83.67,2.71,1a21,21,0,0,0,6.3,1.76,1.25,1.25,0,0,1-.07,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M200,158.92c-2.45,0-4.2-1.83-4.39-4.59s1.22-5.62,3.88-5.9h0a1.25,1.25,0,0,1,1.6-.57,7,7,0,0,1,3.75,7.29,4.58,4.58,0,0,1-4.71,3.77Zm.62-8.5a1.25,1.25,0,0,1-.87.49c-1.09.12-1.75,1.8-1.65,3.25,0,.7.35,2.32,2,2.26a2.12,2.12,0,0,0,2.33-1.74A4.57,4.57,0,0,0,200.66,150.42Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M252.67,154.58a1.25,1.25,0,0,1,0-2.5,39,39,0,0,0,7.44-.64,1.25,1.25,0,1,1,.47,2.46,41.36,41.36,0,0,1-7.9.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M252.33,149.92a1.25,1.25,0,0,1-.21-2.48,18.9,18.9,0,0,1,2.8-.19,9.51,9.51,0,0,0,3.21-.37,1.25,1.25,0,1,1,1.07,2.26,10.79,10.79,0,0,1-4.24.62,16.86,16.86,0,0,0-2.41.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M295.33,148.92a1.25,1.25,0,0,1-.1-2.5c1.15-.09,2.34-.12,3.5-.16a37.78,37.78,0,0,0,6-.49,1.25,1.25,0,0,1,.48,2.45,39.59,39.59,0,0,1-6.44.54c-1.17,0-2.28.07-3.37.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M295.38,154.58h-.05a1.25,1.25,0,0,1-1.25-1.25,1.27,1.27,0,0,1,1.25-1.25,28.42,28.42,0,0,0,4.5-.5,25.18,25.18,0,0,1,5.92-.5,1.25,1.25,0,1,1-.17,2.49,22.63,22.63,0,0,0-5.33.47A29.61,29.61,0,0,1,295.38,154.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M301.32,98.77a5.18,5.18,0,0,1-1.74-.33c-2.41-.86-3.2-3.61-2.71-5.75a3.86,3.86,0,0,1,4.26-3.26,1.25,1.25,0,0,1,.87,2,4.61,4.61,0,0,1,2.24,5.4A3,3,0,0,1,301.32,98.77Zm-1.57-6.47a2.06,2.06,0,0,0-.44.94c-.25,1.09.11,2.49,1.12,2.85.47.17,1.28.37,1.48-.15a2.16,2.16,0,0,0-1.37-2.44A1.25,1.25,0,0,1,299.75,92.3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M327,87.25H308.67a1.25,1.25,0,0,1,0-2.5H327a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M310,92.25h-2a1.25,1.25,0,0,1,0-2.5h1c3.62,0,7.36,0,11-.17.69,0,1.48,0,2.31,0,1.7,0,3.82.07,4.86-.39a1.25,1.25,0,0,1,1,2.29c-1.54.68-3.76.64-5.92.6-.79,0-1.53,0-2.15,0C316.74,92.24,313.31,92.25,310,92.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.48,117.31c-1.41,0-2.81,0-4.16-.11a1.25,1.25,0,0,1-1.18-1.11,9.07,9.07,0,0,1,1.23-5,7.35,7.35,0,0,0,1.05-3.93,6.4,6.4,0,0,0,2.2-1.49,1.25,1.25,0,0,1,1.74.32l.5.72c1.76,2.5,4.42,6.29,4,9.44a1.25,1.25,0,0,1-1.17,1.08C320.3,117.27,318.89,117.31,317.48,117.31Zm-2.82-2.55c1.87.07,3.8.07,5.69,0-.34-2.07-2.2-4.75-3.43-6.51a11.59,11.59,0,0,1-1.28,3.88A10.13,10.13,0,0,0,314.65,114.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.93,132.87a1.25,1.25,0,0,1-.87-.35c-1.54-1.49-2.12-3.64-2.68-5.72-.47-1.75-.91-3.4-1.85-4.18a1.25,1.25,0,0,1,.57-2.19,1.25,1.25,0,0,1,1.75-.91,10.12,10.12,0,0,0,3.66.28c.74,0,1.5,0,2.19,0a1.25,1.25,0,0,1,1.1,1.68,28.14,28.14,0,0,0-1.06,4.49,24.54,24.54,0,0,1-1.69,6.19,1.25,1.25,0,0,1-.91.69Zm-2.54-10.64a16.54,16.54,0,0,1,1.41,3.92,24.47,24.47,0,0,0,.81,2.63c.27-1,.48-2.16.67-3.26s.4-2.17.66-3.23h-.36A19.72,19.72,0,0,1,315.38,122.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M323,153.58a1.25,1.25,0,0,1-.28,0c-3.24-.73-7-.58-10.64-.43-1.47.06-3,.12-4.42.12a1.25,1.25,0,0,1,0-2.5c1.39,0,2.81-.06,4.32-.12,3.8-.16,7.72-.32,11.29.49a1.25,1.25,0,0,1-.27,2.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M340.6,87.54a5.83,5.83,0,0,1-5.79-4.18A7.23,7.23,0,0,1,338,74.92a2.56,2.56,0,0,0,2.84-.48c3.51.62,5.56,4.49,5.43,7.71a5.26,5.26,0,0,1-4.94,5.36A7.74,7.74,0,0,1,340.6,87.54Zm-.82-11a1.24,1.24,0,0,1-.5.53,4.72,4.72,0,0,0-2.1,5.51A3.44,3.44,0,0,0,341.13,85a2.79,2.79,0,0,0,2.7-3c.08-2.14-1.28-4.78-3.37-5.15A1.24,1.24,0,0,1,339.79,76.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M347,101.58H332.33a1.25,1.25,0,0,1,0-2.5H347a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M347.33,118.25a1.24,1.24,0,0,1-.45-.09c-2.59-1-6.67-.84-10.28-.69-1.28.05-2.49.1-3.6.1a1.25,1.25,0,0,1,0-2.5c1.06,0,2.24,0,3.5-.1,3.85-.16,8.22-.35,11.29.86a1.25,1.25,0,0,1-.46,2.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M356.33,79.58a1.25,1.25,0,0,1,0-2.5c7.22,0,14.81-.33,22.56-1,1-.09,2.15-.15,3.28-.2a35.06,35.06,0,0,0,8.44-1.08,1.25,1.25,0,1,1,.76,2.38,36.78,36.78,0,0,1-9.07,1.2c-1.1.06-2.18.11-3.2.2C371.28,79.25,363.62,79.58,356.33,79.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M358,87.58a1.25,1.25,0,0,1,0-2.5c5.58,0,11.25-.61,16.73-1.17s11.28-1.15,16.94-1.17h0a1.25,1.25,0,0,1,0,2.5c-5.54,0-11.21.6-16.69,1.16s-11.27,1.15-17,1.18Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M373.19,127.89c-4.6,0-9.16-1.46-11.59-5.48a18.94,18.94,0,0,1,0-19.05,13.71,13.71,0,0,1,12.76-6.94h0c9.7.78,14.87,4.9,15.81,12.61.66,5.4.64,13-7.13,16.69A24.1,24.1,0,0,1,373.19,127.89Zm.43-29a11.12,11.12,0,0,0-9.83,5.74,16.6,16.6,0,0,0,0,16.48c3.35,5.52,12.95,4.89,18.3,2.35,4.94-2.34,6.65-6.57,5.72-14.13-.8-6.52-5-9.73-13.51-10.42Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M367.44,123.21H367a1.25,1.25,0,0,1-1.2-1.15c-.32-3.86.8-7.22,1.88-10.47a28.1,28.1,0,0,1,1.69-3.72c1-1.87,1.94-3.8,2-5.27a1.25,1.25,0,0,1,2.15-.79,21.29,21.29,0,0,1,3.1,4.13,15.17,15.17,0,0,0,1.41,2.06,22.93,22.93,0,0,0,2.73,2.5c2.12,1.75,4.3,3.57,5,6.11a1.25,1.25,0,0,1-1.08,1.58,28.36,28.36,0,0,0-7.69,2.39C373.93,121.87,370.7,123.21,367.44,123.21Zm5.86-17.86a34.89,34.89,0,0,1-1.7,3.65,28.41,28.41,0,0,0-3.35,11.68,27.38,27.38,0,0,0,7.85-2.41A39.11,39.11,0,0,1,382.8,116a18.07,18.07,0,0,0-3.59-3.55,25.06,25.06,0,0,1-3-2.8,17.36,17.36,0,0,1-1.65-2.38C374.16,106.63,373.78,106,373.3,105.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M392.33,145.58h-35a1.25,1.25,0,0,1,0-2.5h35a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M363.79,154.26h-6.46a1.25,1.25,0,0,1,0-2.5h3.23c7.16,0,14.57,0,21.67-.66a38.38,38.38,0,0,1,4.64,0c2.65.08,5.65.17,7.31-.54a1.25,1.25,0,1,1,1,2.3c-2.16.93-5.32.83-8.37.74a36.82,36.82,0,0,0-4.32,0C376.32,154.18,370,154.26,363.79,154.26Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M426.47,108.22c-1.47,0-3-.1-4.37-.19-.73,0-1.4-.09-2-.11-3.38-.13-6.82-.48-10.15-.82-3.74-.38-7.61-.78-11.33-.85a1.25,1.25,0,0,1-1.23-1.27,1.24,1.24,0,0,1,1.27-1.23c3.82.07,7.74.47,11.54.86,3.29.34,6.69.69,10,.81.6,0,1.29.07,2,.12,2.74.18,6.5.43,8.23-.35a1.25,1.25,0,1,1,1,2.28A13.1,13.1,0,0,1,426.47,108.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M446.35,89.6c-.93,0-1.85,0-2.77,0-1.69,0-3.44-.08-5.17,0a1.25,1.25,0,1,1-.15-2.5c1.83-.11,3.64-.07,5.38,0a33,33,0,0,0,9.05-.61,1.25,1.25,0,1,1,.61,2.42A28.08,28.08,0,0,1,446.35,89.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M453.67,95.58H439.33a1.25,1.25,0,0,1,0-2.5h14.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M463.67,82.58h-6a1.25,1.25,0,0,1,0-2.5h6a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M462.26,153.33a8.62,8.62,0,0,1-3.07-.51,1.25,1.25,0,0,1,1-2.31c1.1.45,3.63.44,4.44-.17a1.25,1.25,0,1,1,1.51,2A6.56,6.56,0,0,1,462.26,153.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M520,149.25a1.25,1.25,0,0,1-1-2,50,50,0,0,1,8.81-8.32c.92-.74,1.83-1.47,2.71-2.21a1.25,1.25,0,1,1,1.61,1.92c-.9.75-1.82,1.5-2.76,2.24a48.07,48.07,0,0,0-8.38,7.89A1.25,1.25,0,0,1,520,149.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M522.33,153.58a1.25,1.25,0,0,1-1.13-1.78,17,17,0,0,1,3.55-4.58,13.25,13.25,0,0,0,3.08-4,1.25,1.25,0,1,1,2.32.93,15.26,15.26,0,0,1-3.62,4.84,15,15,0,0,0-3.08,3.89A1.25,1.25,0,0,1,522.33,153.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M481.93,87.59h-.31a1.25,1.25,0,1,1,.09-2.5c2.23.08,5-1.11,7.63-2.27a40.11,40.11,0,0,1,4.3-1.68,1.25,1.25,0,0,1,.71,2.4,38.48,38.48,0,0,0-4,1.58C487.53,86.33,484.63,87.59,481.93,87.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M484,92.92a1.25,1.25,0,0,1-.7-2.29c2.45-1.66,5.83-2.61,9.09-3.53,1.52-.43,3-.83,4.18-1.28a1.25,1.25,0,0,1,.86,2.35c-1.31.48-2.79.9-4.36,1.34-3.07.86-6.25,1.76-8.37,3.19A1.24,1.24,0,0,1,484,92.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M555.52,157.85a6.45,6.45,0,0,1-5.64-3.1,8.58,8.58,0,0,1,1.6-10.51c3.37-3.32,6.34-2.72,7.82-2.07,2.79,1.24,4.72,4.63,4.58,8.07a7.61,7.61,0,0,1-5.44,7.08h0A8.89,8.89,0,0,1,555.52,157.85Zm2.5-1.7h0Zm-1.11-12a5.43,5.43,0,0,0-3.68,1.85,6.06,6.06,0,0,0-1.24,7.41c1.13,1.82,3.18,2.38,5.61,1.54h0a5.14,5.14,0,0,0,3.76-4.83,6.07,6.07,0,0,0-3.09-5.68A3.35,3.35,0,0,0,556.92,144.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M570.67,149.58h-4.33a1.25,1.25,0,0,1,0-2.5h4.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M542.6,151.64a9.44,9.44,0,0,1-1.08-.06,1.25,1.25,0,1,1,.29-2.48,8.67,8.67,0,0,0,3.19-.3,1.25,1.25,0,1,1,.67,2.41A11.65,11.65,0,0,1,542.6,151.64Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M549.58,132.21h-.91a1.25,1.25,0,0,1-1.16-1.61,52.47,52.47,0,0,1,3.39-8,42.37,42.37,0,0,0,3.88-9.88,1.25,1.25,0,0,1,2.42-.12,56.07,56.07,0,0,0,2.43,6.07c1.63,3.67,3.32,7.46,3.24,10.94a1.25,1.25,0,0,1-1.06,1.21l-1.26.2A73.36,73.36,0,0,1,549.58,132.21ZM556.15,117a67.5,67.5,0,0,1-3,6.74,65.08,65.08,0,0,0-2.7,6,79.31,79.31,0,0,0,9.71-1.12l.17,0c-.25-2.67-1.58-5.67-3-8.83C556.94,118.82,556.53,117.91,556.15,117Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603,150.25c-2.34,0-5.13-.15-8.08-.32-3.61-.2-7.34-.41-10.56-.35a1.28,1.28,0,0,1-1.27-1.23,1.25,1.25,0,0,1,1.23-1.27c3.33-.06,7.1.15,10.75.35,2.91.16,5.67.31,7.94.31a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M585.67,144.58a1.25,1.25,0,0,1-.4-2.43c4.81-1.65,10.6-1.54,15.7-1.44,1.27,0,2.52,0,3.7,0h0a1.25,1.25,0,0,1,0,2.5c-1.22,0-2.47,0-3.75,0-5.14-.1-10.45-.19-14.85,1.31A1.25,1.25,0,0,1,585.67,144.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M610.35,152.6H609a1.25,1.25,0,0,1,0-2.5h0c3.29.07,7.09-.14,10.76-.35,2.76-.16,5.37-.3,7.54-.31h0a1.25,1.25,0,0,1,0,2.5c-2.11,0-4.68.16-7.41.31C616.71,152.41,613.39,152.6,610.35,152.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M147.76,501.88c-3.43,0-6.88-.24-10.26-.48s-6.79-.48-10.13-.48h0a1.25,1.25,0,0,1-1.25-1.25,1.29,1.29,0,0,1,1.28-1.25c3.43,0,6.92.25,10.31.49,6.05.43,12.31.87,18.12-.13a1.25,1.25,0,1,1,.42,2.46A49.74,49.74,0,0,1,147.76,501.88Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M138.33,525.58h-.1c-.51,0-1-.1-1.53-.15a18.61,18.61,0,0,0-3-.18,1.23,1.23,0,0,1-1.31-1.19,1.25,1.25,0,0,1,1.19-1.31,21.27,21.27,0,0,1,3.38.19c.48.05,1,.11,1.44.14a1.25,1.25,0,0,1-.09,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M146.58,580.92a90.71,90.71,0,0,1-12-1c-.57-.07-1.27-.11-2-.15-2.76-.14-6.19-.31-7.88-2.71a1.25,1.25,0,1,1,2-1.44c1,1.4,3.74,1.54,6,1.65.79,0,1.54.08,2.2.17a95.08,95.08,0,0,0,11.83,1H147c3.33,0,5.73,0,8.49-1.23a1.25,1.25,0,1,1,1,2.29c-3.24,1.43-6,1.43-9.5,1.44h-.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M189.67,506.92h0c-4.84,0-13.33-.8-17.81-1.34a1.25,1.25,0,1,1,.3-2.48c4.42.53,12.79,1.29,17.53,1.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M182.45,514.29c-4.67,0-9.59-.2-13.8-1.43a1.25,1.25,0,0,1,.7-2.4c4.87,1.42,11,1.36,16.42,1.3l3.57,0a1.25,1.25,0,0,1,0,2.5,3.43,3.43,0,0,1-.44,0l-3.1,0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M202.33,564.63c-1.34,0-2.86-.1-4.5-.23-1-.08-1.9-.15-2.5-.15a1.25,1.25,0,0,1,0-2.5c.69,0,1.62.07,2.69.16,1.9.15,6.94.55,7.66-.35a1.25,1.25,0,0,1,2,1.56C206.71,564.28,204.82,564.63,202.33,564.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208.67,570.58h-13a1.25,1.25,0,0,1,0-2.5h13a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M201,581.92h-.23c-2.67-.14-3.68-1.28-4.05-2.21-.54-1.35-.05-3,1.31-4.48s3.48-2.61,5.7-1.88c2.5.83,3.09,2.69,2.82,4.15A5.94,5.94,0,0,1,201,581.92Zm1.39-6.29a3.88,3.88,0,0,0-2.54,1.3c-.71.75-.95,1.51-.81,1.84s.66.59,1.86.65h0a3.45,3.45,0,0,0,3.18-2.39c0-.26.17-.88-1.15-1.31A1.71,1.71,0,0,0,202.38,575.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.35,517.29a22.47,22.47,0,0,1-8.32-1.93,75.86,75.86,0,0,1-7.71-3.87L93,510.76a23.18,23.18,0,0,0-2.32-1c-1.85-.75-3.94-1.6-5.3-3.27a1.25,1.25,0,1,1,1.94-1.58c1,1.17,2.66,1.86,4.3,2.53a25.54,25.54,0,0,1,2.58,1.16l1.34.74a74.18,74.18,0,0,0,7.45,3.74,18.35,18.35,0,0,0,8.25,1.7,1.25,1.25,0,0,1,.22,2.49Q110.91,517.29,110.35,517.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110,522.92a1.25,1.25,0,0,1-.33,0c-3.36-.9-6.88-2.06-10.49-3.27-.66-.22-1.43-.46-2.26-.72-4.57-1.43-10.83-3.38-13.24-6.44a1.25,1.25,0,0,1,2-1.54c1.93,2.45,8,4.35,12,5.6.85.27,1.64.51,2.31.74,3.57,1.2,7,2.34,10.34,3.23a1.25,1.25,0,0,1-.32,2.46Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M114.33,529.92a1.25,1.25,0,0,1-.47-2.41c2.22-.91,5.17-.72,7.78-.55,1,.06,1.89.12,2.7.12a1.25,1.25,0,1,1,0,2.5c-.89,0-1.84-.06-2.86-.13-2.34-.15-5-.32-6.67.37A1.24,1.24,0,0,1,114.33,529.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M121.32,533c-2.07,0-4.35-.2-6-1.25a1.25,1.25,0,0,1,1.35-2.1c1.53,1,4.41.89,6.51.82h.44a1.22,1.22,0,0,1,1.29,1.21,1.25,1.25,0,0,1-1.21,1.29h-.43C122.67,533,122,533,121.32,533Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M204.06,502.94c-1.59,0-3.19-.1-4.71-.19s-2.79-.17-4-.17a1.25,1.25,0,1,1,0-2.5c1.31,0,2.7.08,4.17.17,3.66.22,7.8.47,10.68-.74a1.25,1.25,0,0,1,1,2.31A18.59,18.59,0,0,1,204.06,502.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.65,507.25c-3.38,0-6.75-.28-10-.54-2.19-.18-4.46-.36-6.69-.46a1.25,1.25,0,1,1,.11-2.5c2.28.1,4.57.29,6.79.47,3.21.26,6.52.53,9.8.53h0a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M626.88,500.82c-2.73,0-5.52-.16-8.27-.32-3.4-.19-6.62-.38-9.55-.25a1.25,1.25,0,1,1-.1-2.5c3.05-.12,6.33.06,9.8.26,6.67.38,13.56.77,18.82-1.18a1.25,1.25,0,0,1,.87,2.34A33.57,33.57,0,0,1,626.88,500.82Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M638.67,506.25c-4.2,0-8.52-.31-12.7-.6a122.36,122.36,0,0,0-17.87-.4,1.25,1.25,0,0,1-.2-2.49,124.15,124.15,0,0,1,18.24.4c4.14.29,8.42.6,12.53.6a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M634.9,576.77c-1.72,0-3.45-.16-5.06-.3-1-.09-2-.18-2.9-.23-1.46-.07-2.93-.09-4.49-.11-4.54-.06-9.24-.12-13.52-1.62a1.25,1.25,0,1,1,.83-2.36c3.9,1.37,8.38,1.43,12.73,1.48,1.52,0,3.08,0,4.59.12,1,0,2,.14,3,.23,3.09.28,6.3.57,8.93-.19a1.25,1.25,0,1,1,.69,2.4A17.52,17.52,0,0,1,634.9,576.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M622.24,579.36a123.7,123.7,0,0,1-13.37-.78,1.25,1.25,0,0,1,.27-2.49,111.6,111.6,0,0,0,17.55.66c.93,0,2-.06,3-.06,2.82,0,6,0,8.2-.86a1.25,1.25,0,0,1,.87,2.34c-2.59,1-6,1-9,1-1,0-2,0-2.91.06Q624.58,579.36,622.24,579.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M662.25,493.36a39.46,39.46,0,0,1-6.09-.66,32.89,32.89,0,0,0-3.53-.45,1.25,1.25,0,1,1,.09-2.5,34,34,0,0,1,3.84.48,26,26,0,0,0,7.42.5,31.79,31.79,0,0,0,4.85-1.31c1-.34,2.11-.69,3.19-1a1.25,1.25,0,1,1,.63,2.42c-1,.26-2,.58-3,.93a34.23,34.23,0,0,1-5.24,1.4A13.65,13.65,0,0,1,662.25,493.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M663.41,498.84a35.43,35.43,0,0,1-10.82-1.66,1.25,1.25,0,1,1,.81-2.36c4.77,1.64,14,2.52,18.25-.2a1.25,1.25,0,0,1,1.35,2.1C670.63,498.25,667.07,498.84,663.41,498.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M620.51,540.9a5.16,5.16,0,0,1-4.57-2.22c-2-3-.88-8.07,1.28-11.54,1.94-3.12,4.47-4.72,6.94-4.38h0c4.22.63,6.67,3.05,6.71,6.65.06,4.85-4.34,10.57-8.72,11.33A9.76,9.76,0,0,1,620.51,540.9Zm3-15.68c-1.36,0-2.9,1.19-4.18,3.24-1.92,3.09-2.52,7.05-1.33,8.82.66,1,1.92,1.31,3.73,1,3.15-.55,6.69-5.25,6.65-8.83,0-2.34-1.57-3.76-4.57-4.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M661.55,536.59a4.66,4.66,0,0,1-4.27-2.25c-1.38-2.4-.59-6,.9-8.31,1.32-2,3.12-3.11,4.94-2.93h0a1.25,1.25,0,0,1,.83.18,8.54,8.54,0,0,1,3.58,9,5.74,5.74,0,0,1-5.69,4.35Zm1.18-11a3.33,3.33,0,0,0-2.45,1.81c-1.22,1.89-1.59,4.4-.83,5.71.15.27.62,1.08,2.32,1a3.28,3.28,0,0,0,3.38-2.49,6,6,0,0,0-2.21-6h-.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M685,507.44a75.46,75.46,0,0,1-8.17-.54,1.25,1.25,0,1,1,.27-2.48c5.78.64,12.24,1,16.33-.89a1.25,1.25,0,0,1,1.06,2.26A22.82,22.82,0,0,1,685,507.44Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.67,512.58a1.25,1.25,0,0,1,0-2.5c2.87,0,5.77-.25,8.58-.5,2.64-.23,5.38-.47,8.07-.5h0a1.25,1.25,0,0,1,0,2.5c-2.6,0-5.17.25-7.88.49S679.64,512.58,676.67,512.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M663.94,579.51c-2.27,0-4.67-.17-6.95-.33-2-.14-3.82-.27-5.33-.27a1.25,1.25,0,0,1,0-2.5c1.6,0,3.5.13,5.5.27,4.81.34,10.79.76,13.55-.78a1.25,1.25,0,1,1,1.21,2.19C670,579.19,667.07,579.51,663.94,579.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M662.37,583.61c-2,0-4.06-.11-5.92-.21-1.42-.08-2.76-.15-3.79-.15a1.25,1.25,0,0,1,0-2.5c1.09,0,2.47.07,3.92.15,4.14.22,9.8.53,12.94-.73a1.25,1.25,0,0,1,.93,2.32A22.89,22.89,0,0,1,662.37,583.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M678.95,578c-.41,0-.77,0-1.07,0a1.25,1.25,0,1,1,.25-2.49c1.78.19,6.62-.33,8.56-1.49a1.25,1.25,0,1,1,1.29,2.14C685.8,577.38,681.47,578,678.95,578Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M707,514.25a1.27,1.27,0,0,1-.28,0,1.25,1.25,0,0,1-.95-1.49c.41-1.81,3-1.88,6.57-2a21,21,0,0,0,3.64-.28,1.25,1.25,0,0,1,.68,2.41,20.75,20.75,0,0,1-4.25.37,20.78,20.78,0,0,0-4.34.38A1.25,1.25,0,0,1,707,514.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.67,582.58a1.25,1.25,0,0,1-1-2c3.71-5.15,8.35-9.53,12.43-11.71a1.25,1.25,0,0,1,1.18,2.21c-3.75,2-8.08,6.1-11.57,11A1.25,1.25,0,0,1,587.67,582.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M583.67,576.58a1.25,1.25,0,0,1-1.07-1.9c2.1-3.48,10.42-10.32,14.9-10.93a1.25,1.25,0,0,1,.33,2.48c-3.31.45-11.2,6.6-13.1,9.74A1.25,1.25,0,0,1,583.67,576.58Z" transform="translate(-53.25 -44.96)"/></g><g id="BACKGROUND"><path class="cls-24" d="M479.9,331.07c-37.71,0-75.29-.27-112.34-.54-33.89-.24-68.94-.49-103.29-.53-31.44,0-63.33-.27-94.18-.5-33.44-.25-68-.5-102.1-.5a2,2,0,0,1,0-4c34.1,0,68.68.26,102.13.5,30.83.23,62.72.46,94.15.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08H728a2,2,0,0,1,0,4H665.58c-4,0-8,0-12-.08-7.82-.08-15.9-.17-23.81.08C580.3,330.59,530,331.07,479.9,331.07Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M479.9,306c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.7,0-62.72-.31-92.72-.58-32-.29-65-.59-98.87-.59a2,2,0,1,1,0-4c33.84,0,66.92.3,98.91.59,30,.27,61,.55,92.69.58,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08h56.53a2,2,0,0,1,0,4H665.58c-4,0-8,0-12-.09-7.82-.08-15.9-.17-23.81.08C580.3,305.5,530,306,479.9,306Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,190.86c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.42,0-63.29-.27-94.12-.5l-32.69-.23a2,2,0,0,1-2-2,2,2,0,0,1,2-2l32.69.23c30.82.23,62.68.46,94.09.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08a2,2,0,0,1,0,4c-4,0-8,0-12-.09-7.82-.08-15.9-.17-23.81.08C576.4,190.38,526.09,190.86,476,190.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,165.77c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.52,0-63.48-.27-94.4-.5l-8.79-.06a2,2,0,0,1,0-4h0l8.79.06c30.91.23,62.87.46,94.38.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,3.52-.11,7.36-.17,11.75-.17h0a2,2,0,0,1,0,4c-4.34,0-8.14.06-11.62.17C576.4,165.29,526.09,165.77,476,165.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,475.66c-37.71,0-75.29-.27-112.35-.54-33.89-.24-68.93-.5-103.27-.53-31.45,0-63.35-.27-94.2-.5-33.43-.25-68-.5-102.07-.5a2,2,0,1,1,0-4c34.09,0,68.66.25,102.1.5,30.84.23,62.74.46,94.18.5,34.35,0,69.4.29,103.29.53,86.23.62,175.39,1.26,262.11-1.53,8-.25,16.12-.17,24-.09,4,0,7.95.08,11.91.08,10.39,0,22.44-.2,34.11-.4s23.75-.4,34.17-.4a2,2,0,0,1,0,4c-10.39,0-22.45.2-34.11.4s-23.75.4-34.17.4c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08C576.39,475.19,526.08,475.66,476,475.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M733.78,450.57c-10.44,0-23.51-.53-36.14-1s-25.61-1-36-1c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08-86.79,2.79-176,2.15-262.23,1.53-33.9-.24-69-.5-103.31-.53-31.43,0-63.31-.27-94.14-.5-33.45-.25-68-.5-102.13-.5a2,2,0,1,1,0-4c34.11,0,68.7.25,102.16.5,30.83.23,62.7.46,94.12.5,34.37,0,69.43.29,103.33.53,86.21.62,175.36,1.26,262.07-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08,10.44,0,23.5.53,36.13,1s25.61,1,36,1a2,2,0,0,1,0,4Z" transform="translate(-53.25 -44.96)"/><g class="cls-25"><path class="cls-24" d="M167.18,469.74a2.91,2.91,0,0,1-1.53-.42,4.18,4.18,0,0,1-1.65-3.38h0c-.07-.82-.11-1.66-.15-2.5s-.07-1.56-.13-2.32c-.19-2.42-.29-5.09-.29-8.41a4.24,4.24,0,0,1,1.48-3.58c1.55-1.09,3.5-.4,4.66,0a21.31,21.31,0,0,1,9.27,5.93l.19.21c1.06,1.17,2.65,2.94,2,4.76-.35,1-1.32,1.71-2.88,2.76-.28.19-.52.34-.65.45-.95.78-1.93,1.46-2.89,2.13-.56.39-1.13.78-1.68,1.19-.29.22-.58.45-.88.68a14.2,14.2,0,0,1-3.3,2.15A4.14,4.14,0,0,1,167.18,469.74Zm.91-3.46h0Zm-.66-13.63v.05c0,3.21.09,5.78.28,8.09.06.81.1,1.64.14,2.46s.06,1.38.11,2.06a18.62,18.62,0,0,0,1.61-1.2c.33-.27.66-.53,1-.77.59-.43,1.19-.85,1.79-1.27.93-.65,1.81-1.25,2.63-1.93.19-.16.54-.4,1-.68l.9-.62c-.28-.35-.62-.73-.77-.9l-.22-.25a17.5,17.5,0,0,0-7.61-4.8C167.89,452.79,167.63,452.71,167.43,452.65Zm10,5.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M190.73,469.74a4.13,4.13,0,0,1-1.59-.35,14.22,14.22,0,0,1-3.3-2.15c-.3-.24-.59-.47-.88-.68-.55-.41-1.12-.8-1.69-1.19-1-.66-1.94-1.35-2.89-2.13-.13-.11-.37-.26-.65-.45-1.56-1.05-2.54-1.77-2.88-2.76-.63-1.81,1-3.58,2-4.76l.19-.21a21.32,21.32,0,0,1,9.27-5.93c1.16-.42,3.11-1.11,4.66,0a4.24,4.24,0,0,1,1.48,3.58c0,3.32-.09,6-.29,8.41-.06.76-.1,1.54-.13,2.32s-.08,1.69-.15,2.51a4.18,4.18,0,0,1-1.65,3.38A2.91,2.91,0,0,1,190.73,469.74Zm-9.65-10.88.9.62c.41.28.76.52,1,.68.82.67,1.7,1.28,2.62,1.93.6.42,1.2.83,1.79,1.27.33.24.66.5,1,.77a18.47,18.47,0,0,0,1.61,1.2c0-.68.08-1.37.11-2.07s.08-1.64.14-2.45c.19-2.31.27-4.88.28-8.1v-.05c-.2.05-.46.14-.8.26a17.5,17.5,0,0,0-7.61,4.8l-.22.24C181.71,458.13,181.37,458.5,181.09,458.86Zm-.65-.52" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M102.47,354.23a2,2,0,0,1-1.68-3.08,79.22,79.22,0,0,1,7.43-9.73c6.39-7.21,15.4-12.58,27.57-16.43,11.57-3.66,22.64-7.53,30.94-14.54a2,2,0,0,1,3.25,1.91,18.25,18.25,0,0,1-2,5.36c6.95-2,16.48-6.56,19.26-10a2,2,0,0,1,3.55,1.36,16.94,16.94,0,0,1-3,8.82,65.35,65.35,0,0,0,12.58-2.63c1.46-.41,2.94-.82,4.46-1.21a2,2,0,0,1,2.44,2.41,12.34,12.34,0,0,1-1.78,4c17.25,3.33,36.68,15.6,47.45,30.28a2,2,0,1,1-3.23,2.37c-11-15-31.37-27.27-48.49-29.27a2,2,0,0,1-1-3.57,9.19,9.19,0,0,0,1.26-1.18l-.05,0c-5.93,1.65-11.53,3.21-18.5,2.83a2,2,0,0,1-1.09-3.6,12.31,12.31,0,0,0,3.36-3.87c-6.56,4.13-16.49,7.75-21.54,8.2a2,2,0,0,1-1.7-3.3c.35-.4.71-.85,1.08-1.35-7.71,4.74-16.71,7.82-26,10.77-11.46,3.62-19.89,8.62-25.78,15.27a75.18,75.18,0,0,0-7.06,9.24A2,2,0,0,1,102.47,354.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M119.46,422.75c-6.6,0-13.4-1.41-18.19-5.32-12.68-10.37-18.57-28.31-14.66-44.65,3.5-14.6,13.77-24.79,28.19-27.94a50.34,50.34,0,0,1,13.11-1.2h0c21.69,1,33,17.78,34.56,33.91,1.71,17.53-7.28,37.86-31.21,43.77A50.23,50.23,0,0,1,119.46,422.75Zm6.37-75.16a47.77,47.77,0,0,0-10.17,1.15c-12.86,2.81-22,11.91-25.15,25-3.56,14.88,1.78,31.21,13.3,40.62,6.27,5.12,17.82,5.25,26.5,3.11,21.61-5.34,29.73-23.69,28.19-39.5-1.41-14.42-11.46-29.38-30.77-30.3Q126.79,347.59,125.83,347.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M136.19,391.22c6.18-1.2,8.88-12,3.72-16s-15.21,1.36-14.1,8.27C126.6,388.33,131.25,392.18,136.19,391.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M88.65,512.72a2,2,0,0,1-2-2c0-8.37-.06-16.77-.11-24.89-.19-29.54-.38-57.44,1.85-87a2,2,0,1,1,4,.3c-2.22,29.38-2,57.2-1.84,86.66.05,8.13.11,16.53.11,24.91A2,2,0,0,1,88.65,512.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M263.59,512.72h-.2a2,2,0,0,1-1.79-2.19c1.33-13.41.87-37.17.34-58.37-.17-6.66-.6-13.32-1-19.77-.58-8.87-1.18-18-1.07-27.25a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.1,9.06.49,18.15,1.06,26.95.42,6.49.86,13.2,1,19.93.53,21.33,1,45.23-.36,58.87A2,2,0,0,1,263.59,512.72Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="84.62" cy="334.45" r="2.31"/><path class="cls-24" d="M235.5,423.2a50.2,50.2,0,0,1-11.8-1.43c-23.93-5.91-32.92-26.24-31.21-43.77,1.57-16.13,12.87-32.87,34.56-33.91a50.36,50.36,0,0,1,13.11,1.2c14.42,3.15,24.69,13.33,28.19,27.94,3.91,16.34-2,34.29-14.66,44.65C248.9,421.79,242.1,423.2,235.5,423.2ZM229.13,348q-1,0-1.9,0h0c-19.31.92-29.37,15.89-30.77,30.3-1.54,15.81,6.58,34.16,28.19,39.5,8.68,2.14,20.23,2,26.5-3.11,11.52-9.42,16.87-25.74,13.3-40.62-3.13-13.05-12.29-22.15-25.15-25A47.79,47.79,0,0,0,229.13,348Zm-2-2h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M240.76,389.67c-6.18-1.2-8.88-12-3.72-16s15.21,1.36,14.1,8.27C250.36,386.77,245.71,390.62,240.76,389.67Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="191.83" cy="332.89" r="2.31"/><path class="cls-24" d="M176.13,407.12a13.92,13.92,0,0,1-8.83-3.22h0c-3.83-3.15-3.79-5.86-3.09-7.58,1.81-4.42,9.6-5.72,13.19-5.4s8.38,1.36,10,4.47c.61,1.18,1,3.14-.55,5.76a12,12,0,0,1-8.4,5.76A13.24,13.24,0,0,1,176.13,407.12Zm-6.29-6.31a9.78,9.78,0,0,0,7.89,2.17,8.07,8.07,0,0,0,5.65-3.86c.34-.58.7-1.38.43-1.89-.46-.89-2.73-2-6.77-2.31-3.51-.31-8.45,1.28-9.13,2.93-.27.65.46,1.76,1.93,3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M165.22,420.86a8.93,8.93,0,0,1-5.31-1.66,8,8,0,0,1-3.17-7c.2-4.74,3.51-11.08,9.24-13.51a2,2,0,0,1,1.56,3.68c-4,1.7-6.65,6.51-6.8,10a4,4,0,0,0,1.53,3.62,5.83,5.83,0,0,0,5.35.45l1.06-.39c4.27-1.57,7.64-2.81,13.06-2.09a28.21,28.21,0,0,1,3.13.66c3.48.87,5.69,1.27,7.19-.59s.86-4.43.32-5.75c-1.36-3.33-4.58-6.19-7.32-6.52a2,2,0,0,1,.47-4c4.19.5,8.62,4.27,10.55,9,1.49,3.64,1.16,7.2-.9,9.77-3.21,4-7.87,2.83-11.28,2a25.36,25.36,0,0,0-2.68-.58c-4.44-.58-7.12.4-11.16,1.88l-1.08.39A11.06,11.06,0,0,1,165.22,420.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M176.32,432.68c-2.92,0-5.13-.74-6.72-2.25-2.9-2.77-3-7.44-2.79-12.38a2,2,0,1,1,4,.15c-.14,3.84-.14,7.72,1.55,9.34,1,1,2.74,1.31,5.32,1.09l.2,0c3.29-.28,4-.34,4.67-2.76a36.9,36.9,0,0,0,.84-9.07,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,39.11,39.11,0,0,1-1,10.13c-1.45,5.07-4.72,5.35-8.17,5.65l-.2,0Q177.14,432.68,176.32,432.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M104,352.05a2,2,0,0,1-.74-.14C98,349.85,93.29,344,91.72,337.8c-1.24-4.94-.36-9.51,2.47-12.85,3.35-4,10.47-4.29,15-2.12,4.91,2.34,7.35,5.93,9.93,9.73l1.09,1.6a2,2,0,0,1-3.28,2.28l-1.12-1.63c-2.46-3.63-4.41-6.49-8.34-8.37-3.07-1.46-8.22-1.31-10.25,1.09-2.53,3-2.29,6.71-1.64,9.3,1.25,5,5.08,9.77,9.11,11.37a2,2,0,0,1-.74,3.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M251.49,354a2,2,0,0,1-1.5-3.32c3.8-4.33,11.95-15.11,5.66-21.62-2.51-2.6-7.3-2.47-10.55-1-3.57,1.58-5.83,4.67-8,7.65l-.92,1.25a2,2,0,0,1-3.2-2.4l.9-1.21c2.38-3.25,5.08-6.93,9.62-8.94s11.23-2,15,1.91c6.05,6.27,4,16.12-5.53,27A2,2,0,0,1,251.49,354Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-26"><path class="cls-24" d="M625.88,469.74a2.91,2.91,0,0,1-1.54-.42,4.19,4.19,0,0,1-1.65-3.38c-.07-.82-.11-1.67-.15-2.52s-.07-1.55-.13-2.31c-.19-2.42-.29-5.09-.29-8.41a4.24,4.24,0,0,1,1.48-3.58c1.55-1.09,3.5-.4,4.66,0a21.33,21.33,0,0,1,9.27,5.93l.19.21c1.06,1.17,2.65,2.94,2,4.76-.35,1-1.32,1.71-2.88,2.76-.28.19-.52.34-.65.45-.95.78-1.93,1.46-2.89,2.13-.57.39-1.13.79-1.69,1.2-.29.21-.58.45-.88.68a14.24,14.24,0,0,1-3.3,2.15A4.13,4.13,0,0,1,625.88,469.74Zm.91-3.46h0Zm-.66-13.63v.05c0,3.21.09,5.78.28,8.09.06.81.1,1.63.14,2.44s.07,1.4.12,2.08a18.23,18.23,0,0,0,1.61-1.2c.33-.27.66-.53,1-.77.59-.44,1.19-.85,1.79-1.27.93-.64,1.81-1.25,2.62-1.93.19-.16.54-.4,1-.68l.9-.62c-.28-.35-.62-.73-.77-.9l-.22-.25a17.51,17.51,0,0,0-7.61-4.8C626.59,452.79,626.33,452.71,626.13,452.65Zm10,5.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M649.44,469.74a4.13,4.13,0,0,1-1.59-.35,14.23,14.23,0,0,1-3.3-2.15c-.3-.24-.59-.47-.88-.68-.55-.41-1.12-.8-1.68-1.19-1-.66-1.94-1.35-2.89-2.13-.13-.11-.37-.26-.65-.45-1.56-1.05-2.54-1.77-2.88-2.76-.63-1.81,1-3.58,2-4.75l.19-.21a21.33,21.33,0,0,1,9.27-5.93c1.16-.42,3.11-1.11,4.66,0a4.24,4.24,0,0,1,1.48,3.58c0,3.32-.1,6-.29,8.41-.06.77-.1,1.54-.13,2.32s-.08,1.69-.15,2.51h0a4.19,4.19,0,0,1-1.65,3.38A2.91,2.91,0,0,1,649.44,469.74Zm-9.65-10.88c.32.23.67.47.9.62.41.28.76.52,1,.68.82.67,1.7,1.28,2.63,1.93.6.42,1.2.83,1.79,1.27.33.24.66.5,1,.77a18.42,18.42,0,0,0,1.61,1.2c0-.68.08-1.37.11-2.07s.08-1.64.14-2.45c.18-2.31.27-4.88.28-8.1v-.05c-.2.05-.46.14-.8.26a17.51,17.51,0,0,0-7.61,4.8l-.22.24C640.41,458.13,640.07,458.5,639.79,458.86Zm-.65-.52" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M561.17,354.23a2,2,0,0,1-1.68-3.08,79.07,79.07,0,0,1,7.43-9.73c6.39-7.21,15.4-12.58,27.57-16.43,11.57-3.66,22.64-7.53,30.95-14.54a2,2,0,0,1,3.25,1.91,18.24,18.24,0,0,1-2,5.36c6.95-2,16.48-6.56,19.26-10a2,2,0,0,1,3.55,1.36,16.94,16.94,0,0,1-3,8.82A65.37,65.37,0,0,0,659,315.26c1.46-.41,2.94-.82,4.46-1.21a2,2,0,0,1,2.44,2.42,12.35,12.35,0,0,1-1.78,4c17.25,3.33,36.67,15.59,47.45,30.28a2,2,0,1,1-3.22,2.37c-11-15-31.37-27.27-48.49-29.27a2,2,0,0,1-1-3.57,9.15,9.15,0,0,0,1.26-1.18h-.05c-5.93,1.65-11.54,3.21-18.5,2.83a2,2,0,0,1-1.09-3.6,12.32,12.32,0,0,0,3.36-3.87c-6.57,4.13-16.49,7.75-21.54,8.2a2,2,0,0,1-1.7-3.29c.35-.4.71-.86,1.08-1.35-7.71,4.74-16.72,7.82-26,10.77-11.46,3.62-19.89,8.62-25.78,15.27a75.13,75.13,0,0,0-7.06,9.24A2,2,0,0,1,561.17,354.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M578.17,422.75c-6.6,0-13.4-1.41-18.19-5.32-12.68-10.37-18.57-28.31-14.66-44.65,3.5-14.6,13.77-24.79,28.19-27.94a50.35,50.35,0,0,1,13.11-1.2h0c21.69,1,33,17.78,34.56,33.91,1.71,17.53-7.28,37.86-31.21,43.77A50.23,50.23,0,0,1,578.17,422.75Zm6.37-75.16a47.79,47.79,0,0,0-10.18,1.15c-12.86,2.81-22,11.91-25.15,25-3.56,14.88,1.78,31.21,13.3,40.62,6.27,5.12,17.82,5.25,26.5,3.11,21.61-5.34,29.73-23.69,28.19-39.5-1.41-14.42-11.47-29.38-30.77-30.3Q585.49,347.59,584.53,347.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M571.9,391.22c6.18-1.2,8.88-12,3.72-16s-15.21,1.36-14.1,8.27C562.3,388.33,567,392.18,571.9,391.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M547.36,512.72a2,2,0,0,1-2-2c0-8.37-.06-16.77-.11-24.88-.2-29.54-.38-57.44,1.85-87a2,2,0,0,1,4,.3c-2.22,29.38-2,57.21-1.84,86.66.05,8.12.11,16.52.11,24.91A2,2,0,0,1,547.36,512.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M722.29,512.72h-.2a2,2,0,0,1-1.79-2.19c1.33-13.41.87-37.16.34-58.37-.17-6.66-.6-13.32-1-19.77-.58-8.87-1.17-18-1.07-27.26a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.1,9.06.49,18.16,1.07,27,.42,6.49.86,13.19,1,19.93.53,21.33,1,45.23-.36,58.87A2,2,0,0,1,722.29,512.72Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="520.33" cy="334.45" r="2.31"/><path class="cls-24" d="M694.2,423.2a50.2,50.2,0,0,1-11.8-1.43c-23.93-5.91-32.92-26.24-31.21-43.77,1.57-16.13,12.87-32.87,34.56-33.91a50.16,50.16,0,0,1,13.11,1.2c14.42,3.15,24.69,13.33,28.19,27.94,3.91,16.34-2,34.29-14.66,44.65C707.6,421.79,700.8,423.2,694.2,423.2ZM687.83,348q-1,0-1.9,0h0c-19.31.92-29.37,15.89-30.77,30.3-1.54,15.81,6.58,34.16,28.19,39.5,8.68,2.14,20.23,2,26.5-3.11,11.52-9.42,16.86-25.74,13.3-40.62C720,361.1,710.86,352,698,349.19A47.79,47.79,0,0,0,687.83,348Zm-2-2h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.47,389.67c-6.18-1.2-8.88-12-3.72-16s15.21,1.36,14.1,8.27C686.07,386.77,681.41,390.62,676.47,389.67Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="627.54" cy="332.89" r="2.31"/><path class="cls-24" d="M634.83,407.12A13.92,13.92,0,0,1,626,403.9h0c-3.83-3.15-3.79-5.86-3.09-7.58,1.81-4.42,9.61-5.71,13.19-5.4s8.38,1.36,10,4.47c.61,1.18,1,3.14-.55,5.76a12,12,0,0,1-8.4,5.76A13.24,13.24,0,0,1,634.83,407.12Zm-6.29-6.31a9.78,9.78,0,0,0,7.88,2.17,8.08,8.08,0,0,0,5.65-3.86c.34-.58.7-1.38.43-1.89-.46-.89-2.73-2-6.77-2.31-3.51-.31-8.46,1.28-9.13,2.93-.26.65.46,1.76,1.93,3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M623.92,420.86a8.93,8.93,0,0,1-5.31-1.66,8,8,0,0,1-3.17-7c.2-4.74,3.51-11.08,9.23-13.51a2,2,0,0,1,1.56,3.68c-4,1.7-6.65,6.51-6.8,10A4,4,0,0,0,621,416a5.83,5.83,0,0,0,5.35.45l1.06-.39c4.27-1.57,7.64-2.82,13.06-2.09a28.19,28.19,0,0,1,3.13.66c3.48.87,5.7,1.27,7.19-.59s.86-4.43.32-5.75c-1.36-3.33-4.58-6.19-7.32-6.52a2,2,0,1,1,.47-4c4.19.5,8.62,4.27,10.55,9,1.49,3.64,1.16,7.2-.9,9.77-3.21,4-7.87,2.83-11.28,2a25.6,25.6,0,0,0-2.68-.58c-4.44-.58-7.12.4-11.16,1.88l-1.08.39A11.05,11.05,0,0,1,623.92,420.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M635,432.68c-2.92,0-5.13-.74-6.72-2.25-2.9-2.76-3-7.44-2.79-12.38a2,2,0,0,1,4,.15c-.14,3.84-.14,7.72,1.55,9.34,1,1,2.74,1.31,5.32,1.09l.2,0c3.29-.28,4-.34,4.67-2.76a36.89,36.89,0,0,0,.84-9.07,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,39.06,39.06,0,0,1-1,10.13c-1.45,5.07-4.71,5.35-8.17,5.65l-.2,0Q635.84,432.68,635,432.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M562.68,352.05a2,2,0,0,1-.74-.14c-5.21-2.06-9.95-7.87-11.52-14.11-1.24-4.94-.37-9.51,2.46-12.85,3.35-4,10.47-4.29,15-2.12,4.91,2.34,7.35,5.93,9.93,9.74l1.09,1.59a2,2,0,1,1-3.29,2.28l-1.12-1.63c-2.46-3.63-4.41-6.5-8.34-8.37-3.07-1.47-8.23-1.31-10.25,1.09-2.53,3-2.29,6.71-1.64,9.3,1.25,5,5.08,9.77,9.11,11.37a2,2,0,0,1-.74,3.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M710.2,354a2,2,0,0,1-1.5-3.32c3.8-4.33,11.95-15.11,5.66-21.62-2.51-2.6-7.3-2.47-10.54-1-3.57,1.58-5.83,4.67-8,7.65l-.92,1.25a2,2,0,0,1-3.2-2.4l.89-1.21c2.38-3.25,5.08-6.93,9.62-8.94s11.23-2,15,1.91c6.05,6.26,4,16.12-5.53,27A2,2,0,0,1,710.2,354Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M658,401.5a2,2,0,0,1-1.75-3c1.28-2.33,6-3.06,16.21-3.8,1.16-.08,2.16-.16,2.84-.23a186.1,186.1,0,0,1,25.3-.51l3.1.08c6.61.14,14.83.32,19.92,3.76a2,2,0,1,1-2.24,3.31c-4.12-2.78-11.69-2.94-17.77-3.08l-3.16-.08a182.21,182.21,0,0,0-24.75.49c-.72.07-1.75.15-3,.24-3.18.23-11.54.84-13.11,1.92A2,2,0,0,1,658,401.5Zm1.75-1h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M550.5,403a2,2,0,0,1-.85-3.81c22.12-10.34,50.14-5.14,64.87-1.12a2,2,0,1,1-1.05,3.86c-14.2-3.88-41.16-8.92-62.13.88A2,2,0,0,1,550.5,403Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-24" d="M476,616.83c-37.71,0-75.29-.27-112.35-.54-33.89-.24-68.93-.5-103.27-.53-31.46,0-63.37-.27-94.23-.5l-35-.25a2,2,0,0,1,0-4h0l35,.25c30.85.23,62.75.46,94.2.5,34.35,0,69.4.29,103.29.53,86.22.62,175.38,1.26,262.11-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08a2,2,0,0,1,0,4c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08C576.39,616.35,526.08,616.83,476,616.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,591.73c-37.71,0-75.28-.27-112.32-.54-33.9-.24-69-.5-103.31-.53-31.4,0-63.25-.27-94.05-.5q-26.27-.19-52.54-.35a2,2,0,0,1,0-4h0q26.28.14,52.55.35c30.8.23,62.64.46,94,.5,34.37,0,69.43.29,103.33.53,86.21.62,175.36,1.26,262.07-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08,5.21,0,11.36.13,19.37.4a2,2,0,0,1,1.93,2.07,2,2,0,0,1-2.07,1.93c-8-.27-14.08-.39-19.24-.39-4,0-8,0-12-.08-7.82-.08-15.9-.17-23.81.08C576.4,591.25,526.09,591.73,476,591.73Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M89,396a2,2,0,0,1-.1-4,88.43,88.43,0,0,0,11.52-1.63c3-.56,6.18-1.15,9.26-1.47a131.34,131.34,0,0,1,15.92-.45c1.88,0,3.77.05,5.71,0,1.54,0,3.15,0,4.81-.07,7.7-.16,16.42-.33,23.09,2.2a2,2,0,0,1-1.42,3.74c-5.94-2.26-14.25-2.09-21.59-1.94-1.69,0-3.33.07-4.88.07-2,0-3.87,0-5.77,0a128,128,0,0,0-15.45.42c-2.92.31-6,.88-8.95,1.43A91.36,91.36,0,0,1,89.1,396Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M256,394.5a2,2,0,0,1-.63-.1c-13.31-4.45-28.4-3-43-1.64-5.39.51-11,1-16.28,1.24a2,2,0,1,1-.15-4c5.21-.2,10.48-.7,16.06-1.23,15-1.42,30.54-2.89,44.65,1.83a2,2,0,0,1-.63,3.9Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M91.67,303.33a2,2,0,0,1-2-2V282.07c0-4.12.11-8.41.34-12.75.09-1.79.1-4.22.11-6.8,0-3.27,0-6.64.22-8.83a2,2,0,1,1,4,.35c-.18,2-.19,5.31-.21,8.49,0,2.62,0,5.1-.12,7-.22,4.33-.33,8.44-.33,12.55v19.26A2,2,0,0,1,91.67,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.33,303.33a2,2,0,0,1-2-2V222.5a2,2,0,0,1,4,0v78.83A2,2,0,0,1,110.33,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M122.33,303.74a2,2,0,0,1-.93-.23c-1.39-.73-1.91-2.27-2.88-11.69-.08-.74-.14-1.34-.19-1.73-.64-5.16-1.33-10.52-2-16-2.33-18.08-4.73-36.78-6-53.83a2,2,0,1,1,4-.29c1.23,16.93,3.63,35.58,5.95,53.61.7,5.47,1.39,10.83,2,16,.05.41.12,1,.2,1.81.2,1.92.78,7.61,1.31,9a2,2,0,0,1-1.48,3.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M151.33,298.33a2,2,0,0,1-2-1.91,53.62,53.62,0,0,0-1.07-6.68c-.3-1.53-.62-3.1-.83-4.51-.49-3.15-1-6.3-1.55-9.46-.38-2.26-.75-4.52-1.12-6.79-.75-4.62-1.46-9.25-2.18-13.88-2.2-14.2-4.47-28.86-7.59-43.13-5.25-.24-12.81-.26-17,3.52a2,2,0,1,1-2.67-3c5.43-4.85,13.91-4.84,21.43-4.46a2,2,0,0,1,1.85,1.56c3.33,14.87,5.69,30.12,8,44.88.72,4.62,1.43,9.24,2.17,13.86q.55,3.38,1.12,6.76c.53,3.17,1.06,6.34,1.55,9.51.21,1.33.51,2.86.81,4.35a55.52,55.52,0,0,1,1.14,7.28,2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M138.56,304a2,2,0,0,1-.14-4,17.88,17.88,0,0,0,5.7-1.36c.58-.22,1.13-.44,1.7-.59a11.3,11.3,0,0,0,2.52-1.24c.58-.34,1.18-.7,1.81-1a2,2,0,0,1,1.71,3.61c-.46.22-1,.51-1.49.83a14.58,14.58,0,0,1-3.48,1.65c-.38.1-.82.27-1.33.47a21.89,21.89,0,0,1-6.85,1.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M153.33,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.06-3.86.13-7.85,0-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.1-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.44.33,26.71,1,38.39.41,7.12.49,14.44.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,153.33,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M170.33,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.2s-.17-4.93-.17-7.48v-7.94c0-22,0-44.68,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.37-.27-5-1.78-2.09-8.12-1.15-12.31-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.77,38.77,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.86-1,66.78v7.95c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,170.33,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M527.75,303.33a2,2,0,0,1-2-2V222.5a2,2,0,0,1,4,0v78.83A2,2,0,0,1,527.75,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M539.75,303.74a2,2,0,0,1-.93-.23c-1.39-.73-1.91-2.27-2.88-11.68-.08-.74-.14-1.35-.19-1.75l-.58-4.7c-2.64-21.32-5.92-47.86-7.42-68.57a2,2,0,0,1,4-.29c1.49,20.6,4.76,47.09,7.4,68.37l.58,4.7c.05.41.12,1.05.2,1.83.2,1.91.78,7.59,1.31,9a2,2,0,0,1-1.48,3.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M568.75,298.33a2,2,0,0,1-2-1.91,53.52,53.52,0,0,0-1.07-6.67c-.3-1.53-.62-3.11-.84-4.52-.49-3.15-1-6.3-1.54-9.46-.38-2.26-.75-4.52-1.12-6.79-.75-4.62-1.46-9.25-2.18-13.88-2.19-14.18-4.46-28.83-7.58-43.08-6.43.09-17.21,2.45-21.34,6.14a2,2,0,0,1-2.67-3c5.46-4.88,18.89-7.47,25.72-7.12a2,2,0,0,1,1.85,1.56c3.33,14.87,5.69,30.13,8,44.88.72,4.62,1.43,9.24,2.17,13.85.36,2.25.74,4.51,1.12,6.76.53,3.17,1.06,6.34,1.55,9.51.21,1.33.51,2.87.81,4.35a55.44,55.44,0,0,1,1.14,7.27,2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M556,304a2,2,0,0,1-.14-4,17.89,17.89,0,0,0,5.7-1.36c.58-.22,1.13-.44,1.7-.59a11.29,11.29,0,0,0,2.52-1.24c.58-.34,1.18-.7,1.81-1a2,2,0,1,1,1.71,3.61c-.46.22-1,.51-1.49.82a14.58,14.58,0,0,1-3.48,1.65c-.38.1-.82.27-1.33.47a21.89,21.89,0,0,1-6.85,1.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M570.75,302.67a2,2,0,0,1-2-2c0-2,0-4.06.07-6.1.06-3.86.13-7.85-.05-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,570.75,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.75,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.84-.16-7.2s-.17-4.93-.17-7.48v-7.93c0-22,0-44.69,1-67,0-.33,0-.69.06-1.08.08-1.2.29-4.37-.27-5-1.78-2.09-8.12-1.15-12.31-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.68-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.87-1,66.8v7.93c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,587.75,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M175.66,301.33a2,2,0,0,1-2-1.66,70.59,70.59,0,0,1-.53-13.69,87.77,87.77,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.77,90.77,0,0,1,.15,10.86,66.62,66.62,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M180.34,197.94a62.68,62.68,0,0,1-7-.33,2,2,0,1,1,.46-4,105.46,105.46,0,0,0,14.11.14c2.39-.08,4.65-.15,6.72-.15a2,2,0,0,1,2,2,2,2,0,0,1-2,2h0c-2,0-4.24.07-6.6.15C185.46,197.85,182.85,197.94,180.34,197.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M197.66,303.33a2,2,0,0,1-2-1.65,139.45,139.45,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59v-4.22a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4A135.63,135.63,0,0,0,199.64,301,2,2,0,0,1,198,303.3,2.05,2.05,0,0,1,197.66,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M207,212.49a2,2,0,0,1-.5-.06c-2.37-.61-8.13-.82-11.23-.84a2,2,0,1,1,0-4c2.94,0,9.26.2,12.22,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21A2,2,0,0,1,208,303Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M239.67,304h0a2,2,0,0,1-2-2c0-2.18-.07-5-.16-8s-.18-5.94-.18-8.58c0-15.56-.34-31.45-.67-46.8-.29-13.42-.59-27.3-.66-40.92a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c.07,13.58.37,27.45.66,40.85.33,15.38.68,31.28.68,46.89,0,2.59.09,5.57.18,8.46s.18,5.89.16,8.15A2,2,0,0,1,239.67,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M238,199.67a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.73,0c-1.77,0-3.59,0-5.36,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,1,1-1.69-3.63c2.26-1,5-1.11,7.28-1.15l1.16,0c1.87-.07,3.74,0,5.56,0l2.68,0c4.73,0,11.73.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M430.83,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.71,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,430.83,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M447.83,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.21s-.17-4.93-.17-7.47v-8c0-22,0-44.66,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,4.94.17,7.33s.17,4.87.17,7.35A2,2,0,0,1,447.83,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M453.16,301.33a2,2,0,0,1-2-1.66,70.61,70.61,0,0,1-.53-13.69,87.64,87.64,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.75,90.75,0,0,1,.15,10.86,66.58,66.58,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M457.84,197.94a62.68,62.68,0,0,1-7-.33,2,2,0,1,1,.46-4,105.2,105.2,0,0,0,14.11.14c2.41-.08,4.65-.13,6.77-.15a2,2,0,0,1,0,4h0c-2,0-4.24.07-6.6.15C463,197.85,460.35,197.94,457.84,197.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M475.16,303.33a2,2,0,0,1-2-1.65,139.55,139.55,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59v-4.22a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4A135.64,135.64,0,0,0,477.13,301a2,2,0,0,1-1.62,2.32A2,2,0,0,1,475.16,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M484.5,212.49a2,2,0,0,1-.5-.06c-2.37-.61-8.13-.84-11.22-.84h0a2,2,0,1,1,0-4h0c2.94,0,9.26.2,12.22,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M485.5,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21a2,2,0,0,1-1.83,2.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M517.17,304h0a2,2,0,0,1-2-2c0-2.18-.07-5-.16-8s-.18-5.94-.18-8.59c0-15.56-.34-31.44-.67-46.79-.29-13.43-.59-27.31-.66-40.93a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c.07,13.58.37,27.45.66,40.86.33,15.38.67,31.28.67,46.88,0,2.59.09,5.58.18,8.47s.18,5.89.16,8.15A2,2,0,0,1,517.17,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M515.5,199.67a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.73,0c-1.77,0-3.59,0-5.36,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,0,1-1.69-3.63c2.26-1,5-1.11,7.28-1.15l1.16,0c1.87-.07,3.74,0,5.56,0l2.68,0c4.73,0,11.73.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M637.34,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.71,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,637.34,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M654.34,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.2s-.17-4.93-.17-7.48v-8c0-22,0-44.66,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,654.34,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M659.67,301.33a2,2,0,0,1-2-1.66,70.61,70.61,0,0,1-.53-13.69,87.64,87.64,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,1,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.75,90.75,0,0,1,.15,10.86,66.58,66.58,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M681.67,303.33a2,2,0,0,1-2-1.65,139.55,139.55,0,0,1-1.7-17.26c-1.2-25.62-1.32-50.17-1.33-73.13a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,22.91.13,47.4,1.33,72.94A135.64,135.64,0,0,0,683.64,301a2,2,0,0,1-2,2.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M692,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.2-.08-30.69-.17-45.66l-.06-11.11a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2l.06,11.11c.08,15,.17,30.47.17,45.68,0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21A2,2,0,0,1,692,303Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M253,303.33a2,2,0,0,1-1.19-.4c-.74-.55-1.6-1.25-2.51-2-2.68-2.19-6.36-5.2-8.67-5.64a2,2,0,1,1,.75-3.93c3.31.63,7.27,3.87,10.46,6.47.87.72,1.7,1.39,2.37,1.89a2,2,0,0,1-1.2,3.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M241.33,293a2,2,0,0,1-1.94-2.48c2.64-10.63,9.2-19.77,15.55-28.61,2-2.82,3.94-5.48,5.73-8.19,3.93-5.95,7.81-12.09,11.57-18,4.56-7.21,9.27-14.66,14.11-21.83.44-.66.89-1.29,1.33-1.91a29.33,29.33,0,0,0,3.24-5.33c.53-1.23,2.4-5.38,4.32-7.35a2,2,0,1,1,2.86,2.79,25,25,0,0,0-3.51,6.14,32.85,32.85,0,0,1-3.65,6.06c-.42.6-.85,1.2-1.28,1.84-4.81,7.13-9.5,14.55-14,21.74-3.77,6-7.66,12.11-11.61,18.09-1.83,2.77-3.86,5.59-5.81,8.32-6.13,8.53-12.46,17.35-14.91,27.24A2,2,0,0,1,241.33,293Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M309.67,212a2,2,0,0,1-1.49-.67c-2.4-2.68-5.79-4.76-9.06-6.77-1.18-.72-2.39-1.47-3.55-2.23a2,2,0,0,1,2.21-3.34c1.1.73,2.23,1.42,3.43,2.16,3.52,2.16,7.16,4.39,10,7.51a2,2,0,0,1-1.49,3.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M254,304.33a2,2,0,0,1-1.92-2.58c.78-2.6,2.65-4.64,4.45-6.62a32.78,32.78,0,0,0,2.18-2.56c2.36-3.22,4.48-6.69,6.54-10.05l3.33-5.44c3.09-5.06,6.29-10.29,9.55-15.45a408.31,408.31,0,0,0,21.48-38.44c.38-.79.77-1.6,1.16-2.42,2-4.17,4.2-8.89,7.47-12.18a2,2,0,1,1,2.84,2.82c-2.78,2.8-4.77,7-6.69,11.07-.4.84-.79,1.67-1.18,2.47a412.46,412.46,0,0,1-21.69,38.82c-3.25,5.13-6.44,10.35-9.52,15.39l-3.33,5.44c-2.1,3.43-4.27,7-6.73,10.33a35.92,35.92,0,0,1-2.45,2.89c-1.5,1.65-3.06,3.36-3.58,5.09A2,2,0,0,1,254,304.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603.43,303.32a2,2,0,0,1-.75-.15c-.85-.35-1.86-.81-2.93-1.3-3.15-1.45-7.48-3.43-9.81-3.28a2,2,0,1,1-.26-4c3.38-.23,8,1.92,11.75,3.64,1,.47,2,.92,2.77,1.23a2,2,0,0,1-.76,3.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M589.54,296.25a2,2,0,0,1-2-2c-.12-11,3.94-21.45,7.86-31.6,1.25-3.24,2.43-6.29,3.49-9.36,2.31-6.75,4.53-13.67,6.67-20.36,2.6-8.12,5.29-16.51,8.17-24.67.26-.75.54-1.47.81-2.18a29.41,29.41,0,0,0,1.8-6c.2-1.32,1-5.82,2.34-8.2a2,2,0,1,1,3.47,2,25.08,25.08,0,0,0-1.86,6.83,32.91,32.91,0,0,1-2,6.78c-.26.68-.52,1.38-.78,2.1-2.86,8.1-5.54,16.47-8.13,24.56-2.15,6.71-4.37,13.65-6.7,20.44-1.08,3.14-2.33,6.38-3.54,9.51-3.79,9.8-7.7,19.92-7.59,30.11a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M635.33,200.68a2,2,0,0,1-1.11-.33c-3-2-6.8-3.15-10.47-4.27-1.32-.4-2.68-.82-4-1.27a2,2,0,1,1,1.3-3.78c1.25.43,2.52.82,3.87,1.23,3.95,1.21,8,2.45,11.52,4.77a2,2,0,0,1-1.11,3.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.65,304h-.08a2,2,0,0,1-1.92-2.08c.11-2.71,1.4-5.16,2.65-7.53a32.79,32.79,0,0,0,1.47-3c1.47-3.71,2.66-7.6,3.81-11.37l1.86-6.13c1.72-5.67,3.49-11.52,5.36-17.33A408.38,408.38,0,0,0,628.92,214c.17-.86.34-1.74.51-2.64.86-4.53,1.84-9.66,4.17-13.66a2,2,0,1,1,3.46,2c-2,3.41-2.86,8-3.7,12.39-.17.92-.35,1.82-.52,2.69a412.59,412.59,0,0,1-11.24,43c-1.85,5.77-3.63,11.61-5.34,17.26l-1.86,6.13c-1.17,3.85-2.38,7.83-3.92,11.69a35.72,35.72,0,0,1-1.65,3.41c-1,2-2.12,4-2.19,5.82A2,2,0,0,1,604.65,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M310,304.86a2,2,0,0,1-2-1.91c-.52-11.52-.63-20-.34-26,.76-16,.71-32.73.67-48.9,0-13.26-.08-27,.33-40.1a2,2,0,0,1,4,.13c-.41,13.07-.37,26.74-.33,40,0,16.22.1,33-.67,49.1-.28,5.88-.17,14.28.34,25.67a2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M323.33,305.14a2,2,0,0,1-2-2V278.83c0-5.5-.21-11.11-.41-16.53-.3-8.08-.62-16.43-.25-24.7.34-7.62.33-15.47.33-23.06v-2.2c0-2.18.07-4.55.14-7.06a126.8,126.8,0,0,0-.26-17,2,2,0,1,1,4-.46,129.52,129.52,0,0,1,.29,17.58c-.07,2.48-.14,4.82-.14,6.94v2.2c0,7.64,0,15.53-.34,23.24-.36,8.1,0,16.37.25,24.37.21,5.46.42,11.11.42,16.68v24.31A2,2,0,0,1,323.33,305.14Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M340.5,221a2,2,0,0,1-.78-.16c-2.63-1.12-8.49-.91-12.77-.75-1.38.05-2.69.1-3.76.1a2,2,0,0,1,0-4c1,0,2.27,0,3.61-.1,4.92-.18,11-.4,14.49,1.07a2,2,0,0,1-.79,3.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M338.75,305.14a2,2,0,0,1-2-2V289.69c0-11.85.45-23.83.88-35.41s.88-23.52.87-35.28a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,11.84-.44,23.83-.87,35.43s-.87,23.48-.87,35.26v13.45A2,2,0,0,1,338.75,305.14Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M346.25,305.29a2,2,0,0,1-2-2V293c0-9.65-.1-19.65-.19-29.32s-.19-19.77-.19-29.53a2,2,0,1,1,4,0c0,9.74.1,19.78.19,29.49s.19,19.68.19,29.35v10.31A2,2,0,0,1,346.25,305.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M380.14,236.27h-.33c-16.41-.09-27.82-.13-33.94-.13a2,2,0,0,1,0-4c6.12,0,17.54,0,34,.13h1.38v2l2,0C383.19,236.15,381.69,236.27,380.14,236.27Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M380,303.28a2,2,0,0,1-2-2c0-9.68.36-21.38,1-32.94.48-8.65.38-17.78.28-26.61,0-2.51-.06-5-.07-7.44a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,2.44,0,4.92.07,7.42.1,8.9.21,18.09-.28,26.88-.64,11.49-1,23.11-1,32.71A2,2,0,0,1,380,303.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M384.18,302.4a2,2,0,0,1-2-2c-.05-4.06-.14-11.62-.4-16.81-.38-7.67,0-15.44.28-22.95.22-5.06.45-10.3.45-15.42,0-6.33.06-13.14.13-19.74s.13-13.42.13-19.76a2,2,0,0,1,4,0c0,6.35-.06,13.19-.12,19.79s-.12,13.39-.12,19.7c0,5.2-.23,10.49-.45,15.59-.32,7.42-.65,15.09-.28,22.58.26,5.27.36,12.88.41,17a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M425,208c-2.64,0-5.15-.2-7.58-.39-2-.16-3.87-.31-5.84-.36-4.83-.13-9.6.07-13.22.26-2.63.14-10.62.24-13.62.24a2,2,0,0,1,0-4c3,0,10.84-.1,13.41-.23,3.69-.19,8.56-.39,13.53-.26,2.08.05,4.1.21,6.05.37,2.35.19,4.78.38,7.26.38a2,2,0,0,1,0,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M424.5,296a2,2,0,0,1-2-2V279.51c0-12.4.19-24.88.38-37s.37-24.48.37-36.81a2,2,0,0,1,4,0c0,12.36-.19,24.82-.37,36.87s-.37,24.52-.37,36.89V294A2,2,0,0,1,424.5,296Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M657.67,197.33a2,2,0,0,1,0-4c1.61,0,3.14-.17,4.77-.34,1.35-.14,2.75-.28,4.18-.33a2,2,0,0,1,.14,4c-1.29,0-2.56.17-3.91.31-1.65.17-3.35.34-5.15.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M516.67,225.33a2,2,0,0,1-.88-3.8c2.92-1.42,9.36-1.86,12.44-.32a2,2,0,0,1-1.79,3.58c-1.87-.94-7-.59-8.9.34A2,2,0,0,1,516.67,225.33Z" transform="translate(-53.25 -44.96)"/><g class="cls-27"><path class="cls-24" d="M161.5,730.09a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.38.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,161.5,730.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M178.5,730.76h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.21s-.17-4.93-.17-7.47v-7.94c0-22,0-44.67,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a39.88,39.88,0,0,1-5.15.57h0a2,2,0,0,1,0-4,39,39,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.86-1,66.78v7.95c0,2.48.08,4.95.17,7.34s.17,4.87.17,7.35A2,2,0,0,1,178.5,730.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.83,728.76a2,2,0,0,1-2-1.66,70.59,70.59,0,0,1-.53-13.69,87.87,87.87,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.77,90.77,0,0,1,.15,10.86,66.65,66.65,0,0,0,.47,12.91,2,2,0,0,1-1.63,2.31Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M188.51,625.36a62.93,62.93,0,0,1-7-.33,2,2,0,0,1,.46-4,105.22,105.22,0,0,0,14.11.14c2.39-.08,4.65-.15,6.72-.15a2,2,0,1,1,0,4s0,0,0,0c-2,0-4.24.07-6.6.15C193.63,625.28,191,625.36,188.51,625.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M205.83,730.76a2,2,0,0,1-2-1.65,139.57,139.57,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59V623a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4a135.64,135.64,0,0,0,1.64,16.74,2,2,0,0,1-2,2.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.17,639.92a2,2,0,0,1-.5-.06c-2.37-.61-8.12-.84-11.21-.84h0a2,2,0,0,1,0-4h0c2.94,0,9.25.2,12.21,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.17,730.43a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21a2,2,0,0,1-1.83,2.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M246.16,627.1a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.72,0c-1.77,0-3.6,0-5.37,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,1,1-1.69-3.63c2.26-1,5-1.11,7.27-1.15l1.16,0c1.87-.07,3.75,0,5.58,0l2.67,0c4.73,0,11.72.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-28"><path class="cls-24" d="M578.92,730.09a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.39-.38-12.92-.45-19.23-.08-7-.17-14.32-.57-21.34-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.38.41,7.12.49,14.44.57,21.52.07,6.28.15,12.77.45,19.09.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,578.92,730.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M595.92,730.76h0a2,2,0,0,1-2-2c0-2.41-.08-4.84-.16-7.2s-.17-4.93-.17-7.48v-8c0-22,0-44.66,1-66.95,0-.32,0-.68.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.31-.53a39.9,39.9,0,0,1-5.15.57h0a2,2,0,0,1,0-4,39,39,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.22,1.21,7.89,0,.36,0,.69-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,595.92,730.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M611.59,730.75a2,2,0,0,1-.75-.15c-.85-.35-1.86-.81-2.93-1.3-3.15-1.45-7.45-3.44-9.81-3.28a2,2,0,1,1-.26-4c3.38-.21,8,1.92,11.75,3.64,1,.47,2,.92,2.76,1.23a2,2,0,0,1-.76,3.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M597.71,723.68a2,2,0,0,1-2-2c-.12-11,3.94-21.45,7.86-31.6,1.25-3.24,2.43-6.29,3.48-9.36,2.31-6.75,4.53-13.67,6.67-20.36,2.6-8.12,5.29-16.51,8.17-24.67.26-.75.54-1.47.81-2.18a29.33,29.33,0,0,0,1.8-6c.2-1.32,1-5.82,2.34-8.21a2,2,0,0,1,3.47,2,25.08,25.08,0,0,0-1.86,6.83,32.84,32.84,0,0,1-2,6.78c-.26.68-.52,1.38-.78,2.1-2.86,8.1-5.54,16.47-8.13,24.55-2.15,6.71-4.37,13.65-6.7,20.44-1.08,3.14-2.33,6.38-3.54,9.51-3.79,9.8-7.7,19.93-7.59,30.11a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M643.5,628.11a2,2,0,0,1-1.11-.33c-3-2-6.8-3.15-10.47-4.27-1.32-.4-2.68-.82-4-1.27a2,2,0,1,1,1.3-3.78c1.25.43,2.52.82,3.86,1.23,4,1.21,8,2.45,11.52,4.77a2,2,0,0,1-1.11,3.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M612.81,731.47h-.08a2,2,0,0,1-1.92-2.08c.11-2.71,1.4-5.16,2.65-7.53a32.54,32.54,0,0,0,1.47-3c1.47-3.71,2.66-7.61,3.81-11.38l1.86-6.12c1.72-5.67,3.49-11.53,5.36-17.33a408,408,0,0,0,11.13-42.6c.17-.86.34-1.74.51-2.64.86-4.53,1.84-9.66,4.17-13.67a2,2,0,0,1,3.46,2c-2,3.41-2.86,8-3.7,12.4-.17.92-.35,1.82-.52,2.69a412.27,412.27,0,0,1-11.24,43c-1.86,5.77-3.63,11.61-5.34,17.27l-1.86,6.12c-1.17,3.85-2.38,7.83-3.92,11.69a35.94,35.94,0,0,1-1.65,3.41c-1,2-2.12,4-2.19,5.83A2,2,0,0,1,612.81,731.47Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-29"><path class="cls-24" d="M694.89,584.32h-.09a2,2,0,0,1-1.91-2.09,55.68,55.68,0,0,1,1.14-7.28c.29-1.48.6-3,.8-4.34.49-3.16,1-6.33,1.55-9.5q.57-3.38,1.12-6.77c.75-4.62,1.46-9.24,2.18-13.86,2.28-14.75,4.64-30,8-44.87A2,2,0,0,1,709.5,494c7.52-.39,16-.39,21.43,4.46a2,2,0,1,1-2.67,3c-4.23-3.78-11.79-3.76-17-3.52-3.13,14.27-5.4,28.93-7.59,43.13-.72,4.63-1.43,9.26-2.18,13.89q-.55,3.4-1.12,6.79c-.53,3.16-1.05,6.31-1.54,9.46-.22,1.41-.53,3-.83,4.51a53.58,53.58,0,0,0-1.07,6.68A2,2,0,0,1,694.89,584.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M707.66,590h-.15a21.87,21.87,0,0,1-6.85-1.62c-.51-.2-1-.37-1.33-.47a14.59,14.59,0,0,1-3.49-1.65c-.53-.31-1-.6-1.49-.82a2,2,0,1,1,1.71-3.61c.63.3,1.23.65,1.81,1a11.31,11.31,0,0,0,2.52,1.24c.57.16,1.11.37,1.7.59a17.86,17.86,0,0,0,5.7,1.36,2,2,0,0,1-.14,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M692.88,588.65a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.81.45-19.09.08-7.08.17-14.41.57-21.52.67-11.68,1-25,1-38.39a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.5-.33,26.86-1,38.62-.4,7-.49,14.3-.57,21.34-.07,6.32-.15,12.84-.45,19.23-.18,3.85-.12,7.84,0,11.7,0,2,.07,4.08.07,6.11A2,2,0,0,1,692.88,588.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M675.88,589.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-8c0-21.91,0-44.57-1-66.76,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.22-3.79,10.28-2.74,16-1.9a38.94,38.94,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.38,0,.75.06,1.07,1,22.29,1,45,1,66.95v8c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.21A2,2,0,0,1,675.88,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M670.55,587.32l-.34,0a2,2,0,0,1-1.63-2.31,66.62,66.62,0,0,0,.47-12.9,90.82,90.82,0,0,1,.16-10.87c1.92-20.09,1.73-41.2,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,1,1,4,0c0,5.92.05,12,.11,18,.18,20.52.37,41.73-1.57,62a87.71,87.71,0,0,0-.14,10.38,70.56,70.56,0,0,1-.53,13.69A2,2,0,0,1,670.55,587.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M665.88,483.92c-2.51,0-5.12-.08-7.68-.17-2.36-.08-4.59-.15-6.59-.15h-.05a2,2,0,1,1,.05-4c2.07,0,4.33.07,6.72.15a105.2,105.2,0,0,0,14.1-.14,2,2,0,0,1,.46,4A62.84,62.84,0,0,1,665.88,483.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M648.55,589.32a2,2,0,0,1-2-2.35,135.59,135.59,0,0,0,1.64-16.74c1.34-28.56,1.34-55.68,1.33-84.4V481.6a2,2,0,1,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59a139.52,139.52,0,0,1-1.7,17.26A2,2,0,0,1,648.55,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M639.22,498.47a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,639.22,498.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M638.22,589a2,2,0,0,1-1.83-2.8c.8-1.84.67-5.92.57-9.21,0-1.12-.07-2.19-.07-3.15,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,1,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.92,0,1.95.07,3,.12,3.87.25,8.26-.9,10.92A2,2,0,0,1,638.22,589Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M606.55,590a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.67-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M608.22,485.65a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.88-2.13l2.69,0c1.81,0,3.69,0,5.55,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.5-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.58,0-5.34,0l-2.75,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,608.22,485.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M593.22,589.32a2,2,0,0,1-1.2-3.6c.67-.5,1.49-1.17,2.37-1.89,3.18-2.6,7.14-5.84,10.45-6.47a2,2,0,1,1,.75,3.93c-2.31.44-6,3.45-8.67,5.64-.91.75-1.77,1.45-2.51,2A2,2,0,0,1,593.22,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.88,579a2,2,0,0,1-1.94-1.52c-2.45-9.89-8.79-18.71-14.92-27.24-2-2.72-4-5.54-5.81-8.31-4-6-7.85-12.14-11.61-18.09-4.54-7.18-9.24-14.61-14-21.73-.43-.63-.86-1.24-1.28-1.84a32.89,32.89,0,0,1-3.65-6.05,25,25,0,0,0-3.51-6.14,2,2,0,1,1,2.86-2.79c1.92,2,3.79,6.13,4.32,7.35a29.38,29.38,0,0,0,3.24,5.33c.44.62.89,1.25,1.33,1.92,4.84,7.17,9.55,14.62,14.11,21.83,3.76,5.94,7.64,12.08,11.57,18,1.79,2.71,3.7,5.37,5.72,8.19,6.35,8.84,12.91,18,15.55,28.61a2,2,0,0,1-1.94,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M592.22,590.32a2,2,0,0,1-1.91-1.42c-.52-1.73-2.08-3.44-3.58-5.09a36.17,36.17,0,0,1-2.45-2.89c-2.45-3.34-4.62-6.89-6.72-10.31l-3.35-5.49c-3.08-5-6.26-10.25-9.5-15.37A412.7,412.7,0,0,1,543,510.94c-.39-.8-.78-1.63-1.18-2.47-1.92-4.07-3.91-8.27-6.69-11.07a2,2,0,1,1,2.84-2.82c3.26,3.29,5.5,8,7.47,12.18.39.83.78,1.64,1.16,2.43a408.3,408.3,0,0,0,21.47,38.44c3.26,5.15,6.45,10.37,9.54,15.42l3.35,5.48c2.06,3.35,4.18,6.82,6.53,10a32.83,32.83,0,0,0,2.18,2.56c1.8,2,3.67,4,4.45,6.62a2,2,0,0,1-1.92,2.58Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-30"><path class="cls-24" d="M113.55,589.32a2,2,0,0,1-2-2V508.48a2,2,0,0,1,4,0v78.83A2,2,0,0,1,113.55,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M101.55,589.72a2,2,0,0,1-1.48-3.35c.52-1.38,1.11-7.07,1.31-9,.08-.77.15-1.41.2-1.81l.58-4.72c2.63-21.27,5.9-47.75,7.39-68.35a2,2,0,1,1,4,.29c-1.5,20.7-4.78,47.23-7.41,68.55l-.58,4.72c0,.39-.11,1-.19,1.73-1,9.42-1.49,11-2.88,11.69A2,2,0,0,1,101.55,589.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M72.55,584.32h-.09a2,2,0,0,1-1.91-2.09,55.58,55.58,0,0,1,1.14-7.28c.29-1.49.6-3,.81-4.35.49-3.16,1-6.33,1.55-9.5.38-2.25.75-4.51,1.12-6.77.74-4.62,1.46-9.24,2.17-13.86,2.28-14.75,4.64-30,8-44.88A2,2,0,0,1,87.17,494c6.85-.36,20.26,2.25,25.72,7.12a2,2,0,1,1-2.67,3c-4.13-3.69-14.91-6-21.34-6.14-3.12,14.25-5.39,28.9-7.58,43.08-.72,4.63-1.43,9.26-2.18,13.88-.37,2.26-.74,4.53-1.12,6.79-.53,3.16-1.05,6.31-1.54,9.46-.22,1.41-.53,3-.83,4.51a53.65,53.65,0,0,0-1.07,6.68A2,2,0,0,1,72.55,584.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.47,588.65a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.39a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.23-.18,3.86-.11,7.85,0,11.71,0,2,.07,4.08.07,6.11A2,2,0,0,1,210.47,588.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193.47,589.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a39,39,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.95c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.21A2,2,0,0,1,193.47,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M188.14,587.32l-.34,0a2,2,0,0,1-1.63-2.31,66.63,66.63,0,0,0,.47-12.91,90.75,90.75,0,0,1,.15-10.86c1.92-20.09,1.73-41.21,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.95.18,20.52.37,41.74-1.57,62a87.75,87.75,0,0,0-.14,10.38,70.6,70.6,0,0,1-.53,13.69A2,2,0,0,1,188.14,587.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.47,483.92c-2.51,0-5.12-.08-7.68-.17-2.38-.08-4.63-.15-6.64-.15h0a2,2,0,0,1,0-4h.05c2.07,0,4.33.07,6.72.15a105.06,105.06,0,0,0,14.1-.14,2,2,0,0,1,.46,4A62.84,62.84,0,0,1,183.47,483.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M166.14,589.32a2,2,0,0,1-2-2.35,135.67,135.67,0,0,0,1.64-16.74c1.34-28.56,1.34-55.68,1.33-84.4V481.6a2,2,0,0,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59a139.43,139.43,0,0,1-1.7,17.26A2,2,0,0,1,166.14,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M156.8,498.47a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,156.8,498.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M155.81,589a2,2,0,0,1-1.83-2.8c.8-1.84.67-5.92.57-9.21,0-1.12-.07-2.19-.07-3.15,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,1,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.92,0,1.95.07,3,.12,3.87.25,8.26-.9,10.92A2,2,0,0,1,155.81,589Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M124.14,590a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.68-46.88.29-13.41.59-27.28.66-40.87a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M125.81,485.65a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.87-2.13l2.69,0c1.81,0,3.69,0,5.55,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.5-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.58,0-5.35,0l-2.74,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,125.81,485.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.31,494a2,2,0,1,1,0-4c2.48,0,4.91-.19,7.26-.38,2-.16,4-.32,6.06-.37,5-.13,9.84.07,13.53.26,2.43.13,10.08.23,13.41.23a2,2,0,0,1,0,4c-3,0-11-.1-13.61-.24-3.62-.19-8.39-.39-13.22-.26-2,.05-3.85.2-5.85.36C221.45,493.78,218.95,494,216.31,494Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.81,582a2,2,0,0,1-2-2V565.5c0-12.37-.19-24.84-.37-36.89s-.37-24.51-.37-36.87a2,2,0,0,1,4,0c0,12.33.19,24.77.37,36.81s.38,24.55.38,37V580A2,2,0,0,1,216.81,582Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M124.64,511.32a2,2,0,0,1-.87-.2c-1.92-.93-7-1.28-8.9-.34a2,2,0,1,1-1.79-3.58c3.07-1.54,9.51-1.1,12.44.32a2,2,0,0,1-.88,3.8Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-31"><path class="cls-24" d="M625.89,161.66a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.81.45-19.09.08-7.08.17-14.41.57-21.52.67-11.68,1-25,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.5-.33,26.86-1,38.62-.4,7-.49,14.3-.57,21.34-.07,6.31-.15,12.84-.45,19.23-.18,3.85-.12,7.84,0,11.7,0,2,.07,4.08.07,6.11A2,2,0,0,1,625.89,161.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M608.89,162.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-8c0-21.91,0-44.57-1-66.76,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a38.75,38.75,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,66.95v8c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,608.89,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M251.47,162.32a2,2,0,0,1-2-2V81.49a2,2,0,1,1,4,0v78.83A2,2,0,0,1,251.47,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M238.84,164.65a2,2,0,0,1-1.49-3.34c.21-.53.95-3,2.15-12.73l.58-4.72c2.63-21.27,5.9-47.75,7.39-68.34a2,2,0,0,1,4,.29c-1.5,20.7-4.78,47.23-7.41,68.54l-.58,4.72c-1.77,14.33-2.66,14.8-3.7,15.35A2,2,0,0,1,238.84,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.47,157.32h-.09a2,2,0,0,1-1.91-2.09,55.62,55.62,0,0,1,1.14-7.28c.29-1.49.6-3,.81-4.35.49-3.16,1-6.33,1.55-9.51.38-2.25.75-4.51,1.12-6.76.74-4.61,1.46-9.24,2.17-13.86,2.28-14.75,4.64-30,8-44.88A2,2,0,0,1,225.08,67c6.84-.35,20.26,2.25,25.72,7.12a2,2,0,1,1-2.67,3c-4.13-3.69-14.91-6-21.34-6.14-3.12,14.26-5.39,28.9-7.58,43.08-.72,4.63-1.43,9.26-2.18,13.88q-.55,3.39-1.12,6.78c-.53,3.16-1.05,6.32-1.55,9.47-.22,1.41-.53,3-.83,4.51a53.54,53.54,0,0,0-1.07,6.68A2,2,0,0,1,210.47,157.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M224.5,164.58h-.15a18.39,18.39,0,0,1-7.71-2.77,11.93,11.93,0,0,0-1.73-.87,14.6,14.6,0,0,1-3.48-1.65c-.53-.31-1-.6-1.49-.82a2,2,0,1,1,1.71-3.61c.63.3,1.23.65,1.81,1a11.28,11.28,0,0,0,2.52,1.24,12.72,12.72,0,0,1,2.62,1.24,14.89,14.89,0,0,0,6,2.27,2,2,0,0,1-.14,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208.47,161.66a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.22-.18,3.86-.11,7.85,0,11.71,0,2,.07,4.08.07,6.11A2,2,0,0,1,208.47,161.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M191.47,162.32a2,2,0,0,1-2-2c0-2.48.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.17-2.67-.39-6,1.21-7.88,3.21-3.79,10.28-2.74,16-1.9a38.76,38.76,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.57-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.94c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,191.47,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603.56,163.53a2,2,0,0,1-2-2.34c.7-4.07.59-9.54.47-14.84a109.87,109.87,0,0,1,.16-12.13c1.92-20.09,1.74-41.21,1.55-61.63-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.94.18,20.52.37,41.74-1.57,62a107,107,0,0,0-.14,11.66c.12,5.49.24,11.16-.53,15.61A2,2,0,0,1,603.56,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M598.88,56.92c-2.51,0-5.12-.08-7.69-.17-2.36-.08-4.59-.15-6.59-.15h0a2,2,0,0,1-2-2,2,2,0,0,1,2-2c2.07,0,4.33.07,6.72.15a105.14,105.14,0,0,0,14.11-.14,2,2,0,1,1,.46,4A62.66,62.66,0,0,1,598.88,56.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M581.56,162.32a2,2,0,0,1-2-2.35,135.61,135.61,0,0,0,1.64-16.74c1.34-28.54,1.34-55.65,1.33-84.35V54.61a2,2,0,0,1,4,0v4.27c0,28.75,0,55.9-1.34,84.54a139.52,139.52,0,0,1-1.7,17.26A2,2,0,0,1,581.56,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M572.22,71.48a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,572.22,71.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M571.72,163.53a2,2,0,0,1-1.83-2.8c.7-1.62.42-6.14.21-9.44-.1-1.64-.2-3.19-.2-4.45,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,0,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,1.13.09,2.62.2,4.19.27,4.32.56,8.78-.53,11.29A2,2,0,0,1,571.72,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M539.56,163a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.67-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,2-2,2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M541.22,58.66a2,2,0,0,1-.71-3.87c4.15-1.57,11.15-2.13,15.88-2.13l2.68,0c1.82,0,3.7,0,5.56,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.49-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.59,0-5.36,0l-2.73,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,541.22,58.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M349.32,164.65a2,2,0,0,1-2-2c0-2.53-.23-5.64-.47-8.93a109,109,0,0,1-.47-12.06c.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.22a106.6,106.6,0,0,0,.47,11.58c.25,3.37.48,6.55.48,9.23A2,2,0,0,1,349.32,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M331.39,162.32a2,2,0,0,1-2-2c0-2.48.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a38.76,38.76,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.57-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.95c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,331.39,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M326.06,163a2,2,0,0,1-2-2.34c.7-4.06.59-9.38.47-14.52a107.94,107.94,0,0,1,.16-11.92c1.92-20.09,1.73-41.21,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.95.18,20.52.37,41.74-1.57,62a103.64,103.64,0,0,0-.14,11.45c.12,5.33.24,10.84-.53,15.29A2,2,0,0,1,326.06,163Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M321.39,56.92c-2.51,0-5.12-.08-7.69-.17-2.36-.08-4.59-.15-6.59-.15h0a2,2,0,1,1,0-4c2.07,0,4.33.07,6.72.15a105.3,105.3,0,0,0,14.1-.14,2,2,0,1,1,.46,4A62.65,62.65,0,0,1,321.39,56.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M304.06,164.65a2,2,0,0,1-2-2.35,169,169,0,0,0,1.64-19.07c1.34-28.56,1.34-55.68,1.33-84.4V54.61a2,2,0,0,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59A172.17,172.17,0,0,1,306,163,2,2,0,0,1,304.06,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M294.72,71.48a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1a2,2,0,0,1,2,2,2,2,0,0,1-2,2h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,294.72,71.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M293.72,164.65a2,2,0,0,1-1.83-2.8c.82-1.89.66-8.07.56-11.76,0-1.24-.06-2.36-.06-3.25,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,0,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.86,0,1.95.06,3.15.16,6.1.19,11-.89,13.45A2,2,0,0,1,293.72,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.06,163a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.68-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,4,0c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M263.72,58.66a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.87-2.13l2.68,0c1.82,0,3.7,0,5.56,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,1,1-1.69,3.63c-1.49-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.59,0-5.36,0l-2.73,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,263.72,58.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M526.22,162.32a2,2,0,0,1-1.2-3.6c.67-.5,1.5-1.17,2.37-1.89,3.18-2.6,7.14-5.84,10.45-6.47a2,2,0,1,1,.75,3.93c-2.32.44-6,3.45-8.67,5.64-.91.75-1.77,1.45-2.51,2A2,2,0,0,1,526.22,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M537.89,152a2,2,0,0,1-1.94-1.52c-2.45-9.89-8.79-18.71-14.92-27.24-2-2.72-4-5.54-5.81-8.31-4-6-7.85-12.14-11.61-18.09-4.54-7.18-9.24-14.61-14-21.73-.43-.63-.86-1.24-1.28-1.84a32.83,32.83,0,0,1-3.65-6.06,25,25,0,0,0-3.51-6.14A2,2,0,1,1,484,58.26c1.92,2,3.8,6.13,4.32,7.35a29.37,29.37,0,0,0,3.24,5.33c.44.62.89,1.25,1.33,1.91C497.72,80,502.43,87.48,507,94.68c3.76,5.94,7.64,12.08,11.57,18,1.79,2.71,3.7,5.37,5.72,8.19,6.35,8.84,12.91,18,15.55,28.61a2,2,0,0,1-1.46,2.42A2,2,0,0,1,537.89,152Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M469.56,71a2,2,0,0,1-1.49-3.33c2.79-3.12,6.43-5.35,10-7.51,1.2-.74,2.33-1.43,3.43-2.16a2,2,0,0,1,2.21,3.34c-1.16.77-2.37,1.51-3.55,2.23-3.28,2-6.66,4.08-9.06,6.77A2,2,0,0,1,469.56,71Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M525.22,163.32a2,2,0,0,1-1.91-1.42c-.52-1.73-2.08-3.44-3.58-5.09a35.82,35.82,0,0,1-2.45-2.89c-2.46-3.36-4.63-6.91-6.74-10.34l-3.35-5.48c-3.07-5-6.25-10.23-9.49-15.35A412.58,412.58,0,0,1,476,83.94c-.39-.8-.78-1.63-1.18-2.47-1.92-4.07-3.91-8.27-6.69-11.07A2,2,0,1,1,471,67.58c3.26,3.29,5.5,8,7.47,12.18.39.83.78,1.64,1.16,2.42a408.43,408.43,0,0,0,21.47,38.44c3.26,5.14,6.44,10.36,9.53,15.4L514,141.5c2.06,3.37,4.19,6.85,6.55,10.07a32.68,32.68,0,0,0,2.18,2.56c1.8,2,3.67,4,4.45,6.62a2,2,0,0,1-1.92,2.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M175.8,162.31a2,2,0,0,1-.76-3.85c.77-.31,1.74-.76,2.77-1.23,3.73-1.72,8.37-3.86,11.74-3.64a2,2,0,1,1-.26,4c-2.35-.14-6.66,1.83-9.81,3.28-1.07.49-2.08,1-2.93,1.31A2,2,0,0,1,175.8,162.31Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M189.68,155.24h0a2,2,0,0,1-2-2c.11-10.19-3.81-20.32-7.59-30.11-1.21-3.13-2.46-6.36-3.54-9.51-2.32-6.79-4.55-13.73-6.7-20.44-2.59-8.09-5.27-16.45-8.13-24.55-.25-.72-.52-1.41-.78-2.1a32.89,32.89,0,0,1-2-6.78,25,25,0,0,0-1.86-6.83,2,2,0,1,1,3.47-2c1.37,2.39,2.13,6.89,2.34,8.2a29.35,29.35,0,0,0,1.8,6c.27.71.54,1.43.81,2.18,2.88,8.16,5.57,16.55,8.17,24.67,2.14,6.69,4.36,13.62,6.67,20.36,1.05,3.07,2.23,6.13,3.48,9.36,3.92,10.15,8,20.64,7.86,31.6A2,2,0,0,1,189.68,155.24Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M143.89,59.67A2,2,0,0,1,142.78,56c3.49-2.32,7.57-3.56,11.52-4.77,1.35-.41,2.62-.8,3.86-1.23a2,2,0,0,1,1.3,3.78c-1.31.45-2.67.87-4,1.27-3.68,1.12-7.48,2.28-10.48,4.27A2,2,0,0,1,143.89,59.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M174.57,163a2,2,0,0,1-2-1.92c-.07-1.8-1.15-3.85-2.19-5.82a35.88,35.88,0,0,1-1.65-3.41C167.21,148,166,144,164.83,140.2L163,134.1c-1.72-5.67-3.49-11.52-5.35-17.31a412.5,412.5,0,0,1-11.24-43c-.18-.87-.35-1.78-.52-2.69-.84-4.42-1.71-9-3.7-12.4a2,2,0,1,1,3.46-2c2.33,4,3.31,9.14,4.17,13.66.17.9.34,1.78.51,2.64a408.42,408.42,0,0,0,11.13,42.6c1.87,5.82,3.65,11.69,5.37,17.37l1.85,6.09c1.15,3.77,2.33,7.66,3.81,11.36a32.7,32.7,0,0,0,1.47,3c1.25,2.37,2.54,4.82,2.65,7.53a2,2,0,0,1-1.92,2.08Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M469.22,163.85h-.09a2,2,0,0,1-1.91-2.09c.51-11.39.62-19.78.34-25.67-.77-16.11-.72-32.88-.67-49.1,0-13.22.08-26.89-.33-40a2,2,0,0,1,4-.13c.41,13.13.37,26.84.33,40.09,0,16.17-.1,32.9.67,48.9.29,6,.17,14.53-.34,26A2,2,0,0,1,469.22,163.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M455.89,164.13a2,2,0,0,1-2-2V137.82c0-5.58.21-11.22.42-16.68.3-8,.61-16.27.25-24.37-.34-7.72-.34-15.63-.34-23.28V71.32c0-2.12-.07-4.46-.14-6.94a129.62,129.62,0,0,1,.29-17.58,2,2,0,1,1,4,.46,127,127,0,0,0-.26,17c.07,2.51.14,4.87.14,7.05v2.16c0,7.61,0,15.47.33,23.1.37,8.26.05,16.62-.25,24.7-.2,5.42-.41,11-.41,16.53v24.31A2,2,0,0,1,455.89,164.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M438.72,80a2,2,0,0,1-.79-3.84c3.45-1.47,9.57-1.25,14.49-1.07,1.35,0,2.62.1,3.61.1a2,2,0,0,1,0,4c-1.07,0-2.38,0-3.76-.1-4.28-.16-10.15-.37-12.77.75A2,2,0,0,1,438.72,80Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M440.47,164.13a2,2,0,0,1-2-2V148.68c0-11.78-.44-23.72-.87-35.26s-.88-23.59-.87-35.43a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,11.76.44,23.71.87,35.28s.88,23.56.88,35.41v13.45A2,2,0,0,1,440.47,164.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M433,164.28a2,2,0,0,1-2-2V152c0-9.67.09-19.68.19-29.35s.19-19.75.19-29.49a2,2,0,0,1,4,0c0,9.76-.1,19.81-.19,29.53S435,142.32,435,152v10.31A2,2,0,0,1,433,164.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M399.1,95.25c-1.5,0-3.07-.11-3.08-2l2,0v-2h1.37c16.41-.09,27.84-.13,34-.13a2,2,0,1,1,0,4c-6.11,0-17.53,0-33.94.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M399.22,164.65a2,2,0,0,1-2-2c0-10.34-.4-24.44-1-35.1-.49-8.79-.39-18-.28-26.87,0-2.5.06-5,.07-7.43a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,2.45,0,4.94-.07,7.45-.1,8.82-.21,18,.28,26.6.6,10.72,1,24.92,1,35.32A2,2,0,0,1,399.22,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395,163.53h0a2,2,0,0,1-2-2l0-1.28c.06-4.91.16-13.14.39-17.83.37-7.49,0-15.16-.28-22.58-.22-5.11-.45-10.39-.45-15.59,0-6.31-.06-13.12-.12-19.7s-.12-13.44-.12-19.79a2,2,0,1,1,4,0c0,6.33.06,13.16.13,19.76s.13,13.41.13,19.74c0,5.12.23,10.35.45,15.42.33,7.51.66,15.28.28,22.95-.23,4.61-.33,12.79-.39,17.68l0,1.28A2,2,0,0,1,395,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M354.22,67a2,2,0,0,1,0-4c2.48,0,4.91-.19,7.26-.38,2-.16,4-.32,6.06-.37,5-.13,9.83.07,13.53.26,2.42.13,10.07.23,13.41.23a2,2,0,0,1,0,4c-3,0-11-.1-13.62-.24-3.62-.19-8.39-.39-13.22-.26-2,.05-3.85.2-5.84.36C359.37,66.79,356.87,67,354.22,67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M355.5,164.65a2,2,0,0,1-2-2c0-2.37-.2-7.26-.39-12s-.39-9.7-.39-12.15c0-12.37-.19-24.84-.37-36.89S352,77.1,352,64.74a2,2,0,1,1,4,0c0,12.33.19,24.77.37,36.81s.38,24.55.38,37c0,2.37.2,7.26.39,12s.39,9.7.39,12.15A2,2,0,0,1,355.5,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.56,84.32a2,2,0,0,1-.87-.2c-1.92-.93-7-1.28-8.9-.34A2,2,0,1,1,251,80.2c3.07-1.54,9.51-1.1,12.44.32a2,2,0,0,1-.88,3.8Z" transform="translate(-53.25 -44.96)"/></g></g><g id="COLOR-2" data-name="COLOR"><path class="cls-7" d="M348.43,470c-2.63-1-6-1-8.83-1.21-4.22-.38-8.44-.52-12.67-.62-8.68-.21-17.29.23-25.92-.82a58.42,58.42,0,0,0-15.84.35c-4.32.6-8.71,1.09-13,1.84-6.7,1.17-13.45,1.86-20.12,3.25-5.91,1.24-11.79,2.64-17.71,3.83-2.56.52-5.13,1-7.69,1.49-.88.18-3.73.26-4.27,1.08-.74,1.11.42,4.52.63,5.75.67,3.87,1.55,8,3.4,11.51A140.8,140.8,0,0,0,234,508.57c2.85,4.25,4.81,8.24,8.61,11.85a50.38,50.38,0,0,0,12.91,9.06c6.17,2.86,13.11,5.65,19.89,6.31a85.31,85.31,0,0,0,14-.13c2.73-.16,5.46-.65,8.16-1a122,122,0,0,0,14.46-3.5,36.34,36.34,0,0,0,12.24-5.8c7-5.16,12.12-12.82,17.1-19.83a60,60,0,0,0,3.33-5.67,39.58,39.58,0,0,0,2.58-6.66c1.62-4.58,1.84-9.14,2.88-13.77C350.78,476.48,352.27,471.49,348.43,470Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M272.5,468.5c-.55,7,4.53,14,11.81,14,7.66,0,11.95-7.38,12.41-14-3.09-.42-7.19,1.21-10.45,1.23A57.65,57.65,0,0,1,272.5,468.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M290.26,472c-3.34-.13-4.94,3.06-.58,2.67,2.51-.23,5.53-3,1.25-2.83" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M566,470c-2.63-1-6-1-8.83-1.21-4.22-.38-8.44-.52-12.67-.62-8.68-.21-17.29.23-25.92-.82-18.38-2.22-37,.43-55,4.19C455.38,473.24,447,474.6,439,477a22.34,22.34,0,0,0,.84,6.53c.75,3.28,1.14,6.75,2.57,9.82a112.66,112.66,0,0,0,9.11,15.2c2.85,4.25,4.81,8.24,8.61,11.85a50.38,50.38,0,0,0,12.91,9.06c6.17,2.86,13.11,5.65,19.89,6.31a64.13,64.13,0,0,0,22.71-1.38c6.84-1.83,14-4,19.51-8.59,4.69-4,10.07-7.07,14.29-11.55,2.36-2.51,5.09-4.83,7-7.72,2.46-3.72,4-8,5.56-12.17s3.3-8,4.88-12C567.68,480.36,570.64,471.62,566,470Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M492.5,468.5c.12,7,6.16,13.3,13.38,12.25A15.38,15.38,0,0,0,516,474.18a10,10,0,0,0,1.8-4.45c.18-2.63-.45-2.46-2.81-2.49-3.94,0-7.84-.25-11.77-.25C500.19,467,495.9,466.38,492.5,468.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M315,336.21c-3.66-2.95-5.67-7.23-9.3-10.61a61.08,61.08,0,0,0-13.44-9.16c-13.63-7.12-22.83,11.34-15.79,22.31,1.81,2.82,3.9,6.21,5.88,8.72,2.17,2.76,5.2,4.37,6.55,7.9-5.6,3.14-9.54,8.71-14,13.22-4.26,4.27-9.21,8.45-12.54,13.52-6,9.16-8.62,20.26-12.72,30.3-1.67,4.08-3.53,7.71-4.1,11.93.88-.56,2.17-.79,3-1.35-.69,6.27-5.62,4.49-9.37,9.14A81.54,81.54,0,0,0,230,445.5c-2.49,4.82-4,10.2-5.38,15.5a42.67,42.67,0,0,0-1.63,8c-.08,1.43.32,3.13,0,4.52-.24,1.12-2,1.94-2,3,0,5,1.76,2.87,5,2.16,4.82-1.05,9.7-2.48,14.66-3.53,11.74-2.48,23.52-5.57,35.38-7.38,13-2,26.14-1.74,39.38-1.74a121.68,121.68,0,0,1,18.1,1.38c4,.58,8.63-.25,12.5.62,13.48,3.05-4.54,36.54-8,41.74-3.59,5.43-8.81,10.7-13.66,15.14-17.42,16-52.62,19.6-71.13,3.4-3.87-3.39-8.18-6.07-11.48-10-2.56-3.09-4.87-7.49-8.66-8.7-.2,5.41-2.39,12.29-1.1,17.24,1.24,4.78,4.77,10.72,8.52,13.7,10.08,8,23.71,10.68,36.14,12.46,6.95,1,13.36,3.11,19.89,5.3,6.29,2.11,12.84,2.16,19.22,3.75a129.87,129.87,0,0,0,18.63,3.61c19.63,2,38.31,8.92,58.11,10.9,8.06.81,17.29-3,25-5,9.67-2.49,19.64-3.34,29.46-5s19.43-3,29-5c26.08-5.38,52.67-10.58,77.5-20.36,5.66-2.23,6-3,6-9.14,0-4.5.11-9,0-13.5s-.23-9.77-2.39-13.45c-6.66,16.31-24.6,27.61-42.11,29-16.18,1.25-40.74-.14-53-12.53C454.77,514.15,449.39,505,444.5,496c-2.2-4.06-7.86-16-5-20.76,1.8-3,11.67-2,15.14-2.34,7.56-.73,15.16-1.67,22.75-2.42,14.61-1.43,29.36-3.19,44-3.86a166.26,166.26,0,0,1,29.35.78c5.67.76,11.27,2,17,1.57-1.84-6.64-3.32-13.49-5.52-20.14-1.83-5.55-6.93-10.4-10.44-14.94-2.31-3-5.15-5.56-6.5-9.25-1.09-3-.88-6.4-1.87-9.51a106,106,0,0,0-8.23-18.77c-6.24-11.45-12-22.6-21.15-32-2.26-2.33-4.65-4.29-6.76-6.75a20.87,20.87,0,0,0-6.1-5.09c-.54-.29-2.94-1.07-3.1-1.77-.65-3,6.25-6.28,8.11-7.71a21,21,0,0,0,7.09-11.23c1.46-5.57.17-8.86-3.45-13.25s-8.49-6-14.18-6c-6.75,0-10.71,3.57-15.28,8.09a24.4,24.4,0,0,0-5.5,7.9c-1.46,3.52-2.07,7.25-3.21,10.66-1.59-.87-2.6-2.55-4.12-3.59a27,27,0,0,0-8.5-3.24c-4.63-1.12-9.44-1.34-14.09-2.34-4.33-.94-8.63-2.49-12.93-3.73-5.4-1.57-10.35-1.59-16-1.59-12.77,0-25.3.87-38,2-12.39,1.1-25.51,1.3-37.58,4.33a122.83,122.83,0,0,0-13.36,3.92c-2.8,1.05-7.43,1.34-9.43,3A14.6,14.6,0,0,1,315,336.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M229.13,623.25c.89,1.17,1.92,3.92,2.74,4.87,1.3,1.5,2.83,2.79,4.21,4.21a82.17,82.17,0,0,1,6.68,7.93c3.71,4.95,4.32,10.93-.5,15.32-5.63,5.12-13.27,6-20.58,4.77-5.58-.92-8.09-4.39-12-8-2.89-2.68-6.07-4.7-8.76-7.58-3.41-3.66-6.39-7.37-2.9-11.67,3.77-4.65,10.31-6.32,15.92-7.45,3.29-.66,11.72-4.79,14.75-2.82A1.88,1.88,0,0,1,229.13,623.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M566,624.33c-4.5,5.82-7.4,11.21-12.83,16.15s-4.81,10.93-.67,16.68c4.66,6.47,17.4,5.51,23.58,2.74,9-4,18.16-10.94,22.66-20,1.53-3.07,1.13-2.81-1.62-4.79a69.33,69.33,0,0,0-9.77-5.8C581.45,626.37,576.32,625,566,624.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M383.12,470.36c-4.4,2-11.06,9.12-12.45,14-2.15,7.44,4.66,10.07,10.72,8.56,4.63-1.15,8.94-3.74,13.79-4,2.3-.1,4.26.7,6.41,1.39,2.45.79,4.77,1.95,7.27,2.57,6.06,1.51,12.87-1.12,10.72-8.56-1.39-4.83-8.05-12-12.45-14" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M393.83,462.79a18.23,18.23,0,0,0-7.35,2.06c-2.93,1.7-5.13,5.48-1.36,7.86,4.51,2.85,16.6,2.72,20.71-.84,2.88-2.49,2.1-6.25-1.3-7.7A23.59,23.59,0,0,0,393.83,462.79Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M401,490.33c-2.85-1.27-7.34-1.63-10.46-1.34-3.28.31-3.21,2.87-3.58,5.87-.26,2.07-.66,8.48,1.53,9.5,1.47.69,4.55-.06,6.26.11a15.56,15.56,0,0,0,4.83,0C405,503.31,401.23,493.16,401,490.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M510.83,472c-3.34-.13-4.94,3.06-.58,2.67,2.51-.23,5.53-3,1.25-2.83" transform="translate(-53.25 -44.96)"/><path class="cls-33" d="M560.91,668.12c0-1.84.56-4.94-.4-6.62-.74-1.31-2.44-1.5-3.69-2.11a11.57,11.57,0,0,1-5.08-4.89c-3.75-7-.4-12.58,4.49-17.77,2.1-2.22,3.94-4.35,4.32-7.5s-.31-6-.36-9.07c0-1.58.14-3.18.11-4.74,0-.78.26-3.69,0-4.24,1.45,2.88,3.64,5.18,4.62,8.42,1.32,4.38,4,4.19,8,4.76a92.15,92.15,0,0,1,10.5,2c6.07,1.61,14.06,4.53,15.75,11.39.41,1.66,3.47-2.07,3.74-2.9.66-2,.46-4.22.45-6.28,1.23-.16,2.15-1.09,3.38-1.17-.9-1-1.73-2.52-2.91-3.44,1.84-2.05,1.58-3.31-.38-4.65-2.17-1.48-1.34-2.76-1.65-5.3a39.1,39.1,0,0,0-1.89-7.92,58.56,58.56,0,0,0-7.94-14.85c-3.7-5.19-8.79-9.52-13.92-13.24a68.21,68.21,0,0,0-8.86-5.52c-2.45-1.26-6.23-2-8-4.15,1.08-2.54,1.48-5.31,2.46-7.89a13,13,0,0,0,.91-6.71,37.36,37.36,0,0,0-2.8-9c-.76-1.89-1.17-4.3-3.42-4.9-3.36-.9-7.19,2.16-10.17,3.27q-6.93,2.58-14,4.84c-9.38,3-18.89,5.63-28.46,8-25,6.06-50.38,10.09-75.76,14q-11,1.71-22,3.82a57.18,57.18,0,0,0-8.85,2.39c-2.64,1-5.4-.68-8-1.22q-4.67-1-9.35-1.84-9.24-1.73-18.54-3.16c-24.86-3.85-49.68-8.14-74.12-14.14-10.36-2.54-20.65-5.39-30.81-8.66q-7.54-2.43-15-5.18c-2.45-.91-4.91-1.84-7.33-2.83-1.74-.7-3.09-2.28-4.29-.4s-1.61,5.42-2.17,7.66c-1.09,4.37-2.51,9.25-1.29,13.74.72,2.67,3.45,6.2,2.49,9.08-.55,1.66-2.06,1.46-3.53,2.05a37.62,37.62,0,0,0-5.61,2.95,64.39,64.39,0,0,0-18.26,17,58.28,58.28,0,0,0-8,15.09,43.9,43.9,0,0,0-1.84,7.89c-.32,2.28-.07,3.79-1.86,5.29-.72.61-1.35.41-1.48,1.66a4.11,4.11,0,0,0,1.34,2.8c-1.18.92-2,2.49-2.91,3.44,1.24.08,2.16,1,3.38,1.17,0,2.42-.47,5.93,1.21,7.94,1,1.19,2.81,2.33,4,.82s.55-3.19,1.91-4.66c2.44-2.64,6.15-4.18,9.48-5.31a79.51,79.51,0,0,1,14.05-3c3.79-.56,6.63-.61,8.16-4.4.54-1.34,1.66-4.24,2.9-5,1.16,2.17,1.1,4.83,1.3,7.21.32,3.8-.19,8.6,1.75,12,1.64,2.89,4.65,4.7,6.43,7.48a12,12,0,0,1,.35,12.77,10,10,0,0,1-4.13,4.33c-1.71.78-3.68,1.13-3.61,3.32,0,.91.52,1.9.56,2.88.07,1.64,0,3.29.05,4.93.1,8.11.25,15.62-1,23.45-1.39,8.62,2.78,7.83,9.13,11.09,7.41,3.81,14.76,8.81,22.48,11.89,9.71,3.87,21.29,5.47,31.42,8,7.78,1.95,15.39,4.44,23.07,6.74,20.13,6,39.23,12.91,60.46,9.87,29.79-4.26,60-3.23,89.34-10.76,19.65-5,39.24-8.93,58.6-15.13A117.05,117.05,0,0,0,546.43,708c4-2,12.41-4,14.5-8.19,1.47-2.92.11-8.2.07-11.39C560.92,681.63,561,674.88,560.91,668.12Z" transform="translate(-53.25 -44.96)"/><path class="cls-34" d="M399.75,580.86a69.12,69.12,0,0,1,4.48,10.28c.68,1.78,2.41,4.44,2.53,6.3s.46.9-.88,2c-1.09.92-2.07.55-2.95,2a9.39,9.39,0,0,0-.79,3.94,31.94,31.94,0,0,0,.66,8.16c2.37,12.11,1.73,25.25,2.94,37.65.76,7.85,2.22,15,2.26,23.06,0,5.48,3.54,12.13,1.26,17.11-3.09,6.74-8.66,12-13.07,17.81-2.64-1.83-4-6.26-6.06-8.84-2.42-3-5.46-10.59-9.34-11.43-.36-3.59.56-7.58.71-11.2.51-12.06,2.79-23.94,4.6-35.84,1.73-11.41,2.17-22.8,3.15-34.23.11-1.34.63-3.71.2-4.94-1.13-3.26-3.19-4.05-2.63-7.94.47-3.31,2.83-6.07,4.74-8.68C393.71,583.2,396.57,575.41,399.75,580.86Z" transform="translate(-53.25 -44.96)"/></g><g id="LIGHTS"><g class="cls-35"><path class="cls-7" d="M552.25,251c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C552.94,253.89,553,252.63,552.25,251Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M543.3,134.37c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C544,137.27,544,136,543.3,134.37Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M467.29,196.29c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C468,199.18,468,197.91,467.29,196.29Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M664,239.37c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C664.73,242.26,664.78,241,664,239.37Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M395.2,206.7c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C395.9,209.6,396,208.33,395.2,206.7Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M490.21,264.49c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C490.91,267.38,491,266.11,490.21,264.49Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M503.78,95.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C504.48,98.75,504.53,97.48,503.78,95.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M681.87,531.06c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C682.56,534,682.62,532.68,681.87,531.06Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M149,482.09c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C149.72,485,149.78,483.72,149,482.09Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M633.27,482.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C634,485.75,634,484.48,633.27,482.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M179.43,517.52c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C180.13,520.42,180.18,519.15,179.43,517.52Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M165.19,633c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C165.88,635.94,165.93,634.67,165.19,633Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M187.74,639.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C188.44,642.75,188.49,641.48,187.74,639.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M145.49,539.88c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C146.19,542.78,146.24,541.51,145.49,539.88Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M657.92,563.36c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C658.61,566.25,658.67,565,657.92,563.36Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M587.59,553c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36A5.15,5.15,0,0,1,589.4,557C588.28,555.89,588.34,554.63,587.59,553Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M335.84,215.69c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C336.53,218.59,336.58,217.32,335.84,215.69Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M427.19,90.19c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36A5.15,5.15,0,0,1,429,94.19C427.89,93.09,427.94,91.82,427.19,90.19Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M225.82,231.69c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C226.52,234.59,226.57,233.32,225.82,231.69Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M359.42,266.65c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C359.65,267.64,359.67,267.21,359.42,266.65Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M339.39,141c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C339.63,142,339.65,141.57,339.39,141Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M363.07,260.66c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C363.48,262.38,363.51,261.62,363.07,260.66Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M345.15,131.25c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C345.56,133,345.59,132.21,345.15,131.25Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M662.2,258.7c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C662.61,260.41,662.64,259.66,662.2,258.7Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M182.29,542.66c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C182.71,544.37,182.74,543.62,182.29,542.66Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M220.61,677.2c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C221,678.91,221.05,678.16,220.61,677.2Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M116.86,539.75c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C117.27,541.47,117.3,540.71,116.86,539.75Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M669.88,245.85c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C670.29,247.56,670.32,246.81,669.88,245.85Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M592.3,133.64c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C592.71,135.35,592.74,134.6,592.3,133.64Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M99.4,519.52c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C99.81,521.23,99.85,520.48,99.4,519.52Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M629.94,495.14c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C630.35,496.85,630.38,496.1,629.94,495.14Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M578.78,209.48c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C579.19,211.2,579.22,210.45,578.78,209.48Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M498.53,87.64c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95A3,3,0,0,1,499.6,90C498.94,89.35,499,88.6,498.53,87.64Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M621.17,210.72c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C621.58,212.43,621.61,211.68,621.17,210.72Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M129.34,220.08c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C129.57,221.07,129.59,220.63,129.34,220.08Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M133,214.09c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C133.4,215.8,133.43,215.05,133,214.09Z" transform="translate(-53.25 -44.96)"/></g></g><g id="DETAILS-2" data-name="DETAILS"><path class="cls-24" d="M479.33,333.67a1,1,0,0,1-.92-1.38c.22-.54.45-1.1.66-1.64a1,1,0,1,1,1.87.72c-.22.56-.45,1.13-.68,1.69A1,1,0,0,1,479.33,333.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M480.33,337a1,1,0,0,1-.38-1.93.65.65,0,0,0,.39-.55,1,1,0,1,1,2,.29,2.62,2.62,0,0,1-1.61,2.11A1,1,0,0,1,480.33,337Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M483.67,332l-.2,0a1,1,0,0,1-.79-1.18,5.48,5.48,0,0,1,1.22-2.46,1,1,0,0,1,1.52,1.31,3.46,3.46,0,0,0-.78,1.54A1,1,0,0,1,483.67,332Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M483,327.67h-.08a1,1,0,0,1-.91-1.08,2.65,2.65,0,0,1,1.54-2.14,1,1,0,1,1,.92,1.78c-.44.23-.46.45-.46.53A1,1,0,0,1,483,327.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M307,335a1,1,0,0,1-.48-.12,4.52,4.52,0,0,1-1.72-1.72,1,1,0,0,1,1.74-1,2.54,2.54,0,0,0,.94,1A1,1,0,0,1,307,335Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M308.67,340.67a1,1,0,0,1-.7-.29,4.44,4.44,0,0,1-1.27-2.15,1,1,0,0,1,1.95-.46,2.52,2.52,0,0,0,.73,1.18,1,1,0,0,1-.7,1.71Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M304,338.67a1,1,0,0,1-.72-.31,5.2,5.2,0,0,1-1.23-2.05,1,1,0,1,1,1.9-.62,3.2,3.2,0,0,0,.77,1.28,1,1,0,0,1-.72,1.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M302,330.33a1,1,0,0,1-.69-.28,17,17,0,0,1-2.12-2.48,1,1,0,1,1,1.64-1.15,15,15,0,0,0,1.88,2.19,1,1,0,0,1-.69,1.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M261.67,463.67a1,1,0,0,1-.19-2,210.85,210.85,0,0,1,41.19-4,1,1,0,1,1,0,2,208.87,208.87,0,0,0-40.81,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M491.33,461.33a1,1,0,0,1-.46-1.89c3.49-1.78,8.65-1.75,13.18-1.72,1.59,0,3.08,0,4.39-.05l.44,0c4.21-.22,9-.48,13,.38a1,1,0,0,1-.42,2c-3.75-.8-8.37-.55-12.46-.34l-.45,0c-1.36.07-2.89.06-4.5.05-4.32,0-9.21-.05-12.27,1.5A1,1,0,0,1,491.33,461.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M394,506.5a1.5,1.5,0,0,1-1.5-1.5V489.67a1.5,1.5,0,0,1,3,0V505A1.5,1.5,0,0,1,394,506.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M397,686.67h-.14a1,1,0,0,1-.85-1.13,6,6,0,0,1,1.2-2.81,1,1,0,1,1,1.58,1.23,4.05,4.05,0,0,0-.8,1.86A1,1,0,0,1,397,686.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M398.67,689a1,1,0,0,1-1-.89,1.25,1.25,0,0,1,1.43-1.43,1.25,1.25,0,0,1-.33,2.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M372,601a1,1,0,0,1-.35-.06,1.67,1.67,0,0,1-.94-2.23A1.39,1.39,0,1,1,372,601Zm.6-1.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M374.67,599.33a1,1,0,0,1-.65-.24,4,4,0,0,1-1.33-2.22,1,1,0,0,1,2-.42,2,2,0,0,0,.67,1.11,1,1,0,0,1-.65,1.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M420.67,598a1,1,0,0,1-1-1v-3a1,1,0,0,1,2,0v3A1,1,0,0,1,420.67,598Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M192,626.33a1,1,0,0,1-.71-1.7c3.28-3.33,12-4.81,15.58-5.29a1,1,0,0,1,.27,2c-5.45.73-12.1,2.35-14.42,4.71A1,1,0,0,1,192,626.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193,630a1,1,0,0,1-.43-1.9,27.69,27.69,0,0,1,3.3-.75,1,1,0,1,1,.24,2c-.68.08-2.55.55-2.81.63A1,1,0,0,1,193,630Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.33,629.33l-.21,0a21,21,0,0,1-5-2,21.42,21.42,0,0,0-4.71-2,47.68,47.68,0,0,0-12-1.64h0a1,1,0,0,1,0-2,49.77,49.77,0,0,1,12.52,1.69,22.92,22.92,0,0,1,5.16,2.12,19.2,19.2,0,0,0,4.55,1.87,1,1,0,0,1-.21,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M605.67,625.67h0a18.9,18.9,0,0,1-5-1.06,14,14,0,0,0-5.2-.94,1,1,0,0,1-1.08-.91,1,1,0,0,1,.91-1.08,15.42,15.42,0,0,1,6,1,17.07,17.07,0,0,0,4.49,1,1,1,0,0,1,0,2Z" transform="translate(-53.25 -44.96)"/></g><g id="LINEART"><path class="cls-24" d="M561,701a2.5,2.5,0,0,1-2.5-2.5V684.63c0-7-.05-14.7-.17-23.48a2.5,2.5,0,1,1,5-.06c.11,8.8.17,16.5.17,23.54V698.5A2.5,2.5,0,0,1,561,701Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M560.38,634.64a2.5,2.5,0,0,1-2.5-2.46c-.25-14.88-.48-30.71-.42-46.42,0-7.15,0-13.43,0-19.2a2.5,2.5,0,0,1,2.49-2.51h0a2.5,2.5,0,0,1,2.5,2.49c0,5.78,0,12.08,0,19.24-.07,15.65.17,31.46.42,46.31a2.5,2.5,0,0,1-2.46,2.54Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M559.63,541.5a2.5,2.5,0,0,1-2.5-2.44c-.29-12.49-.76-23.82-1.45-34.65a2.5,2.5,0,0,1,5-.31c.68,10.89,1.16,22.29,1.45,34.84a2.5,2.5,0,0,1-2.44,2.56Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M547.24,430.29a2.5,2.5,0,0,1-2.4-1.8q-.26-.9-.53-1.8c-5.82-19.3-15-43.91-34.51-63.11-13.58-13.36-32.91-23.48-57.45-30.09-6.15-1.65-11.36-2.85-16-3.66-17.78-3.15-36.76-2.18-55.12-1.24-4,.21-8.05.41-12,.57-35.32,1.43-66.4,13.65-87.49,34.41-19.51,19.2-28.69,43.81-34.51,63.11a2.5,2.5,0,1,1-4.79-1.44c6-19.87,15.47-45.24,35.79-65.23,22-21.63,54.23-34.36,90.8-35.84,4-.16,8-.37,12-.57,18.64-1,37.91-1.94,56.25,1.31,4.74.84,10.1,2.07,16.38,3.76C479,335.49,499.11,346,513.31,360c20.32,20,29.8,45.36,35.79,65.23q.28.92.55,1.85a2.5,2.5,0,0,1-2.4,3.2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M232,540h0a2.5,2.5,0,0,1-2.46-2.54c.17-9.84.55-19.7,1.1-29.31a2.5,2.5,0,1,1,5,.29c-.55,9.54-.92,19.33-1.1,29.11A2.5,2.5,0,0,1,232,540Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M235.67,635.7a2.5,2.5,0,0,1-2.5-2.38c-.18-3.87-.41-7.43-.7-10.88-1.6-19.07-2.59-38-2.94-56.19a2.5,2.5,0,1,1,5-.1c.35,18.11,1.33,36.91,2.92,55.87.3,3.51.53,7.13.72,11.06a2.5,2.5,0,0,1-2.38,2.62Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M236.44,704.72a2.5,2.5,0,0,1-2.47-2.16c-.71-5.17-.46-6.39,0-7.95.24-.79.55-1.77.36-5.79-.41-9-.49-18.31-.57-27.28v-1.29a2.5,2.5,0,0,1,5,0v1.29c.08,8.93.16,18.16.56,27.1.2,4.52-.14,6.06-.58,7.49-.24.78-.45,1.45.15,5.79a2.5,2.5,0,0,1-2.13,2.82Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M291,354.83a2.49,2.49,0,0,1-1-.23c-7-3.19-17.19-13.06-18.28-23.27-.61-5.75,1.75-10.8,6.83-14.6a16.09,16.09,0,0,1,13.71-3.12c13.11,3,23,20.91,24.85,24.47a2.5,2.5,0,1,1-4.44,2.31c-4.62-8.89-13-20-21.53-21.9a11.15,11.15,0,0,0-9.6,2.25c-3.69,2.76-5.28,6.05-4.85,10.07.85,7.94,9.54,16.56,15.39,19.25a2.5,2.5,0,0,1-1,4.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M497.67,352.83a2.5,2.5,0,0,1-1.55-4.46l1.68-1.32c3.62-2.82,7.72-6,10.47-9.17a14.43,14.43,0,0,0,2.58-15.12c-2-4.73-6.39-7.56-11.94-7.77-11-.44-21.13,11.1-24.17,22a2.5,2.5,0,1,1-4.82-1.34c3.63-13,15.5-26.18,29.17-25.66,7.45.28,13.56,4.31,16.34,10.79A19.45,19.45,0,0,1,512,341.18c-3.06,3.5-7.36,6.85-11.15,9.81l-1.66,1.3A2.49,2.49,0,0,1,497.67,352.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.17,481.17a2.49,2.49,0,0,1-1.79-.76c-2.65-2.72-3.46-6.28-2-9.07a13.19,13.19,0,0,0,.68-3.53c.08-.73.16-1.42.28-2.06a67.86,67.86,0,0,1,7-20.67A68.93,68.93,0,0,1,247.25,421a66,66,0,0,1,97.16,20.76c3,5.36,4.85,11.47,6.64,17.78a3.24,3.24,0,0,0,1.57,2.36c2.67,2.24,3,4.42,2.81,5.86s-1.12,3.55-4.45,5.1a2.5,2.5,0,0,1-2.12-4.53c1.26-.59,1.59-1.12,1.6-1.22s-.14-.6-1.07-1.37a7.5,7.5,0,0,1-3.16-4.82c-1.71-6-3.47-11.82-6.2-16.71A60.88,60.88,0,0,0,250.23,425a64,64,0,0,0-18.46,22.4,63.26,63.26,0,0,0-6.56,19.27c-.09.51-.16,1.11-.23,1.73a15.77,15.77,0,0,1-1.19,5.22c-.34.67-.12,2,1.17,3.33a2.5,2.5,0,0,1-1.79,4.24Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.66,540c-.89,0-1.78,0-2.68-.05a66.06,66.06,0,0,1-63.3-61.13,2.5,2.5,0,0,1,5-.37,61.13,61.13,0,0,0,122-2.13c.08-2,.06-3.93,0-5.88a2.5,2.5,0,1,1,5-.27c.12,2.1.13,4.24,0,6.35A66.22,66.22,0,0,1,286.66,540Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M284.37,485.33a15.13,15.13,0,0,1-15-13.82,2.5,2.5,0,0,1,5-.43,10.13,10.13,0,1,0,20.19-1.76,2.5,2.5,0,0,1,5-.43,15.15,15.15,0,0,1-13.76,16.39C285.26,485.31,284.81,485.33,284.37,485.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.17,481.17a2.5,2.5,0,0,1-.53-4.94l2.9-.63c7.58-1.64,14.74-3.2,22.69-4.56,3.42-.59,6.9-1.29,10.26-2a171.15,171.15,0,0,1,22-3.46c17.18-1.17,34.56-.63,49.51,0,1.58.06,3.28.05,5.09,0,5.17,0,10.51-.05,14.94,1.54a2.5,2.5,0,0,1-1.69,4.71c-3.6-1.29-8.49-1.27-13.22-1.25-1.86,0-3.62,0-5.31,0-14.82-.59-32-1.13-49,0a167.45,167.45,0,0,0-21.4,3.37c-3.4.69-6.92,1.4-10.41,2-7.85,1.35-15,2.89-22.48,4.52l-2.9.63A2.47,2.47,0,0,1,223.17,481.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M439.67,478.95a2.49,2.49,0,0,1-.8-.13c-3.48-1.17-4.63-3.13-5-4.57s-.26-3.61,2.14-6.14a3.25,3.25,0,0,0,1.29-2.52c1.07-6.47,2.23-12.75,4.6-18.41a65.89,65.89,0,0,1,94.21-31.56,68.94,68.94,0,0,1,22.51,21.73,67.86,67.86,0,0,1,9.31,19.75c.19.63.34,1.3.51,2a13.18,13.18,0,0,0,1.08,3.42c1.71,2.61,1.32,6.24-1,9.24a2.5,2.5,0,0,1-4-3.06c1.13-1.46,1.2-2.8.79-3.43a15.75,15.75,0,0,1-1.77-5.05c-.14-.61-.27-1.2-.42-1.7a63.24,63.24,0,0,0-8.68-18.41,64,64,0,0,0-20.86-20.18,61,61,0,0,0-87.09,29.16c-2.16,5.17-3.26,11.13-4.28,17.3a7.5,7.5,0,0,1-2.6,5.15c-.83.88-.93,1.4-.91,1.49s.41.59,1.73,1a2.5,2.5,0,0,1-.8,4.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M502.91,538.8a66.23,66.23,0,0,1-65.32-56.08c-.32-2.1-.55-4.22-.67-6.32a2.5,2.5,0,1,1,5-.29c.11,1.94.32,3.91.62,5.85A61.13,61.13,0,0,0,564,470.36a2.5,2.5,0,0,1,5-.2,66.18,66.18,0,0,1-66.13,68.64Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M504.75,483.85a15.13,15.13,0,0,1-15.12-14.74,2.5,2.5,0,0,1,2.43-2.56h.07a2.5,2.5,0,0,1,2.5,2.44,10.13,10.13,0,1,0,20.26-.52,2.5,2.5,0,0,1,2.43-2.56,2.46,2.46,0,0,1,2.56,2.43,15.15,15.15,0,0,1-14.74,15.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M440.26,477.84a2.5,2.5,0,0,1-1.11-4.74c4.22-2.08,9.53-2.66,14.67-3.21,1.79-.19,3.48-.38,5-.62,14.79-2.28,32-4.77,49.2-5.53a170.23,170.23,0,0,1,22.29,1c3.42.3,7,.6,10.42.8,8.08.46,15.38,1.2,23.12,2l2.89.29a2.5,2.5,0,0,1-.5,5l-2.89-.29c-7.68-.78-14.93-1.51-22.9-2-3.54-.2-7.11-.51-10.57-.81a168.33,168.33,0,0,0-21.64-.94c-16.95.75-34,3.23-48.66,5.48-1.67.26-3.42.45-5.27.65-4.71.51-9.57,1-13,2.72A2.48,2.48,0,0,1,440.26,477.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M393.72,477.54c-4.22,0-8.34-.81-10.74-2.32a6,6,0,0,1-3.13-5.28c0-2.5,1.83-5.12,4.53-6.69a20.53,20.53,0,0,1,8.22-2.34h0a25.62,25.62,0,0,1,11.67,1.54,7.17,7.17,0,0,1,4.44,5.39,6.91,6.91,0,0,1-2.52,6.33C403.56,476.47,398.57,477.54,393.72,477.54Zm-.67-11.65a15.45,15.45,0,0,0-6.16,1.69,3.86,3.86,0,0,0-2,2.46c0,.3.26.62.79,1,3.77,2.38,14.27,2,17.29-.6a2,2,0,0,0,.85-1.78,2.22,2.22,0,0,0-1.46-1.56,20.71,20.71,0,0,0-9.27-1.16Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M377.41,495.74a10.85,10.85,0,0,1-7.91-3c-2.15-2.23-2.76-5.43-1.73-9,1.63-5.66,8.82-13.11,13.56-15.24a2.5,2.5,0,0,1,2,4.56c-3.85,1.73-9.71,8.27-10.8,12.06-.53,1.84-.35,3.23.53,4.15,1.3,1.35,4.16,1.8,7,1.11a43.8,43.8,0,0,0,4.76-1.59,29.73,29.73,0,0,1,9.23-2.35,16.92,16.92,0,0,1,6.25,1.18l.88.29c1.06.34,2.08.74,3.07,1.13a31.94,31.94,0,0,0,3.89,1.34c2.8.69,5.66.24,7-1.11.88-.92,1.06-2.31.53-4.15-1.09-3.79-7-10.33-10.8-12.06a2.5,2.5,0,1,1,2-4.56c4.74,2.13,11.93,9.58,13.56,15.24,1,3.57.42,6.77-1.73,9-2.6,2.69-7.1,3.65-11.76,2.49a36.21,36.21,0,0,1-4.51-1.54c-1-.37-1.85-.73-2.76-1l-.94-.31a12.24,12.24,0,0,0-4.46-.93,25.55,25.55,0,0,0-7.69,2,48.2,48.2,0,0,1-5.31,1.76A16,16,0,0,1,377.41,495.74Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M394.25,507.75a17.94,17.94,0,0,1-5.4-.66c-3.8-1.3-3.85-4.93-3.88-7.34,0-.32,0-.65,0-1-.08-2.48-.06-5.07,0-7.36v-.91a2.5,2.5,0,0,1,2.5-2.48h0a2.5,2.5,0,0,1,2.48,2.52v.91c0,2.24,0,4.78,0,7.16,0,.36,0,.72,0,1.08,0,2.28.17,2.56.5,2.67,1.55.53,5.59.49,7.9.11a6.24,6.24,0,0,0,.89-.2c0-.3,0-.75,0-1.13,0-.63-.09-1.42-.08-2.32,0-1.83,0-3-.08-4.32,0-1.11-.09-2.26-.09-3.82a2.5,2.5,0,0,1,5,0c0,1.47,0,2.57.08,3.63.05,1.29.1,2.63.08,4.58,0,.71,0,1.34.07,1.94.14,2.26.36,5.69-5,6.58A33.27,33.27,0,0,1,394.25,507.75Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.42,555.33A80.37,80.37,0,1,1,366.79,475,80.46,80.46,0,0,1,286.42,555.33Zm0-150.74A70.37,70.37,0,1,0,356.79,475,70.45,70.45,0,0,0,286.42,404.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M503,554.33A80.37,80.37,0,1,1,583.34,474,80.46,80.46,0,0,1,503,554.33Zm0-150.74A70.37,70.37,0,1,0,573.34,474,70.45,70.45,0,0,0,503,403.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M426,465a5,5,0,0,1-4.26-2.37c-1.47-2.38-11.35-7.06-25.79-7.89-13.45-.77-24.29,2.35-29,8.36a5,5,0,0,1-7.85-6.19c6.85-8.69,20.51-13.12,37.45-12.15,12.95.74,29,5,33.73,12.62A5,5,0,0,1,426,465Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210,462h-.27c-5.85-.31-10.27-2.79-12.11-6.8a8.69,8.69,0,0,1,1-9.07c2.79-3.64,8-5.12,14.2-4.06a5,5,0,0,1-1.68,9.86,11.76,11.76,0,0,0-2.75-.18,10.12,10.12,0,0,0,1.86.26,5,5,0,0,1-.26,10Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M579,462a5,5,0,0,1-.26-10,10.1,10.1,0,0,0,1.86-.26,11.7,11.7,0,0,0-2.75.18,5,5,0,0,1-1.68-9.86c6.23-1.07,11.41.42,14.2,4.06a8.69,8.69,0,0,1,1,9.07c-1.85,4-6.26,6.49-12.11,6.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M382.36,612.58a2.56,2.56,0,0,1-.46,0c-10.2-1.9-18.76-4.71-27.82-7.67-3.3-1.08-6.7-2.2-10.31-3.31-21.85-6.75-44.73-12.41-66.85-17.89-8.13-2-16.54-4.1-24.7-6.19l-1.4-.36c-8.17-2.07-19.37-4.9-24-13.77-3.18-6.08,0-16.94,2.14-24.13.25-.86.49-1.65.68-2.35a2.5,2.5,0,0,1,4.82,1.35c-.2.71-.44,1.53-.7,2.41-1.66,5.63-4.74,16.12-2.5,20.4,3.62,6.9,13.15,9.31,20.82,11.25l1.41.36c8.14,2.08,16.54,4.16,24.66,6.18,22.19,5.5,45.14,11.18,67.13,18,3.65,1.13,7.08,2.25,10.39,3.33,8.9,2.92,17.31,5.67,27.18,7.51a2.5,2.5,0,0,1-.46,5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M396.13,578.5a2.54,2.54,0,0,1-.52-.06c-11.08-2.36-21.5-4.28-32.79-6-44.24-6.84-90.83-15.53-131.76-32.57a2.5,2.5,0,1,1,1.92-4.62c40.44,16.84,86.67,25.45,130.6,32.25,11.39,1.76,21.9,3.69,33.07,6.08a2.5,2.5,0,0,1-.52,4.95Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M382.36,612.58h-.18a2.5,2.5,0,0,1-2.32-2.67c.53-7.58,4.21-14.32,7.78-20.84,2.44-4.47,4.75-8.69,6.09-13.12a2.5,2.5,0,1,1,4.79,1.45c-1.49,4.92-4,9.58-6.49,14.07-3.46,6.33-6.73,12.3-7.18,18.79A2.5,2.5,0,0,1,382.36,612.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M411,612.58a2.5,2.5,0,0,1-.46-5c9.73-1.82,17.93-4.52,26.61-7.38,3.41-1.13,6.94-2.29,10.73-3.46,22-6.79,44.92-12.47,67.11-18,8.13-2,16.53-4.1,24.68-6.18l.33-.08c7.38-1.89,15.74-4,19.9-10.15,3.84-5.67,2.12-10-.26-15.95a65.76,65.76,0,0,1-2.41-6.77,2.5,2.5,0,1,1,4.81-1.35,61.79,61.79,0,0,0,2.24,6.27c2.5,6.27,5.09,12.75-.25,20.61-5.22,7.69-15,10.18-22.79,12.19l-.33.08c-8.16,2.09-16.58,4.17-24.71,6.19-22.12,5.48-45,11.14-66.83,17.89-3.74,1.16-7.25,2.31-10.64,3.43-8.85,2.92-17.2,5.67-27.26,7.55A2.57,2.57,0,0,1,411,612.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M397,578.5a2.5,2.5,0,0,1-.52-4.95c11.18-2.38,21.68-4.32,33.07-6.08,40.41-6.25,86.22-13.34,128.13-30.79a2.5,2.5,0,1,1,1.92,4.62C517.14,559,471,566.12,430.32,572.42c-11.29,1.75-21.71,3.66-32.79,6A2.54,2.54,0,0,1,397,578.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M411,612.58a2.5,2.5,0,0,1-2.49-2.33c-.45-6.45-3.76-12.4-7.27-18.7-2.52-4.53-5.13-9.21-6.63-14.17a2.5,2.5,0,1,1,4.79-1.45c1.34,4.44,3.71,8.69,6.21,13.18,3.62,6.5,7.36,13.22,7.89,20.78a2.5,2.5,0,0,1-2.32,2.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M229.87,663.57a41.28,41.28,0,0,1-16.34-3.66,39.84,39.84,0,0,1-19.73-21.19,2.5,2.5,0,0,1,4.63-1.89,34.79,34.79,0,0,0,17.19,18.54c6.44,3,21.18,6.34,25.68-2,3.47-6.46.36-10.22-5-15.81a36.79,36.79,0,0,1-6.18-7.72,6.23,6.23,0,0,1-2.7-3.22,5.9,5.9,0,0,0-.87-1.53,2.5,2.5,0,0,1,3.93-3.09A10.75,10.75,0,0,1,232,624.6c.29.67.32.74,1.16,1.19a2.5,2.5,0,0,1,1.09,1.14c1.18,2.47,3.34,4.73,5.64,7.13,5,5.18,11.16,11.64,5.8,21.63C242.57,661.53,236.38,663.57,229.87,663.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193.09,620.7H193a2.5,2.5,0,0,1-2.38-2.61c.45-9.82,3.75-18.54,10.68-28.29,5.72-8,18.92-20.32,30.37-22.5a2.5,2.5,0,1,1,.93,4.91c-9,1.72-21.17,12-27.23,20.49-6.34,8.92-9.36,16.82-9.76,25.62A2.5,2.5,0,0,1,193.09,620.7Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M228.33,626.08a2.5,2.5,0,0,1-2-4.06l0,0a2.5,2.5,0,0,1,.44-2,3.43,3.43,0,0,1,.48-1.3,2.52,2.52,0,0,1,.31-.85,71,71,0,0,0,4.08-8.66,2.5,2.5,0,0,1,4.63,1.89,84,84,0,0,1-3.7,8,2.5,2.5,0,0,1-.55,1.84l-.24.27a2.83,2.83,0,0,1-.18.82,4.76,4.76,0,0,1-1.27,3l-.11.13A2.5,2.5,0,0,1,228.33,626.08Zm-1.22-2.85h0Zm4.08-6.18h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M196.12,640.27a2.51,2.51,0,0,1-2.43-3.1c2.94-11.89,21.33-14.36,31.21-15.68,1.25-.17,2.34-.31,3.19-.45a2.5,2.5,0,1,1,.82,4.93c-.89.15-2,.3-3.34.48-8.08,1.08-24.9,3.34-27,11.93A2.5,2.5,0,0,1,196.12,640.27Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M195.84,640.28a5.69,5.69,0,0,1-4.05-1.56c-2.2-2.12-2.4-5.65-2.39-8.37l-.2-.1a3.72,3.72,0,0,0-.83-.34,2.5,2.5,0,0,1-1.65-4.21,12.38,12.38,0,0,0,.84-1.07c.21-.29.44-.6.68-.9a4.87,4.87,0,0,1-.28-4.23c1.74-4.17,9.13-5.1,16.86-5.49,10.49-.53,22.23,1.82,25.58,2.55a2.5,2.5,0,1,1-1.07,4.88c-6.58-1.44-16.4-2.83-24.2-2.44-9.92.5-12,1.88-12.48,2.35a3.58,3.58,0,0,0,.67,1,2.5,2.5,0,0,1-.33,3.64,3.19,3.19,0,0,0-.29.26,2.5,2.5,0,0,1,1.73,2.39v.79c0,1.45-.09,4.83.84,5.72.06.06.2.2.72.16a2.5,2.5,0,0,1,.29,5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M565.37,663.57c-6.51,0-12.69-2-15.83-7.89-5.36-10,.83-16.45,5.8-21.63,2.3-2.39,4.47-4.66,5.64-7.12a2.49,2.49,0,0,1,1.09-1.14c.85-.45.88-.52,1.16-1.19a10.73,10.73,0,0,1,1.54-2.65,2.5,2.5,0,0,1,3.93,3.09,5.91,5.91,0,0,0-.87,1.53,6.23,6.23,0,0,1-2.7,3.22,36.77,36.77,0,0,1-6.18,7.72c-5.36,5.59-8.47,9.34-5,15.81,4.5,8.39,19.24,5,25.68,2a34.79,34.79,0,0,0,17.19-18.54,2.5,2.5,0,1,1,4.63,1.89,39.84,39.84,0,0,1-19.73,21.19A41.28,41.28,0,0,1,565.37,663.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M602.15,620.7a2.5,2.5,0,0,1-2.5-2.38c-.41-8.8-3.42-16.7-9.76-25.62-5.67-8-20.58-19.22-29.88-21a2.5,2.5,0,1,1,.93-4.91c10.84,2.06,26.66,14.06,33,23,6.94,9.74,10.23,18.47,10.68,28.29a2.5,2.5,0,0,1-2.38,2.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M566.91,626.08a2.49,2.49,0,0,1-2-.94l-.11-.14a4.77,4.77,0,0,1-1.27-3,2.8,2.8,0,0,1-.18-.83l-.24-.27a2.5,2.5,0,0,1-.55-1.84,84,84,0,0,1-3.7-8,2.5,2.5,0,1,1,4.63-1.89,71.12,71.12,0,0,0,4.08,8.66,2.5,2.5,0,0,1,.31.85,3.43,3.43,0,0,1,.48,1.31,2.48,2.48,0,0,1,.44,1,2.53,2.53,0,0,1,0,1l0,0a2.5,2.5,0,0,1-2,4.06Zm1.22-2.85h0Zm-4.08-6.18h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.12,640.27a2.5,2.5,0,0,1-2.42-1.9c-2.12-8.59-18.94-10.84-27-11.93-1.31-.18-2.45-.33-3.34-.48a2.5,2.5,0,1,1,.82-4.93c.85.14,1.93.29,3.19.45,9.88,1.33,28.28,3.79,31.21,15.68a2.5,2.5,0,0,1-2.43,3.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.4,640.28H599a2.5,2.5,0,1,1,.29-5c.51,0,.66-.11.72-.16.92-.89.86-4.27.84-5.72v-.79a2.5,2.5,0,0,1,1.73-2.39,3.12,3.12,0,0,0-.29-.26,2.5,2.5,0,0,1-.33-3.64,3.58,3.58,0,0,0,.67-1c-.44-.47-2.56-1.85-12.43-2.34-7.86-.39-17.68,1-24.26,2.44a2.5,2.5,0,1,1-1.07-4.88c3.35-.73,15.08-3.08,25.52-2.55,7.79.39,15.18,1.32,16.92,5.49a4.87,4.87,0,0,1-.28,4.23c.24.31.46.61.68.9a12.45,12.45,0,0,0,.84,1.07,2.5,2.5,0,0,1-1.65,4.21,3.73,3.73,0,0,0-.83.34l-.2.1c0,2.72-.18,6.25-2.39,8.37A5.69,5.69,0,0,1,599.4,640.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.89,605.19a13.23,13.23,0,0,1-2.15-.17,13.89,13.89,0,0,1-9.52-6.77,2.5,2.5,0,1,1,4.23-2.66,8.94,8.94,0,0,0,6.1,4.49c3.11.51,6.78-.8,10.32-3.69a2.5,2.5,0,1,1,3.16,3.88C404.08,603.49,399.85,605.19,395.89,605.19Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M381.45,690.17h-.18A2.5,2.5,0,0,1,379,687.5c.55-7.7,1.54-17.78,2.59-28.45,2-20.32,4.27-43.35,4.29-57.89a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5c0,14.78-2.3,37.94-4.31,58.37-1,10.64-2,20.68-2.58,28.32A2.5,2.5,0,0,1,381.45,690.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M409.89,690.37A2.5,2.5,0,0,1,407.4,688c-.55-7.75-1.55-18-2.62-28.77-2-20.33-4.27-43.38-4.29-58.11a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5c0,14.49,2.27,37.41,4.27,57.63,1.07,10.85,2.08,21.1,2.63,28.91a2.5,2.5,0,0,1-2.32,2.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.67,712.41a2.5,2.5,0,0,1-2-.94A128.91,128.91,0,0,1,379.22,689a2.5,2.5,0,1,1,4.5-2.19,123.3,123.3,0,0,0,13.91,21.57,2.5,2.5,0,0,1-2,4.06Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.67,712.41a2.5,2.5,0,0,1-2-4.06,124.1,124.1,0,0,0,13.94-21.57,2.5,2.5,0,0,1,4.5,2.19,129.3,129.3,0,0,1-14.52,22.5A2.5,2.5,0,0,1,395.67,712.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M222,539.15a40.07,40.07,0,0,1-11.74-1.43c-25.41-7.8-19.39-36.26-14.54-59.13,1.89-8.93,3.68-17.36,3.44-23.49a2.5,2.5,0,1,1,5-.19c.26,6.75-1.59,15.48-3.55,24.72-4.65,22-9.93,46.86,11.12,53.32,4.87,1.5,10.81,1.27,16.55,1,2-.08,4.08-.16,6.05-.16a2.5,2.5,0,0,1,0,5c-1.87,0-3.81.07-5.86.15S224.16,539.15,222,539.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M559,542.83a2.5,2.5,0,0,1-2.1-3.85c2.37-3.68,7.95-4.14,13.34-4.59,3.45-.29,7-.59,8.82-1.67,11.8-7.07,17.55-20.9,14.67-35.23-1.06-5.25-2.55-10.19-4-15C587.16,474,584.5,465.2,584.5,455a2.5,2.5,0,0,1,5,0c0,9.46,2.44,17.53,5,26.07,1.48,4.9,3,10,4.11,15.44,3.31,16.43-3.36,32.33-17,40.51-2.79,1.68-7,2-11,2.36-3.8.32-8.52.71-9.55,2.32A2.5,2.5,0,0,1,559,542.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M486,344.5a2.5,2.5,0,0,1-1.32-4.62c2.93-1.83,5.25-6.67,6.36-13.29a2.5,2.5,0,1,1,4.93.82c-1,5.77-3.24,13.35-8.64,16.71A2.49,2.49,0,0,1,486,344.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M487,345.5a2.5,2.5,0,0,1-2.07-3.9c2.69-4,7.07-5.2,10.93-6.28.81-.23,1.61-.45,2.37-.7a2.5,2.5,0,1,1,1.53,4.76c-.83.27-1.68.51-2.56.75-3.33.93-6.48,1.82-8.14,4.27A2.5,2.5,0,0,1,487,345.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M300,347.5a2.49,2.49,0,0,1-1.68-.65L297,345.61c-2.17-2-7.92-7.44-10.14-7.13a2.5,2.5,0,1,1-.68-5c4.23-.58,9.15,3.66,14.24,8.44l1.28,1.19A2.5,2.5,0,0,1,300,347.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M300.5,347.5a2.5,2.5,0,0,1-2.07-1.1c-2.93-4.33-2.93-10.32-2.93-15.13v-.77A2.5,2.5,0,0,1,298,328h0a2.5,2.5,0,0,1,2.5,2.5v.77c0,4.34,0,9.26,2.07,12.33a2.5,2.5,0,0,1-2.07,3.9Z" transform="translate(-53.25 -44.96)"/></g><g id="HAIR_DETAILS" data-name="HAIR DETAILS"><path class="cls-24" d="M400.45,398h0Z" transform="translate(-53.25 -44.96)"/></g><g id="layers"><g class="cls-36"><circle class="cls-7" cx="233.17" cy="430" r="75.37"/></g><g class="cls-36"><circle class="cls-7" cx="449.72" cy="429" r="75.37"/></g><path class="cls-24" d="M426,465a5,5,0,0,1-4.26-2.37c-1.47-2.38-11.35-7.06-25.79-7.89-13.45-.77-24.29,2.35-29,8.36a5,5,0,0,1-7.85-6.19c6.85-8.69,20.51-13.12,37.45-12.15,12.95.74,29,5,33.73,12.62A5,5,0,0,1,426,465Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.42,555.33A80.37,80.37,0,1,1,366.79,475,80.46,80.46,0,0,1,286.42,555.33Zm0-150.74A70.37,70.37,0,1,0,356.79,475,70.45,70.45,0,0,0,286.42,404.59Z" transform="translate(-53.25 -44.96)"/><g class="cls-37"><path class="cls-7" d="M532.48,427.22c1.29,3.14,3.66,6,5.79,8.72a96.55,96.55,0,0,1,18.14,38.2c1,4.5,7.56,4.49,9.69.91a10.2,10.2,0,0,0,1.13-4.2,51.8,51.8,0,0,0-3.32-24.26c-1.32-3.37-3.17-5.84-5.09-8.79-2.11-3.25-3-6.77-6-9.49-3.77-3.43-7.3-7.66-11.88-10.14-2.12-1.15-4.77-2-6.87-.84a5.82,5.82,0,0,0-2.52,4.86A11.66,11.66,0,0,0,532.48,427.22Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-37"><path class="cls-7" d="M316.29,432.4c1.29,3.14,3.66,6,5.79,8.72a96.55,96.55,0,0,1,18.14,38.2c1,4.5,7.56,4.49,9.69.91a10.2,10.2,0,0,0,1.13-4.2,51.8,51.8,0,0,0-3.32-24.26c-1.32-3.37-3.17-5.84-5.09-8.79-2.11-3.25-3-6.77-6-9.49-3.77-3.43-7.3-7.66-11.88-10.14-2.12-1.15-4.77-2-6.87-.84a5.82,5.82,0,0,0-2.52,4.86A11.66,11.66,0,0,0,316.29,432.4Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-24" d="M503,554.33A80.37,80.37,0,1,1,583.34,474,80.46,80.46,0,0,1,503,554.33Zm0-150.74A70.37,70.37,0,1,0,573.34,474,70.45,70.45,0,0,0,503,403.59Z" transform="translate(-53.25 -44.96)"/></g><g id="CIRCLE"><path class="cls-24" d="M397.38,745.79A344.13,344.13,0,0,1,154,158.33,341.87,341.87,0,0,1,397.38,57.54h3l11.29.28h.07a344.13,344.13,0,0,1-14.36,688Zm0-679.25c-184.79,0-335.12,150.34-335.12,335.13S212.59,736.79,397.38,736.79,732.5,586.46,732.5,401.67A334.16,334.16,0,0,0,411.4,66.83l-11.17-.28Z" transform="translate(-53.25 -44.96)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.png
deleted file mode 100644
index f15ad9a4cc..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.svg
deleted file mode 100644
index 4122d3d1f5..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyScene2Shadows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 688.25 700.83"><defs><style>.cls-1{fill:none;}.cls-2{fill:#474747;}.cls-3{opacity:0.2;}.cls-4{fill:#edc0e3;}.cls-5{fill:#e8e5e3;}.cls-6{fill:#aaa39f;}.cls-7{fill:#fff;}.cls-8{fill:#c4d8ba;}.cls-9{fill:#807e6e;}.cls-10{fill:#d7b89b;}.cls-11{fill:#efe6da;}.cls-12{opacity:0.44;}.cls-13{fill:#995967;}.cls-14{opacity:0.72;}.cls-15{fill:#829e93;}.cls-16{opacity:0.61;}.cls-17{fill:#a7d8bf;}.cls-18{opacity:0.59;}.cls-19{fill:#d1b288;}.cls-20{fill:#606282;}.cls-21{opacity:0.46;}.cls-22{fill:#51483e;}.cls-23{fill:#6e607f;}.cls-24{fill:#1d1d1b;}.cls-25{clip-path:url(#clip-path);}.cls-26{clip-path:url(#clip-path-2);}.cls-27{clip-path:url(#clip-path-3);}.cls-28{clip-path:url(#clip-path-4);}.cls-29{clip-path:url(#clip-path-5);}.cls-30{clip-path:url(#clip-path-6);}.cls-31{clip-path:url(#clip-path-7);}.cls-32{fill:#b79765;}.cls-33{fill:#e9e9f2;}.cls-34{fill:#3d3d3d;}.cls-35{opacity:0.68;}.cls-36{opacity:0.17;}.cls-37{opacity:0.36;}</style><clipPath id="clip-path" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M64.1,446.5,68,327c0-.74,110.68.57,120.76.64q30.51.22,61,.33c6.75,0,15.67-2.86,18.19,5,1.69,5.22-.25,11.23,0,16.58a66.07,66.07,0,0,0,2,13.25c1.3,5,2,6.21,0,10.75-3.71,8.44-8.65,15.92-13.38,24.23a58.76,58.76,0,0,0-4.67,11c-1.6,4.92-1.3,10.78-3.33,15.37s-6.67,8.57-9.26,12.9c-2.48,4.16-4.41,10-9.47,11.12-5.52,1.28-15.14-.81-21.12-.85q-24.31-.15-48.62-.34C152.13,446.9,64.12,445.91,64.1,446.5Z"/></clipPath><clipPath id="clip-path-2" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M547.52,426.07A19.5,19.5,0,0,1,543,417c-1.22-5.73-3.79-10.48-5.95-16-6.29-16.22-11.85-27-11.27-44.83.32-9.71.48-19.43,1-29.13,0-.74,110.68.57,120.76.64q30.51.22,61,.33c6.38,0,12.68-.67,19.06-.19,4,11.39,4.55,23,6.27,35.07,1.86,13.09,4.55,25.42,3.85,39-.63,12.08-.29,26.9-4,38.38-1.72,5.29-1.34,5.51-7.3,6.15-4.38.47-8.93-.24-13.33,0-15.44.84-30.18,1.06-45.52,1q-24.31-.15-48.63-.34c-11.71-.09-23.42-.23-35.13-.34-6.18-.06-16.86,2.13-22.47-.37-5.11-2.28-5.82-8.72-8.39-13.08A51.57,51.57,0,0,0,547.52,426.07Z"/></clipPath><clipPath id="clip-path-3" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M132.33,613.67c3-.92,8.1.34,11.5.67a101.15,101.15,0,0,0,14.08,0c8.09-.4,16.39-.28,24.51-.67a108.86,108.86,0,0,1,11.88-.28,17.65,17.65,0,0,0-1.35,4.55c-5.19-.07-3.06,3.59-1.4,6.15-3.62,1.72-3.81,5.09.74,5,0,2.42,0,5.84,1.7,7.78,1,1.1,2.72,1.61,3.56,2.78,1,1.36,1.07,3.37,1.7,4.94a22.28,22.28,0,0,0,6.36,8.73c5.62,4.73,13.19,6.71,20.4,7.06,3.64.18,7.32-.15,10.95,0,.35,7,1,14.28.22,21.25-.66,6.16-2.13,12.08-2.57,18.27-1.4-2.33-5.52-4.06-7.76-5.57-3.65-2.46-7.27-3.34-11.15-5.16-7.75-3.64-13.38-9.11-20.36-13.93-7.53-5.2-15.21-9-22.15-15.08a173,173,0,0,1-22.18-24c-2.75-3.56-6-6.48-8.67-10.07-2.39-3.16-6.59-7.57-8-11.09"/></clipPath><clipPath id="clip-path-4" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M661.33,612.33c-11.53,0-23.3,1.39-34.74,2.33-7.67.63-15.22-.38-22.87.06a6.61,6.61,0,0,0-.34,3.56c3.57.37,3.12,4.64.31,5.63,1.48.49,2.61,1.47,2.59,3-4.54.55-2.26,4.19-3.27,7.39-.52,1.64-1.08,1.92-2.16,3-.36.36-1.26-.21-1.77.39s-.45,1.93-.81,2.67c-2.6,5.29-5.11,10.83-10.45,13.92-4.11,2.37-9.38,3.66-13.82,5.25a32.68,32.68,0,0,1-12.27,2.13c-.65,4.82.62,10.54.62,15.51,0,6.61-.91,14,.34,20.42,4,.09,8.51-3.94,11.64-6.28,5.48-4.09,11.25-7.68,16.78-11.7,5.72-4.15,10.69-9,16.23-13.34s11.78-8.28,17-13.27c4.31-4.15,8.76-8.19,13.34-12,4.43-3.73,7.79-7.72,11.83-11.78C652.16,626.52,662.91,616.69,661.33,612.33Z"/></clipPath><clipPath id="clip-path-5" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M579.07,484.41c-.8,4.09-1.75,8.25-2.81,12.34-2.06,7.88-6.13,15.35-9.25,22.91-1.85,4.48-3.71,6.52-8.28,8.4.2-.08.35,8.66.44,9.64.36,3.72,1.64,7.27,2.7,10.83,2.2,7.37,3.58,13.61-1.5,20.06.48-.61,9.82,2.94,10.61,3.5,2.42,1.71,4.69,3.82,7.21,5.6a47.82,47.82,0,0,1,5.91,5.44c2.74,2.71,4.32,5.41,8.4,5.21,5.13-.25,10.46-1.11,15.65-.58,8,.83,16,.73,24,1.07s16.17-.83,24.31-.83c6.07,0,12.15,0,18.19-.26,5.07-.24,6.21.26,8.85-4.21,2.51-4.26,6.39-7.32,9.59-11,3.9-4.51,5.95-9.54,8.61-14.76,3.82-7.47,5.77-15.67,8-23.71,2.16-7.84,6.43-14.87,9.36-22.45,2.19-5.66,4.22-11.21,4.93-17.26a124.32,124.32,0,0,1,2.34-13.68c.62-2.7,1.77-6.43,1.27-9.27-38.84-2.08-78.82-1.69-117.78,0q-10.63.45-21.24,1.36c-2.39.21-8-.29-9.27,1.76C578.16,476.28,579.53,482,579.07,484.41Z"/></clipPath><clipPath id="clip-path-6" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M141.17,586c8.14.29,16,1.67,24.41,1.67,9.44,0,18.67.29,28-.17,3.4-.17,6.65-.41,10.06-.5,4.37-.12,4.93-2.93,8-6,6-5.95,13.79-9.37,20.88-13.73-1.29-5.55-4.27-8.69-4.28-14.83,0-7.27,4.87-15.19,3.32-22.24-.32-1.47-2.51-3-2.26-4.78s2.46-3.63,2.94-5.42c1-3.89.57-9.75-.41-13.59-1.61-6.29-7-10.59-8.18-17-.63-3.39-.23-6.81-.74-10.19-.35-2.34-1.66-4.32-1.71-6.81-7.93-.44-16-.07-24-.05-10.2,0-20.36-1.34-30.64-1.33-17.24,0-34.65,0-51.82-.67a289.65,289.65,0,0,0-39.92,1c-2,.2-6.86-.45-7.95,1.35-1.41,2.34,3.64,10,4.3,12.3,1.76,6,3.44,12,5.3,17.93,5.63,18.05,11.86,35.93,17.48,54,3,9.49,7.26,19.28,14.09,26.65,4.48,4.84,7.5,4.35,13.9,3.82S134.75,585.77,141.17,586Z"/></clipPath><clipPath id="clip-path-7" transform="translate(-53.25 -44.96)"><path class="cls-1" d="M260.38,162.7c55.06.06,110.12.66,165.17.93s110,.24,164.94-1q11.49-.25,23-.58c6.76-.19,14.57.48,21.18-.81-2.12-2.56-2.84-5.8-5.31-8.27a49.21,49.21,0,0,0-8.75-6.93c-3.43-2.17-6.39-5.18-9.92-7.17s-7.45-3.18-10.4-6.06c-2.57-2.52-3.58-5.46-6.65-7.58-3.92-2.7-8.47-4.14-12.53-6.6-8.77-5.33-15.26-12.33-24.56-16.66-5.63-2.62-9.94-7.32-15.43-10-5.2-2.54-11.11-3.46-16.43-5.68C519,84,513.78,80.24,508,78.17c-11.9-4.27-24.91-5.63-37-9.42-6-1.89-11.6-2.33-17.86-2.73-6.58-.43-13.28-2.26-19.83-3.1a194.85,194.85,0,0,0-31.88-1.22c-4.19.15-7.08-1.83-11.21-1.81s-8.06,1.46-12.12,1.87c-10.28,1-20.62,1.18-30.91,2.28-16.38,1.76-32.39,8-48.07,12.63-10.5,3.1-21.41,6.09-31.32,10.75-9.51,4.47-18.42,10-27.82,14.64-9,4.48-18.56,8.06-26.82,13.94-3.55,2.52-6.66,5.4-10.63,7.35-4.14,2-8.49,3.57-12.18,6.41-7.21,5.55-14.07,12.07-21,17.93-2.51,2.12-15.05,10-10.75,14,2.39,2.2,12.65.55,15.86.57l17.34.12Q226.08,162.62,260.38,162.7Z"/></clipPath></defs><title>BoyerScene2Shadows</title><g id="COLOR"><path class="cls-2" d="M411.55,62.33C592.55,69.76,737,218.85,737,401.67c0,187.57-152.06,339.62-339.62,339.62S57.75,589.24,57.75,401.67,209.81,62,397.38,62h3Z" transform="translate(-53.25 -44.96)"/><g class="cls-3"><path d="M411.55,62.33C592.55,69.76,737,218.85,737,401.67c0,187.57-152.06,339.62-339.62,339.62S57.75,589.24,57.75,401.67,209.81,62,397.38,62h3Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-4" d="M89.49,418.2c.15-3,.16-6,.34-9.05.16-2.72.88-5.49.78-8.19s-.8-5.19,2.15-6.53a49.56,49.56,0,0,1,10.52-3.06c5.41-1.11,11.86-.2,17.44-.35,6.67-.18,13.51,0,20.13-.73,5.79-.66,11.57,2.28,17.41.66,4.71-1.3,1.34-16.9.49-20.44-.92-3.87-2.37-5.83-4.24-9.25-1.77-3.25-2.63-4.83-5.59-7.05-3.61-2.71-6.83-5.59-11.24-7-4-1.23-9.3-.66-13.37-.25a149.55,149.55,0,0,0-15.43,2.48c-7.23,1.5-13.51-4.77-15.24-11.31a15.92,15.92,0,0,1-.43-6.7c.71-3.35,2.92-4.58,6.15-4.63,2,0,3.83-.42,5.79-.51s5.19-.69,6.93-.16c2.42.73,3.93,4.59,5.11,6.67.4.69.56,2.46,1.48,2.68s4.9-2.71,5.85-3.19c5.28-2.67,10.15-4.48,16.08-4.7,8.39-.31,16.79-.16,25.19,0,7.38.17,14.71.78,22.06.17,5-.41,9.91-.5,14.91-.5,5.15,0,10.31-.07,15.45.17,2.67.12,5.91.73,8.14,2.3,2,1.4,5.57,5,8.15,4.47,2.23-.5,3.46-3.4,5.18-4.67,3-2.22,7.08-2.77,10.8-2.43,3.53.32,6.58.76,8.5,3.85s.88,5.93-.23,9.07a54.25,54.25,0,0,1-6.23,12.12,3.82,3.82,0,0,0-2.87-1,13.92,13.92,0,0,1-5.53-1.33c-4.15-2.12-7.94-3.68-12.69-3.83a37.3,37.3,0,0,0-16,3.29c-4.25,1.8-9.81,4.19-13.05,7.58-6,6.26-6.8,14.53-7.53,22.8-.29,3.31-.68,6.73,0,10,.42,2,.9,2.61,3,2.63a68.9,68.9,0,0,0,10.13-.75c8.26-1.17,16.85-3.06,25.24-2.38,4.65.38,9.17.43,13.79,1.32,2.23.43,4.37,1.06,6.63,1.38a14.25,14.25,0,0,1,4,.83c.16,2.13-1.9,5-2.87,6.84-2.06,3.94-3.08,8.38-4.95,12.42a43.33,43.33,0,0,0-2.5,6.58c-.66,2.33-.74,5.27-1.67,7.46-1,2.4-3.9,4.89-5.55,7.09a105.22,105.22,0,0,1-7,8.37c-1.79,1.93-3.67,4.55-5.59,6.25-2.14,1.89-6.41.88-9.08.79-7.44-.26-14.64-1.68-22.17-1.13-6.64.49-13.72-.28-20.44-.32-7.34,0-14.67,0-22,.3-18.33.83-36.7-3.1-54.85-.54a26,26,0,0,1-6.08.2c-1.8-.16-4.23.14-4.82-1.77-.72-2.33.22-6.49.33-9C88.72,430.24,89.19,424.23,89.49,418.2Z" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M727.5,327.5c0-.64,0-1.28-.09-1.91-.34-5.38-.65-22.82-6.92-23.84-4.21-.69-9.54.16-13.88.16h-41c-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-126.07-1.17-191.59-1.17L68,327c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0H728" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M637.53,161.53c-3.9,0-7.8,0-11.68.17-120.91,3.89-243.85,1.14-365.47,1-34.45,0-68.81-.31-103.17-.56l-23.62,24.93c42.24.28,84.46.68,126.79.73,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M64.1,446.5c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0,20.81,0,51.3,2.07,72.11,2.07L730,470.8c-20.81,0-47.47.79-68.28.79-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-130.77-1-196.28-1" transform="translate(-53.25 -44.96)"/><path class="cls-5" d="M681,588.06c-6.91-.23-13.49-.4-19.3-.4-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-48.95-.05-97.73-.59-146.58-.85L131.17,613c43,.28,86.06.7,129.21.75,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M727.5,327.5c0-.64,0-1.28-.09-1.91-.34-5.38-.65-22.82-6.92-23.84-4.21-.69-9.54.16-13.88.16h-41c-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-126.07-1.17-191.59-1.17L68,327c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0H728" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M637.53,161.53c-3.9,0-7.8,0-11.68.17-120.91,3.89-243.85,1.14-365.47,1-34.45,0-68.81-.31-103.17-.56l-23.62,24.93c42.24.28,84.46.68,126.79.73,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M64.1,446.5c65.51,0,130.74.93,196.28,1,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0,20.81,0,51.3,2.07,72.11,2.07L730,470.8c-20.81,0-47.47.79-68.28.79-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-65.54-.07-130.77-1-196.28-1" transform="translate(-53.25 -44.96)"/><path class="cls-6" d="M681,588.06c-6.91-.23-13.49-.4-19.3-.4-11.92,0-23.91-.38-35.82,0-120.91,3.89-243.85,1.14-365.47,1-48.95-.05-97.73-.59-146.58-.85L131.17,613c43,.28,86.06.7,129.21.75,121.62.14,244.56,2.89,365.47-1,11.91-.38,23.9,0,35.82,0" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M689.33,345.33c-15.88.07-27.4,7.39-33.93,21.91-3.35,7.46-4.21,16-1.49,23.75.63,1.79,2.24,7.45,4.14,8.28s7.59-1.84,9.76-1.94c4.4-.21,8.78-.44,13.16-.67,9.14-.47,19-2.15,28-.83,5.14.75,10.82,4.1,15.95,3.49,0-6.61,2.86-12.73,2.39-19.62-.37-5.43-3.36-10.23-6.19-14.69s-6.29-10.2-10.14-13.95C706.06,346.23,699.6,346.58,689.33,345.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M577.33,345.67c-8.13,2.74-16.2,6.05-22.67,12-7.18,6.59-8,16.39-8,25.65,0,5,.58,12.8,4,16.73,9.37-6.75,25.31-5.33,36.26-4.37,6,.52,11.95.82,17.84,1.91,3.54.65,7.58,1.86,11.19,1.37,1.49-6.31,5.31-10,5.06-17a39.76,39.76,0,0,0-5.5-18.32C607.56,350.39,597,346.33,577.33,345.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-8" d="M584.47,330.32c-2.69,1.39-5.71,4.62-8.4,5.3-3.34-7-9.64-7-16.73-6.62-4,.22-7-.06-6.67,4.58.38,5.94,3.06,14.31,9.5,16,5.45,1.42,10.87-1.23,16.15-2.22,6.6-1.23,12.53-1.2,18.85,1,14.85,5.24,21.87,18,21.17,33.56-.16,3.48,0,16.13-4.19,18.05-1.58.72-7.86-1.67-9.82-2-8-1.24-16-2.9-24.13-3.7s-14.79.94-22.37,3.32c-2.75.86-6.43,1.58-8.2,3.86s-2.1,6.88-2.3,9.51c-.45,5.79-2,12.06.31,17.62,1.53,3.63,4.42,6.53,7.44,8.93,3.53,2.82,4.78,5.89,6.65,10.07,14.65.9,29-2.15,43.76-2.28,9-.08,18-.93,26.84-1,9.1-.07,17.51,1.92,26.5,2.68,10.45.88,21,.63,31.53.81,9.78.17,19.79.78,29.48.75,4.8,0,2.74-3,2.71-7.43,0-5.1.57-10.23-.2-15.3-.52-3.43-1.15-6.67-1.35-10.15-.15-2.71-1.27-6.44-.67-9,.75-3.19,3.76-4.87,3.28-8.62-11.35-.63-22.56-1.38-33.94-1.38s-22.47,3.56-33.34,1.83c.18-4-1.47-7.84-1.67-11.83s-.33-8-.33-12c0-8.39,4.09-14.09,10.68-19.41,9.93-8,21.7-11.6,34.67-9.23,3.63.66,7.27,3.77,10.65,4.14,4.87.54,7.91-8.54,8.51-12.84,1.2-8.69-1.45-10.79-9.68-11.17-3.57-.16-6.87-.6-9.85,1.68s-5,5.72-8.22,7.79c-5.52-9.81-22.7-9.3-32.08-9.3-17.09,0-34.29.82-51.35,1.67-3.94.2-8-.88-11.91-1C590.64,326.75,588.76,328.11,584.47,330.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M638,393.67c-3.35,0-15.51-.26-14.36,5.67.5,2.58,6,4.42,8.19,4.83,3,.56,5.94.31,8.16-1.82C641.55,400.86,645.87,392.58,638,393.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M626,400.67c-8.15-1.58-12.48,17.44-3.33,18.33,3.87.38,6.87-2.06,10.41-2.92,4.88-1.19,10.23.45,15.19,0,5.93-.57,6.78-6.25,4-11.05-1.75-3-4.79-3.2-7.18-5.3-2,5.4-13.39,5.35-16.08,1" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M628,418.33c-.19,2.28-1.39,7.7-.18,9.85,1.32,2.33,6,2.67,8.35,2.49,2.92-.23,5.64-1.43,6.58-4.33.44-1.35,1.15-8,.59-9.17C641.86,414.17,631,415,628,418.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M183.67,393c-3.93,0-20.42-1.1-18.35,6,1.15,3.93,8.21,4.93,11.58,5C182.73,404.09,186.51,400.8,183.67,393Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M161.75,404.35c-1.93,2.57-4.11,7.18-2.35,10.26s6.5,4.14,9.6,3.32A43,43,0,0,1,179.5,416c3.4-.11,8.91,1.1,12-.37,7.94-3.79.72-11.47-3.41-14.71-3.25-2.55-3.86.42-6.92,2.25-2.62,1.56-5.68,2.94-8.67,1.7C168.19,403.07,166,398.74,161.75,404.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M168.33,417.33c0,7,.59,11.56,8.33,12.34,3.34.33,6.66.05,8.26-3.17,1-2.07,1.55-7.61.22-9.49C182.34,413.05,174.9,415.3,168.33,417.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M88.5,394.33a48.2,48.2,0,0,1-.21-22.53A27.33,27.33,0,0,1,96,358.64c2-2,3.92-4.38,6.43-5.77a53.9,53.9,0,0,1,8-3.24c6.09-2.19,12.16-3.64,18.69-3.3a36.48,36.48,0,0,1,10.33,2.26c2.89,1.05,4.92,3.18,7.24,5.1,2.08,1.72,4.25,2.94,5.92,5a29.06,29.06,0,0,1,3.73,6.56c2.84,6.42,3.69,12.08,3.68,19.05,0,1.77.92,6.87-.68,8.23-1.13,1-4.26-.81-5.46-1.24-3.84-1.37-8-1.5-12-1.5-9.57,0-19.67.27-29.12,1.88C104.76,393.07,96,393.51,88.5,394.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M196,392c-1.79-1.75-1.89-6.26-2-8.63a33.15,33.15,0,0,1,.46-8c.9-4.59,3.49-9.41,5.67-13.5,7.79-14.61,29.4-17.66,44-13.87,4.77,1.24,9.79,2.87,12.87,6.92,2.27,3,5.88,7.5,6.46,11.25" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M248.67,351.33c.78,1.44,2.61,2.29,3.84,3.33a44,44,0,0,1,4.62,4.63,40.35,40.35,0,0,1,5.83,8.8,52,52,0,0,1,3.62,7.83c.95,3.06-2.19,6-3.86,8.48-2.07,3.07-4.34,6.07-6.27,9.26-2.39-2.19-6.42-2.57-9.56-3.09a103.84,103.84,0,0,0-17.2-1.23c-10.86,0-21.52,2.53-32.37,2.67" transform="translate(-53.25 -44.96)"/><path class="cls-11" d="M180.17,162.33c-4.89,0-5.59-1.1-7.57-5.41-.55-1.2-2.47-4.28-2.28-5.58.35-2.33,3.06-3.08,5-4.35,6.52-4.23,12.36-9.33,18.49-14.16,7.48-5.9,15.18-10.77,23.17-15.93,5.58-3.61,11.35-6.67,17.1-10,11.44-6.63,24.34-10.63,36.4-16.08A352.56,352.56,0,0,1,347.35,66a242.15,242.15,0,0,1,28.52-3.37c3-.23,17.34-2.79,18.83,1,.22.58-.92,3.37-1,4.17-.23,1.6-.25,3.32-.33,4.91-.22,4.5-2.48,16.8.83,20.26,1.57,1.65,2.82.45,5.18,0,3.1-.59,6.36-.33,9.51-.33,6.7,0,13.33,0,20,.67,1.42.14,4.8-.14,5.55,1,.59.87-.24,4.17-.34,5.19-.67,6.65-.65,13.76-.68,20.51,0,10-.34,19.9-.28,29.86,0,2.6-1.23,9.56.09,11.76,1.22,2,4.81,1.58,6.81,2-.32-.07.52-32.62.49-35.66-.1-10.61-.77-21.25-.77-32,0-5-2-14.61.39-18.94,5-.32,9.91-.19,14.89-.44.14-2.75-1-7.18,1.38-8.28,3.14-1.44,9.33,1.6,12.88,1.38-.32,0,.45,22.21.45,24.2,0,5.69-.34,11.33-.59,17-.54,12.46.59,24.71.59,37.15,0,5.16-.47,10.06-.72,15.2-4.26.57-9.19-.62-13.58-.62-5.59,0-11.39-.35-16.94.24-15.7,1.69-32.27.91-48.16.09-10.62-.55-21.43.27-32.14.1-12.09-.19-24.18-.44-36.27-.44-29.6,0-59,1-88.57,1-8.16,0-16.68.73-24.62-.76-2.89-.54-5.9-1-8.74-1.49C193.6,160.38,186.58,162.33,180.17,162.33Z" transform="translate(-53.25 -44.96)"/><g class="cls-3"><path d="M440.17,158.78c-.13-10.26.36-20.52.26-30.82-.1-10.61-.77-21.25-.77-32,0-5-2-14.61.39-18.94,5-.32,9.91-.19,14.89-.44.14-2.75-1-7.18,1.38-8.28,3.14-1.44,9.33,1.6,12.88,1.38-.32,0,.45,22.21.45,24.2,0,5.69-.34,11.33-.59,17-.54,12.46.59,24.71.59,37.15,0,5.16-.47,10.06-.72,15.2,0,.76-19.65-.13-21.13-.32a10.14,10.14,0,0,0-4.14,0c-1.13.34-2.28,1.1-3.39.72Q440.2,161.24,440.17,158.78Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M303.55,161.86c-.81-12.51,1.83-24.9,2.8-37.33a114.16,114.16,0,0,0-.45-18.9c-.5-5.93.14-12.09.09-18.06q0-4.55-.21-9.1c8.46-5.27,18.63-7.23,28.31-9.56,7.08-1.7,14.13-3.37,21.41-1.81-3.48,13.14-.1,27-.06,40.58,0,3.35-.18,6.7-.33,10a355.09,355.09,0,0,0,.93,45.51c-.07-.88-31.13-.58-34.17-.58-1.33,0-18.28-.34-18.21.53Q303.59,162.53,303.55,161.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-14"><path class="cls-15" d="M239.27,163.84a64.66,64.66,0,0,0,2.63-13.77l4.88-41.94a19,19,0,0,1,1.28-5.73c1.72-3.78,6.3-4.89,9.83-6.3,4.23-1.69,8.45-3.38,12.6-5.26a188.12,188.12,0,0,1,24.76-9.16L294,102.77c-.4,6.47-1.61,13.54-.9,19.93a203.82,203.82,0,0,1,1.36,23.14c0,3.86-.17,7.72-.48,11.57s0,5.17-3.94,5.26c-8.35.18-16.71.58-25.05.71q-7,.11-14.07.19C247.54,163.6,242.35,165,239.27,163.84Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M180.17,162.33c-4.89,0-5.59-1.1-7.57-5.41-.55-1.2-2.47-4.28-2.28-5.58.35-2.33,3.06-3.08,5-4.35,6.52-4.23,12.36-9.33,18.49-14.16,7.48-5.9,15.18-10.77,23.17-15.93,5.58-3.61,11.35-6.67,17.1-10,4.47-2.59,9.16-5.63,14.1-7.05a1.67,1.67,0,0,1,1-.08c.77.26.74,1.35.55,2.14a479.38,479.38,0,0,0-8.47,47.41c-.42,3.28.1,9.24-1.38,12.13-1.2,2.34-5,2.19-7.76,2.21-7.81.06-15.73.68-23.45-.76-2.89-.54-5.9-1-8.74-1.49C193.6,160.38,186.58,162.33,180.17,162.33Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/><g class="cls-16"><path class="cls-17" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M499.64,86.89c-.77-1.42-1.53-2.84-2.27-4.28-3-5.84-6.46-6.27-12.5-8.39-4.32-1.51-8.84-3.06-13.48-2.84-.63,4,6.39,10.9,8.54,14.28,3.41,5.36,5,11,7.49,16.75,2.83,6.54,8,11.93,11.25,18.33,3.69,7.21,8.86,13.26,12.93,20.29,4,6.84,9.36,13.51,14.4,19.55,5.21-1.43,7.56-8.46,13.61-9.2,1.34,3.76-.71,7.55-.23,11.23a520.91,520.91,0,0,0,78.88-1.94c4.88-.48,9.81-.13,14.71-.39-2.19-3-3.55-6.49-6.15-9.47-3.41-3.91-7.1-6.63-11.26-9.64-6.7-4.85-14.37-8.71-20.69-14-3.87-3.24-7.56-6.62-11.76-9.5a196.87,196.87,0,0,0-30.18-16.75c-2.57-1.15-10.73-6.6-13.35-3.61-1.39,1.58-.13,8.08-.23,10.18-.44,9.22,1.55,18,1.65,27.17.05,4.4,1.27,12.09-1,15.71-4.13-2.63-4.54-9.06-6.61-13.08-2.44-4.74-6.06-8.74-8.82-13.29-3.25-5.35-7-9.85-10.51-15-1.79-2.64-3-5.7-4.81-8.32C506,96,502.37,91.94,499.64,86.89Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M92.25,301.5c0-6-.5-12-.5-18.06,0-5.5-1-10.71-.75-16.21s-.53-10.74,1.4-16c3.53-9.57,9.82-18.41,15.56-26.75,3.87-5.62,7.07-11.13,14-12.82q.13-.15,0,0a3.67,3.67,0,0,1-.62.54c3.43-.59,7-2.53,10.66-1.41,5.14,1.6,6.51,6.61,7.46,11.3,3.59,17.89,6,36.34,7.92,54.46.51,4.84.5,13.41,4.64,16.72,1.58-5.82,1-12.05.73-18-.09-2.2,1-6.55-1-8,0,0,1.38-62,1.31-63s9.69-2,9.69-2l8.44,1.41,1.06,4.33L174,195.93h20.67v14.55l12.33.13V195.93l19-.65s12.92,3.72,12.84,4.22.17,76.75.17,76.75l.47,16.25,16.16-28.11,31.47-48.05L297.25,201l11.54,8L310.67,188l13.09-.23L323.18,219l17.32.25L338.75,304l-28.66-1V213l-1.84-1L274,271l-11.25,20L253,302l-12-8.67-2,1.09,1.33,6.85Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-19" d="M92.25,301.5c0-6-.5-12-.5-18.06,0-5.5-1-10.71-.75-16.21s-.53-10.74,1.4-16c3.53-9.57,9.82-18.41,15.56-26.75,3.87-5.62,7.07-11.13,14-12.82q.13-.15,0,0a3.67,3.67,0,0,1-.62.54c3.43-.59,7-2.53,10.66-1.41,5.14,1.6,6.51,6.61,7.46,11.3,3.59,17.89,6,36.34,7.92,54.46.36,3.41.41,6.88,1.22,10.23s3,6.57,2.57,10.21c-.92,7-12.72,4.42-17.57,4.43l-21.11,0Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-14"><path class="cls-15" d="M310.09,301.5V253.82c0-17.45.39-34.95-.69-52.32-.06-1,1.2-13.52,1.27-13.52l13.09-.23L323.18,219l17.32.25L338.75,304l-28.66-1Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M253,302c-2.25-1.63-4.71-2.95-7-4.5-1.06-.72-5.47-2.36-5.74-3.5a2.51,2.51,0,0,1,.14-1.25c2.85-9.95,10.06-19.35,15.24-28.36l31.47-48.05L297.25,201c4.1,2.86,9.46,5.37,12.37,9.43a3.46,3.46,0,0,1-1.25,3.18c-3.48,2.74-5.36,7.38-7.58,11.2l-8.67,14.93-15.74,27.11L274,271l-11.25,20Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M153,295.9c-.63-6.8,0-13.85-.26-20.65-.09-2.2,1-6.55-1-8,0,0,1.38-62,1.31-63s9.69-2,9.69-2l8.44,1.41,1.06,4.33L174,195.93h20.67v14.55l12.33.13V195.93l19-.65s12.92,3.72,12.84,4.22.17,76.74.17,76.75c0,2.8.16,5.61.24,8.41.11,4-.6,8.55.14,12.4.4,2.11,2.31,3.77,2.05,6.09-10.6.4-21.52-1-32.17-1.15s-21.12,0-31.67.34c-7.47.26-15.09.63-22.26-1.48a3,3,0,0,1-1.46-.77,3,3,0,0,1-.55-1.55C153.19,297.68,153.08,296.79,153,295.9Z" transform="translate(-53.25 -44.96)"/></g><polygon class="cls-11" points="292.81 257.04 292.37 188.62 331.25 188.69 332.25 161.42 375.58 161.42 377.25 158.59 388.74 157.38 392.75 158.09 396.14 159.65 397.6 150.81 419.52 150.97 418.91 163.79 431.27 164.54 431.3 151.68 445.66 150.81 454.25 150.63 462.5 152.7 463.08 178.06 474.5 177.82 477.54 175.78 476.5 171.22 496 164.54 500.75 165.29 513 237.04 518.25 258.54 486.5 258.79 479.75 205.44 476.5 185.51 474.5 188.04 474.5 259.72 388.74 258.79 372.42 251.62 363.92 248.75 359.76 249.29 360.52 252.7 346.42 254.29 327.96 255.7 320.75 255.7 292.81 257.04"/><g class="cls-16"><path class="cls-17" d="M536.48,277.9,533,250.4c-1.67-10.25-2.32-20.24-3.6-30.5a7,7,0,0,1-.06-2c.57-3.44,8.49-4.49,11.35-5.47l8.57-2.94,4.75.75L566.25,282l5.25,21.5-31.75.25Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M473.47,293.73c-1.74-26.81.49-53.82-1.55-80.62a4.35,4.35,0,0,1,.27-2.4c1-1.92,12.33-1.69,12.33-1.21l0-12.86,14.36-.87,8.59-.19,8.25,2.08.58,25.36c2.8-.06,10.63-1.71,11.76,1.59a7.14,7.14,0,0,1,.21,2.63c-.69,16-.55,32.12-.55,48.19v29.24s-17.26-.19-18.27-.2l-18.3-.2-9.55-.1c-1.55,0-5.71,1.2-6.72,0a4.87,4.87,0,0,1-.81-2.69Q473.72,297.6,473.47,293.73Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M425.5,293.74a206.26,206.26,0,0,1-.69-22.25l.26-51.15a30.31,30.31,0,0,0-.76-8.51,7.25,7.25,0,0,1-.48-2.53c.14-1.71,1.71-2.93,3.28-3.62,5-2.2,9.39-2.75,14.88-3.33l4,.71,3.39,1.56,1.45-8.84,21.92.16c-.27,5.63.18,11.07-.14,16.67-.46,8.18-.88,16.36-1.09,24.55-.41,16.12,0,32.31,2.46,48.27.91,5.88,2.09,11.73,2.51,17.66.16,2.26-.67,1.84-2,1.84-.19,0-1.31-.76-1.64-.85-1.21-.34-3,0-4.25,0L455,303.89l-13-.14c-2,0-5.17-2.27-7-3.05-2.68-1.18-9-2.58-9.43-6Q425.55,294.23,425.5,293.74Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-19" d="M346.06,302l-.45-68.42,38.88.07,1-27.27h16.62c8.39,0,18.24-1.41,26.4.12a68.46,68.46,0,0,1-.41,12.13l-2.78,29.79c-.43,4.65-.87,9.3-.88,14,0,3.8.25,7.6.52,11.39.52,7.46,4,19.43,3.88,26.89-3.05.17-7.48-.41-10.33,0l-4.62-.25h0L400,300.5l-18.79.17H374Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M433.26,162.79c-.09-1.68-.12-3.36-.15-5l-.53-29.61a72.4,72.4,0,0,0-.4-7.61c-.31-2.49-.88-5-1-7.47-.28-6.72,2.75-13.46,1.35-20a1.53,1.53,0,0,0-.45-.93,1.6,1.6,0,0,0-1-.22c-7.26,0-14.53.07-21.78.32-2.6.09-4.76,1-7.28,1.19-2.21.18-6.4-.33-6.61,3-.06.92.31,2.07-.45,2.59-2.09-11,1.69-22.46-.31-33.48a3,3,0,0,0-.73-1.72,3.17,3.17,0,0,0-2.4-.51c-11.48.7-23,1.4-34.34,3.2a4.31,4.31,0,0,0-2.25.82c-1.21,1.08-1.59,5.31-2,6.89-.75,3.31.08,7.37.39,10.71,1.19,12.69.41,25.42.46,38.17q.08,19.88,1,39.74,20.06,1.58,40.21,1.38C398.23,164.17,433.25,162.64,433.26,162.79Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M714.75,284.75c1.42,1.82,1.16,5.24,1.75,7.45s2,3.71,2.85,5.67c2.21,5.24-8.77,4.26-11.58,4.29l-18.26.18-52,.51L635.34,210l-2.86-3.52S622.35,250.08,616.92,266s-12.28,36-12.28,36l-14.84-6.92-2.55,7.29L571.5,303.5l-2.5-97,.75-2.25,11.8-1.16H587l1.5,3.28-.12,6.5-1.13,54.83.25,23.8,26.19-77,5.56-13.75L620,194l13,3.25,2.34,2.5-1.1,4.5,18.27-1.2,2.69,3.45,1.1,2.25V195l8-.33s31,44.17,38.25,58.88" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-19" d="M714.75,284.75c1.42,1.82,1.16,5.24,1.75,7.45s2,3.71,2.85,5.67c2.21,5.24-8.77,4.26-11.58,4.29l-18.26.18-52,.51-1-42.75-.73-31.8-.27-11.63c0-1.28-.74-11.06-1.42-10.63,5.27-3.33,12.27-2.59,18.43-3l2.69,3.45,1.1,2.25V195l8-.33s31,44.17,38.25,58.88" transform="translate(-53.25 -44.96)"/></g><g class="cls-12"><path class="cls-13" d="M635.34,199.75c-1.38,5.62-3.78,10.93-5.29,16.55-1.63,6.07-2.86,12.23-4.4,18.32-2.66,10.52-5.23,21.14-8.72,31.42-5.42,16-12.28,36-12.28,36l-14.84-6.92-2.55,7.29L571.5,303.5l-2.5-97,.75-2.25,11.8-1.16H587l1.5,3.28-.12,6.5-1.13,54.83.25,23.8,26.19-77,5.56-13.75L620,194l13,3.25Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M82,522.25l5.82-27.41,20.8,5.82,5.19,3.67L111.33,509l8.5-.68,4,.74,1.66-3V484.25l12.81-2.65h8l6.21.9,3.5.32.5,14.42L168,495.5l1.14-.66.11-13.09,16.5.75h5.91v9.65l1,2.69,5.11-5.88,4.59-.52,4.57.52,5.1.67.6,5.21,4.79-2.88,4.73-.25,3.63-1s7,15.41,8.11,18.2-.1,4.09-.1,4.09l-2,8.21L229.5,544.5l-2.88,12.27v5.56l2.63,3.86,2.76,1.43-13.26,8.62L206,587.76l-92.21.05Z" transform="translate(-53.25 -44.96)"/><g class="cls-21"><path class="cls-22" d="M82,522.25l5.82-27.41,20.8,5.82,5.19,3.67L111.33,509l8.5-.68,4,.74,1.66-3V484.25l12.81-2.65h8l6.21.9,3.5.32.5,14.42L168,495.5l1.14-.66.11-13.09,16.5.75h5.91v9.65l1,2.69,5.11-5.88,4.59-.52,4.57.52,5.1.67.6,5.21,4.79-2.88,4.73-.25,3.63-1s7,15.41,8.11,18.2-.1,4.09-.1,4.09l-2,8.21L229.5,544.5l-2.88,12.27v5.56l2.63,3.86,2.76,1.43-13.26,8.62L206,587.76l-92.21.05Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M592.09,588l14.61-9.7-.15,9.23,31.78.81,44.33-.81s8.87-18.31,18-38c9-19.49,18.24-40.34,19.36-46.2,2.25-11.78,0-5.95,0-5.95a36.4,36.4,0,0,1-5.55-.79c-1.25-.39-2.24-2.22-3.75-.67-.92.95-1,2.4-1.12,3.72-.61,7.11-3.47,13.81-5,20.78a67.44,67.44,0,0,0-1.42,17.29c.17,4.31.64,8.82-1.1,12.76s-5.5,6.72-7.62,10.51a101.78,101.78,0,0,1-.84-11.9q.65-29.68,1.3-59.37c-3.89.63-7.49-1.87-11.53-1.89a9.74,9.74,0,0,0-4.33.8,4.84,4.84,0,0,0-2.73,3.3,16.64,16.64,0,0,1-.3,2.3c-.25.74-1,1.39-1.76,1.09-1.23-.52-1.5-11.2-1.48-13-1.88-.13-20.08-1.41-20.08-1.38l-1.12,14.8-13.22,1s.25-13.54.33-14.21-31.5,1.57-31.5,1.57l-1.5,90.54-2-1.6-35.11-56.86-7.33,10.78-3,3,21.07,38.54" transform="translate(-53.25 -44.96)"/><path class="cls-11" d="M175.14,629.45a13.91,13.91,0,0,1,6.19,6.09l-.49-13.79a26.83,26.83,0,0,1,8.37,1.08,8.38,8.38,0,0,1-.92,4.7c1.39-.45,2.83.81,3.26,2.21a17.53,17.53,0,0,1,.27,4.36c.07,1.46.59,3.08,1.91,3.71.45.21,1,.29,1.42.49a5.55,5.55,0,0,1,2.35,2.88c2.91,5.91,6.45,12,12.24,15.11a28.83,28.83,0,0,0,8.88,2.75,78.46,78.46,0,0,0,10.7,1.11,9.41,9.41,0,0,1,4.68.93c1.89,1.17,2.62,3.54,3,5.73a62.61,62.61,0,0,1,.5,9.74v15.57c0,2.63-.39,5.87-2.83,6.85s-5.12-1.25-7.11-3.15a92.58,92.58,0,0,0-11-8.45c-7.57-5.3-15-10.82-22.31-16.47-8.51-6.58-16.64-13.72-25.3-20.1-6.14-4.53-9.18-8.39-8.43-16.6.31-3.47,1.82-3.48,5-3.79Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-23" d="M175.14,629.45a13.91,13.91,0,0,1,6.19,6.09l-.49-13.79a26.83,26.83,0,0,1,8.37,1.08,8.38,8.38,0,0,1-.92,4.7c1.39-.45,2.83.81,3.26,2.21a17.53,17.53,0,0,1,.27,4.36c.07,1.46.59,3.08,1.91,3.71.45.21,1,.29,1.42.49a5.55,5.55,0,0,1,2.35,2.88c2.91,5.91,6.45,12,12.24,15.11a28.83,28.83,0,0,0,8.88,2.75,78.46,78.46,0,0,0,10.7,1.11,9.41,9.41,0,0,1,4.68.93c1.89,1.17,2.62,3.54,3,5.73a62.61,62.61,0,0,1,.5,9.74v15.57c0,2.63-.39,5.87-2.83,6.85s-5.12-1.25-7.11-3.15a92.58,92.58,0,0,0-11-8.45c-7.57-5.3-15-10.82-22.31-16.47-8.51-6.58-16.64-13.72-25.3-20.1-6.14-4.53-9.18-8.39-8.43-16.6.31-3.47,1.82-3.48,5-3.79Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-11" d="M560.6,661.45a34,34,0,0,0,27-8c4-3.55,7.13-8,10.2-12.41a101.21,101.21,0,0,0-3,33c5-2.15,10.08-4.38,13.87-8.25a42,42,0,0,0,5.77-8.14,71.54,71.54,0,0,0,6.35-12.44c.93-2.62,1.55-5.34,2.28-8a104.45,104.45,0,0,1,4.87-14,1.57,1.57,0,0,1,.44-.67,1.54,1.54,0,0,1,1-.19,25,25,0,0,1,13.82,5.09c-5.61,4.68-5.11,13.61-9.43,19.5a27.5,27.5,0,0,1-6.13,5.57q-18.32,13.5-37.27,26.11-9.35,6.22-18.84,12.22c-1.75,1.1-6.93,5.66-9,5.23-2.86-.6-1.62-6.71-1.62-8.86S561.4,661.57,560.6,661.45Z" transform="translate(-53.25 -44.96)"/><g class="cls-18"><path class="cls-23" d="M560.6,661.45a34,34,0,0,0,27-8c4-3.55,7.13-8,10.2-12.41a101.21,101.21,0,0,0-3,33c5-2.15,10.08-4.38,13.87-8.25a42,42,0,0,0,5.77-8.14,71.54,71.54,0,0,0,6.35-12.44c.93-2.62,1.55-5.34,2.28-8a104.45,104.45,0,0,1,4.87-14,1.57,1.57,0,0,1,.44-.67,1.54,1.54,0,0,1,1-.19,25,25,0,0,1,13.82,5.09c-5.61,4.68-5.11,13.61-9.43,19.5a27.5,27.5,0,0,1-6.13,5.57q-18.32,13.5-37.27,26.11-9.35,6.22-18.84,12.22c-1.75,1.1-6.93,5.66-9,5.23-2.86-.6-1.62-6.71-1.62-8.86S561.4,661.57,560.6,661.45Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-20" d="M618.76,481.46c-3.58,0-7.92.36-9.5,3.58a9.59,9.59,0,0,0-.68,4.06l-2.13,98.17a180.81,180.81,0,0,0,34.45-.75c-2.21-6.75-2.28-14-2.32-21.09l-.17-28.76a101.28,101.28,0,0,1,.41-12c.47-4.13,1.45-8.2,1.66-12.35.25-4.95-.6-9.85-.78-14.79-.12-3.56,1.07-7.89-.42-11.27C636.27,479.39,624.51,481.52,618.76,481.46Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-18"><path class="cls-23" d="M652.25,544q.42-27.32-.87-54.62c-.13-2.8,0-6.14,2.34-7.64a8,8,0,0,1,4.52-.82l11.28.18a2.46,2.46,0,0,1,3,2.44l1.86,9.92c1.53-.69,1.42-3.21,2.93-3.93a3.4,3.4,0,0,1,1.64-.2A117.76,117.76,0,0,1,694.3,491a1.45,1.45,0,0,1,1.53,1.88l-3.67,40.48a59.81,59.81,0,0,0-.35,9.87c.26,3.51,1.15,6.95,1.53,10.45a48.07,48.07,0,0,1-.17,10.79,10.67,10.67,0,0,1-.59,2.76,12.66,12.66,0,0,1-2.09,3.11,67.57,67.57,0,0,0-10.11,17.14,147.26,147.26,0,0,0-16.07-.7c-3.72,0-9.24,1.46-12.55-.81-2.9-2-2.75-5.51-2.27-8.6.83-5.29,1.67-10.51,2.07-15.86C652,555.68,652.16,549.82,652.25,544Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-21"><path class="cls-22" d="M590.16,587.71c-1.45-5.44-5.88-9.46-9.16-14-5.17-7.2-7.61-16.07-12.71-23.33a50.69,50.69,0,0,1-3.54-5.18c-.9-1.69-1.47-3.54-2.34-5.24-1-2-2.55-4-2.77-6.23a11.73,11.73,0,0,1,1.12-5.19c1.69-4.42,3.58-9.11,7.45-11.83,5.85,6.16,8.57,14.61,13.45,21.56,1.1,1.56,2.3,3,3.44,4.56A135.37,135.37,0,0,1,593.95,557q2.83,5,5.65,10,1.41,2.5,2.8,5c.74,1.34,2.23,3.11,2.42,4.65.31,2.54-3.39,4-5.15,5.19Q595.06,585,590.16,587.71Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-21"><path class="cls-22" d="M639.06,496.73c-1.32,8.89-1.12,17.92-.91,26.91l.18,7.91c.31,13.59.63,27.17.85,40.76a79.15,79.15,0,0,1-.68,14.6l11.23-1.48q1.41-23.59,1.67-47.24c.07-6.84.07-13.68.08-20.52v-8.08c0-2.4,0-4.79-.09-7.19-.06-1.61.23-4.24-.84-5.61S639.17,496,639.06,496.73Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M709.39,497.13a.65.65,0,0,0-.78.67l-3.88,25.33c-1,6.83-2.1,13.74-1.52,20.62,4.23-4.28,5.51-10.58,8.36-15.89,1.36-2.54,3.1-4.87,4.28-7.5a39.23,39.23,0,0,0,2.33-8.3c.85-4.17,2.49-9.42,1.85-13.69-.32-2.18-1.46-1.82-3.46-1.69Z" transform="translate(-53.25 -44.96)"/></g></g><g id="SHADOWS"><g class="cls-3"><path d="M195.5,131.62a9.1,9.1,0,0,1,1.78-.56c1.88,5.23-1.12,12.48-1,17.92,0,2.32,0,5.88,1.86,7.58,1.14,1,9.58,1.63,9.52.49.08,1.56.55,3,.34,4.57-.22,1.73-20.35,1.31-22.15,1.31-8.71,0-17.42-.5-26.11-1,3.56-4,9-6.43,12.87-10.29s7.75-7.42,12-10.9C187.92,138,191.39,133.38,195.5,131.62Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M233.33,106.67c-4.37,13.39-11.53,28.24-11.67,42.65-.05,5.33,2.52,6.93,7,9.08,2.48,1.19,8.63,1.47,10,3.51-4.31,2.79-12.76,2.12-17.7,1.1-4.15-.86-8-4.47-10.78-7.51s-.25-5.88.83-9.55c1.74-5.89,3.26-11.78,4.7-17.72,1-4.22,1.49-8.33,2.22-12.58.93-5.4,4-3.06,7.43-6.65" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M262,93c-2.62,0-7.35,3.44-9.67,4.91-3.2,2-3,3.17-2.66,6.69.68,6.61.65,13.22,1,19.9s0,13.5.67,20.1c.29,3.06-1.11,13,1,15.16s12,.57,14.7.57c3.7,0,7.67.38,11.27-.38-.22-1.64-1.85-2.85-2.55-4.59-1.52-3.79-1.51-8.84-2.07-12.86-1.12-8-1.22-16.34-1.59-24.43-.48-10.46.65-21.92,5.58-31.34C272.13,86.33,264.71,90.07,262,93Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M304,79c-3.21-.27-8.87.83-9.68,3.83s.68,8.29.68,11.55c0,4,.2,8,0,12-.64,12.68,0,25.56,0,38.33,0,5.29.1,10.39.38,15.62,4.34,1.18,14.61,1.76,18.85,0-5-2.95-3.89-15.79-4.32-20.87a195.5,195.5,0,0,1-.24-34.41c.56-6.13,1.47-12.29,2.42-18.34.63-4,2.24-8.05,2.57-11.94C311.49,74.47,308.31,76.81,304,79Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M342,68c-3.19.65-10.42,2.59-11.68,5.82-.76,2-.06,6,0,8.1.15,4.29.67,8.41.67,12.73,0,16-1.35,31.81-.67,47.78.28,6.5,1.09,13,1.38,19.53,4.08.45,7.68-1.32,11.59-2-.44-3.71-2.43-7.78-3.13-11.62-1.12-6.14-2.19-12.25-3.09-18.43-1.37-9.37-2.94-20.47-1.69-30,.86-6.51,2.87-12.88,3.45-19.48C339.09,77.63,338.34,71.23,342,68Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M370,63.33c-7,2.77-7.27,13.38-8.07,19.65-1.33,10.37-1.73,20.93-2.27,31.35-.48,9.22,1.67,18.62,3,27.67.83,5.76,1.76,11.21,4.36,16.49,1.79,3.63,1.95,4-2.45,4.17a28.73,28.73,0,0,1-9.16-1.05,575.68,575.68,0,0,1-.73-57.6c.35-8.3,1-16.73,1-25,0-5.52-1.65-12.88,5.33-14" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M397.67,92.67c2.19-.29,12.81-1,14.36,2,.74,1.42-1.14,6.2-1.37,7.76a91.87,91.87,0,0,0-1,12.33c-.16,16.12-.36,32.61-.72,48.54a85.48,85.48,0,0,1-8.57.33c-1.1-11.42-2.39-22.9-3.54-34.4a200.38,200.38,0,0,1-.84-20.12C396,104,397,98.7,397.67,92.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M395.33,130c0,9.54.06,26.48-7,33.92,1.68.68,3.76.46,5.58.37.61-8.25,1-16.67,1.38-24.95" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M444.67,77.33c-5-2.72-3.47,6.66-3.33,8.67.51,7.82.67,15.62.67,23.49,0,8.92.86,17.62,1.36,26.49.36,6.51.46,13.41,1.72,19.83.92,4.69,2.4,7.41,7.87,5.81,1.4-27.34-1.36-55,.38-82.3.21-3.23,1-2.17,2.27-4.4s.27-5,3.75-3.58c4.71,1.88,2.08,14.17,2,17.9-.41,12.3-1.71,24.59-2.23,36.88-.36,8.41-.85,17.68.59,26,.47,2.71,1,9.7,3.75,10.56-6.92-.24-16.09,3.53-22.72.95-.53-16.33-.92-32.79-1-49.17-.05-7.63-.93-15.23-1-22.85C438.63,87.94,437,78.35,444.67,77.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M477,75.67c1.36,2.46,4.09,3.8,5.93,5.91a54.56,54.56,0,0,1,6.25,9.25c4,7.16,7.92,14.39,12.17,21.53,4,6.8,6.95,14.19,10.73,21.13,3,5.58,6.67,9,11.52,12.77s7.41,5.84,13.63,5.73c-5,2.14-8.6,5.62-12.87,8.1-4.58-5.69-8.66-11.58-13-17.43-5.78-7.75-9.34-16.33-14.67-24.34S487.59,101.63,483.33,93c-1.7-3.46-3.87-6.54-4.91-10.28C477.85,80.64,477,71.8,477,75.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M540.67,97c-1.83,6.16-.33,14.59-.33,21,0,6.6,0,13.18-.33,19.73-.24,5.5-.08,11.05-.33,16.51-.24,5.12-1,7.1,4.45,7.09h16.11c-14.28-.76-10.06-20.28-10.59-30.34-.45-8.45.63-16.6.7-25,0-1.21.78-6.42,0-7.37-.89-1.11-2.88-.63-4.36-.64" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M585.33,121.67c-2.71,5.44-.34,16.3-.65,22.68-.26,5.42-1.19,11.08-1.63,16.27,3,.44,7.33-1.1,9.72,0-3.49-5.92-1.46-16.87-1.44-23.48C591.34,134.45,592.46,123.68,585.33,121.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M574.42,211.81c-.24,3.17.63,7,.71,10.31.23,8.73.76,17.45,1.44,26.16,1.35,17.26,3.31,34.47,4.74,51.72.26,3.13,1,2.78-2.46,3.49a30.27,30.27,0,0,1-7.12.47c-1-2.36-.41-5.56-.4-8.06,0-4.31-.52-8.54-.67-12.83-.34-10.21-.32-20.39-.74-30.58-.53-12.83-1.07-25.66-1.2-38.5,0-2.95-.13-11.65,5-10.85C578.63,203.9,574.61,209.27,574.42,211.81Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M531,215.67c3.23-3,8.55-3.56,12.62-4.29-.6,2.26-3.63,4-4.79,6.32-1.31,2.59-1.67,5.95-1.85,8.8-.51,8.39,1.44,16.92,2.85,25.13a303.37,303.37,0,0,0,8.52,34.9c.88,3,1.46,6,2.15,9,.28,1.19,1.64,4,1.59,5.09-.2,4-7.44,3.47-10.71,2.35-.36-6.51-2.73-12.28-4.55-18.54-2.31-8-3.21-16.3-4.09-24.53A223.9,223.9,0,0,1,531.33,236C531.34,229.67,530.38,223.27,531,215.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M628.67,194.67c-1.84-.19-5.55-1.18-7.33-.33-2.42,1.15-1.84,4.47-2.58,7.24-2.05,7.69-5.47,14.8-7.18,22.58-2.26,10.3-6.18,21-10.18,30.77-3.78,9.18-5.74,18.87-9.16,28.16-.87,2.38-4.17,7.24-3.83,9.65.45,3.19,5.93,5,8.52,6.57.42-4.8,0-9.18,1.23-13.95,1.14-4.28,2.27-8.6,3.52-12.86,3.23-11,6.07-22.28,8.48-33.52,1.86-8.7,5.69-17.17,9.19-25.34a63.77,63.77,0,0,0,3.74-9.92C623.66,201.41,623.59,199.54,628.67,194.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M647.67,201.67c-3.32-.28-11.86,3-13,6s.35,8.4.34,11.37c0,4.54-.15,9.13,0,13.67.29,8.56,1.29,17.08,1.67,25.64.33,7.58-.28,15.09.69,22.59.83,6.47,1,12.79,1.36,19.36,2.48.14,5,0,7.51.08-3.78-6.92-2.88-15.86-3.3-23.51-.66-12-.2-23.8-.25-35.77,0-8.69,1.8-17.22,2.17-25.88C645,210.87,646.82,206.06,647.67,201.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M665.33,194c-1.33,0-5.61.45-6.5,1.36-1.38,1.41-.4,6.65-.5,8.64-.4,8.11-1.32,16.31-1.67,24.47-.46,10.71-.54,22,0,32.7.41,8,2.29,15.71,2.67,23.73.19,4.15.3,8.26.33,12.45,0,1.92-.38,3.07,1,4,1.7,1.14,5.48.21,7.33,0,.12-9.45-2.16-20-3.3-29.44a189,189,0,0,1-1.69-29.5C663.49,227.72,666.67,213.23,665.33,194Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M692.33,233c-1,2.21-.24,6.22-.33,8.91-.16,4.61-.33,9.2-.33,13.84,0,6.58.38,13,.67,19.59.39,8.88,1.53,18.17,1.38,26.95,2.28.28,5.82.26,7-1.88,1-1.76-.16-5.48-.34-7.45-.43-4.61-.56-9.28-.72-13.9-.48-14-2.27-26.92-6.36-40.06" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M526.33,221.67c-3.89.57-8.66-.66-9.67,3.83-1.47,6.54,0,15,0,21.75,0,13,.66,25.67,1.33,38.39.31,5.86.11,11.76.38,17.64,3.28.48,6.2,1.43,7.62-1.78,1.06-2.41.23-6.1.33-8.76.17-4.89.31-9.82.68-14.7.8-10.38.32-21,.32-31.38C527.33,238.63,528.54,230.67,526.33,221.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M483.33,210a37.06,37.06,0,0,0-7.67.67c-3.15.66-2.88.1-3,3.65-.29,8.35-.33,16.65-.33,25,0,18.61-.15,37.75,1.66,56.18.77,7.88,5,8.82,12.63,8.44.52-7.8-.95-15.76-.95-23.62,0-9.13-.9-18.22-.5-27.33.31-7.11.5-14.17.5-21.32C485.67,226,487,217.38,483.33,210Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M494,195.67c-2.1-.07-6.24-.32-8,.74-2.8,1.69-1.37,5.65-1.65,8.68-.95,10.14-1.34,20-1.35,30.3,0,10.72.47,21.62,1,32.36.39,8.3.2,17,1,25.24.24,2.46-.07,8,1.33,10,1.91,2.75,6.2,1.28,9.29,1.28.09-2-.74-4-1-6-.83-5.58,0-11.42-.24-17-.38-11.2-.59-22.43-1-33.64C492.75,231.11,492.33,214.57,494,195.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M452,196.33c2.4,0,4.72-.21,6.95.73.46,21.53,1.05,43.38,1.05,65a251,251,0,0,0,1.65,30.56c.48,3.91,2.7,7.64,2.65,11.31-4.41-1.21-9.25.28-13.76,0-5-.27-5.46-.68-6.18-6.19-3.5-26.94-2.84-55.33.13-82.29.36-3.27,1-8.47,3.16-10.53.54-.5,1.93,0,2.66-.87S450.72,199.14,452,196.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M432,205.67c-1.42,0-2.87,0-4.28.06-1.38,2.56-.38,5.48-.38,8.26,0,5.78-1.35,11.52-1.34,17.37,0,13.53,0,27.06,0,40.59,0,4.88.31,10-.35,14.72-.28,2-1.2,4.31-.62,6.16.67,2.15,4.28,5.2,6.3,5.86,5.7,1.87,3.33-8.73,3.33-12.45,0-16.32-.7-32.53-1.5-48.82-.29-6-.85-11.93-.84-17.91C432.34,217.1,431.2,210.4,432,205.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M398.67,205c-3.11,0-10.57-1.34-13,1-1.68,1.61-.67,4.58-.68,7,0,4.23-.54,8.43-.34,12.65.77,16.7,1.85,33.33,1,50.11-.22,4.31-1,8.57-1.34,12.89-.25,3.2.17,6.9-.62,9.94,3.37,1.06,8,.54,11.52.35.49-2.72-.44-5.82-.66-8.6-.43-5.39-.57-10.8-.57-16.21q0-18.08,0-36.17C394,229.47,392.47,212.61,398.67,205Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M359.67,234.67c-1.46-2-10.7-.75-13.62-.28-.55,6.36.72,13.4.95,19.84.26,7.24.33,14.55.33,21.77,0,6.18-.09,12.28-.67,18.36-.12,1.22-1.08,5.63-.35,6.65,1.24,1.75,7.24.65,9.31.28.73-14,.07-28.15,0-42.14,0-5.19-.4-11.29.53-16.39C356.77,239.56,359.33,236.91,359.67,234.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M331.33,218.33c-6.24,0-8.58-.37-8.33,6,.33,8.74-1.14,17.64-1,26.35.12,7.88,1,15.72,1,23.7,0,6-.3,12.18,0,18.22.24,4.9-.34,9.59,5.94,9.37,1.78-6.4-.67-13.62-1-20.07-.44-9.73,0-19.6,0-29.33C328,241.52,331.3,230.49,331.33,218.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M321.33,186.67c-3.29-.81-8-.77-9,2.65-.74,2.42-.31,6-.67,8.59-.44,3.15-1.17,6.33-1.63,9.43-1.3,8.61.3,17.31.3,25.9,0,7.3.61,14.34,1,21.51.37,6.65-.72,13.16-1,19.73s-.33,13.45-.33,20.2c0,1.72-.74,5.42.29,6.83,1.37,1.86,6.5,1.63,8.78,1.15,4.08-.85,3.45-3.94,3.6-8.23.26-7.39.57-14.83.34-22.24-.49-15.74-.84-31.38-.68-47.15.11-11,2.92-22,.33-32.71" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M304.33,217.33a92.36,92.36,0,0,0-6,11.5c-1.54,3.22-3.78,5-5.84,7.89-5,7-8,15.28-13.14,22.28-4.32,5.93-7.89,12.32-12.5,18.19-3.65,4.64-6.94,9.67-11.15,13.8-.93.91-3.52,4.08-5,4-2.07-.06-4-3.81-4-5.49-.14-6.73,6.26-16.49,9.44-22.28,4-7.24,9.45-14.14,14.59-20.59,4.58-5.75,8.7-12.32,14.17-17.21,4.53-4,7.22-8,10.65-13,1.7-2.44,8-6.83,8.12-9.86.08-2.19-4.94-4.82-7.1-4.33s-3.49,4.25-4.66,5.88c-2.09,2.91-4.44,5.69-6.27,8.78-3.81,6.44-7.24,12.82-11.48,19-5.11,7.48-9.09,15.64-14.41,23.07-4.55,6.36-8.29,13.29-13,19.56-2.41,3.2-7.78,9.79-6,14.11,1.27,3,7.08,3.83,9.58,5.88,1.33,1.09,2.47,2.43,3.69,3.4,6.88-7.71,11.65-17.81,19-25" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M224.67,196.67a131.28,131.28,0,0,0-15.57,1c-5.35.63-4.29,3.57-4.09,8.74.67,17.21,1.66,34.69,1.67,51.92,0,11.92-.82,24.36.93,36.08.64,4.29,1.62,6.22,6.46,5.67,1.47-.17,7.39-.15,8.4-1.27,2-2.23-1-11.85-1.14-14.49-.7-18.28,1.25-36.57.28-54.82-.37-7-1.11-14.28-.93-21.31a22.61,22.61,0,0,1,.91-7.21C222.27,199.15,223.54,198.12,224.67,196.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M204.67,210.33c-3,.68-5.94.87-8.95,1.72.25,4-1.05,8.5-1.4,12.53a101,101,0,0,0-.06,17.16c1,11.86-.71,23.56-.26,35.41.18,4.85.8,9.5,1.41,14.25.29,2.26.56,9.72,2.33,11.18s8.62-.51,9.85-1.94c1.48-1.72.93-5.91,1-8,.2-5.19.55-10.38.75-15.56a279.22,279.22,0,0,0-.76-35.67c-.48-5.5-1.74-10.92-1.92-16.43A87.3,87.3,0,0,0,204.67,210.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M185.67,195.67c-2.38,0-8.11-1-10,.32s-1.34,5-1.34,7.34c0,10.89-.33,21.8-.33,32.73,0,18.1,1.33,36.31,1.33,54.35,0,2.37-1,7.67.16,9.76,1.37,2.51,5.08,1.92,7.79,1.78.52-7.72-1.84-15.65-2-23.42-.19-11.48-.31-23-.73-34.44-.35-9.54-.47-18.89.92-28.34C182.24,210.8,184.9,204.63,185.67,195.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M161.33,202.33c-2.42-.07-9.24.23-10.69,2.65-1,1.73.93,9.94,1,12.26.51,13.18,1.67,26.27,1.67,39.58v36.76c0,2.48-.7,7.64,1.64,8.77.91.43,5.06-.29,5.62-1.07,1.66-2.3.07-12.48.07-15,0-17-.33-34-.33-51C160.33,224.91,157.87,213.86,161.33,202.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M129.67,209.67c-11.07-.29-20.32,5.41-18,17.23.75,3.74,2.64,7.41,3.45,11.25.94,4.42,1.24,8.94,2,13.38,1.5,8.85,2.42,17.72,3.83,26.59,1.18,7.45,3.44,16,3.05,23.5,7.14.39,14.55-.13,20.89-3.56-5.07-.36-9-.75-11.13-6.22-3.46-9.12-5.27-20-6.91-29.56-1.86-10.93-3.85-22.35-3.91-33.45C123,222.64,123.32,215.83,129.67,209.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M105,235c-1,3-.51,6.79-1.07,10a90.56,90.56,0,0,0-1.59,13c-.22,6.91,0,13.77-.33,20.67-.4,8-1,15.94-1.39,24-4.41-1.19-7.16,1.32-8.12-4.31-1.19-7-.42-14.47-.76-21.56-.31-6.45-.06-13-.07-19.41,0-3,.08-5.07,1.4-7.72,1.8-3.62,6-6.42,6.93-10.29" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M97.67,328.33c-4.84.56-4.93,4.53-3.92,8.42.89,3.4,3.12,11.19,6.39,13.1,4.42,2.58,8.26-5.29,10.2-8.39a69.68,69.68,0,0,1,8.63-10.7C113.45,327.11,107,327.33,97.67,328.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M201.66,327.34c-8.3.17-16.71-.55-25,.4-7.92.91-15.71,1.69-23.71,1.27-3.21-.17-6.47-.67-9.67-1-2.61-.28-5.72-1.67-8.29-1.37-5.43.63-12,7.74-17,10.31-3,1.53-12.82,4.75-13,9.15-.15,3.57,7.23.11,9.47-.26a71.05,71.05,0,0,1,16.35-.77c3.2.23,7.35.74,10.31,2,3.36,1.47,5.74,4.51,9.24,7.23-.28-3.45-6.64-9.29-5.36-11.76.67-1.29,7-2.82,8.27-3.18,4.36-1.22,9-2,13.45-2.91,8-1.71,15.59-.78,23.63-.32,3.63.21,10.17-.89,11.6,3.7,1.07,3.43-2.31,7.72-3.51,10.73-4.75,11.87-6.4,25.23-2.84,37.65,2.22,7.75,3.75,17.79,10.43,23a45,45,0,0,0,11.3,6.37c-1.4-2.58-4.66-4.33-6.64-6.59a24.09,24.09,0,0,1-5-9.54c-1.12-4.88.52-6.58,4.35-8.5-5.9-2.91-5.52-9.35-4.81-15.68,1-9,4.46-16.78,11.4-22.66,6.07-5.15,13.17-6.94,21-7.34,4.56-.23,7.89,1,12,1.63-2.63-2-2.58-3.06-4-6.36-.71-1.7-2.5-3.34-3-5.06-.52-1.93,1-3.85.55-5.9-4.72-1.35-4.94,1.38-8.09,2.85s-9.28-5.14-12.28-6.35C216.12,325.39,208.74,327.2,201.66,327.34Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M172.33,393c-10.71.93,1.19,11.2,5.88,12.37C174.46,403.8,167.71,393.12,172.33,393Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M174,405c-5.19,1.15-15.55,10.63-6.77,14-3.23,2.42-8.22-2.7-8.87-5.81-1.19-5.64,5.41-9.42,9-12.19" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M174,418c-6.44.18,2.56,13.07,2.28,14.62-7.62.81-24.82-12.92-17.59-21.51-.18,4.11,1.55,8.35,6.07,8.23C167.58,419.26,169.93,417.64,174,418Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M140.67,416.67c-6,2.29-11.74,5.45-17.93,7.59-4.49,1.55-10.5,3.34-14,6.75-2.22,2.17-3.12,5.71-3.4,8.82-.37,4.06,1,6-3.9,6.48-4.45.46-9.54-.13-14.06-.35.71-4.08.7-7.92,1.88-12a64.87,64.87,0,0,0,2.38-12.07c.68-7.46.58-16-1.05-23.26-1.69-7.51-3.93-13.69-3.59-21.65a32.08,32.08,0,0,1,9.61-21.54c7.09-6.64,18.12-10.21,27.72-7.67-1.85,1.82-4.85,2.58-7.22,3.74a30.13,30.13,0,0,0-10.22,8.11,50.51,50.51,0,0,0-9,18.41c-2.18,9-.07,19.94,6.85,26.39,7.58,7.07,18.77,16.22,30,13" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M81.67,522.67c2-4.66,2.61-10.29,3.92-15.26.71-2.68.47-10.63,2.9-12.22,1.75-1.15,10.47.82,11.83,2.48,1.85,2.26-1.93,4.92-2.74,8.09-1.26,5-1,10.52-1.25,15.6-.53,10.79-1,21.55-1.71,32.29-3.41-.53-7.47-13.76-8.76-16.65C83.9,532.61,80.57,526.58,81.67,522.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M124,509.33a9.09,9.09,0,0,0-8.34,1.75c-2.73,2.55-1.36,6-1.33,9.57.11,12.64,2,25.14,2,37.84a163,163,0,0,1-1,16.58c-.22,2.19-2.41,9.69-.94,11.52,1.17,1.45,8,1.34,9.61,0s1-4.36,1-6.56c0-5.42,1-11.13,1.66-16.54,1.33-11-.53-20.62-1.33-31.42a120.43,120.43,0,0,1-.34-13.78C125.15,514.52,126.43,508.82,124,509.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M142.67,480.67c-6,0-10.22-2.33-13.8,3.17-4.47,6.85-3.2,13.41-3.2,20.92,0,10,1.34,19.82.15,29.76-1.08,9.05.94,18.14-.56,27.13a118.71,118.71,0,0,0-1.21,25c4.23.22,8.55.05,12.8.05,3.15,0,6.39,1.06,9.43.61.23-4.22-4.32-8.19-5.36-12.24-1.32-5.14-1.56-10.38-1.92-15.67-.82-12.37-1.68-24.82-1.67-37.22,0-8.39-.7-16.42,3-24.17,2-4.09,6.15-8.91,4.66-14.64-4.72-.09-12.36.92-16.54,3.33-3.06,1.76-3.41,6.25-3.23,10.64" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M156.31,497.08c-1.62,1.43-1.32,2.42-1.31,4.66a183.3,183.3,0,0,0,1.67,21.63c1.78,14.67.33,29.79.33,44.55,0,6.58.35,13.15.72,19.7,3.52.4,14.68,3.46,17-.62,1.08-1.94.07-7.95,0-10.15-.23-4.82-.3-9.63-.3-14.48,0-13.42.72-26.75.67-40.16,0-9.37-1-19.18.33-28.47.56-3.86,1.9-8.3,1.63-12-2.42-.36-5.44.18-7.91.34-1.42,4.4-.88,9.59-1.1,14.22C168,496.25,157.49,496,156.31,497.08Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M196.67,489c-5.26-.25-5,5.59-5,9.33A223.63,223.63,0,0,0,193.34,523c1.84,15.29,1.32,30.9,1.32,46.32,0,5.81.07,11.55.38,17.31,1.47.09,7.26.85,8,.07,1.51-1.49-.07-8.36-.1-10.43-.08-7-.27-13.71-.81-20.65-1.15-14.84-.62-29.9-1.36-44.78-.36-7.26-.31-14.53-.53-21.78C200,489,199.66,488.94,196.67,489Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M220.33,492.33a14.91,14.91,0,0,0-4.29.38c-1.48,5.41,0,12.72.3,18.34.54,9.27.33,18.84.33,28.12,0,7.85.69,15.5.67,23.35,0,4.71,1.57,9.19,1.39,13.77,2.49-.75,11.84-3.8,12.63-6.78.58-2.18-2.41-6.65-2.78-8.95a27.8,27.8,0,0,1,.69-10.8,188.87,188.87,0,0,0,3.38-23.91c.57-6.48.49-13.79-1.88-19.85C229.52,502.83,225.86,490.53,220.33,492.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M160.33,645c-.82-2.4-1.62-10.72-.67-13,1.16-2.8,7.83-3.39,10.69-3.65,3.49-.32,5.62-.25,6.63,3,1.7,5.43.2,12.35,2.11,17.54a106.73,106.73,0,0,0,2.17-19.13c.14-3.27-.79-7.39,3.76-7.08,3,.2,2.5,1.61,3.91,3.67s3.28,3.35,3.74,6.69c.24,1.71-.52,4.12,1,5.41.94.81,2.71,0,3.77.88,2.09,1.71,3.62,8.86,4.51,11.37.44,1.23.07,2.82,1.05,3.68.48.42,3.68,1.09,4.68,1.65,5,2.81,9.48,2.69,15,3.91,6,1.32,11.72.52,12.38,7.72,1,10.3.88,20.9,1,31.24-3.88,1-9.37-2.15-12.9-3.58a85.82,85.82,0,0,1-23.71-15.06c-7.29-6.57-15.24-12.41-22.31-19.17C171.48,655.7,162.74,652,160.33,645Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M561.67,527.33c6.45,4.84,10.16,17,14.33,24.36,3.09,5.46,7.2,10.27,10.17,15.77,2.22,4.11,3.95,8.67,6.42,12.61.77,1.23,2.09,2.32,1.86,3.68-.19,1.15-3.74,4-4.72,4.22-.81-4.32-5.64-8.81-7.86-12.75q-6.05-10.78-12.37-21.38c-2.41-4-5.84-7.35-8.5-11.16C557.33,537.41,558.72,531.81,561.67,527.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M626,481.33c-3.63-.26-7.16,1-10.74,1.34-2,.2-6.08-.33-7.28,1.64s-.12,8.15-.33,10.35a84.26,84.26,0,0,0-.06,15.64c2.07,21.74,1.16,43.75.15,65.53-.1,2.17-1.42,11.59.33,13.1,1.26,1.1,5.54-.4,6.95-.53,2.63-.24,5.32,0,7.95-.1-.88-7.6-2.87-15.28-3.7-23a311.87,311.87,0,0,1-1.6-36.37c.16-15.13,6.53-29.9,6-44.84a2,2,0,0,0-1.63.25" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M648.33,496c-3.37-.09-8.79,1.66-9.68,4.67-1.58,5.33.08,13.48,0,19-.16,13.34-.92,26.72-.26,40.11.3,6.11.63,12.28.93,18.38.25,4.94-1.55,9.27,4.26,9.47,3.07.11,10,1.24,12.73-.24,3-1.64,1.58-6,1.33-9.09-.53-6.93-.33-13.91-.33-20.87,0-16.13-1.18-32.22-.5-48.36.39-9.15,2.24-18.61,1.82-27.72-6.1-.69-7.45,1-8.08,6.31C650.29,490.07,650.29,496.06,648.33,496Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M688.67,489.67c-3.68,0-9-.62-11.58,2.33-3.78,4.38-3.08,13.19-3.08,18.39,0,19.23,4.62,37.9,4.67,57,0,6.94-2.44,14-2,20.87,7.27-1.84,7.85-2.67,8-10.6.19-13.45.68-26.83.68-40.33C685.33,521.17,683.62,505,688.67,489.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M716,497.33c-1,.19-6.34-.36-7.59,1.06-1.92,2.18-1.45,10.76-1.58,13.55-.46,10.06-1.54,19.74-2.86,29.64,4.72-8.76,6.72-20.48,8-30.22C712.61,506.83,712.71,500,716,497.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M621,654.67c3.15-2.21,3.35-6.94,4.58-10.42.93-2.66,2.33-5.19,3.17-7.91,1.28-4.11,4.28-10.25,3.53-14.62a5.33,5.33,0,0,1-3.88-1C625.23,631.09,619,642.5,621,654.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M596.33,646.67c.27,7.17-1.33,14.41-1.33,21.67,0,3.86.14,7.77-.05,11.61-5.35,1.56-9.95,6.33-14.93,8.73-6.16,3-12.76,6.71-19.29,8.63-.46-3,1.06-6.79,1.36-9.89.41-4.19-.06-8.45.57-12.6a60.35,60.35,0,0,0,1-9c0-1.16-.62-5.13.18-6s4.92.09,6.22-.16c3.48-.68,7.05-2.65,10.31-4A98.74,98.74,0,0,0,596.33,646.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M559,329.67a26.61,26.61,0,0,0,7.93-.92c2.35-.48,5.38-2.11,7.61-.43s.28,4.68,3.46,4.94c1.13.09,2.32-1.42,3.25-1.86a35.56,35.56,0,0,1,6.27-2,56.92,56.92,0,0,1,11.82-1.82c12.22-.57,24.58-1.11,36.85-.6,7.21.3,14.41.77,21.63,1a81.75,81.75,0,0,1,9.48,1c4,.58,7.77-.35,11.69.95,3.59,1.19,7.17,2.48,10.68,3.85,1.29.5,3.63,1.78,5,1.5,1.77-.37,2.68-2.29,4.25-3.53,3.3-2.63,9.2-5.13,13.14-2.74-2.2,2-7.7,3.94-8.4,7.19-.95,4.42,3.54,1.36,6.3,1.87.3,1.76-.64,2.86-1.12,4.45-.79,2.56-.13,2.65.17,4.41.2,1.19,1.08,3.68-1.15,4.71-1.67.77-5.39-.72-5.57-2.56-5.18-1.77-11.27.25-15.92,2.59-10.72,5.41-19,10.13-23.71,21.77-6.06,15-4.17,29.79,8.29,40.53-8,.69-15.79-9.3-18.62-15.7a58,58,0,0,1-5.32-23.4c0-7.37,1.91-13.16,4.34-20,2.88-8.09-6.68-7.32-12.73-8.29-7.47-1.19-15.71-2.17-23.29-1.59-6.62.5-5.45,3.86-6,9.62-2.48,0-7.08-5.42-9.6-6.71-4.34-2.23-8.72-2.25-13.54-2.23-9.16,0-17.18,3.75-26,5,.42-3.09-3.08-2.5-4.9-4-3.36-2.69-3-7.84-2.71-11.67C552.92,329.22,553.6,329.16,559,329.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M598.33,348c-5.19-3.16-14.84-.6-20.35.75a28.59,28.59,0,0,0-16.62,10.55c-11,13.86-9.22,29.22-2.85,44.93,1.77,4.36,3.45,9.3,7.14,12.44,2.39,2,5.28,3.15,7.9,4.68-8.89.42-13.19-4.78-17.64-11.51-5.06-7.65-9.3-15.47-9.57-25a38.42,38.42,0,0,1,6.3-22.13,40.56,40.56,0,0,1,6.69-8.66c4.54-4.14,10.7-4.61,16-7.06" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M636.67,393c-4.08-.48-8.65,3.33-7.27,7.68,1,3.21,5.65,4.8,8.23,6.41-5.39,3.38-10.56,3.18-11.58,10.54,2.29,0,4.53.32,6.91.43-.41,2.87-1.68,5.68-.54,8.61.76,1.95,2.72,3.29,4,5-3,3.74-11-.55-14.14-2.42-3.58-2.09-2.09-2.47-3.54-5.58-1.08-2.32-3.8-2.65-5.23-4.9-2.1-3.31-1.3-8,.19-11.34,1.86-4.21,4.22-4.74,7.39-7.42,1.34-1.13,1.64-2.76,2.79-3.85,1.6-1.51,4.07-1.52,6.17-2.14" transform="translate(-53.25 -44.96)"/></g></g><g id="DETAILS"><path class="cls-24" d="M636.33,431.17a1.5,1.5,0,0,1-1.46-1.14c-.77-3.17-.62-6.77-.48-10.25.05-1.32.11-2.57.11-3.77a1.5,1.5,0,0,1,3,0c0,1.26-.05,2.6-.11,3.89-.13,3.28-.27,6.67.4,9.42a1.5,1.5,0,0,1-1.46,1.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M177.34,430.83h-.21a1.5,1.5,0,0,1-1.28-1.69,37.15,37.15,0,0,0-.09-7.5c-.13-1.65-.26-3.35-.26-5a1.5,1.5,0,0,1,3,0c0,1.5.12,3.07.25,4.73a39.23,39.23,0,0,1,.07,8.14A1.5,1.5,0,0,1,177.34,430.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M569,342.17a1.5,1.5,0,0,1-.73-.19c-.63-.35-1.23-.71-1.83-1.07-2.38-1.43-4.43-2.67-7.31-2.41a1.5,1.5,0,1,1-.27-3c3.84-.34,6.53,1.27,9.12,2.83.57.34,1.14.69,1.74,1a1.5,1.5,0,0,1-.73,2.81Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M569,341.5a1.5,1.5,0,0,1-1.42-1,17.5,17.5,0,0,1-.48-6.45c0-.7.07-1.39.07-2a1.5,1.5,0,0,1,3,0c0,.7,0,1.44-.07,2.19a15.14,15.14,0,0,0,.32,5.32,1.5,1.5,0,0,1-1.42,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M700.66,342.78a1.44,1.44,0,0,1-.71-.18,1.46,1.46,0,0,1-.59-2l0-.08c1.39-2.46,3.29-5.84,3.43-8.59a1.5,1.5,0,0,1,3,.15c-.18,3.46-2.28,7.19-3.81,9.91A1.58,1.58,0,0,1,700.66,342.78Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M701,343.83a1.5,1.5,0,0,1-.85-2.74,24.7,24.7,0,0,1,9.93-3.58,1.5,1.5,0,0,1,.5,3,21.84,21.84,0,0,0-8.74,3.09A1.49,1.49,0,0,1,701,343.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M242.33,343.5a1.5,1.5,0,0,1-1.32-2.21l.54-1c1.08-1.95,2.57-4.61,3-6.9a1.5,1.5,0,1,1,3,.52c-.49,2.79-2.11,5.71-3.3,7.84l-.52.95A1.5,1.5,0,0,1,242.33,343.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M243.26,342.84l-.4,0a1.5,1.5,0,1,1,.28-3,28.1,28.1,0,0,0,6.41-1.27,1.5,1.5,0,0,1,.9,2.86A32.77,32.77,0,0,1,243.26,342.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.33,344.17a1.5,1.5,0,0,1-1.41-1c-.71-1.92-4.84-5.23-6.7-5.36a1.5,1.5,0,0,1,.21-3c3.27.23,8.26,4.49,9.3,7.31a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M109.67,343.5a1.5,1.5,0,0,1-1.38-.9c-1-2.2-1.91-9.32.22-11.89a1.5,1.5,0,1,1,2.31,1.91c-1,1.17-.69,6.68.22,8.78a1.5,1.5,0,0,1-1.37,2.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.83,217.59c-3.24,0-6.29-.39-8.5-1.78a1.25,1.25,0,0,1,1.33-2.11c3,1.87,8.76,1.43,13.43,1.07,1.78-.14,3.47-.26,4.9-.26,3.17,0,6.77-.09,9.56-1.17a1.25,1.25,0,0,1,.9,2.33C234.27,216.9,230.38,217,227,217c-1.33,0-3,.12-4.71.26C220.18,217.42,218,217.59,215.83,217.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.7,222.35c-3.13,0-6.2-.35-8.59-1.77a1.25,1.25,0,1,1,1.28-2.15c3,1.77,7.8,1.49,12,1.24,1.43-.08,2.77-.16,4-.16.82,0,1.7,0,2.59.06,2.9.1,5.89.21,8-.71a1.25,1.25,0,1,1,1,2.29c-2.61,1.14-6,1-9.06.92-.86,0-1.71-.06-2.5-.06-1.15,0-2.47.08-3.86.16C219,222.25,217.34,222.35,215.7,222.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M220.25,211.33c-1.06,0-2.08-.74-3-2.2-1.12-1.69-1.28-6.22.52-7.53.38-.27,1.73-1,3.25.87A1.25,1.25,0,0,1,219,204a7.39,7.39,0,0,0,0,3,1.25,1.25,0,0,1,.73-.95,4.58,4.58,0,0,1,2.71-.3,1.25,1.25,0,0,1,1,1.47c-.59,3-1.82,3.82-2.75,4A2.33,2.33,0,0,1,220.25,211.33Zm-.47-2.92a1.84,1.84,0,0,0,.45.39,1.47,1.47,0,0,0,.22-.32A1.26,1.26,0,0,1,219.78,208.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M226.3,210.34a3.82,3.82,0,0,1-1-.15,2.84,2.84,0,0,1-2-2,8.61,8.61,0,0,1,1.22-6.48,3.12,3.12,0,0,0,1.05-.76,1.25,1.25,0,0,1,1.72.41c.31.5,2.64,5.81,1,8A2.38,2.38,0,0,1,226.3,210.34Zm-.38-5.79a5.77,5.77,0,0,0-.2,2.89c.09.31.19.33.23.34a1,1,0,0,0,.4.05C226.61,207.44,226.32,205.89,225.92,204.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M218.77,281.3c-4.57,0-9.06-.65-11-3.31a1.25,1.25,0,1,1,2-1.48c2.21,3,11.17,2.31,16,1.94,1.14-.09,2.15-.17,3-.2,3.06-.12,7.16-1.07,8.9-2.87a1.25,1.25,0,0,1,1.79,1.74c-2.39,2.46-7.2,3.49-10.6,3.63-.79,0-1.77.11-2.87.19C223.8,281.11,221.27,281.3,218.77,281.3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.15,285c-4.72,0-9.85-.19-14.16-2.12a1.25,1.25,0,1,1,1-2.28c4.34,1.95,9.67,1.92,14.82,1.9h1.82c2.67,0,8.25,0,10.18-2.09a1.25,1.25,0,1,1,1.84,1.69c-2.67,2.92-8.75,2.91-12,2.91h-3.49Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M260.15,291.5c-5.17,0-12.44-6.59-14.82-9.15a1.25,1.25,0,1,1,1.83-1.7c3.24,3.49,9.38,8.35,13,8.35h.11a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.75,289a1.24,1.24,0,0,1-.31,0c-5.06-1.3-11.1-5.88-14.85-9.85a1.25,1.25,0,0,1,1.82-1.72c3.38,3.59,9.1,8,13.65,9.15a1.25,1.25,0,0,1-.31,2.46Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M297.25,229.5l-.23,0c-4.42-.83-9.93-2.35-13.26-6.72a1.25,1.25,0,0,1,2-1.52c2.82,3.69,7.75,5,11.74,5.78a1.25,1.25,0,0,1-.23,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M299.5,227.5h0c-3.75,0-7.37-2.34-10.56-4.39a43.46,43.46,0,0,0-3.75-2.25,1.25,1.25,0,1,1,1.12-2.23,44.92,44.92,0,0,1,4,2.38c3,2,6.19,4,9.21,4a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M302.75,224.25h-.07c-4.22-.24-7.69-3.18-10.75-5.78-1.18-1-2.3-1.94-3.39-2.69a1.25,1.25,0,0,1,1.41-2.06,45.3,45.3,0,0,1,3.59,2.85c2.9,2.45,5.89,5,9.27,5.19a1.25,1.25,0,0,1-.07,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M225.2,288.58a84.79,84.79,0,0,1-18-1.61,1.25,1.25,0,0,1,.53-2.44c9,1.94,18.55,1.63,27.82,1.33l3.38-.11a1.25,1.25,0,0,1,.07,2.5l-3.37.11C232.21,288.47,228.71,288.58,225.2,288.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M203.42,226.89a23.26,23.26,0,0,1-6.81-1.45,1.25,1.25,0,0,1,.78-2.37c1.72.57,5.76,1.9,7.58,1.05a1.25,1.25,0,1,1,1.05,2.27A6.16,6.16,0,0,1,203.42,226.89Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M203.75,230.5h0a24.26,24.26,0,0,1-4.32-.53,19.58,19.58,0,0,0-3.91-.47h0a1.25,1.25,0,0,1,0-2.5,22.23,22.23,0,0,1,4.4.51,22.07,22.07,0,0,0,3.88.49,1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M204.21,291.25a17,17,0,0,1-3.78-.54,17.39,17.39,0,0,0-2.75-.47,1.25,1.25,0,0,1-1.17-1.32,1.24,1.24,0,0,1,1.32-1.17,19.55,19.55,0,0,1,3.15.52,13.65,13.65,0,0,0,3.48.48,1.25,1.25,0,0,1,.08,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.25,211.87c-.81,0-1.63,0-2.42-.06s-1.28-.05-1.83-.05a1.25,1.25,0,0,1,0-2.5h0c.58,0,1.23,0,1.93.05,2,.08,4.55.18,5.76-.42a1.25,1.25,0,0,1,1.11,2.24A10.66,10.66,0,0,1,183.25,211.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M182.34,216.06a6,6,0,0,1-3-.5,1.25,1.25,0,0,1,1.28-2.15,15.14,15.14,0,0,0,3.34.11l1.28,0a1.25,1.25,0,0,1,0,2.5l-1.2,0C183.43,216,182.86,216.06,182.34,216.06Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M184.5,286.5h-.25a1.25,1.25,0,0,1,0-2.5h.25a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M162.75,220.25a30,30,0,0,1-6.77-.53,1.25,1.25,0,1,1,.55-2.44,27.88,27.88,0,0,0,6.17.47l.05,1.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M160,229a1.25,1.25,0,0,1-.42-.07c-.27-.09-.63-.26-1-.45s-.71-.33-1.06-.47a1.25,1.25,0,0,1-2-.8,1.55,1.55,0,0,1,.56-1.52c.91-.7,2.12-.13,3.53.53.32.15.61.29.82.36A1.25,1.25,0,0,1,160,229Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M159,295.25a1.25,1.25,0,0,1-.73-2.26,7,7,0,0,1,2.65-1l.75-.18a1.25,1.25,0,1,1,.67,2.41l-.86.21a5.26,5.26,0,0,0-1.74.6A1.24,1.24,0,0,1,159,295.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M121.9,229.57a22.28,22.28,0,0,1-5.46-.61,1.25,1.25,0,0,1,.61-2.42,25,25,0,0,0,8.56.33l1-.09c2.75-.25,7.34-.67,9.07-2.21a1.25,1.25,0,1,1,1.66,1.87c-2.35,2.09-7.26,2.54-10.51,2.84l-1,.09C124.43,229.5,123.12,229.57,121.9,229.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M119,234.75a1.25,1.25,0,0,1,0-2.5c1.84,0,3.7-.15,5.49-.28,1.06-.08,2.13-.16,3.2-.22a1.25,1.25,0,0,1,.13,2.5c-1.05.05-2.1.13-3.14.21-1.84.14-3.74.28-5.67.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M130.92,292.79c-.6,0-1.2,0-1.75-.06l-.4,0a1.25,1.25,0,0,1-1-.66,1.87,1.87,0,0,1-.22-1.13,1.27,1.27,0,0,1,1.11-1.4,1.24,1.24,0,0,1,1.29.74c1.71.08,3.4.05,4.51-.94a1.25,1.25,0,1,1,1.67,1.86A7.39,7.39,0,0,1,130.92,292.79Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M100.65,293a16.77,16.77,0,0,1-6.1-1.1,1.25,1.25,0,0,1,.91-2.33,14.75,14.75,0,0,0,6,.92,1.25,1.25,0,1,1,.12,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M103,253.75H96.75a1.25,1.25,0,0,1,0-2.5H103a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M316.38,201.63a28.3,28.3,0,0,1-4.06-.39,1.25,1.25,0,1,1,.35-2.47h0c2.75.4,4.92.71,7.29-.4a1.25,1.25,0,1,1,1.06,2.26A10.62,10.62,0,0,1,316.38,201.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M315.5,206h0a4,4,0,0,1-2.92-1.45,1.25,1.25,0,1,1,1.92-1.6,1.47,1.47,0,0,0,1.08.55,1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.84,298.77a10.29,10.29,0,0,1-3-.57,8,8,0,0,0-2.3-.45,1.25,1.25,0,0,1-.06-2.5,9.52,9.52,0,0,1,3.08.55,7.1,7.1,0,0,0,2.6.45,1.25,1.25,0,1,1,.21,2.49Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M315.81,294a2,2,0,0,1-1.5-.7A1.25,1.25,0,0,1,316,291.5h0a1.25,1.25,0,0,1,.26,2.47A2.16,2.16,0,0,1,315.81,294Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M331.74,237.75a12.81,12.81,0,0,1-4.15-.82,1.25,1.25,0,1,1,.81-2.37,10.12,10.12,0,0,0,3.55.68,1.25,1.25,0,1,1,.09,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M367.76,250.38c-1,0-2,0-3-.07-1.61-.06-3.14-.07-4.72,0-2.81.1-5.73.2-8.4-1.19a1.25,1.25,0,1,1,1.15-2.22c2.1,1.09,4.56,1,7.17.91,1.64-.06,3.23,0,4.9,0,3,.1,6.07.21,8.68-.74a1.25,1.25,0,1,1,.85,2.35A19.37,19.37,0,0,1,367.76,250.38Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M366.25,253.75c-4,0-7.73-.17-11.37-.51a1.25,1.25,0,0,1,.23-2.49c3.56.33,7.2.49,11.13.49a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M404.37,234.9a10.12,10.12,0,0,1-2.15-.23,10.85,10.85,0,0,1-7.26-5,10.7,10.7,0,0,1-.75-8.67c1.15-3.67,5.93-7.72,10.18-7.23,7.43.77,10.94,7.22,10.61,11.58a10.23,10.23,0,0,1-4.18,7.39A10.8,10.8,0,0,1,404.37,234.9Zm-.69-18.68c-2.82,0-6.29,3-7.09,5.52a8.24,8.24,0,0,0,.53,6.67,8.39,8.39,0,0,0,5.63,3.82,8.13,8.13,0,0,0,6.57-1.51,7.74,7.74,0,0,0,3.18-5.57c.24-3.26-2.6-8.31-8.38-8.91h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M416.68,242.27c-2.57,0-5.17,0-7.74-.14-1.52-.07-3-.16-4.58-.25-3.16-.19-6.45-.35-9.62-.37-.59,0-1.3,0-2.08.07-2.88.14-6.14.3-7.83-.77a1.25,1.25,0,0,1,1.33-2.12c1,.64,4.24.49,6.38.39.89,0,1.67-.08,2.34-.08,3.22,0,6.48.19,9.63.38,1.52.09,3,.18,4.54.25,3.52.16,7.14.15,10.64.13h3.05a1.25,1.25,0,0,1,0,2.5h-6.07Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M432.44,215.28c-.42,0-.84,0-1.25,0a1.25,1.25,0,1,1,.12-2.5,57.87,57.87,0,0,0,8.39-.51c2.29-.25,4.45-.48,6.3-.49h0a1.25,1.25,0,0,1,0,2.5c-1.72,0-3.82.23-6,.47A72.52,72.52,0,0,1,432.44,215.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M430.5,219.5a1.25,1.25,0,0,1-.23-2.48,76.8,76.8,0,0,1,14.48-1,1.25,1.25,0,0,1,0,2.5,74.64,74.64,0,0,0-14,1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M456.75,222c-.43,0-.87,0-1.3,0a1.25,1.25,0,0,1-1.1-1.68c.67-1.81,1.26-3.74,1.83-5.61.72-2.38,1.47-4.84,2.42-7.15a1.25,1.25,0,0,1,2.27-.08,32.87,32.87,0,0,0,2.57,4c2.06,2.9,4.19,5.89,4,8.87a1.25,1.25,0,0,1-1.25,1.18h0a39.69,39.69,0,0,0-4.91.25C459.8,221.86,458.29,222,456.75,222ZM460,210.86c-.52,1.49-1,3-1.44,4.53-.41,1.35-.83,2.74-1.29,4.1,1.23,0,2.48-.14,3.77-.26s2.52-.23,3.81-.27c-.44-1.86-2-4-3.45-6.1C460.93,212.21,460.45,211.53,460,210.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M460.45,247.43a5.05,5.05,0,0,1-4.72-2.68c-1.77-3.28-.51-8.47,1.76-10.75a3.53,3.53,0,0,1,4.22-.91c3.38,1.05,5.33,5.14,5.2,8.38a5.74,5.74,0,0,1-4.7,5.77A8.85,8.85,0,0,1,460.45,247.43Zm-.21-12.19a1.42,1.42,0,0,0-1,.53c-1.57,1.58-2.5,5.64-1.33,7.8.24.45,1,1.8,3.79,1.23a3.28,3.28,0,0,0,2.7-3.41c.1-2.59-1.54-5.35-3.52-5.92a1.25,1.25,0,0,1-.24-.1A.86.86,0,0,0,460.24,235.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M461.06,273.63a15,15,0,0,1-3.85-.46,1.25,1.25,0,0,1-.92-1.17c0-.92-.15-1.86-.27-2.85a23.47,23.47,0,0,1-.27-4.48,1.27,1.27,0,0,1,.1-.42,12.49,12.49,0,0,1,7.33-6.77,3.17,3.17,0,0,1,2.82.29c1.53,1.12,1.8,4.45,1.75,9.83,0,.5,0,.9,0,1.15V269c.08,2.88-.22,3.68-3.23,4.32A16.94,16.94,0,0,1,461.06,273.63Zm-2.33-2.69a15.17,15.17,0,0,0,5.28-.11,8.3,8.3,0,0,0,1.24-.33,10.35,10.35,0,0,0,0-1.47v-.22c0-.28,0-.71,0-1.24.05-5.74-.38-7.41-.75-7.8-.79-.27-4.62,1.71-6.27,5.28a22.69,22.69,0,0,0,.27,3.79C458.59,269.53,458.67,270.23,458.73,270.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M499.19,228.22a9.21,9.21,0,0,1-1.77-.17c-4.48-.87-6.68-3.57-6.92-8.47-.19-3.88,1.83-10.92,6-13.49a6.41,6.41,0,0,1,6.88.07,1.25,1.25,0,0,1-1.23,2.18,4,4,0,0,0-4.34-.12c-3.12,1.93-5,8-4.8,11.24.19,3.77,1.56,5.49,4.9,6.14,2.67.52,5.84-.58,6.76-3.7.62-2.12-.39-6.15-2.41-7.65a2.53,2.53,0,0,0-3.18.08c-.92.6-2.12,3.18-2.24,5.5-.06,1.18.19,1.82.45,2a1,1,0,0,0,1.2.09,1.88,1.88,0,0,0,.89-1.13,1.29,1.29,0,0,1-.42-1.63,1.21,1.21,0,0,1,1.61-.56,2.32,2.32,0,0,1,1.32,2.15,4.19,4.19,0,0,1-2.43,3.49,3.43,3.43,0,0,1-3.74-.46c-1-.8-1.47-2.22-1.37-4.1.14-2.62,1.46-6.22,3.37-7.46a5,5,0,0,1,6,0c2.94,2.19,4.2,7.37,3.32,10.36A8,8,0,0,1,499.19,228.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M496.25,258.25A1.25,1.25,0,0,1,495,257a38,38,0,0,1,.89-8.09c.27-1.5.53-2.92.68-4.3.06-.55.09-1.32.12-2.21.12-3.34.26-7.49,2.26-9.16a1.25,1.25,0,0,1,1.93.44c.62,1.34,1.31,2.72,2,4.05.49,1,1,1.95,1.45,2.92.17.36.41.8.67,1.29,1.5,2.84,2.72,5.34,2.52,7.25-.26,2.38-2.82,3.8-5.29,5.17a15.92,15.92,0,0,0-3.27,2.14,1.25,1.25,0,0,1-1.36.28l-.07,0s0,.1,0,.15a1.25,1.25,0,0,1-1.2,1.3Zm3.59-10.6a39.39,39.39,0,0,0-.52,5.53c.54-.33,1.1-.64,1.66-.95l1-.58a1.24,1.24,0,0,1-.52-.4A12.68,12.68,0,0,1,499.84,247.65Zm-.17-4.88a1.25,1.25,0,0,1,1.06.59,16,16,0,0,1,1.44,3.39,11.14,11.14,0,0,0,1.32,3,1.24,1.24,0,0,1,.25.8A2.77,2.77,0,0,0,505,249c.14-1.3-1.35-4.12-2.24-5.81-.28-.52-.52-1-.71-1.37-.46-1-.95-1.93-1.43-2.89l-.93-1.86a32.17,32.17,0,0,0-.52,5.49v.33a1.24,1.24,0,0,1,.47-.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M493.31,296.12a1.23,1.23,0,0,1-1-.54c-.24-.34-.51-1,.32-1.93a1.25,1.25,0,0,1,1.77-.07,1.17,1.17,0,0,1,.15.17,1.25,1.25,0,0,1-.25,2.14A2.35,2.35,0,0,1,493.31,296.12Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M501.16,296a1.21,1.21,0,0,1-.92-.39c-.37-.42-.61-1.1.33-2a1.29,1.29,0,0,1,1.8,0,1.21,1.21,0,0,1,0,1.73l-.14.13a1.2,1.2,0,0,1-.17.17A1.4,1.4,0,0,1,501.16,296Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M507.58,295.18h-.17a1.33,1.33,0,0,1-1.16-1.3,1.37,1.37,0,1,1,2.67,0l0,.08C508.63,294.79,508.19,295.18,507.58,295.18Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M494.91,292.32c-1.58,0-3.16,0-4.72,0s-3.13,0-4.69,0a1.25,1.25,0,0,1,0-2.5c1.57,0,3.14,0,4.72,0a135.16,135.16,0,0,0,14.23-.34c.88-.08,1.9-.13,3-.18,2.7-.12,6.06-.26,7.75-1.14a1.25,1.25,0,1,1,1.14,2.22c-2.18,1.12-5.69,1.28-8.78,1.41-1,0-2,.09-2.86.17C501.45,292.25,498.17,292.32,494.91,292.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476.59,238.29l-2.13,0-2,0a1.25,1.25,0,1,1,0-2.5h0l2,0a37.3,37.3,0,0,0,8.23-.49,1.25,1.25,0,1,1,.54,2.44A31.24,31.24,0,0,1,476.59,238.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M482,243c-1.25,0-2.52-.07-3.74-.15a42.49,42.49,0,0,0-4.93-.11,1.25,1.25,0,0,1-.14-2.5,45.62,45.62,0,0,1,5.22.11c1.19.07,2.43.14,3.6.14a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M472.5,233a1.25,1.25,0,0,1,0-2.5c1.46,0,2.95-.13,4.39-.25a48.2,48.2,0,0,1,5.41-.25,1.25,1.25,0,0,1,1.21,1.29,1.27,1.27,0,0,1-1.29,1.21,45.31,45.31,0,0,0-5.12.24c-1.49.13-3,.26-4.59.26Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M473,227.25a1.25,1.25,0,0,1-.31-2.46,40.15,40.15,0,0,1,11.14-1,1.25,1.25,0,1,1-.15,2.5,37.41,37.41,0,0,0-10.36,1A1.25,1.25,0,0,1,473,227.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M518.75,239.75a1.25,1.25,0,0,1,0-2.5c2.07,0,5.69-.13,9-.25a1.25,1.25,0,1,1,.09,2.5C524.51,239.62,520.86,239.75,518.75,239.75Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M517.75,235.5a1.25,1.25,0,0,1-.19-2.49,39.94,39.94,0,0,1,6.62-.28l1.82,0a1.25,1.25,0,0,1,0,2.5l-1.85,0a38.16,38.16,0,0,0-6.21.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M542.16,236.15a7.76,7.76,0,0,1-.82,0,5.72,5.72,0,0,1-4.17-2.31,6.49,6.49,0,0,1-.72-5.35,3.89,3.89,0,0,1,2.29-2.58c3-1.57,8.68-3.08,11.54-1.37a3.39,3.39,0,0,1,1.72,2.66c.25,2.56-2.09,5.4-3.36,6.54A10.13,10.13,0,0,1,542.16,236.15Zm4.82-9.92a17.25,17.25,0,0,0-7.15,1.88l-.18.08a1.42,1.42,0,0,0-.82,1,4,4,0,0,0,.36,3.13,3.24,3.24,0,0,0,2.41,1.29,7.54,7.54,0,0,0,5.36-1.8c1.32-1.19,2.66-3.26,2.54-4.44a.91.91,0,0,0-.51-.75A4.07,4.07,0,0,0,547,226.23Zm-7.73.77h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M538.5,227.75a1.25,1.25,0,0,1-1-.45,4.76,4.76,0,0,1-.92-2,1.25,1.25,0,0,1,1.09-1.48,3.57,3.57,0,0,1,2.5.67,2.31,2.31,0,0,1-1.7,3.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M549.25,226a1.72,1.72,0,0,0-2.39-.31,1.25,1.25,0,0,1-.79-1.58,3.66,3.66,0,0,1,1.82-2.2,1.25,1.25,0,0,1,1.72.66,5.17,5.17,0,0,0,.29.57,5.47,5.47,0,0,1,.57,1.31,1.25,1.25,0,0,1-1.21,1.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M533,244a1.25,1.25,0,0,1-.51-2.39c4.39-1.94,9.74-3,14.45-4,1.23-.25,2.43-.5,3.59-.76l1.25-.28a41.06,41.06,0,0,1,5.87-1,1.25,1.25,0,1,1,.19,2.49,39.3,39.3,0,0,0-5.51,1l-1.26.29c-1.17.26-2.38.51-3.62.76-4.82,1-9.8,2-13.95,3.85A1.25,1.25,0,0,1,533,244Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M538.5,293.5a1.25,1.25,0,0,1,0-2.5,79.17,79.17,0,0,0,18.59-2.62c.84-.21,1.75-.38,2.72-.56a20.92,20.92,0,0,0,5.82-1.65,1.25,1.25,0,0,1,1.25,2.17,22,22,0,0,1-6.6,1.94c-.93.18-1.81.34-2.59.53a81.57,81.57,0,0,1-19.18,2.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M541.59,299.51h-.87a1.25,1.25,0,0,1,0-2.5h0c7.63.21,15.26-2.72,22.6-5.55l2.92-1.12a1.25,1.25,0,0,1,.88,2.34l-2.91,1.11C557,296.6,549.45,299.51,541.59,299.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M572.38,217.43a8,8,0,0,1-3.12-.53,1.25,1.25,0,0,1,1-2.3c1.75.74,4.88.13,7.64-.41a32.09,32.09,0,0,1,4.32-.66c.54,0,1.08-.08,1.63-.13a19.47,19.47,0,0,1,3.27-.14,1.25,1.25,0,0,1,1.16,1.33,1.23,1.23,0,0,1-1.33,1.16,17.49,17.49,0,0,0-2.85.13c-.58.06-1.17.11-1.75.14a30.63,30.63,0,0,0-4,.62A32.48,32.48,0,0,1,572.38,217.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M584.5,221H571a1.25,1.25,0,0,1,0-2.5h13.5a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.25,283.25c-2.46,0-4.94-.13-7.34-.26-2.84-.15-5.78-.31-8.63-.24h0a1.25,1.25,0,0,1,0-2.5c2.94-.07,5.93.09,8.82.24,2.37.13,4.82.26,7.21.26a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M588.5,286.75H572.75a1.25,1.25,0,0,1,0-2.5H588.5a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M632,210h-.12a37.79,37.79,0,0,1-14-4.64,1.25,1.25,0,1,1,1.18-2.2,35.33,35.33,0,0,0,13,4.36A1.25,1.25,0,0,1,632,210Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M631.25,215.75a1.25,1.25,0,0,1-.42-.07c-1.36-.49-2.75-1.08-4.22-1.71-3.66-1.56-7.44-3.17-10.88-3.22a1.25,1.25,0,1,1,0-2.5c3.93.05,7.94,1.76,11.82,3.42,1.44.61,2.79,1.19,4.08,1.66a1.25,1.25,0,0,1-.42,2.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.66,291.29a4.59,4.59,0,0,1-4.13-2.24,6.26,6.26,0,0,1,.39-6.52,4.15,4.15,0,0,1,4.34-1.75,1.25,1.25,0,0,1,.84.62,5,5,0,0,1-.73,9.86A6.58,6.58,0,0,1,599.66,291.29Zm-1.06-7.92a2,2,0,0,0-.66.61,3.81,3.81,0,0,0-.26,3.8,2.25,2.25,0,0,0,2.42,1,2.52,2.52,0,0,0-.52-5A1.25,1.25,0,0,1,598.6,283.37Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M639.25,294a1.25,1.25,0,0,1-.7-2.28c2.92-2,11-1.56,14.28-.67a1.25,1.25,0,1,1-.65,2.41c-3.16-.86-10.25-1-12.22.33A1.25,1.25,0,0,1,639.25,294Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M636,217.5a1.25,1.25,0,0,1-.61-2.34c3.3-1.83,11.37-3.43,15.33-1.81a1.25,1.25,0,1,1-.95,2.31c-3.11-1.27-10.41.15-13.17,1.69A1.25,1.25,0,0,1,636,217.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M643.45,235.79a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.64-5.27,5.59-4.85h0a5.23,5.23,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M645.13,254.09a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.65-5.27,5.59-4.85h0a5.22,5.22,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M644.82,272.38a5,5,0,0,1-.9-.08,4.68,4.68,0,0,1-3.91-5.66c.44-2.71,2.65-5.26,5.59-4.85h0a5.22,5.22,0,0,1,2.33,1,5.41,5.41,0,0,1-3.11,9.6Zm.19-8.14c-1.25,0-2.3,1.39-2.53,2.79a2.2,2.2,0,0,0,1.9,2.8,2.56,2.56,0,0,0,2.82-1.7,2.7,2.7,0,0,0-.73-3.34,2.76,2.76,0,0,0-1.21-.54h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M675.75,217a1.25,1.25,0,0,1-.53-.12c-.87-.41-2.74-.3-4.24-.21-.65,0-1.26.07-1.79.07-1.54,0-3.14-.06-4.66-.13s-2.86-.12-4.29-.12a1.25,1.25,0,0,1,0-2.5h0c1.48,0,3,.07,4.39.13s2.95.12,4.42.12h.12c.49,0,1.05,0,1.65-.07,1.87-.11,4-.24,5.44.44a1.25,1.25,0,0,1-.53,2.38Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.5,228.25a1.26,1.26,0,0,1-.47-.09,13.36,13.36,0,0,0-3.59-.54l-1.28-.1a67.49,67.49,0,0,1-12.24-2.62,1.25,1.25,0,0,1-.44-2.18c2.77-2.21,6.45-3.5,10-4.74a49.15,49.15,0,0,0,6.44-2.59,1.25,1.25,0,0,1,1.16,2.21,51.72,51.72,0,0,1-6.78,2.73,47.88,47.88,0,0,0-7.06,2.89,53.81,53.81,0,0,0,9.15,1.8l1.22.09a14.9,14.9,0,0,1,4.35.72,1.25,1.25,0,0,1-.47,2.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M666.44,283.13c-4.71,0-5.74-.45-6.11-1.44a1.25,1.25,0,0,1,2.06-1.32c1.56.5,9.36.15,12.74,0,1.5-.07,2.72-.12,3.38-.13h0a1.25,1.25,0,0,1,.44.08,1.31,1.31,0,0,1,.91,1.26,1.29,1.29,0,0,1-.95,1.21,1.25,1.25,0,0,1-1.4,0l-2.28.1C671.4,283,668.55,283.13,666.44,283.13Zm12.8-.63h0Zm-16.58-1.7h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M239,158.58l-.21,0a73.4,73.4,0,0,1-10.64-2.37,57.77,57.77,0,0,1-5.62-2.28c-3.74-1.67-7.61-3.36-10.84-3.33a1.23,1.23,0,0,1-1.27-1.22,1.25,1.25,0,0,1,1.23-1.27c3.8-.07,7.92,1.76,11.91,3.54a56.19,56.19,0,0,0,5.36,2.19,71.43,71.43,0,0,0,10.3,2.29,1.25,1.25,0,0,1-.21,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M240.33,154.58h-.07a23.16,23.16,0,0,1-7.07-1.93c-.85-.33-1.73-.68-2.59-1-1.62-.55-3.37-1-5.22-1.47-4.74-1.21-9.64-2.47-13.21-5.61a1.25,1.25,0,1,1,1.65-1.87c3.12,2.75,7.72,3.93,12.17,5.06,1.81.46,3.69.94,5.4,1.52.92.31,1.83.67,2.71,1a21,21,0,0,0,6.3,1.76,1.25,1.25,0,0,1-.07,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M200,158.92c-2.45,0-4.2-1.83-4.39-4.59s1.22-5.62,3.88-5.9h0a1.25,1.25,0,0,1,1.6-.57,7,7,0,0,1,3.75,7.29,4.58,4.58,0,0,1-4.71,3.77Zm.62-8.5a1.25,1.25,0,0,1-.87.49c-1.09.12-1.75,1.8-1.65,3.25,0,.7.35,2.32,2,2.26a2.12,2.12,0,0,0,2.33-1.74A4.57,4.57,0,0,0,200.66,150.42Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M252.67,154.58a1.25,1.25,0,0,1,0-2.5,39,39,0,0,0,7.44-.64,1.25,1.25,0,1,1,.47,2.46,41.36,41.36,0,0,1-7.9.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M252.33,149.92a1.25,1.25,0,0,1-.21-2.48,18.9,18.9,0,0,1,2.8-.19,9.51,9.51,0,0,0,3.21-.37,1.25,1.25,0,1,1,1.07,2.26,10.79,10.79,0,0,1-4.24.62,16.86,16.86,0,0,0-2.41.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M295.33,148.92a1.25,1.25,0,0,1-.1-2.5c1.15-.09,2.34-.12,3.5-.16a37.78,37.78,0,0,0,6-.49,1.25,1.25,0,0,1,.48,2.45,39.59,39.59,0,0,1-6.44.54c-1.17,0-2.28.07-3.37.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M295.38,154.58h-.05a1.25,1.25,0,0,1-1.25-1.25,1.27,1.27,0,0,1,1.25-1.25,28.42,28.42,0,0,0,4.5-.5,25.18,25.18,0,0,1,5.92-.5,1.25,1.25,0,1,1-.17,2.49,22.63,22.63,0,0,0-5.33.47A29.61,29.61,0,0,1,295.38,154.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M301.32,98.77a5.18,5.18,0,0,1-1.74-.33c-2.41-.86-3.2-3.61-2.71-5.75a3.86,3.86,0,0,1,4.26-3.26,1.25,1.25,0,0,1,.87,2,4.61,4.61,0,0,1,2.24,5.4A3,3,0,0,1,301.32,98.77Zm-1.57-6.47a2.06,2.06,0,0,0-.44.94c-.25,1.09.11,2.49,1.12,2.85.47.17,1.28.37,1.48-.15a2.16,2.16,0,0,0-1.37-2.44A1.25,1.25,0,0,1,299.75,92.3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M327,87.25H308.67a1.25,1.25,0,0,1,0-2.5H327a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M310,92.25h-2a1.25,1.25,0,0,1,0-2.5h1c3.62,0,7.36,0,11-.17.69,0,1.48,0,2.31,0,1.7,0,3.82.07,4.86-.39a1.25,1.25,0,0,1,1,2.29c-1.54.68-3.76.64-5.92.6-.79,0-1.53,0-2.15,0C316.74,92.24,313.31,92.25,310,92.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.48,117.31c-1.41,0-2.81,0-4.16-.11a1.25,1.25,0,0,1-1.18-1.11,9.07,9.07,0,0,1,1.23-5,7.35,7.35,0,0,0,1.05-3.93,6.4,6.4,0,0,0,2.2-1.49,1.25,1.25,0,0,1,1.74.32l.5.72c1.76,2.5,4.42,6.29,4,9.44a1.25,1.25,0,0,1-1.17,1.08C320.3,117.27,318.89,117.31,317.48,117.31Zm-2.82-2.55c1.87.07,3.8.07,5.69,0-.34-2.07-2.2-4.75-3.43-6.51a11.59,11.59,0,0,1-1.28,3.88A10.13,10.13,0,0,0,314.65,114.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M317.93,132.87a1.25,1.25,0,0,1-.87-.35c-1.54-1.49-2.12-3.64-2.68-5.72-.47-1.75-.91-3.4-1.85-4.18a1.25,1.25,0,0,1,.57-2.19,1.25,1.25,0,0,1,1.75-.91,10.12,10.12,0,0,0,3.66.28c.74,0,1.5,0,2.19,0a1.25,1.25,0,0,1,1.1,1.68,28.14,28.14,0,0,0-1.06,4.49,24.54,24.54,0,0,1-1.69,6.19,1.25,1.25,0,0,1-.91.69Zm-2.54-10.64a16.54,16.54,0,0,1,1.41,3.92,24.47,24.47,0,0,0,.81,2.63c.27-1,.48-2.16.67-3.26s.4-2.17.66-3.23h-.36A19.72,19.72,0,0,1,315.38,122.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M323,153.58a1.25,1.25,0,0,1-.28,0c-3.24-.73-7-.58-10.64-.43-1.47.06-3,.12-4.42.12a1.25,1.25,0,0,1,0-2.5c1.39,0,2.81-.06,4.32-.12,3.8-.16,7.72-.32,11.29.49a1.25,1.25,0,0,1-.27,2.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M340.6,87.54a5.83,5.83,0,0,1-5.79-4.18A7.23,7.23,0,0,1,338,74.92a2.56,2.56,0,0,0,2.84-.48c3.51.62,5.56,4.49,5.43,7.71a5.26,5.26,0,0,1-4.94,5.36A7.74,7.74,0,0,1,340.6,87.54Zm-.82-11a1.24,1.24,0,0,1-.5.53,4.72,4.72,0,0,0-2.1,5.51A3.44,3.44,0,0,0,341.13,85a2.79,2.79,0,0,0,2.7-3c.08-2.14-1.28-4.78-3.37-5.15A1.24,1.24,0,0,1,339.79,76.55Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M347,101.58H332.33a1.25,1.25,0,0,1,0-2.5H347a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M347.33,118.25a1.24,1.24,0,0,1-.45-.09c-2.59-1-6.67-.84-10.28-.69-1.28.05-2.49.1-3.6.1a1.25,1.25,0,0,1,0-2.5c1.06,0,2.24,0,3.5-.1,3.85-.16,8.22-.35,11.29.86a1.25,1.25,0,0,1-.46,2.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M356.33,79.58a1.25,1.25,0,0,1,0-2.5c7.22,0,14.81-.33,22.56-1,1-.09,2.15-.15,3.28-.2a35.06,35.06,0,0,0,8.44-1.08,1.25,1.25,0,1,1,.76,2.38,36.78,36.78,0,0,1-9.07,1.2c-1.1.06-2.18.11-3.2.2C371.28,79.25,363.62,79.58,356.33,79.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M358,87.58a1.25,1.25,0,0,1,0-2.5c5.58,0,11.25-.61,16.73-1.17s11.28-1.15,16.94-1.17h0a1.25,1.25,0,0,1,0,2.5c-5.54,0-11.21.6-16.69,1.16s-11.27,1.15-17,1.18Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M373.19,127.89c-4.6,0-9.16-1.46-11.59-5.48a18.94,18.94,0,0,1,0-19.05,13.71,13.71,0,0,1,12.76-6.94h0c9.7.78,14.87,4.9,15.81,12.61.66,5.4.64,13-7.13,16.69A24.1,24.1,0,0,1,373.19,127.89Zm.43-29a11.12,11.12,0,0,0-9.83,5.74,16.6,16.6,0,0,0,0,16.48c3.35,5.52,12.95,4.89,18.3,2.35,4.94-2.34,6.65-6.57,5.72-14.13-.8-6.52-5-9.73-13.51-10.42Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M367.44,123.21H367a1.25,1.25,0,0,1-1.2-1.15c-.32-3.86.8-7.22,1.88-10.47a28.1,28.1,0,0,1,1.69-3.72c1-1.87,1.94-3.8,2-5.27a1.25,1.25,0,0,1,2.15-.79,21.29,21.29,0,0,1,3.1,4.13,15.17,15.17,0,0,0,1.41,2.06,22.93,22.93,0,0,0,2.73,2.5c2.12,1.75,4.3,3.57,5,6.11a1.25,1.25,0,0,1-1.08,1.58,28.36,28.36,0,0,0-7.69,2.39C373.93,121.87,370.7,123.21,367.44,123.21Zm5.86-17.86a34.89,34.89,0,0,1-1.7,3.65,28.41,28.41,0,0,0-3.35,11.68,27.38,27.38,0,0,0,7.85-2.41A39.11,39.11,0,0,1,382.8,116a18.07,18.07,0,0,0-3.59-3.55,25.06,25.06,0,0,1-3-2.8,17.36,17.36,0,0,1-1.65-2.38C374.16,106.63,373.78,106,373.3,105.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M392.33,145.58h-35a1.25,1.25,0,0,1,0-2.5h35a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M363.79,154.26h-6.46a1.25,1.25,0,0,1,0-2.5h3.23c7.16,0,14.57,0,21.67-.66a38.38,38.38,0,0,1,4.64,0c2.65.08,5.65.17,7.31-.54a1.25,1.25,0,1,1,1,2.3c-2.16.93-5.32.83-8.37.74a36.82,36.82,0,0,0-4.32,0C376.32,154.18,370,154.26,363.79,154.26Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M426.47,108.22c-1.47,0-3-.1-4.37-.19-.73,0-1.4-.09-2-.11-3.38-.13-6.82-.48-10.15-.82-3.74-.38-7.61-.78-11.33-.85a1.25,1.25,0,0,1-1.23-1.27,1.24,1.24,0,0,1,1.27-1.23c3.82.07,7.74.47,11.54.86,3.29.34,6.69.69,10,.81.6,0,1.29.07,2,.12,2.74.18,6.5.43,8.23-.35a1.25,1.25,0,1,1,1,2.28A13.1,13.1,0,0,1,426.47,108.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M446.35,89.6c-.93,0-1.85,0-2.77,0-1.69,0-3.44-.08-5.17,0a1.25,1.25,0,1,1-.15-2.5c1.83-.11,3.64-.07,5.38,0a33,33,0,0,0,9.05-.61,1.25,1.25,0,1,1,.61,2.42A28.08,28.08,0,0,1,446.35,89.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M453.67,95.58H439.33a1.25,1.25,0,0,1,0-2.5h14.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M463.67,82.58h-6a1.25,1.25,0,0,1,0-2.5h6a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M462.26,153.33a8.62,8.62,0,0,1-3.07-.51,1.25,1.25,0,0,1,1-2.31c1.1.45,3.63.44,4.44-.17a1.25,1.25,0,1,1,1.51,2A6.56,6.56,0,0,1,462.26,153.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M520,149.25a1.25,1.25,0,0,1-1-2,50,50,0,0,1,8.81-8.32c.92-.74,1.83-1.47,2.71-2.21a1.25,1.25,0,1,1,1.61,1.92c-.9.75-1.82,1.5-2.76,2.24a48.07,48.07,0,0,0-8.38,7.89A1.25,1.25,0,0,1,520,149.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M522.33,153.58a1.25,1.25,0,0,1-1.13-1.78,17,17,0,0,1,3.55-4.58,13.25,13.25,0,0,0,3.08-4,1.25,1.25,0,1,1,2.32.93,15.26,15.26,0,0,1-3.62,4.84,15,15,0,0,0-3.08,3.89A1.25,1.25,0,0,1,522.33,153.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M481.93,87.59h-.31a1.25,1.25,0,1,1,.09-2.5c2.23.08,5-1.11,7.63-2.27a40.11,40.11,0,0,1,4.3-1.68,1.25,1.25,0,0,1,.71,2.4,38.48,38.48,0,0,0-4,1.58C487.53,86.33,484.63,87.59,481.93,87.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M484,92.92a1.25,1.25,0,0,1-.7-2.29c2.45-1.66,5.83-2.61,9.09-3.53,1.52-.43,3-.83,4.18-1.28a1.25,1.25,0,0,1,.86,2.35c-1.31.48-2.79.9-4.36,1.34-3.07.86-6.25,1.76-8.37,3.19A1.24,1.24,0,0,1,484,92.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M555.52,157.85a6.45,6.45,0,0,1-5.64-3.1,8.58,8.58,0,0,1,1.6-10.51c3.37-3.32,6.34-2.72,7.82-2.07,2.79,1.24,4.72,4.63,4.58,8.07a7.61,7.61,0,0,1-5.44,7.08h0A8.89,8.89,0,0,1,555.52,157.85Zm2.5-1.7h0Zm-1.11-12a5.43,5.43,0,0,0-3.68,1.85,6.06,6.06,0,0,0-1.24,7.41c1.13,1.82,3.18,2.38,5.61,1.54h0a5.14,5.14,0,0,0,3.76-4.83,6.07,6.07,0,0,0-3.09-5.68A3.35,3.35,0,0,0,556.92,144.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M570.67,149.58h-4.33a1.25,1.25,0,0,1,0-2.5h4.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M542.6,151.64a9.44,9.44,0,0,1-1.08-.06,1.25,1.25,0,1,1,.29-2.48,8.67,8.67,0,0,0,3.19-.3,1.25,1.25,0,1,1,.67,2.41A11.65,11.65,0,0,1,542.6,151.64Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M549.58,132.21h-.91a1.25,1.25,0,0,1-1.16-1.61,52.47,52.47,0,0,1,3.39-8,42.37,42.37,0,0,0,3.88-9.88,1.25,1.25,0,0,1,2.42-.12,56.07,56.07,0,0,0,2.43,6.07c1.63,3.67,3.32,7.46,3.24,10.94a1.25,1.25,0,0,1-1.06,1.21l-1.26.2A73.36,73.36,0,0,1,549.58,132.21ZM556.15,117a67.5,67.5,0,0,1-3,6.74,65.08,65.08,0,0,0-2.7,6,79.31,79.31,0,0,0,9.71-1.12l.17,0c-.25-2.67-1.58-5.67-3-8.83C556.94,118.82,556.53,117.91,556.15,117Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603,150.25c-2.34,0-5.13-.15-8.08-.32-3.61-.2-7.34-.41-10.56-.35a1.28,1.28,0,0,1-1.27-1.23,1.25,1.25,0,0,1,1.23-1.27c3.33-.06,7.1.15,10.75.35,2.91.16,5.67.31,7.94.31a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M585.67,144.58a1.25,1.25,0,0,1-.4-2.43c4.81-1.65,10.6-1.54,15.7-1.44,1.27,0,2.52,0,3.7,0h0a1.25,1.25,0,0,1,0,2.5c-1.22,0-2.47,0-3.75,0-5.14-.1-10.45-.19-14.85,1.31A1.25,1.25,0,0,1,585.67,144.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M610.35,152.6H609a1.25,1.25,0,0,1,0-2.5h0c3.29.07,7.09-.14,10.76-.35,2.76-.16,5.37-.3,7.54-.31h0a1.25,1.25,0,0,1,0,2.5c-2.11,0-4.68.16-7.41.31C616.71,152.41,613.39,152.6,610.35,152.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M147.76,501.88c-3.43,0-6.88-.24-10.26-.48s-6.79-.48-10.13-.48h0a1.25,1.25,0,0,1-1.25-1.25,1.29,1.29,0,0,1,1.28-1.25c3.43,0,6.92.25,10.31.49,6.05.43,12.31.87,18.12-.13a1.25,1.25,0,1,1,.42,2.46A49.74,49.74,0,0,1,147.76,501.88Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M138.33,525.58h-.1c-.51,0-1-.1-1.53-.15a18.61,18.61,0,0,0-3-.18,1.23,1.23,0,0,1-1.31-1.19,1.25,1.25,0,0,1,1.19-1.31,21.27,21.27,0,0,1,3.38.19c.48.05,1,.11,1.44.14a1.25,1.25,0,0,1-.09,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M146.58,580.92a90.71,90.71,0,0,1-12-1c-.57-.07-1.27-.11-2-.15-2.76-.14-6.19-.31-7.88-2.71a1.25,1.25,0,1,1,2-1.44c1,1.4,3.74,1.54,6,1.65.79,0,1.54.08,2.2.17a95.08,95.08,0,0,0,11.83,1H147c3.33,0,5.73,0,8.49-1.23a1.25,1.25,0,1,1,1,2.29c-3.24,1.43-6,1.43-9.5,1.44h-.43Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M189.67,506.92h0c-4.84,0-13.33-.8-17.81-1.34a1.25,1.25,0,1,1,.3-2.48c4.42.53,12.79,1.29,17.53,1.33a1.25,1.25,0,0,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M182.45,514.29c-4.67,0-9.59-.2-13.8-1.43a1.25,1.25,0,0,1,.7-2.4c4.87,1.42,11,1.36,16.42,1.3l3.57,0a1.25,1.25,0,0,1,0,2.5,3.43,3.43,0,0,1-.44,0l-3.1,0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M202.33,564.63c-1.34,0-2.86-.1-4.5-.23-1-.08-1.9-.15-2.5-.15a1.25,1.25,0,0,1,0-2.5c.69,0,1.62.07,2.69.16,1.9.15,6.94.55,7.66-.35a1.25,1.25,0,0,1,2,1.56C206.71,564.28,204.82,564.63,202.33,564.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208.67,570.58h-13a1.25,1.25,0,0,1,0-2.5h13a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M201,581.92h-.23c-2.67-.14-3.68-1.28-4.05-2.21-.54-1.35-.05-3,1.31-4.48s3.48-2.61,5.7-1.88c2.5.83,3.09,2.69,2.82,4.15A5.94,5.94,0,0,1,201,581.92Zm1.39-6.29a3.88,3.88,0,0,0-2.54,1.3c-.71.75-.95,1.51-.81,1.84s.66.59,1.86.65h0a3.45,3.45,0,0,0,3.18-2.39c0-.26.17-.88-1.15-1.31A1.71,1.71,0,0,0,202.38,575.63Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.35,517.29a22.47,22.47,0,0,1-8.32-1.93,75.86,75.86,0,0,1-7.71-3.87L93,510.76a23.18,23.18,0,0,0-2.32-1c-1.85-.75-3.94-1.6-5.3-3.27a1.25,1.25,0,1,1,1.94-1.58c1,1.17,2.66,1.86,4.3,2.53a25.54,25.54,0,0,1,2.58,1.16l1.34.74a74.18,74.18,0,0,0,7.45,3.74,18.35,18.35,0,0,0,8.25,1.7,1.25,1.25,0,0,1,.22,2.49Q110.91,517.29,110.35,517.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110,522.92a1.25,1.25,0,0,1-.33,0c-3.36-.9-6.88-2.06-10.49-3.27-.66-.22-1.43-.46-2.26-.72-4.57-1.43-10.83-3.38-13.24-6.44a1.25,1.25,0,0,1,2-1.54c1.93,2.45,8,4.35,12,5.6.85.27,1.64.51,2.31.74,3.57,1.2,7,2.34,10.34,3.23a1.25,1.25,0,0,1-.32,2.46Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M114.33,529.92a1.25,1.25,0,0,1-.47-2.41c2.22-.91,5.17-.72,7.78-.55,1,.06,1.89.12,2.7.12a1.25,1.25,0,1,1,0,2.5c-.89,0-1.84-.06-2.86-.13-2.34-.15-5-.32-6.67.37A1.24,1.24,0,0,1,114.33,529.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M121.32,533c-2.07,0-4.35-.2-6-1.25a1.25,1.25,0,0,1,1.35-2.1c1.53,1,4.41.89,6.51.82h.44a1.22,1.22,0,0,1,1.29,1.21,1.25,1.25,0,0,1-1.21,1.29h-.43C122.67,533,122,533,121.32,533Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M204.06,502.94c-1.59,0-3.19-.1-4.71-.19s-2.79-.17-4-.17a1.25,1.25,0,1,1,0-2.5c1.31,0,2.7.08,4.17.17,3.66.22,7.8.47,10.68-.74a1.25,1.25,0,0,1,1,2.31A18.59,18.59,0,0,1,204.06,502.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.65,507.25c-3.38,0-6.75-.28-10-.54-2.19-.18-4.46-.36-6.69-.46a1.25,1.25,0,1,1,.11-2.5c2.28.1,4.57.29,6.79.47,3.21.26,6.52.53,9.8.53h0a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M626.88,500.82c-2.73,0-5.52-.16-8.27-.32-3.4-.19-6.62-.38-9.55-.25a1.25,1.25,0,1,1-.1-2.5c3.05-.12,6.33.06,9.8.26,6.67.38,13.56.77,18.82-1.18a1.25,1.25,0,0,1,.87,2.34A33.57,33.57,0,0,1,626.88,500.82Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M638.67,506.25c-4.2,0-8.52-.31-12.7-.6a122.36,122.36,0,0,0-17.87-.4,1.25,1.25,0,0,1-.2-2.49,124.15,124.15,0,0,1,18.24.4c4.14.29,8.42.6,12.53.6a1.25,1.25,0,1,1,0,2.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M634.9,576.77c-1.72,0-3.45-.16-5.06-.3-1-.09-2-.18-2.9-.23-1.46-.07-2.93-.09-4.49-.11-4.54-.06-9.24-.12-13.52-1.62a1.25,1.25,0,1,1,.83-2.36c3.9,1.37,8.38,1.43,12.73,1.48,1.52,0,3.08,0,4.59.12,1,0,2,.14,3,.23,3.09.28,6.3.57,8.93-.19a1.25,1.25,0,1,1,.69,2.4A17.52,17.52,0,0,1,634.9,576.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M622.24,579.36a123.7,123.7,0,0,1-13.37-.78,1.25,1.25,0,0,1,.27-2.49,111.6,111.6,0,0,0,17.55.66c.93,0,2-.06,3-.06,2.82,0,6,0,8.2-.86a1.25,1.25,0,0,1,.87,2.34c-2.59,1-6,1-9,1-1,0-2,0-2.91.06Q624.58,579.36,622.24,579.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M662.25,493.36a39.46,39.46,0,0,1-6.09-.66,32.89,32.89,0,0,0-3.53-.45,1.25,1.25,0,1,1,.09-2.5,34,34,0,0,1,3.84.48,26,26,0,0,0,7.42.5,31.79,31.79,0,0,0,4.85-1.31c1-.34,2.11-.69,3.19-1a1.25,1.25,0,1,1,.63,2.42c-1,.26-2,.58-3,.93a34.23,34.23,0,0,1-5.24,1.4A13.65,13.65,0,0,1,662.25,493.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M663.41,498.84a35.43,35.43,0,0,1-10.82-1.66,1.25,1.25,0,1,1,.81-2.36c4.77,1.64,14,2.52,18.25-.2a1.25,1.25,0,0,1,1.35,2.1C670.63,498.25,667.07,498.84,663.41,498.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M620.51,540.9a5.16,5.16,0,0,1-4.57-2.22c-2-3-.88-8.07,1.28-11.54,1.94-3.12,4.47-4.72,6.94-4.38h0c4.22.63,6.67,3.05,6.71,6.65.06,4.85-4.34,10.57-8.72,11.33A9.76,9.76,0,0,1,620.51,540.9Zm3-15.68c-1.36,0-2.9,1.19-4.18,3.24-1.92,3.09-2.52,7.05-1.33,8.82.66,1,1.92,1.31,3.73,1,3.15-.55,6.69-5.25,6.65-8.83,0-2.34-1.57-3.76-4.57-4.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M661.55,536.59a4.66,4.66,0,0,1-4.27-2.25c-1.38-2.4-.59-6,.9-8.31,1.32-2,3.12-3.11,4.94-2.93h0a1.25,1.25,0,0,1,.83.18,8.54,8.54,0,0,1,3.58,9,5.74,5.74,0,0,1-5.69,4.35Zm1.18-11a3.33,3.33,0,0,0-2.45,1.81c-1.22,1.89-1.59,4.4-.83,5.71.15.27.62,1.08,2.32,1a3.28,3.28,0,0,0,3.38-2.49,6,6,0,0,0-2.21-6h-.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M685,507.44a75.46,75.46,0,0,1-8.17-.54,1.25,1.25,0,1,1,.27-2.48c5.78.64,12.24,1,16.33-.89a1.25,1.25,0,0,1,1.06,2.26A22.82,22.82,0,0,1,685,507.44Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.67,512.58a1.25,1.25,0,0,1,0-2.5c2.87,0,5.77-.25,8.58-.5,2.64-.23,5.38-.47,8.07-.5h0a1.25,1.25,0,0,1,0,2.5c-2.6,0-5.17.25-7.88.49S679.64,512.58,676.67,512.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M663.94,579.51c-2.27,0-4.67-.17-6.95-.33-2-.14-3.82-.27-5.33-.27a1.25,1.25,0,0,1,0-2.5c1.6,0,3.5.13,5.5.27,4.81.34,10.79.76,13.55-.78a1.25,1.25,0,1,1,1.21,2.19C670,579.19,667.07,579.51,663.94,579.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M662.37,583.61c-2,0-4.06-.11-5.92-.21-1.42-.08-2.76-.15-3.79-.15a1.25,1.25,0,0,1,0-2.5c1.09,0,2.47.07,3.92.15,4.14.22,9.8.53,12.94-.73a1.25,1.25,0,0,1,.93,2.32A22.89,22.89,0,0,1,662.37,583.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M678.95,578c-.41,0-.77,0-1.07,0a1.25,1.25,0,1,1,.25-2.49c1.78.19,6.62-.33,8.56-1.49a1.25,1.25,0,1,1,1.29,2.14C685.8,577.38,681.47,578,678.95,578Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M707,514.25a1.27,1.27,0,0,1-.28,0,1.25,1.25,0,0,1-.95-1.49c.41-1.81,3-1.88,6.57-2a21,21,0,0,0,3.64-.28,1.25,1.25,0,0,1,.68,2.41,20.75,20.75,0,0,1-4.25.37,20.78,20.78,0,0,0-4.34.38A1.25,1.25,0,0,1,707,514.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.67,582.58a1.25,1.25,0,0,1-1-2c3.71-5.15,8.35-9.53,12.43-11.71a1.25,1.25,0,0,1,1.18,2.21c-3.75,2-8.08,6.1-11.57,11A1.25,1.25,0,0,1,587.67,582.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M583.67,576.58a1.25,1.25,0,0,1-1.07-1.9c2.1-3.48,10.42-10.32,14.9-10.93a1.25,1.25,0,0,1,.33,2.48c-3.31.45-11.2,6.6-13.1,9.74A1.25,1.25,0,0,1,583.67,576.58Z" transform="translate(-53.25 -44.96)"/></g><g id="BACKGROUND"><path class="cls-24" d="M479.9,331.07c-37.71,0-75.29-.27-112.34-.54-33.89-.24-68.94-.49-103.29-.53-31.44,0-63.33-.27-94.18-.5-33.44-.25-68-.5-102.1-.5a2,2,0,0,1,0-4c34.1,0,68.68.26,102.13.5,30.83.23,62.72.46,94.15.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08H728a2,2,0,0,1,0,4H665.58c-4,0-8,0-12-.08-7.82-.08-15.9-.17-23.81.08C580.3,330.59,530,331.07,479.9,331.07Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M479.9,306c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.7,0-62.72-.31-92.72-.58-32-.29-65-.59-98.87-.59a2,2,0,1,1,0-4c33.84,0,66.92.3,98.91.59,30,.27,61,.55,92.69.58,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08h56.53a2,2,0,0,1,0,4H665.58c-4,0-8,0-12-.09-7.82-.08-15.9-.17-23.81.08C580.3,305.5,530,306,479.9,306Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,190.86c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.42,0-63.29-.27-94.12-.5l-32.69-.23a2,2,0,0,1-2-2,2,2,0,0,1,2-2l32.69.23c30.82.23,62.68.46,94.09.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08a2,2,0,0,1,0,4c-4,0-8,0-12-.09-7.82-.08-15.9-.17-23.81.08C576.4,190.38,526.09,190.86,476,190.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,165.77c-37.71,0-75.29-.27-112.33-.54-33.89-.24-68.94-.49-103.29-.53-31.52,0-63.48-.27-94.4-.5l-8.79-.06a2,2,0,0,1,0-4h0l8.79.06c30.91.23,62.87.46,94.38.5,34.36,0,69.41.29,103.31.53,86.22.62,175.37,1.26,262.09-1.53,3.52-.11,7.36-.17,11.75-.17h0a2,2,0,0,1,0,4c-4.34,0-8.14.06-11.62.17C576.4,165.29,526.09,165.77,476,165.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,475.66c-37.71,0-75.29-.27-112.35-.54-33.89-.24-68.93-.5-103.27-.53-31.45,0-63.35-.27-94.2-.5-33.43-.25-68-.5-102.07-.5a2,2,0,1,1,0-4c34.09,0,68.66.25,102.1.5,30.84.23,62.74.46,94.18.5,34.35,0,69.4.29,103.29.53,86.23.62,175.39,1.26,262.11-1.53,8-.25,16.12-.17,24-.09,4,0,7.95.08,11.91.08,10.39,0,22.44-.2,34.11-.4s23.75-.4,34.17-.4a2,2,0,0,1,0,4c-10.39,0-22.45.2-34.11.4s-23.75.4-34.17.4c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08C576.39,475.19,526.08,475.66,476,475.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M733.78,450.57c-10.44,0-23.51-.53-36.14-1s-25.61-1-36-1c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08-86.79,2.79-176,2.15-262.23,1.53-33.9-.24-69-.5-103.31-.53-31.43,0-63.31-.27-94.14-.5-33.45-.25-68-.5-102.13-.5a2,2,0,1,1,0-4c34.11,0,68.7.25,102.16.5,30.83.23,62.7.46,94.12.5,34.37,0,69.43.29,103.33.53,86.21.62,175.36,1.26,262.07-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08,10.44,0,23.5.53,36.13,1s25.61,1,36,1a2,2,0,0,1,0,4Z" transform="translate(-53.25 -44.96)"/><g class="cls-25"><path class="cls-24" d="M167.18,469.74a2.91,2.91,0,0,1-1.53-.42,4.18,4.18,0,0,1-1.65-3.38h0c-.07-.82-.11-1.66-.15-2.5s-.07-1.56-.13-2.32c-.19-2.42-.29-5.09-.29-8.41a4.24,4.24,0,0,1,1.48-3.58c1.55-1.09,3.5-.4,4.66,0a21.31,21.31,0,0,1,9.27,5.93l.19.21c1.06,1.17,2.65,2.94,2,4.76-.35,1-1.32,1.71-2.88,2.76-.28.19-.52.34-.65.45-.95.78-1.93,1.46-2.89,2.13-.56.39-1.13.78-1.68,1.19-.29.22-.58.45-.88.68a14.2,14.2,0,0,1-3.3,2.15A4.14,4.14,0,0,1,167.18,469.74Zm.91-3.46h0Zm-.66-13.63v.05c0,3.21.09,5.78.28,8.09.06.81.1,1.64.14,2.46s.06,1.38.11,2.06a18.62,18.62,0,0,0,1.61-1.2c.33-.27.66-.53,1-.77.59-.43,1.19-.85,1.79-1.27.93-.65,1.81-1.25,2.63-1.93.19-.16.54-.4,1-.68l.9-.62c-.28-.35-.62-.73-.77-.9l-.22-.25a17.5,17.5,0,0,0-7.61-4.8C167.89,452.79,167.63,452.71,167.43,452.65Zm10,5.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M190.73,469.74a4.13,4.13,0,0,1-1.59-.35,14.22,14.22,0,0,1-3.3-2.15c-.3-.24-.59-.47-.88-.68-.55-.41-1.12-.8-1.69-1.19-1-.66-1.94-1.35-2.89-2.13-.13-.11-.37-.26-.65-.45-1.56-1.05-2.54-1.77-2.88-2.76-.63-1.81,1-3.58,2-4.76l.19-.21a21.32,21.32,0,0,1,9.27-5.93c1.16-.42,3.11-1.11,4.66,0a4.24,4.24,0,0,1,1.48,3.58c0,3.32-.09,6-.29,8.41-.06.76-.1,1.54-.13,2.32s-.08,1.69-.15,2.51a4.18,4.18,0,0,1-1.65,3.38A2.91,2.91,0,0,1,190.73,469.74Zm-9.65-10.88.9.62c.41.28.76.52,1,.68.82.67,1.7,1.28,2.62,1.93.6.42,1.2.83,1.79,1.27.33.24.66.5,1,.77a18.47,18.47,0,0,0,1.61,1.2c0-.68.08-1.37.11-2.07s.08-1.64.14-2.45c.19-2.31.27-4.88.28-8.1v-.05c-.2.05-.46.14-.8.26a17.5,17.5,0,0,0-7.61,4.8l-.22.24C181.71,458.13,181.37,458.5,181.09,458.86Zm-.65-.52" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M102.47,354.23a2,2,0,0,1-1.68-3.08,79.22,79.22,0,0,1,7.43-9.73c6.39-7.21,15.4-12.58,27.57-16.43,11.57-3.66,22.64-7.53,30.94-14.54a2,2,0,0,1,3.25,1.91,18.25,18.25,0,0,1-2,5.36c6.95-2,16.48-6.56,19.26-10a2,2,0,0,1,3.55,1.36,16.94,16.94,0,0,1-3,8.82,65.35,65.35,0,0,0,12.58-2.63c1.46-.41,2.94-.82,4.46-1.21a2,2,0,0,1,2.44,2.41,12.34,12.34,0,0,1-1.78,4c17.25,3.33,36.68,15.6,47.45,30.28a2,2,0,1,1-3.23,2.37c-11-15-31.37-27.27-48.49-29.27a2,2,0,0,1-1-3.57,9.19,9.19,0,0,0,1.26-1.18l-.05,0c-5.93,1.65-11.53,3.21-18.5,2.83a2,2,0,0,1-1.09-3.6,12.31,12.31,0,0,0,3.36-3.87c-6.56,4.13-16.49,7.75-21.54,8.2a2,2,0,0,1-1.7-3.3c.35-.4.71-.85,1.08-1.35-7.71,4.74-16.71,7.82-26,10.77-11.46,3.62-19.89,8.62-25.78,15.27a75.18,75.18,0,0,0-7.06,9.24A2,2,0,0,1,102.47,354.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M119.46,422.75c-6.6,0-13.4-1.41-18.19-5.32-12.68-10.37-18.57-28.31-14.66-44.65,3.5-14.6,13.77-24.79,28.19-27.94a50.34,50.34,0,0,1,13.11-1.2h0c21.69,1,33,17.78,34.56,33.91,1.71,17.53-7.28,37.86-31.21,43.77A50.23,50.23,0,0,1,119.46,422.75Zm6.37-75.16a47.77,47.77,0,0,0-10.17,1.15c-12.86,2.81-22,11.91-25.15,25-3.56,14.88,1.78,31.21,13.3,40.62,6.27,5.12,17.82,5.25,26.5,3.11,21.61-5.34,29.73-23.69,28.19-39.5-1.41-14.42-11.46-29.38-30.77-30.3Q126.79,347.59,125.83,347.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M136.19,391.22c6.18-1.2,8.88-12,3.72-16s-15.21,1.36-14.1,8.27C126.6,388.33,131.25,392.18,136.19,391.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M88.65,512.72a2,2,0,0,1-2-2c0-8.37-.06-16.77-.11-24.89-.19-29.54-.38-57.44,1.85-87a2,2,0,1,1,4,.3c-2.22,29.38-2,57.2-1.84,86.66.05,8.13.11,16.53.11,24.91A2,2,0,0,1,88.65,512.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M263.59,512.72h-.2a2,2,0,0,1-1.79-2.19c1.33-13.41.87-37.17.34-58.37-.17-6.66-.6-13.32-1-19.77-.58-8.87-1.18-18-1.07-27.25a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.1,9.06.49,18.15,1.06,26.95.42,6.49.86,13.2,1,19.93.53,21.33,1,45.23-.36,58.87A2,2,0,0,1,263.59,512.72Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="84.62" cy="334.45" r="2.31"/><path class="cls-24" d="M235.5,423.2a50.2,50.2,0,0,1-11.8-1.43c-23.93-5.91-32.92-26.24-31.21-43.77,1.57-16.13,12.87-32.87,34.56-33.91a50.36,50.36,0,0,1,13.11,1.2c14.42,3.15,24.69,13.33,28.19,27.94,3.91,16.34-2,34.29-14.66,44.65C248.9,421.79,242.1,423.2,235.5,423.2ZM229.13,348q-1,0-1.9,0h0c-19.31.92-29.37,15.89-30.77,30.3-1.54,15.81,6.58,34.16,28.19,39.5,8.68,2.14,20.23,2,26.5-3.11,11.52-9.42,16.87-25.74,13.3-40.62-3.13-13.05-12.29-22.15-25.15-25A47.79,47.79,0,0,0,229.13,348Zm-2-2h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M240.76,389.67c-6.18-1.2-8.88-12-3.72-16s15.21,1.36,14.1,8.27C250.36,386.77,245.71,390.62,240.76,389.67Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="191.83" cy="332.89" r="2.31"/><path class="cls-24" d="M176.13,407.12a13.92,13.92,0,0,1-8.83-3.22h0c-3.83-3.15-3.79-5.86-3.09-7.58,1.81-4.42,9.6-5.72,13.19-5.4s8.38,1.36,10,4.47c.61,1.18,1,3.14-.55,5.76a12,12,0,0,1-8.4,5.76A13.24,13.24,0,0,1,176.13,407.12Zm-6.29-6.31a9.78,9.78,0,0,0,7.89,2.17,8.07,8.07,0,0,0,5.65-3.86c.34-.58.7-1.38.43-1.89-.46-.89-2.73-2-6.77-2.31-3.51-.31-8.45,1.28-9.13,2.93-.27.65.46,1.76,1.93,3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M165.22,420.86a8.93,8.93,0,0,1-5.31-1.66,8,8,0,0,1-3.17-7c.2-4.74,3.51-11.08,9.24-13.51a2,2,0,0,1,1.56,3.68c-4,1.7-6.65,6.51-6.8,10a4,4,0,0,0,1.53,3.62,5.83,5.83,0,0,0,5.35.45l1.06-.39c4.27-1.57,7.64-2.81,13.06-2.09a28.21,28.21,0,0,1,3.13.66c3.48.87,5.69,1.27,7.19-.59s.86-4.43.32-5.75c-1.36-3.33-4.58-6.19-7.32-6.52a2,2,0,0,1,.47-4c4.19.5,8.62,4.27,10.55,9,1.49,3.64,1.16,7.2-.9,9.77-3.21,4-7.87,2.83-11.28,2a25.36,25.36,0,0,0-2.68-.58c-4.44-.58-7.12.4-11.16,1.88l-1.08.39A11.06,11.06,0,0,1,165.22,420.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M176.32,432.68c-2.92,0-5.13-.74-6.72-2.25-2.9-2.77-3-7.44-2.79-12.38a2,2,0,1,1,4,.15c-.14,3.84-.14,7.72,1.55,9.34,1,1,2.74,1.31,5.32,1.09l.2,0c3.29-.28,4-.34,4.67-2.76a36.9,36.9,0,0,0,.84-9.07,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,39.11,39.11,0,0,1-1,10.13c-1.45,5.07-4.72,5.35-8.17,5.65l-.2,0Q177.14,432.68,176.32,432.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M104,352.05a2,2,0,0,1-.74-.14C98,349.85,93.29,344,91.72,337.8c-1.24-4.94-.36-9.51,2.47-12.85,3.35-4,10.47-4.29,15-2.12,4.91,2.34,7.35,5.93,9.93,9.73l1.09,1.6a2,2,0,0,1-3.28,2.28l-1.12-1.63c-2.46-3.63-4.41-6.49-8.34-8.37-3.07-1.46-8.22-1.31-10.25,1.09-2.53,3-2.29,6.71-1.64,9.3,1.25,5,5.08,9.77,9.11,11.37a2,2,0,0,1-.74,3.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M251.49,354a2,2,0,0,1-1.5-3.32c3.8-4.33,11.95-15.11,5.66-21.62-2.51-2.6-7.3-2.47-10.55-1-3.57,1.58-5.83,4.67-8,7.65l-.92,1.25a2,2,0,0,1-3.2-2.4l.9-1.21c2.38-3.25,5.08-6.93,9.62-8.94s11.23-2,15,1.91c6.05,6.27,4,16.12-5.53,27A2,2,0,0,1,251.49,354Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-26"><path class="cls-24" d="M625.88,469.74a2.91,2.91,0,0,1-1.54-.42,4.19,4.19,0,0,1-1.65-3.38c-.07-.82-.11-1.67-.15-2.52s-.07-1.55-.13-2.31c-.19-2.42-.29-5.09-.29-8.41a4.24,4.24,0,0,1,1.48-3.58c1.55-1.09,3.5-.4,4.66,0a21.33,21.33,0,0,1,9.27,5.93l.19.21c1.06,1.17,2.65,2.94,2,4.76-.35,1-1.32,1.71-2.88,2.76-.28.19-.52.34-.65.45-.95.78-1.93,1.46-2.89,2.13-.57.39-1.13.79-1.69,1.2-.29.21-.58.45-.88.68a14.24,14.24,0,0,1-3.3,2.15A4.13,4.13,0,0,1,625.88,469.74Zm.91-3.46h0Zm-.66-13.63v.05c0,3.21.09,5.78.28,8.09.06.81.1,1.63.14,2.44s.07,1.4.12,2.08a18.23,18.23,0,0,0,1.61-1.2c.33-.27.66-.53,1-.77.59-.44,1.19-.85,1.79-1.27.93-.64,1.81-1.25,2.62-1.93.19-.16.54-.4,1-.68l.9-.62c-.28-.35-.62-.73-.77-.9l-.22-.25a17.51,17.51,0,0,0-7.61-4.8C626.59,452.79,626.33,452.71,626.13,452.65Zm10,5.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M649.44,469.74a4.13,4.13,0,0,1-1.59-.35,14.23,14.23,0,0,1-3.3-2.15c-.3-.24-.59-.47-.88-.68-.55-.41-1.12-.8-1.68-1.19-1-.66-1.94-1.35-2.89-2.13-.13-.11-.37-.26-.65-.45-1.56-1.05-2.54-1.77-2.88-2.76-.63-1.81,1-3.58,2-4.75l.19-.21a21.33,21.33,0,0,1,9.27-5.93c1.16-.42,3.11-1.11,4.66,0a4.24,4.24,0,0,1,1.48,3.58c0,3.32-.1,6-.29,8.41-.06.77-.1,1.54-.13,2.32s-.08,1.69-.15,2.51h0a4.19,4.19,0,0,1-1.65,3.38A2.91,2.91,0,0,1,649.44,469.74Zm-9.65-10.88c.32.23.67.47.9.62.41.28.76.52,1,.68.82.67,1.7,1.28,2.63,1.93.6.42,1.2.83,1.79,1.27.33.24.66.5,1,.77a18.42,18.42,0,0,0,1.61,1.2c0-.68.08-1.37.11-2.07s.08-1.64.14-2.45c.18-2.31.27-4.88.28-8.1v-.05c-.2.05-.46.14-.8.26a17.51,17.51,0,0,0-7.61,4.8l-.22.24C640.41,458.13,640.07,458.5,639.79,458.86Zm-.65-.52" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M561.17,354.23a2,2,0,0,1-1.68-3.08,79.07,79.07,0,0,1,7.43-9.73c6.39-7.21,15.4-12.58,27.57-16.43,11.57-3.66,22.64-7.53,30.95-14.54a2,2,0,0,1,3.25,1.91,18.24,18.24,0,0,1-2,5.36c6.95-2,16.48-6.56,19.26-10a2,2,0,0,1,3.55,1.36,16.94,16.94,0,0,1-3,8.82A65.37,65.37,0,0,0,659,315.26c1.46-.41,2.94-.82,4.46-1.21a2,2,0,0,1,2.44,2.42,12.35,12.35,0,0,1-1.78,4c17.25,3.33,36.67,15.59,47.45,30.28a2,2,0,1,1-3.22,2.37c-11-15-31.37-27.27-48.49-29.27a2,2,0,0,1-1-3.57,9.15,9.15,0,0,0,1.26-1.18h-.05c-5.93,1.65-11.54,3.21-18.5,2.83a2,2,0,0,1-1.09-3.6,12.32,12.32,0,0,0,3.36-3.87c-6.57,4.13-16.49,7.75-21.54,8.2a2,2,0,0,1-1.7-3.29c.35-.4.71-.86,1.08-1.35-7.71,4.74-16.72,7.82-26,10.77-11.46,3.62-19.89,8.62-25.78,15.27a75.13,75.13,0,0,0-7.06,9.24A2,2,0,0,1,561.17,354.23Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M578.17,422.75c-6.6,0-13.4-1.41-18.19-5.32-12.68-10.37-18.57-28.31-14.66-44.65,3.5-14.6,13.77-24.79,28.19-27.94a50.35,50.35,0,0,1,13.11-1.2h0c21.69,1,33,17.78,34.56,33.91,1.71,17.53-7.28,37.86-31.21,43.77A50.23,50.23,0,0,1,578.17,422.75Zm6.37-75.16a47.79,47.79,0,0,0-10.18,1.15c-12.86,2.81-22,11.91-25.15,25-3.56,14.88,1.78,31.21,13.3,40.62,6.27,5.12,17.82,5.25,26.5,3.11,21.61-5.34,29.73-23.69,28.19-39.5-1.41-14.42-11.47-29.38-30.77-30.3Q585.49,347.59,584.53,347.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M571.9,391.22c6.18-1.2,8.88-12,3.72-16s-15.21,1.36-14.1,8.27C562.3,388.33,567,392.18,571.9,391.22Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M547.36,512.72a2,2,0,0,1-2-2c0-8.37-.06-16.77-.11-24.88-.2-29.54-.38-57.44,1.85-87a2,2,0,0,1,4,.3c-2.22,29.38-2,57.21-1.84,86.66.05,8.12.11,16.52.11,24.91A2,2,0,0,1,547.36,512.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M722.29,512.72h-.2a2,2,0,0,1-1.79-2.19c1.33-13.41.87-37.16.34-58.37-.17-6.66-.6-13.32-1-19.77-.58-8.87-1.17-18-1.07-27.26a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.1,9.06.49,18.16,1.07,27,.42,6.49.86,13.19,1,19.93.53,21.33,1,45.23-.36,58.87A2,2,0,0,1,722.29,512.72Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="520.33" cy="334.45" r="2.31"/><path class="cls-24" d="M694.2,423.2a50.2,50.2,0,0,1-11.8-1.43c-23.93-5.91-32.92-26.24-31.21-43.77,1.57-16.13,12.87-32.87,34.56-33.91a50.16,50.16,0,0,1,13.11,1.2c14.42,3.15,24.69,13.33,28.19,27.94,3.91,16.34-2,34.29-14.66,44.65C707.6,421.79,700.8,423.2,694.2,423.2ZM687.83,348q-1,0-1.9,0h0c-19.31.92-29.37,15.89-30.77,30.3-1.54,15.81,6.58,34.16,28.19,39.5,8.68,2.14,20.23,2,26.5-3.11,11.52-9.42,16.86-25.74,13.3-40.62C720,361.1,710.86,352,698,349.19A47.79,47.79,0,0,0,687.83,348Zm-2-2h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M676.47,389.67c-6.18-1.2-8.88-12-3.72-16s15.21,1.36,14.1,8.27C686.07,386.77,681.41,390.62,676.47,389.67Z" transform="translate(-53.25 -44.96)"/><circle class="cls-7" cx="627.54" cy="332.89" r="2.31"/><path class="cls-24" d="M634.83,407.12A13.92,13.92,0,0,1,626,403.9h0c-3.83-3.15-3.79-5.86-3.09-7.58,1.81-4.42,9.61-5.71,13.19-5.4s8.38,1.36,10,4.47c.61,1.18,1,3.14-.55,5.76a12,12,0,0,1-8.4,5.76A13.24,13.24,0,0,1,634.83,407.12Zm-6.29-6.31a9.78,9.78,0,0,0,7.88,2.17,8.08,8.08,0,0,0,5.65-3.86c.34-.58.7-1.38.43-1.89-.46-.89-2.73-2-6.77-2.31-3.51-.31-8.46,1.28-9.13,2.93-.26.65.46,1.76,1.93,3Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M623.92,420.86a8.93,8.93,0,0,1-5.31-1.66,8,8,0,0,1-3.17-7c.2-4.74,3.51-11.08,9.23-13.51a2,2,0,0,1,1.56,3.68c-4,1.7-6.65,6.51-6.8,10A4,4,0,0,0,621,416a5.83,5.83,0,0,0,5.35.45l1.06-.39c4.27-1.57,7.64-2.82,13.06-2.09a28.19,28.19,0,0,1,3.13.66c3.48.87,5.7,1.27,7.19-.59s.86-4.43.32-5.75c-1.36-3.33-4.58-6.19-7.32-6.52a2,2,0,1,1,.47-4c4.19.5,8.62,4.27,10.55,9,1.49,3.64,1.16,7.2-.9,9.77-3.21,4-7.87,2.83-11.28,2a25.6,25.6,0,0,0-2.68-.58c-4.44-.58-7.12.4-11.16,1.88l-1.08.39A11.05,11.05,0,0,1,623.92,420.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M635,432.68c-2.92,0-5.13-.74-6.72-2.25-2.9-2.76-3-7.44-2.79-12.38a2,2,0,0,1,4,.15c-.14,3.84-.14,7.72,1.55,9.34,1,1,2.74,1.31,5.32,1.09l.2,0c3.29-.28,4-.34,4.67-2.76a36.89,36.89,0,0,0,.84-9.07,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,39.06,39.06,0,0,1-1,10.13c-1.45,5.07-4.71,5.35-8.17,5.65l-.2,0Q635.84,432.68,635,432.68Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M562.68,352.05a2,2,0,0,1-.74-.14c-5.21-2.06-9.95-7.87-11.52-14.11-1.24-4.94-.37-9.51,2.46-12.85,3.35-4,10.47-4.29,15-2.12,4.91,2.34,7.35,5.93,9.93,9.74l1.09,1.59a2,2,0,1,1-3.29,2.28l-1.12-1.63c-2.46-3.63-4.41-6.5-8.34-8.37-3.07-1.47-8.23-1.31-10.25,1.09-2.53,3-2.29,6.71-1.64,9.3,1.25,5,5.08,9.77,9.11,11.37a2,2,0,0,1-.74,3.86Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M710.2,354a2,2,0,0,1-1.5-3.32c3.8-4.33,11.95-15.11,5.66-21.62-2.51-2.6-7.3-2.47-10.54-1-3.57,1.58-5.83,4.67-8,7.65l-.92,1.25a2,2,0,0,1-3.2-2.4l.89-1.21c2.38-3.25,5.08-6.93,9.62-8.94s11.23-2,15,1.91c6.05,6.26,4,16.12-5.53,27A2,2,0,0,1,710.2,354Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M658,401.5a2,2,0,0,1-1.75-3c1.28-2.33,6-3.06,16.21-3.8,1.16-.08,2.16-.16,2.84-.23a186.1,186.1,0,0,1,25.3-.51l3.1.08c6.61.14,14.83.32,19.92,3.76a2,2,0,1,1-2.24,3.31c-4.12-2.78-11.69-2.94-17.77-3.08l-3.16-.08a182.21,182.21,0,0,0-24.75.49c-.72.07-1.75.15-3,.24-3.18.23-11.54.84-13.11,1.92A2,2,0,0,1,658,401.5Zm1.75-1h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M550.5,403a2,2,0,0,1-.85-3.81c22.12-10.34,50.14-5.14,64.87-1.12a2,2,0,1,1-1.05,3.86c-14.2-3.88-41.16-8.92-62.13.88A2,2,0,0,1,550.5,403Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-24" d="M476,616.83c-37.71,0-75.29-.27-112.35-.54-33.89-.24-68.93-.5-103.27-.53-31.46,0-63.37-.27-94.23-.5l-35-.25a2,2,0,0,1,0-4h0l35,.25c30.85.23,62.75.46,94.2.5,34.35,0,69.4.29,103.29.53,86.22.62,175.38,1.26,262.11-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08a2,2,0,0,1,0,4c-4,0-8,0-12-.08-7.82-.08-15.91-.17-23.81.08C576.39,616.35,526.08,616.83,476,616.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M476,591.73c-37.71,0-75.28-.27-112.32-.54-33.9-.24-69-.5-103.31-.53-31.4,0-63.25-.27-94.05-.5q-26.27-.19-52.54-.35a2,2,0,0,1,0-4h0q26.28.14,52.55.35c30.8.23,62.64.46,94,.5,34.37,0,69.43.29,103.33.53,86.21.62,175.36,1.26,262.07-1.53,8-.26,16.12-.17,24-.09,4,0,7.95.08,11.91.08,5.21,0,11.36.13,19.37.4a2,2,0,0,1,1.93,2.07,2,2,0,0,1-2.07,1.93c-8-.27-14.08-.39-19.24-.39-4,0-8,0-12-.08-7.82-.08-15.9-.17-23.81.08C576.4,591.25,526.09,591.73,476,591.73Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M89,396a2,2,0,0,1-.1-4,88.43,88.43,0,0,0,11.52-1.63c3-.56,6.18-1.15,9.26-1.47a131.34,131.34,0,0,1,15.92-.45c1.88,0,3.77.05,5.71,0,1.54,0,3.15,0,4.81-.07,7.7-.16,16.42-.33,23.09,2.2a2,2,0,0,1-1.42,3.74c-5.94-2.26-14.25-2.09-21.59-1.94-1.69,0-3.33.07-4.88.07-2,0-3.87,0-5.77,0a128,128,0,0,0-15.45.42c-2.92.31-6,.88-8.95,1.43A91.36,91.36,0,0,1,89.1,396Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M256,394.5a2,2,0,0,1-.63-.1c-13.31-4.45-28.4-3-43-1.64-5.39.51-11,1-16.28,1.24a2,2,0,1,1-.15-4c5.21-.2,10.48-.7,16.06-1.23,15-1.42,30.54-2.89,44.65,1.83a2,2,0,0,1-.63,3.9Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M91.67,303.33a2,2,0,0,1-2-2V282.07c0-4.12.11-8.41.34-12.75.09-1.79.1-4.22.11-6.8,0-3.27,0-6.64.22-8.83a2,2,0,1,1,4,.35c-.18,2-.19,5.31-.21,8.49,0,2.62,0,5.1-.12,7-.22,4.33-.33,8.44-.33,12.55v19.26A2,2,0,0,1,91.67,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M110.33,303.33a2,2,0,0,1-2-2V222.5a2,2,0,0,1,4,0v78.83A2,2,0,0,1,110.33,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M122.33,303.74a2,2,0,0,1-.93-.23c-1.39-.73-1.91-2.27-2.88-11.69-.08-.74-.14-1.34-.19-1.73-.64-5.16-1.33-10.52-2-16-2.33-18.08-4.73-36.78-6-53.83a2,2,0,1,1,4-.29c1.23,16.93,3.63,35.58,5.95,53.61.7,5.47,1.39,10.83,2,16,.05.41.12,1,.2,1.81.2,1.92.78,7.61,1.31,9a2,2,0,0,1-1.48,3.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M151.33,298.33a2,2,0,0,1-2-1.91,53.62,53.62,0,0,0-1.07-6.68c-.3-1.53-.62-3.1-.83-4.51-.49-3.15-1-6.3-1.55-9.46-.38-2.26-.75-4.52-1.12-6.79-.75-4.62-1.46-9.25-2.18-13.88-2.2-14.2-4.47-28.86-7.59-43.13-5.25-.24-12.81-.26-17,3.52a2,2,0,1,1-2.67-3c5.43-4.85,13.91-4.84,21.43-4.46a2,2,0,0,1,1.85,1.56c3.33,14.87,5.69,30.12,8,44.88.72,4.62,1.43,9.24,2.17,13.86q.55,3.38,1.12,6.76c.53,3.17,1.06,6.34,1.55,9.51.21,1.33.51,2.86.81,4.35a55.52,55.52,0,0,1,1.14,7.28,2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M138.56,304a2,2,0,0,1-.14-4,17.88,17.88,0,0,0,5.7-1.36c.58-.22,1.13-.44,1.7-.59a11.3,11.3,0,0,0,2.52-1.24c.58-.34,1.18-.7,1.81-1a2,2,0,0,1,1.71,3.61c-.46.22-1,.51-1.49.83a14.58,14.58,0,0,1-3.48,1.65c-.38.1-.82.27-1.33.47a21.89,21.89,0,0,1-6.85,1.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M153.33,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.06-3.86.13-7.85,0-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.1-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.44.33,26.71,1,38.39.41,7.12.49,14.44.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,153.33,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M170.33,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.2s-.17-4.93-.17-7.48v-7.94c0-22,0-44.68,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.37-.27-5-1.78-2.09-8.12-1.15-12.31-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.77,38.77,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.86-1,66.78v7.95c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,170.33,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M527.75,303.33a2,2,0,0,1-2-2V222.5a2,2,0,0,1,4,0v78.83A2,2,0,0,1,527.75,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M539.75,303.74a2,2,0,0,1-.93-.23c-1.39-.73-1.91-2.27-2.88-11.68-.08-.74-.14-1.35-.19-1.75l-.58-4.7c-2.64-21.32-5.92-47.86-7.42-68.57a2,2,0,0,1,4-.29c1.49,20.6,4.76,47.09,7.4,68.37l.58,4.7c.05.41.12,1.05.2,1.83.2,1.91.78,7.59,1.31,9a2,2,0,0,1-1.48,3.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M568.75,298.33a2,2,0,0,1-2-1.91,53.52,53.52,0,0,0-1.07-6.67c-.3-1.53-.62-3.11-.84-4.52-.49-3.15-1-6.3-1.54-9.46-.38-2.26-.75-4.52-1.12-6.79-.75-4.62-1.46-9.25-2.18-13.88-2.19-14.18-4.46-28.83-7.58-43.08-6.43.09-17.21,2.45-21.34,6.14a2,2,0,0,1-2.67-3c5.46-4.88,18.89-7.47,25.72-7.12a2,2,0,0,1,1.85,1.56c3.33,14.87,5.69,30.13,8,44.88.72,4.62,1.43,9.24,2.17,13.85.36,2.25.74,4.51,1.12,6.76.53,3.17,1.06,6.34,1.55,9.51.21,1.33.51,2.87.81,4.35a55.44,55.44,0,0,1,1.14,7.27,2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M556,304a2,2,0,0,1-.14-4,17.89,17.89,0,0,0,5.7-1.36c.58-.22,1.13-.44,1.7-.59a11.29,11.29,0,0,0,2.52-1.24c.58-.34,1.18-.7,1.81-1a2,2,0,1,1,1.71,3.61c-.46.22-1,.51-1.49.82a14.58,14.58,0,0,1-3.48,1.65c-.38.1-.82.27-1.33.47a21.89,21.89,0,0,1-6.85,1.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M570.75,302.67a2,2,0,0,1-2-2c0-2,0-4.06.07-6.1.06-3.86.13-7.85-.05-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,570.75,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M587.75,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.84-.16-7.2s-.17-4.93-.17-7.48v-7.93c0-22,0-44.69,1-67,0-.33,0-.69.06-1.08.08-1.2.29-4.37-.27-5-1.78-2.09-8.12-1.15-12.31-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.68-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.87-1,66.8v7.93c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,587.75,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M175.66,301.33a2,2,0,0,1-2-1.66,70.59,70.59,0,0,1-.53-13.69,87.77,87.77,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.77,90.77,0,0,1,.15,10.86,66.62,66.62,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M180.34,197.94a62.68,62.68,0,0,1-7-.33,2,2,0,1,1,.46-4,105.46,105.46,0,0,0,14.11.14c2.39-.08,4.65-.15,6.72-.15a2,2,0,0,1,2,2,2,2,0,0,1-2,2h0c-2,0-4.24.07-6.6.15C185.46,197.85,182.85,197.94,180.34,197.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M197.66,303.33a2,2,0,0,1-2-1.65,139.45,139.45,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59v-4.22a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4A135.63,135.63,0,0,0,199.64,301,2,2,0,0,1,198,303.3,2.05,2.05,0,0,1,197.66,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M207,212.49a2,2,0,0,1-.5-.06c-2.37-.61-8.13-.82-11.23-.84a2,2,0,1,1,0-4c2.94,0,9.26.2,12.22,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21A2,2,0,0,1,208,303Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M239.67,304h0a2,2,0,0,1-2-2c0-2.18-.07-5-.16-8s-.18-5.94-.18-8.58c0-15.56-.34-31.45-.67-46.8-.29-13.42-.59-27.3-.66-40.92a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c.07,13.58.37,27.45.66,40.85.33,15.38.68,31.28.68,46.89,0,2.59.09,5.57.18,8.46s.18,5.89.16,8.15A2,2,0,0,1,239.67,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M238,199.67a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.73,0c-1.77,0-3.59,0-5.36,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,1,1-1.69-3.63c2.26-1,5-1.11,7.28-1.15l1.16,0c1.87-.07,3.74,0,5.56,0l2.68,0c4.73,0,11.73.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M430.83,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.71,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,430.83,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M447.83,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.21s-.17-4.93-.17-7.47v-8c0-22,0-44.66,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,4.94.17,7.33s.17,4.87.17,7.35A2,2,0,0,1,447.83,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M453.16,301.33a2,2,0,0,1-2-1.66,70.61,70.61,0,0,1-.53-13.69,87.64,87.64,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.75,90.75,0,0,1,.15,10.86,66.58,66.58,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M457.84,197.94a62.68,62.68,0,0,1-7-.33,2,2,0,1,1,.46-4,105.2,105.2,0,0,0,14.11.14c2.41-.08,4.65-.13,6.77-.15a2,2,0,0,1,0,4h0c-2,0-4.24.07-6.6.15C463,197.85,460.35,197.94,457.84,197.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M475.16,303.33a2,2,0,0,1-2-1.65,139.55,139.55,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59v-4.22a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4A135.64,135.64,0,0,0,477.13,301a2,2,0,0,1-1.62,2.32A2,2,0,0,1,475.16,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M484.5,212.49a2,2,0,0,1-.5-.06c-2.37-.61-8.13-.84-11.22-.84h0a2,2,0,1,1,0-4h0c2.94,0,9.26.2,12.22,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M485.5,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21a2,2,0,0,1-1.83,2.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M517.17,304h0a2,2,0,0,1-2-2c0-2.18-.07-5-.16-8s-.18-5.94-.18-8.59c0-15.56-.34-31.44-.67-46.79-.29-13.43-.59-27.31-.66-40.93a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c.07,13.58.37,27.45.66,40.86.33,15.38.67,31.28.67,46.88,0,2.59.09,5.58.18,8.47s.18,5.89.16,8.15A2,2,0,0,1,517.17,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M515.5,199.67a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.73,0c-1.77,0-3.59,0-5.36,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,0,1-1.69-3.63c2.26-1,5-1.11,7.28-1.15l1.16,0c1.87-.07,3.74,0,5.56,0l2.68,0c4.73,0,11.73.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M637.34,302.67a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.75-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.71,1,38.39.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,637.34,302.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M654.34,303.33h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.2s-.17-4.93-.17-7.48v-8c0-22,0-44.66,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a40,40,0,0,1-5.15.57h0a2,2,0,0,1,0-4,38.79,38.79,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,654.34,303.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M659.67,301.33a2,2,0,0,1-2-1.66,70.61,70.61,0,0,1-.53-13.69,87.64,87.64,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,1,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.75,90.75,0,0,1,.15,10.86,66.58,66.58,0,0,0,.47,12.91,2,2,0,0,1-2,2.34Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M681.67,303.33a2,2,0,0,1-2-1.65,139.55,139.55,0,0,1-1.7-17.26c-1.2-25.62-1.32-50.17-1.33-73.13a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,22.91.13,47.4,1.33,72.94A135.64,135.64,0,0,0,683.64,301a2,2,0,0,1-2,2.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M692,303a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.2-.08-30.69-.17-45.66l-.06-11.11a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2l.06,11.11c.08,15,.17,30.47.17,45.68,0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21A2,2,0,0,1,692,303Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M253,303.33a2,2,0,0,1-1.19-.4c-.74-.55-1.6-1.25-2.51-2-2.68-2.19-6.36-5.2-8.67-5.64a2,2,0,1,1,.75-3.93c3.31.63,7.27,3.87,10.46,6.47.87.72,1.7,1.39,2.37,1.89a2,2,0,0,1-1.2,3.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M241.33,293a2,2,0,0,1-1.94-2.48c2.64-10.63,9.2-19.77,15.55-28.61,2-2.82,3.94-5.48,5.73-8.19,3.93-5.95,7.81-12.09,11.57-18,4.56-7.21,9.27-14.66,14.11-21.83.44-.66.89-1.29,1.33-1.91a29.33,29.33,0,0,0,3.24-5.33c.53-1.23,2.4-5.38,4.32-7.35a2,2,0,1,1,2.86,2.79,25,25,0,0,0-3.51,6.14,32.85,32.85,0,0,1-3.65,6.06c-.42.6-.85,1.2-1.28,1.84-4.81,7.13-9.5,14.55-14,21.74-3.77,6-7.66,12.11-11.61,18.09-1.83,2.77-3.86,5.59-5.81,8.32-6.13,8.53-12.46,17.35-14.91,27.24A2,2,0,0,1,241.33,293Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M309.67,212a2,2,0,0,1-1.49-.67c-2.4-2.68-5.79-4.76-9.06-6.77-1.18-.72-2.39-1.47-3.55-2.23a2,2,0,0,1,2.21-3.34c1.1.73,2.23,1.42,3.43,2.16,3.52,2.16,7.16,4.39,10,7.51a2,2,0,0,1-1.49,3.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M254,304.33a2,2,0,0,1-1.92-2.58c.78-2.6,2.65-4.64,4.45-6.62a32.78,32.78,0,0,0,2.18-2.56c2.36-3.22,4.48-6.69,6.54-10.05l3.33-5.44c3.09-5.06,6.29-10.29,9.55-15.45a408.31,408.31,0,0,0,21.48-38.44c.38-.79.77-1.6,1.16-2.42,2-4.17,4.2-8.89,7.47-12.18a2,2,0,1,1,2.84,2.82c-2.78,2.8-4.77,7-6.69,11.07-.4.84-.79,1.67-1.18,2.47a412.46,412.46,0,0,1-21.69,38.82c-3.25,5.13-6.44,10.35-9.52,15.39l-3.33,5.44c-2.1,3.43-4.27,7-6.73,10.33a35.92,35.92,0,0,1-2.45,2.89c-1.5,1.65-3.06,3.36-3.58,5.09A2,2,0,0,1,254,304.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603.43,303.32a2,2,0,0,1-.75-.15c-.85-.35-1.86-.81-2.93-1.3-3.15-1.45-7.48-3.43-9.81-3.28a2,2,0,1,1-.26-4c3.38-.23,8,1.92,11.75,3.64,1,.47,2,.92,2.77,1.23a2,2,0,0,1-.76,3.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M589.54,296.25a2,2,0,0,1-2-2c-.12-11,3.94-21.45,7.86-31.6,1.25-3.24,2.43-6.29,3.49-9.36,2.31-6.75,4.53-13.67,6.67-20.36,2.6-8.12,5.29-16.51,8.17-24.67.26-.75.54-1.47.81-2.18a29.41,29.41,0,0,0,1.8-6c.2-1.32,1-5.82,2.34-8.2a2,2,0,1,1,3.47,2,25.08,25.08,0,0,0-1.86,6.83,32.91,32.91,0,0,1-2,6.78c-.26.68-.52,1.38-.78,2.1-2.86,8.1-5.54,16.47-8.13,24.56-2.15,6.71-4.37,13.65-6.7,20.44-1.08,3.14-2.33,6.38-3.54,9.51-3.79,9.8-7.7,19.92-7.59,30.11a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M635.33,200.68a2,2,0,0,1-1.11-.33c-3-2-6.8-3.15-10.47-4.27-1.32-.4-2.68-.82-4-1.27a2,2,0,1,1,1.3-3.78c1.25.43,2.52.82,3.87,1.23,3.95,1.21,8,2.45,11.52,4.77a2,2,0,0,1-1.11,3.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.65,304h-.08a2,2,0,0,1-1.92-2.08c.11-2.71,1.4-5.16,2.65-7.53a32.79,32.79,0,0,0,1.47-3c1.47-3.71,2.66-7.6,3.81-11.37l1.86-6.13c1.72-5.67,3.49-11.52,5.36-17.33A408.38,408.38,0,0,0,628.92,214c.17-.86.34-1.74.51-2.64.86-4.53,1.84-9.66,4.17-13.66a2,2,0,1,1,3.46,2c-2,3.41-2.86,8-3.7,12.39-.17.92-.35,1.82-.52,2.69a412.59,412.59,0,0,1-11.24,43c-1.85,5.77-3.63,11.61-5.34,17.26l-1.86,6.13c-1.17,3.85-2.38,7.83-3.92,11.69a35.72,35.72,0,0,1-1.65,3.41c-1,2-2.12,4-2.19,5.82A2,2,0,0,1,604.65,304Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M310,304.86a2,2,0,0,1-2-1.91c-.52-11.52-.63-20-.34-26,.76-16,.71-32.73.67-48.9,0-13.26-.08-27,.33-40.1a2,2,0,0,1,4,.13c-.41,13.07-.37,26.74-.33,40,0,16.22.1,33-.67,49.1-.28,5.88-.17,14.28.34,25.67a2,2,0,0,1-1.91,2.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M323.33,305.14a2,2,0,0,1-2-2V278.83c0-5.5-.21-11.11-.41-16.53-.3-8.08-.62-16.43-.25-24.7.34-7.62.33-15.47.33-23.06v-2.2c0-2.18.07-4.55.14-7.06a126.8,126.8,0,0,0-.26-17,2,2,0,1,1,4-.46,129.52,129.52,0,0,1,.29,17.58c-.07,2.48-.14,4.82-.14,6.94v2.2c0,7.64,0,15.53-.34,23.24-.36,8.1,0,16.37.25,24.37.21,5.46.42,11.11.42,16.68v24.31A2,2,0,0,1,323.33,305.14Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M340.5,221a2,2,0,0,1-.78-.16c-2.63-1.12-8.49-.91-12.77-.75-1.38.05-2.69.1-3.76.1a2,2,0,0,1,0-4c1,0,2.27,0,3.61-.1,4.92-.18,11-.4,14.49,1.07a2,2,0,0,1-.79,3.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M338.75,305.14a2,2,0,0,1-2-2V289.69c0-11.85.45-23.83.88-35.41s.88-23.52.87-35.28a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,11.84-.44,23.83-.87,35.43s-.87,23.48-.87,35.26v13.45A2,2,0,0,1,338.75,305.14Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M346.25,305.29a2,2,0,0,1-2-2V293c0-9.65-.1-19.65-.19-29.32s-.19-19.77-.19-29.53a2,2,0,1,1,4,0c0,9.74.1,19.78.19,29.49s.19,19.68.19,29.35v10.31A2,2,0,0,1,346.25,305.29Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M380.14,236.27h-.33c-16.41-.09-27.82-.13-33.94-.13a2,2,0,0,1,0-4c6.12,0,17.54,0,34,.13h1.38v2l2,0C383.19,236.15,381.69,236.27,380.14,236.27Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M380,303.28a2,2,0,0,1-2-2c0-9.68.36-21.38,1-32.94.48-8.65.38-17.78.28-26.61,0-2.51-.06-5-.07-7.44a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,2.44,0,4.92.07,7.42.1,8.9.21,18.09-.28,26.88-.64,11.49-1,23.11-1,32.71A2,2,0,0,1,380,303.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M384.18,302.4a2,2,0,0,1-2-2c-.05-4.06-.14-11.62-.4-16.81-.38-7.67,0-15.44.28-22.95.22-5.06.45-10.3.45-15.42,0-6.33.06-13.14.13-19.74s.13-13.42.13-19.76a2,2,0,0,1,4,0c0,6.35-.06,13.19-.12,19.79s-.12,13.39-.12,19.7c0,5.2-.23,10.49-.45,15.59-.32,7.42-.65,15.09-.28,22.58.26,5.27.36,12.88.41,17a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M425,208c-2.64,0-5.15-.2-7.58-.39-2-.16-3.87-.31-5.84-.36-4.83-.13-9.6.07-13.22.26-2.63.14-10.62.24-13.62.24a2,2,0,0,1,0-4c3,0,10.84-.1,13.41-.23,3.69-.19,8.56-.39,13.53-.26,2.08.05,4.1.21,6.05.37,2.35.19,4.78.38,7.26.38a2,2,0,0,1,0,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M424.5,296a2,2,0,0,1-2-2V279.51c0-12.4.19-24.88.38-37s.37-24.48.37-36.81a2,2,0,0,1,4,0c0,12.36-.19,24.82-.37,36.87s-.37,24.52-.37,36.89V294A2,2,0,0,1,424.5,296Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M657.67,197.33a2,2,0,0,1,0-4c1.61,0,3.14-.17,4.77-.34,1.35-.14,2.75-.28,4.18-.33a2,2,0,0,1,.14,4c-1.29,0-2.56.17-3.91.31-1.65.17-3.35.34-5.15.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M516.67,225.33a2,2,0,0,1-.88-3.8c2.92-1.42,9.36-1.86,12.44-.32a2,2,0,0,1-1.79,3.58c-1.87-.94-7-.59-8.9.34A2,2,0,0,1,516.67,225.33Z" transform="translate(-53.25 -44.96)"/><g class="cls-27"><path class="cls-24" d="M161.5,730.09a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.71-.3-6.38-.38-12.91-.45-19.22-.08-7-.17-14.32-.57-21.35-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.38.41,7.12.49,14.45.57,21.53.07,6.28.15,12.77.45,19.08.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,161.5,730.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M178.5,730.76h0a2,2,0,0,1-2-2c0-2.41-.08-4.85-.16-7.21s-.17-4.93-.17-7.47v-7.94c0-22,0-44.67,1-67,0-.32,0-.69.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.32-.53a39.88,39.88,0,0,1-5.15.57h0a2,2,0,0,1,0-4,39,39,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.21,1.21,7.88,0,.36,0,.7-.06,1-1,22.2-1,44.86-1,66.78v7.95c0,2.48.08,4.95.17,7.34s.17,4.87.17,7.35A2,2,0,0,1,178.5,730.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.83,728.76a2,2,0,0,1-2-1.66,70.59,70.59,0,0,1-.53-13.69,87.87,87.87,0,0,0-.14-10.38c-1.94-20.3-1.75-41.52-1.57-62,.05-5.91.11-12,.11-17.95a2,2,0,0,1,4,0c0,5.94-.05,12.06-.11,18-.18,20.42-.37,41.53,1.55,61.62a90.77,90.77,0,0,1,.15,10.86,66.65,66.65,0,0,0,.47,12.91,2,2,0,0,1-1.63,2.31Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M188.51,625.36a62.93,62.93,0,0,1-7-.33,2,2,0,0,1,.46-4,105.22,105.22,0,0,0,14.11.14c2.39-.08,4.65-.15,6.72-.15a2,2,0,1,1,0,4s0,0,0,0c-2,0-4.24.07-6.6.15C193.63,625.28,191,625.36,188.51,625.36Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M205.83,730.76a2,2,0,0,1-2-1.65,139.57,139.57,0,0,1-1.7-17.26c-1.34-28.65-1.34-55.82-1.34-84.59V623a2,2,0,0,1,4,0v4.22c0,28.72,0,55.84,1.33,84.4a135.64,135.64,0,0,0,1.64,16.74,2,2,0,0,1-2,2.35Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M215.17,639.92a2,2,0,0,1-.5-.06c-2.37-.61-8.12-.84-11.21-.84h0a2,2,0,0,1,0-4h0c2.94,0,9.25.2,12.21,1a2,2,0,0,1-.5,3.94Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.17,730.43a2,2,0,0,1-1.84-1.21c-1.15-2.66-1-7-.9-10.92,0-1.08.07-2.11.07-3,0-15.16-.08-30.61-.17-45.54s-.17-30.43-.17-45.64a2,2,0,0,1,4,0c0,15.2.08,30.67.17,45.62s.17,30.39.17,45.56c0,1,0,2-.07,3.15-.1,3.28-.23,7.37.57,9.21a2,2,0,0,1-1.83,2.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M246.16,627.1a2,2,0,0,1-.71-.13c-3.41-1.29-9.72-1.87-14.46-1.87l-2.72,0c-1.77,0-3.6,0-5.37,0l-1.23,0c-1.86,0-4.18.09-5.67.78a2,2,0,1,1-1.69-3.63c2.26-1,5-1.11,7.27-1.15l1.16,0c1.87-.07,3.75,0,5.58,0l2.67,0c4.73,0,11.72.56,15.87,2.13a2,2,0,0,1-.71,3.87Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-28"><path class="cls-24" d="M578.92,730.09a2,2,0,0,1-2-2c0-2,0-4.07.07-6.11.07-3.86.13-7.85,0-11.7-.3-6.39-.38-12.92-.45-19.23-.08-7-.17-14.32-.57-21.34-.67-11.76-1-25.11-1-38.62a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.43.33,26.7,1,38.38.41,7.12.49,14.44.57,21.52.07,6.28.15,12.77.45,19.09.19,4,.12,8,.05,12,0,2-.07,4-.07,6A2,2,0,0,1,578.92,730.09Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M595.92,730.76h0a2,2,0,0,1-2-2c0-2.41-.08-4.84-.16-7.2s-.17-4.93-.17-7.48v-8c0-22,0-44.66,1-66.95,0-.32,0-.68.06-1.07.08-1.2.29-4.38-.27-5-1.78-2.09-8.12-1.15-12.31-.53a39.9,39.9,0,0,1-5.15.57h0a2,2,0,0,1,0-4,39,39,0,0,0,4.58-.52c5.67-.84,12.74-1.89,16,1.9,1.61,1.89,1.39,5.22,1.21,7.89,0,.36,0,.69-.06,1-1,22.19-1,44.85-1,66.76v8c0,2.48.08,5,.17,7.34s.17,4.87.17,7.34A2,2,0,0,1,595.92,730.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M611.59,730.75a2,2,0,0,1-.75-.15c-.85-.35-1.86-.81-2.93-1.3-3.15-1.45-7.45-3.44-9.81-3.28a2,2,0,1,1-.26-4c3.38-.21,8,1.92,11.75,3.64,1,.47,2,.92,2.76,1.23a2,2,0,0,1-.76,3.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M597.71,723.68a2,2,0,0,1-2-2c-.12-11,3.94-21.45,7.86-31.6,1.25-3.24,2.43-6.29,3.48-9.36,2.31-6.75,4.53-13.67,6.67-20.36,2.6-8.12,5.29-16.51,8.17-24.67.26-.75.54-1.47.81-2.18a29.33,29.33,0,0,0,1.8-6c.2-1.32,1-5.82,2.34-8.21a2,2,0,0,1,3.47,2,25.08,25.08,0,0,0-1.86,6.83,32.84,32.84,0,0,1-2,6.78c-.26.68-.52,1.38-.78,2.1-2.86,8.1-5.54,16.47-8.13,24.55-2.15,6.71-4.37,13.65-6.7,20.44-1.08,3.14-2.33,6.38-3.54,9.51-3.79,9.8-7.7,19.93-7.59,30.11a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M643.5,628.11a2,2,0,0,1-1.11-.33c-3-2-6.8-3.15-10.47-4.27-1.32-.4-2.68-.82-4-1.27a2,2,0,1,1,1.3-3.78c1.25.43,2.52.82,3.86,1.23,4,1.21,8,2.45,11.52,4.77a2,2,0,0,1-1.11,3.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M612.81,731.47h-.08a2,2,0,0,1-1.92-2.08c.11-2.71,1.4-5.16,2.65-7.53a32.54,32.54,0,0,0,1.47-3c1.47-3.71,2.66-7.61,3.81-11.38l1.86-6.12c1.72-5.67,3.49-11.53,5.36-17.33a408,408,0,0,0,11.13-42.6c.17-.86.34-1.74.51-2.64.86-4.53,1.84-9.66,4.17-13.67a2,2,0,0,1,3.46,2c-2,3.41-2.86,8-3.7,12.4-.17.92-.35,1.82-.52,2.69a412.27,412.27,0,0,1-11.24,43c-1.86,5.77-3.63,11.61-5.34,17.27l-1.86,6.12c-1.17,3.85-2.38,7.83-3.92,11.69a35.94,35.94,0,0,1-1.65,3.41c-1,2-2.12,4-2.19,5.83A2,2,0,0,1,612.81,731.47Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-29"><path class="cls-24" d="M694.89,584.32h-.09a2,2,0,0,1-1.91-2.09,55.68,55.68,0,0,1,1.14-7.28c.29-1.48.6-3,.8-4.34.49-3.16,1-6.33,1.55-9.5q.57-3.38,1.12-6.77c.75-4.62,1.46-9.24,2.18-13.86,2.28-14.75,4.64-30,8-44.87A2,2,0,0,1,709.5,494c7.52-.39,16-.39,21.43,4.46a2,2,0,1,1-2.67,3c-4.23-3.78-11.79-3.76-17-3.52-3.13,14.27-5.4,28.93-7.59,43.13-.72,4.63-1.43,9.26-2.18,13.89q-.55,3.4-1.12,6.79c-.53,3.16-1.05,6.31-1.54,9.46-.22,1.41-.53,3-.83,4.51a53.58,53.58,0,0,0-1.07,6.68A2,2,0,0,1,694.89,584.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M707.66,590h-.15a21.87,21.87,0,0,1-6.85-1.62c-.51-.2-1-.37-1.33-.47a14.59,14.59,0,0,1-3.49-1.65c-.53-.31-1-.6-1.49-.82a2,2,0,1,1,1.71-3.61c.63.3,1.23.65,1.81,1a11.31,11.31,0,0,0,2.52,1.24c.57.16,1.11.37,1.7.59a17.86,17.86,0,0,0,5.7,1.36,2,2,0,0,1-.14,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M692.88,588.65a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.81.45-19.09.08-7.08.17-14.41.57-21.52.67-11.68,1-25,1-38.39a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.5-.33,26.86-1,38.62-.4,7-.49,14.3-.57,21.34-.07,6.32-.15,12.84-.45,19.23-.18,3.85-.12,7.84,0,11.7,0,2,.07,4.08.07,6.11A2,2,0,0,1,692.88,588.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M675.88,589.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-8c0-21.91,0-44.57-1-66.76,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.22-3.79,10.28-2.74,16-1.9a38.94,38.94,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.38,0,.75.06,1.07,1,22.29,1,45,1,66.95v8c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.21A2,2,0,0,1,675.88,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M670.55,587.32l-.34,0a2,2,0,0,1-1.63-2.31,66.62,66.62,0,0,0,.47-12.9,90.82,90.82,0,0,1,.16-10.87c1.92-20.09,1.73-41.2,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,1,1,4,0c0,5.92.05,12,.11,18,.18,20.52.37,41.73-1.57,62a87.71,87.71,0,0,0-.14,10.38,70.56,70.56,0,0,1-.53,13.69A2,2,0,0,1,670.55,587.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M665.88,483.92c-2.51,0-5.12-.08-7.68-.17-2.36-.08-4.59-.15-6.59-.15h-.05a2,2,0,1,1,.05-4c2.07,0,4.33.07,6.72.15a105.2,105.2,0,0,0,14.1-.14,2,2,0,0,1,.46,4A62.84,62.84,0,0,1,665.88,483.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M648.55,589.32a2,2,0,0,1-2-2.35,135.59,135.59,0,0,0,1.64-16.74c1.34-28.56,1.34-55.68,1.33-84.4V481.6a2,2,0,1,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59a139.52,139.52,0,0,1-1.7,17.26A2,2,0,0,1,648.55,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M639.22,498.47a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,639.22,498.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M638.22,589a2,2,0,0,1-1.83-2.8c.8-1.84.67-5.92.57-9.21,0-1.12-.07-2.19-.07-3.15,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,1,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.92,0,1.95.07,3,.12,3.87.25,8.26-.9,10.92A2,2,0,0,1,638.22,589Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M606.55,590a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.67-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M608.22,485.65a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.88-2.13l2.69,0c1.81,0,3.69,0,5.55,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.5-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.58,0-5.34,0l-2.75,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,608.22,485.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M593.22,589.32a2,2,0,0,1-1.2-3.6c.67-.5,1.49-1.17,2.37-1.89,3.18-2.6,7.14-5.84,10.45-6.47a2,2,0,1,1,.75,3.93c-2.31.44-6,3.45-8.67,5.64-.91.75-1.77,1.45-2.51,2A2,2,0,0,1,593.22,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.88,579a2,2,0,0,1-1.94-1.52c-2.45-9.89-8.79-18.71-14.92-27.24-2-2.72-4-5.54-5.81-8.31-4-6-7.85-12.14-11.61-18.09-4.54-7.18-9.24-14.61-14-21.73-.43-.63-.86-1.24-1.28-1.84a32.89,32.89,0,0,1-3.65-6.05,25,25,0,0,0-3.51-6.14,2,2,0,1,1,2.86-2.79c1.92,2,3.79,6.13,4.32,7.35a29.38,29.38,0,0,0,3.24,5.33c.44.62.89,1.25,1.33,1.92,4.84,7.17,9.55,14.62,14.11,21.83,3.76,5.94,7.64,12.08,11.57,18,1.79,2.71,3.7,5.37,5.72,8.19,6.35,8.84,12.91,18,15.55,28.61a2,2,0,0,1-1.94,2.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M592.22,590.32a2,2,0,0,1-1.91-1.42c-.52-1.73-2.08-3.44-3.58-5.09a36.17,36.17,0,0,1-2.45-2.89c-2.45-3.34-4.62-6.89-6.72-10.31l-3.35-5.49c-3.08-5-6.26-10.25-9.5-15.37A412.7,412.7,0,0,1,543,510.94c-.39-.8-.78-1.63-1.18-2.47-1.92-4.07-3.91-8.27-6.69-11.07a2,2,0,1,1,2.84-2.82c3.26,3.29,5.5,8,7.47,12.18.39.83.78,1.64,1.16,2.43a408.3,408.3,0,0,0,21.47,38.44c3.26,5.15,6.45,10.37,9.54,15.42l3.35,5.48c2.06,3.35,4.18,6.82,6.53,10a32.83,32.83,0,0,0,2.18,2.56c1.8,2,3.67,4,4.45,6.62a2,2,0,0,1-1.92,2.58Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-30"><path class="cls-24" d="M113.55,589.32a2,2,0,0,1-2-2V508.48a2,2,0,0,1,4,0v78.83A2,2,0,0,1,113.55,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M101.55,589.72a2,2,0,0,1-1.48-3.35c.52-1.38,1.11-7.07,1.31-9,.08-.77.15-1.41.2-1.81l.58-4.72c2.63-21.27,5.9-47.75,7.39-68.35a2,2,0,1,1,4,.29c-1.5,20.7-4.78,47.23-7.41,68.55l-.58,4.72c0,.39-.11,1-.19,1.73-1,9.42-1.49,11-2.88,11.69A2,2,0,0,1,101.55,589.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M72.55,584.32h-.09a2,2,0,0,1-1.91-2.09,55.58,55.58,0,0,1,1.14-7.28c.29-1.49.6-3,.81-4.35.49-3.16,1-6.33,1.55-9.5.38-2.25.75-4.51,1.12-6.77.74-4.62,1.46-9.24,2.17-13.86,2.28-14.75,4.64-30,8-44.88A2,2,0,0,1,87.17,494c6.85-.36,20.26,2.25,25.72,7.12a2,2,0,1,1-2.67,3c-4.13-3.69-14.91-6-21.34-6.14-3.12,14.25-5.39,28.9-7.58,43.08-.72,4.63-1.43,9.26-2.18,13.88-.37,2.26-.74,4.53-1.12,6.79-.53,3.16-1.05,6.31-1.54,9.46-.22,1.41-.53,3-.83,4.51a53.65,53.65,0,0,0-1.07,6.68A2,2,0,0,1,72.55,584.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.47,588.65a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.39a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.23-.18,3.86-.11,7.85,0,11.71,0,2,.07,4.08.07,6.11A2,2,0,0,1,210.47,588.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193.47,589.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a39,39,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.95c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.21A2,2,0,0,1,193.47,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M188.14,587.32l-.34,0a2,2,0,0,1-1.63-2.31,66.63,66.63,0,0,0,.47-12.91,90.75,90.75,0,0,1,.15-10.86c1.92-20.09,1.73-41.21,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.95.18,20.52.37,41.74-1.57,62a87.75,87.75,0,0,0-.14,10.38,70.6,70.6,0,0,1-.53,13.69A2,2,0,0,1,188.14,587.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M183.47,483.92c-2.51,0-5.12-.08-7.68-.17-2.38-.08-4.63-.15-6.64-.15h0a2,2,0,0,1,0-4h.05c2.07,0,4.33.07,6.72.15a105.06,105.06,0,0,0,14.1-.14,2,2,0,0,1,.46,4A62.84,62.84,0,0,1,183.47,483.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M166.14,589.32a2,2,0,0,1-2-2.35,135.67,135.67,0,0,0,1.64-16.74c1.34-28.56,1.34-55.68,1.33-84.4V481.6a2,2,0,0,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59a139.43,139.43,0,0,1-1.7,17.26A2,2,0,0,1,166.14,589.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M156.8,498.47a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,156.8,498.47Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M155.81,589a2,2,0,0,1-1.83-2.8c.8-1.84.67-5.92.57-9.21,0-1.12-.07-2.19-.07-3.15,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,1,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.92,0,1.95.07,3,.12,3.87.25,8.26-.9,10.92A2,2,0,0,1,155.81,589Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M124.14,590a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.68-46.88.29-13.41.59-27.28.66-40.87a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M125.81,485.65a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.87-2.13l2.69,0c1.81,0,3.69,0,5.55,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.5-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.58,0-5.35,0l-2.74,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,125.81,485.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.31,494a2,2,0,1,1,0-4c2.48,0,4.91-.19,7.26-.38,2-.16,4-.32,6.06-.37,5-.13,9.84.07,13.53.26,2.43.13,10.08.23,13.41.23a2,2,0,0,1,0,4c-3,0-11-.1-13.61-.24-3.62-.19-8.39-.39-13.22-.26-2,.05-3.85.2-5.85.36C221.45,493.78,218.95,494,216.31,494Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M216.81,582a2,2,0,0,1-2-2V565.5c0-12.37-.19-24.84-.37-36.89s-.37-24.51-.37-36.87a2,2,0,0,1,4,0c0,12.33.19,24.77.37,36.81s.38,24.55.38,37V580A2,2,0,0,1,216.81,582Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M124.64,511.32a2,2,0,0,1-.87-.2c-1.92-.93-7-1.28-8.9-.34a2,2,0,1,1-1.79-3.58c3.07-1.54,9.51-1.1,12.44.32a2,2,0,0,1-.88,3.8Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-31"><path class="cls-24" d="M625.89,161.66a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.81.45-19.09.08-7.08.17-14.41.57-21.52.67-11.68,1-25,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.5-.33,26.86-1,38.62-.4,7-.49,14.3-.57,21.34-.07,6.31-.15,12.84-.45,19.23-.18,3.85-.12,7.84,0,11.7,0,2,.07,4.08.07,6.11A2,2,0,0,1,625.89,161.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M608.89,162.32a2,2,0,0,1-2-2c0-2.47.08-4.95.17-7.34s.17-4.86.17-7.34v-8c0-21.91,0-44.57-1-66.76,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a38.75,38.75,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.56-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,66.95v8c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,608.89,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M251.47,162.32a2,2,0,0,1-2-2V81.49a2,2,0,1,1,4,0v78.83A2,2,0,0,1,251.47,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M238.84,164.65a2,2,0,0,1-1.49-3.34c.21-.53.95-3,2.15-12.73l.58-4.72c2.63-21.27,5.9-47.75,7.39-68.34a2,2,0,0,1,4,.29c-1.5,20.7-4.78,47.23-7.41,68.54l-.58,4.72c-1.77,14.33-2.66,14.8-3.7,15.35A2,2,0,0,1,238.84,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210.47,157.32h-.09a2,2,0,0,1-1.91-2.09,55.62,55.62,0,0,1,1.14-7.28c.29-1.49.6-3,.81-4.35.49-3.16,1-6.33,1.55-9.51.38-2.25.75-4.51,1.12-6.76.74-4.61,1.46-9.24,2.17-13.86,2.28-14.75,4.64-30,8-44.88A2,2,0,0,1,225.08,67c6.84-.35,20.26,2.25,25.72,7.12a2,2,0,1,1-2.67,3c-4.13-3.69-14.91-6-21.34-6.14-3.12,14.26-5.39,28.9-7.58,43.08-.72,4.63-1.43,9.26-2.18,13.88q-.55,3.39-1.12,6.78c-.53,3.16-1.05,6.32-1.55,9.47-.22,1.41-.53,3-.83,4.51a53.54,53.54,0,0,0-1.07,6.68A2,2,0,0,1,210.47,157.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M224.5,164.58h-.15a18.39,18.39,0,0,1-7.71-2.77,11.93,11.93,0,0,0-1.73-.87,14.6,14.6,0,0,1-3.48-1.65c-.53-.31-1-.6-1.49-.82a2,2,0,1,1,1.71-3.61c.63.3,1.23.65,1.81,1a11.28,11.28,0,0,0,2.52,1.24,12.72,12.72,0,0,1,2.62,1.24,14.89,14.89,0,0,0,6,2.27,2,2,0,0,1-.14,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M208.47,161.66a2,2,0,0,1-2-2c0-2,0-4-.07-6-.07-3.92-.13-8,.05-12,.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.22-.18,3.86-.11,7.85,0,11.71,0,2,.07,4.08.07,6.11A2,2,0,0,1,208.47,161.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M191.47,162.32a2,2,0,0,1-2-2c0-2.48.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.17-2.67-.39-6,1.21-7.88,3.21-3.79,10.28-2.74,16-1.9a38.76,38.76,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.57-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.94c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,191.47,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M603.56,163.53a2,2,0,0,1-2-2.34c.7-4.07.59-9.54.47-14.84a109.87,109.87,0,0,1,.16-12.13c1.92-20.09,1.74-41.21,1.55-61.63-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.94.18,20.52.37,41.74-1.57,62a107,107,0,0,0-.14,11.66c.12,5.49.24,11.16-.53,15.61A2,2,0,0,1,603.56,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M598.88,56.92c-2.51,0-5.12-.08-7.69-.17-2.36-.08-4.59-.15-6.59-.15h0a2,2,0,0,1-2-2,2,2,0,0,1,2-2c2.07,0,4.33.07,6.72.15a105.14,105.14,0,0,0,14.11-.14,2,2,0,1,1,.46,4A62.66,62.66,0,0,1,598.88,56.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M581.56,162.32a2,2,0,0,1-2-2.35,135.61,135.61,0,0,0,1.64-16.74c1.34-28.54,1.34-55.65,1.33-84.35V54.61a2,2,0,0,1,4,0v4.27c0,28.75,0,55.9-1.34,84.54a139.52,139.52,0,0,1-1.7,17.26A2,2,0,0,1,581.56,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M572.22,71.48a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1h0a2,2,0,0,1,0,4h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,572.22,71.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M571.72,163.53a2,2,0,0,1-1.83-2.8c.7-1.62.42-6.14.21-9.44-.1-1.64-.2-3.19-.2-4.45,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,0,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,1.13.09,2.62.2,4.19.27,4.32.56,8.78-.53,11.29A2,2,0,0,1,571.72,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M539.56,163a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.67-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,2-2,2,2,0,0,1,2,2c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M541.22,58.66a2,2,0,0,1-.71-3.87c4.15-1.57,11.15-2.13,15.88-2.13l2.68,0c1.82,0,3.7,0,5.56,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,0,1-1.69,3.63c-1.49-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.59,0-5.36,0l-2.73,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,541.22,58.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M349.32,164.65a2,2,0,0,1-2-2c0-2.53-.23-5.64-.47-8.93a109,109,0,0,1-.47-12.06c.3-6.31.37-12.8.45-19.08.08-7.08.17-14.41.57-21.53.67-11.67,1-24.95,1-38.38a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,13.51-.33,26.87-1,38.62-.4,7-.48,14.31-.57,21.35-.07,6.31-.15,12.84-.45,19.22a106.6,106.6,0,0,0,.47,11.58c.25,3.37.48,6.55.48,9.23A2,2,0,0,1,349.32,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M331.39,162.32a2,2,0,0,1-2-2c0-2.48.08-4.95.17-7.34s.17-4.86.17-7.34v-7.95c0-21.92,0-44.58-1-66.78,0-.3,0-.64-.06-1-.18-2.67-.39-6,1.21-7.89,3.21-3.79,10.28-2.74,16-1.9a38.76,38.76,0,0,0,4.58.52,2,2,0,0,1,0,4h0a39.87,39.87,0,0,1-5.15-.57c-4.2-.62-10.54-1.57-12.32.53-.56.66-.35,3.84-.27,5,0,.39,0,.75.06,1.07,1,22.29,1,45,1,67v7.95c0,2.55-.09,5.05-.17,7.48s-.16,4.8-.16,7.2A2,2,0,0,1,331.39,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M326.06,163a2,2,0,0,1-2-2.34c.7-4.06.59-9.38.47-14.52a107.94,107.94,0,0,1,.16-11.92c1.92-20.09,1.73-41.21,1.55-61.62-.05-5.92-.11-12-.11-18a2,2,0,0,1,4,0c0,5.92.05,12,.11,17.95.18,20.52.37,41.74-1.57,62a103.64,103.64,0,0,0-.14,11.45c.12,5.33.24,10.84-.53,15.29A2,2,0,0,1,326.06,163Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M321.39,56.92c-2.51,0-5.12-.08-7.69-.17-2.36-.08-4.59-.15-6.59-.15h0a2,2,0,1,1,0-4c2.07,0,4.33.07,6.72.15a105.3,105.3,0,0,0,14.1-.14,2,2,0,1,1,.46,4A62.65,62.65,0,0,1,321.39,56.92Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M304.06,164.65a2,2,0,0,1-2-2.35,169,169,0,0,0,1.64-19.07c1.34-28.56,1.34-55.68,1.33-84.4V54.61a2,2,0,0,1,4,0v4.22c0,28.77,0,55.94-1.34,84.59A172.17,172.17,0,0,1,306,163,2,2,0,0,1,304.06,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M294.72,71.48a2,2,0,0,1-.5-3.94c3-.76,9.27-1,12.21-1a2,2,0,0,1,2,2,2,2,0,0,1-2,2h0c-3.09,0-8.84.23-11.21.84A2,2,0,0,1,294.72,71.48Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M293.72,164.65a2,2,0,0,1-1.83-2.8c.82-1.89.66-8.07.56-11.76,0-1.24-.06-2.36-.06-3.25,0-15.17.08-30.62.17-45.56s.17-30.42.17-45.62a2,2,0,0,1,4,0c0,15.21-.08,30.68-.17,45.64s-.17,30.38-.17,45.54c0,.86,0,1.95.06,3.15.16,6.1.19,11-.89,13.45A2,2,0,0,1,293.72,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.06,163a2,2,0,0,1-2-2c0-2.26.07-5.12.16-8.15s.18-5.88.18-8.46c0-15.6.34-31.5.68-46.88.29-13.41.59-27.28.66-40.86a2,2,0,0,1,4,0c-.07,13.62-.37,27.5-.66,40.93-.33,15.35-.67,31.23-.67,46.79,0,2.65-.09,5.66-.18,8.58s-.17,5.81-.16,8a2,2,0,0,1-2,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M263.72,58.66a2,2,0,0,1-.71-3.87c4.15-1.57,11.14-2.13,15.87-2.13l2.68,0c1.82,0,3.7,0,5.56,0l1.16,0c2.24,0,5,.1,7.28,1.15a2,2,0,1,1-1.69,3.63c-1.49-.7-3.81-.74-5.67-.78l-1.23,0c-1.76-.07-3.59,0-5.36,0l-2.73,0c-4.74,0-11,.58-14.46,1.87A2,2,0,0,1,263.72,58.66Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M526.22,162.32a2,2,0,0,1-1.2-3.6c.67-.5,1.5-1.17,2.37-1.89,3.18-2.6,7.14-5.84,10.45-6.47a2,2,0,1,1,.75,3.93c-2.32.44-6,3.45-8.67,5.64-.91.75-1.77,1.45-2.51,2A2,2,0,0,1,526.22,162.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M537.89,152a2,2,0,0,1-1.94-1.52c-2.45-9.89-8.79-18.71-14.92-27.24-2-2.72-4-5.54-5.81-8.31-4-6-7.85-12.14-11.61-18.09-4.54-7.18-9.24-14.61-14-21.73-.43-.63-.86-1.24-1.28-1.84a32.83,32.83,0,0,1-3.65-6.06,25,25,0,0,0-3.51-6.14A2,2,0,1,1,484,58.26c1.92,2,3.8,6.13,4.32,7.35a29.37,29.37,0,0,0,3.24,5.33c.44.62.89,1.25,1.33,1.91C497.72,80,502.43,87.48,507,94.68c3.76,5.94,7.64,12.08,11.57,18,1.79,2.71,3.7,5.37,5.72,8.19,6.35,8.84,12.91,18,15.55,28.61a2,2,0,0,1-1.46,2.42A2,2,0,0,1,537.89,152Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M469.56,71a2,2,0,0,1-1.49-3.33c2.79-3.12,6.43-5.35,10-7.51,1.2-.74,2.33-1.43,3.43-2.16a2,2,0,0,1,2.21,3.34c-1.16.77-2.37,1.51-3.55,2.23-3.28,2-6.66,4.08-9.06,6.77A2,2,0,0,1,469.56,71Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M525.22,163.32a2,2,0,0,1-1.91-1.42c-.52-1.73-2.08-3.44-3.58-5.09a35.82,35.82,0,0,1-2.45-2.89c-2.46-3.36-4.63-6.91-6.74-10.34l-3.35-5.48c-3.07-5-6.25-10.23-9.49-15.35A412.58,412.58,0,0,1,476,83.94c-.39-.8-.78-1.63-1.18-2.47-1.92-4.07-3.91-8.27-6.69-11.07A2,2,0,1,1,471,67.58c3.26,3.29,5.5,8,7.47,12.18.39.83.78,1.64,1.16,2.42a408.43,408.43,0,0,0,21.47,38.44c3.26,5.14,6.44,10.36,9.53,15.4L514,141.5c2.06,3.37,4.19,6.85,6.55,10.07a32.68,32.68,0,0,0,2.18,2.56c1.8,2,3.67,4,4.45,6.62a2,2,0,0,1-1.92,2.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M175.8,162.31a2,2,0,0,1-.76-3.85c.77-.31,1.74-.76,2.77-1.23,3.73-1.72,8.37-3.86,11.74-3.64a2,2,0,1,1-.26,4c-2.35-.14-6.66,1.83-9.81,3.28-1.07.49-2.08,1-2.93,1.31A2,2,0,0,1,175.8,162.31Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M189.68,155.24h0a2,2,0,0,1-2-2c.11-10.19-3.81-20.32-7.59-30.11-1.21-3.13-2.46-6.36-3.54-9.51-2.32-6.79-4.55-13.73-6.7-20.44-2.59-8.09-5.27-16.45-8.13-24.55-.25-.72-.52-1.41-.78-2.1a32.89,32.89,0,0,1-2-6.78,25,25,0,0,0-1.86-6.83,2,2,0,1,1,3.47-2c1.37,2.39,2.13,6.89,2.34,8.2a29.35,29.35,0,0,0,1.8,6c.27.71.54,1.43.81,2.18,2.88,8.16,5.57,16.55,8.17,24.67,2.14,6.69,4.36,13.62,6.67,20.36,1.05,3.07,2.23,6.13,3.48,9.36,3.92,10.15,8,20.64,7.86,31.6A2,2,0,0,1,189.68,155.24Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M143.89,59.67A2,2,0,0,1,142.78,56c3.49-2.32,7.57-3.56,11.52-4.77,1.35-.41,2.62-.8,3.86-1.23a2,2,0,0,1,1.3,3.78c-1.31.45-2.67.87-4,1.27-3.68,1.12-7.48,2.28-10.48,4.27A2,2,0,0,1,143.89,59.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M174.57,163a2,2,0,0,1-2-1.92c-.07-1.8-1.15-3.85-2.19-5.82a35.88,35.88,0,0,1-1.65-3.41C167.21,148,166,144,164.83,140.2L163,134.1c-1.72-5.67-3.49-11.52-5.35-17.31a412.5,412.5,0,0,1-11.24-43c-.18-.87-.35-1.78-.52-2.69-.84-4.42-1.71-9-3.7-12.4a2,2,0,1,1,3.46-2c2.33,4,3.31,9.14,4.17,13.66.17.9.34,1.78.51,2.64a408.42,408.42,0,0,0,11.13,42.6c1.87,5.82,3.65,11.69,5.37,17.37l1.85,6.09c1.15,3.77,2.33,7.66,3.81,11.36a32.7,32.7,0,0,0,1.47,3c1.25,2.37,2.54,4.82,2.65,7.53a2,2,0,0,1-1.92,2.08Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M469.22,163.85h-.09a2,2,0,0,1-1.91-2.09c.51-11.39.62-19.78.34-25.67-.77-16.11-.72-32.88-.67-49.1,0-13.22.08-26.89-.33-40a2,2,0,0,1,4-.13c.41,13.13.37,26.84.33,40.09,0,16.17-.1,32.9.67,48.9.29,6,.17,14.53-.34,26A2,2,0,0,1,469.22,163.85Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M455.89,164.13a2,2,0,0,1-2-2V137.82c0-5.58.21-11.22.42-16.68.3-8,.61-16.27.25-24.37-.34-7.72-.34-15.63-.34-23.28V71.32c0-2.12-.07-4.46-.14-6.94a129.62,129.62,0,0,1,.29-17.58,2,2,0,1,1,4,.46,127,127,0,0,0-.26,17c.07,2.51.14,4.87.14,7.05v2.16c0,7.61,0,15.47.33,23.1.37,8.26.05,16.62-.25,24.7-.2,5.42-.41,11-.41,16.53v24.31A2,2,0,0,1,455.89,164.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M438.72,80a2,2,0,0,1-.79-3.84c3.45-1.47,9.57-1.25,14.49-1.07,1.35,0,2.62.1,3.61.1a2,2,0,0,1,0,4c-1.07,0-2.38,0-3.76-.1-4.28-.16-10.15-.37-12.77.75A2,2,0,0,1,438.72,80Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M440.47,164.13a2,2,0,0,1-2-2V148.68c0-11.78-.44-23.72-.87-35.26s-.88-23.59-.87-35.43a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,11.76.44,23.71.87,35.28s.88,23.56.88,35.41v13.45A2,2,0,0,1,440.47,164.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M433,164.28a2,2,0,0,1-2-2V152c0-9.67.09-19.68.19-29.35s.19-19.75.19-29.49a2,2,0,0,1,4,0c0,9.76-.1,19.81-.19,29.53S435,142.32,435,152v10.31A2,2,0,0,1,433,164.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M399.1,95.25c-1.5,0-3.07-.11-3.08-2l2,0v-2h1.37c16.41-.09,27.84-.13,34-.13a2,2,0,1,1,0,4c-6.11,0-17.53,0-33.94.13Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M399.22,164.65a2,2,0,0,1-2-2c0-10.34-.4-24.44-1-35.1-.49-8.79-.39-18-.28-26.87,0-2.5.06-5,.07-7.43a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2c0,2.45,0,4.94-.07,7.45-.1,8.82-.21,18,.28,26.6.6,10.72,1,24.92,1,35.32A2,2,0,0,1,399.22,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395,163.53h0a2,2,0,0,1-2-2l0-1.28c.06-4.91.16-13.14.39-17.83.37-7.49,0-15.16-.28-22.58-.22-5.11-.45-10.39-.45-15.59,0-6.31-.06-13.12-.12-19.7s-.12-13.44-.12-19.79a2,2,0,1,1,4,0c0,6.33.06,13.16.13,19.76s.13,13.41.13,19.74c0,5.12.23,10.35.45,15.42.33,7.51.66,15.28.28,22.95-.23,4.61-.33,12.79-.39,17.68l0,1.28A2,2,0,0,1,395,163.53Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M354.22,67a2,2,0,0,1,0-4c2.48,0,4.91-.19,7.26-.38,2-.16,4-.32,6.06-.37,5-.13,9.83.07,13.53.26,2.42.13,10.07.23,13.41.23a2,2,0,0,1,0,4c-3,0-11-.1-13.62-.24-3.62-.19-8.39-.39-13.22-.26-2,.05-3.85.2-5.84.36C359.37,66.79,356.87,67,354.22,67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M355.5,164.65a2,2,0,0,1-2-2c0-2.37-.2-7.26-.39-12s-.39-9.7-.39-12.15c0-12.37-.19-24.84-.37-36.89S352,77.1,352,64.74a2,2,0,1,1,4,0c0,12.33.19,24.77.37,36.81s.38,24.55.38,37c0,2.37.2,7.26.39,12s.39,9.7.39,12.15A2,2,0,0,1,355.5,164.65Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M262.56,84.32a2,2,0,0,1-.87-.2c-1.92-.93-7-1.28-8.9-.34A2,2,0,1,1,251,80.2c3.07-1.54,9.51-1.1,12.44.32a2,2,0,0,1-.88,3.8Z" transform="translate(-53.25 -44.96)"/></g></g><g id="COLOR-2" data-name="COLOR"><path class="cls-7" d="M348.43,470c-2.63-1-6-1-8.83-1.21-4.22-.38-8.44-.52-12.67-.62-8.68-.21-17.29.23-25.92-.82a58.42,58.42,0,0,0-15.84.35c-4.32.6-8.71,1.09-13,1.84-6.7,1.17-13.45,1.86-20.12,3.25-5.91,1.24-11.79,2.64-17.71,3.83-2.56.52-5.13,1-7.69,1.49-.88.18-3.73.26-4.27,1.08-.74,1.11.42,4.52.63,5.75.67,3.87,1.55,8,3.4,11.51A140.8,140.8,0,0,0,234,508.57c2.85,4.25,4.81,8.24,8.61,11.85a50.38,50.38,0,0,0,12.91,9.06c6.17,2.86,13.11,5.65,19.89,6.31a85.31,85.31,0,0,0,14-.13c2.73-.16,5.46-.65,8.16-1a122,122,0,0,0,14.46-3.5,36.34,36.34,0,0,0,12.24-5.8c7-5.16,12.12-12.82,17.1-19.83a60,60,0,0,0,3.33-5.67,39.58,39.58,0,0,0,2.58-6.66c1.62-4.58,1.84-9.14,2.88-13.77C350.78,476.48,352.27,471.49,348.43,470Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M272.5,468.5c-.55,7,4.53,14,11.81,14,7.66,0,11.95-7.38,12.41-14-3.09-.42-7.19,1.21-10.45,1.23A57.65,57.65,0,0,1,272.5,468.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M290.26,472c-3.34-.13-4.94,3.06-.58,2.67,2.51-.23,5.53-3,1.25-2.83" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M566,470c-2.63-1-6-1-8.83-1.21-4.22-.38-8.44-.52-12.67-.62-8.68-.21-17.29.23-25.92-.82-18.38-2.22-37,.43-55,4.19C455.38,473.24,447,474.6,439,477a22.34,22.34,0,0,0,.84,6.53c.75,3.28,1.14,6.75,2.57,9.82a112.66,112.66,0,0,0,9.11,15.2c2.85,4.25,4.81,8.24,8.61,11.85a50.38,50.38,0,0,0,12.91,9.06c6.17,2.86,13.11,5.65,19.89,6.31a64.13,64.13,0,0,0,22.71-1.38c6.84-1.83,14-4,19.51-8.59,4.69-4,10.07-7.07,14.29-11.55,2.36-2.51,5.09-4.83,7-7.72,2.46-3.72,4-8,5.56-12.17s3.3-8,4.88-12C567.68,480.36,570.64,471.62,566,470Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M492.5,468.5c.12,7,6.16,13.3,13.38,12.25A15.38,15.38,0,0,0,516,474.18a10,10,0,0,0,1.8-4.45c.18-2.63-.45-2.46-2.81-2.49-3.94,0-7.84-.25-11.77-.25C500.19,467,495.9,466.38,492.5,468.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M315,336.21c-3.66-2.95-5.67-7.23-9.3-10.61a61.08,61.08,0,0,0-13.44-9.16c-13.63-7.12-22.83,11.34-15.79,22.31,1.81,2.82,3.9,6.21,5.88,8.72,2.17,2.76,5.2,4.37,6.55,7.9-5.6,3.14-9.54,8.71-14,13.22-4.26,4.27-9.21,8.45-12.54,13.52-6,9.16-8.62,20.26-12.72,30.3-1.67,4.08-3.53,7.71-4.1,11.93.88-.56,2.17-.79,3-1.35-.69,6.27-5.62,4.49-9.37,9.14A81.54,81.54,0,0,0,230,445.5c-2.49,4.82-4,10.2-5.38,15.5a42.67,42.67,0,0,0-1.63,8c-.08,1.43.32,3.13,0,4.52-.24,1.12-2,1.94-2,3,0,5,1.76,2.87,5,2.16,4.82-1.05,9.7-2.48,14.66-3.53,11.74-2.48,23.52-5.57,35.38-7.38,13-2,26.14-1.74,39.38-1.74a121.68,121.68,0,0,1,18.1,1.38c4,.58,8.63-.25,12.5.62,13.48,3.05-4.54,36.54-8,41.74-3.59,5.43-8.81,10.7-13.66,15.14-17.42,16-52.62,19.6-71.13,3.4-3.87-3.39-8.18-6.07-11.48-10-2.56-3.09-4.87-7.49-8.66-8.7-.2,5.41-2.39,12.29-1.1,17.24,1.24,4.78,4.77,10.72,8.52,13.7,10.08,8,23.71,10.68,36.14,12.46,6.95,1,13.36,3.11,19.89,5.3,6.29,2.11,12.84,2.16,19.22,3.75a129.87,129.87,0,0,0,18.63,3.61c19.63,2,38.31,8.92,58.11,10.9,8.06.81,17.29-3,25-5,9.67-2.49,19.64-3.34,29.46-5s19.43-3,29-5c26.08-5.38,52.67-10.58,77.5-20.36,5.66-2.23,6-3,6-9.14,0-4.5.11-9,0-13.5s-.23-9.77-2.39-13.45c-6.66,16.31-24.6,27.61-42.11,29-16.18,1.25-40.74-.14-53-12.53C454.77,514.15,449.39,505,444.5,496c-2.2-4.06-7.86-16-5-20.76,1.8-3,11.67-2,15.14-2.34,7.56-.73,15.16-1.67,22.75-2.42,14.61-1.43,29.36-3.19,44-3.86a166.26,166.26,0,0,1,29.35.78c5.67.76,11.27,2,17,1.57-1.84-6.64-3.32-13.49-5.52-20.14-1.83-5.55-6.93-10.4-10.44-14.94-2.31-3-5.15-5.56-6.5-9.25-1.09-3-.88-6.4-1.87-9.51a106,106,0,0,0-8.23-18.77c-6.24-11.45-12-22.6-21.15-32-2.26-2.33-4.65-4.29-6.76-6.75a20.87,20.87,0,0,0-6.1-5.09c-.54-.29-2.94-1.07-3.1-1.77-.65-3,6.25-6.28,8.11-7.71a21,21,0,0,0,7.09-11.23c1.46-5.57.17-8.86-3.45-13.25s-8.49-6-14.18-6c-6.75,0-10.71,3.57-15.28,8.09a24.4,24.4,0,0,0-5.5,7.9c-1.46,3.52-2.07,7.25-3.21,10.66-1.59-.87-2.6-2.55-4.12-3.59a27,27,0,0,0-8.5-3.24c-4.63-1.12-9.44-1.34-14.09-2.34-4.33-.94-8.63-2.49-12.93-3.73-5.4-1.57-10.35-1.59-16-1.59-12.77,0-25.3.87-38,2-12.39,1.1-25.51,1.3-37.58,4.33a122.83,122.83,0,0,0-13.36,3.92c-2.8,1.05-7.43,1.34-9.43,3A14.6,14.6,0,0,1,315,336.21Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M229.13,623.25c.89,1.17,1.92,3.92,2.74,4.87,1.3,1.5,2.83,2.79,4.21,4.21a82.17,82.17,0,0,1,6.68,7.93c3.71,4.95,4.32,10.93-.5,15.32-5.63,5.12-13.27,6-20.58,4.77-5.58-.92-8.09-4.39-12-8-2.89-2.68-6.07-4.7-8.76-7.58-3.41-3.66-6.39-7.37-2.9-11.67,3.77-4.65,10.31-6.32,15.92-7.45,3.29-.66,11.72-4.79,14.75-2.82A1.88,1.88,0,0,1,229.13,623.25Z" transform="translate(-53.25 -44.96)"/><path class="cls-32" d="M566,624.33c-4.5,5.82-7.4,11.21-12.83,16.15s-4.81,10.93-.67,16.68c4.66,6.47,17.4,5.51,23.58,2.74,9-4,18.16-10.94,22.66-20,1.53-3.07,1.13-2.81-1.62-4.79a69.33,69.33,0,0,0-9.77-5.8C581.45,626.37,576.32,625,566,624.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-10" d="M383.12,470.36c-4.4,2-11.06,9.12-12.45,14-2.15,7.44,4.66,10.07,10.72,8.56,4.63-1.15,8.94-3.74,13.79-4,2.3-.1,4.26.7,6.41,1.39,2.45.79,4.77,1.95,7.27,2.57,6.06,1.51,12.87-1.12,10.72-8.56-1.39-4.83-8.05-12-12.45-14" transform="translate(-53.25 -44.96)"/><path class="cls-9" d="M393.83,462.79a18.23,18.23,0,0,0-7.35,2.06c-2.93,1.7-5.13,5.48-1.36,7.86,4.51,2.85,16.6,2.72,20.71-.84,2.88-2.49,2.1-6.25-1.3-7.7A23.59,23.59,0,0,0,393.83,462.79Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M401,490.33c-2.85-1.27-7.34-1.63-10.46-1.34-3.28.31-3.21,2.87-3.58,5.87-.26,2.07-.66,8.48,1.53,9.5,1.47.69,4.55-.06,6.26.11a15.56,15.56,0,0,0,4.83,0C405,503.31,401.23,493.16,401,490.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-7" d="M510.83,472c-3.34-.13-4.94,3.06-.58,2.67,2.51-.23,5.53-3,1.25-2.83" transform="translate(-53.25 -44.96)"/><path class="cls-33" d="M560.91,668.12c0-1.84.56-4.94-.4-6.62-.74-1.31-2.44-1.5-3.69-2.11a11.57,11.57,0,0,1-5.08-4.89c-3.75-7-.4-12.58,4.49-17.77,2.1-2.22,3.94-4.35,4.32-7.5s-.31-6-.36-9.07c0-1.58.14-3.18.11-4.74,0-.78.26-3.69,0-4.24,1.45,2.88,3.64,5.18,4.62,8.42,1.32,4.38,4,4.19,8,4.76a92.15,92.15,0,0,1,10.5,2c6.07,1.61,14.06,4.53,15.75,11.39.41,1.66,3.47-2.07,3.74-2.9.66-2,.46-4.22.45-6.28,1.23-.16,2.15-1.09,3.38-1.17-.9-1-1.73-2.52-2.91-3.44,1.84-2.05,1.58-3.31-.38-4.65-2.17-1.48-1.34-2.76-1.65-5.3a39.1,39.1,0,0,0-1.89-7.92,58.56,58.56,0,0,0-7.94-14.85c-3.7-5.19-8.79-9.52-13.92-13.24a68.21,68.21,0,0,0-8.86-5.52c-2.45-1.26-6.23-2-8-4.15,1.08-2.54,1.48-5.31,2.46-7.89a13,13,0,0,0,.91-6.71,37.36,37.36,0,0,0-2.8-9c-.76-1.89-1.17-4.3-3.42-4.9-3.36-.9-7.19,2.16-10.17,3.27q-6.93,2.58-14,4.84c-9.38,3-18.89,5.63-28.46,8-25,6.06-50.38,10.09-75.76,14q-11,1.71-22,3.82a57.18,57.18,0,0,0-8.85,2.39c-2.64,1-5.4-.68-8-1.22q-4.67-1-9.35-1.84-9.24-1.73-18.54-3.16c-24.86-3.85-49.68-8.14-74.12-14.14-10.36-2.54-20.65-5.39-30.81-8.66q-7.54-2.43-15-5.18c-2.45-.91-4.91-1.84-7.33-2.83-1.74-.7-3.09-2.28-4.29-.4s-1.61,5.42-2.17,7.66c-1.09,4.37-2.51,9.25-1.29,13.74.72,2.67,3.45,6.2,2.49,9.08-.55,1.66-2.06,1.46-3.53,2.05a37.62,37.62,0,0,0-5.61,2.95,64.39,64.39,0,0,0-18.26,17,58.28,58.28,0,0,0-8,15.09,43.9,43.9,0,0,0-1.84,7.89c-.32,2.28-.07,3.79-1.86,5.29-.72.61-1.35.41-1.48,1.66a4.11,4.11,0,0,0,1.34,2.8c-1.18.92-2,2.49-2.91,3.44,1.24.08,2.16,1,3.38,1.17,0,2.42-.47,5.93,1.21,7.94,1,1.19,2.81,2.33,4,.82s.55-3.19,1.91-4.66c2.44-2.64,6.15-4.18,9.48-5.31a79.51,79.51,0,0,1,14.05-3c3.79-.56,6.63-.61,8.16-4.4.54-1.34,1.66-4.24,2.9-5,1.16,2.17,1.1,4.83,1.3,7.21.32,3.8-.19,8.6,1.75,12,1.64,2.89,4.65,4.7,6.43,7.48a12,12,0,0,1,.35,12.77,10,10,0,0,1-4.13,4.33c-1.71.78-3.68,1.13-3.61,3.32,0,.91.52,1.9.56,2.88.07,1.64,0,3.29.05,4.93.1,8.11.25,15.62-1,23.45-1.39,8.62,2.78,7.83,9.13,11.09,7.41,3.81,14.76,8.81,22.48,11.89,9.71,3.87,21.29,5.47,31.42,8,7.78,1.95,15.39,4.44,23.07,6.74,20.13,6,39.23,12.91,60.46,9.87,29.79-4.26,60-3.23,89.34-10.76,19.65-5,39.24-8.93,58.6-15.13A117.05,117.05,0,0,0,546.43,708c4-2,12.41-4,14.5-8.19,1.47-2.92.11-8.2.07-11.39C560.92,681.63,561,674.88,560.91,668.12Z" transform="translate(-53.25 -44.96)"/><path class="cls-34" d="M399.75,580.86a69.12,69.12,0,0,1,4.48,10.28c.68,1.78,2.41,4.44,2.53,6.3s.46.9-.88,2c-1.09.92-2.07.55-2.95,2a9.39,9.39,0,0,0-.79,3.94,31.94,31.94,0,0,0,.66,8.16c2.37,12.11,1.73,25.25,2.94,37.65.76,7.85,2.22,15,2.26,23.06,0,5.48,3.54,12.13,1.26,17.11-3.09,6.74-8.66,12-13.07,17.81-2.64-1.83-4-6.26-6.06-8.84-2.42-3-5.46-10.59-9.34-11.43-.36-3.59.56-7.58.71-11.2.51-12.06,2.79-23.94,4.6-35.84,1.73-11.41,2.17-22.8,3.15-34.23.11-1.34.63-3.71.2-4.94-1.13-3.26-3.19-4.05-2.63-7.94.47-3.31,2.83-6.07,4.74-8.68C393.71,583.2,396.57,575.41,399.75,580.86Z" transform="translate(-53.25 -44.96)"/></g><g id="SHADOWS-2" data-name="SHADOWS"><g class="cls-3"><path d="M286.67,316.33c-3.62,2.59-8.05,10-3.81,14,1.6,1.53,4.85,2,6.81,3.41,2.36,1.74,4.42,3.91,7,5.31,1.58-1.79,0-13.45,3-5.87,1.94,5,5.63,6.09,9,1.11,1.13.93,2.55,2.49,2.73,4,.29,2.41-2.2,3.24-4.57,5-3.7,2.71-11.85,10.52-16.83,10.1-3-.26-4.52-4.4-6.58-6.61-2.77-3-5.22-5.63-7-9.34-3.52-7.36-3.28-16,4.58-20.73" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M473,335.67c1.84-7.87,8.06-16.08,15.65-19.33,4.8-2.05,13.27-3.46,17.31.6-5.42.4-11.26-.72-12.61,5.72a57.49,57.49,0,0,0-1,14.3c2.79.38,5.42-.8,8.23-.57.12,2.17-3.51,4.44-3,6.12,1.24,3.87,9.78-2.53,11.37-3.39-1.13,4.6-8.65,10.11-12.95,12.18-1.59-4.63-7.3-6.17-11.42-7.77-2.63-1-5.47-1.41-8-2.53C474.89,340.25,473.69,338.9,473,335.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M365.33,466c10-7,24.85-9.09,37-6.83,4.54.84,11.69,1.72,13.68,6.33,1.59,3.69,1.5,9.1,2.46,13.1,1.3,5.39,2.09,10.9,3.57,16.25,1.88,6.83,4.32,14.52,7.56,20.85,6.61,12.94,15.94,22.93,29.41,28.55,8.63,3.6,16.54,4.43,25.89,4.42a53,53,0,0,1-31.73-17.33c-4.93-5.48-8.81-12-12.16-18.56-3.75-7.33-8.36-14.24-10.76-22.18a70.49,70.49,0,0,1-2.92-19.1c-.05-2.64-.45-5.2-.33-7.84.06-1.42.83-3.59.33-5-1.27-3.61-11.3-4.6-15.07-5.1-6.49-.86-13.3-1.32-19.85-1.57-7.06-.26-14.22,1.94-21,3.59-5.23,1.27-11.4,4.17-7.05,11.07" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M392.67,462.33c-4.53.82-10.59,3.67-10,9.15.57,5.25,10.25,5.34,14.22,3.84C393.46,474.42,383.84,469.37,392.67,462.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M390.67,475.67c-3.65,0-8,1.1-10.35,4.33-1.68,2.33-2.7,7.07-.31,8.34,2.8,1.5,8.7-1.34,11.74-1.66s5.78-.19,8.5,1.67a43.92,43.92,0,0,0-14.91,2c-3.09,1-7.17,4-10.5,3.66-3.74-.37-6.27-4.13-6.17-7.67.16-5.81,6.45-9.4,10.67-12.33" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M367.33,487.67c-1.28,4-.14,8.45,3.41,10.58,3,1.8,7.53,1.2,10.1,3.22s1.51,6,4.64,7.22c2.93,1.16,10.37-1,13.08-2.27-3.56-.31-7.68.23-10.14-2.8-3.22-4-.84-8.61-1.14-12.91-4.66,1.53-10.47,4.44-14.95,1" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M489,468.67c-5.68,0-12.84,3.07-18.25,4.91-4.34,1.48-14.53,2.44-17.34,6.16-3.64,4.82-1.14,16.07.59,21,2.81,8.08,9.47,14.77,15.65,20.55,5.66,5.3,12.71,7.83,19,11.6-6,.48-12.19-2.87-17.51-5.44a57.25,57.25,0,0,1-18.2-13.59c-9.08-9.64-12.68-22.75-17.86-34.28-2.53-5.63-1.81-9.69-.66-15.6,1.81-9.28,3.75-17.09,7.85-25.7,9.21-19.37,38.33-29.09,58.26-29.31,15.86-.17,28.66,5.54,42.11,13-5-.46-10.55-2.65-15.66-3.57a83.41,83.41,0,0,0-15.57-1.07c-12.92.08-27.78,5.36-38.33,12.72-8.12,5.66-13.31,12.83-17.7,21.73-2,4.09-2.48,5.44,2.49,5.88,6.77.59,14-1.23,20.66.06-2.85,2.43-8.56,1.42-10.76,4.4,6.37,2.67,16.78,1.08,23.76,1.72s14.54.64,21.47,2.07c-3.85,1.2-8.56,1-12.56,1.52C495.12,468.08,490.24,470.3,489,468.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M267.33,405.67c-7,.76-20.15,6.64-20,15,2.6-.2,5.64-2.17,8.28-3,4.31-1.29,8.75-2.19,13.09-3.42,8.06-2.27,16.47-4.55,24.84-4.93,6.23-.28,13,1.43,18.74,3.81,5.27,2.17,12.38,5.48,16.71,9.18,9.29,7.95,13.51,23.72,17,34.72,1.22,3.88,3.35,7.72,4.32,11.63,1.47,5.87-.26,13.57-.85,19.5-1.08,11-5.36,19.46-11.74,28.58a170.58,170.58,0,0,1-11.57,14.6c-2.36,2.68-4.21,5.15-7.32,7s-7.12,3.23-10.22,5.27C318,545,327,537.3,333.64,532c8-6.39,16.32-12.51,18.54-22.93,2.81-13.21,7-26.41,9.17-39.71,1.74-10.86,1.17-26-6.33-34.8a66.17,66.17,0,0,0-6.51-6.08c-2.72-2.44-4.64-5.5-7.38-7.88a134.89,134.89,0,0,0-12.48-10c-5.13-3.47-11.67-6.74-17.78-8-5.71-1.14-11.71-1-17.49-1.39-8.92-.63-20.34-2.62-28.13,2.81C265.24,404.7,265.6,405,267.33,405.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M290.33,411.33c-6.84,2.45-14.82,2.28-21.6,6-6.22,3.41-12.05,8.64-17.57,13.13s-9.15,11.08-13.51,16.79c-2.55,3.34-7.33,10.5-5.68,15.08,1.5,4.17,8.16,2.08,11.4,1.46,6.78-1.29,13.58-3.3,20.45-3.74-4.71,2.88-11.12,4-15.16,7.86,4.23,1.73,10.8.5,15.34.74,4.19.22,8.4.69,12.58,1A63,63,0,0,0,254,477c-3.91,2.2-11.33,5.54-12.33,10.34-1.1,5.28.29,11.72,2.08,16.6,5.18,14.09,21,22.35,33.93,28a46.07,46.07,0,0,0,10.4,2.82c2.48.46,6.95.12,8.65.92-7.27-.42-15,1.7-22.34,1.67-7.13,0-13.42-2.58-20.06-4.67-5.83-1.84-11.48-2-16.85-5.53-1.73-1.13-4.59-3-5.16-4.62-1-3,.87-5.18,1.3-8a14.57,14.57,0,0,0-.64-6.32c-1.35-4.81-4.41-8.94-5.84-13.72-.92-3.05-1.72-6.36-2.39-9.51-.31-1.43-.38-3.08-.76-4.49-.5-1.87-1.37-2.08-2.27-3.85-1.45-2.87.23-4.52.6-7.48.57-4.54.19-8.55,2.21-12.84,4.8-10.23,10.44-20.13,19.29-27.47A78.1,78.1,0,0,1,259.2,418.5c3.53-1.7,7.13-3.52,10.77-5,4.28-1.71,8.72-1.6,13-2.86" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M334,537c-5.51,4.05-12.08,7.07-18,10.51-3.43,2-6.63,4.54-10.32,6.08-4.62,1.92-11.17,5-14.73.42,1.08-1.31,4.06-2,5.71-2.6,4-1.54,8.12-2.65,12.15-4.07,5.6-2,15.9-3.35,19.85-8" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M392.72,583.1a20.56,20.56,0,0,0-1.53,3.33c-1,2.9-3,6.84-3.2,9.9-.17,3.55,5.58,6.69,8.63,6.62a26.18,26.18,0,0,1-2-4.75,5.52,5.52,0,0,1,4.05-4.71c4.7-1,2.45,5.12,6.65,5.46.51-6.64-5.73-13.69-8-19.91C395.47,579.15,393.86,581.09,392.72,583.1Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M402.67,603.33c-1.55,1.36-2.47,3.56-4,5-1.09,1-2.34,1.24-3,2.63-1.48,3.07-.64,9.55-1,13-.58,5.85-.32,11.69-.65,17.59-.18,3.28-.39,9.08-2,11.72-.15-2.76-2.17-9.55-5.35-9.94-.33,5.78-.57,11.59-1,17.37-.49,6-2.1,12.49-1.65,18.51.57,7.65,1.43,15.64,7.29,21.07,1.56-2.31,3.85-6.63,6.28-7.95.13,1.73,0,3.53.12,5.27,3.76.1,8.61-5.58,10.88-8.27.56,3-3.39,7.63-4.93,10s-4.53,6.88-7.5,8.12c-4.29,1.8-10.9-10.54-14.17-13.86-2.28-2.32-5.7-4.73-7-7.73-2.32-5.23-.64-13.75-.64-19.26,0-13.78.69-26.83,3.46-40.32.55-2.66,2.2-8.53.15-10.86-.92-1-4.1-1.49-5.44-2.35-2.17-1.39-4-3.4-6.09-4.85a48.36,48.36,0,0,0,11.93-1.38c3.61-1.06,3.17-2.56,4.33-5.87,1.82-5.2,2.89-1.82,6.68-.09C392.47,602.37,400.21,602.57,402.67,603.33Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M404.67,600.67c-1.17,3-.47,8-.28,11.31,4.62-4.61,2.15,6.64,3.3,7.87,1.86,2,17.76-5.76,20.65-6.85,17.88-6.73,35.75-14,54-19.43a200.6,200.6,0,0,0,25.22-9.16c-2.34-.3-5,.68-7.22,1.29-4.84,1.33-9.73,2-14.62,3.14-7.89,1.8-15.4,4.6-23.09,7-12.19,3.75-23.7,9.06-35.81,13-4.52,1.45-11.73,4.33-14.45,0-3.19-5-4.43-13.2-6-18.88-1.41-5.16-1.6-6.67,2.29-10.18s8.65-4.38,13.23-6.67c-7.11-.6-16.23.87-23.25,2.66-.29,4.74,2.78,10.93,4.66,15.34C405.1,595.22,408.06,597.12,404.67,600.67Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M421,595.67c-1.36,1.21-2.2,4.47-2.28,6.31,1.62-1.1,2.77-3.11,4.23-4.29-.08,1,.44,1.94.44,2.94,1.16-.49,3.08-6.27,1.88-7.56-2-2.16-4.45,1.91-4.6,3.6" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M520.33,553.33c9.15-3.9,20-7.21,30-8.17,2.22-.21,5.83-1.27,6,1.5s-5,4.7-7.23,5.34c4.14,0,8.17-.85,8.57,4,.36,4.31-1.6,9.12-4.31,12.29,10.7,1.49,13.52-12.74,11.23-20.34-.68-2.26-1.85-7.69-4.26-8.78-4.86-2.2-15.12,5.39-19.33,6.85" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M562,571.67c-.11,2.51,1.66,4.34,2.42,6.58.86,2.53,1.2,5.24,2,7.76,1.42,4.23,2.9,8.37,4.2,12.51,2.39,7.66,8.36,10.46,15.67,11.15,3.63.34,8.25.4,10.72,3.35-3.93,4.38-18.12,1.2-20,6.92,3.86,1.23,8.51.46,12.29,2.17-3.4,1.47-8.66.3-12,1.89,3.57,1.88,7.83,3.39,11,5.62-4.23.31-9-1.32-13.05.46S567,636.2,563.6,639c-3.18,2.6-5.39,6.43-6.94,10.33s-.42,6.65,0,10.29c-2.76-.2-7.7-5.19-8.55-8-1.25-4.1,1.43-9.94,3-13.5,5.47-12.44,2.85-28.16,3.29-41.68.33-10,.32-18.93,2.32-28.48" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M548.67,654c-.32,4.49,2.76,12.28,6.67,14.5,5.9,3.35,4.38-4.76,4.62-8.45A12.91,12.91,0,0,1,548.67,654Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M278.33,551c1.84,2.56,6.92,2.59,9.74,3.33,4.29,1.14,8.62,2,12.93,2.91,5.16,1.13,13.37,1.77,17.63,4.35-11.6,1-22.56-1.3-34-2.18A150.75,150.75,0,0,1,269.32,557c-2.88-.52-10.85-1.35-12.34,2-.49,1.09.91,3.56,1,4.71.17,1.6-.46,3.81.05,5.37,1.07,3.27,6.25,6.05,9.24,7.61a67.67,67.67,0,0,0,13.19,5.19c4.46,1.24,9.51,1.22,13.82,2.76,9,3.2,17.31,7.84,26.68,10.28,6.33,1.65,13,2.17,18.89,4.77-10.65-1.33-21.53-2.58-32.05-4.88-9.17-2-20-3.75-29.5-2.15-7,1.19-11,13.49-12.08,19.46-1.8,9.65-.92,19.28-.91,29,0,4.27-2.06,7.93-2.24,12.31-.18,4.54.48,9.07.24,13.61-.53,10,0,19.72,0,29.68,0,6.15.21,12.38.62,18.22-5-4.71-12.74-5.56-18.72-8.57-2-1-5.91-2-7.31-3.59s-.78-4-.54-6.48c.64-6.56-.42-12.57-1-19-.42-4.44-.39-9.32-1.38-13.52-.39,0-.76,0-1.16,0,.31-2.23,3.13-3,4.95-4.27,3.87-2.68,5.25-5.48,5.94-10.13.6-4,.39-6.59-2.36-9.71-2.06-2.33-5.21-3.94-6.28-7.07-1.5-4.43-.65-10.6-1.29-15.27-.76-5.55-1.75-10.65-1.34-16.3a122.57,122.57,0,0,0-.31-20c-.44-4.87.47-12.84-2.6-16.89-2.24-3-4.2-3.91-3.84-8.33.33-4.08,2.42-8.24,3.76-12.09,1.43-4.11,2.78-7.18,7.39-5.43,6.44,2.45,13.62,7.94,20.52,8.52A74,74,0,0,1,278.33,551Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-3"><path d="M229.33,570c-4.59,1-10.21,6.73-13.46,10.13A142,142,0,0,0,205,592.47c-2.76,3.65-5.61,7.23-8,11.1-2.66,4.32-1.86,7.91-3,12.43-.82,3.24-2.65,3.94-2.57,7.67,0,.83.55,1.58.55,2.47,0,.41-1.29.92-1.24,1.26.35,2.44,2.63,2.17,3.57,4.43.63,1.52-.36,3.16.55,4.67,1.17,1.93,4.15,2.93,5.47,5,3.93,6.08,6.07,10.68,12.69,14.53,6,3.5,12.13,4.91,19,3.38,3.7-.83,12.41-4.35,12-9.26-5.23,3.7-16.81,5.39-17.71-2.9-.32-3-.25-7.19,1.14-10,.89-1.77,2.65-3,3.26-4.88a7.62,7.62,0,0,1,1.76.25c-1.47-3-5-4.91-5.76-8.32-.94-4.51,2.19-9.4,4.16-13.15C237.22,599.1,230.25,585.2,229.33,570Z" transform="translate(-53.25 -44.96)"/></g></g><g id="LIGHTS"><g class="cls-35"><path class="cls-7" d="M552.25,251c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C552.94,253.89,553,252.63,552.25,251Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M543.3,134.37c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C544,137.27,544,136,543.3,134.37Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M467.29,196.29c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C468,199.18,468,197.91,467.29,196.29Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M664,239.37c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C664.73,242.26,664.78,241,664,239.37Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M395.2,206.7c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C395.9,209.6,396,208.33,395.2,206.7Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M490.21,264.49c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C490.91,267.38,491,266.11,490.21,264.49Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M503.78,95.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C504.48,98.75,504.53,97.48,503.78,95.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M681.87,531.06c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C682.56,534,682.62,532.68,681.87,531.06Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M149,482.09c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C149.72,485,149.78,483.72,149,482.09Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M633.27,482.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C634,485.75,634,484.48,633.27,482.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M179.43,517.52c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C180.13,520.42,180.18,519.15,179.43,517.52Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M165.19,633c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C165.88,635.94,165.93,634.67,165.19,633Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M187.74,639.86c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C188.44,642.75,188.49,641.48,187.74,639.86Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M145.49,539.88c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C146.19,542.78,146.24,541.51,145.49,539.88Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M657.92,563.36c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C658.61,566.25,658.67,565,657.92,563.36Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M587.59,553c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36A5.15,5.15,0,0,1,589.4,557C588.28,555.89,588.34,554.63,587.59,553Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M335.84,215.69c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C336.53,218.59,336.58,217.32,335.84,215.69Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M427.19,90.19c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36A5.15,5.15,0,0,1,429,94.19C427.89,93.09,427.94,91.82,427.19,90.19Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M225.82,231.69c0,3.28,0,4.81-2.87,6.4.87,1,2.32,1.66,3,3s.32,3,.73,4.19c0-2.13,1.22-7.54,3.61-8.36a5.15,5.15,0,0,1-2.65-1.25C226.52,234.59,226.57,233.32,225.82,231.69Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M359.42,266.65c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C359.65,267.64,359.67,267.21,359.42,266.65Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M339.39,141c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C339.63,142,339.65,141.57,339.39,141Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M363.07,260.66c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C363.48,262.38,363.51,261.62,363.07,260.66Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M345.15,131.25c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C345.56,133,345.59,132.21,345.15,131.25Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M662.2,258.7c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C662.61,260.41,662.64,259.66,662.2,258.7Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M182.29,542.66c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C182.71,544.37,182.74,543.62,182.29,542.66Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M220.61,677.2c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C221,678.91,221.05,678.16,220.61,677.2Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M116.86,539.75c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C117.27,541.47,117.3,540.71,116.86,539.75Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M669.88,245.85c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C670.29,247.56,670.32,246.81,669.88,245.85Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M592.3,133.64c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C592.71,135.35,592.74,134.6,592.3,133.64Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M99.4,519.52c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C99.81,521.23,99.85,520.48,99.4,519.52Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M629.94,495.14c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C630.35,496.85,630.38,496.1,629.94,495.14Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M578.78,209.48c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C579.19,211.2,579.22,210.45,578.78,209.48Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M498.53,87.64c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95A3,3,0,0,1,499.6,90C498.94,89.35,499,88.6,498.53,87.64Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M621.17,210.72c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C621.58,212.43,621.61,211.68,621.17,210.72Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M129.34,220.08c0,1.12,0,1.64-1,2.18.29.35.79.57,1,1s.11,1,.25,1.43c0-.73.42-2.57,1.23-2.85a1.76,1.76,0,0,1-.9-.43C129.57,221.07,129.59,220.63,129.34,220.08Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-35"><path class="cls-7" d="M133,214.09c0,1.94,0,2.84-1.7,3.79.51.61,1.37,1,1.77,1.79s.19,1.76.43,2.48c0-1.26.72-4.46,2.14-4.95a3,3,0,0,1-1.57-.74C133.4,215.8,133.43,215.05,133,214.09Z" transform="translate(-53.25 -44.96)"/></g></g><g id="DETAILS-2" data-name="DETAILS"><path class="cls-24" d="M479.33,333.67a1,1,0,0,1-.92-1.38c.22-.54.45-1.1.66-1.64a1,1,0,1,1,1.87.72c-.22.56-.45,1.13-.68,1.69A1,1,0,0,1,479.33,333.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M480.33,337a1,1,0,0,1-.38-1.93.65.65,0,0,0,.39-.55,1,1,0,1,1,2,.29,2.62,2.62,0,0,1-1.61,2.11A1,1,0,0,1,480.33,337Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M483.67,332l-.2,0a1,1,0,0,1-.79-1.18,5.48,5.48,0,0,1,1.22-2.46,1,1,0,0,1,1.52,1.31,3.46,3.46,0,0,0-.78,1.54A1,1,0,0,1,483.67,332Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M483,327.67h-.08a1,1,0,0,1-.91-1.08,2.65,2.65,0,0,1,1.54-2.14,1,1,0,1,1,.92,1.78c-.44.23-.46.45-.46.53A1,1,0,0,1,483,327.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M307,335a1,1,0,0,1-.48-.12,4.52,4.52,0,0,1-1.72-1.72,1,1,0,0,1,1.74-1,2.54,2.54,0,0,0,.94,1A1,1,0,0,1,307,335Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M308.67,340.67a1,1,0,0,1-.7-.29,4.44,4.44,0,0,1-1.27-2.15,1,1,0,0,1,1.95-.46,2.52,2.52,0,0,0,.73,1.18,1,1,0,0,1-.7,1.71Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M304,338.67a1,1,0,0,1-.72-.31,5.2,5.2,0,0,1-1.23-2.05,1,1,0,1,1,1.9-.62,3.2,3.2,0,0,0,.77,1.28,1,1,0,0,1-.72,1.69Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M302,330.33a1,1,0,0,1-.69-.28,17,17,0,0,1-2.12-2.48,1,1,0,1,1,1.64-1.15,15,15,0,0,0,1.88,2.19,1,1,0,0,1-.69,1.72Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M261.67,463.67a1,1,0,0,1-.19-2,210.85,210.85,0,0,1,41.19-4,1,1,0,1,1,0,2,208.87,208.87,0,0,0-40.81,4Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M491.33,461.33a1,1,0,0,1-.46-1.89c3.49-1.78,8.65-1.75,13.18-1.72,1.59,0,3.08,0,4.39-.05l.44,0c4.21-.22,9-.48,13,.38a1,1,0,0,1-.42,2c-3.75-.8-8.37-.55-12.46-.34l-.45,0c-1.36.07-2.89.06-4.5.05-4.32,0-9.21-.05-12.27,1.5A1,1,0,0,1,491.33,461.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M394,506.5a1.5,1.5,0,0,1-1.5-1.5V489.67a1.5,1.5,0,0,1,3,0V505A1.5,1.5,0,0,1,394,506.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M397,686.67h-.14a1,1,0,0,1-.85-1.13,6,6,0,0,1,1.2-2.81,1,1,0,1,1,1.58,1.23,4.05,4.05,0,0,0-.8,1.86A1,1,0,0,1,397,686.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M398.67,689a1,1,0,0,1-1-.89,1.25,1.25,0,0,1,1.43-1.43,1.25,1.25,0,0,1-.33,2.32Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M372,601a1,1,0,0,1-.35-.06,1.67,1.67,0,0,1-.94-2.23A1.39,1.39,0,1,1,372,601Zm.6-1.6Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M374.67,599.33a1,1,0,0,1-.65-.24,4,4,0,0,1-1.33-2.22,1,1,0,0,1,2-.42,2,2,0,0,0,.67,1.11,1,1,0,0,1-.65,1.76Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M420.67,598a1,1,0,0,1-1-1v-3a1,1,0,0,1,2,0v3A1,1,0,0,1,420.67,598Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M192,626.33a1,1,0,0,1-.71-1.7c3.28-3.33,12-4.81,15.58-5.29a1,1,0,0,1,.27,2c-5.45.73-12.1,2.35-14.42,4.71A1,1,0,0,1,192,626.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193,630a1,1,0,0,1-.43-1.9,27.69,27.69,0,0,1,3.3-.75,1,1,0,1,1,.24,2c-.68.08-2.55.55-2.81.63A1,1,0,0,1,193,630Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M604.33,629.33l-.21,0a21,21,0,0,1-5-2,21.42,21.42,0,0,0-4.71-2,47.68,47.68,0,0,0-12-1.64h0a1,1,0,0,1,0-2,49.77,49.77,0,0,1,12.52,1.69,22.92,22.92,0,0,1,5.16,2.12,19.2,19.2,0,0,0,4.55,1.87,1,1,0,0,1-.21,2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M605.67,625.67h0a18.9,18.9,0,0,1-5-1.06,14,14,0,0,0-5.2-.94,1,1,0,0,1-1.08-.91,1,1,0,0,1,.91-1.08,15.42,15.42,0,0,1,6,1,17.07,17.07,0,0,0,4.49,1,1,1,0,0,1,0,2Z" transform="translate(-53.25 -44.96)"/></g><g id="LINEART"><path class="cls-24" d="M561,701a2.5,2.5,0,0,1-2.5-2.5V684.63c0-7-.05-14.7-.17-23.48a2.5,2.5,0,1,1,5-.06c.11,8.8.17,16.5.17,23.54V698.5A2.5,2.5,0,0,1,561,701Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M560.38,634.64a2.5,2.5,0,0,1-2.5-2.46c-.25-14.88-.48-30.71-.42-46.42,0-7.15,0-13.43,0-19.2a2.5,2.5,0,0,1,2.49-2.51h0a2.5,2.5,0,0,1,2.5,2.49c0,5.78,0,12.08,0,19.24-.07,15.65.17,31.46.42,46.31a2.5,2.5,0,0,1-2.46,2.54Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M559.63,541.5a2.5,2.5,0,0,1-2.5-2.44c-.29-12.49-.76-23.82-1.45-34.65a2.5,2.5,0,0,1,5-.31c.68,10.89,1.16,22.29,1.45,34.84a2.5,2.5,0,0,1-2.44,2.56Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M547.24,430.29a2.5,2.5,0,0,1-2.4-1.8q-.26-.9-.53-1.8c-5.82-19.3-15-43.91-34.51-63.11-13.58-13.36-32.91-23.48-57.45-30.09-6.15-1.65-11.36-2.85-16-3.66-17.78-3.15-36.76-2.18-55.12-1.24-4,.21-8.05.41-12,.57-35.32,1.43-66.4,13.65-87.49,34.41-19.51,19.2-28.69,43.81-34.51,63.11a2.5,2.5,0,1,1-4.79-1.44c6-19.87,15.47-45.24,35.79-65.23,22-21.63,54.23-34.36,90.8-35.84,4-.16,8-.37,12-.57,18.64-1,37.91-1.94,56.25,1.31,4.74.84,10.1,2.07,16.38,3.76C479,335.49,499.11,346,513.31,360c20.32,20,29.8,45.36,35.79,65.23q.28.92.55,1.85a2.5,2.5,0,0,1-2.4,3.2Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M232,540h0a2.5,2.5,0,0,1-2.46-2.54c.17-9.84.55-19.7,1.1-29.31a2.5,2.5,0,1,1,5,.29c-.55,9.54-.92,19.33-1.1,29.11A2.5,2.5,0,0,1,232,540Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M235.67,635.7a2.5,2.5,0,0,1-2.5-2.38c-.18-3.87-.41-7.43-.7-10.88-1.6-19.07-2.59-38-2.94-56.19a2.5,2.5,0,1,1,5-.1c.35,18.11,1.33,36.91,2.92,55.87.3,3.51.53,7.13.72,11.06a2.5,2.5,0,0,1-2.38,2.62Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M236.44,704.72a2.5,2.5,0,0,1-2.47-2.16c-.71-5.17-.46-6.39,0-7.95.24-.79.55-1.77.36-5.79-.41-9-.49-18.31-.57-27.28v-1.29a2.5,2.5,0,0,1,5,0v1.29c.08,8.93.16,18.16.56,27.1.2,4.52-.14,6.06-.58,7.49-.24.78-.45,1.45.15,5.79a2.5,2.5,0,0,1-2.13,2.82Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M291,354.83a2.49,2.49,0,0,1-1-.23c-7-3.19-17.19-13.06-18.28-23.27-.61-5.75,1.75-10.8,6.83-14.6a16.09,16.09,0,0,1,13.71-3.12c13.11,3,23,20.91,24.85,24.47a2.5,2.5,0,1,1-4.44,2.31c-4.62-8.89-13-20-21.53-21.9a11.15,11.15,0,0,0-9.6,2.25c-3.69,2.76-5.28,6.05-4.85,10.07.85,7.94,9.54,16.56,15.39,19.25a2.5,2.5,0,0,1-1,4.77Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M497.67,352.83a2.5,2.5,0,0,1-1.55-4.46l1.68-1.32c3.62-2.82,7.72-6,10.47-9.17a14.43,14.43,0,0,0,2.58-15.12c-2-4.73-6.39-7.56-11.94-7.77-11-.44-21.13,11.1-24.17,22a2.5,2.5,0,1,1-4.82-1.34c3.63-13,15.5-26.18,29.17-25.66,7.45.28,13.56,4.31,16.34,10.79A19.45,19.45,0,0,1,512,341.18c-3.06,3.5-7.36,6.85-11.15,9.81l-1.66,1.3A2.49,2.49,0,0,1,497.67,352.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.17,481.17a2.49,2.49,0,0,1-1.79-.76c-2.65-2.72-3.46-6.28-2-9.07a13.19,13.19,0,0,0,.68-3.53c.08-.73.16-1.42.28-2.06a67.86,67.86,0,0,1,7-20.67A68.93,68.93,0,0,1,247.25,421a66,66,0,0,1,97.16,20.76c3,5.36,4.85,11.47,6.64,17.78a3.24,3.24,0,0,0,1.57,2.36c2.67,2.24,3,4.42,2.81,5.86s-1.12,3.55-4.45,5.1a2.5,2.5,0,0,1-2.12-4.53c1.26-.59,1.59-1.12,1.6-1.22s-.14-.6-1.07-1.37a7.5,7.5,0,0,1-3.16-4.82c-1.71-6-3.47-11.82-6.2-16.71A60.88,60.88,0,0,0,250.23,425a64,64,0,0,0-18.46,22.4,63.26,63.26,0,0,0-6.56,19.27c-.09.51-.16,1.11-.23,1.73a15.77,15.77,0,0,1-1.19,5.22c-.34.67-.12,2,1.17,3.33a2.5,2.5,0,0,1-1.79,4.24Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.66,540c-.89,0-1.78,0-2.68-.05a66.06,66.06,0,0,1-63.3-61.13,2.5,2.5,0,0,1,5-.37,61.13,61.13,0,0,0,122-2.13c.08-2,.06-3.93,0-5.88a2.5,2.5,0,1,1,5-.27c.12,2.1.13,4.24,0,6.35A66.22,66.22,0,0,1,286.66,540Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M284.37,485.33a15.13,15.13,0,0,1-15-13.82,2.5,2.5,0,0,1,5-.43,10.13,10.13,0,1,0,20.19-1.76,2.5,2.5,0,0,1,5-.43,15.15,15.15,0,0,1-13.76,16.39C285.26,485.31,284.81,485.33,284.37,485.33Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M223.17,481.17a2.5,2.5,0,0,1-.53-4.94l2.9-.63c7.58-1.64,14.74-3.2,22.69-4.56,3.42-.59,6.9-1.29,10.26-2a171.15,171.15,0,0,1,22-3.46c17.18-1.17,34.56-.63,49.51,0,1.58.06,3.28.05,5.09,0,5.17,0,10.51-.05,14.94,1.54a2.5,2.5,0,0,1-1.69,4.71c-3.6-1.29-8.49-1.27-13.22-1.25-1.86,0-3.62,0-5.31,0-14.82-.59-32-1.13-49,0a167.45,167.45,0,0,0-21.4,3.37c-3.4.69-6.92,1.4-10.41,2-7.85,1.35-15,2.89-22.48,4.52l-2.9.63A2.47,2.47,0,0,1,223.17,481.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M439.67,478.95a2.49,2.49,0,0,1-.8-.13c-3.48-1.17-4.63-3.13-5-4.57s-.26-3.61,2.14-6.14a3.25,3.25,0,0,0,1.29-2.52c1.07-6.47,2.23-12.75,4.6-18.41a65.89,65.89,0,0,1,94.21-31.56,68.94,68.94,0,0,1,22.51,21.73,67.86,67.86,0,0,1,9.31,19.75c.19.63.34,1.3.51,2a13.18,13.18,0,0,0,1.08,3.42c1.71,2.61,1.32,6.24-1,9.24a2.5,2.5,0,0,1-4-3.06c1.13-1.46,1.2-2.8.79-3.43a15.75,15.75,0,0,1-1.77-5.05c-.14-.61-.27-1.2-.42-1.7a63.24,63.24,0,0,0-8.68-18.41,64,64,0,0,0-20.86-20.18,61,61,0,0,0-87.09,29.16c-2.16,5.17-3.26,11.13-4.28,17.3a7.5,7.5,0,0,1-2.6,5.15c-.83.88-.93,1.4-.91,1.49s.41.59,1.73,1a2.5,2.5,0,0,1-.8,4.87Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M502.91,538.8a66.23,66.23,0,0,1-65.32-56.08c-.32-2.1-.55-4.22-.67-6.32a2.5,2.5,0,1,1,5-.29c.11,1.94.32,3.91.62,5.85A61.13,61.13,0,0,0,564,470.36a2.5,2.5,0,0,1,5-.2,66.18,66.18,0,0,1-66.13,68.64Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M504.75,483.85a15.13,15.13,0,0,1-15.12-14.74,2.5,2.5,0,0,1,2.43-2.56h.07a2.5,2.5,0,0,1,2.5,2.44,10.13,10.13,0,1,0,20.26-.52,2.5,2.5,0,0,1,2.43-2.56,2.46,2.46,0,0,1,2.56,2.43,15.15,15.15,0,0,1-14.74,15.51Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M440.26,477.84a2.5,2.5,0,0,1-1.11-4.74c4.22-2.08,9.53-2.66,14.67-3.21,1.79-.19,3.48-.38,5-.62,14.79-2.28,32-4.77,49.2-5.53a170.23,170.23,0,0,1,22.29,1c3.42.3,7,.6,10.42.8,8.08.46,15.38,1.2,23.12,2l2.89.29a2.5,2.5,0,0,1-.5,5l-2.89-.29c-7.68-.78-14.93-1.51-22.9-2-3.54-.2-7.11-.51-10.57-.81a168.33,168.33,0,0,0-21.64-.94c-16.95.75-34,3.23-48.66,5.48-1.67.26-3.42.45-5.27.65-4.71.51-9.57,1-13,2.72A2.48,2.48,0,0,1,440.26,477.84Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M393.72,477.54c-4.22,0-8.34-.81-10.74-2.32a6,6,0,0,1-3.13-5.28c0-2.5,1.83-5.12,4.53-6.69a20.53,20.53,0,0,1,8.22-2.34h0a25.62,25.62,0,0,1,11.67,1.54,7.17,7.17,0,0,1,4.44,5.39,6.91,6.91,0,0,1-2.52,6.33C403.56,476.47,398.57,477.54,393.72,477.54Zm-.67-11.65a15.45,15.45,0,0,0-6.16,1.69,3.86,3.86,0,0,0-2,2.46c0,.3.26.62.79,1,3.77,2.38,14.27,2,17.29-.6a2,2,0,0,0,.85-1.78,2.22,2.22,0,0,0-1.46-1.56,20.71,20.71,0,0,0-9.27-1.16Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M377.41,495.74a10.85,10.85,0,0,1-7.91-3c-2.15-2.23-2.76-5.43-1.73-9,1.63-5.66,8.82-13.11,13.56-15.24a2.5,2.5,0,0,1,2,4.56c-3.85,1.73-9.71,8.27-10.8,12.06-.53,1.84-.35,3.23.53,4.15,1.3,1.35,4.16,1.8,7,1.11a43.8,43.8,0,0,0,4.76-1.59,29.73,29.73,0,0,1,9.23-2.35,16.92,16.92,0,0,1,6.25,1.18l.88.29c1.06.34,2.08.74,3.07,1.13a31.94,31.94,0,0,0,3.89,1.34c2.8.69,5.66.24,7-1.11.88-.92,1.06-2.31.53-4.15-1.09-3.79-7-10.33-10.8-12.06a2.5,2.5,0,1,1,2-4.56c4.74,2.13,11.93,9.58,13.56,15.24,1,3.57.42,6.77-1.73,9-2.6,2.69-7.1,3.65-11.76,2.49a36.21,36.21,0,0,1-4.51-1.54c-1-.37-1.85-.73-2.76-1l-.94-.31a12.24,12.24,0,0,0-4.46-.93,25.55,25.55,0,0,0-7.69,2,48.2,48.2,0,0,1-5.31,1.76A16,16,0,0,1,377.41,495.74Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M394.25,507.75a17.94,17.94,0,0,1-5.4-.66c-3.8-1.3-3.85-4.93-3.88-7.34,0-.32,0-.65,0-1-.08-2.48-.06-5.07,0-7.36v-.91a2.5,2.5,0,0,1,2.5-2.48h0a2.5,2.5,0,0,1,2.48,2.52v.91c0,2.24,0,4.78,0,7.16,0,.36,0,.72,0,1.08,0,2.28.17,2.56.5,2.67,1.55.53,5.59.49,7.9.11a6.24,6.24,0,0,0,.89-.2c0-.3,0-.75,0-1.13,0-.63-.09-1.42-.08-2.32,0-1.83,0-3-.08-4.32,0-1.11-.09-2.26-.09-3.82a2.5,2.5,0,0,1,5,0c0,1.47,0,2.57.08,3.63.05,1.29.1,2.63.08,4.58,0,.71,0,1.34.07,1.94.14,2.26.36,5.69-5,6.58A33.27,33.27,0,0,1,394.25,507.75Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.42,555.33A80.37,80.37,0,1,1,366.79,475,80.46,80.46,0,0,1,286.42,555.33Zm0-150.74A70.37,70.37,0,1,0,356.79,475,70.45,70.45,0,0,0,286.42,404.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M503,554.33A80.37,80.37,0,1,1,583.34,474,80.46,80.46,0,0,1,503,554.33Zm0-150.74A70.37,70.37,0,1,0,573.34,474,70.45,70.45,0,0,0,503,403.59Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M426,465a5,5,0,0,1-4.26-2.37c-1.47-2.38-11.35-7.06-25.79-7.89-13.45-.77-24.29,2.35-29,8.36a5,5,0,0,1-7.85-6.19c6.85-8.69,20.51-13.12,37.45-12.15,12.95.74,29,5,33.73,12.62A5,5,0,0,1,426,465Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M210,462h-.27c-5.85-.31-10.27-2.79-12.11-6.8a8.69,8.69,0,0,1,1-9.07c2.79-3.64,8-5.12,14.2-4.06a5,5,0,0,1-1.68,9.86,11.76,11.76,0,0,0-2.75-.18,10.12,10.12,0,0,0,1.86.26,5,5,0,0,1-.26,10Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M579,462a5,5,0,0,1-.26-10,10.1,10.1,0,0,0,1.86-.26,11.7,11.7,0,0,0-2.75.18,5,5,0,0,1-1.68-9.86c6.23-1.07,11.41.42,14.2,4.06a8.69,8.69,0,0,1,1,9.07c-1.85,4-6.26,6.49-12.11,6.8Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M382.36,612.58a2.56,2.56,0,0,1-.46,0c-10.2-1.9-18.76-4.71-27.82-7.67-3.3-1.08-6.7-2.2-10.31-3.31-21.85-6.75-44.73-12.41-66.85-17.89-8.13-2-16.54-4.1-24.7-6.19l-1.4-.36c-8.17-2.07-19.37-4.9-24-13.77-3.18-6.08,0-16.94,2.14-24.13.25-.86.49-1.65.68-2.35a2.5,2.5,0,0,1,4.82,1.35c-.2.71-.44,1.53-.7,2.41-1.66,5.63-4.74,16.12-2.5,20.4,3.62,6.9,13.15,9.31,20.82,11.25l1.41.36c8.14,2.08,16.54,4.16,24.66,6.18,22.19,5.5,45.14,11.18,67.13,18,3.65,1.13,7.08,2.25,10.39,3.33,8.9,2.92,17.31,5.67,27.18,7.51a2.5,2.5,0,0,1-.46,5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M396.13,578.5a2.54,2.54,0,0,1-.52-.06c-11.08-2.36-21.5-4.28-32.79-6-44.24-6.84-90.83-15.53-131.76-32.57a2.5,2.5,0,1,1,1.92-4.62c40.44,16.84,86.67,25.45,130.6,32.25,11.39,1.76,21.9,3.69,33.07,6.08a2.5,2.5,0,0,1-.52,4.95Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M382.36,612.58h-.18a2.5,2.5,0,0,1-2.32-2.67c.53-7.58,4.21-14.32,7.78-20.84,2.44-4.47,4.75-8.69,6.09-13.12a2.5,2.5,0,1,1,4.79,1.45c-1.49,4.92-4,9.58-6.49,14.07-3.46,6.33-6.73,12.3-7.18,18.79A2.5,2.5,0,0,1,382.36,612.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M411,612.58a2.5,2.5,0,0,1-.46-5c9.73-1.82,17.93-4.52,26.61-7.38,3.41-1.13,6.94-2.29,10.73-3.46,22-6.79,44.92-12.47,67.11-18,8.13-2,16.53-4.1,24.68-6.18l.33-.08c7.38-1.89,15.74-4,19.9-10.15,3.84-5.67,2.12-10-.26-15.95a65.76,65.76,0,0,1-2.41-6.77,2.5,2.5,0,1,1,4.81-1.35,61.79,61.79,0,0,0,2.24,6.27c2.5,6.27,5.09,12.75-.25,20.61-5.22,7.69-15,10.18-22.79,12.19l-.33.08c-8.16,2.09-16.58,4.17-24.71,6.19-22.12,5.48-45,11.14-66.83,17.89-3.74,1.16-7.25,2.31-10.64,3.43-8.85,2.92-17.2,5.67-27.26,7.55A2.57,2.57,0,0,1,411,612.58Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M397,578.5a2.5,2.5,0,0,1-.52-4.95c11.18-2.38,21.68-4.32,33.07-6.08,40.41-6.25,86.22-13.34,128.13-30.79a2.5,2.5,0,1,1,1.92,4.62C517.14,559,471,566.12,430.32,572.42c-11.29,1.75-21.71,3.66-32.79,6A2.54,2.54,0,0,1,397,578.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M411,612.58a2.5,2.5,0,0,1-2.49-2.33c-.45-6.45-3.76-12.4-7.27-18.7-2.52-4.53-5.13-9.21-6.63-14.17a2.5,2.5,0,1,1,4.79-1.45c1.34,4.44,3.71,8.69,6.21,13.18,3.62,6.5,7.36,13.22,7.89,20.78a2.5,2.5,0,0,1-2.32,2.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M229.87,663.57a41.28,41.28,0,0,1-16.34-3.66,39.84,39.84,0,0,1-19.73-21.19,2.5,2.5,0,0,1,4.63-1.89,34.79,34.79,0,0,0,17.19,18.54c6.44,3,21.18,6.34,25.68-2,3.47-6.46.36-10.22-5-15.81a36.79,36.79,0,0,1-6.18-7.72,6.23,6.23,0,0,1-2.7-3.22,5.9,5.9,0,0,0-.87-1.53,2.5,2.5,0,0,1,3.93-3.09A10.75,10.75,0,0,1,232,624.6c.29.67.32.74,1.16,1.19a2.5,2.5,0,0,1,1.09,1.14c1.18,2.47,3.34,4.73,5.64,7.13,5,5.18,11.16,11.64,5.8,21.63C242.57,661.53,236.38,663.57,229.87,663.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M193.09,620.7H193a2.5,2.5,0,0,1-2.38-2.61c.45-9.82,3.75-18.54,10.68-28.29,5.72-8,18.92-20.32,30.37-22.5a2.5,2.5,0,1,1,.93,4.91c-9,1.72-21.17,12-27.23,20.49-6.34,8.92-9.36,16.82-9.76,25.62A2.5,2.5,0,0,1,193.09,620.7Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M228.33,626.08a2.5,2.5,0,0,1-2-4.06l0,0a2.5,2.5,0,0,1,.44-2,3.43,3.43,0,0,1,.48-1.3,2.52,2.52,0,0,1,.31-.85,71,71,0,0,0,4.08-8.66,2.5,2.5,0,0,1,4.63,1.89,84,84,0,0,1-3.7,8,2.5,2.5,0,0,1-.55,1.84l-.24.27a2.83,2.83,0,0,1-.18.82,4.76,4.76,0,0,1-1.27,3l-.11.13A2.5,2.5,0,0,1,228.33,626.08Zm-1.22-2.85h0Zm4.08-6.18h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M196.12,640.27a2.51,2.51,0,0,1-2.43-3.1c2.94-11.89,21.33-14.36,31.21-15.68,1.25-.17,2.34-.31,3.19-.45a2.5,2.5,0,1,1,.82,4.93c-.89.15-2,.3-3.34.48-8.08,1.08-24.9,3.34-27,11.93A2.5,2.5,0,0,1,196.12,640.27Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M195.84,640.28a5.69,5.69,0,0,1-4.05-1.56c-2.2-2.12-2.4-5.65-2.39-8.37l-.2-.1a3.72,3.72,0,0,0-.83-.34,2.5,2.5,0,0,1-1.65-4.21,12.38,12.38,0,0,0,.84-1.07c.21-.29.44-.6.68-.9a4.87,4.87,0,0,1-.28-4.23c1.74-4.17,9.13-5.1,16.86-5.49,10.49-.53,22.23,1.82,25.58,2.55a2.5,2.5,0,1,1-1.07,4.88c-6.58-1.44-16.4-2.83-24.2-2.44-9.92.5-12,1.88-12.48,2.35a3.58,3.58,0,0,0,.67,1,2.5,2.5,0,0,1-.33,3.64,3.19,3.19,0,0,0-.29.26,2.5,2.5,0,0,1,1.73,2.39v.79c0,1.45-.09,4.83.84,5.72.06.06.2.2.72.16a2.5,2.5,0,0,1,.29,5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M565.37,663.57c-6.51,0-12.69-2-15.83-7.89-5.36-10,.83-16.45,5.8-21.63,2.3-2.39,4.47-4.66,5.64-7.12a2.49,2.49,0,0,1,1.09-1.14c.85-.45.88-.52,1.16-1.19a10.73,10.73,0,0,1,1.54-2.65,2.5,2.5,0,0,1,3.93,3.09,5.91,5.91,0,0,0-.87,1.53,6.23,6.23,0,0,1-2.7,3.22,36.77,36.77,0,0,1-6.18,7.72c-5.36,5.59-8.47,9.34-5,15.81,4.5,8.39,19.24,5,25.68,2a34.79,34.79,0,0,0,17.19-18.54,2.5,2.5,0,1,1,4.63,1.89,39.84,39.84,0,0,1-19.73,21.19A41.28,41.28,0,0,1,565.37,663.57Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M602.15,620.7a2.5,2.5,0,0,1-2.5-2.38c-.41-8.8-3.42-16.7-9.76-25.62-5.67-8-20.58-19.22-29.88-21a2.5,2.5,0,1,1,.93-4.91c10.84,2.06,26.66,14.06,33,23,6.94,9.74,10.23,18.47,10.68,28.29a2.5,2.5,0,0,1-2.38,2.61Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M566.91,626.08a2.49,2.49,0,0,1-2-.94l-.11-.14a4.77,4.77,0,0,1-1.27-3,2.8,2.8,0,0,1-.18-.83l-.24-.27a2.5,2.5,0,0,1-.55-1.84,84,84,0,0,1-3.7-8,2.5,2.5,0,1,1,4.63-1.89,71.12,71.12,0,0,0,4.08,8.66,2.5,2.5,0,0,1,.31.85,3.43,3.43,0,0,1,.48,1.31,2.48,2.48,0,0,1,.44,1,2.53,2.53,0,0,1,0,1l0,0a2.5,2.5,0,0,1-2,4.06Zm1.22-2.85h0Zm-4.08-6.18h0Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.12,640.27a2.5,2.5,0,0,1-2.42-1.9c-2.12-8.59-18.94-10.84-27-11.93-1.31-.18-2.45-.33-3.34-.48a2.5,2.5,0,1,1,.82-4.93c.85.14,1.93.29,3.19.45,9.88,1.33,28.28,3.79,31.21,15.68a2.5,2.5,0,0,1-2.43,3.1Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M599.4,640.28H599a2.5,2.5,0,1,1,.29-5c.51,0,.66-.11.72-.16.92-.89.86-4.27.84-5.72v-.79a2.5,2.5,0,0,1,1.73-2.39,3.12,3.12,0,0,0-.29-.26,2.5,2.5,0,0,1-.33-3.64,3.58,3.58,0,0,0,.67-1c-.44-.47-2.56-1.85-12.43-2.34-7.86-.39-17.68,1-24.26,2.44a2.5,2.5,0,1,1-1.07-4.88c3.35-.73,15.08-3.08,25.52-2.55,7.79.39,15.18,1.32,16.92,5.49a4.87,4.87,0,0,1-.28,4.23c.24.31.46.61.68.9a12.45,12.45,0,0,0,.84,1.07,2.5,2.5,0,0,1-1.65,4.21,3.73,3.73,0,0,0-.83.34l-.2.1c0,2.72-.18,6.25-2.39,8.37A5.69,5.69,0,0,1,599.4,640.28Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.89,605.19a13.23,13.23,0,0,1-2.15-.17,13.89,13.89,0,0,1-9.52-6.77,2.5,2.5,0,1,1,4.23-2.66,8.94,8.94,0,0,0,6.1,4.49c3.11.51,6.78-.8,10.32-3.69a2.5,2.5,0,1,1,3.16,3.88C404.08,603.49,399.85,605.19,395.89,605.19Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M381.45,690.17h-.18A2.5,2.5,0,0,1,379,687.5c.55-7.7,1.54-17.78,2.59-28.45,2-20.32,4.27-43.35,4.29-57.89a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5c0,14.78-2.3,37.94-4.31,58.37-1,10.64-2,20.68-2.58,28.32A2.5,2.5,0,0,1,381.45,690.17Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M409.89,690.37A2.5,2.5,0,0,1,407.4,688c-.55-7.75-1.55-18-2.62-28.77-2-20.33-4.27-43.38-4.29-58.11a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5c0,14.49,2.27,37.41,4.27,57.63,1.07,10.85,2.08,21.1,2.63,28.91a2.5,2.5,0,0,1-2.32,2.67Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.67,712.41a2.5,2.5,0,0,1-2-.94A128.91,128.91,0,0,1,379.22,689a2.5,2.5,0,1,1,4.5-2.19,123.3,123.3,0,0,0,13.91,21.57,2.5,2.5,0,0,1-2,4.06Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M395.67,712.41a2.5,2.5,0,0,1-2-4.06,124.1,124.1,0,0,0,13.94-21.57,2.5,2.5,0,0,1,4.5,2.19,129.3,129.3,0,0,1-14.52,22.5A2.5,2.5,0,0,1,395.67,712.41Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M222,539.15a40.07,40.07,0,0,1-11.74-1.43c-25.41-7.8-19.39-36.26-14.54-59.13,1.89-8.93,3.68-17.36,3.44-23.49a2.5,2.5,0,1,1,5-.19c.26,6.75-1.59,15.48-3.55,24.72-4.65,22-9.93,46.86,11.12,53.32,4.87,1.5,10.81,1.27,16.55,1,2-.08,4.08-.16,6.05-.16a2.5,2.5,0,0,1,0,5c-1.87,0-3.81.07-5.86.15S224.16,539.15,222,539.15Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M559,542.83a2.5,2.5,0,0,1-2.1-3.85c2.37-3.68,7.95-4.14,13.34-4.59,3.45-.29,7-.59,8.82-1.67,11.8-7.07,17.55-20.9,14.67-35.23-1.06-5.25-2.55-10.19-4-15C587.16,474,584.5,465.2,584.5,455a2.5,2.5,0,0,1,5,0c0,9.46,2.44,17.53,5,26.07,1.48,4.9,3,10,4.11,15.44,3.31,16.43-3.36,32.33-17,40.51-2.79,1.68-7,2-11,2.36-3.8.32-8.52.71-9.55,2.32A2.5,2.5,0,0,1,559,542.83Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M486,344.5a2.5,2.5,0,0,1-1.32-4.62c2.93-1.83,5.25-6.67,6.36-13.29a2.5,2.5,0,1,1,4.93.82c-1,5.77-3.24,13.35-8.64,16.71A2.49,2.49,0,0,1,486,344.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M487,345.5a2.5,2.5,0,0,1-2.07-3.9c2.69-4,7.07-5.2,10.93-6.28.81-.23,1.61-.45,2.37-.7a2.5,2.5,0,1,1,1.53,4.76c-.83.27-1.68.51-2.56.75-3.33.93-6.48,1.82-8.14,4.27A2.5,2.5,0,0,1,487,345.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M300,347.5a2.49,2.49,0,0,1-1.68-.65L297,345.61c-2.17-2-7.92-7.44-10.14-7.13a2.5,2.5,0,1,1-.68-5c4.23-.58,9.15,3.66,14.24,8.44l1.28,1.19A2.5,2.5,0,0,1,300,347.5Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M300.5,347.5a2.5,2.5,0,0,1-2.07-1.1c-2.93-4.33-2.93-10.32-2.93-15.13v-.77A2.5,2.5,0,0,1,298,328h0a2.5,2.5,0,0,1,2.5,2.5v.77c0,4.34,0,9.26,2.07,12.33a2.5,2.5,0,0,1-2.07,3.9Z" transform="translate(-53.25 -44.96)"/></g><g id="HAIR_DETAILS" data-name="HAIR DETAILS"><path class="cls-24" d="M400.45,398h0Z" transform="translate(-53.25 -44.96)"/></g><g id="layers"><g class="cls-36"><circle class="cls-7" cx="233.17" cy="430" r="75.37"/></g><g class="cls-36"><circle class="cls-7" cx="449.72" cy="429" r="75.37"/></g><path class="cls-24" d="M426,465a5,5,0,0,1-4.26-2.37c-1.47-2.38-11.35-7.06-25.79-7.89-13.45-.77-24.29,2.35-29,8.36a5,5,0,0,1-7.85-6.19c6.85-8.69,20.51-13.12,37.45-12.15,12.95.74,29,5,33.73,12.62A5,5,0,0,1,426,465Z" transform="translate(-53.25 -44.96)"/><path class="cls-24" d="M286.42,555.33A80.37,80.37,0,1,1,366.79,475,80.46,80.46,0,0,1,286.42,555.33Zm0-150.74A70.37,70.37,0,1,0,356.79,475,70.45,70.45,0,0,0,286.42,404.59Z" transform="translate(-53.25 -44.96)"/><g class="cls-37"><path class="cls-7" d="M532.48,427.22c1.29,3.14,3.66,6,5.79,8.72a96.55,96.55,0,0,1,18.14,38.2c1,4.5,7.56,4.49,9.69.91a10.2,10.2,0,0,0,1.13-4.2,51.8,51.8,0,0,0-3.32-24.26c-1.32-3.37-3.17-5.84-5.09-8.79-2.11-3.25-3-6.77-6-9.49-3.77-3.43-7.3-7.66-11.88-10.14-2.12-1.15-4.77-2-6.87-.84a5.82,5.82,0,0,0-2.52,4.86A11.66,11.66,0,0,0,532.48,427.22Z" transform="translate(-53.25 -44.96)"/></g><g class="cls-37"><path class="cls-7" d="M316.29,432.4c1.29,3.14,3.66,6,5.79,8.72a96.55,96.55,0,0,1,18.14,38.2c1,4.5,7.56,4.49,9.69.91a10.2,10.2,0,0,0,1.13-4.2,51.8,51.8,0,0,0-3.32-24.26c-1.32-3.37-3.17-5.84-5.09-8.79-2.11-3.25-3-6.77-6-9.49-3.77-3.43-7.3-7.66-11.88-10.14-2.12-1.15-4.77-2-6.87-.84a5.82,5.82,0,0,0-2.52,4.86A11.66,11.66,0,0,0,316.29,432.4Z" transform="translate(-53.25 -44.96)"/></g><path class="cls-24" d="M503,554.33A80.37,80.37,0,1,1,583.34,474,80.46,80.46,0,0,1,503,554.33Zm0-150.74A70.37,70.37,0,1,0,573.34,474,70.45,70.45,0,0,0,503,403.59Z" transform="translate(-53.25 -44.96)"/></g><g id="CIRCLE"><path class="cls-24" d="M397.38,745.79A344.13,344.13,0,0,1,154,158.33,341.87,341.87,0,0,1,397.38,57.54h3l11.29.28h.07a344.13,344.13,0,0,1-14.36,688Zm0-679.25c-184.79,0-335.12,150.34-335.12,335.13S212.59,736.79,397.38,736.79,732.5,586.46,732.5,401.67A334.16,334.16,0,0,0,411.4,66.83l-11.17-.28Z" transform="translate(-53.25 -44.96)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.png
deleted file mode 100644
index 6492145127..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.svg
deleted file mode 100644
index 305806cd97..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadows.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 720.07 762.53"><defs><style>.cls-1{fill:#ced8d2;}.cls-2{fill:#1d1d1b;}.cls-3{opacity:0.2;}.cls-4{fill:#050505;}.cls-5{fill:#ccbca8;}.cls-6{fill:#b7a38d;}.cls-7{fill:#b79765;}.cls-8{fill:#fff;}.cls-9{fill:#d7b89b;}.cls-10{opacity:0.27;}.cls-11{opacity:0.51;}.cls-12{fill:#e3fbfc;}.cls-13{opacity:0.56;}.cls-14{opacity:0.39;}.cls-15{fill:none;stroke:#1d1d1b;stroke-linecap:round;stroke-linejoin:round;stroke-width:5px;}</style></defs><title>BoyerShadows</title><g id="BACKGROUND_OCLOR" data-name="BACKGROUND OCLOR"><path class="cls-1" d="M604,97c102.41,62,170.85,174.54,170.85,303,0,195.53-158.51,354-354,354s-354-158.51-354-354A352.48,352.48,0,0,1,139,185.68l6.95-8.83A356,356,0,0,1,220.64,108Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M774.33,418.17H743a2.5,2.5,0,0,1,0-5h31.33a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/></g><g id="shadow"><g class="cls-3"><path class="cls-4" d="M683,482.33c-18.83,3.44-37.15,12-54.59,19.58-9,3.89-18.46,6.69-27.67,10.08-5.37,2-15.08,4-18.46,8.83.79-8.35-.94-19-3.12-27.1-2.32-8.64-7.87-15.93-6.74-25.29,10.4-.89,21.59,1.16,32.08,1.24,14.77.12,29.37.81,44.09,1.92C660,472.46,673.68,471.94,683,482.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M291,512.33c-30.31,0-58.76,13-86.18,24.53-16.11,6.77-34.42,9.42-51.16,14.65-10.28,3.21-21.33,5.38-31.33,8.65-5.92,1.94-11.34,5.75-17.38,7.26-3.81-5.92-4.16-13.61-6.52-20.21-3.8-10.67-7.68-21.23-11.12-32C83.14,502,72,486.26,73.7,471.75c10.35.26,20.59,2.61,31.22,2.58,15.75,0,31.49,1.5,47.24,2,23.23.68,46.12,6.64,69,9.85,15.67,2.2,30.65,10.18,46.2,13.66C276.88,501.94,286.34,504.48,291,512.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M267.7,678.5c9.58,1.57,19,4.62,28.83,4.61,8.83,0,17.49-2.54,26.5-2.12,6.67.31,13.14,1.66,19.79,2,15.14.78,28.27,4,42.83,8.8,10.37,3.41,20.13,9,30.39,12.38,8.91,2.93,20.7,1.92,30.18.2,13.06-2.37,25.5-7.44,38.49-10.12,15-3.1,27.84-5.3,42-11.55,12.52-5.54,25.66-10.15,38.37-15.42,4.46-1.85,17.39-3.54,16.48-10.31-.43-3.2-6.84-6.92-9-8.77-7.25-6.25-14.56-10-23.13-14.16-12.82-6.3-19.11-8.37-33.63-7.06-35.83,3.25-71.88,6.13-106.13,17.5-8.81,2.93-20.59,8.56-30,7.84-16.78-1.3-33.56-3-50.42-1.94-10.88.66-21.23,2.49-32.25,1.95-10.47-.52-20.93-3.28-31.32-5-13.79-2.29-29.89-6.58-51.33-3-5.23-.11-14,7.91-14.7,13.33-1.24,9.58,10.32,5.68,16.42,5.39C234.49,662.17,249.83,675.57,267.7,678.5Z" transform="translate(-60.79 2.5)"/></g></g><g id="COLOR"><path class="cls-5" d="M379.67,631.39l50.88-10.2,110.17-24.29,74.73-16.24-13.42-60L594.42,482H680l66-17.43V289l-50.12-6.6V177.1l-23.14-25.84-5.41-2.66L604,148V12.67L539,0,400,5V32H290L222,46V174.2l-83,2.89V312.74L80,314l-3.72,4.24,1,154.1,1.75,2,57.45,11.84,57.15-.53L343,454.5c-.07,0,4.24,22.37,4.47,23.62l4.68,24.73c1.64,8.67,3.73,18.35,2.53,27.22-.51,3.75-.49,7.66-.68,11.44-.17,3.33-.59,6.81,3.25,7.49,1.29.23,2.84-.51,3.7.5s.4,3.3.62,4.55c.37,2.13,1.11,4.34,1.52,6.52l2.81,14.86,5,26.61,5.49,29s.05.34.06.34Z" transform="translate(-60.79 2.5)"/><polygon class="cls-6" points="134.41 488.2 78.21 488.68 13.87 477.07 16.52 316.5 280.95 315.24 352.71 324.5 352.71 390.84 343.71 391 134.41 488.2"/><polygon class="cls-6" points="355.21 150.5 355.21 297.5 635.1 295.83 635.1 179.59 624.21 167 611.96 153.75 591.85 151.83 355.21 150.5"/><polygon class="cls-6" points="161.71 172.5 161.21 48.46 229.21 34.5 366.21 34.5 366.21 148.95 355.21 150.5 354.38 177.49 227.43 179.46 161.71 172.5"/><path class="cls-7" d="M345.88,628.62a19.34,19.34,0,0,0-3.63,1.85c-2.64,1.58-5.9,2.39-8.78,3.45-3.7,1.36-7.63,3.4-11.49,4.23L304,642l-23,.65-32.85-9.12-7.9,6.43-9.5,4.29-10.13,2L217.74,642l4.69-12.72,8.29-7.88-10.09-12.88-6.8-21.21c-.15-4.54-.28-9.09-.46-13.63-.3-7.38-4.83-1.22-7.93-5.12-2.19-2.75,1.31-8.37,2.14-11.07,1.07-3.46,3.65-6.93,4.39-10.37.4-1.85-.79-3.32-.72-5.08,0-1.19.59-1.75.76-2.79.45-2.78-.62-5.74-.77-8.51a117.36,117.36,0,0,0-1.67-11.85c-.45-2.87-.2-6.63-2.31-8.89-1.73-1.86-4.94-2-6.25-4.25-1.1-1.9.2-3.86,0-6-.46-5.23-3.43-9.56-5.81-14.05l-6.84-12.87-8.25-15.52-7.75-20.06,1.3-22.67L182,391.63l3.62-6.63-6.09-2.31-4.76-8.25-.58-11,2.6-4.53,6.43-3.44,5.21,1.25,9.51,9L222.55,355l38.54-8.5,1-7.65,2.74-5.2,5.88-1,3.44,2.58,4.14,9.6,24,.7,32,5.52L350,363.07l8.4-3.82L373.94,355l11.35.35,4.29,3.65L365.95,378.2l6.22,22,14.59,20.54,7.77,6.22-.82,12.28-.82,3.44L343,454.5c-.52.12,6.72,41.69,7.34,45.53.84,5.22,1.15,10.56,2.18,15.72a45.42,45.42,0,0,1,.49,8.61V535.8c0,3.16-.7,9.73,1.75,12.08,1.49,1.43,2.23-.07,3.76.62,2.49,1.13,3,8.54,3.63,11.14L365,572.22c1.27,5.54,3,11.17,3.86,16.79l6.24,40.78,3.37,3.93,3.22-.31.51,6.09-8.08,3.15c-7.9-3.34-15.36-6.95-21.87-12.71a6,6,0,0,0-1.84-1.28A6.58,6.58,0,0,0,345.88,628.62Z" transform="translate(-60.79 2.5)"/><path class="cls-8" d="M367.71,375s25.05-15.79,25.17-15.79,4.73,6.38,4.73,6.38l6.18,19.06-3.15,14-5.14,6.35-5.92,2.45-5.69-4.41-4.45-2.88.39-7.3L371,391.63Z" transform="translate(-60.79 2.5)"/><polygon class="cls-8" points="268 386.47 240.1 389.87 209.14 394.5 194.94 395.41 192.21 407.55 197.47 425.94 207.9 439.05 220.17 446.08 230.11 448.31 240.1 448.06 252.46 444.82 262.21 437.75 268.24 430.09 273.17 419.72 275.01 407.55 273.81 397.65 268 386.47"/><path class="cls-2" d="M362.47,402.31a4.84,4.84,0,0,0,1.79,1l3.11,1.18a10.32,10.32,0,0,0,3.91.92c2.44-.07,4.46-1.82,6.24-3.49a6,6,0,0,0,2.17-3.23A4.82,4.82,0,0,0,378,394.8c-2.45-2.47-7.94-4.68-11.46-3.35C363.61,392.55,359.91,399.72,362.47,402.31Z" transform="translate(-60.79 2.5)"/><path class="cls-9" d="M355,414.41c.84,3.95,4.6,7.43,8.59,6.85,2.93-.42,5.19-2.74,7.93-3.87,4.64-1.92,9.9-.21,14.92-.33a5,5,0,0,0,2-.35,3.89,3.89,0,0,0,1.84-4.23,10.3,10.3,0,0,0-2.31-4.34q-2.11-2.7-4.46-5.2c-1.22-1.3-3-2.65-4.61-1.88a6.15,6.15,0,0,0-1.74,1.69,7.77,7.77,0,0,1-7,2.48c-3.49-.58-7.21-4.17-10.76-2.09S354.24,410.71,355,414.41Z" transform="translate(-60.79 2.5)"/><g class="cls-10"><path class="cls-8" d="M368.81,388.34l-1.1-23.69s8.48-17.33,8.09-18,6.68-6.06,6.68-6.06l13-1,8.29,1.85,9.82,12.28,7.21,15.07L424.21,386l-4.71,21.73-6.39,11.59-8.61,4.11L390.36,422l-5.08-3.31,3.67-3.79v-5.42l-4-6.79-5.56-2.47-1.51-7.57Z" transform="translate(-60.79 2.5)"/></g><g class="cls-10"><polygon class="cls-8" points="226.66 366.6 237.24 361.46 250.18 361.46 265.7 366.6 279.96 384.01 285.01 395.42 287.35 407.55 286.4 422.15 279.23 440.12 268 452.2 253.91 456.94 235.27 454.47 220.17 446.08 208.28 425.94 205.61 398.57 213.7 378.9 226.66 366.6"/></g><g class="cls-11"><path class="cls-8" d="M409,439.75c2.36,4.34,2.22,12.12,2.69,17.5.09,1.06-.14,3.22.56,4,1.48,1.65,1-.36,2.56-.69.63-.14,1.51.46,1.75.39.58-.16,1.31-1.06,1.76-1.16,1.15-.24,3,.52,4.19,0,.76-.35,1-1.35,1.69-1.59.86-.31,1.44.2,2.31.08,1.47-.21,4-2,4.8-.05,1.43.12,1.21-1.24,2.15-1.49.72-.19,1.17.59,1.7.51.9-.12,3.54-.38,4.45-1,2.39-1.52,1-8.77.9-11.83A110.37,110.37,0,0,0,439,431.52c-2.13,0-4.39,1.84-6.54,2.33-5.92,1.36-12,1.57-17.91,3.15" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M536.5,417c-1.36,2.71.54,8.93,1.31,12,.62,2.48,1.22,5,1.73,7.46,1.31-.76,1.41-1.43,3-1.49a14.4,14.4,0,0,0,1.74.77c1.14.13,1.75-.4,2.77-.56,1.84-.29,4.55-.88,6.77-.28-2.06-4.24-3-8.94-3.79-13.6-.18-1,.13-3.81-.67-4.58C547.82,415.29,542.06,417.06,536.5,417Z" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M547.25,294.25c0,9.83-1.48,19.55-1.25,29.38,0,1-.43,3.13,0,4,1.14,2.17,1,.14,2.53.12s2.27,1.32,4.2,1.26c1.21,0,2.66-.62,4-.76,3.52-.36,8.43.88,11.46,2.23.67-11.62-.15-23.39-.24-34.95-.89,0-1.82,0-2.72,0" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M374.75,251c-.19,4,.75,8,.75,12,0,3.31-.18,6.68,0,10,.21,3.74.35,7.47.54,11.21,1.38.2,3.73-1.36,4.73-1,1.66.62.39,3.52,2.47,3.79,1.05.14,1.18-1.19,2-1.3s1.31.73,2,.73,1.89-.48,2.52-.4,1.11.91,1.41.91c4.59,0,3.49-6.39,3.58-10.1.13-5.21,1.23-10.28,1.25-15.49,0-1.39.84-6.83-.05-7.82-.59-.65-1.81-.24-2.59-.25-4.44,0-8.91.19-13.36.19" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M106.25,316.25c-1.22.56-1,9.29-1,11.36,0,3.62.17,7.29,0,10.9-.18,4,.39,8.06.28,12,1.35-.75,2.9-3.06,4.67-2.25.54.25.24,1.64,1,1.93.91.36,1.25-.45,2.07-.48,1.63-.05,2.85.13,4.37-.9,2.49-1.67,1.66-4,1.38-7a76.43,76.43,0,0,1,.5-16.47c.16-1.27,1.52-4.07.75-5.3-1.56-2.48-7.92.65-10.25-1.75" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M164.25,177.75c-1.19,3.13-.24,7.9-.49,11.31a68.35,68.35,0,0,0,.46,11.07c.29,3.43-.16,7.73,1.25,10.84,1-.46,1.46-1.42,2.82-1.47.78,0,2,.77,2.82,1,2.6.78,4.87,1.11,5.37-1.72,1.86-10.4-1.63-22.08,1-32.28" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M314.75,177.5c0,7.1,1,13.7,1.73,20.63.29,2.92-.35,7.68,1,10.32,1.16,2.23.77.49,2.85-.06,2.62-.7,1.29.93,3.27,1.47.61.17,2.79-.54,3.55-.66a40.06,40.06,0,0,0,4.08-.44c.39-.1,2-.76,2.13-.74.87.11,1.12.85,1.65,1,1.47.41,3.44.31,4.72,1.27,2.09-1.86,1.25-6.75,1.25-9.29a111.45,111.45,0,0,1,.28-11.35c.43-4.23,2.08-8.41,2-12.67,0,.13-.45.23-.75.54" transform="translate(-60.79 2.5)"/></g><path class="cls-8" d="M638.75,149.5c0,7.67-.1,15.3-.27,22.94.64-1.54,2.45-3.17,4.22-2.9.54,3.11,1,3.66,3.49,1.74,1.22,3.69,3.36-.27,4.8-1s3.29.33,4.75,0c2-.47,2.21-2.73,2.48-4.73.72-5.42,1.62-10.88,2.52-16.27" transform="translate(-60.79 2.5)"/><g class="cls-11"><path class="cls-8" d="M565.25,4.5c-1.2,3.83-.25,9.22-.25,13.24s-.2,8.22.13,12.26c.34,4.2,1,8.33,1.41,12.49.65-.46,1.79-2.75,2.71-2.77.62,0,1.28,1.34,2,1.55-.51-.15,2.6-.36,2.12-.27.58-.11,1.29.45,2.08-.47,0,.81.59,1.27.81,1.76a1.44,1.44,0,0,1,1.94-.08c1.62-2.72,1.09-7.6,1.24-10.71s.35-6.07.57-9.07c.26-3.51-1.82-10.46-.26-13.18" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M344,32c-.48,1,.06,2.92,0,4.3-.19,2.38-1.19,4.66-1.53,7-.46,3.24-.18,6.66-.18,9.93,0,4-.57,8.72.5,12.48,1.9-1.32,4.18-5.76,6.51-6,.23.57.47,2.78,1.23,3,1.51.34,1.67-2.51,2.77-2.78,1.7-.43,1.94,2.07,3.94.33,1,2.63,1.73,0,3-.48s2.08.81,3.71-.52c.4,1.15,1.06,2.27,2.23,2.45,1.38-2.07,1.35-4.43,1.62-6.86.37-3.41,1.16-6.53,1.19-10,0-4.25-.05-8.71,1.25-12.62" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M247.5,41.25c-.35,3.5,1.76,7.33,2.25,10.81.25,1.81.14,4,1.25,5.48,1.82-3,4.84,1.18,5.79-1,6.84,1.07,2.63-13.17,5-16.54" transform="translate(-60.79 2.5)"/></g><g class="cls-11"><path class="cls-8" d="M709.67,295.33c2.33,3.49,2,11.62,2,16a48.19,48.19,0,0,1-1.63,14c1.82-1.77,2.28-.66,4.27-.64,1.46,0,2.63.09,4.2,0,4.21-.25,4.85.8,4.83-4.4,0-9,1.83-19.42,1.67-27.6" transform="translate(-60.79 2.5)"/></g><path class="cls-7" d="M372.5,517.5c-1,0-4.6-.61-5.25-.27-1.44.77-.83,5.27-1.06,7.08a86.53,86.53,0,0,0-.65,15.65c3.48.21,7.31-1.35,10.34-2.82,2.46-1.19,7-2.37,8.37-5,1.23-2.26-.15-5.42-1.3-7.43C380.22,520,375.95,520.66,372.5,517.5Z" transform="translate(-60.79 2.5)"/><path class="cls-8" d="M364,513.75c-1.64,0-3.47.25-5-.4-1-.43-1.89-2-2.87-2.21-2.63-.57-3.64,4.44-3.93,6.55-.65,4.7,0,9.78-.21,14.56-.18,3.54-.83,7.5-.49,11,.27,2.77,5.17,7.86,7,3.79,2.07,0,2.24,1.42,4.13-.47,2.36-2.36,2.43-8.28,2.58-11.46A89.06,89.06,0,0,0,364,513.75Z" transform="translate(-60.79 2.5)"/><path class="cls-8" d="M346.75,488.75c-4.43-.36-9,1.44-13.25,2.5s-8.35,2.19-12.6,2.12a119.23,119.23,0,0,0-14.92.71c-9.72,1-19.31,3-29,4.43-8,1.18-16.07.42-24.15.8a160.73,160.73,0,0,1-21.67-.3c-3.36-.3-6.5-1.24-9.81-1.71s-7.16.62-10.52,0c-2.57-.5-10.5-4.42-12.24-.89-1.1,2.24,1.65,9,3.37,10.62,1.91,1.8,3.77,2.19,5.08,4.74s1.34,5.38,2.05,8a61.06,61.06,0,0,1,2,12c.21,3.07-.48,6-.26,9,.41,5.51-1.6,10.3-2.13,15.74-.27,2.81-1.92,4.91-2.43,7.58-.45,2.35-1.55,4.24.74,5.47,1.78,1,4.4.33,6.33.6,4.14.59,8.24,1.38,12.37,2.18,10.84,2.11,23,2.42,34,1.95a173.24,173.24,0,0,1,25.22.5c7.15.72,14.39,1.51,21.56,1.87s13.5.73,20.7-.13c4.43-.53,8.73-1,13.2-1.3,3.77-.21,7.17-.5,10.6-2,2.85-1.28,10.28-3.3,11-6.25.81-3.33-1.57-7.8-2-11.1-.3-2.5-.36-4.25-1.34-6.51-5.43.15-6.21-5.74-6.47-10.28-.19-3.35,1.7-6.78,2.08-10.14a70.7,70.7,0,0,0,.18-8.57c-.06-4.81-1.46-9.9-2.56-14.55-.51-2.15-4.41-14.24-4.69-14.24" transform="translate(-60.79 2.5)"/><path class="cls-8" d="M367.67,422.33c-.24-.33.24-.54-.26-.66-.48,7.73,6.38,11.62,12.85,8.57,5.41-2.54,7.2-11,.74-12.92A11.57,11.57,0,0,0,367.67,422.33Z" transform="translate(-60.79 2.5)"/><path class="cls-12" d="M231,391.5c-3,2.57-14.36,15.14-8,18.65C227.9,412.85,231.23,401.12,231,391.5Z" transform="translate(-60.79 2.5)"/><path class="cls-12" d="M230.5,419c-3.25,2.7-10.29,24.24-2.73,21.27C233.1,438.17,229.89,425.67,230.5,419Z" transform="translate(-60.79 2.5)"/></g><g id="shadows"><g class="cls-3"><polygon class="cls-4" points="161.21 48.46 229.21 34.5 229.19 179.59 354.38 179.59 198.21 202.51 165.27 179 161.71 172.5 161.21 48.46"/></g><g class="cls-3"><path class="cls-4" d="M412.5,180c-9,23.6-18.5,48.61-25.84,72.42a252.61,252.61,0,0,0,28.76,0c.84-14.23.89-28.77,1.08-43C416.62,200.39,413.53,192.41,412.5,180Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M290,251c-10.86,19.34-26.07,40.4-36,61.4,11.67,1.24,25-.47,36.87-1C291,291.92,291.49,272.44,290,251Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><polygon class="cls-4" points="138.57 177.49 78.21 179.59 78.21 315.24 138.57 316.5 138.57 177.49"/></g><g class="cls-3"><polygon class="cls-4" points="19.21 316.5 83.21 324.62 83.21 489.21 16.52 476.5 19.21 316.5"/></g><g class="cls-3"><polygon class="cls-4" points="354.64 254.92 229.21 253.5 229.19 316.5 284.48 316.5 352.71 324.5 352.71 354 354.64 387.5 375.37 390.84 373.21 297.5 354.38 296.75 354.64 254.92"/></g><g class="cls-3"><polygon class="cls-4" points="373.21 297.5 373.21 390.49 499.03 390.84 497.21 418.17 519.23 416.91 535.94 484.5 619.21 484.5 621.21 297.5 535.86 298.09 537.21 150.5 354.38 150.5 354.38 296.75 373.21 297.5"/></g><g class="cls-3"><path class="cls-4" d="M408.5,254.5c-1.72,11.63-.54,23.82-1.84,35.55-.81,7.35-1.51,14.57-1.7,22.27a66,66,0,0,1,17.46-1.74c.89,16.3-1.28,32.82-1.95,49.07-.4,9.85.58,19.49,1.1,29.27,3.85-.45,7.23-1.33,11.34-1.5,6-19.23-.34-41,.59-60.82.14-3-.42-8.29,1.69-10.16,2.33-2.07,11.37-2.31,14.31-2.47,22.9-1.22,45.35-4.54,68-7.48,15-1.94,29.77-6.35,44.85-7,5.65-.24,10.71-.52,16.1-2.13,4.42-1.32,12.76-1.92,15.73-4.76-19.4-3.52-39.12-1.68-58.76-2.1-21.15-.45-42.22,0-63.38,0-13.56,0-27.86,2.62-41.3.54-2.23-.35-4.87-.59-6.85-1.92-3.59-2.41-3.44-5.78-4.67-10.64-1.16-4.63-1.79-24.93-5.74-26.48" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><polygon class="cls-4" points="475.7 2.59 339.21 7.5 339.21 34.5 366.21 34.5 366.21 149.74 475.7 151.07 475.7 2.59"/></g><g class="cls-3"><path class="cls-4" d="M341.85,454.31,502,417.85l38.69,179L375.87,633.72l-10.22-53.87-3-15.57c-1.05-5.55-3.3-11.65-3.17-17.26,3.09,1.72,5.12-1.35,5.72-4.28.92-4.53.23-4.23,5.51-4.25,4.9,0,8.53-2.82,12.31-5.76,4.51-3.52.94-6.64-2-10-4.31-4.86-8.66-5.73-15-6.07,0-9.28-10.17-1.72-12.72-8.82-1.68-4.67-2.19-10.14-3.22-15L343,459.5C342.9,459.23,341.84,454.32,341.85,454.31Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M261.67,345.33c.71-3-1.64-12.36,3.83-12.33,4.53,0,2.93,9.79,2.79,12.95-2.3.13-4.85-.24-7,.72" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M185.67,384.33c-6.22,1.13-9.76-9-10.41-13.68-.87-6.31.63-9.24,5.5-13,.47.32.22.28.4.2.73,3.17-1.09,6.15.92,9.13,1.49,2.22,4.23,2.45,6.3,3.52-1.15-.91-2.45-1.66-2.5-3.15,2,.39,4.4,4.37,6.46,3.11,1.5-.91,1.11-5.52.46-6.75,4.1.69,4.17,4.81,2.71,7.25-2.34,3.9-10.33,10.17-9.43,14.94C186.3,385.68,186.39,385.36,185.67,384.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M246.31,350.72c-1.27,1.27-3.4,2.11-5.06,3.18-3.34,2.15-6.16,5-9.25,7.45a83.09,83.09,0,0,0-12.87,12.81c-6.32,7.81-10.75,19.13-12.07,29.1-1,7.23.18,15.24.94,22.44.89,8.47,1.71,17.31,5.26,25.15,6.2,13.7,14.95,28.54,27.78,37,4.94,3.24,10,7.2,15.71,9,4.31,1.39,8.84,1.24,13.23,2.23-3.06,3.07-9.28,2.33-12.72,5.42-2.88,2.59-2.79,5.92.95,7.19,1.69.58,4.05.24,5.86.63,2.82.61,5.36,1.53,8.3,1.71,3.71.23,7.52,0,11.24,0-4.16,0-8.39-.24-12.26,1.54-3.43,1.58-7,2.52-10.31,4s-5.71,4.56-8.28,6.88c-3.22,2.91-6.67,8-2.12,11.25,3,2.13,10.59,2.31,12.25,6.16,1.73,4-4.14,4.18-6.95,4.75-3.63.74-9,1.22-6.26,5.77,2.29,3.86,5.3,3.53,5.33,8.58,0,3.45-1.43,6.07,1.66,8.07s8,1.95,11.52,2.83A65.85,65.85,0,0,0,285.33,576c3.28,0,9-.88,11.31,1.67-5.49,3.45-15.75,3-22.13,4.33-3.3.67-9.6,1.64-11.55,4.74-1.42,2.26-.69,6.78-.06,9.21,1.12,4.33,5,7,8.11,9.71,7.07,6.19,11.31,14.54,20.31,18.52,7.76,3.43,18,3.45,26.41,3.9,5.7.31,12,.81,17.6-.09,1.3-.21,4.62-.53,5.43-1.89,1.26-2.12-1.19-2.72-1.72-4.68,3.66-2.07,10.79,3,14,4.44,3.72,1.65,7.76,2.41,11.4,4.31,2.53,1.33,5.48,3.6,8.5,3.16a27.55,27.55,0,0,0,.48-13.23c-.43,3.89,3.95,16.67,8.8,14.5.53,2.9.1,5.59-2.72,7-7.7,4-22.12-6.42-28.33-10.84-5.24-3.74-6.78-.89-12.26,1.34s-11.38,3.62-17.24,5.13c-13.27,3.42-27.45,4.4-41.22,3.74-6.22-.3-11.5-2.13-17.13-4.47-2.59-1.07-5.4-1.43-8-2.46-1.61-.64-3.45-2.28-5.33-2.07-2.44.27-4.62,4.29-7,6-4.84,3.47-16.18,13.83-22.49,9s-.22-12.28,3-17.15c2.25-3.4,4.66-6.16,5.47-10.1-7-4.26-11.11-13.77-13.31-21.1-2.79-9.27-6.33-20.47-2.68-29.91-2-.35-6,1.29-7.57-.06s-.53-5.59,0-7.34c.93-3.08,2.16-6.15,3.31-9.15.73-1.92,2.61-5.11,2.37-7.18-.1-.91-1.35-1.87-1.35-2.4,0-2,.85-1.63,1.28-2.93,1.06-3.16.25-6.76-.33-10.16-.71-4.15-2.2-8.09-3.37-12.11-.56-1.91-.78-6.27-2.05-7.67-.93-1-2.91-.38-3.93-1.12-1.66-1.21-1.44-2.7-1.74-4.63-.69-4.47.35-8.63-1.27-12.86-1.95-5.08-5.41-9.49-8.65-13.8-2.05-2.73-4.34-5.08-5.69-8.32-1.9-4.58-2.83-9.51-4.9-14-3.89-8.46-5.68-16.8-6.42-26.21a54,54,0,0,1,8-31.47c3-4.62,4.06-9.85,7.65-14.39,6.72-8.49,11.63-17.25,21.5-22.32C221.14,354.82,233.33,349.9,246.31,350.72Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M273.67,368.33c-1.13-4-10.12,5-11.35,6.5-3.26,3.95-6,6.85-7.91,11.76a50.11,50.11,0,0,0-1.75,31.1c2.35,8.41,7.94,19.78,14.9,25.18,8.52,6.6,20.57,8.32,31.14,7.47,7.79-.62,14.35-5.58,19.9-10.8a50.14,50.14,0,0,0,11.1-16.46c-2,6.48-13.41,14.93-19.84,16.73-7.47,2.09-18.4,4.18-25.55.2-12.48-7-24.38-25.35-15.32-39.27,1.93-3,4.76-6,8-7.44,2.18-1,7.74-1.36,8-4.23-4.36-1.48-9.49.89-13.33-2.77-1.72-1.63-3-5.48-3.35-7.8C267.7,374.2,270,374,273.67,368.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M359.67,386.67c-4.3.06-10.59,3.22-11.17,7.85-.33,2.66.75,9.09,2.09,11.12,2-3.53,2.56-7.41,5.28-10.79,3.21-4,5.34-3.32,10.09-3.56C364.29,386.61,362.59,383.8,359.67,386.67Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M360.33,402.67c-2.91.29-6.34,5.53-7,8.35a16,16,0,0,0,1,8.82c1.31,2.8,4.78,4.71,7,7,2.44,2.46,3.76,5.82,6.19,8.2,4.57,4.46,10.14-.65,11.77-5.29-4.84,1.22-7,2.58-8.76-3.54-1.17-4.17.93-5.16,3.54-7.84,1.11-1.15,3.21-1,1.6-2.67-1.4-1.43-5.15.3-6.75.42-2.58.19-4.06-.07-5.6-2.48C362,411.52,359.72,407.17,360.33,402.67Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M359.67,358.33c-.76.31-6.6,4-6.82,4.65-.49,1.41,2.81,4.23,3.75,5.6,2.32,3.38,6.22,6.22,7.66,10a8,8,0,0,0-.28-1.18,30.47,30.47,0,0,0,2.79,7.56c.88,1.57,3.17,6.14,4.59,7.15,2.35,1.66,3.71-1.5,6.4,1.84,1.45,1.79,3,5.84,2.28,7.93,3.41,1.11,4.83,2.88,7.61,4.73,2.32,1.54,1.94,1.59,4.19-.58,1.35-1.3,3.83-4,4.12-5.72-3.86,1.79-7.87,1.35-10.92-1.69s-6.29-6-9.56-9c-2.79-2.59-5-5-4.83-8.95.13-2.92,2.57-6.66,2-9.33C366.92,372.31,363.62,363.75,359.67,358.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M341,454.67c-4.14,3.75-3.56,16.7-4.66,22.34-.85,4.35-3.51,10.22-3,14.61,4-.2,7.16.24,6.62,4.9-.45,3.82-5.52,4.61-4.63,8.09,2.95,1.11,6.66,1.29,7,5.23.39,5-5.31,1.2-8.28,1.55-1,2.37,5.49,3.72,6.64,4.42s1.78,1.62,3.23,2.23,3.23.49,4.56,1.5c2.28,1.73,1.85,4.47,4.18,6.17,2.35-2.21-.25-7,3-8.41,1.49,1.3.19,3.11,2.35,3.71,3.27.9,2.13-2.54,3.66-3.83,3.18-2.68,2.27,5.63,2.39,7.79,2.19-1.18,3.11-.88,5.36.12,1.51.67,6.09,2.23,6.62,3.59,1.42,3.68-6.64,8.48-8.25,11,2.05,1.28,10.43-3,12.74-4.34a10.33,10.33,0,0,0,4.82-6.82c1.65-7.43-5.83-10.9-12.25-11.55-3.49-.35-3.25.33-5.57-2-3.24-3.23-4.07-2.28-8.2-2.66-1.23-.11-6-.63-6.92-1.32-1.46-1.12-1.27-4.38-1.59-5.86-.75-3.48-2.39-6.71-3.1-10.21-1.46-7.27-1-14.8-2.22-22.12-.81-5.08-2.44-10.34-2.17-15.51" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M350.67,541c-3-.23-6.11.62-9,1.25-3.12.68-3.7.34-3.57,3.08.17,3.43,3.3,4.68,4.94,7.07,1.28,1.87,2.56,5.74,3.23,7.93,1.2,3.91,1.76,8.4-1.57,11.42-3.64,3.3-9.51,1.66-12.73,4.58,1.34,1.83,7.16,1.55,9.67,2.25,3.09.86,6.73,1.93,8.65,4.76,3,4.38,3.42,10.73,6.07,15.46,1.72,3.06,2.83,6,5.24,8.52,3.08,3.27,6.61,6.19,9.69,9.4,1.18-15.4-6.86-29-8.6-43.82-.71-6.11-1.3-12.15-1.6-18.31-.08-1.64.39-4.13-.59-5.22-1.18-1.31-5.14-1.94-6.81-3.7" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M384.67,530c.3,8.5-6.07,13.8-11.35,19.33-3.39,3.55-4.81,8.52-5,13.33-.25,7.06.67,13.93.67,20.93,0,5.53-.81,11.5-.34,16.93,1.65-11.38-.9-24.65-4.25-35.53-1.69-5.47-3.45-11.3-3.69-17,6.54,1.48,5.79-3.28,6-8,2.64-.59,5.35-.85,8-1.37,3.17-.61,6.32-2.67,9.27-3" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M435.35,507.66c-4.24,1.67-9.4-.44-13.87-.81-3.78-.31-7.49-1-11.29-1.06-1.72,0-6.63-1.22-8.09-.41-3.43,1.92,3.15,5.19,5.13,6.06a124.84,124.84,0,0,0,16,6.13c10.08,2.86,22.82,1.09,32.08-3.58,7.21-3.64,10.57-8.8,15.72-14.36-5.8,2.45-10.79,5.86-17.25,6.83A116.77,116.77,0,0,1,435.35,507.66Z" transform="translate(-60.79 2.5)"/></g><g class="cls-3"><path class="cls-4" d="M435,527c-2.45,0-4.91,0-7.33,0-4.11,0-3.83,1.13-.38,2.87,5.4,2.72,21.11,6.84,22.34-3.47-3.72-.21-7.54-.06-11.29-.06" transform="translate(-60.79 2.5)"/></g><g class="cls-13"><path class="cls-8" d="M403.49,349.46c-1.42-2-4.26-1.57-6.78-1.52a3.17,3.17,0,0,0-.93,1.51c-2.56,3,4.57,9.28,6.21,12.51,2.07,4.1.56,13.79,3.3,16.77,6.24,6.81,5.75-10.13,5.15-13.27C409.27,359.45,406.45,355.81,403.49,349.46Z" transform="translate(-60.79 2.5)"/></g><g class="cls-13"><path class="cls-8" d="M322,374c-1.2-3.64-13.68-1.56-7.75,5.24,2.13,2.44,6.18,3.72,8.74,5.76a26,26,0,0,1,7.41,8.5c2,4,2.86,14.65,6.09,17,4.07,3,5.05-1,5.51-4.24.83-5.84-1.21-10.45-3.71-15.46C334.78,383.79,330.24,379.88,322,374Z" transform="translate(-60.79 2.5)"/></g></g><g id="DETAILS"><path class="cls-2" d="M391.56,572.73a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,0,1,.5,1.94l-33.32,8.69A1,1,0,0,1,391.56,572.73Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M398.8,603.88a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.1,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M398.8,603.88a1,1,0,0,1-.24-2c11.3-2.76,24.26-5.85,34.69-7.87a1,1,0,1,1,.38,2c-10.39,2-23.32,5.09-34.6,7.85A1,1,0,0,1,398.8,603.88Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M433.44,596a1,1,0,0,1-.92-.61c-2.65-6.23-4.23-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,0,1,1.92-.57c1.08,3.65,2,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M430.55,564.05a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,0,1,.5,1.94L430.8,564A1,1,0,0,1,430.55,564.05Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M437.79,595.21a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.11,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M437.79,595.21a1,1,0,0,1-.24-2c11.3-2.76,24.26-5.85,34.69-7.87a1,1,0,1,1,.38,2c-10.39,2-23.32,5.09-34.6,7.85A1,1,0,0,1,437.79,595.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M472.43,587.35a1,1,0,0,1-.92-.61c-2.65-6.23-4.24-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,0,1,1.92-.57c1.08,3.65,1.95,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M469.54,555.13a1,1,0,0,1-.25-2l33.32-8.69a1,1,0,1,1,.5,1.94l-33.32,8.69A1,1,0,0,1,469.54,555.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M476.78,586.28a1,1,0,0,1-.93-.63c-4.16-10.56-5.82-20.87-7.3-31.38a1,1,0,1,1,2-.28c1.46,10.39,3.11,20.57,7.18,30.93a1,1,0,0,1-.93,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M476.78,586.28a1,1,0,0,1-.24-2c11.31-2.76,24.27-5.86,34.69-7.87a1,1,0,0,1,.38,2c-10.38,2-23.31,5.09-34.6,7.85A1,1,0,0,1,476.78,586.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M511.42,578.43a1,1,0,0,1-.92-.61c-2.65-6.23-4.23-13.44-5.76-20.4-.92-4.17-1.78-8.11-2.84-11.69a1,1,0,1,1,1.92-.57c1.08,3.65,1.95,7.62,2.87,11.83,1.51,6.88,3.07,14,5.65,20a1,1,0,0,1-.92,1.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M411,594.15a1,1,0,0,1-1-.75,147.58,147.58,0,0,1-3-14.59,1,1,0,0,1,2-.3,146,146,0,0,0,2.94,14.39,1,1,0,0,1-1,1.25Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M404.8,579.33a.31.31,0,0,0,0,.19c0,.18.32.13.49,0a15.4,15.4,0,0,1,5.9-1.86,13.93,13.93,0,0,1-2.23-2.31c-.38-.46-1.53-2.3-2.17-2.28-.82,0-.82,2.22-.95,2.8A23.77,23.77,0,0,1,404.8,579.33Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M417.37,592.77a1,1,0,0,1-1-.75,147.58,147.58,0,0,1-3-14.59,1,1,0,0,1,2-.3,146,146,0,0,0,2.94,14.39,1,1,0,0,1-1,1.25Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M411.2,578a.31.31,0,0,0,0,.19c0,.18.32.13.49,0a15.4,15.4,0,0,1,5.9-1.86,13.93,13.93,0,0,1-2.23-2.31c-.38-.46-1.53-2.3-2.17-2.28-.82,0-.82,2.22-.95,2.8A23.77,23.77,0,0,1,411.2,578Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M408.18,597.66a1,1,0,0,1-.14-2,113.17,113.17,0,0,0,12.62-2.59,1,1,0,0,1,.51,1.93,115.38,115.38,0,0,1-12.84,2.63Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M455.14,587.53l-.29,0a3,3,0,0,1-2.33-2.1,16.6,16.6,0,0,1-.68-2l-2.24-7.76a1,1,0,1,1,1.92-.55l2.24,7.76a14.83,14.83,0,0,0,.59,1.77c.22.52.52.88.75.91a.8.8,0,0,0,.62-.44,4.3,4.3,0,0,0,.38-1.52,1,1,0,0,1,2,.26,6,6,0,0,1-.64,2.26A2.74,2.74,0,0,1,455.14,587.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M443.83,577.65a1.81,1.81,0,0,1-1.5-.64c-.86-1.07,0-2.7.28-3.23a9.06,9.06,0,0,1,5.24-4.79,13.43,13.43,0,0,1,5.21-.59,7.57,7.57,0,0,1,4.56,1.92c.75.55,2.14,1.58,2.24,3.18a1,1,0,0,1-.77,1c-3.13.75-6.31,1.44-9.45,2.06-.59.12-1.19.21-1.79.31a28,28,0,0,0-2.87.56A4.39,4.39,0,0,1,443.83,577.65Zm8.13-7.28a10.64,10.64,0,0,0-3.46.52,7.11,7.11,0,0,0-4.12,3.83,4.21,4.21,0,0,0-.38.92,3.18,3.18,0,0,0,.45-.09,29.36,29.36,0,0,1,3.08-.61c.58-.09,1.15-.18,1.72-.3,2.74-.54,5.51-1.14,8.25-1.78a6.36,6.36,0,0,0-1.07-.93,5.68,5.68,0,0,0-3.49-1.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M449.68,569.86a1,1,0,0,1-.95-.68l-.65-1.95a1,1,0,1,1,1.89-.64l.66,2a1,1,0,0,1-.95,1.32Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M487.63,569.34a7.54,7.54,0,0,1-2.89-.62,4.08,4.08,0,0,1-1.66-1.15,4.62,4.62,0,0,1-.81-2l-1.89-9.07a1,1,0,0,1,2-.41l1.89,9.07a3,3,0,0,0,.41,1.2,2.27,2.27,0,0,0,.87.55,5.12,5.12,0,0,0,2.67.42,2.93,2.93,0,0,0,2-1.2c.79-1.21.35-3-.12-4.65L488.21,555a1,1,0,0,1,1.92-.56l1.89,6.42c.6,2,1.14,4.39-.12,6.31a4.88,4.88,0,0,1-3.42,2.08A5.85,5.85,0,0,1,487.63,569.34Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M481.41,557a1,1,0,0,1-.38-1.93,10,10,0,0,1,2.29-.55l5.71-.89a1,1,0,1,1,.31,2l-5.71.89a8.28,8.28,0,0,0-1.84.43A1,1,0,0,1,481.41,557Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.11,579a1,1,0,0,1-1-.73c-.84-3-1.53-6.16-2.07-9.27a1,1,0,0,1,2-.34c.53,3,1.21,6.1,2,9.07a1,1,0,0,1-1,1.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M486.73,580.72a1,1,0,0,1-.4-1.92,11.07,11.07,0,0,1,2.91-.69l.95-.14a13.12,13.12,0,0,0,2.83-.84,1,1,0,1,1,.78,1.84,15.09,15.09,0,0,1-3.26,1l-1,.16a9.4,9.4,0,0,0-2.39.54A1,1,0,0,1,486.73,580.72Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M539.23,438.62h-.05a1,1,0,0,1-.92-.76,100.06,100.06,0,0,1-2.75-19.47,1,1,0,1,1,2-.08,98.07,98.07,0,0,0,2.08,16.38q.29-.45.62-.87a1,1,0,0,1,1.55,0,3,3,0,0,0,1.45,1.13.67.67,0,0,0,.6-.23,1,1,0,0,1,1.91-.48.66.66,0,0,0,.78.29,2.38,2.38,0,0,0,.25-.15,2.75,2.75,0,0,1,1-.43,2.79,2.79,0,0,1,1.72.3l.35.14h.05a1,1,0,0,1,1.57-.38,4,4,0,0,0,1.15.68c-1.13-6.06-2.51-12.14-4.09-18.09a1,1,0,1,1,1.93-.51c1.72,6.47,3.2,13.1,4.39,19.69a1,1,0,0,1-.23.83.94.94,0,0,1-.79.34,6.06,6.06,0,0,1-2.82-.83,2.28,2.28,0,0,1-1.79.15c-.17-.06-.34-.13-.52-.2a2,2,0,0,0-.52-.18,1.72,1.72,0,0,0-.28.16,4.4,4.4,0,0,1-.47.27,2.6,2.6,0,0,1-2,.06l-.29-.12,0,0a2.66,2.66,0,0,1-2.24.61,3.67,3.67,0,0,1-1.69-.87,10.64,10.64,0,0,0-.95,2A1,1,0,0,1,539.23,438.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M413.45,463.26a1,1,0,0,1-.8-.4c-1.36-1.8-1.36-4.11-1.36-6.14v-.54a34.58,34.58,0,0,0-3.39-14.73,1,1,0,1,1,1.8-.87,36.62,36.62,0,0,1,3.59,15.59v.55a13.41,13.41,0,0,0,.31,3.6l.66-.92a1,1,0,0,1,1.67.06.37.37,0,0,0,.31.11.38.38,0,0,0,.31-.12l.07-.15a2.15,2.15,0,0,1,.55-.8c1.06-.91,2.17-.05,2.7.36a3.14,3.14,0,0,0,.62.41.21.21,0,0,0,.19,0,3,3,0,0,0,1-1.69,1,1,0,0,1,1.81-.24,2,2,0,0,0,3.34-.39,1,1,0,0,1,1.69-.34,3.62,3.62,0,0,0,2.06,1.31.43.43,0,0,0,.31-.13,2.09,2.09,0,0,0,.27-.51,4.56,4.56,0,0,1,.43-.81,2.72,2.72,0,0,1,2.6-1.06,3,3,0,0,1,1.39.55l.45-.45a1,1,0,0,1,1.59.25.43.43,0,0,0,.78-.35,1,1,0,0,1,1.77-.91,2.4,2.4,0,0,0,.38.45l-1.72-21.17a1,1,0,0,1,2-.16l1.86,22.86a1,1,0,0,1-1.15,1.07A4.46,4.46,0,0,1,440,457a2.36,2.36,0,0,1-.95.8,2.48,2.48,0,0,1-2.26-.15l-.54.54a1,1,0,0,1-1.64-.35.78.78,0,0,0-.64-.4.79.79,0,0,0-.72.23,3,3,0,0,0-.23.46,3.62,3.62,0,0,1-.64,1.07,2.39,2.39,0,0,1-1.79.77,4.43,4.43,0,0,1-2.59-1.09,4,4,0,0,1-2.48,1.18,4.09,4.09,0,0,1-2.49-.47,3.7,3.7,0,0,1-1.47,1.51,2.18,2.18,0,0,1-1.77.1,4.43,4.43,0,0,1-1.15-.7l-.26-.2-.09.18a2.34,2.34,0,0,1-2,1.14,2.22,2.22,0,0,1-1-.18l-1,1.45a1,1,0,0,1-.8.42Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M568,334.05a2,2,0,0,1-1.63-.84q-.62-.86-1.14-1.78a2.62,2.62,0,0,1-1.57.53,3.26,3.26,0,0,1-2.43-1.15l-.8-.81a3.77,3.77,0,0,1-4.27.95,4,4,0,0,1-1.4-1.09l-.28.46a2.83,2.83,0,0,1-4.34.92l-1.78-1.15a13.94,13.94,0,0,1-1.61,1.75,2,2,0,0,1-3.34-1.73,114.37,114.37,0,0,0,.86-19.86c0-.71-.07-1.42-.11-2.13a46.28,46.28,0,0,1,.41-11.9,2,2,0,0,1,3.92.81,42.57,42.57,0,0,0-.33,10.87c0,.72.08,1.45.11,2.17a118.36,118.36,0,0,1-.32,15.26,2,2,0,0,1,.92.31l2.7,1.75,1.05-1.76a2,2,0,0,1,1.89-1,4,4,0,0,1,3,2.11l.21.31a4.35,4.35,0,0,0,.77-1.08,2,2,0,0,1,3.2-.48l1.59,1.62a2.92,2.92,0,0,1,2.11-1.48,2,2,0,0,1,1.14.17c.08-3.24-.09-6.52-.25-9.73-.35-7-.71-14.15,1.29-21.07a2,2,0,1,1,3.84,1.11c-1.81,6.28-1.48,12.83-1.13,19.77.27,5.39.55,11-.26,16.43a2,2,0,0,1-2,1.71Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M723.53,328.85a2,2,0,0,1-1.7-.94h0a3.37,3.37,0,0,1-1.62.17,3.55,3.55,0,0,1-1.3-.46,2,2,0,0,1-1.19.4,2,2,0,0,1-1.59-.77,4.51,4.51,0,0,0-1.65-1.3,8.46,8.46,0,0,1-2.29,2.39,2,2,0,0,1-3.14-1.52,48.11,48.11,0,0,1,.34-7.82c.06-.61.12-1.22.17-1.83a90.75,90.75,0,0,0-.81-22.43,2,2,0,0,1,3.95-.64,94.8,94.8,0,0,1,.84,23.42c-.06.62-.12,1.25-.18,1.87s-.15,1.48-.21,2.21a2,2,0,0,1,.52,0,8.49,8.49,0,0,1,3.76,1.46,3.43,3.43,0,0,0,4.1-.29h0c.07-9.84.45-19.76,1.14-29.55a2,2,0,0,1,4,.28c-.78,11.06-1.17,22.29-1.15,33.37a2,2,0,0,1-2,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M637.16,177a2,2,0,0,1-2-2.4,143.33,143.33,0,0,0,2.81-24,2,2,0,0,1,4,.13,147.05,147.05,0,0,1-1.22,14.67,2.79,2.79,0,0,1,2.14,1.26l1.59,2.13a3.5,3.5,0,0,1,.5-.66,3.06,3.06,0,0,1,4.17-.17l.15-.26a2,2,0,0,1,1.79-1,2,2,0,0,1,1.73,1.1q.29.58.56,1.17l1.26-1.74a2.6,2.6,0,0,1,2.63-1.2,63.58,63.58,0,0,0,2.49-16.74,2,2,0,0,1,2-2h0a2,2,0,0,1,2,2,67.58,67.58,0,0,1-4,22,2,2,0,0,1-2,1.32,2,2,0,0,1-1.54-.82l-1.84,2.54a3.31,3.31,0,0,0-4.89.84,2,2,0,0,1-1.91-.57l-.1-.11a3.58,3.58,0,0,1-.21.34,2,2,0,0,1-1.61.85,2.09,2.09,0,0,1-1.63-.81l-3-4.05L639,175.74A2,2,0,0,1,637.16,177Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M578.34,48.08a2,2,0,0,1-1-.25,5.11,5.11,0,0,1-2.11-2.27,3,3,0,0,1-1.94-.21,3.58,3.58,0,0,1-1.52-1.43,2,2,0,0,1-3.17-.08L568,43a18.65,18.65,0,0,0-.65,2.92,2,2,0,0,1-4-.28q0-18.63,0-37.26a2,2,0,0,1,2-2h0a2,2,0,0,1,2,2q0,14.29,0,28.57h0a2,2,0,0,1,1.76.82l.71,1q.19-.25.41-.48a2,2,0,0,1,3.22.4l1,1.85a2,2,0,0,1,1.76-1.37c-.05-9.67.38-19.39,1.28-29a2,2,0,1,1,4,.38A288.91,288.91,0,0,0,580.34,46a2,2,0,0,1-2,2.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M341.35,72.24a2,2,0,0,1-2-2.07c.46-12.23,1.44-24.6,2.91-36.75a2,2,0,1,1,4,.48c-1,8.09-1.74,16.27-2.27,24.44a2,2,0,0,1,2.25-.33,11,11,0,0,1,2.36,1.58l.3-.64a2,2,0,0,1,3.7.19l.48,1.37a3.47,3.47,0,0,1,2.3-1.8,2,2,0,0,1,1.66.4l.16.15.08-.15a2,2,0,0,1,2.43-.89q.18-.64.32-1.28a2,2,0,0,1,3.93.11q0,.25.09.51a2,2,0,0,1,2-1.12l2.38-24.32a2,2,0,0,1,4,.39l-3.12,31.83a2,2,0,0,1-3.57,1,8.93,8.93,0,0,1-.56-.81,2,2,0,0,1-3-.59l-.26-.48q-.31.63-.65,1.25a9.33,9.33,0,0,0-4.17,1,2,2,0,0,1-1.71-.68l-.2-.24a3.67,3.67,0,0,1-1.7,1.06,2.83,2.83,0,0,1-2.46-.47,2.94,2.94,0,0,1-.64-.68,2,2,0,0,1-3.08-.44,6.92,6.92,0,0,0-.75-1,31,31,0,0,1-3.55,8A2,2,0,0,1,341.35,72.24Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M250.94,60a2,2,0,0,1-2-1.71L246.6,42.31a2,2,0,1,1,4-.58L252,51.65a2,2,0,0,1,1.31.75l.35.44a2,2,0,0,1,2.52.09,3.33,3.33,0,0,1,.47.5,2.46,2.46,0,0,1,.74-.33,2,2,0,0,1,1,0,2,2,0,0,1,1.21-.66c.05-4.25.07-8.52,0-12.75a2,2,0,0,1,2-2,2,2,0,0,1,2,2c0,5.9,0,11.88-.12,17.78a2,2,0,0,1-3,1.67,5.14,5.14,0,0,1-.61-.43,2,2,0,0,1-2.39-.14,2.66,2.66,0,0,1-1.36.08A3.1,3.1,0,0,1,255,58.1a2,2,0,0,1-1.1.3,2,2,0,0,1-1-.27,2,2,0,0,1-1.82,1.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.36,215.29h-.1a2,2,0,0,1-1.83-1.51c0-.09-.06-.22-.1-.37a2,2,0,0,1-2.54-.55,5.77,5.77,0,0,1-.38-.57,1.5,1.5,0,0,0-2,.7,2.42,2.42,0,0,1-2.31-1.24,3.3,3.3,0,0,1-.73.66,3.23,3.23,0,0,1-2.57.42,3.9,3.9,0,0,1-1.72-.94L326,212a7.25,7.25,0,0,0-3.9.33,2,2,0,0,1-1.52-.63q-.69-.73-1.3-1.52l-.78,1.1a2,2,0,0,1-3.63-1,286.61,286.61,0,0,1-.45-32.05,2,2,0,0,1,2.08-1.91,2,2,0,0,1,1.91,2.08c-.37,8.76-.33,17.62.13,26.4a2,2,0,0,1,2.54.87q.33.6.71,1.16a13.67,13.67,0,0,0,5.52-1.38,2,2,0,0,1,1.48,2v.13a3.09,3.09,0,0,1,3.68-1.4,2.81,2.81,0,0,1,.86.51l.5-1a2,2,0,0,1,3.78.82l0,.35a2,2,0,0,1,1,2,3.47,3.47,0,0,1,.74.11,50.87,50.87,0,0,0,.36-7.37v-.84a208.41,208.41,0,0,1,1.46-24.08,2,2,0,1,1,4,.47,204.43,204.43,0,0,0-1.43,23.61v.84c0,4.07,0,8.28-1.47,12.29A2,2,0,0,1,340.36,215.29Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.18,290.76a2.88,2.88,0,0,1-2.64-1.93,2,2,0,0,1-2.78-.7l-.18.21a2,2,0,0,1-3.18-.19q-.27-.4-.56-.78a16.48,16.48,0,0,0-.57,1.72,2,2,0,0,1-3.93-.47l-1-34.89a2,2,0,1,1,4-.12l.84,28.28a2,2,0,0,1,1.56.52q.68.62,1.29,1.31.2-.34.38-.69A2,2,0,0,1,383.1,282a2,2,0,0,1,1.77,1l.06.11a2,2,0,0,1,3.53.81l.19.87.92-1.57a2,2,0,0,1,3.72.89q0,.2,0,.39l.06,0c1.1-7.19,2-14.54,1.41-21.78,0-.57-.1-1.13-.16-1.7a28.16,28.16,0,0,1,0-7.76,2,2,0,1,1,3.94.7,24.78,24.78,0,0,0,.07,6.67c.06.59.12,1.18.16,1.76.73,8.92-.66,17.76-2,26.32a4,4,0,0,1-6.32.89,2.86,2.86,0,0,1-1.82,1.19A2.66,2.66,0,0,1,388.18,290.76Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M176,215.44a2,2,0,0,1-1.12-.34,8,8,0,0,1-1.65-1.5l-.06.07a2,2,0,0,1-3,.23q-.18-.17-.35-.36a2,2,0,0,1-2.12-.32q-.42-.37-.82-.77l0,.15a2,2,0,0,1-3.94-.14,198.32,198.32,0,0,1-1.3-35.58,2,2,0,1,1,4,.21,194.37,194.37,0,0,0,.65,29.33h.13a2,2,0,0,1,1.72,1,10,10,0,0,0,.56.9l.19-.32a2,2,0,0,1,3.55.21,2,2,0,0,1,2.92.93,2,2,0,0,1,.22-.25,104.51,104.51,0,0,0-.31-12.64c-.42-6.48-.85-13.19.58-19.75a2,2,0,1,1,3.91.85c-1.31,6-.92,12.15-.5,18.64a89.68,89.68,0,0,1,.08,15.77,2,2,0,0,1-1.27,1.64l-.2.61a2,2,0,0,1-1.9,1.38Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M105.57,354.11a2,2,0,0,1-2-2.32,82.63,82.63,0,0,0,.84-19.26c-.09-1.22-.21-2.43-.32-3.65a61.71,61.71,0,0,1-.39-10.8,2,2,0,1,1,4,.32,57.8,57.8,0,0,0,.39,10.1c.12,1.25.24,2.49.33,3.74a86.64,86.64,0,0,1,0,13.21l.17.05a2,2,0,0,1,1.25,1.26,2,2,0,0,1,3.41-.55,2,2,0,0,1,2.72-.39c-.92-8.6.7-17.35,2.13-25.16a2,2,0,0,1,3.93.72c-1.59,8.64-3.24,17.58-1.78,26.27.41,2.42-.13,4.09-1.6,4.95a2,2,0,0,1-2.71-.67,2,2,0,0,1-1.35-.21,2,2,0,0,1-2.37-.24l-.42-.4a3.82,3.82,0,0,1-2.09.58,3.71,3.71,0,0,1-1.5-.36l-.84,1.69A2,2,0,0,1,105.57,354.11Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M312.16,134.92a.81.81,0,0,1,0-1.62L340,133a.83.83,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M311.72,160.82a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.81.81,0,0,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.48,161.46h0c-8.56-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340.48,161.46a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,1.62-.07c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M344.5,135.77a.81.81,0,0,1,0-1.62l27.89-.27a.81.81,0,1,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M344.06,161.67a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.81.81,0,0,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372.82,162.31h0c-8.55-.47-19.32-.58-28.72-.64a.81.81,0,0,1-.81-.81.8.8,0,0,1,.81-.81c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372.82,162.31a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.8.8,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.88,136.43a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.44,162.33a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.81.81,0,1,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M405.21,163h0c-8.57-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.41.05,20.2.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M405.21,163a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.84.84,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M323.19,155.57a.81.81,0,0,1-.81-.8,119.45,119.45,0,0,1,.53-12,.81.81,0,1,1,1.61.15,117.78,117.78,0,0,0-.52,11.88.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M321.06,142.69a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,321.06,142.69Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M328.49,155.74a.81.81,0,0,1-.81-.8,119.74,119.74,0,0,1,.53-12,.81.81,0,1,1,1.61.15,118.08,118.08,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M326.36,142.86a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,326.36,142.86Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M359.46,159.08a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.4,13.4,0,0,1-.14-1.71L357,148.6a.81.81,0,1,1,1.62-.06l.24,6.54a12,12,0,0,0,.12,1.51c.07.45.23.79.41.86a.65.65,0,0,0,.57-.23,3.52,3.52,0,0,0,.6-1.12.81.81,0,1,1,1.5.6,4.84,4.84,0,0,1-.94,1.65A2.32,2.32,0,0,1,359.46,159.08Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M364.67,149.6h0c-2.6,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a22.82,22.82,0,0,0-2.37-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.84,10.84,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,364.67,149.6Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.56.19,6.83.22a5.18,5.18,0,0,0-.66-.94,4.6,4.6,0,0,0-2.44-1.89,9.3,9.3,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.41,3.41,0,0,0-.48.65,2.61,2.61,0,0,0,.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M358.38,144.1a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.61-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M389.22,151.27l-.45,0a5.75,5.75,0,0,1-2.82-1.17,3.27,3.27,0,0,1-1.08-1.23,3.75,3.75,0,0,1-.23-1.76l.3-7.5a.82.82,0,0,1,.84-.78.81.81,0,0,1,.78.84l-.3,7.49a2.47,2.47,0,0,0,.09,1,1.72,1.72,0,0,0,.57.6,4.14,4.14,0,0,0,2,.86,2.37,2.37,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,1,1,1.62-.07l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,389.22,151.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M392.22,140.66h-.07l-4.66-.42a6.73,6.73,0,0,0-1.53,0,.81.81,0,0,1-.23-1.6,8.12,8.12,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.35,159.23a.81.81,0,0,1-.81-.79c-.06-2.56,0-5.14.2-7.69a.81.81,0,0,1,1.62.12c-.19,2.49-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M389.16,160.06q-.43,0-.86,0l-.83-.08a7.63,7.63,0,0,0-2,0,.81.81,0,0,1-.26-1.6,8.9,8.9,0,0,1,2.41,0l.78.07a10.65,10.65,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.24,12.24,0,0,1,389.16,160.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M436.16,110.93a.81.81,0,0,1,0-1.62L464,109a.85.85,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M435.72,136.83a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M464.49,137.47h0c-8.55-.47-19.32-.58-28.73-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M464.48,137.47a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75A.81.81,0,0,1,464,109a.84.84,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M468.5,111.78a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M468.06,137.69a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M496.82,138.33h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M496.82,138.33a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M500.89,112.44a.81.81,0,0,1,0-1.62l27.89-.27a.84.84,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M500.45,138.34a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M529.21,139h0c-8.55-.47-19.32-.59-28.73-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.22.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M529.21,139a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M447.2,131.58a.81.81,0,0,1-.81-.8,119.88,119.88,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.36,118.36,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M445.07,118.7a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,445.07,118.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M452.5,131.76a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M450.37,118.88a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,450.37,118.88Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M483.46,135.1a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.51,13.51,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78l.24,6.54a12.11,12.11,0,0,0,.12,1.51c.08.45.24.79.41.86a.64.64,0,0,0,.57-.23,3.54,3.54,0,0,0,.6-1.12.81.81,0,1,1,1.5.6,4.78,4.78,0,0,1-.94,1.65A2.32,2.32,0,0,1,483.46,135.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M488.68,125.61h0c-2.61,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a21.9,21.9,0,0,0-2.37-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.85,10.85,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,488.68,125.61Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.55.19,6.83.22a5.15,5.15,0,0,0-.66-.94,4.59,4.59,0,0,0-2.44-1.89,9.34,9.34,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.38,3.38,0,0,0-.48.65l.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M482.39,120.11a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.62-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M513.23,127.28l-.45,0a5.74,5.74,0,0,1-2.82-1.17,3.27,3.27,0,0,1-1.08-1.23,3.76,3.76,0,0,1-.23-1.76l.3-7.5a.85.85,0,0,1,.84-.78.81.81,0,0,1,.78.84l-.3,7.49a2.48,2.48,0,0,0,.09,1,1.84,1.84,0,0,0,.57.6,4.14,4.14,0,0,0,2,.86,2.39,2.39,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,.78-.84.8.8,0,0,1,.84.78l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,513.23,127.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M516.23,116.68h-.07l-4.66-.42a6.78,6.78,0,0,0-1.53,0,.81.81,0,1,1-.23-1.6,8.16,8.16,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M512.36,135.24a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.14.2-7.69a.82.82,0,0,1,.87-.75.81.81,0,0,1,.75.87c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M513.16,136.07q-.43,0-.86,0l-.83-.08a7.66,7.66,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.62,10.62,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.27,12.27,0,0,1,513.16,136.07Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.5,258.07a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M490.06,284a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M518.83,284.61h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M518.83,284.61a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M522.84,258.92a.81.81,0,0,1,0-1.62l27.89-.27a.79.79,0,0,1,.82.8.81.81,0,0,1-.8.82l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M522.4,284.82a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.55.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M551.17,285.46h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M551.17,285.46a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.74a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M555.23,259.58a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M554.79,285.48a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M583.56,286.12h0c-8.55-.47-19.32-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M583.55,286.12a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M501.54,278.72a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M499.41,265.84a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,499.41,265.84Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M506.84,278.89a.81.81,0,0,1-.81-.8,119.9,119.9,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.39,118.39,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M504.71,266a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,504.71,266Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M537.81,282.23a1.86,1.86,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.51,13.51,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78l.24,6.54a12.11,12.11,0,0,0,.12,1.51c.08.45.24.79.41.86a.65.65,0,0,0,.57-.23,3.49,3.49,0,0,0,.6-1.12.81.81,0,1,1,1.51.6,4.85,4.85,0,0,1-.94,1.65A2.32,2.32,0,0,1,537.81,282.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M543,272.75h0c-2.6,0-5.24-.11-7.83-.24-.48,0-1-.07-1.46-.11a23.26,23.26,0,0,0-2.38-.12c-1,0-1.7-.28-2-.89-.46-1,.53-2.12.86-2.48a7.33,7.33,0,0,1,5.06-2.73,10.88,10.88,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.76,3.76,0,0,1,1.13,2.94A.81.81,0,0,1,543,272.75Zm-11.45-2.09c.77,0,1.54.07,2.28.13.47,0,.94.08,1.4.1,2.26.11,4.55.19,6.83.22a5.25,5.25,0,0,0-.66-.94,4.6,4.6,0,0,0-2.44-1.89,9.31,9.31,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.47,3.47,0,0,0-.48.65,2.52,2.52,0,0,0,.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M536.73,267.24a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,1.62-.13l.13,1.66a.81.81,0,0,1-.74.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567.57,274.42l-.45,0a5.76,5.76,0,0,1-2.82-1.17,3.26,3.26,0,0,1-1.08-1.23,3.8,3.8,0,0,1-.23-1.76l.3-7.49a.81.81,0,0,1,.81-.78h0a.81.81,0,0,1,.78.84l-.3,7.49a2.49,2.49,0,0,0,.09,1,1.85,1.85,0,0,0,.57.6,4.15,4.15,0,0,0,2,.86,2.37,2.37,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,1.62-.07l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,567.57,274.42Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M570.57,263.81h-.07l-4.66-.42a6.7,6.7,0,0,0-1.53,0,.81.81,0,1,1-.23-1.6,8.16,8.16,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M566.7,282.37a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.13.2-7.69a.82.82,0,0,1,.87-.75.81.81,0,0,1,.75.87c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567.51,283.21q-.43,0-.86,0l-.83-.08a7.59,7.59,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.58,10.58,0,0,0,2.38-.1.81.81,0,0,1,.25,1.6A12.27,12.27,0,0,1,567.51,283.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M587.27,441.82a.81.81,0,0,1,0-1.62l23.12-.22a.81.81,0,1,1,0,1.62l-23.12.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M610.83,468.41h0c-5.06-.28-11.42-.46-19.44-.56a.81.81,0,0,1,0-1.62h0c8,.1,14.43.28,19.51.56a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M610.82,468.41a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M614.84,442.72a.81.81,0,0,1,0-1.62l27.89-.27h0a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M614.4,468.62a.81.81,0,0,1-.8-.71c-1.19-9.12-.47-17.54.44-26.09a.8.8,0,0,1,.89-.72.81.81,0,0,1,.72.89c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M643.17,469.26h0c-8.55-.47-19.32-.58-28.72-.64a.81.81,0,0,1,0-1.62h0c9.42.05,20.21.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M643.16,469.26a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.86.86,0,0,1,.84.78c.13,3.08,0,6.37-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M647.23,443.38a.81.81,0,0,1,0-1.62l27.89-.27a.81.81,0,0,1,0,1.62l-27.89.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.79,469.28a.81.81,0,0,1-.8-.71c-1.19-9.11-.47-17.54.44-26.09a.81.81,0,1,1,1.61.17c-.9,8.45-1.61,16.77-.44,25.71a.81.81,0,0,1-.7.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M675.55,469.92h0c-8.57-.47-19.33-.59-28.72-.64a.81.81,0,0,1,0-1.62h0c9.41.05,20.2.17,28.8.64a.81.81,0,0,1,0,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M675.55,469.92a.81.81,0,0,1-.8-.68c-.86-5.42-.68-11.39-.52-17.16.1-3.46.2-6.72.07-9.75a.81.81,0,0,1,.78-.84.85.85,0,0,1,.84.78c.13,3.08,0,6.38-.07,9.86-.17,5.7-.34,11.59.5,16.86a.81.81,0,0,1-.67.93Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M593.54,462.51a.81.81,0,0,1-.81-.8,119.92,119.92,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.4,118.4,0,0,0-.52,11.89.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M591.41,449.64a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,591.41,449.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M598.84,462.69a.81.81,0,0,1-.81-.8,119.87,119.87,0,0,1,.53-12,.81.81,0,0,1,1.61.15,118.37,118.37,0,0,0-.52,11.88.81.81,0,0,1-.8.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M596.71,449.81a.25.25,0,0,0-.06.14c0,.15.23.16.38.12a12.47,12.47,0,0,1,5-.3,11.28,11.28,0,0,1-1.29-2.25c-.21-.43-.75-2.1-1.26-2.22s-1.08,1.58-1.29,2A19.26,19.26,0,0,1,596.71,449.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M629.8,466a1.87,1.87,0,0,1-.68-.13,2.44,2.44,0,0,1-1.42-2.11,13.55,13.55,0,0,1-.14-1.71l-.24-6.54a.81.81,0,0,1,.78-.84.84.84,0,0,1,.84.78l.24,6.54a11.94,11.94,0,0,0,.12,1.51c.07.45.24.79.41.86a.64.64,0,0,0,.57-.23,3.49,3.49,0,0,0,.6-1.12.81.81,0,0,1,1.51.6,4.82,4.82,0,0,1-.94,1.65A2.32,2.32,0,0,1,629.8,466Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M635,456.54h0c-2.59,0-5.23-.11-7.83-.24-.48,0-1-.07-1.47-.11-.79-.07-1.6-.13-2.37-.12-1,0-1.71-.28-2-.89-.46-1,.53-2.12.86-2.48a7.32,7.32,0,0,1,5.06-2.73,10.87,10.87,0,0,1,4.21.56,6.13,6.13,0,0,1,3.2,2.4,3.77,3.77,0,0,1,1.13,2.94A.81.81,0,0,1,635,456.54Zm-11.45-2.09c.76,0,1.53.07,2.28.13.47,0,.94.08,1.41.1,2.27.11,4.56.19,6.83.22a5.12,5.12,0,0,0-.66-.94,4.59,4.59,0,0,0-2.44-1.89,9.45,9.45,0,0,0-3.58-.49,5.76,5.76,0,0,0-4,2.2,3.43,3.43,0,0,0-.48.65l.37,0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M628.73,451a.81.81,0,0,1-.81-.75l-.13-1.66a.81.81,0,0,1,.74-.87.8.8,0,0,1,.87.74l.13,1.66a.81.81,0,0,1-.75.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M659.57,458.22l-.45,0A5.76,5.76,0,0,1,656.3,457a3.27,3.27,0,0,1-1.08-1.23A3.76,3.76,0,0,1,655,454l.3-7.49a.81.81,0,0,1,.81-.78h0a.81.81,0,0,1,.78.84l-.3,7.49a2.51,2.51,0,0,0,.09,1,1.72,1.72,0,0,0,.57.6,4.16,4.16,0,0,0,2,.86,2.39,2.39,0,0,0,1.83-.54c.86-.8.88-2.32.82-3.68l-.22-5.41a.81.81,0,0,1,.78-.84.83.83,0,0,1,.84.78l.22,5.41c.07,1.72,0,3.67-1.34,4.94A3.88,3.88,0,0,1,659.57,458.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M662.57,447.61h-.07l-4.66-.42a6.67,6.67,0,0,0-1.53,0,.81.81,0,0,1-.23-1.6,8,8,0,0,1,1.91,0l4.66.42a.81.81,0,0,1-.07,1.62Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M658.7,466.17a.81.81,0,0,1-.81-.79c-.06-2.55,0-5.14.2-7.69a.81.81,0,1,1,1.62.12c-.19,2.5-.25,5-.19,7.53a.81.81,0,0,1-.79.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M659.5,467c-.29,0-.57,0-.86,0l-.83-.08a7.66,7.66,0,0,0-2,0,.81.81,0,1,1-.26-1.6,9,9,0,0,1,2.42,0l.77.07a10.54,10.54,0,0,0,2.38-.1.81.81,0,1,1,.25,1.6A12.16,12.16,0,0,1,659.5,467Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M649.15,174.82a1.5,1.5,0,0,1-1.06-2.56l1.28-1.28a1.5,1.5,0,0,1,2.12,2.12l-1.29,1.28A1.5,1.5,0,0,1,649.15,174.82Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.76,297.47a1.91,1.91,0,0,1-.54-.08c-.46-.14-2-.78-1.73-3.32a821.6,821.6,0,0,0,2-121.16,1.5,1.5,0,1,1,3-.17,824.54,824.54,0,0,1-1.89,120.89,1.64,1.64,0,0,1,.42.25,2.14,2.14,0,0,1,.42,2.58A1.82,1.82,0,0,1,646.76,297.47Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M720.11,472.24h0a1.5,1.5,0,0,1-1.49-1.51c.17-47.52-.5-95.68-2-143.15a1.5,1.5,0,0,1,1.45-1.55,1.48,1.48,0,0,1,1.55,1.45c1.5,47.5,2.17,95.7,2,143.26A1.5,1.5,0,0,1,720.11,472.24Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M580,590.51c-.85,0-2.61-.4-3.33-3.53l-34.2-149.63a1.5,1.5,0,0,1,2.92-.67L579.55,586a1.76,1.76,0,0,1,1.05,0,2.53,2.53,0,0,1,1.49,2.71,2,2,0,0,1-1.94,1.81Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M509.61,417.68a1.5,1.5,0,0,1-1.49-1.35c-.91-9-1.45-18.11-1.61-27.13a1.5,1.5,0,0,1,1.47-1.53h0a1.5,1.5,0,0,1,1.5,1.47c.16,8.93.69,18,1.59,26.88a1.5,1.5,0,0,1-1.34,1.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M172.54,314.24a1.5,1.5,0,0,1-1.5-1.4c-2.16-33.64-3.43-67.8-3.77-101.51a1.5,1.5,0,0,1,1.48-1.52h0a1.5,1.5,0,0,1,1.5,1.48c.34,33.66,1.61,67.76,3.77,101.35a1.5,1.5,0,0,1-1.4,1.59Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M102.22,479.3a1.5,1.5,0,0,1-1.5-1.5,976.48,976.48,0,0,1,8.15-126.63,1.5,1.5,0,0,1,3,.39,973.51,973.51,0,0,0-8.13,126.24,1.5,1.5,0,0,1-1.5,1.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M382.09,318.12a1.5,1.5,0,0,1-1.5-1.46,137.6,137.6,0,0,1,2.19-27.88,1.5,1.5,0,0,1,3,.54,134.6,134.6,0,0,0-2.15,27.27,1.5,1.5,0,0,1-1.46,1.53Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M567,147.95h-.11a1.5,1.5,0,0,1-1.39-1.61c2.5-34.22,3.92-69,4.21-103.28a1.5,1.5,0,0,1,1.5-1.49h0a1.5,1.5,0,0,1,1.49,1.51c-.29,34.38-1.71,69.19-4.22,103.47A1.5,1.5,0,0,1,567,147.95Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M254.41,176.21a1.5,1.5,0,0,1-1.5-1.49l-.43-115.58A1.5,1.5,0,0,1,254,57.63h0a1.5,1.5,0,0,1,1.5,1.49l.43,115.58a1.5,1.5,0,0,1-1.49,1.51Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M323.06,194a.88.88,0,0,1-.34-1.68,20.41,20.41,0,0,0,8.61-6.82.88.88,0,1,1,1.42,1A21.88,21.88,0,0,1,323.4,194,.88.88,0,0,1,323.06,194Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M329.51,195.91a.88.88,0,0,1-.31-1.69,7.32,7.32,0,0,0,3.11-2.27.87.87,0,0,1,1.37,1.09,9.07,9.07,0,0,1-3.85,2.81A.88.88,0,0,1,329.51,195.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M383.94,269.31a.88.88,0,0,1-.59-1.52,18.54,18.54,0,0,0,4.38-6.13.87.87,0,1,1,1.6.7,20.31,20.31,0,0,1-4.8,6.71A.88.88,0,0,1,383.94,269.31Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M387,272.83a.87.87,0,0,1-.61-1.5l3-3a.87.87,0,0,1,1.22,1.25l-3,3A.87.87,0,0,1,387,272.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M550.94,316.28a.87.87,0,0,1-.46-1.62,10.51,10.51,0,0,0,4.81-7.27.88.88,0,0,1,1.73.26,12.29,12.29,0,0,1-5.62,8.49A.87.87,0,0,1,550.94,316.28Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M555.08,319.94a.88.88,0,0,1-.68-1.43l4.05-5a.88.88,0,0,1,1.36,1.11l-4.05,5A.87.87,0,0,1,555.08,319.94Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M646.36,158.78a.87.87,0,0,1-.72-1.36l6.27-9.32a.87.87,0,1,1,1.45,1l-6.27,9.32A.87.87,0,0,1,646.36,158.78Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M647.38,163.19a.88.88,0,0,1-.49-1.6,22.85,22.85,0,0,0,6.44-6.52.88.88,0,0,1,1.47,1,24.63,24.63,0,0,1-6.94,7A.87.87,0,0,1,647.38,163.19Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M715.47,312.87a.88.88,0,0,1-.23,0,.87.87,0,0,1-.61-1.08,45.45,45.45,0,0,0,1.57-9.31.87.87,0,0,1,1.75.11,47.17,47.17,0,0,1-1.63,9.67A.87.87,0,0,1,715.47,312.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M717.5,317.38a.87.87,0,0,1-.87-.87V314a.88.88,0,0,1,1.75,0v2.5A.87.87,0,0,1,717.5,317.38Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M569.57,20.39h-.13a.88.88,0,0,1-.74-1l.52-3.5a.87.87,0,1,1,1.73.26l-.52,3.5A.88.88,0,0,1,569.57,20.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M572.25,30a.86.86,0,0,1-.28,0,.88.88,0,0,1-.55-1.11A43.82,43.82,0,0,0,573.68,17a.91.91,0,0,1,.92-.83.87.87,0,0,1,.83.92,45.63,45.63,0,0,1-2.35,12.32A.88.88,0,0,1,572.25,30Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M351.81,47.69a.88.88,0,0,1-.63-1.48,27.74,27.74,0,0,0,5.53-8.54.87.87,0,1,1,1.62.66,29.07,29.07,0,0,1-5.89,9.08A.87.87,0,0,1,351.81,47.69Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M356.83,51.68a.88.88,0,0,1-.58-1.53A45.23,45.23,0,0,0,362,44.08a.87.87,0,1,1,1.38,1.08,47,47,0,0,1-5.94,6.3A.87.87,0,0,1,356.83,51.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M255.46,48.4a.87.87,0,0,1-.77-.46L253.09,45a.87.87,0,1,1,1.54-.83l1.59,2.95a.87.87,0,0,1-.77,1.29Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M173.55,192.77a.87.87,0,0,1-.4-.1,12.56,12.56,0,0,1-6.25-7.89.88.88,0,0,1,1.7-.43,10.78,10.78,0,0,0,5.36,6.77.88.88,0,0,1-.41,1.65Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M171.49,204.89a.87.87,0,0,1-.48-.15,10,10,0,0,1-4.38-8.8.88.88,0,1,1,1.75.11,8.22,8.22,0,0,0,3.6,7.23.87.87,0,0,1-.48,1.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M114,331.87a.88.88,0,0,1-.81-.53l-1.49-3.5a.88.88,0,0,1,1.61-.69l1.49,3.5a.87.87,0,0,1-.8,1.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M112.89,344.45a.88.88,0,0,1-.72-.38,24.28,24.28,0,0,1-3.57-7.84.87.87,0,0,1,1.7-.43,22.53,22.53,0,0,0,3.32,7.28.87.87,0,0,1-.72,1.37Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M190.82,374.17a.88.88,0,0,1-.82-.58,9.05,9.05,0,0,0-7.67-5.79.88.88,0,0,1,.12-1.75,10.85,10.85,0,0,1,9.19,6.94.87.87,0,0,1-.82,1.17Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M189.51,373.73a.87.87,0,0,1-.62-.25,4.18,4.18,0,0,0-5.15-.45.87.87,0,0,1-1-1.43,5.92,5.92,0,0,1,7.39.64.88.88,0,0,1-.62,1.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M269.07,343.71a.87.87,0,0,1-.86-.72,17.45,17.45,0,0,1-.2-4.76.88.88,0,0,1,1.74.17,15.71,15.71,0,0,0,.18,4.28.87.87,0,0,1-.71,1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M268.36,343.16a.87.87,0,0,1-.57-1.54l3.13-2.7a.87.87,0,1,1,1.14,1.33l-3.13,2.7A.87.87,0,0,1,268.36,343.16Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M377.93,433.36h-.11a.88.88,0,0,1-.76-1,26.76,26.76,0,0,0-1.74-14.15.88.88,0,1,1,1.63-.63,28.38,28.38,0,0,1,1.85,15A.88.88,0,0,1,377.93,433.36Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M420.89,450.7a1,1,0,0,1-.53-1.85l9.92-6.12a1,1,0,0,1,1,1.7l-9.92,6.12A1,1,0,0,1,420.89,450.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M424.36,453.7a1,1,0,0,1-.45-1.89l2.94-1.46a1,1,0,1,1,.89,1.79l-2.93,1.46A1,1,0,0,1,424.36,453.7Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M544.14,426.87a1,1,0,0,1-.45-1.89l2-1a1,1,0,1,1,.89,1.79l-2,1A1,1,0,0,1,544.14,426.87Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M545.1,431.23h-.49a1,1,0,0,1,0-2h.49a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M475.12,219.77a1,1,0,0,1,0-2A235.3,235.3,0,0,0,547,203.46a1,1,0,0,1,.69,1.88,237.28,237.28,0,0,1-72.48,14.43Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M510.53,226.27a1,1,0,0,1-.25-2l9.8-2.54a1,1,0,0,1,.5,1.94l-9.8,2.54A1,1,0,0,1,510.53,226.27Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M544.37,369.75a1,1,0,0,1-.07-2c16.71-1.22,32.23-8.25,47.24-15.05a1,1,0,0,1,.83,1.82c-14.46,6.55-30.85,14-47.92,15.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M580.71,394.05a1,1,0,0,1-.45-1.89l5.5-2.76a1,1,0,0,1,.9,1.79l-5.5,2.76A1,1,0,0,1,580.71,394.05Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M454.49,60.42a1,1,0,0,1,0-2,214.71,214.71,0,0,0,53.3-9.11,1,1,0,1,1,.58,1.91,216.68,216.68,0,0,1-53.8,9.19Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M327.29,102.14a1,1,0,0,1-.06-2,192.46,192.46,0,0,0,70.27-18,1,1,0,1,1,.86,1.81,194.47,194.47,0,0,1-71,18.23Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M432.07,510.83c-10.54,0-21-1.47-31.26-2.9a1,1,0,1,1,.28-2c12.26,1.72,24.94,3.49,37.49,2.68,13.92-.91,25.89-5.09,34.6-12.1a1,1,0,1,1,1.25,1.56c-9,7.27-21.39,11.6-35.73,12.54C436.49,510.76,434.28,510.83,432.07,510.83Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M450.56,528.21h-.06c-9.42-.56-19-.73-28.4-.49h0a1,1,0,0,1,0-2c9.48-.23,19.09-.06,28.57.5a1,1,0,0,1-.06,2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M359,529.5a1,1,0,0,1-1-1,55.34,55.34,0,0,1,.78-8.08c.31-2.13.63-4.32.73-6.47a1,1,0,0,1,1-1,1,1,0,0,1,1,1,66.87,66.87,0,0,1-.74,6.67,53.91,53.91,0,0,0-.75,7.79,1,1,0,0,1-1,1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M357.5,544.5a1,1,0,0,1-1-1v-6a1,1,0,0,1,2,0v6A1,1,0,0,1,357.5,544.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M227.31,549.06c-4.17,0-11.51-.6-15.38-4.5a1.5,1.5,0,1,1,2.13-2.11c3.07,3.09,9.95,3.87,15.35,3.56a1.5,1.5,0,0,1,.17,3C229,549,228.26,549.06,227.31,549.06Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M227.5,541a1.46,1.46,0,0,1-.31,0,20.42,20.42,0,0,0-5.58-.47,1.5,1.5,0,0,1-.22-3,23.41,23.41,0,0,1,6.42.53,1.5,1.5,0,0,1-.31,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M328.5,560a1.5,1.5,0,0,1-.7-2.83c1.12-.59,2.3-1.27,3.42-2a1.5,1.5,0,1,1,1.57,2.56c-1.17.72-2.41,1.43-3.58,2A1.48,1.48,0,0,1,328.5,560Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M340,561a1.5,1.5,0,0,1-.55-2.9,4.24,4.24,0,0,0,1.83-1.48,1.5,1.5,0,1,1,2.44,1.74,7.21,7.21,0,0,1-3.17,2.52A1.5,1.5,0,0,1,340,561Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M230.5,604a1.5,1.5,0,0,1-1.07-.45,8.85,8.85,0,0,1-2.42-4.84,1.5,1.5,0,0,1,3-.43,5.86,5.86,0,0,0,1.58,3.16A1.5,1.5,0,0,1,230.5,604Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M236.5,613a1.49,1.49,0,0,1-.89-.29,5.41,5.41,0,0,1-2.11-4.15,1.5,1.5,0,0,1,1.44-1.55,1.47,1.47,0,0,1,1.55,1.44,2.46,2.46,0,0,0,.89,1.85,1.5,1.5,0,0,1-.89,2.71Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M239.5,604.5a1.5,1.5,0,0,1-1.16-.55,3.88,3.88,0,0,1-.81-3.23,1.5,1.5,0,0,1,2.95.56.86.86,0,0,0,.19.77,1.5,1.5,0,0,1-1.16,2.45Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M184.5,419a1.5,1.5,0,0,1-1.48-1.25,8,8,0,0,1,.7-5,1.5,1.5,0,0,1,2.57,1.55,5.2,5.2,0,0,0-.3,3,1.5,1.5,0,0,1-1.23,1.73Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M186,431.5a1.5,1.5,0,0,1-1.22-.63,7.49,7.49,0,0,1-1.28-4.41,1.5,1.5,0,1,1,3,.07,4.53,4.53,0,0,0,.72,2.59A1.5,1.5,0,0,1,186,431.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M192,424.5a1.5,1.5,0,0,1-1.37-.9,14.86,14.86,0,0,1-1.11-3.89,1.5,1.5,0,1,1,3-.42,11.86,11.86,0,0,0,.89,3.11,1.5,1.5,0,0,1-1.37,2.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204.5,533h-36a1.5,1.5,0,0,1,0-3h36a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204,549.5H185.5a1.5,1.5,0,0,1,0-3H204a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M189.5,578.5c-6,0-12.13-.13-18-.25s-12-.25-18-.25a1.5,1.5,0,0,1,0-3c6,0,12.13.13,18,.25s12,.25,18,.25a1.5,1.5,0,0,1,0,3Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M194.74,597.1c-1.16,0-2.31,0-3.45-.05s-2.2,0-3.29,0a1.5,1.5,0,0,1,0-3h0c1.11,0,2.23,0,3.36,0a47.35,47.35,0,0,0,10.34-.52,1.5,1.5,0,0,1,.6,2.94A37.75,37.75,0,0,1,194.74,597.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M204.57,643.61c-1.36,0-2.93-.29-3.46-1.53a1.5,1.5,0,0,1,2.52-1.56,6.25,6.25,0,0,0,2.15,0,1.5,1.5,0,0,1,.43,3A11.65,11.65,0,0,1,204.57,643.61Zm-.69-2.69h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M224.41,412a4.41,4.41,0,0,1-2.14-.58,4.94,4.94,0,0,1-2.65-4c-.63-6.22,8.66-15.66,10.4-17.13a1.5,1.5,0,0,1,2.47,1.11c.19,7.81-1.82,17.46-5.91,19.94A4.16,4.16,0,0,1,224.41,412Zm5-16.86c-3.19,3.51-7.12,8.94-6.81,12a2,2,0,0,0,1.11,1.64,1.14,1.14,0,0,0,1.3,0C227.15,407.56,229,401.53,229.42,395.18Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M226.47,442.05a3.21,3.21,0,0,1-2.82-1.63c-2.75-4.65,2.88-20.07,5.89-22.57a1.5,1.5,0,0,1,2.45,1.29,49.5,49.5,0,0,0,.16,7c.44,6.71.89,13.65-3.83,15.5A5.05,5.05,0,0,1,226.47,442.05ZM229,424.37c-2.07,4.91-4,12.42-2.8,14.52.07.11.18.3,1,0,2.69-1.05,2.27-7.41,1.94-12.52C229.11,425.68,229.07,425,229,424.37Z" transform="translate(-60.79 2.5)"/><g class="cls-14"><path class="cls-2" d="M659,528.67a1,1,0,0,1-.06-2l1.29-.08c4.56-.29,8.88-.57,13.44-.59h0a1,1,0,0,1,0,2c-4.5,0-8.79.29-13.32.58l-1.29.08Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M680.33,545.33H669.67a1,1,0,0,1,0-2h10.67a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M638.33,570H633a1,1,0,0,1,0-2h5.33a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M421,664.7c-.45,0-.91,0-1.36,0a1,1,0,0,1,.1-2,43.87,43.87,0,0,0,6.81-.34c1.22-.12,2.49-.25,3.75-.32a1,1,0,0,1,1.06.94,1,1,0,0,1-.94,1.06c-1.22.07-2.46.2-3.66.32A57,57,0,0,1,421,664.7Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M457.67,654a1,1,0,0,1-.36-1.93c3.28-1.27,7.31-1.07,11.22-.87,1.35.07,2.62.13,3.81.13a1,1,0,0,1,0,2c-1.25,0-2.54-.07-3.91-.14-3.69-.19-7.51-.38-10.39.74A1,1,0,0,1,457.67,654Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M503,674H490.33a1,1,0,1,1,0-2H503a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M340.77,690.77a22.36,22.36,0,0,1-6-.81,1,1,0,1,1,.54-1.93,21.35,21.35,0,0,0,7.64.63,1,1,0,0,1,.19,2Q341.92,690.77,340.77,690.77Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M393,700h-8a1,1,0,0,1,0-2h8a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M645,630.67h-7.33a1,1,0,0,1,0-2H645a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M731,508.67h-2.67a1,1,0,0,1,0-2H731a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M630.33,513.33a1,1,0,0,1-.35-1.94,11.21,11.21,0,0,1,4.38-.73,1,1,0,0,1,1,1,1,1,0,0,1-1,1,9.37,9.37,0,0,0-3.62.6A1,1,0,0,1,630.33,513.33Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M753,472h-2.67a1,1,0,1,1,0-2H753a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M765.67,446H763a1,1,0,0,1,0-2h2.67a1,1,0,1,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M111,505.33h-5.33a1,1,0,1,1,0-2H111a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M144.33,500.67h-4a1,1,0,1,1,0-2h4a1,1,0,0,1,0,2Z" transform="translate(-60.79 2.5)"/></g><g class="cls-14"><path class="cls-2" d="M120.56,518.83a7.62,7.62,0,0,1-4.12-1,1,1,0,0,1,1.14-1.65,7.18,7.18,0,0,0,4.58.51,1,1,0,1,1,.38,2A10.47,10.47,0,0,1,120.56,518.83Z" transform="translate(-60.79 2.5)"/></g></g><g id="LINEART"><path class="cls-15" d="M145.95,176.85" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M255.72,395.42a2.5,2.5,0,0,1-.07-5c14.6-.4,26.34-2.39,38.77-4.49a316.57,316.57,0,0,1,34.2-4.45,2.5,2.5,0,0,1,.32,5,312.48,312.48,0,0,0-33.68,4.38c-12,2-24.51,4.16-39.46,4.56Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M365,378.9a2.5,2.5,0,0,1-1.06-4.76c5.28-2.48,9.35-5.59,13.65-8.88a95.33,95.33,0,0,1,12-8.2,2.5,2.5,0,0,1,2.42,4.38,91.32,91.32,0,0,0-11.39,7.8c-4.33,3.31-8.8,6.72-14.56,9.43A2.49,2.49,0,0,1,365,378.9Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M371.49,408.63a13.15,13.15,0,0,1-1.43-.08,12.82,12.82,0,0,1-8.47-4.94,9.18,9.18,0,0,1-1.83-7.18c1.23-6.66,9.76-7.66,14.6-7.21h0a9.63,9.63,0,0,1,4.79,1.55,8.4,8.4,0,0,1,3.17,7.19,11.07,11.07,0,0,1-6.4,9.79A11.23,11.23,0,0,1,371.49,408.63Zm.79-14.5c-3.31,0-7.17.89-7.6,3.21a4.26,4.26,0,0,0,.92,3.28,7.71,7.71,0,0,0,5,3,6.7,6.7,0,0,0,3.36-.42,6.08,6.08,0,0,0,3.38-5.35,3.59,3.59,0,0,0-1.08-3,5.2,5.2,0,0,0-2.35-.64h0C373.39,394.15,372.85,394.13,372.29,394.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M363.66,424.5a11.22,11.22,0,0,1-7.68-3,12.76,12.76,0,0,1-3.34-12.21,15.39,15.39,0,0,1,7.71-9.63,2.5,2.5,0,0,1,2.39,4.39,10.53,10.53,0,0,0-5.24,6.45,7.79,7.79,0,0,0,1.94,7.37,6.05,6.05,0,0,0,6.84,1,13.26,13.26,0,0,0,1.65-1.22,18.82,18.82,0,0,1,2.06-1.53c3.61-2.23,8-2,11.37-1.58,1.91.24,4,.51,5-.3s.89-3.23,0-5c-1.06-2.1-5.27-5.48-8-6.77a2.5,2.5,0,0,1,2.15-4.51c3.08,1.47,8.52,5.54,10.28,9s2,8.39-1.34,11.12c-2.66,2.14-6.14,1.7-8.68,1.37s-5.91-.53-8.19.87a14.67,14.67,0,0,0-1.52,1.14,17.46,17.46,0,0,1-2.31,1.68A10.19,10.19,0,0,1,363.66,424.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.27,435a8.13,8.13,0,0,1-4-1,13,13,0,0,1-3.16-2.74,12,12,0,0,1-1.82-2.39c-1.18-2.18-2.32-5.7-2-8.26a2.5,2.5,0,1,1,5,.56,11.53,11.53,0,0,0,1.46,5.31,8.1,8.1,0,0,0,1.12,1.4,8.88,8.88,0,0,0,1.92,1.75,4,4,0,0,0,4-.44,6.94,6.94,0,0,0,2.53-4.42,20.49,20.49,0,0,0-.59-7,2.5,2.5,0,1,1,4.89-1,24.37,24.37,0,0,1,.62,8.94,11.8,11.8,0,0,1-4.51,7.58A9.3,9.3,0,0,1,376.27,435Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M388.38,410.24a2.5,2.5,0,0,1-.38-5c5.57-.87,10.41-5.64,12.34-12.16,2.08-7,.34-14.44-1.48-19.41a28.74,28.74,0,0,0-3.29-6.64c-4.09-5.88-11.69-9.55-19.85-9.6h-.15c-9,0-17,4.08-22.08,7.51a2.5,2.5,0,0,1-2.79-4.15c8.19-5.51,16.84-8.38,25-8.36,9.76,0,18.92,4.55,23.93,11.74a33.58,33.58,0,0,1,3.88,7.78c3,8.15,3.54,16,1.58,22.56-2.48,8.36-8.9,14.52-16.37,15.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M291.58,645.16a94,94,0,0,1-26.67-3.83,95.29,95.29,0,0,1-38-21.85c-11.07-10.39-14.37-23.33-16.28-35.77a40.63,40.63,0,0,1,0-12.24,2.5,2.5,0,0,1,5,.53,35.69,35.69,0,0,0,0,11c2.05,13.35,5.35,24,14.76,32.88a89.3,89.3,0,0,0,82.71,21.78c2-.48,4-.93,6-1.37,10.24-2.28,19.91-4.44,28.15-10.85a2.5,2.5,0,0,1,3.07,3.95c-9.13,7.1-19.33,9.38-30.14,11.79-2,.44-3.95.88-5.94,1.36A97.5,97.5,0,0,1,291.58,645.16Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M200.22,497.51a2.5,2.5,0,0,1-2.21-1.33c-2.34-4.4-4.81-8.85-7.19-13.15-2.67-4.82-5.43-9.81-8-14.76-6.07-11.51-11.81-24-12.76-37.34-1-13.78,3-28.47,12.17-44.91,4.35-7.8,8.33-13.25,12.9-17.67a67.46,67.46,0,0,1,17.65-11.86c27.92-13.6,60.15-14.28,88-13.15,28.91,1.17,48.72,11.29,66.24,33.85a2.5,2.5,0,1,1-3.95,3.07c-16.52-21.27-35.21-30.82-62.49-31.92s-58.7-.46-85.61,12.65a62.58,62.58,0,0,0-16.36,11c-4.2,4.06-7.9,9.15-12,16.51C177.87,404,174.09,417.8,175,430.58c.88,12.41,6.39,24.33,12.2,35.36,2.59,4.91,5.34,9.87,8,14.67,2.39,4.32,4.87,8.79,7.23,13.22a2.5,2.5,0,0,1-2.21,3.68Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M261.89,349a2.49,2.49,0,0,1-1.67-.64,4.61,4.61,0,0,1-1.32-3.69,34.16,34.16,0,0,1,.75-6.35,12.71,12.71,0,0,1,2-5,8.89,8.89,0,0,1,9.85-3.06c3,1.06,5.42,3.7,7.23,8.08a43.72,43.72,0,0,1,2,5.84,2.5,2.5,0,0,1-4.84,1.25,38.8,38.8,0,0,0-1.73-5.17c-1.24-3-2.63-4.71-4.25-5.28a3.88,3.88,0,0,0-4.19,1.3,8.26,8.26,0,0,0-1.17,3.09,29.18,29.18,0,0,0-.64,5.42c0,.09,0,.16,0,.21a2.5,2.5,0,0,1-2,4Zm1.67-4.36h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M183.89,387.5a2.52,2.52,0,0,1-.41,0c-3.94-.65-7.3-3.73-9.72-8.89-2.67-5.71-3.34-11.18-1.95-15.82,1.62-5.36,7.07-10.44,13.41-9.67,5,.61,8.67,4.6,11.1,7.24l4.87,5.3a2.5,2.5,0,1,1-3.68,3.38l-4.87-5.3c-2.55-2.78-5.08-5.3-8-5.66-3.68-.45-7,2.84-8,6.15-1.31,4.35.2,9.06,1.69,12.25,1.17,2.51,3.17,5.61,6,6.08a2.5,2.5,0,0,1-.41,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M294.85,448.5A43.45,43.45,0,1,1,338.3,405,43.5,43.5,0,0,1,294.85,448.5Zm0-81.9A38.45,38.45,0,1,0,333.3,405,38.49,38.49,0,0,0,294.85,366.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M394.52,444.82a2.5,2.5,0,0,1-2.5-2.41c-.18-4.94-.79-11.63-1.59-17.47a4.05,4.05,0,0,1,0-1.16A2.53,2.53,0,0,1,392.5,421a2.46,2.46,0,0,1,2.86,2,4.07,4.07,0,0,1,0,1.28c.82,6,1.44,12.85,1.63,17.9a2.5,2.5,0,0,1-2.41,2.59Zm-4.09-20.91h0Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M375.87,636.22a2.5,2.5,0,0,1-2.46-2l-16-84.58a2.5,2.5,0,0,1,4.91-.93l15.56,82L537.75,595,500.12,420.84,344.73,456.22l10,56.84a2.5,2.5,0,0,1-4.92.87l-10.45-59.18a2.5,2.5,0,0,1,1.91-2.87l160.17-36.47a2.5,2.5,0,0,1,3,1.91l38.69,179a2.5,2.5,0,0,1-1.9,3L376.42,636.16A2.45,2.45,0,0,1,375.87,636.22Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M542.38,599.64a2.5,2.5,0,0,1-.49-5c23.54-4.76,47.28-10.1,70.61-15.88L578,417l-53.49,1.44c-6.61.18-13.44.36-20.07,1a2.5,2.5,0,0,1-.51-5c6.82-.7,13.74-.89,20.44-1.07L580,411.91a2.46,2.46,0,0,1,2.51,2l35.43,166.24a2.5,2.5,0,0,1-1.84,2.95c-24.16,6-48.78,11.58-73.18,16.51A2.48,2.48,0,0,1,542.38,599.64Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M339.58,545.66a2.5,2.5,0,0,1-.67-4.91A92.52,92.52,0,0,1,350.66,539l1.36-.16a2.5,2.5,0,0,1,.57,5l-1.36.15a94.18,94.18,0,0,0-11,1.58A2.5,2.5,0,0,1,339.58,545.66Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M365,542.15a2.5,2.5,0,0,1-.41-5c10.27-1.72,16.43-4,18.3-6.92a3.28,3.28,0,0,0,.4-2.81c-1-4-7.08-6.94-18-8.69a2.5,2.5,0,0,1,.79-4.94c8.44,1.36,19.9,4.12,22,12.38a8.33,8.33,0,0,1-1.05,6.79c-2.78,4.27-9.46,7.09-21.67,9.13A2.49,2.49,0,0,1,365,542.15Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M353,517.24l-.28,0A200,200,0,0,0,330.45,516a2.5,2.5,0,0,1,0-5,205,205,0,0,1,22.86,1.26,2.5,2.5,0,0,1-.27,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M374.91,644.09a19.3,19.3,0,0,1-7.71-1.6,35.5,35.5,0,0,1-5.75-3.38l-23.4-15.86a2.5,2.5,0,0,1,2.8-4.14L364.26,635a31.89,31.89,0,0,0,4.94,2.93,14.31,14.31,0,0,0,7.26,1.1,4.63,4.63,0,0,0,2.48-.81c1-.83,1-2.61.47-3.86a2.5,2.5,0,0,1,4.65-1.85c1.39,3.49.62,7.4-1.87,9.52a9.29,9.29,0,0,1-5.17,2A19.23,19.23,0,0,1,374.91,644.09Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M224.4,649.13a19.38,19.38,0,0,1-5.42-.75,5.09,5.09,0,0,1-3-2,5.2,5.2,0,0,1-.74-3c.17-10,7.38-17.73,14.76-24.76a2.5,2.5,0,1,1,3.45,3.62c-6.61,6.3-13.07,13.13-13.21,21.23v.08l.14,0c4.2,1.22,9.32.4,14-2.26,4.56-2.56,8.4-6.47,11.86-10.31a2.5,2.5,0,0,1,3.71,3.35c-3.75,4.16-7.94,8.4-13.13,11.32A25.75,25.75,0,0,1,224.4,649.13Zm-4.15-5.26h0Zm-.31-.44Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M559.82,416.91a2.5,2.5,0,0,1-2.5-2.5V390.84H404.5a2.5,2.5,0,0,1,0-5H559.82a2.5,2.5,0,0,1,2.5,2.5v26.08A2.5,2.5,0,0,1,559.82,416.91Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M447.94,433.1a2.5,2.5,0,0,1-2.5-2.5V388.34a2.5,2.5,0,0,1,5,0V430.6A2.5,2.5,0,0,1,447.94,433.1Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M682,484.5H594.42a2.5,2.5,0,1,1,0-5H679.5v-182h-243v90.84a2.5,2.5,0,0,1-5,0V295a2.5,2.5,0,0,1,2.5-2.5H682a2.5,2.5,0,0,1,2.5,2.5V482A2.5,2.5,0,0,1,682,484.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M682,484.5a2.5,2.5,0,0,1-.66-4.91l62.16-16.93V291.75l-61.27,5.74a2.5,2.5,0,1,1-.47-5l64-6A2.5,2.5,0,0,1,748.5,289V464.57a2.5,2.5,0,0,1-1.84,2.41l-64,17.43A2.52,2.52,0,0,1,682,484.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M598,297.5a2.5,2.5,0,0,1-2.5-2.5V150.5H417.66v142H434a2.5,2.5,0,0,1,0,5H415.16a2.5,2.5,0,0,1-2.5-2.5V148a2.5,2.5,0,0,1,2.5-2.5H598a2.5,2.5,0,0,1,2.5,2.5V295A2.5,2.5,0,0,1,598,297.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M670.74,151.74h0L598,150.5a2.5,2.5,0,1,1,.09-5l72.74,1.24a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M695.88,296.2a2.5,2.5,0,0,1-2.5-2.5V177.1a2.5,2.5,0,0,1,5,0V293.7A2.5,2.5,0,0,1,695.88,296.2Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M604,150.5a2.5,2.5,0,0,1-2.5-2.5V16L541.5,3.1V148a2.5,2.5,0,0,1-5,0V0a2.5,2.5,0,0,1,.93-1.94,2.5,2.5,0,0,1,2.1-.5l65,14a2.5,2.5,0,0,1,2,2.44V148A2.5,2.5,0,0,1,604,150.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M400,30.5a2.5,2.5,0,0,1-2.5-2.5V5a2.5,2.5,0,0,1,2.41-2.5l139-5A2.51,2.51,0,0,1,541.5-.09a2.5,2.5,0,0,1-2.41,2.59L402.5,7.41V28A2.5,2.5,0,0,1,400,30.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,179.6H289.78l-68-5.1A2.5,2.5,0,0,1,219.5,172V46a2.5,2.5,0,0,1,2-2.45l68-14a2.49,2.49,0,0,1,.5-.05H427a2.5,2.5,0,0,1,2.5,2.5V148a2.5,2.5,0,0,1-5,0V34.5H290.25L224.5,48V169.68l65.56,4.92h125.1a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M290,179.6h0a2.5,2.5,0,0,1-2.5-2.5l0-145.1a2.5,2.5,0,0,1,2.5-2.5h0a2.5,2.5,0,0,1,2.5,2.5l0,145.1A2.5,2.5,0,0,1,290,179.6Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M290,316.5H139a2.5,2.5,0,0,1-2.5-2.5V177.1a2.5,2.5,0,0,1,2.41-2.5L242,171a2.5,2.5,0,1,1,.17,5L141.5,179.51v132h146l0-59.5a2.5,2.5,0,0,1,.74-1.77,2.38,2.38,0,0,1,1.78-.72l125.16,1a2.5,2.5,0,1,1,0,5l-122.64-1,0,59.48A2.5,2.5,0,0,1,290,316.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M199.36,316.5a2.5,2.5,0,0,1-2.5-2.5V175a2.5,2.5,0,0,1,5,0V314A2.5,2.5,0,0,1,199.36,316.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,324.62H144l-.3,0L77,316.48a2.5,2.5,0,0,1,.3-5H139a2.5,2.5,0,0,1,0,5H118.54l25.61,3.12H369.87l-28.15-3.12H290a2.5,2.5,0,0,1,0-5h51.88l.27,0,73.31,8.12a2.5,2.5,0,0,1-.28,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M195.71,489.21H139a2.51,2.51,0,0,1-.5-.05L76.81,476.45a2.5,2.5,0,0,1-2-2.45V314a2.5,2.5,0,0,1,5,0V472l59.44,12.25h56.46a2.5,2.5,0,0,1,0,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M144,489.21a2.5,2.5,0,0,1-2.5-2.5V322.12a2.5,2.5,0,0,1,5,0v164.6A2.5,2.5,0,0,1,144,489.21Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M415.16,391a2.5,2.5,0,0,1-2.5-2.5V322.12a2.5,2.5,0,0,1,5,0V388.5A2.5,2.5,0,0,1,415.16,391Z" transform="translate(-60.79 2.5)"/><circle class="cls-2" cx="268" cy="397.88" r="4.97"/><circle class="cls-2" cx="332.92" cy="374.31" r="4.97"/><path class="cls-2" d="M746,291.5l-.33,0-50.12-6.6a2.5,2.5,0,1,1,.65-5l50.12,6.6a2.5,2.5,0,0,1-.32,5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M260.2,516c-11.18,0-22.1-.85-32.78-1.67-5.72-.44-11.25-1.28-17.79-2.41-.42-.07-1.15-.13-1.93-.2-3.83-.31-6.88-.7-8.48-2.55-2.33-2.7-2.49-14.1-2.49-14.21a2.5,2.5,0,0,1,.76-1.78,2.43,2.43,0,0,1,1.81-.7,86.45,86.45,0,0,1,11.45,1.34c2.72.44,5.53.9,8.3,1.14,2.19.19,4.39.43,6.52.67,2.37.27,4.82.54,7.24.73,11.37.88,23.05.62,37.87-.85,4.78-.47,9.53-.91,14.27-1.34,8.69-.79,17.68-1.62,26.58-2.67,6.31-.75,12-1.48,17.45-2.22,4.9-.67,9.64-1.59,14.23-2.48l3-.57a2.5,2.5,0,0,1,.94,4.91l-3,.57c-4.65.9-9.46,1.83-14.5,2.52-5.46.75-11.2,1.48-17.54,2.23-9,1.06-18,1.89-26.71,2.69-4.73.43-9.47.87-14.23,1.34-15.12,1.5-27.08,1.76-38.75.86-2.5-.19-5-.47-7.41-.74-2.1-.23-4.26-.48-6.39-.66-3-.25-5.88-.73-8.69-1.18s-5.43-.89-8.12-1.12c.21,3.07.69,7.15,1.22,8.31.74.45,3.75.69,5.05.8.93.08,1.73.14,2.37.25,6.4,1.1,11.79,1.92,17.33,2.35,16.15,1.25,32.85,2.55,49.94.84,3.43-.34,7-.56,10.36-.78,4.63-.29,9.41-.59,14-1.2,3.91-.53,7.81-1.15,11.58-1.76a221.82,221.82,0,0,1,23.71-2.93c2.85-.15,5.73-.1,8.52-.05,1.38,0,2.75,0,4.11,0a2.5,2.5,0,0,1,0,5c-1.39,0-2.8,0-4.2,0-2.7,0-5.49-.1-8.17,0a215,215,0,0,0-23.18,2.88c-3.81.61-7.74,1.25-11.71,1.78-4.73.63-9.6.94-14.31,1.23-3.36.21-6.84.43-10.18.76C272.16,515.75,266.14,516,260.2,516Zm-57.09-10Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M312.32,579.89q-1.43,0-2.86,0c-15-.5-31.12-1.47-50.81-3.05-3.23-.26-6.56-.34-9.77-.42-3.72-.09-7.57-.19-11.4-.55a74,74,0,0,1-8.77-1.55c-2-.44-4.12-.9-6.18-1.21a55.21,55.21,0,0,0-9.94-.29c-2.27.07-4.62.13-7,0a2.5,2.5,0,0,1-2.38-2.36c-.21-3.82-.29-8.26,1.5-12.54a66.07,66.07,0,0,0,3.9-11.72,3.41,3.41,0,0,0-.06-2.55l-.09-.07a4.08,4.08,0,0,1-1.68-3.3,3.78,3.78,0,0,1,1.78-2.78l.12-.09c1.49-5.19-.17-11.18-1.78-17a76.62,76.62,0,0,1-2.05-8.66,2.5,2.5,0,0,1,4.94-.76,71.94,71.94,0,0,0,1.93,8.08c1.86,6.69,3.78,13.6,1.57,20.34a3.23,3.23,0,0,1-.73,1.2,3.74,3.74,0,0,1,.63,1.13,7.77,7.77,0,0,1,.32,5.48,70.61,70.61,0,0,1-4.19,12.63,19.26,19.26,0,0,0-1.21,8c1.44,0,2.85,0,4.33-.08a59.92,59.92,0,0,1,10.83.34c2.22.33,4.4.81,6.51,1.27a69.34,69.34,0,0,0,8.18,1.46c3.64.35,7.4.44,11,.53,3.29.08,6.68.16,10.05.43,19.61,1.58,35.68,2.55,50.57,3,12.67.43,25.17-2.26,37.24-4.86,7.23-1.55,12.09-2.88,14.44-3.93a2.5,2.5,0,0,1,2,4.56c-2.71,1.21-7.75,2.6-15.43,4.25C336.44,577.34,324.6,579.89,312.32,579.89Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M372,620.83a2.49,2.49,0,0,1-1.73-.69c-1.32-1.27-2.55-2.67-3.74-4a39,39,0,0,0-5.07-5.14,2.5,2.5,0,0,1,3.07-3.94,43.31,43.31,0,0,1,5.76,5.79c1.17,1.33,2.27,2.59,3.43,3.71a2.5,2.5,0,0,1-1.73,4.31Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M357,551.65a5.21,5.21,0,0,1-2.67-1c-5.24-3.3-4.58-11.16-4.14-16.36.07-.8.13-1.54.16-2.18.06-1.23.14-2.47.22-3.7.17-2.67.34-5.43.34-8.11,0-.37-.07-1-.15-1.64-.32-2.75-.76-6.51,1.74-8.64a5,5,0,0,1,2.09-1,4.05,4.05,0,0,1,3.34.57,3.84,3.84,0,0,1,.47-.26,2.5,2.5,0,0,1,3.11.82l.07.09a3.77,3.77,0,0,1,5.15,1c1.64,2.09,1.54,5.24,1.47,7.55,0,.38,0,.72,0,1,0,4.07,0,8.45-.34,12.9,0,.57-.06,1.32-.08,2.17-.17,6.18-.56,11.92-3.51,14.29-.94.76-1.91,1.54-3.26,1.25a2.59,2.59,0,0,1-1.34-.75,2.73,2.73,0,0,1-2.64,2Zm-1.41-37.47a16,16,0,0,0,.13,3.87,20.36,20.36,0,0,1,.18,2.21c0,2.84-.18,5.68-.35,8.43-.08,1.21-.15,2.42-.21,3.64,0,.69-.1,1.49-.17,2.34-.28,3.34-.73,8.69,1.06,11l.18-.14a3.3,3.3,0,0,1,3.06-2,2.86,2.86,0,0,1,2.16.91c.92-2.23,1.07-7.73,1.13-9.73,0-.93,0-1.74.09-2.36.28-4.31.32-8.59.33-12.58,0-.35,0-.75,0-1.18a22.32,22.32,0,0,0-.07-3.18,2.63,2.63,0,0,1-3.27.36,2.5,2.5,0,0,1-3.7-.65l-.09-.14C355.94,514.73,355.76,514.44,355.59,514.19Zm4.89,30.51h0Zm-4.74-30.9h0Zm-1.62-1.9h0Z" transform="translate(-60.79 2.5)"/></g><g id="circle"><path class="cls-2" d="M153.52,177.1A349.71,349.71,0,0,1,222,114.31L221,102a6,6,0,0,0-3.76,1,361.7,361.7,0,0,0-75.95,70.06,6,6,0,0,0-1.31,4.4" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M139.38,195.21A344.77,344.77,0,0,0,72.79,400c0,191.91,156.13,348,348,348s348-156.13,348-348c0-121.6-61.55-232-164.86-296l.87-13a6,6,0,0,1,2.24.81A359.84,359.84,0,0,1,780.86,400,360.13,360.13,0,0,1,89.08,540.14,360.53,360.53,0,0,1,134.23,182a6,6,0,0,1,3.74-2.26Z" transform="translate(-60.79 2.5)"/></g><g id="layers"><g class="cls-10"><path class="cls-8" d="M368.81,388.34l-1.1-23.69s8.48-17.33,8.09-18,6.68-6.06,6.68-6.06l13-1,8.29,1.85,9.82,12.28,7.21,15.07L424.21,386l-4.71,21.73-6.39,11.59-8.61,4.11L390.36,422l-5.08-3.31,3.67-3.79v-5.42l-4-6.79-5.56-2.47-1.51-7.57Z" transform="translate(-60.79 2.5)"/></g><g class="cls-10"><polygon class="cls-8" points="226.66 366.6 237.24 361.46 250.18 361.46 265.7 366.6 279.96 384.01 285.01 395.42 287.35 407.55 286.4 422.15 279.23 440.12 268 452.2 253.91 456.94 235.27 454.47 220.17 446.08 208.28 425.94 205.61 398.57 213.7 378.9 226.66 366.6"/></g><path class="cls-2" d="M426,376.14c-2.08-12-7.08-22.86-14.06-30.5-7.32-8-16-11.61-24.38-10.16s-15.34,7.76-19.54,17.76c-3.34,7.95-4.62,17.52-3.76,27.46a26.09,26.09,0,0,0-17.18,6.73c-8.49-20.91-28.27-34.1-48.45-30.6-23.83,4.13-39.32,30-34.53,57.59,4.35,25.11,24,43.19,45.38,43.19a38.08,38.08,0,0,0,6.5-.56c11.63-2,21.63-9.18,28.14-20.17a55,55,0,0,0,6.39-37.42c-.32-1.87-.74-3.7-1.23-5.49a19.71,19.71,0,0,1,15.78-7.13c.22,1.27.63,3.21.91,4.42a3.06,3.06,0,0,0,6-1.36c-.26-1.15-.67-3.1-.87-4.24-1.89-10.9-1-21.56,2.6-30,3.37-8,8.67-13,14.95-14.1s13,1.85,18.82,8.26c6.2,6.78,10.66,16.52,12.54,27.41,3.81,22-4.06,41.81-17.54,44.14a13,13,0,0,1-3.13.12,23.62,23.62,0,0,1-10.67-3.64,11.5,11.5,0,0,0-1.58-1.14c-.49-.19-1.28.36-1.83.46a9.58,9.58,0,0,0-1.67.32,1.45,1.45,0,0,0-1,1.23,2.66,2.66,0,0,0,.7,1.39,13,13,0,0,1,.83,1.85c.22.45.71.67,1.13.94a28.53,28.53,0,0,0,15.33,4.73,17.49,17.49,0,0,0,3-.24C420.27,424.45,430.38,401.47,426,376.14Zm-87.14,57.62c-5.59,9.43-14.08,15.56-23.92,17.26-20.5,3.55-40.6-13.34-44.81-37.64s9-47,29.55-50.52a32.07,32.07,0,0,1,5.48-.47c18.49,0,35.5,16,39.33,38.11A48.84,48.84,0,0,1,338.85,433.76Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M309.47,458.61c-22.09,0-42-18.92-46.37-44-4.88-28.17,11-54.53,35.35-58.75,19.89-3.45,39.86,8.82,49,29.93a27.19,27.19,0,0,1,15.71-6,58.73,58.73,0,0,1,3.92-26.87c4.34-10.33,11.55-16.85,20.3-18.36s17.73,2.2,25.29,10.47c7.11,7.77,12.19,18.78,14.3,31h0c4.48,25.87-6,49.37-23.34,52.37a18.5,18.5,0,0,1-3.14.25,29.35,29.35,0,0,1-15.87-4.89l-.23-.14a3,3,0,0,1-1.25-1.2c-.13-.27-.23-.54-.33-.81a4.14,4.14,0,0,0-.42-.92l-.16-.22a2.91,2.91,0,0,1-.72-1.74,2.4,2.4,0,0,1,1.67-2.16,5.81,5.81,0,0,1,1.34-.29l.5-.07a3.31,3.31,0,0,0,.46-.17,2.52,2.52,0,0,1,1.92-.24,4.9,4.9,0,0,1,1.26.85,5.44,5.44,0,0,0,.5.39,21.77,21.77,0,0,0,3.33,1.76,21.47,21.47,0,0,0,6.86,1.72,12,12,0,0,0,2.89-.11c12.94-2.24,20.45-21.52,16.73-43-1.85-10.71-6.22-20.27-12.3-26.91-5.63-6.15-12-9-17.91-7.95s-11,5.82-14.2,13.51c-3.49,8.3-4.39,18.77-2.53,29.48.2,1.14.6,3.06.86,4.19a4.06,4.06,0,1,1-7.91,1.81c-.22-1-.53-2.43-.77-3.66a18.76,18.76,0,0,0-13.84,6.39c.45,1.71.82,3.41,1.11,5.07a56,56,0,0,1-6.51,38.1C338.31,448.64,328.07,456,316.15,458A39.24,39.24,0,0,1,309.47,458.61Zm-4.33-101.34a37.16,37.16,0,0,0-6.35.55c-23.28,4-38.41,29.35-33.72,56.44,4.18,24.15,23.27,42.36,44.4,42.36a37.25,37.25,0,0,0,6.33-.54c11.34-2,21.09-9,27.45-19.69a54,54,0,0,0,6.26-36.74c-.31-1.77-.71-3.58-1.21-5.4l-.14-.5.32-.4a20.76,20.76,0,0,1,16.59-7.5l.81,0,.14.79c.23,1.3.63,3.22.9,4.37a2.06,2.06,0,0,0,2.47,1.55,2.06,2.06,0,0,0,1.55-2.47c-.27-1.16-.68-3.13-.88-4.3-1.92-11.08-1-21.95,2.66-30.59,3.5-8.33,9.08-13.56,15.7-14.7s13.62,1.89,19.73,8.57C414.49,356,419,365.93,420.95,377c3.9,22.55-4.33,42.87-18.36,45.3a14,14,0,0,1-3.37.13,23.47,23.47,0,0,1-7.5-1.87,23.81,23.81,0,0,1-3.64-1.93,7.5,7.5,0,0,1-.69-.53,5.15,5.15,0,0,0-.63-.48,4.85,4.85,0,0,0-.5.19,4.3,4.3,0,0,1-.86.29l-.6.09a4.18,4.18,0,0,0-.89.18.65.65,0,0,0-.38.3,1.91,1.91,0,0,0,.33.55l.19.27a5.89,5.89,0,0,1,.65,1.35c.08.21.16.42.26.63a1.78,1.78,0,0,0,.49.36l.29.18a27.71,27.71,0,0,0,14.78,4.57,16.5,16.5,0,0,0,2.8-.22c16.26-2.82,26-25.27,21.71-50.06h0c-2.05-11.85-7-22.5-13.81-30-7.08-7.75-15.42-11.24-23.47-9.85S373,344,368.94,353.64c-3.27,7.78-4.54,17.11-3.68,27l.09,1.08h-1.09a25.09,25.09,0,0,0-16.52,6.47l-1.06,1-.54-1.33C338.55,369.1,322.28,357.27,305.14,357.27Zm4.32,95.22c-19,0-36.41-16.32-40.32-38.94-4.3-24.85,9.32-48,30.36-51.67a33.19,33.19,0,0,1,5.65-.49c19.14,0,36.48,16.74,40.32,38.94a49.84,49.84,0,0,1-5.75,33.94C334,444,325.23,450.25,315.1,452A33,33,0,0,1,309.46,452.49Zm-4.31-89.1a31.2,31.2,0,0,0-5.31.46c-20,3.46-32.85,25.6-28.73,49.36S294.8,453.49,314.76,450c9.55-1.65,17.8-7.61,23.23-16.79h0a47.84,47.84,0,0,0,5.5-32.58C339.81,379.42,323.32,363.39,305.14,363.39Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M371.49,408.63a13.15,13.15,0,0,1-1.43-.08,12.82,12.82,0,0,1-8.47-4.94,9.18,9.18,0,0,1-1.83-7.18c1.23-6.66,9.76-7.66,14.6-7.21h0a9.63,9.63,0,0,1,4.79,1.55,8.4,8.4,0,0,1,3.17,7.19,11.07,11.07,0,0,1-6.4,9.79A11.23,11.23,0,0,1,371.49,408.63Zm.79-14.5c-3.31,0-7.17.89-7.6,3.21a4.26,4.26,0,0,0,.92,3.28,7.71,7.71,0,0,0,5,3,6.7,6.7,0,0,0,3.36-.42,6.08,6.08,0,0,0,3.38-5.35,3.59,3.59,0,0,0-1.08-3,5.2,5.2,0,0,0-2.35-.64h0C373.39,394.15,372.85,394.13,372.29,394.13Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M363.66,424.5a11.22,11.22,0,0,1-7.68-3,12.76,12.76,0,0,1-3.34-12.21,15.39,15.39,0,0,1,7.71-9.63,2.5,2.5,0,0,1,2.39,4.39,10.53,10.53,0,0,0-5.24,6.45,7.79,7.79,0,0,0,1.94,7.37,6.05,6.05,0,0,0,6.84,1,13.26,13.26,0,0,0,1.65-1.22,18.82,18.82,0,0,1,2.06-1.53c3.61-2.23,8-2,11.37-1.58,1.91.24,4,.51,5-.3s.89-3.23,0-5c-1.06-2.1-5.27-5.48-8-6.77a2.5,2.5,0,0,1,2.15-4.51c3.08,1.47,8.52,5.54,10.28,9s2,8.39-1.34,11.12c-2.66,2.14-6.14,1.7-8.68,1.37s-5.91-.53-8.19.87a14.67,14.67,0,0,0-1.52,1.14,17.46,17.46,0,0,1-2.31,1.68A10.19,10.19,0,0,1,363.66,424.5Z" transform="translate(-60.79 2.5)"/><path class="cls-2" d="M376.27,435a8.13,8.13,0,0,1-4-1,13,13,0,0,1-3.16-2.74,12,12,0,0,1-1.82-2.39c-1.18-2.18-2.32-5.7-2-8.26a2.5,2.5,0,1,1,5,.56,11.53,11.53,0,0,0,1.46,5.31,8.1,8.1,0,0,0,1.12,1.4,8.88,8.88,0,0,0,1.92,1.75,4,4,0,0,0,4-.44,6.94,6.94,0,0,0,2.53-4.42,20.49,20.49,0,0,0-.59-7,2.5,2.5,0,1,1,4.89-1,24.37,24.37,0,0,1,.62,8.94,11.8,11.8,0,0,1-4.51,7.58A9.3,9.3,0,0,1,376.27,435Z" transform="translate(-60.79 2.5)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.png b/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.png
deleted file mode 100644
index 0d72555c53..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.svg b/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.svg
deleted file mode 100644
index 4132cb3cae..0000000000
--- a/installer/vendor/github.com/golang/dep/docs/img/DigbyShadowsScene2.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 725.13 841.56"><defs><style>.cls-1{fill:#1c1c1b;}.cls-2{fill:#ced8d2;}.cls-3{opacity:0.2;}.cls-4{opacity:0.45;}.cls-5{fill:#ccbca8;}.cls-6{fill:#b79765;}.cls-7{fill:#fff;}.cls-8{opacity:0.38;}.cls-9{fill:#f6d2a2;}.cls-10{fill:#b7a38d;}.cls-11{fill:#1d1d1b;}.cls-12{opacity:0.19;}</style></defs><title>BoyerShadowsScene2</title><g id="Capa_10" data-name="Capa 10"><path class="cls-1" d="M764.83,322.58A357.59,357.59,0,0,0,608.13,193.31l.36-11,36.64-58.43a2.5,2.5,0,0,0-2.34-3.82l-24.27,2.17,11.87-36.4a2.5,2.5,0,0,0-1.76-3.2l-134.5-34a2.5,2.5,0,0,0-3.05,1.89l-21.16,96.39L429.15,79.7a2.51,2.51,0,0,0-2.31-1.2L276.83,89a2.5,2.5,0,0,0-2.15,3.41l3.72,9.52-17.26-4.35a2.5,2.5,0,0,0-2.5,4.06l53.29,61.29V202.7a3.52,3.52,0,0,0-3.42-.16,357.58,357.58,0,1,0,456.3,120Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M468.33,885.06a362.61,362.61,0,0,1-162-687q.32-.16.65-.29v-33l-52.07-59.88a7.5,7.5,0,0,1,7.49-12.19l7.84,2-.18-.47A7.5,7.5,0,0,1,276.48,84l150-10.5a7.49,7.49,0,0,1,6.93,3.59l34.28,56.48,18.48-84.19a7.5,7.5,0,0,1,9.15-5.67l134.51,34a7.5,7.5,0,0,1,5.29,9.6l-9.52,29.2L642.34,115a7.5,7.5,0,0,1,7,11.45l-35.92,57.28-.2,6.29a362.56,362.56,0,0,1-144.91,695ZM310,207.39a352.51,352.51,0,1,0,296.15-9.48L603,196.57l.51-15.82,34.68-55.31-26.8,2.39L624.8,86.77,495.4,54.06,472.12,160.13,425.66,83.6,280.58,93.76l6,15.39-18.95-4.78,49.29,56.69v50.56Z" transform="translate(-105.77 -43.5)"/></g><g id="background_color" data-name="background color"><path class="cls-2" d="M606.14,196.29C733.21,250,822.37,375.85,822.37,522.5c0,195.53-158.51,354-354,354s-354-158.51-354-354c0-138.66,79.71-258.7,195.81-316.8" transform="translate(-105.77 -43.5)"/></g><g id="background_shadows" data-name="background shadows"><g class="cls-3"><polygon points="655.41 575.12 531.59 650.5 494.43 631.06 496.06 597.66 556.54 578.75 655.41 575.12"/></g><g class="cls-3"><path d="M168.51,577.42l-52.39,5.17s20.59,65.66,26.2,78.18S178.74,727,185.62,737.5s37.45,40.32,37.45,40.32L383.61,705Z" transform="translate(-105.77 -43.5)"/></g></g><g id="Capa_9" data-name="Capa 9"><path class="cls-1" d="M770.15,537.19c-5.12,0-9.59-.48-13-1.76a2.5,2.5,0,0,1,1.78-4.67c7.58,2.88,23.89.83,38.27-1,8.92-1.12,17.34-2.18,23.83-2.18a2.5,2.5,0,0,1,0,5c-6.19,0-14.46,1-23.21,2.14C788.21,535.95,778.35,537.19,770.15,537.19Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M116.11,585.09a2.5,2.5,0,0,1-.58-4.93c12-2.85,23.67-3.07,36.58-3.07a2.5,2.5,0,0,1,0,5h0c-12.64,0-24,.21-35.42,2.93A2.48,2.48,0,0,1,116.11,585.09Z" transform="translate(-105.77 -43.5)"/><g class="cls-4"><path class="cls-1" d="M307.84,758.67h-4.67a2.5,2.5,0,0,1,0-5h4.67a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M348.51,782.67h-6a2.5,2.5,0,1,1,0-5h6a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M491.18,824.67h-2.67a2.5,2.5,0,1,1,0-5h2.67a2.5,2.5,0,1,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M546.51,806h-2.67a2.5,2.5,0,0,1,0-5h2.67a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M693.18,678.67a2.5,2.5,0,0,1-1-4.78,9.8,9.8,0,0,1,4.46-.89,2.5,2.5,0,0,1,2.41,2.59,2.53,2.53,0,0,1-2.59,2.41,4.85,4.85,0,0,0-2.2.44A2.49,2.49,0,0,1,693.18,678.67Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M671.17,663.33a2.5,2.5,0,0,1-.21-5l3.06-.29c1.43-.14,2.86-.28,4.3-.38a2.5,2.5,0,0,1,.36,5c-1.4.1-2.79.24-4.18.37l-3.13.29Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M743.84,654h-6a2.5,2.5,0,0,1,0-5h6a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M787.18,579.33h-8a2.5,2.5,0,0,1,0-5h8a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M628.13,800.15a18.45,18.45,0,0,1-6.49-1,2.5,2.5,0,1,1,1.73-4.69c2.16.8,4.77.7,7.54.59,1,0,2-.07,2.94-.07a2.5,2.5,0,0,1,0,5h-.09c-.87,0-1.75,0-2.65.07S629.13,800.15,628.13,800.15Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M302.11,802.76a25.61,25.61,0,0,1-6.21-.84,2.5,2.5,0,0,1,1.22-4.85,18.38,18.38,0,0,0,6.44.61,2.5,2.5,0,1,1,.57,5A17.58,17.58,0,0,1,302.11,802.76Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M354.79,816.06a18.53,18.53,0,0,1-8-1.64,2.5,2.5,0,0,1,2.15-4.51,14.84,14.84,0,0,0,7.42,1.1,2.5,2.5,0,0,1,.35,5Q355.72,816.06,354.79,816.06Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-4"><path class="cls-1" d="M239.84,748.67h-5.33a2.5,2.5,0,1,1,0-5h5.33a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/></g></g><g id="COLOR"><path class="cls-5" d="M636.94,672.51l.8-29.52,123.44-24.37V376.75L670.5,347.84,601.4,325l3.79-143.43L643,122.5,615,125,627.37,87,493.51,51,468.33,152.25,427,81,277,91.5l5.55,14.05L262,101.71,313.76,162l.69,106.83L247.51,274l-11.2-.75,8.12,48.44-1.59,103.56v2.92l-42.58,5.43V470.5l-50.82,8v45l-4.36,2,12.4,36-2,100.22,95.38,63.2c.75.5,131-19.64,131-19.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M488,791.08c1.73.41,3.46.83,5.22,1.13,6.25,1.07,11.6,2.26,18.06,1.63,15.87-1.55,33.24-1.7,48.46-6.84,9.3-3.14,17.6-8.61,25.79-14l21.6-14.3c7.14-4.73,14.35-9.51,20.21-15.76,3.07-3.27,6-7.1,10.28-8.44,3.42-1.07,6.91,0,10.21-1s6.54-3.75,8.88-6.16a28.13,28.13,0,0,0,8.11-19.64c-.06-4.51-1.64-9.52-5.69-11.52-5.15-2.55-8.9,1.34-12.27,4.65-2.85,2.8-5.23,7.7-7.65,2-1.27-3-1-5.72-1.82-8.82-2-7.49-2.87-17.1-6.28-24.09s-13.47-5.69-19.9-5c-3.27.35-6.28,2.14-9.35,2.57-5.08.73-10.24-.11-15.36.77-10,1.71-20.73,3.63-30.14,7.61-10.29,4.35-19,11.78-28.48,17.55-6.62,4-8.49,8.54-12.51,14.63-2.18,3.29-2.85,4.21-7.09,4.81a13.21,13.21,0,0,0-7.4,3,133.18,133.18,0,0,0-20,17.45A147.06,147.06,0,0,0,464.33,755c-2.47,4-4.95,7.94-7.57,11.93-2.18,3.31-7.21,7.6-8.2,11.21,4.48.44,9.38,4.8,13.63,6.63,4,1.74,8.69,4.48,13,5.08,2.75.39,5.59-.06,8.33.34C485,790.4,486.49,790.73,488,791.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M577.72,629.6q1.12-1.14,2.21-2.32c2.31-2.5,6.69-5.41,7.4-8.85a12.6,12.6,0,0,0-.2-4.62c-.49-2.9-4-13.59-1.07-15.25a6.65,6.65,0,0,1,2.48-.54c4.88-.6,8.84-4.32,11.51-8.45,7.67-11.89,6.78-30.25-1.48-41.48l-5.77-7.85a42.81,42.81,0,0,0-6.15-7.19,24.19,24.19,0,0,0-19.1-5.79c-5.24.6-10.62,1.84-15.71.44-6.12-1.68-10.55-6.81-15.62-10.61-11.44-8.57-26.51-10.51-40.81-10.52a6.36,6.36,0,0,1-3.58-.7,7.41,7.41,0,0,1-2-2.67,19.85,19.85,0,0,0-6.55-6.83,7,7,0,0,0-4.88-1.36,8.49,8.49,0,0,0-3.73,2.19c-2.45,2.07-5.11,4.3-6.63,7.19-1.34,2.55-.75,6.11-3.41,7.46-2.07,1.05-6.25,1-8.69,1.86q-6,2.11-11.86,4.63c-11.08,4.77-21.65,10.62-32.2,16.46-9.48,5.25-19.69,11.33-23.34,21.53-.76,2.13-2.21,3-3.16,5a22.16,22.16,0,0,0-23.17,2.28,10.31,10.31,0,0,0-4.1,5.86,10.86,10.86,0,0,0,1.44,6.8,28,28,0,0,0,16.12,13.78,4.73,4.73,0,0,1,2.38,1.28c1.42,1.8-.31,4.55-1,6.29a16.18,16.18,0,0,0-1.49,6.8v50.12c0,5.83.09,12,3.07,17,24.4.82,49.14-5.34,73.43-7.85,10.86-1.13,21.79-1.25,32.68-2,13.67-1,27.24-2.89,40.81-4.83,6.15-.88,12.4-1.86,18.23-4.11a93,93,0,0,0,25.29-15.26A110.36,110.36,0,0,0,577.72,629.6Z" transform="translate(-105.77 -43.5)"/><path class="cls-7" d="M551.14,648.24a67.44,67.44,0,0,1-9.66,4.38,66.76,66.76,0,0,1-13.13,2.49q-36.59,4.39-73.27,7.93c-22.21,2.14-43.57,6.23-65.86,7.06a40.19,40.19,0,0,0-15.61,3.34c-.16,3.1-.3,6.31.75,9.23s3.64,5.53,6.75,5.62a31.17,31.17,0,0,0,1.32,12.18,62.17,62.17,0,0,0,3.63,8.47c2.84,5.82,5.29,12.19,8.67,17.71,2.63,4.3,5.48,8.34,6.8,13.35,1.23,4.67,3.06,6.19,6.32,9.51,3.59,3.65,7.3,7.54,11,11.31,5.46,5.63,10.9,9.18,18,12.77,1.93,1,3.89,1.83,5.74,2.84,3.09,1.68,3.64,2.29,6.11-.71,3.95-4.81,7.13-10.25,11.23-14.92,3.41-3.88,6.75-7.86,9.78-12,4.73-6.42,9.78-12.61,14.9-18.73,4.32-5.16,10.41-8.76,15-13.52,2.82-2.94.35-3.06-.08-7.15-.74-7,2.48-24.26,12.5-18.55,3.65,2.08,4.47,6.22,7.77,7.92,1-2.83,4.22-5.08,6.75-6.63,4.12-2.52,7.95-5.48,12.35-7.42,6.86-3,13.52-6.36,20.46-9.1,7.16-2.83,14.43-6.14,22-7.72,8.37-1.74,16.44-1.92,25-2.34,6.53-.32,13.08-.12,19.43-1.12,0-1.92-3.18-4.81-4.48-6.45a70.75,70.75,0,0,0-5.79-6.52c-4.4-4.28-8.58-.64-12.84,2.51s-15.29,11-19.27,3.36c-4.43-8.46,2.81-15.4,10.76-15.85,4.41-.25,7.76.45,11.09,3.34,2.94,2.54,5,6.21,8.85,7.3,3.25-5.74-.65-13.37-5.28-16.92-5-3.86-11-3.82-15.33-8.71-1.53-1.75-3-6-5-7-2.57-1.27-4.3,2.26-6,4.44-4,5.2-7.54,10.85-13.37,14.23S557.26,645.07,551.14,648.24Z" transform="translate(-105.77 -43.5)"/><g class="cls-8"><path class="cls-7" d="M548.55,520.1a25.14,25.14,0,0,1,6.58-6.75,23.42,23.42,0,0,1,7.31-2.95,40.69,40.69,0,0,1,35.7,8.76c11.42,10,15.88,25.19,17.67,39.75.86,7,2.84,12.83,1.86,20a46.19,46.19,0,0,1-9.29,22.14,24.82,24.82,0,0,1-7.23,6.57c-4.26,2.37-9.29,2.79-14.15,3.17l-12.41,1c-3,.23-6.28.43-9-1-2.14-1.16-3.63-3.21-5-5.2C543.23,581.15,529,547.74,548.55,520.1Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-8"><path class="cls-7" d="M423.16,562.28a25.14,25.14,0,0,1,6.58-6.75c17.24-11.2,40.27-11.29,59.15-4.76,7.48,2.59,15,6.48,19.15,13.23,2.19,3.57,3.27,7.7,5.06,11.48,2.78,5.88,5.22,8.87,5.62,15.37.35,5.59,1.06,11.13,1.07,16.75,0,10.38-1.67,22-10.26,29-9.82,7.93-21.24,14.51-33.77,16-11.55,1.37-23.07-1.78-33.34-6.94-4.59-2.31-11.26-5.26-14.7-9.17-2.83-3.22-4.69-8.71-6.44-12.64C412.37,603.93,410,580.92,423.16,562.28Z" transform="translate(-105.77 -43.5)"/></g><path class="cls-9" d="M521.44,619.75a4.06,4.06,0,0,0,.1,2.17,3.59,3.59,0,0,0,1.47,1.52,10.39,10.39,0,0,0,11.8-.66c2.25-1.82,3.66-4.55,6-6.22,4.47-3.15,10.66-1.55,15.94-3a8.15,8.15,0,0,0,5.21-3.66c1.57-2.92.15-6.82-2.56-8.74s-6.3-2.16-9.56-1.52a7.14,7.14,0,0,0-2.58.94c-.5.33-.92.76-1.44,1.07a7.24,7.24,0,0,1-2.14.74,91,91,0,0,1-9.6,2.15c-1.8.21-4-.33-5.66.51C524.25,607.22,522.06,615.55,521.44,619.75Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M539.69,595.19a16.74,16.74,0,0,0-5.23,2.53,7.4,7.4,0,0,0-2.66,3.05,2.77,2.77,0,0,0-.21,1.58,3,3,0,0,0,1.52,1.83,8.09,8.09,0,0,0,4.66.9,34.56,34.56,0,0,0,4.74-.86,12.39,12.39,0,0,0,4.27-1.41,3.67,3.67,0,0,0,1.78-3.83,4.43,4.43,0,0,0-2.74-2.55,12.88,12.88,0,0,0-7.51-.78" transform="translate(-105.77 -43.5)"/><path class="cls-7" d="M538.59,620.55a4.57,4.57,0,0,0,.24,1.64c.34,1.06,2.86,5.74,4,6.17,3.37,1.25,12-3.91,12-7.67-.11-7-5.46-6-10.54-4.6C541.69,616.81,538.73,617.93,538.59,620.55Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M511.18,690.5c-9.54-4.09-12.13,7.26-11.68,14.67.27,4.56,1.43,7.6,6.67,7.33,4.82-.25,10.48-4.16,12.43-8.64S516.34,693.51,511.18,690.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-6" d="M601.84,640.83c-4.64-2.27-18.77,2-20.76,7.33-5.05,13.47,13.34,13.65,20.77,9.07C608.25,653.3,614.29,646.82,601.84,640.83Z" transform="translate(-105.77 -43.5)"/><polygon class="cls-10" points="261.69 395.02 182.17 404.84 135.41 383.03 140.61 281.16 130.54 229.75 142.41 232.33 236.08 222.66 247.41 240.66 251.49 239.66 264.08 210.62 310.13 222.66 306.47 236.45 312.74 236 302.08 275.33 302.33 355.11 274.9 357.33 280.37 390.09 254.85 381.34 261.69 395.02"/></g><g id="shadows"><g class="cls-3"><path d="M397.5,545.11c5-5.27,11.18-9.17,17.39-13.1A178.07,178.07,0,0,1,454,513.52c9.72-3.16,11.15,1.58,1.09,5.49-13.06,5.07-23.87,13.14-34.14,22.5-5,4.57-9.92,9.43-12.86,15.51-1.65,3.4-2.59,7.48-5.24,10.47-3.92,4.43-14.43-.32-16.81-4.62C382.68,556.72,393.35,549.5,397.5,545.11Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M382,562c-5.63,0-12.67-3.47-18-.5-4.91,2.72-4.43,8.73-2.47,13.29s24.31,23.4,28.12,14.83c3.14-7.07-16.95-5.47-16.56-12.54a19.12,19.12,0,0,1,7.37-1.17C378.68,571.07,368.68,567.89,382,562Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M384,591c7.86,3.69,6.66,5.87,5.47,14.64-1.21,9-1.08,18.17-1.47,27.24-.3,6.87-1.18,15,3.13,21,4.79,6.71,16.64,7.09,24.13,8.07,8,1,18.91-.5,26.2,3.17-3.93,3.94-14.31,4.92-19.68,6.17-4.66,1.08-15.51,2.6-18.16,7.19-7,12.16,24.8,5.86,29.86,6.61C430.25,689,423,689.26,419.59,694c-3.68,5.12-3.85,13.11-4.19,19.11-.23,4-1.78,10.13,1.1,13.51,3.7,4.34,9.49-.2,14.53.43-2.72,3.86-10.18,13.25-3.22,15.51,5.82,1.89,4.29-2.58,6.7,3.49,1.45,3.66,1.39,8.13,5.53,10.21,7.8,3.9,21.8-9.37,27.09-14.47,6.7-6.46,11.79-11.78,19.74-16.69-.87,11.91-14.7,18-9.25,31.79,2.53,6.4,8.75,6.78,14.38,8.92,8.59,3.25,15.42,8.84,25,9.72,13.5,1.24,33.1,1.14,42-10.27,2.18-2.8,3.23-5.43,4.67-8.7,1.78-4,3.92-5.88,6.72-9-1,5.36-8.77,20-1.41,23.71,13.74,6.92,12.34-18.61,19-20.89,1.43-.49,5.89.68,8,.15,3.36-.85,6.88-3.07,10-4.63,5.77-2.91,12-4.53,17.39-8,3.74-2.42,7.76-5.79,11.54-7.81.46,4.6-7.45,12.32-10.55,15.42-4.11,4.11-10.12,7.33-15,10.76s-9.45,7.28-14.4,10.37c-4.23,2.65-9.38,3.45-13.18,6.19s-7.22,7.6-11.81,9.46c-2.16.88-4.08.2-6.25.73-2.45.6-5,2.09-7.69,3-13.71,4.59-29,9.28-43.56,8.5-8-.42-15-2.41-22.5-4.38-8.37-2.18-16.81-1.56-25-5.12-3.7-1.61-6.83-4.38-10.5-5.89-4.3-1.76-7.44-.64-11.5-1.1-7.84-.9-15.56-9.4-22-13.38-5.16-3.2-7.15-4.55-9.89-10.14a35.34,35.34,0,0,0-6.62-9.37c-4-4.35-3.95-10.18-8-14.61a57.14,57.14,0,0,1-6.5-8.39c-2.83-4.55-4.85-10.14-7.38-14.9a40.53,40.53,0,0,1-4.22-19.15c-5.68-.11-6.63-13.83-2.5-13.65.6-5.41-.77-12.84-1.3-18.39-.71-7.47-.6-14.91-.62-22.45,0-13.08,2.26-27.58,5.5-40.09" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M426.51,572c1.41-7.49,16.39-15.55,23.46-15.42-3.75,6.73-9.32,11.19-11.58,19.07a45.42,45.42,0,0,0-1.77,18.11A40.07,40.07,0,0,0,441.13,608c2.54,4.31,6.43,5.21,9.94,8-3,3.14-4.63,3.31-2.09,7.76,2.93,5.14,8.72,6.95,14.14,8.37,10.51,2.77,28.08,4.58,34.86-6.49-16.19,15.3-36.68,25.36-58.07,12.58-12.57-7.51-19.57-13.86-23.88-28.61-1.87-6.42-3.34-12.12-.9-18.64C417.81,583.78,425.11,577.49,426.51,572Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M531,599c-3.57,4.47-7.85,6.24-9.5,12a57.08,57.08,0,0,0-2,12.5c-.29,5.67,1,8.58,7.25,8,5.91-.53,7-2.14,12.5,0,6.66,2.55,8.28-.52,12.58-5.54-4.84,1.41-5.52,1.57-8.1-2.32-1.2-1.81-1.57-7.2-4-7.68-3.17-.63-5.09,5-8.61,4.07C526.64,618.81,526.54,607.42,531,599Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M550.51,537c-4.84,2.19-3.83,18.15-3.61,22.88.17,3.51-.69,7.91.13,11.32,1,4,4.64,8.32,6.79,11.76,3.47,5.55,6.81,14.68,12.42,18.55,2.47,1.71,5.68,1.68,8.27,3,2,1,4,3.89,6.48,4,9.84.57,2.46-8.92,4.07-12.52-1.59-1.66-2.65-.1-4.69-1.08-2.83-1.35-4.65-3.69-6.49-6.16-2.19-2.94-10.08-12.09-8.81-15.26C556.24,566.71,556.23,550.37,550.51,537Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M541,653.5c-4.87,1.15-16.92,1.11-19,6.51,2.92,2.72,8.27,1.67,10,5,1.52,2.94-1.09,7.9-.94,10.93,1.35-.47,1.81,0,3-1.23-.18.23-.84,1.14-1,1.24,11.63-9.73,25.33-19.65,39.84-24.52a46.33,46.33,0,0,0,1.51-8.3c-2.32,3.22-7.76,10.68-12.17,10.41-4.11-.26-5.75-6-10.75-3.52" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M453,696.5c-2.61-11.13,16.36,1.09,19,2.51s8.67,6,12,5c2.82-.81,4-6.32,4.5-9.37.67,3.88,1.2,13.8,6,7.29,1.12,2,3.18,1.81,4.88.63,2.47,7.16,8.24,2.66,13.12,2.08,5.19-.62,4.57,2.06,1.09,5.5-3.27,3.22-7.93,5-11.6,7.86-4.18,3.22-9.4,11.64-15.46,10.93-.22-3,2.27-5.72,0-8.33s-8.35-1.45-11.26-1.64C465.86,718.33,452.75,711.41,453,696.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M522,674c-8-.49-16.6,3.35-24.53,4.11-6.43.62-13.74,1.36-20,3.52,2.5,2.54,8.24,1.53,11.48,1.48,1.54,0,3.76-.59,5.25-.13,3.06.95,2.36,2.71,4.44,4.23,3.43,2.5,6,0,10.7.89,3.2.61,6.72,2.68,10,3.34.81-5.63-1.54-4.06,2.59-8.94C524,680.17,527.32,675.21,522,674Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M587.51,635.5c-2.71,2.1-4,5.66-6.25,8.25-1.88,2.15-4.78,2.8-4.17,6.17,7-1.05,3.11,7.88,7.44,10.45,4.76,2.83,11.54-2.32,13.93-5.55-2.39,1.91-6.4,2.54-9.36,2.1-2.8-7.06-.07-13.59,6.91-15.68,2.73-.82,6.22.58,3.81-2.65-1.29-1.72-5.39,1.22-4.12-3.25.6-2.11,4.27-1.68,5.28-3.76C597.63,631,589.38,625.44,587.51,635.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M638,714.5c-.73-4.45,7.31-16.33,12.42-15.42C651.87,705,642.81,714,643.5,721c.88,9,10.68,2.07,14.41-1.45.53,7.84-12.88,16.15-19.61,17-1.17.14-3.7.38-4.79,0-3.38-1.19-2.44.34-2-3.33C632.39,725.34,636.61,717.18,638,714.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M149.44,520V478.5L278.51,461l9,79.5,33-75L427,514.83l-3.29,9.8-18.49,11.77c.57-.36-1.54-8.07-1.79-9a193.18,193.18,0,0,1-25.81,4.06c-26.8,2.53-54.93,12.18-78.25,26.11-13,7.79-25.92,20.72-34.38,33.37a62.39,62.39,0,0,0-6.54,11.79c-2.89,7.39-.68,11.48-.05,18.7.46,5.29-.47,11-.78,16.28l-2.2,37.91L252.51,726l-97-64.27,2-101.09L142,522.5l7,1.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M238.51,426.5C232,427,225.38,430,219,430.89c-3.94.57-12.23.11-15.32,2.54-3.36,2.64-1.89,12.95-2.18,17.08-.37,5.2-2.53,13.57-1.42,18.43,9.62-2.43,19.82-2.39,29.79-3.41,10.33-1.06,21.15-3,31.39-3.5,3.72-.18,12.9-2.25,15.62.46,2.25,2.24,1.78,8.66,2.11,11.55.8,6.93,1.46,13.84,2.47,20.71,1.2,8.15,2.61,16.1,4,24.25,1.06,6,.85,12.5,3.12,18.26,6.35-9.54,13-21.37,16.62-32.52,2.25-6.92,3.77-13.84,6.26-20.75,2-5.68,3.07-15,9.83-17,8-2.32,18.46,6.73,25.46,9.47A140.2,140.2,0,0,1,370.51,489c6.61,4.21,18.87,10.6,26.93,11a141,141,0,0,0,.09-21.89C396.9,471.33,392,470.72,387,466c-2.93-2.78-5.59-6-8.31-8.93s-3.23-5.8-4.75-9.29c-1.35-3.11-3.44-5.93-4.14-9.21-6.1-.5-12.51,2.61-18.74,2.9-6.91.32-13,1.68-19.78,3.06A249.22,249.22,0,0,1,294.35,449c-7.85.36-12.06-3.22-18.83-7-5.83-3.28-11.78-5.78-17.87-8.5C251.93,431,245.54,425.89,238.51,426.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><polygon points="137.08 381.75 138.66 278.19 130.54 228.5 143.74 231.78 236.73 222.66 245.81 240.49 194.74 245.5 179 285.98 182.46 404.33 137.08 381.75"/></g><g class="cls-3"><polyline points="208.66 222.66 208.68 118.5 154.77 56.5 275.74 87 330.85 154.64 330.74 352.89 302.33 355.11 302.24 272.5 313.05 235.7 306.24 236.47 310.13 224.59 262.74 208.7 251.69 240.49 245.81 240.49 236.73 222.66 208.68 225.41"/></g><g class="cls-3"><path d="M357.26,283.5c2.08-1.83,1.64-6,4.49-7.27,1.34-.57,4.9-.4,6.45-.55,3.69-.35,7.36-.09,11-.58,11.07-1.49,22.26-.56,33-.3a22.58,22.58,0,0,0-1.33,5.22c-9.5-.26-19,2.65-28.28,4.23-5.37.91-10.91,1.35-16.31,2C364.25,286.52,360.31,287.34,357.26,283.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M301,290.75c5.31-2.94,15.62-2.08,21.84-2.25,4.48-.12,9.5-1,13.88-.46-.6,1.65-2.53,3.08-3.47,4.71-1.53,2.65-3,5.16-4.72,7.74a119.15,119.15,0,0,0-8.1,13.25c-.72,1.47-1.54,3.09-.48,4.26,1.93,2.12,9.39,2,12,2.25,10.58,1.17,22,1.52,32.51,0,4.11-.59,8.19-.46,12.31-.81,3.62-.31,7.26-1.66,10.91-1.45-5.2-.24-12.24,2.24-17.18,3.76-6.67,2.05-13.53,3.4-20.15,5.55-12.44,4-25.07,7.38-37.65,10.9-9.71,2.72-16.76,8.44-20.84,17.72a69.12,69.12,0,0,0-5.36,18.3c-.29-4.92-1-9.78-1-14.72,0-4.35.48-9-.13-13.27-.9-6.39-1.86-13.37.57-19.54C290.84,314.24,293.23,301.07,301,290.75Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M380.84,407.17c-1.77,5.07-3,10-6.17,14.5-.91,1.32-2.1,3.7-3.37,4.64s-2.7.82-3.84,1.51c2.48,3.34,13.65,5,17.67,5.3,0-3.72-1.84-7.9-2.46-11.65C382.12,418.17,383,412.71,380.84,407.17Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M397.91,409.93a180.76,180.76,0,0,1,18,11.59c5.38,3.79,11.2,6.89,16.6,10.66,4.38,3.06,7.88,6.76,13.23,8a139.68,139.68,0,0,1,14.18,4.34c3.94,1.35,8.21,1.38,12.24,2.32,5.63,1.31,11.3,1.65,16.92,2.92,5.05,1.14,12.39,6.53,17.75,5.08,4.42-1.19,6.07-11.94,8.39-15.6,4.34-6.84,8-13.64,9.68-21.74.88-4.22,1.25-8.22,3.34-12.07,2-3.66,5.26-15.42,9.31-8s3.58,14.83,10.13,21a70.59,70.59,0,0,1,9.66,10.69c3,4.1,7.16,9.47,11.21,12.49,4.2,3.14,10.07,3.95,14.64,6.63,3.68,2.16,7.61,3.82,11.31,6a60.37,60.37,0,0,0,18.37,7.09c12.47,2.52,25.74-2.17,37.9-4-.55,2.26-3.1,4-4.44,6-1.06,1.58-1.43,3.29-2.78,4.64-1.74,1.73-1.53,1.43-4.29,1.68-5.33.48-10.51,1.73-15.8,2.33-13.56,1.53-27.06,3.54-40.6,5.25-6.48.82-13,1.48-19.45,2.18-4.19.45-7.6,2.14-11.62,3.26-2.92.81-5.81.72-8.65,1.32-4.63,1-5.85,6.3-8,10.27-2.56,4.67-4.6,9.71-7.45,14.24s-6.54,1-10.65-.1c-6.11-1.59-13.92-1.39-20.22-1.07-2.53.13-4.53.13-5.91-1.69-1.81-2.39-1.4-4.13-4.1-6-5.81-4-12.71-.16-16.07,5.25-1.53,2.47-2.14,6.12-4.26,7.85-3.86,3.16-12.35,4-17.09,5.33-5.67,1.61-11,2.55-16.51,4.82a63.19,63.19,0,0,1-9.37,3c1.67-2.65,3.33-6.34,2.92-9.57-2.71-.41-4.59-3.14-6.62-4.8-2.82-2.31-6.19-3.9-9.31-5.58-6.3-3.39-14.42-.82-15-9.87-.39-5.76,2.56-12.55.66-18.13s-7.08-10.94-10.34-16c-3.81-5.89-8.77-11.11-12.49-17-2.23-3.55-3.8-7-6.53-10.32-2.24-2.74-5.24-5.44-6.2-9,5.23-.55,12.68,4.75,17.59,6.64,3.15,1.21,7.1,3.56,10.53,3.34a83.1,83.1,0,0,1-7.71-20.4,37.54,37.54,0,0,1-.85-9.78c.16-3.59,3.17-6.26,6.93-4.33,1.7.87,2.56,3.33,4.13,4.72A35.08,35.08,0,0,0,397.91,409.93Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M498.84,341.5c-1.85,2.24-2.51,5.38-3.74,8-1.85,4-4.24,7.62-5.94,11.67-2.29,5.46-4.64,10.71-7.11,16s-4.92,10.64-7.84,15.56c9,1.25,19.34-6.2,28.13-2.94,5.28,2,3.3,10.27,3.57,14.54.38,6.06,1.32,12.13,1.59,18.21.21,4.91,1,9.78,1.35,14.67s.27,10.82,1.91,15.26c1.49-11,7.73-20.76,12.08-30.66,3.34-7.59,7.26-15.17,11.32-22.34,3.58-6.33,10.87-2.74,16.41-.57,10.71,4.18,21.14,8.74,32.28,11.34a116.68,116.68,0,0,1,11.65,3.9c7,2.42,14,5.37,20.69,8.34,8.65,3.83,18.84,9.26,28.28,9.28-2.75-4.55-1.46-10.57-2-15.74s-1-10.33-1-15.55c0-3.66.2-4.46-3-5.89-6.12-2.74-13.07-3.65-19.15-6.43-13.72-6.28-27.27-13-41.12-18.93-8.26-3.52-17.18-5.41-25.28-9.06-7-3.14-14.15-4-21.15-6.69-4.64-1.78-8.43-6-13.31-6.93-2-.39-4.17.41-6.07-.28-2.49-.91-4-3.38-6.92-3.78" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M433.43,154.58c-6.07,1.08-12.36.51-18.52.58-3.35,0-9-.6-12,.73,1.38-.62,6.78,8.19,7.55,9.6,2.42,4.42,6.84,6.94,10,10.75,3,3.58,5.09,7.55,7.57,11.43,2.9,4.53,6.57,10.87,11.43,13.47,4.53-10.25,13.06-19.2,19.41-28.39,2.56-3.71,4-7.7,6.66-11.3s6.15-7.6,7-12.23c-3.25-.48-6,1.2-9.06,1.54-2.73.3-5.54,0-8.32.34C447.82,152,440.62,153.31,433.43,154.58Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M472.51,143.5c2.59-2.07,2.86-7.34,3.66-10.48,1-4.06,2.45-8.06,3.5-12.15a92.72,92.72,0,0,0,2.84-19c.54-11.33,3.49-22.76,6.25-33.74,1.25-5,1.45-10.37,2.79-15.19a27.26,27.26,0,0,1,9.75.44c5.54,1.34,10.83,2.11,16.38,3.33,11.54,2.52,23,4.73,34.35,7.91,9.32,2.6,18.55,5.52,28,7.86,9.07,2.26,18.78,3.33,27.66,6.23a35.11,35.11,0,0,1,9.52,4.59c.81.58,3.62,2,3.93,2.66,1.11,2.55-4,8.71-5.42,11-3.23,5.28-6.39,10.37-9.84,15.49-2.1,3.12-3.41,7-5.73,9.89s-4.23,2.61-7.68,3.16c-4,.63-7.45,2.4-11.34,3.44-4.83,1.29-10,1.63-15,2.31-10.49,1.44-21,2.34-31.52,3.85-8.37,1.2-16.91-.11-25.32.85-6.48.73-12.91,2-19.41,2.68C484.44,139.1,477.72,138.2,472.51,143.5Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M476.51,142.17c-.26,2.37-2.93,5.46-4.82,7.49-3.76,4.05-5.93,8-8.85,12.65-5.36,8.61-11.9,16.14-16.32,25.32a95,95,0,0,1-7,12.15c-1.54,2.29-1.7,3.79-2,6.8-.91,9.54.39,18.75,1,28.22.52,8,1.31,16,1.33,24,0,8.83-2.32,17.54-2.33,26.3.38-12.56,5.41-26.66,10.59-37.93,4.26-9.26,8.41-17.29,15.17-25,3.35-3.82,7.22-6.77,11.1-10,5.25-4.35,10.9-8.67,17.52-11,6.4-2.2,13.1-3,19.48-5.2,15-5.09,30.4-11,46.42-11.86-6.77.32-13.86-.56-20.63-.93-10.38-.56-20.83.27-31.22.27-3.42,0-12.51,2.09-10.53-2.58,1-2.39,5.17-5.25,7.15-6.83,12-9.58,24.27-18.84,37.91-26,8.8-4.64,18.27-8.1,27.56-11.57,7.69-2.87,15.67-6.69,24-7.32-5.87-.3-11.73,1.6-17.48,2.52a201.78,201.78,0,0,1-21.49,2.13c-9.89.48-19.93.34-29.81,0-14.37-.48-28.51,3.68-42.73,3.68" transform="translate(-105.77 -43.5)"/></g><g class="cls-3"><path d="M401.84,536.83c-11,0-18.59,4.06-27.85,9.48-6.91,4-17.08,9-21.31,16-6.15,10.22-3.41,26-1.5,37.2,2.22,13-3.3,22.81-4.68,35.32-1,8.85-.12,18.69.68,27.45,1.25,13.73-3.83,33.5,2.05,46.16,2.56,5.5,10.14,6.08,14.65,10.37,3.14,3,7.47,6.92,9.33,11,2.15,4.72,1.93,10.11,5.35,14.67,4.08,5.44,10.34,9.23,15.3,13.69,3.81,3.42,6.72,7.37,11.49,9.52,7.94,3.57,17.77,4.79,26.39,4.37-.38-4.86-13.29-10.74-17.08-14.57-6.59-6.66-12-17.42-16.65-25.63-5.39-9.57-15-21.1-16.75-32.06-.25-1.6,0-7.54-.88-8.84-1.44-2.15-4.58-.58-6.38-3.62-2.52-4.25-.48-16.51,4.4-18-2-21.66-1.22-43.66-1.22-65.61,0-4.4.8-9.45-1.17-13.11-2.12-3.93-7.74-6.1-10.72-9.19-6.12-6.34-9.28-21.65,2.28-24.59,5.56-1.41,10.68,4.26,14.91,2.32,3.16-1.45,5-8.12,6.83-10.73a64.56,64.56,0,0,1,8.53-9" transform="translate(-105.77 -43.5)"/></g></g><g id="DETAILS"><path class="cls-11" d="M652,604.19a1.5,1.5,0,0,1-.3-3l27.16-5.51a1.5,1.5,0,0,1,.6,2.94l-27.15,5.51A1.5,1.5,0,0,1,652,604.19Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M656.45,629.7a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,1.37-1.62,1.52,1.52,0,0,1,1.62,1.37c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M656.44,629.7a1.5,1.5,0,0,1-.27-3c9.22-1.72,19.79-3.64,28.25-4.79a1.5,1.5,0,0,1,.41,3c-8.4,1.15-18.92,3.05-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M684.63,624.91a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.81-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,0,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.37,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M683.75,598.95a1.5,1.5,0,0,1-.3-3l27.16-5.51a1.5,1.5,0,1,1,.6,2.94l-27.15,5.51A1.5,1.5,0,0,1,683.75,598.95Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M688.15,624.45a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,1.37-1.62,1.52,1.52,0,0,1,1.62,1.37c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M688.15,624.45a1.5,1.5,0,0,1-.27-3c9.21-1.72,19.77-3.64,28.25-4.79a1.5,1.5,0,0,1,.41,3c-8.42,1.15-18.93,3.06-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M716.33,619.67a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.81-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,1,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.37,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M715.47,593.5a1.5,1.5,0,0,1-.3-3L742.33,585a1.5,1.5,0,0,1,.6,2.94l-27.16,5.51A1.49,1.49,0,0,1,715.47,593.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M719.87,619a1.5,1.5,0,0,1-1.43-1c-2.88-8.79-3.75-17.24-4.47-25.85a1.5,1.5,0,0,1,3-.25c.7,8.42,1.55,16.68,4.33,25.16a1.5,1.5,0,0,1-1.43,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M719.87,619a1.5,1.5,0,0,1-.27-3c9.21-1.72,19.76-3.64,28.25-4.79a1.5,1.5,0,1,1,.4,3c-8.43,1.15-18.94,3.06-28.11,4.77Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M748.05,614.22a1.5,1.5,0,0,1-1.41-1c-1.87-5.22-2.82-11.14-3.73-16.87-.54-3.4-1.06-6.61-1.74-9.53a1.5,1.5,0,0,1,2.92-.68c.7,3,1.23,6.29,1.78,9.74.89,5.59,1.82,11.38,3.59,16.33a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M666.66,622.38a1.5,1.5,0,0,1-1.47-1.21,120.78,120.78,0,0,1-1.74-12,1.5,1.5,0,1,1,3-.28,118,118,0,0,0,1.7,11.69,1.5,1.5,0,0,1-1.47,1.79Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M662.34,609.44a.26.26,0,0,0,0,.15c0,.15.25.12.39.05a12.33,12.33,0,0,1,4.83-1.24,11.24,11.24,0,0,1-1.68-2c-.28-.39-1.12-1.92-1.64-1.94s-.76,1.76-.89,2.22A19.33,19.33,0,0,1,662.34,609.44Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M671.86,621.56a1.5,1.5,0,0,1-1.47-1.21,120.75,120.75,0,0,1-1.74-12,1.5,1.5,0,1,1,3-.28,117.9,117.9,0,0,0,1.7,11.69,1.5,1.5,0,0,1-1.18,1.76Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M667.54,608.61a.26.26,0,0,0,0,.15c0,.15.25.12.39.05a12.33,12.33,0,0,1,4.83-1.24,11.24,11.24,0,0,1-1.68-2c-.28-.39-1.12-1.92-1.64-1.94s-.76,1.76-.89,2.22A19.33,19.33,0,0,1,667.54,608.61Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M702.49,619a2.52,2.52,0,0,1-.46,0,3.11,3.11,0,0,1-2.3-2.24,14.26,14.26,0,0,1-.48-1.74l-1.45-6.37a1.5,1.5,0,1,1,2.93-.67l1.45,6.37a12.26,12.26,0,0,0,.35,1.31,5.84,5.84,0,0,0,.14-.61,1.5,1.5,0,0,1,2.95.56,5.49,5.49,0,0,1-.71,2A2.91,2.91,0,0,1,702.49,619Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M693.91,610.54a2.17,2.17,0,0,1-1.89-.87c-.61-.85-.49-2,.34-3.36a8.16,8.16,0,0,1,4.83-3.94,11.49,11.49,0,0,1,4.48-.26,6.73,6.73,0,0,1,3.94,1.92,4.41,4.41,0,0,1,1.9,3.2,1.5,1.5,0,0,1-1.23,1.49c-2.55.46-5.14.88-7.71,1.25-.48.07-1,.12-1.47.17a21.5,21.5,0,0,0-2.27.32A4.39,4.39,0,0,1,693.91,610.54ZM700,605a7.29,7.29,0,0,0-2,.25,4.76,4.76,0,0,0-2.72,2.06c.51-.07,1-.12,1.51-.18s.91-.09,1.36-.16c1.77-.25,3.56-.53,5.33-.83a3.56,3.56,0,0,0-2.16-1.06A11.39,11.39,0,0,0,700,605Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M698.86,604.5a1.5,1.5,0,0,1-1.45-1.11l-.44-1.6a1.5,1.5,0,1,1,2.89-.79l.44,1.6a1.5,1.5,0,0,1-1.45,1.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M729.58,605.81a6.59,6.59,0,0,1-2.87-.71,4,4,0,0,1-1.54-1.23,4.38,4.38,0,0,1-.67-2l-1.1-7.41a1.5,1.5,0,1,1,3-.44l1.1,7.41a2.64,2.64,0,0,0,.16.7,1.16,1.16,0,0,0,.41.26,3.42,3.42,0,0,0,1.76.39,1.67,1.67,0,0,0,1.19-.6c.52-.71.27-2,0-3.21l-1.22-5.27a1.5,1.5,0,1,1,2.92-.68l1.22,5.27c.31,1.32.88,3.77-.5,5.66a4.62,4.62,0,0,1-3.34,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M724.92,595.53a1.5,1.5,0,0,1-.49-2.92,8.6,8.6,0,0,1,2-.38l4.62-.46a1.5,1.5,0,0,1,.3,3l-4.62.46a6.16,6.16,0,0,0-1.34.23A1.5,1.5,0,0,1,724.92,595.53Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M730.91,613.71a1.5,1.5,0,0,1-1.46-1.19c-.54-2.52-1-5.09-1.25-7.65a1.5,1.5,0,1,1,3-.34c.28,2.46.68,4.93,1.2,7.36a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M728.12,615a1.5,1.5,0,0,1-.52-2.91,9.5,9.5,0,0,1,2.54-.46l.75-.07A9.73,9.73,0,0,0,733,611a1.5,1.5,0,1,1,1,2.82,12.73,12.73,0,0,1-2.81.67l-.85.08a7.07,7.07,0,0,0-1.76.29A1.49,1.49,0,0,1,728.12,615Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M500.65,218.38a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3l-27.59,2.52Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M502.24,244.21a1.5,1.5,0,0,1-1.47-1.19c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M502.24,244.21a1.5,1.5,0,0,1-.11-3c9.34-.71,20.05-1.46,28.61-1.69h0a1.5,1.5,0,0,1,0,3c-8.49.22-19.15,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M530.77,242.53a1.5,1.5,0,0,1-1.46-1.15C528,236,527.73,230,527.44,224.2c-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M532.74,216.62a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3l-27.59,2.52Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M534.33,242.45a1.5,1.5,0,0,1-1.47-1.19c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M534.33,242.45a1.5,1.5,0,0,1-.11-3c9.34-.71,20.05-1.46,28.61-1.69a1.5,1.5,0,0,1,.08,3c-8.49.22-19.15,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M562.86,240.77a1.5,1.5,0,0,1-1.46-1.15c-1.29-5.39-1.58-11.38-1.87-17.17-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M564.86,214.67a1.5,1.5,0,0,1-.13-3l27.59-2.52a1.5,1.5,0,1,1,.27,3L565,214.66Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M566.45,240.5A1.5,1.5,0,0,1,565,239.3c-1.9-9.06-1.85-17.55-1.62-26.18a1.5,1.5,0,1,1,3,.08c-.23,8.44-.28,16.74,1.56,25.48a1.5,1.5,0,0,1-1.47,1.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M566.45,240.5a1.5,1.5,0,0,1-.11-3c9.33-.71,20-1.46,28.61-1.69a1.5,1.5,0,0,1,.08,3c-8.51.22-19.16,1-28.46,1.68Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M595,238.81a1.5,1.5,0,0,1-1.46-1.15c-1.29-5.39-1.58-11.38-1.87-17.18-.17-3.44-.33-6.68-.69-9.66a1.5,1.5,0,0,1,3-.36c.37,3.08.53,6.38.71,9.87.28,5.66.57,11.51,1.79,16.63a1.5,1.5,0,0,1-1.46,1.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M513.19,238.06a1.5,1.5,0,0,1-1.49-1.37,120.8,120.8,0,0,1-.42-12.11,1.52,1.52,0,0,1,1.52-1.48,1.5,1.5,0,0,1,1.48,1.52,118,118,0,0,0,.41,11.81,1.5,1.5,0,0,1-1.37,1.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M510.14,224.71a.26.26,0,0,0,0,.15c0,.15.24.14.38.09a12.33,12.33,0,0,1,4.93-.71,11.24,11.24,0,0,1-1.46-2.14c-.24-.42-.91-2-1.42-2.11s-.95,1.66-1.12,2.11A19.33,19.33,0,0,1,510.14,224.71Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M518.45,237.8a1.5,1.5,0,0,1-1.49-1.37,120.79,120.79,0,0,1-.42-12.11,1.5,1.5,0,0,1,1.5-1.48h0a1.5,1.5,0,0,1,1.48,1.52,118,118,0,0,0,.41,11.81,1.5,1.5,0,0,1-1.37,1.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M515.4,224.46a.26.26,0,0,0,0,.15c0,.15.24.14.38.09a12.33,12.33,0,0,1,4.93-.71,11.24,11.24,0,0,1-1.46-2.14c-.24-.42-.91-2-1.42-2.11s-.95,1.66-1.12,2.11A19.33,19.33,0,0,1,515.4,224.46Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M549.29,238.63a2.53,2.53,0,0,1-.73-.11,3.11,3.11,0,0,1-2-2.48,14,14,0,0,1-.28-1.78l-.75-6.5a1.5,1.5,0,1,1,3-.34l.74,6.49a12.42,12.42,0,0,0,.2,1.34,5.71,5.71,0,0,0,.21-.59,1.5,1.5,0,1,1,2.87.88,5.48,5.48,0,0,1-.93,2A3,3,0,0,1,549.29,238.63Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M541.83,229.26a2.3,2.3,0,0,1-2.2-1.1c-.51-.91-.27-2,.7-3.3a8.16,8.16,0,0,1,5.24-3.39,11.43,11.43,0,0,1,4.48.23,6.71,6.71,0,0,1,3.71,2.33,4.4,4.4,0,0,1,1.54,3.39,1.5,1.5,0,0,1-1.39,1.34c-2.58.18-5.21.32-7.8.4-.49,0-1,0-1.48,0a22.18,22.18,0,0,0-2.28.07Zm12-2h0Zm-6.65-2.92a6.64,6.64,0,0,0-1.09.09,4.76,4.76,0,0,0-2.93,1.75c.51,0,1,0,1.51,0s.92,0,1.37,0c1.79-.06,3.59-.14,5.39-.24a3.56,3.56,0,0,0-2-1.29A10,10,0,0,0,547.15,224.35Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M547.14,223.79a1.5,1.5,0,0,1-1.48-1.27l-.26-1.64a1.5,1.5,0,1,1,3-.47l.26,1.64a1.5,1.5,0,0,1-1.25,1.72Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M578,228.46h-.11a6.37,6.37,0,0,1-3.25-1,4,4,0,0,1-1.4-1.39,4.39,4.39,0,0,1-.46-2l-.29-7.49a1.5,1.5,0,0,1,3-.12l.29,7.49a2.64,2.64,0,0,0,.08.71,1.17,1.17,0,0,0,.38.3,3.4,3.4,0,0,0,1.7.58,1.69,1.69,0,0,0,1.25-.46c.6-.65.49-2,.35-3.19l-.64-5.37a1.5,1.5,0,0,1,3-.35l.64,5.37c.16,1.34.46,3.85-1.12,5.57A4.6,4.6,0,0,1,578,228.46Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M574,217.71a1.5,1.5,0,0,1-.33-3,8.77,8.77,0,0,1,2.05-.15l4.65,0a1.5,1.5,0,0,1,0,3h0l-4.64,0a6.15,6.15,0,0,0-1.35.08A1.53,1.53,0,0,1,574,217.71Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M578,236.44a1.5,1.5,0,0,1-1.49-1.35c-.26-2.55-.4-5.16-.41-7.74a1.5,1.5,0,0,1,1.49-1.51h0a1.5,1.5,0,0,1,1.5,1.49c0,2.48.14,5,.39,7.45a1.5,1.5,0,0,1-1.34,1.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M575.09,237.37a1.5,1.5,0,0,1-.36-3,9.55,9.55,0,0,1,2.58-.18h.75a9.75,9.75,0,0,0,2.19-.27,1.5,1.5,0,1,1,.71,2.92,12.81,12.81,0,0,1-2.87.36h-.85a7.06,7.06,0,0,0-1.79.1A1.52,1.52,0,0,1,575.09,237.37Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M266.5,686.83a1.5,1.5,0,0,1-.31-3l27.11-5.73a1.5,1.5,0,1,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,266.5,686.83Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M271.1,712.29a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.21-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.13a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,271.1,712.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M271.1,712.29a1.5,1.5,0,0,1-.29-3c9.18-1.79,19.71-3.79,28.21-5a1.5,1.5,0,0,1,.43,3c-8.43,1.22-18.92,3.21-28.07,5A1.46,1.46,0,0,1,271.1,712.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M299.24,707.28a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.84-.57-3.39-1.11-6.6-1.81-9.51a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.27,1.86,9.72.94,5.59,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M298.16,681.32a1.5,1.5,0,0,1-.31-3L325,672.62a1.5,1.5,0,0,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,298.16,681.32Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M302.77,706.79a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.22-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.13a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,302.77,706.79Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M302.77,706.79a1.5,1.5,0,0,1-.29-3c9.2-1.8,19.75-3.8,28.21-5a1.5,1.5,0,1,1,.43,3c-8.4,1.21-18.9,3.21-28.07,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M330.91,701.78a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.84-.57-3.39-1.11-6.6-1.81-9.51a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.27,1.86,9.72.94,5.58,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M329.83,675.62a1.5,1.5,0,0,1-.31-3l27.11-5.73a1.5,1.5,0,1,1,.62,2.94l-27.11,5.73A1.55,1.55,0,0,1,329.83,675.62Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M334.44,701.08a1.5,1.5,0,0,1-1.42-1c-3-8.77-3.9-17.21-4.68-25.81a1.5,1.5,0,1,1,3-.27c.76,8.41,1.68,16.66,4.53,25.12a1.5,1.5,0,0,1-.94,1.9A1.52,1.52,0,0,1,334.44,701.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M334.44,701.08a1.5,1.5,0,0,1-.29-3c9.19-1.79,19.74-3.8,28.21-5a1.5,1.5,0,0,1,.43,3c-8.41,1.22-18.91,3.21-28.07,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M362.58,696.07a1.5,1.5,0,0,1-1.41-1c-1.91-5.2-2.91-11.12-3.87-16.83-.57-3.39-1.11-6.6-1.82-9.52a1.5,1.5,0,0,1,2.92-.71c.73,3,1.28,6.28,1.86,9.72.94,5.58,1.91,11.36,3.73,16.3a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M281.26,704.9a1.5,1.5,0,0,1-1.47-1.2c-.81-3.95-1.43-8-1.84-12a1.5,1.5,0,1,1,3-.3c.4,3.9,1,7.83,1.79,11.68a1.5,1.5,0,0,1-1.17,1.77A1.54,1.54,0,0,1,281.26,704.9Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M276.84,692a.26.26,0,0,0,0,.15c0,.15.25.12.39,0a12.33,12.33,0,0,1,4.82-1.28,11.24,11.24,0,0,1-1.7-2c-.29-.39-1.14-1.92-1.66-1.93s-.75,1.76-.87,2.23A19.33,19.33,0,0,1,276.84,692Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M286.45,704a1.5,1.5,0,0,1-1.47-1.2,120.91,120.91,0,0,1-1.84-12,1.5,1.5,0,1,1,3-.3,118,118,0,0,0,1.79,11.68,1.5,1.5,0,0,1-1.17,1.77A1.53,1.53,0,0,1,286.45,704Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M282,691.12a.26.26,0,0,0,0,.15c0,.15.25.12.39,0a12.33,12.33,0,0,1,4.82-1.28,11.24,11.24,0,0,1-1.7-2c-.29-.39-1.14-1.92-1.66-1.93s-.75,1.76-.87,2.23A19.33,19.33,0,0,1,282,691.12Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M317.05,701.25a2.49,2.49,0,0,1-.44,0,3.11,3.11,0,0,1-2.32-2.23,14.09,14.09,0,0,1-.49-1.73l-1.5-6.36a1.5,1.5,0,0,1,2.92-.69l1.5,6.36a12.44,12.44,0,0,0,.36,1.31,5.79,5.79,0,0,0,.13-.61,1.5,1.5,0,1,1,3,.54,5.42,5.42,0,0,1-.7,2.05A2.91,2.91,0,0,1,317.05,701.25Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M308.39,692.83a2.17,2.17,0,0,1-1.87-.86c-.61-.84-.51-2,.31-3.36a8.15,8.15,0,0,1,4.8-4,11.42,11.42,0,0,1,4.48-.3,6.72,6.72,0,0,1,4,1.88,4.4,4.4,0,0,1,1.93,3.18,1.5,1.5,0,0,1-1.22,1.49c-2.56.49-5.15.93-7.7,1.31-.48.07-1,.13-1.46.18a21.61,21.61,0,0,0-2.27.33A4.39,4.39,0,0,1,308.39,692.83Zm6.15-5.59a7.42,7.42,0,0,0-2.07.27,4.76,4.76,0,0,0-2.71,2.08c.51-.08,1-.13,1.51-.19s.91-.1,1.36-.17c1.76-.26,3.54-.56,5.32-.87a3.57,3.57,0,0,0-2.17-1A11.49,11.49,0,0,0,314.55,687.24Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M313.31,686.76a1.5,1.5,0,0,1-1.44-1.09l-.45-1.6a1.5,1.5,0,1,1,2.89-.81l.45,1.6a1.5,1.5,0,0,1-1.44,1.91Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M344,687.81a6.59,6.59,0,0,1-2.83-.68,3.93,3.93,0,0,1-1.55-1.22,4.38,4.38,0,0,1-.69-2l-1.16-7.4a1.5,1.5,0,0,1,3-.47l1.16,7.4a2.62,2.62,0,0,0,.17.69,1.14,1.14,0,0,0,.41.26,3.37,3.37,0,0,0,1.76.38,1.67,1.67,0,0,0,1.18-.61c.52-.72.26-2,0-3.21l-1.27-5.26A1.5,1.5,0,0,1,347,675l1.27,5.26c.32,1.32.91,3.77-.46,5.66a4.62,4.62,0,0,1-3.33,1.84Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M339.3,677.57a1.5,1.5,0,0,1-.5-2.91,8.62,8.62,0,0,1,2-.39l4.62-.5a1.5,1.5,0,1,1,.32,3l-4.62.5a6.21,6.21,0,0,0-1.34.24A1.49,1.49,0,0,1,339.3,677.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M345.44,695.71a1.5,1.5,0,0,1-1.46-1.17c-.56-2.51-1-5.08-1.31-7.64a1.5,1.5,0,1,1,3-.36c.3,2.46.73,4.93,1.26,7.35a1.5,1.5,0,0,1-1.47,1.83Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M342.65,697a1.5,1.5,0,0,1-.53-2.9,9.58,9.58,0,0,1,2.54-.48l.74-.08a9.78,9.78,0,0,0,2.15-.53,1.5,1.5,0,0,1,1,2.81,12.85,12.85,0,0,1-2.81.69l-.84.09a7.08,7.08,0,0,0-1.77.31A1.5,1.5,0,0,1,342.65,697Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M698.06,387.11a3.52,3.52,0,0,1-1.07-.17c-19.51-6.22-39-13.58-57.77-20.69-27.37-10.35-55.66-21.06-84.39-28.32a3.53,3.53,0,1,1,1.73-6.84c29.12,7.36,57.61,18.14,85.16,28.56,18.72,7.08,38.09,14.41,57.42,20.57a3.53,3.53,0,0,1-1.07,6.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M233.85,453.13a3.53,3.53,0,0,1-.9-6.94c12.29-3.27,24.88-6.06,37.4-8.29a3.53,3.53,0,0,1,1.24,6.95c-12.33,2.19-24.72,4.94-36.82,8.16A3.55,3.55,0,0,1,233.85,453.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M557.18,676.67a1.5,1.5,0,0,1-1.35-.85,43.4,43.4,0,0,1-1.72-4.29c-1-2.89-1.94-5.39-4.29-7.6a1.5,1.5,0,1,1,2.05-2.19c2.88,2.7,4,5.79,5.06,8.78a41,41,0,0,0,1.6,4,1.5,1.5,0,0,1-1.35,2.15Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M564.18,672.33a1.5,1.5,0,0,1-1.22-.62,9.23,9.23,0,0,1-1.36-4.23,12.75,12.75,0,0,0-.42-2.11,8.8,8.8,0,0,0-1.28-2.19,8.19,8.19,0,0,1-1.89-4.25,1.5,1.5,0,0,1,3-.18,5.7,5.7,0,0,0,1.34,2.7,11.35,11.35,0,0,1,1.68,3,15.14,15.14,0,0,1,.54,2.62,6.87,6.87,0,0,0,.83,2.91,1.5,1.5,0,0,1-1.22,2.38Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M411.84,735.33a1.5,1.5,0,0,1-.95-2.66c4.89-4,15-6.91,21.52-7.33a1.5,1.5,0,1,1,.19,3c-6.1.39-15.52,3.16-19.81,6.67A1.49,1.49,0,0,1,411.84,735.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M425.84,743a1.5,1.5,0,0,1-.73-2.81c.79-.43,1.54-.93,2.35-1.46a21.68,21.68,0,0,1,4.89-2.64,1.5,1.5,0,0,1,1,2.84,19.12,19.12,0,0,0-4.21,2.31c-.81.54-1.66,1.09-2.55,1.58A1.49,1.49,0,0,1,425.84,743Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,698.67h-.07a1.5,1.5,0,0,1-1.43-1.57c.16-3.24,3.28-9.69,5.4-12a1.5,1.5,0,1,1,2.19,2.05c-1.71,1.82-4.47,7.53-4.6,10A1.5,1.5,0,0,1,492.18,698.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,708.33a1.5,1.5,0,0,1-1.37-2.12,14.94,14.94,0,0,0,1.2-4.79,1.5,1.5,0,0,1,3,.14,17.83,17.83,0,0,1-1.46,5.88A1.5,1.5,0,0,1,492.18,708.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M488.84,783.33a1.5,1.5,0,0,1-.57-.11c-.86-.35-1.75-.69-2.57-1a1.5,1.5,0,1,1,1-2.84c.89.3,1.84.66,2.76,1a1.5,1.5,0,0,1-.57,2.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M492.18,776.67H492a9.22,9.22,0,0,1-3.59-1.2,1.5,1.5,0,1,1,1.51-2.59,6.19,6.19,0,0,0,2.41.8,1.5,1.5,0,0,1-.17,3Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M498.45,782.38a6.56,6.56,0,0,1-2.51-.49,1.5,1.5,0,0,1,1.14-2.78,3.67,3.67,0,0,0,1.9.23,1.5,1.5,0,1,1,.39,3A7.09,7.09,0,0,1,498.45,782.38Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M631.18,690.67a1.5,1.5,0,0,1-1.5-1.5v-3a1.5,1.5,0,0,1,3,0v3A1.5,1.5,0,0,1,631.18,690.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M632.51,700.67h-.21A1.5,1.5,0,0,1,631,699a2.59,2.59,0,0,0-.21-1.5,1.5,1.5,0,0,1,2.72-1.26,5.58,5.58,0,0,1,.46,3.17A1.5,1.5,0,0,1,632.51,700.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M627.18,696.33a1.5,1.5,0,0,1-1.5-1.5v-1.67a1.5,1.5,0,0,1,3,0v1.67A1.5,1.5,0,0,1,627.18,696.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M372.18,581.33a1.5,1.5,0,0,1-.72-2.82c3.81-2.08,14.85-4.39,18.79-.4a1.5,1.5,0,1,1-2.13,2.11c-2.49-2.52-11.85-.91-15.21.93A1.49,1.49,0,0,1,372.18,581.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M388.51,580.33a1.5,1.5,0,0,1-1.14-.52,24.8,24.8,0,0,0-5.8-4.47c-3.37-2.12-6.86-4.32-8.77-8.56a1.5,1.5,0,1,1,2.74-1.23c1.54,3.42,4.5,5.28,7.63,7.25a27.44,27.44,0,0,1,6.47,5.05,1.5,1.5,0,0,1-1.14,2.48Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M510.58,669.36l-1.18,0h-1.23a1.5,1.5,0,0,1,0-3h1.29a13.85,13.85,0,0,0,4-.29,1.5,1.5,0,1,1,.81,2.89A13.35,13.35,0,0,1,510.58,669.36Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M521.51,671.33h-2a1.5,1.5,0,0,1,0-3h2a1.5,1.5,0,0,1,0,3Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M549.17,628a1.5,1.5,0,0,1-1.47-1.21A30,30,0,0,0,543,616.46a1.5,1.5,0,1,1,2.31-1.92c2.25,2.71,4.66,8.39,5.32,11.67a1.5,1.5,0,0,1-1.18,1.76A1.46,1.46,0,0,1,549.17,628Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M268.51,659a1.5,1.5,0,0,1-1.5-1.5v-4.67a1.5,1.5,0,0,1,3,0v4.67A1.5,1.5,0,0,1,268.51,659Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M267.84,666.67a1.5,1.5,0,0,1-1.49-1.33,8.15,8.15,0,0,1,.41-3.67,1.5,1.5,0,0,1,2.83,1,5.18,5.18,0,0,0-.26,2.33,1.5,1.5,0,0,1-1.32,1.66Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M273.17,659.33a1.5,1.5,0,0,1-1.48-1.3,4.89,4.89,0,0,1,.48-2.88,1.5,1.5,0,1,1,2.68,1.35,1.89,1.89,0,0,0-.19,1.12,1.5,1.5,0,0,1-1.28,1.69Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M165.51,652.67a1.5,1.5,0,0,1-1.4-.95,33.38,33.38,0,0,1-2.1-13,1.5,1.5,0,0,1,3,.16,30.59,30.59,0,0,0,1.9,11.7,1.5,1.5,0,0,1-1.39,2.05Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M170.51,646.67a1.5,1.5,0,0,1-1.2-.59,17.13,17.13,0,0,1-1.55-2.73c-.19-.39-.38-.77-.57-1.13a1.5,1.5,0,0,1,2.65-1.42c.21.39.41.81.62,1.22a15.28,15.28,0,0,0,1.25,2.25,1.5,1.5,0,0,1-1.19,2.41Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M270.84,441.67h0a1.5,1.5,0,0,1-1.5-1.5,15.5,15.5,0,0,0-.58-3.65,27.65,27.65,0,0,1-.57-2.81,30,30,0,0,1-.21-3.51c0-.44,0-.87,0-1.29a1.5,1.5,0,0,1-1.85-.73,8.88,8.88,0,0,1-.72-2.27,3.93,3.93,0,0,1-.73.54,1.5,1.5,0,0,1-2.2-.92l-.08-.3-.06-.22c-.17.32-.34.63-.53.93a1.5,1.5,0,0,1-2.17.42,6.21,6.21,0,0,1-.52-.43,28.48,28.48,0,0,1,.58,7.39,1.5,1.5,0,1,1-3-.26,27.61,27.61,0,0,0-.63-7.12,35.76,35.76,0,0,1-.73-6.67,1.5,1.5,0,0,1,2.74-.82,18.52,18.52,0,0,1,1.35,2.49c.26.54.51,1.07.78,1.55.22-.52.42-1.09.62-1.72a1.5,1.5,0,0,1,2.46-.64,5.09,5.09,0,0,1,1.07,1.51c.07-.19.13-.37.2-.55a1.5,1.5,0,0,1,2.78,0,12.55,12.55,0,0,1,.71,2.64,1.41,1.41,0,0,1,.86-.25,1.5,1.5,0,0,1,1.4,1,19,19,0,0,1,.69,5.67,27.31,27.31,0,0,0,.18,3.17,24.77,24.77,0,0,0,.52,2.51,18,18,0,0,1,.67,4.36A1.5,1.5,0,0,1,270.84,441.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M206.51,695.33a1.5,1.5,0,0,1-1.41-1c-1.2-3.37-.75-7-.32-10.57a34.32,34.32,0,0,0,.4-6.41,2.38,2.38,0,0,1-1.44.28c-1.77-.24-2.37-2.24-3-4.35l0-.13a4.77,4.77,0,0,1-1.67,2.22,1.5,1.5,0,0,1-2.18-.57,15.46,15.46,0,0,1-1.05-3.23l-.14-.57-.12.56a21.28,21.28,0,0,1-.67,2.66,1.5,1.5,0,0,1-1.35,1,1.49,1.49,0,0,1-1.43-.89,38.93,38.93,0,0,1-2-6.27c-.21-.8-.41-1.59-.62-2.35-.15.79-.28,1.6-.42,2.43s-.23,1.4-.35,2.12-.29,1.44-.47,2.28c-.65,3-1.64,7.55-.66,9.66a1.5,1.5,0,0,1-2.72,1.26c-1.41-3-.38-7.76.45-11.56.17-.8.33-1.54.45-2.17s.24-1.38.35-2.06a31.06,31.06,0,0,1,1.81-7.32,1.5,1.5,0,0,1,2.72-.09,34.45,34.45,0,0,1,2.38,7.07l.26,1a7.69,7.69,0,0,1,1.07-2.13,1.5,1.5,0,0,1,1.13-.61,1.53,1.53,0,0,1,1.19.49,9.35,9.35,0,0,1,1.9,4.11,9.09,9.09,0,0,1,.77-1.8,1.5,1.5,0,0,1,2.42-.22,11.77,11.77,0,0,1,1.88,4.24c.17.57.4,1.33.61,1.85a8.94,8.94,0,0,0,.62-.88,1.5,1.5,0,0,1,2.69.34c1.09,3.36.65,6.94.23,10.41s-.8,6.49.17,9.19a1.5,1.5,0,0,1-1.41,2Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M455.51,328.33a1.5,1.5,0,0,1-1.5-1.43c0-.59-.09-1.18-.15-1.76a24.68,24.68,0,0,1-.18-2.65,1.5,1.5,0,0,1,3,0,21.91,21.91,0,0,0,.17,2.33c.07.64.13,1.28.17,1.93a1.5,1.5,0,0,1-1.43,1.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M455.51,339.67a1.5,1.5,0,0,1-1.5-1.5v-2a1.5,1.5,0,0,1,3,0v2A1.5,1.5,0,0,1,455.51,339.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M462.18,330.33a1.5,1.5,0,0,1-1.45-1.13c-.24-.93-.51-2.33-.69-3.47a1.5,1.5,0,1,1,3-.47c.17,1,.43,2.36.64,3.2a1.5,1.5,0,0,1-1.46,1.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M496.84,441h-.06a1.5,1.5,0,0,1-1.44-1.56v-.35a26,26,0,0,1,.71-6,1.5,1.5,0,0,1,2.88.83,23.86,23.86,0,0,0-.6,5.29v.36A1.5,1.5,0,0,1,496.84,441Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M497.18,450.33a1.5,1.5,0,0,1-1.27-2.3,1.23,1.23,0,0,0,.13-.9,1.5,1.5,0,1,1,2.94-.6,4.22,4.22,0,0,1-.53,3.1A1.5,1.5,0,0,1,497.18,450.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M636.84,488.33a1.5,1.5,0,0,1-1.31-2.22,10.57,10.57,0,0,1,2.73-3.13,1.5,1.5,0,1,1,1.83,2.38,7.6,7.6,0,0,0-1.94,2.2A1.5,1.5,0,0,1,636.84,488.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M743.18,547a1.5,1.5,0,0,1-1.28-2.28,17.16,17.16,0,0,0,1.4-3.36c.16-.46.31-.93.48-1.38a1.5,1.5,0,0,1,2.81,1c-.16.43-.3.86-.45,1.3a19.66,19.66,0,0,1-1.67,4A1.5,1.5,0,0,1,743.18,547Z" transform="translate(-105.77 -43.5)"/><path class="cls-11" d="M747.18,559a1.5,1.5,0,0,1-1-2.61.53.53,0,0,0,.18-.47,1.5,1.5,0,0,1,3-.18,3.52,3.52,0,0,1-1.15,2.87A1.49,1.49,0,0,1,747.18,559Z" transform="translate(-105.77 -43.5)"/></g><g id="LINEART"><path class="cls-1" d="M389.53,594.58a2.5,2.5,0,0,1-.54-.06l-.89-.19c-12.57-2.76-33.6-7.38-31.41-25.13.7-5.64,2.85-9.58,6.39-11.73,7-4.23,17.46-.3,25.87,2.86,2.22.83,4.31,1.62,6.1,2.16a2.5,2.5,0,1,1-1.46,4.78c-1.94-.59-4.1-1.4-6.4-2.26-7.4-2.78-16.62-6.24-21.52-3.26-2.2,1.33-3.51,4-4,8.06-1.51,12.21,12.77,16.39,27.52,19.63l.89.2a2.5,2.5,0,0,1-.54,4.94Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M586.6,621.13h-.12a2.5,2.5,0,0,1-2.37-2.62c.31-6.34.06-8.26-.76-14.61-.25-1.94-.6-4-1-6a2.5,2.5,0,0,1,4.9-1c.45,2.18.81,4.33,1.08,6.39a67.68,67.68,0,0,1,.8,15.5A2.5,2.5,0,0,1,586.6,621.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M384.51,562.5a2.5,2.5,0,0,1-2.11-3.83,92.9,92.9,0,0,1,26.15-27.28,106.28,106.28,0,0,1,34-15.26c4.37-1.1,8.81-2.41,13.1-3.68,8.43-2.49,17.14-5.07,26.13-6.25,1.59-.21,3.17-.44,4.75-.66,6.18-.88,12.57-1.8,19-1.59,8.11.27,13.78,2.23,20.9,5a72,72,0,0,1,29.78,21.5,2.5,2.5,0,0,1-3.83,3.22,67.07,67.07,0,0,0-27.75-20.05c-6.87-2.65-11.92-4.4-19.27-4.65-6-.2-11.92.65-18.16,1.54-1.6.23-3.2.46-4.8.67-8.59,1.13-17.12,3.65-25.36,6.09-4.34,1.28-8.82,2.61-13.3,3.73a101.32,101.32,0,0,0-32.41,14.54,87.87,87.87,0,0,0-24.72,25.8A2.5,2.5,0,0,1,384.51,562.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M378.15,676a2.5,2.5,0,0,1-2.48-2.17c-3.25-24.48-5.7-53.7.79-84.83a2.5,2.5,0,0,1,4.89,1c-6.33,30.4-3.92,59.1-.73,83.16a2.5,2.5,0,0,1-2.15,2.81Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.25,702.13a2.5,2.5,0,0,1-1.5-4.5A210.35,210.35,0,0,1,546.49,679a136.83,136.83,0,0,1,39.61-13.51c3.2-.56,6.43-.83,9.57-1.09a92.3,92.3,0,0,0,9.49-1.1,104.21,104.21,0,0,1,15.61-1.72l-.75-.81c-3.51-3.81-7.88-8.55-11.65-8.77a2.5,2.5,0,0,1,.29-5c5.79.33,10.71,5.66,15,10.37a49.59,49.59,0,0,0,4.7,4.71,2.5,2.5,0,0,1-1.56,4.45h-.06a98.51,98.51,0,0,0-20.7,1.67,97,97,0,0,1-10,1.17c-3,.25-6.14.5-9.1,1a131.83,131.83,0,0,0-38.16,13,205.28,205.28,0,0,0-28.06,18.21A2.49,2.49,0,0,1,519.25,702.13Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M445.87,782.45a2.5,2.5,0,0,1-1.79-.76c-2.5-2.57-6-4.44-9.79-6.42a61.91,61.91,0,0,1-8-4.77c-1.3-1-2.69-1.91-4.17-2.91a59.53,59.53,0,0,1-9.12-7.07,16.94,16.94,0,0,1-3.32-5.47,13.19,13.19,0,0,0-2-3.59,10.17,10.17,0,0,0-1.83-1.43,10.61,10.61,0,0,1-4.93-6.24,12.12,12.12,0,0,0-.93-2,61.62,61.62,0,0,1-3-5.52c-.79-1.56-1.53-3-2.4-4.48-.58-1-1.24-1.9-1.93-2.89-.57-.81-1.16-1.65-1.71-2.52-1.32-2.08-2.37-4.14-3.38-6.14-.52-1-1-2.06-1.61-3.1C381,708,379.4,699.4,378,689.9a2.5,2.5,0,1,1,4.95-.74c1.35,9,2.83,17.18,7.38,25.56.59,1.08,1.13,2.16,1.67,3.22,1,2,1.95,3.84,3.14,5.71.49.78,1,1.53,1.59,2.33.71,1,1.45,2.07,2.13,3.19,1,1.61,1.79,3.24,2.58,4.81a57.23,57.23,0,0,0,2.78,5.08,16.18,16.18,0,0,1,1.37,2.9,5.94,5.94,0,0,0,3.08,3.91,14.23,14.23,0,0,1,2.74,2.23,17.39,17.39,0,0,1,2.87,4.94,12.66,12.66,0,0,0,2.3,4,55.94,55.94,0,0,0,8.36,6.44c1.46,1,3,2,4.35,3a57.43,57.43,0,0,0,7.38,4.36,57,57,0,0,1,8.81,5.36c3-4.17,6.22-8.18,9.37-12.08a177.59,177.59,0,0,0,12.68-17c7.6-12.15,18.9-24.48,32.7-35.65a2.5,2.5,0,0,1,3.15,3.88C490,726.16,479,738.06,471.72,749.75a181.62,181.62,0,0,1-13,17.53c-3.67,4.54-7.46,9.23-10.75,14.08a2.5,2.5,0,0,1-1.85,1.09Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M518.09,796a170.73,170.73,0,0,1-28.22-2.37c-5.62.34-10.17-1.06-15-2.54-1.41-.43-2.87-.88-4.37-1.29a104,104,0,0,1-23.77-9.44,2.5,2.5,0,1,1,2.44-4.37,99,99,0,0,0,22.64,9c1.59.43,3.09.89,4.54,1.34,4.63,1.43,8.63,2.66,13.46,2.31a2.51,2.51,0,0,1,.6,0,162.56,162.56,0,0,0,38.24,2c12.47-.88,24.46-5.86,34.53-10.61a2.5,2.5,0,0,1,2.13,4.52c-10.49,5-23,10.14-36.31,11.08C525.44,795.85,521.79,796,518.09,796Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M579.89,776.93a2.5,2.5,0,0,1-1.2-4.7,168.65,168.65,0,0,0,16.36-10.06c3.14-2.2,6.54-4.29,9.82-6.3,7.82-4.8,15.91-9.76,21.57-16.9,18.62-23.46,11.39-59.13-7-77.71-1.25-1.26-2.29-2.46-3.21-3.52-2.36-2.71-4.06-4.66-7.51-5.89a2.5,2.5,0,0,1,1.68-4.71c4.69,1.67,7.08,4.41,9.61,7.32.92,1.05,1.86,2.14,3,3.28,10.43,10.51,17.37,25.4,19,40.85,1.78,16.35-2.36,31.79-11.64,43.49-6.22,7.83-14.68,13-22.87,18.05-3.37,2.07-6.55,4-9.56,6.13a173.37,173.37,0,0,1-16.84,10.35A2.49,2.49,0,0,1,579.89,776.93Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.17,513.92l-.39,0a2.5,2.5,0,0,1-2.09-2.85c1.1-7.09,5.21-16,13.17-17.81,7.2-1.64,14,4.06,16.22,13.56a2.5,2.5,0,0,1-4.87,1.12c-1.32-5.73-5.27-10.94-10.24-9.81-5.13,1.16-8.43,7.92-9.33,13.7A2.5,2.5,0,0,1,467.17,513.92Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M537.44,607.22h-.74c-4-.16-6.74-1.62-7.5-4s.57-5,4-7.56c2.92-2.24,11.31-4.41,15.13-1.5,1,.74,3,2.91,1.3,7.16S542.27,607.22,537.44,607.22Zm-3.33-5.55a10.86,10.86,0,0,0,6,.29c2.43-.46,4.36-1.49,4.79-2.56h0a2.43,2.43,0,0,0,.29-1.33c-1-1-7.07,0-9,1.52A8.16,8.16,0,0,0,534.12,601.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M461.94,640.88c-1.43,0-2.8,0-4.09-.05-14.46-.36-26.11-9.2-32.81-24.88a71.6,71.6,0,0,1-3.63-12.73,55.67,55.67,0,0,1-1.47-13c.18-9.12,3.38-16.86,10.38-25.08,4.1-4.82,12-9.22,18.08-11.46,20.17-7.44,48.23-1.52,57.84,19.15A94.12,94.12,0,0,1,511,586.68c3.92,13.69,2.82,25.54-3.26,35.23-4.81,7.67-14,13.74-25.16,16.67A82.12,82.12,0,0,1,461.94,640.88ZM466,555.62a46.28,46.28,0,0,0-15.89,2.71c-5.42,2-12.66,6.08-16,10-6.2,7.28-9,14-9.18,21.94h0a50.76,50.76,0,0,0,1.36,11.86A67.88,67.88,0,0,0,429.64,614c3.41,8,11.62,21.43,28.33,21.85,6.55.16,15.12.07,23.35-2.08,9.81-2.57,18.1-8,22.19-14.49,5.3-8.44,6.2-18.94,2.69-31.2a90.18,90.18,0,0,0-4.51-13.16C495.66,561.92,480.59,555.62,466,555.62Zm-43.57,34.61h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.07,655.25a61.92,61.92,0,0,1-23.16-4.39,51.53,51.53,0,0,1-28.79-28c-2.13-5-3.34-10.51-4.51-15.82a69.67,69.67,0,0,1-1.84-16.21h0c.2-11.39,4.16-21,12.81-31.27,5.09-6,14.91-11.5,22.39-14.27,19.5-7.21,44.36-3.48,60.45,9.07,12.67,9.89,16,25.19,18.73,37.49,6.14,28-10.29,53.73-39.07,61.25A67.41,67.41,0,0,1,467.07,655.25Zm-2-106.55a54.06,54.06,0,0,0-18.65,3.16c-6.6,2.45-15.41,7.42-19.45,12.21-7.54,8.91-11,17.19-11.15,26.84h0a62.8,62.8,0,0,0,1.68,14.57c1.1,5,2.23,10.16,4.11,14.57,10.56,24.83,38.53,32,60.69,26.17,25.38-6.63,39.34-28.39,34-52.91-3.12-14.23-6.3-25.72-16.18-33.44C490.8,552.63,477.77,548.7,465.08,548.7ZM412.3,590.85h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M578.15,615.43c-5.87,0-12-1.19-17.83-6.13-8-6.76-13.43-15.13-18.08-28a126.1,126.1,0,0,1-4.16-15.7,97.31,97.31,0,0,1-2.3-15.87A51.14,51.14,0,0,1,543,519.87c3.39-5.84,10.34-10.84,15.73-13.2,14.07-6.15,32.68-.86,45.25,12.87,9.54,10.41,12.86,25.54,15.52,37.7,3.71,16.92,2.33,31.23-4.12,42.55-7.37,12.93-19.3,14.13-28.88,15.1A82.79,82.79,0,0,1,578.15,615.43Zm-7-104.21a24,24,0,0,0-9.66,1.92c-4.33,1.9-10,6-12.45,10.27a44.47,44.47,0,0,0-6.25,26h0A90.27,90.27,0,0,0,545,564.08a121,121,0,0,0,3.9,14.81c4.26,11.78,8.89,19,16,25,6.42,5.41,13.41,4.71,20.81,4,10.88-1.09,18.35-2.49,23.53-11.58,5.56-9.75,6.69-22.39,3.36-37.54-3.16-14.41-6.19-26.09-13.84-34.44S580.64,511.22,571.19,511.22Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M583.65,599.89c-12.91,0-24.11-8.93-30.41-24.49-6.2-15.29-11.87-34.24-.67-45.15h0c.33-.32.68-.64,1-.95,9.59-8.13,26.29-5.09,35.28,2.74,12.16,10.58,16.24,24.2,18.63,36.13a28.15,28.15,0,0,1-4.45,22,23,23,0,0,1-16,9.47A28.62,28.62,0,0,1,583.65,599.89ZM556,533.84c-9.16,8.93-3.35,26.93,1.82,39.69,2.86,7.05,11.35,23.23,28.56,21.2A18,18,0,0,0,599,587.28a23.14,23.14,0,0,0,3.59-18.12c-3.15-15.74-8.23-25.71-17-33.34-7.45-6.48-21.33-9-28.78-2.69-.28.24-.54.47-.79.72Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M502.34,715.06a12.41,12.41,0,0,1-1.45-.08,2.5,2.5,0,1,1,.59-5c3.81.45,12.26-2.27,14.54-5.22,1.69-2.17.74-5.17.25-6.36a12.76,12.76,0,0,0-10.33-7.21l-2.56-.05a2.5,2.5,0,0,1,0-5h0l2.66.06a17.75,17.75,0,0,1,14.8,10.31c1.72,4.21,1.38,8.33-.93,11.31C516.83,711.92,508,715.06,502.34,715.06Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M567.78,785.4a11.33,11.33,0,0,1-5.54-1.29,6.36,6.36,0,0,1-2.08-1.92h0c-1.34-2-1.28-4.29-1.24-6.16a54.15,54.15,0,0,1,.73-7.32,57.41,57.41,0,0,1,3.61-13.28c1.85-4.36,7.79-13.46,14.3-13.77,2.15-.11,5.22.7,7.6,5.1a20.48,20.48,0,0,1,2.14,10c0,8.79-3.16,17.45-8.36,23.17-3,3.28-6.47,5.15-10.1,5.42C568.57,785.38,568.21,785.4,567.78,785.4Zm10.15-38.76h-.14c-3.3.16-8.17,6.56-9.94,10.73a52.57,52.57,0,0,0-3.27,12.13,49.13,49.13,0,0,0-.66,6.58c0,1.34-.07,2.65.36,3.28h0a1.35,1.35,0,0,0,.47.41,7.22,7.22,0,0,0,3.72.59c2.94-.22,5.3-2.18,6.77-3.79,4.32-4.76,7-12.36,7.06-19.83a15.72,15.72,0,0,0-1.53-7.62C579.51,746.83,578.42,746.65,577.93,746.65Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M638.39,738.56a8.38,8.38,0,0,1-2.86-.48,7.6,7.6,0,0,1-4.72-5.53,2.5,2.5,0,1,1,4.82-1.34c.49,1.77,1.3,2.06,1.6,2.17,3.61,1.3,12-4.53,14.77-6.45l.64-.44c4.49-3.09,7.55-11.34,8.59-18.14.57-3.7.06-8.38-2-10.17-.35-.3-1.41-1.21-4-.4-5.1,1.57-10.45,7.24-12.17,12.9a2.5,2.5,0,1,1-4.78-1.46C640.4,702,647.05,695,653.69,693c4.37-1.34,7.19,0,8.78,1.39,3.87,3.34,4.41,10,3.69,14.71-.4,2.64-2.81,16.08-10.69,21.5l-.63.43C649.12,735,643.25,738.56,638.39,738.56Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M447.81,618.41c-8.8,0-17.45-1.38-23.25-7.2a2.5,2.5,0,0,1,3.54-3.53c6.33,6.33,18,6.1,28.43,5.37,16.86-1.17,34.34-8.73,52-22.5a2.5,2.5,0,0,1,3.08,3.94c-18.43,14.39-36.84,22.31-54.71,23.54C453.9,618.24,450.84,618.41,447.81,618.41Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M566.29,578.89a30.83,30.83,0,0,1-11.69-2.11,2.5,2.5,0,0,1,1.9-4.62c13.85,5.69,37.34-3,43.33-16.07a2.5,2.5,0,0,1,4.54,2.09C598.86,570.2,581.39,578.89,566.29,578.89Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M556.63,603.14a2.49,2.49,0,0,1-1.14-.28,30.21,30.21,0,0,0-8.12-2.49,2.5,2.5,0,0,1,.78-4.94,34.78,34.78,0,0,1,9.62,3,2.5,2.5,0,0,1-1.14,4.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M529.43,626.73a8,8,0,0,1-6-2.45c-2.56-2.71-2.92-7-1-12,2.31-6.09,4.85-10,7.76-12A2.5,2.5,0,1,1,533,604.5c-2,1.35-4,4.58-5.88,9.6-.55,1.45-1.66,5,0,6.75s5,.78,7.32-.94c1-.71,1.89-1.55,2.86-2.43a17.66,17.66,0,0,1,14-6c1.06-.05,2.07-.1,3-.23,2.09-.27,4.7-1.25,5.3-3.11,0-.29,0-.8.06-1.22s0-.87.05-1a2.5,2.5,0,1,1,5,.57c0,.05,0,.3,0,.6a10.56,10.56,0,0,1-.18,2.17c-1.16,4.34-5.68,6.42-9.53,6.92-1.17.15-2.32.21-3.43.27a13,13,0,0,0-10.91,4.69c-1,.92-2.08,1.88-3.24,2.74A13.82,13.82,0,0,1,529.43,626.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.85,593.87a3.53,3.53,0,0,1-2.47-6,44.74,44.74,0,0,1,26.81-12.52,3.53,3.53,0,0,1,.7,7,37.66,37.66,0,0,0-22.57,10.54A3.52,3.52,0,0,1,519.85,593.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M491.51,718.37a2.5,2.5,0,0,1-1.68-.65,6.89,6.89,0,0,1-.56-.57,3.4,3.4,0,0,1-2,.17c-3.42-.68-4.15-5.85-4.29-7.42-.39-4.33,1.18-20.68,7.72-27h0a8.46,8.46,0,0,1,7.46-2.49,2.5,2.5,0,0,1,1.95,1.64,4.71,4.71,0,0,1,1.85,0,2.5,2.5,0,0,1,1.12.58,4.43,4.43,0,0,1,3.88,1.52c1.49,2.13.1,4.4-.56,5.5a5.42,5.42,0,0,0-.3.51,66.63,66.63,0,0,0-2.4,9.82l0,.23c-1.5,7.72-1.78,11.54-1.71,12.87a2.5,2.5,0,0,1-1.77,4.15c-1.32.06-2.6.05-3.84,0-1,0-1.92,0-2.87,0a2.5,2.5,0,0,1-1.74,1Zm-2.59-5.64h0Zm1-2.27a2.43,2.43,0,0,1,.38,0,2.5,2.5,0,0,1,2.06,1.9c1.4-.07,2.75-.06,4-.05H497a81.17,81.17,0,0,1,1.79-13l0-.22a71.26,71.26,0,0,1,2.62-10.6,5,5,0,0,1,.23-.54,2.51,2.51,0,0,1-1.52-.41l0,0c-.31.25-.62.48-.92.67a2.5,2.5,0,0,1-3.83-2.3c0-.09,0-.19,0-.29a4.89,4.89,0,0,0-1.19.87h0c-4.59,4.42-6.62,18.44-6.21,22.93a10.75,10.75,0,0,0,.28,1.64A2.5,2.5,0,0,1,489.94,710.45ZM500,712.29h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M374,676.5a2.5,2.5,0,0,1-.3-5c52.83-6.38,114.94-14,175.09-21.86a2.5,2.5,0,1,1,.65,5c-60.17,7.9-122.3,15.49-175.14,21.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M550.07,654.18a2.5,2.5,0,0,1-1.68-4.35c4.28-3.89,9.64-7.94,14.83-11.86,9.22-7,18.75-14.15,22.48-20.59a2.5,2.5,0,1,1,4.33,2.51c-4.24,7.32-14.18,14.82-23.79,22.08-5.1,3.85-10.37,7.83-14.48,11.57A2.49,2.49,0,0,1,550.07,654.18Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M378.4,692q-2,0-3.93,0a2.5,2.5,0,0,1-2.42-2.2,88.85,88.85,0,0,1-.51-15.92,2.5,2.5,0,1,1,5,.29,83.89,83.89,0,0,0,.24,12.87c12.87.14,25.88-1.39,38.49-2.87,16.89-2,38.15-4.31,58.71-6.56s41.89-4.58,58.8-6.57a2.5,2.5,0,1,1,.58,5c-16.93,2-38.23,4.32-58.83,6.57s-41.8,4.58-58.67,6.55C403.63,690.55,391,692,378.4,692Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,676a2.5,2.5,0,0,1-2.5-2.5V517.87l-33.42,6.51a2.5,2.5,0,1,1-1-4.91l36.4-7.09a2.5,2.5,0,0,1,3,2.45V673.51A2.5,2.5,0,0,1,637.74,676Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,645.49a2.5,2.5,0,0,1-.48-5l121.42-24V378.4L641.23,396a2.51,2.51,0,0,1-1.25-.13l-140.5-52.67a2.5,2.5,0,0,1,.53-4.82l101-14.1a2.52,2.52,0,0,1,1.08.08l159.83,48.76h0a2.49,2.49,0,0,1,1.42,1.16h0l0,0h0a2.49,2.49,0,0,1,.26,1.17V618.63a2.5,2.5,0,0,1-2,2.45L638.22,645.45A2.52,2.52,0,0,1,637.74,645.49ZM510.46,341.95l130.67,49,108.74-16.27L601.14,329.29Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M640.86,433a2.5,2.5,0,0,1-2.5-2.5v-37a2.5,2.5,0,0,1,5,0v37A2.5,2.5,0,0,1,640.86,433Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M500.36,393.33a2.5,2.5,0,0,1-2.5-2.5V344a2.5,2.5,0,0,1,5,0v46.83A2.5,2.5,0,0,1,500.36,393.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M637.74,517.35a2.51,2.51,0,0,1-2.41-3.21c.7-2.41,15.84-32.87,22.19-45.59l-113,13.94-16.81,30a2.5,2.5,0,1,1-4.36-2.44l17.42-31.1a2.5,2.5,0,0,1,1.88-1.26L661.54,463a2.5,2.5,0,0,1,2.54,3.6c-9.21,18.41-23.18,46.64-23.95,48.94A2.48,2.48,0,0,1,637.74,517.35Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M467.63,512.6a2.49,2.49,0,0,1-.93-.18L398.53,485.2a2.5,2.5,0,0,1-1.13-.9L357,425.58a2.5,2.5,0,0,1,3.05-3.71l120.36,52a2.49,2.49,0,0,1,1.07.87l19.66,28.47a2.5,2.5,0,1,1-4.11,2.84l-19.26-27.88L366,429.91l35.05,50.93,67.48,26.95a2.5,2.5,0,0,1-.93,4.82Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M396.21,500.85a2.5,2.5,0,0,1-2.5-2.5V480.93a2.5,2.5,0,0,1,5,0v17.42A2.5,2.5,0,0,1,396.21,500.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M287.51,543a2.47,2.47,0,0,1-.38,0,2.5,2.5,0,0,1-2.11-2.19l-8.71-77L151.94,480.69V522.5a2.5,2.5,0,0,1-5,0v-44a2.5,2.5,0,0,1,2.16-2.48l129.07-17.5a2.5,2.5,0,0,1,2.82,2.2l8,70.3,29.27-66.52a2.5,2.5,0,0,1,3.34-1.26l106.5,49.33a2.5,2.5,0,0,1,1.32,3.06l-3.65,10.88a2.5,2.5,0,1,1-4.74-1.59l2.94-8.76L321.77,468.84l-32,72.67A2.5,2.5,0,0,1,287.51,543Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M256.51,614.13a2.5,2.5,0,0,1-2.47-2.87l10-66.48a2.5,2.5,0,0,1,2.15-2.11L404.9,524.54a2.5,2.5,0,0,1,2.82,2.48v9.9a2.5,2.5,0,0,1-5,0v-7.06l-134,17.53-9.22,61.32,118-16a2.5,2.5,0,0,1,.67,5L256.84,614.11Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M256.51,614.13a2.5,2.5,0,0,1-1.15-.28l-99-51.63a2.5,2.5,0,0,1-1.2-1.37l-13.5-37.5A2.5,2.5,0,0,1,145,520.2l79.5,33.5a2.5,2.5,0,0,1,1.18,1l33,55.63a2.5,2.5,0,0,1-2.15,3.78Zm-97-55.89,90.35,47.12L221.78,558l-73.49-31Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M207.35,551.69a2.5,2.5,0,0,1-.17-5l59.16-4a2.5,2.5,0,0,1,.34,5l-59.16,4Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M252.51,728.5a2.5,2.5,0,0,1-1.38-.42l-97-64.28a2.5,2.5,0,0,1-1.12-2.13L155,560a2.5,2.5,0,0,1,2.5-2.45h.05A2.5,2.5,0,0,1,160,560L158,660.4l95,63,130.14-20.83a2.5,2.5,0,1,1,.79,4.94l-131.1,21A2.56,2.56,0,0,1,252.51,728.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M252.51,728.5h-.09a2.5,2.5,0,0,1-2.41-2.58l4-114.37a2.5,2.5,0,0,1,5,.17l-4,114.37A2.5,2.5,0,0,1,252.51,728.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M454.71,468a2.5,2.5,0,0,1-.2-5l52.56-4.31-1.75-65.17L383.58,403l5.43,32.6a2.5,2.5,0,0,1-4.93.82l-5.88-35.29a2.5,2.5,0,0,1,2.27-2.9l127.09-9.92a2.5,2.5,0,0,1,2.69,2.43l1.88,70.17a2.5,2.5,0,0,1-2.29,2.56L454.92,468Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M560.41,480.52a2.49,2.49,0,0,1-.79-.13l-50.78-17a2.5,2.5,0,0,1,1.59-4.74l50.78,17a2.5,2.5,0,0,1-.79,4.87Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M645.36,469.64a2.5,2.5,0,0,1-2.17-3.73l15-26.56L538,396.62l-26.32,57.8a2.5,2.5,0,0,1-4.55-2.07l27.28-59.88a2.5,2.5,0,0,1,3.11-1.32l125.14,44.48a2.5,2.5,0,0,1,1.34,3.59l-16.48,29.15A2.5,2.5,0,0,1,645.36,469.64Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M279,468a2.5,2.5,0,0,1-.28-5l95.89-11a2.5,2.5,0,1,1,.57,5L279.3,468Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M200.26,474.11a2.5,2.5,0,0,1-2.5-2.5v-38a2.5,2.5,0,0,1,5,0v38A2.5,2.5,0,0,1,200.26,474.11Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M259,466.15a2.49,2.49,0,0,1-1.14-.27l-58.72-30.05a2.5,2.5,0,0,1,.82-4.71l42.58-5.43a2.53,2.53,0,0,1,1.33.2l44.76,19.9L369,436.54a2.5,2.5,0,1,1,.57,5l-81,9.31a2.5,2.5,0,0,1-1.3-.2l-44.74-19.89-33.87,4.32,51.52,26.37a2.5,2.5,0,0,1-1.14,4.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M288.23,450.84a2.5,2.5,0,0,1-2.5-2.43l-3.4-116.85-35.44-6.85L245.34,428.2a2.5,2.5,0,0,1-2.5,2.46h0a2.5,2.5,0,0,1-2.46-2.54l1.59-106.47a2.5,2.5,0,0,1,3-2.42L285.24,327a2.5,2.5,0,0,1,2,2.38l3.46,118.85a2.5,2.5,0,0,1-2.43,2.57Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M408.1,401.12a2.5,2.5,0,0,1-2.5-2.5V320c-12.94.83-77.13,7.39-120.57,12a2.5,2.5,0,0,1-2.61-3.33l14.87-41.24a2.5,2.5,0,0,1,2.17-1.65L418.63,277a2.5,2.5,0,0,1,2.59,3.17L410.6,317.82v80.8A2.5,2.5,0,0,1,408.1,401.12ZM301.44,290.62l-13,36c9.27-1,33.4-3.49,57.35-5.92,17.84-1.81,32.09-3.21,42.37-4.18s15.31-1.42,18-1.52l9.23-32.73Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M357.46,286.49a2.5,2.5,0,0,1-2.35-3.34l11.34-31.79a2.5,2.5,0,0,1,3-1.56l47.09,13.64a2.5,2.5,0,0,1,1.72,3.06l-3.88,14.14a2.5,2.5,0,1,1-4.82-1.32l3.23-11.76-42.46-12.3-10.55,29.58A2.5,2.5,0,0,1,357.46,286.49Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M351.79,286.91a2.5,2.5,0,0,1-2.23-1.37L341,268.81l-94.43,9a2.5,2.5,0,1,1-.47-5l96.12-9.12a2.49,2.49,0,0,1,2.46,1.35L354,283.27a2.5,2.5,0,0,1-2.23,3.63Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M284.76,332a2.5,2.5,0,0,1-2.47-2.12l-6.65-43.51-36.22-10.81,7.47,45.74a2.5,2.5,0,0,1-4.93.81l-8.12-49.69a2.5,2.5,0,0,1,3.18-2.8L278.59,282a2.5,2.5,0,0,1,1.76,2l6.89,45.08a2.5,2.5,0,0,1-2.09,2.85Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M601.34,329.24h-.08a2.5,2.5,0,0,1-2.42-2.58l4.57-142.37-163.65,17.2a2.5,2.5,0,0,1-.52-5L605.75,179a2.5,2.5,0,0,1,2.76,2.57l-4.67,145.24A2.5,2.5,0,0,1,601.34,329.24Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M436.5,398.9h0a2.5,2.5,0,0,1-2.46-2.54l3-195.5-120-35.51V268.83a2.5,2.5,0,0,1-5,0V162a2.5,2.5,0,0,1,3.21-2.4l125.06,37A2.5,2.5,0,0,1,442,199l-3,197.4A2.5,2.5,0,0,1,436.5,398.9Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M439.51,201.5a2.5,2.5,0,0,1-2.08-3.88l41-62a2.5,2.5,0,0,1,1.86-1.11L642.79,120a2.5,2.5,0,0,1,2.34,3.82l-37,59a2.5,2.5,0,0,1-4.24-2.66l34.33-54.73L481.93,139.38l-40.34,61A2.5,2.5,0,0,1,439.51,201.5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M403.51,157.5a2.5,2.5,0,0,1-.17-5l66.33-4.57,21.4-97.47a2.5,2.5,0,0,1,3.05-1.89l134.5,34a2.5,2.5,0,0,1,1.76,3.2l-13,40a2.5,2.5,0,1,1-4.75-1.55L624.8,86.77,495.4,54.06l-21.25,96.78a2.5,2.5,0,0,1-2.27,2l-68.2,4.7Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M436.62,200.64a2.5,2.5,0,0,1-1.94-.92l-54.58-67L267.65,104.37l48.68,56a2.5,2.5,0,1,1-3.77,3.28l-53.91-62a2.5,2.5,0,0,1,2.5-4.06l121,30.5a2.51,2.51,0,0,1,1.33.85l55.11,67.64a2.5,2.5,0,0,1-1.94,4.08Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M468.33,151.57a2.5,2.5,0,0,1-2.14-1.2L425.66,83.6,280.58,93.76l3.26,8.33a2.5,2.5,0,1,1-4.66,1.82l-4.5-11.5A2.5,2.5,0,0,1,276.83,89l150-10.5a2.51,2.51,0,0,1,2.31,1.2l41.32,68.07a2.5,2.5,0,0,1-2.13,3.8Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M522.51,687.33a2.5,2.5,0,0,1-2-4,77.06,77.06,0,0,1,20-18.5c2.69-1.64,26.72-16.06,40.51-16.42h.07a2.5,2.5,0,0,1,.07,5c-10.15.27-28.69,10-38,15.69a71.62,71.62,0,0,0-18.59,17.2A2.5,2.5,0,0,1,522.51,687.33Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M540.51,669.67a2.5,2.5,0,0,1-2-4,33.69,33.69,0,0,0,2.67-5.27c1.9-4.25,3.69-8.26,6.47-9.77A2.5,2.5,0,0,1,550,655c-1.29.7-3.09,4.74-4.29,7.41a35.3,35.3,0,0,1-3.23,6.22A2.5,2.5,0,0,1,540.51,669.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M558.51,659.67a2.49,2.49,0,0,1-1.23-.33c-.71-.4-1.68-.83-2.71-1.29-2.24-1-4.78-2.11-6.47-3.76a2.5,2.5,0,1,1,3.49-3.58,19.25,19.25,0,0,0,5,2.77c1.14.5,2.22,1,3.15,1.51a2.5,2.5,0,0,1-1.23,4.67Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M484.51,715c-.87,0-1.8,0-2.85-.08-5.32-.27-26.21-3.31-31.25-13.33-1.28-2.54-2.08-6.67,1.4-11.88,6-8.94,19.6-7.5,30.55-6.35,3.06.32,5.94.63,8.15.63a2.5,2.5,0,0,1,0,5c-2.47,0-5.48-.32-8.67-.65-9.62-1-21.58-2.28-25.87,4.15-1.74,2.61-2.1,4.85-1.09,6.85,3.33,6.61,19.51,10.2,27,10.58,1,0,1.82.07,2.6.07a2.5,2.5,0,0,1,0,5Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M593,628a2.5,2.5,0,0,1-2.32-1.57,19.54,19.54,0,0,0-4-5.67,2.5,2.5,0,0,1,3.54-3.53,24.33,24.33,0,0,1,5,7.33A2.5,2.5,0,0,1,593,628Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M572.5,655a2.61,2.61,0,0,1-.7-.1,2.54,2.54,0,0,1-1.71-3.13c.92-3.26,15-19.9,15.16-20.06a25.2,25.2,0,0,0,2.06-3,22,22,0,0,1,3.52-4.63,2.5,2.5,0,0,1,3.38,3.69,18.24,18.24,0,0,0-2.66,3.61A29.11,29.11,0,0,1,589,635c-3.08,3.56-13.32,16.19-14.16,18.23A2.44,2.44,0,0,1,572.5,655Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M614.19,654a2.49,2.49,0,0,1-.67-.09c-3.05-.85-4.95-3.27-6.78-5.6-1.67-2.13-3.25-4.14-5.5-4.68a32.78,32.78,0,0,0-4.7.14c-6.27.42-10.21.53-12.15-1.51a3.61,3.61,0,0,1-1-3,2.49,2.49,0,0,1,.64-1.4,2.39,2.39,0,0,1,.14-.65c1.66-4.44,6-7.31,12-7.88h0a23.37,23.37,0,0,1,9.1.94,18.94,18.94,0,0,1,11.2,10.37,14.19,14.19,0,0,1,0,11.89A2.5,2.5,0,0,1,614.19,654Zm-13.86-15.42a9.08,9.08,0,0,1,2.07.19c3.95.94,6.25,3.87,8.27,6.46a29.17,29.17,0,0,0,2,2.43,10.16,10.16,0,0,0-.84-5,14,14,0,0,0-8.15-7.58,18.26,18.26,0,0,0-7.08-.72h0a11,11,0,0,0-6.19,2.33,2.58,2.58,0,0,1,.36.61,2.45,2.45,0,0,1,.05,1.71h0c1.82,0,4-.14,5.32-.23C597.94,638.62,599.27,638.54,600.33,638.54Zm-3.91-6.71h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M590.08,663.44a11.54,11.54,0,0,1-8.33-3.41,8.64,8.64,0,0,1-2.31-6.88c.26-4.44,2.92-9.72,6.2-12.28a2.5,2.5,0,0,1,3.08,3.94,13.56,13.56,0,0,0-4.29,8.63,4,4,0,0,0,.84,3c4.68,4.63,11.85,0,14.71-2.27,1.12-.87,2.2-1.82,3.34-2.84a53.86,53.86,0,0,1,4.76-3.91,2.5,2.5,0,1,1,2.87,4.1,49.44,49.44,0,0,0-4.31,3.56c-1.15,1-2.34,2.08-3.59,3C598.52,661.66,594.05,663.44,590.08,663.44Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M608.54,636a2.49,2.49,0,0,1-1.28-.35c-3.93-2.35-12.45-5.87-15.18-5.62a2.5,2.5,0,0,1-.48-5c5-.49,15.66,4.78,18.23,6.31a2.5,2.5,0,0,1-1.29,4.65Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M545.57,631.36h-.23c-3.13-.2-4.86-3.22-6.24-5.64a11.71,11.71,0,0,0-1.85-2.72,2.5,2.5,0,0,1,2.52-4.32c1.6.94,2.65,2.77,3.67,4.55a13.1,13.1,0,0,0,2.12,3.07,20.3,20.3,0,0,0,2-1.2,15.74,15.74,0,0,1,1.92-1.13,34.39,34.39,0,0,1,3.19-1.28c-.36-.67-.75-1.35-1.17-2a24.07,24.07,0,0,1-2.75-5.82,2.5,2.5,0,0,1,4.82-1.31,20.12,20.12,0,0,0,2.23,4.59,25.17,25.17,0,0,1,2.71,5.64,2.5,2.5,0,0,1-2.16,3.19,17.73,17.73,0,0,0-4.84,1.59c-.21.1-.81.48-1.25.76C548.38,630.53,547,631.36,545.57,631.36Z" transform="translate(-105.77 -43.5)"/></g><g id="circle"><g class="cls-12"><path class="cls-7" d="M412.3,590.85c.19-10.39,3.77-19.35,12-29.06C429,556.25,438.5,551,445.2,548.55c18-6.67,41.77-3.38,57.05,8.54,11.26,8.79,14.51,22.08,17.45,35.46,5.89,26.81-10.08,50.17-36.51,57.08-25.62,6.69-54-2.76-64.83-28.2-2-4.68-3.14-9.87-4.31-15.2A66.21,66.21,0,0,1,412.3,590.85Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-12"><path class="cls-7" d="M539.3,549.54a47.78,47.78,0,0,1,6.72-27.9c3-5.17,9.47-9.71,14.09-11.74,12.44-5.44,29.58-.7,41.23,12,8.59,9.38,11.74,22.69,14.68,36.07,3.29,15,2.67,28.79-3.74,40-6.27,11-15.81,12.29-26.17,13.33-7.79.78-15.93,1.62-23.52-4.77-8-6.75-12.87-15-17-26.51a122.75,122.75,0,0,1-4-15.26A93.72,93.72,0,0,1,539.3,549.54Z" transform="translate(-105.77 -43.5)"/></g><path class="cls-1" d="M467.07,655.25a61.92,61.92,0,0,1-23.16-4.39,51.53,51.53,0,0,1-28.79-28c-2.13-5-3.34-10.51-4.51-15.82a69.67,69.67,0,0,1-1.84-16.21h0c.2-11.39,4.16-21,12.81-31.27,5.09-6,14.91-11.5,22.39-14.27,19.5-7.21,44.36-3.48,60.45,9.07,12.67,9.89,16,25.19,18.73,37.49,6.14,28-10.29,53.73-39.07,61.25A67.41,67.41,0,0,1,467.07,655.25Zm-2-106.55a54.06,54.06,0,0,0-18.65,3.16c-6.6,2.45-15.41,7.42-19.45,12.21-7.54,8.91-11,17.19-11.15,26.84h0a62.8,62.8,0,0,0,1.68,14.57c1.1,5,2.23,10.16,4.11,14.57,10.56,24.83,38.53,32,60.69,26.17,25.38-6.63,39.34-28.39,34-52.91-3.12-14.23-6.3-25.72-16.18-33.44C490.8,552.63,477.77,548.7,465.08,548.7ZM412.3,590.85h0Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M578.15,615.43c-5.87,0-12-1.19-17.83-6.13-8-6.76-13.43-15.13-18.08-28a126.1,126.1,0,0,1-4.16-15.7,97.31,97.31,0,0,1-2.3-15.87A51.14,51.14,0,0,1,543,519.87c3.39-5.84,10.34-10.84,15.73-13.2,14.07-6.15,32.68-.86,45.25,12.87,9.54,10.41,12.86,25.54,15.52,37.7,3.71,16.92,2.33,31.23-4.12,42.55-7.37,12.93-19.3,14.13-28.88,15.1A82.79,82.79,0,0,1,578.15,615.43Zm-7-104.21a24,24,0,0,0-9.66,1.92c-4.33,1.9-10,6-12.45,10.27a44.47,44.47,0,0,0-6.25,26h0A90.27,90.27,0,0,0,545,564.08a121,121,0,0,0,3.9,14.81c4.26,11.78,8.89,19,16,25,6.42,5.41,13.41,4.71,20.81,4,10.88-1.09,18.35-2.49,23.53-11.58,5.56-9.75,6.69-22.39,3.36-37.54-3.16-14.41-6.19-26.09-13.84-34.44S580.64,511.22,571.19,511.22Z" transform="translate(-105.77 -43.5)"/><path class="cls-1" d="M519.85,593.87a3.53,3.53,0,0,1-2.47-6,44.74,44.74,0,0,1,26.81-12.52,3.53,3.53,0,0,1,.7,7,37.66,37.66,0,0,0-22.57,10.54A3.52,3.52,0,0,1,519.85,593.87Z" transform="translate(-105.77 -43.5)"/><g class="cls-12"><path class="cls-7" d="M594.18,528.83c-2.91-2.27-6.89-1-6.33,3,.48,3.5,3.92,7.78,5.33,11.35,1.52,3.85,1.69,9.59,4.15,12.83,6.11,8,5.64-6.3,4.59-9.76C600,539.94,598.74,534.06,594.18,528.83Z" transform="translate(-105.77 -43.5)"/></g><g class="cls-12"><path class="cls-7" d="M496.84,563.83c-1-3.57-9.51-2.83-8.77,1.67.41,2.44,3.62,5.41,4.9,7.54a40.24,40.24,0,0,1,4.21,9.12c1.7,5.77-.86,14.73,3.3,19.67,3.29,3.9,6.35,1.12,6.68-2.86.42-5.1-.18-10.25-.7-15.28C505.86,577.61,503,567.14,496.84,563.83Z" transform="translate(-105.77 -43.5)"/></g></g><g id="layers"><path class="cls-1" d="M468.33,880.06a357.61,357.61,0,0,1-159.8-677.52,3.53,3.53,0,1,1,3.16,6.31c-119.58,59.84-193.86,180-193.86,313.64C117.82,715.77,275.06,873,468.33,873S818.84,715.77,818.84,522.5a350,350,0,0,0-214.08-323,3.53,3.53,0,0,1,2.75-6.5,357.56,357.56,0,0,1-139.18,687Z" transform="translate(-105.77 -43.5)"/></g></svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/golang/dep/docs/img/StatusGraph.png b/installer/vendor/github.com/golang/dep/docs/img/StatusGraph.png
deleted file mode 100644
index 5380aecae1..0000000000
Binary files a/installer/vendor/github.com/golang/dep/docs/img/StatusGraph.png and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/hack/build-all.bash b/installer/vendor/github.com/golang/dep/hack/build-all.bash
deleted file mode 100755
index 45f8cf2476..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/build-all.bash
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script will build dep and calculate hash for each
-# (DEP_BUILD_PLATFORMS, DEP_BUILD_ARCHS) pair.
-# DEP_BUILD_PLATFORMS="linux" DEP_BUILD_ARCHS="amd64" ./hack/build-all.sh
-# can be called to build only for linux-amd64
-
-set -e
-
-VERSION=$(git describe --tags --dirty)
-COMMIT_HASH=$(git rev-parse --short HEAD 2>/dev/null)
-DATE=$(date "+%Y-%m-%d")
-
-GO_BUILD_CMD="go build -a -installsuffix cgo"
-GO_BUILD_LDFLAGS="-s -w -X main.commitHash=$COMMIT_HASH -X main.buildDate=$DATE -X main.version=$VERSION"
-
-if [ -z "$DEP_BUILD_PLATFORMS" ]; then
-    DEP_BUILD_PLATFORMS="linux windows darwin"
-fi
-
-if [ -z "$DEP_BUILD_ARCHS" ]; then
-    DEP_BUILD_ARCHS="amd64"
-fi
-
-mkdir -p release
-
-for OS in ${DEP_BUILD_PLATFORMS[@]}; do
-  for ARCH in ${DEP_BUILD_ARCHS[@]}; do
-    echo "Building for $OS/$ARCH"
-    GOARCH=$ARCH GOOS=$OS CGO_ENABLED=0 $GO_BUILD_CMD -ldflags "$GO_BUILD_LDFLAGS"\
-     -o "release/dep-$OS-$ARCH" ./cmd/dep/
-    shasum -a 256 "release/dep-$OS-$ARCH" > "release/dep-$OS-$ARCH".sha256
-  done
-done
diff --git a/installer/vendor/github.com/golang/dep/hack/coverage.bash b/installer/vendor/github.com/golang/dep/hack/coverage.bash
deleted file mode 100755
index 6ad89d9f54..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/coverage.bash
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script will generate coverage.txt
-set -e
-
-PKGS=$(go list ./... | grep -v /vendor/)
-for pkg in $PKGS; do
-  go test -race -coverprofile=profile.out -covermode=atomic $pkg
-  if [[ -f profile.out ]]; then
-    cat profile.out >> coverage.txt
-    rm profile.out
-  fi
-done
diff --git a/installer/vendor/github.com/golang/dep/hack/licenseok/main.go b/installer/vendor/github.com/golang/dep/hack/licenseok/main.go
deleted file mode 100644
index f47c771583..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/licenseok/main.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Checks if all files have the license header, a lot of this is based off
-// https://github.com/google/addlicense.
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-)
-
-const helpText = `Usage: licenseok [flags] pattern [pattern ...]
-This program ensures source code files have copyright license headers
-by scanning directory patterns recursively.
-The pattern argument can be provided multiple times, and may also refer
-to single files.
-Flags:
-`
-
-const tmpl = `The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.`
-
-var (
-	update bool
-)
-
-type file struct {
-	path string
-	mode os.FileMode
-}
-
-func init() {
-	flag.BoolVar(&update, "u", false, "modifies all source files in place and avoids adding a license header to any file that already has one.")
-
-	flag.Usage = func() {
-		fmt.Fprintln(os.Stderr, helpText)
-		flag.PrintDefaults()
-	}
-
-	flag.Parse()
-
-	if flag.NArg() == 0 {
-		flag.Usage()
-		os.Exit(1)
-	}
-}
-
-func main() {
-	exitStatus := 0
-
-	// process at most 1000 files in parallel
-	ch := make(chan *file, 1000)
-	done := make(chan struct{})
-	go func() {
-		var wg sync.WaitGroup
-		for f := range ch {
-			wg.Add(1)
-			go func(f *file) {
-				b, err := ioutil.ReadFile(f.path)
-				if err != nil {
-					log.Printf("%s: %v", f.path, err)
-					exitStatus = 1
-				}
-
-				if !hasLicense(b) {
-					if !update {
-						fmt.Fprintln(os.Stderr, f.path)
-						exitStatus = 1
-					} else {
-						fmt.Fprintln(os.Stdout, f.path)
-						if err := addLicense(b, f.path, f.mode); err != nil {
-							log.Printf("%s: %v", f.path, err)
-							exitStatus = 1
-						}
-					}
-				}
-
-				wg.Done()
-			}(f)
-		}
-		wg.Wait()
-		close(done)
-	}()
-
-	for _, d := range flag.Args() {
-		walk(ch, d)
-	}
-	close(ch)
-	<-done
-	os.Exit(exitStatus)
-}
-
-func walk(ch chan<- *file, start string) {
-	filepath.Walk(start, func(path string, fi os.FileInfo, err error) error {
-		if err != nil {
-			log.Printf("%s error: %v", path, err)
-			return nil
-		}
-		if fi.IsDir() {
-			return nil
-		}
-		ch <- &file{path, fi.Mode()}
-		return nil
-	})
-}
-
-func addLicense(b []byte, path string, fmode os.FileMode) error {
-	var lic []byte
-	var err error
-	switch filepath.Ext(path) {
-	default:
-		return nil
-	case ".c", ".h":
-		lic, err = prefix("/*", " * ", " */")
-	case ".js", ".css":
-		lic, err = prefix("/**", " * ", " */")
-	case ".cc", ".cpp", ".cs", ".go", ".hh", ".hpp", ".java", ".m", ".mm", ".proto", ".rs", ".scala", ".swift", ".dart":
-		lic, err = prefix("", "// ", "")
-	case ".py", ".sh":
-		lic, err = prefix("", "# ", "")
-	case ".el", ".lisp":
-		lic, err = prefix("", ";; ", "")
-	case ".erl":
-		lic, err = prefix("", "% ", "")
-	case ".hs":
-		lic, err = prefix("", "-- ", "")
-	case ".html", ".xml":
-		lic, err = prefix("<!--", " ", "-->")
-	case ".php":
-		lic, err = prefix("<?php", "// ", "?>")
-	}
-	if err != nil || lic == nil {
-		return err
-	}
-
-	line := hashBang(b)
-	if len(line) > 0 {
-		b = b[len(line):]
-		if line[len(line)-1] != '\n' {
-			line = append(line, '\n')
-		}
-		lic = append(line, lic...)
-	}
-	b = append(lic, b...)
-	return ioutil.WriteFile(path, b, fmode)
-}
-
-func hashBang(b []byte) []byte {
-	var line []byte
-	for _, c := range b {
-		line = append(line, c)
-		if c == '\n' {
-			break
-		}
-	}
-	if bytes.HasPrefix(line, []byte("#!")) {
-		return line
-	}
-	return nil
-}
-
-func hasLicense(b []byte) bool {
-	n := 100
-	if len(b) < 100 {
-		n = len(b)
-	}
-	return bytes.Contains(bytes.ToLower(b[:n]), []byte("copyright"))
-}
-
-// prefix will execute a license template and prefix the result with top, middle and bottom.
-func prefix(top, mid, bot string) ([]byte, error) {
-	buf := bytes.NewBufferString(fmt.Sprintf("Copyright %d %s", time.Now().Year(), tmpl))
-	var out bytes.Buffer
-	if top != "" {
-		out.WriteString(top)
-		out.WriteRune('\n')
-	}
-	out.WriteString(mid)
-	for _, c := range buf.Bytes() {
-		out.WriteByte(c)
-		if c == '\n' {
-			out.WriteString(mid)
-		}
-	}
-	if bot != "" {
-		out.WriteRune('\n')
-		out.WriteString(bot)
-	}
-	out.Write([]byte{'\n', '\n'})
-	return out.Bytes(), nil
-}
diff --git a/installer/vendor/github.com/golang/dep/hack/lint.bash b/installer/vendor/github.com/golang/dep/hack/lint.bash
deleted file mode 100755
index 2dc1d6e8ad..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/lint.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script will validate code with various linters
-set -e
-
-PKGS=$(go list ./... | grep -vF /vendor/)
-go vet $PKGS
-golint $PKGS
-megacheck -unused.exported -ignore "github.com/golang/dep/internal/test/test.go:U1000 github.com/golang/dep/internal/gps/prune.go:U1000" $PKGS
diff --git a/installer/vendor/github.com/golang/dep/hack/validate-gofmt.bash b/installer/vendor/github.com/golang/dep/hack/validate-gofmt.bash
deleted file mode 100755
index a5ee7fa8bb..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/validate-gofmt.bash
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script will validate that `go fmt` has been ran
-# and is passing for certain directories in the project.
-#
-# Here we use `go list` to help determine which packages
-# we need to check for `go fmt`
-#
-# EXIT 0 - The check is successful
-# EXIT 1 - The check has failed
-
-PKGS=$(go list ./... | grep -v /vendor/)
-REPO_TLD="github.com/golang/dep"
-IGNORE_PKGS=". ./gps"
-
-for PKG in $PKGS; do
-    RELATIVE_PATH="${PKG/$REPO_TLD/.}"
-    i=0
-    for IGNORE_PKG in $IGNORE_PKGS; do
-        if [ "${IGNORE_PKG}" == $RELATIVE_PATH ]; then
-            i=1
-        fi
-    done;
-    if [ $i -eq 1 ]; then
-        continue
-    fi
-
-    echo "Processing gofmt for: ${PKG}"
-    gofmt -s -l $RELATIVE_PATH
-    if [ $? -ne 0 ]; then
-        echo "GO FMT FAILURE: ${PKG}"
-        exit 1
-    fi
-done;
-exit 0
diff --git a/installer/vendor/github.com/golang/dep/hack/validate-licence.bash b/installer/vendor/github.com/golang/dep/hack/validate-licence.bash
deleted file mode 100755
index dcf1c7edac..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/validate-licence.bash
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script will build licenseok and run it on all
-# source files to check licence
-set -e
-
-go build ./hack/licenseok
-find . -path ./vendor -prune -o -regex ".+\.pb\.go$" -prune -o -type f -regex ".*\.\(go\|proto\)$"\
- -printf '%P\n' | xargs ./licenseok
diff --git a/installer/vendor/github.com/golang/dep/hack/validate-vendor.bash b/installer/vendor/github.com/golang/dep/hack/validate-vendor.bash
deleted file mode 100755
index fd395f026e..0000000000
--- a/installer/vendor/github.com/golang/dep/hack/validate-vendor.bash
+++ /dev/null
@@ -1,54 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# This script checks if we changed anything with regard to dependency management
-# for our repo and makes sure that it was done in a valid way.
-
-set -e -o pipefail
-
-if [ -z "$VALIDATE_UPSTREAM" ]; then
-	VALIDATE_REPO='https://github.com/golang/dep.git'
-	VALIDATE_BRANCH='master'
-
-	VALIDATE_HEAD="$(git rev-parse --verify HEAD)"
-
-	git fetch -q "$VALIDATE_REPO" "refs/heads/$VALIDATE_BRANCH"
-	VALIDATE_UPSTREAM="$(git rev-parse --verify FETCH_HEAD)"
-
-	VALIDATE_COMMIT_DIFF="$VALIDATE_UPSTREAM...$VALIDATE_HEAD"
-
-	validate_diff() {
-		if [ "$VALIDATE_UPSTREAM" != "$VALIDATE_HEAD" ]; then
-			git diff "$VALIDATE_COMMIT_DIFF" "$@"
-		fi
-	}
-fi
-
-IFS=$'\n'
-files=( $(validate_diff --diff-filter=ACMR --name-only -- 'Gopkg.toml' 'Gopkg.lock' 'vendor/' || true) )
-unset IFS
-
-if [ ${#files[@]} -gt 0 ]; then
-	go build ./cmd/dep
-	./dep ensure -vendor-only
-	./dep prune
-	# Let see if the working directory is clean
-	diffs="$(git status --porcelain -- vendor Gopkg.toml Gopkg.lock 2>/dev/null)"
-	if [ "$diffs" ]; then
-		{
-			echo 'The contents of vendor differ after "dep ensure && dep prune":'
-			echo
-			echo "$diffs"
-			echo
-			echo 'Make sure these commands have been run before committing.'
-			echo
-		} >&2
-		false
-	else
-		echo 'Congratulations! All vendoring changes are done the right way.'
-	fi
-else
-    echo 'No vendor changes in diff.'
-fi
diff --git a/installer/vendor/github.com/golang/dep/internal/feedback/feedback.go b/installer/vendor/github.com/golang/dep/internal/feedback/feedback.go
deleted file mode 100644
index e8b24ba4c9..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/feedback/feedback.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package feedback
-
-import (
-	"encoding/hex"
-	"fmt"
-	"log"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-const (
-	// ConsTypeConstraint represents a constraint
-	ConsTypeConstraint = "constraint"
-
-	// ConsTypeHint represents a constraint type hint
-	ConsTypeHint = "hint"
-
-	// DepTypeDirect represents a direct dependency
-	DepTypeDirect = "direct dep"
-
-	// DepTypeTransitive represents a transitive dependency,
-	// or a dependency of a dependency
-	DepTypeTransitive = "transitive dep"
-
-	// DepTypeImported represents a dependency imported by an external tool
-	DepTypeImported = "imported dep"
-)
-
-// ConstraintFeedback holds project constraint feedback data
-type ConstraintFeedback struct {
-	Constraint, LockedVersion, Revision, ConstraintType, DependencyType, ProjectPath string
-}
-
-// NewConstraintFeedback builds a feedback entry for a constraint in the manifest.
-func NewConstraintFeedback(pc gps.ProjectConstraint, depType string) *ConstraintFeedback {
-	cf := &ConstraintFeedback{
-		Constraint:     pc.Constraint.String(),
-		ProjectPath:    string(pc.Ident.ProjectRoot),
-		DependencyType: depType,
-	}
-
-	if _, ok := pc.Constraint.(gps.Revision); ok {
-		cf.ConstraintType = ConsTypeHint
-	} else {
-		cf.ConstraintType = ConsTypeConstraint
-	}
-
-	return cf
-}
-
-// NewLockedProjectFeedback builds a feedback entry for a project in the lock.
-func NewLockedProjectFeedback(lp gps.LockedProject, depType string) *ConstraintFeedback {
-	cf := &ConstraintFeedback{
-		ProjectPath:    string(lp.Ident().ProjectRoot),
-		DependencyType: depType,
-	}
-
-	switch vt := lp.Version().(type) {
-	case gps.PairedVersion:
-		cf.LockedVersion = vt.String()
-		cf.Revision = vt.Revision().String()
-	case gps.UnpairedVersion: // Logically this should never occur, but handle for completeness sake
-		cf.LockedVersion = vt.String()
-	case gps.Revision:
-		cf.Revision = vt.String()
-	}
-
-	return cf
-}
-
-// LogFeedback logs feedback on changes made to the manifest or lock.
-func (cf ConstraintFeedback) LogFeedback(logger *log.Logger) {
-	if cf.Constraint != "" {
-		logger.Printf("  %v", GetUsingFeedback(cf.Constraint, cf.ConstraintType, cf.DependencyType, cf.ProjectPath))
-	}
-	if cf.Revision != "" {
-		logger.Printf("  %v", GetLockingFeedback(cf.LockedVersion, cf.Revision, cf.DependencyType, cf.ProjectPath))
-	}
-}
-
-// GetUsingFeedback returns a dependency "using" feedback message. For example:
-//
-//    Using ^1.0.0 as constraint for direct dep github.com/foo/bar
-//    Using 1b8edb3 as hint for direct dep github.com/bar/baz
-func GetUsingFeedback(version, consType, depType, projectPath string) string {
-	if depType == DepTypeImported {
-		return fmt.Sprintf("Using %s as initial %s for %s %s", version, consType, depType, projectPath)
-	}
-	return fmt.Sprintf("Using %s as %s for %s %s", version, consType, depType, projectPath)
-}
-
-// GetLockingFeedback returns a dependency "locking" feedback message. For
-// example:
-//
-//    Locking in v1.1.4 (bc29b4f) for direct dep github.com/foo/bar
-//    Locking in master (436f39d) for transitive dep github.com/baz/qux
-func GetLockingFeedback(version, revision, depType, projectPath string) string {
-	// Check if it's a valid SHA1 digest and trim to 7 characters.
-	if len(revision) == 40 {
-		if _, err := hex.DecodeString(revision); err == nil {
-			// Valid SHA1 digest
-			revision = revision[0:7]
-		}
-	}
-
-	if depType == DepTypeImported {
-		if version == "" {
-			version = "*"
-		}
-		return fmt.Sprintf("Trying %s (%s) as initial lock for %s %s", version, revision, depType, projectPath)
-	}
-	return fmt.Sprintf("Locking in %s (%s) for %s %s", version, revision, depType, projectPath)
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/feedback/feedback_test.go b/installer/vendor/github.com/golang/dep/internal/feedback/feedback_test.go
deleted file mode 100644
index af78a2bfa6..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/feedback/feedback_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package feedback
-
-import (
-	"bytes"
-	log2 "log"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-func TestFeedback_Constraint(t *testing.T) {
-	ver, _ := gps.NewSemverConstraint("^1.0.0")
-	rev := gps.Revision("1b8edb3")
-	pi := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/foo/bar")}
-
-	cases := []struct {
-		feedback *ConstraintFeedback
-		want     string
-	}{
-		{
-			feedback: NewConstraintFeedback(gps.ProjectConstraint{Constraint: ver, Ident: pi}, DepTypeDirect),
-			want:     "Using ^1.0.0 as constraint for direct dep github.com/foo/bar",
-		},
-		{
-			feedback: NewConstraintFeedback(gps.ProjectConstraint{Constraint: ver, Ident: pi}, DepTypeImported),
-			want:     "Using ^1.0.0 as initial constraint for imported dep github.com/foo/bar",
-		},
-		{
-			feedback: NewConstraintFeedback(gps.ProjectConstraint{Constraint: gps.Any(), Ident: pi}, DepTypeImported),
-			want:     "Using * as initial constraint for imported dep github.com/foo/bar",
-		},
-		{
-			feedback: NewConstraintFeedback(gps.ProjectConstraint{Constraint: rev, Ident: pi}, DepTypeDirect),
-			want:     "Using 1b8edb3 as hint for direct dep github.com/foo/bar",
-		},
-		{
-			feedback: NewConstraintFeedback(gps.ProjectConstraint{Constraint: rev, Ident: pi}, DepTypeImported),
-			want:     "Using 1b8edb3 as initial hint for imported dep github.com/foo/bar",
-		},
-	}
-
-	for _, c := range cases {
-		buf := &bytes.Buffer{}
-		log := log2.New(buf, "", 0)
-		c.feedback.LogFeedback(log)
-		got := strings.TrimSpace(buf.String())
-		if c.want != got {
-			t.Errorf("Feedbacks are not expected: \n\t(GOT) '%s'\n\t(WNT) '%s'", got, c.want)
-		}
-	}
-}
-
-func TestFeedback_LockedProject(t *testing.T) {
-	v := gps.NewVersion("v1.1.4").Pair("bc29b4f")
-	b := gps.NewBranch("master").Pair("436f39d")
-	pi := gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/foo/bar")}
-
-	cases := []struct {
-		feedback *ConstraintFeedback
-		want     string
-	}{
-		{
-			feedback: NewLockedProjectFeedback(gps.NewLockedProject(pi, v, nil), DepTypeDirect),
-			want:     "Locking in v1.1.4 (bc29b4f) for direct dep github.com/foo/bar",
-		},
-		{
-			feedback: NewLockedProjectFeedback(gps.NewLockedProject(pi, v, nil), DepTypeImported),
-			want:     "Trying v1.1.4 (bc29b4f) as initial lock for imported dep github.com/foo/bar",
-		},
-		{
-			feedback: NewLockedProjectFeedback(gps.NewLockedProject(pi, gps.NewVersion("").Pair("bc29b4f"), nil), DepTypeImported),
-			want:     "Trying * (bc29b4f) as initial lock for imported dep github.com/foo/bar",
-		},
-		{
-			feedback: NewLockedProjectFeedback(gps.NewLockedProject(pi, b, nil), DepTypeTransitive),
-			want:     "Locking in master (436f39d) for transitive dep github.com/foo/bar",
-		},
-	}
-
-	for _, c := range cases {
-		buf := &bytes.Buffer{}
-		log := log2.New(buf, "", 0)
-		c.feedback.LogFeedback(log)
-		got := strings.TrimSpace(buf.String())
-		if c.want != got {
-			t.Errorf("Feedbacks are not expected: \n\t(GOT) '%s'\n\t(WNT) '%s'", got, c.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/fs/fs_test.go b/installer/vendor/github.com/golang/dep/internal/fs/fs_test.go
deleted file mode 100644
index 4b9422dd88..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/fs/fs_test.go
+++ /dev/null
@@ -1,1075 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package fs
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-// This function tests HadFilepathPrefix. It should test it on both case
-// sensitive and insensitive situations. However, the only reliable way to test
-// case-insensitive behaviour is if using case-insensitive filesystem.  This
-// cannot be guaranteed in an automated test. Therefore, the behaviour of the
-// tests is not to test case sensitivity on *nix and to assume that Windows is
-// case-insensitive. Please see link below for some background.
-//
-// https://superuser.com/questions/266110/how-do-you-make-windows-7-fully-case-sensitive-with-respect-to-the-filesystem
-//
-// NOTE: NTFS can be made case-sensitive. However many Windows programs,
-// including Windows Explorer do not handle gracefully multiple files that
-// differ only in capitalization. It is possible that this can cause these tests
-// to fail on some setups.
-func TestHasFilepathPrefix(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	// dir2 is the same as dir but with different capitalization on Windows to
-	// test case insensitivity
-	var dir2 string
-	if runtime.GOOS == "windows" {
-		dir = strings.ToLower(dir)
-		dir2 = strings.ToUpper(dir)
-	} else {
-		dir2 = dir
-	}
-
-	cases := []struct {
-		path   string
-		prefix string
-		want   bool
-	}{
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2), true},
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a"), true},
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a", "b"), true},
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "c"), false},
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a", "d", "b"), false},
-		{filepath.Join(dir, "a", "b"), filepath.Join(dir2, "a", "b2"), false},
-		{filepath.Join(dir), filepath.Join(dir2, "a", "b"), false},
-		{filepath.Join(dir, "ab"), filepath.Join(dir2, "a", "b"), false},
-		{filepath.Join(dir, "ab"), filepath.Join(dir2, "a"), false},
-		{filepath.Join(dir, "123"), filepath.Join(dir2, "123"), true},
-		{filepath.Join(dir, "123"), filepath.Join(dir2, "1"), false},
-		{filepath.Join(dir, "⌘"), filepath.Join(dir2, "⌘"), true},
-		{filepath.Join(dir, "a"), filepath.Join(dir2, "⌘"), false},
-		{filepath.Join(dir, "⌘"), filepath.Join(dir2, "a"), false},
-	}
-
-	for _, c := range cases {
-		if err := os.MkdirAll(c.path, 0755); err != nil {
-			t.Fatal(err)
-		}
-
-		if err = os.MkdirAll(c.prefix, 0755); err != nil {
-			t.Fatal(err)
-		}
-
-		got, err := HasFilepathPrefix(c.path, c.prefix)
-		if err != nil {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		if c.want != got {
-			t.Fatalf("dir: %q, prefix: %q, expected: %v, got: %v", c.path, c.prefix, c.want, got)
-		}
-	}
-}
-
-// This function tests HadFilepathPrefix. It should test it on both case
-// sensitive and insensitive situations. However, the only reliable way to test
-// case-insensitive behaviour is if using case-insensitive filesystem.  This
-// cannot be guaranteed in an automated test. Therefore, the behaviour of the
-// tests is not to test case sensitivity on *nix and to assume that Windows is
-// case-insensitive. Please see link below for some background.
-//
-// https://superuser.com/questions/266110/how-do-you-make-windows-7-fully-case-sensitive-with-respect-to-the-filesystem
-//
-// NOTE: NTFS can be made case-sensitive. However many Windows programs,
-// including Windows Explorer do not handle gracefully multiple files that
-// differ only in capitalization. It is possible that this can cause these tests
-// to fail on some setups.
-func TestHasFilepathPrefix_Files(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	// dir2 is the same as dir but with different capitalization on Windows to
-	// test case insensitivity
-	var dir2 string
-	if runtime.GOOS == "windows" {
-		dir = strings.ToLower(dir)
-		dir2 = strings.ToUpper(dir)
-	} else {
-		dir2 = dir
-	}
-
-	existingFile := filepath.Join(dir, "exists")
-	if err = os.MkdirAll(existingFile, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	nonExistingFile := filepath.Join(dir, "does_not_exists")
-
-	cases := []struct {
-		path   string
-		prefix string
-		want   bool
-		err    bool
-	}{
-		{existingFile, filepath.Join(dir2), true, false},
-		{nonExistingFile, filepath.Join(dir2), false, true},
-	}
-
-	for _, c := range cases {
-		got, err := HasFilepathPrefix(c.path, c.prefix)
-		if err != nil && !c.err {
-			t.Fatalf("unexpected error: %s", err)
-		}
-		if c.want != got {
-			t.Fatalf("dir: %q, prefix: %q, expected: %v, got: %v", c.path, c.prefix, c.want, got)
-		}
-	}
-}
-
-func TestEquivalentPaths(t *testing.T) {
-	h := test.NewHelper(t)
-	h.TempDir("dir")
-	h.TempDir("dir2")
-
-	h.TempFile("file", "")
-	h.TempFile("file2", "")
-
-	h.TempDir("DIR")
-	h.TempFile("FILE", "")
-
-	testcases := []struct {
-		p1, p2                   string
-		caseSensitiveEquivalent  bool
-		caseInensitiveEquivalent bool
-		err                      bool
-	}{
-		{h.Path("dir"), h.Path("dir"), true, true, false},
-		{h.Path("file"), h.Path("file"), true, true, false},
-		{h.Path("dir"), h.Path("dir2"), false, false, false},
-		{h.Path("file"), h.Path("file2"), false, false, false},
-		{h.Path("dir"), h.Path("file"), false, false, false},
-		{h.Path("dir"), h.Path("DIR"), false, true, false},
-		{strings.ToLower(h.Path("dir")), strings.ToUpper(h.Path("dir")), false, true, true},
-	}
-
-	caseSensitive, err := IsCaseSensitiveFilesystem(h.Path("dir"))
-	if err != nil {
-		t.Fatal("unexpcted error:", err)
-	}
-
-	for _, tc := range testcases {
-		got, err := EquivalentPaths(tc.p1, tc.p2)
-		if err != nil && !tc.err {
-			t.Error("unexpected error:", err)
-		}
-		if caseSensitive {
-			if tc.caseSensitiveEquivalent != got {
-				t.Errorf("expected EquivalentPaths(%q, %q) to be %t on case-sensitive filesystem, got %t", tc.p1, tc.p2, tc.caseSensitiveEquivalent, got)
-			}
-		} else {
-			if tc.caseInensitiveEquivalent != got {
-				t.Errorf("expected EquivalentPaths(%q, %q) to be %t on case-insensitive filesystem, got %t", tc.p1, tc.p2, tc.caseInensitiveEquivalent, got)
-			}
-		}
-	}
-}
-
-func TestRenameWithFallback(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	if err = RenameWithFallback(filepath.Join(dir, "does_not_exists"), filepath.Join(dir, "dst")); err == nil {
-		t.Fatal("expected an error for non existing file, but got nil")
-	}
-
-	srcpath := filepath.Join(dir, "src")
-
-	if srcf, err := os.Create(srcpath); err != nil {
-		t.Fatal(err)
-	} else {
-		srcf.Close()
-	}
-
-	if err = RenameWithFallback(srcpath, filepath.Join(dir, "dst")); err != nil {
-		t.Fatal(err)
-	}
-
-	srcpath = filepath.Join(dir, "a")
-	if err = os.MkdirAll(srcpath, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	dstpath := filepath.Join(dir, "b")
-	if err = os.MkdirAll(dstpath, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = RenameWithFallback(srcpath, dstpath); err == nil {
-		t.Fatal("expected an error if dst is an existing directory, but got nil")
-	}
-}
-
-func TestIsCaseSensitiveFilesystem(t *testing.T) {
-	isLinux := runtime.GOOS == "linux"
-	isWindows := runtime.GOOS == "windows"
-	isMacOS := runtime.GOOS == "darwin"
-
-	if !isLinux && !isWindows && !isMacOS {
-		t.Skip("Run this test on Windows, Linux and macOS only")
-	}
-
-	dir, err := ioutil.TempDir("", "TestCaseSensitivity")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	var want bool
-	if isLinux {
-		want = true
-	} else {
-		want = false
-	}
-
-	got, err := IsCaseSensitiveFilesystem(dir)
-
-	if err != nil {
-		t.Fatalf("unexpected error message: \n\t(GOT) %+v", err)
-	}
-
-	if want != got {
-		t.Fatalf("unexpected value returned: \n\t(GOT) %t\n\t(WNT) %t", got, want)
-	}
-}
-
-func TestReadActualFilenames(t *testing.T) {
-	// We are trying to skip this test on file systems which are case-sensiive. We could
-	// have used `fs.IsCaseSensitiveFilesystem` for this check. However, the code we are
-	// testing also relies on `fs.IsCaseSensitiveFilesystem`. So a bug in
-	// `fs.IsCaseSensitiveFilesystem` could prevent this test from being run. This is the
-	// only scenario where we prefer the OS heuristic over doing the actual work of
-	// validating filesystem case sensitivity via `fs.IsCaseSensitiveFilesystem`.
-	if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-		t.Skip("skip this test on non-Windows, non-macOS")
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("")
-	tmpPath := h.Path(".")
-
-	// First, check the scenarios for which we expect an error.
-	_, err := ReadActualFilenames(filepath.Join(tmpPath, "does_not_exists"), []string{""})
-	switch {
-	case err == nil:
-		t.Fatal("expected err for non-existing folder")
-	// use `errors.Cause` because the error is wrapped and returned
-	case !os.IsNotExist(errors.Cause(err)):
-		t.Fatalf("unexpected error: %+v", err)
-	}
-	h.TempFile("tmpFile", "")
-	_, err = ReadActualFilenames(h.Path("tmpFile"), []string{""})
-	switch {
-	case err == nil:
-		t.Fatal("expected err for passing file instead of directory")
-	case err != errPathNotDir:
-		t.Fatalf("unexpected error: %+v", err)
-	}
-
-	cases := []struct {
-		createFiles []string
-		names       []string
-		want        map[string]string
-	}{
-		// If we supply no filenames to the function, it should return an empty map.
-		{nil, nil, map[string]string{}},
-		// If the directory contains the given file with different case, it should return
-		// a map which has the given filename as the key and actual filename as the value.
-		{
-			[]string{"test1.txt"},
-			[]string{"Test1.txt"},
-			map[string]string{"Test1.txt": "test1.txt"},
-		},
-		// 1. If the given filename is same as the actual filename, map should have the
-		//    same key and value for the file.
-		// 2. If the given filename is present with different case for file extension,
-		//    it should return a map which has the given filename as the key and actual
-		//    filename as the value.
-		// 3. If the given filename is not present even with a different case, the map
-		//    returned should not have an entry for that filename.
-		{
-			[]string{"test2.txt", "test3.TXT"},
-			[]string{"test2.txt", "Test3.txt", "Test4.txt"},
-			map[string]string{
-				"test2.txt": "test2.txt",
-				"Test3.txt": "test3.TXT",
-			},
-		},
-	}
-	for _, c := range cases {
-		for _, file := range c.createFiles {
-			h.TempFile(file, "")
-		}
-		got, err := ReadActualFilenames(tmpPath, c.names)
-		if err != nil {
-			t.Fatalf("unexpected error: %+v", err)
-		}
-		if !reflect.DeepEqual(c.want, got) {
-			t.Fatalf("returned value does not match expected: \n\t(GOT) %v\n\t(WNT) %v",
-				got, c.want)
-		}
-	}
-}
-
-func TestGenTestFilename(t *testing.T) {
-	cases := []struct {
-		str  string
-		want string
-	}{
-		{"abc", "Abc"},
-		{"ABC", "aBC"},
-		{"AbC", "abC"},
-		{"αβγ", "Αβγ"},
-		{"123", "123"},
-		{"1a2", "1A2"},
-		{"12a", "12A"},
-		{"⌘", "⌘"},
-	}
-
-	for _, c := range cases {
-		got := genTestFilename(c.str)
-		if c.want != got {
-			t.Fatalf("str: %q, expected: %q, got: %q", c.str, c.want, got)
-		}
-	}
-}
-
-func BenchmarkGenTestFilename(b *testing.B) {
-	cases := []string{
-		strings.Repeat("a", 128),
-		strings.Repeat("A", 128),
-		strings.Repeat("α", 128),
-		strings.Repeat("1", 128),
-		strings.Repeat("⌘", 128),
-	}
-
-	for i := 0; i < b.N; i++ {
-		for _, str := range cases {
-			genTestFilename(str)
-		}
-	}
-}
-
-func TestCopyDir(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcdir := filepath.Join(dir, "src")
-	if err := os.MkdirAll(srcdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	files := []struct {
-		path     string
-		contents string
-		fi       os.FileInfo
-	}{
-		{path: "myfile", contents: "hello world"},
-		{path: filepath.Join("subdir", "file"), contents: "subdir file"},
-	}
-
-	// Create structure indicated in 'files'
-	for i, file := range files {
-		fn := filepath.Join(srcdir, file.path)
-		dn := filepath.Dir(fn)
-		if err = os.MkdirAll(dn, 0755); err != nil {
-			t.Fatal(err)
-		}
-
-		fh, err := os.Create(fn)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if _, err = fh.Write([]byte(file.contents)); err != nil {
-			t.Fatal(err)
-		}
-		fh.Close()
-
-		files[i].fi, err = os.Stat(fn)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	destdir := filepath.Join(dir, "dest")
-	if err := CopyDir(srcdir, destdir); err != nil {
-		t.Fatal(err)
-	}
-
-	// Compare copy against structure indicated in 'files'
-	for _, file := range files {
-		fn := filepath.Join(srcdir, file.path)
-		dn := filepath.Dir(fn)
-		dirOK, err := IsDir(dn)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !dirOK {
-			t.Fatalf("expected %s to be a directory", dn)
-		}
-
-		got, err := ioutil.ReadFile(fn)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if file.contents != string(got) {
-			t.Fatalf("expected: %s, got: %s", file.contents, string(got))
-		}
-
-		gotinfo, err := os.Stat(fn)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if file.fi.Mode() != gotinfo.Mode() {
-			t.Fatalf("expected %s: %#v\n to be the same mode as %s: %#v",
-				file.path, file.fi.Mode(), fn, gotinfo.Mode())
-		}
-	}
-}
-
-func TestCopyDirFail_SrcInaccessible(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// XXX: setting permissions works differently in
-		// Microsoft Windows. Skipping this this until a
-		// compatible implementation is provided.
-		t.Skip("skipping on windows")
-	}
-
-	var srcdir, dstdir string
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		srcdir = filepath.Join(dir, "src")
-		return os.MkdirAll(srcdir, 0755)
-	})
-	defer cleanup()
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	dstdir = filepath.Join(dir, "dst")
-	if err = CopyDir(srcdir, dstdir); err == nil {
-		t.Fatalf("expected error for CopyDir(%s, %s), got none", srcdir, dstdir)
-	}
-}
-
-func TestCopyDirFail_DstInaccessible(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// XXX: setting permissions works differently in
-		// Microsoft Windows. Skipping this this until a
-		// compatible implementation is provided.
-		t.Skip("skipping on windows")
-	}
-
-	var srcdir, dstdir string
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcdir = filepath.Join(dir, "src")
-	if err = os.MkdirAll(srcdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		dstdir = filepath.Join(dir, "dst")
-		return nil
-	})
-	defer cleanup()
-
-	if err := CopyDir(srcdir, dstdir); err == nil {
-		t.Fatalf("expected error for CopyDir(%s, %s), got none", srcdir, dstdir)
-	}
-}
-
-func TestCopyDirFail_SrcIsNotDir(t *testing.T) {
-	var srcdir, dstdir string
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcdir = filepath.Join(dir, "src")
-	if _, err = os.Create(srcdir); err != nil {
-		t.Fatal(err)
-	}
-
-	dstdir = filepath.Join(dir, "dst")
-
-	if err = CopyDir(srcdir, dstdir); err == nil {
-		t.Fatalf("expected error for CopyDir(%s, %s), got none", srcdir, dstdir)
-	}
-
-	if err != errSrcNotDir {
-		t.Fatalf("expected %v error for CopyDir(%s, %s), got %s", errSrcNotDir, srcdir, dstdir, err)
-	}
-
-}
-
-func TestCopyDirFail_DstExists(t *testing.T) {
-	var srcdir, dstdir string
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcdir = filepath.Join(dir, "src")
-	if err = os.MkdirAll(srcdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	dstdir = filepath.Join(dir, "dst")
-	if err = os.MkdirAll(dstdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = CopyDir(srcdir, dstdir); err == nil {
-		t.Fatalf("expected error for CopyDir(%s, %s), got none", srcdir, dstdir)
-	}
-
-	if err != errDstExist {
-		t.Fatalf("expected %v error for CopyDir(%s, %s), got %s", errDstExist, srcdir, dstdir, err)
-	}
-}
-
-func TestCopyDirFailOpen(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// XXX: setting permissions works differently in
-		// Microsoft Windows. os.Chmod(..., 0222) below is not
-		// enough for the file to be readonly, and os.Chmod(...,
-		// 0000) returns an invalid argument error. Skipping
-		// this this until a compatible implementation is
-		// provided.
-		t.Skip("skipping on windows")
-	}
-
-	var srcdir, dstdir string
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcdir = filepath.Join(dir, "src")
-	if err = os.MkdirAll(srcdir, 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	srcfn := filepath.Join(srcdir, "file")
-	srcf, err := os.Create(srcfn)
-	if err != nil {
-		t.Fatal(err)
-	}
-	srcf.Close()
-
-	// setup source file so that it cannot be read
-	if err = os.Chmod(srcfn, 0222); err != nil {
-		t.Fatal(err)
-	}
-
-	dstdir = filepath.Join(dir, "dst")
-
-	if err = CopyDir(srcdir, dstdir); err == nil {
-		t.Fatalf("expected error for CopyDir(%s, %s), got none", srcdir, dstdir)
-	}
-}
-
-func TestCopyFile(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcf, err := os.Create(filepath.Join(dir, "srcfile"))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	want := "hello world"
-	if _, err := srcf.Write([]byte(want)); err != nil {
-		t.Fatal(err)
-	}
-	srcf.Close()
-
-	destf := filepath.Join(dir, "destf")
-	if err := copyFile(srcf.Name(), destf); err != nil {
-		t.Fatal(err)
-	}
-
-	got, err := ioutil.ReadFile(destf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if want != string(got) {
-		t.Fatalf("expected: %s, got: %s", want, string(got))
-	}
-
-	wantinfo, err := os.Stat(srcf.Name())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	gotinfo, err := os.Stat(destf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if wantinfo.Mode() != gotinfo.Mode() {
-		t.Fatalf("expected %s: %#v\n to be the same mode as %s: %#v", srcf.Name(), wantinfo.Mode(), destf, gotinfo.Mode())
-	}
-}
-
-func TestCopyFileSymlink(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	h.TempDir(".")
-
-	testcases := map[string]string{
-		filepath.Join("./testdata/symlinks/file-symlink"):         filepath.Join(h.Path("."), "dst-file"),
-		filepath.Join("./testdata/symlinks/windows-file-symlink"): filepath.Join(h.Path("."), "windows-dst-file"),
-		filepath.Join("./testdata/symlinks/dir-symlink"):          filepath.Join(h.Path("."), "dst-dir"),
-		filepath.Join("./testdata/symlinks/invalid-symlink"):      filepath.Join(h.Path("."), "invalid-symlink"),
-	}
-
-	for symlink, dst := range testcases {
-		t.Run(symlink, func(t *testing.T) {
-			var err error
-			if err = copyFile(symlink, dst); err != nil {
-				t.Fatalf("failed to copy symlink: %s", err)
-			}
-
-			var want, got string
-
-			if runtime.GOOS == "windows" {
-				// Creating symlinks on Windows require an additional permission
-				// regular users aren't granted usually. So we copy the file
-				// content as a fall back instead of creating a real symlink.
-				srcb, err := ioutil.ReadFile(symlink)
-				h.Must(err)
-				dstb, err := ioutil.ReadFile(dst)
-				h.Must(err)
-
-				want = string(srcb)
-				got = string(dstb)
-			} else {
-				want, err = os.Readlink(symlink)
-				h.Must(err)
-
-				got, err = os.Readlink(dst)
-				if err != nil {
-					t.Fatalf("could not resolve symlink: %s", err)
-				}
-			}
-
-			if want != got {
-				t.Fatalf("resolved path is incorrect. expected %s, got %s", want, got)
-			}
-		})
-	}
-}
-
-func TestCopyFileLongFilePath(t *testing.T) {
-	if runtime.GOOS != "windows" {
-		// We want to ensure the temporary fix actually fixes the issue with
-		// os.Chmod and long file paths. This is only applicable on Windows.
-		t.Skip("skipping on non-windows")
-	}
-
-	h := test.NewHelper(t)
-	h.TempDir(".")
-	defer h.Cleanup()
-
-	tmpPath := h.Path(".")
-
-	// Create a directory with a long-enough path name to cause the bug in #774.
-	dirName := ""
-	for len(tmpPath+string(os.PathSeparator)+dirName) <= 300 {
-		dirName += "directory"
-	}
-
-	h.TempDir(dirName)
-	h.TempFile(dirName+string(os.PathSeparator)+"src", "")
-
-	tmpDirPath := tmpPath + string(os.PathSeparator) + dirName + string(os.PathSeparator)
-
-	err := copyFile(tmpDirPath+"src", tmpDirPath+"dst")
-	if err != nil {
-		t.Fatalf("unexpected error while copying file: %v", err)
-	}
-}
-
-// C:\Users\appveyor\AppData\Local\Temp\1\gotest639065787\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890\dir4567890
-
-func TestCopyFileFail(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// XXX: setting permissions works differently in
-		// Microsoft Windows. Skipping this this until a
-		// compatible implementation is provided.
-		t.Skip("skipping on windows")
-	}
-
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	srcf, err := os.Create(filepath.Join(dir, "srcfile"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	srcf.Close()
-
-	var dstdir string
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		dstdir = filepath.Join(dir, "dir")
-		return os.Mkdir(dstdir, 0777)
-	})
-	defer cleanup()
-
-	fn := filepath.Join(dstdir, "file")
-	if err := copyFile(srcf.Name(), fn); err == nil {
-		t.Fatalf("expected error for %s, got none", fn)
-	}
-}
-
-// setupInaccessibleDir creates a temporary location with a single
-// directory in it, in such a way that that directory is not accessible
-// after this function returns.
-//
-// op is called with the directory as argument, so that it can create
-// files or other test artifacts.
-//
-// If setupInaccessibleDir fails in its preparation, or op fails, t.Fatal
-// will be invoked.
-//
-// This function returns a cleanup function that removes all the temporary
-// files this function creates. It is the caller's responsibility to call
-// this function before the test is done running, whether there's an error or not.
-func setupInaccessibleDir(t *testing.T, op func(dir string) error) func() {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-		return nil // keep compiler happy
-	}
-
-	subdir := filepath.Join(dir, "dir")
-
-	cleanup := func() {
-		if err := os.Chmod(subdir, 0777); err != nil {
-			t.Error(err)
-		}
-		if err := os.RemoveAll(dir); err != nil {
-			t.Error(err)
-		}
-	}
-
-	if err := os.Mkdir(subdir, 0777); err != nil {
-		cleanup()
-		t.Fatal(err)
-		return nil
-	}
-
-	if err := op(subdir); err != nil {
-		cleanup()
-		t.Fatal(err)
-		return nil
-	}
-
-	if err := os.Chmod(subdir, 0666); err != nil {
-		cleanup()
-		t.Fatal(err)
-		return nil
-	}
-
-	return cleanup
-}
-
-func TestIsRegular(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var fn string
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		fn = filepath.Join(dir, "file")
-		fh, err := os.Create(fn)
-		if err != nil {
-			return err
-		}
-
-		return fh.Close()
-	})
-	defer cleanup()
-
-	tests := map[string]struct {
-		exists bool
-		err    bool
-	}{
-		wd: {false, true},
-		filepath.Join(wd, "testdata"):                       {false, true},
-		filepath.Join(wd, "testdata", "test.file"):          {true, false},
-		filepath.Join(wd, "this_file_does_not_exist.thing"): {false, false},
-		fn: {false, true},
-	}
-
-	if runtime.GOOS == "windows" {
-		// This test doesn't work on Microsoft Windows because
-		// of the differences in how file permissions are
-		// implemented. For this to work, the directory where
-		// the file exists should be inaccessible.
-		delete(tests, fn)
-	}
-
-	for f, want := range tests {
-		got, err := IsRegular(f)
-		if err != nil {
-			if want.exists != got {
-				t.Fatalf("expected %t for %s, got %t", want.exists, f, got)
-			}
-			if !want.err {
-				t.Fatalf("expected no error, got %v", err)
-			}
-		} else {
-			if want.err {
-				t.Fatalf("expected error for %s, got none", f)
-			}
-		}
-
-		if got != want.exists {
-			t.Fatalf("expected %t for %s, got %t", want, f, got)
-		}
-	}
-
-}
-
-func TestIsDir(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var dn string
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		dn = filepath.Join(dir, "dir")
-		return os.Mkdir(dn, 0777)
-	})
-	defer cleanup()
-
-	tests := map[string]struct {
-		exists bool
-		err    bool
-	}{
-		wd: {true, false},
-		filepath.Join(wd, "testdata"):                       {true, false},
-		filepath.Join(wd, "main.go"):                        {false, true},
-		filepath.Join(wd, "this_file_does_not_exist.thing"): {false, true},
-		dn: {false, true},
-	}
-
-	if runtime.GOOS == "windows" {
-		// This test doesn't work on Microsoft Windows because
-		// of the differences in how file permissions are
-		// implemented. For this to work, the directory where
-		// the directory exists should be inaccessible.
-		delete(tests, dn)
-	}
-
-	for f, want := range tests {
-		got, err := IsDir(f)
-		if err != nil && !want.err {
-			t.Fatalf("expected no error, got %v", err)
-		}
-
-		if got != want.exists {
-			t.Fatalf("expected %t for %s, got %t", want.exists, f, got)
-		}
-	}
-}
-
-func TestIsNonEmptyDir(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("empty")
-
-	testCases := []struct {
-		path  string
-		empty bool
-		err   bool
-	}{
-		{wd, true, false},
-		{"testdata", true, false},
-		{filepath.Join(wd, "fs.go"), false, true},
-		{filepath.Join(wd, "this_file_does_not_exist.thing"), false, false},
-		{h.Path("empty"), false, false},
-	}
-
-	// This test case doesn't work on Microsoft Windows because of the
-	// differences in how file permissions are implemented.
-	if runtime.GOOS != "windows" {
-		var inaccessibleDir string
-		cleanup := setupInaccessibleDir(t, func(dir string) error {
-			inaccessibleDir = filepath.Join(dir, "empty")
-			return os.Mkdir(inaccessibleDir, 0777)
-		})
-		defer cleanup()
-
-		testCases = append(testCases, struct {
-			path  string
-			empty bool
-			err   bool
-		}{inaccessibleDir, false, true})
-	}
-
-	for _, want := range testCases {
-		got, err := IsNonEmptyDir(want.path)
-		if want.err && err == nil {
-			if got {
-				t.Fatalf("wanted false with error for %v, but got true", want.path)
-			}
-			t.Fatalf("wanted an error for %v, but it was nil", want.path)
-		}
-
-		if got != want.empty {
-			t.Fatalf("wanted %t for %v, but got %t", want.empty, want.path, got)
-		}
-	}
-}
-
-func TestIsSymlink(t *testing.T) {
-	dir, err := ioutil.TempDir("", "dep")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	dirPath := filepath.Join(dir, "directory")
-	if err = os.MkdirAll(dirPath, 0777); err != nil {
-		t.Fatal(err)
-	}
-
-	filePath := filepath.Join(dir, "file")
-	f, err := os.Create(filePath)
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	dirSymlink := filepath.Join(dir, "dirSymlink")
-	fileSymlink := filepath.Join(dir, "fileSymlink")
-
-	if err = os.Symlink(dirPath, dirSymlink); err != nil {
-		t.Fatal(err)
-	}
-	if err = os.Symlink(filePath, fileSymlink); err != nil {
-		t.Fatal(err)
-	}
-
-	var (
-		inaccessibleFile    string
-		inaccessibleSymlink string
-	)
-
-	cleanup := setupInaccessibleDir(t, func(dir string) error {
-		inaccessibleFile = filepath.Join(dir, "file")
-		if fh, err := os.Create(inaccessibleFile); err != nil {
-			return err
-		} else if err = fh.Close(); err != nil {
-			return err
-		}
-
-		inaccessibleSymlink = filepath.Join(dir, "symlink")
-		return os.Symlink(inaccessibleFile, inaccessibleSymlink)
-	})
-	defer cleanup()
-
-	tests := map[string]struct{ expected, err bool }{
-		dirPath:             {false, false},
-		filePath:            {false, false},
-		dirSymlink:          {true, false},
-		fileSymlink:         {true, false},
-		inaccessibleFile:    {false, true},
-		inaccessibleSymlink: {false, true},
-	}
-
-	if runtime.GOOS == "windows" {
-		// XXX: setting permissions works differently in Windows. Skipping
-		// these cases until a compatible implementation is provided.
-		delete(tests, inaccessibleFile)
-		delete(tests, inaccessibleSymlink)
-	}
-
-	for path, want := range tests {
-		got, err := IsSymlink(path)
-		if err != nil {
-			if !want.err {
-				t.Errorf("expected no error, got %v", err)
-			}
-		}
-
-		if got != want.expected {
-			t.Errorf("expected %t for %s, got %t", want.expected, path, got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/fs/testdata/test.file b/installer/vendor/github.com/golang/dep/internal/fs/testdata/test.file
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/README.md b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/README.md
deleted file mode 100644
index 14232159c3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-### Test Data
-
-This directory contains artifacts that represent malformed repo archives. Its purpose is to ensure `dep` can recover from such corrupted repositories in specific test scenarios.
-
-- `corrupt_dot_git_directory.tar`: is a repo with a corrupt `.git` directory. Dep can put a directory in such malformed state when a user hits `Ctrl+C` in the middle of a `dep init` process or others. `TestNewCtxRepoRecovery` uses this file to ensure recovery.
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/corrupt_dot_git_directory.tar b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/corrupt_dot_git_directory.tar
deleted file mode 100644
index 7a84731839..0000000000
Binary files a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/badrepo/corrupt_dot_git_directory.tar and /dev/null differ
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/echosleep/echosleep.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/echosleep/echosleep.go
deleted file mode 100644
index 70de0e5032..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/echosleep/echosleep.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"time"
-)
-
-func main() {
-	n := flag.Int("n", 1, "number of iterations before stopping")
-	flag.Parse()
-
-	for i := 0; i < *n; i++ {
-		fmt.Println("foo")
-		time.Sleep(time.Duration(i) * 250 * time.Millisecond)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go
deleted file mode 100644
index 806d18912b..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/cmd/stdout_stderr/stdout_stderr.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"os"
-)
-
-func main() {
-	os.Stdout.WriteString("stdout")
-	os.Stderr.WriteString("stderr")
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/match/match.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/match/match.go
deleted file mode 100644
index ab5f875285..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/match/match.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package match
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go
deleted file mode 100644
index 1ace4e7683..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/mismatch/mismatch.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mismatch
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go
deleted file mode 100644
index 5b2914de73..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/alice/notInLock/notInLock.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package notInLock
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go
deleted file mode 100644
index 2d6067bc8e..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/emptyDigest/emptyDigest.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package emptyDigest
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/match/match.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/match/match.go
deleted file mode 100644
index ab5f875285..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/github.com/bob/match/match.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package match
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/launchpad.net/match/match.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/launchpad.net/match/match.go
deleted file mode 100644
index ab5f875285..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/digest/launchpad.net/match/match.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package match
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/bad/bad.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/bad/bad.go
deleted file mode 100644
index dfc89bee08..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/bad/bad.go
+++ /dev/null
@@ -1,6 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This ill-formed Go source file is here to ensure the tool is robust
-// against bad packages in the workspace.
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/buildtag/invalid.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/buildtag/invalid.go
deleted file mode 100644
index 20c43146f0..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/buildtag/invalid.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Hello
-// Not a valid +build ignore
-// No Really
-
-package buildtag
-
-import (
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/a.go
deleted file mode 100644
index 9815345118..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/a.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package canonical // import "vanity1"
-
-var (
-	A = "A"
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/b.go
deleted file mode 100644
index b8b706bbd4..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canon_confl/b.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package canonical // import "vanity2"
-
-var (
-	B = "B"
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/main.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/main.go
deleted file mode 100644
index 4fe31ce3d5..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/main.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkg // import "canonical"
-
-var (
-	A = "A"
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/sub/sub.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/sub/sub.go
deleted file mode 100644
index 783186dfc2..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/canonical/sub/sub.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sub // import "canonical/subpackage"
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/a.go
deleted file mode 100644
index 0965bb7037..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cycle
-
-import (
-	"cycle/one"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	A = gps.Solve
-	B = one.A
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/one/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/one/a.go
deleted file mode 100644
index 407c8051c2..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/one/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package one
-
-import (
-	"cycle/two"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	A = gps.Solve
-	B = two.A
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/two/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/two/a.go
deleted file mode 100644
index 98ea406f9c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/cycle/two/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package two
-
-import (
-	"cycle"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	A = gps.Solve
-	B = cycle.A
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/a.go
deleted file mode 100644
index 7b2b9c67bd..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/a.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package disallow
-
-import (
-	"disallow/testdata"
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-	_ = testdata.H
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/testdata/another.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/testdata/another.go
deleted file mode 100644
index f2d60b88f9..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/disallow/testdata/another.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package testdata
-
-import "hash"
-
-var (
-	H = hash.Hash
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.go/.gitkeep b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.go/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.go/dot.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.go/dot.go
deleted file mode 100644
index bb51d69f9a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.go/dot.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dot
-
-// nothing to see here
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/a.go
deleted file mode 100644
index a5fc8c2e57..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	S = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/.m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/foo.go/.gitkeep b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/foo.go/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/foo.go/foo.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/foo.go/foo.go
deleted file mode 100644
index 1de8b0ab15..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/dotgodir/foo.go/foo.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package foo
-
-import "sort"
-
-var _ = sort.Strings
-
-// yes, this is dumb, don't use ".go" in your directory names
-// See https://github.com/golang/dep/issues/550 for more information
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/a.go
deleted file mode 100644
index e99afea031..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package base
-
-import (
-	"go/parser"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = parser.ParseFile
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/nm.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/nm.go
deleted file mode 100644
index 6c4a42fcc3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/doublenest/namemismatch/nm.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nm
-
-import (
-	"os"
-
-	"github.com/Masterminds/semver"
-)
-
-var (
-	V = os.FileInfo
-	_ = semver.Constraint
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/empty/.gitkeep b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/empty/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/locals.go
deleted file mode 100644
index 38dbe7aaab..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/locals.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"github.com/example/varied/namemismatch"
-	"github.com/example/varied/otherpath"
-	"github.com/example/varied/simple"
-)
-
-var (
-	_ = simple.S
-	_ = nm.V
-	_ = otherpath.O
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go
deleted file mode 100644
index b2de8754cb..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	M = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/main.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/main.go
deleted file mode 100644
index 0812e3ca60..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"net/http"
-)
-
-var (
-	_ = http.Client
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go
deleted file mode 100644
index 6c4a42fcc3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/namemismatch/nm.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nm
-
-import (
-	"os"
-
-	"github.com/Masterminds/semver"
-)
-
-var (
-	V = os.FileInfo
-	_ = semver.Constraint
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go
deleted file mode 100644
index 734c91ad43..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/otherpath/otherpath_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package otherpath
-
-import "github.com/example/varied/m1p"
-
-var O = m1p.M
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go
deleted file mode 100644
index c453a8ea1b..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "hash"
-
-var (
-	H = hash.Hash
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go
deleted file mode 100644
index e871391365..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/another_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "encoding/binary"
-
-var (
-	_ = binary.PutVarint
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go
deleted file mode 100644
index 6995b92543..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/another/locals.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "github.com/example/varied/m1p"
-
-var _ = m1p.M
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/locals.go
deleted file mode 100644
index c5a0ae3a6c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/locals.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import "github.com/example/varied/simple/another"
-
-var (
-	_ = another.H
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go
deleted file mode 100644
index 9d0c3445f6..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/github.com/example/varied/simple/simple.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"go/parser"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = parser.ParseFile
-	S = gps.Prepare
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/igmain.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/igmain.go
deleted file mode 100644
index eaab15bd22..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmain/igmain.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "unicode"
-
-var _ = unicode.In
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/igmain.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/igmain.go
deleted file mode 100644
index eaab15bd22..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/igmain.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "unicode"
-
-var _ = unicode.In
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/z.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/z.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainfirst/z.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/igmain.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/igmain.go
deleted file mode 100644
index 849ceab43d..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmainlong/igmain.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Another comment, which the parser should ignore and still see builds tags
-
-// +build ignore
-
-package main
-
-import "unicode"
-
-var _ = unicode.In
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/igmain.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/igmain.go
deleted file mode 100644
index eaab15bd22..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/igmain.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import "unicode"
-
-var _ = unicode.In
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/t_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/t_test.go
deleted file mode 100644
index f29d331338..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/igmaint/t_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"math/rand"
-	"strconv"
-)
-
-var (
-	_ = rand.Int()
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/a.go
deleted file mode 100644
index 0cdcb394ba..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/a.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"missing/missing"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-	_ = missing.Foo
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/missing/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/nest/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/a.go
deleted file mode 100644
index ccfa73a945..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/a.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package relimport
-
-import (
-	"sort"
-)
-
-var (
-	A = sort.Strings
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dot/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dot/a.go
deleted file mode 100644
index a1dd285380..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dot/a.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dot
-
-import (
-	"."
-	"sort"
-)
-
-var (
-	A = sort.Strings
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdot/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdot/a.go
deleted file mode 100644
index 6cfc99f288..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdot/a.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dotdot
-
-import (
-	relimport ".."
-)
-
-var (
-	A = relimport.A
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdotslash/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdotslash/a.go
deleted file mode 100644
index f1ffb55bdd..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotdotslash/a.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dotslash
-
-import (
-	"../github.com/golang/dep/internal/gps"
-)
-
-var (
-	A = gps.Solver
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotslash/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotslash/a.go
deleted file mode 100644
index b904565dd7..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/relimport/dotslash/a.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dotslash
-
-import (
-	"./simple"
-)
-
-var (
-	A = simple.A
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/a.go
deleted file mode 100644
index ddfc833eea..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/simple/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/simple/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/ren/simple/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simple/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simple/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simple/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a_test.go
deleted file mode 100644
index b8a754a717..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/a_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple_test
-
-import (
-	"sort"
-	"strconv"
-)
-
-var (
-	_ = sort.Strings
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/t_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/t_test.go
deleted file mode 100644
index f29d331338..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simpleallt/t_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"math/rand"
-	"strconv"
-)
-
-var (
-	_ = rand.Int()
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/t_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/t_test.go
deleted file mode 100644
index f29d331338..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplet/t_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"math/rand"
-	"strconv"
-)
-
-var (
-	_ = rand.Int()
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a_test.go
deleted file mode 100644
index b8a754a717..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/simplext/a_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple_test
-
-import (
-	"sort"
-	"strconv"
-)
-
-var (
-	_ = sort.Strings
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/_a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/_a.go
deleted file mode 100644
index b53a03b55a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/_a.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package skip
-
-import (
-	"bytes"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = bytes.Buffer
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/a.go
deleted file mode 100644
index cd1dd811ae..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/skip_/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package skip
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/t/t_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/t/t_test.go
deleted file mode 100644
index f29d331338..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/t/t_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"math/rand"
-	"strconv"
-)
-
-var (
-	_ = rand.Int()
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/a.go
deleted file mode 100644
index 2789b659d1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/twopkgs/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/locals.go
deleted file mode 100644
index d9dcdec11a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/locals.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"varied/namemismatch"
-	"varied/otherpath"
-	"varied/simple"
-)
-
-var (
-	_ = simple.S
-	_ = nm.V
-	_ = otherpath.O
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/a.go
deleted file mode 100644
index b2de8754cb..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	M = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/b.go
deleted file mode 100644
index de4eb0b563..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/m1p/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package m1p
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/main.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/main.go
deleted file mode 100644
index 0812e3ca60..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"net/http"
-)
-
-var (
-	_ = http.Client
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/namemismatch/nm.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/namemismatch/nm.go
deleted file mode 100644
index 6c4a42fcc3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/namemismatch/nm.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nm
-
-import (
-	"os"
-
-	"github.com/Masterminds/semver"
-)
-
-var (
-	V = os.FileInfo
-	_ = semver.Constraint
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/otherpath/otherpath_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/otherpath/otherpath_test.go
deleted file mode 100644
index 0ccf3d038f..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/otherpath/otherpath_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package otherpath
-
-import "varied/m1p"
-
-var O = m1p.M
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another.go
deleted file mode 100644
index c453a8ea1b..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "hash"
-
-var (
-	H = hash.Hash
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another_test.go
deleted file mode 100644
index e871391365..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/another_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "encoding/binary"
-
-var (
-	_ = binary.PutVarint
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/locals.go
deleted file mode 100644
index befa5c683a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/another/locals.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package another
-
-import "varied/m1p"
-
-var _ = m1p.M
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/locals.go
deleted file mode 100644
index 3f592af781..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/locals.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import "varied/simple/another"
-
-var (
-	_ = another.H
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/simple.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/simple.go
deleted file mode 100644
index 9d0c3445f6..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied/simple/simple.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"go/parser"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = parser.ParseFile
-	S = gps.Prepare
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
deleted file mode 100644
index 66e136f943..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/a.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package onlyfromtests
-
-import (
-	"sort"
-
-	_ "varied/_secondorder"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	M = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go
deleted file mode 100644
index fa353864bf..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/.onlyfromtests/b.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package onlyfromtests
-
-import (
-	"os"
-	"sort"
-)
-
-var (
-	_ = sort.Strings
-	_ = os.PathSeparator
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_frommain/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_frommain/a.go
deleted file mode 100644
index 28ee51be7a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_frommain/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package frommain
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	M = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_never/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_never/a.go
deleted file mode 100644
index 72c7c99245..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_never/a.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package never
-
-import (
-	"sort"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	M = sort.Strings
-	_ = gps.Solve
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go
deleted file mode 100644
index 4224b81e1e..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/_secondorder/secondorder.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package secondorder
-
-import "hash"
-
-var (
-	H = hash.Hash
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/always/always_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/always/always_test.go
deleted file mode 100644
index 043805b4bf..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/always/always_test.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package always
-
-import _ "varied/.onlyfromtests"
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go
deleted file mode 100644
index f1ffb55bdd..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/dotdotslash/a.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dotslash
-
-import (
-	"../github.com/golang/dep/internal/gps"
-)
-
-var (
-	A = gps.Solver
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/locals.go
deleted file mode 100644
index 4afaa8bfd3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/locals.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	_ "varied/_frommain"
-	"varied/simple"
-)
-
-var (
-	_ = simple.S
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/main.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/main.go
deleted file mode 100644
index 0812e3ca60..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"net/http"
-)
-
-var (
-	_ = http.Client
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/locals.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/locals.go
deleted file mode 100644
index 7d682c4e75..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/locals.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import "varied/simple/testdata"
-
-var (
-	_ = testdata.H
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/simple.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/simple.go
deleted file mode 100644
index 9d0c3445f6..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/simple.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple
-
-import (
-	"go/parser"
-
-	"github.com/golang/dep/internal/gps"
-)
-
-var (
-	_ = parser.ParseFile
-	S = gps.Prepare
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/testdata/another.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/testdata/another.go
deleted file mode 100644
index 02eab2a200..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/varied_hidden/simple/testdata/another.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package testdata
-
-import _ "varied/dotdotslash"
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/xt/a_test.go b/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/xt/a_test.go
deleted file mode 100644
index b8a754a717..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/_testdata/src/xt/a_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package simple_test
-
-import (
-	"sort"
-	"strconv"
-)
-
-var (
-	_ = sort.Strings
-	_ = strconv.Unquote
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/constraint_test.go b/installer/vendor/github.com/golang/dep/internal/gps/constraint_test.go
deleted file mode 100644
index e8f8e9856a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/constraint_test.go
+++ /dev/null
@@ -1,1007 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/golang/dep/internal/gps/internal/pb"
-	"github.com/golang/protobuf/proto"
-	"github.com/pkg/errors"
-)
-
-// gu - helper func for stringifying what we assume is a VersionPair (otherwise
-// will panic), but is given as a Constraint
-func gu(v Constraint) string {
-	return fmt.Sprintf("%q at rev %q", v, v.(PairedVersion).Revision())
-}
-
-func TestBranchConstraintOps(t *testing.T) {
-	v1 := NewBranch("master").(branchVersion)
-	v2 := NewBranch("test").(branchVersion)
-
-	if !v1.MatchesAny(any) {
-		t.Errorf("Branches should always match the any constraint")
-	}
-	if v1.Intersect(any) != v1 {
-		t.Errorf("Branches should always return self when intersecting the any constraint, but got %s", v1.Intersect(any))
-	}
-
-	if v1.MatchesAny(none) {
-		t.Errorf("Branches should never match the none constraint")
-	}
-	if v1.Intersect(none) != none {
-		t.Errorf("Branches should always return none when intersecting the none constraint, but got %s", v1.Intersect(none))
-	}
-
-	if v1.Matches(v2) {
-		t.Errorf("%s should not match %s", v1, v2)
-	}
-
-	if v1.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v1, v2)
-	}
-
-	if v1.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v1, v2)
-	}
-
-	// Add rev to one
-	snuffster := Revision("snuffleupagus")
-	v3 := v1.Pair(snuffster).(versionPair)
-	if v2.Matches(v3) {
-		t.Errorf("%s should not match %s", v2, gu(v3))
-	}
-	if v3.Matches(v2) {
-		t.Errorf("%s should not match %s", gu(v3), v2)
-	}
-
-	if v2.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-	if v3.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-
-	if v2.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v2, gu(v3))
-	}
-	if v3.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), v2)
-	}
-
-	// Add different rev to the other
-	v4 := v2.Pair(Revision("cookie monster")).(versionPair)
-	if v4.Matches(v3) {
-		t.Errorf("%s should not match %s", gu(v4), gu(v3))
-	}
-	if v3.Matches(v4) {
-		t.Errorf("%s should not match %s", gu(v3), gu(v4))
-	}
-
-	if v4.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-	if v3.MatchesAny(v4) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-
-	if v4.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v4), gu(v3))
-	}
-	if v3.Intersect(v4) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), gu(v4))
-	}
-
-	// Now add same rev to different branches
-	v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
-	if !v5.Matches(v3) {
-		t.Errorf("%s should match %s", gu(v5), gu(v3))
-	}
-	if !v3.Matches(v5) {
-		t.Errorf("%s should match %s", gu(v3), gu(v5))
-	}
-
-	if !v5.MatchesAny(v3) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-	if !v3.MatchesAny(v5) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-
-	if v5.Intersect(v3) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v5), gu(v3))
-	}
-	if v3.Intersect(v5) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v3), gu(v5))
-	}
-
-	// Set up for cross-type constraint ops
-	cookie := Revision("cookie monster")
-	o1 := NewVersion("master").(plainVersion)
-	o2 := NewVersion("1.0.0").(semVersion)
-	o3 := o1.Pair(cookie).(versionPair)
-	o4 := o2.Pair(cookie).(versionPair)
-	v6 := v1.Pair(cookie).(versionPair)
-
-	if v1.Matches(o1) {
-		t.Errorf("%s (branch) should not match %s (version) across types", v1, o1)
-	}
-
-	if v1.MatchesAny(o1) {
-		t.Errorf("%s (branch) should not allow any matches when combined with %s (version)", v1, o1)
-	}
-
-	if v1.Intersect(o1) != none {
-		t.Errorf("Intersection of %s (branch) with %s (version) should result in empty set", v1, o1)
-	}
-
-	if v1.Matches(o2) {
-		t.Errorf("%s (branch) should not match %s (semver) across types", v1, o2)
-	}
-
-	if v1.MatchesAny(o2) {
-		t.Errorf("%s (branch) should not allow any matches when combined with %s (semver)", v1, o2)
-	}
-
-	if v1.Intersect(o2) != none {
-		t.Errorf("Intersection of %s (branch) with %s (semver) should result in empty set", v1, o2)
-	}
-
-	if v1.Matches(o3) {
-		t.Errorf("%s (branch) should not match %s (version) across types", v1, gu(o3))
-	}
-
-	if v1.MatchesAny(o3) {
-		t.Errorf("%s (branch) should not allow any matches when combined with %s (version)", v1, gu(o3))
-	}
-
-	if v1.Intersect(o3) != none {
-		t.Errorf("Intersection of %s (branch) with %s (version) should result in empty set", v1, gu(o3))
-	}
-
-	if v1.Matches(o4) {
-		t.Errorf("%s (branch) should not match %s (semver) across types", v1, gu(o4))
-	}
-
-	if v1.MatchesAny(o4) {
-		t.Errorf("%s (branch) should not allow any matches when combined with %s (semver)", v1, gu(o4))
-	}
-
-	if v1.Intersect(o4) != none {
-		t.Errorf("Intersection of %s (branch) with %s (semver) should result in empty set", v1, gu(o4))
-	}
-
-	if !v6.Matches(o3) {
-		t.Errorf("%s (branch) should match %s (version) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if !v6.MatchesAny(o3) {
-		t.Errorf("%s (branch) should allow some matches when combined with %s (version) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if v6.Intersect(o3) != cookie {
-		t.Errorf("Intersection of %s (branch) with %s (version) should return shared underlying rev", gu(v6), gu(o3))
-	}
-
-	if !v6.Matches(o4) {
-		t.Errorf("%s (branch) should match %s (version) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if !v6.MatchesAny(o4) {
-		t.Errorf("%s (branch) should allow some matches when combined with %s (version) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if v6.Intersect(o4) != cookie {
-		t.Errorf("Intersection of %s (branch) with %s (version) should return shared underlying rev", gu(v6), gu(o4))
-	}
-}
-
-func TestVersionConstraintOps(t *testing.T) {
-	v1 := NewVersion("ab123").(plainVersion)
-	v2 := NewVersion("b2a13").(plainVersion)
-
-	if !v1.MatchesAny(any) {
-		t.Errorf("Versions should always match the any constraint")
-	}
-	if v1.Intersect(any) != v1 {
-		t.Errorf("Versions should always return self when intersecting the any constraint, but got %s", v1.Intersect(any))
-	}
-
-	if v1.MatchesAny(none) {
-		t.Errorf("Versions should never match the none constraint")
-	}
-	if v1.Intersect(none) != none {
-		t.Errorf("Versions should always return none when intersecting the none constraint, but got %s", v1.Intersect(none))
-	}
-
-	if v1.Matches(v2) {
-		t.Errorf("%s should not match %s", v1, v2)
-	}
-
-	if v1.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v1, v2)
-	}
-
-	if v1.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v1, v2)
-	}
-
-	// Add rev to one
-	snuffster := Revision("snuffleupagus")
-	v3 := v1.Pair(snuffster).(versionPair)
-	if v2.Matches(v3) {
-		t.Errorf("%s should not match %s", v2, gu(v3))
-	}
-	if v3.Matches(v2) {
-		t.Errorf("%s should not match %s", gu(v3), v2)
-	}
-
-	if v2.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-	if v3.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-
-	if v2.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v2, gu(v3))
-	}
-	if v3.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), v2)
-	}
-
-	// Add different rev to the other
-	v4 := v2.Pair(Revision("cookie monster")).(versionPair)
-	if v4.Matches(v3) {
-		t.Errorf("%s should not match %s", gu(v4), gu(v3))
-	}
-	if v3.Matches(v4) {
-		t.Errorf("%s should not match %s", gu(v3), gu(v4))
-	}
-
-	if v4.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-	if v3.MatchesAny(v4) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-
-	if v4.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v4), gu(v3))
-	}
-	if v3.Intersect(v4) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), gu(v4))
-	}
-
-	// Now add same rev to different versions, and things should line up
-	v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
-	if !v5.Matches(v3) {
-		t.Errorf("%s should match %s", gu(v5), gu(v3))
-	}
-	if !v3.Matches(v5) {
-		t.Errorf("%s should match %s", gu(v3), gu(v5))
-	}
-
-	if !v5.MatchesAny(v3) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-	if !v3.MatchesAny(v5) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-
-	if v5.Intersect(v3) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v5), gu(v3))
-	}
-	if v3.Intersect(v5) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v3), gu(v5))
-	}
-
-	// Set up for cross-type constraint ops
-	cookie := Revision("cookie monster")
-	o1 := NewBranch("master").(branchVersion)
-	o2 := NewVersion("1.0.0").(semVersion)
-	o3 := o1.Pair(cookie).(versionPair)
-	o4 := o2.Pair(cookie).(versionPair)
-	v6 := v1.Pair(cookie).(versionPair)
-
-	if v1.Matches(o1) {
-		t.Errorf("%s (version) should not match %s (branch) across types", v1, o1)
-	}
-
-	if v1.MatchesAny(o1) {
-		t.Errorf("%s (version) should not allow any matches when combined with %s (branch)", v1, o1)
-	}
-
-	if v1.Intersect(o1) != none {
-		t.Errorf("Intersection of %s (version) with %s (branch) should result in empty set", v1, o1)
-	}
-
-	if v1.Matches(o2) {
-		t.Errorf("%s (version) should not match %s (semver) across types", v1, o2)
-	}
-
-	if v1.MatchesAny(o2) {
-		t.Errorf("%s (version) should not allow any matches when combined with %s (semver)", v1, o2)
-	}
-
-	if v1.Intersect(o2) != none {
-		t.Errorf("Intersection of %s (version) with %s (semver) should result in empty set", v1, o2)
-	}
-
-	if v1.Matches(o3) {
-		t.Errorf("%s (version) should not match %s (branch) across types", v1, gu(o3))
-	}
-
-	if v1.MatchesAny(o3) {
-		t.Errorf("%s (version) should not allow any matches when combined with %s (branch)", v1, gu(o3))
-	}
-
-	if v1.Intersect(o3) != none {
-		t.Errorf("Intersection of %s (version) with %s (branch) should result in empty set", v1, gu(o3))
-	}
-
-	if v1.Matches(o4) {
-		t.Errorf("%s (version) should not match %s (semver) across types", v1, gu(o4))
-	}
-
-	if v1.MatchesAny(o4) {
-		t.Errorf("%s (version) should not allow any matches when combined with %s (semver)", v1, gu(o4))
-	}
-
-	if v1.Intersect(o4) != none {
-		t.Errorf("Intersection of %s (version) with %s (semver) should result in empty set", v1, gu(o4))
-	}
-
-	if !v6.Matches(o3) {
-		t.Errorf("%s (version) should match %s (branch) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if !v6.MatchesAny(o3) {
-		t.Errorf("%s (version) should allow some matches when combined with %s (branch) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if v6.Intersect(o3) != cookie {
-		t.Errorf("Intersection of %s (version) with %s (branch) should return shared underlying rev", gu(v6), gu(o3))
-	}
-
-	if !v6.Matches(o4) {
-		t.Errorf("%s (version) should match %s (branch) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if !v6.MatchesAny(o4) {
-		t.Errorf("%s (version) should allow some matches when combined with %s (branch) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if v6.Intersect(o4) != cookie {
-		t.Errorf("Intersection of %s (version) with %s (branch) should return shared underlying rev", gu(v6), gu(o4))
-	}
-}
-
-func TestSemverVersionConstraintOps(t *testing.T) {
-	v1 := NewVersion("1.0.0").(semVersion)
-	v2 := NewVersion("2.0.0").(semVersion)
-
-	if !v1.MatchesAny(any) {
-		t.Errorf("Semvers should always match the any constraint")
-	}
-	if v1.Intersect(any) != v1 {
-		t.Errorf("Semvers should always return self when intersecting the any constraint, but got %s", v1.Intersect(any))
-	}
-
-	if v1.MatchesAny(none) {
-		t.Errorf("Semvers should never match the none constraint")
-	}
-	if v1.Intersect(none) != none {
-		t.Errorf("Semvers should always return none when intersecting the none constraint, but got %s", v1.Intersect(none))
-	}
-
-	if v1.Matches(v2) {
-		t.Errorf("%s should not match %s", v1, v2)
-	}
-
-	if v1.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v1, v2)
-	}
-
-	if v1.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v1, v2)
-	}
-
-	// Add rev to one
-	snuffster := Revision("snuffleupagus")
-	v3 := v1.Pair(snuffster).(versionPair)
-	if v2.Matches(v3) {
-		t.Errorf("%s should not match %s", v2, gu(v3))
-	}
-	if v3.Matches(v2) {
-		t.Errorf("%s should not match %s", gu(v3), v2)
-	}
-
-	if v2.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-	if v3.MatchesAny(v2) {
-		t.Errorf("%s should not allow any matches when combined with %s", v2, gu(v3))
-	}
-
-	if v2.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", v2, gu(v3))
-	}
-	if v3.Intersect(v2) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), v2)
-	}
-
-	// Add different rev to the other
-	v4 := v2.Pair(Revision("cookie monster")).(versionPair)
-	if v4.Matches(v3) {
-		t.Errorf("%s should not match %s", gu(v4), gu(v3))
-	}
-	if v3.Matches(v4) {
-		t.Errorf("%s should not match %s", gu(v3), gu(v4))
-	}
-
-	if v4.MatchesAny(v3) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-	if v3.MatchesAny(v4) {
-		t.Errorf("%s should not allow any matches when combined with %s", gu(v4), gu(v3))
-	}
-
-	if v4.Intersect(v3) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v4), gu(v3))
-	}
-	if v3.Intersect(v4) != none {
-		t.Errorf("Intersection of %s with %s should result in empty set", gu(v3), gu(v4))
-	}
-
-	// Now add same rev to different versions, and things should line up
-	v5 := v2.Pair(Revision("snuffleupagus")).(versionPair)
-	if !v5.Matches(v3) {
-		t.Errorf("%s should match %s", gu(v5), gu(v3))
-	}
-	if !v3.Matches(v5) {
-		t.Errorf("%s should match %s", gu(v3), gu(v5))
-	}
-
-	if !v5.MatchesAny(v3) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-	if !v3.MatchesAny(v5) {
-		t.Errorf("%s should allow some matches when combined with %s", gu(v5), gu(v3))
-	}
-
-	if v5.Intersect(v3) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v5), gu(v3))
-	}
-	if v3.Intersect(v5) != snuffster {
-		t.Errorf("Intersection of %s with %s should return underlying rev", gu(v3), gu(v5))
-	}
-
-	// Set up for cross-type constraint ops
-	cookie := Revision("cookie monster")
-	o1 := NewBranch("master").(branchVersion)
-	o2 := NewVersion("ab123").(plainVersion)
-	o3 := o1.Pair(cookie).(versionPair)
-	o4 := o2.Pair(cookie).(versionPair)
-	v6 := v1.Pair(cookie).(versionPair)
-
-	if v1.Matches(o1) {
-		t.Errorf("%s (semver) should not match %s (branch) across types", v1, o1)
-	}
-
-	if v1.MatchesAny(o1) {
-		t.Errorf("%s (semver) should not allow any matches when combined with %s (branch)", v1, o1)
-	}
-
-	if v1.Intersect(o1) != none {
-		t.Errorf("Intersection of %s (semver) with %s (branch) should result in empty set", v1, o1)
-	}
-
-	if v1.Matches(o2) {
-		t.Errorf("%s (semver) should not match %s (version) across types", v1, o2)
-	}
-
-	if v1.MatchesAny(o2) {
-		t.Errorf("%s (semver) should not allow any matches when combined with %s (version)", v1, o2)
-	}
-
-	if v1.Intersect(o2) != none {
-		t.Errorf("Intersection of %s (semver) with %s (version) should result in empty set", v1, o2)
-	}
-
-	if v1.Matches(o3) {
-		t.Errorf("%s (semver) should not match %s (branch) across types", v1, gu(o3))
-	}
-
-	if v1.MatchesAny(o3) {
-		t.Errorf("%s (semver) should not allow any matches when combined with %s (branch)", v1, gu(o3))
-	}
-
-	if v1.Intersect(o3) != none {
-		t.Errorf("Intersection of %s (semver) with %s (branch) should result in empty set", v1, gu(o3))
-	}
-
-	if v1.Matches(o4) {
-		t.Errorf("%s (semver) should not match %s (version) across types", v1, gu(o4))
-	}
-
-	if v1.MatchesAny(o4) {
-		t.Errorf("%s (semver) should not allow any matches when combined with %s (version)", v1, gu(o4))
-	}
-
-	if v1.Intersect(o4) != none {
-		t.Errorf("Intersection of %s (semver) with %s (version) should result in empty set", v1, gu(o4))
-	}
-
-	if !v6.Matches(o3) {
-		t.Errorf("%s (semver) should match %s (branch) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if !v6.MatchesAny(o3) {
-		t.Errorf("%s (semver) should allow some matches when combined with %s (branch) across types due to shared rev", gu(v6), gu(o3))
-	}
-
-	if v6.Intersect(o3) != cookie {
-		t.Errorf("Intersection of %s (semver) with %s (branch) should return shared underlying rev", gu(v6), gu(o3))
-	}
-
-	if !v6.Matches(o4) {
-		t.Errorf("%s (semver) should match %s (branch) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if !v6.MatchesAny(o4) {
-		t.Errorf("%s (semver) should allow some matches when combined with %s (branch) across types due to shared rev", gu(v6), gu(o4))
-	}
-
-	if v6.Intersect(o4) != cookie {
-		t.Errorf("Intersection of %s (semver) with %s (branch) should return shared underlying rev", gu(v6), gu(o4))
-	}
-
-	// Regression check - make sure that semVersion -> semverConstraint works
-	// the same as verified in the other test
-	c1, _ := NewSemverConstraint("=1.0.0")
-	if !v1.MatchesAny(c1) {
-		t.Errorf("%s (semver) should allow some matches - itself - when combined with an equivalent semverConstraint", gu(v1))
-	}
-	if v1.Intersect(c1) != v1 {
-		t.Errorf("Intersection of %s (semver) with equivalent semver constraint should return self, got %s", gu(v1), v1.Intersect(c1))
-	}
-
-	if !v6.MatchesAny(c1) {
-		t.Errorf("%s (semver pair) should allow some matches - itself - when combined with an equivalent semverConstraint", gu(v6))
-	}
-	if v6.Intersect(c1) != v6 {
-		t.Errorf("Intersection of %s (semver pair) with equivalent semver constraint should return self, got %s", gu(v6), v6.Intersect(c1))
-	}
-
-}
-
-// The other test is about the semverVersion, this is about semverConstraint
-func TestSemverConstraintOps(t *testing.T) {
-	v1 := NewBranch("master").(branchVersion)
-	v2 := NewVersion("ab123").(plainVersion)
-	v3 := NewVersion("1.0.0").(semVersion)
-
-	fozzie := Revision("fozzie bear")
-	v4 := v1.Pair(fozzie).(versionPair)
-	v5 := v2.Pair(fozzie).(versionPair)
-	v6 := v3.Pair(fozzie).(versionPair)
-
-	// TODO(sdboyer) we can't use the same range as below b/c semver.rangeConstraint is
-	// still an incomparable type
-	c1, err := NewSemverConstraint("=1.0.0")
-	if err != nil {
-		t.Fatalf("Failed to create constraint: %s", err)
-	}
-
-	if !c1.MatchesAny(any) {
-		t.Errorf("Semver constraints should always match the any constraint")
-	}
-	if c1.Intersect(any) != c1 {
-		t.Errorf("Semver constraints should always return self when intersecting the any constraint, but got %s", c1.Intersect(any))
-	}
-
-	if c1.MatchesAny(none) {
-		t.Errorf("Semver constraints should never match the none constraint")
-	}
-	if c1.Intersect(none) != none {
-		t.Errorf("Semver constraints should always return none when intersecting the none constraint, but got %s", c1.Intersect(none))
-	}
-
-	c1, err = NewSemverConstraint(">= 1.0.0")
-	if err != nil {
-		t.Fatalf("Failed to create constraint: %s", err)
-	}
-
-	if c1.Matches(v1) {
-		t.Errorf("Semver constraint should not match simple branch")
-	}
-	if c1.Matches(v2) {
-		t.Errorf("Semver constraint should not match simple version")
-	}
-	if !c1.Matches(v3) {
-		t.Errorf("Semver constraint should match a simple semver version in its range")
-	}
-	if c1.Matches(v4) {
-		t.Errorf("Semver constraint should not match paired branch")
-	}
-	if c1.Matches(v5) {
-		t.Errorf("Semver constraint should not match paired version")
-	}
-	if !c1.Matches(v6) {
-		t.Errorf("Semver constraint should match a paired semver version in its range")
-	}
-
-	if c1.MatchesAny(v1) {
-		t.Errorf("Semver constraint should not allow any when intersected with simple branch")
-	}
-	if c1.MatchesAny(v2) {
-		t.Errorf("Semver constraint should not allow any when intersected with simple version")
-	}
-	if !c1.MatchesAny(v3) {
-		t.Errorf("Semver constraint should allow some when intersected with a simple semver version in its range")
-	}
-	if c1.MatchesAny(v4) {
-		t.Errorf("Semver constraint should not allow any when intersected with paired branch")
-	}
-	if c1.MatchesAny(v5) {
-		t.Errorf("Semver constraint should not allow any when intersected with paired version")
-	}
-	if !c1.MatchesAny(v6) {
-		t.Errorf("Semver constraint should allow some when intersected with a paired semver version in its range")
-	}
-
-	if c1.Intersect(v1) != none {
-		t.Errorf("Semver constraint should return none when intersected with a simple branch")
-	}
-	if c1.Intersect(v2) != none {
-		t.Errorf("Semver constraint should return none when intersected with a simple version")
-	}
-	if c1.Intersect(v3) != v3 {
-		t.Errorf("Semver constraint should return input when intersected with a simple semver version in its range")
-	}
-	if c1.Intersect(v4) != none {
-		t.Errorf("Semver constraint should return none when intersected with a paired branch")
-	}
-	if c1.Intersect(v5) != none {
-		t.Errorf("Semver constraint should return none when intersected with a paired version")
-	}
-	if c1.Intersect(v6) != v6 {
-		t.Errorf("Semver constraint should return input when intersected with a paired semver version in its range")
-	}
-}
-
-func TestSemverConstraint_ImpliedCaret(t *testing.T) {
-	c, _ := NewSemverConstraintIC("1.0.0")
-
-	wantS := "^1.0.0"
-	gotS := c.String()
-	if wantS != gotS {
-		t.Errorf("Expected string %s, got %s", wantS, gotS)
-	}
-
-	wantI := "1.0.0"
-	gotI := c.ImpliedCaretString()
-	if wantI != gotI {
-		t.Errorf("Expected implied string %s, got %s", wantI, gotI)
-	}
-
-	wantT := "svc-^1.0.0"
-	gotT := c.typedString()
-	if wantT != gotT {
-		t.Errorf("Expected type string %s, got %s", wantT, gotT)
-	}
-}
-
-// Test that certain types of cross-version comparisons work when they are
-// expressed as a version union (but that others don't).
-func TestVersionUnion(t *testing.T) {
-	rev := Revision("flooboofoobooo")
-	v1 := NewBranch("master")
-	v2 := NewBranch("test")
-	v3 := NewVersion("1.0.0").Pair(rev)
-	v4 := NewVersion("1.0.1")
-	v5 := NewVersion("v2.0.5").Pair(Revision("notamatch"))
-
-	uv1 := versionTypeUnion{v1, v4, rev}
-	uv2 := versionTypeUnion{v2, v3}
-
-	if uv1.MatchesAny(none) {
-		t.Errorf("Union can't match none")
-	}
-	if none.MatchesAny(uv1) {
-		t.Errorf("Union can't match none")
-	}
-
-	if !uv1.MatchesAny(any) {
-		t.Errorf("Union must match any")
-	}
-	if !any.MatchesAny(uv1) {
-		t.Errorf("Union must match any")
-	}
-
-	// Basic matching
-	if !uv1.Matches(v4) {
-		t.Errorf("Union should match on branch to branch")
-	}
-	if !v4.Matches(uv1) {
-		t.Errorf("Union should reverse-match on branch to branch")
-	}
-
-	if !uv1.Matches(v3) {
-		t.Errorf("Union should match on rev to paired rev")
-	}
-	if !v3.Matches(uv1) {
-		t.Errorf("Union should reverse-match on rev to paired rev")
-	}
-
-	if uv1.Matches(v2) {
-		t.Errorf("Union should not match on anything in disjoint unpaired")
-	}
-	if v2.Matches(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint unpaired")
-	}
-
-	if uv1.Matches(v5) {
-		t.Errorf("Union should not match on anything in disjoint pair")
-	}
-	if v5.Matches(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint pair")
-	}
-
-	if !uv1.Matches(uv2) {
-		t.Errorf("Union should succeed on matching comparison to other union with some overlap")
-	}
-
-	// MatchesAny - repeat Matches for safety, but add more, too
-	if !uv1.MatchesAny(v4) {
-		t.Errorf("Union should match on branch to branch")
-	}
-	if !v4.MatchesAny(uv1) {
-		t.Errorf("Union should reverse-match on branch to branch")
-	}
-
-	if !uv1.MatchesAny(v3) {
-		t.Errorf("Union should match on rev to paired rev")
-	}
-	if !v3.MatchesAny(uv1) {
-		t.Errorf("Union should reverse-match on rev to paired rev")
-	}
-
-	if uv1.MatchesAny(v2) {
-		t.Errorf("Union should not match on anything in disjoint unpaired")
-	}
-	if v2.MatchesAny(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint unpaired")
-	}
-
-	if uv1.MatchesAny(v5) {
-		t.Errorf("Union should not match on anything in disjoint pair")
-	}
-	if v5.MatchesAny(uv1) {
-		t.Errorf("Union should not reverse-match on anything in disjoint pair")
-	}
-
-	c1, _ := NewSemverConstraint("~1.0.0")
-	c2, _ := NewSemverConstraint("~2.0.0")
-	if !uv1.MatchesAny(c1) {
-		t.Errorf("Union should have some overlap due to containing 1.0.1 version")
-	}
-	if !c1.MatchesAny(uv1) {
-		t.Errorf("Union should have some overlap due to containing 1.0.1 version")
-	}
-
-	if uv1.MatchesAny(c2) {
-		t.Errorf("Union should have no overlap with ~2.0.0 semver range")
-	}
-	if c2.MatchesAny(uv1) {
-		t.Errorf("Union should have no overlap with ~2.0.0 semver range")
-	}
-
-	if !uv1.MatchesAny(uv2) {
-		t.Errorf("Union should succeed on MatchAny against other union with some overlap")
-	}
-
-	// Intersect - repeat all previous
-	if uv1.Intersect(v4) != v4 {
-		t.Errorf("Union intersection on contained version should return that version")
-	}
-	if v4.Intersect(uv1) != v4 {
-		t.Errorf("Union reverse-intersection on contained version should return that version")
-	}
-
-	if uv1.Intersect(v3) != rev {
-		t.Errorf("Union intersection on paired version w/matching rev should return rev, got %s", uv1.Intersect(v3))
-	}
-	if v3.Intersect(uv1) != rev {
-		t.Errorf("Union reverse-intersection on paired version w/matching rev should return rev, got %s", v3.Intersect(uv1))
-	}
-
-	if uv1.Intersect(v2) != none {
-		t.Errorf("Union should not intersect with anything in disjoint unpaired")
-	}
-	if v2.Intersect(uv1) != none {
-		t.Errorf("Union should not reverse-intersect with anything in disjoint unpaired")
-	}
-
-	if uv1.Intersect(v5) != none {
-		t.Errorf("Union should not intersect with anything in disjoint pair")
-	}
-	if v5.Intersect(uv1) != none {
-		t.Errorf("Union should not reverse-intersect with anything in disjoint pair")
-	}
-
-	if uv1.Intersect(c1) != v4 {
-		t.Errorf("Union intersecting with semver range should return 1.0.1 version, got %s", uv1.Intersect(c1))
-	}
-	if c1.Intersect(uv1) != v4 {
-		t.Errorf("Union reverse-intersecting with semver range should return 1.0.1 version, got %s", c1.Intersect(uv1))
-	}
-
-	if uv1.Intersect(c2) != none {
-		t.Errorf("Union intersecting with non-overlapping semver range should return none, got %s", uv1.Intersect(c2))
-	}
-	if c2.Intersect(uv1) != none {
-		t.Errorf("Union reverse-intersecting with non-overlapping semver range should return none, got %s", uv1.Intersect(c2))
-	}
-
-	if uv1.Intersect(uv2) != rev {
-		t.Errorf("Unions should intersect down to rev, but got %s", uv1.Intersect(uv2))
-	}
-}
-
-func TestVersionUnionPanicOnType(t *testing.T) {
-	// versionTypeUnions need to panic if Type() gets called
-	defer func() {
-		if err := recover(); err == nil {
-			t.Error("versionTypeUnion did not panic on Type() call")
-		}
-	}()
-	_ = versionTypeUnion{}.Type()
-}
-
-func TestVersionUnionPanicOnString(t *testing.T) {
-	// versionStringUnions need to panic if String() gets called
-	defer func() {
-		if err := recover(); err == nil {
-			t.Error("versionStringUnion did not panic on String() call")
-		}
-	}()
-	_ = versionTypeUnion{}.String()
-}
-
-func TestTypedConstraintString(t *testing.T) {
-	// Also tests typedVersionString(), as this nests down into that
-	rev := Revision("flooboofoobooo")
-	v1 := NewBranch("master")
-	v2 := NewBranch("test").Pair(rev)
-	v3 := NewVersion("1.0.1")
-	v4 := NewVersion("v2.0.5")
-	v5 := NewVersion("2.0.5.2")
-
-	table := []struct {
-		in  Constraint
-		out string
-	}{
-		{
-			in:  anyConstraint{},
-			out: "any-*",
-		},
-		{
-			in:  noneConstraint{},
-			out: "none-",
-		},
-		{
-			in:  mkSVC("^1.0.0"),
-			out: "svc-^1.0.0",
-		},
-		{
-			in:  v1,
-			out: "b-master",
-		},
-		{
-			in:  v2,
-			out: "b-test-r-" + string(rev),
-		},
-		{
-			in:  v3,
-			out: "sv-1.0.1",
-		},
-		{
-			in:  v4,
-			out: "sv-v2.0.5",
-		},
-		{
-			in:  v5,
-			out: "pv-2.0.5.2",
-		},
-	}
-
-	for _, fix := range table {
-		got := fix.in.typedString()
-		if got != fix.out {
-			t.Errorf("Typed string for %v (%T) was not expected %q; got %q", fix.in, fix.in, fix.out, got)
-		}
-	}
-}
-
-func TestConstraintsIdentical(t *testing.T) {
-	for _, test := range []struct {
-		a, b Constraint
-		eq   bool
-	}{
-		{Any(), Any(), true},
-		{none, noneConstraint{}, true},
-		{NewVersion("test"), NewVersion("test"), true},
-		{NewVersion("test"), NewVersion("test2"), false},
-		{NewBranch("test"), NewBranch("test"), true},
-		{NewBranch("test"), newDefaultBranch("test"), false},
-		{newDefaultBranch("test"), newDefaultBranch("test"), true},
-		{Revision("test"), Revision("test"), true},
-		{Revision("test"), Revision("test2"), false},
-		{testSemverConstraint(t, "v2.10.7"), testSemverConstraint(t, "v2.10.7"), true},
-		{versionTypeUnion{NewVersion("test"), NewBranch("branch")},
-			versionTypeUnion{NewBranch("branch"), NewVersion("test")}, true},
-	} {
-		if test.eq != test.a.identical(test.b) {
-			want := "identical"
-			if !test.eq {
-				want = "not " + want
-			}
-			t.Errorf("expected %s:\n\t(a) %#v\n\t(b) %#v", want, test.a, test.b)
-		}
-	}
-}
-
-func testSemverConstraint(t *testing.T, body string) Constraint {
-	c, err := NewSemverConstraint(body)
-	if err != nil {
-		t.Fatal(errors.Wrapf(err, "failed to create semver constraint: %s", body))
-	}
-	return c
-}
-
-func TestConstraintEncoding(t *testing.T) {
-	for _, test := range []struct {
-		name string
-		c    Constraint
-	}{
-		{"defaultBranch", newDefaultBranch("test")},
-		{"branch", NewBranch("test")},
-		{"ver", NewVersion("test")},
-		{"semver", testSemverConstraint(t, "^1.0.0")},
-		{"rev", Revision("test")},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			var msg pb.Constraint
-			test.c.copyTo(&msg)
-			b, err := proto.Marshal(&msg)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if err := proto.Unmarshal(b, &msg); err != nil {
-				t.Fatal(err)
-			}
-			got, err := constraintFromCache(&msg)
-			if err != nil {
-				t.Error("failed to decode:", err)
-			} else if !got.identical(test.c) {
-				t.Errorf("decoded non-identical Constraint:\n\t(GOT): %#v\n\t(WNT): %#v", got, test.c)
-			}
-
-			if _, ok := test.c.(UnpairedVersion); ok {
-				got, err := unpairedVersionFromCache(&msg)
-				if err != nil {
-					t.Error("failed to decode:", err)
-				} else if !got.identical(test.c) {
-					t.Errorf("decoded non-identical UnpairedVersion:\n\t(GOT): %#v\n\t(WNT): %#v", got, test.c)
-				}
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/deduce_test.go b/installer/vendor/github.com/golang/dep/internal/gps/deduce_test.go
deleted file mode 100644
index 5002b49eb4..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/deduce_test.go
+++ /dev/null
@@ -1,678 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"net/url"
-	"reflect"
-	"testing"
-)
-
-type pathDeductionFixture struct {
-	in     string
-	root   string
-	rerr   error
-	mb     maybeSource
-	srcerr error
-}
-
-// helper func to generate testing *url.URLs, panicking on err
-func mkurl(s string) (u *url.URL) {
-	var err error
-	u, err = url.Parse(s)
-	if err != nil {
-		panic(fmt.Sprint("string is not a valid URL:", s))
-	}
-	return
-}
-
-var pathDeductionFixtures = map[string][]pathDeductionFixture{
-	"github": {
-		{
-			in:   "github.com/sdboyer/gps",
-			root: "github.com/sdboyer/gps",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")},
-			},
-		},
-		{
-			in:   "github.com/sdboyer/gps/foo",
-			root: "github.com/sdboyer/gps",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("git://github.com/sdboyer/gps")},
-				maybeGitSource{url: mkurl("http://github.com/sdboyer/gps")},
-			},
-		},
-		{
-			// TODO(sdboyer) is this a problem for enforcing uniqueness? do we
-			// need to collapse these extensions?
-			in:   "github.com/sdboyer/gps.git/foo",
-			root: "github.com/sdboyer/gps.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/sdboyer/gps.git")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps.git")},
-				maybeGitSource{url: mkurl("git://github.com/sdboyer/gps.git")},
-				maybeGitSource{url: mkurl("http://github.com/sdboyer/gps.git")},
-			},
-		},
-		{
-			in:   "git@github.com:sdboyer/gps",
-			root: "github.com/sdboyer/gps",
-			mb:   maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer/gps")},
-		},
-		{
-			in:   "https://github.com/sdboyer/gps",
-			root: "github.com/sdboyer/gps",
-			mb:   maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
-		},
-		{
-			in:   "https://github.com/sdboyer/gps/foo/bar",
-			root: "github.com/sdboyer/gps",
-			mb:   maybeGitSource{url: mkurl("https://github.com/sdboyer/gps")},
-		},
-		{
-			in:   "github.com/sdboyer-/gps/foo",
-			root: "github.com/sdboyer-/gps",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/sdboyer-/gps")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/sdboyer-/gps")},
-				maybeGitSource{url: mkurl("git://github.com/sdboyer-/gps")},
-				maybeGitSource{url: mkurl("http://github.com/sdboyer-/gps")},
-			},
-		},
-		{
-			in:   "github.com/a/gps/foo",
-			root: "github.com/a/gps",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/a/gps")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/a/gps")},
-				maybeGitSource{url: mkurl("git://github.com/a/gps")},
-				maybeGitSource{url: mkurl("http://github.com/a/gps")},
-			},
-		},
-		// some invalid github username patterns
-		{
-			in:   "github.com/-sdboyer/gps/foo",
-			rerr: errors.New("github.com/-sdboyer/gps/foo is not a valid path for a source on github.com"),
-		},
-		{
-			in:   "github.com/sdbo.yer/gps/foo",
-			rerr: errors.New("github.com/sdbo.yer/gps/foo is not a valid path for a source on github.com"),
-		},
-		{
-			in:   "github.com/sdbo_yer/gps/foo",
-			rerr: errors.New("github.com/sdbo_yer/gps/foo is not a valid path for a source on github.com"),
-		},
-		// Regression - gh does allow two-letter usernames
-		{
-			in:   "github.com/kr/pretty",
-			root: "github.com/kr/pretty",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://github.com/kr/pretty")},
-				maybeGitSource{url: mkurl("ssh://git@github.com/kr/pretty")},
-				maybeGitSource{url: mkurl("git://github.com/kr/pretty")},
-				maybeGitSource{url: mkurl("http://github.com/kr/pretty")},
-			},
-		},
-	},
-	"gopkg.in": {
-		{
-			in:   "gopkg.in/sdboyer/gps.v0",
-			root: "gopkg.in/sdboyer/gps.v0",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0},
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0},
-			},
-		},
-		{
-			in:   "gopkg.in/sdboyer/gps.v0/foo",
-			root: "gopkg.in/sdboyer/gps.v0",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("https://github.com/sdboyer/gps"), major: 0},
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v0", url: mkurl("http://github.com/sdboyer/gps"), major: 0},
-			},
-		},
-		{
-			in:   "gopkg.in/sdboyer/gps.v1/foo/bar",
-			root: "gopkg.in/sdboyer/gps.v1",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("https://github.com/sdboyer/gps"), major: 1},
-				maybeGopkginSource{opath: "gopkg.in/sdboyer/gps.v1", url: mkurl("http://github.com/sdboyer/gps"), major: 1},
-			},
-		},
-		{
-			in:   "gopkg.in/yaml.v1",
-			root: "gopkg.in/yaml.v1",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/yaml.v1", url: mkurl("https://github.com/go-yaml/yaml"), major: 1},
-				maybeGopkginSource{opath: "gopkg.in/yaml.v1", url: mkurl("http://github.com/go-yaml/yaml"), major: 1},
-			},
-		},
-		{
-			in:   "gopkg.in/yaml.v1/foo/bar",
-			root: "gopkg.in/yaml.v1",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/yaml.v1", url: mkurl("https://github.com/go-yaml/yaml"), major: 1},
-				maybeGopkginSource{opath: "gopkg.in/yaml.v1", url: mkurl("http://github.com/go-yaml/yaml"), major: 1},
-			},
-		},
-		{
-			in:   "gopkg.in/inf.v0",
-			root: "gopkg.in/inf.v0",
-			mb: maybeSources{
-				maybeGopkginSource{opath: "gopkg.in/inf.v0", url: mkurl("https://github.com/go-inf/inf"), major: 0},
-				maybeGopkginSource{opath: "gopkg.in/inf.v0", url: mkurl("http://github.com/go-inf/inf"), major: 0},
-			},
-		},
-		{
-			// gopkg.in only allows specifying major version in import path
-			in:   "gopkg.in/yaml.v1.2",
-			rerr: errors.New("gopkg.in/yaml.v1.2 is not a valid import path; gopkg.in only allows major versions (\"v1\" instead of \"v1.2\")"),
-		},
-	},
-	"jazz": {
-		// IBM hub devops services - fixtures borrowed from go get
-		{
-			in:   "hub.jazz.net/git/user1/pkgname",
-			root: "hub.jazz.net/git/user1/pkgname",
-			mb:   maybeGitSource{url: mkurl("https://hub.jazz.net/git/user1/pkgname")},
-		},
-		{
-			in:   "hub.jazz.net/git/user1/pkgname/submodule/submodule/submodule",
-			root: "hub.jazz.net/git/user1/pkgname",
-			mb:   maybeGitSource{url: mkurl("https://hub.jazz.net/git/user1/pkgname")},
-		},
-		{
-			in:   "hub.jazz.net/someotherprefix",
-			rerr: errors.New("hub.jazz.net/someotherprefix is not a valid path for a source on hub.jazz.net"),
-		},
-		{
-			in:   "hub.jazz.net/someotherprefix/user1/packagename",
-			rerr: errors.New("hub.jazz.net/someotherprefix/user1/packagename is not a valid path for a source on hub.jazz.net"),
-		},
-		// Spaces are not valid in user names or package names
-		{
-			in:   "hub.jazz.net/git/User 1/pkgname",
-			rerr: errors.New("hub.jazz.net/git/User 1/pkgname is not a valid path for a source on hub.jazz.net"),
-		},
-		{
-			in:   "hub.jazz.net/git/user1/pkg name",
-			rerr: errors.New("hub.jazz.net/git/user1/pkg name is not a valid path for a source on hub.jazz.net"),
-		},
-		// Dots are not valid in user names
-		{
-			in:   "hub.jazz.net/git/user.1/pkgname",
-			rerr: errors.New("hub.jazz.net/git/user.1/pkgname is not a valid path for a source on hub.jazz.net"),
-		},
-		{
-			in:   "hub.jazz.net/git/user1/pkg.name",
-			root: "hub.jazz.net/git/user1/pkg.name",
-			mb:   maybeGitSource{url: mkurl("https://hub.jazz.net/git/user1/pkg.name")},
-		},
-		// User names cannot have uppercase letters
-		{
-			in:   "hub.jazz.net/git/USER/pkgname",
-			rerr: errors.New("hub.jazz.net/git/USER/pkgname is not a valid path for a source on hub.jazz.net"),
-		},
-	},
-	"bitbucket": {
-		{
-			in:   "bitbucket.org/sdboyer/reporoot",
-			root: "bitbucket.org/sdboyer/reporoot",
-			mb: maybeSources{
-				maybeHgSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-				maybeHgSource{url: mkurl("ssh://hg@bitbucket.org/sdboyer/reporoot")},
-				maybeHgSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("ssh://git@bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("git://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot")},
-			},
-		},
-		{
-			in:   "bitbucket.org/sdboyer/reporoot/foo/bar",
-			root: "bitbucket.org/sdboyer/reporoot",
-			mb: maybeSources{
-				maybeHgSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-				maybeHgSource{url: mkurl("ssh://hg@bitbucket.org/sdboyer/reporoot")},
-				maybeHgSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("ssh://git@bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("git://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot")},
-			},
-		},
-		{
-			in:   "https://bitbucket.org/sdboyer/reporoot/foo/bar",
-			root: "bitbucket.org/sdboyer/reporoot",
-			mb: maybeSources{
-				maybeHgSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-				maybeGitSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot")},
-			},
-		},
-		// Less standard behaviors possible due to the hg/git ambiguity
-		{
-			in:   "bitbucket.org/sdboyer/reporoot.git",
-			root: "bitbucket.org/sdboyer/reporoot.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot.git")},
-				maybeGitSource{url: mkurl("ssh://git@bitbucket.org/sdboyer/reporoot.git")},
-				maybeGitSource{url: mkurl("git://bitbucket.org/sdboyer/reporoot.git")},
-				maybeGitSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot.git")},
-			},
-		},
-		{
-			in:   "git@bitbucket.org:sdboyer/reporoot.git",
-			root: "bitbucket.org/sdboyer/reporoot.git",
-			mb:   maybeGitSource{url: mkurl("ssh://git@bitbucket.org/sdboyer/reporoot.git")},
-		},
-		{
-			in:   "bitbucket.org/sdboyer/reporoot.hg",
-			root: "bitbucket.org/sdboyer/reporoot.hg",
-			mb: maybeSources{
-				maybeHgSource{url: mkurl("https://bitbucket.org/sdboyer/reporoot.hg")},
-				maybeHgSource{url: mkurl("ssh://hg@bitbucket.org/sdboyer/reporoot.hg")},
-				maybeHgSource{url: mkurl("http://bitbucket.org/sdboyer/reporoot.hg")},
-			},
-		},
-		{
-			in:   "hg@bitbucket.org:sdboyer/reporoot",
-			root: "bitbucket.org/sdboyer/reporoot",
-			mb:   maybeHgSource{url: mkurl("ssh://hg@bitbucket.org/sdboyer/reporoot")},
-		},
-		{
-			in:     "git://bitbucket.org/sdboyer/reporoot.hg",
-			root:   "bitbucket.org/sdboyer/reporoot.hg",
-			srcerr: errors.New("git is not a valid scheme for accessing an hg repository"),
-		},
-	},
-	"launchpad": {
-		// tests for launchpad, mostly bazaar
-		// TODO(sdboyer) need more tests to deal w/launchpad's oddities
-		{
-			in:   "launchpad.net/govcstestbzrrepo",
-			root: "launchpad.net/govcstestbzrrepo",
-			mb: maybeSources{
-				maybeBzrSource{url: mkurl("https://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("bzr+ssh://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("bzr://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("http://launchpad.net/govcstestbzrrepo")},
-			},
-		},
-		{
-			in:   "launchpad.net/govcstestbzrrepo/foo/bar",
-			root: "launchpad.net/govcstestbzrrepo",
-			mb: maybeSources{
-				maybeBzrSource{url: mkurl("https://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("bzr+ssh://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("bzr://launchpad.net/govcstestbzrrepo")},
-				maybeBzrSource{url: mkurl("http://launchpad.net/govcstestbzrrepo")},
-			},
-		},
-		{
-			in:   "launchpad.net/repo root",
-			rerr: errors.New("launchpad.net/repo root is not a valid path for a source on launchpad.net"),
-		},
-	},
-	"git.launchpad": {
-		{
-			in:   "git.launchpad.net/reporoot",
-			root: "git.launchpad.net/reporoot",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("ssh://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("git://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("http://git.launchpad.net/reporoot")},
-			},
-		},
-		{
-			in:   "git.launchpad.net/reporoot/foo/bar",
-			root: "git.launchpad.net/reporoot",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("ssh://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("git://git.launchpad.net/reporoot")},
-				maybeGitSource{url: mkurl("http://git.launchpad.net/reporoot")},
-			},
-		},
-		{
-			in:   "git.launchpad.net/repo root",
-			rerr: errors.New("git.launchpad.net/repo root is not a valid path for a source on launchpad.net"),
-		},
-	},
-	"apache": {
-		{
-			in:   "git.apache.org/package-name.git",
-			root: "git.apache.org/package-name.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("ssh://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("git://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("http://git.apache.org/package-name.git")},
-			},
-		},
-		{
-			in:   "git.apache.org/package-name.git/foo/bar",
-			root: "git.apache.org/package-name.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("ssh://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("git://git.apache.org/package-name.git")},
-				maybeGitSource{url: mkurl("http://git.apache.org/package-name.git")},
-			},
-		},
-	},
-	"vcsext": {
-		// VCS extension-based syntax
-		{
-			in:   "foobar.com/baz.git",
-			root: "foobar.com/baz.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("ssh://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("git://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("http://foobar.com/baz.git")},
-			},
-		},
-		{
-			in:   "foobar.com/baz.git/extra/path",
-			root: "foobar.com/baz.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("ssh://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("git://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("http://foobar.com/baz.git")},
-			},
-		},
-		{
-			in:   "foobar.com/baz.bzr",
-			root: "foobar.com/baz.bzr",
-			mb: maybeSources{
-				maybeBzrSource{url: mkurl("https://foobar.com/baz.bzr")},
-				maybeBzrSource{url: mkurl("bzr+ssh://foobar.com/baz.bzr")},
-				maybeBzrSource{url: mkurl("bzr://foobar.com/baz.bzr")},
-				maybeBzrSource{url: mkurl("http://foobar.com/baz.bzr")},
-			},
-		},
-		{
-			in:   "foo-bar.com/baz.hg",
-			root: "foo-bar.com/baz.hg",
-			mb: maybeSources{
-				maybeHgSource{url: mkurl("https://foo-bar.com/baz.hg")},
-				maybeHgSource{url: mkurl("ssh://foo-bar.com/baz.hg")},
-				maybeHgSource{url: mkurl("http://foo-bar.com/baz.hg")},
-			},
-		},
-		{
-			in:   "git@foobar.com:baz.git",
-			root: "foobar.com/baz.git",
-			mb:   maybeGitSource{url: mkurl("ssh://git@foobar.com/baz.git")},
-		},
-		{
-			in:   "bzr+ssh://foobar.com/baz.bzr",
-			root: "foobar.com/baz.bzr",
-			mb:   maybeBzrSource{url: mkurl("bzr+ssh://foobar.com/baz.bzr")},
-		},
-		{
-			in:   "ssh://foobar.com/baz.bzr",
-			root: "foobar.com/baz.bzr",
-			mb:   maybeBzrSource{url: mkurl("ssh://foobar.com/baz.bzr")},
-		},
-		{
-			in:   "https://foobar.com/baz.hg",
-			root: "foobar.com/baz.hg",
-			mb:   maybeHgSource{url: mkurl("https://foobar.com/baz.hg")},
-		},
-		{
-			in:     "git://foobar.com/baz.hg",
-			root:   "foobar.com/baz.hg",
-			srcerr: errors.New("git is not a valid scheme for accessing hg repositories (path foobar.com/baz.hg)"),
-		},
-		// who knows why anyone would do this, but having a second vcs ext
-		// shouldn't throw us off - only the first one counts
-		{
-			in:   "foobar.com/baz.git/quark/quizzle.bzr/quorum",
-			root: "foobar.com/baz.git",
-			mb: maybeSources{
-				maybeGitSource{url: mkurl("https://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("ssh://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("git://foobar.com/baz.git")},
-				maybeGitSource{url: mkurl("http://foobar.com/baz.git")},
-			},
-		},
-	},
-	"vanity": {
-		// Vanity imports
-		{
-			in:   "golang.org/x/exp",
-			root: "golang.org/x/exp",
-			mb:   maybeGitSource{url: mkurl("https://go.googlesource.com/exp")},
-		},
-		{
-			in:   "golang.org/x/exp/inotify",
-			root: "golang.org/x/exp",
-			mb:   maybeGitSource{url: mkurl("https://go.googlesource.com/exp")},
-		},
-		{
-			in:   "golang.org/x/net/html",
-			root: "golang.org/x/net",
-			mb:   maybeGitSource{url: mkurl("https://go.googlesource.com/net")},
-		},
-	},
-}
-
-func TestDeduceFromPath(t *testing.T) {
-	do := func(typ string, fixtures []pathDeductionFixture, t *testing.T) {
-		t.Run(typ, func(t *testing.T) {
-			t.Parallel()
-
-			var deducer pathDeducer
-			switch typ {
-			case "github":
-				deducer = githubDeducer{regexp: ghRegex}
-			case "gopkg.in":
-				deducer = gopkginDeducer{regexp: gpinNewRegex}
-			case "jazz":
-				deducer = jazzDeducer{regexp: jazzRegex}
-			case "bitbucket":
-				deducer = bitbucketDeducer{regexp: bbRegex}
-			case "launchpad":
-				deducer = launchpadDeducer{regexp: lpRegex}
-			case "git.launchpad":
-				deducer = launchpadGitDeducer{regexp: glpRegex}
-			case "apache":
-				deducer = apacheDeducer{regexp: apacheRegex}
-			case "vcsext":
-				deducer = vcsExtensionDeducer{regexp: vcsExtensionRegex}
-			default:
-				// Should just be the vanity imports, which we do elsewhere
-				t.Log("skipping")
-				t.SkipNow()
-			}
-
-			var printmb func(mb maybeSource, t *testing.T) string
-			printmb = func(mb maybeSource, t *testing.T) string {
-				switch tmb := mb.(type) {
-				case maybeSources:
-					var buf bytes.Buffer
-					fmt.Fprintf(&buf, "%v maybeSources:", len(tmb))
-					for _, elem := range tmb {
-						fmt.Fprintf(&buf, "\n\t\t%s", printmb(elem, t))
-					}
-					return buf.String()
-				case maybeGitSource:
-					return fmt.Sprintf("%T: %s", tmb, ufmt(tmb.url))
-				case maybeBzrSource:
-					return fmt.Sprintf("%T: %s", tmb, ufmt(tmb.url))
-				case maybeHgSource:
-					return fmt.Sprintf("%T: %s", tmb, ufmt(tmb.url))
-				case maybeGopkginSource:
-					return fmt.Sprintf("%T: %s (v%v) %s ", tmb, tmb.opath, tmb.major, ufmt(tmb.url))
-				default:
-					t.Errorf("Unknown maybeSource type: %T", mb)
-				}
-				return ""
-			}
-
-			for _, fix := range fixtures {
-				fix := fix
-				t.Run(fix.in, func(t *testing.T) {
-					t.Parallel()
-					u, in, uerr := normalizeURI(fix.in)
-					if uerr != nil {
-						if fix.rerr == nil {
-							t.Errorf("bad input URI %s", uerr)
-						}
-						t.SkipNow()
-					}
-
-					root, rerr := deducer.deduceRoot(in)
-					if fix.rerr != nil {
-						if rerr == nil {
-							t.Errorf("Expected error on deducing root, got none:\n\t(WNT) %s", fix.rerr)
-						} else if fix.rerr.Error() != rerr.Error() {
-							t.Errorf("Got unexpected error on deducing root:\n\t(GOT) %s\n\t(WNT) %s", rerr, fix.rerr)
-						}
-					} else if rerr != nil {
-						t.Errorf("Got unexpected error on deducing root:\n\t(GOT) %s", rerr)
-					} else if root != fix.root {
-						t.Errorf("Deducer did not return expected root:\n\t(GOT) %s\n\t(WNT) %s", root, fix.root)
-					}
-
-					mb, mberr := deducer.deduceSource(in, u)
-					if fix.srcerr != nil {
-						if mberr == nil {
-							t.Errorf("Expected error on deducing source, got none:\n\t(WNT) %s", fix.srcerr)
-						} else if fix.srcerr.Error() != mberr.Error() {
-							t.Errorf("Got unexpected error on deducing source:\n\t(GOT) %s\n\t(WNT) %s", mberr, fix.srcerr)
-						}
-					} else if mberr != nil {
-						// don't complain the fix already expected an rerr
-						if fix.rerr == nil {
-							t.Errorf("Got unexpected error on deducing source:\n\t(GOT) %s", mberr)
-						}
-					} else if !reflect.DeepEqual(mb, fix.mb) {
-						if mb == nil {
-							t.Errorf("Deducer returned source maybes, but none expected:\n\t(GOT) (none)\n\t(WNT) %s", printmb(fix.mb, t))
-						} else if fix.mb == nil {
-							t.Errorf("Deducer returned source maybes, but none expected:\n\t(GOT) %s\n\t(WNT) (none)", printmb(mb, t))
-						} else {
-							t.Errorf("Deducer did not return expected source:\n\t(GOT) %s\n\t(WNT) %s", printmb(mb, t), printmb(fix.mb, t))
-						}
-					} else {
-						gotURLs, wantURLs := mb.possibleURLs(), fix.mb.possibleURLs()
-						if !reflect.DeepEqual(gotURLs, wantURLs) {
-							t.Errorf("Deducer did not return expected source:\n\t(GOT) %s\n\t(WNT) %s", gotURLs, wantURLs)
-						}
-					}
-				})
-			}
-		})
-	}
-	runSet := func(t *testing.T) {
-		for typ, fixtures := range pathDeductionFixtures {
-			do(typ, fixtures, t)
-		}
-	}
-	t.Run("first", runSet)
-
-	// Run the test set twice to ensure results are correct for both cached
-	// and uncached deductions.
-	t.Run("second", runSet)
-}
-
-func TestVanityDeduction(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	vanities := pathDeductionFixtures["vanity"]
-	// group to avoid sourcemanager cleanup
-	ctx := context.Background()
-	do := func(t *testing.T) {
-		for _, fix := range vanities {
-			fix := fix
-			t.Run(fix.in, func(t *testing.T) {
-				t.Parallel()
-
-				pr, err := sm.DeduceProjectRoot(fix.in)
-				if err != nil {
-					t.Errorf("Unexpected err on deducing project root: %s", err)
-					return
-				} else if string(pr) != fix.root {
-					t.Errorf("Deducer did not return expected root:\n\t(GOT) %s\n\t(WNT) %s", pr, fix.root)
-				}
-
-				pd, err := sm.deduceCoord.deduceRootPath(ctx, fix.in)
-				if err != nil {
-					t.Errorf("Unexpected err on deducing source: %s", err)
-					return
-				}
-
-				goturl, wanturl := pd.mb.(maybeGitSource).url.String(), fix.mb.(maybeGitSource).url.String()
-				if goturl != wanturl {
-					t.Errorf("Deduced repo ident does not match fixture:\n\t(GOT) %s\n\t(WNT) %s", goturl, wanturl)
-				}
-
-				urls, err := sm.SourceURLsForPath(fix.in)
-				if err != nil {
-					t.Errorf("Unexpected err on deducing source urls: %s", err)
-					return
-				}
-				if len(urls) != 1 {
-					t.Errorf("Deduced source URLs count for a vanity import should be 1, got %d", len(urls))
-				}
-				goturl = urls[0].String()
-				if goturl != wanturl {
-					t.Errorf("Deduced source URL does not match fixture:\n\t(GOT) %s\n\t(WNT) %s", goturl, wanturl)
-				}
-			})
-		}
-	}
-
-	// Run twice, to ensure correctness of cache
-	t.Run("first", do)
-	t.Run("second", do)
-}
-
-func TestVanityDeductionSchemeMismatch(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	ctx := context.Background()
-	cm := newSupervisor(ctx)
-	dc := newDeductionCoordinator(cm)
-	_, err := dc.deduceRootPath(ctx, "ssh://golang.org/exp")
-	if err == nil {
-		t.Error("should have errored on scheme mismatch between input and go-get metadata")
-	}
-}
-
-// borrow from stdlib
-// more useful string for debugging than fmt's struct printer
-func ufmt(u *url.URL) string {
-	var user, pass interface{}
-	if u.User != nil {
-		user = u.User.Username()
-		if p, ok := u.User.Password(); ok {
-			pass = p
-		}
-	}
-	return fmt.Sprintf("host=%q, path=%q, opaque=%q, scheme=%q, user=%#v, pass=%#v, rawpath=%q, rawq=%q, frag=%q",
-		u.Host, u.Path, u.Opaque, u.Scheme, user, pass, u.RawPath, u.RawQuery, u.Fragment)
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/filesystem_test.go b/installer/vendor/github.com/golang/dep/internal/gps/filesystem_test.go
deleted file mode 100644
index faa4dd5f5c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/filesystem_test.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// This file contains utilities for running tests around file system state.
-
-// fspath represents a file system path in an OS-agnostic way.
-type fsPath []string
-
-func (f fsPath) String() string { return filepath.Join(f...) }
-
-func (f fsPath) prepend(prefix string) fsPath {
-	p := fsPath{filepath.FromSlash(prefix)}
-	return append(p, f...)
-}
-
-type fsTestCase struct {
-	before, after filesystemState
-}
-
-// filesystemState represents the state of a file system. It has a setup method
-// which inflates its state to the actual host file system, and an assert
-// method which checks that the actual file system matches the described state.
-type filesystemState struct {
-	root  string
-	dirs  []fsPath
-	files []fsPath
-	links []fsLink
-}
-
-// assert makes sure that the fs state matches the state of the actual host
-// file system
-func (fs filesystemState) assert(t *testing.T) {
-	dirMap := make(map[string]bool)
-	fileMap := make(map[string]bool)
-	linkMap := make(map[string]bool)
-
-	for _, d := range fs.dirs {
-		dirMap[d.prepend(fs.root).String()] = true
-	}
-	for _, f := range fs.files {
-		fileMap[f.prepend(fs.root).String()] = true
-	}
-	for _, l := range fs.links {
-		linkMap[l.path.prepend(fs.root).String()] = true
-	}
-
-	err := filepath.Walk(fs.root, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			t.Errorf("filepath.Walk path=%q  err=%q", path, err)
-			return err
-		}
-
-		if path == fs.root {
-			return nil
-		}
-
-		// Careful! Have to check whether the path is a symlink first because, on
-		// windows, a symlink to a directory will return 'true' for info.IsDir().
-		if (info.Mode() & os.ModeSymlink) != 0 {
-			if linkMap[path] {
-				delete(linkMap, path)
-			} else {
-				t.Errorf("unexpected symlink exists %q", path)
-			}
-			return nil
-		}
-
-		if info.IsDir() {
-			if dirMap[path] {
-				delete(dirMap, path)
-			} else {
-				t.Errorf("unexpected directory exists %q", path)
-			}
-			return nil
-		}
-
-		if fileMap[path] {
-			delete(fileMap, path)
-		} else {
-			t.Errorf("unexpected file exists %q", path)
-		}
-		return nil
-	})
-
-	if err != nil {
-		t.Errorf("filesystem.Walk err=%q", err)
-	}
-
-	for d := range dirMap {
-		t.Errorf("could not find expected directory %q", d)
-	}
-	for f := range fileMap {
-		t.Errorf("could not find expected file %q", f)
-	}
-	for l := range linkMap {
-		t.Errorf("could not find expected symlink %q", l)
-	}
-}
-
-// fsLink represents a symbolic link.
-type fsLink struct {
-	path fsPath
-	to   string
-}
-
-// setup inflates fs onto the actual host file system
-func (fs filesystemState) setup(t *testing.T) {
-	fs.setupDirs(t)
-	fs.setupFiles(t)
-	fs.setupLinks(t)
-}
-
-func (fs filesystemState) setupDirs(t *testing.T) {
-	for _, dir := range fs.dirs {
-		p := dir.prepend(fs.root)
-		if err := os.MkdirAll(p.String(), 0777); err != nil {
-			t.Fatalf("os.MkdirAll(%q, 0777) err=%q", p, err)
-		}
-	}
-}
-
-func (fs filesystemState) setupFiles(t *testing.T) {
-	for _, file := range fs.files {
-		p := file.prepend(fs.root)
-		f, err := os.Create(p.String())
-		if err != nil {
-			t.Fatalf("os.Create(%q) err=%q", p, err)
-		}
-		if err := f.Close(); err != nil {
-			t.Fatalf("file %q Close() err=%q", p, err)
-		}
-	}
-}
-
-func (fs filesystemState) setupLinks(t *testing.T) {
-	for _, link := range fs.links {
-		p := link.path.prepend(fs.root)
-
-		// On Windows, relative symlinks confuse filepath.Walk. This is golang/go
-		// issue 17540. So, we'll just sigh and do absolute links, assuming they are
-		// relative to the directory of link.path.
-		dir := filepath.Dir(p.String())
-		to := filepath.Join(dir, link.to)
-
-		if err := os.Symlink(to, p.String()); err != nil {
-			t.Fatalf("os.Symlink(%q, %q) err=%q", to, p, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/hash_test.go b/installer/vendor/github.com/golang/dep/internal/gps/hash_test.go
deleted file mode 100644
index 52898e50ae..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/hash_test.go
+++ /dev/null
@@ -1,686 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"fmt"
-	"strings"
-	"testing"
-	"text/tabwriter"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-)
-
-func TestHashInputs(t *testing.T) {
-	fix := basicFixtures["shared dependency with overlapping constraints"]
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-
-	dig := s.HashInputs()
-	h := sha256.New()
-
-	elems := []string{
-		hhConstraints,
-		"a",
-		"sv-1.0.0",
-		"b",
-		"sv-1.0.0",
-		hhImportsReqs,
-		"a",
-		"b",
-		hhIgnores,
-		hhOverrides,
-		hhAnalyzer,
-		"naive-analyzer",
-		"1",
-	}
-	for _, v := range elems {
-		h.Write([]byte(v))
-	}
-	correct := h.Sum(nil)
-
-	if !bytes.Equal(dig, correct) {
-		t.Errorf("Hashes are not equal. Inputs:\n%s", diffHashingInputs(s, elems))
-	} else if strings.Join(elems, "\n")+"\n" != HashingInputsAsString(s) {
-		t.Errorf("Hashes are equal, but hashing input strings are not:\n%s", diffHashingInputs(s, elems))
-	}
-}
-
-func TestHashInputsReqsIgs(t *testing.T) {
-	fix := basicFixtures["shared dependency with overlapping constraints"]
-
-	rm := fix.rootmanifest().(simpleRootManifest).dup()
-	rm.ig = pkgtree.NewIgnoredRuleset([]string{"foo", "bar"})
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        rm,
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	s, err := Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-
-	dig := s.HashInputs()
-	h := sha256.New()
-
-	elems := []string{
-		hhConstraints,
-		"a",
-		"sv-1.0.0",
-		"b",
-		"sv-1.0.0",
-		hhImportsReqs,
-		"a",
-		"b",
-		hhIgnores,
-		"bar",
-		"foo",
-		hhOverrides,
-		hhAnalyzer,
-		"naive-analyzer",
-		"1",
-	}
-	for _, v := range elems {
-		h.Write([]byte(v))
-	}
-	correct := h.Sum(nil)
-
-	if !bytes.Equal(dig, correct) {
-		t.Errorf("Hashes are not equal. Inputs:\n%s", diffHashingInputs(s, elems))
-	}
-
-	// Add requires
-	rm.req = map[string]bool{
-		"baz": true,
-		"qux": true,
-	}
-
-	params.Manifest = rm
-
-	s, err = Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-
-	dig = s.HashInputs()
-	h = sha256.New()
-
-	elems = []string{
-		hhConstraints,
-		"a",
-		"sv-1.0.0",
-		"b",
-		"sv-1.0.0",
-		hhImportsReqs,
-		"a",
-		"b",
-		"baz",
-		"qux",
-		hhIgnores,
-		"bar",
-		"foo",
-		hhOverrides,
-		hhAnalyzer,
-		"naive-analyzer",
-		"1",
-	}
-	for _, v := range elems {
-		h.Write([]byte(v))
-	}
-	correct = h.Sum(nil)
-
-	if !bytes.Equal(dig, correct) {
-		t.Errorf("Hashes are not equal. Inputs:\n%s", diffHashingInputs(s, elems))
-	}
-
-	// remove ignores, just test requires alone
-	rm.ig = nil
-	params.Manifest = rm
-
-	s, err = Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-
-	dig = s.HashInputs()
-	h = sha256.New()
-
-	elems = []string{
-		hhConstraints,
-		"a",
-		"sv-1.0.0",
-		"b",
-		"sv-1.0.0",
-		hhImportsReqs,
-		"a",
-		"b",
-		"baz",
-		"qux",
-		hhIgnores,
-		hhOverrides,
-		hhAnalyzer,
-		"naive-analyzer",
-		"1",
-	}
-	for _, v := range elems {
-		h.Write([]byte(v))
-	}
-	correct = h.Sum(nil)
-
-	if !bytes.Equal(dig, correct) {
-		t.Errorf("Hashes are not equal. Inputs:\n%s", diffHashingInputs(s, elems))
-	}
-}
-
-func TestHashInputsOverrides(t *testing.T) {
-	basefix := basicFixtures["shared dependency with overlapping constraints"]
-
-	// Set up base state that we'll mutate over the course of each test
-	rm := basefix.rootmanifest().(simpleRootManifest).dup()
-	params := SolveParameters{
-		RootDir:         string(basefix.ds[0].n),
-		RootPackageTree: basefix.rootTree(),
-		Manifest:        rm,
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	table := []struct {
-		name  string
-		mut   func()
-		elems []string
-	}{
-		{
-			name: "override source; not imported, no deps pp",
-			mut: func() {
-				// First case - override just source, on something without
-				// corresponding project properties in the dependencies from
-				// root
-				rm.ovr = map[ProjectRoot]ProjectProperties{
-					"c": {
-						Source: "car",
-					},
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override source; required, no deps pp",
-			mut: func() {
-				// Put c into the requires list, which should make it show up under
-				// constraints
-				rm.req = map[string]bool{
-					"c": true,
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				"c",
-				"car",
-				"any-*", // Any isn't included under the override, but IS for the constraint b/c it's equivalent
-				hhImportsReqs,
-				"a",
-				"b",
-				"c",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override source; required & imported, no deps pp",
-			mut: func() {
-				// Put c in the root's imports
-				poe := params.RootPackageTree.Packages["root"]
-				poe.P.Imports = []string{"a", "b", "c"}
-				params.RootPackageTree.Packages["root"] = poe
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				"c",
-				"car",
-				"any-*", // Any isn't included under the override, but IS for the constraint b/c it's equivalent
-				hhImportsReqs,
-				"a",
-				"b",
-				"c",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override source; imported, no deps pp",
-			mut: func() {
-				// Take c out of requires list - now it's only imported
-				rm.req = nil
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				"c",
-				"car",
-				"any-*",
-				hhImportsReqs,
-				"a",
-				"b",
-				"c",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "other override constraint; not imported, no deps pp",
-			mut: func() {
-				// Override not in root, just with constraint
-				rm.ovr["d"] = ProjectProperties{
-					Constraint: NewBranch("foobranch"),
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				"c",
-				"car",
-				"any-*",
-				hhImportsReqs,
-				"a",
-				"b",
-				"c",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override constraint; not imported, no deps pp",
-			mut: func() {
-				// Remove the "c" pkg from imports for remainder of tests
-				poe := params.RootPackageTree.Packages["root"]
-				poe.P.Imports = []string{"a", "b"}
-				params.RootPackageTree.Packages["root"] = poe
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"car",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override both; not imported, no deps pp",
-			mut: func() {
-				// Override not in root, both constraint and network name
-				rm.ovr["c"] = ProjectProperties{
-					Source:     "groucho",
-					Constraint: NewBranch("plexiglass"),
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"c",
-				"groucho",
-				"b-plexiglass",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override constraint; imported, with constraint",
-			mut: func() {
-				// Override dep present in root, just constraint
-				rm.ovr["a"] = ProjectProperties{
-					Constraint: NewVersion("fluglehorn"),
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"pv-fluglehorn",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"a",
-				"pv-fluglehorn",
-				"c",
-				"groucho",
-				"b-plexiglass",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override source; imported, with constraint",
-			mut: func() {
-				// Override in root, only network name
-				rm.ovr["a"] = ProjectProperties{
-					Source: "nota",
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"nota",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"a",
-				"nota",
-				"c",
-				"groucho",
-				"b-plexiglass",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "override both; imported, with constraint",
-			mut: func() {
-				// Override in root, network name and constraint
-				rm.ovr["a"] = ProjectProperties{
-					Source:     "nota",
-					Constraint: NewVersion("fluglehorn"),
-				}
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"nota",
-				"pv-fluglehorn",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				"a",
-				"nota",
-				"pv-fluglehorn",
-				"c",
-				"groucho",
-				"b-plexiglass",
-				"d",
-				"b-foobranch",
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-	}
-
-	for _, fix := range table {
-		fix.mut()
-		params.Manifest = rm
-
-		s, err := Prepare(params, newdepspecSM(basefix.ds, nil))
-		if err != nil {
-			t.Errorf("(fix: %q) Unexpected error while prepping solver: %s", fix.name, err)
-			continue
-		}
-
-		h := sha256.New()
-		for _, v := range fix.elems {
-			h.Write([]byte(v))
-		}
-
-		if !bytes.Equal(s.HashInputs(), h.Sum(nil)) {
-			t.Errorf("(fix: %q) Hashes are not equal. Inputs:\n%s", fix.name, diffHashingInputs(s, fix.elems))
-		}
-	}
-}
-
-func diffHashingInputs(s Solver, wnt []string) string {
-	actual := HashingInputsAsString(s)
-	got := strings.Split(actual, "\n")
-	// got has a trailing empty, add that to wnt
-	wnt = append(wnt, "")
-
-	lg, lw := len(got), len(wnt)
-
-	var buf bytes.Buffer
-	tw := tabwriter.NewWriter(&buf, 4, 4, 2, ' ', 0)
-	fmt.Fprintln(tw, "  (GOT)  \t  (WANT)  \t")
-
-	lmiss, rmiss := ">>>>>>>>>>", "<<<<<<<<<<"
-	if lg == lw {
-		// same length makes the loop pretty straightforward
-		for i := 0; i < lg; i++ {
-			fmt.Fprintf(tw, "%s\t%s\t\n", got[i], wnt[i])
-		}
-	} else if lg > lw {
-		offset := 0
-		for i := 0; i < lg; i++ {
-			if lw <= i-offset {
-				fmt.Fprintf(tw, "%s\t%s\t\n", got[i], rmiss)
-			} else if got[i] != wnt[i-offset] && i+1 < lg && got[i+1] == wnt[i-offset] {
-				// if the next slot is a match, realign by skipping this one and
-				// bumping the offset
-				fmt.Fprintf(tw, "%s\t%s\t\n", got[i], rmiss)
-				offset++
-			} else {
-				fmt.Fprintf(tw, "%s\t%s\t\n", got[i], wnt[i-offset])
-			}
-		}
-	} else {
-		offset := 0
-		for i := 0; i < lw; i++ {
-			if lg <= i-offset {
-				fmt.Fprintf(tw, "%s\t%s\t\n", lmiss, wnt[i])
-			} else if got[i-offset] != wnt[i] && i+1 < lw && got[i-offset] == wnt[i+1] {
-				// if the next slot is a match, realign by skipping this one and
-				// bumping the offset
-				fmt.Fprintf(tw, "%s\t%s\t\n", lmiss, wnt[i])
-				offset++
-			} else {
-				fmt.Fprintf(tw, "%s\t%s\t\n", got[i-offset], wnt[i])
-			}
-		}
-	}
-
-	tw.Flush()
-	return buf.String()
-}
-
-func TestHashInputsIneffectualWildcardIgs(t *testing.T) {
-	fix := basicFixtures["shared dependency with overlapping constraints"]
-
-	rm := fix.rootmanifest().(simpleRootManifest).dup()
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        rm,
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	cases := []struct {
-		name      string
-		ignoreMap []string
-		elems     []string
-	}{
-		{
-			name: "no wildcard ignores",
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				hhOverrides,
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-		{
-			name: "different wildcard ignores",
-			ignoreMap: []string{
-				"foobar*",
-				"foobarbaz*",
-				"foozapbar*",
-			},
-			elems: []string{
-				hhConstraints,
-				"a",
-				"sv-1.0.0",
-				"b",
-				"sv-1.0.0",
-				hhImportsReqs,
-				"a",
-				"b",
-				hhIgnores,
-				"foobar*",
-				"foozapbar*",
-				hhOverrides,
-				hhAnalyzer,
-				"naive-analyzer",
-				"1",
-			},
-		},
-	}
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-
-			rm.ig = pkgtree.NewIgnoredRuleset(c.ignoreMap)
-
-			params.Manifest = rm
-
-			s, err := Prepare(params, newdepspecSM(fix.ds, nil))
-			if err != nil {
-				t.Fatalf("Unexpected error while prepping solver: %s", err)
-			}
-
-			dig := s.HashInputs()
-			h := sha256.New()
-
-			for _, v := range c.elems {
-				h.Write([]byte(v))
-			}
-			correct := h.Sum(nil)
-
-			if !bytes.Equal(dig, correct) {
-				t.Errorf("Hashes are not equal. Inputs:\n%s", diffHashingInputs(s, c.elems))
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/internal/pb/source_cache.proto b/installer/vendor/github.com/golang/dep/internal/gps/internal/pb/source_cache.proto
deleted file mode 100644
index 7245318e60..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/internal/pb/source_cache.proto
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-syntax = "proto3";
-package pb;
-
-// Constraint is a serializable representation of a gps.Constraint or gps.UnpairedVersion.
-message Constraint {
-	enum Type {
-		Revision = 0;
-		Branch = 1;
-		DefaultBranch = 2;
-		Version = 3;
-		Semver = 4;
-	}
-	Type type = 1;
-	string value = 2;
-	//TODO strongly typed Semver field
-}
-
-// ProjectProperties is a serializable representation of gps.ProjectRoot and gps.ProjectProperties.
-message ProjectProperties {
-	string root = 1;
-	string source = 2;
-	Constraint constraint = 3;
-}
-
-// LockedProject is a serializable representation of gps.LockedProject.
-message LockedProject {
-	string root = 1;
-	string source = 2;
-	Constraint unpairedVersion = 3;
-	string revision = 4;
-	repeated string packages = 5;
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/lock_test.go b/installer/vendor/github.com/golang/dep/internal/gps/lock_test.go
deleted file mode 100644
index 3f9ca6ff2c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/lock_test.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"reflect"
-	"sort"
-	"testing"
-)
-
-func TestLockedProjectSorting(t *testing.T) {
-	// version doesn't matter here
-	lps := []LockedProject{
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil),
-		NewLockedProject(mkPI("foo"), NewVersion("nada"), nil),
-		NewLockedProject(mkPI("bar"), NewVersion("zip"), nil),
-		NewLockedProject(mkPI("qux"), NewVersion("zilch"), nil),
-	}
-	lps2 := make([]LockedProject, len(lps))
-	copy(lps2, lps)
-
-	sort.SliceStable(lps2, func(i, j int) bool {
-		return lps2[i].Ident().Less(lps2[j].Ident())
-	})
-
-	// only the two should have switched positions
-	lps[0], lps[2] = lps[2], lps[0]
-	if !reflect.DeepEqual(lps, lps2) {
-		t.Errorf("SortLockedProject did not sort as expected:\n\t(GOT) %s\n\t(WNT) %s", lps2, lps)
-	}
-}
-
-func TestLockedProjectsEq(t *testing.T) {
-	lps := []LockedProject{
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps", "flugle"}),
-		NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"flugle", "gps"}),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"}),
-		NewLockedProject(mkPI("github.com/sdboyer/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-	}
-
-	fix := map[string]struct {
-		l1, l2   int
-		shouldeq bool
-		err      string
-	}{
-		"with self":               {0, 0, true, "lp does not eq self"},
-		"with different revision": {0, 5, false, "should not eq with different rev"},
-		"with different versions": {0, 6, false, "should not eq with different version"},
-		"with same revsion":       {5, 5, true, "should eq with same rev"},
-		"with empty pkg":          {0, 1, false, "should not eq when other pkg list is empty"},
-		"with long pkg list":      {0, 2, false, "should not eq when other pkg list is longer"},
-		"with different orders":   {2, 4, false, "should not eq when pkg lists are out of order"},
-		"with different lp":       {0, 3, false, "should not eq totally different lp"},
-		"with only rev":           {7, 7, true, "should eq with only rev"},
-		"when only rev matches":   {5, 7, false, "should not eq when only rev matches"},
-	}
-
-	for k, f := range fix {
-		k, f := k, f
-		t.Run(k, func(t *testing.T) {
-			if f.shouldeq {
-				if !lps[f.l1].Eq(lps[f.l2]) {
-					t.Error(f.err)
-				}
-				if !lps[f.l2].Eq(lps[f.l1]) {
-					t.Error(f.err + (" (reversed)"))
-				}
-			} else {
-				if lps[f.l1].Eq(lps[f.l2]) {
-					t.Error(f.err)
-				}
-				if lps[f.l2].Eq(lps[f.l1]) {
-					t.Error(f.err + (" (reversed)"))
-				}
-			}
-		})
-	}
-}
-
-func TestLocksAreEq(t *testing.T) {
-	gpl := NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"})
-	svpl := NewLockedProject(mkPI("github.com/Masterminds/semver"), NewVersion("v2.0.0"), []string{"semver"})
-	bbbt := NewLockedProject(mkPI("github.com/beeblebrox/browntown"), NewBranch("master").Pair("63fc17eb7966a6f4cc0b742bf42731c52c4ac740"), []string{"browntown", "smoochies"})
-
-	l1 := solution{
-		hd: []byte("foo"),
-		p: []LockedProject{
-			gpl,
-			bbbt,
-			svpl,
-		},
-	}
-
-	l2 := solution{
-		p: []LockedProject{
-			svpl,
-			gpl,
-		},
-	}
-
-	if LocksAreEq(l1, l2, true) {
-		t.Fatal("should have failed on hash check")
-	}
-
-	if LocksAreEq(l1, l2, false) {
-		t.Fatal("should have failed on length check")
-	}
-
-	l2.p = append(l2.p, bbbt)
-
-	if !LocksAreEq(l1, l2, false) {
-		t.Fatal("should be eq, must have failed on individual lp check")
-	}
-
-	// ensure original input sort order is maintained
-	if !l1.p[0].Eq(gpl) {
-		t.Error("checking equality resorted l1")
-	}
-	if !l2.p[0].Eq(svpl) {
-		t.Error("checking equality resorted l2")
-	}
-
-	l1.p[0] = NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.11.0"), []string{"gps"})
-	if LocksAreEq(l1, l2, false) {
-		t.Error("should fail when individual lp were not eq")
-	}
-}
-
-func TestLockedProjectsString(t *testing.T) {
-	tt := []struct {
-		name string
-		lp   LockedProject
-		want string
-	}{
-		{
-			name: "full info",
-			lp:   NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}),
-			want: "github.com/sdboyer/gps@v0.10.0 with packages: [gps]",
-		},
-		{
-			name: "empty package list",
-			lp:   NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{}),
-			want: "github.com/sdboyer/gps@v0.10.0 with packages: []",
-		},
-		{
-			name: "nil package",
-			lp:   NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), nil),
-			want: "github.com/sdboyer/gps@v0.10.0 with packages: []",
-		},
-		{
-			name: "with source",
-			lp: NewLockedProject(
-				ProjectIdentifier{ProjectRoot: "github.com/sdboyer/gps", Source: "github.com/another/repo"},
-				NewVersion("v0.10.0"), []string{"."}),
-			want: "github.com/sdboyer/gps (from github.com/another/repo)@v0.10.0 with packages: [.]",
-		},
-		{
-			name: "version pair",
-			lp:   NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-			want: "github.com/sdboyer/gps@v0.10.0 with packages: [gps]",
-		},
-		{
-			name: "revision only",
-			lp:   NewLockedProject(mkPI("github.com/sdboyer/gps"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-			want: "github.com/sdboyer/gps@278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0 with packages: [gps]",
-		},
-	}
-
-	for _, tc := range tt {
-		t.Run(tc.name, func(t *testing.T) {
-			s := tc.lp.String()
-			if tc.want != s {
-				t.Fatalf("want %s, got %s", tc.want, s)
-			}
-		})
-	}
-
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/lockdiff_test.go b/installer/vendor/github.com/golang/dep/internal/gps/lockdiff_test.go
deleted file mode 100644
index 278fc576fd..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/lockdiff_test.go
+++ /dev/null
@@ -1,501 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func TestStringDiff_NoChange(t *testing.T) {
-	diff := StringDiff{Previous: "foo", Current: "foo"}
-	want := "foo"
-	got := diff.String()
-	if got != want {
-		t.Fatalf("Expected '%s', got '%s'", want, got)
-	}
-}
-
-func TestStringDiff_Add(t *testing.T) {
-	diff := StringDiff{Current: "foo"}
-	got := diff.String()
-	if got != "+ foo" {
-		t.Fatalf("Expected '+ foo', got '%s'", got)
-	}
-}
-
-func TestStringDiff_Remove(t *testing.T) {
-	diff := StringDiff{Previous: "foo"}
-	want := "- foo"
-	got := diff.String()
-	if got != want {
-		t.Fatalf("Expected '%s', got '%s'", want, got)
-	}
-}
-
-func TestStringDiff_Modify(t *testing.T) {
-	diff := StringDiff{Previous: "foo", Current: "bar"}
-	want := "foo -> bar"
-	got := diff.String()
-	if got != want {
-		t.Fatalf("Expected '%s', got '%s'", want, got)
-	}
-}
-
-func TestDiffProjects_NoChange(t *testing.T) {
-	p1 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"})
-	p2 := NewLockedProject(mkPI("github.com/golang/dep/internal/gps"), NewVersion("v0.10.0"), []string{"gps"})
-
-	diff := DiffProjects(p1, p2)
-	if diff != nil {
-		t.Fatal("Expected the diff to be nil")
-	}
-}
-
-func TestDiffProjects_Modify(t *testing.T) {
-	p1 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar"},
-		v:    NewBranch("master"),
-		r:    "abc123",
-		pkgs: []string{"baz", "qux"},
-	}
-
-	p2 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar", Source: "https://github.com/mcfork/gps.git"},
-		v:    NewVersion("v1.0.0"),
-		r:    "def456",
-		pkgs: []string{"baz", "derp"},
-	}
-
-	diff := DiffProjects(p1, p2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	wantSource := "+ https://github.com/mcfork/gps.git"
-	gotSource := diff.Source.String()
-	if gotSource != wantSource {
-		t.Fatalf("Expected diff.Source to be '%s', got '%s'", wantSource, diff.Source)
-	}
-
-	wantVersion := "+ v1.0.0"
-	gotVersion := diff.Version.String()
-	if gotVersion != wantVersion {
-		t.Fatalf("Expected diff.Version to be '%s', got '%s'", wantVersion, gotVersion)
-	}
-
-	wantRevision := "abc123 -> def456"
-	gotRevision := diff.Revision.String()
-	if gotRevision != wantRevision {
-		t.Fatalf("Expected diff.Revision to be '%s', got '%s'", wantRevision, gotRevision)
-	}
-
-	wantBranch := "- master"
-	gotBranch := diff.Branch.String()
-	if gotBranch != wantBranch {
-		t.Fatalf("Expected diff.Branch to be '%s', got '%s'", wantBranch, gotBranch)
-	}
-
-	fmtPkgs := func(pkgs []StringDiff) string {
-		b := bytes.NewBufferString("[")
-		for _, pkg := range pkgs {
-			b.WriteString(pkg.String())
-			b.WriteString(",")
-		}
-		b.WriteString("]")
-		return b.String()
-	}
-
-	wantPackages := "[+ derp,- qux,]"
-	gotPackages := fmtPkgs(diff.Packages)
-	if gotPackages != wantPackages {
-		t.Fatalf("Expected diff.Packages to be '%s', got '%s'", wantPackages, gotPackages)
-	}
-}
-
-func TestDiffProjects_AddPackages(t *testing.T) {
-	p1 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar"},
-		v:    NewBranch("master"),
-		r:    "abc123",
-		pkgs: []string{"foobar"},
-	}
-
-	p2 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar", Source: "https://github.com/mcfork/gps.git"},
-		v:    NewVersion("v1.0.0"),
-		r:    "def456",
-		pkgs: []string{"bazqux", "foobar", "zugzug"},
-	}
-
-	diff := DiffProjects(p1, p2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	if len(diff.Packages) != 2 {
-		t.Fatalf("Expected diff.Packages to have 2 packages, got %d", len(diff.Packages))
-	}
-
-	want0 := "+ bazqux"
-	got0 := diff.Packages[0].String()
-	if got0 != want0 {
-		t.Fatalf("Expected diff.Packages[0] to contain %s, got %s", want0, got0)
-	}
-
-	want1 := "+ zugzug"
-	got1 := diff.Packages[1].String()
-	if got1 != want1 {
-		t.Fatalf("Expected diff.Packages[1] to contain %s, got %s", want1, got1)
-	}
-}
-
-func TestDiffProjects_RemovePackages(t *testing.T) {
-	p1 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar"},
-		v:    NewBranch("master"),
-		r:    "abc123",
-		pkgs: []string{"athing", "foobar"},
-	}
-
-	p2 := LockedProject{
-		pi:   ProjectIdentifier{ProjectRoot: "github.com/foo/bar", Source: "https://github.com/mcfork/gps.git"},
-		v:    NewVersion("v1.0.0"),
-		r:    "def456",
-		pkgs: []string{"bazqux"},
-	}
-
-	diff := DiffProjects(p1, p2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	if len(diff.Packages) > 3 {
-		t.Fatalf("Expected diff.Packages to have 3 packages, got %d", len(diff.Packages))
-	}
-
-	want0 := "- athing"
-	got0 := diff.Packages[0].String()
-	if got0 != want0 {
-		t.Fatalf("Expected diff.Packages[0] to contain %s, got %s", want0, got0)
-	}
-
-	// diff.Packages[1] is '+ bazqux'
-
-	want2 := "- foobar"
-	got2 := diff.Packages[2].String()
-	if got2 != want2 {
-		t.Fatalf("Expected diff.Packages[2] to contain %s, got %s", want2, got2)
-	}
-}
-
-func TestDiffLocks_NoChange(t *testing.T) {
-	l1 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-	l2 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, l2)
-	if diff != nil {
-		t.Fatal("Expected the diff to be nil")
-	}
-}
-
-func TestDiffLocks_AddProjects(t *testing.T) {
-	l1 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-	l2 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{
-				pi:   ProjectIdentifier{ProjectRoot: "github.com/baz/qux", Source: "https://github.com/mcfork/bazqux.git"},
-				v:    NewVersion("v0.5.0"),
-				r:    "def456",
-				pkgs: []string{"p1", "p2"},
-			},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/zug/zug"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, l2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	if len(diff.Add) != 2 {
-		t.Fatalf("Expected diff.Add to have 2 projects, got %d", len(diff.Add))
-	}
-
-	want0 := "github.com/baz/qux"
-	got0 := string(diff.Add[0].Name)
-	if got0 != want0 {
-		t.Fatalf("Expected diff.Add[0] to contain %s, got %s", want0, got0)
-	}
-
-	want1 := "github.com/zug/zug"
-	got1 := string(diff.Add[1].Name)
-	if got1 != want1 {
-		t.Fatalf("Expected diff.Add[1] to contain %s, got %s", want1, got1)
-	}
-
-	add0 := diff.Add[0]
-	wantSource := "https://github.com/mcfork/bazqux.git"
-	gotSource := add0.Source.String()
-	if gotSource != wantSource {
-		t.Fatalf("Expected diff.Add[0].Source to be '%s', got '%s'", wantSource, add0.Source)
-	}
-
-	wantVersion := "v0.5.0"
-	gotVersion := add0.Version.String()
-	if gotVersion != wantVersion {
-		t.Fatalf("Expected diff.Add[0].Version to be '%s', got '%s'", wantVersion, gotVersion)
-	}
-
-	wantRevision := "def456"
-	gotRevision := add0.Revision.String()
-	if gotRevision != wantRevision {
-		t.Fatalf("Expected diff.Add[0].Revision to be '%s', got '%s'", wantRevision, gotRevision)
-	}
-
-	wantBranch := ""
-	gotBranch := add0.Branch.String()
-	if gotBranch != wantBranch {
-		t.Fatalf("Expected diff.Add[0].Branch to be '%s', got '%s'", wantBranch, gotBranch)
-	}
-
-	fmtPkgs := func(pkgs []StringDiff) string {
-		b := bytes.NewBufferString("[")
-		for _, pkg := range pkgs {
-			b.WriteString(pkg.String())
-			b.WriteString(",")
-		}
-		b.WriteString("]")
-		return b.String()
-	}
-
-	wantPackages := "[p1,p2,]"
-	gotPackages := fmtPkgs(add0.Packages)
-	if gotPackages != wantPackages {
-		t.Fatalf("Expected diff.Add[0].Packages to be '%s', got '%s'", wantPackages, gotPackages)
-	}
-}
-
-func TestDiffLocks_RemoveProjects(t *testing.T) {
-	l1 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{
-				pi:   ProjectIdentifier{ProjectRoot: "github.com/a/thing", Source: "https://github.com/mcfork/athing.git"},
-				v:    NewBranch("master"),
-				r:    "def456",
-				pkgs: []string{"p1", "p2"},
-			},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-	l2 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/baz/qux"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, l2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	if len(diff.Remove) != 2 {
-		t.Fatalf("Expected diff.Remove to have 2 projects, got %d", len(diff.Remove))
-	}
-
-	want0 := "github.com/a/thing"
-	got0 := string(diff.Remove[0].Name)
-	if got0 != want0 {
-		t.Fatalf("Expected diff.Remove[0] to contain %s, got %s", want0, got0)
-	}
-
-	want1 := "github.com/foo/bar"
-	got1 := string(diff.Remove[1].Name)
-	if got1 != want1 {
-		t.Fatalf("Expected diff.Remove[1] to contain %s, got %s", want1, got1)
-	}
-
-	remove0 := diff.Remove[0]
-	wantSource := "https://github.com/mcfork/athing.git"
-	gotSource := remove0.Source.String()
-	if gotSource != wantSource {
-		t.Fatalf("Expected diff.Remove[0].Source to be '%s', got '%s'", wantSource, remove0.Source)
-	}
-
-	wantVersion := ""
-	gotVersion := remove0.Version.String()
-	if gotVersion != wantVersion {
-		t.Fatalf("Expected diff.Remove[0].Version to be '%s', got '%s'", wantVersion, gotVersion)
-	}
-
-	wantRevision := "def456"
-	gotRevision := remove0.Revision.String()
-	if gotRevision != wantRevision {
-		t.Fatalf("Expected diff.Remove[0].Revision to be '%s', got '%s'", wantRevision, gotRevision)
-	}
-
-	wantBranch := "master"
-	gotBranch := remove0.Branch.String()
-	if gotBranch != wantBranch {
-		t.Fatalf("Expected diff.Remove[0].Branch to be '%s', got '%s'", wantBranch, gotBranch)
-	}
-
-	fmtPkgs := func(pkgs []StringDiff) string {
-		b := bytes.NewBufferString("[")
-		for _, pkg := range pkgs {
-			b.WriteString(pkg.String())
-			b.WriteString(",")
-		}
-		b.WriteString("]")
-		return b.String()
-	}
-
-	wantPackages := "[p1,p2,]"
-	gotPackages := fmtPkgs(remove0.Packages)
-	if gotPackages != wantPackages {
-		t.Fatalf("Expected diff.Remove[0].Packages to be '%s', got '%s'", wantPackages, gotPackages)
-	}
-}
-
-func TestDiffLocks_ModifyProjects(t *testing.T) {
-	l1 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bu"}, v: NewVersion("v1.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/zig/zag"}, v: NewVersion("v1.0.0")},
-		},
-	}
-	l2 := safeLock{
-		h: []byte("abc123"),
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/baz/qux"}, v: NewVersion("v1.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v2.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/zig/zag"}, v: NewVersion("v2.0.0")},
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/zug/zug"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, l2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	if len(diff.Modify) != 2 {
-		t.Fatalf("Expected diff.Remove to have 2 projects, got %d", len(diff.Remove))
-	}
-
-	want0 := "github.com/foo/bar"
-	got0 := string(diff.Modify[0].Name)
-	if got0 != want0 {
-		t.Fatalf("Expected diff.Modify[0] to contain %s, got %s", want0, got0)
-	}
-
-	want1 := "github.com/zig/zag"
-	got1 := string(diff.Modify[1].Name)
-	if got1 != want1 {
-		t.Fatalf("Expected diff.Modify[1] to contain %s, got %s", want1, got1)
-	}
-}
-
-func TestDiffLocks_ModifyHash(t *testing.T) {
-	h1, _ := hex.DecodeString("abc123")
-	l1 := safeLock{
-		h: h1,
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	h2, _ := hex.DecodeString("def456")
-	l2 := safeLock{
-		h: h2,
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, l2)
-	if diff == nil {
-		t.Fatal("Expected the diff to be populated")
-	}
-
-	want := "abc123 -> def456"
-	got := diff.HashDiff.String()
-	if got != want {
-		t.Fatalf("Expected diff.HashDiff to be '%s', got '%s'", want, got)
-	}
-}
-
-func TestDiffLocks_EmptyInitialLock(t *testing.T) {
-	h2, _ := hex.DecodeString("abc123")
-	l2 := safeLock{
-		h: h2,
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(nil, l2)
-
-	wantHash := "+ abc123"
-	gotHash := diff.HashDiff.String()
-	if gotHash != wantHash {
-		t.Fatalf("Expected diff.HashDiff to be '%s', got '%s'", wantHash, gotHash)
-	}
-
-	if len(diff.Add) != 1 {
-		t.Fatalf("Expected diff.Add to contain 1 project, got %d", len(diff.Add))
-	}
-}
-
-func TestDiffLocks_EmptyFinalLock(t *testing.T) {
-	h1, _ := hex.DecodeString("abc123")
-	l1 := safeLock{
-		h: h1,
-		p: []LockedProject{
-			{pi: ProjectIdentifier{ProjectRoot: "github.com/foo/bar"}, v: NewVersion("v1.0.0")},
-		},
-	}
-
-	diff := DiffLocks(l1, nil)
-
-	wantHash := "- abc123"
-	gotHash := diff.HashDiff.String()
-	if gotHash != wantHash {
-		t.Fatalf("Expected diff.HashDiff to be '%s', got '%s'", wantHash, gotHash)
-	}
-
-	if len(diff.Remove) != 1 {
-		t.Fatalf("Expected diff.Remove to contain 1 project, got %d", len(diff.Remove))
-	}
-}
-
-func TestDiffLocks_EmptyLocks(t *testing.T) {
-	diff := DiffLocks(nil, nil)
-	if diff != nil {
-		t.Fatal("Expected the diff to be empty")
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/manager_test.go b/installer/vendor/github.com/golang/dep/internal/gps/manager_test.go
deleted file mode 100644
index cb9d8819d5..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/manager_test.go
+++ /dev/null
@@ -1,1053 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"runtime"
-	"sort"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"text/tabwriter"
-	"time"
-
-	"github.com/golang/dep/internal/test"
-)
-
-// An analyzer that passes nothing back, but doesn't error. This is the naive
-// case - no constraints, no lock, and no errors. The SourceManager will
-// interpret this as open/Any constraints on everything in the import graph.
-type naiveAnalyzer struct{}
-
-func (naiveAnalyzer) DeriveManifestAndLock(string, ProjectRoot) (Manifest, Lock, error) {
-	return nil, nil, nil
-}
-
-func (a naiveAnalyzer) Info() ProjectAnalyzerInfo {
-	return ProjectAnalyzerInfo{
-		Name:    "naive-analyzer",
-		Version: 1,
-	}
-}
-
-func mkNaiveSM(t *testing.T) (*SourceMgr, func()) {
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %s", err)
-	}
-
-	sm, err := NewSourceManager(SourceManagerConfig{
-		Cachedir: cpath,
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	if err != nil {
-		t.Fatalf("Unexpected error on SourceManager creation: %s", err)
-	}
-
-	return sm, func() {
-		sm.Release()
-		err := os.RemoveAll(cpath)
-		if err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}
-}
-
-func remakeNaiveSM(osm *SourceMgr, t *testing.T) (*SourceMgr, func()) {
-	cpath := osm.cachedir
-	osm.Release()
-
-	sm, err := NewSourceManager(SourceManagerConfig{
-		Cachedir: cpath,
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	if err != nil {
-		t.Fatalf("unexpected error on SourceManager recreation: %s", err)
-	}
-
-	return sm, func() {
-		sm.Release()
-		err := os.RemoveAll(cpath)
-		if err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}
-}
-
-func TestSourceManagerInit(t *testing.T) {
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	cfg := SourceManagerConfig{
-		Cachedir: cpath,
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	}
-
-	sm, err := NewSourceManager(cfg)
-
-	if err != nil {
-		t.Errorf("Unexpected error on SourceManager creation: %s", err)
-	}
-
-	_, err = NewSourceManager(cfg)
-	if err == nil {
-		t.Errorf("Creating second SourceManager should have failed due to file lock contention")
-	} else if te, ok := err.(CouldNotCreateLockError); !ok {
-		t.Errorf("Should have gotten CouldNotCreateLockError error type, but got %T", te)
-	}
-
-	if _, err = os.Stat(path.Join(cpath, "sm.lock")); err != nil {
-		t.Errorf("Global cache lock file not created correctly")
-	}
-
-	sm.Release()
-	err = os.RemoveAll(cpath)
-	if err != nil {
-		t.Errorf("removeAll failed: %s", err)
-	}
-
-	if _, err = os.Stat(path.Join(cpath, "sm.lock")); !os.IsNotExist(err) {
-		t.Fatalf("Global cache lock file not cleared correctly on Release()")
-	}
-
-	// Set another one up at the same spot now, just to be sure
-	sm, err = NewSourceManager(cfg)
-	if err != nil {
-		t.Errorf("Creating a second SourceManager should have succeeded when the first was released, but failed with err %s", err)
-	}
-
-	sm.Release()
-	err = os.RemoveAll(cpath)
-	if err != nil {
-		t.Errorf("removeAll failed: %s", err)
-	}
-}
-
-func TestSourceInit(t *testing.T) {
-	// This test is a bit slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping project manager init test in short mode")
-	}
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %s", err)
-	}
-
-	sm, err := NewSourceManager(SourceManagerConfig{
-		Cachedir: cpath,
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	if err != nil {
-		t.Fatalf("Unexpected error on SourceManager creation: %s", err)
-	}
-
-	defer func() {
-		sm.Release()
-		err := os.RemoveAll(cpath)
-		if err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	id := mkPI("github.com/sdboyer/gpkt").normalize()
-	pvl, err := sm.ListVersions(id)
-	if err != nil {
-		t.Errorf("Unexpected error during initial project setup/fetching %s", err)
-	}
-
-	if len(pvl) != 7 {
-		t.Errorf("Expected seven version results from the test repo, got %v", len(pvl))
-	} else {
-		expected := []PairedVersion{
-			NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-			NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
-			NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			newDefaultBranch("master").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
-			NewBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
-			NewBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-		}
-
-		// SourceManager itself doesn't guarantee ordering; sort them here so we
-		// can dependably check output
-		SortPairedForUpgrade(pvl)
-
-		for k, e := range expected {
-			if !pvl[k].Matches(e) {
-				t.Errorf("Expected version %s in position %v but got %s", e, k, pvl[k])
-			}
-		}
-	}
-
-	// Two birds, one stone - make sure the internal ProjectManager vlist cache
-	// works (or at least doesn't not work) by asking for the versions again,
-	// and do it through smcache to ensure its sorting works, as well.
-	smc := &bridge{
-		sm:     sm,
-		vlists: make(map[ProjectIdentifier][]Version),
-		s:      &solver{mtr: newMetrics()},
-	}
-
-	vl, err := smc.listVersions(id)
-	if err != nil {
-		t.Errorf("Unexpected error during initial project setup/fetching %s", err)
-	}
-
-	if len(vl) != 7 {
-		t.Errorf("Expected seven version results from the test repo, got %v", len(vl))
-	} else {
-		expected := []Version{
-			NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-			NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
-			NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			newDefaultBranch("master").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
-			NewBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
-			NewBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-		}
-
-		for k, e := range expected {
-			if !vl[k].Matches(e) {
-				t.Errorf("Expected version %s in position %v but got %s", e, k, vl[k])
-			}
-		}
-
-		if !vl[3].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected master branch version to have isDefault flag, but it did not")
-		}
-		if vl[4].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected v1 branch version not to have isDefault flag, but it did")
-		}
-		if vl[5].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected v1.1 branch version not to have isDefault flag, but it did")
-		}
-		if vl[6].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected v3 branch version not to have isDefault flag, but it did")
-		}
-	}
-
-	present, err := smc.RevisionPresentIn(id, Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e"))
-	if err != nil {
-		t.Errorf("Should have found revision in source, but got err: %s", err)
-	} else if !present {
-		t.Errorf("Should have found revision in source, but did not")
-	}
-
-	// SyncSourceFor will ensure we have everything
-	err = smc.SyncSourceFor(id)
-	if err != nil {
-		t.Errorf("SyncSourceFor failed with unexpected error: %s", err)
-	}
-
-	// Ensure that the appropriate cache dirs and files exist
-	_, err = os.Stat(filepath.Join(cpath, "sources", "https---jackfan.us.kg-sdboyer-gpkt", ".git"))
-	if err != nil {
-		t.Error("Cache repo does not exist in expected location")
-	}
-
-	os.Stat(filepath.Join(cpath, "metadata", "github.com", "sdboyer", "gpkt", "cache.json"))
-
-	// TODO(sdboyer) disabled until we get caching working
-	//_, err = os.Stat(filepath.Join(cpath, "metadata", "github.com", "sdboyer", "gpkt", "cache.json"))
-	//if err != nil {
-	//t.Error("Metadata cache json file does not exist in expected location")
-	//}
-
-	// Ensure source existence values are what we expect
-	var exists bool
-	exists, err = sm.SourceExists(id)
-	if err != nil {
-		t.Errorf("Error on checking SourceExists: %s", err)
-	}
-	if !exists {
-		t.Error("Source should exist after non-erroring call to ListVersions")
-	}
-}
-
-func TestDefaultBranchAssignment(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping default branch assignment test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	id := mkPI("github.com/sdboyer/test-multibranch")
-	v, err := sm.ListVersions(id)
-	if err != nil {
-		t.Errorf("Unexpected error during initial project setup/fetching %s", err)
-	}
-
-	if len(v) != 3 {
-		t.Errorf("Expected three version results from the test repo, got %v", len(v))
-	} else {
-		brev := Revision("fda020843ac81352004b9dca3fcccdd517600149")
-		mrev := Revision("9f9c3a591773d9b28128309ac7a9a72abcab267d")
-		expected := []PairedVersion{
-			NewBranch("branchone").Pair(brev),
-			NewBranch("otherbranch").Pair(brev),
-			NewBranch("master").Pair(mrev),
-		}
-
-		SortPairedForUpgrade(v)
-
-		for k, e := range expected {
-			if !v[k].Matches(e) {
-				t.Errorf("Expected version %s in position %v but got %s", e, k, v[k])
-			}
-		}
-
-		if !v[0].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected branchone branch version to have isDefault flag, but it did not")
-		}
-		if !v[0].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected otherbranch branch version to have isDefault flag, but it did not")
-		}
-		if v[2].(versionPair).v.(branchVersion).isDefault {
-			t.Error("Expected master branch version not to have isDefault flag, but it did")
-		}
-	}
-}
-
-func TestMgrMethodsFailWithBadPath(t *testing.T) {
-	// a symbol will always bork it up
-	bad := mkPI("foo/##&^").normalize()
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	var err error
-	if _, err = sm.SourceExists(bad); err == nil {
-		t.Error("SourceExists() did not error on bad input")
-	}
-	if err = sm.SyncSourceFor(bad); err == nil {
-		t.Error("SyncSourceFor() did not error on bad input")
-	}
-	if _, err = sm.ListVersions(bad); err == nil {
-		t.Error("ListVersions() did not error on bad input")
-	}
-	if _, err = sm.RevisionPresentIn(bad, Revision("")); err == nil {
-		t.Error("RevisionPresentIn() did not error on bad input")
-	}
-	if _, err = sm.ListPackages(bad, nil); err == nil {
-		t.Error("ListPackages() did not error on bad input")
-	}
-	if _, _, err = sm.GetManifestAndLock(bad, nil, naiveAnalyzer{}); err == nil {
-		t.Error("GetManifestAndLock() did not error on bad input")
-	}
-	if err = sm.ExportProject(context.Background(), bad, nil, ""); err == nil {
-		t.Error("ExportProject() did not error on bad input")
-	}
-}
-
-type sourceCreationTestFixture struct {
-	roots               []ProjectIdentifier
-	namecount, srccount int
-}
-
-func (f sourceCreationTestFixture) run(t *testing.T) {
-	t.Parallel()
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	for _, pi := range f.roots {
-		_, err := sm.SourceExists(pi)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if len(sm.srcCoord.nameToURL) != f.namecount {
-		t.Errorf("want %v names in the name->url map, but got %v. contents: \n%v", f.namecount, len(sm.srcCoord.nameToURL), sm.srcCoord.nameToURL)
-	}
-
-	if len(sm.srcCoord.srcs) != f.srccount {
-		t.Errorf("want %v gateways in the sources map, but got %v", f.srccount, len(sm.srcCoord.srcs))
-	}
-
-	var keys []string
-	for k := range sm.srcCoord.nameToURL {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-
-	var buf bytes.Buffer
-	w := tabwriter.NewWriter(&buf, 0, 4, 2, ' ', 0)
-	fmt.Fprint(w, "NAME\tMAPPED URL\n")
-	for _, r := range keys {
-		fmt.Fprintf(w, "%s\t%s\n", r, sm.srcCoord.nameToURL[r])
-	}
-	w.Flush()
-	t.Log("\n", buf.String())
-
-	t.Log("SRC KEYS")
-	for k := range sm.srcCoord.srcs {
-		t.Log(k)
-	}
-}
-
-// This test is primarily about making sure that the logic around folding
-// together different ways of referencing the same underlying resource - whether
-// that be intentionally folding them, or intentionally keeping them separate -
-// work as intended.
-func TestSourceCreationCounts(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	fixtures := map[string]sourceCreationTestFixture{
-		"gopkgin uniqueness": {
-			roots: []ProjectIdentifier{
-				mkPI("gopkg.in/sdboyer/gpkt.v1"),
-				mkPI("gopkg.in/sdboyer/gpkt.v2"),
-				mkPI("gopkg.in/sdboyer/gpkt.v3"),
-			},
-			namecount: 6,
-			srccount:  3,
-		},
-		"gopkgin separation from github": {
-			roots: []ProjectIdentifier{
-				mkPI("gopkg.in/sdboyer/gpkt.v1"),
-				mkPI("github.com/sdboyer/gpkt"),
-			},
-			namecount: 4,
-			srccount:  2,
-		},
-		"case variance across path and URL-based access": {
-			roots: []ProjectIdentifier{
-				ProjectIdentifier{ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"), Source: "https://github.com/Sdboyer/gpkt"},
-				ProjectIdentifier{ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"), Source: "https://github.com/SdbOyer/gpkt"},
-				mkPI("github.com/sdboyer/gpkt"),
-				ProjectIdentifier{ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"), Source: "https://github.com/sdboyeR/gpkt"},
-				mkPI("github.com/sdboyeR/gpkt"),
-			},
-			namecount: 6,
-			srccount:  1,
-		},
-	}
-
-	for name, fix := range fixtures {
-		t.Run(name, fix.run)
-	}
-}
-
-func TestGetSources(t *testing.T) {
-	// This test is a tad slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping source setup test in short mode")
-	}
-	requiresBins(t, "git", "hg", "bzr")
-
-	sm, clean := mkNaiveSM(t)
-
-	pil := []ProjectIdentifier{
-		mkPI("github.com/Masterminds/VCSTestRepo").normalize(),
-		mkPI("bitbucket.org/mattfarina/testhgrepo").normalize(),
-		mkPI("launchpad.net/govcstestbzrrepo").normalize(),
-	}
-
-	ctx := context.Background()
-	// protects against premature release of sm
-	t.Run("inner", func(t *testing.T) {
-		for _, pi := range pil {
-			lpi := pi
-			t.Run(lpi.normalizedSource(), func(t *testing.T) {
-				t.Parallel()
-
-				srcg, err := sm.srcCoord.getSourceGatewayFor(ctx, lpi)
-				if err != nil {
-					t.Errorf("unexpected error setting up source: %s", err)
-					return
-				}
-
-				// Re-get the same, make sure they are the same
-				srcg2, err := sm.srcCoord.getSourceGatewayFor(ctx, lpi)
-				if err != nil {
-					t.Errorf("unexpected error re-getting source: %s", err)
-				} else if srcg != srcg2 {
-					t.Error("first and second sources are not eq")
-				}
-
-				// All of them _should_ select https, so this should work
-				lpi.Source = "https://" + lpi.Source
-				srcg3, err := sm.srcCoord.getSourceGatewayFor(ctx, lpi)
-				if err != nil {
-					t.Errorf("unexpected error getting explicit https source: %s", err)
-				} else if srcg != srcg3 {
-					t.Error("explicit https source should reuse autodetected https source")
-				}
-
-				// Now put in http, and they should differ
-				lpi.Source = "http://" + string(lpi.ProjectRoot)
-				srcg4, err := sm.srcCoord.getSourceGatewayFor(ctx, lpi)
-				if err != nil {
-					t.Errorf("unexpected error getting explicit http source: %s", err)
-				} else if srcg == srcg4 {
-					t.Error("explicit http source should create a new src")
-				}
-			})
-		}
-	})
-
-	// nine entries (of which three are dupes): for each vcs, raw import path,
-	// the https url, and the http url. also three more from case folding of
-	// github.com/Masterminds/VCSTestRepo -> github.com/masterminds/vcstestrepo
-	if len(sm.srcCoord.nameToURL) != 12 {
-		t.Errorf("Should have twelve discrete entries in the nameToURL map, got %v", len(sm.srcCoord.nameToURL))
-	}
-	clean()
-}
-
-func TestFSCaseSensitivityConvergesSources(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	f := func(name string, pi1, pi2 ProjectIdentifier) {
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-			sm, clean := mkNaiveSM(t)
-			defer clean()
-
-			sm.SyncSourceFor(pi1)
-			sg1, err := sm.srcCoord.getSourceGatewayFor(context.Background(), pi1)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			sm.SyncSourceFor(pi2)
-			sg2, err := sm.srcCoord.getSourceGatewayFor(context.Background(), pi2)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			path1 := sg1.src.(*gitSource).repo.LocalPath()
-			t.Log("path1:", path1)
-			stat1, err := os.Stat(path1)
-			if err != nil {
-				t.Fatal(err)
-			}
-			path2 := sg2.src.(*gitSource).repo.LocalPath()
-			t.Log("path2:", path2)
-			stat2, err := os.Stat(path2)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			same, count := os.SameFile(stat1, stat2), len(sm.srcCoord.srcs)
-			if same && count != 1 {
-				t.Log("are same, count", count)
-				t.Fatal("on case-insensitive filesystem, case-varying sources should have been folded together but were not")
-			}
-			if !same && count != 2 {
-				t.Log("not same, count", count)
-				t.Fatal("on case-sensitive filesystem, case-varying sources should not have been folded together, but were")
-			}
-		})
-	}
-
-	folded := mkPI("github.com/sdboyer/deptest").normalize()
-	casevar1 := mkPI("github.com/Sdboyer/deptest").normalize()
-	casevar2 := mkPI("github.com/SdboyeR/deptest").normalize()
-	f("folded first", folded, casevar1)
-	f("folded second", casevar1, folded)
-	f("both unfolded", casevar1, casevar2)
-}
-
-// Regression test for #32
-func TestGetInfoListVersionsOrdering(t *testing.T) {
-	// This test is quite slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	// setup done, now do the test
-
-	id := mkPI("github.com/sdboyer/gpkt").normalize()
-
-	_, _, err := sm.GetManifestAndLock(id, NewVersion("v1.0.0"), naiveAnalyzer{})
-	if err != nil {
-		t.Errorf("Unexpected error from GetInfoAt %s", err)
-	}
-
-	v, err := sm.ListVersions(id)
-	if err != nil {
-		t.Errorf("Unexpected error from ListVersions %s", err)
-	}
-
-	if len(v) != 7 {
-		t.Errorf("Expected seven results from ListVersions, got %v", len(v))
-	}
-}
-
-func TestDeduceProjectRoot(t *testing.T) {
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	in := "github.com/sdboyer/gps"
-	pr, err := sm.DeduceProjectRoot(in)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", in, err)
-	}
-	if string(pr) != in {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 1 {
-		t.Errorf("Root path trie should have one element after one deduction, has %v", sm.deduceCoord.rootxt.Len())
-	}
-
-	pr, err = sm.DeduceProjectRoot(in)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", in, err)
-	} else if string(pr) != in {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 1 {
-		t.Errorf("Root path trie should still have one element after performing the same deduction twice; has %v", sm.deduceCoord.rootxt.Len())
-	}
-
-	// Now do a subpath
-	sub := path.Join(in, "foo")
-	pr, err = sm.DeduceProjectRoot(sub)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", sub, err)
-	} else if string(pr) != in {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 1 {
-		t.Errorf("Root path trie should still have one element, as still only one unique root has gone in; has %v", sm.deduceCoord.rootxt.Len())
-	}
-
-	// Now do a fully different root, but still on github
-	in2 := "github.com/bagel/lox"
-	sub2 := path.Join(in2, "cheese")
-	pr, err = sm.DeduceProjectRoot(sub2)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", sub2, err)
-	} else if string(pr) != in2 {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 2 {
-		t.Errorf("Root path trie should have two elements, one for each unique root; has %v", sm.deduceCoord.rootxt.Len())
-	}
-
-	// Ensure that our prefixes are bounded by path separators
-	in4 := "github.com/bagel/loxx"
-	pr, err = sm.DeduceProjectRoot(in4)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", in4, err)
-	} else if string(pr) != in4 {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 3 {
-		t.Errorf("Root path trie should have three elements, one for each unique root; has %v", sm.deduceCoord.rootxt.Len())
-	}
-
-	// Ensure that vcs extension-based matching comes through
-	in5 := "ffffrrrraaaaaapppppdoesnotresolve.com/baz.git"
-	pr, err = sm.DeduceProjectRoot(in5)
-	if err != nil {
-		t.Errorf("Problem while detecting root of %q %s", in5, err)
-	} else if string(pr) != in5 {
-		t.Errorf("Wrong project root was deduced;\n\t(GOT) %s\n\t(WNT) %s", pr, in)
-	}
-	if sm.deduceCoord.rootxt.Len() != 4 {
-		t.Errorf("Root path trie should have four elements, one for each unique root; has %v", sm.deduceCoord.rootxt.Len())
-	}
-}
-
-func TestMultiFetchThreadsafe(t *testing.T) {
-	// This test is quite slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	projects := []ProjectIdentifier{
-		mkPI("github.com/sdboyer/gps"),
-		mkPI("github.com/sdboyer/gpkt"),
-		{
-			ProjectRoot: ProjectRoot("github.com/sdboyer/gpkt"),
-			Source:      "https://github.com/sdboyer/gpkt",
-		},
-		mkPI("github.com/sdboyer/gogl"),
-		mkPI("github.com/sdboyer/gliph"),
-		mkPI("github.com/sdboyer/frozone"),
-		mkPI("gopkg.in/sdboyer/gpkt.v1"),
-		mkPI("gopkg.in/sdboyer/gpkt.v2"),
-		mkPI("github.com/Masterminds/VCSTestRepo"),
-		mkPI("github.com/go-yaml/yaml"),
-		mkPI("github.com/sirupsen/logrus"),
-		mkPI("github.com/Masterminds/semver"),
-		mkPI("github.com/Masterminds/vcs"),
-		//mkPI("bitbucket.org/sdboyer/withbm"),
-		//mkPI("bitbucket.org/sdboyer/nobm"),
-	}
-
-	do := func(name string, sm SourceManager) {
-		t.Run(name, func(t *testing.T) {
-			// This gives us ten calls per op, per project, which should be(?)
-			// decently likely to reveal underlying concurrency problems
-			ops := 4
-			cnum := len(projects) * ops * 10
-
-			for i := 0; i < cnum; i++ {
-				// Trigger all four ops on each project, then move on to the next
-				// project.
-				id, op := projects[(i/ops)%len(projects)], i%ops
-				// The count of times this op has been been invoked on this project
-				// (after the upcoming invocation)
-				opcount := i/(ops*len(projects)) + 1
-
-				switch op {
-				case 0:
-					t.Run(fmt.Sprintf("deduce:%v:%s", opcount, id), func(t *testing.T) {
-						t.Parallel()
-						if _, err := sm.DeduceProjectRoot(string(id.ProjectRoot)); err != nil {
-							t.Error(err)
-						}
-					})
-				case 1:
-					t.Run(fmt.Sprintf("sync:%v:%s", opcount, id), func(t *testing.T) {
-						t.Parallel()
-						err := sm.SyncSourceFor(id)
-						if err != nil {
-							t.Error(err)
-						}
-					})
-				case 2:
-					t.Run(fmt.Sprintf("listVersions:%v:%s", opcount, id), func(t *testing.T) {
-						t.Parallel()
-						vl, err := sm.ListVersions(id)
-						if err != nil {
-							t.Fatal(err)
-						}
-						if len(vl) == 0 {
-							t.Error("no versions returned")
-						}
-					})
-				case 3:
-					t.Run(fmt.Sprintf("exists:%v:%s", opcount, id), func(t *testing.T) {
-						t.Parallel()
-						y, err := sm.SourceExists(id)
-						if err != nil {
-							t.Fatal(err)
-						}
-						if !y {
-							t.Error("said source does not exist")
-						}
-					})
-				default:
-					panic(fmt.Sprintf("wtf, %s %v", id, op))
-				}
-			}
-		})
-	}
-
-	sm, _ := mkNaiveSM(t)
-	do("first", sm)
-
-	// Run the thing twice with a remade sm so that we cover both the cases of
-	// pre-existing and new clones.
-	//
-	// This triggers a release of the first sm, which is much of what we're
-	// testing here - that the release is complete and clean, and can be
-	// immediately followed by a new sm coming in.
-	sm2, clean := remakeNaiveSM(sm, t)
-	do("second", sm2)
-	clean()
-}
-
-// Ensure that we don't see concurrent map writes when calling ListVersions.
-// Regression test for https://github.com/sdboyer/gps/issues/156.
-//
-// Ideally this would be caught by TestMultiFetchThreadsafe, but perhaps the
-// high degree of parallelism pretty much eliminates that as a realistic
-// possibility?
-func TestListVersionsRacey(t *testing.T) {
-	// This test is quite slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	wg := &sync.WaitGroup{}
-	id := mkPI("github.com/sdboyer/gps")
-	for i := 0; i < 20; i++ {
-		wg.Add(1)
-		go func() {
-			_, err := sm.ListVersions(id)
-			if err != nil {
-				t.Errorf("listing versions failed with err %s", err.Error())
-			}
-			wg.Done()
-		}()
-	}
-
-	wg.Wait()
-}
-
-func TestErrAfterRelease(t *testing.T) {
-	sm, clean := mkNaiveSM(t)
-	clean()
-	id := ProjectIdentifier{}
-
-	_, err := sm.SourceExists(id)
-	if err == nil {
-		t.Errorf("SourceExists did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("SourceExists errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	err = sm.SyncSourceFor(id)
-	if err == nil {
-		t.Errorf("SyncSourceFor did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("SyncSourceFor errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	_, err = sm.ListVersions(id)
-	if err == nil {
-		t.Errorf("ListVersions did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("ListVersions errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	_, err = sm.RevisionPresentIn(id, "")
-	if err == nil {
-		t.Errorf("RevisionPresentIn did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("RevisionPresentIn errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	_, err = sm.ListPackages(id, nil)
-	if err == nil {
-		t.Errorf("ListPackages did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("ListPackages errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	_, _, err = sm.GetManifestAndLock(id, nil, naiveAnalyzer{})
-	if err == nil {
-		t.Errorf("GetManifestAndLock did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("GetManifestAndLock errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	err = sm.ExportProject(context.Background(), id, nil, "")
-	if err == nil {
-		t.Errorf("ExportProject did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("ExportProject errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-
-	_, err = sm.DeduceProjectRoot("")
-	if err == nil {
-		t.Errorf("DeduceProjectRoot did not error after calling Release()")
-	} else if terr, ok := err.(smIsReleased); !ok {
-		t.Errorf("DeduceProjectRoot errored after Release(), but with unexpected error: %T %s", terr, terr.Error())
-	}
-}
-
-func TestSignalHandling(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-
-	sigch := make(chan os.Signal)
-	sm.HandleSignals(sigch)
-
-	sigch <- os.Interrupt
-	<-time.After(10 * time.Millisecond)
-
-	if atomic.LoadInt32(&sm.releasing) != 1 {
-		t.Error("Releasing flag did not get set")
-	}
-
-	clean()
-
-	// Test again, this time with a running call
-	sm, clean = mkNaiveSM(t)
-	sm.HandleSignals(sigch)
-
-	errchan := make(chan error)
-	go func() {
-		_, callerr := sm.DeduceProjectRoot("k8s.io/kubernetes")
-		errchan <- callerr
-	}()
-	go func() { sigch <- os.Interrupt }()
-	runtime.Gosched()
-
-	callerr := <-errchan
-	if callerr == nil {
-		t.Error("network call could not have completed before cancellation, should have gotten an error")
-	}
-	if atomic.LoadInt32(&sm.releasing) != 1 {
-		t.Error("Releasing flag did not get set")
-	}
-	clean()
-
-	sm, clean = mkNaiveSM(t)
-	// Ensure that handling also works after stopping and restarting itself,
-	// and that Release happens only once.
-	sm.UseDefaultSignalHandling()
-	sm.StopSignalHandling()
-	sm.HandleSignals(sigch)
-
-	go func() {
-		_, callerr := sm.DeduceProjectRoot("k8s.io/kubernetes")
-		errchan <- callerr
-	}()
-	go func() {
-		sigch <- os.Interrupt
-		sm.Release()
-	}()
-	runtime.Gosched()
-
-	after := time.After(2 * time.Second)
-	select {
-	case <-sm.qch:
-	case <-after:
-		t.Error("did not shut down in reasonable time")
-	}
-
-	clean()
-}
-
-func TestUnreachableSource(t *testing.T) {
-	// If a git remote is unreachable (maybe the server is only accessible behind a VPN, or
-	// something), we should return a clear error, not a panic.
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	id := mkPI("github.com/golang/notexist").normalize()
-	err := sm.SyncSourceFor(id)
-	if err == nil {
-		t.Error("expected err when listing versions of a bogus source, but got nil")
-	}
-}
-
-func TestSupervisor(t *testing.T) {
-	bgc := context.Background()
-	ctx, cancelFunc := context.WithCancel(bgc)
-	superv := newSupervisor(ctx)
-
-	ci := callInfo{
-		name: "foo",
-		typ:  0,
-	}
-
-	_, err := superv.start(ci)
-	if err != nil {
-		t.Fatal("unexpected err on setUpCall:", err)
-	}
-
-	tc, exists := superv.running[ci]
-	if !exists {
-		t.Fatal("running call not recorded in map")
-	}
-
-	if tc.count != 1 {
-		t.Fatalf("wrong count of running ci: wanted 1 got %v", tc.count)
-	}
-
-	// run another, but via do
-	block, wait := make(chan struct{}), make(chan struct{})
-	errchan := make(chan error)
-	go func() {
-		wait <- struct{}{}
-		err := superv.do(bgc, "foo", 0, func(ctx context.Context) error {
-			<-block
-			return nil
-		})
-		errchan <- err
-		//if err != nil {
-		//	t.Fatal("unexpected err on do() completion:", err)
-		//}
-		close(wait)
-	}()
-	<-wait
-
-	superv.mu.Lock()
-	tc, exists = superv.running[ci]
-	if !exists {
-		t.Fatal("running call not recorded in map")
-	}
-
-	// TODO (kris-nova) We need to disable this bypass here, and in the .travis.yml
-	// as soon as dep#501 is fixed
-	bypass := os.Getenv("DEPTESTBYPASS501")
-	if bypass != "" {
-		t.Log("bypassing tc.count check for running ci")
-	} else if tc.count != 2 {
-		t.Fatalf("wrong count of running ci: wanted 2 got %v", tc.count)
-	}
-	superv.mu.Unlock()
-
-	close(block)
-
-	possibleConcurrentError := <-errchan
-	if possibleConcurrentError != nil {
-		t.Fatal("unexpected err on do() completion:", err)
-	}
-
-	<-wait
-	superv.mu.Lock()
-	if len(superv.ran) != 0 {
-		t.Fatal("should not record metrics until last one drops")
-	}
-
-	tc, exists = superv.running[ci]
-	if !exists {
-		t.Fatal("running call not recorded in map")
-	}
-
-	if tc.count != 1 {
-		t.Fatalf("wrong count of running ci: wanted 1 got %v", tc.count)
-	}
-	superv.mu.Unlock()
-
-	superv.done(ci)
-	superv.mu.Lock()
-	ran, exists := superv.ran[0]
-	if !exists {
-		t.Fatal("should have metrics after closing last of a ci, but did not")
-	}
-
-	if ran.count != 1 {
-		t.Fatalf("wrong count of serial runs of a call: wanted 1 got %v", ran.count)
-	}
-	superv.mu.Unlock()
-
-	cancelFunc()
-	_, err = superv.start(ci)
-	if err == nil {
-		t.Fatal("should have errored on cm.run() after canceling cm's input context")
-	}
-
-	superv.do(bgc, "foo", 0, func(ctx context.Context) error {
-		t.Fatal("calls should not be initiated by do() after main context is cancelled")
-		return nil
-	})
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/manifest_test.go b/installer/vendor/github.com/golang/dep/internal/gps/manifest_test.go
deleted file mode 100644
index a6ce9871fc..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/manifest_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import "testing"
-
-// Test that prep manifest sanitizes manifests appropriately
-func TestPrepManifest(t *testing.T) {
-	m := SimpleManifest{
-		Deps: ProjectConstraints{
-			ProjectRoot("foo"): ProjectProperties{},
-			ProjectRoot("bar"): ProjectProperties{
-				Source: "whatever",
-			},
-		},
-	}
-
-	prepped := prepManifest(m)
-	d := prepped.DependencyConstraints()
-	if len(d) != 1 {
-		t.Error("prepManifest did not eliminate empty ProjectProperties from deps map")
-	}
-
-	if d[ProjectRoot("bar")].Constraint != any {
-		t.Error("prepManifest did not normalize nil constraint to anyConstraint in deps map")
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/paths/paths_test.go b/installer/vendor/github.com/golang/dep/internal/gps/paths/paths_test.go
deleted file mode 100644
index aaaafc1cf1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/paths/paths_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package paths
-
-import "testing"
-
-func TestIsStandardImportPath(t *testing.T) {
-	fix := []struct {
-		ip string
-		is bool
-	}{
-		{"appengine", true},
-		{"net/http", true},
-		{"github.com/anything", false},
-		{"github.com", false},
-		{"foo", true},
-		{".", false},
-	}
-
-	for _, f := range fix {
-		r := IsStandardImportPath(f.ip)
-		if r != f.is {
-			if r {
-				t.Errorf("%s was marked stdlib but should not have been", f.ip)
-			} else {
-				t.Errorf("%s was not marked stdlib but should have been", f.ip)
-
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/digest_test.go b/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/digest_test.go
deleted file mode 100644
index c45bfd3ef3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/digest_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgtree
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-// crossBuffer is a test io.Reader that emits a few canned responses.
-type crossBuffer struct {
-	readCount  int
-	iterations []string
-}
-
-func (cb *crossBuffer) Read(buf []byte) (int, error) {
-	if cb.readCount == len(cb.iterations) {
-		return 0, io.EOF
-	}
-	cb.readCount++
-	return copy(buf, cb.iterations[cb.readCount-1]), nil
-}
-
-func streamThruLineEndingReader(t *testing.T, iterations []string) []byte {
-	dst := new(bytes.Buffer)
-	n, err := io.Copy(dst, newLineEndingReader(&crossBuffer{iterations: iterations}))
-	if got, want := err, error(nil); got != want {
-		t.Errorf("(GOT): %v; (WNT): %v", got, want)
-	}
-	if got, want := n, int64(dst.Len()); got != want {
-		t.Errorf("(GOT): %v; (WNT): %v", got, want)
-	}
-	return dst.Bytes()
-}
-
-func TestLineEndingReader(t *testing.T) {
-	testCases := []struct {
-		input  []string
-		output string
-	}{
-		{[]string{"\r"}, "\r"},
-		{[]string{"\r\n"}, "\n"},
-		{[]string{"now is the time\r\n"}, "now is the time\n"},
-		{[]string{"now is the time\r\n(trailing data)"}, "now is the time\n(trailing data)"},
-		{[]string{"now is the time\n"}, "now is the time\n"},
-		{[]string{"now is the time\r"}, "now is the time\r"},     // trailing CR ought to convey
-		{[]string{"\rnow is the time"}, "\rnow is the time"},     // CR not followed by LF ought to convey
-		{[]string{"\rnow is the time\r"}, "\rnow is the time\r"}, // CR not followed by LF ought to convey
-
-		// no line splits
-		{[]string{"first", "second", "third"}, "firstsecondthird"},
-
-		// 1->2 and 2->3 both break across a CRLF
-		{[]string{"first\r", "\nsecond\r", "\nthird"}, "first\nsecond\nthird"},
-
-		// 1->2 breaks across CRLF and 2->3 does not
-		{[]string{"first\r", "\nsecond", "third"}, "first\nsecondthird"},
-
-		// 1->2 breaks across CRLF and 2 ends in CR but 3 does not begin LF
-		{[]string{"first\r", "\nsecond\r", "third"}, "first\nsecond\rthird"},
-
-		// 1 ends in CR but 2 does not begin LF, and 2->3 breaks across CRLF
-		{[]string{"first\r", "second\r", "\nthird"}, "first\rsecond\nthird"},
-
-		// 1 ends in CR but 2 does not begin LF, and 2->3 does not break across CRLF
-		{[]string{"first\r", "second\r", "\nthird"}, "first\rsecond\nthird"},
-
-		// 1->2 and 2->3 both break across a CRLF, but 3->4 does not
-		{[]string{"first\r", "\nsecond\r", "\nthird\r", "fourth"}, "first\nsecond\nthird\rfourth"},
-		{[]string{"first\r", "\nsecond\r", "\nthird\n", "fourth"}, "first\nsecond\nthird\nfourth"},
-
-		{[]string{"this is the result\r\nfrom the first read\r", "\nthis is the result\r\nfrom the second read\r"},
-			"this is the result\nfrom the first read\nthis is the result\nfrom the second read\r"},
-		{[]string{"now is the time\r\nfor all good engineers\r\nto improve their test coverage!\r\n"},
-			"now is the time\nfor all good engineers\nto improve their test coverage!\n"},
-		{[]string{"now is the time\r\nfor all good engineers\r", "\nto improve their test coverage!\r\n"},
-			"now is the time\nfor all good engineers\nto improve their test coverage!\n"},
-	}
-
-	for _, testCase := range testCases {
-		got := streamThruLineEndingReader(t, testCase.input)
-		if want := []byte(testCase.output); !bytes.Equal(got, want) {
-			t.Errorf("Input: %#v; (GOT): %#q; (WNT): %#q", testCase.input, got, want)
-		}
-	}
-}
-
-////////////////////////////////////////
-
-func getTestdataVerifyRoot(t *testing.T) string {
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	return filepath.Join(filepath.Dir(cwd), "_testdata/digest")
-}
-
-func TestDigestFromDirectoryBailsUnlessDirectory(t *testing.T) {
-	prefix := getTestdataVerifyRoot(t)
-	relativePathname := "launchpad.net/match"
-	_, err := DigestFromDirectory(filepath.Join(prefix, relativePathname))
-	if got, want := err, error(nil); got != want {
-		t.Errorf("\n(GOT): %v; (WNT): %v", got, want)
-	}
-}
-
-func TestDigestFromDirectory(t *testing.T) {
-	relativePathname := "launchpad.net/match"
-	want := []byte{0x7e, 0x10, 0x6, 0x2f, 0x8, 0x3, 0x3c, 0x76, 0xae, 0xbc, 0xa4, 0xc9, 0xec, 0x73, 0x67, 0x15, 0x70, 0x2b, 0x0, 0x89, 0x27, 0xbb, 0x61, 0x9d, 0xc7, 0xc3, 0x39, 0x46, 0x3, 0x91, 0xb7, 0x3b}
-
-	// NOTE: Create the hash using both an absolute and a relative pathname to
-	// ensure hash ignores prefix.
-
-	t.Run("AbsolutePrefix", func(t *testing.T) {
-		prefix := getTestdataVerifyRoot(t)
-		got, err := DigestFromDirectory(filepath.Join(prefix, relativePathname))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !bytes.Equal(got, want) {
-			t.Errorf("\n(GOT):\n\t%#v\n(WNT):\n\t%#v", got, want)
-		}
-	})
-
-	t.Run("RelativePrefix", func(t *testing.T) {
-		prefix := "../_testdata/digest"
-		got, err := DigestFromDirectory(filepath.Join(prefix, relativePathname))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !bytes.Equal(got, want) {
-			t.Errorf("\n(GOT):\n\t%#v\n(WNT):\n\t%#v", got, want)
-		}
-	})
-}
-
-func TestVerifyDepTree(t *testing.T) {
-	vendorRoot := getTestdataVerifyRoot(t)
-
-	wantSums := map[string][]byte{
-		"github.com/alice/match":       []byte{0x7e, 0x10, 0x6, 0x2f, 0x8, 0x3, 0x3c, 0x76, 0xae, 0xbc, 0xa4, 0xc9, 0xec, 0x73, 0x67, 0x15, 0x70, 0x2b, 0x0, 0x89, 0x27, 0xbb, 0x61, 0x9d, 0xc7, 0xc3, 0x39, 0x46, 0x3, 0x91, 0xb7, 0x3b},
-		"github.com/alice/mismatch":    []byte("some non-matching digest"),
-		"github.com/bob/emptyDigest":   nil, // empty hash result
-		"github.com/bob/match":         []byte{0x7e, 0x10, 0x6, 0x2f, 0x8, 0x3, 0x3c, 0x76, 0xae, 0xbc, 0xa4, 0xc9, 0xec, 0x73, 0x67, 0x15, 0x70, 0x2b, 0x0, 0x89, 0x27, 0xbb, 0x61, 0x9d, 0xc7, 0xc3, 0x39, 0x46, 0x3, 0x91, 0xb7, 0x3b},
-		"github.com/charlie/notInTree": nil, // not in tree result ought to superseede empty digest result
-		// matching result at seldomly found directory level
-		"launchpad.net/match": []byte{0x7e, 0x10, 0x6, 0x2f, 0x8, 0x3, 0x3c, 0x76, 0xae, 0xbc, 0xa4, 0xc9, 0xec, 0x73, 0x67, 0x15, 0x70, 0x2b, 0x0, 0x89, 0x27, 0xbb, 0x61, 0x9d, 0xc7, 0xc3, 0x39, 0x46, 0x3, 0x91, 0xb7, 0x3b},
-	}
-
-	status, err := VerifyDepTree(vendorRoot, wantSums)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if got, want := len(status), 7; got != want {
-		t.Errorf("\n(GOT): %v; (WNT): %v", got, want)
-	}
-
-	checkStatus := func(t *testing.T, status map[string]VendorStatus, key string, want VendorStatus) {
-		got, ok := status[key]
-		if !ok {
-			t.Errorf("Want key: %q", key)
-			return
-		}
-		if got != want {
-			t.Errorf("Key: %q; (GOT): %v; (WNT): %v", key, got, want)
-		}
-	}
-
-	checkStatus(t, status, "github.com/alice/match", NoMismatch)
-	checkStatus(t, status, "github.com/alice/mismatch", DigestMismatchInLock)
-	checkStatus(t, status, "github.com/alice/notInLock", NotInLock)
-	checkStatus(t, status, "github.com/bob/match", NoMismatch)
-	checkStatus(t, status, "github.com/bob/emptyDigest", EmptyDigestInLock)
-	checkStatus(t, status, "github.com/charlie/notInTree", NotInTree)
-	checkStatus(t, status, "launchpad.net/match", NoMismatch)
-
-	if t.Failed() {
-		for k, want := range wantSums {
-			got, err := DigestFromDirectory(filepath.Join(vendorRoot, k))
-			if err != nil {
-				t.Error(err)
-			}
-			if !bytes.Equal(got, want) {
-				t.Errorf("%q\n(GOT):\n\t%#v\n(WNT):\n\t%#v", k, got, want)
-			}
-		}
-	}
-}
-
-func BenchmarkDigestFromDirectory(b *testing.B) {
-	b.Skip("Eliding benchmark of user's Go source directory")
-
-	prefix := filepath.Join(os.Getenv("GOPATH"), "src")
-
-	for i := 0; i < b.N; i++ {
-		_, err := DigestFromDirectory(prefix)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkVerifyDepTree(b *testing.B) {
-	b.Skip("Eliding benchmark of user's Go source directory")
-
-	prefix := filepath.Join(os.Getenv("GOPATH"), "src")
-
-	for i := 0; i < b.N; i++ {
-		_, err := VerifyDepTree(prefix, nil)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/ignored_ruleset_test.go b/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/ignored_ruleset_test.go
deleted file mode 100644
index 0dab4309c4..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/ignored_ruleset_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgtree
-
-import "testing"
-
-func TestIgnoredRuleset(t *testing.T) {
-	type tfixm []struct {
-		path string
-		wild bool
-	}
-	cases := []struct {
-		name            string
-		inputs          []string
-		wantInTree      tfixm
-		wantEmptyTree   bool
-		shouldIgnore    []string
-		shouldNotIgnore []string
-	}{
-		{
-			name:          "only skip global ignore",
-			inputs:        []string{"*"},
-			wantEmptyTree: true,
-		},
-		{
-			name: "ignores without ignore suffix",
-			inputs: []string{
-				"x/y/z",
-				"*a/b/c",
-				"gophers",
-			},
-			wantInTree: tfixm{
-				{path: "x/y/z", wild: false},
-				{path: "*a/b/c", wild: false},
-				{path: "gophers", wild: false},
-			},
-			shouldIgnore: []string{
-				"x/y/z",
-				"gophers",
-			},
-			shouldNotIgnore: []string{
-				"x/y/z/q",
-				"x/y",
-				"gopher",
-				"gopherss",
-			},
-		},
-		{
-			name: "ignores with ignore suffix",
-			inputs: []string{
-				"x/y/z*",
-				"a/b/c",
-				"gophers",
-			},
-			wantInTree: tfixm{
-				{path: "x/y/z", wild: true},
-				{path: "a/b/c", wild: false},
-				{path: "gophers", wild: false},
-			},
-			shouldIgnore: []string{
-				"x/y/z",
-				"x/y/zz",
-				"x/y/z/",
-				"x/y/z/q",
-			},
-			shouldNotIgnore: []string{
-				"x/y",
-				"gopher",
-			},
-		},
-		{
-			name: "global ignore with other strings",
-			inputs: []string{
-				"*",
-				"gophers*",
-				"x/y/z*",
-				"a/b/c",
-			},
-			wantInTree: tfixm{
-				{path: "x/y/z", wild: true},
-				{path: "a/b/c", wild: false},
-				{path: "gophers", wild: true},
-			},
-			shouldIgnore: []string{
-				"x/y/z",
-				"x/y/z/",
-				"x/y/z/q",
-				"gophers",
-				"gopherss",
-				"gophers/foo",
-			},
-			shouldNotIgnore: []string{
-				"x/y",
-				"gopher",
-			},
-		},
-		{
-			name: "ineffectual ignore with wildcard",
-			inputs: []string{
-				"a/b*",
-				"a/b/c*",
-				"a/b/x/y",
-				"a/c*",
-			},
-			wantInTree: tfixm{
-				{path: "a/c", wild: true},
-				{path: "a/b", wild: true},
-			},
-			shouldIgnore: []string{
-				"a/cb",
-			},
-			shouldNotIgnore: []string{
-				"a/",
-				"a/d",
-			},
-		},
-		{
-			name: "same path with and without wildcard",
-			inputs: []string{
-				"a/b*",
-				"a/b",
-			},
-			wantInTree: tfixm{
-				{path: "a/b", wild: true},
-			},
-			shouldIgnore: []string{
-				"a/b",
-				"a/bb",
-			},
-			shouldNotIgnore: []string{
-				"a/",
-				"a/d",
-			},
-		},
-		{
-			name: "empty paths",
-			inputs: []string{
-				"",
-				"a/b*",
-			},
-			wantInTree: tfixm{
-				{path: "a/b", wild: true},
-			},
-			shouldNotIgnore: []string{
-				"",
-			},
-		},
-		{
-			name: "single wildcard",
-			inputs: []string{
-				"a/b*",
-			},
-			wantInTree: tfixm{
-				{path: "a/b", wild: true},
-			},
-			shouldIgnore: []string{
-				"a/b/c",
-			},
-		},
-	}
-
-	for _, c := range cases {
-		igm := NewIgnoredRuleset(c.inputs)
-		f := func(t *testing.T) {
-
-			if c.wantEmptyTree {
-				if igm.Len() != 0 {
-					t.Fatalf("wanted empty tree, but had %v elements", igm.Len())
-				}
-			}
-
-			// Check if the wildcard suffix ignores are in the tree.
-			for _, p := range c.wantInTree {
-				wildi, has := igm.t.Get(p.path)
-				if !has {
-					t.Fatalf("expected %q to be in the tree", p.path)
-				} else if wildi.(bool) != p.wild {
-					if p.wild {
-						t.Fatalf("expected %q to be a wildcard matcher, but it was not", p.path)
-					} else {
-						t.Fatalf("expected %q not to be a wildcard matcher, but it was", p.path)
-					}
-				}
-			}
-
-			for _, p := range c.shouldIgnore {
-				if !igm.IsIgnored(p) {
-					t.Fatalf("%q should be ignored, but it was not", p)
-				}
-			}
-			for _, p := range c.shouldNotIgnore {
-				if igm.IsIgnored(p) {
-					t.Fatalf("%q should not be ignored, but it was", p)
-				}
-			}
-		}
-		t.Run(c.name, f)
-
-		igm = NewIgnoredRuleset(igm.ToSlice())
-		t.Run(c.name+"/inandout", f)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/pkgtree_test.go b/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/pkgtree_test.go
deleted file mode 100644
index 8b61a61d67..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/pkgtree/pkgtree_test.go
+++ /dev/null
@@ -1,2272 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkgtree
-
-import (
-	"fmt"
-	"go/build"
-	"go/scanner"
-	"go/token"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps/paths"
-)
-
-// PackageTree.ToReachMap() uses an easily separable algorithm, wmToReach(),
-// to turn a discovered set of packages and their imports into a proper pair of
-// internal and external reach maps.
-//
-// That algorithm is purely symbolic (no filesystem interaction), and thus is
-// easy to test. This is that test.
-func TestWorkmapToReach(t *testing.T) {
-	empty := func() map[string]bool {
-		return make(map[string]bool)
-	}
-
-	table := map[string]struct {
-		workmap  map[string]wm
-		rm       ReachMap
-		em       map[string]*ProblemImportError
-		backprop bool
-	}{
-		"single": {
-			workmap: map[string]wm{
-				"foo": {
-					ex: empty(),
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"foo": {},
-			},
-		},
-		"no external": {
-			workmap: map[string]wm{
-				"foo": {
-					ex: empty(),
-					in: empty(),
-				},
-				"foo/bar": {
-					ex: empty(),
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"foo":     {},
-				"foo/bar": {},
-			},
-		},
-		"no external with subpkg": {
-			workmap: map[string]wm{
-				"foo": {
-					ex: empty(),
-					in: map[string]bool{
-						"foo/bar": true,
-					},
-				},
-				"foo/bar": {
-					ex: empty(),
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"foo": {
-					Internal: []string{"foo/bar"},
-				},
-				"foo/bar": {},
-			},
-		},
-		"simple base transitive": {
-			workmap: map[string]wm{
-				"foo": {
-					ex: empty(),
-					in: map[string]bool{
-						"foo/bar": true,
-					},
-				},
-				"foo/bar": {
-					ex: map[string]bool{
-						"baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"foo": {
-					External: []string{"baz"},
-					Internal: []string{"foo/bar"},
-				},
-				"foo/bar": {
-					External: []string{"baz"},
-				},
-			},
-		},
-		"missing package is poison": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo": true, // missing
-						"A/bar": true,
-					},
-				},
-				"A/bar": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A/bar": {
-					External: []string{"B/baz"},
-				},
-			},
-			em: map[string]*ProblemImportError{
-				"A": {
-					ImportPath: "A",
-					Cause:      []string{"A/foo"},
-					Err:        missingPkgErr("A/foo"),
-				},
-			},
-			backprop: true,
-		},
-		"transitive missing package is poison": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo":  true, // transitively missing
-						"A/quux": true,
-					},
-				},
-				"A/foo": {
-					ex: map[string]bool{
-						"C/flugle": true,
-					},
-					in: map[string]bool{
-						"A/bar": true, // missing
-					},
-				},
-				"A/quux": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A/quux": {
-					External: []string{"B/baz"},
-				},
-			},
-			em: map[string]*ProblemImportError{
-				"A": {
-					ImportPath: "A",
-					Cause:      []string{"A/foo", "A/bar"},
-					Err:        missingPkgErr("A/bar"),
-				},
-				"A/foo": {
-					ImportPath: "A/foo",
-					Cause:      []string{"A/bar"},
-					Err:        missingPkgErr("A/bar"),
-				},
-			},
-			backprop: true,
-		},
-		"err'd package is poison": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo": true, // err'd
-						"A/bar": true,
-					},
-				},
-				"A/foo": {
-					err: fmt.Errorf("err pkg"),
-				},
-				"A/bar": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A/bar": {
-					External: []string{"B/baz"},
-				},
-			},
-			em: map[string]*ProblemImportError{
-				"A": {
-					ImportPath: "A",
-					Cause:      []string{"A/foo"},
-					Err:        fmt.Errorf("err pkg"),
-				},
-				"A/foo": {
-					ImportPath: "A/foo",
-					Err:        fmt.Errorf("err pkg"),
-				},
-			},
-			backprop: true,
-		},
-		"transitive err'd package is poison": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo":  true, // transitively err'd
-						"A/quux": true,
-					},
-				},
-				"A/foo": {
-					ex: map[string]bool{
-						"C/flugle": true,
-					},
-					in: map[string]bool{
-						"A/bar": true, // err'd
-					},
-				},
-				"A/bar": {
-					err: fmt.Errorf("err pkg"),
-				},
-				"A/quux": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A/quux": {
-					External: []string{"B/baz"},
-				},
-			},
-			em: map[string]*ProblemImportError{
-				"A": {
-					ImportPath: "A",
-					Cause:      []string{"A/foo", "A/bar"},
-					Err:        fmt.Errorf("err pkg"),
-				},
-				"A/foo": {
-					ImportPath: "A/foo",
-					Cause:      []string{"A/bar"},
-					Err:        fmt.Errorf("err pkg"),
-				},
-				"A/bar": {
-					ImportPath: "A/bar",
-					Err:        fmt.Errorf("err pkg"),
-				},
-			},
-			backprop: true,
-		},
-		"transitive err'd package no backprop": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo":  true, // transitively err'd
-						"A/quux": true,
-					},
-				},
-				"A/foo": {
-					ex: map[string]bool{
-						"C/flugle": true,
-					},
-					in: map[string]bool{
-						"A/bar": true, // err'd
-					},
-				},
-				"A/bar": {
-					err: fmt.Errorf("err pkg"),
-				},
-				"A/quux": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A": {
-					Internal: []string{"A/bar", "A/foo", "A/quux"},
-					//Internal: []string{"A/foo", "A/quux"},
-					External: []string{"B/baz", "B/foo", "C/flugle"},
-				},
-				"A/foo": {
-					Internal: []string{"A/bar"},
-					External: []string{"C/flugle"},
-				},
-				"A/quux": {
-					External: []string{"B/baz"},
-				},
-			},
-			em: map[string]*ProblemImportError{
-				"A/bar": {
-					ImportPath: "A/bar",
-					Err:        fmt.Errorf("err pkg"),
-				},
-			},
-		},
-		// The following tests are mostly about regressions and weeding out
-		// weird assumptions
-		"internal diamond": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B/foo": true,
-					},
-					in: map[string]bool{
-						"A/foo": true,
-						"A/bar": true,
-					},
-				},
-				"A/foo": {
-					ex: map[string]bool{
-						"C": true,
-					},
-					in: map[string]bool{
-						"A/quux": true,
-					},
-				},
-				"A/bar": {
-					ex: map[string]bool{
-						"D": true,
-					},
-					in: map[string]bool{
-						"A/quux": true,
-					},
-				},
-				"A/quux": {
-					ex: map[string]bool{
-						"B/baz": true,
-					},
-					in: empty(),
-				},
-			},
-			rm: ReachMap{
-				"A": {
-					External: []string{
-						"B/baz",
-						"B/foo",
-						"C",
-						"D",
-					},
-					Internal: []string{
-						"A/bar",
-						"A/foo",
-						"A/quux",
-					},
-				},
-				"A/foo": {
-					External: []string{
-						"B/baz",
-						"C",
-					},
-					Internal: []string{
-						"A/quux",
-					},
-				},
-				"A/bar": {
-					External: []string{
-						"B/baz",
-						"D",
-					},
-					Internal: []string{
-						"A/quux",
-					},
-				},
-				"A/quux": {
-					External: []string{"B/baz"},
-				},
-			},
-		},
-		"rootmost gets imported": {
-			workmap: map[string]wm{
-				"A": {
-					ex: map[string]bool{
-						"B": true,
-					},
-					in: empty(),
-				},
-				"A/foo": {
-					ex: map[string]bool{
-						"C": true,
-					},
-					in: map[string]bool{
-						"A": true,
-					},
-				},
-			},
-			rm: ReachMap{
-				"A": {
-					External: []string{"B"},
-				},
-				"A/foo": {
-					External: []string{
-						"B",
-						"C",
-					},
-					Internal: []string{
-						"A",
-					},
-				},
-			},
-		},
-	}
-
-	for name, fix := range table {
-		name, fix := name, fix
-		t.Run(name, func(t *testing.T) {
-			t.Parallel()
-
-			// Avoid erroneous errors by initializing the fixture's error map if
-			// needed
-			if fix.em == nil {
-				fix.em = make(map[string]*ProblemImportError)
-			}
-
-			rm, em := wmToReach(fix.workmap, fix.backprop)
-			if !reflect.DeepEqual(rm, fix.rm) {
-				//t.Error(pretty.Sprintf("wmToReach(%q): Did not get expected reach map:\n\t(GOT): %s\n\t(WNT): %s", name, rm, fix.rm))
-				t.Errorf("Did not get expected reach map:\n\t(GOT): %s\n\t(WNT): %s", rm, fix.rm)
-			}
-			if !reflect.DeepEqual(em, fix.em) {
-				//t.Error(pretty.Sprintf("wmToReach(%q): Did not get expected error map:\n\t(GOT): %# v\n\t(WNT): %# v", name, em, fix.em))
-				t.Errorf("Did not get expected error map:\n\t(GOT): %v\n\t(WNT): %v", em, fix.em)
-			}
-		})
-	}
-}
-
-func TestListPackagesNoDir(t *testing.T) {
-	out, err := ListPackages(filepath.Join(getTestdataRootDir(t), "notexist"), "notexist")
-	if err == nil {
-		t.Error("ListPackages should have errored on pointing to a nonexistent dir")
-	}
-	if !reflect.DeepEqual(PackageTree{}, out) {
-		t.Error("should've gotten back an empty PackageTree")
-	}
-}
-
-func TestListPackages(t *testing.T) {
-	srcdir := filepath.Join(getTestdataRootDir(t), "src")
-	j := func(s ...string) string {
-		return filepath.Join(srcdir, filepath.Join(s...))
-	}
-
-	table := map[string]struct {
-		fileRoot   string
-		importRoot string
-		out        PackageTree
-		err        error
-	}{
-		"empty": {
-			fileRoot:   j("empty"),
-			importRoot: "empty",
-			out: PackageTree{
-				ImportRoot: "empty",
-				Packages: map[string]PackageOrErr{
-					"empty": {
-						Err: &build.NoGoError{
-							Dir: j("empty"),
-						},
-					},
-				},
-			},
-		},
-		"code only": {
-			fileRoot:   j("simple"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"impose import path": {
-			fileRoot:   j("simple"),
-			importRoot: "arbitrary",
-			out: PackageTree{
-				ImportRoot: "arbitrary",
-				Packages: map[string]PackageOrErr{
-					"arbitrary": {
-						P: Package{
-							ImportPath:  "arbitrary",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"test only": {
-			fileRoot:   j("t"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports:     []string{},
-							TestImports: []string{
-								"math/rand",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		"xtest only": {
-			fileRoot:   j("xt"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports:     []string{},
-							TestImports: []string{
-								"sort",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code and test": {
-			fileRoot:   j("simplet"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-							TestImports: []string{
-								"math/rand",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code and xtest": {
-			fileRoot:   j("simplext"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-							TestImports: []string{
-								"sort",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code, test, xtest": {
-			fileRoot:   j("simpleallt"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-							TestImports: []string{
-								"math/rand",
-								"sort",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		"one pkg multifile": {
-			fileRoot:   j("m1p"),
-			importRoot: "m1p",
-			out: PackageTree{
-				ImportRoot: "m1p",
-				Packages: map[string]PackageOrErr{
-					"m1p": {
-						P: Package{
-							ImportPath:  "m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"one nested below": {
-			fileRoot:   j("nest"),
-			importRoot: "nest",
-			out: PackageTree{
-				ImportRoot: "nest",
-				Packages: map[string]PackageOrErr{
-					"nest": {
-						P: Package{
-							ImportPath:  "nest",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-					"nest/m1p": {
-						P: Package{
-							ImportPath:  "nest/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"malformed go file": {
-			fileRoot:   j("bad"),
-			importRoot: "bad",
-			out: PackageTree{
-				ImportRoot: "bad",
-				Packages: map[string]PackageOrErr{
-					"bad": {
-						Err: scanner.ErrorList{
-							&scanner.Error{
-								Pos: token.Position{
-									Filename: j("bad", "bad.go"),
-									Offset:   273,
-									Line:     6,
-									Column:   43,
-								},
-								Msg: "expected 'package', found 'EOF'",
-							},
-						},
-					},
-				},
-			},
-		},
-		"two nested under empty root": {
-			fileRoot:   j("ren"),
-			importRoot: "ren",
-			out: PackageTree{
-				ImportRoot: "ren",
-				Packages: map[string]PackageOrErr{
-					"ren": {
-						Err: &build.NoGoError{
-							Dir: j("ren"),
-						},
-					},
-					"ren/m1p": {
-						P: Package{
-							ImportPath:  "ren/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-					"ren/simple": {
-						P: Package{
-							ImportPath:  "ren/simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"internal name mismatch": {
-			fileRoot:   j("doublenest"),
-			importRoot: "doublenest",
-			out: PackageTree{
-				ImportRoot: "doublenest",
-				Packages: map[string]PackageOrErr{
-					"doublenest": {
-						P: Package{
-							ImportPath:  "doublenest",
-							CommentPath: "",
-							Name:        "base",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"go/parser",
-							},
-						},
-					},
-					"doublenest/namemismatch": {
-						P: Package{
-							ImportPath:  "doublenest/namemismatch",
-							CommentPath: "",
-							Name:        "nm",
-							Imports: []string{
-								"github.com/Masterminds/semver",
-								"os",
-							},
-						},
-					},
-					"doublenest/namemismatch/m1p": {
-						P: Package{
-							ImportPath:  "doublenest/namemismatch/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"file and importroot mismatch": {
-			fileRoot:   j("doublenest"),
-			importRoot: "other",
-			out: PackageTree{
-				ImportRoot: "other",
-				Packages: map[string]PackageOrErr{
-					"other": {
-						P: Package{
-							ImportPath:  "other",
-							CommentPath: "",
-							Name:        "base",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"go/parser",
-							},
-						},
-					},
-					"other/namemismatch": {
-						P: Package{
-							ImportPath:  "other/namemismatch",
-							CommentPath: "",
-							Name:        "nm",
-							Imports: []string{
-								"github.com/Masterminds/semver",
-								"os",
-							},
-						},
-					},
-					"other/namemismatch/m1p": {
-						P: Package{
-							ImportPath:  "other/namemismatch/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code and ignored main": {
-			fileRoot:   j("igmain"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-								"unicode",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code and ignored main, order check": {
-			fileRoot:   j("igmainfirst"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-								"unicode",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code and ignored main with comment leader": {
-			fileRoot:   j("igmainlong"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-								"unicode",
-							},
-						},
-					},
-				},
-			},
-		},
-		"code, tests, and ignored main": {
-			fileRoot:   j("igmaint"),
-			importRoot: "simple",
-			out: PackageTree{
-				ImportRoot: "simple",
-				Packages: map[string]PackageOrErr{
-					"simple": {
-						P: Package{
-							ImportPath:  "simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-								"unicode",
-							},
-							TestImports: []string{
-								"math/rand",
-								"strconv",
-							},
-						},
-					},
-				},
-			},
-		},
-		// imports a missing pkg
-		"missing import": {
-			fileRoot:   j("missing"),
-			importRoot: "missing",
-			out: PackageTree{
-				ImportRoot: "missing",
-				Packages: map[string]PackageOrErr{
-					"missing": {
-						P: Package{
-							ImportPath:  "missing",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"missing/missing",
-								"sort",
-							},
-						},
-					},
-					"missing/m1p": {
-						P: Package{
-							ImportPath:  "missing/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		// import cycle of three packages. ListPackages doesn't do anything
-		// special with cycles - that's the reach calculator's job - so this is
-		// error-free
-		"import cycle, len 3": {
-			fileRoot:   j("cycle"),
-			importRoot: "cycle",
-			out: PackageTree{
-				ImportRoot: "cycle",
-				Packages: map[string]PackageOrErr{
-					"cycle": {
-						P: Package{
-							ImportPath:  "cycle",
-							CommentPath: "",
-							Name:        "cycle",
-							Imports: []string{
-								"cycle/one",
-								"github.com/golang/dep/internal/gps",
-							},
-						},
-					},
-					"cycle/one": {
-						P: Package{
-							ImportPath:  "cycle/one",
-							CommentPath: "",
-							Name:        "one",
-							Imports: []string{
-								"cycle/two",
-								"github.com/golang/dep/internal/gps",
-							},
-						},
-					},
-					"cycle/two": {
-						P: Package{
-							ImportPath:  "cycle/two",
-							CommentPath: "",
-							Name:        "two",
-							Imports: []string{
-								"cycle",
-								"github.com/golang/dep/internal/gps",
-							},
-						},
-					},
-				},
-			},
-		},
-		// has disallowed dir names
-		"disallowed dirs": {
-			fileRoot:   j("disallow"),
-			importRoot: "disallow",
-			out: PackageTree{
-				ImportRoot: "disallow",
-				Packages: map[string]PackageOrErr{
-					"disallow": {
-						P: Package{
-							ImportPath:  "disallow",
-							CommentPath: "",
-							Name:        "disallow",
-							Imports: []string{
-								"disallow/testdata",
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-					"disallow/testdata": {
-						P: Package{
-							ImportPath:  "disallow/testdata",
-							CommentPath: "",
-							Name:        "testdata",
-							Imports: []string{
-								"hash",
-							},
-						},
-					},
-				},
-			},
-		},
-		"relative imports": {
-			fileRoot:   j("relimport"),
-			importRoot: "relimport",
-			out: PackageTree{
-				ImportRoot: "relimport",
-				Packages: map[string]PackageOrErr{
-					"relimport": {
-						P: Package{
-							ImportPath:  "relimport",
-							CommentPath: "",
-							Name:        "relimport",
-							Imports: []string{
-								"sort",
-							},
-						},
-					},
-					"relimport/dot": {
-						P: Package{
-							ImportPath:  "relimport/dot",
-							CommentPath: "",
-							Name:        "dot",
-							Imports: []string{
-								".",
-								"sort",
-							},
-						},
-					},
-					"relimport/dotdot": {
-						Err: &LocalImportsError{
-							Dir:        j("relimport/dotdot"),
-							ImportPath: "relimport/dotdot",
-							LocalImports: []string{
-								"..",
-							},
-						},
-					},
-					"relimport/dotslash": {
-						Err: &LocalImportsError{
-							Dir:        j("relimport/dotslash"),
-							ImportPath: "relimport/dotslash",
-							LocalImports: []string{
-								"./simple",
-							},
-						},
-					},
-					"relimport/dotdotslash": {
-						Err: &LocalImportsError{
-							Dir:        j("relimport/dotdotslash"),
-							ImportPath: "relimport/dotdotslash",
-							LocalImports: []string{
-								"../github.com/golang/dep/internal/gps",
-							},
-						},
-					},
-				},
-			},
-		},
-		"skip underscore": {
-			fileRoot:   j("skip_"),
-			importRoot: "skip_",
-			out: PackageTree{
-				ImportRoot: "skip_",
-				Packages: map[string]PackageOrErr{
-					"skip_": {
-						P: Package{
-							ImportPath:  "skip_",
-							CommentPath: "",
-							Name:        "skip",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		// This case mostly exists for the PackageTree methods, but it does
-		// cover a bit of range
-		"varied": {
-			fileRoot:   j("varied"),
-			importRoot: "varied",
-			out: PackageTree{
-				ImportRoot: "varied",
-				Packages: map[string]PackageOrErr{
-					"varied": {
-						P: Package{
-							ImportPath:  "varied",
-							CommentPath: "",
-							Name:        "main",
-							Imports: []string{
-								"net/http",
-								"varied/namemismatch",
-								"varied/otherpath",
-								"varied/simple",
-							},
-						},
-					},
-					"varied/otherpath": {
-						P: Package{
-							ImportPath:  "varied/otherpath",
-							CommentPath: "",
-							Name:        "otherpath",
-							Imports:     []string{},
-							TestImports: []string{
-								"varied/m1p",
-							},
-						},
-					},
-					"varied/simple": {
-						P: Package{
-							ImportPath:  "varied/simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"go/parser",
-								"varied/simple/another",
-							},
-						},
-					},
-					"varied/simple/another": {
-						P: Package{
-							ImportPath:  "varied/simple/another",
-							CommentPath: "",
-							Name:        "another",
-							Imports: []string{
-								"hash",
-								"varied/m1p",
-							},
-							TestImports: []string{
-								"encoding/binary",
-							},
-						},
-					},
-					"varied/namemismatch": {
-						P: Package{
-							ImportPath:  "varied/namemismatch",
-							CommentPath: "",
-							Name:        "nm",
-							Imports: []string{
-								"github.com/Masterminds/semver",
-								"os",
-							},
-						},
-					},
-					"varied/m1p": {
-						P: Package{
-							ImportPath:  "varied/m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"varied with hidden dirs": {
-			fileRoot:   j("varied_hidden"),
-			importRoot: "varied",
-			out: PackageTree{
-				ImportRoot: "varied",
-				Packages: map[string]PackageOrErr{
-					"varied": {
-						P: Package{
-							ImportPath:  "varied",
-							CommentPath: "",
-							Name:        "main",
-							Imports: []string{
-								"net/http",
-								"varied/_frommain",
-								"varied/simple",
-							},
-						},
-					},
-					"varied/always": {
-						P: Package{
-							ImportPath:  "varied/always",
-							CommentPath: "",
-							Name:        "always",
-							Imports:     []string{},
-							TestImports: []string{
-								"varied/.onlyfromtests",
-							},
-						},
-					},
-					"varied/.onlyfromtests": {
-						P: Package{
-							ImportPath:  "varied/.onlyfromtests",
-							CommentPath: "",
-							Name:        "onlyfromtests",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-								"varied/_secondorder",
-							},
-						},
-					},
-					"varied/simple": {
-						P: Package{
-							ImportPath:  "varied/simple",
-							CommentPath: "",
-							Name:        "simple",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"go/parser",
-								"varied/simple/testdata",
-							},
-						},
-					},
-					"varied/simple/testdata": {
-						P: Package{
-							ImportPath:  "varied/simple/testdata",
-							CommentPath: "",
-							Name:        "testdata",
-							Imports: []string{
-								"varied/dotdotslash",
-							},
-						},
-					},
-					"varied/_secondorder": {
-						P: Package{
-							ImportPath:  "varied/_secondorder",
-							CommentPath: "",
-							Name:        "secondorder",
-							Imports: []string{
-								"hash",
-							},
-						},
-					},
-					"varied/_never": {
-						P: Package{
-							ImportPath:  "varied/_never",
-							CommentPath: "",
-							Name:        "never",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-					"varied/_frommain": {
-						P: Package{
-							ImportPath:  "varied/_frommain",
-							CommentPath: "",
-							Name:        "frommain",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"sort",
-							},
-						},
-					},
-					"varied/dotdotslash": {
-						Err: &LocalImportsError{
-							Dir:        j("varied_hidden/dotdotslash"),
-							ImportPath: "varied/dotdotslash",
-							LocalImports: []string{
-								"../github.com/golang/dep/internal/gps",
-							},
-						},
-					},
-				},
-			},
-		},
-		"invalid buildtag like comments should be ignored": {
-			fileRoot:   j("buildtag"),
-			importRoot: "buildtag",
-			out: PackageTree{
-				ImportRoot: "buildtag",
-				Packages: map[string]PackageOrErr{
-					"buildtag": {
-						P: Package{
-							ImportPath:  "buildtag",
-							CommentPath: "",
-							Name:        "buildtag",
-							Imports: []string{
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"does not skip directories starting with '.'": {
-			fileRoot:   j("dotgodir"),
-			importRoot: "dotgodir",
-			out: PackageTree{
-				ImportRoot: "dotgodir",
-				Packages: map[string]PackageOrErr{
-					"dotgodir": {
-						P: Package{
-							ImportPath: "dotgodir",
-							Imports:    []string{},
-						},
-					},
-					"dotgodir/.go": {
-						P: Package{
-							ImportPath: "dotgodir/.go",
-							Name:       "dot",
-							Imports:    []string{},
-						},
-					},
-					"dotgodir/foo.go": {
-						P: Package{
-							ImportPath: "dotgodir/foo.go",
-							Name:       "foo",
-							Imports:    []string{"sort"},
-						},
-					},
-					"dotgodir/.m1p": {
-						P: Package{
-							ImportPath:  "dotgodir/.m1p",
-							CommentPath: "",
-							Name:        "m1p",
-							Imports: []string{
-								"github.com/golang/dep/internal/gps",
-								"os",
-								"sort",
-							},
-						},
-					},
-				},
-			},
-		},
-		"canonical": {
-			fileRoot:   j("canonical"),
-			importRoot: "canonical",
-			out: PackageTree{
-				ImportRoot: "canonical",
-				Packages: map[string]PackageOrErr{
-					"canonical": {
-						P: Package{
-							ImportPath:  "canonical",
-							CommentPath: "canonical",
-							Name:        "pkg",
-							Imports:     []string{},
-						},
-					},
-					"canonical/sub": {
-						P: Package{
-							ImportPath:  "canonical/sub",
-							CommentPath: "canonical/subpackage",
-							Name:        "sub",
-							Imports:     []string{},
-						},
-					},
-				},
-			},
-		},
-		"conflicting canonical comments": {
-			fileRoot:   j("canon_confl"),
-			importRoot: "canon_confl",
-			out: PackageTree{
-				ImportRoot: "canon_confl",
-				Packages: map[string]PackageOrErr{
-					"canon_confl": {
-						Err: &ConflictingImportComments{
-							ImportPath: "canon_confl",
-							ConflictingImportComments: []string{
-								"vanity1",
-								"vanity2",
-							},
-						},
-					},
-				},
-			},
-		},
-		"non-canonical": {
-			fileRoot:   j("canonical"),
-			importRoot: "noncanonical",
-			out: PackageTree{
-				ImportRoot: "noncanonical",
-				Packages: map[string]PackageOrErr{
-					"noncanonical": PackageOrErr{
-						Err: &NonCanonicalImportRoot{
-							ImportRoot: "noncanonical",
-							Canonical:  "canonical",
-						},
-					},
-					"noncanonical/sub": PackageOrErr{
-						Err: &NonCanonicalImportRoot{
-							ImportRoot: "noncanonical",
-							Canonical:  "canonical/subpackage",
-						},
-					},
-				},
-			},
-		},
-	}
-
-	for name, fix := range table {
-		t.Run(name, func(t *testing.T) {
-			if _, err := os.Stat(fix.fileRoot); err != nil {
-				t.Errorf("error on fileRoot %s: %s", fix.fileRoot, err)
-			}
-
-			out, err := ListPackages(fix.fileRoot, fix.importRoot)
-
-			if err != nil && fix.err == nil {
-				t.Errorf("Received error but none expected: %s", err)
-			} else if fix.err != nil && err == nil {
-				t.Errorf("Error expected but none received")
-			} else if fix.err != nil && err != nil {
-				if !reflect.DeepEqual(fix.err, err) {
-					t.Errorf("Did not receive expected error:\n\t(GOT): %s\n\t(WNT): %s", err, fix.err)
-				}
-			}
-
-			if fix.out.ImportRoot != "" && fix.out.Packages != nil {
-				if !reflect.DeepEqual(out, fix.out) {
-					if fix.out.ImportRoot != out.ImportRoot {
-						t.Errorf("Expected ImportRoot %s, got %s", fix.out.ImportRoot, out.ImportRoot)
-					}
-
-					// overwrite the out one to see if we still have a real problem
-					out.ImportRoot = fix.out.ImportRoot
-
-					if !reflect.DeepEqual(out, fix.out) {
-						// TODO (kris-nova) We need to disable this bypass here, and in the .travis.yml
-						// as soon as dep#501 is fixed
-						bypass := os.Getenv("DEPTESTBYPASS501")
-						if bypass != "" {
-							t.Log("bypassing fix.out.Packages check < 2")
-						} else {
-							if len(fix.out.Packages) < 2 {
-								t.Errorf("Did not get expected PackageOrErrs:\n\t(GOT): %#v\n\t(WNT): %#v", out, fix.out)
-							} else {
-								seen := make(map[string]bool)
-								for path, perr := range fix.out.Packages {
-									seen[path] = true
-									if operr, exists := out.Packages[path]; !exists {
-										t.Errorf("Expected PackageOrErr for path %s was missing from output:\n\t%s", path, perr)
-									} else {
-										if !reflect.DeepEqual(perr, operr) {
-											t.Errorf("PkgOrErr for path %s was not as expected:\n\t(GOT): %#v\n\t(WNT): %#v", path, operr, perr)
-										}
-									}
-								}
-
-								for path, operr := range out.Packages {
-									if seen[path] {
-										continue
-									}
-
-									t.Errorf("Got PackageOrErr for path %s, but none was expected:\n\t%s", path, operr)
-								}
-							}
-						}
-					}
-				}
-			}
-		})
-	}
-}
-
-// Transform Table Test that operates solely on the varied_hidden fixture.
-func TestTrimHiddenPackages(t *testing.T) {
-	base, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "varied_hidden"), "varied")
-	if err != nil {
-		panic(err)
-	}
-
-	table := map[string]struct {
-		main, tests bool     // literal params to TrimHiddenPackages
-		ignore      []string // transformed into IgnoredRuleset param to TrimHiddenPackages
-		trimmed     []string // list of packages that should be trimmed in result PackageTree
-	}{
-		// All of these implicitly verify that the varied/_never pkg is always
-		// trimmed, and that the varied/dotdotslash pkg is not trimmed even
-		// though it has errors.
-		"minimal trim": {
-			main:  true,
-			tests: true,
-		},
-		"ignore simple, lose testdata": {
-			main:    true,
-			tests:   true,
-			ignore:  []string{"simple"},
-			trimmed: []string{"simple", "simple/testdata"},
-		},
-		"no tests": {
-			main:    true,
-			tests:   false,
-			trimmed: []string{".onlyfromtests", "_secondorder"},
-		},
-		"ignore a reachable hidden": {
-			main:    true,
-			tests:   true,
-			ignore:  []string{"_secondorder"},
-			trimmed: []string{"_secondorder"},
-		},
-		"ignore a reachable hidden with another hidden solely reachable through it": {
-			main:    true,
-			tests:   true,
-			ignore:  []string{".onlyfromtests"},
-			trimmed: []string{".onlyfromtests", "_secondorder"},
-		},
-		"no main": {
-			main:    false,
-			tests:   true,
-			trimmed: []string{"", "_frommain"},
-		},
-		"no main or tests": {
-			main:    false,
-			tests:   false,
-			trimmed: []string{"", "_frommain", ".onlyfromtests", "_secondorder"},
-		},
-		"no main or tests and ignore simple": {
-			main:    false,
-			tests:   false,
-			ignore:  []string{"simple"},
-			trimmed: []string{"", "_frommain", ".onlyfromtests", "_secondorder", "simple", "simple/testdata"},
-		},
-	}
-
-	for name, fix := range table {
-		t.Run(name, func(t *testing.T) {
-			want := base.Copy()
-
-			var ig []string
-			for _, v := range fix.ignore {
-				ig = append(ig, path.Join("varied", v))
-			}
-			got := base.TrimHiddenPackages(fix.main, fix.tests, NewIgnoredRuleset(ig))
-
-			for _, ip := range append(fix.trimmed, "_never") {
-				ip = path.Join("varied", ip)
-				if _, has := want.Packages[ip]; !has {
-					panic(fmt.Sprintf("bad input, %s does not exist in fixture ptree", ip))
-				}
-				delete(want.Packages, ip)
-			}
-
-			if !reflect.DeepEqual(want, got) {
-				if len(want.Packages) < 2 {
-					t.Errorf("Did not get expected PackageOrErrs:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-				} else {
-					seen := make(map[string]bool)
-					for path, perr := range want.Packages {
-						seen[path] = true
-						if operr, exists := got.Packages[path]; !exists {
-							t.Errorf("Expected PackageOrErr for path %s was missing from output:\n\t%s", path, perr)
-						} else {
-							if !reflect.DeepEqual(perr, operr) {
-								t.Errorf("PkgOrErr for path %s was not as expected:\n\t(GOT): %#v\n\t(WNT): %#v", path, operr, perr)
-							}
-						}
-					}
-
-					for path, operr := range got.Packages {
-						if seen[path] {
-							continue
-						}
-
-						t.Errorf("Got PackageOrErr for path %s, but none was expected:\n\t%s", path, operr)
-					}
-				}
-			}
-		})
-	}
-}
-
-// Test that ListPackages skips directories for which it lacks permissions to
-// enter and files it lacks permissions to read.
-func TestListPackagesNoPerms(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		// TODO This test doesn't work on windows because I wasn't able to easily
-		// figure out how to chmod a dir in a way that made it untraversable.
-		//
-		// It's not a big deal, though, because the os.IsPermission() call we
-		// use in the real code is effectively what's being tested here, and
-		// that's designed to be cross-platform. So, if the unix tests pass, we
-		// have every reason to believe windows tests would too, if the situation
-		// arises.
-		t.Skip()
-	}
-	tmp, err := ioutil.TempDir("", "listpkgsnp")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %s", err)
-	}
-	defer os.RemoveAll(tmp)
-
-	srcdir := filepath.Join(getTestdataRootDir(t), "src", "ren")
-	workdir := filepath.Join(tmp, "ren")
-	fs.CopyDir(srcdir, workdir)
-
-	// chmod the simple dir and m1p/b.go file so they can't be read
-	err = os.Chmod(filepath.Join(workdir, "simple"), 0)
-	if err != nil {
-		t.Fatalf("Error while chmodding simple dir: %s", err)
-	}
-	os.Chmod(filepath.Join(workdir, "m1p", "b.go"), 0)
-	if err != nil {
-		t.Fatalf("Error while chmodding b.go file: %s", err)
-	}
-
-	want := PackageTree{
-		ImportRoot: "ren",
-		Packages: map[string]PackageOrErr{
-			"ren": {
-				Err: &build.NoGoError{
-					Dir: workdir,
-				},
-			},
-			"ren/m1p": {
-				P: Package{
-					ImportPath:  "ren/m1p",
-					CommentPath: "",
-					Name:        "m1p",
-					Imports: []string{
-						"github.com/golang/dep/internal/gps",
-						"sort",
-					},
-				},
-			},
-		},
-	}
-
-	got, err := ListPackages(workdir, "ren")
-
-	if err != nil {
-		t.Fatalf("Unexpected err from ListPackages: %s", err)
-	}
-	if want.ImportRoot != got.ImportRoot {
-		t.Fatalf("Expected ImportRoot %s, got %s", want.ImportRoot, got.ImportRoot)
-	}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Did not get expected PackageOrErrs:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		if len(got.Packages) != 2 {
-			if len(got.Packages) == 3 {
-				t.Error("Wrong number of PackageOrErrs - did 'simple' subpackage make it into results somehow?")
-			} else {
-				t.Error("Wrong number of PackageOrErrs")
-			}
-		}
-
-		if got.Packages["ren"].Err == nil {
-			t.Error("Should have gotten error on empty root directory")
-		}
-
-		if !reflect.DeepEqual(got.Packages["ren/m1p"].P.Imports, want.Packages["ren/m1p"].P.Imports) {
-			t.Error("Mismatch between imports in m1p")
-		}
-	}
-}
-
-func TestToReachMap(t *testing.T) {
-	// There's enough in the 'varied' test case to test most of what matters
-	vptree, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "github.com", "example", "varied"), "github.com/example/varied")
-	if err != nil {
-		t.Fatalf("ListPackages failed on varied test case: %s", err)
-	}
-
-	// Helper to add github.com/varied/example prefix
-	b := func(s string) string {
-		if s == "" {
-			return "github.com/example/varied"
-		}
-		return "github.com/example/varied/" + s
-	}
-	bl := func(parts ...string) string {
-		for k, s := range parts {
-			parts[k] = b(s)
-		}
-		return strings.Join(parts, " ")
-	}
-
-	// Set up vars for validate closure
-	var want ReachMap
-	var name string
-	var main, tests bool
-	var ignore []string
-
-	validate := func() {
-		got, em := vptree.ToReachMap(main, tests, true, NewIgnoredRuleset(ignore))
-		if len(em) != 0 {
-			t.Errorf("Should not have any error packages from ToReachMap, got %s", em)
-		}
-		if !reflect.DeepEqual(want, got) {
-			seen := make(map[string]bool)
-			for ip, wantie := range want {
-				seen[ip] = true
-				if gotie, exists := got[ip]; !exists {
-					t.Errorf("ver(%q): expected import path %s was not present in result", name, ip)
-				} else {
-					if !reflect.DeepEqual(wantie, gotie) {
-						t.Errorf("ver(%q): did not get expected import set for pkg %s:\n\t(GOT): %#v\n\t(WNT): %#v", name, ip, gotie, wantie)
-					}
-				}
-			}
-
-			for ip, ie := range got {
-				if seen[ip] {
-					continue
-				}
-				t.Errorf("ver(%q): Got packages for import path %s, but none were expected:\n\t%s", name, ip, ie)
-			}
-		}
-	}
-
-	// maps of each internal package, and their expected external and internal
-	// imports in the maximal case.
-	allex := map[string][]string{
-		b(""):               {"encoding/binary", "github.com/Masterminds/semver", "github.com/golang/dep/internal/gps", "go/parser", "hash", "net/http", "os", "sort"},
-		b("m1p"):            {"github.com/golang/dep/internal/gps", "os", "sort"},
-		b("namemismatch"):   {"github.com/Masterminds/semver", "os"},
-		b("otherpath"):      {"github.com/golang/dep/internal/gps", "os", "sort"},
-		b("simple"):         {"encoding/binary", "github.com/golang/dep/internal/gps", "go/parser", "hash", "os", "sort"},
-		b("simple/another"): {"encoding/binary", "github.com/golang/dep/internal/gps", "hash", "os", "sort"},
-	}
-
-	allin := map[string][]string{
-		b(""):               {b("m1p"), b("namemismatch"), b("otherpath"), b("simple"), b("simple/another")},
-		b("m1p"):            {},
-		b("namemismatch"):   {},
-		b("otherpath"):      {b("m1p")},
-		b("simple"):         {b("m1p"), b("simple/another")},
-		b("simple/another"): {b("m1p")},
-	}
-
-	// build a map to validate the exception inputs. do this because shit is
-	// hard enough to keep track of that it's preferable not to have silent
-	// success if a typo creeps in and we're trying to except an import that
-	// isn't in a pkg in the first place
-	valid := make(map[string]map[string]bool)
-	for ip, expkgs := range allex {
-		m := make(map[string]bool)
-		for _, pkg := range expkgs {
-			m[pkg] = true
-		}
-		valid[ip] = m
-	}
-	validin := make(map[string]map[string]bool)
-	for ip, inpkgs := range allin {
-		m := make(map[string]bool)
-		for _, pkg := range inpkgs {
-			m[pkg] = true
-		}
-		validin[ip] = m
-	}
-
-	// helper to compose want, excepting specific packages
-	//
-	// this makes it easier to see what we're taking out on each test
-	except := func(pkgig ...string) {
-		// reinit expect with everything from all
-		want = make(ReachMap)
-		for ip, expkgs := range allex {
-			var ie struct{ Internal, External []string }
-
-			inpkgs := allin[ip]
-			lenex, lenin := len(expkgs), len(inpkgs)
-			if lenex > 0 {
-				ie.External = make([]string, len(expkgs))
-				copy(ie.External, expkgs)
-			}
-
-			if lenin > 0 {
-				ie.Internal = make([]string, len(inpkgs))
-				copy(ie.Internal, inpkgs)
-			}
-
-			want[ip] = ie
-		}
-
-		// now build the dropmap
-		drop := make(map[string]map[string]bool)
-		for _, igstr := range pkgig {
-			// split on space; first elem is import path to pkg, the rest are
-			// the imports to drop.
-			not := strings.Split(igstr, " ")
-			var ip string
-			ip, not = not[0], not[1:]
-			if _, exists := valid[ip]; !exists {
-				t.Fatalf("%s is not a package name we're working with, doofus", ip)
-			}
-
-			// if only a single elem was passed, though, drop the whole thing
-			if len(not) == 0 {
-				delete(want, ip)
-				continue
-			}
-
-			m := make(map[string]bool)
-			for _, imp := range not {
-				if strings.HasPrefix(imp, "github.com/example/varied") {
-					if !validin[ip][imp] {
-						t.Fatalf("%s is not a reachable import of %s, even in the all case", imp, ip)
-					}
-				} else {
-					if !valid[ip][imp] {
-						t.Fatalf("%s is not a reachable import of %s, even in the all case", imp, ip)
-					}
-				}
-				m[imp] = true
-			}
-
-			drop[ip] = m
-		}
-
-		for ip, ie := range want {
-			var nie struct{ Internal, External []string }
-			for _, imp := range ie.Internal {
-				if !drop[ip][imp] {
-					nie.Internal = append(nie.Internal, imp)
-				}
-			}
-
-			for _, imp := range ie.External {
-				if !drop[ip][imp] {
-					nie.External = append(nie.External, imp)
-				}
-			}
-
-			want[ip] = nie
-		}
-	}
-
-	/* PREP IS DONE, BEGIN ACTUAL TESTING */
-
-	// first, validate all
-	name = "all"
-	main, tests = true, true
-	except()
-	validate()
-
-	// turn off main pkgs, which necessarily doesn't affect anything else
-	name = "no main"
-	main = false
-	except(b(""))
-	validate()
-
-	// ignoring the "varied" pkg has same effect as disabling main pkgs
-	name = "ignore root"
-	ignore = []string{b("")}
-	main = true
-	validate()
-
-	// when we drop tests, varied/otherpath loses its link to varied/m1p and
-	// varied/simple/another loses its test import, which has a fairly big
-	// cascade
-	name = "no tests"
-	tests = false
-	ignore = nil
-	except(
-		b("")+" encoding/binary",
-		b("simple")+" encoding/binary",
-		b("simple/another")+" encoding/binary",
-		b("otherpath")+" github.com/golang/dep/internal/gps os sort",
-	)
-
-	// almost the same as previous, but varied just goes away completely
-	name = "no main or tests"
-	main = false
-	except(
-		b(""),
-		b("simple")+" encoding/binary",
-		b("simple/another")+" encoding/binary",
-		bl("otherpath", "m1p")+" github.com/golang/dep/internal/gps os sort",
-	)
-	validate()
-
-	// focus on ignores now, so reset main and tests
-	main, tests = true, true
-
-	// now, the fun stuff. punch a hole in the middle by cutting out
-	// varied/simple
-	name = "ignore varied/simple"
-	ignore = []string{b("simple")}
-	except(
-		// root pkg loses on everything in varied/simple/another
-		// FIXME this is a bit odd, but should probably exclude m1p as well,
-		// because it actually shouldn't be valid to import a package that only
-		// has tests. This whole model misses that nuance right now, though.
-		bl("", "simple", "simple/another")+" hash encoding/binary go/parser",
-		b("simple"),
-	)
-	validate()
-
-	// widen the hole by excluding otherpath
-	name = "ignore varied/{otherpath,simple}"
-	ignore = []string{
-		b("otherpath"),
-		b("simple"),
-	}
-	except(
-		// root pkg loses on everything in varied/simple/another and varied/m1p
-		bl("", "simple", "simple/another", "m1p", "otherpath")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort",
-		b("otherpath"),
-		b("simple"),
-	)
-	validate()
-
-	// remove namemismatch, though we're mostly beating a dead horse now
-	name = "ignore varied/{otherpath,simple,namemismatch}"
-	ignore = append(ignore, b("namemismatch"))
-	except(
-		// root pkg loses on everything in varied/simple/another and varied/m1p
-		bl("", "simple", "simple/another", "m1p", "otherpath", "namemismatch")+" hash encoding/binary go/parser github.com/golang/dep/internal/gps sort os github.com/Masterminds/semver",
-		b("otherpath"),
-		b("simple"),
-		b("namemismatch"),
-	)
-	validate()
-}
-
-func TestFlattenReachMap(t *testing.T) {
-	// There's enough in the 'varied' test case to test most of what matters
-	vptree, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "github.com", "example", "varied"), "github.com/example/varied")
-	if err != nil {
-		t.Fatalf("listPackages failed on varied test case: %s", err)
-	}
-
-	all := []string{
-		"encoding/binary",
-		"github.com/Masterminds/semver",
-		"github.com/golang/dep/internal/gps",
-		"go/parser",
-		"hash",
-		"net/http",
-		"os",
-		"sort",
-	}
-
-	// helper to generate testCase.expect as: all, except for a couple packages
-	//
-	// this makes it easier to see what we're taking out on each test
-	except := func(not ...string) []string {
-		expect := make([]string, len(all)-len(not))
-
-		drop := make(map[string]bool)
-		for _, npath := range not {
-			drop[npath] = true
-		}
-
-		k := 0
-		for _, path := range all {
-			if !drop[path] {
-				expect[k] = path
-				k++
-			}
-		}
-		return expect
-	}
-
-	for _, testCase := range []*flattenReachMapCase{
-		// everything on
-		{
-			name:       "simple",
-			expect:     except(),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-		},
-		// no stdlib
-		{
-			name:       "no stdlib",
-			expect:     except("encoding/binary", "go/parser", "hash", "net/http", "os", "sort"),
-			isStdLibFn: paths.IsStandardImportPath,
-			main:       true,
-			tests:      true,
-		},
-		// stdlib back in; now exclude tests, which should just cut one
-		{
-			name:       "no tests",
-			expect:     except("encoding/binary"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      false,
-		},
-		// Now skip main, which still just cuts out one
-		{
-			name:       "no main",
-			expect:     except("net/http"),
-			isStdLibFn: nil,
-			main:       false,
-			tests:      true,
-		},
-		// No test and no main, which should be additive
-		{
-			name:       "no tests, no main",
-			expect:     except("net/http", "encoding/binary"),
-			isStdLibFn: nil,
-			main:       false,
-			tests:      false,
-		},
-		// now, the ignore tests. turn main and tests back on
-		// start with non-matching
-		{
-			name:       "non-matching ignore",
-			expect:     except(),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"nomatch",
-			}),
-		},
-		// should have the same effect as ignoring main
-		{
-			name:       "ignore the root",
-			expect:     except("net/http"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied",
-			}),
-		},
-		// now drop a more interesting one
-		// we get github.com/golang/dep/internal/gps from m1p, too, so it should still be there
-		{
-			name:       "ignore simple",
-			expect:     except("go/parser"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-			}),
-		},
-		// now drop two
-		{
-			name:       "ignore simple and nameismatch",
-			expect:     except("go/parser", "github.com/Masterminds/semver"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-				"github.com/example/varied/namemismatch",
-			}),
-		},
-		// make sure tests and main play nice with ignore
-		{
-			name:       "ignore simple and nameismatch, and no tests",
-			expect:     except("go/parser", "github.com/Masterminds/semver", "encoding/binary"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      false,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-				"github.com/example/varied/namemismatch",
-			}),
-		},
-		{
-			name:       "ignore simple and namemismatch, and no main",
-			expect:     except("go/parser", "github.com/Masterminds/semver", "net/http"),
-			isStdLibFn: nil,
-			main:       false,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-				"github.com/example/varied/namemismatch",
-			}),
-		},
-		{
-			name:       "ignore simple and namemismatch, and no main or tests",
-			expect:     except("go/parser", "github.com/Masterminds/semver", "net/http", "encoding/binary"),
-			isStdLibFn: nil,
-			main:       false,
-			tests:      false,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-				"github.com/example/varied/namemismatch",
-			}),
-		},
-		// ignore two that should knock out gps
-		{
-			name:       "ignore both importers",
-			expect:     except("sort", "github.com/golang/dep/internal/gps", "go/parser"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/example/varied/simple",
-				"github.com/example/varied/m1p",
-			}),
-		},
-		// finally, directly ignore some external packages
-		{
-			name:       "ignore external",
-			expect:     except("sort", "github.com/golang/dep/internal/gps", "go/parser"),
-			isStdLibFn: nil,
-			main:       true,
-			tests:      true,
-			ignore: NewIgnoredRuleset([]string{
-				"github.com/golang/dep/internal/gps",
-				"go/parser",
-				"sort",
-			}),
-		},
-	} {
-		t.Run(testCase.name, testFlattenReachMap(&vptree, testCase))
-	}
-
-	// The only thing varied *doesn't* cover is disallowed path patterns
-	ptree, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "disallow"), "disallow")
-	if err != nil {
-		t.Fatalf("ListPackages failed on disallow test case: %s", err)
-	}
-
-	t.Run("disallowed", testFlattenReachMap(&ptree, &flattenReachMapCase{
-		name:       "disallowed",
-		expect:     []string{"github.com/golang/dep/internal/gps", "hash", "sort"},
-		isStdLibFn: nil,
-		main:       false,
-		tests:      false,
-	}))
-}
-
-type flattenReachMapCase struct {
-	expect      []string
-	name        string
-	ignore      *IgnoredRuleset
-	main, tests bool
-	isStdLibFn  func(string) bool
-}
-
-func testFlattenReachMap(ptree *PackageTree, testCase *flattenReachMapCase) func(*testing.T) {
-	return func(t *testing.T) {
-		t.Parallel()
-		rm, em := ptree.ToReachMap(testCase.main, testCase.tests, true, testCase.ignore)
-		if len(em) != 0 {
-			t.Errorf("Should not have any error pkgs from ToReachMap, got %s", em)
-		}
-		result := rm.FlattenFn(testCase.isStdLibFn)
-		if !reflect.DeepEqual(testCase.expect, result) {
-			t.Errorf("Wrong imports in %q case:\n\t(GOT): %s\n\t(WNT): %s", testCase.name, result, testCase.expect)
-		}
-	}
-}
-
-// Verify that we handle import cycles correctly - drop em all
-func TestToReachMapCycle(t *testing.T) {
-	ptree, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "cycle"), "cycle")
-	if err != nil {
-		t.Fatalf("ListPackages failed on cycle test case: %s", err)
-	}
-
-	rm, em := ptree.ToReachMap(true, true, false, nil)
-	if len(em) != 0 {
-		t.Errorf("Should not have any error packages from ToReachMap, got %s", em)
-	}
-
-	// FIXME TEMPORARILY COMMENTED UNTIL WE CREATE A BETTER LISTPACKAGES MODEL -
-	//if len(rm) > 0 {
-	//t.Errorf("should be empty reachmap when all packages are in a cycle, got %v", rm)
-	//}
-
-	if len(rm) == 0 {
-		t.Error("TEMPORARY: should ignore import cycles, but cycle was eliminated")
-	}
-}
-
-func TestToReachMapFilterDot(t *testing.T) {
-	ptree, err := ListPackages(filepath.Join(getTestdataRootDir(t), "src", "relimport"), "relimport")
-	if err != nil {
-		t.Fatalf("ListPackages failed on relimport test case: %s", err)
-	}
-
-	rm, _ := ptree.ToReachMap(true, true, false, nil)
-	if _, has := rm["relimport/dot"]; !has {
-		t.Fatal("relimport/dot should not have had errors")
-	}
-
-	imports := dedupeStrings(rm["relimport/dot"].External, rm["relimport/dot"].Internal)
-	for _, imp := range imports {
-		if imp == "." {
-			t.Fatal("dot import should have been filtered by ToReachMap")
-		}
-	}
-}
-
-func getTestdataRootDir(t *testing.T) string {
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-	return filepath.Join(cwd, "..", "_testdata")
-}
-
-// Canary regression test to make sure that if PackageTree ever gains new
-// fields, we update the Copy method accordingly.
-func TestCanaryPackageTreeCopy(t *testing.T) {
-	ptreeFields := []string{
-		"ImportRoot",
-		"Packages",
-	}
-	packageFields := []string{
-		"Name",
-		"ImportPath",
-		"CommentPath",
-		"Imports",
-		"TestImports",
-	}
-
-	fieldNames := func(typ reflect.Type) []string {
-		var names []string
-		for i := 0; i < typ.NumField(); i++ {
-			names = append(names, typ.Field(i).Name)
-		}
-		return names
-	}
-
-	ptreeRefl := fieldNames(reflect.TypeOf(PackageTree{}))
-	packageRefl := fieldNames(reflect.TypeOf(Package{}))
-
-	if !reflect.DeepEqual(ptreeFields, ptreeRefl) {
-		t.Errorf("PackageTree.Copy is designed to work with an exact set of fields in the PackageTree struct - make sure it (and this test) have been updated!\n\t(GOT):%s\n\t(WNT):%s", ptreeFields, ptreeRefl)
-	}
-
-	if !reflect.DeepEqual(packageFields, packageRefl) {
-		t.Errorf("PackageTree.Copy is designed to work with an exact set of fields in the Package struct - make sure it (and this test) have been updated!\n\t(GOT):%s\n\t(WNT):%s", packageFields, packageRefl)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/prune_test.go b/installer/vendor/github.com/golang/dep/internal/gps/prune_test.go
deleted file mode 100644
index de7791cd77..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/prune_test.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"log"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestPruneUnusedPackages(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir(".")
-
-	pr := "github.com/test/project"
-	pi := ProjectIdentifier{ProjectRoot: ProjectRoot(pr)}
-
-	testcases := []struct {
-		name string
-		lp   LockedProject
-		fs   fsTestCase
-		err  bool
-	}{
-		{
-			"one-package",
-			LockedProject{
-				pi:   pi,
-				pkgs: []string{"."},
-			},
-			fsTestCase{
-				before: filesystemState{
-					files: []fsPath{
-						{"main.go"},
-					},
-				},
-				after: filesystemState{
-					files: []fsPath{
-						{"main.go"},
-					},
-				},
-			},
-			false,
-		},
-		{
-			"nested-package",
-			LockedProject{
-				pi:   pi,
-				pkgs: []string{"pkg"},
-			},
-			fsTestCase{
-				before: filesystemState{
-					dirs: []fsPath{
-						{"pkg"},
-					},
-					files: []fsPath{
-						{"main.go"},
-						{"pkg", "main.go"},
-					},
-				},
-				after: filesystemState{
-					dirs: []fsPath{
-						{"pkg"},
-					},
-					files: []fsPath{
-						{"pkg", "main.go"},
-					},
-				},
-			},
-			false,
-		},
-		{
-			"complex-project",
-			LockedProject{
-				pi:   pi,
-				pkgs: []string{"pkg", "pkg/nestedpkg/otherpkg"},
-			},
-			fsTestCase{
-				before: filesystemState{
-					dirs: []fsPath{
-						{"pkg"},
-						{"pkg", "nestedpkg"},
-						{"pkg", "nestedpkg", "otherpkg"},
-					},
-					files: []fsPath{
-						{"main.go"},
-						{"COPYING"},
-						{"pkg", "main.go"},
-						{"pkg", "nestedpkg", "main.go"},
-						{"pkg", "nestedpkg", "PATENT.md"},
-						{"pkg", "nestedpkg", "otherpkg", "main.go"},
-					},
-				},
-				after: filesystemState{
-					dirs: []fsPath{
-						{"pkg"},
-						{"pkg", "nestedpkg"},
-						{"pkg", "nestedpkg", "otherpkg"},
-					},
-					files: []fsPath{
-						{"COPYING"},
-						{"pkg", "main.go"},
-						{"pkg", "nestedpkg", "PATENT.md"},
-						{"pkg", "nestedpkg", "otherpkg", "main.go"},
-					},
-				},
-			},
-			false,
-		},
-	}
-
-	logger := log.New(ioutil.Discard, "", 0)
-
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			h.TempDir(pr)
-			projectDir := h.Path(pr)
-			tc.fs.before.root = projectDir
-			tc.fs.after.root = projectDir
-
-			tc.fs.before.setup(t)
-
-			err := pruneUnusedPackages(tc.lp, projectDir, logger)
-			if tc.err && err == nil {
-				t.Errorf("expected an error, got nil")
-			} else if !tc.err && err != nil {
-				t.Errorf("unexpected error: %s", err)
-			}
-
-			tc.fs.after.assert(t)
-		})
-	}
-}
-
-func TestPruneNonGoFiles(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir(".")
-
-	testcases := []struct {
-		name string
-		fs   fsTestCase
-		err  bool
-	}{
-		{
-			"one-file",
-			fsTestCase{
-				before: filesystemState{
-					files: []fsPath{
-						{"README.md"},
-					},
-				},
-				after: filesystemState{},
-			},
-			false,
-		},
-		{
-			"multiple-files",
-			fsTestCase{
-				before: filesystemState{
-					files: []fsPath{
-						{"main.go"},
-						{"main_test.go"},
-						{"README"},
-					},
-				},
-				after: filesystemState{
-					files: []fsPath{
-						{"main.go"},
-						{"main_test.go"},
-					},
-				},
-			},
-			false,
-		},
-		{
-			"mixed-files",
-			fsTestCase{
-				before: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-					files: []fsPath{
-						{"dir", "main.go"},
-						{"dir", "main_test.go"},
-						{"dir", "db.sqlite"},
-					},
-				},
-				after: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-					files: []fsPath{
-						{"dir", "main.go"},
-						{"dir", "main_test.go"},
-					},
-				},
-			},
-			false,
-		},
-	}
-
-	logger := log.New(ioutil.Discard, "", 0)
-
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			h.TempDir(tc.name)
-			baseDir := h.Path(tc.name)
-			tc.fs.before.root = baseDir
-			tc.fs.after.root = baseDir
-
-			tc.fs.before.setup(t)
-
-			err := pruneNonGoFiles(baseDir, logger)
-			if tc.err && err == nil {
-				t.Errorf("expected an error, got nil")
-			} else if !tc.err && err != nil {
-				t.Errorf("unexpected error: %s", err)
-			}
-
-			tc.fs.after.assert(t)
-		})
-	}
-}
-
-func TestPruneGoTestFiles(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir(".")
-
-	testcases := []struct {
-		name string
-		fs   fsTestCase
-		err  bool
-	}{
-		{
-			"one-test-file",
-			fsTestCase{
-				before: filesystemState{
-					files: []fsPath{
-						{"main_test.go"},
-					},
-				},
-				after: filesystemState{},
-			},
-			false,
-		},
-		{
-			"multiple-files",
-			fsTestCase{
-				before: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-					files: []fsPath{
-						{"dir", "main_test.go"},
-						{"dir", "main2_test.go"},
-					},
-				},
-				after: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-				},
-			},
-			false,
-		},
-		{
-			"mixed-files",
-			fsTestCase{
-				before: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-					files: []fsPath{
-						{"dir", "main.go"},
-						{"dir", "main2.go"},
-						{"dir", "main_test.go"},
-						{"dir", "main2_test.go"},
-					},
-				},
-				after: filesystemState{
-					dirs: []fsPath{
-						{"dir"},
-					},
-					files: []fsPath{
-						{"dir", "main.go"},
-						{"dir", "main2.go"},
-					},
-				},
-			},
-			false,
-		},
-	}
-
-	logger := log.New(ioutil.Discard, "", 0)
-
-	for _, tc := range testcases {
-		t.Run(tc.name, func(t *testing.T) {
-			h.TempDir(tc.name)
-			baseDir := h.Path(tc.name)
-			tc.fs.before.root = baseDir
-			tc.fs.after.root = baseDir
-
-			tc.fs.before.setup(t)
-
-			err := pruneGoTestFiles(baseDir, logger)
-			if tc.err && err == nil {
-				t.Errorf("expected an error, got nil")
-			} else if !tc.err && err != nil {
-				t.Errorf("unexpected error: %s", err)
-			}
-
-			tc.fs.after.assert(t)
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/rootdata_test.go b/installer/vendor/github.com/golang/dep/internal/gps/rootdata_test.go
deleted file mode 100644
index 7890669b8b..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/rootdata_test.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-)
-
-func TestRootdataExternalImports(t *testing.T) {
-	fix := basicFixtures["shared dependency with overlapping constraints"]
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	is, err := Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-	rd := is.(*solver).rd
-
-	want := []string{"a", "b"}
-	got := rd.externalImportList(params.stdLibFn)
-	if !reflect.DeepEqual(want, got) {
-		t.Errorf("Unexpected return from rootdata.externalImportList:\n\t(GOT): %s\n\t(WNT): %s", got, want)
-	}
-
-	// Add a require
-	rd.req["c"] = true
-
-	want = []string{"a", "b", "c"}
-	got = rd.externalImportList(params.stdLibFn)
-	if !reflect.DeepEqual(want, got) {
-		t.Errorf("Unexpected return from rootdata.externalImportList:\n\t(GOT): %s\n\t(WNT): %s", got, want)
-	}
-
-	// Add same path as import
-	poe := rd.rpt.Packages["root"]
-	poe.P.Imports = []string{"a", "b", "c"}
-	rd.rpt.Packages["root"] = poe
-
-	// should still be the same
-	got = rd.externalImportList(params.stdLibFn)
-	if !reflect.DeepEqual(want, got) {
-		t.Errorf("Unexpected return from rootdata.externalImportList:\n\t(GOT): %s\n\t(WNT): %s", got, want)
-	}
-
-	// Add an ignore, but not on the required path (Prepare makes that
-	// combination impossible)
-
-	rd.ir = pkgtree.NewIgnoredRuleset([]string{"b"})
-	want = []string{"a", "c"}
-	got = rd.externalImportList(params.stdLibFn)
-	if !reflect.DeepEqual(want, got) {
-		t.Errorf("Unexpected return from rootdata.externalImportList:\n\t(GOT): %s\n\t(WNT): %s", got, want)
-	}
-}
-
-func TestGetApplicableConstraints(t *testing.T) {
-	fix := basicFixtures["shared dependency with overlapping constraints"]
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		ProjectAnalyzer: naiveAnalyzer{},
-		stdLibFn:        func(string) bool { return false },
-		mkBridgeFn:      overrideMkBridge,
-	}
-
-	is, err := Prepare(params, newdepspecSM(fix.ds, nil))
-	if err != nil {
-		t.Fatalf("Unexpected error while prepping solver: %s", err)
-	}
-	rd := is.(*solver).rd
-
-	table := []struct {
-		name   string
-		mut    func()
-		result []workingConstraint
-	}{
-		{
-			name: "base case, two constraints",
-			mut:  func() {},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-			},
-		},
-		{
-			name: "with unconstrained require",
-			mut: func() {
-				// No constraint means it doesn't show up
-				rd.req["c"] = true
-			},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-			},
-		},
-		{
-			name: "with unconstrained import",
-			mut: func() {
-				// Again, no constraint means it doesn't show up
-				poe := rd.rpt.Packages["root"]
-				poe.P.Imports = []string{"a", "b", "d"}
-				rd.rpt.Packages["root"] = poe
-			},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-			},
-		},
-		{
-			name: "constraint on required",
-			mut: func() {
-				rd.rm.Deps["c"] = ProjectProperties{
-					Constraint: NewBranch("foo"),
-				}
-			},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("c"),
-					Constraint: NewBranch("foo"),
-				},
-			},
-		},
-		{
-			name: "override on imported",
-			mut: func() {
-				rd.ovr["d"] = ProjectProperties{
-					Constraint: NewBranch("bar"),
-				}
-			},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("c"),
-					Constraint: NewBranch("foo"),
-				},
-				{
-					Ident:           mkPI("d"),
-					Constraint:      NewBranch("bar"),
-					overrConstraint: true,
-				},
-			},
-		},
-		{
-			// It is certainly the simplest and most rule-abiding solution to
-			// drop the constraint in this case, but is there a chance it would
-			// violate the principle of least surprise?
-			name: "ignore imported and overridden pkg",
-			mut: func() {
-				rd.ir = pkgtree.NewIgnoredRuleset([]string{"d"})
-			},
-			result: []workingConstraint{
-				{
-					Ident:      mkPI("a"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("b"),
-					Constraint: mkSVC("1.0.0"),
-				},
-				{
-					Ident:      mkPI("c"),
-					Constraint: NewBranch("foo"),
-				},
-			},
-		},
-	}
-
-	for _, fix := range table {
-		t.Run(fix.name, func(t *testing.T) {
-			fix.mut()
-
-			got := rd.getApplicableConstraints(params.stdLibFn)
-			if !reflect.DeepEqual(fix.result, got) {
-				t.Errorf("unexpected applicable constraint set:\n\t(GOT): %+v\n\t(WNT): %+v", got, fix.result)
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/selection_test.go b/installer/vendor/github.com/golang/dep/internal/gps/selection_test.go
deleted file mode 100644
index 13c4aabf14..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/selection_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"reflect"
-	"testing"
-)
-
-// Regression test for https://github.com/sdboyer/gps/issues/174
-func TestUnselectedRemoval(t *testing.T) {
-	// We don't need a comparison function for this test
-	bmi1 := bimodalIdentifier{
-		id: mkPI("foo"),
-		pl: []string{"foo", "bar"},
-	}
-	bmi2 := bimodalIdentifier{
-		id: mkPI("foo"),
-		pl: []string{"foo", "bar", "baz"},
-	}
-	bmi3 := bimodalIdentifier{
-		id: mkPI("foo"),
-		pl: []string{"foo"},
-	}
-
-	u := &unselected{
-		sl: []bimodalIdentifier{bmi1, bmi2, bmi3},
-	}
-
-	u.remove(bimodalIdentifier{
-		id: mkPI("other"),
-		pl: []string{"other"},
-	})
-
-	if len(u.sl) != 3 {
-		t.Fatalf("len of unselected slice should have been 2 after no-op removal, got %v", len(u.sl))
-	}
-
-	u.remove(bmi3)
-	want := []bimodalIdentifier{bmi1, bmi2}
-	if len(u.sl) != 2 {
-		t.Fatalf("removal of matching bmi did not work, slice should have 2 items but has %v", len(u.sl))
-	}
-	if !reflect.DeepEqual(u.sl, want) {
-		t.Fatalf("wrong item removed from slice:\n\t(GOT): %v\n\t(WNT): %v", u.sl, want)
-	}
-
-	u.remove(bmi3)
-	if len(u.sl) != 2 {
-		t.Fatalf("removal of bmi w/non-matching packages should be a no-op but wasn't; slice should have 2 items but has %v", len(u.sl))
-	}
-
-	u.remove(bmi2)
-	want = []bimodalIdentifier{bmi1}
-	if len(u.sl) != 1 {
-		t.Fatalf("removal of matching bmi did not work, slice should have 1 items but has %v", len(u.sl))
-	}
-	if !reflect.DeepEqual(u.sl, want) {
-		t.Fatalf("wrong item removed from slice:\n\t(GOT): %v\n\t(WNT): %v", u.sl, want)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/solution_test.go b/installer/vendor/github.com/golang/dep/internal/gps/solution_test.go
deleted file mode 100644
index d044f12ad3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/solution_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func discardLogger() *log.Logger {
-	return log.New(ioutil.Discard, "", 0)
-}
-
-var basicResult solution
-
-func pi(n string) ProjectIdentifier {
-	return ProjectIdentifier{
-		ProjectRoot: ProjectRoot(n),
-	}
-}
-
-func init() {
-	basicResult = solution{
-		att: 1,
-		p: []LockedProject{
-			pa2lp(atom{
-				id: pi("github.com/sdboyer/testrepo"),
-				v:  NewBranch("master").Pair(Revision("4d59fb584b15a94d7401e356d2875c472d76ef45")),
-			}, nil),
-			pa2lp(atom{
-				id: pi("github.com/Masterminds/VCSTestRepo"),
-				v:  NewVersion("1.0.0").Pair(Revision("30605f6ac35fcb075ad0bfa9296f90a7d891523e")),
-			}, nil),
-		},
-	}
-	basicResult.analyzerInfo = (naiveAnalyzer{}).Info()
-
-	// Just in case something needs punishing, kubernetes offers a complex,
-	// real-world set of dependencies, and this revision is known to work.
-	/*
-		_ = atom{
-			id: pi("github.com/kubernetes/kubernetes"),
-			v:  NewVersion("1.0.0").Pair(Revision("528f879e7d3790ea4287687ef0ab3f2a01cc2718")),
-		}
-	*/
-}
-
-func testWriteDepTree(t *testing.T) {
-	t.Parallel()
-
-	// This test is a bit slow, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping dep tree writing test in short mode")
-	}
-	requiresBins(t, "git", "hg", "bzr")
-
-	tmp, err := ioutil.TempDir("", "writetree")
-	if err != nil {
-		t.Fatalf("Failed to create temp dir: %s", err)
-	}
-	defer os.RemoveAll(tmp)
-
-	r := solution{
-		att: 1,
-		p: []LockedProject{
-			pa2lp(atom{
-				id: pi("github.com/sdboyer/testrepo"),
-				v:  NewBranch("master").Pair(Revision("4d59fb584b15a94d7401e356d2875c472d76ef45")),
-			}, nil),
-			pa2lp(atom{
-				id: pi("launchpad.net/govcstestbzrrepo"),
-				v:  NewVersion("1.0.0").Pair(Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68")),
-			}, nil),
-			pa2lp(atom{
-				id: pi("bitbucket.org/sdboyer/withbm"),
-				v:  NewVersion("v1.0.0").Pair(Revision("aa110802a0c64195d0a6c375c9f66668827c90b4")),
-			}, nil),
-		},
-	}
-
-	sm, clean := mkNaiveSM(t)
-	defer clean()
-
-	// Trigger simultaneous fetch of all three to speed up test execution time
-	for _, p := range r.p {
-		go func(pi ProjectIdentifier) {
-			sm.SyncSourceFor(pi)
-		}(p.pi)
-	}
-
-	// nil lock/result should err immediately
-	err = WriteDepTree(tmp, nil, sm, true, discardLogger())
-	if err == nil {
-		t.Errorf("Should error if nil lock is passed to WriteDepTree")
-	}
-
-	err = WriteDepTree(tmp, r, sm, true, discardLogger())
-	if err != nil {
-		t.Errorf("Unexpected error while creating vendor tree: %s", err)
-	}
-
-	if _, err = os.Stat(filepath.Join(tmp, "github.com", "sdboyer", "testrepo")); err != nil {
-		t.Errorf("Directory for github.com/sdboyer/testrepo does not exist")
-	}
-	if _, err = os.Stat(filepath.Join(tmp, "launchpad.net", "govcstestbzrrepo")); err != nil {
-		t.Errorf("Directory for launchpad.net/govcstestbzrrepo does not exist")
-	}
-	if _, err = os.Stat(filepath.Join(tmp, "bitbucket.org", "sdboyer", "withbm")); err != nil {
-		t.Errorf("Directory for bitbucket.org/sdboyer/withbm does not exist")
-	}
-}
-
-func BenchmarkCreateVendorTree(b *testing.B) {
-	// We're fs-bound here, so restrict to single parallelism
-	b.SetParallelism(1)
-
-	r := basicResult
-	tmp := path.Join(os.TempDir(), "vsolvtest")
-
-	clean := true
-	sm, err := NewSourceManager(SourceManagerConfig{
-		Cachedir: path.Join(tmp, "cache"),
-		Logger:   log.New(test.Writer{TB: b}, "", 0),
-	})
-	if err != nil {
-		b.Errorf("failed to create SourceManager: %q", err)
-		clean = false
-	}
-
-	// Prefetch the projects before timer starts
-	for _, lp := range r.p {
-		err := sm.SyncSourceFor(lp.Ident())
-		if err != nil {
-			b.Errorf("failed getting project info during prefetch: %s", err)
-			clean = false
-		}
-	}
-
-	if clean {
-		logger := discardLogger()
-		b.ResetTimer()
-		b.StopTimer()
-		exp := path.Join(tmp, "export")
-		for i := 0; i < b.N; i++ {
-			// Order the loop this way to make it easy to disable final cleanup, to
-			// ease manual inspection
-			os.RemoveAll(exp)
-			b.StartTimer()
-			err = WriteDepTree(exp, r, sm, true, logger)
-			b.StopTimer()
-			if err != nil {
-				b.Errorf("unexpected error after %v iterations: %s", i, err)
-				break
-			}
-		}
-	}
-
-	sm.Release()
-	os.RemoveAll(tmp) // comment this to leave temp dir behind for inspection
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/solve_basic_test.go b/installer/vendor/github.com/golang/dep/internal/gps/solve_basic_test.go
deleted file mode 100644
index 1936487718..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/solve_basic_test.go
+++ /dev/null
@@ -1,1596 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"regexp"
-	"strings"
-
-	"github.com/Masterminds/semver"
-	"github.com/golang/dep/internal/gps/pkgtree"
-)
-
-var regfrom = regexp.MustCompile(`^(\w*) from (\w*) ([0-9\.\*]*)`)
-
-// nvSplit splits an "info" string on " " into the pair of name and
-// version/constraint, and returns each individually.
-//
-// This is for narrow use - panics if there are less than two resulting items in
-// the slice.
-func nvSplit(info string) (id ProjectIdentifier, version string) {
-	if strings.Contains(info, " from ") {
-		parts := regfrom.FindStringSubmatch(info)
-		info = parts[1] + " " + parts[3]
-		id.Source = parts[2]
-	}
-
-	s := strings.SplitN(info, " ", 2)
-	if len(s) < 2 {
-		panic(fmt.Sprintf("Malformed name/version info string '%s'", info))
-	}
-
-	id.ProjectRoot, version = ProjectRoot(s[0]), s[1]
-	return
-}
-
-// nvrSplit splits an "info" string on " " into the triplet of name,
-// version/constraint, and revision, and returns each individually.
-//
-// It will work fine if only name and version/constraint are provided.
-//
-// This is for narrow use - panics if there are less than two resulting items in
-// the slice.
-func nvrSplit(info string) (id ProjectIdentifier, version string, revision Revision) {
-	if strings.Contains(info, " from ") {
-		parts := regfrom.FindStringSubmatch(info)
-		info = fmt.Sprintf("%s %s", parts[1], parts[3])
-		id.Source = parts[2]
-	}
-
-	s := strings.SplitN(info, " ", 3)
-	if len(s) < 2 {
-		panic(fmt.Sprintf("Malformed name/version info string '%s'", info))
-	}
-
-	id.ProjectRoot, version = ProjectRoot(s[0]), s[1]
-
-	if len(s) == 3 {
-		revision = Revision(s[2])
-	}
-	return
-}
-
-// mkAtom splits the input string on a space, and uses the first two elements as
-// the project identifier and version, respectively.
-//
-// The version segment may have a leading character indicating the type of
-// version to create:
-//
-//  p: create a "plain" (non-semver) version.
-//  b: create a branch version.
-//  r: create a revision.
-//
-// No prefix is assumed to indicate a semver version.
-//
-// If a third space-delimited element is provided, it will be interepreted as a
-// revision, and used as the underlying version in a PairedVersion. No prefix
-// should be provided in this case. It is an error (and will panic) to try to
-// pass a revision with an underlying revision.
-func mkAtom(info string) atom {
-	// if info is "root", special case it to use the root "version"
-	if info == "root" {
-		return atom{
-			id: ProjectIdentifier{
-				ProjectRoot: ProjectRoot("root"),
-			},
-			v: rootRev,
-		}
-	}
-
-	id, ver, rev := nvrSplit(info)
-
-	var v Version
-	switch ver[0] {
-	case 'r':
-		if rev != "" {
-			panic("Cannot pair a revision with a revision")
-		}
-		v = Revision(ver[1:])
-	case 'p':
-		v = NewVersion(ver[1:])
-	case 'b':
-		v = NewBranch(ver[1:])
-	default:
-		_, err := semver.NewVersion(ver)
-		if err != nil {
-			// don't want to allow bad test data at this level, so just panic
-			panic(fmt.Sprintf("Error when converting '%s' into semver: %s", ver, err))
-		}
-		v = NewVersion(ver)
-	}
-
-	if rev != "" {
-		v = v.(UnpairedVersion).Pair(rev)
-	}
-
-	return atom{
-		id: id,
-		v:  v,
-	}
-}
-
-// mkPCstrnt splits the input string on a space, and uses the first two elements
-// as the project identifier and constraint body, respectively.
-//
-// The constraint body may have a leading character indicating the type of
-// version to create:
-//
-//  p: create a "plain" (non-semver) version.
-//  b: create a branch version.
-//  r: create a revision.
-//
-// If no leading character is used, a semver constraint is assumed.
-func mkPCstrnt(info string) ProjectConstraint {
-	id, ver, rev := nvrSplit(info)
-
-	var c Constraint
-	switch ver[0] {
-	case 'r':
-		c = Revision(ver[1:])
-	case 'p':
-		c = NewVersion(ver[1:])
-	case 'b':
-		c = NewBranch(ver[1:])
-	default:
-		// Without one of those leading characters, we know it's a proper semver
-		// expression, so use the other parser that doesn't look for a rev
-		rev = ""
-		id, ver = nvSplit(info)
-		var err error
-		c, err = NewSemverConstraint(ver)
-		if err != nil {
-			// don't want bad test data at this level, so just panic
-			panic(fmt.Sprintf("Error when converting '%s' into semver constraint: %s (full info: %s)", ver, err, info))
-		}
-	}
-
-	// There's no practical reason that a real tool would need to produce a
-	// constraint that's a PairedVersion, but it is a possibility admitted by the
-	// system, so we at least allow for it in our testing harness.
-	if rev != "" {
-		// Of course, this *will* panic if the predicate is a revision or a
-		// semver constraint, neither of which implement UnpairedVersion. This
-		// is as intended, to prevent bad data from entering the system.
-		c = c.(UnpairedVersion).Pair(rev)
-	}
-
-	return ProjectConstraint{
-		Ident:      id,
-		Constraint: c,
-	}
-}
-
-// mkCDep composes a completeDep struct from the inputs.
-//
-// The only real work here is passing the initial string to mkPDep. All the
-// other args are taken as package names.
-func mkCDep(pdep string, pl ...string) completeDep {
-	pc := mkPCstrnt(pdep)
-	return completeDep{
-		workingConstraint: workingConstraint{
-			Ident:      pc.Ident,
-			Constraint: pc.Constraint,
-		},
-		pl: pl,
-	}
-}
-
-// A depspec is a fixture representing all the information a SourceManager would
-// ordinarily glean directly from interrogating a repository.
-type depspec struct {
-	n    ProjectRoot
-	v    Version
-	deps []ProjectConstraint
-	pkgs []tpkg
-}
-
-// mkDepspec creates a depspec by processing a series of strings, each of which
-// contains an identiifer and version information.
-//
-// The first string is broken out into the name and version of the package being
-// described - see the docs on mkAtom for details. subsequent strings are
-// interpreted as dep constraints of that dep at that version. See the docs on
-// mkPDep for details.
-func mkDepspec(pi string, deps ...string) depspec {
-	pa := mkAtom(pi)
-	if string(pa.id.ProjectRoot) != pa.id.Source && pa.id.Source != "" {
-		panic("alternate source on self makes no sense")
-	}
-
-	ds := depspec{
-		n: pa.id.ProjectRoot,
-		v: pa.v,
-	}
-
-	for _, dep := range deps {
-		ds.deps = append(ds.deps, mkPCstrnt(dep))
-	}
-
-	return ds
-}
-
-func mkDep(atom, pdep string, pl ...string) dependency {
-	return dependency{
-		depender: mkAtom(atom),
-		dep:      mkCDep(pdep, pl...),
-	}
-}
-
-func mkADep(atom, pdep string, c Constraint, pl ...string) dependency {
-	return dependency{
-		depender: mkAtom(atom),
-		dep: completeDep{
-			workingConstraint: workingConstraint{
-				Ident: ProjectIdentifier{
-					ProjectRoot: ProjectRoot(pdep),
-				},
-				Constraint: c,
-			},
-			pl: pl,
-		},
-	}
-}
-
-// mkPI creates a ProjectIdentifier with the ProjectRoot as the provided
-// string, and the Source unset.
-//
-// Call normalize() on the returned value if you need the Source to be be
-// equal to the ProjectRoot.
-func mkPI(root string) ProjectIdentifier {
-	return ProjectIdentifier{
-		ProjectRoot: ProjectRoot(root),
-	}
-}
-
-// mkSVC creates a new semver constraint, panicking if an error is returned.
-func mkSVC(body string) Constraint {
-	c, err := NewSemverConstraint(body)
-	if err != nil {
-		panic(fmt.Sprintf("Error while trying to create semver constraint from %s: %s", body, err.Error()))
-	}
-	return c
-}
-
-// mklock makes a fixLock, suitable to act as a lock file
-func mklock(pairs ...string) fixLock {
-	l := make(fixLock, 0)
-	for _, s := range pairs {
-		pa := mkAtom(s)
-		l = append(l, NewLockedProject(pa.id, pa.v, nil))
-	}
-
-	return l
-}
-
-// mkrevlock makes a fixLock, suitable to act as a lock file, with only a name
-// and a rev
-func mkrevlock(pairs ...string) fixLock {
-	l := make(fixLock, 0)
-	for _, s := range pairs {
-		pa := mkAtom(s)
-		l = append(l, NewLockedProject(pa.id, pa.v.(PairedVersion).Revision(), nil))
-	}
-
-	return l
-}
-
-// mksolution creates a map of project identifiers to their LockedProject
-// result, which is sufficient to act as a solution fixture for the purposes of
-// most tests.
-//
-// Either strings or LockedProjects can be provided. If a string is provided, it
-// is assumed that we're in the default, "basic" case where there is exactly one
-// package in a project, and it is the root of the project - meaning that only
-// the "." package should be listed. If a LockedProject is provided (e.g. as
-// returned from mklp()), then it's incorporated directly.
-//
-// If any other type is provided, the func will panic.
-func mksolution(inputs ...interface{}) map[ProjectIdentifier]LockedProject {
-	m := make(map[ProjectIdentifier]LockedProject)
-	for _, in := range inputs {
-		switch t := in.(type) {
-		case string:
-			a := mkAtom(t)
-			m[a.id] = NewLockedProject(a.id, a.v, []string{"."})
-		case LockedProject:
-			m[t.pi] = t
-		default:
-			panic(fmt.Sprintf("unexpected input to mksolution: %T %s", in, in))
-		}
-	}
-
-	return m
-}
-
-// mklp creates a LockedProject from string inputs
-func mklp(pair string, pkgs ...string) LockedProject {
-	a := mkAtom(pair)
-	return NewLockedProject(a.id, a.v, pkgs)
-}
-
-// computeBasicReachMap takes a depspec and computes a reach map which is
-// identical to the explicit depgraph.
-//
-// Using a reachMap here is overkill for what the basic fixtures actually need,
-// but we use it anyway for congruence with the more general cases.
-func computeBasicReachMap(ds []depspec) reachMap {
-	rm := make(reachMap)
-
-	for k, d := range ds {
-		n := string(d.n)
-		lm := map[string][]string{
-			n: nil,
-		}
-		v := d.v
-		if k == 0 {
-			// Put the root in with a nil rev, to accommodate the solver
-			v = nil
-		}
-		rm[pident{n: d.n, v: v}] = lm
-
-		for _, dep := range d.deps {
-			lm[n] = append(lm[n], string(dep.Ident.ProjectRoot))
-		}
-	}
-
-	return rm
-}
-
-type pident struct {
-	n ProjectRoot
-	v Version
-}
-
-type specfix interface {
-	name() string
-	rootmanifest() RootManifest
-	rootTree() pkgtree.PackageTree
-	specs() []depspec
-	maxTries() int
-	solution() map[ProjectIdentifier]LockedProject
-	failure() error
-}
-
-// A basicFixture is a declarative test fixture that can cover a wide variety of
-// solver cases. All cases, however, maintain one invariant: package == project.
-// There are no subpackages, and so it is impossible for them to trigger or
-// require bimodal solving.
-//
-// This type is separate from bimodalFixture in part for legacy reasons - many
-// of these were adapted from similar tests in dart's pub lib, where there is no
-// such thing as "bimodal solving".
-//
-// But it's also useful to keep them separate because bimodal solving involves
-// considerably more complexity than simple solving, both in terms of fixture
-// declaration and actual solving mechanics. Thus, we gain a lot of value for
-// contributors and maintainers by keeping comprehension costs relatively low
-// while still covering important cases.
-type basicFixture struct {
-	// name of this fixture datum
-	n string
-	// depspecs. always treat first as root
-	ds []depspec
-	// results; map of name/atom pairs
-	r map[ProjectIdentifier]LockedProject
-	// max attempts the solver should need to find solution. 0 means no limit
-	maxAttempts int
-	// Use downgrade instead of default upgrade sorter
-	downgrade bool
-	// lock file simulator, if one's to be used at all
-	l fixLock
-	// solve failure expected, if any
-	fail error
-	// overrides, if any
-	ovr ProjectConstraints
-	// request up/downgrade to all projects
-	changeall bool
-	// individual projects to change
-	changelist []ProjectRoot
-	// if the fixture is currently broken/expected to fail, this has a message
-	// recording why
-	broken string
-}
-
-func (f basicFixture) name() string {
-	return f.n
-}
-
-func (f basicFixture) specs() []depspec {
-	return f.ds
-}
-
-func (f basicFixture) maxTries() int {
-	return f.maxAttempts
-}
-
-func (f basicFixture) solution() map[ProjectIdentifier]LockedProject {
-	return f.r
-}
-
-func (f basicFixture) rootmanifest() RootManifest {
-	return simpleRootManifest{
-		c:   pcSliceToMap(f.ds[0].deps),
-		ovr: f.ovr,
-	}
-}
-
-func (f basicFixture) rootTree() pkgtree.PackageTree {
-	var imp []string
-	for _, dep := range f.ds[0].deps {
-		imp = append(imp, string(dep.Ident.ProjectRoot))
-	}
-
-	n := string(f.ds[0].n)
-	pt := pkgtree.PackageTree{
-		ImportRoot: n,
-		Packages: map[string]pkgtree.PackageOrErr{
-			string(n): {
-				P: pkgtree.Package{
-					ImportPath: n,
-					Name:       n,
-					Imports:    imp,
-				},
-			},
-		},
-	}
-
-	return pt
-}
-
-func (f basicFixture) failure() error {
-	return f.fail
-}
-
-// A table of basicFixtures, used in the basic solving test set.
-var basicFixtures = map[string]basicFixture{
-	// basic fixtures
-	"no dependencies": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0"),
-		},
-		r: mksolution(),
-	},
-	"simple dependency tree": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 1.0.0", "aa 1.0.0", "ab 1.0.0"),
-			mkDepspec("aa 1.0.0"),
-			mkDepspec("ab 1.0.0"),
-			mkDepspec("b 1.0.0", "ba 1.0.0", "bb 1.0.0"),
-			mkDepspec("ba 1.0.0"),
-			mkDepspec("bb 1.0.0"),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"aa 1.0.0",
-			"ab 1.0.0",
-			"b 1.0.0",
-			"ba 1.0.0",
-			"bb 1.0.0",
-		),
-	},
-	"shared dependency with overlapping constraints": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 1.0.0", "shared >=2.0.0, <4.0.0"),
-			mkDepspec("b 1.0.0", "shared >=3.0.0, <5.0.0"),
-			mkDepspec("shared 2.0.0"),
-			mkDepspec("shared 3.0.0"),
-			mkDepspec("shared 3.6.9"),
-			mkDepspec("shared 4.0.0"),
-			mkDepspec("shared 5.0.0"),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-			"shared 3.6.9",
-		),
-	},
-	"downgrade on overlapping constraints": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 1.0.0", "shared >=2.0.0, <=4.0.0"),
-			mkDepspec("b 1.0.0", "shared >=3.0.0, <5.0.0"),
-			mkDepspec("shared 2.0.0"),
-			mkDepspec("shared 3.0.0"),
-			mkDepspec("shared 3.6.9"),
-			mkDepspec("shared 4.0.0"),
-			mkDepspec("shared 5.0.0"),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-			"shared 3.0.0",
-		),
-		downgrade: true,
-	},
-	"shared dependency where dependent version in turn affects other dependencies": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo <=1.0.2", "bar 1.0.0"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 1.0.1", "bang 1.0.0"),
-			mkDepspec("foo 1.0.2", "whoop 1.0.0"),
-			mkDepspec("foo 1.0.3", "zoop 1.0.0"),
-			mkDepspec("bar 1.0.0", "foo <=1.0.1"),
-			mkDepspec("bang 1.0.0"),
-			mkDepspec("whoop 1.0.0"),
-			mkDepspec("zoop 1.0.0"),
-		},
-		r: mksolution(
-			"foo 1.0.1",
-			"bar 1.0.0",
-			"bang 1.0.0",
-		),
-	},
-	"removed dependency": {
-		ds: []depspec{
-			mkDepspec("root 1.0.0", "foo 1.0.0", "bar *"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 2.0.0"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 2.0.0", "baz 1.0.0"),
-			mkDepspec("baz 1.0.0", "foo 2.0.0"),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-		),
-		maxAttempts: 2,
-	},
-	// fixtures with locks
-	"with compatible locked dependency": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.1",
-			"bar 1.0.1",
-		),
-	},
-	"upgrade through lock": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-		),
-		changeall: true,
-	},
-	"downgrade through lock": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-		),
-		changeall: true,
-		downgrade: true,
-	},
-	"update one with only one": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 1.0.1"),
-			mkDepspec("foo 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-		),
-		changelist: []ProjectRoot{"foo"},
-	},
-	"update one of multi": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 1.0.1"),
-			mkDepspec("foo 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-			"bar 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.1",
-		),
-		changelist: []ProjectRoot{"foo"},
-	},
-	"update both of multi": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 1.0.1"),
-			mkDepspec("foo 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-			"bar 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-		),
-		changelist: []ProjectRoot{"foo", "bar"},
-	},
-	"update two of more": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *", "baz *"),
-			mkDepspec("foo 1.0.0"),
-			mkDepspec("foo 1.0.1"),
-			mkDepspec("foo 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-			mkDepspec("baz 1.0.0"),
-			mkDepspec("baz 1.0.1"),
-			mkDepspec("baz 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-			"bar 1.0.1",
-			"baz 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-			"baz 1.0.1",
-		),
-		changelist: []ProjectRoot{"foo", "bar"},
-	},
-	"break other lock with targeted update": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "baz *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-			mkDepspec("baz 1.0.0"),
-			mkDepspec("baz 1.0.1"),
-			mkDepspec("baz 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-			"bar 1.0.1",
-			"baz 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-			"baz 1.0.1",
-		),
-		changelist: []ProjectRoot{"foo", "bar"},
-	},
-	"with incompatible locked dependency": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo >1.0.1"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-		),
-	},
-	"with unrelated locked dependency": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-			mkDepspec("baz 1.0.0 bazrev"),
-		},
-		l: mklock(
-			"baz 1.0.0 bazrev",
-		),
-		r: mksolution(
-			"foo 1.0.2",
-			"bar 1.0.2",
-		),
-	},
-	"unlocks dependencies if necessary to ensure that a new dependency is satisfied": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "newdep *"),
-			mkDepspec("foo 1.0.0 foorev", "bar <2.0.0"),
-			mkDepspec("bar 1.0.0 barrev", "baz <2.0.0"),
-			mkDepspec("baz 1.0.0 bazrev", "qux <2.0.0"),
-			mkDepspec("qux 1.0.0 quxrev"),
-			mkDepspec("foo 2.0.0", "bar <3.0.0"),
-			mkDepspec("bar 2.0.0", "baz <3.0.0"),
-			mkDepspec("baz 2.0.0", "qux <3.0.0"),
-			mkDepspec("qux 2.0.0"),
-			mkDepspec("newdep 2.0.0", "baz >=1.5.0"),
-		},
-		l: mklock(
-			"foo 1.0.0 foorev",
-			"bar 1.0.0 barrev",
-			"baz 1.0.0 bazrev",
-			"qux 1.0.0 quxrev",
-		),
-		r: mksolution(
-			"foo 2.0.0",
-			"bar 2.0.0",
-			"baz 2.0.0",
-			"qux 1.0.0 quxrev",
-			"newdep 2.0.0",
-		),
-		maxAttempts: 4,
-	},
-	"break lock when only the deps necessitate it": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *"),
-			mkDepspec("foo 1.0.0 foorev", "bar <2.0.0"),
-			mkDepspec("foo 2.0.0", "bar <3.0.0"),
-			mkDepspec("bar 2.0.0", "baz <3.0.0"),
-			mkDepspec("baz 2.0.0", "foo >1.0.0"),
-		},
-		l: mklock(
-			"foo 1.0.0 foorev",
-		),
-		r: mksolution(
-			"foo 2.0.0",
-			"bar 2.0.0",
-			"baz 2.0.0",
-		),
-		maxAttempts: 4,
-	},
-	"locked atoms are matched on both local and net name": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0 foorev"),
-			mkDepspec("foo 2.0.0 foorev2"),
-		},
-		l: mklock(
-			"foo from baz 1.0.0 foorev",
-		),
-		r: mksolution(
-			"foo 2.0.0 foorev2",
-		),
-	},
-	"pairs bare revs in lock with versions": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo ~1.0.1"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1 foorev", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mkrevlock(
-			"foo 1.0.1 foorev", // mkrevlock drops the 1.0.1
-		),
-		r: mksolution(
-			"foo 1.0.1 foorev",
-			"bar 1.0.1",
-		),
-	},
-	// This fixture describes a situation that should be impossible with a
-	// real-world VCS (contents of dep at same rev are different, as indicated
-	// by different constraints on bar). But, that's not the SUT here, so it's
-	// OK.
-	"pairs bare revs in lock with all versions": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo ~1.0.1"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1 foorev", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2 foorev", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mkrevlock(
-			"foo 1.0.1 foorev", // mkrevlock drops the 1.0.1
-		),
-		r: mksolution(
-			"foo 1.0.2 foorev",
-			"bar 1.0.2",
-		),
-	},
-	"does not pair bare revs in manifest with unpaired lock version": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo ~1.0.1"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1 foorev", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mkrevlock(
-			"foo 1.0.1 foorev", // mkrevlock drops the 1.0.1
-		),
-		r: mksolution(
-			"foo 1.0.1 foorev",
-			"bar 1.0.1",
-		),
-	},
-	"lock to branch on old rev keeps old rev": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo bmaster"),
-			mkDepspec("foo bmaster newrev"),
-		},
-		l: mklock(
-			"foo bmaster oldrev",
-		),
-		r: mksolution(
-			"foo bmaster oldrev",
-		),
-	},
-	// Whereas this is a normal situation for a branch, when it occurs for a
-	// tag, it means someone's been naughty upstream. Still, though, the outcome
-	// is the same.
-	//
-	// TODO(sdboyer) this needs to generate a warning, once we start doing that
-	"lock to now-moved tag on old rev keeps old rev": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo ptaggerino"),
-			mkDepspec("foo ptaggerino newrev"),
-		},
-		l: mklock(
-			"foo ptaggerino oldrev",
-		),
-		r: mksolution(
-			"foo ptaggerino oldrev",
-		),
-	},
-	"no version that matches requirement": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo ^1.0.0"),
-			mkDepspec("foo 2.0.0"),
-			mkDepspec("foo 2.1.3"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.1.3"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("foo 2.1.3"),
-						failparent: []dependency{mkDep("root", "foo ^1.0.0", "foo")},
-						c:          mkSVC("^1.0.0"),
-					},
-				},
-				{
-					v: NewVersion("2.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("foo 2.0.0"),
-						failparent: []dependency{mkDep("root", "foo ^1.0.0", "foo")},
-						c:          mkSVC("^1.0.0"),
-					},
-				},
-			},
-		},
-	},
-	"no version that matches combined constraint": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.0", "shared >=2.0.0, <3.0.0"),
-			mkDepspec("bar 1.0.0", "shared >=2.9.0, <4.0.0"),
-			mkDepspec("shared 2.5.0"),
-			mkDepspec("shared 3.5.0"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("shared"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("3.5.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("shared 3.5.0"),
-						failparent: []dependency{mkDep("foo 1.0.0", "shared >=2.0.0, <3.0.0", "shared")},
-						c:          mkSVC(">=2.9.0, <3.0.0"),
-					},
-				},
-				{
-					v: NewVersion("2.5.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("shared 2.5.0"),
-						failparent: []dependency{mkDep("bar 1.0.0", "shared >=2.9.0, <4.0.0", "shared")},
-						c:          mkSVC(">=2.9.0, <3.0.0"),
-					},
-				},
-			},
-		},
-	},
-	"disjoint constraints": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.0", "shared <=2.0.0"),
-			mkDepspec("bar 1.0.0", "shared >3.0.0"),
-			mkDepspec("shared 2.0.0"),
-			mkDepspec("shared 4.0.0"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &disjointConstraintFailure{
-						goal:      mkDep("foo 1.0.0", "shared <=2.0.0", "shared"),
-						failsib:   []dependency{mkDep("bar 1.0.0", "shared >3.0.0", "shared")},
-						nofailsib: nil,
-						c:         mkSVC(">3.0.0"),
-					},
-				},
-			},
-		},
-	},
-	"no valid solution": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "b *"),
-			mkDepspec("a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 2.0.0", "b 2.0.0"),
-			mkDepspec("b 1.0.0", "a 2.0.0"),
-			mkDepspec("b 2.0.0", "a 1.0.0"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("b"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("b 2.0.0"),
-						failparent: []dependency{mkDep("a 1.0.0", "b 1.0.0", "b")},
-						c:          mkSVC("1.0.0"),
-					},
-				},
-				{
-					v: NewVersion("1.0.0"),
-					f: &constraintNotAllowedFailure{
-						goal: mkDep("b 1.0.0", "a 2.0.0", "a"),
-						v:    NewVersion("1.0.0"),
-					},
-				},
-			},
-		},
-	},
-	"no version that matches while backtracking": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "b >1.0.0"),
-			mkDepspec("a 1.0.0"),
-			mkDepspec("b 1.0.0"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("b"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("b 1.0.0"),
-						failparent: []dependency{mkDep("root", "b >1.0.0", "b")},
-						c:          mkSVC(">1.0.0"),
-					},
-				},
-			},
-		},
-	},
-	// The latest versions of a and b disagree on c. An older version of either
-	// will resolve the problem. This test validates that b, which is farther
-	// in the dependency graph from myapp is downgraded first.
-	"rolls back leaf versions first": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *"),
-			mkDepspec("a 1.0.0", "b *"),
-			mkDepspec("a 2.0.0", "b *", "c 2.0.0"),
-			mkDepspec("b 1.0.0"),
-			mkDepspec("b 2.0.0", "c 1.0.0"),
-			mkDepspec("c 1.0.0"),
-			mkDepspec("c 2.0.0"),
-		},
-		r: mksolution(
-			"a 2.0.0",
-			"b 1.0.0",
-			"c 2.0.0",
-		),
-		maxAttempts: 2,
-	},
-	// Only one version of baz, so foo and bar will have to downgrade until they
-	// reach it.
-	"mutual downgrading": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"),
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 2.0.0", "bar 2.0.0"),
-			mkDepspec("foo 3.0.0", "bar 3.0.0"),
-			mkDepspec("bar 1.0.0", "baz *"),
-			mkDepspec("bar 2.0.0", "baz 2.0.0"),
-			mkDepspec("bar 3.0.0", "baz 3.0.0"),
-			mkDepspec("baz 1.0.0"),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-			"baz 1.0.0",
-		),
-		maxAttempts: 3,
-	},
-	// Ensures the solver doesn't exhaustively search all versions of b when
-	// it's a-2.0.0 whose dependency on c-2.0.0-nonexistent led to the
-	// problem. We make sure b has more versions than a so that the solver
-	// tries a first since it sorts sibling dependencies by number of
-	// versions.
-	"search real failer": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "b *"),
-			mkDepspec("a 1.0.0", "c 1.0.0"),
-			mkDepspec("a 2.0.0", "c 2.0.0"),
-			mkDepspec("b 1.0.0"),
-			mkDepspec("b 2.0.0"),
-			mkDepspec("b 3.0.0"),
-			mkDepspec("c 1.0.0"),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 3.0.0",
-			"c 1.0.0",
-		),
-		maxAttempts: 2,
-	},
-	// Dependencies are ordered so that packages with fewer versions are tried
-	// first. Here, there are two valid solutions (either a or b must be
-	// downgraded once). The chosen one depends on which dep is traversed first.
-	// Since b has fewer versions, it will be traversed first, which means a
-	// will come later. Since later selections are revised first, a gets
-	// downgraded.
-	"traverse into package with fewer versions first": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "b *"),
-			mkDepspec("a 1.0.0", "c *"),
-			mkDepspec("a 2.0.0", "c *"),
-			mkDepspec("a 3.0.0", "c *"),
-			mkDepspec("a 4.0.0", "c *"),
-			mkDepspec("a 5.0.0", "c 1.0.0"),
-			mkDepspec("b 1.0.0", "c *"),
-			mkDepspec("b 2.0.0", "c *"),
-			mkDepspec("b 3.0.0", "c *"),
-			mkDepspec("b 4.0.0", "c 2.0.0"),
-			mkDepspec("c 1.0.0"),
-			mkDepspec("c 2.0.0"),
-		},
-		r: mksolution(
-			"a 4.0.0",
-			"b 4.0.0",
-			"c 2.0.0",
-		),
-		maxAttempts: 2,
-	},
-	// This is similar to the preceding fixture. When getting the number of
-	// versions of a package to determine which to traverse first, versions that
-	// are disallowed by the root package's constraints should not be
-	// considered. Here, foo has more versions than bar in total (4), but fewer
-	// that meet myapp"s constraints (only 2). There is no solution, but we will
-	// do less backtracking if foo is tested first.
-	"root constraints pre-eliminate versions": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *"),
-			mkDepspec("foo 1.0.0", "none 2.0.0"),
-			mkDepspec("foo 2.0.0", "none 2.0.0"),
-			mkDepspec("foo 3.0.0", "none 2.0.0"),
-			mkDepspec("foo 4.0.0", "none 2.0.0"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 2.0.0"),
-			mkDepspec("bar 3.0.0"),
-			mkDepspec("none 1.0.0"),
-		},
-		fail: &noVersionError{
-			pn: mkPI("none"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("none 1.0.0"),
-						failparent: []dependency{mkDep("foo 1.0.0", "none 2.0.0", "none")},
-						c:          mkSVC("2.0.0"),
-					},
-				},
-			},
-		},
-	},
-	// If there"s a disjoint constraint on a package, then selecting other
-	// versions of it is a waste of time: no possible versions can match. We
-	// need to jump past it to the most recent package that affected the
-	// constraint.
-	"backjump past failed package on disjoint constraint": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "foo *"),
-			mkDepspec("a 1.0.0", "foo *"),
-			mkDepspec("a 2.0.0", "foo <1.0.0"),
-			mkDepspec("foo 2.0.0"),
-			mkDepspec("foo 2.0.1"),
-			mkDepspec("foo 2.0.2"),
-			mkDepspec("foo 2.0.3"),
-			mkDepspec("foo 2.0.4"),
-			mkDepspec("none 1.0.0"),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"foo 2.0.4",
-		),
-		maxAttempts: 2,
-	},
-	// Revision enters vqueue if a dep has a constraint on that revision
-	"revision injected into vqueue": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo r123abc"),
-			mkDepspec("foo r123abc"),
-			mkDepspec("foo 1.0.0 foorev"),
-			mkDepspec("foo 2.0.0 foorev2"),
-		},
-		r: mksolution(
-			"foo r123abc",
-		),
-	},
-	// Some basic override checks
-	"override root's own constraint": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *", "b *"),
-			mkDepspec("a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 2.0.0", "b 1.0.0"),
-			mkDepspec("b 1.0.0"),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("a"): ProjectProperties{
-				Constraint: NewVersion("1.0.0"),
-			},
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-		),
-	},
-	"override dep's constraint": {
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "a *"),
-			mkDepspec("a 1.0.0", "b 1.0.0"),
-			mkDepspec("a 2.0.0", "b 1.0.0"),
-			mkDepspec("b 1.0.0"),
-			mkDepspec("b 2.0.0"),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("b"): ProjectProperties{
-				Constraint: NewVersion("2.0.0"),
-			},
-		},
-		r: mksolution(
-			"a 2.0.0",
-			"b 2.0.0",
-		),
-	},
-	"overridden mismatched net addrs, alt in dep, back to default": {
-		ds: []depspec{
-			mkDepspec("root 1.0.0", "foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.0", "bar from baz 1.0.0"),
-			mkDepspec("bar 1.0.0"),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("bar"): ProjectProperties{
-				Source: "bar",
-			},
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar from bar 1.0.0",
-		),
-	},
-
-	// TODO(sdboyer) decide how to refactor the solver in order to re-enable these.
-	// Checking for revision existence is important...but kinda obnoxious.
-	//{
-	//// Solve fails if revision constraint calls for a nonexistent revision
-	//n: "fail on missing revision",
-	//ds: []depspec{
-	//mkDepspec("root 0.0.0", "bar *"),
-	//mkDepspec("bar 1.0.0", "foo r123abc"),
-	//mkDepspec("foo r123nomatch"),
-	//mkDepspec("foo 1.0.0"),
-	//mkDepspec("foo 2.0.0"),
-	//},
-	//errp: []string{"bar", "foo", "bar"},
-	//},
-	//{
-	//// Solve fails if revision constraint calls for a nonexistent revision,
-	//// even if rev constraint is specified by root
-	//n: "fail on missing revision from root",
-	//ds: []depspec{
-	//mkDepspec("root 0.0.0", "foo r123nomatch"),
-	//mkDepspec("foo r123abc"),
-	//mkDepspec("foo 1.0.0"),
-	//mkDepspec("foo 2.0.0"),
-	//},
-	//errp: []string{"foo", "root", "foo"},
-	//},
-
-	// TODO(sdboyer) add fixture that tests proper handling of loops via aliases (where
-	// a project that wouldn't be a loop is aliased to a project that is a loop)
-}
-
-func init() {
-	// This sets up a hundred versions of foo and bar, 0.0.0 through 9.9.0. Each
-	// version of foo depends on a baz with the same major version. Each version
-	// of bar depends on a baz with the same minor version. There is only one
-	// version of baz, 0.0.0, so only older versions of foo and bar will
-	// satisfy it.
-	fix := basicFixture{
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *", "bar *"),
-			mkDepspec("baz 0.0.0"),
-		},
-		r: mksolution(
-			"foo 0.9.0",
-			"bar 9.0.0",
-			"baz 0.0.0",
-		),
-		maxAttempts: 10,
-	}
-
-	for i := 0; i < 10; i++ {
-		for j := 0; j < 10; j++ {
-			fix.ds = append(fix.ds, mkDepspec(fmt.Sprintf("foo %v.%v.0", i, j), fmt.Sprintf("baz %v.0.0", i)))
-			fix.ds = append(fix.ds, mkDepspec(fmt.Sprintf("bar %v.%v.0", i, j), fmt.Sprintf("baz 0.%v.0", j)))
-		}
-	}
-
-	basicFixtures["complex backtrack"] = fix
-
-	for k, fix := range basicFixtures {
-		// Assign the name into the fixture itself
-		fix.n = k
-		basicFixtures[k] = fix
-	}
-}
-
-// reachMaps contain externalReach()-type data for a given depspec fixture's
-// universe of projects, packages, and versions.
-type reachMap map[pident]map[string][]string
-
-type depspecSourceManager struct {
-	specs []depspec
-	rm    reachMap
-	ig    map[string]bool
-}
-
-type fixSM interface {
-	SourceManager
-	rootSpec() depspec
-	allSpecs() []depspec
-	ignore() map[string]bool
-}
-
-var _ fixSM = &depspecSourceManager{}
-
-func newdepspecSM(ds []depspec, ignore []string) *depspecSourceManager {
-	ig := make(map[string]bool)
-	if len(ignore) > 0 {
-		for _, pkg := range ignore {
-			ig[pkg] = true
-		}
-	}
-
-	return &depspecSourceManager{
-		specs: ds,
-		rm:    computeBasicReachMap(ds),
-		ig:    ig,
-	}
-}
-
-func (sm *depspecSourceManager) GetManifestAndLock(id ProjectIdentifier, v Version, an ProjectAnalyzer) (Manifest, Lock, error) {
-	// If the input version is a PairedVersion, look only at its top version,
-	// not the underlying. This is generally consistent with the idea that, for
-	// this class of lookup, the rev probably DOES exist, but upstream changed
-	// it (typically a branch). For the purposes of tests, then, that's an OK
-	// scenario, because otherwise we'd have to enumerate all the revs in the
-	// fixture declarations, which would screw up other things.
-	if pv, ok := v.(PairedVersion); ok {
-		v = pv.Unpair()
-	}
-
-	src := toFold(id.normalizedSource())
-	for _, ds := range sm.specs {
-		if src == string(ds.n) && v.Matches(ds.v) {
-			return ds, dummyLock{}, nil
-		}
-	}
-
-	return nil, nil, fmt.Errorf("Project %s at version %s could not be found", id, v)
-}
-
-func (sm *depspecSourceManager) ListPackages(id ProjectIdentifier, v Version) (pkgtree.PackageTree, error) {
-	pid := pident{n: ProjectRoot(toFold(id.normalizedSource())), v: v}
-	if pv, ok := v.(PairedVersion); ok && pv.Revision() == "FAKEREV" {
-		// An empty rev may come in here because that's what we produce in
-		// ListVersions(). If that's what we see, then just pretend like we have
-		// an unpaired.
-		pid.v = pv.Unpair()
-	}
-
-	if r, exists := sm.rm[pid]; exists {
-		return pkgtree.PackageTree{
-			ImportRoot: id.normalizedSource(),
-			Packages: map[string]pkgtree.PackageOrErr{
-				string(pid.n): {
-					P: pkgtree.Package{
-						ImportPath: string(pid.n),
-						Name:       string(pid.n),
-						Imports:    r[string(pid.n)],
-					},
-				},
-			},
-		}, nil
-	}
-
-	// if incoming version was paired, walk the map and search for a match on
-	// top-only version
-	if pv, ok := v.(PairedVersion); ok {
-		uv := pv.Unpair()
-		for pid, r := range sm.rm {
-			if uv.Matches(pid.v) {
-				return pkgtree.PackageTree{
-					ImportRoot: id.normalizedSource(),
-					Packages: map[string]pkgtree.PackageOrErr{
-						string(pid.n): {
-							P: pkgtree.Package{
-								ImportPath: string(pid.n),
-								Name:       string(pid.n),
-								Imports:    r[string(pid.n)],
-							},
-						},
-					},
-				}, nil
-			}
-		}
-	}
-
-	return pkgtree.PackageTree{}, fmt.Errorf("Project %s at version %s could not be found", pid.n, v)
-}
-
-func (sm *depspecSourceManager) ListVersions(id ProjectIdentifier) ([]PairedVersion, error) {
-	var pvl []PairedVersion
-	src := toFold(id.normalizedSource())
-	for _, ds := range sm.specs {
-		if src != string(ds.n) {
-			continue
-		}
-
-		switch tv := ds.v.(type) {
-		case Revision:
-			// To simulate the behavior of the real SourceManager, we do not return
-			// raw revisions from listVersions().
-		case PairedVersion:
-			pvl = append(pvl, tv)
-		case UnpairedVersion:
-			// Dummy revision; if the fixture doesn't provide it, we know
-			// the test doesn't need revision info, anyway.
-			pvl = append(pvl, tv.Pair(Revision("FAKEREV")))
-		default:
-			panic(fmt.Sprintf("unreachable: type of version was %#v for spec %s", ds.v, id))
-		}
-	}
-
-	if len(pvl) == 0 {
-		return nil, fmt.Errorf("Project %s could not be found", id)
-	}
-	return pvl, nil
-}
-
-func (sm *depspecSourceManager) RevisionPresentIn(id ProjectIdentifier, r Revision) (bool, error) {
-	src := toFold(id.normalizedSource())
-	for _, ds := range sm.specs {
-		if src == string(ds.n) && r == ds.v {
-			return true, nil
-		}
-	}
-
-	return false, fmt.Errorf("Project %s has no revision %s", id, r)
-}
-
-func (sm *depspecSourceManager) SourceExists(id ProjectIdentifier) (bool, error) {
-	src := toFold(id.normalizedSource())
-	for _, ds := range sm.specs {
-		if src == string(ds.n) {
-			return true, nil
-		}
-	}
-
-	return false, nil
-}
-
-func (sm *depspecSourceManager) SyncSourceFor(id ProjectIdentifier) error {
-	// Ignore err because it can't happen
-	if exist, _ := sm.SourceExists(id); !exist {
-		return fmt.Errorf("Source %s does not exist", id)
-	}
-	return nil
-}
-
-func (sm *depspecSourceManager) Release() {}
-
-func (sm *depspecSourceManager) ExportProject(context.Context, ProjectIdentifier, Version, string) error {
-	return fmt.Errorf("dummy sm doesn't support exporting")
-}
-
-func (sm *depspecSourceManager) DeduceProjectRoot(ip string) (ProjectRoot, error) {
-	fip := toFold(ip)
-	for _, ds := range sm.allSpecs() {
-		n := string(ds.n)
-		if fip == n || strings.HasPrefix(fip, n+"/") {
-			return ProjectRoot(ip[:len(n)]), nil
-		}
-	}
-	return "", fmt.Errorf("Could not find %s, or any parent, in list of known fixtures", ip)
-}
-
-func (sm *depspecSourceManager) SourceURLsForPath(ip string) ([]*url.URL, error) {
-	return nil, fmt.Errorf("dummy sm doesn't implement SourceURLsForPath")
-}
-
-func (sm *depspecSourceManager) rootSpec() depspec {
-	return sm.specs[0]
-}
-
-func (sm *depspecSourceManager) allSpecs() []depspec {
-	return sm.specs
-}
-
-func (sm *depspecSourceManager) ignore() map[string]bool {
-	return sm.ig
-}
-
-// InferConstraint tries to puzzle out what kind of version is given in a string -
-// semver, a revision, or as a fallback, a plain tag. This current implementation
-// is a panic because there's no current circumstance under which the depspecSourceManager
-// is useful outside of the gps solving tests, and it shouldn't be used anywhere else without a conscious and intentional
-// expansion of its semantics.
-func (sm *depspecSourceManager) InferConstraint(s string, pi ProjectIdentifier) (Constraint, error) {
-	panic("depsecSourceManager is only for gps solving tests")
-}
-
-type depspecBridge struct {
-	*bridge
-}
-
-func (b *depspecBridge) listVersions(id ProjectIdentifier) ([]Version, error) {
-	if vl, exists := b.vlists[id]; exists {
-		return vl, nil
-	}
-
-	pvl, err := b.sm.ListVersions(id)
-	if err != nil {
-		return nil, err
-	}
-
-	// Construct a []Version slice. If any paired versions use the fake rev,
-	// remove the underlying component.
-	vl := make([]Version, 0, len(pvl))
-	for _, v := range pvl {
-		if v.Revision() == "FAKEREV" {
-			vl = append(vl, v.Unpair())
-		} else {
-			vl = append(vl, v)
-		}
-	}
-
-	if b.down {
-		SortForDowngrade(vl)
-	} else {
-		SortForUpgrade(vl)
-	}
-
-	b.vlists[id] = vl
-	return vl, nil
-}
-
-// override verifyRoot() on bridge to prevent any filesystem interaction
-func (b *depspecBridge) verifyRootDir(path string) error {
-	root := b.sm.(fixSM).rootSpec()
-	if string(root.n) != path {
-		return fmt.Errorf("Expected only root project %q to verifyRootDir(), got %q", root.n, path)
-	}
-
-	return nil
-}
-
-func (b *depspecBridge) ListPackages(id ProjectIdentifier, v Version) (pkgtree.PackageTree, error) {
-	return b.sm.(fixSM).ListPackages(id, v)
-}
-
-func (b *depspecBridge) vendorCodeExists(id ProjectIdentifier) (bool, error) {
-	return false, nil
-}
-
-// enforce interfaces
-var _ Manifest = depspec{}
-var _ Lock = dummyLock{}
-var _ Lock = fixLock{}
-
-// impl Spec interface
-func (ds depspec) DependencyConstraints() ProjectConstraints {
-	return pcSliceToMap(ds.deps)
-}
-
-type fixLock []LockedProject
-
-// impl Lock interface
-func (fixLock) InputsDigest() []byte {
-	return []byte("fooooorooooofooorooofoo")
-}
-
-// impl Lock interface
-func (l fixLock) Projects() []LockedProject {
-	return l
-}
-
-type dummyLock struct{}
-
-// impl Lock interface
-func (dummyLock) InputsDigest() []byte {
-	return []byte("fooooorooooofooorooofoo")
-}
-
-// impl Lock interface
-func (dummyLock) Projects() []LockedProject {
-	return nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/solve_bimodal_test.go b/installer/vendor/github.com/golang/dep/internal/gps/solve_bimodal_test.go
deleted file mode 100644
index e55e875415..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/solve_bimodal_test.go
+++ /dev/null
@@ -1,1504 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-)
-
-// dsp - "depspec with packages"
-//
-// Wraps a set of tpkgs onto a depspec, and returns it.
-func dsp(ds depspec, pkgs ...tpkg) depspec {
-	ds.pkgs = pkgs
-	return ds
-}
-
-// pkg makes a tpkg appropriate for use in bimodal testing
-func pkg(path string, imports ...string) tpkg {
-	return tpkg{
-		path:    path,
-		imports: imports,
-	}
-}
-
-func init() {
-	for k, fix := range bimodalFixtures {
-		// Assign the name into the fixture itself
-		fix.n = k
-		bimodalFixtures[k] = fix
-	}
-}
-
-// Fixtures that rely on simulated bimodal (project and package-level)
-// analysis for correct operation. The name given in the map gets assigned into
-// the fixture itself in init().
-var bimodalFixtures = map[string]bimodalFixture{
-	// Simple case, ensures that we do the very basics of picking up and
-	// including a single, simple import that is not expressed as a constraint
-	"simple bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a")),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a")),
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	// Ensure it works when the import jump is not from the package with the
-	// same path as root, but from a subpkg
-	"subpkg bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	// The same, but with a jump through two subpkgs
-	"double-subpkg bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "root/bar"),
-				pkg("root/bar", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	// Same again, but now nest the subpkgs
-	"double nested subpkg bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "root/foo/bar"),
-				pkg("root/foo/bar", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	// Importing package from project with no root package
-	"bm-add on project with no pkg in root dir": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a/foo")),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a/foo")),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", "foo"),
-		),
-	},
-	// Import jump is in a dep, and points to a transitive dep
-	"transitive bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-		),
-	},
-	// Constraints apply only if the project that declares them has a
-	// reachable import
-	"constraints activated by import": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "b 1.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-			dsp(mkDepspec("b 1.1.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.1.0",
-		),
-	},
-	// Constraints apply only if the project that declares them has a
-	// reachable import - non-root
-	"constraints activated by import, transitive": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo", "b"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0", "b 1.0.0"),
-				pkg("a"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-			dsp(mkDepspec("b 1.1.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.1.0",
-		),
-	},
-	// Import jump is in a dep, and points to a transitive dep - but only in not
-	// the first version we try
-	"transitive bm-add on older version": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-			),
-			dsp(mkDepspec("a 1.1.0"),
-				pkg("a"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-		),
-	},
-	// Import jump is in a dep, and points to a transitive dep - but will only
-	// get there via backtracking
-	"backtrack to dep on bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a", "b"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "c"),
-			),
-			dsp(mkDepspec("a 1.1.0"),
-				pkg("a"),
-			),
-			// Include two versions of b, otherwise it'll be selected first
-			dsp(mkDepspec("b 0.9.0"),
-				pkg("b", "c"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b", "c"),
-			),
-			dsp(mkDepspec("c 1.0.0", "a 1.0.0"),
-				pkg("c", "a"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0",
-			"c 1.0.0",
-		),
-	},
-	"backjump through pkg-only selection": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a", "b"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "c"),
-			),
-			// Include two versions of b to ensure that a is visited first
-			dsp(mkDepspec("b 0.9.0", "d ^1.0.0"),
-				pkg("b", "c/other", "d"),
-			),
-			dsp(mkDepspec("b 1.0.0", "d ^1.2.0"),
-				pkg("b", "c/other", "d"),
-			),
-			// Three versions of c so it's last
-			dsp(mkDepspec("c 1.0.0", "d ^1.0.0"),
-				pkg("c", "d"),
-				pkg("c/other"),
-			),
-			dsp(mkDepspec("d 1.0.0"),
-				pkg("d"),
-			),
-			dsp(mkDepspec("d 1.1.0"),
-				pkg("d"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 0.9.0",
-			mklp("c 1.0.0", ".", "other"),
-			"d 1.1.0",
-		),
-	},
-	// Import jump is in a dep subpkg, and points to a transitive dep
-	"transitive subpkg bm-add": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "a/bar"),
-				pkg("a/bar", "b"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", ".", "bar"),
-			"b 1.0.0",
-		),
-	},
-	// Import jump is in a dep subpkg, pointing to a transitive dep, but only in
-	// not the first version we try
-	"transitive subpkg bm-add on older version": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "a/bar"),
-				pkg("a/bar", "b"),
-			),
-			dsp(mkDepspec("a 1.1.0"),
-				pkg("a", "a/bar"),
-				pkg("a/bar"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", ".", "bar"),
-			"b 1.0.0",
-		),
-	},
-	"project cycle involving root": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "a"),
-				pkg("root/foo"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "root/foo"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	"project cycle involving root with backtracking": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "a", "b"),
-				pkg("root/foo"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "root/foo"),
-			),
-			dsp(mkDepspec("a 1.0.1"),
-				pkg("a", "root/foo"),
-			),
-			dsp(mkDepspec("b 1.0.0", "a 1.0.0"),
-				pkg("b", "a"),
-			),
-			dsp(mkDepspec("b 1.0.1", "a 1.0.0"),
-				pkg("b", "a"),
-			),
-			dsp(mkDepspec("b 1.0.2", "a 1.0.0"),
-				pkg("b", "a"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.2",
-		),
-	},
-	"unify project on disjoint package imports + source switching": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "b from baz 1.0.0"),
-				pkg("root", "a", "b"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b/foo"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-				pkg("b/foo"),
-			),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("b"),
-				pkg("b/foo"),
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			mklp("b from baz 1.0.0", ".", "foo"),
-		),
-	},
-	"project cycle not involving root": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-				pkg("a/foo"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b", "a/foo"),
-			),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", ".", "foo"),
-			"b 1.0.0",
-		),
-	},
-	"project cycle not involving root with internal paths": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a ~1.0.0"),
-				pkg("root", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b/baz"),
-				pkg("a/foo", "a/quux", "a/quark"),
-				pkg("a/quux"),
-				pkg("a/quark"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b", "a/foo"),
-				pkg("b/baz", "b"),
-			),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", ".", "foo", "quark", "quux"),
-			mklp("b 1.0.0", ".", "baz"),
-		),
-	},
-	// Ensure that if a constraint is expressed, but no actual import exists,
-	// then the constraint is disregarded - the project named in the constraint
-	// is not part of the solution.
-	"ignore constraint without import": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a 1.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-		},
-		r: mksolution(),
-	},
-	// Transitive deps from one project (a) get incrementally included as other
-	// deps incorporate its various packages.
-	"multi-stage pkg incorporation": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a", "d"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-				pkg("a/second", "c"),
-			),
-			dsp(mkDepspec("b 2.0.0"),
-				pkg("b"),
-			),
-			dsp(mkDepspec("c 1.2.0"),
-				pkg("c"),
-			),
-			dsp(mkDepspec("d 1.0.0"),
-				pkg("d", "a/second"),
-			),
-		},
-		r: mksolution(
-			mklp("a 1.0.0", ".", "second"),
-			"b 2.0.0",
-			"c 1.2.0",
-			"d 1.0.0",
-		),
-	},
-	// Regression - make sure that the the constraint/import intersector only
-	// accepts a project 'match' if exactly equal, or a separating slash is
-	// present.
-	"radix path separator post-check": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo", "foobar"),
-			),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo"),
-			),
-			dsp(mkDepspec("foobar 1.0.0"),
-				pkg("foobar"),
-			),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"foobar 1.0.0",
-		),
-	},
-	// Well-formed failure when there's a dependency on a pkg that doesn't exist
-	"fail when imports nonexistent package": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "a 1.0.0"),
-				pkg("root", "a/foo"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-		},
-		fail: &noVersionError{
-			pn: mkPI("a"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &checkeeHasProblemPackagesFailure{
-						goal: mkAtom("a 1.0.0"),
-						failpkg: map[string]errDeppers{
-							"a/foo": {
-								err: nil, // nil indicates package is missing
-								deppers: []atom{
-									mkAtom("root"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	},
-	// Transitive deps from one project (a) get incrementally included as other
-	// deps incorporate its various packages, and fail with proper error when we
-	// discover one incrementally that isn't present
-	"fail multi-stage missing pkg": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a", "d"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b"),
-				pkg("a/second", "c"),
-			),
-			dsp(mkDepspec("b 2.0.0"),
-				pkg("b"),
-			),
-			dsp(mkDepspec("c 1.2.0"),
-				pkg("c"),
-			),
-			dsp(mkDepspec("d 1.0.0"),
-				pkg("d", "a/second"),
-				pkg("d", "a/nonexistent"),
-			),
-		},
-		fail: &noVersionError{
-			pn: mkPI("d"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &depHasProblemPackagesFailure{
-						goal: mkADep("d 1.0.0", "a", Any(), "a/nonexistent"),
-						v:    NewVersion("1.0.0"),
-						prob: map[string]error{
-							"a/nonexistent": nil,
-						},
-					},
-				},
-			},
-		},
-	},
-	// Check ignores on the root project
-	"ignore in double-subpkg": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "root/bar", "b"),
-				pkg("root/bar", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		ignore: []string{"root/bar"},
-		r: mksolution(
-			"b 1.0.0",
-		),
-	},
-	// Ignores on a dep pkg
-	"ignore through dep pkg": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "root/foo"),
-				pkg("root/foo", "a"),
-			),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "a/bar"),
-				pkg("a/bar", "b"),
-			),
-			dsp(mkDepspec("b 1.0.0"),
-				pkg("b"),
-			),
-		},
-		ignore: []string{"a/bar"},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	// Preferred version, as derived from a dep's lock, is attempted first
-	"respect prefv, simple case": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a")),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b")),
-			dsp(mkDepspec("b 1.0.0 foorev"),
-				pkg("b")),
-			dsp(mkDepspec("b 2.0.0 barrev"),
-				pkg("b")),
-		},
-		lm: map[string]fixLock{
-			"a 1.0.0": mklock(
-				"b 1.0.0 foorev",
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0 foorev",
-		),
-	},
-	// Preferred version, as derived from a dep's lock, is attempted first, even
-	// if the root also has a direct dep on it (root doesn't need to use
-	// preferreds, because it has direct control AND because the root lock
-	// already supersedes dep lock "preferences")
-	"respect dep prefv with root import": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a", "b")),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b")),
-			//dsp(newDepspec("a 1.0.1"),
-			//pkg("a", "b")),
-			//dsp(newDepspec("a 1.1.0"),
-			//pkg("a", "b")),
-			dsp(mkDepspec("b 1.0.0 foorev"),
-				pkg("b")),
-			dsp(mkDepspec("b 2.0.0 barrev"),
-				pkg("b")),
-		},
-		lm: map[string]fixLock{
-			"a 1.0.0": mklock(
-				"b 1.0.0 foorev",
-			),
-		},
-		r: mksolution(
-			"a 1.0.0",
-			"b 1.0.0 foorev",
-		),
-	},
-	// Preferred versions can only work if the thing offering it has been
-	// selected, or at least marked in the unselected queue
-	"prefv only works if depper is selected": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a", "b")),
-			// Three atoms for a, which will mean it gets visited after b
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a", "b")),
-			dsp(mkDepspec("a 1.0.1"),
-				pkg("a", "b")),
-			dsp(mkDepspec("a 1.1.0"),
-				pkg("a", "b")),
-			dsp(mkDepspec("b 1.0.0 foorev"),
-				pkg("b")),
-			dsp(mkDepspec("b 2.0.0 barrev"),
-				pkg("b")),
-		},
-		lm: map[string]fixLock{
-			"a 1.0.0": mklock(
-				"b 1.0.0 foorev",
-			),
-		},
-		r: mksolution(
-			"a 1.1.0",
-			"b 2.0.0 barrev",
-		),
-	},
-	"override unconstrained root import": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "a")),
-			dsp(mkDepspec("a 1.0.0"),
-				pkg("a")),
-			dsp(mkDepspec("a 2.0.0"),
-				pkg("a")),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("a"): ProjectProperties{
-				Constraint: NewVersion("1.0.0"),
-			},
-		},
-		r: mksolution(
-			"a 1.0.0",
-		),
-	},
-	"simple case-only differences": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo", "bar")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &caseMismatchFailure{
-						goal:    mkDep("foo 1.0.0", "Bar 1.0.0", "Bar"),
-						current: ProjectRoot("bar"),
-						failsib: []dependency{mkDep("root", "bar 1.0.0", "bar")},
-					},
-				},
-			},
-		},
-	},
-	"case variations acceptable with agreement": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "Bar", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"Bar 1.0.0",
-			"baz 1.0.0",
-		),
-	},
-	"case variations within root": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo", "bar", "Bar")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &caseMismatchFailure{
-						goal:    mkDep("foo 1.0.0", "Bar 1.0.0", "Bar"),
-						current: ProjectRoot("bar"),
-						failsib: []dependency{mkDep("root", "foo 1.0.0", "foo")},
-					},
-				},
-			},
-		},
-		broken: "need to implement checking for import case variations *within* the root",
-	},
-	"case variations within single dep": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &caseMismatchFailure{
-						goal:    mkDep("foo 1.0.0", "Bar 1.0.0", "Bar"),
-						current: ProjectRoot("bar"),
-						failsib: []dependency{mkDep("root", "foo 1.0.0", "foo")},
-					},
-				},
-			},
-		},
-		broken: "need to implement checking for import case variations *within* a single project",
-	},
-	"case variations across multiple deps": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo", "bar")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("baz"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &caseMismatchFailure{
-						goal:    mkDep("baz 1.0.0", "Bar 1.0.0", "Bar"),
-						current: ProjectRoot("bar"),
-						failsib: []dependency{
-							mkDep("root", "bar 1.0.0", "bar"),
-							mkDep("foo 1.0.0", "bar 1.0.0", "bar"),
-						},
-					},
-				},
-			},
-		},
-	},
-	// This isn't actually as crazy as it might seem, as the root is defined by
-	// the addresser, not the addressee. It would occur (to provide a
-	// real-as-of-this-writing example) if something imports
-	// github.com/Sirupsen/logrus, as the contained subpackage at
-	// github.com/Sirupsen/logrus/hooks/syslog imports
-	// github.com/sirupsen/logrus. The only reason that doesn't blow up all the
-	// time is that most people only import the root package, not the syslog
-	// subpackage.
-	"canonical case is established by mutual self-imports": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar", "bar/subpkg"),
-				pkg("bar/subpkg")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("Bar"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &wrongCaseFailure{
-						correct: ProjectRoot("bar"),
-						goal:    mkDep("Bar 1.0.0", "bar 1.0.0", "bar"),
-						badcase: []dependency{mkDep("foo 1.0.0", "Bar 1.0.0", "Bar/subpkg")},
-					},
-				},
-			},
-		},
-	},
-	"canonical case only applies if relevant imports are activated": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "Bar/subpkg")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar", "bar/subpkg"),
-				pkg("bar/subpkg")),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			mklp("Bar 1.0.0", "subpkg"),
-		),
-	},
-	"simple case-only variations plus source variance": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo", "bar")),
-			dsp(mkDepspec("foo 1.0.0", "Bar from quux 1.0.0"),
-				pkg("foo", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("quux 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &caseMismatchFailure{
-						goal:    mkDep("foo 1.0.0", "Bar from quux 1.0.0", "Bar"),
-						current: ProjectRoot("bar"),
-						failsib: []dependency{mkDep("root", "bar 1.0.0", "bar")},
-					},
-				},
-			},
-		},
-	},
-	"case-only variations plus source variance with internal canonicality": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "Bar from quux 1.0.0"),
-				pkg("root", "foo", "Bar")),
-			dsp(mkDepspec("foo 1.0.0", "Bar from quux 1.0.0"),
-				pkg("foo", "Bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar", "bar/subpkg"),
-				pkg("bar/subpkg")),
-			dsp(mkDepspec("quux 1.0.0"),
-				pkg("bar", "bar/subpkg"),
-				pkg("bar/subpkg")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("Bar"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &wrongCaseFailure{
-						correct: ProjectRoot("bar"),
-						goal:    mkDep("Bar from quux 1.0.0", "bar 1.0.0", "bar"),
-						badcase: []dependency{mkDep("root", "Bar 1.0.0", "Bar/subpkg")},
-					},
-				},
-			},
-		},
-	},
-	"alternate net address": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo from bar 2.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("foo 2.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 2.0.0"),
-				pkg("foo")),
-		},
-		r: mksolution(
-			"foo from bar 2.0.0",
-		),
-	},
-	"alternate net address, version only in alt": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo from bar 2.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 2.0.0"),
-				pkg("foo")),
-		},
-		r: mksolution(
-			"foo from bar 2.0.0",
-		),
-	},
-	"alternate net address in dep": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0", "bar from baz 2.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 2.0.0"),
-				pkg("bar")),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar from baz 2.0.0",
-		),
-	},
-	// Because NOT specifying an alternate net address for a given import path
-	// is taken as an "eh, whatever", if we see an empty net addr after
-	// something else has already set an alternate one, then the second should
-	// just "go along" with whatever's already been specified.
-	"alternate net address with second depper": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo from bar 2.0.0"),
-				pkg("root", "foo", "baz")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("foo 2.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("bar 2.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz", "foo")),
-		},
-		r: mksolution(
-			"foo from bar 2.0.0",
-			"baz 1.0.0",
-		),
-	},
-	// Same as the previous, except the alternate declaration originates in a
-	// dep, not the root.
-	"alternate net addr from dep, with second default depper": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo 1.0.0"),
-				pkg("root", "foo", "bar")),
-			dsp(mkDepspec("foo 1.0.0", "bar 2.0.0"),
-				pkg("foo", "baz")),
-			dsp(mkDepspec("foo 2.0.0", "bar 2.0.0"),
-				pkg("foo", "baz")),
-			dsp(mkDepspec("bar 2.0.0", "baz from quux 1.0.0"),
-				pkg("bar", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("baz 2.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("quux 1.0.0"),
-				pkg("baz")),
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 2.0.0",
-			"baz from quux 1.0.0",
-		),
-	},
-	// When a given project is initially brought in using the default (i.e.,
-	// empty) ProjectIdentifier.Source, and a later, presumably
-	// as-yet-undiscovered dependency specifies an alternate net addr for it, we
-	// have to fail - even though, if the deps were visited in the opposite
-	// order (deeper dep w/the alternate location first, default location
-	// second), it would be fine.
-	//
-	// TODO A better solution here would involve restarting the solver w/a
-	// marker to use that alternate, or (ugh) introducing a new failure
-	// path/marker type that changes how backtracking works. (In fact, these
-	// approaches are probably demonstrably equivalent.)
-	"fails with net mismatch when deeper dep specs it": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo 1.0.0"),
-				pkg("root", "foo", "baz")),
-			dsp(mkDepspec("foo 1.0.0", "bar 2.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 2.0.0", "baz from quux 1.0.0"),
-				pkg("bar", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("quux 1.0.0"),
-				pkg("baz")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("bar"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.0.0"),
-					f: &sourceMismatchFailure{
-						shared:   ProjectRoot("baz"),
-						current:  "baz",
-						mismatch: "quux",
-						prob:     mkAtom("bar 2.0.0"),
-						sel:      []dependency{mkDep("foo 1.0.0", "bar 2.0.0", "bar")},
-					},
-				},
-			},
-		},
-	},
-	"with mismatched net addrs": {
-		ds: []depspec{
-			dsp(mkDepspec("root 1.0.0", "foo 1.0.0", "bar 1.0.0"),
-				pkg("root", "foo", "bar")),
-			dsp(mkDepspec("foo 1.0.0", "bar from baz 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("bar")),
-		},
-		fail: &noVersionError{
-			pn: mkPI("foo"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("1.0.0"),
-					f: &sourceMismatchFailure{
-						shared:   ProjectRoot("bar"),
-						current:  "bar",
-						mismatch: "baz",
-						prob:     mkAtom("foo 1.0.0"),
-						sel:      []dependency{mkDep("root", "foo 1.0.0", "foo")},
-					},
-				},
-			},
-		},
-	},
-	"overridden mismatched net addrs, alt in dep": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0", "bar from baz 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("bar")),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("bar"): ProjectProperties{
-				Source: "baz",
-			},
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar from baz 1.0.0",
-		),
-	},
-	"overridden mismatched net addrs, alt in root": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "bar from baz 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("bar")),
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("bar"): ProjectProperties{
-				Source: "baz",
-			},
-		},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar from baz 1.0.0",
-		),
-	},
-	"require package": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "bar 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-		},
-		require: []string{"baz"},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-			"baz 1.0.0",
-		),
-	},
-	"require activates constraints": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "foo 1.0.0", "bar 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("bar 1.1.0"),
-				pkg("bar")),
-		},
-		require: []string{"bar"},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-		),
-	},
-	"require subpackage": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "bar 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo", "bar")),
-			dsp(mkDepspec("bar 1.0.0"),
-				pkg("bar")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz", "baz/qux"),
-				pkg("baz/qux")),
-		},
-		require: []string{"baz/qux"},
-		r: mksolution(
-			"foo 1.0.0",
-			"bar 1.0.0",
-			mklp("baz 1.0.0", "qux"),
-		),
-	},
-	"require impossible subpackage": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0", "baz 1.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0"),
-				pkg("foo")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("baz 2.0.0"),
-				pkg("baz", "baz/qux"),
-				pkg("baz/qux")),
-		},
-		require: []string{"baz/qux"},
-		fail: &noVersionError{
-			pn: mkPI("baz"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("baz 2.0.0"),
-						failparent: []dependency{mkDep("root", "baz 1.0.0", "baz/qux")},
-						c:          NewVersion("1.0.0"),
-					},
-				},
-				{
-					v: NewVersion("1.0.0"),
-					f: &checkeeHasProblemPackagesFailure{
-						goal: mkAtom("baz 1.0.0"),
-						failpkg: map[string]errDeppers{
-							"baz/qux": {
-								err: nil, // nil indicates package is missing
-								deppers: []atom{
-									mkAtom("root"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	},
-	"require subpkg conflicts with other dep constraint": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0", "baz 1.0.0"),
-				pkg("foo", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("baz 2.0.0"),
-				pkg("baz", "baz/qux"),
-				pkg("baz/qux")),
-		},
-		require: []string{"baz/qux"},
-		fail: &noVersionError{
-			pn: mkPI("baz"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("baz 2.0.0"),
-						failparent: []dependency{mkDep("foo 1.0.0", "baz 1.0.0", "baz")},
-						c:          NewVersion("1.0.0"),
-					},
-				},
-				{
-					v: NewVersion("1.0.0"),
-					f: &checkeeHasProblemPackagesFailure{
-						goal: mkAtom("baz 1.0.0"),
-						failpkg: map[string]errDeppers{
-							"baz/qux": {
-								err: nil, // nil indicates package is missing
-								deppers: []atom{
-									mkAtom("root"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	},
-	"require independent subpkg conflicts with other dep constraint": {
-		ds: []depspec{
-			dsp(mkDepspec("root 0.0.0"),
-				pkg("root", "foo")),
-			dsp(mkDepspec("foo 1.0.0", "baz 1.0.0"),
-				pkg("foo", "baz")),
-			dsp(mkDepspec("baz 1.0.0"),
-				pkg("baz")),
-			dsp(mkDepspec("baz 2.0.0"),
-				pkg("baz"),
-				pkg("baz/qux")),
-		},
-		require: []string{"baz/qux"},
-		fail: &noVersionError{
-			pn: mkPI("baz"),
-			fails: []failedVersion{
-				{
-					v: NewVersion("2.0.0"),
-					f: &versionNotAllowedFailure{
-						goal:       mkAtom("baz 2.0.0"),
-						failparent: []dependency{mkDep("foo 1.0.0", "baz 1.0.0", "baz")},
-						c:          NewVersion("1.0.0"),
-					},
-				},
-				{
-					v: NewVersion("1.0.0"),
-					f: &checkeeHasProblemPackagesFailure{
-						goal: mkAtom("baz 1.0.0"),
-						failpkg: map[string]errDeppers{
-							"baz/qux": {
-								err: nil, // nil indicates package is missing
-								deppers: []atom{
-									mkAtom("root"),
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	},
-}
-
-// tpkg is a representation of a single package. It has its own import path, as
-// well as a list of paths it itself "imports".
-type tpkg struct {
-	// Full import path of this package
-	path string
-	// Slice of full paths to its virtual imports
-	imports []string
-}
-
-type bimodalFixture struct {
-	// name of this fixture datum
-	n string
-	// bimodal project; first is always treated as root project
-	ds []depspec
-	// results; map of name/version pairs
-	r map[ProjectIdentifier]LockedProject
-	// max attempts the solver should need to find solution. 0 means no limit
-	maxAttempts int
-	// Use downgrade instead of default upgrade sorter
-	downgrade bool
-	// lock file simulator, if one's to be used at all
-	l fixLock
-	// map of locks for deps, if any. keys should be of the form:
-	// "<project> <version>"
-	lm map[string]fixLock
-	// solve failure expected, if any
-	fail error
-	// overrides, if any
-	ovr ProjectConstraints
-	// request up/downgrade to all projects
-	changeall bool
-	// pkgs to ignore
-	ignore []string
-	// pkgs to require
-	require []string
-	// if the fixture is currently broken/expected to fail, this has a message
-	// recording why
-	broken string
-}
-
-func (f bimodalFixture) name() string {
-	return f.n
-}
-
-func (f bimodalFixture) specs() []depspec {
-	return f.ds
-}
-
-func (f bimodalFixture) maxTries() int {
-	return f.maxAttempts
-}
-
-func (f bimodalFixture) solution() map[ProjectIdentifier]LockedProject {
-	return f.r
-}
-
-func (f bimodalFixture) rootmanifest() RootManifest {
-	m := simpleRootManifest{
-		c:   pcSliceToMap(f.ds[0].deps),
-		ovr: f.ovr,
-		ig:  pkgtree.NewIgnoredRuleset(f.ignore),
-		req: make(map[string]bool),
-	}
-	for _, req := range f.require {
-		m.req[req] = true
-	}
-
-	return m
-}
-
-func (f bimodalFixture) rootTree() pkgtree.PackageTree {
-	pt := pkgtree.PackageTree{
-		ImportRoot: string(f.ds[0].n),
-		Packages:   map[string]pkgtree.PackageOrErr{},
-	}
-
-	for _, pkg := range f.ds[0].pkgs {
-		elems := strings.Split(pkg.path, "/")
-		pt.Packages[pkg.path] = pkgtree.PackageOrErr{
-			P: pkgtree.Package{
-				ImportPath: pkg.path,
-				Name:       elems[len(elems)-1],
-				// TODO(sdboyer) ugh, tpkg type has no space for supporting test
-				// imports...
-				Imports: pkg.imports,
-			},
-		}
-	}
-
-	return pt
-}
-
-func (f bimodalFixture) failure() error {
-	return f.fail
-}
-
-// bmSourceManager is an SM specifically for the bimodal fixtures. It composes
-// the general depspec SM, and differs from it in how it answers static analysis
-// calls, and its support for package ignores and dep lock data.
-type bmSourceManager struct {
-	depspecSourceManager
-	lm map[string]fixLock
-}
-
-var _ SourceManager = &bmSourceManager{}
-
-func newbmSM(bmf bimodalFixture) *bmSourceManager {
-	sm := &bmSourceManager{
-		depspecSourceManager: *newdepspecSM(bmf.ds, bmf.ignore),
-	}
-	sm.rm = computeBimodalExternalMap(bmf.ds)
-	sm.lm = bmf.lm
-
-	return sm
-}
-
-func (sm *bmSourceManager) ListPackages(id ProjectIdentifier, v Version) (pkgtree.PackageTree, error) {
-	// Deal with address-based root-switching with both case folding and
-	// alternate sources.
-	var src, fsrc, root, froot string
-	src, fsrc = id.normalizedSource(), toFold(id.normalizedSource())
-	if id.Source != "" {
-		root = string(id.ProjectRoot)
-		froot = toFold(root)
-	} else {
-		root, froot = src, fsrc
-	}
-
-	for k, ds := range sm.specs {
-		// Cheat for root, otherwise we blow up b/c version is empty
-		if fsrc == string(ds.n) && (k == 0 || ds.v.Matches(v)) {
-			var replace bool
-			if root != string(ds.n) {
-				// We're in a case-varying lookup; ensure we replace the actual
-				// leading ProjectRoot portion of import paths with the literal
-				// string from the input.
-				replace = true
-			}
-
-			ptree := pkgtree.PackageTree{
-				ImportRoot: src,
-				Packages:   make(map[string]pkgtree.PackageOrErr),
-			}
-			for _, pkg := range ds.pkgs {
-				if replace {
-					pkg.path = strings.Replace(pkg.path, froot, root, 1)
-				}
-				ptree.Packages[pkg.path] = pkgtree.PackageOrErr{
-					P: pkgtree.Package{
-						ImportPath: pkg.path,
-						Name:       filepath.Base(pkg.path),
-						Imports:    pkg.imports,
-					},
-				}
-			}
-
-			return ptree, nil
-		}
-	}
-
-	return pkgtree.PackageTree{}, fmt.Errorf("Project %s at version %s could not be found", id, v)
-}
-
-func (sm *bmSourceManager) GetManifestAndLock(id ProjectIdentifier, v Version, an ProjectAnalyzer) (Manifest, Lock, error) {
-	src := toFold(id.normalizedSource())
-	for _, ds := range sm.specs {
-		if src == string(ds.n) && v.Matches(ds.v) {
-			if l, exists := sm.lm[src+" "+v.String()]; exists {
-				return ds, l, nil
-			}
-			return ds, dummyLock{}, nil
-		}
-	}
-
-	// TODO(sdboyer) proper solver-type errors
-	return nil, nil, fmt.Errorf("Project %s at version %s could not be found", id, v)
-}
-
-// computeBimodalExternalMap takes a set of depspecs and computes an
-// internally-versioned ReachMap that is useful for quickly answering
-// ReachMap.Flatten()-type calls.
-//
-// Note that it does not do things like stripping out stdlib packages - these
-// maps are intended for use in SM fixtures, and that's a higher-level
-// responsibility within the system.
-func computeBimodalExternalMap(specs []depspec) map[pident]map[string][]string {
-	// map of project name+version -> map of subpkg name -> external pkg list
-	rm := make(map[pident]map[string][]string)
-
-	for _, ds := range specs {
-		ptree := pkgtree.PackageTree{
-			ImportRoot: string(ds.n),
-			Packages:   make(map[string]pkgtree.PackageOrErr),
-		}
-		for _, pkg := range ds.pkgs {
-			ptree.Packages[pkg.path] = pkgtree.PackageOrErr{
-				P: pkgtree.Package{
-					ImportPath: pkg.path,
-					Name:       filepath.Base(pkg.path),
-					Imports:    pkg.imports,
-				},
-			}
-		}
-		reachmap, em := ptree.ToReachMap(false, true, true, nil)
-		if len(em) > 0 {
-			panic(fmt.Sprintf("pkgs with errors in reachmap processing: %s", em))
-		}
-
-		drm := make(map[string][]string)
-		for ip, ie := range reachmap {
-			drm[ip] = ie.External
-		}
-		rm[pident{n: ds.n, v: ds.v}] = drm
-	}
-
-	return rm
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/solve_test.go b/installer/vendor/github.com/golang/dep/internal/gps/solve_test.go
deleted file mode 100644
index c80d7d7c24..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/solve_test.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-// overrideMkBridge overrides the base bridge with the depspecBridge that skips
-// verifyRootDir calls
-func overrideMkBridge(s *solver, sm SourceManager, down bool) sourceBridge {
-	return &depspecBridge{mkBridge(s, sm, down)}
-}
-
-func fixSolve(params SolveParameters, sm SourceManager, t *testing.T) (Solution, error) {
-	// Trace unconditionally; by passing the trace through t.Log(), the testing
-	// system will decide whether or not to actually show the output (based on
-	// -v, or selectively on test failure).
-	params.TraceLogger = log.New(test.Writer{TB: t}, "", 0)
-	// always return false, otherwise it would identify pretty much all of
-	// our fixtures as being stdlib and skip everything
-	params.stdLibFn = func(string) bool { return false }
-	params.mkBridgeFn = overrideMkBridge
-	s, err := Prepare(params, sm)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.Solve()
-}
-
-// Test all the basic table fixtures.
-//
-// Or, just the one named in the fix arg.
-func TestBasicSolves(t *testing.T) {
-	// sort them by their keys so we get stable output
-	names := make([]string, 0, len(basicFixtures))
-	for n := range basicFixtures {
-		names = append(names, n)
-	}
-
-	sort.Strings(names)
-	for _, n := range names {
-		n := n
-		t.Run(n, func(t *testing.T) {
-			t.Parallel()
-			solveBasicsAndCheck(basicFixtures[n], t)
-		})
-	}
-}
-
-func solveBasicsAndCheck(fix basicFixture, t *testing.T) (res Solution, err error) {
-	sm := newdepspecSM(fix.ds, nil)
-	if fix.broken != "" {
-		t.Skip(fix.broken)
-	}
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		Lock:            dummyLock{},
-		Downgrade:       fix.downgrade,
-		ChangeAll:       fix.changeall,
-		ToChange:        fix.changelist,
-		ProjectAnalyzer: naiveAnalyzer{},
-	}
-
-	if fix.l != nil {
-		params.Lock = fix.l
-	}
-
-	res, err = fixSolve(params, sm, t)
-
-	return fixtureSolveSimpleChecks(fix, res, err, t)
-}
-
-// Test all the bimodal table fixtures.
-//
-// Or, just the one named in the fix arg.
-func TestBimodalSolves(t *testing.T) {
-	// sort them by their keys so we get stable output
-	names := make([]string, 0, len(bimodalFixtures))
-	for n := range bimodalFixtures {
-		names = append(names, n)
-	}
-
-	sort.Strings(names)
-	for _, n := range names {
-		n := n
-		t.Run(n, func(t *testing.T) {
-			t.Parallel()
-			solveBimodalAndCheck(bimodalFixtures[n], t)
-		})
-	}
-}
-
-func solveBimodalAndCheck(fix bimodalFixture, t *testing.T) (res Solution, err error) {
-	sm := newbmSM(fix)
-	if fix.broken != "" {
-		t.Skip(fix.broken)
-	}
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		Lock:            dummyLock{},
-		Downgrade:       fix.downgrade,
-		ChangeAll:       fix.changeall,
-		ProjectAnalyzer: naiveAnalyzer{},
-	}
-
-	if fix.l != nil {
-		params.Lock = fix.l
-	}
-
-	res, err = fixSolve(params, sm, t)
-
-	return fixtureSolveSimpleChecks(fix, res, err, t)
-}
-
-func fixtureSolveSimpleChecks(fix specfix, soln Solution, err error, t *testing.T) (Solution, error) {
-	ppi := func(id ProjectIdentifier) string {
-		// need this so we can clearly tell if there's a Source or not
-		if id.Source == "" {
-			return string(id.ProjectRoot)
-		}
-		return fmt.Sprintf("%s (from %s)", id.ProjectRoot, id.Source)
-	}
-
-	pv := func(v Version) string {
-		if pv, ok := v.(PairedVersion); ok {
-			return fmt.Sprintf("%s (%s)", pv.Unpair(), pv.Revision())
-		}
-		return v.String()
-	}
-
-	fixfail := fix.failure()
-	if err != nil {
-		if fixfail == nil {
-			t.Errorf("Solve failed unexpectedly:\n%s", err)
-		} else if !(fixfail.Error() == err.Error()) {
-			// TODO(sdboyer) reflect.DeepEqual works for now, but once we start
-			// modeling more complex cases, this should probably become more robust
-			t.Errorf("Failure mismatch:\n\t(GOT): %s\n\t(WNT): %s", err, fixfail)
-		}
-	} else if fixfail != nil {
-		var buf bytes.Buffer
-		fmt.Fprintf(&buf, "Solver succeeded, but expecting failure:\n%s\nProjects in solution:", fixfail)
-		for _, p := range soln.Projects() {
-			fmt.Fprintf(&buf, "\n\t- %s at %s", ppi(p.Ident()), p.Version())
-		}
-		t.Error(buf.String())
-	} else {
-		r := soln.(solution)
-		if fix.maxTries() > 0 && r.Attempts() > fix.maxTries() {
-			t.Errorf("Solver completed in %v attempts, but expected %v or fewer", r.att, fix.maxTries())
-		}
-
-		// Dump result projects into a map for easier interrogation
-		rp := make(map[ProjectIdentifier]LockedProject)
-		for _, lp := range r.p {
-			rp[lp.pi] = lp
-		}
-
-		fixlen, rlen := len(fix.solution()), len(rp)
-		if fixlen != rlen {
-			// Different length, so they definitely disagree
-			t.Errorf("Solver reported %v package results, result expected %v", rlen, fixlen)
-		}
-
-		// Whether or not len is same, still have to verify that results agree
-		// Walk through fixture/expected results first
-		for id, flp := range fix.solution() {
-			if lp, exists := rp[id]; !exists {
-				t.Errorf("Project %q expected but missing from results", ppi(id))
-			} else {
-				// delete result from map so we skip it on the reverse pass
-				delete(rp, id)
-				if flp.Version() != lp.Version() {
-					t.Errorf("Expected version %q of project %q, but actual version was %q", pv(flp.Version()), ppi(id), pv(lp.Version()))
-				}
-
-				if !reflect.DeepEqual(lp.pkgs, flp.pkgs) {
-					t.Errorf("Package list was not not as expected for project %s@%s:\n\t(GOT) %s\n\t(WNT) %s", ppi(id), pv(lp.Version()), lp.pkgs, flp.pkgs)
-				}
-			}
-		}
-
-		// Now walk through remaining actual results
-		for id, lp := range rp {
-			if _, exists := fix.solution()[id]; !exists {
-				t.Errorf("Unexpected project %s@%s present in results, with pkgs:\n\t%s", ppi(id), pv(lp.Version()), lp.pkgs)
-			}
-		}
-	}
-
-	return soln, err
-}
-
-// This tests that, when a root lock is underspecified (has only a version) we
-// don't allow a match on that version from a rev in the manifest. We may allow
-// this in the future, but disallow it for now because going from an immutable
-// requirement to a mutable lock automagically is a bad direction that could
-// produce weird side effects.
-func TestRootLockNoVersionPairMatching(t *testing.T) {
-	fix := basicFixture{
-		n: "does not match unpaired lock versions with paired real versions",
-		ds: []depspec{
-			mkDepspec("root 0.0.0", "foo *"), // foo's constraint rewritten below to foorev
-			mkDepspec("foo 1.0.0", "bar 1.0.0"),
-			mkDepspec("foo 1.0.1 foorev", "bar 1.0.1"),
-			mkDepspec("foo 1.0.2 foorev", "bar 1.0.2"),
-			mkDepspec("bar 1.0.0"),
-			mkDepspec("bar 1.0.1"),
-			mkDepspec("bar 1.0.2"),
-		},
-		l: mklock(
-			"foo 1.0.1",
-		),
-		r: mksolution(
-			"foo 1.0.2 foorev",
-			"bar 1.0.2",
-		),
-	}
-
-	pd := fix.ds[0].deps[0]
-	pd.Constraint = Revision("foorev")
-	fix.ds[0].deps[0] = pd
-
-	sm := newdepspecSM(fix.ds, nil)
-
-	l2 := make(fixLock, 1)
-	copy(l2, fix.l)
-	l2[0].v = nil
-
-	params := SolveParameters{
-		RootDir:         string(fix.ds[0].n),
-		RootPackageTree: fix.rootTree(),
-		Manifest:        fix.rootmanifest(),
-		Lock:            l2,
-		ProjectAnalyzer: naiveAnalyzer{},
-	}
-
-	res, err := fixSolve(params, sm, t)
-
-	fixtureSolveSimpleChecks(fix, res, err, t)
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/solver_inputs_test.go b/installer/vendor/github.com/golang/dep/internal/gps/solver_inputs_test.go
deleted file mode 100644
index 0393597fdc..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/solver_inputs_test.go
+++ /dev/null
@@ -1,228 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"log"
-	"math/rand"
-	"strconv"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/golang/dep/internal/test"
-)
-
-// TestBadSolveOpts exercises the different possible inputs to a solver that can
-// be determined as invalid in Prepare(), without any further work
-func TestBadSolveOpts(t *testing.T) {
-	pn := strconv.FormatInt(rand.Int63(), 36)
-	fix := basicFixtures["no dependencies"]
-	fix.ds[0].n = ProjectRoot(pn)
-
-	sm := newdepspecSM(fix.ds, nil)
-	params := SolveParameters{
-		mkBridgeFn: overrideMkBridge,
-	}
-
-	_, err := Prepare(params, nil)
-	if err == nil {
-		t.Errorf("Prepare should have errored on nil SourceManager")
-	} else if !strings.Contains(err.Error(), "non-nil SourceManager") {
-		t.Error("Prepare should have given error on nil SourceManager, but gave:", err)
-	}
-
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Prepare should have errored without ProjectAnalyzer")
-	} else if !strings.Contains(err.Error(), "must provide a ProjectAnalyzer") {
-		t.Error("Prepare should have given error without ProjectAnalyzer, but gave:", err)
-	}
-
-	params.ProjectAnalyzer = naiveAnalyzer{}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Prepare should have errored on empty root")
-	} else if !strings.Contains(err.Error(), "non-empty root directory") {
-		t.Error("Prepare should have given error on empty root, but gave:", err)
-	}
-
-	params.RootDir = pn
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Prepare should have errored on empty name")
-	} else if !strings.Contains(err.Error(), "non-empty import root") {
-		t.Error("Prepare should have given error on empty import root, but gave:", err)
-	}
-
-	params.RootPackageTree = pkgtree.PackageTree{
-		ImportRoot: pn,
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Prepare should have errored on empty name")
-	} else if !strings.Contains(err.Error(), "at least one package") {
-		t.Error("Prepare should have given error on empty import root, but gave:", err)
-	}
-
-	params.RootPackageTree = pkgtree.PackageTree{
-		ImportRoot: pn,
-		Packages: map[string]pkgtree.PackageOrErr{
-			pn: {
-				P: pkgtree.Package{
-					ImportPath: pn,
-					Name:       pn,
-				},
-			},
-		},
-	}
-	params.TraceLogger = log.New(ioutil.Discard, "", 0)
-
-	params.Manifest = simpleRootManifest{
-		ovr: ProjectConstraints{
-			ProjectRoot("foo"): ProjectProperties{},
-		},
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on override with empty ProjectProperties")
-	} else if !strings.Contains(err.Error(), "foo, but without any non-zero properties") {
-		t.Error("Prepare should have given error override with empty ProjectProperties, but gave:", err)
-	}
-
-	params.Manifest = simpleRootManifest{
-		ig:  pkgtree.NewIgnoredRuleset([]string{"foo"}),
-		req: map[string]bool{"foo": true},
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on pkg both ignored and required")
-	} else if !strings.Contains(err.Error(), "was given as both a required and ignored package") {
-		t.Error("Prepare should have given error with single ignore/require conflict error, but gave:", err)
-	}
-
-	params.Manifest = simpleRootManifest{
-		ig:  pkgtree.NewIgnoredRuleset([]string{"foo", "bar"}),
-		req: map[string]bool{"foo": true, "bar": true},
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on pkg both ignored and required")
-	} else if !strings.Contains(err.Error(), "multiple packages given as both required and ignored:") {
-		t.Error("Prepare should have given error with multiple ignore/require conflict error, but gave:", err)
-	}
-
-	params.Manifest = simpleRootManifest{
-		ig:  pkgtree.NewIgnoredRuleset([]string{"foo*"}),
-		req: map[string]bool{"foo/bar": true},
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on pkg both ignored (with wildcard) and required")
-	} else if !strings.Contains(err.Error(), "was given as both a required and ignored package") {
-		t.Error("Prepare should have given error with single ignore/require conflict error, but gave:", err)
-	}
-	params.Manifest = nil
-
-	params.ToChange = []ProjectRoot{"foo"}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on non-empty ToChange without a lock provided")
-	} else if !strings.Contains(err.Error(), "update specifically requested for") {
-		t.Error("Prepare should have given error on ToChange without Lock, but gave:", err)
-	}
-
-	params.Lock = safeLock{
-		p: []LockedProject{
-			NewLockedProject(mkPI("bar"), Revision("makebelieve"), nil),
-		},
-	}
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on ToChange containing project not in lock")
-	} else if !strings.Contains(err.Error(), "cannot update foo as it is not in the lock") {
-		t.Error("Prepare should have given error on ToChange with item not present in Lock, but gave:", err)
-	}
-
-	params.Lock, params.ToChange = nil, nil
-	_, err = Prepare(params, sm)
-	if err != nil {
-		t.Error("Basic conditions satisfied, prepare should have completed successfully, err as:", err)
-	}
-
-	// swap out the test mkBridge override temporarily, just to make sure we get
-	// the right error
-	params.mkBridgeFn = nil
-
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on nonexistent root")
-	} else if !strings.Contains(err.Error(), "could not read project root") {
-		t.Error("Prepare should have given error nonexistent project root dir, but gave:", err)
-	}
-
-	// Pointing it at a file should also be an err
-	params.RootDir = "solve_test.go"
-	_, err = Prepare(params, sm)
-	if err == nil {
-		t.Errorf("Should have errored on file for RootDir")
-	} else if !strings.Contains(err.Error(), "is a file, not a directory") {
-		t.Error("Prepare should have given error on file as RootDir, but gave:", err)
-	}
-}
-
-func TestValidateParams(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	cacheDir := "gps-cache"
-	h.TempDir(cacheDir)
-	sm, err := NewSourceManager(SourceManagerConfig{
-		Cachedir: h.Path(cacheDir),
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	h.Must(err)
-	defer sm.Release()
-
-	h.TempDir("src")
-
-	testcases := []struct {
-		imports []string
-		err     bool
-	}{
-		{[]string{"google.com/non-existing/package"}, true},
-		{[]string{"google.com/non-existing/package/subpkg"}, true},
-		{[]string{"github.com/sdboyer/testrepo"}, false},
-		{[]string{"github.com/sdboyer/testrepo/subpkg"}, false},
-	}
-
-	params := SolveParameters{
-		ProjectAnalyzer: naiveAnalyzer{},
-		RootDir:         h.Path("src"),
-		RootPackageTree: pkgtree.PackageTree{
-			ImportRoot: "github.com/sdboyer/dep",
-		},
-	}
-
-	for _, tc := range testcases {
-		params.RootPackageTree.Packages = map[string]pkgtree.PackageOrErr{
-			"github.com/sdboyer/dep": {
-				P: pkgtree.Package{
-					Name:       "github.com/sdboyer/dep",
-					ImportPath: "github.com/sdboyer/dep",
-					Imports:    tc.imports,
-				},
-			},
-		}
-
-		err = ValidateParams(params, sm)
-		if tc.err && err == nil {
-			t.Fatalf("expected an error when deducing package fails, got none")
-		} else if !tc.err && err != nil {
-			t.Fatalf("deducing packges should have succeeded, got err: %#v", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_encode_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_encode_test.go
deleted file mode 100644
index c4f7dd2f92..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_encode_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"bytes"
-	"testing"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-)
-
-func TestPropertiesFromCache(t *testing.T) {
-	for _, test := range []struct {
-		name string
-		ip   ProjectRoot
-		pp   ProjectProperties
-	}{
-		{"defaultBranch",
-			"root", ProjectProperties{"", newDefaultBranch("test")}},
-		{"branch",
-			"root", ProjectProperties{"source", NewBranch("test")}},
-		{"semver",
-			"root", ProjectProperties{"", testSemverConstraint(t, "^1.0.0")}},
-		{"rev",
-			"root", ProjectProperties{"source", Revision("test")}},
-		{"any",
-			"root", ProjectProperties{"source", Any()}},
-	} {
-		t.Run(test.name, func(t *testing.T) {
-			var buf projectPropertiesMsgs
-			buf.copyFrom(test.ip, test.pp)
-			v, err := proto.Marshal(&buf.pp)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if err := proto.Unmarshal(v, &buf.pp); err != nil {
-				t.Fatal(err)
-			} else {
-				ip, pp, err := propertiesFromCache(&buf.pp)
-				if err != nil {
-					t.Fatal(err)
-				}
-				if ip != test.ip {
-					t.Errorf("decoded unexpected ProjectRoot:\n\t(GOT): %#v\n\t(WNT): %#v", ip, test.ip)
-				}
-				if pp.Source != test.pp.Source {
-					t.Errorf("decoded unexpected ProjectRoot.Source:\n\t(GOT): %s\n\t (WNT): %s", pp.Source, test.pp.Source)
-				}
-				if !pp.Constraint.identical(test.pp.Constraint) {
-					t.Errorf("decoded non-identical ProjectRoot.Constraint:\n\t(GOT): %#v\n\t(WNT): %#v", pp.Constraint, test.pp.Constraint)
-				}
-			}
-		})
-	}
-}
-
-func TestCacheTimestampedKey(t *testing.T) {
-	pre := byte('p')
-	for _, test := range []struct {
-		ts     time.Time
-		suffix []byte
-	}{
-		{time.Unix(0, 0), []byte{0, 0, 0, 0, 0, 0, 0, 0}},
-		{time.Unix(100, 0), []byte{0, 0, 0, 0, 0, 0, 0, 100}},
-		{time.Unix(255, 0), []byte{0, 0, 0, 0, 0, 0, 0, 255}},
-		{time.Unix(1+1<<8+1<<16+1<<24, 0), []byte{0, 0, 0, 0, 1, 1, 1, 1}},
-		{time.Unix(255<<48, 0), []byte{0, 255, 0, 0, 0, 0, 0, 0}},
-	} {
-		b := cacheTimestampedKey(pre, test.ts)
-		if !bytes.Equal(b, append([]byte{pre}, test.suffix...)) {
-			t.Errorf("unexpected suffix:\n\t(GOT):%v\n\t(WNT):%v", b[4:], test.suffix)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_test.go
deleted file mode 100644
index d2d2d16710..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_bolt_test.go
+++ /dev/null
@@ -1,298 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"log"
-	"testing"
-	"time"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestBoltCacheTimeout(t *testing.T) {
-	const root = "example.com/test"
-	cpath, err := ioutil.TempDir("", "singlesourcecache")
-	if err != nil {
-		t.Fatalf("Failed to create temp cache dir: %s", err)
-	}
-	pi := ProjectIdentifier{ProjectRoot: root}
-	logger := log.New(test.Writer{TB: t}, "", 0)
-
-	start := time.Now()
-	bc, err := newBoltCache(cpath, start.Unix(), logger)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer bc.close()
-	c := bc.newSingleSourceCache(pi)
-
-	rev := Revision("test")
-	ai := ProjectAnalyzerInfo{Name: "name", Version: 42}
-
-	manifest := &simpleRootManifest{
-		c: ProjectConstraints{
-			ProjectRoot("foo"): ProjectProperties{
-				Constraint: Any(),
-			},
-			ProjectRoot("bar"): ProjectProperties{
-				Source:     "whatever",
-				Constraint: testSemverConstraint(t, "> 1.3"),
-			},
-		},
-		ovr: ProjectConstraints{
-			ProjectRoot("b"): ProjectProperties{
-				Constraint: testSemverConstraint(t, "2.0.0"),
-			},
-		},
-	}
-
-	lock := &safeLock{
-		h: []byte("test_hash"),
-		p: []LockedProject{
-			NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}),
-			NewLockedProject(mkPI("github.com/sdboyer/gps2"), NewVersion("v0.10.0"), nil),
-			NewLockedProject(mkPI("github.com/sdboyer/gps3"), NewVersion("v0.10.0"), []string{"gps", "flugle"}),
-			NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}),
-			NewLockedProject(mkPI("github.com/sdboyer/gps4"), NewVersion("v0.10.0"), []string{"flugle", "gps"}),
-		},
-	}
-
-	ptree := pkgtree.PackageTree{
-		ImportRoot: root,
-		Packages: map[string]pkgtree.PackageOrErr{
-			"simple": {
-				P: pkgtree.Package{
-					ImportPath:  "simple",
-					CommentPath: "comment",
-					Name:        "simple",
-					Imports: []string{
-						"github.com/golang/dep/internal/gps",
-						"sort",
-					},
-				},
-			},
-			"m1p": {
-				P: pkgtree.Package{
-					ImportPath:  "m1p",
-					CommentPath: "",
-					Name:        "m1p",
-					Imports: []string{
-						"github.com/golang/dep/internal/gps",
-						"os",
-						"sort",
-					},
-				},
-			},
-		},
-	}
-
-	pvs := []PairedVersion{
-		NewBranch("originalbranch").Pair("rev1"),
-		NewVersion("originalver").Pair("rev2"),
-	}
-
-	// Write values timestamped > `start`.
-	{
-		c.setManifestAndLock(rev, ai, manifest, lock)
-		c.setPackageTree(rev, ptree)
-		c.setVersionMap(pvs)
-	}
-	// Read back values timestamped > `start`.
-	{
-		gotM, gotL, ok := c.getManifestAndLock(rev, ai)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, manifest, gotM)
-		if dl := DiffLocks(lock, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-
-		got, ok := c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", ptree)
-		}
-		comparePackageTree(t, ptree, got)
-
-		gotV, ok := c.getAllVersions()
-		if !ok || len(gotV) != len(pvs) {
-			t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, pvs)
-		} else {
-			SortPairedForDowngrade(gotV)
-			for i := range pvs {
-				if !pvs[i].identical(gotV[i]) {
-					t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, pvs)
-					break
-				}
-			}
-		}
-	}
-
-	if err := bc.close(); err != nil {
-		t.Fatal("failed to close cache:", err)
-	}
-
-	// Read with a later epoch. Expect no *timestamped* values, since all were < `after`.
-	{
-		after := start.Add(1000 * time.Hour)
-		bc, err = newBoltCache(cpath, after.Unix(), logger)
-		if err != nil {
-			t.Fatal(err)
-		}
-		c = bc.newSingleSourceCache(pi)
-
-		gotM, gotL, ok := c.getManifestAndLock(rev, ai)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, manifest, gotM)
-		if dl := DiffLocks(lock, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-
-		gotPtree, ok := c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", ptree)
-		}
-		comparePackageTree(t, ptree, gotPtree)
-
-		pvs, ok := c.getAllVersions()
-		if ok || len(pvs) > 0 {
-			t.Errorf("expected no cached versions, but got:\n\t%#v", pvs)
-		}
-	}
-
-	if err := bc.close(); err != nil {
-		t.Fatal("failed to close cache:", err)
-	}
-
-	// Re-connect with the original epoch.
-	bc, err = newBoltCache(cpath, start.Unix(), logger)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c = bc.newSingleSourceCache(pi)
-	// Read values timestamped > `start`.
-	{
-		gotM, gotL, ok := c.getManifestAndLock(rev, ai)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, manifest, gotM)
-		if dl := DiffLocks(lock, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-
-		got, ok := c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", ptree)
-		}
-		comparePackageTree(t, ptree, got)
-
-		gotV, ok := c.getAllVersions()
-		if !ok || len(gotV) != len(pvs) {
-			t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, pvs)
-		} else {
-			SortPairedForDowngrade(gotV)
-			for i := range pvs {
-				if !pvs[i].identical(gotV[i]) {
-					t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, pvs)
-					break
-				}
-			}
-		}
-	}
-
-	// New values.
-	newManifest := &simpleRootManifest{
-		c: ProjectConstraints{
-			ProjectRoot("foo"): ProjectProperties{
-				Constraint: NewBranch("master"),
-			},
-			ProjectRoot("bar"): ProjectProperties{
-				Source:     "whatever",
-				Constraint: testSemverConstraint(t, "> 1.5"),
-			},
-		},
-	}
-
-	newLock := &safeLock{
-		h: []byte("new_test_hash"),
-		p: []LockedProject{
-			NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v1"), []string{"gps"}),
-		},
-	}
-
-	newPtree := pkgtree.PackageTree{
-		ImportRoot: root,
-		Packages: map[string]pkgtree.PackageOrErr{
-			"simple": {
-				P: pkgtree.Package{
-					ImportPath:  "simple",
-					CommentPath: "newcomment",
-					Name:        "simple",
-					Imports: []string{
-						"github.com/golang/dep/internal/gps42",
-						"test",
-					},
-				},
-			},
-			"m1p": {
-				P: pkgtree.Package{
-					ImportPath:  "m1p",
-					CommentPath: "",
-					Name:        "m1p",
-					Imports: []string{
-						"os",
-					},
-				},
-			},
-		},
-	}
-
-	newPVS := []PairedVersion{
-		NewBranch("newbranch").Pair("revA"),
-		NewVersion("newver").Pair("revB"),
-	}
-	// Overwrite with new values, and with timestamps > `after`.
-	{
-		c.setManifestAndLock(rev, ai, newManifest, newLock)
-		c.setPackageTree(rev, newPtree)
-		c.setVersionMap(newPVS)
-	}
-	// Read new values.
-	{
-		gotM, gotL, ok := c.getManifestAndLock(rev, ai)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, newManifest, gotM)
-		if dl := DiffLocks(newLock, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-
-		got, ok := c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", newPtree)
-		}
-		comparePackageTree(t, newPtree, got)
-
-		gotV, ok := c.getAllVersions()
-		if !ok || len(gotV) != len(newPVS) {
-			t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, newPVS)
-		} else {
-			SortPairedForDowngrade(gotV)
-			for i := range newPVS {
-				if !newPVS[i].identical(gotV[i]) {
-					t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", gotV, newPVS)
-					break
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_cache_test.go
deleted file mode 100644
index e219f4858f..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_cache_test.go
+++ /dev/null
@@ -1,578 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"log"
-	"reflect"
-	"sort"
-	"testing"
-	"time"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func Test_singleSourceCache(t *testing.T) {
-	newMem := func(*testing.T, string, string) (singleSourceCache, func() error) {
-		return newMemoryCache(), func() error { return nil }
-	}
-	t.Run("mem", singleSourceCacheTest{newCache: newMem}.run)
-
-	epoch := time.Now().Unix()
-	newBolt := func(t *testing.T, cachedir, root string) (singleSourceCache, func() error) {
-		pi := mkPI(root).normalize()
-		bc, err := newBoltCache(cachedir, epoch, log.New(test.Writer{TB: t}, "", 0))
-		if err != nil {
-			t.Fatal(err)
-		}
-		return bc.newSingleSourceCache(pi), bc.close
-	}
-	t.Run("bolt/keepOpen", singleSourceCacheTest{newCache: newBolt}.run)
-	t.Run("bolt/reOpen", singleSourceCacheTest{newCache: newBolt, persistent: true}.run)
-
-	newMulti := func(t *testing.T, cachedir, root string) (singleSourceCache, func() error) {
-		disk, close := newBolt(t, cachedir, root)
-		return &multiCache{mem: newMemoryCache(), disk: disk}, close
-	}
-	t.Run("multi/keepOpen", singleSourceCacheTest{newCache: newMulti}.run)
-	t.Run("multi/reOpen", singleSourceCacheTest{persistent: true, newCache: newMulti}.run)
-
-	t.Run("multi/keepOpen/noDisk", singleSourceCacheTest{
-		newCache: func(*testing.T, string, string) (singleSourceCache, func() error) {
-			return &multiCache{mem: newMemoryCache(), disk: discardCache{}}, func() error { return nil }
-		},
-	}.run)
-
-	t.Run("multi/reOpen/noMem", singleSourceCacheTest{
-		persistent: true,
-		newCache: func(t *testing.T, cachedir, root string) (singleSourceCache, func() error) {
-			disk, close := newBolt(t, cachedir, root)
-			return &multiCache{mem: discardCache{}, disk: disk}, close
-		},
-	}.run)
-}
-
-var testAnalyzerInfo = ProjectAnalyzerInfo{
-	Name:    "test-analyzer",
-	Version: 1,
-}
-
-type singleSourceCacheTest struct {
-	newCache   func(*testing.T, string, string) (cache singleSourceCache, close func() error)
-	persistent bool
-}
-
-// run tests singleSourceCache methods of caches returned by test.newCache.
-// For test.persistent caches, test.newCache is periodically called mid-test to ensure persistence.
-func (test singleSourceCacheTest) run(t *testing.T) {
-	const root = "example.com/test"
-	cpath, err := ioutil.TempDir("", "singlesourcecache")
-	if err != nil {
-		t.Fatalf("Failed to create temp cache dir: %s", err)
-	}
-
-	t.Run("info", func(t *testing.T) {
-		const rev Revision = "revision"
-
-		c, close := test.newCache(t, cpath, root)
-		defer func() {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-		}()
-
-		var m Manifest = &simpleRootManifest{
-			c: ProjectConstraints{
-				ProjectRoot("foo"): ProjectProperties{
-					Constraint: Any(),
-				},
-				ProjectRoot("bar"): ProjectProperties{
-					Source:     "whatever",
-					Constraint: testSemverConstraint(t, "> 1.3"),
-				},
-			},
-			ovr: ProjectConstraints{
-				ProjectRoot("b"): ProjectProperties{
-					Constraint: testSemverConstraint(t, "2.0.0"),
-				},
-			},
-			req: map[string]bool{
-				"c": true,
-				"d": true,
-			},
-			ig: pkgtree.NewIgnoredRuleset([]string{"a", "b"}),
-		}
-		var l Lock = &safeLock{
-			h: []byte("test_hash"),
-			p: []LockedProject{
-				NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0"), []string{"gps"}),
-				NewLockedProject(mkPI("github.com/sdboyer/gps2"), NewVersion("v0.10.0"), nil),
-				NewLockedProject(mkPI("github.com/sdboyer/gps3"), NewVersion("v0.10.0"), []string{"gps", "flugle"}),
-				NewLockedProject(mkPI("foo"), NewVersion("nada"), []string{"foo"}),
-				NewLockedProject(mkPI("github.com/sdboyer/gps4"), NewVersion("v0.10.0"), []string{"flugle", "gps"}),
-			},
-		}
-		c.setManifestAndLock(rev, testAnalyzerInfo, m, l)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		gotM, gotL, ok := c.getManifestAndLock(rev, testAnalyzerInfo)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, m, gotM)
-		if dl := DiffLocks(l, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-
-		m = &simpleRootManifest{
-			c: ProjectConstraints{
-				ProjectRoot("foo"): ProjectProperties{
-					Source:     "whatever",
-					Constraint: Any(),
-				},
-			},
-			ovr: ProjectConstraints{
-				ProjectRoot("bar"): ProjectProperties{
-					Constraint: testSemverConstraint(t, "2.0.0"),
-				},
-			},
-			req: map[string]bool{
-				"a": true,
-				"b": true,
-			},
-			ig: pkgtree.NewIgnoredRuleset([]string{"c", "d"}),
-		}
-		l = &safeLock{
-			h: []byte("different_test_hash"),
-			p: []LockedProject{
-				NewLockedProject(mkPI("github.com/sdboyer/gps"), NewVersion("v0.10.0").Pair("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-				NewLockedProject(mkPI("github.com/sdboyer/gps2"), NewVersion("v0.11.0"), []string{"gps"}),
-				NewLockedProject(mkPI("github.com/sdboyer/gps3"), Revision("278a227dfc3d595a33a77ff3f841fd8ca1bc8cd0"), []string{"gps"}),
-			},
-		}
-		c.setManifestAndLock(rev, testAnalyzerInfo, m, l)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		gotM, gotL, ok = c.getManifestAndLock(rev, testAnalyzerInfo)
-		if !ok {
-			t.Error("no manifest and lock found for revision")
-		}
-		compareManifests(t, m, gotM)
-		if dl := DiffLocks(l, gotL); dl != nil {
-			t.Errorf("lock differences:\n\t %#v", dl)
-		}
-	})
-
-	t.Run("pkgTree", func(t *testing.T) {
-		c, close := test.newCache(t, cpath, root)
-		defer func() {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-		}()
-
-		const rev Revision = "rev_adsfjkl"
-
-		if got, ok := c.getPackageTree(rev); ok {
-			t.Fatalf("unexpected result before setting package tree: %v", got)
-		}
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		pt := pkgtree.PackageTree{
-			ImportRoot: root,
-			Packages: map[string]pkgtree.PackageOrErr{
-				"simple": {
-					P: pkgtree.Package{
-						ImportPath:  "simple",
-						CommentPath: "comment",
-						Name:        "simple",
-						Imports: []string{
-							"github.com/golang/dep/internal/gps",
-							"sort",
-						},
-					},
-				},
-				"m1p": {
-					P: pkgtree.Package{
-						ImportPath:  "m1p",
-						CommentPath: "",
-						Name:        "m1p",
-						Imports: []string{
-							"github.com/golang/dep/internal/gps",
-							"os",
-							"sort",
-						},
-					},
-				},
-			},
-		}
-		c.setPackageTree(rev, pt)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		got, ok := c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", pt)
-		}
-		comparePackageTree(t, pt, got)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		pt = pkgtree.PackageTree{
-			ImportRoot: root,
-			Packages: map[string]pkgtree.PackageOrErr{
-				"test": {
-					Err: errors.New("error"),
-				},
-			},
-		}
-		c.setPackageTree(rev, pt)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		got, ok = c.getPackageTree(rev)
-		if !ok {
-			t.Errorf("no package tree found:\n\t(WNT): %#v", pt)
-		}
-		comparePackageTree(t, pt, got)
-	})
-
-	t.Run("versions", func(t *testing.T) {
-		c, close := test.newCache(t, cpath, root)
-		defer func() {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-		}()
-
-		const rev1, rev2 = "rev1", "rev2"
-		const br, ver = "branch_name", "2.10"
-		versions := []PairedVersion{
-			NewBranch(br).Pair(rev1),
-			NewVersion(ver).Pair(rev2),
-		}
-		SortPairedForDowngrade(versions)
-		c.setVersionMap(versions)
-
-		if test.persistent {
-			if err := close(); err != nil {
-				t.Fatal("failed to close cache:", err)
-			}
-			c, close = test.newCache(t, cpath, root)
-		}
-
-		t.Run("getAllVersions", func(t *testing.T) {
-			got, ok := c.getAllVersions()
-			if !ok || len(got) != len(versions) {
-				t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", got, versions)
-			} else {
-				SortPairedForDowngrade(got)
-				for i := range versions {
-					if !versions[i].identical(got[i]) {
-						t.Errorf("unexpected versions:\n\t(GOT): %#v\n\t(WNT): %#v", got, versions)
-						break
-					}
-				}
-			}
-		})
-
-		revToUV := map[Revision]UnpairedVersion{
-			rev1: NewBranch(br),
-			rev2: NewVersion(ver),
-		}
-
-		t.Run("getVersionsFor", func(t *testing.T) {
-			for rev, want := range revToUV {
-				rev, want := rev, want
-				t.Run(string(rev), func(t *testing.T) {
-					uvs, ok := c.getVersionsFor(rev)
-					if !ok {
-						t.Errorf("no version found:\n\t(WNT) %#v", want)
-					} else if len(uvs) != 1 {
-						t.Errorf("expected one result but got %d", len(uvs))
-					} else {
-						uv := uvs[0]
-						if uv.Type() != want.Type() {
-							t.Errorf("expected version type %d but got %d", want.Type(), uv.Type())
-						}
-						if uv.String() != want.String() {
-							t.Errorf("expected version %q but got %q", want.String(), uv.String())
-						}
-					}
-				})
-			}
-		})
-
-		t.Run("getRevisionFor", func(t *testing.T) {
-			for want, uv := range revToUV {
-				want, uv := want, uv
-				t.Run(uv.String(), func(t *testing.T) {
-					rev, ok := c.getRevisionFor(uv)
-					if !ok {
-						t.Errorf("expected revision %q but got none", want)
-					} else if rev != want {
-						t.Errorf("expected revision %q but got %q", want, rev)
-					}
-				})
-			}
-		})
-
-		t.Run("toRevision", func(t *testing.T) {
-			for want, uv := range revToUV {
-				want, uv := want, uv
-				t.Run(uv.String(), func(t *testing.T) {
-					rev, ok := c.toRevision(uv)
-					if !ok {
-						t.Errorf("expected revision %q but got none", want)
-					} else if rev != want {
-						t.Errorf("expected revision %q but got %q", want, rev)
-					}
-				})
-			}
-		})
-
-		t.Run("toUnpaired", func(t *testing.T) {
-			for rev, want := range revToUV {
-				rev, want := rev, want
-				t.Run(want.String(), func(t *testing.T) {
-					uv, ok := c.toUnpaired(rev)
-					if !ok {
-						t.Errorf("no UnpairedVersion found:\n\t(WNT): %#v", uv)
-					} else if !uv.identical(want) {
-						t.Errorf("unexpected UnpairedVersion:\n\t(GOT): %#v\n\t(WNT): %#v", uv, want)
-					}
-				})
-			}
-		})
-	})
-}
-
-// compareManifests compares two manifests and reports differences as test errors.
-func compareManifests(t *testing.T, want, got Manifest) {
-	if (want == nil || got == nil) && (got != nil || want != nil) {
-		t.Errorf("one manifest is nil:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		return
-	}
-	{
-		want, got := want.DependencyConstraints(), got.DependencyConstraints()
-		if !projectConstraintsEqual(want, got) {
-			t.Errorf("unexpected constraints:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		}
-	}
-
-	wantRM, wantOK := want.(RootManifest)
-	gotRM, gotOK := got.(RootManifest)
-	if wantOK && !gotOK {
-		t.Errorf("expected RootManifest:\n\t(GOT): %#v", got)
-		return
-	}
-	if gotOK && !wantOK {
-		t.Errorf("didn't expected RootManifest:\n\t(GOT): %#v", got)
-		return
-	}
-
-	{
-		want, got := wantRM.IgnoredPackages(), gotRM.IgnoredPackages()
-		if !reflect.DeepEqual(want.ToSlice(), got.ToSlice()) {
-			t.Errorf("unexpected ignored packages:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		}
-	}
-
-	{
-		want, got := wantRM.Overrides(), gotRM.Overrides()
-		if !projectConstraintsEqual(want, got) {
-			t.Errorf("unexpected overrides:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		}
-	}
-
-	{
-		want, got := wantRM.RequiredPackages(), gotRM.RequiredPackages()
-		if !mapStringBoolEqual(want, got) {
-			t.Errorf("unexpected required packages:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		}
-	}
-}
-
-// comparePackageTree compares two pkgtree.PackageTree and reports differences as test errors.
-func comparePackageTree(t *testing.T, want, got pkgtree.PackageTree) {
-	if got.ImportRoot != want.ImportRoot {
-		t.Errorf("expected package tree root %q but got %q", want.ImportRoot, got.ImportRoot)
-	}
-	{
-		want, got := want.Packages, got.Packages
-		if len(want) != len(got) {
-			t.Errorf("unexpected packages:\n\t(GOT): %#v\n\t(WNT): %#v", got, want)
-		} else {
-			for k, v := range want {
-				if v2, ok := got[k]; !ok {
-					t.Errorf("key %q: expected %v but got none", k, v)
-				} else if !packageOrErrEqual(v, v2) {
-					t.Errorf("key %q: expected %v but got %v", k, v, v2)
-				}
-			}
-		}
-	}
-}
-
-func projectConstraintsEqual(want, got ProjectConstraints) bool {
-	loop, check := want, got
-	if len(got) > len(want) {
-		loop, check = got, want
-	}
-	for pr, pp := range loop {
-		pp2, ok := check[pr]
-		if !ok {
-			return false
-		}
-		if pp.Source != pp2.Source {
-			return false
-		}
-		if pp.Constraint == nil || pp2.Constraint == nil {
-			if pp.Constraint != nil || pp2.Constraint != nil {
-				return false
-			}
-		} else if !pp.Constraint.identical(pp2.Constraint) {
-			return false
-		}
-	}
-	return true
-}
-
-func mapStringBoolEqual(exp, got map[string]bool) bool {
-	loop, check := exp, got
-	if len(got) > len(exp) {
-		loop, check = got, exp
-	}
-	for k, v := range loop {
-		v2, ok := check[k]
-		if !ok || v != v2 {
-			return false
-		}
-	}
-	return true
-}
-
-func safeError(err error) string {
-	if err == nil {
-		return ""
-	}
-	return err.Error()
-}
-
-// packageOrErrEqual return true if the pkgtree.PackageOrErrs are equal. Error equality is
-// string based. Imports and TestImports are treated as sets, and will be sorted.
-func packageOrErrEqual(a, b pkgtree.PackageOrErr) bool {
-	if safeError(a.Err) != safeError(b.Err) {
-		return false
-	}
-	if a.P.Name != b.P.Name {
-		return false
-	}
-	if a.P.ImportPath != b.P.ImportPath {
-		return false
-	}
-	if a.P.CommentPath != b.P.CommentPath {
-		return false
-	}
-
-	if len(a.P.Imports) != len(b.P.Imports) {
-		return false
-	}
-	sort.Strings(a.P.Imports)
-	sort.Strings(b.P.Imports)
-	for i := range a.P.Imports {
-		if a.P.Imports[i] != b.P.Imports[i] {
-			return false
-		}
-	}
-
-	if len(a.P.TestImports) != len(b.P.TestImports) {
-		return false
-	}
-	sort.Strings(a.P.TestImports)
-	sort.Strings(b.P.TestImports)
-	for i := range a.P.TestImports {
-		if a.P.TestImports[i] != b.P.TestImports[i] {
-			return false
-		}
-	}
-
-	return true
-}
-
-// discardCache discards set values and returns nothing.
-type discardCache struct{}
-
-func (discardCache) setManifestAndLock(Revision, ProjectAnalyzerInfo, Manifest, Lock) {}
-
-func (discardCache) getManifestAndLock(Revision, ProjectAnalyzerInfo) (Manifest, Lock, bool) {
-	return nil, nil, false
-}
-
-func (discardCache) setPackageTree(Revision, pkgtree.PackageTree) {}
-
-func (discardCache) getPackageTree(Revision) (pkgtree.PackageTree, bool) {
-	return pkgtree.PackageTree{}, false
-}
-
-func (discardCache) markRevisionExists(r Revision) {}
-
-func (discardCache) setVersionMap(versionList []PairedVersion) {}
-
-func (discardCache) getVersionsFor(Revision) ([]UnpairedVersion, bool) {
-	return nil, false
-}
-
-func (discardCache) getAllVersions() ([]PairedVersion, bool) {
-	return nil, false
-}
-
-func (discardCache) getRevisionFor(UnpairedVersion) (Revision, bool) {
-	return "", false
-}
-
-func (discardCache) toRevision(v Version) (Revision, bool) {
-	return "", false
-}
-
-func (discardCache) toUnpaired(v Version) (UnpairedVersion, bool) {
-	return nil, false
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_errors_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_errors_test.go
deleted file mode 100644
index ce6153c2fe..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_errors_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"testing"
-
-	"github.com/Masterminds/vcs"
-)
-
-func TestUnwrapVcsErrNonNil(t *testing.T) {
-	for _, err := range []error{
-		vcs.NewRemoteError("msg", nil, "out"),
-		vcs.NewRemoteError("msg", nil, ""),
-		vcs.NewRemoteError("", nil, "out"),
-		vcs.NewRemoteError("", nil, ""),
-		vcs.NewLocalError("msg", nil, "out"),
-		vcs.NewLocalError("msg", nil, ""),
-		vcs.NewLocalError("", nil, "out"),
-		vcs.NewLocalError("", nil, ""),
-		&vcs.RemoteError{},
-		&vcs.LocalError{},
-	} {
-		if unwrapVcsErr(err) == nil {
-			t.Errorf("unexpected nil error unwrapping: %#v", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_manager_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_manager_test.go
deleted file mode 100644
index 05667121fc..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_manager_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"log"
-	"reflect"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestSourceManager_InferConstraint(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	t.Parallel()
-
-	// Used in git subtests:
-	v081, err := NewSemverConstraintIC("v0.8.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	v012, err := NewSemverConstraintIC("v0.12.0-12-de4dcafe0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Used in hg and bzr subtests:
-	v1, err := NewSemverConstraintIC("v1.0.0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var (
-		gitProj = ProjectIdentifier{ProjectRoot: "github.com/carolynvs/deptest"}
-		bzrProj = ProjectIdentifier{ProjectRoot: "launchpad.net/govcstestbzrrepo"}
-		hgProj  = ProjectIdentifier{ProjectRoot: "bitbucket.org/golang-dep/dep-test"}
-
-		testcases = []struct {
-			project ProjectIdentifier
-			name    string
-			str     string
-			want    Constraint
-		}{
-			{gitProj, "empty", "", Any()},
-			{gitProj, "semver-short", "v0.8.1", v081},
-			{gitProj, "long semver constraint", "v0.12.0-12-de4dcafe0", v012},
-			{gitProj, "branch v2", "v2", NewBranch("v2")},
-			{gitProj, "branch master", "master", NewBranch("master")},
-			{gitProj, "long revision", "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-				Revision("3f4c3bea144e112a69bbe5d8d01c1b09a544253f")},
-			{gitProj, "short revision", "3f4c3bea",
-				Revision("3f4c3bea144e112a69bbe5d8d01c1b09a544253f")},
-
-			{bzrProj, "empty", "", Any()},
-			{bzrProj, "semver", "v1.0.0", v1},
-			{bzrProj, "revision", "matt@mattfarina.com-20150731135137-pbphasfppmygpl68",
-				Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68")},
-
-			{hgProj, "empty", "", Any()},
-			{hgProj, "semver", "v1.0.0", v1},
-			{hgProj, "default branch", "default", NewBranch("default")},
-			{hgProj, "revision", "6f55e1f03d91f8a7cce35d1968eb60a2352e4d59",
-				Revision("6f55e1f03d91f8a7cce35d1968eb60a2352e4d59")},
-			{hgProj, "short revision", "6f55e1f03d91",
-				Revision("6f55e1f03d91f8a7cce35d1968eb60a2352e4d59")},
-		}
-	)
-
-	for _, tc := range testcases {
-		var subtestName string
-		switch tc.project {
-		case gitProj:
-			subtestName = "git-" + tc.name
-		case bzrProj:
-			subtestName = "bzr-" + tc.name
-		case hgProj:
-			subtestName = "hg-" + tc.name
-		default:
-			subtestName = tc.name
-		}
-
-		t.Run(subtestName, func(t *testing.T) {
-			t.Parallel()
-			h := test.NewHelper(t)
-			defer h.Cleanup()
-
-			cacheDir := "gps-repocache"
-			h.TempDir(cacheDir)
-
-			sm, err := NewSourceManager(SourceManagerConfig{
-				Cachedir: h.Path(cacheDir),
-				Logger:   log.New(test.Writer{TB: t}, "", 0),
-			})
-			h.Must(err)
-
-			got, err := sm.InferConstraint(tc.str, tc.project)
-			h.Must(err)
-
-			wantT := reflect.TypeOf(tc.want)
-			gotT := reflect.TypeOf(got)
-			if wantT != gotT {
-				t.Errorf("expected type: %s, got %s, for input %s", wantT, gotT, tc.str)
-			}
-			if got.String() != tc.want.String() {
-				t.Errorf("expected value: %s, got %s for input %s", tc.want, got, tc.str)
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/source_test.go b/installer/vendor/github.com/golang/dep/internal/gps/source_test.go
deleted file mode 100644
index 639bec5dba..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/source_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-	"github.com/golang/dep/internal/test"
-)
-
-// Executed in parallel by TestSlowVcs
-func testSourceGateway(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("Skipping gateway testing in short mode")
-	}
-	requiresBins(t, "git")
-
-	cachedir, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Fatalf("failed to create temp dir: %s", err)
-	}
-	bgc := context.Background()
-	ctx, cancelFunc := context.WithCancel(bgc)
-	defer func() {
-		os.RemoveAll(cachedir)
-		cancelFunc()
-	}()
-
-	do := func(wantstate sourceState) func(t *testing.T) {
-		return func(t *testing.T) {
-			superv := newSupervisor(ctx)
-			sc := newSourceCoordinator(superv, newDeductionCoordinator(superv), cachedir, log.New(test.Writer{TB: t}, "", 0))
-
-			id := mkPI("github.com/sdboyer/deptest")
-			sg, err := sc.getSourceGatewayFor(ctx, id)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if _, ok := sg.src.(*gitSource); !ok {
-				t.Fatalf("Expected a gitSource, got a %T", sg.src)
-			}
-
-			if sg.srcState != wantstate {
-				t.Fatalf("expected state on initial create to be %v, got %v", wantstate, sg.srcState)
-			}
-
-			if err := sg.syncLocal(ctx); err != nil {
-				t.Fatalf("error on cloning git repo: %s", err)
-			}
-
-			cvlist, ok := sg.cache.getAllVersions()
-			if !ok || len(cvlist) != 4 {
-				t.Fatalf("repo setup should've cached four versions, got %v: %s", len(cvlist), cvlist)
-			}
-
-			wanturl := "https://" + id.normalizedSource()
-			goturl, err := sg.sourceURL(ctx)
-			if err != nil {
-				t.Fatalf("got err from sourceURL: %s", err)
-			}
-			if wanturl != goturl {
-				t.Fatalf("Expected %s as source URL, got %s", wanturl, goturl)
-			}
-
-			vlist, err := sg.listVersions(ctx)
-			if err != nil {
-				t.Fatalf("Unexpected error getting version pairs from git repo: %s", err)
-			}
-
-			if len(vlist) != 4 {
-				t.Fatalf("git test repo should've produced four versions, got %v: vlist was %s", len(vlist), vlist)
-			} else {
-				SortPairedForUpgrade(vlist)
-				evl := []PairedVersion{
-					NewVersion("v1.0.0").Pair(Revision("ff2948a2ac8f538c4ecd55962e919d1e13e74baf")),
-					NewVersion("v0.8.1").Pair(Revision("3f4c3bea144e112a69bbe5d8d01c1b09a544253f")),
-					NewVersion("v0.8.0").Pair(Revision("ff2948a2ac8f538c4ecd55962e919d1e13e74baf")),
-					newDefaultBranch("master").Pair(Revision("3f4c3bea144e112a69bbe5d8d01c1b09a544253f")),
-				}
-				if !reflect.DeepEqual(vlist, evl) {
-					t.Fatalf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-				}
-			}
-
-			rev := Revision("c575196502940c07bf89fd6d95e83b999162e051")
-			// check that an expected rev is not in cache
-			_, has := sg.cache.getVersionsFor(rev)
-			if has {
-				t.Fatal("shouldn't have bare revs in cache without specifically requesting them")
-			}
-
-			is, err := sg.revisionPresentIn(ctx, Revision("c575196502940c07bf89fd6d95e83b999162e051"))
-			if err != nil {
-				t.Fatalf("unexpected error while checking revision presence: %s", err)
-			} else if !is {
-				t.Fatalf("revision that should exist was not present")
-			}
-
-			// check that an expected rev is not in cache
-			_, has = sg.cache.getVersionsFor(rev)
-			if !has {
-				t.Fatal("bare rev should be in cache after specific request for it")
-			}
-
-			// Ensure that a bad rev doesn't work on any method that takes
-			// versions
-			badver := NewVersion("notexist")
-			wanterr := fmt.Errorf("version %q does not exist in source", badver)
-
-			_, _, err = sg.getManifestAndLock(ctx, ProjectRoot("github.com/sdboyer/deptest"), badver, naiveAnalyzer{})
-			if err == nil {
-				t.Fatal("wanted err on nonexistent version")
-			} else if err.Error() != wanterr.Error() {
-				t.Fatalf("wanted nonexistent err when passing bad version, got: %s", err)
-			}
-
-			_, err = sg.listPackages(ctx, ProjectRoot("github.com/sdboyer/deptest"), badver)
-			if err == nil {
-				t.Fatal("wanted err on nonexistent version")
-			} else if err.Error() != wanterr.Error() {
-				t.Fatalf("wanted nonexistent err when passing bad version, got: %s", err)
-			}
-
-			err = sg.exportVersionTo(ctx, badver, cachedir)
-			if err == nil {
-				t.Fatal("wanted err on nonexistent version")
-			} else if err.Error() != wanterr.Error() {
-				t.Fatalf("wanted nonexistent err when passing bad version, got: %s", err)
-			}
-
-			wantptree := pkgtree.PackageTree{
-				ImportRoot: "github.com/sdboyer/deptest",
-				Packages: map[string]pkgtree.PackageOrErr{
-					"github.com/sdboyer/deptest": {
-						P: pkgtree.Package{
-							ImportPath: "github.com/sdboyer/deptest",
-							Name:       "deptest",
-							Imports:    []string{},
-						},
-					},
-				},
-			}
-
-			ptree, err := sg.listPackages(ctx, ProjectRoot("github.com/sdboyer/deptest"), Revision("ff2948a2ac8f538c4ecd55962e919d1e13e74baf"))
-			if err != nil {
-				t.Fatalf("unexpected err when getting package tree with known rev: %s", err)
-			}
-			if !reflect.DeepEqual(wantptree, ptree) {
-				t.Fatalf("got incorrect PackageTree:\n\t(GOT): %#v\n\t(WNT): %#v", ptree, wantptree)
-			}
-
-			ptree, err = sg.listPackages(ctx, ProjectRoot("github.com/sdboyer/deptest"), NewVersion("v1.0.0"))
-			if err != nil {
-				t.Fatalf("unexpected err when getting package tree with unpaired good version: %s", err)
-			}
-			if !reflect.DeepEqual(wantptree, ptree) {
-				t.Fatalf("got incorrect PackageTree:\n\t(GOT): %#v\n\t(WNT): %#v", ptree, wantptree)
-			}
-		}
-	}
-
-	// Run test twice so that we cover both the existing and non-existing case;
-	// only difference in results is the initial setup state.
-	t.Run("empty", do(sourceIsSetUp|sourceExistsUpstream|sourceHasLatestVersionList))
-	t.Run("exists", do(sourceIsSetUp|sourceExistsLocally|sourceExistsUpstream|sourceHasLatestVersionList))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_nonwindows_test.go b/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_nonwindows_test.go
deleted file mode 100644
index 8ff55155b0..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_nonwindows_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !windows
-
-package gps
-
-import "testing"
-
-func TestStripVendorSymlinks(t *testing.T) {
-	t.Run("vendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-		},
-	}))
-
-	t.Run("nonvendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link"},
-					to:   "_vendor",
-				},
-			},
-		},
-	}))
-
-	t.Run("vendor symlink to file", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			files: []fsPath{
-				{"file"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "file",
-				},
-			},
-		},
-		after: filesystemState{
-			files: []fsPath{
-				{"file"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "file",
-				},
-			},
-		},
-	}))
-
-	t.Run("broken vendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "nonexistence",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "nonexistence",
-				},
-			},
-		},
-	}))
-
-	t.Run("chained symlinks", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "vendor2",
-				},
-				{
-					path: fsPath{"vendor2"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor2"},
-					to:   "_vendor",
-				},
-			},
-		},
-	}))
-
-	t.Run("circular symlinks", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link1"},
-					to:   "link2",
-				},
-				{
-					path: fsPath{"package", "link2"},
-					to:   "link1",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link1"},
-					to:   "link2",
-				},
-				{
-					path: fsPath{"package", "link2"},
-					to:   "link1",
-				},
-			},
-		},
-	}))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_test.go b/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_test.go
deleted file mode 100644
index 18a722cd9c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func stripVendorTestCase(tc fsTestCase) func(*testing.T) {
-	return func(t *testing.T) {
-		tempDir, err := ioutil.TempDir("", "TestStripVendor")
-		if err != nil {
-			t.Fatalf("ioutil.TempDir err=%q", err)
-		}
-		defer func() {
-			if err := os.RemoveAll(tempDir); err != nil {
-				t.Errorf("os.RemoveAll(%q) err=%q", tempDir, err)
-			}
-		}()
-		tc.before.root = tempDir
-		tc.after.root = tempDir
-
-		tc.before.setup(t)
-
-		if err := filepath.Walk(tempDir, stripVendor); err != nil {
-			t.Errorf("filepath.Walk err=%q", err)
-		}
-
-		tc.after.assert(t)
-	}
-}
-
-func TestStripVendorDirectory(t *testing.T) {
-	t.Run("vendor directory", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "vendor"},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-		},
-	}))
-
-	t.Run("vendor file", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			files: []fsPath{
-				{"package", "vendor"},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			files: []fsPath{
-				{"package", "vendor"},
-			},
-		},
-	}))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_windows_test.go b/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_windows_test.go
deleted file mode 100644
index 67ff900299..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/strip_vendor_windows_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package gps
-
-import "testing"
-
-func TestStripVendorSymlinks(t *testing.T) {
-	// On windows, we skip symlinks, even if they're named 'vendor', because
-	// they're too hard to distinguish from junctions.
-	t.Run("vendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "_vendor",
-				},
-			},
-		},
-	}))
-
-	t.Run("nonvendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-				{"package", "_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link"},
-					to:   "_vendor",
-				},
-			},
-		},
-	}))
-
-	t.Run("vendor symlink to file", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			files: []fsPath{
-				{"file"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "file",
-				},
-			},
-		},
-		after: filesystemState{
-			files: []fsPath{
-				{"file"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "file",
-				},
-			},
-		},
-	}))
-
-	t.Run("broken vendor symlink", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "nonexistence",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "vendor"},
-					to:   "nonexistence",
-				},
-			},
-		},
-	}))
-
-	t.Run("chained symlinks", stripVendorTestCase(fsTestCase{
-		// Curiously, if a symlink on windows points to *another* symlink which
-		// eventually points at a directory, we'll correctly remove that first
-		// symlink, because the first symlink doesn't appear to Go to be a
-		// directory.
-		before: filesystemState{
-			dirs: []fsPath{
-				{"_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor"},
-					to:   "vendor2",
-				},
-				{
-					path: fsPath{"vendor2"},
-					to:   "_vendor",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"_vendor"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"vendor2"},
-					to:   "_vendor",
-				},
-			},
-		},
-	}))
-
-	t.Run("circular symlinks", stripVendorTestCase(fsTestCase{
-		before: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link1"},
-					to:   "link2",
-				},
-				{
-					path: fsPath{"package", "link2"},
-					to:   "link1",
-				},
-			},
-		},
-		after: filesystemState{
-			dirs: []fsPath{
-				{"package"},
-			},
-			links: []fsLink{
-				{
-					path: fsPath{"package", "link1"},
-					to:   "link2",
-				},
-				{
-					path: fsPath{"package", "link2"},
-					to:   "link1",
-				},
-			},
-		},
-	}))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/typed_radix_test.go b/installer/vendor/github.com/golang/dep/internal/gps/typed_radix_test.go
deleted file mode 100644
index 38f6064808..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/typed_radix_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import "testing"
-
-// basically a regression test
-func TestPathPrefixOrEqual(t *testing.T) {
-	if !isPathPrefixOrEqual("foo", "foo") {
-		t.Error("Same path should return true")
-	}
-
-	if isPathPrefixOrEqual("foo", "fooer") {
-		t.Error("foo is not a path-type prefix of fooer")
-	}
-
-	if !isPathPrefixOrEqual("foo", "foo/bar") {
-		t.Error("foo is a path prefix of foo/bar")
-	}
-
-	if isPathPrefixOrEqual("foo", "foo/") {
-		t.Error("special case - foo is not a path prefix of foo/")
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/vcs_repo_test.go b/installer/vendor/github.com/golang/dep/internal/gps/vcs_repo_test.go
deleted file mode 100644
index 2f281f2057..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/vcs_repo_test.go
+++ /dev/null
@@ -1,462 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"context"
-	"errors"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"github.com/Masterminds/vcs"
-)
-
-// original implementation of these test files come from
-// https://github.com/Masterminds/vcs test files
-
-const gitRemoteTestRepo = "https://github.com/Masterminds/VCSTestRepo"
-
-func TestErrs(t *testing.T) {
-	err := newVcsLocalErrorOr(context.Canceled, nil, "", "")
-	if err != context.Canceled {
-		t.Errorf("context errors should always pass through, got %s", err)
-	}
-	err = newVcsRemoteErrorOr(context.Canceled, nil, "", "")
-	if err != context.Canceled {
-		t.Errorf("context errors should always pass through, got %s", err)
-	}
-	err = newVcsLocalErrorOr(context.DeadlineExceeded, nil, "", "")
-	if err != context.DeadlineExceeded {
-		t.Errorf("context errors should always pass through, got %s", err)
-	}
-	err = newVcsRemoteErrorOr(context.DeadlineExceeded, nil, "", "")
-	if err != context.DeadlineExceeded {
-		t.Errorf("context errors should always pass through, got %s", err)
-	}
-
-	err = newVcsLocalErrorOr(errors.New("bar"), nil, "foo", "baz")
-	if _, is := err.(*vcs.LocalError); !is {
-		t.Errorf("should have gotten local error, got %T %v", err, err)
-	}
-	err = newVcsRemoteErrorOr(errors.New("bar"), nil, "foo", "baz")
-	if _, is := err.(*vcs.RemoteError); !is {
-		t.Errorf("should have gotten remote error, got %T %v", err, err)
-	}
-}
-
-func TestNewCtxRepoHappyPath(t *testing.T) {
-	t.Parallel()
-
-	tempDir, err := ioutil.TempDir("", "go-ctx-repo-happy-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	_, err = newCtxRepo(vcs.Git, gitRemoteTestRepo, tempDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestNewCtxRepoRecovery(t *testing.T) {
-	t.Parallel()
-
-	tempDir, err := ioutil.TempDir("", "go-ctx-repo-recovery-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	src := filepath.Join(cwd, "_testdata", "badrepo", "corrupt_dot_git_directory.tar")
-	f, err := os.Open(src)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-
-	dest := filepath.Join(tempDir, ".git")
-	err = untar(dest, f)
-	if err != nil {
-		t.Fatalf("could not untar corrupt repo into temp folder: %v\n", err)
-	}
-
-	_, err = getVCSRepo(vcs.Git, gitRemoteTestRepo, tempDir)
-	if err != nil {
-		if _, ok := err.(*vcs.LocalError); !ok {
-			t.Fatalf("expected a local error but got: %v\n", err)
-		}
-	} else {
-		t.Fatal("expected getVCSRepo to fail when pointing to a corrupt local path. It is possible that vcs.GitNewRepo updated to gracefully handle this test scenario. Check the return of vcs.GitNewRepo.")
-	}
-
-	_, err = newCtxRepo(vcs.Git, gitRemoteTestRepo, tempDir)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testSvnRepo(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	ctx := context.Background()
-	tempDir, err := ioutil.TempDir("", "go-vcs-svn-tests")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	rep, err := vcs.NewSvnRepo("https://github.com/Masterminds/VCSTestRepo/trunk", tempDir+string(os.PathSeparator)+"VCSTestRepo")
-	if err != nil {
-		t.Fatal(err)
-	}
-	repo := &svnRepo{rep}
-
-	// Do an initial checkout.
-	err = repo.get(ctx)
-	if err != nil {
-		t.Fatalf("Unable to checkout SVN repo. Err was %s", err)
-	}
-
-	// Verify SVN repo is a SVN repo
-	if !repo.CheckLocal() {
-		t.Fatal("Problem checking out repo or SVN CheckLocal is not working")
-	}
-
-	// Update the version to a previous version.
-	err = repo.updateVersion(ctx, "r2")
-	if err != nil {
-		t.Fatalf("Unable to update SVN repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err := repo.Version()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v != "2" {
-		t.Fatal("Error checking checked SVN out version")
-	}
-
-	// Perform an update which should take up back to the latest version.
-	err = repo.fetch(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Make sure we are on a newer version because of the update.
-	v, err = repo.Version()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v == "2" {
-		t.Fatal("Error with version. Still on old version. Update failed")
-	}
-
-	ci, err := repo.CommitInfo("2")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if ci.Commit != "2" {
-		t.Error("Svn.CommitInfo wrong commit id")
-	}
-	if ci.Author != "matt.farina" {
-		t.Error("Svn.CommitInfo wrong author")
-	}
-	if ci.Message != "Update README.md" {
-		t.Error("Svn.CommitInfo wrong message")
-	}
-	ti, err := time.Parse(time.RFC3339Nano, "2015-07-29T13:46:20.000000Z")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !ti.Equal(ci.Date) {
-		t.Error("Svn.CommitInfo wrong date")
-	}
-
-	_, err = repo.CommitInfo("555555555")
-	if err != vcs.ErrRevisionUnavailable {
-		t.Error("Svn didn't return expected ErrRevisionUnavailable")
-	}
-}
-
-func testHgRepo(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	ctx := context.Background()
-	tempDir, err := ioutil.TempDir("", "go-vcs-hg-tests")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	rep, err := vcs.NewHgRepo("https://bitbucket.org/mattfarina/testhgrepo", tempDir+"/testhgrepo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	repo := &hgRepo{rep}
-
-	// Do an initial clone.
-	err = repo.get(ctx)
-	if err != nil {
-		t.Fatalf("Unable to clone Hg repo. Err was %s", err)
-	}
-
-	// Verify Hg repo is a Hg repo
-	if !repo.CheckLocal() {
-		t.Fatal("Problem checking out repo or Hg CheckLocal is not working")
-	}
-
-	// Set the version using the short hash.
-	err = repo.updateVersion(ctx, "a5494ba2177f")
-	if err != nil {
-		t.Fatalf("Unable to update Hg repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err := repo.Version()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v != "a5494ba2177ff9ef26feb3c155dfecc350b1a8ef" {
-		t.Fatalf("Error checking checked out Hg version: %s", v)
-	}
-
-	// Perform an update.
-	err = repo.fetch(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testGitRepo(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	ctx := context.Background()
-	tempDir, err := ioutil.TempDir("", "go-vcs-git-tests")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	rep, err := vcs.NewGitRepo(gitRemoteTestRepo, tempDir+"/VCSTestRepo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	repo := &gitRepo{rep}
-
-	// Do an initial clone.
-	err = repo.get(ctx)
-	if err != nil {
-		t.Fatalf("Unable to clone Git repo. Err was %s", err)
-	}
-
-	// Verify Git repo is a Git repo
-	if !repo.CheckLocal() {
-		t.Fatal("Problem checking out repo or Git CheckLocal is not working")
-	}
-
-	// Perform an update.
-	err = repo.fetch(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Fatalf("Error trying Git Current: %s", err)
-	}
-	if v != "master" {
-		t.Fatalf("Current failed to detect Git on tip of master. Got version: %s", v)
-	}
-
-	// Set the version using the short hash.
-	err = repo.updateVersion(ctx, "806b07b")
-	if err != nil {
-		t.Fatalf("Unable to update Git repo version. Err was %s", err)
-	}
-
-	// Once a ref has been checked out the repo is in a detached head state.
-	// Trying to pull in an update in this state will cause an error. Update
-	// should cleanly handle this. Pulling on a branch (tested elsewhere) and
-	// skipping that here.
-	err = repo.fetch(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v != "806b07b08faa21cfbdae93027904f80174679402" {
-		t.Fatal("Error checking checked out Git version")
-	}
-}
-
-func testBzrRepo(t *testing.T) {
-	t.Parallel()
-
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	ctx := context.Background()
-	tempDir, err := ioutil.TempDir("", "go-vcs-bzr-tests")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		err = os.RemoveAll(tempDir)
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	rep, err := vcs.NewBzrRepo("https://launchpad.net/govcstestbzrrepo", tempDir+"/govcstestbzrrepo")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	repo := &bzrRepo{rep}
-
-	// Do an initial clone.
-	err = repo.get(ctx)
-	if err != nil {
-		t.Fatalf("Unable to clone Bzr repo. Err was %s", err)
-	}
-
-	// Verify Bzr repo is a Bzr repo
-	if !repo.CheckLocal() {
-		t.Fatal("Problem checking out repo or Bzr CheckLocal is not working")
-	}
-
-	v, err := repo.Current()
-	if err != nil {
-		t.Fatalf("Error trying Bzr Current: %s", err)
-	}
-	if v != "-1" {
-		t.Fatalf("Current failed to detect Bzr on tip of branch. Got version: %s", v)
-	}
-
-	err = repo.updateVersion(ctx, "2")
-	if err != nil {
-		t.Fatalf("Unable to update Bzr repo version. Err was %s", err)
-	}
-
-	// Use Version to verify we are on the right version.
-	v, err = repo.Version()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if v != "2" {
-		t.Fatal("Error checking checked out Bzr version")
-	}
-
-	v, err = repo.Current()
-	if err != nil {
-		t.Fatalf("Error trying Bzr Current: %s", err)
-	}
-	if v != "2" {
-		t.Fatalf("Current failed to detect Bzr on rev 2 of branch. Got version: %s", v)
-	}
-}
-
-func untar(dst string, r io.Reader) error {
-	gzr, err := gzip.NewReader(r)
-	if err != nil {
-		return err
-	}
-	defer gzr.Close()
-
-	tr := tar.NewReader(gzr)
-
-	for {
-		header, err := tr.Next()
-
-		switch {
-		case err == io.EOF:
-			return nil
-		case err != nil:
-			return err
-		case header == nil:
-			continue
-		}
-
-		target := filepath.Join(dst, header.Name)
-		switch header.Typeflag {
-		case tar.TypeDir:
-			if _, err := os.Stat(target); err != nil {
-				if err := os.MkdirAll(target, 0755); err != nil {
-					return err
-				}
-			}
-		case tar.TypeReg:
-			f, err := os.OpenFile(target, os.O_CREATE|os.O_RDWR, os.FileMode(header.Mode))
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-
-			if _, err := io.Copy(f, tr); err != nil {
-				return err
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/vcs_source_test.go b/installer/vendor/github.com/golang/dep/internal/gps/vcs_source_test.go
deleted file mode 100644
index d48e34412d..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/vcs_source_test.go
+++ /dev/null
@@ -1,766 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"context"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"reflect"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-// Parent test that executes all the slow vcs interaction tests in parallel.
-func TestSlowVcs(t *testing.T) {
-	t.Run("write-deptree", testWriteDepTree)
-	t.Run("source-gateway", testSourceGateway)
-	t.Run("bzr-repo", testBzrRepo)
-	t.Run("bzr-source", testBzrSourceInteractions)
-	t.Run("svn-repo", testSvnRepo)
-	// TODO(sdboyer) svn-source
-	t.Run("hg-repo", testHgRepo)
-	t.Run("hg-source", testHgSourceInteractions)
-	t.Run("git-repo", testGitRepo)
-	t.Run("git-source", testGitSourceInteractions)
-	t.Run("gopkgin-source", testGopkginSourceInteractions)
-}
-
-func testGitSourceInteractions(t *testing.T) {
-	t.Parallel()
-
-	// This test is slowish, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping git source version fetching test in short mode")
-	}
-	requiresBins(t, "git")
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(cpath); err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	n := "github.com/sdboyer/gpkt"
-	un := "https://" + n
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Fatalf("Error parsing URL %s: %s", un, err)
-	}
-	mb := maybeGitSource{
-		url: u,
-	}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("Unexpected error while setting up gitSource for test repo: %s", err)
-	}
-
-	wantstate := sourceIsSetUp | sourceExistsUpstream | sourceHasLatestVersionList
-	if state != wantstate {
-		t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-	}
-
-	err = isrc.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning git repo: %s", err)
-	}
-
-	src, ok := isrc.(*gitSource)
-	if !ok {
-		t.Fatalf("Expected a gitSource, got a %T", isrc)
-	}
-
-	if un != src.upstreamURL() {
-		t.Errorf("Expected %s as source URL, got %s", un, src.upstreamURL())
-	}
-
-	pvlist, err := src.listVersions(ctx)
-	if err != nil {
-		t.Fatalf("Unexpected error getting version pairs from git repo: %s", err)
-	}
-
-	vlist := hidePair(pvlist)
-	// check that an expected rev is present
-	is, err := src.revisionPresentIn(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e"))
-	if err != nil {
-		t.Errorf("Unexpected error while checking revision presence: %s", err)
-	} else if !is {
-		t.Errorf("Revision that should exist was not present")
-	}
-
-	if len(vlist) != 7 {
-		t.Errorf("git test repo should've produced seven versions, got %v: vlist was %s", len(vlist), vlist)
-	} else {
-		SortForUpgrade(vlist)
-		evl := []Version{
-			NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-			NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
-			NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			newDefaultBranch("master").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
-			NewBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
-			NewBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-		}
-		if !reflect.DeepEqual(vlist, evl) {
-			t.Errorf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-		}
-	}
-
-	// recheck that rev is present, this time interacting with cache differently
-	is, err = src.revisionPresentIn(Revision("30605f6ac35fcb075ad0bfa9296f90a7d891523e"))
-	if err != nil {
-		t.Errorf("Unexpected error while re-checking revision presence: %s", err)
-	} else if !is {
-		t.Errorf("Revision that should exist was not present on re-check")
-	}
-}
-
-func testGopkginSourceInteractions(t *testing.T) {
-	t.Parallel()
-
-	// This test is slowish, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping gopkg.in source version fetching test in short mode")
-	}
-	requiresBins(t, "git")
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(cpath); err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	tfunc := func(opath, n string, major uint64, evl []Version) {
-		un := "https://" + opath
-		u, err := url.Parse("https://" + n)
-		if err != nil {
-			t.Errorf("URL was bad, lolwut? errtext: %s", err)
-			return
-		}
-		unstable := strings.HasSuffix(opath, gopkgUnstableSuffix)
-		mb := maybeGopkginSource{
-			opath:    opath,
-			url:      u,
-			major:    major,
-			unstable: unstable,
-		}
-
-		ctx := context.Background()
-		superv := newSupervisor(ctx)
-		isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-		if err != nil {
-			t.Errorf("Unexpected error while setting up gopkginSource for test repo: %s", err)
-			return
-		}
-
-		wantstate := sourceIsSetUp | sourceExistsUpstream | sourceHasLatestVersionList
-		if state != wantstate {
-			t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-		}
-
-		err = isrc.initLocal(ctx)
-		if err != nil {
-			t.Fatalf("Error on cloning git repo: %s", err)
-		}
-
-		src, ok := isrc.(*gopkginSource)
-		if !ok {
-			t.Errorf("Expected a gopkginSource, got a %T", isrc)
-			return
-		}
-
-		if un != src.upstreamURL() {
-			t.Errorf("Expected %s as source URL, got %s", un, src.upstreamURL())
-		}
-		if src.major != major {
-			t.Errorf("Expected %v as major version filter on gopkginSource, got %v", major, src.major)
-		}
-
-		// check that an expected rev is present
-		rev := evl[0].(PairedVersion).Revision()
-		is, err := src.revisionPresentIn(rev)
-		if err != nil {
-			t.Errorf("Unexpected error while checking revision presence: %s", err)
-		} else if !is {
-			t.Errorf("Revision %s that should exist was not present", rev)
-		}
-
-		pvlist, err := src.listVersions(ctx)
-		if err != nil {
-			t.Errorf("Unexpected error getting version pairs from hg repo: %s", err)
-		}
-
-		vlist := hidePair(pvlist)
-		if len(vlist) != len(evl) {
-			t.Errorf("gopkgin test repo should've produced %v versions, got %v", len(evl), len(vlist))
-		} else {
-			SortForUpgrade(vlist)
-			if !reflect.DeepEqual(vlist, evl) {
-				t.Errorf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-			}
-		}
-
-		// Run again, this time to ensure cache outputs correctly
-		pvlist, err = src.listVersions(ctx)
-		if err != nil {
-			t.Errorf("Unexpected error getting version pairs from hg repo: %s", err)
-		}
-
-		vlist = hidePair(pvlist)
-		if len(vlist) != len(evl) {
-			t.Errorf("gopkgin test repo should've produced %v versions, got %v", len(evl), len(vlist))
-		} else {
-			SortForUpgrade(vlist)
-			if !reflect.DeepEqual(vlist, evl) {
-				t.Errorf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-			}
-		}
-
-		// recheck that rev is present, this time interacting with cache differently
-		is, err = src.revisionPresentIn(rev)
-		if err != nil {
-			t.Errorf("Unexpected error while re-checking revision presence: %s", err)
-		} else if !is {
-			t.Errorf("Revision that should exist was not present on re-check")
-		}
-	}
-
-	// simultaneously run for v1, v2, and v3 filters of the target repo
-	wg := &sync.WaitGroup{}
-	wg.Add(4)
-	go func() {
-		tfunc("gopkg.in/sdboyer/gpkt.v1", "github.com/sdboyer/gpkt", 1, []Version{
-			NewVersion("v1.1.0").Pair(Revision("b2cb48dda625f6640b34d9ffb664533359ac8b91")),
-			NewVersion("v1.0.0").Pair(Revision("bf85021c0405edbc4f3648b0603818d641674f72")),
-			newDefaultBranch("v1.1").Pair(Revision("f1fbc520489a98306eb28c235204e39fa8a89c84")),
-			NewBranch("v1").Pair(Revision("e3777f683305eafca223aefe56b4e8ecf103f467")),
-		})
-		wg.Done()
-	}()
-
-	go func() {
-		tfunc("gopkg.in/sdboyer/gpkt.v2", "github.com/sdboyer/gpkt", 2, []Version{
-			NewVersion("v2.0.0").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-		})
-		wg.Done()
-	}()
-
-	go func() {
-		tfunc("gopkg.in/sdboyer/gpkt.v3", "github.com/sdboyer/gpkt", 3, []Version{
-			newDefaultBranch("v3").Pair(Revision("4a54adf81c75375d26d376459c00d5ff9b703e5e")),
-		})
-		wg.Done()
-	}()
-
-	go func() {
-		tfunc("github.com/sdboyer/gpkt2.v1-unstable", "github.com/sdboyer/gpkt2", 1, []Version{
-			newDefaultBranch("v1-unstable").Pair(Revision("24de0be8f4a0b8a44321562117749b257bfcef69")),
-		})
-		wg.Done()
-	}()
-
-	wg.Wait()
-}
-
-func testBzrSourceInteractions(t *testing.T) {
-	t.Parallel()
-
-	// This test is quite slow (ugh bzr), so skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping bzr source version fetching test in short mode")
-	}
-	requiresBins(t, "bzr")
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(cpath); err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	n := "launchpad.net/govcstestbzrrepo"
-	un := "https://" + n
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Fatalf("Error parsing URL %s: %s", un, err)
-	}
-	mb := maybeBzrSource{
-		url: u,
-	}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("Unexpected error while setting up bzrSource for test repo: %s", err)
-	}
-
-	wantstate := sourceIsSetUp | sourceExistsUpstream
-	if state != wantstate {
-		t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-	}
-
-	err = isrc.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning bzr repo: %s", err)
-	}
-
-	src, ok := isrc.(*bzrSource)
-	if !ok {
-		t.Fatalf("Expected a bzrSource, got a %T", isrc)
-	}
-
-	if state != wantstate {
-		t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-	}
-	if un != src.upstreamURL() {
-		t.Errorf("Expected %s as source URL, got %s", un, src.upstreamURL())
-	}
-	evl := []Version{
-		NewVersion("1.0.0").Pair(Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68")),
-		newDefaultBranch("(default)").Pair(Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68")),
-	}
-
-	// check that an expected rev is present
-	is, err := src.revisionPresentIn(Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68"))
-	if err != nil {
-		t.Errorf("Unexpected error while checking revision presence: %s", err)
-	} else if !is {
-		t.Errorf("Revision that should exist was not present")
-	}
-
-	pvlist, err := src.listVersions(ctx)
-	if err != nil {
-		t.Errorf("Unexpected error getting version pairs from bzr repo: %s", err)
-	}
-
-	vlist := hidePair(pvlist)
-	if len(vlist) != 2 {
-		t.Errorf("bzr test repo should've produced two versions, got %v", len(vlist))
-	} else {
-		SortForUpgrade(vlist)
-		if !reflect.DeepEqual(vlist, evl) {
-			t.Errorf("bzr version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-		}
-	}
-
-	// Run again, this time to ensure cache outputs correctly
-	pvlist, err = src.listVersions(ctx)
-	if err != nil {
-		t.Errorf("Unexpected error getting version pairs from bzr repo: %s", err)
-	}
-
-	vlist = hidePair(pvlist)
-	if len(vlist) != 2 {
-		t.Errorf("bzr test repo should've produced two versions, got %v", len(vlist))
-	} else {
-		SortForUpgrade(vlist)
-		if !reflect.DeepEqual(vlist, evl) {
-			t.Errorf("bzr version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-		}
-	}
-
-	// recheck that rev is present, this time interacting with cache differently
-	is, err = src.revisionPresentIn(Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68"))
-	if err != nil {
-		t.Errorf("Unexpected error while re-checking revision presence: %s", err)
-	} else if !is {
-		t.Errorf("Revision that should exist was not present on re-check")
-	}
-}
-
-func testHgSourceInteractions(t *testing.T) {
-	t.Parallel()
-
-	// This test is slow, so skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping hg source version fetching test in short mode")
-	}
-	requiresBins(t, "hg")
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(cpath); err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	tfunc := func(n string, evl []Version) {
-		un := "https://" + n
-		u, err := url.Parse(un)
-		if err != nil {
-			t.Errorf("URL was bad, lolwut? errtext: %s", err)
-			return
-		}
-		mb := maybeHgSource{
-			url: u,
-		}
-
-		ctx := context.Background()
-		superv := newSupervisor(ctx)
-		isrc, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-		if err != nil {
-			t.Errorf("Unexpected error while setting up hgSource for test repo: %s", err)
-			return
-		}
-
-		wantstate := sourceIsSetUp | sourceExistsUpstream
-		if state != wantstate {
-			t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-		}
-
-		err = isrc.initLocal(ctx)
-		if err != nil {
-			t.Fatalf("Error on cloning hg repo: %s", err)
-		}
-
-		src, ok := isrc.(*hgSource)
-		if !ok {
-			t.Errorf("Expected a hgSource, got a %T", isrc)
-			return
-		}
-
-		if state != wantstate {
-			t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-		}
-		if un != src.upstreamURL() {
-			t.Errorf("Expected %s as source URL, got %s", un, src.upstreamURL())
-		}
-
-		// check that an expected rev is present
-		is, err := src.revisionPresentIn(Revision("103d1bddef2199c80aad7c42041223083d613ef9"))
-		if err != nil {
-			t.Errorf("Unexpected error while checking revision presence: %s", err)
-		} else if !is {
-			t.Errorf("Revision that should exist was not present")
-		}
-
-		pvlist, err := src.listVersions(ctx)
-		if err != nil {
-			t.Errorf("Unexpected error getting version pairs from hg repo: %s", err)
-		}
-
-		vlist := hidePair(pvlist)
-		if len(vlist) != len(evl) {
-			t.Errorf("hg test repo should've produced %v versions, got %v", len(evl), len(vlist))
-		} else {
-			SortForUpgrade(vlist)
-			if !reflect.DeepEqual(vlist, evl) {
-				t.Errorf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-			}
-		}
-
-		// Run again, this time to ensure cache outputs correctly
-		pvlist, err = src.listVersions(ctx)
-		if err != nil {
-			t.Errorf("Unexpected error getting version pairs from hg repo: %s", err)
-		}
-
-		vlist = hidePair(pvlist)
-		if len(vlist) != len(evl) {
-			t.Errorf("hg test repo should've produced %v versions, got %v", len(evl), len(vlist))
-		} else {
-			SortForUpgrade(vlist)
-			if !reflect.DeepEqual(vlist, evl) {
-				t.Errorf("Version list was not what we expected:\n\t(GOT): %s\n\t(WNT): %s", vlist, evl)
-			}
-		}
-
-		// recheck that rev is present, this time interacting with cache differently
-		is, err = src.revisionPresentIn(Revision("103d1bddef2199c80aad7c42041223083d613ef9"))
-		if err != nil {
-			t.Errorf("Unexpected error while re-checking revision presence: %s", err)
-		} else if !is {
-			t.Errorf("Revision that should exist was not present on re-check")
-		}
-	}
-
-	// simultaneously run for both the repo with and without the magic bookmark
-	donech := make(chan struct{})
-	go func() {
-		tfunc("bitbucket.org/sdboyer/withbm", []Version{
-			NewVersion("v1.0.0").Pair(Revision("aa110802a0c64195d0a6c375c9f66668827c90b4")),
-			newDefaultBranch("@").Pair(Revision("b10d05d581e5401f383e48ccfeb84b48fde99d06")),
-			NewBranch("another").Pair(Revision("b10d05d581e5401f383e48ccfeb84b48fde99d06")),
-			NewBranch("default").Pair(Revision("3d466f437f6616da594bbab6446cc1cb4328d1bb")),
-			NewBranch("newbranch").Pair(Revision("5e2a01be9aee942098e44590ae545c7143da9675")),
-		})
-		close(donech)
-	}()
-
-	tfunc("bitbucket.org/sdboyer/nobm", []Version{
-		NewVersion("v1.0.0").Pair(Revision("aa110802a0c64195d0a6c375c9f66668827c90b4")),
-		newDefaultBranch("default").Pair(Revision("3d466f437f6616da594bbab6446cc1cb4328d1bb")),
-		NewBranch("another").Pair(Revision("b10d05d581e5401f383e48ccfeb84b48fde99d06")),
-		NewBranch("newbranch").Pair(Revision("5e2a01be9aee942098e44590ae545c7143da9675")),
-	})
-
-	<-donech
-}
-
-func TestGitSourceListVersionsNoHEAD(t *testing.T) {
-	t.Parallel()
-
-	requiresBins(t, "git")
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	h.TempDir("smcache")
-	cpath := h.Path("smcache")
-	h.TempDir("repo")
-	repoPath := h.Path("repo")
-
-	// Create test repo with a single commit on the master branch
-	h.RunGit(repoPath, "init")
-	h.RunGit(repoPath, "config", "--local", "user.email", "test@example.com")
-	h.RunGit(repoPath, "config", "--local", "user.name", "Test author")
-	h.RunGit(repoPath, "commit", "--allow-empty", `--message="Initial commit"`)
-
-	// Make HEAD point at a nonexistent branch (deleting it is not allowed)
-	// The `git ls-remote` that listVersions() calls will not return a HEAD ref
-	// because it points at a nonexistent branch
-	h.RunGit(repoPath, "symbolic-ref", "HEAD", "refs/heads/nonexistent")
-
-	un := "file://" + filepath.ToSlash(repoPath)
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Fatalf("Error parsing URL %s: %s", un, err)
-	}
-	mb := maybeGitSource{u}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	isrc, _, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("Unexpected error while setting up gitSource for test repo: %s", err)
-	}
-
-	err = isrc.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning git repo: %s", err)
-	}
-
-	src, ok := isrc.(*gitSource)
-	if !ok {
-		t.Fatalf("Expected a gitSource, got a %T", isrc)
-	}
-
-	pvlist, err := src.listVersions(ctx)
-	if err != nil {
-		t.Fatalf("Unexpected error getting version pairs from git repo: %s", err)
-	}
-
-	if len(pvlist) != 1 {
-		t.Errorf("Unexpected version pair length:\n\t(GOT): %d\n\t(WNT): %d", len(pvlist), 1)
-	}
-}
-
-func TestGitSourceListVersionsNoDupes(t *testing.T) {
-	t.Parallel()
-
-	// This test is slowish, skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping git source version fetching test in short mode")
-	}
-	requiresBins(t, "git")
-
-	cpath, err := ioutil.TempDir("", "smcache")
-	if err != nil {
-		t.Errorf("Failed to create temp dir: %s", err)
-	}
-	defer func() {
-		if err := os.RemoveAll(cpath); err != nil {
-			t.Errorf("removeAll failed: %s", err)
-		}
-	}()
-
-	n := "github.com/carolynvs/deptest-importers"
-	un := "https://" + n
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Fatalf("Error parsing URL %s: %s", un, err)
-	}
-	mb := maybeGitSource{
-		url: u,
-	}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	src, state, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("Unexpected error while setting up gitSource for test repo: %s", err)
-	}
-
-	wantstate := sourceIsSetUp | sourceExistsUpstream | sourceHasLatestVersionList
-	if state != wantstate {
-		t.Errorf("Expected return state to be %v, got %v", wantstate, state)
-	}
-
-	err = src.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning git repo: %s", err)
-	}
-
-	pvlist, err := src.listVersions(ctx)
-	if err != nil {
-		t.Fatalf("Unexpected error getting version pairs from git repo: %s", err)
-	}
-
-	for i := range pvlist {
-		pv1 := pvlist[i]
-		uv1 := pv1.Unpair()
-		for j := range pvlist {
-			if i == j {
-				continue
-			}
-			pv2 := pvlist[j]
-			uv2 := pv2.Unpair()
-			if uv1 == uv2 {
-				t.Errorf("duplicate version pair mapping from %#v to both %q and %q", uv1, pv1.Revision(), pv2.Revision())
-			}
-		}
-	}
-}
-
-func Test_bzrSource_exportRevisionTo_removeVcsFiles(t *testing.T) {
-	t.Parallel()
-
-	// This test is slow, so skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping hg source version fetching test in short mode")
-	}
-	requiresBins(t, "bzr")
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	h.TempDir("smcache")
-	cpath := h.Path("smcache")
-	repoPath := filepath.Join(h.Path("."), "repo")
-
-	rev := Revision("matt@mattfarina.com-20150731135137-pbphasfppmygpl68")
-	n := "launchpad.net/govcstestbzrrepo"
-	un := "https://" + n
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Errorf("URL was bad, lolwut? errtext: %s", err)
-		return
-	}
-	mb := maybeBzrSource{u}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	isrc, _, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("unexpected error while setting up hgSource for test repo: %s", err)
-	}
-
-	err = isrc.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning bzr repo: %s", err)
-	}
-
-	src, ok := isrc.(*bzrSource)
-	if !ok {
-		t.Fatalf("expected a bzrSource, got a %T", isrc)
-	}
-
-	if err := src.exportRevisionTo(ctx, rev, repoPath); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	_, err = os.Stat(filepath.Join(repoPath, ".bzr"))
-	if err == nil {
-		t.Fatal("expected .bzr/ to not exists")
-	} else if !os.IsNotExist(err) {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func Test_hgSource_exportRevisionTo_removeVcsFiles(t *testing.T) {
-	t.Parallel()
-
-	// This test is slow, so skip it on -short
-	if testing.Short() {
-		t.Skip("Skipping hg source version fetching test in short mode")
-	}
-	requiresBins(t, "hg")
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	h.TempDir("smcache")
-	cpath := h.Path("smcache")
-	repoPath := filepath.Join(h.Path("."), "repo")
-
-	rev := Revision("6f55e1f03d91f8a7cce35d1968eb60a2352e4d59")
-	n := "bitbucket.org/golang-dep/dep-test"
-	un := "https://" + n
-	u, err := url.Parse(un)
-	if err != nil {
-		t.Errorf("URL was bad, lolwut? errtext: %s", err)
-		return
-	}
-	mb := maybeHgSource{u}
-
-	ctx := context.Background()
-	superv := newSupervisor(ctx)
-	isrc, _, err := mb.try(ctx, cpath, newMemoryCache(), superv)
-	if err != nil {
-		t.Fatalf("unexpected error while setting up hgSource for test repo: %s", err)
-	}
-
-	err = isrc.initLocal(ctx)
-	if err != nil {
-		t.Fatalf("Error on cloning hg repo: %s", err)
-	}
-
-	src, ok := isrc.(*hgSource)
-	if !ok {
-		t.Fatalf("expected a hgSource, got a %T", isrc)
-	}
-
-	if err := src.exportRevisionTo(ctx, rev, repoPath); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-
-	_, err = os.Stat(filepath.Join(repoPath, ".hg"))
-	if err == nil {
-		t.Fatal("expected .hg/ to not exists")
-	} else if !os.IsNotExist(err) {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-// Fail a test if the specified binaries aren't installed.
-func requiresBins(t *testing.T, bins ...string) {
-	for _, b := range bins {
-		_, err := exec.LookPath(b)
-		if err != nil {
-			t.Fatalf("%s is not installed", b)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/vcs_version_test.go b/installer/vendor/github.com/golang/dep/internal/gps/vcs_version_test.go
deleted file mode 100644
index 2d85b60fc3..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/vcs_version_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-)
-
-func TestVCSVersion(t *testing.T) {
-	if testing.Short() {
-		t.Skip("Skipping slow test in short mode")
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	requiresBins(t, "git")
-
-	h.TempDir("src")
-	gopath := h.Path(".")
-	h.Setenv("GOPATH", gopath)
-
-	importPaths := map[string]struct {
-		rev      Version
-		checkout bool
-	}{
-		"github.com/pkg/errors": {
-			rev:      NewVersion("v0.8.0").Pair("645ef00459ed84a119197bfb8d8205042c6df63d"), // semver
-			checkout: true,
-		},
-		"github.com/sirupsen/logrus": {
-			rev:      Revision("42b84f9ec624953ecbf81a94feccb3f5935c5edf"), // random sha
-			checkout: true,
-		},
-		"github.com/rsc/go-get-default-branch": {
-			rev: NewBranch("another-branch").Pair("8e6902fdd0361e8fa30226b350e62973e3625ed5"),
-		},
-	}
-
-	// checkout the specified revisions
-	for ip, info := range importPaths {
-		h.RunGo("get", ip)
-		repoDir := h.Path("src/" + ip)
-		if info.checkout {
-			h.RunGit(repoDir, "checkout", info.rev.String())
-		}
-		abs := filepath.FromSlash(filepath.Join(gopath, "src", ip))
-		got, err := VCSVersion(abs)
-		h.Must(err)
-
-		if got != info.rev {
-			t.Fatalf("expected %q, got %q", got.String(), info.rev.String())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/version_queue_test.go b/installer/vendor/github.com/golang/dep/internal/gps/version_queue_test.go
deleted file mode 100644
index b2ea87881f..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/version_queue_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"testing"
-
-	"github.com/pkg/errors"
-)
-
-// just need a listVersions method
-type fakeBridge struct {
-	*bridge
-	vl []Version
-}
-
-var fakevl = []Version{
-	NewVersion("v2.0.0").Pair("200rev"),
-	NewVersion("v1.1.1").Pair("111rev"),
-	NewVersion("v1.1.0").Pair("110rev"),
-	NewVersion("v1.0.0").Pair("100rev"),
-	NewBranch("master").Pair("masterrev"),
-}
-
-func init() {
-	SortForUpgrade(fakevl)
-}
-
-func (fb *fakeBridge) listVersions(id ProjectIdentifier) ([]Version, error) {
-	// it's a fixture, we only ever do the one, regardless of id
-	return fb.vl, nil
-}
-
-type fakeFailBridge struct {
-	*bridge
-}
-
-var errVQ = errors.New("vqerr")
-
-func (fb *fakeFailBridge) listVersions(id ProjectIdentifier) ([]Version, error) {
-	return nil, errVQ
-}
-
-func TestVersionQueueSetup(t *testing.T) {
-	id := ProjectIdentifier{ProjectRoot: ProjectRoot("foo")}.normalize()
-
-	// shouldn't even need to embed a real bridge
-	fb := &fakeBridge{vl: fakevl}
-	ffb := &fakeFailBridge{}
-
-	_, err := newVersionQueue(id, nil, nil, ffb)
-	if err == nil {
-		t.Error("Expected err when providing no prefv or lockv, and injected bridge returns err from ListVersions()")
-	}
-
-	vq, err := newVersionQueue(id, nil, nil, fb)
-	if err != nil {
-		t.Errorf("Unexpected err on vq create: %s", err)
-	} else {
-		if len(vq.pi) != 5 {
-			t.Errorf("Should have five versions from listVersions() when providing no prefv or lockv; got %v:\n\t%s", len(vq.pi), vq.String())
-		}
-		if !vq.allLoaded {
-			t.Errorf("allLoaded flag should be set, but wasn't")
-		}
-
-		if vq.prefv != nil || vq.lockv != nil {
-			t.Error("lockv and prefv should be nil")
-		}
-		if vq.current() != fakevl[0] {
-			t.Errorf("current should be head of fakevl (%s), got %s", fakevl[0], vq.current())
-		}
-	}
-
-	lockv := fakevl[0]
-	prefv := fakevl[1]
-	vq, err = newVersionQueue(id, lockv, nil, fb)
-	if err != nil {
-		t.Errorf("Unexpected err on vq create: %s", err)
-	} else {
-		if len(vq.pi) != 1 {
-			t.Errorf("Should have one version when providing only a lockv; got %v:\n\t%s", len(vq.pi), vq.String())
-		}
-		if vq.allLoaded {
-			t.Errorf("allLoaded flag should not be set")
-		}
-		if vq.lockv != lockv {
-			t.Errorf("lockv should be %s, was %s", lockv, vq.lockv)
-		}
-		if vq.current() != lockv {
-			t.Errorf("current should be lockv (%s), got %s", lockv, vq.current())
-		}
-	}
-
-	vq, err = newVersionQueue(id, nil, prefv, fb)
-	if err != nil {
-		t.Errorf("Unexpected err on vq create: %s", err)
-	} else {
-		if len(vq.pi) != 1 {
-			t.Errorf("Should have one version when providing only a prefv; got %v:\n\t%s", len(vq.pi), vq.String())
-		}
-		if vq.allLoaded {
-			t.Errorf("allLoaded flag should not be set")
-		}
-		if vq.prefv != prefv {
-			t.Errorf("prefv should be %s, was %s", prefv, vq.prefv)
-		}
-		if vq.current() != prefv {
-			t.Errorf("current should be prefv (%s), got %s", prefv, vq.current())
-		}
-	}
-
-	vq, err = newVersionQueue(id, lockv, prefv, fb)
-	if err != nil {
-		t.Errorf("Unexpected err on vq create: %s", err)
-	} else {
-		if len(vq.pi) != 2 {
-			t.Errorf("Should have two versions when providing both a prefv and lockv; got %v:\n\t%s", len(vq.pi), vq.String())
-		}
-		if vq.allLoaded {
-			t.Errorf("allLoaded flag should not be set")
-		}
-		if vq.prefv != prefv {
-			t.Errorf("prefv should be %s, was %s", prefv, vq.prefv)
-		}
-		if vq.lockv != lockv {
-			t.Errorf("lockv should be %s, was %s", lockv, vq.lockv)
-		}
-		if vq.current() != lockv {
-			t.Errorf("current should be lockv (%s), got %s", lockv, vq.current())
-		}
-	}
-}
-
-func TestVersionQueueAdvance(t *testing.T) {
-	fb := &fakeBridge{vl: fakevl}
-	id := ProjectIdentifier{ProjectRoot: ProjectRoot("foo")}.normalize()
-
-	// First with no prefv or lockv
-	vq, err := newVersionQueue(id, nil, nil, fb)
-	if err != nil {
-		t.Fatalf("Unexpected err on vq create: %s", err)
-	}
-
-	for k, v := range fakevl[1:] {
-		err = vq.advance(errors.Errorf("advancment fail for %s", fakevl[k]))
-		if err != nil {
-			t.Errorf("error on advancing vq from %s to %s", fakevl[k], v)
-			break
-		}
-
-		if vq.current() != v {
-			t.Errorf("on advance() %v, current should be %s, got %s", k, v, vq.current())
-		}
-	}
-
-	if vq.isExhausted() {
-		t.Error("should not be exhausted until advancing 'past' the end")
-	}
-	if err = vq.advance(errors.Errorf("final advance failure")); err != nil {
-		t.Errorf("should not error on advance, even past end, but got %s", err)
-	}
-
-	if !vq.isExhausted() {
-		t.Error("advanced past end, should now report exhaustion")
-	}
-	if vq.current() != nil {
-		t.Error("advanced past end, current should return nil")
-	}
-
-	// now, do one with both a prefv and lockv
-	lockv := fakevl[2]
-	prefv := fakevl[0]
-	vq, err = newVersionQueue(id, lockv, prefv, fb)
-	if err != nil {
-		t.Errorf("error creating version queue: %v", err)
-	}
-	if vq.String() != "[v1.1.0, v2.0.0]" {
-		t.Error("stringifying vq did not have expected outcome, got", vq.String())
-	}
-	if vq.isExhausted() {
-		t.Error("can't be exhausted, we aren't even 'allLoaded' yet")
-	}
-
-	err = vq.advance(errors.Errorf("dequeue lockv"))
-	if err != nil {
-		t.Error("unexpected error when advancing past lockv", err)
-	} else {
-		if vq.current() != prefv {
-			t.Errorf("current should be prefv (%s) after first advance, got %s", prefv, vq.current())
-		}
-		if len(vq.pi) != 1 {
-			t.Errorf("should have just prefv elem left in vq, but there are %v:\n\t%s", len(vq.pi), vq.String())
-		}
-	}
-
-	err = vq.advance(errors.Errorf("dequeue prefv"))
-	if err != nil {
-		t.Error("unexpected error when advancing past prefv", err)
-	} else {
-		if !vq.allLoaded {
-			t.Error("allLoaded should now be true")
-		}
-		if len(vq.pi) != 3 {
-			t.Errorf("should have three remaining versions after removing prefv and lockv, but there are %v:\n\t%s", len(vq.pi), vq.String())
-		}
-		if vq.current() != fakevl[1] {
-			t.Errorf("current should be first elem of fakevl (%s) after advancing into all, got %s", fakevl[1], vq.current())
-		}
-	}
-
-	// make sure the queue ordering is still right even with a double-delete
-	vq.advance(nil)
-	if vq.current() != fakevl[3] {
-		t.Errorf("second elem after ListVersions() should be idx 3 of fakevl (%s), got %s", fakevl[3], vq.current())
-	}
-	vq.advance(nil)
-	if vq.current() != fakevl[4] {
-		t.Errorf("third elem after ListVersions() should be idx 4 of fakevl (%s), got %s", fakevl[4], vq.current())
-	}
-	vq.advance(nil)
-	if vq.current() != nil || !vq.isExhausted() {
-		t.Error("should be out of versions in the queue")
-	}
-
-	// Make sure we handle things correctly when listVersions adds nothing new
-	fb = &fakeBridge{vl: []Version{lockv, prefv}}
-	vq, err = newVersionQueue(id, lockv, prefv, fb)
-	if err != nil {
-		t.Errorf("error creating version queue: %v", err)
-	}
-	vq.advance(nil)
-	vq.advance(nil)
-	if vq.current() != nil || !vq.isExhausted() {
-		t.Errorf("should have no versions left, as ListVersions() added nothing new, but still have %s", vq.String())
-	}
-	err = vq.advance(nil)
-	if err != nil {
-		t.Errorf("should be fine to advance on empty queue, per docs, but got err %s", err)
-	}
-
-	// Also handle it well when advancing calls ListVersions() and it gets an
-	// error
-	vq, err = newVersionQueue(id, lockv, nil, &fakeFailBridge{})
-	if err != nil {
-		t.Errorf("should not err on creation when preseeded with lockv, but got err %s", err)
-	}
-	err = vq.advance(nil)
-	if err == nil {
-		t.Error("advancing should trigger call to erroring bridge, but no err")
-	}
-	err = vq.advance(nil)
-	if err == nil {
-		t.Error("err should be stored for reuse on any subsequent calls")
-	}
-
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/version_test.go b/installer/vendor/github.com/golang/dep/internal/gps/version_test.go
deleted file mode 100644
index 3c68fe5882..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/version_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import "testing"
-
-func TestVersionSorts(t *testing.T) {
-	rev := Revision("flooboofoobooo")
-	v1 := NewBranch("master").Pair(rev)
-	v2 := NewBranch("test").Pair(rev)
-	v3 := NewVersion("1.0.0").Pair(rev)
-	v4 := NewVersion("1.0.1").Pair(rev)
-	v5 := NewVersion("v2.0.5").Pair(rev)
-	v6 := NewVersion("2.0.5.2").Pair(rev)
-	v7 := newDefaultBranch("unwrapped").Pair(rev)
-	v8 := NewVersion("20.0.5.2").Pair(rev)
-	v9 := NewVersion("v1.5.5-beta.4").Pair(rev)
-	v10 := NewVersion("v3.0.1-alpha.1").Pair(rev)
-
-	start := []Version{
-		v1,
-		v2,
-		v3,
-		v4,
-		v5,
-		v6,
-		v7,
-		v8,
-		v9,
-		v10,
-		rev,
-	}
-
-	down := make([]Version, len(start))
-	copy(down, start)
-	up := make([]Version, len(start))
-	copy(up, start)
-
-	edown := []Version{
-		v3, v4, v5, // semvers
-		v9, v10, // prerelease semver
-		v7, v1, v2, // floating/branches
-		v6, v8, // plain versions
-		rev, // revs
-	}
-
-	eup := []Version{
-		v5, v4, v3, // semvers
-		v10, v9, // prerelease semver
-		v7, v1, v2, // floating/branches
-		v6, v8, // plain versions
-		rev, // revs
-	}
-
-	SortForUpgrade(up)
-	var wrong []int
-	for k, v := range up {
-		if eup[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on upgrade sort, but got %s", eup[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Upgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	SortForDowngrade(down)
-	wrong = wrong[:0]
-	for k, v := range down {
-		if edown[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on downgrade sort, but got %s", edown[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Downgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	// Now make sure we sort back the other way correctly...just because
-	SortForUpgrade(down)
-	wrong = wrong[:0]
-	for k, v := range down {
-		if eup[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on down-then-upgrade sort, but got %s", eup[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Down-then-upgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	// Now make sure we sort back the other way correctly...just because
-	SortForDowngrade(up)
-	wrong = wrong[:0]
-	for k, v := range up {
-		if edown[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on up-then-downgrade sort, but got %s", edown[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Fatalf("Up-then-downgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	///////////
-	// Repeat for PairedVersion slices & sorts
-
-	pdown, pup := make([]PairedVersion, 0, len(start)), make([]PairedVersion, 0, len(start))
-	for _, v := range start {
-		if _, ok := v.(Revision); ok {
-			continue
-		}
-		pdown = append(pdown, v.(PairedVersion))
-		pup = append(pup, v.(PairedVersion))
-	}
-
-	pedown, peup := make([]PairedVersion, 0, len(edown)), make([]PairedVersion, 0, len(eup))
-	for _, v := range edown {
-		if _, ok := v.(Revision); ok {
-			continue
-		}
-		pedown = append(pedown, v.(PairedVersion))
-	}
-	for _, v := range eup {
-		if _, ok := v.(Revision); ok {
-			continue
-		}
-		peup = append(peup, v.(PairedVersion))
-	}
-
-	SortPairedForUpgrade(pup)
-	for k, v := range pup {
-		if peup[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on upgrade sort, but got %s", peup[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Upgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	SortPairedForDowngrade(pdown)
-	wrong = wrong[:0]
-	for k, v := range pdown {
-		if pedown[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on downgrade sort, but got %s", pedown[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Downgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	// Now make sure we sort back the other way correctly...just because
-	SortPairedForUpgrade(pdown)
-	wrong = wrong[:0]
-	for k, v := range pdown {
-		if peup[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on down-then-upgrade sort, but got %s", peup[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Down-then-upgrade sort positions with wrong versions: %v", wrong)
-	}
-
-	// Now make sure we sort back the other way correctly...just because
-	SortPairedForDowngrade(pup)
-	wrong = wrong[:0]
-	for k, v := range pup {
-		if pedown[k] != v {
-			wrong = append(wrong, k)
-			t.Errorf("Expected version %s in position %v on up-then-downgrade sort, but got %s", pedown[k], k, v)
-		}
-	}
-	if len(wrong) > 0 {
-		// Just helps with readability a bit
-		t.Errorf("Up-then-downgrade sort positions with wrong versions: %v", wrong)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/gps/version_unifier_test.go b/installer/vendor/github.com/golang/dep/internal/gps/version_unifier_test.go
deleted file mode 100644
index f044347188..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/gps/version_unifier_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gps
-
-import (
-	"testing"
-
-	"github.com/golang/dep/internal/gps/pkgtree"
-)
-
-type lvFixBridge []Version
-
-var lvfb1 lvFixBridge
-
-func init() {
-	rev1 := Revision("revision-one")
-	rev2 := Revision("revision-two")
-	rev3 := Revision("revision-three")
-
-	lvfb1 = lvFixBridge{
-		NewBranch("master").Pair(rev1),
-		NewBranch("test").Pair(rev2),
-		NewVersion("1.0.0").Pair(rev1),
-		NewVersion("1.0.1").Pair("other1"),
-		NewVersion("v2.0.5").Pair(rev3),
-		NewVersion("2.0.5.2").Pair(rev3),
-		newDefaultBranch("unwrapped").Pair(rev3),
-		NewVersion("20.0.5.2").Pair(rev1),
-		NewVersion("v1.5.5-beta.4").Pair("other2"),
-		NewVersion("v3.0.1-alpha.1").Pair(rev2),
-	}
-}
-
-func (lb lvFixBridge) listVersions(ProjectIdentifier) ([]Version, error) {
-	return lb, nil
-}
-
-func TestCreateTyepUnion(t *testing.T) {
-	vu := versionUnifier{
-		b:   lvfb1,
-		mtr: newMetrics(),
-	}
-
-	rev1 := Revision("revision-one")
-	rev2 := Revision("revision-two")
-	id := mkPI("irrelevant")
-
-	vtu := vu.createTypeUnion(id, rev1)
-	if len(vtu) != 4 {
-		t.Fatalf("wanted a type union with four elements, got %v: \n%#v", len(vtu), vtu)
-	}
-
-	vtu = vu.createTypeUnion(id, NewBranch("master"))
-	if len(vtu) != 4 {
-		t.Fatalf("wanted a type union with four elements, got %v: \n%#v", len(vtu), vtu)
-	}
-
-	vtu = vu.createTypeUnion(id, Revision("notexist"))
-	if len(vtu) != 1 {
-		t.Fatalf("wanted a type union with one elements, got %v: \n%#v", len(vtu), vtu)
-	}
-
-	vtu = vu.createTypeUnion(id, rev2)
-	if len(vtu) != 3 {
-		t.Fatalf("wanted a type union with three elements, got %v: \n%#v", len(vtu), vtu)
-	}
-
-	vtu = vu.createTypeUnion(id, nil)
-	if vtu != nil {
-		t.Fatalf("wanted a nil return on nil input, got %#v", vtu)
-	}
-}
-
-func TestTypeUnionIntersect(t *testing.T) {
-	vu := versionUnifier{
-		b:   lvfb1,
-		mtr: newMetrics(),
-	}
-
-	rev1 := Revision("revision-one")
-	rev2 := Revision("revision-two")
-	rev3 := Revision("revision-three")
-	id := mkPI("irrelevant")
-
-	c, _ := NewSemverConstraint("^2.0.0")
-	gotc := vu.intersect(id, rev2, c)
-	if gotc != none {
-		t.Fatalf("wanted empty set from intersect, got %#v", gotc)
-	}
-
-	gotc = vu.intersect(id, c, rev1)
-	if gotc != none {
-		t.Fatalf("wanted empty set from intersect, got %#v", gotc)
-	}
-
-	gotc = vu.intersect(id, c, rev3)
-	if gotc != NewVersion("v2.0.5").Pair(rev3) {
-		t.Fatalf("wanted v2.0.5, got %s from intersect", gotc.typedString())
-	}
-}
-
-func (lb lvFixBridge) SourceExists(ProjectIdentifier) (bool, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) SyncSourceFor(ProjectIdentifier) error {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) RevisionPresentIn(ProjectIdentifier, Revision) (bool, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) ListPackages(ProjectIdentifier, Version) (pkgtree.PackageTree, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) GetManifestAndLock(ProjectIdentifier, Version, ProjectAnalyzer) (Manifest, Lock, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) ExportProject(ProjectIdentifier, Version, string) error {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) DeduceProjectRoot(ip string) (ProjectRoot, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) verifyRootDir(path string) error {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) vendorCodeExists(ProjectIdentifier) (bool, error) {
-	panic("not implemented")
-}
-
-func (lb lvFixBridge) breakLock() {
-	panic("not implemented")
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/base/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/base/importer.go
deleted file mode 100644
index 262411c744..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/base/importer.go
+++ /dev/null
@@ -1,324 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package base
-
-import (
-	"log"
-
-	"github.com/golang/dep"
-	fb "github.com/golang/dep/internal/feedback"
-	"github.com/golang/dep/internal/gps"
-	"github.com/pkg/errors"
-)
-
-// Importer provides a common implementation for importing from other
-// dependency managers.
-type Importer struct {
-	sm gps.SourceManager
-
-	Logger   *log.Logger
-	Verbose  bool
-	Manifest *dep.Manifest
-	Lock     *dep.Lock
-}
-
-// NewImporter creates a new Importer for embedding in an importer.
-func NewImporter(logger *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{
-		Logger:   logger,
-		Verbose:  verbose,
-		Manifest: dep.NewManifest(),
-		Lock:     &dep.Lock{},
-		sm:       sm,
-	}
-}
-
-// isTag determines if the specified value is a tag (plain or semver).
-func (i *Importer) isTag(pi gps.ProjectIdentifier, value string) (bool, gps.Version, error) {
-	versions, err := i.sm.ListVersions(pi)
-	if err != nil {
-		return false, nil, errors.Wrapf(err, "unable to list versions for %s(%s)", pi.ProjectRoot, pi.Source)
-	}
-
-	for _, version := range versions {
-		if version.Type() != gps.IsVersion && version.Type() != gps.IsSemver {
-			continue
-		}
-
-		if value == version.String() {
-			return true, version, nil
-		}
-	}
-
-	return false, nil, nil
-}
-
-// lookupVersionForLockedProject figures out the appropriate version for a locked
-// project based on the locked revision and the constraint from the manifest.
-// First try matching the revision to a version, then try the constraint from the
-// manifest, then finally the revision.
-func (i *Importer) lookupVersionForLockedProject(pi gps.ProjectIdentifier, c gps.Constraint, rev gps.Revision) (gps.Version, error) {
-	// Find the version that goes with this revision, if any
-	versions, err := i.sm.ListVersions(pi)
-	if err != nil {
-		return rev, errors.Wrapf(err, "Unable to lookup the version represented by %s in %s(%s). Falling back to locking the revision only.", rev, pi.ProjectRoot, pi.Source)
-	}
-
-	var branchConstraint gps.PairedVersion
-	gps.SortPairedForUpgrade(versions) // Sort versions in asc order
-	matches := []gps.Version{}
-	for _, v := range versions {
-		if v.Revision() == rev {
-			matches = append(matches, v)
-		}
-		if c != nil && v.Type() == gps.IsBranch && v.String() == c.String() {
-			branchConstraint = v
-		}
-	}
-
-	// Try to narrow down the matches with the constraint. Otherwise return the first match.
-	if len(matches) > 0 {
-		if c != nil {
-			for _, v := range matches {
-				if i.testConstraint(c, v) {
-					return v, nil
-				}
-			}
-		}
-		return matches[0], nil
-	}
-
-	// Use branch constraint from the manifest
-	if branchConstraint != nil {
-		return branchConstraint.Unpair().Pair(rev), nil
-	}
-
-	// Give up and lock only to a revision
-	return rev, nil
-}
-
-// ImportedPackage is a common intermediate representation of a package imported
-// from an external tool's configuration.
-type ImportedPackage struct {
-	// Required. The package path, not necessarily the project root.
-	Name string
-
-	// Required. Text representing a revision or tag.
-	LockHint string
-
-	// Optional. Alternative source, or fork, for the project.
-	Source string
-
-	// Optional. Text representing a branch or version.
-	ConstraintHint string
-}
-
-// importedProject is a consolidated representation of a set of imported packages
-// for the same project root.
-type importedProject struct {
-	Root gps.ProjectRoot
-	ImportedPackage
-}
-
-// loadPackages consolidates all package references into a set of project roots.
-func (i *Importer) loadPackages(packages []ImportedPackage) ([]importedProject, error) {
-	// preserve the original order of the packages so that messages that
-	// are printed as they are processed are in a consistent order.
-	orderedProjects := make([]importedProject, 0, len(packages))
-
-	projects := make(map[gps.ProjectRoot]*importedProject, len(packages))
-	for _, pkg := range packages {
-		pr, err := i.sm.DeduceProjectRoot(pkg.Name)
-		if err != nil {
-			return nil, errors.Wrapf(err, "Cannot determine the project root for %s", pkg.Name)
-		}
-		pkg.Name = string(pr)
-
-		prj, exists := projects[pr]
-		if !exists {
-			prj := importedProject{pr, pkg}
-			orderedProjects = append(orderedProjects, prj)
-			projects[pr] = &orderedProjects[len(orderedProjects)-1]
-			continue
-		}
-
-		// The config found first "wins", though we allow for incrementally
-		// setting each field because some importers have a config and lock file.
-		if prj.Source == "" && pkg.Source != "" {
-			prj.Source = pkg.Source
-		}
-
-		if prj.ConstraintHint == "" && pkg.ConstraintHint != "" {
-			prj.ConstraintHint = pkg.ConstraintHint
-		}
-
-		if prj.LockHint == "" && pkg.LockHint != "" {
-			prj.LockHint = pkg.LockHint
-		}
-	}
-
-	return orderedProjects, nil
-}
-
-// ImportPackages loads imported packages into the manifest and lock.
-// - defaultConstraintFromLock specifies if a constraint should be defaulted
-//   based on the locked version when there wasn't a constraint hint.
-//
-// Rules:
-// * When a constraint is ignored, default to *.
-// * HEAD revisions default to the matching branch.
-// * Semantic versions default to ^VERSION.
-// * Revision constraints are ignored.
-// * Versions that don't satisfy the constraint, drop the constraint.
-// * Untagged revisions ignore non-branch constraint hints.
-func (i *Importer) ImportPackages(packages []ImportedPackage, defaultConstraintFromLock bool) (err error) {
-	projects, err := i.loadPackages(packages)
-	if err != nil {
-		return err
-	}
-
-	for _, prj := range projects {
-		source := prj.Source
-		if len(source) > 0 {
-			isDefault, err := i.isDefaultSource(prj.Root, source)
-			if err != nil {
-				i.Logger.Printf("  Ignoring imported source %s for %s: %s", source, prj.Root, err.Error())
-				source = ""
-			} else if isDefault {
-				source = ""
-			}
-		}
-
-		pc := gps.ProjectConstraint{
-			Ident: gps.ProjectIdentifier{
-				ProjectRoot: prj.Root,
-				Source:      source,
-			},
-		}
-
-		pc.Constraint, err = i.sm.InferConstraint(prj.ConstraintHint, pc.Ident)
-		if err != nil {
-			pc.Constraint = gps.Any()
-		}
-
-		var version gps.Version
-		if prj.LockHint != "" {
-			var isTag bool
-			// Determine if the lock hint is a revision or tag
-			isTag, version, err = i.isTag(pc.Ident, prj.LockHint)
-			if err != nil {
-				return err
-			}
-
-			// If the hint is a revision, check if it is tagged
-			if !isTag {
-				revision := gps.Revision(prj.LockHint)
-				version, err = i.lookupVersionForLockedProject(pc.Ident, pc.Constraint, revision)
-				if err != nil {
-					version = nil
-					i.Logger.Println(err)
-				}
-			}
-
-			// Default the constraint based on the locked version
-			if defaultConstraintFromLock && prj.ConstraintHint == "" && version != nil {
-				c := i.convertToConstraint(version)
-				if c != nil {
-					pc.Constraint = c
-				}
-			}
-		}
-
-		// Ignore pinned constraints
-		if i.isConstraintPinned(pc.Constraint) {
-			if i.Verbose {
-				i.Logger.Printf("  Ignoring pinned constraint %v for %v.\n", pc.Constraint, pc.Ident)
-			}
-			pc.Constraint = gps.Any()
-		}
-
-		// Ignore constraints which conflict with the locked revision, so that
-		// solve doesn't later change the revision to satisfy the constraint.
-		if !i.testConstraint(pc.Constraint, version) {
-			if i.Verbose {
-				i.Logger.Printf("  Ignoring constraint %v for %v because it would invalidate the locked version %v.\n", pc.Constraint, pc.Ident, version)
-			}
-			pc.Constraint = gps.Any()
-		}
-
-		i.Manifest.Constraints[pc.Ident.ProjectRoot] = gps.ProjectProperties{
-			Source:     pc.Ident.Source,
-			Constraint: pc.Constraint,
-		}
-		fb.NewConstraintFeedback(pc, fb.DepTypeImported).LogFeedback(i.Logger)
-
-		if version != nil {
-			lp := gps.NewLockedProject(pc.Ident, version, nil)
-			i.Lock.P = append(i.Lock.P, lp)
-			fb.NewLockedProjectFeedback(lp, fb.DepTypeImported).LogFeedback(i.Logger)
-		}
-	}
-
-	return nil
-}
-
-// isConstraintPinned returns if a constraint is pinned to a specific revision.
-func (i *Importer) isConstraintPinned(c gps.Constraint) bool {
-	if version, isVersion := c.(gps.Version); isVersion {
-		switch version.Type() {
-		case gps.IsRevision, gps.IsVersion:
-			return true
-		}
-	}
-	return false
-}
-
-// testConstraint verifies that the constraint won't invalidate the locked version.
-func (i *Importer) testConstraint(c gps.Constraint, v gps.Version) bool {
-	// Assume branch constraints are satisfied
-	if version, isVersion := c.(gps.Version); isVersion {
-		if version.Type() == gps.IsBranch {
-
-			return true
-		}
-	}
-
-	return c.Matches(v)
-}
-
-// convertToConstraint turns a version into a constraint.
-// Semver tags are converted to a range with the caret operator.
-func (i *Importer) convertToConstraint(v gps.Version) gps.Constraint {
-	if v.Type() == gps.IsSemver {
-		c, err := gps.NewSemverConstraintIC(v.String())
-		if err != nil {
-			// This should never fail, because the type is semver.
-			// If it does fail somehow, don't let that impact the import.
-			return nil
-		}
-		return c
-	}
-	return v
-}
-
-func (i *Importer) isDefaultSource(projectRoot gps.ProjectRoot, sourceURL string) (bool, error) {
-	// this condition is mainly for gopkg.in imports,
-	// as some importers specify the repository url as https://gopkg.in/...,
-	// but sm.SourceURLsForPath() returns https://github.com/... urls for gopkg.in
-	if sourceURL == "https://"+string(projectRoot) {
-		return true, nil
-	}
-
-	sourceURLs, err := i.sm.SourceURLsForPath(string(projectRoot))
-	if err != nil {
-		return false, err
-	}
-	// The first url in the slice will be the default one (usually https://...)
-	if len(sourceURLs) > 0 && sourceURL == sourceURLs[0].String() {
-		return true, nil
-	}
-
-	return false, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/base/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/base/importer_test.go
deleted file mode 100644
index f298efefd7..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/base/importer_test.go
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package base
-
-import (
-	"log"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestBaseImporter_IsTag(t *testing.T) {
-	testcases := map[string]struct {
-		input     string
-		wantIsTag bool
-		wantTag   gps.Version
-	}{
-		"non-semver tag": {
-			input:     importertest.Beta1Tag,
-			wantIsTag: true,
-			wantTag:   gps.NewVersion(importertest.Beta1Tag).Pair(importertest.Beta1Rev),
-		},
-		"semver-tag": {
-			input:     importertest.V1PatchTag,
-			wantIsTag: true,
-			wantTag:   gps.NewVersion(importertest.V1PatchTag).Pair(importertest.V1PatchRev)},
-		"untagged revision": {
-			input:     importertest.UntaggedRev,
-			wantIsTag: false,
-		},
-		"branch name": {
-			input:     importertest.V2Branch,
-			wantIsTag: false,
-		},
-		"empty": {
-			input:     "",
-			wantIsTag: false,
-		},
-	}
-
-	pi := gps.ProjectIdentifier{ProjectRoot: importertest.Project}
-
-	for name, tc := range testcases {
-		name := name
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			h := test.NewHelper(t)
-			defer h.Cleanup()
-			// Disable parallel tests until we can resolve this error on the Windows builds:
-			// "remote repository at https://github.com/carolynvs/deptest-importers does not exist, or is inaccessible"
-			//h.Parallel()
-
-			ctx := importertest.NewTestContext(h)
-			sm, err := ctx.SourceManager()
-			h.Must(err)
-			defer sm.Release()
-
-			i := NewImporter(ctx.Err, ctx.Verbose, sm)
-			gotIsTag, gotTag, err := i.isTag(pi, tc.input)
-			h.Must(err)
-
-			if tc.wantIsTag != gotIsTag {
-				t.Fatalf("unexpected isTag result for %v: \n\t(GOT) %v \n\t(WNT) %v",
-					tc.input, gotIsTag, tc.wantIsTag)
-			}
-
-			if tc.wantTag != gotTag {
-				t.Fatalf("unexpected tag for %v: \n\t(GOT) %v \n\t(WNT) %v",
-					tc.input, gotTag, tc.wantTag)
-			}
-		})
-	}
-}
-
-func TestBaseImporter_LookupVersionForLockedProject(t *testing.T) {
-	testcases := map[string]struct {
-		revision    gps.Revision
-		constraint  gps.Constraint
-		wantVersion string
-	}{
-		"match revision to tag": {
-			revision:    importertest.V1PatchRev,
-			wantVersion: importertest.V1PatchTag,
-		},
-		"match revision with multiple tags using constraint": {
-			revision:    importertest.MultiTaggedRev,
-			constraint:  gps.NewVersion(importertest.MultiTaggedPlainTag),
-			wantVersion: importertest.MultiTaggedPlainTag,
-		},
-		"revision with multiple tags with no constraint defaults to best match": {
-			revision:    importertest.MultiTaggedRev,
-			wantVersion: importertest.MultiTaggedSemverTag,
-		},
-		"revision with multiple tags with nonmatching constraint defaults to best match": {
-			revision:    importertest.MultiTaggedRev,
-			constraint:  gps.NewVersion("thismatchesnothing"),
-			wantVersion: importertest.MultiTaggedSemverTag,
-		},
-		"untagged revision fallback to branch constraint": {
-			revision:    importertest.UntaggedRev,
-			constraint:  gps.NewBranch("master"),
-			wantVersion: "master",
-		},
-		"fallback to revision": {
-			revision:    importertest.UntaggedRev,
-			wantVersion: importertest.UntaggedRev,
-		},
-	}
-
-	pi := gps.ProjectIdentifier{ProjectRoot: importertest.Project}
-
-	for name, tc := range testcases {
-		name := name
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			h := test.NewHelper(t)
-			defer h.Cleanup()
-			// Disable parallel tests until we can resolve this error on the Windows builds:
-			// "remote repository at https://github.com/carolynvs/deptest-importers does not exist, or is inaccessible"
-			//h.Parallel()
-
-			ctx := importertest.NewTestContext(h)
-			sm, err := ctx.SourceManager()
-			h.Must(err)
-			defer sm.Release()
-
-			i := NewImporter(ctx.Err, ctx.Verbose, sm)
-			v, err := i.lookupVersionForLockedProject(pi, tc.constraint, tc.revision)
-			h.Must(err)
-
-			gotVersion := v.String()
-			if gotVersion != tc.wantVersion {
-				t.Fatalf("unexpected locked version: \n\t(GOT) %v\n\t(WNT) %v", gotVersion, tc.wantVersion)
-			}
-		})
-	}
-}
-
-func TestBaseImporter_ImportProjects(t *testing.T) {
-	testcases := map[string]struct {
-		importertest.TestCase
-		projects []ImportedPackage
-	}{
-		"tag constraints are ignored": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantVersion:    importertest.Beta1Tag,
-				WantRevision:   importertest.Beta1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.Beta1Rev,
-					ConstraintHint: importertest.Beta1Tag,
-				},
-			},
-		},
-		"tag lock hints Lock to tagged revision": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantVersion:    importertest.Beta1Tag,
-				WantRevision:   importertest.Beta1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project,
-					LockHint: importertest.Beta1Tag,
-				},
-			},
-		},
-		"untagged revision ignores range constraint": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantRevision:   importertest.UntaggedRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.UntaggedRev,
-					ConstraintHint: importertest.V1Constraint,
-				},
-			},
-		},
-		"untagged revision keeps branch constraint": {
-			importertest.TestCase{
-				WantConstraint: "master",
-				WantVersion:    "master",
-				WantRevision:   importertest.UntaggedRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.UntaggedRev,
-					ConstraintHint: "master",
-				},
-			},
-		},
-		"HEAD revisions default constraint to the matching branch": {
-			importertest.TestCase{
-				DefaultConstraintFromLock: true,
-				WantConstraint:            importertest.V2Branch,
-				WantVersion:               importertest.V2Branch,
-				WantRevision:              importertest.V2Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project,
-					LockHint: importertest.V2Rev,
-				},
-			},
-		},
-		"Semver tagged revisions default to ^VERSION": {
-			importertest.TestCase{
-				DefaultConstraintFromLock: true,
-				WantConstraint:            importertest.V1Constraint,
-				WantVersion:               importertest.V1Tag,
-				WantRevision:              importertest.V1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project,
-					LockHint: importertest.V1Rev,
-				},
-			},
-		},
-		"Semver lock hint defaults constraint to ^VERSION": {
-			importertest.TestCase{
-				DefaultConstraintFromLock: true,
-				WantConstraint:            importertest.V1Constraint,
-				WantVersion:               importertest.V1Tag,
-				WantRevision:              importertest.V1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project,
-					LockHint: importertest.V1Tag,
-				},
-			},
-		},
-		"Semver constraint hint": {
-			importertest.TestCase{
-				WantConstraint: importertest.V1Constraint,
-				WantVersion:    importertest.V1PatchTag,
-				WantRevision:   importertest.V1PatchRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.V1PatchRev,
-					ConstraintHint: importertest.V1Constraint,
-				},
-			},
-		},
-		"Semver prerelease lock hint": {
-			importertest.TestCase{
-				WantConstraint: importertest.V2Branch,
-				WantVersion:    importertest.V2PatchTag,
-				WantRevision:   importertest.V2PatchRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.V2PatchRev,
-					ConstraintHint: importertest.V2Branch,
-				},
-			},
-		},
-		"Revision constraints are ignored": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantVersion:    importertest.V1Tag,
-				WantRevision:   importertest.V1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.V1Rev,
-					ConstraintHint: importertest.V1Rev,
-				},
-			},
-		},
-		"Branch constraint hint": {
-			importertest.TestCase{
-				WantConstraint: "master",
-				WantVersion:    importertest.V1Tag,
-				WantRevision:   importertest.V1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.V1Rev,
-					ConstraintHint: "master",
-				},
-			},
-		},
-		"Non-matching semver constraint is ignored": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantVersion:    importertest.V1Tag,
-				WantRevision:   importertest.V1Rev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.V1Rev,
-					ConstraintHint: "^2.0.0",
-				},
-			},
-		},
-		"git describe constraint is ignored": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantRevision:   importertest.UntaggedRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project,
-					LockHint:       importertest.UntaggedRev,
-					ConstraintHint: importertest.UntaggedRevAbbrv,
-				},
-			},
-		},
-		"consolidate subpackages under root": {
-			importertest.TestCase{
-				WantConstraint: "master",
-				WantVersion:    "master",
-				WantRevision:   importertest.UntaggedRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:           importertest.Project + "/subpkA",
-					ConstraintHint: "master",
-				},
-				{
-					Name:     importertest.Project,
-					LockHint: importertest.UntaggedRev,
-				},
-			},
-		},
-		"ignore duplicate packages": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantRevision:   importertest.UntaggedRev,
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project + "/subpkgA",
-					LockHint: importertest.UntaggedRev, // first wins
-				},
-				{
-					Name:     importertest.Project + "/subpkgB",
-					LockHint: importertest.V1Rev,
-				},
-			},
-		},
-		"skip empty lock hints": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantRevision:   "",
-			},
-			[]ImportedPackage{
-				{
-					Name:     importertest.Project,
-					LockHint: "",
-				},
-			},
-		},
-		"alternate source": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantSourceRepo: importertest.ProjectSrc,
-			},
-			[]ImportedPackage{
-				{
-					Name:   importertest.Project,
-					Source: importertest.ProjectSrc,
-				},
-			},
-		},
-		"ignoring default source": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantSourceRepo: "",
-			},
-			[]ImportedPackage{
-				{
-					Name:   importertest.Project,
-					Source: "https://" + importertest.Project,
-				},
-			},
-		},
-	}
-
-	for name, tc := range testcases {
-		name := name
-		tc := tc
-		t.Run(name, func(t *testing.T) {
-			err := tc.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				i := NewImporter(logger, true, sm)
-				convertErr := i.ImportPackages(tc.projects, tc.DefaultConstraintFromLock)
-				return i.Manifest, i.Lock, convertErr
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/glide/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/glide/importer.go
deleted file mode 100644
index 1745b1375c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/glide/importer.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package glide
-
-import (
-	"bytes"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/go-yaml/yaml"
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/fs"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/base"
-	"github.com/pkg/errors"
-)
-
-const glideYamlName = "glide.yaml"
-const glideLockName = "glide.lock"
-
-// Importer imports glide configuration into the dep configuration format.
-type Importer struct {
-	*base.Importer
-	glideConfig glideYaml
-	glideLock   glideLock
-	lockFound   bool
-}
-
-// NewImporter for glide.
-func NewImporter(logger *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{Importer: base.NewImporter(logger, verbose, sm)}
-}
-
-type glideYaml struct {
-	Name        string         `yaml:"package"`
-	Ignores     []string       `yaml:"ignore"`
-	ExcludeDirs []string       `yaml:"excludeDirs"`
-	Imports     []glidePackage `yaml:"import"`
-	TestImports []glidePackage `yaml:"testImport"`
-}
-
-type glideLock struct {
-	Imports     []glideLockedPackage `yaml:"imports"`
-	TestImports []glideLockedPackage `yaml:"testImports"`
-}
-
-type glidePackage struct {
-	Name       string `yaml:"package"`
-	Reference  string `yaml:"version"` // could contain a semver, tag or branch
-	Repository string `yaml:"repo"`
-
-	// Unsupported fields that we will warn if used
-	Subpackages []string `yaml:"subpackages"`
-	OS          string   `yaml:"os"`
-	Arch        string   `yaml:"arch"`
-}
-
-type glideLockedPackage struct {
-	Name       string `yaml:"name"`
-	Revision   string `yaml:"version"`
-	Repository string `yaml:"repo"`
-}
-
-// Name of the importer.
-func (g *Importer) Name() string {
-	return "glide"
-}
-
-// HasDepMetadata checks if a directory contains config that the importer can handle.
-func (g *Importer) HasDepMetadata(dir string) bool {
-	// Only require glide.yaml, the lock is optional
-	y := filepath.Join(dir, glideYamlName)
-	if _, err := os.Stat(y); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// Import the config found in the directory.
-func (g *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	err := g.load(dir)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.convert(pr)
-}
-
-// load the glide configuration files.
-func (g *Importer) load(projectDir string) error {
-	g.Logger.Println("Detected glide configuration files...")
-	y := filepath.Join(projectDir, glideYamlName)
-	if g.Verbose {
-		g.Logger.Printf("  Loading %s", y)
-	}
-	yb, err := ioutil.ReadFile(y)
-	if err != nil {
-		return errors.Wrapf(err, "unable to read %s", y)
-	}
-	err = yaml.Unmarshal(yb, &g.glideConfig)
-	if err != nil {
-		return errors.Wrapf(err, "unable to parse %s", y)
-	}
-
-	l := filepath.Join(projectDir, glideLockName)
-	if exists, _ := fs.IsRegular(l); exists {
-		if g.Verbose {
-			g.Logger.Printf("  Loading %s", l)
-		}
-		g.lockFound = true
-		lb, err := ioutil.ReadFile(l)
-		if err != nil {
-			return errors.Wrapf(err, "unable to read %s", l)
-		}
-		lock := glideLock{}
-		err = yaml.Unmarshal(lb, &lock)
-		if err != nil {
-			return errors.Wrapf(err, "unable to parse %s", l)
-		}
-		g.glideLock = lock
-	}
-
-	return nil
-}
-
-// convert the glide configuration files into dep configuration files.
-func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	projectName := string(pr)
-
-	task := bytes.NewBufferString("Converting from glide.yaml")
-	if g.lockFound {
-		task.WriteString(" and glide.lock")
-	}
-	task.WriteString("...")
-	g.Logger.Println(task)
-
-	numPkgs := len(g.glideConfig.Imports) + len(g.glideConfig.TestImports) + len(g.glideLock.Imports) + len(g.glideLock.TestImports)
-	packages := make([]base.ImportedPackage, 0, numPkgs)
-
-	// Constraints
-	for _, pkg := range append(g.glideConfig.Imports, g.glideConfig.TestImports...) {
-		// Validate
-		if pkg.Name == "" {
-			return nil, nil, errors.New("invalid glide configuration: Name is required")
-		}
-
-		// Warn
-		if g.Verbose {
-			if pkg.OS != "" {
-				g.Logger.Printf("  The %s package specified an os, but that isn't supported by dep yet, and will be ignored. See https://github.com/golang/dep/issues/291.\n", pkg.Name)
-			}
-			if pkg.Arch != "" {
-				g.Logger.Printf("  The %s package specified an arch, but that isn't supported by dep yet, and will be ignored. See https://github.com/golang/dep/issues/291.\n", pkg.Name)
-			}
-		}
-
-		ip := base.ImportedPackage{
-			Name:           pkg.Name,
-			Source:         pkg.Repository,
-			ConstraintHint: pkg.Reference,
-		}
-		packages = append(packages, ip)
-	}
-
-	// Locks
-	for _, pkg := range append(g.glideLock.Imports, g.glideLock.TestImports...) {
-		// Validate
-		if pkg.Name == "" {
-			return nil, nil, errors.New("invalid glide lock: Name is required")
-		}
-
-		ip := base.ImportedPackage{
-			Name:     pkg.Name,
-			Source:   pkg.Repository,
-			LockHint: pkg.Revision,
-		}
-		packages = append(packages, ip)
-	}
-
-	err := g.ImportPackages(packages, false)
-	if err != nil {
-		return nil, nil, errors.Wrap(err, "invalid glide configuration")
-	}
-
-	// Ignores
-	g.Manifest.Ignored = append(g.Manifest.Ignored, g.glideConfig.Ignores...)
-	if len(g.glideConfig.ExcludeDirs) > 0 {
-		if g.glideConfig.Name != "" && g.glideConfig.Name != projectName {
-			g.Logger.Printf("  Glide thinks the package is '%s' but dep thinks it is '%s', using dep's value.\n", g.glideConfig.Name, projectName)
-		}
-
-		for _, dir := range g.glideConfig.ExcludeDirs {
-			pkg := path.Join(projectName, dir)
-			g.Manifest.Ignored = append(g.Manifest.Ignored, pkg)
-		}
-	}
-
-	return g.Manifest, g.Lock, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/glide/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/glide/importer_test.go
deleted file mode 100644
index eb2099a458..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/glide/importer_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package glide
-
-import (
-	"bytes"
-	"log"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func TestGlideConfig_Convert(t *testing.T) {
-	testCases := map[string]struct {
-		yaml glideYaml
-		lock glideLock
-		importertest.TestCase
-	}{
-		"project": {
-			glideYaml{
-				Imports: []glidePackage{
-					{
-						Name:       importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Reference:  importertest.V2Branch,
-					},
-				},
-			},
-			glideLock{
-				Imports: []glideLockedPackage{
-					{
-						Name:       importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Revision:   importertest.V2PatchRev,
-					},
-				},
-			},
-			importertest.TestCase{
-				WantSourceRepo: importertest.ProjectSrc,
-				WantConstraint: importertest.V2Branch,
-				WantRevision:   importertest.V2PatchRev,
-				WantVersion:    importertest.V2PatchTag,
-			},
-		},
-		"test project": {
-			glideYaml{
-				Imports: []glidePackage{
-					{
-						Name:       importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Reference:  importertest.V2Branch,
-					},
-				},
-			},
-			glideLock{
-				Imports: []glideLockedPackage{
-					{
-						Name:       importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Revision:   importertest.V2PatchRev,
-					},
-				},
-			},
-			importertest.TestCase{
-				WantSourceRepo: importertest.ProjectSrc,
-				WantConstraint: importertest.V2Branch,
-				WantRevision:   importertest.V2PatchRev,
-				WantVersion:    importertest.V2PatchTag,
-			},
-		},
-		"yaml only": {
-			glideYaml{
-				Imports: []glidePackage{
-					{
-						Name:       importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Reference:  importertest.V2Branch,
-					},
-				},
-			},
-			glideLock{},
-			importertest.TestCase{
-				WantSourceRepo: importertest.ProjectSrc,
-				WantConstraint: importertest.V2Branch,
-			},
-		},
-		"ignored package": {
-			glideYaml{
-				Ignores: []string{importertest.Project},
-			},
-			glideLock{},
-			importertest.TestCase{
-				WantIgnored: []string{importertest.Project},
-			},
-		},
-		"exclude dir": {
-			glideYaml{
-				ExcludeDirs: []string{"samples"},
-			},
-			glideLock{},
-			importertest.TestCase{
-				WantIgnored: []string{importertest.RootProject + "/samples"},
-			},
-		},
-		"exclude dir ignores mismatched package name": {
-			glideYaml{
-				Name:        "github.com/golang/mismatched-package-name",
-				ExcludeDirs: []string{"samples"},
-			},
-			glideLock{},
-			importertest.TestCase{
-				WantIgnored: []string{importertest.RootProject + "/samples"},
-			},
-		},
-		"missing package name": {
-			glideYaml{
-				Imports: []glidePackage{{Name: ""}},
-			},
-			glideLock{},
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-		},
-		"warn unused os field": {
-			glideYaml{
-				Imports: []glidePackage{
-					{
-						Name: importertest.Project,
-						OS:   "windows",
-					},
-				}},
-			glideLock{},
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantWarning:    "specified an os",
-			},
-		},
-		"warn unused arch field": {
-			glideYaml{
-				Imports: []glidePackage{
-					{
-						Name: importertest.Project,
-						Arch: "i686",
-					},
-				}},
-			glideLock{},
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantWarning:    "specified an arch",
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		name := name
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			err := testCase.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				g := NewImporter(logger, true, sm)
-				g.glideConfig = testCase.yaml
-				g.glideLock = testCase.lock
-				return g.convert(importertest.RootProject)
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
-
-func TestGlideConfig_Import(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := importertest.NewTestContext(h)
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	h.TempDir(filepath.Join("src", importertest.RootProject))
-	h.TempCopy(filepath.Join(importertest.RootProject, glideYamlName), "glide.yaml")
-	h.TempCopy(filepath.Join(importertest.RootProject, glideLockName), "glide.lock")
-	projectRoot := h.Path(importertest.RootProject)
-
-	// Capture stderr so we can verify output
-	verboseOutput := &bytes.Buffer{}
-	ctx.Err = log.New(verboseOutput, "", 0)
-
-	g := NewImporter(ctx.Err, false, sm) // Disable verbose so that we don't print values that change each test run
-	if !g.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect the glide configuration files")
-	}
-
-	m, l, err := g.Import(projectRoot, importertest.RootProject)
-	h.Must(err)
-
-	if m == nil {
-		t.Fatal("Expected the manifest to be generated")
-	}
-
-	if l == nil {
-		t.Fatal("Expected the lock to be generated")
-	}
-
-	goldenFile := "golden.txt"
-	got := verboseOutput.String()
-	want := h.GetTestFileString(goldenFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenFile, got); err != nil {
-				t.Fatalf("%+v", errors.Wrapf(err, "Unable to write updated golden file %s", goldenFile))
-			}
-		} else {
-			t.Fatalf("want %s, got %s", want, got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.lock b/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.lock
deleted file mode 100644
index 0fae066028..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-hash: 16053c82a71f9bd509b05a4523df6bc418aed2083e4b8bd97a870bbc003256f8
-updated: 2017-03-07T17:02:32.214383898-06:00
-imports:
-- name: github.com/sdboyer/deptest
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: 3f4c3bea144e112a69bbe5d8d01c1b09a544253f
-- name: github.com/sdboyer/deptestdos
-  version: 5c607206be5decd28e6263ffffdcee067266015e
-testImports:
-- name: github.com/golang/lint
-  version: cb00e5669539f047b2f4c53a421a01b0c8e172c6
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.yaml b/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.yaml
deleted file mode 100644
index 88a3f2be74..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/glide.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
-package: github.com/golang/notexist
-homepage: http://example.com
-license: MIT
-owners:
-- name: Sam Boyer
-  email: sdboyer@example.com
-  homepage: http://sdboyer.io
-ignore:
-- github.com/sdboyer/dep-test
-excludeDirs:
-- samples
-import:
-- package: github.com/sdboyer/deptest
-  repo: https://github.com/sdboyer/deptest.git
-  vcs: git
-  version: master
-- package: github.com/sdboyer/deptestdos
-  version: v2.0.0
-testImport:
-- package: github.com/golang/lint
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/golden.txt b/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/golden.txt
deleted file mode 100644
index 30dfd7d429..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/glide/testdata/golden.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Detected glide configuration files...
-Converting from glide.yaml and glide.lock...
-  Using master as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
-  Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
-  Using * as initial constraint for imported dep github.com/golang/lint
-  Trying * (cb00e56) as initial lock for imported dep github.com/golang/lint
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/godep/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/godep/importer.go
deleted file mode 100644
index e35636ec51..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/godep/importer.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godep
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/base"
-	"github.com/pkg/errors"
-)
-
-const godepPath = "Godeps" + string(os.PathSeparator) + "Godeps.json"
-
-// Importer imports godep configuration into the dep configuration format.
-type Importer struct {
-	*base.Importer
-	json godepJSON
-}
-
-// NewImporter for godep.
-func NewImporter(logger *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{Importer: base.NewImporter(logger, verbose, sm)}
-}
-
-type godepJSON struct {
-	Imports []godepPackage `json:"Deps"`
-}
-
-type godepPackage struct {
-	ImportPath string `json:"ImportPath"`
-	Rev        string `json:"Rev"`
-	Comment    string `json:"Comment"`
-}
-
-// Name of the importer.
-func (g *Importer) Name() string {
-	return "godep"
-}
-
-// HasDepMetadata checks if a directory contains config that the importer can handle.
-func (g *Importer) HasDepMetadata(dir string) bool {
-	y := filepath.Join(dir, godepPath)
-	if _, err := os.Stat(y); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// Import the config found in the directory.
-func (g *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	err := g.load(dir)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.convert(pr)
-}
-
-func (g *Importer) load(projectDir string) error {
-	g.Logger.Println("Detected godep configuration files...")
-	j := filepath.Join(projectDir, godepPath)
-	if g.Verbose {
-		g.Logger.Printf("  Loading %s", j)
-	}
-	jb, err := ioutil.ReadFile(j)
-	if err != nil {
-		return errors.Wrapf(err, "unable to read %s", j)
-	}
-	err = json.Unmarshal(jb, &g.json)
-	if err != nil {
-		return errors.Wrapf(err, "unable to parse %s", j)
-	}
-
-	return nil
-}
-
-func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	g.Logger.Println("Converting from Godeps.json ...")
-
-	packages := make([]base.ImportedPackage, 0, len(g.json.Imports))
-	for _, pkg := range g.json.Imports {
-		// Validate
-		if pkg.ImportPath == "" {
-			err := errors.New("invalid godep configuration, ImportPath is required")
-			return nil, nil, err
-		}
-
-		if pkg.Rev == "" {
-			err := errors.New("invalid godep configuration, Rev is required")
-			return nil, nil, err
-		}
-
-		ip := base.ImportedPackage{
-			Name:           pkg.ImportPath,
-			LockHint:       pkg.Rev,
-			ConstraintHint: pkg.Comment,
-		}
-		packages = append(packages, ip)
-	}
-
-	err := g.ImportPackages(packages, true)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.Manifest, g.Lock, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/godep/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/godep/importer_test.go
deleted file mode 100644
index 3aa27159a8..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/godep/importer_test.go
+++ /dev/null
@@ -1,204 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godep
-
-import (
-	"bytes"
-	"log"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func TestGodepConfig_Convert(t *testing.T) {
-	testCases := map[string]struct {
-		importertest.TestCase
-		json godepJSON
-	}{
-		"package without comment": {
-			importertest.TestCase{
-				WantConstraint: importertest.V1Constraint,
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-			},
-			godepJSON{
-				Imports: []godepPackage{
-					{
-						ImportPath: importertest.Project,
-						Rev:        importertest.V1Rev,
-					},
-				},
-			},
-		},
-		"package with comment": {
-			importertest.TestCase{
-				WantConstraint: importertest.V2Branch,
-				WantRevision:   importertest.V2PatchRev,
-				WantVersion:    importertest.V2PatchTag,
-			},
-			godepJSON{
-				Imports: []godepPackage{
-					{
-						ImportPath: importertest.Project,
-						Rev:        importertest.V2PatchRev,
-						Comment:    importertest.V2Branch,
-					},
-				},
-			},
-		},
-		"missing package name": {
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-			godepJSON{
-				Imports: []godepPackage{{ImportPath: ""}},
-			},
-		},
-		"missing revision": {
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-			godepJSON{
-				Imports: []godepPackage{
-					{
-						ImportPath: importertest.Project,
-					},
-				},
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		name := name
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			err := testCase.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				g := NewImporter(logger, true, sm)
-				g.json = testCase.json
-				return g.convert(importertest.RootProject)
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
-
-func TestGodepConfig_Import(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	cacheDir := "gps-repocache"
-	h.TempDir(cacheDir)
-	h.TempDir("src")
-	h.TempDir(filepath.Join("src", importertest.RootProject))
-	h.TempCopy(filepath.Join(importertest.RootProject, godepPath), "Godeps.json")
-
-	projectRoot := h.Path(importertest.RootProject)
-	sm, err := gps.NewSourceManager(gps.SourceManagerConfig{
-		Cachedir: h.Path(cacheDir),
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	h.Must(err)
-	defer sm.Release()
-
-	// Capture stderr so we can verify output
-	verboseOutput := &bytes.Buffer{}
-	logger := log.New(verboseOutput, "", 0)
-
-	g := NewImporter(logger, false, sm) // Disable Verbose so that we don't print values that change each test run
-	if !g.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect godep configuration file")
-	}
-
-	m, l, err := g.Import(projectRoot, importertest.RootProject)
-	h.Must(err)
-
-	if m == nil {
-		t.Fatal("Expected the manifest to be generated")
-	}
-
-	if l == nil {
-		t.Fatal("Expected the lock to be generated")
-	}
-
-	goldenFile := "golden.txt"
-	got := verboseOutput.String()
-	want := h.GetTestFileString(goldenFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenFile, got); err != nil {
-				t.Fatalf("%+v", errors.Wrapf(err, "Unable to write updated golden file %s", goldenFile))
-			}
-		} else {
-			t.Fatalf("want %s, got %s", want, got)
-		}
-	}
-}
-
-func TestGodepConfig_JsonLoad(t *testing.T) {
-	// This is same as cmd/dep/testdata/init/Godeps.json
-	wantJSON := godepJSON{
-		Imports: []godepPackage{
-			{
-				ImportPath: "github.com/sdboyer/deptest",
-				Rev:        "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-			},
-			{
-				ImportPath: "github.com/sdboyer/deptestdos",
-				Rev:        "5c607206be5decd28e6263ffffdcee067266015e",
-				Comment:    "v2.0.0",
-			},
-		},
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := importertest.NewTestContext(h)
-
-	h.TempCopy(filepath.Join(importertest.RootProject, godepPath), "Godeps.json")
-
-	projectRoot := h.Path(importertest.RootProject)
-
-	g := NewImporter(ctx.Err, true, nil)
-	err := g.load(projectRoot)
-	if err != nil {
-		t.Fatalf("Error while loading... %v", err)
-	}
-
-	if !equalImports(g.json.Imports, wantJSON.Imports) {
-		t.Fatalf("Expected imports to be equal. \n\t(GOT): %v\n\t(WNT): %v", g.json.Imports, wantJSON.Imports)
-	}
-}
-
-// equalImports compares two slices of godepPackage and checks if they are
-// equal.
-func equalImports(a, b []godepPackage) bool {
-	if a == nil && b == nil {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/Godeps.json b/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/Godeps.json
deleted file mode 100644
index 15126ac12d..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/Godeps.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "ImportPath": "github.com/golang/notexist",
-  "GoVersion": "go1.8",
-  "GodepVersion": "vXYZ",
-  "Deps": [
-    {
-      "ImportPath": "github.com/sdboyer/deptest",
-      "Rev": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f"
-    },
-    {
-      "ImportPath": "github.com/sdboyer/deptestdos",
-      "Comment": "v2.0.0",
-      "Rev": "5c607206be5decd28e6263ffffdcee067266015e"
-    }
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/golden.txt b/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/golden.txt
deleted file mode 100644
index 9788b947f7..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/godep/testdata/golden.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Detected godep configuration files...
-Converting from Godeps.json ...
-  Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
-  Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/govend/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/govend/importer.go
deleted file mode 100644
index 2a49cce39f..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/govend/importer.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package govend
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-
-	"github.com/go-yaml/yaml"
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/base"
-	"github.com/pkg/errors"
-)
-
-// ToDo: govend supports json and xml formats as well and we will add support for other formats in next PR - @RaviTezu
-// govend don't have a separate lock file.
-const govendYAMLName = "vendor.yml"
-
-// Importer imports govend configuration in to the dep configuration format.
-type Importer struct {
-	*base.Importer
-	yaml govendYAML
-}
-
-// NewImporter for govend.
-func NewImporter(logger *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{Importer: base.NewImporter(logger, verbose, sm)}
-}
-
-type govendYAML struct {
-	Imports []govendPackage `yaml:"vendors"`
-}
-
-type govendPackage struct {
-	Path     string `yaml:"path"`
-	Revision string `yaml:"rev"`
-}
-
-// Name of the importer.
-func (g *Importer) Name() string {
-	return "govend"
-}
-
-// HasDepMetadata checks if a directory contains config that the importer can handle.
-func (g *Importer) HasDepMetadata(dir string) bool {
-	y := filepath.Join(dir, govendYAMLName)
-	if _, err := os.Stat(y); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// Import the config found in the directory.
-func (g *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	err := g.load(dir)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.convert(pr)
-}
-
-// load the govend configuration files.
-func (g *Importer) load(projectDir string) error {
-	g.Logger.Println("Detected govend configuration files...")
-	y := filepath.Join(projectDir, govendYAMLName)
-	if g.Verbose {
-		g.Logger.Printf("  Loading %s", y)
-	}
-	yb, err := ioutil.ReadFile(y)
-	if err != nil {
-		return errors.Wrapf(err, "unable to read %s", y)
-	}
-	err = yaml.Unmarshal(yb, &g.yaml)
-	if err != nil {
-		return errors.Wrapf(err, "unable to parse %s", y)
-	}
-	return nil
-}
-
-// convert the govend configuration files into dep configuration files.
-func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	g.Logger.Println("Converting from vendor.yaml...")
-
-	packages := make([]base.ImportedPackage, 0, len(g.yaml.Imports))
-	for _, pkg := range g.yaml.Imports {
-		// Path must not be empty
-		if pkg.Path == "" || pkg.Revision == "" {
-			return nil, nil, errors.New("invalid govend configuration, path and rev are required")
-		}
-
-		ip := base.ImportedPackage{
-			Name:     pkg.Path,
-			LockHint: pkg.Revision,
-		}
-		packages = append(packages, ip)
-	}
-
-	err := g.ImportPackages(packages, true)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.Manifest, g.Lock, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/govend/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/govend/importer_test.go
deleted file mode 100644
index 04c9ea5d8c..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/govend/importer_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package govend
-
-import (
-	"bytes"
-	"log"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func TestGovendConfig_Convert(t *testing.T) {
-	testCases := map[string]struct {
-		yaml govendYAML
-		importertest.TestCase
-	}{
-		"package": {
-			govendYAML{
-				Imports: []govendPackage{
-					{
-						Path:     importertest.Project,
-						Revision: importertest.V1Rev,
-					},
-				},
-			},
-			importertest.TestCase{
-				WantConstraint: importertest.V1Constraint,
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-			},
-		},
-		"missing package name": {
-			govendYAML{
-				Imports: []govendPackage{
-					{
-						Path: "",
-					},
-				},
-			},
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-		},
-
-		"missing revision": {
-			govendYAML{
-				Imports: []govendPackage{
-					{
-						Path: importertest.Project,
-					},
-				},
-			},
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		name := name
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			err := testCase.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				g := NewImporter(logger, true, sm)
-				g.yaml = testCase.yaml
-				return g.convert(importertest.RootProject)
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
-
-func TestGovendConfig_Import(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	cacheDir := "gps-repocache"
-	h.TempDir(cacheDir)
-	h.TempDir("src")
-	h.TempDir(filepath.Join("src", importertest.RootProject))
-	h.TempCopy(filepath.Join(importertest.RootProject, govendYAMLName), "vendor.yml")
-
-	projectRoot := h.Path(importertest.RootProject)
-	sm, err := gps.NewSourceManager(gps.SourceManagerConfig{Cachedir: h.Path(cacheDir)})
-	h.Must(err)
-	defer sm.Release()
-
-	// Capture stderr so we can verify the import output
-	verboseOutput := &bytes.Buffer{}
-	logger := log.New(verboseOutput, "", 0)
-
-	// Disable Verbose so that we don't print values that change each test run
-	g := NewImporter(logger, false, sm)
-	if !g.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect govend configuration file")
-	}
-
-	m, l, err := g.Import(projectRoot, importertest.RootProject)
-	h.Must(err)
-
-	if m == nil {
-		t.Fatal("Expected the manifest to be generated")
-	}
-
-	if l == nil {
-		t.Fatal("Expected the lock to be generated")
-	}
-
-	govendImportOutputFile := "golden.txt"
-	got := verboseOutput.String()
-	want := h.GetTestFileString(govendImportOutputFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(govendImportOutputFile, got); err != nil {
-				t.Fatalf("%+v", errors.Wrapf(err, "Unable to write updated golden file %s", govendImportOutputFile))
-			}
-		} else {
-			t.Fatalf("want %s, got %s", want, got)
-		}
-	}
-
-}
-
-func TestGovendConfig_YAMLLoad(t *testing.T) {
-	// This is same as cmd/testdata/init/govend/vendor.yml
-	wantYaml := govendYAML{
-		Imports: []govendPackage{
-			{
-				Path:     "github.com/sdboyer/deptest",
-				Revision: "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-			},
-			{
-				Path:     "github.com/sdboyer/deptestdos",
-				Revision: "5c607206be5decd28e6263ffffdcee067266015e",
-			},
-		},
-	}
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := importertest.NewTestContext(h)
-	h.TempCopy(filepath.Join(importertest.RootProject, govendYAMLName), "vendor.yml")
-
-	projectRoot := h.Path(importertest.RootProject)
-
-	g := NewImporter(ctx.Err, true, nil)
-	err := g.load(projectRoot)
-	if err != nil {
-		t.Fatalf("Error while loading %v", err)
-	}
-
-	if !equalGovendImports(g.yaml.Imports, wantYaml.Imports) {
-		t.Fatalf("Expected import to be equal. \n\t(GOT): %v\n\t(WNT): %v", g.yaml.Imports, wantYaml.Imports)
-	}
-}
-
-func equalGovendImports(a, b []govendPackage) bool {
-	if a == nil && b == nil {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/golden.txt b/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/golden.txt
deleted file mode 100644
index e77c76ab5f..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/golden.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Detected govend configuration files...
-Converting from vendor.yaml...
-  Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
-  Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/vendor.yml b/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/vendor.yml
deleted file mode 100644
index 0545b10125..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/govend/testdata/vendor.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-vendors:
-- path: github.com/sdboyer/deptest
-  rev: 3f4c3bea144e112a69bbe5d8d01c1b09a544253f
-- path: github.com/sdboyer/deptestdos
-  rev: 5c607206be5decd28e6263ffffdcee067266015e
-
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer.go
deleted file mode 100644
index 8177f21d80..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gvt
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/base"
-	"github.com/pkg/errors"
-)
-
-const gvtPath = "vendor" + string(os.PathSeparator) + "manifest"
-
-// Importer imports gvt configuration into the dep configuration format.
-type Importer struct {
-	*base.Importer
-	gvtConfig gvtManifest
-}
-
-// NewImporter for gvt. It handles gb (gb-vendor) too as they share a common manifest file & format
-func NewImporter(logger *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{Importer: base.NewImporter(logger, verbose, sm)}
-}
-
-type gvtManifest struct {
-	Deps []gvtPkg `json:"dependencies"`
-}
-
-type gvtPkg struct {
-	ImportPath string
-	Repository string
-	Revision   string
-	Branch     string
-}
-
-// Name of the importer.
-func (g *Importer) Name() string {
-	return "gvt"
-}
-
-// HasDepMetadata checks if a directory contains config that the importer can handle.
-func (g *Importer) HasDepMetadata(dir string) bool {
-	y := filepath.Join(dir, gvtPath)
-	if _, err := os.Stat(y); err != nil {
-		return false
-	}
-
-	return true
-}
-
-// Import the config found in the directory.
-func (g *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	err := g.load(dir)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.convert(pr)
-}
-
-func (g *Importer) load(projectDir string) error {
-	g.Logger.Println("Detected gb/gvt configuration files...")
-	j := filepath.Join(projectDir, gvtPath)
-	if g.Verbose {
-		g.Logger.Printf("  Loading %s", j)
-	}
-	jb, err := ioutil.ReadFile(j)
-	if err != nil {
-		return errors.Wrapf(err, "unable to read %s", j)
-	}
-	err = json.Unmarshal(jb, &g.gvtConfig)
-	if err != nil {
-		return errors.Wrapf(err, "unable to parse %s", j)
-	}
-
-	return nil
-}
-
-func (g *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	g.Logger.Println("Converting from vendor/manifest ...")
-
-	packages := make([]base.ImportedPackage, 0, len(g.gvtConfig.Deps))
-	for _, pkg := range g.gvtConfig.Deps {
-		// Validate
-		if pkg.ImportPath == "" {
-			err := errors.New("invalid gvt configuration, ImportPath is required")
-			return nil, nil, err
-		}
-
-		if pkg.Revision == "" {
-			err := errors.New("invalid gvt configuration, Revision is required")
-			return nil, nil, err
-		}
-
-		var contstraintHint = ""
-		if pkg.Branch == "HEAD" {
-			// gb-vendor sets "branch" to "HEAD", if the package was feteched via -tag or -revision,
-			// we pass the revision as the constraint hint
-			contstraintHint = pkg.Revision
-		} else if pkg.Branch != "master" {
-			// both gvt & gb-vendor set "branch" to "master" unless a different branch was requested.
-			// so it's not realy a constraint unless it's a different branch
-			contstraintHint = pkg.Branch
-		}
-
-		ip := base.ImportedPackage{
-			Name:           pkg.ImportPath,
-			Source:         pkg.Repository,
-			LockHint:       pkg.Revision,
-			ConstraintHint: contstraintHint,
-		}
-		packages = append(packages, ip)
-	}
-
-	err := g.ImportPackages(packages, true)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return g.Manifest, g.Lock, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer_test.go
deleted file mode 100644
index e927af8dbf..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/gvt/importer_test.go
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gvt
-
-import (
-	"bytes"
-	"log"
-	"path/filepath"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func TestGvtConfig_Convert(t *testing.T) {
-	testCases := map[string]struct {
-		importertest.TestCase
-		gvtConfig gvtManifest
-	}{
-		"package with master branch": {
-			importertest.TestCase{
-				WantConstraint: importertest.V1Constraint,
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{
-					{
-						ImportPath: importertest.Project,
-						Revision:   importertest.V1Rev,
-						Branch:     "master",
-					},
-				},
-			},
-		},
-		"package with non-master branch": {
-			importertest.TestCase{
-				WantConstraint: importertest.V2Branch,
-				WantRevision:   importertest.V2PatchRev,
-				WantVersion:    importertest.V2PatchTag,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{
-					{
-						ImportPath: importertest.Project,
-						Revision:   importertest.V2PatchRev,
-						Branch:     importertest.V2Branch,
-					},
-				},
-			},
-		},
-		"package with HEAD branch": {
-			importertest.TestCase{
-				WantConstraint: "*",
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{
-					{
-						ImportPath: importertest.Project,
-						Revision:   importertest.V1Rev,
-						Branch:     "HEAD",
-					},
-				},
-			},
-		},
-		"package with alternate repository": {
-			importertest.TestCase{
-				WantConstraint: importertest.V1Constraint,
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-				WantSourceRepo: importertest.ProjectSrc,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{
-					{
-						ImportPath: importertest.Project,
-						Repository: importertest.ProjectSrc,
-						Revision:   importertest.V1Rev,
-						Branch:     "master",
-					},
-				},
-			},
-		},
-		"missing package name": {
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{{ImportPath: ""}},
-			},
-		},
-		"missing revision": {
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-			gvtManifest{
-				Deps: []gvtPkg{
-					{
-						ImportPath: importertest.Project,
-					},
-				},
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		name := name
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			err := testCase.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				g := NewImporter(logger, true, sm)
-				g.gvtConfig = testCase.gvtConfig
-				return g.convert(importertest.RootProject)
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
-
-func TestGvtConfig_Import(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	cacheDir := "gps-repocache"
-	h.TempDir(cacheDir)
-	h.TempDir("src")
-	h.TempDir(filepath.Join("src", importertest.RootProject))
-	h.TempCopy(filepath.Join(importertest.RootProject, gvtPath), "manifest")
-
-	projectRoot := h.Path(importertest.RootProject)
-	sm, err := gps.NewSourceManager(gps.SourceManagerConfig{
-		Cachedir: h.Path(cacheDir),
-		Logger:   log.New(test.Writer{TB: t}, "", 0),
-	})
-	h.Must(err)
-	defer sm.Release()
-
-	// Capture stderr so we can verify output
-	verboseOutput := &bytes.Buffer{}
-	logger := log.New(verboseOutput, "", 0)
-
-	g := NewImporter(logger, false, sm) // Disable verbose so that we don't print values that change each test run
-	if !g.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect gvt configuration file")
-	}
-
-	m, l, err := g.Import(projectRoot, importertest.RootProject)
-	h.Must(err)
-
-	if m == nil {
-		t.Fatal("Expected the manifest to be generated")
-	}
-
-	if l == nil {
-		t.Fatal("Expected the lock to be generated")
-	}
-
-	goldenFile := "golden.txt"
-	got := verboseOutput.String()
-	want := h.GetTestFileString(goldenFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenFile, got); err != nil {
-				t.Fatalf("%+v", errors.Wrapf(err, "Unable to write updated golden file %s", goldenFile))
-			}
-		} else {
-			t.Fatalf("want %s, got %s", want, got)
-		}
-	}
-}
-
-func TestGvtConfig_JsonLoad(t *testing.T) {
-	// This is same as testdata/manifest
-	wantConfig := gvtManifest{
-		Deps: []gvtPkg{
-			{
-				ImportPath: "github.com/sdboyer/deptest",
-				Revision:   "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-				Branch:     "HEAD",
-			},
-			{
-				ImportPath: "github.com/sdboyer/deptestdos",
-				Revision:   "5c607206be5decd28e6263ffffdcee067266015e",
-				Branch:     "master",
-			},
-			{
-				ImportPath: "github.com/carolynvs/deptest-importers",
-				Revision:   "b79bc9482da8bb7402cdc3e3fd984db250718dd7",
-				Branch:     "v2",
-			},
-		},
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := importertest.NewTestContext(h)
-
-	h.TempCopy(filepath.Join(importertest.RootProject, gvtPath), "manifest")
-
-	projectRoot := h.Path(importertest.RootProject)
-
-	g := NewImporter(ctx.Err, true, nil)
-	err := g.load(projectRoot)
-	if err != nil {
-		t.Fatalf("Error while loading... %v", err)
-	}
-
-	if !equalImports(g.gvtConfig.Deps, wantConfig.Deps) {
-		t.Fatalf("Expected imports to be equal. \n\t(GOT): %v\n\t(WNT): %v", g.gvtConfig.Deps, wantConfig.Deps)
-	}
-}
-
-// equalImports compares two slices of gvtPkg and checks if they are
-// equal.
-func equalImports(a, b []gvtPkg) bool {
-	if a == nil && b == nil {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	if len(a) != len(b) {
-		return false
-	}
-
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/golden.txt b/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/golden.txt
deleted file mode 100644
index d65e86d60b..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/golden.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Detected gb/gvt configuration files...
-Converting from vendor/manifest ...
-  Using * as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
-  Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
-  Using v2 as initial constraint for imported dep github.com/carolynvs/deptest-importers
-  Trying v2 (b79bc94) as initial lock for imported dep github.com/carolynvs/deptest-importers
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/manifest b/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/manifest
deleted file mode 100644
index 36e49d56b1..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/gvt/testdata/manifest
+++ /dev/null
@@ -1,19 +0,0 @@
-{
-  "dependencies": [
-    {
-      "importpath": "github.com/sdboyer/deptest",
-      "revision": "3f4c3bea144e112a69bbe5d8d01c1b09a544253f",
-      "branch": "HEAD"
-    },
-    {
-      "importpath": "github.com/sdboyer/deptestdos",
-      "revision": "5c607206be5decd28e6263ffffdcee067266015e",
-      "branch": "master"
-    },
-    {
-      "importpath": "github.com/carolynvs/deptest-importers",
-      "revision": "b79bc9482da8bb7402cdc3e3fd984db250718dd7",
-      "branch": "v2" 
-    }
-  ]
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/importers.go b/installer/vendor/github.com/golang/dep/internal/importers/importers.go
deleted file mode 100644
index ad669b55bd..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/importers.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package importers
-
-import (
-	"log"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/glide"
-	"github.com/golang/dep/internal/importers/godep"
-	"github.com/golang/dep/internal/importers/govend"
-	"github.com/golang/dep/internal/importers/gvt"
-	"github.com/golang/dep/internal/importers/vndr"
-)
-
-// Importer handles importing configuration from other dependency managers into
-// the dep configuration format.
-type Importer interface {
-	// Name of the importer.
-	Name() string
-
-	// Import the config found in the directory.
-	Import(path string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error)
-
-	// HasDepMetadata checks if a directory contains config that the importer can handle.
-	HasDepMetadata(dir string) bool
-}
-
-// BuildAll returns a slice of all the importers.
-func BuildAll(logger *log.Logger, verbose bool, sm gps.SourceManager) []Importer {
-	return []Importer{
-		glide.NewImporter(logger, verbose, sm),
-		godep.NewImporter(logger, verbose, sm),
-		vndr.NewImporter(logger, verbose, sm),
-		govend.NewImporter(logger, verbose, sm),
-		gvt.NewImporter(logger, verbose, sm),
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/importertest/testcase.go b/installer/vendor/github.com/golang/dep/internal/importers/importertest/testcase.go
deleted file mode 100644
index 54d041548e..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/importertest/testcase.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package importertest
-
-import (
-	"bytes"
-	"io/ioutil"
-	"log"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-// TestCase is a common set of validations applied to the result
-// of an importer converting from an external config format to dep's.
-type TestCase struct {
-	DefaultConstraintFromLock bool
-	WantConvertErr            bool
-	WantSourceRepo            string
-	WantConstraint            string
-	WantRevision              gps.Revision
-	WantVersion               string
-	WantIgnored               []string
-	WantWarning               string
-}
-
-// NewTestContext creates a unique context with its own GOPATH for a single test.
-func NewTestContext(h *test.Helper) *dep.Ctx {
-	h.TempDir("src")
-	pwd := h.Path(".")
-	discardLogger := log.New(ioutil.Discard, "", 0)
-
-	return &dep.Ctx{
-		GOPATH: pwd,
-		Out:    discardLogger,
-		Err:    discardLogger,
-	}
-}
-
-// Execute and validate the test case.
-func (tc TestCase) Execute(t *testing.T, convert func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error)) error {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	// Disable parallel tests until we can resolve this error on the Windows builds:
-	// "remote repository at https://github.com/carolynvs/deptest-importers does not exist, or is inaccessible"
-	//h.Parallel()
-
-	ctx := NewTestContext(h)
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	// Capture stderr so we can verify warnings
-	output := &bytes.Buffer{}
-	ctx.Err = log.New(output, "", 0)
-
-	manifest, lock, convertErr := convert(ctx.Err, sm)
-	return tc.validate(manifest, lock, convertErr, output)
-}
-
-// validate returns an error if any of the testcase validations failed.
-func (tc TestCase) validate(manifest *dep.Manifest, lock *dep.Lock, convertErr error, output *bytes.Buffer) error {
-	if tc.WantConvertErr {
-		if convertErr == nil {
-			return errors.New("Expected the conversion to fail, but it did not return an error")
-		}
-		return nil
-	}
-
-	if convertErr != nil {
-		return errors.Wrap(convertErr, "Expected the conversion to pass, but it returned an error")
-	}
-
-	if !equalSlice(manifest.Ignored, tc.WantIgnored) {
-		return errors.Errorf("unexpected set of ignored projects: \n\t(GOT) %v \n\t(WNT) %v",
-			manifest.Ignored, tc.WantIgnored)
-	}
-
-	wantConstraintCount := 0
-	if tc.WantConstraint != "" {
-		wantConstraintCount = 1
-	}
-	gotConstraintCount := len(manifest.Constraints)
-	if gotConstraintCount != wantConstraintCount {
-		return errors.Errorf("unexpected number of constraints: \n\t(GOT) %v \n\t(WNT) %v",
-			gotConstraintCount, wantConstraintCount)
-	}
-
-	if tc.WantConstraint != "" {
-		d, ok := manifest.Constraints[Project]
-		if !ok {
-			return errors.Errorf("Expected the manifest to have a dependency for '%v'",
-				Project)
-		}
-
-		gotConstraint := d.Constraint.String()
-		if gotConstraint != tc.WantConstraint {
-			return errors.Errorf("unexpected constraint: \n\t(GOT) %v \n\t(WNT) %v",
-				gotConstraint, tc.WantConstraint)
-		}
-
-	}
-
-	// Lock checks.
-	wantLockCount := 0
-	if tc.WantRevision != "" {
-		wantLockCount = 1
-	}
-	gotLockCount := 0
-	if lock != nil {
-		gotLockCount = len(lock.P)
-	}
-	if gotLockCount != wantLockCount {
-		return errors.Errorf("unexpected number of locked projects: \n\t(GOT) %v \n\t(WNT) %v",
-			gotLockCount, wantLockCount)
-	}
-
-	if tc.WantRevision != "" {
-		lp := lock.P[0]
-
-		gotProjectRoot := lp.Ident().ProjectRoot
-		if gotProjectRoot != Project {
-			return errors.Errorf("unexpected root project in lock: \n\t(GOT) %v \n\t(WNT) %v",
-				gotProjectRoot, Project)
-		}
-
-		gotSource := lp.Ident().Source
-		if gotSource != tc.WantSourceRepo {
-			return errors.Errorf("unexpected source repository: \n\t(GOT) %v \n\t(WNT) %v",
-				gotSource, tc.WantSourceRepo)
-		}
-
-		// Break down the locked "version" into a version (optional) and revision
-		var gotVersion string
-		var gotRevision gps.Revision
-		if lpv, ok := lp.Version().(gps.PairedVersion); ok {
-			gotVersion = lpv.String()
-			gotRevision = lpv.Revision()
-		} else if lr, ok := lp.Version().(gps.Revision); ok {
-			gotRevision = lr
-		} else {
-			return errors.New("could not determine the type of the locked version")
-		}
-
-		if gotRevision != tc.WantRevision {
-			return errors.Errorf("unexpected locked revision: \n\t(GOT) %v \n\t(WNT) %v",
-				gotRevision,
-				tc.WantRevision)
-		}
-		if gotVersion != tc.WantVersion {
-			return errors.Errorf("unexpected locked version: \n\t(GOT) %v \n\t(WNT) %v",
-				gotVersion,
-				tc.WantVersion)
-		}
-	}
-
-	if tc.WantWarning != "" {
-		if !strings.Contains(output.String(), tc.WantWarning) {
-			return errors.Errorf("Expected the output to include the warning '%s'", tc.WantWarning)
-		}
-	}
-
-	return nil
-}
-
-// equalSlice is comparing two string slices for equality.
-func equalSlice(a, b []string) bool {
-	if a == nil && b == nil {
-		return true
-	}
-
-	if a == nil || b == nil {
-		return false
-	}
-
-	if len(a) != len(b) {
-		return false
-	}
-
-	sort.Strings(a)
-	sort.Strings(b)
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/importertest/testdata.go b/installer/vendor/github.com/golang/dep/internal/importers/importertest/testdata.go
deleted file mode 100644
index cd7f2c0879..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/importertest/testdata.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package importertest
-
-const (
-	// RootProject is the containing project performing the import.
-	RootProject = "github.com/golang/notexist"
-
-	// Project being imported.
-	Project = "github.com/carolynvs/deptest-importers"
-
-	// ProjectSrc is an alternate source for the imported project.
-	ProjectSrc = "https://github.com/carolynvs/deptest-importers.git"
-
-	// UntaggedRev is a revision without any tags.
-	UntaggedRev = "9b670d143bfb4a00f7461451d5c4a62f80e9d11d"
-
-	// UntaggedRevAbbrv is the result of running `git describe` on UntaggedRev
-	UntaggedRevAbbrv = "v1.0.0-1-g9b670d1"
-
-	// Beta1Tag is a non-semver tag.
-	Beta1Tag = "beta1"
-
-	// Beta1Rev is the revision of Beta1Tag
-	Beta1Rev = "7913ab26988c6fb1e16225f845a178e8849dd254"
-
-	// V2Branch is a branch that could be interpreted as a semver tag (but shouldn't).
-	V2Branch = "v2"
-
-	// V2Rev is the HEAD revision of V2Branch.
-	V2Rev = "45dcf5a09c64b48b6e836028a3bc672b19b9d11d"
-
-	// V2PatchTag is a prerelease semver tag on the non-default branch.
-	V2PatchTag = "v2.0.0-alpha1"
-
-	// V2PatchRev is the revision of V2PatchTag.
-	V2PatchRev = "347760b50204948ea63e531dd6560e56a9adde8f"
-
-	// V1Tag is a semver tag that matches V1Constraint.
-	V1Tag = "v1.0.0"
-
-	// V1Rev is the revision of V1Tag.
-	V1Rev = "d0c29640b17f77426b111f4c1640d716591aa70e"
-
-	// V1PatchTag is a semver tag that matches V1Constraint.
-	V1PatchTag = "v1.0.2"
-
-	// V1PatchRev is the revision of V1PatchTag
-	V1PatchRev = "788963efe22e3e6e24c776a11a57468bb2fcd780"
-
-	// V1Constraint is a constraint that matches multiple semver tags.
-	V1Constraint = "^1.0.0"
-
-	// MultiTaggedRev is a revision with multiple tags.
-	MultiTaggedRev = "34cf993cc346f65601fe4356dd68bd54d20a1bfe"
-
-	// MultiTaggedSemverTag is a semver tag on MultiTaggedRev.
-	MultiTaggedSemverTag = "v1.0.4"
-
-	// MultiTaggedPlainTag is a non-semver tag on MultiTaggedRev.
-	MultiTaggedPlainTag = "stable"
-)
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer.go b/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer.go
deleted file mode 100644
index f24723ee0e..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vndr
-
-import (
-	"bufio"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/base"
-	"github.com/pkg/errors"
-)
-
-func vndrFile(dir string) string {
-	return filepath.Join(dir, "vendor.conf")
-}
-
-// Importer imports vndr configuration into the dep configuration format.
-type Importer struct {
-	*base.Importer
-	packages []vndrPackage
-}
-
-// NewImporter for vndr.
-func NewImporter(log *log.Logger, verbose bool, sm gps.SourceManager) *Importer {
-	return &Importer{Importer: base.NewImporter(log, verbose, sm)}
-}
-
-// Name of the importer.
-func (v *Importer) Name() string { return "vndr" }
-
-// HasDepMetadata checks if a directory contains config that the importer can handle.
-func (v *Importer) HasDepMetadata(dir string) bool {
-	_, err := os.Stat(vndrFile(dir))
-	return err == nil
-}
-
-// Import the config found in the directory.
-func (v *Importer) Import(dir string, pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	v.Logger.Println("Detected vndr configuration file...")
-
-	err := v.loadVndrFile(dir)
-	if err != nil {
-		return nil, nil, errors.Wrapf(err, "unable to load vndr file")
-	}
-
-	return v.convert(pr)
-}
-
-func (v *Importer) loadVndrFile(dir string) error {
-	v.Logger.Printf("Converting from vendor.conf...")
-
-	f, err := os.Open(vndrFile(dir))
-	if err != nil {
-		return errors.Wrapf(err, "unable to open %s", vndrFile(dir))
-	}
-	defer f.Close()
-
-	scanner := bufio.NewScanner(f)
-	for scanner.Scan() {
-		pkg, err := parseVndrLine(scanner.Text())
-		if err != nil {
-			return errors.Wrapf(err, "unable to parse line")
-		}
-		if pkg == nil {
-			// Could be an empty line or one which is just a comment
-			continue
-		}
-		v.packages = append(v.packages, *pkg)
-	}
-
-	if scanner.Err() != nil {
-		return errors.Wrapf(err, "unable to read %s", vndrFile(dir))
-	}
-
-	return nil
-}
-
-func (v *Importer) convert(pr gps.ProjectRoot) (*dep.Manifest, *dep.Lock, error) {
-	packages := make([]base.ImportedPackage, 0, len(v.packages))
-	for _, pkg := range v.packages {
-		// Validate
-		if pkg.importPath == "" {
-			err := errors.New("invalid vndr configuration: import path is required")
-			return nil, nil, err
-		}
-
-		if pkg.reference == "" {
-			err := errors.New("invalid vndr configuration: revision is required")
-			return nil, nil, err
-		}
-
-		ip := base.ImportedPackage{
-			Name:     pkg.importPath,
-			Source:   pkg.repository,
-			LockHint: pkg.reference,
-		}
-		packages = append(packages, ip)
-	}
-	err := v.ImportPackages(packages, true)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return v.Manifest, v.Lock, nil
-}
-
-type vndrPackage struct {
-	importPath string
-	reference  string
-	repository string
-}
-
-func parseVndrLine(line string) (*vndrPackage, error) {
-	commentIdx := strings.Index(line, "#")
-	if commentIdx >= 0 {
-		line = line[:commentIdx]
-	}
-	line = strings.TrimSpace(line)
-
-	if line == "" {
-		return nil, nil
-	}
-
-	parts := strings.Fields(line)
-
-	if !(len(parts) == 2 || len(parts) == 3) {
-		return nil, errors.Errorf("invalid config format: %q", line)
-	}
-
-	pkg := &vndrPackage{
-		importPath: parts[0],
-		reference:  parts[1],
-	}
-	if len(parts) == 3 {
-		pkg.repository = parts[2]
-	}
-
-	return pkg, nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer_test.go b/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer_test.go
deleted file mode 100644
index c417c1188e..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/vndr/importer_test.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vndr
-
-import (
-	"bytes"
-	"log"
-	"path/filepath"
-	"reflect"
-	"testing"
-
-	"github.com/golang/dep"
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/importers/importertest"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-func TestVndrConfig_Convert(t *testing.T) {
-	testCases := map[string]struct {
-		packages []vndrPackage
-		importertest.TestCase
-	}{
-		"package": {
-			[]vndrPackage{{
-				importPath: importertest.Project,
-				reference:  importertest.V1Rev,
-				repository: importertest.ProjectSrc,
-			}},
-			importertest.TestCase{
-				WantSourceRepo: importertest.ProjectSrc,
-				WantConstraint: importertest.V1Constraint,
-				WantRevision:   importertest.V1Rev,
-				WantVersion:    importertest.V1Tag,
-			},
-		},
-		"missing importPath": {
-			[]vndrPackage{{
-				reference: importertest.V1Tag,
-			}},
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-		},
-		"missing reference": {
-			[]vndrPackage{{
-				importPath: importertest.Project,
-			}},
-			importertest.TestCase{
-				WantConvertErr: true,
-			},
-		},
-	}
-
-	for name, testCase := range testCases {
-		name := name
-		testCase := testCase
-		t.Run(name, func(t *testing.T) {
-			err := testCase.Execute(t, func(logger *log.Logger, sm gps.SourceManager) (*dep.Manifest, *dep.Lock, error) {
-				g := NewImporter(logger, true, sm)
-				g.packages = testCase.packages
-				return g.convert(importertest.RootProject)
-			})
-			if err != nil {
-				t.Fatalf("%#v", err)
-			}
-		})
-	}
-}
-
-func TestVndrConfig_Import(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	ctx := importertest.NewTestContext(h)
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	h.TempDir(filepath.Join("src", importertest.RootProject))
-	h.TempCopy(vndrFile(importertest.RootProject), "vendor.conf")
-	projectRoot := h.Path(importertest.RootProject)
-
-	logOutput := bytes.NewBuffer(nil)
-	ctx.Err = log.New(logOutput, "", 0)
-
-	v := NewImporter(ctx.Err, false, sm)
-	if !v.HasDepMetadata(projectRoot) {
-		t.Fatal("Expected the importer to detect vndr configuration file")
-	}
-
-	m, l, err := v.Import(projectRoot, importertest.RootProject)
-	h.Must(err)
-
-	wantM := dep.NewManifest()
-	c1, _ := gps.NewSemverConstraint("^0.8.1")
-	wantM.Constraints["github.com/sdboyer/deptest"] = gps.ProjectProperties{
-		Source:     "https://github.com/sdboyer/deptest.git",
-		Constraint: c1,
-	}
-	c2, _ := gps.NewSemverConstraint("^2.0.0")
-	wantM.Constraints["github.com/sdboyer/deptestdos"] = gps.ProjectProperties{
-		Constraint: c2,
-	}
-	if !reflect.DeepEqual(wantM, m) {
-		t.Errorf("unexpected manifest\nhave=%+v\nwant=%+v", m, wantM)
-	}
-
-	wantL := &dep.Lock{
-		P: []gps.LockedProject{
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{
-					ProjectRoot: "github.com/sdboyer/deptest",
-					Source:      "https://github.com/sdboyer/deptest.git",
-				},
-				gps.NewVersion("v0.8.1").Pair("3f4c3bea144e112a69bbe5d8d01c1b09a544253f"),
-				nil,
-			),
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{
-					ProjectRoot: "github.com/sdboyer/deptestdos",
-				},
-				gps.NewVersion("v2.0.0").Pair("5c607206be5decd28e6263ffffdcee067266015e"),
-				nil,
-			),
-		},
-	}
-	if !reflect.DeepEqual(wantL, l) {
-		t.Errorf("unexpected lock\nhave=%+v\nwant=%+v", l, wantL)
-	}
-
-	goldenFile := "golden.txt"
-	got := logOutput.String()
-	want := h.GetTestFileString(goldenFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := h.WriteTestFile(goldenFile, got); err != nil {
-				t.Fatalf("%+v", errors.Wrapf(err, "Unable to write updated golden file %s", goldenFile))
-			}
-		} else {
-			t.Fatalf("expected %s, got %s", want, got)
-		}
-	}
-}
-
-func TestParseVndrLine(t *testing.T) {
-	testcase := func(in string, wantPkg *vndrPackage, wantErr error) func(*testing.T) {
-		return func(t *testing.T) {
-			havePkg, haveErr := parseVndrLine(in)
-			switch {
-			case wantPkg == nil:
-				if havePkg != nil {
-					t.Errorf("expected nil package, have %v", havePkg)
-				}
-			case havePkg == nil:
-				if wantPkg != nil {
-					t.Errorf("expected non-nil package %v, have nil", wantPkg)
-				}
-			default:
-				if !reflect.DeepEqual(havePkg, wantPkg) {
-					t.Errorf("unexpected package, have=%v, want=%v", *havePkg, *wantPkg)
-				}
-			}
-
-			switch {
-			case wantErr == nil:
-				if haveErr != nil {
-					t.Errorf("expected nil err, have %v", haveErr)
-				}
-			case haveErr == nil:
-				if wantErr != nil {
-					t.Errorf("expected non-nil err %v, have nil", wantErr)
-				}
-			default:
-				if haveErr.Error() != wantErr.Error() {
-					t.Errorf("expected err=%q, have err=%q", wantErr.Error(), haveErr.Error())
-				}
-			}
-		}
-	}
-	t.Run("normal line",
-		testcase("github.com/golang/notreal v1.0.0",
-			&vndrPackage{
-				importPath: "github.com/golang/notreal",
-				reference:  "v1.0.0",
-			}, nil))
-
-	t.Run("with repo",
-		testcase("github.com/golang/notreal v1.0.0 https://github.com/golang/notreal",
-			&vndrPackage{
-				importPath: "github.com/golang/notreal",
-				reference:  "v1.0.0",
-				repository: "https://github.com/golang/notreal",
-			}, nil))
-
-	t.Run("trailing comment",
-		testcase("github.com/golang/notreal v1.0.0 https://github.com/golang/notreal  # cool comment",
-			&vndrPackage{
-				importPath: "github.com/golang/notreal",
-				reference:  "v1.0.0",
-				repository: "https://github.com/golang/notreal",
-			}, nil))
-
-	t.Run("empty line", testcase("", nil, nil))
-	t.Run("comment line", testcase("# comment", nil, nil))
-	t.Run("comment line with leading whitespace", testcase("  # comment", nil, nil))
-
-	t.Run("missing revision",
-		testcase("github.com/golang/notreal", nil,
-			errors.New("invalid config format: \"github.com/golang/notreal\""),
-		))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/golden.txt b/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/golden.txt
deleted file mode 100644
index 3702ae436a..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/golden.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Detected vndr configuration file...
-Converting from vendor.conf...
-  Using ^0.8.1 as initial constraint for imported dep github.com/sdboyer/deptest
-  Trying v0.8.1 (3f4c3be) as initial lock for imported dep github.com/sdboyer/deptest
-  Using ^2.0.0 as initial constraint for imported dep github.com/sdboyer/deptestdos
-  Trying v2.0.0 (5c60720) as initial lock for imported dep github.com/sdboyer/deptestdos
diff --git a/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/vendor.conf b/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/vendor.conf
deleted file mode 100644
index 072166aa57..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/importers/vndr/testdata/vendor.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-github.com/sdboyer/deptest 3f4c3bea144e112a69bbe5d8d01c1b09a544253f https://github.com/sdboyer/deptest.git # trailing comment
-# line comment
-
-github.com/sdboyer/deptestdos v2.0.0 # trailing comment
diff --git a/installer/vendor/github.com/golang/dep/internal/test/integration/testcase.go b/installer/vendor/github.com/golang/dep/internal/test/integration/testcase.go
deleted file mode 100644
index bd772da7d8..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/test/integration/testcase.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package integration
-
-import (
-	"encoding/json"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"unicode"
-
-	"github.com/golang/dep/internal/test"
-)
-
-// TestCase manages a test case directory structure and content
-type TestCase struct {
-	t             *testing.T
-	name          string
-	rootPath      string
-	initialPath   string
-	finalPath     string
-	Commands      [][]string        `json:"commands"`
-	ErrorExpected string            `json:"error-expected"`
-	GopathInitial map[string]string `json:"gopath-initial"`
-	VendorInitial map[string]string `json:"vendor-initial"`
-	VendorFinal   []string          `json:"vendor-final"`
-	InitPath      string            `json:"init-path"`
-}
-
-// NewTestCase creates a new TestCase.
-func NewTestCase(t *testing.T, dir, name string) *TestCase {
-	rootPath := filepath.FromSlash(filepath.Join(dir, name))
-	n := &TestCase{
-		t:           t,
-		name:        name,
-		rootPath:    rootPath,
-		initialPath: filepath.Join(rootPath, "initial"),
-		finalPath:   filepath.Join(rootPath, "final"),
-	}
-	j, err := ioutil.ReadFile(filepath.Join(rootPath, "testcase.json"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = json.Unmarshal(j, n)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return n
-}
-
-// InitialPath represents the initial set of files in a project.
-func (tc *TestCase) InitialPath() string {
-	return tc.initialPath
-}
-
-// UpdateFile updates the golden file with the working result.
-func (tc *TestCase) UpdateFile(goldenPath, workingPath string) {
-	exists, working, err := getFile(workingPath)
-	if err != nil {
-		tc.t.Fatalf("Error reading project file %s: %s", goldenPath, err)
-	}
-
-	golden := filepath.Join(tc.finalPath, goldenPath)
-	if exists {
-		if err := tc.WriteFile(golden, working); err != nil {
-			tc.t.Fatal(err)
-		}
-	} else {
-		err := os.Remove(golden)
-		if err != nil && !os.IsNotExist(err) {
-			tc.t.Fatal(err)
-		}
-	}
-}
-
-// CompareFile compares the golden file with the working result.
-func (tc *TestCase) CompareFile(goldenPath, working string) {
-	golden := filepath.Join(tc.finalPath, goldenPath)
-
-	gotExists, got, err := getFile(working)
-	if err != nil {
-		tc.t.Fatalf("Error reading project file %q: %s", goldenPath, err)
-	}
-	wantExists, want, err := getFile(golden)
-	if err != nil {
-		tc.t.Fatalf("Error reading testcase file %q: %s", goldenPath, err)
-	}
-
-	if wantExists && gotExists {
-		if want != got {
-			tc.t.Errorf("%s was not as expected\n(WNT):\n%s\n(GOT):\n%s", filepath.Base(goldenPath), want, got)
-		}
-	} else if !wantExists && gotExists {
-		tc.t.Errorf("%q created where none was expected", goldenPath)
-	} else if wantExists && !gotExists {
-		tc.t.Errorf("%q not created where one was expected", goldenPath)
-	}
-}
-
-// UpdateOutput updates the golden file for stdout with the working result.
-func (tc *TestCase) UpdateOutput(stdout string) {
-	stdoutPath := filepath.Join(tc.rootPath, "stdout.txt")
-	_, err := os.Stat(stdoutPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			// Don't update the stdout.txt file if it doesn't exist.
-			return
-		}
-		panic(err)
-	}
-
-	if err := tc.WriteFile(stdoutPath, stdout); err != nil {
-		tc.t.Fatal(err)
-	}
-}
-
-// CompareOutput compares expected and actual stdout output.
-func (tc *TestCase) CompareOutput(stdout string) {
-	expected, err := ioutil.ReadFile(filepath.Join(tc.rootPath, "stdout.txt"))
-	if err != nil {
-		if os.IsNotExist(err) {
-			// Nothing to verify
-			return
-		}
-		panic(err)
-	}
-
-	expStr := normalizeLines(string(expected))
-	stdout = normalizeLines(stdout)
-
-	if expStr != stdout {
-		tc.t.Errorf("stdout was not as expected\n(WNT):\n%s\n(GOT):\n%s\n", expStr, stdout)
-	}
-}
-
-// normalizeLines returns a version with trailing whitespace stripped from each line.
-func normalizeLines(s string) string {
-	lines := strings.Split(s, "\n")
-	for i := range lines {
-		lines[i] = strings.TrimRightFunc(lines[i], unicode.IsSpace)
-	}
-	return strings.Join(lines, "\n")
-}
-
-// CompareError compares expected and actual stderr output.
-func (tc *TestCase) CompareError(err error, stderr string) {
-	wantExists, want := tc.ErrorExpected != "", tc.ErrorExpected
-	gotExists, got := stderr != "" && err != nil, stderr
-
-	if wantExists && gotExists {
-		switch c := strings.Count(got, want); c {
-		case 0:
-			tc.t.Errorf("error did not contain expected string:\n\t(GOT): %s\n\t(WNT): %s", got, want)
-		case 1:
-		default:
-			tc.t.Errorf("expected error %s matches %d times to actual error %s", want, c, got)
-		}
-	} else if !wantExists && gotExists {
-		tc.t.Fatalf("error raised where none was expected: \n%v", stderr)
-	} else if wantExists && !gotExists {
-		tc.t.Error("error not raised where one was expected:", want)
-	}
-}
-
-// CompareVendorPaths validates the vendor directory contents.
-func (tc *TestCase) CompareVendorPaths(gotVendorPaths []string) {
-	if *test.UpdateGolden {
-		tc.VendorFinal = gotVendorPaths
-	} else {
-		wantVendorPaths := tc.VendorFinal
-		if len(gotVendorPaths) != len(wantVendorPaths) {
-			tc.t.Fatalf("Wrong number of vendor paths created: want %d got %d", len(wantVendorPaths), len(gotVendorPaths))
-		}
-		for ind := range gotVendorPaths {
-			if gotVendorPaths[ind] != wantVendorPaths[ind] {
-				tc.t.Errorf("Mismatch in vendor paths created: want %s got %s", wantVendorPaths, gotVendorPaths)
-			}
-		}
-	}
-}
-
-// WriteFile writes a file using the default file permissions.
-func (tc *TestCase) WriteFile(src string, content string) error {
-	return ioutil.WriteFile(src, []byte(content), 0666)
-}
-
-func getFile(path string) (bool, string, error) {
-	_, err := os.Stat(path)
-	if err != nil {
-		return false, "", nil
-	}
-	f, err := ioutil.ReadFile(path)
-	if err != nil {
-		return true, "", err
-	}
-	return true, string(f), nil
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/test/integration/testproj.go b/installer/vendor/github.com/golang/dep/internal/test/integration/testproj.go
deleted file mode 100644
index 760e1cc52d..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/test/integration/testproj.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package integration
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-const (
-	projectRoot string = "src/github.com/golang/notexist"
-)
-
-// RunFunc defines the function signature for an integration test command to execute.
-type RunFunc func(prog string, newargs []string, outW, errW io.Writer, dir string, env []string) error
-
-// TestProject manages the "virtual" test project directory structure
-// and content
-type TestProject struct {
-	t          *testing.T
-	preImports []string
-	tempdir    string
-	env        []string
-	origWd     string
-	stdout     bytes.Buffer
-	stderr     bytes.Buffer
-	run        RunFunc
-}
-
-// NewTestProject initializes a new test's project directory.
-func NewTestProject(t *testing.T, initPath, wd string, run RunFunc) *TestProject {
-	new := &TestProject{
-		t:      t,
-		origWd: wd,
-		env:    os.Environ(),
-		run:    run,
-	}
-	new.makeRootTempDir()
-	new.TempDir(projectRoot, "vendor")
-	new.CopyTree(initPath)
-
-	new.Setenv("GOPATH", new.tempdir)
-
-	return new
-}
-
-// Cleanup (remove) the test project's directory.
-func (p *TestProject) Cleanup() {
-	os.RemoveAll(p.tempdir)
-}
-
-// Path to the test project directory.
-func (p *TestProject) Path(args ...string) string {
-	return filepath.Join(p.tempdir, filepath.Join(args...))
-}
-
-// ProjPath builds an import path for the test project.
-func (p *TestProject) ProjPath(args ...string) string {
-	localPath := append([]string{projectRoot}, args...)
-	return p.Path(localPath...)
-}
-
-// TempDir creates a temporary directory for the test project.
-func (p *TestProject) TempDir(args ...string) {
-	fullPath := p.Path(args...)
-	if err := os.MkdirAll(fullPath, 0755); err != nil && !os.IsExist(err) {
-		p.t.Fatalf("%+v", errors.Errorf("Unable to create temp directory: %s", fullPath))
-	}
-}
-
-// TempProjDir builds the path to a package within the test project.
-func (p *TestProject) TempProjDir(args ...string) {
-	localPath := append([]string{projectRoot}, args...)
-	p.TempDir(localPath...)
-}
-
-// VendorPath lists the contents of the test project's vendor directory.
-func (p *TestProject) VendorPath(args ...string) string {
-	localPath := append([]string{projectRoot, "vendor"}, args...)
-	p.TempDir(localPath...)
-	return p.Path(localPath...)
-}
-
-// RunGo runs a go command, and expects it to succeed.
-func (p *TestProject) RunGo(args ...string) {
-	cmd := exec.Command("go", args...)
-	p.stdout.Reset()
-	p.stderr.Reset()
-	cmd.Stdout = &p.stdout
-	cmd.Stderr = &p.stderr
-	cmd.Dir = p.tempdir
-	cmd.Env = p.env
-	status := cmd.Run()
-	if p.stdout.Len() > 0 {
-		p.t.Log("go standard output:")
-		p.t.Log(p.stdout.String())
-	}
-	if p.stderr.Len() > 0 {
-		p.t.Log("go standard error:")
-		p.t.Log(p.stderr.String())
-	}
-	if status != nil {
-		p.t.Logf("go %v failed unexpectedly: %v", args, status)
-		p.t.FailNow()
-	}
-}
-
-// RunGit runs a git command, and expects it to succeed.
-func (p *TestProject) RunGit(dir string, args ...string) {
-	cmd := exec.Command("git", args...)
-	p.stdout.Reset()
-	p.stderr.Reset()
-	cmd.Stdout = &p.stdout
-	cmd.Stderr = &p.stderr
-	cmd.Dir = dir
-	cmd.Env = p.env
-	status := cmd.Run()
-	if *test.PrintLogs {
-		if p.stdout.Len() > 0 {
-			p.t.Logf("git %v standard output:", args)
-			p.t.Log(p.stdout.String())
-		}
-		if p.stderr.Len() > 0 {
-			p.t.Logf("git %v standard error:", args)
-			p.t.Log(p.stderr.String())
-		}
-	}
-	if status != nil {
-		p.t.Logf("git %v failed unexpectedly: %v", args, status)
-		p.t.FailNow()
-	}
-}
-
-// GetStdout gets the Stdout output from test run.
-func (p *TestProject) GetStdout() string {
-	return p.stdout.String()
-}
-
-// GetStderr gets the Stderr output from test run.
-func (p *TestProject) GetStderr() string {
-	return p.stderr.String()
-}
-
-// GetVendorGit populates the initial vendor directory for a test project.
-func (p *TestProject) GetVendorGit(ip string) {
-	parse := strings.Split(ip, "/")
-	gitDir := strings.Join(parse[:len(parse)-1], string(filepath.Separator))
-	p.TempProjDir("vendor", gitDir)
-	p.RunGit(p.ProjPath("vendor", gitDir), "clone", "http://"+ip)
-}
-
-// DoRun executes the integration test command against the test project.
-func (p *TestProject) DoRun(args []string) error {
-	if *test.PrintLogs {
-		p.t.Logf("running testdep %v", args)
-	}
-	prog := filepath.Join(p.origWd, "testdep"+test.ExeSuffix)
-	newargs := append([]string{args[0], "-v"}, args[1:]...)
-
-	p.stdout.Reset()
-	p.stderr.Reset()
-
-	status := p.run(prog, newargs, &p.stdout, &p.stderr, p.ProjPath(""), p.env)
-
-	if *test.PrintLogs {
-		if p.stdout.Len() > 0 {
-			p.t.Logf("\nstandard output:%s", p.stdout.String())
-		}
-		if p.stderr.Len() > 0 {
-			p.t.Logf("standard error:\n%s", p.stderr.String())
-		}
-	}
-	return status
-}
-
-// CopyTree recursively copies a source directory into the test project's directory.
-func (p *TestProject) CopyTree(src string) {
-	filepath.Walk(src,
-		func(path string, info os.FileInfo, err error) error {
-			if path != src {
-				localpath := path[len(src)+1:]
-				if info.IsDir() {
-					p.TempDir(projectRoot, localpath)
-				} else {
-					destpath := filepath.Join(p.ProjPath(), localpath)
-					copyFile(destpath, path)
-				}
-			}
-			return nil
-		})
-}
-
-func copyFile(dest, src string) {
-	in, err := os.Open(src)
-	if err != nil {
-		panic(err)
-	}
-	defer in.Close()
-
-	out, err := os.Create(dest)
-	if err != nil {
-		panic(err)
-	}
-	defer out.Close()
-
-	io.Copy(out, in)
-}
-
-// GetVendorPaths collects final vendor paths at a depth of three levels.
-func (p *TestProject) GetVendorPaths() []string {
-	vendorPath := p.ProjPath("vendor")
-	result := make([]string, 0)
-	filepath.Walk(
-		vendorPath,
-		func(path string, info os.FileInfo, err error) error {
-			if len(path) > len(vendorPath) && info.IsDir() {
-				parse := strings.Split(path[len(vendorPath)+1:], string(filepath.Separator))
-				if len(parse) == 3 {
-					result = append(result, strings.Join(parse, "/"))
-					return filepath.SkipDir
-				}
-			}
-			return nil
-		},
-	)
-	sort.Strings(result)
-	return result
-}
-
-// GetImportPaths collect final vendor paths at a depth of three levels.
-func (p *TestProject) GetImportPaths() []string {
-	importPath := p.Path("src")
-	result := make([]string, 0)
-	filepath.Walk(
-		importPath,
-		func(path string, info os.FileInfo, err error) error {
-			if len(path) > len(importPath) && info.IsDir() {
-				parse := strings.Split(path[len(importPath)+1:], string(filepath.Separator))
-				if len(parse) == 3 {
-					result = append(result, strings.Join(parse, "/"))
-					return filepath.SkipDir
-				}
-			}
-			return nil
-		},
-	)
-	sort.Strings(result)
-	return result
-}
-
-// RecordImportPaths takes a snapshot of the import paths before test is run.
-func (p *TestProject) RecordImportPaths() {
-	p.preImports = p.GetImportPaths()
-}
-
-// CompareImportPaths compares import paths before and after test commands.
-func (p *TestProject) CompareImportPaths() {
-	wantImportPaths := p.preImports
-	gotImportPaths := p.GetImportPaths()
-	if len(gotImportPaths) != len(wantImportPaths) {
-		p.t.Fatalf("Import path count changed during command: pre %d post %d", len(wantImportPaths), len(gotImportPaths))
-	}
-	for ind := range gotImportPaths {
-		if gotImportPaths[ind] != wantImportPaths[ind] {
-			p.t.Errorf("Change in import paths during: pre %s post %s", gotImportPaths, wantImportPaths)
-		}
-	}
-}
-
-// makeRootTempdir makes a temporary directory for a run of testgo. If
-// the temporary directory was already created, this does nothing.
-func (p *TestProject) makeRootTempDir() {
-	if p.tempdir == "" {
-		var err error
-		p.tempdir, err = ioutil.TempDir("", "gotest")
-		p.Must(err)
-
-		// Fix for OSX where the tempdir is a symlink:
-		if runtime.GOOS == "darwin" {
-			p.tempdir, err = filepath.EvalSymlinks(p.tempdir)
-			p.Must(err)
-		}
-	}
-}
-
-// Setenv sets an environment variable to use when running the test go
-// command.
-func (p *TestProject) Setenv(name, val string) {
-	p.env = append(p.env, name+"="+val)
-}
-
-// Must gives a fatal error if err is not nil.
-func (p *TestProject) Must(err error) {
-	if err != nil {
-		p.t.Fatalf("%+v", err)
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/test/test.go b/installer/vendor/github.com/golang/dep/internal/test/test.go
deleted file mode 100644
index 9a7fbc8d98..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/test/test.go
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package test
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/pkg/errors"
-)
-
-var (
-	// ExeSuffix is the suffix of executable files; ".exe" on Windows.
-	ExeSuffix string
-	mu        sync.Mutex
-	// PrintLogs controls logging of test commands.
-	PrintLogs = flag.Bool("logs", false, "log stdin/stdout of test commands")
-	// UpdateGolden controls updating test fixtures.
-	UpdateGolden = flag.Bool("update", false, "update golden files")
-)
-
-const (
-	manifestName string = "Gopkg.toml"
-	lockName     string = "Gopkg.lock"
-)
-
-func init() {
-	switch runtime.GOOS {
-	case "windows":
-		ExeSuffix = ".exe"
-	}
-}
-
-// Helper with utilities for testing.
-type Helper struct {
-	t              *testing.T
-	temps          []string
-	wd             string
-	origWd         string
-	env            []string
-	tempdir        string
-	ran            bool
-	inParallel     bool
-	stdout, stderr bytes.Buffer
-}
-
-// NewHelper initializes a new helper for testing.
-func NewHelper(t *testing.T) *Helper {
-	wd, err := os.Getwd()
-	if err != nil {
-		panic(err)
-	}
-	return &Helper{t: t, origWd: wd}
-}
-
-// Must gives a fatal error if err is not nil.
-func (h *Helper) Must(err error) {
-	if err != nil {
-		h.t.Fatalf("%+v", err)
-	}
-}
-
-// check gives a test non-fatal error if err is not nil.
-func (h *Helper) check(err error) {
-	if err != nil {
-		h.t.Errorf("%+v", err)
-	}
-}
-
-// Parallel runs the test in parallel by calling t.Parallel.
-func (h *Helper) Parallel() {
-	if h.ran {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: call to parallel after run"))
-	}
-	if h.wd != "" {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: call to parallel after cd"))
-	}
-	for _, e := range h.env {
-		if strings.HasPrefix(e, "GOROOT=") || strings.HasPrefix(e, "GOPATH=") || strings.HasPrefix(e, "GOBIN=") {
-			val := e[strings.Index(e, "=")+1:]
-			if strings.HasPrefix(val, "testdata") || strings.HasPrefix(val, "./testdata") {
-				h.t.Fatalf("%+v", errors.Errorf("internal testsuite error: call to parallel with testdata in environment (%s)", e))
-			}
-		}
-	}
-	h.inParallel = true
-	h.t.Parallel()
-}
-
-// pwd returns the current directory.
-func (h *Helper) pwd() string {
-	wd, err := os.Getwd()
-	if err != nil {
-		h.t.Fatalf("%+v", errors.Wrap(err, "could not get working directory"))
-	}
-	return wd
-}
-
-// Cd changes the current directory to the named directory. Note that
-// using this means that the test must not be run in parallel with any
-// other tests.
-func (h *Helper) Cd(dir string) {
-	if h.inParallel {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: changing directory when running in parallel"))
-	}
-	if h.wd == "" {
-		h.wd = h.pwd()
-	}
-	abs, err := filepath.Abs(dir)
-	if err == nil {
-		h.Setenv("PWD", abs)
-	}
-
-	err = os.Chdir(dir)
-	h.Must(errors.Wrapf(err, "Unable to cd to %s", dir))
-}
-
-// Setenv sets an environment variable to use when running the test go
-// command.
-func (h *Helper) Setenv(name, val string) {
-	if h.inParallel && (name == "GOROOT" || name == "GOPATH" || name == "GOBIN") && (strings.HasPrefix(val, "testdata") || strings.HasPrefix(val, "./testdata")) {
-		h.t.Fatalf("%+v", errors.Errorf("internal testsuite error: call to setenv with testdata (%s=%s) after parallel", name, val))
-	}
-	h.unsetenv(name)
-	h.env = append(h.env, name+"="+val)
-}
-
-// unsetenv removes an environment variable.
-func (h *Helper) unsetenv(name string) {
-	if h.env == nil {
-		h.env = append([]string(nil), os.Environ()...)
-	}
-	for i, v := range h.env {
-		if strings.HasPrefix(v, name+"=") {
-			h.env = append(h.env[:i], h.env[i+1:]...)
-			break
-		}
-	}
-}
-
-// DoRun runs the test go command, recording stdout and stderr and
-// returning exit status.
-func (h *Helper) DoRun(args []string) error {
-	if h.inParallel {
-		for _, arg := range args {
-			if strings.HasPrefix(arg, "testdata") || strings.HasPrefix(arg, "./testdata") {
-				h.t.Fatalf("%+v", errors.New("internal testsuite error: parallel run using testdata"))
-			}
-		}
-	}
-	if *PrintLogs {
-		h.t.Logf("running testdep %v", args)
-	}
-	var prog string
-	if h.wd == "" {
-		prog = "./testdep" + ExeSuffix
-	} else {
-		prog = filepath.Join(h.wd, "testdep"+ExeSuffix)
-	}
-	newargs := []string{args[0], "-v"}
-	newargs = append(newargs, args[1:]...)
-	cmd := exec.Command(prog, newargs...)
-	h.stdout.Reset()
-	h.stderr.Reset()
-	cmd.Stdout = &h.stdout
-	cmd.Stderr = &h.stderr
-	cmd.Env = h.env
-	status := cmd.Run()
-	if *PrintLogs {
-		if h.stdout.Len() > 0 {
-			h.t.Log("standard output:")
-			h.t.Log(h.stdout.String())
-		}
-		if h.stderr.Len() > 0 {
-			h.t.Log("standard error:")
-			h.t.Log(h.stderr.String())
-		}
-	}
-	h.ran = true
-	return errors.Wrapf(status, "Error running %s\n%s", strings.Join(newargs, " "), h.stderr.String())
-}
-
-// Run runs the test go command, and expects it to succeed.
-func (h *Helper) Run(args ...string) {
-	if runtime.GOOS == "windows" {
-		mu.Lock()
-		defer mu.Unlock()
-	}
-	if status := h.DoRun(args); status != nil {
-		h.t.Logf("go %v failed unexpectedly: %v", args, status)
-		h.t.FailNow()
-	}
-}
-
-// runFail runs the test go command, and expects it to fail.
-func (h *Helper) runFail(args ...string) {
-	if status := h.DoRun(args); status == nil {
-		h.t.Fatalf("%+v", errors.New("testgo succeeded unexpectedly"))
-	} else {
-		h.t.Log("testgo failed as expected:", status)
-	}
-}
-
-// RunGo runs a go command, and expects it to succeed.
-func (h *Helper) RunGo(args ...string) {
-	cmd := exec.Command("go", args...)
-	h.stdout.Reset()
-	h.stderr.Reset()
-	cmd.Stdout = &h.stdout
-	cmd.Stderr = &h.stderr
-	cmd.Dir = h.wd
-	cmd.Env = h.env
-	status := cmd.Run()
-	if h.stdout.Len() > 0 {
-		h.t.Log("go standard output:")
-		h.t.Log(h.stdout.String())
-	}
-	if h.stderr.Len() > 0 {
-		h.t.Log("go standard error:")
-		h.t.Log(h.stderr.String())
-	}
-	if status != nil {
-		h.t.Logf("go %v failed unexpectedly: %v", args, status)
-		h.t.FailNow()
-	}
-}
-
-// NeedsExternalNetwork makes sure the tests needing external network will not
-// be run when executing tests in short mode.
-func NeedsExternalNetwork(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test: no external network in -short mode")
-	}
-}
-
-// NeedsGit will make sure the tests that require git will be skipped if the
-// git binary is not available.
-func NeedsGit(t *testing.T) {
-	if _, err := exec.LookPath("git"); err != nil {
-		t.Skip("skipping because git binary not found")
-	}
-}
-
-// RunGit runs a git command, and expects it to succeed.
-func (h *Helper) RunGit(dir string, args ...string) {
-	cmd := exec.Command("git", args...)
-	h.stdout.Reset()
-	h.stderr.Reset()
-	cmd.Stdout = &h.stdout
-	cmd.Stderr = &h.stderr
-	cmd.Dir = dir
-	cmd.Env = h.env
-	status := cmd.Run()
-	if *PrintLogs {
-		if h.stdout.Len() > 0 {
-			h.t.Logf("git %v standard output:", args)
-			h.t.Log(h.stdout.String())
-		}
-		if h.stderr.Len() > 0 {
-			h.t.Logf("git %v standard error:", args)
-			h.t.Log(h.stderr.String())
-		}
-	}
-	if status != nil {
-		h.t.Logf("git %v failed unexpectedly: %v", args, status)
-		h.t.FailNow()
-	}
-}
-
-// getStdout returns standard output of the testgo run as a string.
-func (h *Helper) getStdout() string {
-	if !h.ran {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: stdout called before run"))
-	}
-	return h.stdout.String()
-}
-
-// getStderr returns standard error of the testgo run as a string.
-func (h *Helper) getStderr() string {
-	if !h.ran {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: stdout called before run"))
-	}
-	return h.stderr.String()
-}
-
-// doGrepMatch looks for a regular expression in a buffer, and returns
-// whether it is found. The regular expression is matched against
-// each line separately, as with the grep command.
-func (h *Helper) doGrepMatch(match string, b *bytes.Buffer) bool {
-	if !h.ran {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: grep called before run"))
-	}
-	re := regexp.MustCompile(match)
-	for _, ln := range bytes.Split(b.Bytes(), []byte{'\n'}) {
-		if re.Match(ln) {
-			return true
-		}
-	}
-	return false
-}
-
-// doGrep looks for a regular expression in a buffer and fails if it
-// is not found. The name argument is the name of the output we are
-// searching, "output" or "error".  The msg argument is logged on
-// failure.
-func (h *Helper) doGrep(match string, b *bytes.Buffer, name, msg string) {
-	if !h.doGrepMatch(match, b) {
-		h.t.Log(msg)
-		h.t.Logf("pattern %v not found in standard %s", match, name)
-		h.t.FailNow()
-	}
-}
-
-// grepStdout looks for a regular expression in the test run's
-// standard output and fails, logging msg, if it is not found.
-func (h *Helper) grepStdout(match, msg string) {
-	h.doGrep(match, &h.stdout, "output", msg)
-}
-
-// grepStderr looks for a regular expression in the test run's
-// standard error and fails, logging msg, if it is not found.
-func (h *Helper) grepStderr(match, msg string) {
-	h.doGrep(match, &h.stderr, "error", msg)
-}
-
-// grepBoth looks for a regular expression in the test run's standard
-// output or stand error and fails, logging msg, if it is not found.
-func (h *Helper) grepBoth(match, msg string) {
-	if !h.doGrepMatch(match, &h.stdout) && !h.doGrepMatch(match, &h.stderr) {
-		h.t.Log(msg)
-		h.t.Logf("pattern %v not found in standard output or standard error", match)
-		h.t.FailNow()
-	}
-}
-
-// doGrepNot looks for a regular expression in a buffer and fails if
-// it is found. The name and msg arguments are as for doGrep.
-func (h *Helper) doGrepNot(match string, b *bytes.Buffer, name, msg string) {
-	if h.doGrepMatch(match, b) {
-		h.t.Log(msg)
-		h.t.Logf("pattern %v found unexpectedly in standard %s", match, name)
-		h.t.FailNow()
-	}
-}
-
-// grepStdoutNot looks for a regular expression in the test run's
-// standard output and fails, logging msg, if it is found.
-func (h *Helper) grepStdoutNot(match, msg string) {
-	h.doGrepNot(match, &h.stdout, "output", msg)
-}
-
-// grepStderrNot looks for a regular expression in the test run's
-// standard error and fails, logging msg, if it is found.
-func (h *Helper) grepStderrNot(match, msg string) {
-	h.doGrepNot(match, &h.stderr, "error", msg)
-}
-
-// grepBothNot looks for a regular expression in the test run's
-// standard output or stand error and fails, logging msg, if it is
-// found.
-func (h *Helper) grepBothNot(match, msg string) {
-	if h.doGrepMatch(match, &h.stdout) || h.doGrepMatch(match, &h.stderr) {
-		h.t.Log(msg)
-		h.t.Fatalf("%+v", errors.Errorf("pattern %v found unexpectedly in standard output or standard error", match))
-	}
-}
-
-// doGrepCount counts the number of times a regexp is seen in a buffer.
-func (h *Helper) doGrepCount(match string, b *bytes.Buffer) int {
-	if !h.ran {
-		h.t.Fatalf("%+v", errors.New("internal testsuite error: doGrepCount called before run"))
-	}
-	re := regexp.MustCompile(match)
-	c := 0
-	for _, ln := range bytes.Split(b.Bytes(), []byte{'\n'}) {
-		if re.Match(ln) {
-			c++
-		}
-	}
-	return c
-}
-
-// grepCountBoth returns the number of times a regexp is seen in both
-// standard output and standard error.
-func (h *Helper) grepCountBoth(match string) int {
-	return h.doGrepCount(match, &h.stdout) + h.doGrepCount(match, &h.stderr)
-}
-
-// creatingTemp records that the test plans to create a temporary file
-// or directory. If the file or directory exists already, it will be
-// removed. When the test completes, the file or directory will be
-// removed if it exists.
-func (h *Helper) creatingTemp(path string) {
-	if filepath.IsAbs(path) && !strings.HasPrefix(path, h.tempdir) {
-		h.t.Fatalf("%+v", errors.Errorf("internal testsuite error: creatingTemp(%q) with absolute path not in temporary directory", path))
-	}
-	// If we have changed the working directory, make sure we have
-	// an absolute path, because we are going to change directory
-	// back before we remove the temporary.
-	if h.wd != "" && !filepath.IsAbs(path) {
-		path = filepath.Join(h.pwd(), path)
-	}
-	h.Must(os.RemoveAll(path))
-	h.temps = append(h.temps, path)
-}
-
-// makeTempdir makes a temporary directory for a run of testgo. If
-// the temporary directory was already created, this does nothing.
-func (h *Helper) makeTempdir() {
-	if h.tempdir == "" {
-		var err error
-		h.tempdir, err = ioutil.TempDir("", "gotest")
-		h.Must(err)
-	}
-}
-
-// TempFile adds a temporary file for a run of testgo.
-func (h *Helper) TempFile(path, contents string) {
-	h.makeTempdir()
-	h.Must(os.MkdirAll(filepath.Join(h.tempdir, filepath.Dir(path)), 0755))
-	bytes := []byte(contents)
-	if strings.HasSuffix(path, ".go") {
-		formatted, err := format.Source(bytes)
-		if err == nil {
-			bytes = formatted
-		}
-	}
-	h.Must(ioutil.WriteFile(filepath.Join(h.tempdir, path), bytes, 0644))
-}
-
-// WriteTestFile writes a file to the testdata directory from memory.  src is
-// relative to ./testdata.
-func (h *Helper) WriteTestFile(src string, content string) error {
-	err := ioutil.WriteFile(filepath.Join(h.origWd, "testdata", src), []byte(content), 0666)
-	return err
-}
-
-// GetFile reads a file into memory
-func (h *Helper) GetFile(path string) io.ReadCloser {
-	content, err := os.Open(path)
-	if err != nil {
-		h.t.Fatalf("%+v", errors.Wrapf(err, "Unable to open file: %s", path))
-	}
-	return content
-}
-
-// GetTestFile reads a file from the testdata directory into memory.  src is
-// relative to ./testdata.
-func (h *Helper) GetTestFile(src string) io.ReadCloser {
-	fullPath := filepath.Join(h.origWd, "testdata", src)
-	return h.GetFile(fullPath)
-}
-
-// GetTestFileString reads a file from the testdata directory into memory.  src is
-// relative to ./testdata.
-func (h *Helper) GetTestFileString(src string) string {
-	srcf := h.GetTestFile(src)
-	defer srcf.Close()
-	content, err := ioutil.ReadAll(srcf)
-	if err != nil {
-		h.t.Fatalf("%+v", err)
-	}
-	return string(content)
-}
-
-// TempCopy copies a temporary file from testdata into the temporary directory.
-// dest is relative to the temp directory location, and src is relative to
-// ./testdata.
-func (h *Helper) TempCopy(dest, src string) {
-	in := h.GetTestFile(src)
-	defer in.Close()
-	h.TempDir(filepath.Dir(dest))
-	out, err := os.Create(filepath.Join(h.tempdir, dest))
-	if err != nil {
-		panic(err)
-	}
-	defer out.Close()
-	io.Copy(out, in)
-}
-
-// TempDir adds a temporary directory for a run of testgo.
-func (h *Helper) TempDir(path string) {
-	h.makeTempdir()
-	fullPath := filepath.Join(h.tempdir, path)
-	if err := os.MkdirAll(fullPath, 0755); err != nil && !os.IsExist(err) {
-		h.t.Fatalf("%+v", errors.Errorf("Unable to create temp directory: %s", fullPath))
-	}
-}
-
-// Path returns the absolute pathname to file with the temporary
-// directory.
-func (h *Helper) Path(name string) string {
-	if h.tempdir == "" {
-		h.t.Fatalf("%+v", errors.Errorf("internal testsuite error: path(%q) with no tempdir", name))
-	}
-
-	var joined string
-	if name == "." {
-		joined = h.tempdir
-	} else {
-		joined = filepath.Join(h.tempdir, name)
-	}
-
-	// Ensure it's the absolute, symlink-less path we're returning
-	abs, err := filepath.EvalSymlinks(joined)
-	if err != nil {
-		h.t.Fatalf("%+v", errors.Wrapf(err, "internal testsuite error: could not get absolute path for dir(%q)", joined))
-	}
-	return abs
-}
-
-// MustExist fails if path does not exist.
-func (h *Helper) MustExist(path string) {
-	if err := h.ShouldExist(path); err != nil {
-		h.t.Fatalf("%+v", err)
-	}
-}
-
-// ShouldExist returns an error if path does not exist.
-func (h *Helper) ShouldExist(path string) error {
-	if !h.Exist(path) {
-		return errors.Errorf("%s does not exist but should", path)
-	}
-
-	return nil
-}
-
-// Exist returns whether or not a path exists
-func (h *Helper) Exist(path string) bool {
-	if _, err := os.Stat(path); err != nil {
-		if os.IsNotExist(err) {
-			return false
-		}
-		h.t.Fatalf("%+v", errors.Wrapf(err, "Error checking if path exists: %s", path))
-	}
-
-	return true
-}
-
-// MustNotExist fails if path exists.
-func (h *Helper) MustNotExist(path string) {
-	if err := h.ShouldNotExist(path); err != nil {
-		h.t.Fatalf("%+v", err)
-	}
-}
-
-// ShouldNotExist returns an error if path exists.
-func (h *Helper) ShouldNotExist(path string) error {
-	if h.Exist(path) {
-		return errors.Errorf("%s exists but should not", path)
-	}
-
-	return nil
-}
-
-// Cleanup cleans up a test that runs testgo.
-func (h *Helper) Cleanup() {
-	if h.wd != "" {
-		if err := os.Chdir(h.wd); err != nil {
-			// We are unlikely to be able to continue.
-			fmt.Fprintln(os.Stderr, "could not restore working directory, crashing:", err)
-			os.Exit(2)
-		}
-	}
-	// NOTE(mattn): It seems that sometimes git.exe is not dead
-	// when cleanup() is called. But we do not know any way to wait for it.
-	if runtime.GOOS == "windows" {
-		mu.Lock()
-		exec.Command(`taskkill`, `/F`, `/IM`, `git.exe`).Run()
-		mu.Unlock()
-	}
-	for _, path := range h.temps {
-		h.check(os.RemoveAll(path))
-	}
-	if h.tempdir != "" {
-		h.check(os.RemoveAll(h.tempdir))
-	}
-}
-
-// ReadManifest returns the manifest in the current directory.
-func (h *Helper) ReadManifest() string {
-	m := filepath.Join(h.pwd(), manifestName)
-	h.MustExist(m)
-
-	f, err := ioutil.ReadFile(m)
-	h.Must(err)
-	return string(f)
-}
-
-// ReadLock returns the lock in the current directory.
-func (h *Helper) ReadLock() string {
-	l := filepath.Join(h.pwd(), lockName)
-	h.MustExist(l)
-
-	f, err := ioutil.ReadFile(l)
-	h.Must(err)
-	return string(f)
-}
-
-// GetCommit treats repo as a path to a git repository and returns the current
-// revision.
-func (h *Helper) GetCommit(repo string) string {
-	repoPath := h.Path("pkg/dep/sources/https---" + strings.Replace(repo, "/", "-", -1))
-	cmd := exec.Command("git", "rev-parse", "HEAD")
-	cmd.Dir = repoPath
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		h.t.Fatalf("%+v", errors.Wrapf(err, "git commit failed: out -> %s", string(out)))
-	}
-	return strings.TrimSpace(string(out))
-}
diff --git a/installer/vendor/github.com/golang/dep/internal/test/writer.go b/installer/vendor/github.com/golang/dep/internal/test/writer.go
deleted file mode 100644
index 7fd3a4d948..0000000000
--- a/installer/vendor/github.com/golang/dep/internal/test/writer.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package test
-
-import (
-	"strings"
-	"testing"
-	"unicode"
-)
-
-// Writer adapts a testing.TB to the io.Writer interface
-type Writer struct {
-	testing.TB
-}
-
-func (t Writer) Write(b []byte) (n int, err error) {
-	str := string(b)
-	if len(str) == 0 {
-		return 0, nil
-	}
-
-	for _, part := range strings.Split(str, "\n") {
-		str := strings.TrimRightFunc(part, unicode.IsSpace)
-		if len(str) != 0 {
-			t.Log(str)
-		}
-	}
-	return len(b), err
-}
diff --git a/installer/vendor/github.com/golang/dep/lock_test.go b/installer/vendor/github.com/golang/dep/lock_test.go
deleted file mode 100644
index 8ee340c578..0000000000
--- a/installer/vendor/github.com/golang/dep/lock_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"encoding/hex"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestReadLock(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	golden := "lock/golden0.toml"
-	g0f := h.GetTestFile(golden)
-	defer g0f.Close()
-	got, err := readLock(g0f)
-	if err != nil {
-		t.Fatalf("Should have read Lock correctly, but got err %q", err)
-	}
-
-	b, _ := hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
-	want := &Lock{
-		SolveMeta: SolveMeta{
-			InputsDigest: b,
-		},
-		P: []gps.LockedProject{
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep")},
-				gps.NewBranch("master").Pair(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
-				[]string{"."},
-			),
-		},
-	}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Error("Valid lock did not parse as expected")
-	}
-
-	golden = "lock/golden1.toml"
-	g1f := h.GetTestFile(golden)
-	defer g1f.Close()
-	got, err = readLock(g1f)
-	if err != nil {
-		t.Fatalf("Should have read Lock correctly, but got err %q", err)
-	}
-
-	b, _ = hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
-	want = &Lock{
-		SolveMeta: SolveMeta{
-			InputsDigest: b,
-		},
-		P: []gps.LockedProject{
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep")},
-				gps.NewVersion("0.12.2").Pair(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
-				[]string{"."},
-			),
-		},
-	}
-
-	if !reflect.DeepEqual(got, want) {
-		t.Error("Valid lock did not parse as expected")
-	}
-}
-
-func TestWriteLock(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	golden := "lock/golden0.toml"
-	want := h.GetTestFileString(golden)
-	memo, _ := hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
-	l := &Lock{
-		SolveMeta: SolveMeta{
-			InputsDigest: memo,
-		},
-		P: []gps.LockedProject{
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep")},
-				gps.NewBranch("master").Pair(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
-				[]string{"."},
-			),
-		},
-	}
-
-	got, err := l.MarshalTOML()
-	if err != nil {
-		t.Fatalf("Error while marshaling valid lock to TOML: %q", err)
-	}
-
-	if string(got) != want {
-		if *test.UpdateGolden {
-			if err = h.WriteTestFile(golden, string(got)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("Valid lock did not marshal to TOML as expected:\n\t(GOT): %s\n\t(WNT): %s", string(got), want)
-		}
-	}
-
-	golden = "lock/golden1.toml"
-	want = h.GetTestFileString(golden)
-	memo, _ = hex.DecodeString("2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e")
-	l = &Lock{
-		SolveMeta: SolveMeta{
-			InputsDigest: memo,
-		},
-		P: []gps.LockedProject{
-			gps.NewLockedProject(
-				gps.ProjectIdentifier{ProjectRoot: gps.ProjectRoot("github.com/golang/dep")},
-				gps.NewVersion("0.12.2").Pair(gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb")),
-				[]string{"."},
-			),
-		},
-	}
-
-	got, err = l.MarshalTOML()
-	if err != nil {
-		t.Fatalf("Error while marshaling valid lock to TOML: %q", err)
-	}
-
-	if string(got) != want {
-		if *test.UpdateGolden {
-			if err = h.WriteTestFile(golden, string(got)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("Valid lock did not marshal to TOML as expected:\n\t(GOT): %s\n\t(WNT): %s", string(got), want)
-		}
-	}
-}
-
-func TestReadLockErrors(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	var err error
-
-	tests := []struct {
-		name string
-		file string
-	}{
-		{"specified both", "lock/error0.toml"},
-		{"invalid hash", "lock/error1.toml"},
-		{"no branch or version", "lock/error2.toml"},
-	}
-
-	for _, tst := range tests {
-		lf := h.GetTestFile(tst.file)
-		defer lf.Close()
-		_, err = readLock(lf)
-		if err == nil {
-			t.Errorf("Reading lock with %s should have caused error, but did not", tst.name)
-		} else if !strings.Contains(err.Error(), tst.name) {
-			t.Errorf("Unexpected error %q; expected %s error", err, tst.name)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/manifest_test.go b/installer/vendor/github.com/golang/dep/manifest_test.go
deleted file mode 100644
index 7ac24448ca..0000000000
--- a/installer/vendor/github.com/golang/dep/manifest_test.go
+++ /dev/null
@@ -1,484 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-	"log"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestReadManifest(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	mf := h.GetTestFile("manifest/golden.toml")
-	defer mf.Close()
-	got, _, err := readManifest(mf)
-	if err != nil {
-		t.Fatalf("Should have read Manifest correctly, but got err %q", err)
-	}
-
-	c, _ := gps.NewSemverConstraint("^0.12.0")
-	want := Manifest{
-		Constraints: map[gps.ProjectRoot]gps.ProjectProperties{
-			gps.ProjectRoot("github.com/golang/dep/internal/gps"): {
-				Constraint: c,
-			},
-			gps.ProjectRoot("github.com/babble/brook"): {
-				Constraint: gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb"),
-			},
-		},
-		Ovr: map[gps.ProjectRoot]gps.ProjectProperties{
-			gps.ProjectRoot("github.com/golang/dep/internal/gps"): {
-				Source:     "https://github.com/golang/dep/internal/gps",
-				Constraint: gps.NewBranch("master"),
-			},
-		},
-		Ignored: []string{"github.com/foo/bar"},
-	}
-
-	if !reflect.DeepEqual(got.Constraints, want.Constraints) {
-		t.Error("Valid manifest's dependencies did not parse as expected")
-	}
-	if !reflect.DeepEqual(got.Ovr, want.Ovr) {
-		t.Error("Valid manifest's overrides did not parse as expected")
-	}
-	if !reflect.DeepEqual(got.Ignored, want.Ignored) {
-		t.Error("Valid manifest's ignored did not parse as expected")
-	}
-}
-
-func TestWriteManifest(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	golden := "manifest/golden.toml"
-	want := h.GetTestFileString(golden)
-	c, _ := gps.NewSemverConstraint("^0.12.0")
-	m := NewManifest()
-	m.Constraints[gps.ProjectRoot("github.com/golang/dep/internal/gps")] = gps.ProjectProperties{
-		Constraint: c,
-	}
-	m.Constraints[gps.ProjectRoot("github.com/babble/brook")] = gps.ProjectProperties{
-		Constraint: gps.Revision("d05d5aca9f895d19e9265839bffeadd74a2d2ecb"),
-	}
-	m.Ovr[gps.ProjectRoot("github.com/golang/dep/internal/gps")] = gps.ProjectProperties{
-		Source:     "https://github.com/golang/dep/internal/gps",
-		Constraint: gps.NewBranch("master"),
-	}
-	m.Ignored = []string{"github.com/foo/bar"}
-
-	got, err := m.MarshalTOML()
-	if err != nil {
-		t.Fatalf("Error while marshaling valid manifest to TOML: %q", err)
-	}
-
-	if string(got) != want {
-		if *test.UpdateGolden {
-			if err = h.WriteTestFile(golden, string(got)); err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			t.Errorf("Valid manifest did not marshal to TOML as expected:\n\t(GOT): %s\n\t(WNT): %s", string(got), want)
-		}
-	}
-}
-
-func TestReadManifestErrors(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	var err error
-
-	tests := []struct {
-		name string
-		file string
-	}{
-		{"multiple constraints", "manifest/error1.toml"},
-		{"multiple dependencies", "manifest/error2.toml"},
-		{"multiple overrides", "manifest/error3.toml"},
-	}
-
-	for _, tst := range tests {
-		mf := h.GetTestFile(tst.file)
-		defer mf.Close()
-		_, _, err = readManifest(mf)
-		if err == nil {
-			t.Errorf("Reading manifest with %s should have caused error, but did not", tst.name)
-		} else if !strings.Contains(err.Error(), tst.name) {
-			t.Errorf("Unexpected error %q; expected %s error", err, tst.name)
-		}
-	}
-}
-
-func TestValidateManifest(t *testing.T) {
-	cases := []struct {
-		tomlString string
-		wantWarn   []error
-		wantError  error
-	}{
-		{
-			tomlString: `
-			required = ["github.com/foo/bar"]
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			required = "github.com/foo/bar"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidRequired,
-		},
-		{
-			tomlString: `
-			required = []
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			required = [1, 2, 3]
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidRequired,
-		},
-		{
-			tomlString: `
-			[[required]]
-			  name = "foo"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidRequired,
-		},
-		{
-			tomlString: `
-			ignored = ["foo"]
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			ignored = "foo"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidIgnored,
-		},
-		{
-			tomlString: `
-			ignored = []
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			ignored = [1, 2, 3]
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidIgnored,
-		},
-		{
-			tomlString: `
-			[[ignored]]
-			  name = "foo"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidIgnored,
-		},
-		{
-			tomlString: `
-			[metadata]
-			  authors = "foo"
-			  version = "1.0.0"
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			foo = "some-value"
-			version = 14
-
-			[[bar]]
-			  author = "xyz"
-
-			[[constraint]]
-			  name = "github.com/foo/bar"
-			  version = ""
-			`,
-			wantWarn: []error{
-				errors.New("Unknown field in manifest: foo"),
-				errors.New("Unknown field in manifest: bar"),
-				errors.New("Unknown field in manifest: version"),
-			},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			metadata = "project-name"
-
-			[[constraint]]
-			  name = "github.com/foo/bar"
-			`,
-			wantWarn:  []error{errors.New("metadata should be a TOML table")},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			  name = "github.com/foo/bar"
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			constraint = "foo"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidConstraint,
-		},
-		{
-			tomlString: `
-			constraint = ["foo", "bar"]
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidConstraint,
-		},
-		{
-			tomlString: `
-			[[override]]
-			  name = "github.com/foo/bar"
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[override]]
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			override = "bar"
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidOverride,
-		},
-		{
-			tomlString: `
-			override = ["foo", "bar"]
-			`,
-			wantWarn:  []error{},
-			wantError: errInvalidOverride,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			  name = "github.com/foo/bar"
-			  location = "some-value"
-			  link = "some-other-value"
-			  metadata = "foo"
-
-			[[override]]
-			  nick = "foo"
-			`,
-			wantWarn: []error{
-				errors.New("Invalid key \"location\" in \"constraint\""),
-				errors.New("Invalid key \"link\" in \"constraint\""),
-				errors.New("Invalid key \"nick\" in \"override\""),
-				errors.New("metadata in \"constraint\" should be a TOML table"),
-			},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			  name = "github.com/foo/bar"
-
-			  [constraint.metadata]
-			    color = "blue"
-			`,
-			wantWarn:  []error{},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			  name = "github.com/foo/bar"
-			  revision = "b86ad16"
-			`,
-			wantWarn:  []error{errors.New("revision \"b86ad16\" should not be in abbreviated form")},
-			wantError: nil,
-		},
-		{
-			tomlString: `
-			[[constraint]]
-			  name = "foobar.com/hg"
-			  revision = "8d43f8c0b836"
-			`,
-			wantWarn:  []error{errors.New("revision \"8d43f8c0b836\" should not be in abbreviated form")},
-			wantError: nil,
-		},
-	}
-
-	// contains for error
-	contains := func(s []error, e error) bool {
-		for _, a := range s {
-			if a.Error() == e.Error() {
-				return true
-			}
-		}
-		return false
-	}
-
-	for _, c := range cases {
-		errs, err := validateManifest(c.tomlString)
-
-		// compare validation errors
-		if err != c.wantError {
-			t.Fatalf("Manifest errors are not as expected: \n\t(GOT) %v \n\t(WNT) %v", err, c.wantError)
-		}
-
-		// compare length of error slice
-		if len(errs) != len(c.wantWarn) {
-			t.Fatalf("Number of manifest errors are not as expected: \n\t(GOT) %v errors(%v)\n\t(WNT) %v errors(%v).", len(errs), errs, len(c.wantWarn), c.wantWarn)
-		}
-
-		// check if the expected errors exist in actual errors slice
-		for _, er := range errs {
-			if !contains(c.wantWarn, er) {
-				t.Fatalf("Manifest errors are not as expected: \n\t(MISSING) %v\n\t(FROM) %v", er, c.wantWarn)
-			}
-		}
-	}
-}
-
-func TestValidateProjectRoots(t *testing.T) {
-	cases := []struct {
-		name      string
-		manifest  Manifest
-		wantError error
-		wantWarn  []string
-	}{
-		{
-			name:      "empty Manifest",
-			manifest:  Manifest{},
-			wantError: nil,
-			wantWarn:  []string{},
-		},
-		{
-			name: "valid project root",
-			manifest: Manifest{
-				Constraints: map[gps.ProjectRoot]gps.ProjectProperties{
-					gps.ProjectRoot("github.com/golang/dep"): {
-						Constraint: gps.Any(),
-					},
-				},
-			},
-			wantError: nil,
-			wantWarn:  []string{},
-		},
-		{
-			name: "invalid project roots in Constraints and Overrides",
-			manifest: Manifest{
-				Constraints: map[gps.ProjectRoot]gps.ProjectProperties{
-					gps.ProjectRoot("github.com/golang/dep/foo"): {
-						Constraint: gps.Any(),
-					},
-					gps.ProjectRoot("github.com/golang/go/xyz"): {
-						Constraint: gps.Any(),
-					},
-					gps.ProjectRoot("github.com/golang/fmt"): {
-						Constraint: gps.Any(),
-					},
-				},
-				Ovr: map[gps.ProjectRoot]gps.ProjectProperties{
-					gps.ProjectRoot("github.com/golang/mock/bar"): {
-						Constraint: gps.Any(),
-					},
-					gps.ProjectRoot("github.com/golang/mock"): {
-						Constraint: gps.Any(),
-					},
-				},
-			},
-			wantError: errInvalidProjectRoot,
-			wantWarn: []string{
-				"the name for \"github.com/golang/dep/foo\" should be changed to \"github.com/golang/dep\"",
-				"the name for \"github.com/golang/mock/bar\" should be changed to \"github.com/golang/mock\"",
-				"the name for \"github.com/golang/go/xyz\" should be changed to \"github.com/golang/go\"",
-			},
-		},
-		{
-			name: "invalid source path",
-			manifest: Manifest{
-				Constraints: map[gps.ProjectRoot]gps.ProjectProperties{
-					gps.ProjectRoot("github.com/golang"): {
-						Constraint: gps.Any(),
-					},
-				},
-			},
-			wantError: errInvalidProjectRoot,
-			wantWarn:  []string{},
-		},
-	}
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	h.TempDir("src")
-	pwd := h.Path(".")
-
-	// Capture the stderr to verify the warnings
-	stderrOutput := &bytes.Buffer{}
-	errLogger := log.New(stderrOutput, "", 0)
-	ctx := &Ctx{
-		GOPATH: pwd,
-		Out:    log.New(ioutil.Discard, "", 0),
-		Err:    errLogger,
-	}
-
-	sm, err := ctx.SourceManager()
-	h.Must(err)
-	defer sm.Release()
-
-	for _, c := range cases {
-		t.Run(c.name, func(t *testing.T) {
-			// Empty the buffer for every case
-			stderrOutput.Reset()
-			err := ValidateProjectRoots(ctx, &c.manifest, sm)
-			if err != c.wantError {
-				t.Fatalf("Unexpected error while validating project roots:\n\t(GOT): %v\n\t(WNT): %v", err, c.wantError)
-			}
-
-			warnings := stderrOutput.String()
-			for _, warn := range c.wantWarn {
-				if !strings.Contains(warnings, warn) {
-					t.Fatalf("Expected ValidateProjectRoot errors to contain: %q", warn)
-				}
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/project_test.go b/installer/vendor/github.com/golang/dep/project_test.go
deleted file mode 100644
index c3d1ef00ba..0000000000
--- a/installer/vendor/github.com/golang/dep/project_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-)
-
-func TestFindRoot(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	want := filepath.Join(wd, "testdata", "rootfind")
-	got1, err := findProjectRoot(want)
-	if err != nil {
-		t.Errorf("Unexpected error while finding root: %s", err)
-	} else if want != got1 {
-		t.Errorf("findProjectRoot directly on root dir should have found %s, got %s", want, got1)
-	}
-
-	got2, err := findProjectRoot(filepath.Join(want, "subdir"))
-	if err != nil {
-		t.Errorf("Unexpected error while finding root: %s", err)
-	} else if want != got2 {
-		t.Errorf("findProjectRoot on subdir should have found %s, got %s", want, got2)
-	}
-
-	got3, err := findProjectRoot(filepath.Join(want, "nonexistent"))
-	if err != nil {
-		t.Errorf("Unexpected error while finding root: %s", err)
-	} else if want != got3 {
-		t.Errorf("findProjectRoot on nonexistent subdir should still work and give %s, got %s", want, got3)
-	}
-
-	root := "/"
-	p, err := findProjectRoot(root)
-	if p != "" {
-		t.Errorf("findProjectRoot with path %s returned non empty string: %s", root, p)
-	}
-	if err != errProjectNotFound {
-		t.Errorf("findProjectRoot want: %#v got: %#v", errProjectNotFound, err)
-	}
-
-	// The following test does not work on windows because syscall.Stat does not
-	// return a "not a directory" error.
-	if runtime.GOOS != "windows" {
-		got4, err := findProjectRoot(filepath.Join(want, ManifestName))
-		if err == nil {
-			t.Errorf("Should have err'd when trying subdir of file, but returned %s", got4)
-		}
-	}
-}
-
-func TestCheckGopkgFilenames(t *testing.T) {
-	// We are trying to skip this test on file systems which are case-sensiive. We could
-	// have used `fs.IsCaseSensitiveFilesystem` for this check. However, the code we are
-	// testing also relies on `fs.IsCaseSensitiveFilesystem`. So a bug in
-	// `fs.IsCaseSensitiveFilesystem` could prevent this test from being run. This is the
-	// only scenario where we prefer the OS heuristic over doing the actual work of
-	// validating filesystem case sensitivity via `fs.IsCaseSensitiveFilesystem`.
-	if runtime.GOOS != "windows" && runtime.GOOS != "darwin" {
-		t.Skip("skip this test on non-Windows, non-macOS")
-	}
-
-	errMsgFor := func(filetype, filename string) func(string) string {
-		return func(name string) string {
-			return fmt.Sprintf("%s filename %q does not match %q", filetype, name, filename)
-		}
-	}
-
-	manifestErrMsg := errMsgFor("manifest", ManifestName)
-	lockErrMsg := errMsgFor("lock", LockName)
-
-	invalidMfName := strings.ToLower(ManifestName)
-	invalidLfName := strings.ToLower(LockName)
-
-	cases := []struct {
-		wantErr     bool
-		createFiles []string
-		wantErrMsg  string
-	}{
-		// No error should be returned when the project contains a valid manifest file
-		// but no lock file.
-		{false, []string{ManifestName}, ""},
-		// No error should be returned when the project contains a valid manifest file as
-		// well as a valid lock file.
-		{false, []string{ManifestName, LockName}, ""},
-		// Error indicating the project was not found should be returned if a manifest
-		// file is not found.
-		{true, nil, errProjectNotFound.Error()},
-		// Error should be returned if the project has a manifest file with invalid name
-		// but no lock file.
-		{true, []string{invalidMfName}, manifestErrMsg(invalidMfName)},
-		// Error should be returned if the project has a valid manifest file and an
-		// invalid lock file.
-		{true, []string{ManifestName, invalidLfName}, lockErrMsg(invalidLfName)},
-	}
-
-	for _, c := range cases {
-		h := test.NewHelper(t)
-		defer h.Cleanup()
-
-		// Create a temporary directory which we will use as the project folder.
-		h.TempDir("")
-		tmpPath := h.Path(".")
-
-		// Create any files that are needed for the test before invoking
-		// `checkGopkgFilenames`.
-		for _, file := range c.createFiles {
-			h.TempFile(file, "")
-		}
-		err := checkGopkgFilenames(tmpPath)
-
-		if c.wantErr {
-			if err == nil {
-				// We were expecting an error but did not get one.
-				t.Fatalf("unexpected error message: \n\t(GOT) nil\n\t(WNT) %s", c.wantErrMsg)
-			} else if err.Error() != c.wantErrMsg {
-				// We got an error but it is not the one we were expecting.
-				t.Fatalf("unexpected error message: \n\t(GOT) %s\n\t(WNT) %s", err.Error(), c.wantErrMsg)
-			}
-		} else if err != nil {
-			// Error was not expected but still we got one
-			t.Fatalf("unexpected error message: \n\t(GOT) %+v", err)
-		}
-	}
-}
-
-func TestProjectMakeParams(t *testing.T) {
-	m := NewManifest()
-	m.Ignored = []string{"ignoring this"}
-
-	p := Project{
-		AbsRoot:    "someroot",
-		ImportRoot: gps.ProjectRoot("Some project root"),
-		Manifest:   m,
-		Lock:       &Lock{},
-	}
-
-	solveParam := p.MakeParams()
-
-	if solveParam.Manifest != p.Manifest {
-		t.Error("makeParams() returned gps.SolveParameters with incorrect Manifest")
-	}
-
-	if solveParam.Lock != p.Lock {
-		t.Error("makeParams() returned gps.SolveParameters with incorrect Lock")
-	}
-}
-
-func TestBackupVendor(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, "vendorbackupproject")
-	defer pc.Release()
-
-	dummyFile := filepath.Join("vendor", "badinput_fileroot")
-	pc.CopyFile(dummyFile, "txn_writer/badinput_fileroot")
-	pc.Load()
-
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-
-	// Create a backup
-	wantName := "_vendor-sfx"
-	vendorbak, err := BackupVendor("vendor", "sfx")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if vendorbak != wantName {
-		t.Fatalf("Vendor backup name is not as expected: \n\t(GOT) %v\n\t(WNT) %v", vendorbak, wantName)
-	}
-
-	if err = pc.h.ShouldExist(vendorbak); err != nil {
-		t.Fatal(err)
-	}
-
-	if err = pc.h.ShouldExist(vendorbak + string(filepath.Separator) + "badinput_fileroot"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Should return error on creating backup with existing filename
-	vendorbak, err = BackupVendor("vendor", "sfx")
-
-	if err != errVendorBackupFailed {
-		t.Fatalf("Vendor backup error is not as expected: \n\t(GOT) %v\n\t(WNT) %v", err, errVendorBackupFailed)
-	}
-
-	if vendorbak != "" {
-		t.Fatalf("Vendor backup name is not as expected: \n\t(GOT) %v\n\t(WNT) %v", vendorbak, "")
-	}
-
-	// Delete vendor
-	if err = os.RemoveAll("vendor"); err != nil {
-		t.Fatal(err)
-	}
-
-	// Should return empty backup file name when no vendor exists
-	vendorbak, err = BackupVendor("vendor", "sfx")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if vendorbak != "" {
-		t.Fatalf("Vendor backup name is not as expected: \n\t(GOT) %v\n\t(WNT) %v", vendorbak, "")
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/test_project_context_test.go b/installer/vendor/github.com/golang/dep/test_project_context_test.go
deleted file mode 100644
index c0739d9270..0000000000
--- a/installer/vendor/github.com/golang/dep/test_project_context_test.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"path/filepath"
-
-	"github.com/golang/dep/internal/gps"
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-// TestProjectContext groups together test project files and helps test them
-type TestProjectContext struct {
-	h              *test.Helper
-	tempDir        string // Full path to the temp directory
-	tempProjectDir string // Relative path of the project under the temp directory
-
-	Context       *Ctx
-	Project       *Project
-	SourceManager gps.SourceManager
-}
-
-// NewTestProjectContext creates a new on-disk test project
-func NewTestProjectContext(h *test.Helper, projectName string) *TestProjectContext {
-	pc := &TestProjectContext{h: h}
-
-	// Create the test project directory
-	pc.tempProjectDir = filepath.Join("src", projectName)
-	h.TempDir(pc.tempProjectDir)
-	pc.tempDir = h.Path(".")
-	pc.Project = &Project{AbsRoot: filepath.Join(pc.tempDir, pc.tempProjectDir)}
-	h.Cd(pc.Project.AbsRoot)
-	h.Setenv("GOPATH", pc.tempDir)
-
-	// Set up a Source Manager
-	var err error
-	pc.Context = &Ctx{
-		GOPATH: pc.tempDir,
-		Out:    discardLogger(),
-		Err:    discardLogger(),
-	}
-	pc.SourceManager, err = pc.Context.SourceManager()
-	h.Must(errors.Wrap(err, "Unable to create a SourceManager"))
-
-	return pc
-}
-
-// CopyFile copies a file from the testdata directory into the project
-// projectPath is the destination file path, relative to the project directory
-// testdataPath is the source path, relative to the testdata directory
-func (pc *TestProjectContext) CopyFile(projectPath string, testdataPath string) string {
-	path := filepath.Join(pc.tempProjectDir, projectPath)
-	pc.h.TempCopy(path, testdataPath)
-	return path
-}
-
-func (pc *TestProjectContext) Load() {
-	// TODO(carolynvs): Can't use Ctx.LoadProject until dep doesn't require a manifest at the project root or it also looks for lock
-	var err error
-	var m *Manifest
-	mp := pc.getManifestPath()
-	if pc.h.Exist(mp) {
-		mf := pc.h.GetFile(mp)
-		defer mf.Close()
-		var warns []error
-		m, warns, err = readManifest(mf)
-		for _, warn := range warns {
-			pc.Context.Err.Printf("dep: WARNING: %v\n", warn)
-		}
-		pc.h.Must(errors.Wrapf(err, "Unable to read manifest at %s", mp))
-	}
-	var l *Lock
-	lp := pc.getLockPath()
-	if pc.h.Exist(lp) {
-		lf := pc.h.GetFile(lp)
-		defer lf.Close()
-		l, err = readLock(lf)
-		pc.h.Must(errors.Wrapf(err, "Unable to read lock at %s", lp))
-	}
-	pc.Project.Manifest = m
-	pc.Project.Lock = l
-}
-
-// GetLockPath returns the full path to the lock
-func (pc *TestProjectContext) getLockPath() string {
-	return filepath.Join(pc.Project.AbsRoot, LockName)
-}
-
-// GetManifestPath returns the full path to the manifest
-func (pc *TestProjectContext) getManifestPath() string {
-	return filepath.Join(pc.Project.AbsRoot, ManifestName)
-}
-
-// GetVendorPath returns the full path to the vendor directory
-func (pc *TestProjectContext) getVendorPath() string {
-	return filepath.Join(pc.Project.AbsRoot, "vendor")
-}
-
-// LockShouldMatchGolden returns an error when the lock does not match the golden lock.
-// goldenLockPath is the path to the golden lock file relative to the testdata directory
-// Updates the golden file when -UpdateGolden flag is present.
-func (pc *TestProjectContext) LockShouldMatchGolden(goldenLockPath string) error {
-	got := pc.h.ReadLock()
-	return pc.ShouldMatchGolden(goldenLockPath, got)
-}
-
-// LockShouldNotExist returns an error when the lock exists.
-func (pc *TestProjectContext) LockShouldNotExist() error {
-	return pc.h.ShouldNotExist(pc.getLockPath())
-}
-
-// ManifestShouldMatchGolden returns an error when the manifest does not match the golden manifest.
-// goldenManifestPath is the path to the golden manifest file, relative to the testdata directory
-// Updates the golden file when -UpdateGolden flag is present
-func (pc *TestProjectContext) ManifestShouldMatchGolden(goldenManifestPath string) error {
-	got := pc.h.ReadManifest()
-	return pc.ShouldMatchGolden(goldenManifestPath, got)
-}
-
-// ManifestShouldNotExist returns an error when the lock exists.
-func (pc *TestProjectContext) ManifestShouldNotExist() error {
-	return pc.h.ShouldNotExist(pc.getManifestPath())
-}
-
-// ShouldMatchGolden returns an error when a file does not match the golden file.
-// goldenFile is the path to the golden file, relative to the testdata directory
-// Updates the golden file when -UpdateGolden flag is present
-func (pc *TestProjectContext) ShouldMatchGolden(goldenFile string, got string) error {
-	want := pc.h.GetTestFileString(goldenFile)
-	if want != got {
-		if *test.UpdateGolden {
-			if err := pc.h.WriteTestFile(goldenFile, got); err != nil {
-				return errors.Wrapf(err, "Unable to write updated golden file %s", goldenFile)
-			}
-		} else {
-			return errors.Errorf("expected %s, got %s", want, got)
-		}
-	}
-
-	return nil
-}
-
-// VendorShouldExist returns an error when the vendor directory does not exist.
-func (pc *TestProjectContext) VendorShouldExist() error {
-	return pc.h.ShouldExist(pc.getVendorPath())
-}
-
-// VendorFileShouldExist returns an error when the specified file does not exist in vendor.
-// filePath is the relative path to the file within vendor
-func (pc *TestProjectContext) VendorFileShouldExist(filePath string) error {
-	fullPath := filepath.Join(pc.getVendorPath(), filePath)
-	return pc.h.ShouldExist(fullPath)
-}
-
-// VendorShouldNotExist returns an error when the vendor directory exists.
-func (pc *TestProjectContext) VendorShouldNotExist() error {
-	return pc.h.ShouldNotExist(pc.getVendorPath())
-}
-
-// Release cleans up after test objects created by this instance
-func (pc *TestProjectContext) Release() {
-	if pc.SourceManager != nil {
-		pc.SourceManager.Release()
-	}
-}
diff --git a/installer/vendor/github.com/golang/dep/testdata/analyzer/Gopkg.toml b/installer/vendor/github.com/golang/dep/testdata/analyzer/Gopkg.toml
deleted file mode 100644
index a86104fe52..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/analyzer/Gopkg.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-[[constraint]]
-  name = "github.com/golang/dep"
-  version = ">=0.12.0, <1.0.0"
-
-[[constraint]]
-  name = "github.com/pkg/errors"
-  version = ">=0.8.0, <1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/testdata/lock/error0.toml b/installer/vendor/github.com/golang/dep/testdata/lock/error0.toml
deleted file mode 100644
index 80eb22b1be..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/lock/error0.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-[solve-meta]
-  inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
-
-[[projects]]
-  name = "github.com/golang/dep"
-  branch = "master"
-  version = "v0.12.0"
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-  packages = ["."]
diff --git a/installer/vendor/github.com/golang/dep/testdata/lock/error1.toml b/installer/vendor/github.com/golang/dep/testdata/lock/error1.toml
deleted file mode 100644
index 2d83237fc9..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/lock/error1.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[[projects]]
-  name = "github.com/golang/dep"
-  branch = "master"
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-  packages = ["."]
-
-[solve-meta]
-  inputs-digest = "000aaa2a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
diff --git a/installer/vendor/github.com/golang/dep/testdata/lock/error2.toml b/installer/vendor/github.com/golang/dep/testdata/lock/error2.toml
deleted file mode 100644
index f692f4d976..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/lock/error2.toml
+++ /dev/null
@@ -1,6 +0,0 @@
-[[projects]]
-  name = "github.com/golang/dep"
-  packages = ["."]
-
-[solve-meta]
-  inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
diff --git a/installer/vendor/github.com/golang/dep/testdata/lock/golden0.toml b/installer/vendor/github.com/golang/dep/testdata/lock/golden0.toml
deleted file mode 100644
index 2ba4a82d5d..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/lock/golden0.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[[projects]]
-  branch = "master"
-  name = "github.com/golang/dep"
-  packages = ["."]
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-
-[solve-meta]
-  analyzer-name = ""
-  analyzer-version = 0
-  inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
-  solver-name = ""
-  solver-version = 0
diff --git a/installer/vendor/github.com/golang/dep/testdata/lock/golden1.toml b/installer/vendor/github.com/golang/dep/testdata/lock/golden1.toml
deleted file mode 100644
index 1a0e183a47..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/lock/golden1.toml
+++ /dev/null
@@ -1,13 +0,0 @@
-
-[[projects]]
-  name = "github.com/golang/dep"
-  packages = ["."]
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-  version = "0.12.2"
-
-[solve-meta]
-  analyzer-name = ""
-  analyzer-version = 0
-  inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
-  solver-name = ""
-  solver-version = 0
diff --git a/installer/vendor/github.com/golang/dep/testdata/manifest/error1.toml b/installer/vendor/github.com/golang/dep/testdata/manifest/error1.toml
deleted file mode 100644
index fddf02a2b0..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/manifest/error1.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-ignored = ["github.com/foo/bar"]
-
-[[constraint]]
-  name = "github.com/golang/dep"
-  branch = "master"
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-  version = "^v0.12.0"
-  source = "https://github.com/golang/dep"
-
-[[override]]
-  name = "github.com/golang/dep"
-  branch = "master"
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-  version = "^v0.12.0"
-  source = "https://github.com/golang/dep"
diff --git a/installer/vendor/github.com/golang/dep/testdata/manifest/error2.toml b/installer/vendor/github.com/golang/dep/testdata/manifest/error2.toml
deleted file mode 100644
index 6b1408362d..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/manifest/error2.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-ignored = ["github.com/foo/bar"]
-
-[[constraint]]
-  name = "github.com/golang/dep"
-  branch = "master"
-
-[[constraint]]
-  name = "github.com/golang/dep"
-  branch = "master"
diff --git a/installer/vendor/github.com/golang/dep/testdata/manifest/error3.toml b/installer/vendor/github.com/golang/dep/testdata/manifest/error3.toml
deleted file mode 100644
index 4d96624be0..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/manifest/error3.toml
+++ /dev/null
@@ -1,9 +0,0 @@
-ignored = ["github.com/foo/bar"]
-
-[[override]]
-  name = "github.com/golang/dep"
-  branch = "master"
-
-[[override]]
-  name = "github.com/golang/dep"
-  branch = "master"
diff --git a/installer/vendor/github.com/golang/dep/testdata/manifest/golden.toml b/installer/vendor/github.com/golang/dep/testdata/manifest/golden.toml
deleted file mode 100644
index 8614f1fdd7..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/manifest/golden.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-ignored = ["github.com/foo/bar"]
-
-[[constraint]]
-  name = "github.com/babble/brook"
-  revision = "d05d5aca9f895d19e9265839bffeadd74a2d2ecb"
-
-[[constraint]]
-  name = "github.com/golang/dep/internal/gps"
-  version = "0.12.0"
-
-[[override]]
-  branch = "master"
-  name = "github.com/golang/dep/internal/gps"
-  source = "https://github.com/golang/dep/internal/gps"
diff --git a/installer/vendor/github.com/golang/dep/testdata/rootfind/Gopkg.toml b/installer/vendor/github.com/golang/dep/testdata/rootfind/Gopkg.toml
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/testdata/rootfind/subdir/.gitkeep b/installer/vendor/github.com/golang/dep/testdata/rootfind/subdir/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/badinput_fileroot b/installer/vendor/github.com/golang/dep/testdata/txn_writer/badinput_fileroot
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_diff_output.txt b/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_diff_output.txt
deleted file mode 100644
index bbfe78f82b..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_diff_output.txt
+++ /dev/null
@@ -1,31 +0,0 @@
-Memo: 595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c -> 2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e
-
-Add:
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/stuff/realthing"
-  packages = ["."]
-  revision = "1f02e52d6bac308da54ab84a234c58a98ca82347"
-  version = "2.0.0"
-
-Remove:
-[[projects]]
-  name = "github.com/stuff/placeholder"
-  packages = ["."]
-  revision = "6694017eeb4e20fd277b049bf29dba4895c97234"
-  version = "2.0.0"
-
-Modify:
-[[projects]]
-  branch = "- master"
-  name = "github.com/foo/bar"
-  packages = ["- placeholder","+ thing"]
-  revision = "f24338400f072ef18125ae0fbe6b06fe6d1783e7 -> 2a3a211e171803acb82d1d5d42ceb53228f51751"
-  source = "+ http://github.example.com/foo/bar"
-  version = "+ 1.2.0"
-
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_lock.toml b/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_lock.toml
deleted file mode 100644
index 8c9310fd3b..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_lock.toml
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/sdboyer/dep-test"
-  packages = ["."]
-  revision = "2a3a211e171803acb82d1d5d42ceb53228f51751"
-  version = "1.0.0"
-
-[solve-meta]
-  analyzer-name = ""
-  analyzer-version = 0
-  inputs-digest = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
-  solver-name = ""
-  solver-version = 0
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_manifest.toml b/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_manifest.toml
deleted file mode 100644
index 6b0c8ea43c..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/txn_writer/expected_manifest.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
-[[constraint]]
-  name = "github.com/sdboyer/dep-test"
-  version = "1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/original_lock.toml b/installer/vendor/github.com/golang/dep/testdata/txn_writer/original_lock.toml
deleted file mode 100644
index 2651064873..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/txn_writer/original_lock.toml
+++ /dev/null
@@ -1,14 +0,0 @@
-[solve-meta]
-  inputs-digest = "595716d270828e763c811ef79c9c41f85b1d1bfbdfe85280036405c03772206c"
-
-[[projects]]
-  name = "github.com/foo/bar"
-  branch = "master"
-  revision = "f24338400f072ef18125ae0fbe6b06fe6d1783e7"
-  packages = ["placeholder", "util"]
-
-[[projects]]
-  name = "github.com/stuff/placeholder"
-  version = "2.0.0"
-  revision = "6694017eeb4e20fd277b049bf29dba4895c97234"
-  packages = ["."]
diff --git a/installer/vendor/github.com/golang/dep/testdata/txn_writer/updated_lock.toml b/installer/vendor/github.com/golang/dep/testdata/txn_writer/updated_lock.toml
deleted file mode 100644
index 81ae83ba34..0000000000
--- a/installer/vendor/github.com/golang/dep/testdata/txn_writer/updated_lock.toml
+++ /dev/null
@@ -1,21 +0,0 @@
-[solve-meta]
-  inputs-digest = "2252a285ab27944a4d7adcba8dbd03980f59ba652f12db39fa93b927c345593e"
-
-[[projects]]
-  name = "github.com/foo/bar"
-  source = "http://github.example.com/foo/bar"
-  version = "1.2.0"
-  revision = "2a3a211e171803acb82d1d5d42ceb53228f51751"
-  packages = ["thing","util"]
-
-[[projects]]
-  name = "github.com/stuff/realthing"
-  version = "2.0.0"
-  revision = "1f02e52d6bac308da54ab84a234c58a98ca82347"
-  packages = ["."]
-
-[[projects]]
-  name = "github.com/sdboyer/deptest"
-  packages = ["."]
-  revision = "ff2948a2ac8f538c4ecd55962e919d1e13e74baf"
-  version = "v1.0.0"
diff --git a/installer/vendor/github.com/golang/dep/txn_writer_test.go b/installer/vendor/github.com/golang/dep/txn_writer_test.go
deleted file mode 100644
index 141e1f8cc1..0000000000
--- a/installer/vendor/github.com/golang/dep/txn_writer_test.go
+++ /dev/null
@@ -1,593 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dep
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/golang/dep/internal/test"
-	"github.com/pkg/errors"
-)
-
-const safeWriterProject = "safewritertest"
-const safeWriterGoldenManifest = "txn_writer/expected_manifest.toml"
-const safeWriterGoldenLock = "txn_writer/expected_lock.toml"
-
-func TestSafeWriter_BadInput_MissingRoot(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-
-	sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
-	err := sw.Write("", pc.SourceManager, true, discardLogger())
-
-	if err == nil {
-		t.Fatal("should have errored without a root path, but did not")
-	} else if !strings.Contains(err.Error(), "root path") {
-		t.Fatalf("expected root path error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_BadInput_MissingSourceManager(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(nil, nil, pc.Project.Lock, VendorAlways)
-	err := sw.Write(pc.Project.AbsRoot, nil, true, discardLogger())
-
-	if err == nil {
-		t.Fatal("should have errored without a source manager when forceVendor is true, but did not")
-	} else if !strings.Contains(err.Error(), "SourceManager") {
-		t.Fatalf("expected SourceManager error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_BadInput_ForceVendorMissingLock(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-
-	_, err := NewSafeWriter(nil, nil, nil, VendorAlways)
-	if err == nil {
-		t.Fatal("should have errored without a lock when forceVendor is true, but did not")
-	} else if !strings.Contains(err.Error(), "newLock") {
-		t.Fatalf("expected newLock error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_BadInput_OldLockOnly(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	_, err := NewSafeWriter(nil, pc.Project.Lock, nil, VendorAlways)
-	if err == nil {
-		t.Fatal("should have errored with only an old lock, but did not")
-	} else if !strings.Contains(err.Error(), "oldLock") {
-		t.Fatalf("expected oldLock error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_BadInput_NonexistentRoot(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-
-	sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
-
-	missingroot := filepath.Join(pc.Project.AbsRoot, "nonexistent")
-	err := sw.Write(missingroot, pc.SourceManager, true, discardLogger())
-
-	if err == nil {
-		t.Fatal("should have errored with nonexistent dir for root path, but did not")
-	} else if !strings.Contains(err.Error(), "does not exist") {
-		t.Fatalf("expected does not exist error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_BadInput_RootIsFile(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-
-	sw, _ := NewSafeWriter(nil, nil, nil, VendorOnChanged)
-
-	fileroot := pc.CopyFile("fileroot", "txn_writer/badinput_fileroot")
-	err := sw.Write(fileroot, pc.SourceManager, true, discardLogger())
-
-	if err == nil {
-		t.Fatal("should have errored when root path is a file, but did not")
-	} else if !strings.Contains(err.Error(), "does not exist") {
-		t.Fatalf("expected does not exist error, got %s", err.Error())
-	}
-}
-
-func TestSafeWriter_Manifest(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(ManifestName, safeWriterGoldenManifest)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(pc.Project.Manifest, nil, nil, VendorOnChanged)
-
-	// Verify prepared actions
-	if !sw.HasManifest() {
-		t.Fatal("Expected the payload to contain the manifest")
-	}
-	if sw.HasLock() {
-		t.Fatal("Did not expect the payload to contain the lock")
-	}
-	if sw.writeVendor {
-		t.Fatal("Did not expect the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldMatchGolden(safeWriterGoldenManifest); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_ManifestAndUnmodifiedLock(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(ManifestName, safeWriterGoldenManifest)
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(pc.Project.Manifest, pc.Project.Lock, pc.Project.Lock, VendorOnChanged)
-
-	// Verify prepared actions
-	if !sw.HasManifest() {
-		t.Fatal("Expected the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock.")
-	}
-	if sw.writeLock {
-		t.Fatal("Did not expect that the writer should plan to write the lock")
-	}
-	if sw.writeVendor {
-		t.Fatal("Did not expect the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldMatchGolden(safeWriterGoldenManifest); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_ManifestAndUnmodifiedLockWithForceVendor(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(ManifestName, safeWriterGoldenManifest)
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(pc.Project.Manifest, pc.Project.Lock, pc.Project.Lock, VendorAlways)
-
-	// Verify prepared actions
-	if !sw.HasManifest() {
-		t.Fatal("Expected the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if sw.writeLock {
-		t.Fatal("Did not expect that the writer should plan to write the lock")
-	}
-	if !sw.writeVendor {
-		t.Fatal("Expected the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldMatchGolden(safeWriterGoldenManifest); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorFileShouldExist("github.com/sdboyer/dep-test"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_ModifiedLock(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	originalLock := new(Lock)
-	*originalLock = *pc.Project.Lock
-	originalLock.SolveMeta.InputsDigest = []byte{} // zero out the input hash to ensure non-equivalency
-	sw, _ := NewSafeWriter(nil, originalLock, pc.Project.Lock, VendorOnChanged)
-
-	// Verify prepared actions
-	if sw.HasManifest() {
-		t.Fatal("Did not expect the manifest to be written")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if !sw.writeLock {
-		t.Fatal("Expected that the writer should plan to write the lock")
-	}
-	if !sw.writeVendor {
-		t.Fatal("Expected that the writer should plan to write the vendor directory")
-	}
-
-	// Write changes
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorFileShouldExist("github.com/sdboyer/dep-test"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_ModifiedLockSkipVendor(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	originalLock := new(Lock)
-	*originalLock = *pc.Project.Lock
-	originalLock.SolveMeta.InputsDigest = []byte{} // zero out the input hash to ensure non-equivalency
-	sw, _ := NewSafeWriter(nil, originalLock, pc.Project.Lock, VendorNever)
-
-	// Verify prepared actions
-	if sw.HasManifest() {
-		t.Fatal("Did not expect the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if !sw.writeLock {
-		t.Fatal("Expected that the writer should plan to write the lock")
-	}
-	if sw.writeVendor {
-		t.Fatal("Did not expect the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_ForceVendorWhenVendorAlreadyExists(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(nil, pc.Project.Lock, pc.Project.Lock, VendorAlways)
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify prepared actions
-	sw, _ = NewSafeWriter(nil, nil, pc.Project.Lock, VendorAlways)
-	if sw.HasManifest() {
-		t.Fatal("Did not expect the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if !sw.writeLock {
-		t.Fatal("Expected that the writer should plan to write the lock")
-	}
-	if !sw.writeVendor {
-		t.Fatal("Expected the payload to contain the vendor directory ")
-	}
-
-	err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorFileShouldExist("github.com/sdboyer/dep-test"); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_NewLock(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.Load()
-
-	lf := h.GetTestFile(safeWriterGoldenLock)
-	defer lf.Close()
-	newLock, err := readLock(lf)
-	h.Must(err)
-	sw, _ := NewSafeWriter(nil, nil, newLock, VendorOnChanged)
-
-	// Verify prepared actions
-	if sw.HasManifest() {
-		t.Fatal("Did not expect the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if !sw.writeLock {
-		t.Fatal("Expected that the writer should plan to write the lock")
-	}
-	if !sw.writeVendor {
-		t.Fatal("Expected the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_NewLockSkipVendor(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.Load()
-
-	lf := h.GetTestFile(safeWriterGoldenLock)
-	defer lf.Close()
-	newLock, err := readLock(lf)
-	h.Must(err)
-	sw, _ := NewSafeWriter(nil, nil, newLock, VendorNever)
-
-	// Verify prepared actions
-	if sw.HasManifest() {
-		t.Fatal("Did not expect the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if !sw.writeLock {
-		t.Fatal("Expected that the writer should plan to write the lock")
-	}
-	if sw.writeVendor {
-		t.Fatal("Did not expect the payload to contain the vendor directory")
-	}
-
-	// Write changes
-	err = sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldNotExist(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSafeWriter_DiffLocks(t *testing.T) {
-	test.NeedsExternalNetwork(t)
-	test.NeedsGit(t)
-
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-	pc.CopyFile(LockName, "txn_writer/original_lock.toml")
-	pc.Load()
-
-	ulf := h.GetTestFile("txn_writer/updated_lock.toml")
-	defer ulf.Close()
-	updatedLock, err := readLock(ulf)
-	h.Must(err)
-
-	sw, _ := NewSafeWriter(nil, pc.Project.Lock, updatedLock, VendorOnChanged)
-
-	// Verify lock diff
-	diff := sw.lockDiff
-	if diff == nil {
-		t.Fatal("Expected the payload to contain a diff of the lock files")
-	}
-
-	output, err := formatLockDiff(*diff)
-	h.Must(err)
-	goldenOutput := "txn_writer/expected_diff_output.txt"
-	if err = pc.ShouldMatchGolden(goldenOutput, output); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestHasDotGit(t *testing.T) {
-	// Create a tempdir with .git file
-	td, err := ioutil.TempDir(os.TempDir(), "dotGitFile")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(td)
-
-	os.OpenFile(td+string(filepath.Separator)+".git", os.O_CREATE, 0777)
-	if !hasDotGit(td) {
-		t.Fatal("Expected hasDotGit to find .git")
-	}
-}
-
-func TestSafeWriter_VendorDotGitPreservedWithForceVendor(t *testing.T) {
-	h := test.NewHelper(t)
-	defer h.Cleanup()
-
-	pc := NewTestProjectContext(h, safeWriterProject)
-	defer pc.Release()
-
-	gitDirPath := filepath.Join(pc.Project.AbsRoot, "vendor", ".git")
-	os.MkdirAll(gitDirPath, 0777)
-	dummyFile := filepath.Join("vendor", ".git", "badinput_fileroot")
-	pc.CopyFile(dummyFile, "txn_writer/badinput_fileroot")
-	pc.CopyFile(ManifestName, safeWriterGoldenManifest)
-	pc.CopyFile(LockName, safeWriterGoldenLock)
-	pc.Load()
-
-	sw, _ := NewSafeWriter(pc.Project.Manifest, pc.Project.Lock, pc.Project.Lock, VendorAlways)
-
-	// Verify prepared actions
-	if !sw.HasManifest() {
-		t.Fatal("Expected the payload to contain the manifest")
-	}
-	if !sw.HasLock() {
-		t.Fatal("Expected the payload to contain the lock")
-	}
-	if sw.writeLock {
-		t.Fatal("Did not expect that the writer should plan to write the lock")
-	}
-	if !sw.writeVendor {
-		t.Fatal("Expected the payload to contain the vendor directory")
-	}
-
-	err := sw.Write(pc.Project.AbsRoot, pc.SourceManager, true, discardLogger())
-	h.Must(errors.Wrap(err, "SafeWriter.Write failed"))
-
-	// Verify file system changes
-	if err := pc.ManifestShouldMatchGolden(safeWriterGoldenManifest); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.LockShouldMatchGolden(safeWriterGoldenLock); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorShouldExist(); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorFileShouldExist("github.com/sdboyer/dep-test"); err != nil {
-		t.Fatal(err)
-	}
-	if err := pc.VendorFileShouldExist(".git/badinput_fileroot"); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/.travis.yml b/installer/vendor/github.com/golang/lint/.travis.yml
deleted file mode 100644
index 09fb310e64..0000000000
--- a/installer/vendor/github.com/golang/lint/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-sudo: false
-language: go
-go:
-  - 1.7.x
-  - 1.8.x
-  - master
-
-install:
-  - go get -t -v ./...
-
-script:
-  - go test -v -race ./...
-
-matrix:
-  allow_failures:
-    - go: master
-  fast_finish: true
diff --git a/installer/vendor/github.com/golang/lint/CONTRIBUTING.md b/installer/vendor/github.com/golang/lint/CONTRIBUTING.md
deleted file mode 100644
index 971da126ec..0000000000
--- a/installer/vendor/github.com/golang/lint/CONTRIBUTING.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Contributing to Golint
-
-## Before filing an issue:
-
-### Are you having trouble building golint?
-
-Check you have the latest version of its dependencies. Run
-```
-go get -u github.com/golang/lint
-```
-If you still have problems, consider searching for existing issues before filing a new issue.
-
-## Before sending a pull request:
-
-Have you understood the purpose of golint? Make sure to carefully read `README`.
diff --git a/installer/vendor/github.com/golang/lint/README.md b/installer/vendor/github.com/golang/lint/README.md
deleted file mode 100644
index 3593ddd992..0000000000
--- a/installer/vendor/github.com/golang/lint/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-Golint is a linter for Go source code.
-
-[![Build Status](https://travis-ci.org/golang/lint.svg?branch=master)](https://travis-ci.org/golang/lint)
-
-## Installation
-
-Golint requires Go 1.6 or later.
-
-    go get -u github.com/golang/lint/golint
-
-## Usage
-
-Invoke `golint` with one or more filenames, directories, or packages named
-by its import path. Golint uses the same
-[import path syntax](https://golang.org/cmd/go/#hdr-Import_path_syntax) as
-the `go` command and therefore
-also supports relative import paths like `./...`. Additionally the `...`
-wildcard can be used as suffix on relative and absolute file paths to recurse
-into them.
-
-The output of this tool is a list of suggestions in Vim quickfix format,
-which is accepted by lots of different editors.
-
-## Purpose
-
-Golint differs from gofmt. Gofmt reformats Go source code, whereas
-golint prints out style mistakes.
-
-Golint differs from govet. Govet is concerned with correctness, whereas
-golint is concerned with coding style. Golint is in use at Google, and it
-seeks to match the accepted style of the open source Go project.
-
-The suggestions made by golint are exactly that: suggestions.
-Golint is not perfect, and has both false positives and false negatives.
-Do not treat its output as a gold standard. We will not be adding pragmas
-or other knobs to suppress specific warnings, so do not expect or require
-code to be completely "lint-free".
-In short, this tool is not, and will never be, trustworthy enough for its
-suggestions to be enforced automatically, for example as part of a build process.
-Golint makes suggestions for many of the mechanically checkable items listed in
-[Effective Go](https://golang.org/doc/effective_go.html) and the
-[CodeReviewComments wiki page](https://golang.org/wiki/CodeReviewComments).
-
-If you find an established style that is frequently violated, and which
-you think golint could statically check,
-[file an issue](https://github.com/golang/lint/issues).
-
-## Contributions
-
-Contributions to this project are welcome, though please send mail before
-starting work on anything major. Contributors retain their copyright, so we
-need you to fill out
-[a short form](https://developers.google.com/open-source/cla/individual)
-before we can accept your contribution.
-
-## Vim
-
-Add this to your ~/.vimrc:
-
-    set rtp+=$GOPATH/src/github.com/golang/lint/misc/vim
-
-If you have multiple entries in your GOPATH, replace `$GOPATH` with the right value.
-
-Running `:Lint` will run golint on the current file and populate the quickfix list.
-
-Optionally, add this to your `~/.vimrc` to automatically run `golint` on `:w`
-
-    autocmd BufWritePost,FileWritePost *.go execute 'Lint' | cwindow
-
-
-## Emacs
-
-Add this to your `.emacs` file:
-
-    (add-to-list 'load-path (concat (getenv "GOPATH")  "/src/github.com/golang/lint/misc/emacs"))
-    (require 'golint)
-
-If you have multiple entries in your GOPATH, replace `$GOPATH` with the right value.
-
-Running M-x golint will run golint on the current file.
-
-For more usage, see [Compilation-Mode](http://www.gnu.org/software/emacs/manual/html_node/emacs/Compilation-Mode.html).
diff --git a/installer/vendor/github.com/golang/lint/golint/golint.go b/installer/vendor/github.com/golang/lint/golint/golint.go
index d8360ad310..ac024b6d26 100644
--- a/installer/vendor/github.com/golang/lint/golint/golint.go
+++ b/installer/vendor/github.com/golang/lint/golint/golint.go
@@ -16,7 +16,7 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/golang/lint"
+	"golang.org/x/lint"
 )
 
 var (
diff --git a/installer/vendor/github.com/golang/lint/golint/import.go b/installer/vendor/github.com/golang/lint/golint/import.go
index 02a0daa61a..2ba9dea779 100644
--- a/installer/vendor/github.com/golang/lint/golint/import.go
+++ b/installer/vendor/github.com/golang/lint/golint/import.go
@@ -22,11 +22,10 @@ import (
 	"strings"
 )
 
-var buildContext = build.Default
-
 var (
-	goroot    = filepath.Clean(runtime.GOROOT())
-	gorootSrc = filepath.Join(goroot, "src")
+	buildContext = build.Default
+	goroot       = filepath.Clean(runtime.GOROOT())
+	gorootSrc    = filepath.Join(goroot, "src")
 )
 
 // importPathsNoDotExpansion returns the import paths to use for the given
diff --git a/installer/vendor/github.com/golang/lint/lint_test.go b/installer/vendor/github.com/golang/lint/lint_test.go
deleted file mode 100644
index 92db5968e4..0000000000
--- a/installer/vendor/github.com/golang/lint/lint_test.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright (c) 2013 The Go Authors. All rights reserved.
-//
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file or at
-// https://developers.google.com/open-source/licenses/bsd.
-
-package lint
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"path"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-var lintMatch = flag.String("lint.match", "", "restrict testdata matches to this pattern")
-
-func TestAll(t *testing.T) {
-	l := new(Linter)
-	rx, err := regexp.Compile(*lintMatch)
-	if err != nil {
-		t.Fatalf("Bad -lint.match value %q: %v", *lintMatch, err)
-	}
-
-	baseDir := "testdata"
-	fis, err := ioutil.ReadDir(baseDir)
-	if err != nil {
-		t.Fatalf("ioutil.ReadDir: %v", err)
-	}
-	if len(fis) == 0 {
-		t.Fatalf("no files in %v", baseDir)
-	}
-	for _, fi := range fis {
-		if !rx.MatchString(fi.Name()) {
-			continue
-		}
-		//t.Logf("Testing %s", fi.Name())
-		src, err := ioutil.ReadFile(path.Join(baseDir, fi.Name()))
-		if err != nil {
-			t.Fatalf("Failed reading %s: %v", fi.Name(), err)
-		}
-
-		ins := parseInstructions(t, fi.Name(), src)
-		if ins == nil {
-			t.Errorf("Test file %v does not have instructions", fi.Name())
-			continue
-		}
-
-		ps, err := l.Lint(fi.Name(), src)
-		if err != nil {
-			t.Errorf("Linting %s: %v", fi.Name(), err)
-			continue
-		}
-
-		for _, in := range ins {
-			ok := false
-			for i, p := range ps {
-				if p.Position.Line != in.Line {
-					continue
-				}
-				if in.Match.MatchString(p.Text) {
-					// check replacement if we are expecting one
-					if in.Replacement != "" {
-						// ignore any inline comments, since that would be recursive
-						r := p.ReplacementLine
-						if i := strings.Index(r, " //"); i >= 0 {
-							r = r[:i]
-						}
-						if r != in.Replacement {
-							t.Errorf("Lint failed at %s:%d; got replacement %q, want %q", fi.Name(), in.Line, r, in.Replacement)
-						}
-					}
-
-					// remove this problem from ps
-					copy(ps[i:], ps[i+1:])
-					ps = ps[:len(ps)-1]
-
-					//t.Logf("/%v/ matched at %s:%d", in.Match, fi.Name(), in.Line)
-					ok = true
-					break
-				}
-			}
-			if !ok {
-				t.Errorf("Lint failed at %s:%d; /%v/ did not match", fi.Name(), in.Line, in.Match)
-			}
-		}
-		for _, p := range ps {
-			t.Errorf("Unexpected problem at %s:%d: %v", fi.Name(), p.Position.Line, p.Text)
-		}
-	}
-}
-
-type instruction struct {
-	Line        int            // the line number this applies to
-	Match       *regexp.Regexp // what pattern to match
-	Replacement string         // what the suggested replacement line should be
-}
-
-// parseInstructions parses instructions from the comments in a Go source file.
-// It returns nil if none were parsed.
-func parseInstructions(t *testing.T, filename string, src []byte) []instruction {
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, filename, src, parser.ParseComments)
-	if err != nil {
-		t.Fatalf("Test file %v does not parse: %v", filename, err)
-	}
-	var ins []instruction
-	for _, cg := range f.Comments {
-		ln := fset.Position(cg.Pos()).Line
-		raw := cg.Text()
-		for _, line := range strings.Split(raw, "\n") {
-			if line == "" || strings.HasPrefix(line, "#") {
-				continue
-			}
-			if line == "OK" && ins == nil {
-				// so our return value will be non-nil
-				ins = make([]instruction, 0)
-				continue
-			}
-			if strings.Contains(line, "MATCH") {
-				rx, err := extractPattern(line)
-				if err != nil {
-					t.Fatalf("At %v:%d: %v", filename, ln, err)
-				}
-				matchLine := ln
-				if i := strings.Index(line, "MATCH:"); i >= 0 {
-					// This is a match for a different line.
-					lns := strings.TrimPrefix(line[i:], "MATCH:")
-					lns = lns[:strings.Index(lns, " ")]
-					matchLine, err = strconv.Atoi(lns)
-					if err != nil {
-						t.Fatalf("Bad match line number %q at %v:%d: %v", lns, filename, ln, err)
-					}
-				}
-				var repl string
-				if r, ok := extractReplacement(line); ok {
-					repl = r
-				}
-				ins = append(ins, instruction{
-					Line:        matchLine,
-					Match:       rx,
-					Replacement: repl,
-				})
-			}
-		}
-	}
-	return ins
-}
-
-func extractPattern(line string) (*regexp.Regexp, error) {
-	a, b := strings.Index(line, "/"), strings.LastIndex(line, "/")
-	if a == -1 || a == b {
-		return nil, fmt.Errorf("malformed match instruction %q", line)
-	}
-	pat := line[a+1 : b]
-	rx, err := regexp.Compile(pat)
-	if err != nil {
-		return nil, fmt.Errorf("bad match pattern %q: %v", pat, err)
-	}
-	return rx, nil
-}
-
-func extractReplacement(line string) (string, bool) {
-	// Look for this:  / -> `
-	// (the end of a match and start of a backtick string),
-	// and then the closing backtick.
-	const start = "/ -> `"
-	a, b := strings.Index(line, start), strings.LastIndex(line, "`")
-	if a < 0 || a > b {
-		return "", false
-	}
-	return line[a+len(start) : b], true
-}
-
-func render(fset *token.FileSet, x interface{}) string {
-	var buf bytes.Buffer
-	if err := printer.Fprint(&buf, fset, x); err != nil {
-		panic(err)
-	}
-	return buf.String()
-}
-
-func TestLine(t *testing.T) {
-	tests := []struct {
-		src    string
-		offset int
-		want   string
-	}{
-		{"single line file", 5, "single line file"},
-		{"single line file with newline\n", 5, "single line file with newline\n"},
-		{"first\nsecond\nthird\n", 2, "first\n"},
-		{"first\nsecond\nthird\n", 9, "second\n"},
-		{"first\nsecond\nthird\n", 14, "third\n"},
-		{"first\nsecond\nthird with no newline", 16, "third with no newline"},
-		{"first byte\n", 0, "first byte\n"},
-	}
-	for _, test := range tests {
-		got := srcLine([]byte(test.src), token.Position{Offset: test.offset})
-		if got != test.want {
-			t.Errorf("srcLine(%q, offset=%d) = %q, want %q", test.src, test.offset, got, test.want)
-		}
-	}
-}
-
-func TestLintName(t *testing.T) {
-	tests := []struct {
-		name, want string
-	}{
-		{"foo_bar", "fooBar"},
-		{"foo_bar_baz", "fooBarBaz"},
-		{"Foo_bar", "FooBar"},
-		{"foo_WiFi", "fooWiFi"},
-		{"id", "id"},
-		{"Id", "ID"},
-		{"foo_id", "fooID"},
-		{"fooId", "fooID"},
-		{"fooUid", "fooUID"},
-		{"idFoo", "idFoo"},
-		{"uidFoo", "uidFoo"},
-		{"midIdDle", "midIDDle"},
-		{"APIProxy", "APIProxy"},
-		{"ApiProxy", "APIProxy"},
-		{"apiProxy", "apiProxy"},
-		{"_Leading", "_Leading"},
-		{"___Leading", "_Leading"},
-		{"trailing_", "trailing"},
-		{"trailing___", "trailing"},
-		{"a_b", "aB"},
-		{"a__b", "aB"},
-		{"a___b", "aB"},
-		{"Rpc1150", "RPC1150"},
-		{"case3_1", "case3_1"},
-		{"case3__1", "case3_1"},
-		{"IEEE802_16bit", "IEEE802_16bit"},
-		{"IEEE802_16Bit", "IEEE802_16Bit"},
-	}
-	for _, test := range tests {
-		got := lintName(test.name)
-		if got != test.want {
-			t.Errorf("lintName(%q) = %q, want %q", test.name, got, test.want)
-		}
-	}
-}
-
-func TestExportedType(t *testing.T) {
-	tests := []struct {
-		typString string
-		exp       bool
-	}{
-		{"int", true},
-		{"string", false}, // references the shadowed builtin "string"
-		{"T", true},
-		{"t", false},
-		{"*T", true},
-		{"*t", false},
-		{"map[int]complex128", true},
-	}
-	for _, test := range tests {
-		src := `package foo; type T int; type t int; type string struct{}`
-		fset := token.NewFileSet()
-		file, err := parser.ParseFile(fset, "foo.go", src, 0)
-		if err != nil {
-			t.Fatalf("Parsing %q: %v", src, err)
-		}
-		// use the package name as package path
-		config := &types.Config{}
-		pkg, err := config.Check(file.Name.Name, fset, []*ast.File{file}, nil)
-		if err != nil {
-			t.Fatalf("Type checking %q: %v", src, err)
-		}
-		tv, err := types.Eval(fset, pkg, token.NoPos, test.typString)
-		if err != nil {
-			t.Errorf("types.Eval(%q): %v", test.typString, err)
-			continue
-		}
-		if got := exportedType(tv.Type); got != test.exp {
-			t.Errorf("exportedType(%v) = %t, want %t", tv.Type, got, test.exp)
-		}
-	}
-}
-
-func TestIsGenerated(t *testing.T) {
-	tests := []struct {
-		source    string
-		generated bool
-	}{
-		{"// Code Generated by some tool. DO NOT EDIT.", false},
-		{"// Code generated by some tool. DO NOT EDIT.", true},
-		{"// Code generated by some tool. DO NOT EDIT", false},
-		{"// Code generated  DO NOT EDIT.", true},
-		{"// Code generated DO NOT EDIT.", false},
-		{"\t\t// Code generated by some tool. DO NOT EDIT.\npackage foo\n", false},
-		{"// Code generated by some tool. DO NOT EDIT.\npackage foo\n", true},
-		{"package foo\n// Code generated by some tool. DO NOT EDIT.\ntype foo int\n", true},
-		{"package foo\n // Code generated by some tool. DO NOT EDIT.\ntype foo int\n", false},
-		{"package foo\n// Code generated by some tool. DO NOT EDIT. \ntype foo int\n", false},
-		{"package foo\ntype foo int\n// Code generated by some tool. DO NOT EDIT.\n", true},
-		{"package foo\ntype foo int\n// Code generated by some tool. DO NOT EDIT.", true},
-	}
-
-	for i, test := range tests {
-		got := isGenerated([]byte(test.source))
-		if got != test.generated {
-			t.Errorf("test %d, isGenerated() = %v, want %v", i, got, test.generated)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/misc/emacs/golint.el b/installer/vendor/github.com/golang/lint/misc/emacs/golint.el
deleted file mode 100644
index d015e3716d..0000000000
--- a/installer/vendor/github.com/golang/lint/misc/emacs/golint.el
+++ /dev/null
@@ -1,53 +0,0 @@
-;;; golint.el --- lint for the Go source code
-
-;; Copyright 2013 The Go Authors. All rights reserved.
-;; Use of this source code is governed by a BSD-style
-;; license that can be found in the LICENSE file.
-
-;; URL: https://github.com/golang/lint
-
-;;; Commentary:
-
-;; To install golint, add the following lines to your .emacs file:
-;;   (add-to-list 'load-path "PATH CONTAINING golint.el" t)
-;;   (require 'golint)
-;;
-;; After this, type M-x golint on Go source code.
-;;
-;; Usage:
-;;   C-x `
-;;     Jump directly to the line in your code which caused the first message.
-;; 
-;;   For more usage, see Compilation-Mode:
-;;     http://www.gnu.org/software/emacs/manual/html_node/emacs/Compilation-Mode.html
-
-;;; Code:
-(require 'compile)
-
-(defun go-lint-buffer-name (mode) 
- "*Golint*") 
-
-(defun golint-process-setup ()
-  "Setup compilation variables and buffer for `golint'."
-  (run-hooks 'golint-setup-hook))
-
-(define-compilation-mode golint-mode "golint"
-  "Golint is a linter for Go source code."
-  (set (make-local-variable 'compilation-scroll-output) nil)
-  (set (make-local-variable 'compilation-disable-input) t)
-  (set (make-local-variable 'compilation-process-setup-function)
-       'golint-process-setup)
-)
-
-;;;###autoload
-(defun golint ()
-  "Run golint on the current file and populate the fix list. Pressing C-x ` will jump directly to the line in your code which caused the first message."
-  (interactive)
-  (compilation-start
-   (mapconcat #'shell-quote-argument
-              (list "golint" (expand-file-name buffer-file-name)) " ")
-   'golint-mode))
-
-(provide 'golint)
-
-;;; golint.el ends here
diff --git a/installer/vendor/github.com/golang/lint/misc/vim/ftplugin/go/lint.vim b/installer/vendor/github.com/golang/lint/misc/vim/ftplugin/go/lint.vim
deleted file mode 100644
index 7dffd18176..0000000000
--- a/installer/vendor/github.com/golang/lint/misc/vim/ftplugin/go/lint.vim
+++ /dev/null
@@ -1,31 +0,0 @@
-" Copyright 2013 The Go Authors. All rights reserved.
-" Use of this source code is governed by a BSD-style
-" license that can be found in the LICENSE file.
-"
-" lint.vim: Vim command to lint Go files with golint.
-"
-"   https://github.com/golang/lint
-"
-" This filetype plugin add a new commands for go buffers:
-"
-"   :Lint
-"
-"       Run golint for the current Go file.
-"
-if exists("b:did_ftplugin_go_lint")
-    finish
-endif
-
-if !executable("golint")
-    finish
-endif
-
-command! -buffer Lint call s:GoLint()
-
-function! s:GoLint() abort
-    cexpr system('golint ' . shellescape(expand('%')))
-endfunction
-
-let b:did_ftplugin_go_lint = 1
-
-" vim:ts=4:sw=4:et
diff --git a/installer/vendor/github.com/golang/lint/testdata/4.go b/installer/vendor/github.com/golang/lint/testdata/4.go
deleted file mode 100644
index c9a6e89963..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/4.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Test that exported names have correct comments.
-
-// Package pkg does something.
-package pkg
-
-import "time"
-
-type T int // MATCH /exported type T.*should.*comment.*or.*unexport/
-
-func (T) F() {} // MATCH /exported method T\.F.*should.*comment.*or.*unexport/
-
-// this is a nice type.
-// MATCH /comment.*exported type U.*should.*form.*"U ..."/
-type U string
-
-// this is a neat function.
-// MATCH /comment.*exported method U\.G.*should.*form.*"G ..."/
-func (U) G() {}
-
-// A V is a string.
-type V string
-
-// V.H has a pointer receiver
-
-func (*V) H() {} // MATCH /exported method V\.H.*should.*comment.*or.*unexport/
-
-var W = "foo" // MATCH /exported var W.*should.*comment.*or.*unexport/
-
-const X = "bar" // MATCH /exported const X.*should.*comment.*or.*unexport/
-
-var Y, Z int // MATCH /exported var Z.*own declaration/
-
-// Location should be okay, since the other var name is an underscore.
-var Location, _ = time.LoadLocation("Europe/Istanbul") // not Constantinople
-
-// this is improperly documented
-// MATCH /comment.*const.*Thing.*form.*"Thing ..."/
-const Thing = "wonderful"
diff --git a/installer/vendor/github.com/golang/lint/testdata/5_test.go b/installer/vendor/github.com/golang/lint/testdata/5_test.go
deleted file mode 100644
index af174587c0..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/5_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// This file ends in _test.go, so we should not warn about doc comments.
-// OK
-
-package pkg
-
-import "testing"
-
-type H int
-
-func TestSomething(t *testing.T) {
-}
-
-func TestSomething_suffix(t *testing.T) {
-}
-
-func ExampleBuffer_reader() {
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/blank-import-lib.go b/installer/vendor/github.com/golang/lint/testdata/blank-import-lib.go
deleted file mode 100644
index fe1eb5008a..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/blank-import-lib.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Test that blank imports in library packages are flagged.
-
-// Package foo ...
-package foo
-
-// The instructions need to go before the imports below so they will not be
-// mistaken for documentation.
-
-/* MATCH /blank import/ */ import _ "encoding/json"
-
-import (
-	"fmt"
-
-	/* MATCH /blank import/ */ _ "os"
-
-	/* MATCH /blank import/ */ _ "net/http"
-	_ "path"
-)
-
-import _ "encoding/base64" // Don't gripe about this
-
-import (
-	// Don't gripe about these next two lines.
-	_ "compress/zlib"
-	_ "syscall"
-
-	/* MATCH /blank import/ */ _ "path/filepath"
-)
-
-import (
-	"go/ast"
-	_ "go/scanner" // Don't gripe about this or the following line.
-	_ "go/token"
-)
-
-var (
-	_ fmt.Stringer // for "fmt"
-	_ ast.Node     // for "go/ast"
-)
diff --git a/installer/vendor/github.com/golang/lint/testdata/blank-import-lib_test.go b/installer/vendor/github.com/golang/lint/testdata/blank-import-lib_test.go
deleted file mode 100644
index abbf7d74df..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/blank-import-lib_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Test that blank imports in test packages are not flagged.
-// OK
-
-// Package foo ...
-package foo
-
-// These are essentially the same imports as in the "library" package, but
-// these should not trigger the warning because this is a test.
-
-import _ "encoding/json"
-
-import (
-	"fmt"
-	"testing"
-
-	_ "os"
-
-	_ "net/http"
-	_ "path"
-)
-
-var (
-	_ fmt.Stringer // for "fmt"
-	_ testing.T    // for "testing"
-)
diff --git a/installer/vendor/github.com/golang/lint/testdata/blank-import-main.go b/installer/vendor/github.com/golang/lint/testdata/blank-import-main.go
deleted file mode 100644
index 6ec3a2423e..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/blank-import-main.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test that blank imports in package main are not flagged.
-// OK
-
-// Binary foo ...
-package main
-
-import _ "fmt"
-
-import (
-	"os"
-	_ "path"
-)
-
-var _ os.File // for "os"
diff --git a/installer/vendor/github.com/golang/lint/testdata/broken.go b/installer/vendor/github.com/golang/lint/testdata/broken.go
deleted file mode 100644
index 6543775c5a..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/broken.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test of code that is malformed, but accepted by go/parser.
-// See https://golang.org/issue/11271 for discussion.
-// OK
-
-// Package pkg ...
-package pkg
-
-// Foo is a method with a missing receiver.
-func () Foo() {}
diff --git a/installer/vendor/github.com/golang/lint/testdata/common-methods.go b/installer/vendor/github.com/golang/lint/testdata/common-methods.go
deleted file mode 100644
index c0bb1363a5..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/common-methods.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Test that we don't nag for comments on common methods.
-// OK
-
-// Package pkg ...
-package pkg
-
-import "net/http"
-
-// T is ...
-type T int
-
-func (T) Error() string                                    { return "" }
-func (T) String() string                                   { return "" }
-func (T) ServeHTTP(w http.ResponseWriter, r *http.Request) {}
-func (T) Read(p []byte) (n int, err error)                 { return 0, nil }
-func (T) Write(p []byte) (n int, err error)                { return 0, nil }
diff --git a/installer/vendor/github.com/golang/lint/testdata/const-block.go b/installer/vendor/github.com/golang/lint/testdata/const-block.go
deleted file mode 100644
index 4b89d6f60e..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/const-block.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Test for docs in const blocks
-
-// Package foo ...
-package foo
-
-const (
-	// Prefix for something.
-	// MATCH /InlineWhatever.*form/
-	InlineWhatever = "blah"
-
-	Whatsit = "missing_comment" // MATCH /Whatsit.*should have comment.*block/
-
-	// We should only warn once per block for missing comments,
-	// but always complain about malformed comments.
-
-	WhosYourDaddy = "another_missing_one"
-
-	// Something
-	// MATCH /WhatDoesHeDo.*form/
-	WhatDoesHeDo = "it's not a tumor!"
-)
-
-// These shouldn't need doc comments.
-const (
-	Alpha = "a"
-	Beta  = "b"
-	Gamma = "g"
-)
-
-// The comment on the previous const block shouldn't flow through to here.
-
-const UndocAgain = 6 // MATCH /UndocAgain.*should have comment/
-
-const (
-	SomeUndocumented = 7 // MATCH /SomeUndocumented.*should have comment.*block/
-)
diff --git a/installer/vendor/github.com/golang/lint/testdata/context.go b/installer/vendor/github.com/golang/lint/testdata/context.go
deleted file mode 100644
index 501c69b409..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/context.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Test that context.Context is the first arg to a function.
-
-// Package foo ...
-package foo
-
-import (
-	"context"
-)
-
-// A proper context.Context location
-func x(ctx context.Context) { // ok
-}
-
-// A proper context.Context location
-func x(ctx context.Context, s string) { // ok
-}
-
-// An invalid context.Context location
-func y(s string, ctx context.Context) { // MATCH /context.Context should be the first parameter.*/
-}
-
-// An invalid context.Context location with more than 2 args
-func y(s string, r int, ctx context.Context, x int) { // MATCH /context.Context should be the first parameter.*/
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/contextkeytypes.go b/installer/vendor/github.com/golang/lint/testdata/contextkeytypes.go
deleted file mode 100644
index 68dc36a4a7..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/contextkeytypes.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Package contextkeytypes verifies that correct types are used as keys in
-// calls to context.WithValue.
-package contextkeytypes
-
-import (
-	"context"
-	"fmt"
-)
-
-type ctxKey struct{}
-
-func contextKeyTypeTests() {
-	fmt.Println()                               // not in package context
-	context.TODO()                              // wrong function
-	c := context.Background()                   // wrong function
-	context.WithValue(c, "foo", "bar")          // MATCH /should not use basic type( untyped|)? string as key in context.WithValue/
-	context.WithValue(c, true, "bar")           // MATCH /should not use basic type( untyped|)? bool as key in context.WithValue/
-	context.WithValue(c, 1, "bar")              // MATCH /should not use basic type( untyped|)? int as key in context.WithValue/
-	context.WithValue(c, int8(1), "bar")        // MATCH /should not use basic type int8 as key in context.WithValue/
-	context.WithValue(c, int16(1), "bar")       // MATCH /should not use basic type int16 as key in context.WithValue/
-	context.WithValue(c, int32(1), "bar")       // MATCH /should not use basic type int32 as key in context.WithValue/
-	context.WithValue(c, rune(1), "bar")        // MATCH /should not use basic type rune as key in context.WithValue/
-	context.WithValue(c, int64(1), "bar")       // MATCH /should not use basic type int64 as key in context.WithValue/
-	context.WithValue(c, uint(1), "bar")        // MATCH /should not use basic type uint as key in context.WithValue/
-	context.WithValue(c, uint8(1), "bar")       // MATCH /should not use basic type uint8 as key in context.WithValue/
-	context.WithValue(c, byte(1), "bar")        // MATCH /should not use basic type byte as key in context.WithValue/
-	context.WithValue(c, uint16(1), "bar")      // MATCH /should not use basic type uint16 as key in context.WithValue/
-	context.WithValue(c, uint32(1), "bar")      // MATCH /should not use basic type uint32 as key in context.WithValue/
-	context.WithValue(c, uint64(1), "bar")      // MATCH /should not use basic type uint64 as key in context.WithValue/
-	context.WithValue(c, uintptr(1), "bar")     // MATCH /should not use basic type uintptr as key in context.WithValue/
-	context.WithValue(c, float32(1.0), "bar")   // MATCH /should not use basic type float32 as key in context.WithValue/
-	context.WithValue(c, float64(1.0), "bar")   // MATCH /should not use basic type float64 as key in context.WithValue/
-	context.WithValue(c, complex64(1i), "bar")  // MATCH /should not use basic type complex64 as key in context.WithValue/
-	context.WithValue(c, complex128(1i), "bar") // MATCH /should not use basic type complex128 as key in context.WithValue/
-	context.WithValue(c, ctxKey{}, "bar")       // ok
-	context.WithValue(c, &ctxKey{}, "bar")      // ok
-	context.WithValue(c, invalid{}, "bar")      // ok
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/else-multi.go b/installer/vendor/github.com/golang/lint/testdata/else-multi.go
deleted file mode 100644
index 98f39a3eb5..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/else-multi.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Test of return+else warning; should not trigger on multi-branch if/else.
-// OK
-
-// Package pkg ...
-package pkg
-
-import "log"
-
-func f(x int) bool {
-	if x == 0 {
-		log.Print("x is zero")
-	} else if x > 0 {
-		return true
-	} else {
-		log.Printf("non-positive x: %d", x)
-	}
-	return false
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/else.go b/installer/vendor/github.com/golang/lint/testdata/else.go
deleted file mode 100644
index 515c043d30..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/else.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Test of return+else warning.
-
-// Package pkg ...
-package pkg
-
-import "log"
-
-func f(x int) bool {
-	if x > 0 {
-		return true
-	} else { // MATCH /if.*return.*else.*outdent/
-		log.Printf("non-positive x: %d", x)
-	}
-	return false
-}
-
-func g(f func() bool) string {
-	if ok := f(); ok {
-		return "it's okay"
-	} else { // MATCH /if.*return.*else.*outdent.*short.*var.*declaration/
-		return "it's NOT okay!"
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/error-return.go b/installer/vendor/github.com/golang/lint/testdata/error-return.go
deleted file mode 100644
index 446a64c81a..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/error-return.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Test for returning errors.
-
-// Package foo ...
-package foo
-
-// Returns nothing
-func f() { // ok
-}
-
-// Check for a single error return
-func g() error { // ok
-	return nil
-}
-
-// Check for a single other return type
-func h() int { // ok
-	return 0
-}
-
-// Check for multiple return but error at end.
-func i() (int, error) { // ok
-	return 0, nil
-}
-
-// Check for multiple return but error at end with named variables.
-func j() (x int, err error) { // ok
-	return 0, nil
-}
-
-// Check for error in the wrong location on 2 types
-func k() (error, int) { // MATCH /error should be the last type/
-	return nil, 0
-}
-
-// Check for error in the wrong location for > 2 types
-func l() (int, error, int) { // MATCH /error should be the last type/
-	return 0, nil, 0
-}
-
-// Check for error in the wrong location with named variables.
-func m() (x int, err error, y int) { // MATCH /error should be the last type/
-	return 0, nil, 0
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/errorf.go b/installer/vendor/github.com/golang/lint/testdata/errorf.go
deleted file mode 100644
index 72161f2b9e..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/errorf.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Test for not using fmt.Errorf or testing.Errorf.
-
-// Package foo ...
-package foo
-
-import (
-	"errors"
-	"fmt"
-	"testing"
-)
-
-func f(x int) error {
-	if x > 10 {
-		return errors.New(fmt.Sprintf("something %d", x)) // MATCH /should replace.*errors\.New\(fmt\.Sprintf\(\.\.\.\)\).*fmt\.Errorf\(\.\.\.\)/ -> `		return fmt.Errorf("something %d", x)`
-	}
-	if x > 5 {
-		return errors.New(g("blah")) // ok
-	}
-	if x > 4 {
-		return errors.New("something else") // ok
-	}
-	return nil
-}
-
-// TestF is a dummy test
-func TestF(t *testing.T) error {
-	x := 1
-	if x > 10 {
-		return t.Error(fmt.Sprintf("something %d", x)) // MATCH /should replace.*t\.Error\(fmt\.Sprintf\(\.\.\.\)\).*t\.Errorf\(\.\.\.\)/
-	}
-	if x > 5 {
-		return t.Error(g("blah")) // ok
-	}
-	if x > 4 {
-		return t.Error("something else") // ok
-	}
-	return nil
-}
-
-func g(s string) string { return "prefix: " + s }
diff --git a/installer/vendor/github.com/golang/lint/testdata/errors.go b/installer/vendor/github.com/golang/lint/testdata/errors.go
deleted file mode 100644
index 3435bf8574..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/errors.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Test for naming errors.
-
-// Package foo ...
-package foo
-
-import (
-	"errors"
-	"fmt"
-)
-
-var unexp = errors.New("some unexported error") // MATCH /error var.*unexp.*errFoo/
-
-// Exp ...
-var Exp = errors.New("some exported error") // MATCH /error var.*Exp.*ErrFoo/
-
-var (
-	e1 = fmt.Errorf("blah %d", 4) // MATCH /error var.*e1.*errFoo/
-	// E2 ...
-	E2 = fmt.Errorf("blah %d", 5) // MATCH /error var.*E2.*ErrFoo/
-)
-
-func f() {
-	var whatever = errors.New("ok") // ok
-	_ = whatever
-}
-
-// Check for the error strings themselves.
-
-func g(x int) error {
-	var err error
-	err = fmt.Errorf("This %d is too low", x)     // MATCH /error strings.*be capitalized/
-	err = fmt.Errorf("XML time")                  // ok
-	err = fmt.Errorf("newlines are fun\n")        // MATCH /error strings.*end with punctuation/
-	err = fmt.Errorf("Newlines are really fun\n") // MATCH /error strings.+not be capitalized/
-	err = errors.New(`too much stuff.`)           // MATCH /error strings.*end with punctuation/
-	return err
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/iferr.go b/installer/vendor/github.com/golang/lint/testdata/iferr.go
deleted file mode 100644
index 920fa9ea58..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/iferr.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Test of redundant if err != nil
-
-// Package pkg ...
-package pkg
-
-func f() error {
-	if err := f(); err != nil {
-		g()
-		return err
-	}
-	return nil
-}
-
-func g() error {
-	if err := f(); err != nil { // MATCH /redundant/
-		return err
-	}
-	return nil
-}
-
-func h() error {
-	if err, x := f(), 1; err != nil {
-		return err
-	}
-	return nil
-}
-
-func i() error {
-	a := 1
-	if err := f(); err != nil {
-		a++
-		return err
-	}
-	return nil
-}
-
-func j() error {
-	var a error
-	if err := f(); err != nil {
-		return err
-	}
-	return a
-}
-
-func k() error {
-	if err := f(); err != nil {
-		// TODO: handle error better
-		return err
-	}
-	return nil
-}
-
-func l() (interface{}, error) {
-	if err := f(); err != nil {
-		return nil, err
-	}
-	if err := f(); err != nil {
-		return nil, err
-	}
-	if err := f(); err != nil {
-		return nil, err
-	}
-	// Phew, it worked
-	return nil
-}
-
-func m() error {
-	if err := f(); err != nil {
-		return err
-	}
-	if err := f(); err != nil {
-		return err
-	}
-	if err := f(); err != nil {
-		return err
-	}
-	// Phew, it worked again.
-	return nil
-}
-
-func multi() error {
-	a := 0
-	var err error
-	// unreachable code after return statements is intentional to check that it
-	// doesn't confuse the linter.
-	if true {
-		a++
-		if err := f(); err != nil { // MATCH /redundant/
-			return err
-		}
-		return nil
-		a++
-	} else {
-		a++
-		if err = f(); err != nil { // MATCH /redundant/
-			return err
-		}
-		return nil
-		a++
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/import-dot.go b/installer/vendor/github.com/golang/lint/testdata/import-dot.go
deleted file mode 100644
index 879de26734..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/import-dot.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Test that dot imports are flagged.
-
-// Package pkg ...
-package pkg
-
-import . "fmt" // MATCH /dot import/
-
-var _ Stringer // from "fmt"
diff --git a/installer/vendor/github.com/golang/lint/testdata/inc.go b/installer/vendor/github.com/golang/lint/testdata/inc.go
deleted file mode 100644
index 3868beea11..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/inc.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Test for use of x++ and x--.
-
-// Package pkg ...
-package pkg
-
-func addOne(x int) int {
-	x += 1 // MATCH /x\+\+/
-	return x
-}
-
-func subOneInLoop(y int) {
-	for ; y > 0; y -= 1 { // MATCH /y--/
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/names.go b/installer/vendor/github.com/golang/lint/testdata/names.go
deleted file mode 100644
index 0ec1520421..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/names.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Test for name linting.
-
-// Package pkg_with_underscores ...
-package pkg_with_underscores // MATCH /underscore.*package name/
-
-import (
-	"io"
-	"net"
-	net_http "net/http" // renamed deliberately
-	"net/url"
-)
-
-import "C"
-
-var var_name int // MATCH /underscore.*var.*var_name/
-
-type t_wow struct { // MATCH /underscore.*type.*t_wow/
-	x_damn int      // MATCH /underscore.*field.*x_damn/
-	Url    *url.URL // MATCH /struct field.*Url.*URL/
-}
-
-const fooId = "blah" // MATCH /fooId.*fooID/
-
-func f_it() { // MATCH /underscore.*func.*f_it/
-	more_underscore := 4 // MATCH /underscore.*var.*more_underscore/
-	_ = more_underscore
-	var err error
-	if isEof := (err == io.EOF); isEof { // MATCH /var.*isEof.*isEOF/
-		more_underscore = 7 // should be okay
-	}
-
-	x := net_http.Request{} // should be okay
-	_ = x
-
-	var ips []net.IP
-	for _, theIp := range ips { // MATCH /range var.*theIp.*theIP/
-		_ = theIp
-	}
-
-	switch myJson := g(); { // MATCH /var.*myJson.*myJSON/
-	default:
-		_ = myJson
-	}
-	var y net_http.ResponseWriter // an interface
-	switch tApi := y.(type) {     // MATCH /var.*tApi.*tAPI/
-	default:
-		_ = tApi
-	}
-
-	var c chan int
-	select {
-	case qId := <-c: // MATCH /var.*qId.*qID/
-		_ = qId
-	}
-}
-
-// Common styles in other languages that don't belong in Go.
-const (
-	CPP_CONST   = 1 // MATCH /ALL_CAPS.*CamelCase/
-	kLeadingKay = 2 // MATCH /k.*leadingKay/
-
-	HTML  = 3 // okay; no underscore
-	X509B = 4 // ditto
-)
-
-func f(bad_name int)                    {}            // MATCH /underscore.*func parameter.*bad_name/
-func g() (no_way int)                   { return 0 }  // MATCH /underscore.*func result.*no_way/
-func (t *t_wow) f(more_under string)    {}            // MATCH /underscore.*method parameter.*more_under/
-func (t *t_wow) g() (still_more string) { return "" } // MATCH /underscore.*method result.*still_more/
-
-type i interface {
-	CheckHtml() string // okay; interface method names are often constrained by the concrete types' method names
-
-	F(foo_bar int) // MATCH /foo_bar.*fooBar/
-}
-
-// All okay; underscore between digits
-const case1_1 = 1
-
-type case2_1 struct {
-	case2_2 int
-}
-
-func case3_1(case3_2 int) (case3_3 string) {
-	case3_4 := 4
-	_ = case3_4
-
-	return ""
-}
-
-type t struct{}
-
-func (t) LastInsertId() (int64, error) { return 0, nil } // okay because it matches a known style violation
-
-//export exported_to_c
-func exported_to_c() {} // okay: https://github.com/golang/lint/issues/144
-
-//export exported_to_c_with_arg
-func exported_to_c_with_arg(but_use_go_param_names int) // MATCH /underscore.*func parameter.*but_use_go_param_names/
-
-// This is an exported C function with a leading doc comment.
-//
-//export exported_to_c_with_comment
-func exported_to_c_with_comment() {} // okay: https://github.com/golang/lint/issues/144
-
-//export maybe_exported_to_CPlusPlusWithCamelCase
-func maybe_exported_to_CPlusPlusWithCamelCase() {} // okay: https://github.com/golang/lint/issues/144
-
-// WhyAreYouUsingCapitalLetters_InACFunctionName is a Go-exported function that
-// is also exported to C as a name with underscores.
-//
-// Don't do that. If you want to use a C-style name for a C export, make it
-// lower-case and leave it out of the Go-exported API.
-//
-//export WhyAreYouUsingCapitalLetters_InACFunctionName
-func WhyAreYouUsingCapitalLetters_InACFunctionName() {} // MATCH /underscore.*func.*Why.*CFunctionName/
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-doc1.go b/installer/vendor/github.com/golang/lint/testdata/pkg-doc1.go
deleted file mode 100644
index 8197a8ee0f..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-doc1.go
+++ /dev/null
@@ -1,3 +0,0 @@
-// Test of missing package comment.
-
-package foo // MATCH /should.*package comment.*unless/
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-doc2.go b/installer/vendor/github.com/golang/lint/testdata/pkg-doc2.go
deleted file mode 100644
index c61febd0e9..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-doc2.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Test of package comment in an incorrect form.
-
-// Some random package doc that isn't in the right form.
-// MATCH /package comment should.*form.*"Package testdata .*"/
-package testdata
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-doc3.go b/installer/vendor/github.com/golang/lint/testdata/pkg-doc3.go
deleted file mode 100644
index 95e814e0a4..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-doc3.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test of block package comment.
-// OK
-
-/*
-Package foo is pretty sweet.
-*/
-package foo
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-doc4.go b/installer/vendor/github.com/golang/lint/testdata/pkg-doc4.go
deleted file mode 100644
index 23448dec31..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-doc4.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Test of block package comment with leading space.
-
-/*
- Package foo is pretty sweet.
-MATCH /package comment.*leading space/
-*/
-package foo
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-doc5.go b/installer/vendor/github.com/golang/lint/testdata/pkg-doc5.go
deleted file mode 100644
index cbe5d1e6c9..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-doc5.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Test of detached package comment.
-
-/*
-Package foo is pretty sweet.
-*/
-
-package foo
-
-// MATCH:6 /package comment.*detached/
diff --git a/installer/vendor/github.com/golang/lint/testdata/pkg-main.go b/installer/vendor/github.com/golang/lint/testdata/pkg-main.go
deleted file mode 100644
index c261945d69..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/pkg-main.go
+++ /dev/null
@@ -1,5 +0,0 @@
-// Test of package comment for package main.
-// OK
-
-// This binary does something awesome.
-package main
diff --git a/installer/vendor/github.com/golang/lint/testdata/range.go b/installer/vendor/github.com/golang/lint/testdata/range.go
deleted file mode 100644
index af36a82e02..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/range.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Test for range construction.
-
-// Package foo ...
-package foo
-
-func f() {
-	var m map[string]int
-
-	// with :=
-	for x, _ := range m { // MATCH /should omit 2nd value.*range.*equivalent.*for x := range/ -> `	for x := range m {`
-		_ = x
-	}
-	// with =
-	var y string
-	_ = y
-	for y, _ = range m { // MATCH /should omit 2nd value.*range.*equivalent.*for y = range/
-	}
-
-	// all OK:
-	for x := range m {
-		_ = x
-	}
-	for x, y := range m {
-		_, _ = x, y
-	}
-	for _, y := range m {
-		_ = y
-	}
-	var x int
-	_ = x
-	for y = range m {
-	}
-	for y, x = range m {
-	}
-	for _, x = range m {
-	}
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/receiver-names.go b/installer/vendor/github.com/golang/lint/testdata/receiver-names.go
deleted file mode 100644
index 6e513279b5..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/receiver-names.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Test for bad receiver names.
-
-// Package foo ...
-package foo
-
-type foo struct{}
-
-func (this foo) f1() { // MATCH /should be a reflection of its identity/
-}
-
-func (self foo) f2() { // MATCH /should be a reflection of its identity/
-}
-
-func (f foo) f3() {
-}
-
-func (foo) f4() {
-}
-
-type bar struct{}
-
-func (b bar) f1() {
-}
-
-func (b bar) f2() {
-}
-
-func (a bar) f3() { // MATCH /receiver name a should be consistent with previous receiver name b for bar/
-}
-
-func (a *bar) f4() { // MATCH /receiver name a should be consistent with previous receiver name b for bar/
-}
-
-func (b *bar) f5() {
-}
-
-func (bar) f6() {
-}
-
-func (_ *bar) f7() { // MATCH /receiver name should not be an underscore/
-}
-
-type multiError struct{}
-
-func (me multiError) f8() {
-}
-
-// Regression test for a panic caused by ill-formed receiver type.
-func (recv []*x.y) f()
diff --git a/installer/vendor/github.com/golang/lint/testdata/sort.go b/installer/vendor/github.com/golang/lint/testdata/sort.go
deleted file mode 100644
index c099049428..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/sort.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Test that we don't ask for comments on sort.Interface methods.
-
-// Package pkg ...
-package pkg
-
-// T is ...
-type T []int
-
-// Len by itself should get documented.
-
-func (t T) Len() int { return len(t) } // MATCH /exported method T\.Len.*should.*comment/
-
-// U is ...
-type U []int
-
-func (u U) Len() int           { return len(u) }
-func (u U) Less(i, j int) bool { return u[i] < u[j] }
-func (u U) Swap(i, j int)      { u[i], u[j] = u[j], u[i] }
-
-func (u U) Other() {} // MATCH /exported method U\.Other.*should.*comment/
diff --git a/installer/vendor/github.com/golang/lint/testdata/stutter.go b/installer/vendor/github.com/golang/lint/testdata/stutter.go
deleted file mode 100644
index 3e6b13e7b0..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/stutter.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Test of stuttery names.
-
-// Package donut ...
-package donut
-
-// DonutMaker makes donuts.
-type DonutMaker struct{} // MATCH /donut\.DonutMaker.*stutter/
-
-// DonutRank computes the ranking of a donut.
-func DonutRank(d Donut) int { // MATCH /donut\.DonutRank.*stutter/
-	return 0
-}
-
-// Donut is a delicious treat.
-type Donut struct{} // ok because it is the whole name
-
-// Donuts are great, aren't they?
-type Donuts []Donut // ok because it didn't start a new word
-
-type donutGlaze int // ok because it is unexported
-
-// DonutMass reports the mass of a donut.
-func (d *Donut) DonutMass() (grams int) { // okay because it is a method
-	return 38
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/time.go b/installer/vendor/github.com/golang/lint/testdata/time.go
deleted file mode 100644
index 9271acb6ae..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/time.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Test of time suffixes.
-
-// Package foo ...
-package foo
-
-import (
-	"flag"
-	"time"
-)
-
-var rpcTimeoutMsec = flag.Duration("rpc_timeout", 100*time.Millisecond, "some flag") // MATCH /Msec.*\*time.Duration/
-
-var timeoutSecs = 5 * time.Second // MATCH /Secs.*time.Duration/
diff --git a/installer/vendor/github.com/golang/lint/testdata/unexp-return.go b/installer/vendor/github.com/golang/lint/testdata/unexp-return.go
deleted file mode 100644
index 7fc9769f6d..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/unexp-return.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Test for unexported return types.
-
-// Package foo ...
-package foo
-
-import ()
-
-type hidden struct{}
-
-// Exported returns a hidden type, which is annoying.
-func Exported() hidden { // MATCH /Exported.*unexported.*hidden/
-	return hidden{}
-}
-
-// ExpErr returns a builtin type.
-func ExpErr() error { // ok
-}
-
-func (hidden) ExpOnHidden() hidden { // ok
-}
-
-// T is another test type.
-type T struct{}
-
-// MethodOnT returns a hidden type, which is annoying.
-func (T) MethodOnT() hidden { // MATCH /method MethodOnT.*unexported.*hidden/
-	return hidden{}
-}
-
-// ExpT returns a T.
-func ExpT() T { // ok
-	return T{}
-}
-
-func unexp() hidden { // ok
-	return hidden{}
-}
-
-// This is slightly sneaky: we shadow the builtin "int" type.
-
-type int struct{}
-
-// ExportedIntReturner returns an unexported type from this package.
-func ExportedIntReturner() int { // MATCH /ExportedIntReturner.*unexported.*int/
-	return int{}
-}
diff --git a/installer/vendor/github.com/golang/lint/testdata/var-decl.go b/installer/vendor/github.com/golang/lint/testdata/var-decl.go
deleted file mode 100644
index 9201d18c1a..0000000000
--- a/installer/vendor/github.com/golang/lint/testdata/var-decl.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Test for redundant type declaration.
-
-// Package foo ...
-package foo
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"nosuchpkg" // export data unavailable
-	"os"
-)
-
-// Q is a test type.
-type Q bool
-
-var myInt int = 7                           // MATCH /should.*int.*myInt.*inferred/
-var mux *http.ServeMux = http.NewServeMux() // MATCH /should.*\*http\.ServeMux.*inferred/
-
-var myZeroInt int = 0         // MATCH /should.*= 0.*myZeroInt.*zero value/
-var myZeroFlt float32 = 0.    // MATCH /should.*= 0\..*myZeroFlt.*zero value/
-var myZeroF64 float64 = 0.0   // MATCH /should.*= 0\..*myZeroF64.*zero value/
-var myZeroImg complex64 = 0i  // MATCH /should.*= 0i.*myZeroImg.*zero value/
-var myZeroStr string = ""     // MATCH /should.*= "".*myZeroStr.*zero value/
-var myZeroRaw string = ``     // MATCH /should.*= ``.*myZeroRaw.*zero value/
-var myZeroPtr *Q = nil        // MATCH /should.*= nil.*myZeroPtr.*zero value/
-var myZeroRune rune = '\x00'  // MATCH /should.*= '\\x00'.*myZeroRune.*zero value/
-var myZeroRune2 rune = '\000' // MATCH /should.*= '\\000'.*myZeroRune2.*zero value/
-
-// No warning because there's no type on the LHS
-var x = 0
-
-// This shouldn't get a warning because there's no initial values.
-var str fmt.Stringer
-
-// No warning because this is a const.
-const k uint64 = 7
-
-const num = 123
-
-// No warning because the var's RHS is known to be an untyped const.
-var flags uint32 = num
-
-// No warnings because the RHS is an ideal int, and the LHS is a different int type.
-var userID int64 = 1235
-var negID int64 = -1
-var parenID int64 = (17)
-var crazyID int64 = -(-(-(-9)))
-
-// Same, but for strings and floats.
-type stringT string
-type floatT float64
-
-var stringV stringT = "abc"
-var floatV floatT = 123.45
-
-// No warning because the LHS names an interface type.
-var data interface{} = googleIPs
-var googleIPs []int
-
-// No warning because it's a common idiom for interface satisfaction.
-var _ Server = (*serverImpl)(nil)
-
-// Server is a test type.
-type Server interface{}
-type serverImpl struct{}
-
-// LHS is a different type than the RHS.
-var myStringer fmt.Stringer = q(0)
-
-// LHS is a different type than the RHS.
-var out io.Writer = os.Stdout
-
-var out2 io.Writer = newWriter() // MATCH /should omit.*io\.Writer/
-
-func newWriter() io.Writer { return nil }
-
-// We don't figure out the true types of LHS and RHS here,
-// so we suppress the check.
-var ni nosuchpkg.Interface = nosuchpkg.NewConcrete()
-
-var y string = q(1).String() // MATCH /should.*string/
-
-type q int
-
-func (q) String() string { return "I'm a q" }
diff --git a/installer/vendor/github.com/golang/protobuf/.gitignore b/installer/vendor/github.com/golang/protobuf/.gitignore
deleted file mode 100644
index 8f5b596b14..0000000000
--- a/installer/vendor/github.com/golang/protobuf/.gitignore
+++ /dev/null
@@ -1,16 +0,0 @@
-.DS_Store
-*.[568ao]
-*.ao
-*.so
-*.pyc
-._*
-.nfs.*
-[568a].out
-*~
-*.orig
-core
-_obj
-_test
-_testmain.go
-protoc-gen-go/testdata/multi/*.pb.go
-_conformance/_conformance
diff --git a/installer/vendor/github.com/golang/protobuf/.travis.yml b/installer/vendor/github.com/golang/protobuf/.travis.yml
deleted file mode 100644
index 93c67805b9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/.travis.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-sudo: false
-language: go
-go:
-- 1.6.x
-- 1.7.x
-- 1.8.x
-- 1.9.x
-
-install:
-  - go get -v -d -t github.com/golang/protobuf/...
-  - curl -L https://github.com/google/protobuf/releases/download/v3.3.0/protoc-3.3.0-linux-x86_64.zip -o /tmp/protoc.zip
-  - unzip /tmp/protoc.zip -d $HOME/protoc
-
-env:
-  - PATH=$HOME/protoc/bin:$PATH
-
-script:
-  - make all test
diff --git a/installer/vendor/github.com/golang/protobuf/Make.protobuf b/installer/vendor/github.com/golang/protobuf/Make.protobuf
deleted file mode 100644
index 15071de101..0000000000
--- a/installer/vendor/github.com/golang/protobuf/Make.protobuf
+++ /dev/null
@@ -1,40 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Includable Makefile to add a rule for generating .pb.go files from .proto files
-# (Google protocol buffer descriptions).
-# Typical use if myproto.proto is a file in package mypackage in this directory:
-#
-#	include $(GOROOT)/src/pkg/github.com/golang/protobuf/Make.protobuf
-
-%.pb.go:	%.proto
-	protoc --go_out=. $<
-
diff --git a/installer/vendor/github.com/golang/protobuf/Makefile b/installer/vendor/github.com/golang/protobuf/Makefile
deleted file mode 100644
index a1421d8b73..0000000000
--- a/installer/vendor/github.com/golang/protobuf/Makefile
+++ /dev/null
@@ -1,55 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-all:	install
-
-install:
-	go install ./proto ./jsonpb ./ptypes
-	go install ./protoc-gen-go
-
-test:
-	go test ./proto ./jsonpb ./ptypes
-	make -C protoc-gen-go/testdata test
-
-clean:
-	go clean ./...
-
-nuke:
-	go clean -i ./...
-
-regenerate:
-	make -C protoc-gen-go/descriptor regenerate
-	make -C protoc-gen-go/plugin regenerate
-	make -C protoc-gen-go/testdata regenerate
-	make -C proto/testdata regenerate
-	make -C jsonpb/jsonpb_test_proto regenerate
-	make -C _conformance regenerate
diff --git a/installer/vendor/github.com/golang/protobuf/README.md b/installer/vendor/github.com/golang/protobuf/README.md
deleted file mode 100644
index 9c4c815c02..0000000000
--- a/installer/vendor/github.com/golang/protobuf/README.md
+++ /dev/null
@@ -1,244 +0,0 @@
-# Go support for Protocol Buffers
-
-[![Build Status](https://travis-ci.org/golang/protobuf.svg?branch=master)](https://travis-ci.org/golang/protobuf)
-[![GoDoc](https://godoc.org/github.com/golang/protobuf?status.svg)](https://godoc.org/github.com/golang/protobuf)
-
-Google's data interchange format.
-Copyright 2010 The Go Authors.
-https://github.com/golang/protobuf
-
-This package and the code it generates requires at least Go 1.4.
-
-This software implements Go bindings for protocol buffers.  For
-information about protocol buffers themselves, see
-	https://developers.google.com/protocol-buffers/
-
-## Installation ##
-
-To use this software, you must:
-- Install the standard C++ implementation of protocol buffers from
-	https://developers.google.com/protocol-buffers/
-- Of course, install the Go compiler and tools from
-	https://golang.org/
-  See
-	https://golang.org/doc/install
-  for details or, if you are using gccgo, follow the instructions at
-	https://golang.org/doc/install/gccgo
-- Grab the code from the repository and install the proto package.
-  The simplest way is to run `go get -u github.com/golang/protobuf/protoc-gen-go`.
-  The compiler plugin, protoc-gen-go, will be installed in $GOBIN,
-  defaulting to $GOPATH/bin.  It must be in your $PATH for the protocol
-  compiler, protoc, to find it.
-
-This software has two parts: a 'protocol compiler plugin' that
-generates Go source files that, once compiled, can access and manage
-protocol buffers; and a library that implements run-time support for
-encoding (marshaling), decoding (unmarshaling), and accessing protocol
-buffers.
-
-There is support for gRPC in Go using protocol buffers.
-See the note at the bottom of this file for details.
-
-There are no insertion points in the plugin.
-
-
-## Using protocol buffers with Go ##
-
-Once the software is installed, there are two steps to using it.
-First you must compile the protocol buffer definitions and then import
-them, with the support library, into your program.
-
-To compile the protocol buffer definition, run protoc with the --go_out
-parameter set to the directory you want to output the Go code to.
-
-	protoc --go_out=. *.proto
-
-The generated files will be suffixed .pb.go.  See the Test code below
-for an example using such a file.
-
-
-The package comment for the proto library contains text describing
-the interface provided in Go for protocol buffers. Here is an edited
-version.
-
-==========
-
-The proto package converts data structures to and from the
-wire format of protocol buffers.  It works in concert with the
-Go source code generated for .proto files by the protocol compiler.
-
-A summary of the properties of the protocol buffer interface
-for a protocol buffer variable v:
-
-  - Names are turned from camel_case to CamelCase for export.
-  - There are no methods on v to set fields; just treat
-  	them as structure fields.
-  - There are getters that return a field's value if set,
-	and return the field's default value if unset.
-	The getters work even if the receiver is a nil message.
-  - The zero value for a struct is its correct initialization state.
-	All desired fields must be set before marshaling.
-  - A Reset() method will restore a protobuf struct to its zero state.
-  - Non-repeated fields are pointers to the values; nil means unset.
-	That is, optional or required field int32 f becomes F *int32.
-  - Repeated fields are slices.
-  - Helper functions are available to aid the setting of fields.
-	Helpers for getting values are superseded by the
-	GetFoo methods and their use is deprecated.
-		msg.Foo = proto.String("hello") // set field
-  - Constants are defined to hold the default values of all fields that
-	have them.  They have the form Default_StructName_FieldName.
-	Because the getter methods handle defaulted values,
-	direct use of these constants should be rare.
-  - Enums are given type names and maps from names to values.
-	Enum values are prefixed with the enum's type name. Enum types have
-	a String method, and a Enum method to assist in message construction.
-  - Nested groups and enums have type names prefixed with the name of
-  	the surrounding message type.
-  - Extensions are given descriptor names that start with E_,
-	followed by an underscore-delimited list of the nested messages
-	that contain it (if any) followed by the CamelCased name of the
-	extension field itself.  HasExtension, ClearExtension, GetExtension
-	and SetExtension are functions for manipulating extensions.
-  - Oneof field sets are given a single field in their message,
-	with distinguished wrapper types for each possible field value.
-  - Marshal and Unmarshal are functions to encode and decode the wire format.
-
-When the .proto file specifies `syntax="proto3"`, there are some differences:
-
-  - Non-repeated fields of non-message type are values instead of pointers.
-  - Enum types do not get an Enum method.
-
-Consider file test.proto, containing
-
-```proto
-	syntax = "proto2";
-	package example;
-	
-	enum FOO { X = 17; };
-	
-	message Test {
-	  required string label = 1;
-	  optional int32 type = 2 [default=77];
-	  repeated int64 reps = 3;
-	  optional group OptionalGroup = 4 {
-	    required string RequiredField = 5;
-	  }
-	}
-```
-
-To create and play with a Test object from the example package,
-
-```go
-	package main
-
-	import (
-		"log"
-
-		"github.com/golang/protobuf/proto"
-		"path/to/example"
-	)
-
-	func main() {
-		test := &example.Test {
-			Label: proto.String("hello"),
-			Type:  proto.Int32(17),
-			Reps:  []int64{1, 2, 3},
-			Optionalgroup: &example.Test_OptionalGroup {
-				RequiredField: proto.String("good bye"),
-			},
-		}
-		data, err := proto.Marshal(test)
-		if err != nil {
-			log.Fatal("marshaling error: ", err)
-		}
-		newTest := &example.Test{}
-		err = proto.Unmarshal(data, newTest)
-		if err != nil {
-			log.Fatal("unmarshaling error: ", err)
-		}
-		// Now test and newTest contain the same data.
-		if test.GetLabel() != newTest.GetLabel() {
-			log.Fatalf("data mismatch %q != %q", test.GetLabel(), newTest.GetLabel())
-		}
-		// etc.
-	}
-```
-
-## Parameters ##
-
-To pass extra parameters to the plugin, use a comma-separated
-parameter list separated from the output directory by a colon:
-
-
-	protoc --go_out=plugins=grpc,import_path=mypackage:. *.proto
-
-
-- `import_prefix=xxx` - a prefix that is added onto the beginning of
-  all imports. Useful for things like generating protos in a
-  subdirectory, or regenerating vendored protobufs in-place.
-- `import_path=foo/bar` - used as the package if no input files
-  declare `go_package`. If it contains slashes, everything up to the
-  rightmost slash is ignored.
-- `plugins=plugin1+plugin2` - specifies the list of sub-plugins to
-  load. The only plugin in this repo is `grpc`.
-- `Mfoo/bar.proto=quux/shme` - declares that foo/bar.proto is
-  associated with Go package quux/shme.  This is subject to the
-  import_prefix parameter.
-
-## gRPC Support ##
-
-If a proto file specifies RPC services, protoc-gen-go can be instructed to
-generate code compatible with gRPC (http://www.grpc.io/). To do this, pass
-the `plugins` parameter to protoc-gen-go; the usual way is to insert it into
-the --go_out argument to protoc:
-
-	protoc --go_out=plugins=grpc:. *.proto
-
-## Compatibility ##
-
-The library and the generated code are expected to be stable over time.
-However, we reserve the right to make breaking changes without notice for the
-following reasons:
-
-- Security. A security issue in the specification or implementation may come to
-  light whose resolution requires breaking compatibility. We reserve the right
-  to address such security issues.
-- Unspecified behavior.  There are some aspects of the Protocol Buffers
-  specification that are undefined.  Programs that depend on such unspecified
-  behavior may break in future releases.
-- Specification errors or changes. If it becomes necessary to address an
-  inconsistency, incompleteness, or change in the Protocol Buffers
-  specification, resolving the issue could affect the meaning or legality of
-  existing programs.  We reserve the right to address such issues, including
-  updating the implementations.
-- Bugs.  If the library has a bug that violates the specification, a program
-  that depends on the buggy behavior may break if the bug is fixed.  We reserve
-  the right to fix such bugs.
-- Adding methods or fields to generated structs.  These may conflict with field
-  names that already exist in a schema, causing applications to break.  When the
-  code generator encounters a field in the schema that would collide with a
-  generated field or method name, the code generator will append an underscore
-  to the generated field or method name.
-- Adding, removing, or changing methods or fields in generated structs that
-  start with `XXX`.  These parts of the generated code are exported out of
-  necessity, but should not be considered part of the public API.
-- Adding, removing, or changing unexported symbols in generated code.
-
-Any breaking changes outside of these will be announced 6 months in advance to
-protobuf@googlegroups.com.
-
-You should, whenever possible, use generated code created by the `protoc-gen-go`
-tool built at the same commit as the `proto` package.  The `proto` package
-declares package-level constants in the form `ProtoPackageIsVersionX`.
-Application code and generated code may depend on one of these constants to
-ensure that compilation will fail if the available version of the proto library
-is too old.  Whenever we make a change to the generated code that requires newer
-library support, in the same commit we will increment the version number of the
-generated code and declare a new package-level constant whose name incorporates
-the latest version number.  Removing a compatibility constant is considered a
-breaking change and would be subject to the announcement policy stated above.
-
-The `protoc-gen-go/generator` package exposes a plugin interface,
-which is used by the gRPC code generation. This interface is not
-supported and is subject to incompatible changes without notice.
diff --git a/installer/vendor/github.com/golang/protobuf/_conformance/Makefile b/installer/vendor/github.com/golang/protobuf/_conformance/Makefile
deleted file mode 100644
index 89800e2d95..0000000000
--- a/installer/vendor/github.com/golang/protobuf/_conformance/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2016 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-regenerate:
-	protoc --go_out=Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/struct.proto=github.com/golang/protobuf/ptypes/struct,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers,Mgoogle/protobuf/field_mask.proto=google.golang.org/genproto/protobuf:. conformance_proto/conformance.proto
diff --git a/installer/vendor/github.com/golang/protobuf/_conformance/conformance.go b/installer/vendor/github.com/golang/protobuf/_conformance/conformance.go
deleted file mode 100644
index c54212c80d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/_conformance/conformance.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// conformance implements the conformance test subprocess protocol as
-// documented in conformance.proto.
-package main
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-
-	pb "github.com/golang/protobuf/_conformance/conformance_proto"
-	"github.com/golang/protobuf/jsonpb"
-	"github.com/golang/protobuf/proto"
-)
-
-func main() {
-	var sizeBuf [4]byte
-	inbuf := make([]byte, 0, 4096)
-	outbuf := proto.NewBuffer(nil)
-	for {
-		if _, err := io.ReadFull(os.Stdin, sizeBuf[:]); err == io.EOF {
-			break
-		} else if err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: read request:", err)
-			os.Exit(1)
-		}
-		size := binary.LittleEndian.Uint32(sizeBuf[:])
-		if int(size) > cap(inbuf) {
-			inbuf = make([]byte, size)
-		}
-		inbuf = inbuf[:size]
-		if _, err := io.ReadFull(os.Stdin, inbuf); err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: read request:", err)
-			os.Exit(1)
-		}
-
-		req := new(pb.ConformanceRequest)
-		if err := proto.Unmarshal(inbuf, req); err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: parse request:", err)
-			os.Exit(1)
-		}
-		res := handle(req)
-
-		if err := outbuf.Marshal(res); err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: marshal response:", err)
-			os.Exit(1)
-		}
-		binary.LittleEndian.PutUint32(sizeBuf[:], uint32(len(outbuf.Bytes())))
-		if _, err := os.Stdout.Write(sizeBuf[:]); err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: write response:", err)
-			os.Exit(1)
-		}
-		if _, err := os.Stdout.Write(outbuf.Bytes()); err != nil {
-			fmt.Fprintln(os.Stderr, "go conformance: write response:", err)
-			os.Exit(1)
-		}
-		outbuf.Reset()
-	}
-}
-
-var jsonMarshaler = jsonpb.Marshaler{
-	OrigName: true,
-}
-
-func handle(req *pb.ConformanceRequest) *pb.ConformanceResponse {
-	var err error
-	var msg pb.TestAllTypes
-	switch p := req.Payload.(type) {
-	case *pb.ConformanceRequest_ProtobufPayload:
-		err = proto.Unmarshal(p.ProtobufPayload, &msg)
-	case *pb.ConformanceRequest_JsonPayload:
-		err = jsonpb.UnmarshalString(p.JsonPayload, &msg)
-		if err != nil && err.Error() == "unmarshaling Any not supported yet" {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_Skipped{
-					Skipped: err.Error(),
-				},
-			}
-		}
-	default:
-		return &pb.ConformanceResponse{
-			Result: &pb.ConformanceResponse_RuntimeError{
-				RuntimeError: "unknown request payload type",
-			},
-		}
-	}
-	if err != nil {
-		return &pb.ConformanceResponse{
-			Result: &pb.ConformanceResponse_ParseError{
-				ParseError: err.Error(),
-			},
-		}
-	}
-	switch req.RequestedOutputFormat {
-	case pb.WireFormat_PROTOBUF:
-		p, err := proto.Marshal(&msg)
-		if err != nil {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_SerializeError{
-					SerializeError: err.Error(),
-				},
-			}
-		}
-		return &pb.ConformanceResponse{
-			Result: &pb.ConformanceResponse_ProtobufPayload{
-				ProtobufPayload: p,
-			},
-		}
-	case pb.WireFormat_JSON:
-		p, err := jsonMarshaler.MarshalToString(&msg)
-		if err != nil {
-			return &pb.ConformanceResponse{
-				Result: &pb.ConformanceResponse_SerializeError{
-					SerializeError: err.Error(),
-				},
-			}
-		}
-		return &pb.ConformanceResponse{
-			Result: &pb.ConformanceResponse_JsonPayload{
-				JsonPayload: p,
-			},
-		}
-	default:
-		return &pb.ConformanceResponse{
-			Result: &pb.ConformanceResponse_RuntimeError{
-				RuntimeError: "unknown output format",
-			},
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go b/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go
deleted file mode 100644
index ec354eada7..0000000000
--- a/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.pb.go
+++ /dev/null
@@ -1,1885 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: conformance_proto/conformance.proto
-
-/*
-Package conformance is a generated protocol buffer package.
-
-It is generated from these files:
-	conformance_proto/conformance.proto
-
-It has these top-level messages:
-	ConformanceRequest
-	ConformanceResponse
-	TestAllTypes
-	ForeignMessage
-*/
-package conformance
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "google.golang.org/genproto/protobuf"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf5 "github.com/golang/protobuf/ptypes/wrappers"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type WireFormat int32
-
-const (
-	WireFormat_UNSPECIFIED WireFormat = 0
-	WireFormat_PROTOBUF    WireFormat = 1
-	WireFormat_JSON        WireFormat = 2
-)
-
-var WireFormat_name = map[int32]string{
-	0: "UNSPECIFIED",
-	1: "PROTOBUF",
-	2: "JSON",
-}
-var WireFormat_value = map[string]int32{
-	"UNSPECIFIED": 0,
-	"PROTOBUF":    1,
-	"JSON":        2,
-}
-
-func (x WireFormat) String() string {
-	return proto.EnumName(WireFormat_name, int32(x))
-}
-func (WireFormat) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type ForeignEnum int32
-
-const (
-	ForeignEnum_FOREIGN_FOO ForeignEnum = 0
-	ForeignEnum_FOREIGN_BAR ForeignEnum = 1
-	ForeignEnum_FOREIGN_BAZ ForeignEnum = 2
-)
-
-var ForeignEnum_name = map[int32]string{
-	0: "FOREIGN_FOO",
-	1: "FOREIGN_BAR",
-	2: "FOREIGN_BAZ",
-}
-var ForeignEnum_value = map[string]int32{
-	"FOREIGN_FOO": 0,
-	"FOREIGN_BAR": 1,
-	"FOREIGN_BAZ": 2,
-}
-
-func (x ForeignEnum) String() string {
-	return proto.EnumName(ForeignEnum_name, int32(x))
-}
-func (ForeignEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type TestAllTypes_NestedEnum int32
-
-const (
-	TestAllTypes_FOO TestAllTypes_NestedEnum = 0
-	TestAllTypes_BAR TestAllTypes_NestedEnum = 1
-	TestAllTypes_BAZ TestAllTypes_NestedEnum = 2
-	TestAllTypes_NEG TestAllTypes_NestedEnum = -1
-)
-
-var TestAllTypes_NestedEnum_name = map[int32]string{
-	0:  "FOO",
-	1:  "BAR",
-	2:  "BAZ",
-	-1: "NEG",
-}
-var TestAllTypes_NestedEnum_value = map[string]int32{
-	"FOO": 0,
-	"BAR": 1,
-	"BAZ": 2,
-	"NEG": -1,
-}
-
-func (x TestAllTypes_NestedEnum) String() string {
-	return proto.EnumName(TestAllTypes_NestedEnum_name, int32(x))
-}
-func (TestAllTypes_NestedEnum) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-// Represents a single test case's input.  The testee should:
-//
-//   1. parse this proto (which should always succeed)
-//   2. parse the protobuf or JSON payload in "payload" (which may fail)
-//   3. if the parse succeeded, serialize the message in the requested format.
-type ConformanceRequest struct {
-	// The payload (whether protobuf of JSON) is always for a TestAllTypes proto
-	// (see below).
-	//
-	// Types that are valid to be assigned to Payload:
-	//	*ConformanceRequest_ProtobufPayload
-	//	*ConformanceRequest_JsonPayload
-	Payload isConformanceRequest_Payload `protobuf_oneof:"payload"`
-	// Which format should the testee serialize its message to?
-	RequestedOutputFormat WireFormat `protobuf:"varint,3,opt,name=requested_output_format,json=requestedOutputFormat,enum=conformance.WireFormat" json:"requested_output_format,omitempty"`
-}
-
-func (m *ConformanceRequest) Reset()                    { *m = ConformanceRequest{} }
-func (m *ConformanceRequest) String() string            { return proto.CompactTextString(m) }
-func (*ConformanceRequest) ProtoMessage()               {}
-func (*ConformanceRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type isConformanceRequest_Payload interface {
-	isConformanceRequest_Payload()
-}
-
-type ConformanceRequest_ProtobufPayload struct {
-	ProtobufPayload []byte `protobuf:"bytes,1,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof"`
-}
-type ConformanceRequest_JsonPayload struct {
-	JsonPayload string `protobuf:"bytes,2,opt,name=json_payload,json=jsonPayload,oneof"`
-}
-
-func (*ConformanceRequest_ProtobufPayload) isConformanceRequest_Payload() {}
-func (*ConformanceRequest_JsonPayload) isConformanceRequest_Payload()     {}
-
-func (m *ConformanceRequest) GetPayload() isConformanceRequest_Payload {
-	if m != nil {
-		return m.Payload
-	}
-	return nil
-}
-
-func (m *ConformanceRequest) GetProtobufPayload() []byte {
-	if x, ok := m.GetPayload().(*ConformanceRequest_ProtobufPayload); ok {
-		return x.ProtobufPayload
-	}
-	return nil
-}
-
-func (m *ConformanceRequest) GetJsonPayload() string {
-	if x, ok := m.GetPayload().(*ConformanceRequest_JsonPayload); ok {
-		return x.JsonPayload
-	}
-	return ""
-}
-
-func (m *ConformanceRequest) GetRequestedOutputFormat() WireFormat {
-	if m != nil {
-		return m.RequestedOutputFormat
-	}
-	return WireFormat_UNSPECIFIED
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConformanceRequest) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConformanceRequest_OneofMarshaler, _ConformanceRequest_OneofUnmarshaler, _ConformanceRequest_OneofSizer, []interface{}{
-		(*ConformanceRequest_ProtobufPayload)(nil),
-		(*ConformanceRequest_JsonPayload)(nil),
-	}
-}
-
-func _ConformanceRequest_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConformanceRequest)
-	// payload
-	switch x := m.Payload.(type) {
-	case *ConformanceRequest_ProtobufPayload:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ProtobufPayload)
-	case *ConformanceRequest_JsonPayload:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.JsonPayload)
-	case nil:
-	default:
-		return fmt.Errorf("ConformanceRequest.Payload has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConformanceRequest_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConformanceRequest)
-	switch tag {
-	case 1: // payload.protobuf_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Payload = &ConformanceRequest_ProtobufPayload{x}
-		return true, err
-	case 2: // payload.json_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Payload = &ConformanceRequest_JsonPayload{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConformanceRequest_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConformanceRequest)
-	// payload
-	switch x := m.Payload.(type) {
-	case *ConformanceRequest_ProtobufPayload:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.ProtobufPayload)))
-		n += len(x.ProtobufPayload)
-	case *ConformanceRequest_JsonPayload:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.JsonPayload)))
-		n += len(x.JsonPayload)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// Represents a single test case's output.
-type ConformanceResponse struct {
-	// Types that are valid to be assigned to Result:
-	//	*ConformanceResponse_ParseError
-	//	*ConformanceResponse_SerializeError
-	//	*ConformanceResponse_RuntimeError
-	//	*ConformanceResponse_ProtobufPayload
-	//	*ConformanceResponse_JsonPayload
-	//	*ConformanceResponse_Skipped
-	Result isConformanceResponse_Result `protobuf_oneof:"result"`
-}
-
-func (m *ConformanceResponse) Reset()                    { *m = ConformanceResponse{} }
-func (m *ConformanceResponse) String() string            { return proto.CompactTextString(m) }
-func (*ConformanceResponse) ProtoMessage()               {}
-func (*ConformanceResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-type isConformanceResponse_Result interface {
-	isConformanceResponse_Result()
-}
-
-type ConformanceResponse_ParseError struct {
-	ParseError string `protobuf:"bytes,1,opt,name=parse_error,json=parseError,oneof"`
-}
-type ConformanceResponse_SerializeError struct {
-	SerializeError string `protobuf:"bytes,6,opt,name=serialize_error,json=serializeError,oneof"`
-}
-type ConformanceResponse_RuntimeError struct {
-	RuntimeError string `protobuf:"bytes,2,opt,name=runtime_error,json=runtimeError,oneof"`
-}
-type ConformanceResponse_ProtobufPayload struct {
-	ProtobufPayload []byte `protobuf:"bytes,3,opt,name=protobuf_payload,json=protobufPayload,proto3,oneof"`
-}
-type ConformanceResponse_JsonPayload struct {
-	JsonPayload string `protobuf:"bytes,4,opt,name=json_payload,json=jsonPayload,oneof"`
-}
-type ConformanceResponse_Skipped struct {
-	Skipped string `protobuf:"bytes,5,opt,name=skipped,oneof"`
-}
-
-func (*ConformanceResponse_ParseError) isConformanceResponse_Result()      {}
-func (*ConformanceResponse_SerializeError) isConformanceResponse_Result()  {}
-func (*ConformanceResponse_RuntimeError) isConformanceResponse_Result()    {}
-func (*ConformanceResponse_ProtobufPayload) isConformanceResponse_Result() {}
-func (*ConformanceResponse_JsonPayload) isConformanceResponse_Result()     {}
-func (*ConformanceResponse_Skipped) isConformanceResponse_Result()         {}
-
-func (m *ConformanceResponse) GetResult() isConformanceResponse_Result {
-	if m != nil {
-		return m.Result
-	}
-	return nil
-}
-
-func (m *ConformanceResponse) GetParseError() string {
-	if x, ok := m.GetResult().(*ConformanceResponse_ParseError); ok {
-		return x.ParseError
-	}
-	return ""
-}
-
-func (m *ConformanceResponse) GetSerializeError() string {
-	if x, ok := m.GetResult().(*ConformanceResponse_SerializeError); ok {
-		return x.SerializeError
-	}
-	return ""
-}
-
-func (m *ConformanceResponse) GetRuntimeError() string {
-	if x, ok := m.GetResult().(*ConformanceResponse_RuntimeError); ok {
-		return x.RuntimeError
-	}
-	return ""
-}
-
-func (m *ConformanceResponse) GetProtobufPayload() []byte {
-	if x, ok := m.GetResult().(*ConformanceResponse_ProtobufPayload); ok {
-		return x.ProtobufPayload
-	}
-	return nil
-}
-
-func (m *ConformanceResponse) GetJsonPayload() string {
-	if x, ok := m.GetResult().(*ConformanceResponse_JsonPayload); ok {
-		return x.JsonPayload
-	}
-	return ""
-}
-
-func (m *ConformanceResponse) GetSkipped() string {
-	if x, ok := m.GetResult().(*ConformanceResponse_Skipped); ok {
-		return x.Skipped
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*ConformanceResponse) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _ConformanceResponse_OneofMarshaler, _ConformanceResponse_OneofUnmarshaler, _ConformanceResponse_OneofSizer, []interface{}{
-		(*ConformanceResponse_ParseError)(nil),
-		(*ConformanceResponse_SerializeError)(nil),
-		(*ConformanceResponse_RuntimeError)(nil),
-		(*ConformanceResponse_ProtobufPayload)(nil),
-		(*ConformanceResponse_JsonPayload)(nil),
-		(*ConformanceResponse_Skipped)(nil),
-	}
-}
-
-func _ConformanceResponse_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*ConformanceResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *ConformanceResponse_ParseError:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.ParseError)
-	case *ConformanceResponse_SerializeError:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.SerializeError)
-	case *ConformanceResponse_RuntimeError:
-		b.EncodeVarint(2<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.RuntimeError)
-	case *ConformanceResponse_ProtobufPayload:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.ProtobufPayload)
-	case *ConformanceResponse_JsonPayload:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.JsonPayload)
-	case *ConformanceResponse_Skipped:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Skipped)
-	case nil:
-	default:
-		return fmt.Errorf("ConformanceResponse.Result has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _ConformanceResponse_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*ConformanceResponse)
-	switch tag {
-	case 1: // result.parse_error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &ConformanceResponse_ParseError{x}
-		return true, err
-	case 6: // result.serialize_error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &ConformanceResponse_SerializeError{x}
-		return true, err
-	case 2: // result.runtime_error
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &ConformanceResponse_RuntimeError{x}
-		return true, err
-	case 3: // result.protobuf_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Result = &ConformanceResponse_ProtobufPayload{x}
-		return true, err
-	case 4: // result.json_payload
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &ConformanceResponse_JsonPayload{x}
-		return true, err
-	case 5: // result.skipped
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Result = &ConformanceResponse_Skipped{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _ConformanceResponse_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*ConformanceResponse)
-	// result
-	switch x := m.Result.(type) {
-	case *ConformanceResponse_ParseError:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.ParseError)))
-		n += len(x.ParseError)
-	case *ConformanceResponse_SerializeError:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.SerializeError)))
-		n += len(x.SerializeError)
-	case *ConformanceResponse_RuntimeError:
-		n += proto.SizeVarint(2<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.RuntimeError)))
-		n += len(x.RuntimeError)
-	case *ConformanceResponse_ProtobufPayload:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.ProtobufPayload)))
-		n += len(x.ProtobufPayload)
-	case *ConformanceResponse_JsonPayload:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.JsonPayload)))
-		n += len(x.JsonPayload)
-	case *ConformanceResponse_Skipped:
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Skipped)))
-		n += len(x.Skipped)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-type TestAllTypes struct {
-	// Singular
-	OptionalInt32          int32                       `protobuf:"varint,1,opt,name=optional_int32,json=optionalInt32" json:"optional_int32,omitempty"`
-	OptionalInt64          int64                       `protobuf:"varint,2,opt,name=optional_int64,json=optionalInt64" json:"optional_int64,omitempty"`
-	OptionalUint32         uint32                      `protobuf:"varint,3,opt,name=optional_uint32,json=optionalUint32" json:"optional_uint32,omitempty"`
-	OptionalUint64         uint64                      `protobuf:"varint,4,opt,name=optional_uint64,json=optionalUint64" json:"optional_uint64,omitempty"`
-	OptionalSint32         int32                       `protobuf:"zigzag32,5,opt,name=optional_sint32,json=optionalSint32" json:"optional_sint32,omitempty"`
-	OptionalSint64         int64                       `protobuf:"zigzag64,6,opt,name=optional_sint64,json=optionalSint64" json:"optional_sint64,omitempty"`
-	OptionalFixed32        uint32                      `protobuf:"fixed32,7,opt,name=optional_fixed32,json=optionalFixed32" json:"optional_fixed32,omitempty"`
-	OptionalFixed64        uint64                      `protobuf:"fixed64,8,opt,name=optional_fixed64,json=optionalFixed64" json:"optional_fixed64,omitempty"`
-	OptionalSfixed32       int32                       `protobuf:"fixed32,9,opt,name=optional_sfixed32,json=optionalSfixed32" json:"optional_sfixed32,omitempty"`
-	OptionalSfixed64       int64                       `protobuf:"fixed64,10,opt,name=optional_sfixed64,json=optionalSfixed64" json:"optional_sfixed64,omitempty"`
-	OptionalFloat          float32                     `protobuf:"fixed32,11,opt,name=optional_float,json=optionalFloat" json:"optional_float,omitempty"`
-	OptionalDouble         float64                     `protobuf:"fixed64,12,opt,name=optional_double,json=optionalDouble" json:"optional_double,omitempty"`
-	OptionalBool           bool                        `protobuf:"varint,13,opt,name=optional_bool,json=optionalBool" json:"optional_bool,omitempty"`
-	OptionalString         string                      `protobuf:"bytes,14,opt,name=optional_string,json=optionalString" json:"optional_string,omitempty"`
-	OptionalBytes          []byte                      `protobuf:"bytes,15,opt,name=optional_bytes,json=optionalBytes,proto3" json:"optional_bytes,omitempty"`
-	OptionalNestedMessage  *TestAllTypes_NestedMessage `protobuf:"bytes,18,opt,name=optional_nested_message,json=optionalNestedMessage" json:"optional_nested_message,omitempty"`
-	OptionalForeignMessage *ForeignMessage             `protobuf:"bytes,19,opt,name=optional_foreign_message,json=optionalForeignMessage" json:"optional_foreign_message,omitempty"`
-	OptionalNestedEnum     TestAllTypes_NestedEnum     `protobuf:"varint,21,opt,name=optional_nested_enum,json=optionalNestedEnum,enum=conformance.TestAllTypes_NestedEnum" json:"optional_nested_enum,omitempty"`
-	OptionalForeignEnum    ForeignEnum                 `protobuf:"varint,22,opt,name=optional_foreign_enum,json=optionalForeignEnum,enum=conformance.ForeignEnum" json:"optional_foreign_enum,omitempty"`
-	OptionalStringPiece    string                      `protobuf:"bytes,24,opt,name=optional_string_piece,json=optionalStringPiece" json:"optional_string_piece,omitempty"`
-	OptionalCord           string                      `protobuf:"bytes,25,opt,name=optional_cord,json=optionalCord" json:"optional_cord,omitempty"`
-	RecursiveMessage       *TestAllTypes               `protobuf:"bytes,27,opt,name=recursive_message,json=recursiveMessage" json:"recursive_message,omitempty"`
-	// Repeated
-	RepeatedInt32          []int32                       `protobuf:"varint,31,rep,packed,name=repeated_int32,json=repeatedInt32" json:"repeated_int32,omitempty"`
-	RepeatedInt64          []int64                       `protobuf:"varint,32,rep,packed,name=repeated_int64,json=repeatedInt64" json:"repeated_int64,omitempty"`
-	RepeatedUint32         []uint32                      `protobuf:"varint,33,rep,packed,name=repeated_uint32,json=repeatedUint32" json:"repeated_uint32,omitempty"`
-	RepeatedUint64         []uint64                      `protobuf:"varint,34,rep,packed,name=repeated_uint64,json=repeatedUint64" json:"repeated_uint64,omitempty"`
-	RepeatedSint32         []int32                       `protobuf:"zigzag32,35,rep,packed,name=repeated_sint32,json=repeatedSint32" json:"repeated_sint32,omitempty"`
-	RepeatedSint64         []int64                       `protobuf:"zigzag64,36,rep,packed,name=repeated_sint64,json=repeatedSint64" json:"repeated_sint64,omitempty"`
-	RepeatedFixed32        []uint32                      `protobuf:"fixed32,37,rep,packed,name=repeated_fixed32,json=repeatedFixed32" json:"repeated_fixed32,omitempty"`
-	RepeatedFixed64        []uint64                      `protobuf:"fixed64,38,rep,packed,name=repeated_fixed64,json=repeatedFixed64" json:"repeated_fixed64,omitempty"`
-	RepeatedSfixed32       []int32                       `protobuf:"fixed32,39,rep,packed,name=repeated_sfixed32,json=repeatedSfixed32" json:"repeated_sfixed32,omitempty"`
-	RepeatedSfixed64       []int64                       `protobuf:"fixed64,40,rep,packed,name=repeated_sfixed64,json=repeatedSfixed64" json:"repeated_sfixed64,omitempty"`
-	RepeatedFloat          []float32                     `protobuf:"fixed32,41,rep,packed,name=repeated_float,json=repeatedFloat" json:"repeated_float,omitempty"`
-	RepeatedDouble         []float64                     `protobuf:"fixed64,42,rep,packed,name=repeated_double,json=repeatedDouble" json:"repeated_double,omitempty"`
-	RepeatedBool           []bool                        `protobuf:"varint,43,rep,packed,name=repeated_bool,json=repeatedBool" json:"repeated_bool,omitempty"`
-	RepeatedString         []string                      `protobuf:"bytes,44,rep,name=repeated_string,json=repeatedString" json:"repeated_string,omitempty"`
-	RepeatedBytes          [][]byte                      `protobuf:"bytes,45,rep,name=repeated_bytes,json=repeatedBytes,proto3" json:"repeated_bytes,omitempty"`
-	RepeatedNestedMessage  []*TestAllTypes_NestedMessage `protobuf:"bytes,48,rep,name=repeated_nested_message,json=repeatedNestedMessage" json:"repeated_nested_message,omitempty"`
-	RepeatedForeignMessage []*ForeignMessage             `protobuf:"bytes,49,rep,name=repeated_foreign_message,json=repeatedForeignMessage" json:"repeated_foreign_message,omitempty"`
-	RepeatedNestedEnum     []TestAllTypes_NestedEnum     `protobuf:"varint,51,rep,packed,name=repeated_nested_enum,json=repeatedNestedEnum,enum=conformance.TestAllTypes_NestedEnum" json:"repeated_nested_enum,omitempty"`
-	RepeatedForeignEnum    []ForeignEnum                 `protobuf:"varint,52,rep,packed,name=repeated_foreign_enum,json=repeatedForeignEnum,enum=conformance.ForeignEnum" json:"repeated_foreign_enum,omitempty"`
-	RepeatedStringPiece    []string                      `protobuf:"bytes,54,rep,name=repeated_string_piece,json=repeatedStringPiece" json:"repeated_string_piece,omitempty"`
-	RepeatedCord           []string                      `protobuf:"bytes,55,rep,name=repeated_cord,json=repeatedCord" json:"repeated_cord,omitempty"`
-	// Map
-	MapInt32Int32           map[int32]int32                        `protobuf:"bytes,56,rep,name=map_int32_int32,json=mapInt32Int32" json:"map_int32_int32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapInt64Int64           map[int64]int64                        `protobuf:"bytes,57,rep,name=map_int64_int64,json=mapInt64Int64" json:"map_int64_int64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint32Uint32         map[uint32]uint32                      `protobuf:"bytes,58,rep,name=map_uint32_uint32,json=mapUint32Uint32" json:"map_uint32_uint32,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapUint64Uint64         map[uint64]uint64                      `protobuf:"bytes,59,rep,name=map_uint64_uint64,json=mapUint64Uint64" json:"map_uint64_uint64,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapSint32Sint32         map[int32]int32                        `protobuf:"bytes,60,rep,name=map_sint32_sint32,json=mapSint32Sint32" json:"map_sint32_sint32,omitempty" protobuf_key:"zigzag32,1,opt,name=key" protobuf_val:"zigzag32,2,opt,name=value"`
-	MapSint64Sint64         map[int64]int64                        `protobuf:"bytes,61,rep,name=map_sint64_sint64,json=mapSint64Sint64" json:"map_sint64_sint64,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"zigzag64,2,opt,name=value"`
-	MapFixed32Fixed32       map[uint32]uint32                      `protobuf:"bytes,62,rep,name=map_fixed32_fixed32,json=mapFixed32Fixed32" json:"map_fixed32_fixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapFixed64Fixed64       map[uint64]uint64                      `protobuf:"bytes,63,rep,name=map_fixed64_fixed64,json=mapFixed64Fixed64" json:"map_fixed64_fixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapSfixed32Sfixed32     map[int32]int32                        `protobuf:"bytes,64,rep,name=map_sfixed32_sfixed32,json=mapSfixed32Sfixed32" json:"map_sfixed32_sfixed32,omitempty" protobuf_key:"fixed32,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapSfixed64Sfixed64     map[int64]int64                        `protobuf:"bytes,65,rep,name=map_sfixed64_sfixed64,json=mapSfixed64Sfixed64" json:"map_sfixed64_sfixed64,omitempty" protobuf_key:"fixed64,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapInt32Float           map[int32]float32                      `protobuf:"bytes,66,rep,name=map_int32_float,json=mapInt32Float" json:"map_int32_float,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed32,2,opt,name=value"`
-	MapInt32Double          map[int32]float64                      `protobuf:"bytes,67,rep,name=map_int32_double,json=mapInt32Double" json:"map_int32_double,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"fixed64,2,opt,name=value"`
-	MapBoolBool             map[bool]bool                          `protobuf:"bytes,68,rep,name=map_bool_bool,json=mapBoolBool" json:"map_bool_bool,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	MapStringString         map[string]string                      `protobuf:"bytes,69,rep,name=map_string_string,json=mapStringString" json:"map_string_string,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringBytes          map[string][]byte                      `protobuf:"bytes,70,rep,name=map_string_bytes,json=mapStringBytes" json:"map_string_bytes,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-	MapStringNestedMessage  map[string]*TestAllTypes_NestedMessage `protobuf:"bytes,71,rep,name=map_string_nested_message,json=mapStringNestedMessage" json:"map_string_nested_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringForeignMessage map[string]*ForeignMessage             `protobuf:"bytes,72,rep,name=map_string_foreign_message,json=mapStringForeignMessage" json:"map_string_foreign_message,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MapStringNestedEnum     map[string]TestAllTypes_NestedEnum     `protobuf:"bytes,73,rep,name=map_string_nested_enum,json=mapStringNestedEnum" json:"map_string_nested_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=conformance.TestAllTypes_NestedEnum"`
-	MapStringForeignEnum    map[string]ForeignEnum                 `protobuf:"bytes,74,rep,name=map_string_foreign_enum,json=mapStringForeignEnum" json:"map_string_foreign_enum,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=conformance.ForeignEnum"`
-	// Types that are valid to be assigned to OneofField:
-	//	*TestAllTypes_OneofUint32
-	//	*TestAllTypes_OneofNestedMessage
-	//	*TestAllTypes_OneofString
-	//	*TestAllTypes_OneofBytes
-	//	*TestAllTypes_OneofBool
-	//	*TestAllTypes_OneofUint64
-	//	*TestAllTypes_OneofFloat
-	//	*TestAllTypes_OneofDouble
-	//	*TestAllTypes_OneofEnum
-	OneofField isTestAllTypes_OneofField `protobuf_oneof:"oneof_field"`
-	// Well-known types
-	OptionalBoolWrapper   *google_protobuf5.BoolValue     `protobuf:"bytes,201,opt,name=optional_bool_wrapper,json=optionalBoolWrapper" json:"optional_bool_wrapper,omitempty"`
-	OptionalInt32Wrapper  *google_protobuf5.Int32Value    `protobuf:"bytes,202,opt,name=optional_int32_wrapper,json=optionalInt32Wrapper" json:"optional_int32_wrapper,omitempty"`
-	OptionalInt64Wrapper  *google_protobuf5.Int64Value    `protobuf:"bytes,203,opt,name=optional_int64_wrapper,json=optionalInt64Wrapper" json:"optional_int64_wrapper,omitempty"`
-	OptionalUint32Wrapper *google_protobuf5.UInt32Value   `protobuf:"bytes,204,opt,name=optional_uint32_wrapper,json=optionalUint32Wrapper" json:"optional_uint32_wrapper,omitempty"`
-	OptionalUint64Wrapper *google_protobuf5.UInt64Value   `protobuf:"bytes,205,opt,name=optional_uint64_wrapper,json=optionalUint64Wrapper" json:"optional_uint64_wrapper,omitempty"`
-	OptionalFloatWrapper  *google_protobuf5.FloatValue    `protobuf:"bytes,206,opt,name=optional_float_wrapper,json=optionalFloatWrapper" json:"optional_float_wrapper,omitempty"`
-	OptionalDoubleWrapper *google_protobuf5.DoubleValue   `protobuf:"bytes,207,opt,name=optional_double_wrapper,json=optionalDoubleWrapper" json:"optional_double_wrapper,omitempty"`
-	OptionalStringWrapper *google_protobuf5.StringValue   `protobuf:"bytes,208,opt,name=optional_string_wrapper,json=optionalStringWrapper" json:"optional_string_wrapper,omitempty"`
-	OptionalBytesWrapper  *google_protobuf5.BytesValue    `protobuf:"bytes,209,opt,name=optional_bytes_wrapper,json=optionalBytesWrapper" json:"optional_bytes_wrapper,omitempty"`
-	RepeatedBoolWrapper   []*google_protobuf5.BoolValue   `protobuf:"bytes,211,rep,name=repeated_bool_wrapper,json=repeatedBoolWrapper" json:"repeated_bool_wrapper,omitempty"`
-	RepeatedInt32Wrapper  []*google_protobuf5.Int32Value  `protobuf:"bytes,212,rep,name=repeated_int32_wrapper,json=repeatedInt32Wrapper" json:"repeated_int32_wrapper,omitempty"`
-	RepeatedInt64Wrapper  []*google_protobuf5.Int64Value  `protobuf:"bytes,213,rep,name=repeated_int64_wrapper,json=repeatedInt64Wrapper" json:"repeated_int64_wrapper,omitempty"`
-	RepeatedUint32Wrapper []*google_protobuf5.UInt32Value `protobuf:"bytes,214,rep,name=repeated_uint32_wrapper,json=repeatedUint32Wrapper" json:"repeated_uint32_wrapper,omitempty"`
-	RepeatedUint64Wrapper []*google_protobuf5.UInt64Value `protobuf:"bytes,215,rep,name=repeated_uint64_wrapper,json=repeatedUint64Wrapper" json:"repeated_uint64_wrapper,omitempty"`
-	RepeatedFloatWrapper  []*google_protobuf5.FloatValue  `protobuf:"bytes,216,rep,name=repeated_float_wrapper,json=repeatedFloatWrapper" json:"repeated_float_wrapper,omitempty"`
-	RepeatedDoubleWrapper []*google_protobuf5.DoubleValue `protobuf:"bytes,217,rep,name=repeated_double_wrapper,json=repeatedDoubleWrapper" json:"repeated_double_wrapper,omitempty"`
-	RepeatedStringWrapper []*google_protobuf5.StringValue `protobuf:"bytes,218,rep,name=repeated_string_wrapper,json=repeatedStringWrapper" json:"repeated_string_wrapper,omitempty"`
-	RepeatedBytesWrapper  []*google_protobuf5.BytesValue  `protobuf:"bytes,219,rep,name=repeated_bytes_wrapper,json=repeatedBytesWrapper" json:"repeated_bytes_wrapper,omitempty"`
-	OptionalDuration      *google_protobuf1.Duration      `protobuf:"bytes,301,opt,name=optional_duration,json=optionalDuration" json:"optional_duration,omitempty"`
-	OptionalTimestamp     *google_protobuf4.Timestamp     `protobuf:"bytes,302,opt,name=optional_timestamp,json=optionalTimestamp" json:"optional_timestamp,omitempty"`
-	OptionalFieldMask     *google_protobuf2.FieldMask     `protobuf:"bytes,303,opt,name=optional_field_mask,json=optionalFieldMask" json:"optional_field_mask,omitempty"`
-	OptionalStruct        *google_protobuf3.Struct        `protobuf:"bytes,304,opt,name=optional_struct,json=optionalStruct" json:"optional_struct,omitempty"`
-	OptionalAny           *google_protobuf.Any            `protobuf:"bytes,305,opt,name=optional_any,json=optionalAny" json:"optional_any,omitempty"`
-	OptionalValue         *google_protobuf3.Value         `protobuf:"bytes,306,opt,name=optional_value,json=optionalValue" json:"optional_value,omitempty"`
-	RepeatedDuration      []*google_protobuf1.Duration    `protobuf:"bytes,311,rep,name=repeated_duration,json=repeatedDuration" json:"repeated_duration,omitempty"`
-	RepeatedTimestamp     []*google_protobuf4.Timestamp   `protobuf:"bytes,312,rep,name=repeated_timestamp,json=repeatedTimestamp" json:"repeated_timestamp,omitempty"`
-	RepeatedFieldmask     []*google_protobuf2.FieldMask   `protobuf:"bytes,313,rep,name=repeated_fieldmask,json=repeatedFieldmask" json:"repeated_fieldmask,omitempty"`
-	RepeatedStruct        []*google_protobuf3.Struct      `protobuf:"bytes,324,rep,name=repeated_struct,json=repeatedStruct" json:"repeated_struct,omitempty"`
-	RepeatedAny           []*google_protobuf.Any          `protobuf:"bytes,315,rep,name=repeated_any,json=repeatedAny" json:"repeated_any,omitempty"`
-	RepeatedValue         []*google_protobuf3.Value       `protobuf:"bytes,316,rep,name=repeated_value,json=repeatedValue" json:"repeated_value,omitempty"`
-	// Test field-name-to-JSON-name convention.
-	// (protobuf says names can be any valid C/C++ identifier.)
-	Fieldname1    int32 `protobuf:"varint,401,opt,name=fieldname1" json:"fieldname1,omitempty"`
-	FieldName2    int32 `protobuf:"varint,402,opt,name=field_name2,json=fieldName2" json:"field_name2,omitempty"`
-	XFieldName3   int32 `protobuf:"varint,403,opt,name=_field_name3,json=FieldName3" json:"_field_name3,omitempty"`
-	Field_Name4_  int32 `protobuf:"varint,404,opt,name=field__name4_,json=fieldName4" json:"field__name4_,omitempty"`
-	Field0Name5   int32 `protobuf:"varint,405,opt,name=field0name5" json:"field0name5,omitempty"`
-	Field_0Name6  int32 `protobuf:"varint,406,opt,name=field_0_name6,json=field0Name6" json:"field_0_name6,omitempty"`
-	FieldName7    int32 `protobuf:"varint,407,opt,name=fieldName7" json:"fieldName7,omitempty"`
-	FieldName8    int32 `protobuf:"varint,408,opt,name=FieldName8" json:"FieldName8,omitempty"`
-	Field_Name9   int32 `protobuf:"varint,409,opt,name=field_Name9,json=fieldName9" json:"field_Name9,omitempty"`
-	Field_Name10  int32 `protobuf:"varint,410,opt,name=Field_Name10,json=FieldName10" json:"Field_Name10,omitempty"`
-	FIELD_NAME11  int32 `protobuf:"varint,411,opt,name=FIELD_NAME11,json=FIELDNAME11" json:"FIELD_NAME11,omitempty"`
-	FIELDName12   int32 `protobuf:"varint,412,opt,name=FIELD_name12,json=FIELDName12" json:"FIELD_name12,omitempty"`
-	XFieldName13  int32 `protobuf:"varint,413,opt,name=__field_name13,json=FieldName13" json:"__field_name13,omitempty"`
-	X_FieldName14 int32 `protobuf:"varint,414,opt,name=__Field_name14,json=FieldName14" json:"__Field_name14,omitempty"`
-	Field_Name15  int32 `protobuf:"varint,415,opt,name=field__name15,json=fieldName15" json:"field__name15,omitempty"`
-	Field__Name16 int32 `protobuf:"varint,416,opt,name=field__Name16,json=fieldName16" json:"field__Name16,omitempty"`
-	FieldName17__ int32 `protobuf:"varint,417,opt,name=field_name17__,json=fieldName17" json:"field_name17__,omitempty"`
-	FieldName18__ int32 `protobuf:"varint,418,opt,name=Field_name18__,json=FieldName18" json:"Field_name18__,omitempty"`
-}
-
-func (m *TestAllTypes) Reset()                    { *m = TestAllTypes{} }
-func (m *TestAllTypes) String() string            { return proto.CompactTextString(m) }
-func (*TestAllTypes) ProtoMessage()               {}
-func (*TestAllTypes) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-type isTestAllTypes_OneofField interface {
-	isTestAllTypes_OneofField()
-}
-
-type TestAllTypes_OneofUint32 struct {
-	OneofUint32 uint32 `protobuf:"varint,111,opt,name=oneof_uint32,json=oneofUint32,oneof"`
-}
-type TestAllTypes_OneofNestedMessage struct {
-	OneofNestedMessage *TestAllTypes_NestedMessage `protobuf:"bytes,112,opt,name=oneof_nested_message,json=oneofNestedMessage,oneof"`
-}
-type TestAllTypes_OneofString struct {
-	OneofString string `protobuf:"bytes,113,opt,name=oneof_string,json=oneofString,oneof"`
-}
-type TestAllTypes_OneofBytes struct {
-	OneofBytes []byte `protobuf:"bytes,114,opt,name=oneof_bytes,json=oneofBytes,proto3,oneof"`
-}
-type TestAllTypes_OneofBool struct {
-	OneofBool bool `protobuf:"varint,115,opt,name=oneof_bool,json=oneofBool,oneof"`
-}
-type TestAllTypes_OneofUint64 struct {
-	OneofUint64 uint64 `protobuf:"varint,116,opt,name=oneof_uint64,json=oneofUint64,oneof"`
-}
-type TestAllTypes_OneofFloat struct {
-	OneofFloat float32 `protobuf:"fixed32,117,opt,name=oneof_float,json=oneofFloat,oneof"`
-}
-type TestAllTypes_OneofDouble struct {
-	OneofDouble float64 `protobuf:"fixed64,118,opt,name=oneof_double,json=oneofDouble,oneof"`
-}
-type TestAllTypes_OneofEnum struct {
-	OneofEnum TestAllTypes_NestedEnum `protobuf:"varint,119,opt,name=oneof_enum,json=oneofEnum,enum=conformance.TestAllTypes_NestedEnum,oneof"`
-}
-
-func (*TestAllTypes_OneofUint32) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofNestedMessage) isTestAllTypes_OneofField() {}
-func (*TestAllTypes_OneofString) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofBytes) isTestAllTypes_OneofField()         {}
-func (*TestAllTypes_OneofBool) isTestAllTypes_OneofField()          {}
-func (*TestAllTypes_OneofUint64) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofFloat) isTestAllTypes_OneofField()         {}
-func (*TestAllTypes_OneofDouble) isTestAllTypes_OneofField()        {}
-func (*TestAllTypes_OneofEnum) isTestAllTypes_OneofField()          {}
-
-func (m *TestAllTypes) GetOneofField() isTestAllTypes_OneofField {
-	if m != nil {
-		return m.OneofField
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalInt32() int32 {
-	if m != nil {
-		return m.OptionalInt32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalInt64() int64 {
-	if m != nil {
-		return m.OptionalInt64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalUint32() uint32 {
-	if m != nil {
-		return m.OptionalUint32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalUint64() uint64 {
-	if m != nil {
-		return m.OptionalUint64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalSint32() int32 {
-	if m != nil {
-		return m.OptionalSint32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalSint64() int64 {
-	if m != nil {
-		return m.OptionalSint64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalFixed32() uint32 {
-	if m != nil {
-		return m.OptionalFixed32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalFixed64() uint64 {
-	if m != nil {
-		return m.OptionalFixed64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalSfixed32() int32 {
-	if m != nil {
-		return m.OptionalSfixed32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalSfixed64() int64 {
-	if m != nil {
-		return m.OptionalSfixed64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalFloat() float32 {
-	if m != nil {
-		return m.OptionalFloat
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalDouble() float64 {
-	if m != nil {
-		return m.OptionalDouble
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOptionalBool() bool {
-	if m != nil {
-		return m.OptionalBool
-	}
-	return false
-}
-
-func (m *TestAllTypes) GetOptionalString() string {
-	if m != nil {
-		return m.OptionalString
-	}
-	return ""
-}
-
-func (m *TestAllTypes) GetOptionalBytes() []byte {
-	if m != nil {
-		return m.OptionalBytes
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalNestedMessage() *TestAllTypes_NestedMessage {
-	if m != nil {
-		return m.OptionalNestedMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalForeignMessage() *ForeignMessage {
-	if m != nil {
-		return m.OptionalForeignMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalNestedEnum() TestAllTypes_NestedEnum {
-	if m != nil {
-		return m.OptionalNestedEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (m *TestAllTypes) GetOptionalForeignEnum() ForeignEnum {
-	if m != nil {
-		return m.OptionalForeignEnum
-	}
-	return ForeignEnum_FOREIGN_FOO
-}
-
-func (m *TestAllTypes) GetOptionalStringPiece() string {
-	if m != nil {
-		return m.OptionalStringPiece
-	}
-	return ""
-}
-
-func (m *TestAllTypes) GetOptionalCord() string {
-	if m != nil {
-		return m.OptionalCord
-	}
-	return ""
-}
-
-func (m *TestAllTypes) GetRecursiveMessage() *TestAllTypes {
-	if m != nil {
-		return m.RecursiveMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedInt32() []int32 {
-	if m != nil {
-		return m.RepeatedInt32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedInt64() []int64 {
-	if m != nil {
-		return m.RepeatedInt64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedUint32() []uint32 {
-	if m != nil {
-		return m.RepeatedUint32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedUint64() []uint64 {
-	if m != nil {
-		return m.RepeatedUint64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedSint32() []int32 {
-	if m != nil {
-		return m.RepeatedSint32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedSint64() []int64 {
-	if m != nil {
-		return m.RepeatedSint64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedFixed32() []uint32 {
-	if m != nil {
-		return m.RepeatedFixed32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedFixed64() []uint64 {
-	if m != nil {
-		return m.RepeatedFixed64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedSfixed32() []int32 {
-	if m != nil {
-		return m.RepeatedSfixed32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedSfixed64() []int64 {
-	if m != nil {
-		return m.RepeatedSfixed64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedFloat() []float32 {
-	if m != nil {
-		return m.RepeatedFloat
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedDouble() []float64 {
-	if m != nil {
-		return m.RepeatedDouble
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedBool() []bool {
-	if m != nil {
-		return m.RepeatedBool
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedString() []string {
-	if m != nil {
-		return m.RepeatedString
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedBytes() [][]byte {
-	if m != nil {
-		return m.RepeatedBytes
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedNestedMessage() []*TestAllTypes_NestedMessage {
-	if m != nil {
-		return m.RepeatedNestedMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedForeignMessage() []*ForeignMessage {
-	if m != nil {
-		return m.RepeatedForeignMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedNestedEnum() []TestAllTypes_NestedEnum {
-	if m != nil {
-		return m.RepeatedNestedEnum
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedForeignEnum() []ForeignEnum {
-	if m != nil {
-		return m.RepeatedForeignEnum
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedStringPiece() []string {
-	if m != nil {
-		return m.RepeatedStringPiece
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedCord() []string {
-	if m != nil {
-		return m.RepeatedCord
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapInt32Int32() map[int32]int32 {
-	if m != nil {
-		return m.MapInt32Int32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapInt64Int64() map[int64]int64 {
-	if m != nil {
-		return m.MapInt64Int64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapUint32Uint32() map[uint32]uint32 {
-	if m != nil {
-		return m.MapUint32Uint32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapUint64Uint64() map[uint64]uint64 {
-	if m != nil {
-		return m.MapUint64Uint64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapSint32Sint32() map[int32]int32 {
-	if m != nil {
-		return m.MapSint32Sint32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapSint64Sint64() map[int64]int64 {
-	if m != nil {
-		return m.MapSint64Sint64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapFixed32Fixed32() map[uint32]uint32 {
-	if m != nil {
-		return m.MapFixed32Fixed32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapFixed64Fixed64() map[uint64]uint64 {
-	if m != nil {
-		return m.MapFixed64Fixed64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapSfixed32Sfixed32() map[int32]int32 {
-	if m != nil {
-		return m.MapSfixed32Sfixed32
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapSfixed64Sfixed64() map[int64]int64 {
-	if m != nil {
-		return m.MapSfixed64Sfixed64
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapInt32Float() map[int32]float32 {
-	if m != nil {
-		return m.MapInt32Float
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapInt32Double() map[int32]float64 {
-	if m != nil {
-		return m.MapInt32Double
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapBoolBool() map[bool]bool {
-	if m != nil {
-		return m.MapBoolBool
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringString() map[string]string {
-	if m != nil {
-		return m.MapStringString
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringBytes() map[string][]byte {
-	if m != nil {
-		return m.MapStringBytes
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringNestedMessage() map[string]*TestAllTypes_NestedMessage {
-	if m != nil {
-		return m.MapStringNestedMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringForeignMessage() map[string]*ForeignMessage {
-	if m != nil {
-		return m.MapStringForeignMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringNestedEnum() map[string]TestAllTypes_NestedEnum {
-	if m != nil {
-		return m.MapStringNestedEnum
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetMapStringForeignEnum() map[string]ForeignEnum {
-	if m != nil {
-		return m.MapStringForeignEnum
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOneofUint32() uint32 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofUint32); ok {
-		return x.OneofUint32
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofNestedMessage() *TestAllTypes_NestedMessage {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofNestedMessage); ok {
-		return x.OneofNestedMessage
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOneofString() string {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofString); ok {
-		return x.OneofString
-	}
-	return ""
-}
-
-func (m *TestAllTypes) GetOneofBytes() []byte {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofBytes); ok {
-		return x.OneofBytes
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOneofBool() bool {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofBool); ok {
-		return x.OneofBool
-	}
-	return false
-}
-
-func (m *TestAllTypes) GetOneofUint64() uint64 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofUint64); ok {
-		return x.OneofUint64
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofFloat() float32 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofFloat); ok {
-		return x.OneofFloat
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofDouble() float64 {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofDouble); ok {
-		return x.OneofDouble
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetOneofEnum() TestAllTypes_NestedEnum {
-	if x, ok := m.GetOneofField().(*TestAllTypes_OneofEnum); ok {
-		return x.OneofEnum
-	}
-	return TestAllTypes_FOO
-}
-
-func (m *TestAllTypes) GetOptionalBoolWrapper() *google_protobuf5.BoolValue {
-	if m != nil {
-		return m.OptionalBoolWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalInt32Wrapper() *google_protobuf5.Int32Value {
-	if m != nil {
-		return m.OptionalInt32Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalInt64Wrapper() *google_protobuf5.Int64Value {
-	if m != nil {
-		return m.OptionalInt64Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalUint32Wrapper() *google_protobuf5.UInt32Value {
-	if m != nil {
-		return m.OptionalUint32Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalUint64Wrapper() *google_protobuf5.UInt64Value {
-	if m != nil {
-		return m.OptionalUint64Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalFloatWrapper() *google_protobuf5.FloatValue {
-	if m != nil {
-		return m.OptionalFloatWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalDoubleWrapper() *google_protobuf5.DoubleValue {
-	if m != nil {
-		return m.OptionalDoubleWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalStringWrapper() *google_protobuf5.StringValue {
-	if m != nil {
-		return m.OptionalStringWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalBytesWrapper() *google_protobuf5.BytesValue {
-	if m != nil {
-		return m.OptionalBytesWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedBoolWrapper() []*google_protobuf5.BoolValue {
-	if m != nil {
-		return m.RepeatedBoolWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedInt32Wrapper() []*google_protobuf5.Int32Value {
-	if m != nil {
-		return m.RepeatedInt32Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedInt64Wrapper() []*google_protobuf5.Int64Value {
-	if m != nil {
-		return m.RepeatedInt64Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedUint32Wrapper() []*google_protobuf5.UInt32Value {
-	if m != nil {
-		return m.RepeatedUint32Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedUint64Wrapper() []*google_protobuf5.UInt64Value {
-	if m != nil {
-		return m.RepeatedUint64Wrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedFloatWrapper() []*google_protobuf5.FloatValue {
-	if m != nil {
-		return m.RepeatedFloatWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedDoubleWrapper() []*google_protobuf5.DoubleValue {
-	if m != nil {
-		return m.RepeatedDoubleWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedStringWrapper() []*google_protobuf5.StringValue {
-	if m != nil {
-		return m.RepeatedStringWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedBytesWrapper() []*google_protobuf5.BytesValue {
-	if m != nil {
-		return m.RepeatedBytesWrapper
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalDuration() *google_protobuf1.Duration {
-	if m != nil {
-		return m.OptionalDuration
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalTimestamp() *google_protobuf4.Timestamp {
-	if m != nil {
-		return m.OptionalTimestamp
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalFieldMask() *google_protobuf2.FieldMask {
-	if m != nil {
-		return m.OptionalFieldMask
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalStruct() *google_protobuf3.Struct {
-	if m != nil {
-		return m.OptionalStruct
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalAny() *google_protobuf.Any {
-	if m != nil {
-		return m.OptionalAny
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetOptionalValue() *google_protobuf3.Value {
-	if m != nil {
-		return m.OptionalValue
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedDuration() []*google_protobuf1.Duration {
-	if m != nil {
-		return m.RepeatedDuration
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedTimestamp() []*google_protobuf4.Timestamp {
-	if m != nil {
-		return m.RepeatedTimestamp
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedFieldmask() []*google_protobuf2.FieldMask {
-	if m != nil {
-		return m.RepeatedFieldmask
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedStruct() []*google_protobuf3.Struct {
-	if m != nil {
-		return m.RepeatedStruct
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedAny() []*google_protobuf.Any {
-	if m != nil {
-		return m.RepeatedAny
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetRepeatedValue() []*google_protobuf3.Value {
-	if m != nil {
-		return m.RepeatedValue
-	}
-	return nil
-}
-
-func (m *TestAllTypes) GetFieldname1() int32 {
-	if m != nil {
-		return m.Fieldname1
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName2() int32 {
-	if m != nil {
-		return m.FieldName2
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetXFieldName3() int32 {
-	if m != nil {
-		return m.XFieldName3
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_Name4_() int32 {
-	if m != nil {
-		return m.Field_Name4_
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField0Name5() int32 {
-	if m != nil {
-		return m.Field0Name5
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_0Name6() int32 {
-	if m != nil {
-		return m.Field_0Name6
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName7() int32 {
-	if m != nil {
-		return m.FieldName7
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName8() int32 {
-	if m != nil {
-		return m.FieldName8
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_Name9() int32 {
-	if m != nil {
-		return m.Field_Name9
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_Name10() int32 {
-	if m != nil {
-		return m.Field_Name10
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFIELD_NAME11() int32 {
-	if m != nil {
-		return m.FIELD_NAME11
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFIELDName12() int32 {
-	if m != nil {
-		return m.FIELDName12
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetXFieldName13() int32 {
-	if m != nil {
-		return m.XFieldName13
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetX_FieldName14() int32 {
-	if m != nil {
-		return m.X_FieldName14
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField_Name15() int32 {
-	if m != nil {
-		return m.Field_Name15
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetField__Name16() int32 {
-	if m != nil {
-		return m.Field__Name16
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName17__() int32 {
-	if m != nil {
-		return m.FieldName17__
-	}
-	return 0
-}
-
-func (m *TestAllTypes) GetFieldName18__() int32 {
-	if m != nil {
-		return m.FieldName18__
-	}
-	return 0
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*TestAllTypes) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _TestAllTypes_OneofMarshaler, _TestAllTypes_OneofUnmarshaler, _TestAllTypes_OneofSizer, []interface{}{
-		(*TestAllTypes_OneofUint32)(nil),
-		(*TestAllTypes_OneofNestedMessage)(nil),
-		(*TestAllTypes_OneofString)(nil),
-		(*TestAllTypes_OneofBytes)(nil),
-		(*TestAllTypes_OneofBool)(nil),
-		(*TestAllTypes_OneofUint64)(nil),
-		(*TestAllTypes_OneofFloat)(nil),
-		(*TestAllTypes_OneofDouble)(nil),
-		(*TestAllTypes_OneofEnum)(nil),
-	}
-}
-
-func _TestAllTypes_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*TestAllTypes)
-	// oneof_field
-	switch x := m.OneofField.(type) {
-	case *TestAllTypes_OneofUint32:
-		b.EncodeVarint(111<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint32))
-	case *TestAllTypes_OneofNestedMessage:
-		b.EncodeVarint(112<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.OneofNestedMessage); err != nil {
-			return err
-		}
-	case *TestAllTypes_OneofString:
-		b.EncodeVarint(113<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.OneofString)
-	case *TestAllTypes_OneofBytes:
-		b.EncodeVarint(114<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.OneofBytes)
-	case *TestAllTypes_OneofBool:
-		t := uint64(0)
-		if x.OneofBool {
-			t = 1
-		}
-		b.EncodeVarint(115<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *TestAllTypes_OneofUint64:
-		b.EncodeVarint(116<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofUint64))
-	case *TestAllTypes_OneofFloat:
-		b.EncodeVarint(117<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.OneofFloat)))
-	case *TestAllTypes_OneofDouble:
-		b.EncodeVarint(118<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.OneofDouble))
-	case *TestAllTypes_OneofEnum:
-		b.EncodeVarint(119<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.OneofEnum))
-	case nil:
-	default:
-		return fmt.Errorf("TestAllTypes.OneofField has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _TestAllTypes_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*TestAllTypes)
-	switch tag {
-	case 111: // oneof_field.oneof_uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofUint32{uint32(x)}
-		return true, err
-	case 112: // oneof_field.oneof_nested_message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(TestAllTypes_NestedMessage)
-		err := b.DecodeMessage(msg)
-		m.OneofField = &TestAllTypes_OneofNestedMessage{msg}
-		return true, err
-	case 113: // oneof_field.oneof_string
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.OneofField = &TestAllTypes_OneofString{x}
-		return true, err
-	case 114: // oneof_field.oneof_bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.OneofField = &TestAllTypes_OneofBytes{x}
-		return true, err
-	case 115: // oneof_field.oneof_bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofBool{x != 0}
-		return true, err
-	case 116: // oneof_field.oneof_uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofUint64{x}
-		return true, err
-	case 117: // oneof_field.oneof_float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.OneofField = &TestAllTypes_OneofFloat{math.Float32frombits(uint32(x))}
-		return true, err
-	case 118: // oneof_field.oneof_double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.OneofField = &TestAllTypes_OneofDouble{math.Float64frombits(x)}
-		return true, err
-	case 119: // oneof_field.oneof_enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.OneofField = &TestAllTypes_OneofEnum{TestAllTypes_NestedEnum(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _TestAllTypes_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*TestAllTypes)
-	// oneof_field
-	switch x := m.OneofField.(type) {
-	case *TestAllTypes_OneofUint32:
-		n += proto.SizeVarint(111<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint32))
-	case *TestAllTypes_OneofNestedMessage:
-		s := proto.Size(x.OneofNestedMessage)
-		n += proto.SizeVarint(112<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *TestAllTypes_OneofString:
-		n += proto.SizeVarint(113<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofString)))
-		n += len(x.OneofString)
-	case *TestAllTypes_OneofBytes:
-		n += proto.SizeVarint(114<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.OneofBytes)))
-		n += len(x.OneofBytes)
-	case *TestAllTypes_OneofBool:
-		n += proto.SizeVarint(115<<3 | proto.WireVarint)
-		n += 1
-	case *TestAllTypes_OneofUint64:
-		n += proto.SizeVarint(116<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofUint64))
-	case *TestAllTypes_OneofFloat:
-		n += proto.SizeVarint(117<<3 | proto.WireFixed32)
-		n += 4
-	case *TestAllTypes_OneofDouble:
-		n += proto.SizeVarint(118<<3 | proto.WireFixed64)
-		n += 8
-	case *TestAllTypes_OneofEnum:
-		n += proto.SizeVarint(119<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.OneofEnum))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type TestAllTypes_NestedMessage struct {
-	A           int32         `protobuf:"varint,1,opt,name=a" json:"a,omitempty"`
-	Corecursive *TestAllTypes `protobuf:"bytes,2,opt,name=corecursive" json:"corecursive,omitempty"`
-}
-
-func (m *TestAllTypes_NestedMessage) Reset()                    { *m = TestAllTypes_NestedMessage{} }
-func (m *TestAllTypes_NestedMessage) String() string            { return proto.CompactTextString(m) }
-func (*TestAllTypes_NestedMessage) ProtoMessage()               {}
-func (*TestAllTypes_NestedMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *TestAllTypes_NestedMessage) GetA() int32 {
-	if m != nil {
-		return m.A
-	}
-	return 0
-}
-
-func (m *TestAllTypes_NestedMessage) GetCorecursive() *TestAllTypes {
-	if m != nil {
-		return m.Corecursive
-	}
-	return nil
-}
-
-type ForeignMessage struct {
-	C int32 `protobuf:"varint,1,opt,name=c" json:"c,omitempty"`
-}
-
-func (m *ForeignMessage) Reset()                    { *m = ForeignMessage{} }
-func (m *ForeignMessage) String() string            { return proto.CompactTextString(m) }
-func (*ForeignMessage) ProtoMessage()               {}
-func (*ForeignMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *ForeignMessage) GetC() int32 {
-	if m != nil {
-		return m.C
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*ConformanceRequest)(nil), "conformance.ConformanceRequest")
-	proto.RegisterType((*ConformanceResponse)(nil), "conformance.ConformanceResponse")
-	proto.RegisterType((*TestAllTypes)(nil), "conformance.TestAllTypes")
-	proto.RegisterType((*TestAllTypes_NestedMessage)(nil), "conformance.TestAllTypes.NestedMessage")
-	proto.RegisterType((*ForeignMessage)(nil), "conformance.ForeignMessage")
-	proto.RegisterEnum("conformance.WireFormat", WireFormat_name, WireFormat_value)
-	proto.RegisterEnum("conformance.ForeignEnum", ForeignEnum_name, ForeignEnum_value)
-	proto.RegisterEnum("conformance.TestAllTypes_NestedEnum", TestAllTypes_NestedEnum_name, TestAllTypes_NestedEnum_value)
-}
-
-func init() { proto.RegisterFile("conformance_proto/conformance.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2737 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0xd9, 0x72, 0xdb, 0xc8,
-	0xd5, 0x16, 0x08, 0x59, 0x4b, 0x93, 0x92, 0xa8, 0xd6, 0xd6, 0x96, 0x5d, 0x63, 0x58, 0xb2, 0x7f,
-	0xd3, 0xf6, 0x8c, 0xac, 0x05, 0x86, 0x65, 0xcf, 0x3f, 0x8e, 0x45, 0x9b, 0xb4, 0xe4, 0x8c, 0x25,
-	0x17, 0x64, 0x8d, 0xab, 0x9c, 0x0b, 0x06, 0xa6, 0x20, 0x15, 0xc7, 0x24, 0xc1, 0x01, 0x48, 0x4f,
-	0x94, 0xcb, 0xbc, 0x41, 0xf6, 0x7d, 0xbd, 0xcf, 0x7a, 0x93, 0xa4, 0x92, 0xab, 0x54, 0x6e, 0xb2,
-	0x27, 0x95, 0x3d, 0x79, 0x85, 0xbc, 0x43, 0x52, 0xbd, 0xa2, 0xbb, 0x01, 0x50, 0xf4, 0x54, 0x0d,
-	0x25, 0x1e, 0x7c, 0xfd, 0x9d, 0xd3, 0xe7, 0x1c, 0x7c, 0x2d, 0x1c, 0x18, 0x2c, 0xd7, 0x83, 0xf6,
-	0x51, 0x10, 0xb6, 0xbc, 0x76, 0xdd, 0xaf, 0x75, 0xc2, 0xa0, 0x1b, 0xdc, 0x90, 0x2c, 0x2b, 0xc4,
-	0x02, 0xf3, 0x92, 0x69, 0xf1, 0xec, 0x71, 0x10, 0x1c, 0x37, 0xfd, 0x1b, 0xe4, 0xd2, 0x8b, 0xde,
-	0xd1, 0x0d, 0xaf, 0x7d, 0x42, 0x71, 0x8b, 0x6f, 0xe8, 0x97, 0x0e, 0x7b, 0xa1, 0xd7, 0x6d, 0x04,
-	0x6d, 0x76, 0xdd, 0xd2, 0xaf, 0x1f, 0x35, 0xfc, 0xe6, 0x61, 0xad, 0xe5, 0x45, 0x2f, 0x19, 0xe2,
-	0xbc, 0x8e, 0x88, 0xba, 0x61, 0xaf, 0xde, 0x65, 0x57, 0x2f, 0xe8, 0x57, 0xbb, 0x8d, 0x96, 0x1f,
-	0x75, 0xbd, 0x56, 0x27, 0x2b, 0x80, 0x0f, 0x43, 0xaf, 0xd3, 0xf1, 0xc3, 0x88, 0x5e, 0x5f, 0xfa,
-	0x85, 0x01, 0xe0, 0xfd, 0x78, 0x2f, 0xae, 0xff, 0x41, 0xcf, 0x8f, 0xba, 0xf0, 0x3a, 0x28, 0xf2,
-	0x15, 0xb5, 0x8e, 0x77, 0xd2, 0x0c, 0xbc, 0x43, 0x64, 0x58, 0x46, 0xa9, 0xb0, 0x3d, 0xe4, 0x4e,
-	0xf1, 0x2b, 0x4f, 0xe8, 0x05, 0xb8, 0x0c, 0x0a, 0xef, 0x47, 0x41, 0x5b, 0x00, 0x73, 0x96, 0x51,
-	0x1a, 0xdf, 0x1e, 0x72, 0xf3, 0xd8, 0xca, 0x41, 0x7b, 0x60, 0x21, 0xa4, 0xe4, 0xfe, 0x61, 0x2d,
-	0xe8, 0x75, 0x3b, 0xbd, 0x6e, 0x8d, 0x78, 0xed, 0x22, 0xd3, 0x32, 0x4a, 0x93, 0xeb, 0x0b, 0x2b,
-	0x72, 0x9a, 0x9f, 0x35, 0x42, 0xbf, 0x4a, 0x2e, 0xbb, 0x73, 0x62, 0xdd, 0x1e, 0x59, 0x46, 0xcd,
-	0xe5, 0x71, 0x30, 0xca, 0x1c, 0x2e, 0x7d, 0x2a, 0x07, 0x66, 0x94, 0x4d, 0x44, 0x9d, 0xa0, 0x1d,
-	0xf9, 0xf0, 0x22, 0xc8, 0x77, 0xbc, 0x30, 0xf2, 0x6b, 0x7e, 0x18, 0x06, 0x21, 0xd9, 0x00, 0x8e,
-	0x0b, 0x10, 0x63, 0x05, 0xdb, 0xe0, 0x55, 0x30, 0x15, 0xf9, 0x61, 0xc3, 0x6b, 0x36, 0x3e, 0xc9,
-	0x61, 0x23, 0x0c, 0x36, 0x29, 0x2e, 0x50, 0xe8, 0x65, 0x30, 0x11, 0xf6, 0xda, 0x38, 0xc1, 0x0c,
-	0xc8, 0xf7, 0x59, 0x60, 0x66, 0x0a, 0x4b, 0x4b, 0x9d, 0x39, 0x68, 0xea, 0x86, 0xd3, 0x52, 0xb7,
-	0x08, 0x46, 0xa3, 0x97, 0x8d, 0x4e, 0xc7, 0x3f, 0x44, 0x67, 0xd8, 0x75, 0x6e, 0x28, 0x8f, 0x81,
-	0x91, 0xd0, 0x8f, 0x7a, 0xcd, 0xee, 0xd2, 0x7f, 0xaa, 0xa0, 0xf0, 0xd4, 0x8f, 0xba, 0x5b, 0xcd,
-	0xe6, 0xd3, 0x93, 0x8e, 0x1f, 0xc1, 0xcb, 0x60, 0x32, 0xe8, 0xe0, 0x5e, 0xf3, 0x9a, 0xb5, 0x46,
-	0xbb, 0xbb, 0xb1, 0x4e, 0x12, 0x70, 0xc6, 0x9d, 0xe0, 0xd6, 0x1d, 0x6c, 0xd4, 0x61, 0x8e, 0x4d,
-	0xf6, 0x65, 0x2a, 0x30, 0xc7, 0x86, 0x57, 0xc0, 0x94, 0x80, 0xf5, 0x28, 0x1d, 0xde, 0xd5, 0x84,
-	0x2b, 0x56, 0x1f, 0x10, 0x6b, 0x02, 0xe8, 0xd8, 0x64, 0x57, 0xc3, 0x2a, 0x50, 0x63, 0x8c, 0x28,
-	0x23, 0xde, 0xde, 0x74, 0x0c, 0xdc, 0x4f, 0x32, 0x46, 0x94, 0x11, 0xd7, 0x08, 0xaa, 0x40, 0xc7,
-	0x86, 0x57, 0x41, 0x51, 0x00, 0x8f, 0x1a, 0x9f, 0xf0, 0x0f, 0x37, 0xd6, 0xd1, 0xa8, 0x65, 0x94,
-	0x46, 0x5d, 0x41, 0x50, 0xa5, 0xe6, 0x24, 0xd4, 0xb1, 0xd1, 0x98, 0x65, 0x94, 0x46, 0x34, 0xa8,
-	0x63, 0xc3, 0xeb, 0x60, 0x3a, 0x76, 0xcf, 0x69, 0xc7, 0x2d, 0xa3, 0x34, 0xe5, 0x0a, 0x8e, 0x7d,
-	0x66, 0x4f, 0x01, 0x3b, 0x36, 0x02, 0x96, 0x51, 0x2a, 0xea, 0x60, 0xc7, 0x56, 0x52, 0x7f, 0xd4,
-	0x0c, 0xbc, 0x2e, 0xca, 0x5b, 0x46, 0x29, 0x17, 0xa7, 0xbe, 0x8a, 0x8d, 0xca, 0xfe, 0x0f, 0x83,
-	0xde, 0x8b, 0xa6, 0x8f, 0x0a, 0x96, 0x51, 0x32, 0xe2, 0xfd, 0x3f, 0x20, 0x56, 0xb8, 0x0c, 0xc4,
-	0xca, 0xda, 0x8b, 0x20, 0x68, 0xa2, 0x09, 0xcb, 0x28, 0x8d, 0xb9, 0x05, 0x6e, 0x2c, 0x07, 0x41,
-	0x53, 0xcd, 0x66, 0x37, 0x6c, 0xb4, 0x8f, 0xd1, 0x24, 0xee, 0x2a, 0x29, 0x9b, 0xc4, 0xaa, 0x44,
-	0xf7, 0xe2, 0xa4, 0xeb, 0x47, 0x68, 0x0a, 0xb7, 0x71, 0x1c, 0x5d, 0x19, 0x1b, 0x61, 0x0d, 0x2c,
-	0x08, 0x58, 0x9b, 0xde, 0xde, 0x2d, 0x3f, 0x8a, 0xbc, 0x63, 0x1f, 0x41, 0xcb, 0x28, 0xe5, 0xd7,
-	0xaf, 0x28, 0x37, 0xb6, 0xdc, 0xa2, 0x2b, 0xbb, 0x04, 0xff, 0x98, 0xc2, 0xdd, 0x39, 0xce, 0xa3,
-	0x98, 0xe1, 0x01, 0x40, 0x71, 0x96, 0x82, 0xd0, 0x6f, 0x1c, 0xb7, 0x85, 0x87, 0x19, 0xe2, 0xe1,
-	0x9c, 0xe2, 0xa1, 0x4a, 0x31, 0x9c, 0x75, 0x5e, 0x24, 0x53, 0xb1, 0xc3, 0xf7, 0xc0, 0xac, 0x1e,
-	0xb7, 0xdf, 0xee, 0xb5, 0xd0, 0x1c, 0x51, 0xa3, 0x4b, 0xa7, 0x05, 0x5d, 0x69, 0xf7, 0x5a, 0x2e,
-	0x54, 0x23, 0xc6, 0x36, 0xf8, 0x2e, 0x98, 0x4b, 0x84, 0x4b, 0x88, 0xe7, 0x09, 0x31, 0x4a, 0x8b,
-	0x95, 0x90, 0xcd, 0x68, 0x81, 0x12, 0x36, 0x47, 0x62, 0xa3, 0xd5, 0xaa, 0x75, 0x1a, 0x7e, 0xdd,
-	0x47, 0x08, 0xd7, 0xac, 0x9c, 0x1b, 0xcb, 0xc5, 0xeb, 0x68, 0xdd, 0x9e, 0xe0, 0xcb, 0xf0, 0x8a,
-	0xd4, 0x0a, 0xf5, 0x20, 0x3c, 0x44, 0x67, 0x19, 0xde, 0x88, 0xdb, 0xe1, 0x7e, 0x10, 0x1e, 0xc2,
-	0x2a, 0x98, 0x0e, 0xfd, 0x7a, 0x2f, 0x8c, 0x1a, 0xaf, 0x7c, 0x91, 0xd6, 0x73, 0x24, 0xad, 0x67,
-	0x33, 0x73, 0xe0, 0x16, 0xc5, 0x1a, 0x9e, 0xce, 0xcb, 0x60, 0x32, 0xf4, 0x3b, 0xbe, 0x87, 0xf3,
-	0x48, 0x6f, 0xe6, 0x0b, 0x96, 0x89, 0xd5, 0x86, 0x5b, 0x85, 0xda, 0xc8, 0x30, 0xc7, 0x46, 0x96,
-	0x65, 0x62, 0xb5, 0x91, 0x60, 0x54, 0x1b, 0x04, 0x8c, 0xa9, 0xcd, 0x45, 0xcb, 0xc4, 0x6a, 0xc3,
-	0xcd, 0xb1, 0xda, 0x28, 0x40, 0xc7, 0x46, 0x4b, 0x96, 0x89, 0xd5, 0x46, 0x06, 0x6a, 0x8c, 0x4c,
-	0x6d, 0x96, 0x2d, 0x13, 0xab, 0x0d, 0x37, 0xef, 0x27, 0x19, 0x99, 0xda, 0x5c, 0xb2, 0x4c, 0xac,
-	0x36, 0x32, 0x90, 0xaa, 0x8d, 0x00, 0x72, 0x59, 0xb8, 0x6c, 0x99, 0x58, 0x6d, 0xb8, 0x5d, 0x52,
-	0x1b, 0x15, 0xea, 0xd8, 0xe8, 0xff, 0x2c, 0x13, 0xab, 0x8d, 0x02, 0xa5, 0x6a, 0x13, 0xbb, 0xe7,
-	0xb4, 0x57, 0x2c, 0x13, 0xab, 0x8d, 0x08, 0x40, 0x52, 0x1b, 0x0d, 0xec, 0xd8, 0xa8, 0x64, 0x99,
-	0x58, 0x6d, 0x54, 0x30, 0x55, 0x9b, 0x38, 0x08, 0xa2, 0x36, 0x57, 0x2d, 0x13, 0xab, 0x8d, 0x08,
-	0x81, 0xab, 0x8d, 0x80, 0x31, 0xb5, 0xb9, 0x66, 0x99, 0x58, 0x6d, 0xb8, 0x39, 0x56, 0x1b, 0x01,
-	0x24, 0x6a, 0x73, 0xdd, 0x32, 0xb1, 0xda, 0x70, 0x23, 0x57, 0x9b, 0x38, 0x42, 0xaa, 0x36, 0x6f,
-	0x5a, 0x26, 0x56, 0x1b, 0x11, 0x9f, 0x50, 0x9b, 0x98, 0x8d, 0xa8, 0xcd, 0x5b, 0x96, 0x89, 0xd5,
-	0x46, 0xd0, 0x71, 0xb5, 0x11, 0x30, 0x4d, 0x6d, 0x56, 0x2d, 0xf3, 0xb5, 0xd4, 0x86, 0xf3, 0x24,
-	0xd4, 0x26, 0xce, 0x92, 0xa6, 0x36, 0x6b, 0xc4, 0x43, 0x7f, 0xb5, 0x11, 0xc9, 0x4c, 0xa8, 0x8d,
-	0x1e, 0x37, 0x11, 0x85, 0x0d, 0xcb, 0x1c, 0x5c, 0x6d, 0xd4, 0x88, 0xb9, 0xda, 0x24, 0xc2, 0x25,
-	0xc4, 0x36, 0x21, 0xee, 0xa3, 0x36, 0x5a, 0xa0, 0x5c, 0x6d, 0xb4, 0x6a, 0x31, 0xb5, 0x71, 0x70,
-	0xcd, 0xa8, 0xda, 0xa8, 0x75, 0x13, 0x6a, 0x23, 0xd6, 0x11, 0xb5, 0xb9, 0xc5, 0xf0, 0x46, 0xdc,
-	0x0e, 0x44, 0x6d, 0x9e, 0x82, 0xa9, 0x96, 0xd7, 0xa1, 0x02, 0xc1, 0x64, 0x62, 0x93, 0x24, 0xf5,
-	0xcd, 0xec, 0x0c, 0x3c, 0xf6, 0x3a, 0x44, 0x3b, 0xc8, 0x47, 0xa5, 0xdd, 0x0d, 0x4f, 0xdc, 0x89,
-	0x96, 0x6c, 0x93, 0x58, 0x1d, 0x9b, 0xa9, 0xca, 0xed, 0xc1, 0x58, 0x1d, 0x9b, 0x7c, 0x28, 0xac,
-	0xcc, 0x06, 0x9f, 0x83, 0x69, 0xcc, 0x4a, 0xe5, 0x87, 0xab, 0xd0, 0x1d, 0xc2, 0xbb, 0xd2, 0x97,
-	0x97, 0x4a, 0x13, 0xfd, 0xa4, 0xcc, 0x38, 0x3c, 0xd9, 0x2a, 0x73, 0x3b, 0x36, 0x17, 0xae, 0xb7,
-	0x07, 0xe4, 0x76, 0x6c, 0xfa, 0xa9, 0x72, 0x73, 0x2b, 0xe7, 0xa6, 0x22, 0xc7, 0xb5, 0xee, 0xff,
-	0x07, 0xe0, 0xa6, 0x02, 0xb8, 0xaf, 0xc5, 0x2d, 0x5b, 0x65, 0x6e, 0xc7, 0xe6, 0xf2, 0xf8, 0xce,
-	0x80, 0xdc, 0x8e, 0xbd, 0xaf, 0xc5, 0x2d, 0x5b, 0xe1, 0xc7, 0xc1, 0x0c, 0xe6, 0x66, 0xda, 0x26,
-	0x24, 0xf5, 0x2e, 0x61, 0x5f, 0xed, 0xcb, 0xce, 0x74, 0x96, 0xfd, 0xa0, 0xfc, 0x38, 0x50, 0xd5,
-	0xae, 0x78, 0x70, 0x6c, 0xa1, 0xc4, 0x1f, 0x19, 0xd4, 0x83, 0x63, 0xb3, 0x1f, 0x9a, 0x07, 0x61,
-	0x87, 0x47, 0x60, 0x8e, 0xe4, 0x87, 0x6f, 0x42, 0x28, 0xf8, 0x3d, 0xe2, 0x63, 0xbd, 0x7f, 0x8e,
-	0x18, 0x98, 0xff, 0xa4, 0x5e, 0x70, 0xc8, 0xfa, 0x15, 0xd5, 0x0f, 0xae, 0x04, 0xdf, 0xcb, 0xd6,
-	0xc0, 0x7e, 0x1c, 0x9b, 0xff, 0xd4, 0xfd, 0xc4, 0x57, 0xd4, 0xfb, 0x95, 0x1e, 0x1a, 0xe5, 0x41,
-	0xef, 0x57, 0x72, 0x9c, 0x68, 0xf7, 0x2b, 0x3d, 0x62, 0x9e, 0x81, 0x62, 0xcc, 0xca, 0xce, 0x98,
-	0xfb, 0x84, 0xf6, 0xad, 0xd3, 0x69, 0xe9, 0xe9, 0x43, 0x79, 0x27, 0x5b, 0x8a, 0x11, 0xee, 0x02,
-	0xec, 0x89, 0x9c, 0x46, 0xf4, 0x48, 0x7a, 0x40, 0x58, 0xaf, 0xf5, 0x65, 0xc5, 0xe7, 0x14, 0xfe,
-	0x9f, 0x52, 0xe6, 0x5b, 0xb1, 0x45, 0xb4, 0x3b, 0x95, 0x42, 0x76, 0x7e, 0x55, 0x06, 0x69, 0x77,
-	0x02, 0xa5, 0x9f, 0x52, 0xbb, 0x4b, 0x56, 0x9e, 0x04, 0xc6, 0x4d, 0x8f, 0xbc, 0xea, 0x00, 0x49,
-	0xa0, 0xcb, 0xc9, 0x69, 0x18, 0x27, 0x41, 0x32, 0xc2, 0x0e, 0x38, 0x2b, 0x11, 0x6b, 0x87, 0xe4,
-	0x43, 0xe2, 0xe1, 0xe6, 0x00, 0x1e, 0x94, 0x63, 0x91, 0x7a, 0x9a, 0x6f, 0xa5, 0x5e, 0x84, 0x11,
-	0x58, 0x94, 0x3c, 0xea, 0xa7, 0xe6, 0x36, 0x71, 0xe9, 0x0c, 0xe0, 0x52, 0x3d, 0x33, 0xa9, 0xcf,
-	0x85, 0x56, 0xfa, 0x55, 0x78, 0x0c, 0xe6, 0x93, 0xdb, 0x24, 0x47, 0xdf, 0xce, 0x20, 0xf7, 0x80,
-	0xb4, 0x0d, 0x7c, 0xf4, 0x49, 0xf7, 0x80, 0x76, 0x05, 0xbe, 0x0f, 0x16, 0x52, 0x76, 0x47, 0x3c,
-	0x3d, 0x22, 0x9e, 0x36, 0x06, 0xdf, 0x5a, 0xec, 0x6a, 0xb6, 0x95, 0x72, 0x09, 0x2e, 0x83, 0x42,
-	0xd0, 0xf6, 0x83, 0x23, 0x7e, 0xdc, 0x04, 0xf8, 0x11, 0x7b, 0x7b, 0xc8, 0xcd, 0x13, 0x2b, 0x3b,
-	0x3c, 0x3e, 0x06, 0x66, 0x29, 0x48, 0xab, 0x6d, 0xe7, 0xb5, 0x1e, 0xb7, 0xb6, 0x87, 0x5c, 0x48,
-	0x68, 0xd4, 0x5a, 0x8a, 0x08, 0x58, 0xb7, 0x7f, 0xc0, 0x27, 0x12, 0xc4, 0xca, 0x7a, 0xf7, 0x22,
-	0xa0, 0x5f, 0x59, 0xdb, 0x86, 0x6c, 0xbc, 0x01, 0x88, 0x91, 0x76, 0xe1, 0x05, 0x00, 0x18, 0x04,
-	0xdf, 0x87, 0x11, 0x7e, 0x10, 0xdd, 0x1e, 0x72, 0xc7, 0x29, 0x02, 0xdf, 0x5b, 0xca, 0x56, 0x1d,
-	0x1b, 0x75, 0x2d, 0xa3, 0x34, 0xac, 0x6c, 0xd5, 0xb1, 0x63, 0x47, 0x54, 0x7b, 0x7a, 0xf8, 0xf1,
-	0x58, 0x38, 0xa2, 0x62, 0x22, 0x78, 0x98, 0x90, 0xbc, 0xc2, 0x8f, 0xc6, 0x82, 0x87, 0x09, 0x43,
-	0x85, 0x47, 0x43, 0xca, 0xf6, 0xe1, 0xe0, 0x8f, 0x78, 0x22, 0x66, 0x52, 0x9e, 0x3d, 0xe9, 0x69,
-	0x8c, 0x88, 0x0c, 0x9b, 0xa6, 0xa1, 0x5f, 0x19, 0x24, 0xf7, 0x8b, 0x2b, 0x74, 0xdc, 0xb6, 0xc2,
-	0xe7, 0x3c, 0x2b, 0x78, 0xab, 0xef, 0x79, 0xcd, 0x9e, 0x1f, 0x3f, 0xa6, 0x61, 0xd3, 0x33, 0xba,
-	0x0e, 0xba, 0x60, 0x5e, 0x9d, 0xd1, 0x08, 0xc6, 0x5f, 0x1b, 0xec, 0xd1, 0x56, 0x67, 0x24, 0x7a,
-	0x47, 0x29, 0x67, 0x95, 0x49, 0x4e, 0x06, 0xa7, 0x63, 0x0b, 0xce, 0xdf, 0xf4, 0xe1, 0x74, 0xec,
-	0x24, 0xa7, 0x63, 0x73, 0xce, 0x03, 0xe9, 0x21, 0xbf, 0xa7, 0x06, 0xfa, 0x5b, 0x4a, 0x7a, 0x3e,
-	0x41, 0x7a, 0x20, 0x45, 0x3a, 0xa7, 0x0e, 0x89, 0xb2, 0x68, 0xa5, 0x58, 0x7f, 0xd7, 0x8f, 0x96,
-	0x07, 0x3b, 0xa7, 0x8e, 0x94, 0xd2, 0x32, 0x40, 0x1a, 0x47, 0xb0, 0xfe, 0x3e, 0x2b, 0x03, 0xa4,
-	0x97, 0xb4, 0x0c, 0x10, 0x5b, 0x5a, 0xa8, 0xb4, 0xd3, 0x04, 0xe9, 0x1f, 0xb2, 0x42, 0xa5, 0xcd,
-	0xa7, 0x85, 0x4a, 0x8d, 0x69, 0xb4, 0x4c, 0x61, 0x38, 0xed, 0x1f, 0xb3, 0x68, 0xe9, 0x4d, 0xa8,
-	0xd1, 0x52, 0x63, 0x5a, 0x06, 0xc8, 0x3d, 0x2a, 0x58, 0xff, 0x94, 0x95, 0x01, 0x72, 0xdb, 0x6a,
-	0x19, 0x20, 0x36, 0xce, 0xb9, 0x27, 0x3d, 0x1c, 0x28, 0xcd, 0xff, 0x67, 0x83, 0xc8, 0x60, 0xdf,
-	0xe6, 0x97, 0x1f, 0x0a, 0xa5, 0x20, 0xd5, 0x91, 0x81, 0x60, 0xfc, 0x8b, 0xc1, 0x9e, 0xb4, 0xfa,
-	0x35, 0xbf, 0x32, 0x58, 0xc8, 0xe0, 0x94, 0x1a, 0xea, 0xaf, 0x7d, 0x38, 0x45, 0xf3, 0x2b, 0x53,
-	0x08, 0xa9, 0x46, 0xda, 0x30, 0x42, 0x90, 0xfe, 0x8d, 0x92, 0x9e, 0xd2, 0xfc, 0xea, 0xcc, 0x22,
-	0x8b, 0x56, 0x8a, 0xf5, 0xef, 0xfd, 0x68, 0x45, 0xf3, 0xab, 0x13, 0x8e, 0xb4, 0x0c, 0xa8, 0xcd,
-	0xff, 0x8f, 0xac, 0x0c, 0xc8, 0xcd, 0xaf, 0x0c, 0x03, 0xd2, 0x42, 0xd5, 0x9a, 0xff, 0x9f, 0x59,
-	0xa1, 0x2a, 0xcd, 0xaf, 0x8e, 0x0e, 0xd2, 0x68, 0xb5, 0xe6, 0xff, 0x57, 0x16, 0xad, 0xd2, 0xfc,
-	0xea, 0xb3, 0x68, 0x5a, 0x06, 0xd4, 0xe6, 0xff, 0x77, 0x56, 0x06, 0xe4, 0xe6, 0x57, 0x06, 0x0e,
-	0x9c, 0xf3, 0xa1, 0x34, 0xd7, 0xe5, 0xef, 0x70, 0xd0, 0x77, 0x73, 0x6c, 0x4e, 0x96, 0xd8, 0x3b,
-	0x43, 0xc4, 0x33, 0x5f, 0x6e, 0x81, 0x8f, 0x80, 0x18, 0x1a, 0xd6, 0xc4, 0xcb, 0x1a, 0xf4, 0xbd,
-	0x5c, 0xc6, 0xf9, 0xf1, 0x94, 0x43, 0x5c, 0xe1, 0x5f, 0x98, 0xe0, 0x47, 0xc1, 0x8c, 0x34, 0xc4,
-	0xe6, 0x2f, 0x8e, 0xd0, 0xf7, 0xb3, 0xc8, 0xaa, 0x18, 0xf3, 0xd8, 0x8b, 0x5e, 0xc6, 0x64, 0xc2,
-	0x04, 0xb7, 0xd4, 0xb9, 0x70, 0xaf, 0xde, 0x45, 0x3f, 0xa0, 0x44, 0x0b, 0x69, 0x45, 0xe8, 0xd5,
-	0xbb, 0xca, 0xc4, 0xb8, 0x57, 0xef, 0xc2, 0x4d, 0x20, 0x66, 0x8b, 0x35, 0xaf, 0x7d, 0x82, 0x7e,
-	0x48, 0xd7, 0xcf, 0x26, 0xd6, 0x6f, 0xb5, 0x4f, 0xdc, 0x3c, 0x87, 0x6e, 0xb5, 0x4f, 0xe0, 0x5d,
-	0x69, 0xd6, 0xfc, 0x0a, 0x97, 0x01, 0xfd, 0x88, 0xae, 0x9d, 0x4f, 0xac, 0xa5, 0x55, 0x12, 0xd3,
-	0x4d, 0xf2, 0x15, 0x97, 0x27, 0x6e, 0x50, 0x5e, 0x9e, 0x1f, 0xe7, 0x48, 0xb5, 0xfb, 0x95, 0x47,
-	0xf4, 0xa5, 0x54, 0x1e, 0x41, 0x14, 0x97, 0xe7, 0x27, 0xb9, 0x0c, 0x85, 0x93, 0xca, 0xc3, 0x97,
-	0xc5, 0xe5, 0x91, 0xb9, 0x48, 0x79, 0x48, 0x75, 0x7e, 0x9a, 0xc5, 0x25, 0x55, 0x27, 0x1e, 0x0a,
-	0xb2, 0x55, 0xb8, 0x3a, 0xf2, 0xad, 0x82, 0xab, 0xf3, 0x4b, 0x4a, 0x94, 0x5d, 0x1d, 0xe9, 0xee,
-	0x60, 0xd5, 0x11, 0x14, 0xb8, 0x3a, 0x3f, 0xa3, 0xeb, 0x33, 0xaa, 0xc3, 0xa1, 0xac, 0x3a, 0x62,
-	0x25, 0xad, 0xce, 0xcf, 0xe9, 0xda, 0xcc, 0xea, 0x70, 0x38, 0xad, 0xce, 0x05, 0x00, 0xc8, 0xfe,
-	0xdb, 0x5e, 0xcb, 0x5f, 0x43, 0x9f, 0x36, 0xc9, 0x6b, 0x28, 0xc9, 0x04, 0x2d, 0x90, 0xa7, 0xfd,
-	0x8b, 0xbf, 0xae, 0xa3, 0xcf, 0xc8, 0x88, 0x5d, 0x6c, 0x82, 0x17, 0x41, 0xa1, 0x16, 0x43, 0x36,
-	0xd0, 0x67, 0x19, 0xa4, 0xca, 0x21, 0x1b, 0x70, 0x09, 0x4c, 0x50, 0x04, 0x81, 0xd8, 0x35, 0xf4,
-	0x39, 0x9d, 0x86, 0xfc, 0x3d, 0x49, 0xbe, 0xad, 0x62, 0xc8, 0x4d, 0xf4, 0x79, 0x8a, 0x90, 0x6d,
-	0x70, 0x99, 0xd3, 0xac, 0x12, 0x1e, 0x07, 0x7d, 0x41, 0x01, 0x61, 0x1e, 0x47, 0xec, 0x08, 0x7f,
-	0xbb, 0x85, 0xbe, 0xa8, 0x3b, 0xba, 0x85, 0x01, 0x22, 0xb4, 0x4d, 0xf4, 0x25, 0x3d, 0xda, 0xcd,
-	0x78, 0xcb, 0xf8, 0xeb, 0x6d, 0xf4, 0x65, 0x9d, 0xe2, 0x36, 0x5c, 0x02, 0x85, 0xaa, 0x40, 0xac,
-	0xad, 0xa2, 0xaf, 0xb0, 0x38, 0x04, 0xc9, 0xda, 0x2a, 0xc1, 0xec, 0x54, 0xde, 0x7d, 0x50, 0xdb,
-	0xdd, 0x7a, 0x5c, 0x59, 0x5b, 0x43, 0x5f, 0xe5, 0x18, 0x6c, 0xa4, 0xb6, 0x18, 0x43, 0x72, 0xbd,
-	0x8e, 0xbe, 0xa6, 0x60, 0x88, 0x0d, 0x5e, 0x02, 0x93, 0x35, 0x29, 0xbf, 0x6b, 0x1b, 0xe8, 0xeb,
-	0x09, 0x6f, 0x1b, 0x14, 0x55, 0x8d, 0x51, 0x36, 0xfa, 0x46, 0x02, 0x65, 0xc7, 0x09, 0xa4, 0xa0,
-	0x9b, 0xe8, 0x9b, 0x72, 0x02, 0x09, 0x48, 0xca, 0x32, 0xdd, 0x9d, 0x83, 0xbe, 0x95, 0x00, 0x39,
-	0xd8, 0x9f, 0x14, 0xd3, 0xad, 0x5a, 0x0d, 0x7d, 0x3b, 0x81, 0xba, 0x85, 0x51, 0x52, 0x4c, 0x9b,
-	0xb5, 0x1a, 0xfa, 0x4e, 0x22, 0xaa, 0xcd, 0xc5, 0xe7, 0x60, 0x42, 0x7d, 0xd0, 0x29, 0x00, 0xc3,
-	0x63, 0x6f, 0x44, 0x0d, 0x0f, 0xbe, 0x0d, 0xf2, 0xf5, 0x40, 0xbc, 0xd4, 0x40, 0xb9, 0xd3, 0x5e,
-	0x80, 0xc8, 0xe8, 0xc5, 0x7b, 0x00, 0x26, 0x87, 0x94, 0xb0, 0x08, 0xcc, 0x97, 0xfe, 0x09, 0x73,
-	0x81, 0x7f, 0x85, 0xb3, 0xe0, 0x0c, 0xbd, 0x7d, 0x72, 0xc4, 0x46, 0xbf, 0xdc, 0xc9, 0x6d, 0x1a,
-	0x31, 0x83, 0x3c, 0x90, 0x94, 0x19, 0xcc, 0x14, 0x06, 0x53, 0x66, 0x28, 0x83, 0xd9, 0xb4, 0xd1,
-	0xa3, 0xcc, 0x31, 0x91, 0xc2, 0x31, 0x91, 0xce, 0xa1, 0x8c, 0x18, 0x65, 0x8e, 0xe1, 0x14, 0x8e,
-	0xe1, 0x24, 0x47, 0x62, 0x94, 0x28, 0x73, 0x4c, 0xa7, 0x70, 0x4c, 0xa7, 0x73, 0x28, 0x23, 0x43,
-	0x99, 0x03, 0xa6, 0x70, 0x40, 0x99, 0xe3, 0x01, 0x98, 0x4f, 0x1f, 0x0c, 0xca, 0x2c, 0xa3, 0x29,
-	0x2c, 0xa3, 0x19, 0x2c, 0xea, 0xf0, 0x4f, 0x66, 0x19, 0x49, 0x61, 0x19, 0x91, 0x59, 0xaa, 0x00,
-	0x65, 0x8d, 0xf7, 0x64, 0x9e, 0xa9, 0x14, 0x9e, 0xa9, 0x2c, 0x1e, 0x6d, 0x7c, 0x27, 0xf3, 0x14,
-	0x53, 0x78, 0x8a, 0xa9, 0xdd, 0x26, 0x0f, 0xe9, 0x4e, 0xeb, 0xd7, 0x9c, 0xcc, 0xb0, 0x05, 0x66,
-	0x52, 0xe6, 0x71, 0xa7, 0x51, 0x18, 0x32, 0xc5, 0x5d, 0x50, 0xd4, 0x87, 0x6f, 0xf2, 0xfa, 0xb1,
-	0x94, 0xf5, 0x63, 0x29, 0x4d, 0xa2, 0x0f, 0xda, 0x64, 0x8e, 0xf1, 0x14, 0x8e, 0xf1, 0xe4, 0x36,
-	0xf4, 0x89, 0xda, 0x69, 0x14, 0x05, 0x99, 0x22, 0x04, 0xe7, 0xfa, 0x8c, 0xcc, 0x52, 0xa8, 0xde,
-	0x91, 0xa9, 0x5e, 0xe3, 0x7d, 0x95, 0xe4, 0xf3, 0x18, 0x9c, 0xef, 0x37, 0x33, 0x4b, 0x71, 0xba,
-	0xa6, 0x3a, 0xed, 0xfb, 0x0a, 0x4b, 0x72, 0xd4, 0xa4, 0x0d, 0x97, 0x36, 0x2b, 0x4b, 0x71, 0x72,
-	0x47, 0x76, 0x32, 0xe8, 0x4b, 0x2d, 0xc9, 0x9b, 0x07, 0xce, 0x66, 0xce, 0xcb, 0x52, 0xdc, 0xad,
-	0xa8, 0xee, 0xb2, 0x5f, 0x75, 0xc5, 0x2e, 0x96, 0x6e, 0x03, 0x20, 0x4d, 0xf6, 0x46, 0x81, 0x59,
-	0xdd, 0xdb, 0x2b, 0x0e, 0xe1, 0x5f, 0xca, 0x5b, 0x6e, 0xd1, 0xa0, 0xbf, 0x3c, 0x2f, 0xe6, 0xb0,
-	0xbb, 0xdd, 0xca, 0xc3, 0xe2, 0x7f, 0xf9, 0x7f, 0x46, 0x79, 0x42, 0x8c, 0xa2, 0xf0, 0xa9, 0xb2,
-	0xf4, 0x06, 0x98, 0xd4, 0x06, 0x92, 0x05, 0x60, 0xd4, 0xf9, 0x81, 0x52, 0xbf, 0x76, 0x13, 0x80,
-	0xf8, 0xdf, 0x30, 0xc1, 0x29, 0x90, 0x3f, 0xd8, 0xdd, 0x7f, 0x52, 0xb9, 0xbf, 0x53, 0xdd, 0xa9,
-	0x3c, 0x28, 0x0e, 0xc1, 0x02, 0x18, 0x7b, 0xe2, 0xee, 0x3d, 0xdd, 0x2b, 0x1f, 0x54, 0x8b, 0x06,
-	0x1c, 0x03, 0xc3, 0x8f, 0xf6, 0xf7, 0x76, 0x8b, 0xb9, 0x6b, 0xf7, 0x40, 0x5e, 0x9e, 0x07, 0x4e,
-	0x81, 0x7c, 0x75, 0xcf, 0xad, 0xec, 0x3c, 0xdc, 0xad, 0xd1, 0x48, 0x25, 0x03, 0x8d, 0x58, 0x31,
-	0x3c, 0x2f, 0xe6, 0xca, 0x17, 0xc1, 0x85, 0x7a, 0xd0, 0x4a, 0xfc, 0x61, 0x26, 0x25, 0xe7, 0xc5,
-	0x08, 0xb1, 0x6e, 0xfc, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x33, 0xc2, 0x0c, 0xb6, 0xeb, 0x26, 0x00,
-	0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto b/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto
deleted file mode 100644
index 95a8fd135f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/_conformance/conformance_proto/conformance.proto
+++ /dev/null
@@ -1,285 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-package conformance;
-option java_package = "com.google.protobuf.conformance";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/field_mask.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-// This defines the conformance testing protocol.  This protocol exists between
-// the conformance test suite itself and the code being tested.  For each test,
-// the suite will send a ConformanceRequest message and expect a
-// ConformanceResponse message.
-//
-// You can either run the tests in two different ways:
-//
-//   1. in-process (using the interface in conformance_test.h).
-//
-//   2. as a sub-process communicating over a pipe.  Information about how to
-//      do this is in conformance_test_runner.cc.
-//
-// Pros/cons of the two approaches:
-//
-//   - running as a sub-process is much simpler for languages other than C/C++.
-//
-//   - running as a sub-process may be more tricky in unusual environments like
-//     iOS apps, where fork/stdin/stdout are not available.
-
-enum WireFormat {
-  UNSPECIFIED = 0;
-  PROTOBUF = 1;
-  JSON = 2;
-}
-
-// Represents a single test case's input.  The testee should:
-//
-//   1. parse this proto (which should always succeed)
-//   2. parse the protobuf or JSON payload in "payload" (which may fail)
-//   3. if the parse succeeded, serialize the message in the requested format.
-message ConformanceRequest {
-  // The payload (whether protobuf of JSON) is always for a TestAllTypes proto
-  // (see below).
-  oneof payload {
-    bytes protobuf_payload = 1;
-    string json_payload = 2;
-  }
-
-  // Which format should the testee serialize its message to?
-  WireFormat requested_output_format = 3;
-}
-
-// Represents a single test case's output.
-message ConformanceResponse {
-  oneof result {
-    // This string should be set to indicate parsing failed.  The string can
-    // provide more information about the parse error if it is available.
-    //
-    // Setting this string does not necessarily mean the testee failed the
-    // test.  Some of the test cases are intentionally invalid input.
-    string parse_error = 1;
-
-    // If the input was successfully parsed but errors occurred when
-    // serializing it to the requested output format, set the error message in
-    // this field.
-    string serialize_error = 6;
-
-    // This should be set if some other error occurred.  This will always
-    // indicate that the test failed.  The string can provide more information
-    // about the failure.
-    string runtime_error = 2;
-
-    // If the input was successfully parsed and the requested output was
-    // protobuf, serialize it to protobuf and set it in this field.
-    bytes protobuf_payload = 3;
-
-    // If the input was successfully parsed and the requested output was JSON,
-    // serialize to JSON and set it in this field.
-    string json_payload = 4;
-
-    // For when the testee skipped the test, likely because a certain feature
-    // wasn't supported, like JSON input/output.
-    string skipped = 5;
-  }
-}
-
-// This proto includes every type of field in both singular and repeated
-// forms.
-message TestAllTypes {
-  message NestedMessage {
-    int32 a = 1;
-    TestAllTypes corecursive = 2;
-  }
-
-  enum NestedEnum {
-    FOO = 0;
-    BAR = 1;
-    BAZ = 2;
-    NEG = -1;  // Intentionally negative.
-  }
-
-  // Singular
-  int32 optional_int32    =  1;
-  int64 optional_int64    =  2;
-  uint32 optional_uint32   =  3;
-  uint64 optional_uint64   =  4;
-  sint32 optional_sint32   =  5;
-  sint64 optional_sint64   =  6;
-  fixed32 optional_fixed32  =  7;
-  fixed64 optional_fixed64  =  8;
-  sfixed32 optional_sfixed32 =  9;
-  sfixed64 optional_sfixed64 = 10;
-  float optional_float    = 11;
-  double optional_double   = 12;
-  bool optional_bool     = 13;
-  string optional_string   = 14;
-  bytes optional_bytes    = 15;
-
-  NestedMessage                        optional_nested_message  = 18;
-  ForeignMessage                       optional_foreign_message = 19;
-
-  NestedEnum                           optional_nested_enum     = 21;
-  ForeignEnum                          optional_foreign_enum    = 22;
-
-  string optional_string_piece = 24 [ctype=STRING_PIECE];
-  string optional_cord = 25 [ctype=CORD];
-
-  TestAllTypes recursive_message = 27;
-
-  // Repeated
-  repeated    int32 repeated_int32    = 31;
-  repeated    int64 repeated_int64    = 32;
-  repeated   uint32 repeated_uint32   = 33;
-  repeated   uint64 repeated_uint64   = 34;
-  repeated   sint32 repeated_sint32   = 35;
-  repeated   sint64 repeated_sint64   = 36;
-  repeated  fixed32 repeated_fixed32  = 37;
-  repeated  fixed64 repeated_fixed64  = 38;
-  repeated sfixed32 repeated_sfixed32 = 39;
-  repeated sfixed64 repeated_sfixed64 = 40;
-  repeated    float repeated_float    = 41;
-  repeated   double repeated_double   = 42;
-  repeated     bool repeated_bool     = 43;
-  repeated   string repeated_string   = 44;
-  repeated    bytes repeated_bytes    = 45;
-
-  repeated NestedMessage                        repeated_nested_message  = 48;
-  repeated ForeignMessage                       repeated_foreign_message = 49;
-
-  repeated NestedEnum                           repeated_nested_enum     = 51;
-  repeated ForeignEnum                          repeated_foreign_enum    = 52;
-
-  repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
-  repeated string repeated_cord = 55 [ctype=CORD];
-
-  // Map
-  map <   int32, int32>    map_int32_int32 = 56;
-  map <   int64, int64>    map_int64_int64 = 57;
-  map <  uint32, uint32>   map_uint32_uint32 = 58;
-  map <  uint64, uint64>   map_uint64_uint64 = 59;
-  map <  sint32, sint32>   map_sint32_sint32 = 60;
-  map <  sint64, sint64>   map_sint64_sint64 = 61;
-  map < fixed32, fixed32>  map_fixed32_fixed32 = 62;
-  map < fixed64, fixed64>  map_fixed64_fixed64 = 63;
-  map <sfixed32, sfixed32> map_sfixed32_sfixed32 = 64;
-  map <sfixed64, sfixed64> map_sfixed64_sfixed64 = 65;
-  map <   int32, float>    map_int32_float = 66;
-  map <   int32, double>   map_int32_double = 67;
-  map <    bool, bool>     map_bool_bool = 68;
-  map <  string, string>   map_string_string = 69;
-  map <  string, bytes>    map_string_bytes = 70;
-  map <  string, NestedMessage>  map_string_nested_message = 71;
-  map <  string, ForeignMessage> map_string_foreign_message = 72;
-  map <  string, NestedEnum>     map_string_nested_enum = 73;
-  map <  string, ForeignEnum>    map_string_foreign_enum = 74;
-
-  oneof oneof_field {
-    uint32 oneof_uint32 = 111;
-    NestedMessage oneof_nested_message = 112;
-    string oneof_string = 113;
-    bytes oneof_bytes = 114;
-    bool oneof_bool = 115;
-    uint64 oneof_uint64 = 116;
-    float oneof_float = 117;
-    double oneof_double = 118;
-    NestedEnum oneof_enum = 119;
-  }
-
-  // Well-known types
-  google.protobuf.BoolValue optional_bool_wrapper = 201;
-  google.protobuf.Int32Value optional_int32_wrapper = 202;
-  google.protobuf.Int64Value optional_int64_wrapper = 203;
-  google.protobuf.UInt32Value optional_uint32_wrapper = 204;
-  google.protobuf.UInt64Value optional_uint64_wrapper = 205;
-  google.protobuf.FloatValue optional_float_wrapper = 206;
-  google.protobuf.DoubleValue optional_double_wrapper = 207;
-  google.protobuf.StringValue optional_string_wrapper = 208;
-  google.protobuf.BytesValue optional_bytes_wrapper = 209;
-
-  repeated google.protobuf.BoolValue repeated_bool_wrapper = 211;
-  repeated google.protobuf.Int32Value repeated_int32_wrapper = 212;
-  repeated google.protobuf.Int64Value repeated_int64_wrapper = 213;
-  repeated google.protobuf.UInt32Value repeated_uint32_wrapper = 214;
-  repeated google.protobuf.UInt64Value repeated_uint64_wrapper = 215;
-  repeated google.protobuf.FloatValue repeated_float_wrapper = 216;
-  repeated google.protobuf.DoubleValue repeated_double_wrapper = 217;
-  repeated google.protobuf.StringValue repeated_string_wrapper = 218;
-  repeated google.protobuf.BytesValue repeated_bytes_wrapper = 219;
-
-  google.protobuf.Duration optional_duration = 301;
-  google.protobuf.Timestamp optional_timestamp = 302;
-  google.protobuf.FieldMask optional_field_mask = 303;
-  google.protobuf.Struct optional_struct = 304;
-  google.protobuf.Any optional_any = 305;
-  google.protobuf.Value optional_value = 306;
-
-  repeated google.protobuf.Duration repeated_duration = 311;
-  repeated google.protobuf.Timestamp repeated_timestamp = 312;
-  repeated google.protobuf.FieldMask repeated_fieldmask = 313;
-  repeated google.protobuf.Struct repeated_struct = 324;
-  repeated google.protobuf.Any repeated_any = 315;
-  repeated google.protobuf.Value repeated_value = 316;
-
-  // Test field-name-to-JSON-name convention.
-  // (protobuf says names can be any valid C/C++ identifier.)
-  int32 fieldname1 = 401;
-  int32 field_name2 = 402;
-  int32 _field_name3 = 403;
-  int32 field__name4_ = 404;
-  int32 field0name5 = 405;
-  int32 field_0_name6 = 406;
-  int32 fieldName7 = 407;
-  int32 FieldName8 = 408;
-  int32 field_Name9 = 409;
-  int32 Field_Name10 = 410;
-  int32 FIELD_NAME11 = 411;
-  int32 FIELD_name12 = 412;
-  int32 __field_name13 = 413;
-  int32 __Field_name14 = 414;
-  int32 field__name15 = 415;
-  int32 field__Name16 = 416;
-  int32 field_name17__ = 417;
-  int32 Field_name18__ = 418;
-}
-
-message ForeignMessage {
-  int32 c = 1;
-}
-
-enum ForeignEnum {
-  FOREIGN_FOO = 0;
-  FOREIGN_BAR = 1;
-  FOREIGN_BAZ = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/descriptor/descriptor.go b/installer/vendor/github.com/golang/protobuf/descriptor/descriptor.go
deleted file mode 100644
index ac7e51bfb1..0000000000
--- a/installer/vendor/github.com/golang/protobuf/descriptor/descriptor.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Package descriptor provides functions for obtaining protocol buffer
-// descriptors for generated Go types.
-//
-// These functions cannot go in package proto because they depend on the
-// generated protobuf descriptor messages, which themselves depend on proto.
-package descriptor
-
-import (
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io/ioutil"
-
-	"github.com/golang/protobuf/proto"
-	protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-)
-
-// extractFile extracts a FileDescriptorProto from a gzip'd buffer.
-func extractFile(gz []byte) (*protobuf.FileDescriptorProto, error) {
-	r, err := gzip.NewReader(bytes.NewReader(gz))
-	if err != nil {
-		return nil, fmt.Errorf("failed to open gzip reader: %v", err)
-	}
-	defer r.Close()
-
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return nil, fmt.Errorf("failed to uncompress descriptor: %v", err)
-	}
-
-	fd := new(protobuf.FileDescriptorProto)
-	if err := proto.Unmarshal(b, fd); err != nil {
-		return nil, fmt.Errorf("malformed FileDescriptorProto: %v", err)
-	}
-
-	return fd, nil
-}
-
-// Message is a proto.Message with a method to return its descriptor.
-//
-// Message types generated by the protocol compiler always satisfy
-// the Message interface.
-type Message interface {
-	proto.Message
-	Descriptor() ([]byte, []int)
-}
-
-// ForMessage returns a FileDescriptorProto and a DescriptorProto from within it
-// describing the given message.
-func ForMessage(msg Message) (fd *protobuf.FileDescriptorProto, md *protobuf.DescriptorProto) {
-	gz, path := msg.Descriptor()
-	fd, err := extractFile(gz)
-	if err != nil {
-		panic(fmt.Sprintf("invalid FileDescriptorProto for %T: %v", msg, err))
-	}
-
-	md = fd.MessageType[path[0]]
-	for _, i := range path[1:] {
-		md = md.NestedType[i]
-	}
-	return fd, md
-}
diff --git a/installer/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go b/installer/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go
deleted file mode 100644
index 27b0729cbe..0000000000
--- a/installer/vendor/github.com/golang/protobuf/descriptor/descriptor_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package descriptor_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/golang/protobuf/descriptor"
-	tpb "github.com/golang/protobuf/proto/testdata"
-	protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-)
-
-func TestMessage(t *testing.T) {
-	var msg *protobuf.DescriptorProto
-	fd, md := descriptor.ForMessage(msg)
-	if pkg, want := fd.GetPackage(), "google.protobuf"; pkg != want {
-		t.Errorf("descriptor.ForMessage(%T).GetPackage() = %q; want %q", msg, pkg, want)
-	}
-	if name, want := md.GetName(), "DescriptorProto"; name != want {
-		t.Fatalf("descriptor.ForMessage(%T).GetName() = %q; want %q", msg, name, want)
-	}
-}
-
-func Example_Options() {
-	var msg *tpb.MyMessageSet
-	_, md := descriptor.ForMessage(msg)
-	if md.GetOptions().GetMessageSetWireFormat() {
-		fmt.Printf("%v uses option message_set_wire_format.\n", md.GetName())
-	}
-
-	// Output:
-	// MyMessageSet uses option message_set_wire_format.
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
deleted file mode 100644
index 110ae13842..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb.go
+++ /dev/null
@@ -1,1083 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package jsonpb provides marshaling and unmarshaling between protocol buffers and JSON.
-It follows the specification at https://developers.google.com/protocol-buffers/docs/proto3#json.
-
-This package produces a different output than the standard "encoding/json" package,
-which does not operate correctly on protocol buffers.
-*/
-package jsonpb
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-
-	stpb "github.com/golang/protobuf/ptypes/struct"
-)
-
-// Marshaler is a configurable object for converting between
-// protocol buffer objects and a JSON representation for them.
-type Marshaler struct {
-	// Whether to render enum values as integers, as opposed to string values.
-	EnumsAsInts bool
-
-	// Whether to render fields with zero values.
-	EmitDefaults bool
-
-	// A string to indent each level by. The presence of this field will
-	// also cause a space to appear between the field separator and
-	// value, and for newlines to be appear between fields and array
-	// elements.
-	Indent string
-
-	// Whether to use the original (.proto) name for fields.
-	OrigName bool
-
-	// A custom URL resolver to use when marshaling Any messages to JSON.
-	// If unset, the default resolution strategy is to extract the
-	// fully-qualified type name from the type URL and pass that to
-	// proto.MessageType(string).
-	AnyResolver AnyResolver
-}
-
-// AnyResolver takes a type URL, present in an Any message, and resolves it into
-// an instance of the associated message.
-type AnyResolver interface {
-	Resolve(typeUrl string) (proto.Message, error)
-}
-
-func defaultResolveAny(typeUrl string) (proto.Message, error) {
-	// Only the part of typeUrl after the last slash is relevant.
-	mname := typeUrl
-	if slash := strings.LastIndex(mname, "/"); slash >= 0 {
-		mname = mname[slash+1:]
-	}
-	mt := proto.MessageType(mname)
-	if mt == nil {
-		return nil, fmt.Errorf("unknown message type %q", mname)
-	}
-	return reflect.New(mt.Elem()).Interface().(proto.Message), nil
-}
-
-// JSONPBMarshaler is implemented by protobuf messages that customize the
-// way they are marshaled to JSON. Messages that implement this should
-// also implement JSONPBUnmarshaler so that the custom format can be
-// parsed.
-type JSONPBMarshaler interface {
-	MarshalJSONPB(*Marshaler) ([]byte, error)
-}
-
-// JSONPBUnmarshaler is implemented by protobuf messages that customize
-// the way they are unmarshaled from JSON. Messages that implement this
-// should also implement JSONPBMarshaler so that the custom format can be
-// produced.
-type JSONPBUnmarshaler interface {
-	UnmarshalJSONPB(*Unmarshaler, []byte) error
-}
-
-// Marshal marshals a protocol buffer into JSON.
-func (m *Marshaler) Marshal(out io.Writer, pb proto.Message) error {
-	writer := &errWriter{writer: out}
-	return m.marshalObject(writer, pb, "", "")
-}
-
-// MarshalToString converts a protocol buffer object to JSON string.
-func (m *Marshaler) MarshalToString(pb proto.Message) (string, error) {
-	var buf bytes.Buffer
-	if err := m.Marshal(&buf, pb); err != nil {
-		return "", err
-	}
-	return buf.String(), nil
-}
-
-type int32Slice []int32
-
-var nonFinite = map[string]float64{
-	`"NaN"`:       math.NaN(),
-	`"Infinity"`:  math.Inf(1),
-	`"-Infinity"`: math.Inf(-1),
-}
-
-// For sorting extensions ids to ensure stable output.
-func (s int32Slice) Len() int           { return len(s) }
-func (s int32Slice) Less(i, j int) bool { return s[i] < s[j] }
-func (s int32Slice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-type wkt interface {
-	XXX_WellKnownType() string
-}
-
-// marshalObject writes a struct to the Writer.
-func (m *Marshaler) marshalObject(out *errWriter, v proto.Message, indent, typeURL string) error {
-	if jsm, ok := v.(JSONPBMarshaler); ok {
-		b, err := jsm.MarshalJSONPB(m)
-		if err != nil {
-			return err
-		}
-		if typeURL != "" {
-			// we are marshaling this object to an Any type
-			var js map[string]*json.RawMessage
-			if err = json.Unmarshal(b, &js); err != nil {
-				return fmt.Errorf("type %T produced invalid JSON: %v", v, err)
-			}
-			turl, err := json.Marshal(typeURL)
-			if err != nil {
-				return fmt.Errorf("failed to marshal type URL %q to JSON: %v", typeURL, err)
-			}
-			js["@type"] = (*json.RawMessage)(&turl)
-			if b, err = json.Marshal(js); err != nil {
-				return err
-			}
-		}
-
-		out.write(string(b))
-		return out.err
-	}
-
-	s := reflect.ValueOf(v).Elem()
-
-	// Handle well-known types.
-	if wkt, ok := v.(wkt); ok {
-		switch wkt.XXX_WellKnownType() {
-		case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
-			"Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
-			// "Wrappers use the same representation in JSON
-			//  as the wrapped primitive type, ..."
-			sprop := proto.GetProperties(s.Type())
-			return m.marshalValue(out, sprop.Prop[0], s.Field(0), indent)
-		case "Any":
-			// Any is a bit more involved.
-			return m.marshalAny(out, v, indent)
-		case "Duration":
-			// "Generated output always contains 3, 6, or 9 fractional digits,
-			//  depending on required precision."
-			s, ns := s.Field(0).Int(), s.Field(1).Int()
-			d := time.Duration(s)*time.Second + time.Duration(ns)*time.Nanosecond
-			x := fmt.Sprintf("%.9f", d.Seconds())
-			x = strings.TrimSuffix(x, "000")
-			x = strings.TrimSuffix(x, "000")
-			out.write(`"`)
-			out.write(x)
-			out.write(`s"`)
-			return out.err
-		case "Struct", "ListValue":
-			// Let marshalValue handle the `Struct.fields` map or the `ListValue.values` slice.
-			// TODO: pass the correct Properties if needed.
-			return m.marshalValue(out, &proto.Properties{}, s.Field(0), indent)
-		case "Timestamp":
-			// "RFC 3339, where generated output will always be Z-normalized
-			//  and uses 3, 6 or 9 fractional digits."
-			s, ns := s.Field(0).Int(), s.Field(1).Int()
-			t := time.Unix(s, ns).UTC()
-			// time.RFC3339Nano isn't exactly right (we need to get 3/6/9 fractional digits).
-			x := t.Format("2006-01-02T15:04:05.000000000")
-			x = strings.TrimSuffix(x, "000")
-			x = strings.TrimSuffix(x, "000")
-			out.write(`"`)
-			out.write(x)
-			out.write(`Z"`)
-			return out.err
-		case "Value":
-			// Value has a single oneof.
-			kind := s.Field(0)
-			if kind.IsNil() {
-				// "absence of any variant indicates an error"
-				return errors.New("nil Value")
-			}
-			// oneof -> *T -> T -> T.F
-			x := kind.Elem().Elem().Field(0)
-			// TODO: pass the correct Properties if needed.
-			return m.marshalValue(out, &proto.Properties{}, x, indent)
-		}
-	}
-
-	out.write("{")
-	if m.Indent != "" {
-		out.write("\n")
-	}
-
-	firstField := true
-
-	if typeURL != "" {
-		if err := m.marshalTypeURL(out, indent, typeURL); err != nil {
-			return err
-		}
-		firstField = false
-	}
-
-	for i := 0; i < s.NumField(); i++ {
-		value := s.Field(i)
-		valueField := s.Type().Field(i)
-		if strings.HasPrefix(valueField.Name, "XXX_") {
-			continue
-		}
-
-		// IsNil will panic on most value kinds.
-		switch value.Kind() {
-		case reflect.Chan, reflect.Func, reflect.Interface:
-			if value.IsNil() {
-				continue
-			}
-		}
-
-		if !m.EmitDefaults {
-			switch value.Kind() {
-			case reflect.Bool:
-				if !value.Bool() {
-					continue
-				}
-			case reflect.Int32, reflect.Int64:
-				if value.Int() == 0 {
-					continue
-				}
-			case reflect.Uint32, reflect.Uint64:
-				if value.Uint() == 0 {
-					continue
-				}
-			case reflect.Float32, reflect.Float64:
-				if value.Float() == 0 {
-					continue
-				}
-			case reflect.String:
-				if value.Len() == 0 {
-					continue
-				}
-			case reflect.Map, reflect.Ptr, reflect.Slice:
-				if value.IsNil() {
-					continue
-				}
-			}
-		}
-
-		// Oneof fields need special handling.
-		if valueField.Tag.Get("protobuf_oneof") != "" {
-			// value is an interface containing &T{real_value}.
-			sv := value.Elem().Elem() // interface -> *T -> T
-			value = sv.Field(0)
-			valueField = sv.Type().Field(0)
-		}
-		prop := jsonProperties(valueField, m.OrigName)
-		if !firstField {
-			m.writeSep(out)
-		}
-		if err := m.marshalField(out, prop, value, indent); err != nil {
-			return err
-		}
-		firstField = false
-	}
-
-	// Handle proto2 extensions.
-	if ep, ok := v.(proto.Message); ok {
-		extensions := proto.RegisteredExtensions(v)
-		// Sort extensions for stable output.
-		ids := make([]int32, 0, len(extensions))
-		for id, desc := range extensions {
-			if !proto.HasExtension(ep, desc) {
-				continue
-			}
-			ids = append(ids, id)
-		}
-		sort.Sort(int32Slice(ids))
-		for _, id := range ids {
-			desc := extensions[id]
-			if desc == nil {
-				// unknown extension
-				continue
-			}
-			ext, extErr := proto.GetExtension(ep, desc)
-			if extErr != nil {
-				return extErr
-			}
-			value := reflect.ValueOf(ext)
-			var prop proto.Properties
-			prop.Parse(desc.Tag)
-			prop.JSONName = fmt.Sprintf("[%s]", desc.Name)
-			if !firstField {
-				m.writeSep(out)
-			}
-			if err := m.marshalField(out, &prop, value, indent); err != nil {
-				return err
-			}
-			firstField = false
-		}
-
-	}
-
-	if m.Indent != "" {
-		out.write("\n")
-		out.write(indent)
-	}
-	out.write("}")
-	return out.err
-}
-
-func (m *Marshaler) writeSep(out *errWriter) {
-	if m.Indent != "" {
-		out.write(",\n")
-	} else {
-		out.write(",")
-	}
-}
-
-func (m *Marshaler) marshalAny(out *errWriter, any proto.Message, indent string) error {
-	// "If the Any contains a value that has a special JSON mapping,
-	//  it will be converted as follows: {"@type": xxx, "value": yyy}.
-	//  Otherwise, the value will be converted into a JSON object,
-	//  and the "@type" field will be inserted to indicate the actual data type."
-	v := reflect.ValueOf(any).Elem()
-	turl := v.Field(0).String()
-	val := v.Field(1).Bytes()
-
-	var msg proto.Message
-	var err error
-	if m.AnyResolver != nil {
-		msg, err = m.AnyResolver.Resolve(turl)
-	} else {
-		msg, err = defaultResolveAny(turl)
-	}
-	if err != nil {
-		return err
-	}
-
-	if err := proto.Unmarshal(val, msg); err != nil {
-		return err
-	}
-
-	if _, ok := msg.(wkt); ok {
-		out.write("{")
-		if m.Indent != "" {
-			out.write("\n")
-		}
-		if err := m.marshalTypeURL(out, indent, turl); err != nil {
-			return err
-		}
-		m.writeSep(out)
-		if m.Indent != "" {
-			out.write(indent)
-			out.write(m.Indent)
-			out.write(`"value": `)
-		} else {
-			out.write(`"value":`)
-		}
-		if err := m.marshalObject(out, msg, indent+m.Indent, ""); err != nil {
-			return err
-		}
-		if m.Indent != "" {
-			out.write("\n")
-			out.write(indent)
-		}
-		out.write("}")
-		return out.err
-	}
-
-	return m.marshalObject(out, msg, indent, turl)
-}
-
-func (m *Marshaler) marshalTypeURL(out *errWriter, indent, typeURL string) error {
-	if m.Indent != "" {
-		out.write(indent)
-		out.write(m.Indent)
-	}
-	out.write(`"@type":`)
-	if m.Indent != "" {
-		out.write(" ")
-	}
-	b, err := json.Marshal(typeURL)
-	if err != nil {
-		return err
-	}
-	out.write(string(b))
-	return out.err
-}
-
-// marshalField writes field description and value to the Writer.
-func (m *Marshaler) marshalField(out *errWriter, prop *proto.Properties, v reflect.Value, indent string) error {
-	if m.Indent != "" {
-		out.write(indent)
-		out.write(m.Indent)
-	}
-	out.write(`"`)
-	out.write(prop.JSONName)
-	out.write(`":`)
-	if m.Indent != "" {
-		out.write(" ")
-	}
-	if err := m.marshalValue(out, prop, v, indent); err != nil {
-		return err
-	}
-	return nil
-}
-
-// marshalValue writes the value to the Writer.
-func (m *Marshaler) marshalValue(out *errWriter, prop *proto.Properties, v reflect.Value, indent string) error {
-	var err error
-	v = reflect.Indirect(v)
-
-	// Handle nil pointer
-	if v.Kind() == reflect.Invalid {
-		out.write("null")
-		return out.err
-	}
-
-	// Handle repeated elements.
-	if v.Kind() == reflect.Slice && v.Type().Elem().Kind() != reflect.Uint8 {
-		out.write("[")
-		comma := ""
-		for i := 0; i < v.Len(); i++ {
-			sliceVal := v.Index(i)
-			out.write(comma)
-			if m.Indent != "" {
-				out.write("\n")
-				out.write(indent)
-				out.write(m.Indent)
-				out.write(m.Indent)
-			}
-			if err := m.marshalValue(out, prop, sliceVal, indent+m.Indent); err != nil {
-				return err
-			}
-			comma = ","
-		}
-		if m.Indent != "" {
-			out.write("\n")
-			out.write(indent)
-			out.write(m.Indent)
-		}
-		out.write("]")
-		return out.err
-	}
-
-	// Handle well-known types.
-	// Most are handled up in marshalObject (because 99% are messages).
-	if wkt, ok := v.Interface().(wkt); ok {
-		switch wkt.XXX_WellKnownType() {
-		case "NullValue":
-			out.write("null")
-			return out.err
-		}
-	}
-
-	// Handle enumerations.
-	if !m.EnumsAsInts && prop.Enum != "" {
-		// Unknown enum values will are stringified by the proto library as their
-		// value. Such values should _not_ be quoted or they will be interpreted
-		// as an enum string instead of their value.
-		enumStr := v.Interface().(fmt.Stringer).String()
-		var valStr string
-		if v.Kind() == reflect.Ptr {
-			valStr = strconv.Itoa(int(v.Elem().Int()))
-		} else {
-			valStr = strconv.Itoa(int(v.Int()))
-		}
-		isKnownEnum := enumStr != valStr
-		if isKnownEnum {
-			out.write(`"`)
-		}
-		out.write(enumStr)
-		if isKnownEnum {
-			out.write(`"`)
-		}
-		return out.err
-	}
-
-	// Handle nested messages.
-	if v.Kind() == reflect.Struct {
-		return m.marshalObject(out, v.Addr().Interface().(proto.Message), indent+m.Indent, "")
-	}
-
-	// Handle maps.
-	// Since Go randomizes map iteration, we sort keys for stable output.
-	if v.Kind() == reflect.Map {
-		out.write(`{`)
-		keys := v.MapKeys()
-		sort.Sort(mapKeys(keys))
-		for i, k := range keys {
-			if i > 0 {
-				out.write(`,`)
-			}
-			if m.Indent != "" {
-				out.write("\n")
-				out.write(indent)
-				out.write(m.Indent)
-				out.write(m.Indent)
-			}
-
-			b, err := json.Marshal(k.Interface())
-			if err != nil {
-				return err
-			}
-			s := string(b)
-
-			// If the JSON is not a string value, encode it again to make it one.
-			if !strings.HasPrefix(s, `"`) {
-				b, err := json.Marshal(s)
-				if err != nil {
-					return err
-				}
-				s = string(b)
-			}
-
-			out.write(s)
-			out.write(`:`)
-			if m.Indent != "" {
-				out.write(` `)
-			}
-
-			if err := m.marshalValue(out, prop, v.MapIndex(k), indent+m.Indent); err != nil {
-				return err
-			}
-		}
-		if m.Indent != "" {
-			out.write("\n")
-			out.write(indent)
-			out.write(m.Indent)
-		}
-		out.write(`}`)
-		return out.err
-	}
-
-	// Handle non-finite floats, e.g. NaN, Infinity and -Infinity.
-	if v.Kind() == reflect.Float32 || v.Kind() == reflect.Float64 {
-		f := v.Float()
-		var sval string
-		switch {
-		case math.IsInf(f, 1):
-			sval = `"Infinity"`
-		case math.IsInf(f, -1):
-			sval = `"-Infinity"`
-		case math.IsNaN(f):
-			sval = `"NaN"`
-		}
-		if sval != "" {
-			out.write(sval)
-			return out.err
-		}
-	}
-
-	// Default handling defers to the encoding/json library.
-	b, err := json.Marshal(v.Interface())
-	if err != nil {
-		return err
-	}
-	needToQuote := string(b[0]) != `"` && (v.Kind() == reflect.Int64 || v.Kind() == reflect.Uint64)
-	if needToQuote {
-		out.write(`"`)
-	}
-	out.write(string(b))
-	if needToQuote {
-		out.write(`"`)
-	}
-	return out.err
-}
-
-// Unmarshaler is a configurable object for converting from a JSON
-// representation to a protocol buffer object.
-type Unmarshaler struct {
-	// Whether to allow messages to contain unknown fields, as opposed to
-	// failing to unmarshal.
-	AllowUnknownFields bool
-
-	// A custom URL resolver to use when unmarshaling Any messages from JSON.
-	// If unset, the default resolution strategy is to extract the
-	// fully-qualified type name from the type URL and pass that to
-	// proto.MessageType(string).
-	AnyResolver AnyResolver
-}
-
-// UnmarshalNext unmarshals the next protocol buffer from a JSON object stream.
-// This function is lenient and will decode any options permutations of the
-// related Marshaler.
-func (u *Unmarshaler) UnmarshalNext(dec *json.Decoder, pb proto.Message) error {
-	inputValue := json.RawMessage{}
-	if err := dec.Decode(&inputValue); err != nil {
-		return err
-	}
-	return u.unmarshalValue(reflect.ValueOf(pb).Elem(), inputValue, nil)
-}
-
-// Unmarshal unmarshals a JSON object stream into a protocol
-// buffer. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func (u *Unmarshaler) Unmarshal(r io.Reader, pb proto.Message) error {
-	dec := json.NewDecoder(r)
-	return u.UnmarshalNext(dec, pb)
-}
-
-// UnmarshalNext unmarshals the next protocol buffer from a JSON object stream.
-// This function is lenient and will decode any options permutations of the
-// related Marshaler.
-func UnmarshalNext(dec *json.Decoder, pb proto.Message) error {
-	return new(Unmarshaler).UnmarshalNext(dec, pb)
-}
-
-// Unmarshal unmarshals a JSON object stream into a protocol
-// buffer. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func Unmarshal(r io.Reader, pb proto.Message) error {
-	return new(Unmarshaler).Unmarshal(r, pb)
-}
-
-// UnmarshalString will populate the fields of a protocol buffer based
-// on a JSON string. This function is lenient and will decode any options
-// permutations of the related Marshaler.
-func UnmarshalString(str string, pb proto.Message) error {
-	return new(Unmarshaler).Unmarshal(strings.NewReader(str), pb)
-}
-
-// unmarshalValue converts/copies a value into the target.
-// prop may be nil.
-func (u *Unmarshaler) unmarshalValue(target reflect.Value, inputValue json.RawMessage, prop *proto.Properties) error {
-	targetType := target.Type()
-
-	// Allocate memory for pointer fields.
-	if targetType.Kind() == reflect.Ptr {
-		// If input value is "null" and target is a pointer type, then the field should be treated as not set
-		// UNLESS the target is structpb.Value, in which case it should be set to structpb.NullValue.
-		_, isJSONPBUnmarshaler := target.Interface().(JSONPBUnmarshaler)
-		if string(inputValue) == "null" && targetType != reflect.TypeOf(&stpb.Value{}) && !isJSONPBUnmarshaler {
-			return nil
-		}
-		target.Set(reflect.New(targetType.Elem()))
-
-		return u.unmarshalValue(target.Elem(), inputValue, prop)
-	}
-
-	if jsu, ok := target.Addr().Interface().(JSONPBUnmarshaler); ok {
-		return jsu.UnmarshalJSONPB(u, []byte(inputValue))
-	}
-
-	// Handle well-known types that are not pointers.
-	if w, ok := target.Addr().Interface().(wkt); ok {
-		switch w.XXX_WellKnownType() {
-		case "DoubleValue", "FloatValue", "Int64Value", "UInt64Value",
-			"Int32Value", "UInt32Value", "BoolValue", "StringValue", "BytesValue":
-			return u.unmarshalValue(target.Field(0), inputValue, prop)
-		case "Any":
-			// Use json.RawMessage pointer type instead of value to support pre-1.8 version.
-			// 1.8 changed RawMessage.MarshalJSON from pointer type to value type, see
-			// https://github.com/golang/go/issues/14493
-			var jsonFields map[string]*json.RawMessage
-			if err := json.Unmarshal(inputValue, &jsonFields); err != nil {
-				return err
-			}
-
-			val, ok := jsonFields["@type"]
-			if !ok || val == nil {
-				return errors.New("Any JSON doesn't have '@type'")
-			}
-
-			var turl string
-			if err := json.Unmarshal([]byte(*val), &turl); err != nil {
-				return fmt.Errorf("can't unmarshal Any's '@type': %q", *val)
-			}
-			target.Field(0).SetString(turl)
-
-			var m proto.Message
-			var err error
-			if u.AnyResolver != nil {
-				m, err = u.AnyResolver.Resolve(turl)
-			} else {
-				m, err = defaultResolveAny(turl)
-			}
-			if err != nil {
-				return err
-			}
-
-			if _, ok := m.(wkt); ok {
-				val, ok := jsonFields["value"]
-				if !ok {
-					return errors.New("Any JSON doesn't have 'value'")
-				}
-
-				if err := u.unmarshalValue(reflect.ValueOf(m).Elem(), *val, nil); err != nil {
-					return fmt.Errorf("can't unmarshal Any nested proto %T: %v", m, err)
-				}
-			} else {
-				delete(jsonFields, "@type")
-				nestedProto, err := json.Marshal(jsonFields)
-				if err != nil {
-					return fmt.Errorf("can't generate JSON for Any's nested proto to be unmarshaled: %v", err)
-				}
-
-				if err = u.unmarshalValue(reflect.ValueOf(m).Elem(), nestedProto, nil); err != nil {
-					return fmt.Errorf("can't unmarshal Any nested proto %T: %v", m, err)
-				}
-			}
-
-			b, err := proto.Marshal(m)
-			if err != nil {
-				return fmt.Errorf("can't marshal proto %T into Any.Value: %v", m, err)
-			}
-			target.Field(1).SetBytes(b)
-
-			return nil
-		case "Duration":
-			unq, err := strconv.Unquote(string(inputValue))
-			if err != nil {
-				return err
-			}
-
-			d, err := time.ParseDuration(unq)
-			if err != nil {
-				return fmt.Errorf("bad Duration: %v", err)
-			}
-
-			ns := d.Nanoseconds()
-			s := ns / 1e9
-			ns %= 1e9
-			target.Field(0).SetInt(s)
-			target.Field(1).SetInt(ns)
-			return nil
-		case "Timestamp":
-			unq, err := strconv.Unquote(string(inputValue))
-			if err != nil {
-				return err
-			}
-
-			t, err := time.Parse(time.RFC3339Nano, unq)
-			if err != nil {
-				return fmt.Errorf("bad Timestamp: %v", err)
-			}
-
-			target.Field(0).SetInt(t.Unix())
-			target.Field(1).SetInt(int64(t.Nanosecond()))
-			return nil
-		case "Struct":
-			var m map[string]json.RawMessage
-			if err := json.Unmarshal(inputValue, &m); err != nil {
-				return fmt.Errorf("bad StructValue: %v", err)
-			}
-
-			target.Field(0).Set(reflect.ValueOf(map[string]*stpb.Value{}))
-			for k, jv := range m {
-				pv := &stpb.Value{}
-				if err := u.unmarshalValue(reflect.ValueOf(pv).Elem(), jv, prop); err != nil {
-					return fmt.Errorf("bad value in StructValue for key %q: %v", k, err)
-				}
-				target.Field(0).SetMapIndex(reflect.ValueOf(k), reflect.ValueOf(pv))
-			}
-			return nil
-		case "ListValue":
-			var s []json.RawMessage
-			if err := json.Unmarshal(inputValue, &s); err != nil {
-				return fmt.Errorf("bad ListValue: %v", err)
-			}
-
-			target.Field(0).Set(reflect.ValueOf(make([]*stpb.Value, len(s), len(s))))
-			for i, sv := range s {
-				if err := u.unmarshalValue(target.Field(0).Index(i), sv, prop); err != nil {
-					return err
-				}
-			}
-			return nil
-		case "Value":
-			ivStr := string(inputValue)
-			if ivStr == "null" {
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_NullValue{}))
-			} else if v, err := strconv.ParseFloat(ivStr, 0); err == nil {
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_NumberValue{v}))
-			} else if v, err := strconv.Unquote(ivStr); err == nil {
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_StringValue{v}))
-			} else if v, err := strconv.ParseBool(ivStr); err == nil {
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_BoolValue{v}))
-			} else if err := json.Unmarshal(inputValue, &[]json.RawMessage{}); err == nil {
-				lv := &stpb.ListValue{}
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_ListValue{lv}))
-				return u.unmarshalValue(reflect.ValueOf(lv).Elem(), inputValue, prop)
-			} else if err := json.Unmarshal(inputValue, &map[string]json.RawMessage{}); err == nil {
-				sv := &stpb.Struct{}
-				target.Field(0).Set(reflect.ValueOf(&stpb.Value_StructValue{sv}))
-				return u.unmarshalValue(reflect.ValueOf(sv).Elem(), inputValue, prop)
-			} else {
-				return fmt.Errorf("unrecognized type for Value %q", ivStr)
-			}
-			return nil
-		}
-	}
-
-	// Handle enums, which have an underlying type of int32,
-	// and may appear as strings.
-	// The case of an enum appearing as a number is handled
-	// at the bottom of this function.
-	if inputValue[0] == '"' && prop != nil && prop.Enum != "" {
-		vmap := proto.EnumValueMap(prop.Enum)
-		// Don't need to do unquoting; valid enum names
-		// are from a limited character set.
-		s := inputValue[1 : len(inputValue)-1]
-		n, ok := vmap[string(s)]
-		if !ok {
-			return fmt.Errorf("unknown value %q for enum %s", s, prop.Enum)
-		}
-		if target.Kind() == reflect.Ptr { // proto2
-			target.Set(reflect.New(targetType.Elem()))
-			target = target.Elem()
-		}
-		target.SetInt(int64(n))
-		return nil
-	}
-
-	// Handle nested messages.
-	if targetType.Kind() == reflect.Struct {
-		var jsonFields map[string]json.RawMessage
-		if err := json.Unmarshal(inputValue, &jsonFields); err != nil {
-			return err
-		}
-
-		consumeField := func(prop *proto.Properties) (json.RawMessage, bool) {
-			// Be liberal in what names we accept; both orig_name and camelName are okay.
-			fieldNames := acceptedJSONFieldNames(prop)
-
-			vOrig, okOrig := jsonFields[fieldNames.orig]
-			vCamel, okCamel := jsonFields[fieldNames.camel]
-			if !okOrig && !okCamel {
-				return nil, false
-			}
-			// If, for some reason, both are present in the data, favour the camelName.
-			var raw json.RawMessage
-			if okOrig {
-				raw = vOrig
-				delete(jsonFields, fieldNames.orig)
-			}
-			if okCamel {
-				raw = vCamel
-				delete(jsonFields, fieldNames.camel)
-			}
-			return raw, true
-		}
-
-		sprops := proto.GetProperties(targetType)
-		for i := 0; i < target.NumField(); i++ {
-			ft := target.Type().Field(i)
-			if strings.HasPrefix(ft.Name, "XXX_") {
-				continue
-			}
-
-			valueForField, ok := consumeField(sprops.Prop[i])
-			if !ok {
-				continue
-			}
-
-			if err := u.unmarshalValue(target.Field(i), valueForField, sprops.Prop[i]); err != nil {
-				return err
-			}
-		}
-		// Check for any oneof fields.
-		if len(jsonFields) > 0 {
-			for _, oop := range sprops.OneofTypes {
-				raw, ok := consumeField(oop.Prop)
-				if !ok {
-					continue
-				}
-				nv := reflect.New(oop.Type.Elem())
-				target.Field(oop.Field).Set(nv)
-				if err := u.unmarshalValue(nv.Elem().Field(0), raw, oop.Prop); err != nil {
-					return err
-				}
-			}
-		}
-		// Handle proto2 extensions.
-		if len(jsonFields) > 0 {
-			if ep, ok := target.Addr().Interface().(proto.Message); ok {
-				for _, ext := range proto.RegisteredExtensions(ep) {
-					name := fmt.Sprintf("[%s]", ext.Name)
-					raw, ok := jsonFields[name]
-					if !ok {
-						continue
-					}
-					delete(jsonFields, name)
-					nv := reflect.New(reflect.TypeOf(ext.ExtensionType).Elem())
-					if err := u.unmarshalValue(nv.Elem(), raw, nil); err != nil {
-						return err
-					}
-					if err := proto.SetExtension(ep, ext, nv.Interface()); err != nil {
-						return err
-					}
-				}
-			}
-		}
-		if !u.AllowUnknownFields && len(jsonFields) > 0 {
-			// Pick any field to be the scapegoat.
-			var f string
-			for fname := range jsonFields {
-				f = fname
-				break
-			}
-			return fmt.Errorf("unknown field %q in %v", f, targetType)
-		}
-		return nil
-	}
-
-	// Handle arrays (which aren't encoded bytes)
-	if targetType.Kind() == reflect.Slice && targetType.Elem().Kind() != reflect.Uint8 {
-		var slc []json.RawMessage
-		if err := json.Unmarshal(inputValue, &slc); err != nil {
-			return err
-		}
-		if slc != nil {
-			l := len(slc)
-			target.Set(reflect.MakeSlice(targetType, l, l))
-			for i := 0; i < l; i++ {
-				if err := u.unmarshalValue(target.Index(i), slc[i], prop); err != nil {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-
-	// Handle maps (whose keys are always strings)
-	if targetType.Kind() == reflect.Map {
-		var mp map[string]json.RawMessage
-		if err := json.Unmarshal(inputValue, &mp); err != nil {
-			return err
-		}
-		if mp != nil {
-			target.Set(reflect.MakeMap(targetType))
-			var keyprop, valprop *proto.Properties
-			if prop != nil {
-				// These could still be nil if the protobuf metadata is broken somehow.
-				// TODO: This won't work because the fields are unexported.
-				// We should probably just reparse them.
-				//keyprop, valprop = prop.mkeyprop, prop.mvalprop
-			}
-			for ks, raw := range mp {
-				// Unmarshal map key. The core json library already decoded the key into a
-				// string, so we handle that specially. Other types were quoted post-serialization.
-				var k reflect.Value
-				if targetType.Key().Kind() == reflect.String {
-					k = reflect.ValueOf(ks)
-				} else {
-					k = reflect.New(targetType.Key()).Elem()
-					if err := u.unmarshalValue(k, json.RawMessage(ks), keyprop); err != nil {
-						return err
-					}
-				}
-
-				// Unmarshal map value.
-				v := reflect.New(targetType.Elem()).Elem()
-				if err := u.unmarshalValue(v, raw, valprop); err != nil {
-					return err
-				}
-				target.SetMapIndex(k, v)
-			}
-		}
-		return nil
-	}
-
-	// 64-bit integers can be encoded as strings. In this case we drop
-	// the quotes and proceed as normal.
-	isNum := targetType.Kind() == reflect.Int64 || targetType.Kind() == reflect.Uint64
-	if isNum && strings.HasPrefix(string(inputValue), `"`) {
-		inputValue = inputValue[1 : len(inputValue)-1]
-	}
-
-	// Non-finite numbers can be encoded as strings.
-	isFloat := targetType.Kind() == reflect.Float32 || targetType.Kind() == reflect.Float64
-	if isFloat {
-		if num, ok := nonFinite[string(inputValue)]; ok {
-			target.SetFloat(num)
-			return nil
-		}
-	}
-
-	// Use the encoding/json for parsing other value types.
-	return json.Unmarshal(inputValue, target.Addr().Interface())
-}
-
-// jsonProperties returns parsed proto.Properties for the field and corrects JSONName attribute.
-func jsonProperties(f reflect.StructField, origName bool) *proto.Properties {
-	var prop proto.Properties
-	prop.Init(f.Type, f.Name, f.Tag.Get("protobuf"), &f)
-	if origName || prop.JSONName == "" {
-		prop.JSONName = prop.OrigName
-	}
-	return &prop
-}
-
-type fieldNames struct {
-	orig, camel string
-}
-
-func acceptedJSONFieldNames(prop *proto.Properties) fieldNames {
-	opts := fieldNames{orig: prop.OrigName, camel: prop.OrigName}
-	if prop.JSONName != "" {
-		opts.camel = prop.JSONName
-	}
-	return opts
-}
-
-// Writer wrapper inspired by https://blog.golang.org/errors-are-values
-type errWriter struct {
-	writer io.Writer
-	err    error
-}
-
-func (w *errWriter) write(str string) {
-	if w.err != nil {
-		return
-	}
-	_, w.err = w.writer.Write([]byte(str))
-}
-
-// Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-//
-// Numeric keys are sorted in numeric order per
-// https://developers.google.com/protocol-buffers/docs/proto#maps.
-type mapKeys []reflect.Value
-
-func (s mapKeys) Len() int      { return len(s) }
-func (s mapKeys) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s mapKeys) Less(i, j int) bool {
-	if k := s[i].Kind(); k == s[j].Kind() {
-		switch k {
-		case reflect.Int32, reflect.Int64:
-			return s[i].Int() < s[j].Int()
-		case reflect.Uint32, reflect.Uint64:
-			return s[i].Uint() < s[j].Uint()
-		}
-	}
-	return fmt.Sprint(s[i].Interface()) < fmt.Sprint(s[j].Interface())
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
deleted file mode 100644
index 2428d0566c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test.go
+++ /dev/null
@@ -1,896 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package jsonpb
-
-import (
-	"bytes"
-	"encoding/json"
-	"io"
-	"math"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	pb "github.com/golang/protobuf/jsonpb/jsonpb_test_proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	"github.com/golang/protobuf/ptypes"
-	anypb "github.com/golang/protobuf/ptypes/any"
-	durpb "github.com/golang/protobuf/ptypes/duration"
-	stpb "github.com/golang/protobuf/ptypes/struct"
-	tspb "github.com/golang/protobuf/ptypes/timestamp"
-	wpb "github.com/golang/protobuf/ptypes/wrappers"
-)
-
-var (
-	marshaler = Marshaler{}
-
-	marshalerAllOptions = Marshaler{
-		Indent: "  ",
-	}
-
-	simpleObject = &pb.Simple{
-		OInt32:  proto.Int32(-32),
-		OInt64:  proto.Int64(-6400000000),
-		OUint32: proto.Uint32(32),
-		OUint64: proto.Uint64(6400000000),
-		OSint32: proto.Int32(-13),
-		OSint64: proto.Int64(-2600000000),
-		OFloat:  proto.Float32(3.14),
-		ODouble: proto.Float64(6.02214179e23),
-		OBool:   proto.Bool(true),
-		OString: proto.String("hello \"there\""),
-		OBytes:  []byte("beep boop"),
-	}
-
-	simpleObjectJSON = `{` +
-		`"oBool":true,` +
-		`"oInt32":-32,` +
-		`"oInt64":"-6400000000",` +
-		`"oUint32":32,` +
-		`"oUint64":"6400000000",` +
-		`"oSint32":-13,` +
-		`"oSint64":"-2600000000",` +
-		`"oFloat":3.14,` +
-		`"oDouble":6.02214179e+23,` +
-		`"oString":"hello \"there\"",` +
-		`"oBytes":"YmVlcCBib29w"` +
-		`}`
-
-	simpleObjectPrettyJSON = `{
-  "oBool": true,
-  "oInt32": -32,
-  "oInt64": "-6400000000",
-  "oUint32": 32,
-  "oUint64": "6400000000",
-  "oSint32": -13,
-  "oSint64": "-2600000000",
-  "oFloat": 3.14,
-  "oDouble": 6.02214179e+23,
-  "oString": "hello \"there\"",
-  "oBytes": "YmVlcCBib29w"
-}`
-
-	repeatsObject = &pb.Repeats{
-		RBool:   []bool{true, false, true},
-		RInt32:  []int32{-3, -4, -5},
-		RInt64:  []int64{-123456789, -987654321},
-		RUint32: []uint32{1, 2, 3},
-		RUint64: []uint64{6789012345, 3456789012},
-		RSint32: []int32{-1, -2, -3},
-		RSint64: []int64{-6789012345, -3456789012},
-		RFloat:  []float32{3.14, 6.28},
-		RDouble: []float64{299792458 * 1e20, 6.62606957e-34},
-		RString: []string{"happy", "days"},
-		RBytes:  [][]byte{[]byte("skittles"), []byte("m&m's")},
-	}
-
-	repeatsObjectJSON = `{` +
-		`"rBool":[true,false,true],` +
-		`"rInt32":[-3,-4,-5],` +
-		`"rInt64":["-123456789","-987654321"],` +
-		`"rUint32":[1,2,3],` +
-		`"rUint64":["6789012345","3456789012"],` +
-		`"rSint32":[-1,-2,-3],` +
-		`"rSint64":["-6789012345","-3456789012"],` +
-		`"rFloat":[3.14,6.28],` +
-		`"rDouble":[2.99792458e+28,6.62606957e-34],` +
-		`"rString":["happy","days"],` +
-		`"rBytes":["c2tpdHRsZXM=","bSZtJ3M="]` +
-		`}`
-
-	repeatsObjectPrettyJSON = `{
-  "rBool": [
-    true,
-    false,
-    true
-  ],
-  "rInt32": [
-    -3,
-    -4,
-    -5
-  ],
-  "rInt64": [
-    "-123456789",
-    "-987654321"
-  ],
-  "rUint32": [
-    1,
-    2,
-    3
-  ],
-  "rUint64": [
-    "6789012345",
-    "3456789012"
-  ],
-  "rSint32": [
-    -1,
-    -2,
-    -3
-  ],
-  "rSint64": [
-    "-6789012345",
-    "-3456789012"
-  ],
-  "rFloat": [
-    3.14,
-    6.28
-  ],
-  "rDouble": [
-    2.99792458e+28,
-    6.62606957e-34
-  ],
-  "rString": [
-    "happy",
-    "days"
-  ],
-  "rBytes": [
-    "c2tpdHRsZXM=",
-    "bSZtJ3M="
-  ]
-}`
-
-	innerSimple   = &pb.Simple{OInt32: proto.Int32(-32)}
-	innerSimple2  = &pb.Simple{OInt64: proto.Int64(25)}
-	innerRepeats  = &pb.Repeats{RString: []string{"roses", "red"}}
-	innerRepeats2 = &pb.Repeats{RString: []string{"violets", "blue"}}
-	complexObject = &pb.Widget{
-		Color:    pb.Widget_GREEN.Enum(),
-		RColor:   []pb.Widget_Color{pb.Widget_RED, pb.Widget_GREEN, pb.Widget_BLUE},
-		Simple:   innerSimple,
-		RSimple:  []*pb.Simple{innerSimple, innerSimple2},
-		Repeats:  innerRepeats,
-		RRepeats: []*pb.Repeats{innerRepeats, innerRepeats2},
-	}
-
-	complexObjectJSON = `{"color":"GREEN",` +
-		`"rColor":["RED","GREEN","BLUE"],` +
-		`"simple":{"oInt32":-32},` +
-		`"rSimple":[{"oInt32":-32},{"oInt64":"25"}],` +
-		`"repeats":{"rString":["roses","red"]},` +
-		`"rRepeats":[{"rString":["roses","red"]},{"rString":["violets","blue"]}]` +
-		`}`
-
-	complexObjectPrettyJSON = `{
-  "color": "GREEN",
-  "rColor": [
-    "RED",
-    "GREEN",
-    "BLUE"
-  ],
-  "simple": {
-    "oInt32": -32
-  },
-  "rSimple": [
-    {
-      "oInt32": -32
-    },
-    {
-      "oInt64": "25"
-    }
-  ],
-  "repeats": {
-    "rString": [
-      "roses",
-      "red"
-    ]
-  },
-  "rRepeats": [
-    {
-      "rString": [
-        "roses",
-        "red"
-      ]
-    },
-    {
-      "rString": [
-        "violets",
-        "blue"
-      ]
-    }
-  ]
-}`
-
-	colorPrettyJSON = `{
- "color": 2
-}`
-
-	colorListPrettyJSON = `{
-  "color": 1000,
-  "rColor": [
-    "RED"
-  ]
-}`
-
-	nummyPrettyJSON = `{
-  "nummy": {
-    "1": 2,
-    "3": 4
-  }
-}`
-
-	objjyPrettyJSON = `{
-  "objjy": {
-    "1": {
-      "dub": 1
-    }
-  }
-}`
-	realNumber     = &pb.Real{Value: proto.Float64(3.14159265359)}
-	realNumberName = "Pi"
-	complexNumber  = &pb.Complex{Imaginary: proto.Float64(0.5772156649)}
-	realNumberJSON = `{` +
-		`"value":3.14159265359,` +
-		`"[jsonpb.Complex.real_extension]":{"imaginary":0.5772156649},` +
-		`"[jsonpb.name]":"Pi"` +
-		`}`
-
-	anySimple = &pb.KnownTypes{
-		An: &anypb.Any{
-			TypeUrl: "something.example.com/jsonpb.Simple",
-			Value: []byte{
-				// &pb.Simple{OBool:true}
-				1 << 3, 1,
-			},
-		},
-	}
-	anySimpleJSON       = `{"an":{"@type":"something.example.com/jsonpb.Simple","oBool":true}}`
-	anySimplePrettyJSON = `{
-  "an": {
-    "@type": "something.example.com/jsonpb.Simple",
-    "oBool": true
-  }
-}`
-
-	anyWellKnown = &pb.KnownTypes{
-		An: &anypb.Any{
-			TypeUrl: "type.googleapis.com/google.protobuf.Duration",
-			Value: []byte{
-				// &durpb.Duration{Seconds: 1, Nanos: 212000000 }
-				1 << 3, 1, // seconds
-				2 << 3, 0x80, 0xba, 0x8b, 0x65, // nanos
-			},
-		},
-	}
-	anyWellKnownJSON       = `{"an":{"@type":"type.googleapis.com/google.protobuf.Duration","value":"1.212s"}}`
-	anyWellKnownPrettyJSON = `{
-  "an": {
-    "@type": "type.googleapis.com/google.protobuf.Duration",
-    "value": "1.212s"
-  }
-}`
-
-	nonFinites = &pb.NonFinites{
-		FNan:  proto.Float32(float32(math.NaN())),
-		FPinf: proto.Float32(float32(math.Inf(1))),
-		FNinf: proto.Float32(float32(math.Inf(-1))),
-		DNan:  proto.Float64(float64(math.NaN())),
-		DPinf: proto.Float64(float64(math.Inf(1))),
-		DNinf: proto.Float64(float64(math.Inf(-1))),
-	}
-	nonFinitesJSON = `{` +
-		`"fNan":"NaN",` +
-		`"fPinf":"Infinity",` +
-		`"fNinf":"-Infinity",` +
-		`"dNan":"NaN",` +
-		`"dPinf":"Infinity",` +
-		`"dNinf":"-Infinity"` +
-		`}`
-)
-
-func init() {
-	if err := proto.SetExtension(realNumber, pb.E_Name, &realNumberName); err != nil {
-		panic(err)
-	}
-	if err := proto.SetExtension(realNumber, pb.E_Complex_RealExtension, complexNumber); err != nil {
-		panic(err)
-	}
-}
-
-var marshalingTests = []struct {
-	desc      string
-	marshaler Marshaler
-	pb        proto.Message
-	json      string
-}{
-	{"simple flat object", marshaler, simpleObject, simpleObjectJSON},
-	{"simple pretty object", marshalerAllOptions, simpleObject, simpleObjectPrettyJSON},
-	{"non-finite floats fields object", marshaler, nonFinites, nonFinitesJSON},
-	{"repeated fields flat object", marshaler, repeatsObject, repeatsObjectJSON},
-	{"repeated fields pretty object", marshalerAllOptions, repeatsObject, repeatsObjectPrettyJSON},
-	{"nested message/enum flat object", marshaler, complexObject, complexObjectJSON},
-	{"nested message/enum pretty object", marshalerAllOptions, complexObject, complexObjectPrettyJSON},
-	{"enum-string flat object", Marshaler{},
-		&pb.Widget{Color: pb.Widget_BLUE.Enum()}, `{"color":"BLUE"}`},
-	{"enum-value pretty object", Marshaler{EnumsAsInts: true, Indent: " "},
-		&pb.Widget{Color: pb.Widget_BLUE.Enum()}, colorPrettyJSON},
-	{"unknown enum value object", marshalerAllOptions,
-		&pb.Widget{Color: pb.Widget_Color(1000).Enum(), RColor: []pb.Widget_Color{pb.Widget_RED}}, colorListPrettyJSON},
-	{"repeated proto3 enum", Marshaler{},
-		&proto3pb.Message{RFunny: []proto3pb.Message_Humour{
-			proto3pb.Message_PUNS,
-			proto3pb.Message_SLAPSTICK,
-		}},
-		`{"rFunny":["PUNS","SLAPSTICK"]}`},
-	{"repeated proto3 enum as int", Marshaler{EnumsAsInts: true},
-		&proto3pb.Message{RFunny: []proto3pb.Message_Humour{
-			proto3pb.Message_PUNS,
-			proto3pb.Message_SLAPSTICK,
-		}},
-		`{"rFunny":[1,2]}`},
-	{"empty value", marshaler, &pb.Simple3{}, `{}`},
-	{"empty value emitted", Marshaler{EmitDefaults: true}, &pb.Simple3{}, `{"dub":0}`},
-	{"empty repeated emitted", Marshaler{EmitDefaults: true}, &pb.SimpleSlice3{}, `{"slices":[]}`},
-	{"empty map emitted", Marshaler{EmitDefaults: true}, &pb.SimpleMap3{}, `{"stringy":{}}`},
-	{"nested struct null", Marshaler{EmitDefaults: true}, &pb.SimpleNull3{}, `{"simple":null}`},
-	{"map<int64, int32>", marshaler, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}, `{"nummy":{"1":2,"3":4}}`},
-	{"map<int64, int32>", marshalerAllOptions, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}, nummyPrettyJSON},
-	{"map<string, string>", marshaler,
-		&pb.Mappy{Strry: map[string]string{`"one"`: "two", "three": "four"}},
-		`{"strry":{"\"one\"":"two","three":"four"}}`},
-	{"map<int32, Object>", marshaler,
-		&pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}, `{"objjy":{"1":{"dub":1}}}`},
-	{"map<int32, Object>", marshalerAllOptions,
-		&pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}, objjyPrettyJSON},
-	{"map<int64, string>", marshaler, &pb.Mappy{Buggy: map[int64]string{1234: "yup"}},
-		`{"buggy":{"1234":"yup"}}`},
-	{"map<bool, bool>", marshaler, &pb.Mappy{Booly: map[bool]bool{false: true}}, `{"booly":{"false":true}}`},
-	// TODO: This is broken.
-	//{"map<string, enum>", marshaler, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}, `{"enumy":{"XIV":"ROMAN"}`},
-	{"map<string, enum as int>", Marshaler{EnumsAsInts: true}, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}, `{"enumy":{"XIV":2}}`},
-	{"map<int32, bool>", marshaler, &pb.Mappy{S32Booly: map[int32]bool{1: true, 3: false, 10: true, 12: false}}, `{"s32booly":{"1":true,"3":false,"10":true,"12":false}}`},
-	{"map<int64, bool>", marshaler, &pb.Mappy{S64Booly: map[int64]bool{1: true, 3: false, 10: true, 12: false}}, `{"s64booly":{"1":true,"3":false,"10":true,"12":false}}`},
-	{"map<uint32, bool>", marshaler, &pb.Mappy{U32Booly: map[uint32]bool{1: true, 3: false, 10: true, 12: false}}, `{"u32booly":{"1":true,"3":false,"10":true,"12":false}}`},
-	{"map<uint64, bool>", marshaler, &pb.Mappy{U64Booly: map[uint64]bool{1: true, 3: false, 10: true, 12: false}}, `{"u64booly":{"1":true,"3":false,"10":true,"12":false}}`},
-	{"proto2 map<int64, string>", marshaler, &pb.Maps{MInt64Str: map[int64]string{213: "cat"}},
-		`{"mInt64Str":{"213":"cat"}}`},
-	{"proto2 map<bool, Object>", marshaler,
-		&pb.Maps{MBoolSimple: map[bool]*pb.Simple{true: {OInt32: proto.Int32(1)}}},
-		`{"mBoolSimple":{"true":{"oInt32":1}}}`},
-	{"oneof, not set", marshaler, &pb.MsgWithOneof{}, `{}`},
-	{"oneof, set", marshaler, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Title{"Grand Poobah"}}, `{"title":"Grand Poobah"}`},
-	{"force orig_name", Marshaler{OrigName: true}, &pb.Simple{OInt32: proto.Int32(4)},
-		`{"o_int32":4}`},
-	{"proto2 extension", marshaler, realNumber, realNumberJSON},
-	{"Any with message", marshaler, anySimple, anySimpleJSON},
-	{"Any with message and indent", marshalerAllOptions, anySimple, anySimplePrettyJSON},
-	{"Any with WKT", marshaler, anyWellKnown, anyWellKnownJSON},
-	{"Any with WKT and indent", marshalerAllOptions, anyWellKnown, anyWellKnownPrettyJSON},
-	{"Duration", marshaler, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}, `{"dur":"3.000s"}`},
-	{"Struct", marshaler, &pb.KnownTypes{St: &stpb.Struct{
-		Fields: map[string]*stpb.Value{
-			"one": {Kind: &stpb.Value_StringValue{"loneliest number"}},
-			"two": {Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}},
-		},
-	}}, `{"st":{"one":"loneliest number","two":null}}`},
-	{"empty ListValue", marshaler, &pb.KnownTypes{Lv: &stpb.ListValue{}}, `{"lv":[]}`},
-	{"basic ListValue", marshaler, &pb.KnownTypes{Lv: &stpb.ListValue{Values: []*stpb.Value{
-		{Kind: &stpb.Value_StringValue{"x"}},
-		{Kind: &stpb.Value_NullValue{}},
-		{Kind: &stpb.Value_NumberValue{3}},
-		{Kind: &stpb.Value_BoolValue{true}},
-	}}}, `{"lv":["x",null,3,true]}`},
-	{"Timestamp", marshaler, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}, `{"ts":"2014-05-13T16:53:20.021Z"}`},
-	{"number Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NumberValue{1}}}, `{"val":1}`},
-	{"null Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}}}, `{"val":null}`},
-	{"string number value", marshaler, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"9223372036854775807"}}}, `{"val":"9223372036854775807"}`},
-	{"list of lists Value", marshaler, &pb.KnownTypes{Val: &stpb.Value{
-		Kind: &stpb.Value_ListValue{&stpb.ListValue{
-			Values: []*stpb.Value{
-				{Kind: &stpb.Value_StringValue{"x"}},
-				{Kind: &stpb.Value_ListValue{&stpb.ListValue{
-					Values: []*stpb.Value{
-						{Kind: &stpb.Value_ListValue{&stpb.ListValue{
-							Values: []*stpb.Value{{Kind: &stpb.Value_StringValue{"y"}}},
-						}}},
-						{Kind: &stpb.Value_StringValue{"z"}},
-					},
-				}}},
-			},
-		}},
-	}}, `{"val":["x",[["y"],"z"]]}`},
-
-	{"DoubleValue", marshaler, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}, `{"dbl":1.2}`},
-	{"FloatValue", marshaler, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}, `{"flt":1.2}`},
-	{"Int64Value", marshaler, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}, `{"i64":"-3"}`},
-	{"UInt64Value", marshaler, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}, `{"u64":"3"}`},
-	{"Int32Value", marshaler, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}, `{"i32":-4}`},
-	{"UInt32Value", marshaler, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}, `{"u32":4}`},
-	{"BoolValue", marshaler, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}, `{"bool":true}`},
-	{"StringValue", marshaler, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}, `{"str":"plush"}`},
-	{"BytesValue", marshaler, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}, `{"bytes":"d293"}`},
-}
-
-func TestMarshaling(t *testing.T) {
-	for _, tt := range marshalingTests {
-		json, err := tt.marshaler.MarshalToString(tt.pb)
-		if err != nil {
-			t.Errorf("%s: marshaling error: %v", tt.desc, err)
-		} else if tt.json != json {
-			t.Errorf("%s: got [%v] want [%v]", tt.desc, json, tt.json)
-		}
-	}
-}
-
-func TestMarshalJSONPBMarshaler(t *testing.T) {
-	rawJson := `{ "foo": "bar", "baz": [0, 1, 2, 3] }`
-	msg := dynamicMessage{rawJson: rawJson}
-	str, err := new(Marshaler).MarshalToString(&msg)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when marshalling JSONPBMarshaler: %v", err)
-	}
-	if str != rawJson {
-		t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", str, rawJson)
-	}
-}
-
-func TestMarshalAnyJSONPBMarshaler(t *testing.T) {
-	msg := dynamicMessage{rawJson: `{ "foo": "bar", "baz": [0, 1, 2, 3] }`}
-	a, err := ptypes.MarshalAny(&msg)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when marshalling to Any: %v", err)
-	}
-	str, err := new(Marshaler).MarshalToString(a)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when marshalling Any to JSON: %v", err)
-	}
-	// after custom marshaling, it's round-tripped through JSON decoding/encoding already,
-	// so the keys are sorted, whitespace is compacted, and "@type" key has been added
-	expected := `{"@type":"type.googleapis.com/` + dynamicMessageName + `","baz":[0,1,2,3],"foo":"bar"}`
-	if str != expected {
-		t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", str, expected)
-	}
-}
-
-var unmarshalingTests = []struct {
-	desc        string
-	unmarshaler Unmarshaler
-	json        string
-	pb          proto.Message
-}{
-	{"simple flat object", Unmarshaler{}, simpleObjectJSON, simpleObject},
-	{"simple pretty object", Unmarshaler{}, simpleObjectPrettyJSON, simpleObject},
-	{"repeated fields flat object", Unmarshaler{}, repeatsObjectJSON, repeatsObject},
-	{"repeated fields pretty object", Unmarshaler{}, repeatsObjectPrettyJSON, repeatsObject},
-	{"nested message/enum flat object", Unmarshaler{}, complexObjectJSON, complexObject},
-	{"nested message/enum pretty object", Unmarshaler{}, complexObjectPrettyJSON, complexObject},
-	{"enum-string object", Unmarshaler{}, `{"color":"BLUE"}`, &pb.Widget{Color: pb.Widget_BLUE.Enum()}},
-	{"enum-value object", Unmarshaler{}, "{\n \"color\": 2\n}", &pb.Widget{Color: pb.Widget_BLUE.Enum()}},
-	{"unknown field with allowed option", Unmarshaler{AllowUnknownFields: true}, `{"unknown": "foo"}`, new(pb.Simple)},
-	{"proto3 enum string", Unmarshaler{}, `{"hilarity":"PUNS"}`, &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
-	{"proto3 enum value", Unmarshaler{}, `{"hilarity":1}`, &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
-	{"unknown enum value object",
-		Unmarshaler{},
-		"{\n  \"color\": 1000,\n  \"r_color\": [\n    \"RED\"\n  ]\n}",
-		&pb.Widget{Color: pb.Widget_Color(1000).Enum(), RColor: []pb.Widget_Color{pb.Widget_RED}}},
-	{"repeated proto3 enum", Unmarshaler{}, `{"rFunny":["PUNS","SLAPSTICK"]}`,
-		&proto3pb.Message{RFunny: []proto3pb.Message_Humour{
-			proto3pb.Message_PUNS,
-			proto3pb.Message_SLAPSTICK,
-		}}},
-	{"repeated proto3 enum as int", Unmarshaler{}, `{"rFunny":[1,2]}`,
-		&proto3pb.Message{RFunny: []proto3pb.Message_Humour{
-			proto3pb.Message_PUNS,
-			proto3pb.Message_SLAPSTICK,
-		}}},
-	{"repeated proto3 enum as mix of strings and ints", Unmarshaler{}, `{"rFunny":["PUNS",2]}`,
-		&proto3pb.Message{RFunny: []proto3pb.Message_Humour{
-			proto3pb.Message_PUNS,
-			proto3pb.Message_SLAPSTICK,
-		}}},
-	{"unquoted int64 object", Unmarshaler{}, `{"oInt64":-314}`, &pb.Simple{OInt64: proto.Int64(-314)}},
-	{"unquoted uint64 object", Unmarshaler{}, `{"oUint64":123}`, &pb.Simple{OUint64: proto.Uint64(123)}},
-	{"NaN", Unmarshaler{}, `{"oDouble":"NaN"}`, &pb.Simple{ODouble: proto.Float64(math.NaN())}},
-	{"Inf", Unmarshaler{}, `{"oFloat":"Infinity"}`, &pb.Simple{OFloat: proto.Float32(float32(math.Inf(1)))}},
-	{"-Inf", Unmarshaler{}, `{"oDouble":"-Infinity"}`, &pb.Simple{ODouble: proto.Float64(math.Inf(-1))}},
-	{"map<int64, int32>", Unmarshaler{}, `{"nummy":{"1":2,"3":4}}`, &pb.Mappy{Nummy: map[int64]int32{1: 2, 3: 4}}},
-	{"map<string, string>", Unmarshaler{}, `{"strry":{"\"one\"":"two","three":"four"}}`, &pb.Mappy{Strry: map[string]string{`"one"`: "two", "three": "four"}}},
-	{"map<int32, Object>", Unmarshaler{}, `{"objjy":{"1":{"dub":1}}}`, &pb.Mappy{Objjy: map[int32]*pb.Simple3{1: {Dub: 1}}}},
-	{"proto2 extension", Unmarshaler{}, realNumberJSON, realNumber},
-	{"Any with message", Unmarshaler{}, anySimpleJSON, anySimple},
-	{"Any with message and indent", Unmarshaler{}, anySimplePrettyJSON, anySimple},
-	{"Any with WKT", Unmarshaler{}, anyWellKnownJSON, anyWellKnown},
-	{"Any with WKT and indent", Unmarshaler{}, anyWellKnownPrettyJSON, anyWellKnown},
-	// TODO: This is broken.
-	//{"map<string, enum>", Unmarshaler{}, `{"enumy":{"XIV":"ROMAN"}`, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}},
-	{"map<string, enum as int>", Unmarshaler{}, `{"enumy":{"XIV":2}}`, &pb.Mappy{Enumy: map[string]pb.Numeral{"XIV": pb.Numeral_ROMAN}}},
-	{"oneof", Unmarshaler{}, `{"salary":31000}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Salary{31000}}},
-	{"oneof spec name", Unmarshaler{}, `{"Country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
-	{"oneof orig_name", Unmarshaler{}, `{"Country":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_Country{"Australia"}}},
-	{"oneof spec name2", Unmarshaler{}, `{"homeAddress":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_HomeAddress{"Australia"}}},
-	{"oneof orig_name2", Unmarshaler{}, `{"home_address":"Australia"}`, &pb.MsgWithOneof{Union: &pb.MsgWithOneof_HomeAddress{"Australia"}}},
-	{"orig_name input", Unmarshaler{}, `{"o_bool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
-	{"camelName input", Unmarshaler{}, `{"oBool":true}`, &pb.Simple{OBool: proto.Bool(true)}},
-
-	{"Duration", Unmarshaler{}, `{"dur":"3.000s"}`, &pb.KnownTypes{Dur: &durpb.Duration{Seconds: 3}}},
-	{"null Duration", Unmarshaler{}, `{"dur":null}`, &pb.KnownTypes{Dur: nil}},
-	{"Timestamp", Unmarshaler{}, `{"ts":"2014-05-13T16:53:20.021Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: 14e8, Nanos: 21e6}}},
-	{"PreEpochTimestamp", Unmarshaler{}, `{"ts":"1969-12-31T23:59:58.999999995Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -2, Nanos: 999999995}}},
-	{"ZeroTimeTimestamp", Unmarshaler{}, `{"ts":"0001-01-01T00:00:00Z"}`, &pb.KnownTypes{Ts: &tspb.Timestamp{Seconds: -62135596800, Nanos: 0}}},
-	{"null Timestamp", Unmarshaler{}, `{"ts":null}`, &pb.KnownTypes{Ts: nil}},
-	{"null Struct", Unmarshaler{}, `{"st": null}`, &pb.KnownTypes{St: nil}},
-	{"empty Struct", Unmarshaler{}, `{"st": {}}`, &pb.KnownTypes{St: &stpb.Struct{}}},
-	{"basic Struct", Unmarshaler{}, `{"st": {"a": "x", "b": null, "c": 3, "d": true}}`, &pb.KnownTypes{St: &stpb.Struct{Fields: map[string]*stpb.Value{
-		"a": {Kind: &stpb.Value_StringValue{"x"}},
-		"b": {Kind: &stpb.Value_NullValue{}},
-		"c": {Kind: &stpb.Value_NumberValue{3}},
-		"d": {Kind: &stpb.Value_BoolValue{true}},
-	}}}},
-	{"nested Struct", Unmarshaler{}, `{"st": {"a": {"b": 1, "c": [{"d": true}, "f"]}}}`, &pb.KnownTypes{St: &stpb.Struct{Fields: map[string]*stpb.Value{
-		"a": {Kind: &stpb.Value_StructValue{&stpb.Struct{Fields: map[string]*stpb.Value{
-			"b": {Kind: &stpb.Value_NumberValue{1}},
-			"c": {Kind: &stpb.Value_ListValue{&stpb.ListValue{Values: []*stpb.Value{
-				{Kind: &stpb.Value_StructValue{&stpb.Struct{Fields: map[string]*stpb.Value{"d": {Kind: &stpb.Value_BoolValue{true}}}}}},
-				{Kind: &stpb.Value_StringValue{"f"}},
-			}}}},
-		}}}},
-	}}}},
-	{"null ListValue", Unmarshaler{}, `{"lv": null}`, &pb.KnownTypes{Lv: nil}},
-	{"empty ListValue", Unmarshaler{}, `{"lv": []}`, &pb.KnownTypes{Lv: &stpb.ListValue{}}},
-	{"basic ListValue", Unmarshaler{}, `{"lv": ["x", null, 3, true]}`, &pb.KnownTypes{Lv: &stpb.ListValue{Values: []*stpb.Value{
-		{Kind: &stpb.Value_StringValue{"x"}},
-		{Kind: &stpb.Value_NullValue{}},
-		{Kind: &stpb.Value_NumberValue{3}},
-		{Kind: &stpb.Value_BoolValue{true}},
-	}}}},
-	{"number Value", Unmarshaler{}, `{"val":1}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NumberValue{1}}}},
-	{"null Value", Unmarshaler{}, `{"val":null}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_NullValue{stpb.NullValue_NULL_VALUE}}}},
-	{"bool Value", Unmarshaler{}, `{"val":true}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_BoolValue{true}}}},
-	{"string Value", Unmarshaler{}, `{"val":"x"}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"x"}}}},
-	{"string number value", Unmarshaler{}, `{"val":"9223372036854775807"}`, &pb.KnownTypes{Val: &stpb.Value{Kind: &stpb.Value_StringValue{"9223372036854775807"}}}},
-	{"list of lists Value", Unmarshaler{}, `{"val":["x", [["y"], "z"]]}`, &pb.KnownTypes{Val: &stpb.Value{
-		Kind: &stpb.Value_ListValue{&stpb.ListValue{
-			Values: []*stpb.Value{
-				{Kind: &stpb.Value_StringValue{"x"}},
-				{Kind: &stpb.Value_ListValue{&stpb.ListValue{
-					Values: []*stpb.Value{
-						{Kind: &stpb.Value_ListValue{&stpb.ListValue{
-							Values: []*stpb.Value{{Kind: &stpb.Value_StringValue{"y"}}},
-						}}},
-						{Kind: &stpb.Value_StringValue{"z"}},
-					},
-				}}},
-			},
-		}}}}},
-
-	{"DoubleValue", Unmarshaler{}, `{"dbl":1.2}`, &pb.KnownTypes{Dbl: &wpb.DoubleValue{Value: 1.2}}},
-	{"FloatValue", Unmarshaler{}, `{"flt":1.2}`, &pb.KnownTypes{Flt: &wpb.FloatValue{Value: 1.2}}},
-	{"Int64Value", Unmarshaler{}, `{"i64":"-3"}`, &pb.KnownTypes{I64: &wpb.Int64Value{Value: -3}}},
-	{"UInt64Value", Unmarshaler{}, `{"u64":"3"}`, &pb.KnownTypes{U64: &wpb.UInt64Value{Value: 3}}},
-	{"Int32Value", Unmarshaler{}, `{"i32":-4}`, &pb.KnownTypes{I32: &wpb.Int32Value{Value: -4}}},
-	{"UInt32Value", Unmarshaler{}, `{"u32":4}`, &pb.KnownTypes{U32: &wpb.UInt32Value{Value: 4}}},
-	{"BoolValue", Unmarshaler{}, `{"bool":true}`, &pb.KnownTypes{Bool: &wpb.BoolValue{Value: true}}},
-	{"StringValue", Unmarshaler{}, `{"str":"plush"}`, &pb.KnownTypes{Str: &wpb.StringValue{Value: "plush"}}},
-	{"BytesValue", Unmarshaler{}, `{"bytes":"d293"}`, &pb.KnownTypes{Bytes: &wpb.BytesValue{Value: []byte("wow")}}},
-
-	// Ensure that `null` as a value ends up with a nil pointer instead of a [type]Value struct.
-	{"null DoubleValue", Unmarshaler{}, `{"dbl":null}`, &pb.KnownTypes{Dbl: nil}},
-	{"null FloatValue", Unmarshaler{}, `{"flt":null}`, &pb.KnownTypes{Flt: nil}},
-	{"null Int64Value", Unmarshaler{}, `{"i64":null}`, &pb.KnownTypes{I64: nil}},
-	{"null UInt64Value", Unmarshaler{}, `{"u64":null}`, &pb.KnownTypes{U64: nil}},
-	{"null Int32Value", Unmarshaler{}, `{"i32":null}`, &pb.KnownTypes{I32: nil}},
-	{"null UInt32Value", Unmarshaler{}, `{"u32":null}`, &pb.KnownTypes{U32: nil}},
-	{"null BoolValue", Unmarshaler{}, `{"bool":null}`, &pb.KnownTypes{Bool: nil}},
-	{"null StringValue", Unmarshaler{}, `{"str":null}`, &pb.KnownTypes{Str: nil}},
-	{"null BytesValue", Unmarshaler{}, `{"bytes":null}`, &pb.KnownTypes{Bytes: nil}},
-}
-
-func TestUnmarshaling(t *testing.T) {
-	for _, tt := range unmarshalingTests {
-		// Make a new instance of the type of our expected object.
-		p := reflect.New(reflect.TypeOf(tt.pb).Elem()).Interface().(proto.Message)
-
-		err := tt.unmarshaler.Unmarshal(strings.NewReader(tt.json), p)
-		if err != nil {
-			t.Errorf("%s: %v", tt.desc, err)
-			continue
-		}
-
-		// For easier diffs, compare text strings of the protos.
-		exp := proto.MarshalTextString(tt.pb)
-		act := proto.MarshalTextString(p)
-		if string(exp) != string(act) {
-			t.Errorf("%s: got [%s] want [%s]", tt.desc, act, exp)
-		}
-	}
-}
-
-func TestUnmarshalNullArray(t *testing.T) {
-	var repeats pb.Repeats
-	if err := UnmarshalString(`{"rBool":null}`, &repeats); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(repeats, pb.Repeats{}) {
-		t.Errorf("got non-nil fields in [%#v]", repeats)
-	}
-}
-
-func TestUnmarshalNullObject(t *testing.T) {
-	var maps pb.Maps
-	if err := UnmarshalString(`{"mInt64Str":null}`, &maps); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(maps, pb.Maps{}) {
-		t.Errorf("got non-nil fields in [%#v]", maps)
-	}
-}
-
-func TestUnmarshalNext(t *testing.T) {
-	// We only need to check against a few, not all of them.
-	tests := unmarshalingTests[:5]
-
-	// Create a buffer with many concatenated JSON objects.
-	var b bytes.Buffer
-	for _, tt := range tests {
-		b.WriteString(tt.json)
-	}
-
-	dec := json.NewDecoder(&b)
-	for _, tt := range tests {
-		// Make a new instance of the type of our expected object.
-		p := reflect.New(reflect.TypeOf(tt.pb).Elem()).Interface().(proto.Message)
-
-		err := tt.unmarshaler.UnmarshalNext(dec, p)
-		if err != nil {
-			t.Errorf("%s: %v", tt.desc, err)
-			continue
-		}
-
-		// For easier diffs, compare text strings of the protos.
-		exp := proto.MarshalTextString(tt.pb)
-		act := proto.MarshalTextString(p)
-		if string(exp) != string(act) {
-			t.Errorf("%s: got [%s] want [%s]", tt.desc, act, exp)
-		}
-	}
-
-	p := &pb.Simple{}
-	err := new(Unmarshaler).UnmarshalNext(dec, p)
-	if err != io.EOF {
-		t.Errorf("eof: got %v, expected io.EOF", err)
-	}
-}
-
-var unmarshalingShouldError = []struct {
-	desc string
-	in   string
-	pb   proto.Message
-}{
-	{"a value", "666", new(pb.Simple)},
-	{"gibberish", "{adskja123;l23=-=", new(pb.Simple)},
-	{"unknown field", `{"unknown": "foo"}`, new(pb.Simple)},
-	{"unknown enum name", `{"hilarity":"DAVE"}`, new(proto3pb.Message)},
-}
-
-func TestUnmarshalingBadInput(t *testing.T) {
-	for _, tt := range unmarshalingShouldError {
-		err := UnmarshalString(tt.in, tt.pb)
-		if err == nil {
-			t.Errorf("an error was expected when parsing %q instead of an object", tt.desc)
-		}
-	}
-}
-
-type funcResolver func(turl string) (proto.Message, error)
-
-func (fn funcResolver) Resolve(turl string) (proto.Message, error) {
-	return fn(turl)
-}
-
-func TestAnyWithCustomResolver(t *testing.T) {
-	var resolvedTypeUrls []string
-	resolver := funcResolver(func(turl string) (proto.Message, error) {
-		resolvedTypeUrls = append(resolvedTypeUrls, turl)
-		return new(pb.Simple), nil
-	})
-	msg := &pb.Simple{
-		OBytes:  []byte{1, 2, 3, 4},
-		OBool:   proto.Bool(true),
-		OString: proto.String("foobar"),
-		OInt64:  proto.Int64(1020304),
-	}
-	msgBytes, err := proto.Marshal(msg)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when marshaling message: %v", err)
-	}
-	// make an Any with a type URL that won't resolve w/out custom resolver
-	any := &anypb.Any{
-		TypeUrl: "https://foobar.com/some.random.MessageKind",
-		Value:   msgBytes,
-	}
-
-	m := Marshaler{AnyResolver: resolver}
-	js, err := m.MarshalToString(any)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when marshaling any to JSON: %v", err)
-	}
-	if len(resolvedTypeUrls) != 1 {
-		t.Errorf("custom resolver was not invoked during marshaling")
-	} else if resolvedTypeUrls[0] != "https://foobar.com/some.random.MessageKind" {
-		t.Errorf("custom resolver was invoked with wrong URL: got %q, wanted %q", resolvedTypeUrls[0], "https://foobar.com/some.random.MessageKind")
-	}
-	wanted := `{"@type":"https://foobar.com/some.random.MessageKind","oBool":true,"oInt64":"1020304","oString":"foobar","oBytes":"AQIDBA=="}`
-	if js != wanted {
-		t.Errorf("marshalling JSON produced incorrect output: got %s, wanted %s", js, wanted)
-	}
-
-	u := Unmarshaler{AnyResolver: resolver}
-	roundTrip := &anypb.Any{}
-	err = u.Unmarshal(bytes.NewReader([]byte(js)), roundTrip)
-	if err != nil {
-		t.Errorf("an unexpected error occurred when unmarshaling any from JSON: %v", err)
-	}
-	if len(resolvedTypeUrls) != 2 {
-		t.Errorf("custom resolver was not invoked during marshaling")
-	} else if resolvedTypeUrls[1] != "https://foobar.com/some.random.MessageKind" {
-		t.Errorf("custom resolver was invoked with wrong URL: got %q, wanted %q", resolvedTypeUrls[1], "https://foobar.com/some.random.MessageKind")
-	}
-	if !proto.Equal(any, roundTrip) {
-		t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", roundTrip, any)
-	}
-}
-
-func TestUnmarshalJSONPBUnmarshaler(t *testing.T) {
-	rawJson := `{ "foo": "bar", "baz": [0, 1, 2, 3] }`
-	var msg dynamicMessage
-	if err := Unmarshal(strings.NewReader(rawJson), &msg); err != nil {
-		t.Errorf("an unexpected error occurred when parsing into JSONPBUnmarshaler: %v", err)
-	}
-	if msg.rawJson != rawJson {
-		t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", msg.rawJson, rawJson)
-	}
-}
-
-func TestUnmarshalNullWithJSONPBUnmarshaler(t *testing.T) {
-	rawJson := `{"stringField":null}`
-	var ptrFieldMsg ptrFieldMessage
-	if err := Unmarshal(strings.NewReader(rawJson), &ptrFieldMsg); err != nil {
-		t.Errorf("unmarshal error: %v", err)
-	}
-
-	want := ptrFieldMessage{StringField: &stringField{IsSet: true, StringValue: "null"}}
-	if !proto.Equal(&ptrFieldMsg, &want) {
-		t.Errorf("unmarshal result StringField: got %v, want %v", ptrFieldMsg, want)
-	}
-}
-
-func TestUnmarshalAnyJSONPBUnmarshaler(t *testing.T) {
-	rawJson := `{ "@type": "blah.com/` + dynamicMessageName + `", "foo": "bar", "baz": [0, 1, 2, 3] }`
-	var got anypb.Any
-	if err := Unmarshal(strings.NewReader(rawJson), &got); err != nil {
-		t.Errorf("an unexpected error occurred when parsing into JSONPBUnmarshaler: %v", err)
-	}
-
-	dm := &dynamicMessage{rawJson: `{"baz":[0,1,2,3],"foo":"bar"}`}
-	var want anypb.Any
-	if b, err := proto.Marshal(dm); err != nil {
-		t.Errorf("an unexpected error occurred when marshaling message: %v", err)
-	} else {
-		want.TypeUrl = "blah.com/" + dynamicMessageName
-		want.Value = b
-	}
-
-	if !proto.Equal(&got, &want) {
-		t.Errorf("message contents not set correctly after unmarshalling JSON: got %s, wanted %s", got, want)
-	}
-}
-
-const (
-	dynamicMessageName = "google.protobuf.jsonpb.testing.dynamicMessage"
-)
-
-func init() {
-	// we register the custom type below so that we can use it in Any types
-	proto.RegisterType((*dynamicMessage)(nil), dynamicMessageName)
-}
-
-type ptrFieldMessage struct {
-	StringField *stringField `protobuf:"bytes,1,opt,name=stringField"`
-}
-
-func (m *ptrFieldMessage) Reset() {
-}
-
-func (m *ptrFieldMessage) String() string {
-	return m.StringField.StringValue
-}
-
-func (m *ptrFieldMessage) ProtoMessage() {
-}
-
-type stringField struct {
-	IsSet       bool   `protobuf:"varint,1,opt,name=isSet"`
-	StringValue string `protobuf:"bytes,2,opt,name=stringValue"`
-}
-
-func (s *stringField) Reset() {
-}
-
-func (s *stringField) String() string {
-	return s.StringValue
-}
-
-func (s *stringField) ProtoMessage() {
-}
-
-func (s *stringField) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
-	s.IsSet = true
-	s.StringValue = string(js)
-	return nil
-}
-
-// dynamicMessage implements protobuf.Message but is not a normal generated message type.
-// It provides implementations of JSONPBMarshaler and JSONPBUnmarshaler for JSON support.
-type dynamicMessage struct {
-	rawJson string `protobuf:"bytes,1,opt,name=rawJson"`
-}
-
-func (m *dynamicMessage) Reset() {
-	m.rawJson = "{}"
-}
-
-func (m *dynamicMessage) String() string {
-	return m.rawJson
-}
-
-func (m *dynamicMessage) ProtoMessage() {
-}
-
-func (m *dynamicMessage) MarshalJSONPB(jm *Marshaler) ([]byte, error) {
-	return []byte(m.rawJson), nil
-}
-
-func (m *dynamicMessage) UnmarshalJSONPB(jum *Unmarshaler, js []byte) error {
-	m.rawJson = string(js)
-	return nil
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile
deleted file mode 100644
index eeda8ae531..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2015 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-regenerate:
-	protoc --go_out=Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any,Mgoogle/protobuf/duration.proto=github.com/golang/protobuf/ptypes/duration,Mgoogle/protobuf/struct.proto=github.com/golang/protobuf/ptypes/struct,Mgoogle/protobuf/timestamp.proto=github.com/golang/protobuf/ptypes/timestamp,Mgoogle/protobuf/wrappers.proto=github.com/golang/protobuf/ptypes/wrappers:. *.proto
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
deleted file mode 100644
index ebb180e88d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.pb.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: more_test_objects.proto
-
-/*
-Package jsonpb is a generated protocol buffer package.
-
-It is generated from these files:
-	more_test_objects.proto
-	test_objects.proto
-
-It has these top-level messages:
-	Simple3
-	SimpleSlice3
-	SimpleMap3
-	SimpleNull3
-	Mappy
-	Simple
-	NonFinites
-	Repeats
-	Widget
-	Maps
-	MsgWithOneof
-	Real
-	Complex
-	KnownTypes
-*/
-package jsonpb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type Numeral int32
-
-const (
-	Numeral_UNKNOWN Numeral = 0
-	Numeral_ARABIC  Numeral = 1
-	Numeral_ROMAN   Numeral = 2
-)
-
-var Numeral_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "ARABIC",
-	2: "ROMAN",
-}
-var Numeral_value = map[string]int32{
-	"UNKNOWN": 0,
-	"ARABIC":  1,
-	"ROMAN":   2,
-}
-
-func (x Numeral) String() string {
-	return proto.EnumName(Numeral_name, int32(x))
-}
-func (Numeral) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-type Simple3 struct {
-	Dub float64 `protobuf:"fixed64,1,opt,name=dub" json:"dub,omitempty"`
-}
-
-func (m *Simple3) Reset()                    { *m = Simple3{} }
-func (m *Simple3) String() string            { return proto.CompactTextString(m) }
-func (*Simple3) ProtoMessage()               {}
-func (*Simple3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Simple3) GetDub() float64 {
-	if m != nil {
-		return m.Dub
-	}
-	return 0
-}
-
-type SimpleSlice3 struct {
-	Slices []string `protobuf:"bytes,1,rep,name=slices" json:"slices,omitempty"`
-}
-
-func (m *SimpleSlice3) Reset()                    { *m = SimpleSlice3{} }
-func (m *SimpleSlice3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleSlice3) ProtoMessage()               {}
-func (*SimpleSlice3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *SimpleSlice3) GetSlices() []string {
-	if m != nil {
-		return m.Slices
-	}
-	return nil
-}
-
-type SimpleMap3 struct {
-	Stringy map[string]string `protobuf:"bytes,1,rep,name=stringy" json:"stringy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *SimpleMap3) Reset()                    { *m = SimpleMap3{} }
-func (m *SimpleMap3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleMap3) ProtoMessage()               {}
-func (*SimpleMap3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *SimpleMap3) GetStringy() map[string]string {
-	if m != nil {
-		return m.Stringy
-	}
-	return nil
-}
-
-type SimpleNull3 struct {
-	Simple *Simple3 `protobuf:"bytes,1,opt,name=simple" json:"simple,omitempty"`
-}
-
-func (m *SimpleNull3) Reset()                    { *m = SimpleNull3{} }
-func (m *SimpleNull3) String() string            { return proto.CompactTextString(m) }
-func (*SimpleNull3) ProtoMessage()               {}
-func (*SimpleNull3) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *SimpleNull3) GetSimple() *Simple3 {
-	if m != nil {
-		return m.Simple
-	}
-	return nil
-}
-
-type Mappy struct {
-	Nummy    map[int64]int32    `protobuf:"bytes,1,rep,name=nummy" json:"nummy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	Strry    map[string]string  `protobuf:"bytes,2,rep,name=strry" json:"strry,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Objjy    map[int32]*Simple3 `protobuf:"bytes,3,rep,name=objjy" json:"objjy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Buggy    map[int64]string   `protobuf:"bytes,4,rep,name=buggy" json:"buggy,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Booly    map[bool]bool      `protobuf:"bytes,5,rep,name=booly" json:"booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	Enumy    map[string]Numeral `protobuf:"bytes,6,rep,name=enumy" json:"enumy,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"varint,2,opt,name=value,enum=jsonpb.Numeral"`
-	S32Booly map[int32]bool     `protobuf:"bytes,7,rep,name=s32booly" json:"s32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	S64Booly map[int64]bool     `protobuf:"bytes,8,rep,name=s64booly" json:"s64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	U32Booly map[uint32]bool    `protobuf:"bytes,9,rep,name=u32booly" json:"u32booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-	U64Booly map[uint64]bool    `protobuf:"bytes,10,rep,name=u64booly" json:"u64booly,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-}
-
-func (m *Mappy) Reset()                    { *m = Mappy{} }
-func (m *Mappy) String() string            { return proto.CompactTextString(m) }
-func (*Mappy) ProtoMessage()               {}
-func (*Mappy) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *Mappy) GetNummy() map[int64]int32 {
-	if m != nil {
-		return m.Nummy
-	}
-	return nil
-}
-
-func (m *Mappy) GetStrry() map[string]string {
-	if m != nil {
-		return m.Strry
-	}
-	return nil
-}
-
-func (m *Mappy) GetObjjy() map[int32]*Simple3 {
-	if m != nil {
-		return m.Objjy
-	}
-	return nil
-}
-
-func (m *Mappy) GetBuggy() map[int64]string {
-	if m != nil {
-		return m.Buggy
-	}
-	return nil
-}
-
-func (m *Mappy) GetBooly() map[bool]bool {
-	if m != nil {
-		return m.Booly
-	}
-	return nil
-}
-
-func (m *Mappy) GetEnumy() map[string]Numeral {
-	if m != nil {
-		return m.Enumy
-	}
-	return nil
-}
-
-func (m *Mappy) GetS32Booly() map[int32]bool {
-	if m != nil {
-		return m.S32Booly
-	}
-	return nil
-}
-
-func (m *Mappy) GetS64Booly() map[int64]bool {
-	if m != nil {
-		return m.S64Booly
-	}
-	return nil
-}
-
-func (m *Mappy) GetU32Booly() map[uint32]bool {
-	if m != nil {
-		return m.U32Booly
-	}
-	return nil
-}
-
-func (m *Mappy) GetU64Booly() map[uint64]bool {
-	if m != nil {
-		return m.U64Booly
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Simple3)(nil), "jsonpb.Simple3")
-	proto.RegisterType((*SimpleSlice3)(nil), "jsonpb.SimpleSlice3")
-	proto.RegisterType((*SimpleMap3)(nil), "jsonpb.SimpleMap3")
-	proto.RegisterType((*SimpleNull3)(nil), "jsonpb.SimpleNull3")
-	proto.RegisterType((*Mappy)(nil), "jsonpb.Mappy")
-	proto.RegisterEnum("jsonpb.Numeral", Numeral_name, Numeral_value)
-}
-
-func init() { proto.RegisterFile("more_test_objects.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 526 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x94, 0xdd, 0x6b, 0xdb, 0x3c,
-	0x14, 0x87, 0x5f, 0x27, 0xf5, 0xd7, 0x49, 0xfb, 0x2e, 0x88, 0xb1, 0x99, 0xf4, 0x62, 0xc5, 0xb0,
-	0xad, 0x0c, 0xe6, 0x8b, 0x78, 0x74, 0x5d, 0x77, 0x95, 0x8e, 0x5e, 0x94, 0x11, 0x07, 0x1c, 0xc2,
-	0x2e, 0x4b, 0xdc, 0x99, 0x90, 0xcc, 0x5f, 0xd8, 0xd6, 0xc0, 0xd7, 0xfb, 0xbb, 0x07, 0xe3, 0x48,
-	0x72, 0x2d, 0x07, 0x85, 0x6c, 0x77, 0x52, 0x7e, 0xcf, 0xe3, 0x73, 0x24, 0x1d, 0x02, 0x2f, 0xd3,
-	0xbc, 0x8c, 0x1f, 0xea, 0xb8, 0xaa, 0x1f, 0xf2, 0x68, 0x17, 0x3f, 0xd6, 0x95, 0x57, 0x94, 0x79,
-	0x9d, 0x13, 0x63, 0x57, 0xe5, 0x59, 0x11, 0xb9, 0xe7, 0x60, 0x2e, 0xb7, 0x69, 0x91, 0xc4, 0x3e,
-	0x19, 0xc3, 0xf0, 0x3b, 0x8d, 0x1c, 0xed, 0x42, 0xbb, 0xd4, 0x42, 0x5c, 0xba, 0x6f, 0xe0, 0x94,
-	0x87, 0xcb, 0x64, 0xfb, 0x18, 0xfb, 0xe4, 0x05, 0x18, 0x15, 0xae, 0x2a, 0x47, 0xbb, 0x18, 0x5e,
-	0xda, 0xa1, 0xd8, 0xb9, 0xbf, 0x34, 0x00, 0x0e, 0xce, 0xd7, 0x85, 0x4f, 0x3e, 0x81, 0x59, 0xd5,
-	0xe5, 0x36, 0xdb, 0x34, 0x8c, 0x1b, 0x4d, 0x5f, 0x79, 0xbc, 0x9a, 0xd7, 0x41, 0xde, 0x92, 0x13,
-	0x77, 0x59, 0x5d, 0x36, 0x61, 0xcb, 0x4f, 0x6e, 0xe0, 0x54, 0x0e, 0xb0, 0xa7, 0x1f, 0x71, 0xc3,
-	0x7a, 0xb2, 0x43, 0x5c, 0x92, 0xe7, 0xa0, 0xff, 0x5c, 0x27, 0x34, 0x76, 0x06, 0xec, 0x37, 0xbe,
-	0xb9, 0x19, 0x5c, 0x6b, 0xee, 0x15, 0x8c, 0xf8, 0xf7, 0x03, 0x9a, 0x24, 0x3e, 0x79, 0x0b, 0x46,
-	0xc5, 0xb6, 0xcc, 0x1e, 0x4d, 0x9f, 0xf5, 0x9b, 0xf0, 0x43, 0x11, 0xbb, 0xbf, 0x2d, 0xd0, 0xe7,
-	0xeb, 0xa2, 0x68, 0x88, 0x07, 0x7a, 0x46, 0xd3, 0xb4, 0x6d, 0xdb, 0x69, 0x0d, 0x96, 0x7a, 0x01,
-	0x46, 0xbc, 0x5f, 0x8e, 0x21, 0x5f, 0xd5, 0x65, 0xd9, 0x38, 0x03, 0x15, 0xbf, 0xc4, 0x48, 0xf0,
-	0x0c, 0x43, 0x3e, 0x8f, 0x76, 0xbb, 0xc6, 0x19, 0xaa, 0xf8, 0x05, 0x46, 0x82, 0x67, 0x18, 0xf2,
-	0x11, 0xdd, 0x6c, 0x1a, 0xe7, 0x44, 0xc5, 0xdf, 0x62, 0x24, 0x78, 0x86, 0x31, 0x3e, 0xcf, 0x93,
-	0xc6, 0xd1, 0x95, 0x3c, 0x46, 0x2d, 0x8f, 0x6b, 0xe4, 0xe3, 0x8c, 0xa6, 0x8d, 0x63, 0xa8, 0xf8,
-	0x3b, 0x8c, 0x04, 0xcf, 0x30, 0xf2, 0x11, 0xac, 0xca, 0x9f, 0xf2, 0x12, 0x26, 0x53, 0xce, 0xf7,
-	0x8e, 0x2c, 0x52, 0x6e, 0x3d, 0xc1, 0x4c, 0xbc, 0xfa, 0xc0, 0x45, 0x4b, 0x29, 0x8a, 0xb4, 0x15,
-	0xc5, 0x16, 0x45, 0xda, 0x56, 0xb4, 0x55, 0xe2, 0xaa, 0x5f, 0x91, 0x4a, 0x15, 0x69, 0x5b, 0x11,
-	0x94, 0x62, 0xbf, 0x62, 0x0b, 0x4f, 0xae, 0x01, 0xba, 0x87, 0x96, 0xe7, 0x6f, 0xa8, 0x98, 0x3f,
-	0x5d, 0x9a, 0x3f, 0x34, 0xbb, 0x27, 0xff, 0x97, 0xc9, 0x9d, 0xdc, 0x03, 0x74, 0x8f, 0x2f, 0x9b,
-	0x3a, 0x37, 0x5f, 0xcb, 0xa6, 0x62, 0x92, 0xfb, 0x4d, 0x74, 0x73, 0x71, 0xac, 0x7d, 0x7b, 0xdf,
-	0x7c, 0xba, 0x10, 0xd9, 0xb4, 0x14, 0xa6, 0xb5, 0xd7, 0x7e, 0x37, 0x2b, 0x8a, 0x83, 0xf7, 0xda,
-	0xff, 0xbf, 0x6b, 0x3f, 0xa0, 0x69, 0x5c, 0xae, 0x13, 0xf9, 0x53, 0x9f, 0xe1, 0xac, 0x37, 0x43,
-	0x8a, 0xcb, 0x38, 0xdc, 0x07, 0xca, 0xf2, 0xab, 0x1e, 0x3b, 0xfe, 0xbe, 0xbc, 0x3a, 0x54, 0xf9,
-	0xec, 0x6f, 0xe4, 0x43, 0x95, 0x4f, 0x8e, 0xc8, 0xef, 0xde, 0x83, 0x29, 0x6e, 0x82, 0x8c, 0xc0,
-	0x5c, 0x05, 0x5f, 0x83, 0xc5, 0xb7, 0x60, 0xfc, 0x1f, 0x01, 0x30, 0x66, 0xe1, 0xec, 0xf6, 0xfe,
-	0xcb, 0x58, 0x23, 0x36, 0xe8, 0xe1, 0x62, 0x3e, 0x0b, 0xc6, 0x83, 0xc8, 0x60, 0x7f, 0xe0, 0xfe,
-	0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x84, 0x34, 0xaf, 0xdb, 0x05, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto
deleted file mode 100644
index d254fa5fae..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/more_test_objects.proto
+++ /dev/null
@@ -1,69 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package jsonpb;
-
-message Simple3 {
-  double dub = 1;
-}
-
-message SimpleSlice3 {
-  repeated string slices = 1;
-}
-
-message SimpleMap3 {
-  map<string,string> stringy = 1;
-}
-
-message SimpleNull3 {
-  Simple3 simple = 1;
-}
-
-enum Numeral {
-  UNKNOWN = 0;
-  ARABIC = 1;
-  ROMAN = 2;
-}
-
-message Mappy {
-  map<int64, int32> nummy = 1;
-  map<string, string> strry = 2;
-  map<int32, Simple3> objjy = 3;
-  map<int64, string> buggy = 4;
-  map<bool, bool> booly = 5;
-  map<string, Numeral> enumy = 6;
-  map<int32, bool> s32booly = 7;
-  map<int64, bool> s64booly = 8;
-  map<uint32, bool> u32booly = 9;
-  map<uint64, bool> u64booly = 10;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
deleted file mode 100644
index d413d740de..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.pb.go
+++ /dev/null
@@ -1,852 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: test_objects.proto
-
-package jsonpb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import google_protobuf1 "github.com/golang/protobuf/ptypes/duration"
-import google_protobuf2 "github.com/golang/protobuf/ptypes/struct"
-import google_protobuf3 "github.com/golang/protobuf/ptypes/timestamp"
-import google_protobuf4 "github.com/golang/protobuf/ptypes/wrappers"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-type Widget_Color int32
-
-const (
-	Widget_RED   Widget_Color = 0
-	Widget_GREEN Widget_Color = 1
-	Widget_BLUE  Widget_Color = 2
-)
-
-var Widget_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Widget_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Widget_Color) Enum() *Widget_Color {
-	p := new(Widget_Color)
-	*p = x
-	return p
-}
-func (x Widget_Color) String() string {
-	return proto.EnumName(Widget_Color_name, int32(x))
-}
-func (x *Widget_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Widget_Color_value, data, "Widget_Color")
-	if err != nil {
-		return err
-	}
-	*x = Widget_Color(value)
-	return nil
-}
-func (Widget_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} }
-
-// Test message for holding primitive types.
-type Simple struct {
-	OBool            *bool    `protobuf:"varint,1,opt,name=o_bool,json=oBool" json:"o_bool,omitempty"`
-	OInt32           *int32   `protobuf:"varint,2,opt,name=o_int32,json=oInt32" json:"o_int32,omitempty"`
-	OInt64           *int64   `protobuf:"varint,3,opt,name=o_int64,json=oInt64" json:"o_int64,omitempty"`
-	OUint32          *uint32  `protobuf:"varint,4,opt,name=o_uint32,json=oUint32" json:"o_uint32,omitempty"`
-	OUint64          *uint64  `protobuf:"varint,5,opt,name=o_uint64,json=oUint64" json:"o_uint64,omitempty"`
-	OSint32          *int32   `protobuf:"zigzag32,6,opt,name=o_sint32,json=oSint32" json:"o_sint32,omitempty"`
-	OSint64          *int64   `protobuf:"zigzag64,7,opt,name=o_sint64,json=oSint64" json:"o_sint64,omitempty"`
-	OFloat           *float32 `protobuf:"fixed32,8,opt,name=o_float,json=oFloat" json:"o_float,omitempty"`
-	ODouble          *float64 `protobuf:"fixed64,9,opt,name=o_double,json=oDouble" json:"o_double,omitempty"`
-	OString          *string  `protobuf:"bytes,10,opt,name=o_string,json=oString" json:"o_string,omitempty"`
-	OBytes           []byte   `protobuf:"bytes,11,opt,name=o_bytes,json=oBytes" json:"o_bytes,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *Simple) Reset()                    { *m = Simple{} }
-func (m *Simple) String() string            { return proto.CompactTextString(m) }
-func (*Simple) ProtoMessage()               {}
-func (*Simple) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} }
-
-func (m *Simple) GetOBool() bool {
-	if m != nil && m.OBool != nil {
-		return *m.OBool
-	}
-	return false
-}
-
-func (m *Simple) GetOInt32() int32 {
-	if m != nil && m.OInt32 != nil {
-		return *m.OInt32
-	}
-	return 0
-}
-
-func (m *Simple) GetOInt64() int64 {
-	if m != nil && m.OInt64 != nil {
-		return *m.OInt64
-	}
-	return 0
-}
-
-func (m *Simple) GetOUint32() uint32 {
-	if m != nil && m.OUint32 != nil {
-		return *m.OUint32
-	}
-	return 0
-}
-
-func (m *Simple) GetOUint64() uint64 {
-	if m != nil && m.OUint64 != nil {
-		return *m.OUint64
-	}
-	return 0
-}
-
-func (m *Simple) GetOSint32() int32 {
-	if m != nil && m.OSint32 != nil {
-		return *m.OSint32
-	}
-	return 0
-}
-
-func (m *Simple) GetOSint64() int64 {
-	if m != nil && m.OSint64 != nil {
-		return *m.OSint64
-	}
-	return 0
-}
-
-func (m *Simple) GetOFloat() float32 {
-	if m != nil && m.OFloat != nil {
-		return *m.OFloat
-	}
-	return 0
-}
-
-func (m *Simple) GetODouble() float64 {
-	if m != nil && m.ODouble != nil {
-		return *m.ODouble
-	}
-	return 0
-}
-
-func (m *Simple) GetOString() string {
-	if m != nil && m.OString != nil {
-		return *m.OString
-	}
-	return ""
-}
-
-func (m *Simple) GetOBytes() []byte {
-	if m != nil {
-		return m.OBytes
-	}
-	return nil
-}
-
-// Test message for holding special non-finites primitives.
-type NonFinites struct {
-	FNan             *float32 `protobuf:"fixed32,1,opt,name=f_nan,json=fNan" json:"f_nan,omitempty"`
-	FPinf            *float32 `protobuf:"fixed32,2,opt,name=f_pinf,json=fPinf" json:"f_pinf,omitempty"`
-	FNinf            *float32 `protobuf:"fixed32,3,opt,name=f_ninf,json=fNinf" json:"f_ninf,omitempty"`
-	DNan             *float64 `protobuf:"fixed64,4,opt,name=d_nan,json=dNan" json:"d_nan,omitempty"`
-	DPinf            *float64 `protobuf:"fixed64,5,opt,name=d_pinf,json=dPinf" json:"d_pinf,omitempty"`
-	DNinf            *float64 `protobuf:"fixed64,6,opt,name=d_ninf,json=dNinf" json:"d_ninf,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *NonFinites) Reset()                    { *m = NonFinites{} }
-func (m *NonFinites) String() string            { return proto.CompactTextString(m) }
-func (*NonFinites) ProtoMessage()               {}
-func (*NonFinites) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} }
-
-func (m *NonFinites) GetFNan() float32 {
-	if m != nil && m.FNan != nil {
-		return *m.FNan
-	}
-	return 0
-}
-
-func (m *NonFinites) GetFPinf() float32 {
-	if m != nil && m.FPinf != nil {
-		return *m.FPinf
-	}
-	return 0
-}
-
-func (m *NonFinites) GetFNinf() float32 {
-	if m != nil && m.FNinf != nil {
-		return *m.FNinf
-	}
-	return 0
-}
-
-func (m *NonFinites) GetDNan() float64 {
-	if m != nil && m.DNan != nil {
-		return *m.DNan
-	}
-	return 0
-}
-
-func (m *NonFinites) GetDPinf() float64 {
-	if m != nil && m.DPinf != nil {
-		return *m.DPinf
-	}
-	return 0
-}
-
-func (m *NonFinites) GetDNinf() float64 {
-	if m != nil && m.DNinf != nil {
-		return *m.DNinf
-	}
-	return 0
-}
-
-// Test message for holding repeated primitives.
-type Repeats struct {
-	RBool            []bool    `protobuf:"varint,1,rep,name=r_bool,json=rBool" json:"r_bool,omitempty"`
-	RInt32           []int32   `protobuf:"varint,2,rep,name=r_int32,json=rInt32" json:"r_int32,omitempty"`
-	RInt64           []int64   `protobuf:"varint,3,rep,name=r_int64,json=rInt64" json:"r_int64,omitempty"`
-	RUint32          []uint32  `protobuf:"varint,4,rep,name=r_uint32,json=rUint32" json:"r_uint32,omitempty"`
-	RUint64          []uint64  `protobuf:"varint,5,rep,name=r_uint64,json=rUint64" json:"r_uint64,omitempty"`
-	RSint32          []int32   `protobuf:"zigzag32,6,rep,name=r_sint32,json=rSint32" json:"r_sint32,omitempty"`
-	RSint64          []int64   `protobuf:"zigzag64,7,rep,name=r_sint64,json=rSint64" json:"r_sint64,omitempty"`
-	RFloat           []float32 `protobuf:"fixed32,8,rep,name=r_float,json=rFloat" json:"r_float,omitempty"`
-	RDouble          []float64 `protobuf:"fixed64,9,rep,name=r_double,json=rDouble" json:"r_double,omitempty"`
-	RString          []string  `protobuf:"bytes,10,rep,name=r_string,json=rString" json:"r_string,omitempty"`
-	RBytes           [][]byte  `protobuf:"bytes,11,rep,name=r_bytes,json=rBytes" json:"r_bytes,omitempty"`
-	XXX_unrecognized []byte    `json:"-"`
-}
-
-func (m *Repeats) Reset()                    { *m = Repeats{} }
-func (m *Repeats) String() string            { return proto.CompactTextString(m) }
-func (*Repeats) ProtoMessage()               {}
-func (*Repeats) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} }
-
-func (m *Repeats) GetRBool() []bool {
-	if m != nil {
-		return m.RBool
-	}
-	return nil
-}
-
-func (m *Repeats) GetRInt32() []int32 {
-	if m != nil {
-		return m.RInt32
-	}
-	return nil
-}
-
-func (m *Repeats) GetRInt64() []int64 {
-	if m != nil {
-		return m.RInt64
-	}
-	return nil
-}
-
-func (m *Repeats) GetRUint32() []uint32 {
-	if m != nil {
-		return m.RUint32
-	}
-	return nil
-}
-
-func (m *Repeats) GetRUint64() []uint64 {
-	if m != nil {
-		return m.RUint64
-	}
-	return nil
-}
-
-func (m *Repeats) GetRSint32() []int32 {
-	if m != nil {
-		return m.RSint32
-	}
-	return nil
-}
-
-func (m *Repeats) GetRSint64() []int64 {
-	if m != nil {
-		return m.RSint64
-	}
-	return nil
-}
-
-func (m *Repeats) GetRFloat() []float32 {
-	if m != nil {
-		return m.RFloat
-	}
-	return nil
-}
-
-func (m *Repeats) GetRDouble() []float64 {
-	if m != nil {
-		return m.RDouble
-	}
-	return nil
-}
-
-func (m *Repeats) GetRString() []string {
-	if m != nil {
-		return m.RString
-	}
-	return nil
-}
-
-func (m *Repeats) GetRBytes() [][]byte {
-	if m != nil {
-		return m.RBytes
-	}
-	return nil
-}
-
-// Test message for holding enums and nested messages.
-type Widget struct {
-	Color            *Widget_Color  `protobuf:"varint,1,opt,name=color,enum=jsonpb.Widget_Color" json:"color,omitempty"`
-	RColor           []Widget_Color `protobuf:"varint,2,rep,name=r_color,json=rColor,enum=jsonpb.Widget_Color" json:"r_color,omitempty"`
-	Simple           *Simple        `protobuf:"bytes,10,opt,name=simple" json:"simple,omitempty"`
-	RSimple          []*Simple      `protobuf:"bytes,11,rep,name=r_simple,json=rSimple" json:"r_simple,omitempty"`
-	Repeats          *Repeats       `protobuf:"bytes,20,opt,name=repeats" json:"repeats,omitempty"`
-	RRepeats         []*Repeats     `protobuf:"bytes,21,rep,name=r_repeats,json=rRepeats" json:"r_repeats,omitempty"`
-	XXX_unrecognized []byte         `json:"-"`
-}
-
-func (m *Widget) Reset()                    { *m = Widget{} }
-func (m *Widget) String() string            { return proto.CompactTextString(m) }
-func (*Widget) ProtoMessage()               {}
-func (*Widget) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} }
-
-func (m *Widget) GetColor() Widget_Color {
-	if m != nil && m.Color != nil {
-		return *m.Color
-	}
-	return Widget_RED
-}
-
-func (m *Widget) GetRColor() []Widget_Color {
-	if m != nil {
-		return m.RColor
-	}
-	return nil
-}
-
-func (m *Widget) GetSimple() *Simple {
-	if m != nil {
-		return m.Simple
-	}
-	return nil
-}
-
-func (m *Widget) GetRSimple() []*Simple {
-	if m != nil {
-		return m.RSimple
-	}
-	return nil
-}
-
-func (m *Widget) GetRepeats() *Repeats {
-	if m != nil {
-		return m.Repeats
-	}
-	return nil
-}
-
-func (m *Widget) GetRRepeats() []*Repeats {
-	if m != nil {
-		return m.RRepeats
-	}
-	return nil
-}
-
-type Maps struct {
-	MInt64Str        map[int64]string `protobuf:"bytes,1,rep,name=m_int64_str,json=mInt64Str" json:"m_int64_str,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MBoolSimple      map[bool]*Simple `protobuf:"bytes,2,rep,name=m_bool_simple,json=mBoolSimple" json:"m_bool_simple,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte           `json:"-"`
-}
-
-func (m *Maps) Reset()                    { *m = Maps{} }
-func (m *Maps) String() string            { return proto.CompactTextString(m) }
-func (*Maps) ProtoMessage()               {}
-func (*Maps) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} }
-
-func (m *Maps) GetMInt64Str() map[int64]string {
-	if m != nil {
-		return m.MInt64Str
-	}
-	return nil
-}
-
-func (m *Maps) GetMBoolSimple() map[bool]*Simple {
-	if m != nil {
-		return m.MBoolSimple
-	}
-	return nil
-}
-
-type MsgWithOneof struct {
-	// Types that are valid to be assigned to Union:
-	//	*MsgWithOneof_Title
-	//	*MsgWithOneof_Salary
-	//	*MsgWithOneof_Country
-	//	*MsgWithOneof_HomeAddress
-	Union            isMsgWithOneof_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *MsgWithOneof) Reset()                    { *m = MsgWithOneof{} }
-func (m *MsgWithOneof) String() string            { return proto.CompactTextString(m) }
-func (*MsgWithOneof) ProtoMessage()               {}
-func (*MsgWithOneof) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} }
-
-type isMsgWithOneof_Union interface {
-	isMsgWithOneof_Union()
-}
-
-type MsgWithOneof_Title struct {
-	Title string `protobuf:"bytes,1,opt,name=title,oneof"`
-}
-type MsgWithOneof_Salary struct {
-	Salary int64 `protobuf:"varint,2,opt,name=salary,oneof"`
-}
-type MsgWithOneof_Country struct {
-	Country string `protobuf:"bytes,3,opt,name=Country,oneof"`
-}
-type MsgWithOneof_HomeAddress struct {
-	HomeAddress string `protobuf:"bytes,4,opt,name=home_address,json=homeAddress,oneof"`
-}
-
-func (*MsgWithOneof_Title) isMsgWithOneof_Union()       {}
-func (*MsgWithOneof_Salary) isMsgWithOneof_Union()      {}
-func (*MsgWithOneof_Country) isMsgWithOneof_Union()     {}
-func (*MsgWithOneof_HomeAddress) isMsgWithOneof_Union() {}
-
-func (m *MsgWithOneof) GetUnion() isMsgWithOneof_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *MsgWithOneof) GetTitle() string {
-	if x, ok := m.GetUnion().(*MsgWithOneof_Title); ok {
-		return x.Title
-	}
-	return ""
-}
-
-func (m *MsgWithOneof) GetSalary() int64 {
-	if x, ok := m.GetUnion().(*MsgWithOneof_Salary); ok {
-		return x.Salary
-	}
-	return 0
-}
-
-func (m *MsgWithOneof) GetCountry() string {
-	if x, ok := m.GetUnion().(*MsgWithOneof_Country); ok {
-		return x.Country
-	}
-	return ""
-}
-
-func (m *MsgWithOneof) GetHomeAddress() string {
-	if x, ok := m.GetUnion().(*MsgWithOneof_HomeAddress); ok {
-		return x.HomeAddress
-	}
-	return ""
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*MsgWithOneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _MsgWithOneof_OneofMarshaler, _MsgWithOneof_OneofUnmarshaler, _MsgWithOneof_OneofSizer, []interface{}{
-		(*MsgWithOneof_Title)(nil),
-		(*MsgWithOneof_Salary)(nil),
-		(*MsgWithOneof_Country)(nil),
-		(*MsgWithOneof_HomeAddress)(nil),
-	}
-}
-
-func _MsgWithOneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*MsgWithOneof)
-	// union
-	switch x := m.Union.(type) {
-	case *MsgWithOneof_Title:
-		b.EncodeVarint(1<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Title)
-	case *MsgWithOneof_Salary:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Salary))
-	case *MsgWithOneof_Country:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Country)
-	case *MsgWithOneof_HomeAddress:
-		b.EncodeVarint(4<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.HomeAddress)
-	case nil:
-	default:
-		return fmt.Errorf("MsgWithOneof.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _MsgWithOneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*MsgWithOneof)
-	switch tag {
-	case 1: // union.title
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &MsgWithOneof_Title{x}
-		return true, err
-	case 2: // union.salary
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &MsgWithOneof_Salary{int64(x)}
-		return true, err
-	case 3: // union.Country
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &MsgWithOneof_Country{x}
-		return true, err
-	case 4: // union.home_address
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &MsgWithOneof_HomeAddress{x}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _MsgWithOneof_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*MsgWithOneof)
-	// union
-	switch x := m.Union.(type) {
-	case *MsgWithOneof_Title:
-		n += proto.SizeVarint(1<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Title)))
-		n += len(x.Title)
-	case *MsgWithOneof_Salary:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Salary))
-	case *MsgWithOneof_Country:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Country)))
-		n += len(x.Country)
-	case *MsgWithOneof_HomeAddress:
-		n += proto.SizeVarint(4<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.HomeAddress)))
-		n += len(x.HomeAddress)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Real struct {
-	Value                        *float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Real) Reset()                    { *m = Real{} }
-func (m *Real) String() string            { return proto.CompactTextString(m) }
-func (*Real) ProtoMessage()               {}
-func (*Real) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} }
-
-var extRange_Real = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Real) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Real
-}
-
-func (m *Real) GetValue() float64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return 0
-}
-
-type Complex struct {
-	Imaginary                    *float64 `protobuf:"fixed64,1,opt,name=imaginary" json:"imaginary,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Complex) Reset()                    { *m = Complex{} }
-func (m *Complex) String() string            { return proto.CompactTextString(m) }
-func (*Complex) ProtoMessage()               {}
-func (*Complex) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} }
-
-var extRange_Complex = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Complex) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Complex
-}
-
-func (m *Complex) GetImaginary() float64 {
-	if m != nil && m.Imaginary != nil {
-		return *m.Imaginary
-	}
-	return 0
-}
-
-var E_Complex_RealExtension = &proto.ExtensionDesc{
-	ExtendedType:  (*Real)(nil),
-	ExtensionType: (*Complex)(nil),
-	Field:         123,
-	Name:          "jsonpb.Complex.real_extension",
-	Tag:           "bytes,123,opt,name=real_extension,json=realExtension",
-	Filename:      "test_objects.proto",
-}
-
-type KnownTypes struct {
-	An               *google_protobuf.Any          `protobuf:"bytes,14,opt,name=an" json:"an,omitempty"`
-	Dur              *google_protobuf1.Duration    `protobuf:"bytes,1,opt,name=dur" json:"dur,omitempty"`
-	St               *google_protobuf2.Struct      `protobuf:"bytes,12,opt,name=st" json:"st,omitempty"`
-	Ts               *google_protobuf3.Timestamp   `protobuf:"bytes,2,opt,name=ts" json:"ts,omitempty"`
-	Lv               *google_protobuf2.ListValue   `protobuf:"bytes,15,opt,name=lv" json:"lv,omitempty"`
-	Val              *google_protobuf2.Value       `protobuf:"bytes,16,opt,name=val" json:"val,omitempty"`
-	Dbl              *google_protobuf4.DoubleValue `protobuf:"bytes,3,opt,name=dbl" json:"dbl,omitempty"`
-	Flt              *google_protobuf4.FloatValue  `protobuf:"bytes,4,opt,name=flt" json:"flt,omitempty"`
-	I64              *google_protobuf4.Int64Value  `protobuf:"bytes,5,opt,name=i64" json:"i64,omitempty"`
-	U64              *google_protobuf4.UInt64Value `protobuf:"bytes,6,opt,name=u64" json:"u64,omitempty"`
-	I32              *google_protobuf4.Int32Value  `protobuf:"bytes,7,opt,name=i32" json:"i32,omitempty"`
-	U32              *google_protobuf4.UInt32Value `protobuf:"bytes,8,opt,name=u32" json:"u32,omitempty"`
-	Bool             *google_protobuf4.BoolValue   `protobuf:"bytes,9,opt,name=bool" json:"bool,omitempty"`
-	Str              *google_protobuf4.StringValue `protobuf:"bytes,10,opt,name=str" json:"str,omitempty"`
-	Bytes            *google_protobuf4.BytesValue  `protobuf:"bytes,11,opt,name=bytes" json:"bytes,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (m *KnownTypes) Reset()                    { *m = KnownTypes{} }
-func (m *KnownTypes) String() string            { return proto.CompactTextString(m) }
-func (*KnownTypes) ProtoMessage()               {}
-func (*KnownTypes) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{8} }
-
-func (m *KnownTypes) GetAn() *google_protobuf.Any {
-	if m != nil {
-		return m.An
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetDur() *google_protobuf1.Duration {
-	if m != nil {
-		return m.Dur
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetSt() *google_protobuf2.Struct {
-	if m != nil {
-		return m.St
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetTs() *google_protobuf3.Timestamp {
-	if m != nil {
-		return m.Ts
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetLv() *google_protobuf2.ListValue {
-	if m != nil {
-		return m.Lv
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetVal() *google_protobuf2.Value {
-	if m != nil {
-		return m.Val
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetDbl() *google_protobuf4.DoubleValue {
-	if m != nil {
-		return m.Dbl
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetFlt() *google_protobuf4.FloatValue {
-	if m != nil {
-		return m.Flt
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetI64() *google_protobuf4.Int64Value {
-	if m != nil {
-		return m.I64
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetU64() *google_protobuf4.UInt64Value {
-	if m != nil {
-		return m.U64
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetI32() *google_protobuf4.Int32Value {
-	if m != nil {
-		return m.I32
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetU32() *google_protobuf4.UInt32Value {
-	if m != nil {
-		return m.U32
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetBool() *google_protobuf4.BoolValue {
-	if m != nil {
-		return m.Bool
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetStr() *google_protobuf4.StringValue {
-	if m != nil {
-		return m.Str
-	}
-	return nil
-}
-
-func (m *KnownTypes) GetBytes() *google_protobuf4.BytesValue {
-	if m != nil {
-		return m.Bytes
-	}
-	return nil
-}
-
-var E_Name = &proto.ExtensionDesc{
-	ExtendedType:  (*Real)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         124,
-	Name:          "jsonpb.name",
-	Tag:           "bytes,124,opt,name=name",
-	Filename:      "test_objects.proto",
-}
-
-func init() {
-	proto.RegisterType((*Simple)(nil), "jsonpb.Simple")
-	proto.RegisterType((*NonFinites)(nil), "jsonpb.NonFinites")
-	proto.RegisterType((*Repeats)(nil), "jsonpb.Repeats")
-	proto.RegisterType((*Widget)(nil), "jsonpb.Widget")
-	proto.RegisterType((*Maps)(nil), "jsonpb.Maps")
-	proto.RegisterType((*MsgWithOneof)(nil), "jsonpb.MsgWithOneof")
-	proto.RegisterType((*Real)(nil), "jsonpb.Real")
-	proto.RegisterType((*Complex)(nil), "jsonpb.Complex")
-	proto.RegisterType((*KnownTypes)(nil), "jsonpb.KnownTypes")
-	proto.RegisterEnum("jsonpb.Widget_Color", Widget_Color_name, Widget_Color_value)
-	proto.RegisterExtension(E_Complex_RealExtension)
-	proto.RegisterExtension(E_Name)
-}
-
-func init() { proto.RegisterFile("test_objects.proto", fileDescriptor1) }
-
-var fileDescriptor1 = []byte{
-	// 1160 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x95, 0x41, 0x73, 0xdb, 0x44,
-	0x14, 0xc7, 0x23, 0xc9, 0x92, 0xed, 0x75, 0x92, 0x9a, 0x6d, 0xda, 0x2a, 0x26, 0x80, 0xc6, 0x94,
-	0x22, 0x0a, 0x75, 0x07, 0xc7, 0xe3, 0x61, 0x0a, 0x97, 0xa4, 0x71, 0x29, 0x43, 0x13, 0x98, 0x4d,
-	0x43, 0x8f, 0x1e, 0x39, 0x5a, 0xbb, 0x2a, 0xf2, 0xae, 0x67, 0x77, 0x95, 0xd4, 0x03, 0x87, 0x9c,
-	0x39, 0x32, 0x7c, 0x05, 0xf8, 0x08, 0x1c, 0xf8, 0x74, 0xcc, 0xdb, 0x95, 0xac, 0xc4, 0x8e, 0x4f,
-	0xf1, 0x7b, 0xef, 0xff, 0xfe, 0x59, 0xed, 0x6f, 0x77, 0x1f, 0xc2, 0x8a, 0x4a, 0x35, 0xe4, 0xa3,
-	0x77, 0xf4, 0x5c, 0xc9, 0xce, 0x4c, 0x70, 0xc5, 0xb1, 0xf7, 0x4e, 0x72, 0x36, 0x1b, 0xb5, 0x76,
-	0x27, 0x9c, 0x4f, 0x52, 0xfa, 0x54, 0x67, 0x47, 0xd9, 0xf8, 0x69, 0xc4, 0xe6, 0x46, 0xd2, 0xfa,
-	0x78, 0xb9, 0x14, 0x67, 0x22, 0x52, 0x09, 0x67, 0x79, 0x7d, 0x6f, 0xb9, 0x2e, 0x95, 0xc8, 0xce,
-	0x55, 0x5e, 0xfd, 0x64, 0xb9, 0xaa, 0x92, 0x29, 0x95, 0x2a, 0x9a, 0xce, 0xd6, 0xd9, 0x5f, 0x8a,
-	0x68, 0x36, 0xa3, 0x22, 0x5f, 0x61, 0xfb, 0x6f, 0x1b, 0x79, 0xa7, 0xc9, 0x74, 0x96, 0x52, 0x7c,
-	0x0f, 0x79, 0x7c, 0x38, 0xe2, 0x3c, 0xf5, 0xad, 0xc0, 0x0a, 0x6b, 0xc4, 0xe5, 0x87, 0x9c, 0xa7,
-	0xf8, 0x01, 0xaa, 0xf2, 0x61, 0xc2, 0xd4, 0x7e, 0xd7, 0xb7, 0x03, 0x2b, 0x74, 0x89, 0xc7, 0x7f,
-	0x80, 0x68, 0x51, 0xe8, 0xf7, 0x7c, 0x27, 0xb0, 0x42, 0xc7, 0x14, 0xfa, 0x3d, 0xbc, 0x8b, 0x6a,
-	0x7c, 0x98, 0x99, 0x96, 0x4a, 0x60, 0x85, 0x5b, 0xa4, 0xca, 0xcf, 0x74, 0x58, 0x96, 0xfa, 0x3d,
-	0xdf, 0x0d, 0xac, 0xb0, 0x92, 0x97, 0x8a, 0x2e, 0x69, 0xba, 0xbc, 0xc0, 0x0a, 0x3f, 0x20, 0x55,
-	0x7e, 0x7a, 0xad, 0x4b, 0x9a, 0xae, 0x6a, 0x60, 0x85, 0x38, 0x2f, 0xf5, 0x7b, 0x66, 0x11, 0xe3,
-	0x94, 0x47, 0xca, 0xaf, 0x05, 0x56, 0x68, 0x13, 0x8f, 0xbf, 0x80, 0xc8, 0xf4, 0xc4, 0x3c, 0x1b,
-	0xa5, 0xd4, 0xaf, 0x07, 0x56, 0x68, 0x91, 0x2a, 0x3f, 0xd2, 0x61, 0x6e, 0xa7, 0x44, 0xc2, 0x26,
-	0x3e, 0x0a, 0xac, 0xb0, 0x0e, 0x76, 0x3a, 0x34, 0x76, 0xa3, 0xb9, 0xa2, 0xd2, 0x6f, 0x04, 0x56,
-	0xb8, 0x49, 0x3c, 0x7e, 0x08, 0x51, 0xfb, 0x4f, 0x0b, 0xa1, 0x13, 0xce, 0x5e, 0x24, 0x2c, 0x51,
-	0x54, 0xe2, 0xbb, 0xc8, 0x1d, 0x0f, 0x59, 0xc4, 0xf4, 0x56, 0xd9, 0xa4, 0x32, 0x3e, 0x89, 0x18,
-	0x6c, 0xe0, 0x78, 0x38, 0x4b, 0xd8, 0x58, 0x6f, 0x94, 0x4d, 0xdc, 0xf1, 0xcf, 0x09, 0x1b, 0x9b,
-	0x34, 0x83, 0xb4, 0x93, 0xa7, 0x4f, 0x20, 0x7d, 0x17, 0xb9, 0xb1, 0xb6, 0xa8, 0xe8, 0xd5, 0x55,
-	0xe2, 0xdc, 0x22, 0x36, 0x16, 0xae, 0xce, 0xba, 0x71, 0x61, 0x11, 0x1b, 0x0b, 0x2f, 0x4f, 0x83,
-	0x45, 0xfb, 0x1f, 0x1b, 0x55, 0x09, 0x9d, 0xd1, 0x48, 0x49, 0x90, 0x88, 0x82, 0x9e, 0x03, 0xf4,
-	0x44, 0x41, 0x4f, 0x2c, 0xe8, 0x39, 0x40, 0x4f, 0x2c, 0xe8, 0x89, 0x05, 0x3d, 0x07, 0xe8, 0x89,
-	0x05, 0x3d, 0x51, 0xd2, 0x73, 0x80, 0x9e, 0x28, 0xe9, 0x89, 0x92, 0x9e, 0x03, 0xf4, 0x44, 0x49,
-	0x4f, 0x94, 0xf4, 0x1c, 0xa0, 0x27, 0x4e, 0xaf, 0x75, 0x2d, 0xe8, 0x39, 0x40, 0x4f, 0x94, 0xf4,
-	0xc4, 0x82, 0x9e, 0x03, 0xf4, 0xc4, 0x82, 0x9e, 0x28, 0xe9, 0x39, 0x40, 0x4f, 0x94, 0xf4, 0x44,
-	0x49, 0xcf, 0x01, 0x7a, 0xa2, 0xa4, 0x27, 0x16, 0xf4, 0x1c, 0xa0, 0x27, 0x0c, 0xbd, 0x7f, 0x6d,
-	0xe4, 0xbd, 0x49, 0xe2, 0x09, 0x55, 0xf8, 0x31, 0x72, 0xcf, 0x79, 0xca, 0x85, 0x26, 0xb7, 0xdd,
-	0xdd, 0xe9, 0x98, 0x2b, 0xda, 0x31, 0xe5, 0xce, 0x73, 0xa8, 0x11, 0x23, 0xc1, 0x4f, 0xc0, 0xcf,
-	0xa8, 0x61, 0xf3, 0xd6, 0xa9, 0x3d, 0xa1, 0xff, 0xe2, 0x47, 0xc8, 0x93, 0xfa, 0x2a, 0xe9, 0x53,
-	0xd5, 0xe8, 0x6e, 0x17, 0x6a, 0x73, 0xc1, 0x48, 0x5e, 0xc5, 0x5f, 0x98, 0x0d, 0xd1, 0x4a, 0x58,
-	0xe7, 0xaa, 0x12, 0x36, 0x28, 0x97, 0x56, 0x85, 0x01, 0xec, 0xef, 0x68, 0xcf, 0x3b, 0x85, 0x32,
-	0xe7, 0x4e, 0x8a, 0x3a, 0xfe, 0x0a, 0xd5, 0xc5, 0xb0, 0x10, 0xdf, 0xd3, 0xb6, 0x2b, 0xe2, 0x9a,
-	0xc8, 0x7f, 0xb5, 0x3f, 0x43, 0xae, 0x59, 0x74, 0x15, 0x39, 0x64, 0x70, 0xd4, 0xdc, 0xc0, 0x75,
-	0xe4, 0x7e, 0x4f, 0x06, 0x83, 0x93, 0xa6, 0x85, 0x6b, 0xa8, 0x72, 0xf8, 0xea, 0x6c, 0xd0, 0xb4,
-	0xdb, 0x7f, 0xd9, 0xa8, 0x72, 0x1c, 0xcd, 0x24, 0xfe, 0x16, 0x35, 0xa6, 0xe6, 0xb8, 0xc0, 0xde,
-	0xeb, 0x33, 0xd6, 0xe8, 0x7e, 0x58, 0xf8, 0x83, 0xa4, 0x73, 0xac, 0xcf, 0xcf, 0xa9, 0x12, 0x03,
-	0xa6, 0xc4, 0x9c, 0xd4, 0xa7, 0x45, 0x8c, 0x0f, 0xd0, 0xd6, 0x54, 0x9f, 0xcd, 0xe2, 0xab, 0x6d,
-	0xdd, 0xfe, 0xd1, 0xcd, 0x76, 0x38, 0xaf, 0xe6, 0xb3, 0x8d, 0x41, 0x63, 0x5a, 0x66, 0x5a, 0xdf,
-	0xa1, 0xed, 0x9b, 0xfe, 0xb8, 0x89, 0x9c, 0x5f, 0xe9, 0x5c, 0x63, 0x74, 0x08, 0xfc, 0xc4, 0x3b,
-	0xc8, 0xbd, 0x88, 0xd2, 0x8c, 0xea, 0xeb, 0x57, 0x27, 0x26, 0x78, 0x66, 0x7f, 0x63, 0xb5, 0x4e,
-	0x50, 0x73, 0xd9, 0xfe, 0x7a, 0x7f, 0xcd, 0xf4, 0x3f, 0xbc, 0xde, 0xbf, 0x0a, 0xa5, 0xf4, 0x6b,
-	0xff, 0x61, 0xa1, 0xcd, 0x63, 0x39, 0x79, 0x93, 0xa8, 0xb7, 0x3f, 0x31, 0xca, 0xc7, 0xf8, 0x3e,
-	0x72, 0x55, 0xa2, 0x52, 0xaa, 0xed, 0xea, 0x2f, 0x37, 0x88, 0x09, 0xb1, 0x8f, 0x3c, 0x19, 0xa5,
-	0x91, 0x98, 0x6b, 0x4f, 0xe7, 0xe5, 0x06, 0xc9, 0x63, 0xdc, 0x42, 0xd5, 0xe7, 0x3c, 0x83, 0x95,
-	0xe8, 0x67, 0x01, 0x7a, 0x8a, 0x04, 0xfe, 0x14, 0x6d, 0xbe, 0xe5, 0x53, 0x3a, 0x8c, 0xe2, 0x58,
-	0x50, 0x29, 0xf5, 0x0b, 0x01, 0x82, 0x06, 0x64, 0x0f, 0x4c, 0xf2, 0xb0, 0x8a, 0xdc, 0x8c, 0x25,
-	0x9c, 0xb5, 0x1f, 0xa1, 0x0a, 0xa1, 0x51, 0x5a, 0x7e, 0xbe, 0x65, 0xde, 0x08, 0x1d, 0x3c, 0xae,
-	0xd5, 0xe2, 0xe6, 0xd5, 0xd5, 0xd5, 0x95, 0xdd, 0xbe, 0x84, 0xff, 0x08, 0x5f, 0xf2, 0x1e, 0xef,
-	0xa1, 0x7a, 0x32, 0x8d, 0x26, 0x09, 0x83, 0x95, 0x19, 0x79, 0x99, 0x28, 0x5b, 0xba, 0x47, 0x68,
-	0x5b, 0xd0, 0x28, 0x1d, 0xd2, 0xf7, 0x8a, 0x32, 0x99, 0x70, 0x86, 0x37, 0xcb, 0x23, 0x15, 0xa5,
-	0xfe, 0x6f, 0x37, 0xcf, 0x64, 0x6e, 0x4f, 0xb6, 0xa0, 0x69, 0x50, 0xf4, 0xb4, 0xff, 0x73, 0x11,
-	0xfa, 0x91, 0xf1, 0x4b, 0xf6, 0x7a, 0x3e, 0xa3, 0x12, 0x3f, 0x44, 0x76, 0xc4, 0xfc, 0x6d, 0xdd,
-	0xba, 0xd3, 0x31, 0xf3, 0xa9, 0x53, 0xcc, 0xa7, 0xce, 0x01, 0x9b, 0x13, 0x3b, 0x62, 0xf8, 0x4b,
-	0xe4, 0xc4, 0x99, 0xb9, 0xa5, 0x8d, 0xee, 0xee, 0x8a, 0xec, 0x28, 0x9f, 0x92, 0x04, 0x54, 0xf8,
-	0x73, 0x64, 0x4b, 0xe5, 0x6f, 0x6a, 0xed, 0x83, 0x15, 0xed, 0xa9, 0x9e, 0x98, 0xc4, 0x96, 0x70,
-	0xfb, 0x6d, 0x25, 0x73, 0xbe, 0xad, 0x15, 0xe1, 0xeb, 0x62, 0x78, 0x12, 0x5b, 0x49, 0xd0, 0xa6,
-	0x17, 0xfe, 0x9d, 0x35, 0xda, 0x57, 0x89, 0x54, 0xbf, 0xc0, 0x0e, 0x13, 0x3b, 0xbd, 0xc0, 0x21,
-	0x72, 0x2e, 0xa2, 0xd4, 0x6f, 0x6a, 0xf1, 0xfd, 0x15, 0xb1, 0x11, 0x82, 0x04, 0x77, 0x90, 0x13,
-	0x8f, 0x52, 0xcd, 0xbc, 0xd1, 0xdd, 0x5b, 0xfd, 0x2e, 0xfd, 0xc8, 0xe5, 0xfa, 0x78, 0x94, 0xe2,
-	0x27, 0xc8, 0x19, 0xa7, 0x4a, 0x1f, 0x01, 0xb8, 0x70, 0xcb, 0x7a, 0xfd, 0x5c, 0xe6, 0xf2, 0x71,
-	0xaa, 0x40, 0x9e, 0xe4, 0xb3, 0xf5, 0x36, 0xb9, 0xbe, 0x42, 0xb9, 0x3c, 0xe9, 0xf7, 0x60, 0x35,
-	0x59, 0xbf, 0xa7, 0xa7, 0xca, 0x6d, 0xab, 0x39, 0xbb, 0xae, 0xcf, 0xfa, 0x3d, 0x6d, 0xbf, 0xdf,
-	0xd5, 0x43, 0x78, 0x8d, 0xfd, 0x7e, 0xb7, 0xb0, 0xdf, 0xef, 0x6a, 0xfb, 0xfd, 0xae, 0x9e, 0xcc,
-	0xeb, 0xec, 0x17, 0xfa, 0x4c, 0xeb, 0x2b, 0x7a, 0x84, 0xd5, 0xd7, 0x6c, 0x3a, 0xdc, 0x61, 0x23,
-	0xd7, 0x3a, 0xf0, 0x87, 0xd7, 0x08, 0xad, 0xf1, 0x37, 0x63, 0x21, 0xf7, 0x97, 0x4a, 0xe0, 0xaf,
-	0x91, 0x5b, 0x0e, 0xf7, 0xdb, 0x3e, 0x40, 0x8f, 0x0b, 0xd3, 0x60, 0x94, 0xcf, 0x02, 0x54, 0x61,
-	0xd1, 0x94, 0x2e, 0x1d, 0xfc, 0xdf, 0xf5, 0x0b, 0xa3, 0x2b, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff,
-	0xd5, 0x39, 0x32, 0x09, 0xf9, 0x09, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto b/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
deleted file mode 100644
index 0d2fc1fad9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/jsonpb/jsonpb_test_proto/test_objects.proto
+++ /dev/null
@@ -1,147 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "google/protobuf/any.proto";
-import "google/protobuf/duration.proto";
-import "google/protobuf/struct.proto";
-import "google/protobuf/timestamp.proto";
-import "google/protobuf/wrappers.proto";
-
-package jsonpb;
-
-// Test message for holding primitive types.
-message Simple {
-  optional bool o_bool = 1;
-  optional int32 o_int32 = 2;
-  optional int64 o_int64 = 3;
-  optional uint32 o_uint32 = 4;
-  optional uint64 o_uint64 = 5;
-  optional sint32 o_sint32 = 6;
-  optional sint64 o_sint64 = 7;
-  optional float o_float = 8;
-  optional double o_double = 9;
-  optional string o_string = 10;
-  optional bytes o_bytes = 11;
-}
-
-// Test message for holding special non-finites primitives.
-message NonFinites {
-    optional float f_nan = 1;
-    optional float f_pinf = 2;
-    optional float f_ninf = 3;
-    optional double d_nan = 4;
-    optional double d_pinf = 5;
-    optional double d_ninf = 6;
-}
-
-// Test message for holding repeated primitives.
-message Repeats {
-  repeated bool r_bool = 1;
-  repeated int32 r_int32 = 2;
-  repeated int64 r_int64 = 3;
-  repeated uint32 r_uint32 = 4;
-  repeated uint64 r_uint64 = 5;
-  repeated sint32 r_sint32 = 6;
-  repeated sint64 r_sint64 = 7;
-  repeated float r_float = 8;
-  repeated double r_double = 9;
-  repeated string r_string = 10;
-  repeated bytes r_bytes = 11;
-}
-
-// Test message for holding enums and nested messages.
-message Widget {
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  };
-  optional Color color = 1;
-  repeated Color r_color = 2;
-
-  optional Simple simple = 10;
-  repeated Simple r_simple = 11;
-
-  optional Repeats repeats = 20;
-  repeated Repeats r_repeats = 21;
-}
-
-message Maps {
-  map<int64, string> m_int64_str = 1;
-  map<bool, Simple> m_bool_simple = 2;
-}
-
-message MsgWithOneof {
-  oneof union {
-    string title = 1;
-    int64 salary = 2;
-    string Country = 3;
-    string home_address = 4;
-  }
-}
-
-message Real {
-  optional double value = 1;
-  extensions 100 to max;
-}
-
-extend Real {
-  optional string name = 124;
-}
-
-message Complex {
-  extend Real {
-    optional Complex real_extension = 123;
-  }
-  optional double imaginary = 1;
-  extensions 100 to max;
-}
-
-message KnownTypes {
-  optional google.protobuf.Any an = 14;
-  optional google.protobuf.Duration dur = 1;
-  optional google.protobuf.Struct st = 12;
-  optional google.protobuf.Timestamp ts = 2;
-  optional google.protobuf.ListValue lv = 15;
-  optional google.protobuf.Value val = 16;
-
-  optional google.protobuf.DoubleValue dbl = 3;
-  optional google.protobuf.FloatValue flt = 4;
-  optional google.protobuf.Int64Value i64 = 5;
-  optional google.protobuf.UInt64Value u64 = 6;
-  optional google.protobuf.Int32Value i32 = 7;
-  optional google.protobuf.UInt32Value u32 = 8;
-  optional google.protobuf.BoolValue bool = 9;
-  optional google.protobuf.StringValue str = 10;
-  optional google.protobuf.BytesValue bytes = 11;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/Makefile b/installer/vendor/github.com/golang/protobuf/proto/Makefile
deleted file mode 100644
index e2e0651a93..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/Makefile
+++ /dev/null
@@ -1,43 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-install:
-	go install
-
-test: install generate-test-pbs
-	go test
-
-
-generate-test-pbs:
-	make install
-	make -C testdata
-	protoc --go_out=Mtestdata/test.proto=github.com/golang/protobuf/proto/testdata,Mgoogle/protobuf/any.proto=github.com/golang/protobuf/ptypes/any:. proto3_proto/proto3.proto
-	make
diff --git a/installer/vendor/github.com/golang/protobuf/proto/all_test.go b/installer/vendor/github.com/golang/protobuf/proto/all_test.go
deleted file mode 100644
index 41451a4073..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/all_test.go
+++ /dev/null
@@ -1,2278 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"math"
-	"math/rand"
-	"reflect"
-	"runtime/debug"
-	"strings"
-	"testing"
-	"time"
-
-	. "github.com/golang/protobuf/proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-var globalO *Buffer
-
-func old() *Buffer {
-	if globalO == nil {
-		globalO = NewBuffer(nil)
-	}
-	globalO.Reset()
-	return globalO
-}
-
-func equalbytes(b1, b2 []byte, t *testing.T) {
-	if len(b1) != len(b2) {
-		t.Errorf("wrong lengths: 2*%d != %d", len(b1), len(b2))
-		return
-	}
-	for i := 0; i < len(b1); i++ {
-		if b1[i] != b2[i] {
-			t.Errorf("bad byte[%d]:%x %x: %s %s", i, b1[i], b2[i], b1, b2)
-		}
-	}
-}
-
-func initGoTestField() *GoTestField {
-	f := new(GoTestField)
-	f.Label = String("label")
-	f.Type = String("type")
-	return f
-}
-
-// These are all structurally equivalent but the tag numbers differ.
-// (It's remarkable that required, optional, and repeated all have
-// 8 letters.)
-func initGoTest_RequiredGroup() *GoTest_RequiredGroup {
-	return &GoTest_RequiredGroup{
-		RequiredField: String("required"),
-	}
-}
-
-func initGoTest_OptionalGroup() *GoTest_OptionalGroup {
-	return &GoTest_OptionalGroup{
-		RequiredField: String("optional"),
-	}
-}
-
-func initGoTest_RepeatedGroup() *GoTest_RepeatedGroup {
-	return &GoTest_RepeatedGroup{
-		RequiredField: String("repeated"),
-	}
-}
-
-func initGoTest(setdefaults bool) *GoTest {
-	pb := new(GoTest)
-	if setdefaults {
-		pb.F_BoolDefaulted = Bool(Default_GoTest_F_BoolDefaulted)
-		pb.F_Int32Defaulted = Int32(Default_GoTest_F_Int32Defaulted)
-		pb.F_Int64Defaulted = Int64(Default_GoTest_F_Int64Defaulted)
-		pb.F_Fixed32Defaulted = Uint32(Default_GoTest_F_Fixed32Defaulted)
-		pb.F_Fixed64Defaulted = Uint64(Default_GoTest_F_Fixed64Defaulted)
-		pb.F_Uint32Defaulted = Uint32(Default_GoTest_F_Uint32Defaulted)
-		pb.F_Uint64Defaulted = Uint64(Default_GoTest_F_Uint64Defaulted)
-		pb.F_FloatDefaulted = Float32(Default_GoTest_F_FloatDefaulted)
-		pb.F_DoubleDefaulted = Float64(Default_GoTest_F_DoubleDefaulted)
-		pb.F_StringDefaulted = String(Default_GoTest_F_StringDefaulted)
-		pb.F_BytesDefaulted = Default_GoTest_F_BytesDefaulted
-		pb.F_Sint32Defaulted = Int32(Default_GoTest_F_Sint32Defaulted)
-		pb.F_Sint64Defaulted = Int64(Default_GoTest_F_Sint64Defaulted)
-	}
-
-	pb.Kind = GoTest_TIME.Enum()
-	pb.RequiredField = initGoTestField()
-	pb.F_BoolRequired = Bool(true)
-	pb.F_Int32Required = Int32(3)
-	pb.F_Int64Required = Int64(6)
-	pb.F_Fixed32Required = Uint32(32)
-	pb.F_Fixed64Required = Uint64(64)
-	pb.F_Uint32Required = Uint32(3232)
-	pb.F_Uint64Required = Uint64(6464)
-	pb.F_FloatRequired = Float32(3232)
-	pb.F_DoubleRequired = Float64(6464)
-	pb.F_StringRequired = String("string")
-	pb.F_BytesRequired = []byte("bytes")
-	pb.F_Sint32Required = Int32(-32)
-	pb.F_Sint64Required = Int64(-64)
-	pb.Requiredgroup = initGoTest_RequiredGroup()
-
-	return pb
-}
-
-func fail(msg string, b *bytes.Buffer, s string, t *testing.T) {
-	data := b.Bytes()
-	ld := len(data)
-	ls := len(s) / 2
-
-	fmt.Printf("fail %s ld=%d ls=%d\n", msg, ld, ls)
-
-	// find the interesting spot - n
-	n := ls
-	if ld < ls {
-		n = ld
-	}
-	j := 0
-	for i := 0; i < n; i++ {
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		if data[i] == bs {
-			continue
-		}
-		n = i
-		break
-	}
-	l := n - 10
-	if l < 0 {
-		l = 0
-	}
-	h := n + 10
-
-	// find the interesting spot - n
-	fmt.Printf("is[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ld {
-			fmt.Printf(" --")
-			continue
-		}
-		fmt.Printf(" %.2x", data[i])
-	}
-	fmt.Printf("\n")
-
-	fmt.Printf("sb[%d]:", l)
-	for i := l; i < h; i++ {
-		if i >= ls {
-			fmt.Printf(" --")
-			continue
-		}
-		bs := hex(s[j])*16 + hex(s[j+1])
-		j += 2
-		fmt.Printf(" %.2x", bs)
-	}
-	fmt.Printf("\n")
-
-	t.Fail()
-
-	//	t.Errorf("%s: \ngood: %s\nbad: %x", msg, s, b.Bytes())
-	// Print the output in a partially-decoded format; can
-	// be helpful when updating the test.  It produces the output
-	// that is pasted, with minor edits, into the argument to verify().
-	//	data := b.Bytes()
-	//	nesting := 0
-	//	for b.Len() > 0 {
-	//		start := len(data) - b.Len()
-	//		var u uint64
-	//		u, err := DecodeVarint(b)
-	//		if err != nil {
-	//			fmt.Printf("decode error on varint:", err)
-	//			return
-	//		}
-	//		wire := u & 0x7
-	//		tag := u >> 3
-	//		switch wire {
-	//		case WireVarint:
-	//			v, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on varint:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed32:
-	//			v, err := DecodeFixed32(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed32:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireFixed64:
-	//			v, err := DecodeFixed64(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on fixed64:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\"  // field %d, encoding %d, value %d\n",
-	//				data[start:len(data)-b.Len()], tag, wire, v)
-	//		case WireBytes:
-	//			nb, err := DecodeVarint(b)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			after_tag := len(data) - b.Len()
-	//			str := make([]byte, nb)
-	//			_, err = b.Read(str)
-	//			if err != nil {
-	//				fmt.Printf("decode error on bytes:", err)
-	//				return
-	//			}
-	//			fmt.Printf("\t\t\"%x\" \"%x\"  // field %d, encoding %d (FIELD)\n",
-	//				data[start:after_tag], str, tag, wire)
-	//		case WireStartGroup:
-	//			nesting++
-	//			fmt.Printf("\t\t\"%x\"\t\t// start group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//		case WireEndGroup:
-	//			fmt.Printf("\t\t\"%x\"\t\t// end group field %d level %d\n",
-	//				data[start:len(data)-b.Len()], tag, nesting)
-	//			nesting--
-	//		default:
-	//			fmt.Printf("unrecognized wire type %d\n", wire)
-	//			return
-	//		}
-	//	}
-}
-
-func hex(c uint8) uint8 {
-	if '0' <= c && c <= '9' {
-		return c - '0'
-	}
-	if 'a' <= c && c <= 'f' {
-		return 10 + c - 'a'
-	}
-	if 'A' <= c && c <= 'F' {
-		return 10 + c - 'A'
-	}
-	return 0
-}
-
-func equal(b []byte, s string, t *testing.T) bool {
-	if 2*len(b) != len(s) {
-		//		fail(fmt.Sprintf("wrong lengths: 2*%d != %d", len(b), len(s)), b, s, t)
-		fmt.Printf("wrong lengths: 2*%d != %d\n", len(b), len(s))
-		return false
-	}
-	for i, j := 0, 0; i < len(b); i, j = i+1, j+2 {
-		x := hex(s[j])*16 + hex(s[j+1])
-		if b[i] != x {
-			//			fail(fmt.Sprintf("bad byte[%d]:%x %x", i, b[i], x), b, s, t)
-			fmt.Printf("bad byte[%d]:%x %x", i, b[i], x)
-			return false
-		}
-	}
-	return true
-}
-
-func overify(t *testing.T, pb *GoTest, expected string) {
-	o := old()
-	err := o.Marshal(pb)
-	if err != nil {
-		fmt.Printf("overify marshal-1 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 1", o.Bytes())
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = o.Unmarshal(pbd)
-	if err != nil {
-		t.Fatalf("overify unmarshal err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	o.Reset()
-	err = o.Marshal(pbd)
-	if err != nil {
-		t.Errorf("overify marshal-2 err = %v", err)
-		o.DebugPrint("", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-	if !equal(o.Bytes(), expected, t) {
-		o.DebugPrint("overify neq 2", o.Bytes())
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-// Simple tests for numeric encode/decode primitives (varint, etc.)
-func TestNumericPrimitives(t *testing.T) {
-	for i := uint64(0); i < 1e6; i += 111 {
-		o := old()
-		if o.EncodeVarint(i) != nil {
-			t.Error("EncodeVarint")
-			break
-		}
-		x, e := o.DecodeVarint()
-		if e != nil {
-			t.Fatal("DecodeVarint")
-		}
-		if x != i {
-			t.Fatal("varint decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed32(i) != nil {
-			t.Fatal("encFixed32")
-		}
-		x, e = o.DecodeFixed32()
-		if e != nil {
-			t.Fatal("decFixed32")
-		}
-		if x != i {
-			t.Fatal("fixed32 decode fail:", i, x)
-		}
-
-		o = old()
-		if o.EncodeFixed64(i*1234567) != nil {
-			t.Error("encFixed64")
-			break
-		}
-		x, e = o.DecodeFixed64()
-		if e != nil {
-			t.Error("decFixed64")
-			break
-		}
-		if x != i*1234567 {
-			t.Error("fixed64 decode fail:", i*1234567, x)
-			break
-		}
-
-		o = old()
-		i32 := int32(i - 12345)
-		if o.EncodeZigzag32(uint64(i32)) != nil {
-			t.Fatal("EncodeZigzag32")
-		}
-		x, e = o.DecodeZigzag32()
-		if e != nil {
-			t.Fatal("DecodeZigzag32")
-		}
-		if x != uint64(uint32(i32)) {
-			t.Fatal("zigzag32 decode fail:", i32, x)
-		}
-
-		o = old()
-		i64 := int64(i - 12345)
-		if o.EncodeZigzag64(uint64(i64)) != nil {
-			t.Fatal("EncodeZigzag64")
-		}
-		x, e = o.DecodeZigzag64()
-		if e != nil {
-			t.Fatal("DecodeZigzag64")
-		}
-		if x != uint64(i64) {
-			t.Fatal("zigzag64 decode fail:", i64, x)
-		}
-	}
-}
-
-// fakeMarshaler is a simple struct implementing Marshaler and Message interfaces.
-type fakeMarshaler struct {
-	b   []byte
-	err error
-}
-
-func (f *fakeMarshaler) Marshal() ([]byte, error) { return f.b, f.err }
-func (f *fakeMarshaler) String() string           { return fmt.Sprintf("Bytes: %v Error: %v", f.b, f.err) }
-func (f *fakeMarshaler) ProtoMessage()            {}
-func (f *fakeMarshaler) Reset()                   {}
-
-type msgWithFakeMarshaler struct {
-	M *fakeMarshaler `protobuf:"bytes,1,opt,name=fake"`
-}
-
-func (m *msgWithFakeMarshaler) String() string { return CompactTextString(m) }
-func (m *msgWithFakeMarshaler) ProtoMessage()  {}
-func (m *msgWithFakeMarshaler) Reset()         {}
-
-// Simple tests for proto messages that implement the Marshaler interface.
-func TestMarshalerEncoding(t *testing.T) {
-	tests := []struct {
-		name    string
-		m       Message
-		want    []byte
-		errType reflect.Type
-	}{
-		{
-			name: "Marshaler that fails",
-			m: &fakeMarshaler{
-				err: errors.New("some marshal err"),
-				b:   []byte{5, 6, 7},
-			},
-			// Since the Marshal method returned bytes, they should be written to the
-			// buffer.  (For efficiency, we assume that Marshal implementations are
-			// always correct w.r.t. RequiredNotSetError and output.)
-			want:    []byte{5, 6, 7},
-			errType: reflect.TypeOf(errors.New("some marshal err")),
-		},
-		{
-			name: "Marshaler that fails with RequiredNotSetError",
-			m: &msgWithFakeMarshaler{
-				M: &fakeMarshaler{
-					err: &RequiredNotSetError{},
-					b:   []byte{5, 6, 7},
-				},
-			},
-			// Since there's an error that can be continued after,
-			// the buffer should be written.
-			want: []byte{
-				10, 3, // for &msgWithFakeMarshaler
-				5, 6, 7, // for &fakeMarshaler
-			},
-			errType: reflect.TypeOf(&RequiredNotSetError{}),
-		},
-		{
-			name: "Marshaler that succeeds",
-			m: &fakeMarshaler{
-				b: []byte{0, 1, 2, 3, 4, 127, 255},
-			},
-			want: []byte{0, 1, 2, 3, 4, 127, 255},
-		},
-	}
-	for _, test := range tests {
-		b := NewBuffer(nil)
-		err := b.Marshal(test.m)
-		if reflect.TypeOf(err) != test.errType {
-			t.Errorf("%s: got err %T(%v) wanted %T", test.name, err, err, test.errType)
-		}
-		if !reflect.DeepEqual(test.want, b.Bytes()) {
-			t.Errorf("%s: got bytes %v wanted %v", test.name, b.Bytes(), test.want)
-		}
-		if size := Size(test.m); size != len(b.Bytes()) {
-			t.Errorf("%s: Size(_) = %v, but marshaled to %v bytes", test.name, size, len(b.Bytes()))
-		}
-
-		m, mErr := Marshal(test.m)
-		if !bytes.Equal(b.Bytes(), m) {
-			t.Errorf("%s: Marshal returned %v, but (*Buffer).Marshal wrote %v", test.name, m, b.Bytes())
-		}
-		if !reflect.DeepEqual(err, mErr) {
-			t.Errorf("%s: Marshal err = %q, but (*Buffer).Marshal returned %q",
-				test.name, fmt.Sprint(mErr), fmt.Sprint(err))
-		}
-	}
-}
-
-// Simple tests for bytes
-func TestBytesPrimitives(t *testing.T) {
-	o := old()
-	bytes := []byte{'n', 'o', 'w', ' ', 'i', 's', ' ', 't', 'h', 'e', ' ', 't', 'i', 'm', 'e'}
-	if o.EncodeRawBytes(bytes) != nil {
-		t.Error("EncodeRawBytes")
-	}
-	decb, e := o.DecodeRawBytes(false)
-	if e != nil {
-		t.Error("DecodeRawBytes")
-	}
-	equalbytes(bytes, decb, t)
-}
-
-// Simple tests for strings
-func TestStringPrimitives(t *testing.T) {
-	o := old()
-	s := "now is the time"
-	if o.EncodeStringBytes(s) != nil {
-		t.Error("enc_string")
-	}
-	decs, e := o.DecodeStringBytes()
-	if e != nil {
-		t.Error("dec_string")
-	}
-	if s != decs {
-		t.Error("string encode/decode fail:", s, decs)
-	}
-}
-
-// Do we catch the "required bit not set" case?
-func TestRequiredBit(t *testing.T) {
-	o := old()
-	pb := new(GoTest)
-	err := o.Marshal(pb)
-	if err == nil {
-		t.Error("did not catch missing required fields")
-	} else if strings.Index(err.Error(), "Kind") < 0 {
-		t.Error("wrong error type:", err)
-	}
-}
-
-// Check that all fields are nil.
-// Clearly silly, and a residue from a more interesting test with an earlier,
-// different initialization property, but it once caught a compiler bug so
-// it lives.
-func checkInitialized(pb *GoTest, t *testing.T) {
-	if pb.F_BoolDefaulted != nil {
-		t.Error("New or Reset did not set boolean:", *pb.F_BoolDefaulted)
-	}
-	if pb.F_Int32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Int32Defaulted)
-	}
-	if pb.F_Int64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Int64Defaulted)
-	}
-	if pb.F_Fixed32Defaulted != nil {
-		t.Error("New or Reset did not set fixed32:", *pb.F_Fixed32Defaulted)
-	}
-	if pb.F_Fixed64Defaulted != nil {
-		t.Error("New or Reset did not set fixed64:", *pb.F_Fixed64Defaulted)
-	}
-	if pb.F_Uint32Defaulted != nil {
-		t.Error("New or Reset did not set uint32:", *pb.F_Uint32Defaulted)
-	}
-	if pb.F_Uint64Defaulted != nil {
-		t.Error("New or Reset did not set uint64:", *pb.F_Uint64Defaulted)
-	}
-	if pb.F_FloatDefaulted != nil {
-		t.Error("New or Reset did not set float:", *pb.F_FloatDefaulted)
-	}
-	if pb.F_DoubleDefaulted != nil {
-		t.Error("New or Reset did not set double:", *pb.F_DoubleDefaulted)
-	}
-	if pb.F_StringDefaulted != nil {
-		t.Error("New or Reset did not set string:", *pb.F_StringDefaulted)
-	}
-	if pb.F_BytesDefaulted != nil {
-		t.Error("New or Reset did not set bytes:", string(pb.F_BytesDefaulted))
-	}
-	if pb.F_Sint32Defaulted != nil {
-		t.Error("New or Reset did not set int32:", *pb.F_Sint32Defaulted)
-	}
-	if pb.F_Sint64Defaulted != nil {
-		t.Error("New or Reset did not set int64:", *pb.F_Sint64Defaulted)
-	}
-}
-
-// Does Reset() reset?
-func TestReset(t *testing.T) {
-	pb := initGoTest(true)
-	// muck with some values
-	pb.F_BoolDefaulted = Bool(false)
-	pb.F_Int32Defaulted = Int32(237)
-	pb.F_Int64Defaulted = Int64(12346)
-	pb.F_Fixed32Defaulted = Uint32(32000)
-	pb.F_Fixed64Defaulted = Uint64(666)
-	pb.F_Uint32Defaulted = Uint32(323232)
-	pb.F_Uint64Defaulted = nil
-	pb.F_FloatDefaulted = nil
-	pb.F_DoubleDefaulted = Float64(0)
-	pb.F_StringDefaulted = String("gotcha")
-	pb.F_BytesDefaulted = []byte("asdfasdf")
-	pb.F_Sint32Defaulted = Int32(123)
-	pb.F_Sint64Defaulted = Int64(789)
-	pb.Reset()
-	checkInitialized(pb, t)
-}
-
-// All required fields set, no defaults provided.
-func TestEncodeDecode1(t *testing.T) {
-	pb := initGoTest(false)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 0x20
-			"714000000000000000"+ // field 14, encoding 1, value 0x40
-			"78a019"+ // field 15, encoding 0, value 0xca0 = 3232
-			"8001c032"+ // field 16, encoding 0, value 0x1940 = 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2, string "string"
-			"b304"+ // field 70, encoding 3, start group
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // field 70, encoding 4, end group
-			"aa0605"+"6279746573"+ // field 101, encoding 2, string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f") // field 103, encoding 0, 0x7f zigzag64
-}
-
-// All required fields set, defaults provided.
-func TestEncodeDecode2(t *testing.T) {
-	pb := initGoTest(true)
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All default fields set to their default value by hand
-func TestEncodeDecode3(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolDefaulted = Bool(true)
-	pb.F_Int32Defaulted = Int32(32)
-	pb.F_Int64Defaulted = Int64(64)
-	pb.F_Fixed32Defaulted = Uint32(320)
-	pb.F_Fixed64Defaulted = Uint64(640)
-	pb.F_Uint32Defaulted = Uint32(3200)
-	pb.F_Uint64Defaulted = Uint64(6400)
-	pb.F_FloatDefaulted = Float32(314159)
-	pb.F_DoubleDefaulted = Float64(271828)
-	pb.F_StringDefaulted = String("hello, \"world!\"\n")
-	pb.F_BytesDefaulted = []byte("Bignose")
-	pb.F_Sint32Defaulted = Int32(-32)
-	pb.F_Sint64Defaulted = Int64(-64)
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all non-defaulted optional fields have values.
-func TestEncodeDecode4(t *testing.T) {
-	pb := initGoTest(true)
-	pb.Table = String("hello")
-	pb.Param = Int32(7)
-	pb.OptionalField = initGoTestField()
-	pb.F_BoolOptional = Bool(true)
-	pb.F_Int32Optional = Int32(32)
-	pb.F_Int64Optional = Int64(64)
-	pb.F_Fixed32Optional = Uint32(3232)
-	pb.F_Fixed64Optional = Uint64(6464)
-	pb.F_Uint32Optional = Uint32(323232)
-	pb.F_Uint64Optional = Uint64(646464)
-	pb.F_FloatOptional = Float32(32.)
-	pb.F_DoubleOptional = Float64(64.)
-	pb.F_StringOptional = String("hello")
-	pb.F_BytesOptional = []byte("Bignose")
-	pb.F_Sint32Optional = Int32(-32)
-	pb.F_Sint64Optional = Int64(-64)
-	pb.Optionalgroup = initGoTest_OptionalGroup()
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"1205"+"68656c6c6f"+ // field 2, encoding 2, string "hello"
-			"1807"+ // field 3, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"320d"+"0a056c6162656c120474797065"+ // field 6, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"f00101"+ // field 30, encoding 0, value 1
-			"f80120"+ // field 31, encoding 0, value 32
-			"800240"+ // field 32, encoding 0, value 64
-			"8d02a00c0000"+ // field 33, encoding 5, value 3232
-			"91024019000000000000"+ // field 34, encoding 1, value 6464
-			"9802a0dd13"+ // field 35, encoding 0, value 323232
-			"a002c0ba27"+ // field 36, encoding 0, value 646464
-			"ad0200000042"+ // field 37, encoding 5, value 32.0
-			"b1020000000000005040"+ // field 38, encoding 1, value 64.0
-			"ba0205"+"68656c6c6f"+ // field 39, encoding 2, string "hello"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"d305"+ // start group field 90 level 1
-			"da0508"+"6f7074696f6e616c"+ // field 91, encoding 2, string "optional"
-			"d405"+ // end group field 90 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ea1207"+"4269676e6f7365"+ // field 301, encoding 2, string "Bignose"
-			"f0123f"+ // field 302, encoding 0, value 63
-			"f8127f"+ // field 303, encoding 0, value 127
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestEncodeDecode5(t *testing.T) {
-	pb := initGoTest(true)
-	pb.RepeatedField = []*GoTestField{initGoTestField(), initGoTestField()}
-	pb.F_BoolRepeated = []bool{false, true}
-	pb.F_Int32Repeated = []int32{32, 33}
-	pb.F_Int64Repeated = []int64{64, 65}
-	pb.F_Fixed32Repeated = []uint32{3232, 3333}
-	pb.F_Fixed64Repeated = []uint64{6464, 6565}
-	pb.F_Uint32Repeated = []uint32{323232, 333333}
-	pb.F_Uint64Repeated = []uint64{646464, 656565}
-	pb.F_FloatRepeated = []float32{32., 33.}
-	pb.F_DoubleRepeated = []float64{64., 65.}
-	pb.F_StringRepeated = []string{"hello", "sailor"}
-	pb.F_BytesRepeated = [][]byte{[]byte("big"), []byte("nose")}
-	pb.F_Sint32Repeated = []int32{32, -32}
-	pb.F_Sint64Repeated = []int64{64, -64}
-	pb.Repeatedgroup = []*GoTest_RepeatedGroup{initGoTest_RepeatedGroup(), initGoTest_RepeatedGroup()}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"2a0d"+"0a056c6162656c120474797065"+ // field 5, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"a00100"+ // field 20, encoding 0, value 0
-			"a00101"+ // field 20, encoding 0, value 1
-			"a80120"+ // field 21, encoding 0, value 32
-			"a80121"+ // field 21, encoding 0, value 33
-			"b00140"+ // field 22, encoding 0, value 64
-			"b00141"+ // field 22, encoding 0, value 65
-			"bd01a00c0000"+ // field 23, encoding 5, value 3232
-			"bd01050d0000"+ // field 23, encoding 5, value 3333
-			"c1014019000000000000"+ // field 24, encoding 1, value 6464
-			"c101a519000000000000"+ // field 24, encoding 1, value 6565
-			"c801a0dd13"+ // field 25, encoding 0, value 323232
-			"c80195ac14"+ // field 25, encoding 0, value 333333
-			"d001c0ba27"+ // field 26, encoding 0, value 646464
-			"d001b58928"+ // field 26, encoding 0, value 656565
-			"dd0100000042"+ // field 27, encoding 5, value 32.0
-			"dd0100000442"+ // field 27, encoding 5, value 33.0
-			"e1010000000000005040"+ // field 28, encoding 1, value 64.0
-			"e1010000000000405040"+ // field 28, encoding 1, value 65.0
-			"ea0105"+"68656c6c6f"+ // field 29, encoding 2, string "hello"
-			"ea0106"+"7361696c6f72"+ // field 29, encoding 2, string "sailor"
-			"c00201"+ // field 40, encoding 0, value 1
-			"c80220"+ // field 41, encoding 0, value 32
-			"d00240"+ // field 42, encoding 0, value 64
-			"dd0240010000"+ // field 43, encoding 5, value 320
-			"e1028002000000000000"+ // field 44, encoding 1, value 640
-			"e8028019"+ // field 45, encoding 0, value 3200
-			"f0028032"+ // field 46, encoding 0, value 6400
-			"fd02e0659948"+ // field 47, encoding 5, value 314159.0
-			"81030000000050971041"+ // field 48, encoding 1, value 271828.0
-			"8a0310"+"68656c6c6f2c2022776f726c6421220a"+ // field 49, encoding 2 string "hello, \"world!\"\n"
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"8305"+ // start group field 80 level 1
-			"8a0508"+"7265706561746564"+ // field 81, encoding 2, string "repeated"
-			"8405"+ // end group field 80 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"ca0c03"+"626967"+ // field 201, encoding 2, string "big"
-			"ca0c04"+"6e6f7365"+ // field 201, encoding 2, string "nose"
-			"d00c40"+ // field 202, encoding 0, value 32
-			"d00c3f"+ // field 202, encoding 0, value -32
-			"d80c8001"+ // field 203, encoding 0, value 64
-			"d80c7f"+ // field 203, encoding 0, value -64
-			"8a1907"+"4269676e6f7365"+ // field 401, encoding 2, string "Bignose"
-			"90193f"+ // field 402, encoding 0, value 63
-			"98197f") // field 403, encoding 0, value 127
-
-}
-
-// All required fields set, all packed repeated fields given two values.
-func TestEncodeDecode6(t *testing.T) {
-	pb := initGoTest(false)
-	pb.F_BoolRepeatedPacked = []bool{false, true}
-	pb.F_Int32RepeatedPacked = []int32{32, 33}
-	pb.F_Int64RepeatedPacked = []int64{64, 65}
-	pb.F_Fixed32RepeatedPacked = []uint32{3232, 3333}
-	pb.F_Fixed64RepeatedPacked = []uint64{6464, 6565}
-	pb.F_Uint32RepeatedPacked = []uint32{323232, 333333}
-	pb.F_Uint64RepeatedPacked = []uint64{646464, 656565}
-	pb.F_FloatRepeatedPacked = []float32{32., 33.}
-	pb.F_DoubleRepeatedPacked = []float64{64., 65.}
-	pb.F_Sint32RepeatedPacked = []int32{32, -32}
-	pb.F_Sint64RepeatedPacked = []int64{64, -64}
-
-	overify(t, pb,
-		"0807"+ // field 1, encoding 0, value 7
-			"220d"+"0a056c6162656c120474797065"+ // field 4, encoding 2 (GoTestField)
-			"5001"+ // field 10, encoding 0, value 1
-			"5803"+ // field 11, encoding 0, value 3
-			"6006"+ // field 12, encoding 0, value 6
-			"6d20000000"+ // field 13, encoding 5, value 32
-			"714000000000000000"+ // field 14, encoding 1, value 64
-			"78a019"+ // field 15, encoding 0, value 3232
-			"8001c032"+ // field 16, encoding 0, value 6464
-			"8d0100004a45"+ // field 17, encoding 5, value 3232.0
-			"9101000000000040b940"+ // field 18, encoding 1, value 6464.0
-			"9a0106"+"737472696e67"+ // field 19, encoding 2 string "string"
-			"9203020001"+ // field 50, encoding 2, 2 bytes, value 0, value 1
-			"9a03022021"+ // field 51, encoding 2, 2 bytes, value 32, value 33
-			"a203024041"+ // field 52, encoding 2, 2 bytes, value 64, value 65
-			"aa0308"+ // field 53, encoding 2, 8 bytes
-			"a00c0000050d0000"+ // value 3232, value 3333
-			"b20310"+ // field 54, encoding 2, 16 bytes
-			"4019000000000000a519000000000000"+ // value 6464, value 6565
-			"ba0306"+ // field 55, encoding 2, 6 bytes
-			"a0dd1395ac14"+ // value 323232, value 333333
-			"c20306"+ // field 56, encoding 2, 6 bytes
-			"c0ba27b58928"+ // value 646464, value 656565
-			"ca0308"+ // field 57, encoding 2, 8 bytes
-			"0000004200000442"+ // value 32.0, value 33.0
-			"d20310"+ // field 58, encoding 2, 16 bytes
-			"00000000000050400000000000405040"+ // value 64.0, value 65.0
-			"b304"+ // start group field 70 level 1
-			"ba0408"+"7265717569726564"+ // field 71, encoding 2, string "required"
-			"b404"+ // end group field 70 level 1
-			"aa0605"+"6279746573"+ // field 101, encoding 2 string "bytes"
-			"b0063f"+ // field 102, encoding 0, 0x3f zigzag32
-			"b8067f"+ // field 103, encoding 0, 0x7f zigzag64
-			"b21f02"+ // field 502, encoding 2, 2 bytes
-			"403f"+ // value 32, value -32
-			"ba1f03"+ // field 503, encoding 2, 3 bytes
-			"80017f") // value 64, value -64
-}
-
-// Test that we can encode empty bytes fields.
-func TestEncodeDecodeBytes1(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRequired = []byte{}
-	pb.F_BytesRepeated = [][]byte{{}}
-	pb.F_BytesOptional = []byte{}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if pbd.F_BytesRequired == nil || len(pbd.F_BytesRequired) != 0 {
-		t.Error("required empty bytes field is incorrect")
-	}
-	if pbd.F_BytesRepeated == nil || len(pbd.F_BytesRepeated) == 1 && pbd.F_BytesRepeated[0] == nil {
-		t.Error("repeated empty bytes field is incorrect")
-	}
-	if pbd.F_BytesOptional == nil || len(pbd.F_BytesOptional) != 0 {
-		t.Error("optional empty bytes field is incorrect")
-	}
-}
-
-// Test that we encode nil-valued fields of a repeated bytes field correctly.
-// Since entries in a repeated field cannot be nil, nil must mean empty value.
-func TestEncodeDecodeBytes2(t *testing.T) {
-	pb := initGoTest(false)
-
-	// Create our bytes
-	pb.F_BytesRepeated = [][]byte{nil}
-
-	d, err := Marshal(pb)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pbd := new(GoTest)
-	if err := Unmarshal(d, pbd); err != nil {
-		t.Error(err)
-	}
-
-	if len(pbd.F_BytesRepeated) != 1 || pbd.F_BytesRepeated[0] == nil {
-		t.Error("Unexpected value for repeated bytes field")
-	}
-}
-
-// All required fields set, defaults provided, all repeated fields given two values.
-func TestSkippingUnrecognizedFields(t *testing.T) {
-	o := old()
-	pb := initGoTestField()
-
-	// Marshal it normally.
-	o.Marshal(pb)
-
-	// Now new a GoSkipTest record.
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	// Marshal it into same buffer.
-	o.Marshal(skip)
-
-	pbd := new(GoTestField)
-	o.Unmarshal(pbd)
-
-	// The __unrecognized field should be a marshaling of GoSkipTest
-	skipd := new(GoSkipTest)
-
-	o.SetBuf(pbd.XXX_unrecognized)
-	o.Unmarshal(skipd)
-
-	if *skipd.SkipInt32 != *skip.SkipInt32 {
-		t.Error("skip int32", skipd.SkipInt32)
-	}
-	if *skipd.SkipFixed32 != *skip.SkipFixed32 {
-		t.Error("skip fixed32", skipd.SkipFixed32)
-	}
-	if *skipd.SkipFixed64 != *skip.SkipFixed64 {
-		t.Error("skip fixed64", skipd.SkipFixed64)
-	}
-	if *skipd.SkipString != *skip.SkipString {
-		t.Error("skip string", *skipd.SkipString)
-	}
-	if *skipd.Skipgroup.GroupInt32 != *skip.Skipgroup.GroupInt32 {
-		t.Error("skip group int32", skipd.Skipgroup.GroupInt32)
-	}
-	if *skipd.Skipgroup.GroupString != *skip.Skipgroup.GroupString {
-		t.Error("skip group string", *skipd.Skipgroup.GroupString)
-	}
-}
-
-// Check that unrecognized fields of a submessage are preserved.
-func TestSubmessageUnrecognizedFields(t *testing.T) {
-	nm := &NewMessage{
-		Nested: &NewMessage_Nested{
-			Name:      String("Nigel"),
-			FoodGroup: String("carbs"),
-		},
-	}
-	b, err := Marshal(nm)
-	if err != nil {
-		t.Fatalf("Marshal of NewMessage: %v", err)
-	}
-
-	// Unmarshal into an OldMessage.
-	om := new(OldMessage)
-	if err := Unmarshal(b, om); err != nil {
-		t.Fatalf("Unmarshal to OldMessage: %v", err)
-	}
-	exp := &OldMessage{
-		Nested: &OldMessage_Nested{
-			Name: String("Nigel"),
-			// normal protocol buffer users should not do this
-			XXX_unrecognized: []byte("\x12\x05carbs"),
-		},
-	}
-	if !Equal(om, exp) {
-		t.Errorf("om = %v, want %v", om, exp)
-	}
-
-	// Clone the OldMessage.
-	om = Clone(om).(*OldMessage)
-	if !Equal(om, exp) {
-		t.Errorf("Clone(om) = %v, want %v", om, exp)
-	}
-
-	// Marshal the OldMessage, then unmarshal it into an empty NewMessage.
-	if b, err = Marshal(om); err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-	t.Logf("Marshal(%v) -> %q", om, b)
-	nm2 := new(NewMessage)
-	if err := Unmarshal(b, nm2); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	if !Equal(nm, nm2) {
-		t.Errorf("NewMessage round-trip: %v => %v", nm, nm2)
-	}
-}
-
-// Check that an int32 field can be upgraded to an int64 field.
-func TestNegativeInt32(t *testing.T) {
-	om := &OldMessage{
-		Num: Int32(-1),
-	}
-	b, err := Marshal(om)
-	if err != nil {
-		t.Fatalf("Marshal of OldMessage: %v", err)
-	}
-
-	// Check the size. It should be 11 bytes;
-	// 1 for the field/wire type, and 10 for the negative number.
-	if len(b) != 11 {
-		t.Errorf("%v marshaled as %q, wanted 11 bytes", om, b)
-	}
-
-	// Unmarshal into a NewMessage.
-	nm := new(NewMessage)
-	if err := Unmarshal(b, nm); err != nil {
-		t.Fatalf("Unmarshal to NewMessage: %v", err)
-	}
-	want := &NewMessage{
-		Num: Int64(-1),
-	}
-	if !Equal(nm, want) {
-		t.Errorf("nm = %v, want %v", nm, want)
-	}
-}
-
-// Check that we can grow an array (repeated field) to have many elements.
-// This test doesn't depend only on our encoding; for variety, it makes sure
-// we create, encode, and decode the correct contents explicitly.  It's therefore
-// a bit messier.
-// This test also uses (and hence tests) the Marshal/Unmarshal functions
-// instead of the methods.
-func TestBigRepeated(t *testing.T) {
-	pb := initGoTest(true)
-
-	// Create the arrays
-	const N = 50 // Internally the library starts much smaller.
-	pb.Repeatedgroup = make([]*GoTest_RepeatedGroup, N)
-	pb.F_Sint64Repeated = make([]int64, N)
-	pb.F_Sint32Repeated = make([]int32, N)
-	pb.F_BytesRepeated = make([][]byte, N)
-	pb.F_StringRepeated = make([]string, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	pb.F_FloatRepeated = make([]float32, N)
-	pb.F_Uint64Repeated = make([]uint64, N)
-	pb.F_Uint32Repeated = make([]uint32, N)
-	pb.F_Fixed64Repeated = make([]uint64, N)
-	pb.F_Fixed32Repeated = make([]uint32, N)
-	pb.F_Int64Repeated = make([]int64, N)
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_BoolRepeated = make([]bool, N)
-	pb.RepeatedField = make([]*GoTestField, N)
-
-	// Fill in the arrays with checkable values.
-	igtf := initGoTestField()
-	igtrg := initGoTest_RepeatedGroup()
-	for i := 0; i < N; i++ {
-		pb.Repeatedgroup[i] = igtrg
-		pb.F_Sint64Repeated[i] = int64(i)
-		pb.F_Sint32Repeated[i] = int32(i)
-		s := fmt.Sprint(i)
-		pb.F_BytesRepeated[i] = []byte(s)
-		pb.F_StringRepeated[i] = s
-		pb.F_DoubleRepeated[i] = float64(i)
-		pb.F_FloatRepeated[i] = float32(i)
-		pb.F_Uint64Repeated[i] = uint64(i)
-		pb.F_Uint32Repeated[i] = uint32(i)
-		pb.F_Fixed64Repeated[i] = uint64(i)
-		pb.F_Fixed32Repeated[i] = uint32(i)
-		pb.F_Int64Repeated[i] = int64(i)
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_BoolRepeated[i] = i%2 == 0
-		pb.RepeatedField[i] = igtf
-	}
-
-	// Marshal.
-	buf, _ := Marshal(pb)
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	Unmarshal(buf, pbd)
-
-	// Check the checkable values
-	for i := uint64(0); i < N; i++ {
-		if pbd.Repeatedgroup[i] == nil { // TODO: more checking?
-			t.Error("pbd.Repeatedgroup bad")
-		}
-		var x uint64
-		x = uint64(pbd.F_Sint64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Sint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Sint32Repeated bad", x, i)
-		}
-		s := fmt.Sprint(i)
-		equalbytes(pbd.F_BytesRepeated[i], []byte(s), t)
-		if pbd.F_StringRepeated[i] != s {
-			t.Error("pbd.F_Sint32Repeated bad", pbd.F_StringRepeated[i], i)
-		}
-		x = uint64(pbd.F_DoubleRepeated[i])
-		if x != i {
-			t.Error("pbd.F_DoubleRepeated bad", x, i)
-		}
-		x = uint64(pbd.F_FloatRepeated[i])
-		if x != i {
-			t.Error("pbd.F_FloatRepeated bad", x, i)
-		}
-		x = pbd.F_Uint64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Uint64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Uint32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Uint32Repeated bad", x, i)
-		}
-		x = pbd.F_Fixed64Repeated[i]
-		if x != i {
-			t.Error("pbd.F_Fixed64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Fixed32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Fixed32Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int64Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int64Repeated bad", x, i)
-		}
-		x = uint64(pbd.F_Int32Repeated[i])
-		if x != i {
-			t.Error("pbd.F_Int32Repeated bad", x, i)
-		}
-		if pbd.F_BoolRepeated[i] != (i%2 == 0) {
-			t.Error("pbd.F_BoolRepeated bad", x, i)
-		}
-		if pbd.RepeatedField[i] == nil { // TODO: more checking?
-			t.Error("pbd.RepeatedField bad")
-		}
-	}
-}
-
-// Verify we give a useful message when decoding to the wrong structure type.
-func TestTypeMismatch(t *testing.T) {
-	pb1 := initGoTest(true)
-
-	// Marshal
-	o := old()
-	o.Marshal(pb1)
-
-	// Now Unmarshal it to the wrong type.
-	pb2 := initGoTestField()
-	err := o.Unmarshal(pb2)
-	if err == nil {
-		t.Error("expected error, got no error")
-	} else if !strings.Contains(err.Error(), "bad wiretype") {
-		t.Error("expected bad wiretype error, got", err)
-	}
-}
-
-func encodeDecode(t *testing.T, in, out Message, msg string) {
-	buf, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("failed marshaling %v: %v", msg, err)
-	}
-	if err := Unmarshal(buf, out); err != nil {
-		t.Fatalf("failed unmarshaling %v: %v", msg, err)
-	}
-}
-
-func TestPackedNonPackedDecoderSwitching(t *testing.T) {
-	np, p := new(NonPackedTest), new(PackedTest)
-
-	// non-packed -> packed
-	np.A = []int32{0, 1, 1, 2, 3, 5}
-	encodeDecode(t, np, p, "non-packed -> packed")
-	if !reflect.DeepEqual(np.A, p.B) {
-		t.Errorf("failed non-packed -> packed; np.A=%+v, p.B=%+v", np.A, p.B)
-	}
-
-	// packed -> non-packed
-	np.Reset()
-	p.B = []int32{3, 1, 4, 1, 5, 9}
-	encodeDecode(t, p, np, "packed -> non-packed")
-	if !reflect.DeepEqual(p.B, np.A) {
-		t.Errorf("failed packed -> non-packed; p.B=%+v, np.A=%+v", p.B, np.A)
-	}
-}
-
-func TestProto1RepeatedGroup(t *testing.T) {
-	pb := &MessageList{
-		Message: []*MessageList_Message{
-			{
-				Name:  String("blah"),
-				Count: Int32(7),
-			},
-			// NOTE: pb.Message[1] is a nil
-			nil,
-		},
-	}
-
-	o := old()
-	err := o.Marshal(pb)
-	if err == nil || !strings.Contains(err.Error(), "repeated field Message has nil") {
-		t.Fatalf("unexpected or no error when marshaling: %v", err)
-	}
-}
-
-// Test that enums work.  Checks for a bug introduced by making enums
-// named types instead of int32: newInt32FromUint64 would crash with
-// a type mismatch in reflect.PointTo.
-func TestEnum(t *testing.T) {
-	pb := new(GoEnum)
-	pb.Foo = FOO_FOO1.Enum()
-	o := old()
-	if err := o.Marshal(pb); err != nil {
-		t.Fatal("error encoding enum:", err)
-	}
-	pb1 := new(GoEnum)
-	if err := o.Unmarshal(pb1); err != nil {
-		t.Fatal("error decoding enum:", err)
-	}
-	if *pb1.Foo != FOO_FOO1 {
-		t.Error("expected 7 but got ", *pb1.Foo)
-	}
-}
-
-// Enum types have String methods. Check that enum fields can be printed.
-// We don't care what the value actually is, just as long as it doesn't crash.
-func TestPrintingNilEnumFields(t *testing.T) {
-	pb := new(GoEnum)
-	_ = fmt.Sprintf("%+v", pb)
-}
-
-// Verify that absent required fields cause Marshal/Unmarshal to return errors.
-func TestRequiredFieldEnforcement(t *testing.T) {
-	pb := new(GoTestField)
-	_, err := Marshal(pb)
-	if err == nil {
-		t.Error("marshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Label") {
-		t.Errorf("marshal: bad error type: %v", err)
-	}
-
-	// A slightly sneaky, yet valid, proto. It encodes the same required field twice,
-	// so simply counting the required fields is insufficient.
-	// field 1, encoding 2, value "hi"
-	buf := []byte("\x0A\x02hi\x0A\x02hi")
-	err = Unmarshal(buf, pb)
-	if err == nil {
-		t.Error("unmarshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "{Unknown}") {
-		t.Errorf("unmarshal: bad error type: %v", err)
-	}
-}
-
-// Verify that absent required fields in groups cause Marshal/Unmarshal to return errors.
-func TestRequiredFieldEnforcementGroups(t *testing.T) {
-	pb := &GoTestRequiredGroupField{Group: &GoTestRequiredGroupField_Group{}}
-	if _, err := Marshal(pb); err == nil {
-		t.Error("marshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Group.Field") {
-		t.Errorf("marshal: bad error type: %v", err)
-	}
-
-	buf := []byte{11, 12}
-	if err := Unmarshal(buf, pb); err == nil {
-		t.Error("unmarshal: expected error, got nil")
-	} else if _, ok := err.(*RequiredNotSetError); !ok || !strings.Contains(err.Error(), "Group.{Unknown}") {
-		t.Errorf("unmarshal: bad error type: %v", err)
-	}
-}
-
-func TestTypedNilMarshal(t *testing.T) {
-	// A typed nil should return ErrNil and not crash.
-	{
-		var m *GoEnum
-		if _, err := Marshal(m); err != ErrNil {
-			t.Errorf("Marshal(%#v): got %v, want ErrNil", m, err)
-		}
-	}
-
-	{
-		m := &Communique{Union: &Communique_Msg{nil}}
-		if _, err := Marshal(m); err == nil || err == ErrNil {
-			t.Errorf("Marshal(%#v): got %v, want errOneofHasNil", m, err)
-		}
-	}
-}
-
-// A type that implements the Marshaler interface, but is not nillable.
-type nonNillableInt uint64
-
-func (nni nonNillableInt) Marshal() ([]byte, error) {
-	return EncodeVarint(uint64(nni)), nil
-}
-
-type NNIMessage struct {
-	nni nonNillableInt
-}
-
-func (*NNIMessage) Reset()         {}
-func (*NNIMessage) String() string { return "" }
-func (*NNIMessage) ProtoMessage()  {}
-
-// A type that implements the Marshaler interface and is nillable.
-type nillableMessage struct {
-	x uint64
-}
-
-func (nm *nillableMessage) Marshal() ([]byte, error) {
-	return EncodeVarint(nm.x), nil
-}
-
-type NMMessage struct {
-	nm *nillableMessage
-}
-
-func (*NMMessage) Reset()         {}
-func (*NMMessage) String() string { return "" }
-func (*NMMessage) ProtoMessage()  {}
-
-// Verify a type that uses the Marshaler interface, but has a nil pointer.
-func TestNilMarshaler(t *testing.T) {
-	// Try a struct with a Marshaler field that is nil.
-	// It should be directly marshable.
-	nmm := new(NMMessage)
-	if _, err := Marshal(nmm); err != nil {
-		t.Error("unexpected error marshaling nmm: ", err)
-	}
-
-	// Try a struct with a Marshaler field that is not nillable.
-	nnim := new(NNIMessage)
-	nnim.nni = 7
-	var _ Marshaler = nnim.nni // verify it is truly a Marshaler
-	if _, err := Marshal(nnim); err != nil {
-		t.Error("unexpected error marshaling nnim: ", err)
-	}
-}
-
-func TestAllSetDefaults(t *testing.T) {
-	// Exercise SetDefaults with all scalar field types.
-	m := &Defaults{
-		// NaN != NaN, so override that here.
-		F_Nan: Float32(1.7),
-	}
-	expected := &Defaults{
-		F_Bool:    Bool(true),
-		F_Int32:   Int32(32),
-		F_Int64:   Int64(64),
-		F_Fixed32: Uint32(320),
-		F_Fixed64: Uint64(640),
-		F_Uint32:  Uint32(3200),
-		F_Uint64:  Uint64(6400),
-		F_Float:   Float32(314159),
-		F_Double:  Float64(271828),
-		F_String:  String(`hello, "world!"` + "\n"),
-		F_Bytes:   []byte("Bignose"),
-		F_Sint32:  Int32(-32),
-		F_Sint64:  Int64(-64),
-		F_Enum:    Defaults_GREEN.Enum(),
-		F_Pinf:    Float32(float32(math.Inf(1))),
-		F_Ninf:    Float32(float32(math.Inf(-1))),
-		F_Nan:     Float32(1.7),
-		StrZero:   String(""),
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("SetDefaults failed\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithSetField(t *testing.T) {
-	// Check that a set value is not overridden.
-	m := &Defaults{
-		F_Int32: Int32(12),
-	}
-	SetDefaults(m)
-	if v := m.GetF_Int32(); v != 12 {
-		t.Errorf("m.FInt32 = %v, want 12", v)
-	}
-}
-
-func TestSetDefaultsWithSubMessage(t *testing.T) {
-	m := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-		},
-	}
-	expected := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("gopher"),
-			Port: Int32(4000),
-		},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultsWithRepeatedSubMessage(t *testing.T) {
-	m := &MyMessage{
-		RepInner: []*InnerMessage{{}},
-	}
-	expected := &MyMessage{
-		RepInner: []*InnerMessage{{
-			Port: Int32(4000),
-		}},
-	}
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestSetDefaultWithRepeatedNonMessage(t *testing.T) {
-	m := &MyMessage{
-		Pet: []string{"turtle", "wombat"},
-	}
-	expected := Clone(m)
-	SetDefaults(m)
-	if !Equal(m, expected) {
-		t.Errorf("\n got %v\nwant %v", m, expected)
-	}
-}
-
-func TestMaximumTagNumber(t *testing.T) {
-	m := &MaxTag{
-		LastField: String("natural goat essence"),
-	}
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal failed: %v", err)
-	}
-	m2 := new(MaxTag)
-	if err := Unmarshal(buf, m2); err != nil {
-		t.Fatalf("proto.Unmarshal failed: %v", err)
-	}
-	if got, want := m2.GetLastField(), *m.LastField; got != want {
-		t.Errorf("got %q, want %q", got, want)
-	}
-}
-
-func TestJSON(t *testing.T) {
-	m := &MyMessage{
-		Count: Int32(4),
-		Pet:   []string{"bunny", "kitty"},
-		Inner: &InnerMessage{
-			Host: String("cauchy"),
-		},
-		Bikeshed: MyMessage_GREEN.Enum(),
-	}
-	const expected = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":1}`
-
-	b, err := json.Marshal(m)
-	if err != nil {
-		t.Fatalf("json.Marshal failed: %v", err)
-	}
-	s := string(b)
-	if s != expected {
-		t.Errorf("got  %s\nwant %s", s, expected)
-	}
-
-	received := new(MyMessage)
-	if err := json.Unmarshal(b, received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-
-	// Test unmarshalling of JSON with symbolic enum name.
-	const old = `{"count":4,"pet":["bunny","kitty"],"inner":{"host":"cauchy"},"bikeshed":"GREEN"}`
-	received.Reset()
-	if err := json.Unmarshal([]byte(old), received); err != nil {
-		t.Fatalf("json.Unmarshal failed: %v", err)
-	}
-	if !Equal(received, m) {
-		t.Fatalf("got %s, want %s", received, m)
-	}
-}
-
-func TestBadWireType(t *testing.T) {
-	b := []byte{7<<3 | 6} // field 7, wire type 6
-	pb := new(OtherMessage)
-	if err := Unmarshal(b, pb); err == nil {
-		t.Errorf("Unmarshal did not fail")
-	} else if !strings.Contains(err.Error(), "unknown wire type") {
-		t.Errorf("wrong error: %v", err)
-	}
-}
-
-func TestBytesWithInvalidLength(t *testing.T) {
-	// If a byte sequence has an invalid (negative) length, Unmarshal should not panic.
-	b := []byte{2<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestLengthOverflow(t *testing.T) {
-	// Overflowing a length should not panic.
-	b := []byte{2<<3 | WireBytes, 1, 1, 3<<3 | WireBytes, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f, 0x01}
-	Unmarshal(b, new(MyMessage))
-}
-
-func TestVarintOverflow(t *testing.T) {
-	// Overflowing a 64-bit length should not be allowed.
-	b := []byte{1<<3 | WireVarint, 0x01, 3<<3 | WireBytes, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x01}
-	if err := Unmarshal(b, new(MyMessage)); err == nil {
-		t.Fatalf("Overflowed uint64 length without error")
-	}
-}
-
-func TestUnmarshalFuzz(t *testing.T) {
-	const N = 1000
-	seed := time.Now().UnixNano()
-	t.Logf("RNG seed is %d", seed)
-	rng := rand.New(rand.NewSource(seed))
-	buf := make([]byte, 20)
-	for i := 0; i < N; i++ {
-		for j := range buf {
-			buf[j] = byte(rng.Intn(256))
-		}
-		fuzzUnmarshal(t, buf)
-	}
-}
-
-func TestMergeMessages(t *testing.T) {
-	pb := &MessageList{Message: []*MessageList_Message{{Name: String("x"), Count: Int32(1)}}}
-	data, err := Marshal(pb)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	pb1 := new(MessageList)
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("first Unmarshal: %v", err)
-	}
-	if err := Unmarshal(data, pb1); err != nil {
-		t.Fatalf("second Unmarshal: %v", err)
-	}
-	if len(pb1.Message) != 1 {
-		t.Errorf("two Unmarshals produced %d Messages, want 1", len(pb1.Message))
-	}
-
-	pb2 := new(MessageList)
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("first UnmarshalMerge: %v", err)
-	}
-	if err := UnmarshalMerge(data, pb2); err != nil {
-		t.Fatalf("second UnmarshalMerge: %v", err)
-	}
-	if len(pb2.Message) != 2 {
-		t.Errorf("two UnmarshalMerges produced %d Messages, want 2", len(pb2.Message))
-	}
-}
-
-func TestExtensionMarshalOrder(t *testing.T) {
-	m := &MyMessage{Count: Int(123)}
-	if err := SetExtension(m, E_Ext_More, &Ext{Data: String("alpha")}); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Text, String("aleph")); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-	if err := SetExtension(m, E_Ext_Number, Int32(1)); err != nil {
-		t.Fatalf("SetExtension: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	var orig []byte
-	for i := 0; i < 100; i++ {
-		b, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if i == 0 {
-			orig = b
-			continue
-		}
-		if !bytes.Equal(b, orig) {
-			t.Errorf("Bytes differ on attempt #%d", i)
-		}
-	}
-}
-
-// Many extensions, because small maps might not iterate differently on each iteration.
-var exts = []*ExtensionDesc{
-	E_X201,
-	E_X202,
-	E_X203,
-	E_X204,
-	E_X205,
-	E_X206,
-	E_X207,
-	E_X208,
-	E_X209,
-	E_X210,
-	E_X211,
-	E_X212,
-	E_X213,
-	E_X214,
-	E_X215,
-	E_X216,
-	E_X217,
-	E_X218,
-	E_X219,
-	E_X220,
-	E_X221,
-	E_X222,
-	E_X223,
-	E_X224,
-	E_X225,
-	E_X226,
-	E_X227,
-	E_X228,
-	E_X229,
-	E_X230,
-	E_X231,
-	E_X232,
-	E_X233,
-	E_X234,
-	E_X235,
-	E_X236,
-	E_X237,
-	E_X238,
-	E_X239,
-	E_X240,
-	E_X241,
-	E_X242,
-	E_X243,
-	E_X244,
-	E_X245,
-	E_X246,
-	E_X247,
-	E_X248,
-	E_X249,
-	E_X250,
-}
-
-func TestMessageSetMarshalOrder(t *testing.T) {
-	m := &MyMessageSet{}
-	for _, x := range exts {
-		if err := SetExtension(m, x, &Empty{}); err != nil {
-			t.Fatalf("SetExtension: %v", err)
-		}
-	}
-
-	buf, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// Serialize m several times, and check we get the same bytes each time.
-	for i := 0; i < 10; i++ {
-		b1, err := Marshal(m)
-		if err != nil {
-			t.Fatalf("Marshal: %v", err)
-		}
-		if !bytes.Equal(b1, buf) {
-			t.Errorf("Bytes differ on re-Marshal #%d", i)
-		}
-
-		m2 := &MyMessageSet{}
-		if err := Unmarshal(buf, m2); err != nil {
-			t.Errorf("Unmarshal: %v", err)
-		}
-		b2, err := Marshal(m2)
-		if err != nil {
-			t.Errorf("re-Marshal: %v", err)
-		}
-		if !bytes.Equal(b2, buf) {
-			t.Errorf("Bytes differ on round-trip #%d", i)
-		}
-	}
-}
-
-func TestUnmarshalMergesMessages(t *testing.T) {
-	// If a nested message occurs twice in the input,
-	// the fields should be merged when decoding.
-	a := &OtherMessage{
-		Key: Int64(123),
-		Inner: &InnerMessage{
-			Host: String("polhode"),
-			Port: Int32(1234),
-		},
-	}
-	aData, err := Marshal(a)
-	if err != nil {
-		t.Fatalf("Marshal(a): %v", err)
-	}
-	b := &OtherMessage{
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Connected: Bool(true),
-		},
-	}
-	bData, err := Marshal(b)
-	if err != nil {
-		t.Fatalf("Marshal(b): %v", err)
-	}
-	want := &OtherMessage{
-		Key:    Int64(123),
-		Weight: Float32(1.2),
-		Inner: &InnerMessage{
-			Host:      String("herpolhode"),
-			Port:      Int32(1234),
-			Connected: Bool(true),
-		},
-	}
-	got := new(OtherMessage)
-	if err := Unmarshal(append(aData, bData...), got); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	if !Equal(got, want) {
-		t.Errorf("\n got %v\nwant %v", got, want)
-	}
-}
-
-func TestEncodingSizes(t *testing.T) {
-	tests := []struct {
-		m Message
-		n int
-	}{
-		{&Defaults{F_Int32: Int32(math.MaxInt32)}, 6},
-		{&Defaults{F_Int32: Int32(math.MinInt32)}, 11},
-		{&Defaults{F_Uint32: Uint32(uint32(math.MaxInt32) + 1)}, 6},
-		{&Defaults{F_Uint32: Uint32(math.MaxUint32)}, 6},
-	}
-	for _, test := range tests {
-		b, err := Marshal(test.m)
-		if err != nil {
-			t.Errorf("Marshal(%v): %v", test.m, err)
-			continue
-		}
-		if len(b) != test.n {
-			t.Errorf("Marshal(%v) yielded %d bytes, want %d bytes", test.m, len(b), test.n)
-		}
-	}
-}
-
-func TestRequiredNotSetError(t *testing.T) {
-	pb := initGoTest(false)
-	pb.RequiredField.Label = nil
-	pb.F_Int32Required = nil
-	pb.F_Int64Required = nil
-
-	expected := "0807" + // field 1, encoding 0, value 7
-		"2206" + "120474797065" + // field 4, encoding 2 (GoTestField)
-		"5001" + // field 10, encoding 0, value 1
-		"6d20000000" + // field 13, encoding 5, value 0x20
-		"714000000000000000" + // field 14, encoding 1, value 0x40
-		"78a019" + // field 15, encoding 0, value 0xca0 = 3232
-		"8001c032" + // field 16, encoding 0, value 0x1940 = 6464
-		"8d0100004a45" + // field 17, encoding 5, value 3232.0
-		"9101000000000040b940" + // field 18, encoding 1, value 6464.0
-		"9a0106" + "737472696e67" + // field 19, encoding 2, string "string"
-		"b304" + // field 70, encoding 3, start group
-		"ba0408" + "7265717569726564" + // field 71, encoding 2, string "required"
-		"b404" + // field 70, encoding 4, end group
-		"aa0605" + "6279746573" + // field 101, encoding 2, string "bytes"
-		"b0063f" + // field 102, encoding 0, 0x3f zigzag32
-		"b8067f" // field 103, encoding 0, 0x7f zigzag64
-
-	o := old()
-	bytes, err := Marshal(pb)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		fmt.Printf("marshal-1 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-1 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 1", bytes)
-		t.Fatalf("expected = %s", expected)
-	}
-
-	// Now test Unmarshal by recreating the original buffer.
-	pbd := new(GoTest)
-	err = Unmarshal(bytes, pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Fatalf("unmarshal err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.{Unknown}") < 0 {
-		t.Errorf("unmarshal wrong err msg: %v", err)
-	}
-	bytes, err = Marshal(pbd)
-	if _, ok := err.(*RequiredNotSetError); !ok {
-		t.Errorf("marshal-2 err = %v, want *RequiredNotSetError", err)
-		o.DebugPrint("", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-	if strings.Index(err.Error(), "RequiredField.Label") < 0 {
-		t.Errorf("marshal-2 wrong err msg: %v", err)
-	}
-	if !equal(bytes, expected, t) {
-		o.DebugPrint("neq 2", bytes)
-		t.Fatalf("string = %s", expected)
-	}
-}
-
-func fuzzUnmarshal(t *testing.T, data []byte) {
-	defer func() {
-		if e := recover(); e != nil {
-			t.Errorf("These bytes caused a panic: %+v", data)
-			t.Logf("Stack:\n%s", debug.Stack())
-			t.FailNow()
-		}
-	}()
-
-	pb := new(MyMessage)
-	Unmarshal(data, pb)
-}
-
-func TestMapFieldMarshal(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-
-	// b should be the concatenation of these three byte sequences in some order.
-	parts := []string{
-		"\n\a\b\x01\x12\x03Rob",
-		"\n\a\b\x04\x12\x03Ian",
-		"\n\b\b\x08\x12\x04Dave",
-	}
-	ok := false
-	for i := range parts {
-		for j := range parts {
-			if j == i {
-				continue
-			}
-			for k := range parts {
-				if k == i || k == j {
-					continue
-				}
-				try := parts[i] + parts[j] + parts[k]
-				if bytes.Equal(b, []byte(try)) {
-					ok = true
-					break
-				}
-			}
-		}
-	}
-	if !ok {
-		t.Fatalf("Incorrect Marshal output.\n got %q\nwant %q (or a permutation of that)", b, parts[0]+parts[1]+parts[2])
-	}
-	t.Logf("FYI b: %q", b)
-
-	(new(Buffer)).DebugPrint("Dump of b", b)
-}
-
-func TestMapFieldRoundTrips(t *testing.T) {
-	m := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1: "Rob",
-			4: "Ian",
-			8: "Dave",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			0x7001: &FloatingPoint{F: Float64(2.0)},
-		},
-		ByteMapping: map[bool][]byte{
-			false: []byte("that's not right!"),
-			true:  []byte("aye, 'tis true!"),
-		},
-	}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("FYI b: %q", b)
-	m2 := new(MessageWithMap)
-	if err := Unmarshal(b, m2); err != nil {
-		t.Fatalf("Unmarshal: %v", err)
-	}
-	for _, pair := range [][2]interface{}{
-		{m.NameMapping, m2.NameMapping},
-		{m.MsgMapping, m2.MsgMapping},
-		{m.ByteMapping, m2.ByteMapping},
-	} {
-		if !reflect.DeepEqual(pair[0], pair[1]) {
-			t.Errorf("Map did not survive a round trip.\ninitial: %v\n  final: %v", pair[0], pair[1])
-		}
-	}
-}
-
-func TestMapFieldWithNil(t *testing.T) {
-	m1 := &MessageWithMap{
-		MsgMapping: map[int64]*FloatingPoint{
-			1: nil,
-		},
-	}
-	b, err := Marshal(m1)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	m2 := new(MessageWithMap)
-	if err := Unmarshal(b, m2); err != nil {
-		t.Fatalf("Unmarshal: %v, got these bytes: %v", err, b)
-	}
-	if v, ok := m2.MsgMapping[1]; !ok {
-		t.Error("msg_mapping[1] not present")
-	} else if v != nil {
-		t.Errorf("msg_mapping[1] not nil: %v", v)
-	}
-}
-
-func TestMapFieldWithNilBytes(t *testing.T) {
-	m1 := &MessageWithMap{
-		ByteMapping: map[bool][]byte{
-			false: []byte{},
-			true:  nil,
-		},
-	}
-	n := Size(m1)
-	b, err := Marshal(m1)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	if n != len(b) {
-		t.Errorf("Size(m1) = %d; want len(Marshal(m1)) = %d", n, len(b))
-	}
-	m2 := new(MessageWithMap)
-	if err := Unmarshal(b, m2); err != nil {
-		t.Fatalf("Unmarshal: %v, got these bytes: %v", err, b)
-	}
-	if v, ok := m2.ByteMapping[false]; !ok {
-		t.Error("byte_mapping[false] not present")
-	} else if len(v) != 0 {
-		t.Errorf("byte_mapping[false] not empty: %#v", v)
-	}
-	if v, ok := m2.ByteMapping[true]; !ok {
-		t.Error("byte_mapping[true] not present")
-	} else if len(v) != 0 {
-		t.Errorf("byte_mapping[true] not empty: %#v", v)
-	}
-}
-
-func TestDecodeMapFieldMissingKey(t *testing.T) {
-	b := []byte{
-		0x0A, 0x03, // message, tag 1 (name_mapping), of length 3 bytes
-		// no key
-		0x12, 0x01, 0x6D, // string value of length 1 byte, value "m"
-	}
-	got := &MessageWithMap{}
-	err := Unmarshal(b, got)
-	if err != nil {
-		t.Fatalf("failed to marshal map with missing key: %v", err)
-	}
-	want := &MessageWithMap{NameMapping: map[int32]string{0: "m"}}
-	if !Equal(got, want) {
-		t.Errorf("Unmarshaled map with no key was not as expected. got: %v, want %v", got, want)
-	}
-}
-
-func TestDecodeMapFieldMissingValue(t *testing.T) {
-	b := []byte{
-		0x0A, 0x02, // message, tag 1 (name_mapping), of length 2 bytes
-		0x08, 0x01, // varint key, value 1
-		// no value
-	}
-	got := &MessageWithMap{}
-	err := Unmarshal(b, got)
-	if err != nil {
-		t.Fatalf("failed to marshal map with missing value: %v", err)
-	}
-	want := &MessageWithMap{NameMapping: map[int32]string{1: ""}}
-	if !Equal(got, want) {
-		t.Errorf("Unmarshaled map with no value was not as expected. got: %v, want %v", got, want)
-	}
-}
-
-func TestOneof(t *testing.T) {
-	m := &Communique{}
-	b, err := Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal of empty message with oneof: %v", err)
-	}
-	if len(b) != 0 {
-		t.Errorf("Marshal of empty message yielded too many bytes: %v", b)
-	}
-
-	m = &Communique{
-		Union: &Communique_Name{"Barry"},
-	}
-
-	// Round-trip.
-	b, err = Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal of message with oneof: %v", err)
-	}
-	if len(b) != 7 { // name tag/wire (1) + name len (1) + name (5)
-		t.Errorf("Incorrect marshal of message with oneof: %v", b)
-	}
-	m.Reset()
-	if err := Unmarshal(b, m); err != nil {
-		t.Fatalf("Unmarshal of message with oneof: %v", err)
-	}
-	if x, ok := m.Union.(*Communique_Name); !ok || x.Name != "Barry" {
-		t.Errorf("After round trip, Union = %+v", m.Union)
-	}
-	if name := m.GetName(); name != "Barry" {
-		t.Errorf("After round trip, GetName = %q, want %q", name, "Barry")
-	}
-
-	// Let's try with a message in the oneof.
-	m.Union = &Communique_Msg{&Strings{StringField: String("deep deep string")}}
-	b, err = Marshal(m)
-	if err != nil {
-		t.Fatalf("Marshal of message with oneof set to message: %v", err)
-	}
-	if len(b) != 20 { // msg tag/wire (1) + msg len (1) + msg (1 + 1 + 16)
-		t.Errorf("Incorrect marshal of message with oneof set to message: %v", b)
-	}
-	m.Reset()
-	if err := Unmarshal(b, m); err != nil {
-		t.Fatalf("Unmarshal of message with oneof set to message: %v", err)
-	}
-	ss, ok := m.Union.(*Communique_Msg)
-	if !ok || ss.Msg.GetStringField() != "deep deep string" {
-		t.Errorf("After round trip with oneof set to message, Union = %+v", m.Union)
-	}
-}
-
-func TestInefficientPackedBool(t *testing.T) {
-	// https://github.com/golang/protobuf/issues/76
-	inp := []byte{
-		0x12, 0x02, // 0x12 = 2<<3|2; 2 bytes
-		// Usually a bool should take a single byte,
-		// but it is permitted to be any varint.
-		0xb9, 0x30,
-	}
-	if err := Unmarshal(inp, new(MoreRepeated)); err != nil {
-		t.Error(err)
-	}
-}
-
-// Benchmarks
-
-func testMsg() *GoTest {
-	pb := initGoTest(true)
-	const N = 1000 // Internally the library starts much smaller.
-	pb.F_Int32Repeated = make([]int32, N)
-	pb.F_DoubleRepeated = make([]float64, N)
-	for i := 0; i < N; i++ {
-		pb.F_Int32Repeated[i] = int32(i)
-		pb.F_DoubleRepeated[i] = float64(i)
-	}
-	return pb
-}
-
-func bytesMsg() *GoTest {
-	pb := initGoTest(true)
-	buf := make([]byte, 4000)
-	for i := range buf {
-		buf[i] = byte(i)
-	}
-	pb.F_BytesDefaulted = buf
-	return pb
-}
-
-func benchmarkMarshal(b *testing.B, pb Message, marshal func(Message) ([]byte, error)) {
-	d, _ := marshal(pb)
-	b.SetBytes(int64(len(d)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		marshal(pb)
-	}
-}
-
-func benchmarkBufferMarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		p.Reset()
-		err := p.Marshal(pb0)
-		return p.Bytes(), err
-	})
-}
-
-func benchmarkSize(b *testing.B, pb Message) {
-	benchmarkMarshal(b, pb, func(pb0 Message) ([]byte, error) {
-		Size(pb)
-		return nil, nil
-	})
-}
-
-func newOf(pb Message) Message {
-	in := reflect.ValueOf(pb)
-	if in.IsNil() {
-		return pb
-	}
-	return reflect.New(in.Type().Elem()).Interface().(Message)
-}
-
-func benchmarkUnmarshal(b *testing.B, pb Message, unmarshal func([]byte, Message) error) {
-	d, _ := Marshal(pb)
-	b.SetBytes(int64(len(d)))
-	pbd := newOf(pb)
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		unmarshal(d, pbd)
-	}
-}
-
-func benchmarkBufferUnmarshal(b *testing.B, pb Message) {
-	p := NewBuffer(nil)
-	benchmarkUnmarshal(b, pb, func(d []byte, pb0 Message) error {
-		p.SetBuf(d)
-		return p.Unmarshal(pb0)
-	})
-}
-
-// Benchmark{Marshal,BufferMarshal,Size,Unmarshal,BufferUnmarshal}{,Bytes}
-
-func BenchmarkMarshal(b *testing.B) {
-	benchmarkMarshal(b, testMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshal(b *testing.B) {
-	benchmarkBufferMarshal(b, testMsg())
-}
-
-func BenchmarkSize(b *testing.B) {
-	benchmarkSize(b, testMsg())
-}
-
-func BenchmarkUnmarshal(b *testing.B) {
-	benchmarkUnmarshal(b, testMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshal(b *testing.B) {
-	benchmarkBufferUnmarshal(b, testMsg())
-}
-
-func BenchmarkMarshalBytes(b *testing.B) {
-	benchmarkMarshal(b, bytesMsg(), Marshal)
-}
-
-func BenchmarkBufferMarshalBytes(b *testing.B) {
-	benchmarkBufferMarshal(b, bytesMsg())
-}
-
-func BenchmarkSizeBytes(b *testing.B) {
-	benchmarkSize(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalBytes(b *testing.B) {
-	benchmarkUnmarshal(b, bytesMsg(), Unmarshal)
-}
-
-func BenchmarkBufferUnmarshalBytes(b *testing.B) {
-	benchmarkBufferUnmarshal(b, bytesMsg())
-}
-
-func BenchmarkUnmarshalUnrecognizedFields(b *testing.B) {
-	b.StopTimer()
-	pb := initGoTestField()
-	skip := &GoSkipTest{
-		SkipInt32:   Int32(32),
-		SkipFixed32: Uint32(3232),
-		SkipFixed64: Uint64(6464),
-		SkipString:  String("skipper"),
-		Skipgroup: &GoSkipTest_SkipGroup{
-			GroupInt32:  Int32(75),
-			GroupString: String("wxyz"),
-		},
-	}
-
-	pbd := new(GoTestField)
-	p := NewBuffer(nil)
-	p.Marshal(pb)
-	p.Marshal(skip)
-	p2 := NewBuffer(nil)
-
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		p2.SetBuf(p.Bytes())
-		p2.Unmarshal(pbd)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/any_test.go b/installer/vendor/github.com/golang/protobuf/proto/any_test.go
deleted file mode 100644
index 1a3c22ed41..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/any_test.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	pb "github.com/golang/protobuf/proto/proto3_proto"
-	testpb "github.com/golang/protobuf/proto/testdata"
-	anypb "github.com/golang/protobuf/ptypes/any"
-)
-
-var (
-	expandedMarshaler        = proto.TextMarshaler{ExpandAny: true}
-	expandedCompactMarshaler = proto.TextMarshaler{Compact: true, ExpandAny: true}
-)
-
-// anyEqual reports whether two messages which may be google.protobuf.Any or may
-// contain google.protobuf.Any fields are equal. We can't use proto.Equal for
-// comparison, because semantically equivalent messages may be marshaled to
-// binary in different tag order. Instead, trust that TextMarshaler with
-// ExpandAny option works and compare the text marshaling results.
-func anyEqual(got, want proto.Message) bool {
-	// if messages are proto.Equal, no need to marshal.
-	if proto.Equal(got, want) {
-		return true
-	}
-	g := expandedMarshaler.Text(got)
-	w := expandedMarshaler.Text(want)
-	return g == w
-}
-
-type golden struct {
-	m    proto.Message
-	t, c string
-}
-
-var goldenMessages = makeGolden()
-
-func makeGolden() []golden {
-	nested := &pb.Nested{Bunny: "Monty"}
-	nb, err := proto.Marshal(nested)
-	if err != nil {
-		panic(err)
-	}
-	m1 := &pb.Message{
-		Name:        "David",
-		ResultCount: 47,
-		Anything:    &anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(nested), Value: nb},
-	}
-	m2 := &pb.Message{
-		Name:        "David",
-		ResultCount: 47,
-		Anything:    &anypb.Any{TypeUrl: "http://[::1]/type.googleapis.com/" + proto.MessageName(nested), Value: nb},
-	}
-	m3 := &pb.Message{
-		Name:        "David",
-		ResultCount: 47,
-		Anything:    &anypb.Any{TypeUrl: `type.googleapis.com/"/` + proto.MessageName(nested), Value: nb},
-	}
-	m4 := &pb.Message{
-		Name:        "David",
-		ResultCount: 47,
-		Anything:    &anypb.Any{TypeUrl: "type.googleapis.com/a/path/" + proto.MessageName(nested), Value: nb},
-	}
-	m5 := &anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(nested), Value: nb}
-
-	any1 := &testpb.MyMessage{Count: proto.Int32(47), Name: proto.String("David")}
-	proto.SetExtension(any1, testpb.E_Ext_More, &testpb.Ext{Data: proto.String("foo")})
-	proto.SetExtension(any1, testpb.E_Ext_Text, proto.String("bar"))
-	any1b, err := proto.Marshal(any1)
-	if err != nil {
-		panic(err)
-	}
-	any2 := &testpb.MyMessage{Count: proto.Int32(42), Bikeshed: testpb.MyMessage_GREEN.Enum(), RepBytes: [][]byte{[]byte("roboto")}}
-	proto.SetExtension(any2, testpb.E_Ext_More, &testpb.Ext{Data: proto.String("baz")})
-	any2b, err := proto.Marshal(any2)
-	if err != nil {
-		panic(err)
-	}
-	m6 := &pb.Message{
-		Name:        "David",
-		ResultCount: 47,
-		Anything:    &anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(any1), Value: any1b},
-		ManyThings: []*anypb.Any{
-			&anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(any2), Value: any2b},
-			&anypb.Any{TypeUrl: "type.googleapis.com/" + proto.MessageName(any1), Value: any1b},
-		},
-	}
-
-	const (
-		m1Golden = `
-name: "David"
-result_count: 47
-anything: <
-  [type.googleapis.com/proto3_proto.Nested]: <
-    bunny: "Monty"
-  >
->
-`
-		m2Golden = `
-name: "David"
-result_count: 47
-anything: <
-  ["http://[::1]/type.googleapis.com/proto3_proto.Nested"]: <
-    bunny: "Monty"
-  >
->
-`
-		m3Golden = `
-name: "David"
-result_count: 47
-anything: <
-  ["type.googleapis.com/\"/proto3_proto.Nested"]: <
-    bunny: "Monty"
-  >
->
-`
-		m4Golden = `
-name: "David"
-result_count: 47
-anything: <
-  [type.googleapis.com/a/path/proto3_proto.Nested]: <
-    bunny: "Monty"
-  >
->
-`
-		m5Golden = `
-[type.googleapis.com/proto3_proto.Nested]: <
-  bunny: "Monty"
->
-`
-		m6Golden = `
-name: "David"
-result_count: 47
-anything: <
-  [type.googleapis.com/testdata.MyMessage]: <
-    count: 47
-    name: "David"
-    [testdata.Ext.more]: <
-      data: "foo"
-    >
-    [testdata.Ext.text]: "bar"
-  >
->
-many_things: <
-  [type.googleapis.com/testdata.MyMessage]: <
-    count: 42
-    bikeshed: GREEN
-    rep_bytes: "roboto"
-    [testdata.Ext.more]: <
-      data: "baz"
-    >
-  >
->
-many_things: <
-  [type.googleapis.com/testdata.MyMessage]: <
-    count: 47
-    name: "David"
-    [testdata.Ext.more]: <
-      data: "foo"
-    >
-    [testdata.Ext.text]: "bar"
-  >
->
-`
-	)
-	return []golden{
-		{m1, strings.TrimSpace(m1Golden) + "\n", strings.TrimSpace(compact(m1Golden)) + " "},
-		{m2, strings.TrimSpace(m2Golden) + "\n", strings.TrimSpace(compact(m2Golden)) + " "},
-		{m3, strings.TrimSpace(m3Golden) + "\n", strings.TrimSpace(compact(m3Golden)) + " "},
-		{m4, strings.TrimSpace(m4Golden) + "\n", strings.TrimSpace(compact(m4Golden)) + " "},
-		{m5, strings.TrimSpace(m5Golden) + "\n", strings.TrimSpace(compact(m5Golden)) + " "},
-		{m6, strings.TrimSpace(m6Golden) + "\n", strings.TrimSpace(compact(m6Golden)) + " "},
-	}
-}
-
-func TestMarshalGolden(t *testing.T) {
-	for _, tt := range goldenMessages {
-		if got, want := expandedMarshaler.Text(tt.m), tt.t; got != want {
-			t.Errorf("message %v: got:\n%s\nwant:\n%s", tt.m, got, want)
-		}
-		if got, want := expandedCompactMarshaler.Text(tt.m), tt.c; got != want {
-			t.Errorf("message %v: got:\n`%s`\nwant:\n`%s`", tt.m, got, want)
-		}
-	}
-}
-
-func TestUnmarshalGolden(t *testing.T) {
-	for _, tt := range goldenMessages {
-		want := tt.m
-		got := proto.Clone(tt.m)
-		got.Reset()
-		if err := proto.UnmarshalText(tt.t, got); err != nil {
-			t.Errorf("failed to unmarshal\n%s\nerror: %v", tt.t, err)
-		}
-		if !anyEqual(got, want) {
-			t.Errorf("message:\n%s\ngot:\n%s\nwant:\n%s", tt.t, got, want)
-		}
-		got.Reset()
-		if err := proto.UnmarshalText(tt.c, got); err != nil {
-			t.Errorf("failed to unmarshal\n%s\nerror: %v", tt.c, err)
-		}
-		if !anyEqual(got, want) {
-			t.Errorf("message:\n%s\ngot:\n%s\nwant:\n%s", tt.c, got, want)
-		}
-	}
-}
-
-func TestMarshalUnknownAny(t *testing.T) {
-	m := &pb.Message{
-		Anything: &anypb.Any{
-			TypeUrl: "foo",
-			Value:   []byte("bar"),
-		},
-	}
-	want := `anything: <
-  type_url: "foo"
-  value: "bar"
->
-`
-	got := expandedMarshaler.Text(m)
-	if got != want {
-		t.Errorf("got\n`%s`\nwant\n`%s`", got, want)
-	}
-}
-
-func TestAmbiguousAny(t *testing.T) {
-	pb := &anypb.Any{}
-	err := proto.UnmarshalText(`
-	type_url: "ttt/proto3_proto.Nested"
-	value: "\n\x05Monty"
-	`, pb)
-	t.Logf("result: %v (error: %v)", expandedMarshaler.Text(pb), err)
-	if err != nil {
-		t.Errorf("failed to parse ambiguous Any message: %v", err)
-	}
-}
-
-func TestUnmarshalOverwriteAny(t *testing.T) {
-	pb := &anypb.Any{}
-	err := proto.UnmarshalText(`
-  [type.googleapis.com/a/path/proto3_proto.Nested]: <
-    bunny: "Monty"
-  >
-  [type.googleapis.com/a/path/proto3_proto.Nested]: <
-    bunny: "Rabbit of Caerbannog"
-  >
-	`, pb)
-	want := `line 7: Any message unpacked multiple times, or "type_url" already set`
-	if err.Error() != want {
-		t.Errorf("incorrect error.\nHave: %v\nWant: %v", err.Error(), want)
-	}
-}
-
-func TestUnmarshalAnyMixAndMatch(t *testing.T) {
-	pb := &anypb.Any{}
-	err := proto.UnmarshalText(`
-	value: "\n\x05Monty"
-  [type.googleapis.com/a/path/proto3_proto.Nested]: <
-    bunny: "Rabbit of Caerbannog"
-  >
-	`, pb)
-	want := `line 5: Any message unpacked multiple times, or "value" already set`
-	if err.Error() != want {
-		t.Errorf("incorrect error.\nHave: %v\nWant: %v", err.Error(), want)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/clone.go b/installer/vendor/github.com/golang/protobuf/proto/clone.go
index e392575b35..3cd3249f70 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/clone.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/clone.go
@@ -35,22 +35,39 @@
 package proto
 
 import (
+	"fmt"
 	"log"
 	"reflect"
 	"strings"
 )
 
 // Clone returns a deep copy of a protocol buffer.
-func Clone(pb Message) Message {
-	in := reflect.ValueOf(pb)
+func Clone(src Message) Message {
+	in := reflect.ValueOf(src)
 	if in.IsNil() {
-		return pb
+		return src
 	}
-
 	out := reflect.New(in.Type().Elem())
-	// out is empty so a merge is a deep copy.
-	mergeStruct(out.Elem(), in.Elem())
-	return out.Interface().(Message)
+	dst := out.Interface().(Message)
+	Merge(dst, src)
+	return dst
+}
+
+// Merger is the interface representing objects that can merge messages of the same type.
+type Merger interface {
+	// Merge merges src into this message.
+	// Required and optional fields that are set in src will be set to that value in dst.
+	// Elements of repeated fields will be appended.
+	//
+	// Merge may panic if called with a different argument type than the receiver.
+	Merge(src Message)
+}
+
+// generatedMerger is the custom merge method that generated protos will have.
+// We must add this method since a generate Merge method will conflict with
+// many existing protos that have a Merge data field already defined.
+type generatedMerger interface {
+	XXX_Merge(src Message)
 }
 
 // Merge merges src into dst.
@@ -58,17 +75,24 @@ func Clone(pb Message) Message {
 // Elements of repeated fields will be appended.
 // Merge panics if src and dst are not the same type, or if dst is nil.
 func Merge(dst, src Message) {
+	if m, ok := dst.(Merger); ok {
+		m.Merge(src)
+		return
+	}
+
 	in := reflect.ValueOf(src)
 	out := reflect.ValueOf(dst)
 	if out.IsNil() {
 		panic("proto: nil destination")
 	}
 	if in.Type() != out.Type() {
-		// Explicit test prior to mergeStruct so that mistyped nils will fail
-		panic("proto: type mismatch")
+		panic(fmt.Sprintf("proto.Merge(%T, %T) type mismatch", dst, src))
 	}
 	if in.IsNil() {
-		// Merging nil into non-nil is a quiet no-op
+		return // Merge from nil src is a noop
+	}
+	if m, ok := dst.(generatedMerger); ok {
+		m.XXX_Merge(src)
 		return
 	}
 	mergeStruct(out.Elem(), in.Elem())
@@ -84,7 +108,7 @@ func mergeStruct(out, in reflect.Value) {
 		mergeAny(out.Field(i), in.Field(i), false, sprop.Prop[i])
 	}
 
-	if emIn, ok := extendable(in.Addr().Interface()); ok {
+	if emIn, err := extendable(in.Addr().Interface()); err == nil {
 		emOut, _ := extendable(out.Addr().Interface())
 		mIn, muIn := emIn.extensionsRead()
 		if mIn != nil {
diff --git a/installer/vendor/github.com/golang/protobuf/proto/clone_test.go b/installer/vendor/github.com/golang/protobuf/proto/clone_test.go
deleted file mode 100644
index f607ff49eb..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/clone_test.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-var cloneTestMessage = &pb.MyMessage{
-	Count: proto.Int32(42),
-	Name:  proto.String("Dave"),
-	Pet:   []string{"bunny", "kitty", "horsey"},
-	Inner: &pb.InnerMessage{
-		Host:      proto.String("niles"),
-		Port:      proto.Int32(9099),
-		Connected: proto.Bool(true),
-	},
-	Others: []*pb.OtherMessage{
-		{
-			Value: []byte("some bytes"),
-		},
-	},
-	Somegroup: &pb.MyMessage_SomeGroup{
-		GroupField: proto.Int32(6),
-	},
-	RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-}
-
-func init() {
-	ext := &pb.Ext{
-		Data: proto.String("extension"),
-	}
-	if err := proto.SetExtension(cloneTestMessage, pb.E_Ext_More, ext); err != nil {
-		panic("SetExtension: " + err.Error())
-	}
-}
-
-func TestClone(t *testing.T) {
-	m := proto.Clone(cloneTestMessage).(*pb.MyMessage)
-	if !proto.Equal(m, cloneTestMessage) {
-		t.Errorf("Clone(%v) = %v", cloneTestMessage, m)
-	}
-
-	// Verify it was a deep copy.
-	*m.Inner.Port++
-	if proto.Equal(m, cloneTestMessage) {
-		t.Error("Mutating clone changed the original")
-	}
-	// Byte fields and repeated fields should be copied.
-	if &m.Pet[0] == &cloneTestMessage.Pet[0] {
-		t.Error("Pet: repeated field not copied")
-	}
-	if &m.Others[0] == &cloneTestMessage.Others[0] {
-		t.Error("Others: repeated field not copied")
-	}
-	if &m.Others[0].Value[0] == &cloneTestMessage.Others[0].Value[0] {
-		t.Error("Others[0].Value: bytes field not copied")
-	}
-	if &m.RepBytes[0] == &cloneTestMessage.RepBytes[0] {
-		t.Error("RepBytes: repeated field not copied")
-	}
-	if &m.RepBytes[0][0] == &cloneTestMessage.RepBytes[0][0] {
-		t.Error("RepBytes[0]: bytes field not copied")
-	}
-}
-
-func TestCloneNil(t *testing.T) {
-	var m *pb.MyMessage
-	if c := proto.Clone(m); !proto.Equal(m, c) {
-		t.Errorf("Clone(%v) = %v", m, c)
-	}
-}
-
-var mergeTests = []struct {
-	src, dst, want proto.Message
-}{
-	{
-		src: &pb.MyMessage{
-			Count: proto.Int32(42),
-		},
-		dst: &pb.MyMessage{
-			Name: proto.String("Dave"),
-		},
-		want: &pb.MyMessage{
-			Count: proto.Int32(42),
-			Name:  proto.String("Dave"),
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-			},
-			Pet: []string{"horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-		dst: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host: proto.String("niles"),
-				Port: proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{
-					// Explicitly test a src=nil field
-					Inner: nil,
-				},
-			},
-		},
-		want: &pb.MyMessage{
-			Inner: &pb.InnerMessage{
-				Host:      proto.String("hey"),
-				Connected: proto.Bool(true),
-				Port:      proto.Int32(9099),
-			},
-			Pet: []string{"bunny", "kitty", "horsey"},
-			Others: []*pb.OtherMessage{
-				{
-					Key: proto.Int64(31415926535),
-				},
-				{},
-				{
-					Value: []byte("some bytes"),
-				},
-			},
-		},
-	},
-	{
-		src: &pb.MyMessage{
-			RepBytes: [][]byte{[]byte("wow")},
-		},
-		dst: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham")},
-		},
-		want: &pb.MyMessage{
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: proto.Int32(6),
-			},
-			RepBytes: [][]byte{[]byte("sham"), []byte("wow")},
-		},
-	},
-	// Check that a scalar bytes field replaces rather than appends.
-	{
-		src:  &pb.OtherMessage{Value: []byte("foo")},
-		dst:  &pb.OtherMessage{Value: []byte("bar")},
-		want: &pb.OtherMessage{Value: []byte("foo")},
-	},
-	{
-		src: &pb.MessageWithMap{
-			NameMapping: map[int32]string{6: "Nigel"},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: &pb.FloatingPoint{F: proto.Float64(2.0)},
-				0x4002: &pb.FloatingPoint{
-					F: proto.Float64(2.0),
-				},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-		dst: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Bruce", // should be overwritten
-				7: "Andrew",
-			},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4002: &pb.FloatingPoint{
-					F:     proto.Float64(3.0),
-					Exact: proto.Bool(true),
-				}, // the entire message should be overwritten
-			},
-		},
-		want: &pb.MessageWithMap{
-			NameMapping: map[int32]string{
-				6: "Nigel",
-				7: "Andrew",
-			},
-			MsgMapping: map[int64]*pb.FloatingPoint{
-				0x4001: &pb.FloatingPoint{F: proto.Float64(2.0)},
-				0x4002: &pb.FloatingPoint{
-					F: proto.Float64(2.0),
-				},
-			},
-			ByteMapping: map[bool][]byte{true: []byte("wowsa")},
-		},
-	},
-	// proto3 shouldn't merge zero values,
-	// in the same way that proto2 shouldn't merge nils.
-	{
-		src: &proto3pb.Message{
-			Name: "Aaron",
-			Data: []byte(""), // zero value, but not nil
-		},
-		dst: &proto3pb.Message{
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-		want: &proto3pb.Message{
-			Name:       "Aaron",
-			HeightInCm: 176,
-			Data:       []byte("texas!"),
-		},
-	},
-	// Oneof fields should merge by assignment.
-	{
-		src: &pb.Communique{
-			Union: &pb.Communique_Number{41},
-		},
-		dst: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
-		want: &pb.Communique{
-			Union: &pb.Communique_Number{41},
-		},
-	},
-	// Oneof nil is the same as not set.
-	{
-		src: &pb.Communique{},
-		dst: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
-		want: &pb.Communique{
-			Union: &pb.Communique_Name{"Bobby Tables"},
-		},
-	},
-	{
-		src: &proto3pb.Message{
-			Terrain: map[string]*proto3pb.Nested{
-				"kay_a": &proto3pb.Nested{Cute: true},      // replace
-				"kay_b": &proto3pb.Nested{Bunny: "rabbit"}, // insert
-			},
-		},
-		dst: &proto3pb.Message{
-			Terrain: map[string]*proto3pb.Nested{
-				"kay_a": &proto3pb.Nested{Bunny: "lost"},  // replaced
-				"kay_c": &proto3pb.Nested{Bunny: "bunny"}, // keep
-			},
-		},
-		want: &proto3pb.Message{
-			Terrain: map[string]*proto3pb.Nested{
-				"kay_a": &proto3pb.Nested{Cute: true},
-				"kay_b": &proto3pb.Nested{Bunny: "rabbit"},
-				"kay_c": &proto3pb.Nested{Bunny: "bunny"},
-			},
-		},
-	},
-}
-
-func TestMerge(t *testing.T) {
-	for _, m := range mergeTests {
-		got := proto.Clone(m.dst)
-		proto.Merge(got, m.src)
-		if !proto.Equal(got, m.want) {
-			t.Errorf("Merge(%v, %v)\n got %v\nwant %v\n", m.dst, m.src, got, m.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/decode.go b/installer/vendor/github.com/golang/protobuf/proto/decode.go
index aa207298f9..d9aa3c42d6 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/decode.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/decode.go
@@ -39,8 +39,6 @@ import (
 	"errors"
 	"fmt"
 	"io"
-	"os"
-	"reflect"
 )
 
 // errOverflow is returned when an integer is too large to be represented.
@@ -50,10 +48,6 @@ var errOverflow = errors.New("proto: integer overflow")
 // wire type is encountered. It does not get returned to user code.
 var ErrInternalBadWireType = errors.New("proto: internal error: bad wiretype for oneof")
 
-// The fundamental decoders that interpret bytes on the wire.
-// Those that take integer types all return uint64 and are
-// therefore of type valueDecoder.
-
 // DecodeVarint reads a varint-encoded integer from the slice.
 // It returns the integer and the number of bytes consumed, or
 // zero if there is not enough.
@@ -267,9 +261,6 @@ func (p *Buffer) DecodeZigzag32() (x uint64, err error) {
 	return
 }
 
-// These are not ValueDecoders: they produce an array of bytes or a string.
-// bytes, embedded messages
-
 // DecodeRawBytes reads a count-delimited byte buffer from the Buffer.
 // This is the format used for the bytes protocol buffer
 // type and for embedded messages.
@@ -311,81 +302,29 @@ func (p *Buffer) DecodeStringBytes() (s string, err error) {
 	return string(buf), nil
 }
 
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-// If the protocol buffer has extensions, and the field matches, add it as an extension.
-// Otherwise, if the XXX_unrecognized field exists, append the skipped data there.
-func (o *Buffer) skipAndSave(t reflect.Type, tag, wire int, base structPointer, unrecField field) error {
-	oi := o.index
-
-	err := o.skip(t, tag, wire)
-	if err != nil {
-		return err
-	}
-
-	if !unrecField.IsValid() {
-		return nil
-	}
-
-	ptr := structPointer_Bytes(base, unrecField)
-
-	// Add the skipped field to struct field
-	obuf := o.buf
-
-	o.buf = *ptr
-	o.EncodeVarint(uint64(tag<<3 | wire))
-	*ptr = append(o.buf, obuf[oi:o.index]...)
-
-	o.buf = obuf
-
-	return nil
-}
-
-// Skip the next item in the buffer. Its wire type is decoded and presented as an argument.
-func (o *Buffer) skip(t reflect.Type, tag, wire int) error {
-
-	var u uint64
-	var err error
-
-	switch wire {
-	case WireVarint:
-		_, err = o.DecodeVarint()
-	case WireFixed64:
-		_, err = o.DecodeFixed64()
-	case WireBytes:
-		_, err = o.DecodeRawBytes(false)
-	case WireFixed32:
-		_, err = o.DecodeFixed32()
-	case WireStartGroup:
-		for {
-			u, err = o.DecodeVarint()
-			if err != nil {
-				break
-			}
-			fwire := int(u & 0x7)
-			if fwire == WireEndGroup {
-				break
-			}
-			ftag := int(u >> 3)
-			err = o.skip(t, ftag, fwire)
-			if err != nil {
-				break
-			}
-		}
-	default:
-		err = fmt.Errorf("proto: can't skip unknown wire type %d for %s", wire, t)
-	}
-	return err
-}
-
 // Unmarshaler is the interface representing objects that can
-// unmarshal themselves.  The method should reset the receiver before
-// decoding starts.  The argument points to data that may be
+// unmarshal themselves.  The argument points to data that may be
 // overwritten, so implementations should not keep references to the
 // buffer.
+// Unmarshal implementations should not clear the receiver.
+// Any unmarshaled data should be merged into the receiver.
+// Callers of Unmarshal that do not want to retain existing data
+// should Reset the receiver before calling Unmarshal.
 type Unmarshaler interface {
 	Unmarshal([]byte) error
 }
 
+// newUnmarshaler is the interface representing objects that can
+// unmarshal themselves. The semantics are identical to Unmarshaler.
+//
+// This exists to support protoc-gen-go generated messages.
+// The proto package will stop type-asserting to this interface in the future.
+//
+// DO NOT DEPEND ON THIS.
+type newUnmarshaler interface {
+	XXX_Unmarshal([]byte) error
+}
+
 // Unmarshal parses the protocol buffer representation in buf and places the
 // decoded result in pb.  If the struct underlying pb does not match
 // the data in buf, the results can be unpredictable.
@@ -395,7 +334,13 @@ type Unmarshaler interface {
 // to preserve and append to existing data.
 func Unmarshal(buf []byte, pb Message) error {
 	pb.Reset()
-	return UnmarshalMerge(buf, pb)
+	if u, ok := pb.(newUnmarshaler); ok {
+		return u.XXX_Unmarshal(buf)
+	}
+	if u, ok := pb.(Unmarshaler); ok {
+		return u.Unmarshal(buf)
+	}
+	return NewBuffer(buf).Unmarshal(pb)
 }
 
 // UnmarshalMerge parses the protocol buffer representation in buf and
@@ -405,8 +350,16 @@ func Unmarshal(buf []byte, pb Message) error {
 // UnmarshalMerge merges into existing data in pb.
 // Most code should use Unmarshal instead.
 func UnmarshalMerge(buf []byte, pb Message) error {
-	// If the object can unmarshal itself, let it.
+	if u, ok := pb.(newUnmarshaler); ok {
+		return u.XXX_Unmarshal(buf)
+	}
 	if u, ok := pb.(Unmarshaler); ok {
+		// NOTE: The history of proto have unfortunately been inconsistent
+		// whether Unmarshaler should or should not implicitly clear itself.
+		// Some implementations do, most do not.
+		// Thus, calling this here may or may not do what people want.
+		//
+		// See https://github.com/golang/protobuf/issues/424
 		return u.Unmarshal(buf)
 	}
 	return NewBuffer(buf).Unmarshal(pb)
@@ -422,12 +375,17 @@ func (p *Buffer) DecodeMessage(pb Message) error {
 }
 
 // DecodeGroup reads a tag-delimited group from the Buffer.
+// StartGroup tag is already consumed. This function consumes
+// EndGroup tag.
 func (p *Buffer) DecodeGroup(pb Message) error {
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
+	b := p.buf[p.index:]
+	x, y := findEndGroup(b)
+	if x < 0 {
+		return io.ErrUnexpectedEOF
 	}
-	return p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), true, base)
+	err := Unmarshal(b[:x], pb)
+	p.index += y
+	return err
 }
 
 // Unmarshal parses the protocol buffer representation in the
@@ -438,533 +396,33 @@ func (p *Buffer) DecodeGroup(pb Message) error {
 // Unlike proto.Unmarshal, this does not reset pb before starting to unmarshal.
 func (p *Buffer) Unmarshal(pb Message) error {
 	// If the object can unmarshal itself, let it.
-	if u, ok := pb.(Unmarshaler); ok {
-		err := u.Unmarshal(p.buf[p.index:])
+	if u, ok := pb.(newUnmarshaler); ok {
+		err := u.XXX_Unmarshal(p.buf[p.index:])
 		p.index = len(p.buf)
 		return err
 	}
-
-	typ, base, err := getbase(pb)
-	if err != nil {
-		return err
-	}
-
-	err = p.unmarshalType(typ.Elem(), GetProperties(typ.Elem()), false, base)
-
-	if collectStats {
-		stats.Decode++
-	}
-
-	return err
-}
-
-// unmarshalType does the work of unmarshaling a structure.
-func (o *Buffer) unmarshalType(st reflect.Type, prop *StructProperties, is_group bool, base structPointer) error {
-	var state errorState
-	required, reqFields := prop.reqCount, uint64(0)
-
-	var err error
-	for err == nil && o.index < len(o.buf) {
-		oi := o.index
-		var u uint64
-		u, err = o.DecodeVarint()
-		if err != nil {
-			break
-		}
-		wire := int(u & 0x7)
-		if wire == WireEndGroup {
-			if is_group {
-				if required > 0 {
-					// Not enough information to determine the exact field.
-					// (See below.)
-					return &RequiredNotSetError{"{Unknown}"}
-				}
-				return nil // input is satisfied
-			}
-			return fmt.Errorf("proto: %s: wiretype end group for non-group", st)
-		}
-		tag := int(u >> 3)
-		if tag <= 0 {
-			return fmt.Errorf("proto: %s: illegal tag %d (wire type %d)", st, tag, wire)
-		}
-		fieldnum, ok := prop.decoderTags.get(tag)
-		if !ok {
-			// Maybe it's an extension?
-			if prop.extendable {
-				if e, _ := extendable(structPointer_Interface(base, st)); isExtensionField(e, int32(tag)) {
-					if err = o.skip(st, tag, wire); err == nil {
-						extmap := e.extensionsWrite()
-						ext := extmap[int32(tag)] // may be missing
-						ext.enc = append(ext.enc, o.buf[oi:o.index]...)
-						extmap[int32(tag)] = ext
-					}
-					continue
-				}
-			}
-			// Maybe it's a oneof?
-			if prop.oneofUnmarshaler != nil {
-				m := structPointer_Interface(base, st).(Message)
-				// First return value indicates whether tag is a oneof field.
-				ok, err = prop.oneofUnmarshaler(m, tag, wire, o)
-				if err == ErrInternalBadWireType {
-					// Map the error to something more descriptive.
-					// Do the formatting here to save generated code space.
-					err = fmt.Errorf("bad wiretype for oneof field in %T", m)
-				}
-				if ok {
-					continue
-				}
-			}
-			err = o.skipAndSave(st, tag, wire, base, prop.unrecField)
-			continue
-		}
-		p := prop.Prop[fieldnum]
-
-		if p.dec == nil {
-			fmt.Fprintf(os.Stderr, "proto: no protobuf decoder for %s.%s\n", st, st.Field(fieldnum).Name)
-			continue
-		}
-		dec := p.dec
-		if wire != WireStartGroup && wire != p.WireType {
-			if wire == WireBytes && p.packedDec != nil {
-				// a packable field
-				dec = p.packedDec
-			} else {
-				err = fmt.Errorf("proto: bad wiretype for field %s.%s: got wiretype %d, want %d", st, st.Field(fieldnum).Name, wire, p.WireType)
-				continue
-			}
-		}
-		decErr := dec(o, p, base)
-		if decErr != nil && !state.shouldContinue(decErr, p) {
-			err = decErr
-		}
-		if err == nil && p.Required {
-			// Successfully decoded a required field.
-			if tag <= 64 {
-				// use bitmap for fields 1-64 to catch field reuse.
-				var mask uint64 = 1 << uint64(tag-1)
-				if reqFields&mask == 0 {
-					// new required field
-					reqFields |= mask
-					required--
-				}
-			} else {
-				// This is imprecise. It can be fooled by a required field
-				// with a tag > 64 that is encoded twice; that's very rare.
-				// A fully correct implementation would require allocating
-				// a data structure, which we would like to avoid.
-				required--
-			}
-		}
-	}
-	if err == nil {
-		if is_group {
-			return io.ErrUnexpectedEOF
-		}
-		if state.err != nil {
-			return state.err
-		}
-		if required > 0 {
-			// Not enough information to determine the exact field. If we use extra
-			// CPU, we could determine the field only if the missing required field
-			// has a tag <= 64 and we check reqFields.
-			return &RequiredNotSetError{"{Unknown}"}
-		}
-	}
-	return err
-}
-
-// Individual type decoders
-// For each,
-//	u is the decoded value,
-//	v is a pointer to the field (pointer) in the struct
-
-// Sizes of the pools to allocate inside the Buffer.
-// The goal is modest amortization and allocation
-// on at least 16-byte boundaries.
-const (
-	boolPoolSize   = 16
-	uint32PoolSize = 8
-	uint64PoolSize = 4
-)
-
-// Decode a bool.
-func (o *Buffer) dec_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	if len(o.bools) == 0 {
-		o.bools = make([]bool, boolPoolSize)
-	}
-	o.bools[0] = u != 0
-	*structPointer_Bool(base, p.field) = &o.bools[0]
-	o.bools = o.bools[1:]
-	return nil
-}
-
-func (o *Buffer) dec_proto3_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	*structPointer_BoolVal(base, p.field) = u != 0
-	return nil
-}
-
-// Decode an int32.
-func (o *Buffer) dec_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32_Set(structPointer_Word32(base, p.field), o, uint32(u))
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word32Val_Set(structPointer_Word32Val(base, p.field), uint32(u))
-	return nil
-}
-
-// Decode an int64.
-func (o *Buffer) dec_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64_Set(structPointer_Word64(base, p.field), o, u)
-	return nil
-}
-
-func (o *Buffer) dec_proto3_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	word64Val_Set(structPointer_Word64Val(base, p.field), o, u)
-	return nil
-}
-
-// Decode a string.
-func (o *Buffer) dec_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_String(base, p.field) = &s
-	return nil
-}
-
-func (o *Buffer) dec_proto3_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	*structPointer_StringVal(base, p.field) = s
-	return nil
-}
-
-// Decode a slice of bytes ([]byte).
-func (o *Buffer) dec_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	*structPointer_Bytes(base, p.field) = b
-	return nil
-}
-
-// Decode a slice of bools ([]bool).
-func (o *Buffer) dec_slice_bool(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BoolSlice(base, p.field)
-	*v = append(*v, u != 0)
-	return nil
-}
-
-// Decode a slice of bools ([]bool) in packed format.
-func (o *Buffer) dec_slice_packed_bool(p *Properties, base structPointer) error {
-	v := structPointer_BoolSlice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded bools
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-
-	y := *v
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		y = append(y, u != 0)
-	}
-
-	*v = y
-	return nil
-}
-
-// Decode a slice of int32s ([]int32).
-func (o *Buffer) dec_slice_int32(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-	structPointer_Word32Slice(base, p.field).Append(uint32(u))
-	return nil
-}
-
-// Decode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) dec_slice_packed_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int32s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(uint32(u))
-	}
-	return nil
-}
-
-// Decode a slice of int64s ([]int64).
-func (o *Buffer) dec_slice_int64(p *Properties, base structPointer) error {
-	u, err := p.valDec(o)
-	if err != nil {
-		return err
-	}
-
-	structPointer_Word64Slice(base, p.field).Append(u)
-	return nil
-}
-
-// Decode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) dec_slice_packed_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Slice(base, p.field)
-
-	nn, err := o.DecodeVarint()
-	if err != nil {
-		return err
-	}
-	nb := int(nn) // number of bytes of encoded int64s
-
-	fin := o.index + nb
-	if fin < o.index {
-		return errOverflow
-	}
-	for o.index < fin {
-		u, err := p.valDec(o)
-		if err != nil {
-			return err
-		}
-		v.Append(u)
-	}
-	return nil
-}
-
-// Decode a slice of strings ([]string).
-func (o *Buffer) dec_slice_string(p *Properties, base structPointer) error {
-	s, err := o.DecodeStringBytes()
-	if err != nil {
-		return err
-	}
-	v := structPointer_StringSlice(base, p.field)
-	*v = append(*v, s)
-	return nil
-}
-
-// Decode a slice of slice of bytes ([][]byte).
-func (o *Buffer) dec_slice_slice_byte(p *Properties, base structPointer) error {
-	b, err := o.DecodeRawBytes(true)
-	if err != nil {
-		return err
-	}
-	v := structPointer_BytesSlice(base, p.field)
-	*v = append(*v, b)
-	return nil
-}
-
-// Decode a map field.
-func (o *Buffer) dec_new_map(p *Properties, base structPointer) error {
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
-		return err
-	}
-	oi := o.index       // index at the end of this map entry
-	o.index -= len(raw) // move buffer back to start of map entry
-
-	mptr := structPointer_NewAt(base, p.field, p.mtype) // *map[K]V
-	if mptr.Elem().IsNil() {
-		mptr.Elem().Set(reflect.MakeMap(mptr.Type().Elem()))
-	}
-	v := mptr.Elem() // map[K]V
-
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// See enc_new_map for why.
-	keyptr := reflect.New(reflect.PtrTo(p.mtype.Key())).Elem() // addressable *K
-	keybase := toStructPointer(keyptr.Addr())                  // **K
-
-	var valbase structPointer
-	var valptr reflect.Value
-	switch p.mtype.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valptr = reflect.ValueOf(&dummy)  // *[]byte
-		valbase = toStructPointer(valptr) // *[]byte
-	case reflect.Ptr:
-		// message; valptr is **Msg; need to allocate the intermediate pointer
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valptr.Set(reflect.New(valptr.Type().Elem()))
-		valbase = toStructPointer(valptr)
-	default:
-		// everything else
-		valptr = reflect.New(reflect.PtrTo(p.mtype.Elem())).Elem() // addressable *V
-		valbase = toStructPointer(valptr.Addr())                   // **V
-	}
-
-	// Decode.
-	// This parses a restricted wire format, namely the encoding of a message
-	// with two fields. See enc_new_map for the format.
-	for o.index < oi {
-		// tagcode for key and value properties are always a single byte
-		// because they have tags 1 and 2.
-		tagcode := o.buf[o.index]
-		o.index++
-		switch tagcode {
-		case p.mkeyprop.tagcode[0]:
-			if err := p.mkeyprop.dec(o, p.mkeyprop, keybase); err != nil {
-				return err
-			}
-		case p.mvalprop.tagcode[0]:
-			if err := p.mvalprop.dec(o, p.mvalprop, valbase); err != nil {
-				return err
-			}
-		default:
-			// TODO: Should we silently skip this instead?
-			return fmt.Errorf("proto: bad map data tag %d", raw[0])
-		}
-	}
-	keyelem, valelem := keyptr.Elem(), valptr.Elem()
-	if !keyelem.IsValid() {
-		keyelem = reflect.Zero(p.mtype.Key())
-	}
-	if !valelem.IsValid() {
-		valelem = reflect.Zero(p.mtype.Elem())
-	}
-
-	v.SetMapIndex(keyelem, valelem)
-	return nil
-}
-
-// Decode a group.
-func (o *Buffer) dec_struct_group(p *Properties, base structPointer) error {
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-	return o.unmarshalType(p.stype, p.sprop, true, bas)
-}
-
-// Decode an embedded message.
-func (o *Buffer) dec_struct_message(p *Properties, base structPointer) (err error) {
-	raw, e := o.DecodeRawBytes(false)
-	if e != nil {
-		return e
-	}
-
-	bas := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(bas) {
-		// allocate new nested message
-		bas = toStructPointer(reflect.New(p.stype))
-		structPointer_SetStructPointer(base, p.field, bas)
-	}
-
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := structPointer_Interface(bas, p.stype)
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, false, bas)
-	o.buf = obuf
-	o.index = oi
-
-	return err
-}
-
-// Decode a slice of embedded messages.
-func (o *Buffer) dec_slice_struct_message(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, false, base)
-}
-
-// Decode a slice of embedded groups.
-func (o *Buffer) dec_slice_struct_group(p *Properties, base structPointer) error {
-	return o.dec_slice_struct(p, true, base)
-}
-
-// Decode a slice of structs ([]*struct).
-func (o *Buffer) dec_slice_struct(p *Properties, is_group bool, base structPointer) error {
-	v := reflect.New(p.stype)
-	bas := toStructPointer(v)
-	structPointer_StructPointerSlice(base, p.field).Append(bas)
-
-	if is_group {
-		err := o.unmarshalType(p.stype, p.sprop, is_group, bas)
-		return err
-	}
-
-	raw, err := o.DecodeRawBytes(false)
-	if err != nil {
+	if u, ok := pb.(Unmarshaler); ok {
+		// NOTE: The history of proto have unfortunately been inconsistent
+		// whether Unmarshaler should or should not implicitly clear itself.
+		// Some implementations do, most do not.
+		// Thus, calling this here may or may not do what people want.
+		//
+		// See https://github.com/golang/protobuf/issues/424
+		err := u.Unmarshal(p.buf[p.index:])
+		p.index = len(p.buf)
 		return err
 	}
 
-	// If the object can unmarshal itself, let it.
-	if p.isUnmarshaler {
-		iv := v.Interface()
-		return iv.(Unmarshaler).Unmarshal(raw)
-	}
-
-	obuf := o.buf
-	oi := o.index
-	o.buf = raw
-	o.index = 0
-
-	err = o.unmarshalType(p.stype, p.sprop, is_group, bas)
-
-	o.buf = obuf
-	o.index = oi
-
+	// Slow workaround for messages that aren't Unmarshalers.
+	// This includes some hand-coded .pb.go files and
+	// bootstrap protos.
+	// TODO: fix all of those and then add Unmarshal to
+	// the Message interface. Then:
+	// The cast above and code below can be deleted.
+	// The old unmarshaler can be deleted.
+	// Clients can call Unmarshal directly (can already do that, actually).
+	var info InternalMessageInfo
+	err := info.Unmarshal(pb, p.buf[p.index:])
+	p.index = len(p.buf)
 	return err
 }
diff --git a/installer/vendor/github.com/golang/protobuf/proto/decode_test.go b/installer/vendor/github.com/golang/protobuf/proto/decode_test.go
deleted file mode 100644
index 2c4c31d127..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/decode_test.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build go1.7
-
-package proto_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	tpb "github.com/golang/protobuf/proto/proto3_proto"
-)
-
-var (
-	bytesBlackhole []byte
-	msgBlackhole   = new(tpb.Message)
-)
-
-// BenchmarkVarint32ArraySmall shows the performance on an array of small int32 fields (1 and
-// 2 bytes long).
-func BenchmarkVarint32ArraySmall(b *testing.B) {
-	for i := uint(1); i <= 10; i++ {
-		dist := genInt32Dist([7]int{0, 3, 1}, 1<<i)
-		raw, err := proto.Marshal(&tpb.Message{
-			ShortKey: dist,
-		})
-		if err != nil {
-			b.Error("wrong encode", err)
-		}
-		b.Run(fmt.Sprintf("Len%v", len(dist)), func(b *testing.B) {
-			scratchBuf := proto.NewBuffer(nil)
-			b.ResetTimer()
-			for k := 0; k < b.N; k++ {
-				scratchBuf.SetBuf(raw)
-				msgBlackhole.Reset()
-				if err := scratchBuf.Unmarshal(msgBlackhole); err != nil {
-					b.Error("wrong decode", err)
-				}
-			}
-		})
-	}
-}
-
-// BenchmarkVarint32ArrayLarge shows the performance on an array of large int32 fields (3 and
-// 4 bytes long, with a small number of 1, 2, 5 and 10 byte long versions).
-func BenchmarkVarint32ArrayLarge(b *testing.B) {
-	for i := uint(1); i <= 10; i++ {
-		dist := genInt32Dist([7]int{0, 1, 2, 4, 8, 1, 1}, 1<<i)
-		raw, err := proto.Marshal(&tpb.Message{
-			ShortKey: dist,
-		})
-		if err != nil {
-			b.Error("wrong encode", err)
-		}
-		b.Run(fmt.Sprintf("Len%v", len(dist)), func(b *testing.B) {
-			scratchBuf := proto.NewBuffer(nil)
-			b.ResetTimer()
-			for k := 0; k < b.N; k++ {
-				scratchBuf.SetBuf(raw)
-				msgBlackhole.Reset()
-				if err := scratchBuf.Unmarshal(msgBlackhole); err != nil {
-					b.Error("wrong decode", err)
-				}
-			}
-		})
-	}
-}
-
-// BenchmarkVarint64ArraySmall shows the performance on an array of small int64 fields (1 and
-// 2 bytes long).
-func BenchmarkVarint64ArraySmall(b *testing.B) {
-	for i := uint(1); i <= 10; i++ {
-		dist := genUint64Dist([11]int{0, 3, 1}, 1<<i)
-		raw, err := proto.Marshal(&tpb.Message{
-			Key: dist,
-		})
-		if err != nil {
-			b.Error("wrong encode", err)
-		}
-		b.Run(fmt.Sprintf("Len%v", len(dist)), func(b *testing.B) {
-			scratchBuf := proto.NewBuffer(nil)
-			b.ResetTimer()
-			for k := 0; k < b.N; k++ {
-				scratchBuf.SetBuf(raw)
-				msgBlackhole.Reset()
-				if err := scratchBuf.Unmarshal(msgBlackhole); err != nil {
-					b.Error("wrong decode", err)
-				}
-			}
-		})
-	}
-}
-
-// BenchmarkVarint64ArrayLarge shows the performance on an array of large int64 fields (6, 7,
-// and 8 bytes long with a small number of the other sizes).
-func BenchmarkVarint64ArrayLarge(b *testing.B) {
-	for i := uint(1); i <= 10; i++ {
-		dist := genUint64Dist([11]int{0, 1, 1, 2, 4, 8, 16, 32, 16, 1, 1}, 1<<i)
-		raw, err := proto.Marshal(&tpb.Message{
-			Key: dist,
-		})
-		if err != nil {
-			b.Error("wrong encode", err)
-		}
-		b.Run(fmt.Sprintf("Len%v", len(dist)), func(b *testing.B) {
-			scratchBuf := proto.NewBuffer(nil)
-			b.ResetTimer()
-			for k := 0; k < b.N; k++ {
-				scratchBuf.SetBuf(raw)
-				msgBlackhole.Reset()
-				if err := scratchBuf.Unmarshal(msgBlackhole); err != nil {
-					b.Error("wrong decode", err)
-				}
-			}
-		})
-	}
-}
-
-// BenchmarkVarint64ArrayMixed shows the performance of lots of small messages, each
-// containing a small number of large (3, 4, and 5 byte) repeated int64s.
-func BenchmarkVarint64ArrayMixed(b *testing.B) {
-	for i := uint(1); i <= 1<<5; i <<= 1 {
-		dist := genUint64Dist([11]int{0, 0, 0, 4, 6, 4, 0, 0, 0, 0, 0}, int(i))
-		// number of sub fields
-		for k := uint(1); k <= 1<<10; k <<= 2 {
-			msg := &tpb.Message{}
-			for m := uint(0); m < k; m++ {
-				msg.Children = append(msg.Children, &tpb.Message{
-					Key: dist,
-				})
-			}
-			raw, err := proto.Marshal(msg)
-			if err != nil {
-				b.Error("wrong encode", err)
-			}
-			b.Run(fmt.Sprintf("Fields%vLen%v", k, i), func(b *testing.B) {
-				scratchBuf := proto.NewBuffer(nil)
-				b.ResetTimer()
-				for k := 0; k < b.N; k++ {
-					scratchBuf.SetBuf(raw)
-					msgBlackhole.Reset()
-					if err := scratchBuf.Unmarshal(msgBlackhole); err != nil {
-						b.Error("wrong decode", err)
-					}
-				}
-			})
-		}
-	}
-}
-
-// genInt32Dist generates a slice of ints that will match the size distribution of dist.
-// A size of 6 corresponds to a max length varint32, which is 10 bytes.  The distribution
-// is 1-indexed. (i.e. the value at index 1 is how many 1 byte ints to create).
-func genInt32Dist(dist [7]int, count int) (dest []int32) {
-	for i := 0; i < count; i++ {
-		for k := 0; k < len(dist); k++ {
-			var num int32
-			switch k {
-			case 1:
-				num = 1<<7 - 1
-			case 2:
-				num = 1<<14 - 1
-			case 3:
-				num = 1<<21 - 1
-			case 4:
-				num = 1<<28 - 1
-			case 5:
-				num = 1<<29 - 1
-			case 6:
-				num = -1
-			}
-			for m := 0; m < dist[k]; m++ {
-				dest = append(dest, num)
-			}
-		}
-	}
-	return
-}
-
-// genUint64Dist generates a slice of ints that will match the size distribution of dist.
-// The distribution is 1-indexed. (i.e. the value at index 1 is how many 1 byte ints to create).
-func genUint64Dist(dist [11]int, count int) (dest []uint64) {
-	for i := 0; i < count; i++ {
-		for k := 0; k < len(dist); k++ {
-			var num uint64
-			switch k {
-			case 1:
-				num = 1<<7 - 1
-			case 2:
-				num = 1<<14 - 1
-			case 3:
-				num = 1<<21 - 1
-			case 4:
-				num = 1<<28 - 1
-			case 5:
-				num = 1<<35 - 1
-			case 6:
-				num = 1<<42 - 1
-			case 7:
-				num = 1<<49 - 1
-			case 8:
-				num = 1<<56 - 1
-			case 9:
-				num = 1<<63 - 1
-			case 10:
-				num = 1<<64 - 1
-			}
-			for m := 0; m < dist[k]; m++ {
-				dest = append(dest, num)
-			}
-		}
-	}
-	return
-}
-
-// BenchmarkDecodeEmpty measures the overhead of doing the minimal possible decode.
-func BenchmarkDecodeEmpty(b *testing.B) {
-	raw, err := proto.Marshal(&tpb.Message{})
-	if err != nil {
-		b.Error("wrong encode", err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		if err := proto.Unmarshal(raw, msgBlackhole); err != nil {
-			b.Error("wrong decode", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/discard.go b/installer/vendor/github.com/golang/protobuf/proto/discard.go
new file mode 100644
index 0000000000..dea2617ced
--- /dev/null
+++ b/installer/vendor/github.com/golang/protobuf/proto/discard.go
@@ -0,0 +1,350 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2017 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"sync"
+	"sync/atomic"
+)
+
+type generatedDiscarder interface {
+	XXX_DiscardUnknown()
+}
+
+// DiscardUnknown recursively discards all unknown fields from this message
+// and all embedded messages.
+//
+// When unmarshaling a message with unrecognized fields, the tags and values
+// of such fields are preserved in the Message. This allows a later call to
+// marshal to be able to produce a message that continues to have those
+// unrecognized fields. To avoid this, DiscardUnknown is used to
+// explicitly clear the unknown fields after unmarshaling.
+//
+// For proto2 messages, the unknown fields of message extensions are only
+// discarded from messages that have been accessed via GetExtension.
+func DiscardUnknown(m Message) {
+	if m, ok := m.(generatedDiscarder); ok {
+		m.XXX_DiscardUnknown()
+		return
+	}
+	// TODO: Dynamically populate a InternalMessageInfo for legacy messages,
+	// but the master branch has no implementation for InternalMessageInfo,
+	// so it would be more work to replicate that approach.
+	discardLegacy(m)
+}
+
+// DiscardUnknown recursively discards all unknown fields.
+func (a *InternalMessageInfo) DiscardUnknown(m Message) {
+	di := atomicLoadDiscardInfo(&a.discard)
+	if di == nil {
+		di = getDiscardInfo(reflect.TypeOf(m).Elem())
+		atomicStoreDiscardInfo(&a.discard, di)
+	}
+	di.discard(toPointer(&m))
+}
+
+type discardInfo struct {
+	typ reflect.Type
+
+	initialized int32 // 0: only typ is valid, 1: everything is valid
+	lock        sync.Mutex
+
+	fields       []discardFieldInfo
+	unrecognized field
+}
+
+type discardFieldInfo struct {
+	field   field // Offset of field, guaranteed to be valid
+	discard func(src pointer)
+}
+
+var (
+	discardInfoMap  = map[reflect.Type]*discardInfo{}
+	discardInfoLock sync.Mutex
+)
+
+func getDiscardInfo(t reflect.Type) *discardInfo {
+	discardInfoLock.Lock()
+	defer discardInfoLock.Unlock()
+	di := discardInfoMap[t]
+	if di == nil {
+		di = &discardInfo{typ: t}
+		discardInfoMap[t] = di
+	}
+	return di
+}
+
+func (di *discardInfo) discard(src pointer) {
+	if src.isNil() {
+		return // Nothing to do.
+	}
+
+	if atomic.LoadInt32(&di.initialized) == 0 {
+		di.computeDiscardInfo()
+	}
+
+	for _, fi := range di.fields {
+		sfp := src.offset(fi.field)
+		fi.discard(sfp)
+	}
+
+	// For proto2 messages, only discard unknown fields in message extensions
+	// that have been accessed via GetExtension.
+	if em, err := extendable(src.asPointerTo(di.typ).Interface()); err == nil {
+		// Ignore lock since DiscardUnknown is not concurrency safe.
+		emm, _ := em.extensionsRead()
+		for _, mx := range emm {
+			if m, ok := mx.value.(Message); ok {
+				DiscardUnknown(m)
+			}
+		}
+	}
+
+	if di.unrecognized.IsValid() {
+		*src.offset(di.unrecognized).toBytes() = nil
+	}
+}
+
+func (di *discardInfo) computeDiscardInfo() {
+	di.lock.Lock()
+	defer di.lock.Unlock()
+	if di.initialized != 0 {
+		return
+	}
+	t := di.typ
+	n := t.NumField()
+
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+
+		dfi := discardFieldInfo{field: toField(&f)}
+		tf := f.Type
+
+		// Unwrap tf to get its most basic type.
+		var isPointer, isSlice bool
+		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
+			isSlice = true
+			tf = tf.Elem()
+		}
+		if tf.Kind() == reflect.Ptr {
+			isPointer = true
+			tf = tf.Elem()
+		}
+		if isPointer && isSlice && tf.Kind() != reflect.Struct {
+			panic(fmt.Sprintf("%v.%s cannot be a slice of pointers to primitive types", t, f.Name))
+		}
+
+		switch tf.Kind() {
+		case reflect.Struct:
+			switch {
+			case !isPointer:
+				panic(fmt.Sprintf("%v.%s cannot be a direct struct value", t, f.Name))
+			case isSlice: // E.g., []*pb.T
+				di := getDiscardInfo(tf)
+				dfi.discard = func(src pointer) {
+					sps := src.getPointerSlice()
+					for _, sp := range sps {
+						if !sp.isNil() {
+							di.discard(sp)
+						}
+					}
+				}
+			default: // E.g., *pb.T
+				di := getDiscardInfo(tf)
+				dfi.discard = func(src pointer) {
+					sp := src.getPointer()
+					if !sp.isNil() {
+						di.discard(sp)
+					}
+				}
+			}
+		case reflect.Map:
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%v.%s cannot be a pointer to a map or a slice of map values", t, f.Name))
+			default: // E.g., map[K]V
+				if tf.Elem().Kind() == reflect.Ptr { // Proto struct (e.g., *T)
+					dfi.discard = func(src pointer) {
+						sm := src.asPointerTo(tf).Elem()
+						if sm.Len() == 0 {
+							return
+						}
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							DiscardUnknown(val.Interface().(Message))
+						}
+					}
+				} else {
+					dfi.discard = func(pointer) {} // Noop
+				}
+			}
+		case reflect.Interface:
+			// Must be oneof field.
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%v.%s cannot be a pointer to a interface or a slice of interface values", t, f.Name))
+			default: // E.g., interface{}
+				// TODO: Make this faster?
+				dfi.discard = func(src pointer) {
+					su := src.asPointerTo(tf).Elem()
+					if !su.IsNil() {
+						sv := su.Elem().Elem().Field(0)
+						if sv.Kind() == reflect.Ptr && sv.IsNil() {
+							return
+						}
+						switch sv.Type().Kind() {
+						case reflect.Ptr: // Proto struct (e.g., *T)
+							DiscardUnknown(sv.Interface().(Message))
+						}
+					}
+				}
+			}
+		default:
+			continue
+		}
+		di.fields = append(di.fields, dfi)
+	}
+
+	di.unrecognized = invalidField
+	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
+		if f.Type != reflect.TypeOf([]byte{}) {
+			panic("expected XXX_unrecognized to be of type []byte")
+		}
+		di.unrecognized = toField(&f)
+	}
+
+	atomic.StoreInt32(&di.initialized, 1)
+}
+
+func discardLegacy(m Message) {
+	v := reflect.ValueOf(m)
+	if v.Kind() != reflect.Ptr || v.IsNil() {
+		return
+	}
+	v = v.Elem()
+	if v.Kind() != reflect.Struct {
+		return
+	}
+	t := v.Type()
+
+	for i := 0; i < v.NumField(); i++ {
+		f := t.Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		vf := v.Field(i)
+		tf := f.Type
+
+		// Unwrap tf to get its most basic type.
+		var isPointer, isSlice bool
+		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
+			isSlice = true
+			tf = tf.Elem()
+		}
+		if tf.Kind() == reflect.Ptr {
+			isPointer = true
+			tf = tf.Elem()
+		}
+		if isPointer && isSlice && tf.Kind() != reflect.Struct {
+			panic(fmt.Sprintf("%T.%s cannot be a slice of pointers to primitive types", m, f.Name))
+		}
+
+		switch tf.Kind() {
+		case reflect.Struct:
+			switch {
+			case !isPointer:
+				panic(fmt.Sprintf("%T.%s cannot be a direct struct value", m, f.Name))
+			case isSlice: // E.g., []*pb.T
+				for j := 0; j < vf.Len(); j++ {
+					discardLegacy(vf.Index(j).Interface().(Message))
+				}
+			default: // E.g., *pb.T
+				discardLegacy(vf.Interface().(Message))
+			}
+		case reflect.Map:
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%T.%s cannot be a pointer to a map or a slice of map values", m, f.Name))
+			default: // E.g., map[K]V
+				tv := vf.Type().Elem()
+				if tv.Kind() == reflect.Ptr && tv.Implements(protoMessageType) { // Proto struct (e.g., *T)
+					for _, key := range vf.MapKeys() {
+						val := vf.MapIndex(key)
+						discardLegacy(val.Interface().(Message))
+					}
+				}
+			}
+		case reflect.Interface:
+			// Must be oneof field.
+			switch {
+			case isPointer || isSlice:
+				panic(fmt.Sprintf("%T.%s cannot be a pointer to a interface or a slice of interface values", m, f.Name))
+			default: // E.g., test_proto.isCommunique_Union interface
+				if !vf.IsNil() && f.Tag.Get("protobuf_oneof") != "" {
+					vf = vf.Elem() // E.g., *test_proto.Communique_Msg
+					if !vf.IsNil() {
+						vf = vf.Elem()   // E.g., test_proto.Communique_Msg
+						vf = vf.Field(0) // E.g., Proto struct (e.g., *T) or primitive value
+						if vf.Kind() == reflect.Ptr {
+							discardLegacy(vf.Interface().(Message))
+						}
+					}
+				}
+			}
+		}
+	}
+
+	if vf := v.FieldByName("XXX_unrecognized"); vf.IsValid() {
+		if vf.Type() != reflect.TypeOf([]byte{}) {
+			panic("expected XXX_unrecognized to be of type []byte")
+		}
+		vf.Set(reflect.ValueOf([]byte(nil)))
+	}
+
+	// For proto2 messages, only discard unknown fields in message extensions
+	// that have been accessed via GetExtension.
+	if em, err := extendable(m); err == nil {
+		// Ignore lock since discardLegacy is not concurrency safe.
+		emm, _ := em.extensionsRead()
+		for _, mx := range emm {
+			if m, ok := mx.value.(Message); ok {
+				discardLegacy(m)
+			}
+		}
+	}
+}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/encode.go b/installer/vendor/github.com/golang/protobuf/proto/encode.go
index 8b84d1b22d..4c35d33738 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/encode.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/encode.go
@@ -39,23 +39,19 @@ import (
 	"errors"
 	"fmt"
 	"reflect"
-	"sort"
 )
 
-// RequiredNotSetError is the error returned if Marshal is called with
-// a protocol buffer struct whose required fields have not
-// all been initialized. It is also the error returned if Unmarshal is
-// called with an encoded protocol buffer that does not include all the
-// required fields.
-//
-// When printed, RequiredNotSetError reports the first unset required field in a
-// message. If the field cannot be precisely determined, it is reported as
-// "{Unknown}".
+// RequiredNotSetError is an error type returned by either Marshal or Unmarshal.
+// Marshal reports this when a required field is not initialized.
+// Unmarshal reports this when a required field is missing from the wire data.
 type RequiredNotSetError struct {
 	field string
 }
 
 func (e *RequiredNotSetError) Error() string {
+	if e.field == "" {
+		return fmt.Sprintf("proto: required field not set")
+	}
 	return fmt.Sprintf("proto: required field %q not set", e.field)
 }
 
@@ -82,10 +78,6 @@ var (
 
 const maxVarintBytes = 10 // maximum length of a varint
 
-// maxMarshalSize is the largest allowed size of an encoded protobuf,
-// since C++ and Java use signed int32s for the size.
-const maxMarshalSize = 1<<31 - 1
-
 // EncodeVarint returns the varint encoding of x.
 // This is the format for the
 // int32, int64, uint32, uint64, bool, and enum
@@ -119,18 +111,27 @@ func (p *Buffer) EncodeVarint(x uint64) error {
 
 // SizeVarint returns the varint encoding size of an integer.
 func SizeVarint(x uint64) int {
-	return sizeVarint(x)
-}
-
-func sizeVarint(x uint64) (n int) {
-	for {
-		n++
-		x >>= 7
-		if x == 0 {
-			break
-		}
-	}
-	return n
+	switch {
+	case x < 1<<7:
+		return 1
+	case x < 1<<14:
+		return 2
+	case x < 1<<21:
+		return 3
+	case x < 1<<28:
+		return 4
+	case x < 1<<35:
+		return 5
+	case x < 1<<42:
+		return 6
+	case x < 1<<49:
+		return 7
+	case x < 1<<56:
+		return 8
+	case x < 1<<63:
+		return 9
+	}
+	return 10
 }
 
 // EncodeFixed64 writes a 64-bit integer to the Buffer.
@@ -149,10 +150,6 @@ func (p *Buffer) EncodeFixed64(x uint64) error {
 	return nil
 }
 
-func sizeFixed64(x uint64) int {
-	return 8
-}
-
 // EncodeFixed32 writes a 32-bit integer to the Buffer.
 // This is the format for the
 // fixed32, sfixed32, and float protocol buffer types.
@@ -165,20 +162,12 @@ func (p *Buffer) EncodeFixed32(x uint64) error {
 	return nil
 }
 
-func sizeFixed32(x uint64) int {
-	return 4
-}
-
 // EncodeZigzag64 writes a zigzag-encoded 64-bit integer
 // to the Buffer.
 // This is the format used for the sint64 protocol buffer type.
 func (p *Buffer) EncodeZigzag64(x uint64) error {
 	// use signed number to get arithmetic right shift.
-	return p.EncodeVarint((x << 1) ^ uint64((int64(x) >> 63)))
-}
-
-func sizeZigzag64(x uint64) int {
-	return sizeVarint((x << 1) ^ uint64((int64(x) >> 63)))
+	return p.EncodeVarint(uint64((x << 1) ^ uint64((int64(x) >> 63))))
 }
 
 // EncodeZigzag32 writes a zigzag-encoded 32-bit integer
@@ -189,10 +178,6 @@ func (p *Buffer) EncodeZigzag32(x uint64) error {
 	return p.EncodeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
 }
 
-func sizeZigzag32(x uint64) int {
-	return sizeVarint(uint64((uint32(x) << 1) ^ uint32((int32(x) >> 31))))
-}
-
 // EncodeRawBytes writes a count-delimited byte buffer to the Buffer.
 // This is the format used for the bytes protocol buffer
 // type and for embedded messages.
@@ -202,11 +187,6 @@ func (p *Buffer) EncodeRawBytes(b []byte) error {
 	return nil
 }
 
-func sizeRawBytes(b []byte) int {
-	return sizeVarint(uint64(len(b))) +
-		len(b)
-}
-
 // EncodeStringBytes writes an encoded string to the Buffer.
 // This is the format used for the proto2 string type.
 func (p *Buffer) EncodeStringBytes(s string) error {
@@ -215,319 +195,17 @@ func (p *Buffer) EncodeStringBytes(s string) error {
 	return nil
 }
 
-func sizeStringBytes(s string) int {
-	return sizeVarint(uint64(len(s))) +
-		len(s)
-}
-
 // Marshaler is the interface representing objects that can marshal themselves.
 type Marshaler interface {
 	Marshal() ([]byte, error)
 }
 
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, returning the data.
-func Marshal(pb Message) ([]byte, error) {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		return m.Marshal()
-	}
-	p := NewBuffer(nil)
-	err := p.Marshal(pb)
-	if p.buf == nil && err == nil {
-		// Return a non-nil slice on success.
-		return []byte{}, nil
-	}
-	return p.buf, err
-}
-
 // EncodeMessage writes the protocol buffer to the Buffer,
 // prefixed by a varint-encoded length.
 func (p *Buffer) EncodeMessage(pb Message) error {
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		var state errorState
-		err = p.enc_len_struct(GetProperties(t.Elem()), base, &state)
-	}
-	return err
-}
-
-// Marshal takes the protocol buffer
-// and encodes it into the wire format, writing the result to the
-// Buffer.
-func (p *Buffer) Marshal(pb Message) error {
-	// Can the object marshal itself?
-	if m, ok := pb.(Marshaler); ok {
-		data, err := m.Marshal()
-		p.buf = append(p.buf, data...)
-		return err
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return ErrNil
-	}
-	if err == nil {
-		err = p.enc_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Encode++ // Parens are to work around a goimports bug.
-	}
-
-	if len(p.buf) > maxMarshalSize {
-		return ErrTooLarge
-	}
-	return err
-}
-
-// Size returns the encoded size of a protocol buffer.
-func Size(pb Message) (n int) {
-	// Can the object marshal itself?  If so, Size is slow.
-	// TODO: add Size to Marshaler, or add a Sizer interface.
-	if m, ok := pb.(Marshaler); ok {
-		b, _ := m.Marshal()
-		return len(b)
-	}
-
-	t, base, err := getbase(pb)
-	if structPointer_IsNil(base) {
-		return 0
-	}
-	if err == nil {
-		n = size_struct(GetProperties(t.Elem()), base)
-	}
-
-	if collectStats {
-		(stats).Size++ // Parens are to work around a goimports bug.
-	}
-
-	return
-}
-
-// Individual type encoders.
-
-// Encode a bool.
-func (o *Buffer) enc_bool(p *Properties, base structPointer) error {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := 0
-	if *v {
-		x = 1
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_bool(p *Properties, base structPointer) error {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, 1)
-	return nil
-}
-
-func size_bool(p *Properties, base structPointer) int {
-	v := *structPointer_Bool(base, p.field)
-	if v == nil {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-func size_proto3_bool(p *Properties, base structPointer) int {
-	v := *structPointer_BoolVal(base, p.field)
-	if !v && !p.oneof {
-		return 0
-	}
-	return len(p.tagcode) + 1 // each bool takes exactly one byte
-}
-
-// Encode an int32.
-func (o *Buffer) enc_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := int32(word32_Get(v)) // permit sign extension to use full 64-bit range
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_int32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := int32(word32Val_Get(v)) // permit sign extension to use full 64-bit range
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode a uint32.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return ErrNil
-	}
-	x := word32_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func (o *Buffer) enc_proto3_uint32(p *Properties, base structPointer) error {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, uint64(x))
-	return nil
-}
-
-func size_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32(base, p.field)
-	if word32_IsNil(v) {
-		return 0
-	}
-	x := word32_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-func size_proto3_uint32(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word32Val(base, p.field)
-	x := word32Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(uint64(x))
-	return
-}
-
-// Encode an int64.
-func (o *Buffer) enc_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return ErrNil
-	}
-	x := word64_Get(v)
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_int64(p *Properties, base structPointer) error {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	p.valEnc(o, x)
-	return nil
-}
-
-func size_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64(base, p.field)
-	if word64_IsNil(v) {
-		return 0
-	}
-	x := word64_Get(v)
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-func size_proto3_int64(p *Properties, base structPointer) (n int) {
-	v := structPointer_Word64Val(base, p.field)
-	x := word64Val_Get(v)
-	if x == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += p.valSize(x)
-	return
-}
-
-// Encode a string.
-func (o *Buffer) enc_string(p *Properties, base structPointer) error {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return ErrNil
-	}
-	x := *v
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(x)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_string(p *Properties, base structPointer) error {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeStringBytes(v)
-	return nil
-}
-
-func size_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_String(base, p.field)
-	if v == nil {
-		return 0
-	}
-	x := *v
-	n += len(p.tagcode)
-	n += sizeStringBytes(x)
-	return
-}
-
-func size_proto3_string(p *Properties, base structPointer) (n int) {
-	v := *structPointer_StringVal(base, p.field)
-	if v == "" && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeStringBytes(v)
-	return
+	siz := Size(pb)
+	p.EncodeVarint(uint64(siz))
+	return p.Marshal(pb)
 }
 
 // All protocol buffer fields are nillable, but be careful.
@@ -538,825 +216,3 @@ func isNil(v reflect.Value) bool {
 	}
 	return false
 }
-
-// Encode a message struct.
-func (o *Buffer) enc_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return ErrNil
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, err := m.Marshal()
-		if err != nil && !state.shouldContinue(err, nil) {
-			return err
-		}
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(data)
-		return state.err
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	return o.enc_len_struct(p.sprop, structp, &state)
-}
-
-func size_struct_message(p *Properties, base structPointer) int {
-	structp := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(structp) {
-		return 0
-	}
-
-	// Can the object marshal itself?
-	if p.isMarshaler {
-		m := structPointer_Interface(structp, p.stype).(Marshaler)
-		data, _ := m.Marshal()
-		n0 := len(p.tagcode)
-		n1 := sizeRawBytes(data)
-		return n0 + n1
-	}
-
-	n0 := len(p.tagcode)
-	n1 := size_struct(p.sprop, structp)
-	n2 := sizeVarint(uint64(n1)) // size of encoded length
-	return n0 + n1 + n2
-}
-
-// Encode a group struct.
-func (o *Buffer) enc_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return ErrNil
-	}
-
-	o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	err := o.enc_struct(p.sprop, b)
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return state.err
-}
-
-func size_struct_group(p *Properties, base structPointer) (n int) {
-	b := structPointer_GetStructPointer(base, p.field)
-	if structPointer_IsNil(b) {
-		return 0
-	}
-
-	n += sizeVarint(uint64((p.Tag << 3) | WireStartGroup))
-	n += size_struct(p.sprop, b)
-	n += sizeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	return
-}
-
-// Encode a slice of bools ([]bool).
-func (o *Buffer) enc_slice_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	for _, x := range s {
-		o.buf = append(o.buf, p.tagcode...)
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_bool(p *Properties, base structPointer) int {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	return l * (len(p.tagcode) + 1) // each bool takes exactly one byte
-}
-
-// Encode a slice of bools ([]bool) in packed format.
-func (o *Buffer) enc_slice_packed_bool(p *Properties, base structPointer) error {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(l)) // each bool takes exactly one byte
-	for _, x := range s {
-		v := uint64(0)
-		if x {
-			v = 1
-		}
-		p.valEnc(o, v)
-	}
-	return nil
-}
-
-func size_slice_packed_bool(p *Properties, base structPointer) (n int) {
-	s := *structPointer_BoolSlice(base, p.field)
-	l := len(s)
-	if l == 0 {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(l))
-	n += l // each bool takes exactly one byte
-	return
-}
-
-// Encode a slice of bytes ([]byte).
-func (o *Buffer) enc_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func (o *Buffer) enc_proto3_slice_byte(p *Properties, base structPointer) error {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 {
-		return ErrNil
-	}
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeRawBytes(s)
-	return nil
-}
-
-func size_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if s == nil && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-func size_proto3_slice_byte(p *Properties, base structPointer) (n int) {
-	s := *structPointer_Bytes(base, p.field)
-	if len(s) == 0 && !p.oneof {
-		return 0
-	}
-	n += len(p.tagcode)
-	n += sizeRawBytes(s)
-	return
-}
-
-// Encode a slice of int32s ([]int32).
-func (o *Buffer) enc_slice_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of int32s ([]int32) in packed format.
-func (o *Buffer) enc_slice_packed_int32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		p.valEnc(buf, uint64(x))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		x := int32(s.Index(i)) // permit sign extension to use full 64-bit range
-		bufSize += p.valSize(uint64(x))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of uint32s ([]uint32).
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		x := s.Index(i)
-		p.valEnc(o, uint64(x))
-	}
-	return nil
-}
-
-func size_slice_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		x := s.Index(i)
-		n += p.valSize(uint64(x))
-	}
-	return
-}
-
-// Encode a slice of uint32s ([]uint32) in packed format.
-// Exactly the same as int32, except for no sign extension.
-func (o *Buffer) enc_slice_packed_uint32(p *Properties, base structPointer) error {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, uint64(s.Index(i)))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_uint32(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word32Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(uint64(s.Index(i)))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of int64s ([]int64).
-func (o *Buffer) enc_slice_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		p.valEnc(o, s.Index(i))
-	}
-	return nil
-}
-
-func size_slice_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	for i := 0; i < l; i++ {
-		n += len(p.tagcode)
-		n += p.valSize(s.Index(i))
-	}
-	return
-}
-
-// Encode a slice of int64s ([]int64) in packed format.
-func (o *Buffer) enc_slice_packed_int64(p *Properties, base structPointer) error {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return ErrNil
-	}
-	// TODO: Reuse a Buffer.
-	buf := NewBuffer(nil)
-	for i := 0; i < l; i++ {
-		p.valEnc(buf, s.Index(i))
-	}
-
-	o.buf = append(o.buf, p.tagcode...)
-	o.EncodeVarint(uint64(len(buf.buf)))
-	o.buf = append(o.buf, buf.buf...)
-	return nil
-}
-
-func size_slice_packed_int64(p *Properties, base structPointer) (n int) {
-	s := structPointer_Word64Slice(base, p.field)
-	l := s.Len()
-	if l == 0 {
-		return 0
-	}
-	var bufSize int
-	for i := 0; i < l; i++ {
-		bufSize += p.valSize(s.Index(i))
-	}
-
-	n += len(p.tagcode)
-	n += sizeVarint(uint64(bufSize))
-	n += bufSize
-	return
-}
-
-// Encode a slice of slice of bytes ([][]byte).
-func (o *Buffer) enc_slice_slice_byte(p *Properties, base structPointer) error {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return ErrNil
-	}
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeRawBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_slice_byte(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_BytesSlice(base, p.field)
-	l := len(ss)
-	if l == 0 {
-		return 0
-	}
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeRawBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of strings ([]string).
-func (o *Buffer) enc_slice_string(p *Properties, base structPointer) error {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	for i := 0; i < l; i++ {
-		o.buf = append(o.buf, p.tagcode...)
-		o.EncodeStringBytes(ss[i])
-	}
-	return nil
-}
-
-func size_slice_string(p *Properties, base structPointer) (n int) {
-	ss := *structPointer_StringSlice(base, p.field)
-	l := len(ss)
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		n += sizeStringBytes(ss[i])
-	}
-	return
-}
-
-// Encode a slice of message structs ([]*struct).
-func (o *Buffer) enc_slice_struct_message(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return errRepeatedHasNil
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, err := m.Marshal()
-			if err != nil && !state.shouldContinue(err, nil) {
-				return err
-			}
-			o.buf = append(o.buf, p.tagcode...)
-			o.EncodeRawBytes(data)
-			continue
-		}
-
-		o.buf = append(o.buf, p.tagcode...)
-		err := o.enc_len_struct(p.sprop, structp, &state)
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-	}
-	return state.err
-}
-
-func size_slice_struct_message(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-	n += l * len(p.tagcode)
-	for i := 0; i < l; i++ {
-		structp := s.Index(i)
-		if structPointer_IsNil(structp) {
-			return // return the size up to this point
-		}
-
-		// Can the object marshal itself?
-		if p.isMarshaler {
-			m := structPointer_Interface(structp, p.stype).(Marshaler)
-			data, _ := m.Marshal()
-			n += sizeRawBytes(data)
-			continue
-		}
-
-		n0 := size_struct(p.sprop, structp)
-		n1 := sizeVarint(uint64(n0)) // size of encoded length
-		n += n0 + n1
-	}
-	return
-}
-
-// Encode a slice of group structs ([]*struct).
-func (o *Buffer) enc_slice_struct_group(p *Properties, base structPointer) error {
-	var state errorState
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return errRepeatedHasNil
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireStartGroup))
-
-		err := o.enc_struct(p.sprop, b)
-
-		if err != nil && !state.shouldContinue(err, nil) {
-			if err == ErrNil {
-				return errRepeatedHasNil
-			}
-			return err
-		}
-
-		o.EncodeVarint(uint64((p.Tag << 3) | WireEndGroup))
-	}
-	return state.err
-}
-
-func size_slice_struct_group(p *Properties, base structPointer) (n int) {
-	s := structPointer_StructPointerSlice(base, p.field)
-	l := s.Len()
-
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireStartGroup))
-	n += l * sizeVarint(uint64((p.Tag<<3)|WireEndGroup))
-	for i := 0; i < l; i++ {
-		b := s.Index(i)
-		if structPointer_IsNil(b) {
-			return // return size up to this point
-		}
-
-		n += size_struct(p.sprop, b)
-	}
-	return
-}
-
-// Encode an extension map.
-func (o *Buffer) enc_map(p *Properties, base structPointer) error {
-	exts := structPointer_ExtMap(base, p.field)
-	if err := encodeExtensionsMap(*exts); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(*exts)
-}
-
-func (o *Buffer) enc_exts(p *Properties, base structPointer) error {
-	exts := structPointer_Extensions(base, p.field)
-
-	v, mu := exts.extensionsRead()
-	if v == nil {
-		return nil
-	}
-
-	mu.Lock()
-	defer mu.Unlock()
-	if err := encodeExtensionsMap(v); err != nil {
-		return err
-	}
-
-	return o.enc_map_body(v)
-}
-
-func (o *Buffer) enc_map_body(v map[int32]Extension) error {
-	// Fast-path for common cases: zero or one extensions.
-	if len(v) <= 1 {
-		for _, e := range v {
-			o.buf = append(o.buf, e.enc...)
-		}
-		return nil
-	}
-
-	// Sort keys to provide a deterministic encoding.
-	keys := make([]int, 0, len(v))
-	for k := range v {
-		keys = append(keys, int(k))
-	}
-	sort.Ints(keys)
-
-	for _, k := range keys {
-		o.buf = append(o.buf, v[int32(k)].enc...)
-	}
-	return nil
-}
-
-func size_map(p *Properties, base structPointer) int {
-	v := structPointer_ExtMap(base, p.field)
-	return extensionsMapSize(*v)
-}
-
-func size_exts(p *Properties, base structPointer) int {
-	v := structPointer_Extensions(base, p.field)
-	return extensionsSize(v)
-}
-
-// Encode a map field.
-func (o *Buffer) enc_new_map(p *Properties, base structPointer) error {
-	var state errorState // XXX: or do we need to plumb this through?
-
-	/*
-		A map defined as
-			map<key_type, value_type> map_field = N;
-		is encoded in the same way as
-			message MapFieldEntry {
-				key_type key = 1;
-				value_type value = 2;
-			}
-			repeated MapFieldEntry map_field = N;
-	*/
-
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-	if v.Len() == 0 {
-		return nil
-	}
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	enc := func() error {
-		if err := p.mkeyprop.enc(o, p.mkeyprop, keybase); err != nil {
-			return err
-		}
-		if err := p.mvalprop.enc(o, p.mvalprop, valbase); err != nil && err != ErrNil {
-			return err
-		}
-		return nil
-	}
-
-	// Don't sort map keys. It is not required by the spec, and C++ doesn't do it.
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		o.buf = append(o.buf, p.tagcode...)
-		if err := o.enc_len_thing(enc, &state); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func size_new_map(p *Properties, base structPointer) int {
-	v := structPointer_NewAt(base, p.field, p.mtype).Elem() // map[K]V
-
-	keycopy, valcopy, keybase, valbase := mapEncodeScratch(p.mtype)
-
-	n := 0
-	for _, key := range v.MapKeys() {
-		val := v.MapIndex(key)
-		keycopy.Set(key)
-		valcopy.Set(val)
-
-		// Tag codes for key and val are the responsibility of the sub-sizer.
-		keysize := p.mkeyprop.size(p.mkeyprop, keybase)
-		valsize := p.mvalprop.size(p.mvalprop, valbase)
-		entry := keysize + valsize
-		// Add on tag code and length of map entry itself.
-		n += len(p.tagcode) + sizeVarint(uint64(entry)) + entry
-	}
-	return n
-}
-
-// mapEncodeScratch returns a new reflect.Value matching the map's value type,
-// and a structPointer suitable for passing to an encoder or sizer.
-func mapEncodeScratch(mapType reflect.Type) (keycopy, valcopy reflect.Value, keybase, valbase structPointer) {
-	// Prepare addressable doubly-indirect placeholders for the key and value types.
-	// This is needed because the element-type encoders expect **T, but the map iteration produces T.
-
-	keycopy = reflect.New(mapType.Key()).Elem()                 // addressable K
-	keyptr := reflect.New(reflect.PtrTo(keycopy.Type())).Elem() // addressable *K
-	keyptr.Set(keycopy.Addr())                                  //
-	keybase = toStructPointer(keyptr.Addr())                    // **K
-
-	// Value types are more varied and require special handling.
-	switch mapType.Elem().Kind() {
-	case reflect.Slice:
-		// []byte
-		var dummy []byte
-		valcopy = reflect.ValueOf(&dummy).Elem() // addressable []byte
-		valbase = toStructPointer(valcopy.Addr())
-	case reflect.Ptr:
-		// message; the generated field type is map[K]*Msg (so V is *Msg),
-		// so we only need one level of indirection.
-		valcopy = reflect.New(mapType.Elem()).Elem() // addressable V
-		valbase = toStructPointer(valcopy.Addr())
-	default:
-		// everything else
-		valcopy = reflect.New(mapType.Elem()).Elem()                // addressable V
-		valptr := reflect.New(reflect.PtrTo(valcopy.Type())).Elem() // addressable *V
-		valptr.Set(valcopy.Addr())                                  //
-		valbase = toStructPointer(valptr.Addr())                    // **V
-	}
-	return
-}
-
-// Encode a struct.
-func (o *Buffer) enc_struct(prop *StructProperties, base structPointer) error {
-	var state errorState
-	// Encode fields in tag order so that decoders may use optimizations
-	// that depend on the ordering.
-	// https://developers.google.com/protocol-buffers/docs/encoding#order
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.enc != nil {
-			err := p.enc(o, p, base)
-			if err != nil {
-				if err == ErrNil {
-					if p.Required && state.err == nil {
-						state.err = &RequiredNotSetError{p.Name}
-					}
-				} else if err == errRepeatedHasNil {
-					// Give more context to nil values in repeated fields.
-					return errors.New("repeated field " + p.OrigName + " has nil element")
-				} else if !state.shouldContinue(err, p) {
-					return err
-				}
-			}
-			if len(o.buf) > maxMarshalSize {
-				return ErrTooLarge
-			}
-		}
-	}
-
-	// Do oneof fields.
-	if prop.oneofMarshaler != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		if err := prop.oneofMarshaler(m, o); err == ErrNil {
-			return errOneofHasNil
-		} else if err != nil {
-			return err
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		if len(o.buf)+len(v) > maxMarshalSize {
-			return ErrTooLarge
-		}
-		if len(v) > 0 {
-			o.buf = append(o.buf, v...)
-		}
-	}
-
-	return state.err
-}
-
-func size_struct(prop *StructProperties, base structPointer) (n int) {
-	for _, i := range prop.order {
-		p := prop.Prop[i]
-		if p.size != nil {
-			n += p.size(p, base)
-		}
-	}
-
-	// Add unrecognized fields at the end.
-	if prop.unrecField.IsValid() {
-		v := *structPointer_Bytes(base, prop.unrecField)
-		n += len(v)
-	}
-
-	// Factor in any oneof fields.
-	if prop.oneofSizer != nil {
-		m := structPointer_Interface(base, prop.stype).(Message)
-		n += prop.oneofSizer(m)
-	}
-
-	return
-}
-
-var zeroes [20]byte // longer than any conceivable sizeVarint
-
-// Encode a struct, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_struct(prop *StructProperties, base structPointer, state *errorState) error {
-	return o.enc_len_thing(func() error { return o.enc_struct(prop, base) }, state)
-}
-
-// Encode something, preceded by its encoded length (as a varint).
-func (o *Buffer) enc_len_thing(enc func() error, state *errorState) error {
-	iLen := len(o.buf)
-	o.buf = append(o.buf, 0, 0, 0, 0) // reserve four bytes for length
-	iMsg := len(o.buf)
-	err := enc()
-	if err != nil && !state.shouldContinue(err, nil) {
-		return err
-	}
-	lMsg := len(o.buf) - iMsg
-	lLen := sizeVarint(uint64(lMsg))
-	switch x := lLen - (iMsg - iLen); {
-	case x > 0: // actual length is x bytes larger than the space we reserved
-		// Move msg x bytes right.
-		o.buf = append(o.buf, zeroes[:x]...)
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-	case x < 0: // actual length is x bytes smaller than the space we reserved
-		// Move msg x bytes left.
-		copy(o.buf[iMsg+x:], o.buf[iMsg:iMsg+lMsg])
-		o.buf = o.buf[:len(o.buf)+x] // x is negative
-	}
-	// Encode the length in the reserved space.
-	o.buf = o.buf[:iLen]
-	o.EncodeVarint(uint64(lMsg))
-	o.buf = o.buf[:len(o.buf)+lMsg]
-	return state.err
-}
-
-// errorState maintains the first error that occurs and updates that error
-// with additional context.
-type errorState struct {
-	err error
-}
-
-// shouldContinue reports whether encoding should continue upon encountering the
-// given error. If the error is RequiredNotSetError, shouldContinue returns true
-// and, if this is the first appearance of that error, remembers it for future
-// reporting.
-//
-// If prop is not nil, it may update any error with additional context about the
-// field with the error.
-func (s *errorState) shouldContinue(err error, prop *Properties) bool {
-	// Ignore unset required fields.
-	reqNotSet, ok := err.(*RequiredNotSetError)
-	if !ok {
-		return false
-	}
-	if s.err == nil {
-		if prop != nil {
-			err = &RequiredNotSetError{prop.Name + "." + reqNotSet.field}
-		}
-		s.err = err
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/encode_test.go b/installer/vendor/github.com/golang/protobuf/proto/encode_test.go
deleted file mode 100644
index a7209475f1..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/encode_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// +build go1.7
-
-package proto_test
-
-import (
-	"strconv"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	tpb "github.com/golang/protobuf/proto/proto3_proto"
-	"github.com/golang/protobuf/ptypes"
-)
-
-var (
-	blackhole []byte
-)
-
-// BenchmarkAny creates increasingly large arbitrary Any messages.  The type is always the
-// same.
-func BenchmarkAny(b *testing.B) {
-	data := make([]byte, 1<<20)
-	quantum := 1 << 10
-	for i := uint(0); i <= 10; i++ {
-		b.Run(strconv.Itoa(quantum<<i), func(b *testing.B) {
-			for k := 0; k < b.N; k++ {
-				inner := &tpb.Message{
-					Data: data[:quantum<<i],
-				}
-				outer, err := ptypes.MarshalAny(inner)
-				if err != nil {
-					b.Error("wrong encode", err)
-				}
-				raw, err := proto.Marshal(&tpb.Message{
-					Anything: outer,
-				})
-				if err != nil {
-					b.Error("wrong encode", err)
-				}
-				blackhole = raw
-			}
-		})
-	}
-}
-
-// BenchmarkEmpy measures the overhead of doing the minimal possible encode.
-func BenchmarkEmpy(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		raw, err := proto.Marshal(&tpb.Message{})
-		if err != nil {
-			b.Error("wrong encode", err)
-		}
-		blackhole = raw
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/equal.go b/installer/vendor/github.com/golang/protobuf/proto/equal.go
index 2ed1cf5966..d4db5a1c14 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/equal.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/equal.go
@@ -109,15 +109,6 @@ func equalStruct(v1, v2 reflect.Value) bool {
 				// set/unset mismatch
 				return false
 			}
-			b1, ok := f1.Interface().(raw)
-			if ok {
-				b2 := f2.Interface().(raw)
-				// RawMessage
-				if !bytes.Equal(b1.Bytes(), b2.Bytes()) {
-					return false
-				}
-				continue
-			}
 			f1, f2 = f1.Elem(), f2.Elem()
 		}
 		if !equalAny(f1, f2, sprop.Prop[i]) {
@@ -146,11 +137,7 @@ func equalStruct(v1, v2 reflect.Value) bool {
 
 	u1 := uf.Bytes()
 	u2 := v2.FieldByName("XXX_unrecognized").Bytes()
-	if !bytes.Equal(u1, u2) {
-		return false
-	}
-
-	return true
+	return bytes.Equal(u1, u2)
 }
 
 // v1 and v2 are known to have the same type.
@@ -261,6 +248,15 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 
 		m1, m2 := e1.value, e2.value
 
+		if m1 == nil && m2 == nil {
+			// Both have only encoded form.
+			if bytes.Equal(e1.enc, e2.enc) {
+				continue
+			}
+			// The bytes are different, but the extensions might still be
+			// equal. We need to decode them to compare.
+		}
+
 		if m1 != nil && m2 != nil {
 			// Both are unencoded.
 			if !equalAny(reflect.ValueOf(m1), reflect.ValueOf(m2), nil) {
@@ -276,8 +272,12 @@ func equalExtMap(base reflect.Type, em1, em2 map[int32]Extension) bool {
 			desc = m[extNum]
 		}
 		if desc == nil {
+			// If both have only encoded form and the bytes are the same,
+			// it is handled above. We get here when the bytes are different.
+			// We don't know how to decode it, so just compare them as byte
+			// slices.
 			log.Printf("proto: don't know how to compare extension %d of %v", extNum, base)
-			continue
+			return false
 		}
 		var err error
 		if m1 == nil {
diff --git a/installer/vendor/github.com/golang/protobuf/proto/equal_test.go b/installer/vendor/github.com/golang/protobuf/proto/equal_test.go
deleted file mode 100644
index a2febb391c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/equal_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-// Four identical base messages.
-// The init function adds extensions to some of them.
-var messageWithoutExtension = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1a = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension1b = &pb.MyMessage{Count: Int32(7)}
-var messageWithExtension2 = &pb.MyMessage{Count: Int32(7)}
-
-// Two messages with non-message extensions.
-var messageWithInt32Extension1 = &pb.MyMessage{Count: Int32(8)}
-var messageWithInt32Extension2 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	ext1 := &pb.Ext{Data: String("Kirk")}
-	ext2 := &pb.Ext{Data: String("Picard")}
-
-	// messageWithExtension1a has ext1, but never marshals it.
-	if err := SetExtension(messageWithExtension1a, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1a failed: " + err.Error())
-	}
-
-	// messageWithExtension1b is the unmarshaled form of messageWithExtension1a.
-	if err := SetExtension(messageWithExtension1b, pb.E_Ext_More, ext1); err != nil {
-		panic("SetExtension on 1b failed: " + err.Error())
-	}
-	buf, err := Marshal(messageWithExtension1b)
-	if err != nil {
-		panic("Marshal of 1b failed: " + err.Error())
-	}
-	messageWithExtension1b.Reset()
-	if err := Unmarshal(buf, messageWithExtension1b); err != nil {
-		panic("Unmarshal of 1b failed: " + err.Error())
-	}
-
-	// messageWithExtension2 has ext2.
-	if err := SetExtension(messageWithExtension2, pb.E_Ext_More, ext2); err != nil {
-		panic("SetExtension on 2 failed: " + err.Error())
-	}
-
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(23)); err != nil {
-		panic("SetExtension on Int32-1 failed: " + err.Error())
-	}
-	if err := SetExtension(messageWithInt32Extension1, pb.E_Ext_Number, Int32(24)); err != nil {
-		panic("SetExtension on Int32-2 failed: " + err.Error())
-	}
-}
-
-var EqualTests = []struct {
-	desc string
-	a, b Message
-	exp  bool
-}{
-	{"different types", &pb.GoEnum{}, &pb.GoTestField{}, false},
-	{"equal empty", &pb.GoEnum{}, &pb.GoEnum{}, true},
-	{"nil vs nil", nil, nil, true},
-	{"typed nil vs typed nil", (*pb.GoEnum)(nil), (*pb.GoEnum)(nil), true},
-	{"typed nil vs empty", (*pb.GoEnum)(nil), &pb.GoEnum{}, false},
-	{"different typed nil", (*pb.GoEnum)(nil), (*pb.GoTestField)(nil), false},
-
-	{"one set field, one unset field", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{}, false},
-	{"one set field zero, one unset field", &pb.GoTest{Param: Int32(0)}, &pb.GoTest{}, false},
-	{"different set fields", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("bar")}, false},
-	{"equal set", &pb.GoTestField{Label: String("foo")}, &pb.GoTestField{Label: String("foo")}, true},
-
-	{"repeated, one set", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{}, false},
-	{"repeated, different length", &pb.GoTest{F_Int32Repeated: []int32{2, 3}}, &pb.GoTest{F_Int32Repeated: []int32{2}}, false},
-	{"repeated, different value", &pb.GoTest{F_Int32Repeated: []int32{2}}, &pb.GoTest{F_Int32Repeated: []int32{3}}, false},
-	{"repeated, equal", &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, &pb.GoTest{F_Int32Repeated: []int32{2, 4}}, true},
-	{"repeated, nil equal nil", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: nil}, true},
-	{"repeated, nil equal empty", &pb.GoTest{F_Int32Repeated: nil}, &pb.GoTest{F_Int32Repeated: []int32{}}, true},
-	{"repeated, empty equal nil", &pb.GoTest{F_Int32Repeated: []int32{}}, &pb.GoTest{F_Int32Repeated: nil}, true},
-
-	{
-		"nested, different",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("foo")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("bar")}},
-		false,
-	},
-	{
-		"nested, equal",
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		&pb.GoTest{RequiredField: &pb.GoTestField{Label: String("wow")}},
-		true,
-	},
-
-	{"bytes", &pb.OtherMessage{Value: []byte("foo")}, &pb.OtherMessage{Value: []byte("foo")}, true},
-	{"bytes, empty", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: []byte{}}, true},
-	{"bytes, empty vs nil", &pb.OtherMessage{Value: []byte{}}, &pb.OtherMessage{Value: nil}, false},
-	{
-		"repeated bytes",
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		&pb.MyMessage{RepBytes: [][]byte{[]byte("sham"), []byte("wow")}},
-		true,
-	},
-	// In proto3, []byte{} and []byte(nil) are equal.
-	{"proto3 bytes, empty vs nil", &proto3pb.Message{Data: []byte{}}, &proto3pb.Message{Data: nil}, true},
-
-	{"extension vs. no extension", messageWithoutExtension, messageWithExtension1a, false},
-	{"extension vs. same extension", messageWithExtension1a, messageWithExtension1b, true},
-	{"extension vs. different extension", messageWithExtension1a, messageWithExtension2, false},
-
-	{"int32 extension vs. itself", messageWithInt32Extension1, messageWithInt32Extension1, true},
-	{"int32 extension vs. a different int32", messageWithInt32Extension1, messageWithInt32Extension2, false},
-
-	{
-		"message with group",
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		&pb.MyMessage{
-			Count: Int32(1),
-			Somegroup: &pb.MyMessage_SomeGroup{
-				GroupField: Int32(5),
-			},
-		},
-		true,
-	},
-
-	{
-		"map same",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		true,
-	},
-	{
-		"map different entry",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Rob"}},
-		false,
-	},
-	{
-		"map different key only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Ken"}},
-		false,
-	},
-	{
-		"map different value only",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob"}},
-		false,
-	},
-	{
-		"zero-length maps same",
-		&pb.MessageWithMap{NameMapping: map[int32]string{}},
-		&pb.MessageWithMap{NameMapping: nil},
-		true,
-	},
-	{
-		"orders in map don't matter",
-		&pb.MessageWithMap{NameMapping: map[int32]string{1: "Ken", 2: "Rob"}},
-		&pb.MessageWithMap{NameMapping: map[int32]string{2: "Rob", 1: "Ken"}},
-		true,
-	},
-	{
-		"oneof same",
-		&pb.Communique{Union: &pb.Communique_Number{41}},
-		&pb.Communique{Union: &pb.Communique_Number{41}},
-		true,
-	},
-	{
-		"oneof one nil",
-		&pb.Communique{Union: &pb.Communique_Number{41}},
-		&pb.Communique{},
-		false,
-	},
-	{
-		"oneof different",
-		&pb.Communique{Union: &pb.Communique_Number{41}},
-		&pb.Communique{Union: &pb.Communique_Name{"Bobby Tables"}},
-		false,
-	},
-}
-
-func TestEqual(t *testing.T) {
-	for _, tc := range EqualTests {
-		if res := Equal(tc.a, tc.b); res != tc.exp {
-			t.Errorf("%v: Equal(%v, %v) = %v, want %v", tc.desc, tc.a, tc.b, res, tc.exp)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/extensions.go b/installer/vendor/github.com/golang/protobuf/proto/extensions.go
index eaad218312..816a3b9d6c 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/extensions.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/extensions.go
@@ -38,6 +38,7 @@ package proto
 import (
 	"errors"
 	"fmt"
+	"io"
 	"reflect"
 	"strconv"
 	"sync"
@@ -91,14 +92,29 @@ func (n notLocker) Unlock() {}
 // extendable returns the extendableProto interface for the given generated proto message.
 // If the proto message has the old extension format, it returns a wrapper that implements
 // the extendableProto interface.
-func extendable(p interface{}) (extendableProto, bool) {
-	if ep, ok := p.(extendableProto); ok {
-		return ep, ok
-	}
-	if ep, ok := p.(extendableProtoV1); ok {
-		return extensionAdapter{ep}, ok
+func extendable(p interface{}) (extendableProto, error) {
+	switch p := p.(type) {
+	case extendableProto:
+		if isNilPtr(p) {
+			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
+		}
+		return p, nil
+	case extendableProtoV1:
+		if isNilPtr(p) {
+			return nil, fmt.Errorf("proto: nil %T is not extendable", p)
+		}
+		return extensionAdapter{p}, nil
 	}
-	return nil, false
+	// Don't allocate a specific error containing %T:
+	// this is the hot path for Clone and MarshalText.
+	return nil, errNotExtendable
+}
+
+var errNotExtendable = errors.New("proto: not an extendable proto.Message")
+
+func isNilPtr(x interface{}) bool {
+	v := reflect.ValueOf(x)
+	return v.Kind() == reflect.Ptr && v.IsNil()
 }
 
 // XXX_InternalExtensions is an internal representation of proto extensions.
@@ -143,9 +159,6 @@ func (e *XXX_InternalExtensions) extensionsRead() (map[int32]Extension, sync.Loc
 	return e.p.extensionMap, &e.p.mu
 }
 
-var extendableProtoType = reflect.TypeOf((*extendableProto)(nil)).Elem()
-var extendableProtoV1Type = reflect.TypeOf((*extendableProtoV1)(nil)).Elem()
-
 // ExtensionDesc represents an extension specification.
 // Used in generated code from the protocol compiler.
 type ExtensionDesc struct {
@@ -179,8 +192,8 @@ type Extension struct {
 
 // SetRawExtension is for testing only.
 func SetRawExtension(base Message, id int32, b []byte) {
-	epb, ok := extendable(base)
-	if !ok {
+	epb, err := extendable(base)
+	if err != nil {
 		return
 	}
 	extmap := epb.extensionsWrite()
@@ -205,7 +218,7 @@ func checkExtensionTypes(pb extendableProto, extension *ExtensionDesc) error {
 		pbi = ea.extendableProtoV1
 	}
 	if a, b := reflect.TypeOf(pbi), reflect.TypeOf(extension.ExtendedType); a != b {
-		return errors.New("proto: bad extended type; " + b.String() + " does not extend " + a.String())
+		return fmt.Errorf("proto: bad extended type; %v does not extend %v", b, a)
 	}
 	// Check the range.
 	if !isExtensionField(pb, extension.Field) {
@@ -250,85 +263,11 @@ func extensionProperties(ed *ExtensionDesc) *Properties {
 	return prop
 }
 
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensions(e *XXX_InternalExtensions) error {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return nil // fast path
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return encodeExtensionsMap(m)
-}
-
-// encode encodes any unmarshaled (unencoded) extensions in e.
-func encodeExtensionsMap(m map[int32]Extension) error {
-	for k, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		p := NewBuffer(nil)
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		if err := props.enc(p, props, toStructPointer(x)); err != nil {
-			return err
-		}
-		e.enc = p.buf
-		m[k] = e
-	}
-	return nil
-}
-
-func extensionsSize(e *XXX_InternalExtensions) (n int) {
-	m, mu := e.extensionsRead()
-	if m == nil {
-		return 0
-	}
-	mu.Lock()
-	defer mu.Unlock()
-	return extensionsMapSize(m)
-}
-
-func extensionsMapSize(m map[int32]Extension) (n int) {
-	for _, e := range m {
-		if e.value == nil || e.desc == nil {
-			// Extension is only in its encoded form.
-			n += len(e.enc)
-			continue
-		}
-
-		// We don't skip extensions that have an encoded form set,
-		// because the extension value may have been mutated after
-		// the last time this function was called.
-
-		et := reflect.TypeOf(e.desc.ExtensionType)
-		props := extensionProperties(e.desc)
-
-		// If e.value has type T, the encoder expects a *struct{ X T }.
-		// Pass a *T with a zero field and hope it all works out.
-		x := reflect.New(et)
-		x.Elem().Set(reflect.ValueOf(e.value))
-		n += props.size(props, toStructPointer(x))
-	}
-	return
-}
-
 // HasExtension returns whether the given extension is present in pb.
 func HasExtension(pb Message, extension *ExtensionDesc) bool {
 	// TODO: Check types, field numbers, etc.?
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return false
 	}
 	extmap, mu := epb.extensionsRead()
@@ -336,15 +275,15 @@ func HasExtension(pb Message, extension *ExtensionDesc) bool {
 		return false
 	}
 	mu.Lock()
-	_, ok = extmap[extension.Field]
+	_, ok := extmap[extension.Field]
 	mu.Unlock()
 	return ok
 }
 
 // ClearExtension removes the given extension from pb.
 func ClearExtension(pb Message, extension *ExtensionDesc) {
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return
 	}
 	// TODO: Check types, field numbers, etc.?
@@ -352,16 +291,26 @@ func ClearExtension(pb Message, extension *ExtensionDesc) {
 	delete(extmap, extension.Field)
 }
 
-// GetExtension parses and returns the given extension of pb.
-// If the extension is not present and has no default value it returns ErrMissingExtension.
+// GetExtension retrieves a proto2 extended field from pb.
+//
+// If the descriptor is type complete (i.e., ExtensionDesc.ExtensionType is non-nil),
+// then GetExtension parses the encoded field and returns a Go value of the specified type.
+// If the field is not present, then the default value is returned (if one is specified),
+// otherwise ErrMissingExtension is reported.
+//
+// If the descriptor is not type complete (i.e., ExtensionDesc.ExtensionType is nil),
+// then GetExtension returns the raw encoded bytes of the field extension.
 func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 
-	if err := checkExtensionTypes(epb, extension); err != nil {
-		return nil, err
+	if extension.ExtendedType != nil {
+		// can only check type if this is a complete descriptor
+		if err := checkExtensionTypes(epb, extension); err != nil {
+			return nil, err
+		}
 	}
 
 	emap, mu := epb.extensionsRead()
@@ -388,6 +337,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 		return e.value, nil
 	}
 
+	if extension.ExtensionType == nil {
+		// incomplete descriptor
+		return e.enc, nil
+	}
+
 	v, err := decodeExtension(e.enc, extension)
 	if err != nil {
 		return nil, err
@@ -405,6 +359,11 @@ func GetExtension(pb Message, extension *ExtensionDesc) (interface{}, error) {
 // defaultExtensionValue returns the default value for extension.
 // If no default for an extension is defined ErrMissingExtension is returned.
 func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
+	if extension.ExtensionType == nil {
+		// incomplete descriptor, so no default
+		return nil, ErrMissingExtension
+	}
+
 	t := reflect.TypeOf(extension.ExtensionType)
 	props := extensionProperties(extension)
 
@@ -439,31 +398,28 @@ func defaultExtensionValue(extension *ExtensionDesc) (interface{}, error) {
 
 // decodeExtension decodes an extension encoded in b.
 func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
-	o := NewBuffer(b)
-
 	t := reflect.TypeOf(extension.ExtensionType)
-
-	props := extensionProperties(extension)
+	unmarshal := typeUnmarshaler(t, extension.Tag)
 
 	// t is a pointer to a struct, pointer to basic type or a slice.
-	// Allocate a "field" to store the pointer/slice itself; the
-	// pointer/slice will be stored here. We pass
-	// the address of this field to props.dec.
-	// This passes a zero field and a *t and lets props.dec
-	// interpret it as a *struct{ x t }.
+	// Allocate space to store the pointer/slice.
 	value := reflect.New(t).Elem()
 
+	var err error
 	for {
-		// Discard wire type and field number varint. It isn't needed.
-		if _, err := o.DecodeVarint(); err != nil {
-			return nil, err
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
 		}
+		b = b[n:]
+		wire := int(x) & 7
 
-		if err := props.dec(o, props, toStructPointer(value.Addr())); err != nil {
+		b, err = unmarshal(b, valToPointer(value.Addr()), wire)
+		if err != nil {
 			return nil, err
 		}
 
-		if o.index >= len(o.buf) {
+		if len(b) == 0 {
 			break
 		}
 	}
@@ -473,9 +429,9 @@ func decodeExtension(b []byte, extension *ExtensionDesc) (interface{}, error) {
 // GetExtensions returns a slice of the extensions present in pb that are also listed in es.
 // The returned slice has the same length as es; missing extensions will appear as nil elements.
 func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, err error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 	extensions = make([]interface{}, len(es))
 	for i, e := range es {
@@ -494,9 +450,9 @@ func GetExtensions(pb Message, es []*ExtensionDesc) (extensions []interface{}, e
 // For non-registered extensions, ExtensionDescs returns an incomplete descriptor containing
 // just the Field field, which defines the extension's field number.
 func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
-	epb, ok := extendable(pb)
-	if !ok {
-		return nil, fmt.Errorf("proto: %T is not an extendable proto.Message", pb)
+	epb, err := extendable(pb)
+	if err != nil {
+		return nil, err
 	}
 	registeredExtensions := RegisteredExtensions(pb)
 
@@ -523,9 +479,9 @@ func ExtensionDescs(pb Message) ([]*ExtensionDesc, error) {
 
 // SetExtension sets the specified extension of pb to the specified value.
 func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error {
-	epb, ok := extendable(pb)
-	if !ok {
-		return errors.New("proto: not an extendable proto")
+	epb, err := extendable(pb)
+	if err != nil {
+		return err
 	}
 	if err := checkExtensionTypes(epb, extension); err != nil {
 		return err
@@ -550,8 +506,8 @@ func SetExtension(pb Message, extension *ExtensionDesc, value interface{}) error
 
 // ClearAllExtensions clears all extensions from pb.
 func ClearAllExtensions(pb Message) {
-	epb, ok := extendable(pb)
-	if !ok {
+	epb, err := extendable(pb)
+	if err != nil {
 		return
 	}
 	m := epb.extensionsWrite()
diff --git a/installer/vendor/github.com/golang/protobuf/proto/extensions_test.go b/installer/vendor/github.com/golang/protobuf/proto/extensions_test.go
deleted file mode 100644
index b6d9114c56..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/extensions_test.go
+++ /dev/null
@@ -1,536 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-	"golang.org/x/sync/errgroup"
-)
-
-func TestGetExtensionsWithMissingExtensions(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Fatalf("Could not set ext1: %s", err)
-	}
-	exts, err := proto.GetExtensions(msg, []*proto.ExtensionDesc{
-		pb.E_Ext_More,
-		pb.E_Ext_Text,
-	})
-	if err != nil {
-		t.Fatalf("GetExtensions() failed: %s", err)
-	}
-	if exts[0] != ext1 {
-		t.Errorf("ext1 not in returned extensions: %T %v", exts[0], exts[0])
-	}
-	if exts[1] != nil {
-		t.Errorf("ext2 in returned extensions: %T %v", exts[1], exts[1])
-	}
-}
-
-func TestExtensionDescsWithMissingExtensions(t *testing.T) {
-	msg := &pb.MyMessage{Count: proto.Int32(0)}
-	extdesc1 := pb.E_Ext_More
-	if descs, err := proto.ExtensionDescs(msg); len(descs) != 0 || err != nil {
-		t.Errorf("proto.ExtensionDescs: got %d descs, error %v; want 0, nil", len(descs), err)
-	}
-
-	ext1 := &pb.Ext{}
-	if err := proto.SetExtension(msg, extdesc1, ext1); err != nil {
-		t.Fatalf("Could not set ext1: %s", err)
-	}
-	extdesc2 := &proto.ExtensionDesc{
-		ExtendedType:  (*pb.MyMessage)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         123456789,
-		Name:          "a.b",
-		Tag:           "varint,123456789,opt",
-	}
-	ext2 := proto.Bool(false)
-	if err := proto.SetExtension(msg, extdesc2, ext2); err != nil {
-		t.Fatalf("Could not set ext2: %s", err)
-	}
-
-	b, err := proto.Marshal(msg)
-	if err != nil {
-		t.Fatalf("Could not marshal msg: %v", err)
-	}
-	if err := proto.Unmarshal(b, msg); err != nil {
-		t.Fatalf("Could not unmarshal into msg: %v", err)
-	}
-
-	descs, err := proto.ExtensionDescs(msg)
-	if err != nil {
-		t.Fatalf("proto.ExtensionDescs: got error %v", err)
-	}
-	sortExtDescs(descs)
-	wantDescs := []*proto.ExtensionDesc{extdesc1, &proto.ExtensionDesc{Field: extdesc2.Field}}
-	if !reflect.DeepEqual(descs, wantDescs) {
-		t.Errorf("proto.ExtensionDescs(msg) sorted extension ids: got %+v, want %+v", descs, wantDescs)
-	}
-}
-
-type ExtensionDescSlice []*proto.ExtensionDesc
-
-func (s ExtensionDescSlice) Len() int           { return len(s) }
-func (s ExtensionDescSlice) Less(i, j int) bool { return s[i].Field < s[j].Field }
-func (s ExtensionDescSlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-
-func sortExtDescs(s []*proto.ExtensionDesc) {
-	sort.Sort(ExtensionDescSlice(s))
-}
-
-func TestGetExtensionStability(t *testing.T) {
-	check := func(m *pb.MyMessage) bool {
-		ext1, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		ext2, err := proto.GetExtension(m, pb.E_Ext_More)
-		if err != nil {
-			t.Fatalf("GetExtension() failed: %s", err)
-		}
-		return ext1 == ext2
-	}
-	msg := &pb.MyMessage{Count: proto.Int32(4)}
-	ext0 := &pb.Ext{}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext0); err != nil {
-		t.Fatalf("Could not set ext1: %s", ext0)
-	}
-	if !check(msg) {
-		t.Errorf("GetExtension() not stable before marshaling")
-	}
-	bb, err := proto.Marshal(msg)
-	if err != nil {
-		t.Fatalf("Marshal() failed: %s", err)
-	}
-	msg1 := &pb.MyMessage{}
-	err = proto.Unmarshal(bb, msg1)
-	if err != nil {
-		t.Fatalf("Unmarshal() failed: %s", err)
-	}
-	if !check(msg1) {
-		t.Errorf("GetExtension() not stable after unmarshaling")
-	}
-}
-
-func TestGetExtensionDefaults(t *testing.T) {
-	var setFloat64 float64 = 1
-	var setFloat32 float32 = 2
-	var setInt32 int32 = 3
-	var setInt64 int64 = 4
-	var setUint32 uint32 = 5
-	var setUint64 uint64 = 6
-	var setBool = true
-	var setBool2 = false
-	var setString = "Goodnight string"
-	var setBytes = []byte("Goodnight bytes")
-	var setEnum = pb.DefaultsMessage_TWO
-
-	type testcase struct {
-		ext  *proto.ExtensionDesc // Extension we are testing.
-		want interface{}          // Expected value of extension, or nil (meaning that GetExtension will fail).
-		def  interface{}          // Expected value of extension after ClearExtension().
-	}
-	tests := []testcase{
-		{pb.E_NoDefaultDouble, setFloat64, nil},
-		{pb.E_NoDefaultFloat, setFloat32, nil},
-		{pb.E_NoDefaultInt32, setInt32, nil},
-		{pb.E_NoDefaultInt64, setInt64, nil},
-		{pb.E_NoDefaultUint32, setUint32, nil},
-		{pb.E_NoDefaultUint64, setUint64, nil},
-		{pb.E_NoDefaultSint32, setInt32, nil},
-		{pb.E_NoDefaultSint64, setInt64, nil},
-		{pb.E_NoDefaultFixed32, setUint32, nil},
-		{pb.E_NoDefaultFixed64, setUint64, nil},
-		{pb.E_NoDefaultSfixed32, setInt32, nil},
-		{pb.E_NoDefaultSfixed64, setInt64, nil},
-		{pb.E_NoDefaultBool, setBool, nil},
-		{pb.E_NoDefaultBool, setBool2, nil},
-		{pb.E_NoDefaultString, setString, nil},
-		{pb.E_NoDefaultBytes, setBytes, nil},
-		{pb.E_NoDefaultEnum, setEnum, nil},
-		{pb.E_DefaultDouble, setFloat64, float64(3.1415)},
-		{pb.E_DefaultFloat, setFloat32, float32(3.14)},
-		{pb.E_DefaultInt32, setInt32, int32(42)},
-		{pb.E_DefaultInt64, setInt64, int64(43)},
-		{pb.E_DefaultUint32, setUint32, uint32(44)},
-		{pb.E_DefaultUint64, setUint64, uint64(45)},
-		{pb.E_DefaultSint32, setInt32, int32(46)},
-		{pb.E_DefaultSint64, setInt64, int64(47)},
-		{pb.E_DefaultFixed32, setUint32, uint32(48)},
-		{pb.E_DefaultFixed64, setUint64, uint64(49)},
-		{pb.E_DefaultSfixed32, setInt32, int32(50)},
-		{pb.E_DefaultSfixed64, setInt64, int64(51)},
-		{pb.E_DefaultBool, setBool, true},
-		{pb.E_DefaultBool, setBool2, true},
-		{pb.E_DefaultString, setString, "Hello, string"},
-		{pb.E_DefaultBytes, setBytes, []byte("Hello, bytes")},
-		{pb.E_DefaultEnum, setEnum, pb.DefaultsMessage_ONE},
-	}
-
-	checkVal := func(test testcase, msg *pb.DefaultsMessage, valWant interface{}) error {
-		val, err := proto.GetExtension(msg, test.ext)
-		if err != nil {
-			if valWant != nil {
-				return fmt.Errorf("GetExtension(): %s", err)
-			}
-			if want := proto.ErrMissingExtension; err != want {
-				return fmt.Errorf("Unexpected error: got %v, want %v", err, want)
-			}
-			return nil
-		}
-
-		// All proto2 extension values are either a pointer to a value or a slice of values.
-		ty := reflect.TypeOf(val)
-		tyWant := reflect.TypeOf(test.ext.ExtensionType)
-		if got, want := ty, tyWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf(): got %v want %v", got, want)
-		}
-		tye := ty.Elem()
-		tyeWant := tyWant.Elem()
-		if got, want := tye, tyeWant; got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem(): got %v want %v", got, want)
-		}
-
-		// Check the name of the type of the value.
-		// If it is an enum it will be type int32 with the name of the enum.
-		if got, want := tye.Name(), tye.Name(); got != want {
-			return fmt.Errorf("unexpected reflect.TypeOf().Elem().Name(): got %v want %v", got, want)
-		}
-
-		// Check that value is what we expect.
-		// If we have a pointer in val, get the value it points to.
-		valExp := val
-		if ty.Kind() == reflect.Ptr {
-			valExp = reflect.ValueOf(val).Elem().Interface()
-		}
-		if got, want := valExp, valWant; !reflect.DeepEqual(got, want) {
-			return fmt.Errorf("unexpected reflect.DeepEqual(): got %v want %v", got, want)
-		}
-
-		return nil
-	}
-
-	setTo := func(test testcase) interface{} {
-		setTo := reflect.ValueOf(test.want)
-		if typ := reflect.TypeOf(test.ext.ExtensionType); typ.Kind() == reflect.Ptr {
-			setTo = reflect.New(typ).Elem()
-			setTo.Set(reflect.New(setTo.Type().Elem()))
-			setTo.Elem().Set(reflect.ValueOf(test.want))
-		}
-		return setTo.Interface()
-	}
-
-	for _, test := range tests {
-		msg := &pb.DefaultsMessage{}
-		name := test.ext.Name
-
-		// Check the initial value.
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-
-		// Set the per-type value and check value.
-		name = fmt.Sprintf("%s (set to %T %v)", name, test.want, test.want)
-		if err := proto.SetExtension(msg, test.ext, setTo(test)); err != nil {
-			t.Errorf("%s: SetExtension(): %v", name, err)
-			continue
-		}
-		if err := checkVal(test, msg, test.want); err != nil {
-			t.Errorf("%s: %v", name, err)
-			continue
-		}
-
-		// Set and check the value.
-		name += " (cleared)"
-		proto.ClearExtension(msg, test.ext)
-		if err := checkVal(test, msg, test.def); err != nil {
-			t.Errorf("%s: %v", name, err)
-		}
-	}
-}
-
-func TestExtensionsRoundTrip(t *testing.T) {
-	msg := &pb.MyMessage{}
-	ext1 := &pb.Ext{
-		Data: proto.String("hi"),
-	}
-	ext2 := &pb.Ext{
-		Data: proto.String("there"),
-	}
-	exists := proto.HasExtension(msg, pb.E_Ext_More)
-	if exists {
-		t.Error("Extension More present unexpectedly")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext1); err != nil {
-		t.Error(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext2); err != nil {
-		t.Error(err)
-	}
-	e, err := proto.GetExtension(msg, pb.E_Ext_More)
-	if err != nil {
-		t.Error(err)
-	}
-	x, ok := e.(*pb.Ext)
-	if !ok {
-		t.Errorf("e has type %T, expected testdata.Ext", e)
-	} else if *x.Data != "there" {
-		t.Errorf("SetExtension failed to overwrite, got %+v, not 'there'", x)
-	}
-	proto.ClearExtension(msg, pb.E_Ext_More)
-	if _, err = proto.GetExtension(msg, pb.E_Ext_More); err != proto.ErrMissingExtension {
-		t.Errorf("got %v, expected ErrMissingExtension", e)
-	}
-	if _, err := proto.GetExtension(msg, pb.E_X215); err == nil {
-		t.Error("expected bad extension error, got nil")
-	}
-	if err := proto.SetExtension(msg, pb.E_X215, 12); err == nil {
-		t.Error("expected extension err")
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, 12); err == nil {
-		t.Error("expected some sort of type mismatch error, got nil")
-	}
-}
-
-func TestNilExtension(t *testing.T) {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(1),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_Text, proto.String("hello")); err != nil {
-		t.Fatal(err)
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, (*pb.Ext)(nil)); err == nil {
-		t.Error("expected SetExtension to fail due to a nil extension")
-	} else if want := "proto: SetExtension called with nil value of type *testdata.Ext"; err.Error() != want {
-		t.Errorf("expected error %v, got %v", want, err)
-	}
-	// Note: if the behavior of Marshal is ever changed to ignore nil extensions, update
-	// this test to verify that E_Ext_Text is properly propagated through marshal->unmarshal.
-}
-
-func TestMarshalUnmarshalRepeatedExtension(t *testing.T) {
-	// Add a repeated extension to the result.
-	tests := []struct {
-		name string
-		ext  []*pb.ComplexExtension
-	}{
-		{
-			"two fields",
-			[]*pb.ComplexExtension{
-				{First: proto.Int32(7)},
-				{Second: proto.Int32(11)},
-			},
-		},
-		{
-			"repeated field",
-			[]*pb.ComplexExtension{
-				{Third: []int32{1000}},
-				{Third: []int32{2000}},
-			},
-		},
-		{
-			"two fields and repeated field",
-			[]*pb.ComplexExtension{
-				{Third: []int32{1000}},
-				{First: proto.Int32(9)},
-				{Second: proto.Int32(21)},
-				{Third: []int32{2000}},
-			},
-		},
-	}
-	for _, test := range tests {
-		// Marshal message with a repeated extension.
-		msg1 := new(pb.OtherMessage)
-		err := proto.SetExtension(msg1, pb.E_RComplex, test.ext)
-		if err != nil {
-			t.Fatalf("[%s] Error setting extension: %v", test.name, err)
-		}
-		b, err := proto.Marshal(msg1)
-		if err != nil {
-			t.Fatalf("[%s] Error marshaling message: %v", test.name, err)
-		}
-
-		// Unmarshal and read the merged proto.
-		msg2 := new(pb.OtherMessage)
-		err = proto.Unmarshal(b, msg2)
-		if err != nil {
-			t.Fatalf("[%s] Error unmarshaling message: %v", test.name, err)
-		}
-		e, err := proto.GetExtension(msg2, pb.E_RComplex)
-		if err != nil {
-			t.Fatalf("[%s] Error getting extension: %v", test.name, err)
-		}
-		ext := e.([]*pb.ComplexExtension)
-		if ext == nil {
-			t.Fatalf("[%s] Invalid extension", test.name)
-		}
-		if !reflect.DeepEqual(ext, test.ext) {
-			t.Errorf("[%s] Wrong value for ComplexExtension: got: %v want: %v\n", test.name, ext, test.ext)
-		}
-	}
-}
-
-func TestUnmarshalRepeatingNonRepeatedExtension(t *testing.T) {
-	// We may see multiple instances of the same extension in the wire
-	// format. For example, the proto compiler may encode custom options in
-	// this way. Here, we verify that we merge the extensions together.
-	tests := []struct {
-		name string
-		ext  []*pb.ComplexExtension
-	}{
-		{
-			"two fields",
-			[]*pb.ComplexExtension{
-				{First: proto.Int32(7)},
-				{Second: proto.Int32(11)},
-			},
-		},
-		{
-			"repeated field",
-			[]*pb.ComplexExtension{
-				{Third: []int32{1000}},
-				{Third: []int32{2000}},
-			},
-		},
-		{
-			"two fields and repeated field",
-			[]*pb.ComplexExtension{
-				{Third: []int32{1000}},
-				{First: proto.Int32(9)},
-				{Second: proto.Int32(21)},
-				{Third: []int32{2000}},
-			},
-		},
-	}
-	for _, test := range tests {
-		var buf bytes.Buffer
-		var want pb.ComplexExtension
-
-		// Generate a serialized representation of a repeated extension
-		// by catenating bytes together.
-		for i, e := range test.ext {
-			// Merge to create the wanted proto.
-			proto.Merge(&want, e)
-
-			// serialize the message
-			msg := new(pb.OtherMessage)
-			err := proto.SetExtension(msg, pb.E_Complex, e)
-			if err != nil {
-				t.Fatalf("[%s] Error setting extension %d: %v", test.name, i, err)
-			}
-			b, err := proto.Marshal(msg)
-			if err != nil {
-				t.Fatalf("[%s] Error marshaling message %d: %v", test.name, i, err)
-			}
-			buf.Write(b)
-		}
-
-		// Unmarshal and read the merged proto.
-		msg2 := new(pb.OtherMessage)
-		err := proto.Unmarshal(buf.Bytes(), msg2)
-		if err != nil {
-			t.Fatalf("[%s] Error unmarshaling message: %v", test.name, err)
-		}
-		e, err := proto.GetExtension(msg2, pb.E_Complex)
-		if err != nil {
-			t.Fatalf("[%s] Error getting extension: %v", test.name, err)
-		}
-		ext := e.(*pb.ComplexExtension)
-		if ext == nil {
-			t.Fatalf("[%s] Invalid extension", test.name)
-		}
-		if !reflect.DeepEqual(*ext, want) {
-			t.Errorf("[%s] Wrong value for ComplexExtension: got: %s want: %s\n", test.name, ext, want)
-		}
-	}
-}
-
-func TestClearAllExtensions(t *testing.T) {
-	// unregistered extension
-	desc := &proto.ExtensionDesc{
-		ExtendedType:  (*pb.MyMessage)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         101010100,
-		Name:          "emptyextension",
-		Tag:           "varint,0,opt",
-	}
-	m := &pb.MyMessage{}
-	if proto.HasExtension(m, desc) {
-		t.Errorf("proto.HasExtension(%s): got true, want false", proto.MarshalTextString(m))
-	}
-	if err := proto.SetExtension(m, desc, proto.Bool(true)); err != nil {
-		t.Errorf("proto.SetExtension(m, desc, true): got error %q, want nil", err)
-	}
-	if !proto.HasExtension(m, desc) {
-		t.Errorf("proto.HasExtension(%s): got false, want true", proto.MarshalTextString(m))
-	}
-	proto.ClearAllExtensions(m)
-	if proto.HasExtension(m, desc) {
-		t.Errorf("proto.HasExtension(%s): got true, want false", proto.MarshalTextString(m))
-	}
-}
-
-func TestMarshalRace(t *testing.T) {
-	// unregistered extension
-	desc := &proto.ExtensionDesc{
-		ExtendedType:  (*pb.MyMessage)(nil),
-		ExtensionType: (*bool)(nil),
-		Field:         101010100,
-		Name:          "emptyextension",
-		Tag:           "varint,0,opt",
-	}
-
-	m := &pb.MyMessage{Count: proto.Int32(4)}
-	if err := proto.SetExtension(m, desc, proto.Bool(true)); err != nil {
-		t.Errorf("proto.SetExtension(m, desc, true): got error %q, want nil", err)
-	}
-
-	var g errgroup.Group
-	for n := 3; n > 0; n-- {
-		g.Go(func() error {
-			_, err := proto.Marshal(m)
-			return err
-		})
-	}
-	if err := g.Wait(); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/lib.go b/installer/vendor/github.com/golang/protobuf/proto/lib.go
index 1c225504a0..0e2191b8ad 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/lib.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/lib.go
@@ -265,6 +265,7 @@ package proto
 
 import (
 	"encoding/json"
+	"errors"
 	"fmt"
 	"log"
 	"reflect"
@@ -273,6 +274,8 @@ import (
 	"sync"
 )
 
+var errInvalidUTF8 = errors.New("proto: invalid UTF-8 string")
+
 // Message is implemented by generated protocol buffer messages.
 type Message interface {
 	Reset()
@@ -309,16 +312,7 @@ type Buffer struct {
 	buf   []byte // encode/decode byte stream
 	index int    // read point
 
-	// pools of basic types to amortize allocation.
-	bools   []bool
-	uint32s []uint32
-	uint64s []uint64
-
-	// extra pools, only used with pointer_reflect.go
-	int32s   []int32
-	int64s   []int64
-	float32s []float32
-	float64s []float64
+	deterministic bool
 }
 
 // NewBuffer allocates a new Buffer and initializes its internal data to
@@ -343,6 +337,30 @@ func (p *Buffer) SetBuf(s []byte) {
 // Bytes returns the contents of the Buffer.
 func (p *Buffer) Bytes() []byte { return p.buf }
 
+// SetDeterministic sets whether to use deterministic serialization.
+//
+// Deterministic serialization guarantees that for a given binary, equal
+// messages will always be serialized to the same bytes. This implies:
+//
+//   - Repeated serialization of a message will return the same bytes.
+//   - Different processes of the same binary (which may be executing on
+//     different machines) will serialize equal messages to the same bytes.
+//
+// Note that the deterministic serialization is NOT canonical across
+// languages. It is not guaranteed to remain stable over time. It is unstable
+// across different builds with schema changes due to unknown fields.
+// Users who need canonical serialization (e.g., persistent storage in a
+// canonical form, fingerprinting, etc.) should define their own
+// canonicalization specification and implement their own serializer rather
+// than relying on this API.
+//
+// If deterministic serialization is requested, map entries will be sorted
+// by keys in lexographical order. This is an implementation detail and
+// subject to change.
+func (p *Buffer) SetDeterministic(deterministic bool) {
+	p.deterministic = deterministic
+}
+
 /*
  * Helper routines for simplifying the creation of optional fields of basic type.
  */
@@ -831,22 +849,12 @@ func fieldDefault(ft reflect.Type, prop *Properties) (sf *scalarField, nestedMes
 	return sf, false, nil
 }
 
+// mapKeys returns a sort.Interface to be used for sorting the map keys.
 // Map fields may have key types of non-float scalars, strings and enums.
-// The easiest way to sort them in some deterministic order is to use fmt.
-// If this turns out to be inefficient we can always consider other options,
-// such as doing a Schwartzian transform.
-
 func mapKeys(vs []reflect.Value) sort.Interface {
-	s := mapKeySorter{
-		vs: vs,
-		// default Less function: textual comparison
-		less: func(a, b reflect.Value) bool {
-			return fmt.Sprint(a.Interface()) < fmt.Sprint(b.Interface())
-		},
-	}
+	s := mapKeySorter{vs: vs}
 
-	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps;
-	// numeric keys are sorted numerically.
+	// Type specialization per https://developers.google.com/protocol-buffers/docs/proto#maps.
 	if len(vs) == 0 {
 		return s
 	}
@@ -855,6 +863,12 @@ func mapKeys(vs []reflect.Value) sort.Interface {
 		s.less = func(a, b reflect.Value) bool { return a.Int() < b.Int() }
 	case reflect.Uint32, reflect.Uint64:
 		s.less = func(a, b reflect.Value) bool { return a.Uint() < b.Uint() }
+	case reflect.Bool:
+		s.less = func(a, b reflect.Value) bool { return !a.Bool() && b.Bool() } // false < true
+	case reflect.String:
+		s.less = func(a, b reflect.Value) bool { return a.String() < b.String() }
+	default:
+		panic(fmt.Sprintf("unsupported map key type: %v", vs[0].Kind()))
 	}
 
 	return s
@@ -895,3 +909,13 @@ const ProtoPackageIsVersion2 = true
 // ProtoPackageIsVersion1 is referenced from generated protocol buffer files
 // to assert that that code is compatible with this version of the proto package.
 const ProtoPackageIsVersion1 = true
+
+// InternalMessageInfo is a type used internally by generated .pb.go files.
+// This type is not intended to be used by non-generated code.
+// This type is not subject to any compatibility guarantee.
+type InternalMessageInfo struct {
+	marshal   *marshalInfo
+	unmarshal *unmarshalInfo
+	merge     *mergeInfo
+	discard   *discardInfo
+}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/map_test.go b/installer/vendor/github.com/golang/protobuf/proto/map_test.go
deleted file mode 100644
index 313e879245..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/map_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package proto_test
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	ppb "github.com/golang/protobuf/proto/proto3_proto"
-)
-
-func marshalled() []byte {
-	m := &ppb.IntMaps{}
-	for i := 0; i < 1000; i++ {
-		m.Maps = append(m.Maps, &ppb.IntMap{
-			Rtt: map[int32]int32{1: 2},
-		})
-	}
-	b, err := proto.Marshal(m)
-	if err != nil {
-		panic(fmt.Sprintf("Can't marshal %+v: %v", m, err))
-	}
-	return b
-}
-
-func BenchmarkConcurrentMapUnmarshal(b *testing.B) {
-	in := marshalled()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			var out ppb.IntMaps
-			if err := proto.Unmarshal(in, &out); err != nil {
-				b.Errorf("Can't unmarshal ppb.IntMaps: %v", err)
-			}
-		}
-	})
-}
-
-func BenchmarkSequentialMapUnmarshal(b *testing.B) {
-	in := marshalled()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		var out ppb.IntMaps
-		if err := proto.Unmarshal(in, &out); err != nil {
-			b.Errorf("Can't unmarshal ppb.IntMaps: %v", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/message_set.go b/installer/vendor/github.com/golang/protobuf/proto/message_set.go
index fd982decd6..3b6ca41d5e 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/message_set.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/message_set.go
@@ -42,6 +42,7 @@ import (
 	"fmt"
 	"reflect"
 	"sort"
+	"sync"
 )
 
 // errNoMessageTypeID occurs when a protocol buffer does not have a message type ID.
@@ -94,10 +95,7 @@ func (ms *messageSet) find(pb Message) *_MessageSet_Item {
 }
 
 func (ms *messageSet) Has(pb Message) bool {
-	if ms.find(pb) != nil {
-		return true
-	}
-	return false
+	return ms.find(pb) != nil
 }
 
 func (ms *messageSet) Unmarshal(pb Message) error {
@@ -150,46 +148,42 @@ func skipVarint(buf []byte) []byte {
 // MarshalMessageSet encodes the extension map represented by m in the message set wire format.
 // It is called by generated Marshal methods on protocol buffer messages with the message_set_wire_format option.
 func MarshalMessageSet(exts interface{}) ([]byte, error) {
-	var m map[int32]Extension
+	return marshalMessageSet(exts, false)
+}
+
+// marshaMessageSet implements above function, with the opt to turn on / off deterministic during Marshal.
+func marshalMessageSet(exts interface{}, deterministic bool) ([]byte, error) {
 	switch exts := exts.(type) {
 	case *XXX_InternalExtensions:
-		if err := encodeExtensions(exts); err != nil {
-			return nil, err
-		}
-		m, _ = exts.extensionsRead()
+		var u marshalInfo
+		siz := u.sizeMessageSet(exts)
+		b := make([]byte, 0, siz)
+		return u.appendMessageSet(b, exts, deterministic)
+
 	case map[int32]Extension:
-		if err := encodeExtensionsMap(exts); err != nil {
-			return nil, err
+		// This is an old-style extension map.
+		// Wrap it in a new-style XXX_InternalExtensions.
+		ie := XXX_InternalExtensions{
+			p: &struct {
+				mu           sync.Mutex
+				extensionMap map[int32]Extension
+			}{
+				extensionMap: exts,
+			},
 		}
-		m = exts
+
+		var u marshalInfo
+		siz := u.sizeMessageSet(&ie)
+		b := make([]byte, 0, siz)
+		return u.appendMessageSet(b, &ie, deterministic)
+
 	default:
 		return nil, errors.New("proto: not an extension map")
 	}
-
-	// Sort extension IDs to provide a deterministic encoding.
-	// See also enc_map in encode.go.
-	ids := make([]int, 0, len(m))
-	for id := range m {
-		ids = append(ids, int(id))
-	}
-	sort.Ints(ids)
-
-	ms := &messageSet{Item: make([]*_MessageSet_Item, 0, len(m))}
-	for _, id := range ids {
-		e := m[int32(id)]
-		// Remove the wire type and field number varint, as well as the length varint.
-		msg := skipVarint(skipVarint(e.enc))
-
-		ms.Item = append(ms.Item, &_MessageSet_Item{
-			TypeId:  Int32(int32(id)),
-			Message: msg,
-		})
-	}
-	return Marshal(ms)
 }
 
 // UnmarshalMessageSet decodes the extension map encoded in buf in the message set wire format.
-// It is called by generated Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
+// It is called by Unmarshal methods on protocol buffer messages with the message_set_wire_format option.
 func UnmarshalMessageSet(buf []byte, exts interface{}) error {
 	var m map[int32]Extension
 	switch exts := exts.(type) {
@@ -235,7 +229,15 @@ func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
 	var m map[int32]Extension
 	switch exts := exts.(type) {
 	case *XXX_InternalExtensions:
-		m, _ = exts.extensionsRead()
+		var mu sync.Locker
+		m, mu = exts.extensionsRead()
+		if m != nil {
+			// Keep the extensions map locked until we're done marshaling to prevent
+			// races between marshaling and unmarshaling the lazily-{en,de}coded
+			// values.
+			mu.Lock()
+			defer mu.Unlock()
+		}
 	case map[int32]Extension:
 		m = exts
 	default:
@@ -253,15 +255,16 @@ func MarshalMessageSetJSON(exts interface{}) ([]byte, error) {
 
 	for i, id := range ids {
 		ext := m[id]
-		if i > 0 {
-			b.WriteByte(',')
-		}
-
 		msd, ok := messageSetMap[id]
 		if !ok {
 			// Unknown type; we can't render it, so skip it.
 			continue
 		}
+
+		if i > 0 && b.Len() > 1 {
+			b.WriteByte(',')
+		}
+
 		fmt.Fprintf(&b, `"[%s]":`, msd.name)
 
 		x := ext.value
diff --git a/installer/vendor/github.com/golang/protobuf/proto/message_set_test.go b/installer/vendor/github.com/golang/protobuf/proto/message_set_test.go
deleted file mode 100644
index 353a3ea769..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/message_set_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestUnmarshalMessageSetWithDuplicate(t *testing.T) {
-	// Check that a repeated message set entry will be concatenated.
-	in := &messageSet{
-		Item: []*_MessageSet_Item{
-			{TypeId: Int32(12345), Message: []byte("hoo")},
-			{TypeId: Int32(12345), Message: []byte("hah")},
-		},
-	}
-	b, err := Marshal(in)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	t.Logf("Marshaled bytes: %q", b)
-
-	var extensions XXX_InternalExtensions
-	if err := UnmarshalMessageSet(b, &extensions); err != nil {
-		t.Fatalf("UnmarshalMessageSet: %v", err)
-	}
-	ext, ok := extensions.p.extensionMap[12345]
-	if !ok {
-		t.Fatalf("Didn't retrieve extension 12345; map is %v", extensions.p.extensionMap)
-	}
-	// Skip wire type/field number and length varints.
-	got := skipVarint(skipVarint(ext.enc))
-	if want := []byte("hoohah"); !bytes.Equal(got, want) {
-		t.Errorf("Combined extension is %q, want %q", got, want)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/pointer_reflect.go b/installer/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
index fb512e2e16..b6cad90834 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/pointer_reflect.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build appengine js
+// +build purego appengine js
 
 // This file contains an implementation of proto field accesses using package reflect.
 // It is slower than the code in pointer_unsafe.go but it avoids package unsafe and can
@@ -38,32 +38,13 @@
 package proto
 
 import (
-	"math"
 	"reflect"
+	"sync"
 )
 
-// A structPointer is a pointer to a struct.
-type structPointer struct {
-	v reflect.Value
-}
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-// The reflect value must itself be a pointer to a struct.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer{v}
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p.v.IsNil()
-}
+const unsafeAllowed = false
 
-// Interface returns the struct pointer as an interface value.
-func structPointer_Interface(p structPointer, _ reflect.Type) interface{} {
-	return p.v.Interface()
-}
-
-// A field identifies a field in a struct, accessible from a structPointer.
+// A field identifies a field in a struct, accessible from a pointer.
 // In this implementation, a field is identified by the sequence of field indices
 // passed to reflect's FieldByIndex.
 type field []int
@@ -76,409 +57,301 @@ func toField(f *reflect.StructField) field {
 // invalidField is an invalid field identifier.
 var invalidField = field(nil)
 
+// zeroField is a noop when calling pointer.offset.
+var zeroField = field([]int{})
+
 // IsValid reports whether the field identifier is valid.
 func (f field) IsValid() bool { return f != nil }
 
-// field returns the given field in the struct as a reflect value.
-func structPointer_field(p structPointer, f field) reflect.Value {
-	// Special case: an extension map entry with a value of type T
-	// passes a *T to the struct-handling code with a zero field,
-	// expecting that it will be treated as equivalent to *struct{ X T },
-	// which has the same memory layout. We have to handle that case
-	// specially, because reflect will panic if we call FieldByIndex on a
-	// non-struct.
-	if f == nil {
-		return p.v.Elem()
-	}
-
-	return p.v.Elem().FieldByIndex(f)
+// The pointer type is for the table-driven decoder.
+// The implementation here uses a reflect.Value of pointer type to
+// create a generic pointer. In pointer_unsafe.go we use unsafe
+// instead of reflect to implement the same (but faster) interface.
+type pointer struct {
+	v reflect.Value
 }
 
-// ifield returns the given field in the struct as an interface value.
-func structPointer_ifield(p structPointer, f field) interface{} {
-	return structPointer_field(p, f).Addr().Interface()
+// toPointer converts an interface of pointer type to a pointer
+// that points to the same target.
+func toPointer(i *Message) pointer {
+	return pointer{v: reflect.ValueOf(*i)}
 }
 
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return structPointer_ifield(p, f).(*[]byte)
+// toAddrPointer converts an interface to a pointer that points to
+// the interface data.
+func toAddrPointer(i *interface{}, isptr bool) pointer {
+	v := reflect.ValueOf(*i)
+	u := reflect.New(v.Type())
+	u.Elem().Set(v)
+	return pointer{v: u}
 }
 
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return structPointer_ifield(p, f).(*[][]byte)
+// valToPointer converts v to a pointer.  v must be of pointer type.
+func valToPointer(v reflect.Value) pointer {
+	return pointer{v: v}
 }
 
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return structPointer_ifield(p, f).(**bool)
+// offset converts from a pointer to a structure to a pointer to
+// one of its fields.
+func (p pointer) offset(f field) pointer {
+	return pointer{v: p.v.Elem().FieldByIndex(f).Addr()}
 }
 
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return structPointer_ifield(p, f).(*bool)
+func (p pointer) isNil() bool {
+	return p.v.IsNil()
 }
 
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return structPointer_ifield(p, f).(*[]bool)
+// grow updates the slice s in place to make it one element longer.
+// s must be addressable.
+// Returns the (addressable) new element.
+func grow(s reflect.Value) reflect.Value {
+	n, m := s.Len(), s.Cap()
+	if n < m {
+		s.SetLen(n + 1)
+	} else {
+		s.Set(reflect.Append(s, reflect.Zero(s.Type().Elem())))
+	}
+	return s.Index(n)
 }
 
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return structPointer_ifield(p, f).(**string)
+func (p pointer) toInt64() *int64 {
+	return p.v.Interface().(*int64)
 }
-
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return structPointer_ifield(p, f).(*string)
+func (p pointer) toInt64Ptr() **int64 {
+	return p.v.Interface().(**int64)
 }
-
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return structPointer_ifield(p, f).(*[]string)
+func (p pointer) toInt64Slice() *[]int64 {
+	return p.v.Interface().(*[]int64)
 }
 
-// Extensions returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return structPointer_ifield(p, f).(*XXX_InternalExtensions)
-}
+var int32ptr = reflect.TypeOf((*int32)(nil))
 
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return structPointer_ifield(p, f).(*map[int32]Extension)
+func (p pointer) toInt32() *int32 {
+	return p.v.Convert(int32ptr).Interface().(*int32)
 }
 
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return structPointer_field(p, f).Addr()
+// The toInt32Ptr/Slice methods don't work because of enums.
+// Instead, we must use set/get methods for the int32ptr/slice case.
+/*
+	func (p pointer) toInt32Ptr() **int32 {
+		return p.v.Interface().(**int32)
 }
-
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	structPointer_field(p, f).Set(q.v)
+	func (p pointer) toInt32Slice() *[]int32 {
+		return p.v.Interface().(*[]int32)
 }
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return structPointer{structPointer_field(p, f)}
+*/
+func (p pointer) getInt32Ptr() *int32 {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		return p.v.Elem().Interface().(*int32)
+	}
+	// an enum
+	return p.v.Elem().Convert(int32PtrType).Interface().(*int32)
+}
+func (p pointer) setInt32Ptr(v int32) {
+	// Allocate value in a *int32. Possibly convert that to a *enum.
+	// Then assign it to a **int32 or **enum.
+	// Note: we can convert *int32 to *enum, but we can't convert
+	// **int32 to **enum!
+	p.v.Elem().Set(reflect.ValueOf(&v).Convert(p.v.Type().Elem()))
+}
+
+// getInt32Slice copies []int32 from p as a new slice.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) getInt32Slice() []int32 {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		return p.v.Elem().Interface().([]int32)
+	}
+	// an enum
+	// Allocate a []int32, then assign []enum's values into it.
+	// Note: we can't convert []enum to []int32.
+	slice := p.v.Elem()
+	s := make([]int32, slice.Len())
+	for i := 0; i < slice.Len(); i++ {
+		s[i] = int32(slice.Index(i).Int())
+	}
+	return s
 }
 
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) structPointerSlice {
-	return structPointerSlice{structPointer_field(p, f)}
+// setInt32Slice copies []int32 into p as a new slice.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) setInt32Slice(v []int32) {
+	if p.v.Type().Elem().Elem() == reflect.TypeOf(int32(0)) {
+		// raw int32 type
+		p.v.Elem().Set(reflect.ValueOf(v))
+		return
+	}
+	// an enum
+	// Allocate a []enum, then assign []int32's values into it.
+	// Note: we can't convert []enum to []int32.
+	slice := reflect.MakeSlice(p.v.Type().Elem(), len(v), cap(v))
+	for i, x := range v {
+		slice.Index(i).SetInt(int64(x))
+	}
+	p.v.Elem().Set(slice)
 }
-
-// A structPointerSlice represents the address of a slice of pointers to structs
-// (themselves messages or groups). That is, v.Type() is *[]*struct{...}.
-type structPointerSlice struct {
-	v reflect.Value
+func (p pointer) appendInt32Slice(v int32) {
+	grow(p.v.Elem()).SetInt(int64(v))
 }
 
-func (p structPointerSlice) Len() int                  { return p.v.Len() }
-func (p structPointerSlice) Index(i int) structPointer { return structPointer{p.v.Index(i)} }
-func (p structPointerSlice) Append(q structPointer) {
-	p.v.Set(reflect.Append(p.v, q.v))
+func (p pointer) toUint64() *uint64 {
+	return p.v.Interface().(*uint64)
 }
-
-var (
-	int32Type   = reflect.TypeOf(int32(0))
-	uint32Type  = reflect.TypeOf(uint32(0))
-	float32Type = reflect.TypeOf(float32(0))
-	int64Type   = reflect.TypeOf(int64(0))
-	uint64Type  = reflect.TypeOf(uint64(0))
-	float64Type = reflect.TypeOf(float64(0))
-)
-
-// A word32 represents a field of type *int32, *uint32, *float32, or *enum.
-// That is, v.Type() is *int32, *uint32, *float32, or *enum and v is assignable.
-type word32 struct {
-	v reflect.Value
+func (p pointer) toUint64Ptr() **uint64 {
+	return p.v.Interface().(**uint64)
 }
-
-// IsNil reports whether p is nil.
-func word32_IsNil(p word32) bool {
-	return p.v.IsNil()
+func (p pointer) toUint64Slice() *[]uint64 {
+	return p.v.Interface().(*[]uint64)
 }
-
-// Set sets p to point at a newly allocated word with bits set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int32Type:
-		if len(o.int32s) == 0 {
-			o.int32s = make([]int32, uint32PoolSize)
-		}
-		o.int32s[0] = int32(x)
-		p.v.Set(reflect.ValueOf(&o.int32s[0]))
-		o.int32s = o.int32s[1:]
-		return
-	case uint32Type:
-		if len(o.uint32s) == 0 {
-			o.uint32s = make([]uint32, uint32PoolSize)
-		}
-		o.uint32s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint32s[0]))
-		o.uint32s = o.uint32s[1:]
-		return
-	case float32Type:
-		if len(o.float32s) == 0 {
-			o.float32s = make([]float32, uint32PoolSize)
-		}
-		o.float32s[0] = math.Float32frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float32s[0]))
-		o.float32s = o.float32s[1:]
-		return
-	}
-
-	// must be enum
-	p.v.Set(reflect.New(t))
-	p.v.Elem().SetInt(int64(int32(x)))
+func (p pointer) toUint32() *uint32 {
+	return p.v.Interface().(*uint32)
 }
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32_Get(p word32) uint32 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toUint32Ptr() **uint32 {
+	return p.v.Interface().(**uint32)
 }
-
-// Word32 returns a reference to a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32{structPointer_field(p, f)}
+func (p pointer) toUint32Slice() *[]uint32 {
+	return p.v.Interface().(*[]uint32)
 }
-
-// A word32Val represents a field of type int32, uint32, float32, or enum.
-// That is, v.Type() is int32, uint32, float32, or enum and v is assignable.
-type word32Val struct {
-	v reflect.Value
+func (p pointer) toBool() *bool {
+	return p.v.Interface().(*bool)
 }
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	switch p.v.Type() {
-	case int32Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint32Type:
-		p.v.SetUint(uint64(x))
-		return
-	case float32Type:
-		p.v.SetFloat(float64(math.Float32frombits(x)))
-		return
-	}
-
-	// must be enum
-	p.v.SetInt(int64(int32(x)))
+func (p pointer) toBoolPtr() **bool {
+	return p.v.Interface().(**bool)
 }
-
-// Get gets the bits pointed at by p, as a uint32.
-func word32Val_Get(p word32Val) uint32 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toBoolSlice() *[]bool {
+	return p.v.Interface().(*[]bool)
 }
-
-// Word32Val returns a reference to a int32, uint32, float32, or enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val{structPointer_field(p, f)}
+func (p pointer) toFloat64() *float64 {
+	return p.v.Interface().(*float64)
 }
-
-// A word32Slice is a slice of 32-bit values.
-// That is, v.Type() is []int32, []uint32, []float32, or []enum.
-type word32Slice struct {
-	v reflect.Value
+func (p pointer) toFloat64Ptr() **float64 {
+	return p.v.Interface().(**float64)
 }
-
-func (p word32Slice) Append(x uint32) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int32:
-		elem.SetInt(int64(int32(x)))
-	case reflect.Uint32:
-		elem.SetUint(uint64(x))
-	case reflect.Float32:
-		elem.SetFloat(float64(math.Float32frombits(x)))
-	}
+func (p pointer) toFloat64Slice() *[]float64 {
+	return p.v.Interface().(*[]float64)
 }
-
-func (p word32Slice) Len() int {
-	return p.v.Len()
+func (p pointer) toFloat32() *float32 {
+	return p.v.Interface().(*float32)
 }
-
-func (p word32Slice) Index(i int) uint32 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int32:
-		return uint32(elem.Int())
-	case reflect.Uint32:
-		return uint32(elem.Uint())
-	case reflect.Float32:
-		return math.Float32bits(float32(elem.Float()))
-	}
-	panic("unreachable")
+func (p pointer) toFloat32Ptr() **float32 {
+	return p.v.Interface().(**float32)
 }
-
-// Word32Slice returns a reference to a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) word32Slice {
-	return word32Slice{structPointer_field(p, f)}
+func (p pointer) toFloat32Slice() *[]float32 {
+	return p.v.Interface().(*[]float32)
 }
-
-// word64 is like word32 but for 64-bit values.
-type word64 struct {
-	v reflect.Value
+func (p pointer) toString() *string {
+	return p.v.Interface().(*string)
 }
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	t := p.v.Type().Elem()
-	switch t {
-	case int64Type:
-		if len(o.int64s) == 0 {
-			o.int64s = make([]int64, uint64PoolSize)
-		}
-		o.int64s[0] = int64(x)
-		p.v.Set(reflect.ValueOf(&o.int64s[0]))
-		o.int64s = o.int64s[1:]
-		return
-	case uint64Type:
-		if len(o.uint64s) == 0 {
-			o.uint64s = make([]uint64, uint64PoolSize)
-		}
-		o.uint64s[0] = x
-		p.v.Set(reflect.ValueOf(&o.uint64s[0]))
-		o.uint64s = o.uint64s[1:]
-		return
-	case float64Type:
-		if len(o.float64s) == 0 {
-			o.float64s = make([]float64, uint64PoolSize)
-		}
-		o.float64s[0] = math.Float64frombits(x)
-		p.v.Set(reflect.ValueOf(&o.float64s[0]))
-		o.float64s = o.float64s[1:]
-		return
-	}
-	panic("unreachable")
+func (p pointer) toStringPtr() **string {
+	return p.v.Interface().(**string)
 }
-
-func word64_IsNil(p word64) bool {
-	return p.v.IsNil()
+func (p pointer) toStringSlice() *[]string {
+	return p.v.Interface().(*[]string)
 }
-
-func word64_Get(p word64) uint64 {
-	elem := p.v.Elem()
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
-	}
-	panic("unreachable")
+func (p pointer) toBytes() *[]byte {
+	return p.v.Interface().(*[]byte)
 }
-
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64{structPointer_field(p, f)}
+func (p pointer) toBytesSlice() *[][]byte {
+	return p.v.Interface().(*[][]byte)
+}
+func (p pointer) toExtensions() *XXX_InternalExtensions {
+	return p.v.Interface().(*XXX_InternalExtensions)
+}
+func (p pointer) toOldExtensions() *map[int32]Extension {
+	return p.v.Interface().(*map[int32]Extension)
+}
+func (p pointer) getPointer() pointer {
+	return pointer{v: p.v.Elem()}
+}
+func (p pointer) setPointer(q pointer) {
+	p.v.Elem().Set(q.v)
+}
+func (p pointer) appendPointer(q pointer) {
+	grow(p.v.Elem()).Set(q.v)
 }
 
-// word64Val is like word32Val but for 64-bit values.
-type word64Val struct {
-	v reflect.Value
+// getPointerSlice copies []*T from p as a new []pointer.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) getPointerSlice() []pointer {
+	if p.v.IsNil() {
+		return nil
+	}
+	n := p.v.Elem().Len()
+	s := make([]pointer, n)
+	for i := 0; i < n; i++ {
+		s[i] = pointer{v: p.v.Elem().Index(i)}
+	}
+	return s
 }
 
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	switch p.v.Type() {
-	case int64Type:
-		p.v.SetInt(int64(x))
-		return
-	case uint64Type:
-		p.v.SetUint(x)
-		return
-	case float64Type:
-		p.v.SetFloat(math.Float64frombits(x))
+// setPointerSlice copies []pointer into p as a new []*T.
+// This behavior differs from the implementation in pointer_unsafe.go.
+func (p pointer) setPointerSlice(v []pointer) {
+	if v == nil {
+		p.v.Elem().Set(reflect.New(p.v.Elem().Type()).Elem())
 		return
 	}
-	panic("unreachable")
+	s := reflect.MakeSlice(p.v.Elem().Type(), 0, len(v))
+	for _, p := range v {
+		s = reflect.Append(s, p.v)
+	}
+	p.v.Elem().Set(s)
 }
 
-func word64Val_Get(p word64Val) uint64 {
-	elem := p.v
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return elem.Uint()
-	case reflect.Float64:
-		return math.Float64bits(elem.Float())
+// getInterfacePointer returns a pointer that points to the
+// interface data of the interface pointed by p.
+func (p pointer) getInterfacePointer() pointer {
+	if p.v.Elem().IsNil() {
+		return pointer{v: p.v.Elem()}
 	}
-	panic("unreachable")
+	return pointer{v: p.v.Elem().Elem().Elem().Field(0).Addr()} // *interface -> interface -> *struct -> struct
 }
 
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val{structPointer_field(p, f)}
+func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
+	// TODO: check that p.v.Type().Elem() == t?
+	return p.v
 }
 
-type word64Slice struct {
-	v reflect.Value
+func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
 }
-
-func (p word64Slice) Append(x uint64) {
-	n, m := p.v.Len(), p.v.Cap()
-	if n < m {
-		p.v.SetLen(n + 1)
-	} else {
-		t := p.v.Type().Elem()
-		p.v.Set(reflect.Append(p.v, reflect.Zero(t)))
-	}
-	elem := p.v.Index(n)
-	switch elem.Kind() {
-	case reflect.Int64:
-		elem.SetInt(int64(int64(x)))
-	case reflect.Uint64:
-		elem.SetUint(uint64(x))
-	case reflect.Float64:
-		elem.SetFloat(float64(math.Float64frombits(x)))
-	}
+func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
-
-func (p word64Slice) Len() int {
-	return p.v.Len()
+func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
 }
-
-func (p word64Slice) Index(i int) uint64 {
-	elem := p.v.Index(i)
-	switch elem.Kind() {
-	case reflect.Int64:
-		return uint64(elem.Int())
-	case reflect.Uint64:
-		return uint64(elem.Uint())
-	case reflect.Float64:
-		return math.Float64bits(float64(elem.Float()))
-	}
-	panic("unreachable")
+func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
-
-func structPointer_Word64Slice(p structPointer, f field) word64Slice {
-	return word64Slice{structPointer_field(p, f)}
+func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
+}
+func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
 }
+func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	return *p
+}
+func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
+	atomicLock.Lock()
+	defer atomicLock.Unlock()
+	*p = v
+}
+
+var atomicLock sync.Mutex
diff --git a/installer/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go b/installer/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
index 6b5567d47c..d55a335d94 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/pointer_unsafe.go
@@ -29,7 +29,7 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-// +build !appengine,!js
+// +build !purego,!appengine,!js
 
 // This file contains the implementation of the proto field accesses using package unsafe.
 
@@ -37,38 +37,13 @@ package proto
 
 import (
 	"reflect"
+	"sync/atomic"
 	"unsafe"
 )
 
-// NOTE: These type_Foo functions would more idiomatically be methods,
-// but Go does not allow methods on pointer types, and we must preserve
-// some pointer type for the garbage collector. We use these
-// funcs with clunky names as our poor approximation to methods.
-//
-// An alternative would be
-//	type structPointer struct { p unsafe.Pointer }
-// but that does not registerize as well.
-
-// A structPointer is a pointer to a struct.
-type structPointer unsafe.Pointer
-
-// toStructPointer returns a structPointer equivalent to the given reflect value.
-func toStructPointer(v reflect.Value) structPointer {
-	return structPointer(unsafe.Pointer(v.Pointer()))
-}
-
-// IsNil reports whether p is nil.
-func structPointer_IsNil(p structPointer) bool {
-	return p == nil
-}
-
-// Interface returns the struct pointer, assumed to have element type t,
-// as an interface value.
-func structPointer_Interface(p structPointer, t reflect.Type) interface{} {
-	return reflect.NewAt(t, unsafe.Pointer(p)).Interface()
-}
+const unsafeAllowed = true
 
-// A field identifies a field in a struct, accessible from a structPointer.
+// A field identifies a field in a struct, accessible from a pointer.
 // In this implementation, a field is identified by its byte offset from the start of the struct.
 type field uintptr
 
@@ -80,191 +55,254 @@ func toField(f *reflect.StructField) field {
 // invalidField is an invalid field identifier.
 const invalidField = ^field(0)
 
+// zeroField is a noop when calling pointer.offset.
+const zeroField = field(0)
+
 // IsValid reports whether the field identifier is valid.
 func (f field) IsValid() bool {
-	return f != ^field(0)
+	return f != invalidField
 }
 
-// Bytes returns the address of a []byte field in the struct.
-func structPointer_Bytes(p structPointer, f field) *[]byte {
-	return (*[]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// The pointer type below is for the new table-driven encoder/decoder.
+// The implementation here uses unsafe.Pointer to create a generic pointer.
+// In pointer_reflect.go we use reflect instead of unsafe to implement
+// the same (but slower) interface.
+type pointer struct {
+	p unsafe.Pointer
 }
 
-// BytesSlice returns the address of a [][]byte field in the struct.
-func structPointer_BytesSlice(p structPointer, f field) *[][]byte {
-	return (*[][]byte)(unsafe.Pointer(uintptr(p) + uintptr(f)))
-}
+// size of pointer
+var ptrSize = unsafe.Sizeof(uintptr(0))
 
-// Bool returns the address of a *bool field in the struct.
-func structPointer_Bool(p structPointer, f field) **bool {
-	return (**bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// toPointer converts an interface of pointer type to a pointer
+// that points to the same target.
+func toPointer(i *Message) pointer {
+	// Super-tricky - read pointer out of data word of interface value.
+	// Saves ~25ns over the equivalent:
+	// return valToPointer(reflect.ValueOf(*i))
+	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 }
 
-// BoolVal returns the address of a bool field in the struct.
-func structPointer_BoolVal(p structPointer, f field) *bool {
-	return (*bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// toAddrPointer converts an interface to a pointer that points to
+// the interface data.
+func toAddrPointer(i *interface{}, isptr bool) pointer {
+	// Super-tricky - read or get the address of data word of interface value.
+	if isptr {
+		// The interface is of pointer type, thus it is a direct interface.
+		// The data word is the pointer data itself. We take its address.
+		return pointer{p: unsafe.Pointer(uintptr(unsafe.Pointer(i)) + ptrSize)}
+	}
+	// The interface is not of pointer type. The data word is the pointer
+	// to the data.
+	return pointer{p: (*[2]unsafe.Pointer)(unsafe.Pointer(i))[1]}
 }
 
-// BoolSlice returns the address of a []bool field in the struct.
-func structPointer_BoolSlice(p structPointer, f field) *[]bool {
-	return (*[]bool)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// valToPointer converts v to a pointer. v must be of pointer type.
+func valToPointer(v reflect.Value) pointer {
+	return pointer{p: unsafe.Pointer(v.Pointer())}
 }
 
-// String returns the address of a *string field in the struct.
-func structPointer_String(p structPointer, f field) **string {
-	return (**string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// offset converts from a pointer to a structure to a pointer to
+// one of its fields.
+func (p pointer) offset(f field) pointer {
+	// For safety, we should panic if !f.IsValid, however calling panic causes
+	// this to no longer be inlineable, which is a serious performance cost.
+	/*
+		if !f.IsValid() {
+			panic("invalid field")
+		}
+	*/
+	return pointer{p: unsafe.Pointer(uintptr(p.p) + uintptr(f))}
 }
 
-// StringVal returns the address of a string field in the struct.
-func structPointer_StringVal(p structPointer, f field) *string {
-	return (*string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) isNil() bool {
+	return p.p == nil
 }
 
-// StringSlice returns the address of a []string field in the struct.
-func structPointer_StringSlice(p structPointer, f field) *[]string {
-	return (*[]string)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64() *int64 {
+	return (*int64)(p.p)
 }
-
-// ExtMap returns the address of an extension map field in the struct.
-func structPointer_Extensions(p structPointer, f field) *XXX_InternalExtensions {
-	return (*XXX_InternalExtensions)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64Ptr() **int64 {
+	return (**int64)(p.p)
 }
-
-func structPointer_ExtMap(p structPointer, f field) *map[int32]Extension {
-	return (*map[int32]Extension)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toInt64Slice() *[]int64 {
+	return (*[]int64)(p.p)
 }
-
-// NewAt returns the reflect.Value for a pointer to a field in the struct.
-func structPointer_NewAt(p structPointer, f field, typ reflect.Type) reflect.Value {
-	return reflect.NewAt(typ, unsafe.Pointer(uintptr(p)+uintptr(f)))
+func (p pointer) toInt32() *int32 {
+	return (*int32)(p.p)
 }
 
-// SetStructPointer writes a *struct field in the struct.
-func structPointer_SetStructPointer(p structPointer, f field, q structPointer) {
-	*(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f))) = q
+// See pointer_reflect.go for why toInt32Ptr/Slice doesn't exist.
+/*
+	func (p pointer) toInt32Ptr() **int32 {
+		return (**int32)(p.p)
+	}
+	func (p pointer) toInt32Slice() *[]int32 {
+		return (*[]int32)(p.p)
+	}
+*/
+func (p pointer) getInt32Ptr() *int32 {
+	return *(**int32)(p.p)
 }
-
-// GetStructPointer reads a *struct field in the struct.
-func structPointer_GetStructPointer(p structPointer, f field) structPointer {
-	return *(*structPointer)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) setInt32Ptr(v int32) {
+	*(**int32)(p.p) = &v
 }
 
-// StructPointerSlice the address of a []*struct field in the struct.
-func structPointer_StructPointerSlice(p structPointer, f field) *structPointerSlice {
-	return (*structPointerSlice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+// getInt32Slice loads a []int32 from p.
+// The value returned is aliased with the original slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) getInt32Slice() []int32 {
+	return *(*[]int32)(p.p)
 }
 
-// A structPointerSlice represents a slice of pointers to structs (themselves submessages or groups).
-type structPointerSlice []structPointer
-
-func (v *structPointerSlice) Len() int                  { return len(*v) }
-func (v *structPointerSlice) Index(i int) structPointer { return (*v)[i] }
-func (v *structPointerSlice) Append(p structPointer)    { *v = append(*v, p) }
-
-// A word32 is the address of a "pointer to 32-bit value" field.
-type word32 **uint32
-
-// IsNil reports whether *v is nil.
-func word32_IsNil(p word32) bool {
-	return *p == nil
+// setInt32Slice stores a []int32 to p.
+// The value set is aliased with the input slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) setInt32Slice(v []int32) {
+	*(*[]int32)(p.p) = v
 }
 
-// Set sets *v to point at a newly allocated word set to x.
-func word32_Set(p word32, o *Buffer, x uint32) {
-	if len(o.uint32s) == 0 {
-		o.uint32s = make([]uint32, uint32PoolSize)
-	}
-	o.uint32s[0] = x
-	*p = &o.uint32s[0]
-	o.uint32s = o.uint32s[1:]
+// TODO: Can we get rid of appendInt32Slice and use setInt32Slice instead?
+func (p pointer) appendInt32Slice(v int32) {
+	s := (*[]int32)(p.p)
+	*s = append(*s, v)
 }
 
-// Get gets the value pointed at by *v.
-func word32_Get(p word32) uint32 {
-	return **p
+func (p pointer) toUint64() *uint64 {
+	return (*uint64)(p.p)
 }
-
-// Word32 returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32(p structPointer, f field) word32 {
-	return word32((**uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+func (p pointer) toUint64Ptr() **uint64 {
+	return (**uint64)(p.p)
 }
-
-// A word32Val is the address of a 32-bit value field.
-type word32Val *uint32
-
-// Set sets *p to x.
-func word32Val_Set(p word32Val, x uint32) {
-	*p = x
+func (p pointer) toUint64Slice() *[]uint64 {
+	return (*[]uint64)(p.p)
 }
-
-// Get gets the value pointed at by p.
-func word32Val_Get(p word32Val) uint32 {
-	return *p
+func (p pointer) toUint32() *uint32 {
+	return (*uint32)(p.p)
 }
-
-// Word32Val returns the address of a *int32, *uint32, *float32, or *enum field in the struct.
-func structPointer_Word32Val(p structPointer, f field) word32Val {
-	return word32Val((*uint32)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+func (p pointer) toUint32Ptr() **uint32 {
+	return (**uint32)(p.p)
 }
-
-// A word32Slice is a slice of 32-bit values.
-type word32Slice []uint32
-
-func (v *word32Slice) Append(x uint32)    { *v = append(*v, x) }
-func (v *word32Slice) Len() int           { return len(*v) }
-func (v *word32Slice) Index(i int) uint32 { return (*v)[i] }
-
-// Word32Slice returns the address of a []int32, []uint32, []float32, or []enum field in the struct.
-func structPointer_Word32Slice(p structPointer, f field) *word32Slice {
-	return (*word32Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func (p pointer) toUint32Slice() *[]uint32 {
+	return (*[]uint32)(p.p)
 }
-
-// word64 is like word32 but for 64-bit values.
-type word64 **uint64
-
-func word64_Set(p word64, o *Buffer, x uint64) {
-	if len(o.uint64s) == 0 {
-		o.uint64s = make([]uint64, uint64PoolSize)
-	}
-	o.uint64s[0] = x
-	*p = &o.uint64s[0]
-	o.uint64s = o.uint64s[1:]
+func (p pointer) toBool() *bool {
+	return (*bool)(p.p)
 }
-
-func word64_IsNil(p word64) bool {
-	return *p == nil
+func (p pointer) toBoolPtr() **bool {
+	return (**bool)(p.p)
 }
-
-func word64_Get(p word64) uint64 {
-	return **p
+func (p pointer) toBoolSlice() *[]bool {
+	return (*[]bool)(p.p)
+}
+func (p pointer) toFloat64() *float64 {
+	return (*float64)(p.p)
+}
+func (p pointer) toFloat64Ptr() **float64 {
+	return (**float64)(p.p)
+}
+func (p pointer) toFloat64Slice() *[]float64 {
+	return (*[]float64)(p.p)
+}
+func (p pointer) toFloat32() *float32 {
+	return (*float32)(p.p)
+}
+func (p pointer) toFloat32Ptr() **float32 {
+	return (**float32)(p.p)
+}
+func (p pointer) toFloat32Slice() *[]float32 {
+	return (*[]float32)(p.p)
+}
+func (p pointer) toString() *string {
+	return (*string)(p.p)
+}
+func (p pointer) toStringPtr() **string {
+	return (**string)(p.p)
+}
+func (p pointer) toStringSlice() *[]string {
+	return (*[]string)(p.p)
+}
+func (p pointer) toBytes() *[]byte {
+	return (*[]byte)(p.p)
+}
+func (p pointer) toBytesSlice() *[][]byte {
+	return (*[][]byte)(p.p)
+}
+func (p pointer) toExtensions() *XXX_InternalExtensions {
+	return (*XXX_InternalExtensions)(p.p)
+}
+func (p pointer) toOldExtensions() *map[int32]Extension {
+	return (*map[int32]Extension)(p.p)
 }
 
-func structPointer_Word64(p structPointer, f field) word64 {
-	return word64((**uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+// getPointerSlice loads []*T from p as a []pointer.
+// The value returned is aliased with the original slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) getPointerSlice() []pointer {
+	// Super-tricky - p should point to a []*T where T is a
+	// message type. We load it as []pointer.
+	return *(*[]pointer)(p.p)
 }
 
-// word64Val is like word32Val but for 64-bit values.
-type word64Val *uint64
+// setPointerSlice stores []pointer into p as a []*T.
+// The value set is aliased with the input slice.
+// This behavior differs from the implementation in pointer_reflect.go.
+func (p pointer) setPointerSlice(v []pointer) {
+	// Super-tricky - p should point to a []*T where T is a
+	// message type. We store it as []pointer.
+	*(*[]pointer)(p.p) = v
+}
 
-func word64Val_Set(p word64Val, o *Buffer, x uint64) {
-	*p = x
+// getPointer loads the pointer at p and returns it.
+func (p pointer) getPointer() pointer {
+	return pointer{p: *(*unsafe.Pointer)(p.p)}
 }
 
-func word64Val_Get(p word64Val) uint64 {
-	return *p
+// setPointer stores the pointer q at p.
+func (p pointer) setPointer(q pointer) {
+	*(*unsafe.Pointer)(p.p) = q.p
 }
 
-func structPointer_Word64Val(p structPointer, f field) word64Val {
-	return word64Val((*uint64)(unsafe.Pointer(uintptr(p) + uintptr(f))))
+// append q to the slice pointed to by p.
+func (p pointer) appendPointer(q pointer) {
+	s := (*[]unsafe.Pointer)(p.p)
+	*s = append(*s, q.p)
 }
 
-// word64Slice is like word32Slice but for 64-bit values.
-type word64Slice []uint64
+// getInterfacePointer returns a pointer that points to the
+// interface data of the interface pointed by p.
+func (p pointer) getInterfacePointer() pointer {
+	// Super-tricky - read pointer out of data word of interface value.
+	return pointer{p: (*(*[2]unsafe.Pointer)(p.p))[1]}
+}
 
-func (v *word64Slice) Append(x uint64)    { *v = append(*v, x) }
-func (v *word64Slice) Len() int           { return len(*v) }
-func (v *word64Slice) Index(i int) uint64 { return (*v)[i] }
+// asPointerTo returns a reflect.Value that is a pointer to an
+// object of type t stored at p.
+func (p pointer) asPointerTo(t reflect.Type) reflect.Value {
+	return reflect.NewAt(t, p.p)
+}
 
-func structPointer_Word64Slice(p structPointer, f field) *word64Slice {
-	return (*word64Slice)(unsafe.Pointer(uintptr(p) + uintptr(f)))
+func atomicLoadUnmarshalInfo(p **unmarshalInfo) *unmarshalInfo {
+	return (*unmarshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreUnmarshalInfo(p **unmarshalInfo, v *unmarshalInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadMarshalInfo(p **marshalInfo) *marshalInfo {
+	return (*marshalInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreMarshalInfo(p **marshalInfo, v *marshalInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadMergeInfo(p **mergeInfo) *mergeInfo {
+	return (*mergeInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreMergeInfo(p **mergeInfo, v *mergeInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
+}
+func atomicLoadDiscardInfo(p **discardInfo) *discardInfo {
+	return (*discardInfo)(atomic.LoadPointer((*unsafe.Pointer)(unsafe.Pointer(p))))
+}
+func atomicStoreDiscardInfo(p **discardInfo, v *discardInfo) {
+	atomic.StorePointer((*unsafe.Pointer)(unsafe.Pointer(p)), unsafe.Pointer(v))
 }
diff --git a/installer/vendor/github.com/golang/protobuf/proto/properties.go b/installer/vendor/github.com/golang/protobuf/proto/properties.go
index ec2289c005..f710adab09 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/properties.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/properties.go
@@ -58,42 +58,6 @@ const (
 	WireFixed32    = 5
 )
 
-const startSize = 10 // initial slice/string sizes
-
-// Encoders are defined in encode.go
-// An encoder outputs the full representation of a field, including its
-// tag and encoder type.
-type encoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueEncoder encodes a single integer in a particular encoding.
-type valueEncoder func(o *Buffer, x uint64) error
-
-// Sizers are defined in encode.go
-// A sizer returns the encoded size of a field, including its tag and encoder
-// type.
-type sizer func(prop *Properties, base structPointer) int
-
-// A valueSizer returns the encoded size of a single integer in a particular
-// encoding.
-type valueSizer func(x uint64) int
-
-// Decoders are defined in decode.go
-// A decoder creates a value from its wire representation.
-// Unrecognized subelements are saved in unrec.
-type decoder func(p *Buffer, prop *Properties, base structPointer) error
-
-// A valueDecoder decodes a single integer in a particular encoding.
-type valueDecoder func(o *Buffer) (x uint64, err error)
-
-// A oneofMarshaler does the marshaling for all oneof fields in a message.
-type oneofMarshaler func(Message, *Buffer) error
-
-// A oneofUnmarshaler does the unmarshaling for a oneof field in a message.
-type oneofUnmarshaler func(Message, int, int, *Buffer) (bool, error)
-
-// A oneofSizer does the sizing for all oneof fields in a message.
-type oneofSizer func(Message) int
-
 // tagMap is an optimization over map[int]int for typical protocol buffer
 // use-cases. Encoded protocol buffers are often in tag order with small tag
 // numbers.
@@ -140,13 +104,6 @@ type StructProperties struct {
 	decoderTags      tagMap         // map from proto tag to struct field number
 	decoderOrigNames map[string]int // map from original name to struct field number
 	order            []int          // list of struct field numbers in tag order
-	unrecField       field          // field id of the XXX_unrecognized []byte field
-	extendable       bool           // is this an extendable proto
-
-	oneofMarshaler   oneofMarshaler
-	oneofUnmarshaler oneofUnmarshaler
-	oneofSizer       oneofSizer
-	stype            reflect.Type
 
 	// OneofTypes contains information about the oneof fields in this message.
 	// It is keyed by the original name of a field.
@@ -187,36 +144,19 @@ type Properties struct {
 
 	Default    string // default value
 	HasDefault bool   // whether an explicit default was provided
-	def_uint64 uint64
-
-	enc           encoder
-	valEnc        valueEncoder // set for bool and numeric types only
-	field         field
-	tagcode       []byte // encoding of EncodeVarint((Tag<<3)|WireType)
-	tagbuf        [8]byte
-	stype         reflect.Type      // set for struct types only
-	sprop         *StructProperties // set for struct types only
-	isMarshaler   bool
-	isUnmarshaler bool
+
+	stype reflect.Type      // set for struct types only
+	sprop *StructProperties // set for struct types only
 
 	mtype    reflect.Type // set for map types only
 	mkeyprop *Properties  // set for map types only
 	mvalprop *Properties  // set for map types only
-
-	size    sizer
-	valSize valueSizer // set for bool and numeric types only
-
-	dec    decoder
-	valDec valueDecoder // set for bool and numeric types only
-
-	// If this is a packable field, this will be the decoder for the packed version of the field.
-	packedDec decoder
 }
 
 // String formats the properties in the protobuf struct field tag style.
 func (p *Properties) String() string {
 	s := p.Wire
-	s = ","
+	s += ","
 	s += strconv.Itoa(p.Tag)
 	if p.Required {
 		s += ",req"
@@ -262,29 +202,14 @@ func (p *Properties) Parse(s string) {
 	switch p.Wire {
 	case "varint":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeVarint
-		p.valDec = (*Buffer).DecodeVarint
-		p.valSize = sizeVarint
 	case "fixed32":
 		p.WireType = WireFixed32
-		p.valEnc = (*Buffer).EncodeFixed32
-		p.valDec = (*Buffer).DecodeFixed32
-		p.valSize = sizeFixed32
 	case "fixed64":
 		p.WireType = WireFixed64
-		p.valEnc = (*Buffer).EncodeFixed64
-		p.valDec = (*Buffer).DecodeFixed64
-		p.valSize = sizeFixed64
 	case "zigzag32":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag32
-		p.valDec = (*Buffer).DecodeZigzag32
-		p.valSize = sizeZigzag32
 	case "zigzag64":
 		p.WireType = WireVarint
-		p.valEnc = (*Buffer).EncodeZigzag64
-		p.valDec = (*Buffer).DecodeZigzag64
-		p.valSize = sizeZigzag64
 	case "bytes", "group":
 		p.WireType = WireBytes
 		// no numeric converter for non-numeric types
@@ -299,6 +224,7 @@ func (p *Properties) Parse(s string) {
 		return
 	}
 
+outer:
 	for i := 2; i < len(fields); i++ {
 		f := fields[i]
 		switch {
@@ -326,229 +252,28 @@ func (p *Properties) Parse(s string) {
 			if i+1 < len(fields) {
 				// Commas aren't escaped, and def is always last.
 				p.Default += "," + strings.Join(fields[i+1:], ",")
-				break
+				break outer
 			}
 		}
 	}
 }
 
-func logNoSliceEnc(t1, t2 reflect.Type) {
-	fmt.Fprintf(os.Stderr, "proto: no slice oenc for %T = []%T\n", t1, t2)
-}
-
 var protoMessageType = reflect.TypeOf((*Message)(nil)).Elem()
 
-// Initialize the fields for encoding and decoding.
-func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
-	p.enc = nil
-	p.dec = nil
-	p.size = nil
-
+// setFieldProps initializes the field properties for submessages and maps.
+func (p *Properties) setFieldProps(typ reflect.Type, f *reflect.StructField, lockGetProp bool) {
 	switch t1 := typ; t1.Kind() {
-	default:
-		fmt.Fprintf(os.Stderr, "proto: no coders for %v\n", t1)
-
-	// proto3 scalar types
-
-	case reflect.Bool:
-		p.enc = (*Buffer).enc_proto3_bool
-		p.dec = (*Buffer).dec_proto3_bool
-		p.size = size_proto3_bool
-	case reflect.Int32:
-		p.enc = (*Buffer).enc_proto3_int32
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_int32
-	case reflect.Uint32:
-		p.enc = (*Buffer).enc_proto3_uint32
-		p.dec = (*Buffer).dec_proto3_int32 // can reuse
-		p.size = size_proto3_uint32
-	case reflect.Int64, reflect.Uint64:
-		p.enc = (*Buffer).enc_proto3_int64
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.Float32:
-		p.enc = (*Buffer).enc_proto3_uint32 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int32
-		p.size = size_proto3_uint32
-	case reflect.Float64:
-		p.enc = (*Buffer).enc_proto3_int64 // can just treat them as bits
-		p.dec = (*Buffer).dec_proto3_int64
-		p.size = size_proto3_int64
-	case reflect.String:
-		p.enc = (*Buffer).enc_proto3_string
-		p.dec = (*Buffer).dec_proto3_string
-		p.size = size_proto3_string
-
 	case reflect.Ptr:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			fmt.Fprintf(os.Stderr, "proto: no encoder function for %v -> %v\n", t1, t2)
-			break
-		case reflect.Bool:
-			p.enc = (*Buffer).enc_bool
-			p.dec = (*Buffer).dec_bool
-			p.size = size_bool
-		case reflect.Int32:
-			p.enc = (*Buffer).enc_int32
-			p.dec = (*Buffer).dec_int32
-			p.size = size_int32
-		case reflect.Uint32:
-			p.enc = (*Buffer).enc_uint32
-			p.dec = (*Buffer).dec_int32 // can reuse
-			p.size = size_uint32
-		case reflect.Int64, reflect.Uint64:
-			p.enc = (*Buffer).enc_int64
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.Float32:
-			p.enc = (*Buffer).enc_uint32 // can just treat them as bits
-			p.dec = (*Buffer).dec_int32
-			p.size = size_uint32
-		case reflect.Float64:
-			p.enc = (*Buffer).enc_int64 // can just treat them as bits
-			p.dec = (*Buffer).dec_int64
-			p.size = size_int64
-		case reflect.String:
-			p.enc = (*Buffer).enc_string
-			p.dec = (*Buffer).dec_string
-			p.size = size_string
-		case reflect.Struct:
+		if t1.Elem().Kind() == reflect.Struct {
 			p.stype = t1.Elem()
-			p.isMarshaler = isMarshaler(t1)
-			p.isUnmarshaler = isUnmarshaler(t1)
-			if p.Wire == "bytes" {
-				p.enc = (*Buffer).enc_struct_message
-				p.dec = (*Buffer).dec_struct_message
-				p.size = size_struct_message
-			} else {
-				p.enc = (*Buffer).enc_struct_group
-				p.dec = (*Buffer).dec_struct_group
-				p.size = size_struct_group
-			}
 		}
 
 	case reflect.Slice:
-		switch t2 := t1.Elem(); t2.Kind() {
-		default:
-			logNoSliceEnc(t1, t2)
-			break
-		case reflect.Bool:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_bool
-				p.size = size_slice_packed_bool
-			} else {
-				p.enc = (*Buffer).enc_slice_bool
-				p.size = size_slice_bool
-			}
-			p.dec = (*Buffer).dec_slice_bool
-			p.packedDec = (*Buffer).dec_slice_packed_bool
-		case reflect.Int32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int32
-				p.size = size_slice_packed_int32
-			} else {
-				p.enc = (*Buffer).enc_slice_int32
-				p.size = size_slice_int32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Uint32:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_uint32
-				p.size = size_slice_packed_uint32
-			} else {
-				p.enc = (*Buffer).enc_slice_uint32
-				p.size = size_slice_uint32
-			}
-			p.dec = (*Buffer).dec_slice_int32
-			p.packedDec = (*Buffer).dec_slice_packed_int32
-		case reflect.Int64, reflect.Uint64:
-			if p.Packed {
-				p.enc = (*Buffer).enc_slice_packed_int64
-				p.size = size_slice_packed_int64
-			} else {
-				p.enc = (*Buffer).enc_slice_int64
-				p.size = size_slice_int64
-			}
-			p.dec = (*Buffer).dec_slice_int64
-			p.packedDec = (*Buffer).dec_slice_packed_int64
-		case reflect.Uint8:
-			p.dec = (*Buffer).dec_slice_byte
-			if p.proto3 {
-				p.enc = (*Buffer).enc_proto3_slice_byte
-				p.size = size_proto3_slice_byte
-			} else {
-				p.enc = (*Buffer).enc_slice_byte
-				p.size = size_slice_byte
-			}
-		case reflect.Float32, reflect.Float64:
-			switch t2.Bits() {
-			case 32:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_uint32
-					p.size = size_slice_packed_uint32
-				} else {
-					p.enc = (*Buffer).enc_slice_uint32
-					p.size = size_slice_uint32
-				}
-				p.dec = (*Buffer).dec_slice_int32
-				p.packedDec = (*Buffer).dec_slice_packed_int32
-			case 64:
-				// can just treat them as bits
-				if p.Packed {
-					p.enc = (*Buffer).enc_slice_packed_int64
-					p.size = size_slice_packed_int64
-				} else {
-					p.enc = (*Buffer).enc_slice_int64
-					p.size = size_slice_int64
-				}
-				p.dec = (*Buffer).dec_slice_int64
-				p.packedDec = (*Buffer).dec_slice_packed_int64
-			default:
-				logNoSliceEnc(t1, t2)
-				break
-			}
-		case reflect.String:
-			p.enc = (*Buffer).enc_slice_string
-			p.dec = (*Buffer).dec_slice_string
-			p.size = size_slice_string
-		case reflect.Ptr:
-			switch t3 := t2.Elem(); t3.Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no ptr oenc for %T -> %T -> %T\n", t1, t2, t3)
-				break
-			case reflect.Struct:
-				p.stype = t2.Elem()
-				p.isMarshaler = isMarshaler(t2)
-				p.isUnmarshaler = isUnmarshaler(t2)
-				if p.Wire == "bytes" {
-					p.enc = (*Buffer).enc_slice_struct_message
-					p.dec = (*Buffer).dec_slice_struct_message
-					p.size = size_slice_struct_message
-				} else {
-					p.enc = (*Buffer).enc_slice_struct_group
-					p.dec = (*Buffer).dec_slice_struct_group
-					p.size = size_slice_struct_group
-				}
-			}
-		case reflect.Slice:
-			switch t2.Elem().Kind() {
-			default:
-				fmt.Fprintf(os.Stderr, "proto: no slice elem oenc for %T -> %T -> %T\n", t1, t2, t2.Elem())
-				break
-			case reflect.Uint8:
-				p.enc = (*Buffer).enc_slice_slice_byte
-				p.dec = (*Buffer).dec_slice_slice_byte
-				p.size = size_slice_slice_byte
-			}
+		if t2 := t1.Elem(); t2.Kind() == reflect.Ptr && t2.Elem().Kind() == reflect.Struct {
+			p.stype = t2.Elem()
 		}
 
 	case reflect.Map:
-		p.enc = (*Buffer).enc_new_map
-		p.dec = (*Buffer).dec_new_map
-		p.size = size_new_map
-
 		p.mtype = t1
 		p.mkeyprop = &Properties{}
 		p.mkeyprop.init(reflect.PtrTo(p.mtype.Key()), "Key", f.Tag.Get("protobuf_key"), nil, lockGetProp)
@@ -562,20 +287,6 @@ func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lock
 		p.mvalprop.init(vtype, "Value", f.Tag.Get("protobuf_val"), nil, lockGetProp)
 	}
 
-	// precalculate tag code
-	wire := p.WireType
-	if p.Packed {
-		wire = WireBytes
-	}
-	x := uint32(p.Tag)<<3 | uint32(wire)
-	i := 0
-	for i = 0; x > 127; i++ {
-		p.tagbuf[i] = 0x80 | uint8(x&0x7F)
-		x >>= 7
-	}
-	p.tagbuf[i] = uint8(x)
-	p.tagcode = p.tagbuf[0 : i+1]
-
 	if p.stype != nil {
 		if lockGetProp {
 			p.sprop = GetProperties(p.stype)
@@ -586,32 +297,9 @@ func (p *Properties) setEncAndDec(typ reflect.Type, f *reflect.StructField, lock
 }
 
 var (
-	marshalerType   = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	unmarshalerType = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
+	marshalerType = reflect.TypeOf((*Marshaler)(nil)).Elem()
 )
 
-// isMarshaler reports whether type t implements Marshaler.
-func isMarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isMarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isMarshaler")
-	}
-	return t.Implements(marshalerType)
-}
-
-// isUnmarshaler reports whether type t implements Unmarshaler.
-func isUnmarshaler(t reflect.Type) bool {
-	// We're checking for (likely) pointer-receiver methods
-	// so if t is not a pointer, something is very wrong.
-	// The calls above only invoke isUnmarshaler on pointer types.
-	if t.Kind() != reflect.Ptr {
-		panic("proto: misuse of isUnmarshaler")
-	}
-	return t.Implements(unmarshalerType)
-}
-
 // Init populates the properties from a protocol buffer struct tag.
 func (p *Properties) Init(typ reflect.Type, name, tag string, f *reflect.StructField) {
 	p.init(typ, name, tag, f, true)
@@ -621,14 +309,11 @@ func (p *Properties) init(typ reflect.Type, name, tag string, f *reflect.StructF
 	// "bytes,49,opt,def=hello!"
 	p.Name = name
 	p.OrigName = name
-	if f != nil {
-		p.field = toField(f)
-	}
 	if tag == "" {
 		return
 	}
 	p.Parse(tag)
-	p.setEncAndDec(typ, f, lockGetProp)
+	p.setFieldProps(typ, f, lockGetProp)
 }
 
 var (
@@ -678,9 +363,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	propertiesMap[t] = prop
 
 	// build properties
-	prop.extendable = reflect.PtrTo(t).Implements(extendableProtoType) ||
-		reflect.PtrTo(t).Implements(extendableProtoV1Type)
-	prop.unrecField = invalidField
 	prop.Prop = make([]*Properties, t.NumField())
 	prop.order = make([]int, t.NumField())
 
@@ -690,17 +372,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 		name := f.Name
 		p.init(f.Type, name, f.Tag.Get("protobuf"), &f, false)
 
-		if f.Name == "XXX_InternalExtensions" { // special case
-			p.enc = (*Buffer).enc_exts
-			p.dec = nil // not needed
-			p.size = size_exts
-		} else if f.Name == "XXX_extensions" { // special case
-			p.enc = (*Buffer).enc_map
-			p.dec = nil // not needed
-			p.size = size_map
-		} else if f.Name == "XXX_unrecognized" { // special case
-			prop.unrecField = toField(&f)
-		}
 		oneof := f.Tag.Get("protobuf_oneof") // special case
 		if oneof != "" {
 			// Oneof fields don't use the traditional protobuf tag.
@@ -715,9 +386,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 			}
 			print("\n")
 		}
-		if p.enc == nil && !strings.HasPrefix(f.Name, "XXX_") && oneof == "" {
-			fmt.Fprintln(os.Stderr, "proto: no encoder for", f.Name, f.Type.String(), "[GetProperties]")
-		}
 	}
 
 	// Re-order prop.order.
@@ -728,8 +396,7 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	}
 	if om, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
 		var oots []interface{}
-		prop.oneofMarshaler, prop.oneofUnmarshaler, prop.oneofSizer, oots = om.XXX_OneofFuncs()
-		prop.stype = t
+		_, _, _, oots = om.XXX_OneofFuncs()
 
 		// Interpret oneof metadata.
 		prop.OneofTypes = make(map[string]*OneofProperties)
@@ -779,30 +446,6 @@ func getPropertiesLocked(t reflect.Type) *StructProperties {
 	return prop
 }
 
-// Return the Properties object for the x[0]'th field of the structure.
-func propByIndex(t reflect.Type, x []int) *Properties {
-	if len(x) != 1 {
-		fmt.Fprintf(os.Stderr, "proto: field index dimension %d (not 1) for type %s\n", len(x), t)
-		return nil
-	}
-	prop := GetProperties(t)
-	return prop.Prop[x[0]]
-}
-
-// Get the address and type of a pointer to a struct from an interface.
-func getbase(pb Message) (t reflect.Type, b structPointer, err error) {
-	if pb == nil {
-		err = ErrNil
-		return
-	}
-	// get the reflect type of the pointer to the struct.
-	t = reflect.TypeOf(pb)
-	// get the address of the struct.
-	value := reflect.ValueOf(pb)
-	b = toStructPointer(value)
-	return
-}
-
 // A global registry of enum types.
 // The generated code will register the generated maps by calling RegisterEnum.
 
@@ -826,20 +469,42 @@ func EnumValueMap(enumType string) map[string]int32 {
 // A registry of all linked message types.
 // The string is a fully-qualified proto name ("pkg.Message").
 var (
-	protoTypes    = make(map[string]reflect.Type)
-	revProtoTypes = make(map[reflect.Type]string)
+	protoTypedNils = make(map[string]Message)      // a map from proto names to typed nil pointers
+	protoMapTypes  = make(map[string]reflect.Type) // a map from proto names to map types
+	revProtoTypes  = make(map[reflect.Type]string)
 )
 
 // RegisterType is called from generated code and maps from the fully qualified
 // proto name to the type (pointer to struct) of the protocol buffer.
 func RegisterType(x Message, name string) {
-	if _, ok := protoTypes[name]; ok {
+	if _, ok := protoTypedNils[name]; ok {
 		// TODO: Some day, make this a panic.
 		log.Printf("proto: duplicate proto type registered: %s", name)
 		return
 	}
 	t := reflect.TypeOf(x)
-	protoTypes[name] = t
+	if v := reflect.ValueOf(x); v.Kind() == reflect.Ptr && v.Pointer() == 0 {
+		// Generated code always calls RegisterType with nil x.
+		// This check is just for extra safety.
+		protoTypedNils[name] = x
+	} else {
+		protoTypedNils[name] = reflect.Zero(t).Interface().(Message)
+	}
+	revProtoTypes[t] = name
+}
+
+// RegisterMapType is called from generated code and maps from the fully qualified
+// proto name to the native map type of the proto map definition.
+func RegisterMapType(x interface{}, name string) {
+	if reflect.TypeOf(x).Kind() != reflect.Map {
+		panic(fmt.Sprintf("RegisterMapType(%T, %q); want map", x, name))
+	}
+	if _, ok := protoMapTypes[name]; ok {
+		log.Printf("proto: duplicate proto type registered: %s", name)
+		return
+	}
+	t := reflect.TypeOf(x)
+	protoMapTypes[name] = t
 	revProtoTypes[t] = name
 }
 
@@ -855,7 +520,14 @@ func MessageName(x Message) string {
 }
 
 // MessageType returns the message type (pointer to struct) for a named message.
-func MessageType(name string) reflect.Type { return protoTypes[name] }
+// The type is not guaranteed to implement proto.Message if the name refers to a
+// map entry.
+func MessageType(name string) reflect.Type {
+	if t, ok := protoTypedNils[name]; ok {
+		return reflect.TypeOf(t)
+	}
+	return protoMapTypes[name]
+}
 
 // A registry of all linked proto files.
 var (
diff --git a/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go b/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
deleted file mode 100644
index cc4d0489f1..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.pb.go
+++ /dev/null
@@ -1,347 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: proto3_proto/proto3.proto
-// DO NOT EDIT!
-
-/*
-Package proto3_proto is a generated protocol buffer package.
-
-It is generated from these files:
-	proto3_proto/proto3.proto
-
-It has these top-level messages:
-	Message
-	Nested
-	MessageWithMap
-	IntMap
-	IntMaps
-*/
-package proto3_proto
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/ptypes/any"
-import testdata "github.com/golang/protobuf/proto/testdata"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type Message_Humour int32
-
-const (
-	Message_UNKNOWN     Message_Humour = 0
-	Message_PUNS        Message_Humour = 1
-	Message_SLAPSTICK   Message_Humour = 2
-	Message_BILL_BAILEY Message_Humour = 3
-)
-
-var Message_Humour_name = map[int32]string{
-	0: "UNKNOWN",
-	1: "PUNS",
-	2: "SLAPSTICK",
-	3: "BILL_BAILEY",
-}
-var Message_Humour_value = map[string]int32{
-	"UNKNOWN":     0,
-	"PUNS":        1,
-	"SLAPSTICK":   2,
-	"BILL_BAILEY": 3,
-}
-
-func (x Message_Humour) String() string {
-	return proto.EnumName(Message_Humour_name, int32(x))
-}
-func (Message_Humour) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} }
-
-type Message struct {
-	Name         string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Hilarity     Message_Humour                   `protobuf:"varint,2,opt,name=hilarity,enum=proto3_proto.Message_Humour" json:"hilarity,omitempty"`
-	HeightInCm   uint32                           `protobuf:"varint,3,opt,name=height_in_cm,json=heightInCm" json:"height_in_cm,omitempty"`
-	Data         []byte                           `protobuf:"bytes,4,opt,name=data,proto3" json:"data,omitempty"`
-	ResultCount  int64                            `protobuf:"varint,7,opt,name=result_count,json=resultCount" json:"result_count,omitempty"`
-	TrueScotsman bool                             `protobuf:"varint,8,opt,name=true_scotsman,json=trueScotsman" json:"true_scotsman,omitempty"`
-	Score        float32                          `protobuf:"fixed32,9,opt,name=score" json:"score,omitempty"`
-	Key          []uint64                         `protobuf:"varint,5,rep,packed,name=key" json:"key,omitempty"`
-	ShortKey     []int32                          `protobuf:"varint,19,rep,packed,name=short_key,json=shortKey" json:"short_key,omitempty"`
-	Nested       *Nested                          `protobuf:"bytes,6,opt,name=nested" json:"nested,omitempty"`
-	RFunny       []Message_Humour                 `protobuf:"varint,16,rep,packed,name=r_funny,json=rFunny,enum=proto3_proto.Message_Humour" json:"r_funny,omitempty"`
-	Terrain      map[string]*Nested               `protobuf:"bytes,10,rep,name=terrain" json:"terrain,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Proto2Field  *testdata.SubDefaults            `protobuf:"bytes,11,opt,name=proto2_field,json=proto2Field" json:"proto2_field,omitempty"`
-	Proto2Value  map[string]*testdata.SubDefaults `protobuf:"bytes,13,rep,name=proto2_value,json=proto2Value" json:"proto2_value,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Anything     *google_protobuf.Any             `protobuf:"bytes,14,opt,name=anything" json:"anything,omitempty"`
-	ManyThings   []*google_protobuf.Any           `protobuf:"bytes,15,rep,name=many_things,json=manyThings" json:"many_things,omitempty"`
-	Submessage   *Message                         `protobuf:"bytes,17,opt,name=submessage" json:"submessage,omitempty"`
-	Children     []*Message                       `protobuf:"bytes,18,rep,name=children" json:"children,omitempty"`
-}
-
-func (m *Message) Reset()                    { *m = Message{} }
-func (m *Message) String() string            { return proto.CompactTextString(m) }
-func (*Message) ProtoMessage()               {}
-func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Message) GetName() string {
-	if m != nil {
-		return m.Name
-	}
-	return ""
-}
-
-func (m *Message) GetHilarity() Message_Humour {
-	if m != nil {
-		return m.Hilarity
-	}
-	return Message_UNKNOWN
-}
-
-func (m *Message) GetHeightInCm() uint32 {
-	if m != nil {
-		return m.HeightInCm
-	}
-	return 0
-}
-
-func (m *Message) GetData() []byte {
-	if m != nil {
-		return m.Data
-	}
-	return nil
-}
-
-func (m *Message) GetResultCount() int64 {
-	if m != nil {
-		return m.ResultCount
-	}
-	return 0
-}
-
-func (m *Message) GetTrueScotsman() bool {
-	if m != nil {
-		return m.TrueScotsman
-	}
-	return false
-}
-
-func (m *Message) GetScore() float32 {
-	if m != nil {
-		return m.Score
-	}
-	return 0
-}
-
-func (m *Message) GetKey() []uint64 {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Message) GetShortKey() []int32 {
-	if m != nil {
-		return m.ShortKey
-	}
-	return nil
-}
-
-func (m *Message) GetNested() *Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *Message) GetRFunny() []Message_Humour {
-	if m != nil {
-		return m.RFunny
-	}
-	return nil
-}
-
-func (m *Message) GetTerrain() map[string]*Nested {
-	if m != nil {
-		return m.Terrain
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Field() *testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Field
-	}
-	return nil
-}
-
-func (m *Message) GetProto2Value() map[string]*testdata.SubDefaults {
-	if m != nil {
-		return m.Proto2Value
-	}
-	return nil
-}
-
-func (m *Message) GetAnything() *google_protobuf.Any {
-	if m != nil {
-		return m.Anything
-	}
-	return nil
-}
-
-func (m *Message) GetManyThings() []*google_protobuf.Any {
-	if m != nil {
-		return m.ManyThings
-	}
-	return nil
-}
-
-func (m *Message) GetSubmessage() *Message {
-	if m != nil {
-		return m.Submessage
-	}
-	return nil
-}
-
-func (m *Message) GetChildren() []*Message {
-	if m != nil {
-		return m.Children
-	}
-	return nil
-}
-
-type Nested struct {
-	Bunny string `protobuf:"bytes,1,opt,name=bunny" json:"bunny,omitempty"`
-	Cute  bool   `protobuf:"varint,2,opt,name=cute" json:"cute,omitempty"`
-}
-
-func (m *Nested) Reset()                    { *m = Nested{} }
-func (m *Nested) String() string            { return proto.CompactTextString(m) }
-func (*Nested) ProtoMessage()               {}
-func (*Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *Nested) GetBunny() string {
-	if m != nil {
-		return m.Bunny
-	}
-	return ""
-}
-
-func (m *Nested) GetCute() bool {
-	if m != nil {
-		return m.Cute
-	}
-	return false
-}
-
-type MessageWithMap struct {
-	ByteMapping map[bool][]byte `protobuf:"bytes,1,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value,proto3"`
-}
-
-func (m *MessageWithMap) Reset()                    { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string            { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()               {}
-func (*MessageWithMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-type IntMap struct {
-	Rtt map[int32]int32 `protobuf:"bytes,1,rep,name=rtt" json:"rtt,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"varint,2,opt,name=value"`
-}
-
-func (m *IntMap) Reset()                    { *m = IntMap{} }
-func (m *IntMap) String() string            { return proto.CompactTextString(m) }
-func (*IntMap) ProtoMessage()               {}
-func (*IntMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *IntMap) GetRtt() map[int32]int32 {
-	if m != nil {
-		return m.Rtt
-	}
-	return nil
-}
-
-type IntMaps struct {
-	Maps []*IntMap `protobuf:"bytes,1,rep,name=maps" json:"maps,omitempty"`
-}
-
-func (m *IntMaps) Reset()                    { *m = IntMaps{} }
-func (m *IntMaps) String() string            { return proto.CompactTextString(m) }
-func (*IntMaps) ProtoMessage()               {}
-func (*IntMaps) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *IntMaps) GetMaps() []*IntMap {
-	if m != nil {
-		return m.Maps
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Message)(nil), "proto3_proto.Message")
-	proto.RegisterType((*Nested)(nil), "proto3_proto.Nested")
-	proto.RegisterType((*MessageWithMap)(nil), "proto3_proto.MessageWithMap")
-	proto.RegisterType((*IntMap)(nil), "proto3_proto.IntMap")
-	proto.RegisterType((*IntMaps)(nil), "proto3_proto.IntMaps")
-	proto.RegisterEnum("proto3_proto.Message_Humour", Message_Humour_name, Message_Humour_value)
-}
-
-func init() { proto.RegisterFile("proto3_proto/proto3.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 733 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x84, 0x53, 0x6d, 0x6f, 0xf3, 0x34,
-	0x14, 0x25, 0x4d, 0x5f, 0xd2, 0x9b, 0x74, 0x0b, 0x5e, 0x91, 0xbc, 0x02, 0x52, 0x28, 0x12, 0x8a,
-	0x78, 0x49, 0xa1, 0xd3, 0xd0, 0x84, 0x10, 0x68, 0x1b, 0x9b, 0xa8, 0xd6, 0x95, 0xca, 0xdd, 0x98,
-	0xf8, 0x14, 0xa5, 0xad, 0xdb, 0x46, 0x34, 0x4e, 0x49, 0x1c, 0xa4, 0xfc, 0x1d, 0xfe, 0x28, 0x8f,
-	0x6c, 0xa7, 0x5d, 0x36, 0x65, 0xcf, 0xf3, 0x29, 0xf6, 0xf1, 0xb9, 0xf7, 0x9c, 0x1c, 0x5f, 0xc3,
-	0xe9, 0x2e, 0x89, 0x79, 0x7c, 0xe6, 0xcb, 0xcf, 0x40, 0x6d, 0x3c, 0xf9, 0x41, 0x56, 0xf9, 0xa8,
-	0x77, 0xba, 0x8e, 0xe3, 0xf5, 0x96, 0x2a, 0xca, 0x3c, 0x5b, 0x0d, 0x02, 0x96, 0x2b, 0x62, 0xef,
-	0x84, 0xd3, 0x94, 0x2f, 0x03, 0x1e, 0x0c, 0xc4, 0x42, 0x81, 0xfd, 0xff, 0x5b, 0xd0, 0xba, 0xa7,
-	0x69, 0x1a, 0xac, 0x29, 0x42, 0x50, 0x67, 0x41, 0x44, 0xb1, 0xe6, 0x68, 0x6e, 0x9b, 0xc8, 0x35,
-	0xba, 0x00, 0x63, 0x13, 0x6e, 0x83, 0x24, 0xe4, 0x39, 0xae, 0x39, 0x9a, 0x7b, 0x34, 0xfc, 0xcc,
-	0x2b, 0x0b, 0x7a, 0x45, 0xb1, 0xf7, 0x7b, 0x16, 0xc5, 0x59, 0x42, 0x0e, 0x6c, 0xe4, 0x80, 0xb5,
-	0xa1, 0xe1, 0x7a, 0xc3, 0xfd, 0x90, 0xf9, 0x8b, 0x08, 0xeb, 0x8e, 0xe6, 0x76, 0x08, 0x28, 0x6c,
-	0xc4, 0xae, 0x23, 0xa1, 0x27, 0xec, 0xe0, 0xba, 0xa3, 0xb9, 0x16, 0x91, 0x6b, 0xf4, 0x05, 0x58,
-	0x09, 0x4d, 0xb3, 0x2d, 0xf7, 0x17, 0x71, 0xc6, 0x38, 0x6e, 0x39, 0x9a, 0xab, 0x13, 0x53, 0x61,
-	0xd7, 0x02, 0x42, 0x5f, 0x42, 0x87, 0x27, 0x19, 0xf5, 0xd3, 0x45, 0xcc, 0xd3, 0x28, 0x60, 0xd8,
-	0x70, 0x34, 0xd7, 0x20, 0x96, 0x00, 0x67, 0x05, 0x86, 0xba, 0xd0, 0x48, 0x17, 0x71, 0x42, 0x71,
-	0xdb, 0xd1, 0xdc, 0x1a, 0x51, 0x1b, 0x64, 0x83, 0xfe, 0x37, 0xcd, 0x71, 0xc3, 0xd1, 0xdd, 0x3a,
-	0x11, 0x4b, 0xf4, 0x29, 0xb4, 0xd3, 0x4d, 0x9c, 0x70, 0x5f, 0xe0, 0x27, 0x8e, 0xee, 0x36, 0x88,
-	0x21, 0x81, 0x3b, 0x9a, 0xa3, 0x6f, 0xa1, 0xc9, 0x68, 0xca, 0xe9, 0x12, 0x37, 0x1d, 0xcd, 0x35,
-	0x87, 0xdd, 0x97, 0xbf, 0x3e, 0x91, 0x67, 0xa4, 0xe0, 0xa0, 0x73, 0x68, 0x25, 0xfe, 0x2a, 0x63,
-	0x2c, 0xc7, 0xb6, 0xa3, 0x7f, 0x30, 0xa9, 0x66, 0x72, 0x2b, 0xb8, 0xe8, 0x67, 0x68, 0x71, 0x9a,
-	0x24, 0x41, 0xc8, 0x30, 0x38, 0xba, 0x6b, 0x0e, 0xfb, 0xd5, 0x65, 0x0f, 0x8a, 0x74, 0xc3, 0x78,
-	0x92, 0x93, 0x7d, 0x09, 0xba, 0x00, 0x75, 0xff, 0x43, 0x7f, 0x15, 0xd2, 0xed, 0x12, 0x9b, 0xd2,
-	0xe8, 0x27, 0xde, 0xfe, 0xae, 0xbd, 0x59, 0x36, 0xff, 0x8d, 0xae, 0x82, 0x6c, 0xcb, 0x53, 0x62,
-	0x2a, 0xea, 0xad, 0x60, 0xa2, 0xd1, 0xa1, 0xf2, 0xdf, 0x60, 0x9b, 0x51, 0xdc, 0x91, 0xe2, 0x5f,
-	0x55, 0x8b, 0x4f, 0x25, 0xf3, 0x4f, 0x41, 0x54, 0x06, 0x8a, 0x56, 0x12, 0x41, 0xdf, 0x83, 0x11,
-	0xb0, 0x9c, 0x6f, 0x42, 0xb6, 0xc6, 0x47, 0x45, 0x52, 0x6a, 0x0e, 0xbd, 0xfd, 0x1c, 0x7a, 0x97,
-	0x2c, 0x27, 0x07, 0x16, 0x3a, 0x07, 0x33, 0x0a, 0x58, 0xee, 0xcb, 0x5d, 0x8a, 0x8f, 0xa5, 0x76,
-	0x75, 0x11, 0x08, 0xe2, 0x83, 0xe4, 0xa1, 0x73, 0x80, 0x34, 0x9b, 0x47, 0xca, 0x14, 0xfe, 0xb8,
-	0xf8, 0xd7, 0x2a, 0xc7, 0xa4, 0x44, 0x44, 0x3f, 0x80, 0xb1, 0xd8, 0x84, 0xdb, 0x65, 0x42, 0x19,
-	0x46, 0x52, 0xea, 0x8d, 0xa2, 0x03, 0xad, 0x37, 0x05, 0xab, 0x1c, 0xf8, 0x7e, 0x72, 0xd4, 0xd3,
-	0x90, 0x93, 0xf3, 0x35, 0x34, 0x54, 0x70, 0xb5, 0xf7, 0xcc, 0x86, 0xa2, 0xfc, 0x54, 0xbb, 0xd0,
-	0x7a, 0x8f, 0x60, 0xbf, 0x4e, 0xb1, 0xa2, 0xeb, 0x37, 0x2f, 0xbb, 0xbe, 0x71, 0x91, 0xcf, 0x6d,
-	0xfb, 0xbf, 0x42, 0x53, 0x0d, 0x14, 0x32, 0xa1, 0xf5, 0x38, 0xb9, 0x9b, 0xfc, 0xf1, 0x34, 0xb1,
-	0x3f, 0x42, 0x06, 0xd4, 0xa7, 0x8f, 0x93, 0x99, 0xad, 0xa1, 0x0e, 0xb4, 0x67, 0xe3, 0xcb, 0xe9,
-	0xec, 0x61, 0x74, 0x7d, 0x67, 0xd7, 0xd0, 0x31, 0x98, 0x57, 0xa3, 0xf1, 0xd8, 0xbf, 0xba, 0x1c,
-	0x8d, 0x6f, 0xfe, 0xb2, 0xf5, 0xfe, 0x10, 0x9a, 0xca, 0xac, 0x78, 0x33, 0x73, 0x39, 0xbe, 0xca,
-	0x8f, 0xda, 0x88, 0x57, 0xba, 0xc8, 0xb8, 0x32, 0x64, 0x10, 0xb9, 0xee, 0xff, 0xa7, 0xc1, 0x51,
-	0x91, 0xd9, 0x53, 0xc8, 0x37, 0xf7, 0xc1, 0x0e, 0x4d, 0xc1, 0x9a, 0xe7, 0x9c, 0xfa, 0x51, 0xb0,
-	0xdb, 0x89, 0x39, 0xd0, 0x64, 0xce, 0xdf, 0x55, 0xe6, 0x5c, 0xd4, 0x78, 0x57, 0x39, 0xa7, 0xf7,
-	0x8a, 0x5f, 0x4c, 0xd5, 0xfc, 0x19, 0xe9, 0xfd, 0x02, 0xf6, 0x6b, 0x42, 0x39, 0x30, 0x43, 0x05,
-	0xd6, 0x2d, 0x07, 0x66, 0x95, 0x93, 0xf9, 0x07, 0x9a, 0x23, 0xc6, 0x85, 0xb7, 0x01, 0xe8, 0x09,
-	0xe7, 0x85, 0xa5, 0xcf, 0x5f, 0x5a, 0x52, 0x14, 0x8f, 0x70, 0xae, 0x2c, 0x08, 0x66, 0xef, 0x47,
-	0x30, 0xf6, 0x40, 0x59, 0xb2, 0x51, 0x21, 0xd9, 0x28, 0x4b, 0x9e, 0x41, 0x4b, 0xf5, 0x4b, 0x91,
-	0x0b, 0xf5, 0x28, 0xd8, 0xa5, 0x85, 0x68, 0xb7, 0x4a, 0x94, 0x48, 0xc6, 0xbc, 0xa9, 0x8e, 0xde,
-	0x05, 0x00, 0x00, 0xff, 0xff, 0x75, 0x38, 0xad, 0x84, 0xe4, 0x05, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto b/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
deleted file mode 100644
index 204865571b..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/proto3_proto/proto3.proto
+++ /dev/null
@@ -1,87 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-import "google/protobuf/any.proto";
-import "testdata/test.proto";
-
-package proto3_proto;
-
-message Message {
-  enum Humour {
-    UNKNOWN = 0;
-    PUNS = 1;
-    SLAPSTICK = 2;
-    BILL_BAILEY = 3;
-  }
-
-  string name = 1;
-  Humour hilarity = 2;
-  uint32 height_in_cm = 3;
-  bytes data = 4;
-  int64 result_count = 7;
-  bool true_scotsman = 8;
-  float score = 9;
-
-  repeated uint64 key = 5;
-  repeated int32 short_key = 19;
-  Nested nested = 6;
-  repeated Humour r_funny = 16;
-
-  map<string, Nested> terrain = 10;
-  testdata.SubDefaults proto2_field = 11;
-  map<string, testdata.SubDefaults> proto2_value = 13;
-
-  google.protobuf.Any anything = 14;
-  repeated google.protobuf.Any many_things = 15;
-
-  Message submessage = 17;
-  repeated Message children = 18;
-}
-
-message Nested {
-  string bunny = 1;
-  bool cute = 2;
-}
-
-message MessageWithMap {
-  map<bool, bytes> byte_mapping = 1;
-}
-
-
-message IntMap {
-  map<int32, int32> rtt = 1;
-}
-
-message IntMaps {
-  repeated IntMap maps = 1;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/proto3_test.go b/installer/vendor/github.com/golang/protobuf/proto/proto3_test.go
deleted file mode 100644
index 735837f2de..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/proto3_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/proto/proto3_proto"
-	tpb "github.com/golang/protobuf/proto/testdata"
-)
-
-func TestProto3ZeroValues(t *testing.T) {
-	tests := []struct {
-		desc string
-		m    proto.Message
-	}{
-		{"zero message", &pb.Message{}},
-		{"empty bytes field", &pb.Message{Data: []byte{}}},
-	}
-	for _, test := range tests {
-		b, err := proto.Marshal(test.m)
-		if err != nil {
-			t.Errorf("%s: proto.Marshal: %v", test.desc, err)
-			continue
-		}
-		if len(b) > 0 {
-			t.Errorf("%s: Encoding is non-empty: %q", test.desc, b)
-		}
-	}
-}
-
-func TestRoundTripProto3(t *testing.T) {
-	m := &pb.Message{
-		Name:         "David",          // (2 | 1<<3): 0x0a 0x05 "David"
-		Hilarity:     pb.Message_PUNS,  // (0 | 2<<3): 0x10 0x01
-		HeightInCm:   178,              // (0 | 3<<3): 0x18 0xb2 0x01
-		Data:         []byte("roboto"), // (2 | 4<<3): 0x20 0x06 "roboto"
-		ResultCount:  47,               // (0 | 7<<3): 0x38 0x2f
-		TrueScotsman: true,             // (0 | 8<<3): 0x40 0x01
-		Score:        8.1,              // (5 | 9<<3): 0x4d <8.1>
-
-		Key: []uint64{1, 0xdeadbeef},
-		Nested: &pb.Nested{
-			Bunny: "Monty",
-		},
-	}
-	t.Logf(" m: %v", m)
-
-	b, err := proto.Marshal(m)
-	if err != nil {
-		t.Fatalf("proto.Marshal: %v", err)
-	}
-	t.Logf(" b: %q", b)
-
-	m2 := new(pb.Message)
-	if err := proto.Unmarshal(b, m2); err != nil {
-		t.Fatalf("proto.Unmarshal: %v", err)
-	}
-	t.Logf("m2: %v", m2)
-
-	if !proto.Equal(m, m2) {
-		t.Errorf("proto.Equal returned false:\n m: %v\nm2: %v", m, m2)
-	}
-}
-
-func TestGettersForBasicTypesExist(t *testing.T) {
-	var m pb.Message
-	if got := m.GetNested().GetBunny(); got != "" {
-		t.Errorf("m.GetNested().GetBunny() = %q, want empty string", got)
-	}
-	if got := m.GetNested().GetCute(); got {
-		t.Errorf("m.GetNested().GetCute() = %t, want false", got)
-	}
-}
-
-func TestProto3SetDefaults(t *testing.T) {
-	in := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: new(tpb.SubDefaults),
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": new(tpb.SubDefaults),
-		},
-	}
-
-	got := proto.Clone(in).(*pb.Message)
-	proto.SetDefaults(got)
-
-	// There are no defaults in proto3.  Everything should be the zero value, but
-	// we need to remember to set defaults for nested proto2 messages.
-	want := &pb.Message{
-		Terrain: map[string]*pb.Nested{
-			"meadow": new(pb.Nested),
-		},
-		Proto2Field: &tpb.SubDefaults{N: proto.Int64(7)},
-		Proto2Value: map[string]*tpb.SubDefaults{
-			"badlands": &tpb.SubDefaults{N: proto.Int64(7)},
-		},
-	}
-
-	if !proto.Equal(got, want) {
-		t.Errorf("with in = %v\nproto.SetDefaults(in) =>\ngot %v\nwant %v", in, got, want)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/size2_test.go b/installer/vendor/github.com/golang/protobuf/proto/size2_test.go
deleted file mode 100644
index a2729c39a1..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/size2_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto
-
-import (
-	"testing"
-)
-
-// This is a separate file and package from size_test.go because that one uses
-// generated messages and thus may not be in package proto without having a circular
-// dependency, whereas this file tests unexported details of size.go.
-
-func TestVarintSize(t *testing.T) {
-	// Check the edge cases carefully.
-	testCases := []struct {
-		n    uint64
-		size int
-	}{
-		{0, 1},
-		{1, 1},
-		{127, 1},
-		{128, 2},
-		{16383, 2},
-		{16384, 3},
-		{1<<63 - 1, 9},
-		{1 << 63, 10},
-	}
-	for _, tc := range testCases {
-		size := sizeVarint(tc.n)
-		if size != tc.size {
-			t.Errorf("sizeVarint(%d) = %d, want %d", tc.n, size, tc.size)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/size_test.go b/installer/vendor/github.com/golang/protobuf/proto/size_test.go
deleted file mode 100644
index af1034dc7b..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/size_test.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"log"
-	"strings"
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-var messageWithExtension1 = &pb.MyMessage{Count: Int32(7)}
-
-// messageWithExtension2 is in equal_test.go.
-var messageWithExtension3 = &pb.MyMessage{Count: Int32(8)}
-
-func init() {
-	if err := SetExtension(messageWithExtension1, pb.E_Ext_More, &pb.Ext{Data: String("Abbott")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-	if err := SetExtension(messageWithExtension3, pb.E_Ext_More, &pb.Ext{Data: String("Costello")}); err != nil {
-		log.Panicf("SetExtension: %v", err)
-	}
-
-	// Force messageWithExtension3 to have the extension encoded.
-	Marshal(messageWithExtension3)
-
-}
-
-var SizeTests = []struct {
-	desc string
-	pb   Message
-}{
-	{"empty", &pb.OtherMessage{}},
-	// Basic types.
-	{"bool", &pb.Defaults{F_Bool: Bool(true)}},
-	{"int32", &pb.Defaults{F_Int32: Int32(12)}},
-	{"negative int32", &pb.Defaults{F_Int32: Int32(-1)}},
-	{"small int64", &pb.Defaults{F_Int64: Int64(1)}},
-	{"big int64", &pb.Defaults{F_Int64: Int64(1 << 20)}},
-	{"negative int64", &pb.Defaults{F_Int64: Int64(-1)}},
-	{"fixed32", &pb.Defaults{F_Fixed32: Uint32(71)}},
-	{"fixed64", &pb.Defaults{F_Fixed64: Uint64(72)}},
-	{"uint32", &pb.Defaults{F_Uint32: Uint32(123)}},
-	{"uint64", &pb.Defaults{F_Uint64: Uint64(124)}},
-	{"float", &pb.Defaults{F_Float: Float32(12.6)}},
-	{"double", &pb.Defaults{F_Double: Float64(13.9)}},
-	{"string", &pb.Defaults{F_String: String("niles")}},
-	{"bytes", &pb.Defaults{F_Bytes: []byte("wowsa")}},
-	{"bytes, empty", &pb.Defaults{F_Bytes: []byte{}}},
-	{"sint32", &pb.Defaults{F_Sint32: Int32(65)}},
-	{"sint64", &pb.Defaults{F_Sint64: Int64(67)}},
-	{"enum", &pb.Defaults{F_Enum: pb.Defaults_BLUE.Enum()}},
-	// Repeated.
-	{"empty repeated bool", &pb.MoreRepeated{Bools: []bool{}}},
-	{"repeated bool", &pb.MoreRepeated{Bools: []bool{false, true, true, false}}},
-	{"packed repeated bool", &pb.MoreRepeated{BoolsPacked: []bool{false, true, true, false, true, true, true}}},
-	{"repeated int32", &pb.MoreRepeated{Ints: []int32{1, 12203, 1729, -1}}},
-	{"repeated int32 packed", &pb.MoreRepeated{IntsPacked: []int32{1, 12203, 1729}}},
-	{"repeated int64 packed", &pb.MoreRepeated{Int64SPacked: []int64{
-		// Need enough large numbers to verify that the header is counting the number of bytes
-		// for the field, not the number of elements.
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-		1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62, 1 << 62,
-	}}},
-	{"repeated string", &pb.MoreRepeated{Strings: []string{"r", "ken", "gri"}}},
-	{"repeated fixed", &pb.MoreRepeated{Fixeds: []uint32{1, 2, 3, 4}}},
-	// Nested.
-	{"nested", &pb.OldMessage{Nested: &pb.OldMessage_Nested{Name: String("whatever")}}},
-	{"group", &pb.GroupOld{G: &pb.GroupOld_G{X: Int32(12345)}}},
-	// Other things.
-	{"unrecognized", &pb.MoreRepeated{XXX_unrecognized: []byte{13<<3 | 0, 4}}},
-	{"extension (unencoded)", messageWithExtension1},
-	{"extension (encoded)", messageWithExtension3},
-	// proto3 message
-	{"proto3 empty", &proto3pb.Message{}},
-	{"proto3 bool", &proto3pb.Message{TrueScotsman: true}},
-	{"proto3 int64", &proto3pb.Message{ResultCount: 1}},
-	{"proto3 uint32", &proto3pb.Message{HeightInCm: 123}},
-	{"proto3 float", &proto3pb.Message{Score: 12.6}},
-	{"proto3 string", &proto3pb.Message{Name: "Snezana"}},
-	{"proto3 bytes", &proto3pb.Message{Data: []byte("wowsa")}},
-	{"proto3 bytes, empty", &proto3pb.Message{Data: []byte{}}},
-	{"proto3 enum", &proto3pb.Message{Hilarity: proto3pb.Message_PUNS}},
-	{"proto3 map field with empty bytes", &proto3pb.MessageWithMap{ByteMapping: map[bool][]byte{false: []byte{}}}},
-
-	{"map field", &pb.MessageWithMap{NameMapping: map[int32]string{1: "Rob", 7: "Andrew"}}},
-	{"map field with message", &pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{0x7001: &pb.FloatingPoint{F: Float64(2.0)}}}},
-	{"map field with bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: []byte("this time for sure")}}},
-	{"map field with empty bytes", &pb.MessageWithMap{ByteMapping: map[bool][]byte{true: []byte{}}}},
-
-	{"map field with big entry", &pb.MessageWithMap{NameMapping: map[int32]string{8: strings.Repeat("x", 125)}}},
-	{"map field with big key and val", &pb.MessageWithMap{StrToStr: map[string]string{strings.Repeat("x", 70): strings.Repeat("y", 70)}}},
-	{"map field with big numeric key", &pb.MessageWithMap{NameMapping: map[int32]string{0xf00d: "om nom nom"}}},
-
-	{"oneof not set", &pb.Oneof{}},
-	{"oneof bool", &pb.Oneof{Union: &pb.Oneof_F_Bool{true}}},
-	{"oneof zero int32", &pb.Oneof{Union: &pb.Oneof_F_Int32{0}}},
-	{"oneof big int32", &pb.Oneof{Union: &pb.Oneof_F_Int32{1 << 20}}},
-	{"oneof int64", &pb.Oneof{Union: &pb.Oneof_F_Int64{42}}},
-	{"oneof fixed32", &pb.Oneof{Union: &pb.Oneof_F_Fixed32{43}}},
-	{"oneof fixed64", &pb.Oneof{Union: &pb.Oneof_F_Fixed64{44}}},
-	{"oneof uint32", &pb.Oneof{Union: &pb.Oneof_F_Uint32{45}}},
-	{"oneof uint64", &pb.Oneof{Union: &pb.Oneof_F_Uint64{46}}},
-	{"oneof float", &pb.Oneof{Union: &pb.Oneof_F_Float{47.1}}},
-	{"oneof double", &pb.Oneof{Union: &pb.Oneof_F_Double{48.9}}},
-	{"oneof string", &pb.Oneof{Union: &pb.Oneof_F_String{"Rhythmic Fman"}}},
-	{"oneof bytes", &pb.Oneof{Union: &pb.Oneof_F_Bytes{[]byte("let go")}}},
-	{"oneof sint32", &pb.Oneof{Union: &pb.Oneof_F_Sint32{50}}},
-	{"oneof sint64", &pb.Oneof{Union: &pb.Oneof_F_Sint64{51}}},
-	{"oneof enum", &pb.Oneof{Union: &pb.Oneof_F_Enum{pb.MyMessage_BLUE}}},
-	{"message for oneof", &pb.GoTestField{Label: String("k"), Type: String("v")}},
-	{"oneof message", &pb.Oneof{Union: &pb.Oneof_F_Message{&pb.GoTestField{Label: String("k"), Type: String("v")}}}},
-	{"oneof group", &pb.Oneof{Union: &pb.Oneof_FGroup{&pb.Oneof_F_Group{X: Int32(52)}}}},
-	{"oneof largest tag", &pb.Oneof{Union: &pb.Oneof_F_Largest_Tag{1}}},
-	{"multiple oneofs", &pb.Oneof{Union: &pb.Oneof_F_Int32{1}, Tormato: &pb.Oneof_Value{2}}},
-}
-
-func TestSize(t *testing.T) {
-	for _, tc := range SizeTests {
-		size := Size(tc.pb)
-		b, err := Marshal(tc.pb)
-		if err != nil {
-			t.Errorf("%v: Marshal failed: %v", tc.desc, err)
-			continue
-		}
-		if size != len(b) {
-			t.Errorf("%v: Size(%v) = %d, want %d", tc.desc, tc.pb, size, len(b))
-			t.Logf("%v: bytes: %#v", tc.desc, b)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/table_marshal.go b/installer/vendor/github.com/golang/protobuf/proto/table_marshal.go
new file mode 100644
index 0000000000..0f212b3029
--- /dev/null
+++ b/installer/vendor/github.com/golang/protobuf/proto/table_marshal.go
@@ -0,0 +1,2681 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"errors"
+	"fmt"
+	"math"
+	"reflect"
+	"sort"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"unicode/utf8"
+)
+
+// a sizer takes a pointer to a field and the size of its tag, computes the size of
+// the encoded data.
+type sizer func(pointer, int) int
+
+// a marshaler takes a byte slice, a pointer to a field, and its tag (in wire format),
+// marshals the field to the end of the slice, returns the slice and error (if any).
+type marshaler func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error)
+
+// marshalInfo is the information used for marshaling a message.
+type marshalInfo struct {
+	typ          reflect.Type
+	fields       []*marshalFieldInfo
+	unrecognized field                      // offset of XXX_unrecognized
+	extensions   field                      // offset of XXX_InternalExtensions
+	v1extensions field                      // offset of XXX_extensions
+	sizecache    field                      // offset of XXX_sizecache
+	initialized  int32                      // 0 -- only typ is set, 1 -- fully initialized
+	messageset   bool                       // uses message set wire format
+	hasmarshaler bool                       // has custom marshaler
+	sync.RWMutex                            // protect extElems map, also for initialization
+	extElems     map[int32]*marshalElemInfo // info of extension elements
+}
+
+// marshalFieldInfo is the information used for marshaling a field of a message.
+type marshalFieldInfo struct {
+	field      field
+	wiretag    uint64 // tag in wire format
+	tagsize    int    // size of tag in wire format
+	sizer      sizer
+	marshaler  marshaler
+	isPointer  bool
+	required   bool                              // field is required
+	name       string                            // name of the field, for error reporting
+	oneofElems map[reflect.Type]*marshalElemInfo // info of oneof elements
+}
+
+// marshalElemInfo is the information used for marshaling an extension or oneof element.
+type marshalElemInfo struct {
+	wiretag   uint64 // tag in wire format
+	tagsize   int    // size of tag in wire format
+	sizer     sizer
+	marshaler marshaler
+	isptr     bool // elem is pointer typed, thus interface of this type is a direct interface (extension only)
+}
+
+var (
+	marshalInfoMap  = map[reflect.Type]*marshalInfo{}
+	marshalInfoLock sync.Mutex
+)
+
+// getMarshalInfo returns the information to marshal a given type of message.
+// The info it returns may not necessarily initialized.
+// t is the type of the message (NOT the pointer to it).
+func getMarshalInfo(t reflect.Type) *marshalInfo {
+	marshalInfoLock.Lock()
+	u, ok := marshalInfoMap[t]
+	if !ok {
+		u = &marshalInfo{typ: t}
+		marshalInfoMap[t] = u
+	}
+	marshalInfoLock.Unlock()
+	return u
+}
+
+// Size is the entry point from generated code,
+// and should be ONLY called by generated code.
+// It computes the size of encoded data of msg.
+// a is a pointer to a place to store cached marshal info.
+func (a *InternalMessageInfo) Size(msg Message) int {
+	u := getMessageMarshalInfo(msg, a)
+	ptr := toPointer(&msg)
+	if ptr.isNil() {
+		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
+		// so it satisfies the interface, and msg == nil wouldn't
+		// catch it. We don't want crash in this case.
+		return 0
+	}
+	return u.size(ptr)
+}
+
+// Marshal is the entry point from generated code,
+// and should be ONLY called by generated code.
+// It marshals msg to the end of b.
+// a is a pointer to a place to store cached marshal info.
+func (a *InternalMessageInfo) Marshal(b []byte, msg Message, deterministic bool) ([]byte, error) {
+	u := getMessageMarshalInfo(msg, a)
+	ptr := toPointer(&msg)
+	if ptr.isNil() {
+		// We get here if msg is a typed nil ((*SomeMessage)(nil)),
+		// so it satisfies the interface, and msg == nil wouldn't
+		// catch it. We don't want crash in this case.
+		return b, ErrNil
+	}
+	return u.marshal(b, ptr, deterministic)
+}
+
+func getMessageMarshalInfo(msg interface{}, a *InternalMessageInfo) *marshalInfo {
+	// u := a.marshal, but atomically.
+	// We use an atomic here to ensure memory consistency.
+	u := atomicLoadMarshalInfo(&a.marshal)
+	if u == nil {
+		// Get marshal information from type of message.
+		t := reflect.ValueOf(msg).Type()
+		if t.Kind() != reflect.Ptr {
+			panic(fmt.Sprintf("cannot handle non-pointer message type %v", t))
+		}
+		u = getMarshalInfo(t.Elem())
+		// Store it in the cache for later users.
+		// a.marshal = u, but atomically.
+		atomicStoreMarshalInfo(&a.marshal, u)
+	}
+	return u
+}
+
+// size is the main function to compute the size of the encoded data of a message.
+// ptr is the pointer to the message.
+func (u *marshalInfo) size(ptr pointer) int {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeMarshalInfo()
+	}
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if u.hasmarshaler {
+		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
+		b, _ := m.Marshal()
+		return len(b)
+	}
+
+	n := 0
+	for _, f := range u.fields {
+		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
+			// nil pointer always marshals to nothing
+			continue
+		}
+		n += f.sizer(ptr.offset(f.field), f.tagsize)
+	}
+	if u.extensions.IsValid() {
+		e := ptr.offset(u.extensions).toExtensions()
+		if u.messageset {
+			n += u.sizeMessageSet(e)
+		} else {
+			n += u.sizeExtensions(e)
+		}
+	}
+	if u.v1extensions.IsValid() {
+		m := *ptr.offset(u.v1extensions).toOldExtensions()
+		n += u.sizeV1Extensions(m)
+	}
+	if u.unrecognized.IsValid() {
+		s := *ptr.offset(u.unrecognized).toBytes()
+		n += len(s)
+	}
+	// cache the result for use in marshal
+	if u.sizecache.IsValid() {
+		atomic.StoreInt32(ptr.offset(u.sizecache).toInt32(), int32(n))
+	}
+	return n
+}
+
+// cachedsize gets the size from cache. If there is no cache (i.e. message is not generated),
+// fall back to compute the size.
+func (u *marshalInfo) cachedsize(ptr pointer) int {
+	if u.sizecache.IsValid() {
+		return int(atomic.LoadInt32(ptr.offset(u.sizecache).toInt32()))
+	}
+	return u.size(ptr)
+}
+
+// marshal is the main function to marshal a message. It takes a byte slice and appends
+// the encoded data to the end of the slice, returns the slice and error (if any).
+// ptr is the pointer to the message.
+// If deterministic is true, map is marshaled in deterministic order.
+func (u *marshalInfo) marshal(b []byte, ptr pointer, deterministic bool) ([]byte, error) {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeMarshalInfo()
+	}
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if u.hasmarshaler {
+		m := ptr.asPointerTo(u.typ).Interface().(Marshaler)
+		b1, err := m.Marshal()
+		b = append(b, b1...)
+		return b, err
+	}
+
+	var err, errreq error
+	// The old marshaler encodes extensions at beginning.
+	if u.extensions.IsValid() {
+		e := ptr.offset(u.extensions).toExtensions()
+		if u.messageset {
+			b, err = u.appendMessageSet(b, e, deterministic)
+		} else {
+			b, err = u.appendExtensions(b, e, deterministic)
+		}
+		if err != nil {
+			return b, err
+		}
+	}
+	if u.v1extensions.IsValid() {
+		m := *ptr.offset(u.v1extensions).toOldExtensions()
+		b, err = u.appendV1Extensions(b, m, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	for _, f := range u.fields {
+		if f.required && errreq == nil {
+			if ptr.offset(f.field).getPointer().isNil() {
+				// Required field is not set.
+				// We record the error but keep going, to give a complete marshaling.
+				errreq = &RequiredNotSetError{f.name}
+				continue
+			}
+		}
+		if f.isPointer && ptr.offset(f.field).getPointer().isNil() {
+			// nil pointer always marshals to nothing
+			continue
+		}
+		b, err = f.marshaler(b, ptr.offset(f.field), f.wiretag, deterministic)
+		if err != nil {
+			if err1, ok := err.(*RequiredNotSetError); ok {
+				// Required field in submessage is not set.
+				// We record the error but keep going, to give a complete marshaling.
+				if errreq == nil {
+					errreq = &RequiredNotSetError{f.name + "." + err1.field}
+				}
+				continue
+			}
+			if err == errRepeatedHasNil {
+				err = errors.New("proto: repeated field " + f.name + " has nil element")
+			}
+			return b, err
+		}
+	}
+	if u.unrecognized.IsValid() {
+		s := *ptr.offset(u.unrecognized).toBytes()
+		b = append(b, s...)
+	}
+	return b, errreq
+}
+
+// computeMarshalInfo initializes the marshal info.
+func (u *marshalInfo) computeMarshalInfo() {
+	u.Lock()
+	defer u.Unlock()
+	if u.initialized != 0 { // non-atomic read is ok as it is protected by the lock
+		return
+	}
+
+	t := u.typ
+	u.unrecognized = invalidField
+	u.extensions = invalidField
+	u.v1extensions = invalidField
+	u.sizecache = invalidField
+
+	// If the message can marshal itself, let it do it, for compatibility.
+	// NOTE: This is not efficient.
+	if reflect.PtrTo(t).Implements(marshalerType) {
+		u.hasmarshaler = true
+		atomic.StoreInt32(&u.initialized, 1)
+		return
+	}
+
+	// get oneof implementers
+	var oneofImplementers []interface{}
+	if m, ok := reflect.Zero(reflect.PtrTo(t)).Interface().(oneofMessage); ok {
+		_, _, _, oneofImplementers = m.XXX_OneofFuncs()
+	}
+
+	n := t.NumField()
+
+	// deal with XXX fields first
+	for i := 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+		if !strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		switch f.Name {
+		case "XXX_sizecache":
+			u.sizecache = toField(&f)
+		case "XXX_unrecognized":
+			u.unrecognized = toField(&f)
+		case "XXX_InternalExtensions":
+			u.extensions = toField(&f)
+			u.messageset = f.Tag.Get("protobuf_messageset") == "1"
+		case "XXX_extensions":
+			u.v1extensions = toField(&f)
+		case "XXX_NoUnkeyedLiteral":
+			// nothing to do
+		default:
+			panic("unknown XXX field: " + f.Name)
+		}
+		n--
+	}
+
+	// normal fields
+	fields := make([]marshalFieldInfo, n) // batch allocation
+	u.fields = make([]*marshalFieldInfo, 0, n)
+	for i, j := 0, 0; i < t.NumField(); i++ {
+		f := t.Field(i)
+
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+		field := &fields[j]
+		j++
+		field.name = f.Name
+		u.fields = append(u.fields, field)
+		if f.Tag.Get("protobuf_oneof") != "" {
+			field.computeOneofFieldInfo(&f, oneofImplementers)
+			continue
+		}
+		if f.Tag.Get("protobuf") == "" {
+			// field has no tag (not in generated message), ignore it
+			u.fields = u.fields[:len(u.fields)-1]
+			j--
+			continue
+		}
+		field.computeMarshalFieldInfo(&f)
+	}
+
+	// fields are marshaled in tag order on the wire.
+	sort.Sort(byTag(u.fields))
+
+	atomic.StoreInt32(&u.initialized, 1)
+}
+
+// helper for sorting fields by tag
+type byTag []*marshalFieldInfo
+
+func (a byTag) Len() int           { return len(a) }
+func (a byTag) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
+func (a byTag) Less(i, j int) bool { return a[i].wiretag < a[j].wiretag }
+
+// getExtElemInfo returns the information to marshal an extension element.
+// The info it returns is initialized.
+func (u *marshalInfo) getExtElemInfo(desc *ExtensionDesc) *marshalElemInfo {
+	// get from cache first
+	u.RLock()
+	e, ok := u.extElems[desc.Field]
+	u.RUnlock()
+	if ok {
+		return e
+	}
+
+	t := reflect.TypeOf(desc.ExtensionType) // pointer or slice to basic type or struct
+	tags := strings.Split(desc.Tag, ",")
+	tag, err := strconv.Atoi(tags[1])
+	if err != nil {
+		panic("tag is not an integer")
+	}
+	wt := wiretype(tags[0])
+	sizer, marshaler := typeMarshaler(t, tags, false, false)
+	e = &marshalElemInfo{
+		wiretag:   uint64(tag)<<3 | wt,
+		tagsize:   SizeVarint(uint64(tag) << 3),
+		sizer:     sizer,
+		marshaler: marshaler,
+		isptr:     t.Kind() == reflect.Ptr,
+	}
+
+	// update cache
+	u.Lock()
+	if u.extElems == nil {
+		u.extElems = make(map[int32]*marshalElemInfo)
+	}
+	u.extElems[desc.Field] = e
+	u.Unlock()
+	return e
+}
+
+// computeMarshalFieldInfo fills up the information to marshal a field.
+func (fi *marshalFieldInfo) computeMarshalFieldInfo(f *reflect.StructField) {
+	// parse protobuf tag of the field.
+	// tag has format of "bytes,49,opt,name=foo,def=hello!"
+	tags := strings.Split(f.Tag.Get("protobuf"), ",")
+	if tags[0] == "" {
+		return
+	}
+	tag, err := strconv.Atoi(tags[1])
+	if err != nil {
+		panic("tag is not an integer")
+	}
+	wt := wiretype(tags[0])
+	if tags[2] == "req" {
+		fi.required = true
+	}
+	fi.setTag(f, tag, wt)
+	fi.setMarshaler(f, tags)
+}
+
+func (fi *marshalFieldInfo) computeOneofFieldInfo(f *reflect.StructField, oneofImplementers []interface{}) {
+	fi.field = toField(f)
+	fi.wiretag = 1<<31 - 1 // Use a large tag number, make oneofs sorted at the end. This tag will not appear on the wire.
+	fi.isPointer = true
+	fi.sizer, fi.marshaler = makeOneOfMarshaler(fi, f)
+	fi.oneofElems = make(map[reflect.Type]*marshalElemInfo)
+
+	ityp := f.Type // interface type
+	for _, o := range oneofImplementers {
+		t := reflect.TypeOf(o)
+		if !t.Implements(ityp) {
+			continue
+		}
+		sf := t.Elem().Field(0) // oneof implementer is a struct with a single field
+		tags := strings.Split(sf.Tag.Get("protobuf"), ",")
+		tag, err := strconv.Atoi(tags[1])
+		if err != nil {
+			panic("tag is not an integer")
+		}
+		wt := wiretype(tags[0])
+		sizer, marshaler := typeMarshaler(sf.Type, tags, false, true) // oneof should not omit any zero value
+		fi.oneofElems[t.Elem()] = &marshalElemInfo{
+			wiretag:   uint64(tag)<<3 | wt,
+			tagsize:   SizeVarint(uint64(tag) << 3),
+			sizer:     sizer,
+			marshaler: marshaler,
+		}
+	}
+}
+
+type oneofMessage interface {
+	XXX_OneofFuncs() (func(Message, *Buffer) error, func(Message, int, int, *Buffer) (bool, error), func(Message) int, []interface{})
+}
+
+// wiretype returns the wire encoding of the type.
+func wiretype(encoding string) uint64 {
+	switch encoding {
+	case "fixed32":
+		return WireFixed32
+	case "fixed64":
+		return WireFixed64
+	case "varint", "zigzag32", "zigzag64":
+		return WireVarint
+	case "bytes":
+		return WireBytes
+	case "group":
+		return WireStartGroup
+	}
+	panic("unknown wire type " + encoding)
+}
+
+// setTag fills up the tag (in wire format) and its size in the info of a field.
+func (fi *marshalFieldInfo) setTag(f *reflect.StructField, tag int, wt uint64) {
+	fi.field = toField(f)
+	fi.wiretag = uint64(tag)<<3 | wt
+	fi.tagsize = SizeVarint(uint64(tag) << 3)
+}
+
+// setMarshaler fills up the sizer and marshaler in the info of a field.
+func (fi *marshalFieldInfo) setMarshaler(f *reflect.StructField, tags []string) {
+	switch f.Type.Kind() {
+	case reflect.Map:
+		// map field
+		fi.isPointer = true
+		fi.sizer, fi.marshaler = makeMapMarshaler(f)
+		return
+	case reflect.Ptr, reflect.Slice:
+		fi.isPointer = true
+	}
+	fi.sizer, fi.marshaler = typeMarshaler(f.Type, tags, true, false)
+}
+
+// typeMarshaler returns the sizer and marshaler of a given field.
+// t is the type of the field.
+// tags is the generated "protobuf" tag of the field.
+// If nozero is true, zero value is not marshaled to the wire.
+// If oneof is true, it is a oneof field.
+func typeMarshaler(t reflect.Type, tags []string, nozero, oneof bool) (sizer, marshaler) {
+	encoding := tags[0]
+
+	pointer := false
+	slice := false
+	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
+		slice = true
+		t = t.Elem()
+	}
+	if t.Kind() == reflect.Ptr {
+		pointer = true
+		t = t.Elem()
+	}
+
+	packed := false
+	proto3 := false
+	for i := 2; i < len(tags); i++ {
+		if tags[i] == "packed" {
+			packed = true
+		}
+		if tags[i] == "proto3" {
+			proto3 = true
+		}
+	}
+
+	switch t.Kind() {
+	case reflect.Bool:
+		if pointer {
+			return sizeBoolPtr, appendBoolPtr
+		}
+		if slice {
+			if packed {
+				return sizeBoolPackedSlice, appendBoolPackedSlice
+			}
+			return sizeBoolSlice, appendBoolSlice
+		}
+		if nozero {
+			return sizeBoolValueNoZero, appendBoolValueNoZero
+		}
+		return sizeBoolValue, appendBoolValue
+	case reflect.Uint32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return sizeFixed32Ptr, appendFixed32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixed32PackedSlice, appendFixed32PackedSlice
+				}
+				return sizeFixed32Slice, appendFixed32Slice
+			}
+			if nozero {
+				return sizeFixed32ValueNoZero, appendFixed32ValueNoZero
+			}
+			return sizeFixed32Value, appendFixed32Value
+		case "varint":
+			if pointer {
+				return sizeVarint32Ptr, appendVarint32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarint32PackedSlice, appendVarint32PackedSlice
+				}
+				return sizeVarint32Slice, appendVarint32Slice
+			}
+			if nozero {
+				return sizeVarint32ValueNoZero, appendVarint32ValueNoZero
+			}
+			return sizeVarint32Value, appendVarint32Value
+		}
+	case reflect.Int32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return sizeFixedS32Ptr, appendFixedS32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixedS32PackedSlice, appendFixedS32PackedSlice
+				}
+				return sizeFixedS32Slice, appendFixedS32Slice
+			}
+			if nozero {
+				return sizeFixedS32ValueNoZero, appendFixedS32ValueNoZero
+			}
+			return sizeFixedS32Value, appendFixedS32Value
+		case "varint":
+			if pointer {
+				return sizeVarintS32Ptr, appendVarintS32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarintS32PackedSlice, appendVarintS32PackedSlice
+				}
+				return sizeVarintS32Slice, appendVarintS32Slice
+			}
+			if nozero {
+				return sizeVarintS32ValueNoZero, appendVarintS32ValueNoZero
+			}
+			return sizeVarintS32Value, appendVarintS32Value
+		case "zigzag32":
+			if pointer {
+				return sizeZigzag32Ptr, appendZigzag32Ptr
+			}
+			if slice {
+				if packed {
+					return sizeZigzag32PackedSlice, appendZigzag32PackedSlice
+				}
+				return sizeZigzag32Slice, appendZigzag32Slice
+			}
+			if nozero {
+				return sizeZigzag32ValueNoZero, appendZigzag32ValueNoZero
+			}
+			return sizeZigzag32Value, appendZigzag32Value
+		}
+	case reflect.Uint64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return sizeFixed64Ptr, appendFixed64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixed64PackedSlice, appendFixed64PackedSlice
+				}
+				return sizeFixed64Slice, appendFixed64Slice
+			}
+			if nozero {
+				return sizeFixed64ValueNoZero, appendFixed64ValueNoZero
+			}
+			return sizeFixed64Value, appendFixed64Value
+		case "varint":
+			if pointer {
+				return sizeVarint64Ptr, appendVarint64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarint64PackedSlice, appendVarint64PackedSlice
+				}
+				return sizeVarint64Slice, appendVarint64Slice
+			}
+			if nozero {
+				return sizeVarint64ValueNoZero, appendVarint64ValueNoZero
+			}
+			return sizeVarint64Value, appendVarint64Value
+		}
+	case reflect.Int64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return sizeFixedS64Ptr, appendFixedS64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeFixedS64PackedSlice, appendFixedS64PackedSlice
+				}
+				return sizeFixedS64Slice, appendFixedS64Slice
+			}
+			if nozero {
+				return sizeFixedS64ValueNoZero, appendFixedS64ValueNoZero
+			}
+			return sizeFixedS64Value, appendFixedS64Value
+		case "varint":
+			if pointer {
+				return sizeVarintS64Ptr, appendVarintS64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeVarintS64PackedSlice, appendVarintS64PackedSlice
+				}
+				return sizeVarintS64Slice, appendVarintS64Slice
+			}
+			if nozero {
+				return sizeVarintS64ValueNoZero, appendVarintS64ValueNoZero
+			}
+			return sizeVarintS64Value, appendVarintS64Value
+		case "zigzag64":
+			if pointer {
+				return sizeZigzag64Ptr, appendZigzag64Ptr
+			}
+			if slice {
+				if packed {
+					return sizeZigzag64PackedSlice, appendZigzag64PackedSlice
+				}
+				return sizeZigzag64Slice, appendZigzag64Slice
+			}
+			if nozero {
+				return sizeZigzag64ValueNoZero, appendZigzag64ValueNoZero
+			}
+			return sizeZigzag64Value, appendZigzag64Value
+		}
+	case reflect.Float32:
+		if pointer {
+			return sizeFloat32Ptr, appendFloat32Ptr
+		}
+		if slice {
+			if packed {
+				return sizeFloat32PackedSlice, appendFloat32PackedSlice
+			}
+			return sizeFloat32Slice, appendFloat32Slice
+		}
+		if nozero {
+			return sizeFloat32ValueNoZero, appendFloat32ValueNoZero
+		}
+		return sizeFloat32Value, appendFloat32Value
+	case reflect.Float64:
+		if pointer {
+			return sizeFloat64Ptr, appendFloat64Ptr
+		}
+		if slice {
+			if packed {
+				return sizeFloat64PackedSlice, appendFloat64PackedSlice
+			}
+			return sizeFloat64Slice, appendFloat64Slice
+		}
+		if nozero {
+			return sizeFloat64ValueNoZero, appendFloat64ValueNoZero
+		}
+		return sizeFloat64Value, appendFloat64Value
+	case reflect.String:
+		if pointer {
+			return sizeStringPtr, appendStringPtr
+		}
+		if slice {
+			return sizeStringSlice, appendStringSlice
+		}
+		if nozero {
+			return sizeStringValueNoZero, appendStringValueNoZero
+		}
+		return sizeStringValue, appendStringValue
+	case reflect.Slice:
+		if slice {
+			return sizeBytesSlice, appendBytesSlice
+		}
+		if oneof {
+			// Oneof bytes field may also have "proto3" tag.
+			// We want to marshal it as a oneof field. Do this
+			// check before the proto3 check.
+			return sizeBytesOneof, appendBytesOneof
+		}
+		if proto3 {
+			return sizeBytes3, appendBytes3
+		}
+		return sizeBytes, appendBytes
+	case reflect.Struct:
+		switch encoding {
+		case "group":
+			if slice {
+				return makeGroupSliceMarshaler(getMarshalInfo(t))
+			}
+			return makeGroupMarshaler(getMarshalInfo(t))
+		case "bytes":
+			if slice {
+				return makeMessageSliceMarshaler(getMarshalInfo(t))
+			}
+			return makeMessageMarshaler(getMarshalInfo(t))
+		}
+	}
+	panic(fmt.Sprintf("unknown or mismatched type: type: %v, wire type: %v", t, encoding))
+}
+
+// Below are functions to size/marshal a specific type of a field.
+// They are stored in the field's info, and called by function pointers.
+// They have type sizer or marshaler.
+
+func sizeFixed32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFixed32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixed32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixed32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFixed32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFixedS32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFixedS32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixedS32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFixedS32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFixedS32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFloat32Value(_ pointer, tagsize int) int {
+	return 4 + tagsize
+}
+func sizeFloat32ValueNoZero(ptr pointer, tagsize int) int {
+	v := math.Float32bits(*ptr.toFloat32())
+	if v == 0 {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFloat32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toFloat32Ptr()
+	if p == nil {
+		return 0
+	}
+	return 4 + tagsize
+}
+func sizeFloat32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat32Slice()
+	return (4 + tagsize) * len(s)
+}
+func sizeFloat32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 4*len(s) + SizeVarint(uint64(4*len(s))) + tagsize
+}
+func sizeFixed64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFixed64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixed64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixed64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFixed64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeFixedS64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFixedS64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixedS64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFixedS64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFixedS64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeFloat64Value(_ pointer, tagsize int) int {
+	return 8 + tagsize
+}
+func sizeFloat64ValueNoZero(ptr pointer, tagsize int) int {
+	v := math.Float64bits(*ptr.toFloat64())
+	if v == 0 {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFloat64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toFloat64Ptr()
+	if p == nil {
+		return 0
+	}
+	return 8 + tagsize
+}
+func sizeFloat64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat64Slice()
+	return (8 + tagsize) * len(s)
+}
+func sizeFloat64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toFloat64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	return 8*len(s) + SizeVarint(uint64(8*len(s))) + tagsize
+}
+func sizeVarint32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarint32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarint32Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarint32Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarint32PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarintS32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarintS32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarintS32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarint64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	return SizeVarint(v) + tagsize
+}
+func sizeVarint64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(v) + tagsize
+}
+func sizeVarint64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(*p) + tagsize
+}
+func sizeVarint64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v) + tagsize
+	}
+	return n
+}
+func sizeVarint64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v)
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeVarintS64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v)) + tagsize
+}
+func sizeVarintS64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	return SizeVarint(uint64(*p)) + tagsize
+}
+func sizeVarintS64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v)) + tagsize
+	}
+	return n
+}
+func sizeVarintS64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeZigzag32Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32Ptr(ptr pointer, tagsize int) int {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+}
+func sizeZigzag32Slice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v)<<1)^uint32((int32(v)>>31)))) + tagsize
+	}
+	return n
+}
+func sizeZigzag32PackedSlice(ptr pointer, tagsize int) int {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeZigzag64Value(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64ValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return 0
+	}
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64Ptr(ptr pointer, tagsize int) int {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+}
+func sizeZigzag64Slice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1)^uint64((int64(v)>>63))) + tagsize
+	}
+	return n
+}
+func sizeZigzag64PackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return 0
+	}
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
+	}
+	return n + SizeVarint(uint64(n)) + tagsize
+}
+func sizeBoolValue(_ pointer, tagsize int) int {
+	return 1 + tagsize
+}
+func sizeBoolValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toBool()
+	if !v {
+		return 0
+	}
+	return 1 + tagsize
+}
+func sizeBoolPtr(ptr pointer, tagsize int) int {
+	p := *ptr.toBoolPtr()
+	if p == nil {
+		return 0
+	}
+	return 1 + tagsize
+}
+func sizeBoolSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBoolSlice()
+	return (1 + tagsize) * len(s)
+}
+func sizeBoolPackedSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBoolSlice()
+	if len(s) == 0 {
+		return 0
+	}
+	return len(s) + SizeVarint(uint64(len(s))) + tagsize
+}
+func sizeStringValue(ptr pointer, tagsize int) int {
+	v := *ptr.toString()
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringValueNoZero(ptr pointer, tagsize int) int {
+	v := *ptr.toString()
+	if v == "" {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringPtr(ptr pointer, tagsize int) int {
+	p := *ptr.toStringPtr()
+	if p == nil {
+		return 0
+	}
+	v := *p
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeStringSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toStringSlice()
+	n := 0
+	for _, v := range s {
+		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
+	}
+	return n
+}
+func sizeBytes(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	if v == nil {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytes3(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	if len(v) == 0 {
+		return 0
+	}
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytesOneof(ptr pointer, tagsize int) int {
+	v := *ptr.toBytes()
+	return len(v) + SizeVarint(uint64(len(v))) + tagsize
+}
+func sizeBytesSlice(ptr pointer, tagsize int) int {
+	s := *ptr.toBytesSlice()
+	n := 0
+	for _, v := range s {
+		n += len(v) + SizeVarint(uint64(len(v))) + tagsize
+	}
+	return n
+}
+
+// appendFixed32 appends an encoded fixed32 to b.
+func appendFixed32(b []byte, v uint32) []byte {
+	b = append(b,
+		byte(v),
+		byte(v>>8),
+		byte(v>>16),
+		byte(v>>24))
+	return b
+}
+
+// appendFixed64 appends an encoded fixed64 to b.
+func appendFixed64(b []byte, v uint64) []byte {
+	b = append(b,
+		byte(v),
+		byte(v>>8),
+		byte(v>>16),
+		byte(v>>24),
+		byte(v>>32),
+		byte(v>>40),
+		byte(v>>48),
+		byte(v>>56))
+	return b
+}
+
+// appendVarint appends an encoded varint to b.
+func appendVarint(b []byte, v uint64) []byte {
+	// TODO: make 1-byte (maybe 2-byte) case inline-able, once we
+	// have non-leaf inliner.
+	switch {
+	case v < 1<<7:
+		b = append(b, byte(v))
+	case v < 1<<14:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte(v>>7))
+	case v < 1<<21:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte(v>>14))
+	case v < 1<<28:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte(v>>21))
+	case v < 1<<35:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte(v>>28))
+	case v < 1<<42:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte(v>>35))
+	case v < 1<<49:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte(v>>42))
+	case v < 1<<56:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte(v>>49))
+	case v < 1<<63:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte((v>>49)&0x7f|0x80),
+			byte(v>>56))
+	default:
+		b = append(b,
+			byte(v&0x7f|0x80),
+			byte((v>>7)&0x7f|0x80),
+			byte((v>>14)&0x7f|0x80),
+			byte((v>>21)&0x7f|0x80),
+			byte((v>>28)&0x7f|0x80),
+			byte((v>>35)&0x7f|0x80),
+			byte((v>>42)&0x7f|0x80),
+			byte((v>>49)&0x7f|0x80),
+			byte((v>>56)&0x7f|0x80),
+			1)
+	}
+	return b
+}
+
+func appendFixed32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFixed32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFixed32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, *p)
+	return b, nil
+}
+func appendFixed32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, v)
+	}
+	return b, nil
+}
+func appendFixed32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, v)
+	}
+	return b, nil
+}
+func appendFixedS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(v))
+	return b, nil
+}
+func appendFixedS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(v))
+	return b, nil
+}
+func appendFixedS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, uint32(*p))
+	return b, nil
+}
+func appendFixedS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, uint32(v))
+	}
+	return b, nil
+}
+func appendFixedS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, uint32(v))
+	}
+	return b, nil
+}
+func appendFloat32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float32bits(*ptr.toFloat32())
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFloat32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float32bits(*ptr.toFloat32())
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, v)
+	return b, nil
+}
+func appendFloat32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toFloat32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed32(b, math.Float32bits(*p))
+	return b, nil
+}
+func appendFloat32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed32(b, math.Float32bits(v))
+	}
+	return b, nil
+}
+func appendFloat32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(4*len(s)))
+	for _, v := range s {
+		b = appendFixed32(b, math.Float32bits(v))
+	}
+	return b, nil
+}
+func appendFixed64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFixed64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFixed64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, *p)
+	return b, nil
+}
+func appendFixed64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, v)
+	}
+	return b, nil
+}
+func appendFixed64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, v)
+	}
+	return b, nil
+}
+func appendFixedS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(v))
+	return b, nil
+}
+func appendFixedS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(v))
+	return b, nil
+}
+func appendFixedS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, uint64(*p))
+	return b, nil
+}
+func appendFixedS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, uint64(v))
+	}
+	return b, nil
+}
+func appendFixedS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, uint64(v))
+	}
+	return b, nil
+}
+func appendFloat64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float64bits(*ptr.toFloat64())
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFloat64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := math.Float64bits(*ptr.toFloat64())
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, v)
+	return b, nil
+}
+func appendFloat64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toFloat64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendFixed64(b, math.Float64bits(*p))
+	return b, nil
+}
+func appendFloat64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendFixed64(b, math.Float64bits(v))
+	}
+	return b, nil
+}
+func appendFloat64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toFloat64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(8*len(s)))
+	for _, v := range s {
+		b = appendFixed64(b, math.Float64bits(v))
+	}
+	return b, nil
+}
+func appendVarint32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarint32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarint32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarint32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarint32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarintS32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarint64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, v)
+	return b, nil
+}
+func appendVarint64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toUint64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, v)
+	return b, nil
+}
+func appendVarint64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toUint64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, *p)
+	return b, nil
+}
+func appendVarint64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, v)
+	}
+	return b, nil
+}
+func appendVarint64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toUint64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(v)
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, v)
+	}
+	return b, nil
+}
+func appendVarintS64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v))
+	return b, nil
+}
+func appendVarintS64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(*p))
+	return b, nil
+}
+func appendVarintS64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendVarintS64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v))
+	}
+	return b, nil
+}
+func appendZigzag32Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt32()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := ptr.getInt32Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	v := *p
+	b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	return b, nil
+}
+func appendZigzag32Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	}
+	return b, nil
+}
+func appendZigzag32PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := ptr.getInt32Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64((uint32(v) << 1) ^ uint32((int32(v) >> 31))))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64((uint32(v)<<1)^uint32((int32(v)>>31))))
+	}
+	return b, nil
+}
+func appendZigzag64Value(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64ValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toInt64()
+	if v == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64Ptr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toInt64Ptr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	v := *p
+	b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	return b, nil
+}
+func appendZigzag64Slice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	}
+	return b, nil
+}
+func appendZigzag64PackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toInt64Slice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	// compute size
+	n := 0
+	for _, v := range s {
+		n += SizeVarint(uint64(v<<1) ^ uint64((int64(v) >> 63)))
+	}
+	b = appendVarint(b, uint64(n))
+	for _, v := range s {
+		b = appendVarint(b, uint64(v<<1)^uint64((int64(v)>>63)))
+	}
+	return b, nil
+}
+func appendBoolValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBool()
+	b = appendVarint(b, wiretag)
+	if v {
+		b = append(b, 1)
+	} else {
+		b = append(b, 0)
+	}
+	return b, nil
+}
+func appendBoolValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBool()
+	if !v {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = append(b, 1)
+	return b, nil
+}
+
+func appendBoolPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toBoolPtr()
+	if p == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	if *p {
+		b = append(b, 1)
+	} else {
+		b = append(b, 0)
+	}
+	return b, nil
+}
+func appendBoolSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBoolSlice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		if v {
+			b = append(b, 1)
+		} else {
+			b = append(b, 0)
+		}
+	}
+	return b, nil
+}
+func appendBoolPackedSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBoolSlice()
+	if len(s) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag&^7|WireBytes)
+	b = appendVarint(b, uint64(len(s)))
+	for _, v := range s {
+		if v {
+			b = append(b, 1)
+		} else {
+			b = append(b, 0)
+		}
+	}
+	return b, nil
+}
+func appendStringValue(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toString()
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringValueNoZero(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toString()
+	if v == "" {
+		return b, nil
+	}
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringPtr(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	p := *ptr.toStringPtr()
+	if p == nil {
+		return b, nil
+	}
+	v := *p
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendStringSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toStringSlice()
+	for _, v := range s {
+		if !utf8.ValidString(v) {
+			return nil, errInvalidUTF8
+		}
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(len(v)))
+		b = append(b, v...)
+	}
+	return b, nil
+}
+func appendBytes(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	if v == nil {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytes3(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	if len(v) == 0 {
+		return b, nil
+	}
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytesOneof(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	v := *ptr.toBytes()
+	b = appendVarint(b, wiretag)
+	b = appendVarint(b, uint64(len(v)))
+	b = append(b, v...)
+	return b, nil
+}
+func appendBytesSlice(b []byte, ptr pointer, wiretag uint64, _ bool) ([]byte, error) {
+	s := *ptr.toBytesSlice()
+	for _, v := range s {
+		b = appendVarint(b, wiretag)
+		b = appendVarint(b, uint64(len(v)))
+		b = append(b, v...)
+	}
+	return b, nil
+}
+
+// makeGroupMarshaler returns the sizer and marshaler for a group.
+// u is the marshal info of the underlying message.
+func makeGroupMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return 0
+			}
+			return u.size(p) + 2*tagsize
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return b, nil
+			}
+			var err error
+			b = appendVarint(b, wiretag) // start group
+			b, err = u.marshal(b, p, deterministic)
+			b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
+			return b, err
+		}
+}
+
+// makeGroupSliceMarshaler returns the sizer and marshaler for a group slice.
+// u is the marshal info of the underlying message.
+func makeGroupSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			s := ptr.getPointerSlice()
+			n := 0
+			for _, v := range s {
+				if v.isNil() {
+					continue
+				}
+				n += u.size(v) + 2*tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			s := ptr.getPointerSlice()
+			var err, errreq error
+			for _, v := range s {
+				if v.isNil() {
+					return b, errRepeatedHasNil
+				}
+				b = appendVarint(b, wiretag) // start group
+				b, err = u.marshal(b, v, deterministic)
+				b = appendVarint(b, wiretag+(WireEndGroup-WireStartGroup)) // end group
+				if err != nil {
+					if _, ok := err.(*RequiredNotSetError); ok {
+						// Required field in submessage is not set.
+						// We record the error but keep going, to give a complete marshaling.
+						if errreq == nil {
+							errreq = err
+						}
+						continue
+					}
+					if err == ErrNil {
+						err = errRepeatedHasNil
+					}
+					return b, err
+				}
+			}
+			return b, errreq
+		}
+}
+
+// makeMessageMarshaler returns the sizer and marshaler for a message field.
+// u is the marshal info of the message.
+func makeMessageMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return 0
+			}
+			siz := u.size(p)
+			return siz + SizeVarint(uint64(siz)) + tagsize
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getPointer()
+			if p.isNil() {
+				return b, nil
+			}
+			b = appendVarint(b, wiretag)
+			siz := u.cachedsize(p)
+			b = appendVarint(b, uint64(siz))
+			return u.marshal(b, p, deterministic)
+		}
+}
+
+// makeMessageSliceMarshaler returns the sizer and marshaler for a message slice.
+// u is the marshal info of the message.
+func makeMessageSliceMarshaler(u *marshalInfo) (sizer, marshaler) {
+	return func(ptr pointer, tagsize int) int {
+			s := ptr.getPointerSlice()
+			n := 0
+			for _, v := range s {
+				if v.isNil() {
+					continue
+				}
+				siz := u.size(v)
+				n += siz + SizeVarint(uint64(siz)) + tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, wiretag uint64, deterministic bool) ([]byte, error) {
+			s := ptr.getPointerSlice()
+			var err, errreq error
+			for _, v := range s {
+				if v.isNil() {
+					return b, errRepeatedHasNil
+				}
+				b = appendVarint(b, wiretag)
+				siz := u.cachedsize(v)
+				b = appendVarint(b, uint64(siz))
+				b, err = u.marshal(b, v, deterministic)
+
+				if err != nil {
+					if _, ok := err.(*RequiredNotSetError); ok {
+						// Required field in submessage is not set.
+						// We record the error but keep going, to give a complete marshaling.
+						if errreq == nil {
+							errreq = err
+						}
+						continue
+					}
+					if err == ErrNil {
+						err = errRepeatedHasNil
+					}
+					return b, err
+				}
+			}
+			return b, errreq
+		}
+}
+
+// makeMapMarshaler returns the sizer and marshaler for a map field.
+// f is the pointer to the reflect data structure of the field.
+func makeMapMarshaler(f *reflect.StructField) (sizer, marshaler) {
+	// figure out key and value type
+	t := f.Type
+	keyType := t.Key()
+	valType := t.Elem()
+	keyTags := strings.Split(f.Tag.Get("protobuf_key"), ",")
+	valTags := strings.Split(f.Tag.Get("protobuf_val"), ",")
+	keySizer, keyMarshaler := typeMarshaler(keyType, keyTags, false, false) // don't omit zero value in map
+	valSizer, valMarshaler := typeMarshaler(valType, valTags, false, false) // don't omit zero value in map
+	keyWireTag := 1<<3 | wiretype(keyTags[0])
+	valWireTag := 2<<3 | wiretype(valTags[0])
+
+	// We create an interface to get the addresses of the map key and value.
+	// If value is pointer-typed, the interface is a direct interface, the
+	// idata itself is the value. Otherwise, the idata is the pointer to the
+	// value.
+	// Key cannot be pointer-typed.
+	valIsPtr := valType.Kind() == reflect.Ptr
+	return func(ptr pointer, tagsize int) int {
+			m := ptr.asPointerTo(t).Elem() // the map
+			n := 0
+			for _, k := range m.MapKeys() {
+				ki := k.Interface()
+				vi := m.MapIndex(k).Interface()
+				kaddr := toAddrPointer(&ki, false)             // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr)          // pointer to value
+				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
+				n += siz + SizeVarint(uint64(siz)) + tagsize
+			}
+			return n
+		},
+		func(b []byte, ptr pointer, tag uint64, deterministic bool) ([]byte, error) {
+			m := ptr.asPointerTo(t).Elem() // the map
+			var err error
+			keys := m.MapKeys()
+			if len(keys) > 1 && deterministic {
+				sort.Sort(mapKeys(keys))
+			}
+			for _, k := range keys {
+				ki := k.Interface()
+				vi := m.MapIndex(k).Interface()
+				kaddr := toAddrPointer(&ki, false)    // pointer to key
+				vaddr := toAddrPointer(&vi, valIsPtr) // pointer to value
+				b = appendVarint(b, tag)
+				siz := keySizer(kaddr, 1) + valSizer(vaddr, 1) // tag of key = 1 (size=1), tag of val = 2 (size=1)
+				b = appendVarint(b, uint64(siz))
+				b, err = keyMarshaler(b, kaddr, keyWireTag, deterministic)
+				if err != nil {
+					return b, err
+				}
+				b, err = valMarshaler(b, vaddr, valWireTag, deterministic)
+				if err != nil && err != ErrNil { // allow nil value in map
+					return b, err
+				}
+			}
+			return b, nil
+		}
+}
+
+// makeOneOfMarshaler returns the sizer and marshaler for a oneof field.
+// fi is the marshal info of the field.
+// f is the pointer to the reflect data structure of the field.
+func makeOneOfMarshaler(fi *marshalFieldInfo, f *reflect.StructField) (sizer, marshaler) {
+	// Oneof field is an interface. We need to get the actual data type on the fly.
+	t := f.Type
+	return func(ptr pointer, _ int) int {
+			p := ptr.getInterfacePointer()
+			if p.isNil() {
+				return 0
+			}
+			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
+			telem := v.Type()
+			e := fi.oneofElems[telem]
+			return e.sizer(p, e.tagsize)
+		},
+		func(b []byte, ptr pointer, _ uint64, deterministic bool) ([]byte, error) {
+			p := ptr.getInterfacePointer()
+			if p.isNil() {
+				return b, nil
+			}
+			v := ptr.asPointerTo(t).Elem().Elem().Elem() // *interface -> interface -> *struct -> struct
+			telem := v.Type()
+			if telem.Field(0).Type.Kind() == reflect.Ptr && p.getPointer().isNil() {
+				return b, errOneofHasNil
+			}
+			e := fi.oneofElems[telem]
+			return e.marshaler(b, p, e.wiretag, deterministic)
+		}
+}
+
+// sizeExtensions computes the size of encoded data for a XXX_InternalExtensions field.
+func (u *marshalInfo) sizeExtensions(ext *XXX_InternalExtensions) int {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return 0
+	}
+	mu.Lock()
+
+	n := 0
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, ei.tagsize)
+	}
+	mu.Unlock()
+	return n
+}
+
+// appendExtensions marshals a XXX_InternalExtensions field to the end of byte slice b.
+func (u *marshalInfo) appendExtensions(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return b, nil
+	}
+	mu.Lock()
+	defer mu.Unlock()
+
+	var err error
+
+	// Fast-path for common cases: zero or one extensions.
+	// Don't bother sorting the keys.
+	if len(m) <= 1 {
+		for _, e := range m {
+			if e.value == nil || e.desc == nil {
+				// Extension is only in its encoded form.
+				b = append(b, e.enc...)
+				continue
+			}
+
+			// We don't skip extensions that have an encoded form set,
+			// because the extension value may have been mutated after
+			// the last time this function was called.
+
+			ei := u.getExtElemInfo(e.desc)
+			v := e.value
+			p := toAddrPointer(&v, ei.isptr)
+			b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+			if err != nil {
+				return b, err
+			}
+		}
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	// Not sure this is required, but the old code does it.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, k := range keys {
+		e := m[int32(k)]
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			b = append(b, e.enc...)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// message set format is:
+//   message MessageSet {
+//     repeated group Item = 1 {
+//       required int32 type_id = 2;
+//       required string message = 3;
+//     };
+//   }
+
+// sizeMessageSet computes the size of encoded data for a XXX_InternalExtensions field
+// in message set format (above).
+func (u *marshalInfo) sizeMessageSet(ext *XXX_InternalExtensions) int {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return 0
+	}
+	mu.Lock()
+
+	n := 0
+	for id, e := range m {
+		n += 2                          // start group, end group. tag = 1 (size=1)
+		n += SizeVarint(uint64(id)) + 1 // type_id, tag = 2 (size=1)
+
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+			siz := len(msgWithLen)
+			n += siz + 1 // message, tag = 3 (size=1)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, 1) // message, tag = 3 (size=1)
+	}
+	mu.Unlock()
+	return n
+}
+
+// appendMessageSet marshals a XXX_InternalExtensions field in message set format (above)
+// to the end of byte slice b.
+func (u *marshalInfo) appendMessageSet(b []byte, ext *XXX_InternalExtensions, deterministic bool) ([]byte, error) {
+	m, mu := ext.extensionsRead()
+	if m == nil {
+		return b, nil
+	}
+	mu.Lock()
+	defer mu.Unlock()
+
+	var err error
+
+	// Fast-path for common cases: zero or one extensions.
+	// Don't bother sorting the keys.
+	if len(m) <= 1 {
+		for id, e := range m {
+			b = append(b, 1<<3|WireStartGroup)
+			b = append(b, 2<<3|WireVarint)
+			b = appendVarint(b, uint64(id))
+
+			if e.value == nil || e.desc == nil {
+				// Extension is only in its encoded form.
+				msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+				b = append(b, 3<<3|WireBytes)
+				b = append(b, msgWithLen...)
+				b = append(b, 1<<3|WireEndGroup)
+				continue
+			}
+
+			// We don't skip extensions that have an encoded form set,
+			// because the extension value may have been mutated after
+			// the last time this function was called.
+
+			ei := u.getExtElemInfo(e.desc)
+			v := e.value
+			p := toAddrPointer(&v, ei.isptr)
+			b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
+			if err != nil {
+				return b, err
+			}
+			b = append(b, 1<<3|WireEndGroup)
+		}
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	for _, id := range keys {
+		e := m[int32(id)]
+		b = append(b, 1<<3|WireStartGroup)
+		b = append(b, 2<<3|WireVarint)
+		b = appendVarint(b, uint64(id))
+
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			msgWithLen := skipVarint(e.enc) // skip old tag, but leave the length varint
+			b = append(b, 3<<3|WireBytes)
+			b = append(b, msgWithLen...)
+			b = append(b, 1<<3|WireEndGroup)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, 3<<3|WireBytes, deterministic)
+		b = append(b, 1<<3|WireEndGroup)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// sizeV1Extensions computes the size of encoded data for a V1-API extension field.
+func (u *marshalInfo) sizeV1Extensions(m map[int32]Extension) int {
+	if m == nil {
+		return 0
+	}
+
+	n := 0
+	for _, e := range m {
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			n += len(e.enc)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		n += ei.sizer(p, ei.tagsize)
+	}
+	return n
+}
+
+// appendV1Extensions marshals a V1-API extension field to the end of byte slice b.
+func (u *marshalInfo) appendV1Extensions(b []byte, m map[int32]Extension, deterministic bool) ([]byte, error) {
+	if m == nil {
+		return b, nil
+	}
+
+	// Sort the keys to provide a deterministic encoding.
+	keys := make([]int, 0, len(m))
+	for k := range m {
+		keys = append(keys, int(k))
+	}
+	sort.Ints(keys)
+
+	var err error
+	for _, k := range keys {
+		e := m[int32(k)]
+		if e.value == nil || e.desc == nil {
+			// Extension is only in its encoded form.
+			b = append(b, e.enc...)
+			continue
+		}
+
+		// We don't skip extensions that have an encoded form set,
+		// because the extension value may have been mutated after
+		// the last time this function was called.
+
+		ei := u.getExtElemInfo(e.desc)
+		v := e.value
+		p := toAddrPointer(&v, ei.isptr)
+		b, err = ei.marshaler(b, p, ei.wiretag, deterministic)
+		if err != nil {
+			return b, err
+		}
+	}
+	return b, nil
+}
+
+// newMarshaler is the interface representing objects that can marshal themselves.
+//
+// This exists to support protoc-gen-go generated messages.
+// The proto package will stop type-asserting to this interface in the future.
+//
+// DO NOT DEPEND ON THIS.
+type newMarshaler interface {
+	XXX_Size() int
+	XXX_Marshal(b []byte, deterministic bool) ([]byte, error)
+}
+
+// Size returns the encoded size of a protocol buffer message.
+// This is the main entry point.
+func Size(pb Message) int {
+	if m, ok := pb.(newMarshaler); ok {
+		return m.XXX_Size()
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		b, _ := m.Marshal()
+		return len(b)
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return 0
+	}
+	var info InternalMessageInfo
+	return info.Size(pb)
+}
+
+// Marshal takes a protocol buffer message
+// and encodes it into the wire format, returning the data.
+// This is the main entry point.
+func Marshal(pb Message) ([]byte, error) {
+	if m, ok := pb.(newMarshaler); ok {
+		siz := m.XXX_Size()
+		b := make([]byte, 0, siz)
+		return m.XXX_Marshal(b, false)
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		return m.Marshal()
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return nil, ErrNil
+	}
+	var info InternalMessageInfo
+	siz := info.Size(pb)
+	b := make([]byte, 0, siz)
+	return info.Marshal(b, pb, false)
+}
+
+// Marshal takes a protocol buffer message
+// and encodes it into the wire format, writing the result to the
+// Buffer.
+// This is an alternative entry point. It is not necessary to use
+// a Buffer for most applications.
+func (p *Buffer) Marshal(pb Message) error {
+	var err error
+	if m, ok := pb.(newMarshaler); ok {
+		siz := m.XXX_Size()
+		p.grow(siz) // make sure buf has enough capacity
+		p.buf, err = m.XXX_Marshal(p.buf, p.deterministic)
+		return err
+	}
+	if m, ok := pb.(Marshaler); ok {
+		// If the message can marshal itself, let it do it, for compatibility.
+		// NOTE: This is not efficient.
+		b, err := m.Marshal()
+		p.buf = append(p.buf, b...)
+		return err
+	}
+	// in case somehow we didn't generate the wrapper
+	if pb == nil {
+		return ErrNil
+	}
+	var info InternalMessageInfo
+	siz := info.Size(pb)
+	p.grow(siz) // make sure buf has enough capacity
+	p.buf, err = info.Marshal(p.buf, pb, p.deterministic)
+	return err
+}
+
+// grow grows the buffer's capacity, if necessary, to guarantee space for
+// another n bytes. After grow(n), at least n bytes can be written to the
+// buffer without another allocation.
+func (p *Buffer) grow(n int) {
+	need := len(p.buf) + n
+	if need <= cap(p.buf) {
+		return
+	}
+	newCap := len(p.buf) * 2
+	if newCap < need {
+		newCap = need
+	}
+	p.buf = append(make([]byte, 0, newCap), p.buf...)
+}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/table_merge.go b/installer/vendor/github.com/golang/protobuf/proto/table_merge.go
new file mode 100644
index 0000000000..5525def6a5
--- /dev/null
+++ b/installer/vendor/github.com/golang/protobuf/proto/table_merge.go
@@ -0,0 +1,654 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"fmt"
+	"reflect"
+	"strings"
+	"sync"
+	"sync/atomic"
+)
+
+// Merge merges the src message into dst.
+// This assumes that dst and src of the same type and are non-nil.
+func (a *InternalMessageInfo) Merge(dst, src Message) {
+	mi := atomicLoadMergeInfo(&a.merge)
+	if mi == nil {
+		mi = getMergeInfo(reflect.TypeOf(dst).Elem())
+		atomicStoreMergeInfo(&a.merge, mi)
+	}
+	mi.merge(toPointer(&dst), toPointer(&src))
+}
+
+type mergeInfo struct {
+	typ reflect.Type
+
+	initialized int32 // 0: only typ is valid, 1: everything is valid
+	lock        sync.Mutex
+
+	fields       []mergeFieldInfo
+	unrecognized field // Offset of XXX_unrecognized
+}
+
+type mergeFieldInfo struct {
+	field field // Offset of field, guaranteed to be valid
+
+	// isPointer reports whether the value in the field is a pointer.
+	// This is true for the following situations:
+	//	* Pointer to struct
+	//	* Pointer to basic type (proto2 only)
+	//	* Slice (first value in slice header is a pointer)
+	//	* String (first value in string header is a pointer)
+	isPointer bool
+
+	// basicWidth reports the width of the field assuming that it is directly
+	// embedded in the struct (as is the case for basic types in proto3).
+	// The possible values are:
+	// 	0: invalid
+	//	1: bool
+	//	4: int32, uint32, float32
+	//	8: int64, uint64, float64
+	basicWidth int
+
+	// Where dst and src are pointers to the types being merged.
+	merge func(dst, src pointer)
+}
+
+var (
+	mergeInfoMap  = map[reflect.Type]*mergeInfo{}
+	mergeInfoLock sync.Mutex
+)
+
+func getMergeInfo(t reflect.Type) *mergeInfo {
+	mergeInfoLock.Lock()
+	defer mergeInfoLock.Unlock()
+	mi := mergeInfoMap[t]
+	if mi == nil {
+		mi = &mergeInfo{typ: t}
+		mergeInfoMap[t] = mi
+	}
+	return mi
+}
+
+// merge merges src into dst assuming they are both of type *mi.typ.
+func (mi *mergeInfo) merge(dst, src pointer) {
+	if dst.isNil() {
+		panic("proto: nil destination")
+	}
+	if src.isNil() {
+		return // Nothing to do.
+	}
+
+	if atomic.LoadInt32(&mi.initialized) == 0 {
+		mi.computeMergeInfo()
+	}
+
+	for _, fi := range mi.fields {
+		sfp := src.offset(fi.field)
+
+		// As an optimization, we can avoid the merge function call cost
+		// if we know for sure that the source will have no effect
+		// by checking if it is the zero value.
+		if unsafeAllowed {
+			if fi.isPointer && sfp.getPointer().isNil() { // Could be slice or string
+				continue
+			}
+			if fi.basicWidth > 0 {
+				switch {
+				case fi.basicWidth == 1 && !*sfp.toBool():
+					continue
+				case fi.basicWidth == 4 && *sfp.toUint32() == 0:
+					continue
+				case fi.basicWidth == 8 && *sfp.toUint64() == 0:
+					continue
+				}
+			}
+		}
+
+		dfp := dst.offset(fi.field)
+		fi.merge(dfp, sfp)
+	}
+
+	// TODO: Make this faster?
+	out := dst.asPointerTo(mi.typ).Elem()
+	in := src.asPointerTo(mi.typ).Elem()
+	if emIn, err := extendable(in.Addr().Interface()); err == nil {
+		emOut, _ := extendable(out.Addr().Interface())
+		mIn, muIn := emIn.extensionsRead()
+		if mIn != nil {
+			mOut := emOut.extensionsWrite()
+			muIn.Lock()
+			mergeExtension(mOut, mIn)
+			muIn.Unlock()
+		}
+	}
+
+	if mi.unrecognized.IsValid() {
+		if b := *src.offset(mi.unrecognized).toBytes(); len(b) > 0 {
+			*dst.offset(mi.unrecognized).toBytes() = append([]byte(nil), b...)
+		}
+	}
+}
+
+func (mi *mergeInfo) computeMergeInfo() {
+	mi.lock.Lock()
+	defer mi.lock.Unlock()
+	if mi.initialized != 0 {
+		return
+	}
+	t := mi.typ
+	n := t.NumField()
+
+	props := GetProperties(t)
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if strings.HasPrefix(f.Name, "XXX_") {
+			continue
+		}
+
+		mfi := mergeFieldInfo{field: toField(&f)}
+		tf := f.Type
+
+		// As an optimization, we can avoid the merge function call cost
+		// if we know for sure that the source will have no effect
+		// by checking if it is the zero value.
+		if unsafeAllowed {
+			switch tf.Kind() {
+			case reflect.Ptr, reflect.Slice, reflect.String:
+				// As a special case, we assume slices and strings are pointers
+				// since we know that the first field in the SliceSlice or
+				// StringHeader is a data pointer.
+				mfi.isPointer = true
+			case reflect.Bool:
+				mfi.basicWidth = 1
+			case reflect.Int32, reflect.Uint32, reflect.Float32:
+				mfi.basicWidth = 4
+			case reflect.Int64, reflect.Uint64, reflect.Float64:
+				mfi.basicWidth = 8
+			}
+		}
+
+		// Unwrap tf to get at its most basic type.
+		var isPointer, isSlice bool
+		if tf.Kind() == reflect.Slice && tf.Elem().Kind() != reflect.Uint8 {
+			isSlice = true
+			tf = tf.Elem()
+		}
+		if tf.Kind() == reflect.Ptr {
+			isPointer = true
+			tf = tf.Elem()
+		}
+		if isPointer && isSlice && tf.Kind() != reflect.Struct {
+			panic("both pointer and slice for basic type in " + tf.Name())
+		}
+
+		switch tf.Kind() {
+		case reflect.Int32:
+			switch {
+			case isSlice: // E.g., []int32
+				mfi.merge = func(dst, src pointer) {
+					// NOTE: toInt32Slice is not defined (see pointer_reflect.go).
+					/*
+						sfsp := src.toInt32Slice()
+						if *sfsp != nil {
+							dfsp := dst.toInt32Slice()
+							*dfsp = append(*dfsp, *sfsp...)
+							if *dfsp == nil {
+								*dfsp = []int64{}
+							}
+						}
+					*/
+					sfs := src.getInt32Slice()
+					if sfs != nil {
+						dfs := dst.getInt32Slice()
+						dfs = append(dfs, sfs...)
+						if dfs == nil {
+							dfs = []int32{}
+						}
+						dst.setInt32Slice(dfs)
+					}
+				}
+			case isPointer: // E.g., *int32
+				mfi.merge = func(dst, src pointer) {
+					// NOTE: toInt32Ptr is not defined (see pointer_reflect.go).
+					/*
+						sfpp := src.toInt32Ptr()
+						if *sfpp != nil {
+							dfpp := dst.toInt32Ptr()
+							if *dfpp == nil {
+								*dfpp = Int32(**sfpp)
+							} else {
+								**dfpp = **sfpp
+							}
+						}
+					*/
+					sfp := src.getInt32Ptr()
+					if sfp != nil {
+						dfp := dst.getInt32Ptr()
+						if dfp == nil {
+							dst.setInt32Ptr(*sfp)
+						} else {
+							*dfp = *sfp
+						}
+					}
+				}
+			default: // E.g., int32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toInt32(); v != 0 {
+						*dst.toInt32() = v
+					}
+				}
+			}
+		case reflect.Int64:
+			switch {
+			case isSlice: // E.g., []int64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toInt64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toInt64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []int64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *int64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toInt64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toInt64Ptr()
+						if *dfpp == nil {
+							*dfpp = Int64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., int64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toInt64(); v != 0 {
+						*dst.toInt64() = v
+					}
+				}
+			}
+		case reflect.Uint32:
+			switch {
+			case isSlice: // E.g., []uint32
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toUint32Slice()
+					if *sfsp != nil {
+						dfsp := dst.toUint32Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []uint32{}
+						}
+					}
+				}
+			case isPointer: // E.g., *uint32
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toUint32Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toUint32Ptr()
+						if *dfpp == nil {
+							*dfpp = Uint32(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., uint32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toUint32(); v != 0 {
+						*dst.toUint32() = v
+					}
+				}
+			}
+		case reflect.Uint64:
+			switch {
+			case isSlice: // E.g., []uint64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toUint64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toUint64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []uint64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *uint64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toUint64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toUint64Ptr()
+						if *dfpp == nil {
+							*dfpp = Uint64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., uint64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toUint64(); v != 0 {
+						*dst.toUint64() = v
+					}
+				}
+			}
+		case reflect.Float32:
+			switch {
+			case isSlice: // E.g., []float32
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toFloat32Slice()
+					if *sfsp != nil {
+						dfsp := dst.toFloat32Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []float32{}
+						}
+					}
+				}
+			case isPointer: // E.g., *float32
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toFloat32Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toFloat32Ptr()
+						if *dfpp == nil {
+							*dfpp = Float32(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., float32
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toFloat32(); v != 0 {
+						*dst.toFloat32() = v
+					}
+				}
+			}
+		case reflect.Float64:
+			switch {
+			case isSlice: // E.g., []float64
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toFloat64Slice()
+					if *sfsp != nil {
+						dfsp := dst.toFloat64Slice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []float64{}
+						}
+					}
+				}
+			case isPointer: // E.g., *float64
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toFloat64Ptr()
+					if *sfpp != nil {
+						dfpp := dst.toFloat64Ptr()
+						if *dfpp == nil {
+							*dfpp = Float64(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., float64
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toFloat64(); v != 0 {
+						*dst.toFloat64() = v
+					}
+				}
+			}
+		case reflect.Bool:
+			switch {
+			case isSlice: // E.g., []bool
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toBoolSlice()
+					if *sfsp != nil {
+						dfsp := dst.toBoolSlice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []bool{}
+						}
+					}
+				}
+			case isPointer: // E.g., *bool
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toBoolPtr()
+					if *sfpp != nil {
+						dfpp := dst.toBoolPtr()
+						if *dfpp == nil {
+							*dfpp = Bool(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., bool
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toBool(); v {
+						*dst.toBool() = v
+					}
+				}
+			}
+		case reflect.String:
+			switch {
+			case isSlice: // E.g., []string
+				mfi.merge = func(dst, src pointer) {
+					sfsp := src.toStringSlice()
+					if *sfsp != nil {
+						dfsp := dst.toStringSlice()
+						*dfsp = append(*dfsp, *sfsp...)
+						if *dfsp == nil {
+							*dfsp = []string{}
+						}
+					}
+				}
+			case isPointer: // E.g., *string
+				mfi.merge = func(dst, src pointer) {
+					sfpp := src.toStringPtr()
+					if *sfpp != nil {
+						dfpp := dst.toStringPtr()
+						if *dfpp == nil {
+							*dfpp = String(**sfpp)
+						} else {
+							**dfpp = **sfpp
+						}
+					}
+				}
+			default: // E.g., string
+				mfi.merge = func(dst, src pointer) {
+					if v := *src.toString(); v != "" {
+						*dst.toString() = v
+					}
+				}
+			}
+		case reflect.Slice:
+			isProto3 := props.Prop[i].proto3
+			switch {
+			case isPointer:
+				panic("bad pointer in byte slice case in " + tf.Name())
+			case tf.Elem().Kind() != reflect.Uint8:
+				panic("bad element kind in byte slice case in " + tf.Name())
+			case isSlice: // E.g., [][]byte
+				mfi.merge = func(dst, src pointer) {
+					sbsp := src.toBytesSlice()
+					if *sbsp != nil {
+						dbsp := dst.toBytesSlice()
+						for _, sb := range *sbsp {
+							if sb == nil {
+								*dbsp = append(*dbsp, nil)
+							} else {
+								*dbsp = append(*dbsp, append([]byte{}, sb...))
+							}
+						}
+						if *dbsp == nil {
+							*dbsp = [][]byte{}
+						}
+					}
+				}
+			default: // E.g., []byte
+				mfi.merge = func(dst, src pointer) {
+					sbp := src.toBytes()
+					if *sbp != nil {
+						dbp := dst.toBytes()
+						if !isProto3 || len(*sbp) > 0 {
+							*dbp = append([]byte{}, *sbp...)
+						}
+					}
+				}
+			}
+		case reflect.Struct:
+			switch {
+			case !isPointer:
+				panic(fmt.Sprintf("message field %s without pointer", tf))
+			case isSlice: // E.g., []*pb.T
+				mi := getMergeInfo(tf)
+				mfi.merge = func(dst, src pointer) {
+					sps := src.getPointerSlice()
+					if sps != nil {
+						dps := dst.getPointerSlice()
+						for _, sp := range sps {
+							var dp pointer
+							if !sp.isNil() {
+								dp = valToPointer(reflect.New(tf))
+								mi.merge(dp, sp)
+							}
+							dps = append(dps, dp)
+						}
+						if dps == nil {
+							dps = []pointer{}
+						}
+						dst.setPointerSlice(dps)
+					}
+				}
+			default: // E.g., *pb.T
+				mi := getMergeInfo(tf)
+				mfi.merge = func(dst, src pointer) {
+					sp := src.getPointer()
+					if !sp.isNil() {
+						dp := dst.getPointer()
+						if dp.isNil() {
+							dp = valToPointer(reflect.New(tf))
+							dst.setPointer(dp)
+						}
+						mi.merge(dp, sp)
+					}
+				}
+			}
+		case reflect.Map:
+			switch {
+			case isPointer || isSlice:
+				panic("bad pointer or slice in map case in " + tf.Name())
+			default: // E.g., map[K]V
+				mfi.merge = func(dst, src pointer) {
+					sm := src.asPointerTo(tf).Elem()
+					if sm.Len() == 0 {
+						return
+					}
+					dm := dst.asPointerTo(tf).Elem()
+					if dm.IsNil() {
+						dm.Set(reflect.MakeMap(tf))
+					}
+
+					switch tf.Elem().Kind() {
+					case reflect.Ptr: // Proto struct (e.g., *T)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							val = reflect.ValueOf(Clone(val.Interface().(Message)))
+							dm.SetMapIndex(key, val)
+						}
+					case reflect.Slice: // E.g. Bytes type (e.g., []byte)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							val = reflect.ValueOf(append([]byte{}, val.Bytes()...))
+							dm.SetMapIndex(key, val)
+						}
+					default: // Basic type (e.g., string)
+						for _, key := range sm.MapKeys() {
+							val := sm.MapIndex(key)
+							dm.SetMapIndex(key, val)
+						}
+					}
+				}
+			}
+		case reflect.Interface:
+			// Must be oneof field.
+			switch {
+			case isPointer || isSlice:
+				panic("bad pointer or slice in interface case in " + tf.Name())
+			default: // E.g., interface{}
+				// TODO: Make this faster?
+				mfi.merge = func(dst, src pointer) {
+					su := src.asPointerTo(tf).Elem()
+					if !su.IsNil() {
+						du := dst.asPointerTo(tf).Elem()
+						typ := su.Elem().Type()
+						if du.IsNil() || du.Elem().Type() != typ {
+							du.Set(reflect.New(typ.Elem())) // Initialize interface if empty
+						}
+						sv := su.Elem().Elem().Field(0)
+						if sv.Kind() == reflect.Ptr && sv.IsNil() {
+							return
+						}
+						dv := du.Elem().Elem().Field(0)
+						if dv.Kind() == reflect.Ptr && dv.IsNil() {
+							dv.Set(reflect.New(sv.Type().Elem())) // Initialize proto message if empty
+						}
+						switch sv.Type().Kind() {
+						case reflect.Ptr: // Proto struct (e.g., *T)
+							Merge(dv.Interface().(Message), sv.Interface().(Message))
+						case reflect.Slice: // E.g. Bytes type (e.g., []byte)
+							dv.Set(reflect.ValueOf(append([]byte{}, sv.Bytes()...)))
+						default: // Basic type (e.g., string)
+							dv.Set(sv)
+						}
+					}
+				}
+			}
+		default:
+			panic(fmt.Sprintf("merger not found for type:%s", tf))
+		}
+		mi.fields = append(mi.fields, mfi)
+	}
+
+	mi.unrecognized = invalidField
+	if f, ok := t.FieldByName("XXX_unrecognized"); ok {
+		if f.Type != reflect.TypeOf([]byte{}) {
+			panic("expected XXX_unrecognized to be of type []byte")
+		}
+		mi.unrecognized = toField(&f)
+	}
+
+	atomic.StoreInt32(&mi.initialized, 1)
+}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/table_unmarshal.go b/installer/vendor/github.com/golang/protobuf/proto/table_unmarshal.go
new file mode 100644
index 0000000000..55f0340a3f
--- /dev/null
+++ b/installer/vendor/github.com/golang/protobuf/proto/table_unmarshal.go
@@ -0,0 +1,1967 @@
+// Go support for Protocol Buffers - Google's data interchange format
+//
+// Copyright 2016 The Go Authors.  All rights reserved.
+// https://github.com/golang/protobuf
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//     * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//     * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//     * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+package proto
+
+import (
+	"errors"
+	"fmt"
+	"io"
+	"math"
+	"reflect"
+	"strconv"
+	"strings"
+	"sync"
+	"sync/atomic"
+	"unicode/utf8"
+)
+
+// Unmarshal is the entry point from the generated .pb.go files.
+// This function is not intended to be used by non-generated code.
+// This function is not subject to any compatibility guarantee.
+// msg contains a pointer to a protocol buffer struct.
+// b is the data to be unmarshaled into the protocol buffer.
+// a is a pointer to a place to store cached unmarshal information.
+func (a *InternalMessageInfo) Unmarshal(msg Message, b []byte) error {
+	// Load the unmarshal information for this message type.
+	// The atomic load ensures memory consistency.
+	u := atomicLoadUnmarshalInfo(&a.unmarshal)
+	if u == nil {
+		// Slow path: find unmarshal info for msg, update a with it.
+		u = getUnmarshalInfo(reflect.TypeOf(msg).Elem())
+		atomicStoreUnmarshalInfo(&a.unmarshal, u)
+	}
+	// Then do the unmarshaling.
+	err := u.unmarshal(toPointer(&msg), b)
+	return err
+}
+
+type unmarshalInfo struct {
+	typ reflect.Type // type of the protobuf struct
+
+	// 0 = only typ field is initialized
+	// 1 = completely initialized
+	initialized     int32
+	lock            sync.Mutex                    // prevents double initialization
+	dense           []unmarshalFieldInfo          // fields indexed by tag #
+	sparse          map[uint64]unmarshalFieldInfo // fields indexed by tag #
+	reqFields       []string                      // names of required fields
+	reqMask         uint64                        // 1<<len(reqFields)-1
+	unrecognized    field                         // offset of []byte to put unrecognized data (or invalidField if we should throw it away)
+	extensions      field                         // offset of extensions field (of type proto.XXX_InternalExtensions), or invalidField if it does not exist
+	oldExtensions   field                         // offset of old-form extensions field (of type map[int]Extension)
+	extensionRanges []ExtensionRange              // if non-nil, implies extensions field is valid
+	isMessageSet    bool                          // if true, implies extensions field is valid
+}
+
+// An unmarshaler takes a stream of bytes and a pointer to a field of a message.
+// It decodes the field, stores it at f, and returns the unused bytes.
+// w is the wire encoding.
+// b is the data after the tag and wire encoding have been read.
+type unmarshaler func(b []byte, f pointer, w int) ([]byte, error)
+
+type unmarshalFieldInfo struct {
+	// location of the field in the proto message structure.
+	field field
+
+	// function to unmarshal the data for the field.
+	unmarshal unmarshaler
+
+	// if a required field, contains a single set bit at this field's index in the required field list.
+	reqMask uint64
+}
+
+var (
+	unmarshalInfoMap  = map[reflect.Type]*unmarshalInfo{}
+	unmarshalInfoLock sync.Mutex
+)
+
+// getUnmarshalInfo returns the data structure which can be
+// subsequently used to unmarshal a message of the given type.
+// t is the type of the message (note: not pointer to message).
+func getUnmarshalInfo(t reflect.Type) *unmarshalInfo {
+	// It would be correct to return a new unmarshalInfo
+	// unconditionally. We would end up allocating one
+	// per occurrence of that type as a message or submessage.
+	// We use a cache here just to reduce memory usage.
+	unmarshalInfoLock.Lock()
+	defer unmarshalInfoLock.Unlock()
+	u := unmarshalInfoMap[t]
+	if u == nil {
+		u = &unmarshalInfo{typ: t}
+		// Note: we just set the type here. The rest of the fields
+		// will be initialized on first use.
+		unmarshalInfoMap[t] = u
+	}
+	return u
+}
+
+// unmarshal does the main work of unmarshaling a message.
+// u provides type information used to unmarshal the message.
+// m is a pointer to a protocol buffer message.
+// b is a byte stream to unmarshal into m.
+// This is top routine used when recursively unmarshaling submessages.
+func (u *unmarshalInfo) unmarshal(m pointer, b []byte) error {
+	if atomic.LoadInt32(&u.initialized) == 0 {
+		u.computeUnmarshalInfo()
+	}
+	if u.isMessageSet {
+		return UnmarshalMessageSet(b, m.offset(u.extensions).toExtensions())
+	}
+	var reqMask uint64            // bitmask of required fields we've seen.
+	var rnse *RequiredNotSetError // an instance of a RequiredNotSetError returned by a submessage.
+	for len(b) > 0 {
+		// Read tag and wire type.
+		// Special case 1 and 2 byte varints.
+		var x uint64
+		if b[0] < 128 {
+			x = uint64(b[0])
+			b = b[1:]
+		} else if len(b) >= 2 && b[1] < 128 {
+			x = uint64(b[0]&0x7f) + uint64(b[1])<<7
+			b = b[2:]
+		} else {
+			var n int
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+		}
+		tag := x >> 3
+		wire := int(x) & 7
+
+		// Dispatch on the tag to one of the unmarshal* functions below.
+		var f unmarshalFieldInfo
+		if tag < uint64(len(u.dense)) {
+			f = u.dense[tag]
+		} else {
+			f = u.sparse[tag]
+		}
+		if fn := f.unmarshal; fn != nil {
+			var err error
+			b, err = fn(b, m.offset(f.field), wire)
+			if err == nil {
+				reqMask |= f.reqMask
+				continue
+			}
+			if r, ok := err.(*RequiredNotSetError); ok {
+				// Remember this error, but keep parsing. We need to produce
+				// a full parse even if a required field is missing.
+				rnse = r
+				reqMask |= f.reqMask
+				continue
+			}
+			if err != errInternalBadWireType {
+				return err
+			}
+			// Fragments with bad wire type are treated as unknown fields.
+		}
+
+		// Unknown tag.
+		if !u.unrecognized.IsValid() {
+			// Don't keep unrecognized data; just skip it.
+			var err error
+			b, err = skipField(b, wire)
+			if err != nil {
+				return err
+			}
+			continue
+		}
+		// Keep unrecognized data around.
+		// maybe in extensions, maybe in the unrecognized field.
+		z := m.offset(u.unrecognized).toBytes()
+		var emap map[int32]Extension
+		var e Extension
+		for _, r := range u.extensionRanges {
+			if uint64(r.Start) <= tag && tag <= uint64(r.End) {
+				if u.extensions.IsValid() {
+					mp := m.offset(u.extensions).toExtensions()
+					emap = mp.extensionsWrite()
+					e = emap[int32(tag)]
+					z = &e.enc
+					break
+				}
+				if u.oldExtensions.IsValid() {
+					p := m.offset(u.oldExtensions).toOldExtensions()
+					emap = *p
+					if emap == nil {
+						emap = map[int32]Extension{}
+						*p = emap
+					}
+					e = emap[int32(tag)]
+					z = &e.enc
+					break
+				}
+				panic("no extensions field available")
+			}
+		}
+
+		// Use wire type to skip data.
+		var err error
+		b0 := b
+		b, err = skipField(b, wire)
+		if err != nil {
+			return err
+		}
+		*z = encodeVarint(*z, tag<<3|uint64(wire))
+		*z = append(*z, b0[:len(b0)-len(b)]...)
+
+		if emap != nil {
+			emap[int32(tag)] = e
+		}
+	}
+	if rnse != nil {
+		// A required field of a submessage/group is missing. Return that error.
+		return rnse
+	}
+	if reqMask != u.reqMask {
+		// A required field of this message is missing.
+		for _, n := range u.reqFields {
+			if reqMask&1 == 0 {
+				return &RequiredNotSetError{n}
+			}
+			reqMask >>= 1
+		}
+	}
+	return nil
+}
+
+// computeUnmarshalInfo fills in u with information for use
+// in unmarshaling protocol buffers of type u.typ.
+func (u *unmarshalInfo) computeUnmarshalInfo() {
+	u.lock.Lock()
+	defer u.lock.Unlock()
+	if u.initialized != 0 {
+		return
+	}
+	t := u.typ
+	n := t.NumField()
+
+	// Set up the "not found" value for the unrecognized byte buffer.
+	// This is the default for proto3.
+	u.unrecognized = invalidField
+	u.extensions = invalidField
+	u.oldExtensions = invalidField
+
+	// List of the generated type and offset for each oneof field.
+	type oneofField struct {
+		ityp  reflect.Type // interface type of oneof field
+		field field        // offset in containing message
+	}
+	var oneofFields []oneofField
+
+	for i := 0; i < n; i++ {
+		f := t.Field(i)
+		if f.Name == "XXX_unrecognized" {
+			// The byte slice used to hold unrecognized input is special.
+			if f.Type != reflect.TypeOf(([]byte)(nil)) {
+				panic("bad type for XXX_unrecognized field: " + f.Type.Name())
+			}
+			u.unrecognized = toField(&f)
+			continue
+		}
+		if f.Name == "XXX_InternalExtensions" {
+			// Ditto here.
+			if f.Type != reflect.TypeOf(XXX_InternalExtensions{}) {
+				panic("bad type for XXX_InternalExtensions field: " + f.Type.Name())
+			}
+			u.extensions = toField(&f)
+			if f.Tag.Get("protobuf_messageset") == "1" {
+				u.isMessageSet = true
+			}
+			continue
+		}
+		if f.Name == "XXX_extensions" {
+			// An older form of the extensions field.
+			if f.Type != reflect.TypeOf((map[int32]Extension)(nil)) {
+				panic("bad type for XXX_extensions field: " + f.Type.Name())
+			}
+			u.oldExtensions = toField(&f)
+			continue
+		}
+		if f.Name == "XXX_NoUnkeyedLiteral" || f.Name == "XXX_sizecache" {
+			continue
+		}
+
+		oneof := f.Tag.Get("protobuf_oneof")
+		if oneof != "" {
+			oneofFields = append(oneofFields, oneofField{f.Type, toField(&f)})
+			// The rest of oneof processing happens below.
+			continue
+		}
+
+		tags := f.Tag.Get("protobuf")
+		tagArray := strings.Split(tags, ",")
+		if len(tagArray) < 2 {
+			panic("protobuf tag not enough fields in " + t.Name() + "." + f.Name + ": " + tags)
+		}
+		tag, err := strconv.Atoi(tagArray[1])
+		if err != nil {
+			panic("protobuf tag field not an integer: " + tagArray[1])
+		}
+
+		name := ""
+		for _, tag := range tagArray[3:] {
+			if strings.HasPrefix(tag, "name=") {
+				name = tag[5:]
+			}
+		}
+
+		// Extract unmarshaling function from the field (its type and tags).
+		unmarshal := fieldUnmarshaler(&f)
+
+		// Required field?
+		var reqMask uint64
+		if tagArray[2] == "req" {
+			bit := len(u.reqFields)
+			u.reqFields = append(u.reqFields, name)
+			reqMask = uint64(1) << uint(bit)
+			// TODO: if we have more than 64 required fields, we end up
+			// not verifying that all required fields are present.
+			// Fix this, perhaps using a count of required fields?
+		}
+
+		// Store the info in the correct slot in the message.
+		u.setTag(tag, toField(&f), unmarshal, reqMask)
+	}
+
+	// Find any types associated with oneof fields.
+	// TODO: XXX_OneofFuncs returns more info than we need.  Get rid of some of it?
+	fn := reflect.Zero(reflect.PtrTo(t)).MethodByName("XXX_OneofFuncs")
+	if fn.IsValid() {
+		res := fn.Call(nil)[3] // last return value from XXX_OneofFuncs: []interface{}
+		for i := res.Len() - 1; i >= 0; i-- {
+			v := res.Index(i)                             // interface{}
+			tptr := reflect.ValueOf(v.Interface()).Type() // *Msg_X
+			typ := tptr.Elem()                            // Msg_X
+
+			f := typ.Field(0) // oneof implementers have one field
+			baseUnmarshal := fieldUnmarshaler(&f)
+			tagstr := strings.Split(f.Tag.Get("protobuf"), ",")[1]
+			tag, err := strconv.Atoi(tagstr)
+			if err != nil {
+				panic("protobuf tag field not an integer: " + tagstr)
+			}
+
+			// Find the oneof field that this struct implements.
+			// Might take O(n^2) to process all of the oneofs, but who cares.
+			for _, of := range oneofFields {
+				if tptr.Implements(of.ityp) {
+					// We have found the corresponding interface for this struct.
+					// That lets us know where this struct should be stored
+					// when we encounter it during unmarshaling.
+					unmarshal := makeUnmarshalOneof(typ, of.ityp, baseUnmarshal)
+					u.setTag(tag, of.field, unmarshal, 0)
+				}
+			}
+		}
+	}
+
+	// Get extension ranges, if any.
+	fn = reflect.Zero(reflect.PtrTo(t)).MethodByName("ExtensionRangeArray")
+	if fn.IsValid() {
+		if !u.extensions.IsValid() && !u.oldExtensions.IsValid() {
+			panic("a message with extensions, but no extensions field in " + t.Name())
+		}
+		u.extensionRanges = fn.Call(nil)[0].Interface().([]ExtensionRange)
+	}
+
+	// Explicitly disallow tag 0. This will ensure we flag an error
+	// when decoding a buffer of all zeros. Without this code, we
+	// would decode and skip an all-zero buffer of even length.
+	// [0 0] is [tag=0/wiretype=varint varint-encoded-0].
+	u.setTag(0, zeroField, func(b []byte, f pointer, w int) ([]byte, error) {
+		return nil, fmt.Errorf("proto: %s: illegal tag 0 (wire type %d)", t, w)
+	}, 0)
+
+	// Set mask for required field check.
+	u.reqMask = uint64(1)<<uint(len(u.reqFields)) - 1
+
+	atomic.StoreInt32(&u.initialized, 1)
+}
+
+// setTag stores the unmarshal information for the given tag.
+// tag = tag # for field
+// field/unmarshal = unmarshal info for that field.
+// reqMask = if required, bitmask for field position in required field list. 0 otherwise.
+func (u *unmarshalInfo) setTag(tag int, field field, unmarshal unmarshaler, reqMask uint64) {
+	i := unmarshalFieldInfo{field: field, unmarshal: unmarshal, reqMask: reqMask}
+	n := u.typ.NumField()
+	if tag >= 0 && (tag < 16 || tag < 2*n) { // TODO: what are the right numbers here?
+		for len(u.dense) <= tag {
+			u.dense = append(u.dense, unmarshalFieldInfo{})
+		}
+		u.dense[tag] = i
+		return
+	}
+	if u.sparse == nil {
+		u.sparse = map[uint64]unmarshalFieldInfo{}
+	}
+	u.sparse[uint64(tag)] = i
+}
+
+// fieldUnmarshaler returns an unmarshaler for the given field.
+func fieldUnmarshaler(f *reflect.StructField) unmarshaler {
+	if f.Type.Kind() == reflect.Map {
+		return makeUnmarshalMap(f)
+	}
+	return typeUnmarshaler(f.Type, f.Tag.Get("protobuf"))
+}
+
+// typeUnmarshaler returns an unmarshaler for the given field type / field tag pair.
+func typeUnmarshaler(t reflect.Type, tags string) unmarshaler {
+	tagArray := strings.Split(tags, ",")
+	encoding := tagArray[0]
+	name := "unknown"
+	for _, tag := range tagArray[3:] {
+		if strings.HasPrefix(tag, "name=") {
+			name = tag[5:]
+		}
+	}
+
+	// Figure out packaging (pointer, slice, or both)
+	slice := false
+	pointer := false
+	if t.Kind() == reflect.Slice && t.Elem().Kind() != reflect.Uint8 {
+		slice = true
+		t = t.Elem()
+	}
+	if t.Kind() == reflect.Ptr {
+		pointer = true
+		t = t.Elem()
+	}
+
+	// We'll never have both pointer and slice for basic types.
+	if pointer && slice && t.Kind() != reflect.Struct {
+		panic("both pointer and slice for basic type in " + t.Name())
+	}
+
+	switch t.Kind() {
+	case reflect.Bool:
+		if pointer {
+			return unmarshalBoolPtr
+		}
+		if slice {
+			return unmarshalBoolSlice
+		}
+		return unmarshalBoolValue
+	case reflect.Int32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return unmarshalFixedS32Ptr
+			}
+			if slice {
+				return unmarshalFixedS32Slice
+			}
+			return unmarshalFixedS32Value
+		case "varint":
+			// this could be int32 or enum
+			if pointer {
+				return unmarshalInt32Ptr
+			}
+			if slice {
+				return unmarshalInt32Slice
+			}
+			return unmarshalInt32Value
+		case "zigzag32":
+			if pointer {
+				return unmarshalSint32Ptr
+			}
+			if slice {
+				return unmarshalSint32Slice
+			}
+			return unmarshalSint32Value
+		}
+	case reflect.Int64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return unmarshalFixedS64Ptr
+			}
+			if slice {
+				return unmarshalFixedS64Slice
+			}
+			return unmarshalFixedS64Value
+		case "varint":
+			if pointer {
+				return unmarshalInt64Ptr
+			}
+			if slice {
+				return unmarshalInt64Slice
+			}
+			return unmarshalInt64Value
+		case "zigzag64":
+			if pointer {
+				return unmarshalSint64Ptr
+			}
+			if slice {
+				return unmarshalSint64Slice
+			}
+			return unmarshalSint64Value
+		}
+	case reflect.Uint32:
+		switch encoding {
+		case "fixed32":
+			if pointer {
+				return unmarshalFixed32Ptr
+			}
+			if slice {
+				return unmarshalFixed32Slice
+			}
+			return unmarshalFixed32Value
+		case "varint":
+			if pointer {
+				return unmarshalUint32Ptr
+			}
+			if slice {
+				return unmarshalUint32Slice
+			}
+			return unmarshalUint32Value
+		}
+	case reflect.Uint64:
+		switch encoding {
+		case "fixed64":
+			if pointer {
+				return unmarshalFixed64Ptr
+			}
+			if slice {
+				return unmarshalFixed64Slice
+			}
+			return unmarshalFixed64Value
+		case "varint":
+			if pointer {
+				return unmarshalUint64Ptr
+			}
+			if slice {
+				return unmarshalUint64Slice
+			}
+			return unmarshalUint64Value
+		}
+	case reflect.Float32:
+		if pointer {
+			return unmarshalFloat32Ptr
+		}
+		if slice {
+			return unmarshalFloat32Slice
+		}
+		return unmarshalFloat32Value
+	case reflect.Float64:
+		if pointer {
+			return unmarshalFloat64Ptr
+		}
+		if slice {
+			return unmarshalFloat64Slice
+		}
+		return unmarshalFloat64Value
+	case reflect.Map:
+		panic("map type in typeUnmarshaler in " + t.Name())
+	case reflect.Slice:
+		if pointer {
+			panic("bad pointer in slice case in " + t.Name())
+		}
+		if slice {
+			return unmarshalBytesSlice
+		}
+		return unmarshalBytesValue
+	case reflect.String:
+		if pointer {
+			return unmarshalStringPtr
+		}
+		if slice {
+			return unmarshalStringSlice
+		}
+		return unmarshalStringValue
+	case reflect.Struct:
+		// message or group field
+		if !pointer {
+			panic(fmt.Sprintf("message/group field %s:%s without pointer", t, encoding))
+		}
+		switch encoding {
+		case "bytes":
+			if slice {
+				return makeUnmarshalMessageSlicePtr(getUnmarshalInfo(t), name)
+			}
+			return makeUnmarshalMessagePtr(getUnmarshalInfo(t), name)
+		case "group":
+			if slice {
+				return makeUnmarshalGroupSlicePtr(getUnmarshalInfo(t), name)
+			}
+			return makeUnmarshalGroupPtr(getUnmarshalInfo(t), name)
+		}
+	}
+	panic(fmt.Sprintf("unmarshaler not found type:%s encoding:%s", t, encoding))
+}
+
+// Below are all the unmarshalers for individual fields of various types.
+
+func unmarshalInt64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	*f.toInt64() = v
+	return b, nil
+}
+
+func unmarshalInt64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	*f.toInt64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalInt64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int64(x)
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x)
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalSint64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	*f.toInt64() = v
+	return b, nil
+}
+
+func unmarshalSint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	*f.toInt64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalSint64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int64(x>>1) ^ int64(x)<<63>>63
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int64(x>>1) ^ int64(x)<<63>>63
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalUint64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	*f.toUint64() = v
+	return b, nil
+}
+
+func unmarshalUint64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	*f.toUint64Ptr() = &v
+	return b, nil
+}
+
+func unmarshalUint64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := uint64(x)
+			s := f.toUint64Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint64(x)
+	s := f.toUint64Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalInt32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	*f.toInt32() = v
+	return b, nil
+}
+
+func unmarshalInt32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	f.setInt32Ptr(v)
+	return b, nil
+}
+
+func unmarshalInt32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int32(x)
+			f.appendInt32Slice(v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x)
+	f.appendInt32Slice(v)
+	return b, nil
+}
+
+func unmarshalSint32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	*f.toInt32() = v
+	return b, nil
+}
+
+func unmarshalSint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	f.setInt32Ptr(v)
+	return b, nil
+}
+
+func unmarshalSint32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := int32(x>>1) ^ int32(x)<<31>>31
+			f.appendInt32Slice(v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := int32(x>>1) ^ int32(x)<<31>>31
+	f.appendInt32Slice(v)
+	return b, nil
+}
+
+func unmarshalUint32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	*f.toUint32() = v
+	return b, nil
+}
+
+func unmarshalUint32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	*f.toUint32Ptr() = &v
+	return b, nil
+}
+
+func unmarshalUint32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			b = b[n:]
+			v := uint32(x)
+			s := f.toUint32Slice()
+			*s = append(*s, v)
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	v := uint32(x)
+	s := f.toUint32Slice()
+	*s = append(*s, v)
+	return b, nil
+}
+
+func unmarshalFixed64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	*f.toUint64() = v
+	return b[8:], nil
+}
+
+func unmarshalFixed64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	*f.toUint64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFixed64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+			s := f.toUint64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
+	s := f.toUint64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	*f.toInt64() = v
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	*f.toInt64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFixedS64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+			s := f.toInt64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int64(b[0]) | int64(b[1])<<8 | int64(b[2])<<16 | int64(b[3])<<24 | int64(b[4])<<32 | int64(b[5])<<40 | int64(b[6])<<48 | int64(b[7])<<56
+	s := f.toInt64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFixed32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	*f.toUint32() = v
+	return b[4:], nil
+}
+
+func unmarshalFixed32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	*f.toUint32Ptr() = &v
+	return b[4:], nil
+}
+
+func unmarshalFixed32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+			s := f.toUint32Slice()
+			*s = append(*s, v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
+	s := f.toUint32Slice()
+	*s = append(*s, v)
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	*f.toInt32() = v
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	f.setInt32Ptr(v)
+	return b[4:], nil
+}
+
+func unmarshalFixedS32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+			f.appendInt32Slice(v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := int32(b[0]) | int32(b[1])<<8 | int32(b[2])<<16 | int32(b[3])<<24
+	f.appendInt32Slice(v)
+	return b[4:], nil
+}
+
+func unmarshalBoolValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	// Note: any length varint is allowed, even though any sane
+	// encoder will use one byte.
+	// See https://github.com/golang/protobuf/issues/76
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	// TODO: check if x>1? Tests seem to indicate no.
+	v := x != 0
+	*f.toBool() = v
+	return b[n:], nil
+}
+
+func unmarshalBoolPtr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := x != 0
+	*f.toBoolPtr() = &v
+	return b[n:], nil
+}
+
+func unmarshalBoolSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			x, n = decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := x != 0
+			s := f.toBoolSlice()
+			*s = append(*s, v)
+			b = b[n:]
+		}
+		return res, nil
+	}
+	if w != WireVarint {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := x != 0
+	s := f.toBoolSlice()
+	*s = append(*s, v)
+	return b[n:], nil
+}
+
+func unmarshalFloat64Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	*f.toFloat64() = v
+	return b[8:], nil
+}
+
+func unmarshalFloat64Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	*f.toFloat64Ptr() = &v
+	return b[8:], nil
+}
+
+func unmarshalFloat64Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 8 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+			s := f.toFloat64Slice()
+			*s = append(*s, v)
+			b = b[8:]
+		}
+		return res, nil
+	}
+	if w != WireFixed64 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 8 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float64frombits(uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 | uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56)
+	s := f.toFloat64Slice()
+	*s = append(*s, v)
+	return b[8:], nil
+}
+
+func unmarshalFloat32Value(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	*f.toFloat32() = v
+	return b[4:], nil
+}
+
+func unmarshalFloat32Ptr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	*f.toFloat32Ptr() = &v
+	return b[4:], nil
+}
+
+func unmarshalFloat32Slice(b []byte, f pointer, w int) ([]byte, error) {
+	if w == WireBytes { // packed
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		res := b[x:]
+		b = b[:x]
+		for len(b) > 0 {
+			if len(b) < 4 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+			s := f.toFloat32Slice()
+			*s = append(*s, v)
+			b = b[4:]
+		}
+		return res, nil
+	}
+	if w != WireFixed32 {
+		return b, errInternalBadWireType
+	}
+	if len(b) < 4 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := math.Float32frombits(uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24)
+	s := f.toFloat32Slice()
+	*s = append(*s, v)
+	return b[4:], nil
+}
+
+func unmarshalStringValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	*f.toString() = v
+	return b[x:], nil
+}
+
+func unmarshalStringPtr(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	*f.toStringPtr() = &v
+	return b[x:], nil
+}
+
+func unmarshalStringSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := string(b[:x])
+	if !utf8.ValidString(v) {
+		return nil, errInvalidUTF8
+	}
+	s := f.toStringSlice()
+	*s = append(*s, v)
+	return b[x:], nil
+}
+
+var emptyBuf [0]byte
+
+func unmarshalBytesValue(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	// The use of append here is a trick which avoids the zeroing
+	// that would be required if we used a make/copy pair.
+	// We append to emptyBuf instead of nil because we want
+	// a non-nil result even when the length is 0.
+	v := append(emptyBuf[:], b[:x]...)
+	*f.toBytes() = v
+	return b[x:], nil
+}
+
+func unmarshalBytesSlice(b []byte, f pointer, w int) ([]byte, error) {
+	if w != WireBytes {
+		return b, errInternalBadWireType
+	}
+	x, n := decodeVarint(b)
+	if n == 0 {
+		return nil, io.ErrUnexpectedEOF
+	}
+	b = b[n:]
+	if x > uint64(len(b)) {
+		return nil, io.ErrUnexpectedEOF
+	}
+	v := append(emptyBuf[:], b[:x]...)
+	s := f.toBytesSlice()
+	*s = append(*s, v)
+	return b[x:], nil
+}
+
+func makeUnmarshalMessagePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireBytes {
+			return b, errInternalBadWireType
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		// First read the message field to see if something is there.
+		// The semantics of multiple submessages are weird.  Instead of
+		// the last one winning (as it is for all other fields), multiple
+		// submessages are merged.
+		v := f.getPointer()
+		if v.isNil() {
+			v = valToPointer(reflect.New(sub.typ))
+			f.setPointer(v)
+		}
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		return b[x:], err
+	}
+}
+
+func makeUnmarshalMessageSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireBytes {
+			return b, errInternalBadWireType
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := valToPointer(reflect.New(sub.typ))
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		f.appendPointer(v)
+		return b[x:], err
+	}
+}
+
+func makeUnmarshalGroupPtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireStartGroup {
+			return b, errInternalBadWireType
+		}
+		x, y := findEndGroup(b)
+		if x < 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := f.getPointer()
+		if v.isNil() {
+			v = valToPointer(reflect.New(sub.typ))
+			f.setPointer(v)
+		}
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		return b[y:], err
+	}
+}
+
+func makeUnmarshalGroupSlicePtr(sub *unmarshalInfo, name string) unmarshaler {
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		if w != WireStartGroup {
+			return b, errInternalBadWireType
+		}
+		x, y := findEndGroup(b)
+		if x < 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		v := valToPointer(reflect.New(sub.typ))
+		err := sub.unmarshal(v, b[:x])
+		if err != nil {
+			if r, ok := err.(*RequiredNotSetError); ok {
+				r.field = name + "." + r.field
+			} else {
+				return nil, err
+			}
+		}
+		f.appendPointer(v)
+		return b[y:], err
+	}
+}
+
+func makeUnmarshalMap(f *reflect.StructField) unmarshaler {
+	t := f.Type
+	kt := t.Key()
+	vt := t.Elem()
+	unmarshalKey := typeUnmarshaler(kt, f.Tag.Get("protobuf_key"))
+	unmarshalVal := typeUnmarshaler(vt, f.Tag.Get("protobuf_val"))
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		// The map entry is a submessage. Figure out how big it is.
+		if w != WireBytes {
+			return nil, fmt.Errorf("proto: bad wiretype for map field: got %d want %d", w, WireBytes)
+		}
+		x, n := decodeVarint(b)
+		if n == 0 {
+			return nil, io.ErrUnexpectedEOF
+		}
+		b = b[n:]
+		if x > uint64(len(b)) {
+			return nil, io.ErrUnexpectedEOF
+		}
+		r := b[x:] // unused data to return
+		b = b[:x]  // data for map entry
+
+		// Note: we could use #keys * #values ~= 200 functions
+		// to do map decoding without reflection. Probably not worth it.
+		// Maps will be somewhat slow. Oh well.
+
+		// Read key and value from data.
+		k := reflect.New(kt)
+		v := reflect.New(vt)
+		for len(b) > 0 {
+			x, n := decodeVarint(b)
+			if n == 0 {
+				return nil, io.ErrUnexpectedEOF
+			}
+			wire := int(x) & 7
+			b = b[n:]
+
+			var err error
+			switch x >> 3 {
+			case 1:
+				b, err = unmarshalKey(b, valToPointer(k), wire)
+			case 2:
+				b, err = unmarshalVal(b, valToPointer(v), wire)
+			default:
+				err = errInternalBadWireType // skip unknown tag
+			}
+
+			if err == nil {
+				continue
+			}
+			if err != errInternalBadWireType {
+				return nil, err
+			}
+
+			// Skip past unknown fields.
+			b, err = skipField(b, wire)
+			if err != nil {
+				return nil, err
+			}
+		}
+
+		// Get map, allocate if needed.
+		m := f.asPointerTo(t).Elem() // an addressable map[K]T
+		if m.IsNil() {
+			m.Set(reflect.MakeMap(t))
+		}
+
+		// Insert into map.
+		m.SetMapIndex(k.Elem(), v.Elem())
+
+		return r, nil
+	}
+}
+
+// makeUnmarshalOneof makes an unmarshaler for oneof fields.
+// for:
+// message Msg {
+//   oneof F {
+//     int64 X = 1;
+//     float64 Y = 2;
+//   }
+// }
+// typ is the type of the concrete entry for a oneof case (e.g. Msg_X).
+// ityp is the interface type of the oneof field (e.g. isMsg_F).
+// unmarshal is the unmarshaler for the base type of the oneof case (e.g. int64).
+// Note that this function will be called once for each case in the oneof.
+func makeUnmarshalOneof(typ, ityp reflect.Type, unmarshal unmarshaler) unmarshaler {
+	sf := typ.Field(0)
+	field0 := toField(&sf)
+	return func(b []byte, f pointer, w int) ([]byte, error) {
+		// Allocate holder for value.
+		v := reflect.New(typ)
+
+		// Unmarshal data into holder.
+		// We unmarshal into the first field of the holder object.
+		var err error
+		b, err = unmarshal(b, valToPointer(v).offset(field0), w)
+		if err != nil {
+			return nil, err
+		}
+
+		// Write pointer to holder into target field.
+		f.asPointerTo(ityp).Elem().Set(v)
+
+		return b, nil
+	}
+}
+
+// Error used by decode internally.
+var errInternalBadWireType = errors.New("proto: internal error: bad wiretype")
+
+// skipField skips past a field of type wire and returns the remaining bytes.
+func skipField(b []byte, wire int) ([]byte, error) {
+	switch wire {
+	case WireVarint:
+		_, k := decodeVarint(b)
+		if k == 0 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[k:]
+	case WireFixed32:
+		if len(b) < 4 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[4:]
+	case WireFixed64:
+		if len(b) < 8 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[8:]
+	case WireBytes:
+		m, k := decodeVarint(b)
+		if k == 0 || uint64(len(b)-k) < m {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[uint64(k)+m:]
+	case WireStartGroup:
+		_, i := findEndGroup(b)
+		if i == -1 {
+			return b, io.ErrUnexpectedEOF
+		}
+		b = b[i:]
+	default:
+		return b, fmt.Errorf("proto: can't skip unknown wire type %d", wire)
+	}
+	return b, nil
+}
+
+// findEndGroup finds the index of the next EndGroup tag.
+// Groups may be nested, so the "next" EndGroup tag is the first
+// unpaired EndGroup.
+// findEndGroup returns the indexes of the start and end of the EndGroup tag.
+// Returns (-1,-1) if it can't find one.
+func findEndGroup(b []byte) (int, int) {
+	depth := 1
+	i := 0
+	for {
+		x, n := decodeVarint(b[i:])
+		if n == 0 {
+			return -1, -1
+		}
+		j := i
+		i += n
+		switch x & 7 {
+		case WireVarint:
+			_, k := decodeVarint(b[i:])
+			if k == 0 {
+				return -1, -1
+			}
+			i += k
+		case WireFixed32:
+			if len(b)-4 < i {
+				return -1, -1
+			}
+			i += 4
+		case WireFixed64:
+			if len(b)-8 < i {
+				return -1, -1
+			}
+			i += 8
+		case WireBytes:
+			m, k := decodeVarint(b[i:])
+			if k == 0 {
+				return -1, -1
+			}
+			i += k
+			if uint64(len(b)-i) < m {
+				return -1, -1
+			}
+			i += int(m)
+		case WireStartGroup:
+			depth++
+		case WireEndGroup:
+			depth--
+			if depth == 0 {
+				return j, i
+			}
+		default:
+			return -1, -1
+		}
+	}
+}
+
+// encodeVarint appends a varint-encoded integer to b and returns the result.
+func encodeVarint(b []byte, x uint64) []byte {
+	for x >= 1<<7 {
+		b = append(b, byte(x&0x7f|0x80))
+		x >>= 7
+	}
+	return append(b, byte(x))
+}
+
+// decodeVarint reads a varint-encoded integer from b.
+// Returns the decoded integer and the number of bytes read.
+// If there is an error, it returns 0,0.
+func decodeVarint(b []byte) (uint64, int) {
+	var x, y uint64
+	if len(b) <= 0 {
+		goto bad
+	}
+	x = uint64(b[0])
+	if x < 0x80 {
+		return x, 1
+	}
+	x -= 0x80
+
+	if len(b) <= 1 {
+		goto bad
+	}
+	y = uint64(b[1])
+	x += y << 7
+	if y < 0x80 {
+		return x, 2
+	}
+	x -= 0x80 << 7
+
+	if len(b) <= 2 {
+		goto bad
+	}
+	y = uint64(b[2])
+	x += y << 14
+	if y < 0x80 {
+		return x, 3
+	}
+	x -= 0x80 << 14
+
+	if len(b) <= 3 {
+		goto bad
+	}
+	y = uint64(b[3])
+	x += y << 21
+	if y < 0x80 {
+		return x, 4
+	}
+	x -= 0x80 << 21
+
+	if len(b) <= 4 {
+		goto bad
+	}
+	y = uint64(b[4])
+	x += y << 28
+	if y < 0x80 {
+		return x, 5
+	}
+	x -= 0x80 << 28
+
+	if len(b) <= 5 {
+		goto bad
+	}
+	y = uint64(b[5])
+	x += y << 35
+	if y < 0x80 {
+		return x, 6
+	}
+	x -= 0x80 << 35
+
+	if len(b) <= 6 {
+		goto bad
+	}
+	y = uint64(b[6])
+	x += y << 42
+	if y < 0x80 {
+		return x, 7
+	}
+	x -= 0x80 << 42
+
+	if len(b) <= 7 {
+		goto bad
+	}
+	y = uint64(b[7])
+	x += y << 49
+	if y < 0x80 {
+		return x, 8
+	}
+	x -= 0x80 << 49
+
+	if len(b) <= 8 {
+		goto bad
+	}
+	y = uint64(b[8])
+	x += y << 56
+	if y < 0x80 {
+		return x, 9
+	}
+	x -= 0x80 << 56
+
+	if len(b) <= 9 {
+		goto bad
+	}
+	y = uint64(b[9])
+	x += y << 63
+	if y < 2 {
+		return x, 10
+	}
+
+bad:
+	return 0, 0
+}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/testdata/Makefile b/installer/vendor/github.com/golang/protobuf/proto/testdata/Makefile
deleted file mode 100644
index fc288628a7..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/testdata/Makefile
+++ /dev/null
@@ -1,50 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-include ../../Make.protobuf
-
-all:	regenerate
-
-regenerate:
-	rm -f test.pb.go
-	make test.pb.go
-
-# The following rules are just aids to development. Not needed for typical testing.
-
-diff:	regenerate
-	git diff test.pb.go
-
-restore:
-	cp test.pb.go.golden test.pb.go
-
-preserve:
-	cp test.pb.go test.pb.go.golden
diff --git a/installer/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go b/installer/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go
deleted file mode 100644
index 7172d0e969..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/testdata/golden_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Verify that the compiler output for test.proto is unchanged.
-
-package testdata
-
-import (
-	"crypto/sha1"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-)
-
-// sum returns in string form (for easy comparison) the SHA-1 hash of the named file.
-func sum(t *testing.T, name string) string {
-	data, err := ioutil.ReadFile(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("sum(%q): length is %d", name, len(data))
-	hash := sha1.New()
-	_, err = hash.Write(data)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return fmt.Sprintf("% x", hash.Sum(nil))
-}
-
-func run(t *testing.T, name string, args ...string) {
-	cmd := exec.Command(name, args...)
-	cmd.Stdin = os.Stdin
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	err := cmd.Run()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// Compute the original checksum.
-	goldenSum := sum(t, "test.pb.go")
-	// Run the proto compiler.
-	run(t, "protoc", "--go_out="+os.TempDir(), "test.proto")
-	newFile := filepath.Join(os.TempDir(), "test.pb.go")
-	defer os.Remove(newFile)
-	// Compute the new checksum.
-	newSum := sum(t, newFile)
-	// Verify
-	if newSum != goldenSum {
-		run(t, "diff", "-u", "test.pb.go", newFile)
-		t.Fatal("Code generated by protoc-gen-go has changed; update test.pb.go")
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go b/installer/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go
deleted file mode 100644
index e980d1a03c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/testdata/test.pb.go
+++ /dev/null
@@ -1,4147 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: test.proto
-
-/*
-Package testdata is a generated protocol buffer package.
-
-It is generated from these files:
-	test.proto
-
-It has these top-level messages:
-	GoEnum
-	GoTestField
-	GoTest
-	GoTestRequiredGroupField
-	GoSkipTest
-	NonPackedTest
-	PackedTest
-	MaxTag
-	OldMessage
-	NewMessage
-	InnerMessage
-	OtherMessage
-	RequiredInnerMessage
-	MyMessage
-	Ext
-	ComplexExtension
-	DefaultsMessage
-	MyMessageSet
-	Empty
-	MessageList
-	Strings
-	Defaults
-	SubDefaults
-	RepeatedEnum
-	MoreRepeated
-	GroupOld
-	GroupNew
-	FloatingPoint
-	MessageWithMap
-	Oneof
-	Communique
-*/
-package testdata
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type FOO int32
-
-const (
-	FOO_FOO1 FOO = 1
-)
-
-var FOO_name = map[int32]string{
-	1: "FOO1",
-}
-var FOO_value = map[string]int32{
-	"FOO1": 1,
-}
-
-func (x FOO) Enum() *FOO {
-	p := new(FOO)
-	*p = x
-	return p
-}
-func (x FOO) String() string {
-	return proto.EnumName(FOO_name, int32(x))
-}
-func (x *FOO) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FOO_value, data, "FOO")
-	if err != nil {
-		return err
-	}
-	*x = FOO(value)
-	return nil
-}
-func (FOO) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-// An enum, for completeness.
-type GoTest_KIND int32
-
-const (
-	GoTest_VOID GoTest_KIND = 0
-	// Basic types
-	GoTest_BOOL        GoTest_KIND = 1
-	GoTest_BYTES       GoTest_KIND = 2
-	GoTest_FINGERPRINT GoTest_KIND = 3
-	GoTest_FLOAT       GoTest_KIND = 4
-	GoTest_INT         GoTest_KIND = 5
-	GoTest_STRING      GoTest_KIND = 6
-	GoTest_TIME        GoTest_KIND = 7
-	// Groupings
-	GoTest_TUPLE GoTest_KIND = 8
-	GoTest_ARRAY GoTest_KIND = 9
-	GoTest_MAP   GoTest_KIND = 10
-	// Table types
-	GoTest_TABLE GoTest_KIND = 11
-	// Functions
-	GoTest_FUNCTION GoTest_KIND = 12
-)
-
-var GoTest_KIND_name = map[int32]string{
-	0:  "VOID",
-	1:  "BOOL",
-	2:  "BYTES",
-	3:  "FINGERPRINT",
-	4:  "FLOAT",
-	5:  "INT",
-	6:  "STRING",
-	7:  "TIME",
-	8:  "TUPLE",
-	9:  "ARRAY",
-	10: "MAP",
-	11: "TABLE",
-	12: "FUNCTION",
-}
-var GoTest_KIND_value = map[string]int32{
-	"VOID":        0,
-	"BOOL":        1,
-	"BYTES":       2,
-	"FINGERPRINT": 3,
-	"FLOAT":       4,
-	"INT":         5,
-	"STRING":      6,
-	"TIME":        7,
-	"TUPLE":       8,
-	"ARRAY":       9,
-	"MAP":         10,
-	"TABLE":       11,
-	"FUNCTION":    12,
-}
-
-func (x GoTest_KIND) Enum() *GoTest_KIND {
-	p := new(GoTest_KIND)
-	*p = x
-	return p
-}
-func (x GoTest_KIND) String() string {
-	return proto.EnumName(GoTest_KIND_name, int32(x))
-}
-func (x *GoTest_KIND) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(GoTest_KIND_value, data, "GoTest_KIND")
-	if err != nil {
-		return err
-	}
-	*x = GoTest_KIND(value)
-	return nil
-}
-func (GoTest_KIND) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-type MyMessage_Color int32
-
-const (
-	MyMessage_RED   MyMessage_Color = 0
-	MyMessage_GREEN MyMessage_Color = 1
-	MyMessage_BLUE  MyMessage_Color = 2
-)
-
-var MyMessage_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var MyMessage_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x MyMessage_Color) Enum() *MyMessage_Color {
-	p := new(MyMessage_Color)
-	*p = x
-	return p
-}
-func (x MyMessage_Color) String() string {
-	return proto.EnumName(MyMessage_Color_name, int32(x))
-}
-func (x *MyMessage_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MyMessage_Color_value, data, "MyMessage_Color")
-	if err != nil {
-		return err
-	}
-	*x = MyMessage_Color(value)
-	return nil
-}
-func (MyMessage_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
-
-type DefaultsMessage_DefaultsEnum int32
-
-const (
-	DefaultsMessage_ZERO DefaultsMessage_DefaultsEnum = 0
-	DefaultsMessage_ONE  DefaultsMessage_DefaultsEnum = 1
-	DefaultsMessage_TWO  DefaultsMessage_DefaultsEnum = 2
-)
-
-var DefaultsMessage_DefaultsEnum_name = map[int32]string{
-	0: "ZERO",
-	1: "ONE",
-	2: "TWO",
-}
-var DefaultsMessage_DefaultsEnum_value = map[string]int32{
-	"ZERO": 0,
-	"ONE":  1,
-	"TWO":  2,
-}
-
-func (x DefaultsMessage_DefaultsEnum) Enum() *DefaultsMessage_DefaultsEnum {
-	p := new(DefaultsMessage_DefaultsEnum)
-	*p = x
-	return p
-}
-func (x DefaultsMessage_DefaultsEnum) String() string {
-	return proto.EnumName(DefaultsMessage_DefaultsEnum_name, int32(x))
-}
-func (x *DefaultsMessage_DefaultsEnum) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(DefaultsMessage_DefaultsEnum_value, data, "DefaultsMessage_DefaultsEnum")
-	if err != nil {
-		return err
-	}
-	*x = DefaultsMessage_DefaultsEnum(value)
-	return nil
-}
-func (DefaultsMessage_DefaultsEnum) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{16, 0}
-}
-
-type Defaults_Color int32
-
-const (
-	Defaults_RED   Defaults_Color = 0
-	Defaults_GREEN Defaults_Color = 1
-	Defaults_BLUE  Defaults_Color = 2
-)
-
-var Defaults_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Defaults_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Defaults_Color) Enum() *Defaults_Color {
-	p := new(Defaults_Color)
-	*p = x
-	return p
-}
-func (x Defaults_Color) String() string {
-	return proto.EnumName(Defaults_Color_name, int32(x))
-}
-func (x *Defaults_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Defaults_Color_value, data, "Defaults_Color")
-	if err != nil {
-		return err
-	}
-	*x = Defaults_Color(value)
-	return nil
-}
-func (Defaults_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{21, 0} }
-
-type RepeatedEnum_Color int32
-
-const (
-	RepeatedEnum_RED RepeatedEnum_Color = 1
-)
-
-var RepeatedEnum_Color_name = map[int32]string{
-	1: "RED",
-}
-var RepeatedEnum_Color_value = map[string]int32{
-	"RED": 1,
-}
-
-func (x RepeatedEnum_Color) Enum() *RepeatedEnum_Color {
-	p := new(RepeatedEnum_Color)
-	*p = x
-	return p
-}
-func (x RepeatedEnum_Color) String() string {
-	return proto.EnumName(RepeatedEnum_Color_name, int32(x))
-}
-func (x *RepeatedEnum_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(RepeatedEnum_Color_value, data, "RepeatedEnum_Color")
-	if err != nil {
-		return err
-	}
-	*x = RepeatedEnum_Color(value)
-	return nil
-}
-func (RepeatedEnum_Color) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{23, 0} }
-
-type GoEnum struct {
-	Foo              *FOO   `protobuf:"varint,1,req,name=foo,enum=testdata.FOO" json:"foo,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoEnum) Reset()                    { *m = GoEnum{} }
-func (m *GoEnum) String() string            { return proto.CompactTextString(m) }
-func (*GoEnum) ProtoMessage()               {}
-func (*GoEnum) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *GoEnum) GetFoo() FOO {
-	if m != nil && m.Foo != nil {
-		return *m.Foo
-	}
-	return FOO_FOO1
-}
-
-type GoTestField struct {
-	Label            *string `protobuf:"bytes,1,req,name=Label" json:"Label,omitempty"`
-	Type             *string `protobuf:"bytes,2,req,name=Type" json:"Type,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTestField) Reset()                    { *m = GoTestField{} }
-func (m *GoTestField) String() string            { return proto.CompactTextString(m) }
-func (*GoTestField) ProtoMessage()               {}
-func (*GoTestField) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *GoTestField) GetLabel() string {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return ""
-}
-
-func (m *GoTestField) GetType() string {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return ""
-}
-
-type GoTest struct {
-	// Some typical parameters
-	Kind  *GoTest_KIND `protobuf:"varint,1,req,name=Kind,enum=testdata.GoTest_KIND" json:"Kind,omitempty"`
-	Table *string      `protobuf:"bytes,2,opt,name=Table" json:"Table,omitempty"`
-	Param *int32       `protobuf:"varint,3,opt,name=Param" json:"Param,omitempty"`
-	// Required, repeated and optional foreign fields.
-	RequiredField *GoTestField   `protobuf:"bytes,4,req,name=RequiredField" json:"RequiredField,omitempty"`
-	RepeatedField []*GoTestField `protobuf:"bytes,5,rep,name=RepeatedField" json:"RepeatedField,omitempty"`
-	OptionalField *GoTestField   `protobuf:"bytes,6,opt,name=OptionalField" json:"OptionalField,omitempty"`
-	// Required fields of all basic types
-	F_BoolRequired    *bool    `protobuf:"varint,10,req,name=F_Bool_required,json=FBoolRequired" json:"F_Bool_required,omitempty"`
-	F_Int32Required   *int32   `protobuf:"varint,11,req,name=F_Int32_required,json=FInt32Required" json:"F_Int32_required,omitempty"`
-	F_Int64Required   *int64   `protobuf:"varint,12,req,name=F_Int64_required,json=FInt64Required" json:"F_Int64_required,omitempty"`
-	F_Fixed32Required *uint32  `protobuf:"fixed32,13,req,name=F_Fixed32_required,json=FFixed32Required" json:"F_Fixed32_required,omitempty"`
-	F_Fixed64Required *uint64  `protobuf:"fixed64,14,req,name=F_Fixed64_required,json=FFixed64Required" json:"F_Fixed64_required,omitempty"`
-	F_Uint32Required  *uint32  `protobuf:"varint,15,req,name=F_Uint32_required,json=FUint32Required" json:"F_Uint32_required,omitempty"`
-	F_Uint64Required  *uint64  `protobuf:"varint,16,req,name=F_Uint64_required,json=FUint64Required" json:"F_Uint64_required,omitempty"`
-	F_FloatRequired   *float32 `protobuf:"fixed32,17,req,name=F_Float_required,json=FFloatRequired" json:"F_Float_required,omitempty"`
-	F_DoubleRequired  *float64 `protobuf:"fixed64,18,req,name=F_Double_required,json=FDoubleRequired" json:"F_Double_required,omitempty"`
-	F_StringRequired  *string  `protobuf:"bytes,19,req,name=F_String_required,json=FStringRequired" json:"F_String_required,omitempty"`
-	F_BytesRequired   []byte   `protobuf:"bytes,101,req,name=F_Bytes_required,json=FBytesRequired" json:"F_Bytes_required,omitempty"`
-	F_Sint32Required  *int32   `protobuf:"zigzag32,102,req,name=F_Sint32_required,json=FSint32Required" json:"F_Sint32_required,omitempty"`
-	F_Sint64Required  *int64   `protobuf:"zigzag64,103,req,name=F_Sint64_required,json=FSint64Required" json:"F_Sint64_required,omitempty"`
-	// Repeated fields of all basic types
-	F_BoolRepeated    []bool    `protobuf:"varint,20,rep,name=F_Bool_repeated,json=FBoolRepeated" json:"F_Bool_repeated,omitempty"`
-	F_Int32Repeated   []int32   `protobuf:"varint,21,rep,name=F_Int32_repeated,json=FInt32Repeated" json:"F_Int32_repeated,omitempty"`
-	F_Int64Repeated   []int64   `protobuf:"varint,22,rep,name=F_Int64_repeated,json=FInt64Repeated" json:"F_Int64_repeated,omitempty"`
-	F_Fixed32Repeated []uint32  `protobuf:"fixed32,23,rep,name=F_Fixed32_repeated,json=FFixed32Repeated" json:"F_Fixed32_repeated,omitempty"`
-	F_Fixed64Repeated []uint64  `protobuf:"fixed64,24,rep,name=F_Fixed64_repeated,json=FFixed64Repeated" json:"F_Fixed64_repeated,omitempty"`
-	F_Uint32Repeated  []uint32  `protobuf:"varint,25,rep,name=F_Uint32_repeated,json=FUint32Repeated" json:"F_Uint32_repeated,omitempty"`
-	F_Uint64Repeated  []uint64  `protobuf:"varint,26,rep,name=F_Uint64_repeated,json=FUint64Repeated" json:"F_Uint64_repeated,omitempty"`
-	F_FloatRepeated   []float32 `protobuf:"fixed32,27,rep,name=F_Float_repeated,json=FFloatRepeated" json:"F_Float_repeated,omitempty"`
-	F_DoubleRepeated  []float64 `protobuf:"fixed64,28,rep,name=F_Double_repeated,json=FDoubleRepeated" json:"F_Double_repeated,omitempty"`
-	F_StringRepeated  []string  `protobuf:"bytes,29,rep,name=F_String_repeated,json=FStringRepeated" json:"F_String_repeated,omitempty"`
-	F_BytesRepeated   [][]byte  `protobuf:"bytes,201,rep,name=F_Bytes_repeated,json=FBytesRepeated" json:"F_Bytes_repeated,omitempty"`
-	F_Sint32Repeated  []int32   `protobuf:"zigzag32,202,rep,name=F_Sint32_repeated,json=FSint32Repeated" json:"F_Sint32_repeated,omitempty"`
-	F_Sint64Repeated  []int64   `protobuf:"zigzag64,203,rep,name=F_Sint64_repeated,json=FSint64Repeated" json:"F_Sint64_repeated,omitempty"`
-	// Optional fields of all basic types
-	F_BoolOptional    *bool    `protobuf:"varint,30,opt,name=F_Bool_optional,json=FBoolOptional" json:"F_Bool_optional,omitempty"`
-	F_Int32Optional   *int32   `protobuf:"varint,31,opt,name=F_Int32_optional,json=FInt32Optional" json:"F_Int32_optional,omitempty"`
-	F_Int64Optional   *int64   `protobuf:"varint,32,opt,name=F_Int64_optional,json=FInt64Optional" json:"F_Int64_optional,omitempty"`
-	F_Fixed32Optional *uint32  `protobuf:"fixed32,33,opt,name=F_Fixed32_optional,json=FFixed32Optional" json:"F_Fixed32_optional,omitempty"`
-	F_Fixed64Optional *uint64  `protobuf:"fixed64,34,opt,name=F_Fixed64_optional,json=FFixed64Optional" json:"F_Fixed64_optional,omitempty"`
-	F_Uint32Optional  *uint32  `protobuf:"varint,35,opt,name=F_Uint32_optional,json=FUint32Optional" json:"F_Uint32_optional,omitempty"`
-	F_Uint64Optional  *uint64  `protobuf:"varint,36,opt,name=F_Uint64_optional,json=FUint64Optional" json:"F_Uint64_optional,omitempty"`
-	F_FloatOptional   *float32 `protobuf:"fixed32,37,opt,name=F_Float_optional,json=FFloatOptional" json:"F_Float_optional,omitempty"`
-	F_DoubleOptional  *float64 `protobuf:"fixed64,38,opt,name=F_Double_optional,json=FDoubleOptional" json:"F_Double_optional,omitempty"`
-	F_StringOptional  *string  `protobuf:"bytes,39,opt,name=F_String_optional,json=FStringOptional" json:"F_String_optional,omitempty"`
-	F_BytesOptional   []byte   `protobuf:"bytes,301,opt,name=F_Bytes_optional,json=FBytesOptional" json:"F_Bytes_optional,omitempty"`
-	F_Sint32Optional  *int32   `protobuf:"zigzag32,302,opt,name=F_Sint32_optional,json=FSint32Optional" json:"F_Sint32_optional,omitempty"`
-	F_Sint64Optional  *int64   `protobuf:"zigzag64,303,opt,name=F_Sint64_optional,json=FSint64Optional" json:"F_Sint64_optional,omitempty"`
-	// Default-valued fields of all basic types
-	F_BoolDefaulted    *bool    `protobuf:"varint,40,opt,name=F_Bool_defaulted,json=FBoolDefaulted,def=1" json:"F_Bool_defaulted,omitempty"`
-	F_Int32Defaulted   *int32   `protobuf:"varint,41,opt,name=F_Int32_defaulted,json=FInt32Defaulted,def=32" json:"F_Int32_defaulted,omitempty"`
-	F_Int64Defaulted   *int64   `protobuf:"varint,42,opt,name=F_Int64_defaulted,json=FInt64Defaulted,def=64" json:"F_Int64_defaulted,omitempty"`
-	F_Fixed32Defaulted *uint32  `protobuf:"fixed32,43,opt,name=F_Fixed32_defaulted,json=FFixed32Defaulted,def=320" json:"F_Fixed32_defaulted,omitempty"`
-	F_Fixed64Defaulted *uint64  `protobuf:"fixed64,44,opt,name=F_Fixed64_defaulted,json=FFixed64Defaulted,def=640" json:"F_Fixed64_defaulted,omitempty"`
-	F_Uint32Defaulted  *uint32  `protobuf:"varint,45,opt,name=F_Uint32_defaulted,json=FUint32Defaulted,def=3200" json:"F_Uint32_defaulted,omitempty"`
-	F_Uint64Defaulted  *uint64  `protobuf:"varint,46,opt,name=F_Uint64_defaulted,json=FUint64Defaulted,def=6400" json:"F_Uint64_defaulted,omitempty"`
-	F_FloatDefaulted   *float32 `protobuf:"fixed32,47,opt,name=F_Float_defaulted,json=FFloatDefaulted,def=314159" json:"F_Float_defaulted,omitempty"`
-	F_DoubleDefaulted  *float64 `protobuf:"fixed64,48,opt,name=F_Double_defaulted,json=FDoubleDefaulted,def=271828" json:"F_Double_defaulted,omitempty"`
-	F_StringDefaulted  *string  `protobuf:"bytes,49,opt,name=F_String_defaulted,json=FStringDefaulted,def=hello, \"world!\"\n" json:"F_String_defaulted,omitempty"`
-	F_BytesDefaulted   []byte   `protobuf:"bytes,401,opt,name=F_Bytes_defaulted,json=FBytesDefaulted,def=Bignose" json:"F_Bytes_defaulted,omitempty"`
-	F_Sint32Defaulted  *int32   `protobuf:"zigzag32,402,opt,name=F_Sint32_defaulted,json=FSint32Defaulted,def=-32" json:"F_Sint32_defaulted,omitempty"`
-	F_Sint64Defaulted  *int64   `protobuf:"zigzag64,403,opt,name=F_Sint64_defaulted,json=FSint64Defaulted,def=-64" json:"F_Sint64_defaulted,omitempty"`
-	// Packed repeated fields (no string or bytes).
-	F_BoolRepeatedPacked    []bool                  `protobuf:"varint,50,rep,packed,name=F_Bool_repeated_packed,json=FBoolRepeatedPacked" json:"F_Bool_repeated_packed,omitempty"`
-	F_Int32RepeatedPacked   []int32                 `protobuf:"varint,51,rep,packed,name=F_Int32_repeated_packed,json=FInt32RepeatedPacked" json:"F_Int32_repeated_packed,omitempty"`
-	F_Int64RepeatedPacked   []int64                 `protobuf:"varint,52,rep,packed,name=F_Int64_repeated_packed,json=FInt64RepeatedPacked" json:"F_Int64_repeated_packed,omitempty"`
-	F_Fixed32RepeatedPacked []uint32                `protobuf:"fixed32,53,rep,packed,name=F_Fixed32_repeated_packed,json=FFixed32RepeatedPacked" json:"F_Fixed32_repeated_packed,omitempty"`
-	F_Fixed64RepeatedPacked []uint64                `protobuf:"fixed64,54,rep,packed,name=F_Fixed64_repeated_packed,json=FFixed64RepeatedPacked" json:"F_Fixed64_repeated_packed,omitempty"`
-	F_Uint32RepeatedPacked  []uint32                `protobuf:"varint,55,rep,packed,name=F_Uint32_repeated_packed,json=FUint32RepeatedPacked" json:"F_Uint32_repeated_packed,omitempty"`
-	F_Uint64RepeatedPacked  []uint64                `protobuf:"varint,56,rep,packed,name=F_Uint64_repeated_packed,json=FUint64RepeatedPacked" json:"F_Uint64_repeated_packed,omitempty"`
-	F_FloatRepeatedPacked   []float32               `protobuf:"fixed32,57,rep,packed,name=F_Float_repeated_packed,json=FFloatRepeatedPacked" json:"F_Float_repeated_packed,omitempty"`
-	F_DoubleRepeatedPacked  []float64               `protobuf:"fixed64,58,rep,packed,name=F_Double_repeated_packed,json=FDoubleRepeatedPacked" json:"F_Double_repeated_packed,omitempty"`
-	F_Sint32RepeatedPacked  []int32                 `protobuf:"zigzag32,502,rep,packed,name=F_Sint32_repeated_packed,json=FSint32RepeatedPacked" json:"F_Sint32_repeated_packed,omitempty"`
-	F_Sint64RepeatedPacked  []int64                 `protobuf:"zigzag64,503,rep,packed,name=F_Sint64_repeated_packed,json=FSint64RepeatedPacked" json:"F_Sint64_repeated_packed,omitempty"`
-	Requiredgroup           *GoTest_RequiredGroup   `protobuf:"group,70,req,name=RequiredGroup,json=requiredgroup" json:"requiredgroup,omitempty"`
-	Repeatedgroup           []*GoTest_RepeatedGroup `protobuf:"group,80,rep,name=RepeatedGroup,json=repeatedgroup" json:"repeatedgroup,omitempty"`
-	Optionalgroup           *GoTest_OptionalGroup   `protobuf:"group,90,opt,name=OptionalGroup,json=optionalgroup" json:"optionalgroup,omitempty"`
-	XXX_unrecognized        []byte                  `json:"-"`
-}
-
-func (m *GoTest) Reset()                    { *m = GoTest{} }
-func (m *GoTest) String() string            { return proto.CompactTextString(m) }
-func (*GoTest) ProtoMessage()               {}
-func (*GoTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-const Default_GoTest_F_BoolDefaulted bool = true
-const Default_GoTest_F_Int32Defaulted int32 = 32
-const Default_GoTest_F_Int64Defaulted int64 = 64
-const Default_GoTest_F_Fixed32Defaulted uint32 = 320
-const Default_GoTest_F_Fixed64Defaulted uint64 = 640
-const Default_GoTest_F_Uint32Defaulted uint32 = 3200
-const Default_GoTest_F_Uint64Defaulted uint64 = 6400
-const Default_GoTest_F_FloatDefaulted float32 = 314159
-const Default_GoTest_F_DoubleDefaulted float64 = 271828
-const Default_GoTest_F_StringDefaulted string = "hello, \"world!\"\n"
-
-var Default_GoTest_F_BytesDefaulted []byte = []byte("Bignose")
-
-const Default_GoTest_F_Sint32Defaulted int32 = -32
-const Default_GoTest_F_Sint64Defaulted int64 = -64
-
-func (m *GoTest) GetKind() GoTest_KIND {
-	if m != nil && m.Kind != nil {
-		return *m.Kind
-	}
-	return GoTest_VOID
-}
-
-func (m *GoTest) GetTable() string {
-	if m != nil && m.Table != nil {
-		return *m.Table
-	}
-	return ""
-}
-
-func (m *GoTest) GetParam() int32 {
-	if m != nil && m.Param != nil {
-		return *m.Param
-	}
-	return 0
-}
-
-func (m *GoTest) GetRequiredField() *GoTestField {
-	if m != nil {
-		return m.RequiredField
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedField() []*GoTestField {
-	if m != nil {
-		return m.RepeatedField
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalField() *GoTestField {
-	if m != nil {
-		return m.OptionalField
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolRequired() bool {
-	if m != nil && m.F_BoolRequired != nil {
-		return *m.F_BoolRequired
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Required() int32 {
-	if m != nil && m.F_Int32Required != nil {
-		return *m.F_Int32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Required() int64 {
-	if m != nil && m.F_Int64Required != nil {
-		return *m.F_Int64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Required() uint32 {
-	if m != nil && m.F_Fixed32Required != nil {
-		return *m.F_Fixed32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Required() uint64 {
-	if m != nil && m.F_Fixed64Required != nil {
-		return *m.F_Fixed64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Required() uint32 {
-	if m != nil && m.F_Uint32Required != nil {
-		return *m.F_Uint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Required() uint64 {
-	if m != nil && m.F_Uint64Required != nil {
-		return *m.F_Uint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatRequired() float32 {
-	if m != nil && m.F_FloatRequired != nil {
-		return *m.F_FloatRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleRequired() float64 {
-	if m != nil && m.F_DoubleRequired != nil {
-		return *m.F_DoubleRequired
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringRequired() string {
-	if m != nil && m.F_StringRequired != nil {
-		return *m.F_StringRequired
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesRequired() []byte {
-	if m != nil {
-		return m.F_BytesRequired
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Required() int32 {
-	if m != nil && m.F_Sint32Required != nil {
-		return *m.F_Sint32Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Required() int64 {
-	if m != nil && m.F_Sint64Required != nil {
-		return *m.F_Sint64Required
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolRepeated() []bool {
-	if m != nil {
-		return m.F_BoolRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32Repeated() []int32 {
-	if m != nil {
-		return m.F_Int32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64Repeated() []int64 {
-	if m != nil {
-		return m.F_Int64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Fixed32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Fixed64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32Repeated() []uint32 {
-	if m != nil {
-		return m.F_Uint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64Repeated() []uint64 {
-	if m != nil {
-		return m.F_Uint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeated() []float32 {
-	if m != nil {
-		return m.F_FloatRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeated() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_StringRepeated() []string {
-	if m != nil {
-		return m.F_StringRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BytesRepeated() [][]byte {
-	if m != nil {
-		return m.F_BytesRepeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Repeated() []int32 {
-	if m != nil {
-		return m.F_Sint32Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64Repeated() []int64 {
-	if m != nil {
-		return m.F_Sint64Repeated
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_BoolOptional() bool {
-	if m != nil && m.F_BoolOptional != nil {
-		return *m.F_BoolOptional
-	}
-	return false
-}
-
-func (m *GoTest) GetF_Int32Optional() int32 {
-	if m != nil && m.F_Int32Optional != nil {
-		return *m.F_Int32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Int64Optional() int64 {
-	if m != nil && m.F_Int64Optional != nil {
-		return *m.F_Int64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed32Optional() uint32 {
-	if m != nil && m.F_Fixed32Optional != nil {
-		return *m.F_Fixed32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Fixed64Optional() uint64 {
-	if m != nil && m.F_Fixed64Optional != nil {
-		return *m.F_Fixed64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint32Optional() uint32 {
-	if m != nil && m.F_Uint32Optional != nil {
-		return *m.F_Uint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Uint64Optional() uint64 {
-	if m != nil && m.F_Uint64Optional != nil {
-		return *m.F_Uint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_FloatOptional() float32 {
-	if m != nil && m.F_FloatOptional != nil {
-		return *m.F_FloatOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_DoubleOptional() float64 {
-	if m != nil && m.F_DoubleOptional != nil {
-		return *m.F_DoubleOptional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_StringOptional() string {
-	if m != nil && m.F_StringOptional != nil {
-		return *m.F_StringOptional
-	}
-	return ""
-}
-
-func (m *GoTest) GetF_BytesOptional() []byte {
-	if m != nil {
-		return m.F_BytesOptional
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32Optional() int32 {
-	if m != nil && m.F_Sint32Optional != nil {
-		return *m.F_Sint32Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_Sint64Optional() int64 {
-	if m != nil && m.F_Sint64Optional != nil {
-		return *m.F_Sint64Optional
-	}
-	return 0
-}
-
-func (m *GoTest) GetF_BoolDefaulted() bool {
-	if m != nil && m.F_BoolDefaulted != nil {
-		return *m.F_BoolDefaulted
-	}
-	return Default_GoTest_F_BoolDefaulted
-}
-
-func (m *GoTest) GetF_Int32Defaulted() int32 {
-	if m != nil && m.F_Int32Defaulted != nil {
-		return *m.F_Int32Defaulted
-	}
-	return Default_GoTest_F_Int32Defaulted
-}
-
-func (m *GoTest) GetF_Int64Defaulted() int64 {
-	if m != nil && m.F_Int64Defaulted != nil {
-		return *m.F_Int64Defaulted
-	}
-	return Default_GoTest_F_Int64Defaulted
-}
-
-func (m *GoTest) GetF_Fixed32Defaulted() uint32 {
-	if m != nil && m.F_Fixed32Defaulted != nil {
-		return *m.F_Fixed32Defaulted
-	}
-	return Default_GoTest_F_Fixed32Defaulted
-}
-
-func (m *GoTest) GetF_Fixed64Defaulted() uint64 {
-	if m != nil && m.F_Fixed64Defaulted != nil {
-		return *m.F_Fixed64Defaulted
-	}
-	return Default_GoTest_F_Fixed64Defaulted
-}
-
-func (m *GoTest) GetF_Uint32Defaulted() uint32 {
-	if m != nil && m.F_Uint32Defaulted != nil {
-		return *m.F_Uint32Defaulted
-	}
-	return Default_GoTest_F_Uint32Defaulted
-}
-
-func (m *GoTest) GetF_Uint64Defaulted() uint64 {
-	if m != nil && m.F_Uint64Defaulted != nil {
-		return *m.F_Uint64Defaulted
-	}
-	return Default_GoTest_F_Uint64Defaulted
-}
-
-func (m *GoTest) GetF_FloatDefaulted() float32 {
-	if m != nil && m.F_FloatDefaulted != nil {
-		return *m.F_FloatDefaulted
-	}
-	return Default_GoTest_F_FloatDefaulted
-}
-
-func (m *GoTest) GetF_DoubleDefaulted() float64 {
-	if m != nil && m.F_DoubleDefaulted != nil {
-		return *m.F_DoubleDefaulted
-	}
-	return Default_GoTest_F_DoubleDefaulted
-}
-
-func (m *GoTest) GetF_StringDefaulted() string {
-	if m != nil && m.F_StringDefaulted != nil {
-		return *m.F_StringDefaulted
-	}
-	return Default_GoTest_F_StringDefaulted
-}
-
-func (m *GoTest) GetF_BytesDefaulted() []byte {
-	if m != nil && m.F_BytesDefaulted != nil {
-		return m.F_BytesDefaulted
-	}
-	return append([]byte(nil), Default_GoTest_F_BytesDefaulted...)
-}
-
-func (m *GoTest) GetF_Sint32Defaulted() int32 {
-	if m != nil && m.F_Sint32Defaulted != nil {
-		return *m.F_Sint32Defaulted
-	}
-	return Default_GoTest_F_Sint32Defaulted
-}
-
-func (m *GoTest) GetF_Sint64Defaulted() int64 {
-	if m != nil && m.F_Sint64Defaulted != nil {
-		return *m.F_Sint64Defaulted
-	}
-	return Default_GoTest_F_Sint64Defaulted
-}
-
-func (m *GoTest) GetF_BoolRepeatedPacked() []bool {
-	if m != nil {
-		return m.F_BoolRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Int32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Int64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Int64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Fixed32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Fixed64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Fixed64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint32RepeatedPacked() []uint32 {
-	if m != nil {
-		return m.F_Uint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Uint64RepeatedPacked() []uint64 {
-	if m != nil {
-		return m.F_Uint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_FloatRepeatedPacked() []float32 {
-	if m != nil {
-		return m.F_FloatRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_DoubleRepeatedPacked() []float64 {
-	if m != nil {
-		return m.F_DoubleRepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint32RepeatedPacked() []int32 {
-	if m != nil {
-		return m.F_Sint32RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetF_Sint64RepeatedPacked() []int64 {
-	if m != nil {
-		return m.F_Sint64RepeatedPacked
-	}
-	return nil
-}
-
-func (m *GoTest) GetRequiredgroup() *GoTest_RequiredGroup {
-	if m != nil {
-		return m.Requiredgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetRepeatedgroup() []*GoTest_RepeatedGroup {
-	if m != nil {
-		return m.Repeatedgroup
-	}
-	return nil
-}
-
-func (m *GoTest) GetOptionalgroup() *GoTest_OptionalGroup {
-	if m != nil {
-		return m.Optionalgroup
-	}
-	return nil
-}
-
-// Required, repeated, and optional groups.
-type GoTest_RequiredGroup struct {
-	RequiredField    *string `protobuf:"bytes,71,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RequiredGroup) Reset()                    { *m = GoTest_RequiredGroup{} }
-func (m *GoTest_RequiredGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_RequiredGroup) ProtoMessage()               {}
-func (*GoTest_RequiredGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *GoTest_RequiredGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_RepeatedGroup struct {
-	RequiredField    *string `protobuf:"bytes,81,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_RepeatedGroup) Reset()                    { *m = GoTest_RepeatedGroup{} }
-func (m *GoTest_RepeatedGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_RepeatedGroup) ProtoMessage()               {}
-func (*GoTest_RepeatedGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 1} }
-
-func (m *GoTest_RepeatedGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-type GoTest_OptionalGroup struct {
-	RequiredField    *string `protobuf:"bytes,91,req,name=RequiredField" json:"RequiredField,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoTest_OptionalGroup) Reset()                    { *m = GoTest_OptionalGroup{} }
-func (m *GoTest_OptionalGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoTest_OptionalGroup) ProtoMessage()               {}
-func (*GoTest_OptionalGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 2} }
-
-func (m *GoTest_OptionalGroup) GetRequiredField() string {
-	if m != nil && m.RequiredField != nil {
-		return *m.RequiredField
-	}
-	return ""
-}
-
-// For testing a group containing a required field.
-type GoTestRequiredGroupField struct {
-	Group            *GoTestRequiredGroupField_Group `protobuf:"group,1,req,name=Group,json=group" json:"group,omitempty"`
-	XXX_unrecognized []byte                          `json:"-"`
-}
-
-func (m *GoTestRequiredGroupField) Reset()                    { *m = GoTestRequiredGroupField{} }
-func (m *GoTestRequiredGroupField) String() string            { return proto.CompactTextString(m) }
-func (*GoTestRequiredGroupField) ProtoMessage()               {}
-func (*GoTestRequiredGroupField) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-func (m *GoTestRequiredGroupField) GetGroup() *GoTestRequiredGroupField_Group {
-	if m != nil {
-		return m.Group
-	}
-	return nil
-}
-
-type GoTestRequiredGroupField_Group struct {
-	Field            *int32 `protobuf:"varint,2,req,name=Field" json:"Field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GoTestRequiredGroupField_Group) Reset()         { *m = GoTestRequiredGroupField_Group{} }
-func (m *GoTestRequiredGroupField_Group) String() string { return proto.CompactTextString(m) }
-func (*GoTestRequiredGroupField_Group) ProtoMessage()    {}
-func (*GoTestRequiredGroupField_Group) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{3, 0}
-}
-
-func (m *GoTestRequiredGroupField_Group) GetField() int32 {
-	if m != nil && m.Field != nil {
-		return *m.Field
-	}
-	return 0
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-type GoSkipTest struct {
-	SkipInt32        *int32                `protobuf:"varint,11,req,name=skip_int32,json=skipInt32" json:"skip_int32,omitempty"`
-	SkipFixed32      *uint32               `protobuf:"fixed32,12,req,name=skip_fixed32,json=skipFixed32" json:"skip_fixed32,omitempty"`
-	SkipFixed64      *uint64               `protobuf:"fixed64,13,req,name=skip_fixed64,json=skipFixed64" json:"skip_fixed64,omitempty"`
-	SkipString       *string               `protobuf:"bytes,14,req,name=skip_string,json=skipString" json:"skip_string,omitempty"`
-	Skipgroup        *GoSkipTest_SkipGroup `protobuf:"group,15,req,name=SkipGroup,json=skipgroup" json:"skipgroup,omitempty"`
-	XXX_unrecognized []byte                `json:"-"`
-}
-
-func (m *GoSkipTest) Reset()                    { *m = GoSkipTest{} }
-func (m *GoSkipTest) String() string            { return proto.CompactTextString(m) }
-func (*GoSkipTest) ProtoMessage()               {}
-func (*GoSkipTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *GoSkipTest) GetSkipInt32() int32 {
-	if m != nil && m.SkipInt32 != nil {
-		return *m.SkipInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed32() uint32 {
-	if m != nil && m.SkipFixed32 != nil {
-		return *m.SkipFixed32
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipFixed64() uint64 {
-	if m != nil && m.SkipFixed64 != nil {
-		return *m.SkipFixed64
-	}
-	return 0
-}
-
-func (m *GoSkipTest) GetSkipString() string {
-	if m != nil && m.SkipString != nil {
-		return *m.SkipString
-	}
-	return ""
-}
-
-func (m *GoSkipTest) GetSkipgroup() *GoSkipTest_SkipGroup {
-	if m != nil {
-		return m.Skipgroup
-	}
-	return nil
-}
-
-type GoSkipTest_SkipGroup struct {
-	GroupInt32       *int32  `protobuf:"varint,16,req,name=group_int32,json=groupInt32" json:"group_int32,omitempty"`
-	GroupString      *string `protobuf:"bytes,17,req,name=group_string,json=groupString" json:"group_string,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *GoSkipTest_SkipGroup) Reset()                    { *m = GoSkipTest_SkipGroup{} }
-func (m *GoSkipTest_SkipGroup) String() string            { return proto.CompactTextString(m) }
-func (*GoSkipTest_SkipGroup) ProtoMessage()               {}
-func (*GoSkipTest_SkipGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
-
-func (m *GoSkipTest_SkipGroup) GetGroupInt32() int32 {
-	if m != nil && m.GroupInt32 != nil {
-		return *m.GroupInt32
-	}
-	return 0
-}
-
-func (m *GoSkipTest_SkipGroup) GetGroupString() string {
-	if m != nil && m.GroupString != nil {
-		return *m.GroupString
-	}
-	return ""
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-type NonPackedTest struct {
-	A                []int32 `protobuf:"varint,1,rep,name=a" json:"a,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NonPackedTest) Reset()                    { *m = NonPackedTest{} }
-func (m *NonPackedTest) String() string            { return proto.CompactTextString(m) }
-func (*NonPackedTest) ProtoMessage()               {}
-func (*NonPackedTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *NonPackedTest) GetA() []int32 {
-	if m != nil {
-		return m.A
-	}
-	return nil
-}
-
-type PackedTest struct {
-	B                []int32 `protobuf:"varint,1,rep,packed,name=b" json:"b,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *PackedTest) Reset()                    { *m = PackedTest{} }
-func (m *PackedTest) String() string            { return proto.CompactTextString(m) }
-func (*PackedTest) ProtoMessage()               {}
-func (*PackedTest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *PackedTest) GetB() []int32 {
-	if m != nil {
-		return m.B
-	}
-	return nil
-}
-
-type MaxTag struct {
-	// Maximum possible tag number.
-	LastField        *string `protobuf:"bytes,536870911,opt,name=last_field,json=lastField" json:"last_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MaxTag) Reset()                    { *m = MaxTag{} }
-func (m *MaxTag) String() string            { return proto.CompactTextString(m) }
-func (*MaxTag) ProtoMessage()               {}
-func (*MaxTag) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *MaxTag) GetLastField() string {
-	if m != nil && m.LastField != nil {
-		return *m.LastField
-	}
-	return ""
-}
-
-type OldMessage struct {
-	Nested           *OldMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	Num              *int32             `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *OldMessage) Reset()                    { *m = OldMessage{} }
-func (m *OldMessage) String() string            { return proto.CompactTextString(m) }
-func (*OldMessage) ProtoMessage()               {}
-func (*OldMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *OldMessage) GetNested() *OldMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *OldMessage) GetNum() int32 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type OldMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *OldMessage_Nested) Reset()                    { *m = OldMessage_Nested{} }
-func (m *OldMessage_Nested) String() string            { return proto.CompactTextString(m) }
-func (*OldMessage_Nested) ProtoMessage()               {}
-func (*OldMessage_Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8, 0} }
-
-func (m *OldMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-type NewMessage struct {
-	Nested *NewMessage_Nested `protobuf:"bytes,1,opt,name=nested" json:"nested,omitempty"`
-	// This is an int32 in OldMessage.
-	Num              *int64 `protobuf:"varint,2,opt,name=num" json:"num,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *NewMessage) Reset()                    { *m = NewMessage{} }
-func (m *NewMessage) String() string            { return proto.CompactTextString(m) }
-func (*NewMessage) ProtoMessage()               {}
-func (*NewMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-func (m *NewMessage) GetNested() *NewMessage_Nested {
-	if m != nil {
-		return m.Nested
-	}
-	return nil
-}
-
-func (m *NewMessage) GetNum() int64 {
-	if m != nil && m.Num != nil {
-		return *m.Num
-	}
-	return 0
-}
-
-type NewMessage_Nested struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	FoodGroup        *string `protobuf:"bytes,2,opt,name=food_group,json=foodGroup" json:"food_group,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *NewMessage_Nested) Reset()                    { *m = NewMessage_Nested{} }
-func (m *NewMessage_Nested) String() string            { return proto.CompactTextString(m) }
-func (*NewMessage_Nested) ProtoMessage()               {}
-func (*NewMessage_Nested) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9, 0} }
-
-func (m *NewMessage_Nested) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *NewMessage_Nested) GetFoodGroup() string {
-	if m != nil && m.FoodGroup != nil {
-		return *m.FoodGroup
-	}
-	return ""
-}
-
-type InnerMessage struct {
-	Host             *string `protobuf:"bytes,1,req,name=host" json:"host,omitempty"`
-	Port             *int32  `protobuf:"varint,2,opt,name=port,def=4000" json:"port,omitempty"`
-	Connected        *bool   `protobuf:"varint,3,opt,name=connected" json:"connected,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *InnerMessage) Reset()                    { *m = InnerMessage{} }
-func (m *InnerMessage) String() string            { return proto.CompactTextString(m) }
-func (*InnerMessage) ProtoMessage()               {}
-func (*InnerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-const Default_InnerMessage_Port int32 = 4000
-
-func (m *InnerMessage) GetHost() string {
-	if m != nil && m.Host != nil {
-		return *m.Host
-	}
-	return ""
-}
-
-func (m *InnerMessage) GetPort() int32 {
-	if m != nil && m.Port != nil {
-		return *m.Port
-	}
-	return Default_InnerMessage_Port
-}
-
-func (m *InnerMessage) GetConnected() bool {
-	if m != nil && m.Connected != nil {
-		return *m.Connected
-	}
-	return false
-}
-
-type OtherMessage struct {
-	Key                          *int64        `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	Value                        []byte        `protobuf:"bytes,2,opt,name=value" json:"value,omitempty"`
-	Weight                       *float32      `protobuf:"fixed32,3,opt,name=weight" json:"weight,omitempty"`
-	Inner                        *InnerMessage `protobuf:"bytes,4,opt,name=inner" json:"inner,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OtherMessage) Reset()                    { *m = OtherMessage{} }
-func (m *OtherMessage) String() string            { return proto.CompactTextString(m) }
-func (*OtherMessage) ProtoMessage()               {}
-func (*OtherMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-var extRange_OtherMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*OtherMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OtherMessage
-}
-
-func (m *OtherMessage) GetKey() int64 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *OtherMessage) GetWeight() float32 {
-	if m != nil && m.Weight != nil {
-		return *m.Weight
-	}
-	return 0
-}
-
-func (m *OtherMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-type RequiredInnerMessage struct {
-	LeoFinallyWonAnOscar *InnerMessage `protobuf:"bytes,1,req,name=leo_finally_won_an_oscar,json=leoFinallyWonAnOscar" json:"leo_finally_won_an_oscar,omitempty"`
-	XXX_unrecognized     []byte        `json:"-"`
-}
-
-func (m *RequiredInnerMessage) Reset()                    { *m = RequiredInnerMessage{} }
-func (m *RequiredInnerMessage) String() string            { return proto.CompactTextString(m) }
-func (*RequiredInnerMessage) ProtoMessage()               {}
-func (*RequiredInnerMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-func (m *RequiredInnerMessage) GetLeoFinallyWonAnOscar() *InnerMessage {
-	if m != nil {
-		return m.LeoFinallyWonAnOscar
-	}
-	return nil
-}
-
-type MyMessage struct {
-	Count          *int32                `protobuf:"varint,1,req,name=count" json:"count,omitempty"`
-	Name           *string               `protobuf:"bytes,2,opt,name=name" json:"name,omitempty"`
-	Quote          *string               `protobuf:"bytes,3,opt,name=quote" json:"quote,omitempty"`
-	Pet            []string              `protobuf:"bytes,4,rep,name=pet" json:"pet,omitempty"`
-	Inner          *InnerMessage         `protobuf:"bytes,5,opt,name=inner" json:"inner,omitempty"`
-	Others         []*OtherMessage       `protobuf:"bytes,6,rep,name=others" json:"others,omitempty"`
-	WeMustGoDeeper *RequiredInnerMessage `protobuf:"bytes,13,opt,name=we_must_go_deeper,json=weMustGoDeeper" json:"we_must_go_deeper,omitempty"`
-	RepInner       []*InnerMessage       `protobuf:"bytes,12,rep,name=rep_inner,json=repInner" json:"rep_inner,omitempty"`
-	Bikeshed       *MyMessage_Color      `protobuf:"varint,7,opt,name=bikeshed,enum=testdata.MyMessage_Color" json:"bikeshed,omitempty"`
-	Somegroup      *MyMessage_SomeGroup  `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
-	// This field becomes [][]byte in the generated code.
-	RepBytes                     [][]byte `protobuf:"bytes,10,rep,name=rep_bytes,json=repBytes" json:"rep_bytes,omitempty"`
-	Bigfloat                     *float64 `protobuf:"fixed64,11,opt,name=bigfloat" json:"bigfloat,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MyMessage) Reset()                    { *m = MyMessage{} }
-func (m *MyMessage) String() string            { return proto.CompactTextString(m) }
-func (*MyMessage) ProtoMessage()               {}
-func (*MyMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-var extRange_MyMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*MyMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessage
-}
-
-func (m *MyMessage) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-func (m *MyMessage) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MyMessage) GetQuote() string {
-	if m != nil && m.Quote != nil {
-		return *m.Quote
-	}
-	return ""
-}
-
-func (m *MyMessage) GetPet() []string {
-	if m != nil {
-		return m.Pet
-	}
-	return nil
-}
-
-func (m *MyMessage) GetInner() *InnerMessage {
-	if m != nil {
-		return m.Inner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetOthers() []*OtherMessage {
-	if m != nil {
-		return m.Others
-	}
-	return nil
-}
-
-func (m *MyMessage) GetWeMustGoDeeper() *RequiredInnerMessage {
-	if m != nil {
-		return m.WeMustGoDeeper
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepInner() []*InnerMessage {
-	if m != nil {
-		return m.RepInner
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBikeshed() MyMessage_Color {
-	if m != nil && m.Bikeshed != nil {
-		return *m.Bikeshed
-	}
-	return MyMessage_RED
-}
-
-func (m *MyMessage) GetSomegroup() *MyMessage_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *MyMessage) GetRepBytes() [][]byte {
-	if m != nil {
-		return m.RepBytes
-	}
-	return nil
-}
-
-func (m *MyMessage) GetBigfloat() float64 {
-	if m != nil && m.Bigfloat != nil {
-		return *m.Bigfloat
-	}
-	return 0
-}
-
-type MyMessage_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MyMessage_SomeGroup) Reset()                    { *m = MyMessage_SomeGroup{} }
-func (m *MyMessage_SomeGroup) String() string            { return proto.CompactTextString(m) }
-func (*MyMessage_SomeGroup) ProtoMessage()               {}
-func (*MyMessage_SomeGroup) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13, 0} }
-
-func (m *MyMessage_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Ext struct {
-	Data             *string `protobuf:"bytes,1,opt,name=data" json:"data,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Ext) Reset()                    { *m = Ext{} }
-func (m *Ext) String() string            { return proto.CompactTextString(m) }
-func (*Ext) ProtoMessage()               {}
-func (*Ext) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-func (m *Ext) GetData() string {
-	if m != nil && m.Data != nil {
-		return *m.Data
-	}
-	return ""
-}
-
-var E_Ext_More = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*Ext)(nil),
-	Field:         103,
-	Name:          "testdata.Ext.more",
-	Tag:           "bytes,103,opt,name=more",
-	Filename:      "test.proto",
-}
-
-var E_Ext_Text = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         104,
-	Name:          "testdata.Ext.text",
-	Tag:           "bytes,104,opt,name=text",
-	Filename:      "test.proto",
-}
-
-var E_Ext_Number = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         105,
-	Name:          "testdata.Ext.number",
-	Tag:           "varint,105,opt,name=number",
-	Filename:      "test.proto",
-}
-
-type ComplexExtension struct {
-	First            *int32  `protobuf:"varint,1,opt,name=first" json:"first,omitempty"`
-	Second           *int32  `protobuf:"varint,2,opt,name=second" json:"second,omitempty"`
-	Third            []int32 `protobuf:"varint,3,rep,name=third" json:"third,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *ComplexExtension) Reset()                    { *m = ComplexExtension{} }
-func (m *ComplexExtension) String() string            { return proto.CompactTextString(m) }
-func (*ComplexExtension) ProtoMessage()               {}
-func (*ComplexExtension) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-func (m *ComplexExtension) GetFirst() int32 {
-	if m != nil && m.First != nil {
-		return *m.First
-	}
-	return 0
-}
-
-func (m *ComplexExtension) GetSecond() int32 {
-	if m != nil && m.Second != nil {
-		return *m.Second
-	}
-	return 0
-}
-
-func (m *ComplexExtension) GetThird() []int32 {
-	if m != nil {
-		return m.Third
-	}
-	return nil
-}
-
-type DefaultsMessage struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *DefaultsMessage) Reset()                    { *m = DefaultsMessage{} }
-func (m *DefaultsMessage) String() string            { return proto.CompactTextString(m) }
-func (*DefaultsMessage) ProtoMessage()               {}
-func (*DefaultsMessage) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-var extRange_DefaultsMessage = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*DefaultsMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_DefaultsMessage
-}
-
-type MyMessageSet struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MyMessageSet) Reset()                    { *m = MyMessageSet{} }
-func (m *MyMessageSet) String() string            { return proto.CompactTextString(m) }
-func (*MyMessageSet) ProtoMessage()               {}
-func (*MyMessageSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-func (m *MyMessageSet) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
-}
-func (m *MyMessageSet) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
-}
-
-// ensure MyMessageSet satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*MyMessageSet)(nil)
-var _ proto.Unmarshaler = (*MyMessageSet)(nil)
-
-var extRange_MyMessageSet = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*MyMessageSet) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MyMessageSet
-}
-
-type Empty struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-type MessageList struct {
-	Message          []*MessageList_Message `protobuf:"group,1,rep,name=Message,json=message" json:"message,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *MessageList) Reset()                    { *m = MessageList{} }
-func (m *MessageList) String() string            { return proto.CompactTextString(m) }
-func (*MessageList) ProtoMessage()               {}
-func (*MessageList) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
-
-func (m *MessageList) GetMessage() []*MessageList_Message {
-	if m != nil {
-		return m.Message
-	}
-	return nil
-}
-
-type MessageList_Message struct {
-	Name             *string `protobuf:"bytes,2,req,name=name" json:"name,omitempty"`
-	Count            *int32  `protobuf:"varint,3,req,name=count" json:"count,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *MessageList_Message) Reset()                    { *m = MessageList_Message{} }
-func (m *MessageList_Message) String() string            { return proto.CompactTextString(m) }
-func (*MessageList_Message) ProtoMessage()               {}
-func (*MessageList_Message) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19, 0} }
-
-func (m *MessageList_Message) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MessageList_Message) GetCount() int32 {
-	if m != nil && m.Count != nil {
-		return *m.Count
-	}
-	return 0
-}
-
-type Strings struct {
-	StringField      *string `protobuf:"bytes,1,opt,name=string_field,json=stringField" json:"string_field,omitempty"`
-	BytesField       []byte  `protobuf:"bytes,2,opt,name=bytes_field,json=bytesField" json:"bytes_field,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Strings) Reset()                    { *m = Strings{} }
-func (m *Strings) String() string            { return proto.CompactTextString(m) }
-func (*Strings) ProtoMessage()               {}
-func (*Strings) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
-
-func (m *Strings) GetStringField() string {
-	if m != nil && m.StringField != nil {
-		return *m.StringField
-	}
-	return ""
-}
-
-func (m *Strings) GetBytesField() []byte {
-	if m != nil {
-		return m.BytesField
-	}
-	return nil
-}
-
-type Defaults struct {
-	// Default-valued fields of all basic types.
-	// Same as GoTest, but copied here to make testing easier.
-	F_Bool    *bool           `protobuf:"varint,1,opt,name=F_Bool,json=FBool,def=1" json:"F_Bool,omitempty"`
-	F_Int32   *int32          `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,def=32" json:"F_Int32,omitempty"`
-	F_Int64   *int64          `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,def=64" json:"F_Int64,omitempty"`
-	F_Fixed32 *uint32         `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,def=320" json:"F_Fixed32,omitempty"`
-	F_Fixed64 *uint64         `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,def=640" json:"F_Fixed64,omitempty"`
-	F_Uint32  *uint32         `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,def=3200" json:"F_Uint32,omitempty"`
-	F_Uint64  *uint64         `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,def=6400" json:"F_Uint64,omitempty"`
-	F_Float   *float32        `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,def=314159" json:"F_Float,omitempty"`
-	F_Double  *float64        `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,def=271828" json:"F_Double,omitempty"`
-	F_String  *string         `protobuf:"bytes,10,opt,name=F_String,json=FString,def=hello, \"world!\"\n" json:"F_String,omitempty"`
-	F_Bytes   []byte          `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,def=Bignose" json:"F_Bytes,omitempty"`
-	F_Sint32  *int32          `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,def=-32" json:"F_Sint32,omitempty"`
-	F_Sint64  *int64          `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,def=-64" json:"F_Sint64,omitempty"`
-	F_Enum    *Defaults_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=testdata.Defaults_Color,def=1" json:"F_Enum,omitempty"`
-	// More fields with crazy defaults.
-	F_Pinf *float32 `protobuf:"fixed32,15,opt,name=F_Pinf,json=FPinf,def=inf" json:"F_Pinf,omitempty"`
-	F_Ninf *float32 `protobuf:"fixed32,16,opt,name=F_Ninf,json=FNinf,def=-inf" json:"F_Ninf,omitempty"`
-	F_Nan  *float32 `protobuf:"fixed32,17,opt,name=F_Nan,json=FNan,def=nan" json:"F_Nan,omitempty"`
-	// Sub-message.
-	Sub *SubDefaults `protobuf:"bytes,18,opt,name=sub" json:"sub,omitempty"`
-	// Redundant but explicit defaults.
-	StrZero          *string `protobuf:"bytes,19,opt,name=str_zero,json=strZero,def=" json:"str_zero,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Defaults) Reset()                    { *m = Defaults{} }
-func (m *Defaults) String() string            { return proto.CompactTextString(m) }
-func (*Defaults) ProtoMessage()               {}
-func (*Defaults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{21} }
-
-const Default_Defaults_F_Bool bool = true
-const Default_Defaults_F_Int32 int32 = 32
-const Default_Defaults_F_Int64 int64 = 64
-const Default_Defaults_F_Fixed32 uint32 = 320
-const Default_Defaults_F_Fixed64 uint64 = 640
-const Default_Defaults_F_Uint32 uint32 = 3200
-const Default_Defaults_F_Uint64 uint64 = 6400
-const Default_Defaults_F_Float float32 = 314159
-const Default_Defaults_F_Double float64 = 271828
-const Default_Defaults_F_String string = "hello, \"world!\"\n"
-
-var Default_Defaults_F_Bytes []byte = []byte("Bignose")
-
-const Default_Defaults_F_Sint32 int32 = -32
-const Default_Defaults_F_Sint64 int64 = -64
-const Default_Defaults_F_Enum Defaults_Color = Defaults_GREEN
-
-var Default_Defaults_F_Pinf float32 = float32(math.Inf(1))
-var Default_Defaults_F_Ninf float32 = float32(math.Inf(-1))
-var Default_Defaults_F_Nan float32 = float32(math.NaN())
-
-func (m *Defaults) GetF_Bool() bool {
-	if m != nil && m.F_Bool != nil {
-		return *m.F_Bool
-	}
-	return Default_Defaults_F_Bool
-}
-
-func (m *Defaults) GetF_Int32() int32 {
-	if m != nil && m.F_Int32 != nil {
-		return *m.F_Int32
-	}
-	return Default_Defaults_F_Int32
-}
-
-func (m *Defaults) GetF_Int64() int64 {
-	if m != nil && m.F_Int64 != nil {
-		return *m.F_Int64
-	}
-	return Default_Defaults_F_Int64
-}
-
-func (m *Defaults) GetF_Fixed32() uint32 {
-	if m != nil && m.F_Fixed32 != nil {
-		return *m.F_Fixed32
-	}
-	return Default_Defaults_F_Fixed32
-}
-
-func (m *Defaults) GetF_Fixed64() uint64 {
-	if m != nil && m.F_Fixed64 != nil {
-		return *m.F_Fixed64
-	}
-	return Default_Defaults_F_Fixed64
-}
-
-func (m *Defaults) GetF_Uint32() uint32 {
-	if m != nil && m.F_Uint32 != nil {
-		return *m.F_Uint32
-	}
-	return Default_Defaults_F_Uint32
-}
-
-func (m *Defaults) GetF_Uint64() uint64 {
-	if m != nil && m.F_Uint64 != nil {
-		return *m.F_Uint64
-	}
-	return Default_Defaults_F_Uint64
-}
-
-func (m *Defaults) GetF_Float() float32 {
-	if m != nil && m.F_Float != nil {
-		return *m.F_Float
-	}
-	return Default_Defaults_F_Float
-}
-
-func (m *Defaults) GetF_Double() float64 {
-	if m != nil && m.F_Double != nil {
-		return *m.F_Double
-	}
-	return Default_Defaults_F_Double
-}
-
-func (m *Defaults) GetF_String() string {
-	if m != nil && m.F_String != nil {
-		return *m.F_String
-	}
-	return Default_Defaults_F_String
-}
-
-func (m *Defaults) GetF_Bytes() []byte {
-	if m != nil && m.F_Bytes != nil {
-		return m.F_Bytes
-	}
-	return append([]byte(nil), Default_Defaults_F_Bytes...)
-}
-
-func (m *Defaults) GetF_Sint32() int32 {
-	if m != nil && m.F_Sint32 != nil {
-		return *m.F_Sint32
-	}
-	return Default_Defaults_F_Sint32
-}
-
-func (m *Defaults) GetF_Sint64() int64 {
-	if m != nil && m.F_Sint64 != nil {
-		return *m.F_Sint64
-	}
-	return Default_Defaults_F_Sint64
-}
-
-func (m *Defaults) GetF_Enum() Defaults_Color {
-	if m != nil && m.F_Enum != nil {
-		return *m.F_Enum
-	}
-	return Default_Defaults_F_Enum
-}
-
-func (m *Defaults) GetF_Pinf() float32 {
-	if m != nil && m.F_Pinf != nil {
-		return *m.F_Pinf
-	}
-	return Default_Defaults_F_Pinf
-}
-
-func (m *Defaults) GetF_Ninf() float32 {
-	if m != nil && m.F_Ninf != nil {
-		return *m.F_Ninf
-	}
-	return Default_Defaults_F_Ninf
-}
-
-func (m *Defaults) GetF_Nan() float32 {
-	if m != nil && m.F_Nan != nil {
-		return *m.F_Nan
-	}
-	return Default_Defaults_F_Nan
-}
-
-func (m *Defaults) GetSub() *SubDefaults {
-	if m != nil {
-		return m.Sub
-	}
-	return nil
-}
-
-func (m *Defaults) GetStrZero() string {
-	if m != nil && m.StrZero != nil {
-		return *m.StrZero
-	}
-	return ""
-}
-
-type SubDefaults struct {
-	N                *int64 `protobuf:"varint,1,opt,name=n,def=7" json:"n,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *SubDefaults) Reset()                    { *m = SubDefaults{} }
-func (m *SubDefaults) String() string            { return proto.CompactTextString(m) }
-func (*SubDefaults) ProtoMessage()               {}
-func (*SubDefaults) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{22} }
-
-const Default_SubDefaults_N int64 = 7
-
-func (m *SubDefaults) GetN() int64 {
-	if m != nil && m.N != nil {
-		return *m.N
-	}
-	return Default_SubDefaults_N
-}
-
-type RepeatedEnum struct {
-	Color            []RepeatedEnum_Color `protobuf:"varint,1,rep,name=color,enum=testdata.RepeatedEnum_Color" json:"color,omitempty"`
-	XXX_unrecognized []byte               `json:"-"`
-}
-
-func (m *RepeatedEnum) Reset()                    { *m = RepeatedEnum{} }
-func (m *RepeatedEnum) String() string            { return proto.CompactTextString(m) }
-func (*RepeatedEnum) ProtoMessage()               {}
-func (*RepeatedEnum) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{23} }
-
-func (m *RepeatedEnum) GetColor() []RepeatedEnum_Color {
-	if m != nil {
-		return m.Color
-	}
-	return nil
-}
-
-type MoreRepeated struct {
-	Bools            []bool   `protobuf:"varint,1,rep,name=bools" json:"bools,omitempty"`
-	BoolsPacked      []bool   `protobuf:"varint,2,rep,packed,name=bools_packed,json=boolsPacked" json:"bools_packed,omitempty"`
-	Ints             []int32  `protobuf:"varint,3,rep,name=ints" json:"ints,omitempty"`
-	IntsPacked       []int32  `protobuf:"varint,4,rep,packed,name=ints_packed,json=intsPacked" json:"ints_packed,omitempty"`
-	Int64SPacked     []int64  `protobuf:"varint,7,rep,packed,name=int64s_packed,json=int64sPacked" json:"int64s_packed,omitempty"`
-	Strings          []string `protobuf:"bytes,5,rep,name=strings" json:"strings,omitempty"`
-	Fixeds           []uint32 `protobuf:"fixed32,6,rep,name=fixeds" json:"fixeds,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *MoreRepeated) Reset()                    { *m = MoreRepeated{} }
-func (m *MoreRepeated) String() string            { return proto.CompactTextString(m) }
-func (*MoreRepeated) ProtoMessage()               {}
-func (*MoreRepeated) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{24} }
-
-func (m *MoreRepeated) GetBools() []bool {
-	if m != nil {
-		return m.Bools
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetBoolsPacked() []bool {
-	if m != nil {
-		return m.BoolsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInts() []int32 {
-	if m != nil {
-		return m.Ints
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetIntsPacked() []int32 {
-	if m != nil {
-		return m.IntsPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetInt64SPacked() []int64 {
-	if m != nil {
-		return m.Int64SPacked
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetStrings() []string {
-	if m != nil {
-		return m.Strings
-	}
-	return nil
-}
-
-func (m *MoreRepeated) GetFixeds() []uint32 {
-	if m != nil {
-		return m.Fixeds
-	}
-	return nil
-}
-
-type GroupOld struct {
-	G                *GroupOld_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupOld) Reset()                    { *m = GroupOld{} }
-func (m *GroupOld) String() string            { return proto.CompactTextString(m) }
-func (*GroupOld) ProtoMessage()               {}
-func (*GroupOld) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25} }
-
-func (m *GroupOld) GetG() *GroupOld_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupOld_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupOld_G) Reset()                    { *m = GroupOld_G{} }
-func (m *GroupOld_G) String() string            { return proto.CompactTextString(m) }
-func (*GroupOld_G) ProtoMessage()               {}
-func (*GroupOld_G) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{25, 0} }
-
-func (m *GroupOld_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type GroupNew struct {
-	G                *GroupNew_G `protobuf:"group,101,opt,name=G,json=g" json:"g,omitempty"`
-	XXX_unrecognized []byte      `json:"-"`
-}
-
-func (m *GroupNew) Reset()                    { *m = GroupNew{} }
-func (m *GroupNew) String() string            { return proto.CompactTextString(m) }
-func (*GroupNew) ProtoMessage()               {}
-func (*GroupNew) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26} }
-
-func (m *GroupNew) GetG() *GroupNew_G {
-	if m != nil {
-		return m.G
-	}
-	return nil
-}
-
-type GroupNew_G struct {
-	X                *int32 `protobuf:"varint,2,opt,name=x" json:"x,omitempty"`
-	Y                *int32 `protobuf:"varint,3,opt,name=y" json:"y,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GroupNew_G) Reset()                    { *m = GroupNew_G{} }
-func (m *GroupNew_G) String() string            { return proto.CompactTextString(m) }
-func (*GroupNew_G) ProtoMessage()               {}
-func (*GroupNew_G) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{26, 0} }
-
-func (m *GroupNew_G) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-func (m *GroupNew_G) GetY() int32 {
-	if m != nil && m.Y != nil {
-		return *m.Y
-	}
-	return 0
-}
-
-type FloatingPoint struct {
-	F                *float64 `protobuf:"fixed64,1,req,name=f" json:"f,omitempty"`
-	Exact            *bool    `protobuf:"varint,2,opt,name=exact" json:"exact,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *FloatingPoint) Reset()                    { *m = FloatingPoint{} }
-func (m *FloatingPoint) String() string            { return proto.CompactTextString(m) }
-func (*FloatingPoint) ProtoMessage()               {}
-func (*FloatingPoint) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{27} }
-
-func (m *FloatingPoint) GetF() float64 {
-	if m != nil && m.F != nil {
-		return *m.F
-	}
-	return 0
-}
-
-func (m *FloatingPoint) GetExact() bool {
-	if m != nil && m.Exact != nil {
-		return *m.Exact
-	}
-	return false
-}
-
-type MessageWithMap struct {
-	NameMapping      map[int32]string         `protobuf:"bytes,1,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	MsgMapping       map[int64]*FloatingPoint `protobuf:"bytes,2,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	ByteMapping      map[bool][]byte          `protobuf:"bytes,3,rep,name=byte_mapping,json=byteMapping" json:"byte_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	StrToStr         map[string]string        `protobuf:"bytes,4,rep,name=str_to_str,json=strToStr" json:"str_to_str,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *MessageWithMap) Reset()                    { *m = MessageWithMap{} }
-func (m *MessageWithMap) String() string            { return proto.CompactTextString(m) }
-func (*MessageWithMap) ProtoMessage()               {}
-func (*MessageWithMap) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{28} }
-
-func (m *MessageWithMap) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetMsgMapping() map[int64]*FloatingPoint {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetByteMapping() map[bool][]byte {
-	if m != nil {
-		return m.ByteMapping
-	}
-	return nil
-}
-
-func (m *MessageWithMap) GetStrToStr() map[string]string {
-	if m != nil {
-		return m.StrToStr
-	}
-	return nil
-}
-
-type Oneof struct {
-	// Types that are valid to be assigned to Union:
-	//	*Oneof_F_Bool
-	//	*Oneof_F_Int32
-	//	*Oneof_F_Int64
-	//	*Oneof_F_Fixed32
-	//	*Oneof_F_Fixed64
-	//	*Oneof_F_Uint32
-	//	*Oneof_F_Uint64
-	//	*Oneof_F_Float
-	//	*Oneof_F_Double
-	//	*Oneof_F_String
-	//	*Oneof_F_Bytes
-	//	*Oneof_F_Sint32
-	//	*Oneof_F_Sint64
-	//	*Oneof_F_Enum
-	//	*Oneof_F_Message
-	//	*Oneof_FGroup
-	//	*Oneof_F_Largest_Tag
-	Union isOneof_Union `protobuf_oneof:"union"`
-	// Types that are valid to be assigned to Tormato:
-	//	*Oneof_Value
-	Tormato          isOneof_Tormato `protobuf_oneof:"tormato"`
-	XXX_unrecognized []byte          `json:"-"`
-}
-
-func (m *Oneof) Reset()                    { *m = Oneof{} }
-func (m *Oneof) String() string            { return proto.CompactTextString(m) }
-func (*Oneof) ProtoMessage()               {}
-func (*Oneof) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29} }
-
-type isOneof_Union interface {
-	isOneof_Union()
-}
-type isOneof_Tormato interface {
-	isOneof_Tormato()
-}
-
-type Oneof_F_Bool struct {
-	F_Bool bool `protobuf:"varint,1,opt,name=F_Bool,json=FBool,oneof"`
-}
-type Oneof_F_Int32 struct {
-	F_Int32 int32 `protobuf:"varint,2,opt,name=F_Int32,json=FInt32,oneof"`
-}
-type Oneof_F_Int64 struct {
-	F_Int64 int64 `protobuf:"varint,3,opt,name=F_Int64,json=FInt64,oneof"`
-}
-type Oneof_F_Fixed32 struct {
-	F_Fixed32 uint32 `protobuf:"fixed32,4,opt,name=F_Fixed32,json=FFixed32,oneof"`
-}
-type Oneof_F_Fixed64 struct {
-	F_Fixed64 uint64 `protobuf:"fixed64,5,opt,name=F_Fixed64,json=FFixed64,oneof"`
-}
-type Oneof_F_Uint32 struct {
-	F_Uint32 uint32 `protobuf:"varint,6,opt,name=F_Uint32,json=FUint32,oneof"`
-}
-type Oneof_F_Uint64 struct {
-	F_Uint64 uint64 `protobuf:"varint,7,opt,name=F_Uint64,json=FUint64,oneof"`
-}
-type Oneof_F_Float struct {
-	F_Float float32 `protobuf:"fixed32,8,opt,name=F_Float,json=FFloat,oneof"`
-}
-type Oneof_F_Double struct {
-	F_Double float64 `protobuf:"fixed64,9,opt,name=F_Double,json=FDouble,oneof"`
-}
-type Oneof_F_String struct {
-	F_String string `protobuf:"bytes,10,opt,name=F_String,json=FString,oneof"`
-}
-type Oneof_F_Bytes struct {
-	F_Bytes []byte `protobuf:"bytes,11,opt,name=F_Bytes,json=FBytes,oneof"`
-}
-type Oneof_F_Sint32 struct {
-	F_Sint32 int32 `protobuf:"zigzag32,12,opt,name=F_Sint32,json=FSint32,oneof"`
-}
-type Oneof_F_Sint64 struct {
-	F_Sint64 int64 `protobuf:"zigzag64,13,opt,name=F_Sint64,json=FSint64,oneof"`
-}
-type Oneof_F_Enum struct {
-	F_Enum MyMessage_Color `protobuf:"varint,14,opt,name=F_Enum,json=FEnum,enum=testdata.MyMessage_Color,oneof"`
-}
-type Oneof_F_Message struct {
-	F_Message *GoTestField `protobuf:"bytes,15,opt,name=F_Message,json=FMessage,oneof"`
-}
-type Oneof_FGroup struct {
-	FGroup *Oneof_F_Group `protobuf:"group,16,opt,name=F_Group,json=fGroup,oneof"`
-}
-type Oneof_F_Largest_Tag struct {
-	F_Largest_Tag int32 `protobuf:"varint,536870911,opt,name=F_Largest_Tag,json=FLargestTag,oneof"`
-}
-type Oneof_Value struct {
-	Value int32 `protobuf:"varint,100,opt,name=value,oneof"`
-}
-
-func (*Oneof_F_Bool) isOneof_Union()        {}
-func (*Oneof_F_Int32) isOneof_Union()       {}
-func (*Oneof_F_Int64) isOneof_Union()       {}
-func (*Oneof_F_Fixed32) isOneof_Union()     {}
-func (*Oneof_F_Fixed64) isOneof_Union()     {}
-func (*Oneof_F_Uint32) isOneof_Union()      {}
-func (*Oneof_F_Uint64) isOneof_Union()      {}
-func (*Oneof_F_Float) isOneof_Union()       {}
-func (*Oneof_F_Double) isOneof_Union()      {}
-func (*Oneof_F_String) isOneof_Union()      {}
-func (*Oneof_F_Bytes) isOneof_Union()       {}
-func (*Oneof_F_Sint32) isOneof_Union()      {}
-func (*Oneof_F_Sint64) isOneof_Union()      {}
-func (*Oneof_F_Enum) isOneof_Union()        {}
-func (*Oneof_F_Message) isOneof_Union()     {}
-func (*Oneof_FGroup) isOneof_Union()        {}
-func (*Oneof_F_Largest_Tag) isOneof_Union() {}
-func (*Oneof_Value) isOneof_Tormato()       {}
-
-func (m *Oneof) GetUnion() isOneof_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-func (m *Oneof) GetTormato() isOneof_Tormato {
-	if m != nil {
-		return m.Tormato
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Bool() bool {
-	if x, ok := m.GetUnion().(*Oneof_F_Bool); ok {
-		return x.F_Bool
-	}
-	return false
-}
-
-func (m *Oneof) GetF_Int32() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Int32); ok {
-		return x.F_Int32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Int64() int64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Int64); ok {
-		return x.F_Int64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Fixed32() uint32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Fixed32); ok {
-		return x.F_Fixed32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Fixed64() uint64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Fixed64); ok {
-		return x.F_Fixed64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Uint32() uint32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Uint32); ok {
-		return x.F_Uint32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Uint64() uint64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Uint64); ok {
-		return x.F_Uint64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Float() float32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Float); ok {
-		return x.F_Float
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Double() float64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Double); ok {
-		return x.F_Double
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_String() string {
-	if x, ok := m.GetUnion().(*Oneof_F_String); ok {
-		return x.F_String
-	}
-	return ""
-}
-
-func (m *Oneof) GetF_Bytes() []byte {
-	if x, ok := m.GetUnion().(*Oneof_F_Bytes); ok {
-		return x.F_Bytes
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Sint32() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Sint32); ok {
-		return x.F_Sint32
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Sint64() int64 {
-	if x, ok := m.GetUnion().(*Oneof_F_Sint64); ok {
-		return x.F_Sint64
-	}
-	return 0
-}
-
-func (m *Oneof) GetF_Enum() MyMessage_Color {
-	if x, ok := m.GetUnion().(*Oneof_F_Enum); ok {
-		return x.F_Enum
-	}
-	return MyMessage_RED
-}
-
-func (m *Oneof) GetF_Message() *GoTestField {
-	if x, ok := m.GetUnion().(*Oneof_F_Message); ok {
-		return x.F_Message
-	}
-	return nil
-}
-
-func (m *Oneof) GetFGroup() *Oneof_F_Group {
-	if x, ok := m.GetUnion().(*Oneof_FGroup); ok {
-		return x.FGroup
-	}
-	return nil
-}
-
-func (m *Oneof) GetF_Largest_Tag() int32 {
-	if x, ok := m.GetUnion().(*Oneof_F_Largest_Tag); ok {
-		return x.F_Largest_Tag
-	}
-	return 0
-}
-
-func (m *Oneof) GetValue() int32 {
-	if x, ok := m.GetTormato().(*Oneof_Value); ok {
-		return x.Value
-	}
-	return 0
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Oneof) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Oneof_OneofMarshaler, _Oneof_OneofUnmarshaler, _Oneof_OneofSizer, []interface{}{
-		(*Oneof_F_Bool)(nil),
-		(*Oneof_F_Int32)(nil),
-		(*Oneof_F_Int64)(nil),
-		(*Oneof_F_Fixed32)(nil),
-		(*Oneof_F_Fixed64)(nil),
-		(*Oneof_F_Uint32)(nil),
-		(*Oneof_F_Uint64)(nil),
-		(*Oneof_F_Float)(nil),
-		(*Oneof_F_Double)(nil),
-		(*Oneof_F_String)(nil),
-		(*Oneof_F_Bytes)(nil),
-		(*Oneof_F_Sint32)(nil),
-		(*Oneof_F_Sint64)(nil),
-		(*Oneof_F_Enum)(nil),
-		(*Oneof_F_Message)(nil),
-		(*Oneof_FGroup)(nil),
-		(*Oneof_F_Largest_Tag)(nil),
-		(*Oneof_Value)(nil),
-	}
-}
-
-func _Oneof_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Oneof)
-	// union
-	switch x := m.Union.(type) {
-	case *Oneof_F_Bool:
-		t := uint64(0)
-		if x.F_Bool {
-			t = 1
-		}
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Oneof_F_Int32:
-		b.EncodeVarint(2<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Int32))
-	case *Oneof_F_Int64:
-		b.EncodeVarint(3<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Int64))
-	case *Oneof_F_Fixed32:
-		b.EncodeVarint(4<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(x.F_Fixed32))
-	case *Oneof_F_Fixed64:
-		b.EncodeVarint(5<<3 | proto.WireFixed64)
-		b.EncodeFixed64(uint64(x.F_Fixed64))
-	case *Oneof_F_Uint32:
-		b.EncodeVarint(6<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Uint32))
-	case *Oneof_F_Uint64:
-		b.EncodeVarint(7<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Uint64))
-	case *Oneof_F_Float:
-		b.EncodeVarint(8<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.F_Float)))
-	case *Oneof_F_Double:
-		b.EncodeVarint(9<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.F_Double))
-	case *Oneof_F_String:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.F_String)
-	case *Oneof_F_Bytes:
-		b.EncodeVarint(11<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.F_Bytes)
-	case *Oneof_F_Sint32:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.F_Sint32))
-	case *Oneof_F_Sint64:
-		b.EncodeVarint(13<<3 | proto.WireVarint)
-		b.EncodeZigzag64(uint64(x.F_Sint64))
-	case *Oneof_F_Enum:
-		b.EncodeVarint(14<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Enum))
-	case *Oneof_F_Message:
-		b.EncodeVarint(15<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.F_Message); err != nil {
-			return err
-		}
-	case *Oneof_FGroup:
-		b.EncodeVarint(16<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.FGroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(16<<3 | proto.WireEndGroup)
-	case *Oneof_F_Largest_Tag:
-		b.EncodeVarint(536870911<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.F_Largest_Tag))
-	case nil:
-	default:
-		return fmt.Errorf("Oneof.Union has unexpected type %T", x)
-	}
-	// tormato
-	switch x := m.Tormato.(type) {
-	case *Oneof_Value:
-		b.EncodeVarint(100<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Value))
-	case nil:
-	default:
-		return fmt.Errorf("Oneof.Tormato has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Oneof_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Oneof)
-	switch tag {
-	case 1: // union.F_Bool
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Bool{x != 0}
-		return true, err
-	case 2: // union.F_Int32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Int32{int32(x)}
-		return true, err
-	case 3: // union.F_Int64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Int64{int64(x)}
-		return true, err
-	case 4: // union.F_Fixed32
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Oneof_F_Fixed32{uint32(x)}
-		return true, err
-	case 5: // union.F_Fixed64
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Oneof_F_Fixed64{x}
-		return true, err
-	case 6: // union.F_Uint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Uint32{uint32(x)}
-		return true, err
-	case 7: // union.F_Uint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Uint64{x}
-		return true, err
-	case 8: // union.F_Float
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Oneof_F_Float{math.Float32frombits(uint32(x))}
-		return true, err
-	case 9: // union.F_Double
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Oneof_F_Double{math.Float64frombits(x)}
-		return true, err
-	case 10: // union.F_String
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Oneof_F_String{x}
-		return true, err
-	case 11: // union.F_Bytes
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Oneof_F_Bytes{x}
-		return true, err
-	case 12: // union.F_Sint32
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.Union = &Oneof_F_Sint32{int32(x)}
-		return true, err
-	case 13: // union.F_Sint64
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag64()
-		m.Union = &Oneof_F_Sint64{int64(x)}
-		return true, err
-	case 14: // union.F_Enum
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Enum{MyMessage_Color(x)}
-		return true, err
-	case 15: // union.F_Message
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(GoTestField)
-		err := b.DecodeMessage(msg)
-		m.Union = &Oneof_F_Message{msg}
-		return true, err
-	case 16: // union.f_group
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Oneof_F_Group)
-		err := b.DecodeGroup(msg)
-		m.Union = &Oneof_FGroup{msg}
-		return true, err
-	case 536870911: // union.F_Largest_Tag
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Oneof_F_Largest_Tag{int32(x)}
-		return true, err
-	case 100: // tormato.value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Tormato = &Oneof_Value{int32(x)}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Oneof_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Oneof)
-	// union
-	switch x := m.Union.(type) {
-	case *Oneof_F_Bool:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += 1
-	case *Oneof_F_Int32:
-		n += proto.SizeVarint(2<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Int32))
-	case *Oneof_F_Int64:
-		n += proto.SizeVarint(3<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Int64))
-	case *Oneof_F_Fixed32:
-		n += proto.SizeVarint(4<<3 | proto.WireFixed32)
-		n += 4
-	case *Oneof_F_Fixed64:
-		n += proto.SizeVarint(5<<3 | proto.WireFixed64)
-		n += 8
-	case *Oneof_F_Uint32:
-		n += proto.SizeVarint(6<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Uint32))
-	case *Oneof_F_Uint64:
-		n += proto.SizeVarint(7<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Uint64))
-	case *Oneof_F_Float:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed32)
-		n += 4
-	case *Oneof_F_Double:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed64)
-		n += 8
-	case *Oneof_F_String:
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.F_String)))
-		n += len(x.F_String)
-	case *Oneof_F_Bytes:
-		n += proto.SizeVarint(11<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.F_Bytes)))
-		n += len(x.F_Bytes)
-	case *Oneof_F_Sint32:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.F_Sint32) << 1) ^ uint32((int32(x.F_Sint32) >> 31))))
-	case *Oneof_F_Sint64:
-		n += proto.SizeVarint(13<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(uint64(x.F_Sint64<<1) ^ uint64((int64(x.F_Sint64) >> 63))))
-	case *Oneof_F_Enum:
-		n += proto.SizeVarint(14<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Enum))
-	case *Oneof_F_Message:
-		s := proto.Size(x.F_Message)
-		n += proto.SizeVarint(15<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Oneof_FGroup:
-		n += proto.SizeVarint(16<<3 | proto.WireStartGroup)
-		n += proto.Size(x.FGroup)
-		n += proto.SizeVarint(16<<3 | proto.WireEndGroup)
-	case *Oneof_F_Largest_Tag:
-		n += proto.SizeVarint(536870911<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.F_Largest_Tag))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	// tormato
-	switch x := m.Tormato.(type) {
-	case *Oneof_Value:
-		n += proto.SizeVarint(100<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Value))
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Oneof_F_Group struct {
-	X                *int32 `protobuf:"varint,17,opt,name=x" json:"x,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Oneof_F_Group) Reset()                    { *m = Oneof_F_Group{} }
-func (m *Oneof_F_Group) String() string            { return proto.CompactTextString(m) }
-func (*Oneof_F_Group) ProtoMessage()               {}
-func (*Oneof_F_Group) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{29, 0} }
-
-func (m *Oneof_F_Group) GetX() int32 {
-	if m != nil && m.X != nil {
-		return *m.X
-	}
-	return 0
-}
-
-type Communique struct {
-	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
-	// This is a oneof, called "union".
-	//
-	// Types that are valid to be assigned to Union:
-	//	*Communique_Number
-	//	*Communique_Name
-	//	*Communique_Data
-	//	*Communique_TempC
-	//	*Communique_Col
-	//	*Communique_Msg
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Communique) Reset()                    { *m = Communique{} }
-func (m *Communique) String() string            { return proto.CompactTextString(m) }
-func (*Communique) ProtoMessage()               {}
-func (*Communique) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{30} }
-
-type isCommunique_Union interface {
-	isCommunique_Union()
-}
-
-type Communique_Number struct {
-	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
-}
-type Communique_Name struct {
-	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
-}
-type Communique_Data struct {
-	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
-}
-type Communique_TempC struct {
-	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
-}
-type Communique_Col struct {
-	Col MyMessage_Color `protobuf:"varint,9,opt,name=col,enum=testdata.MyMessage_Color,oneof"`
-}
-type Communique_Msg struct {
-	Msg *Strings `protobuf:"bytes,10,opt,name=msg,oneof"`
-}
-
-func (*Communique_Number) isCommunique_Union() {}
-func (*Communique_Name) isCommunique_Union()   {}
-func (*Communique_Data) isCommunique_Union()   {}
-func (*Communique_TempC) isCommunique_Union()  {}
-func (*Communique_Col) isCommunique_Union()    {}
-func (*Communique_Msg) isCommunique_Union()    {}
-
-func (m *Communique) GetUnion() isCommunique_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *Communique) GetMakeMeCry() bool {
-	if m != nil && m.MakeMeCry != nil {
-		return *m.MakeMeCry
-	}
-	return false
-}
-
-func (m *Communique) GetNumber() int32 {
-	if x, ok := m.GetUnion().(*Communique_Number); ok {
-		return x.Number
-	}
-	return 0
-}
-
-func (m *Communique) GetName() string {
-	if x, ok := m.GetUnion().(*Communique_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Communique) GetData() []byte {
-	if x, ok := m.GetUnion().(*Communique_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *Communique) GetTempC() float64 {
-	if x, ok := m.GetUnion().(*Communique_TempC); ok {
-		return x.TempC
-	}
-	return 0
-}
-
-func (m *Communique) GetCol() MyMessage_Color {
-	if x, ok := m.GetUnion().(*Communique_Col); ok {
-		return x.Col
-	}
-	return MyMessage_RED
-}
-
-func (m *Communique) GetMsg() *Strings {
-	if x, ok := m.GetUnion().(*Communique_Msg); ok {
-		return x.Msg
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
-		(*Communique_Number)(nil),
-		(*Communique_Name)(nil),
-		(*Communique_Data)(nil),
-		(*Communique_TempC)(nil),
-		(*Communique_Col)(nil),
-		(*Communique_Msg)(nil),
-	}
-}
-
-func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Number))
-	case *Communique_Name:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case *Communique_Data:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *Communique_TempC:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.TempC))
-	case *Communique_Col:
-		b.EncodeVarint(9<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Col))
-	case *Communique_Msg:
-		b.EncodeVarint(10<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Msg); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Communique.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Communique)
-	switch tag {
-	case 5: // union.number
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Number{int32(x)}
-		return true, err
-	case 6: // union.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Communique_Name{x}
-		return true, err
-	case 7: // union.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Communique_Data{x}
-		return true, err
-	case 8: // union.temp_c
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Communique_TempC{math.Float64frombits(x)}
-		return true, err
-	case 9: // union.col
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Col{MyMessage_Color(x)}
-		return true, err
-	case 10: // union.msg
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Strings)
-		err := b.DecodeMessage(msg)
-		m.Union = &Communique_Msg{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Communique_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Number))
-	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
-		n += 8
-	case *Communique_Col:
-		n += proto.SizeVarint(9<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Col))
-	case *Communique_Msg:
-		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(10<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-var E_Greeting = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessage)(nil),
-	ExtensionType: ([]string)(nil),
-	Field:         106,
-	Name:          "testdata.greeting",
-	Tag:           "bytes,106,rep,name=greeting",
-	Filename:      "test.proto",
-}
-
-var E_Complex = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherMessage)(nil),
-	ExtensionType: (*ComplexExtension)(nil),
-	Field:         200,
-	Name:          "testdata.complex",
-	Tag:           "bytes,200,opt,name=complex",
-	Filename:      "test.proto",
-}
-
-var E_RComplex = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherMessage)(nil),
-	ExtensionType: ([]*ComplexExtension)(nil),
-	Field:         201,
-	Name:          "testdata.r_complex",
-	Tag:           "bytes,201,rep,name=r_complex,json=rComplex",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "testdata.no_default_double",
-	Tag:           "fixed64,101,opt,name=no_default_double,json=noDefaultDouble",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         102,
-	Name:          "testdata.no_default_float",
-	Tag:           "fixed32,102,opt,name=no_default_float,json=noDefaultFloat",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         103,
-	Name:          "testdata.no_default_int32",
-	Tag:           "varint,103,opt,name=no_default_int32,json=noDefaultInt32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         104,
-	Name:          "testdata.no_default_int64",
-	Tag:           "varint,104,opt,name=no_default_int64,json=noDefaultInt64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         105,
-	Name:          "testdata.no_default_uint32",
-	Tag:           "varint,105,opt,name=no_default_uint32,json=noDefaultUint32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         106,
-	Name:          "testdata.no_default_uint64",
-	Tag:           "varint,106,opt,name=no_default_uint64,json=noDefaultUint64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         107,
-	Name:          "testdata.no_default_sint32",
-	Tag:           "zigzag32,107,opt,name=no_default_sint32,json=noDefaultSint32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         108,
-	Name:          "testdata.no_default_sint64",
-	Tag:           "zigzag64,108,opt,name=no_default_sint64,json=noDefaultSint64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         109,
-	Name:          "testdata.no_default_fixed32",
-	Tag:           "fixed32,109,opt,name=no_default_fixed32,json=noDefaultFixed32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         110,
-	Name:          "testdata.no_default_fixed64",
-	Tag:           "fixed64,110,opt,name=no_default_fixed64,json=noDefaultFixed64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         111,
-	Name:          "testdata.no_default_sfixed32",
-	Tag:           "fixed32,111,opt,name=no_default_sfixed32,json=noDefaultSfixed32",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         112,
-	Name:          "testdata.no_default_sfixed64",
-	Tag:           "fixed64,112,opt,name=no_default_sfixed64,json=noDefaultSfixed64",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         113,
-	Name:          "testdata.no_default_bool",
-	Tag:           "varint,113,opt,name=no_default_bool,json=noDefaultBool",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         114,
-	Name:          "testdata.no_default_string",
-	Tag:           "bytes,114,opt,name=no_default_string,json=noDefaultString",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         115,
-	Name:          "testdata.no_default_bytes",
-	Tag:           "bytes,115,opt,name=no_default_bytes,json=noDefaultBytes",
-	Filename:      "test.proto",
-}
-
-var E_NoDefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         116,
-	Name:          "testdata.no_default_enum",
-	Tag:           "varint,116,opt,name=no_default_enum,json=noDefaultEnum,enum=testdata.DefaultsMessage_DefaultsEnum",
-	Filename:      "test.proto",
-}
-
-var E_DefaultDouble = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         201,
-	Name:          "testdata.default_double",
-	Tag:           "fixed64,201,opt,name=default_double,json=defaultDouble,def=3.1415",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFloat = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*float32)(nil),
-	Field:         202,
-	Name:          "testdata.default_float",
-	Tag:           "fixed32,202,opt,name=default_float,json=defaultFloat,def=3.14",
-	Filename:      "test.proto",
-}
-
-var E_DefaultInt32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         203,
-	Name:          "testdata.default_int32",
-	Tag:           "varint,203,opt,name=default_int32,json=defaultInt32,def=42",
-	Filename:      "test.proto",
-}
-
-var E_DefaultInt64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         204,
-	Name:          "testdata.default_int64",
-	Tag:           "varint,204,opt,name=default_int64,json=defaultInt64,def=43",
-	Filename:      "test.proto",
-}
-
-var E_DefaultUint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         205,
-	Name:          "testdata.default_uint32",
-	Tag:           "varint,205,opt,name=default_uint32,json=defaultUint32,def=44",
-	Filename:      "test.proto",
-}
-
-var E_DefaultUint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         206,
-	Name:          "testdata.default_uint64",
-	Tag:           "varint,206,opt,name=default_uint64,json=defaultUint64,def=45",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSint32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         207,
-	Name:          "testdata.default_sint32",
-	Tag:           "zigzag32,207,opt,name=default_sint32,json=defaultSint32,def=46",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSint64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         208,
-	Name:          "testdata.default_sint64",
-	Tag:           "zigzag64,208,opt,name=default_sint64,json=defaultSint64,def=47",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint32)(nil),
-	Field:         209,
-	Name:          "testdata.default_fixed32",
-	Tag:           "fixed32,209,opt,name=default_fixed32,json=defaultFixed32,def=48",
-	Filename:      "test.proto",
-}
-
-var E_DefaultFixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*uint64)(nil),
-	Field:         210,
-	Name:          "testdata.default_fixed64",
-	Tag:           "fixed64,210,opt,name=default_fixed64,json=defaultFixed64,def=49",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSfixed32 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int32)(nil),
-	Field:         211,
-	Name:          "testdata.default_sfixed32",
-	Tag:           "fixed32,211,opt,name=default_sfixed32,json=defaultSfixed32,def=50",
-	Filename:      "test.proto",
-}
-
-var E_DefaultSfixed64 = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*int64)(nil),
-	Field:         212,
-	Name:          "testdata.default_sfixed64",
-	Tag:           "fixed64,212,opt,name=default_sfixed64,json=defaultSfixed64,def=51",
-	Filename:      "test.proto",
-}
-
-var E_DefaultBool = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*bool)(nil),
-	Field:         213,
-	Name:          "testdata.default_bool",
-	Tag:           "varint,213,opt,name=default_bool,json=defaultBool,def=1",
-	Filename:      "test.proto",
-}
-
-var E_DefaultString = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         214,
-	Name:          "testdata.default_string",
-	Tag:           "bytes,214,opt,name=default_string,json=defaultString,def=Hello, string",
-	Filename:      "test.proto",
-}
-
-var E_DefaultBytes = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: ([]byte)(nil),
-	Field:         215,
-	Name:          "testdata.default_bytes",
-	Tag:           "bytes,215,opt,name=default_bytes,json=defaultBytes,def=Hello, bytes",
-	Filename:      "test.proto",
-}
-
-var E_DefaultEnum = &proto.ExtensionDesc{
-	ExtendedType:  (*DefaultsMessage)(nil),
-	ExtensionType: (*DefaultsMessage_DefaultsEnum)(nil),
-	Field:         216,
-	Name:          "testdata.default_enum",
-	Tag:           "varint,216,opt,name=default_enum,json=defaultEnum,enum=testdata.DefaultsMessage_DefaultsEnum,def=1",
-	Filename:      "test.proto",
-}
-
-var E_X201 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         201,
-	Name:          "testdata.x201",
-	Tag:           "bytes,201,opt,name=x201",
-	Filename:      "test.proto",
-}
-
-var E_X202 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         202,
-	Name:          "testdata.x202",
-	Tag:           "bytes,202,opt,name=x202",
-	Filename:      "test.proto",
-}
-
-var E_X203 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         203,
-	Name:          "testdata.x203",
-	Tag:           "bytes,203,opt,name=x203",
-	Filename:      "test.proto",
-}
-
-var E_X204 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         204,
-	Name:          "testdata.x204",
-	Tag:           "bytes,204,opt,name=x204",
-	Filename:      "test.proto",
-}
-
-var E_X205 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         205,
-	Name:          "testdata.x205",
-	Tag:           "bytes,205,opt,name=x205",
-	Filename:      "test.proto",
-}
-
-var E_X206 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         206,
-	Name:          "testdata.x206",
-	Tag:           "bytes,206,opt,name=x206",
-	Filename:      "test.proto",
-}
-
-var E_X207 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         207,
-	Name:          "testdata.x207",
-	Tag:           "bytes,207,opt,name=x207",
-	Filename:      "test.proto",
-}
-
-var E_X208 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         208,
-	Name:          "testdata.x208",
-	Tag:           "bytes,208,opt,name=x208",
-	Filename:      "test.proto",
-}
-
-var E_X209 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         209,
-	Name:          "testdata.x209",
-	Tag:           "bytes,209,opt,name=x209",
-	Filename:      "test.proto",
-}
-
-var E_X210 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         210,
-	Name:          "testdata.x210",
-	Tag:           "bytes,210,opt,name=x210",
-	Filename:      "test.proto",
-}
-
-var E_X211 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         211,
-	Name:          "testdata.x211",
-	Tag:           "bytes,211,opt,name=x211",
-	Filename:      "test.proto",
-}
-
-var E_X212 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         212,
-	Name:          "testdata.x212",
-	Tag:           "bytes,212,opt,name=x212",
-	Filename:      "test.proto",
-}
-
-var E_X213 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         213,
-	Name:          "testdata.x213",
-	Tag:           "bytes,213,opt,name=x213",
-	Filename:      "test.proto",
-}
-
-var E_X214 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         214,
-	Name:          "testdata.x214",
-	Tag:           "bytes,214,opt,name=x214",
-	Filename:      "test.proto",
-}
-
-var E_X215 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         215,
-	Name:          "testdata.x215",
-	Tag:           "bytes,215,opt,name=x215",
-	Filename:      "test.proto",
-}
-
-var E_X216 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         216,
-	Name:          "testdata.x216",
-	Tag:           "bytes,216,opt,name=x216",
-	Filename:      "test.proto",
-}
-
-var E_X217 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         217,
-	Name:          "testdata.x217",
-	Tag:           "bytes,217,opt,name=x217",
-	Filename:      "test.proto",
-}
-
-var E_X218 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         218,
-	Name:          "testdata.x218",
-	Tag:           "bytes,218,opt,name=x218",
-	Filename:      "test.proto",
-}
-
-var E_X219 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         219,
-	Name:          "testdata.x219",
-	Tag:           "bytes,219,opt,name=x219",
-	Filename:      "test.proto",
-}
-
-var E_X220 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         220,
-	Name:          "testdata.x220",
-	Tag:           "bytes,220,opt,name=x220",
-	Filename:      "test.proto",
-}
-
-var E_X221 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         221,
-	Name:          "testdata.x221",
-	Tag:           "bytes,221,opt,name=x221",
-	Filename:      "test.proto",
-}
-
-var E_X222 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         222,
-	Name:          "testdata.x222",
-	Tag:           "bytes,222,opt,name=x222",
-	Filename:      "test.proto",
-}
-
-var E_X223 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         223,
-	Name:          "testdata.x223",
-	Tag:           "bytes,223,opt,name=x223",
-	Filename:      "test.proto",
-}
-
-var E_X224 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         224,
-	Name:          "testdata.x224",
-	Tag:           "bytes,224,opt,name=x224",
-	Filename:      "test.proto",
-}
-
-var E_X225 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         225,
-	Name:          "testdata.x225",
-	Tag:           "bytes,225,opt,name=x225",
-	Filename:      "test.proto",
-}
-
-var E_X226 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         226,
-	Name:          "testdata.x226",
-	Tag:           "bytes,226,opt,name=x226",
-	Filename:      "test.proto",
-}
-
-var E_X227 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         227,
-	Name:          "testdata.x227",
-	Tag:           "bytes,227,opt,name=x227",
-	Filename:      "test.proto",
-}
-
-var E_X228 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         228,
-	Name:          "testdata.x228",
-	Tag:           "bytes,228,opt,name=x228",
-	Filename:      "test.proto",
-}
-
-var E_X229 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         229,
-	Name:          "testdata.x229",
-	Tag:           "bytes,229,opt,name=x229",
-	Filename:      "test.proto",
-}
-
-var E_X230 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         230,
-	Name:          "testdata.x230",
-	Tag:           "bytes,230,opt,name=x230",
-	Filename:      "test.proto",
-}
-
-var E_X231 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         231,
-	Name:          "testdata.x231",
-	Tag:           "bytes,231,opt,name=x231",
-	Filename:      "test.proto",
-}
-
-var E_X232 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         232,
-	Name:          "testdata.x232",
-	Tag:           "bytes,232,opt,name=x232",
-	Filename:      "test.proto",
-}
-
-var E_X233 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         233,
-	Name:          "testdata.x233",
-	Tag:           "bytes,233,opt,name=x233",
-	Filename:      "test.proto",
-}
-
-var E_X234 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         234,
-	Name:          "testdata.x234",
-	Tag:           "bytes,234,opt,name=x234",
-	Filename:      "test.proto",
-}
-
-var E_X235 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         235,
-	Name:          "testdata.x235",
-	Tag:           "bytes,235,opt,name=x235",
-	Filename:      "test.proto",
-}
-
-var E_X236 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         236,
-	Name:          "testdata.x236",
-	Tag:           "bytes,236,opt,name=x236",
-	Filename:      "test.proto",
-}
-
-var E_X237 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         237,
-	Name:          "testdata.x237",
-	Tag:           "bytes,237,opt,name=x237",
-	Filename:      "test.proto",
-}
-
-var E_X238 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         238,
-	Name:          "testdata.x238",
-	Tag:           "bytes,238,opt,name=x238",
-	Filename:      "test.proto",
-}
-
-var E_X239 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         239,
-	Name:          "testdata.x239",
-	Tag:           "bytes,239,opt,name=x239",
-	Filename:      "test.proto",
-}
-
-var E_X240 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         240,
-	Name:          "testdata.x240",
-	Tag:           "bytes,240,opt,name=x240",
-	Filename:      "test.proto",
-}
-
-var E_X241 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         241,
-	Name:          "testdata.x241",
-	Tag:           "bytes,241,opt,name=x241",
-	Filename:      "test.proto",
-}
-
-var E_X242 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         242,
-	Name:          "testdata.x242",
-	Tag:           "bytes,242,opt,name=x242",
-	Filename:      "test.proto",
-}
-
-var E_X243 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         243,
-	Name:          "testdata.x243",
-	Tag:           "bytes,243,opt,name=x243",
-	Filename:      "test.proto",
-}
-
-var E_X244 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         244,
-	Name:          "testdata.x244",
-	Tag:           "bytes,244,opt,name=x244",
-	Filename:      "test.proto",
-}
-
-var E_X245 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         245,
-	Name:          "testdata.x245",
-	Tag:           "bytes,245,opt,name=x245",
-	Filename:      "test.proto",
-}
-
-var E_X246 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         246,
-	Name:          "testdata.x246",
-	Tag:           "bytes,246,opt,name=x246",
-	Filename:      "test.proto",
-}
-
-var E_X247 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         247,
-	Name:          "testdata.x247",
-	Tag:           "bytes,247,opt,name=x247",
-	Filename:      "test.proto",
-}
-
-var E_X248 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         248,
-	Name:          "testdata.x248",
-	Tag:           "bytes,248,opt,name=x248",
-	Filename:      "test.proto",
-}
-
-var E_X249 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         249,
-	Name:          "testdata.x249",
-	Tag:           "bytes,249,opt,name=x249",
-	Filename:      "test.proto",
-}
-
-var E_X250 = &proto.ExtensionDesc{
-	ExtendedType:  (*MyMessageSet)(nil),
-	ExtensionType: (*Empty)(nil),
-	Field:         250,
-	Name:          "testdata.x250",
-	Tag:           "bytes,250,opt,name=x250",
-	Filename:      "test.proto",
-}
-
-func init() {
-	proto.RegisterType((*GoEnum)(nil), "testdata.GoEnum")
-	proto.RegisterType((*GoTestField)(nil), "testdata.GoTestField")
-	proto.RegisterType((*GoTest)(nil), "testdata.GoTest")
-	proto.RegisterType((*GoTest_RequiredGroup)(nil), "testdata.GoTest.RequiredGroup")
-	proto.RegisterType((*GoTest_RepeatedGroup)(nil), "testdata.GoTest.RepeatedGroup")
-	proto.RegisterType((*GoTest_OptionalGroup)(nil), "testdata.GoTest.OptionalGroup")
-	proto.RegisterType((*GoTestRequiredGroupField)(nil), "testdata.GoTestRequiredGroupField")
-	proto.RegisterType((*GoTestRequiredGroupField_Group)(nil), "testdata.GoTestRequiredGroupField.Group")
-	proto.RegisterType((*GoSkipTest)(nil), "testdata.GoSkipTest")
-	proto.RegisterType((*GoSkipTest_SkipGroup)(nil), "testdata.GoSkipTest.SkipGroup")
-	proto.RegisterType((*NonPackedTest)(nil), "testdata.NonPackedTest")
-	proto.RegisterType((*PackedTest)(nil), "testdata.PackedTest")
-	proto.RegisterType((*MaxTag)(nil), "testdata.MaxTag")
-	proto.RegisterType((*OldMessage)(nil), "testdata.OldMessage")
-	proto.RegisterType((*OldMessage_Nested)(nil), "testdata.OldMessage.Nested")
-	proto.RegisterType((*NewMessage)(nil), "testdata.NewMessage")
-	proto.RegisterType((*NewMessage_Nested)(nil), "testdata.NewMessage.Nested")
-	proto.RegisterType((*InnerMessage)(nil), "testdata.InnerMessage")
-	proto.RegisterType((*OtherMessage)(nil), "testdata.OtherMessage")
-	proto.RegisterType((*RequiredInnerMessage)(nil), "testdata.RequiredInnerMessage")
-	proto.RegisterType((*MyMessage)(nil), "testdata.MyMessage")
-	proto.RegisterType((*MyMessage_SomeGroup)(nil), "testdata.MyMessage.SomeGroup")
-	proto.RegisterType((*Ext)(nil), "testdata.Ext")
-	proto.RegisterType((*ComplexExtension)(nil), "testdata.ComplexExtension")
-	proto.RegisterType((*DefaultsMessage)(nil), "testdata.DefaultsMessage")
-	proto.RegisterType((*MyMessageSet)(nil), "testdata.MyMessageSet")
-	proto.RegisterType((*Empty)(nil), "testdata.Empty")
-	proto.RegisterType((*MessageList)(nil), "testdata.MessageList")
-	proto.RegisterType((*MessageList_Message)(nil), "testdata.MessageList.Message")
-	proto.RegisterType((*Strings)(nil), "testdata.Strings")
-	proto.RegisterType((*Defaults)(nil), "testdata.Defaults")
-	proto.RegisterType((*SubDefaults)(nil), "testdata.SubDefaults")
-	proto.RegisterType((*RepeatedEnum)(nil), "testdata.RepeatedEnum")
-	proto.RegisterType((*MoreRepeated)(nil), "testdata.MoreRepeated")
-	proto.RegisterType((*GroupOld)(nil), "testdata.GroupOld")
-	proto.RegisterType((*GroupOld_G)(nil), "testdata.GroupOld.G")
-	proto.RegisterType((*GroupNew)(nil), "testdata.GroupNew")
-	proto.RegisterType((*GroupNew_G)(nil), "testdata.GroupNew.G")
-	proto.RegisterType((*FloatingPoint)(nil), "testdata.FloatingPoint")
-	proto.RegisterType((*MessageWithMap)(nil), "testdata.MessageWithMap")
-	proto.RegisterType((*Oneof)(nil), "testdata.Oneof")
-	proto.RegisterType((*Oneof_F_Group)(nil), "testdata.Oneof.F_Group")
-	proto.RegisterType((*Communique)(nil), "testdata.Communique")
-	proto.RegisterEnum("testdata.FOO", FOO_name, FOO_value)
-	proto.RegisterEnum("testdata.GoTest_KIND", GoTest_KIND_name, GoTest_KIND_value)
-	proto.RegisterEnum("testdata.MyMessage_Color", MyMessage_Color_name, MyMessage_Color_value)
-	proto.RegisterEnum("testdata.DefaultsMessage_DefaultsEnum", DefaultsMessage_DefaultsEnum_name, DefaultsMessage_DefaultsEnum_value)
-	proto.RegisterEnum("testdata.Defaults_Color", Defaults_Color_name, Defaults_Color_value)
-	proto.RegisterEnum("testdata.RepeatedEnum_Color", RepeatedEnum_Color_name, RepeatedEnum_Color_value)
-	proto.RegisterExtension(E_Ext_More)
-	proto.RegisterExtension(E_Ext_Text)
-	proto.RegisterExtension(E_Ext_Number)
-	proto.RegisterExtension(E_Greeting)
-	proto.RegisterExtension(E_Complex)
-	proto.RegisterExtension(E_RComplex)
-	proto.RegisterExtension(E_NoDefaultDouble)
-	proto.RegisterExtension(E_NoDefaultFloat)
-	proto.RegisterExtension(E_NoDefaultInt32)
-	proto.RegisterExtension(E_NoDefaultInt64)
-	proto.RegisterExtension(E_NoDefaultUint32)
-	proto.RegisterExtension(E_NoDefaultUint64)
-	proto.RegisterExtension(E_NoDefaultSint32)
-	proto.RegisterExtension(E_NoDefaultSint64)
-	proto.RegisterExtension(E_NoDefaultFixed32)
-	proto.RegisterExtension(E_NoDefaultFixed64)
-	proto.RegisterExtension(E_NoDefaultSfixed32)
-	proto.RegisterExtension(E_NoDefaultSfixed64)
-	proto.RegisterExtension(E_NoDefaultBool)
-	proto.RegisterExtension(E_NoDefaultString)
-	proto.RegisterExtension(E_NoDefaultBytes)
-	proto.RegisterExtension(E_NoDefaultEnum)
-	proto.RegisterExtension(E_DefaultDouble)
-	proto.RegisterExtension(E_DefaultFloat)
-	proto.RegisterExtension(E_DefaultInt32)
-	proto.RegisterExtension(E_DefaultInt64)
-	proto.RegisterExtension(E_DefaultUint32)
-	proto.RegisterExtension(E_DefaultUint64)
-	proto.RegisterExtension(E_DefaultSint32)
-	proto.RegisterExtension(E_DefaultSint64)
-	proto.RegisterExtension(E_DefaultFixed32)
-	proto.RegisterExtension(E_DefaultFixed64)
-	proto.RegisterExtension(E_DefaultSfixed32)
-	proto.RegisterExtension(E_DefaultSfixed64)
-	proto.RegisterExtension(E_DefaultBool)
-	proto.RegisterExtension(E_DefaultString)
-	proto.RegisterExtension(E_DefaultBytes)
-	proto.RegisterExtension(E_DefaultEnum)
-	proto.RegisterExtension(E_X201)
-	proto.RegisterExtension(E_X202)
-	proto.RegisterExtension(E_X203)
-	proto.RegisterExtension(E_X204)
-	proto.RegisterExtension(E_X205)
-	proto.RegisterExtension(E_X206)
-	proto.RegisterExtension(E_X207)
-	proto.RegisterExtension(E_X208)
-	proto.RegisterExtension(E_X209)
-	proto.RegisterExtension(E_X210)
-	proto.RegisterExtension(E_X211)
-	proto.RegisterExtension(E_X212)
-	proto.RegisterExtension(E_X213)
-	proto.RegisterExtension(E_X214)
-	proto.RegisterExtension(E_X215)
-	proto.RegisterExtension(E_X216)
-	proto.RegisterExtension(E_X217)
-	proto.RegisterExtension(E_X218)
-	proto.RegisterExtension(E_X219)
-	proto.RegisterExtension(E_X220)
-	proto.RegisterExtension(E_X221)
-	proto.RegisterExtension(E_X222)
-	proto.RegisterExtension(E_X223)
-	proto.RegisterExtension(E_X224)
-	proto.RegisterExtension(E_X225)
-	proto.RegisterExtension(E_X226)
-	proto.RegisterExtension(E_X227)
-	proto.RegisterExtension(E_X228)
-	proto.RegisterExtension(E_X229)
-	proto.RegisterExtension(E_X230)
-	proto.RegisterExtension(E_X231)
-	proto.RegisterExtension(E_X232)
-	proto.RegisterExtension(E_X233)
-	proto.RegisterExtension(E_X234)
-	proto.RegisterExtension(E_X235)
-	proto.RegisterExtension(E_X236)
-	proto.RegisterExtension(E_X237)
-	proto.RegisterExtension(E_X238)
-	proto.RegisterExtension(E_X239)
-	proto.RegisterExtension(E_X240)
-	proto.RegisterExtension(E_X241)
-	proto.RegisterExtension(E_X242)
-	proto.RegisterExtension(E_X243)
-	proto.RegisterExtension(E_X244)
-	proto.RegisterExtension(E_X245)
-	proto.RegisterExtension(E_X246)
-	proto.RegisterExtension(E_X247)
-	proto.RegisterExtension(E_X248)
-	proto.RegisterExtension(E_X249)
-	proto.RegisterExtension(E_X250)
-}
-
-func init() { proto.RegisterFile("test.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 4453 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x94, 0x5a, 0xc9, 0x77, 0xdb, 0x48,
-	0x7a, 0x37, 0xc0, 0xfd, 0x23, 0x25, 0x42, 0x65, 0xb5, 0x9b, 0x96, 0xbc, 0xc0, 0x9c, 0xe9, 0x6e,
-	0x7a, 0xd3, 0x48, 0x20, 0x44, 0xdb, 0x74, 0xa7, 0xdf, 0xf3, 0x42, 0xca, 0x7a, 0x63, 0x89, 0x0a,
-	0xa4, 0xee, 0x7e, 0xd3, 0x39, 0xf0, 0x51, 0x22, 0x44, 0xb3, 0x4d, 0x02, 0x34, 0x09, 0xc5, 0x52,
-	0x72, 0xe9, 0x4b, 0x72, 0xcd, 0x76, 0xc9, 0x35, 0xa7, 0x9c, 0x92, 0xbc, 0x97, 0x7f, 0x22, 0xe9,
-	0xee, 0x59, 0x7b, 0xd6, 0xac, 0x93, 0x7d, 0x99, 0xec, 0xdb, 0x4c, 0x92, 0x4b, 0xcf, 0xab, 0xaf,
-	0x0a, 0x40, 0x01, 0x24, 0x20, 0xf9, 0x24, 0x56, 0xd5, 0xef, 0xf7, 0xd5, 0xf6, 0xab, 0xef, 0xab,
-	0xaf, 0x20, 0x00, 0xc7, 0x9c, 0x38, 0x2b, 0xa3, 0xb1, 0xed, 0xd8, 0x24, 0x4b, 0x7f, 0x77, 0x3b,
-	0x4e, 0xa7, 0x7c, 0x1d, 0xd2, 0x1b, 0x76, 0xc3, 0x3a, 0x1a, 0x92, 0xab, 0x90, 0x38, 0xb4, 0xed,
-	0x92, 0xa4, 0xca, 0x95, 0x79, 0x6d, 0x6e, 0xc5, 0x45, 0xac, 0x34, 0x5b, 0x2d, 0x83, 0xb6, 0x94,
-	0xef, 0x40, 0x7e, 0xc3, 0xde, 0x33, 0x27, 0x4e, 0xb3, 0x6f, 0x0e, 0xba, 0x64, 0x11, 0x52, 0x4f,
-	0x3b, 0xfb, 0xe6, 0x00, 0x19, 0x39, 0x83, 0x15, 0x08, 0x81, 0xe4, 0xde, 0xc9, 0xc8, 0x2c, 0xc9,
-	0x58, 0x89, 0xbf, 0xcb, 0xbf, 0x72, 0x85, 0x76, 0x42, 0x99, 0xe4, 0x3a, 0x24, 0xbf, 0xdc, 0xb7,
-	0xba, 0xbc, 0x97, 0xd7, 0xfc, 0x5e, 0x58, 0xfb, 0xca, 0x97, 0x37, 0xb7, 0x1f, 0x1b, 0x08, 0xa1,
-	0xf6, 0xf7, 0x3a, 0xfb, 0x03, 0x6a, 0x4a, 0xa2, 0xf6, 0xb1, 0x40, 0x6b, 0x77, 0x3a, 0xe3, 0xce,
-	0xb0, 0x94, 0x50, 0xa5, 0x4a, 0xca, 0x60, 0x05, 0x72, 0x1f, 0xe6, 0x0c, 0xf3, 0xc5, 0x51, 0x7f,
-	0x6c, 0x76, 0x71, 0x70, 0xa5, 0xa4, 0x2a, 0x57, 0xf2, 0xd3, 0xf6, 0xb1, 0xd1, 0x08, 0x62, 0x19,
-	0x79, 0x64, 0x76, 0x1c, 0x97, 0x9c, 0x52, 0x13, 0xb1, 0x64, 0x01, 0x4b, 0xc9, 0xad, 0x91, 0xd3,
-	0xb7, 0xad, 0xce, 0x80, 0x91, 0xd3, 0xaa, 0x14, 0x43, 0x0e, 0x60, 0xc9, 0x9b, 0x50, 0x6c, 0xb6,
-	0x1f, 0xda, 0xf6, 0xa0, 0x3d, 0xe6, 0x23, 0x2a, 0x81, 0x2a, 0x57, 0xb2, 0xc6, 0x5c, 0x93, 0xd6,
-	0xba, 0xc3, 0x24, 0x15, 0x50, 0x9a, 0xed, 0x4d, 0xcb, 0xa9, 0x6a, 0x3e, 0x30, 0xaf, 0xca, 0x95,
-	0x94, 0x31, 0xdf, 0xc4, 0xea, 0x29, 0x64, 0x4d, 0xf7, 0x91, 0x05, 0x55, 0xae, 0x24, 0x18, 0xb2,
-	0xa6, 0x7b, 0xc8, 0x5b, 0x40, 0x9a, 0xed, 0x66, 0xff, 0xd8, 0xec, 0x8a, 0x56, 0xe7, 0x54, 0xb9,
-	0x92, 0x31, 0x94, 0x26, 0x6f, 0x98, 0x81, 0x16, 0x2d, 0xcf, 0xab, 0x72, 0x25, 0xed, 0xa2, 0x05,
-	0xdb, 0x37, 0x60, 0xa1, 0xd9, 0x7e, 0xb7, 0x1f, 0x1c, 0x70, 0x51, 0x95, 0x2b, 0x73, 0x46, 0xb1,
-	0xc9, 0xea, 0xa7, 0xb1, 0xa2, 0x61, 0x45, 0x95, 0x2b, 0x49, 0x8e, 0x15, 0xec, 0xe2, 0xec, 0x9a,
-	0x03, 0xbb, 0xe3, 0xf8, 0xd0, 0x05, 0x55, 0xae, 0xc8, 0xc6, 0x7c, 0x13, 0xab, 0x83, 0x56, 0x1f,
-	0xdb, 0x47, 0xfb, 0x03, 0xd3, 0x87, 0x12, 0x55, 0xae, 0x48, 0x46, 0xb1, 0xc9, 0xea, 0x83, 0xd8,
-	0x5d, 0x67, 0xdc, 0xb7, 0x7a, 0x3e, 0xf6, 0x3c, 0xea, 0xb7, 0xd8, 0x64, 0xf5, 0xc1, 0x11, 0x3c,
-	0x3c, 0x71, 0xcc, 0x89, 0x0f, 0x35, 0x55, 0xb9, 0x52, 0x30, 0xe6, 0x9b, 0x58, 0x1d, 0xb2, 0x1a,
-	0x5a, 0x83, 0x43, 0x55, 0xae, 0x2c, 0x50, 0xab, 0x33, 0xd6, 0x60, 0x37, 0xb4, 0x06, 0x3d, 0x55,
-	0xae, 0x10, 0x8e, 0x15, 0xd6, 0x40, 0xd4, 0x0c, 0x13, 0x62, 0x69, 0x51, 0x4d, 0x08, 0x9a, 0x61,
-	0x95, 0x41, 0xcd, 0x70, 0xe0, 0x6b, 0x6a, 0x42, 0xd4, 0x4c, 0x08, 0x89, 0x9d, 0x73, 0xe4, 0x05,
-	0x35, 0x21, 0x6a, 0x86, 0x23, 0x43, 0x9a, 0xe1, 0xd8, 0xd7, 0xd5, 0x44, 0x50, 0x33, 0x53, 0x68,
-	0xd1, 0x72, 0x49, 0x4d, 0x04, 0x35, 0xc3, 0xd1, 0x41, 0xcd, 0x70, 0xf0, 0x45, 0x35, 0x11, 0xd0,
-	0x4c, 0x18, 0x2b, 0x1a, 0x5e, 0x52, 0x13, 0x01, 0xcd, 0x88, 0xb3, 0x73, 0x35, 0xc3, 0xa1, 0xcb,
-	0x6a, 0x42, 0xd4, 0x8c, 0x68, 0xd5, 0xd3, 0x0c, 0x87, 0x5e, 0x52, 0x13, 0x01, 0xcd, 0x88, 0x58,
-	0x4f, 0x33, 0x1c, 0x7b, 0x59, 0x4d, 0x04, 0x34, 0xc3, 0xb1, 0xd7, 0x45, 0xcd, 0x70, 0xe8, 0xc7,
-	0x92, 0x9a, 0x10, 0x45, 0xc3, 0xa1, 0x37, 0x03, 0xa2, 0xe1, 0xd8, 0x4f, 0x28, 0x56, 0x54, 0x4d,
-	0x18, 0x2c, 0xae, 0xc2, 0xa7, 0x14, 0x2c, 0xca, 0x86, 0x83, 0x7d, 0xd9, 0xd8, 0xdc, 0x05, 0x95,
-	0xae, 0xa8, 0x92, 0x27, 0x1b, 0xd7, 0x2f, 0x89, 0xb2, 0xf1, 0x80, 0x57, 0xd1, 0xd5, 0x72, 0xd9,
-	0x4c, 0x21, 0x6b, 0xba, 0x8f, 0x54, 0x55, 0xc9, 0x97, 0x8d, 0x87, 0x0c, 0xc8, 0xc6, 0xc3, 0x5e,
-	0x53, 0x25, 0x51, 0x36, 0x33, 0xd0, 0xa2, 0xe5, 0xb2, 0x2a, 0x89, 0xb2, 0xf1, 0xd0, 0xa2, 0x6c,
-	0x3c, 0xf0, 0x17, 0x54, 0x49, 0x90, 0xcd, 0x34, 0x56, 0x34, 0xfc, 0x45, 0x55, 0x12, 0x64, 0x13,
-	0x9c, 0x1d, 0x93, 0x8d, 0x07, 0x7d, 0x43, 0x95, 0x7c, 0xd9, 0x04, 0xad, 0x72, 0xd9, 0x78, 0xd0,
-	0x37, 0x55, 0x49, 0x90, 0x4d, 0x10, 0xcb, 0x65, 0xe3, 0x61, 0xdf, 0xc2, 0xf8, 0xe6, 0xca, 0xc6,
-	0xc3, 0x0a, 0xb2, 0xf1, 0xa0, 0xbf, 0x43, 0x63, 0xa1, 0x27, 0x1b, 0x0f, 0x2a, 0xca, 0xc6, 0xc3,
-	0xfe, 0x2e, 0xc5, 0xfa, 0xb2, 0x99, 0x06, 0x8b, 0xab, 0xf0, 0x7b, 0x14, 0xec, 0xcb, 0xc6, 0x03,
-	0xaf, 0xe0, 0x20, 0xa8, 0x6c, 0xba, 0xe6, 0x61, 0xe7, 0x68, 0x40, 0x25, 0x56, 0xa1, 0xba, 0xa9,
-	0x27, 0x9d, 0xf1, 0x91, 0x49, 0x47, 0x62, 0xdb, 0x83, 0xc7, 0x6e, 0x1b, 0x59, 0xa1, 0xc6, 0x99,
-	0x7c, 0x7c, 0xc2, 0x75, 0xaa, 0x9f, 0xba, 0x5c, 0xd5, 0x8c, 0x22, 0xd3, 0xd0, 0x34, 0xbe, 0xa6,
-	0x0b, 0xf8, 0x1b, 0x54, 0x45, 0x75, 0xb9, 0xa6, 0x33, 0x7c, 0x4d, 0xf7, 0xf1, 0x55, 0x38, 0xef,
-	0x4b, 0xc9, 0x67, 0xdc, 0xa4, 0x5a, 0xaa, 0x27, 0xaa, 0xda, 0xaa, 0xb1, 0xe0, 0x0a, 0x6a, 0x16,
-	0x29, 0xd0, 0xcd, 0x2d, 0x2a, 0xa9, 0x7a, 0xa2, 0xa6, 0x7b, 0x24, 0xb1, 0x27, 0x8d, 0xca, 0x90,
-	0x0b, 0xcb, 0xe7, 0xdc, 0xa6, 0xca, 0xaa, 0x27, 0xab, 0xda, 0xea, 0xaa, 0xa1, 0x70, 0x7d, 0xcd,
-	0xe0, 0x04, 0xfa, 0x59, 0xa1, 0x0a, 0xab, 0x27, 0x6b, 0xba, 0xc7, 0x09, 0xf6, 0xb3, 0xe0, 0x0a,
-	0xcd, 0xa7, 0x7c, 0x89, 0x2a, 0xad, 0x9e, 0xae, 0xae, 0xe9, 0x6b, 0xeb, 0xf7, 0x8c, 0x22, 0x53,
-	0x9c, 0xcf, 0xd1, 0x69, 0x3f, 0x5c, 0x72, 0x3e, 0x69, 0x95, 0x6a, 0xae, 0x9e, 0xd6, 0xee, 0xac,
-	0xdd, 0xd5, 0xee, 0x1a, 0x0a, 0xd7, 0x9e, 0xcf, 0x7a, 0x87, 0xb2, 0xb8, 0xf8, 0x7c, 0xd6, 0x1a,
-	0x55, 0x5f, 0x5d, 0x79, 0x66, 0x0e, 0x06, 0xf6, 0x2d, 0xb5, 0xfc, 0xd2, 0x1e, 0x0f, 0xba, 0xd7,
-	0xca, 0x60, 0x28, 0x5c, 0x8f, 0x62, 0xaf, 0x0b, 0xae, 0x20, 0x7d, 0xfa, 0xaf, 0xd1, 0x7b, 0x58,
-	0xa1, 0x9e, 0x79, 0xd8, 0xef, 0x59, 0xf6, 0xc4, 0x34, 0x8a, 0x4c, 0x9a, 0xa1, 0x35, 0xd9, 0x0d,
-	0xaf, 0xe3, 0xaf, 0x53, 0xda, 0x42, 0x3d, 0x71, 0xbb, 0xaa, 0xd1, 0x9e, 0x66, 0xad, 0xe3, 0x6e,
-	0x78, 0x1d, 0x7f, 0x83, 0x72, 0x48, 0x3d, 0x71, 0xbb, 0xa6, 0x73, 0x8e, 0xb8, 0x8e, 0x77, 0xe0,
-	0x42, 0x28, 0x2e, 0xb6, 0x47, 0x9d, 0x83, 0xe7, 0x66, 0xb7, 0xa4, 0xd1, 0xf0, 0xf8, 0x50, 0x56,
-	0x24, 0xe3, 0x7c, 0x20, 0x44, 0xee, 0x60, 0x33, 0xb9, 0x07, 0xaf, 0x87, 0x03, 0xa5, 0xcb, 0xac,
-	0xd2, 0x78, 0x89, 0xcc, 0xc5, 0x60, 0xcc, 0x0c, 0x51, 0x05, 0x07, 0xec, 0x52, 0x75, 0x1a, 0x40,
-	0x7d, 0xaa, 0xef, 0x89, 0x39, 0xf5, 0x67, 0xe0, 0xe2, 0x74, 0x28, 0x75, 0xc9, 0xeb, 0x34, 0xa2,
-	0x22, 0xf9, 0x42, 0x38, 0xaa, 0x4e, 0xd1, 0x67, 0xf4, 0x5d, 0xa3, 0x21, 0x56, 0xa4, 0x4f, 0xf5,
-	0x7e, 0x1f, 0x4a, 0x53, 0xc1, 0xd6, 0x65, 0xdf, 0xa1, 0x31, 0x17, 0xd9, 0xaf, 0x85, 0xe2, 0x6e,
-	0x98, 0x3c, 0xa3, 0xeb, 0xbb, 0x34, 0x08, 0x0b, 0xe4, 0xa9, 0x9e, 0x71, 0xc9, 0x82, 0xe1, 0xd8,
-	0xe5, 0xde, 0xa3, 0x51, 0x99, 0x2f, 0x59, 0x20, 0x32, 0x8b, 0xfd, 0x86, 0xe2, 0xb3, 0xcb, 0xad,
-	0xd3, 0x30, 0xcd, 0xfb, 0x0d, 0x86, 0x6a, 0x4e, 0x7e, 0x9b, 0x92, 0x77, 0x67, 0xcf, 0xf8, 0xc7,
-	0x09, 0x1a, 0x60, 0x39, 0x7b, 0x77, 0xd6, 0x94, 0x3d, 0xf6, 0x8c, 0x29, 0xff, 0x84, 0xb2, 0x89,
-	0xc0, 0x9e, 0x9a, 0xf3, 0x63, 0x98, 0x73, 0x6f, 0x75, 0xbd, 0xb1, 0x7d, 0x34, 0x2a, 0x35, 0x55,
-	0xb9, 0x02, 0xda, 0x95, 0xa9, 0xec, 0xc7, 0xbd, 0xe4, 0x6d, 0x50, 0x94, 0x11, 0x24, 0x31, 0x2b,
-	0xcc, 0x2e, 0xb3, 0xb2, 0xa3, 0x26, 0x22, 0xac, 0x30, 0x94, 0x67, 0x45, 0x20, 0x51, 0x2b, 0xae,
-	0xd3, 0x67, 0x56, 0x3e, 0x50, 0xa5, 0x99, 0x56, 0xdc, 0x10, 0xc0, 0xad, 0x04, 0x48, 0x4b, 0xeb,
-	0x7e, 0xbe, 0x85, 0xed, 0xe4, 0x8b, 0xe1, 0x04, 0x6c, 0x03, 0xef, 0xcf, 0xc1, 0x4a, 0x46, 0x13,
-	0x06, 0x37, 0x4d, 0xfb, 0xd9, 0x08, 0x5a, 0x60, 0x34, 0xd3, 0xb4, 0x9f, 0x9b, 0x41, 0x2b, 0xff,
-	0xa6, 0x04, 0x49, 0x9a, 0x4f, 0x92, 0x2c, 0x24, 0xdf, 0x6b, 0x6d, 0x3e, 0x56, 0xce, 0xd1, 0x5f,
-	0x0f, 0x5b, 0xad, 0xa7, 0x8a, 0x44, 0x72, 0x90, 0x7a, 0xf8, 0x95, 0xbd, 0xc6, 0xae, 0x22, 0x93,
-	0x22, 0xe4, 0x9b, 0x9b, 0xdb, 0x1b, 0x0d, 0x63, 0xc7, 0xd8, 0xdc, 0xde, 0x53, 0x12, 0xb4, 0xad,
-	0xf9, 0xb4, 0xf5, 0x60, 0x4f, 0x49, 0x92, 0x0c, 0x24, 0x68, 0x5d, 0x8a, 0x00, 0xa4, 0x77, 0xf7,
-	0x8c, 0xcd, 0xed, 0x0d, 0x25, 0x4d, 0xad, 0xec, 0x6d, 0x6e, 0x35, 0x94, 0x0c, 0x45, 0xee, 0xbd,
-	0xbb, 0xf3, 0xb4, 0xa1, 0x64, 0xe9, 0xcf, 0x07, 0x86, 0xf1, 0xe0, 0x2b, 0x4a, 0x8e, 0x92, 0xb6,
-	0x1e, 0xec, 0x28, 0x80, 0xcd, 0x0f, 0x1e, 0x3e, 0x6d, 0x28, 0x79, 0x52, 0x80, 0x6c, 0xf3, 0xdd,
-	0xed, 0x47, 0x7b, 0x9b, 0xad, 0x6d, 0xa5, 0x50, 0x3e, 0x81, 0x12, 0x5b, 0xe6, 0xc0, 0x2a, 0xb2,
-	0xa4, 0xf0, 0x1d, 0x48, 0xb1, 0x9d, 0x91, 0x50, 0x25, 0x95, 0xf0, 0xce, 0x4c, 0x53, 0x56, 0xd8,
-	0x1e, 0x31, 0xda, 0xd2, 0x65, 0x48, 0xb1, 0x55, 0x5a, 0x84, 0x14, 0x5b, 0x1d, 0x19, 0x53, 0x45,
-	0x56, 0x28, 0xff, 0x96, 0x0c, 0xb0, 0x61, 0xef, 0x3e, 0xef, 0x8f, 0x30, 0x21, 0xbf, 0x0c, 0x30,
-	0x79, 0xde, 0x1f, 0xb5, 0x51, 0xf5, 0x3c, 0xa9, 0xcc, 0xd1, 0x1a, 0xf4, 0x77, 0xe4, 0x1a, 0x14,
-	0xb0, 0xf9, 0x90, 0x79, 0x21, 0xcc, 0x25, 0x33, 0x46, 0x9e, 0xd6, 0x71, 0xc7, 0x14, 0x84, 0xd4,
-	0x74, 0x4c, 0x21, 0xd3, 0x02, 0xa4, 0xa6, 0x93, 0xab, 0x80, 0xc5, 0xf6, 0x04, 0x23, 0x0a, 0xa6,
-	0x8d, 0x39, 0x03, 0xfb, 0x65, 0x31, 0x86, 0xbc, 0x0d, 0xd8, 0x27, 0x9b, 0x77, 0x71, 0xfa, 0x74,
-	0xb8, 0xc3, 0x5d, 0xa1, 0x3f, 0xd8, 0x6c, 0x7d, 0xc2, 0x52, 0x0b, 0x72, 0x5e, 0x3d, 0xed, 0x0b,
-	0x6b, 0xf9, 0x8c, 0x14, 0x9c, 0x11, 0x60, 0x95, 0x37, 0x25, 0x06, 0xe0, 0xa3, 0x59, 0xc0, 0xd1,
-	0x30, 0x12, 0x1b, 0x4e, 0xf9, 0x32, 0xcc, 0x6d, 0xdb, 0x16, 0x3b, 0xbd, 0xb8, 0x4a, 0x05, 0x90,
-	0x3a, 0x25, 0x09, 0xb3, 0x27, 0xa9, 0x53, 0xbe, 0x02, 0x20, 0xb4, 0x29, 0x20, 0xed, 0xb3, 0x36,
-	0xf4, 0x01, 0xd2, 0x7e, 0xf9, 0x26, 0xa4, 0xb7, 0x3a, 0xc7, 0x7b, 0x9d, 0x1e, 0xb9, 0x06, 0x30,
-	0xe8, 0x4c, 0x9c, 0xf6, 0x21, 0xee, 0xc3, 0xe7, 0x9f, 0x7f, 0xfe, 0xb9, 0x84, 0x97, 0xbd, 0x1c,
-	0xad, 0x65, 0xfb, 0xf1, 0x02, 0xa0, 0x35, 0xe8, 0x6e, 0x99, 0x93, 0x49, 0xa7, 0x67, 0x92, 0x2a,
-	0xa4, 0x2d, 0x73, 0x42, 0xa3, 0x9d, 0x84, 0xef, 0x08, 0xcb, 0xfe, 0x2a, 0xf8, 0xa8, 0x95, 0x6d,
-	0x84, 0x18, 0x1c, 0x4a, 0x14, 0x48, 0x58, 0x47, 0x43, 0x7c, 0x27, 0x49, 0x19, 0xf4, 0xe7, 0xd2,
-	0x25, 0x48, 0x33, 0x0c, 0x21, 0x90, 0xb4, 0x3a, 0x43, 0xb3, 0xc4, 0xfa, 0xc5, 0xdf, 0xe5, 0x5f,
-	0x95, 0x00, 0xb6, 0xcd, 0x97, 0x67, 0xe8, 0xd3, 0x47, 0xc5, 0xf4, 0x99, 0x60, 0x7d, 0xde, 0x8f,
-	0xeb, 0x93, 0xea, 0xec, 0xd0, 0xb6, 0xbb, 0x6d, 0xb6, 0xc5, 0xec, 0x49, 0x27, 0x47, 0x6b, 0x70,
-	0xd7, 0xca, 0x1f, 0x40, 0x61, 0xd3, 0xb2, 0xcc, 0xb1, 0x3b, 0x26, 0x02, 0xc9, 0x67, 0xf6, 0xc4,
-	0xe1, 0x6f, 0x4b, 0xf8, 0x9b, 0x94, 0x20, 0x39, 0xb2, 0xc7, 0x0e, 0x9b, 0x67, 0x3d, 0xa9, 0xaf,
-	0xae, 0xae, 0x1a, 0x58, 0x43, 0x2e, 0x41, 0xee, 0xc0, 0xb6, 0x2c, 0xf3, 0x80, 0x4e, 0x22, 0x81,
-	0x69, 0x8d, 0x5f, 0x51, 0xfe, 0x65, 0x09, 0x0a, 0x2d, 0xe7, 0x99, 0x6f, 0x5c, 0x81, 0xc4, 0x73,
-	0xf3, 0x04, 0x87, 0x97, 0x30, 0xe8, 0x4f, 0x7a, 0x54, 0x7e, 0xbe, 0x33, 0x38, 0x62, 0x6f, 0x4d,
-	0x05, 0x83, 0x15, 0xc8, 0x05, 0x48, 0xbf, 0x34, 0xfb, 0xbd, 0x67, 0x0e, 0xda, 0x94, 0x0d, 0x5e,
-	0x22, 0xb7, 0x20, 0xd5, 0xa7, 0x83, 0x2d, 0x25, 0x71, 0xbd, 0x2e, 0xf8, 0xeb, 0x25, 0xce, 0xc1,
-	0x60, 0xa0, 0x1b, 0xd9, 0x6c, 0x57, 0xf9, 0xe8, 0xa3, 0x8f, 0x3e, 0x92, 0xcb, 0x87, 0xb0, 0xe8,
-	0x1e, 0xde, 0xc0, 0x64, 0xb7, 0xa1, 0x34, 0x30, 0xed, 0xf6, 0x61, 0xdf, 0xea, 0x0c, 0x06, 0x27,
-	0xed, 0x97, 0xb6, 0xd5, 0xee, 0x58, 0x6d, 0x7b, 0x72, 0xd0, 0x19, 0xe3, 0x02, 0x44, 0x77, 0xb1,
-	0x38, 0x30, 0xed, 0x26, 0xa3, 0xbd, 0x6f, 0x5b, 0x0f, 0xac, 0x16, 0xe5, 0x94, 0xff, 0x20, 0x09,
-	0xb9, 0xad, 0x13, 0xd7, 0xfa, 0x22, 0xa4, 0x0e, 0xec, 0x23, 0x8b, 0xad, 0x65, 0xca, 0x60, 0x05,
-	0x6f, 0x8f, 0x64, 0x61, 0x8f, 0x16, 0x21, 0xf5, 0xe2, 0xc8, 0x76, 0x4c, 0x9c, 0x6e, 0xce, 0x60,
-	0x05, 0xba, 0x5a, 0x23, 0xd3, 0x29, 0x25, 0x31, 0xb9, 0xa5, 0x3f, 0xfd, 0xf9, 0xa7, 0xce, 0x30,
-	0x7f, 0xb2, 0x02, 0x69, 0x9b, 0xae, 0xfe, 0xa4, 0x94, 0xc6, 0x77, 0x35, 0x01, 0x2e, 0xee, 0x8a,
-	0xc1, 0x51, 0x64, 0x13, 0x16, 0x5e, 0x9a, 0xed, 0xe1, 0xd1, 0xc4, 0x69, 0xf7, 0xec, 0x76, 0xd7,
-	0x34, 0x47, 0xe6, 0xb8, 0x34, 0x87, 0x3d, 0x09, 0x3e, 0x61, 0xd6, 0x42, 0x1a, 0xf3, 0x2f, 0xcd,
-	0xad, 0xa3, 0x89, 0xb3, 0x61, 0x3f, 0x46, 0x16, 0xa9, 0x42, 0x6e, 0x6c, 0x52, 0x4f, 0x40, 0x07,
-	0x5b, 0x08, 0xf7, 0x1e, 0xa0, 0x66, 0xc7, 0xe6, 0x08, 0x2b, 0xc8, 0x3a, 0x64, 0xf7, 0xfb, 0xcf,
-	0xcd, 0xc9, 0x33, 0xb3, 0x5b, 0xca, 0xa8, 0x52, 0x65, 0x5e, 0xbb, 0xe8, 0x73, 0xbc, 0x65, 0x5d,
-	0x79, 0x64, 0x0f, 0xec, 0xb1, 0xe1, 0x41, 0xc9, 0x7d, 0xc8, 0x4d, 0xec, 0xa1, 0xc9, 0xf4, 0x9d,
-	0xc5, 0xa0, 0x7a, 0x79, 0x16, 0x6f, 0xd7, 0x1e, 0x9a, 0xae, 0x07, 0x73, 0xf1, 0x64, 0x99, 0x0d,
-	0x74, 0x9f, 0x5e, 0x9d, 0x4b, 0x80, 0x4f, 0x03, 0x74, 0x40, 0x78, 0x95, 0x26, 0x4b, 0x74, 0x40,
-	0xbd, 0x43, 0x7a, 0x23, 0x2a, 0xe5, 0x31, 0xaf, 0xf4, 0xca, 0x4b, 0xb7, 0x20, 0xe7, 0x19, 0xf4,
-	0x5d, 0x1f, 0x73, 0x37, 0x39, 0xf4, 0x07, 0xcc, 0xf5, 0x31, 0x5f, 0xf3, 0x06, 0xa4, 0x70, 0xd8,
-	0x34, 0x42, 0x19, 0x0d, 0x1a, 0x10, 0x73, 0x90, 0xda, 0x30, 0x1a, 0x8d, 0x6d, 0x45, 0xc2, 0xd8,
-	0xf8, 0xf4, 0xdd, 0x86, 0x22, 0x0b, 0x8a, 0xfd, 0x6d, 0x09, 0x12, 0x8d, 0x63, 0x54, 0x0b, 0x9d,
-	0x86, 0x7b, 0xa2, 0xe9, 0x6f, 0xad, 0x06, 0xc9, 0xa1, 0x3d, 0x36, 0xc9, 0xf9, 0x19, 0xb3, 0x2c,
-	0xf5, 0x70, 0xbf, 0x84, 0x57, 0xe4, 0xc6, 0xb1, 0x63, 0x20, 0x5e, 0x7b, 0x0b, 0x92, 0x8e, 0x79,
-	0xec, 0xcc, 0xe6, 0x3d, 0x63, 0x1d, 0x50, 0x80, 0x76, 0x13, 0xd2, 0xd6, 0xd1, 0x70, 0xdf, 0x1c,
-	0xcf, 0x86, 0xf6, 0x71, 0x7a, 0x1c, 0x52, 0x7e, 0x0f, 0x94, 0x47, 0xf6, 0x70, 0x34, 0x30, 0x8f,
-	0x1b, 0xc7, 0x8e, 0x69, 0x4d, 0xfa, 0xb6, 0x45, 0xf5, 0x7c, 0xd8, 0x1f, 0xa3, 0x17, 0xc1, 0xb7,
-	0x62, 0x2c, 0xd0, 0x53, 0x3d, 0x31, 0x0f, 0x6c, 0xab, 0xcb, 0x1d, 0x26, 0x2f, 0x51, 0xb4, 0xf3,
-	0xac, 0x3f, 0xa6, 0x0e, 0x84, 0xfa, 0x79, 0x56, 0x28, 0x6f, 0x40, 0x91, 0xe7, 0x18, 0x13, 0xde,
-	0x71, 0xf9, 0x06, 0x14, 0xdc, 0x2a, 0x7c, 0x38, 0xcf, 0x42, 0xf2, 0x83, 0x86, 0xd1, 0x52, 0xce,
-	0xd1, 0x65, 0x6d, 0x6d, 0x37, 0x14, 0x89, 0xfe, 0xd8, 0x7b, 0xbf, 0x15, 0x58, 0xca, 0x4b, 0x50,
-	0xf0, 0xc6, 0xbe, 0x6b, 0x3a, 0xd8, 0x42, 0x03, 0x42, 0xa6, 0x2e, 0x67, 0xa5, 0x72, 0x06, 0x52,
-	0x8d, 0xe1, 0xc8, 0x39, 0x29, 0xff, 0x22, 0xe4, 0x39, 0xe8, 0x69, 0x7f, 0xe2, 0x90, 0x3b, 0x90,
-	0x19, 0xf2, 0xf9, 0x4a, 0x78, 0xdd, 0x13, 0x35, 0xe5, 0xe3, 0xdc, 0xdf, 0x86, 0x8b, 0x5e, 0xaa,
-	0x42, 0x46, 0xf0, 0xa5, 0xfc, 0xa8, 0xcb, 0xe2, 0x51, 0x67, 0x4e, 0x21, 0x21, 0x38, 0x85, 0xf2,
-	0x16, 0x64, 0x58, 0x04, 0x9c, 0x60, 0x54, 0x67, 0xa9, 0x22, 0x13, 0x13, 0xdb, 0xf9, 0x3c, 0xab,
-	0x63, 0x17, 0x95, 0xab, 0x90, 0x47, 0xc1, 0x72, 0x04, 0x73, 0x9d, 0x80, 0x55, 0x4c, 0x6e, 0xbf,
-	0x9f, 0x82, 0xac, 0xbb, 0x52, 0x64, 0x19, 0xd2, 0x2c, 0x3f, 0x43, 0x53, 0xee, 0xfb, 0x41, 0x0a,
-	0x33, 0x32, 0xb2, 0x0c, 0x19, 0x9e, 0x83, 0x71, 0xef, 0x2e, 0x57, 0x35, 0x23, 0xcd, 0x72, 0x2e,
-	0xaf, 0xb1, 0xa6, 0xa3, 0x63, 0x62, 0x2f, 0x03, 0x69, 0x96, 0x55, 0x11, 0x15, 0x72, 0x5e, 0x1e,
-	0x85, 0xfe, 0x98, 0x3f, 0x03, 0x64, 0xdd, 0xc4, 0x49, 0x40, 0xd4, 0x74, 0xf4, 0x58, 0x3c, 0xe7,
-	0xcf, 0x36, 0xfd, 0xeb, 0x49, 0xd6, 0xcd, 0x86, 0xf0, 0xf9, 0xde, 0x4d, 0xf0, 0x33, 0x3c, 0xff,
-	0xf1, 0x01, 0x35, 0x1d, 0x5d, 0x82, 0x9b, 0xcd, 0x67, 0x78, 0x8e, 0x43, 0xae, 0xd2, 0x21, 0x62,
-	0xce, 0x82, 0x47, 0xdf, 0x4f, 0xdd, 0xd3, 0x2c, 0x93, 0x21, 0xd7, 0xa8, 0x05, 0x96, 0x98, 0xe0,
-	0xb9, 0xf4, 0xf3, 0xf4, 0x0c, 0xcf, 0x57, 0xc8, 0x4d, 0x0a, 0x61, 0xcb, 0x5f, 0x82, 0x88, 0xa4,
-	0x3c, 0xc3, 0x93, 0x72, 0xa2, 0xd2, 0x0e, 0xd1, 0x3d, 0xa0, 0x4b, 0x10, 0x12, 0xf0, 0x34, 0x4b,
-	0xc0, 0xc9, 0x15, 0x34, 0xc7, 0x26, 0x55, 0xf0, 0x93, 0xed, 0x0c, 0x4f, 0x70, 0xfc, 0x76, 0xbc,
-	0xb2, 0x79, 0x89, 0x75, 0x86, 0xa7, 0x30, 0xa4, 0x46, 0xf7, 0x8b, 0xea, 0xbb, 0x34, 0x8f, 0x4e,
-	0xb0, 0xe4, 0x0b, 0xcf, 0xdd, 0x53, 0xe6, 0x03, 0xeb, 0xcc, 0x83, 0x18, 0xa9, 0x26, 0x9e, 0x86,
-	0x25, 0xca, 0xdb, 0xe9, 0x5b, 0x87, 0xa5, 0x22, 0xae, 0x44, 0xa2, 0x6f, 0x1d, 0x1a, 0xa9, 0x26,
-	0xad, 0x61, 0x1a, 0xd8, 0xa6, 0x6d, 0x0a, 0xb6, 0x25, 0x6f, 0xb3, 0x46, 0x5a, 0x45, 0x4a, 0x90,
-	0x6a, 0xb6, 0xb7, 0x3b, 0x56, 0x69, 0x81, 0xf1, 0xac, 0x8e, 0x65, 0x24, 0x9b, 0xdb, 0x1d, 0x8b,
-	0xbc, 0x05, 0x89, 0xc9, 0xd1, 0x7e, 0x89, 0x84, 0xbf, 0xac, 0xec, 0x1e, 0xed, 0xbb, 0x43, 0x31,
-	0x28, 0x82, 0x2c, 0x43, 0x76, 0xe2, 0x8c, 0xdb, 0xbf, 0x60, 0x8e, 0xed, 0xd2, 0x79, 0x5c, 0xc2,
-	0x73, 0x46, 0x66, 0xe2, 0x8c, 0x3f, 0x30, 0xc7, 0xf6, 0x19, 0x9d, 0x5f, 0xf9, 0x0a, 0xe4, 0x05,
-	0xbb, 0xa4, 0x08, 0x92, 0xc5, 0x6e, 0x0a, 0x75, 0xe9, 0x8e, 0x21, 0x59, 0xe5, 0x3d, 0x28, 0xb8,
-	0x39, 0x0c, 0xce, 0x57, 0xa3, 0x27, 0x69, 0x60, 0x8f, 0xf1, 0x7c, 0xce, 0x6b, 0x97, 0xc4, 0x10,
-	0xe5, 0xc3, 0x78, 0xb8, 0x60, 0xd0, 0xb2, 0x12, 0x1a, 0x8a, 0x54, 0xfe, 0xa1, 0x04, 0x85, 0x2d,
-	0x7b, 0xec, 0x3f, 0x30, 0x2f, 0x42, 0x6a, 0xdf, 0xb6, 0x07, 0x13, 0x34, 0x9b, 0x35, 0x58, 0x81,
-	0xbc, 0x01, 0x05, 0xfc, 0xe1, 0xe6, 0x9e, 0xb2, 0xf7, 0xb4, 0x91, 0xc7, 0x7a, 0x9e, 0x70, 0x12,
-	0x48, 0xf6, 0x2d, 0x67, 0xc2, 0x3d, 0x19, 0xfe, 0x26, 0x5f, 0x80, 0x3c, 0xfd, 0xeb, 0x32, 0x93,
-	0xde, 0x85, 0x15, 0x68, 0x35, 0x27, 0xbe, 0x05, 0x73, 0xb8, 0xfb, 0x1e, 0x2c, 0xe3, 0x3d, 0x63,
-	0x14, 0x58, 0x03, 0x07, 0x96, 0x20, 0xc3, 0x5c, 0xc1, 0x04, 0xbf, 0x96, 0xe5, 0x0c, 0xb7, 0x48,
-	0xdd, 0x2b, 0x66, 0x02, 0x2c, 0xdc, 0x67, 0x0c, 0x5e, 0x2a, 0x3f, 0x80, 0x2c, 0x46, 0xa9, 0xd6,
-	0xa0, 0x4b, 0xca, 0x20, 0xf5, 0x4a, 0x26, 0xc6, 0xc8, 0x45, 0xe1, 0x9a, 0xcf, 0x9b, 0x57, 0x36,
-	0x0c, 0xa9, 0xb7, 0xb4, 0x00, 0xd2, 0x06, 0xbd, 0x77, 0x1f, 0x73, 0x37, 0x2d, 0x1d, 0x97, 0x5b,
-	0xdc, 0xc4, 0xb6, 0xf9, 0x32, 0xce, 0xc4, 0xb6, 0xf9, 0x92, 0x99, 0xb8, 0x3a, 0x65, 0x82, 0x96,
-	0x4e, 0xf8, 0xa7, 0x43, 0xe9, 0xa4, 0x5c, 0x85, 0x39, 0x3c, 0x9e, 0x7d, 0xab, 0xb7, 0x63, 0xf7,
-	0x2d, 0xbc, 0xe7, 0x1f, 0xe2, 0x3d, 0x49, 0x32, 0xa4, 0x43, 0xba, 0x07, 0xe6, 0x71, 0xe7, 0x80,
-	0xdd, 0x38, 0xb3, 0x06, 0x2b, 0x94, 0x3f, 0x4b, 0xc2, 0x3c, 0x77, 0xad, 0xef, 0xf7, 0x9d, 0x67,
-	0x5b, 0x9d, 0x11, 0x79, 0x0a, 0x05, 0xea, 0x55, 0xdb, 0xc3, 0xce, 0x68, 0x44, 0x8f, 0xaf, 0x84,
-	0x57, 0x8d, 0xeb, 0x53, 0xae, 0x9a, 0xe3, 0x57, 0xb6, 0x3b, 0x43, 0x73, 0x8b, 0x61, 0x1b, 0x96,
-	0x33, 0x3e, 0x31, 0xf2, 0x96, 0x5f, 0x43, 0x36, 0x21, 0x3f, 0x9c, 0xf4, 0x3c, 0x63, 0x32, 0x1a,
-	0xab, 0x44, 0x1a, 0xdb, 0x9a, 0xf4, 0x02, 0xb6, 0x60, 0xe8, 0x55, 0xd0, 0x81, 0x51, 0x7f, 0xec,
-	0xd9, 0x4a, 0x9c, 0x32, 0x30, 0xea, 0x3a, 0x82, 0x03, 0xdb, 0xf7, 0x6b, 0xc8, 0x63, 0x00, 0x7a,
-	0xbc, 0x1c, 0x9b, 0xa6, 0x4e, 0xa8, 0xa0, 0xbc, 0xf6, 0x66, 0xa4, 0xad, 0x5d, 0x67, 0xbc, 0x67,
-	0xef, 0x3a, 0x63, 0x66, 0x88, 0x1e, 0x4c, 0x2c, 0x2e, 0xbd, 0x03, 0x4a, 0x78, 0xfe, 0xe2, 0x8d,
-	0x3c, 0x35, 0xe3, 0x46, 0x9e, 0xe3, 0x37, 0xf2, 0xba, 0x7c, 0x57, 0x5a, 0x7a, 0x0f, 0x8a, 0xa1,
-	0x29, 0x8b, 0x74, 0xc2, 0xe8, 0xb7, 0x45, 0x7a, 0x5e, 0x7b, 0x5d, 0xf8, 0x9c, 0x2d, 0x6e, 0xb8,
-	0x68, 0xf7, 0x1d, 0x50, 0xc2, 0xd3, 0x17, 0x0d, 0x67, 0x63, 0x32, 0x05, 0xe4, 0xdf, 0x87, 0xb9,
-	0xc0, 0x94, 0x45, 0x72, 0xee, 0x94, 0x49, 0x95, 0x7f, 0x29, 0x05, 0xa9, 0x96, 0x65, 0xda, 0x87,
-	0xe4, 0xf5, 0x60, 0x9c, 0x7c, 0x72, 0xce, 0x8d, 0x91, 0x17, 0x43, 0x31, 0xf2, 0xc9, 0x39, 0x2f,
-	0x42, 0x5e, 0x0c, 0x45, 0x48, 0xb7, 0xa9, 0xa6, 0x93, 0xcb, 0x53, 0xf1, 0xf1, 0xc9, 0x39, 0x21,
-	0x38, 0x5e, 0x9e, 0x0a, 0x8e, 0x7e, 0x73, 0x4d, 0xa7, 0x0e, 0x35, 0x18, 0x19, 0x9f, 0x9c, 0xf3,
-	0xa3, 0xe2, 0x72, 0x38, 0x2a, 0x7a, 0x8d, 0x35, 0x9d, 0x0d, 0x49, 0x88, 0x88, 0x38, 0x24, 0x16,
-	0x0b, 0x97, 0xc3, 0xb1, 0x10, 0x79, 0x3c, 0x0a, 0x2e, 0x87, 0xa3, 0x20, 0x36, 0xf2, 0xa8, 0x77,
-	0x31, 0x14, 0xf5, 0xd0, 0x28, 0x0b, 0x77, 0xcb, 0xe1, 0x70, 0xc7, 0x78, 0xc2, 0x48, 0xc5, 0x58,
-	0xe7, 0x35, 0xd6, 0x74, 0xa2, 0x85, 0x02, 0x5d, 0xf4, 0x6d, 0x1f, 0xf7, 0x02, 0x9d, 0xbe, 0x4e,
-	0x97, 0xcd, 0xbd, 0x88, 0x16, 0x63, 0xbe, 0xf8, 0xe3, 0x6a, 0xba, 0x17, 0x31, 0x0d, 0x32, 0x87,
-	0x3c, 0x01, 0x56, 0xd0, 0x73, 0x09, 0xb2, 0xc4, 0xcd, 0x5f, 0x69, 0xb6, 0xd1, 0x83, 0xd1, 0x79,
-	0x1d, 0xb2, 0x3b, 0x7d, 0x05, 0xe6, 0x9a, 0xed, 0xa7, 0x9d, 0x71, 0xcf, 0x9c, 0x38, 0xed, 0xbd,
-	0x4e, 0xcf, 0x7b, 0x44, 0xa0, 0xfb, 0x9f, 0x6f, 0xf2, 0x96, 0xbd, 0x4e, 0x8f, 0x5c, 0x70, 0xc5,
-	0xd5, 0xc5, 0x56, 0x89, 0xcb, 0x6b, 0xe9, 0x75, 0xba, 0x68, 0xcc, 0x18, 0xfa, 0xc2, 0x05, 0xee,
-	0x0b, 0x1f, 0x66, 0x20, 0x75, 0x64, 0xf5, 0x6d, 0xeb, 0x61, 0x0e, 0x32, 0x8e, 0x3d, 0x1e, 0x76,
-	0x1c, 0xbb, 0xfc, 0x23, 0x09, 0xe0, 0x91, 0x3d, 0x1c, 0x1e, 0x59, 0xfd, 0x17, 0x47, 0x26, 0xb9,
-	0x02, 0xf9, 0x61, 0xe7, 0xb9, 0xd9, 0x1e, 0x9a, 0xed, 0x83, 0xb1, 0x7b, 0x0e, 0x72, 0xb4, 0x6a,
-	0xcb, 0x7c, 0x34, 0x3e, 0x21, 0x25, 0xf7, 0x8a, 0x8e, 0xda, 0x41, 0x49, 0xf2, 0x2b, 0xfb, 0x22,
-	0xbf, 0x74, 0xa6, 0xf9, 0x1e, 0xba, 0xd7, 0x4e, 0x96, 0x47, 0x64, 0xf8, 0xee, 0x61, 0x89, 0x4a,
-	0xde, 0x31, 0x87, 0xa3, 0xf6, 0x01, 0x4a, 0x85, 0xca, 0x21, 0x45, 0xcb, 0x8f, 0xc8, 0x6d, 0x48,
-	0x1c, 0xd8, 0x03, 0x14, 0xc9, 0x29, 0xfb, 0x42, 0x71, 0xe4, 0x0d, 0x48, 0x0c, 0x27, 0x4c, 0x36,
-	0x79, 0x6d, 0x41, 0xb8, 0x27, 0xb0, 0xd0, 0x44, 0x61, 0xc3, 0x49, 0xcf, 0x9b, 0xf7, 0x8d, 0x22,
-	0x24, 0x9a, 0xad, 0x16, 0x8d, 0xfd, 0xcd, 0x56, 0x6b, 0x4d, 0x91, 0xea, 0x5f, 0x82, 0x6c, 0x6f,
-	0x6c, 0x9a, 0xd4, 0x3d, 0xcc, 0xce, 0x39, 0x3e, 0xc4, 0x58, 0xe7, 0x81, 0xea, 0x5b, 0x90, 0x39,
-	0x60, 0x59, 0x07, 0x89, 0x48, 0x6b, 0x4b, 0x7f, 0xc8, 0x1e, 0x55, 0x96, 0xfc, 0xe6, 0x70, 0x9e,
-	0x62, 0xb8, 0x36, 0xea, 0x3b, 0x90, 0x1b, 0xb7, 0x4f, 0x33, 0xf8, 0x31, 0x8b, 0x2e, 0x71, 0x06,
-	0xb3, 0x63, 0x5e, 0x55, 0x6f, 0xc0, 0x82, 0x65, 0xbb, 0xdf, 0x50, 0xda, 0x5d, 0x76, 0xc6, 0x2e,
-	0x4e, 0x5f, 0xe5, 0x5c, 0xe3, 0x26, 0xfb, 0x6e, 0x69, 0xd9, 0xbc, 0x81, 0x9d, 0xca, 0xfa, 0x23,
-	0x50, 0x04, 0x33, 0x98, 0x7a, 0xc6, 0x59, 0x39, 0x64, 0x1f, 0x4a, 0x3d, 0x2b, 0x78, 0xee, 0x43,
-	0x46, 0xd8, 0xc9, 0x8c, 0x31, 0xd2, 0x63, 0x5f, 0x9d, 0x3d, 0x23, 0xe8, 0xea, 0xa6, 0x8d, 0x50,
-	0x5f, 0x13, 0x6d, 0xe4, 0x19, 0xfb, 0x20, 0x2d, 0x1a, 0xa9, 0xe9, 0xa1, 0x55, 0x39, 0x3a, 0x75,
-	0x28, 0x7d, 0xf6, 0x3d, 0xd9, 0xb3, 0xc2, 0x1c, 0xe0, 0x0c, 0x33, 0xf1, 0x83, 0xf9, 0x90, 0x7d,
-	0x6a, 0x0e, 0x98, 0x99, 0x1a, 0xcd, 0xe4, 0xd4, 0xd1, 0x3c, 0x67, 0xdf, 0x75, 0x3d, 0x33, 0xbb,
-	0xb3, 0x46, 0x33, 0x39, 0x75, 0x34, 0x03, 0xf6, 0xc5, 0x37, 0x60, 0xa6, 0xa6, 0xd7, 0x37, 0x80,
-	0x88, 0x5b, 0xcd, 0xe3, 0x44, 0x8c, 0x9d, 0x21, 0xfb, 0x8e, 0xef, 0x6f, 0x36, 0xa3, 0xcc, 0x32,
-	0x14, 0x3f, 0x20, 0x8b, 0x7d, 0xe2, 0x0f, 0x1a, 0xaa, 0xe9, 0xf5, 0x4d, 0x38, 0x2f, 0x4e, 0xec,
-	0x0c, 0x43, 0xb2, 0x55, 0xa9, 0x52, 0x34, 0x16, 0xfc, 0xa9, 0x71, 0xce, 0x4c, 0x53, 0xf1, 0x83,
-	0x1a, 0xa9, 0x52, 0x45, 0x99, 0x32, 0x55, 0xd3, 0xeb, 0x0f, 0xa0, 0x28, 0x98, 0xda, 0xc7, 0x08,
-	0x1d, 0x6d, 0xe6, 0x05, 0xfb, 0x5f, 0x0b, 0xcf, 0x0c, 0x8d, 0xe8, 0xe1, 0x1d, 0xe3, 0x31, 0x2e,
-	0xda, 0xc8, 0x98, 0xfd, 0xa3, 0x80, 0x3f, 0x16, 0x64, 0x84, 0x8e, 0x04, 0xe6, 0xdf, 0x71, 0x56,
-	0x26, 0xec, 0x5f, 0x08, 0xfc, 0xa1, 0x50, 0x42, 0xbd, 0x1f, 0x98, 0x8e, 0x49, 0x83, 0x5c, 0x8c,
-	0x0d, 0x07, 0x3d, 0xf2, 0x9b, 0x91, 0x80, 0x15, 0xf1, 0x81, 0x44, 0x98, 0x36, 0x2d, 0xd6, 0x37,
-	0x61, 0xfe, 0xec, 0x0e, 0xe9, 0x63, 0x89, 0x65, 0xcb, 0xd5, 0x15, 0x9a, 0x50, 0x1b, 0x73, 0xdd,
-	0x80, 0x5f, 0x6a, 0xc0, 0xdc, 0x99, 0x9d, 0xd2, 0x27, 0x12, 0xcb, 0x39, 0xa9, 0x25, 0xa3, 0xd0,
-	0x0d, 0x7a, 0xa6, 0xb9, 0x33, 0xbb, 0xa5, 0x4f, 0x25, 0xf6, 0x40, 0xa1, 0x6b, 0x9e, 0x11, 0xd7,
-	0x33, 0xcd, 0x9d, 0xd9, 0x2d, 0x7d, 0x95, 0x65, 0x94, 0xb2, 0x5e, 0x15, 0x8d, 0xa0, 0x2f, 0x98,
-	0x3f, 0xbb, 0x5b, 0xfa, 0x9a, 0x84, 0x8f, 0x15, 0xb2, 0xae, 0x7b, 0xeb, 0xe2, 0x79, 0xa6, 0xf9,
-	0xb3, 0xbb, 0xa5, 0xaf, 0x4b, 0xf8, 0xa4, 0x21, 0xeb, 0xeb, 0x01, 0x33, 0xc1, 0xd1, 0x9c, 0xee,
-	0x96, 0xbe, 0x21, 0xe1, 0x2b, 0x83, 0xac, 0xd7, 0x3c, 0x33, 0xbb, 0x53, 0xa3, 0x39, 0xdd, 0x2d,
-	0x7d, 0x13, 0x6f, 0xf1, 0x75, 0x59, 0xbf, 0x13, 0x30, 0x83, 0x9e, 0xa9, 0xf8, 0x0a, 0x6e, 0xe9,
-	0x5b, 0x12, 0x3e, 0x06, 0xc9, 0xfa, 0x5d, 0xc3, 0xed, 0xdd, 0xf7, 0x4c, 0xc5, 0x57, 0x70, 0x4b,
-	0x9f, 0x49, 0xf8, 0x66, 0x24, 0xeb, 0xf7, 0x82, 0x86, 0xd0, 0x33, 0x29, 0xaf, 0xe2, 0x96, 0xbe,
-	0x4d, 0x2d, 0x15, 0xeb, 0xf2, 0xfa, 0xaa, 0xe1, 0x0e, 0x40, 0xf0, 0x4c, 0xca, 0xab, 0xb8, 0xa5,
-	0xef, 0x50, 0x53, 0x4a, 0x5d, 0x5e, 0x5f, 0x0b, 0x99, 0xaa, 0xe9, 0xf5, 0x47, 0x50, 0x38, 0xab,
-	0x5b, 0xfa, 0xae, 0xf8, 0x16, 0x97, 0xef, 0x0a, 0xbe, 0x69, 0x47, 0xd8, 0xb3, 0x53, 0x1d, 0xd3,
-	0xf7, 0x30, 0xc7, 0xa9, 0xcf, 0x3d, 0x61, 0xef, 0x55, 0x8c, 0xe0, 0x6f, 0x1f, 0x73, 0x53, 0x5b,
-	0xfe, 0xf9, 0x38, 0xd5, 0x47, 0x7d, 0x5f, 0xc2, 0x47, 0xad, 0x02, 0x37, 0x88, 0x78, 0xef, 0xa4,
-	0x30, 0x87, 0xf5, 0xa1, 0x3f, 0xcb, 0xd3, 0xbc, 0xd5, 0x0f, 0xa4, 0x57, 0x71, 0x57, 0xf5, 0x44,
-	0x6b, 0xbb, 0xe1, 0x2d, 0x06, 0xd6, 0xbc, 0x0d, 0xc9, 0x63, 0x6d, 0x75, 0x4d, 0xbc, 0x92, 0x89,
-	0x6f, 0xb9, 0xcc, 0x49, 0xe5, 0xb5, 0xa2, 0xf0, 0xdc, 0x3d, 0x1c, 0x39, 0x27, 0x06, 0xb2, 0x38,
-	0x5b, 0x8b, 0x64, 0x7f, 0x12, 0xc3, 0xd6, 0x38, 0xbb, 0x1a, 0xc9, 0xfe, 0x34, 0x86, 0x5d, 0xe5,
-	0x6c, 0x3d, 0x92, 0xfd, 0xd5, 0x18, 0xb6, 0xce, 0xd9, 0xeb, 0x91, 0xec, 0xaf, 0xc5, 0xb0, 0xd7,
-	0x39, 0xbb, 0x16, 0xc9, 0xfe, 0x7a, 0x0c, 0xbb, 0xc6, 0xd9, 0x77, 0x22, 0xd9, 0xdf, 0x88, 0x61,
-	0xdf, 0xe1, 0xec, 0xbb, 0x91, 0xec, 0x6f, 0xc6, 0xb0, 0xef, 0x72, 0xf6, 0xbd, 0x48, 0xf6, 0xb7,
-	0x62, 0xd8, 0xf7, 0x18, 0x7b, 0x6d, 0x35, 0x92, 0xfd, 0x59, 0x34, 0x7b, 0x6d, 0x95, 0xb3, 0xa3,
-	0xb5, 0xf6, 0xed, 0x18, 0x36, 0xd7, 0xda, 0x5a, 0xb4, 0xd6, 0xbe, 0x13, 0xc3, 0xe6, 0x5a, 0x5b,
-	0x8b, 0xd6, 0xda, 0x77, 0x63, 0xd8, 0x5c, 0x6b, 0x6b, 0xd1, 0x5a, 0xfb, 0x5e, 0x0c, 0x9b, 0x6b,
-	0x6d, 0x2d, 0x5a, 0x6b, 0xdf, 0x8f, 0x61, 0x73, 0xad, 0xad, 0x45, 0x6b, 0xed, 0x07, 0x31, 0x6c,
-	0xae, 0xb5, 0xb5, 0x68, 0xad, 0xfd, 0x51, 0x0c, 0x9b, 0x6b, 0x6d, 0x2d, 0x5a, 0x6b, 0x7f, 0x1c,
-	0xc3, 0xe6, 0x5a, 0x5b, 0x8b, 0xd6, 0xda, 0x9f, 0xc4, 0xb0, 0xb9, 0xd6, 0xb4, 0x68, 0xad, 0xfd,
-	0x69, 0x34, 0x5b, 0xe3, 0x5a, 0xd3, 0xa2, 0xb5, 0xf6, 0x67, 0x31, 0x6c, 0xae, 0x35, 0x2d, 0x5a,
-	0x6b, 0x7f, 0x1e, 0xc3, 0xe6, 0x5a, 0xd3, 0xa2, 0xb5, 0xf6, 0xc3, 0x18, 0x36, 0xd7, 0x9a, 0x16,
-	0xad, 0xb5, 0xbf, 0x88, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xcb, 0x18, 0x36, 0xd7, 0x9a,
-	0x16, 0xad, 0xb5, 0xbf, 0x8a, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xeb, 0x18, 0x36, 0xd7,
-	0x9a, 0x16, 0xad, 0xb5, 0xbf, 0x89, 0x61, 0x73, 0xad, 0x69, 0xd1, 0x5a, 0xfb, 0xdb, 0x18, 0x36,
-	0xd7, 0x5a, 0x35, 0x5a, 0x6b, 0x7f, 0x17, 0xcd, 0xae, 0x72, 0xad, 0x55, 0xa3, 0xb5, 0xf6, 0xf7,
-	0x31, 0x6c, 0xae, 0xb5, 0x6a, 0xb4, 0xd6, 0xfe, 0x21, 0x86, 0xcd, 0xb5, 0x56, 0x8d, 0xd6, 0xda,
-	0x3f, 0xc6, 0xb0, 0xb9, 0xd6, 0xaa, 0xd1, 0x5a, 0xfb, 0x51, 0x0c, 0x9b, 0x6b, 0xad, 0x1a, 0xad,
-	0xb5, 0x7f, 0x8a, 0x61, 0x73, 0xad, 0x55, 0xa3, 0xb5, 0xf6, 0xcf, 0x31, 0x6c, 0xae, 0xb5, 0x6a,
-	0xb4, 0xd6, 0xfe, 0x25, 0x86, 0xcd, 0xb5, 0x56, 0x8d, 0xd6, 0xda, 0xbf, 0xc6, 0xb0, 0xb9, 0xd6,
-	0xaa, 0xd1, 0x5a, 0xfb, 0xb7, 0x18, 0x36, 0xd7, 0x9a, 0x1e, 0xad, 0xb5, 0x7f, 0x8f, 0x66, 0xeb,
-	0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x23, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed, 0x3f, 0x63,
-	0xd8, 0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x2b, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed, 0xbf,
-	0x63, 0xd8, 0x5c, 0x6b, 0x7a, 0xb4, 0xd6, 0xfe, 0x27, 0x86, 0xcd, 0xb5, 0xa6, 0x47, 0x6b, 0xed,
-	0xc7, 0x31, 0x6c, 0xae, 0x35, 0x3d, 0x5a, 0x6b, 0x3f, 0x89, 0x61, 0x73, 0xad, 0xe9, 0xd1, 0x5a,
-	0xfb, 0xdf, 0x18, 0x36, 0xd7, 0x9a, 0x1e, 0xad, 0xb5, 0xff, 0x8b, 0x61, 0x73, 0xad, 0xad, 0x47,
-	0x6b, 0xed, 0xff, 0xa3, 0xd9, 0xeb, 0xab, 0x3f, 0x0d, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x00, 0xcd,
-	0x32, 0x57, 0x39, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/testdata/test.proto b/installer/vendor/github.com/golang/protobuf/proto/testdata/test.proto
deleted file mode 100644
index 70e3cfcda2..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/testdata/test.proto
+++ /dev/null
@@ -1,548 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A feature-rich test file for the protocol compiler and libraries.
-
-syntax = "proto2";
-
-package testdata;
-
-enum FOO { FOO1 = 1; };
-
-message GoEnum {
-  required FOO foo = 1;
-}
-
-message GoTestField {
-  required string Label = 1;
-  required string Type = 2;
-}
-
-message GoTest {
-  // An enum, for completeness.
-  enum KIND {
-    VOID = 0;
-
-    // Basic types
-    BOOL = 1;
-    BYTES = 2;
-    FINGERPRINT = 3;
-    FLOAT = 4;
-    INT = 5;
-    STRING = 6;
-    TIME = 7;
-
-    // Groupings
-    TUPLE = 8;
-    ARRAY = 9;
-    MAP = 10;
-
-    // Table types
-    TABLE = 11;
-
-    // Functions
-    FUNCTION = 12;  // last tag
-  };
-
-  // Some typical parameters
-  required KIND Kind = 1;
-  optional string Table = 2;
-  optional int32 Param = 3;
-
-  // Required, repeated and optional foreign fields.
-  required GoTestField RequiredField = 4;
-  repeated GoTestField RepeatedField = 5;
-  optional GoTestField OptionalField = 6;
-
-  // Required fields of all basic types
-  required bool F_Bool_required = 10;
-  required int32 F_Int32_required = 11;
-  required int64 F_Int64_required = 12;
-  required fixed32 F_Fixed32_required = 13;
-  required fixed64 F_Fixed64_required = 14;
-  required uint32 F_Uint32_required = 15;
-  required uint64 F_Uint64_required = 16;
-  required float F_Float_required = 17;
-  required double F_Double_required = 18;
-  required string F_String_required = 19;
-  required bytes F_Bytes_required = 101;
-  required sint32 F_Sint32_required = 102;
-  required sint64 F_Sint64_required = 103;
-
-  // Repeated fields of all basic types
-  repeated bool F_Bool_repeated = 20;
-  repeated int32 F_Int32_repeated = 21;
-  repeated int64 F_Int64_repeated = 22;
-  repeated fixed32 F_Fixed32_repeated = 23;
-  repeated fixed64 F_Fixed64_repeated = 24;
-  repeated uint32 F_Uint32_repeated = 25;
-  repeated uint64 F_Uint64_repeated = 26;
-  repeated float F_Float_repeated = 27;
-  repeated double F_Double_repeated = 28;
-  repeated string F_String_repeated = 29;
-  repeated bytes F_Bytes_repeated = 201;
-  repeated sint32 F_Sint32_repeated = 202;
-  repeated sint64 F_Sint64_repeated = 203;
-
-  // Optional fields of all basic types
-  optional bool F_Bool_optional = 30;
-  optional int32 F_Int32_optional = 31;
-  optional int64 F_Int64_optional = 32;
-  optional fixed32 F_Fixed32_optional = 33;
-  optional fixed64 F_Fixed64_optional = 34;
-  optional uint32 F_Uint32_optional = 35;
-  optional uint64 F_Uint64_optional = 36;
-  optional float F_Float_optional = 37;
-  optional double F_Double_optional = 38;
-  optional string F_String_optional = 39;
-  optional bytes F_Bytes_optional = 301;
-  optional sint32 F_Sint32_optional = 302;
-  optional sint64 F_Sint64_optional = 303;
-
-  // Default-valued fields of all basic types
-  optional bool F_Bool_defaulted = 40 [default=true];
-  optional int32 F_Int32_defaulted = 41 [default=32];
-  optional int64 F_Int64_defaulted = 42 [default=64];
-  optional fixed32 F_Fixed32_defaulted = 43 [default=320];
-  optional fixed64 F_Fixed64_defaulted = 44 [default=640];
-  optional uint32 F_Uint32_defaulted = 45 [default=3200];
-  optional uint64 F_Uint64_defaulted = 46 [default=6400];
-  optional float F_Float_defaulted = 47 [default=314159.];
-  optional double F_Double_defaulted = 48 [default=271828.];
-  optional string F_String_defaulted = 49 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes_defaulted = 401 [default="Bignose"];
-  optional sint32 F_Sint32_defaulted = 402 [default = -32];
-  optional sint64 F_Sint64_defaulted = 403 [default = -64];
-
-  // Packed repeated fields (no string or bytes).
-  repeated bool F_Bool_repeated_packed = 50 [packed=true];
-  repeated int32 F_Int32_repeated_packed = 51 [packed=true];
-  repeated int64 F_Int64_repeated_packed = 52 [packed=true];
-  repeated fixed32 F_Fixed32_repeated_packed = 53 [packed=true];
-  repeated fixed64 F_Fixed64_repeated_packed = 54 [packed=true];
-  repeated uint32 F_Uint32_repeated_packed = 55 [packed=true];
-  repeated uint64 F_Uint64_repeated_packed = 56 [packed=true];
-  repeated float F_Float_repeated_packed = 57 [packed=true];
-  repeated double F_Double_repeated_packed = 58 [packed=true];
-  repeated sint32 F_Sint32_repeated_packed = 502 [packed=true];
-  repeated sint64 F_Sint64_repeated_packed = 503 [packed=true];
-
-  // Required, repeated, and optional groups.
-  required group RequiredGroup = 70 {
-    required string RequiredField = 71;
-  };
-
-  repeated group RepeatedGroup = 80 {
-    required string RequiredField = 81;
-  };
-
-  optional group OptionalGroup = 90 {
-    required string RequiredField = 91;
-  };
-}
-
-// For testing a group containing a required field.
-message GoTestRequiredGroupField {
-  required group Group = 1 {
-    required int32 Field = 2;
-  };
-}
-
-// For testing skipping of unrecognized fields.
-// Numbers are all big, larger than tag numbers in GoTestField,
-// the message used in the corresponding test.
-message GoSkipTest {
-  required int32 skip_int32 = 11;
-  required fixed32 skip_fixed32 = 12;
-  required fixed64 skip_fixed64 = 13;
-  required string skip_string = 14;
-  required group SkipGroup = 15 {
-    required int32 group_int32 = 16;
-    required string group_string = 17;
-  }
-}
-
-// For testing packed/non-packed decoder switching.
-// A serialized instance of one should be deserializable as the other.
-message NonPackedTest {
-  repeated int32 a = 1;
-}
-
-message PackedTest {
-  repeated int32 b = 1 [packed=true];
-}
-
-message MaxTag {
-  // Maximum possible tag number.
-  optional string last_field = 536870911;
-}
-
-message OldMessage {
-  message Nested {
-    optional string name = 1;
-  }
-  optional Nested nested = 1;
-
-  optional int32 num = 2;
-}
-
-// NewMessage is wire compatible with OldMessage;
-// imagine it as a future version.
-message NewMessage {
-  message Nested {
-    optional string name = 1;
-    optional string food_group = 2;
-  }
-  optional Nested nested = 1;
-
-  // This is an int32 in OldMessage.
-  optional int64 num = 2;
-}
-
-// Smaller tests for ASCII formatting.
-
-message InnerMessage {
-  required string host = 1;
-  optional int32 port = 2 [default=4000];
-  optional bool connected = 3;
-}
-
-message OtherMessage {
-  optional int64 key = 1;
-  optional bytes value = 2;
-  optional float weight = 3;
-  optional InnerMessage inner = 4;
-
-  extensions 100 to max;
-}
-
-message RequiredInnerMessage {
-  required InnerMessage leo_finally_won_an_oscar = 1;
-}
-
-message MyMessage {
-  required int32 count = 1;
-  optional string name = 2;
-  optional string quote = 3;
-  repeated string pet = 4;
-  optional InnerMessage inner = 5;
-  repeated OtherMessage others = 6;
-  optional RequiredInnerMessage we_must_go_deeper = 13;
-  repeated InnerMessage rep_inner = 12;
-
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  };
-  optional Color bikeshed = 7;
-
-  optional group SomeGroup = 8 {
-    optional int32 group_field = 9;
-  }
-
-  // This field becomes [][]byte in the generated code.
-  repeated bytes rep_bytes = 10;
-
-  optional double bigfloat = 11;
-
-  extensions 100 to max;
-}
-
-message Ext {
-  extend MyMessage {
-    optional Ext more = 103;
-    optional string text = 104;
-    optional int32 number = 105;
-  }
-
-  optional string data = 1;
-}
-
-extend MyMessage {
-  repeated string greeting = 106;
-}
-
-message ComplexExtension {
-  optional int32 first = 1;
-  optional int32 second = 2;
-  repeated int32 third = 3;
-}
-
-extend OtherMessage {
-  optional ComplexExtension complex = 200;
-  repeated ComplexExtension r_complex = 201;
-}
-
-message DefaultsMessage {
-  enum DefaultsEnum {
-    ZERO = 0;
-    ONE = 1;
-    TWO = 2;
-  };
-  extensions 100 to max;
-}
-
-extend DefaultsMessage {
-  optional double no_default_double = 101;
-  optional float no_default_float = 102;
-  optional int32 no_default_int32 = 103;
-  optional int64 no_default_int64 = 104;
-  optional uint32 no_default_uint32 = 105;
-  optional uint64 no_default_uint64 = 106;
-  optional sint32 no_default_sint32 = 107;
-  optional sint64 no_default_sint64 = 108;
-  optional fixed32 no_default_fixed32 = 109;
-  optional fixed64 no_default_fixed64 = 110;
-  optional sfixed32 no_default_sfixed32 = 111;
-  optional sfixed64 no_default_sfixed64 = 112;
-  optional bool no_default_bool = 113;
-  optional string no_default_string = 114;
-  optional bytes no_default_bytes = 115;
-  optional DefaultsMessage.DefaultsEnum no_default_enum = 116;
-
-  optional double default_double = 201 [default = 3.1415];
-  optional float default_float = 202 [default = 3.14];
-  optional int32 default_int32 = 203 [default = 42];
-  optional int64 default_int64 = 204 [default = 43];
-  optional uint32 default_uint32 = 205 [default = 44];
-  optional uint64 default_uint64 = 206 [default = 45];
-  optional sint32 default_sint32 = 207 [default = 46];
-  optional sint64 default_sint64 = 208 [default = 47];
-  optional fixed32 default_fixed32 = 209 [default = 48];
-  optional fixed64 default_fixed64 = 210 [default = 49];
-  optional sfixed32 default_sfixed32 = 211 [default = 50];
-  optional sfixed64 default_sfixed64 = 212 [default = 51];
-  optional bool default_bool = 213 [default = true];
-  optional string default_string = 214 [default = "Hello, string"];
-  optional bytes default_bytes = 215 [default = "Hello, bytes"];
-  optional DefaultsMessage.DefaultsEnum default_enum = 216 [default = ONE];
-}
-
-message MyMessageSet {
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
-
-message Empty {
-}
-
-extend MyMessageSet {
-    optional Empty x201 = 201;
-    optional Empty x202 = 202;
-    optional Empty x203 = 203;
-    optional Empty x204 = 204;
-    optional Empty x205 = 205;
-    optional Empty x206 = 206;
-    optional Empty x207 = 207;
-    optional Empty x208 = 208;
-    optional Empty x209 = 209;
-    optional Empty x210 = 210;
-    optional Empty x211 = 211;
-    optional Empty x212 = 212;
-    optional Empty x213 = 213;
-    optional Empty x214 = 214;
-    optional Empty x215 = 215;
-    optional Empty x216 = 216;
-    optional Empty x217 = 217;
-    optional Empty x218 = 218;
-    optional Empty x219 = 219;
-    optional Empty x220 = 220;
-    optional Empty x221 = 221;
-    optional Empty x222 = 222;
-    optional Empty x223 = 223;
-    optional Empty x224 = 224;
-    optional Empty x225 = 225;
-    optional Empty x226 = 226;
-    optional Empty x227 = 227;
-    optional Empty x228 = 228;
-    optional Empty x229 = 229;
-    optional Empty x230 = 230;
-    optional Empty x231 = 231;
-    optional Empty x232 = 232;
-    optional Empty x233 = 233;
-    optional Empty x234 = 234;
-    optional Empty x235 = 235;
-    optional Empty x236 = 236;
-    optional Empty x237 = 237;
-    optional Empty x238 = 238;
-    optional Empty x239 = 239;
-    optional Empty x240 = 240;
-    optional Empty x241 = 241;
-    optional Empty x242 = 242;
-    optional Empty x243 = 243;
-    optional Empty x244 = 244;
-    optional Empty x245 = 245;
-    optional Empty x246 = 246;
-    optional Empty x247 = 247;
-    optional Empty x248 = 248;
-    optional Empty x249 = 249;
-    optional Empty x250 = 250;
-}
-
-message MessageList {
-  repeated group Message = 1 {
-    required string name = 2;
-    required int32 count = 3;
-  }
-}
-
-message Strings {
-  optional string string_field = 1;
-  optional bytes bytes_field = 2;
-}
-
-message Defaults {
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  }
-
-  // Default-valued fields of all basic types.
-  // Same as GoTest, but copied here to make testing easier.
-  optional bool F_Bool = 1 [default=true];
-  optional int32 F_Int32 = 2 [default=32];
-  optional int64 F_Int64 = 3 [default=64];
-  optional fixed32 F_Fixed32 = 4 [default=320];
-  optional fixed64 F_Fixed64 = 5 [default=640];
-  optional uint32 F_Uint32 = 6 [default=3200];
-  optional uint64 F_Uint64 = 7 [default=6400];
-  optional float F_Float = 8 [default=314159.];
-  optional double F_Double = 9 [default=271828.];
-  optional string F_String = 10 [default="hello, \"world!\"\n"];
-  optional bytes F_Bytes = 11 [default="Bignose"];
-  optional sint32 F_Sint32 = 12 [default=-32];
-  optional sint64 F_Sint64 = 13 [default=-64];
-  optional Color F_Enum = 14 [default=GREEN];
-
-  // More fields with crazy defaults.
-  optional float F_Pinf = 15 [default=inf];
-  optional float F_Ninf = 16 [default=-inf];
-  optional float F_Nan = 17 [default=nan];
-
-  // Sub-message.
-  optional SubDefaults sub = 18;
-
-  // Redundant but explicit defaults.
-  optional string str_zero = 19 [default=""];
-}
-
-message SubDefaults {
-  optional int64 n = 1 [default=7];
-}
-
-message RepeatedEnum {
-  enum Color {
-    RED = 1;
-  }
-  repeated Color color = 1;
-}
-
-message MoreRepeated {
-  repeated bool bools = 1;
-  repeated bool bools_packed = 2 [packed=true];
-  repeated int32 ints = 3;
-  repeated int32 ints_packed = 4 [packed=true];
-  repeated int64 int64s_packed = 7 [packed=true];
-  repeated string strings = 5;
-  repeated fixed32 fixeds = 6;
-}
-
-// GroupOld and GroupNew have the same wire format.
-// GroupNew has a new field inside a group.
-
-message GroupOld {
-  optional group G = 101 {
-    optional int32 x = 2;
-  }
-}
-
-message GroupNew {
-  optional group G = 101 {
-    optional int32 x = 2;
-    optional int32 y = 3;
-  }
-}
-
-message FloatingPoint {
-  required double f = 1;
-  optional bool exact = 2;
-}
-
-message MessageWithMap {
-  map<int32, string> name_mapping = 1;
-  map<sint64, FloatingPoint> msg_mapping = 2;
-  map<bool, bytes> byte_mapping = 3;
-  map<string, string> str_to_str = 4;
-}
-
-message Oneof {
-  oneof union {
-    bool F_Bool = 1;
-    int32 F_Int32 = 2;
-    int64 F_Int64 = 3;
-    fixed32 F_Fixed32 = 4;
-    fixed64 F_Fixed64 = 5;
-    uint32 F_Uint32 = 6;
-    uint64 F_Uint64 = 7;
-    float F_Float = 8;
-    double F_Double = 9;
-    string F_String = 10;
-    bytes F_Bytes = 11;
-    sint32 F_Sint32 = 12;
-    sint64 F_Sint64 = 13;
-    MyMessage.Color F_Enum = 14;
-    GoTestField F_Message = 15;
-    group F_Group = 16 {
-      optional int32 x = 17;
-    }
-    int32 F_Largest_Tag = 536870911;
-  }
-
-  oneof tormato {
-    int32 value = 100;
-  }
-}
-
-message Communique {
-  optional bool make_me_cry = 1;
-
-  // This is a oneof, called "union".
-  oneof union {
-    int32 number = 5;
-    string name = 6;
-    bytes data = 7;
-    double temp_c = 8;
-    MyMessage.Color col = 9;
-    Strings msg = 10;
-  }
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/text.go b/installer/vendor/github.com/golang/protobuf/proto/text.go
index 965876bf03..2205fdaadf 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/text.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/text.go
@@ -50,7 +50,6 @@ import (
 var (
 	newline         = []byte("\n")
 	spaces          = []byte("                                        ")
-	gtNewline       = []byte(">\n")
 	endBraceNewline = []byte("}\n")
 	backslashN      = []byte{'\\', 'n'}
 	backslashR      = []byte{'\\', 'r'}
@@ -170,11 +169,6 @@ func writeName(w *textWriter, props *Properties) error {
 	return nil
 }
 
-// raw is the interface satisfied by RawMessage.
-type raw interface {
-	Bytes() []byte
-}
-
 func requiresQuotes(u string) bool {
 	// When type URL contains any characters except [0-9A-Za-z./\-]*, it must be quoted.
 	for _, ch := range u {
@@ -269,6 +263,10 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 		props := sprops.Prop[i]
 		name := st.Field(i).Name
 
+		if name == "XXX_NoUnkeyedLiteral" {
+			continue
+		}
+
 		if strings.HasPrefix(name, "XXX_") {
 			// There are two XXX_ fields:
 			//   XXX_unrecognized []byte
@@ -436,12 +434,6 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 				return err
 			}
 		}
-		if b, ok := fv.Interface().(raw); ok {
-			if err := writeRaw(w, b.Bytes()); err != nil {
-				return err
-			}
-			continue
-		}
 
 		// Enums have a String method, so writeAny will work fine.
 		if err := tm.writeAny(w, fv, props); err != nil {
@@ -455,7 +447,7 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 
 	// Extensions (the XXX_extensions field).
 	pv := sv.Addr()
-	if _, ok := extendable(pv.Interface()); ok {
+	if _, err := extendable(pv.Interface()); err == nil {
 		if err := tm.writeExtensions(w, pv); err != nil {
 			return err
 		}
@@ -464,27 +456,6 @@ func (tm *TextMarshaler) writeStruct(w *textWriter, sv reflect.Value) error {
 	return nil
 }
 
-// writeRaw writes an uninterpreted raw message.
-func writeRaw(w *textWriter, b []byte) error {
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if !w.compact {
-		if err := w.WriteByte('\n'); err != nil {
-			return err
-		}
-	}
-	w.indent()
-	if err := writeUnknownStruct(w, b); err != nil {
-		return err
-	}
-	w.unindent()
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-	return nil
-}
-
 // writeAny writes an arbitrary field.
 func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Properties) error {
 	v = reflect.Indirect(v)
@@ -535,6 +506,19 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 			}
 		}
 		w.indent()
+		if v.CanAddr() {
+			// Calling v.Interface on a struct causes the reflect package to
+			// copy the entire struct. This is racy with the new Marshaler
+			// since we atomically update the XXX_sizecache.
+			//
+			// Thus, we retrieve a pointer to the struct if possible to avoid
+			// a race since v.Interface on the pointer doesn't copy the struct.
+			//
+			// If v is not addressable, then we are not worried about a race
+			// since it implies that the binary Marshaler cannot possibly be
+			// mutating this value.
+			v = v.Addr()
+		}
 		if etm, ok := v.Interface().(encoding.TextMarshaler); ok {
 			text, err := etm.MarshalText()
 			if err != nil {
@@ -543,8 +527,13 @@ func (tm *TextMarshaler) writeAny(w *textWriter, v reflect.Value, props *Propert
 			if _, err = w.Write(text); err != nil {
 				return err
 			}
-		} else if err := tm.writeStruct(w, v); err != nil {
-			return err
+		} else {
+			if v.Kind() == reflect.Ptr {
+				v = v.Elem()
+			}
+			if err := tm.writeStruct(w, v); err != nil {
+				return err
+			}
 		}
 		w.unindent()
 		if err := w.WriteByte(ket); err != nil {
diff --git a/installer/vendor/github.com/golang/protobuf/proto/text_parser.go b/installer/vendor/github.com/golang/protobuf/proto/text_parser.go
index 5e14513f28..0685bae36d 100644
--- a/installer/vendor/github.com/golang/protobuf/proto/text_parser.go
+++ b/installer/vendor/github.com/golang/protobuf/proto/text_parser.go
@@ -206,7 +206,6 @@ func (p *textParser) advance() {
 
 var (
 	errBadUTF8 = errors.New("proto: bad UTF-8")
-	errBadHex  = errors.New("proto: bad hexadecimal")
 )
 
 func unquoteC(s string, quote rune) (string, error) {
@@ -277,60 +276,47 @@ func unescape(s string) (ch string, tail string, err error) {
 		return "?", s, nil // trigraph workaround
 	case '\'', '"', '\\':
 		return string(r), s, nil
-	case '0', '1', '2', '3', '4', '5', '6', '7', 'x', 'X':
+	case '0', '1', '2', '3', '4', '5', '6', '7':
 		if len(s) < 2 {
 			return "", "", fmt.Errorf(`\%c requires 2 following digits`, r)
 		}
-		base := 8
-		ss := s[:2]
+		ss := string(r) + s[:2]
 		s = s[2:]
-		if r == 'x' || r == 'X' {
-			base = 16
-		} else {
-			ss = string(r) + ss
-		}
-		i, err := strconv.ParseUint(ss, base, 8)
+		i, err := strconv.ParseUint(ss, 8, 8)
 		if err != nil {
-			return "", "", err
+			return "", "", fmt.Errorf(`\%s contains non-octal digits`, ss)
 		}
 		return string([]byte{byte(i)}), s, nil
-	case 'u', 'U':
-		n := 4
-		if r == 'U' {
+	case 'x', 'X', 'u', 'U':
+		var n int
+		switch r {
+		case 'x', 'X':
+			n = 2
+		case 'u':
+			n = 4
+		case 'U':
 			n = 8
 		}
 		if len(s) < n {
-			return "", "", fmt.Errorf(`\%c requires %d digits`, r, n)
-		}
-
-		bs := make([]byte, n/2)
-		for i := 0; i < n; i += 2 {
-			a, ok1 := unhex(s[i])
-			b, ok2 := unhex(s[i+1])
-			if !ok1 || !ok2 {
-				return "", "", errBadHex
-			}
-			bs[i/2] = a<<4 | b
+			return "", "", fmt.Errorf(`\%c requires %d following digits`, r, n)
 		}
+		ss := s[:n]
 		s = s[n:]
-		return string(bs), s, nil
+		i, err := strconv.ParseUint(ss, 16, 64)
+		if err != nil {
+			return "", "", fmt.Errorf(`\%c%s contains non-hexadecimal digits`, r, ss)
+		}
+		if r == 'x' || r == 'X' {
+			return string([]byte{byte(i)}), s, nil
+		}
+		if i > utf8.MaxRune {
+			return "", "", fmt.Errorf(`\%c%s is not a valid Unicode code point`, r, ss)
+		}
+		return string(i), s, nil
 	}
 	return "", "", fmt.Errorf(`unknown escape \%c`, r)
 }
 
-// Adapted from src/pkg/strconv/quote.go.
-func unhex(b byte) (v byte, ok bool) {
-	switch {
-	case '0' <= b && b <= '9':
-		return b - '0', true
-	case 'a' <= b && b <= 'f':
-		return b - 'a' + 10, true
-	case 'A' <= b && b <= 'F':
-		return b - 'A' + 10, true
-	}
-	return 0, false
-}
-
 // Back off the parser by one token. Can only be done between calls to next().
 // It makes the next advance() a no-op.
 func (p *textParser) back() { p.backed = true }
@@ -728,6 +714,9 @@ func (p *textParser) consumeExtName() (string, error) {
 		if tok.err != nil {
 			return "", p.errorf("unrecognized type_url or extension name: %s", tok.err)
 		}
+		if p.done && tok.value != "]" {
+			return "", p.errorf("unclosed type_url or extension name")
+		}
 	}
 	return strings.Join(parts, ""), nil
 }
@@ -865,7 +854,7 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 		return p.readStruct(fv, terminator)
 	case reflect.Uint32:
 		if x, err := strconv.ParseUint(tok.value, 0, 32); err == nil {
-			fv.SetUint(x)
+			fv.SetUint(uint64(x))
 			return nil
 		}
 	case reflect.Uint64:
@@ -883,13 +872,9 @@ func (p *textParser) readAny(v reflect.Value, props *Properties) error {
 // UnmarshalText returns *RequiredNotSetError.
 func UnmarshalText(s string, pb Message) error {
 	if um, ok := pb.(encoding.TextUnmarshaler); ok {
-		err := um.UnmarshalText([]byte(s))
-		return err
+		return um.UnmarshalText([]byte(s))
 	}
 	pb.Reset()
 	v := reflect.ValueOf(pb)
-	if pe := newTextParser(s).readStruct(v.Elem(), ""); pe != nil {
-		return pe
-	}
-	return nil
+	return newTextParser(s).readStruct(v.Elem(), "")
 }
diff --git a/installer/vendor/github.com/golang/protobuf/proto/text_parser_test.go b/installer/vendor/github.com/golang/protobuf/proto/text_parser_test.go
deleted file mode 100644
index 8f7cb4d274..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/text_parser_test.go
+++ /dev/null
@@ -1,673 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"math"
-	"reflect"
-	"testing"
-
-	. "github.com/golang/protobuf/proto"
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	. "github.com/golang/protobuf/proto/testdata"
-)
-
-type UnmarshalTextTest struct {
-	in  string
-	err string // if "", no error expected
-	out *MyMessage
-}
-
-func buildExtStructTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_More, &Ext{
-		Data: String("Hello, world!"),
-	})
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtDataTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	SetExtension(msg, E_Ext_Text, String("Hello, world!"))
-	SetExtension(msg, E_Ext_Number, Int32(1729))
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-func buildExtRepStringTest(text string) UnmarshalTextTest {
-	msg := &MyMessage{
-		Count: Int32(42),
-	}
-	if err := SetExtension(msg, E_Greeting, []string{"bula", "hola"}); err != nil {
-		panic(err)
-	}
-	return UnmarshalTextTest{in: text, out: msg}
-}
-
-var unMarshalTextTests = []UnmarshalTextTest{
-	// Basic
-	{
-		in: " count:42\n  name:\"Dave\" ",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-		},
-	},
-
-	// Empty quoted string
-	{
-		in: `count:42 name:""`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(""),
-		},
-	},
-
-	// Quoted string concatenation with double quotes
-	{
-		in: `count:42 name: "My name is "` + "\n" + `"elsewhere"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-
-	// Quoted string concatenation with single quotes
-	{
-		in: "count:42 name: 'My name is '\n'elsewhere'",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-
-	// Quoted string concatenations with mixed quotes
-	{
-		in: "count:42 name: 'My name is '\n\"elsewhere\"",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-	{
-		in: "count:42 name: \"My name is \"\n'elsewhere'",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("My name is elsewhere"),
-		},
-	},
-
-	// Quoted string with escaped apostrophe
-	{
-		in: `count:42 name: "HOLIDAY - New Year\'s Day"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("HOLIDAY - New Year's Day"),
-		},
-	},
-
-	// Quoted string with single quote
-	{
-		in: `count:42 name: 'Roger "The Ramster" Ramjet'`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`Roger "The Ramster" Ramjet`),
-		},
-	},
-
-	// Quoted string with all the accepted special characters from the C++ test
-	{
-		in: `count:42 name: ` + "\"\\\"A string with \\' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces"),
-		},
-	},
-
-	// Quoted string with quoted backslash
-	{
-		in: `count:42 name: "\\'xyz"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String(`\'xyz`),
-		},
-	},
-
-	// Quoted string with UTF-8 bytes.
-	{
-		in: "count:42 name: '\303\277\302\201\xAB'",
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("\303\277\302\201\xAB"),
-		},
-	},
-
-	// Bad quoted string
-	{
-		in:  `inner: < host: "\0" >` + "\n",
-		err: `line 1.15: invalid quoted string "\0": \0 requires 2 following digits`,
-	},
-
-	// Number too large for int64
-	{
-		in:  "count: 1 others { key: 123456789012345678901 }",
-		err: "line 1.23: invalid int64: 123456789012345678901",
-	},
-
-	// Number too large for int32
-	{
-		in:  "count: 1234567890123",
-		err: "line 1.7: invalid int32: 1234567890123",
-	},
-
-	// Number in hexadecimal
-	{
-		in: "count: 0x2beef",
-		out: &MyMessage{
-			Count: Int32(0x2beef),
-		},
-	},
-
-	// Number in octal
-	{
-		in: "count: 024601",
-		out: &MyMessage{
-			Count: Int32(024601),
-		},
-	},
-
-	// Floating point number with "f" suffix
-	{
-		in: "count: 4 others:< weight: 17.0f >",
-		out: &MyMessage{
-			Count: Int32(4),
-			Others: []*OtherMessage{
-				{
-					Weight: Float32(17),
-				},
-			},
-		},
-	},
-
-	// Floating point positive infinity
-	{
-		in: "count: 4 bigfloat: inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(1)),
-		},
-	},
-
-	// Floating point negative infinity
-	{
-		in: "count: 4 bigfloat: -inf",
-		out: &MyMessage{
-			Count:    Int32(4),
-			Bigfloat: Float64(math.Inf(-1)),
-		},
-	},
-
-	// Number too large for float32
-	{
-		in:  "others:< weight: 12345678901234567890123456789012345678901234567890 >",
-		err: "line 1.17: invalid float32: 12345678901234567890123456789012345678901234567890",
-	},
-
-	// Number posing as a quoted string
-	{
-		in:  `inner: < host: 12 >` + "\n",
-		err: `line 1.15: invalid string: 12`,
-	},
-
-	// Quoted string posing as int32
-	{
-		in:  `count: "12"`,
-		err: `line 1.7: invalid int32: "12"`,
-	},
-
-	// Quoted string posing a float32
-	{
-		in:  `others:< weight: "17.4" >`,
-		err: `line 1.17: invalid float32: "17.4"`,
-	},
-
-	// Enum
-	{
-		in: `count:42 bikeshed: BLUE`,
-		out: &MyMessage{
-			Count:    Int32(42),
-			Bikeshed: MyMessage_BLUE.Enum(),
-		},
-	},
-
-	// Repeated field
-	{
-		in: `count:42 pet: "horsey" pet:"bunny"`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Pet:   []string{"horsey", "bunny"},
-		},
-	},
-
-	// Repeated field with list notation
-	{
-		in: `count:42 pet: ["horsey", "bunny"]`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Pet:   []string{"horsey", "bunny"},
-		},
-	},
-
-	// Repeated message with/without colon and <>/{}
-	{
-		in: `count:42 others:{} others{} others:<> others:{}`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Others: []*OtherMessage{
-				{},
-				{},
-				{},
-				{},
-			},
-		},
-	},
-
-	// Missing colon for inner message
-	{
-		in: `count:42 inner < host: "cauchy.syd" >`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host: String("cauchy.syd"),
-			},
-		},
-	},
-
-	// Missing colon for string field
-	{
-		in:  `name "Dave"`,
-		err: `line 1.5: expected ':', found "\"Dave\""`,
-	},
-
-	// Missing colon for int32 field
-	{
-		in:  `count 42`,
-		err: `line 1.6: expected ':', found "42"`,
-	},
-
-	// Missing required field
-	{
-		in:  `name: "Pawel"`,
-		err: `proto: required field "testdata.MyMessage.count" not set`,
-		out: &MyMessage{
-			Name: String("Pawel"),
-		},
-	},
-
-	// Missing required field in a required submessage
-	{
-		in:  `count: 42 we_must_go_deeper < leo_finally_won_an_oscar <> >`,
-		err: `proto: required field "testdata.InnerMessage.host" not set`,
-		out: &MyMessage{
-			Count:          Int32(42),
-			WeMustGoDeeper: &RequiredInnerMessage{LeoFinallyWonAnOscar: &InnerMessage{}},
-		},
-	},
-
-	// Repeated non-repeated field
-	{
-		in:  `name: "Rob" name: "Russ"`,
-		err: `line 1.12: non-repeated field "name" was repeated`,
-	},
-
-	// Group
-	{
-		in: `count: 17 SomeGroup { group_field: 12 }`,
-		out: &MyMessage{
-			Count: Int32(17),
-			Somegroup: &MyMessage_SomeGroup{
-				GroupField: Int32(12),
-			},
-		},
-	},
-
-	// Semicolon between fields
-	{
-		in: `count:3;name:"Calvin"`,
-		out: &MyMessage{
-			Count: Int32(3),
-			Name:  String("Calvin"),
-		},
-	},
-	// Comma between fields
-	{
-		in: `count:4,name:"Ezekiel"`,
-		out: &MyMessage{
-			Count: Int32(4),
-			Name:  String("Ezekiel"),
-		},
-	},
-
-	// Boolean false
-	{
-		in: `count:42 inner { host: "example.com" connected: false }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(false),
-			},
-		},
-	},
-	// Boolean true
-	{
-		in: `count:42 inner { host: "example.com" connected: true }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(true),
-			},
-		},
-	},
-	// Boolean 0
-	{
-		in: `count:42 inner { host: "example.com" connected: 0 }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(false),
-			},
-		},
-	},
-	// Boolean 1
-	{
-		in: `count:42 inner { host: "example.com" connected: 1 }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(true),
-			},
-		},
-	},
-	// Boolean f
-	{
-		in: `count:42 inner { host: "example.com" connected: f }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(false),
-			},
-		},
-	},
-	// Boolean t
-	{
-		in: `count:42 inner { host: "example.com" connected: t }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(true),
-			},
-		},
-	},
-	// Boolean False
-	{
-		in: `count:42 inner { host: "example.com" connected: False }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(false),
-			},
-		},
-	},
-	// Boolean True
-	{
-		in: `count:42 inner { host: "example.com" connected: True }`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Inner: &InnerMessage{
-				Host:      String("example.com"),
-				Connected: Bool(true),
-			},
-		},
-	},
-
-	// Extension
-	buildExtStructTest(`count: 42 [testdata.Ext.more]:<data:"Hello, world!" >`),
-	buildExtStructTest(`count: 42 [testdata.Ext.more] {data:"Hello, world!"}`),
-	buildExtDataTest(`count: 42 [testdata.Ext.text]:"Hello, world!" [testdata.Ext.number]:1729`),
-	buildExtRepStringTest(`count: 42 [testdata.greeting]:"bula" [testdata.greeting]:"hola"`),
-
-	// Big all-in-one
-	{
-		in: "count:42  # Meaning\n" +
-			`name:"Dave" ` +
-			`quote:"\"I didn't want to go.\"" ` +
-			`pet:"bunny" ` +
-			`pet:"kitty" ` +
-			`pet:"horsey" ` +
-			`inner:<` +
-			`  host:"footrest.syd" ` +
-			`  port:7001 ` +
-			`  connected:true ` +
-			`> ` +
-			`others:<` +
-			`  key:3735928559 ` +
-			`  value:"\x01A\a\f" ` +
-			`> ` +
-			`others:<` +
-			"  weight:58.9  # Atomic weight of Co\n" +
-			`  inner:<` +
-			`    host:"lesha.mtv" ` +
-			`    port:8002 ` +
-			`  >` +
-			`>`,
-		out: &MyMessage{
-			Count: Int32(42),
-			Name:  String("Dave"),
-			Quote: String(`"I didn't want to go."`),
-			Pet:   []string{"bunny", "kitty", "horsey"},
-			Inner: &InnerMessage{
-				Host:      String("footrest.syd"),
-				Port:      Int32(7001),
-				Connected: Bool(true),
-			},
-			Others: []*OtherMessage{
-				{
-					Key:   Int64(3735928559),
-					Value: []byte{0x1, 'A', '\a', '\f'},
-				},
-				{
-					Weight: Float32(58.9),
-					Inner: &InnerMessage{
-						Host: String("lesha.mtv"),
-						Port: Int32(8002),
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestUnmarshalText(t *testing.T) {
-	for i, test := range unMarshalTextTests {
-		pb := new(MyMessage)
-		err := UnmarshalText(test.in, pb)
-		if test.err == "" {
-			// We don't expect failure.
-			if err != nil {
-				t.Errorf("Test %d: Unexpected error: %v", i, err)
-			} else if !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		} else {
-			// We do expect failure.
-			if err == nil {
-				t.Errorf("Test %d: Didn't get expected error: %v", i, test.err)
-			} else if err.Error() != test.err {
-				t.Errorf("Test %d: Incorrect error.\nHave: %v\nWant: %v",
-					i, err.Error(), test.err)
-			} else if _, ok := err.(*RequiredNotSetError); ok && test.out != nil && !reflect.DeepEqual(pb, test.out) {
-				t.Errorf("Test %d: Incorrect populated \nHave: %v\nWant: %v",
-					i, pb, test.out)
-			}
-		}
-	}
-}
-
-func TestUnmarshalTextCustomMessage(t *testing.T) {
-	msg := &textMessage{}
-	if err := UnmarshalText("custom", msg); err != nil {
-		t.Errorf("Unexpected error from custom unmarshal: %v", err)
-	}
-	if UnmarshalText("not custom", msg) == nil {
-		t.Errorf("Didn't get expected error from custom unmarshal")
-	}
-}
-
-// Regression test; this caused a panic.
-func TestRepeatedEnum(t *testing.T) {
-	pb := new(RepeatedEnum)
-	if err := UnmarshalText("color: RED", pb); err != nil {
-		t.Fatal(err)
-	}
-	exp := &RepeatedEnum{
-		Color: []RepeatedEnum_Color{RepeatedEnum_RED},
-	}
-	if !Equal(pb, exp) {
-		t.Errorf("Incorrect populated \nHave: %v\nWant: %v", pb, exp)
-	}
-}
-
-func TestProto3TextParsing(t *testing.T) {
-	m := new(proto3pb.Message)
-	const in = `name: "Wallace" true_scotsman: true`
-	want := &proto3pb.Message{
-		Name:         "Wallace",
-		TrueScotsman: true,
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-func TestMapParsing(t *testing.T) {
-	m := new(MessageWithMap)
-	const in = `name_mapping:<key:1234 value:"Feist"> name_mapping:<key:1 value:"Beatles">` +
-		`msg_mapping:<key:-4, value:<f: 2.0>,>` + // separating commas are okay
-		`msg_mapping<key:-2 value<f: 4.0>>` + // no colon after "value"
-		`msg_mapping:<value:<f: 5.0>>` + // omitted key
-		`msg_mapping:<key:1>` + // omitted value
-		`byte_mapping:<key:true value:"so be it">` +
-		`byte_mapping:<>` // omitted key and value
-	want := &MessageWithMap{
-		NameMapping: map[int32]string{
-			1:    "Beatles",
-			1234: "Feist",
-		},
-		MsgMapping: map[int64]*FloatingPoint{
-			-4: {F: Float64(2.0)},
-			-2: {F: Float64(4.0)},
-			0:  {F: Float64(5.0)},
-			1:  nil,
-		},
-		ByteMapping: map[bool][]byte{
-			false: nil,
-			true:  []byte("so be it"),
-		},
-	}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-}
-
-func TestOneofParsing(t *testing.T) {
-	const in = `name:"Shrek"`
-	m := new(Communique)
-	want := &Communique{Union: &Communique_Name{"Shrek"}}
-	if err := UnmarshalText(in, m); err != nil {
-		t.Fatal(err)
-	}
-	if !Equal(m, want) {
-		t.Errorf("\n got %v\nwant %v", m, want)
-	}
-
-	const inOverwrite = `name:"Shrek" number:42`
-	m = new(Communique)
-	testErr := "line 1.13: field 'number' would overwrite already parsed oneof 'Union'"
-	if err := UnmarshalText(inOverwrite, m); err == nil {
-		t.Errorf("TestOneofParsing: Didn't get expected error: %v", testErr)
-	} else if err.Error() != testErr {
-		t.Errorf("TestOneofParsing: Incorrect error.\nHave: %v\nWant: %v",
-			err.Error(), testErr)
-	}
-
-}
-
-var benchInput string
-
-func init() {
-	benchInput = "count: 4\n"
-	for i := 0; i < 1000; i++ {
-		benchInput += "pet: \"fido\"\n"
-	}
-
-	// Check it is valid input.
-	pb := new(MyMessage)
-	err := UnmarshalText(benchInput, pb)
-	if err != nil {
-		panic("Bad benchmark input: " + err.Error())
-	}
-}
-
-func BenchmarkUnmarshalText(b *testing.B) {
-	pb := new(MyMessage)
-	for i := 0; i < b.N; i++ {
-		UnmarshalText(benchInput, pb)
-	}
-	b.SetBytes(int64(len(benchInput)))
-}
diff --git a/installer/vendor/github.com/golang/protobuf/proto/text_test.go b/installer/vendor/github.com/golang/protobuf/proto/text_test.go
deleted file mode 100644
index 3eabacac8f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/proto/text_test.go
+++ /dev/null
@@ -1,474 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package proto_test
-
-import (
-	"bytes"
-	"errors"
-	"io/ioutil"
-	"math"
-	"strings"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-
-	proto3pb "github.com/golang/protobuf/proto/proto3_proto"
-	pb "github.com/golang/protobuf/proto/testdata"
-)
-
-// textMessage implements the methods that allow it to marshal and unmarshal
-// itself as text.
-type textMessage struct {
-}
-
-func (*textMessage) MarshalText() ([]byte, error) {
-	return []byte("custom"), nil
-}
-
-func (*textMessage) UnmarshalText(bytes []byte) error {
-	if string(bytes) != "custom" {
-		return errors.New("expected 'custom'")
-	}
-	return nil
-}
-
-func (*textMessage) Reset()         {}
-func (*textMessage) String() string { return "" }
-func (*textMessage) ProtoMessage()  {}
-
-func newTestMessage() *pb.MyMessage {
-	msg := &pb.MyMessage{
-		Count: proto.Int32(42),
-		Name:  proto.String("Dave"),
-		Quote: proto.String(`"I didn't want to go."`),
-		Pet:   []string{"bunny", "kitty", "horsey"},
-		Inner: &pb.InnerMessage{
-			Host:      proto.String("footrest.syd"),
-			Port:      proto.Int32(7001),
-			Connected: proto.Bool(true),
-		},
-		Others: []*pb.OtherMessage{
-			{
-				Key:   proto.Int64(0xdeadbeef),
-				Value: []byte{1, 65, 7, 12},
-			},
-			{
-				Weight: proto.Float32(6.022),
-				Inner: &pb.InnerMessage{
-					Host: proto.String("lesha.mtv"),
-					Port: proto.Int32(8002),
-				},
-			},
-		},
-		Bikeshed: pb.MyMessage_BLUE.Enum(),
-		Somegroup: &pb.MyMessage_SomeGroup{
-			GroupField: proto.Int32(8),
-		},
-		// One normally wouldn't do this.
-		// This is an undeclared tag 13, as a varint (wire type 0) with value 4.
-		XXX_unrecognized: []byte{13<<3 | 0, 4},
-	}
-	ext := &pb.Ext{
-		Data: proto.String("Big gobs for big rats"),
-	}
-	if err := proto.SetExtension(msg, pb.E_Ext_More, ext); err != nil {
-		panic(err)
-	}
-	greetings := []string{"adg", "easy", "cow"}
-	if err := proto.SetExtension(msg, pb.E_Greeting, greetings); err != nil {
-		panic(err)
-	}
-
-	// Add an unknown extension. We marshal a pb.Ext, and fake the ID.
-	b, err := proto.Marshal(&pb.Ext{Data: proto.String("3G skiing")})
-	if err != nil {
-		panic(err)
-	}
-	b = append(proto.EncodeVarint(201<<3|proto.WireBytes), b...)
-	proto.SetRawExtension(msg, 201, b)
-
-	// Extensions can be plain fields, too, so let's test that.
-	b = append(proto.EncodeVarint(202<<3|proto.WireVarint), 19)
-	proto.SetRawExtension(msg, 202, b)
-
-	return msg
-}
-
-const text = `count: 42
-name: "Dave"
-quote: "\"I didn't want to go.\""
-pet: "bunny"
-pet: "kitty"
-pet: "horsey"
-inner: <
-  host: "footrest.syd"
-  port: 7001
-  connected: true
->
-others: <
-  key: 3735928559
-  value: "\001A\007\014"
->
-others: <
-  weight: 6.022
-  inner: <
-    host: "lesha.mtv"
-    port: 8002
-  >
->
-bikeshed: BLUE
-SomeGroup {
-  group_field: 8
-}
-/* 2 unknown bytes */
-13: 4
-[testdata.Ext.more]: <
-  data: "Big gobs for big rats"
->
-[testdata.greeting]: "adg"
-[testdata.greeting]: "easy"
-[testdata.greeting]: "cow"
-/* 13 unknown bytes */
-201: "\t3G skiing"
-/* 3 unknown bytes */
-202: 19
-`
-
-func TestMarshalText(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, newTestMessage()); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != text {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, text)
-	}
-}
-
-func TestMarshalTextCustomMessage(t *testing.T) {
-	buf := new(bytes.Buffer)
-	if err := proto.MarshalText(buf, &textMessage{}); err != nil {
-		t.Fatalf("proto.MarshalText: %v", err)
-	}
-	s := buf.String()
-	if s != "custom" {
-		t.Errorf("Got %q, expected %q", s, "custom")
-	}
-}
-func TestMarshalTextNil(t *testing.T) {
-	want := "<nil>"
-	tests := []proto.Message{nil, (*pb.MyMessage)(nil)}
-	for i, test := range tests {
-		buf := new(bytes.Buffer)
-		if err := proto.MarshalText(buf, test); err != nil {
-			t.Fatal(err)
-		}
-		if got := buf.String(); got != want {
-			t.Errorf("%d: got %q want %q", i, got, want)
-		}
-	}
-}
-
-func TestMarshalTextUnknownEnum(t *testing.T) {
-	// The Color enum only specifies values 0-2.
-	m := &pb.MyMessage{Bikeshed: pb.MyMessage_Color(3).Enum()}
-	got := m.String()
-	const want = `bikeshed:3 `
-	if got != want {
-		t.Errorf("\n got %q\nwant %q", got, want)
-	}
-}
-
-func TestTextOneof(t *testing.T) {
-	tests := []struct {
-		m    proto.Message
-		want string
-	}{
-		// zero message
-		{&pb.Communique{}, ``},
-		// scalar field
-		{&pb.Communique{Union: &pb.Communique_Number{4}}, `number:4`},
-		// message field
-		{&pb.Communique{Union: &pb.Communique_Msg{
-			&pb.Strings{StringField: proto.String("why hello!")},
-		}}, `msg:<string_field:"why hello!" >`},
-		// bad oneof (should not panic)
-		{&pb.Communique{Union: &pb.Communique_Msg{nil}}, `msg:/* nil */`},
-	}
-	for _, test := range tests {
-		got := strings.TrimSpace(test.m.String())
-		if got != test.want {
-			t.Errorf("\n got %s\nwant %s", got, test.want)
-		}
-	}
-}
-
-func BenchmarkMarshalTextBuffered(b *testing.B) {
-	buf := new(bytes.Buffer)
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		buf.Reset()
-		proto.MarshalText(buf, m)
-	}
-}
-
-func BenchmarkMarshalTextUnbuffered(b *testing.B) {
-	w := ioutil.Discard
-	m := newTestMessage()
-	for i := 0; i < b.N; i++ {
-		proto.MarshalText(w, m)
-	}
-}
-
-func compact(src string) string {
-	// s/[ \n]+/ /g; s/ $//;
-	dst := make([]byte, len(src))
-	space, comment := false, false
-	j := 0
-	for i := 0; i < len(src); i++ {
-		if strings.HasPrefix(src[i:], "/*") {
-			comment = true
-			i++
-			continue
-		}
-		if comment && strings.HasPrefix(src[i:], "*/") {
-			comment = false
-			i++
-			continue
-		}
-		if comment {
-			continue
-		}
-		c := src[i]
-		if c == ' ' || c == '\n' {
-			space = true
-			continue
-		}
-		if j > 0 && (dst[j-1] == ':' || dst[j-1] == '<' || dst[j-1] == '{') {
-			space = false
-		}
-		if c == '{' {
-			space = false
-		}
-		if space {
-			dst[j] = ' '
-			j++
-			space = false
-		}
-		dst[j] = c
-		j++
-	}
-	if space {
-		dst[j] = ' '
-		j++
-	}
-	return string(dst[0:j])
-}
-
-var compactText = compact(text)
-
-func TestCompactText(t *testing.T) {
-	s := proto.CompactTextString(newTestMessage())
-	if s != compactText {
-		t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v\n===\n", s, compactText)
-	}
-}
-
-func TestStringEscaping(t *testing.T) {
-	testCases := []struct {
-		in  *pb.Strings
-		out string
-	}{
-		{
-			// Test data from C++ test (TextFormatTest.StringEscape).
-			// Single divergence: we don't escape apostrophes.
-			&pb.Strings{StringField: proto.String("\"A string with ' characters \n and \r newlines and \t tabs and \001 slashes \\ and  multiple   spaces")},
-			"string_field: \"\\\"A string with ' characters \\n and \\r newlines and \\t tabs and \\001 slashes \\\\ and  multiple   spaces\"\n",
-		},
-		{
-			// Test data from the same C++ test.
-			&pb.Strings{StringField: proto.String("\350\260\267\346\255\214")},
-			"string_field: \"\\350\\260\\267\\346\\255\\214\"\n",
-		},
-		{
-			// Some UTF-8.
-			&pb.Strings{StringField: proto.String("\x00\x01\xff\x81")},
-			`string_field: "\000\001\377\201"` + "\n",
-		},
-	}
-
-	for i, tc := range testCases {
-		var buf bytes.Buffer
-		if err := proto.MarshalText(&buf, tc.in); err != nil {
-			t.Errorf("proto.MarsalText: %v", err)
-			continue
-		}
-		s := buf.String()
-		if s != tc.out {
-			t.Errorf("#%d: Got:\n%s\nExpected:\n%s\n", i, s, tc.out)
-			continue
-		}
-
-		// Check round-trip.
-		pb := new(pb.Strings)
-		if err := proto.UnmarshalText(s, pb); err != nil {
-			t.Errorf("#%d: UnmarshalText: %v", i, err)
-			continue
-		}
-		if !proto.Equal(pb, tc.in) {
-			t.Errorf("#%d: Round-trip failed:\nstart: %v\n  end: %v", i, tc.in, pb)
-		}
-	}
-}
-
-// A limitedWriter accepts some output before it fails.
-// This is a proxy for something like a nearly-full or imminently-failing disk,
-// or a network connection that is about to die.
-type limitedWriter struct {
-	b     bytes.Buffer
-	limit int
-}
-
-var outOfSpace = errors.New("proto: insufficient space")
-
-func (w *limitedWriter) Write(p []byte) (n int, err error) {
-	var avail = w.limit - w.b.Len()
-	if avail <= 0 {
-		return 0, outOfSpace
-	}
-	if len(p) <= avail {
-		return w.b.Write(p)
-	}
-	n, _ = w.b.Write(p[:avail])
-	return n, outOfSpace
-}
-
-func TestMarshalTextFailing(t *testing.T) {
-	// Try lots of different sizes to exercise more error code-paths.
-	for lim := 0; lim < len(text); lim++ {
-		buf := new(limitedWriter)
-		buf.limit = lim
-		err := proto.MarshalText(buf, newTestMessage())
-		// We expect a certain error, but also some partial results in the buffer.
-		if err != outOfSpace {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", err, outOfSpace)
-		}
-		s := buf.b.String()
-		x := text[:buf.limit]
-		if s != x {
-			t.Errorf("Got:\n===\n%v===\nExpected:\n===\n%v===\n", s, x)
-		}
-	}
-}
-
-func TestFloats(t *testing.T) {
-	tests := []struct {
-		f    float64
-		want string
-	}{
-		{0, "0"},
-		{4.7, "4.7"},
-		{math.Inf(1), "inf"},
-		{math.Inf(-1), "-inf"},
-		{math.NaN(), "nan"},
-	}
-	for _, test := range tests {
-		msg := &pb.FloatingPoint{F: &test.f}
-		got := strings.TrimSpace(msg.String())
-		want := `f:` + test.want
-		if got != want {
-			t.Errorf("f=%f: got %q, want %q", test.f, got, want)
-		}
-	}
-}
-
-func TestRepeatedNilText(t *testing.T) {
-	m := &pb.MessageList{
-		Message: []*pb.MessageList_Message{
-			nil,
-			&pb.MessageList_Message{
-				Name: proto.String("Horse"),
-			},
-			nil,
-		},
-	}
-	want := `Message <nil>
-Message {
-  name: "Horse"
-}
-Message <nil>
-`
-	if s := proto.MarshalTextString(m); s != want {
-		t.Errorf(" got: %s\nwant: %s", s, want)
-	}
-}
-
-func TestProto3Text(t *testing.T) {
-	tests := []struct {
-		m    proto.Message
-		want string
-	}{
-		// zero message
-		{&proto3pb.Message{}, ``},
-		// zero message except for an empty byte slice
-		{&proto3pb.Message{Data: []byte{}}, ``},
-		// trivial case
-		{&proto3pb.Message{Name: "Rob", HeightInCm: 175}, `name:"Rob" height_in_cm:175`},
-		// empty map
-		{&pb.MessageWithMap{}, ``},
-		// non-empty map; map format is the same as a repeated struct,
-		// and they are sorted by key (numerically for numeric keys).
-		{
-			&pb.MessageWithMap{NameMapping: map[int32]string{
-				-1:      "Negatory",
-				7:       "Lucky",
-				1234:    "Feist",
-				6345789: "Otis",
-			}},
-			`name_mapping:<key:-1 value:"Negatory" > ` +
-				`name_mapping:<key:7 value:"Lucky" > ` +
-				`name_mapping:<key:1234 value:"Feist" > ` +
-				`name_mapping:<key:6345789 value:"Otis" >`,
-		},
-		// map with nil value; not well-defined, but we shouldn't crash
-		{
-			&pb.MessageWithMap{MsgMapping: map[int64]*pb.FloatingPoint{7: nil}},
-			`msg_mapping:<key:7 >`,
-		},
-	}
-	for _, test := range tests {
-		got := strings.TrimSpace(test.m.String())
-		if got != test.want {
-			t.Errorf("\n got %s\nwant %s", got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile
deleted file mode 100644
index a42cc3717f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-test:
-	cd testdata && make test
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
deleted file mode 100644
index f706871a6f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but descriptor.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/descriptor.proto
-regenerate:
-	@echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cp $(HOME)/src/protobuf/include/google/protobuf/descriptor.proto .
-	protoc --go_out=../../../../.. -I$(HOME)/src/protobuf/include $(HOME)/src/protobuf/include/google/protobuf/descriptor.proto
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
deleted file mode 100644
index c6a91bcab9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.pb.go
+++ /dev/null
@@ -1,2215 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/descriptor.proto
-
-/*
-Package descriptor is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/descriptor.proto
-
-It has these top-level messages:
-	FileDescriptorSet
-	FileDescriptorProto
-	DescriptorProto
-	ExtensionRangeOptions
-	FieldDescriptorProto
-	OneofDescriptorProto
-	EnumDescriptorProto
-	EnumValueDescriptorProto
-	ServiceDescriptorProto
-	MethodDescriptorProto
-	FileOptions
-	MessageOptions
-	FieldOptions
-	OneofOptions
-	EnumOptions
-	EnumValueOptions
-	ServiceOptions
-	MethodOptions
-	UninterpretedOption
-	SourceCodeInfo
-	GeneratedCodeInfo
-*/
-package descriptor
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type FieldDescriptorProto_Type int32
-
-const (
-	// 0 is reserved for errors.
-	// Order is weird for historical reasons.
-	FieldDescriptorProto_TYPE_DOUBLE FieldDescriptorProto_Type = 1
-	FieldDescriptorProto_TYPE_FLOAT  FieldDescriptorProto_Type = 2
-	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-	// negative values are likely.
-	FieldDescriptorProto_TYPE_INT64  FieldDescriptorProto_Type = 3
-	FieldDescriptorProto_TYPE_UINT64 FieldDescriptorProto_Type = 4
-	// Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-	// negative values are likely.
-	FieldDescriptorProto_TYPE_INT32   FieldDescriptorProto_Type = 5
-	FieldDescriptorProto_TYPE_FIXED64 FieldDescriptorProto_Type = 6
-	FieldDescriptorProto_TYPE_FIXED32 FieldDescriptorProto_Type = 7
-	FieldDescriptorProto_TYPE_BOOL    FieldDescriptorProto_Type = 8
-	FieldDescriptorProto_TYPE_STRING  FieldDescriptorProto_Type = 9
-	// Tag-delimited aggregate.
-	// Group type is deprecated and not supported in proto3. However, Proto3
-	// implementations should still be able to parse the group wire format and
-	// treat group fields as unknown fields.
-	FieldDescriptorProto_TYPE_GROUP   FieldDescriptorProto_Type = 10
-	FieldDescriptorProto_TYPE_MESSAGE FieldDescriptorProto_Type = 11
-	// New in version 2.
-	FieldDescriptorProto_TYPE_BYTES    FieldDescriptorProto_Type = 12
-	FieldDescriptorProto_TYPE_UINT32   FieldDescriptorProto_Type = 13
-	FieldDescriptorProto_TYPE_ENUM     FieldDescriptorProto_Type = 14
-	FieldDescriptorProto_TYPE_SFIXED32 FieldDescriptorProto_Type = 15
-	FieldDescriptorProto_TYPE_SFIXED64 FieldDescriptorProto_Type = 16
-	FieldDescriptorProto_TYPE_SINT32   FieldDescriptorProto_Type = 17
-	FieldDescriptorProto_TYPE_SINT64   FieldDescriptorProto_Type = 18
-)
-
-var FieldDescriptorProto_Type_name = map[int32]string{
-	1:  "TYPE_DOUBLE",
-	2:  "TYPE_FLOAT",
-	3:  "TYPE_INT64",
-	4:  "TYPE_UINT64",
-	5:  "TYPE_INT32",
-	6:  "TYPE_FIXED64",
-	7:  "TYPE_FIXED32",
-	8:  "TYPE_BOOL",
-	9:  "TYPE_STRING",
-	10: "TYPE_GROUP",
-	11: "TYPE_MESSAGE",
-	12: "TYPE_BYTES",
-	13: "TYPE_UINT32",
-	14: "TYPE_ENUM",
-	15: "TYPE_SFIXED32",
-	16: "TYPE_SFIXED64",
-	17: "TYPE_SINT32",
-	18: "TYPE_SINT64",
-}
-var FieldDescriptorProto_Type_value = map[string]int32{
-	"TYPE_DOUBLE":   1,
-	"TYPE_FLOAT":    2,
-	"TYPE_INT64":    3,
-	"TYPE_UINT64":   4,
-	"TYPE_INT32":    5,
-	"TYPE_FIXED64":  6,
-	"TYPE_FIXED32":  7,
-	"TYPE_BOOL":     8,
-	"TYPE_STRING":   9,
-	"TYPE_GROUP":    10,
-	"TYPE_MESSAGE":  11,
-	"TYPE_BYTES":    12,
-	"TYPE_UINT32":   13,
-	"TYPE_ENUM":     14,
-	"TYPE_SFIXED32": 15,
-	"TYPE_SFIXED64": 16,
-	"TYPE_SINT32":   17,
-	"TYPE_SINT64":   18,
-}
-
-func (x FieldDescriptorProto_Type) Enum() *FieldDescriptorProto_Type {
-	p := new(FieldDescriptorProto_Type)
-	*p = x
-	return p
-}
-func (x FieldDescriptorProto_Type) String() string {
-	return proto.EnumName(FieldDescriptorProto_Type_name, int32(x))
-}
-func (x *FieldDescriptorProto_Type) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Type_value, data, "FieldDescriptorProto_Type")
-	if err != nil {
-		return err
-	}
-	*x = FieldDescriptorProto_Type(value)
-	return nil
-}
-func (FieldDescriptorProto_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{4, 0} }
-
-type FieldDescriptorProto_Label int32
-
-const (
-	// 0 is reserved for errors
-	FieldDescriptorProto_LABEL_OPTIONAL FieldDescriptorProto_Label = 1
-	FieldDescriptorProto_LABEL_REQUIRED FieldDescriptorProto_Label = 2
-	FieldDescriptorProto_LABEL_REPEATED FieldDescriptorProto_Label = 3
-)
-
-var FieldDescriptorProto_Label_name = map[int32]string{
-	1: "LABEL_OPTIONAL",
-	2: "LABEL_REQUIRED",
-	3: "LABEL_REPEATED",
-}
-var FieldDescriptorProto_Label_value = map[string]int32{
-	"LABEL_OPTIONAL": 1,
-	"LABEL_REQUIRED": 2,
-	"LABEL_REPEATED": 3,
-}
-
-func (x FieldDescriptorProto_Label) Enum() *FieldDescriptorProto_Label {
-	p := new(FieldDescriptorProto_Label)
-	*p = x
-	return p
-}
-func (x FieldDescriptorProto_Label) String() string {
-	return proto.EnumName(FieldDescriptorProto_Label_name, int32(x))
-}
-func (x *FieldDescriptorProto_Label) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldDescriptorProto_Label_value, data, "FieldDescriptorProto_Label")
-	if err != nil {
-		return err
-	}
-	*x = FieldDescriptorProto_Label(value)
-	return nil
-}
-func (FieldDescriptorProto_Label) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{4, 1}
-}
-
-// Generated classes can be optimized for speed or code size.
-type FileOptions_OptimizeMode int32
-
-const (
-	FileOptions_SPEED FileOptions_OptimizeMode = 1
-	// etc.
-	FileOptions_CODE_SIZE    FileOptions_OptimizeMode = 2
-	FileOptions_LITE_RUNTIME FileOptions_OptimizeMode = 3
-)
-
-var FileOptions_OptimizeMode_name = map[int32]string{
-	1: "SPEED",
-	2: "CODE_SIZE",
-	3: "LITE_RUNTIME",
-}
-var FileOptions_OptimizeMode_value = map[string]int32{
-	"SPEED":        1,
-	"CODE_SIZE":    2,
-	"LITE_RUNTIME": 3,
-}
-
-func (x FileOptions_OptimizeMode) Enum() *FileOptions_OptimizeMode {
-	p := new(FileOptions_OptimizeMode)
-	*p = x
-	return p
-}
-func (x FileOptions_OptimizeMode) String() string {
-	return proto.EnumName(FileOptions_OptimizeMode_name, int32(x))
-}
-func (x *FileOptions_OptimizeMode) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FileOptions_OptimizeMode_value, data, "FileOptions_OptimizeMode")
-	if err != nil {
-		return err
-	}
-	*x = FileOptions_OptimizeMode(value)
-	return nil
-}
-func (FileOptions_OptimizeMode) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{10, 0} }
-
-type FieldOptions_CType int32
-
-const (
-	// Default mode.
-	FieldOptions_STRING       FieldOptions_CType = 0
-	FieldOptions_CORD         FieldOptions_CType = 1
-	FieldOptions_STRING_PIECE FieldOptions_CType = 2
-)
-
-var FieldOptions_CType_name = map[int32]string{
-	0: "STRING",
-	1: "CORD",
-	2: "STRING_PIECE",
-}
-var FieldOptions_CType_value = map[string]int32{
-	"STRING":       0,
-	"CORD":         1,
-	"STRING_PIECE": 2,
-}
-
-func (x FieldOptions_CType) Enum() *FieldOptions_CType {
-	p := new(FieldOptions_CType)
-	*p = x
-	return p
-}
-func (x FieldOptions_CType) String() string {
-	return proto.EnumName(FieldOptions_CType_name, int32(x))
-}
-func (x *FieldOptions_CType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldOptions_CType_value, data, "FieldOptions_CType")
-	if err != nil {
-		return err
-	}
-	*x = FieldOptions_CType(value)
-	return nil
-}
-func (FieldOptions_CType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 0} }
-
-type FieldOptions_JSType int32
-
-const (
-	// Use the default type.
-	FieldOptions_JS_NORMAL FieldOptions_JSType = 0
-	// Use JavaScript strings.
-	FieldOptions_JS_STRING FieldOptions_JSType = 1
-	// Use JavaScript numbers.
-	FieldOptions_JS_NUMBER FieldOptions_JSType = 2
-)
-
-var FieldOptions_JSType_name = map[int32]string{
-	0: "JS_NORMAL",
-	1: "JS_STRING",
-	2: "JS_NUMBER",
-}
-var FieldOptions_JSType_value = map[string]int32{
-	"JS_NORMAL": 0,
-	"JS_STRING": 1,
-	"JS_NUMBER": 2,
-}
-
-func (x FieldOptions_JSType) Enum() *FieldOptions_JSType {
-	p := new(FieldOptions_JSType)
-	*p = x
-	return p
-}
-func (x FieldOptions_JSType) String() string {
-	return proto.EnumName(FieldOptions_JSType_name, int32(x))
-}
-func (x *FieldOptions_JSType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(FieldOptions_JSType_value, data, "FieldOptions_JSType")
-	if err != nil {
-		return err
-	}
-	*x = FieldOptions_JSType(value)
-	return nil
-}
-func (FieldOptions_JSType) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{12, 1} }
-
-// Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-// or neither? HTTP based RPC implementation may choose GET verb for safe
-// methods, and PUT verb for idempotent methods instead of the default POST.
-type MethodOptions_IdempotencyLevel int32
-
-const (
-	MethodOptions_IDEMPOTENCY_UNKNOWN MethodOptions_IdempotencyLevel = 0
-	MethodOptions_NO_SIDE_EFFECTS     MethodOptions_IdempotencyLevel = 1
-	MethodOptions_IDEMPOTENT          MethodOptions_IdempotencyLevel = 2
-)
-
-var MethodOptions_IdempotencyLevel_name = map[int32]string{
-	0: "IDEMPOTENCY_UNKNOWN",
-	1: "NO_SIDE_EFFECTS",
-	2: "IDEMPOTENT",
-}
-var MethodOptions_IdempotencyLevel_value = map[string]int32{
-	"IDEMPOTENCY_UNKNOWN": 0,
-	"NO_SIDE_EFFECTS":     1,
-	"IDEMPOTENT":          2,
-}
-
-func (x MethodOptions_IdempotencyLevel) Enum() *MethodOptions_IdempotencyLevel {
-	p := new(MethodOptions_IdempotencyLevel)
-	*p = x
-	return p
-}
-func (x MethodOptions_IdempotencyLevel) String() string {
-	return proto.EnumName(MethodOptions_IdempotencyLevel_name, int32(x))
-}
-func (x *MethodOptions_IdempotencyLevel) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(MethodOptions_IdempotencyLevel_value, data, "MethodOptions_IdempotencyLevel")
-	if err != nil {
-		return err
-	}
-	*x = MethodOptions_IdempotencyLevel(value)
-	return nil
-}
-func (MethodOptions_IdempotencyLevel) EnumDescriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{17, 0}
-}
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-type FileDescriptorSet struct {
-	File             []*FileDescriptorProto `protobuf:"bytes,1,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *FileDescriptorSet) Reset()                    { *m = FileDescriptorSet{} }
-func (m *FileDescriptorSet) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorSet) ProtoMessage()               {}
-func (*FileDescriptorSet) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *FileDescriptorSet) GetFile() []*FileDescriptorProto {
-	if m != nil {
-		return m.File
-	}
-	return nil
-}
-
-// Describes a complete .proto file.
-type FileDescriptorProto struct {
-	Name    *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Package *string `protobuf:"bytes,2,opt,name=package" json:"package,omitempty"`
-	// Names of files imported by this file.
-	Dependency []string `protobuf:"bytes,3,rep,name=dependency" json:"dependency,omitempty"`
-	// Indexes of the public imported files in the dependency list above.
-	PublicDependency []int32 `protobuf:"varint,10,rep,name=public_dependency,json=publicDependency" json:"public_dependency,omitempty"`
-	// Indexes of the weak imported files in the dependency list.
-	// For Google-internal migration only. Do not use.
-	WeakDependency []int32 `protobuf:"varint,11,rep,name=weak_dependency,json=weakDependency" json:"weak_dependency,omitempty"`
-	// All top-level definitions in this file.
-	MessageType []*DescriptorProto        `protobuf:"bytes,4,rep,name=message_type,json=messageType" json:"message_type,omitempty"`
-	EnumType    []*EnumDescriptorProto    `protobuf:"bytes,5,rep,name=enum_type,json=enumType" json:"enum_type,omitempty"`
-	Service     []*ServiceDescriptorProto `protobuf:"bytes,6,rep,name=service" json:"service,omitempty"`
-	Extension   []*FieldDescriptorProto   `protobuf:"bytes,7,rep,name=extension" json:"extension,omitempty"`
-	Options     *FileOptions              `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	// This field contains optional information about the original source code.
-	// You may safely remove this entire field without harming runtime
-	// functionality of the descriptors -- the information is needed only by
-	// development tools.
-	SourceCodeInfo *SourceCodeInfo `protobuf:"bytes,9,opt,name=source_code_info,json=sourceCodeInfo" json:"source_code_info,omitempty"`
-	// The syntax of the proto file.
-	// The supported values are "proto2" and "proto3".
-	Syntax           *string `protobuf:"bytes,12,opt,name=syntax" json:"syntax,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *FileDescriptorProto) Reset()                    { *m = FileDescriptorProto{} }
-func (m *FileDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FileDescriptorProto) ProtoMessage()               {}
-func (*FileDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *FileDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *FileDescriptorProto) GetPackage() string {
-	if m != nil && m.Package != nil {
-		return *m.Package
-	}
-	return ""
-}
-
-func (m *FileDescriptorProto) GetDependency() []string {
-	if m != nil {
-		return m.Dependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetPublicDependency() []int32 {
-	if m != nil {
-		return m.PublicDependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetWeakDependency() []int32 {
-	if m != nil {
-		return m.WeakDependency
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetMessageType() []*DescriptorProto {
-	if m != nil {
-		return m.MessageType
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetEnumType() []*EnumDescriptorProto {
-	if m != nil {
-		return m.EnumType
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetService() []*ServiceDescriptorProto {
-	if m != nil {
-		return m.Service
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetExtension() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Extension
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetOptions() *FileOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetSourceCodeInfo() *SourceCodeInfo {
-	if m != nil {
-		return m.SourceCodeInfo
-	}
-	return nil
-}
-
-func (m *FileDescriptorProto) GetSyntax() string {
-	if m != nil && m.Syntax != nil {
-		return *m.Syntax
-	}
-	return ""
-}
-
-// Describes a message type.
-type DescriptorProto struct {
-	Name           *string                           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Field          []*FieldDescriptorProto           `protobuf:"bytes,2,rep,name=field" json:"field,omitempty"`
-	Extension      []*FieldDescriptorProto           `protobuf:"bytes,6,rep,name=extension" json:"extension,omitempty"`
-	NestedType     []*DescriptorProto                `protobuf:"bytes,3,rep,name=nested_type,json=nestedType" json:"nested_type,omitempty"`
-	EnumType       []*EnumDescriptorProto            `protobuf:"bytes,4,rep,name=enum_type,json=enumType" json:"enum_type,omitempty"`
-	ExtensionRange []*DescriptorProto_ExtensionRange `protobuf:"bytes,5,rep,name=extension_range,json=extensionRange" json:"extension_range,omitempty"`
-	OneofDecl      []*OneofDescriptorProto           `protobuf:"bytes,8,rep,name=oneof_decl,json=oneofDecl" json:"oneof_decl,omitempty"`
-	Options        *MessageOptions                   `protobuf:"bytes,7,opt,name=options" json:"options,omitempty"`
-	ReservedRange  []*DescriptorProto_ReservedRange  `protobuf:"bytes,9,rep,name=reserved_range,json=reservedRange" json:"reserved_range,omitempty"`
-	// Reserved field names, which may not be used by fields in the same message.
-	// A given name may only be reserved once.
-	ReservedName     []string `protobuf:"bytes,10,rep,name=reserved_name,json=reservedName" json:"reserved_name,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *DescriptorProto) Reset()                    { *m = DescriptorProto{} }
-func (m *DescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*DescriptorProto) ProtoMessage()               {}
-func (*DescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *DescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *DescriptorProto) GetField() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Field
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetExtension() []*FieldDescriptorProto {
-	if m != nil {
-		return m.Extension
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetNestedType() []*DescriptorProto {
-	if m != nil {
-		return m.NestedType
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetEnumType() []*EnumDescriptorProto {
-	if m != nil {
-		return m.EnumType
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetExtensionRange() []*DescriptorProto_ExtensionRange {
-	if m != nil {
-		return m.ExtensionRange
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetOneofDecl() []*OneofDescriptorProto {
-	if m != nil {
-		return m.OneofDecl
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetOptions() *MessageOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetReservedRange() []*DescriptorProto_ReservedRange {
-	if m != nil {
-		return m.ReservedRange
-	}
-	return nil
-}
-
-func (m *DescriptorProto) GetReservedName() []string {
-	if m != nil {
-		return m.ReservedName
-	}
-	return nil
-}
-
-type DescriptorProto_ExtensionRange struct {
-	Start            *int32                 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End              *int32                 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	Options          *ExtensionRangeOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                 `json:"-"`
-}
-
-func (m *DescriptorProto_ExtensionRange) Reset()         { *m = DescriptorProto_ExtensionRange{} }
-func (m *DescriptorProto_ExtensionRange) String() string { return proto.CompactTextString(m) }
-func (*DescriptorProto_ExtensionRange) ProtoMessage()    {}
-func (*DescriptorProto_ExtensionRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 0}
-}
-
-func (m *DescriptorProto_ExtensionRange) GetStart() int32 {
-	if m != nil && m.Start != nil {
-		return *m.Start
-	}
-	return 0
-}
-
-func (m *DescriptorProto_ExtensionRange) GetEnd() int32 {
-	if m != nil && m.End != nil {
-		return *m.End
-	}
-	return 0
-}
-
-func (m *DescriptorProto_ExtensionRange) GetOptions() *ExtensionRangeOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Range of reserved tag numbers. Reserved tag numbers may not be used by
-// fields or extension ranges in the same message. Reserved ranges may
-// not overlap.
-type DescriptorProto_ReservedRange struct {
-	Start            *int32 `protobuf:"varint,1,opt,name=start" json:"start,omitempty"`
-	End              *int32 `protobuf:"varint,2,opt,name=end" json:"end,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *DescriptorProto_ReservedRange) Reset()         { *m = DescriptorProto_ReservedRange{} }
-func (m *DescriptorProto_ReservedRange) String() string { return proto.CompactTextString(m) }
-func (*DescriptorProto_ReservedRange) ProtoMessage()    {}
-func (*DescriptorProto_ReservedRange) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{2, 1}
-}
-
-func (m *DescriptorProto_ReservedRange) GetStart() int32 {
-	if m != nil && m.Start != nil {
-		return *m.Start
-	}
-	return 0
-}
-
-func (m *DescriptorProto_ReservedRange) GetEnd() int32 {
-	if m != nil && m.End != nil {
-		return *m.End
-	}
-	return 0
-}
-
-type ExtensionRangeOptions struct {
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *ExtensionRangeOptions) Reset()                    { *m = ExtensionRangeOptions{} }
-func (m *ExtensionRangeOptions) String() string            { return proto.CompactTextString(m) }
-func (*ExtensionRangeOptions) ProtoMessage()               {}
-func (*ExtensionRangeOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-
-var extRange_ExtensionRangeOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*ExtensionRangeOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ExtensionRangeOptions
-}
-
-func (m *ExtensionRangeOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-// Describes a field within a message.
-type FieldDescriptorProto struct {
-	Name   *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number *int32                      `protobuf:"varint,3,opt,name=number" json:"number,omitempty"`
-	Label  *FieldDescriptorProto_Label `protobuf:"varint,4,opt,name=label,enum=google.protobuf.FieldDescriptorProto_Label" json:"label,omitempty"`
-	// If type_name is set, this need not be set.  If both this and type_name
-	// are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-	Type *FieldDescriptorProto_Type `protobuf:"varint,5,opt,name=type,enum=google.protobuf.FieldDescriptorProto_Type" json:"type,omitempty"`
-	// For message and enum types, this is the name of the type.  If the name
-	// starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-	// rules are used to find the type (i.e. first the nested types within this
-	// message are searched, then within the parent, on up to the root
-	// namespace).
-	TypeName *string `protobuf:"bytes,6,opt,name=type_name,json=typeName" json:"type_name,omitempty"`
-	// For extensions, this is the name of the type being extended.  It is
-	// resolved in the same manner as type_name.
-	Extendee *string `protobuf:"bytes,2,opt,name=extendee" json:"extendee,omitempty"`
-	// For numeric types, contains the original text representation of the value.
-	// For booleans, "true" or "false".
-	// For strings, contains the default text contents (not escaped in any way).
-	// For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-	// TODO(kenton):  Base-64 encode?
-	DefaultValue *string `protobuf:"bytes,7,opt,name=default_value,json=defaultValue" json:"default_value,omitempty"`
-	// If set, gives the index of a oneof in the containing type's oneof_decl
-	// list.  This field is a member of that oneof.
-	OneofIndex *int32 `protobuf:"varint,9,opt,name=oneof_index,json=oneofIndex" json:"oneof_index,omitempty"`
-	// JSON name of this field. The value is set by protocol compiler. If the
-	// user has set a "json_name" option on this field, that option's value
-	// will be used. Otherwise, it's deduced from the field's name by converting
-	// it to camelCase.
-	JsonName         *string       `protobuf:"bytes,10,opt,name=json_name,json=jsonName" json:"json_name,omitempty"`
-	Options          *FieldOptions `protobuf:"bytes,8,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *FieldDescriptorProto) Reset()                    { *m = FieldDescriptorProto{} }
-func (m *FieldDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*FieldDescriptorProto) ProtoMessage()               {}
-func (*FieldDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-
-func (m *FieldDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetNumber() int32 {
-	if m != nil && m.Number != nil {
-		return *m.Number
-	}
-	return 0
-}
-
-func (m *FieldDescriptorProto) GetLabel() FieldDescriptorProto_Label {
-	if m != nil && m.Label != nil {
-		return *m.Label
-	}
-	return FieldDescriptorProto_LABEL_OPTIONAL
-}
-
-func (m *FieldDescriptorProto) GetType() FieldDescriptorProto_Type {
-	if m != nil && m.Type != nil {
-		return *m.Type
-	}
-	return FieldDescriptorProto_TYPE_DOUBLE
-}
-
-func (m *FieldDescriptorProto) GetTypeName() string {
-	if m != nil && m.TypeName != nil {
-		return *m.TypeName
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetExtendee() string {
-	if m != nil && m.Extendee != nil {
-		return *m.Extendee
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetDefaultValue() string {
-	if m != nil && m.DefaultValue != nil {
-		return *m.DefaultValue
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetOneofIndex() int32 {
-	if m != nil && m.OneofIndex != nil {
-		return *m.OneofIndex
-	}
-	return 0
-}
-
-func (m *FieldDescriptorProto) GetJsonName() string {
-	if m != nil && m.JsonName != nil {
-		return *m.JsonName
-	}
-	return ""
-}
-
-func (m *FieldDescriptorProto) GetOptions() *FieldOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a oneof.
-type OneofDescriptorProto struct {
-	Name             *string       `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Options          *OneofOptions `protobuf:"bytes,2,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte        `json:"-"`
-}
-
-func (m *OneofDescriptorProto) Reset()                    { *m = OneofDescriptorProto{} }
-func (m *OneofDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*OneofDescriptorProto) ProtoMessage()               {}
-func (*OneofDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-
-func (m *OneofDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *OneofDescriptorProto) GetOptions() *OneofOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes an enum type.
-type EnumDescriptorProto struct {
-	Name             *string                     `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Value            []*EnumValueDescriptorProto `protobuf:"bytes,2,rep,name=value" json:"value,omitempty"`
-	Options          *EnumOptions                `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                      `json:"-"`
-}
-
-func (m *EnumDescriptorProto) Reset()                    { *m = EnumDescriptorProto{} }
-func (m *EnumDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumDescriptorProto) ProtoMessage()               {}
-func (*EnumDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-
-func (m *EnumDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *EnumDescriptorProto) GetValue() []*EnumValueDescriptorProto {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func (m *EnumDescriptorProto) GetOptions() *EnumOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a value within an enum.
-type EnumValueDescriptorProto struct {
-	Name             *string           `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Number           *int32            `protobuf:"varint,2,opt,name=number" json:"number,omitempty"`
-	Options          *EnumValueOptions `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte            `json:"-"`
-}
-
-func (m *EnumValueDescriptorProto) Reset()                    { *m = EnumValueDescriptorProto{} }
-func (m *EnumValueDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueDescriptorProto) ProtoMessage()               {}
-func (*EnumValueDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-
-func (m *EnumValueDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *EnumValueDescriptorProto) GetNumber() int32 {
-	if m != nil && m.Number != nil {
-		return *m.Number
-	}
-	return 0
-}
-
-func (m *EnumValueDescriptorProto) GetOptions() *EnumValueOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a service.
-type ServiceDescriptorProto struct {
-	Name             *string                  `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	Method           []*MethodDescriptorProto `protobuf:"bytes,2,rep,name=method" json:"method,omitempty"`
-	Options          *ServiceOptions          `protobuf:"bytes,3,opt,name=options" json:"options,omitempty"`
-	XXX_unrecognized []byte                   `json:"-"`
-}
-
-func (m *ServiceDescriptorProto) Reset()                    { *m = ServiceDescriptorProto{} }
-func (m *ServiceDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*ServiceDescriptorProto) ProtoMessage()               {}
-func (*ServiceDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-
-func (m *ServiceDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *ServiceDescriptorProto) GetMethod() []*MethodDescriptorProto {
-	if m != nil {
-		return m.Method
-	}
-	return nil
-}
-
-func (m *ServiceDescriptorProto) GetOptions() *ServiceOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-// Describes a method of a service.
-type MethodDescriptorProto struct {
-	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// Input and output type names.  These are resolved in the same way as
-	// FieldDescriptorProto.type_name, but must refer to a message type.
-	InputType  *string        `protobuf:"bytes,2,opt,name=input_type,json=inputType" json:"input_type,omitempty"`
-	OutputType *string        `protobuf:"bytes,3,opt,name=output_type,json=outputType" json:"output_type,omitempty"`
-	Options    *MethodOptions `protobuf:"bytes,4,opt,name=options" json:"options,omitempty"`
-	// Identifies if client streams multiple client messages
-	ClientStreaming *bool `protobuf:"varint,5,opt,name=client_streaming,json=clientStreaming,def=0" json:"client_streaming,omitempty"`
-	// Identifies if server streams multiple server messages
-	ServerStreaming  *bool  `protobuf:"varint,6,opt,name=server_streaming,json=serverStreaming,def=0" json:"server_streaming,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *MethodDescriptorProto) Reset()                    { *m = MethodDescriptorProto{} }
-func (m *MethodDescriptorProto) String() string            { return proto.CompactTextString(m) }
-func (*MethodDescriptorProto) ProtoMessage()               {}
-func (*MethodDescriptorProto) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{9} }
-
-const Default_MethodDescriptorProto_ClientStreaming bool = false
-const Default_MethodDescriptorProto_ServerStreaming bool = false
-
-func (m *MethodDescriptorProto) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetInputType() string {
-	if m != nil && m.InputType != nil {
-		return *m.InputType
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetOutputType() string {
-	if m != nil && m.OutputType != nil {
-		return *m.OutputType
-	}
-	return ""
-}
-
-func (m *MethodDescriptorProto) GetOptions() *MethodOptions {
-	if m != nil {
-		return m.Options
-	}
-	return nil
-}
-
-func (m *MethodDescriptorProto) GetClientStreaming() bool {
-	if m != nil && m.ClientStreaming != nil {
-		return *m.ClientStreaming
-	}
-	return Default_MethodDescriptorProto_ClientStreaming
-}
-
-func (m *MethodDescriptorProto) GetServerStreaming() bool {
-	if m != nil && m.ServerStreaming != nil {
-		return *m.ServerStreaming
-	}
-	return Default_MethodDescriptorProto_ServerStreaming
-}
-
-type FileOptions struct {
-	// Sets the Java package where classes generated from this .proto will be
-	// placed.  By default, the proto package is used, but this is often
-	// inappropriate because proto packages do not normally start with backwards
-	// domain names.
-	JavaPackage *string `protobuf:"bytes,1,opt,name=java_package,json=javaPackage" json:"java_package,omitempty"`
-	// If set, all the classes from the .proto file are wrapped in a single
-	// outer class with the given name.  This applies to both Proto1
-	// (equivalent to the old "--one_java_file" option) and Proto2 (where
-	// a .proto always translates to a single class, but you may want to
-	// explicitly choose the class name).
-	JavaOuterClassname *string `protobuf:"bytes,8,opt,name=java_outer_classname,json=javaOuterClassname" json:"java_outer_classname,omitempty"`
-	// If set true, then the Java code generator will generate a separate .java
-	// file for each top-level message, enum, and service defined in the .proto
-	// file.  Thus, these types will *not* be nested inside the outer class
-	// named by java_outer_classname.  However, the outer class will still be
-	// generated to contain the file's getDescriptor() method as well as any
-	// top-level extensions defined in the file.
-	JavaMultipleFiles *bool `protobuf:"varint,10,opt,name=java_multiple_files,json=javaMultipleFiles,def=0" json:"java_multiple_files,omitempty"`
-	// This option does nothing.
-	JavaGenerateEqualsAndHash *bool `protobuf:"varint,20,opt,name=java_generate_equals_and_hash,json=javaGenerateEqualsAndHash" json:"java_generate_equals_and_hash,omitempty"`
-	// If set true, then the Java2 code generator will generate code that
-	// throws an exception whenever an attempt is made to assign a non-UTF-8
-	// byte sequence to a string field.
-	// Message reflection will do the same.
-	// However, an extension field still accepts non-UTF-8 byte sequences.
-	// This option has no effect on when used with the lite runtime.
-	JavaStringCheckUtf8 *bool                     `protobuf:"varint,27,opt,name=java_string_check_utf8,json=javaStringCheckUtf8,def=0" json:"java_string_check_utf8,omitempty"`
-	OptimizeFor         *FileOptions_OptimizeMode `protobuf:"varint,9,opt,name=optimize_for,json=optimizeFor,enum=google.protobuf.FileOptions_OptimizeMode,def=1" json:"optimize_for,omitempty"`
-	// Sets the Go package where structs generated from this .proto will be
-	// placed. If omitted, the Go package will be derived from the following:
-	//   - The basename of the package import path, if provided.
-	//   - Otherwise, the package statement in the .proto file, if present.
-	//   - Otherwise, the basename of the .proto file, without extension.
-	GoPackage *string `protobuf:"bytes,11,opt,name=go_package,json=goPackage" json:"go_package,omitempty"`
-	// Should generic services be generated in each language?  "Generic" services
-	// are not specific to any particular RPC system.  They are generated by the
-	// main code generators in each language (without additional plugins).
-	// Generic services were the only kind of service generation supported by
-	// early versions of google.protobuf.
-	//
-	// Generic services are now considered deprecated in favor of using plugins
-	// that generate code specific to your particular RPC system.  Therefore,
-	// these default to false.  Old code which depends on generic services should
-	// explicitly set them to true.
-	CcGenericServices   *bool `protobuf:"varint,16,opt,name=cc_generic_services,json=ccGenericServices,def=0" json:"cc_generic_services,omitempty"`
-	JavaGenericServices *bool `protobuf:"varint,17,opt,name=java_generic_services,json=javaGenericServices,def=0" json:"java_generic_services,omitempty"`
-	PyGenericServices   *bool `protobuf:"varint,18,opt,name=py_generic_services,json=pyGenericServices,def=0" json:"py_generic_services,omitempty"`
-	PhpGenericServices  *bool `protobuf:"varint,42,opt,name=php_generic_services,json=phpGenericServices,def=0" json:"php_generic_services,omitempty"`
-	// Is this file deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for everything in the file, or it will be completely ignored; in the very
-	// least, this is a formalization for deprecating files.
-	Deprecated *bool `protobuf:"varint,23,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// Enables the use of arenas for the proto messages in this file. This applies
-	// only to generated classes for C++.
-	CcEnableArenas *bool `protobuf:"varint,31,opt,name=cc_enable_arenas,json=ccEnableArenas,def=0" json:"cc_enable_arenas,omitempty"`
-	// Sets the objective c class prefix which is prepended to all objective c
-	// generated classes from this .proto. There is no default.
-	ObjcClassPrefix *string `protobuf:"bytes,36,opt,name=objc_class_prefix,json=objcClassPrefix" json:"objc_class_prefix,omitempty"`
-	// Namespace for generated classes; defaults to the package.
-	CsharpNamespace *string `protobuf:"bytes,37,opt,name=csharp_namespace,json=csharpNamespace" json:"csharp_namespace,omitempty"`
-	// By default Swift generators will take the proto package and CamelCase it
-	// replacing '.' with underscore and use that to prefix the types/symbols
-	// defined. When this options is provided, they will use this value instead
-	// to prefix the types/symbols defined.
-	SwiftPrefix *string `protobuf:"bytes,39,opt,name=swift_prefix,json=swiftPrefix" json:"swift_prefix,omitempty"`
-	// Sets the php class prefix which is prepended to all php generated classes
-	// from this .proto. Default is empty.
-	PhpClassPrefix *string `protobuf:"bytes,40,opt,name=php_class_prefix,json=phpClassPrefix" json:"php_class_prefix,omitempty"`
-	// Use this option to change the namespace of php generated classes. Default
-	// is empty. When this option is empty, the package name will be used for
-	// determining the namespace.
-	PhpNamespace *string `protobuf:"bytes,41,opt,name=php_namespace,json=phpNamespace" json:"php_namespace,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *FileOptions) Reset()                    { *m = FileOptions{} }
-func (m *FileOptions) String() string            { return proto.CompactTextString(m) }
-func (*FileOptions) ProtoMessage()               {}
-func (*FileOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{10} }
-
-var extRange_FileOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*FileOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_FileOptions
-}
-
-const Default_FileOptions_JavaMultipleFiles bool = false
-const Default_FileOptions_JavaStringCheckUtf8 bool = false
-const Default_FileOptions_OptimizeFor FileOptions_OptimizeMode = FileOptions_SPEED
-const Default_FileOptions_CcGenericServices bool = false
-const Default_FileOptions_JavaGenericServices bool = false
-const Default_FileOptions_PyGenericServices bool = false
-const Default_FileOptions_PhpGenericServices bool = false
-const Default_FileOptions_Deprecated bool = false
-const Default_FileOptions_CcEnableArenas bool = false
-
-func (m *FileOptions) GetJavaPackage() string {
-	if m != nil && m.JavaPackage != nil {
-		return *m.JavaPackage
-	}
-	return ""
-}
-
-func (m *FileOptions) GetJavaOuterClassname() string {
-	if m != nil && m.JavaOuterClassname != nil {
-		return *m.JavaOuterClassname
-	}
-	return ""
-}
-
-func (m *FileOptions) GetJavaMultipleFiles() bool {
-	if m != nil && m.JavaMultipleFiles != nil {
-		return *m.JavaMultipleFiles
-	}
-	return Default_FileOptions_JavaMultipleFiles
-}
-
-func (m *FileOptions) GetJavaGenerateEqualsAndHash() bool {
-	if m != nil && m.JavaGenerateEqualsAndHash != nil {
-		return *m.JavaGenerateEqualsAndHash
-	}
-	return false
-}
-
-func (m *FileOptions) GetJavaStringCheckUtf8() bool {
-	if m != nil && m.JavaStringCheckUtf8 != nil {
-		return *m.JavaStringCheckUtf8
-	}
-	return Default_FileOptions_JavaStringCheckUtf8
-}
-
-func (m *FileOptions) GetOptimizeFor() FileOptions_OptimizeMode {
-	if m != nil && m.OptimizeFor != nil {
-		return *m.OptimizeFor
-	}
-	return Default_FileOptions_OptimizeFor
-}
-
-func (m *FileOptions) GetGoPackage() string {
-	if m != nil && m.GoPackage != nil {
-		return *m.GoPackage
-	}
-	return ""
-}
-
-func (m *FileOptions) GetCcGenericServices() bool {
-	if m != nil && m.CcGenericServices != nil {
-		return *m.CcGenericServices
-	}
-	return Default_FileOptions_CcGenericServices
-}
-
-func (m *FileOptions) GetJavaGenericServices() bool {
-	if m != nil && m.JavaGenericServices != nil {
-		return *m.JavaGenericServices
-	}
-	return Default_FileOptions_JavaGenericServices
-}
-
-func (m *FileOptions) GetPyGenericServices() bool {
-	if m != nil && m.PyGenericServices != nil {
-		return *m.PyGenericServices
-	}
-	return Default_FileOptions_PyGenericServices
-}
-
-func (m *FileOptions) GetPhpGenericServices() bool {
-	if m != nil && m.PhpGenericServices != nil {
-		return *m.PhpGenericServices
-	}
-	return Default_FileOptions_PhpGenericServices
-}
-
-func (m *FileOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_FileOptions_Deprecated
-}
-
-func (m *FileOptions) GetCcEnableArenas() bool {
-	if m != nil && m.CcEnableArenas != nil {
-		return *m.CcEnableArenas
-	}
-	return Default_FileOptions_CcEnableArenas
-}
-
-func (m *FileOptions) GetObjcClassPrefix() string {
-	if m != nil && m.ObjcClassPrefix != nil {
-		return *m.ObjcClassPrefix
-	}
-	return ""
-}
-
-func (m *FileOptions) GetCsharpNamespace() string {
-	if m != nil && m.CsharpNamespace != nil {
-		return *m.CsharpNamespace
-	}
-	return ""
-}
-
-func (m *FileOptions) GetSwiftPrefix() string {
-	if m != nil && m.SwiftPrefix != nil {
-		return *m.SwiftPrefix
-	}
-	return ""
-}
-
-func (m *FileOptions) GetPhpClassPrefix() string {
-	if m != nil && m.PhpClassPrefix != nil {
-		return *m.PhpClassPrefix
-	}
-	return ""
-}
-
-func (m *FileOptions) GetPhpNamespace() string {
-	if m != nil && m.PhpNamespace != nil {
-		return *m.PhpNamespace
-	}
-	return ""
-}
-
-func (m *FileOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type MessageOptions struct {
-	// Set true to use the old proto1 MessageSet wire format for extensions.
-	// This is provided for backwards-compatibility with the MessageSet wire
-	// format.  You should not use this for any other reason:  It's less
-	// efficient, has fewer features, and is more complicated.
-	//
-	// The message must be defined exactly as follows:
-	//   message Foo {
-	//     option message_set_wire_format = true;
-	//     extensions 4 to max;
-	//   }
-	// Note that the message cannot have any defined fields; MessageSets only
-	// have extensions.
-	//
-	// All extensions of your type must be singular messages; e.g. they cannot
-	// be int32s, enums, or repeated messages.
-	//
-	// Because this is an option, the above two restrictions are not enforced by
-	// the protocol compiler.
-	MessageSetWireFormat *bool `protobuf:"varint,1,opt,name=message_set_wire_format,json=messageSetWireFormat,def=0" json:"message_set_wire_format,omitempty"`
-	// Disables the generation of the standard "descriptor()" accessor, which can
-	// conflict with a field of the same name.  This is meant to make migration
-	// from proto1 easier; new code should avoid fields named "descriptor".
-	NoStandardDescriptorAccessor *bool `protobuf:"varint,2,opt,name=no_standard_descriptor_accessor,json=noStandardDescriptorAccessor,def=0" json:"no_standard_descriptor_accessor,omitempty"`
-	// Is this message deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the message, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating messages.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// Whether the message is an automatically generated map entry type for the
-	// maps field.
-	//
-	// For maps fields:
-	//     map<KeyType, ValueType> map_field = 1;
-	// The parsed descriptor looks like:
-	//     message MapFieldEntry {
-	//         option map_entry = true;
-	//         optional KeyType key = 1;
-	//         optional ValueType value = 2;
-	//     }
-	//     repeated MapFieldEntry map_field = 1;
-	//
-	// Implementations may choose not to generate the map_entry=true message, but
-	// use a native map in the target language to hold the keys and values.
-	// The reflection APIs in such implementions still need to work as
-	// if the field is a repeated message field.
-	//
-	// NOTE: Do not set the option in .proto files. Always use the maps syntax
-	// instead. The option should only be implicitly set by the proto compiler
-	// parser.
-	MapEntry *bool `protobuf:"varint,7,opt,name=map_entry,json=mapEntry" json:"map_entry,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MessageOptions) Reset()                    { *m = MessageOptions{} }
-func (m *MessageOptions) String() string            { return proto.CompactTextString(m) }
-func (*MessageOptions) ProtoMessage()               {}
-func (*MessageOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{11} }
-
-var extRange_MessageOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*MessageOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MessageOptions
-}
-
-const Default_MessageOptions_MessageSetWireFormat bool = false
-const Default_MessageOptions_NoStandardDescriptorAccessor bool = false
-const Default_MessageOptions_Deprecated bool = false
-
-func (m *MessageOptions) GetMessageSetWireFormat() bool {
-	if m != nil && m.MessageSetWireFormat != nil {
-		return *m.MessageSetWireFormat
-	}
-	return Default_MessageOptions_MessageSetWireFormat
-}
-
-func (m *MessageOptions) GetNoStandardDescriptorAccessor() bool {
-	if m != nil && m.NoStandardDescriptorAccessor != nil {
-		return *m.NoStandardDescriptorAccessor
-	}
-	return Default_MessageOptions_NoStandardDescriptorAccessor
-}
-
-func (m *MessageOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_MessageOptions_Deprecated
-}
-
-func (m *MessageOptions) GetMapEntry() bool {
-	if m != nil && m.MapEntry != nil {
-		return *m.MapEntry
-	}
-	return false
-}
-
-func (m *MessageOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type FieldOptions struct {
-	// The ctype option instructs the C++ code generator to use a different
-	// representation of the field than it normally would.  See the specific
-	// options below.  This option is not yet implemented in the open source
-	// release -- sorry, we'll try to include it in a future version!
-	Ctype *FieldOptions_CType `protobuf:"varint,1,opt,name=ctype,enum=google.protobuf.FieldOptions_CType,def=0" json:"ctype,omitempty"`
-	// The packed option can be enabled for repeated primitive fields to enable
-	// a more efficient representation on the wire. Rather than repeatedly
-	// writing the tag and type for each element, the entire array is encoded as
-	// a single length-delimited blob. In proto3, only explicit setting it to
-	// false will avoid using packed encoding.
-	Packed *bool `protobuf:"varint,2,opt,name=packed" json:"packed,omitempty"`
-	// The jstype option determines the JavaScript type used for values of the
-	// field.  The option is permitted only for 64 bit integral and fixed types
-	// (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-	// is represented as JavaScript string, which avoids loss of precision that
-	// can happen when a large value is converted to a floating point JavaScript.
-	// Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-	// use the JavaScript "number" type.  The behavior of the default option
-	// JS_NORMAL is implementation dependent.
-	//
-	// This option is an enum to permit additional types to be added, e.g.
-	// goog.math.Integer.
-	Jstype *FieldOptions_JSType `protobuf:"varint,6,opt,name=jstype,enum=google.protobuf.FieldOptions_JSType,def=0" json:"jstype,omitempty"`
-	// Should this field be parsed lazily?  Lazy applies only to message-type
-	// fields.  It means that when the outer message is initially parsed, the
-	// inner message's contents will not be parsed but instead stored in encoded
-	// form.  The inner message will actually be parsed when it is first accessed.
-	//
-	// This is only a hint.  Implementations are free to choose whether to use
-	// eager or lazy parsing regardless of the value of this option.  However,
-	// setting this option true suggests that the protocol author believes that
-	// using lazy parsing on this field is worth the additional bookkeeping
-	// overhead typically needed to implement it.
-	//
-	// This option does not affect the public interface of any generated code;
-	// all method signatures remain the same.  Furthermore, thread-safety of the
-	// interface is not affected by this option; const methods remain safe to
-	// call from multiple threads concurrently, while non-const methods continue
-	// to require exclusive access.
-	//
-	//
-	// Note that implementations may choose not to check required fields within
-	// a lazy sub-message.  That is, calling IsInitialized() on the outer message
-	// may return true even if the inner message has missing required fields.
-	// This is necessary because otherwise the inner message would have to be
-	// parsed in order to perform the check, defeating the purpose of lazy
-	// parsing.  An implementation which chooses not to check required fields
-	// must be consistent about it.  That is, for any particular sub-message, the
-	// implementation must either *always* check its required fields, or *never*
-	// check its required fields, regardless of whether or not the message has
-	// been parsed.
-	Lazy *bool `protobuf:"varint,5,opt,name=lazy,def=0" json:"lazy,omitempty"`
-	// Is this field deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for accessors, or it will be completely ignored; in the very least, this
-	// is a formalization for deprecating fields.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// For Google-internal migration only. Do not use.
-	Weak *bool `protobuf:"varint,10,opt,name=weak,def=0" json:"weak,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *FieldOptions) Reset()                    { *m = FieldOptions{} }
-func (m *FieldOptions) String() string            { return proto.CompactTextString(m) }
-func (*FieldOptions) ProtoMessage()               {}
-func (*FieldOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{12} }
-
-var extRange_FieldOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*FieldOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_FieldOptions
-}
-
-const Default_FieldOptions_Ctype FieldOptions_CType = FieldOptions_STRING
-const Default_FieldOptions_Jstype FieldOptions_JSType = FieldOptions_JS_NORMAL
-const Default_FieldOptions_Lazy bool = false
-const Default_FieldOptions_Deprecated bool = false
-const Default_FieldOptions_Weak bool = false
-
-func (m *FieldOptions) GetCtype() FieldOptions_CType {
-	if m != nil && m.Ctype != nil {
-		return *m.Ctype
-	}
-	return Default_FieldOptions_Ctype
-}
-
-func (m *FieldOptions) GetPacked() bool {
-	if m != nil && m.Packed != nil {
-		return *m.Packed
-	}
-	return false
-}
-
-func (m *FieldOptions) GetJstype() FieldOptions_JSType {
-	if m != nil && m.Jstype != nil {
-		return *m.Jstype
-	}
-	return Default_FieldOptions_Jstype
-}
-
-func (m *FieldOptions) GetLazy() bool {
-	if m != nil && m.Lazy != nil {
-		return *m.Lazy
-	}
-	return Default_FieldOptions_Lazy
-}
-
-func (m *FieldOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_FieldOptions_Deprecated
-}
-
-func (m *FieldOptions) GetWeak() bool {
-	if m != nil && m.Weak != nil {
-		return *m.Weak
-	}
-	return Default_FieldOptions_Weak
-}
-
-func (m *FieldOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type OneofOptions struct {
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OneofOptions) Reset()                    { *m = OneofOptions{} }
-func (m *OneofOptions) String() string            { return proto.CompactTextString(m) }
-func (*OneofOptions) ProtoMessage()               {}
-func (*OneofOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{13} }
-
-var extRange_OneofOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*OneofOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OneofOptions
-}
-
-func (m *OneofOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type EnumOptions struct {
-	// Set this option to true to allow mapping different tag names to the same
-	// value.
-	AllowAlias *bool `protobuf:"varint,2,opt,name=allow_alias,json=allowAlias" json:"allow_alias,omitempty"`
-	// Is this enum deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the enum, or it will be completely ignored; in the very least, this
-	// is a formalization for deprecating enums.
-	Deprecated *bool `protobuf:"varint,3,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *EnumOptions) Reset()                    { *m = EnumOptions{} }
-func (m *EnumOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumOptions) ProtoMessage()               {}
-func (*EnumOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{14} }
-
-var extRange_EnumOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*EnumOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_EnumOptions
-}
-
-const Default_EnumOptions_Deprecated bool = false
-
-func (m *EnumOptions) GetAllowAlias() bool {
-	if m != nil && m.AllowAlias != nil {
-		return *m.AllowAlias
-	}
-	return false
-}
-
-func (m *EnumOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_EnumOptions_Deprecated
-}
-
-func (m *EnumOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type EnumValueOptions struct {
-	// Is this enum value deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the enum value, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating enum values.
-	Deprecated *bool `protobuf:"varint,1,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *EnumValueOptions) Reset()                    { *m = EnumValueOptions{} }
-func (m *EnumValueOptions) String() string            { return proto.CompactTextString(m) }
-func (*EnumValueOptions) ProtoMessage()               {}
-func (*EnumValueOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{15} }
-
-var extRange_EnumValueOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*EnumValueOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_EnumValueOptions
-}
-
-const Default_EnumValueOptions_Deprecated bool = false
-
-func (m *EnumValueOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_EnumValueOptions_Deprecated
-}
-
-func (m *EnumValueOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type ServiceOptions struct {
-	// Is this service deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the service, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating services.
-	Deprecated *bool `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *ServiceOptions) Reset()                    { *m = ServiceOptions{} }
-func (m *ServiceOptions) String() string            { return proto.CompactTextString(m) }
-func (*ServiceOptions) ProtoMessage()               {}
-func (*ServiceOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{16} }
-
-var extRange_ServiceOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*ServiceOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ServiceOptions
-}
-
-const Default_ServiceOptions_Deprecated bool = false
-
-func (m *ServiceOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_ServiceOptions_Deprecated
-}
-
-func (m *ServiceOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-type MethodOptions struct {
-	// Is this method deprecated?
-	// Depending on the target platform, this can emit Deprecated annotations
-	// for the method, or it will be completely ignored; in the very least,
-	// this is a formalization for deprecating methods.
-	Deprecated       *bool                           `protobuf:"varint,33,opt,name=deprecated,def=0" json:"deprecated,omitempty"`
-	IdempotencyLevel *MethodOptions_IdempotencyLevel `protobuf:"varint,34,opt,name=idempotency_level,json=idempotencyLevel,enum=google.protobuf.MethodOptions_IdempotencyLevel,def=0" json:"idempotency_level,omitempty"`
-	// The parser stores options it doesn't recognize here. See above.
-	UninterpretedOption          []*UninterpretedOption `protobuf:"bytes,999,rep,name=uninterpreted_option,json=uninterpretedOption" json:"uninterpreted_option,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *MethodOptions) Reset()                    { *m = MethodOptions{} }
-func (m *MethodOptions) String() string            { return proto.CompactTextString(m) }
-func (*MethodOptions) ProtoMessage()               {}
-func (*MethodOptions) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{17} }
-
-var extRange_MethodOptions = []proto.ExtensionRange{
-	{1000, 536870911},
-}
-
-func (*MethodOptions) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_MethodOptions
-}
-
-const Default_MethodOptions_Deprecated bool = false
-const Default_MethodOptions_IdempotencyLevel MethodOptions_IdempotencyLevel = MethodOptions_IDEMPOTENCY_UNKNOWN
-
-func (m *MethodOptions) GetDeprecated() bool {
-	if m != nil && m.Deprecated != nil {
-		return *m.Deprecated
-	}
-	return Default_MethodOptions_Deprecated
-}
-
-func (m *MethodOptions) GetIdempotencyLevel() MethodOptions_IdempotencyLevel {
-	if m != nil && m.IdempotencyLevel != nil {
-		return *m.IdempotencyLevel
-	}
-	return Default_MethodOptions_IdempotencyLevel
-}
-
-func (m *MethodOptions) GetUninterpretedOption() []*UninterpretedOption {
-	if m != nil {
-		return m.UninterpretedOption
-	}
-	return nil
-}
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-type UninterpretedOption struct {
-	Name []*UninterpretedOption_NamePart `protobuf:"bytes,2,rep,name=name" json:"name,omitempty"`
-	// The value of the uninterpreted option, in whatever type the tokenizer
-	// identified it as during parsing. Exactly one of these should be set.
-	IdentifierValue  *string  `protobuf:"bytes,3,opt,name=identifier_value,json=identifierValue" json:"identifier_value,omitempty"`
-	PositiveIntValue *uint64  `protobuf:"varint,4,opt,name=positive_int_value,json=positiveIntValue" json:"positive_int_value,omitempty"`
-	NegativeIntValue *int64   `protobuf:"varint,5,opt,name=negative_int_value,json=negativeIntValue" json:"negative_int_value,omitempty"`
-	DoubleValue      *float64 `protobuf:"fixed64,6,opt,name=double_value,json=doubleValue" json:"double_value,omitempty"`
-	StringValue      []byte   `protobuf:"bytes,7,opt,name=string_value,json=stringValue" json:"string_value,omitempty"`
-	AggregateValue   *string  `protobuf:"bytes,8,opt,name=aggregate_value,json=aggregateValue" json:"aggregate_value,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *UninterpretedOption) Reset()                    { *m = UninterpretedOption{} }
-func (m *UninterpretedOption) String() string            { return proto.CompactTextString(m) }
-func (*UninterpretedOption) ProtoMessage()               {}
-func (*UninterpretedOption) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
-
-func (m *UninterpretedOption) GetName() []*UninterpretedOption_NamePart {
-	if m != nil {
-		return m.Name
-	}
-	return nil
-}
-
-func (m *UninterpretedOption) GetIdentifierValue() string {
-	if m != nil && m.IdentifierValue != nil {
-		return *m.IdentifierValue
-	}
-	return ""
-}
-
-func (m *UninterpretedOption) GetPositiveIntValue() uint64 {
-	if m != nil && m.PositiveIntValue != nil {
-		return *m.PositiveIntValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetNegativeIntValue() int64 {
-	if m != nil && m.NegativeIntValue != nil {
-		return *m.NegativeIntValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetDoubleValue() float64 {
-	if m != nil && m.DoubleValue != nil {
-		return *m.DoubleValue
-	}
-	return 0
-}
-
-func (m *UninterpretedOption) GetStringValue() []byte {
-	if m != nil {
-		return m.StringValue
-	}
-	return nil
-}
-
-func (m *UninterpretedOption) GetAggregateValue() string {
-	if m != nil && m.AggregateValue != nil {
-		return *m.AggregateValue
-	}
-	return ""
-}
-
-// The name of the uninterpreted option.  Each string represents a segment in
-// a dot-separated name.  is_extension is true iff a segment represents an
-// extension (denoted with parentheses in options specs in .proto files).
-// E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-// "foo.(bar.baz).qux".
-type UninterpretedOption_NamePart struct {
-	NamePart         *string `protobuf:"bytes,1,req,name=name_part,json=namePart" json:"name_part,omitempty"`
-	IsExtension      *bool   `protobuf:"varint,2,req,name=is_extension,json=isExtension" json:"is_extension,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *UninterpretedOption_NamePart) Reset()         { *m = UninterpretedOption_NamePart{} }
-func (m *UninterpretedOption_NamePart) String() string { return proto.CompactTextString(m) }
-func (*UninterpretedOption_NamePart) ProtoMessage()    {}
-func (*UninterpretedOption_NamePart) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{18, 0}
-}
-
-func (m *UninterpretedOption_NamePart) GetNamePart() string {
-	if m != nil && m.NamePart != nil {
-		return *m.NamePart
-	}
-	return ""
-}
-
-func (m *UninterpretedOption_NamePart) GetIsExtension() bool {
-	if m != nil && m.IsExtension != nil {
-		return *m.IsExtension
-	}
-	return false
-}
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-type SourceCodeInfo struct {
-	// A Location identifies a piece of source code in a .proto file which
-	// corresponds to a particular definition.  This information is intended
-	// to be useful to IDEs, code indexers, documentation generators, and similar
-	// tools.
-	//
-	// For example, say we have a file like:
-	//   message Foo {
-	//     optional string foo = 1;
-	//   }
-	// Let's look at just the field definition:
-	//   optional string foo = 1;
-	//   ^       ^^     ^^  ^  ^^^
-	//   a       bc     de  f  ghi
-	// We have the following locations:
-	//   span   path               represents
-	//   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-	//   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-	//   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-	//   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-	//   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-	//
-	// Notes:
-	// - A location may refer to a repeated field itself (i.e. not to any
-	//   particular index within it).  This is used whenever a set of elements are
-	//   logically enclosed in a single code segment.  For example, an entire
-	//   extend block (possibly containing multiple extension definitions) will
-	//   have an outer location whose path refers to the "extensions" repeated
-	//   field without an index.
-	// - Multiple locations may have the same path.  This happens when a single
-	//   logical declaration is spread out across multiple places.  The most
-	//   obvious example is the "extend" block again -- there may be multiple
-	//   extend blocks in the same scope, each of which will have the same path.
-	// - A location's span is not always a subset of its parent's span.  For
-	//   example, the "extendee" of an extension declaration appears at the
-	//   beginning of the "extend" block and is shared by all extensions within
-	//   the block.
-	// - Just because a location's span is a subset of some other location's span
-	//   does not mean that it is a descendent.  For example, a "group" defines
-	//   both a type and a field in a single declaration.  Thus, the locations
-	//   corresponding to the type and field and their components will overlap.
-	// - Code which tries to interpret locations should probably be designed to
-	//   ignore those that it doesn't understand, as more types of locations could
-	//   be recorded in the future.
-	Location         []*SourceCodeInfo_Location `protobuf:"bytes,1,rep,name=location" json:"location,omitempty"`
-	XXX_unrecognized []byte                     `json:"-"`
-}
-
-func (m *SourceCodeInfo) Reset()                    { *m = SourceCodeInfo{} }
-func (m *SourceCodeInfo) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo) ProtoMessage()               {}
-func (*SourceCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19} }
-
-func (m *SourceCodeInfo) GetLocation() []*SourceCodeInfo_Location {
-	if m != nil {
-		return m.Location
-	}
-	return nil
-}
-
-type SourceCodeInfo_Location struct {
-	// Identifies which part of the FileDescriptorProto was defined at this
-	// location.
-	//
-	// Each element is a field number or an index.  They form a path from
-	// the root FileDescriptorProto to the place where the definition.  For
-	// example, this path:
-	//   [ 4, 3, 2, 7, 1 ]
-	// refers to:
-	//   file.message_type(3)  // 4, 3
-	//       .field(7)         // 2, 7
-	//       .name()           // 1
-	// This is because FileDescriptorProto.message_type has field number 4:
-	//   repeated DescriptorProto message_type = 4;
-	// and DescriptorProto.field has field number 2:
-	//   repeated FieldDescriptorProto field = 2;
-	// and FieldDescriptorProto.name has field number 1:
-	//   optional string name = 1;
-	//
-	// Thus, the above path gives the location of a field name.  If we removed
-	// the last element:
-	//   [ 4, 3, 2, 7 ]
-	// this path refers to the whole field declaration (from the beginning
-	// of the label to the terminating semicolon).
-	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
-	// Always has exactly three or four elements: start line, start column,
-	// end line (optional, otherwise assumed same as start line), end column.
-	// These are packed into a single field for efficiency.  Note that line
-	// and column numbers are zero-based -- typically you will want to add
-	// 1 to each before displaying to a user.
-	Span []int32 `protobuf:"varint,2,rep,packed,name=span" json:"span,omitempty"`
-	// If this SourceCodeInfo represents a complete declaration, these are any
-	// comments appearing before and after the declaration which appear to be
-	// attached to the declaration.
-	//
-	// A series of line comments appearing on consecutive lines, with no other
-	// tokens appearing on those lines, will be treated as a single comment.
-	//
-	// leading_detached_comments will keep paragraphs of comments that appear
-	// before (but not connected to) the current element. Each paragraph,
-	// separated by empty lines, will be one comment element in the repeated
-	// field.
-	//
-	// Only the comment content is provided; comment markers (e.g. //) are
-	// stripped out.  For block comments, leading whitespace and an asterisk
-	// will be stripped from the beginning of each line other than the first.
-	// Newlines are included in the output.
-	//
-	// Examples:
-	//
-	//   optional int32 foo = 1;  // Comment attached to foo.
-	//   // Comment attached to bar.
-	//   optional int32 bar = 2;
-	//
-	//   optional string baz = 3;
-	//   // Comment attached to baz.
-	//   // Another line attached to baz.
-	//
-	//   // Comment attached to qux.
-	//   //
-	//   // Another line attached to qux.
-	//   optional double qux = 4;
-	//
-	//   // Detached comment for corge. This is not leading or trailing comments
-	//   // to qux or corge because there are blank lines separating it from
-	//   // both.
-	//
-	//   // Detached comment for corge paragraph 2.
-	//
-	//   optional string corge = 5;
-	//   /* Block comment attached
-	//    * to corge.  Leading asterisks
-	//    * will be removed. */
-	//   /* Block comment attached to
-	//    * grault. */
-	//   optional int32 grault = 6;
-	//
-	//   // ignored detached comments.
-	LeadingComments         *string  `protobuf:"bytes,3,opt,name=leading_comments,json=leadingComments" json:"leading_comments,omitempty"`
-	TrailingComments        *string  `protobuf:"bytes,4,opt,name=trailing_comments,json=trailingComments" json:"trailing_comments,omitempty"`
-	LeadingDetachedComments []string `protobuf:"bytes,6,rep,name=leading_detached_comments,json=leadingDetachedComments" json:"leading_detached_comments,omitempty"`
-	XXX_unrecognized        []byte   `json:"-"`
-}
-
-func (m *SourceCodeInfo_Location) Reset()                    { *m = SourceCodeInfo_Location{} }
-func (m *SourceCodeInfo_Location) String() string            { return proto.CompactTextString(m) }
-func (*SourceCodeInfo_Location) ProtoMessage()               {}
-func (*SourceCodeInfo_Location) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{19, 0} }
-
-func (m *SourceCodeInfo_Location) GetPath() []int32 {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-func (m *SourceCodeInfo_Location) GetSpan() []int32 {
-	if m != nil {
-		return m.Span
-	}
-	return nil
-}
-
-func (m *SourceCodeInfo_Location) GetLeadingComments() string {
-	if m != nil && m.LeadingComments != nil {
-		return *m.LeadingComments
-	}
-	return ""
-}
-
-func (m *SourceCodeInfo_Location) GetTrailingComments() string {
-	if m != nil && m.TrailingComments != nil {
-		return *m.TrailingComments
-	}
-	return ""
-}
-
-func (m *SourceCodeInfo_Location) GetLeadingDetachedComments() []string {
-	if m != nil {
-		return m.LeadingDetachedComments
-	}
-	return nil
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-type GeneratedCodeInfo struct {
-	// An Annotation connects some span of text in generated code to an element
-	// of its generating .proto file.
-	Annotation       []*GeneratedCodeInfo_Annotation `protobuf:"bytes,1,rep,name=annotation" json:"annotation,omitempty"`
-	XXX_unrecognized []byte                          `json:"-"`
-}
-
-func (m *GeneratedCodeInfo) Reset()                    { *m = GeneratedCodeInfo{} }
-func (m *GeneratedCodeInfo) String() string            { return proto.CompactTextString(m) }
-func (*GeneratedCodeInfo) ProtoMessage()               {}
-func (*GeneratedCodeInfo) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{20} }
-
-func (m *GeneratedCodeInfo) GetAnnotation() []*GeneratedCodeInfo_Annotation {
-	if m != nil {
-		return m.Annotation
-	}
-	return nil
-}
-
-type GeneratedCodeInfo_Annotation struct {
-	// Identifies the element in the original source .proto file. This field
-	// is formatted the same as SourceCodeInfo.Location.path.
-	Path []int32 `protobuf:"varint,1,rep,packed,name=path" json:"path,omitempty"`
-	// Identifies the filesystem path to the original source .proto.
-	SourceFile *string `protobuf:"bytes,2,opt,name=source_file,json=sourceFile" json:"source_file,omitempty"`
-	// Identifies the starting offset in bytes in the generated code
-	// that relates to the identified object.
-	Begin *int32 `protobuf:"varint,3,opt,name=begin" json:"begin,omitempty"`
-	// Identifies the ending offset in bytes in the generated code that
-	// relates to the identified offset. The end offset should be one past
-	// the last relevant byte (so the length of the text = end - begin).
-	End              *int32 `protobuf:"varint,4,opt,name=end" json:"end,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *GeneratedCodeInfo_Annotation) Reset()         { *m = GeneratedCodeInfo_Annotation{} }
-func (m *GeneratedCodeInfo_Annotation) String() string { return proto.CompactTextString(m) }
-func (*GeneratedCodeInfo_Annotation) ProtoMessage()    {}
-func (*GeneratedCodeInfo_Annotation) Descriptor() ([]byte, []int) {
-	return fileDescriptor0, []int{20, 0}
-}
-
-func (m *GeneratedCodeInfo_Annotation) GetPath() []int32 {
-	if m != nil {
-		return m.Path
-	}
-	return nil
-}
-
-func (m *GeneratedCodeInfo_Annotation) GetSourceFile() string {
-	if m != nil && m.SourceFile != nil {
-		return *m.SourceFile
-	}
-	return ""
-}
-
-func (m *GeneratedCodeInfo_Annotation) GetBegin() int32 {
-	if m != nil && m.Begin != nil {
-		return *m.Begin
-	}
-	return 0
-}
-
-func (m *GeneratedCodeInfo_Annotation) GetEnd() int32 {
-	if m != nil && m.End != nil {
-		return *m.End
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*FileDescriptorSet)(nil), "google.protobuf.FileDescriptorSet")
-	proto.RegisterType((*FileDescriptorProto)(nil), "google.protobuf.FileDescriptorProto")
-	proto.RegisterType((*DescriptorProto)(nil), "google.protobuf.DescriptorProto")
-	proto.RegisterType((*DescriptorProto_ExtensionRange)(nil), "google.protobuf.DescriptorProto.ExtensionRange")
-	proto.RegisterType((*DescriptorProto_ReservedRange)(nil), "google.protobuf.DescriptorProto.ReservedRange")
-	proto.RegisterType((*ExtensionRangeOptions)(nil), "google.protobuf.ExtensionRangeOptions")
-	proto.RegisterType((*FieldDescriptorProto)(nil), "google.protobuf.FieldDescriptorProto")
-	proto.RegisterType((*OneofDescriptorProto)(nil), "google.protobuf.OneofDescriptorProto")
-	proto.RegisterType((*EnumDescriptorProto)(nil), "google.protobuf.EnumDescriptorProto")
-	proto.RegisterType((*EnumValueDescriptorProto)(nil), "google.protobuf.EnumValueDescriptorProto")
-	proto.RegisterType((*ServiceDescriptorProto)(nil), "google.protobuf.ServiceDescriptorProto")
-	proto.RegisterType((*MethodDescriptorProto)(nil), "google.protobuf.MethodDescriptorProto")
-	proto.RegisterType((*FileOptions)(nil), "google.protobuf.FileOptions")
-	proto.RegisterType((*MessageOptions)(nil), "google.protobuf.MessageOptions")
-	proto.RegisterType((*FieldOptions)(nil), "google.protobuf.FieldOptions")
-	proto.RegisterType((*OneofOptions)(nil), "google.protobuf.OneofOptions")
-	proto.RegisterType((*EnumOptions)(nil), "google.protobuf.EnumOptions")
-	proto.RegisterType((*EnumValueOptions)(nil), "google.protobuf.EnumValueOptions")
-	proto.RegisterType((*ServiceOptions)(nil), "google.protobuf.ServiceOptions")
-	proto.RegisterType((*MethodOptions)(nil), "google.protobuf.MethodOptions")
-	proto.RegisterType((*UninterpretedOption)(nil), "google.protobuf.UninterpretedOption")
-	proto.RegisterType((*UninterpretedOption_NamePart)(nil), "google.protobuf.UninterpretedOption.NamePart")
-	proto.RegisterType((*SourceCodeInfo)(nil), "google.protobuf.SourceCodeInfo")
-	proto.RegisterType((*SourceCodeInfo_Location)(nil), "google.protobuf.SourceCodeInfo.Location")
-	proto.RegisterType((*GeneratedCodeInfo)(nil), "google.protobuf.GeneratedCodeInfo")
-	proto.RegisterType((*GeneratedCodeInfo_Annotation)(nil), "google.protobuf.GeneratedCodeInfo.Annotation")
-	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Type", FieldDescriptorProto_Type_name, FieldDescriptorProto_Type_value)
-	proto.RegisterEnum("google.protobuf.FieldDescriptorProto_Label", FieldDescriptorProto_Label_name, FieldDescriptorProto_Label_value)
-	proto.RegisterEnum("google.protobuf.FileOptions_OptimizeMode", FileOptions_OptimizeMode_name, FileOptions_OptimizeMode_value)
-	proto.RegisterEnum("google.protobuf.FieldOptions_CType", FieldOptions_CType_name, FieldOptions_CType_value)
-	proto.RegisterEnum("google.protobuf.FieldOptions_JSType", FieldOptions_JSType_name, FieldOptions_JSType_value)
-	proto.RegisterEnum("google.protobuf.MethodOptions_IdempotencyLevel", MethodOptions_IdempotencyLevel_name, MethodOptions_IdempotencyLevel_value)
-}
-
-func init() { proto.RegisterFile("google/protobuf/descriptor.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 2519 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xdd, 0x6e, 0x1b, 0xc7,
-	0x15, 0x0e, 0x7f, 0x45, 0x1e, 0x52, 0xd4, 0x68, 0xa4, 0xd8, 0x6b, 0xe5, 0xc7, 0x32, 0xf3, 0x63,
-	0xd9, 0x69, 0xa8, 0x40, 0xb1, 0x1d, 0x47, 0x29, 0xd2, 0x52, 0xe4, 0x5a, 0xa1, 0x4a, 0x91, 0xec,
-	0x92, 0x6a, 0x7e, 0x6e, 0x16, 0xa3, 0xdd, 0x21, 0xb9, 0xf6, 0x72, 0x77, 0xb3, 0xbb, 0xb4, 0xad,
-	0xa0, 0x17, 0x06, 0x7a, 0x55, 0xa0, 0x0f, 0x50, 0x14, 0x45, 0x2f, 0x72, 0x13, 0xa0, 0x0f, 0x50,
-	0x20, 0x77, 0x7d, 0x82, 0x02, 0x79, 0x83, 0xa2, 0x28, 0xd0, 0x3e, 0x46, 0x31, 0x33, 0xbb, 0xcb,
-	0x5d, 0xfe, 0xc4, 0x6a, 0x80, 0x38, 0x57, 0xe4, 0x7c, 0xe7, 0x3b, 0x67, 0xce, 0x9c, 0x39, 0x33,
-	0x73, 0x66, 0x16, 0x76, 0x47, 0xb6, 0x3d, 0x32, 0xe9, 0xbe, 0xe3, 0xda, 0xbe, 0x7d, 0x3e, 0x1d,
-	0xee, 0xeb, 0xd4, 0xd3, 0x5c, 0xc3, 0xf1, 0x6d, 0xb7, 0xc6, 0x31, 0xbc, 0x21, 0x18, 0xb5, 0x90,
-	0x51, 0x3d, 0x85, 0xcd, 0x07, 0x86, 0x49, 0x9b, 0x11, 0xb1, 0x4f, 0x7d, 0x7c, 0x1f, 0xb2, 0x43,
-	0xc3, 0xa4, 0x52, 0x6a, 0x37, 0xb3, 0x57, 0x3a, 0x78, 0xb3, 0x36, 0xa7, 0x54, 0x4b, 0x6a, 0xf4,
-	0x18, 0xac, 0x70, 0x8d, 0xea, 0xbf, 0xb3, 0xb0, 0xb5, 0x44, 0x8a, 0x31, 0x64, 0x2d, 0x32, 0x61,
-	0x16, 0x53, 0x7b, 0x45, 0x85, 0xff, 0xc7, 0x12, 0xac, 0x39, 0x44, 0x7b, 0x44, 0x46, 0x54, 0x4a,
-	0x73, 0x38, 0x6c, 0xe2, 0xd7, 0x01, 0x74, 0xea, 0x50, 0x4b, 0xa7, 0x96, 0x76, 0x21, 0x65, 0x76,
-	0x33, 0x7b, 0x45, 0x25, 0x86, 0xe0, 0x77, 0x60, 0xd3, 0x99, 0x9e, 0x9b, 0x86, 0xa6, 0xc6, 0x68,
-	0xb0, 0x9b, 0xd9, 0xcb, 0x29, 0x48, 0x08, 0x9a, 0x33, 0xf2, 0x4d, 0xd8, 0x78, 0x42, 0xc9, 0xa3,
-	0x38, 0xb5, 0xc4, 0xa9, 0x15, 0x06, 0xc7, 0x88, 0x0d, 0x28, 0x4f, 0xa8, 0xe7, 0x91, 0x11, 0x55,
-	0xfd, 0x0b, 0x87, 0x4a, 0x59, 0x3e, 0xfa, 0xdd, 0x85, 0xd1, 0xcf, 0x8f, 0xbc, 0x14, 0x68, 0x0d,
-	0x2e, 0x1c, 0x8a, 0xeb, 0x50, 0xa4, 0xd6, 0x74, 0x22, 0x2c, 0xe4, 0x56, 0xc4, 0x4f, 0xb6, 0xa6,
-	0x93, 0x79, 0x2b, 0x05, 0xa6, 0x16, 0x98, 0x58, 0xf3, 0xa8, 0xfb, 0xd8, 0xd0, 0xa8, 0x94, 0xe7,
-	0x06, 0x6e, 0x2e, 0x18, 0xe8, 0x0b, 0xf9, 0xbc, 0x8d, 0x50, 0x0f, 0x37, 0xa0, 0x48, 0x9f, 0xfa,
-	0xd4, 0xf2, 0x0c, 0xdb, 0x92, 0xd6, 0xb8, 0x91, 0xb7, 0x96, 0xcc, 0x22, 0x35, 0xf5, 0x79, 0x13,
-	0x33, 0x3d, 0x7c, 0x0f, 0xd6, 0x6c, 0xc7, 0x37, 0x6c, 0xcb, 0x93, 0x0a, 0xbb, 0xa9, 0xbd, 0xd2,
-	0xc1, 0xab, 0x4b, 0x13, 0xa1, 0x2b, 0x38, 0x4a, 0x48, 0xc6, 0x2d, 0x40, 0x9e, 0x3d, 0x75, 0x35,
-	0xaa, 0x6a, 0xb6, 0x4e, 0x55, 0xc3, 0x1a, 0xda, 0x52, 0x91, 0x1b, 0xb8, 0xbe, 0x38, 0x10, 0x4e,
-	0x6c, 0xd8, 0x3a, 0x6d, 0x59, 0x43, 0x5b, 0xa9, 0x78, 0x89, 0x36, 0xbe, 0x02, 0x79, 0xef, 0xc2,
-	0xf2, 0xc9, 0x53, 0xa9, 0xcc, 0x33, 0x24, 0x68, 0x55, 0xbf, 0xcd, 0xc3, 0xc6, 0x65, 0x52, 0xec,
-	0x23, 0xc8, 0x0d, 0xd9, 0x28, 0xa5, 0xf4, 0xff, 0x13, 0x03, 0xa1, 0x93, 0x0c, 0x62, 0xfe, 0x07,
-	0x06, 0xb1, 0x0e, 0x25, 0x8b, 0x7a, 0x3e, 0xd5, 0x45, 0x46, 0x64, 0x2e, 0x99, 0x53, 0x20, 0x94,
-	0x16, 0x53, 0x2a, 0xfb, 0x83, 0x52, 0xea, 0x33, 0xd8, 0x88, 0x5c, 0x52, 0x5d, 0x62, 0x8d, 0xc2,
-	0xdc, 0xdc, 0x7f, 0x9e, 0x27, 0x35, 0x39, 0xd4, 0x53, 0x98, 0x9a, 0x52, 0xa1, 0x89, 0x36, 0x6e,
-	0x02, 0xd8, 0x16, 0xb5, 0x87, 0xaa, 0x4e, 0x35, 0x53, 0x2a, 0xac, 0x88, 0x52, 0x97, 0x51, 0x16,
-	0xa2, 0x64, 0x0b, 0x54, 0x33, 0xf1, 0x87, 0xb3, 0x54, 0x5b, 0x5b, 0x91, 0x29, 0xa7, 0x62, 0x91,
-	0x2d, 0x64, 0xdb, 0x19, 0x54, 0x5c, 0xca, 0xf2, 0x9e, 0xea, 0xc1, 0xc8, 0x8a, 0xdc, 0x89, 0xda,
-	0x73, 0x47, 0xa6, 0x04, 0x6a, 0x62, 0x60, 0xeb, 0x6e, 0xbc, 0x89, 0xdf, 0x80, 0x08, 0x50, 0x79,
-	0x5a, 0x01, 0xdf, 0x85, 0xca, 0x21, 0xd8, 0x21, 0x13, 0xba, 0xf3, 0x15, 0x54, 0x92, 0xe1, 0xc1,
-	0xdb, 0x90, 0xf3, 0x7c, 0xe2, 0xfa, 0x3c, 0x0b, 0x73, 0x8a, 0x68, 0x60, 0x04, 0x19, 0x6a, 0xe9,
-	0x7c, 0x97, 0xcb, 0x29, 0xec, 0x2f, 0xfe, 0xe5, 0x6c, 0xc0, 0x19, 0x3e, 0xe0, 0xb7, 0x17, 0x67,
-	0x34, 0x61, 0x79, 0x7e, 0xdc, 0x3b, 0x1f, 0xc0, 0x7a, 0x62, 0x00, 0x97, 0xed, 0xba, 0xfa, 0x5b,
-	0x78, 0x79, 0xa9, 0x69, 0xfc, 0x19, 0x6c, 0x4f, 0x2d, 0xc3, 0xf2, 0xa9, 0xeb, 0xb8, 0x94, 0x65,
-	0xac, 0xe8, 0x4a, 0xfa, 0xcf, 0xda, 0x8a, 0x9c, 0x3b, 0x8b, 0xb3, 0x85, 0x15, 0x65, 0x6b, 0xba,
-	0x08, 0xde, 0x2e, 0x16, 0xfe, 0xbb, 0x86, 0x9e, 0x3d, 0x7b, 0xf6, 0x2c, 0x5d, 0xfd, 0x63, 0x1e,
-	0xb6, 0x97, 0xad, 0x99, 0xa5, 0xcb, 0xf7, 0x0a, 0xe4, 0xad, 0xe9, 0xe4, 0x9c, 0xba, 0x3c, 0x48,
-	0x39, 0x25, 0x68, 0xe1, 0x3a, 0xe4, 0x4c, 0x72, 0x4e, 0x4d, 0x29, 0xbb, 0x9b, 0xda, 0xab, 0x1c,
-	0xbc, 0x73, 0xa9, 0x55, 0x59, 0x6b, 0x33, 0x15, 0x45, 0x68, 0xe2, 0x8f, 0x21, 0x1b, 0x6c, 0xd1,
-	0xcc, 0xc2, 0xed, 0xcb, 0x59, 0x60, 0x6b, 0x49, 0xe1, 0x7a, 0xf8, 0x15, 0x28, 0xb2, 0x5f, 0x91,
-	0x1b, 0x79, 0xee, 0x73, 0x81, 0x01, 0x2c, 0x2f, 0xf0, 0x0e, 0x14, 0xf8, 0x32, 0xd1, 0x69, 0x78,
-	0xb4, 0x45, 0x6d, 0x96, 0x58, 0x3a, 0x1d, 0x92, 0xa9, 0xe9, 0xab, 0x8f, 0x89, 0x39, 0xa5, 0x3c,
-	0xe1, 0x8b, 0x4a, 0x39, 0x00, 0x7f, 0xc3, 0x30, 0x7c, 0x1d, 0x4a, 0x62, 0x55, 0x19, 0x96, 0x4e,
-	0x9f, 0xf2, 0xdd, 0x33, 0xa7, 0x88, 0x85, 0xd6, 0x62, 0x08, 0xeb, 0xfe, 0xa1, 0x67, 0x5b, 0x61,
-	0x6a, 0xf2, 0x2e, 0x18, 0xc0, 0xbb, 0xff, 0x60, 0x7e, 0xe3, 0x7e, 0x6d, 0xf9, 0xf0, 0xe6, 0x73,
-	0xaa, 0xfa, 0xb7, 0x34, 0x64, 0xf9, 0x7e, 0xb1, 0x01, 0xa5, 0xc1, 0xe7, 0x3d, 0x59, 0x6d, 0x76,
-	0xcf, 0x8e, 0xda, 0x32, 0x4a, 0xe1, 0x0a, 0x00, 0x07, 0x1e, 0xb4, 0xbb, 0xf5, 0x01, 0x4a, 0x47,
-	0xed, 0x56, 0x67, 0x70, 0xef, 0x0e, 0xca, 0x44, 0x0a, 0x67, 0x02, 0xc8, 0xc6, 0x09, 0xef, 0x1f,
-	0xa0, 0x1c, 0x46, 0x50, 0x16, 0x06, 0x5a, 0x9f, 0xc9, 0xcd, 0x7b, 0x77, 0x50, 0x3e, 0x89, 0xbc,
-	0x7f, 0x80, 0xd6, 0xf0, 0x3a, 0x14, 0x39, 0x72, 0xd4, 0xed, 0xb6, 0x51, 0x21, 0xb2, 0xd9, 0x1f,
-	0x28, 0xad, 0xce, 0x31, 0x2a, 0x46, 0x36, 0x8f, 0x95, 0xee, 0x59, 0x0f, 0x41, 0x64, 0xe1, 0x54,
-	0xee, 0xf7, 0xeb, 0xc7, 0x32, 0x2a, 0x45, 0x8c, 0xa3, 0xcf, 0x07, 0x72, 0x1f, 0x95, 0x13, 0x6e,
-	0xbd, 0x7f, 0x80, 0xd6, 0xa3, 0x2e, 0xe4, 0xce, 0xd9, 0x29, 0xaa, 0xe0, 0x4d, 0x58, 0x17, 0x5d,
-	0x84, 0x4e, 0x6c, 0xcc, 0x41, 0xf7, 0xee, 0x20, 0x34, 0x73, 0x44, 0x58, 0xd9, 0x4c, 0x00, 0xf7,
-	0xee, 0x20, 0x5c, 0x6d, 0x40, 0x8e, 0x67, 0x17, 0xc6, 0x50, 0x69, 0xd7, 0x8f, 0xe4, 0xb6, 0xda,
-	0xed, 0x0d, 0x5a, 0xdd, 0x4e, 0xbd, 0x8d, 0x52, 0x33, 0x4c, 0x91, 0x7f, 0x7d, 0xd6, 0x52, 0xe4,
-	0x26, 0x4a, 0xc7, 0xb1, 0x9e, 0x5c, 0x1f, 0xc8, 0x4d, 0x94, 0xa9, 0x6a, 0xb0, 0xbd, 0x6c, 0x9f,
-	0x5c, 0xba, 0x32, 0x62, 0x53, 0x9c, 0x5e, 0x31, 0xc5, 0xdc, 0xd6, 0xc2, 0x14, 0x7f, 0x9d, 0x82,
-	0xad, 0x25, 0x67, 0xc5, 0xd2, 0x4e, 0x7e, 0x01, 0x39, 0x91, 0xa2, 0xe2, 0xf4, 0xbc, 0xb5, 0xf4,
-	0xd0, 0xe1, 0x09, 0xbb, 0x70, 0x82, 0x72, 0xbd, 0x78, 0x05, 0x91, 0x59, 0x51, 0x41, 0x30, 0x13,
-	0x0b, 0x4e, 0xfe, 0x2e, 0x05, 0xd2, 0x2a, 0xdb, 0xcf, 0xd9, 0x28, 0xd2, 0x89, 0x8d, 0xe2, 0xa3,
-	0x79, 0x07, 0x6e, 0xac, 0x1e, 0xc3, 0x82, 0x17, 0xdf, 0xa4, 0xe0, 0xca, 0xf2, 0x42, 0x6b, 0xa9,
-	0x0f, 0x1f, 0x43, 0x7e, 0x42, 0xfd, 0xb1, 0x1d, 0x16, 0x1b, 0x6f, 0x2f, 0x39, 0xc2, 0x98, 0x78,
-	0x3e, 0x56, 0x81, 0x56, 0xfc, 0x0c, 0xcc, 0xac, 0xaa, 0x96, 0x84, 0x37, 0x0b, 0x9e, 0xfe, 0x3e,
-	0x0d, 0x2f, 0x2f, 0x35, 0xbe, 0xd4, 0xd1, 0xd7, 0x00, 0x0c, 0xcb, 0x99, 0xfa, 0xa2, 0xa0, 0x10,
-	0xfb, 0x53, 0x91, 0x23, 0x7c, 0xed, 0xb3, 0xbd, 0x67, 0xea, 0x47, 0xf2, 0x0c, 0x97, 0x83, 0x80,
-	0x38, 0xe1, 0xfe, 0xcc, 0xd1, 0x2c, 0x77, 0xf4, 0xf5, 0x15, 0x23, 0x5d, 0x38, 0xab, 0xdf, 0x03,
-	0xa4, 0x99, 0x06, 0xb5, 0x7c, 0xd5, 0xf3, 0x5d, 0x4a, 0x26, 0x86, 0x35, 0xe2, 0x1b, 0x70, 0xe1,
-	0x30, 0x37, 0x24, 0xa6, 0x47, 0x95, 0x0d, 0x21, 0xee, 0x87, 0x52, 0xa6, 0xc1, 0xcf, 0x38, 0x37,
-	0xa6, 0x91, 0x4f, 0x68, 0x08, 0x71, 0xa4, 0x51, 0xfd, 0xb6, 0x00, 0xa5, 0x58, 0x59, 0x8a, 0x6f,
-	0x40, 0xf9, 0x21, 0x79, 0x4c, 0xd4, 0xf0, 0xaa, 0x21, 0x22, 0x51, 0x62, 0x58, 0x2f, 0xb8, 0x6e,
-	0xbc, 0x07, 0xdb, 0x9c, 0x62, 0x4f, 0x7d, 0xea, 0xaa, 0x9a, 0x49, 0x3c, 0x8f, 0x07, 0xad, 0xc0,
-	0xa9, 0x98, 0xc9, 0xba, 0x4c, 0xd4, 0x08, 0x25, 0xf8, 0x2e, 0x6c, 0x71, 0x8d, 0xc9, 0xd4, 0xf4,
-	0x0d, 0xc7, 0xa4, 0x2a, 0xbb, 0xfc, 0x78, 0x7c, 0x23, 0x8e, 0x3c, 0xdb, 0x64, 0x8c, 0xd3, 0x80,
-	0xc0, 0x3c, 0xf2, 0x70, 0x13, 0x5e, 0xe3, 0x6a, 0x23, 0x6a, 0x51, 0x97, 0xf8, 0x54, 0xa5, 0x5f,
-	0x4e, 0x89, 0xe9, 0xa9, 0xc4, 0xd2, 0xd5, 0x31, 0xf1, 0xc6, 0xd2, 0x36, 0x33, 0x70, 0x94, 0x96,
-	0x52, 0xca, 0x35, 0x46, 0x3c, 0x0e, 0x78, 0x32, 0xa7, 0xd5, 0x2d, 0xfd, 0x13, 0xe2, 0x8d, 0xf1,
-	0x21, 0x5c, 0xe1, 0x56, 0x3c, 0xdf, 0x35, 0xac, 0x91, 0xaa, 0x8d, 0xa9, 0xf6, 0x48, 0x9d, 0xfa,
-	0xc3, 0xfb, 0xd2, 0x2b, 0xf1, 0xfe, 0xb9, 0x87, 0x7d, 0xce, 0x69, 0x30, 0xca, 0x99, 0x3f, 0xbc,
-	0x8f, 0xfb, 0x50, 0x66, 0x93, 0x31, 0x31, 0xbe, 0xa2, 0xea, 0xd0, 0x76, 0xf9, 0xc9, 0x52, 0x59,
-	0xb2, 0xb2, 0x63, 0x11, 0xac, 0x75, 0x03, 0x85, 0x53, 0x5b, 0xa7, 0x87, 0xb9, 0x7e, 0x4f, 0x96,
-	0x9b, 0x4a, 0x29, 0xb4, 0xf2, 0xc0, 0x76, 0x59, 0x42, 0x8d, 0xec, 0x28, 0xc0, 0x25, 0x91, 0x50,
-	0x23, 0x3b, 0x0c, 0xef, 0x5d, 0xd8, 0xd2, 0x34, 0x31, 0x66, 0x43, 0x53, 0x83, 0x2b, 0x8a, 0x27,
-	0xa1, 0x44, 0xb0, 0x34, 0xed, 0x58, 0x10, 0x82, 0x1c, 0xf7, 0xf0, 0x87, 0xf0, 0xf2, 0x2c, 0x58,
-	0x71, 0xc5, 0xcd, 0x85, 0x51, 0xce, 0xab, 0xde, 0x85, 0x2d, 0xe7, 0x62, 0x51, 0x11, 0x27, 0x7a,
-	0x74, 0x2e, 0xe6, 0xd5, 0x3e, 0x80, 0x6d, 0x67, 0xec, 0x2c, 0xea, 0xdd, 0x8e, 0xeb, 0x61, 0x67,
-	0xec, 0xcc, 0x2b, 0xbe, 0xc5, 0xef, 0xab, 0x2e, 0xd5, 0x88, 0x4f, 0x75, 0xe9, 0x6a, 0x9c, 0x1e,
-	0x13, 0xe0, 0x7d, 0x40, 0x9a, 0xa6, 0x52, 0x8b, 0x9c, 0x9b, 0x54, 0x25, 0x2e, 0xb5, 0x88, 0x27,
-	0x5d, 0x8f, 0x93, 0x2b, 0x9a, 0x26, 0x73, 0x69, 0x9d, 0x0b, 0xf1, 0x6d, 0xd8, 0xb4, 0xcf, 0x1f,
-	0x6a, 0x22, 0x25, 0x55, 0xc7, 0xa5, 0x43, 0xe3, 0xa9, 0xf4, 0x26, 0x8f, 0xef, 0x06, 0x13, 0xf0,
-	0x84, 0xec, 0x71, 0x18, 0xdf, 0x02, 0xa4, 0x79, 0x63, 0xe2, 0x3a, 0xbc, 0x26, 0xf0, 0x1c, 0xa2,
-	0x51, 0xe9, 0x2d, 0x41, 0x15, 0x78, 0x27, 0x84, 0xd9, 0x92, 0xf0, 0x9e, 0x18, 0x43, 0x3f, 0xb4,
-	0x78, 0x53, 0x2c, 0x09, 0x8e, 0x05, 0xd6, 0xf6, 0x00, 0xb1, 0x50, 0x24, 0x3a, 0xde, 0xe3, 0xb4,
-	0x8a, 0x33, 0x76, 0xe2, 0xfd, 0xbe, 0x01, 0xeb, 0x8c, 0x39, 0xeb, 0xf4, 0x96, 0xa8, 0x67, 0x9c,
-	0x71, 0xac, 0xc7, 0x1f, 0xad, 0xb4, 0xac, 0x1e, 0x42, 0x39, 0x9e, 0x9f, 0xb8, 0x08, 0x22, 0x43,
-	0x51, 0x8a, 0x9d, 0xf5, 0x8d, 0x6e, 0x93, 0x9d, 0xd2, 0x5f, 0xc8, 0x28, 0xcd, 0xaa, 0x85, 0x76,
-	0x6b, 0x20, 0xab, 0xca, 0x59, 0x67, 0xd0, 0x3a, 0x95, 0x51, 0x26, 0x56, 0x96, 0x9e, 0x64, 0x0b,
-	0x6f, 0xa3, 0x9b, 0xd5, 0xef, 0xd2, 0x50, 0x49, 0xde, 0x33, 0xf0, 0xcf, 0xe1, 0x6a, 0xf8, 0x28,
-	0xe0, 0x51, 0x5f, 0x7d, 0x62, 0xb8, 0x7c, 0xe1, 0x4c, 0x88, 0xa8, 0xb3, 0xa3, 0xa9, 0xdb, 0x0e,
-	0x58, 0x7d, 0xea, 0x7f, 0x6a, 0xb8, 0x6c, 0x59, 0x4c, 0x88, 0x8f, 0xdb, 0x70, 0xdd, 0xb2, 0x55,
-	0xcf, 0x27, 0x96, 0x4e, 0x5c, 0x5d, 0x9d, 0x3d, 0xc7, 0xa8, 0x44, 0xd3, 0xa8, 0xe7, 0xd9, 0xe2,
-	0xc0, 0x8a, 0xac, 0xbc, 0x6a, 0xd9, 0xfd, 0x80, 0x3c, 0xdb, 0xc9, 0xeb, 0x01, 0x75, 0x2e, 0xcd,
-	0x32, 0xab, 0xd2, 0xec, 0x15, 0x28, 0x4e, 0x88, 0xa3, 0x52, 0xcb, 0x77, 0x2f, 0x78, 0x75, 0x59,
-	0x50, 0x0a, 0x13, 0xe2, 0xc8, 0xac, 0xfd, 0x42, 0x8a, 0xfc, 0x93, 0x6c, 0xa1, 0x80, 0x8a, 0x27,
-	0xd9, 0x42, 0x11, 0x41, 0xf5, 0x5f, 0x19, 0x28, 0xc7, 0xab, 0x4d, 0x56, 0xbc, 0x6b, 0xfc, 0x64,
-	0x49, 0xf1, 0xbd, 0xe7, 0x8d, 0xef, 0xad, 0x4d, 0x6b, 0x0d, 0x76, 0xe4, 0x1c, 0xe6, 0x45, 0x0d,
-	0xa8, 0x08, 0x4d, 0x76, 0xdc, 0xb3, 0xdd, 0x86, 0x8a, 0x7b, 0x4d, 0x41, 0x09, 0x5a, 0xf8, 0x18,
-	0xf2, 0x0f, 0x3d, 0x6e, 0x3b, 0xcf, 0x6d, 0xbf, 0xf9, 0xfd, 0xb6, 0x4f, 0xfa, 0xdc, 0x78, 0xf1,
-	0xa4, 0xaf, 0x76, 0xba, 0xca, 0x69, 0xbd, 0xad, 0x04, 0xea, 0xf8, 0x1a, 0x64, 0x4d, 0xf2, 0xd5,
-	0x45, 0xf2, 0x70, 0xe2, 0xd0, 0x65, 0x27, 0xe1, 0x1a, 0x64, 0x9f, 0x50, 0xf2, 0x28, 0x79, 0x24,
-	0x70, 0xe8, 0x47, 0x5c, 0x0c, 0xfb, 0x90, 0xe3, 0xf1, 0xc2, 0x00, 0x41, 0xc4, 0xd0, 0x4b, 0xb8,
-	0x00, 0xd9, 0x46, 0x57, 0x61, 0x0b, 0x02, 0x41, 0x59, 0xa0, 0x6a, 0xaf, 0x25, 0x37, 0x64, 0x94,
-	0xae, 0xde, 0x85, 0xbc, 0x08, 0x02, 0x5b, 0x2c, 0x51, 0x18, 0xd0, 0x4b, 0x41, 0x33, 0xb0, 0x91,
-	0x0a, 0xa5, 0x67, 0xa7, 0x47, 0xb2, 0x82, 0xd2, 0xc9, 0xa9, 0xce, 0xa2, 0x5c, 0xd5, 0x83, 0x72,
-	0xbc, 0xdc, 0x7c, 0x31, 0x57, 0xc9, 0xbf, 0xa7, 0xa0, 0x14, 0x2b, 0x1f, 0x59, 0xe1, 0x42, 0x4c,
-	0xd3, 0x7e, 0xa2, 0x12, 0xd3, 0x20, 0x5e, 0x90, 0x1a, 0xc0, 0xa1, 0x3a, 0x43, 0x2e, 0x3b, 0x75,
-	0x2f, 0x68, 0x89, 0xe4, 0x50, 0xbe, 0xfa, 0x97, 0x14, 0xa0, 0xf9, 0x02, 0x74, 0xce, 0xcd, 0xd4,
-	0x4f, 0xe9, 0x66, 0xf5, 0xcf, 0x29, 0xa8, 0x24, 0xab, 0xce, 0x39, 0xf7, 0x6e, 0xfc, 0xa4, 0xee,
-	0xfd, 0x33, 0x0d, 0xeb, 0x89, 0x5a, 0xf3, 0xb2, 0xde, 0x7d, 0x09, 0x9b, 0x86, 0x4e, 0x27, 0x8e,
-	0xed, 0x53, 0x4b, 0xbb, 0x50, 0x4d, 0xfa, 0x98, 0x9a, 0x52, 0x95, 0x6f, 0x1a, 0xfb, 0xdf, 0x5f,
-	0xcd, 0xd6, 0x5a, 0x33, 0xbd, 0x36, 0x53, 0x3b, 0xdc, 0x6a, 0x35, 0xe5, 0xd3, 0x5e, 0x77, 0x20,
-	0x77, 0x1a, 0x9f, 0xab, 0x67, 0x9d, 0x5f, 0x75, 0xba, 0x9f, 0x76, 0x14, 0x64, 0xcc, 0xd1, 0x7e,
-	0xc4, 0x65, 0xdf, 0x03, 0x34, 0xef, 0x14, 0xbe, 0x0a, 0xcb, 0xdc, 0x42, 0x2f, 0xe1, 0x2d, 0xd8,
-	0xe8, 0x74, 0xd5, 0x7e, 0xab, 0x29, 0xab, 0xf2, 0x83, 0x07, 0x72, 0x63, 0xd0, 0x17, 0xd7, 0xfb,
-	0x88, 0x3d, 0x48, 0x2c, 0xf0, 0xea, 0x9f, 0x32, 0xb0, 0xb5, 0xc4, 0x13, 0x5c, 0x0f, 0x6e, 0x16,
-	0xe2, 0xb2, 0xf3, 0xee, 0x65, 0xbc, 0xaf, 0xb1, 0x82, 0xa0, 0x47, 0x5c, 0x3f, 0xb8, 0x88, 0xdc,
-	0x02, 0x16, 0x25, 0xcb, 0x37, 0x86, 0x06, 0x75, 0x83, 0xd7, 0x10, 0x71, 0xdd, 0xd8, 0x98, 0xe1,
-	0xe2, 0x41, 0xe4, 0x67, 0x80, 0x1d, 0xdb, 0x33, 0x7c, 0xe3, 0x31, 0x55, 0x0d, 0x2b, 0x7c, 0x3a,
-	0x61, 0xd7, 0x8f, 0xac, 0x82, 0x42, 0x49, 0xcb, 0xf2, 0x23, 0xb6, 0x45, 0x47, 0x64, 0x8e, 0xcd,
-	0x36, 0xf3, 0x8c, 0x82, 0x42, 0x49, 0xc4, 0xbe, 0x01, 0x65, 0xdd, 0x9e, 0xb2, 0x9a, 0x4c, 0xf0,
-	0xd8, 0xd9, 0x91, 0x52, 0x4a, 0x02, 0x8b, 0x28, 0x41, 0xb5, 0x3d, 0x7b, 0xb3, 0x29, 0x2b, 0x25,
-	0x81, 0x09, 0xca, 0x4d, 0xd8, 0x20, 0xa3, 0x91, 0xcb, 0x8c, 0x87, 0x86, 0xc4, 0xfd, 0xa1, 0x12,
-	0xc1, 0x9c, 0xb8, 0x73, 0x02, 0x85, 0x30, 0x0e, 0xec, 0xa8, 0x66, 0x91, 0x50, 0x1d, 0xf1, 0x6e,
-	0x97, 0xde, 0x2b, 0x2a, 0x05, 0x2b, 0x14, 0xde, 0x80, 0xb2, 0xe1, 0xa9, 0xb3, 0x27, 0xe8, 0xf4,
-	0x6e, 0x7a, 0xaf, 0xa0, 0x94, 0x0c, 0x2f, 0x7a, 0xbe, 0xab, 0x7e, 0x93, 0x86, 0x4a, 0xf2, 0x09,
-	0x1d, 0x37, 0xa1, 0x60, 0xda, 0x1a, 0xe1, 0xa9, 0x25, 0xbe, 0xdf, 0xec, 0x3d, 0xe7, 0xd5, 0xbd,
-	0xd6, 0x0e, 0xf8, 0x4a, 0xa4, 0xb9, 0xf3, 0x8f, 0x14, 0x14, 0x42, 0x18, 0x5f, 0x81, 0xac, 0x43,
-	0xfc, 0x31, 0x37, 0x97, 0x3b, 0x4a, 0xa3, 0x94, 0xc2, 0xdb, 0x0c, 0xf7, 0x1c, 0x62, 0xf1, 0x14,
-	0x08, 0x70, 0xd6, 0x66, 0xf3, 0x6a, 0x52, 0xa2, 0xf3, 0xcb, 0x89, 0x3d, 0x99, 0x50, 0xcb, 0xf7,
-	0xc2, 0x79, 0x0d, 0xf0, 0x46, 0x00, 0xe3, 0x77, 0x60, 0xd3, 0x77, 0x89, 0x61, 0x26, 0xb8, 0x59,
-	0xce, 0x45, 0xa1, 0x20, 0x22, 0x1f, 0xc2, 0xb5, 0xd0, 0xae, 0x4e, 0x7d, 0xa2, 0x8d, 0xa9, 0x3e,
-	0x53, 0xca, 0xf3, 0xf7, 0xd9, 0xab, 0x01, 0xa1, 0x19, 0xc8, 0x43, 0xdd, 0xea, 0x77, 0x29, 0xd8,
-	0x0c, 0xaf, 0x53, 0x7a, 0x14, 0xac, 0x53, 0x00, 0x62, 0x59, 0xb6, 0x1f, 0x0f, 0xd7, 0x62, 0x2a,
-	0x2f, 0xe8, 0xd5, 0xea, 0x91, 0x92, 0x12, 0x33, 0xb0, 0x33, 0x01, 0x98, 0x49, 0x56, 0x86, 0xed,
-	0x3a, 0x94, 0x82, 0xef, 0x23, 0xfc, 0x23, 0x9b, 0xb8, 0x80, 0x83, 0x80, 0xd8, 0xbd, 0x0b, 0x6f,
-	0x43, 0xee, 0x9c, 0x8e, 0x0c, 0x2b, 0x78, 0xf5, 0x14, 0x8d, 0xf0, 0x25, 0x37, 0x1b, 0xbd, 0xe4,
-	0x1e, 0xfd, 0x21, 0x05, 0x5b, 0x9a, 0x3d, 0x99, 0xf7, 0xf7, 0x08, 0xcd, 0xbd, 0x02, 0x78, 0x9f,
-	0xa4, 0xbe, 0xf8, 0x78, 0x64, 0xf8, 0xe3, 0xe9, 0x79, 0x4d, 0xb3, 0x27, 0xfb, 0x23, 0xdb, 0x24,
-	0xd6, 0x68, 0xf6, 0x95, 0x90, 0xff, 0xd1, 0xde, 0x1d, 0x51, 0xeb, 0xdd, 0x91, 0x1d, 0xfb, 0x66,
-	0xf8, 0xd1, 0xec, 0xef, 0xd7, 0xe9, 0xcc, 0x71, 0xef, 0xe8, 0xaf, 0xe9, 0x9d, 0x63, 0xd1, 0x57,
-	0x2f, 0x8c, 0x8d, 0x42, 0x87, 0x26, 0xd5, 0xd8, 0x78, 0xff, 0x17, 0x00, 0x00, 0xff, 0xff, 0x0c,
-	0xab, 0xb6, 0x37, 0x7e, 0x1c, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
deleted file mode 100644
index 4d4fb378f5..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/descriptor/descriptor.proto
+++ /dev/null
@@ -1,849 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//  Based on original Protocol Buffers design by
-//  Sanjay Ghemawat, Jeff Dean, and others.
-//
-// The messages in this file describe the definitions found in .proto files.
-// A valid .proto file can be translated directly to a FileDescriptorProto
-// without any other information (e.g. without reading its imports).
-
-
-syntax = "proto2";
-
-package google.protobuf;
-option go_package = "github.com/golang/protobuf/protoc-gen-go/descriptor;descriptor";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DescriptorProtos";
-option csharp_namespace = "Google.Protobuf.Reflection";
-option objc_class_prefix = "GPB";
-
-// descriptor.proto must be optimized for speed because reflection-based
-// algorithms don't work during bootstrapping.
-option optimize_for = SPEED;
-
-// The protocol compiler can output a FileDescriptorSet containing the .proto
-// files it parses.
-message FileDescriptorSet {
-  repeated FileDescriptorProto file = 1;
-}
-
-// Describes a complete .proto file.
-message FileDescriptorProto {
-  optional string name = 1;       // file name, relative to root of source tree
-  optional string package = 2;    // e.g. "foo", "foo.bar", etc.
-
-  // Names of files imported by this file.
-  repeated string dependency = 3;
-  // Indexes of the public imported files in the dependency list above.
-  repeated int32 public_dependency = 10;
-  // Indexes of the weak imported files in the dependency list.
-  // For Google-internal migration only. Do not use.
-  repeated int32 weak_dependency = 11;
-
-  // All top-level definitions in this file.
-  repeated DescriptorProto message_type = 4;
-  repeated EnumDescriptorProto enum_type = 5;
-  repeated ServiceDescriptorProto service = 6;
-  repeated FieldDescriptorProto extension = 7;
-
-  optional FileOptions options = 8;
-
-  // This field contains optional information about the original source code.
-  // You may safely remove this entire field without harming runtime
-  // functionality of the descriptors -- the information is needed only by
-  // development tools.
-  optional SourceCodeInfo source_code_info = 9;
-
-  // The syntax of the proto file.
-  // The supported values are "proto2" and "proto3".
-  optional string syntax = 12;
-}
-
-// Describes a message type.
-message DescriptorProto {
-  optional string name = 1;
-
-  repeated FieldDescriptorProto field = 2;
-  repeated FieldDescriptorProto extension = 6;
-
-  repeated DescriptorProto nested_type = 3;
-  repeated EnumDescriptorProto enum_type = 4;
-
-  message ExtensionRange {
-    optional int32 start = 1;
-    optional int32 end = 2;
-
-    optional ExtensionRangeOptions options = 3;
-  }
-  repeated ExtensionRange extension_range = 5;
-
-  repeated OneofDescriptorProto oneof_decl = 8;
-
-  optional MessageOptions options = 7;
-
-  // Range of reserved tag numbers. Reserved tag numbers may not be used by
-  // fields or extension ranges in the same message. Reserved ranges may
-  // not overlap.
-  message ReservedRange {
-    optional int32 start = 1; // Inclusive.
-    optional int32 end = 2;   // Exclusive.
-  }
-  repeated ReservedRange reserved_range = 9;
-  // Reserved field names, which may not be used by fields in the same message.
-  // A given name may only be reserved once.
-  repeated string reserved_name = 10;
-}
-
-message ExtensionRangeOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-// Describes a field within a message.
-message FieldDescriptorProto {
-  enum Type {
-    // 0 is reserved for errors.
-    // Order is weird for historical reasons.
-    TYPE_DOUBLE         = 1;
-    TYPE_FLOAT          = 2;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT64 if
-    // negative values are likely.
-    TYPE_INT64          = 3;
-    TYPE_UINT64         = 4;
-    // Not ZigZag encoded.  Negative numbers take 10 bytes.  Use TYPE_SINT32 if
-    // negative values are likely.
-    TYPE_INT32          = 5;
-    TYPE_FIXED64        = 6;
-    TYPE_FIXED32        = 7;
-    TYPE_BOOL           = 8;
-    TYPE_STRING         = 9;
-    // Tag-delimited aggregate.
-    // Group type is deprecated and not supported in proto3. However, Proto3
-    // implementations should still be able to parse the group wire format and
-    // treat group fields as unknown fields.
-    TYPE_GROUP          = 10;
-    TYPE_MESSAGE        = 11;  // Length-delimited aggregate.
-
-    // New in version 2.
-    TYPE_BYTES          = 12;
-    TYPE_UINT32         = 13;
-    TYPE_ENUM           = 14;
-    TYPE_SFIXED32       = 15;
-    TYPE_SFIXED64       = 16;
-    TYPE_SINT32         = 17;  // Uses ZigZag encoding.
-    TYPE_SINT64         = 18;  // Uses ZigZag encoding.
-  };
-
-  enum Label {
-    // 0 is reserved for errors
-    LABEL_OPTIONAL      = 1;
-    LABEL_REQUIRED      = 2;
-    LABEL_REPEATED      = 3;
-  };
-
-  optional string name = 1;
-  optional int32 number = 3;
-  optional Label label = 4;
-
-  // If type_name is set, this need not be set.  If both this and type_name
-  // are set, this must be one of TYPE_ENUM, TYPE_MESSAGE or TYPE_GROUP.
-  optional Type type = 5;
-
-  // For message and enum types, this is the name of the type.  If the name
-  // starts with a '.', it is fully-qualified.  Otherwise, C++-like scoping
-  // rules are used to find the type (i.e. first the nested types within this
-  // message are searched, then within the parent, on up to the root
-  // namespace).
-  optional string type_name = 6;
-
-  // For extensions, this is the name of the type being extended.  It is
-  // resolved in the same manner as type_name.
-  optional string extendee = 2;
-
-  // For numeric types, contains the original text representation of the value.
-  // For booleans, "true" or "false".
-  // For strings, contains the default text contents (not escaped in any way).
-  // For bytes, contains the C escaped value.  All bytes >= 128 are escaped.
-  // TODO(kenton):  Base-64 encode?
-  optional string default_value = 7;
-
-  // If set, gives the index of a oneof in the containing type's oneof_decl
-  // list.  This field is a member of that oneof.
-  optional int32 oneof_index = 9;
-
-  // JSON name of this field. The value is set by protocol compiler. If the
-  // user has set a "json_name" option on this field, that option's value
-  // will be used. Otherwise, it's deduced from the field's name by converting
-  // it to camelCase.
-  optional string json_name = 10;
-
-  optional FieldOptions options = 8;
-}
-
-// Describes a oneof.
-message OneofDescriptorProto {
-  optional string name = 1;
-  optional OneofOptions options = 2;
-}
-
-// Describes an enum type.
-message EnumDescriptorProto {
-  optional string name = 1;
-
-  repeated EnumValueDescriptorProto value = 2;
-
-  optional EnumOptions options = 3;
-}
-
-// Describes a value within an enum.
-message EnumValueDescriptorProto {
-  optional string name = 1;
-  optional int32 number = 2;
-
-  optional EnumValueOptions options = 3;
-}
-
-// Describes a service.
-message ServiceDescriptorProto {
-  optional string name = 1;
-  repeated MethodDescriptorProto method = 2;
-
-  optional ServiceOptions options = 3;
-}
-
-// Describes a method of a service.
-message MethodDescriptorProto {
-  optional string name = 1;
-
-  // Input and output type names.  These are resolved in the same way as
-  // FieldDescriptorProto.type_name, but must refer to a message type.
-  optional string input_type = 2;
-  optional string output_type = 3;
-
-  optional MethodOptions options = 4;
-
-  // Identifies if client streams multiple client messages
-  optional bool client_streaming = 5 [default=false];
-  // Identifies if server streams multiple server messages
-  optional bool server_streaming = 6 [default=false];
-}
-
-
-// ===================================================================
-// Options
-
-// Each of the definitions above may have "options" attached.  These are
-// just annotations which may cause code to be generated slightly differently
-// or may contain hints for code that manipulates protocol messages.
-//
-// Clients may define custom options as extensions of the *Options messages.
-// These extensions may not yet be known at parsing time, so the parser cannot
-// store the values in them.  Instead it stores them in a field in the *Options
-// message called uninterpreted_option. This field must have the same name
-// across all *Options messages. We then use this field to populate the
-// extensions when we build a descriptor, at which point all protos have been
-// parsed and so all extensions are known.
-//
-// Extension numbers for custom options may be chosen as follows:
-// * For options which will only be used within a single application or
-//   organization, or for experimental options, use field numbers 50000
-//   through 99999.  It is up to you to ensure that you do not use the
-//   same number for multiple options.
-// * For options which will be published and used publicly by multiple
-//   independent entities, e-mail protobuf-global-extension-registry@google.com
-//   to reserve extension numbers. Simply provide your project name (e.g.
-//   Objective-C plugin) and your project website (if available) -- there's no
-//   need to explain how you intend to use them. Usually you only need one
-//   extension number. You can declare multiple options with only one extension
-//   number by putting them in a sub-message. See the Custom Options section of
-//   the docs for examples:
-//   https://developers.google.com/protocol-buffers/docs/proto#options
-//   If this turns out to be popular, a web service will be set up
-//   to automatically assign option numbers.
-
-
-message FileOptions {
-
-  // Sets the Java package where classes generated from this .proto will be
-  // placed.  By default, the proto package is used, but this is often
-  // inappropriate because proto packages do not normally start with backwards
-  // domain names.
-  optional string java_package = 1;
-
-
-  // If set, all the classes from the .proto file are wrapped in a single
-  // outer class with the given name.  This applies to both Proto1
-  // (equivalent to the old "--one_java_file" option) and Proto2 (where
-  // a .proto always translates to a single class, but you may want to
-  // explicitly choose the class name).
-  optional string java_outer_classname = 8;
-
-  // If set true, then the Java code generator will generate a separate .java
-  // file for each top-level message, enum, and service defined in the .proto
-  // file.  Thus, these types will *not* be nested inside the outer class
-  // named by java_outer_classname.  However, the outer class will still be
-  // generated to contain the file's getDescriptor() method as well as any
-  // top-level extensions defined in the file.
-  optional bool java_multiple_files = 10 [default=false];
-
-  // This option does nothing.
-  optional bool java_generate_equals_and_hash = 20 [deprecated=true];
-
-  // If set true, then the Java2 code generator will generate code that
-  // throws an exception whenever an attempt is made to assign a non-UTF-8
-  // byte sequence to a string field.
-  // Message reflection will do the same.
-  // However, an extension field still accepts non-UTF-8 byte sequences.
-  // This option has no effect on when used with the lite runtime.
-  optional bool java_string_check_utf8 = 27 [default=false];
-
-
-  // Generated classes can be optimized for speed or code size.
-  enum OptimizeMode {
-    SPEED = 1;        // Generate complete code for parsing, serialization,
-                      // etc.
-    CODE_SIZE = 2;    // Use ReflectionOps to implement these methods.
-    LITE_RUNTIME = 3; // Generate code using MessageLite and the lite runtime.
-  }
-  optional OptimizeMode optimize_for = 9 [default=SPEED];
-
-  // Sets the Go package where structs generated from this .proto will be
-  // placed. If omitted, the Go package will be derived from the following:
-  //   - The basename of the package import path, if provided.
-  //   - Otherwise, the package statement in the .proto file, if present.
-  //   - Otherwise, the basename of the .proto file, without extension.
-  optional string go_package = 11;
-
-
-
-  // Should generic services be generated in each language?  "Generic" services
-  // are not specific to any particular RPC system.  They are generated by the
-  // main code generators in each language (without additional plugins).
-  // Generic services were the only kind of service generation supported by
-  // early versions of google.protobuf.
-  //
-  // Generic services are now considered deprecated in favor of using plugins
-  // that generate code specific to your particular RPC system.  Therefore,
-  // these default to false.  Old code which depends on generic services should
-  // explicitly set them to true.
-  optional bool cc_generic_services = 16 [default=false];
-  optional bool java_generic_services = 17 [default=false];
-  optional bool py_generic_services = 18 [default=false];
-  optional bool php_generic_services = 42 [default=false];
-
-  // Is this file deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for everything in the file, or it will be completely ignored; in the very
-  // least, this is a formalization for deprecating files.
-  optional bool deprecated = 23 [default=false];
-
-  // Enables the use of arenas for the proto messages in this file. This applies
-  // only to generated classes for C++.
-  optional bool cc_enable_arenas = 31 [default=false];
-
-
-  // Sets the objective c class prefix which is prepended to all objective c
-  // generated classes from this .proto. There is no default.
-  optional string objc_class_prefix = 36;
-
-  // Namespace for generated classes; defaults to the package.
-  optional string csharp_namespace = 37;
-
-  // By default Swift generators will take the proto package and CamelCase it
-  // replacing '.' with underscore and use that to prefix the types/symbols
-  // defined. When this options is provided, they will use this value instead
-  // to prefix the types/symbols defined.
-  optional string swift_prefix = 39;
-
-  // Sets the php class prefix which is prepended to all php generated classes
-  // from this .proto. Default is empty.
-  optional string php_class_prefix = 40;
-
-  // Use this option to change the namespace of php generated classes. Default
-  // is empty. When this option is empty, the package name will be used for
-  // determining the namespace.
-  optional string php_namespace = 41;
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 38;
-}
-
-message MessageOptions {
-  // Set true to use the old proto1 MessageSet wire format for extensions.
-  // This is provided for backwards-compatibility with the MessageSet wire
-  // format.  You should not use this for any other reason:  It's less
-  // efficient, has fewer features, and is more complicated.
-  //
-  // The message must be defined exactly as follows:
-  //   message Foo {
-  //     option message_set_wire_format = true;
-  //     extensions 4 to max;
-  //   }
-  // Note that the message cannot have any defined fields; MessageSets only
-  // have extensions.
-  //
-  // All extensions of your type must be singular messages; e.g. they cannot
-  // be int32s, enums, or repeated messages.
-  //
-  // Because this is an option, the above two restrictions are not enforced by
-  // the protocol compiler.
-  optional bool message_set_wire_format = 1 [default=false];
-
-  // Disables the generation of the standard "descriptor()" accessor, which can
-  // conflict with a field of the same name.  This is meant to make migration
-  // from proto1 easier; new code should avoid fields named "descriptor".
-  optional bool no_standard_descriptor_accessor = 2 [default=false];
-
-  // Is this message deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the message, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating messages.
-  optional bool deprecated = 3 [default=false];
-
-  // Whether the message is an automatically generated map entry type for the
-  // maps field.
-  //
-  // For maps fields:
-  //     map<KeyType, ValueType> map_field = 1;
-  // The parsed descriptor looks like:
-  //     message MapFieldEntry {
-  //         option map_entry = true;
-  //         optional KeyType key = 1;
-  //         optional ValueType value = 2;
-  //     }
-  //     repeated MapFieldEntry map_field = 1;
-  //
-  // Implementations may choose not to generate the map_entry=true message, but
-  // use a native map in the target language to hold the keys and values.
-  // The reflection APIs in such implementions still need to work as
-  // if the field is a repeated message field.
-  //
-  // NOTE: Do not set the option in .proto files. Always use the maps syntax
-  // instead. The option should only be implicitly set by the proto compiler
-  // parser.
-  optional bool map_entry = 7;
-
-  reserved 8;  // javalite_serializable
-  reserved 9;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message FieldOptions {
-  // The ctype option instructs the C++ code generator to use a different
-  // representation of the field than it normally would.  See the specific
-  // options below.  This option is not yet implemented in the open source
-  // release -- sorry, we'll try to include it in a future version!
-  optional CType ctype = 1 [default = STRING];
-  enum CType {
-    // Default mode.
-    STRING = 0;
-
-    CORD = 1;
-
-    STRING_PIECE = 2;
-  }
-  // The packed option can be enabled for repeated primitive fields to enable
-  // a more efficient representation on the wire. Rather than repeatedly
-  // writing the tag and type for each element, the entire array is encoded as
-  // a single length-delimited blob. In proto3, only explicit setting it to
-  // false will avoid using packed encoding.
-  optional bool packed = 2;
-
-  // The jstype option determines the JavaScript type used for values of the
-  // field.  The option is permitted only for 64 bit integral and fixed types
-  // (int64, uint64, sint64, fixed64, sfixed64).  A field with jstype JS_STRING
-  // is represented as JavaScript string, which avoids loss of precision that
-  // can happen when a large value is converted to a floating point JavaScript.
-  // Specifying JS_NUMBER for the jstype causes the generated JavaScript code to
-  // use the JavaScript "number" type.  The behavior of the default option
-  // JS_NORMAL is implementation dependent.
-  //
-  // This option is an enum to permit additional types to be added, e.g.
-  // goog.math.Integer.
-  optional JSType jstype = 6 [default = JS_NORMAL];
-  enum JSType {
-    // Use the default type.
-    JS_NORMAL = 0;
-
-    // Use JavaScript strings.
-    JS_STRING = 1;
-
-    // Use JavaScript numbers.
-    JS_NUMBER = 2;
-  }
-
-  // Should this field be parsed lazily?  Lazy applies only to message-type
-  // fields.  It means that when the outer message is initially parsed, the
-  // inner message's contents will not be parsed but instead stored in encoded
-  // form.  The inner message will actually be parsed when it is first accessed.
-  //
-  // This is only a hint.  Implementations are free to choose whether to use
-  // eager or lazy parsing regardless of the value of this option.  However,
-  // setting this option true suggests that the protocol author believes that
-  // using lazy parsing on this field is worth the additional bookkeeping
-  // overhead typically needed to implement it.
-  //
-  // This option does not affect the public interface of any generated code;
-  // all method signatures remain the same.  Furthermore, thread-safety of the
-  // interface is not affected by this option; const methods remain safe to
-  // call from multiple threads concurrently, while non-const methods continue
-  // to require exclusive access.
-  //
-  //
-  // Note that implementations may choose not to check required fields within
-  // a lazy sub-message.  That is, calling IsInitialized() on the outer message
-  // may return true even if the inner message has missing required fields.
-  // This is necessary because otherwise the inner message would have to be
-  // parsed in order to perform the check, defeating the purpose of lazy
-  // parsing.  An implementation which chooses not to check required fields
-  // must be consistent about it.  That is, for any particular sub-message, the
-  // implementation must either *always* check its required fields, or *never*
-  // check its required fields, regardless of whether or not the message has
-  // been parsed.
-  optional bool lazy = 5 [default=false];
-
-  // Is this field deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for accessors, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating fields.
-  optional bool deprecated = 3 [default=false];
-
-  // For Google-internal migration only. Do not use.
-  optional bool weak = 10 [default=false];
-
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-
-  reserved 4;  // removed jtype
-}
-
-message OneofOptions {
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumOptions {
-
-  // Set this option to true to allow mapping different tag names to the same
-  // value.
-  optional bool allow_alias = 2;
-
-  // Is this enum deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum, or it will be completely ignored; in the very least, this
-  // is a formalization for deprecating enums.
-  optional bool deprecated = 3 [default=false];
-
-  reserved 5;  // javanano_as_lite
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message EnumValueOptions {
-  // Is this enum value deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the enum value, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating enum values.
-  optional bool deprecated = 1 [default=false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message ServiceOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this service deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the service, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating services.
-  optional bool deprecated = 33 [default=false];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-message MethodOptions {
-
-  // Note:  Field numbers 1 through 32 are reserved for Google's internal RPC
-  //   framework.  We apologize for hoarding these numbers to ourselves, but
-  //   we were already using them long before we decided to release Protocol
-  //   Buffers.
-
-  // Is this method deprecated?
-  // Depending on the target platform, this can emit Deprecated annotations
-  // for the method, or it will be completely ignored; in the very least,
-  // this is a formalization for deprecating methods.
-  optional bool deprecated = 33 [default=false];
-
-  // Is this method side-effect-free (or safe in HTTP parlance), or idempotent,
-  // or neither? HTTP based RPC implementation may choose GET verb for safe
-  // methods, and PUT verb for idempotent methods instead of the default POST.
-  enum IdempotencyLevel {
-    IDEMPOTENCY_UNKNOWN = 0;
-    NO_SIDE_EFFECTS     = 1; // implies idempotent
-    IDEMPOTENT          = 2; // idempotent, but may have side effects
-  }
-  optional IdempotencyLevel idempotency_level =
-      34 [default=IDEMPOTENCY_UNKNOWN];
-
-  // The parser stores options it doesn't recognize here. See above.
-  repeated UninterpretedOption uninterpreted_option = 999;
-
-  // Clients can define custom options in extensions of this message. See above.
-  extensions 1000 to max;
-}
-
-
-// A message representing a option the parser does not recognize. This only
-// appears in options protos created by the compiler::Parser class.
-// DescriptorPool resolves these when building Descriptor objects. Therefore,
-// options protos in descriptor objects (e.g. returned by Descriptor::options(),
-// or produced by Descriptor::CopyTo()) will never have UninterpretedOptions
-// in them.
-message UninterpretedOption {
-  // The name of the uninterpreted option.  Each string represents a segment in
-  // a dot-separated name.  is_extension is true iff a segment represents an
-  // extension (denoted with parentheses in options specs in .proto files).
-  // E.g.,{ ["foo", false], ["bar.baz", true], ["qux", false] } represents
-  // "foo.(bar.baz).qux".
-  message NamePart {
-    required string name_part = 1;
-    required bool is_extension = 2;
-  }
-  repeated NamePart name = 2;
-
-  // The value of the uninterpreted option, in whatever type the tokenizer
-  // identified it as during parsing. Exactly one of these should be set.
-  optional string identifier_value = 3;
-  optional uint64 positive_int_value = 4;
-  optional int64 negative_int_value = 5;
-  optional double double_value = 6;
-  optional bytes string_value = 7;
-  optional string aggregate_value = 8;
-}
-
-// ===================================================================
-// Optional source code info
-
-// Encapsulates information about the original source file from which a
-// FileDescriptorProto was generated.
-message SourceCodeInfo {
-  // A Location identifies a piece of source code in a .proto file which
-  // corresponds to a particular definition.  This information is intended
-  // to be useful to IDEs, code indexers, documentation generators, and similar
-  // tools.
-  //
-  // For example, say we have a file like:
-  //   message Foo {
-  //     optional string foo = 1;
-  //   }
-  // Let's look at just the field definition:
-  //   optional string foo = 1;
-  //   ^       ^^     ^^  ^  ^^^
-  //   a       bc     de  f  ghi
-  // We have the following locations:
-  //   span   path               represents
-  //   [a,i)  [ 4, 0, 2, 0 ]     The whole field definition.
-  //   [a,b)  [ 4, 0, 2, 0, 4 ]  The label (optional).
-  //   [c,d)  [ 4, 0, 2, 0, 5 ]  The type (string).
-  //   [e,f)  [ 4, 0, 2, 0, 1 ]  The name (foo).
-  //   [g,h)  [ 4, 0, 2, 0, 3 ]  The number (1).
-  //
-  // Notes:
-  // - A location may refer to a repeated field itself (i.e. not to any
-  //   particular index within it).  This is used whenever a set of elements are
-  //   logically enclosed in a single code segment.  For example, an entire
-  //   extend block (possibly containing multiple extension definitions) will
-  //   have an outer location whose path refers to the "extensions" repeated
-  //   field without an index.
-  // - Multiple locations may have the same path.  This happens when a single
-  //   logical declaration is spread out across multiple places.  The most
-  //   obvious example is the "extend" block again -- there may be multiple
-  //   extend blocks in the same scope, each of which will have the same path.
-  // - A location's span is not always a subset of its parent's span.  For
-  //   example, the "extendee" of an extension declaration appears at the
-  //   beginning of the "extend" block and is shared by all extensions within
-  //   the block.
-  // - Just because a location's span is a subset of some other location's span
-  //   does not mean that it is a descendent.  For example, a "group" defines
-  //   both a type and a field in a single declaration.  Thus, the locations
-  //   corresponding to the type and field and their components will overlap.
-  // - Code which tries to interpret locations should probably be designed to
-  //   ignore those that it doesn't understand, as more types of locations could
-  //   be recorded in the future.
-  repeated Location location = 1;
-  message Location {
-    // Identifies which part of the FileDescriptorProto was defined at this
-    // location.
-    //
-    // Each element is a field number or an index.  They form a path from
-    // the root FileDescriptorProto to the place where the definition.  For
-    // example, this path:
-    //   [ 4, 3, 2, 7, 1 ]
-    // refers to:
-    //   file.message_type(3)  // 4, 3
-    //       .field(7)         // 2, 7
-    //       .name()           // 1
-    // This is because FileDescriptorProto.message_type has field number 4:
-    //   repeated DescriptorProto message_type = 4;
-    // and DescriptorProto.field has field number 2:
-    //   repeated FieldDescriptorProto field = 2;
-    // and FieldDescriptorProto.name has field number 1:
-    //   optional string name = 1;
-    //
-    // Thus, the above path gives the location of a field name.  If we removed
-    // the last element:
-    //   [ 4, 3, 2, 7 ]
-    // this path refers to the whole field declaration (from the beginning
-    // of the label to the terminating semicolon).
-    repeated int32 path = 1 [packed=true];
-
-    // Always has exactly three or four elements: start line, start column,
-    // end line (optional, otherwise assumed same as start line), end column.
-    // These are packed into a single field for efficiency.  Note that line
-    // and column numbers are zero-based -- typically you will want to add
-    // 1 to each before displaying to a user.
-    repeated int32 span = 2 [packed=true];
-
-    // If this SourceCodeInfo represents a complete declaration, these are any
-    // comments appearing before and after the declaration which appear to be
-    // attached to the declaration.
-    //
-    // A series of line comments appearing on consecutive lines, with no other
-    // tokens appearing on those lines, will be treated as a single comment.
-    //
-    // leading_detached_comments will keep paragraphs of comments that appear
-    // before (but not connected to) the current element. Each paragraph,
-    // separated by empty lines, will be one comment element in the repeated
-    // field.
-    //
-    // Only the comment content is provided; comment markers (e.g. //) are
-    // stripped out.  For block comments, leading whitespace and an asterisk
-    // will be stripped from the beginning of each line other than the first.
-    // Newlines are included in the output.
-    //
-    // Examples:
-    //
-    //   optional int32 foo = 1;  // Comment attached to foo.
-    //   // Comment attached to bar.
-    //   optional int32 bar = 2;
-    //
-    //   optional string baz = 3;
-    //   // Comment attached to baz.
-    //   // Another line attached to baz.
-    //
-    //   // Comment attached to qux.
-    //   //
-    //   // Another line attached to qux.
-    //   optional double qux = 4;
-    //
-    //   // Detached comment for corge. This is not leading or trailing comments
-    //   // to qux or corge because there are blank lines separating it from
-    //   // both.
-    //
-    //   // Detached comment for corge paragraph 2.
-    //
-    //   optional string corge = 5;
-    //   /* Block comment attached
-    //    * to corge.  Leading asterisks
-    //    * will be removed. */
-    //   /* Block comment attached to
-    //    * grault. */
-    //   optional int32 grault = 6;
-    //
-    //   // ignored detached comments.
-    optional string leading_comments = 3;
-    optional string trailing_comments = 4;
-    repeated string leading_detached_comments = 6;
-  }
-}
-
-// Describes the relationship between generated code and its original source
-// file. A GeneratedCodeInfo message is associated with only one generated
-// source file, but may contain references to different source .proto files.
-message GeneratedCodeInfo {
-  // An Annotation connects some span of text in generated code to an element
-  // of its generating .proto file.
-  repeated Annotation annotation = 1;
-  message Annotation {
-    // Identifies the element in the original source .proto file. This field
-    // is formatted the same as SourceCodeInfo.Location.path.
-    repeated int32 path = 1 [packed=true];
-
-    // Identifies the filesystem path to the original source .proto.
-    optional string source_file = 2;
-
-    // Identifies the starting offset in bytes in the generated code
-    // that relates to the identified object.
-    optional int32 begin = 3;
-
-    // Identifies the ending offset in bytes in the generated code that
-    // relates to the identified offset. The end offset should be one past
-    // the last relevant byte (so the length of the text = end - begin).
-    optional int32 end = 4;
-  }
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go
deleted file mode 100644
index 0d6055d610..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/doc.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-	A plugin for the Google protocol buffer compiler to generate Go code.
-	Run it by building this program and putting it in your path with the name
-		protoc-gen-go
-	That word 'go' at the end becomes part of the option string set for the
-	protocol compiler, so once the protocol compiler (protoc) is installed
-	you can run
-		protoc --go_out=output_directory input_directory/file.proto
-	to generate Go bindings for the protocol defined by file.proto.
-	With that input, the output will be written to
-		output_directory/file.pb.go
-
-	The generated code is documented in the package comment for
-	the library.
-
-	See the README and documentation for protocol buffers to learn more:
-		https://developers.google.com/protocol-buffers/
-
-*/
-package documentation
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
deleted file mode 100644
index b5715c3577..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-include $(GOROOT)/src/Make.inc
-
-TARG=github.com/golang/protobuf/compiler/generator
-GOFILES=\
-	generator.go\
-
-DEPS=../descriptor ../plugin ../../proto
-
-include $(GOROOT)/src/Make.pkg
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
deleted file mode 100644
index 60d524645e..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/generator.go
+++ /dev/null
@@ -1,2866 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-	The code generator for the plugin for the Google protocol buffer compiler.
-	It generates Go code from the protocol buffer description files read by the
-	main routine.
-*/
-package generator
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"log"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-
-	"github.com/golang/protobuf/proto"
-
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-	plugin "github.com/golang/protobuf/protoc-gen-go/plugin"
-)
-
-// generatedCodeVersion indicates a version of the generated code.
-// It is incremented whenever an incompatibility between the generated code and
-// proto package is introduced; the generated code references
-// a constant, proto.ProtoPackageIsVersionN (where N is generatedCodeVersion).
-const generatedCodeVersion = 2
-
-// A Plugin provides functionality to add to the output during Go code generation,
-// such as to produce RPC stubs.
-type Plugin interface {
-	// Name identifies the plugin.
-	Name() string
-	// Init is called once after data structures are built but before
-	// code generation begins.
-	Init(g *Generator)
-	// Generate produces the code generated by the plugin for this file,
-	// except for the imports, by calling the generator's methods P, In, and Out.
-	Generate(file *FileDescriptor)
-	// GenerateImports produces the import declarations for this file.
-	// It is called after Generate.
-	GenerateImports(file *FileDescriptor)
-}
-
-var plugins []Plugin
-
-// RegisterPlugin installs a (second-order) plugin to be run when the Go output is generated.
-// It is typically called during initialization.
-func RegisterPlugin(p Plugin) {
-	plugins = append(plugins, p)
-}
-
-// Each type we import as a protocol buffer (other than FileDescriptorProto) needs
-// a pointer to the FileDescriptorProto that represents it.  These types achieve that
-// wrapping by placing each Proto inside a struct with the pointer to its File. The
-// structs have the same names as their contents, with "Proto" removed.
-// FileDescriptor is used to store the things that it points to.
-
-// The file and package name method are common to messages and enums.
-type common struct {
-	file *descriptor.FileDescriptorProto // File this object comes from.
-}
-
-// PackageName is name in the package clause in the generated file.
-func (c *common) PackageName() string { return uniquePackageOf(c.file) }
-
-func (c *common) File() *descriptor.FileDescriptorProto { return c.file }
-
-func fileIsProto3(file *descriptor.FileDescriptorProto) bool {
-	return file.GetSyntax() == "proto3"
-}
-
-func (c *common) proto3() bool { return fileIsProto3(c.file) }
-
-// Descriptor represents a protocol buffer message.
-type Descriptor struct {
-	common
-	*descriptor.DescriptorProto
-	parent   *Descriptor            // The containing message, if any.
-	nested   []*Descriptor          // Inner messages, if any.
-	enums    []*EnumDescriptor      // Inner enums, if any.
-	ext      []*ExtensionDescriptor // Extensions, if any.
-	typename []string               // Cached typename vector.
-	index    int                    // The index into the container, whether the file or another message.
-	path     string                 // The SourceCodeInfo path as comma-separated integers.
-	group    bool
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (d *Descriptor) TypeName() []string {
-	if d.typename != nil {
-		return d.typename
-	}
-	n := 0
-	for parent := d; parent != nil; parent = parent.parent {
-		n++
-	}
-	s := make([]string, n, n)
-	for parent := d; parent != nil; parent = parent.parent {
-		n--
-		s[n] = parent.GetName()
-	}
-	d.typename = s
-	return s
-}
-
-// EnumDescriptor describes an enum. If it's at top level, its parent will be nil.
-// Otherwise it will be the descriptor of the message in which it is defined.
-type EnumDescriptor struct {
-	common
-	*descriptor.EnumDescriptorProto
-	parent   *Descriptor // The containing message, if any.
-	typename []string    // Cached typename vector.
-	index    int         // The index into the container, whether the file or a message.
-	path     string      // The SourceCodeInfo path as comma-separated integers.
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (e *EnumDescriptor) TypeName() (s []string) {
-	if e.typename != nil {
-		return e.typename
-	}
-	name := e.GetName()
-	if e.parent == nil {
-		s = make([]string, 1)
-	} else {
-		pname := e.parent.TypeName()
-		s = make([]string, len(pname)+1)
-		copy(s, pname)
-	}
-	s[len(s)-1] = name
-	e.typename = s
-	return s
-}
-
-// Everything but the last element of the full type name, CamelCased.
-// The values of type Foo.Bar are call Foo_value1... not Foo_Bar_value1... .
-func (e *EnumDescriptor) prefix() string {
-	if e.parent == nil {
-		// If the enum is not part of a message, the prefix is just the type name.
-		return CamelCase(*e.Name) + "_"
-	}
-	typeName := e.TypeName()
-	return CamelCaseSlice(typeName[0:len(typeName)-1]) + "_"
-}
-
-// The integer value of the named constant in this enumerated type.
-func (e *EnumDescriptor) integerValueAsString(name string) string {
-	for _, c := range e.Value {
-		if c.GetName() == name {
-			return fmt.Sprint(c.GetNumber())
-		}
-	}
-	log.Fatal("cannot find value for enum constant")
-	return ""
-}
-
-// ExtensionDescriptor describes an extension. If it's at top level, its parent will be nil.
-// Otherwise it will be the descriptor of the message in which it is defined.
-type ExtensionDescriptor struct {
-	common
-	*descriptor.FieldDescriptorProto
-	parent *Descriptor // The containing message, if any.
-}
-
-// TypeName returns the elements of the dotted type name.
-// The package name is not part of this name.
-func (e *ExtensionDescriptor) TypeName() (s []string) {
-	name := e.GetName()
-	if e.parent == nil {
-		// top-level extension
-		s = make([]string, 1)
-	} else {
-		pname := e.parent.TypeName()
-		s = make([]string, len(pname)+1)
-		copy(s, pname)
-	}
-	s[len(s)-1] = name
-	return s
-}
-
-// DescName returns the variable name used for the generated descriptor.
-func (e *ExtensionDescriptor) DescName() string {
-	// The full type name.
-	typeName := e.TypeName()
-	// Each scope of the extension is individually CamelCased, and all are joined with "_" with an "E_" prefix.
-	for i, s := range typeName {
-		typeName[i] = CamelCase(s)
-	}
-	return "E_" + strings.Join(typeName, "_")
-}
-
-// ImportedDescriptor describes a type that has been publicly imported from another file.
-type ImportedDescriptor struct {
-	common
-	o Object
-}
-
-func (id *ImportedDescriptor) TypeName() []string { return id.o.TypeName() }
-
-// FileDescriptor describes an protocol buffer descriptor file (.proto).
-// It includes slices of all the messages and enums defined within it.
-// Those slices are constructed by WrapTypes.
-type FileDescriptor struct {
-	*descriptor.FileDescriptorProto
-	desc []*Descriptor          // All the messages defined in this file.
-	enum []*EnumDescriptor      // All the enums defined in this file.
-	ext  []*ExtensionDescriptor // All the top-level extensions defined in this file.
-	imp  []*ImportedDescriptor  // All types defined in files publicly imported by this file.
-
-	// Comments, stored as a map of path (comma-separated integers) to the comment.
-	comments map[string]*descriptor.SourceCodeInfo_Location
-
-	// The full list of symbols that are exported,
-	// as a map from the exported object to its symbols.
-	// This is used for supporting public imports.
-	exported map[Object][]symbol
-
-	index int // The index of this file in the list of files to generate code for
-
-	proto3 bool // whether to generate proto3 code for this file
-}
-
-// PackageName is the package name we'll use in the generated code to refer to this file.
-func (d *FileDescriptor) PackageName() string { return uniquePackageOf(d.FileDescriptorProto) }
-
-// VarName is the variable name we'll use in the generated code to refer
-// to the compressed bytes of this descriptor. It is not exported, so
-// it is only valid inside the generated package.
-func (d *FileDescriptor) VarName() string { return fmt.Sprintf("fileDescriptor%d", d.index) }
-
-// goPackageOption interprets the file's go_package option.
-// If there is no go_package, it returns ("", "", false).
-// If there's a simple name, it returns ("", pkg, true).
-// If the option implies an import path, it returns (impPath, pkg, true).
-func (d *FileDescriptor) goPackageOption() (impPath, pkg string, ok bool) {
-	pkg = d.GetOptions().GetGoPackage()
-	if pkg == "" {
-		return
-	}
-	ok = true
-	// The presence of a slash implies there's an import path.
-	slash := strings.LastIndex(pkg, "/")
-	if slash < 0 {
-		return
-	}
-	impPath, pkg = pkg, pkg[slash+1:]
-	// A semicolon-delimited suffix overrides the package name.
-	sc := strings.IndexByte(impPath, ';')
-	if sc < 0 {
-		return
-	}
-	impPath, pkg = impPath[:sc], impPath[sc+1:]
-	return
-}
-
-// goPackageName returns the Go package name to use in the
-// generated Go file.  The result explicit reports whether the name
-// came from an option go_package statement.  If explicit is false,
-// the name was derived from the protocol buffer's package statement
-// or the input file name.
-func (d *FileDescriptor) goPackageName() (name string, explicit bool) {
-	// Does the file have a "go_package" option?
-	if _, pkg, ok := d.goPackageOption(); ok {
-		return pkg, true
-	}
-
-	// Does the file have a package clause?
-	if pkg := d.GetPackage(); pkg != "" {
-		return pkg, false
-	}
-	// Use the file base name.
-	return baseName(d.GetName()), false
-}
-
-// goFileName returns the output name for the generated Go file.
-func (d *FileDescriptor) goFileName() string {
-	name := *d.Name
-	if ext := path.Ext(name); ext == ".proto" || ext == ".protodevel" {
-		name = name[:len(name)-len(ext)]
-	}
-	name += ".pb.go"
-
-	// Does the file have a "go_package" option?
-	// If it does, it may override the filename.
-	if impPath, _, ok := d.goPackageOption(); ok && impPath != "" {
-		// Replace the existing dirname with the declared import path.
-		_, name = path.Split(name)
-		name = path.Join(impPath, name)
-		return name
-	}
-
-	return name
-}
-
-func (d *FileDescriptor) addExport(obj Object, sym symbol) {
-	d.exported[obj] = append(d.exported[obj], sym)
-}
-
-// symbol is an interface representing an exported Go symbol.
-type symbol interface {
-	// GenerateAlias should generate an appropriate alias
-	// for the symbol from the named package.
-	GenerateAlias(g *Generator, pkg string)
-}
-
-type messageSymbol struct {
-	sym                         string
-	hasExtensions, isMessageSet bool
-	hasOneof                    bool
-	getters                     []getterSymbol
-}
-
-type getterSymbol struct {
-	name     string
-	typ      string
-	typeName string // canonical name in proto world; empty for proto.Message and similar
-	genType  bool   // whether typ contains a generated type (message/group/enum)
-}
-
-func (ms *messageSymbol) GenerateAlias(g *Generator, pkg string) {
-	remoteSym := pkg + "." + ms.sym
-
-	g.P("type ", ms.sym, " ", remoteSym)
-	g.P("func (m *", ms.sym, ") Reset() { (*", remoteSym, ")(m).Reset() }")
-	g.P("func (m *", ms.sym, ") String() string { return (*", remoteSym, ")(m).String() }")
-	g.P("func (*", ms.sym, ") ProtoMessage() {}")
-	if ms.hasExtensions {
-		g.P("func (*", ms.sym, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange ",
-			"{ return (*", remoteSym, ")(nil).ExtensionRangeArray() }")
-		if ms.isMessageSet {
-			g.P("func (m *", ms.sym, ") Marshal() ([]byte, error) ",
-				"{ return (*", remoteSym, ")(m).Marshal() }")
-			g.P("func (m *", ms.sym, ") Unmarshal(buf []byte) error ",
-				"{ return (*", remoteSym, ")(m).Unmarshal(buf) }")
-		}
-	}
-	if ms.hasOneof {
-		// Oneofs and public imports do not mix well.
-		// We can make them work okay for the binary format,
-		// but they're going to break weirdly for text/JSON.
-		enc := "_" + ms.sym + "_OneofMarshaler"
-		dec := "_" + ms.sym + "_OneofUnmarshaler"
-		size := "_" + ms.sym + "_OneofSizer"
-		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
-		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
-		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) int"
-		g.P("func (m *", ms.sym, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
-		g.P("return ", enc, ", ", dec, ", ", size, ", nil")
-		g.P("}")
-
-		g.P("func ", enc, encSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("enc, _, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return enc(m0, b)")
-		g.P("}")
-
-		g.P("func ", dec, decSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, dec, _, _ := m0.XXX_OneofFuncs()")
-		g.P("return dec(m0, tag, wire, b)")
-		g.P("}")
-
-		g.P("func ", size, sizeSig, " {")
-		g.P("m := msg.(*", ms.sym, ")")
-		g.P("m0 := (*", remoteSym, ")(m)")
-		g.P("_, _, size, _ := m0.XXX_OneofFuncs()")
-		g.P("return size(m0)")
-		g.P("}")
-	}
-	for _, get := range ms.getters {
-
-		if get.typeName != "" {
-			g.RecordTypeUse(get.typeName)
-		}
-		typ := get.typ
-		val := "(*" + remoteSym + ")(m)." + get.name + "()"
-		if get.genType {
-			// typ will be "*pkg.T" (message/group) or "pkg.T" (enum)
-			// or "map[t]*pkg.T" (map to message/enum).
-			// The first two of those might have a "[]" prefix if it is repeated.
-			// Drop any package qualifier since we have hoisted the type into this package.
-			rep := strings.HasPrefix(typ, "[]")
-			if rep {
-				typ = typ[2:]
-			}
-			isMap := strings.HasPrefix(typ, "map[")
-			star := typ[0] == '*'
-			if !isMap { // map types handled lower down
-				typ = typ[strings.Index(typ, ".")+1:]
-			}
-			if star {
-				typ = "*" + typ
-			}
-			if rep {
-				// Go does not permit conversion between slice types where both
-				// element types are named. That means we need to generate a bit
-				// of code in this situation.
-				// typ is the element type.
-				// val is the expression to get the slice from the imported type.
-
-				ctyp := typ // conversion type expression; "Foo" or "(*Foo)"
-				if star {
-					ctyp = "(" + typ + ")"
-				}
-
-				g.P("func (m *", ms.sym, ") ", get.name, "() []", typ, " {")
-				g.In()
-				g.P("o := ", val)
-				g.P("if o == nil {")
-				g.In()
-				g.P("return nil")
-				g.Out()
-				g.P("}")
-				g.P("s := make([]", typ, ", len(o))")
-				g.P("for i, x := range o {")
-				g.In()
-				g.P("s[i] = ", ctyp, "(x)")
-				g.Out()
-				g.P("}")
-				g.P("return s")
-				g.Out()
-				g.P("}")
-				continue
-			}
-			if isMap {
-				// Split map[keyTyp]valTyp.
-				bra, ket := strings.Index(typ, "["), strings.Index(typ, "]")
-				keyTyp, valTyp := typ[bra+1:ket], typ[ket+1:]
-				// Drop any package qualifier.
-				// Only the value type may be foreign.
-				star := valTyp[0] == '*'
-				valTyp = valTyp[strings.Index(valTyp, ".")+1:]
-				if star {
-					valTyp = "*" + valTyp
-				}
-
-				typ := "map[" + keyTyp + "]" + valTyp
-				g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " {")
-				g.P("o := ", val)
-				g.P("if o == nil { return nil }")
-				g.P("s := make(", typ, ", len(o))")
-				g.P("for k, v := range o {")
-				g.P("s[k] = (", valTyp, ")(v)")
-				g.P("}")
-				g.P("return s")
-				g.P("}")
-				continue
-			}
-			// Convert imported type into the forwarding type.
-			val = "(" + typ + ")(" + val + ")"
-		}
-
-		g.P("func (m *", ms.sym, ") ", get.name, "() ", typ, " { return ", val, " }")
-	}
-
-}
-
-type enumSymbol struct {
-	name   string
-	proto3 bool // Whether this came from a proto3 file.
-}
-
-func (es enumSymbol) GenerateAlias(g *Generator, pkg string) {
-	s := es.name
-	g.P("type ", s, " ", pkg, ".", s)
-	g.P("var ", s, "_name = ", pkg, ".", s, "_name")
-	g.P("var ", s, "_value = ", pkg, ".", s, "_value")
-	g.P("func (x ", s, ") String() string { return (", pkg, ".", s, ")(x).String() }")
-	if !es.proto3 {
-		g.P("func (x ", s, ") Enum() *", s, "{ return (*", s, ")((", pkg, ".", s, ")(x).Enum()) }")
-		g.P("func (x *", s, ") UnmarshalJSON(data []byte) error { return (*", pkg, ".", s, ")(x).UnmarshalJSON(data) }")
-	}
-}
-
-type constOrVarSymbol struct {
-	sym  string
-	typ  string // either "const" or "var"
-	cast string // if non-empty, a type cast is required (used for enums)
-}
-
-func (cs constOrVarSymbol) GenerateAlias(g *Generator, pkg string) {
-	v := pkg + "." + cs.sym
-	if cs.cast != "" {
-		v = cs.cast + "(" + v + ")"
-	}
-	g.P(cs.typ, " ", cs.sym, " = ", v)
-}
-
-// Object is an interface abstracting the abilities shared by enums, messages, extensions and imported objects.
-type Object interface {
-	PackageName() string // The name we use in our output (a_b_c), possibly renamed for uniqueness.
-	TypeName() []string
-	File() *descriptor.FileDescriptorProto
-}
-
-// Each package name we generate must be unique. The package we're generating
-// gets its own name but every other package must have a unique name that does
-// not conflict in the code we generate.  These names are chosen globally (although
-// they don't have to be, it simplifies things to do them globally).
-func uniquePackageOf(fd *descriptor.FileDescriptorProto) string {
-	s, ok := uniquePackageName[fd]
-	if !ok {
-		log.Fatal("internal error: no package name defined for " + fd.GetName())
-	}
-	return s
-}
-
-// Generator is the type whose methods generate the output, stored in the associated response structure.
-type Generator struct {
-	*bytes.Buffer
-
-	Request  *plugin.CodeGeneratorRequest  // The input.
-	Response *plugin.CodeGeneratorResponse // The output.
-
-	Param             map[string]string // Command-line parameters.
-	PackageImportPath string            // Go import path of the package we're generating code for
-	ImportPrefix      string            // String to prefix to imported package file names.
-	ImportMap         map[string]string // Mapping from .proto file name to import path
-
-	Pkg map[string]string // The names under which we import support packages
-
-	packageName      string                     // What we're calling ourselves.
-	allFiles         []*FileDescriptor          // All files in the tree
-	allFilesByName   map[string]*FileDescriptor // All files by filename.
-	genFiles         []*FileDescriptor          // Those files we will generate output for.
-	file             *FileDescriptor            // The file we are compiling now.
-	usedPackages     map[string]bool            // Names of packages used in current file.
-	typeNameToObject map[string]Object          // Key is a fully-qualified name in input syntax.
-	init             []string                   // Lines to emit in the init function.
-	indent           string
-	writeOutput      bool
-}
-
-// New creates a new generator and allocates the request and response protobufs.
-func New() *Generator {
-	g := new(Generator)
-	g.Buffer = new(bytes.Buffer)
-	g.Request = new(plugin.CodeGeneratorRequest)
-	g.Response = new(plugin.CodeGeneratorResponse)
-	return g
-}
-
-// Error reports a problem, including an error, and exits the program.
-func (g *Generator) Error(err error, msgs ...string) {
-	s := strings.Join(msgs, " ") + ":" + err.Error()
-	log.Print("protoc-gen-go: error:", s)
-	os.Exit(1)
-}
-
-// Fail reports a problem and exits the program.
-func (g *Generator) Fail(msgs ...string) {
-	s := strings.Join(msgs, " ")
-	log.Print("protoc-gen-go: error:", s)
-	os.Exit(1)
-}
-
-// CommandLineParameters breaks the comma-separated list of key=value pairs
-// in the parameter (a member of the request protobuf) into a key/value map.
-// It then sets file name mappings defined by those entries.
-func (g *Generator) CommandLineParameters(parameter string) {
-	g.Param = make(map[string]string)
-	for _, p := range strings.Split(parameter, ",") {
-		if i := strings.Index(p, "="); i < 0 {
-			g.Param[p] = ""
-		} else {
-			g.Param[p[0:i]] = p[i+1:]
-		}
-	}
-
-	g.ImportMap = make(map[string]string)
-	pluginList := "none" // Default list of plugin names to enable (empty means all).
-	for k, v := range g.Param {
-		switch k {
-		case "import_prefix":
-			g.ImportPrefix = v
-		case "import_path":
-			g.PackageImportPath = v
-		case "plugins":
-			pluginList = v
-		default:
-			if len(k) > 0 && k[0] == 'M' {
-				g.ImportMap[k[1:]] = v
-			}
-		}
-	}
-	if pluginList != "" {
-		// Amend the set of plugins.
-		enabled := make(map[string]bool)
-		for _, name := range strings.Split(pluginList, "+") {
-			enabled[name] = true
-		}
-		var nplugins []Plugin
-		for _, p := range plugins {
-			if enabled[p.Name()] {
-				nplugins = append(nplugins, p)
-			}
-		}
-		plugins = nplugins
-	}
-}
-
-// DefaultPackageName returns the package name printed for the object.
-// If its file is in a different package, it returns the package name we're using for this file, plus ".".
-// Otherwise it returns the empty string.
-func (g *Generator) DefaultPackageName(obj Object) string {
-	pkg := obj.PackageName()
-	if pkg == g.packageName {
-		return ""
-	}
-	return pkg + "."
-}
-
-// For each input file, the unique package name to use, underscored.
-var uniquePackageName = make(map[*descriptor.FileDescriptorProto]string)
-
-// Package names already registered.  Key is the name from the .proto file;
-// value is the name that appears in the generated code.
-var pkgNamesInUse = make(map[string]bool)
-
-// Create and remember a guaranteed unique package name for this file descriptor.
-// Pkg is the candidate name.  If f is nil, it's a builtin package like "proto" and
-// has no file descriptor.
-func RegisterUniquePackageName(pkg string, f *FileDescriptor) string {
-	// Convert dots to underscores before finding a unique alias.
-	pkg = strings.Map(badToUnderscore, pkg)
-
-	for i, orig := 1, pkg; pkgNamesInUse[pkg]; i++ {
-		// It's a duplicate; must rename.
-		pkg = orig + strconv.Itoa(i)
-	}
-	// Install it.
-	pkgNamesInUse[pkg] = true
-	if f != nil {
-		uniquePackageName[f.FileDescriptorProto] = pkg
-	}
-	return pkg
-}
-
-var isGoKeyword = map[string]bool{
-	"break":       true,
-	"case":        true,
-	"chan":        true,
-	"const":       true,
-	"continue":    true,
-	"default":     true,
-	"else":        true,
-	"defer":       true,
-	"fallthrough": true,
-	"for":         true,
-	"func":        true,
-	"go":          true,
-	"goto":        true,
-	"if":          true,
-	"import":      true,
-	"interface":   true,
-	"map":         true,
-	"package":     true,
-	"range":       true,
-	"return":      true,
-	"select":      true,
-	"struct":      true,
-	"switch":      true,
-	"type":        true,
-	"var":         true,
-}
-
-// defaultGoPackage returns the package name to use,
-// derived from the import path of the package we're building code for.
-func (g *Generator) defaultGoPackage() string {
-	p := g.PackageImportPath
-	if i := strings.LastIndex(p, "/"); i >= 0 {
-		p = p[i+1:]
-	}
-	if p == "" {
-		return ""
-	}
-
-	p = strings.Map(badToUnderscore, p)
-	// Identifier must not be keyword: insert _.
-	if isGoKeyword[p] {
-		p = "_" + p
-	}
-	// Identifier must not begin with digit: insert _.
-	if r, _ := utf8.DecodeRuneInString(p); unicode.IsDigit(r) {
-		p = "_" + p
-	}
-	return p
-}
-
-// SetPackageNames sets the package name for this run.
-// The package name must agree across all files being generated.
-// It also defines unique package names for all imported files.
-func (g *Generator) SetPackageNames() {
-	// Register the name for this package.  It will be the first name
-	// registered so is guaranteed to be unmodified.
-	pkg, explicit := g.genFiles[0].goPackageName()
-
-	// Check all files for an explicit go_package option.
-	for _, f := range g.genFiles {
-		thisPkg, thisExplicit := f.goPackageName()
-		if thisExplicit {
-			if !explicit {
-				// Let this file's go_package option serve for all input files.
-				pkg, explicit = thisPkg, true
-			} else if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
-		}
-	}
-
-	// If we don't have an explicit go_package option but we have an
-	// import path, use that.
-	if !explicit {
-		p := g.defaultGoPackage()
-		if p != "" {
-			pkg, explicit = p, true
-		}
-	}
-
-	// If there was no go_package and no import path to use,
-	// double-check that all the inputs have the same implicit
-	// Go package name.
-	if !explicit {
-		for _, f := range g.genFiles {
-			thisPkg, _ := f.goPackageName()
-			if thisPkg != pkg {
-				g.Fail("inconsistent package names:", thisPkg, pkg)
-			}
-		}
-	}
-
-	g.packageName = RegisterUniquePackageName(pkg, g.genFiles[0])
-
-	// Register the support package names. They might collide with the
-	// name of a package we import.
-	g.Pkg = map[string]string{
-		"fmt":   RegisterUniquePackageName("fmt", nil),
-		"math":  RegisterUniquePackageName("math", nil),
-		"proto": RegisterUniquePackageName("proto", nil),
-	}
-
-AllFiles:
-	for _, f := range g.allFiles {
-		for _, genf := range g.genFiles {
-			if f == genf {
-				// In this package already.
-				uniquePackageName[f.FileDescriptorProto] = g.packageName
-				continue AllFiles
-			}
-		}
-		// The file is a dependency, so we want to ignore its go_package option
-		// because that is only relevant for its specific generated output.
-		pkg := f.GetPackage()
-		if pkg == "" {
-			pkg = baseName(*f.Name)
-		}
-		RegisterUniquePackageName(pkg, f)
-	}
-}
-
-// WrapTypes walks the incoming data, wrapping DescriptorProtos, EnumDescriptorProtos
-// and FileDescriptorProtos into file-referenced objects within the Generator.
-// It also creates the list of files to generate and so should be called before GenerateAllFiles.
-func (g *Generator) WrapTypes() {
-	g.allFiles = make([]*FileDescriptor, 0, len(g.Request.ProtoFile))
-	g.allFilesByName = make(map[string]*FileDescriptor, len(g.allFiles))
-	for _, f := range g.Request.ProtoFile {
-		// We must wrap the descriptors before we wrap the enums
-		descs := wrapDescriptors(f)
-		g.buildNestedDescriptors(descs)
-		enums := wrapEnumDescriptors(f, descs)
-		g.buildNestedEnums(descs, enums)
-		exts := wrapExtensions(f)
-		fd := &FileDescriptor{
-			FileDescriptorProto: f,
-			desc:                descs,
-			enum:                enums,
-			ext:                 exts,
-			exported:            make(map[Object][]symbol),
-			proto3:              fileIsProto3(f),
-		}
-		extractComments(fd)
-		g.allFiles = append(g.allFiles, fd)
-		g.allFilesByName[f.GetName()] = fd
-	}
-	for _, fd := range g.allFiles {
-		fd.imp = wrapImported(fd.FileDescriptorProto, g)
-	}
-
-	g.genFiles = make([]*FileDescriptor, 0, len(g.Request.FileToGenerate))
-	for _, fileName := range g.Request.FileToGenerate {
-		fd := g.allFilesByName[fileName]
-		if fd == nil {
-			g.Fail("could not find file named", fileName)
-		}
-		fd.index = len(g.genFiles)
-		g.genFiles = append(g.genFiles, fd)
-	}
-}
-
-// Scan the descriptors in this file.  For each one, build the slice of nested descriptors
-func (g *Generator) buildNestedDescriptors(descs []*Descriptor) {
-	for _, desc := range descs {
-		if len(desc.NestedType) != 0 {
-			for _, nest := range descs {
-				if nest.parent == desc {
-					desc.nested = append(desc.nested, nest)
-				}
-			}
-			if len(desc.nested) != len(desc.NestedType) {
-				g.Fail("internal error: nesting failure for", desc.GetName())
-			}
-		}
-	}
-}
-
-func (g *Generator) buildNestedEnums(descs []*Descriptor, enums []*EnumDescriptor) {
-	for _, desc := range descs {
-		if len(desc.EnumType) != 0 {
-			for _, enum := range enums {
-				if enum.parent == desc {
-					desc.enums = append(desc.enums, enum)
-				}
-			}
-			if len(desc.enums) != len(desc.EnumType) {
-				g.Fail("internal error: enum nesting failure for", desc.GetName())
-			}
-		}
-	}
-}
-
-// Construct the Descriptor
-func newDescriptor(desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *Descriptor {
-	d := &Descriptor{
-		common:          common{file},
-		DescriptorProto: desc,
-		parent:          parent,
-		index:           index,
-	}
-	if parent == nil {
-		d.path = fmt.Sprintf("%d,%d", messagePath, index)
-	} else {
-		d.path = fmt.Sprintf("%s,%d,%d", parent.path, messageMessagePath, index)
-	}
-
-	// The only way to distinguish a group from a message is whether
-	// the containing message has a TYPE_GROUP field that matches.
-	if parent != nil {
-		parts := d.TypeName()
-		if file.Package != nil {
-			parts = append([]string{*file.Package}, parts...)
-		}
-		exp := "." + strings.Join(parts, ".")
-		for _, field := range parent.Field {
-			if field.GetType() == descriptor.FieldDescriptorProto_TYPE_GROUP && field.GetTypeName() == exp {
-				d.group = true
-				break
-			}
-		}
-	}
-
-	for _, field := range desc.Extension {
-		d.ext = append(d.ext, &ExtensionDescriptor{common{file}, field, d})
-	}
-
-	return d
-}
-
-// Return a slice of all the Descriptors defined within this file
-func wrapDescriptors(file *descriptor.FileDescriptorProto) []*Descriptor {
-	sl := make([]*Descriptor, 0, len(file.MessageType)+10)
-	for i, desc := range file.MessageType {
-		sl = wrapThisDescriptor(sl, desc, nil, file, i)
-	}
-	return sl
-}
-
-// Wrap this Descriptor, recursively
-func wrapThisDescriptor(sl []*Descriptor, desc *descriptor.DescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) []*Descriptor {
-	sl = append(sl, newDescriptor(desc, parent, file, index))
-	me := sl[len(sl)-1]
-	for i, nested := range desc.NestedType {
-		sl = wrapThisDescriptor(sl, nested, me, file, i)
-	}
-	return sl
-}
-
-// Construct the EnumDescriptor
-func newEnumDescriptor(desc *descriptor.EnumDescriptorProto, parent *Descriptor, file *descriptor.FileDescriptorProto, index int) *EnumDescriptor {
-	ed := &EnumDescriptor{
-		common:              common{file},
-		EnumDescriptorProto: desc,
-		parent:              parent,
-		index:               index,
-	}
-	if parent == nil {
-		ed.path = fmt.Sprintf("%d,%d", enumPath, index)
-	} else {
-		ed.path = fmt.Sprintf("%s,%d,%d", parent.path, messageEnumPath, index)
-	}
-	return ed
-}
-
-// Return a slice of all the EnumDescriptors defined within this file
-func wrapEnumDescriptors(file *descriptor.FileDescriptorProto, descs []*Descriptor) []*EnumDescriptor {
-	sl := make([]*EnumDescriptor, 0, len(file.EnumType)+10)
-	// Top-level enums.
-	for i, enum := range file.EnumType {
-		sl = append(sl, newEnumDescriptor(enum, nil, file, i))
-	}
-	// Enums within messages. Enums within embedded messages appear in the outer-most message.
-	for _, nested := range descs {
-		for i, enum := range nested.EnumType {
-			sl = append(sl, newEnumDescriptor(enum, nested, file, i))
-		}
-	}
-	return sl
-}
-
-// Return a slice of all the top-level ExtensionDescriptors defined within this file.
-func wrapExtensions(file *descriptor.FileDescriptorProto) []*ExtensionDescriptor {
-	var sl []*ExtensionDescriptor
-	for _, field := range file.Extension {
-		sl = append(sl, &ExtensionDescriptor{common{file}, field, nil})
-	}
-	return sl
-}
-
-// Return a slice of all the types that are publicly imported into this file.
-func wrapImported(file *descriptor.FileDescriptorProto, g *Generator) (sl []*ImportedDescriptor) {
-	for _, index := range file.PublicDependency {
-		df := g.fileByName(file.Dependency[index])
-		for _, d := range df.desc {
-			if d.GetOptions().GetMapEntry() {
-				continue
-			}
-			sl = append(sl, &ImportedDescriptor{common{file}, d})
-		}
-		for _, e := range df.enum {
-			sl = append(sl, &ImportedDescriptor{common{file}, e})
-		}
-		for _, ext := range df.ext {
-			sl = append(sl, &ImportedDescriptor{common{file}, ext})
-		}
-	}
-	return
-}
-
-func extractComments(file *FileDescriptor) {
-	file.comments = make(map[string]*descriptor.SourceCodeInfo_Location)
-	for _, loc := range file.GetSourceCodeInfo().GetLocation() {
-		if loc.LeadingComments == nil {
-			continue
-		}
-		var p []string
-		for _, n := range loc.Path {
-			p = append(p, strconv.Itoa(int(n)))
-		}
-		file.comments[strings.Join(p, ",")] = loc
-	}
-}
-
-// BuildTypeNameMap builds the map from fully qualified type names to objects.
-// The key names for the map come from the input data, which puts a period at the beginning.
-// It should be called after SetPackageNames and before GenerateAllFiles.
-func (g *Generator) BuildTypeNameMap() {
-	g.typeNameToObject = make(map[string]Object)
-	for _, f := range g.allFiles {
-		// The names in this loop are defined by the proto world, not us, so the
-		// package name may be empty.  If so, the dotted package name of X will
-		// be ".X"; otherwise it will be ".pkg.X".
-		dottedPkg := "." + f.GetPackage()
-		if dottedPkg != "." {
-			dottedPkg += "."
-		}
-		for _, enum := range f.enum {
-			name := dottedPkg + dottedSlice(enum.TypeName())
-			g.typeNameToObject[name] = enum
-		}
-		for _, desc := range f.desc {
-			name := dottedPkg + dottedSlice(desc.TypeName())
-			g.typeNameToObject[name] = desc
-		}
-	}
-}
-
-// ObjectNamed, given a fully-qualified input type name as it appears in the input data,
-// returns the descriptor for the message or enum with that name.
-func (g *Generator) ObjectNamed(typeName string) Object {
-	o, ok := g.typeNameToObject[typeName]
-	if !ok {
-		g.Fail("can't find object with type", typeName)
-	}
-
-	// If the file of this object isn't a direct dependency of the current file,
-	// or in the current file, then this object has been publicly imported into
-	// a dependency of the current file.
-	// We should return the ImportedDescriptor object for it instead.
-	direct := *o.File().Name == *g.file.Name
-	if !direct {
-		for _, dep := range g.file.Dependency {
-			if *g.fileByName(dep).Name == *o.File().Name {
-				direct = true
-				break
-			}
-		}
-	}
-	if !direct {
-		found := false
-	Loop:
-		for _, dep := range g.file.Dependency {
-			df := g.fileByName(*g.fileByName(dep).Name)
-			for _, td := range df.imp {
-				if td.o == o {
-					// Found it!
-					o = td
-					found = true
-					break Loop
-				}
-			}
-		}
-		if !found {
-			log.Printf("protoc-gen-go: WARNING: failed finding publicly imported dependency for %v, used in %v", typeName, *g.file.Name)
-		}
-	}
-
-	return o
-}
-
-// P prints the arguments to the generated output.  It handles strings and int32s, plus
-// handling indirections because they may be *string, etc.
-func (g *Generator) P(str ...interface{}) {
-	if !g.writeOutput {
-		return
-	}
-	g.WriteString(g.indent)
-	for _, v := range str {
-		switch s := v.(type) {
-		case string:
-			g.WriteString(s)
-		case *string:
-			g.WriteString(*s)
-		case bool:
-			fmt.Fprintf(g, "%t", s)
-		case *bool:
-			fmt.Fprintf(g, "%t", *s)
-		case int:
-			fmt.Fprintf(g, "%d", s)
-		case *int32:
-			fmt.Fprintf(g, "%d", *s)
-		case *int64:
-			fmt.Fprintf(g, "%d", *s)
-		case float64:
-			fmt.Fprintf(g, "%g", s)
-		case *float64:
-			fmt.Fprintf(g, "%g", *s)
-		default:
-			g.Fail(fmt.Sprintf("unknown type in printer: %T", v))
-		}
-	}
-	g.WriteByte('\n')
-}
-
-// addInitf stores the given statement to be printed inside the file's init function.
-// The statement is given as a format specifier and arguments.
-func (g *Generator) addInitf(stmt string, a ...interface{}) {
-	g.init = append(g.init, fmt.Sprintf(stmt, a...))
-}
-
-// In Indents the output one tab stop.
-func (g *Generator) In() { g.indent += "\t" }
-
-// Out unindents the output one tab stop.
-func (g *Generator) Out() {
-	if len(g.indent) > 0 {
-		g.indent = g.indent[1:]
-	}
-}
-
-// GenerateAllFiles generates the output for all the files we're outputting.
-func (g *Generator) GenerateAllFiles() {
-	// Initialize the plugins
-	for _, p := range plugins {
-		p.Init(g)
-	}
-	// Generate the output. The generator runs for every file, even the files
-	// that we don't generate output for, so that we can collate the full list
-	// of exported symbols to support public imports.
-	genFileMap := make(map[*FileDescriptor]bool, len(g.genFiles))
-	for _, file := range g.genFiles {
-		genFileMap[file] = true
-	}
-	for _, file := range g.allFiles {
-		g.Reset()
-		g.writeOutput = genFileMap[file]
-		g.generate(file)
-		if !g.writeOutput {
-			continue
-		}
-		g.Response.File = append(g.Response.File, &plugin.CodeGeneratorResponse_File{
-			Name:    proto.String(file.goFileName()),
-			Content: proto.String(g.String()),
-		})
-	}
-}
-
-// Run all the plugins associated with the file.
-func (g *Generator) runPlugins(file *FileDescriptor) {
-	for _, p := range plugins {
-		p.Generate(file)
-	}
-}
-
-// FileOf return the FileDescriptor for this FileDescriptorProto.
-func (g *Generator) FileOf(fd *descriptor.FileDescriptorProto) *FileDescriptor {
-	for _, file := range g.allFiles {
-		if file.FileDescriptorProto == fd {
-			return file
-		}
-	}
-	g.Fail("could not find file in table:", fd.GetName())
-	return nil
-}
-
-// Fill the response protocol buffer with the generated output for all the files we're
-// supposed to generate.
-func (g *Generator) generate(file *FileDescriptor) {
-	g.file = g.FileOf(file.FileDescriptorProto)
-	g.usedPackages = make(map[string]bool)
-
-	if g.file.index == 0 {
-		// For one file in the package, assert version compatibility.
-		g.P("// This is a compile-time assertion to ensure that this generated file")
-		g.P("// is compatible with the proto package it is being compiled against.")
-		g.P("// A compilation error at this line likely means your copy of the")
-		g.P("// proto package needs to be updated.")
-		g.P("const _ = ", g.Pkg["proto"], ".ProtoPackageIsVersion", generatedCodeVersion, " // please upgrade the proto package")
-		g.P()
-	}
-	for _, td := range g.file.imp {
-		g.generateImported(td)
-	}
-	for _, enum := range g.file.enum {
-		g.generateEnum(enum)
-	}
-	for _, desc := range g.file.desc {
-		// Don't generate virtual messages for maps.
-		if desc.GetOptions().GetMapEntry() {
-			continue
-		}
-		g.generateMessage(desc)
-	}
-	for _, ext := range g.file.ext {
-		g.generateExtension(ext)
-	}
-	g.generateInitFunction()
-
-	// Run the plugins before the imports so we know which imports are necessary.
-	g.runPlugins(file)
-
-	g.generateFileDescriptor(file)
-
-	// Generate header and imports last, though they appear first in the output.
-	rem := g.Buffer
-	g.Buffer = new(bytes.Buffer)
-	g.generateHeader()
-	g.generateImports()
-	if !g.writeOutput {
-		return
-	}
-	g.Write(rem.Bytes())
-
-	// Reformat generated code.
-	fset := token.NewFileSet()
-	raw := g.Bytes()
-	ast, err := parser.ParseFile(fset, "", g, parser.ParseComments)
-	if err != nil {
-		// Print out the bad code with line numbers.
-		// This should never happen in practice, but it can while changing generated code,
-		// so consider this a debugging aid.
-		var src bytes.Buffer
-		s := bufio.NewScanner(bytes.NewReader(raw))
-		for line := 1; s.Scan(); line++ {
-			fmt.Fprintf(&src, "%5d\t%s\n", line, s.Bytes())
-		}
-		g.Fail("bad Go source code was generated:", err.Error(), "\n"+src.String())
-	}
-	g.Reset()
-	err = (&printer.Config{Mode: printer.TabIndent | printer.UseSpaces, Tabwidth: 8}).Fprint(g, fset, ast)
-	if err != nil {
-		g.Fail("generated Go source code could not be reformatted:", err.Error())
-	}
-}
-
-// Generate the header, including package definition
-func (g *Generator) generateHeader() {
-	g.P("// Code generated by protoc-gen-go. DO NOT EDIT.")
-	g.P("// source: ", g.file.Name)
-	g.P()
-
-	name := g.file.PackageName()
-
-	if g.file.index == 0 {
-		// Generate package docs for the first file in the package.
-		g.P("/*")
-		g.P("Package ", name, " is a generated protocol buffer package.")
-		g.P()
-		if loc, ok := g.file.comments[strconv.Itoa(packagePath)]; ok {
-			// not using g.PrintComments because this is a /* */ comment block.
-			text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
-			for _, line := range strings.Split(text, "\n") {
-				line = strings.TrimPrefix(line, " ")
-				// ensure we don't escape from the block comment
-				line = strings.Replace(line, "*/", "* /", -1)
-				g.P(line)
-			}
-			g.P()
-		}
-		var topMsgs []string
-		g.P("It is generated from these files:")
-		for _, f := range g.genFiles {
-			g.P("\t", f.Name)
-			for _, msg := range f.desc {
-				if msg.parent != nil {
-					continue
-				}
-				topMsgs = append(topMsgs, CamelCaseSlice(msg.TypeName()))
-			}
-		}
-		g.P()
-		g.P("It has these top-level messages:")
-		for _, msg := range topMsgs {
-			g.P("\t", msg)
-		}
-		g.P("*/")
-	}
-
-	g.P("package ", name)
-	g.P()
-}
-
-// PrintComments prints any comments from the source .proto file.
-// The path is a comma-separated list of integers.
-// It returns an indication of whether any comments were printed.
-// See descriptor.proto for its format.
-func (g *Generator) PrintComments(path string) bool {
-	if !g.writeOutput {
-		return false
-	}
-	if loc, ok := g.file.comments[path]; ok {
-		text := strings.TrimSuffix(loc.GetLeadingComments(), "\n")
-		for _, line := range strings.Split(text, "\n") {
-			g.P("// ", strings.TrimPrefix(line, " "))
-		}
-		return true
-	}
-	return false
-}
-
-func (g *Generator) fileByName(filename string) *FileDescriptor {
-	return g.allFilesByName[filename]
-}
-
-// weak returns whether the ith import of the current file is a weak import.
-func (g *Generator) weak(i int32) bool {
-	for _, j := range g.file.WeakDependency {
-		if j == i {
-			return true
-		}
-	}
-	return false
-}
-
-// Generate the imports
-func (g *Generator) generateImports() {
-	// We almost always need a proto import.  Rather than computing when we
-	// do, which is tricky when there's a plugin, just import it and
-	// reference it later. The same argument applies to the fmt and math packages.
-	g.P("import " + g.Pkg["proto"] + " " + strconv.Quote(g.ImportPrefix+"github.com/golang/protobuf/proto"))
-	g.P("import " + g.Pkg["fmt"] + ` "fmt"`)
-	g.P("import " + g.Pkg["math"] + ` "math"`)
-	for i, s := range g.file.Dependency {
-		fd := g.fileByName(s)
-		// Do not import our own package.
-		if fd.PackageName() == g.packageName {
-			continue
-		}
-		filename := fd.goFileName()
-		// By default, import path is the dirname of the Go filename.
-		importPath := path.Dir(filename)
-		if substitution, ok := g.ImportMap[s]; ok {
-			importPath = substitution
-		}
-		importPath = g.ImportPrefix + importPath
-		// Skip weak imports.
-		if g.weak(int32(i)) {
-			g.P("// skipping weak import ", fd.PackageName(), " ", strconv.Quote(importPath))
-			continue
-		}
-		// We need to import all the dependencies, even if we don't reference them,
-		// because other code and tools depend on having the full transitive closure
-		// of protocol buffer types in the binary.
-		pname := fd.PackageName()
-		if _, ok := g.usedPackages[pname]; !ok {
-			pname = "_"
-		}
-		g.P("import ", pname, " ", strconv.Quote(importPath))
-	}
-	g.P()
-	// TODO: may need to worry about uniqueness across plugins
-	for _, p := range plugins {
-		p.GenerateImports(g.file)
-		g.P()
-	}
-	g.P("// Reference imports to suppress errors if they are not otherwise used.")
-	g.P("var _ = ", g.Pkg["proto"], ".Marshal")
-	g.P("var _ = ", g.Pkg["fmt"], ".Errorf")
-	g.P("var _ = ", g.Pkg["math"], ".Inf")
-	g.P()
-}
-
-func (g *Generator) generateImported(id *ImportedDescriptor) {
-	// Don't generate public import symbols for files that we are generating
-	// code for, since those symbols will already be in this package.
-	// We can't simply avoid creating the ImportedDescriptor objects,
-	// because g.genFiles isn't populated at that stage.
-	tn := id.TypeName()
-	sn := tn[len(tn)-1]
-	df := g.FileOf(id.o.File())
-	filename := *df.Name
-	for _, fd := range g.genFiles {
-		if *fd.Name == filename {
-			g.P("// Ignoring public import of ", sn, " from ", filename)
-			g.P()
-			return
-		}
-	}
-	g.P("// ", sn, " from public import ", filename)
-	g.usedPackages[df.PackageName()] = true
-
-	for _, sym := range df.exported[id.o] {
-		sym.GenerateAlias(g, df.PackageName())
-	}
-
-	g.P()
-}
-
-// Generate the enum definitions for this EnumDescriptor.
-func (g *Generator) generateEnum(enum *EnumDescriptor) {
-	// The full type name
-	typeName := enum.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-	ccPrefix := enum.prefix()
-
-	g.PrintComments(enum.path)
-	g.P("type ", ccTypeName, " int32")
-	g.file.addExport(enum, enumSymbol{ccTypeName, enum.proto3()})
-	g.P("const (")
-	g.In()
-	for i, e := range enum.Value {
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", enum.path, enumValuePath, i))
-
-		name := ccPrefix + *e.Name
-		g.P(name, " ", ccTypeName, " = ", e.Number)
-		g.file.addExport(enum, constOrVarSymbol{name, "const", ccTypeName})
-	}
-	g.Out()
-	g.P(")")
-	g.P("var ", ccTypeName, "_name = map[int32]string{")
-	g.In()
-	generated := make(map[int32]bool) // avoid duplicate values
-	for _, e := range enum.Value {
-		duplicate := ""
-		if _, present := generated[*e.Number]; present {
-			duplicate = "// Duplicate value: "
-		}
-		g.P(duplicate, e.Number, ": ", strconv.Quote(*e.Name), ",")
-		generated[*e.Number] = true
-	}
-	g.Out()
-	g.P("}")
-	g.P("var ", ccTypeName, "_value = map[string]int32{")
-	g.In()
-	for _, e := range enum.Value {
-		g.P(strconv.Quote(*e.Name), ": ", e.Number, ",")
-	}
-	g.Out()
-	g.P("}")
-
-	if !enum.proto3() {
-		g.P("func (x ", ccTypeName, ") Enum() *", ccTypeName, " {")
-		g.In()
-		g.P("p := new(", ccTypeName, ")")
-		g.P("*p = x")
-		g.P("return p")
-		g.Out()
-		g.P("}")
-	}
-
-	g.P("func (x ", ccTypeName, ") String() string {")
-	g.In()
-	g.P("return ", g.Pkg["proto"], ".EnumName(", ccTypeName, "_name, int32(x))")
-	g.Out()
-	g.P("}")
-
-	if !enum.proto3() {
-		g.P("func (x *", ccTypeName, ") UnmarshalJSON(data []byte) error {")
-		g.In()
-		g.P("value, err := ", g.Pkg["proto"], ".UnmarshalJSONEnum(", ccTypeName, `_value, data, "`, ccTypeName, `")`)
-		g.P("if err != nil {")
-		g.In()
-		g.P("return err")
-		g.Out()
-		g.P("}")
-		g.P("*x = ", ccTypeName, "(value)")
-		g.P("return nil")
-		g.Out()
-		g.P("}")
-	}
-
-	var indexes []string
-	for m := enum.parent; m != nil; m = m.parent {
-		// XXX: skip groups?
-		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
-	}
-	indexes = append(indexes, strconv.Itoa(enum.index))
-	g.P("func (", ccTypeName, ") EnumDescriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
-	if enum.file.GetPackage() == "google.protobuf" && enum.GetName() == "NullValue" {
-		g.P("func (", ccTypeName, `) XXX_WellKnownType() string { return "`, enum.GetName(), `" }`)
-	}
-
-	g.P()
-}
-
-// The tag is a string like "varint,2,opt,name=fieldname,def=7" that
-// identifies details of the field for the protocol buffer marshaling and unmarshaling
-// code.  The fields are:
-//	wire encoding
-//	protocol tag number
-//	opt,req,rep for optional, required, or repeated
-//	packed whether the encoding is "packed" (optional; repeated primitives only)
-//	name= the original declared name
-//	enum= the name of the enum type if it is an enum-typed field.
-//	proto3 if this field is in a proto3 message
-//	def= string representation of the default value, if any.
-// The default value must be in a representation that can be used at run-time
-// to generate the default value. Thus bools become 0 and 1, for instance.
-func (g *Generator) goTag(message *Descriptor, field *descriptor.FieldDescriptorProto, wiretype string) string {
-	optrepreq := ""
-	switch {
-	case isOptional(field):
-		optrepreq = "opt"
-	case isRequired(field):
-		optrepreq = "req"
-	case isRepeated(field):
-		optrepreq = "rep"
-	}
-	var defaultValue string
-	if dv := field.DefaultValue; dv != nil { // set means an explicit default
-		defaultValue = *dv
-		// Some types need tweaking.
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_BOOL:
-			if defaultValue == "true" {
-				defaultValue = "1"
-			} else {
-				defaultValue = "0"
-			}
-		case descriptor.FieldDescriptorProto_TYPE_STRING,
-			descriptor.FieldDescriptorProto_TYPE_BYTES:
-			// Nothing to do. Quoting is done for the whole tag.
-		case descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// For enums we need to provide the integer constant.
-			obj := g.ObjectNamed(field.GetTypeName())
-			if id, ok := obj.(*ImportedDescriptor); ok {
-				// It is an enum that was publicly imported.
-				// We need the underlying type.
-				obj = id.o
-			}
-			enum, ok := obj.(*EnumDescriptor)
-			if !ok {
-				log.Printf("obj is a %T", obj)
-				if id, ok := obj.(*ImportedDescriptor); ok {
-					log.Printf("id.o is a %T", id.o)
-				}
-				g.Fail("unknown enum type", CamelCaseSlice(obj.TypeName()))
-			}
-			defaultValue = enum.integerValueAsString(defaultValue)
-		}
-		defaultValue = ",def=" + defaultValue
-	}
-	enum := ""
-	if *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM {
-		// We avoid using obj.PackageName(), because we want to use the
-		// original (proto-world) package name.
-		obj := g.ObjectNamed(field.GetTypeName())
-		if id, ok := obj.(*ImportedDescriptor); ok {
-			obj = id.o
-		}
-		enum = ",enum="
-		if pkg := obj.File().GetPackage(); pkg != "" {
-			enum += pkg + "."
-		}
-		enum += CamelCaseSlice(obj.TypeName())
-	}
-	packed := ""
-	if (field.Options != nil && field.Options.GetPacked()) ||
-		// Per https://developers.google.com/protocol-buffers/docs/proto3#simple:
-		// "In proto3, repeated fields of scalar numeric types use packed encoding by default."
-		(message.proto3() && (field.Options == nil || field.Options.Packed == nil) &&
-			isRepeated(field) && isScalar(field)) {
-		packed = ",packed"
-	}
-	fieldName := field.GetName()
-	name := fieldName
-	if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-		// We must use the type name for groups instead of
-		// the field name to preserve capitalization.
-		// type_name in FieldDescriptorProto is fully-qualified,
-		// but we only want the local part.
-		name = *field.TypeName
-		if i := strings.LastIndex(name, "."); i >= 0 {
-			name = name[i+1:]
-		}
-	}
-	if json := field.GetJsonName(); json != "" && json != name {
-		// TODO: escaping might be needed, in which case
-		// perhaps this should be in its own "json" tag.
-		name += ",json=" + json
-	}
-	name = ",name=" + name
-	if message.proto3() {
-		// We only need the extra tag for []byte fields;
-		// no need to add noise for the others.
-		if *field.Type == descriptor.FieldDescriptorProto_TYPE_BYTES {
-			name += ",proto3"
-		}
-
-	}
-	oneof := ""
-	if field.OneofIndex != nil {
-		oneof = ",oneof"
-	}
-	return strconv.Quote(fmt.Sprintf("%s,%d,%s%s%s%s%s%s",
-		wiretype,
-		field.GetNumber(),
-		optrepreq,
-		packed,
-		name,
-		enum,
-		oneof,
-		defaultValue))
-}
-
-func needsStar(typ descriptor.FieldDescriptorProto_Type) bool {
-	switch typ {
-	case descriptor.FieldDescriptorProto_TYPE_GROUP:
-		return false
-	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-		return false
-	case descriptor.FieldDescriptorProto_TYPE_BYTES:
-		return false
-	}
-	return true
-}
-
-// TypeName is the printed name appropriate for an item. If the object is in the current file,
-// TypeName drops the package name and underscores the rest.
-// Otherwise the object is from another package; and the result is the underscored
-// package name followed by the item name.
-// The result always has an initial capital.
-func (g *Generator) TypeName(obj Object) string {
-	return g.DefaultPackageName(obj) + CamelCaseSlice(obj.TypeName())
-}
-
-// TypeNameWithPackage is like TypeName, but always includes the package
-// name even if the object is in our own package.
-func (g *Generator) TypeNameWithPackage(obj Object) string {
-	return obj.PackageName() + CamelCaseSlice(obj.TypeName())
-}
-
-// GoType returns a string representing the type name, and the wire type
-func (g *Generator) GoType(message *Descriptor, field *descriptor.FieldDescriptorProto) (typ string, wire string) {
-	// TODO: Options.
-	switch *field.Type {
-	case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-		typ, wire = "float64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-		typ, wire = "float32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_INT64:
-		typ, wire = "int64", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_UINT64:
-		typ, wire = "uint64", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_INT32:
-		typ, wire = "int32", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_UINT32:
-		typ, wire = "uint32", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_FIXED64:
-		typ, wire = "uint64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_FIXED32:
-		typ, wire = "uint32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_BOOL:
-		typ, wire = "bool", "varint"
-	case descriptor.FieldDescriptorProto_TYPE_STRING:
-		typ, wire = "string", "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_GROUP:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = "*"+g.TypeName(desc), "group"
-	case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = "*"+g.TypeName(desc), "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_BYTES:
-		typ, wire = "[]byte", "bytes"
-	case descriptor.FieldDescriptorProto_TYPE_ENUM:
-		desc := g.ObjectNamed(field.GetTypeName())
-		typ, wire = g.TypeName(desc), "varint"
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-		typ, wire = "int32", "fixed32"
-	case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-		typ, wire = "int64", "fixed64"
-	case descriptor.FieldDescriptorProto_TYPE_SINT32:
-		typ, wire = "int32", "zigzag32"
-	case descriptor.FieldDescriptorProto_TYPE_SINT64:
-		typ, wire = "int64", "zigzag64"
-	default:
-		g.Fail("unknown type for", field.GetName())
-	}
-	if isRepeated(field) {
-		typ = "[]" + typ
-	} else if message != nil && message.proto3() {
-		return
-	} else if field.OneofIndex != nil && message != nil {
-		return
-	} else if needsStar(*field.Type) {
-		typ = "*" + typ
-	}
-	return
-}
-
-func (g *Generator) RecordTypeUse(t string) {
-	if obj, ok := g.typeNameToObject[t]; ok {
-		// Call ObjectNamed to get the true object to record the use.
-		obj = g.ObjectNamed(t)
-		g.usedPackages[obj.PackageName()] = true
-	}
-}
-
-// Method names that may be generated.  Fields with these names get an
-// underscore appended. Any change to this set is a potential incompatible
-// API change because it changes generated field names.
-var methodNames = [...]string{
-	"Reset",
-	"String",
-	"ProtoMessage",
-	"Marshal",
-	"Unmarshal",
-	"ExtensionRangeArray",
-	"ExtensionMap",
-	"Descriptor",
-}
-
-// Names of messages in the `google.protobuf` package for which
-// we will generate XXX_WellKnownType methods.
-var wellKnownTypes = map[string]bool{
-	"Any":       true,
-	"Duration":  true,
-	"Empty":     true,
-	"Struct":    true,
-	"Timestamp": true,
-
-	"Value":       true,
-	"ListValue":   true,
-	"DoubleValue": true,
-	"FloatValue":  true,
-	"Int64Value":  true,
-	"UInt64Value": true,
-	"Int32Value":  true,
-	"UInt32Value": true,
-	"BoolValue":   true,
-	"StringValue": true,
-	"BytesValue":  true,
-}
-
-// Generate the type and default constant definitions for this Descriptor.
-func (g *Generator) generateMessage(message *Descriptor) {
-	// The full type name
-	typeName := message.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-
-	usedNames := make(map[string]bool)
-	for _, n := range methodNames {
-		usedNames[n] = true
-	}
-	fieldNames := make(map[*descriptor.FieldDescriptorProto]string)
-	fieldGetterNames := make(map[*descriptor.FieldDescriptorProto]string)
-	fieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
-	mapFieldTypes := make(map[*descriptor.FieldDescriptorProto]string)
-
-	oneofFieldName := make(map[int32]string)                           // indexed by oneof_index field of FieldDescriptorProto
-	oneofDisc := make(map[int32]string)                                // name of discriminator method
-	oneofTypeName := make(map[*descriptor.FieldDescriptorProto]string) // without star
-	oneofInsertPoints := make(map[int32]int)                           // oneof_index => offset of g.Buffer
-
-	g.PrintComments(message.path)
-	g.P("type ", ccTypeName, " struct {")
-	g.In()
-
-	// allocNames finds a conflict-free variation of the given strings,
-	// consistently mutating their suffixes.
-	// It returns the same number of strings.
-	allocNames := func(ns ...string) []string {
-	Loop:
-		for {
-			for _, n := range ns {
-				if usedNames[n] {
-					for i := range ns {
-						ns[i] += "_"
-					}
-					continue Loop
-				}
-			}
-			for _, n := range ns {
-				usedNames[n] = true
-			}
-			return ns
-		}
-	}
-
-	for i, field := range message.Field {
-		// Allocate the getter and the field at the same time so name
-		// collisions create field/method consistent names.
-		// TODO: This allocation occurs based on the order of the fields
-		// in the proto file, meaning that a change in the field
-		// ordering can change generated Method/Field names.
-		base := CamelCase(*field.Name)
-		ns := allocNames(base, "Get"+base)
-		fieldName, fieldGetterName := ns[0], ns[1]
-		typename, wiretype := g.GoType(message, field)
-		jsonName := *field.Name
-		tag := fmt.Sprintf("protobuf:%s json:%q", g.goTag(message, field, wiretype), jsonName+",omitempty")
-
-		fieldNames[field] = fieldName
-		fieldGetterNames[field] = fieldGetterName
-
-		oneof := field.OneofIndex != nil
-		if oneof && oneofFieldName[*field.OneofIndex] == "" {
-			odp := message.OneofDecl[int(*field.OneofIndex)]
-			fname := allocNames(CamelCase(odp.GetName()))[0]
-
-			// This is the first field of a oneof we haven't seen before.
-			// Generate the union field.
-			com := g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageOneofPath, *field.OneofIndex))
-			if com {
-				g.P("//")
-			}
-			g.P("// Types that are valid to be assigned to ", fname, ":")
-			// Generate the rest of this comment later,
-			// when we've computed any disambiguation.
-			oneofInsertPoints[*field.OneofIndex] = g.Buffer.Len()
-
-			dname := "is" + ccTypeName + "_" + fname
-			oneofFieldName[*field.OneofIndex] = fname
-			oneofDisc[*field.OneofIndex] = dname
-			tag := `protobuf_oneof:"` + odp.GetName() + `"`
-			g.P(fname, " ", dname, " `", tag, "`")
-		}
-
-		if *field.Type == descriptor.FieldDescriptorProto_TYPE_MESSAGE {
-			desc := g.ObjectNamed(field.GetTypeName())
-			if d, ok := desc.(*Descriptor); ok && d.GetOptions().GetMapEntry() {
-				// Figure out the Go types and tags for the key and value types.
-				keyField, valField := d.Field[0], d.Field[1]
-				keyType, keyWire := g.GoType(d, keyField)
-				valType, valWire := g.GoType(d, valField)
-				keyTag, valTag := g.goTag(d, keyField, keyWire), g.goTag(d, valField, valWire)
-
-				// We don't use stars, except for message-typed values.
-				// Message and enum types are the only two possibly foreign types used in maps,
-				// so record their use. They are not permitted as map keys.
-				keyType = strings.TrimPrefix(keyType, "*")
-				switch *valField.Type {
-				case descriptor.FieldDescriptorProto_TYPE_ENUM:
-					valType = strings.TrimPrefix(valType, "*")
-					g.RecordTypeUse(valField.GetTypeName())
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					g.RecordTypeUse(valField.GetTypeName())
-				default:
-					valType = strings.TrimPrefix(valType, "*")
-				}
-
-				typename = fmt.Sprintf("map[%s]%s", keyType, valType)
-				mapFieldTypes[field] = typename // record for the getter generation
-
-				tag += fmt.Sprintf(" protobuf_key:%s protobuf_val:%s", keyTag, valTag)
-			}
-		}
-
-		fieldTypes[field] = typename
-
-		if oneof {
-			tname := ccTypeName + "_" + fieldName
-			// It is possible for this to collide with a message or enum
-			// nested in this message. Check for collisions.
-			for {
-				ok := true
-				for _, desc := range message.nested {
-					if CamelCaseSlice(desc.TypeName()) == tname {
-						ok = false
-						break
-					}
-				}
-				for _, enum := range message.enums {
-					if CamelCaseSlice(enum.TypeName()) == tname {
-						ok = false
-						break
-					}
-				}
-				if !ok {
-					tname += "_"
-					continue
-				}
-				break
-			}
-
-			oneofTypeName[field] = tname
-			continue
-		}
-
-		g.PrintComments(fmt.Sprintf("%s,%d,%d", message.path, messageFieldPath, i))
-		g.P(fieldName, "\t", typename, "\t`", tag, "`")
-		g.RecordTypeUse(field.GetTypeName())
-	}
-	if len(message.ExtensionRange) > 0 {
-		g.P(g.Pkg["proto"], ".XXX_InternalExtensions `json:\"-\"`")
-	}
-	if !message.proto3() {
-		g.P("XXX_unrecognized\t[]byte `json:\"-\"`")
-	}
-	g.Out()
-	g.P("}")
-
-	// Update g.Buffer to list valid oneof types.
-	// We do this down here, after we've disambiguated the oneof type names.
-	// We go in reverse order of insertion point to avoid invalidating offsets.
-	for oi := int32(len(message.OneofDecl)); oi >= 0; oi-- {
-		ip := oneofInsertPoints[oi]
-		all := g.Buffer.Bytes()
-		rem := all[ip:]
-		g.Buffer = bytes.NewBuffer(all[:ip:ip]) // set cap so we don't scribble on rem
-		for _, field := range message.Field {
-			if field.OneofIndex == nil || *field.OneofIndex != oi {
-				continue
-			}
-			g.P("//\t*", oneofTypeName[field])
-		}
-		g.Buffer.Write(rem)
-	}
-
-	// Reset, String and ProtoMessage methods.
-	g.P("func (m *", ccTypeName, ") Reset() { *m = ", ccTypeName, "{} }")
-	g.P("func (m *", ccTypeName, ") String() string { return ", g.Pkg["proto"], ".CompactTextString(m) }")
-	g.P("func (*", ccTypeName, ") ProtoMessage() {}")
-	var indexes []string
-	for m := message; m != nil; m = m.parent {
-		indexes = append([]string{strconv.Itoa(m.index)}, indexes...)
-	}
-	g.P("func (*", ccTypeName, ") Descriptor() ([]byte, []int) { return ", g.file.VarName(), ", []int{", strings.Join(indexes, ", "), "} }")
-	// TODO: Revisit the decision to use a XXX_WellKnownType method
-	// if we change proto.MessageName to work with multiple equivalents.
-	if message.file.GetPackage() == "google.protobuf" && wellKnownTypes[message.GetName()] {
-		g.P("func (*", ccTypeName, `) XXX_WellKnownType() string { return "`, message.GetName(), `" }`)
-	}
-
-	// Extension support methods
-	var hasExtensions, isMessageSet bool
-	if len(message.ExtensionRange) > 0 {
-		hasExtensions = true
-		// message_set_wire_format only makes sense when extensions are defined.
-		if opts := message.Options; opts != nil && opts.GetMessageSetWireFormat() {
-			isMessageSet = true
-			g.P()
-			g.P("func (m *", ccTypeName, ") Marshal() ([]byte, error) {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSet(&m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") Unmarshal(buf []byte) error {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") MarshalJSON() ([]byte, error) {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".MarshalMessageSetJSON(&m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
-			g.P("func (m *", ccTypeName, ") UnmarshalJSON(buf []byte) error {")
-			g.In()
-			g.P("return ", g.Pkg["proto"], ".UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)")
-			g.Out()
-			g.P("}")
-			g.P("// ensure ", ccTypeName, " satisfies proto.Marshaler and proto.Unmarshaler")
-			g.P("var _ ", g.Pkg["proto"], ".Marshaler = (*", ccTypeName, ")(nil)")
-			g.P("var _ ", g.Pkg["proto"], ".Unmarshaler = (*", ccTypeName, ")(nil)")
-		}
-
-		g.P()
-		g.P("var extRange_", ccTypeName, " = []", g.Pkg["proto"], ".ExtensionRange{")
-		g.In()
-		for _, r := range message.ExtensionRange {
-			end := fmt.Sprint(*r.End - 1) // make range inclusive on both ends
-			g.P("{", r.Start, ", ", end, "},")
-		}
-		g.Out()
-		g.P("}")
-		g.P("func (*", ccTypeName, ") ExtensionRangeArray() []", g.Pkg["proto"], ".ExtensionRange {")
-		g.In()
-		g.P("return extRange_", ccTypeName)
-		g.Out()
-		g.P("}")
-	}
-
-	// Default constants
-	defNames := make(map[*descriptor.FieldDescriptorProto]string)
-	for _, field := range message.Field {
-		def := field.GetDefaultValue()
-		if def == "" {
-			continue
-		}
-		fieldname := "Default_" + ccTypeName + "_" + CamelCase(*field.Name)
-		defNames[field] = fieldname
-		typename, _ := g.GoType(message, field)
-		if typename[0] == '*' {
-			typename = typename[1:]
-		}
-		kind := "const "
-		switch {
-		case typename == "bool":
-		case typename == "string":
-			def = strconv.Quote(def)
-		case typename == "[]byte":
-			def = "[]byte(" + strconv.Quote(unescape(def)) + ")"
-			kind = "var "
-		case def == "inf", def == "-inf", def == "nan":
-			// These names are known to, and defined by, the protocol language.
-			switch def {
-			case "inf":
-				def = "math.Inf(1)"
-			case "-inf":
-				def = "math.Inf(-1)"
-			case "nan":
-				def = "math.NaN()"
-			}
-			if *field.Type == descriptor.FieldDescriptorProto_TYPE_FLOAT {
-				def = "float32(" + def + ")"
-			}
-			kind = "var "
-		case *field.Type == descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// Must be an enum.  Need to construct the prefixed name.
-			obj := g.ObjectNamed(field.GetTypeName())
-			var enum *EnumDescriptor
-			if id, ok := obj.(*ImportedDescriptor); ok {
-				// The enum type has been publicly imported.
-				enum, _ = id.o.(*EnumDescriptor)
-			} else {
-				enum, _ = obj.(*EnumDescriptor)
-			}
-			if enum == nil {
-				log.Printf("don't know how to generate constant for %s", fieldname)
-				continue
-			}
-			def = g.DefaultPackageName(obj) + enum.prefix() + def
-		}
-		g.P(kind, fieldname, " ", typename, " = ", def)
-		g.file.addExport(message, constOrVarSymbol{fieldname, kind, ""})
-	}
-	g.P()
-
-	// Oneof per-field types, discriminants and getters.
-	//
-	// Generate unexported named types for the discriminant interfaces.
-	// We shouldn't have to do this, but there was (~19 Aug 2015) a compiler/linker bug
-	// that was triggered by using anonymous interfaces here.
-	// TODO: Revisit this and consider reverting back to anonymous interfaces.
-	for oi := range message.OneofDecl {
-		dname := oneofDisc[int32(oi)]
-		g.P("type ", dname, " interface { ", dname, "() }")
-	}
-	g.P()
-	for _, field := range message.Field {
-		if field.OneofIndex == nil {
-			continue
-		}
-		_, wiretype := g.GoType(message, field)
-		tag := "protobuf:" + g.goTag(message, field, wiretype)
-		g.P("type ", oneofTypeName[field], " struct{ ", fieldNames[field], " ", fieldTypes[field], " `", tag, "` }")
-		g.RecordTypeUse(field.GetTypeName())
-	}
-	g.P()
-	for _, field := range message.Field {
-		if field.OneofIndex == nil {
-			continue
-		}
-		g.P("func (*", oneofTypeName[field], ") ", oneofDisc[*field.OneofIndex], "() {}")
-	}
-	g.P()
-	for oi := range message.OneofDecl {
-		fname := oneofFieldName[int32(oi)]
-		g.P("func (m *", ccTypeName, ") Get", fname, "() ", oneofDisc[int32(oi)], " {")
-		g.P("if m != nil { return m.", fname, " }")
-		g.P("return nil")
-		g.P("}")
-	}
-	g.P()
-
-	// Field getters
-	var getters []getterSymbol
-	for _, field := range message.Field {
-		oneof := field.OneofIndex != nil
-
-		fname := fieldNames[field]
-		typename, _ := g.GoType(message, field)
-		if t, ok := mapFieldTypes[field]; ok {
-			typename = t
-		}
-		mname := fieldGetterNames[field]
-		star := ""
-		if needsStar(*field.Type) && typename[0] == '*' {
-			typename = typename[1:]
-			star = "*"
-		}
-
-		// Only export getter symbols for basic types,
-		// and for messages and enums in the same package.
-		// Groups are not exported.
-		// Foreign types can't be hoisted through a public import because
-		// the importer may not already be importing the defining .proto.
-		// As an example, imagine we have an import tree like this:
-		//   A.proto -> B.proto -> C.proto
-		// If A publicly imports B, we need to generate the getters from B in A's output,
-		// but if one such getter returns something from C then we cannot do that
-		// because A is not importing C already.
-		var getter, genType bool
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_GROUP:
-			getter = false
-		case descriptor.FieldDescriptorProto_TYPE_MESSAGE, descriptor.FieldDescriptorProto_TYPE_ENUM:
-			// Only export getter if its return type is in this package.
-			getter = g.ObjectNamed(field.GetTypeName()).PackageName() == message.PackageName()
-			genType = true
-		default:
-			getter = true
-		}
-		if getter {
-			getters = append(getters, getterSymbol{
-				name:     mname,
-				typ:      typename,
-				typeName: field.GetTypeName(),
-				genType:  genType,
-			})
-		}
-
-		g.P("func (m *", ccTypeName, ") "+mname+"() "+typename+" {")
-		g.In()
-		def, hasDef := defNames[field]
-		typeDefaultIsNil := false // whether this field type's default value is a literal nil unless specified
-		switch *field.Type {
-		case descriptor.FieldDescriptorProto_TYPE_BYTES:
-			typeDefaultIsNil = !hasDef
-		case descriptor.FieldDescriptorProto_TYPE_GROUP, descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-			typeDefaultIsNil = true
-		}
-		if isRepeated(field) {
-			typeDefaultIsNil = true
-		}
-		if typeDefaultIsNil && !oneof {
-			// A bytes field with no explicit default needs less generated code,
-			// as does a message or group field, or a repeated field.
-			g.P("if m != nil {")
-			g.In()
-			g.P("return m." + fname)
-			g.Out()
-			g.P("}")
-			g.P("return nil")
-			g.Out()
-			g.P("}")
-			g.P()
-			continue
-		}
-		if !oneof {
-			if message.proto3() {
-				g.P("if m != nil {")
-			} else {
-				g.P("if m != nil && m." + fname + " != nil {")
-			}
-			g.In()
-			g.P("return " + star + "m." + fname)
-			g.Out()
-			g.P("}")
-		} else {
-			uname := oneofFieldName[*field.OneofIndex]
-			tname := oneofTypeName[field]
-			g.P("if x, ok := m.Get", uname, "().(*", tname, "); ok {")
-			g.P("return x.", fname)
-			g.P("}")
-		}
-		if hasDef {
-			if *field.Type != descriptor.FieldDescriptorProto_TYPE_BYTES {
-				g.P("return " + def)
-			} else {
-				// The default is a []byte var.
-				// Make a copy when returning it to be safe.
-				g.P("return append([]byte(nil), ", def, "...)")
-			}
-		} else {
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				g.P("return false")
-			case descriptor.FieldDescriptorProto_TYPE_STRING:
-				g.P(`return ""`)
-			case descriptor.FieldDescriptorProto_TYPE_GROUP,
-				descriptor.FieldDescriptorProto_TYPE_MESSAGE,
-				descriptor.FieldDescriptorProto_TYPE_BYTES:
-				// This is only possible for oneof fields.
-				g.P("return nil")
-			case descriptor.FieldDescriptorProto_TYPE_ENUM:
-				// The default default for an enum is the first value in the enum,
-				// not zero.
-				obj := g.ObjectNamed(field.GetTypeName())
-				var enum *EnumDescriptor
-				if id, ok := obj.(*ImportedDescriptor); ok {
-					// The enum type has been publicly imported.
-					enum, _ = id.o.(*EnumDescriptor)
-				} else {
-					enum, _ = obj.(*EnumDescriptor)
-				}
-				if enum == nil {
-					log.Printf("don't know how to generate getter for %s", field.GetName())
-					continue
-				}
-				if len(enum.Value) == 0 {
-					g.P("return 0 // empty enum")
-				} else {
-					first := enum.Value[0].GetName()
-					g.P("return ", g.DefaultPackageName(obj)+enum.prefix()+first)
-				}
-			default:
-				g.P("return 0")
-			}
-		}
-		g.Out()
-		g.P("}")
-		g.P()
-	}
-
-	if !message.group {
-		ms := &messageSymbol{
-			sym:           ccTypeName,
-			hasExtensions: hasExtensions,
-			isMessageSet:  isMessageSet,
-			hasOneof:      len(message.OneofDecl) > 0,
-			getters:       getters,
-		}
-		g.file.addExport(message, ms)
-	}
-
-	// Oneof functions
-	if len(message.OneofDecl) > 0 {
-		fieldWire := make(map[*descriptor.FieldDescriptorProto]string)
-
-		// method
-		enc := "_" + ccTypeName + "_OneofMarshaler"
-		dec := "_" + ccTypeName + "_OneofUnmarshaler"
-		size := "_" + ccTypeName + "_OneofSizer"
-		encSig := "(msg " + g.Pkg["proto"] + ".Message, b *" + g.Pkg["proto"] + ".Buffer) error"
-		decSig := "(msg " + g.Pkg["proto"] + ".Message, tag, wire int, b *" + g.Pkg["proto"] + ".Buffer) (bool, error)"
-		sizeSig := "(msg " + g.Pkg["proto"] + ".Message) (n int)"
-
-		g.P("// XXX_OneofFuncs is for the internal use of the proto package.")
-		g.P("func (*", ccTypeName, ") XXX_OneofFuncs() (func", encSig, ", func", decSig, ", func", sizeSig, ", []interface{}) {")
-		g.P("return ", enc, ", ", dec, ", ", size, ", []interface{}{")
-		for _, field := range message.Field {
-			if field.OneofIndex == nil {
-				continue
-			}
-			g.P("(*", oneofTypeName[field], ")(nil),")
-		}
-		g.P("}")
-		g.P("}")
-		g.P()
-
-		// marshaler
-		g.P("func ", enc, encSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		for oi, odp := range message.OneofDecl {
-			g.P("// ", odp.GetName())
-			fname := oneofFieldName[int32(oi)]
-			g.P("switch x := m.", fname, ".(type) {")
-			for _, field := range message.Field {
-				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
-					continue
-				}
-				g.P("case *", oneofTypeName[field], ":")
-				var wire, pre, post string
-				val := "x." + fieldNames[field] // overridden for TYPE_BOOL
-				canFail := false                // only TYPE_MESSAGE and TYPE_GROUP can fail
-				switch *field.Type {
-				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-					wire = "WireFixed64"
-					pre = "b.EncodeFixed64(" + g.Pkg["math"] + ".Float64bits("
-					post = "))"
-				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-					wire = "WireFixed32"
-					pre = "b.EncodeFixed32(uint64(" + g.Pkg["math"] + ".Float32bits("
-					post = ")))"
-				case descriptor.FieldDescriptorProto_TYPE_INT64,
-					descriptor.FieldDescriptorProto_TYPE_UINT64:
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_INT32,
-					descriptor.FieldDescriptorProto_TYPE_UINT32,
-					descriptor.FieldDescriptorProto_TYPE_ENUM:
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-					wire = "WireFixed64"
-					pre, post = "b.EncodeFixed64(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-					wire = "WireFixed32"
-					pre, post = "b.EncodeFixed32(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_BOOL:
-					// bool needs special handling.
-					g.P("t := uint64(0)")
-					g.P("if ", val, " { t = 1 }")
-					val = "t"
-					wire = "WireVarint"
-					pre, post = "b.EncodeVarint(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_STRING:
-					wire = "WireBytes"
-					pre, post = "b.EncodeStringBytes(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_GROUP:
-					wire = "WireStartGroup"
-					pre, post = "b.Marshal(", ")"
-					canFail = true
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					wire = "WireBytes"
-					pre, post = "b.EncodeMessage(", ")"
-					canFail = true
-				case descriptor.FieldDescriptorProto_TYPE_BYTES:
-					wire = "WireBytes"
-					pre, post = "b.EncodeRawBytes(", ")"
-				case descriptor.FieldDescriptorProto_TYPE_SINT32:
-					wire = "WireVarint"
-					pre, post = "b.EncodeZigzag32(uint64(", "))"
-				case descriptor.FieldDescriptorProto_TYPE_SINT64:
-					wire = "WireVarint"
-					pre, post = "b.EncodeZigzag64(uint64(", "))"
-				default:
-					g.Fail("unhandled oneof field type ", field.Type.String())
-				}
-				fieldWire[field] = wire
-				g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
-				if !canFail {
-					g.P(pre, val, post)
-				} else {
-					g.P("if err := ", pre, val, post, "; err != nil {")
-					g.P("return err")
-					g.P("}")
-				}
-				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-					g.P("b.EncodeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
-				}
-			}
-			g.P("case nil:")
-			g.P("default: return ", g.Pkg["fmt"], `.Errorf("`, ccTypeName, ".", fname, ` has unexpected type %T", x)`)
-			g.P("}")
-		}
-		g.P("return nil")
-		g.P("}")
-		g.P()
-
-		// unmarshaler
-		g.P("func ", dec, decSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		g.P("switch tag {")
-		for _, field := range message.Field {
-			if field.OneofIndex == nil {
-				continue
-			}
-			odp := message.OneofDecl[int(*field.OneofIndex)]
-			g.P("case ", field.Number, ": // ", odp.GetName(), ".", *field.Name)
-			g.P("if wire != ", g.Pkg["proto"], ".", fieldWire[field], " {")
-			g.P("return true, ", g.Pkg["proto"], ".ErrInternalBadWireType")
-			g.P("}")
-			lhs := "x, err" // overridden for TYPE_MESSAGE and TYPE_GROUP
-			var dec, cast, cast2 string
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-				dec, cast = "b.DecodeFixed64()", g.Pkg["math"]+".Float64frombits"
-			case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-				dec, cast, cast2 = "b.DecodeFixed32()", "uint32", g.Pkg["math"]+".Float32frombits"
-			case descriptor.FieldDescriptorProto_TYPE_INT64:
-				dec, cast = "b.DecodeVarint()", "int64"
-			case descriptor.FieldDescriptorProto_TYPE_UINT64:
-				dec = "b.DecodeVarint()"
-			case descriptor.FieldDescriptorProto_TYPE_INT32:
-				dec, cast = "b.DecodeVarint()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_FIXED64:
-				dec = "b.DecodeFixed64()"
-			case descriptor.FieldDescriptorProto_TYPE_FIXED32:
-				dec, cast = "b.DecodeFixed32()", "uint32"
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				dec = "b.DecodeVarint()"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_STRING:
-				dec = "b.DecodeStringBytes()"
-			case descriptor.FieldDescriptorProto_TYPE_GROUP:
-				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
-				lhs = "err"
-				dec = "b.DecodeGroup(msg)"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-				g.P("msg := new(", fieldTypes[field][1:], ")") // drop star
-				lhs = "err"
-				dec = "b.DecodeMessage(msg)"
-				// handled specially below
-			case descriptor.FieldDescriptorProto_TYPE_BYTES:
-				dec = "b.DecodeRawBytes(true)"
-			case descriptor.FieldDescriptorProto_TYPE_UINT32:
-				dec, cast = "b.DecodeVarint()", "uint32"
-			case descriptor.FieldDescriptorProto_TYPE_ENUM:
-				dec, cast = "b.DecodeVarint()", fieldTypes[field]
-			case descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-				dec, cast = "b.DecodeFixed32()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-				dec, cast = "b.DecodeFixed64()", "int64"
-			case descriptor.FieldDescriptorProto_TYPE_SINT32:
-				dec, cast = "b.DecodeZigzag32()", "int32"
-			case descriptor.FieldDescriptorProto_TYPE_SINT64:
-				dec, cast = "b.DecodeZigzag64()", "int64"
-			default:
-				g.Fail("unhandled oneof field type ", field.Type.String())
-			}
-			g.P(lhs, " := ", dec)
-			val := "x"
-			if cast != "" {
-				val = cast + "(" + val + ")"
-			}
-			if cast2 != "" {
-				val = cast2 + "(" + val + ")"
-			}
-			switch *field.Type {
-			case descriptor.FieldDescriptorProto_TYPE_BOOL:
-				val += " != 0"
-			case descriptor.FieldDescriptorProto_TYPE_GROUP,
-				descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-				val = "msg"
-			}
-			g.P("m.", oneofFieldName[*field.OneofIndex], " = &", oneofTypeName[field], "{", val, "}")
-			g.P("return true, err")
-		}
-		g.P("default: return false, nil")
-		g.P("}")
-		g.P("}")
-		g.P()
-
-		// sizer
-		g.P("func ", size, sizeSig, " {")
-		g.P("m := msg.(*", ccTypeName, ")")
-		for oi, odp := range message.OneofDecl {
-			g.P("// ", odp.GetName())
-			fname := oneofFieldName[int32(oi)]
-			g.P("switch x := m.", fname, ".(type) {")
-			for _, field := range message.Field {
-				if field.OneofIndex == nil || int(*field.OneofIndex) != oi {
-					continue
-				}
-				g.P("case *", oneofTypeName[field], ":")
-				val := "x." + fieldNames[field]
-				var wire, varint, fixed string
-				switch *field.Type {
-				case descriptor.FieldDescriptorProto_TYPE_DOUBLE:
-					wire = "WireFixed64"
-					fixed = "8"
-				case descriptor.FieldDescriptorProto_TYPE_FLOAT:
-					wire = "WireFixed32"
-					fixed = "4"
-				case descriptor.FieldDescriptorProto_TYPE_INT64,
-					descriptor.FieldDescriptorProto_TYPE_UINT64,
-					descriptor.FieldDescriptorProto_TYPE_INT32,
-					descriptor.FieldDescriptorProto_TYPE_UINT32,
-					descriptor.FieldDescriptorProto_TYPE_ENUM:
-					wire = "WireVarint"
-					varint = val
-				case descriptor.FieldDescriptorProto_TYPE_FIXED64,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED64:
-					wire = "WireFixed64"
-					fixed = "8"
-				case descriptor.FieldDescriptorProto_TYPE_FIXED32,
-					descriptor.FieldDescriptorProto_TYPE_SFIXED32:
-					wire = "WireFixed32"
-					fixed = "4"
-				case descriptor.FieldDescriptorProto_TYPE_BOOL:
-					wire = "WireVarint"
-					fixed = "1"
-				case descriptor.FieldDescriptorProto_TYPE_STRING:
-					wire = "WireBytes"
-					fixed = "len(" + val + ")"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_GROUP:
-					wire = "WireStartGroup"
-					fixed = g.Pkg["proto"] + ".Size(" + val + ")"
-				case descriptor.FieldDescriptorProto_TYPE_MESSAGE:
-					wire = "WireBytes"
-					g.P("s := ", g.Pkg["proto"], ".Size(", val, ")")
-					fixed = "s"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_BYTES:
-					wire = "WireBytes"
-					fixed = "len(" + val + ")"
-					varint = fixed
-				case descriptor.FieldDescriptorProto_TYPE_SINT32:
-					wire = "WireVarint"
-					varint = "(uint32(" + val + ") << 1) ^ uint32((int32(" + val + ") >> 31))"
-				case descriptor.FieldDescriptorProto_TYPE_SINT64:
-					wire = "WireVarint"
-					varint = "uint64(" + val + " << 1) ^ uint64((int64(" + val + ") >> 63))"
-				default:
-					g.Fail("unhandled oneof field type ", field.Type.String())
-				}
-				g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".", wire, ")")
-				if varint != "" {
-					g.P("n += ", g.Pkg["proto"], ".SizeVarint(uint64(", varint, "))")
-				}
-				if fixed != "" {
-					g.P("n += ", fixed)
-				}
-				if *field.Type == descriptor.FieldDescriptorProto_TYPE_GROUP {
-					g.P("n += ", g.Pkg["proto"], ".SizeVarint(", field.Number, "<<3|", g.Pkg["proto"], ".WireEndGroup)")
-				}
-			}
-			g.P("case nil:")
-			g.P("default:")
-			g.P("panic(", g.Pkg["fmt"], ".Sprintf(\"proto: unexpected type %T in oneof\", x))")
-			g.P("}")
-		}
-		g.P("return n")
-		g.P("}")
-		g.P()
-	}
-
-	for _, ext := range message.ext {
-		g.generateExtension(ext)
-	}
-
-	fullName := strings.Join(message.TypeName(), ".")
-	if g.file.Package != nil {
-		fullName = *g.file.Package + "." + fullName
-	}
-
-	g.addInitf("%s.RegisterType((*%s)(nil), %q)", g.Pkg["proto"], ccTypeName, fullName)
-}
-
-var escapeChars = [256]byte{
-	'a': '\a', 'b': '\b', 'f': '\f', 'n': '\n', 'r': '\r', 't': '\t', 'v': '\v', '\\': '\\', '"': '"', '\'': '\'', '?': '?',
-}
-
-// unescape reverses the "C" escaping that protoc does for default values of bytes fields.
-// It is best effort in that it effectively ignores malformed input. Seemingly invalid escape
-// sequences are conveyed, unmodified, into the decoded result.
-func unescape(s string) string {
-	// NB: Sadly, we can't use strconv.Unquote because protoc will escape both
-	// single and double quotes, but strconv.Unquote only allows one or the
-	// other (based on actual surrounding quotes of its input argument).
-
-	var out []byte
-	for len(s) > 0 {
-		// regular character, or too short to be valid escape
-		if s[0] != '\\' || len(s) < 2 {
-			out = append(out, s[0])
-			s = s[1:]
-		} else if c := escapeChars[s[1]]; c != 0 {
-			// escape sequence
-			out = append(out, c)
-			s = s[2:]
-		} else if s[1] == 'x' || s[1] == 'X' {
-			// hex escape, e.g. "\x80
-			if len(s) < 4 {
-				// too short to be valid
-				out = append(out, s[:2]...)
-				s = s[2:]
-				continue
-			}
-			v, err := strconv.ParseUint(s[2:4], 16, 8)
-			if err != nil {
-				out = append(out, s[:4]...)
-			} else {
-				out = append(out, byte(v))
-			}
-			s = s[4:]
-		} else if '0' <= s[1] && s[1] <= '7' {
-			// octal escape, can vary from 1 to 3 octal digits; e.g., "\0" "\40" or "\164"
-			// so consume up to 2 more bytes or up to end-of-string
-			n := len(s[1:]) - len(strings.TrimLeft(s[1:], "01234567"))
-			if n > 3 {
-				n = 3
-			}
-			v, err := strconv.ParseUint(s[1:1+n], 8, 8)
-			if err != nil {
-				out = append(out, s[:1+n]...)
-			} else {
-				out = append(out, byte(v))
-			}
-			s = s[1+n:]
-		} else {
-			// bad escape, just propagate the slash as-is
-			out = append(out, s[0])
-			s = s[1:]
-		}
-	}
-
-	return string(out)
-}
-
-func (g *Generator) generateExtension(ext *ExtensionDescriptor) {
-	ccTypeName := ext.DescName()
-
-	extObj := g.ObjectNamed(*ext.Extendee)
-	var extDesc *Descriptor
-	if id, ok := extObj.(*ImportedDescriptor); ok {
-		// This is extending a publicly imported message.
-		// We need the underlying type for goTag.
-		extDesc = id.o.(*Descriptor)
-	} else {
-		extDesc = extObj.(*Descriptor)
-	}
-	extendedType := "*" + g.TypeName(extObj) // always use the original
-	field := ext.FieldDescriptorProto
-	fieldType, wireType := g.GoType(ext.parent, field)
-	tag := g.goTag(extDesc, field, wireType)
-	g.RecordTypeUse(*ext.Extendee)
-	if n := ext.FieldDescriptorProto.TypeName; n != nil {
-		// foreign extension type
-		g.RecordTypeUse(*n)
-	}
-
-	typeName := ext.TypeName()
-
-	// Special case for proto2 message sets: If this extension is extending
-	// proto2_bridge.MessageSet, and its final name component is "message_set_extension",
-	// then drop that last component.
-	mset := false
-	if extendedType == "*proto2_bridge.MessageSet" && typeName[len(typeName)-1] == "message_set_extension" {
-		typeName = typeName[:len(typeName)-1]
-		mset = true
-	}
-
-	// For text formatting, the package must be exactly what the .proto file declares,
-	// ignoring overrides such as the go_package option, and with no dot/underscore mapping.
-	extName := strings.Join(typeName, ".")
-	if g.file.Package != nil {
-		extName = *g.file.Package + "." + extName
-	}
-
-	g.P("var ", ccTypeName, " = &", g.Pkg["proto"], ".ExtensionDesc{")
-	g.In()
-	g.P("ExtendedType: (", extendedType, ")(nil),")
-	g.P("ExtensionType: (", fieldType, ")(nil),")
-	g.P("Field: ", field.Number, ",")
-	g.P(`Name: "`, extName, `",`)
-	g.P("Tag: ", tag, ",")
-	g.P(`Filename: "`, g.file.GetName(), `",`)
-
-	g.Out()
-	g.P("}")
-	g.P()
-
-	if mset {
-		// Generate a bit more code to register with message_set.go.
-		g.addInitf("%s.RegisterMessageSetType((%s)(nil), %d, %q)", g.Pkg["proto"], fieldType, *field.Number, extName)
-	}
-
-	g.file.addExport(ext, constOrVarSymbol{ccTypeName, "var", ""})
-}
-
-func (g *Generator) generateInitFunction() {
-	for _, enum := range g.file.enum {
-		g.generateEnumRegistration(enum)
-	}
-	for _, d := range g.file.desc {
-		for _, ext := range d.ext {
-			g.generateExtensionRegistration(ext)
-		}
-	}
-	for _, ext := range g.file.ext {
-		g.generateExtensionRegistration(ext)
-	}
-	if len(g.init) == 0 {
-		return
-	}
-	g.P("func init() {")
-	g.In()
-	for _, l := range g.init {
-		g.P(l)
-	}
-	g.Out()
-	g.P("}")
-	g.init = nil
-}
-
-func (g *Generator) generateFileDescriptor(file *FileDescriptor) {
-	// Make a copy and trim source_code_info data.
-	// TODO: Trim this more when we know exactly what we need.
-	pb := proto.Clone(file.FileDescriptorProto).(*descriptor.FileDescriptorProto)
-	pb.SourceCodeInfo = nil
-
-	b, err := proto.Marshal(pb)
-	if err != nil {
-		g.Fail(err.Error())
-	}
-
-	var buf bytes.Buffer
-	w, _ := gzip.NewWriterLevel(&buf, gzip.BestCompression)
-	w.Write(b)
-	w.Close()
-	b = buf.Bytes()
-
-	v := file.VarName()
-	g.P()
-	g.P("func init() { ", g.Pkg["proto"], ".RegisterFile(", strconv.Quote(*file.Name), ", ", v, ") }")
-	g.P("var ", v, " = []byte{")
-	g.In()
-	g.P("// ", len(b), " bytes of a gzipped FileDescriptorProto")
-	for len(b) > 0 {
-		n := 16
-		if n > len(b) {
-			n = len(b)
-		}
-
-		s := ""
-		for _, c := range b[:n] {
-			s += fmt.Sprintf("0x%02x,", c)
-		}
-		g.P(s)
-
-		b = b[n:]
-	}
-	g.Out()
-	g.P("}")
-}
-
-func (g *Generator) generateEnumRegistration(enum *EnumDescriptor) {
-	// // We always print the full (proto-world) package name here.
-	pkg := enum.File().GetPackage()
-	if pkg != "" {
-		pkg += "."
-	}
-	// The full type name
-	typeName := enum.TypeName()
-	// The full type name, CamelCased.
-	ccTypeName := CamelCaseSlice(typeName)
-	g.addInitf("%s.RegisterEnum(%q, %[3]s_name, %[3]s_value)", g.Pkg["proto"], pkg+ccTypeName, ccTypeName)
-}
-
-func (g *Generator) generateExtensionRegistration(ext *ExtensionDescriptor) {
-	g.addInitf("%s.RegisterExtension(%s)", g.Pkg["proto"], ext.DescName())
-}
-
-// And now lots of helper functions.
-
-// Is c an ASCII lower-case letter?
-func isASCIILower(c byte) bool {
-	return 'a' <= c && c <= 'z'
-}
-
-// Is c an ASCII digit?
-func isASCIIDigit(c byte) bool {
-	return '0' <= c && c <= '9'
-}
-
-// CamelCase returns the CamelCased name.
-// If there is an interior underscore followed by a lower case letter,
-// drop the underscore and convert the letter to upper case.
-// There is a remote possibility of this rewrite causing a name collision,
-// but it's so remote we're prepared to pretend it's nonexistent - since the
-// C++ generator lowercases names, it's extremely unlikely to have two fields
-// with different capitalizations.
-// In short, _my_field_name_2 becomes XMyFieldName_2.
-func CamelCase(s string) string {
-	if s == "" {
-		return ""
-	}
-	t := make([]byte, 0, 32)
-	i := 0
-	if s[0] == '_' {
-		// Need a capital letter; drop the '_'.
-		t = append(t, 'X')
-		i++
-	}
-	// Invariant: if the next letter is lower case, it must be converted
-	// to upper case.
-	// That is, we process a word at a time, where words are marked by _ or
-	// upper case letter. Digits are treated as words.
-	for ; i < len(s); i++ {
-		c := s[i]
-		if c == '_' && i+1 < len(s) && isASCIILower(s[i+1]) {
-			continue // Skip the underscore in s.
-		}
-		if isASCIIDigit(c) {
-			t = append(t, c)
-			continue
-		}
-		// Assume we have a letter now - if not, it's a bogus identifier.
-		// The next word is a sequence of characters that must start upper case.
-		if isASCIILower(c) {
-			c ^= ' ' // Make it a capital letter.
-		}
-		t = append(t, c) // Guaranteed not lower case.
-		// Accept lower case sequence that follows.
-		for i+1 < len(s) && isASCIILower(s[i+1]) {
-			i++
-			t = append(t, s[i])
-		}
-	}
-	return string(t)
-}
-
-// CamelCaseSlice is like CamelCase, but the argument is a slice of strings to
-// be joined with "_".
-func CamelCaseSlice(elem []string) string { return CamelCase(strings.Join(elem, "_")) }
-
-// dottedSlice turns a sliced name into a dotted name.
-func dottedSlice(elem []string) string { return strings.Join(elem, ".") }
-
-// Is this field optional?
-func isOptional(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_OPTIONAL
-}
-
-// Is this field required?
-func isRequired(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REQUIRED
-}
-
-// Is this field repeated?
-func isRepeated(field *descriptor.FieldDescriptorProto) bool {
-	return field.Label != nil && *field.Label == descriptor.FieldDescriptorProto_LABEL_REPEATED
-}
-
-// Is this field a scalar numeric type?
-func isScalar(field *descriptor.FieldDescriptorProto) bool {
-	if field.Type == nil {
-		return false
-	}
-	switch *field.Type {
-	case descriptor.FieldDescriptorProto_TYPE_DOUBLE,
-		descriptor.FieldDescriptorProto_TYPE_FLOAT,
-		descriptor.FieldDescriptorProto_TYPE_INT64,
-		descriptor.FieldDescriptorProto_TYPE_UINT64,
-		descriptor.FieldDescriptorProto_TYPE_INT32,
-		descriptor.FieldDescriptorProto_TYPE_FIXED64,
-		descriptor.FieldDescriptorProto_TYPE_FIXED32,
-		descriptor.FieldDescriptorProto_TYPE_BOOL,
-		descriptor.FieldDescriptorProto_TYPE_UINT32,
-		descriptor.FieldDescriptorProto_TYPE_ENUM,
-		descriptor.FieldDescriptorProto_TYPE_SFIXED32,
-		descriptor.FieldDescriptorProto_TYPE_SFIXED64,
-		descriptor.FieldDescriptorProto_TYPE_SINT32,
-		descriptor.FieldDescriptorProto_TYPE_SINT64:
-		return true
-	default:
-		return false
-	}
-}
-
-// badToUnderscore is the mapping function used to generate Go names from package names,
-// which can be dotted in the input .proto file.  It replaces non-identifier characters such as
-// dot or dash with underscore.
-func badToUnderscore(r rune) rune {
-	if unicode.IsLetter(r) || unicode.IsDigit(r) || r == '_' {
-		return r
-	}
-	return '_'
-}
-
-// baseName returns the last path element of the name, with the last dotted suffix removed.
-func baseName(name string) string {
-	// First, find the last element
-	if i := strings.LastIndex(name, "/"); i >= 0 {
-		name = name[i+1:]
-	}
-	// Now drop the suffix
-	if i := strings.LastIndex(name, "."); i >= 0 {
-		name = name[0:i]
-	}
-	return name
-}
-
-// The SourceCodeInfo message describes the location of elements of a parsed
-// .proto file by way of a "path", which is a sequence of integers that
-// describe the route from a FileDescriptorProto to the relevant submessage.
-// The path alternates between a field number of a repeated field, and an index
-// into that repeated field. The constants below define the field numbers that
-// are used.
-//
-// See descriptor.proto for more information about this.
-const (
-	// tag numbers in FileDescriptorProto
-	packagePath = 2 // package
-	messagePath = 4 // message_type
-	enumPath    = 5 // enum_type
-	// tag numbers in DescriptorProto
-	messageFieldPath   = 2 // field
-	messageMessagePath = 3 // nested_type
-	messageEnumPath    = 4 // enum_type
-	messageOneofPath   = 8 // oneof_decl
-	// tag numbers in EnumDescriptorProto
-	enumValuePath = 2 // value
-)
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go
deleted file mode 100644
index 76808f3b7a..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/generator/name_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2013 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package generator
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/protoc-gen-go/descriptor"
-)
-
-func TestCamelCase(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"one", "One"},
-		{"one_two", "OneTwo"},
-		{"_my_field_name_2", "XMyFieldName_2"},
-		{"Something_Capped", "Something_Capped"},
-		{"my_Name", "My_Name"},
-		{"OneTwo", "OneTwo"},
-		{"_", "X"},
-		{"_a_", "XA_"},
-	}
-	for _, tc := range tests {
-		if got := CamelCase(tc.in); got != tc.want {
-			t.Errorf("CamelCase(%q) = %q, want %q", tc.in, got, tc.want)
-		}
-	}
-}
-
-func TestGoPackageOption(t *testing.T) {
-	tests := []struct {
-		in           string
-		impPath, pkg string
-		ok           bool
-	}{
-		{"", "", "", false},
-		{"foo", "", "foo", true},
-		{"github.com/golang/bar", "github.com/golang/bar", "bar", true},
-		{"github.com/golang/bar;baz", "github.com/golang/bar", "baz", true},
-	}
-	for _, tc := range tests {
-		d := &FileDescriptor{
-			FileDescriptorProto: &descriptor.FileDescriptorProto{
-				Options: &descriptor.FileOptions{
-					GoPackage: &tc.in,
-				},
-			},
-		}
-		impPath, pkg, ok := d.goPackageOption()
-		if impPath != tc.impPath || pkg != tc.pkg || ok != tc.ok {
-			t.Errorf("go_package = %q => (%q, %q, %t), want (%q, %q, %t)", tc.in,
-				impPath, pkg, ok, tc.impPath, tc.pkg, tc.ok)
-		}
-	}
-}
-
-func TestUnescape(t *testing.T) {
-	tests := []struct {
-		in   string
-		out  string
-	}{
-		// successful cases, including all kinds of escapes
-		{"", ""},
-		{"foo bar baz frob nitz", "foo bar baz frob nitz"},
-		{`\000\001\002\003\004\005\006\007`, string([]byte{0, 1, 2, 3, 4, 5, 6, 7})},
-		{`\a\b\f\n\r\t\v\\\?\'\"`, string([]byte{'\a', '\b', '\f', '\n', '\r', '\t', '\v', '\\', '?', '\'', '"'})},
-		{`\x10\x20\x30\x40\x50\x60\x70\x80`, string([]byte{16, 32, 48, 64, 80, 96, 112, 128})},
-		// variable length octal escapes
-		{`\0\018\222\377\3\04\005\6\07`, string([]byte{0, 1, '8', 0222, 255, 3, 4, 5, 6, 7})},
-		// malformed escape sequences left as is
-		{"foo \\g bar", "foo \\g bar"},
-		{"foo \\xg0 bar", "foo \\xg0 bar"},
-		{"\\", "\\"},
-		{"\\x", "\\x"},
-		{"\\xf", "\\xf"},
-		{"\\777", "\\777"}, // overflows byte
-	}
-	for _, tc := range tests {
-		s := unescape(tc.in)
-		if s != tc.out {
-			t.Errorf("doUnescape(%q) = %q; should have been %q", tc.in, s, tc.out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
deleted file mode 100644
index 2660e47a27..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/grpc/grpc.go
+++ /dev/null
@@ -1,463 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Package grpc outputs gRPC service descriptions in Go code.
-// It runs as a plugin for the Go protocol buffer compiler plugin.
-// It is linked in to protoc-gen-go.
-package grpc
-
-import (
-	"fmt"
-	"path"
-	"strconv"
-	"strings"
-
-	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/golang/protobuf/protoc-gen-go/generator"
-)
-
-// generatedCodeVersion indicates a version of the generated code.
-// It is incremented whenever an incompatibility between the generated code and
-// the grpc package is introduced; the generated code references
-// a constant, grpc.SupportPackageIsVersionN (where N is generatedCodeVersion).
-const generatedCodeVersion = 4
-
-// Paths for packages used by code generated in this file,
-// relative to the import_prefix of the generator.Generator.
-const (
-	contextPkgPath = "golang.org/x/net/context"
-	grpcPkgPath    = "google.golang.org/grpc"
-)
-
-func init() {
-	generator.RegisterPlugin(new(grpc))
-}
-
-// grpc is an implementation of the Go protocol buffer compiler's
-// plugin architecture.  It generates bindings for gRPC support.
-type grpc struct {
-	gen *generator.Generator
-}
-
-// Name returns the name of this plugin, "grpc".
-func (g *grpc) Name() string {
-	return "grpc"
-}
-
-// The names for packages imported in the generated code.
-// They may vary from the final path component of the import path
-// if the name is used by other packages.
-var (
-	contextPkg string
-	grpcPkg    string
-)
-
-// Init initializes the plugin.
-func (g *grpc) Init(gen *generator.Generator) {
-	g.gen = gen
-	contextPkg = generator.RegisterUniquePackageName("context", nil)
-	grpcPkg = generator.RegisterUniquePackageName("grpc", nil)
-}
-
-// Given a type name defined in a .proto, return its object.
-// Also record that we're using it, to guarantee the associated import.
-func (g *grpc) objectNamed(name string) generator.Object {
-	g.gen.RecordTypeUse(name)
-	return g.gen.ObjectNamed(name)
-}
-
-// Given a type name defined in a .proto, return its name as we will print it.
-func (g *grpc) typeName(str string) string {
-	return g.gen.TypeName(g.objectNamed(str))
-}
-
-// P forwards to g.gen.P.
-func (g *grpc) P(args ...interface{}) { g.gen.P(args...) }
-
-// Generate generates code for the services in the given file.
-func (g *grpc) Generate(file *generator.FileDescriptor) {
-	if len(file.FileDescriptorProto.Service) == 0 {
-		return
-	}
-
-	g.P("// Reference imports to suppress errors if they are not otherwise used.")
-	g.P("var _ ", contextPkg, ".Context")
-	g.P("var _ ", grpcPkg, ".ClientConn")
-	g.P()
-
-	// Assert version compatibility.
-	g.P("// This is a compile-time assertion to ensure that this generated file")
-	g.P("// is compatible with the grpc package it is being compiled against.")
-	g.P("const _ = ", grpcPkg, ".SupportPackageIsVersion", generatedCodeVersion)
-	g.P()
-
-	for i, service := range file.FileDescriptorProto.Service {
-		g.generateService(file, service, i)
-	}
-}
-
-// GenerateImports generates the import declaration for this file.
-func (g *grpc) GenerateImports(file *generator.FileDescriptor) {
-	if len(file.FileDescriptorProto.Service) == 0 {
-		return
-	}
-	g.P("import (")
-	g.P(contextPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, contextPkgPath)))
-	g.P(grpcPkg, " ", strconv.Quote(path.Join(g.gen.ImportPrefix, grpcPkgPath)))
-	g.P(")")
-	g.P()
-}
-
-// reservedClientName records whether a client name is reserved on the client side.
-var reservedClientName = map[string]bool{
-// TODO: do we need any in gRPC?
-}
-
-func unexport(s string) string { return strings.ToLower(s[:1]) + s[1:] }
-
-// generateService generates all the code for the named service.
-func (g *grpc) generateService(file *generator.FileDescriptor, service *pb.ServiceDescriptorProto, index int) {
-	path := fmt.Sprintf("6,%d", index) // 6 means service.
-
-	origServName := service.GetName()
-	fullServName := origServName
-	if pkg := file.GetPackage(); pkg != "" {
-		fullServName = pkg + "." + fullServName
-	}
-	servName := generator.CamelCase(origServName)
-
-	g.P()
-	g.P("// Client API for ", servName, " service")
-	g.P()
-
-	// Client interface.
-	g.P("type ", servName, "Client interface {")
-	for i, method := range service.Method {
-		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
-		g.P(g.generateClientSignature(servName, method))
-	}
-	g.P("}")
-	g.P()
-
-	// Client structure.
-	g.P("type ", unexport(servName), "Client struct {")
-	g.P("cc *", grpcPkg, ".ClientConn")
-	g.P("}")
-	g.P()
-
-	// NewClient factory.
-	g.P("func New", servName, "Client (cc *", grpcPkg, ".ClientConn) ", servName, "Client {")
-	g.P("return &", unexport(servName), "Client{cc}")
-	g.P("}")
-	g.P()
-
-	var methodIndex, streamIndex int
-	serviceDescVar := "_" + servName + "_serviceDesc"
-	// Client method implementations.
-	for _, method := range service.Method {
-		var descExpr string
-		if !method.GetServerStreaming() && !method.GetClientStreaming() {
-			// Unary RPC method
-			descExpr = fmt.Sprintf("&%s.Methods[%d]", serviceDescVar, methodIndex)
-			methodIndex++
-		} else {
-			// Streaming RPC method
-			descExpr = fmt.Sprintf("&%s.Streams[%d]", serviceDescVar, streamIndex)
-			streamIndex++
-		}
-		g.generateClientMethod(servName, fullServName, serviceDescVar, method, descExpr)
-	}
-
-	g.P("// Server API for ", servName, " service")
-	g.P()
-
-	// Server interface.
-	serverType := servName + "Server"
-	g.P("type ", serverType, " interface {")
-	for i, method := range service.Method {
-		g.gen.PrintComments(fmt.Sprintf("%s,2,%d", path, i)) // 2 means method in a service.
-		g.P(g.generateServerSignature(servName, method))
-	}
-	g.P("}")
-	g.P()
-
-	// Server registration.
-	g.P("func Register", servName, "Server(s *", grpcPkg, ".Server, srv ", serverType, ") {")
-	g.P("s.RegisterService(&", serviceDescVar, `, srv)`)
-	g.P("}")
-	g.P()
-
-	// Server handler implementations.
-	var handlerNames []string
-	for _, method := range service.Method {
-		hname := g.generateServerMethod(servName, fullServName, method)
-		handlerNames = append(handlerNames, hname)
-	}
-
-	// Service descriptor.
-	g.P("var ", serviceDescVar, " = ", grpcPkg, ".ServiceDesc {")
-	g.P("ServiceName: ", strconv.Quote(fullServName), ",")
-	g.P("HandlerType: (*", serverType, ")(nil),")
-	g.P("Methods: []", grpcPkg, ".MethodDesc{")
-	for i, method := range service.Method {
-		if method.GetServerStreaming() || method.GetClientStreaming() {
-			continue
-		}
-		g.P("{")
-		g.P("MethodName: ", strconv.Quote(method.GetName()), ",")
-		g.P("Handler: ", handlerNames[i], ",")
-		g.P("},")
-	}
-	g.P("},")
-	g.P("Streams: []", grpcPkg, ".StreamDesc{")
-	for i, method := range service.Method {
-		if !method.GetServerStreaming() && !method.GetClientStreaming() {
-			continue
-		}
-		g.P("{")
-		g.P("StreamName: ", strconv.Quote(method.GetName()), ",")
-		g.P("Handler: ", handlerNames[i], ",")
-		if method.GetServerStreaming() {
-			g.P("ServerStreams: true,")
-		}
-		if method.GetClientStreaming() {
-			g.P("ClientStreams: true,")
-		}
-		g.P("},")
-	}
-	g.P("},")
-	g.P("Metadata: \"", file.GetName(), "\",")
-	g.P("}")
-	g.P()
-}
-
-// generateClientSignature returns the client-side signature for a method.
-func (g *grpc) generateClientSignature(servName string, method *pb.MethodDescriptorProto) string {
-	origMethName := method.GetName()
-	methName := generator.CamelCase(origMethName)
-	if reservedClientName[methName] {
-		methName += "_"
-	}
-	reqArg := ", in *" + g.typeName(method.GetInputType())
-	if method.GetClientStreaming() {
-		reqArg = ""
-	}
-	respName := "*" + g.typeName(method.GetOutputType())
-	if method.GetServerStreaming() || method.GetClientStreaming() {
-		respName = servName + "_" + generator.CamelCase(origMethName) + "Client"
-	}
-	return fmt.Sprintf("%s(ctx %s.Context%s, opts ...%s.CallOption) (%s, error)", methName, contextPkg, reqArg, grpcPkg, respName)
-}
-
-func (g *grpc) generateClientMethod(servName, fullServName, serviceDescVar string, method *pb.MethodDescriptorProto, descExpr string) {
-	sname := fmt.Sprintf("/%s/%s", fullServName, method.GetName())
-	methName := generator.CamelCase(method.GetName())
-	inType := g.typeName(method.GetInputType())
-	outType := g.typeName(method.GetOutputType())
-
-	g.P("func (c *", unexport(servName), "Client) ", g.generateClientSignature(servName, method), "{")
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		g.P("out := new(", outType, ")")
-		// TODO: Pass descExpr to Invoke.
-		g.P("err := ", grpcPkg, `.Invoke(ctx, "`, sname, `", in, out, c.cc, opts...)`)
-		g.P("if err != nil { return nil, err }")
-		g.P("return out, nil")
-		g.P("}")
-		g.P()
-		return
-	}
-	streamType := unexport(servName) + methName + "Client"
-	g.P("stream, err := ", grpcPkg, ".NewClientStream(ctx, ", descExpr, `, c.cc, "`, sname, `", opts...)`)
-	g.P("if err != nil { return nil, err }")
-	g.P("x := &", streamType, "{stream}")
-	if !method.GetClientStreaming() {
-		g.P("if err := x.ClientStream.SendMsg(in); err != nil { return nil, err }")
-		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
-	}
-	g.P("return x, nil")
-	g.P("}")
-	g.P()
-
-	genSend := method.GetClientStreaming()
-	genRecv := method.GetServerStreaming()
-	genCloseAndRecv := !method.GetServerStreaming()
-
-	// Stream auxiliary types and methods.
-	g.P("type ", servName, "_", methName, "Client interface {")
-	if genSend {
-		g.P("Send(*", inType, ") error")
-	}
-	if genRecv {
-		g.P("Recv() (*", outType, ", error)")
-	}
-	if genCloseAndRecv {
-		g.P("CloseAndRecv() (*", outType, ", error)")
-	}
-	g.P(grpcPkg, ".ClientStream")
-	g.P("}")
-	g.P()
-
-	g.P("type ", streamType, " struct {")
-	g.P(grpcPkg, ".ClientStream")
-	g.P("}")
-	g.P()
-
-	if genSend {
-		g.P("func (x *", streamType, ") Send(m *", inType, ") error {")
-		g.P("return x.ClientStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genRecv {
-		g.P("func (x *", streamType, ") Recv() (*", outType, ", error) {")
-		g.P("m := new(", outType, ")")
-		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-	if genCloseAndRecv {
-		g.P("func (x *", streamType, ") CloseAndRecv() (*", outType, ", error) {")
-		g.P("if err := x.ClientStream.CloseSend(); err != nil { return nil, err }")
-		g.P("m := new(", outType, ")")
-		g.P("if err := x.ClientStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-}
-
-// generateServerSignature returns the server-side signature for a method.
-func (g *grpc) generateServerSignature(servName string, method *pb.MethodDescriptorProto) string {
-	origMethName := method.GetName()
-	methName := generator.CamelCase(origMethName)
-	if reservedClientName[methName] {
-		methName += "_"
-	}
-
-	var reqArgs []string
-	ret := "error"
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		reqArgs = append(reqArgs, contextPkg+".Context")
-		ret = "(*" + g.typeName(method.GetOutputType()) + ", error)"
-	}
-	if !method.GetClientStreaming() {
-		reqArgs = append(reqArgs, "*"+g.typeName(method.GetInputType()))
-	}
-	if method.GetServerStreaming() || method.GetClientStreaming() {
-		reqArgs = append(reqArgs, servName+"_"+generator.CamelCase(origMethName)+"Server")
-	}
-
-	return methName + "(" + strings.Join(reqArgs, ", ") + ") " + ret
-}
-
-func (g *grpc) generateServerMethod(servName, fullServName string, method *pb.MethodDescriptorProto) string {
-	methName := generator.CamelCase(method.GetName())
-	hname := fmt.Sprintf("_%s_%s_Handler", servName, methName)
-	inType := g.typeName(method.GetInputType())
-	outType := g.typeName(method.GetOutputType())
-
-	if !method.GetServerStreaming() && !method.GetClientStreaming() {
-		g.P("func ", hname, "(srv interface{}, ctx ", contextPkg, ".Context, dec func(interface{}) error, interceptor ", grpcPkg, ".UnaryServerInterceptor) (interface{}, error) {")
-		g.P("in := new(", inType, ")")
-		g.P("if err := dec(in); err != nil { return nil, err }")
-		g.P("if interceptor == nil { return srv.(", servName, "Server).", methName, "(ctx, in) }")
-		g.P("info := &", grpcPkg, ".UnaryServerInfo{")
-		g.P("Server: srv,")
-		g.P("FullMethod: ", strconv.Quote(fmt.Sprintf("/%s/%s", fullServName, methName)), ",")
-		g.P("}")
-		g.P("handler := func(ctx ", contextPkg, ".Context, req interface{}) (interface{}, error) {")
-		g.P("return srv.(", servName, "Server).", methName, "(ctx, req.(*", inType, "))")
-		g.P("}")
-		g.P("return interceptor(ctx, in, info, handler)")
-		g.P("}")
-		g.P()
-		return hname
-	}
-	streamType := unexport(servName) + methName + "Server"
-	g.P("func ", hname, "(srv interface{}, stream ", grpcPkg, ".ServerStream) error {")
-	if !method.GetClientStreaming() {
-		g.P("m := new(", inType, ")")
-		g.P("if err := stream.RecvMsg(m); err != nil { return err }")
-		g.P("return srv.(", servName, "Server).", methName, "(m, &", streamType, "{stream})")
-	} else {
-		g.P("return srv.(", servName, "Server).", methName, "(&", streamType, "{stream})")
-	}
-	g.P("}")
-	g.P()
-
-	genSend := method.GetServerStreaming()
-	genSendAndClose := !method.GetServerStreaming()
-	genRecv := method.GetClientStreaming()
-
-	// Stream auxiliary types and methods.
-	g.P("type ", servName, "_", methName, "Server interface {")
-	if genSend {
-		g.P("Send(*", outType, ") error")
-	}
-	if genSendAndClose {
-		g.P("SendAndClose(*", outType, ") error")
-	}
-	if genRecv {
-		g.P("Recv() (*", inType, ", error)")
-	}
-	g.P(grpcPkg, ".ServerStream")
-	g.P("}")
-	g.P()
-
-	g.P("type ", streamType, " struct {")
-	g.P(grpcPkg, ".ServerStream")
-	g.P("}")
-	g.P()
-
-	if genSend {
-		g.P("func (x *", streamType, ") Send(m *", outType, ") error {")
-		g.P("return x.ServerStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genSendAndClose {
-		g.P("func (x *", streamType, ") SendAndClose(m *", outType, ") error {")
-		g.P("return x.ServerStream.SendMsg(m)")
-		g.P("}")
-		g.P()
-	}
-	if genRecv {
-		g.P("func (x *", streamType, ") Recv() (*", inType, ", error) {")
-		g.P("m := new(", inType, ")")
-		g.P("if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err }")
-		g.P("return m, nil")
-		g.P("}")
-		g.P()
-	}
-
-	return hname
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
deleted file mode 100644
index 532a550050..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/link_grpc.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package main
-
-import _ "github.com/golang/protobuf/protoc-gen-go/grpc"
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/main.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/main.go
deleted file mode 100644
index 8e2486de0b..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/main.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// protoc-gen-go is a plugin for the Google protocol buffer compiler to generate
-// Go code.  Run it by building this program and putting it in your path with
-// the name
-// 	protoc-gen-go
-// That word 'go' at the end becomes part of the option string set for the
-// protocol compiler, so once the protocol compiler (protoc) is installed
-// you can run
-// 	protoc --go_out=output_directory input_directory/file.proto
-// to generate Go bindings for the protocol defined by file.proto.
-// With that input, the output will be written to
-// 	output_directory/file.pb.go
-//
-// The generated code is documented in the package comment for
-// the library.
-//
-// See the README and documentation for protocol buffers to learn more:
-// 	https://developers.google.com/protocol-buffers/
-package main
-
-import (
-	"io/ioutil"
-	"os"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/protoc-gen-go/generator"
-)
-
-func main() {
-	// Begin by allocating a generator. The request and response structures are stored there
-	// so we can do error handling easily - the response structure contains the field to
-	// report failure.
-	g := generator.New()
-
-	data, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		g.Error(err, "reading input")
-	}
-
-	if err := proto.Unmarshal(data, g.Request); err != nil {
-		g.Error(err, "parsing input proto")
-	}
-
-	if len(g.Request.FileToGenerate) == 0 {
-		g.Fail("no files to generate")
-	}
-
-	g.CommandLineParameters(g.Request.GetParameter())
-
-	// Create a wrapped version of the Descriptors and EnumDescriptors that
-	// point to the file that defines them.
-	g.WrapTypes()
-
-	g.SetPackageNames()
-	g.BuildTypeNameMap()
-
-	g.GenerateAllFiles()
-
-	// Send back the results.
-	data, err = proto.Marshal(g.Response)
-	if err != nil {
-		g.Error(err, "failed to marshal output proto")
-	}
-	_, err = os.Stdout.Write(data)
-	if err != nil {
-		g.Error(err, "failed to write output proto")
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
deleted file mode 100644
index bc0463d571..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-# Not stored here, but plugin.proto is in https://github.com/google/protobuf/
-# at src/google/protobuf/compiler/plugin.proto
-# Also we need to fix an import.
-regenerate:
-	@echo WARNING! THIS RULE IS PROBABLY NOT RIGHT FOR YOUR INSTALLATION
-	cp $(HOME)/src/protobuf/include/google/protobuf/compiler/plugin.proto .
-	protoc --go_out=Mgoogle/protobuf/descriptor.proto=github.com/golang/protobuf/protoc-gen-go/descriptor:../../../../.. \
-		-I$(HOME)/src/protobuf/include $(HOME)/src/protobuf/include/google/protobuf/compiler/plugin.proto
-
-restore:
-	cp plugin.pb.golden plugin.pb.go
-
-preserve:
-	cp plugin.pb.go plugin.pb.golden
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
deleted file mode 100644
index c608a248bc..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/compiler/plugin.proto
-
-/*
-Package plugin_go is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/compiler/plugin.proto
-
-It has these top-level messages:
-	Version
-	CodeGeneratorRequest
-	CodeGeneratorResponse
-*/
-package plugin_go
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// The version number of protocol compiler.
-type Version struct {
-	Major *int32 `protobuf:"varint,1,opt,name=major" json:"major,omitempty"`
-	Minor *int32 `protobuf:"varint,2,opt,name=minor" json:"minor,omitempty"`
-	Patch *int32 `protobuf:"varint,3,opt,name=patch" json:"patch,omitempty"`
-	// A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
-	// be empty for mainline stable releases.
-	Suffix           *string `protobuf:"bytes,4,opt,name=suffix" json:"suffix,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Version) Reset()                    { *m = Version{} }
-func (m *Version) String() string            { return proto.CompactTextString(m) }
-func (*Version) ProtoMessage()               {}
-func (*Version) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-
-func (m *Version) GetMajor() int32 {
-	if m != nil && m.Major != nil {
-		return *m.Major
-	}
-	return 0
-}
-
-func (m *Version) GetMinor() int32 {
-	if m != nil && m.Minor != nil {
-		return *m.Minor
-	}
-	return 0
-}
-
-func (m *Version) GetPatch() int32 {
-	if m != nil && m.Patch != nil {
-		return *m.Patch
-	}
-	return 0
-}
-
-func (m *Version) GetSuffix() string {
-	if m != nil && m.Suffix != nil {
-		return *m.Suffix
-	}
-	return ""
-}
-
-// An encoded CodeGeneratorRequest is written to the plugin's stdin.
-type CodeGeneratorRequest struct {
-	// The .proto files that were explicitly listed on the command-line.  The
-	// code generator should generate code only for these files.  Each file's
-	// descriptor will be included in proto_file, below.
-	FileToGenerate []string `protobuf:"bytes,1,rep,name=file_to_generate,json=fileToGenerate" json:"file_to_generate,omitempty"`
-	// The generator parameter passed on the command-line.
-	Parameter *string `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
-	// FileDescriptorProtos for all files in files_to_generate and everything
-	// they import.  The files will appear in topological order, so each file
-	// appears before any file that imports it.
-	//
-	// protoc guarantees that all proto_files will be written after
-	// the fields above, even though this is not technically guaranteed by the
-	// protobuf wire format.  This theoretically could allow a plugin to stream
-	// in the FileDescriptorProtos and handle them one by one rather than read
-	// the entire set into memory at once.  However, as of this writing, this
-	// is not similarly optimized on protoc's end -- it will store all fields in
-	// memory at once before sending them to the plugin.
-	//
-	// Type names of fields and extensions in the FileDescriptorProto are always
-	// fully qualified.
-	ProtoFile []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file,json=protoFile" json:"proto_file,omitempty"`
-	// The version number of protocol compiler.
-	CompilerVersion  *Version `protobuf:"bytes,3,opt,name=compiler_version,json=compilerVersion" json:"compiler_version,omitempty"`
-	XXX_unrecognized []byte   `json:"-"`
-}
-
-func (m *CodeGeneratorRequest) Reset()                    { *m = CodeGeneratorRequest{} }
-func (m *CodeGeneratorRequest) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorRequest) ProtoMessage()               {}
-func (*CodeGeneratorRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-
-func (m *CodeGeneratorRequest) GetFileToGenerate() []string {
-	if m != nil {
-		return m.FileToGenerate
-	}
-	return nil
-}
-
-func (m *CodeGeneratorRequest) GetParameter() string {
-	if m != nil && m.Parameter != nil {
-		return *m.Parameter
-	}
-	return ""
-}
-
-func (m *CodeGeneratorRequest) GetProtoFile() []*google_protobuf.FileDescriptorProto {
-	if m != nil {
-		return m.ProtoFile
-	}
-	return nil
-}
-
-func (m *CodeGeneratorRequest) GetCompilerVersion() *Version {
-	if m != nil {
-		return m.CompilerVersion
-	}
-	return nil
-}
-
-// The plugin writes an encoded CodeGeneratorResponse to stdout.
-type CodeGeneratorResponse struct {
-	// Error message.  If non-empty, code generation failed.  The plugin process
-	// should exit with status code zero even if it reports an error in this way.
-	//
-	// This should be used to indicate errors in .proto files which prevent the
-	// code generator from generating correct code.  Errors which indicate a
-	// problem in protoc itself -- such as the input CodeGeneratorRequest being
-	// unparseable -- should be reported by writing a message to stderr and
-	// exiting with a non-zero status code.
-	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (m *CodeGeneratorResponse) Reset()                    { *m = CodeGeneratorResponse{} }
-func (m *CodeGeneratorResponse) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorResponse) ProtoMessage()               {}
-func (*CodeGeneratorResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-
-func (m *CodeGeneratorResponse) GetError() string {
-	if m != nil && m.Error != nil {
-		return *m.Error
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse) GetFile() []*CodeGeneratorResponse_File {
-	if m != nil {
-		return m.File
-	}
-	return nil
-}
-
-// Represents a single generated file.
-type CodeGeneratorResponse_File struct {
-	// The file name, relative to the output directory.  The name must not
-	// contain "." or ".." components and must be relative, not be absolute (so,
-	// the file cannot lie outside the output directory).  "/" must be used as
-	// the path separator, not "\".
-	//
-	// If the name is omitted, the content will be appended to the previous
-	// file.  This allows the generator to break large files into small chunks,
-	// and allows the generated text to be streamed back to protoc so that large
-	// files need not reside completely in memory at one time.  Note that as of
-	// this writing protoc does not optimize for this -- it will read the entire
-	// CodeGeneratorResponse before writing files to disk.
-	Name *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	// If non-empty, indicates that the named file should already exist, and the
-	// content here is to be inserted into that file at a defined insertion
-	// point.  This feature allows a code generator to extend the output
-	// produced by another code generator.  The original generator may provide
-	// insertion points by placing special annotations in the file that look
-	// like:
-	//   @@protoc_insertion_point(NAME)
-	// The annotation can have arbitrary text before and after it on the line,
-	// which allows it to be placed in a comment.  NAME should be replaced with
-	// an identifier naming the point -- this is what other generators will use
-	// as the insertion_point.  Code inserted at this point will be placed
-	// immediately above the line containing the insertion point (thus multiple
-	// insertions to the same point will come out in the order they were added).
-	// The double-@ is intended to make it unlikely that the generated code
-	// could contain things that look like insertion points by accident.
-	//
-	// For example, the C++ code generator places the following line in the
-	// .pb.h files that it generates:
-	//   // @@protoc_insertion_point(namespace_scope)
-	// This line appears within the scope of the file's package namespace, but
-	// outside of any particular class.  Another plugin can then specify the
-	// insertion_point "namespace_scope" to generate additional classes or
-	// other declarations that should be placed in this scope.
-	//
-	// Note that if the line containing the insertion point begins with
-	// whitespace, the same whitespace will be added to every line of the
-	// inserted text.  This is useful for languages like Python, where
-	// indentation matters.  In these languages, the insertion point comment
-	// should be indented the same amount as any inserted code will need to be
-	// in order to work correctly in that context.
-	//
-	// The code generator that generates the initial file and the one which
-	// inserts into it must both run as part of a single invocation of protoc.
-	// Code generators are executed in the order in which they appear on the
-	// command line.
-	//
-	// If |insertion_point| is present, |name| must also be present.
-	InsertionPoint *string `protobuf:"bytes,2,opt,name=insertion_point,json=insertionPoint" json:"insertion_point,omitempty"`
-	// The file contents.
-	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *CodeGeneratorResponse_File) Reset()                    { *m = CodeGeneratorResponse_File{} }
-func (m *CodeGeneratorResponse_File) String() string            { return proto.CompactTextString(m) }
-func (*CodeGeneratorResponse_File) ProtoMessage()               {}
-func (*CodeGeneratorResponse_File) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2, 0} }
-
-func (m *CodeGeneratorResponse_File) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse_File) GetInsertionPoint() string {
-	if m != nil && m.InsertionPoint != nil {
-		return *m.InsertionPoint
-	}
-	return ""
-}
-
-func (m *CodeGeneratorResponse_File) GetContent() string {
-	if m != nil && m.Content != nil {
-		return *m.Content
-	}
-	return ""
-}
-
-func init() {
-	proto.RegisterType((*Version)(nil), "google.protobuf.compiler.Version")
-	proto.RegisterType((*CodeGeneratorRequest)(nil), "google.protobuf.compiler.CodeGeneratorRequest")
-	proto.RegisterType((*CodeGeneratorResponse)(nil), "google.protobuf.compiler.CodeGeneratorResponse")
-	proto.RegisterType((*CodeGeneratorResponse_File)(nil), "google.protobuf.compiler.CodeGeneratorResponse.File")
-}
-
-func init() { proto.RegisterFile("google/protobuf/compiler/plugin.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 417 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0xcf, 0x6a, 0x14, 0x41,
-	0x10, 0xc6, 0x19, 0x77, 0x63, 0x98, 0x8a, 0x64, 0x43, 0x13, 0xa5, 0x09, 0x39, 0x8c, 0x8b, 0xe2,
-	0x5c, 0x32, 0x0b, 0xc1, 0x8b, 0x78, 0x4b, 0x44, 0x3d, 0x78, 0x58, 0x1a, 0xf1, 0x20, 0xc8, 0x30,
-	0x99, 0xd4, 0x74, 0x5a, 0x66, 0xba, 0xc6, 0xee, 0x1e, 0xf1, 0x49, 0x7d, 0x0f, 0xdf, 0x40, 0xfa,
-	0xcf, 0x24, 0xb2, 0xb8, 0xa7, 0xee, 0xef, 0x57, 0xd5, 0xd5, 0x55, 0x1f, 0x05, 0x2f, 0x25, 0x91,
-	0xec, 0x71, 0x33, 0x1a, 0x72, 0x74, 0x33, 0x75, 0x9b, 0x96, 0x86, 0x51, 0xf5, 0x68, 0x36, 0x63,
-	0x3f, 0x49, 0xa5, 0xab, 0x10, 0x60, 0x3c, 0xa6, 0x55, 0x73, 0x5a, 0x35, 0xa7, 0x9d, 0x15, 0xbb,
-	0x05, 0x6e, 0xd1, 0xb6, 0x46, 0x8d, 0x8e, 0x4c, 0xcc, 0x5e, 0xb7, 0x70, 0xf8, 0x05, 0x8d, 0x55,
-	0xa4, 0xd9, 0x29, 0x1c, 0x0c, 0xcd, 0x77, 0x32, 0x3c, 0x2b, 0xb2, 0xf2, 0x40, 0x44, 0x11, 0xa8,
-	0xd2, 0x64, 0xf8, 0xa3, 0x44, 0xbd, 0xf0, 0x74, 0x6c, 0x5c, 0x7b, 0xc7, 0x17, 0x91, 0x06, 0xc1,
-	0x9e, 0xc1, 0x63, 0x3b, 0x75, 0x9d, 0xfa, 0xc5, 0x97, 0x45, 0x56, 0xe6, 0x22, 0xa9, 0xf5, 0x9f,
-	0x0c, 0x4e, 0xaf, 0xe9, 0x16, 0x3f, 0xa0, 0x46, 0xd3, 0x38, 0x32, 0x02, 0x7f, 0x4c, 0x68, 0x1d,
-	0x2b, 0xe1, 0xa4, 0x53, 0x3d, 0xd6, 0x8e, 0x6a, 0x19, 0x63, 0xc8, 0xb3, 0x62, 0x51, 0xe6, 0xe2,
-	0xd8, 0xf3, 0xcf, 0x94, 0x5e, 0x20, 0x3b, 0x87, 0x7c, 0x6c, 0x4c, 0x33, 0xa0, 0xc3, 0xd8, 0x4a,
-	0x2e, 0x1e, 0x00, 0xbb, 0x06, 0x08, 0xe3, 0xd4, 0xfe, 0x15, 0x5f, 0x15, 0x8b, 0xf2, 0xe8, 0xf2,
-	0x45, 0xb5, 0x6b, 0xcb, 0x7b, 0xd5, 0xe3, 0xbb, 0x7b, 0x03, 0xb6, 0x1e, 0x8b, 0x3c, 0x44, 0x7d,
-	0x84, 0x7d, 0x82, 0x93, 0xd9, 0xb8, 0xfa, 0x67, 0xf4, 0x24, 0x8c, 0x77, 0x74, 0xf9, 0xbc, 0xda,
-	0xe7, 0x70, 0x95, 0xcc, 0x13, 0xab, 0x99, 0x24, 0xb0, 0xfe, 0x9d, 0xc1, 0xd3, 0x9d, 0x99, 0xed,
-	0x48, 0xda, 0xa2, 0xf7, 0x0e, 0x8d, 0x49, 0x3e, 0xe7, 0x22, 0x0a, 0xf6, 0x11, 0x96, 0xff, 0x34,
-	0xff, 0x7a, 0xff, 0x8f, 0xff, 0x2d, 0x1a, 0x66, 0x13, 0xa1, 0xc2, 0xd9, 0x37, 0x58, 0x86, 0x79,
-	0x18, 0x2c, 0x75, 0x33, 0x60, 0xfa, 0x26, 0xdc, 0xd9, 0x2b, 0x58, 0x29, 0x6d, 0xd1, 0x38, 0x45,
-	0xba, 0x1e, 0x49, 0x69, 0x97, 0xcc, 0x3c, 0xbe, 0xc7, 0x5b, 0x4f, 0x19, 0x87, 0xc3, 0x96, 0xb4,
-	0x43, 0xed, 0xf8, 0x2a, 0x24, 0xcc, 0xf2, 0x4a, 0xc2, 0x79, 0x4b, 0xc3, 0xde, 0xfe, 0xae, 0x9e,
-	0x6c, 0xc3, 0x6e, 0x06, 0x7b, 0xed, 0xd7, 0x37, 0x52, 0xb9, 0xbb, 0xe9, 0xc6, 0x87, 0x37, 0x92,
-	0xfa, 0x46, 0xcb, 0x87, 0x65, 0x0c, 0x97, 0xf6, 0x42, 0xa2, 0xbe, 0x90, 0x94, 0x56, 0xfa, 0x6d,
-	0x3c, 0x6a, 0x49, 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x15, 0x40, 0xc5, 0xfe, 0x02, 0x00,
-	0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
deleted file mode 100644
index 8953d0ff82..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.pb.golden
+++ /dev/null
@@ -1,83 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: google/protobuf/compiler/plugin.proto
-// DO NOT EDIT!
-
-package google_protobuf_compiler
-
-import proto "github.com/golang/protobuf/proto"
-import "math"
-import google_protobuf "github.com/golang/protobuf/protoc-gen-go/descriptor"
-
-// Reference proto and math imports to suppress error if they are not otherwise used.
-var _ = proto.GetString
-var _ = math.Inf
-
-type CodeGeneratorRequest struct {
-	FileToGenerate   []string                               `protobuf:"bytes,1,rep,name=file_to_generate" json:"file_to_generate,omitempty"`
-	Parameter        *string                                `protobuf:"bytes,2,opt,name=parameter" json:"parameter,omitempty"`
-	ProtoFile        []*google_protobuf.FileDescriptorProto `protobuf:"bytes,15,rep,name=proto_file" json:"proto_file,omitempty"`
-	XXX_unrecognized []byte                                 `json:"-"`
-}
-
-func (this *CodeGeneratorRequest) Reset()         { *this = CodeGeneratorRequest{} }
-func (this *CodeGeneratorRequest) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorRequest) ProtoMessage()       {}
-
-func (this *CodeGeneratorRequest) GetParameter() string {
-	if this != nil && this.Parameter != nil {
-		return *this.Parameter
-	}
-	return ""
-}
-
-type CodeGeneratorResponse struct {
-	Error            *string                       `protobuf:"bytes,1,opt,name=error" json:"error,omitempty"`
-	File             []*CodeGeneratorResponse_File `protobuf:"bytes,15,rep,name=file" json:"file,omitempty"`
-	XXX_unrecognized []byte                        `json:"-"`
-}
-
-func (this *CodeGeneratorResponse) Reset()         { *this = CodeGeneratorResponse{} }
-func (this *CodeGeneratorResponse) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorResponse) ProtoMessage()       {}
-
-func (this *CodeGeneratorResponse) GetError() string {
-	if this != nil && this.Error != nil {
-		return *this.Error
-	}
-	return ""
-}
-
-type CodeGeneratorResponse_File struct {
-	Name             *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	InsertionPoint   *string `protobuf:"bytes,2,opt,name=insertion_point" json:"insertion_point,omitempty"`
-	Content          *string `protobuf:"bytes,15,opt,name=content" json:"content,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (this *CodeGeneratorResponse_File) Reset()         { *this = CodeGeneratorResponse_File{} }
-func (this *CodeGeneratorResponse_File) String() string { return proto.CompactTextString(this) }
-func (*CodeGeneratorResponse_File) ProtoMessage()       {}
-
-func (this *CodeGeneratorResponse_File) GetName() string {
-	if this != nil && this.Name != nil {
-		return *this.Name
-	}
-	return ""
-}
-
-func (this *CodeGeneratorResponse_File) GetInsertionPoint() string {
-	if this != nil && this.InsertionPoint != nil {
-		return *this.InsertionPoint
-	}
-	return ""
-}
-
-func (this *CodeGeneratorResponse_File) GetContent() string {
-	if this != nil && this.Content != nil {
-		return *this.Content
-	}
-	return ""
-}
-
-func init() {
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.proto
deleted file mode 100644
index 5b5574529e..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/plugin/plugin.proto
+++ /dev/null
@@ -1,167 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Author: kenton@google.com (Kenton Varda)
-//
-// WARNING:  The plugin interface is currently EXPERIMENTAL and is subject to
-//   change.
-//
-// protoc (aka the Protocol Compiler) can be extended via plugins.  A plugin is
-// just a program that reads a CodeGeneratorRequest from stdin and writes a
-// CodeGeneratorResponse to stdout.
-//
-// Plugins written using C++ can use google/protobuf/compiler/plugin.h instead
-// of dealing with the raw protocol defined here.
-//
-// A plugin executable needs only to be placed somewhere in the path.  The
-// plugin should be named "protoc-gen-$NAME", and will then be used when the
-// flag "--${NAME}_out" is passed to protoc.
-
-syntax = "proto2";
-package google.protobuf.compiler;
-option java_package = "com.google.protobuf.compiler";
-option java_outer_classname = "PluginProtos";
-
-option go_package = "github.com/golang/protobuf/protoc-gen-go/plugin;plugin_go";
-
-import "google/protobuf/descriptor.proto";
-
-// The version number of protocol compiler.
-message Version {
-  optional int32 major = 1;
-  optional int32 minor = 2;
-  optional int32 patch = 3;
-  // A suffix for alpha, beta or rc release, e.g., "alpha-1", "rc2". It should
-  // be empty for mainline stable releases.
-  optional string suffix = 4;
-}
-
-// An encoded CodeGeneratorRequest is written to the plugin's stdin.
-message CodeGeneratorRequest {
-  // The .proto files that were explicitly listed on the command-line.  The
-  // code generator should generate code only for these files.  Each file's
-  // descriptor will be included in proto_file, below.
-  repeated string file_to_generate = 1;
-
-  // The generator parameter passed on the command-line.
-  optional string parameter = 2;
-
-  // FileDescriptorProtos for all files in files_to_generate and everything
-  // they import.  The files will appear in topological order, so each file
-  // appears before any file that imports it.
-  //
-  // protoc guarantees that all proto_files will be written after
-  // the fields above, even though this is not technically guaranteed by the
-  // protobuf wire format.  This theoretically could allow a plugin to stream
-  // in the FileDescriptorProtos and handle them one by one rather than read
-  // the entire set into memory at once.  However, as of this writing, this
-  // is not similarly optimized on protoc's end -- it will store all fields in
-  // memory at once before sending them to the plugin.
-  //
-  // Type names of fields and extensions in the FileDescriptorProto are always
-  // fully qualified.
-  repeated FileDescriptorProto proto_file = 15;
-
-  // The version number of protocol compiler.
-  optional Version compiler_version = 3;
-
-}
-
-// The plugin writes an encoded CodeGeneratorResponse to stdout.
-message CodeGeneratorResponse {
-  // Error message.  If non-empty, code generation failed.  The plugin process
-  // should exit with status code zero even if it reports an error in this way.
-  //
-  // This should be used to indicate errors in .proto files which prevent the
-  // code generator from generating correct code.  Errors which indicate a
-  // problem in protoc itself -- such as the input CodeGeneratorRequest being
-  // unparseable -- should be reported by writing a message to stderr and
-  // exiting with a non-zero status code.
-  optional string error = 1;
-
-  // Represents a single generated file.
-  message File {
-    // The file name, relative to the output directory.  The name must not
-    // contain "." or ".." components and must be relative, not be absolute (so,
-    // the file cannot lie outside the output directory).  "/" must be used as
-    // the path separator, not "\".
-    //
-    // If the name is omitted, the content will be appended to the previous
-    // file.  This allows the generator to break large files into small chunks,
-    // and allows the generated text to be streamed back to protoc so that large
-    // files need not reside completely in memory at one time.  Note that as of
-    // this writing protoc does not optimize for this -- it will read the entire
-    // CodeGeneratorResponse before writing files to disk.
-    optional string name = 1;
-
-    // If non-empty, indicates that the named file should already exist, and the
-    // content here is to be inserted into that file at a defined insertion
-    // point.  This feature allows a code generator to extend the output
-    // produced by another code generator.  The original generator may provide
-    // insertion points by placing special annotations in the file that look
-    // like:
-    //   @@protoc_insertion_point(NAME)
-    // The annotation can have arbitrary text before and after it on the line,
-    // which allows it to be placed in a comment.  NAME should be replaced with
-    // an identifier naming the point -- this is what other generators will use
-    // as the insertion_point.  Code inserted at this point will be placed
-    // immediately above the line containing the insertion point (thus multiple
-    // insertions to the same point will come out in the order they were added).
-    // The double-@ is intended to make it unlikely that the generated code
-    // could contain things that look like insertion points by accident.
-    //
-    // For example, the C++ code generator places the following line in the
-    // .pb.h files that it generates:
-    //   // @@protoc_insertion_point(namespace_scope)
-    // This line appears within the scope of the file's package namespace, but
-    // outside of any particular class.  Another plugin can then specify the
-    // insertion_point "namespace_scope" to generate additional classes or
-    // other declarations that should be placed in this scope.
-    //
-    // Note that if the line containing the insertion point begins with
-    // whitespace, the same whitespace will be added to every line of the
-    // inserted text.  This is useful for languages like Python, where
-    // indentation matters.  In these languages, the insertion point comment
-    // should be indented the same amount as any inserted code will need to be
-    // in order to work correctly in that context.
-    //
-    // The code generator that generates the initial file and the one which
-    // inserts into it must both run as part of a single invocation of protoc.
-    // Code generators are executed in the order in which they appear on the
-    // command line.
-    //
-    // If |insertion_point| is present, |name| must also be present.
-    optional string insertion_point = 2;
-
-    // The file contents.
-    optional string content = 15;
-  }
-  repeated File file = 15;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile
deleted file mode 100644
index a0bf9fefd9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/Makefile
+++ /dev/null
@@ -1,73 +0,0 @@
-# Go support for Protocol Buffers - Google's data interchange format
-#
-# Copyright 2010 The Go Authors.  All rights reserved.
-# https://github.com/golang/protobuf
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-#     * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following disclaimer
-# in the documentation and/or other materials provided with the
-# distribution.
-#     * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-all:
-	@echo run make test
-
-include ../../Make.protobuf
-
-test:	golden testbuild
-
-#test:	golden testbuild extension_test
-#	./extension_test
-#	@echo PASS
-
-my_test/test.pb.go: my_test/test.proto
-	protoc --go_out=Mmulti/multi1.proto=github.com/golang/protobuf/protoc-gen-go/testdata/multi:. $<
-
-golden:
-	make -B my_test/test.pb.go
-	sed -i -e '/return.*fileDescriptor/d' my_test/test.pb.go
-	sed -i -e '/^var fileDescriptor/,/^}/d' my_test/test.pb.go
-	sed -i -e '/proto.RegisterFile.*fileDescriptor/d' my_test/test.pb.go
-	gofmt -w my_test/test.pb.go
-	diff -w my_test/test.pb.go my_test/test.pb.go.golden
-
-nuke:	clean
-
-testbuild:	regenerate
-	go test
-
-regenerate:
-	# Invoke protoc once to generate three independent .pb.go files in the same package.
-	protoc --go_out=. multi/multi1.proto multi/multi2.proto multi/multi3.proto
-
-#extension_test:	extension_test.$O
-#	$(LD) -L. -o $@ $<
-
-#multi.a: multi3.pb.$O multi2.pb.$O multi1.pb.$O
-#	rm -f multi.a
-#	$(QUOTED_GOBIN)/gopack grc $@ $<
-
-#test.pb.go:	imp.pb.go
-#multi1.pb.go:	multi2.pb.go multi3.pb.go
-#main.$O: imp.pb.$O test.pb.$O multi.a
-#extension_test.$O: extension_base.pb.$O extension_extra.pb.$O extension_user.pb.$O
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto
deleted file mode 100644
index 94acfc1bc9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_base.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package extension_base;
-
-message BaseMessage {
-  optional int32 height = 1;
-  extensions 4 to 9;
-  extensions 16 to max;
-}
-
-// Another message that may be extended, using message_set_wire_format.
-message OldStyleMessage {
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto
deleted file mode 100644
index fca7f600cc..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_extra.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package extension_extra;
-
-message ExtraMessage {
-  optional int32 width = 1;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go
deleted file mode 100644
index 86e9c118a6..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Test that we can use protocol buffers that use extensions.
-
-package testdata
-
-/*
-
-import (
-	"bytes"
-	"regexp"
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	base "extension_base.pb"
-	user "extension_user.pb"
-)
-
-func TestSingleFieldExtension(t *testing.T) {
-	bm := &base.BaseMessage{
-		Height: proto.Int32(178),
-	}
-
-	// Use extension within scope of another type.
-	vol := proto.Uint32(11)
-	err := proto.SetExtension(bm, user.E_LoudMessage_Volume, vol)
-	if err != nil {
-		t.Fatal("Failed setting extension:", err)
-	}
-	buf, err := proto.Marshal(bm)
-	if err != nil {
-		t.Fatal("Failed encoding message with extension:", err)
-	}
-	bm_new := new(base.BaseMessage)
-	if err := proto.Unmarshal(buf, bm_new); err != nil {
-		t.Fatal("Failed decoding message with extension:", err)
-	}
-	if !proto.HasExtension(bm_new, user.E_LoudMessage_Volume) {
-		t.Fatal("Decoded message didn't contain extension.")
-	}
-	vol_out, err := proto.GetExtension(bm_new, user.E_LoudMessage_Volume)
-	if err != nil {
-		t.Fatal("Failed getting extension:", err)
-	}
-	if v := vol_out.(*uint32); *v != *vol {
-		t.Errorf("vol_out = %v, expected %v", *v, *vol)
-	}
-	proto.ClearExtension(bm_new, user.E_LoudMessage_Volume)
-	if proto.HasExtension(bm_new, user.E_LoudMessage_Volume) {
-		t.Fatal("Failed clearing extension.")
-	}
-}
-
-func TestMessageExtension(t *testing.T) {
-	bm := &base.BaseMessage{
-		Height: proto.Int32(179),
-	}
-
-	// Use extension that is itself a message.
-	um := &user.UserMessage{
-		Name: proto.String("Dave"),
-		Rank: proto.String("Major"),
-	}
-	err := proto.SetExtension(bm, user.E_LoginMessage_UserMessage, um)
-	if err != nil {
-		t.Fatal("Failed setting extension:", err)
-	}
-	buf, err := proto.Marshal(bm)
-	if err != nil {
-		t.Fatal("Failed encoding message with extension:", err)
-	}
-	bm_new := new(base.BaseMessage)
-	if err := proto.Unmarshal(buf, bm_new); err != nil {
-		t.Fatal("Failed decoding message with extension:", err)
-	}
-	if !proto.HasExtension(bm_new, user.E_LoginMessage_UserMessage) {
-		t.Fatal("Decoded message didn't contain extension.")
-	}
-	um_out, err := proto.GetExtension(bm_new, user.E_LoginMessage_UserMessage)
-	if err != nil {
-		t.Fatal("Failed getting extension:", err)
-	}
-	if n := um_out.(*user.UserMessage).Name; *n != *um.Name {
-		t.Errorf("um_out.Name = %q, expected %q", *n, *um.Name)
-	}
-	if r := um_out.(*user.UserMessage).Rank; *r != *um.Rank {
-		t.Errorf("um_out.Rank = %q, expected %q", *r, *um.Rank)
-	}
-	proto.ClearExtension(bm_new, user.E_LoginMessage_UserMessage)
-	if proto.HasExtension(bm_new, user.E_LoginMessage_UserMessage) {
-		t.Fatal("Failed clearing extension.")
-	}
-}
-
-func TestTopLevelExtension(t *testing.T) {
-	bm := &base.BaseMessage{
-		Height: proto.Int32(179),
-	}
-
-	width := proto.Int32(17)
-	err := proto.SetExtension(bm, user.E_Width, width)
-	if err != nil {
-		t.Fatal("Failed setting extension:", err)
-	}
-	buf, err := proto.Marshal(bm)
-	if err != nil {
-		t.Fatal("Failed encoding message with extension:", err)
-	}
-	bm_new := new(base.BaseMessage)
-	if err := proto.Unmarshal(buf, bm_new); err != nil {
-		t.Fatal("Failed decoding message with extension:", err)
-	}
-	if !proto.HasExtension(bm_new, user.E_Width) {
-		t.Fatal("Decoded message didn't contain extension.")
-	}
-	width_out, err := proto.GetExtension(bm_new, user.E_Width)
-	if err != nil {
-		t.Fatal("Failed getting extension:", err)
-	}
-	if w := width_out.(*int32); *w != *width {
-		t.Errorf("width_out = %v, expected %v", *w, *width)
-	}
-	proto.ClearExtension(bm_new, user.E_Width)
-	if proto.HasExtension(bm_new, user.E_Width) {
-		t.Fatal("Failed clearing extension.")
-	}
-}
-
-func TestMessageSetWireFormat(t *testing.T) {
-	osm := new(base.OldStyleMessage)
-	osp := &user.OldStyleParcel{
-		Name:   proto.String("Dave"),
-		Height: proto.Int32(178),
-	}
-
-	err := proto.SetExtension(osm, user.E_OldStyleParcel_MessageSetExtension, osp)
-	if err != nil {
-		t.Fatal("Failed setting extension:", err)
-	}
-
-	buf, err := proto.Marshal(osm)
-	if err != nil {
-		t.Fatal("Failed encoding message:", err)
-	}
-
-	// Data generated from Python implementation.
-	expected := []byte{
-		11, 16, 209, 15, 26, 9, 10, 4, 68, 97, 118, 101, 16, 178, 1, 12,
-	}
-
-	if !bytes.Equal(expected, buf) {
-		t.Errorf("Encoding mismatch.\nwant %+v\n got %+v", expected, buf)
-	}
-
-	// Check that it is restored correctly.
-	osm = new(base.OldStyleMessage)
-	if err := proto.Unmarshal(buf, osm); err != nil {
-		t.Fatal("Failed decoding message:", err)
-	}
-	osp_out, err := proto.GetExtension(osm, user.E_OldStyleParcel_MessageSetExtension)
-	if err != nil {
-		t.Fatal("Failed getting extension:", err)
-	}
-	osp = osp_out.(*user.OldStyleParcel)
-	if *osp.Name != "Dave" || *osp.Height != 178 {
-		t.Errorf("Retrieved extension from decoded message is not correct: %+v", osp)
-	}
-}
-
-func main() {
-	// simpler than rigging up gotest
-	testing.Main(regexp.MatchString, []testing.InternalTest{
-		{"TestSingleFieldExtension", TestSingleFieldExtension},
-		{"TestMessageExtension", TestMessageExtension},
-		{"TestTopLevelExtension", TestTopLevelExtension},
-	},
-		[]testing.InternalBenchmark{},
-		[]testing.InternalExample{})
-}
-
-*/
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto
deleted file mode 100644
index ff65873dd2..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/extension_user.proto
+++ /dev/null
@@ -1,100 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "extension_base.proto";
-import "extension_extra.proto";
-
-package extension_user;
-
-message UserMessage {
-  optional string name = 1;
-  optional string rank = 2;
-}
-
-// Extend with a message
-extend extension_base.BaseMessage {
-  optional UserMessage user_message = 5;
-}
-
-// Extend with a foreign message
-extend extension_base.BaseMessage {
-  optional extension_extra.ExtraMessage extra_message = 9;
-}
-
-// Extend with some primitive types
-extend extension_base.BaseMessage {
-  optional int32 width = 6;
-  optional int64 area = 7;
-}
-
-// Extend inside the scope of another type
-message LoudMessage {
-  extend extension_base.BaseMessage {
-    optional uint32 volume = 8;
-  }
-  extensions 100 to max;
-}
-
-// Extend inside the scope of another type, using a message.
-message LoginMessage {
-  extend extension_base.BaseMessage {
-    optional UserMessage user_message = 16;
-  }
-}
-
-// Extend with a repeated field
-extend extension_base.BaseMessage {
-  repeated Detail detail = 17;
-}
-
-message Detail {
-  optional string color = 1;
-}
-
-// An extension of an extension
-message Announcement {
-  optional string words = 1;
-  extend LoudMessage {
-    optional Announcement loud_ext = 100;
-  }
-}
-
-// Something that can be put in a message set.
-message OldStyleParcel {
-  extend extension_base.OldStyleMessage {
-    optional OldStyleParcel message_set_extension = 2001;
-  }
-
-  required string name = 1;
-  optional int32 height = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto
deleted file mode 100644
index b8bc41acd8..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/grpc.proto
+++ /dev/null
@@ -1,59 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2015 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package grpc.testing;
-
-message SimpleRequest {
-}
-
-message SimpleResponse {
-}
-
-message StreamMsg {
-}
-
-message StreamMsg2 {
-}
-
-service Test {
-  rpc UnaryCall(SimpleRequest) returns (SimpleResponse);
-
-  // This RPC streams from the server only.
-  rpc Downstream(SimpleRequest) returns (stream StreamMsg);
-
-  // This RPC streams from the client.
-  rpc Upstream(stream StreamMsg) returns (SimpleResponse);
-
-  // This one streams in both directions.
-  rpc Bidi(stream StreamMsg) returns (stream StreamMsg2);
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden
deleted file mode 100644
index 784a4f865a..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.pb.go.golden
+++ /dev/null
@@ -1,113 +0,0 @@
-// Code generated by protoc-gen-go.
-// source: imp.proto
-// DO NOT EDIT!
-
-package imp
-
-import proto "github.com/golang/protobuf/proto"
-import "math"
-import "os"
-import imp1 "imp2.pb"
-
-// Reference proto & math imports to suppress error if they are not otherwise used.
-var _ = proto.GetString
-var _ = math.Inf
-
-// Types from public import imp2.proto
-type PubliclyImportedMessage imp1.PubliclyImportedMessage
-
-func (this *PubliclyImportedMessage) Reset() { (*imp1.PubliclyImportedMessage)(this).Reset() }
-func (this *PubliclyImportedMessage) String() string {
-	return (*imp1.PubliclyImportedMessage)(this).String()
-}
-
-// PubliclyImportedMessage from public import imp.proto
-
-type ImportedMessage_Owner int32
-
-const (
-	ImportedMessage_DAVE ImportedMessage_Owner = 1
-	ImportedMessage_MIKE ImportedMessage_Owner = 2
-)
-
-var ImportedMessage_Owner_name = map[int32]string{
-	1: "DAVE",
-	2: "MIKE",
-}
-var ImportedMessage_Owner_value = map[string]int32{
-	"DAVE": 1,
-	"MIKE": 2,
-}
-
-// NewImportedMessage_Owner is deprecated. Use x.Enum() instead.
-func NewImportedMessage_Owner(x ImportedMessage_Owner) *ImportedMessage_Owner {
-	e := ImportedMessage_Owner(x)
-	return &e
-}
-func (x ImportedMessage_Owner) Enum() *ImportedMessage_Owner {
-	p := new(ImportedMessage_Owner)
-	*p = x
-	return p
-}
-func (x ImportedMessage_Owner) String() string {
-	return proto.EnumName(ImportedMessage_Owner_name, int32(x))
-}
-
-type ImportedMessage struct {
-	Field            *int64           `protobuf:"varint,1,req,name=field" json:"field,omitempty"`
-	XXX_extensions   map[int32][]byte `json:",omitempty"`
-	XXX_unrecognized []byte           `json:",omitempty"`
-}
-
-func (this *ImportedMessage) Reset()         { *this = ImportedMessage{} }
-func (this *ImportedMessage) String() string { return proto.CompactTextString(this) }
-
-var extRange_ImportedMessage = []proto.ExtensionRange{
-	proto.ExtensionRange{90, 100},
-}
-
-func (*ImportedMessage) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ImportedMessage
-}
-func (this *ImportedMessage) ExtensionMap() map[int32][]byte {
-	if this.XXX_extensions == nil {
-		this.XXX_extensions = make(map[int32][]byte)
-	}
-	return this.XXX_extensions
-}
-
-type ImportedExtendable struct {
-	XXX_extensions   map[int32][]byte `json:",omitempty"`
-	XXX_unrecognized []byte           `json:",omitempty"`
-}
-
-func (this *ImportedExtendable) Reset()         { *this = ImportedExtendable{} }
-func (this *ImportedExtendable) String() string { return proto.CompactTextString(this) }
-
-func (this *ImportedExtendable) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(this.ExtensionMap())
-}
-func (this *ImportedExtendable) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, this.ExtensionMap())
-}
-// ensure ImportedExtendable satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*ImportedExtendable)(nil)
-var _ proto.Unmarshaler = (*ImportedExtendable)(nil)
-
-var extRange_ImportedExtendable = []proto.ExtensionRange{
-	proto.ExtensionRange{100, 536870911},
-}
-
-func (*ImportedExtendable) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_ImportedExtendable
-}
-func (this *ImportedExtendable) ExtensionMap() map[int32][]byte {
-	if this.XXX_extensions == nil {
-		this.XXX_extensions = make(map[int32][]byte)
-	}
-	return this.XXX_extensions
-}
-
-func init() {
-	proto.RegisterEnum("imp.ImportedMessage_Owner", ImportedMessage_Owner_name, ImportedMessage_Owner_value)
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto
deleted file mode 100644
index 156e078d12..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp.proto
+++ /dev/null
@@ -1,70 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package imp;
-
-import "imp2.proto";
-import "imp3.proto";
-
-message ImportedMessage {
-  required int64 field = 1;
-
-  // The forwarded getters for these fields are fiddly to get right.
-  optional ImportedMessage2 local_msg = 2;
-  optional ForeignImportedMessage foreign_msg = 3;  // in imp3.proto
-  optional Owner enum_field = 4;
-  oneof union {
-    int32 state = 9;
-  }
-
-  repeated string name = 5;
-  repeated Owner boss = 6;
-  repeated ImportedMessage2 memo = 7;
-
-  map<string, ImportedMessage2> msg_map = 8;
-
-  enum Owner {
-    DAVE = 1;
-    MIKE = 2;
-  }
-
-  extensions 90 to 100;
-}
-
-message ImportedMessage2 {
-}
-
-message ImportedExtendable {
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto
deleted file mode 100644
index 3bb0632b29..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp2.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2011 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package imp;
-
-message PubliclyImportedMessage {
-  optional int64 field = 1;
-}
-
-enum PubliclyImportedEnum {
-  GLASSES = 1;
-  HAIR = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto
deleted file mode 100644
index 58fc7598bf..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/imp3.proto
+++ /dev/null
@@ -1,38 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2012 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package imp;
-
-message ForeignImportedMessage {
-  optional string tuber = 1;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go
deleted file mode 100644
index f9b5ccf203..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/main_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// A simple binary to link together the protocol buffers in this test.
-
-package testdata
-
-import (
-	"testing"
-
-	mytestpb "./my_test"
-	multipb "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
-)
-
-func TestLink(t *testing.T) {
-	_ = &multipb.Multi1{}
-	_ = &mytestpb.Request{}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto
deleted file mode 100644
index 0da6e0af4b..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi1.proto
+++ /dev/null
@@ -1,44 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-import "multi/multi2.proto";
-import "multi/multi3.proto";
-
-package multitest;
-
-message Multi1 {
-  required Multi2 multi2 = 1;
-  optional Multi2.Color color = 2;
-  optional Multi3.HatType hat_type = 3;
-}
-
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto
deleted file mode 100644
index e6bfc71b3c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi2.proto
+++ /dev/null
@@ -1,46 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package multitest;
-
-message Multi2 {
-  required int32 required_value = 1;
-
-  enum Color {
-    BLUE = 1;
-    GREEN = 2;
-    RED = 3;
-  };
-  optional Color color = 2;
-}
-
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto
deleted file mode 100644
index 146c255bd2..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/multi/multi3.proto
+++ /dev/null
@@ -1,43 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-package multitest;
-
-message Multi3 {
-  enum HatType {
-    FEDORA = 1;
-    FEZ = 2;
-  };
-  optional HatType hat_type = 1;
-}
-
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go
deleted file mode 100644
index 1954e3fb7d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go
+++ /dev/null
@@ -1,870 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: my_test/test.proto
-
-/*
-Package my_test is a generated protocol buffer package.
-
-This package holds interesting messages.
-
-It is generated from these files:
-	my_test/test.proto
-
-It has these top-level messages:
-	Request
-	Reply
-	OtherBase
-	ReplyExtensions
-	OtherReplyExtensions
-	OldReply
-	Communique
-*/
-package my_test
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type HatType int32
-
-const (
-	// deliberately skipping 0
-	HatType_FEDORA HatType = 1
-	HatType_FEZ    HatType = 2
-)
-
-var HatType_name = map[int32]string{
-	1: "FEDORA",
-	2: "FEZ",
-}
-var HatType_value = map[string]int32{
-	"FEDORA": 1,
-	"FEZ":    2,
-}
-
-func (x HatType) Enum() *HatType {
-	p := new(HatType)
-	*p = x
-	return p
-}
-func (x HatType) String() string {
-	return proto.EnumName(HatType_name, int32(x))
-}
-func (x *HatType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(HatType_value, data, "HatType")
-	if err != nil {
-		return err
-	}
-	*x = HatType(value)
-	return nil
-}
-
-// This enum represents days of the week.
-type Days int32
-
-const (
-	Days_MONDAY  Days = 1
-	Days_TUESDAY Days = 2
-	Days_LUNDI   Days = 1
-)
-
-var Days_name = map[int32]string{
-	1: "MONDAY",
-	2: "TUESDAY",
-	// Duplicate value: 1: "LUNDI",
-}
-var Days_value = map[string]int32{
-	"MONDAY":  1,
-	"TUESDAY": 2,
-	"LUNDI":   1,
-}
-
-func (x Days) Enum() *Days {
-	p := new(Days)
-	*p = x
-	return p
-}
-func (x Days) String() string {
-	return proto.EnumName(Days_name, int32(x))
-}
-func (x *Days) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Days_value, data, "Days")
-	if err != nil {
-		return err
-	}
-	*x = Days(value)
-	return nil
-}
-
-type Request_Color int32
-
-const (
-	Request_RED   Request_Color = 0
-	Request_GREEN Request_Color = 1
-	Request_BLUE  Request_Color = 2
-)
-
-var Request_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Request_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Request_Color) Enum() *Request_Color {
-	p := new(Request_Color)
-	*p = x
-	return p
-}
-func (x Request_Color) String() string {
-	return proto.EnumName(Request_Color_name, int32(x))
-}
-func (x *Request_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Request_Color_value, data, "Request_Color")
-	if err != nil {
-		return err
-	}
-	*x = Request_Color(value)
-	return nil
-}
-
-type Reply_Entry_Game int32
-
-const (
-	Reply_Entry_FOOTBALL Reply_Entry_Game = 1
-	Reply_Entry_TENNIS   Reply_Entry_Game = 2
-)
-
-var Reply_Entry_Game_name = map[int32]string{
-	1: "FOOTBALL",
-	2: "TENNIS",
-}
-var Reply_Entry_Game_value = map[string]int32{
-	"FOOTBALL": 1,
-	"TENNIS":   2,
-}
-
-func (x Reply_Entry_Game) Enum() *Reply_Entry_Game {
-	p := new(Reply_Entry_Game)
-	*p = x
-	return p
-}
-func (x Reply_Entry_Game) String() string {
-	return proto.EnumName(Reply_Entry_Game_name, int32(x))
-}
-func (x *Reply_Entry_Game) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Reply_Entry_Game_value, data, "Reply_Entry_Game")
-	if err != nil {
-		return err
-	}
-	*x = Reply_Entry_Game(value)
-	return nil
-}
-
-// This is a message that might be sent somewhere.
-type Request struct {
-	Key []int64 `protobuf:"varint,1,rep,name=key" json:"key,omitempty"`
-	//  optional imp.ImportedMessage imported_message = 2;
-	Hue *Request_Color `protobuf:"varint,3,opt,name=hue,enum=my.test.Request_Color" json:"hue,omitempty"`
-	Hat *HatType       `protobuf:"varint,4,opt,name=hat,enum=my.test.HatType,def=1" json:"hat,omitempty"`
-	//  optional imp.ImportedMessage.Owner owner = 6;
-	Deadline  *float32           `protobuf:"fixed32,7,opt,name=deadline,def=inf" json:"deadline,omitempty"`
-	Somegroup *Request_SomeGroup `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
-	// This is a map field. It will generate map[int32]string.
-	NameMapping map[int32]string `protobuf:"bytes,14,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// This is a map field whose value type is a message.
-	MsgMapping map[int64]*Reply `protobuf:"bytes,15,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Reset_     *int32           `protobuf:"varint,12,opt,name=reset" json:"reset,omitempty"`
-	// This field should not conflict with any getters.
-	GetKey_          *string `protobuf:"bytes,16,opt,name=get_key,json=getKey" json:"get_key,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Request) Reset()         { *m = Request{} }
-func (m *Request) String() string { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()    {}
-
-const Default_Request_Hat HatType = HatType_FEDORA
-
-var Default_Request_Deadline float32 = float32(math.Inf(1))
-
-func (m *Request) GetKey() []int64 {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Request) GetHue() Request_Color {
-	if m != nil && m.Hue != nil {
-		return *m.Hue
-	}
-	return Request_RED
-}
-
-func (m *Request) GetHat() HatType {
-	if m != nil && m.Hat != nil {
-		return *m.Hat
-	}
-	return Default_Request_Hat
-}
-
-func (m *Request) GetDeadline() float32 {
-	if m != nil && m.Deadline != nil {
-		return *m.Deadline
-	}
-	return Default_Request_Deadline
-}
-
-func (m *Request) GetSomegroup() *Request_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *Request) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *Request) GetMsgMapping() map[int64]*Reply {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *Request) GetReset_() int32 {
-	if m != nil && m.Reset_ != nil {
-		return *m.Reset_
-	}
-	return 0
-}
-
-func (m *Request) GetGetKey_() string {
-	if m != nil && m.GetKey_ != nil {
-		return *m.GetKey_
-	}
-	return ""
-}
-
-type Request_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Request_SomeGroup) Reset()         { *m = Request_SomeGroup{} }
-func (m *Request_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Request_SomeGroup) ProtoMessage()    {}
-
-func (m *Request_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Reply struct {
-	Found                        []*Reply_Entry `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
-	CompactKeys                  []int32        `protobuf:"varint,2,rep,packed,name=compact_keys,json=compactKeys" json:"compact_keys,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Reply) Reset()         { *m = Reply{} }
-func (m *Reply) String() string { return proto.CompactTextString(m) }
-func (*Reply) ProtoMessage()    {}
-
-var extRange_Reply = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Reply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Reply
-}
-
-func (m *Reply) GetFound() []*Reply_Entry {
-	if m != nil {
-		return m.Found
-	}
-	return nil
-}
-
-func (m *Reply) GetCompactKeys() []int32 {
-	if m != nil {
-		return m.CompactKeys
-	}
-	return nil
-}
-
-type Reply_Entry struct {
-	KeyThatNeeds_1234Camel_CasIng *int64 `protobuf:"varint,1,req,name=key_that_needs_1234camel_CasIng,json=keyThatNeeds1234camelCasIng" json:"key_that_needs_1234camel_CasIng,omitempty"`
-	Value                         *int64 `protobuf:"varint,2,opt,name=value,def=7" json:"value,omitempty"`
-	XMyFieldName_2                *int64 `protobuf:"varint,3,opt,name=_my_field_name_2,json=MyFieldName2" json:"_my_field_name_2,omitempty"`
-	XXX_unrecognized              []byte `json:"-"`
-}
-
-func (m *Reply_Entry) Reset()         { *m = Reply_Entry{} }
-func (m *Reply_Entry) String() string { return proto.CompactTextString(m) }
-func (*Reply_Entry) ProtoMessage()    {}
-
-const Default_Reply_Entry_Value int64 = 7
-
-func (m *Reply_Entry) GetKeyThatNeeds_1234Camel_CasIng() int64 {
-	if m != nil && m.KeyThatNeeds_1234Camel_CasIng != nil {
-		return *m.KeyThatNeeds_1234Camel_CasIng
-	}
-	return 0
-}
-
-func (m *Reply_Entry) GetValue() int64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return Default_Reply_Entry_Value
-}
-
-func (m *Reply_Entry) GetXMyFieldName_2() int64 {
-	if m != nil && m.XMyFieldName_2 != nil {
-		return *m.XMyFieldName_2
-	}
-	return 0
-}
-
-type OtherBase struct {
-	Name                         *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OtherBase) Reset()         { *m = OtherBase{} }
-func (m *OtherBase) String() string { return proto.CompactTextString(m) }
-func (*OtherBase) ProtoMessage()    {}
-
-var extRange_OtherBase = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*OtherBase) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OtherBase
-}
-
-func (m *OtherBase) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type ReplyExtensions struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ReplyExtensions) Reset()         { *m = ReplyExtensions{} }
-func (m *ReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*ReplyExtensions) ProtoMessage()    {}
-
-var E_ReplyExtensions_Time = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.time",
-	Tag:           "fixed64,101,opt,name=time",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Carrot = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         105,
-	Name:          "my.test.ReplyExtensions.carrot",
-	Tag:           "bytes,105,opt,name=carrot",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherBase)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.donut",
-	Tag:           "bytes,101,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-type OtherReplyExtensions struct {
-	Key              *int32 `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *OtherReplyExtensions) Reset()         { *m = OtherReplyExtensions{} }
-func (m *OtherReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*OtherReplyExtensions) ProtoMessage()    {}
-
-func (m *OtherReplyExtensions) GetKey() int32 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-type OldReply struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OldReply) Reset()         { *m = OldReply{} }
-func (m *OldReply) String() string { return proto.CompactTextString(m) }
-func (*OldReply) ProtoMessage()    {}
-
-func (m *OldReply) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
-}
-func (m *OldReply) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
-}
-
-// ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*OldReply)(nil)
-var _ proto.Unmarshaler = (*OldReply)(nil)
-
-var extRange_OldReply = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*OldReply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OldReply
-}
-
-type Communique struct {
-	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
-	// This is a oneof, called "union".
-	//
-	// Types that are valid to be assigned to Union:
-	//	*Communique_Number
-	//	*Communique_Name
-	//	*Communique_Data
-	//	*Communique_TempC
-	//	*Communique_Height
-	//	*Communique_Today
-	//	*Communique_Maybe
-	//	*Communique_Delta_
-	//	*Communique_Msg
-	//	*Communique_Somegroup
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Communique) Reset()         { *m = Communique{} }
-func (m *Communique) String() string { return proto.CompactTextString(m) }
-func (*Communique) ProtoMessage()    {}
-
-type isCommunique_Union interface {
-	isCommunique_Union()
-}
-
-type Communique_Number struct {
-	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
-}
-type Communique_Name struct {
-	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
-}
-type Communique_Data struct {
-	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
-}
-type Communique_TempC struct {
-	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
-}
-type Communique_Height struct {
-	Height float32 `protobuf:"fixed32,9,opt,name=height,oneof"`
-}
-type Communique_Today struct {
-	Today Days `protobuf:"varint,10,opt,name=today,enum=my.test.Days,oneof"`
-}
-type Communique_Maybe struct {
-	Maybe bool `protobuf:"varint,11,opt,name=maybe,oneof"`
-}
-type Communique_Delta_ struct {
-	Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof"`
-}
-type Communique_Msg struct {
-	Msg *Reply `protobuf:"bytes,13,opt,name=msg,oneof"`
-}
-type Communique_Somegroup struct {
-	Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof"`
-}
-
-func (*Communique_Number) isCommunique_Union()    {}
-func (*Communique_Name) isCommunique_Union()      {}
-func (*Communique_Data) isCommunique_Union()      {}
-func (*Communique_TempC) isCommunique_Union()     {}
-func (*Communique_Height) isCommunique_Union()    {}
-func (*Communique_Today) isCommunique_Union()     {}
-func (*Communique_Maybe) isCommunique_Union()     {}
-func (*Communique_Delta_) isCommunique_Union()    {}
-func (*Communique_Msg) isCommunique_Union()       {}
-func (*Communique_Somegroup) isCommunique_Union() {}
-
-func (m *Communique) GetUnion() isCommunique_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *Communique) GetMakeMeCry() bool {
-	if m != nil && m.MakeMeCry != nil {
-		return *m.MakeMeCry
-	}
-	return false
-}
-
-func (m *Communique) GetNumber() int32 {
-	if x, ok := m.GetUnion().(*Communique_Number); ok {
-		return x.Number
-	}
-	return 0
-}
-
-func (m *Communique) GetName() string {
-	if x, ok := m.GetUnion().(*Communique_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Communique) GetData() []byte {
-	if x, ok := m.GetUnion().(*Communique_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *Communique) GetTempC() float64 {
-	if x, ok := m.GetUnion().(*Communique_TempC); ok {
-		return x.TempC
-	}
-	return 0
-}
-
-func (m *Communique) GetHeight() float32 {
-	if x, ok := m.GetUnion().(*Communique_Height); ok {
-		return x.Height
-	}
-	return 0
-}
-
-func (m *Communique) GetToday() Days {
-	if x, ok := m.GetUnion().(*Communique_Today); ok {
-		return x.Today
-	}
-	return Days_MONDAY
-}
-
-func (m *Communique) GetMaybe() bool {
-	if x, ok := m.GetUnion().(*Communique_Maybe); ok {
-		return x.Maybe
-	}
-	return false
-}
-
-func (m *Communique) GetDelta() int32 {
-	if x, ok := m.GetUnion().(*Communique_Delta_); ok {
-		return x.Delta
-	}
-	return 0
-}
-
-func (m *Communique) GetMsg() *Reply {
-	if x, ok := m.GetUnion().(*Communique_Msg); ok {
-		return x.Msg
-	}
-	return nil
-}
-
-func (m *Communique) GetSomegroup() *Communique_SomeGroup {
-	if x, ok := m.GetUnion().(*Communique_Somegroup); ok {
-		return x.Somegroup
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
-		(*Communique_Number)(nil),
-		(*Communique_Name)(nil),
-		(*Communique_Data)(nil),
-		(*Communique_TempC)(nil),
-		(*Communique_Height)(nil),
-		(*Communique_Today)(nil),
-		(*Communique_Maybe)(nil),
-		(*Communique_Delta_)(nil),
-		(*Communique_Msg)(nil),
-		(*Communique_Somegroup)(nil),
-	}
-}
-
-func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Number))
-	case *Communique_Name:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case *Communique_Data:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *Communique_TempC:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.TempC))
-	case *Communique_Height:
-		b.EncodeVarint(9<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.Height)))
-	case *Communique_Today:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		t := uint64(0)
-		if x.Maybe {
-			t = 1
-		}
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Communique_Delta_:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.Delta))
-	case *Communique_Msg:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Msg); err != nil {
-			return err
-		}
-	case *Communique_Somegroup:
-		b.EncodeVarint(14<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Somegroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		return fmt.Errorf("Communique.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Communique)
-	switch tag {
-	case 5: // union.number
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Number{int32(x)}
-		return true, err
-	case 6: // union.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Communique_Name{x}
-		return true, err
-	case 7: // union.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Communique_Data{x}
-		return true, err
-	case 8: // union.temp_c
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Communique_TempC{math.Float64frombits(x)}
-		return true, err
-	case 9: // union.height
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Communique_Height{math.Float32frombits(uint32(x))}
-		return true, err
-	case 10: // union.today
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Today{Days(x)}
-		return true, err
-	case 11: // union.maybe
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Maybe{x != 0}
-		return true, err
-	case 12: // union.delta
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.Union = &Communique_Delta_{int32(x)}
-		return true, err
-	case 13: // union.msg
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Reply)
-		err := b.DecodeMessage(msg)
-		m.Union = &Communique_Msg{msg}
-		return true, err
-	case 14: // union.somegroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Communique_SomeGroup)
-		err := b.DecodeGroup(msg)
-		m.Union = &Communique_Somegroup{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Communique_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Number))
-	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
-		n += 8
-	case *Communique_Height:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed32)
-		n += 4
-	case *Communique_Today:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
-		n += 1
-	case *Communique_Delta_:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.Delta) << 1) ^ uint32((int32(x.Delta) >> 31))))
-	case *Communique_Msg:
-		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Communique_Somegroup:
-		n += proto.SizeVarint(14<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Somegroup)
-		n += proto.SizeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Communique_SomeGroup struct {
-	Member           *string `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Communique_SomeGroup) Reset()         { *m = Communique_SomeGroup{} }
-func (m *Communique_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Communique_SomeGroup) ProtoMessage()    {}
-
-func (m *Communique_SomeGroup) GetMember() string {
-	if m != nil && m.Member != nil {
-		return *m.Member
-	}
-	return ""
-}
-
-type Communique_Delta struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Communique_Delta) Reset()         { *m = Communique_Delta{} }
-func (m *Communique_Delta) String() string { return proto.CompactTextString(m) }
-func (*Communique_Delta) ProtoMessage()    {}
-
-var E_Tag = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         103,
-	Name:          "my.test.tag",
-	Tag:           "bytes,103,opt,name=tag",
-	Filename:      "my_test/test.proto",
-}
-
-var E_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*OtherReplyExtensions)(nil),
-	Field:         106,
-	Name:          "my.test.donut",
-	Tag:           "bytes,106,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-func init() {
-	proto.RegisterType((*Request)(nil), "my.test.Request")
-	proto.RegisterType((*Request_SomeGroup)(nil), "my.test.Request.SomeGroup")
-	proto.RegisterType((*Reply)(nil), "my.test.Reply")
-	proto.RegisterType((*Reply_Entry)(nil), "my.test.Reply.Entry")
-	proto.RegisterType((*OtherBase)(nil), "my.test.OtherBase")
-	proto.RegisterType((*ReplyExtensions)(nil), "my.test.ReplyExtensions")
-	proto.RegisterType((*OtherReplyExtensions)(nil), "my.test.OtherReplyExtensions")
-	proto.RegisterType((*OldReply)(nil), "my.test.OldReply")
-	proto.RegisterType((*Communique)(nil), "my.test.Communique")
-	proto.RegisterType((*Communique_SomeGroup)(nil), "my.test.Communique.SomeGroup")
-	proto.RegisterType((*Communique_Delta)(nil), "my.test.Communique.Delta")
-	proto.RegisterEnum("my.test.HatType", HatType_name, HatType_value)
-	proto.RegisterEnum("my.test.Days", Days_name, Days_value)
-	proto.RegisterEnum("my.test.Request_Color", Request_Color_name, Request_Color_value)
-	proto.RegisterEnum("my.test.Reply_Entry_Game", Reply_Entry_Game_name, Reply_Entry_Game_value)
-	proto.RegisterExtension(E_ReplyExtensions_Time)
-	proto.RegisterExtension(E_ReplyExtensions_Carrot)
-	proto.RegisterExtension(E_ReplyExtensions_Donut)
-	proto.RegisterExtension(E_Tag)
-	proto.RegisterExtension(E_Donut)
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden
deleted file mode 100644
index 1954e3fb7d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.pb.go.golden
+++ /dev/null
@@ -1,870 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: my_test/test.proto
-
-/*
-Package my_test is a generated protocol buffer package.
-
-This package holds interesting messages.
-
-It is generated from these files:
-	my_test/test.proto
-
-It has these top-level messages:
-	Request
-	Reply
-	OtherBase
-	ReplyExtensions
-	OtherReplyExtensions
-	OldReply
-	Communique
-*/
-package my_test
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-import _ "github.com/golang/protobuf/protoc-gen-go/testdata/multi"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-type HatType int32
-
-const (
-	// deliberately skipping 0
-	HatType_FEDORA HatType = 1
-	HatType_FEZ    HatType = 2
-)
-
-var HatType_name = map[int32]string{
-	1: "FEDORA",
-	2: "FEZ",
-}
-var HatType_value = map[string]int32{
-	"FEDORA": 1,
-	"FEZ":    2,
-}
-
-func (x HatType) Enum() *HatType {
-	p := new(HatType)
-	*p = x
-	return p
-}
-func (x HatType) String() string {
-	return proto.EnumName(HatType_name, int32(x))
-}
-func (x *HatType) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(HatType_value, data, "HatType")
-	if err != nil {
-		return err
-	}
-	*x = HatType(value)
-	return nil
-}
-
-// This enum represents days of the week.
-type Days int32
-
-const (
-	Days_MONDAY  Days = 1
-	Days_TUESDAY Days = 2
-	Days_LUNDI   Days = 1
-)
-
-var Days_name = map[int32]string{
-	1: "MONDAY",
-	2: "TUESDAY",
-	// Duplicate value: 1: "LUNDI",
-}
-var Days_value = map[string]int32{
-	"MONDAY":  1,
-	"TUESDAY": 2,
-	"LUNDI":   1,
-}
-
-func (x Days) Enum() *Days {
-	p := new(Days)
-	*p = x
-	return p
-}
-func (x Days) String() string {
-	return proto.EnumName(Days_name, int32(x))
-}
-func (x *Days) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Days_value, data, "Days")
-	if err != nil {
-		return err
-	}
-	*x = Days(value)
-	return nil
-}
-
-type Request_Color int32
-
-const (
-	Request_RED   Request_Color = 0
-	Request_GREEN Request_Color = 1
-	Request_BLUE  Request_Color = 2
-)
-
-var Request_Color_name = map[int32]string{
-	0: "RED",
-	1: "GREEN",
-	2: "BLUE",
-}
-var Request_Color_value = map[string]int32{
-	"RED":   0,
-	"GREEN": 1,
-	"BLUE":  2,
-}
-
-func (x Request_Color) Enum() *Request_Color {
-	p := new(Request_Color)
-	*p = x
-	return p
-}
-func (x Request_Color) String() string {
-	return proto.EnumName(Request_Color_name, int32(x))
-}
-func (x *Request_Color) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Request_Color_value, data, "Request_Color")
-	if err != nil {
-		return err
-	}
-	*x = Request_Color(value)
-	return nil
-}
-
-type Reply_Entry_Game int32
-
-const (
-	Reply_Entry_FOOTBALL Reply_Entry_Game = 1
-	Reply_Entry_TENNIS   Reply_Entry_Game = 2
-)
-
-var Reply_Entry_Game_name = map[int32]string{
-	1: "FOOTBALL",
-	2: "TENNIS",
-}
-var Reply_Entry_Game_value = map[string]int32{
-	"FOOTBALL": 1,
-	"TENNIS":   2,
-}
-
-func (x Reply_Entry_Game) Enum() *Reply_Entry_Game {
-	p := new(Reply_Entry_Game)
-	*p = x
-	return p
-}
-func (x Reply_Entry_Game) String() string {
-	return proto.EnumName(Reply_Entry_Game_name, int32(x))
-}
-func (x *Reply_Entry_Game) UnmarshalJSON(data []byte) error {
-	value, err := proto.UnmarshalJSONEnum(Reply_Entry_Game_value, data, "Reply_Entry_Game")
-	if err != nil {
-		return err
-	}
-	*x = Reply_Entry_Game(value)
-	return nil
-}
-
-// This is a message that might be sent somewhere.
-type Request struct {
-	Key []int64 `protobuf:"varint,1,rep,name=key" json:"key,omitempty"`
-	//  optional imp.ImportedMessage imported_message = 2;
-	Hue *Request_Color `protobuf:"varint,3,opt,name=hue,enum=my.test.Request_Color" json:"hue,omitempty"`
-	Hat *HatType       `protobuf:"varint,4,opt,name=hat,enum=my.test.HatType,def=1" json:"hat,omitempty"`
-	//  optional imp.ImportedMessage.Owner owner = 6;
-	Deadline  *float32           `protobuf:"fixed32,7,opt,name=deadline,def=inf" json:"deadline,omitempty"`
-	Somegroup *Request_SomeGroup `protobuf:"group,8,opt,name=SomeGroup,json=somegroup" json:"somegroup,omitempty"`
-	// This is a map field. It will generate map[int32]string.
-	NameMapping map[int32]string `protobuf:"bytes,14,rep,name=name_mapping,json=nameMapping" json:"name_mapping,omitempty" protobuf_key:"varint,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	// This is a map field whose value type is a message.
-	MsgMapping map[int64]*Reply `protobuf:"bytes,15,rep,name=msg_mapping,json=msgMapping" json:"msg_mapping,omitempty" protobuf_key:"zigzag64,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-	Reset_     *int32           `protobuf:"varint,12,opt,name=reset" json:"reset,omitempty"`
-	// This field should not conflict with any getters.
-	GetKey_          *string `protobuf:"bytes,16,opt,name=get_key,json=getKey" json:"get_key,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Request) Reset()         { *m = Request{} }
-func (m *Request) String() string { return proto.CompactTextString(m) }
-func (*Request) ProtoMessage()    {}
-
-const Default_Request_Hat HatType = HatType_FEDORA
-
-var Default_Request_Deadline float32 = float32(math.Inf(1))
-
-func (m *Request) GetKey() []int64 {
-	if m != nil {
-		return m.Key
-	}
-	return nil
-}
-
-func (m *Request) GetHue() Request_Color {
-	if m != nil && m.Hue != nil {
-		return *m.Hue
-	}
-	return Request_RED
-}
-
-func (m *Request) GetHat() HatType {
-	if m != nil && m.Hat != nil {
-		return *m.Hat
-	}
-	return Default_Request_Hat
-}
-
-func (m *Request) GetDeadline() float32 {
-	if m != nil && m.Deadline != nil {
-		return *m.Deadline
-	}
-	return Default_Request_Deadline
-}
-
-func (m *Request) GetSomegroup() *Request_SomeGroup {
-	if m != nil {
-		return m.Somegroup
-	}
-	return nil
-}
-
-func (m *Request) GetNameMapping() map[int32]string {
-	if m != nil {
-		return m.NameMapping
-	}
-	return nil
-}
-
-func (m *Request) GetMsgMapping() map[int64]*Reply {
-	if m != nil {
-		return m.MsgMapping
-	}
-	return nil
-}
-
-func (m *Request) GetReset_() int32 {
-	if m != nil && m.Reset_ != nil {
-		return *m.Reset_
-	}
-	return 0
-}
-
-func (m *Request) GetGetKey_() string {
-	if m != nil && m.GetKey_ != nil {
-		return *m.GetKey_
-	}
-	return ""
-}
-
-type Request_SomeGroup struct {
-	GroupField       *int32 `protobuf:"varint,9,opt,name=group_field,json=groupField" json:"group_field,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Request_SomeGroup) Reset()         { *m = Request_SomeGroup{} }
-func (m *Request_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Request_SomeGroup) ProtoMessage()    {}
-
-func (m *Request_SomeGroup) GetGroupField() int32 {
-	if m != nil && m.GroupField != nil {
-		return *m.GroupField
-	}
-	return 0
-}
-
-type Reply struct {
-	Found                        []*Reply_Entry `protobuf:"bytes,1,rep,name=found" json:"found,omitempty"`
-	CompactKeys                  []int32        `protobuf:"varint,2,rep,packed,name=compact_keys,json=compactKeys" json:"compact_keys,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *Reply) Reset()         { *m = Reply{} }
-func (m *Reply) String() string { return proto.CompactTextString(m) }
-func (*Reply) ProtoMessage()    {}
-
-var extRange_Reply = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*Reply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_Reply
-}
-
-func (m *Reply) GetFound() []*Reply_Entry {
-	if m != nil {
-		return m.Found
-	}
-	return nil
-}
-
-func (m *Reply) GetCompactKeys() []int32 {
-	if m != nil {
-		return m.CompactKeys
-	}
-	return nil
-}
-
-type Reply_Entry struct {
-	KeyThatNeeds_1234Camel_CasIng *int64 `protobuf:"varint,1,req,name=key_that_needs_1234camel_CasIng,json=keyThatNeeds1234camelCasIng" json:"key_that_needs_1234camel_CasIng,omitempty"`
-	Value                         *int64 `protobuf:"varint,2,opt,name=value,def=7" json:"value,omitempty"`
-	XMyFieldName_2                *int64 `protobuf:"varint,3,opt,name=_my_field_name_2,json=MyFieldName2" json:"_my_field_name_2,omitempty"`
-	XXX_unrecognized              []byte `json:"-"`
-}
-
-func (m *Reply_Entry) Reset()         { *m = Reply_Entry{} }
-func (m *Reply_Entry) String() string { return proto.CompactTextString(m) }
-func (*Reply_Entry) ProtoMessage()    {}
-
-const Default_Reply_Entry_Value int64 = 7
-
-func (m *Reply_Entry) GetKeyThatNeeds_1234Camel_CasIng() int64 {
-	if m != nil && m.KeyThatNeeds_1234Camel_CasIng != nil {
-		return *m.KeyThatNeeds_1234Camel_CasIng
-	}
-	return 0
-}
-
-func (m *Reply_Entry) GetValue() int64 {
-	if m != nil && m.Value != nil {
-		return *m.Value
-	}
-	return Default_Reply_Entry_Value
-}
-
-func (m *Reply_Entry) GetXMyFieldName_2() int64 {
-	if m != nil && m.XMyFieldName_2 != nil {
-		return *m.XMyFieldName_2
-	}
-	return 0
-}
-
-type OtherBase struct {
-	Name                         *string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"`
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OtherBase) Reset()         { *m = OtherBase{} }
-func (m *OtherBase) String() string { return proto.CompactTextString(m) }
-func (*OtherBase) ProtoMessage()    {}
-
-var extRange_OtherBase = []proto.ExtensionRange{
-	{100, 536870911},
-}
-
-func (*OtherBase) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OtherBase
-}
-
-func (m *OtherBase) GetName() string {
-	if m != nil && m.Name != nil {
-		return *m.Name
-	}
-	return ""
-}
-
-type ReplyExtensions struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *ReplyExtensions) Reset()         { *m = ReplyExtensions{} }
-func (m *ReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*ReplyExtensions) ProtoMessage()    {}
-
-var E_ReplyExtensions_Time = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*float64)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.time",
-	Tag:           "fixed64,101,opt,name=time",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Carrot = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         105,
-	Name:          "my.test.ReplyExtensions.carrot",
-	Tag:           "bytes,105,opt,name=carrot",
-	Filename:      "my_test/test.proto",
-}
-
-var E_ReplyExtensions_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*OtherBase)(nil),
-	ExtensionType: (*ReplyExtensions)(nil),
-	Field:         101,
-	Name:          "my.test.ReplyExtensions.donut",
-	Tag:           "bytes,101,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-type OtherReplyExtensions struct {
-	Key              *int32 `protobuf:"varint,1,opt,name=key" json:"key,omitempty"`
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *OtherReplyExtensions) Reset()         { *m = OtherReplyExtensions{} }
-func (m *OtherReplyExtensions) String() string { return proto.CompactTextString(m) }
-func (*OtherReplyExtensions) ProtoMessage()    {}
-
-func (m *OtherReplyExtensions) GetKey() int32 {
-	if m != nil && m.Key != nil {
-		return *m.Key
-	}
-	return 0
-}
-
-type OldReply struct {
-	proto.XXX_InternalExtensions `json:"-"`
-	XXX_unrecognized             []byte `json:"-"`
-}
-
-func (m *OldReply) Reset()         { *m = OldReply{} }
-func (m *OldReply) String() string { return proto.CompactTextString(m) }
-func (*OldReply) ProtoMessage()    {}
-
-func (m *OldReply) Marshal() ([]byte, error) {
-	return proto.MarshalMessageSet(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) Unmarshal(buf []byte) error {
-	return proto.UnmarshalMessageSet(buf, &m.XXX_InternalExtensions)
-}
-func (m *OldReply) MarshalJSON() ([]byte, error) {
-	return proto.MarshalMessageSetJSON(&m.XXX_InternalExtensions)
-}
-func (m *OldReply) UnmarshalJSON(buf []byte) error {
-	return proto.UnmarshalMessageSetJSON(buf, &m.XXX_InternalExtensions)
-}
-
-// ensure OldReply satisfies proto.Marshaler and proto.Unmarshaler
-var _ proto.Marshaler = (*OldReply)(nil)
-var _ proto.Unmarshaler = (*OldReply)(nil)
-
-var extRange_OldReply = []proto.ExtensionRange{
-	{100, 2147483646},
-}
-
-func (*OldReply) ExtensionRangeArray() []proto.ExtensionRange {
-	return extRange_OldReply
-}
-
-type Communique struct {
-	MakeMeCry *bool `protobuf:"varint,1,opt,name=make_me_cry,json=makeMeCry" json:"make_me_cry,omitempty"`
-	// This is a oneof, called "union".
-	//
-	// Types that are valid to be assigned to Union:
-	//	*Communique_Number
-	//	*Communique_Name
-	//	*Communique_Data
-	//	*Communique_TempC
-	//	*Communique_Height
-	//	*Communique_Today
-	//	*Communique_Maybe
-	//	*Communique_Delta_
-	//	*Communique_Msg
-	//	*Communique_Somegroup
-	Union            isCommunique_Union `protobuf_oneof:"union"`
-	XXX_unrecognized []byte             `json:"-"`
-}
-
-func (m *Communique) Reset()         { *m = Communique{} }
-func (m *Communique) String() string { return proto.CompactTextString(m) }
-func (*Communique) ProtoMessage()    {}
-
-type isCommunique_Union interface {
-	isCommunique_Union()
-}
-
-type Communique_Number struct {
-	Number int32 `protobuf:"varint,5,opt,name=number,oneof"`
-}
-type Communique_Name struct {
-	Name string `protobuf:"bytes,6,opt,name=name,oneof"`
-}
-type Communique_Data struct {
-	Data []byte `protobuf:"bytes,7,opt,name=data,oneof"`
-}
-type Communique_TempC struct {
-	TempC float64 `protobuf:"fixed64,8,opt,name=temp_c,json=tempC,oneof"`
-}
-type Communique_Height struct {
-	Height float32 `protobuf:"fixed32,9,opt,name=height,oneof"`
-}
-type Communique_Today struct {
-	Today Days `protobuf:"varint,10,opt,name=today,enum=my.test.Days,oneof"`
-}
-type Communique_Maybe struct {
-	Maybe bool `protobuf:"varint,11,opt,name=maybe,oneof"`
-}
-type Communique_Delta_ struct {
-	Delta int32 `protobuf:"zigzag32,12,opt,name=delta,oneof"`
-}
-type Communique_Msg struct {
-	Msg *Reply `protobuf:"bytes,13,opt,name=msg,oneof"`
-}
-type Communique_Somegroup struct {
-	Somegroup *Communique_SomeGroup `protobuf:"group,14,opt,name=SomeGroup,json=somegroup,oneof"`
-}
-
-func (*Communique_Number) isCommunique_Union()    {}
-func (*Communique_Name) isCommunique_Union()      {}
-func (*Communique_Data) isCommunique_Union()      {}
-func (*Communique_TempC) isCommunique_Union()     {}
-func (*Communique_Height) isCommunique_Union()    {}
-func (*Communique_Today) isCommunique_Union()     {}
-func (*Communique_Maybe) isCommunique_Union()     {}
-func (*Communique_Delta_) isCommunique_Union()    {}
-func (*Communique_Msg) isCommunique_Union()       {}
-func (*Communique_Somegroup) isCommunique_Union() {}
-
-func (m *Communique) GetUnion() isCommunique_Union {
-	if m != nil {
-		return m.Union
-	}
-	return nil
-}
-
-func (m *Communique) GetMakeMeCry() bool {
-	if m != nil && m.MakeMeCry != nil {
-		return *m.MakeMeCry
-	}
-	return false
-}
-
-func (m *Communique) GetNumber() int32 {
-	if x, ok := m.GetUnion().(*Communique_Number); ok {
-		return x.Number
-	}
-	return 0
-}
-
-func (m *Communique) GetName() string {
-	if x, ok := m.GetUnion().(*Communique_Name); ok {
-		return x.Name
-	}
-	return ""
-}
-
-func (m *Communique) GetData() []byte {
-	if x, ok := m.GetUnion().(*Communique_Data); ok {
-		return x.Data
-	}
-	return nil
-}
-
-func (m *Communique) GetTempC() float64 {
-	if x, ok := m.GetUnion().(*Communique_TempC); ok {
-		return x.TempC
-	}
-	return 0
-}
-
-func (m *Communique) GetHeight() float32 {
-	if x, ok := m.GetUnion().(*Communique_Height); ok {
-		return x.Height
-	}
-	return 0
-}
-
-func (m *Communique) GetToday() Days {
-	if x, ok := m.GetUnion().(*Communique_Today); ok {
-		return x.Today
-	}
-	return Days_MONDAY
-}
-
-func (m *Communique) GetMaybe() bool {
-	if x, ok := m.GetUnion().(*Communique_Maybe); ok {
-		return x.Maybe
-	}
-	return false
-}
-
-func (m *Communique) GetDelta() int32 {
-	if x, ok := m.GetUnion().(*Communique_Delta_); ok {
-		return x.Delta
-	}
-	return 0
-}
-
-func (m *Communique) GetMsg() *Reply {
-	if x, ok := m.GetUnion().(*Communique_Msg); ok {
-		return x.Msg
-	}
-	return nil
-}
-
-func (m *Communique) GetSomegroup() *Communique_SomeGroup {
-	if x, ok := m.GetUnion().(*Communique_Somegroup); ok {
-		return x.Somegroup
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Communique) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Communique_OneofMarshaler, _Communique_OneofUnmarshaler, _Communique_OneofSizer, []interface{}{
-		(*Communique_Number)(nil),
-		(*Communique_Name)(nil),
-		(*Communique_Data)(nil),
-		(*Communique_TempC)(nil),
-		(*Communique_Height)(nil),
-		(*Communique_Today)(nil),
-		(*Communique_Maybe)(nil),
-		(*Communique_Delta_)(nil),
-		(*Communique_Msg)(nil),
-		(*Communique_Somegroup)(nil),
-	}
-}
-
-func _Communique_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		b.EncodeVarint(5<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Number))
-	case *Communique_Name:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.Name)
-	case *Communique_Data:
-		b.EncodeVarint(7<<3 | proto.WireBytes)
-		b.EncodeRawBytes(x.Data)
-	case *Communique_TempC:
-		b.EncodeVarint(8<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.TempC))
-	case *Communique_Height:
-		b.EncodeVarint(9<<3 | proto.WireFixed32)
-		b.EncodeFixed32(uint64(math.Float32bits(x.Height)))
-	case *Communique_Today:
-		b.EncodeVarint(10<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		t := uint64(0)
-		if x.Maybe {
-			t = 1
-		}
-		b.EncodeVarint(11<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Communique_Delta_:
-		b.EncodeVarint(12<<3 | proto.WireVarint)
-		b.EncodeZigzag32(uint64(x.Delta))
-	case *Communique_Msg:
-		b.EncodeVarint(13<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.Msg); err != nil {
-			return err
-		}
-	case *Communique_Somegroup:
-		b.EncodeVarint(14<<3 | proto.WireStartGroup)
-		if err := b.Marshal(x.Somegroup); err != nil {
-			return err
-		}
-		b.EncodeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		return fmt.Errorf("Communique.Union has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Communique_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Communique)
-	switch tag {
-	case 5: // union.number
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Number{int32(x)}
-		return true, err
-	case 6: // union.name
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Union = &Communique_Name{x}
-		return true, err
-	case 7: // union.data
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeRawBytes(true)
-		m.Union = &Communique_Data{x}
-		return true, err
-	case 8: // union.temp_c
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Union = &Communique_TempC{math.Float64frombits(x)}
-		return true, err
-	case 9: // union.height
-		if wire != proto.WireFixed32 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed32()
-		m.Union = &Communique_Height{math.Float32frombits(uint32(x))}
-		return true, err
-	case 10: // union.today
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Today{Days(x)}
-		return true, err
-	case 11: // union.maybe
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Union = &Communique_Maybe{x != 0}
-		return true, err
-	case 12: // union.delta
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeZigzag32()
-		m.Union = &Communique_Delta_{int32(x)}
-		return true, err
-	case 13: // union.msg
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Reply)
-		err := b.DecodeMessage(msg)
-		m.Union = &Communique_Msg{msg}
-		return true, err
-	case 14: // union.somegroup
-		if wire != proto.WireStartGroup {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Communique_SomeGroup)
-		err := b.DecodeGroup(msg)
-		m.Union = &Communique_Somegroup{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Communique_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Communique)
-	// union
-	switch x := m.Union.(type) {
-	case *Communique_Number:
-		n += proto.SizeVarint(5<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Number))
-	case *Communique_Name:
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Name)))
-		n += len(x.Name)
-	case *Communique_Data:
-		n += proto.SizeVarint(7<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.Data)))
-		n += len(x.Data)
-	case *Communique_TempC:
-		n += proto.SizeVarint(8<<3 | proto.WireFixed64)
-		n += 8
-	case *Communique_Height:
-		n += proto.SizeVarint(9<<3 | proto.WireFixed32)
-		n += 4
-	case *Communique_Today:
-		n += proto.SizeVarint(10<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.Today))
-	case *Communique_Maybe:
-		n += proto.SizeVarint(11<<3 | proto.WireVarint)
-		n += 1
-	case *Communique_Delta_:
-		n += proto.SizeVarint(12<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64((uint32(x.Delta) << 1) ^ uint32((int32(x.Delta) >> 31))))
-	case *Communique_Msg:
-		s := proto.Size(x.Msg)
-		n += proto.SizeVarint(13<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Communique_Somegroup:
-		n += proto.SizeVarint(14<<3 | proto.WireStartGroup)
-		n += proto.Size(x.Somegroup)
-		n += proto.SizeVarint(14<<3 | proto.WireEndGroup)
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-type Communique_SomeGroup struct {
-	Member           *string `protobuf:"bytes,15,opt,name=member" json:"member,omitempty"`
-	XXX_unrecognized []byte  `json:"-"`
-}
-
-func (m *Communique_SomeGroup) Reset()         { *m = Communique_SomeGroup{} }
-func (m *Communique_SomeGroup) String() string { return proto.CompactTextString(m) }
-func (*Communique_SomeGroup) ProtoMessage()    {}
-
-func (m *Communique_SomeGroup) GetMember() string {
-	if m != nil && m.Member != nil {
-		return *m.Member
-	}
-	return ""
-}
-
-type Communique_Delta struct {
-	XXX_unrecognized []byte `json:"-"`
-}
-
-func (m *Communique_Delta) Reset()         { *m = Communique_Delta{} }
-func (m *Communique_Delta) String() string { return proto.CompactTextString(m) }
-func (*Communique_Delta) ProtoMessage()    {}
-
-var E_Tag = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*string)(nil),
-	Field:         103,
-	Name:          "my.test.tag",
-	Tag:           "bytes,103,opt,name=tag",
-	Filename:      "my_test/test.proto",
-}
-
-var E_Donut = &proto.ExtensionDesc{
-	ExtendedType:  (*Reply)(nil),
-	ExtensionType: (*OtherReplyExtensions)(nil),
-	Field:         106,
-	Name:          "my.test.donut",
-	Tag:           "bytes,106,opt,name=donut",
-	Filename:      "my_test/test.proto",
-}
-
-func init() {
-	proto.RegisterType((*Request)(nil), "my.test.Request")
-	proto.RegisterType((*Request_SomeGroup)(nil), "my.test.Request.SomeGroup")
-	proto.RegisterType((*Reply)(nil), "my.test.Reply")
-	proto.RegisterType((*Reply_Entry)(nil), "my.test.Reply.Entry")
-	proto.RegisterType((*OtherBase)(nil), "my.test.OtherBase")
-	proto.RegisterType((*ReplyExtensions)(nil), "my.test.ReplyExtensions")
-	proto.RegisterType((*OtherReplyExtensions)(nil), "my.test.OtherReplyExtensions")
-	proto.RegisterType((*OldReply)(nil), "my.test.OldReply")
-	proto.RegisterType((*Communique)(nil), "my.test.Communique")
-	proto.RegisterType((*Communique_SomeGroup)(nil), "my.test.Communique.SomeGroup")
-	proto.RegisterType((*Communique_Delta)(nil), "my.test.Communique.Delta")
-	proto.RegisterEnum("my.test.HatType", HatType_name, HatType_value)
-	proto.RegisterEnum("my.test.Days", Days_name, Days_value)
-	proto.RegisterEnum("my.test.Request_Color", Request_Color_name, Request_Color_value)
-	proto.RegisterEnum("my.test.Reply_Entry_Game", Reply_Entry_Game_name, Reply_Entry_Game_value)
-	proto.RegisterExtension(E_ReplyExtensions_Time)
-	proto.RegisterExtension(E_ReplyExtensions_Carrot)
-	proto.RegisterExtension(E_ReplyExtensions_Donut)
-	proto.RegisterExtension(E_Tag)
-	proto.RegisterExtension(E_Donut)
-}
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto
deleted file mode 100644
index 8e7094632d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/my_test/test.proto
+++ /dev/null
@@ -1,156 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2010 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto2";
-
-// This package holds interesting messages.
-package my.test;  // dotted package name
-
-//import "imp.proto";
-import "multi/multi1.proto";  // unused import
-
-enum HatType {
-  // deliberately skipping 0
-  FEDORA = 1;
-  FEZ = 2;
-}
-
-// This enum represents days of the week.
-enum Days {
-  option allow_alias = true;
-
-  MONDAY = 1;
-  TUESDAY = 2;
-  LUNDI = 1;  // same value as MONDAY
-}
-
-// This is a message that might be sent somewhere.
-message Request {
-  enum Color {
-    RED = 0;
-    GREEN = 1;
-    BLUE = 2;
-  }
-  repeated int64 key = 1;
-//  optional imp.ImportedMessage imported_message = 2;
-  optional Color hue = 3; // no default
-  optional HatType hat = 4 [default=FEDORA];
-//  optional imp.ImportedMessage.Owner owner = 6;
-  optional float deadline = 7 [default=inf];
-  optional group SomeGroup = 8 {
-    optional int32 group_field = 9;
-  }
-
-  // These foreign types are in imp2.proto,
-  // which is publicly imported by imp.proto.
-//  optional imp.PubliclyImportedMessage pub = 10;
-//  optional imp.PubliclyImportedEnum pub_enum = 13 [default=HAIR];
-
-
-  // This is a map field. It will generate map[int32]string.
-  map<int32, string> name_mapping = 14;
-  // This is a map field whose value type is a message.
-  map<sint64, Reply> msg_mapping = 15;
-
-  optional int32 reset = 12;
-  // This field should not conflict with any getters.
-  optional string get_key = 16;
-}
-
-message Reply {
-  message Entry {
-    required int64 key_that_needs_1234camel_CasIng = 1;
-    optional int64 value = 2 [default=7];
-    optional int64 _my_field_name_2 = 3;
-    enum Game {
-      FOOTBALL = 1;
-      TENNIS = 2;
-    }
-  }
-  repeated Entry found = 1;
-  repeated int32 compact_keys = 2 [packed=true];
-  extensions 100 to max;
-}
-
-message OtherBase {
-  optional string name = 1;
-  extensions 100 to max;
-}
-
-message ReplyExtensions {
-  extend Reply {
-    optional double time = 101;
-    optional ReplyExtensions carrot = 105;
-  }
-  extend OtherBase {
-    optional ReplyExtensions donut = 101;
-  }
-}
-
-message OtherReplyExtensions {
-  optional int32 key = 1;
-}
-
-// top-level extension
-extend Reply {
-  optional string tag = 103;
-  optional OtherReplyExtensions donut = 106;
-//  optional imp.ImportedMessage elephant = 107;  // extend with message from another file.
-}
-
-message OldReply {
-  // Extensions will be encoded in MessageSet wire format.
-  option message_set_wire_format = true;
-  extensions 100 to max;
-}
-
-message Communique {
-  optional bool make_me_cry = 1;
-
-  // This is a oneof, called "union".
-  oneof union {
-    int32 number = 5;
-    string name = 6;
-    bytes data = 7;
-    double temp_c = 8;
-    float height = 9;
-    Days today = 10;
-    bool maybe = 11;
-    sint32 delta = 12;  // name will conflict with Delta below
-    Reply msg = 13;
-    group SomeGroup = 14 {
-      optional string member = 15;
-    }
-  }
-
-  message Delta {}
-}
-
diff --git a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto b/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto
deleted file mode 100644
index 869b9af5a7..0000000000
--- a/installer/vendor/github.com/golang/protobuf/protoc-gen-go/testdata/proto3.proto
+++ /dev/null
@@ -1,53 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2014 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package proto3;
-
-message Request {
-  enum Flavour {
-    SWEET = 0;
-    SOUR = 1;
-    UMAMI = 2;
-    GOPHERLICIOUS = 3;
-  }
-  string name = 1;
-  repeated int64 key = 2;
-  Flavour taste = 3;
-  Book book = 4;
-  repeated int64 unpacked = 5 [packed=false];
-}
-
-message Book {
-  string title = 1;
-  bytes raw_data = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/any.go b/installer/vendor/github.com/golang/protobuf/ptypes/any.go
deleted file mode 100644
index b2af97f4a9..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/any.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-// This file implements functions to marshal proto.Message to/from
-// google.protobuf.Any message.
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-
-	"github.com/golang/protobuf/proto"
-	"github.com/golang/protobuf/ptypes/any"
-)
-
-const googleApis = "type.googleapis.com/"
-
-// AnyMessageName returns the name of the message contained in a google.protobuf.Any message.
-//
-// Note that regular type assertions should be done using the Is
-// function. AnyMessageName is provided for less common use cases like filtering a
-// sequence of Any messages based on a set of allowed message type names.
-func AnyMessageName(any *any.Any) (string, error) {
-	if any == nil {
-		return "", fmt.Errorf("message is nil")
-	}
-	slash := strings.LastIndex(any.TypeUrl, "/")
-	if slash < 0 {
-		return "", fmt.Errorf("message type url %q is invalid", any.TypeUrl)
-	}
-	return any.TypeUrl[slash+1:], nil
-}
-
-// MarshalAny takes the protocol buffer and encodes it into google.protobuf.Any.
-func MarshalAny(pb proto.Message) (*any.Any, error) {
-	value, err := proto.Marshal(pb)
-	if err != nil {
-		return nil, err
-	}
-	return &any.Any{TypeUrl: googleApis + proto.MessageName(pb), Value: value}, nil
-}
-
-// DynamicAny is a value that can be passed to UnmarshalAny to automatically
-// allocate a proto.Message for the type specified in a google.protobuf.Any
-// message. The allocated message is stored in the embedded proto.Message.
-//
-// Example:
-//
-//   var x ptypes.DynamicAny
-//   if err := ptypes.UnmarshalAny(a, &x); err != nil { ... }
-//   fmt.Printf("unmarshaled message: %v", x.Message)
-type DynamicAny struct {
-	proto.Message
-}
-
-// Empty returns a new proto.Message of the type specified in a
-// google.protobuf.Any message. It returns an error if corresponding message
-// type isn't linked in.
-func Empty(any *any.Any) (proto.Message, error) {
-	aname, err := AnyMessageName(any)
-	if err != nil {
-		return nil, err
-	}
-
-	t := proto.MessageType(aname)
-	if t == nil {
-		return nil, fmt.Errorf("any: message type %q isn't linked in", aname)
-	}
-	return reflect.New(t.Elem()).Interface().(proto.Message), nil
-}
-
-// UnmarshalAny parses the protocol buffer representation in a google.protobuf.Any
-// message and places the decoded result in pb. It returns an error if type of
-// contents of Any message does not match type of pb message.
-//
-// pb can be a proto.Message, or a *DynamicAny.
-func UnmarshalAny(any *any.Any, pb proto.Message) error {
-	if d, ok := pb.(*DynamicAny); ok {
-		if d.Message == nil {
-			var err error
-			d.Message, err = Empty(any)
-			if err != nil {
-				return err
-			}
-		}
-		return UnmarshalAny(any, d.Message)
-	}
-
-	aname, err := AnyMessageName(any)
-	if err != nil {
-		return err
-	}
-
-	mname := proto.MessageName(pb)
-	if aname != mname {
-		return fmt.Errorf("mismatched message type: got %q want %q", aname, mname)
-	}
-	return proto.Unmarshal(any.Value, pb)
-}
-
-// Is returns true if any value contains a given message type.
-func Is(any *any.Any, pb proto.Message) bool {
-	aname, err := AnyMessageName(any)
-	if err != nil {
-		return false
-	}
-
-	return aname == proto.MessageName(pb)
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
deleted file mode 100644
index f34601723d..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/any/any.pb.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/any.proto
-
-/*
-Package any is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/any.proto
-
-It has these top-level messages:
-	Any
-*/
-package any
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// `Any` contains an arbitrary serialized protocol buffer message along with a
-// URL that describes the type of the serialized message.
-//
-// Protobuf library provides support to pack/unpack Any values in the form
-// of utility functions or additional generated methods of the Any type.
-//
-// Example 1: Pack and unpack a message in C++.
-//
-//     Foo foo = ...;
-//     Any any;
-//     any.PackFrom(foo);
-//     ...
-//     if (any.UnpackTo(&foo)) {
-//       ...
-//     }
-//
-// Example 2: Pack and unpack a message in Java.
-//
-//     Foo foo = ...;
-//     Any any = Any.pack(foo);
-//     ...
-//     if (any.is(Foo.class)) {
-//       foo = any.unpack(Foo.class);
-//     }
-//
-//  Example 3: Pack and unpack a message in Python.
-//
-//     foo = Foo(...)
-//     any = Any()
-//     any.Pack(foo)
-//     ...
-//     if any.Is(Foo.DESCRIPTOR):
-//       any.Unpack(foo)
-//       ...
-//
-//  Example 4: Pack and unpack a message in Go
-//
-//      foo := &pb.Foo{...}
-//      any, err := ptypes.MarshalAny(foo)
-//      ...
-//      foo := &pb.Foo{}
-//      if err := ptypes.UnmarshalAny(any, foo); err != nil {
-//        ...
-//      }
-//
-// The pack methods provided by protobuf library will by default use
-// 'type.googleapis.com/full.type.name' as the type URL and the unpack
-// methods only use the fully qualified type name after the last '/'
-// in the type URL, for example "foo.bar.com/x/y.z" will yield type
-// name "y.z".
-//
-//
-// JSON
-// ====
-// The JSON representation of an `Any` value uses the regular
-// representation of the deserialized, embedded message, with an
-// additional field `@type` which contains the type URL. Example:
-//
-//     package google.profile;
-//     message Person {
-//       string first_name = 1;
-//       string last_name = 2;
-//     }
-//
-//     {
-//       "@type": "type.googleapis.com/google.profile.Person",
-//       "firstName": <string>,
-//       "lastName": <string>
-//     }
-//
-// If the embedded message type is well-known and has a custom JSON
-// representation, that representation will be embedded adding a field
-// `value` which holds the custom JSON in addition to the `@type`
-// field. Example (for message [google.protobuf.Duration][]):
-//
-//     {
-//       "@type": "type.googleapis.com/google.protobuf.Duration",
-//       "value": "1.212s"
-//     }
-//
-type Any struct {
-	// A URL/resource name whose content describes the type of the
-	// serialized protocol buffer message.
-	//
-	// For URLs which use the scheme `http`, `https`, or no scheme, the
-	// following restrictions and interpretations apply:
-	//
-	// * If no scheme is provided, `https` is assumed.
-	// * The last segment of the URL's path must represent the fully
-	//   qualified name of the type (as in `path/google.protobuf.Duration`).
-	//   The name should be in a canonical form (e.g., leading "." is
-	//   not accepted).
-	// * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-	//   value in binary format, or produce an error.
-	// * Applications are allowed to cache lookup results based on the
-	//   URL, or have them precompiled into a binary to avoid any
-	//   lookup. Therefore, binary compatibility needs to be preserved
-	//   on changes to types. (Use versioned type names to manage
-	//   breaking changes.)
-	//
-	// Schemes other than `http`, `https` (or the empty scheme) might be
-	// used with implementation specific semantics.
-	//
-	TypeUrl string `protobuf:"bytes,1,opt,name=type_url,json=typeUrl" json:"type_url,omitempty"`
-	// Must be a valid serialized protocol buffer of the above specified type.
-	Value []byte `protobuf:"bytes,2,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (m *Any) Reset()                    { *m = Any{} }
-func (m *Any) String() string            { return proto.CompactTextString(m) }
-func (*Any) ProtoMessage()               {}
-func (*Any) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Any) XXX_WellKnownType() string   { return "Any" }
-
-func (m *Any) GetTypeUrl() string {
-	if m != nil {
-		return m.TypeUrl
-	}
-	return ""
-}
-
-func (m *Any) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Any)(nil), "google.protobuf.Any")
-}
-
-func init() { proto.RegisterFile("google/protobuf/any.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 185 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4c, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcc, 0xab, 0xd4,
-	0x03, 0x73, 0x84, 0xf8, 0x21, 0x52, 0x7a, 0x30, 0x29, 0x25, 0x33, 0x2e, 0x66, 0xc7, 0xbc, 0x4a,
-	0x21, 0x49, 0x2e, 0x8e, 0x92, 0xca, 0x82, 0xd4, 0xf8, 0xd2, 0xa2, 0x1c, 0x09, 0x46, 0x05, 0x46,
-	0x0d, 0xce, 0x20, 0x76, 0x10, 0x3f, 0xb4, 0x28, 0x47, 0x48, 0x84, 0x8b, 0xb5, 0x2c, 0x31, 0xa7,
-	0x34, 0x55, 0x82, 0x49, 0x81, 0x51, 0x83, 0x27, 0x08, 0xc2, 0x71, 0xca, 0xe7, 0x12, 0x4e, 0xce,
-	0xcf, 0xd5, 0x43, 0x33, 0xce, 0x89, 0xc3, 0x31, 0xaf, 0x32, 0x00, 0xc4, 0x09, 0x60, 0x8c, 0x52,
-	0x4d, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf, 0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc,
-	0x4b, 0x47, 0xb8, 0xa8, 0x00, 0x64, 0x7a, 0x31, 0xc8, 0x61, 0x8b, 0x98, 0x98, 0xdd, 0x03, 0x9c,
-	0x56, 0x31, 0xc9, 0xb9, 0x43, 0x8c, 0x0a, 0x80, 0x2a, 0xd1, 0x0b, 0x4f, 0xcd, 0xc9, 0xf1, 0xce,
-	0xcb, 0x2f, 0xcf, 0x0b, 0x01, 0x29, 0x4d, 0x62, 0x03, 0xeb, 0x35, 0x06, 0x04, 0x00, 0x00, 0xff,
-	0xff, 0x13, 0xf8, 0xe8, 0x42, 0xdd, 0x00, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/any/any.proto b/installer/vendor/github.com/golang/protobuf/ptypes/any/any.proto
deleted file mode 100644
index c748667623..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/any/any.proto
+++ /dev/null
@@ -1,149 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option go_package = "github.com/golang/protobuf/ptypes/any";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "AnyProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// `Any` contains an arbitrary serialized protocol buffer message along with a
-// URL that describes the type of the serialized message.
-//
-// Protobuf library provides support to pack/unpack Any values in the form
-// of utility functions or additional generated methods of the Any type.
-//
-// Example 1: Pack and unpack a message in C++.
-//
-//     Foo foo = ...;
-//     Any any;
-//     any.PackFrom(foo);
-//     ...
-//     if (any.UnpackTo(&foo)) {
-//       ...
-//     }
-//
-// Example 2: Pack and unpack a message in Java.
-//
-//     Foo foo = ...;
-//     Any any = Any.pack(foo);
-//     ...
-//     if (any.is(Foo.class)) {
-//       foo = any.unpack(Foo.class);
-//     }
-//
-//  Example 3: Pack and unpack a message in Python.
-//
-//     foo = Foo(...)
-//     any = Any()
-//     any.Pack(foo)
-//     ...
-//     if any.Is(Foo.DESCRIPTOR):
-//       any.Unpack(foo)
-//       ...
-//
-//  Example 4: Pack and unpack a message in Go
-//
-//      foo := &pb.Foo{...}
-//      any, err := ptypes.MarshalAny(foo)
-//      ...
-//      foo := &pb.Foo{}
-//      if err := ptypes.UnmarshalAny(any, foo); err != nil {
-//        ...
-//      }
-//
-// The pack methods provided by protobuf library will by default use
-// 'type.googleapis.com/full.type.name' as the type URL and the unpack
-// methods only use the fully qualified type name after the last '/'
-// in the type URL, for example "foo.bar.com/x/y.z" will yield type
-// name "y.z".
-//
-//
-// JSON
-// ====
-// The JSON representation of an `Any` value uses the regular
-// representation of the deserialized, embedded message, with an
-// additional field `@type` which contains the type URL. Example:
-//
-//     package google.profile;
-//     message Person {
-//       string first_name = 1;
-//       string last_name = 2;
-//     }
-//
-//     {
-//       "@type": "type.googleapis.com/google.profile.Person",
-//       "firstName": <string>,
-//       "lastName": <string>
-//     }
-//
-// If the embedded message type is well-known and has a custom JSON
-// representation, that representation will be embedded adding a field
-// `value` which holds the custom JSON in addition to the `@type`
-// field. Example (for message [google.protobuf.Duration][]):
-//
-//     {
-//       "@type": "type.googleapis.com/google.protobuf.Duration",
-//       "value": "1.212s"
-//     }
-//
-message Any {
-  // A URL/resource name whose content describes the type of the
-  // serialized protocol buffer message.
-  //
-  // For URLs which use the scheme `http`, `https`, or no scheme, the
-  // following restrictions and interpretations apply:
-  //
-  // * If no scheme is provided, `https` is assumed.
-  // * The last segment of the URL's path must represent the fully
-  //   qualified name of the type (as in `path/google.protobuf.Duration`).
-  //   The name should be in a canonical form (e.g., leading "." is
-  //   not accepted).
-  // * An HTTP GET on the URL must yield a [google.protobuf.Type][]
-  //   value in binary format, or produce an error.
-  // * Applications are allowed to cache lookup results based on the
-  //   URL, or have them precompiled into a binary to avoid any
-  //   lookup. Therefore, binary compatibility needs to be preserved
-  //   on changes to types. (Use versioned type names to manage
-  //   breaking changes.)
-  //
-  // Schemes other than `http`, `https` (or the empty scheme) might be
-  // used with implementation specific semantics.
-  //
-  string type_url = 1;
-
-  // Must be a valid serialized protocol buffer of the above specified type.
-  bytes value = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/any_test.go b/installer/vendor/github.com/golang/protobuf/ptypes/any_test.go
deleted file mode 100644
index ed675b489c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/any_test.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-import (
-	"testing"
-
-	"github.com/golang/protobuf/proto"
-	pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
-	"github.com/golang/protobuf/ptypes/any"
-)
-
-func TestMarshalUnmarshal(t *testing.T) {
-	orig := &any.Any{Value: []byte("test")}
-
-	packed, err := MarshalAny(orig)
-	if err != nil {
-		t.Errorf("MarshalAny(%+v): got: _, %v exp: _, nil", orig, err)
-	}
-
-	unpacked := &any.Any{}
-	err = UnmarshalAny(packed, unpacked)
-	if err != nil || !proto.Equal(unpacked, orig) {
-		t.Errorf("got: %v, %+v; want nil, %+v", err, unpacked, orig)
-	}
-}
-
-func TestIs(t *testing.T) {
-	a, err := MarshalAny(&pb.FileDescriptorProto{})
-	if err != nil {
-		t.Fatal(err)
-	}
-	if Is(a, &pb.DescriptorProto{}) {
-		t.Error("FileDescriptorProto is not a DescriptorProto, but Is says it is")
-	}
-	if !Is(a, &pb.FileDescriptorProto{}) {
-		t.Error("FileDescriptorProto is indeed a FileDescriptorProto, but Is says it is not")
-	}
-}
-
-func TestIsDifferentUrlPrefixes(t *testing.T) {
-	m := &pb.FileDescriptorProto{}
-	a := &any.Any{TypeUrl: "foo/bar/" + proto.MessageName(m)}
-	if !Is(a, m) {
-		t.Errorf("message with type url %q didn't satisfy Is for type %q", a.TypeUrl, proto.MessageName(m))
-	}
-}
-
-func TestUnmarshalDynamic(t *testing.T) {
-	want := &pb.FileDescriptorProto{Name: proto.String("foo")}
-	a, err := MarshalAny(want)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var got DynamicAny
-	if err := UnmarshalAny(a, &got); err != nil {
-		t.Fatal(err)
-	}
-	if !proto.Equal(got.Message, want) {
-		t.Errorf("invalid result from UnmarshalAny, got %q want %q", got.Message, want)
-	}
-}
-
-func TestEmpty(t *testing.T) {
-	want := &pb.FileDescriptorProto{}
-	a, err := MarshalAny(want)
-	if err != nil {
-		t.Fatal(err)
-	}
-	got, err := Empty(a)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !proto.Equal(got, want) {
-		t.Errorf("unequal empty message, got %q, want %q", got, want)
-	}
-
-	// that's a valid type_url for a message which shouldn't be linked into this
-	// test binary. We want an error.
-	a.TypeUrl = "type.googleapis.com/google.protobuf.FieldMask"
-	if _, err := Empty(a); err == nil {
-		t.Errorf("got no error for an attempt to create a message of type %q, which shouldn't be linked in", a.TypeUrl)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/doc.go b/installer/vendor/github.com/golang/protobuf/ptypes/doc.go
deleted file mode 100644
index c0d595da7a..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/doc.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-/*
-Package ptypes contains code for interacting with well-known types.
-*/
-package ptypes
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/duration.go b/installer/vendor/github.com/golang/protobuf/ptypes/duration.go
deleted file mode 100644
index 65cb0f8eb5..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/duration.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-// This file implements conversions between google.protobuf.Duration
-// and time.Duration.
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	durpb "github.com/golang/protobuf/ptypes/duration"
-)
-
-const (
-	// Range of a durpb.Duration in seconds, as specified in
-	// google/protobuf/duration.proto. This is about 10,000 years in seconds.
-	maxSeconds = int64(10000 * 365.25 * 24 * 60 * 60)
-	minSeconds = -maxSeconds
-)
-
-// validateDuration determines whether the durpb.Duration is valid according to the
-// definition in google/protobuf/duration.proto. A valid durpb.Duration
-// may still be too large to fit into a time.Duration (the range of durpb.Duration
-// is about 10,000 years, and the range of time.Duration is about 290).
-func validateDuration(d *durpb.Duration) error {
-	if d == nil {
-		return errors.New("duration: nil Duration")
-	}
-	if d.Seconds < minSeconds || d.Seconds > maxSeconds {
-		return fmt.Errorf("duration: %v: seconds out of range", d)
-	}
-	if d.Nanos <= -1e9 || d.Nanos >= 1e9 {
-		return fmt.Errorf("duration: %v: nanos out of range", d)
-	}
-	// Seconds and Nanos must have the same sign, unless d.Nanos is zero.
-	if (d.Seconds < 0 && d.Nanos > 0) || (d.Seconds > 0 && d.Nanos < 0) {
-		return fmt.Errorf("duration: %v: seconds and nanos have different signs", d)
-	}
-	return nil
-}
-
-// Duration converts a durpb.Duration to a time.Duration. Duration
-// returns an error if the durpb.Duration is invalid or is too large to be
-// represented in a time.Duration.
-func Duration(p *durpb.Duration) (time.Duration, error) {
-	if err := validateDuration(p); err != nil {
-		return 0, err
-	}
-	d := time.Duration(p.Seconds) * time.Second
-	if int64(d/time.Second) != p.Seconds {
-		return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
-	}
-	if p.Nanos != 0 {
-		d += time.Duration(p.Nanos)
-		if (d < 0) != (p.Nanos < 0) {
-			return 0, fmt.Errorf("duration: %v is out of range for time.Duration", p)
-		}
-	}
-	return d, nil
-}
-
-// DurationProto converts a time.Duration to a durpb.Duration.
-func DurationProto(d time.Duration) *durpb.Duration {
-	nanos := d.Nanoseconds()
-	secs := nanos / 1e9
-	nanos -= secs * 1e9
-	return &durpb.Duration{
-		Seconds: secs,
-		Nanos:   int32(nanos),
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go
deleted file mode 100644
index b2410a098e..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.pb.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/duration.proto
-
-/*
-Package duration is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/duration.proto
-
-It has these top-level messages:
-	Duration
-*/
-package duration
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// A Duration represents a signed, fixed-length span of time represented
-// as a count of seconds and fractions of seconds at nanosecond
-// resolution. It is independent of any calendar and concepts like "day"
-// or "month". It is related to Timestamp in that the difference between
-// two Timestamp values is a Duration and it can be added or subtracted
-// from a Timestamp. Range is approximately +-10,000 years.
-//
-// # Examples
-//
-// Example 1: Compute Duration from two Timestamps in pseudo code.
-//
-//     Timestamp start = ...;
-//     Timestamp end = ...;
-//     Duration duration = ...;
-//
-//     duration.seconds = end.seconds - start.seconds;
-//     duration.nanos = end.nanos - start.nanos;
-//
-//     if (duration.seconds < 0 && duration.nanos > 0) {
-//       duration.seconds += 1;
-//       duration.nanos -= 1000000000;
-//     } else if (durations.seconds > 0 && duration.nanos < 0) {
-//       duration.seconds -= 1;
-//       duration.nanos += 1000000000;
-//     }
-//
-// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
-//
-//     Timestamp start = ...;
-//     Duration duration = ...;
-//     Timestamp end = ...;
-//
-//     end.seconds = start.seconds + duration.seconds;
-//     end.nanos = start.nanos + duration.nanos;
-//
-//     if (end.nanos < 0) {
-//       end.seconds -= 1;
-//       end.nanos += 1000000000;
-//     } else if (end.nanos >= 1000000000) {
-//       end.seconds += 1;
-//       end.nanos -= 1000000000;
-//     }
-//
-// Example 3: Compute Duration from datetime.timedelta in Python.
-//
-//     td = datetime.timedelta(days=3, minutes=10)
-//     duration = Duration()
-//     duration.FromTimedelta(td)
-//
-// # JSON Mapping
-//
-// In JSON format, the Duration type is encoded as a string rather than an
-// object, where the string ends in the suffix "s" (indicating seconds) and
-// is preceded by the number of seconds, with nanoseconds expressed as
-// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
-// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
-// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
-// microsecond should be expressed in JSON format as "3.000001s".
-//
-//
-type Duration struct {
-	// Signed seconds of the span of time. Must be from -315,576,000,000
-	// to +315,576,000,000 inclusive. Note: these bounds are computed from:
-	// 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-	Seconds int64 `protobuf:"varint,1,opt,name=seconds" json:"seconds,omitempty"`
-	// Signed fractions of a second at nanosecond resolution of the span
-	// of time. Durations less than one second are represented with a 0
-	// `seconds` field and a positive or negative `nanos` field. For durations
-	// of one second or more, a non-zero value for the `nanos` field must be
-	// of the same sign as the `seconds` field. Must be from -999,999,999
-	// to +999,999,999 inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
-}
-
-func (m *Duration) Reset()                    { *m = Duration{} }
-func (m *Duration) String() string            { return proto.CompactTextString(m) }
-func (*Duration) ProtoMessage()               {}
-func (*Duration) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Duration) XXX_WellKnownType() string   { return "Duration" }
-
-func (m *Duration) GetSeconds() int64 {
-	if m != nil {
-		return m.Seconds
-	}
-	return 0
-}
-
-func (m *Duration) GetNanos() int32 {
-	if m != nil {
-		return m.Nanos
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*Duration)(nil), "google.protobuf.Duration")
-}
-
-func init() { proto.RegisterFile("google/protobuf/duration.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 190 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0x29, 0x2d, 0x4a,
-	0x2c, 0xc9, 0xcc, 0xcf, 0xd3, 0x03, 0x8b, 0x08, 0xf1, 0x43, 0xe4, 0xf5, 0x60, 0xf2, 0x4a, 0x56,
-	0x5c, 0x1c, 0x2e, 0x50, 0x25, 0x42, 0x12, 0x5c, 0xec, 0xc5, 0xa9, 0xc9, 0xf9, 0x79, 0x29, 0xc5,
-	0x12, 0x8c, 0x0a, 0x8c, 0x1a, 0xcc, 0x41, 0x30, 0xae, 0x90, 0x08, 0x17, 0x6b, 0x5e, 0x62, 0x5e,
-	0x7e, 0xb1, 0x04, 0x93, 0x02, 0xa3, 0x06, 0x6b, 0x10, 0x84, 0xe3, 0x54, 0xc3, 0x25, 0x9c, 0x9c,
-	0x9f, 0xab, 0x87, 0x66, 0xa4, 0x13, 0x2f, 0xcc, 0xc0, 0x00, 0x90, 0x48, 0x00, 0x63, 0x94, 0x56,
-	0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x4e, 0x62, 0x5e,
-	0x3a, 0xc2, 0x7d, 0x05, 0x25, 0x95, 0x05, 0xa9, 0xc5, 0x70, 0x67, 0xfe, 0x60, 0x64, 0x5c, 0xc4,
-	0xc4, 0xec, 0x1e, 0xe0, 0xb4, 0x8a, 0x49, 0xce, 0x1d, 0x62, 0x6e, 0x00, 0x54, 0xa9, 0x5e, 0x78,
-	0x6a, 0x4e, 0x8e, 0x77, 0x5e, 0x7e, 0x79, 0x5e, 0x08, 0x48, 0x4b, 0x12, 0x1b, 0xd8, 0x0c, 0x63,
-	0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0xdc, 0x84, 0x30, 0xff, 0xf3, 0x00, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto b/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto
deleted file mode 100644
index 975fce41aa..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/duration/duration.proto
+++ /dev/null
@@ -1,117 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "github.com/golang/protobuf/ptypes/duration";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "DurationProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// A Duration represents a signed, fixed-length span of time represented
-// as a count of seconds and fractions of seconds at nanosecond
-// resolution. It is independent of any calendar and concepts like "day"
-// or "month". It is related to Timestamp in that the difference between
-// two Timestamp values is a Duration and it can be added or subtracted
-// from a Timestamp. Range is approximately +-10,000 years.
-//
-// # Examples
-//
-// Example 1: Compute Duration from two Timestamps in pseudo code.
-//
-//     Timestamp start = ...;
-//     Timestamp end = ...;
-//     Duration duration = ...;
-//
-//     duration.seconds = end.seconds - start.seconds;
-//     duration.nanos = end.nanos - start.nanos;
-//
-//     if (duration.seconds < 0 && duration.nanos > 0) {
-//       duration.seconds += 1;
-//       duration.nanos -= 1000000000;
-//     } else if (durations.seconds > 0 && duration.nanos < 0) {
-//       duration.seconds -= 1;
-//       duration.nanos += 1000000000;
-//     }
-//
-// Example 2: Compute Timestamp from Timestamp + Duration in pseudo code.
-//
-//     Timestamp start = ...;
-//     Duration duration = ...;
-//     Timestamp end = ...;
-//
-//     end.seconds = start.seconds + duration.seconds;
-//     end.nanos = start.nanos + duration.nanos;
-//
-//     if (end.nanos < 0) {
-//       end.seconds -= 1;
-//       end.nanos += 1000000000;
-//     } else if (end.nanos >= 1000000000) {
-//       end.seconds += 1;
-//       end.nanos -= 1000000000;
-//     }
-//
-// Example 3: Compute Duration from datetime.timedelta in Python.
-//
-//     td = datetime.timedelta(days=3, minutes=10)
-//     duration = Duration()
-//     duration.FromTimedelta(td)
-//
-// # JSON Mapping
-//
-// In JSON format, the Duration type is encoded as a string rather than an
-// object, where the string ends in the suffix "s" (indicating seconds) and
-// is preceded by the number of seconds, with nanoseconds expressed as
-// fractional seconds. For example, 3 seconds with 0 nanoseconds should be
-// encoded in JSON format as "3s", while 3 seconds and 1 nanosecond should
-// be expressed in JSON format as "3.000000001s", and 3 seconds and 1
-// microsecond should be expressed in JSON format as "3.000001s".
-//
-//
-message Duration {
-
-  // Signed seconds of the span of time. Must be from -315,576,000,000
-  // to +315,576,000,000 inclusive. Note: these bounds are computed from:
-  // 60 sec/min * 60 min/hr * 24 hr/day * 365.25 days/year * 10000 years
-  int64 seconds = 1;
-
-  // Signed fractions of a second at nanosecond resolution of the span
-  // of time. Durations less than one second are represented with a 0
-  // `seconds` field and a positive or negative `nanos` field. For durations
-  // of one second or more, a non-zero value for the `nanos` field must be
-  // of the same sign as the `seconds` field. Must be from -999,999,999
-  // to +999,999,999 inclusive.
-  int32 nanos = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/duration_test.go b/installer/vendor/github.com/golang/protobuf/ptypes/duration_test.go
deleted file mode 100644
index e00491a34f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/duration_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-import (
-	"math"
-	"testing"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	durpb "github.com/golang/protobuf/ptypes/duration"
-)
-
-const (
-	minGoSeconds = math.MinInt64 / int64(1e9)
-	maxGoSeconds = math.MaxInt64 / int64(1e9)
-)
-
-var durationTests = []struct {
-	proto   *durpb.Duration
-	isValid bool
-	inRange bool
-	dur     time.Duration
-}{
-	// The zero duration.
-	{&durpb.Duration{Seconds: 0, Nanos: 0}, true, true, 0},
-	// Some ordinary non-zero durations.
-	{&durpb.Duration{Seconds: 100, Nanos: 0}, true, true, 100 * time.Second},
-	{&durpb.Duration{Seconds: -100, Nanos: 0}, true, true, -100 * time.Second},
-	{&durpb.Duration{Seconds: 100, Nanos: 987}, true, true, 100*time.Second + 987},
-	{&durpb.Duration{Seconds: -100, Nanos: -987}, true, true, -(100*time.Second + 987)},
-	// The largest duration representable in Go.
-	{&durpb.Duration{Seconds: maxGoSeconds, Nanos: int32(math.MaxInt64 - 1e9*maxGoSeconds)}, true, true, math.MaxInt64},
-	// The smallest duration representable in Go.
-	{&durpb.Duration{Seconds: minGoSeconds, Nanos: int32(math.MinInt64 - 1e9*minGoSeconds)}, true, true, math.MinInt64},
-	{nil, false, false, 0},
-	{&durpb.Duration{Seconds: -100, Nanos: 987}, false, false, 0},
-	{&durpb.Duration{Seconds: 100, Nanos: -987}, false, false, 0},
-	{&durpb.Duration{Seconds: math.MinInt64, Nanos: 0}, false, false, 0},
-	{&durpb.Duration{Seconds: math.MaxInt64, Nanos: 0}, false, false, 0},
-	// The largest valid duration.
-	{&durpb.Duration{Seconds: maxSeconds, Nanos: 1e9 - 1}, true, false, 0},
-	// The smallest valid duration.
-	{&durpb.Duration{Seconds: minSeconds, Nanos: -(1e9 - 1)}, true, false, 0},
-	// The smallest invalid duration above the valid range.
-	{&durpb.Duration{Seconds: maxSeconds + 1, Nanos: 0}, false, false, 0},
-	// The largest invalid duration below the valid range.
-	{&durpb.Duration{Seconds: minSeconds - 1, Nanos: -(1e9 - 1)}, false, false, 0},
-	// One nanosecond past the largest duration representable in Go.
-	{&durpb.Duration{Seconds: maxGoSeconds, Nanos: int32(math.MaxInt64-1e9*maxGoSeconds) + 1}, true, false, 0},
-	// One nanosecond past the smallest duration representable in Go.
-	{&durpb.Duration{Seconds: minGoSeconds, Nanos: int32(math.MinInt64-1e9*minGoSeconds) - 1}, true, false, 0},
-	// One second past the largest duration representable in Go.
-	{&durpb.Duration{Seconds: maxGoSeconds + 1, Nanos: int32(math.MaxInt64 - 1e9*maxGoSeconds)}, true, false, 0},
-	// One second past the smallest duration representable in Go.
-	{&durpb.Duration{Seconds: minGoSeconds - 1, Nanos: int32(math.MinInt64 - 1e9*minGoSeconds)}, true, false, 0},
-}
-
-func TestValidateDuration(t *testing.T) {
-	for _, test := range durationTests {
-		err := validateDuration(test.proto)
-		gotValid := (err == nil)
-		if gotValid != test.isValid {
-			t.Errorf("validateDuration(%v) = %t, want %t", test.proto, gotValid, test.isValid)
-		}
-	}
-}
-
-func TestDuration(t *testing.T) {
-	for _, test := range durationTests {
-		got, err := Duration(test.proto)
-		gotOK := (err == nil)
-		wantOK := test.isValid && test.inRange
-		if gotOK != wantOK {
-			t.Errorf("Duration(%v) ok = %t, want %t", test.proto, gotOK, wantOK)
-		}
-		if err == nil && got != test.dur {
-			t.Errorf("Duration(%v) = %v, want %v", test.proto, got, test.dur)
-		}
-	}
-}
-
-func TestDurationProto(t *testing.T) {
-	for _, test := range durationTests {
-		if test.isValid && test.inRange {
-			got := DurationProto(test.dur)
-			if !proto.Equal(got, test.proto) {
-				t.Errorf("DurationProto(%v) = %v, want %v", test.dur, got, test.proto)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
deleted file mode 100644
index e877b72c3f..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.pb.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/empty.proto
-
-/*
-Package empty is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/empty.proto
-
-It has these top-level messages:
-	Empty
-*/
-package empty
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// A generic empty message that you can re-use to avoid defining duplicated
-// empty messages in your APIs. A typical example is to use it as the request
-// or the response type of an API method. For instance:
-//
-//     service Foo {
-//       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
-//     }
-//
-// The JSON representation for `Empty` is empty JSON object `{}`.
-type Empty struct {
-}
-
-func (m *Empty) Reset()                    { *m = Empty{} }
-func (m *Empty) String() string            { return proto.CompactTextString(m) }
-func (*Empty) ProtoMessage()               {}
-func (*Empty) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Empty) XXX_WellKnownType() string   { return "Empty" }
-
-func init() {
-	proto.RegisterType((*Empty)(nil), "google.protobuf.Empty")
-}
-
-func init() { proto.RegisterFile("google/protobuf/empty.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 148 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4e, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x4f, 0xcd, 0x2d, 0x28,
-	0xa9, 0xd4, 0x03, 0x73, 0x85, 0xf8, 0x21, 0x92, 0x7a, 0x30, 0x49, 0x25, 0x76, 0x2e, 0x56, 0x57,
-	0x90, 0xbc, 0x53, 0x19, 0x97, 0x70, 0x72, 0x7e, 0xae, 0x1e, 0x9a, 0xbc, 0x13, 0x17, 0x58, 0x36,
-	0x00, 0xc4, 0x0d, 0x60, 0x8c, 0x52, 0x4f, 0xcf, 0x2c, 0xc9, 0x28, 0x4d, 0xd2, 0x4b, 0xce, 0xcf,
-	0xd5, 0x4f, 0xcf, 0xcf, 0x49, 0xcc, 0x4b, 0x47, 0x58, 0x53, 0x50, 0x52, 0x59, 0x90, 0x5a, 0x0c,
-	0xb1, 0xed, 0x07, 0x23, 0xe3, 0x22, 0x26, 0x66, 0xf7, 0x00, 0xa7, 0x55, 0x4c, 0x72, 0xee, 0x10,
-	0x13, 0x03, 0xa0, 0xea, 0xf4, 0xc2, 0x53, 0x73, 0x72, 0xbc, 0xf3, 0xf2, 0xcb, 0xf3, 0x42, 0x40,
-	0xea, 0x93, 0xd8, 0xc0, 0x06, 0x18, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0x64, 0xd4, 0xb3, 0xa6,
-	0xb7, 0x00, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.proto b/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.proto
deleted file mode 100644
index 03cacd2330..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/empty/empty.proto
+++ /dev/null
@@ -1,52 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option go_package = "github.com/golang/protobuf/ptypes/empty";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "EmptyProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-option cc_enable_arenas = true;
-
-// A generic empty message that you can re-use to avoid defining duplicated
-// empty messages in your APIs. A typical example is to use it as the request
-// or the response type of an API method. For instance:
-//
-//     service Foo {
-//       rpc Bar(google.protobuf.Empty) returns (google.protobuf.Empty);
-//     }
-//
-// The JSON representation for `Empty` is empty JSON object `{}`.
-message Empty {}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/regen.sh b/installer/vendor/github.com/golang/protobuf/ptypes/regen.sh
deleted file mode 100755
index b50a9414ac..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/regen.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash -e
-#
-# This script fetches and rebuilds the "well-known types" protocol buffers.
-# To run this you will need protoc and goprotobuf installed;
-# see https://github.com/golang/protobuf for instructions.
-# You also need Go and Git installed.
-
-PKG=github.com/golang/protobuf/ptypes
-UPSTREAM=https://github.com/google/protobuf
-UPSTREAM_SUBDIR=src/google/protobuf
-PROTO_FILES=(any duration empty struct timestamp wrappers)
-
-function die() {
-  echo 1>&2 $*
-  exit 1
-}
-
-# Sanity check that the right tools are accessible.
-for tool in go git protoc protoc-gen-go; do
-  q=$(which $tool) || die "didn't find $tool"
-  echo 1>&2 "$tool: $q"
-done
-
-tmpdir=$(mktemp -d -t regen-wkt.XXXXXX)
-trap 'rm -rf $tmpdir' EXIT
-
-echo -n 1>&2 "finding package dir... "
-pkgdir=$(go list -f '{{.Dir}}' $PKG)
-echo 1>&2 $pkgdir
-base=$(echo $pkgdir | sed "s,/$PKG\$,,")
-echo 1>&2 "base: $base"
-cd "$base"
-
-echo 1>&2 "fetching latest protos... "
-git clone -q $UPSTREAM $tmpdir
-
-for file in ${PROTO_FILES[@]}; do
-  echo 1>&2 "* $file"
-  protoc --go_out=. -I$tmpdir/src $tmpdir/src/google/protobuf/$file.proto || die
-  cp $tmpdir/src/google/protobuf/$file.proto $PKG/$file
-done
-
-echo 1>&2 "All OK"
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go
deleted file mode 100644
index 4cfe608187..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.pb.go
+++ /dev/null
@@ -1,380 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/struct.proto
-
-/*
-Package structpb is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/struct.proto
-
-It has these top-level messages:
-	Struct
-	Value
-	ListValue
-*/
-package structpb
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// `NullValue` is a singleton enumeration to represent the null value for the
-// `Value` type union.
-//
-//  The JSON representation for `NullValue` is JSON `null`.
-type NullValue int32
-
-const (
-	// Null value.
-	NullValue_NULL_VALUE NullValue = 0
-)
-
-var NullValue_name = map[int32]string{
-	0: "NULL_VALUE",
-}
-var NullValue_value = map[string]int32{
-	"NULL_VALUE": 0,
-}
-
-func (x NullValue) String() string {
-	return proto.EnumName(NullValue_name, int32(x))
-}
-func (NullValue) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (NullValue) XXX_WellKnownType() string       { return "NullValue" }
-
-// `Struct` represents a structured data value, consisting of fields
-// which map to dynamically typed values. In some languages, `Struct`
-// might be supported by a native representation. For example, in
-// scripting languages like JS a struct is represented as an
-// object. The details of that representation are described together
-// with the proto support for the language.
-//
-// The JSON representation for `Struct` is JSON object.
-type Struct struct {
-	// Unordered map of dynamically typed values.
-	Fields map[string]*Value `protobuf:"bytes,1,rep,name=fields" json:"fields,omitempty" protobuf_key:"bytes,1,opt,name=key" protobuf_val:"bytes,2,opt,name=value"`
-}
-
-func (m *Struct) Reset()                    { *m = Struct{} }
-func (m *Struct) String() string            { return proto.CompactTextString(m) }
-func (*Struct) ProtoMessage()               {}
-func (*Struct) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Struct) XXX_WellKnownType() string   { return "Struct" }
-
-func (m *Struct) GetFields() map[string]*Value {
-	if m != nil {
-		return m.Fields
-	}
-	return nil
-}
-
-// `Value` represents a dynamically typed value which can be either
-// null, a number, a string, a boolean, a recursive struct value, or a
-// list of values. A producer of value is expected to set one of that
-// variants, absence of any variant indicates an error.
-//
-// The JSON representation for `Value` is JSON value.
-type Value struct {
-	// The kind of value.
-	//
-	// Types that are valid to be assigned to Kind:
-	//	*Value_NullValue
-	//	*Value_NumberValue
-	//	*Value_StringValue
-	//	*Value_BoolValue
-	//	*Value_StructValue
-	//	*Value_ListValue
-	Kind isValue_Kind `protobuf_oneof:"kind"`
-}
-
-func (m *Value) Reset()                    { *m = Value{} }
-func (m *Value) String() string            { return proto.CompactTextString(m) }
-func (*Value) ProtoMessage()               {}
-func (*Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-func (*Value) XXX_WellKnownType() string   { return "Value" }
-
-type isValue_Kind interface {
-	isValue_Kind()
-}
-
-type Value_NullValue struct {
-	NullValue NullValue `protobuf:"varint,1,opt,name=null_value,json=nullValue,enum=google.protobuf.NullValue,oneof"`
-}
-type Value_NumberValue struct {
-	NumberValue float64 `protobuf:"fixed64,2,opt,name=number_value,json=numberValue,oneof"`
-}
-type Value_StringValue struct {
-	StringValue string `protobuf:"bytes,3,opt,name=string_value,json=stringValue,oneof"`
-}
-type Value_BoolValue struct {
-	BoolValue bool `protobuf:"varint,4,opt,name=bool_value,json=boolValue,oneof"`
-}
-type Value_StructValue struct {
-	StructValue *Struct `protobuf:"bytes,5,opt,name=struct_value,json=structValue,oneof"`
-}
-type Value_ListValue struct {
-	ListValue *ListValue `protobuf:"bytes,6,opt,name=list_value,json=listValue,oneof"`
-}
-
-func (*Value_NullValue) isValue_Kind()   {}
-func (*Value_NumberValue) isValue_Kind() {}
-func (*Value_StringValue) isValue_Kind() {}
-func (*Value_BoolValue) isValue_Kind()   {}
-func (*Value_StructValue) isValue_Kind() {}
-func (*Value_ListValue) isValue_Kind()   {}
-
-func (m *Value) GetKind() isValue_Kind {
-	if m != nil {
-		return m.Kind
-	}
-	return nil
-}
-
-func (m *Value) GetNullValue() NullValue {
-	if x, ok := m.GetKind().(*Value_NullValue); ok {
-		return x.NullValue
-	}
-	return NullValue_NULL_VALUE
-}
-
-func (m *Value) GetNumberValue() float64 {
-	if x, ok := m.GetKind().(*Value_NumberValue); ok {
-		return x.NumberValue
-	}
-	return 0
-}
-
-func (m *Value) GetStringValue() string {
-	if x, ok := m.GetKind().(*Value_StringValue); ok {
-		return x.StringValue
-	}
-	return ""
-}
-
-func (m *Value) GetBoolValue() bool {
-	if x, ok := m.GetKind().(*Value_BoolValue); ok {
-		return x.BoolValue
-	}
-	return false
-}
-
-func (m *Value) GetStructValue() *Struct {
-	if x, ok := m.GetKind().(*Value_StructValue); ok {
-		return x.StructValue
-	}
-	return nil
-}
-
-func (m *Value) GetListValue() *ListValue {
-	if x, ok := m.GetKind().(*Value_ListValue); ok {
-		return x.ListValue
-	}
-	return nil
-}
-
-// XXX_OneofFuncs is for the internal use of the proto package.
-func (*Value) XXX_OneofFuncs() (func(msg proto.Message, b *proto.Buffer) error, func(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error), func(msg proto.Message) (n int), []interface{}) {
-	return _Value_OneofMarshaler, _Value_OneofUnmarshaler, _Value_OneofSizer, []interface{}{
-		(*Value_NullValue)(nil),
-		(*Value_NumberValue)(nil),
-		(*Value_StringValue)(nil),
-		(*Value_BoolValue)(nil),
-		(*Value_StructValue)(nil),
-		(*Value_ListValue)(nil),
-	}
-}
-
-func _Value_OneofMarshaler(msg proto.Message, b *proto.Buffer) error {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		b.EncodeVarint(1<<3 | proto.WireVarint)
-		b.EncodeVarint(uint64(x.NullValue))
-	case *Value_NumberValue:
-		b.EncodeVarint(2<<3 | proto.WireFixed64)
-		b.EncodeFixed64(math.Float64bits(x.NumberValue))
-	case *Value_StringValue:
-		b.EncodeVarint(3<<3 | proto.WireBytes)
-		b.EncodeStringBytes(x.StringValue)
-	case *Value_BoolValue:
-		t := uint64(0)
-		if x.BoolValue {
-			t = 1
-		}
-		b.EncodeVarint(4<<3 | proto.WireVarint)
-		b.EncodeVarint(t)
-	case *Value_StructValue:
-		b.EncodeVarint(5<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.StructValue); err != nil {
-			return err
-		}
-	case *Value_ListValue:
-		b.EncodeVarint(6<<3 | proto.WireBytes)
-		if err := b.EncodeMessage(x.ListValue); err != nil {
-			return err
-		}
-	case nil:
-	default:
-		return fmt.Errorf("Value.Kind has unexpected type %T", x)
-	}
-	return nil
-}
-
-func _Value_OneofUnmarshaler(msg proto.Message, tag, wire int, b *proto.Buffer) (bool, error) {
-	m := msg.(*Value)
-	switch tag {
-	case 1: // kind.null_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_NullValue{NullValue(x)}
-		return true, err
-	case 2: // kind.number_value
-		if wire != proto.WireFixed64 {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeFixed64()
-		m.Kind = &Value_NumberValue{math.Float64frombits(x)}
-		return true, err
-	case 3: // kind.string_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeStringBytes()
-		m.Kind = &Value_StringValue{x}
-		return true, err
-	case 4: // kind.bool_value
-		if wire != proto.WireVarint {
-			return true, proto.ErrInternalBadWireType
-		}
-		x, err := b.DecodeVarint()
-		m.Kind = &Value_BoolValue{x != 0}
-		return true, err
-	case 5: // kind.struct_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(Struct)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_StructValue{msg}
-		return true, err
-	case 6: // kind.list_value
-		if wire != proto.WireBytes {
-			return true, proto.ErrInternalBadWireType
-		}
-		msg := new(ListValue)
-		err := b.DecodeMessage(msg)
-		m.Kind = &Value_ListValue{msg}
-		return true, err
-	default:
-		return false, nil
-	}
-}
-
-func _Value_OneofSizer(msg proto.Message) (n int) {
-	m := msg.(*Value)
-	// kind
-	switch x := m.Kind.(type) {
-	case *Value_NullValue:
-		n += proto.SizeVarint(1<<3 | proto.WireVarint)
-		n += proto.SizeVarint(uint64(x.NullValue))
-	case *Value_NumberValue:
-		n += proto.SizeVarint(2<<3 | proto.WireFixed64)
-		n += 8
-	case *Value_StringValue:
-		n += proto.SizeVarint(3<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(len(x.StringValue)))
-		n += len(x.StringValue)
-	case *Value_BoolValue:
-		n += proto.SizeVarint(4<<3 | proto.WireVarint)
-		n += 1
-	case *Value_StructValue:
-		s := proto.Size(x.StructValue)
-		n += proto.SizeVarint(5<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case *Value_ListValue:
-		s := proto.Size(x.ListValue)
-		n += proto.SizeVarint(6<<3 | proto.WireBytes)
-		n += proto.SizeVarint(uint64(s))
-		n += s
-	case nil:
-	default:
-		panic(fmt.Sprintf("proto: unexpected type %T in oneof", x))
-	}
-	return n
-}
-
-// `ListValue` is a wrapper around a repeated field of values.
-//
-// The JSON representation for `ListValue` is JSON array.
-type ListValue struct {
-	// Repeated field of dynamically typed values.
-	Values []*Value `protobuf:"bytes,1,rep,name=values" json:"values,omitempty"`
-}
-
-func (m *ListValue) Reset()                    { *m = ListValue{} }
-func (m *ListValue) String() string            { return proto.CompactTextString(m) }
-func (*ListValue) ProtoMessage()               {}
-func (*ListValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-func (*ListValue) XXX_WellKnownType() string   { return "ListValue" }
-
-func (m *ListValue) GetValues() []*Value {
-	if m != nil {
-		return m.Values
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*Struct)(nil), "google.protobuf.Struct")
-	proto.RegisterType((*Value)(nil), "google.protobuf.Value")
-	proto.RegisterType((*ListValue)(nil), "google.protobuf.ListValue")
-	proto.RegisterEnum("google.protobuf.NullValue", NullValue_name, NullValue_value)
-}
-
-func init() { proto.RegisterFile("google/protobuf/struct.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 417 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x92, 0x41, 0x8b, 0xd3, 0x40,
-	0x14, 0xc7, 0x3b, 0xc9, 0x36, 0x98, 0x17, 0x59, 0x97, 0x11, 0xb4, 0xac, 0xa2, 0xa1, 0x7b, 0x09,
-	0x22, 0x29, 0xd6, 0x8b, 0x18, 0x2f, 0x06, 0xd6, 0x5d, 0x30, 0x2c, 0x31, 0xba, 0x15, 0xbc, 0x94,
-	0x26, 0x4d, 0x63, 0xe8, 0x74, 0x26, 0x24, 0x33, 0x4a, 0x8f, 0x7e, 0x0b, 0xcf, 0x1e, 0x3d, 0xfa,
-	0xe9, 0x3c, 0xca, 0xcc, 0x24, 0xa9, 0xb4, 0xf4, 0x94, 0xbc, 0xf7, 0x7e, 0xef, 0x3f, 0xef, 0xff,
-	0x66, 0xe0, 0x71, 0xc1, 0x58, 0x41, 0xf2, 0x49, 0x55, 0x33, 0xce, 0x52, 0xb1, 0x9a, 0x34, 0xbc,
-	0x16, 0x19, 0xf7, 0x55, 0x8c, 0xef, 0xe9, 0xaa, 0xdf, 0x55, 0xc7, 0x3f, 0x11, 0x58, 0x1f, 0x15,
-	0x81, 0x03, 0xb0, 0x56, 0x65, 0x4e, 0x96, 0xcd, 0x08, 0xb9, 0xa6, 0xe7, 0x4c, 0x2f, 0xfc, 0x3d,
-	0xd8, 0xd7, 0xa0, 0xff, 0x4e, 0x51, 0x97, 0x94, 0xd7, 0xdb, 0xa4, 0x6d, 0x39, 0xff, 0x00, 0xce,
-	0x7f, 0x69, 0x7c, 0x06, 0xe6, 0x3a, 0xdf, 0x8e, 0x90, 0x8b, 0x3c, 0x3b, 0x91, 0xbf, 0xf8, 0x39,
-	0x0c, 0xbf, 0x2d, 0x88, 0xc8, 0x47, 0x86, 0x8b, 0x3c, 0x67, 0xfa, 0xe0, 0x40, 0x7c, 0x26, 0xab,
-	0x89, 0x86, 0x5e, 0x1b, 0xaf, 0xd0, 0xf8, 0x8f, 0x01, 0x43, 0x95, 0xc4, 0x01, 0x00, 0x15, 0x84,
-	0xcc, 0xb5, 0x80, 0x14, 0x3d, 0x9d, 0x9e, 0x1f, 0x08, 0xdc, 0x08, 0x42, 0x14, 0x7f, 0x3d, 0x48,
-	0x6c, 0xda, 0x05, 0xf8, 0x02, 0xee, 0x52, 0xb1, 0x49, 0xf3, 0x7a, 0xbe, 0x3b, 0x1f, 0x5d, 0x0f,
-	0x12, 0x47, 0x67, 0x7b, 0xa8, 0xe1, 0x75, 0x49, 0x8b, 0x16, 0x32, 0xe5, 0xe0, 0x12, 0xd2, 0x59,
-	0x0d, 0x3d, 0x05, 0x48, 0x19, 0xeb, 0xc6, 0x38, 0x71, 0x91, 0x77, 0x47, 0x1e, 0x25, 0x73, 0x1a,
-	0x78, 0xa3, 0x54, 0x44, 0xc6, 0x5b, 0x64, 0xa8, 0xac, 0x3e, 0x3c, 0xb2, 0xc7, 0x56, 0x5e, 0x64,
-	0xbc, 0x77, 0x49, 0xca, 0xa6, 0xeb, 0xb5, 0x54, 0xef, 0xa1, 0xcb, 0xa8, 0x6c, 0x78, 0xef, 0x92,
-	0x74, 0x41, 0x68, 0xc1, 0xc9, 0xba, 0xa4, 0xcb, 0x71, 0x00, 0x76, 0x4f, 0x60, 0x1f, 0x2c, 0x25,
-	0xd6, 0xdd, 0xe8, 0xb1, 0xa5, 0xb7, 0xd4, 0xb3, 0x47, 0x60, 0xf7, 0x4b, 0xc4, 0xa7, 0x00, 0x37,
-	0xb7, 0x51, 0x34, 0x9f, 0xbd, 0x8d, 0x6e, 0x2f, 0xcf, 0x06, 0xe1, 0x0f, 0x04, 0xf7, 0x33, 0xb6,
-	0xd9, 0x97, 0x08, 0x1d, 0xed, 0x26, 0x96, 0x71, 0x8c, 0xbe, 0xbc, 0x28, 0x4a, 0xfe, 0x55, 0xa4,
-	0x7e, 0xc6, 0x36, 0x93, 0x82, 0x91, 0x05, 0x2d, 0x76, 0x4f, 0xb1, 0xe2, 0xdb, 0x2a, 0x6f, 0xda,
-	0x17, 0x19, 0xe8, 0x4f, 0x95, 0xfe, 0x45, 0xe8, 0x97, 0x61, 0x5e, 0xc5, 0xe1, 0x6f, 0xe3, 0xc9,
-	0x95, 0x16, 0x8f, 0xbb, 0xf9, 0x3e, 0xe7, 0x84, 0xbc, 0xa7, 0xec, 0x3b, 0xfd, 0x24, 0x3b, 0x53,
-	0x4b, 0x49, 0xbd, 0xfc, 0x17, 0x00, 0x00, 0xff, 0xff, 0xe8, 0x1b, 0x59, 0xf8, 0xe5, 0x02, 0x00,
-	0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.proto b/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.proto
deleted file mode 100644
index 7d7808e7fb..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/struct/struct.proto
+++ /dev/null
@@ -1,96 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "github.com/golang/protobuf/ptypes/struct;structpb";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "StructProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-
-// `Struct` represents a structured data value, consisting of fields
-// which map to dynamically typed values. In some languages, `Struct`
-// might be supported by a native representation. For example, in
-// scripting languages like JS a struct is represented as an
-// object. The details of that representation are described together
-// with the proto support for the language.
-//
-// The JSON representation for `Struct` is JSON object.
-message Struct {
-  // Unordered map of dynamically typed values.
-  map<string, Value> fields = 1;
-}
-
-// `Value` represents a dynamically typed value which can be either
-// null, a number, a string, a boolean, a recursive struct value, or a
-// list of values. A producer of value is expected to set one of that
-// variants, absence of any variant indicates an error.
-//
-// The JSON representation for `Value` is JSON value.
-message Value {
-  // The kind of value.
-  oneof kind {
-    // Represents a null value.
-    NullValue null_value = 1;
-    // Represents a double value.
-    double number_value = 2;
-    // Represents a string value.
-    string string_value = 3;
-    // Represents a boolean value.
-    bool bool_value = 4;
-    // Represents a structured value.
-    Struct struct_value = 5;
-    // Represents a repeated `Value`.
-    ListValue list_value = 6;
-  }
-}
-
-// `NullValue` is a singleton enumeration to represent the null value for the
-// `Value` type union.
-//
-//  The JSON representation for `NullValue` is JSON `null`.
-enum NullValue {
-  // Null value.
-  NULL_VALUE = 0;
-}
-
-// `ListValue` is a wrapper around a repeated field of values.
-//
-// The JSON representation for `ListValue` is JSON array.
-message ListValue {
-  // Repeated field of dynamically typed values.
-  repeated Value values = 1;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp.go b/installer/vendor/github.com/golang/protobuf/ptypes/timestamp.go
deleted file mode 100644
index 47f10dbc2c..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-// This file implements operations on google.protobuf.Timestamp.
-
-import (
-	"errors"
-	"fmt"
-	"time"
-
-	tspb "github.com/golang/protobuf/ptypes/timestamp"
-)
-
-const (
-	// Seconds field of the earliest valid Timestamp.
-	// This is time.Date(1, 1, 1, 0, 0, 0, 0, time.UTC).Unix().
-	minValidSeconds = -62135596800
-	// Seconds field just after the latest valid Timestamp.
-	// This is time.Date(10000, 1, 1, 0, 0, 0, 0, time.UTC).Unix().
-	maxValidSeconds = 253402300800
-)
-
-// validateTimestamp determines whether a Timestamp is valid.
-// A valid timestamp represents a time in the range
-// [0001-01-01, 10000-01-01) and has a Nanos field
-// in the range [0, 1e9).
-//
-// If the Timestamp is valid, validateTimestamp returns nil.
-// Otherwise, it returns an error that describes
-// the problem.
-//
-// Every valid Timestamp can be represented by a time.Time, but the converse is not true.
-func validateTimestamp(ts *tspb.Timestamp) error {
-	if ts == nil {
-		return errors.New("timestamp: nil Timestamp")
-	}
-	if ts.Seconds < minValidSeconds {
-		return fmt.Errorf("timestamp: %v before 0001-01-01", ts)
-	}
-	if ts.Seconds >= maxValidSeconds {
-		return fmt.Errorf("timestamp: %v after 10000-01-01", ts)
-	}
-	if ts.Nanos < 0 || ts.Nanos >= 1e9 {
-		return fmt.Errorf("timestamp: %v: nanos not in range [0, 1e9)", ts)
-	}
-	return nil
-}
-
-// Timestamp converts a google.protobuf.Timestamp proto to a time.Time.
-// It returns an error if the argument is invalid.
-//
-// Unlike most Go functions, if Timestamp returns an error, the first return value
-// is not the zero time.Time. Instead, it is the value obtained from the
-// time.Unix function when passed the contents of the Timestamp, in the UTC
-// locale. This may or may not be a meaningful time; many invalid Timestamps
-// do map to valid time.Times.
-//
-// A nil Timestamp returns an error. The first return value in that case is
-// undefined.
-func Timestamp(ts *tspb.Timestamp) (time.Time, error) {
-	// Don't return the zero value on error, because corresponds to a valid
-	// timestamp. Instead return whatever time.Unix gives us.
-	var t time.Time
-	if ts == nil {
-		t = time.Unix(0, 0).UTC() // treat nil like the empty Timestamp
-	} else {
-		t = time.Unix(ts.Seconds, int64(ts.Nanos)).UTC()
-	}
-	return t, validateTimestamp(ts)
-}
-
-// TimestampNow returns a google.protobuf.Timestamp for the current time.
-func TimestampNow() *tspb.Timestamp {
-	ts, err := TimestampProto(time.Now())
-	if err != nil {
-		panic("ptypes: time.Now() out of Timestamp range")
-	}
-	return ts
-}
-
-// TimestampProto converts the time.Time to a google.protobuf.Timestamp proto.
-// It returns an error if the resulting Timestamp is invalid.
-func TimestampProto(t time.Time) (*tspb.Timestamp, error) {
-	seconds := t.Unix()
-	nanos := int32(t.Sub(time.Unix(seconds, 0)))
-	ts := &tspb.Timestamp{
-		Seconds: seconds,
-		Nanos:   nanos,
-	}
-	if err := validateTimestamp(ts); err != nil {
-		return nil, err
-	}
-	return ts, nil
-}
-
-// TimestampString returns the RFC 3339 string for valid Timestamps. For invalid
-// Timestamps, it returns an error message in parentheses.
-func TimestampString(ts *tspb.Timestamp) string {
-	t, err := Timestamp(ts)
-	if err != nil {
-		return fmt.Sprintf("(%v)", err)
-	}
-	return t.Format(time.RFC3339Nano)
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
deleted file mode 100644
index e23e4a25da..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.pb.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/timestamp.proto
-
-/*
-Package timestamp is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/timestamp.proto
-
-It has these top-level messages:
-	Timestamp
-*/
-package timestamp
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// A Timestamp represents a point in time independent of any time zone
-// or calendar, represented as seconds and fractions of seconds at
-// nanosecond resolution in UTC Epoch time. It is encoded using the
-// Proleptic Gregorian Calendar which extends the Gregorian calendar
-// backwards to year one. It is encoded assuming all minutes are 60
-// seconds long, i.e. leap seconds are "smeared" so that no leap second
-// table is needed for interpretation. Range is from
-// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
-// By restricting to that range, we ensure that we can convert to
-// and from  RFC 3339 date strings.
-// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
-//
-// # Examples
-//
-// Example 1: Compute Timestamp from POSIX `time()`.
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(time(NULL));
-//     timestamp.set_nanos(0);
-//
-// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-//
-//     struct timeval tv;
-//     gettimeofday(&tv, NULL);
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(tv.tv_sec);
-//     timestamp.set_nanos(tv.tv_usec * 1000);
-//
-// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-//
-//     FILETIME ft;
-//     GetSystemTimeAsFileTime(&ft);
-//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-//
-//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-//     Timestamp timestamp;
-//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-//
-// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-//
-//     long millis = System.currentTimeMillis();
-//
-//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-//         .setNanos((int) ((millis % 1000) * 1000000)).build();
-//
-//
-// Example 5: Compute Timestamp from current time in Python.
-//
-//     timestamp = Timestamp()
-//     timestamp.GetCurrentTime()
-//
-// # JSON Mapping
-//
-// In JSON format, the Timestamp type is encoded as a string in the
-// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-// where {year} is always expressed using four digits while {month}, {day},
-// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required, though only UTC (as indicated by "Z") is presently supported.
-//
-// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-// 01:30 UTC on January 15, 2017.
-//
-// In JavaScript, one can convert a Date object to this format using the
-// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString]
-// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
-// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
-// can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime())
-// to obtain a formatter capable of generating timestamps in this format.
-//
-//
-type Timestamp struct {
-	// Represents seconds of UTC time since Unix epoch
-	// 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-	// 9999-12-31T23:59:59Z inclusive.
-	Seconds int64 `protobuf:"varint,1,opt,name=seconds" json:"seconds,omitempty"`
-	// Non-negative fractions of a second at nanosecond resolution. Negative
-	// second values with fractions must still have non-negative nanos values
-	// that count forward in time. Must be from 0 to 999,999,999
-	// inclusive.
-	Nanos int32 `protobuf:"varint,2,opt,name=nanos" json:"nanos,omitempty"`
-}
-
-func (m *Timestamp) Reset()                    { *m = Timestamp{} }
-func (m *Timestamp) String() string            { return proto.CompactTextString(m) }
-func (*Timestamp) ProtoMessage()               {}
-func (*Timestamp) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*Timestamp) XXX_WellKnownType() string   { return "Timestamp" }
-
-func (m *Timestamp) GetSeconds() int64 {
-	if m != nil {
-		return m.Seconds
-	}
-	return 0
-}
-
-func (m *Timestamp) GetNanos() int32 {
-	if m != nil {
-		return m.Nanos
-	}
-	return 0
-}
-
-func init() {
-	proto.RegisterType((*Timestamp)(nil), "google.protobuf.Timestamp")
-}
-
-func init() { proto.RegisterFile("google/protobuf/timestamp.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 191 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4f, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0xc9, 0xcc, 0x4d,
-	0x2d, 0x2e, 0x49, 0xcc, 0x2d, 0xd0, 0x03, 0x0b, 0x09, 0xf1, 0x43, 0x14, 0xe8, 0xc1, 0x14, 0x28,
-	0x59, 0x73, 0x71, 0x86, 0xc0, 0xd4, 0x08, 0x49, 0x70, 0xb1, 0x17, 0xa7, 0x26, 0xe7, 0xe7, 0xa5,
-	0x14, 0x4b, 0x30, 0x2a, 0x30, 0x6a, 0x30, 0x07, 0xc1, 0xb8, 0x42, 0x22, 0x5c, 0xac, 0x79, 0x89,
-	0x79, 0xf9, 0xc5, 0x12, 0x4c, 0x0a, 0x8c, 0x1a, 0xac, 0x41, 0x10, 0x8e, 0x53, 0x1d, 0x97, 0x70,
-	0x72, 0x7e, 0xae, 0x1e, 0x9a, 0x99, 0x4e, 0x7c, 0x70, 0x13, 0x03, 0x40, 0x42, 0x01, 0x8c, 0x51,
-	0xda, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, 0xb9, 0xfa, 0xe9, 0xf9, 0x39, 0x89,
-	0x79, 0xe9, 0x08, 0x27, 0x16, 0x94, 0x54, 0x16, 0xa4, 0x16, 0x23, 0x5c, 0xfa, 0x83, 0x91, 0x71,
-	0x11, 0x13, 0xb3, 0x7b, 0x80, 0xd3, 0x2a, 0x26, 0x39, 0x77, 0x88, 0xc9, 0x01, 0x50, 0xb5, 0x7a,
-	0xe1, 0xa9, 0x39, 0x39, 0xde, 0x79, 0xf9, 0xe5, 0x79, 0x21, 0x20, 0x3d, 0x49, 0x6c, 0x60, 0x43,
-	0x8c, 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xbc, 0x77, 0x4a, 0x07, 0xf7, 0x00, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto b/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
deleted file mode 100644
index b7cbd17502..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp/timestamp.proto
+++ /dev/null
@@ -1,133 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "github.com/golang/protobuf/ptypes/timestamp";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "TimestampProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// A Timestamp represents a point in time independent of any time zone
-// or calendar, represented as seconds and fractions of seconds at
-// nanosecond resolution in UTC Epoch time. It is encoded using the
-// Proleptic Gregorian Calendar which extends the Gregorian calendar
-// backwards to year one. It is encoded assuming all minutes are 60
-// seconds long, i.e. leap seconds are "smeared" so that no leap second
-// table is needed for interpretation. Range is from
-// 0001-01-01T00:00:00Z to 9999-12-31T23:59:59.999999999Z.
-// By restricting to that range, we ensure that we can convert to
-// and from  RFC 3339 date strings.
-// See [https://www.ietf.org/rfc/rfc3339.txt](https://www.ietf.org/rfc/rfc3339.txt).
-//
-// # Examples
-//
-// Example 1: Compute Timestamp from POSIX `time()`.
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(time(NULL));
-//     timestamp.set_nanos(0);
-//
-// Example 2: Compute Timestamp from POSIX `gettimeofday()`.
-//
-//     struct timeval tv;
-//     gettimeofday(&tv, NULL);
-//
-//     Timestamp timestamp;
-//     timestamp.set_seconds(tv.tv_sec);
-//     timestamp.set_nanos(tv.tv_usec * 1000);
-//
-// Example 3: Compute Timestamp from Win32 `GetSystemTimeAsFileTime()`.
-//
-//     FILETIME ft;
-//     GetSystemTimeAsFileTime(&ft);
-//     UINT64 ticks = (((UINT64)ft.dwHighDateTime) << 32) | ft.dwLowDateTime;
-//
-//     // A Windows tick is 100 nanoseconds. Windows epoch 1601-01-01T00:00:00Z
-//     // is 11644473600 seconds before Unix epoch 1970-01-01T00:00:00Z.
-//     Timestamp timestamp;
-//     timestamp.set_seconds((INT64) ((ticks / 10000000) - 11644473600LL));
-//     timestamp.set_nanos((INT32) ((ticks % 10000000) * 100));
-//
-// Example 4: Compute Timestamp from Java `System.currentTimeMillis()`.
-//
-//     long millis = System.currentTimeMillis();
-//
-//     Timestamp timestamp = Timestamp.newBuilder().setSeconds(millis / 1000)
-//         .setNanos((int) ((millis % 1000) * 1000000)).build();
-//
-//
-// Example 5: Compute Timestamp from current time in Python.
-//
-//     timestamp = Timestamp()
-//     timestamp.GetCurrentTime()
-//
-// # JSON Mapping
-//
-// In JSON format, the Timestamp type is encoded as a string in the
-// [RFC 3339](https://www.ietf.org/rfc/rfc3339.txt) format. That is, the
-// format is "{year}-{month}-{day}T{hour}:{min}:{sec}[.{frac_sec}]Z"
-// where {year} is always expressed using four digits while {month}, {day},
-// {hour}, {min}, and {sec} are zero-padded to two digits each. The fractional
-// seconds, which can go up to 9 digits (i.e. up to 1 nanosecond resolution),
-// are optional. The "Z" suffix indicates the timezone ("UTC"); the timezone
-// is required, though only UTC (as indicated by "Z") is presently supported.
-//
-// For example, "2017-01-15T01:30:15.01Z" encodes 15.01 seconds past
-// 01:30 UTC on January 15, 2017.
-//
-// In JavaScript, one can convert a Date object to this format using the
-// standard [toISOString()](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Date/toISOString]
-// method. In Python, a standard `datetime.datetime` object can be converted
-// to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
-// with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
-// can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime())
-// to obtain a formatter capable of generating timestamps in this format.
-//
-//
-message Timestamp {
-
-  // Represents seconds of UTC time since Unix epoch
-  // 1970-01-01T00:00:00Z. Must be from 0001-01-01T00:00:00Z to
-  // 9999-12-31T23:59:59Z inclusive.
-  int64 seconds = 1;
-
-  // Non-negative fractions of a second at nanosecond resolution. Negative
-  // second values with fractions must still have non-negative nanos values
-  // that count forward in time. Must be from 0 to 999,999,999
-  // inclusive.
-  int32 nanos = 2;
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp_test.go b/installer/vendor/github.com/golang/protobuf/ptypes/timestamp_test.go
deleted file mode 100644
index 6e3c969b94..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/timestamp_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Go support for Protocol Buffers - Google's data interchange format
-//
-// Copyright 2016 The Go Authors.  All rights reserved.
-// https://github.com/golang/protobuf
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-package ptypes
-
-import (
-	"math"
-	"testing"
-	"time"
-
-	"github.com/golang/protobuf/proto"
-	tspb "github.com/golang/protobuf/ptypes/timestamp"
-)
-
-var tests = []struct {
-	ts    *tspb.Timestamp
-	valid bool
-	t     time.Time
-}{
-	// The timestamp representing the Unix epoch date.
-	{&tspb.Timestamp{Seconds: 0, Nanos: 0}, true, utcDate(1970, 1, 1)},
-	// The smallest representable timestamp.
-	{&tspb.Timestamp{Seconds: math.MinInt64, Nanos: math.MinInt32}, false,
-		time.Unix(math.MinInt64, math.MinInt32).UTC()},
-	// The smallest representable timestamp with non-negative nanos.
-	{&tspb.Timestamp{Seconds: math.MinInt64, Nanos: 0}, false, time.Unix(math.MinInt64, 0).UTC()},
-	// The earliest valid timestamp.
-	{&tspb.Timestamp{Seconds: minValidSeconds, Nanos: 0}, true, utcDate(1, 1, 1)},
-	//"0001-01-01T00:00:00Z"},
-	// The largest representable timestamp.
-	{&tspb.Timestamp{Seconds: math.MaxInt64, Nanos: math.MaxInt32}, false,
-		time.Unix(math.MaxInt64, math.MaxInt32).UTC()},
-	// The largest representable timestamp with nanos in range.
-	{&tspb.Timestamp{Seconds: math.MaxInt64, Nanos: 1e9 - 1}, false,
-		time.Unix(math.MaxInt64, 1e9-1).UTC()},
-	// The largest valid timestamp.
-	{&tspb.Timestamp{Seconds: maxValidSeconds - 1, Nanos: 1e9 - 1}, true,
-		time.Date(9999, 12, 31, 23, 59, 59, 1e9-1, time.UTC)},
-	// The smallest invalid timestamp that is larger than the valid range.
-	{&tspb.Timestamp{Seconds: maxValidSeconds, Nanos: 0}, false, time.Unix(maxValidSeconds, 0).UTC()},
-	// A date before the epoch.
-	{&tspb.Timestamp{Seconds: -281836800, Nanos: 0}, true, utcDate(1961, 1, 26)},
-	// A date after the epoch.
-	{&tspb.Timestamp{Seconds: 1296000000, Nanos: 0}, true, utcDate(2011, 1, 26)},
-	// A date after the epoch, in the middle of the day.
-	{&tspb.Timestamp{Seconds: 1296012345, Nanos: 940483}, true,
-		time.Date(2011, 1, 26, 3, 25, 45, 940483, time.UTC)},
-}
-
-func TestValidateTimestamp(t *testing.T) {
-	for _, s := range tests {
-		got := validateTimestamp(s.ts)
-		if (got == nil) != s.valid {
-			t.Errorf("validateTimestamp(%v) = %v, want %v", s.ts, got, s.valid)
-		}
-	}
-}
-
-func TestTimestamp(t *testing.T) {
-	for _, s := range tests {
-		got, err := Timestamp(s.ts)
-		if (err == nil) != s.valid {
-			t.Errorf("Timestamp(%v) error = %v, but valid = %t", s.ts, err, s.valid)
-		} else if s.valid && got != s.t {
-			t.Errorf("Timestamp(%v) = %v, want %v", s.ts, got, s.t)
-		}
-	}
-	// Special case: a nil Timestamp is an error, but returns the 0 Unix time.
-	got, err := Timestamp(nil)
-	want := time.Unix(0, 0).UTC()
-	if got != want {
-		t.Errorf("Timestamp(nil) = %v, want %v", got, want)
-	}
-	if err == nil {
-		t.Errorf("Timestamp(nil) error = nil, expected error")
-	}
-}
-
-func TestTimestampProto(t *testing.T) {
-	for _, s := range tests {
-		got, err := TimestampProto(s.t)
-		if (err == nil) != s.valid {
-			t.Errorf("TimestampProto(%v) error = %v, but valid = %t", s.t, err, s.valid)
-		} else if s.valid && !proto.Equal(got, s.ts) {
-			t.Errorf("TimestampProto(%v) = %v, want %v", s.t, got, s.ts)
-		}
-	}
-	// No corresponding special case here: no time.Time results in a nil Timestamp.
-}
-
-func TestTimestampString(t *testing.T) {
-	for _, test := range []struct {
-		ts   *tspb.Timestamp
-		want string
-	}{
-		// Not much testing needed because presumably time.Format is
-		// well-tested.
-		{&tspb.Timestamp{Seconds: 0, Nanos: 0}, "1970-01-01T00:00:00Z"},
-		{&tspb.Timestamp{Seconds: minValidSeconds - 1, Nanos: 0}, "(timestamp: seconds:-62135596801  before 0001-01-01)"},
-	} {
-		got := TimestampString(test.ts)
-		if got != test.want {
-			t.Errorf("TimestampString(%v) = %q, want %q", test.ts, got, test.want)
-		}
-	}
-}
-
-func utcDate(year, month, day int) time.Time {
-	return time.Date(year, time.Month(month), day, 0, 0, 0, 0, time.UTC)
-}
-
-func TestTimestampNow(t *testing.T) {
-	// Bracket the expected time.
-	before := time.Now()
-	ts := TimestampNow()
-	after := time.Now()
-
-	tm, err := Timestamp(ts)
-	if err != nil {
-		t.Errorf("between %v and %v\nTimestampNow() = %v\nwhich is invalid (%v)", before, after, ts, err)
-	}
-	if tm.Before(before) || tm.After(after) {
-		t.Errorf("between %v and %v\nTimestamp(TimestampNow()) = %v", before, after, tm)
-	}
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go b/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go
deleted file mode 100644
index 0ed59bf19b..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.pb.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Code generated by protoc-gen-go. DO NOT EDIT.
-// source: google/protobuf/wrappers.proto
-
-/*
-Package wrappers is a generated protocol buffer package.
-
-It is generated from these files:
-	google/protobuf/wrappers.proto
-
-It has these top-level messages:
-	DoubleValue
-	FloatValue
-	Int64Value
-	UInt64Value
-	Int32Value
-	UInt32Value
-	BoolValue
-	StringValue
-	BytesValue
-*/
-package wrappers
-
-import proto "github.com/golang/protobuf/proto"
-import fmt "fmt"
-import math "math"
-
-// Reference imports to suppress errors if they are not otherwise used.
-var _ = proto.Marshal
-var _ = fmt.Errorf
-var _ = math.Inf
-
-// This is a compile-time assertion to ensure that this generated file
-// is compatible with the proto package it is being compiled against.
-// A compilation error at this line likely means your copy of the
-// proto package needs to be updated.
-const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package
-
-// Wrapper message for `double`.
-//
-// The JSON representation for `DoubleValue` is JSON number.
-type DoubleValue struct {
-	// The double value.
-	Value float64 `protobuf:"fixed64,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *DoubleValue) Reset()                    { *m = DoubleValue{} }
-func (m *DoubleValue) String() string            { return proto.CompactTextString(m) }
-func (*DoubleValue) ProtoMessage()               {}
-func (*DoubleValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} }
-func (*DoubleValue) XXX_WellKnownType() string   { return "DoubleValue" }
-
-func (m *DoubleValue) GetValue() float64 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `float`.
-//
-// The JSON representation for `FloatValue` is JSON number.
-type FloatValue struct {
-	// The float value.
-	Value float32 `protobuf:"fixed32,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *FloatValue) Reset()                    { *m = FloatValue{} }
-func (m *FloatValue) String() string            { return proto.CompactTextString(m) }
-func (*FloatValue) ProtoMessage()               {}
-func (*FloatValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} }
-func (*FloatValue) XXX_WellKnownType() string   { return "FloatValue" }
-
-func (m *FloatValue) GetValue() float32 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `int64`.
-//
-// The JSON representation for `Int64Value` is JSON string.
-type Int64Value struct {
-	// The int64 value.
-	Value int64 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *Int64Value) Reset()                    { *m = Int64Value{} }
-func (m *Int64Value) String() string            { return proto.CompactTextString(m) }
-func (*Int64Value) ProtoMessage()               {}
-func (*Int64Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} }
-func (*Int64Value) XXX_WellKnownType() string   { return "Int64Value" }
-
-func (m *Int64Value) GetValue() int64 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `uint64`.
-//
-// The JSON representation for `UInt64Value` is JSON string.
-type UInt64Value struct {
-	// The uint64 value.
-	Value uint64 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *UInt64Value) Reset()                    { *m = UInt64Value{} }
-func (m *UInt64Value) String() string            { return proto.CompactTextString(m) }
-func (*UInt64Value) ProtoMessage()               {}
-func (*UInt64Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} }
-func (*UInt64Value) XXX_WellKnownType() string   { return "UInt64Value" }
-
-func (m *UInt64Value) GetValue() uint64 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `int32`.
-//
-// The JSON representation for `Int32Value` is JSON number.
-type Int32Value struct {
-	// The int32 value.
-	Value int32 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *Int32Value) Reset()                    { *m = Int32Value{} }
-func (m *Int32Value) String() string            { return proto.CompactTextString(m) }
-func (*Int32Value) ProtoMessage()               {}
-func (*Int32Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} }
-func (*Int32Value) XXX_WellKnownType() string   { return "Int32Value" }
-
-func (m *Int32Value) GetValue() int32 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `uint32`.
-//
-// The JSON representation for `UInt32Value` is JSON number.
-type UInt32Value struct {
-	// The uint32 value.
-	Value uint32 `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *UInt32Value) Reset()                    { *m = UInt32Value{} }
-func (m *UInt32Value) String() string            { return proto.CompactTextString(m) }
-func (*UInt32Value) ProtoMessage()               {}
-func (*UInt32Value) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} }
-func (*UInt32Value) XXX_WellKnownType() string   { return "UInt32Value" }
-
-func (m *UInt32Value) GetValue() uint32 {
-	if m != nil {
-		return m.Value
-	}
-	return 0
-}
-
-// Wrapper message for `bool`.
-//
-// The JSON representation for `BoolValue` is JSON `true` and `false`.
-type BoolValue struct {
-	// The bool value.
-	Value bool `protobuf:"varint,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *BoolValue) Reset()                    { *m = BoolValue{} }
-func (m *BoolValue) String() string            { return proto.CompactTextString(m) }
-func (*BoolValue) ProtoMessage()               {}
-func (*BoolValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} }
-func (*BoolValue) XXX_WellKnownType() string   { return "BoolValue" }
-
-func (m *BoolValue) GetValue() bool {
-	if m != nil {
-		return m.Value
-	}
-	return false
-}
-
-// Wrapper message for `string`.
-//
-// The JSON representation for `StringValue` is JSON string.
-type StringValue struct {
-	// The string value.
-	Value string `protobuf:"bytes,1,opt,name=value" json:"value,omitempty"`
-}
-
-func (m *StringValue) Reset()                    { *m = StringValue{} }
-func (m *StringValue) String() string            { return proto.CompactTextString(m) }
-func (*StringValue) ProtoMessage()               {}
-func (*StringValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} }
-func (*StringValue) XXX_WellKnownType() string   { return "StringValue" }
-
-func (m *StringValue) GetValue() string {
-	if m != nil {
-		return m.Value
-	}
-	return ""
-}
-
-// Wrapper message for `bytes`.
-//
-// The JSON representation for `BytesValue` is JSON string.
-type BytesValue struct {
-	// The bytes value.
-	Value []byte `protobuf:"bytes,1,opt,name=value,proto3" json:"value,omitempty"`
-}
-
-func (m *BytesValue) Reset()                    { *m = BytesValue{} }
-func (m *BytesValue) String() string            { return proto.CompactTextString(m) }
-func (*BytesValue) ProtoMessage()               {}
-func (*BytesValue) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{8} }
-func (*BytesValue) XXX_WellKnownType() string   { return "BytesValue" }
-
-func (m *BytesValue) GetValue() []byte {
-	if m != nil {
-		return m.Value
-	}
-	return nil
-}
-
-func init() {
-	proto.RegisterType((*DoubleValue)(nil), "google.protobuf.DoubleValue")
-	proto.RegisterType((*FloatValue)(nil), "google.protobuf.FloatValue")
-	proto.RegisterType((*Int64Value)(nil), "google.protobuf.Int64Value")
-	proto.RegisterType((*UInt64Value)(nil), "google.protobuf.UInt64Value")
-	proto.RegisterType((*Int32Value)(nil), "google.protobuf.Int32Value")
-	proto.RegisterType((*UInt32Value)(nil), "google.protobuf.UInt32Value")
-	proto.RegisterType((*BoolValue)(nil), "google.protobuf.BoolValue")
-	proto.RegisterType((*StringValue)(nil), "google.protobuf.StringValue")
-	proto.RegisterType((*BytesValue)(nil), "google.protobuf.BytesValue")
-}
-
-func init() { proto.RegisterFile("google/protobuf/wrappers.proto", fileDescriptor0) }
-
-var fileDescriptor0 = []byte{
-	// 259 bytes of a gzipped FileDescriptorProto
-	0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x4b, 0xcf, 0xcf, 0x4f,
-	0xcf, 0x49, 0xd5, 0x2f, 0x28, 0xca, 0x2f, 0xc9, 0x4f, 0x2a, 0x4d, 0xd3, 0x2f, 0x2f, 0x4a, 0x2c,
-	0x28, 0x48, 0x2d, 0x2a, 0xd6, 0x03, 0x8b, 0x08, 0xf1, 0x43, 0xe4, 0xf5, 0x60, 0xf2, 0x4a, 0xca,
-	0x5c, 0xdc, 0x2e, 0xf9, 0xa5, 0x49, 0x39, 0xa9, 0x61, 0x89, 0x39, 0xa5, 0xa9, 0x42, 0x22, 0x5c,
-	0xac, 0x65, 0x20, 0x86, 0x04, 0xa3, 0x02, 0xa3, 0x06, 0x63, 0x10, 0x84, 0xa3, 0xa4, 0xc4, 0xc5,
-	0xe5, 0x96, 0x93, 0x9f, 0x58, 0x82, 0x45, 0x0d, 0x13, 0x92, 0x1a, 0xcf, 0xbc, 0x12, 0x33, 0x13,
-	0x2c, 0x6a, 0x98, 0x61, 0x6a, 0x94, 0xb9, 0xb8, 0x43, 0x71, 0x29, 0x62, 0x41, 0x35, 0xc8, 0xd8,
-	0x08, 0x8b, 0x1a, 0x56, 0x34, 0x83, 0xb0, 0x2a, 0xe2, 0x85, 0x29, 0x52, 0xe4, 0xe2, 0x74, 0xca,
-	0xcf, 0xcf, 0xc1, 0xa2, 0x84, 0x03, 0xc9, 0x9c, 0xe0, 0x92, 0xa2, 0xcc, 0xbc, 0x74, 0x2c, 0x8a,
-	0x38, 0x91, 0x1c, 0xe4, 0x54, 0x59, 0x92, 0x5a, 0x8c, 0x45, 0x0d, 0x0f, 0x54, 0x8d, 0x53, 0x0d,
-	0x97, 0x70, 0x72, 0x7e, 0xae, 0x1e, 0x5a, 0xe8, 0x3a, 0xf1, 0x86, 0x43, 0x83, 0x3f, 0x00, 0x24,
-	0x12, 0xc0, 0x18, 0xa5, 0x95, 0x9e, 0x59, 0x92, 0x51, 0x9a, 0xa4, 0x97, 0x9c, 0x9f, 0xab, 0x9f,
-	0x9e, 0x9f, 0x93, 0x98, 0x97, 0x8e, 0x88, 0xaa, 0x82, 0x92, 0xca, 0x82, 0xd4, 0x62, 0x78, 0x8c,
-	0xfd, 0x60, 0x64, 0x5c, 0xc4, 0xc4, 0xec, 0x1e, 0xe0, 0xb4, 0x8a, 0x49, 0xce, 0x1d, 0x62, 0x6e,
-	0x00, 0x54, 0xa9, 0x5e, 0x78, 0x6a, 0x4e, 0x8e, 0x77, 0x5e, 0x7e, 0x79, 0x5e, 0x08, 0x48, 0x4b,
-	0x12, 0x1b, 0xd8, 0x0c, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x19, 0x6c, 0xb9, 0xb8, 0xfe,
-	0x01, 0x00, 0x00,
-}
diff --git a/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.proto b/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.proto
deleted file mode 100644
index 01947639ac..0000000000
--- a/installer/vendor/github.com/golang/protobuf/ptypes/wrappers/wrappers.proto
+++ /dev/null
@@ -1,118 +0,0 @@
-// Protocol Buffers - Google's data interchange format
-// Copyright 2008 Google Inc.  All rights reserved.
-// https://developers.google.com/protocol-buffers/
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-//     * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-//     * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-//     * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-// Wrappers for primitive (non-message) types. These types are useful
-// for embedding primitives in the `google.protobuf.Any` type and for places
-// where we need to distinguish between the absence of a primitive
-// typed field and its default value.
-
-syntax = "proto3";
-
-package google.protobuf;
-
-option csharp_namespace = "Google.Protobuf.WellKnownTypes";
-option cc_enable_arenas = true;
-option go_package = "github.com/golang/protobuf/ptypes/wrappers";
-option java_package = "com.google.protobuf";
-option java_outer_classname = "WrappersProto";
-option java_multiple_files = true;
-option objc_class_prefix = "GPB";
-
-// Wrapper message for `double`.
-//
-// The JSON representation for `DoubleValue` is JSON number.
-message DoubleValue {
-  // The double value.
-  double value = 1;
-}
-
-// Wrapper message for `float`.
-//
-// The JSON representation for `FloatValue` is JSON number.
-message FloatValue {
-  // The float value.
-  float value = 1;
-}
-
-// Wrapper message for `int64`.
-//
-// The JSON representation for `Int64Value` is JSON string.
-message Int64Value {
-  // The int64 value.
-  int64 value = 1;
-}
-
-// Wrapper message for `uint64`.
-//
-// The JSON representation for `UInt64Value` is JSON string.
-message UInt64Value {
-  // The uint64 value.
-  uint64 value = 1;
-}
-
-// Wrapper message for `int32`.
-//
-// The JSON representation for `Int32Value` is JSON number.
-message Int32Value {
-  // The int32 value.
-  int32 value = 1;
-}
-
-// Wrapper message for `uint32`.
-//
-// The JSON representation for `UInt32Value` is JSON number.
-message UInt32Value {
-  // The uint32 value.
-  uint32 value = 1;
-}
-
-// Wrapper message for `bool`.
-//
-// The JSON representation for `BoolValue` is JSON `true` and `false`.
-message BoolValue {
-  // The bool value.
-  bool value = 1;
-}
-
-// Wrapper message for `string`.
-//
-// The JSON representation for `StringValue` is JSON string.
-message StringValue {
-  // The string value.
-  string value = 1;
-}
-
-// Wrapper message for `bytes`.
-//
-// The JSON representation for `BytesValue` is JSON string.
-message BytesValue {
-  // The bytes value.
-  bytes value = 1;
-}
diff --git a/installer/vendor/github.com/google/uuid/.travis.yml b/installer/vendor/github.com/google/uuid/.travis.yml
deleted file mode 100644
index d8156a60ba..0000000000
--- a/installer/vendor/github.com/google/uuid/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-
-go:
-  - 1.4.3
-  - 1.5.3
-  - tip
-
-script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/google/uuid/CONTRIBUTING.md b/installer/vendor/github.com/google/uuid/CONTRIBUTING.md
deleted file mode 100644
index 04fdf09f13..0000000000
--- a/installer/vendor/github.com/google/uuid/CONTRIBUTING.md
+++ /dev/null
@@ -1,10 +0,0 @@
-# How to contribute
-
-We definitely welcome patches and contribution to this project!
-
-### Legal requirements
-
-In order to protect both you and ourselves, you will need to sign the
-[Contributor License Agreement](https://cla.developers.google.com/clas).
-
-You may have already signed it for other Google projects.
diff --git a/installer/vendor/github.com/google/uuid/README.md b/installer/vendor/github.com/google/uuid/README.md
deleted file mode 100644
index 21205eaeb5..0000000000
--- a/installer/vendor/github.com/google/uuid/README.md
+++ /dev/null
@@ -1,23 +0,0 @@
-**This package is currently in development and the API may not be stable.**
-
-The API will become stable with v1.
-
-# uuid ![build status](https://travis-ci.org/google/uuid.svg?branch=master)
-The uuid package generates and inspects UUIDs based on
-[RFC 4122](http://tools.ietf.org/html/rfc4122)
-and DCE 1.1: Authentication and Security Services. 
-
-This package is based on the github.com/pborman/uuid package (previously named
-code.google.com/p/go-uuid).  It differs from these earlier packages in that
-a UUID is a 16 byte array rather than a byte slice.  One loss due to this
-change is the ability to represent an invalid UUID (vs a NIL UUID).
-
-###### Install
-`go get github.com/google/uuid`
-
-###### Documentation 
-[![GoDoc](https://godoc.org/github.com/google/uuid?status.svg)](http://godoc.org/github.com/google/uuid)
-
-Full `go doc` style documentation for the package can be viewed online without
-installing this package by using the GoDoc site here: 
-http://godoc.org/github.com/google/uuid
diff --git a/installer/vendor/github.com/google/uuid/json_test.go b/installer/vendor/github.com/google/uuid/json_test.go
deleted file mode 100644
index 245f91edfb..0000000000
--- a/installer/vendor/github.com/google/uuid/json_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2016 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"encoding/json"
-	"reflect"
-	"testing"
-)
-
-var testUUID = Must(Parse("f47ac10b-58cc-0372-8567-0e02b2c3d479"))
-
-func TestJSON(t *testing.T) {
-	type S struct {
-		ID1 UUID
-		ID2 UUID
-	}
-	s1 := S{ID1: testUUID}
-	data, err := json.Marshal(&s1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var s2 S
-	if err := json.Unmarshal(data, &s2); err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(&s1, &s2) {
-		t.Errorf("got %#v, want %#v", s2, s1)
-	}
-}
-
-func BenchmarkUUID_MarshalJSON(b *testing.B) {
-	x := &struct {
-		UUID UUID `json:"uuid"`
-	}{}
-	var err error
-	x.UUID, err = Parse("f47ac10b-58cc-0372-8567-0e02b2c3d479")
-	if err != nil {
-		b.Fatal(err)
-	}
-	for i := 0; i < b.N; i++ {
-		js, err := json.Marshal(x)
-		if err != nil {
-			b.Fatalf("marshal json: %#v (%v)", js, err)
-		}
-	}
-}
-
-func BenchmarkUUID_UnmarshalJSON(b *testing.B) {
-	js := []byte(`{"uuid":"f47ac10b-58cc-0372-8567-0e02b2c3d479"}`)
-	var x *struct {
-		UUID UUID `json:"uuid"`
-	}
-	for i := 0; i < b.N; i++ {
-		err := json.Unmarshal(js, &x)
-		if err != nil {
-			b.Fatalf("marshal json: %#v (%v)", js, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/google/uuid/seq_test.go b/installer/vendor/github.com/google/uuid/seq_test.go
deleted file mode 100644
index 853a4aa3f3..0000000000
--- a/installer/vendor/github.com/google/uuid/seq_test.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2016 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"flag"
-	"runtime"
-	"testing"
-	"time"
-)
-
-// This test is only run when --regressions is passed on the go test line.
-var regressions = flag.Bool("regressions", false, "run uuid regression tests")
-
-// TestClockSeqRace tests for a particular race condition of returning two
-// identical Version1 UUIDs.  The duration of 1 minute was chosen as the race
-// condition, before being fixed, nearly always occured in under 30 seconds.
-func TestClockSeqRace(t *testing.T) {
-	if !*regressions {
-		t.Skip("skipping regression tests")
-	}
-	duration := time.Minute
-
-	done := make(chan struct{})
-	defer close(done)
-
-	ch := make(chan UUID, 10000)
-	ncpu := runtime.NumCPU()
-	switch ncpu {
-	case 0, 1:
-		// We can't run the test effectively.
-		t.Skip("skipping race test, only one CPU detected")
-		return
-	default:
-		runtime.GOMAXPROCS(ncpu)
-	}
-	for i := 0; i < ncpu; i++ {
-		go func() {
-			for {
-				select {
-				case <-done:
-					return
-				case ch <- Must(NewUUID()):
-				}
-			}
-		}()
-	}
-
-	uuids := make(map[string]bool)
-	cnt := 0
-	start := time.Now()
-	for u := range ch {
-		s := u.String()
-		if uuids[s] {
-			t.Errorf("duplicate uuid after %d in %v: %s", cnt, time.Since(start), s)
-			return
-		}
-		uuids[s] = true
-		if time.Since(start) > duration {
-			return
-		}
-		cnt++
-	}
-}
diff --git a/installer/vendor/github.com/google/uuid/sql_test.go b/installer/vendor/github.com/google/uuid/sql_test.go
deleted file mode 100644
index c193196037..0000000000
--- a/installer/vendor/github.com/google/uuid/sql_test.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2016 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"strings"
-	"testing"
-)
-
-func TestScan(t *testing.T) {
-	var stringTest string = "f47ac10b-58cc-0372-8567-0e02b2c3d479"
-	var badTypeTest int = 6
-	var invalidTest string = "f47ac10b-58cc-0372-8567-0e02b2c3d4"
-
-	byteTest := make([]byte, 16)
-	byteTestUUID := Must(Parse(stringTest))
-	copy(byteTest, byteTestUUID[:])
-
-	// sunny day tests
-
-	var uuid UUID
-	err := (&uuid).Scan(stringTest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = (&uuid).Scan([]byte(stringTest))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = (&uuid).Scan(byteTest)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// bad type tests
-
-	err = (&uuid).Scan(badTypeTest)
-	if err == nil {
-		t.Error("int correctly parsed and shouldn't have")
-	}
-	if !strings.Contains(err.Error(), "unable to scan type") {
-		t.Error("attempting to parse an int returned an incorrect error message")
-	}
-
-	// invalid/incomplete uuids
-
-	err = (&uuid).Scan(invalidTest)
-	if err == nil {
-		t.Error("invalid uuid was parsed without error")
-	}
-	if !strings.Contains(err.Error(), "invalid UUID") {
-		t.Error("attempting to parse an invalid UUID returned an incorrect error message")
-	}
-
-	err = (&uuid).Scan(byteTest[:len(byteTest)-2])
-	if err == nil {
-		t.Error("invalid byte uuid was parsed without error")
-	}
-	if !strings.Contains(err.Error(), "invalid UUID") {
-		t.Error("attempting to parse an invalid byte UUID returned an incorrect error message")
-	}
-
-	// empty tests
-
-	uuid = UUID{}
-	var emptySlice []byte
-	err = (&uuid).Scan(emptySlice)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, v := range uuid {
-		if v != 0 {
-			t.Error("UUID was not nil after scanning empty byte slice")
-		}
-	}
-
-	uuid = UUID{}
-	var emptyString string
-	err = (&uuid).Scan(emptyString)
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, v := range uuid {
-		if v != 0 {
-			t.Error("UUID was not nil after scanning empty byte slice")
-		}
-	}
-}
-
-func TestValue(t *testing.T) {
-	stringTest := "f47ac10b-58cc-0372-8567-0e02b2c3d479"
-	uuid := Must(Parse(stringTest))
-	val, _ := uuid.Value()
-	if val != stringTest {
-		t.Error("Value() did not return expected string")
-	}
-}
diff --git a/installer/vendor/github.com/google/uuid/uuid_test.go b/installer/vendor/github.com/google/uuid/uuid_test.go
deleted file mode 100644
index 70986ff3f3..0000000000
--- a/installer/vendor/github.com/google/uuid/uuid_test.go
+++ /dev/null
@@ -1,526 +0,0 @@
-// Copyright 2016 Google Inc.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package uuid
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-	"time"
-	"unsafe"
-)
-
-type test struct {
-	in      string
-	version Version
-	variant Variant
-	isuuid  bool
-}
-
-var tests = []test{
-	{"f47ac10b-58cc-0372-8567-0e02b2c3d479", 0, RFC4122, true},
-	{"f47ac10b-58cc-1372-8567-0e02b2c3d479", 1, RFC4122, true},
-	{"f47ac10b-58cc-2372-8567-0e02b2c3d479", 2, RFC4122, true},
-	{"f47ac10b-58cc-3372-8567-0e02b2c3d479", 3, RFC4122, true},
-	{"f47ac10b-58cc-4372-8567-0e02b2c3d479", 4, RFC4122, true},
-	{"f47ac10b-58cc-5372-8567-0e02b2c3d479", 5, RFC4122, true},
-	{"f47ac10b-58cc-6372-8567-0e02b2c3d479", 6, RFC4122, true},
-	{"f47ac10b-58cc-7372-8567-0e02b2c3d479", 7, RFC4122, true},
-	{"f47ac10b-58cc-8372-8567-0e02b2c3d479", 8, RFC4122, true},
-	{"f47ac10b-58cc-9372-8567-0e02b2c3d479", 9, RFC4122, true},
-	{"f47ac10b-58cc-a372-8567-0e02b2c3d479", 10, RFC4122, true},
-	{"f47ac10b-58cc-b372-8567-0e02b2c3d479", 11, RFC4122, true},
-	{"f47ac10b-58cc-c372-8567-0e02b2c3d479", 12, RFC4122, true},
-	{"f47ac10b-58cc-d372-8567-0e02b2c3d479", 13, RFC4122, true},
-	{"f47ac10b-58cc-e372-8567-0e02b2c3d479", 14, RFC4122, true},
-	{"f47ac10b-58cc-f372-8567-0e02b2c3d479", 15, RFC4122, true},
-
-	{"urn:uuid:f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
-	{"URN:UUID:f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-0567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-1567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-2567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-3567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-4567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-5567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-6567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-7567-0e02b2c3d479", 4, Reserved, true},
-	{"f47ac10b-58cc-4372-8567-0e02b2c3d479", 4, RFC4122, true},
-	{"f47ac10b-58cc-4372-9567-0e02b2c3d479", 4, RFC4122, true},
-	{"f47ac10b-58cc-4372-a567-0e02b2c3d479", 4, RFC4122, true},
-	{"f47ac10b-58cc-4372-b567-0e02b2c3d479", 4, RFC4122, true},
-	{"f47ac10b-58cc-4372-c567-0e02b2c3d479", 4, Microsoft, true},
-	{"f47ac10b-58cc-4372-d567-0e02b2c3d479", 4, Microsoft, true},
-	{"f47ac10b-58cc-4372-e567-0e02b2c3d479", 4, Future, true},
-	{"f47ac10b-58cc-4372-f567-0e02b2c3d479", 4, Future, true},
-
-	{"f47ac10b158cc-5372-a567-0e02b2c3d479", 0, Invalid, false},
-	{"f47ac10b-58cc25372-a567-0e02b2c3d479", 0, Invalid, false},
-	{"f47ac10b-58cc-53723a567-0e02b2c3d479", 0, Invalid, false},
-	{"f47ac10b-58cc-5372-a56740e02b2c3d479", 0, Invalid, false},
-	{"f47ac10b-58cc-5372-a567-0e02-2c3d479", 0, Invalid, false},
-	{"g47ac10b-58cc-4372-a567-0e02b2c3d479", 0, Invalid, false},
-}
-
-var constants = []struct {
-	c    interface{}
-	name string
-}{
-	{Person, "Person"},
-	{Group, "Group"},
-	{Org, "Org"},
-	{Invalid, "Invalid"},
-	{RFC4122, "RFC4122"},
-	{Reserved, "Reserved"},
-	{Microsoft, "Microsoft"},
-	{Future, "Future"},
-	{Domain(17), "Domain17"},
-	{Variant(42), "BadVariant42"},
-}
-
-func testTest(t *testing.T, in string, tt test) {
-	uuid, err := Parse(in)
-	if ok := (err == nil); ok != tt.isuuid {
-		t.Errorf("Parse(%s) got %v expected %v\b", in, ok, tt.isuuid)
-	}
-	if err != nil {
-		return
-	}
-
-	if v := uuid.Variant(); v != tt.variant {
-		t.Errorf("Variant(%s) got %d expected %d\b", in, v, tt.variant)
-	}
-	if v := uuid.Version(); v != tt.version {
-		t.Errorf("Version(%s) got %d expected %d\b", in, v, tt.version)
-	}
-}
-
-func testBytes(t *testing.T, in []byte, tt test) {
-	uuid, err := ParseBytes(in)
-	if ok := (err == nil); ok != tt.isuuid {
-		t.Errorf("ParseBytes(%s) got %v expected %v\b", in, ok, tt.isuuid)
-	}
-	if err != nil {
-		return
-	}
-	suuid, _ := Parse(string(in))
-	if uuid != suuid {
-		t.Errorf("ParseBytes(%s) got %v expected %v\b", in, uuid, suuid)
-	}
-}
-
-func TestUUID(t *testing.T) {
-	for _, tt := range tests {
-		testTest(t, tt.in, tt)
-		testTest(t, strings.ToUpper(tt.in), tt)
-		testBytes(t, []byte(tt.in), tt)
-	}
-}
-
-func TestConstants(t *testing.T) {
-	for x, tt := range constants {
-		v, ok := tt.c.(fmt.Stringer)
-		if !ok {
-			t.Errorf("%x: %v: not a stringer", x, v)
-		} else if s := v.String(); s != tt.name {
-			v, _ := tt.c.(int)
-			t.Errorf("%x: Constant %T:%d gives %q, expected %q", x, tt.c, v, s, tt.name)
-		}
-	}
-}
-
-func TestRandomUUID(t *testing.T) {
-	m := make(map[string]bool)
-	for x := 1; x < 32; x++ {
-		uuid := New()
-		s := uuid.String()
-		if m[s] {
-			t.Errorf("NewRandom returned duplicated UUID %s", s)
-		}
-		m[s] = true
-		if v := uuid.Version(); v != 4 {
-			t.Errorf("Random UUID of version %s", v)
-		}
-		if uuid.Variant() != RFC4122 {
-			t.Errorf("Random UUID is variant %d", uuid.Variant())
-		}
-	}
-}
-
-func TestNew(t *testing.T) {
-	m := make(map[UUID]bool)
-	for x := 1; x < 32; x++ {
-		s := New()
-		if m[s] {
-			t.Errorf("New returned duplicated UUID %s", s)
-		}
-		m[s] = true
-		uuid, err := Parse(s.String())
-		if err != nil {
-			t.Errorf("New.String() returned %q which does not decode", s)
-			continue
-		}
-		if v := uuid.Version(); v != 4 {
-			t.Errorf("Random UUID of version %s", v)
-		}
-		if uuid.Variant() != RFC4122 {
-			t.Errorf("Random UUID is variant %d", uuid.Variant())
-		}
-	}
-}
-
-func TestClockSeq(t *testing.T) {
-	// Fake time.Now for this test to return a monotonically advancing time; restore it at end.
-	defer func(orig func() time.Time) { timeNow = orig }(timeNow)
-	monTime := time.Now()
-	timeNow = func() time.Time {
-		monTime = monTime.Add(1 * time.Second)
-		return monTime
-	}
-
-	SetClockSequence(-1)
-	uuid1, err := NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-	uuid2, err := NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-
-	if s1, s2 := uuid1.ClockSequence(), uuid2.ClockSequence(); s1 != s2 {
-		t.Errorf("clock sequence %d != %d", s1, s2)
-	}
-
-	SetClockSequence(-1)
-	uuid2, err = NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-
-	// Just on the very off chance we generated the same sequence
-	// two times we try again.
-	if uuid1.ClockSequence() == uuid2.ClockSequence() {
-		SetClockSequence(-1)
-		uuid2, err = NewUUID()
-		if err != nil {
-			t.Fatalf("could not create UUID: %v", err)
-		}
-	}
-	if s1, s2 := uuid1.ClockSequence(), uuid2.ClockSequence(); s1 == s2 {
-		t.Errorf("Duplicate clock sequence %d", s1)
-	}
-
-	SetClockSequence(0x1234)
-	uuid1, err = NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-	if seq := uuid1.ClockSequence(); seq != 0x1234 {
-		t.Errorf("%s: expected seq 0x1234 got 0x%04x", uuid1, seq)
-	}
-}
-
-func TestCoding(t *testing.T) {
-	text := "7d444840-9dc0-11d1-b245-5ffdce74fad2"
-	urn := "urn:uuid:7d444840-9dc0-11d1-b245-5ffdce74fad2"
-	data := UUID{
-		0x7d, 0x44, 0x48, 0x40,
-		0x9d, 0xc0,
-		0x11, 0xd1,
-		0xb2, 0x45,
-		0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2,
-	}
-	if v := data.String(); v != text {
-		t.Errorf("%x: encoded to %s, expected %s", data, v, text)
-	}
-	if v := data.URN(); v != urn {
-		t.Errorf("%x: urn is %s, expected %s", data, v, urn)
-	}
-
-	uuid, err := Parse(text)
-	if err != nil {
-		t.Errorf("Parse returned unexpected error %v", err)
-	}
-	if data != data {
-		t.Errorf("%s: decoded to %s, expected %s", text, uuid, data)
-	}
-}
-
-func TestVersion1(t *testing.T) {
-	uuid1, err := NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-	uuid2, err := NewUUID()
-	if err != nil {
-		t.Fatalf("could not create UUID: %v", err)
-	}
-
-	if uuid1 == uuid2 {
-		t.Errorf("%s:duplicate uuid", uuid1)
-	}
-	if v := uuid1.Version(); v != 1 {
-		t.Errorf("%s: version %s expected 1", uuid1, v)
-	}
-	if v := uuid2.Version(); v != 1 {
-		t.Errorf("%s: version %s expected 1", uuid2, v)
-	}
-	n1 := uuid1.NodeID()
-	n2 := uuid2.NodeID()
-	if !bytes.Equal(n1, n2) {
-		t.Errorf("Different nodes %x != %x", n1, n2)
-	}
-	t1 := uuid1.Time()
-	t2 := uuid2.Time()
-	q1 := uuid1.ClockSequence()
-	q2 := uuid2.ClockSequence()
-
-	switch {
-	case t1 == t2 && q1 == q2:
-		t.Error("time stopped")
-	case t1 > t2 && q1 == q2:
-		t.Error("time reversed")
-	case t1 < t2 && q1 != q2:
-		t.Error("clock sequence chaned unexpectedly")
-	}
-}
-
-func TestNode(t *testing.T) {
-	// This test is mostly to make sure we don't leave nodeMu locked.
-	ifname = ""
-	if ni := NodeInterface(); ni != "" {
-		t.Errorf("NodeInterface got %q, want %q", ni, "")
-	}
-	if SetNodeInterface("xyzzy") {
-		t.Error("SetNodeInterface succeeded on a bad interface name")
-	}
-	if !SetNodeInterface("") {
-		t.Error("SetNodeInterface failed")
-	}
-	if ni := NodeInterface(); ni == "" {
-		t.Error("NodeInterface returned an empty string")
-	}
-
-	ni := NodeID()
-	if len(ni) != 6 {
-		t.Errorf("ni got %d bytes, want 6", len(ni))
-	}
-	hasData := false
-	for _, b := range ni {
-		if b != 0 {
-			hasData = true
-		}
-	}
-	if !hasData {
-		t.Error("nodeid is all zeros")
-	}
-
-	id := []byte{1, 2, 3, 4, 5, 6, 7, 8}
-	SetNodeID(id)
-	ni = NodeID()
-	if !bytes.Equal(ni, id[:6]) {
-		t.Errorf("got nodeid %v, want %v", ni, id[:6])
-	}
-
-	if ni := NodeInterface(); ni != "user" {
-		t.Errorf("got inteface %q, want %q", ni, "user")
-	}
-}
-
-func TestNodeAndTime(t *testing.T) {
-	// Time is February 5, 1998 12:30:23.136364800 AM GMT
-
-	uuid, err := Parse("7d444840-9dc0-11d1-b245-5ffdce74fad2")
-	if err != nil {
-		t.Fatalf("Parser returned unexpected error %v", err)
-	}
-	node := []byte{0x5f, 0xfd, 0xce, 0x74, 0xfa, 0xd2}
-
-	ts := uuid.Time()
-	c := time.Unix(ts.UnixTime())
-	want := time.Date(1998, 2, 5, 0, 30, 23, 136364800, time.UTC)
-	if !c.Equal(want) {
-		t.Errorf("Got time %v, want %v", c, want)
-	}
-	if !bytes.Equal(node, uuid.NodeID()) {
-		t.Errorf("Expected node %v got %v", node, uuid.NodeID())
-	}
-}
-
-func TestMD5(t *testing.T) {
-	uuid := NewMD5(NameSpaceDNS, []byte("python.org")).String()
-	want := "6fa459ea-ee8a-3ca4-894e-db77e160355e"
-	if uuid != want {
-		t.Errorf("MD5: got %q expected %q", uuid, want)
-	}
-}
-
-func TestSHA1(t *testing.T) {
-	uuid := NewSHA1(NameSpaceDNS, []byte("python.org")).String()
-	want := "886313e1-3b8a-5372-9b90-0c9aee199e5d"
-	if uuid != want {
-		t.Errorf("SHA1: got %q expected %q", uuid, want)
-	}
-}
-
-func TestNodeID(t *testing.T) {
-	nid := []byte{1, 2, 3, 4, 5, 6}
-	SetNodeInterface("")
-	s := NodeInterface()
-	if s == "" || s == "user" {
-		t.Errorf("NodeInterface %q after SetInteface", s)
-	}
-	node1 := NodeID()
-	if node1 == nil {
-		t.Error("NodeID nil after SetNodeInterface", s)
-	}
-	SetNodeID(nid)
-	s = NodeInterface()
-	if s != "user" {
-		t.Errorf("Expected NodeInterface %q got %q", "user", s)
-	}
-	node2 := NodeID()
-	if node2 == nil {
-		t.Error("NodeID nil after SetNodeID", s)
-	}
-	if bytes.Equal(node1, node2) {
-		t.Error("NodeID not changed after SetNodeID", s)
-	} else if !bytes.Equal(nid, node2) {
-		t.Errorf("NodeID is %x, expected %x", node2, nid)
-	}
-}
-
-func testDCE(t *testing.T, name string, uuid UUID, err error, domain Domain, id uint32) {
-	if err != nil {
-		t.Errorf("%s failed: %v", name, err)
-		return
-	}
-	if v := uuid.Version(); v != 2 {
-		t.Errorf("%s: %s: expected version 2, got %s", name, uuid, v)
-		return
-	}
-	if v := uuid.Domain(); v != domain {
-		t.Errorf("%s: %s: expected domain %d, got %d", name, uuid, domain, v)
-	}
-	if v := uuid.ID(); v != id {
-		t.Errorf("%s: %s: expected id %d, got %d", name, uuid, id, v)
-	}
-}
-
-func TestDCE(t *testing.T) {
-	uuid, err := NewDCESecurity(42, 12345678)
-	testDCE(t, "NewDCESecurity", uuid, err, 42, 12345678)
-	uuid, err = NewDCEPerson()
-	testDCE(t, "NewDCEPerson", uuid, err, Person, uint32(os.Getuid()))
-	uuid, err = NewDCEGroup()
-	testDCE(t, "NewDCEGroup", uuid, err, Group, uint32(os.Getgid()))
-}
-
-type badRand struct{}
-
-func (r badRand) Read(buf []byte) (int, error) {
-	for i, _ := range buf {
-		buf[i] = byte(i)
-	}
-	return len(buf), nil
-}
-
-func TestBadRand(t *testing.T) {
-	SetRand(badRand{})
-	uuid1 := New()
-	uuid2 := New()
-	if uuid1 != uuid2 {
-		t.Errorf("execpted duplicates, got %q and %q", uuid1, uuid2)
-	}
-	SetRand(nil)
-	uuid1 = New()
-	uuid2 = New()
-	if uuid1 == uuid2 {
-		t.Errorf("unexecpted duplicates, got %q", uuid1)
-	}
-}
-
-var asString = "f47ac10b-58cc-0372-8567-0e02b2c3d479"
-var asBytes = []byte(asString)
-
-func BenchmarkParse(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_, err := Parse(asString)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkParseBytes(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_, err := ParseBytes(asBytes)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-// parseBytesUnsafe is to benchmark using unsafe.
-func parseBytesUnsafe(b []byte) (UUID, error) {
-	return Parse(*(*string)(unsafe.Pointer(&b)))
-}
-
-
-func BenchmarkParseBytesUnsafe(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_, err := parseBytesUnsafe(asBytes)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-// parseBytesCopy is to benchmark not using unsafe.
-func parseBytesCopy(b []byte) (UUID, error) {
-	return Parse(string(b))
-}
-
-func BenchmarkParseBytesCopy(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		_, err := parseBytesCopy(asBytes)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkNew(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		New()
-	}
-}
-
-func BenchmarkUUID_String(b *testing.B) {
-	uuid, err := Parse("f47ac10b-58cc-0372-8567-0e02b2c3d479")
-	if err != nil {
-		b.Fatal(err)
-	}
-	for i := 0; i < b.N; i++ {
-		if uuid.String() == "" {
-			b.Fatal("invalid uuid")
-		}
-	}
-}
-
-func BenchmarkUUID_URN(b *testing.B) {
-	uuid, err := Parse("f47ac10b-58cc-0372-8567-0e02b2c3d479")
-	if err != nil {
-		b.Fatal(err)
-	}
-	for i := 0; i < b.N; i++ {
-		if uuid.URN() == "" {
-			b.Fatal("invalid uuid")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/jmank88/nuts/.gitignore b/installer/vendor/github.com/jmank88/nuts/.gitignore
deleted file mode 100644
index f562d2c8d9..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.idea
-testdata
-vendor/
\ No newline at end of file
diff --git a/installer/vendor/github.com/jmank88/nuts/.travis.yml b/installer/vendor/github.com/jmank88/nuts/.travis.yml
deleted file mode 100644
index 66385620b3..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-
-go:
-    - 1.x
-    - tip
-
-install:
-    - go get -u github.com/golang/dep/...
-    - dep ensure -vendor-only
\ No newline at end of file
diff --git a/installer/vendor/github.com/jmank88/nuts/Gopkg.lock b/installer/vendor/github.com/jmank88/nuts/Gopkg.lock
deleted file mode 100644
index 2be2e1fb59..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/Gopkg.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/boltdb/bolt"
-  packages = ["."]
-  revision = "2f1ce7a837dcb8da3ec595b1dac9d0632f0f99e8"
-  version = "v1.3.1"
-
-[[projects]]
-  branch = "master"
-  name = "github.com/dgryski/go-metro"
-  packages = ["."]
-  revision = "0f6473574cdfd7be3962c41fb23dc4768b1f7deb"
-
-[[projects]]
-  branch = "master"
-  name = "golang.org/x/sys"
-  packages = ["unix"]
-  revision = "7ddbeae9ae08c6a06a59597f0c9edbc5ff2444ce"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "051cec76ab73ca227eb718f999fe302404bd5b6673fc29b438eb5945e97f571b"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/jmank88/nuts/Gopkg.toml b/installer/vendor/github.com/jmank88/nuts/Gopkg.toml
deleted file mode 100644
index 8e289df017..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/Gopkg.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[[constraint]]
-  name = "github.com/boltdb/bolt"
-  version = "^1.0.0"
-
-[[constraint]]
-  name = "github.com/dgryski/go-metro"
-  branch = "master"
diff --git a/installer/vendor/github.com/jmank88/nuts/README.md b/installer/vendor/github.com/jmank88/nuts/README.md
deleted file mode 100644
index ad81fb582f..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/README.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Nuts - BoltDB Utilities
-
-[![GoDoc](https://godoc.org/github.com/jmank88/nuts?status.svg)](https://godoc.org/github.com/jmank88/nuts) [![Go Report Card](https://goreportcard.com/badge/github.com/jmank88/nuts)](https://goreportcard.com/report/github.com/jmank88/nuts) [![Coverage Status](https://coveralls.io/repos/github/jmank88/nuts/badge.svg?branch=master)](https://coveralls.io/github/jmank88/nuts?branch=master)
-
-A collection of [BoltDB](https://github.com/boltdb/bolt) utilities.
-
-## Path Prefix Scans
-
-The prefix scanning functions `SeekPathConflict` and `SeekPathMatch` facilitate maintenance and access to buckets of 
-paths supporting *variable elements* with *exclusive matches*.  Paths are `/` delimited, must begin with a `/`, and 
-elements beginning with `:` or `*` are variable.
-
-Examples:
-
-```
-/
-/blogs/
-/blogs/:blog_id
-```
-
-### Variable Elements
-
-Path elements beginning with a `:` match any single element.  Path elements beginning with `*` match any remaining 
-elements, and therefore must be last.
-
-Examples: 
-
-```
-Path:  /blogs/:blog_id
-Match: /blogs/someblog
-```
-
-```
-Path:  /blogs/:blog_id/comments/:comment_id/*suffix
-Match: /blogs/42/comments/100/edit
-```
-
-### Exclusive Matches
-
-Using `SeekPathConflict` before putting new paths to ensure the bucket remains conflict-free guarantees that `SeekPathMatch` 
-will never match more than one path. 
-
-Examples:
-
-```
-Conflicts: `/blogs/:blog_id`, `/blogs/golang`
-Match:     `/blogs/golang`
-```
-
-```
-Conflicts: `/blogs/*`, `/blogs/:blog_id/comments`
-Match:     `/blogs/42/comments`
-```
diff --git a/installer/vendor/github.com/jmank88/nuts/cmd/testdb/main.go b/installer/vendor/github.com/jmank88/nuts/cmd/testdb/main.go
deleted file mode 100644
index 4c7103cff4..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/cmd/testdb/main.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Command testdb recursively walks the directory given as the first (and only) argument, and copies paths from .txt files
-into .db BoltDB database files by the same name.
-*/
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/boltdb/bolt"
-	"github.com/jmank88/nuts"
-)
-
-func main() {
-	if len(os.Args) < 2 {
-		log.Fatal("too few arguments")
-	}
-	dir := os.Args[1]
-	if err := filepath.Walk(dir, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if !info.IsDir() && strings.HasSuffix(path, ".txt") {
-			if err := copyToBolt(path); err != nil {
-				log.Printf("failed to copy %q to boltdb: %s\n", path, err)
-			}
-		}
-		return nil
-	}); err != nil {
-		log.Fatal("failed to walk files", err)
-	}
-}
-
-const batchSize = 10000
-
-func copyToBolt(txt string) (err error) {
-	path := strings.TrimSuffix(txt, ".txt") + ".db"
-
-	db, err := bolt.Open(path, 0666, nil)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err2 := db.Close(); err2 != nil && err == nil {
-			err = err2
-		}
-	}()
-
-	f, err := os.Open(txt)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	// Use default, ScanLines
-	s := bufio.NewScanner(f)
-	done := false
-	for !done {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucketIfNotExists([]byte("paths"))
-			if err != nil {
-				return err
-			}
-
-			for batch := 0; batch < batchSize; batch++ {
-				if !s.Scan() {
-					done = true
-					return s.Err()
-				}
-				path := s.Bytes()
-				if k, _ := nuts.SeekPathConflict(b.Cursor(), path); k != nil {
-					return fmt.Errorf("path %q conflicts with existing %q", string(path), string(k))
-				}
-				if err := b.Put(path, []byte{}); err != nil {
-					return err
-				}
-			}
-			return nil
-		}); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/jmank88/nuts/cmd/testpaths/main.go b/installer/vendor/github.com/jmank88/nuts/cmd/testpaths/main.go
deleted file mode 100644
index c42fe7cf26..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/cmd/testpaths/main.go
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Command testpaths generates files with one path per line.  The first argument is the output directory and the second
-must be one of 'standard', 'branchFactor', 'segmentCount', or 'segmentSize'.  Each additional (integer) argument
-generates a .txt file by the same name.
-*/
-package main
-
-import (
-	"bytes"
-	"crypto/md5"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"github.com/dgryski/go-metro"
-)
-
-// A writePathFn should write one path per line to w.
-type writePathFn func(w io.Writer, arg int64)
-
-var writePathFns = map[string]writePathFn{
-	// Writes count routes of a 'standard' form.
-	"standard": func(w io.Writer, count int64) {
-		for i := int64(0); i < count; i++ {
-			path := generateRoute(uint64(i))
-			if _, err := io.WriteString(w, path); err != nil {
-				log.Fatalf("failed to write path #%d %q: %s", i, path, err)
-			}
-			if _, err := w.Write([]byte{'\n'}); err != nil {
-				log.Fatal("failed to write new line:", err)
-			}
-		}
-	},
-
-	// Writes count routes with different values for the same component.
-	"branchFactor": func(w io.Writer, count int64) {
-		for i := int64(0); i < count; i++ {
-			sum := md5.Sum([]byte{byte(i >> 16), byte(i), byte(i >> 24), byte(i >> 8)})
-			if _, err := fmt.Fprintf(w, "/%x", sum); err != nil {
-				log.Fatalf("failed to write path #%d: %s", i, err)
-			}
-			if _, err := w.Write([]byte{'\n'}); err != nil {
-				log.Fatal("failed to write new line:", err)
-			}
-		}
-	},
-
-	// Writes a route with count segments.
-	"segmentCount": func(w io.Writer, count int64) {
-		path := strings.Repeat("/test", int(count))
-		if _, err := io.WriteString(w, path); err != nil {
-			log.Fatalf("failed to write path %d", count)
-		}
-	},
-
-	// Writes a route with 5 counts sized segments.
-	"segmentSize": func(w io.Writer, size int64) {
-		path := strings.Repeat("/"+strings.Repeat("a", int(size)), 5)
-		if _, err := io.WriteString(w, path); err != nil {
-			log.Fatalf("failed to write path %d", size)
-		}
-	},
-}
-
-func main() {
-	if len(os.Args) < 4 {
-		log.Fatal("too few arguments")
-	}
-
-	dir := os.Args[1]
-	name := os.Args[2]
-	nameDir := filepath.Join(dir, name)
-	if err := os.MkdirAll(nameDir, 0777); err != nil {
-		log.Fatal("failed to create diretory:", err)
-	}
-
-	writePath, ok := writePathFns[name]
-	if !ok {
-		log.Fatal("unrecognized name:", name)
-	}
-
-	for _, arg := range os.Args[3:] {
-		routes, err := strconv.ParseInt(arg, 10, 0)
-		if err != nil {
-			log.Fatal("failed to parse argument:", err)
-		}
-
-		createFile(filepath.Join(nameDir, arg+".txt"), routes, writePath)
-	}
-}
-
-func createFile(name string, arg int64, writePath writePathFn) {
-	f, err := os.Create(name)
-	if err != nil {
-		log.Fatal("failed to create file:", err)
-	}
-	defer f.Close()
-	writePath(f, arg)
-}
-
-const (
-	seed1 = 33928
-	seed2 = 9274035
-)
-
-// generateRoute generates a deterministic test route based on u.
-// Routes are 32 bytes printed as hex, and split into 1, 2, 4, or 8 parts.
-// ~1/5 of the parts after the first are parameters. ~1/2 of suffix parameters are catch all.
-// Example: /61aab75e6134555e/:param/20c98ae9da239a03/*wildcard
-//
-// Verified conflict free up to: 1,000,000
-func generateRoute(u uint64) string {
-	s := make([]byte, 0, 32)
-	h1, h2 := metro.Hash128([]byte{byte(u >> 24), byte(u >> 8), byte(u), byte(u >> 16)}, seed1)
-	h3, h4 := metro.Hash128([]byte{byte(u), byte(u >> 16), byte(u >> 8), byte(u >> 24)}, seed2)
-	for _, h := range []uint64{h1, h2, h3, h4} {
-		var i uint
-		for ; i < 64; i += 8 {
-			s = append(s, byte(h>>i))
-		}
-	}
-
-	parts := 1 << (u % 4)  // [1,2,4,8]
-	each := len(s) / parts // [32,16,8,4]
-
-	var b bytes.Buffer
-	for i := 0; i < parts; i++ {
-		b.WriteRune('/')
-
-		// if not first, 1/5 chance of param
-		if i > 0 && metro.Hash64(b.Bytes(), seed1)%5 == 0 {
-			// if last, 1/2 chance of *
-			if i == parts-1 && u%2 == 0 {
-				b.WriteString(`*wildcard`)
-			} else {
-				b.WriteString(`:param`)
-			}
-		} else {
-			nameStart := i * each
-			fmt.Fprintf(&b, "%x", s[nameStart:nameStart+each])
-		}
-	}
-
-	return b.String()
-}
diff --git a/installer/vendor/github.com/jmank88/nuts/example_test.go b/installer/vendor/github.com/jmank88/nuts/example_test.go
deleted file mode 100644
index e209c6a761..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/example_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package nuts
-
-import (
-	"fmt"
-)
-
-func ExampleKey_UUID() {
-	type uuid struct{ a, b uint64 }
-
-	u := uuid{
-		a: 0xaaaaaaaaaaaaaaaa,
-		b: 0xbbbbbbbbbbbbbbbb,
-	}
-
-	key := make(Key, 16)
-	key[:8].Put(u.a)
-	key[8:].Put(u.b)
-	fmt.Printf("%#x", key)
-
-	// Output:
-	// 0xaaaaaaaaaaaaaaaabbbbbbbbbbbbbbbb
-}
diff --git a/installer/vendor/github.com/jmank88/nuts/key_test.go b/installer/vendor/github.com/jmank88/nuts/key_test.go
deleted file mode 100644
index 8fbcf78354..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/key_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package nuts
-
-import (
-	"bytes"
-	"strconv"
-	"testing"
-)
-
-func TestKeyLen(t *testing.T) {
-	for _, test := range []struct {
-		x   uint64
-		exp int
-	}{
-		{0, 1},
-		{1, 1},
-		{1 << 8, 2},
-		{1 << 16, 3},
-		{1 << 24, 4},
-		{1 << 32, 5},
-		{1 << 40, 6},
-		{1 << 48, 7},
-		{1 << 56, 8},
-	} {
-		got := KeyLen(test.x)
-		if got != test.exp {
-			t.Errorf("%d: expected length %d but got %d", test.x, test.exp, got)
-		}
-	}
-}
-
-func TestKey(t *testing.T) {
-	for _, test := range []struct {
-		max int
-		xs  []uint64
-		bs  [][]byte
-	}{
-		{
-			max: 1 << 7,
-			xs:  []uint64{0, 1, (1 << 8) - 1},
-			bs: [][]byte{
-				{0x00}, {0x01}, {0xFF},
-			},
-		},
-		{
-			max: 1 << 15,
-			xs:  []uint64{0, 1, (1 << 16) - 1},
-			bs: [][]byte{
-				{0x00, 0x00}, {0x00, 0x01}, {0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 23,
-			xs:  []uint64{0, 1, (1 << 24) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00}, {0x00, 0x00, 0x01}, {0xFF, 0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 31,
-			xs:  []uint64{0, 1, (1 << 32) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00, 0x00},
-				{0x00, 0x00, 0x00, 0x01},
-				{0xFF, 0xFF, 0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 39,
-			xs:  []uint64{0, 1, (1 << 40) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00, 0x00, 0x00},
-				{0x00, 0x00, 0x00, 0x00, 0x01},
-				{0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 47,
-			xs:  []uint64{0, 1, (1 << 48) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-				{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 55,
-			xs:  []uint64{0, 1, (1 << 56) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-				{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-			},
-		},
-		{
-			max: 1 << 60,
-			xs:  []uint64{0, 1, (1 << 60) - 1},
-			bs: [][]byte{
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-				{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-				{0x0F, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-			},
-		},
-	} {
-		t.Run(strconv.Itoa(test.max), func(t *testing.T) {
-			k := make(Key, KeyLen(uint64(test.max)))
-			for i, x := range test.xs {
-				k.Put(x)
-				if !bytes.Equal(k, test.bs[i]) {
-					t.Errorf("unexpected serialized integer %d:\n\t(GOT): %#x\n\t(WNT): %#x", x, k, test.bs[i])
-				}
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/jmank88/nuts/paths_test.go b/installer/vendor/github.com/jmank88/nuts/paths_test.go
deleted file mode 100644
index b0bce31f1b..0000000000
--- a/installer/vendor/github.com/jmank88/nuts/paths_test.go
+++ /dev/null
@@ -1,338 +0,0 @@
-//go:generate rm -r testdata
-//
-//go:generate go run cmd/testpaths/main.go testdata standard 10 100 1000 10000 100000 1000000
-//go:generate go run cmd/testpaths/main.go testdata segmentCount 1 5 10 50 100
-//go:generate go run cmd/testpaths/main.go testdata branchFactor 1 5 10 50 100 500 1000 5000 10000
-//go:generate go run cmd/testpaths/main.go testdata segmentSize 1 5 10 50 100 200
-//
-//go:generate go run cmd/testdb/main.go testdata
-package nuts
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/boltdb/bolt"
-)
-
-var bucketName = []byte("testBucket")
-
-func exDB(f func(db *bolt.DB)) {
-	tmp := tempfile()
-	defer os.Remove(tmp)
-	db, err := bolt.Open(tmp, 0666, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer db.Close()
-	f(db)
-}
-
-func ExampleSeekPathMatch() {
-	exDB(func(db *bolt.DB) {
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucket(bucketName)
-			if err != nil {
-				return err
-			}
-
-			// Put a variable path.
-			return b.Put([]byte("/blogs/:blog_id/comments/:comment_id"), []byte{})
-		}); err != nil {
-			log.Fatal(err)
-		}
-
-		if err := db.View(func(tx *bolt.Tx) error {
-			b := tx.Bucket(bucketName)
-
-			// Match path.
-			path, _ := SeekPathMatch(b.Cursor(), []byte("/blogs/asdf/comments/42"))
-			fmt.Println(string(path))
-
-			return nil
-		}); err != nil {
-			log.Fatal(err)
-		}
-	})
-
-	// Output: /blogs/:blog_id/comments/:comment_id
-}
-
-func ExampleSeekPathConflict() {
-	exDB(func(db *bolt.DB) {
-		insert := func(path string) {
-			if err := db.Update(func(tx *bolt.Tx) error {
-				b, err := tx.CreateBucketIfNotExists(bucketName)
-				if err != nil {
-					return err
-				}
-
-				// Check for conflicts.
-				if k, _ := SeekPathConflict(b.Cursor(), []byte(path)); k != nil {
-					fmt.Printf("Put(%s) blocked - conflict: %s\n", path, string(k))
-					return nil
-				}
-
-				// Put.
-				if err := b.Put([]byte(path), []byte{}); err != nil {
-					return err
-				}
-				fmt.Printf("Put(%s)\n", path)
-				return nil
-			}); err != nil {
-				log.Fatal(err)
-			}
-		}
-		// Put
-		insert("/blogs/")
-		// Put
-		insert("/blogs/:blog_id")
-		// Conflict
-		insert("/blogs/a_blog")
-	})
-
-	// Output:
-	// Put(/blogs/)
-	// Put(/blogs/:blog_id)
-	// Put(/blogs/a_blog) blocked - conflict: /blogs/:blog_id
-}
-
-var matchTests = []struct {
-	path    string
-	matches []string
-}{
-	{`/blogs`, []string{`/blogs`}},
-	{`/blogs/`, []string{`/blogs/`}},
-	{`/blogs/:blog_id`, []string{`/blogs/123`}},
-	{`/blogs/:blog_id/comments`, []string{`/blogs/123/comments`}},
-	{`/blogs/:blog_id/comments/`, []string{`/blogs/123/comments/`}},
-	{`/blogs/:blog_id/comments/:comment_id`, []string{`/blogs/123/comments/456`}},
-	{`/blogs/:blog_id/comments/:comment_id/*suffix`,
-		[]string{`/blogs/123/comments/456/test`, `/blogs/123/comments/456/test/test`}},
-}
-
-func TestMatchPath(t *testing.T) {
-	testDB(t, func(db *bolt.DB) {
-		bucketName := []byte("testBucket")
-
-		// Setup - Put all paths
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucket(bucketName)
-			if err != nil {
-				return err
-			}
-			for _, test := range matchTests {
-				err := b.Put([]byte(test.path), []byte{})
-				if err != nil {
-					return err
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal("failed to insert paths:", err)
-		}
-
-		// Test - Match each
-		if err := db.View(func(tx *bolt.Tx) error {
-			b := tx.Bucket(bucketName)
-			for _, test := range matchTests {
-				for _, match := range test.matches {
-					k, _ := SeekPathMatch(b.Cursor(), []byte(match))
-					if k == nil {
-						t.Errorf("expected %q to match %q but got none", match, test.path)
-					} else if !bytes.Equal(k, []byte(test.path)) {
-						t.Errorf("expected %q to match %q but got %q", match, test.path, string(k))
-					}
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal("tests failed:", err)
-		}
-	})
-}
-
-func TestConflicts(t *testing.T) {
-	for _, test := range []struct {
-		path      string
-		conflicts []string
-	}{
-		{`/test/test`, []string{`/test/test`, `/:test`, `/*test`, `/test/:test`, `/test/*test`, `/:test/test`}},
-		{`/:test`, []string{`/:tst`, `/test`, `/*test`}},
-		{`/test/*test`, []string{`/test/*tst`, `/test/test`, `/test/:tst`, `/test/test/test`, `/test/test/:test`, `/test/test/*test`}},
-	} {
-		testDB(t, func(db *bolt.DB) {
-			// Setup - Put path
-			if err := db.Update(func(tx *bolt.Tx) error {
-				b, err := tx.CreateBucket(bucketName)
-				if err != nil {
-					return err
-				}
-				return b.Put([]byte(test.path), []byte{})
-			}); err != nil {
-				t.Fatal("failed to insert path", err)
-			}
-
-			// Test - Verify all conflicts
-			if err := db.View(func(tx *bolt.Tx) error {
-				b := tx.Bucket(bucketName)
-				for _, c := range test.conflicts {
-					k, _ := SeekPathConflict(b.Cursor(), []byte(c))
-					kStr := string(k)
-					if kStr != test.path {
-						t.Errorf("expected %q to match %q but got %q", c, test.path, kStr)
-					}
-				}
-				return nil
-			}); err != nil {
-				t.Fatal("failed to run tests", err)
-			}
-		})
-	}
-}
-
-// Attempts to put all matchTests w/o conflict.
-func TestNoConflicts(t *testing.T) {
-	testDB(t, func(db *bolt.DB) {
-		bucketName := []byte("testBucket")
-
-		if err := db.Update(func(tx *bolt.Tx) error {
-			b, err := tx.CreateBucket(bucketName)
-			if err != nil {
-				return err
-			}
-			c := b.Cursor()
-			for _, test := range matchTests {
-				pathB := []byte(test.path)
-				if k, _ := SeekPathConflict(c, pathB); k != nil {
-					t.Errorf("unexpected conflict with %q: %s", test.path, string(k))
-				}
-
-				if err := b.Put(pathB, []byte{}); err != nil {
-					return err
-				}
-			}
-			return nil
-		}); err != nil {
-			t.Fatal("failed to insert paths:", err)
-		}
-	})
-}
-
-func Benchmark(b *testing.B) {
-	b.Run("standard", forEachDB("standard", strings.NewReplacer(":", "", "*", "").Replace))
-	b.Run("branchFactor", forEachDB("branchFactor", nil))
-	b.Run("segmentCount", forEachDB("segmentCount", nil))
-	b.Run("segmentSize", forEachDB("segmentSize", nil))
-}
-
-func forEachDB(testname string, fn func(path string) string) func(*testing.B) {
-	return func(b *testing.B) {
-		dir := filepath.Join("testdata", testname)
-		err := filepath.Walk(dir, func(testfile string, info os.FileInfo, err error) error {
-			if !info.IsDir() && filepath.Ext(testfile) == ".db" {
-				arg := strings.TrimSuffix(filepath.Base(testfile), ".db")
-
-				b.Run(arg, benchMatch(testfile, fn))
-			}
-			return nil
-		})
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func benchMatch(testdb string, pathFn func(path string) string) func(b *testing.B) {
-	return func(b *testing.B) {
-		db, err := bolt.Open(testdb, 0666, nil)
-		if err != nil {
-			b.Fatalf("failed to open database %s: %s", testdb, err)
-		}
-		defer db.Close()
-
-		testtxt := strings.TrimSuffix(testdb, ".db") + ".txt"
-		f, err := os.Open(testtxt)
-		if err != nil {
-			b.Fatalf("failed to open file %s: %s", testtxt, err)
-		}
-
-		var paths [][]byte
-		func() {
-			defer f.Close()
-
-			// Use default, ScanLines
-			s := bufio.NewScanner(f)
-
-			paths = make([][]byte, 0, b.N)
-			for s.Scan() {
-				if pathFn == nil {
-					paths = append(paths, s.Bytes())
-				} else {
-					paths = append(paths, []byte(pathFn(s.Text())))
-				}
-
-				if len(paths) == cap(paths) {
-					break
-				}
-			}
-			if s.Err() != nil {
-				b.Fatal("failed to read text paths:", s.Err())
-			}
-		}()
-
-		b.ResetTimer()
-
-		lookup := func(path []byte) error {
-			return db.View(func(tx *bolt.Tx) error {
-				bk := tx.Bucket([]byte("paths"))
-				k, _ := SeekPathMatch(bk.Cursor(), path)
-				if k == nil {
-					return errors.New("no match found")
-				}
-				return nil
-			})
-		}
-
-		for i := 0; i < b.N; i++ {
-			path := paths[i%len(paths)]
-
-			if err := lookup(path); err != nil {
-				b.Fatalf("failed to match %q: %s", string(path), err)
-			}
-		}
-	}
-}
-
-func testDB(t *testing.T, f func(db *bolt.DB)) {
-	tmp := tempfile()
-	defer os.Remove(tmp)
-	db, err := bolt.Open(tmp, 0666, nil)
-	if err != nil {
-		t.Fatal("failed to open db:", err)
-	}
-	defer db.Close()
-	f(db)
-}
-
-func tempfile() string {
-	f, err := ioutil.TempFile("", "nuts-bolt-")
-	if err != nil {
-		panic(err)
-	}
-	if err := f.Close(); err != nil {
-		panic(err)
-	}
-	if err := os.Remove(f.Name()); err != nil {
-		panic(err)
-	}
-	return f.Name()
-}
diff --git a/installer/vendor/github.com/kr/pretty/.gitignore b/installer/vendor/github.com/kr/pretty/.gitignore
deleted file mode 100644
index 1f0a99f2f2..0000000000
--- a/installer/vendor/github.com/kr/pretty/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-[568].out
-_go*
-_test*
-_obj
diff --git a/installer/vendor/github.com/kr/pretty/Readme b/installer/vendor/github.com/kr/pretty/Readme
deleted file mode 100644
index c589fc622b..0000000000
--- a/installer/vendor/github.com/kr/pretty/Readme
+++ /dev/null
@@ -1,9 +0,0 @@
-package pretty
-
-    import "github.com/kr/pretty"
-
-    Package pretty provides pretty-printing for Go values.
-
-Documentation
-
-    http://godoc.org/github.com/kr/pretty
diff --git a/installer/vendor/github.com/kr/pretty/diff_test.go b/installer/vendor/github.com/kr/pretty/diff_test.go
deleted file mode 100644
index a951e4b6c3..0000000000
--- a/installer/vendor/github.com/kr/pretty/diff_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-package pretty
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"reflect"
-	"testing"
-	"unsafe"
-)
-
-var (
-	_ Logfer   = (*testing.T)(nil)
-	_ Logfer   = (*testing.B)(nil)
-	_ Printfer = (*log.Logger)(nil)
-)
-
-type difftest struct {
-	a   interface{}
-	b   interface{}
-	exp []string
-}
-
-type S struct {
-	A int
-	S *S
-	I interface{}
-	C []int
-}
-
-type (
-	N struct{ N int }
-	E interface{}
-)
-
-var (
-	c0 = make(chan int)
-	c1 = make(chan int)
-	f0 = func() {}
-	f1 = func() {}
-	i0 = 0
-	i1 = 1
-)
-
-var diffs = []difftest{
-	{a: nil, b: nil},
-	{a: S{A: 1}, b: S{A: 1}},
-
-	{0, "", []string{`int != string`}},
-	{0, 1, []string{`0 != 1`}},
-	{S{}, new(S), []string{`pretty.S != *pretty.S`}},
-	{"a", "b", []string{`"a" != "b"`}},
-	{S{}, S{A: 1}, []string{`A: 0 != 1`}},
-	{new(S), &S{A: 1}, []string{`A: 0 != 1`}},
-	{S{S: new(S)}, S{S: &S{A: 1}}, []string{`S.A: 0 != 1`}},
-	{S{}, S{I: 0}, []string{`I: nil != int(0)`}},
-	{S{I: 1}, S{I: "x"}, []string{`I: int != string`}},
-	{S{}, S{C: []int{1}}, []string{`C: []int[0] != []int[1]`}},
-	{S{C: []int{}}, S{C: []int{1}}, []string{`C: []int[0] != []int[1]`}},
-	{S{C: []int{1, 2, 3}}, S{C: []int{1, 2, 4}}, []string{`C[2]: 3 != 4`}},
-	{S{}, S{A: 1, S: new(S)}, []string{`A: 0 != 1`, `S: nil != &pretty.S{}`}},
-
-	// unexported fields of every reflect.Kind (both equal and unequal)
-	{struct{ x bool }{false}, struct{ x bool }{false}, nil},
-	{struct{ x bool }{false}, struct{ x bool }{true}, []string{`x: false != true`}},
-	{struct{ x int }{0}, struct{ x int }{0}, nil},
-	{struct{ x int }{0}, struct{ x int }{1}, []string{`x: 0 != 1`}},
-	{struct{ x int8 }{0}, struct{ x int8 }{0}, nil},
-	{struct{ x int8 }{0}, struct{ x int8 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x int16 }{0}, struct{ x int16 }{0}, nil},
-	{struct{ x int16 }{0}, struct{ x int16 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x int32 }{0}, struct{ x int32 }{0}, nil},
-	{struct{ x int32 }{0}, struct{ x int32 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x int64 }{0}, struct{ x int64 }{0}, nil},
-	{struct{ x int64 }{0}, struct{ x int64 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uint }{0}, struct{ x uint }{0}, nil},
-	{struct{ x uint }{0}, struct{ x uint }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uint8 }{0}, struct{ x uint8 }{0}, nil},
-	{struct{ x uint8 }{0}, struct{ x uint8 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uint16 }{0}, struct{ x uint16 }{0}, nil},
-	{struct{ x uint16 }{0}, struct{ x uint16 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uint32 }{0}, struct{ x uint32 }{0}, nil},
-	{struct{ x uint32 }{0}, struct{ x uint32 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uint64 }{0}, struct{ x uint64 }{0}, nil},
-	{struct{ x uint64 }{0}, struct{ x uint64 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x uintptr }{0}, struct{ x uintptr }{0}, nil},
-	{struct{ x uintptr }{0}, struct{ x uintptr }{1}, []string{`x: 0 != 1`}},
-	{struct{ x float32 }{0}, struct{ x float32 }{0}, nil},
-	{struct{ x float32 }{0}, struct{ x float32 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x float64 }{0}, struct{ x float64 }{0}, nil},
-	{struct{ x float64 }{0}, struct{ x float64 }{1}, []string{`x: 0 != 1`}},
-	{struct{ x complex64 }{0}, struct{ x complex64 }{0}, nil},
-	{struct{ x complex64 }{0}, struct{ x complex64 }{1}, []string{`x: (0+0i) != (1+0i)`}},
-	{struct{ x complex128 }{0}, struct{ x complex128 }{0}, nil},
-	{struct{ x complex128 }{0}, struct{ x complex128 }{1}, []string{`x: (0+0i) != (1+0i)`}},
-	{struct{ x [1]int }{[1]int{0}}, struct{ x [1]int }{[1]int{0}}, nil},
-	{struct{ x [1]int }{[1]int{0}}, struct{ x [1]int }{[1]int{1}}, []string{`x[0]: 0 != 1`}},
-	{struct{ x chan int }{c0}, struct{ x chan int }{c0}, nil},
-	{struct{ x chan int }{c0}, struct{ x chan int }{c1}, []string{fmt.Sprintf("x: %p != %p", c0, c1)}},
-	{struct{ x func() }{f0}, struct{ x func() }{f0}, nil},
-	{struct{ x func() }{f0}, struct{ x func() }{f1}, []string{fmt.Sprintf("x: %p != %p", f0, f1)}},
-	{struct{ x interface{} }{0}, struct{ x interface{} }{0}, nil},
-	{struct{ x interface{} }{0}, struct{ x interface{} }{1}, []string{`x: 0 != 1`}},
-	{struct{ x interface{} }{0}, struct{ x interface{} }{""}, []string{`x: int != string`}},
-	{struct{ x interface{} }{0}, struct{ x interface{} }{nil}, []string{`x: int(0) != nil`}},
-	{struct{ x interface{} }{nil}, struct{ x interface{} }{0}, []string{`x: nil != int(0)`}},
-	{struct{ x map[int]int }{map[int]int{0: 0}}, struct{ x map[int]int }{map[int]int{0: 0}}, nil},
-	{struct{ x map[int]int }{map[int]int{0: 0}}, struct{ x map[int]int }{map[int]int{0: 1}}, []string{`x[0]: 0 != 1`}},
-	{struct{ x *int }{new(int)}, struct{ x *int }{new(int)}, nil},
-	{struct{ x *int }{&i0}, struct{ x *int }{&i1}, []string{`x: 0 != 1`}},
-	{struct{ x *int }{nil}, struct{ x *int }{&i0}, []string{`x: nil != &int(0)`}},
-	{struct{ x *int }{&i0}, struct{ x *int }{nil}, []string{`x: &int(0) != nil`}},
-	{struct{ x []int }{[]int{0}}, struct{ x []int }{[]int{0}}, nil},
-	{struct{ x []int }{[]int{0}}, struct{ x []int }{[]int{1}}, []string{`x[0]: 0 != 1`}},
-	{struct{ x string }{"a"}, struct{ x string }{"a"}, nil},
-	{struct{ x string }{"a"}, struct{ x string }{"b"}, []string{`x: "a" != "b"`}},
-	{struct{ x N }{N{0}}, struct{ x N }{N{0}}, nil},
-	{struct{ x N }{N{0}}, struct{ x N }{N{1}}, []string{`x.N: 0 != 1`}},
-	{
-		struct{ x unsafe.Pointer }{unsafe.Pointer(uintptr(0))},
-		struct{ x unsafe.Pointer }{unsafe.Pointer(uintptr(0))},
-		nil,
-	},
-	{
-		struct{ x unsafe.Pointer }{unsafe.Pointer(uintptr(0))},
-		struct{ x unsafe.Pointer }{unsafe.Pointer(uintptr(1))},
-		[]string{`x: 0x0 != 0x1`},
-	},
-}
-
-func TestDiff(t *testing.T) {
-	for _, tt := range diffs {
-		got := Diff(tt.a, tt.b)
-		eq := len(got) == len(tt.exp)
-		if eq {
-			for i := range got {
-				eq = eq && got[i] == tt.exp[i]
-			}
-		}
-		if !eq {
-			t.Errorf("diffing % #v", tt.a)
-			t.Errorf("with    % #v", tt.b)
-			diffdiff(t, got, tt.exp)
-			continue
-		}
-	}
-}
-
-func TestKeyEqual(t *testing.T) {
-	var emptyInterfaceZero interface{} = 0
-
-	cases := []interface{}{
-		new(bool),
-		new(int),
-		new(int8),
-		new(int16),
-		new(int32),
-		new(int64),
-		new(uint),
-		new(uint8),
-		new(uint16),
-		new(uint32),
-		new(uint64),
-		new(uintptr),
-		new(float32),
-		new(float64),
-		new(complex64),
-		new(complex128),
-		new([1]int),
-		new(chan int),
-		new(unsafe.Pointer),
-		new(interface{}),
-		&emptyInterfaceZero,
-		new(*int),
-		new(string),
-		new(struct{ int }),
-	}
-
-	for _, test := range cases {
-		rv := reflect.ValueOf(test).Elem()
-		if !keyEqual(rv, rv) {
-			t.Errorf("keyEqual(%s, %s) = false want true", rv.Type(), rv.Type())
-		}
-	}
-}
-
-func TestFdiff(t *testing.T) {
-	var buf bytes.Buffer
-	Fdiff(&buf, 0, 1)
-	want := "0 != 1\n"
-	if got := buf.String(); got != want {
-		t.Errorf("Fdiff(0, 1) = %q want %q", got, want)
-	}
-}
-
-func diffdiff(t *testing.T, got, exp []string) {
-	minus(t, "unexpected:", got, exp)
-	minus(t, "missing:", exp, got)
-}
-
-func minus(t *testing.T, s string, a, b []string) {
-	var i, j int
-	for i = 0; i < len(a); i++ {
-		for j = 0; j < len(b); j++ {
-			if a[i] == b[j] {
-				break
-			}
-		}
-		if j == len(b) {
-			t.Error(s, a[i])
-		}
-	}
-}
diff --git a/installer/vendor/github.com/kr/pretty/example_test.go b/installer/vendor/github.com/kr/pretty/example_test.go
deleted file mode 100644
index ecf40f3fcc..0000000000
--- a/installer/vendor/github.com/kr/pretty/example_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package pretty_test
-
-import (
-	"fmt"
-	"github.com/kr/pretty"
-)
-
-func Example() {
-	type myType struct {
-		a, b int
-	}
-	var x = []myType{{1, 2}, {3, 4}, {5, 6}}
-	fmt.Printf("%# v", pretty.Formatter(x))
-	// output:
-	// []pretty_test.myType{
-	//     {a:1, b:2},
-	//     {a:3, b:4},
-	//     {a:5, b:6},
-	// }
-}
diff --git a/installer/vendor/github.com/kr/pretty/formatter_test.go b/installer/vendor/github.com/kr/pretty/formatter_test.go
deleted file mode 100644
index c8c0b51531..0000000000
--- a/installer/vendor/github.com/kr/pretty/formatter_test.go
+++ /dev/null
@@ -1,288 +0,0 @@
-package pretty
-
-import (
-	"fmt"
-	"io"
-	"strings"
-	"testing"
-	"unsafe"
-)
-
-type test struct {
-	v interface{}
-	s string
-}
-
-type passtest struct {
-	v    interface{}
-	f, s string
-}
-
-type LongStructTypeName struct {
-	longFieldName      interface{}
-	otherLongFieldName interface{}
-}
-
-type SA struct {
-	t *T
-	v T
-}
-
-type T struct {
-	x, y int
-}
-
-type F int
-
-func (f F) Format(s fmt.State, c rune) {
-	fmt.Fprintf(s, "F(%d)", int(f))
-}
-
-type Stringer struct { i int }
-
-func (s *Stringer) String() string { return "foo" }
-
-var long = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"
-
-var passthrough = []passtest{
-	{1, "%d", "1"},
-	{"a", "%s", "a"},
-	{&Stringer{}, "%s", "foo"},
-}
-
-func TestPassthrough(t *testing.T) {
-	for _, tt := range passthrough {
-		s := fmt.Sprintf(tt.f, Formatter(tt.v))
-		if tt.s != s {
-			t.Errorf("expected %q", tt.s)
-			t.Errorf("got      %q", s)
-			t.Errorf("expraw\n%s", tt.s)
-			t.Errorf("gotraw\n%s", s)
-		}
-	}
-}
-
-var gosyntax = []test{
-	{nil, `nil`},
-	{"", `""`},
-	{"a", `"a"`},
-	{1, "int(1)"},
-	{1.0, "float64(1)"},
-	{[]int(nil), "[]int(nil)"},
-	{[0]int{}, "[0]int{}"},
-	{complex(1, 0), "(1+0i)"},
-	//{make(chan int), "(chan int)(0x1234)"},
-	{unsafe.Pointer(uintptr(unsafe.Pointer(&long))), fmt.Sprintf("unsafe.Pointer(0x%02x)", uintptr(unsafe.Pointer(&long)))},
-	{func(int) {}, "func(int) {...}"},
-	{map[int]int{1: 1}, "map[int]int{1:1}"},
-	{int32(1), "int32(1)"},
-	{io.EOF, `&errors.errorString{s:"EOF"}`},
-	{[]string{"a"}, `[]string{"a"}`},
-	{
-		[]string{long},
-		`[]string{"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"}`,
-	},
-	{F(5), "pretty.F(5)"},
-	{
-		SA{&T{1, 2}, T{3, 4}},
-		`pretty.SA{
-    t:  &pretty.T{x:1, y:2},
-    v:  pretty.T{x:3, y:4},
-}`,
-	},
-	{
-		map[int][]byte{1: {}},
-		`map[int][]uint8{
-    1:  {},
-}`,
-	},
-	{
-		map[int]T{1: {}},
-		`map[int]pretty.T{
-    1:  {},
-}`,
-	},
-	{
-		long,
-		`"abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789"`,
-	},
-	{
-		LongStructTypeName{
-			longFieldName:      LongStructTypeName{},
-			otherLongFieldName: long,
-		},
-		`pretty.LongStructTypeName{
-    longFieldName:      pretty.LongStructTypeName{},
-    otherLongFieldName: "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-}`,
-	},
-	{
-		&LongStructTypeName{
-			longFieldName:      &LongStructTypeName{},
-			otherLongFieldName: (*LongStructTypeName)(nil),
-		},
-		`&pretty.LongStructTypeName{
-    longFieldName:      &pretty.LongStructTypeName{},
-    otherLongFieldName: (*pretty.LongStructTypeName)(nil),
-}`,
-	},
-	{
-		[]LongStructTypeName{
-			{nil, nil},
-			{3, 3},
-			{long, nil},
-		},
-		`[]pretty.LongStructTypeName{
-    {},
-    {
-        longFieldName:      int(3),
-        otherLongFieldName: int(3),
-    },
-    {
-        longFieldName:      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-        otherLongFieldName: nil,
-    },
-}`,
-	},
-	{
-		[]interface{}{
-			LongStructTypeName{nil, nil},
-			[]byte{1, 2, 3},
-			T{3, 4},
-			LongStructTypeName{long, nil},
-		},
-		`[]interface {}{
-    pretty.LongStructTypeName{},
-    []uint8{0x1, 0x2, 0x3},
-    pretty.T{x:3, y:4},
-    pretty.LongStructTypeName{
-        longFieldName:      "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789",
-        otherLongFieldName: nil,
-    },
-}`,
-	},
-}
-
-func TestGoSyntax(t *testing.T) {
-	for _, tt := range gosyntax {
-		s := fmt.Sprintf("%# v", Formatter(tt.v))
-		if tt.s != s {
-			t.Errorf("expected %q", tt.s)
-			t.Errorf("got      %q", s)
-			t.Errorf("expraw\n%s", tt.s)
-			t.Errorf("gotraw\n%s", s)
-		}
-	}
-}
-
-type I struct {
-	i int
-	R interface{}
-}
-
-func (i *I) I() *I { return i.R.(*I) }
-
-func TestCycle(t *testing.T) {
-	type A struct{ *A }
-	v := &A{}
-	v.A = v
-
-	// panics from stack overflow without cycle detection
-	t.Logf("Example cycle:\n%# v", Formatter(v))
-
-	p := &A{}
-	s := fmt.Sprintf("%# v", Formatter([]*A{p, p}))
-	if strings.Contains(s, "CYCLIC") {
-		t.Errorf("Repeated address detected as cyclic reference:\n%s", s)
-	}
-
-	type R struct {
-		i int
-		*R
-	}
-	r := &R{
-		i: 1,
-		R: &R{
-			i: 2,
-			R: &R{
-				i: 3,
-			},
-		},
-	}
-	r.R.R.R = r
-	t.Logf("Example longer cycle:\n%# v", Formatter(r))
-
-	r = &R{
-		i: 1,
-		R: &R{
-			i: 2,
-			R: &R{
-				i: 3,
-				R: &R{
-					i: 4,
-					R: &R{
-						i: 5,
-						R: &R{
-							i: 6,
-							R: &R{
-								i: 7,
-								R: &R{
-									i: 8,
-									R: &R{
-										i: 9,
-										R: &R{
-											i: 10,
-											R: &R{
-												i: 11,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-	// here be pirates
-	r.R.R.R.R.R.R.R.R.R.R.R = r
-	t.Logf("Example very long cycle:\n%# v", Formatter(r))
-
-	i := &I{
-		i: 1,
-		R: &I{
-			i: 2,
-			R: &I{
-				i: 3,
-				R: &I{
-					i: 4,
-					R: &I{
-						i: 5,
-						R: &I{
-							i: 6,
-							R: &I{
-								i: 7,
-								R: &I{
-									i: 8,
-									R: &I{
-										i: 9,
-										R: &I{
-											i: 10,
-											R: &I{
-												i: 11,
-											},
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-	iv := i.I().I().I().I().I().I().I().I().I().I()
-	*iv = *i
-	t.Logf("Example long interface cycle:\n%# v", Formatter(i))
-}
diff --git a/installer/vendor/github.com/kr/text/Readme b/installer/vendor/github.com/kr/text/Readme
deleted file mode 100644
index 7e6e7c0687..0000000000
--- a/installer/vendor/github.com/kr/text/Readme
+++ /dev/null
@@ -1,3 +0,0 @@
-This is a Go package for manipulating paragraphs of text.
-
-See http://go.pkgdoc.org/github.com/kr/text for full documentation.
diff --git a/installer/vendor/github.com/kr/text/cmd/agg/doc.go b/installer/vendor/github.com/kr/text/cmd/agg/doc.go
deleted file mode 100644
index 3a9ec2db4f..0000000000
--- a/installer/vendor/github.com/kr/text/cmd/agg/doc.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-
-Agg computes aggregate values over tabular text.
-It behaves somewhat like the SQL “GROUP BY” clause.
-
-Usage:
-
-	agg [function...]
-
-It reads input from stdin as a sequence of records, one per line.
-It treats each line as a set of fields separated by white space.
-One field (the first, by default) is designated as the key.
-Successive lines with equal keys are grouped into a group,
-and agg produces one line of output for each group.
-(Note that only contiguous input lines can form a group.
-If you need to make sure that all records for a given key
-are grouped together, sort the input first.)
-
-For each remaining field,
-agg applies a function to all the values in the group,
-producing a single output value.
-The command line arguments specify which functions to use,
-one per field in the input table.
-
-Functions
-
-The available functions are:
-
-    key        group by this field (default for field 1)
-    first      value from first line of group (default for rest)
-    last       value from last line of group
-    sample     value from any line of group, uniformly at random
-    prefix     longest common string prefix
-    join:sep   concatenate strings with given sep
-    smin       lexically least string
-    smax       lexically greatest string
-    min        numerically least value
-    max        numerically greatest value
-    sum        numeric sum
-    mean       arithmetic mean
-    count      number of records (ignores input value)
-    const:val  print val, ignoring input
-    drop       omit the column entirely
-
-The numeric functions skip items that don't parse as numbers.
-
-Examples
-
-Using the following input:
-
-    $ cat >input
-    -rwx   alice      100   /home/alice/bin/crdt
-    -rw-   alice   210002   /home/alice/thesis.tex
-    -rw-   bob      10051   /home/bob/expenses.tab
-    -rwx   kr      862060   /home/kr/bin/blog
-    -rwx   kr      304608   /home/kr/bin/agg
-
-Disk usage for each user, plus where that disk usage occurs
-(longest common prefix of filesystem paths):
-
-    $ agg <input drop key sum prefix
-    alice	210153	/home/alice/
-    bob	10051	/home/bob/expenses.tab
-    kr	1166668	/home/kr/
-
-Disk usage for executable vs non-executable files:
-
-    $ sort input | agg key drop sum join:,
-    -rw-	220053	/home/alice/thesis.tex,/home/bob/expenses.tab
-    -rwx	1166768	/home/alice/bin/crdt,/home/kr/bin/agg,/home/kr/bin/blog
-
-*/
-package main
diff --git a/installer/vendor/github.com/kr/text/cmd/agg/main.go b/installer/vendor/github.com/kr/text/cmd/agg/main.go
deleted file mode 100644
index 4239aa43ca..0000000000
--- a/installer/vendor/github.com/kr/text/cmd/agg/main.go
+++ /dev/null
@@ -1,112 +0,0 @@
-package main
-
-// TODO(kr): tests
-
-import (
-	"bufio"
-	"fmt"
-	"log"
-	"math/rand"
-	"os"
-	"strings"
-	"time"
-)
-
-type agg interface {
-	merge(string)
-	String() string
-}
-
-var (
-	key     = 0
-	funcmap = make(map[int]func(init, arg string) agg)
-	argmap  = make(map[int]string)
-	symtab  = map[string]func(init, arg string) agg{
-		"first":  first,
-		"last":   last,
-		"prefix": prefix,
-		"sample": sample,
-		"join":   join,
-		"smin":   smin,
-		"smax":   smax,
-		"min":    min,
-		"max":    max,
-		"sum":    sum,
-		"mean":   mean,
-		"count":  count,
-		"const":  constf,
-		"drop":   nil,
-	}
-)
-
-func main() {
-	log.SetPrefix("agg: ")
-	log.SetFlags(0)
-	rand.Seed(time.Now().UnixNano())
-	for i, sym := range os.Args[1:] {
-		if p := strings.IndexByte(sym, ':'); p >= 0 {
-			sym, argmap[i] = sym[:p], sym[p+1:]
-		}
-		if sym == "key" {
-			key, sym = i, "first"
-		}
-		f, ok := symtab[sym]
-		if !ok {
-			log.Fatalf("bad function: %q", sym)
-		}
-		funcmap[i] = f
-	}
-
-	sc := bufio.NewScanner(os.Stdin)
-	var g *group
-	for sc.Scan() {
-		ss := strings.Fields(sc.Text())
-		if !matches(g, ss) {
-			emit(g)
-			g = &group{key: ss[key]}
-		}
-		mergeLine(g, ss)
-	}
-	emit(g)
-}
-
-type group struct {
-	key string
-	agg []agg
-}
-
-func matches(g *group, ss []string) bool {
-	return g != nil && g.key == ss[key]
-}
-
-func emit(g *group) {
-	if g == nil {
-		return
-	}
-	rest := false
-	for i, a := range g.agg {
-		if f, ok := funcmap[i]; ok && f == nil {
-			continue
-		}
-		if rest {
-			fmt.Print("\t")
-		}
-		rest = true
-		fmt.Print(a)
-	}
-	fmt.Println()
-}
-
-func mergeLine(g *group, ss []string) {
-	for i, s := range ss {
-		if i >= len(g.agg) {
-			f := funcmap[i]
-			if f == nil {
-				f = first
-			}
-			g.agg = append(g.agg, f(s, argmap[i]))
-		} else {
-			g.agg[i].merge(s)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/kr/text/cmd/agg/num.go b/installer/vendor/github.com/kr/text/cmd/agg/num.go
deleted file mode 100644
index 93ac3fe15e..0000000000
--- a/installer/vendor/github.com/kr/text/cmd/agg/num.go
+++ /dev/null
@@ -1,99 +0,0 @@
-package main
-
-import (
-	"math/big"
-	"strconv"
-)
-
-func min(s, arg string) agg { return newBinop(s, opmin) }
-func max(s, arg string) agg { return newBinop(s, opmax) }
-func sum(s, arg string) agg { return newBinop(s, opsum) }
-
-type binop struct {
-	v *big.Float
-	f func(a, b *big.Float) *big.Float
-}
-
-func newBinop(s string, f func(a, b *big.Float) *big.Float) *binop {
-	v, _ := parseFloat(s)
-	return &binop{v, f}
-}
-
-func (o *binop) String() string {
-	if o.v == nil {
-		return "NaN"
-	}
-	return o.v.Text('f', -1)
-}
-
-func (o *binop) merge(s string) {
-	v, ok := parseFloat(s)
-	if !ok {
-		return
-	}
-	o.v = o.f(o.v, v)
-}
-
-func opmin(a, b *big.Float) *big.Float {
-	if a != nil && (b == nil || a.Cmp(b) <= 0) {
-		return a
-	}
-	return b
-}
-
-func opmax(a, b *big.Float) *big.Float {
-	if a != nil && (b == nil || a.Cmp(b) >= 0) {
-		return a
-	}
-	return b
-}
-
-func opsum(a, b *big.Float) *big.Float {
-	if a == nil {
-		return b
-	} else if b == nil {
-		return a
-	}
-	return a.Add(a, b)
-}
-
-type meanagg struct {
-	v *big.Float
-	d float64 // actually an integer
-}
-
-func mean(s, arg string) agg {
-	v, ok := parseFloat(s)
-	if !ok {
-		return &meanagg{new(big.Float), 0}
-	}
-	return &meanagg{v, 1}
-}
-
-func (m *meanagg) String() string {
-	if m.d == 0 {
-		return "NaN"
-	}
-	v := new(big.Float).Quo(m.v, big.NewFloat(m.d))
-	return v.Text('f', -1)
-}
-
-func (m *meanagg) merge(s string) {
-	v, ok := parseFloat(s)
-	if !ok {
-		return
-	}
-	m.v.Add(m.v, v)
-	m.d++
-}
-
-func parseFloat(s string) (*big.Float, bool) {
-	v, _, err := big.ParseFloat(s, 0, 1000, big.ToNearestEven)
-	return v, err == nil
-}
-
-type counter int
-
-func count(init, arg string) agg  { return new(counter) }
-func (c *counter) String() string { return strconv.Itoa(int(*c) + 1) }
-func (c *counter) merge(string)   { *c++ }
diff --git a/installer/vendor/github.com/kr/text/cmd/agg/string.go b/installer/vendor/github.com/kr/text/cmd/agg/string.go
deleted file mode 100644
index 9a8cf78cae..0000000000
--- a/installer/vendor/github.com/kr/text/cmd/agg/string.go
+++ /dev/null
@@ -1,74 +0,0 @@
-package main
-
-import (
-	"math/rand"
-	"strings"
-)
-
-func first(s, arg string) agg  { return &sbinop{s, opfirst} }
-func last(s, arg string) agg   { return &sbinop{s, oplast} }
-func prefix(s, arg string) agg { return &sbinop{s, opprefix} }
-func join(s, arg string) agg   { return &sbinop{s, opjoin(arg)} }
-func smin(s, arg string) agg   { return &sbinop{s, opsmin} }
-func smax(s, arg string) agg   { return &sbinop{s, opsmax} }
-
-type sbinop struct {
-	s string
-	f func(a, b string) string
-}
-
-func (o *sbinop) String() string { return o.s }
-
-func (o *sbinop) merge(s string) { o.s = o.f(o.s, s) }
-
-func opfirst(a, b string) string { return a }
-func oplast(a, b string) string  { return b }
-
-func opprefix(a, b string) string {
-	for i := range a {
-		if i >= len(b) || a[i] != b[i] {
-			return a[:i]
-		}
-	}
-	return a
-}
-
-func opjoin(sep string) func(a, b string) string {
-	return func(a, b string) string {
-		return a + sep + b // TODO(kr): too slow? maybe strings.Join?
-	}
-}
-
-func opsmin(a, b string) string {
-	if strings.Compare(a, b) <= 0 {
-		return a
-	}
-	return b
-}
-
-func opsmax(a, b string) string {
-	if strings.Compare(a, b) >= 0 {
-		return a
-	}
-	return b
-}
-
-type sampler struct {
-	n int
-	s string
-}
-
-func sample(s, arg string) agg    { return &sampler{1, s} }
-func (p *sampler) String() string { return p.s }
-func (p *sampler) merge(s string) {
-	p.n++
-	if rand.Intn(p.n) == 0 {
-		p.s = s
-	}
-}
-
-type constant string
-
-func constf(init, arg string) agg { return constant(arg) }
-func (c constant) String() string { return string(c) }
-func (c constant) merge(string)   {}
diff --git a/installer/vendor/github.com/kr/text/colwriter/Readme b/installer/vendor/github.com/kr/text/colwriter/Readme
deleted file mode 100644
index 1c1f4e6839..0000000000
--- a/installer/vendor/github.com/kr/text/colwriter/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-Package colwriter provides a write filter that formats
-input lines in multiple columns.
-
-The package is a straightforward translation from
-/src/cmd/draw/mc.c in Plan 9 from User Space.
diff --git a/installer/vendor/github.com/kr/text/colwriter/column.go b/installer/vendor/github.com/kr/text/colwriter/column.go
deleted file mode 100644
index 7302ce9f7a..0000000000
--- a/installer/vendor/github.com/kr/text/colwriter/column.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Package colwriter provides a write filter that formats
-// input lines in multiple columns.
-//
-// The package is a straightforward translation from
-// /src/cmd/draw/mc.c in Plan 9 from User Space.
-package colwriter
-
-import (
-	"bytes"
-	"io"
-	"unicode/utf8"
-)
-
-const (
-	tab = 4
-)
-
-const (
-	// Print each input line ending in a colon ':' separately.
-	BreakOnColon uint = 1 << iota
-)
-
-// A Writer is a filter that arranges input lines in as many columns as will
-// fit in its width. Tab '\t' chars in the input are translated to sequences
-// of spaces ending at multiples of 4 positions.
-//
-// If BreakOnColon is set, each input line ending in a colon ':' is written
-// separately.
-//
-// The Writer assumes that all Unicode code points have the same width; this
-// may not be true in some fonts.
-type Writer struct {
-	w     io.Writer
-	buf   []byte
-	width int
-	flag  uint
-}
-
-// NewWriter allocates and initializes a new Writer writing to w.
-// Parameter width controls the total number of characters on each line
-// across all columns.
-func NewWriter(w io.Writer, width int, flag uint) *Writer {
-	return &Writer{
-		w:     w,
-		width: width,
-		flag:  flag,
-	}
-}
-
-// Write writes p to the writer w. The only errors returned are ones
-// encountered while writing to the underlying output stream.
-func (w *Writer) Write(p []byte) (n int, err error) {
-	var linelen int
-	var lastWasColon bool
-	for i, c := range p {
-		w.buf = append(w.buf, c)
-		linelen++
-		if c == '\t' {
-			w.buf[len(w.buf)-1] = ' '
-			for linelen%tab != 0 {
-				w.buf = append(w.buf, ' ')
-				linelen++
-			}
-		}
-		if w.flag&BreakOnColon != 0 && c == ':' {
-			lastWasColon = true
-		} else if lastWasColon {
-			if c == '\n' {
-				pos := bytes.LastIndex(w.buf[:len(w.buf)-1], []byte{'\n'})
-				if pos < 0 {
-					pos = 0
-				}
-				line := w.buf[pos:]
-				w.buf = w.buf[:pos]
-				if err = w.columnate(); err != nil {
-					if len(line) < i {
-						return i - len(line), err
-					}
-					return 0, err
-				}
-				if n, err := w.w.Write(line); err != nil {
-					if r := len(line) - n; r < i {
-						return i - r, err
-					}
-					return 0, err
-				}
-			}
-			lastWasColon = false
-		}
-		if c == '\n' {
-			linelen = 0
-		}
-	}
-	return len(p), nil
-}
-
-// Flush should be called after the last call to Write to ensure that any data
-// buffered in the Writer is written to output.
-func (w *Writer) Flush() error {
-	return w.columnate()
-}
-
-func (w *Writer) columnate() error {
-	words := bytes.Split(w.buf, []byte{'\n'})
-	w.buf = nil
-	if len(words[len(words)-1]) == 0 {
-		words = words[:len(words)-1]
-	}
-	maxwidth := 0
-	for _, wd := range words {
-		if n := utf8.RuneCount(wd); n > maxwidth {
-			maxwidth = n
-		}
-	}
-	maxwidth++ // space char
-	wordsPerLine := w.width / maxwidth
-	if wordsPerLine <= 0 {
-		wordsPerLine = 1
-	}
-	nlines := (len(words) + wordsPerLine - 1) / wordsPerLine
-	for i := 0; i < nlines; i++ {
-		col := 0
-		endcol := 0
-		for j := i; j < len(words); j += nlines {
-			endcol += maxwidth
-			_, err := w.w.Write(words[j])
-			if err != nil {
-				return err
-			}
-			col += utf8.RuneCount(words[j])
-			if j+nlines < len(words) {
-				for col < endcol {
-					_, err := w.w.Write([]byte{' '})
-					if err != nil {
-						return err
-					}
-					col++
-				}
-			}
-		}
-		_, err := w.w.Write([]byte{'\n'})
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/kr/text/colwriter/column_test.go b/installer/vendor/github.com/kr/text/colwriter/column_test.go
deleted file mode 100644
index ce388f5a26..0000000000
--- a/installer/vendor/github.com/kr/text/colwriter/column_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-package colwriter
-
-import (
-	"bytes"
-	"testing"
-)
-
-var src = `
-.git
-.gitignore
-.godir
-Procfile:
-README.md
-api.go
-apps.go
-auth.go
-darwin.go
-data.go
-dyno.go:
-env.go
-git.go
-help.go
-hkdist
-linux.go
-ls.go
-main.go
-plugin.go
-run.go
-scale.go
-ssh.go
-tail.go
-term
-unix.go
-update.go
-version.go
-windows.go
-`[1:]
-
-var tests = []struct {
-	wid  int
-	flag uint
-	src  string
-	want string
-}{
-	{80, 0, "", ""},
-	{80, 0, src, `
-.git       README.md  darwin.go  git.go     ls.go      scale.go   unix.go
-.gitignore api.go     data.go    help.go    main.go    ssh.go     update.go
-.godir     apps.go    dyno.go:   hkdist     plugin.go  tail.go    version.go
-Procfile:  auth.go    env.go     linux.go   run.go     term       windows.go
-`[1:]},
-	{80, BreakOnColon, src, `
-.git       .gitignore .godir
-
-Procfile:
-README.md api.go    apps.go   auth.go   darwin.go data.go
-
-dyno.go:
-env.go     hkdist     main.go    scale.go   term       version.go
-git.go     linux.go   plugin.go  ssh.go     unix.go    windows.go
-help.go    ls.go      run.go     tail.go    update.go
-`[1:]},
-	{20, 0, `
-Hello
-Γειά σου
-안녕
-今日は
-`[1:], `
-Hello    안녕
-Γειά σου 今日は
-`[1:]},
-}
-
-func TestWriter(t *testing.T) {
-	for _, test := range tests {
-		b := new(bytes.Buffer)
-		w := NewWriter(b, test.wid, test.flag)
-		if _, err := w.Write([]byte(test.src)); err != nil {
-			t.Error(err)
-		}
-		if err := w.Flush(); err != nil {
-			t.Error(err)
-		}
-		if g := b.String(); test.want != g {
-			t.Log("\n" + test.want)
-			t.Log("\n" + g)
-			t.Errorf("%q != %q", test.want, g)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/kr/text/indent_test.go b/installer/vendor/github.com/kr/text/indent_test.go
deleted file mode 100644
index 5c723eee85..0000000000
--- a/installer/vendor/github.com/kr/text/indent_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-package text
-
-import (
-	"bytes"
-	"testing"
-)
-
-type T struct {
-	inp, exp, pre string
-}
-
-var tests = []T{
-	{
-		"The quick brown fox\njumps over the lazy\ndog.\nBut not quickly.\n",
-		"xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\nxxxBut not quickly.\n",
-		"xxx",
-	},
-	{
-		"The quick brown fox\njumps over the lazy\ndog.\n\nBut not quickly.",
-		"xxxThe quick brown fox\nxxxjumps over the lazy\nxxxdog.\n\nxxxBut not quickly.",
-		"xxx",
-	},
-}
-
-func TestIndent(t *testing.T) {
-	for _, test := range tests {
-		got := Indent(test.inp, test.pre)
-		if got != test.exp {
-			t.Errorf("mismatch %q != %q", got, test.exp)
-		}
-	}
-}
-
-type IndentWriterTest struct {
-	inp, exp string
-	pre      []string
-}
-
-var ts = []IndentWriterTest{
-	{
-		`
-The quick brown fox
-jumps over the lazy
-dog.
-But not quickly.
-`[1:],
-		`
-xxxThe quick brown fox
-xxxjumps over the lazy
-xxxdog.
-xxxBut not quickly.
-`[1:],
-		[]string{"xxx"},
-	},
-	{
-		`
-The quick brown fox
-jumps over the lazy
-dog.
-But not quickly.
-`[1:],
-		`
-xxaThe quick brown fox
-xxxjumps over the lazy
-xxxdog.
-xxxBut not quickly.
-`[1:],
-		[]string{"xxa", "xxx"},
-	},
-	{
-		`
-The quick brown fox
-jumps over the lazy
-dog.
-But not quickly.
-`[1:],
-		`
-xxaThe quick brown fox
-xxbjumps over the lazy
-xxcdog.
-xxxBut not quickly.
-`[1:],
-		[]string{"xxa", "xxb", "xxc", "xxx"},
-	},
-	{
-		`
-The quick brown fox
-jumps over the lazy
-dog.
-
-But not quickly.`[1:],
-		`
-xxaThe quick brown fox
-xxxjumps over the lazy
-xxxdog.
-xxx
-xxxBut not quickly.`[1:],
-		[]string{"xxa", "xxx"},
-	},
-}
-
-func TestIndentWriter(t *testing.T) {
-	for _, test := range ts {
-		b := new(bytes.Buffer)
-		pre := make([][]byte, len(test.pre))
-		for i := range test.pre {
-			pre[i] = []byte(test.pre[i])
-		}
-		w := NewIndentWriter(b, pre...)
-		if _, err := w.Write([]byte(test.inp)); err != nil {
-			t.Error(err)
-		}
-		if got := b.String(); got != test.exp {
-			t.Errorf("mismatch %q != %q", got, test.exp)
-			t.Log(got)
-			t.Log(test.exp)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/kr/text/mc/Readme b/installer/vendor/github.com/kr/text/mc/Readme
deleted file mode 100644
index 519ddc00a1..0000000000
--- a/installer/vendor/github.com/kr/text/mc/Readme
+++ /dev/null
@@ -1,9 +0,0 @@
-Command mc prints in multiple columns.
-
-  Usage: mc [-] [-N] [file...]
-
-Mc splits the input into as many columns as will fit in N
-print positions. If the output is a tty, the default N is
-the number of characters in a terminal line; otherwise the
-default N is 80. Under option - each input line ending in
-a colon ':' is printed separately.
diff --git a/installer/vendor/github.com/kr/text/mc/mc.go b/installer/vendor/github.com/kr/text/mc/mc.go
deleted file mode 100644
index 00169a30f1..0000000000
--- a/installer/vendor/github.com/kr/text/mc/mc.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Command mc prints in multiple columns.
-//
-//   Usage: mc [-] [-N] [file...]
-//
-// Mc splits the input into as many columns as will fit in N
-// print positions. If the output is a tty, the default N is
-// the number of characters in a terminal line; otherwise the
-// default N is 80. Under option - each input line ending in
-// a colon ':' is printed separately.
-package main
-
-import (
-	"github.com/kr/pty"
-	"github.com/kr/text/colwriter"
-	"io"
-	"log"
-	"os"
-	"strconv"
-)
-
-func main() {
-	var width int
-	var flag uint
-	args := os.Args[1:]
-	for len(args) > 0 && len(args[0]) > 0 && args[0][0] == '-' {
-		if len(args[0]) > 1 {
-			width, _ = strconv.Atoi(args[0][1:])
-		} else {
-			flag |= colwriter.BreakOnColon
-		}
-		args = args[1:]
-	}
-	if width < 1 {
-		_, width, _ = pty.Getsize(os.Stdout)
-	}
-	if width < 1 {
-		width = 80
-	}
-
-	w := colwriter.NewWriter(os.Stdout, width, flag)
-	if len(args) > 0 {
-		for _, s := range args {
-			if f, err := os.Open(s); err == nil {
-				copyin(w, f)
-				f.Close()
-			} else {
-				log.Println(err)
-			}
-		}
-	} else {
-		copyin(w, os.Stdin)
-	}
-}
-
-func copyin(w *colwriter.Writer, r io.Reader) {
-	if _, err := io.Copy(w, r); err != nil {
-		log.Println(err)
-	}
-	if err := w.Flush(); err != nil {
-		log.Println(err)
-	}
-}
diff --git a/installer/vendor/github.com/kr/text/wrap_test.go b/installer/vendor/github.com/kr/text/wrap_test.go
deleted file mode 100644
index 634b6e8ebb..0000000000
--- a/installer/vendor/github.com/kr/text/wrap_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package text
-
-import (
-	"bytes"
-	"testing"
-)
-
-var text = "The quick brown fox jumps over the lazy dog."
-
-func TestWrap(t *testing.T) {
-	exp := [][]string{
-		{"The", "quick", "brown", "fox"},
-		{"jumps", "over", "the", "lazy", "dog."},
-	}
-	words := bytes.Split([]byte(text), sp)
-	got := WrapWords(words, 1, 24, defaultPenalty)
-	if len(exp) != len(got) {
-		t.Fail()
-	}
-	for i := range exp {
-		if len(exp[i]) != len(got[i]) {
-			t.Fail()
-		}
-		for j := range exp[i] {
-			if exp[i][j] != string(got[i][j]) {
-				t.Fatal(i, exp[i][j], got[i][j])
-			}
-		}
-	}
-}
-
-func TestWrapNarrow(t *testing.T) {
-	exp := "The\nquick\nbrown\nfox\njumps\nover\nthe\nlazy\ndog."
-	if Wrap(text, 5) != exp {
-		t.Fail()
-	}
-}
-
-func TestWrapOneLine(t *testing.T) {
-	exp := "The quick brown fox jumps over the lazy dog."
-	if Wrap(text, 500) != exp {
-		t.Fail()
-	}
-}
-
-func TestWrapBug1(t *testing.T) {
-	cases := []struct {
-		limit int
-		text  string
-		want  string
-	}{
-		{4, "aaaaa", "aaaaa"},
-		{4, "a aaaaa", "a\naaaaa"},
-	}
-
-	for _, test := range cases {
-		got := Wrap(test.text, test.limit)
-		if got != test.want {
-			t.Errorf("Wrap(%q, %d) = %q want %q", test.text, test.limit, got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/.travis.yml b/installer/vendor/github.com/maruel/panicparse/.travis.yml
deleted file mode 100644
index c6da8f0b8c..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/.travis.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2014 Marc-Antoine Ruel. All rights reserved.
-# Use of this source code is governed under the Apache License, Version 2.0
-# that can be found in the LICENSE file.
-
-sudo: false
-language: go
-
-go:
-- tip
-
-before_install:
-  - go get github.com/maruel/pre-commit-go/cmd/pcg
-
-script:
-  - pcg
diff --git a/installer/vendor/github.com/maruel/panicparse/README.md b/installer/vendor/github.com/maruel/panicparse/README.md
deleted file mode 100644
index 9fc039cd9c..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/README.md
+++ /dev/null
@@ -1,123 +0,0 @@
-panicparse
-==========
-
-Parses panic stack traces, densifies and deduplicates goroutines with similar
-stack traces. Helps debugging crashes and deadlocks in heavily parallelized
-process.
-
-[![Build Status](https://travis-ci.org/maruel/panicparse.svg?branch=master)](https://travis-ci.org/maruel/panicparse)
-
-panicparse helps make sense of Go crash dumps:
-
-![Screencast](https://raw.githubusercontent.com/wiki/maruel/panicparse/parse.gif "Screencast")
-
-
-Features
---------
-
-   * >50% more compact output than original stack dump yet more readable.
-   * Exported symbols are bold, private symbols are darker.
-   * Stdlib is green, main is yellow, rest is red.
-   * Deduplicates redundant goroutine stacks. Useful for large server crashes.
-   * Arguments as pointer IDs instead of raw pointer values.
-   * Pushes stdlib-only stacks at the bottom to help focus on important code.
-   * Usable as a library!
-     [![GoDoc](https://godoc.org/github.com/maruel/panicparse/stack?status.svg)](https://godoc.org/github.com/maruel/panicparse/stack)
-     * Warning: please pin the version (e.g. vendor it). Breaking changes are
-       not planned but may happen.
-   * Parses the source files if available to augment the output.
-   * Works on Windows.
-
-
-Installation
-------------
-
-    go get github.com/maruel/panicparse/cmd/pp
-
-
-Usage
------
-
-### Piping a stack trace from another process
-
-#### TL;DR
-
-   * Ubuntu (bash v4 or zsh): `|&`
-   * OSX, [install bash 4+](README.md#updating-bash-on-osx), then: `|&`
-   * Windows _or_ OSX with stock bash v3: `2>&1 |`
-   * [Fish](http://fishshell.com/) shell: `^|`
-
-
-#### Longer version
-
-`pp` streams its stdin to stdout as long as it doesn't detect any panic.
-`panic()` and Go's native deadlock detector [print to
-stderr](https://golang.org/src/runtime/panic1.go) via the native [`print()`
-function](https://golang.org/pkg/builtin/#print).
-
-
-**Bash v4** or **zsh**: `|&` tells the shell to redirect stderr to stdout,
-it's an alias for `2>&1 |` ([bash
-v4](https://www.gnu.org/software/bash/manual/bash.html#Pipelines),
-[zsh](http://zsh.sourceforge.net/Doc/Release/Shell-Grammar.html#Simple-Commands-_0026-Pipelines)):
-
-    go test -v |&pp
-
-
-**Windows or OSX native bash** [(which is
-3.2.57)](http://meta.ath0.com/2012/02/05/apples-great-gpl-purge/): They don't
-have this shortcut, so use the long form:
-
-    go test -v 2>&1 | pp
-
-
-**Fish**: It uses [^ for stderr
-redirection](http://fishshell.com/docs/current/tutorial.html#tut_pipes_and_redirections)
-so the shortcut is `^|`:
-
-    go test -v ^|pp
-
-
-**PowerShell**: [It has broken `2>&1` redirection](https://connect.microsoft.com/PowerShell/feedback/details/765551/in-powershell-v3-you-cant-redirect-stderr-to-stdout-without-generating-error-records). The workaround is to shell out to cmd.exe. :(
-
-
-### Investigate deadlock
-
-On POSIX, use `Ctrl-\` to send SIGQUIT to your process, `pp` will ignore
-the signal and will parse the stack trace.
-
-
-### Parsing from a file
-
-To dump to a file then parse, pass the file path of a stack trace
-
-    go test 2> stack.txt
-    pp stack.txt
-
-
-Tips
-----
-
-### GOTRACEBACK
-
-Starting with Go 1.6, [`GOTRACEBACK`](https://golang.org/pkg/runtime/) defaults
-to `single` instead of `all` / `1` that was used in 1.5 and before. To get all
-goroutines trace and not just the crashing one, set the environment variable:
-
-    export GOTRACEBACK=all
-
-or `set GOTRACEBACK=all` on Windows. Probably worth to put it in your `.bashrc`.
-
-
-### Updating bash on OSX
-
-Install bash v4+ on OSX via [homebrew](http://brew.sh) or
-[macports](https://www.macports.org/). Your future self will appreciate having
-done that.
-
-
-### If you have `/usr/bin/pp` installed
-
-You may have the Perl PAR Packager installed. Use long name `panicparse` then;
-
-    go get github.com/maruel/panicparse
diff --git a/installer/vendor/github.com/maruel/panicparse/cmd/pp/main.go b/installer/vendor/github.com/maruel/panicparse/cmd/pp/main.go
deleted file mode 100644
index 67d8e1a754..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/cmd/pp/main.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-// panicparse: analyzes stack dump of Go processes and simplifies it.
-//
-// It is mostly useful on servers will large number of identical goroutines,
-// making the crash dump harder to read than strictly necesary.
-//
-// Colors:
-//  - Magenta: first goroutine to be listed.
-//  - Yellow: main package.
-//  - Green: standard library.
-//  - Red: other packages.
-//
-// Bright colors are used for exported symbols.
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/maruel/panicparse/internal"
-)
-
-func main() {
-	if err := internal.Main(); err != nil {
-		fmt.Fprintf(os.Stderr, "Failed: %s\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/internal/goversion1.6.go b/installer/vendor/github.com/maruel/panicparse/internal/goversion1.6.go
deleted file mode 100644
index 3bd5e5dd46..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/internal/goversion1.6.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-// +build go1.6
-
-package internal
-
-const (
-	showGOTRACEBACKBanner = true
-)
diff --git a/installer/vendor/github.com/maruel/panicparse/internal/goversion1.go b/installer/vendor/github.com/maruel/panicparse/internal/goversion1.go
deleted file mode 100644
index 3ee33e1322..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/internal/goversion1.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-// +build go1.1
-// +build !go1.6
-
-package internal
-
-const (
-	showGOTRACEBACKBanner = false
-)
diff --git a/installer/vendor/github.com/maruel/panicparse/internal/main.go b/installer/vendor/github.com/maruel/panicparse/internal/main.go
deleted file mode 100644
index b4750d8e25..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/internal/main.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-// Package internal implements panicparse
-//
-// It is mostly useful on servers will large number of identical goroutines,
-// making the crash dump harder to read than strictly necesary.
-//
-// Colors:
-//  - Magenta: first goroutine to be listed.
-//  - Yellow: main package.
-//  - Green: standard library.
-//  - Red: other packages.
-//
-// Bright colors are used for exported symbols.
-package internal
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/maruel/panicparse/stack"
-	"github.com/mattn/go-colorable"
-	"github.com/mattn/go-isatty"
-	"github.com/mgutz/ansi"
-)
-
-// resetFG is similar to ansi.Reset except that it doesn't reset the
-// background color, only the foreground color and the style.
-//
-// That much for the "ansi" abstraction layer...
-const resetFG = ansi.DefaultFG + "\033[m"
-
-// defaultPalette is the default recommended palette.
-var defaultPalette = stack.Palette{
-	EOLReset:               resetFG,
-	RoutineFirst:           ansi.ColorCode("magenta+b"),
-	CreatedBy:              ansi.LightBlack,
-	Package:                ansi.ColorCode("default+b"),
-	SourceFile:             resetFG,
-	FunctionStdLib:         ansi.Green,
-	FunctionStdLibExported: ansi.ColorCode("green+b"),
-	FunctionMain:           ansi.ColorCode("yellow+b"),
-	FunctionOther:          ansi.Red,
-	FunctionOtherExported:  ansi.ColorCode("red+b"),
-	Arguments:              resetFG,
-}
-
-// process copies stdin to stdout and processes any "panic: " line found.
-func process(in io.Reader, out io.Writer, p *stack.Palette, s stack.Similarity, fullPath, parse bool) error {
-	goroutines, err := stack.ParseDump(in, out)
-	if err != nil {
-		return err
-	}
-	if len(goroutines) == 1 && showBanner() {
-		_, _ = io.WriteString(out, "\nTo see all goroutines, visit https://github.com/maruel/panicparse#GOTRACEBACK\n\n")
-	}
-	if parse {
-		stack.Augment(goroutines)
-	}
-	buckets := stack.SortBuckets(stack.Bucketize(goroutines, s))
-	srcLen, pkgLen := stack.CalcLengths(buckets, fullPath)
-	for _, bucket := range buckets {
-		_, _ = io.WriteString(out, p.BucketHeader(&bucket, fullPath, len(buckets) > 1))
-		_, _ = io.WriteString(out, p.StackLines(&bucket.Signature, srcLen, pkgLen, fullPath))
-	}
-	return err
-}
-
-func showBanner() bool {
-	if !showGOTRACEBACKBanner {
-		return false
-	}
-	gtb := os.Getenv("GOTRACEBACK")
-	return gtb == "" || gtb == "single"
-}
-
-// Main is implemented here so both 'pp' and 'panicparse' executables can be
-// compiled. This is to work around the Perl Package manager 'pp' that is
-// preinstalled on some OSes.
-func Main() error {
-	signals := make(chan os.Signal)
-	go func() {
-		for {
-			<-signals
-		}
-	}()
-	signal.Notify(signals, os.Interrupt, syscall.SIGQUIT)
-	aggressive := flag.Bool("aggressive", false, "Aggressive deduplication including non pointers")
-	fullPath := flag.Bool("full-path", false, "Print full sources path")
-	noColor := flag.Bool("no-color", !isatty.IsTerminal(os.Stdout.Fd()) || os.Getenv("TERM") == "dumb", "Disable coloring")
-	forceColor := flag.Bool("force-color", false, "Forcibly enable coloring when with stdout is redirected")
-	parse := flag.Bool("parse", true, "Parses source files to deduct types; use -parse=false to work around bugs in source parser")
-	verboseFlag := flag.Bool("v", false, "Enables verbose logging output")
-	flag.Parse()
-
-	log.SetFlags(log.Lmicroseconds)
-	if !*verboseFlag {
-		log.SetOutput(ioutil.Discard)
-	}
-
-	s := stack.AnyPointer
-	if *aggressive {
-		s = stack.AnyValue
-	}
-
-	var out io.Writer
-	p := &defaultPalette
-	if *noColor && !*forceColor {
-		p = &stack.Palette{}
-		out = os.Stdout
-	} else {
-		out = colorable.NewColorableStdout()
-	}
-
-	var in *os.File
-	switch flag.NArg() {
-	case 0:
-		in = os.Stdin
-	case 1:
-		var err error
-		name := flag.Arg(0)
-		if in, err = os.Open(name); err != nil {
-			return fmt.Errorf("did you mean to specify a valid stack dump file name? %s", err)
-		}
-		defer in.Close()
-	default:
-		return errors.New("pipe from stdin or specify a single file")
-	}
-	return process(in, out, p, s, *fullPath, *parse)
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/internal/main_test.go b/installer/vendor/github.com/maruel/panicparse/internal/main_test.go
deleted file mode 100644
index d6e27f0abd..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/internal/main_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-package internal
-
-import (
-	"bytes"
-	"strings"
-	"testing"
-
-	"github.com/maruel/panicparse/stack"
-	"github.com/maruel/ut"
-)
-
-var data = []string{
-	"panic: runtime error: index out of range",
-	"",
-	"goroutine 11 [running, 5 minutes, locked to thread]:",
-	"github.com/luci/luci-go/client/archiver.(*archiver).PushFile(0xc208032410, 0xc20968a3c0, 0x5b, 0xc20988c280, 0x7d, 0x0, 0x0)",
-	"        /gopath/path/to/archiver.go:325 +0x2c4",
-	"github.com/luci/luci-go/client/isolate.archive(0x7fbdab7a5218, 0xc208032410, 0xc20803b0b0, 0x22, 0xc208046370, 0xc20804666a, 0x17, 0x0, 0x0, 0x0, ...)",
-	"        /gopath/path/to/isolate.go:148 +0x12d2",
-	"github.com/luci/luci-go/client/isolate.Archive(0x7fbdab7a5218, 0xc208032410, 0xc20803b0b0, 0x22, 0xc208046370, 0x0, 0x0)",
-	"        /gopath/path/to/isolate.go:102 +0xc9",
-	"main.func·004(0x7fffc3b8f13a, 0x2c)",
-	"        /gopath/path/to/batch_archive.go:166 +0x7cd",
-	"created by main.(*batchArchiveRun).main",
-	"        /gopath/path/to/batch_archive.go:167 +0x42c",
-	"",
-	"goroutine 1 [running]:",
-	"gopkg.in/yaml%2ev2.handleErr(0xc208033b20)",
-	" /gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-	"reflect.Value.assignTo(0x570860, 0xc20803f3e0, 0x15)",
-	" c:/go/src/reflect/value.go:2125 +0x368",
-	"main.main()",
-	" /gopath/src/github.com/maruel/pre-commit-go/main.go:428 +0x27",
-	"",
-	"goroutine 2 [running, 1 minutes]:",
-	"gopkg.in/yaml%2ev2.handleErr(0xc208033b20)",
-	" /gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-	"reflect.Value.assignTo(0x570860, 0xc20803f3e0, 0x15)",
-	" c:/go/src/reflect/value.go:2125 +0x368",
-	"main.main()",
-	" /gopath/src/github.com/maruel/pre-commit-go/main.go:428 +0x27",
-	"",
-}
-
-func TestProcess(t *testing.T) {
-	out := &bytes.Buffer{}
-	err := process(bytes.NewBufferString(strings.Join(data, "\n")), out, &defaultPalette, stack.AnyPointer, false, false)
-	ut.AssertEqual(t, nil, err)
-	expected := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"\x1b[1;35m1: running [5 minutes] [locked]\x1b[90m [Created by main.(*batchArchiveRun).main @ batch_archive.go:167]\x1b[39m\x1b[m",
-		"    \x1b[1;39marchiver \x1b[39m\x1b[marchiver.go:325      \x1b[1;31m(*archiver).PushFile\x1b[39m\x1b[m(#1, 0xc20968a3c0, 0x5b, 0xc20988c280, 0x7d, 0, 0)\x1b[39m\x1b[m",
-		"    \x1b[1;39misolate  \x1b[39m\x1b[misolate.go:148       \x1b[31marchive\x1b[39m\x1b[m(#4, #1, #2, 0x22, #3, 0xc20804666a, 0x17, 0, 0, 0, ...)\x1b[39m\x1b[m",
-		"    \x1b[1;39misolate  \x1b[39m\x1b[misolate.go:102       \x1b[1;31mArchive\x1b[39m\x1b[m(#4, #1, #2, 0x22, #3, 0, 0)\x1b[39m\x1b[m",
-		"    \x1b[1;39mmain     \x1b[39m\x1b[mbatch_archive.go:166 \x1b[1;33mfunc·004\x1b[39m\x1b[m(0x7fffc3b8f13a, 0x2c)\x1b[39m\x1b[m",
-		"2: running [0~1 minutes]\x1b[39m\x1b[m",
-		"    \x1b[1;39myaml.v2  \x1b[39m\x1b[myaml.go:153          \x1b[31mhandleErr\x1b[39m\x1b[m(#5)\x1b[39m\x1b[m",
-		"    \x1b[1;39mreflect  \x1b[39m\x1b[mvalue.go:2125        \x1b[32mValue.assignTo\x1b[39m\x1b[m(0x570860, #6, 0x15)\x1b[39m\x1b[m",
-		"    \x1b[1;39mmain     \x1b[39m\x1b[mmain.go:428          \x1b[1;33mmain\x1b[39m\x1b[m()\x1b[39m\x1b[m",
-		"",
-	}
-	actual := strings.Split(out.String(), "\n")
-	for i := 0; i < len(actual) && i < len(expected); i++ {
-		ut.AssertEqualIndex(t, i, expected[i], actual[i])
-	}
-	ut.AssertEqual(t, expected, actual)
-}
-
-func TestProcessFullPath(t *testing.T) {
-	out := &bytes.Buffer{}
-	err := process(bytes.NewBufferString(strings.Join(data, "\n")), out, &defaultPalette, stack.AnyValue, true, false)
-	ut.AssertEqual(t, nil, err)
-	expected := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"\x1b[1;35m1: running [5 minutes] [locked]\x1b[90m [Created by main.(*batchArchiveRun).main @ /gopath/path/to/batch_archive.go:167]\x1b[39m\x1b[m",
-		"    \x1b[1;39marchiver \x1b[39m\x1b[m/gopath/path/to/archiver.go:325                         \x1b[1;31m(*archiver).PushFile\x1b[39m\x1b[m(#1, 0xc20968a3c0, 0x5b, 0xc20988c280, 0x7d, 0, 0)\x1b[39m\x1b[m",
-		"    \x1b[1;39misolate  \x1b[39m\x1b[m/gopath/path/to/isolate.go:148                          \x1b[31marchive\x1b[39m\x1b[m(#4, #1, #2, 0x22, #3, 0xc20804666a, 0x17, 0, 0, 0, ...)\x1b[39m\x1b[m",
-		"    \x1b[1;39misolate  \x1b[39m\x1b[m/gopath/path/to/isolate.go:102                          \x1b[1;31mArchive\x1b[39m\x1b[m(#4, #1, #2, 0x22, #3, 0, 0)\x1b[39m\x1b[m",
-		"    \x1b[1;39mmain     \x1b[39m\x1b[m/gopath/path/to/batch_archive.go:166                    \x1b[1;33mfunc·004\x1b[39m\x1b[m(0x7fffc3b8f13a, 0x2c)\x1b[39m\x1b[m",
-		"2: running [0~1 minutes]\x1b[39m\x1b[m",
-		"    \x1b[1;39myaml.v2  \x1b[39m\x1b[m/gopath/src/gopkg.in/yaml.v2/yaml.go:153                \x1b[31mhandleErr\x1b[39m\x1b[m(#5)\x1b[39m\x1b[m",
-		"    \x1b[1;39mreflect  \x1b[39m\x1b[mc:/go/src/reflect/value.go:2125                         \x1b[32mValue.assignTo\x1b[39m\x1b[m(0x570860, #6, 0x15)\x1b[39m\x1b[m",
-		"    \x1b[1;39mmain     \x1b[39m\x1b[m/gopath/src/github.com/maruel/pre-commit-go/main.go:428 \x1b[1;33mmain\x1b[39m\x1b[m()\x1b[39m\x1b[m",
-		"",
-	}
-	actual := strings.Split(out.String(), "\n")
-	for i := 0; i < len(actual) && i < len(expected); i++ {
-		ut.AssertEqualIndex(t, i, expected[i], actual[i])
-	}
-	ut.AssertEqual(t, expected, actual)
-}
-
-func TestProcessNoColor(t *testing.T) {
-	out := &bytes.Buffer{}
-	err := process(bytes.NewBufferString(strings.Join(data, "\n")), out, &stack.Palette{}, stack.AnyPointer, false, false)
-	ut.AssertEqual(t, nil, err)
-	expected := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"1: running [5 minutes] [locked] [Created by main.(*batchArchiveRun).main @ batch_archive.go:167]",
-		"    archiver archiver.go:325      (*archiver).PushFile(#1, 0xc20968a3c0, 0x5b, 0xc20988c280, 0x7d, 0, 0)",
-		"    isolate  isolate.go:148       archive(#4, #1, #2, 0x22, #3, 0xc20804666a, 0x17, 0, 0, 0, ...)",
-		"    isolate  isolate.go:102       Archive(#4, #1, #2, 0x22, #3, 0, 0)",
-		"    main     batch_archive.go:166 func·004(0x7fffc3b8f13a, 0x2c)",
-		"2: running [0~1 minutes]",
-		"    yaml.v2  yaml.go:153          handleErr(#5)",
-		"    reflect  value.go:2125        Value.assignTo(0x570860, #6, 0x15)",
-		"    main     main.go:428          main()",
-		"",
-	}
-	actual := strings.Split(out.String(), "\n")
-	for i := 0; i < len(actual) && i < len(expected); i++ {
-		ut.AssertEqualIndex(t, i, expected[i], actual[i])
-	}
-	ut.AssertEqual(t, expected, actual)
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/main.go b/installer/vendor/github.com/maruel/panicparse/main.go
deleted file mode 100644
index 67d8e1a754..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/main.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-// panicparse: analyzes stack dump of Go processes and simplifies it.
-//
-// It is mostly useful on servers will large number of identical goroutines,
-// making the crash dump harder to read than strictly necesary.
-//
-// Colors:
-//  - Magenta: first goroutine to be listed.
-//  - Yellow: main package.
-//  - Green: standard library.
-//  - Red: other packages.
-//
-// Bright colors are used for exported symbols.
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/maruel/panicparse/internal"
-)
-
-func main() {
-	if err := internal.Main(); err != nil {
-		fmt.Fprintf(os.Stderr, "Failed: %s\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/bucket.go b/installer/vendor/github.com/maruel/panicparse/stack/bucket.go
new file mode 100644
index 0000000000..259dab2517
--- /dev/null
+++ b/installer/vendor/github.com/maruel/panicparse/stack/bucket.go
@@ -0,0 +1,109 @@
+// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
+// Use of this source code is governed under the Apache License, Version 2.0
+// that can be found in the LICENSE file.
+
+package stack
+
+import (
+	"sort"
+)
+
+// Similarity is the level at which two call lines arguments must match to be
+// considered similar enough to coalesce them.
+type Similarity int
+
+const (
+	// ExactFlags requires same bits (e.g. Locked).
+	ExactFlags Similarity = iota
+	// ExactLines requests the exact same arguments on the call line.
+	ExactLines
+	// AnyPointer considers different pointers a similar call line.
+	AnyPointer
+	// AnyValue accepts any value as similar call line.
+	AnyValue
+)
+
+// Bucketize returns the number of similar goroutines.
+func Bucketize(goroutines []Goroutine, similar Similarity) map[*Signature][]Goroutine {
+	out := map[*Signature][]Goroutine{}
+	// O(n²). Fix eventually.
+	for _, routine := range goroutines {
+		found := false
+		for key := range out {
+			// When a match is found, this effectively drops the other goroutine ID.
+			if key.Similar(&routine.Signature, similar) {
+				found = true
+				if !key.Equal(&routine.Signature) {
+					// Almost but not quite equal. There's different pointers passed
+					// around but the same values. Zap out the different values.
+					newKey := key.Merge(&routine.Signature)
+					out[newKey] = append(out[key], routine)
+					delete(out, key)
+				} else {
+					out[key] = append(out[key], routine)
+				}
+				break
+			}
+		}
+		if !found {
+			key := &Signature{}
+			*key = routine.Signature
+			out[key] = []Goroutine{routine}
+		}
+	}
+	return out
+}
+
+// Bucket is a stack trace signature and the list of goroutines that fits this
+// signature.
+type Bucket struct {
+	Signature
+	Routines []Goroutine
+}
+
+// First returns true if it contains the first goroutine, e.g. the ones that
+// likely generated the panic() call, if any.
+func (b *Bucket) First() bool {
+	for _, r := range b.Routines {
+		if r.First {
+			return true
+		}
+	}
+	return false
+}
+
+// Less does reverse sort.
+func (b *Bucket) Less(r *Bucket) bool {
+	if b.First() {
+		return true
+	}
+	if r.First() {
+		return false
+	}
+	return b.Signature.Less(&r.Signature)
+}
+
+// Buckets is a list of Bucket sorted by repeation count.
+type Buckets []Bucket
+
+func (b Buckets) Len() int {
+	return len(b)
+}
+
+func (b Buckets) Less(i, j int) bool {
+	return b[i].Less(&b[j])
+}
+
+func (b Buckets) Swap(i, j int) {
+	b[j], b[i] = b[i], b[j]
+}
+
+// SortBuckets creates a list of Bucket from each goroutine stack trace count.
+func SortBuckets(buckets map[*Signature][]Goroutine) Buckets {
+	out := make(Buckets, 0, len(buckets))
+	for signature, count := range buckets {
+		out = append(out, Bucket{*signature, count})
+	}
+	sort.Sort(out)
+	return out
+}
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/source.go b/installer/vendor/github.com/maruel/panicparse/stack/source.go
index f09e67336a..f5fb8fb6f9 100644
--- a/installer/vendor/github.com/maruel/panicparse/stack/source.go
+++ b/installer/vendor/github.com/maruel/panicparse/stack/source.go
@@ -49,11 +49,11 @@ func (c *cache) augmentGoroutine(goroutine *Goroutine) {
 	// For each call site, look at the next call and populate it. Then we can
 	// walk back and reformat things.
 	for i := range goroutine.Stack.Calls {
-		c.load(goroutine.Stack.Calls[i].SourcePath)
+		c.load(goroutine.Stack.Calls[i].LocalSourcePath())
 	}
 
 	// Once all loaded, we can look at the next call when available.
-	for i := 1; i < len(goroutine.Stack.Calls); i++ {
+	for i := 0; i < len(goroutine.Stack.Calls)-1; i++ {
 		// Get the AST from the previous call and process the call line with it.
 		if f := c.getFuncAST(&goroutine.Stack.Calls[i]); f != nil {
 			processCall(&goroutine.Stack.Calls[i], f)
@@ -101,7 +101,7 @@ func (c *cache) load(fileName string) {
 }
 
 func (c *cache) getFuncAST(call *Call) *ast.FuncDecl {
-	if p := c.parsed[call.SourcePath]; p != nil {
+	if p := c.parsed[call.LocalSourcePath()]; p != nil {
 		return p.getFuncAST(call.Func.Name(), call.Line)
 	}
 	return nil
@@ -115,6 +115,15 @@ type parsedFile struct {
 // getFuncAST gets the callee site function AST representation for the code
 // inside the function f at line l.
 func (p *parsedFile) getFuncAST(f string, l int) (d *ast.FuncDecl) {
+	if len(p.lineToByteOffset) <= l {
+		// The line number in the stack trace line does not exist in the file. That
+		// can only mean that the sources on disk do not match the sources used to
+		// build the binary.
+		// TODO(maruel): This should be surfaced, so that source parsing is
+		// completely ignored.
+		return
+	}
+
 	// Walk the AST to find the lineToByteOffset that fits the line number.
 	var lastFunc *ast.FuncDecl
 	var found ast.Node
@@ -155,20 +164,18 @@ func (p *parsedFile) getFuncAST(f string, l int) (d *ast.FuncDecl) {
 }
 
 func name(n ast.Node) string {
-	if _, ok := n.(*ast.InterfaceType); ok {
+	switch t := n.(type) {
+	case *ast.InterfaceType:
 		return "interface{}"
+	case *ast.Ident:
+		return t.Name
+	case *ast.SelectorExpr:
+		return t.Sel.Name
+	case *ast.StarExpr:
+		return "*" + name(t.X)
+	default:
+		return "<unknown>"
 	}
-	if i, ok := n.(*ast.Ident); ok {
-		return i.Name
-	}
-	if _, ok := n.(*ast.FuncType); ok {
-		return "func"
-	}
-	if s, ok := n.(*ast.SelectorExpr); ok {
-		return s.Sel.Name
-	}
-	// TODO(maruel): Implement anything missing.
-	return "<unknown>"
 }
 
 // fieldToType returns the type name and whether if it's an ellipsis.
@@ -189,6 +196,10 @@ func fieldToType(f *ast.Field) (string, bool) {
 		return arg.Sel.Name, false
 	case *ast.StarExpr:
 		return "*" + name(arg.X), false
+	case *ast.MapType:
+		return fmt.Sprintf("map[%s]%s", name(arg.Key), name(arg.Value)), false
+	case *ast.ChanType:
+		return fmt.Sprintf("chan %s", name(arg.Value)), false
 	default:
 		// TODO(maruel): Implement anything missing.
 		return "<unknown>", false
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/source_test.go b/installer/vendor/github.com/maruel/panicparse/stack/source_test.go
deleted file mode 100644
index c06fd5f26b..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/stack/source_test.go
+++ /dev/null
@@ -1,318 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-package stack
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/maruel/ut"
-)
-
-func overrideEnv(env []string, key, value string) []string {
-	prefix := key + "="
-	for i, e := range env {
-		if strings.HasPrefix(e, prefix) {
-			env[i] = value
-			return env
-		}
-	}
-	return append(env, prefix+value)
-}
-
-func getCrash(t *testing.T, content string) (string, []byte) {
-	name, err := ioutil.TempDir("", "panicparse")
-	ut.AssertEqual(t, nil, err)
-	defer os.RemoveAll(name)
-	main := filepath.Join(name, "main.go")
-	ut.AssertEqual(t, nil, ioutil.WriteFile(main, []byte(content), 0500))
-	cmd := exec.Command("go", "run", main)
-	// Use the Go 1.4 compatible format.
-	cmd.Env = overrideEnv(os.Environ(), "GOTRACEBACK", "2")
-	out, _ := cmd.CombinedOutput()
-	return main, out
-}
-
-func TestAugment(t *testing.T) {
-	extra := &bytes.Buffer{}
-	main, content := getCrash(t, mainSource)
-	goroutines, err := ParseDump(bytes.NewBuffer(content), extra)
-	ut.AssertEqual(t, nil, err)
-	// On go1.4, there's one less space.
-	actual := extra.String()
-	if actual != "panic: ooh\n\nexit status 2\n" && actual != "panic: ooh\nexit status 2\n" {
-		t.Fatalf("Unexpected panic output:\n%#v", actual)
-	}
-	// The number of goroutine alive depends on the runtime environment. It
-	// doesn't matter as only the crashing thread is of importance.
-	ut.AssertEqual(t, true, len(goroutines) >= 1)
-
-	// Preload content so no disk I/O is done.
-	c := &cache{files: map[string][]byte{main: []byte(mainSource)}}
-	c.augmentGoroutine(&goroutines[0])
-	pointer := uint64(0xfffffffff)
-	pointerStr := fmt.Sprintf("0x%x", pointer)
-	expected := Stack{
-		Calls: []Call{
-			{
-				SourcePath: filepath.Join(goroot, "src", "runtime", "panic.go"),
-				Func:       Function{"panic"},
-				Args:       Args{Values: []Arg{{Value: pointer}, {Value: pointer}}},
-			},
-			{
-				Func: Function{"main.S.f1"},
-			},
-			{
-				Func: Function{"main.(*S).f2"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}},
-					Processed: []string{"*S(" + pointerStr + ")"},
-				},
-			},
-			{
-				Func: Function{"main.f3"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 3}, {Value: 1}},
-					Processed: []string{"string(" + pointerStr + ", len=3)", "1"},
-				},
-			},
-			{
-				Func: Function{"main.f4"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 3}},
-					Processed: []string{"string(" + pointerStr + ", len=3)"},
-				},
-			},
-			{
-				Func: Function{"main.f5"},
-				Args: Args{
-					Values:    []Arg{{}, {}, {}, {}, {}, {}, {}, {}, {}, {}},
-					Processed: []string{"0", "0", "0", "0", "0", "0", "0", "0", "0", "interface{}(0x0)"},
-					Elided:    true,
-				},
-			},
-			{
-				Func: Function{"main.f6"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: pointer}},
-					Processed: []string{"error(" + pointerStr + ")"},
-				},
-			},
-			{
-				Func: Function{"main.f7"},
-				Args: Args{
-					Values:    []Arg{{}, {}},
-					Processed: []string{"error(0x0)"},
-				},
-			},
-			{
-				Func: Function{"main.f8"},
-				Args: Args{
-					Values:    []Arg{{Value: 0x3fe0000000000000}, {Value: 0xc440066666}},
-					Processed: []string{"0.5", "2.1"},
-				},
-			},
-			{
-				Func: Function{"main.f9"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 5}, {Value: 7}},
-					Processed: []string{"[]int(" + pointerStr + " len=5 cap=7)"},
-				},
-			},
-			{
-				Func: Function{"main.f10"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 5}, {Value: 7}},
-					Processed: []string{"[]interface{}(" + pointerStr + " len=5 cap=7)"},
-				},
-			},
-			{
-				Func: Function{"main.f11"},
-				Args: Args{
-					Values:    []Arg{{}},
-					Processed: []string{"func(0x0)"},
-				},
-			},
-			{
-				Func: Function{"main.f12"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 2}, {Value: 2}},
-					Processed: []string{"func(" + pointerStr + ")", "func(0x2)"},
-				},
-			},
-			{
-				Func: Function{"main.f13"},
-				Args: Args{
-					Values:    []Arg{{Value: pointer}, {Value: 2}},
-					Processed: []string{"string(" + pointerStr + ", len=2)"},
-				},
-			},
-			{
-				Func: Function{"main.main"},
-			},
-		},
-	}
-	s := goroutines[0].Signature.Stack
-	// On Travis, runtime.GOROOT() != what is dumped when running a command via
-	// "go run". E.g. GOROOT() were "/usr/local/go" yet the path output via a
-	// subcommand is "/home/travis/.gimme/versions/go1.4.linux.amd64". Kidding
-	// me, right?
-	ut.AssertEqual(t, true, strings.HasSuffix(s.Calls[0].SourcePath, "panic.go"))
-	s.Calls[0].SourcePath = expected.Calls[0].SourcePath
-	// Zap out the panic() call, since its signature changed between go1.4 and
-	// go1.5, it used to be runtime.gopanic().
-	ut.AssertEqual(t, true, strings.HasSuffix(s.Calls[0].Func.Raw, "panic"))
-	s.Calls[0].Func = expected.Calls[0].Func
-
-	// Zap out pointers.
-	for i := range s.Calls {
-		if i >= len(expected.Calls) {
-			// When using GOTRACEBACK=2, it'll include runtime.main() and
-			// runtime.goexit(). Ignore these since they could be changed in a future
-			// version.
-			s.Calls = s.Calls[:len(expected.Calls)]
-			break
-		}
-		if i > 0 {
-			ut.AssertEqual(t, true, s.Calls[i].Line > s.Calls[i-1].Line)
-		}
-		s.Calls[i].Line = 0
-		for j := range s.Calls[i].Args.Values {
-			if j >= len(expected.Calls[i].Args.Values) {
-				break
-			}
-			if expected.Calls[i].Args.Values[j].Value == pointer {
-				// Replace the pointer value.
-				ut.AssertEqual(t, false, s.Calls[i].Args.Values[j].Value == 0)
-				old := fmt.Sprintf("0x%x", s.Calls[i].Args.Values[j].Value)
-				s.Calls[i].Args.Values[j].Value = pointer
-				for k := range s.Calls[i].Args.Processed {
-					s.Calls[i].Args.Processed[k] = strings.Replace(s.Calls[i].Args.Processed[k], old, pointerStr, -1)
-				}
-			}
-		}
-		if expected.Calls[i].SourcePath == "" {
-			expected.Calls[i].SourcePath = main
-		}
-	}
-	// Zap out panic() exact line number.
-	s.Calls[0].Line = 0
-
-	// Zap out floating point, this is not deterministic. Verify the line # is
-	// actually the right one.
-	line := 8 // main.f8
-	ut.AssertEqual(t, uint64(0xc440066666), expected.Calls[line].Args.Values[1].Value)
-	if s.Calls[line].Args.Values[1].Value != expected.Calls[line].Args.Values[1].Value {
-		// Try an alternate encoding of "2.1".
-		expected.Calls[line].Args.Values[1].Value = 0x40066666
-	}
-	ut.AssertEqual(t, expected, s)
-}
-
-func TestAugmentDummy(t *testing.T) {
-	goroutines := []Goroutine{
-		{
-			Signature: Signature{
-				Stack: Stack{
-					Calls: []Call{{SourcePath: "missing.go"}},
-				},
-			},
-		},
-	}
-	Augment(goroutines)
-}
-
-func TestLoad(t *testing.T) {
-	c := &cache{
-		files:  map[string][]byte{"bad.go": []byte("bad content")},
-		parsed: map[string]*parsedFile{},
-	}
-	c.load("foo.asm")
-	c.load("bad.go")
-	c.load("doesnt_exist.go")
-	ut.AssertEqual(t, 3, len(c.parsed))
-	ut.AssertEqual(t, (*parsedFile)(nil), c.parsed["foo.asm"])
-	ut.AssertEqual(t, (*parsedFile)(nil), c.parsed["bad.go"])
-	ut.AssertEqual(t, (*parsedFile)(nil), c.parsed["doesnt_exist.go"])
-	ut.AssertEqual(t, (*ast.FuncDecl)(nil), c.getFuncAST(&Call{SourcePath: "other"}))
-}
-
-const mainSource = `// Exercises most code paths in processCall().
-
-package main
-
-import "errors"
-
-type S struct {
-}
-
-func (s S) f1() {
-	panic("ooh")
-}
-
-func (s *S) f2() {
-	s.f1()
-}
-
-func f3(s string, i int) {
-	(&S{}).f2()
-}
-
-func f4(s string) {
-	f3(s, 1)
-}
-
-func f5(s1, s2, s3, s4, s5, s6, s7, s8, s9 int, s10 interface{}) {
-	f4("ooh")
-}
-
-func f6(err error) {
-	f5(0, 0, 0, 0, 0, 0, 0, 0, 0, nil)
-}
-
-func f7(error) {
-	f6(errors.New("Ooh"))
-}
-
-func f8(a float64, b float32) {
-	f7(nil)
-}
-
-func f9(a []int) {
-	f8(0.5, 2.1)
-}
-
-func f10(a []interface{}) {
-	f9(make([]int, 5, 7))
-}
-
-func f11(a func()) {
-	f10(make([]interface{}, 5, 7))
-}
-
-func f12(a ...func()) {
-	f11(nil)
-}
-
-func f13(s string) {
-	// This asserts that a local function definition is not picked up by accident.
-	a := func(i int) int {
-		return 1 + i
-	}
-	_ = a(3)
-	f12(nil, nil)
-}
-
-func main() {
-	f13("yo")
-}
-`
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/stack.go b/installer/vendor/github.com/maruel/panicparse/stack/stack.go
index cfb502e663..0aad4952be 100644
--- a/installer/vendor/github.com/maruel/panicparse/stack/stack.go
+++ b/installer/vendor/github.com/maruel/panicparse/stack/stack.go
@@ -5,7 +5,7 @@
 // Package stack analyzes stack dump of Go processes and simplifies it.
 //
 // It is mostly useful on servers will large number of identical goroutines,
-// making the crash dump harder to read than strictly necesary.
+// making the crash dump harder to read than strictly necessary.
 package stack
 
 import (
@@ -14,9 +14,11 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"log"
 	"math"
 	"net/url"
 	"os"
+	"os/user"
 	"path/filepath"
 	"regexp"
 	"runtime"
@@ -35,7 +37,7 @@ var (
 	// - found next stack barrier at 0x123; expected
 	// - runtime: unexpected return pc for FUNC_NAME called from 0x123
 
-	reRoutineHeader = regexp.MustCompile("^goroutine (\\d+) \\[([^\\]]+)\\]\\:\n$")
+	reRoutineHeader = regexp.MustCompile("^goroutine (\\d+) \\[([^\\]]+)\\]\\:\r?\n$")
 	reMinutes       = regexp.MustCompile("^(\\d+) minutes$")
 	reUnavail       = regexp.MustCompile("^(?:\t| +)goroutine running on other thread; stack unavailable")
 	// See gentraceback() in src/runtime/traceback.go for more information.
@@ -54,34 +56,30 @@ var (
 	//   when a signal is not correctly handled. It is printed with m.throwing>0.
 	//   These are discarded.
 	// - For cgo, the source file may be "??".
-	reFile = regexp.MustCompile("^(?:\t| +)(\\?\\?|\\<autogenerated\\>|.+\\.(?:c|go|s))\\:(\\d+)(?:| \\+0x[0-9a-f]+)(?:| fp=0x[0-9a-f]+ sp=0x[0-9a-f]+)\n$")
+	reFile = regexp.MustCompile("^(?:\t| +)(\\?\\?|\\<autogenerated\\>|.+\\.(?:c|go|s))\\:(\\d+)(?:| \\+0x[0-9a-f]+)(?:| fp=0x[0-9a-f]+ sp=0x[0-9a-f]+)\r?\n$")
 	// Sadly, it doesn't note the goroutine number so we could cascade them per
 	// parenthood.
-	reCreated = regexp.MustCompile("^created by (.+)\n$")
-	reFunc    = regexp.MustCompile("^(.+)\\((.*)\\)\n$")
-	reElided  = regexp.MustCompile("^\\.\\.\\.additional frames elided\\.\\.\\.\n$")
-	// Include frequent GOROOT value on Windows, distro provided and user
-	// installed path. This simplifies the user's life when processing a trace
-	// generated on another VM.
-	// TODO(maruel): Guess the path automatically via traces containing the
-	// 'runtime' package, which is very frequent. This would be "less bad" than
-	// throwing up random values at the parser.
-	goroots = []string{runtime.GOROOT(), "c:/go", "/usr/lib/go", "/usr/local/go"}
-)
-
-// Similarity is the level at which two call lines arguments must match to be
-// considered similar enough to coalesce them.
-type Similarity int
-
-const (
-	// ExactFlags requires same bits (e.g. Locked).
-	ExactFlags Similarity = iota
-	// ExactLines requests the exact same arguments on the call line.
-	ExactLines
-	// AnyPointer considers different pointers a similar call line.
-	AnyPointer
-	// AnyValue accepts any value as similar call line.
-	AnyValue
+	reCreated = regexp.MustCompile("^created by (.+)\r?\n$")
+	reFunc    = regexp.MustCompile("^(.+)\\((.*)\\)\r?\n$")
+	reElided  = regexp.MustCompile("^\\.\\.\\.additional frames elided\\.\\.\\.\r?\n$")
+
+	// TODO(maruel): This is a global state, affected by ParseDump(). This will
+	// be refactored in v2.
+
+	// goroot is the GOROOT as detected in the traceback, not the on the host.
+	//
+	// It can be empty if no root was determined, for example the traceback
+	// contains only non-stdlib source references.
+	goroot string
+	// gopaths is the GOPATH as detected in the traceback, with the value being
+	// the corresponding path mapped to the host.
+	//
+	// It can be empty if only stdlib code is in the traceback or if no local
+	// sources were matched up. In the general case there is only one.
+	gopaths map[string]string
+	// Corresponding local values on the host.
+	localgoroot  = runtime.GOROOT()
+	localgopaths = getGOPATHs()
 )
 
 // Function is a function call.
@@ -250,7 +248,7 @@ func (a *Args) Merge(r *Args) Args {
 
 // Call is an item in the stack trace.
 type Call struct {
-	SourcePath string   // Full path name of the source file
+	SourcePath string   // Full path name of the source file as seen in the trace
 	Line       int      // Line number
 	Func       Function // Fully qualified function name (encoded).
 	Args       Args     // Call arguments
@@ -287,7 +285,23 @@ func (c *Call) SourceLine() string {
 	return fmt.Sprintf("%s:%d", c.SourceName(), c.Line)
 }
 
+// LocalSourcePath is the full path name of the source file as seen in the host.
+func (c *Call) LocalSourcePath() string {
+	// TODO(maruel): Call needs members goroot and gopaths.
+	if strings.HasPrefix(c.SourcePath, goroot) {
+		return filepath.Join(localgoroot, c.SourcePath[len(goroot):])
+	}
+	for prefix, dest := range gopaths {
+		if strings.HasPrefix(c.SourcePath, prefix) {
+			return filepath.Join(dest, c.SourcePath[len(prefix):])
+		}
+	}
+	return c.SourcePath
+}
+
 // FullSourceLine returns "/path/to/source.go:line".
+//
+// This file path is mutated to look like the local path.
 func (c *Call) FullSourceLine() string {
 	return fmt.Sprintf("%s:%d", c.SourcePath, c.Line)
 }
@@ -302,13 +316,8 @@ const testMainSource = "_test" + string(os.PathSeparator) + "_testmain.go"
 // IsStdlib returns true if it is a Go standard library function. This includes
 // the 'go test' generated main executable.
 func (c *Call) IsStdlib() bool {
-	for _, goroot := range goroots {
-		if strings.HasPrefix(c.SourcePath, goroot) {
-			return true
-		}
-	}
 	// Consider _test/_testmain.go as stdlib since it's injected by "go test".
-	return c.PkgSource() == testMainSource
+	return (goroot != "" && strings.HasPrefix(c.SourcePath, goroot)) || c.PkgSource() == testMainSource
 }
 
 // IsPkgMain returns true if it is in the main package.
@@ -525,91 +534,6 @@ type Goroutine struct {
 	First     bool // First is the goroutine first printed, normally the one that crashed.
 }
 
-// Bucketize returns the number of similar goroutines.
-func Bucketize(goroutines []Goroutine, similar Similarity) map[*Signature][]Goroutine {
-	out := map[*Signature][]Goroutine{}
-	// O(n²). Fix eventually.
-	for _, routine := range goroutines {
-		found := false
-		for key := range out {
-			// When a match is found, this effectively drops the other goroutine ID.
-			if key.Similar(&routine.Signature, similar) {
-				found = true
-				if !key.Equal(&routine.Signature) {
-					// Almost but not quite equal. There's different pointers passed
-					// around but the same values. Zap out the different values.
-					newKey := key.Merge(&routine.Signature)
-					out[newKey] = append(out[key], routine)
-					delete(out, key)
-				} else {
-					out[key] = append(out[key], routine)
-				}
-				break
-			}
-		}
-		if !found {
-			key := &Signature{}
-			*key = routine.Signature
-			out[key] = []Goroutine{routine}
-		}
-	}
-	return out
-}
-
-// Bucket is a stack trace signature and the list of goroutines that fits this
-// signature.
-type Bucket struct {
-	Signature
-	Routines []Goroutine
-}
-
-// First returns true if it contains the first goroutine, e.g. the ones that
-// likely generated the panic() call, if any.
-func (b *Bucket) First() bool {
-	for _, r := range b.Routines {
-		if r.First {
-			return true
-		}
-	}
-	return false
-}
-
-// Less does reverse sort.
-func (b *Bucket) Less(r *Bucket) bool {
-	if b.First() {
-		return true
-	}
-	if r.First() {
-		return false
-	}
-	return b.Signature.Less(&r.Signature)
-}
-
-// Buckets is a list of Bucket sorted by repeation count.
-type Buckets []Bucket
-
-func (b Buckets) Len() int {
-	return len(b)
-}
-
-func (b Buckets) Less(i, j int) bool {
-	return b[i].Less(&b[j])
-}
-
-func (b Buckets) Swap(i, j int) {
-	b[j], b[i] = b[i], b[j]
-}
-
-// SortBuckets creates a list of Bucket from each goroutine stack trace count.
-func SortBuckets(buckets map[*Signature][]Goroutine) Buckets {
-	out := make(Buckets, 0, len(buckets))
-	for signature, count := range buckets {
-		out = append(out, Bucket{*signature, count})
-	}
-	sort.Sort(out)
-	return out
-}
-
 // scanLines is similar to bufio.ScanLines except that it:
 //     - doesn't drop '\n'
 //     - doesn't strip '\r'
@@ -656,7 +580,7 @@ func ParseDump(r io.Reader, out io.Writer) ([]Goroutine, error) {
 	firstLine := false
 	for scanner.Scan() {
 		line := scanner.Text()
-		if line == "\n" {
+		if line == "\n" || line == "\r\n" {
 			if goroutine != nil {
 				goroutine = nil
 				continue
@@ -763,13 +687,30 @@ func ParseDump(r io.Reader, out io.Writer) ([]Goroutine, error) {
 		goroutine = nil
 	}
 	nameArguments(goroutines)
+	// Mutate global state.
+	// TODO(maruel): Make this part of the context instead of a global.
+	if goroot == "" {
+		findRoots(goroutines)
+	}
 	return goroutines, scanner.Err()
 }
 
+// NoRebase disables GOROOT and GOPATH guessing in ParseDump().
+//
+// BUG: This function will be removed in v2, as ParseDump() will accept a flag
+// explicitly.
+func NoRebase() {
+	goroot = runtime.GOROOT()
+	gopaths = map[string]string{}
+	for _, p := range getGOPATHs() {
+		gopaths[p] = p
+	}
+}
+
 // Private stuff.
 
 func nameArguments(goroutines []Goroutine) {
-	// Set a name for any pointer occuring more than once.
+	// Set a name for any pointer occurring more than once.
 	type object struct {
 		args      []*Arg
 		inPrimary bool
@@ -791,7 +732,7 @@ func nameArguments(goroutines []Goroutine) {
 		}
 		// CreatedBy.Args is never set.
 	}
-	order := uint64Slice{}
+	order := make(uint64Slice, 0, len(objects)/2)
 	for k, obj := range objects {
 		if len(obj.args) > 1 && obj.inPrimary {
 			order = append(order, k)
@@ -807,7 +748,7 @@ func nameArguments(goroutines []Goroutine) {
 	}
 
 	// Now do the rest. This is done so the output is deterministic.
-	order = uint64Slice{}
+	order = make(uint64Slice, 0, len(objects))
 	for k := range objects {
 		order = append(order, k)
 	}
@@ -825,6 +766,139 @@ func nameArguments(goroutines []Goroutine) {
 	}
 }
 
+// hasPathPrefix returns true if any of s is the prefix of p.
+func hasPathPrefix(p string, s map[string]string) bool {
+	for prefix := range s {
+		if strings.HasPrefix(p, prefix+"/") {
+			return true
+		}
+	}
+	return false
+}
+
+// getFiles returns all the source files deduped and ordered.
+func getFiles(goroutines []Goroutine) []string {
+	files := map[string]struct{}{}
+	for _, g := range goroutines {
+		for _, c := range g.Stack.Calls {
+			files[c.SourcePath] = struct{}{}
+		}
+	}
+	out := make([]string, 0, len(files))
+	for f := range files {
+		out = append(out, f)
+	}
+	sort.Strings(out)
+	return out
+}
+
+// splitPath splits a path into its components.
+//
+// The first item has its initial path separator kept.
+func splitPath(p string) []string {
+	if p == "" {
+		return nil
+	}
+	var out []string
+	s := ""
+	for _, c := range p {
+		if c != '/' || (len(out) == 0 && strings.Count(s, "/") == len(s)) {
+			s += string(c)
+		} else if s != "" {
+			out = append(out, s)
+			s = ""
+		}
+	}
+	if s != "" {
+		out = append(out, s)
+	}
+	return out
+}
+
+// isFile returns true if the path is a valid file.
+func isFile(p string) bool {
+	// TODO(maruel): Is it faster to open the file or to stat it? Worth a perf
+	// test on Windows.
+	i, err := os.Stat(p)
+	return err == nil && !i.IsDir()
+}
+
+// isRootIn returns a root if the file split in parts is rooted in root.
+func rootedIn(root string, parts []string) string {
+	//log.Printf("rootIn(%s, %v)", root, parts)
+	for i := 1; i < len(parts); i++ {
+		suffix := filepath.Join(parts[i:]...)
+		if isFile(filepath.Join(root, suffix)) {
+			return filepath.Join(parts[:i]...)
+		}
+	}
+	return ""
+}
+
+// findRoots sets global variables goroot and gopath.
+//
+// TODO(maruel): In v2, it will be a property of the new struct that will
+// contain the goroutines.
+func findRoots(goroutines []Goroutine) {
+	gopaths = map[string]string{}
+	for _, f := range getFiles(goroutines) {
+		// TODO(maruel): Could a stack dump have mixed cases? I think it's
+		// possible, need to confirm and handle.
+		//log.Printf("  Analyzing %s", f)
+		if goroot != "" && strings.HasPrefix(f, goroot+"/") {
+			continue
+		}
+		if gopaths != nil && hasPathPrefix(f, gopaths) {
+			continue
+		}
+		parts := splitPath(f)
+		if goroot == "" {
+			if r := rootedIn(localgoroot, parts); r != "" {
+				goroot = r
+				log.Printf("Found GOROOT=%s", goroot)
+				continue
+			}
+		}
+		found := false
+		for _, l := range localgopaths {
+			if r := rootedIn(l, parts); r != "" {
+				log.Printf("Found GOPATH=%s", r)
+				gopaths[r] = l
+				found = true
+				break
+			}
+		}
+		if !found {
+			// If the source is not found, just too bad.
+			//log.Printf("Failed to find locally: %s / %s", f, goroot)
+		}
+	}
+}
+
+func getGOPATHs() []string {
+	var out []string
+	for _, v := range filepath.SplitList(os.Getenv("GOPATH")) {
+		// Disallow non-absolute paths?
+		if v != "" {
+			out = append(out, v)
+		}
+	}
+	if len(out) == 0 {
+		homeDir := ""
+		u, err := user.Current()
+		if err != nil {
+			homeDir = os.Getenv("HOME")
+			if homeDir == "" {
+				panic(fmt.Sprintf("Could not get current user or $HOME: %s\n", err.Error()))
+			}
+		} else {
+			homeDir = u.HomeDir
+		}
+		out = []string{homeDir + "go"}
+	}
+	return out
+}
+
 type uint64Slice []uint64
 
 func (a uint64Slice) Len() int           { return len(a) }
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/stack_test.go b/installer/vendor/github.com/maruel/panicparse/stack/stack_test.go
deleted file mode 100644
index 2a699047bf..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/stack/stack_test.go
+++ /dev/null
@@ -1,964 +0,0 @@
-// Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-package stack
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	"github.com/maruel/ut"
-)
-
-var goroot = goroots[0]
-
-const crash = `panic: oh no!
-
-goroutine 1 [running]:
-panic(0x0, 0x0)
-	/home/user/src/golang/src/runtime/panic.go:464 +0x3e6
-main.crash2(0x7fe50b49d028, 0xc82000a1e0)
-	/home/user/src/foo.go:45 +0x23
-main.main()
-	/home/user/src/foo.go:50 +0xa6
-`
-
-func Example() {
-	in := bytes.NewBufferString(crash)
-	goroutines, err := ParseDump(in, os.Stdout)
-	if err != nil {
-		return
-	}
-
-	// Optional: Check for GOTRACEBACK being set, in particular if there is only
-	// one goroutine returned.
-
-	// Use a color palette based on ANSI code.
-	p := &Palette{}
-	buckets := SortBuckets(Bucketize(goroutines, AnyValue))
-	srcLen, pkgLen := CalcLengths(buckets, false)
-	for _, bucket := range buckets {
-		io.WriteString(os.Stdout, p.BucketHeader(&bucket, false, len(buckets) > 1))
-		io.WriteString(os.Stdout, p.StackLines(&bucket.Signature, srcLen, pkgLen, false))
-	}
-	// Output:
-	// panic: oh no!
-	//
-	// 1: running
-	//          panic.go:464 panic(0, 0)
-	//     main foo.go:45    crash2(0x7fe50b49d028, 0xc82000a1e0)
-	//     main foo.go:50    main()
-}
-
-func TestParseDump1(t *testing.T) {
-	// One call from main, one from stdlib, one from third party.
-	// Create a long first line that will be ignored. It is to guard against
-	// https://github.com/maruel/panicparse/issues/17.
-	long := strings.Repeat("a", bufio.MaxScanTokenSize+1)
-	data := []string{
-		long,
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 1 [running]:",
-		"github.com/cockroachdb/cockroach/storage/engine._Cfunc_DBIterSeek()",
-		" ??:0 +0x6d",
-		"gopkg.in/yaml%2ev2.handleErr(0xc208033b20)",
-		"	/gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-		"reflect.Value.assignTo(0x570860, 0xc20803f3e0, 0x15)",
-		"	" + goroot + "/src/reflect/value.go:2125 +0x368",
-		"main.main()",
-		"	/gopath/src/github.com/foo/bar/baz.go:428 +0x27",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	ut.AssertEqual(t, long+"\npanic: reflect.Set: value of type\n\n", extra.String())
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "running",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "??",
-							Func:       Function{"github.com/cockroachdb/cockroach/storage/engine._Cfunc_DBIterSeek"},
-						},
-						{
-							SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-							Line:       153,
-							Func:       Function{"gopkg.in/yaml%2ev2.handleErr"},
-							Args:       Args{Values: []Arg{{Value: 0xc208033b20}}},
-						},
-						{
-							SourcePath: goroot + "/src/reflect/value.go",
-							Line:       2125,
-							Func:       Function{"reflect.Value.assignTo"},
-							Args:       Args{Values: []Arg{{Value: 0x570860}, {Value: 0xc20803f3e0}, {Value: 0x15}}},
-						},
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       428,
-							Func:       Function{"main.main"},
-						},
-					},
-				},
-			},
-			ID:    1,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-}
-
-func TestParseDumpLongWait(t *testing.T) {
-	// One call from main, one from stdlib, one from third party.
-	data := []string{
-		"panic: bleh",
-		"",
-		"goroutine 1 [chan send, 100 minutes]:",
-		"gopkg.in/yaml%2ev2.handleErr(0xc208033b20)",
-		"	/gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-		"",
-		"goroutine 2 [chan send, locked to thread]:",
-		"gopkg.in/yaml%2ev2.handleErr(0xc208033b21)",
-		"	/gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-		"",
-		"goroutine 3 [chan send, 101 minutes, locked to thread]:",
-		"gopkg.in/yaml%2ev2.handleErr(0xc208033b22)",
-		"	/gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	ut.AssertEqual(t, "panic: bleh\n\n", extra.String())
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State:    "chan send",
-				SleepMin: 100,
-				SleepMax: 100,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-							Line:       153,
-							Func:       Function{"gopkg.in/yaml%2ev2.handleErr"},
-							Args:       Args{Values: []Arg{{Value: 0xc208033b20}}},
-						},
-					},
-				},
-			},
-			ID:    1,
-			First: true,
-		},
-		{
-			Signature: Signature{
-				State:  "chan send",
-				Locked: true,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-							Line:       153,
-							Func:       Function{"gopkg.in/yaml%2ev2.handleErr"},
-							Args:       Args{Values: []Arg{{Value: 0xc208033b21, Name: "#1"}}},
-						},
-					},
-				},
-			},
-			ID: 2,
-		},
-		{
-			Signature: Signature{
-				State:    "chan send",
-				SleepMin: 101,
-				SleepMax: 101,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-							Line:       153,
-							Func:       Function{"gopkg.in/yaml%2ev2.handleErr"},
-							Args:       Args{Values: []Arg{{Value: 0xc208033b22, Name: "#2"}}},
-						},
-					},
-				},
-				Locked: true,
-			},
-			ID: 3,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-}
-
-func TestParseDumpAsm(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 16 [garbage collection]:",
-		"runtime.switchtoM()",
-		"\t" + goroot + "/src/runtime/asm_amd64.s:198 fp=0xc20cfb80d8 sp=0xc20cfb80d0",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "garbage collection",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: goroot + "/src/runtime/asm_amd64.s",
-							Line:       198,
-							Func:       Function{Raw: "runtime.switchtoM"},
-						},
-					},
-				},
-			},
-			ID:    16,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-	ut.AssertEqual(t, "panic: reflect.Set: value of type\n\n", extra.String())
-}
-
-func TestParseDumpLineErr(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 1 [running]:",
-		"github.com/foo/bar.recurseType()",
-		"\t/gopath/src/github.com/foo/bar/baz.go:12345678901234567890",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, errors.New("failed to parse int on line: \"\t/gopath/src/github.com/foo/bar/baz.go:12345678901234567890\n\""), err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "running",
-				Stack: Stack{Calls: []Call{{Func: Function{Raw: "github.com/foo/bar.recurseType"}}}},
-			},
-			ID:    1,
-			First: true,
-		},
-	}
-
-	ut.AssertEqual(t, expected, goroutines)
-}
-
-func TestParseDumpValueErr(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 1 [running]:",
-		"github.com/foo/bar.recurseType(123456789012345678901)",
-		"\t/gopath/src/github.com/foo/bar/baz.go:9",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, errors.New("failed to parse int on line: \"github.com/foo/bar.recurseType(123456789012345678901)\n\""), err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{State: "running"},
-			ID:        1,
-			First:     true,
-		},
-	}
-
-	ut.AssertEqual(t, expected, goroutines)
-}
-
-func TestParseDumpOrderErr(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 16 [garbage collection]:",
-		"	/gopath/src/gopkg.in/yaml.v2/yaml.go:153 +0xc6",
-		"runtime.switchtoM()",
-		"\t" + goroot + "/src/runtime/asm_amd64.s:198 fp=0xc20cfb80d8 sp=0xc20cfb80d0",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, errors.New("unexpected order"), err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{State: "garbage collection"},
-			ID:        16,
-			First:     true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-	ut.AssertEqual(t, "panic: reflect.Set: value of type\n\n", extra.String())
-}
-
-func TestParseDumpElided(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 16 [garbage collection]:",
-		"github.com/foo/bar.recurseType(0x7f4fa9a3ec70, 0xc208062580, 0x7f4fa9a3e818, 0x50a820, 0xc20803a8a0)",
-		"\t/gopath/src/github.com/foo/bar/baz.go:53 +0x845 fp=0xc20cfc66d8 sp=0xc20cfc6470",
-		"...additional frames elided...",
-		"created by testing.RunTests",
-		"\t" + goroot + "/src/testing/testing.go:555 +0xa8b",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "garbage collection",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       53,
-							Func:       Function{Raw: "github.com/foo/bar.recurseType"},
-							Args: Args{
-								Values: []Arg{
-									{Value: 0x7f4fa9a3ec70},
-									{Value: 0xc208062580},
-									{Value: 0x7f4fa9a3e818},
-									{Value: 0x50a820},
-									{Value: 0xc20803a8a0},
-								},
-							},
-						},
-					},
-					Elided: true,
-				},
-				CreatedBy: Call{
-					SourcePath: goroot + "/src/testing/testing.go",
-					Line:       555,
-					Func:       Function{Raw: "testing.RunTests"},
-				},
-			},
-			ID:    16,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-	ut.AssertEqual(t, "panic: reflect.Set: value of type\n\n", extra.String())
-}
-
-func TestParseDumpSysCall(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 5 [syscall]:",
-		"runtime.notetsleepg(0x918100, 0xffffffffffffffff, 0x1)",
-		"\t" + goroot + "/src/runtime/lock_futex.go:201 +0x52 fp=0xc208018f68 sp=0xc208018f40",
-		"runtime.signal_recv(0x0)",
-		"\t" + goroot + "/src/runtime/sigqueue.go:109 +0x135 fp=0xc208018fa0 sp=0xc208018f68",
-		"os/signal.loop()",
-		"\t" + goroot + "/src/os/signal/signal_unix.go:21 +0x1f fp=0xc208018fe0 sp=0xc208018fa0",
-		"runtime.goexit()",
-		"\t" + goroot + "/src/runtime/asm_amd64.s:2232 +0x1 fp=0xc208018fe8 sp=0xc208018fe0",
-		"created by os/signal.init·1",
-		"\t" + goroot + "/src/os/signal/signal_unix.go:27 +0x35",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "syscall",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: goroot + "/src/runtime/lock_futex.go",
-							Line:       201,
-							Func:       Function{Raw: "runtime.notetsleepg"},
-							Args: Args{
-								Values: []Arg{
-									{Value: 0x918100},
-									{Value: 0xffffffffffffffff},
-									{Value: 0x1},
-								},
-							},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/sigqueue.go",
-							Line:       109,
-							Func:       Function{Raw: "runtime.signal_recv"},
-							Args: Args{
-								Values: []Arg{{}},
-							},
-						},
-						{
-							SourcePath: goroot + "/src/os/signal/signal_unix.go",
-							Line:       21,
-							Func:       Function{Raw: "os/signal.loop"},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/asm_amd64.s",
-							Line:       2232,
-							Func:       Function{Raw: "runtime.goexit"},
-						},
-					},
-				},
-				CreatedBy: Call{
-					SourcePath: goroot + "/src/os/signal/signal_unix.go",
-					Line:       27,
-					Func:       Function{Raw: "os/signal.init·1"},
-				},
-			},
-			ID:    5,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-	ut.AssertEqual(t, "panic: reflect.Set: value of type\n\n", extra.String())
-}
-
-func TestParseDumpUnavail(t *testing.T) {
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 24 [running]:",
-		"\tgoroutine running on other thread; stack unavailable",
-		"created by github.com/foo.New",
-		"\t/gopath/src/github.com/foo/bar.go:131 +0x381",
-		"",
-	}
-	extra := &bytes.Buffer{}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), extra)
-	ut.AssertEqual(t, nil, err)
-	expected := []Goroutine{
-		{
-			Signature: Signature{
-				State: "running",
-				Stack: Stack{
-					Calls: []Call{{SourcePath: "<unavailable>"}},
-				},
-				CreatedBy: Call{
-					SourcePath: "/gopath/src/github.com/foo/bar.go",
-					Line:       131,
-					Func:       Function{Raw: "github.com/foo.New"},
-				},
-			},
-			ID:    24,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expected, goroutines)
-	ut.AssertEqual(t, "panic: reflect.Set: value of type\n\n", extra.String())
-}
-
-func TestParseDumpSameBucket(t *testing.T) {
-	// 2 goroutines with the same signature
-	data := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"goroutine 6 [chan receive]:",
-		"main.func·001()",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"created by main.mainImpl",
-		"	/gopath/src/github.com/foo/bar/baz.go:74 +0xeb",
-		"",
-		"goroutine 7 [chan receive]:",
-		"main.func·001()",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"created by main.mainImpl",
-		"	/gopath/src/github.com/foo/bar/baz.go:74 +0xeb",
-		"",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{
-				State: "chan receive",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-						},
-					},
-				},
-				CreatedBy: Call{
-					SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-					Line:       74,
-					Func:       Function{"main.mainImpl"},
-				},
-			},
-			ID:    6,
-			First: true,
-		},
-		{
-			Signature: Signature{
-				State: "chan receive",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-						},
-					},
-				},
-				CreatedBy: Call{
-					SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-					Line:       74,
-					Func:       Function{"main.mainImpl"},
-				},
-			},
-			ID: 7,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-	expectedBuckets := Buckets{{expectedGR[0].Signature, []Goroutine{expectedGR[0], expectedGR[1]}}}
-	ut.AssertEqual(t, expectedBuckets, SortBuckets(Bucketize(goroutines, ExactLines)))
-}
-
-func TestBucketizeNotAggressive(t *testing.T) {
-	// 2 goroutines with the same signature
-	data := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"goroutine 6 [chan receive]:",
-		"main.func·001(0x11000000, 2)",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"",
-		"goroutine 7 [chan receive]:",
-		"main.func·001(0x21000000, 2)",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{
-				State: "chan receive",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-							Args:       Args{Values: []Arg{{0x11000000, ""}, {Value: 2}}},
-						},
-					},
-				},
-			},
-			ID:    6,
-			First: true,
-		},
-		{
-			Signature: Signature{
-				State: "chan receive",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-							Args:       Args{Values: []Arg{{0x21000000, "#1"}, {Value: 2}}},
-						},
-					},
-				},
-			},
-			ID: 7,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-	expectedBuckets := Buckets{
-		{expectedGR[0].Signature, []Goroutine{expectedGR[0]}},
-		{expectedGR[1].Signature, []Goroutine{expectedGR[1]}},
-	}
-	ut.AssertEqual(t, expectedBuckets, SortBuckets(Bucketize(goroutines, ExactLines)))
-}
-
-func TestBucketizeAggressive(t *testing.T) {
-	// 2 goroutines with the same signature
-	data := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"goroutine 6 [chan receive, 10 minutes]:",
-		"main.func·001(0x11000000, 2)",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"",
-		"goroutine 7 [chan receive, 50 minutes]:",
-		"main.func·001(0x21000000, 2)",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"",
-		"goroutine 8 [chan receive, 100 minutes]:",
-		"main.func·001(0x21000000, 2)",
-		"	/gopath/src/github.com/foo/bar/baz.go:72 +0x49",
-		"",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{
-				State:    "chan receive",
-				SleepMin: 10,
-				SleepMax: 10,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-							Args:       Args{Values: []Arg{{0x11000000, ""}, {Value: 2}}},
-						},
-					},
-				},
-			},
-			ID:    6,
-			First: true,
-		},
-		{
-			Signature: Signature{
-				State:    "chan receive",
-				SleepMin: 50,
-				SleepMax: 50,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-							Args:       Args{Values: []Arg{{0x21000000, "#1"}, {Value: 2}}},
-						},
-					},
-				},
-			},
-			ID: 7,
-		},
-		{
-			Signature: Signature{
-				State:    "chan receive",
-				SleepMin: 100,
-				SleepMax: 100,
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-							Line:       72,
-							Func:       Function{"main.func·001"},
-							Args:       Args{Values: []Arg{{0x21000000, "#1"}, {Value: 2}}},
-						},
-					},
-				},
-			},
-			ID: 8,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-	signature := Signature{
-		State:    "chan receive",
-		SleepMin: 10,
-		SleepMax: 100,
-		Stack: Stack{
-			Calls: []Call{
-				{
-					SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-					Line:       72,
-					Func:       Function{"main.func·001"},
-					Args:       Args{Values: []Arg{{0x11000000, "*"}, {Value: 2}}},
-				},
-			},
-		},
-	}
-	expectedBuckets := Buckets{{signature, []Goroutine{expectedGR[0], expectedGR[1], expectedGR[2]}}}
-	ut.AssertEqual(t, expectedBuckets, SortBuckets(Bucketize(goroutines, AnyPointer)))
-}
-
-func TestParseDumpNoOffset(t *testing.T) {
-	data := []string{
-		"panic: runtime error: index out of range",
-		"",
-		"goroutine 37 [runnable]:",
-		"github.com/foo.func·002()",
-		"	/gopath/src/github.com/foo/bar.go:110",
-		"created by github.com/foo.New",
-		"	/gopath/src/github.com/foo/bar.go:113 +0x43b",
-		"",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{
-				State: "runnable",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: "/gopath/src/github.com/foo/bar.go",
-							Line:       110,
-							Func:       Function{"github.com/foo.func·002"},
-						},
-					},
-				},
-				CreatedBy: Call{
-					SourcePath: "/gopath/src/github.com/foo/bar.go",
-					Line:       113,
-					Func:       Function{"github.com/foo.New"},
-				},
-			},
-			ID:    37,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-}
-
-func TestParseDumpJunk(t *testing.T) {
-	// For coverage of scanLines.
-	data := []string{
-		"panic: reflect.Set: value of type",
-		"",
-		"goroutine 1 [running]:",
-		"junk",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{State: "running"},
-			ID:        1,
-			First:     true,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-}
-
-func TestParseCCode(t *testing.T) {
-	data := []string{
-		"SIGQUIT: quit",
-		"PC=0x43f349",
-		"",
-		"goroutine 0 [idle]:",
-		"runtime.epollwait(0x4, 0x7fff671c7118, 0xffffffff00000080, 0x0, 0xffffffff0028c1be, 0x0, 0x0, 0x0, 0x0, 0x0, ...)",
-		"        " + goroot + "/src/runtime/sys_linux_amd64.s:400 +0x19",
-		"runtime.netpoll(0x901b01, 0x0)",
-		"        " + goroot + "/src/runtime/netpoll_epoll.go:68 +0xa3",
-		"findrunnable(0xc208012000)",
-		"        " + goroot + "/src/runtime/proc.c:1472 +0x485",
-		"schedule()",
-		"        " + goroot + "/src/runtime/proc.c:1575 +0x151",
-		"runtime.park_m(0xc2080017a0)",
-		"        " + goroot + "/src/runtime/proc.c:1654 +0x113",
-		"runtime.mcall(0x432684)",
-		"        " + goroot + "/src/runtime/asm_amd64.s:186 +0x5a",
-		"",
-	}
-	goroutines, err := ParseDump(bytes.NewBufferString(strings.Join(data, "\n")), &bytes.Buffer{})
-	ut.AssertEqual(t, nil, err)
-	expectedGR := []Goroutine{
-		{
-			Signature: Signature{
-				State: "idle",
-				Stack: Stack{
-					Calls: []Call{
-						{
-							SourcePath: goroot + "/src/runtime/sys_linux_amd64.s",
-							Line:       400,
-							Func:       Function{"runtime.epollwait"},
-							Args: Args{
-								Values: []Arg{
-									{Value: 0x4},
-									{Value: 0x7fff671c7118},
-									{Value: 0xffffffff00000080},
-									{},
-									{Value: 0xffffffff0028c1be},
-									{},
-									{},
-									{},
-									{},
-									{},
-								},
-								Elided: true,
-							},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/netpoll_epoll.go",
-							Line:       68,
-							Func:       Function{"runtime.netpoll"},
-							Args:       Args{Values: []Arg{{Value: 0x901b01}, {}}},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/proc.c",
-							Line:       1472,
-							Func:       Function{"findrunnable"},
-							Args:       Args{Values: []Arg{{Value: 0xc208012000}}},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/proc.c",
-							Line:       1575,
-							Func:       Function{"schedule"},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/proc.c",
-							Line:       1654,
-							Func:       Function{"runtime.park_m"},
-							Args:       Args{Values: []Arg{{Value: 0xc2080017a0}}},
-						},
-						{
-							SourcePath: goroot + "/src/runtime/asm_amd64.s",
-							Line:       186,
-							Func:       Function{"runtime.mcall"},
-							Args:       Args{Values: []Arg{{Value: 0x432684}}},
-						},
-					},
-				},
-			},
-			ID:    0,
-			First: true,
-		},
-	}
-	ut.AssertEqual(t, expectedGR, goroutines)
-}
-
-func TestCallPkg1(t *testing.T) {
-	c := Call{
-		SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-		Line:       153,
-		Func:       Function{"gopkg.in/yaml%2ev2.handleErr"},
-		Args:       Args{Values: []Arg{{Value: 0xc208033b20}}},
-	}
-	ut.AssertEqual(t, "yaml.go", c.SourceName())
-	ut.AssertEqual(t, filepath.Join("yaml.v2", "yaml.go"), c.PkgSource())
-	ut.AssertEqual(t, "gopkg.in/yaml.v2.handleErr", c.Func.String())
-	ut.AssertEqual(t, "handleErr", c.Func.Name())
-	// This is due to directory name not matching the package name.
-	ut.AssertEqual(t, "yaml.v2", c.Func.PkgName())
-	ut.AssertEqual(t, false, c.Func.IsExported())
-	ut.AssertEqual(t, false, c.IsStdlib())
-	ut.AssertEqual(t, false, c.IsPkgMain())
-}
-
-func TestCallPkg2(t *testing.T) {
-	c := Call{
-		SourcePath: "/gopath/src/gopkg.in/yaml.v2/yaml.go",
-		Line:       153,
-		Func:       Function{"gopkg.in/yaml%2ev2.(*decoder).unmarshal"},
-		Args:       Args{Values: []Arg{{Value: 0xc208033b20}}},
-	}
-	ut.AssertEqual(t, "yaml.go", c.SourceName())
-	ut.AssertEqual(t, filepath.Join("yaml.v2", "yaml.go"), c.PkgSource())
-	// TODO(maruel): Using '/' for this function is inconsistent on Windows
-	// w.r.t. other functions.
-	ut.AssertEqual(t, "gopkg.in/yaml.v2.(*decoder).unmarshal", c.Func.String())
-	ut.AssertEqual(t, "(*decoder).unmarshal", c.Func.Name())
-	// This is due to directory name not matching the package name.
-	ut.AssertEqual(t, "yaml.v2", c.Func.PkgName())
-	ut.AssertEqual(t, false, c.Func.IsExported())
-	ut.AssertEqual(t, false, c.IsStdlib())
-	ut.AssertEqual(t, false, c.IsPkgMain())
-}
-
-func TestCallStdlib(t *testing.T) {
-	c := Call{
-		SourcePath: goroot + "/src/reflect/value.go",
-		Line:       2125,
-		Func:       Function{"reflect.Value.assignTo"},
-		Args:       Args{Values: []Arg{{Value: 0x570860}, {Value: 0xc20803f3e0}, {Value: 0x15}}},
-	}
-	ut.AssertEqual(t, "value.go", c.SourceName())
-	ut.AssertEqual(t, "value.go:2125", c.SourceLine())
-	ut.AssertEqual(t, filepath.Join("reflect", "value.go"), c.PkgSource())
-	ut.AssertEqual(t, "reflect.Value.assignTo", c.Func.String())
-	ut.AssertEqual(t, "Value.assignTo", c.Func.Name())
-	ut.AssertEqual(t, "reflect", c.Func.PkgName())
-	ut.AssertEqual(t, false, c.Func.IsExported())
-	ut.AssertEqual(t, true, c.IsStdlib())
-	ut.AssertEqual(t, false, c.IsPkgMain())
-}
-
-func TestCallMain(t *testing.T) {
-	c := Call{
-		SourcePath: "/gopath/src/github.com/foo/bar/main.go",
-		Line:       428,
-		Func:       Function{"main.main"},
-	}
-	ut.AssertEqual(t, "main.go", c.SourceName())
-	ut.AssertEqual(t, "main.go:428", c.SourceLine())
-	ut.AssertEqual(t, filepath.Join("bar", "main.go"), c.PkgSource())
-	ut.AssertEqual(t, "main.main", c.Func.String())
-	ut.AssertEqual(t, "main", c.Func.Name())
-	ut.AssertEqual(t, "main", c.Func.PkgName())
-	ut.AssertEqual(t, true, c.Func.IsExported())
-	ut.AssertEqual(t, false, c.IsStdlib())
-	ut.AssertEqual(t, true, c.IsPkgMain())
-}
-
-func TestCallC(t *testing.T) {
-	c := Call{
-		SourcePath: goroot + "/src/runtime/proc.c",
-		Line:       1472,
-		Func:       Function{"findrunnable"},
-		Args:       Args{Values: []Arg{{Value: 0xc208012000}}},
-	}
-	ut.AssertEqual(t, "proc.c", c.SourceName())
-	ut.AssertEqual(t, "proc.c:1472", c.SourceLine())
-	ut.AssertEqual(t, filepath.Join("runtime", "proc.c"), c.PkgSource())
-	ut.AssertEqual(t, "findrunnable", c.Func.String())
-	ut.AssertEqual(t, "findrunnable", c.Func.Name())
-	ut.AssertEqual(t, "", c.Func.PkgName())
-	ut.AssertEqual(t, false, c.Func.IsExported())
-	ut.AssertEqual(t, true, c.IsStdlib())
-	ut.AssertEqual(t, false, c.IsPkgMain())
-}
-
-func TestArgs(t *testing.T) {
-	a := Args{
-		Values: []Arg{
-			{Value: 0x4},
-			{Value: 0x7fff671c7118},
-			{Value: 0xffffffff00000080},
-			{},
-			{Value: 0xffffffff0028c1be},
-			{},
-			{},
-			{},
-			{},
-			{},
-		},
-		Elided: true,
-	}
-	ut.AssertEqual(t, "0x4, 0x7fff671c7118, 0xffffffff00000080, 0, 0xffffffff0028c1be, 0, 0, 0, 0, 0, ...", a.String())
-}
-
-func TestFunctionAnonymous(t *testing.T) {
-	f := Function{"main.func·001"}
-	ut.AssertEqual(t, "main.func·001", f.String())
-	ut.AssertEqual(t, "main.func·001", f.PkgDotName())
-	ut.AssertEqual(t, "func·001", f.Name())
-	ut.AssertEqual(t, "main", f.PkgName())
-	ut.AssertEqual(t, false, f.IsExported())
-}
-
-func TestFunctionGC(t *testing.T) {
-	f := Function{"gc"}
-	ut.AssertEqual(t, "gc", f.String())
-	ut.AssertEqual(t, "gc", f.PkgDotName())
-	ut.AssertEqual(t, "gc", f.Name())
-	ut.AssertEqual(t, "", f.PkgName())
-	ut.AssertEqual(t, false, f.IsExported())
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/stack/ui_test.go b/installer/vendor/github.com/maruel/panicparse/stack/ui_test.go
deleted file mode 100644
index d50c588ec0..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/stack/ui_test.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2016 Marc-Antoine Ruel. All rights reserved.
-// Use of this source code is governed under the Apache License, Version 2.0
-// that can be found in the LICENSE file.
-
-package stack
-
-import (
-	"testing"
-
-	"github.com/maruel/ut"
-)
-
-var p = &Palette{
-	EOLReset:               "A",
-	RoutineFirst:           "B",
-	Routine:                "C",
-	CreatedBy:              "D",
-	Package:                "E",
-	SourceFile:             "F",
-	FunctionStdLib:         "G",
-	FunctionStdLibExported: "H",
-	FunctionMain:           "I",
-	FunctionOther:          "J",
-	FunctionOtherExported:  "K",
-	Arguments:              "L",
-}
-
-func TestCalcLengths(t *testing.T) {
-	t.Parallel()
-	b := Buckets{
-		{
-			Signature{Stack: Stack{Calls: []Call{{SourcePath: "/gopath/baz.go", Func: Function{"main.func·001"}}}}},
-			nil,
-		},
-	}
-	srcLen, pkgLen := CalcLengths(b, true)
-	ut.AssertEqual(t, 16, srcLen)
-	ut.AssertEqual(t, 4, pkgLen)
-	srcLen, pkgLen = CalcLengths(b, false)
-	ut.AssertEqual(t, 8, srcLen)
-	ut.AssertEqual(t, 4, pkgLen)
-}
-
-func TestBucketHeader(t *testing.T) {
-	t.Parallel()
-	b := &Bucket{
-		Signature{
-			State: "chan receive",
-			CreatedBy: Call{
-				SourcePath: "/gopath/src/github.com/foo/bar/baz.go",
-				Line:       74,
-				Func:       Function{"main.mainImpl"},
-			},
-			SleepMax: 6,
-			SleepMin: 2,
-		},
-		[]Goroutine{
-			{
-				First: true,
-			},
-			{},
-		},
-	}
-	ut.AssertEqual(t, "B2: chan receive [2~6 minutes]D [Created by main.mainImpl @ /gopath/src/github.com/foo/bar/baz.go:74]A\n", p.BucketHeader(b, true, true))
-	ut.AssertEqual(t, "C2: chan receive [2~6 minutes]D [Created by main.mainImpl @ /gopath/src/github.com/foo/bar/baz.go:74]A\n", p.BucketHeader(b, true, false))
-	ut.AssertEqual(t, "B2: chan receive [2~6 minutes]D [Created by main.mainImpl @ baz.go:74]A\n", p.BucketHeader(b, false, true))
-	ut.AssertEqual(t, "C2: chan receive [2~6 minutes]D [Created by main.mainImpl @ baz.go:74]A\n", p.BucketHeader(b, false, false))
-
-	b = &Bucket{
-		Signature{
-			State:    "b0rked",
-			SleepMax: 6,
-			SleepMin: 6,
-			Locked:   true,
-		},
-		nil,
-	}
-	ut.AssertEqual(t, "C0: b0rked [6 minutes] [locked]A\n", p.BucketHeader(b, false, false))
-}
-
-func TestStackLines(t *testing.T) {
-	t.Parallel()
-	s := &Signature{
-		State: "idle",
-		Stack: Stack{
-			Calls: []Call{
-				{
-					SourcePath: goroot + "/src/runtime/sys_linux_amd64.s",
-					Line:       400,
-					Func:       Function{"runtime.Epollwait"},
-					Args: Args{
-						Values: []Arg{
-							{Value: 0x4},
-							{Value: 0x7fff671c7118},
-							{Value: 0xffffffff00000080},
-							{},
-							{Value: 0xffffffff0028c1be},
-							{},
-							{},
-							{},
-							{},
-							{},
-						},
-						Elided: true,
-					},
-				},
-				{
-					SourcePath: goroot + "/src/runtime/netpoll_epoll.go",
-					Line:       68,
-					Func:       Function{"runtime.netpoll"},
-					Args:       Args{Values: []Arg{{Value: 0x901b01}, {}}},
-				},
-				{
-					SourcePath: "/src/main.go",
-					Line:       1472,
-					Func:       Function{"main.Main"},
-					Args:       Args{Values: []Arg{{Value: 0xc208012000}}},
-				},
-				{
-					SourcePath: "/src/foo/bar.go",
-					Line:       1575,
-					Func:       Function{"foo.OtherExported"},
-				},
-				{
-					SourcePath: "/src/foo/bar.go",
-					Line:       10,
-					Func:       Function{"foo.otherPrivate"},
-				},
-			},
-			Elided: true,
-		},
-	}
-	expected := "" +
-		"    Eruntime    F" + goroot + "/src/runtime/sys_linux_amd64.s:400 HEpollwaitL(0x4, 0x7fff671c7118, 0xffffffff00000080, 0, 0xffffffff0028c1be, 0, 0, 0, 0, 0, ...)A\n" +
-		"    Eruntime    F" + goroot + "/src/runtime/netpoll_epoll.go:68 GnetpollL(0x901b01, 0)A\n" +
-		"    Emain       F/src/main.go:1472 IMainL(0xc208012000)A\n" +
-		"    Efoo        F/src/foo/bar.go:1575 KOtherExportedL()A\n" +
-		"    Efoo        F/src/foo/bar.go:10 JotherPrivateL()A\n" +
-		"    (...)\n"
-	ut.AssertEqual(t, expected, p.StackLines(s, 10, 10, true))
-	expected = "" +
-		"    Eruntime    Fsys_linux_amd64.s:400 HEpollwaitL(0x4, 0x7fff671c7118, 0xffffffff00000080, 0, 0xffffffff0028c1be, 0, 0, 0, 0, 0, ...)A\n" +
-		"    Eruntime    Fnetpoll_epoll.go:68 GnetpollL(0x901b01, 0)A\n" +
-		"    Emain       Fmain.go:1472 IMainL(0xc208012000)A\n" +
-		"    Efoo        Fbar.go:1575 KOtherExportedL()A\n" +
-		"    Efoo        Fbar.go:10  JotherPrivateL()A\n" +
-		"    (...)\n"
-	ut.AssertEqual(t, expected, p.StackLines(s, 10, 10, false))
-}
diff --git a/installer/vendor/github.com/maruel/panicparse/vendor.yml b/installer/vendor/github.com/maruel/panicparse/vendor.yml
deleted file mode 100644
index d8d02eba74..0000000000
--- a/installer/vendor/github.com/maruel/panicparse/vendor.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-vendors:
-- path: github.com/kr/pretty
-  rev: cfb55aafdaf3ec08f0db22699ab822c50091b1c4
-- path: github.com/kr/text
-  rev: 7cafcd837844e784b526369c9bce262804aebc60
-- path: github.com/maruel/ut
-  rev: a9c9f15ccfa6f8b90182a53df32f4745586fbae3
-- path: github.com/mattn/go-colorable
-  rev: d898aa9fb31c91f35dd28ca75db377eff023c076
-- path: github.com/mattn/go-isatty
-  rev: dda3de49cbfcec471bd7a70e6cc01fcc3ff90109
-- path: github.com/mgutz/ansi
-  rev: 9520e82c474b0a04dd04f8a40959027271bab992
-- path: github.com/pmezard/go-difflib
-  rev: 792786c7400a136282c1664665ae0a8db921c6c2
diff --git a/installer/vendor/github.com/mattn/go-runewidth/.travis.yml b/installer/vendor/github.com/mattn/go-runewidth/.travis.yml
deleted file mode 100644
index 5c9c2a30f0..0000000000
--- a/installer/vendor/github.com/mattn/go-runewidth/.travis.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-language: go
-go:
-  - tip
-before_install:
-  - go get github.com/mattn/goveralls
-  - go get golang.org/x/tools/cmd/cover
-script:
-    - $HOME/gopath/bin/goveralls -repotoken lAKAWPzcGsD3A8yBX3BGGtRUdJ6CaGERL
diff --git a/installer/vendor/github.com/mattn/go-runewidth/README.mkd b/installer/vendor/github.com/mattn/go-runewidth/README.mkd
deleted file mode 100644
index 66663a94b0..0000000000
--- a/installer/vendor/github.com/mattn/go-runewidth/README.mkd
+++ /dev/null
@@ -1,27 +0,0 @@
-go-runewidth
-============
-
-[![Build Status](https://travis-ci.org/mattn/go-runewidth.png?branch=master)](https://travis-ci.org/mattn/go-runewidth)
-[![Coverage Status](https://coveralls.io/repos/mattn/go-runewidth/badge.png?branch=HEAD)](https://coveralls.io/r/mattn/go-runewidth?branch=HEAD)
-[![GoDoc](https://godoc.org/github.com/mattn/go-runewidth?status.svg)](http://godoc.org/github.com/mattn/go-runewidth)
-[![Go Report Card](https://goreportcard.com/badge/github.com/mattn/go-runewidth)](https://goreportcard.com/report/github.com/mattn/go-runewidth)
-
-Provides functions to get fixed width of the character or string.
-
-Usage
------
-
-```go
-runewidth.StringWidth("つのだ☆HIRO") == 12
-```
-
-
-Author
-------
-
-Yasuhiro Matsumoto
-
-License
--------
-
-under the MIT License: http://mattn.mit-license.org/2013
diff --git a/installer/vendor/github.com/mattn/go-runewidth/runewidth_test.go b/installer/vendor/github.com/mattn/go-runewidth/runewidth_test.go
deleted file mode 100644
index 3cabbeaf7d..0000000000
--- a/installer/vendor/github.com/mattn/go-runewidth/runewidth_test.go
+++ /dev/null
@@ -1,277 +0,0 @@
-package runewidth
-
-import (
-	"sort"
-	"testing"
-)
-
-var _ sort.Interface = (*table)(nil)
-
-func (t table) Len() int {
-	return len(t)
-}
-
-func (t table) Less(i, j int) bool {
-	return t[i].first < t[j].first
-}
-
-func (t *table) Swap(i, j int) {
-	(*t)[i], (*t)[j] = (*t)[j], (*t)[i]
-}
-
-var tables = []table{
-	private,
-	nonprint,
-	combining,
-	doublewidth,
-	ambiguous,
-	emoji,
-	notassigned,
-	neutral,
-}
-
-func TestSorted(t *testing.T) {
-	for _, tbl := range tables {
-		if !sort.IsSorted(&tbl) {
-			t.Errorf("not sorted")
-		}
-	}
-}
-
-var runewidthtests = []struct {
-	in    rune
-	out   int
-	eaout int
-}{
-	{'世', 2, 2},
-	{'界', 2, 2},
-	{'ｾ', 1, 1},
-	{'ｶ', 1, 1},
-	{'ｲ', 1, 1},
-	{'☆', 1, 2}, // double width in ambiguous
-	{'\x00', 0, 0},
-	{'\x01', 0, 0},
-	{'\u0300', 0, 0},
-}
-
-func TestRuneWidth(t *testing.T) {
-	c := NewCondition()
-	c.EastAsianWidth = false
-	for _, tt := range runewidthtests {
-		if out := c.RuneWidth(tt.in); out != tt.out {
-			t.Errorf("RuneWidth(%q) = %d, want %d", tt.in, out, tt.out)
-		}
-	}
-	c.EastAsianWidth = true
-	for _, tt := range runewidthtests {
-		if out := c.RuneWidth(tt.in); out != tt.eaout {
-			t.Errorf("RuneWidth(%q) = %d, want %d", tt.in, out, tt.eaout)
-		}
-	}
-}
-
-var isambiguouswidthtests = []struct {
-	in  rune
-	out bool
-}{
-	{'世', false},
-	{'■', true},
-	{'界', false},
-	{'○', true},
-	{'㈱', false},
-	{'①', true},
-	{'②', true},
-	{'③', true},
-	{'④', true},
-	{'⑤', true},
-	{'⑥', true},
-	{'⑦', true},
-	{'⑧', true},
-	{'⑨', true},
-	{'⑩', true},
-	{'⑪', true},
-	{'⑫', true},
-	{'⑬', true},
-	{'⑭', true},
-	{'⑮', true},
-	{'⑯', true},
-	{'⑰', true},
-	{'⑱', true},
-	{'⑲', true},
-	{'⑳', true},
-	{'☆', true},
-}
-
-func TestIsAmbiguousWidth(t *testing.T) {
-	for _, tt := range isambiguouswidthtests {
-		if out := IsAmbiguousWidth(tt.in); out != tt.out {
-			t.Errorf("IsAmbiguousWidth(%q) = %v, want %v", tt.in, out, tt.out)
-		}
-	}
-}
-
-var stringwidthtests = []struct {
-	in    string
-	out   int
-	eaout int
-}{
-	{"■㈱の世界①", 10, 12},
-	{"スター☆", 7, 8},
-	{"つのだ☆HIRO", 11, 12},
-}
-
-func TestStringWidth(t *testing.T) {
-	c := NewCondition()
-	c.EastAsianWidth = false
-	for _, tt := range stringwidthtests {
-		if out := c.StringWidth(tt.in); out != tt.out {
-			t.Errorf("StringWidth(%q) = %d, want %d", tt.in, out, tt.out)
-		}
-	}
-	c.EastAsianWidth = true
-	for _, tt := range stringwidthtests {
-		if out := c.StringWidth(tt.in); out != tt.eaout {
-			t.Errorf("StringWidth(%q) = %d, want %d", tt.in, out, tt.eaout)
-		}
-	}
-}
-
-func TestStringWidthInvalid(t *testing.T) {
-	s := "こんにちわ\x00世界"
-	if out := StringWidth(s); out != 14 {
-		t.Errorf("StringWidth(%q) = %d, want %d", s, out, 14)
-	}
-}
-
-func TestTruncateSmaller(t *testing.T) {
-	s := "あいうえお"
-	expected := "あいうえお"
-
-	if out := Truncate(s, 10, "..."); out != expected {
-		t.Errorf("Truncate(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-func TestTruncate(t *testing.T) {
-	s := "あいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおおおおお"
-	expected := "あいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおお..."
-	out := Truncate(s, 80, "...")
-	if out != expected {
-		t.Errorf("Truncate(%q) = %q, want %q", s, out, expected)
-	}
-	width := StringWidth(out)
-	if width != 79 {
-		t.Errorf("width of Truncate(%q) should be %d, but %d", s, 79, width)
-	}
-}
-
-func TestTruncateFit(t *testing.T) {
-	s := "aあいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおおおおお"
-	expected := "aあいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおお..."
-
-	out := Truncate(s, 80, "...")
-	if out != expected {
-		t.Errorf("Truncate(%q) = %q, want %q", s, out, expected)
-	}
-	width := StringWidth(out)
-	if width != 80 {
-		t.Errorf("width of Truncate(%q) should be %d, but %d", s, 80, width)
-	}
-}
-
-func TestTruncateJustFit(t *testing.T) {
-	s := "あいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおおおお"
-	expected := "あいうえおあいうえおえおおおおおおおおおおおおおおおおおおおおおおおおおおおおお"
-
-	out := Truncate(s, 80, "...")
-	if out != expected {
-		t.Errorf("Truncate(%q) = %q, want %q", s, out, expected)
-	}
-	width := StringWidth(out)
-	if width != 80 {
-		t.Errorf("width of Truncate(%q) should be %d, but %d", s, 80, width)
-	}
-}
-
-func TestWrap(t *testing.T) {
-	s := `東京特許許可局局長はよく柿喰う客だ/東京特許許可局局長はよく柿喰う客だ
-123456789012345678901234567890
-
-END`
-	expected := `東京特許許可局局長はよく柿喰う
-客だ/東京特許許可局局長はよく
-柿喰う客だ
-123456789012345678901234567890
-
-END`
-
-	if out := Wrap(s, 30); out != expected {
-		t.Errorf("Wrap(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-func TestTruncateNoNeeded(t *testing.T) {
-	s := "あいうえおあい"
-	expected := "あいうえおあい"
-
-	if out := Truncate(s, 80, "..."); out != expected {
-		t.Errorf("Truncate(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-var isneutralwidthtests = []struct {
-	in  rune
-	out bool
-}{
-	{'→', false},
-	{'┊', false},
-	{'┈', false},
-	{'～', false},
-	{'└', false},
-	{'⣀', true},
-	{'⣀', true},
-}
-
-func TestIsNeutralWidth(t *testing.T) {
-	for _, tt := range isneutralwidthtests {
-		if out := IsNeutralWidth(tt.in); out != tt.out {
-			t.Errorf("IsNeutralWidth(%q) = %v, want %v", tt.in, out, tt.out)
-		}
-	}
-}
-
-func TestFillLeft(t *testing.T) {
-	s := "あxいうえお"
-	expected := "    あxいうえお"
-
-	if out := FillLeft(s, 15); out != expected {
-		t.Errorf("FillLeft(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-func TestFillLeftFit(t *testing.T) {
-	s := "あいうえお"
-	expected := "あいうえお"
-
-	if out := FillLeft(s, 10); out != expected {
-		t.Errorf("FillLeft(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-func TestFillRight(t *testing.T) {
-	s := "あxいうえお"
-	expected := "あxいうえお    "
-
-	if out := FillRight(s, 15); out != expected {
-		t.Errorf("FillRight(%q) = %q, want %q", s, out, expected)
-	}
-}
-
-func TestFillRightFit(t *testing.T) {
-	s := "あいうえお"
-	expected := "あいうえお"
-
-	if out := FillRight(s, 10); out != expected {
-		t.Errorf("FillRight(%q) = %q, want %q", s, out, expected)
-	}
-}
diff --git a/installer/vendor/github.com/mitchellh/go-wordwrap/README.md b/installer/vendor/github.com/mitchellh/go-wordwrap/README.md
deleted file mode 100644
index 60ae311700..0000000000
--- a/installer/vendor/github.com/mitchellh/go-wordwrap/README.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# go-wordwrap
-
-`go-wordwrap` (Golang package: `wordwrap`) is a package for Go that
-automatically wraps words into multiple lines. The primary use case for this
-is in formatting CLI output, but of course word wrapping is a generally useful
-thing to do.
-
-## Installation and Usage
-
-Install using `go get github.com/mitchellh/go-wordwrap`.
-
-Full documentation is available at
-http://godoc.org/github.com/mitchellh/go-wordwrap
-
-Below is an example of its usage ignoring errors:
-
-```go
-wrapped := wordwrap.WrapString("foo bar baz", 3)
-fmt.Println(wrapped)
-```
-
-Would output:
-
-```
-foo
-bar
-baz
-```
-
-## Word Wrap Algorithm
-
-This library doesn't use any clever algorithm for word wrapping. The wrapping
-is actually very naive: whenever there is whitespace or an explicit linebreak.
-The goal of this library is for word wrapping CLI output, so the input is
-typically pretty well controlled human language. Because of this, the naive
-approach typically works just fine.
-
-In the future, we'd like to make the algorithm more advanced. We would do
-so without breaking the API.
diff --git a/installer/vendor/github.com/mitchellh/go-wordwrap/wordwrap_test.go b/installer/vendor/github.com/mitchellh/go-wordwrap/wordwrap_test.go
deleted file mode 100644
index bf6ae13da6..0000000000
--- a/installer/vendor/github.com/mitchellh/go-wordwrap/wordwrap_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-package wordwrap
-
-import (
-	"testing"
-)
-
-func TestWrapString(t *testing.T) {
-	cases := []struct {
-		Input, Output string
-		Lim           uint
-	}{
-		// A simple word passes through.
-		{
-			"foo",
-			"foo",
-			4,
-		},
-		// A single word that is too long passes through.
-		// We do not break words.
-		{
-			"foobarbaz",
-			"foobarbaz",
-			4,
-		},
-		// Lines are broken at whitespace.
-		{
-			"foo bar baz",
-			"foo\nbar\nbaz",
-			4,
-		},
-		// Lines are broken at whitespace, even if words
-		// are too long. We do not break words.
-		{
-			"foo bars bazzes",
-			"foo\nbars\nbazzes",
-			4,
-		},
-		// A word that would run beyond the width is wrapped.
-		{
-			"fo sop",
-			"fo\nsop",
-			4,
-		},
-		// Whitespace that trails a line and fits the width
-		// passes through, as does whitespace prefixing an
-		// explicit line break. A tab counts as one character.
-		{
-			"foo\nb\t r\n baz",
-			"foo\nb\t r\n baz",
-			4,
-		},
-		// Trailing whitespace is removed if it doesn't fit the width.
-		// Runs of whitespace on which a line is broken are removed.
-		{
-			"foo    \nb   ar   ",
-			"foo\nb\nar",
-			4,
-		},
-		// An explicit line break at the end of the input is preserved.
-		{
-			"foo bar baz\n",
-			"foo\nbar\nbaz\n",
-			4,
-		},
-		// Explicit break are always preserved.
-		{
-			"\nfoo bar\n\n\nbaz\n",
-			"\nfoo\nbar\n\n\nbaz\n",
-			4,
-		},
-		// Complete example:
-		{
-			" This is a list: \n\n\t* foo\n\t* bar\n\n\n\t* baz  \nBAM    ",
-			" This\nis a\nlist: \n\n\t* foo\n\t* bar\n\n\n\t* baz\nBAM",
-			6,
-		},
-	}
-
-	for i, tc := range cases {
-		actual := WrapString(tc.Input, tc.Lim)
-		if actual != tc.Output {
-			t.Fatalf("Case %d Input:\n\n`%s`\n\nActual Output:\n\n`%s`", i, tc.Input, actual)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/.gitignore b/installer/vendor/github.com/nbutton23/zxcvbn-go/.gitignore
deleted file mode 100644
index 4bff1a28e4..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-zxcvbn
-debug.test
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.lock b/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.lock
deleted file mode 100644
index b5a62a3802..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-# This file is autogenerated, do not edit; changes may be undone by the next 'dep ensure'.
-
-
-[[projects]]
-  name = "github.com/davecgh/go-spew"
-  packages = ["spew"]
-  revision = "346938d642f2ec3594ed81d874461961cd0faa76"
-  version = "v1.1.0"
-
-[[projects]]
-  name = "github.com/pmezard/go-difflib"
-  packages = ["difflib"]
-  revision = "792786c7400a136282c1664665ae0a8db921c6c2"
-  version = "v1.0.0"
-
-[[projects]]
-  name = "github.com/stretchr/testify"
-  packages = ["assert"]
-  revision = "69483b4bd14f5845b5a1e55bca19e954e827f1d0"
-  version = "v1.1.4"
-
-[solve-meta]
-  analyzer-name = "dep"
-  analyzer-version = 1
-  inputs-digest = "b750880cdc8ce044e6f9bf3b331d8a392471c328107b8c3d42e3e11022d76858"
-  solver-name = "gps-cdcl"
-  solver-version = 1
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.toml b/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.toml
deleted file mode 100644
index c59386c0a1..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/Gopkg.toml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-# Gopkg.toml example
-#
-# Refer to https://github.com/golang/dep/blob/master/docs/Gopkg.toml.md
-# for detailed Gopkg.toml documentation.
-#
-# required = ["github.com/user/thing/cmd/thing"]
-# ignored = ["github.com/user/project/pkgX", "bitbucket.org/user/project/pkgA/pkgY"]
-#
-# [[constraint]]
-#   name = "github.com/user/project"
-#   version = "1.0.0"
-#
-# [[constraint]]
-#   name = "github.com/user/project2"
-#   branch = "dev"
-#   source = "github.com/myfork/project2"
-#
-# [[override]]
-#  name = "github.com/x/y"
-#  version = "2.4.0"
-
-
-[[constraint]]
-  name = "github.com/stretchr/testify"
-  version = "1.1.4"
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/README.md b/installer/vendor/github.com/nbutton23/zxcvbn-go/README.md
deleted file mode 100644
index a9d2f78368..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-This is a goLang port of python-zxcvbn and [zxcvbn](https://github.com/dropbox/zxcvbn), which are python and JavaScript password strength
-generators. zxcvbn attempts to give sound password advice through pattern
-matching and conservative entropy calculations. It finds 10k common passwords,
-common American names and surnames, common English words, and common patterns
-like dates, repeats (aaa), sequences (abcd), and QWERTY patterns.
-
-Please refer to http://tech.dropbox.com/?p=165 for the full details and
-motivation behind zxcbvn. The source code for the original JavaScript (well,
-actually CoffeeScript) implementation can be found at:
-
-https://github.com/lowe/zxcvbn
-
-Python at:
-
-https://github.com/dropbox/python-zxcvbn
-
-For full motivation, see:
-
-http://tech.dropbox.com/?p=165
-
-------------------------------------------------------------------------
-Use
-------------------------------------------------------------------------
-
-The zxcvbn module has the public method PasswordStrength() function. Import zxcvbn, and
-call PasswordStrength(password string, userInputs []string).  The function will return a
-result dictionary with the following keys:
-
-Entropy            # bits
-
-CrackTime         # estimation of actual crack time, in seconds.
-
-CrackTimeDisplay # same crack time, as a friendlier string:
-                   # "instant", "6 minutes", "centuries", etc.
-
-Score              # [0,1,2,3,4] if crack time is less than
-                   # [10^2, 10^4, 10^6, 10^8, Infinity].
-                   # (useful for implementing a strength bar.)
-
-MatchSequence     # the list of patterns that zxcvbn based the
-                   # entropy calculation on.
-
-CalcTime   # how long it took to calculate an answer,
-                   # in milliseconds. usually only a few ms.
-
-The userInputs argument is an splice of strings that zxcvbn
-will add to its internal dictionary. This can be whatever list of
-strings you like, but is meant for user inputs from other fields of the
-form, like name and email. That way a password that includes the user's
-personal info can be heavily penalized. This list is also good for
-site-specific vocabulary.
-
-Bug reports and pull requests welcome!
-
-------------------------------------------------------------------------
-Project Status
-------------------------------------------------------------------------
-
-Use zxcvbn_test.go to check how close to feature parity the project is.
-
-------------------------------------------------------------------------
-Acknowledgment
-------------------------------------------------------------------------
-
-Thanks to Dan Wheeler (https://github.com/lowe) for the CoffeeScript implementation
-(see above.) To repeat his outside acknowledgements (which remain useful, as always):
-
-Many thanks to Mark Burnett for releasing his 10k top passwords list:
-http://xato.net/passwords/more-top-worst-passwords
-and for his 2006 book,
-"Perfect Passwords: Selection, Protection, Authentication"
-
-Huge thanks to Wiktionary contributors for building a frequency list
-of English as used in television and movies:
-http://en.wiktionary.org/wiki/Wiktionary:Frequency_lists
-
-Last but not least, big thanks to xkcd :)
-https://xkcd.com/936/
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/adjacency/adjacmartix_test.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/adjacency/adjacmartix_test.go
deleted file mode 100644
index c40d6baf94..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/adjacency/adjacmartix_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-package adjacency
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-/*
-nbutton: Really the value is not as important to me than they don't change, which happened during development.
-*/
-func TestCalculateDegreeQwert(t *testing.T) {
-	avgDegreeQwert := BuildQwerty().CalculateAvgDegree()
-
-	assert.Equal(t, float64(1.5319148936170213), avgDegreeQwert, "Avg degree for qwerty should be 1.5319148936170213")
-}
-
-func TestCalculateDegreeDvorak(t *testing.T) {
-	avgDegreeQwert := BuildDvorak().CalculateAvgDegree()
-
-	assert.Equal(t, float64(1.5319148936170213), avgDegreeQwert, "Avg degree for dvorak should be 1.53191489361702135")
-}
-
-func TestCalculateDegreeKeypad(t *testing.T) {
-	avgDegreeQwert := BuildKeypad().CalculateAvgDegree()
-
-	assert.Equal(t, float64(0.6333333333333333), avgDegreeQwert, "Avg degree for keypad should be 0.6333333333333333")
-}
-
-func TestCalculateDegreeMacKepad(t *testing.T) {
-	avgDegreeQwert := BuildMacKeypad().CalculateAvgDegree()
-
-	assert.Equal(t, float64(0.65625), avgDegreeQwert, "Avg degree for mackeyPad should be 0.65625")
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Dvorak.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Dvorak.json
deleted file mode 100644
index 915819aac9..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Dvorak.json
+++ /dev/null
@@ -1,756 +0,0 @@
-{
-  "Graph": {
-    "0": [
-      "9(",
-      null,
-      null,
-      "[{",
-      "lL",
-      "rR"
-    ],
-    "1": [
-      "`~",
-      null,
-      null,
-      "2@",
-      "'\"",
-      null
-    ],
-    "2": [
-      "1!",
-      null,
-      null,
-      "3#",
-      ",<",
-      "'\""
-    ],
-    "3": [
-      "2@",
-      null,
-      null,
-      "4$",
-      ".>",
-      ",<"
-    ],
-    "4": [
-      "3#",
-      null,
-      null,
-      "5%",
-      "pP",
-      ".>"
-    ],
-    "5": [
-      "4$",
-      null,
-      null,
-      "6^",
-      "yY",
-      "pP"
-    ],
-    "6": [
-      "5%",
-      null,
-      null,
-      "7&",
-      "fF",
-      "yY"
-    ],
-    "7": [
-      "6^",
-      null,
-      null,
-      "8*",
-      "gG",
-      "fF"
-    ],
-    "8": [
-      "7&",
-      null,
-      null,
-      "9(",
-      "cC",
-      "gG"
-    ],
-    "9": [
-      "8*",
-      null,
-      null,
-      "0)",
-      "rR",
-      "cC"
-    ],
-    "!": [
-      "`~",
-      null,
-      null,
-      "2@",
-      "'\"",
-      null
-    ],
-    "\"": [
-      null,
-      "1!",
-      "2@",
-      ",<",
-      "aA",
-      null
-    ],
-    "#": [
-      "2@",
-      null,
-      null,
-      "4$",
-      ".>",
-      ",<"
-    ],
-    "$": [
-      "3#",
-      null,
-      null,
-      "5%",
-      "pP",
-      ".>"
-    ],
-    "%": [
-      "4$",
-      null,
-      null,
-      "6^",
-      "yY",
-      "pP"
-    ],
-    "&": [
-      "6^",
-      null,
-      null,
-      "8*",
-      "gG",
-      "fF"
-    ],
-    "'": [
-      null,
-      "1!",
-      "2@",
-      ",<",
-      "aA",
-      null
-    ],
-    "(": [
-      "8*",
-      null,
-      null,
-      "0)",
-      "rR",
-      "cC"
-    ],
-    ")": [
-      "9(",
-      null,
-      null,
-      "[{",
-      "lL",
-      "rR"
-    ],
-    "*": [
-      "7&",
-      null,
-      null,
-      "9(",
-      "cC",
-      "gG"
-    ],
-    "+": [
-      "/?",
-      "]}",
-      null,
-      "\\|",
-      null,
-      "-_"
-    ],
-    ",": [
-      "'\"",
-      "2@",
-      "3#",
-      ".>",
-      "oO",
-      "aA"
-    ],
-    "-": [
-      "sS",
-      "/?",
-      "=+",
-      null,
-      null,
-      "zZ"
-    ],
-    ".": [
-      ",<",
-      "3#",
-      "4$",
-      "pP",
-      "eE",
-      "oO"
-    ],
-    "/": [
-      "lL",
-      "[{",
-      "]}",
-      "=+",
-      "-_",
-      "sS"
-    ],
-    ":": [
-      null,
-      "aA",
-      "oO",
-      "qQ",
-      null,
-      null
-    ],
-    ";": [
-      null,
-      "aA",
-      "oO",
-      "qQ",
-      null,
-      null
-    ],
-    "<": [
-      "'\"",
-      "2@",
-      "3#",
-      ".>",
-      "oO",
-      "aA"
-    ],
-    "=": [
-      "/?",
-      "]}",
-      null,
-      "\\|",
-      null,
-      "-_"
-    ],
-    ">": [
-      ",<",
-      "3#",
-      "4$",
-      "pP",
-      "eE",
-      "oO"
-    ],
-    "?": [
-      "lL",
-      "[{",
-      "]}",
-      "=+",
-      "-_",
-      "sS"
-    ],
-    "@": [
-      "1!",
-      null,
-      null,
-      "3#",
-      ",<",
-      "'\""
-    ],
-    "A": [
-      null,
-      "'\"",
-      ",<",
-      "oO",
-      ";:",
-      null
-    ],
-    "B": [
-      "xX",
-      "dD",
-      "hH",
-      "mM",
-      null,
-      null
-    ],
-    "C": [
-      "gG",
-      "8*",
-      "9(",
-      "rR",
-      "tT",
-      "hH"
-    ],
-    "D": [
-      "iI",
-      "fF",
-      "gG",
-      "hH",
-      "bB",
-      "xX"
-    ],
-    "E": [
-      "oO",
-      ".>",
-      "pP",
-      "uU",
-      "jJ",
-      "qQ"
-    ],
-    "F": [
-      "yY",
-      "6^",
-      "7&",
-      "gG",
-      "dD",
-      "iI"
-    ],
-    "G": [
-      "fF",
-      "7&",
-      "8*",
-      "cC",
-      "hH",
-      "dD"
-    ],
-    "H": [
-      "dD",
-      "gG",
-      "cC",
-      "tT",
-      "mM",
-      "bB"
-    ],
-    "I": [
-      "uU",
-      "yY",
-      "fF",
-      "dD",
-      "xX",
-      "kK"
-    ],
-    "J": [
-      "qQ",
-      "eE",
-      "uU",
-      "kK",
-      null,
-      null
-    ],
-    "K": [
-      "jJ",
-      "uU",
-      "iI",
-      "xX",
-      null,
-      null
-    ],
-    "L": [
-      "rR",
-      "0)",
-      "[{",
-      "/?",
-      "sS",
-      "nN"
-    ],
-    "M": [
-      "bB",
-      "hH",
-      "tT",
-      "wW",
-      null,
-      null
-    ],
-    "N": [
-      "tT",
-      "rR",
-      "lL",
-      "sS",
-      "vV",
-      "wW"
-    ],
-    "O": [
-      "aA",
-      ",<",
-      ".>",
-      "eE",
-      "qQ",
-      ";:"
-    ],
-    "P": [
-      ".>",
-      "4$",
-      "5%",
-      "yY",
-      "uU",
-      "eE"
-    ],
-    "Q": [
-      ";:",
-      "oO",
-      "eE",
-      "jJ",
-      null,
-      null
-    ],
-    "R": [
-      "cC",
-      "9(",
-      "0)",
-      "lL",
-      "nN",
-      "tT"
-    ],
-    "S": [
-      "nN",
-      "lL",
-      "/?",
-      "-_",
-      "zZ",
-      "vV"
-    ],
-    "T": [
-      "hH",
-      "cC",
-      "rR",
-      "nN",
-      "wW",
-      "mM"
-    ],
-    "U": [
-      "eE",
-      "pP",
-      "yY",
-      "iI",
-      "kK",
-      "jJ"
-    ],
-    "V": [
-      "wW",
-      "nN",
-      "sS",
-      "zZ",
-      null,
-      null
-    ],
-    "W": [
-      "mM",
-      "tT",
-      "nN",
-      "vV",
-      null,
-      null
-    ],
-    "X": [
-      "kK",
-      "iI",
-      "dD",
-      "bB",
-      null,
-      null
-    ],
-    "Y": [
-      "pP",
-      "5%",
-      "6^",
-      "fF",
-      "iI",
-      "uU"
-    ],
-    "Z": [
-      "vV",
-      "sS",
-      "-_",
-      null,
-      null,
-      null
-    ],
-    "[": [
-      "0)",
-      null,
-      null,
-      "]}",
-      "/?",
-      "lL"
-    ],
-    "\\": [
-      "=+",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "]": [
-      "[{",
-      null,
-      null,
-      null,
-      "=+",
-      "/?"
-    ],
-    "^": [
-      "5%",
-      null,
-      null,
-      "7&",
-      "fF",
-      "yY"
-    ],
-    "_": [
-      "sS",
-      "/?",
-      "=+",
-      null,
-      null,
-      "zZ"
-    ],
-    "`": [
-      null,
-      null,
-      null,
-      "1!",
-      null,
-      null
-    ],
-    "a": [
-      null,
-      "'\"",
-      ",<",
-      "oO",
-      ";:",
-      null
-    ],
-    "b": [
-      "xX",
-      "dD",
-      "hH",
-      "mM",
-      null,
-      null
-    ],
-    "c": [
-      "gG",
-      "8*",
-      "9(",
-      "rR",
-      "tT",
-      "hH"
-    ],
-    "d": [
-      "iI",
-      "fF",
-      "gG",
-      "hH",
-      "bB",
-      "xX"
-    ],
-    "e": [
-      "oO",
-      ".>",
-      "pP",
-      "uU",
-      "jJ",
-      "qQ"
-    ],
-    "f": [
-      "yY",
-      "6^",
-      "7&",
-      "gG",
-      "dD",
-      "iI"
-    ],
-    "g": [
-      "fF",
-      "7&",
-      "8*",
-      "cC",
-      "hH",
-      "dD"
-    ],
-    "h": [
-      "dD",
-      "gG",
-      "cC",
-      "tT",
-      "mM",
-      "bB"
-    ],
-    "i": [
-      "uU",
-      "yY",
-      "fF",
-      "dD",
-      "xX",
-      "kK"
-    ],
-    "j": [
-      "qQ",
-      "eE",
-      "uU",
-      "kK",
-      null,
-      null
-    ],
-    "k": [
-      "jJ",
-      "uU",
-      "iI",
-      "xX",
-      null,
-      null
-    ],
-    "l": [
-      "rR",
-      "0)",
-      "[{",
-      "/?",
-      "sS",
-      "nN"
-    ],
-    "m": [
-      "bB",
-      "hH",
-      "tT",
-      "wW",
-      null,
-      null
-    ],
-    "n": [
-      "tT",
-      "rR",
-      "lL",
-      "sS",
-      "vV",
-      "wW"
-    ],
-    "o": [
-      "aA",
-      ",<",
-      ".>",
-      "eE",
-      "qQ",
-      ";:"
-    ],
-    "p": [
-      ".>",
-      "4$",
-      "5%",
-      "yY",
-      "uU",
-      "eE"
-    ],
-    "q": [
-      ";:",
-      "oO",
-      "eE",
-      "jJ",
-      null,
-      null
-    ],
-    "r": [
-      "cC",
-      "9(",
-      "0)",
-      "lL",
-      "nN",
-      "tT"
-    ],
-    "s": [
-      "nN",
-      "lL",
-      "/?",
-      "-_",
-      "zZ",
-      "vV"
-    ],
-    "t": [
-      "hH",
-      "cC",
-      "rR",
-      "nN",
-      "wW",
-      "mM"
-    ],
-    "u": [
-      "eE",
-      "pP",
-      "yY",
-      "iI",
-      "kK",
-      "jJ"
-    ],
-    "v": [
-      "wW",
-      "nN",
-      "sS",
-      "zZ",
-      null,
-      null
-    ],
-    "w": [
-      "mM",
-      "tT",
-      "nN",
-      "vV",
-      null,
-      null
-    ],
-    "x": [
-      "kK",
-      "iI",
-      "dD",
-      "bB",
-      null,
-      null
-    ],
-    "y": [
-      "pP",
-      "5%",
-      "6^",
-      "fF",
-      "iI",
-      "uU"
-    ],
-    "z": [
-      "vV",
-      "sS",
-      "-_",
-      null,
-      null,
-      null
-    ],
-    "{": [
-      "0)",
-      null,
-      null,
-      "]}",
-      "/?",
-      "lL"
-    ],
-    "|": [
-      "=+",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "}": [
-      "[{",
-      null,
-      null,
-      null,
-      "=+",
-      "/?"
-    ],
-    "~": [
-      null,
-      null,
-      null,
-      "1!",
-      null,
-      null
-    ]
-  }
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/English.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/English.json
deleted file mode 100644
index 490edba566..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/English.json
+++ /dev/null
@@ -1 +0,0 @@
-{"List":[ "you","i","to","the","a","and","that","it","of","me","what","is","in","this","know","i'm","for","no","have","my","don't","just","not","do","be","on","your","was","we","it's","with","so","but","all","well","are","he","oh","about","right","you're","get","here","out","going","like","yeah","if","her","she","can","up","want","think","that's","now","go","him","at","how","got","there","one","did","why","see","come","good","they","really","as","would","look","when","time","will","okay","back","can't","mean","tell","i'll","from","hey","were","he's","could","didn't","yes","his","been","or","something","who","because","some","had","then","say","ok","take","an","way","us","little","make","need","gonna","never","we're","too","she's","i've","sure","them","more","over","our","sorry","where","what's","let","thing","am","maybe","down","man","has","uh","very","by","there's","should","anything","said","much","any","life","even","off","doing","thank","give","only","thought","help","two","talk","people","god","still","wait","into","find","nothing","again","things","let's","doesn't","call","told","great","before","better","ever","night","than","away","first","believe","other","feel","everything","work","you've","fine","home","after","last","these","day","keep","does","put","around","stop","they're","i'd","guy","isn't","always","listen","wanted","mr","guys","huh","those","big","lot","happened","thanks","won't","trying","kind","wrong","through","talking","made","new","being","guess","hi","care","bad","mom","remember","getting","we'll","together","dad","leave","place","understand","wouldn't","actually","hear","baby","nice","father","else","stay","done","wasn't","their","course","might","mind","every","enough","try","hell","came","someone","you'll","own","family","whole","another","house","yourself","idea","ask","best","must","coming","old","looking","woman","which","years","room","left","knew","tonight","real","son","hope","name","same","went","um","hmm","happy","pretty","saw","girl","sir","show","friend","already","saying","next","three","job","problem","minute","found","world","thinking","haven't","heard","honey","matter","myself","couldn't","exactly","having","ah","probably","happen","we've","hurt","boy","both","while","dead","gotta","alone","since","excuse","start","kill","hard","you'd","today","car","ready","until","without","wants","hold","wanna","yet","seen","deal","took","once","gone","called","morning","supposed","friends","head","stuff","most","used","worry","second","part","live","truth","school","face","forget","true","business","each","cause","soon","knows","few","telling","wife","who's","use","chance","run","move","anyone","person","bye","somebody","dr","heart","such","miss","married","point","later","making","meet","anyway","many","phone","reason","damn","lost","looks","bring","case","turn","wish","tomorrow","kids","trust","check","change","end","late","anymore","five","least","town","aren't","ha","working","year","makes","taking","means","brother","play","hate","ago","says","beautiful","gave","fact","crazy","party","sit","open","afraid","between","important","rest","fun","kid","word","watch","glad","everyone","days","sister","minutes","everybody","bit","couple","whoa","either","mrs","feeling","daughter","wow","gets","asked","under","break","promise","door","set","close","hand","easy","question","tried","far","walk","needs","mine","though","times","different","killed","hospital","anybody","alright","wedding","shut","able","die","perfect","stand","comes","hit","story","ya","mm","waiting","dinner","against","funny","husband","almost","pay","answer","four","office","eyes","news","child","shouldn't","half","side","yours","moment","sleep","read","where's","started","men","sounds","sonny","pick","sometimes","em","bed","also","date","line","plan","hours","lose","hands","serious","behind","inside","high","ahead","week","wonderful","fight","past","cut","quite","number","he'll","sick","it'll","game","eat","nobody","goes","along","save","seems","finally","lives","worried","upset","carly","met","book","brought","seem","sort","safe","living","children","weren't","leaving","front","shot","loved","asking","running","clear","figure","hot","felt","six","parents","drink","absolutely","how's","daddy","alive","sense","meant","happens","special","bet","blood","ain't","kidding","lie","full","meeting","dear","seeing","sound","fault","water","ten","women","buy","months","hour","speak","lady","jen","thinks","christmas","body","order","outside","hang","possible","worse","company","mistake","ooh","handle","spend","totally","giving","control","here's","marriage","realize","president","unless","sex","send","needed","taken","died","scared","picture","talked","ass","hundred","changed","completely","explain","playing","certainly","sign","boys","relationship","loves","hair","lying","choice","anywhere","future","weird","luck","she'll","turned","known","touch","kiss","crane","questions","obviously","wonder","pain","calling","somewhere","throw","straight","cold","fast","words","food","none","drive","feelings","they'll","worked","marry","light","drop","cannot","sent","city","dream","protect","twenty","class","surprise","its","sweetheart","poor","looked","mad","except","gun","y'know","dance","takes","appreciate","especially","situation","besides","pull","himself","hasn't","act","worth","sheridan","amazing","top","given","expect","rather","involved","swear","piece","busy","law","decided","happening","movie","we'd","catch","country","less","perhaps","step","fall","watching","kept","darling","dog","win","air","honor","personal","moving","till","admit","problems","murder","he'd","evil","definitely","feels","information","honest","eye","broke","missed","longer","dollars","tired","evening","human","starting","red","entire","trip","club","niles","suppose","calm","imagine","fair","caught","blame","street","sitting","favor","apartment","court","terrible","clean","learn","works","frasier","relax","million","accident","wake","prove","smart","message","missing","forgot","interested","table","nbsp","become","mouth","pregnant","middle","ring","careful","shall","team","ride","figured","wear","shoot","stick","follow","angry","instead","write","stopped","early","ran","war","standing","forgive","jail","wearing","kinda","lunch","cristian","eight","greenlee","gotten","hoping","phoebe","thousand","ridge","paper","tough","tape","state","count","boyfriend","proud","agree","birthday","seven","they've","history","share","offer","hurry","feet","wondering","decision","building","ones","finish","voice","herself","would've","list","mess","deserve","evidence","cute","dress","interesting","hotel","quiet","concerned","road","staying","beat","sweetie","mention","clothes","finished","fell","neither","mmm","fix","respect","spent","prison","attention","holding","calls","near","surprised","bar","keeping","gift","hadn't","putting","dark","self","owe","using","ice","helping","normal","aunt","lawyer","apart","certain","plans","jax","girlfriend","floor","whether","everything's","present","earth","box","cover","judge","upstairs","sake","mommy","possibly","worst","station","acting","accept","blow","strange","saved","conversation","plane","mama","yesterday","lied","quick","lately","stuck","report","difference","rid","store","she'd","bag","bought","doubt","listening","walking","cops","deep","dangerous","buffy","sleeping","chloe","rafe","shh","record","lord","moved","join","card","crime","gentlemen","willing","window","return","walked","guilty","likes","fighting","difficult","soul","joke","favorite","uncle","promised","public","bother","island","seriously","cell","lead","knowing","broken","advice","somehow","paid","losing","push","helped","killing","usually","earlier","boss","beginning","liked","innocent","doc","rules","cop","learned","thirty","risk","letting","speaking","officer","ridiculous","support","afternoon","born","apologize","seat","nervous","across","song","charge","patient","boat","how'd","hide","detective","planning","nine","huge","breakfast","horrible","age","awful","pleasure","driving","hanging","picked","sell","quit","apparently","dying","notice","congratulations","chief","one's","month","visit","could've","c'mon","letter","decide","double","sad","press","forward","fool","showed","smell","seemed","spell","memory","pictures","slow","seconds","hungry","board","position","hearing","roz","kitchen","ma'am","force","fly","during","space","should've","realized","experience","kick","others","grab","mother's","discuss","third","cat","fifty","responsible","fat","reading","idiot","yep","suddenly","agent","destroy","bucks","track","shoes","scene","peace","arms","demon","low","livvie","consider","papers","medical","incredible","witch","drunk","attorney","tells","knock","ways","gives","department","nose","skye","turns","keeps","jealous","drug","sooner","cares","plenty","extra","tea","won","attack","ground","whose","outta","weekend","matters","wrote","type","father's","gosh","opportunity","impossible","books","waste","pretend","named","jump","eating","proof","complete","slept","career","arrest","breathe","perfectly","warm","pulled","twice","easier","goin","dating","suit","romantic","drugs","comfortable","finds","checked","fit","divorce","begin","ourselves","closer","ruin","although","smile","laugh","treat","god's","fear","what'd","guy's","otherwise","excited","mail","hiding","cost","stole","pacey","noticed","fired","excellent","lived","bringing","pop","bottom","note","sudden","bathroom","flight","honestly","sing","foot","games","remind","bank","charges","witness","finding","places","tree","dare","hardly","that'll","interest","steal","silly","contact","teach","shop","plus","colonel","fresh","trial","invited","roll","radio","reach","heh","choose","emergency","dropped","credit","obvious","cry","locked","loving","positive","nuts","agreed","prue","goodbye","condition","guard","fuckin","grow","cake","mood","dad's","total","crap","crying","belong","lay","partner","trick","pressure","ohh","arm","dressed","cup","lies","bus","taste","neck","south","something's","nurse","raise","lots","carry","group","whoever","drinking","they'd","breaking","file","lock","wine","closed","writing","spot","paying","study","assume","asleep","man's","turning","legal","viki","bedroom","shower","nikolas","camera","fill","reasons","forty","bigger","nope","breath","doctors","pants","level","movies","gee","area","folks","ugh","continue","focus","wild","truly","desk","convince","client","threw","band","hurts","spending","allow","grand","answers","shirt","chair","allowed","rough","doin","sees","government","ought","empty","round","hat","wind","shows","aware","dealing","pack","meaning","hurting","ship","subject","guest","mom's","pal","match","arrested","salem","confused","surgery","expecting","deacon","unfortunately","goddamn","lab","passed","bottle","beyond","whenever","pool","opinion","held","common","starts","jerk","secrets","falling","played","necessary","barely","dancing","health","tests","copy","cousin","planned","dry","ahem","twelve","simply","tess","skin","often","fifteen","speech","names","issue","orders","nah","final","results","code","believed","complicated","umm","research","nowhere","escape","biggest","restaurant","grateful","usual","burn","address","within","someplace","screw","everywhere","train","film","regret","goodness","mistakes","details","responsibility","suspect","corner","hero","dumb","terrific","further","gas","whoo","hole","memories","o'clock","following","ended","nobody's","teeth","ruined","split","airport","bite","stenbeck","older","liar","showing","project","cards","desperate","themselves","pathetic","damage","spoke","quickly","scare","marah","afford","vote","settle","mentioned","due","stayed","rule","checking","tie","hired","upon","heads","concern","blew","natural","alcazar","champagne","connection","tickets","happiness","form","saving","kissing","hated","personally","suggest","prepared","build","leg","onto","leaves","downstairs","ticket","it'd","taught","loose","holy","staff","sea","duty","convinced","throwing","defense","kissed","legs","according","loud","practice","saturday","babies","army","where'd","warning","miracle","carrying","flying","blind","ugly","shopping","hates","someone's","sight","bride","coat","account","states","clearly","celebrate","brilliant","wanting","add","forrester","lips","custody","center","screwed","buying","size","toast","thoughts","student","stories","however","professional","reality","birth","lexie","attitude","advantage","grandfather","sami","sold","opened","grandma","beg","changes","someday","grade","roof","brothers","signed","ahh","marrying","powerful","grown","grandmother","fake","opening","expected","eventually","must've","ideas","exciting","covered","familiar","bomb","bout","television","harmony","color","heavy","schedule","records","capable","practically","including","correct","clue","forgotten","immediately","appointment","social","nature","deserves","threat","bloody","lonely","ordered","shame","local","jacket","hook","destroyed","scary","investigation","above","invite","shooting","port","lesson","criminal","growing","caused","victim","professor","followed","funeral","nothing's","considering","burning","strength","loss","view","gia","sisters","everybody's","several","pushed","written","somebody's","shock","pushing","heat","chocolate","greatest","miserable","corinthos","nightmare","brings","zander","character","became","famous","enemy","crash","chances","sending","recognize","healthy","boring","feed","engaged","percent","headed","lines","treated","purpose","knife","rights","drag","san","fan","badly","hire","paint","pardon","built","behavior","closet","warn","gorgeous","milk","survive","forced","operation","offered","ends","dump","rent","remembered","lieutenant","trade","thanksgiving","rain","revenge","physical","available","program","prefer","baby's","spare","pray","disappeared","aside","statement","sometime","meat","fantastic","breathing","laughing","itself","tip","stood","market","affair","ours","depends","main","protecting","jury","national","brave","large","jack's","interview","fingers","murdered","explanation","process","picking","based","style","pieces","blah","assistant","stronger","aah","pie","handsome","unbelievable","anytime","nearly","shake","everyone's","oakdale","cars","wherever","serve","pulling","points","medicine","facts","waited","lousy","circumstances","stage","disappointed","weak","trusted","license","nothin","community","trash","understanding","slip","cab","sounded","awake","friendship","stomach","weapon","threatened","mystery","official","regular","river","vegas","understood","contract","race","basically","switch","frankly","issues","cheap","lifetime","deny","painting","ear","clock","weight","garbage","why'd","tear","ears","dig","selling","setting","indeed","changing","singing","tiny","particular","draw","decent","avoid","messed","filled","touched","score","people's","disappear","exact","pills","kicked","harm","recently","fortune","pretending","raised","insurance","fancy","drove","cared","belongs","nights","shape","lorelai","base","lift","stock","sonny's","fashion","timing","guarantee","chest","bridge","woke","source","patients","theory","original","burned","watched","heading","selfish","oil","drinks","failed","period","doll","committed","elevator","freeze","noise","exist","science","pair","edge","wasting","sat","ceremony","pig","uncomfortable","peg","guns","staring","files","bike","weather","name's","mostly","stress","permission","arrived","thrown","possibility","example","borrow","release","ate","notes","hoo","library","property","negative","fabulous","event","doors","screaming","xander","term","what're","meal","fellow","apology","anger","honeymoon","wet","bail","parking","non","protection","fixed","families","chinese","campaign","map","wash","stolen","sensitive","stealing","chose","lets","comfort","worrying","whom","pocket","mateo","bleeding","students","shoulder","ignore","fourth","neighborhood","fbi","talent","tied","garage","dies","demons","dumped","witches","training","rude","crack","model","bothering","radar","grew","remain","soft","meantime","gimme","connected","kinds","cast","sky","likely","fate","buried","hug","brother's","concentrate","prom","messages","east","unit","intend","crew","ashamed","somethin","manage","guilt","weapons","terms","interrupt","guts","tongue","distance","conference","treatment","shoe","basement","sentence","purse","glasses","cabin","universe","towards","repeat","mirror","wound","travers","tall","reaction","odd","engagement","therapy","letters","emotional","runs","magazine","jeez","decisions","soup","daughter's","thrilled","society","managed","stake","chef","moves","extremely","entirely","moments","expensive","counting","shots","kidnapped","square","son's","cleaning","shift","plate","impressed","smells","trapped","male","tour","aidan","knocked","charming","attractive","argue","puts","whip","language","embarrassed","settled","package","laid","animals","hitting","disease","bust","stairs","alarm","pure","nail","nerve","incredibly","walks","dirt","stamp","sister's","becoming","terribly","friendly","easily","damned","jobs","suffering","disgusting","stopping","deliver","riding","helps","federal","disaster","bars","dna","crossed","rate","create","trap","claim","california","talks","eggs","effect","chick","threatening","spoken","introduce","confession","embarrassing","bags","impression","gate","year's","reputation","attacked","among","knowledge","presents","inn","europe","chat","suffer","argument","talkin","crowd","homework","fought","coincidence","cancel","accepted","rip","pride","solve","hopefully","pounds","pine","mate","illegal","generous","streets","con","separate","outfit","maid","bath","punch","mayor","freaked","begging","recall","enjoying","bug","woman's","prepare","parts","wheel","signal","direction","defend","signs","painful","yourselves","rat","maris","amount","that'd","suspicious","flat","cooking","button","warned","sixty","pity","parties","crisis","coach","row","yelling","leads","awhile","pen","confidence","offering","falls","image","farm","pleased","panic","hers","gettin","role","refuse","determined","hell's","grandpa","progress","testify","passing","military","choices","uhh","gym","cruel","wings","bodies","mental","gentleman","coma","cutting","proteus","guests","girl's","expert","benefit","faces","cases","led","jumped","toilet","secretary","sneak","mix","firm","halloween","agreement","privacy","dates","anniversary","smoking","reminds","pot","created","twins","swing","successful","season","scream","considered","solid","options","commitment","senior","ill","else's","crush","ambulance","wallet","discovered","officially","til","rise","reached","eleven","option","laundry","former","assure","stays","skip","fail","accused","wide","challenge","popular","learning","discussion","clinic","plant","exchange","betrayed","bro","sticking","university","members","lower","bored","mansion","soda","sheriff","suite","handled","busted","senator","load","happier","younger","studying","romance","procedure","ocean","section","sec","commit","assignment","suicide","minds","swim","ending","bat","yell","llanview","league","chasing","seats","proper","command","believes","humor","hopes","fifth","winning","solution","leader","theresa's","sale","lawyers","nor","material","latest","highly","escaped","audience","parent","tricks","insist","dropping","cheer","medication","higher","flesh","district","routine","century","shared","sandwich","handed","false","beating","appear","warrant","family's","awfully","odds","article","treating","thin","suggesting","fever","sweat","silent","specific","clever","sweater","request","prize","mall","tries","mile","fully","estate","union","sharing","assuming","judgment","goodnight","divorced","despite","surely","steps","jet","confess","math","listened","comin","answered","vulnerable","bless","dreaming","rooms","chip","zero","potential","pissed","nate","kills","tears","knees","chill","carly's","brains","agency","harvard","degree","unusual","wife's","joint","packed","dreamed","cure","covering","newspaper","lookin","coast","grave","egg","direct","cheating","breaks","quarter","mixed","locker","husband's","gifts","awkward","toy","thursday","rare","policy","kid's","joking","competition","classes","assumed","reasonable","dozen","curse","quartermaine","millions","dessert","rolling","detail","alien","served","delicious","closing","vampires","released","ancient","wore","value","tail","secure","salad","murderer","hits","toward","spit","screen","offense","dust","conscience","bread","answering","admitted","lame","invitation","grief","smiling","path","stands","bowl","pregnancy","hollywood","prisoner","delivery","guards","virus","shrink","influence","freezing","concert","wreck","partners","massimo","chain","birds","life's","wire","technically","presence","blown","anxious","cave","version","holidays","cleared","wishes","survived","caring","candles","bound","related","charm","yup","pulse","jumping","jokes","frame","boom","vice","performance","occasion","silence","opera","nonsense","frightened","downtown","americans","slipped","dimera","blowing","world's","session","relationships","kidnapping","actual","spin","civil","roxy","packing","education","blaming","wrap","obsessed","fruit","torture","personality","location","effort","daddy's","commander","trees","there'll","owner","fairy","per","other's","necessarily","county","contest","seventy","print","motel","fallen","directly","underwear","grams","exhausted","believing","particularly","freaking","carefully","trace","touching","messing","committee","recovery","intention","consequences","belt","sacrifice","courage","officers","enjoyed","lack","attracted","appears","bay","yard","returned","remove","nut","carried","today's","testimony","intense","granted","violence","heal","defending","attempt","unfair","relieved","political","loyal","approach","slowly","plays","normally","buzz","alcohol","actor","surprises","psychiatrist","pre","plain","attic","who'd","uniform","terrified","sons","pet","cleaned","zach","threaten","teaching","mum","motion","fella","enemies","desert","collection","incident","failure","satisfied","imagination","hooked","headache","forgetting","counselor","andie","acted","opposite","highest","equipment","badge","italian","visiting","naturally","frozen","commissioner","sakes","labor","appropriate","trunk","armed","thousands","received","dunno","costume","temporary","sixteen","impressive","zone","kicking","junk","hon","grabbed","unlike","understands","describe","clients","owns","affect","witnesses","starving","instincts","happily","discussing","deserved","strangers","leading","intelligence","host","authority","surveillance","cow","commercial","admire","questioning","fund","dragged","barn","object","deeply","amp","wrapped","wasted","tense","route","reports","hoped","fellas","election","roommate","mortal","fascinating","chosen","stops","shown","arranged","abandoned","sides","delivered","becomes","arrangements","agenda","began","theater","series","literally","propose","honesty","underneath","forces","services","sauce","promises","lecture","eighty","torn","shocked","relief","explained","counter","circle","victims","transfer","response","channel","identity","differently","campus","spy","ninety","interests","guide","deck","biological","pheebs","ease","creep","will's","waitress","skills","telephone","ripped","raising","scratch","rings","prints","wave","thee","arguing","figures","ephram","asks","reception","pin","oops","diner","annoying","agents","taggert","goal","mass","ability","sergeant","julian's","international","gig","blast","basic","tradition","towel","earned","rub","president's","habit","customers","creature","bermuda","actions","snap","react","prime","paranoid","wha","handling","eaten","therapist","comment","charged","tax","sink","reporter","beats","priority","interrupting","gain","fed","warehouse","shy","pattern","loyalty","inspector","events","pleasant","media","excuses","threats","permanent","guessing","financial","demand","assault","tend","praying","motive","los","unconscious","trained","museum","tracks","range","nap","mysterious","unhappy","tone","switched","rappaport","award","sookie","neighbor","loaded","gut","childhood","causing","swore","piss","hundreds","balance","background","toss","mob","misery","valentine's","thief","squeeze","lobby","hah","goa'uld","geez","exercise","ego","drama","al's","forth","facing","booked","boo","songs","sandburg","eighteen","d'you","bury","perform","everyday","digging","creepy","compared","wondered","trail","liver","hmmm","drawn","device","magical","journey","fits","discussed","supply","moral","helpful","attached","timmy's","searching","flew","depressed","aisle","underground","pro","daughters","cris","amen","vows","proposal","pit","neighbors","darn","cents","arrange","annulment","uses","useless","squad","represent","product","joined","afterwards","adventure","resist","protected","net","fourteen","celebrating","piano","inch","flag","debt","violent","tag","sand","gum","dammit","teal'c","hip","celebration","below","reminded","claims","tonight's","replace","phones","paperwork","emotions","typical","stubborn","stable","sheridan's","pound","papa","lap","designed","current","bum","tension","tank","suffered","steady","provide","overnight","meanwhile","chips","beef","wins","suits","boxes","salt","cassadine","collect","boy's","tragedy","therefore","spoil","realm","profile","degrees","wipe","surgeon","stretch","stepped","nephew","neat","limo","confident","anti","perspective","designer","climb","title","suggested","punishment","finest","ethan's","springfield","occurred","hint","furniture","blanket","twist","surrounded","surface","proceed","lip","fries","worries","refused","niece","gloves","soap","signature","disappoint","crawl","convicted","zoo","result","pages","lit","flip","counsel","doubts","crimes","accusing","when's","shaking","remembering","phase","hallway","halfway","bothered","useful","makeup","madam","gather","concerns","cia","cameras","blackmail","symptoms","rope","ordinary","imagined","concept","cigarette","supportive","memorial","explosion","yay","woo","trauma","ouch","leo's","furious","cheat","avoiding","whew","thick","oooh","boarding","approve","urgent","shhh","misunderstanding","minister","drawer","sin","phony","joining","jam","interfere","governor","chapter","catching","bargain","tragic","schools","respond","punish","penthouse","hop","thou","remains","rach","ohhh","insult","doctor's","bugs","beside","begged","absolute","strictly","stefano","socks","senses","ups","sneaking","yah","serving","reward","polite","checks","tale","physically","instructions","fooled","blows","tabby","internal","bitter","adorable","y'all","tested","suggestion","string","jewelry","debate","com","alike","pitch","fax","distracted","shelter","lessons","foreign","average","twin","friend's","damnit","constable","circus","audition","tune","shoulders","mud","mask","helpless","feeding","explains","dated","robbery","objection","behave","valuable","shadows","courtroom","confusing","tub","talented","struck","smarter","mistaken","italy","customer","bizarre","scaring","punk","motherfucker","holds","focused","alert","activity","vecchio","reverend","highway","foolish","compliment","bastards","attend","scheme","aid","worker","wheelchair","protective","poetry","gentle","script","reverse","picnic","knee","intended","construction","cage","wednesday","voices","toes","stink","scares","pour","effects","cheated","tower","time's","slide","ruining","recent","jewish","filling","exit","cottage","corporate","upside","supplies","proves","parked","instance","grounds","diary","complaining","basis","wounded","thing's","politics","confessed","pipe","merely","massage","data","chop","budget","brief","spill","prayer","costs","betray","begins","arrangement","waiter","scam","rats","fraud","flu","brush","anyone's","adopted","tables","sympathy","pill","pee","web","seventeen","landed","expression","entrance","employee","drawing","cap","bracelet","principal","pays","jen's","fairly","facility","dru","deeper","arrive","unique","tracking","spite","shed","recommend","oughta","nanny","naive","menu","grades","diet","corn","authorities","separated","roses","patch","dime","devastated","description","tap","subtle","include","citizen","bullets","beans","ric","pile","las","executive","confirm","toe","strings","parade","harbor","charity's","bow","borrowed","toys","straighten","steak","status","remote","premonition","poem","planted","honored","youth","specifically","meetings","exam","convenient","traveling","matches","laying","insisted","apply","units","technology","dish","aitoro","sis","kindly","grandson","donor","temper","teenager","strategy","richard's","proven","iron","denial","couples","backwards","tent","swell","noon","happiest","episode","drives","thinkin","spirits","potion","fence","affairs","acts","whatsoever","rehearsal","proved","overheard","nuclear","lemme","hostage","faced","constant","bench","tryin","taxi","shove","sets","moron","limits","impress","entitled","needle","limit","lad","intelligent","instant","forms","disagree","stinks","rianna","recover","paul's","losers","groom","gesture","developed","constantly","blocks","bartender","tunnel","suspects","sealed","removed","legally","illness","hears","dresses","aye","vehicle","thy","teachers","sheet","receive","psychic","night's","denied","knocking","judging","bible","behalf","accidentally","waking","ton","superior","seek","rumor","natalie's","manners","homeless","hollow","desperately","critical","theme","tapes","referring","personnel","item","genoa","gear","majesty","fans","exposed","cried","tons","spells","producer","launch","instinct","belief","quote","motorcycle","convincing","appeal","advance","greater","fashioned","aids","accomplished","mommy's","grip","bump","upsetting","soldiers","scheduled","production","needing","invisible","forgiveness","feds","complex","compare","bothers","tooth","territory","sacred","mon","jessica's","inviting","inner","earn","compromise","cocktail","tramp","temperature","signing","landing","jabot","intimate","dignity","dealt","souls","informed","gods","entertainment","dressing","cigarettes","blessing","billion","alistair","upper","manner","lightning","leak","heaven's","fond","corky","alternative","seduce","players","operate","modern","liquor","fingerprints","enchantment","butters","stuffed","stavros","rome","filed","emotionally","division","conditions","uhm","transplant","tips","passes","oxygen","nicely","lunatic","hid","drill","designs","complain","announcement","visitors","unfortunate","slap","prayers","plug","organization","opens","oath","o'neill","mutual","graduate","confirmed","broad","yacht","spa","remembers","fried","extraordinary","bait","appearance","abuse","warton","sworn","stare","safely","reunion","plot","burst","aha","might've","experiment","dive","commission","cells","aboard","returning","independent","expose","environment","buddies","trusting","smaller","mountains","booze","sweep","sore","scudder","properly","parole","manhattan","effective","ditch","decides","canceled","bra","antonio's","speaks","spanish","reaching","glow","foundation","women's","wears","thirsty","skull","ringing","dorm","dining","bend","unexpected","systems","sob","pancakes","michael's","harsh","flattered","existence","ahhh","troubles","proposed","fights","favourite","eats","driven","computers","rage","luke's","causes","border","undercover","spoiled","sloane","shine","rug","identify","destroying","deputy","deliberately","conspiracy","clothing","thoughtful","similar","sandwiches","plates","nails","miracles","investment","fridge","drank","contrary","beloved","allergic","washed","stalking","solved","sack","misses","hope's","forgiven","erica's","cuz","bent","approval","practical","organized","maciver","involve","industry","fuel","dragging","cooked","possession","pointing","foul","editor","dull","beneath","ages","horror","heels","grass","faking","deaf","stunt","portrait","painted","jealousy","hopeless","fears","cuts","conclusion","volunteer","scenario","satellite","necklace","men's","crashed","chapel","accuse","restraining","jason's","humans","homicide","helicopter","formal","firing","shortly","safer","devoted","auction","videotape","tore","stores","reservations","pops","appetite","anybody's","wounds","vanquish","symbol","prevent","patrol","ironic","flow","fathers","excitement","anyhow","tearing","sends","sam's","rape","laughed","function","core","charmed","whatever's","sub","lucy's","dealer","cooperate","bachelor","accomplish","wakes","struggle","spotted","sorts","reservation","ashes","yards","votes","tastes","supposedly","loft","intentions","integrity","wished","towels","suspected","slightly","qualified","log","investigating","inappropriate","immediate","companies","backed","pan","owned","lipstick","lawn","compassion","cafeteria","belonged","affected","scarf","precisely","obsession","management","loses","lighten","jake's","infection","granddaughter","explode","chemistry","balcony","this'll","storage","spying","publicity","exists","employees","depend","cue","cracked","conscious","aww","ally","ace","accounts","absurd","vicious","tools","strongly","rap","invented","forbid","directions","defendant","bare","announce","alcazar's","screwing","salesman","robbed","leap","lakeview","insanity","injury","genetic","document","why's","reveal","religious","possibilities","kidnap","gown","entering","chairs","wishing","statue","setup","serial","punished","dramatic","dismissed","criminals","seventh","regrets","raped","quarters","produce","lamp","dentist","anyways","anonymous","added","semester","risks","regarding","owes","magazines","machines","lungs","explaining","delicate","child's","tricked","oldest","liv","eager","doomed","cafe","bureau","adoption","traditional","surrender","stab","sickness","scum","loop","independence","generation","floating","envelope","entered","combination","chamber","worn","vault","sorel","pretended","potatoes","plea","photograph","payback","misunderstood","kiddo","healing","cascade","capeside","application","stabbed","remarkable","cabinet","brat","wrestling","sixth","scale","privilege","passionate","nerves","lawsuit","kidney","disturbed","crossing","cozy","associate","tire","shirts","required","posted","oven","ordering","mill","journal","gallery","delay","clubs","risky","nest","monsters","honorable","grounded","favour","culture","closest","brenda's","breakdown","attempted","tony's","placed","conflict","bald","actress","abandon","steam","scar","pole","duh","collar","worthless","standards","resources","photographs","introduced","injured","graduation","enormous","disturbing","disturb","distract","deals","conclusions","vodka","situations","require","mid","measure","dishes","crawling","congress","children's","briefcase","wiped","whistle","sits","roast","rented","pigs","greek","flirting","existed","deposit","damaged","bottles","vanessa's","types","topic","riot","overreacting","minimum","logical","impact","hostile","embarrass","casual","beacon","amusing","altar","values","recognized","maintain","goods","covers","claus","battery","survival","skirt","shave","prisoners","porch","med","ghosts","favors","drops","dizzy","chili","begun","beaten","advise","transferred","strikes","rehab","raw","photographer","peaceful","leery","heavens","fortunately","fooling","expectations","draft","citizens","weakness","ski","ships","ranch","practicing","musical","movement","individual","homes","executed","examine","documents","cranes","column","bribe","task","species","sail","rum","resort","prescription","operating","hush","fragile","forensics","expense","drugged","differences","cows","conduct","comic","bells","avenue","attacking","assigned","visitor","suitcase","sources","sorta","scan","payment","motor","mini","manticore","inspired","insecure","imagining","hardest","clerk","yea","wrist","what'll","tube","starters","silk","pump","pale","nicer","haul","flies","demands","boot","arts","african","there'd","limited","how're","elders","connections","quietly","pulls","idiots","factor","erase","denying","attacks","ankle","amnesia","accepting","ooo","heartbeat","gal","devane","confront","backing","phrase","operations","minus","meets","legitimate","hurricane","fixing","communication","boats","auto","arrogant","supper","studies","slightest","sins","sayin","recipe","pier","paternity","humiliating","genuine","catholic","snack","rational","pointed","minded","guessed","grace's","display","dip","brooke's","advanced","weddings","unh","tumor","teams","reported","humiliated","destruction","copies","closely","bid","aspirin","academy","wig","throughout","spray","occur","logic","eyed","equal","drowning","contacts","shakespeare","ritual","perfume","kelly's","hiring","hating","generally","error","elected","docks","creatures","visions","thanking","thankful","sock","replaced","nineteen","nick's","fork","comedy","analysis","yale","throws","teenagers","studied","stressed","slice","rolls","requires","plead","ladder","kicks","detectives","assured","alison's","widow","tomorrow's","tissue","tellin","shallow","responsibilities","repay","rejected","permanently","girlfriends","deadly","comforting","ceiling","bonus","verdict","maintenance","jar","insensitive","factory","aim","triple","spilled","respected","recovered","messy","interrupted","halliwell","car's","bleed","benefits","wardrobe","takin","significant","objective","murders","doo","chart","backs","workers","waves","underestimate","ties","registered","multiple","justify","harmless","frustrated","fold","enzo","convention","communicate","bugging","attraction","arson","whack","salary","rumors","residence","party's","obligation","medium","liking","laura's","development","develop","dearest","david's","danny's","congratulate","vengeance","switzerland","severe","rack","puzzle","puerto","guidance","fires","courtesy","caller","blamed","tops","repair","quiz","prep","now's","involves","headquarters","curiosity","codes","circles","barbecue","troops","sunnydale","spinning","scores","pursue","psychotic","cough","claimed","accusations","shares","resent","money's","laughs","gathered","freshman","envy","drown","cristian's","bartlet","asses","sofa","scientist","poster","islands","highness","dock","apologies","welfare","victor's","theirs","stat","stall","spots","somewhat","ryan's","realizes","psych","fools","finishing","album","wee","understandable","unable","treats","theatre","succeed","stir","relaxed","makin","inches","gratitude","faithful","bin","accent","zip","witter","wandering","regardless","que","locate","inevitable","gretel","deed","crushed","controlling","taxes","smelled","settlement","robe","poet","opposed","marked","greenlee's","gossip","gambling","determine","cuba","cosmetics","cent","accidents","surprising","stiff","sincere","shield","rushed","resume","reporting","refrigerator","reference","preparing","nightmares","mijo","ignoring","hunch","fog","fireworks","drowned","crown","cooperation","brass","accurate","whispering","sophisticated","religion","luggage","investigate","hike","explore","emotion","creek","crashing","contacted","complications","ceo","acid","shining","rolled","righteous","reconsider","inspiration","goody","geek","frightening","festival","ethics","creeps","courthouse","camping","assistance","affection","vow","smythe","protest","lodge","haircut","forcing","essay","chairman","baked","apologized","vibe","respects","receipt","mami","includes","hats","exclusive","destructive","define","defeat","adore","adopt","voted","tracked","signals","shorts","rory's","reminding","relative","ninth","floors","dough","creations","continues","cancelled","cabot","barrel","adam's","snuck","slight","reporters","rear","pressing","novel","newspapers","magnificent","madame","lazy","glorious","fiancee","candidate","brick","bits","australia","activities","visitation","scholarship","sane","previous","kindness","ivy's","shoulda","rescued","mattress","maria's","lounge","lifted","label","importantly","glove","enterprises","driver's","disappointment","condo","cemetery","beings","admitting","yelled","waving","screech","satisfaction","requested","reads","plants","nun","nailed","described","dedicated","certificate","centuries","annual","worm","tick","resting","primary","polish","marvelous","fuss","funds","defensive","cortlandt","compete","chased","provided","pockets","luckily","lilith","filing","depression","conversations","consideration","consciousness","worlds","innocence","indicate","grandmother's","forehead","bam","appeared","aggressive","trailer","slam","retirement","quitting","pry","person's","narrow","levels","kay's","inform","encourage","dug","delighted","daylight","danced","currently","confidential","billy's","ben's","aunts","washing","vic","tossed","spectra","rick's","permit","marrow","lined","implying","hatred","grill","efforts","corpse","clues","sober","relatives","promotion","offended","morgue","larger","infected","humanity","eww","emily's","electricity","electrical","distraction","cart","broadcast","wired","violation","suspended","promising","harassment","glue","gathering","d'angelo","cursed","controlled","calendar","brutal","assets","warlocks","wagon","unpleasant","proving","priorities","observation","mustn't","lease","grows","flame","domestic","disappearance","depressing","thrill","sitter","ribs","offers","naw","flush","exception","earrings","deadline","corporal","collapsed","update","snapped","smack","orleans","offices","melt","figuring","delusional","coulda","burnt","actors","trips","tender","sperm","specialist","scientific","realise","pork","popped","planes","kev","interrogation","institution","included","esteem","communications","choosing","choir","undo","pres","prayed","plague","manipulate","lifestyle","insulting","honour","detention","delightful","coffeehouse","chess","betrayal","apologizing","adjust","wrecked","wont","whipped","rides","reminder","psychological","principle","monsieur","injuries","fame","faint","confusion","christ's","bon","bake","nearest","korea","industries","execution","distress","definition","creating","correctly","complaint","blocked","trophy","tortured","structure","rot","risking","pointless","household","heir","handing","eighth","dumping","cups","chloe's","alibi","absence","vital","tokyo","thus","struggling","shiny","risked","refer","mummy","mint","joey's","involvement","hose","hobby","fortunate","fleischman","fitting","curtain","counseling","addition","wit","transport","technical","rode","puppet","opportunities","modeling","memo","irresponsible","humiliation","hiya","freakin","fez","felony","choke","blackmailing","appreciated","tabloid","suspicion","recovering","rally","psychology","pledge","panicked","nursery","louder","jeans","investigator","identified","homecoming","helena's","height","graduated","frustrating","fabric","distant","buys","busting","buff","wax","sleeve","products","philosophy","irony","hospitals","dope","declare","autopsy","workin","torch","substitute","scandal","prick","limb","leaf","lady's","hysterical","growth","goddamnit","fetch","dimension","day's","crowded","clip","climbing","bonding","approved","yeh","woah","ultimately","trusts","returns","negotiate","millennium","majority","lethal","length","iced","deeds","bore","babysitter","questioned","outrageous","medal","kiriakis","insulted","grudge","established","driveway","deserted","definite","capture","beep","wires","suggestions","searched","owed","originally","nickname","lighting","lend","drunken","demanding","costanza","conviction","characters","bumped","weigh","touches","tempted","shout","resolve","relate","poisoned","pip","phoebe's","pete's","occasionally","molly's","meals","maker","invitations","haunted","fur","footage","depending","bogus","autograph","affects","tolerate","stepping","spontaneous","sleeps","probation","presentation","performed","manny","identical","fist","cycle","associates","aaron's","streak","spectacular","sector","lasted","isaac's","increase","hostages","heroin","havin","habits","encouraging","cult","consult","burgers","boyfriends","bailed","baggage","association","wealthy","watches","versus","troubled","torturing","teasing","sweetest","stations","sip","shawn's","rag","qualities","postpone","pad","overwhelmed","malkovich","impulse","hut","follows","classy","charging","barbara's","angel's","amazed","scenes","rising","revealed","representing","policeman","offensive","mug","hypocrite","humiliate","hideous","finals","experiences","d'ya","courts","costumes","captured","bluffing","betting","bein","bedtime","alcoholic","vegetable","tray","suspicions","spreading","splendid","shouting","roots","pressed","nooo","liza's","jew","intent","grieving","gladly","fling","eliminate","disorder","courtney's","cereal","arrives","aaah","yum","technique","statements","sonofabitch","servant","roads","republican","paralyzed","orb","lotta","locks","guaranteed","european","dummy","discipline","despise","dental","corporation","carries","briefing","bluff","batteries","atmosphere","whatta","tux","sounding","servants","rifle","presume","kevin's","handwriting","goals","gin","fainted","elements","dried","cape","allright","allowing","acknowledge","whacked","toxic","skating","reliable","quicker","penalty","panel","overwhelming","nearby","lining","importance","harassing","fatal","endless","elsewhere","dolls","convict","bold","ballet","whatcha","unlikely","spiritual","shutting","separation","recording","positively","overcome","goddam","failing","essence","dose","diagnosis","cured","claiming","bully","airline","ahold","yearbook","various","tempting","shelf","rig","pursuit","prosecution","pouring","possessed","partnership","miguel's","lindsay's","countries","wonders","tsk","thorough","spine","rath","psychiatric","meaningless","latte","jammed","ignored","fiance","exposure","exhibit","evidently","duties","contempt","compromised","capacity","cans","weekends","urge","theft","suing","shipment","scissors","responding","refuses","proposition","noises","matching","located","ink","hormones","hiv","hail","grandchildren","godfather","gently","establish","crane's","contracts","compound","buffy's","worldwide","smashed","sexually","sentimental","senor","scored","patient's","nicest","marketing","manipulated","jaw","intern","handcuffs","framed","errands","entertaining","discovery","crib","carriage","barge","awards","attending","ambassador","videos","tab","spends","slipping","seated","rubbing","rely","reject","recommendation","reckon","ratings","headaches","float","embrace","corners","whining","sweating","sole","skipped","restore","receiving","population","pep","mountie","motives","mama's","listens","korean","heroes","heart's","cristobel","controls","cheerleader","balsom","unnecessary","stunning","shipping","scent","santa's","quartermaines","praise","pose","montega","luxury","loosen","kyle's","keri's","info","hum","haunt","gracious","git","forgiving","fleet","errand","emperor","cakes","blames","abortion","worship","theories","strict","sketch","shifts","plotting","physician","perimeter","passage","pals","mere","mattered","lonigan","longest","jews","interference","eyewitness","enthusiasm","encounter","diapers","craig's","artists","strongest","shaken","serves","punched","projects","portal","outer","nazi","hal's","colleagues","catches","bearing","backyard","academic","winds","terrorists","sabotage","pea","organs","needy","mentor","measures","listed","lex","cuff","civilization","caribbean","articles","writes","woof","who'll","viki's","valid","rarely","rabbi","prank","performing","obnoxious","mates","improve","hereby","gabby","faked","cellar","whitelighter","void","substance","strangle","sour","skill","senate","purchase","native","muffins","interfering","hoh","gina's","demonic","colored","clearing","civilian","buildings","boutique","barrington","trading","terrace","smoked","seed","righty","relations","quack","published","preliminary","petey","pact","outstanding","opinions","knot","ketchup","items","examined","disappearing","cordy","coin","circuit","assist","administration","walt","uptight","ticking","terrifying","tease","tabitha's","syd","swamp","secretly","rejection","reflection","realizing","rays","pennsylvania","partly","mentally","marone","jurisdiction","frasier's","doubted","deception","crucial","congressman","cheesy","arrival","visited","supporting","stalling","scouts","scoop","ribbon","reserve","raid","notion","income","immune","grandma's","expects","edition","destined","constitution","classroom","bets","appreciation","appointed","accomplice","whitney's","wander","shoved","sewer","scroll","retire","paintings","lasts","fugitive","freezer","discount","cranky","crank","clearance","bodyguard","anxiety","accountant","abby's","whoops","volunteered","terrorist","tales","talents","stinking","resolved","remotely","protocol","livvie's","garlic","decency","cord","beds","asa's","areas","altogether","uniforms","tremendous","restaurants","rank","profession","popping","philadelphia","outa","observe","lung","largest","hangs","feelin","experts","enforcement","encouraged","economy","dudes","donation","disguise","diane's","curb","continued","competitive","businessman","bites","antique","advertising","ads","toothbrush","retreat","represents","realistic","profits","predict","nora's","lid","landlord","hourglass","hesitate","frank's","focusing","equally","consolation","boyfriend's","babbling","aged","troy's","tipped","stranded","smartest","sabrina's","rhythm","replacement","repeating","puke","psst","paycheck","overreacted","macho","leadership","kendall's","juvenile","john's","images","grocery","freshen","disposal","cuffs","consent","caffeine","arguments","agrees","abigail's","vanished","unfinished","tobacco","tin","syndrome","ripping","pinch","missiles","isolated","flattering","expenses","dinners","cos","colleague","ciao","buh","belthazor","belle's","attorneys","amber's","woulda","whereabouts","wars","waitin","visits","truce","tripped","tee","tasted","stu","steer","ruling","poisoning","nursing","manipulative","immature","husbands","heel","granddad","delivering","deaths","condoms","automatically","anchor","trashed","tournament","throne","raining","prices","pasta","needles","leaning","leaders","judges","ideal","detector","coolest","casting","batch","approximately","appointments","almighty","achieve","vegetables","sum","spark","ruled","revolution","principles","perfection","pains","momma","mole","interviews","initiative","hairs","getaway","employment","den","cracking","counted","compliments","behold","verge","tougher","timer","tapped","taped","stakes","specialty","snooping","shoots","semi","rendezvous","pentagon","passenger","leverage","jeopardize","janitor","grandparents","forbidden","examination","communist","clueless","cities","bidding","arriving","adding","ungrateful","unacceptable","tutor","soviet","shaped","serum","scuse","savings","pub","pajamas","mouths","modest","methods","lure","irrational","depth","cries","classified","bombs","beautifully","arresting","approaching","vessel","variety","traitor","sympathetic","smug","smash","rental","prostitute","premonitions","mild","jumps","inventory","ing","improved","grandfather's","developing","darlin","committing","caleb's","banging","asap","amendment","worms","violated","vent","traumatic","traced","tow","swiss","sweaty","shaft","recommended","overboard","literature","insight","healed","grasp","fluid","experiencing","crappy","crab","connecticut","chunk","chandler's","awww","applied","witnessed","traveled","stain","shack","reacted","pronounce","presented","poured","occupied","moms","marriages","jabez","invested","handful","gob","gag","flipped","fireplace","expertise","embarrassment","disappears","concussion","bruises","brakes","anything's","week's","twisting","tide","swept","summon","splitting","settling","scientists","reschedule","regard","purposes","ohio","notch","mike's","improvement","hooray","grabbing","extend","exquisite","disrespect","complaints","colin's","armor","voting","thornhart","sustained","straw","slapped","simon's","shipped","shattered","ruthless","reva's","refill","recorded","payroll","numb","mourning","marijuana","manly","jerry's","involving","hunk","entertain","earthquake","drift","dreadful","doorstep","confirmation","chops","bridget's","appreciates","announced","vague","tires","stressful","stem","stashed","stash","sensed","preoccupied","predictable","noticing","madly","halls","gunshot","embassy","dozens","dinner's","confuse","cleaners","charade","chalk","cappuccino","breed","bouquet","amulet","addiction","who've","warming","unlock","transition","satisfy","sacrificed","relaxing","lone","input","hampshire","girlfriend's","elaborate","concerning","completed","channels","category","cal","blocking","blend","blankets","america's","addicted","yuck","voters","professionals","positions","monica's","mode","initial","hunger","hamburger","greeting","greet","gravy","gram","dreamt","dice","declared","collecting","caution","brady's","backpack","agreeing","writers","whale","tribe","taller","supervisor","sacrifices","radiation","poo","phew","outcome","ounce","missile","meter","likewise","irrelevant","gran","felon","feature","favorites","farther","fade","experiments","erased","easiest","disk","convenience","conceived","compassionate","challenged","cane","blair's","backstage","agony","adores","veins","tweek","thieves","surgical","strangely","stetson","recital","proposing","productive","meaningful","marching","immunity","hassle","goddamned","frighten","directors","dearly","comments","closure","cease","ambition","wisconsin","unstable","sweetness","salvage","richer","refusing","raging","pumping","pressuring","petition","mortals","lowlife","jus","intimidated","intentionally","inspire","forgave","eric's","devotion","despicable","deciding","dash","comfy","breach","bo's","bark","alternate","aaaah","switching","swallowed","stove","slot","screamed","scars","russians","relevant","poof","pipes","persons","pawn","losses","legit","invest","generations","farewell","experimental","difficulty","curtains","civilized","championship","caviar","boost","token","tends","temporarily","superstition","supernatural","sunk","sadness","reduced","recorder","psyched","presidential","owners","motivated","microwave","lands","karen's","hallelujah","gap","fraternity","engines","dryer","cocoa","chewing","additional","acceptable","unbelievably","survivor","smiled","smelling","sized","simpler","sentenced","respectable","remarks","registration","premises","passengers","organ","occasional","khasinau","indication","gutter","grabs","goo","fulfill","flashlight","ellenor","courses","blooded","blessings","beware","beth's","bands","advised","water's","uhhh","turf","swings","slips","shocking","resistance","privately","olivia's","mirrors","lyrics","locking","instrument","historical","heartless","fras","decades","comparison","childish","cassie's","cardiac","admission","utterly","tuscany","ticked","suspension","stunned","statesville","sadly","resolution","reserved","purely","opponent","noted","lowest","kiddin","jerks","hitch","flirt","fare","extension","establishment","equals","dismiss","delayed","decade","christening","casket","c'mere","breakup","brad's","biting","antibiotics","accusation","abducted","witchcraft","whoever's","traded","thread","spelling","so's","school's","runnin","remaining","punching","protein","printed","paramedics","newest","murdering","mine's","masks","lawndale","intact","ins","initials","heights","grampa","democracy","deceased","colleen's","choking","charms","careless","bushes","buns","bummed","accounting","travels","taylor's","shred","saves","saddle","rethink","regards","references","precinct","persuade","patterns","meds","manipulating","llanfair","leash","kenny's","housing","hearted","guarantees","flown","feast","extent","educated","disgrace","determination","deposition","coverage","corridor","burial","bookstore","boil","abilities","vitals","veil","trespassing","teaches","sidewalk","sensible","punishing","overtime","optimistic","occasions","obsessing","oak","notify","mornin","jeopardy","jaffa","injection","hilarious","distinct","directed","desires","curve","confide","challenging","cautious","alter","yada","wilderness","where're","vindictive","vial","tomb","teeny","subjects","stroll","sittin","scrub","rebuild","rachel's","posters","parallel","ordeal","orbit","o'brien","nuns","max's","jennifer's","intimacy","inheritance","fails","exploded","donate","distracting","despair","democratic","defended","crackers","commercials","bryant's","ammunition","wildwind","virtue","thoroughly","tails","spicy","sketches","sights","sheer","shaving","seize","scarecrow","refreshing","prosecute","possess","platter","phillip's","napkin","misplaced","merchandise","membership","loony","jinx","heroic","frankenstein","fag","efficient","devil's","corps","clan","boundaries","attract","ambitious","virtually","syrup","solitary","resignation","resemblance","reacting","pursuing","premature","pod","liz's","lavery","journalist","honors","harvey's","genes","flashes","erm","contribution","company's","client's","cheque","charts","cargo","awright","acquainted","wrapping","untie","salute","ruins","resign","realised","priceless","partying","myth","moonlight","lightly","lifting","kasnoff","insisting","glowing","generator","flowing","explosives","employer","cutie","confronted","clause","buts","breakthrough","blouse","ballistic","antidote","analyze","allowance","adjourned","vet","unto","understatement","tucked","touchy","toll","subconscious","sequence","screws","sarge","roommates","reaches","rambaldi","programs","offend","nerd","knives","kin","irresistible","inherited","incapable","hostility","goddammit","fuse","frat","equation","curfew","centered","blackmailed","allows","alleged","walkin","transmission","text","starve","sleigh","sarcastic","recess","rebound","procedures","pinned","parlor","outfits","livin","issued","institute","industrial","heartache","head's","haired","fundraiser","doorman","documentary","discreet","dilucca","detect","cracks","cracker","considerate","climbed","catering","author","apophis","zoey","vacuum","urine","tunnels","todd's","tanks","strung","stitches","sordid","sark","referred","protector","portion","phoned","pets","paths","mat","lengths","kindergarten","hostess","flaw","flavor","discharge","deveraux","consumed","confidentiality","automatic","amongst","viktor","victim's","tactics","straightened","specials","spaghetti","soil","prettier","powerless","por","poems","playin","playground","parker's","paranoia","nsa","mainly","mac's","joe's","instantly","havoc","exaggerating","evaluation","eavesdropping","doughnuts","diversion","deepest","cutest","companion","comb","bela","behaving","avoided","anyplace","agh","accessory","zap","whereas","translate","stuffing","speeding","slime","polls","personalities","payments","musician","marital","lurking","lottery","journalism","interior","imaginary","hog","guinea","greetings","game's","fairwinds","ethical","equipped","environmental","elegant","elbow","customs","cuban","credibility","credentials","consistent","collapse","cloth","claws","chopped","challenges","bridal","boards","bedside","babysitting","authorized","assumption","ant","youngest","witty","vast","unforgivable","underworld","tempt","tabs","succeeded","sophomore","selfless","secrecy","runway","restless","programming","professionally","okey","movin","metaphor","messes","meltdown","lecter","incoming","hence","gasoline","gained","funding","episodes","diefenbaker","contain","comedian","collected","cam","buckle","assembly","ancestors","admired","adjustment","acceptance","weekly","warmth","throats","seduced","ridge's","reform","rebecca's","queer","poll","parenting","noses","luckiest","graveyard","gifted","footsteps","dimeras","cynical","assassination","wedded","voyage","volunteers","verbal","unpredictable","tuned","stoop","slides","sinking","show's","rio","rigged","regulations","region","promoted","plumbing","lingerie","layer","katie's","hankey","greed","everwood","essential","elope","dresser","departure","dat","dances","coup","chauffeur","bulletin","bugged","bouncing","website","tubes","temptation","supported","strangest","sorel's","slammed","selection","sarcasm","rib","primitive","platform","pending","partial","packages","orderly","obsessive","nevertheless","nbc","murderers","motto","meteor","inconvenience","glimpse","froze","fiber","execute","etc","ensure","drivers","dispute","damages","crop","courageous","consulate","closes","bosses","bees","amends","wuss","wolfram","wacky","unemployed","traces","town's","testifying","tendency","syringe","symphony","stew","startled","sorrow","sleazy","shaky","screams","rsquo","remark","poke","phone's","philip's","nutty","nobel","mentioning","mend","mayor's","iowa","inspiring","impulsive","housekeeper","germans","formed","foam","fingernails","economic","divide","conditioning","baking","whine","thug","starved","sedative","rose's","reversed","publishing","programmed","picket","paged","nowadays","newman's","mines","margo's","invasion","homosexual","homo","hips","forgets","flipping","flea","flatter","dwell","dumpster","consultant","choo","banking","assignments","apartments","ants","affecting","advisor","vile","unreasonable","tossing","thanked","steals","souvenir","screening","scratched","rep","psychopath","proportion","outs","operative","obstruction","obey","neutral","lump","lily's","insists","ian's","harass","gloat","flights","filth","extended","electronic","edgy","diseases","didn","coroner","confessing","cologne","cedar","bruise","betraying","bailing","attempting","appealing","adebisi","wrath","wandered","waist","vain","traps","transportation","stepfather","publicly","presidents","poking","obligated","marshal","lexie's","instructed","heavenly","halt","employed","diplomatic","dilemma","crazed","contagious","coaster","cheering","carved","bundle","approached","appearances","vomit","thingy","stadium","speeches","robbing","reflect","raft","qualify","pumped","pillows","peep","pageant","packs","neo","neglected","m'kay","loneliness","liberal","intrude","indicates","helluva","gardener","freely","forresters","err","drooling","continuing","betcha","alan's","addressed","acquired","vase","supermarket","squat","spitting","spaces","slaves","rhyme","relieve","receipts","racket","purchased","preserve","pictured","pause","overdue","officials","nod","motivation","morgendorffer","lucky's","lacking","kidnapper","introduction","insect","hunters","horns","feminine","eyeballs","dumps","disc","disappointing","difficulties","crock","convertible","context","claw","clamp","canned","cambias","bathtub","avanya","artery","weep","warmer","vendetta","tenth","suspense","summoned","stuff's","spiders","sings","reiber","raving","pushy","produced","poverty","postponed","ohhhh","noooo","mold","mice","laughter","incompetent","hugging","groceries","frequency","fastest","drip","differ","daphne's","communicating","body's","beliefs","bats","bases","auntie","adios","wraps","willingly","weirdest","voila","timmih","thinner","swelling","swat","steroids","sensitivity","scrape","rehearse","quarterback","organic","matched","ledge","justified","insults","increased","heavily","hateful","handles","feared","doorway","decorations","colour","chatting","buyer","buckaroo","bedrooms","batting","askin","ammo","tutoring","subpoena","span","scratching","requests","privileges","pager","mart","kel","intriguing","idiotic","hotels","grape","enlighten","dum","door's","dixie's","demonstrate","dairy","corrupt","combined","brunch","bridesmaid","barking","architect","applause","alongside","ale","acquaintance","yuh","wretched","superficial","sufficient","sued","soak","smoothly","sensing","restraint","quo","pow","posing","pleading","pittsburgh","peru","payoff","participate","organize","oprah","nemo","morals","loans","loaf","lists","laboratory","jumpy","intervention","ignorant","herbal","hangin","germs","generosity","flashing","country's","convent","clumsy","chocolates","captive","bianca's","behaved","apologise","vanity","trials","stumbled","republicans","represented","recognition","preview","poisonous","perjury","parental","onboard","mugged","minding","linen","learns","knots","interviewing","inmates","ingredients","humour","grind","greasy","goons","estimate","elementary","edmund's","drastic","database","coop","comparing","cocky","clearer","bruised","brag","bind","axe","asset","apparent","ann's","worthwhile","whoop","wedding's","vanquishing","tabloids","survivors","stenbeck's","sprung","spotlight","shops","sentencing","sentences","revealing","reduce","ram","racist","provoke","piper's","pining","overly","oui","ops","mop","louisiana","locket","king's","jab","imply","impatient","hovering","hotter","fest","endure","dots","doren","dim","diagnosed","debts","cultures","crawled","contained","condemned","chained","brit","breaths","adds","weirdo","warmed","wand","utah","troubling","tok'ra","stripped","strapped","soaked","skipping","sharon's","scrambled","rattle","profound","musta","mocking","mnh","misunderstand","merit","loading","linked","limousine","kacl","investors","interviewed","hustle","forensic","foods","enthusiastic","duct","drawers","devastating","democrats","conquer","concentration","comeback","clarify","chores","cheerleaders","cheaper","charlie's","callin","blushing","barging","abused","yoga","wrecking","wits","waffles","virginity","vibes","uninvited","unfaithful","underwater","tribute","strangled","state's","scheming","ropes","responded","residents","rescuing","rave","priests","postcard","overseas","orientation","ongoing","o'reily","newly","neil's","morphine","lotion","limitations","lesser","lectures","lads","kidneys","judgement","jog","itch","intellectual","installed","infant","indefinitely","grenade","glamorous","genetically","freud","faculty","engineering","doh","discretion","delusions","declaration","crate","competent","commonwealth","catalog","bakery","attempts","asylum","argh","applying","ahhhh","yesterday's","wedge","wager","unfit","tripping","treatments","torment","superhero","stirring","spinal","sorority","seminar","scenery","repairs","rabble","pneumonia","perks","owl","override","ooooh","moo","mija","manslaughter","mailed","love's","lime","lettuce","intimidate","instructor","guarded","grieve","grad","globe","frustration","extensive","exploring","exercises","eve's","doorbell","devices","deal's","dam","cultural","ctu","credits","commerce","chinatown","chemicals","baltimore","authentic","arraignment","annulled","altered","allergies","wanta","verify","vegetarian","tunes","tourist","tighter","telegram","suitable","stalk","specimen","spared","solving","shoo","satisfying","saddam","requesting","publisher","pens","overprotective","obstacles","notified","negro","nasedo","judged","jill's","identification","grandchild","genuinely","founded","flushed","fluids","floss","escaping","ditched","demon's","decorated","criticism","cramp","corny","contribute","connecting","bunk","bombing","bitten","billions","bankrupt","yikes","wrists","ultrasound","ultimatum","thirst","spelled","sniff","scope","ross's","room's","retrieve","releasing","reassuring","pumps","properties","predicted","neurotic","negotiating","needn't","multi","monitors","millionaire","microphone","mechanical","lydecker","limp","incriminating","hatchet","gracias","gordie","fills","feeds","egypt","doubting","dedication","decaf","dawson's","competing","cellular","biopsy","whiz","voluntarily","visible","ventilator","unpack","unload","universal","tomatoes","targets","suggests","strawberry","spooked","snitch","schillinger","sap","reassure","providing","prey","pressure's","persuasive","mystical","mysteries","mri","moment's","mixing","matrimony","mary's","mails","lighthouse","liability","kgb","jock","headline","frankie's","factors","explosive","explanations","dispatch","detailed","curly","cupid","condolences","comrade","cassadines","bulb","brittany's","bragging","awaits","assaulted","ambush","adolescent","adjusted","abort","yank","whit","verse","vaguely","undermine","tying","trim","swamped","stitch","stan's","stabbing","slippers","skye's","sincerely","sigh","setback","secondly","rotting","rev","retail","proceedings","preparation","precaution","pox","pcpd","nonetheless","melting","materials","mar","liaison","hots","hooking","headlines","hag","ganz","fury","felicity","fangs","expelled","encouragement","earring","dreidel","draws","dory","donut","dog's","dis","dictate","dependent","decorating","coordinates","cocktails","bumps","blueberry","believable","backfired","backfire","apron","anticipated","adjusting","activated","vous","vouch","vitamins","vista","urn","uncertain","ummm","tourists","tattoos","surrounding","sponsor","slimy","singles","sibling","shhhh","restored","representative","renting","reign","publish","planets","peculiar","parasite","paddington","noo","marries","mailbox","magically","lovebirds","listeners","knocks","kane's","informant","grain","exits","elf","drazen","distractions","disconnected","dinosaurs","designing","dashwood","crooked","conveniently","contents","argued","wink","warped","underestimated","testified","tacky","substantial","steve's","steering","staged","stability","shoving","seizure","reset","repeatedly","radius","pushes","pitching","pairs","opener","mornings","mississippi","matthew's","mash","investigations","invent","indulge","horribly","hallucinating","festive","eyebrows","expand","enjoys","dictionary","dialogue","desperation","dealers","darkest","daph","critic","consulting","cartman's","canal","boragora","belts","bagel","authorization","auditions","associated","ape","amy's","agitated","adventures","withdraw","wishful","wimp","vehicles","vanish","unbearable","tonic","tom's","tackle","suffice","suction","slaying","singapore","safest","rosanna's","rocking","relive","rates","puttin","prettiest","oval","noisy","newlyweds","nauseous","moi","misguided","mildly","midst","maps","liable","kristina's","judgmental","introducing","individuals","hunted","hen","givin","frequent","fisherman","fascinated","elephants","dislike","diploma","deluded","decorate","crummy","contractions","carve","careers","bottled","bonded","bahamas","unavailable","twenties","trustworthy","translation","traditions","surviving","surgeons","stupidity","skies","secured","salvation","remorse","rafe's","princeton","preferably","pies","photography","operational","nuh","northwest","nausea","napkins","mule","mourn","melted","mechanism","mashed","julia's","inherit","holdings","hel","greatness","golly","excused","edges","dumbo","drifting","delirious","damaging","cubicle","compelled","comm","colleges","cole's","chooses","checkup","chad's","certified","candidates","boredom","bob's","bandages","baldwin's","bah","automobile","athletic","alarms","absorbed","absent","windshield","who're","whaddya","vitamin","transparent","surprisingly","sunglasses","starring","slit","sided","schemes","roar","relatively","reade","quarry","prosecutor","prognosis","probe","potentially","pitiful","persistent","perception","percentage","peas","oww","nosy","neighbourhood","nagging","morons","molecular","meters","masterpiece","martinis","limbo","liars","jax's","irritating","inclined","hump","hoynes","haw","gauge","functions","fiasco","educational","eatin","donated","destination","dense","cubans","continent","concentrating","commanding","colorful","clam","cider","brochure","behaviour","barto","bargaining","awe","artistic","welcoming","weighing","villain","vein","vanquished","striking","stains","sooo","smear","sire","simone's","secondary","roughly","rituals","resentment","psychologist","preferred","pint","pension","passive","overhear","origin","orchestra","negotiations","mounted","morality","landingham","labs","kisser","jackson's","icy","hoot","holling","handshake","grilled","functioning","formality","elevators","edward's","depths","confirms","civilians","bypass","briefly","boathouse","binding","acres","accidental","westbridge","wacko","ulterior","transferring","tis","thugs","tangled","stirred","stefano's","sought","snag","smallest","sling","sleaze","seeds","rumour","ripe","remarried","reluctant","regularly","puddle","promote","precise","popularity","pins","perceptive","miraculous","memorable","maternal","lucinda's","longing","lockup","locals","librarian","job's","inspection","impressions","immoral","hypothetically","guarding","gourmet","gabe","fighters","fees","features","faxed","extortion","expressed","essentially","downright","digest","der","crosses","cranberry","city's","chorus","casualties","bygones","buzzing","burying","bikes","attended","allah","all's","weary","viewing","viewers","transmitter","taping","takeout","sweeping","stepmother","stating","stale","seating","seaborn","resigned","rating","prue's","pros","pepperoni","ownership","occurs","nicole's","newborn","merger","mandatory","malcolm's","ludicrous","jan's","injected","holden's","henry's","heating","geeks","forged","faults","expressing","eddie's","drue","dire","dief","desi","deceiving","centre","celebrities","caterer","calmed","businesses","budge","ashley's","applications","ankles","vending","typing","tribbiani","there're","squared","speculation","snowing","shades","sexist","scudder's","scattered","sanctuary","rewrite","regretted","regain","raises","processing","picky","orphan","mural","misjudged","miscarriage","memorize","marshall's","mark's","licensed","lens","leaking","launched","larry's","languages","judge's","jitters","invade","interruption","implied","illegally","handicapped","glitch","gittes","finer","fewer","engineered","distraught","dispose","dishonest","digs","dahlia's","dads","cruelty","conducting","clinical","circling","champions","canceling","butterflies","belongings","barbrady","amusement","allegations","alias","aging","zombies","where've","unborn","tri","swearing","stables","squeezed","spaulding's","slavery","sew","sensational","revolutionary","resisting","removing","radioactive","races","questionable","privileged","portofino","par","owning","overlook","overhead","orson","oddly","nazis","musicians","interrogate","instruments","imperative","impeccable","icu","hurtful","hors","heap","harley's","graduating","graders","glance","endangered","disgust","devious","destruct","demonstration","creates","crazier","countdown","coffee's","chump","cheeseburger","cat's","burglar","brotherhood","berries","ballroom","assumptions","ark","annoyed","allies","allergy","advantages","admirer","admirable","addresses","activate","accompany","wed","victoria's","valve","underpants","twit","triggered","teacher's","tack","strokes","stool","starr's","sham","seasons","sculpture","scrap","sailed","retarded","resourceful","remarkably","refresh","ranks","pressured","precautions","pointy","obligations","nightclub","mustache","month's","minority","mind's","maui","lace","isabella's","improving","iii","hunh","hubby","flare","fierce","farmers","dont","dokey","divided","demise","demanded","dangerously","crushing","considerable","complained","clinging","choked","chem","cheerleading","checkbook","cashmere","calmly","blush","believer","aspect","amazingly","alas","acute","a's","yak","whores","what've","tuition","trey's","tolerance","toilets","tactical","tacos","stairwell","spur","spirited","slower","sewing","separately","rubbed","restricted","punches","protects","partially","ole","nuisance","niagara","motherfuckers","mingle","mia's","kynaston","knack","kinkle","impose","hosting","harry's","gullible","grid","godmother","funniest","friggin","folding","financially","filming","fashions","eater","dysfunctional","drool","distinguished","defence","defeated","cruising","crude","criticize","corruption","contractor","conceive","clone","circulation","cedars","caliber","brighter","blinded","birthdays","bio","bill's","banquet","artificial","anticipate","annoy","achievement","whim","whichever","volatile","veto","vested","uncle's","supports","successfully","shroud","severely","rests","representation","quarantine","premiere","pleases","parent's","painless","pads","orphans","orphanage","offence","obliged","nip","niggers","negotiation","narcotics","nag","mistletoe","meddling","manifest","lookit","loo","lilah","investigated","intrigued","injustice","homicidal","hayward's","gigantic","exposing","elves","disturbance","disastrous","depended","demented","correction","cooped","colby's","cheerful","buyers","brownies","beverage","basics","attorney's","atm","arvin","arcade","weighs","upsets","unethical","tidy","swollen","sweaters","swap","stupidest","sensation","scalpel","rail","prototype","props","prescribed","pompous","poetic","ploy","paws","operates","objections","mushrooms","mulwray","monitoring","manipulation","lured","lays","lasting","kung","keg","jell","internship","insignificant","inmate","incentive","gandhi","fulfilled","flooded","expedition","evolution","discharged","disagreement","dine","dean's","crypt","coroner's","cornered","copied","confrontation","cds","catalogue","brightest","beethoven","banned","attendant","athlete","amaze","airlines","yogurt","wyndemere","wool","vocabulary","vcr","tulsa","tags","tactic","stuffy","slug","sexuality","seniors","segment","revelation","respirator","pulp","prop","producing","processed","pretends","polygraph","perp","pennies","ordinarily","opposition","olives","necks","morally","martyr","martial","lisa's","leftovers","joints","jimmy's","irs","invaded","imported","hopping","homey","hints","helicopters","heed","heated","heartbroken","gulf","greatly","forge","florist","firsthand","fiend","expanding","emma's","defenses","crippled","cousin's","corrected","conniving","conditioner","clears","chemo","bubbly","bladder","beeper","baptism","apb","answer's","anna's","angles","ache","womb","wiring","wench","weaknesses","volunteering","violating","unlocked","unemployment","tummy","tibet","threshold","surrogate","submarine","subid","stray","stated","startle","specifics","snob","slowing","sled","scoot","robbers","rightful","richest","quid","qfxmjrie","puffs","probable","pitched","pierced","pencils","paralysis","nuke","managing","makeover","luncheon","lords","linksynergy","jury's","jacuzzi","ish","interstate","hitched","historic","hangover","gasp","fracture","flock","firemen","drawings","disgusted","darned","coal","clams","chez","cables","broadcasting","brew","borrowing","banged","achieved","wildest","weirder","unauthorized","stunts","sleeves","sixties","shush","shalt","senora","rises","retro","quits","pupils","politicians","pegged","painfully","paging","outlet","omelet","observed","ned's","memorized","lawfully","jackets","interpretation","intercept","ingredient","grownup","glued","gaining","fulfilling","flee","enchanted","dvd","delusion","daring","conservative","conducted","compelling","charitable","carton","bronx","bridesmaids","bribed","boiling","bathrooms","bandage","awareness","awaiting","assign","arrogance","antiques","ainsley","turkeys","travelling","trashing","tic","takeover","sync","supervision","stockings","stalked","stabilized","spacecraft","slob","skates","sirs","sedated","robes","reviews","respecting","rat's","psyche","prominent","prizes","presumptuous","prejudice","platoon","permitted","paragraph","mush","mum's","movements","mist","missions","mints","mating","mantan","lorne","lord's","loads","listener","legendary","itinerary","hugs","hepatitis","heave","guesses","gender","flags","fading","exams","examining","elizabeth's","egyptian","dumbest","dishwasher","dimera's","describing","deceive","cunning","cripple","cove","convictions","congressional","confided","compulsive","compromising","burglary","bun","bumpy","brainwashed","benes","arnie","alvy","affirmative","adrenaline","adamant","watchin","waitresses","uncommon","treaty","transgenic","toughest","toby's","surround","stormed","spree","spilling","spectacle","soaking","significance","shreds","sewers","severed","scarce","scamming","scalp","sami's","salem's","rewind","rehearsing","pretentious","potions","possessions","planner","placing","periods","overrated","obstacle","notices","nerds","meems","medieval","mcmurphy","maturity","maternity","masses","maneuver","lyin","loathe","lawyer's","irv","investigators","hep","grin","gospel","gals","formation","fertility","facilities","exterior","epidemic","eloping","ecstatic","ecstasy","duly","divorcing","distribution","dignan","debut","costing","coaching","clubhouse","clot","clocks","classical","candid","bursting","breather","braces","bennett's","bending","australian","attendance","arsonist","applies","adored","accepts","absorb","vacant","uuh","uphold","unarmed","turd","topolsky","thrilling","thigh","terminate","tempo","sustain","spaceship","snore","sneeze","smuggling","shrine","sera","scott's","salty","salon","ramp","quaint","prostitution","prof","policies","patronize","patio","nasa","morbid","marlo's","mamma","locations","licence","kettle","joyous","invincible","interpret","insecurities","insects","inquiry","infamous","impulses","illusions","holed","glen's","fragments","forrester's","exploit","economics","drivin","des","defy","defenseless","dedicate","cradle","cpr","coupon","countless","conjure","confined","celebrated","cardboard","booking","blur","bleach","ban","backseat","austin's","alternatives","afterward","accomplishment","wordsworth","wisely","wildlife","valet","vaccine","urges","unnatural","unlucky","truths","traumatized","tit","tennessee","tasting","swears","strawberries","steaks","stats","skank","seducing","secretive","screwdriver","schedules","rooting","rightfully","rattled","qualifies","puppets","provides","prospects","pronto","prevented","powered","posse","poorly","polling","pedestal","palms","muddy","morty","miniature","microscope","merci","margin","lecturing","inject","incriminate","hygiene","hospital's","grapefruit","gazebo","funnier","freight","flooding","equivalent","eliminated","elaine's","dios","deacon's","cuter","continental","container","cons","compensation","clap","cbs","cavity","caves","capricorn","canvas","calculations","bossy","booby","bacteria","aides","zende","winthrop","wider","warrants","valentines","undressed","underage","truthfully","tampered","suffers","stored","statute","speechless","sparkling","sod","socially","sidelines","shrek","sank","roy's","raul's","railing","puberty","practices","pesky","parachute","outrage","outdoors","operated","openly","nominated","motions","moods","lunches","litter","kidnappers","itching","intuition","index","imitation","icky","humility","hassling","gallons","firmly","excessive","evolved","employ","eligible","elections","elderly","drugstore","dosage","disrupt","directing","dipping","deranged","debating","cuckoo","cremated","craziness","cooperating","compatible","circumstantial","chimney","bonnie's","blinking","biscuits","belgium","arise","analyzed","admiring","acquire","accounted","willow's","weeping","volumes","views","triad","trashy","transaction","tilt","soothing","slumber","slayers","skirts","siren","ship's","shindig","sentiment","sally's","rosco","riddance","rewarded","quaid","purity","proceeding","pretzels","practiced","politician","polar","panicking","overall","occupation","naming","minimal","mckechnie","massacre","marah's","lovin","leaked","layers","isolation","intruding","impersonating","ignorance","hoop","hamburgers","gwen's","fruits","footprints","fluke","fleas","festivities","fences","feisty","evacuate","emergencies","diabetes","detained","democrat","deceived","creeping","craziest","corpses","conned","coincidences","charleston","bums","brussels","bounced","bodyguards","blasted","bitterness","baloney","ashtray","apocalypse","advances","zillion","watergate","wallpaper","viable","tory's","tenants","telesave","sympathize","sweeter","swam","sup","startin","stages","spencer's","sodas","snowed","sleepover","signor","seein","reviewing","reunited","retainer","restroom","rested","replacing","repercussions","reliving","reef","reconciliation","reconcile","recognise","prevail","preaching","planting","overreact","oof","omen","o'neil","numerous","noose","moustache","morning's","manicure","maids","mah","lorelei's","landlady","hypothetical","hopped","homesick","hives","hesitation","herbs","hectic","heartbreak","haunting","gangs","frown","fingerprint","extract","expired","exhausting","exchanged","exceptional","everytime","encountered","disregard","daytime","cooperative","constitutional","cling","chevron","chaperone","buenos","blinding","bitty","beads","battling","badgering","anticipation","advocate","zander's","waterfront","upstanding","unprofessional","unity","unhealthy","undead","turmoil","truthful","toothpaste","tippin","thoughtless","tagataya","stretching","strategic","spun","shortage","shooters","sheriff's","shady","senseless","sailors","rewarding","refuge","rapid","rah","pun","propane","pronounced","preposterous","pottery","portable","pigeons","pastry","overhearing","ogre","obscene","novels","negotiable","mtv","morgan's","monthly","loner","leisure","leagues","jogging","jaws","itchy","insinuating","insides","induced","immigration","hospitality","hormone","hilda's","hearst","grandpa's","frequently","forthcoming","fists","fifties","etiquette","endings","elevated","editing","dunk","distinction","disabled","dibs","destroys","despises","desired","designers","deprived","dancers","dah","cuddy","crust","conductor","communists","cloak","circumstance","chewed","casserole","bora","bidder","bearer","assessment","artoo","applaud","appalling","amounts","admissions","withdrawal","weights","vowed","virgins","vigilante","vatican","undone","trench","touchdown","throttle","thaw","tha","testosterone","tailor","symptom","swoop","suited","suitcases","stomp","sticker","stakeout","spoiling","snatched","smoochy","smitten","shameless","restraints","researching","renew","relay","regional","refund","reclaim","rapids","raoul","rags","puzzles","purposely","punks","prosecuted","plaid","pineapple","picturing","pickin","pbs","parasites","offspring","nyah","mysteriously","multiply","mineral","masculine","mascara","laps","kramer's","jukebox","interruptions","hoax","gunfire","gays","furnace","exceptions","engraved","elbows","duplicate","drapes","designated","deliberate","deli","decoy","cub","cryptic","crowds","critics","coupla","convert","conventional","condemn","complicate","combine","colossal","clerks","clarity","cassadine's","byes","brushed","bride's","banished","arrests","argon","andy's","alarmed","worships","versa","uncanny","troop","treasury","transformation","terminated","telescope","technicality","sydney's","sundae","stumble","stripping","shuts","separating","schmuck","saliva","robber","retain","remained","relentless","reconnect","recipes","rearrange","ray's","rainy","psychiatrists","producers","policemen","plunge","plugged","patched","overload","ofc","obtained","obsolete","o'malley","numbered","number's","nay","moth","module","mkay","mindless","menus","lullaby","lotte","leavin","layout","knob","killin","karinsky","irregular","invalid","hides","grownups","griff","flaws","flashy","flaming","fettes","evicted","epic","encoded","dread","dil","degrassi","dealings","dangers","cushion","console","concluded","casey's","bowel","beginnings","barged","apes","announcing","amanda's","admits","abroad","abide","abandoning","workshop","wonderfully","woak","warfare","wait'll","wad","violate","turkish","tim's","ter","targeted","susan's","suicidal","stayin","sorted","slamming","sketchy","shoplifting","shapes","selected","sarah's","retiring","raiser","quizmaster","pursued","pupkin","profitable","prefers","politically","phenomenon","palmer's","olympics","needless","nature's","mutt","motherhood","momentarily","migraine","lizzie's","lilo","lifts","leukemia","leftover","law's","keepin","idol","hinks","hellhole","h'mm","gowns","goodies","gallon","futures","friction","finale","farms","extraction","entertained","electronics","eighties","earth's","dmv","darker","daniel's","cum","conspiring","consequence","cheery","caps","calf","cadet","builds","benign","barney's","aspects","artillery","apiece","allison's","aggression","adjustments","abusive","abduction","wiping","whipping","welles","unspeakable","unlimited","unidentified","trivial","transcripts","threatens","textbook","tenant","supervise","superstitious","stricken","stretched","story's","stimulating","steep","statistics","spielberg","sodium","slices","shelves","scratches","saudi","sabotaged","roxy's","retrieval","repressed","relation","rejecting","quickie","promoting","ponies","peeking","paw","paolo","outraged","observer","o'connell","moping","moaning","mausoleum","males","licked","kovich","klutz","iraq","interrogating","interfered","intensive","insulin","infested","incompetence","hyper","horrified","handedly","hacked","guiding","glamour","geoff","gekko","fraid","fractured","formerly","flour","firearms","fend","executives","examiner","evaluate","eloped","duke's","disoriented","delivers","dashing","crystals","crossroads","crashdown","court's","conclude","coffees","cockroach","climate","chipped","camps","brushing","boulevard","bombed","bolts","begs","baths","baptized","astronaut","assurance","anemia","allegiance","aiming","abuela","abiding","workplace","withholding","weave","wearin","weaker","warnings","usa","tours","thesis","terrorism","suffocating","straws","straightforward","stench","steamed","starboard","sideways","shrinks","shortcut","sean's","scram","roasted","roaming","riviera","respectfully","repulsive","recognizes","receiver","psychiatry","provoked","penitentiary","peed","pas","painkillers","oink","norm","ninotchka","muslim","montgomery's","mitzvah","milligrams","mil","midge","marshmallows","markets","macy's","looky","lapse","kubelik","knit","jeb","investments","intellect","improvise","implant","hometown","hanged","handicap","halo","governor's","goa'ulds","giddy","gia's","geniuses","fruitcake","footing","flop","findings","fightin","fib","editorial","drinkin","doork","discovering","detour","danish","cuddle","crashes","coordinate","combo","colonnade","collector","cheats","cetera","canadians","bip","bailiff","auditioning","assed","amused","alienate","algebra","alexi","aiding","aching","woe","wah","unwanted","typically","tug","topless","tongues","tiniest","them's","symbols","superiors","soy","soften","sheldrake","sensors","seller","seas","ruler","rival","rips","renowned","recruiting","reasoning","rawley","raisins","racial","presses","preservation","portfolio","oversight","organizing","obtain","observing","nessa","narrowed","minions","midwest","meth","merciful","manages","magistrate","lawsuits","labour","invention","intimidating","infirmary","indicated","inconvenient","imposter","hugged","honoring","holdin","hades","godforsaken","fumes","forgery","foremost","foolproof","folder","folded","flattery","fingertips","financing","fifteenth","exterminator","explodes","eccentric","drained","dodging","documented","disguised","developments","currency","crafts","constructive","concealed","compartment","chute","chinpokomon","captains","capitol","calculated","buses","bodily","astronauts","alimony","accustomed","accessories","abdominal","zen","zach's","wrinkle","wallow","viv","vicinity","venue","valued","valium","valerie's","upgrade","upcoming","untrue","uncover","twig","twelfth","trembling","treasures","torched","toenails","timed","termites","telly","taunting","taransky","tar","talker","succubus","statues","smarts","sliding","sizes","sighting","semen","seizures","scarred","savvy","sauna","saddest","sacrificing","rubbish","riled","ricky's","rican","revive","recruit","ratted","rationally","provenance","professors","prestigious","pms","phonse","perky","pedal","overdose","organism","nasal","nanites","mushy","movers","moot","missus","midterm","merits","melodramatic","manure","magnetic","knockout","knitting","jig","invading","interpol","incapacitated","idle","hotline","horse's","highlight","hauling","hair's","gunpoint","greenwich","grail","ganza","framing","formally","fleeing","flap","flannel","fin","fibers","faded","existing","email","eavesdrop","dwelling","dwarf","donations","detected","desserts","dar","corporations","constellation","collision","chic","calories","businessmen","buchanan's","breathtaking","bleak","blacked","batter","balanced","ante","aggravated","agencies","abu","yanked","wuh","withdrawn","wigand","whoah","wham","vocal","unwind","undoubtedly","unattractive","twitch","trimester","torrance","timetable","taxpayers","strained","stationed","stared","slapping","sincerity","signatures","siding","siblings","shit's","shenanigans","shacking","seer","satellites","sappy","samaritan","rune","regained","rebellion","proceeds","privy","power's","poorer","politely","paste","oysters","overruled","olaf","nightcap","networks","necessity","mosquito","millimeter","michelle's","merrier","massachusetts","manuscript","manufacture","manhood","lunar","lug","lucked","loaned","kilos","ignition","hurl","hauled","harmed","goodwill","freshmen","forming","fenmore","fasten","farce","failures","exploding","erratic","elm","drunks","ditching","d'artagnan","crops","cramped","contacting","coalition","closets","clientele","chimp","cavalry","casa","cabs","bled","bargained","arranging","archives","anesthesia","amuse","altering","afternoons","accountable","abetting","wrinkles","wolek","waved","unite","uneasy","unaware","ufo","toot","toddy","tens","tattooed","tad's","sway","stained","spauldings","solely","sliced","sirens","schibetta","scatter","rumours","roger's","robbie's","rinse","remo","remedy","redemption","queen's","progressive","pleasures","picture's","philosopher","pacey's","optimism","oblige","natives","muy","measuring","measured","masked","mascot","malicious","mailing","luca","lifelong","kosher","koji","kiddies","judas","isolate","intercepted","insecurity","initially","inferior","incidentally","ifs","hun","heals","headlights","guided","growl","grilling","glazed","gem","gel","gaps","fundamental","flunk","floats","fiery","fairness","exercising","excellency","evenings","ere","enrolled","disclosure","det","department's","damp","curling","cupboard","counterfeit","cooling","condescending","conclusive","clicked","cleans","cholesterol","chap","cashed","brow","broccoli","brats","blueprints","blindfold","biz","billing","barracks","attach","aquarium","appalled","altitude","alrighty","aimed","yawn","xander's","wynant","winslow's","welcomed","violations","upright","unsolved","unreliable","toots","tighten","symbolic","sweatshirt","steinbrenner","steamy","spouse","sox","sonogram","slowed","slots","sleepless","skeleton","shines","roles","retaliate","representatives","rephrase","repeated","renaissance","redeem","rapidly","rambling","quilt","quarrel","prying","proverbial","priced","presiding","presidency","prescribe","prepped","pranks","possessive","plaintiff","philosophical","pest","persuaded","perk","pediatrics","paige's","overlooked","outcast","oop","odor","notorious","nightgown","mythology","mumbo","monitored","mediocre","master's","mademoiselle","lunchtime","lifesaver","legislation","leaned","lambs","lag","killings","interns","intensity","increasing","identities","hounding","hem","hellmouth","goon","goner","ghoul","germ","gardening","frenzy","foyer","food's","extras","extinct","exhibition","exaggerate","everlasting","enlightened","drilling","doubles","digits","dialed","devote","defined","deceitful","d'oeuvres","csi","cosmetic","contaminated","conspired","conning","colonies","cerebral","cavern","cathedral","carving","butting","boiled","blurry","beams","barf","babysit","assistants","ascension","architecture","approaches","albums","albanian","aaaaah","wildly","whoopee","whiny","weiskopf","walkie","vultures","veteran","vacations","upfront","unresolved","tile","tampering","struggled","stockholders","specially","snaps","sleepwalking","shrunk","sermon","seeks","seduction","scenarios","scams","ridden","revolve","repaired","regulation","reasonably","reactor","quotes","preserved","phenomenal","patrolling","paranormal","ounces","omigod","offs","nonstop","nightfall","nat","militia","meeting's","logs","lineup","libby's","lava","lashing","labels","kilometers","kate's","invites","investigative","innocents","infierno","incision","import","implications","humming","highlights","haunts","greeks","gloss","gloating","general's","frannie","flute","fled","fitted","finishes","fiji","fetal","feeny","entrapment","edit","dyin","download","discomfort","dimensions","detonator","dependable","deke","decree","dax","cot","confiscated","concludes","concede","complication","commotion","commence","chulak","caucasian","casually","canary","brainer","bolie","ballpark","arm's","anwar","anatomy","analyzing","accommodations","yukon","youse","wring","wharf","wallowing","uranium","unclear","treason","transgenics","thrive","think's","thermal","territories","tedious","survives","stylish","strippers","sterile","squeezing","squeaky","sprained","solemn","snoring","sic","shifting","shattering","shabby","seams","scrawny","rotation","risen","revoked","residue","reeks","recite","reap","ranting","quoting","primal","pressures","predicament","precision","plugs","pits","pinpoint","petrified","petite","persona","pathological","passports","oughtta","nods","nighter","navigate","nashville","namely","museums","morale","milwaukee","meditation","mathematics","martin's","malta","logan's","latter","kippie","jackie's","intrigue","intentional","insufferable","incomplete","inability","imprisoned","hup","hunky","how've","horrifying","hearty","headmaster","hath","har","hank's","handbook","hamptons","grazie","goof","george's","funerals","fuck's","fraction","forks","finances","fetched","excruciating","enjoyable","enhanced","enhance","endanger","efficiency","dumber","drying","diabolical","destroyer","desirable","defendants","debris","darts","cuisine","cucumber","cube","crossword","contestant","considers","comprehend","club's","clipped","classmates","choppers","certificates","carmen's","canoe","candlelight","building's","brutally","brutality","boarded","bathrobe","backward","authorize","audrey's","atom","assemble","appeals","airports","aerobics","ado","abbott's","wholesome","whiff","vessels","vermin","varsity","trophies","trait","tragically","toying","titles","tissues","testy","team's","tasteful","surge","sun's","studios","strips","stocked","stephen's","staircase","squares","spinach","sow","southwest","southeast","sookie's","slayer's","sipping","singers","sidetracked","seldom","scrubbing","scraping","sanctity","russell's","ruse","robberies","rink","ridin","retribution","reinstated","refrain","rec","realities","readings","radiant","protesting","projector","posed","plutonium","plaque","pilar's","payin","parting","pans","o'reilly","nooooo","motorcycles","motherfucking","mein","measly","marv","manic","line's","lice","liam","lenses","lama","lalita","juggling","jerking","jamie's","intro","inevitably","imprisonment","hypnosis","huddle","horrendous","hobbies","heavier","heartfelt","harlin","hairdresser","grub","gramps","gonorrhea","gardens","fussing","fragment","fleeting","flawless","flashed","fetus","exclusively","eulogy","equality","enforce","distinctly","disrespectful","denies","crossbow","crest","cregg","crabs","cowardly","countess","contrast","contraction","contingency","consulted","connects","confirming","condone","coffins","cleansing","cheesecake","certainty","captain's","cages","c'est","briefed","brewing","bravest","bosom","boils","binoculars","bachelorette","aunt's","atta","assess","appetizer","ambushed","alerted","woozy","withhold","weighed","vulgar","viral","utmost","unusually","unleashed","unholy","unhappiness","underway","uncovered","unconditional","typewriter","typed","twists","sweeps","supervised","supermodel","suburbs","subpoenaed","stringing","snyder's","snot","skeptical","skateboard","shifted","secret's","scottish","schoolgirl","romantically","rocked","revoir","reviewed","respiratory","reopen","regiment","reflects","refined","puncture","pta","prone","produces","preach","pools","polished","pods","planetarium","penicillin","peacefully","partner's","nurturing","nation's","more'n","monastery","mmhmm","midgets","marklar","machinery","lodged","lifeline","joanna's","jer","jellyfish","infiltrate","implies","illegitimate","hutch","horseback","henri","heist","gents","frickin","freezes","forfeit","followers","flakes","flair","fathered","fascist","eternally","eta","epiphany","enlisted","eleventh","elect","effectively","dos","disgruntled","discrimination","discouraged","delinquent","decipher","danvers","dab","cubes","credible","coping","concession","cnn","clash","chills","cherished","catastrophe","caretaker","bulk","bras","branches","bombshell","birthright","billionaire","awol","ample","alumni","affections","admiration","abbotts","zelda's","whatnot","watering","vinegar","vietnamese","unthinkable","unseen","unprepared","unorthodox","underhanded","uncool","transmitted","traits","timeless","thump","thermometer","theoretically","theoretical","testament","tapping","tagged","tac","synthetic","syndicate","swung","surplus","supplier","stares","spiked","soviets","solves","smuggle","scheduling","scarier","saucer","reinforcements","recruited","rant","quitter","prudent","projection","previously","powdered","poked","pointers","placement","peril","penetrate","penance","patriotic","passions","opium","nudge","nostrils","nevermind","neurological","muslims","mow","momentum","mockery","mobster","mining","medically","magnitude","maggie's","loudly","listing","killer's","kar","jim's","insights","indicted","implicate","hypocritical","humanly","holiness","healthier","hammered","haldeman","gunman","graphic","gloom","geography","gary's","freshly","francs","formidable","flunked","flawed","feminist","faux","ewww","escorted","escapes","emptiness","emerge","drugging","dozer","doc's","directorate","diana's","derevko","deprive","deodorant","cryin","crusade","crocodile","creativity","controversial","commands","coloring","colder","cognac","clocked","clippings","christine's","chit","charades","chanting","certifiable","caterers","brute","brochures","briefs","bran","botched","blinders","bitchin","bauer's","banter","babu","appearing","adequate","accompanied","abrupt","abdomen","zones","wooo","woken","winding","vip","venezuela","unanimous","ulcer","tread","thirteenth","thankfully","tame","tabby's","swine","swimsuit","swans","suv","stressing","steaming","stamped","stabilize","squirm","spokesman","snooze","shuffle","shredded","seoul","seized","seafood","scratchy","savor","sadistic","roster","rica","rhetorical","revlon","realist","reactions","prosecuting","prophecies","prisons","precedent","polyester","petals","persuasion","paddles","o'leary","nuthin","neighbour","negroes","naval","mute","muster","muck","minnesota","meningitis","matron","mastered","markers","maris's","manufactured","lot's","lockers","letterman","legged","launching","lanes","journals","indictment","indicating","hypnotized","housekeeping","hopelessly","hmph","hallucinations","grader","goldilocks","girly","furthermore","frames","flask","expansion","envelopes","engaging","downside","doves","doorknob","distinctive","dissolve","discourage","disapprove","diabetic","departed","deliveries","decorator","deaq","crossfire","criminally","containment","comrades","complimentary","commitments","chum","chatter","chapters","catchy","cashier","cartel","caribou","cardiologist","bull's","buffer","brawl","bowls","booted","boat's","billboard","biblical","barbershop","awakening","aryan","angst","administer","acquitted","acquisition","aces","accommodate","zellie","yield","wreak","witch's","william's","whistles","wart","vandalism","vamps","uterus","upstate","unstoppable","unrelated","understudy","tristin","transporting","transcript","tranquilizer","trails","trafficking","toxins","tonsils","timing's","therapeutic","tex","subscription","submitted","stephanie's","stempel","spotting","spectator","spatula","soho","softer","snotty","slinging","showered","sexiest","sensual","scoring","sadder","roam","rimbaud","rim","rewards","restrain","resilient","remission","reinstate","rehash","recollection","rabies","quinn's","presenting","preference","prairie","popsicle","plausible","plantation","pharmaceutical","pediatric","patronizing","patent","participation","outdoor","ostrich","ortolani","oooooh","omelette","neighbor's","neglect","nachos","movie's","mixture","mistrial","mio","mcginty's","marseilles","mare","mandate","malt","luv","loophole","literary","liberation","laughin","lacey's","kevvy","jah","irritated","intends","initiation","initiated","initiate","influenced","infidelity","indigenous","inc","idaho","hypothermia","horrific","hive","heroine","groupie","grinding","graceful","government's","goodspeed","gestures","gah","frantic","extradition","evil's","engineers","echelon","earning","disks","discussions","demolition","definitive","dawnie","dave's","date's","dared","dan's","damsel","curled","courtyard","constitutes","combustion","collective","collateral","collage","col","chant","cassette","carol's","carl's","calculating","bumping","britain","bribes","boardwalk","blinds","blindly","bleeds","blake's","bickering","beasts","battlefield","bankruptcy","backside","avenge","apprehended","annie's","anguish","afghanistan","acknowledged","abusing","youthful","yells","yanking","whomever","when'd","waterfall","vomiting","vine","vengeful","utility","unpacking","unfamiliar","undying","tumble","trolls","treacherous","todo","tipping","tantrum","tanked","summons","strategies","straps","stomped","stinkin","stings","stance","staked","squirrels","sprinkles","speculate","specialists","sorting","skinned","sicko","sicker","shootin","shep","shatter","seeya","schnapps","s'posed","rows","rounded","ronee","rite","revolves","respectful","resource","reply","rendered","regroup","regretting","reeling","reckoned","rebuilding","randy's","ramifications","qualifications","pulitzer","puddy","projections","preschool","pots","potassium","plissken","platonic","peter's","permalash","performer","peasant","outdone","outburst","ogh","obscure","mutants","mugging","molecules","misfortune","miserably","miraculously","medications","medals","margaritas","manpower","lovemaking","long's","logo","logically","leeches","latrine","lamps","lacks","kneel","johnny's","jenny's","inflict","impostor","icon","hypocrisy","hype","hosts","hippies","heterosexual","heightened","hecuba's","hecuba","healer","habitat","gunned","grooming","groo","groin","gras","gory","gooey","gloomy","frying","friendships","fredo","foil","fishermen","firepower","fess","fathom","exhaustion","evils","epi","endeavor","ehh","eggnog","dreaded","drafted","dimensional","detached","deficit","d'arcy","crotch","coughing","coronary","cookin","contributed","consummate","congrats","concerts","companionship","caved","caspar","bulletproof","bris","brilliance","breakin","brash","blasting","beak","arabia","analyst","aluminum","aloud","alligator","airtight","advising","advertise","adultery","administered","aches","abstract","aahh","wronged","wal","voluntary","ventilation","upbeat","uncertainty","trot","trillion","tricia's","trades","tots","tol","tightly","thingies","tending","technician","tarts","surreal","summer's","strengths","specs","specialize","spat","spade","slogan","sloane's","shrew","shaping","seth's","selves","seemingly","schoolwork","roomie","requirements","redundant","redo","recuperating","recommendations","ratio","rabid","quart","pseudo","provocative","proudly","principal's","pretenses","prenatal","pillar","photographers","photographed","pharmaceuticals","patron","pacing","overworked","originals","nicotine","newsletter","neighbours","murderous","miller's","mileage","mechanics","mayonnaise","massages","maroon","lucrative","losin","lil","lending","legislative","kat","juno","iran","interrogated","instruction","injunction","impartial","homing","heartbreaker","harm's","hacks","glands","giver","fraizh","flows","flips","flaunt","excellence","estimated","espionage","englishman","electrocuted","eisenhower","dusting","ducking","drifted","donna's","donating","dom","distribute","diem","daydream","cylon","curves","crutches","crates","cowards","covenant","converted","contributions","composed","comfortably","cod","cockpit","chummy","chitchat","childbirth","charities","businesswoman","brood","brewery","bp's","blatant","bethy","barring","bagged","awakened","assumes","assembled","asbestos","arty","artwork","arc","anthony's","aka","airplanes","accelerated","worshipped","winnings","why're","whilst","wesley's","volleyball","visualize","unprotected","unleash","unexpectedly","twentieth","turnpike","trays","translated","tones","three's","thicker","therapists","takeoff","sums","stub","streisand","storm's","storeroom","stethoscope","stacked","sponsors","spiteful","solutions","sneaks","snapping","slaughtered","slashed","simplest","silverware","shits","secluded","scruples","scrubs","scraps","scholar","ruptured","rubs","roaring","relying","reflected","refers","receptionist","recap","reborn","raisin","rainforest","rae's","raditch","radiator","pushover","pout","plastered","pharmacist","petroleum","perverse","perpetrator","passages","ornament","ointment","occupy","nineties","napping","nannies","mousse","mort","morocco","moors","momentary","modified","mitch's","misunderstandings","marina's","marcy's","marched","manipulator","malfunction","loot","limbs","latitude","lapd","laced","kivar","kickin","interface","infuriating","impressionable","imposing","holdup","hires","hick","hesitated","hebrew","hearings","headphones","hammering","groundwork","grotesque","greenhouse","gradually","graces","genetics","gauze","garter","gangsters","g's","frivolous","freelance","freeing","fours","forwarding","feud","ferrars","faulty","fantasizing","extracurricular","exhaust","empathy","educate","divorces","detonate","depraved","demeaning","declaring","deadlines","dea","daria's","dalai","cursing","cufflink","crows","coupons","countryside","coo","consultation","composer","comply","comforted","clive","claustrophobic","chef's","casinos","caroline's","capsule","camped","cairo","busboy","bred","bravery","bluth","biography","berserk","bennetts","baskets","attacker","aplastic","angrier","affectionate","zit","zapped","yorker","yarn","wormhole","weaken","vat","unrealistic","unravel","unimportant","unforgettable","twain","tv's","tush","turnout","trio","towed","tofu","textbooks","territorial","suspend","supplied","superbowl","sundays","stutter","stewardess","stepson","standin","sshh","specializes","spandex","souvenirs","sociopath","snails","slope","skeletons","shivering","sexier","sequel","sensory","selfishness","scrapbook","romania","riverside","rites","ritalin","rift","ribbons","reunite","remarry","relaxation","reduction","realization","rattling","rapist","quad","pup","psychosis","promotions","presumed","prepping","posture","poses","pleasing","pisses","piling","photographic","pfft","persecuted","pear","part's","pantyhose","padded","outline","organizations","operatives","oohh","obituary","northeast","nina's","neural","negotiator","nba","natty","nathan's","minimize","merl","menopause","mennihan","marty's","martimmys","makers","loyalties","literal","lest","laynie","lando","justifies","josh's","intimately","interact","integrated","inning","inexperienced","impotent","immortality","imminent","ich","horrors","hooky","holders","hinges","heartbreaking","handcuffed","gypsies","guacamole","grovel","graziella","goggles","gestapo","fussy","functional","filmmaker","ferragamo","feeble","eyesight","explosions","experimenting","enzo's","endorsement","enchanting","eee","ed's","duration","doubtful","dizziness","dismantle","disciplinary","disability","detectors","deserving","depot","defective","decor","decline","dangling","dancin","crumble","criteria","creamed","cramping","cooled","conceal","component","competitors","clockwork","clark's","circuits","chrissakes","chrissake","chopping","cabinets","buttercup","brooding","bonfire","blurt","bluestar","bloated","blackmailer","beforehand","bathed","bathe","barcode","banjo","banish","badges","babble","await","attentive","artifacts","aroused","antibodies","animosity","administrator","accomplishments","ya'll","wrinkled","wonderland","willed","whisk","waltzing","waitressing","vis","vin","vila","vigilant","upbringing","unselfish","unpopular","unmarried","uncles","trendy","trajectory","targeting","surroundings","stun","striped","starbucks","stamina","stalled","staking","stag","spoils","snuff","snooty","snide","shrinking","senorita","securities","secretaries","scrutiny","scoundrel","saline","salads","sails","rundown","roz's","roommate's","riddles","responses","resistant","requirement","relapse","refugees","recommending","raspberry","raced","prosperity","programme","presumably","preparations","posts","pom","plight","pleaded","pilot's","peers","pecan","particles","pantry","overturned","overslept","ornaments","opposing","niner","nfl","negligent","negligence","nailing","mutually","mucho","mouthed","monstrous","monarchy","minsk","matt's","mateo's","marking","manufacturing","manager's","malpractice","maintaining","lowly","loitering","logged","lingering","light's","lettin","lattes","kim's","kamal","justification","juror","junction","julie's","joys","johnson's","jillefsky","jacked","irritate","intrusion","inscription","insatiable","infect","inadequate","impromptu","icing","hmmmm","hefty","grammar","generate","gdc","gasket","frightens","flapping","firstborn","fire's","fig","faucet","exaggerated","estranged","envious","eighteenth","edible","downward","dopey","doesn","disposition","disposable","disasters","disappointments","dipped","diminished","dignified","diaries","deported","deficiency","deceit","dealership","deadbeat","curses","coven","counselors","convey","consume","concierge","clutches","christians","cdc","casbah","carefree","callous","cahoots","caf","brotherly","britches","brides","bop","bona","bethie","beige","barrels","ballot","ave","autographed","attendants","attachment","attaboy","astonishing","ashore","appreciative","antibiotic","aneurysm","afterlife","affidavit","zuko","zoning","work's","whats","whaddaya","weakened","watermelon","vasectomy","unsuspecting","trial's","trailing","toula","topanga","tonio","toasted","tiring","thereby","terrorized","tenderness","tch","tailing","syllable","sweats","suffocated","sucky","subconsciously","starvin","staging","sprouts","spineless","sorrows","snowstorm","smirk","slicery","sledding","slander","simmer","signora","sigmund","siege","siberia","seventies","sedate","scented","sampling","sal's","rowdy","rollers","rodent","revenue","retraction","resurrection","resigning","relocate","releases","refusal","referendum","recuperate","receptive","ranking","racketeering","queasy","proximity","provoking","promptly","probability","priors","princes","prerogative","premed","pornography","porcelain","poles","podium","pinched","pig's","pendant","packet","owner's","outsiders","outpost","orbing","opportunist","olanov","observations","nurse's","nobility","neurologist","nate's","nanobot","muscular","mommies","molested","misread","melon","mediterranean","mea","mastermind","mannered","maintained","mackenzie's","liberated","lesions","lee's","laundromat","landscape","lagoon","labeled","jolt","intercom","inspect","insanely","infrared","infatuation","indulgent","indiscretion","inconsiderate","incidents","impaired","hurrah","hungarian","howling","honorary","herpes","hasta","harassed","hanukkah","guides","groveling","groosalug","geographic","gaze","gander","galactica","futile","fridays","flier","fixes","fide","fer","feedback","exploiting","exorcism","exile","evasive","ensemble","endorse","emptied","dreary","dreamy","downloaded","dodged","doctored","displayed","disobeyed","disneyland","disable","diego's","dehydrated","defect","customary","csc","criticizing","contracted","contemplating","consists","concepts","compensate","commonly","colours","coins","coconuts","cockroaches","clogged","cincinnati","churches","chronicle","chilling","chaperon","ceremonies","catalina's","cant","cameraman","bulbs","bucklands","bribing","brava","bracelets","bowels","bobby's","bmw","bluepoint","baton","barred","balm","audit","astronomy","aruba","appetizers","appendix","antics","anointed","analogy","almonds","albuquerque","abruptly","yore","yammering","winch","white's","weston's","weirdness","wangler","vibrations","vendor","unmarked","unannounced","twerp","trespass","tres","travesty","transported","transfusion","trainee","towelie","topics","tock","tiresome","thru","theatrical","terrain","suspect's","straightening","staggering","spaced","sonar","socializing","sitcom","sinus","sinners","shambles","serene","scraped","scones","scepter","sarris","saberhagen","rouge","rigid","ridiculously","ridicule","reveals","rents","reflecting","reconciled","rate's","radios","quota","quixote","publicist","pubes","prune","prude","provider","propaganda","prolonged","projecting","prestige","precrime","postponing","pluck","perpetual","permits","perish","peppermint","peeled","particle","parliament","overdo","oriented","optional","nutshell","notre","notions","nostalgic","nomination","mulan","mouthing","monkey's","mistook","mis","milhouse","mel's","meddle","maybourne","martimmy","loon","lobotomy","livelihood","litigation","lippman","likeness","laurie's","kindest","kare","kaffee","jocks","jerked","jeopardizing","jazzed","investing","insured","inquisition","inhale","ingenious","inflation","incorrect","igby","ideals","holier","highways","hereditary","helmets","heirloom","heinous","haste","harmsway","hardship","hanky","gutters","gruesome","groping","governments","goofing","godson","glare","garment","founding","fortunes","foe","finesse","figuratively","ferrie","fda","external","examples","evacuation","ethnic","est","endangerment","enclosed","emphasis","dyed","dud","dreading","dozed","dorky","dmitri","divert","dissertation","discredit","director's","dialing","describes","decks","cufflinks","crutch","creator","craps","corrupted","coronation","contemporary","consumption","considerably","comprehensive","cocoon","cleavage","chile","carriers","carcass","cannery","bystander","brushes","bruising","bribery","brainstorm","bolted","binge","bart's","barracuda","baroness","ballistics","b's","astute","arroway","arabian","ambitions","alexandra's","afar","adventurous","adoptive","addicts","addictive","accessible","yadda","wilson's","wigs","whitelighters","wematanye","weeds","wedlock","wallets","walker's","vulnerability","vroom","vibrant","vertical","vents","uuuh","urgh","upped","unsettling","unofficial","unharmed","underlying","trippin","trifle","tracing","tox","tormenting","timothy's","threads","theaters","thats","tavern","taiwan","syphilis","susceptible","summary","suites","subtext","stickin","spices","sores","smacked","slumming","sixteenth","sinks","signore","shitting","shameful","shacked","sergei","septic","seedy","security's","searches","righteousness","removal","relish","relevance","rectify","recruits","recipient","ravishing","quickest","pupil","productions","precedence","potent","pooch","pledged","phoebs","perverted","peeing","pedicure","pastrami","passionately","ozone","overlooking","outnumbered","outlook","oregano","offender","nukes","novelty","nosed","nighty","nifty","mugs","mounties","motivate","moons","misinterpreted","miners","mercenary","mentality","mas","marsellus","mapped","malls","lupus","lumbar","lovesick","longitude","lobsters","likelihood","leaky","laundering","latch","japs","jafar","instinctively","inspires","inflicted","inflammation","indoors","incarcerated","imagery","hundredth","hula","hemisphere","handkerchief","hand's","gynecologist","guittierez","groundhog","grinning","graduates","goodbyes","georgetown","geese","fullest","ftl","floral","flashback","eyelashes","eyelash","excluded","evening's","evacuated","enquirer","endlessly","encounters","elusive","disarm","detest","deluding","dangle","crabby","cotillion","corsage","copenhagen","conjugal","confessional","cones","commandment","coded","coals","chuckle","christmastime","christina's","cheeseburgers","chardonnay","ceremonial","cept","cello","celery","carter's","campfire","calming","burritos","burp","buggy","brundle","broflovski","brighten","bows","borderline","blinked","bling","beauties","bauers","battered","athletes","assisting","articulate","alot","alienated","aleksandr","ahhhhh","agreements","agamemnon","accountants","zat","y'see","wrongful","writer's","wrapper","workaholic","wok","winnebago","whispered","warts","vikki's","verified","vacate","updated","unworthy","unprecedented","unanswered","trend","transformed","transform","trademark","tote","tonane","tolerated","throwin","throbbing","thriving","thrills","thorns","thereof","there've","terminator","tendencies","tarot","tailed","swab","sunscreen","stretcher","stereotype","spike's","soggy","sobbing","slopes","skis","skim","sizable","sightings","shucks","shrapnel","sever","senile","sections","seaboard","scripts","scorned","saver","roxanne's","resemble","red's","rebellious","rained","putty","proposals","prenup","positioned","portuguese","pores","pinching","pilgrims","pertinent","peeping","pamphlet","paints","ovulating","outbreak","oppression","opposites","occult","nutcracker","nutcase","nominee","newt","newsstand","newfound","nepal","mocked","midterms","marshmallow","manufacturer","managers","majesty's","maclaren","luscious","lowered","loops","leans","laurence's","krudski","knowingly","keycard","katherine's","junkies","juilliard","judicial","jolinar","jase","irritable","invaluable","inuit","intoxicating","instruct","insolent","inexcusable","induce","incubator","illustrious","hydrogen","hunsecker","hub","houseguest","honk","homosexuals","homeroom","holly's","hindu","hernia","harming","handgun","hallways","hallucination","gunshots","gums","guineas","groupies","groggy","goiter","gingerbread","giggling","geometry","genre","funded","frontal","frigging","fledged","fedex","feat","fairies","eyeball","extending","exchanging","exaggeration","esteemed","ergo","enlist","enlightenment","encyclopedia","drags","disrupted","dispense","disloyal","disconnect","dimitri","desks","dentists","delhi","delacroix","degenerate","deemed","decay","daydreaming","cushions","cuddly","corroborate","contender","congregation","conflicts","confessions","complexion","completion","compensated","cobbler","closeness","chilled","checkmate","channing","carousel","calms","bylaws","bud's","benefactor","belonging","ballgame","baiting","backstabbing","assassins","artifact","armies","appoint","anthropology","anthropologist","alzheimer's","allegedly","alex's","airspace","adversary","adolf","actin","acre","aced","accuses","accelerant","abundantly","abstinence","abc","zsa","zissou","zandt","yom","yapping","wop","witchy","winter's","willows","whee","whadaya","want's","walter's","waah","viruses","vilandra","veiled","unwilling","undress","undivided","underestimating","ultimatums","twirl","truckload","tremble","traditionally","touring","touche","toasting","tingling","tiles","tents","tempered","sussex","sulking","stunk","stretches","sponges","spills","softly","snipers","slid","sedan","screens","scourge","rooftop","rog","rivalry","rifles","riana","revolting","revisit","resisted","rejects","refreshments","redecorating","recurring","recapture","raysy","randomly","purchases","prostitutes","proportions","proceeded","prevents","pretense","prejudiced","precogs","pouting","poppie","poofs","pimple","piles","pediatrician","patrick's","pathology","padre","packets","paces","orvelle","oblivious","objectivity","nikki's","nighttime","nervosa","navigation","moist","moan","minors","mic","mexicans","meurice","melts","mau","mats","matchmaker","markings","maeby","lugosi","lipnik","leprechaun","kissy","kafka","italians","introductions","intestines","intervene","inspirational","insightful","inseparable","injections","informal","influential","inadvertently","illustrated","hussy","huckabees","hmo","hittin","hiss","hemorrhaging","headin","hazy","haystack","hallowed","haiti","haa","grudges","grenades","granilith","grandkids","grading","gracefully","godsend","gobbles","fyi","future's","fun's","fret","frau","fragrance","fliers","firms","finchley","fbi's","farts","eyewitnesses","expendable","existential","endured","embraced","elk","ekg","dude's","dragonfly","dorms","domination","directory","depart","demonstrated","delaying","degrading","deduction","darlings","dante's","danes","cylons","counsellor","cortex","cop's","coordinator","contraire","consensus","consciously","conjuring","congratulating","compares","commentary","commandant","cokes","centimeters","cc's","caucus","casablanca","buffay","buddy's","brooch","bony","boggle","blood's","bitching","bistro","bijou","bewitched","benevolent","bends","bearings","barren","arr","aptitude","antenna","amish","amazes","alcatraz","acquisitions","abomination","worldly","woodstock","withstand","whispers","whadda","wayward","wayne's","wailing","vinyl","variables","vanishing","upscale","untouchable","unspoken","uncontrollable","unavoidable","unattended","tuning","trite","transvestite","toupee","timid","timers","themes","terrorizing","teamed","taipei","t's","swana","surrendered","suppressed","suppress","stumped","strolling","stripe","storybook","storming","stomachs","stoked","stationery","springtime","spontaneity","sponsored","spits","spins","soiree","sociology","soaps","smarty","shootout","shar","settings","sentiments","senator's","scramble","scouting","scone","runners","rooftops","retract","restrictions","residency","replay","remainder","regime","reflexes","recycling","rcmp","rawdon","ragged","quirky","quantico","psychologically","prodigal","primo","pounce","potty","portraits","pleasantries","plane's","pints","phd","petting","perceive","patrons","parameters","outright","outgoing","onstage","officer's","o'connor","notwithstanding","noah's","nibble","newmans","neutralize","mutilated","mortality","monumental","ministers","millionaires","mentions","mcdonald's","mayflower","masquerade","mangy","macreedy","lunatics","luau","lover's","lovable","louie's","locating","lizards","limping","lasagna","largely","kwang","keepers","juvie","jaded","ironing","intuitive","intensely","insure","installation","increases","incantation","identifying","hysteria","hypnotize","humping","heavyweight","happenin","gung","griet","grasping","glorified","glib","ganging","g'night","fueled","focker","flunking","flimsy","flaunting","fixated","fitzwallace","fictional","fearing","fainting","eyebrow","exonerated","ether","ers","electrician","egotistical","earthly","dusted","dues","donors","divisions","distinguish","displays","dismissal","dignify","detonation","deploy","departments","debrief","dazzling","dawn's","dan'l","damnedest","daisies","crushes","crucify","cordelia's","controversy","contraband","contestants","confronting","communion","collapsing","cocked","clock's","clicks","cliche","circular","circled","chord","characteristics","chandelier","casualty","carburetor","callers","bup","broads","breathes","boca","bobbie's","bloodshed","blindsided","blabbing","binary","bialystock","bashing","ballerina","ball's","aviva","avalanche","arteries","appliances","anthem","anomaly","anglo","airstrip","agonizing","adjourn","abandonment","zack's","you's","yearning","yams","wrecker","word's","witnessing","winged","whence","wept","warsaw","warp","warhead","wagons","visibility","usc","unsure","unions","unheard","unfreeze","unfold","unbalanced","ugliest","troublemaker","tolerant","toddler","tiptoe","threesome","thirties","thermostat","tampa","sycamore","switches","swipe","surgically","supervising","subtlety","stung","stumbling","stubs","struggles","stride","strangling","stamp's","spruce","sprayed","socket","snuggle","smuggled","skulls","simplicity","showering","shhhhh","sensor","sci","sac","sabotaging","rumson","rounding","risotto","riots","revival","responds","reserves","reps","reproduction","repairman","rematch","rehearsed","reelection","redi","recognizing","ratty","ragging","radiology","racquetball","racking","quieter","quicksand","pyramids","pulmonary","puh","publication","prowl","provisions","prompt","premeditated","prematurely","prancing","porcupine","plated","pinocchio","perceived","peeked","peddle","pasture","panting","overweight","oversee","overrun","outing","outgrown","obsess","o'donnell","nyu","nursed","northwestern","norma's","nodding","negativity","negatives","musketeers","mugger","mounting","motorcade","monument","merrily","matured","massimo's","masquerading","marvellous","marlena's","margins","maniacs","mag","lumpy","lovey","louse","linger","lilies","libido","lawful","kudos","knuckle","kitchen's","kennedy's","juices","judgments","joshua's","jars","jams","jamal's","jag","itches","intolerable","intermission","interaction","institutions","infectious","inept","incentives","incarceration","improper","implication","imaginative","ight","hussein","humanitarian","huckleberry","horatio","holster","heiress","heartburn","hayley's","hap","gunna","guitarist","groomed","greta's","granting","graciously","glee","gentleman's","fulfillment","fugitives","fronts","founder","forsaking","forgives","foreseeable","flavors","flares","fixation","figment","fickle","featuring","featured","fantasize","famished","faith's","fades","expiration","exclamation","evolve","euro","erasing","emphasize","elevator's","eiffel","eerie","earful","duped","dulles","distributor","distorted","dissing","dissect","dispenser","dilated","digit","differential","diagnostic","detergent","desdemona","debriefing","dazzle","damper","cylinder","curing","crowbar","crispina","crafty","crackpot","courting","corrections","cordial","copying","consuming","conjunction","conflicted","comprehension","commie","collects","cleanup","chiropractor","charmer","chariot","charcoal","chaplain","challenger","census","cd's","cauldron","catatonic","capabilities","calculate","bullied","buckets","brilliantly","breathed","boss's","booths","bombings","boardroom","blowout","blower","blip","blindness","blazing","birthday's","biologically","bibles","biased","beseech","barbaric","band's","balraj","auditorium","audacity","assisted","appropriations","applicants","anticipating","alcoholics","airhead","agendas","aft","admittedly","adapt","absolution","abbot","zing","youre","yippee","wittlesey","withheld","willingness","willful","whammy","webber's","weakest","washes","virtuous","violently","videotapes","vials","vee","unplugged","unpacked","unfairly","und","turbulence","tumbling","troopers","tricking","trenches","tremendously","travelled","travelers","traitors","torches","tommy's","tinga","thyroid","texture","temperatures","teased","tawdry","tat","taker","sympathies","swiped","swallows","sundaes","suave","strut","structural","stone's","stewie","stepdad","spewing","spasm","socialize","slither","sky's","simulator","sighted","shutters","shrewd","shocks","sherry's","sgc","semantics","scout's","schizophrenic","scans","savages","satisfactory","rya'c","runny","ruckus","royally","roadblocks","riff","rewriting","revoke","reversal","repent","renovation","relating","rehearsals","regal","redecorate","recovers","recourse","reconnaissance","receives","ratched","ramali","racquet","quince","quiche","puppeteer","puking","puffed","prospective","projected","problemo","preventing","praises","pouch","posting","postcards","pooped","poised","piled","phoney","phobia","performances","patty's","patching","participating","parenthood","pardner","oppose","oozing","oils","ohm","ohhhhh","nypd","numbing","novelist","nostril","nosey","nominate","noir","neatly","nato","naps","nappa","nameless","muzzle","muh","mortuary","moronic","modesty","mitz","missionary","mimi's","midwife","mercenaries","mcclane","maxie's","matuka","mano","mam","maitre","lush","lumps","lucid","loosened","loosely","loins","lawnmower","lane's","lamotta","kroehner","kristen's","juggle","jude's","joins","jinxy","jessep","jaya","jamming","jailhouse","jacking","ironically","intruders","inhuman","infections","infatuated","indoor","indigestion","improvements","implore","implanted","id's","hormonal","hoboken","hillbilly","heartwarming","headway","headless","haute","hatched","hartmans","harping","hari","grapevine","graffiti","gps","gon","gogh","gnome","ged","forties","foreigners","fool's","flyin","flirted","fingernail","fdr","exploration","expectation","exhilarating","entrusted","enjoyment","embark","earliest","dumper","duel","dubious","drell","dormant","docking","disqualified","disillusioned","dishonor","disbarred","directive","dicey","denny's","deleted","del's","declined","custodial","crunchy","crises","counterproductive","correspondent","corned","cords","cor","coot","contributing","contemplate","containers","concur","conceivable","commissioned","cobblepot","cliffs","clad","chief's","chickened","chewbacca","checkout","carpe","cap'n","campers","calcium","buyin","buttocks","bullies","brown's","brigade","brain's","braid","boxed","bouncy","blueberries","blubbering","bloodstream","bigamy","bel","beeped","bearable","bank's","awarded","autographs","attracts","attracting","asteroid","arbor","arab","apprentice","announces","andie's","ammonia","alarming","aidan's","ahoy","ahm","zan","wretch","wimps","widows","widower","whirlwind","whirl","weather's","warms","war's","wack","villagers","vie","vandelay","unveiling","uno","undoing","unbecoming","ucla","turnaround","tribunal","togetherness","tickles","ticker","tended","teensy","taunt","system's","sweethearts","superintendent","subcommittee","strengthen","stomach's","stitched","standpoint","staffers","spotless","splits","soothe","sonnet","smothered","sickening","showdown","shouted","shepherds","shelters","shawl","seriousness","separates","sen","schooled","schoolboy","scat","sats","sacramento","s'mores","roped","ritchie's","resembles","reminders","regulars","refinery","raggedy","profiles","preemptive","plucked","pheromones","particulars","pardoned","overpriced","overbearing","outrun","outlets","onward","oho","ohmigod","nosing","norwegian","nightly","nicked","neanderthal","mosquitoes","mortified","moisture","moat","mime","milky","messin","mecha","markinson","marivellas","mannequin","manderley","maid's","madder","macready","maciver's","lookie","locusts","lisbon","lifetimes","leg's","lanna","lakhi","kholi","joke's","invasive","impersonate","impending","immigrants","ick","i's","hyperdrive","horrid","hopin","hombre","hogging","hens","hearsay","haze","harpy","harboring","hairdo","hafta","hacking","gun's","guardians","grasshopper","graded","gobble","gatehouse","fourteenth","foosball","floozy","fitzgerald's","fished","firewood","finalize","fever's","fencing","felons","falsely","fad","exploited","euphemism","entourage","enlarged","ell","elitist","elegance","eldest","duo","drought","drokken","drier","dredge","dramas","dossier","doses","diseased","dictator","diarrhea","diagnose","despised","defuse","defendant's","d'amour","crowned","cooper's","continually","contesting","consistently","conserve","conscientious","conjured","completing","commune","commissioner's","collars","coaches","clogs","chenille","chatty","chartered","chamomile","casing","calculus","calculator","brittle","breached","boycott","blurted","birthing","bikinis","bankers","balancing","astounding","assaulting","aroma","arbitration","appliance","antsy","amnio","alienating","aliases","aires","adolescence","administrative","addressing","achieving","xerox","wrongs","workload","willona","whistling","werewolves","wallaby","veterans","usin","updates","unwelcome","unsuccessful","unseemly","unplug","undermining","ugliness","tyranny","tuesdays","trumpets","transference","traction","ticks","tete","tangible","tagging","swallowing","superheroes","sufficiently","studs","strep","stowed","stow","stomping","steffy","stature","stairway","sssh","sprain","spouting","sponsoring","snug","sneezing","smeared","slop","slink","slew","skid","simultaneously","simulation","sheltered","shakin","sewed","sewage","seatbelt","scariest","scammed","scab","sanctimonious","samir","rushes","rugged","routes","romanov","roasting","rightly","retinal","rethinking","resulted","resented","reruns","replica","renewed","remover","raiding","raided","racks","quantity","purest","progressing","primarily","presidente","prehistoric","preeclampsia","postponement","portals","poppa","pop's","pollution","polka","pliers","playful","pinning","pharaoh","perv","pennant","pelvic","paved","patented","paso","parted","paramedic","panels","pampered","painters","padding","overjoyed","orthodox","organizer","one'll","octavius","occupational","oakdale's","nous","nite","nicknames","neurosurgeon","narrows","mitt","misled","mislead","mishap","milltown","milking","microscopic","meticulous","mediocrity","meatballs","measurements","mandy's","malaria","machete","lydecker's","lurch","lorelai's","linda's","layin","lavish","lard","knockin","khruschev","kelso's","jurors","jumpin","jugular","journalists","jour","jeweler","jabba","intersection","intellectually","integral","installment","inquiries","indulging","indestructible","indebted","implicated","imitate","ignores","hyperventilating","hyenas","hurrying","huron","horizontal","hermano","hellish","heheh","header","hazardous","hart's","harshly","harper's","handout","handbag","grunemann","gots","glum","gland","glances","giveaway","getup","gerome","furthest","funhouse","frosting","franchise","frail","fowl","forwarded","forceful","flavored","flank","flammable","flaky","fingered","finalists","fatherly","famine","fags","facilitate","exempt","exceptionally","ethic","essays","equity","entrepreneur","enduring","empowered","employers","embezzlement","eels","dusk","duffel","downfall","dotted","doth","doke","distressed","disobey","disappearances","disadvantage","dinky","diminish","diaphragm","deuces","deployed","delia's","davidson's","curriculum","curator","creme","courteous","correspondence","conquered","comforts","coerced","coached","clots","clarification","cite","chunks","chickie","chick's","chases","chaperoning","ceramic","ceased","cartons","capri","caper","cannons","cameron's","calves","caged","bustin","bungee","bulging","bringin","brie","boomhauer","blowin","blindfolded","blab","biscotti","bird's","beneficial","bastard's","ballplayer","bagging","automated","auster","assurances","aschen","arraigned","anonymity","annex","animation","andi","anchorage","alters","alistair's","albatross","agreeable","advancement","adoring","accurately","abduct","wolfi","width","weirded","watchers","washroom","warheads","voltage","vincennes","villains","victorian","urgency","upward","understandably","uncomplicated","uhuh","uhhhh","twitching","trig","treadmill","transactions","topped","tiffany's","they's","thermos","termination","tenorman","tater","tangle","talkative","swarm","surrendering","summoning","substances","strive","stilts","stickers","stationary","squish","squashed","spraying","spew","sparring","sorrel's","soaring","snout","snort","sneezed","slaps","skanky","singin","sidle","shreck","shortness","shorthand","shepherd's","sharper","shamed","sculptures","scanning","saga","sadist","rydell","rusik","roulette","rodi's","rockefeller","revised","resumes","restoring","respiration","reiber's","reek","recycle","recount","reacts","rabbit's","purge","purgatory","purchasing","providence","prostate","princesses","presentable","poultry","ponytail","plotted","playwright","pinot","pigtails","pianist","phillippe","philippines","peddling","paroled","owww","orchestrated","orbed","opted","offends","o'hara","noticeable","nominations","nancy's","myrtle's","music's","mope","moonlit","moines","minefield","metaphors","memoirs","mecca","maureen's","manning's","malignant","mainframe","magicks","maggots","maclaine","lobe","loathing","linking","leper","leaps","leaping","lashed","larch","larceny","lapses","ladyship","juncture","jiffy","jane's","jakov","invoke","interpreted","internally","intake","infantile","increasingly","inadmissible","implement","immense","howl","horoscope","hoof","homage","histories","hinting","hideaway","hesitating","hellbent","heddy","heckles","hat's","harmony's","hairline","gunpowder","guidelines","guatemala","gripe","gratifying","grants","governess","gorge","goebbels","gigolo","generated","gears","fuzz","frigid","freddo","freddie's","foresee","filters","filmed","fertile","fellowship","feeling's","fascination","extinction","exemplary","executioner","evident","etcetera","estimates","escorts","entity","endearing","encourages","electoral","eaters","earplugs","draped","distributors","disrupting","disagrees","dimes","devastate","detain","deposits","depositions","delicacy","delays","darklighter","dana's","cynicism","cyanide","cutters","cronus","convoy","continuous","continuance","conquering","confiding","concentrated","compartments","companions","commodity","combing","cofell","clingy","cleanse","christmases","cheered","cheekbones","charismatic","cabaret","buttle","burdened","buddhist","bruenell","broomstick","brin","brained","bozos","bontecou","bluntman","blazes","blameless","bizarro","benny's","bellboy","beaucoup","barry's","barkeep","bali","bala","bacterial","axis","awaken","astray","assailant","aslan","arlington","aria","appease","aphrodisiac","announcements","alleys","albania","aitoro's","activation","acme","yesss","wrecks","woodpecker","wondrous","window's","wimpy","willpower","widowed","wheeling","weepy","waxing","waive","vulture","videotaped","veritable","vascular","variations","untouched","unlisted","unfounded","unforeseen","two's","twinge","truffles","triggers","traipsing","toxin","tombstone","titties","tidal","thumping","thor's","thirds","therein","testicles","tenure","tenor","telephones","technicians","tarmac","talby","tackled","systematically","swirling","suicides","suckered","subtitles","sturdy","strangler","stockbroker","stitching","steered","staple","standup","squeal","sprinkler","spontaneously","splendor","spiking","spender","sovereign","snipe","snip","snagged","slum","skimming","significantly","siddown","showroom","showcase","shovels","shotguns","shoelaces","shitload","shifty","shellfish","sharpest","shadowy","sewn","seizing","seekers","scrounge","scapegoat","sayonara","satan's","saddled","rung","rummaging","roomful","romp","retained","residual","requiring","reproductive","renounce","reggie's","reformed","reconsidered","recharge","realistically","radioed","quirks","quadrant","punctual","public's","presently","practising","pours","possesses","poolhouse","poltergeist","pocketbook","plural","plots","pleasure's","plainly","plagued","pity's","pillars","picnics","pesto","pawing","passageway","partied","para","owing","openings","oneself","oats","numero","nostalgia","nocturnal","nitwit","nile","nexus","neuro","negotiated","muss","moths","mono","molecule","mixer","medicines","meanest","mcbeal","matinee","margate","marce","manipulations","manhunt","manger","magicians","maddie's","loafers","litvack","lightheaded","lifeguard","lawns","laughingstock","kodak","kink","jewellery","jessie's","jacko","itty","inhibitor","ingested","informing","indignation","incorporate","inconceivable","imposition","impersonal","imbecile","ichabod","huddled","housewarming","horizons","homicides","hobo","historically","hiccups","helsinki","hehe","hearse","harmful","hardened","gushing","gushie","greased","goddamit","gigs","freelancer","forging","fonzie","fondue","flustered","flung","flinch","flicker","flak","fixin","finalized","fibre","festivus","fertilizer","fenmore's","farted","faggots","expanded","exonerate","exceeded","evict","establishing","enormously","enforced","encrypted","emdash","embracing","embedded","elliot's","elimination","dynamics","duress","dupres","dowser","doormat","dominant","districts","dissatisfied","disfigured","disciplined","discarded","dibbs","diagram","detailing","descend","depository","defining","decorative","decoration","deathbed","death's","dazzled","da's","cuttin","cures","crowding","crepe","crater","crammed","costly","cosmopolitan","cortlandt's","copycat","coordinated","conversion","contradict","containing","constructed","confidant","condemning","conceited","computer's","commute","comatose","coleman's","coherent","clinics","clapping","circumference","chuppah","chore","choksondik","chestnuts","catastrophic","capitalist","campaigning","cabins","briault","bottomless","boop","bonnet","board's","bloomingdale's","blokes","blob","bids","berluti","beret","behavioral","beggars","bar's","bankroll","bania","athos","assassinate","arsenic","apperantly","ancestor","akron","ahhhhhh","afloat","adjacent","actresses","accordingly","accents","abe's","zipped","zeros","zeroes","zamir","yuppie","youngsters","yorkers","writ","wisest","wipes","wield","whyn't","weirdos","wednesdays","villages","vicksburg","variable","upchuck","untraceable","unsupervised","unpleasantness","unpaid","unhook","unconscionable","uncalled","turks","tumors","trappings","translating","tragedies","townie","timely","tiki","thurgood","things'll","thine","tetanus","terrorize","temptations","teamwork","tanning","tampons","tact","swarming","surfaced","supporter","stuart's","stranger's","straitjacket","stint","stimulation","steroid","statistically","startling","starry","squander","speculating","source's","sollozzo","sobriety","soar","sneaked","smithsonian","slugs","slaw","skit","skedaddle","sinker","similarities","silky","shortcomings","shipments","sheila's","severity","sellin","selective","seattle's","seasoned","scrubbed","scrooge","screwup","scrapes","schooling","scarves","saturdays","satchel","sandburg's","sandbox","salesmen","rooming","romances","revolving","revere","resulting","reptiles","reproach","reprieve","recreational","rearranging","realtor","ravine","rationalize","raffle","quoted","punchy","psychobabble","provocation","profoundly","problematic","prescriptions","preferable","praised","polishing","poached","plow","pledges","planetary","plan's","pirelli","perverts","peaked","pastures","pant","oversized","overdressed","outdid","outdated","oriental","ordinance","orbs","opponents","occurrence","nuptials","nominees","nineteenth","nefarious","mutiny","mouthpiece","motels","mopping","moon's","mongrel","monetary","mommie","missin","metaphorically","merv","mertin","memos","memento","melodrama","melancholy","measles","meaner","marches","mantel","maneuvers","maneuvering","mailroom","machine's","luring","listenin","lion's","lifeless","liege","licks","libraries","liberties","levon","legwork","lanka","lacked","kneecaps","kippur","kiddie","kaput","justifiable","jigsaw","issuing","islamic","insistent","insidious","innuendo","innit","inhabitants","individually","indicator","indecent","imaginable","illicit","hymn","hurling","humane","hospitalized","horseshit","hops","hondo","hemorrhoid","hella","healthiest","haywire","hamsters","halibut","hairbrush","hackers","guam","grouchy","grisly","griffin's","gratuitous","glutton","glimmer","gibberish","ghastly","geologist","gentler","generously","generators","geeky","gaga","furs","fuhrer","fronting","forklift","foolin","fluorescent","flats","flan","financed","filmmaking","fight's","faxes","faceless","extinguisher","expressions","expel","etched","entertainer","engagements","endangering","empress","egos","educator","ducked","dual","dramatically","dodgeball","dives","diverted","dissolved","dislocated","discrepancy","discovers","dink","devour","destroyers","derail","deputies","dementia","decisive","daycare","daft","cynic","crumbling","cowardice","cow's","covet","cornwallis","corkscrew","cookbook","conditioned","commendation","commandments","columns","coincidental","cobwebs","clouded","clogging","clicking","clasp","citizenship","chopsticks","chefs","chaps","catherine's","castles","cashing","carat","calmer","burgundy","bulldog's","brightly","brazen","brainwashing","bradys","bowing","booties","bookcase","boned","bloodsucking","blending","bleachers","bleached","belgian","bedpan","bearded","barrenger","bachelors","awwww","atop","assures","assigning","asparagus","arabs","apprehend","anecdote","amoral","alterations","alli","aladdin","aggravation","afoot","acquaintances","accommodating","accelerate","yakking","wreckage","worshipping","wladek","willya","willies","wigged","whoosh","whisked","wavelength","watered","warpath","warehouses","volts","vitro","violates","viewed","vicar","valuables","users","urging","uphill","unwise","untimely","unsavory","unresponsive","unpunished","unexplained","unconventional","tubby","trolling","treasurer","transfers","toxicology","totaled","tortoise","tormented","toothache","tingly","tina's","timmiihh","tibetan","thursdays","thoreau","terrifies","temperature's","temperamental","telegrams","ted's","technologies","teaming","teal'c's","talkie","takers","table's","symbiote","swirl","suffocate","subsequently","stupider","strapping","store's","steckler","standardized","stampede","stainless","springing","spreads","spokesperson","speeds","someway","snowflake","sleepyhead","sledgehammer","slant","slams","situation's","showgirl","shoveling","shmoopy","sharkbait","shan't","seminars","scrambling","schizophrenia","schematics","schedule's","scenic","sanitary","sandeman","saloon","sabbatical","rural","runt","rummy","rotate","reykjavik","revert","retrieved","responsive","rescheduled","requisition","renovations","remake","relinquish","rejoice","rehabilitation","recreation","reckoning","recant","rebuilt","rebadow","reassurance","reassigned","rattlesnake","ramble","racism","quor","prowess","prob","primed","pricey","predictions","prance","pothole","pocus","plains","pitches","pistols","persist","perpetrated","penal","pekar","peeling","patter","pastime","parmesan","paper's","papa's","panty","pail","pacemaker","overdrive","optic","operas","ominous","offa","observant","nothings","noooooo","nonexistent","nodded","nieces","neia","neglecting","nauseating","mutton","mutated","musket","munson's","mumbling","mowing","mouthful","mooseport","monologue","momma's","moly","mistrust","meetin","maximize","masseuse","martha's","marigold","mantini","mailer","madre","lowlifes","locksmith","livid","liven","limos","licenses","liberating","lhasa","lenin","leniency","leering","learnt","laughable","lashes","lasagne","laceration","korben","katan","kalen","jordan's","jittery","jesse's","jammies","irreplaceable","intubate","intolerant","inhaler","inhaled","indifferent","indifference","impound","imposed","impolite","humbly","holocaust","heroics","heigh","gunk","guillotine","guesthouse","grounding","groundbreaking","groom's","grips","grant's","gossiping","goatee","gnomes","gellar","fusion's","fumble","frutt","frobisher","freudian","frenchman","foolishness","flagged","fixture","femme","feeder","favored","favorable","fatso","fatigue","fatherhood","farmer's","fantasized","fairest","faintest","factories","eyelids","extravagant","extraterrestrial","extraordinarily","explicit","escalator","eros","endurance","encryption","enchantment's","eliminating","elevate","editors","dysfunction","drivel","dribble","dominican","dissed","dispatched","dismal","disarray","dinnertime","devastation","dermatologist","delicately","defrost","debutante","debacle","damone","dainty","cuvee","culpa","crucified","creeped","crayons","courtship","counsel's","convene","continents","conspicuous","congresswoman","confinement","conferences","confederate","concocted","compromises","comprende","composition","communism","comma","collectors","coleslaw","clothed","clinically","chug","chickenshit","checkin","chaotic","cesspool","caskets","cancellation","calzone","brothel","boomerang","bodega","bloods","blasphemy","black's","bitsy","bink","biff","bicentennial","berlini","beatin","beards","barbas","barbarians","backpacking","audiences","artist's","arrhythmia","array","arousing","arbitrator","aqui","appropriately","antagonize","angling","anesthetic","altercation","alice's","aggressor","adversity","adopting","acne","accordance","acathla","aaahhh","wreaking","workup","workings","wonderin","wolf's","wither","wielding","whopper","what'm","what'cha","waxed","vibrating","veterinarian","versions","venting","vasey","valor","validate","urged","upholstery","upgraded","untied","unscathed","unsafe","unlawful","uninterrupted","unforgiving","undies","uncut","twinkies","tucking","tuba","truffle","truck's","triplets","treatable","treasured","transmit","tranquility","townspeople","torso","tomei","tipsy","tinsel","timeline","tidings","thirtieth","tensions","teapot","tasks","tantrums","tamper","talky","swayed","swapping","sven","sulk","suitor","subjected","stylist","stroller","storing","stirs","statistical","standoff","staffed","squadron","sprinklers","springsteen","specimens","sparkly","song's","snowy","snobby","snatcher","smoother","smith's","sleepin","shrug","shortest","shoebox","shel","sheesh","shee","shackles","setbacks","sedatives","screeching","scorched","scanned","satyr","sammy's","sahib","rosemary's","rooted","rods","roadblock","riverbank","rivals","ridiculed","resentful","repellent","relates","registry","regarded","refugee","recreate","reconvene","recalled","rebuttal","realmedia","quizzes","questionnaire","quartet","pusher","punctured","pucker","propulsion","promo","prolong","professionalism","prized","premise","predators","portions","pleasantly","planet's","pigsty","physicist","phil's","penniless","pedestrian","paychecks","patiently","paternal","parading","pa's","overactive","ovaries","orderlies","oracles","omaha","oiled","offending","nudie","neonatal","neighborly","nectar","nautical","naught","moops","moonlighting","mobilize","mite","misleading","milkshake","mickey's","metropolitan","menial","meats","mayan","maxed","marketplace","mangled","magua","lunacy","luckier","llanview's","livestock","liters","liter","licorice","libyan","legislature","lasers","lansbury","kremlin","koreans","kooky","knowin","kilt","junkyard","jiggle","jest","jeopardized","jags","intending","inkling","inhalation","influences","inflated","inflammatory","infecting","incense","inbound","impractical","impenetrable","iffy","idealistic","i'mma","hypocrites","hurtin","humbled","hosted","homosexuality","hologram","hokey","hocus","hitchhiking","hemorrhoids","headhunter","hassled","harts","hardworking","haircuts","hacksaw","guerrilla","genitals","gazillion","gatherings","ganza's","gammy","gamesphere","fugue","fuels","forests","footwear","folly","folds","flexibility","flattened","flashlights","fives","filet","field's","famously","extenuating","explored","exceed","estrogen","envisioned","entails","emerged","embezzled","eloquent","egomaniac","dummies","duds","ducts","drowsy","drones","dragon's","drafts","doree","donovon","donny's","docked","dixon's","distributed","disorders","disguises","disclose","diggin","dickie's","detachment","deserting","depriving","demographic","delegation","defying","deductible","decorum","decked","daylights","daybreak","dashboard","darien","damnation","d'angelo's","cuddling","crunching","crickets","crazies","crayon","councilman","coughed","coordination","conundrum","contractors","contend","considerations","compose","complimented","compliance","cohaagen","clutching","cluster","clued","climbs","clader","chuck's","chromosome","cheques","checkpoint","chats","channeling","ceases","catholics","cassius","carver's","carasco","capped","capisce","cantaloupe","cancelling","campsite","camouflage","cambodia","burglars","bureaucracy","breakfasts","branding","bra'tac","book's","blueprint","bleedin","blaze's","blabbed","bisexual","bile","big's","beverages","beneficiary","battery's","basing","avert","avail","autobiography","atone","army's","arlyn","ares","architectural","approves","apothecary","anus","antiseptic","analytical","amnesty","alphabetical","alignment","aligned","aleikuum","advisory","advisors","advisement","adulthood","acquiring","accessed","zombie's","zadir","wrestled","wobbly","withnail","wheeled","whattaya","whacking","wedged","wanders","walkman","visionary","virtues","vincent's","vega's","vaginal","usage","unnamed","uniquely","unimaginable","undeniable","unconditionally","uncharted","unbridled","tweezers","tvmegasite","trumped","triumphant","trimming","tribes","treading","translates","tranquilizers","towing","tout","toontown","thunk","taps","taboo","suture","suppressing","succeeding","submission","strays","stonewall","stogie","stepdaughter","stalls","stace","squint","spouses","splashed","speakin","sounder","sorrier","sorrel","sorcerer","sombrero","solemnly","softened","socialist","snobs","snippy","snare","smoothing","slump","slimeball","slaving","sips","singular","silently","sicily","shiller","shayne's","shareholders","shakedown","sensations","seagulls","scrying","scrumptious","screamin","saucy","santoses","santos's","sanctions","roundup","roughed","rosary","robechaux","roadside","riley's","retrospect","resurrected","restoration","reside","researched","rescind","reproduce","reprehensible","repel","rendering","remodeling","religions","reconsidering","reciprocate","ratchet","rambaldi's","railroaded","raccoon","quasi","psychics","psat","promos","proclamation","problem's","prob'ly","pristine","printout","priestess","prenuptial","prediction","precedes","pouty","potter's","phoning","petersburg","peppy","pariah","parched","parcel","panes","overloaded","overdoing","operators","oldies","obesity","nymphs","nother","notebooks","nook","nikolai","nearing","nearer","mutation","municipal","monstrosity","minister's","milady","mieke","mephesto","memory's","melissa's","medicated","marshals","manilow","mammogram","mainstream","madhouse","m'lady","luxurious","luck's","lucas's","lotsa","loopy","logging","liquids","lifeboat","lesion","lenient","learner","lateral","laszlo","larva","kross","kinks","jinxed","involuntary","inventor","interim","insubordination","inherent","ingrate","inflatable","independently","incarnate","inane","imaging","hypoglycemia","huntin","humorous","humongous","hoodlum","honoured","honking","hitler's","hemorrhage","helpin","hearing's","hathor","hatching","hangar","halftime","guise","guggenheim","grrr","grotto","grandson's","grandmama","gorillas","godless","girlish","ghouls","gershwin","frosted","friday's","forwards","flutter","flourish","flagpole","finely","finder's","fetching","fatter","fated","faithfully","faction","fabrics","exposition","expo","exploits","exert","exclude","eviction","everwood's","evasion","espn","escorting","escalate","enticing","enroll","enhancement","endowed","enchantress","emerging","elopement","drills","drat","downtime","downloading","dorks","doorways","doctorate","divulge","dissociative","diss","disgraceful","disconcerting","dirtbag","deteriorating","deteriorate","destinies","depressive","dented","denim","defeating","decruz","decidedly","deactivate","daydreams","czar","curls","culprit","cues","crybaby","cruelest","critique","crippling","cretin","cranberries","cous","coupled","corvis","copped","convicts","converts","contingent","contests","complement","commend","commemorate","combinations","coastguard","cloning","cirque","churning","chock","chivalry","chemotherapy","charlotte's","chancellor's","catalogues","cartwheels","carpets","carols","canister","camera's","buttered","bureaucratic","bundt","buljanoff","bubbling","brokers","broaden","brimstone","brainless","borneo","bores","boing","bodied","billie's","biceps","beijing","bead","badmouthing","bad's","avec","autopilot","attractions","attire","atoms","atheist","ascertain","artificially","archbishop","aorta","amps","ampata","amok","alloy","allied","allenby","align","albeit","aired","aint","adjoining","accosted","abyss","absolve","aborted","aaagh","aaaaaah","your's","yonder","yellin","yearly","wyndham","wrongdoing","woodsboro","wigging","whup","wasteland","warranty","waltzed","walnuts","wallace's","vividly","vibration","verses","veggie","variation","validation","unnecessarily","unloaded","unicorns","understated","undefeated","unclean","umbrellas","tyke","twirling","turpentine","turnover","tupperware","tugger","triangles","triage","treehouse","tract","toil","tidbit","tickled","thud","threes","thousandth","thingie","terminally","temporal","teething","tassel","talkies","syndication","syllables","swoon","switchboard","swerved","suspiciously","superiority","successor","subsequentlyne","subsequent","subscribe","strudel","stroking","strictest","steven's","stensland","stefan's","starsky","starin","stannart","squirming","squealing","sorely","solidarity","softie","snookums","sniveling","snail","smidge","smallpox","sloth","slab","skulking","singled","simian","silo","sightseeing","siamese","shudder","shoppers","shax","sharpen","shannen","semtex","sellout","secondhand","season's","seance","screenplay","scowl","scorn","scandals","santiago's","safekeeping","sacked","russe","rummage","rosie's","roshman","roomies","roaches","rinds","retrace","retires","resuscitate","restrained","residential","reservoir","rerun","reputations","rekall","rejoin","refreshment","reenactment","recluse","ravioli","raves","ranked","rampant","rama","rallies","raking","purses","punishable","punchline","puked","provincial","prosky","prompted","processor","previews","prepares","poughkeepsie","poppins","polluted","placenta","pissy","petulant","peterson's","perseverance","persecution","pent","peasants","pears","pawns","patrols","pastries","partake","paramount","panky","palate","overzealous","overthrow","overs","oswald's","oskar","originated","orchids","optical","onset","offenses","obstructing","objectively","obituaries","obedient","obedience","novice","nothingness","nitrate","newer","nets","mwah","musty","mung","motherly","mooning","monique's","momentous","moby","mistaking","mistakenly","minutemen","milos","microchip","meself","merciless","menelaus","mazel","mauser","masturbate","marsh's","manufacturers","mahogany","lysistrata","lillienfield","likable","lightweight","liberate","leveled","letdown","leer","leeloo","larynx","lardass","lainey","lagged","lab's","klorel","klan","kidnappings","keyed","karmic","jive","jiggy","jeebies","isabel's","irate","iraqi","iota","iodine","invulnerable","investor","intrusive","intricate","intimidation","interestingly","inserted","insemination","inquire","innate","injecting","inhabited","informative","informants","incorporation","inclination","impure","impasse","imbalance","illiterate","i'ma","i'ii","hurled","hunts","hispanic","hematoma","help's","helen's","headstrong","harmonica","hark","handmade","handiwork","gymnasium","growling","governors","govern","gorky","gook","girdle","getcha","gesundheit","gazing","gazette","garde","galley","funnel","fred's","fossils","foolishly","fondness","flushing","floris","firearm","ferocious","feathered","fateful","fancies","fakes","faker","expressway","expire","exec","ever'body","estates","essentials","eskimos","equations","eons","enlightening","energetic","enchilada","emmi","emissary","embolism","elsinore","ecklie","drenched","drazi","doped","dogging","documentation","doable","diverse","disposed","dislikes","dishonesty","disengage","discouraging","diplomat","diplomacy","deviant","descended","derailed","depleted","demi","deformed","deflect","defines","defer","defcon","deactivated","crips","creditors","counters","corridors","cordy's","conversation's","constellations","congressmen","congo","complimenting","colombian","clubbing","clog","clint's","clawing","chromium","chimes","chicken's","chews","cheatin","chaste","ceremony's","cellblock","ceilings","cece","caving","catered","catacombs","calamari","cabbie","bursts","bullying","bucking","brulee","brits","brisk","breezes","brandon's","bounces","boudoir","blockbuster","binks","better'n","beluga","bellied","behrani","behaves","bedding","battalion","barriers","banderas","balmy","bakersfield","badmouth","backers","avenging","atat","aspiring","aromatherapy","armpit","armoire","anythin","another's","anonymously","anniversaries","alonzo's","aftershave","affordable","affliction","adrift","admissible","adieu","activist","acquittal","yucky","yearn","wrongly","wino","whitter","whirlpool","wendigo","watchdog","wannabes","walkers","wakey","vomited","voicemail","verb","vans","valedictorian","vacancy","uttered","up's","unwed","unrequited","unnoticed","unnerving","unkind","unjust","uniformed","unconfirmed","unadulterated","unaccounted","uglier","tyler's","twix","turnoff","trough","trolley","trampled","tramell","traci's","tort","toads","titled","timbuktu","thwarted","throwback","thon","thinker","thimble","tasteless","tarantula","tammy's","tamale","takeovers","symposium","symmetry","swish","supposing","supporters","suns","sully","streaking","strands","statutory","starlight","stargher","starch","stanzi","stabs","squeamish","spokane","splattered","spiritually","spilt","sped","speciality","spacious","soundtrack","smacking","slain","slag","slacking","skywire","skips","skeet","skaara","simpatico","shredding","showin","shortcuts","shite","shielding","sheep's","shamelessly","serafine","sentimentality","sect","secretary's","seasick","scientifically","scholars","schemer","scandalous","saturday's","salts","saks","sainted","rustic","rugs","riedenschneider","ric's","rhyming","rhetoric","revolt","reversing","revel","retractor","retards","retaliation","resurrect","remiss","reminiscing","remanded","reluctance","relocating","relied","reiben","regions","regains","refuel","refresher","redoing","redheaded","redeemed","recycled","reassured","rearranged","rapport","qumar","prowling","promotional","promoter","preserving","prejudices","precarious","powwow","pondering","plunger","plunged","pleasantville","playpen","playback","pioneers","physicians","phlegm","perfected","pancreas","pakistani","oxide","ovary","output","outbursts","oppressed","opal's","ooohhh","omoroca","offed","o'toole","nurture","nursemaid","nosebleed","nixon's","necktie","muttering","munchies","mucking","mogul","mitosis","misdemeanor","miscarried","minx","millionth","migraines","midler","methane","metabolism","merchants","medicinal","margaret's","manifestation","manicurist","mandelbaum","manageable","mambo","malfunctioned","mais","magnesium","magnanimous","loudmouth","longed","lifestyles","liddy","lickety","leprechauns","lengthy","komako","koji's","klute","kennel","kathy's","justifying","jerusalem","israelis","isle","irreversible","inventing","invariably","intervals","intergalactic","instrumental","instability","insinuate","inquiring","ingenuity","inconclusive","incessant","improv","impersonation","impeachment","immigrant","id'd","hyena","humperdinck","humm","hubba","housework","homeland","holistic","hoffa","hither","hissy","hippy","hijacked","hero's","heparin","hellooo","heat's","hearth","hassles","handcuff","hairstyle","hadda","gymnastics","guys'll","gutted","gulp","gulls","guard's","gritty","grievous","gravitational","graft","gossamer","gooder","glory's","gere","gash","gaming","gambled","galaxies","gadgets","fundamentals","frustrations","frolicking","frock","frilly","fraser's","francais","foreseen","footloose","fondly","fluent","flirtation","flinched","flight's","flatten","fiscal","fiercely","felicia's","fashionable","farting","farthest","farming","facade","extends","exposer","exercised","evading","escrow","errr","enzymes","energies","empathize","embryos","embodiment","ellsberg","electromagnetic","ebola","earnings","dulcinea","dreamin","drawbacks","drains","doyle's","doubling","doting","doose's","doose","doofy","dominated","dividing","diversity","disturbs","disorderly","disliked","disgusts","devoid","detox","descriptions","denominator","demonstrating","demeanor","deliriously","decode","debauchery","dartmouth","d'oh","croissant","cravings","cranked","coworkers","councilor","council's","convergence","conventions","consistency","consist","conquests","conglomerate","confuses","confiscate","confines","confesses","conduit","compress","committee's","commanded","combed","colonel's","coated","clouding","clamps","circulating","circa","cinch","chinnery","celebratory","catalogs","carpenters","carnal","carla's","captures","capitan","capability","canin","canes","caitlin's","cadets","cadaver","cable's","bundys","bulldozer","buggers","bueller","bruno's","breakers","brazilian","branded","brainy","booming","bookstores","bloodbath","blister","bittersweet","biologist","billed","betty's","bellhop","beeping","beaut","beanstalk","beady","baudelaire","bartenders","bargains","ballad","backgrounds","averted","avatar's","atmospheric","assert","assassinated","armadillo","archive","appreciating","appraised","antlers","anterior","alps","aloof","allowances","alleyway","agriculture","agent's","affleck","acknowledging","achievements","accordion","accelerator","abracadabra","abject","zinc","zilch","yule","yemen","xanax","wrenching","wreath","wouldn","witted","widely","wicca","whorehouse","whooo","whips","westchester","websites","weaponry","wasn","walsh's","vouchers","vigorous","viet","victimized","vicodin","untested","unsolicited","unofficially","unfocused","unfettered","unfeeling","unexplainable","uneven","understaffed","underbelly","tutorial","tuberculosis","tryst","trois","trix","transmitting","trampoline","towering","topeka","tirade","thieving","thang","tentacles","teflon","teachings","tablets","swimmin","swiftly","swayzak","suspecting","supplying","suppliers","superstitions","superhuman","subs","stubbornness","structures","streamers","strattman","stonewalling","stimulate","stiffs","station's","stacking","squishy","spout","splice","spec","sonrisa","smarmy","slows","slicing","sisterly","sierra's","sicilian","shrill","shined","shift's","seniority","seine","seeming","sedley","seatbelts","scour","scold","schoolyard","scarring","sash","sark's","salieri","rustling","roxbury","richly","rexy","rex's","rewire","revved","retriever","respective","reputable","repulsed","repeats","rendition","remodel","relocated","reins","reincarnation","regression","reconstruction","readiness","rationale","rance","rafters","radiohead","radio's","rackets","quarterly","quadruple","pumbaa","prosperous","propeller","proclaim","probing","privates","pried","prewedding","premeditation","posturing","posterity","posh","pleasurable","pizzeria","pish","piranha","pimps","penmanship","penchant","penalties","pelvis","patriotism","pasa","papaya","packaging","overturn","overture","overstepped","overcoat","ovens","outsmart","outed","orient","ordained","ooohh","oncologist","omission","olly","offhand","odour","occurring","nyazian","notarized","nobody'll","nightie","nightclubs","newsweek","nesting","navel","nationwide","nabbed","naah","mystique","musk","mover","mortician","morose","moratorium","monster's","moderate","mockingbird","mobsters","misconduct","mingling","mikey's","methinks","metaphysical","messengered","merge","merde","medallion","mathematical","mater","mason's","masochist","martouf","martians","marinara","manray","manned","mammal","majorly","magnifying","mackerel","mabel's","lyme","lurid","lugging","lonnegan","loathsome","llantano","liszt","listings","limiting","liberace","leprosy","latinos","lanterns","lamest","laferette","ladybird","kraut","kook","kits","kipling","joyride","inward","intestine","innocencia","inhibitions","ineffectual","indisposed","incurable","incumbent","incorporated","inconvenienced","inanimate","improbable","implode","idea's","hypothesis","hydrant","hustling","hustled","huevos","how'm","horseshoe","hooey","hoods","honcho","hinge","hijack","heroism","hermit","heimlich","harvesting","hamunaptra","haladki","haiku","haggle","haaa","gutsy","grunting","grueling","grit","grifter","grievances","gribbs","greevy","greeted","green's","grandstanding","godparents","glows","glistening","glider","gimmick","genocide","gaping","fraiser","formalities","foreigner","forecast","footprint","folders","foggy","flaps","fitty","fiends","femmes","fearful","fe'nos","favours","fabio","eyeing","extort","experimentation","expedite","escalating","erect","epinephrine","entitles","entice","enriched","enable","emissions","eminence","eights","ehhh","educating","eden's","earthquakes","earthlings","eagerly","dunville","dugout","draining","doublemeat","doling","disperse","dispensing","dispatches","dispatcher","discoloration","disapproval","diners","dieu","diddly","dictates","diazepam","descendants","derogatory","deposited","delights","defies","decoder","debates","dealio","danson","cutthroat","crumbles","crud","croissants","crematorium","craftsmanship","crafted","could'a","correctional","cordless","cools","contradiction","constitute","conked","confine","concealing","composite","complicates","communique","columbian","cockamamie","coasters","clusters","clobbered","clipping","clipboard","clergy","clemenza","cleanser","circumcision","cindy's","chisel","character's","chanukah","certainaly","centerpiece","cellmate","cartoonist","cancels","cadmium","buzzed","busiest","bumstead","bucko","browsing","broth","broader","break's","braver","boundary","boggling","bobbing","blurred","birkhead","bethesda","benet","belvedere","bellies","begrudge","beckworth","bebe's","banky","baldness","bagpipes","baggy","babysitters","aversion","auxiliary","attributes","attain","astonished","asta","assorted","aspirations","arnold's","area's","appetites","apparel","apocalyptic","apartment's","announcer","angina","amiss","ambulances","allo","alleviate","alibis","algeria","alaskan","airway","affiliated","aerial","advocating","adrenalin","admires","adhesive","actively","accompanying","zeta","yoyou","yoke","yachts","wreaked","wracking","woooo","wooing","wised","winnie's","wind's","wilshire","wedgie","watson's","warden's","waging","violets","vincey","victorious","victories","velcro","vastly","valves","valley's","uplifting","untrustworthy","unmitigated","universities","uneventful","undressing","underprivileged","unburden","umbilical","twigs","tweet","tweaking","turquoise","trustees","truckers","trimmed","triggering","treachery","trapping","tourism","tosses","torching","toothpick","toga","toasty","toasts","tiamat","thickens","ther","tereza","tenacious","temperament","televised","teldar","taxis","taint","swill","sweatin","sustaining","surgery's","surgeries","succeeds","subtly","subterranean","subject's","subdural","streep","stopwatch","stockholder","stillwater","steamer","stang's","stalkers","squished","squeegee","splinters","spliced","splat","spied","specialized","spaz","spackle","sophistication","snapshots","smoky","smite","sluggish","slithered","skin's","skeeters","sidewalks","sickly","shrugs","shrubbery","shrieking","shitless","shithole","settin","servers","serge","sentinels","selfishly","segments","scarcely","sawdust","sanitation","sangria","sanctum","samantha's","sahjhan","sacrament","saber","rustle","rupture","rump","roving","rousing","rosomorf","rosario's","rodents","robust","rigs","riddled","rhythms","revelations","restart","responsibly","repression","reporter's","replied","repairing","renoir","remoray","remedial","relocation","relies","reinforcement","refundable","redirect","recheck","ravenwood","rationalizing","ramus","ramsey's","ramelle","rails","radish","quivering","pyjamas","puny","psychos","prussian","provocations","prouder","protestors","protesters","prohibited","prohibit","progression","prodded","proctologist","proclaimed","primordial","pricks","prickly","predatory","precedents","praising","pragmatic","powerhouse","posterior","postage","porthos","populated","poly","pointe","pivotal","pinata","persistence","performers","pentangeli","pele","pecs","pathetically","parka","parakeet","panicky","pandora's","pamphlets","paired","overthruster","outsmarted","ottoman","orthopedic","oncoming","oily","offing","nutritious","nuthouse","nourishment","nietzsche","nibbling","newlywed","newcomers","need's","nautilus","narcissist","myths","mythical","mutilation","mundane","mummy's","mummies","mumble","mowed","morvern","mortem","mortal's","mopes","mongolian","molasses","modification","misplace","miscommunication","miney","militant","midlife","mens","menacing","memorizing","memorabilia","membrane","massaging","masking","maritime","mapping","manually","magnets","ma's","luxuries","lows","lowering","lowdown","lounging","lothario","longtime","liposuction","lieutenant's","lidocaine","libbets","lewd","levitate","leslie's","leeway","lectured","lauren's","launcher","launcelot","latent","larek","lagos","lackeys","kumbaya","kryptonite","knapsack","keyhole","kensington","katarangura","kann","junior's","juiced","jugs","joyful","jihad","janitor's","jakey","ironclad","invoice","intertwined","interlude","interferes","insurrection","injure","initiating","infernal","india's","indeedy","incur","incorrigible","incantations","imprint","impediment","immersion","immensely","illustrate","ike's","igloo","idly","ideally","hysterectomy","hyah","house's","hour's","hounded","hooch","honeymoon's","hollering","hogs","hindsight","highs","high's","hiatus","helix","heirs","heebie","havesham","hassan's","hasenfuss","hankering","hangers","hakuna","gutless","gusto","grubbing","grrrr","greg's","grazed","gratification","grandeur","gorak","godammit","gnawing","glanced","gladiators","generating","galahad","gaius","furnished","funeral's","fundamentally","frostbite","frees","frazzled","fraulein","fraternizing","fortuneteller","formaldehyde","followup","foggiest","flunky","flickering","flashbacks","fixtures","firecrackers","fines","filly","figger","fetuses","fella's","feasible","fates","eyeliner","extremities","extradited","expires","experimented","exiting","exhibits","exhibited","exes","excursion","exceedingly","evaporate","erupt","equilibrium","epileptic","ephram's","entrails","entities","emporium","egregious","eggshells","easing","duwayne","drone","droll","dreyfuss","drastically","dovey","doubly","doozy","donkeys","donde","dominate","distrust","distributing","distressing","disintegrate","discreetly","disagreements","diff","dick's","devised","determines","descending","deprivation","delegate","dela","degradation","decision's","decapitated","dealin","deader","dashed","darkroom","dares","daddies","dabble","cycles","cushy","currents","cupcakes","cuffed","croupier","croak","criticized","crapped","coursing","cornerstone","copyright","coolers","continuum","contaminate","cont","consummated","construed","construct","condos","concoction","compulsion","committees","commish","columnist","collapses","coercion","coed","coastal","clemency","clairvoyant","circulate","chords","chesterton","checkered","charlatan","chaperones","categorically","cataracts","carano","capsules","capitalize","cache","butcher's","burdon","bullshitting","bulge","buck's","brewed","brethren","bren","breathless","breasted","brainstorming","bossing","borealis","bonsoir","bobka","boast","blimp","bleu","bleep","bleeder","blackouts","bisque","binford's","billboards","bernie's","beecher's","beatings","bayberry","bashed","bartlet's","bapu","bamboozled","ballon","balding","baklava","baffled","backfires","babak","awkwardness","attributed","attest","attachments","assembling","assaults","asphalt","arthur's","arthritis","armenian","arbitrary","apologizes","anyhoo","antiquated","alcante","agency's","advisable","advertisement","adventurer","abundance","aahhh","aaahh","zatarc","yous","york's","yeti","yellowstone","yearbooks","yakuza","wuddya","wringing","woogie","womanhood","witless","winging","whatsa","wetting","wessex","wendy's","way's","waterproof","wastin","washington's","wary","voom","volition","volcanic","vogelman","vocation","visually","violinist","vindicated","vigilance","viewpoint","vicariously","venza","vasily","validity","vacuuming","utensils","uplink","unveil","unloved","unloading","uninhibited","unattached","ukraine","typo","tweaked","twas","turnips","tunisia","tsch","trinkets","tribune","transmitters","translator","train's","toured","toughen","toting","topside","topical","toothed","tippy","tides","theology","terrors","terrify","tentative","technologically","tarnish","target's","tallest","tailored","tagliati","szpilman","swimmers","swanky","susie's","surly","supple","sunken","summation","suds","suckin","substantially","structured","stockholm","stepmom","squeaking","springfield's","spooks","splashmore","spanked","souffle","solitaire","solicitation","solarium","smooch","smokers","smog","slugged","slobbering","skylight","skimpy","situated","sinuses","simplify","silenced","sideburns","sid's","shutdown","shrinkage","shoddy","shhhhhh","shelling","shelled","shareef","shangri","shakey's","seuss","servicing","serenade","securing","scuffle","scrolls","scoff","scholarships","scanners","sauerkraut","satisfies","satanic","sars","sardines","sarcophagus","santino","sandi's","salvy","rusted","russells","ruby's","rowboat","routines","routed","rotating","rolfsky","ringside","rigging","revered","retreated","respectability","resonance","resembling","reparations","reopened","renewal","renegotiate","reminisce","reluctantly","reimburse","regimen","regaining","rectum","recommends","recognizable","realism","reactive","rawhide","rappaport's","raincoat","quibble","puzzled","pursuits","purposefully","puns","pubic","psychotherapy","prosecution's","proofs","proofing","professor's","prevention","prescribing","prelim","positioning","pore","poisons","poaching","pizza's","pertaining","personalized","personable","peroxide","performs","pentonville","penetrated","peggy's","payphone","payoffs","participated","park's","parisian","palp","paleontology","overhaul","overflowing","organised","oompa","ojai","offenders","oddest","objecting","o'hare","o'daniel","notches","noggin","nobody'd","nitrogen","nightstand","niece's","nicky's","neutralized","nervousness","nerdy","needlessly","navigational","narrative","narc","naquadah","nappy","nantucket","nambla","myriad","mussolini","mulberry","mountaineer","mound","motherfuckin","morrie","monopolizing","mohel","mistreated","misreading","misbehave","miramax","minstrel","minivan","milligram","milkshakes","milestone","middleweight","michelangelo","metamorphosis","mesh","medics","mckinnon's","mattresses","mathesar","matchbook","matata","marys","marco's","malucci","majored","magilla","magic's","lymphoma","lowers","lordy","logistics","linens","lineage","lindenmeyer","limelight","libel","leery's","leased","leapt","laxative","lather","lapel","lamppost","laguardia","labyrinth","kindling","key's","kegs","kegger","kawalsky","juries","judo","jokin","jesminder","janine's","izzy","israeli","interning","insulation","institutionalized","inspected","innings","innermost","injun","infallible","industrious","indulgence","indonesia","incinerator","impossibility","imports","impart","illuminate","iguanas","hypnotic","hyped","huns","housed","hostilities","hospitable","hoses","horton's","homemaker","history's","historian","hirschmuller","highlighted","hideout","helpers","headset","guardianship","guapo","guantanamo","grubby","greyhound","grazing","granola","granddaddy","gotham's","goren","goblet","gluttony","glucose","globes","giorno","gillian's","getter","geritol","gassed","gang's","gaggle","freighter","freebie","frederick's","fractures","foxhole","foundations","fouled","foretold","forcibly","folklore","floorboards","floods","floated","flippers","flavour","flaked","firstly","fireflies","feedings","fashionably","fascism","farragut","fallback","factions","facials","exterminate","exited","existent","exiled","exhibiting","excites","everything'll","evenin","evaluated","ethically","entree","entirety","ensue","enema","empath","embryo","eluded","eloquently","elle","eliminates","eject","edited","edema","echoes","earns","dumpling","drumming","droppings","drazen's","drab","dolled","doll's","doctrine","distasteful","disputing","disputes","displeasure","disdain","disciples","diamond's","develops","deterrent","detection","dehydration","defied","defiance","decomposing","debated","dawned","darken","daredevil","dailies","cyst","custodian","crusts","crucifix","crowning","crier","crept","credited","craze","crawls","coveted","couple's","couldn","corresponding","correcting","corkmaster","copperfield","cooties","coopers","cooperated","controller","contraption","consumes","constituents","conspire","consenting","consented","conquers","congeniality","computerized","compute","completes","complains","communicator","communal","commits","commendable","colonels","collide","coladas","colada","clout","clooney","classmate","classifieds","clammy","claire's","civility","cirrhosis","chink","chemically","characterize","censor","catskills","cath","caterpillar","catalyst","carvers","carts","carpool","carelessness","career's","cardio","carbs","captivity","capeside's","capades","butabi","busmalis","bushel","burping","buren","burdens","bunks","buncha","bulldozers","browse","brockovich","bria","breezy","breeds","breakthroughs","bravado","brandy's","bracket","boogety","bolshevik","blossoms","bloomington","blooming","bloodsucker","blockade","blight","blacksmith","betterton","betrayer","bestseller","bennigan's","belittle","beeps","bawling","barts","bartending","barbed","bankbooks","back's","babs","babish","authors","authenticity","atropine","astronomical","assertive","arterial","armbrust","armageddon","aristotle","arches","anyanka","annoyance","anemic","anck","anago","ali's","algiers","airways","airwaves","air's","aimlessly","ails","ahab","afflicted","adverse","adhere","accuracy","aaargh","aaand","zest","yoghurt","yeast","wyndham's","writings","writhing","woven","workable","winking","winded","widen","whooping","whiter","whip's","whatya","whacko","we's","wazoo","wasp","waived","vlad","virile","vino","vic's","veterinary","vests","vestibule","versed","venetian","vaughn's","vanishes","vacancies","urkel","upwards","uproot","unwarranted","unscheduled","unparalleled","undertaking","undergrad","tweedle","turtleneck","turban","trickery","travolta","transylvania","transponder","toyed","townhouse","tonto","toed","tion","tier","thyself","thunderstorm","thnk","thinning","thinkers","theatres","thawed","tether","tempus","telegraph","technicalities","tau'ri","tarp","tarnished","tara's","taggert's","taffeta","tada","tacked","systolic","symbolize","swerve","sweepstakes","swami","swabs","suspenders","surfers","superwoman","sunsets","sumo","summertime","succulent","successes","subpoenas","stumper","stosh","stomachache","stewed","steppin","stepatech","stateside","starvation","staff's","squads","spicoli","spic","sparing","soulless","soul's","sonnets","sockets","snit","sneaker","snatching","smothering","slush","sloman","slashing","sitters","simpson's","simpleton","signify","signal's","sighs","sidra","sideshow","sickens","shunned","shrunken","showbiz","shopped","shootings","shimmering","shakespeare's","shagging","seventeenth","semblance","segue","sedation","scuzzlebutt","scumbags","scribble","screwin","scoundrels","scarsdale","scamp","scabs","saucers","sanctioned","saintly","saddened","runaways","runaround","rumored","rudimentary","rubies","rsvp","rots","roman's","ripley's","rheya","revived","residing","resenting","researcher","repertoire","rehashing","rehabilitated","regrettable","regimental","refreshed","reese's","redial","reconnecting","rebirth","ravenous","raping","ralph's","railroads","rafting","rache","quandary","pylea","putrid","punitive","puffing","psychopathic","prunes","protests","protestant","prosecutors","proportional","progressed","prod","probate","prince's","primate","predicting","prayin","practitioner","possessing","pomegranate","polgara","plummeting","planners","planing","plaintiffs","plagues","pitt's","pithy","photographer's","philharmonic","petrol","perversion","personals","perpetrators","perm","peripheral","periodic","perfecto","perched","pees","peeps","pedigree","peckish","pavarotti","partnered","palette","pajama","packin","pacifier","oyez","overstepping","outpatient","optimum","okama","obstetrician","nutso","nuance","noun","noting","normalcy","normal's","nonnegotiable","nomak","nobleman","ninny","nines","nicey","newsflash","nevermore","neutered","nether","nephew's","negligee","necrosis","nebula","navigating","narcissistic","namesake","mylie","muses","munitions","motivational","momento","moisturizer","moderation","mmph","misinformed","misconception","minnifield","mikkos","methodical","mechanisms","mebbe","meager","maybes","matchmaking","masry","markovic","manifesto","malakai","madagascar","m'am","luzhin","lusting","lumberjack","louvre","loopholes","loaning","lightening","liberals","lesbo","leotard","leafs","leader's","layman's","launder","lamaze","kubla","kneeling","kilo","kibosh","kelp","keith's","jumpsuit","joy's","jovi","joliet","jogger","janover","jakovasaurs","irreparable","intervened","inspectors","innovation","innocently","inigo","infomercial","inexplicable","indispensable","indicative","incognito","impregnated","impossibly","imperfect","immaculate","imitating","illnesses","icarus","hunches","hummus","humidity","housewives","houmfort","hothead","hostiles","hooves","hoopla","hooligans","homos","homie","hisself","himalayas","hidy","hickory","heyyy","hesitant","hangout","handsomest","handouts","haitian","hairless","gwennie","guzzling","guinevere","grungy","grunge","grenada","gout","gordon's","goading","gliders","glaring","geology","gems","gavel","garments","gardino","gannon's","gangrene","gaff","gabrielle's","fundraising","fruitful","friendlier","frequencies","freckle","freakish","forthright","forearm","footnote","footer","foot's","flops","flamenco","fixer","firm's","firecracker","finito","figgered","fezzik","favourites","fastened","farfetched","fanciful","familiarize","faire","failsafe","fahrenheit","fabrication","extravaganza","extracted","expulsion","exploratory","exploitation","explanatory","exclusion","evolutionary","everglades","evenly","eunuch","estas","escapade","erasers","entries","enforcing","endorsements","enabling","emptying","emperor's","emblem","embarassing","ecosystem","ebby","ebay","dweeb","dutiful","dumplings","drilled","drafty","doug's","dolt","dollhouse","displaced","dismissing","disgraced","discrepancies","disbelief","disagreeing","disagreed","digestion","didnt","deviled","deviated","deterioration","departmental","departing","demoted","demerol","delectable","deco","decaying","decadent","dears","daze","dateless","d'algout","cultured","cultivating","cryto","crusades","crumpled","crumbled","cronies","critters","crew's","crease","craves","cozying","cortland","corduroy","cook's","consumers","congratulated","conflicting","confidante","condensed","concessions","compressor","compressions","compression","complicating","complexity","compadre","communicated","coerce","coding","coating","coarse","clown's","clockwise","clerk's","classier","clandestine","chums","chumash","christopher's","choreography","choirs","chivalrous","chinpoko","chilean","chihuahua","cheerio","charred","chafing","celibacy","casts","caste","cashier's","carted","carryin","carpeting","carp","carotid","cannibals","candor","caen","cab's","butterscotch","busts","busier","bullcrap","buggin","budding","brookside","brodski","bristow's","brig","bridesmaid's","brassiere","brainwash","brainiac","botrelle","boatload","blimey","blaring","blackness","bipolar","bipartisan","bins","bimbos","bigamist","biebe","biding","betrayals","bestow","bellerophon","beefy","bedpans","battleship","bathroom's","bassinet","basking","basin","barzini","barnyard","barfed","barbarian","bandit","balances","baker's","backups","avid","augh","audited","attribute","attitudes","at's","astor","asteroids","assortment","associations","asinine","asalaam","arouse","architects","aqua","applejack","apparatus","antiquities","annoys","angela's","anew","anchovies","anchors","analysts","ampule","alphabetically","aloe","allure","alameida","aisles","airfield","ahah","aggressively","aggravate","aftermath","affiliation","aesthetic","advertised","advancing","adept","adage","accomplices","accessing","academics","aagh","zoned","zoey's","zeal","yokel","y'ever","wynant's","wringer","witwer","withdrew","withdrawing","withdrawals","windward","wimbledon","wily","willfully","whorfin","whimsical","whimpering","welding","weddin","weathered","wealthiest","weakening","warmest","wanton","waif","volant","vivo","vive","visceral","vindication","vikram","vigorously","verification","veggies","urinate","uproar","upload","unwritten","unwrap","unsung","unsubstantiated","unspeakably","unscrupulous","unraveling","unquote","unqualified","unfulfilled","undetectable","underlined","unconstitutional","unattainable","unappreciated","ummmm","ulcers","tylenol","tweak","tutu","turnin","turk's","tucker's","tuatha","tropez","trends","trellis","traffic's","torque","toppings","tootin","toodles","toodle","tivo","tinkering","thursday's","thrives","thorne's","thespis","thereafter","theatrics","thatherton","texts","testicle","terr","tempers","teammates","taxpayer","tavington","tampon","tackling","systematic","syndicated","synagogue","swelled","sweeney's","sutures","sustenance","surfaces","superstars","sunflowers","sumatra","sublet","subjective","stubbins","strutting","strewn","streams","stowaway","stoic","sternin","stereotypes","steadily","star's","stalker's","stabilizing","sprang","spotter","spiraling","spinster","spell's","speedometer","specified","speakeasy","sparked","soooo","songwriter","soiled","sneakin","smithereens","smelt","smacks","sloan's","slaughterhouse","slang","slacks","skids","sketching","skateboards","sizzling","sixes","sirree","simplistic","sift","side's","shouts","shorted","shoelace","sheeit","shaw's","shards","shackled","sequestered","selmak","seduces","seclusion","seasonal","seamstress","seabeas","scry","scripted","scotia","scoops","scooped","schillinger's","scavenger","saturation","satch","salaries","safety's","s'more","s'il","rudeness","rostov","romanian","romancing","robo","robert's","rioja","rifkin","rieper","revise","reunions","repugnant","replicating","replacements","repaid","renewing","remembrance","relic","relaxes","rekindle","regulate","regrettably","registering","regenerate","referenced","reels","reducing","reconstruct","reciting","reared","reappear","readin","ratting","rapes","rancho","rancher","rammed","rainstorm","railroading","queers","punxsutawney","punishes","pssst","prudy","proudest","protectors","prohibits","profiling","productivity","procrastinating","procession","proactive","priss","primaries","potomac","postmortem","pompoms","polio","poise","piping","pickups","pickings","physiology","philanthropist","phenomena","pheasant","perfectionist","peretti","people'll","peninsula","pecking","peaks","pave","patrolman","participant","paralegal","paragraphs","paparazzi","pankot","pampering","pain's","overstep","overpower","ovation","outweigh","outlawed","orion's","openness","omnipotent","oleg","okra","okie","odious","nuwanda","nurtured","niles's","newsroom","netherlands","nephews","neeson","needlepoint","necklaces","neato","nationals","muggers","muffler","mousy","mourned","mosey","morn","mormon","mopey","mongolians","moldy","moderately","modelling","misinterpret","minneapolis","minion","minibar","millenium","microfilm","metals","mendola","mended","melissande","me's","mathematician","masturbating","massacred","masbath","marler's","manipulates","manifold","malp","maimed","mailboxes","magnetism","magna","m'lord","m'honey","lymph","lunge","lull","luka","lt's","lovelier","loser's","lonigan's","lode","locally","literacy","liners","linear","lefferts","leezak","ledgers","larraby","lamborghini","laloosh","kundun","kozinski","knockoff","kissin","kiosk","khasinau's","kennedys","kellman","karlo","kaleidoscope","jumble","juggernaut","joseph's","jiminy","jesuits","jeffy","jaywalking","jailbird","itsy","irregularities","inventive","introduces","interpreter","instructing","installing","inquest","inhabit","infraction","informer","infarction","incidence","impulsively","impressing","importing","impersonated","impeach","idiocy","hyperbole","hydra","hurray","hungary","humped","huhuh","hsing","hotspot","horsepower","hordes","hoodlums","honky","hitchhiker","hind","hideously","henchmen","heaving","heathrow","heather's","heathcliff","healthcare","headgear","headboard","hazing","hawking","harem","handprint","halves","hairspray","gutiurrez","greener","grandstand","goosebumps","good's","gondola","gnaw","gnat","glitches","glide","gees","gasping","gases","garrison's","frolic","fresca","freeways","frayed","fortnight","fortitude","forgetful","forefathers","foley's","foiled","focuses","foaming","flossing","flailing","fitzgeralds","firehouse","finders","filmmakers","fiftieth","fiddler","fellah","feats","fawning","farquaad","faraway","fancied","extremists","extremes","expresses","exorcist","exhale","excel","evaluations","ethros","escalated","epilepsy","entrust","enraged","ennui","energized","endowment","encephalitis","empties","embezzling","elster","ellie's","ellen's","elixir","electrolytes","elective","elastic","edged","econ","eclectic","eagle's","duplex","dryers","drexl","dredging","drawback","drafting","don'ts","docs","dobisch","divorcee","ditches","distinguishing","distances","disrespected","disprove","disobeying","disobedience","disinfectant","discs","discoveries","dips","diplomas","dingy","digress","dignitaries","digestive","dieting","dictatorship","dictating","devoured","devise","devane's","detonators","detecting","desist","deserter","derriere","deron","derive","derivative","delegates","defects","defeats","deceptive","debilitating","deathwok","dat's","darryl's","dago","daffodils","curtsy","cursory","cuppa","cumin","cultivate","cujo","cubic","cronkite","cremation","credence","cranking","coverup","courted","countin","counselling","cornball","converting","contentment","contention","contamination","consortium","consequently","consensual","consecutive","compressed","compounds","compost","components","comparative","comparable","commenting","color's","collections","coleridge","coincidentally","cluett","cleverly","cleansed","cleanliness","clea","clare's","citizen's","chopec","chomp","cholera","chins","chime","cheswick","chessler","cheapest","chatted","cauliflower","catharsis","categories","catchin","caress","cardigan","capitalism","canopy","cana","camcorder","calorie","cackling","cabot's","bystanders","buttoned","buttering","butted","buries","burgel","bullpen","buffoon","brogna","brah","bragged","boutros","boosted","bohemian","bogeyman","boar","blurting","blurb","blowup","bloodhound","blissful","birthmark","biotech","bigot","bestest","benefited","belted","belligerent","bell's","beggin","befall","beeswax","beer's","becky's","beatnik","beaming","bazaar","bashful","barricade","banners","bangers","baja","baggoli","badness","awry","awoke","autonomy","automobiles","attica","astoria","assessing","ashram","artsy","artful","aroun","armpits","arming","arithmetic","annihilate","anise","angiogram","andre's","anaesthetic","amorous","ambiguous","ambiance","alligators","afforded","adoration","admittance","administering","adama","aclu","abydos","absorption","zonked","zhivago","zealand","zazu","youngster","yorkin","wrongfully","writin","wrappers","worrywart","woops","wonderfalls","womanly","wickedness","wichita","whoopie","wholesale","wholeheartedly","whimper","which'll","wherein","wheelchairs","what'ya","west's","wellness","welcomes","wavy","warren's","warranted","wankers","waltham","wallop","wading","wade's","wacked","vogue","virginal","vill","vets","vermouth","vermeil","verger","verbs","verbally","ventriss","veneer","vecchio's","vampira","utero","ushers","urgently","untoward","unshakable","unsettled","unruly","unrest","unmanned","unlocks","unified","ungodly","undue","undermined","undergoing","undergo","uncooperative","uncontrollably","unbeatable","twitchy","tunh","tumbler","tubs","truest","troublesome","triumphs","triplicate","tribbey","trent's","transmissions","tortures","torpedoes","torah","tongaree","tommi","tightening","thunderbolt","thunderbird","thorazine","thinly","theta","theres","testifies","terre","teenaged","technological","tearful","taxing","taldor","takashi","tach","symbolizes","symbolism","syllabus","swoops","swingin","swede","sutra","suspending","supplement","sunday's","sunburn","succumbed","subtitled","substituting","subsidiary","subdued","stuttering","stupor","stumps","strummer","strides","strategize","strangulation","stooped","stipulation","stingy","stigma","stewart's","statistic","startup","starlet","stapled","squeaks","squawking","spoilsport","splicing","spiel","spencers","specifications","spawned","spasms","spaniard","sous","softener","sodding","soapbox","snow's","smoldering","smithbauer","slogans","slicker","slasher","skittish","skepticism","simulated","similarity","silvio","signifies","signaling","sifting","sickest","sicilians","shuffling","shrivel","shortstop","sensibility","sender","seminary","selecting","segretti","seeping","securely","scurrying","scrunch","scrote","screwups","schoolteacher","schibetta's","schenkman","sawing","savin","satine","saps","sapiens","salvaging","salmonella","safeguard","sacrilege","rumpus","ruffle","rube","routing","roughing","rotted","roshman's","rondall","road's","ridding","rickshaw","rialto","rhinestone","reversible","revenues","retina","restrooms","resides","reroute","requisite","repress","replicate","repetition","removes","relationship's","regent","regatta","reflective","rednecks","redeeming","rectory","recordings","reasoned","rayed","ravell","raked","rainstorm's","raincheck","raids","raffi","racked","query","quantities","pushin","prototypes","proprietor","promotes","prometheus","promenade","projectile","progeny","profess","prodding","procure","primetime","presuming","preppy","prednisone","predecessor","potted","posttraumatic","poppies","poorhouse","pool's","polaroid","podiatrist","plucky","plowed","pledging","playroom","playhouse","play's","plait","placate","pitchfork","pissant","pinback","picketing","photographing","pharoah","petrak","petal","persecuting","perchance","penny's","pellets","peeved","peerless","payable","pauses","pathways","pathologist","pat's","parchment","papi","pagliacci","owls","overwrought","overwhelmingly","overreaction","overqualified","overheated","outward","outlines","outcasts","otherworldly","originality","organisms","opinionated","oodles","oftentimes","octane","occured","obstinate","observatory","o'er","nutritionist","nutrition","numbness","nubile","notification","notary","nooooooo","nodes","nobodies","nepotism","neighborhoods","neanderthals","musicals","mushu","murphy's","multimedia","mucus","mothering","mothballs","monogrammed","monk's","molesting","misspoke","misspelled","misconstrued","miscellaneous","miscalculated","minimums","mince","mildew","mighta","middleman","metabolic","messengers","mementos","mellowed","meditate","medicare","mayol","maximilian","mauled","massaged","marmalade","mardi","mannie","mandates","mammals","malaysia","makings","major's","maim","lundegaard","lovingly","lout","louisville","loudest","lotto","loosing","loompa","looming","longs","lodging","loathes","littlest","littering","linebacker","lifelike","li'l","legalities","lavery's","laundered","lapdog","lacerations","kopalski","knobs","knitted","kittridge","kidnaps","kerosene","katya","karras","jungles","juke","joes","jockeys","jeremy's","jefe","janeiro","jacqueline's","ithaca","irrigation","iranoff","invoices","invigorating","intestinal","interactive","integration","insolence","insincere","insectopia","inhumane","inhaling","ingrates","infrastructure","infestation","infants","individuality","indianapolis","indeterminate","indefinite","inconsistent","incomprehensible","inaugural","inadequacy","impropriety","importer","imaginations","illuminating","ignited","ignite","iggy","i'da","hysterics","hypodermic","hyperventilate","hypertension","hyperactive","humoring","hotdogs","honeymooning","honed","hoist","hoarding","hitching","hinted","hill's","hiker","hijo","hightail","highlands","hemoglobin","helo","hell'd","heinie","hanoi","hags","gush","guerrillas","growin","grog","grissom's","gregory's","grasped","grandparent","granddaughters","gouged","goblins","gleam","glades","gigantor","get'em","geriatric","geared","gawk","gawd","gatekeeper","gargoyles","gardenias","garcon","garbo","gallows","gabe's","gabby's","gabbing","futon","fulla","frightful","freshener","freedoms","fountains","fortuitous","formulas","forceps","fogged","fodder","foamy","flogging","flaun","flared","fireplaces","firefighters","fins","filtered","feverish","favell","fattest","fattening","fate's","fallow","faculties","fabricated","extraordinaire","expressly","expressive","explorers","evade","evacuating","euclid","ethanol","errant","envied","enchant","enamored","enact","embarking","election's","egocentric","eeny","dussander","dunwitty","dullest","dru's","dropout","dredged","dorsia","dormitory","doot","doornail","dongs","dogged","dodgy","do's","ditty","dishonorable","discriminating","discontinue","dings","dilly","diffuse","diets","dictation","dialysis","deteriorated","delly","delightfully","definitions","decreased","declining","deadliest","daryll","dandruff","cynthia's","cush","cruddy","croquet","crocodiles","cringe","crimp","credo","cranial","crackling","coyotes","courtside","coupling","counteroffer","counterfeiting","corrupting","corrective","copter","copping","conway's","conveyor","contusions","contusion","conspirator","consoling","connoisseur","conjecture","confetti","composure","competitor","compel","commanders","coloured","collector's","colic","coldest","coincide","coddle","cocksuckers","coax","coattails","cloned","cliff's","clerical","claustrophobia","classrooms","clamoring","civics","churn","chugga","chromosomes","christened","chopper's","chirping","chasin","characterized","chapped","chalkboard","centimeter","caymans","catheter","caspian","casings","cartilage","carlton's","card's","caprica","capelli","cannolis","cannoli","canals","campaigns","camogli","camembert","butchers","butchered","busboys","bureaucrats","bungalow","buildup","budweiser","buckled","bubbe","brownstone","bravely","brackley","bouquets","botox","boozing","boosters","bodhi","blunders","blunder","blockage","blended","blackberry","bitch's","birthplace","biocyte","biking","bike's","betrays","bestowed","bested","beryllium","beheading","beginner's","beggar","begbie","beamed","bayou","bastille","bask","barstool","barricades","baron's","barbecues","barbecued","barb's","bandwagon","bandits","ballots","ballads","backfiring","bacarra","avoidance","avenged","autopsies","austrian","aunties","attache","atrium","associating","artichoke","arrowhead","arrivals","arose","armory","appendage","apostrophe","apostles","apathy","antacid","ansel","anon","annul","annihilation","andrew's","anderson's","anastasia's","amuses","amped","amicable","amendments","amberg","alluring","allotted","alfalfa","alcoholism","airs","ailing","affinity","adversaries","admirers","adlai","adjective","acupuncture","acorn","abnormality","aaaahhhh","zooming","zippity","zipping","zeroed","yuletide","yoyodyne","yengeese","yeahhh","xena","wrinkly","wracked","wording","withered","winks","windmills","widow's","whopping","wholly","wendle","weigart","weekend's","waterworks","waterford","waterbed","watchful","wantin","wally's","wail","wagging","waal","waaah","vying","voter","ville","vertebrae","versatile","ventures","ventricle","varnish","vacuumed","uugh","utilities","uptake","updating","unreachable","unprovoked","unmistakable","unky","unfriendly","unfolding","undesirable","undertake","underpaid","uncuff","unchanged","unappealing","unabomber","ufos","tyres","typhoid","tweek's","tuxedos","tushie","turret","turds","tumnus","tude","truman's","troubadour","tropic","trinium","treaters","treads","transpired","transient","transgression","tournaments","tought","touchdowns","totem","tolstoy","thready","thins","thinners","thas","terrible's","television's","techs","teary","tattaglia","tassels","tarzana","tape's","tanking","tallahassee","tablecloths","synonymous","synchronize","symptomatic","symmetrical","sycophant","swimmingly","sweatshop","surrounds","surfboard","superpowers","sunroom","sunflower","sunblock","sugarplum","sudan","subsidies","stupidly","strumpet","streetcar","strategically","strapless","straits","stooping","stools","stifler","stems","stealthy","stalks","stairmaster","staffer","sshhh","squatting","squatters","spores","spelt","spectacularly","spaniel","soulful","sorbet","socked","society's","sociable","snubbed","snub","snorting","sniffles","snazzy","snakebite","smuggler","smorgasbord","smooching","slurping","sludge","slouch","slingshot","slicer","slaved","skimmed","skier","sisterhood","silliest","sideline","sidarthur","shrink's","shipwreck","shimmy","sheraton","shebang","sharpening","shanghaied","shakers","sendoff","scurvy","scoliosis","scaredy","scaled","scagnetti","saxophone","sawchuk","saviour","saugus","saturated","sasquatch","sandbag","saltines","s'pose","royalties","routinely","roundabout","roston","rostle","riveting","ristle","righ","rifling","revulsion","reverently","retrograde","restriction","restful","resolving","resents","rescinded","reptilian","repository","reorganize","rentals","rent's","renovating","renal","remedies","reiterate","reinvent","reinmar","reibers","reechard","recuse","recorders","record's","reconciling","recognizance","recognised","reclaiming","recitation","recieved","rebate","reacquainted","rations","rascals","raptors","railly","quintuplets","quahog","pygmies","puzzling","punctuality","psychoanalysis","psalm","prosthetic","proposes","proms","proliferation","prohibition","probie","printers","preys","pretext","preserver","preppie","prag","practise","postmaster","portrayed","pollen","polled","poachers","plummet","plumbers","pled","plannin","pitying","pitfalls","piqued","pinecrest","pinches","pillage","pigheaded","pied","physique","pessimistic","persecute","perjure","perch","percentile","pentothal","pensky","penises","peking","peini","peacetime","pazzi","pastels","partisan","parlour","parkway","parallels","paperweight","pamper","palsy","palaces","pained","overwhelm","overview","overalls","ovarian","outrank","outpouring","outhouse","outage","ouija","orbital","old's","offset","offer's","occupying","obstructed","obsessions","objectives","obeying","obese","o'riley","o'neal","o'higgins","nylon","notoriously","nosebleeds","norman's","norad","noooooooo","nononono","nonchalant","nominal","nome","nitrous","nippy","neurosis","nekhorvich","necronomicon","nativity","naquada","nano","nani","n'est","mystik","mystified","mums","mumps","multinational","muddle","mothership","moped","monumentally","monogamous","mondesi","molded","mixes","misogynistic","misinterpreting","miranda's","mindlock","mimic","midtown","microphones","mending","megaphone","meeny","medicating","meanings","meanie","masseur","maru","marshal's","markstrom","marklars","mariachi","margueritas","manifesting","maintains","mail's","maharajah","lurk","lulu's","lukewarm","loveliest","loveable","lordship","looting","lizardo","liquored","lipped","lingers","limey","limestone","lieutenants","lemkin","leisurely","laureate","lathe","latched","lars","lapping","ladle","kuala","krevlorneswath","kosygin","khakis","kenaru","keats","kath","kaitlan","justin's","julliard","juliet's","journeys","jollies","jiff","jaundice","jargon","jackals","jabot's","invoked","invisibility","interacting","instituted","insipid","innovative","inflamed","infinitely","inferiority","inexperience","indirectly","indications","incompatible","incinerated","incinerate","incidental","incendiary","incan","inbred","implicitly","implicating","impersonator","impacted","ida's","ichiro","iago","hypo","hurricanes","hunks","host's","hospice","horsing","hooded","honey's","homestead","hippopotamus","hindus","hiked","hetson","hetero","hessian","henslowe","hendler","hellstrom","hecate","headstone","hayloft","hater","hast","harold's","harbucks","handguns","hallucinate","halliwell's","haldol","hailing","haggling","hadj","gynaecologist","gumball","gulag","guilder","guaranteeing","groundskeeper","ground's","grindstone","grimoir","grievance","griddle","gribbit","greystone","graceland","gooders","goeth","glossy","glam","giddyup","gentlemanly","gels","gelatin","gazelle","gawking","gaulle","gate's","ganged","fused","fukes","fromby","frenchmen","franny","foursome","forsley","foreman's","forbids","footwork","foothold","fonz","fois","foie","floater","flinging","flicking","fittest","fistfight","fireballs","filtration","fillings","fiddling","festivals","fertilization","fennyman","felonious","felonies","feces","favoritism","fatten","fanfare","fanatics","faceman","extensions","executions","executing","excusing","excepted","examiner's","ex's","evaluating","eugh","erroneous","enzyme","envoy","entwined","entrances","ensconced","enrollment","england's","enemy's","emit","emerges","embankment","em's","ellison's","electrons","eladio","ehrlichman","easterland","dylan's","dwellers","dueling","dubbed","dribbling","drape","doze","downtrodden","doused","dosed","dorleen","dopamine","domesticated","dokie","doggone","disturbances","distort","displeased","disown","dismount","disinherited","disarmed","disapproves","disabilities","diperna","dioxide","dined","diligent","dicaprio","diameter","dialect","detonated","destitute","designate","depress","demolish","demographics","degraded","deficient","decoded","debatable","dealey","darsh","dapper","damsels","damning","daisy's","dad'll","d'oeuvre","cutter's","curlers","curie","cubed","cryo","critically","crikey","crepes","crackhead","countrymen","count's","correlation","cornfield","coppers","copilot","copier","coordinating","cooing","converge","contributor","conspiracies","consolidated","consigliere","consecrated","configuration","conducts","condoning","condemnation","communities","commoner","commies","commented","comical","combust","comas","colds","clod","clique","clay's","clawed","clamped","cici","christianity","choosy","chomping","chimps","chigorin","chianti","cheval","chet's","cheep","checkups","check's","cheaters","chase's","charted","celibate","cautiously","cautionary","castell","carpentry","caroling","carjacking","caritas","caregiver","cardiology","carb","capturing","canteen","candlesticks","candies","candidacy","canasta","calendars","cain't","caboose","buster's","burro","burnin","buon","bunking","bumming","bullwinkle","budgets","brummel","brooms","broadcasts","britt's","brews","breech","breathin","braslow","bracing","bouts","botulism","bosnia","boorish","bluenote","bloodless","blayne","blatantly","blankie","birdy","bene","beetles","bedbugs","becuase","becks","bearers","bazooka","baywatch","bavarian","baseman","bartender's","barrister","barmaid","barges","bared","baracus","banal","bambino","baltic","baku","bakes","badminton","bacon's","backpacks","authorizing","aurelius","attentions","atrocious","ativan","athame","asunder","astound","assuring","aspirins","asphyxiation","ashtrays","aryans","artistry","arnon","aren","approximate","apprehension","appraisal","applauding","anya's","anvil","antiquing","antidepressants","annoyingly","amputate","altruistic","alotta","allegation","alienation","algerian","algae","alerting","airport's","aided","agricultural","afterthought","affront","affirm","adapted","actuality","acoustics","acoustic","accumulate","accountability","abysmal","absentee","zimm","yves","yoohoo","ymca","yeller","yakushova","wuzzy","wriggle","worrier","workmen","woogyman","womanizer","windpipe","windex","windbag","willy's","willin","widening","whisking","whimsy","wendall","weeny","weensy","weasels","watery","watcha","wasteful","waski","washcloth","wartime","waaay","vowel","vouched","volkswagen","viznick","visuals","visitor's","veteran's","ventriloquist","venomous","vendors","vendettas","veils","vehicular","vayhue","vary","varies","van's","vamanos","vadimus","uuhh","upstage","uppity","upheaval","unsaid","unlocking","universally","unintentionally","undisputed","undetected","undergraduate","undergone","undecided","uncaring","unbearably","twos","tween","tuscan","turkey's","tumor's","tryout","trotting","tropics","trini","trimmings","trickier","tree's","treatin","treadstone","trashcan","transports","transistor","transcendent","tramps","toxicity","townsfolk","torturous","torrid","toothpicks","tombs","tolerable","toenail","tireless","tiptoeing","tins","tinkerbell","tink","timmay","tillinghouse","tidying","tibia","thumbing","thrusters","thrashing","thompson's","these'll","testicular","terminology","teriyaki","tenors","tenacity","tellers","telemetry","teas","tea's","tarragon","taliban","switchblade","swicker","swells","sweatshirts","swatches","swatch","swapped","suzanne's","surging","supremely","suntan","sump'n","suga","succumb","subsidize","subordinate","stumbles","stuffs","stronghold","stoppin","stipulate","stewie's","stenographer","steamroll","stds","stately","stasis","stagger","squandered","splint","splendidly","splatter","splashy","splashing","spectra's","specter","sorry's","sorcerers","soot","somewheres","somber","solvent","soldier's","soir","snuggled","snowmobile","snowball's","sniffed","snake's","snags","smugglers","smudged","smirking","smearing","slings","sleet","sleepovers","sleek","slackers","skirmish","siree","siphoning","singed","sincerest","signifying","sidney's","sickened","shuffled","shriveled","shorthanded","shittin","shish","shipwrecked","shins","shingle","sheetrock","shawshank","shamu","sha're","servitude","sequins","seinfeld's","seat's","seascape","seam","sculptor","scripture","scrapings","scoured","scoreboard","scorching","sciences","sara's","sandpaper","salvaged","saluting","salud","salamander","rugrats","ruffles","ruffled","rudolph's","router","roughnecks","rougher","rosslyn","rosses","rosco's","roost","roomy","romping","romeo's","robs","roadie","ride's","riddler","rianna's","revolutionize","revisions","reuniting","retake","retaining","restitution","restaurant's","resorts","reputed","reprimanded","replies","renovate","remnants","refute","refrigerated","reforms","reeled","reefs","reed's","redundancies","rectangle","rectal","recklessly","receding","reassignment","rearing","reapers","realms","readout","ration","raring","ramblings","racetrack","raccoons","quoi","quell","quarantined","quaker","pursuant","purr","purging","punters","pulpit","publishers","publications","psychologists","psychically","provinces","proust","protocols","prose","prophets","project's","priesthood","prevailed","premarital","pregnancies","predisposed","precautionary","poppin","pollute","pollo","podunk","plums","plaything","plateau","pixilated","pivot","pitting","piranhas","pieced","piddles","pickled","picker","photogenic","phosphorous","phases","pffft","petey's","pests","pestilence","pessimist","pesos","peruvian","perspiration","perps","penticoff","pedals","payload","passageways","pardons","paprika","paperboy","panics","pancamo","pam's","paleontologist","painting's","pacifist","ozzie","overwhelms","overstating","overseeing","overpaid","overlap","overflow","overdid","outspoken","outlive","outlaws","orthodontist","orin","orgies","oreos","ordover","ordinates","ooooooh","oooohhh","omelettes","officiate","obtuse","obits","oakwood","nymph","nutritional","nuremberg","nozzle","novocaine","notable","noooooooooo","node","nipping","nilly","nikko","nightstick","nicaragua","neurology","nelson's","negate","neatness","natured","narrowly","narcotic","narcissism","napoleon's","nana's","namun","nakatomi","murky","muchacho","mouthwash","motzah","motherfucker's","mortar","morsel","morrison's","morph","morlocks","moreover","mooch","monoxide","moloch","molest","molding","mohra","modus","modicum","mockolate","mobility","missionaries","misdemeanors","miscalculation","minorities","middies","metric","mermaids","meringue","mercilessly","merchandising","ment","meditating","me'n","mayakovsky","maximillian","martinique","marlee","markovski","marissa's","marginal","mansions","manitoba","maniacal","maneuvered","mags","magnificence","maddening","lyrical","lutze","lunged","lovelies","lou's","lorry","loosening","lookee","liver's","liva","littered","lilac","lightened","lighted","licensing","lexington","lettering","legality","launches","larvae","laredo","landings","lancelot's","laker","ladyship's","laces","kurzon","kurtzweil","kobo","knowledgeable","kinship","kind've","kimono","kenji","kembu","keanu","kazuo","kayaking","juniors","jonesing","joad","jilted","jiggling","jewelers","jewbilee","jeffrey's","jamey's","jacqnoud","jacksons","jabs","ivories","isnt","irritation","iraqis","intellectuals","insurmountable","instances","installments","innocuous","innkeeper","inna","influencing","infantery","indulged","indescribable","incorrectly","incoherent","inactive","inaccurate","improperly","impervious","impertinent","imperfections","imhotep","ideology","identifies","i'il","hymns","huts","hurdles","hunnert","humpty","huffy","hourly","horsies","horseradish","hooo","honours","honduras","hollowed","hogwash","hockley","hissing","hiromitsu","hierarchy","hidin","hereafter","helpmann","haughty","happenings","hankie","handsomely","halliwells","haklar","haise","gunsights","gunn's","grossly","grossed","grope","grocer","grits","gripping","greenpeace","granddad's","grabby","glorificus","gizzard","gilardi","gibarian","geminon","gasses","garnish","galloping","galactic","gairwyn","gail's","futterman","futility","fumigated","fruitless","friendless","freon","fraternities","franc","fractions","foxes","foregone","forego","foliage","flux","floored","flighty","fleshy","flapjacks","fizzled","fittings","fisherman's","finalist","ficus","festering","ferragamo's","federation","fatalities","farbman","familial","famed","factual","fabricate","eyghon","extricate","exchanges","exalted","evolving","eventful","esophagus","eruption","envision","entre","enterprising","entail","ensuring","enrolling","endor","emphatically","eminent","embarrasses","electroshock","electronically","electrodes","efficiently","edinburgh","ecstacy","ecological","easel","dwarves","duffle","drumsticks","drake's","downstream","downed","dollface","divas","distortion","dissent","dissection","dissected","disruptive","disposing","disparaging","disorientation","disintegrated","discounts","disarming","dictated","devoting","deviation","detective's","dessaline","deprecating","deplorable","delve","deity","degenerative","deficiencies","deduct","decomposed","deceased's","debbie's","deathly","dearie","daunting","dankova","czechoslovakia","cyclotron","cyberspace","cutbacks","cusp","culpable","cuddled","crypto","crumpets","cruises","cruisers","cruelly","crowns","crouching","cristo","crip","criminology","cranium","cramming","cowering","couric","counties","cosy","corky's","cordesh","conversational","conservatory","conklin's","conducive","conclusively","competitions","compatibility","coeur","clung","cloud's","clotting","cleanest","classify","clambake","civilizations","cited","cipher","cinematic","chlorine","chipping","china's","chimpanzee","chests","checkpoints","cheapen","chainsaws","censure","censorship","cemeteries","celebrates","ceej","cavities","catapult","cassettes","cartridge","caravaggio","carats","captivating","cancers","campuses","campbell's","calrissian","calibre","calcutta","calamity","butt's","butlers","busybody","bussing","bureau's","bunion","bundy's","bulimic","bulgaria","budging","brung","browbeat","brokerage","brokenhearted","brecher","breakdowns","braun's","bracebridge","boyhood","botanical","bonuses","boning","blowhard","bloc","blisters","blackboard","blackbird","births","birdies","bigotry","biggy","bibliography","bialy","bhamra","bethlehem","bet's","bended","belgrade","begat","bayonet","bawl","battering","baste","basquiat","barrymore","barrington's","barricaded","barometer","balsom's","balled","ballast","baited","badenweiler","backhand","aztec","axle","auschwitz","astrophysics","ascenscion","argumentative","arguably","arby's","arboretum","aramaic","appendicitis","apparition","aphrodite","anxiously","antagonistic","anomalies","anne's","angora","anecdotes","anand","anacott","amniotic","amenities","ambience","alonna","aleck","albert's","akashic","airing","ageless","afro","affiliates","advertisers","adobe","adjustable","acrobat","accommodation","accelerating","absorbing","abouts","abortions","abnormalities","aawwww","aaaaarrrrrrggghhh","zuko's","zoloft","zendi","zamboni","yuppies","yodel","y'hear","wyck","wrangle","wounding","worshippers","worker's","worf","wombosi","wittle","withstanding","wisecracks","williamsburg","wilder's","wiggly","wiggling","wierd","whittlesley","whipper","whattya","whatsamatter","whatchamacallit","whassup","whad'ya","weighted","weakling","waxy","waverly","wasps","warhol","warfarin","waponis","wampum","walled","wadn't","waco","vorash","vogler's","vizzini","visas","virtucon","viridiana","veve","vetoed","vertically","veracity","ventricular","ventilated","varicose","varcon","vandalized","vampire's","vamos","vamoose","val's","vaccinated","vacationing","usted","urinal","uppers","upkeep","unwittingly","unsigned","unsealed","unplanned","unhinged","unhand","unfathomable","unequivocally","unearthed","unbreakable","unanimously","unadvisedly","udall","tynacorp","twisty","tuxes","tussle","turati","tunic","tubing","tsavo","trussed","troublemakers","trollop","trip's","trinket","trilogy","tremors","trekkie","transsexual","transitional","transfusions","tractors","toothbrushes","toned","toke","toddlers","titan's","tita","tinted","timon","timeslot","tightened","thundering","thorpey","thoracic","this'd","thespian","therapist's","theorem","thaddius","texan","tenuous","tenths","tenement","telethon","teleprompter","technicolor","teaspoon","teammate","teacup","taunted","tattle","tardiness","taraka","tappy","tapioca","tapeworm","tanith","tandem","talons","talcum","tais","tacks","synchronized","swivel","swig","swaying","swann's","suppression","supplements","superpower","summed","summarize","sumbitch","sultry","sulfur","sues","subversive","suburbia","substantive","styrofoam","stylings","struts","strolls","strobe","streaks","strategist","stockpile","stewardesses","sterilized","sterilize","stealin","starred","stakeouts","stad","squawk","squalor","squabble","sprinkled","sportsmanship","spokes","spiritus","spectators","specialties","sparklers","spareribs","sowing","sororities","sorbonne","sonovabitch","solicit","softy","softness","softening","socialite","snuggling","snatchers","snarling","snarky","snacking","smythe's","smears","slumped","slowest","slithering","sleepers","sleazebag","slayed","slaughtering","skynet","skidded","skated","sivapathasundaram","sitter's","sitcoms","sissies","sinai","silliness","silences","sidecar","sicced","siam","shylock","shtick","shrugged","shriek","shredder","shoves","should'a","shorten","shortcake","shockingly","shirking","shelly's","shedding","shaves","shatner","sharpener","shapely","shafted","sexless","sequencing","septum","semitic","selflessness","sega","sectors","seabea","scuff","screwball","screened","scoping","scooch","scolding","scholarly","schnitzel","schemed","scalper","sayings","saws","sashimi","santy","sankara","sanest","sanatorium","sampled","samoan","salzburg","saltwater","salma","salesperson","sakulos","safehouse","sabers","rwanda","ruth's","runes","rumblings","rumbling","ruijven","roxie's","round's","ringers","rigorous","righto","rhinestones","reviving","retrieving","resorted","reneging","remodelling","reliance","relentlessly","relegated","relativity","reinforced","reigning","regurgitate","regulated","refills","referencing","reeking","reduces","recreated","reclusive","recklessness","recanted","ranges","ranchers","rallied","rafer","racy","quintet","quaking","quacks","pulses","provision","prophesied","propensity","pronunciation","programmer","profusely","procedural","problema","principals","prided","prerequisite","preferences","preceded","preached","prays","postmark","popsicles","poodles","pollyanna","policing","policeman's","polecat","polaroids","polarity","pokes","poignant","poconos","pocketful","plunging","plugging","pleeease","pleaser","platters","pitied","pinetti","piercings","phyllis's","phooey","phonies","pestering","periscope","perennial","perceptions","pentagram","pelts","patronized","parliamentary","paramour","paralyze","paraguay","parachutes","pancreatic","pales","paella","paducci","oxymoron","owatta","overpass","overgrown","overdone","overcrowded","overcompensating","overcoming","ostracized","orphaned","organise","organisation","ordinate","orbiting","optometrist","oprah's","operandi","oncology","on's","omoc","omens","okayed","oedipal","occupants","obscured","oboe","nuys","nuttier","nuptial","nunheim","noxious","nourish","notepad","notation","nordic","nitroglycerin","niki's","nightmare's","nightlife","nibblet","neuroses","neighbour's","navy's","nationally","nassau","nanosecond","nabbit","mythic","murdock's","munchkins","multiplied","multimillion","mulroney","mulch","mucous","muchas","moxie","mouth's","mountaintop","mounds","morlin","mongorians","moneymaker","moneybags","monde","mom'll","molto","mixup","mitchell's","misgivings","misery's","minerals","mindset","milo's","michalchuk","mesquite","mesmerized","merman","mensa","megan's","media's","meaty","mbwun","materialize","materialistic","mastery","masterminded","mastercard","mario's","marginally","mapuhe","manuscripts","manny's","malvern","malfunctioning","mahatma","mahal","magnify","macnamara","macinerney","machinations","macarena","macadamia","lysol","luxembourg","lurks","lumpur","luminous","lube","lovelorn","lopsided","locator","lobbying","litback","litany","linea","limousines","limo's","limes","lighters","liechtenstein","liebkind","lids","libya","levity","levelheaded","letterhead","lester's","lesabre","leron","lepers","legions","lefts","leftenant","learner's","laziness","layaway","laughlan","lascivious","laryngitis","laptops","lapsed","laos","landok","landfill","laminated","laden","ladders","labelled","kyoto","kurten","kobol","koala","knucklehead","knowed","knotted","kit's","kinsa","kiln","kickboxing","karnovsky","karat","kacl's","judiciary","judaism","journalistic","jolla","joked","jimson","jettison","jet's","jeric","jeeves","jay's","jawed","jankis","janitors","janice's","jango","jamaican","jalopy","jailbreak","jackers","jackasses","j'ai","ivig","invalidate","intoxicated","interstellar","internationally","intercepting","intercede","integrate","instructors","insinuations","insignia","inn's","inflicting","infiltrated","infertile","ineffective","indies","indie","impetuous","imperialist","impaled","immerse","immaterial","imbeciles","imam","imagines","idyllic","idolized","icebox","i'd've","hypochondriac","hyphen","hydraulic","hurtling","hurried","hunchback","hums","humid","hullo","hugger","hubby's","howard's","hostel","horsting","horned","hoooo","homies","homeboys","hollywood's","hollandaise","hoity","hijinks","heya","hesitates","herrero","herndorff","hemp","helplessly","heeyy","heathen","hearin","headband","harv","harrassment","harpies","harmonious","harcourt","harbors","hannah's","hamstring","halstrom","hahahahaha","hackett's","hacer","gunmen","guff","grumbling","grimlocks","grift","greets","grandmothers","grander","granddaughter's","gran's","grafts","governing","gordievsky","gondorff","godorsky","goddesses","glscripts","gillman's","geyser","gettysburg","geological","gentlemen's","genome","gauntlet","gaudy","gastric","gardeners","gardener's","gandolf","gale's","gainful","fuses","fukienese","fucker's","frizzy","freshness","freshening","freb","fraught","frantically","fran's","foxbooks","fortieth","forked","forfeited","forbidding","footed","foibles","flunkies","fleur","fleece","flatbed","flagship","fisted","firefight","fingerpaint","fined","filibuster","fiancee's","fhloston","ferrets","fenceline","femur","fellow's","fatigues","farmhouse","fanucci","fantastically","familiars","falafel","fabulously","eyesore","extracting","extermination","expedient","expectancy","exiles","executor","excluding","ewwww","eviscerated","eventual","evac","eucalyptus","ethnicity","erogenous","equestrian","equator","epidural","enrich","endeavors","enchante","embroidered","embarassed","embarass","embalming","emails","elude","elspeth","electrocute","electrified","eigth","eheh","eggshell","eeyy","echinacea","eases","earpiece","earlobe","dwarfs","dumpsters","dumbshit","dumbasses","duloc","duisberg","drummed","drinkers","dressy","drainage","dracula's","dorma","dolittle","doily","divvy","diverting","ditz","dissuade","disrespecting","displacement","displace","disorganized","dismantled","disgustingly","discriminate","discord","disapproving","dinero","dimwit","diligence","digitally","didja","diddy","dickless","diced","devouring","devlin's","detach","destructing","desperado","desolate","designation","derek's","deposed","dependency","dentist's","demonstrates","demerits","delirium","degrade","deevak","deemesa","deductions","deduce","debriefed","deadbeats","dazs","dateline","darndest","damnable","dalliance","daiquiri","d'agosta","cuvee's","cussing","curate","cryss","cripes","cretins","creature's","crapper","crackerjack","cower","coveting","couriers","countermission","cotswolds","cornholio","copa","convinces","convertibles","conversationalist","contributes","conspirators","consorting","consoled","conservation","consarn","confronts","conformity","confides","confidentially","confederacy","concise","competence","commited","commissioners","commiserate","commencing","comme","commandos","comforter","comeuppance","combative","comanches","colosseum","colling","collaboration","coli","coexist","coaxing","cliffside","clayton's","clauses","cia's","chuy","chutes","chucked","christian's","chokes","chinaman","childlike","childhoods","chickening","chicano","chenowith","chassis","charmingly","changin","championships","chameleon","ceos","catsup","carvings","carlotta's","captioning","capsize","cappucino","capiche","cannonball","cannibal","candlewell","cams","call's","calculation","cakewalk","cagey","caesar's","caddie","buxley","bumbling","bulky","bulgarian","bugle","buggered","brussel","brunettes","brumby","brotha","bros","bronck","brisket","bridegroom","breathing's","breakout","braveheart","braided","bowled","bowed","bovary","bordering","bookkeeper","bluster","bluh","blue's","blot","bloodline","blissfully","blarney","binds","billionaires","billiard","bide","bicycles","bicker","berrisford","bereft","berating","berate","bendy","benches","bellevue","belive","believers","belated","beikoku","beens","bedspread","bed's","bear's","bawdy","barrett's","barreling","baptize","banya","balthazar","balmoral","bakshi","bails","badgered","backstreet","backdrop","awkwardly","avoids","avocado","auras","attuned","attends","atheists","astaire","assuredly","art's","arrivederci","armaments","arises","argyle","argument's","argentine","appetit","appendectomy","appealed","apologetic","antihistamine","antigua","anesthesiologist","amulets","algonquin","alexander's","ales","albie","alarmist","aiight","agility","aforementioned","adstream","adolescents","admirably","adjectives","addison's","activists","acquaint","acids","abound","abominable","abolish","abode","abfc","aaaaaaah","zorg","zoltan","zoe's","zekes","zatunica","yama","wussy","wrcw","worded","wooed","woodrell","wiretap","windowsill","windjammer","windfall","whitey's","whitaker's","whisker","whims","whatiya","whadya","westerns","welded","weirdly","weenies","webster's","waunt","washout","wanto","waning","vitality","vineyards","victimless","vicki's","verdad","veranda","vegan","veer","vandaley","vancouver","vancomycin","valise","validated","vaguest","usefulness","upshot","uprising","upgrading","unzip","unwashed","untrained","unsuitable","unstuck","unprincipled","unmentionables","unjustly","unit's","unfolds","unemployable","uneducated","unduly","undercut","uncovering","unconsciousness","unconsciously","unbeknownst","unaffected","ubiquitous","tyndareus","tutors","turncoat","turlock","tulle","tuesday's","tryouts","truth's","trouper","triplette","trepkos","tremor","treeger","treatment's","traveller","traveler's","trapeze","traipse","tradeoff","trach","torin","tommorow","tollan","toity","timpani","tilted","thumbprint","throat's","this's","theater's","thankless","terrestrial","tenney's","tell'em","telepathy","telemarketing","telekinesis","teevee","teeming","tc's","tarred","tankers","tambourine","talentless","taki","takagi","swooped","switcheroo","swirly","sweatpants","surpassed","surgeon's","supermarkets","sunstroke","suitors","suggestive","sugarcoat","succession","subways","subterfuge","subservient","submitting","subletting","stunningly","student's","strongbox","striptease","stravanavitch","stradling","stoolie","stodgy","stocky","stimuli","stigmata","stifle","stealer","statewide","stark's","stardom","stalemate","staggered","squeezes","squatter","squarely","sprouted","spool","spirit's","spindly","spellman's","speedos","specify","specializing","spacey","soups","soundly","soulmates","somethin's","somebody'll","soliciting","solenoid","sobering","snowflakes","snowballs","snores","slung","slimming","slender","skyscrapers","skulk","skivvies","skillful","skewered","skewer","skaters","sizing","sistine","sidebar","sickos","shushing","shunt","shugga","shone","shol'va","shiv","shifter","sharply","sharpened","shareholder","shapeshifter","shadowing","shadoe","serviced","selwyn","selectman","sefelt","seared","seamen","scrounging","scribbling","scotty's","scooping","scintillating","schmoozing","schenectady","scene's","scattering","scampi","scallops","sat's","sapphires","sans","sanitarium","sanded","sanction","safes","sacrificial","rudely","roust","rosebush","rosasharn","rondell","roadhouse","riveted","rile","ricochet","rhinoceros","rewrote","reverence","revamp","retaliatory","rescues","reprimand","reportedly","replicators","replaceable","repeal","reopening","renown","remo's","remedied","rembrandt","relinquishing","relieving","rejoicing","reincarnated","reimbursed","refinement","referral","reevaluate","redundancy","redid","redefine","recreating","reconnected","recession","rebelling","reassign","rearview","reappeared","readily","rayne","ravings","ravage","ratso","rambunctious","rallying","radiologist","quiver","quiero","queef","quark","qualms","pyrotechnics","pyro","puritan","punky","pulsating","publisher's","psychosomatic","provisional","proverb","protested","proprietary","promiscuous","profanity","prisoner's","prioritize","preying","predisposition","precocious","precludes","preceding","prattling","prankster","povich","potting","postpartum","portray","porter's","porridge","polluting","pogo","plowing","plating","plankton","pistachio","pissin","pinecone","pickpocket","physicists","physicals","pesticides","peruse","pertains","personified","personalize","permitting","perjured","perished","pericles","perfecting","percentages","pepys","pepperdine","pembry","peering","peels","pedophile","patties","pathogen","passkey","parrots","paratroopers","paratrooper","paraphernalia","paralyzing","panned","pandering","paltry","palpable","painkiller","pagers","pachyderm","paced","overtaken","overstay","overestimated","overbite","outwit","outskirts","outgrow","outbid","origins","ordnance","ooze","ooops","oomph","oohhh","omni","oldie","olas","oddball","observers","obscurity","obliterate","oblique","objectionable","objected","oars","o'keefe","nygma","nyet","nouveau","notting","nothin's","noches","nnno","nitty","nighters","nigger's","niche","newsstands","newfoundland","newborns","neurosurgery","networking","nellie's","nein","neighboring","negligible","necron","nauseated","nastiest","nasedo's","narrowing","narrator","narcolepsy","napa","nala","nairobi","mutilate","muscled","murmur","mulva","multitude","multiplex","mulling","mules","mukada","muffled","mueller's","motorized","motif","mortgages","morgues","moonbeams","monogamy","mondays","mollusk","molester","molestation","molars","modifications","modeled","moans","misuse","misprint","mismatched","mirth","minnow","mindful","mimosas","millander","mikhail","mescaline","mercutio","menstrual","menage","mellowing","medicaid","mediator","medevac","meddlesome","mcgarry's","matey","massively","massacres","marky","many's","manifests","manifested","manicures","malevolent","malaysian","majoring","madmen","mache","macarthur's","macaroons","lydell","lycra","lunchroom","lunching","lozenges","lorenzo's","looped","look's","lolly","lofty","lobbyist","litigious","liquidate","linoleum","lingk","lincoln's","limitless","limitation","limber","lilacs","ligature","liftoff","lifeboats","lemmiwinks","leggo","learnin","lazarre","lawyered","landmarks","lament","lambchop","lactose","kringle","knocker","knelt","kirk's","kins","kiev","keynote","kenyon's","kenosha","kemosabe","kazi","kayak","kaon","kama","jussy","junky","joyce's","journey's","jordy","jo's","jimmies","jetson","jeriko","jean's","janet's","jakovasaur","jailed","jace","issacs","isotopes","isabela","irresponsibility","ironed","intravenous","intoxication","intermittent","insufficient","insinuated","inhibitors","inherits","inherently","ingest","ingenue","informs","influenza","inflexible","inflame","inevitability","inefficient","inedible","inducement","indignant","indictments","indentured","indefensible","inconsistencies","incomparable","incommunicado","in's","improvising","impounded","illogical","ignoramus","igneous","idlewild","hydrochloric","hydrate","hungover","humorless","humiliations","humanoid","huhh","hugest","hudson's","hoverdrone","hovel","honor's","hoagie","hmmph","hitters","hitchhike","hit's","hindenburg","hibernating","hermione","herds","henchman","helloooo","heirlooms","heaviest","heartsick","headshot","headdress","hatches","hastily","hartsfield's","harrison's","harrisburg","harebrained","hardships","hapless","hanen","handsomer","hallows","habitual","habeas","guten","gus's","gummy","guiltier","guidebook","gstaad","grunts","gruff","griss","grieved","grids","grey's","greenville","grata","granny's","gorignak","goosed","goofed","goat's","gnarly","glowed","glitz","glimpses","glancing","gilmores","gilligan's","gianelli","geraniums","georgie's","genitalia","gaydar","gart","garroway","gardenia","gangbusters","gamblers","gamble's","galls","fuddy","frumpy","frowning","frothy","fro'tak","friars","frere","freddy's","fragrances","founders","forgettin","footsie","follicles","foes","flowery","flophouse","floor's","floatin","flirts","flings","flatfoot","firefighter","fingerprinting","fingerprinted","fingering","finald","film's","fillet","file's","fianc","femoral","fellini","federated","federales","faze","fawkes","fatally","fascists","fascinates","farfel","familiarity","fambly","falsified","fait","fabricating","fables","extremist","exterminators","extensively","expectant","excusez","excrement","excercises","excavation","examinations","evian","evah","etins","esther's","esque","esophageal","equivalency","equate","equalizer","environmentally","entrees","enquire","enough's","engine's","endorsed","endearment","emulate","empathetic","embodies","emailed","eggroll","edna's","economist","ecology","eased","earmuffs","eared","dyslexic","duper","dupe","dungeons","duncan's","duesouth","drunker","drummers","druggie","dreadfully","dramatics","dragnet","dragline","dowry","downplay","downers","doritos","dominatrix","doers","docket","docile","diversify","distracts","disruption","disloyalty","disinterested","disciple","discharging","disagreeable","dirtier","diplomats","dinghy","diner's","dimwitted","dimoxinil","dimmy","dietary","didi","diatribe","dialects","diagrams","diagnostics","devonshire","devising","deviate","detriment","desertion","derp","derm","dept","depressants","depravity","dependence","denounced","deniability","demolished","delinquents","defiled","defends","defamation","deepcore","deductive","decrease","declares","declarations","decimated","decimate","deb's","deadbolt","dauthuille","dastardly","darla's","dans","daiquiris","daggers","dachau","d'ah","cymbals","customized","curved","curiouser","curdled","cupid's","cults","cucamonga","cruller","cruces","crow's","crosswalk","crossover","crinkle","crescendo","cremate","creeper","craftsman","cox's","counteract","counseled","couches","coronet","cornea","cornbread","corday","copernicus","conveyed","contrition","contracting","contested","contemptible","consultants","constructing","constipated","conqueror","connor's","conjoined","congenital","confounded","condescend","concubine","concoct","conch","concerto","conceded","compounded","compensating","comparisons","commoners","committment","commencement","commandeered","comely","coined","cognitive","codex","coddled","cockfight","cluttered","clunky","clownfish","cloaked","cliches","clenched","cleft","cleanin","cleaner's","civilised","circumcised","cimmeria","cilantro","chutzpah","chutney","chucking","chucker","chronicles","chiseled","chicka","chicago's","chattering","charting","characteristic","chaise","chair's","cervix","cereals","cayenne","carrey","carpal","carnations","caricature","cappuccinos","candy's","candied","cancer's","cameo","calluses","calisthenics","cadre","buzzsaw","bushy","burners","bundled","bum's","budington","buchanans","brock's","britons","brimming","breeders","breakaway","braids","bradley's","boycotting","bouncers","botticelli","botherin","boosting","bookkeeping","booga","bogyman","bogged","bluepoint's","bloodthirsty","blintzes","blanky","blak","biosphere","binturong","billable","bigboote","bewildered","betas","bernard's","bequeath","beirut","behoove","beheaded","beginners","beginner","befriend","beet","bedpost","bedded","bay's","baudelaires","barty","barreled","barboni","barbeque","bangin","baltus","bailout","bag's","backstabber","baccarat","awning","awaited","avenues","austen","augie","auditioned","auctions","astrology","assistant's","assassinations","aspiration","armenians","aristocrat","arguillo","archway","archaeologist","arcane","arabic","apricots","applicant","apologising","antennas","annyong","angered","andretti","anchorman","anchored","amritsar","amour","amidst","amid","americana","amenable","ambassadors","ambassador's","amazement","allspice","alannis","airliner","airfare","airbags","ahhhhhhhhh","ahhhhhhhh","ahhhhhhh","agitator","afternoon's","afghan","affirmation","affiliate","aegean","adrenal","actor's","acidosis","achy","achoo","accessorizing","accentuate","academically","abuses","abrasions","abilene","abductor","aaaahhh","zuzu","zoot","zeroing","zelner","zeldy","yo's","yevgeny","yeup","yeska","yellows","yeesh","yeahh","yamuri","yaks","wyatt's","wspr","writing's","wrestlers","wouldn't've","workmanship","woodsman","winnin","winked","wildness","widespread","whoring","whitewash","whiney","when're","wheezer","wheelman","wheelbarrow","whaling","westerburg","wegener's","weekdays","weeding","weaving","watermelons","watcher's","washboard","warmly","wards","waltzes","walt's","walkway","waged","wafting","voulez","voluptuous","vitone","vision's","villa's","vigilantes","videotaping","viciously","vices","veruca","vermeer","verifying","ventured","vaya","vaults","vases","vasculitis","varieties","vapor","valets","upriver","upholstered","upholding","unwavering","unused","untold","unsympathetic","unromantic","unrecognizable","unpredictability","unmask","unleashing","unintentional","unilaterally","unglued","unequivocal","underside","underrated","underfoot","unchecked","unbutton","unbind","unbiased","unagi","uhhhhh","turnovers","tugging","trouble's","triads","trespasses","treehorn","traviata","trappers","transplants","transforming","trannie","tramping","trainers","traders","tracheotomy","tourniquet","tooty","toothless","tomarrow","toasters","tine","tilting","thruster","thoughtfulness","thornwood","therapies","thanksgiving's","tha's","terri's","tengo","tenfold","telltale","telephoto","telephoned","telemarketer","teddy's","tearin","tastic","tastefully","tasking","taser","tamed","tallow","taketh","taillight","tadpoles","tachibana","syringes","sweated","swarthy","swagger","surrey","surges","surf's","supermodels","superhighway","sunup","sun'll","summaries","sumerian","sulu","sulphur","sullivan's","sulfa","suis","sugarless","sufficed","substituted","subside","submerged","subdue","styling","strolled","stringy","strengthens","street's","straightest","straightens","storyteller","storefront","stopper","stockpiling","stimulant","stiffed","steyne","sternum","stereotypical","stepladder","stepbrother","steers","steeple","steelheads","steakhouse","statue's","stathis","stankylecartmankennymr","standoffish","stalwart","stallions","stacy's","squirted","squeaker","squad's","spuds","spritz","sprig","sprawl","spousal","sportsman","sphincter","spenders","spearmint","spatter","sparrows","spangled","southey","soured","sonuvabitch","somethng","societies","snuffed","snowfall","snowboarding","sniffs","snafu","smokescreen","smilin","slurred","slurpee","slums","slobs","sleepwalker","sleds","slays","slayage","skydiving","sketched","skateboarding","skanks","sixed","siri","sired","siphoned","siphon","singer's","simpering","silencer","sigfried","siena","sidearm","siddons","sickie","siberian","shuteye","shuk","shuffleboard","shrubberies","shrouded","showmanship","shower's","shouldn't've","shortwave","shoplift","shooter's","shiatsu","sheriffs","shak","shafts","serendipity","serena's","sentries","sentance","sensuality","semesters","seething","sedition","secular","secretions","searing","scuttlebutt","sculpt","scowling","scouring","scorecard","schwarzenegger","schoolers","schmucks","scepters","scaly","scalps","scaling","scaffolding","sauces","sartorius","santen","sampler","salivating","salinger","sainthood","said's","saget","saddens","rygalski","rusting","rumson's","ruination","rueland","rudabaga","rubles","rowr","rottweiler","rotations","roofies","romantics","rollerblading","roldy","rob's","roadshow","rike","rickets","rible","rheza","revisiting","revisited","reverted","retrospective","retentive","resurface","restores","respite","resounding","resorting","resolutions","resists","repulse","repressing","repaying","reneged","relays","relayed","reinforce","regulator","registers","refunds","reflections","rediscover","redecorated","recruitment","reconstructive","reconstructed","recommitted","recollect","recoil","recited","receptor","receptacle","receivers","reassess","reanimation","realtors","razinin","ravaged","ratios","rationalization","ratified","ratatouille","rashum","rasczak","rarer","rapping","rancheros","rampler","rain's","railway","racehorse","quotient","quizzing","quips","question's","quartered","qualification","purring","pummeling","puede","publicized","psychedelic","proximo","proteins","protege","prospectus","pronouncing","pronoun","prolonging","program's","proficient","procreation","proclamations","prio","principled","prides","pricing","presbyterian","preoccupation","prego","preferential","predicts","precog","prattle","pounced","potshots","potpourri","portsmouth","porque","poppie's","poms","pomeranian","pomegranates","polynesian","polymer","polenta","plying","plume","plumber's","pluie","plough","plesac","playoff","playmates","planter","plantains","plaintiff's","pituitary","pisano's","pillowcase","piddle","pickers","phys","photocopied","philistine","pfeiffer's","peyton's","petitioned","persuading","perpetuate","perpetually","periodically","perilous","pensacola","pawned","pausing","pauper","patterned","pats","patronage","passover","partition","parter","parlez","parlay","parkinson's","parades","paperwork's","pally","pairing","ovulation","overtake","overstate","overpowering","overpowered","overconfident","overbooked","ovaltine","ouzo","outweighs","outings","outfit's","out's","ottos","orrin","originate","orifice","orangutan","optimal","optics","opportunistic","ooww","oopsy","ooooooooh","ooohhhh","onyx","onslaught","oldsmobile","ocular","ocean's","obstruct","obscenely","o'dwyer","o'brien's","nutjob","nunur","notifying","nostrand","nonny","nonfat","noblest","nimble","nikes","nicht","newsworthy","network's","nestled","nessie","necessities","nearsighted","ne'er","nazareth","navidad","nastier","nasa's","narco","nakedness","muted","mummified","multiplying","mudda","mtv's","mozzarella","moxica","motorists","motivator","motility","mothafucka","mortmain","mortgaged","mortally","moroccan","mores","moonshine","mongers","moe's","modify","mobster's","mobilization","mobbed","mitigating","mistah","misrepresented","mishke","misfortunes","misdirection","mischievous","mirrored","mineshaft","mimosa","millers","millaney","miho","midday","microwaves","mick's","metzenbaum","metres","merc","mentoring","medicine's","mccovey","maya's","mau's","masterful","masochistic","martie","marliston","market's","marijawana","marie's","marian's","manya","manuals","mantumbi","mannheim","mania","mane","mami's","malarkey","magnifique","magics","magician's","madrona","madox","madison's","machida","m'mm","m'hm","m'hidi","lyric","luxe","luther's","lusty","lullabies","loveliness","lotions","looka","lompoc","loader","litterbug","litigator","lithe","liquorice","lins","linguistics","linds","limericks","lightbulb","lewises","letch","lemec","lecter's","leavenworth","leasing","leases","layover","layered","lavatory","laurels","launchers","laude","latvian","lateness","lasky's","laparotomy","landlord's","laboring","la's","kumquat","kuato","kroff","krispy","kree","krauts","kona","knuckleheads","knighthood","kiva","kitschy","kippers","kip's","kimbrow","kike","keypad","keepsake","kebab","keane's","kazakhstan","karloff","justices","junket","juicer","judy's","judgemental","jsut","jointed","jogs","jezzie","jetting","jekyll","jehovah's","jeff's","jeeze","jeeter","jeesus","jeebs","janeane","jalapeno","jails","jailbait","jagged","jackin","jackhammer","jacket's","ixnay","ivanovich","issue's","isotope","island's","irritates","irritability","irrevocable","irrefutable","irma's","irked","invoking","intricacies","interferon","intents","inte","insubordinate","instructive","instinctive","inspector's","inserting","inscribed","inquisitive","inlay","injuns","inhibited","infringement","information's","infer","inebriated","indignity","indecisive","incisors","incacha","inauguration","inalienable","impresses","impregnate","impregnable","implosion","immersed","ikea","idolizes","ideological","idealism","icepick","hypothyroidism","hypoglycemic","hyde's","hutz","huseni","humvee","hummingbird","hugely","huddling","housekeeper's","honing","hobnobbing","hobnob","histrionics","histamine","hirohito","hippocratic","hindquarters","hinder","himalayan","hikita","hikes","hightailed","hieroglyphics","heyy","heuh","heretofore","herbalist","her's","henryk","henceforth","hehey","hedriks","heartstrings","headmistress","headlight","harvested","hardheaded","happend","handlers","handlebars","hagitha","habla","gyroscope","guys'd","guy'd","guttersnipe","grump","growed","grovelling","grooves","groan","greenbacks","greats","gravedigger","grating","grasshoppers","grappling","graph","granger's","grandiose","grandest","gram's","grains","grafted","gradual","grabthar's","goop","gooood","goood","gooks","godsakes","goaded","gloria's","glamorama","giveth","gingham","ghostbusters","germane","georgy","geisha","gazzo","gazelles","gargle","garbled","galgenstein","galapagos","gaffe","g'day","fyarl","furnish","furies","fulfills","frowns","frowned","frommer's","frighteningly","fresco","freebies","freakshow","freakishly","fraudulent","fragrant","forewarned","foreclose","forearms","fordson","ford's","fonics","follies","foghorn","fly's","flushes","fluffy's","flitting","flintstone","flemmer","flatline","flamboyant","flabby","fishbowl","firsts","finger's","financier","figs","fidgeting","fictitious","fevers","feur","ferns","feminism","fema","feigning","faxing","fatigued","fathoms","fatherless","fares","fancier","fanatical","fairs","factored","eyelid","eyeglasses","eye's","expresso","exponentially","expletive","expectin","excruciatingly","evidentiary","ever'thing","evelyn's","eurotrash","euphoria","eugene's","eubie","ethiopian","ethiopia","estrangement","espanol","erupted","ernie's","erlich","eres","epitome","epitaph","environments","environmentalists","entrap","enthusiastically","entertainers","entangled","enclose","encased","empowering","empires","emphysema","embers","embargo","emasculating","elizabethan","elephant's","eighths","egyptians","effigy","editions","echoing","eardrum","dyslexia","duplicitous","duplicated","dumpty","dumbledore","dufus","dudley's","duddy","duck's","duchamp","drunkenness","drumlin","drowns","droid","drinky","drifts","drawbridge","dramamine","downey's","douggie","douchebag","dostoyevsky","dorian's","doodling","don'tcha","domo","domineering","doings","dogcatcher","documenting","doctoring","doctoral","dockers","divides","ditzy","dissimilar","dissecting","disparage","disliking","disintegrating","dishwalla","dishonored","dishing","disengaged","discretionary","discard","disavowed","directives","dippy","diorama","dimmed","diminishing","dilate","dijon","digitalis","diggory","dicing","diagnosing","devout","devola","developmental","deter","destiny's","desolation","descendant","derived","derevko's","deployment","dennings","denials","deliverance","deliciously","delicacies","degenerates","degas","deflector","defile","deference","defenders","deduced","decrepit","decreed","decoding","deciphered","dazed","dawdle","dauphine","daresay","dangles","dampen","damndest","customer's","curricular","cucumbers","cucaracha","cryogenically","cruella","crowd's","croaks","croaked","criticise","crit","crisper","creepiest","creep's","credit's","creams","crawford's","crackle","crackin","covertly","cover's","county's","counterintelligence","corrosive","corpsman","cordially","cops'll","convulsions","convoluted","convincingly","conversing","contradictions","conga","confucius","confrontational","confab","condolence","conditional","condition's","condiments","composing","complicit","compiled","compile","compiegne","commuter","commodus","commissions","comings","cometh","combining","colossus","collusion","collared","cockeyed","coastline","clobber","clemonds","clashes","clarithromycin","clarified","cinq","cienega","chronological","christmasy","christmassy","chloroform","chippie","childless","chested","chemistry's","cheerios","cheeco","checklist","chaz","chauvinist","char","chang's","chandlers","chamois","chambermaid","chakras","chak","censored","cemented","cellophane","celestial","celebrations","caveat","catholicism","cataloguing","cartmanland","carples","carny","carded","caramels","captors","caption","cappy","caped","canvassing","cannibalism","canada's","camille's","callback","calibrated","calamine","cal's","cabo","bypassed","buzzy","buttermilk","butterfingers","bushed","burlesque","bunsen","bung","bulimia","bukatari","buildin","budged","bronck's","brom","brobich","bringer","brine","brendell","brawling","bratty","brasi","braking","braised","brackett's","braced","boyish","boundless","botch","borough","boosh","bookies","bonbons","bois","bodes","bobunk","bluntly","blossoming","bloopers","bloomers","bloodstains","bloodhounds","blitzen","blinker","blech","blasts","blanca's","bitterly","biter","biometric","bioethics","bilk","bijan","bigoted","bicep","betrothed","bergdorf's","bereaved","bequeathed","belo","bellowing","belching","beholden","befriended","beached","bawk","battled","batmobile","batman's","baseline","baseball's","barcodes","barch","barbie's","barbecuing","bandanna","baldy","bailey's","baghdad","backwater","backtrack","backdraft","ayuh","awgh","augustino","auctioned","attaching","attaches","atrophy","atrocity","atley","athletics","atchoo","asymmetrical","asthmatic","assoc","assists","ascending","ascend","articulated","arrr","armstrong's","armchair","arisen","archeology","archeological","arachnids","aptly","applesauce","appetizing","antisocial","antagonizing","anorexia","anini","angie's","andersons","anarchist","anagram","amputation","amherst","alleluia","algorithms","albemarle","ajar","airlock","airbag","aims","aimless","ailments","agua","agonized","agitate","aggravating","affirming","aerosol","aerosmith","aeroplane","acing","accumulated","accomplishing","accolades","accidently","academia","abuser","abstain","abso","abnormally","aberration","abandons","aaww","aaaaahh","zlotys","zesty","zerzura","zapruder","zany","zantopia","yugoslavia","youo","yoru","yipe","yeow","yello","yelburton","yeess","yaah","y'knowwhati'msayin","wwhat","wussies","wrenched","would'a","worryin","wormser","wooooo","wookiee","wolfe's","wolchek","woes","wishin","wiseguys","winston's","winky","wine's","windbreaker","wiggy","wieners","wiedersehen","whoopin","whittled","whey","whet","wherefore","wharvey","welts","welt","wellstone","weee","wednesday's","wedges","wavered","watchit","wastebasket","ward's","wank","wango","wallet's","wall's","waken","waiver","waitressed","wacquiem","wabbit","vrykolaka","voula","vote's","volt","volga","volcanoes","vocals","vitally","visualizing","viscous","virgo","virg","violet's","viciousness","vewy","vespers","vertes","verily","vegetarians","vater","vaseline","varied","vaporize","vannacutt","vallens","valenti's","vacated","uterine","usta","ussher","urns","urinating","urchin","upping","upheld","unwitting","untreated","untangle","untamed","unsanitary","unraveled","unopened","unisex","uninvolved","uninteresting","unintelligible","unimaginative","undisclosed","undeserving","undermines","undergarments","unconcerned","unbroken","ukrainian","tyrants","typist","tykes","tybalt","twosome","twits","tutti","turndown","tularemia","tuberculoma","tsimshian","truffaut","truer","truant","trove","triumphed","tripe","trigonometry","trifled","trifecta","tricycle","trickle","tribulations","trevor's","tremont","tremoille","treaties","trawler","translators","transcends","trafficker","touchin","tonnage","tomfoolery","tolls","tokens","tinkered","tinfoil","tightrope","ticket's","thth","thousan","thoracotomy","theses","thesaurus","theologian","themed","thawing","thatta","thar","textiles","testimonies","tessio","terminating","temps","taxidermist","tator","tarkin","tangent","tactile","tachycardia","t'akaya","synthesize","symbolically","swelco","sweetbreads","swedes","swatting","swastika","swamps","suze","supernova","supercollider","sunbathing","summarily","suffocation","sueleen","succinct","subtitle","subsided","submissive","subjecting","subbing","subatomic","stupendous","stunted","stubble","stubbed","striving","streetwalker","strategizing","straining","straightaway","storyline","stoli","stock's","stipulated","stimulus","stiffer","stickup","stens","steamroller","steadwell","steadfast","stave","statutes","stateroom","stans","stacey's","sshhhh","squishing","squinting","squealed","sprouting","sprimp","spreadsheets","sprawled","spotlights","spooning","spoiler","spirals","spinner's","speedboat","spectacles","speakerphone","spar","spaniards","spacing","sovereignty","southglen","souse","soundproof","soothsayer","soon's","sommes","somethings","solidify","soars","snorted","snorkeling","snitches","sniping","sniper's","snifter","sniffin","snickering","sneer","snarl","smila","slinking","sleuth","slater's","slated","slanted","slanderous","slammin","skyscraper","skimp","skilosh","skeletal","skag","siteid","sirloin","singe","simulate","signaled","sighing","sidekicks","sicken","shrubs","shrub","showstopper","shot's","shostakovich","shoreline","shoppin","shoplifter","shop's","shoe's","shoal","shitter","shirt's","shimokawa","sherborne","sheds","shawna's","shavadai","sharpshooters","sharking","shane's","shakespearean","shagged","shaddup","sexism","sexes","sesterces","serotonin","sequences","sentient","sensuous","seminal","selections","seismic","seashell","seaplane","sealing","seahaven","seagrave","scuttled","scullery","scow","scots","scorcher","scorch","schotzie","schnoz","schmooze","schlep","schizo","schindler's","scents","scalping","scalped","scallop","scalding","sayeth","saybrooke","sawed","savoring","sardine","sandy's","sandstorm","sandalwood","samoa","samo","salutations","salad's","saki","sailor's","sagman","s'okay","rudy's","rsvp'd","royale","rousted","rootin","roofs","romper","romanovs","rollercoaster","rolfie","rockers","rock's","robinsons","ritzy","ritualistic","ringwald","rhymed","rheingold","rewrites","revolved","revolutionaries","revoking","reviewer","reverts","retrofit","retort","retinas","resurfaced","respirations","respectively","resolute","resin","reprobate","replaying","repayment","repaint","renquist","renege","renders","rename","remarked","relapsing","rekindled","rejuvenating","rejuvenated","reinstating","reinstatement","reigns","referendums","recriminations","recitals","rechecked","reception's","recaptured","rebounds","reassemble","rears","reamed","realty","reader's","reacquaint","rayanne","ravish","rava","rathole","raspail","rarest","rapists","rants","ramone","ragnar","radiating","radial","racketeer","quotation","quittin","quitters","quintessential","quincy's","queremos","quellek","quelle","quasimodo","quarterbacks","quarter's","pyromaniac","puttanesca","puritanical","purged","purer","puree","punishments","pungent","pummel","puedo","pudge","puce","psychotherapist","psycho's","prosecutorial","prosciutto","propositioning","propellers","pronouns","progresses","procured","procrastination","processes","probationary","primping","primates","priest's","preventative","prevails","presided","preserves","preservatives","prefix","predecessors","preachy","prancer","praetorians","practicality","powders","potus","pot's","postop","positives","poser","portolano","portokalos","poolside","poltergeists","pocketed","poach","plunder","plummeted","plucking","plop","plimpton","plethora","playthings","player's","playboys","plastique","plainclothes","pious","pinpointed","pinkus","pinks","pilgrimage","pigskin","piffle","pictionary","piccata","photocopy","phobias","persia","permissible","perils","perignon","perfumes","peon","penned","penalized","peg's","pecks","pecked","paving","patriarch","patents","patently","passable","participants","parasitic","parasailing","paramus","paramilitary","parabolic","parable","papier","paperback","paintbrush","pacer","paaiint","oxen","owen's","overtures","overthink","overstayed","overrule","overlapping","overestimate","overcooked","outlandish","outgrew","outdoorsy","outdo","outbound","ostensibly","originating","orchestrate","orally","oppress","opposable","opponent's","operation's","oooohh","oomupwah","omitted","okeydokey","okaaay","ohashi","offerings","of'em","od'd","occurrences","occupant","observable","obscenities","obligatory","oakie","o'malley's","o'gar","nyah's","nurection","nun's","nougat","nostradamus","norther","norcom","nooch","nonviolent","nonsensical","nominating","nomadic","noel's","nkay","nipped","nimbala","nigeria","nigel's","nicklaus","newscast","nervously","nell's","nehru","neckline","nebbleman","navigator","nasdaq","narwhal","nametag","n'n't","mycenae","myanmar","muzak","muumuu","murderer's","mumbled","mulvehill","multiplication","multiples","muggings","muffet","mozart's","mouthy","motorbike","motivations","motivates","motaba","mortars","mordred","mops","moocher","moniker","mongi","mondo","monday's","moley","molds","moisturize","mohair","mocky","mmkay","mistuh","missis","mission's","misdeeds","minuscule","minty","mined","mincemeat","milton's","milt","millennia","mikes","miggs","miffed","mieke's","midwestern","methadone","metaphysics","messieur","merging","mergers","menopausal","menagerie","meee","mckenna's","mcgillicuddy","mayflowers","maxim's","matrimonial","matisse","matick","masculinity","mascots","masai","marzipan","marika","maplewood","manzelle","manufactures","manticore's","mannequins","manhole","manhandle","manatee","mallory's","malfunctions","mainline","magua's","madwoman","madeline's","machiavelli","lynley","lynching","lynched","lurconis","lujack","lubricant","looove","loons","loom","loofah","longevity","lonelyhearts","lollipops","loca","llama","liquidation","lineswoman","lindsey's","lindbergh","lilith's","lila's","lifers","lichen","liberty's","lias","lexter","levee","letter's","lessen","lepner","leonard's","lemony","leggy","leafy","leaflets","leadeth","lazerus","lazare","lawford","languishing","langford's","landslide","landlords","lagoda","ladman","lad's","kuwait","kundera","krist's","krinkle","krendler","kreigel","kowolski","kosovo","knockdown","knifed","kneed","kneecap","kids'll","kevlar","kennie","keeled","kazootie","kaufman's","katzenmoyer","kasdan","karl's","karak","kapowski","kakistos","jumpers","julyan","juanito","jockstrap","jobless","jiggly","jesuit","jaunt","jarring","jabbering","israelites","irrigate","irrevocably","irrationally","ironies","ions","invitro","inventions","intrigues","intimated","interview's","intervening","interchangeable","intently","intentioned","intelligently","insulated","institutional","instill","instigator","instigated","instep","inopportune","innuendoes","inheriting","inflate","infiltration","infects","infamy","inducing","indiscretions","indiscreet","indio","indignities","indict","indecision","incurred","incubation","inconspicuous","inappropriately","impunity","impudent","improves","impotence","implicates","implausible","imperfection","impatience","immutable","immobilize","illustration","illumination","idiot's","idealized","idealist","icelandic","iambic","hysterically","hyperspace","hygienist","hydraulics","hydrated","huzzah","husks","hurricane's","hunt's","hunched","huffed","hubris","hubbub","hovercraft","houngan","hotel's","hosed","horoscopes","hoppy","hopelessness","hoodwinked","honourable","honorably","honeysuckle","homeowners","homegirl","holiest","hoisted","hoho","ho's","hippity","hildie","hikers","hieroglyphs","hexton","herein","helicopter's","heckle","heats","heartbeat's","heaping","healthilizer","headmaster's","headfirst","hawk's","haviland's","hatsue","harlot","hardwired","hanno's","hams","hamilton's","halothane","hairstyles","hails","hailed","haagen","haaaaa","gyno","gutting","gurl","gumshoe","gummi","gull","guerilla","gttk","grover's","grouping","groundless","groaning","gristle","grills","graynamore","grassy","graham's","grabbin","governmental","goodes","goggle","godlike","glittering","glint","gliding","gleaming","glassy","girth","gimbal","gilmore's","gibson's","giblets","gert","geometric","geographical","genealogy","gellers","geller's","geezers","geeze","garshaw","gargantuan","garfunkel","gardner's","garcia's","garb","gangway","gandarium","gamut","galoshes","gallivanting","galleries","gainfully","gack","gachnar","fusionlips","fusilli","furiously","fulfil","fugu","frugal","fron","friendship's","fricking","frederika","freckling","frauds","fraternal","fountainhead","forthwith","forgo","forgettable","foresight","foresaw","footnotes","fondling","fondled","fondle","folksy","fluttering","flutie","fluffing","floundering","florin","florentine","flirtatious","flexing","flatterer","flaring","fizz","fixating","five's","fishnet","firs","firestorm","finchy","figurehead","fifths","fiendish","fertilize","ferment","fending","fellahs","feeny's","feelers","feeders","fatality","fascinate","fantabulous","falsify","fallopian","faithless","fairy's","fairer","fair's","fainter","failings","facto","facets","facetious","eyepatch","exxon","extraterrestrials","extradite","extracurriculars","extinguish","expunged","exports","expenditure","expelling","exorbitant","exigent","exhilarated","exertion","exerting","exemption","excursions","excludes","excessively","excercise","exceeds","exceeding","everbody","evaporated","euthanasia","euros","europeans","escargot","escapee","erases","epizootics","epithelials","ephrum","enthusiast","entanglements","enslaved","enslave","engrossed","endeavour","enables","enabled","empowerment","employer's","emphatic","emeralds","embroiled","embraces","ember","embellished","emancipated","ello","elisa's","elevates","ejaculate","ego's","effeminate","economically","eccentricities","easygoing","earshot","durp","dunks","dunes","dullness","dulli","dulled","drumstick","dropper","driftwood","dregs","dreck","dreamboat","draggin","downsizing","dost","doofer","donowitz","dominoes","dominance","doe's","diversions","distinctions","distillery","distended","dissolving","dissipate","disraeli","disqualify","disowned","dishwashing","discusses","discontent","disclosed","disciplining","discerning","disappoints","dinged","diluted","digested","dicking","diablos","deux","detonating","destinations","despising","designer's","deserts","derelict","depressor","depose","deport","dents","demonstrations","deliberations","defused","deflection","deflecting","decryption","decoys","decoupage","decompress","decibel","decadence","dealer's","deafening","deadlock","dawning","dater","darkened","darcy's","dappy","dancing's","damon's","dallying","dagon","d'etat","czechoslovakians","cuticles","cuteness","curacao","cupboards","cumulative","culottes","culmination","culminating","csi's","cruisin","crosshairs","cronyn","croc","criminalistics","crimean","creatively","creaming","crapping","cranny","cowed","countermeasures","corsica","corinne's","corey's","cooker","convened","contradicting","continuity","constitutionally","constipation","consort","consolidate","consisted","connection's","confining","confidences","confessor","confederates","condensation","concluding","conceiving","conceivably","concealment","compulsively","complainin","complacent","compiling","compels","communing","commonplace","commode","commission's","commissary","comming","commensurate","columnists","colonoscopy","colonists","collagen","collaborate","colchicine","coddling","clump","clubbed","clowning","closet's","clones","clinton's","clinic's","cliffhanger","classification","clang","citrus","cissy","circuitry","chronology","christophe","choosers","choker","chloride","chippewa","chip's","chiffon","chesty","chesapeake","chernobyl","chants","channeled","champagne's","chalet","chaka","cervical","cellphone","cellmates","caverns","catwalk","cathartic","catcher's","cassandra's","caseload","carpenter's","carolyn's","carnivorous","carjack","carbohydrates","capt","capitalists","canvass","cantonese","canisters","candlestick","candlelit","canaries","camry","camel's","calzones","calitri","caldy","cabin's","byline","butterball","bustier","burmese","burlap","burgeoning","bureaucrat","buffoons","buenas","bryan's","brookline","bronzed","broiled","broda","briss","brioche","briar","breathable","brea","brays","brassieres","braille","brahms","braddock's","boysenberry","bowman's","bowline","boutiques","botticelli's","boooo","boonies","booklets","bookish","boogeyman","boogey","bomb's","boldly","bogs","bogas","boardinghouse","bluuch","blundering","bluffs","bluer","blowed","blotto","blotchy","blossomed","blooms","bloodwork","bloodied","blithering","blinks","blathering","blasphemous","blacking","bison","birdson","bings","bilateral","bfmid","bfast","berserker","berkshires","bequest","benjamins","benevolence","benched","benatar","belthazor's","bellybutton","belabor","bela's","behooves","beddy","beaujolais","beattle","baxworth","batted","baseless","baring","barfing","barbi","bannish","bankrolled","banek","ballsy","ballpoint","balkans","balconies","bakers","bahama","baffling","badder","badda","bada","bactine","backgammon","baako","aztreonam","aztecs","awed","avon","autobiographical","autistic","authoritah","auspicious","august's","auditing","audible","auctioning","attitude's","atrocities","athlete's","astronomer","assessed","ascot","aristocratic","arid","argues","arachtoids","arachnid","aquaman","apropos","aprons","apprised","apprehensive","apex","anythng","antivenin","antichrist","antennae","anorexic","anoint","annum","annihilated","animal's","anguished","angioplasty","angio","amply","ampicillin","amphetamines","amino","american's","ambiguity","ambient","amarillo","alyssa's","alternator","alcove","albacore","alarm's","alabaster","airlifted","ahta","agrabah","affidavits","advocacy","advises","adversely","admonished","admonish","adler's","addled","addendum","acknowledgement","accuser","accompli","acclaim","acceleration","abut","abundant","absurdity","absolved","abrusso","abreast","abrasive","aboot","abductions","abducting","abbots","aback","ababwa","aand","aaahhhh","zorin","zinthar","zinfandel","zimbabwe","zillions","zephyrs","zatarcs","zacks","youuu","youths","yokels","yech","yardstick","yammer","y'understand","wynette","wrung","wrought","wreaths","wowed","wouldn'ta","worshiped","worming","wormed","workday","wops","woolly","wooh","woodsy","woodshed","woodchuck","wojadubakowski","withering","witching","wiseass","wiretaps","winner's","wining","willoby","wiccaning","whupped","whoopi","whoomp","wholesaler","whiteness","whiner","whatchya","wharves","whah","wetlands","westward","wenus","weirdoes","weds","webs","weaver's","wearer","weaning","watusi","wastes","warlock's","warfield's","waponi","waiting's","waistband","waht","wackos","vouching","votre","voight's","voiced","vivica","viveca","vivant","vivacious","visor","visitin","visage","virgil's","violins","vinny","vinci's","villas","vigor","video's","vicrum","vibrator","vetted","versailles","vernon's","venues","ventriloquism","venison","venerable","varnsen","variant","variance","vaporized","vapid","vanstock","vandals","vader's","vaccination","uuuuh","utilize","ushering","usda","usable","urur","urologist","urination","urinary","upstart","uprooted","unsubtitled","unspoiled","unseat","unseasonably","unseal","unsatisfying","unnerve","unlikable","unleaded","university's","universe's","uninsured","uninspired","uniformity","unicycle","unhooked","ungh","unfunny","unfreezing","unflattering","unfairness","unexpressed","unending","unencumbered","unearth","undiscovered","undisciplined","undertaken","understan","undershirt","underlings","underline","undercurrent","uncontrolled","uncivilized","uncharacteristic","umpteenth","uglies","u're","tut's","turner's","turbine","tunnel's","tuney","trustee","trumps","truckasaurus","trubshaw","trouser","trippy","tringle","trifling","trickster","triangular","trespassers","trespasser","traverse","traumas","trattoria","trashes","transgressions","tranquil","trampling","trainees","tracy's","tp'ed","toxoplasmosis","tounge","tortillas","torrent","torpedoed","topsy","topple","topnotch","top's","tonsil","tippin's","tions","timmuh","timithious","tilney","tighty","tightness","tightens","tidbits","ticketed","thyme","thrones","threepio","thoughtfully","thornhart's","thorkel","thommo","thing'll","theological","thel","theh","thefts","that've","thanksgivings","tetherball","testikov","terraforming","terminus","tepid","tendonitis","tenboom","telex","teleport","telepathic","teenybopper","taxicab","taxed","taut","tattered","tattaglias","tapered","tantric","tanneke","takedown","tailspin","tacs","tacit","tablet","tablecloth","systemic","syria","syphon","synthesis","symbiotic","swooping","swizzle","swiping","swindled","swilling","swerving","sweatshops","swayzak's","swaddling","swackhammer","svetkoff","suzie's","surpass","supossed","superdad","super's","sumptuous","sula","suit's","sugary","sugar's","sugai","suey","subvert","suburb","substantiate","subsidy","submersible","sublimating","subjugation","styx","stymied","stuntman","studded","strychnine","strikingly","strenuous","streetlights","strassmans","stranglehold","strangeness","straddling","straddle","stowaways","stotch","stockbrokers","stifling","stepford","stepdad's","steerage","steena","staunch","statuary","starlets","stanza","stanley's","stagnant","staggeringly","ssshhh","squaw","spurt","spungeon","sprightly","sprays","sportswear","spoonful","splittin","splitsville","spirituality","spiny","spider's","speedily","speculative","specialise","spatial","spastic","spas","sparrin","soybean","souvlaki","southie","southampton","sourpuss","soupy","soup's","soundstage","sophie's","soothes","somebody'd","solicited","softest","sociopathic","socialized","socialism","snyders","snowmobiles","snowballed","snatches","smugness","smoothest","smashes","slurp","slur","sloshed","sleight","skyrocket","skied","skewed","sizeable","sixpence","sipowicz","singling","simulations","simulates","similarly","silvery","silverstone","siesta","siempre","sidewinder","shyness","shuvanis","showoff","shortsighted","shopkeeper","shoehorn","shithouse","shirtless","shipshape","shingles","shifu","shes","sherman's","shelve","shelbyville","sheepskin","shat","sharpens","shaquille","shaq","shanshu","shania's","set's","servings","serpico","sequined","sensibilities","seizes","seesaw","seep","seconded","sebastian's","seashells","scrapped","scrambler","scorpions","scopes","schnauzer","schmo","schizoid","scampered","scag","savagely","saudis","satire","santas","sanskrit","sandovals","sanding","sandal","salient","saleswoman","sagging","s'cuse","rutting","ruthlessly","runoff","runneth","rulers","ruffians","rubes","roughriders","rotates","rotated","roswell's","rosalita","rookies","ron's","rollerblades","rohypnol","rogues","robinson's","roasts","roadies","river's","ritten","rippling","ripples","ring's","rigor","rigoletto","richardo","ribbed","revolutions","revlon's","reverend's","retreating","retractable","rethought","retaliated","retailers","reshoot","reserving","reseda","researchers","rescuer","reread","requisitions","repute","reprogram","representations","report's","replenish","repetitive","repetitious","repentance","reorganizing","renton","renee's","remodeled","religiously","relics","reinventing","reinvented","reheat","rehabilitate","registrar","regeneration","refueling","refrigerators","refining","reenter","redress","recruiter","recliner","reciprocal","reappears","razors","rawdy","rashes","rarity","ranging","rajeski","raison","raisers","rainier","ragtime","rages","radar's","quinine","questscape","queller","quartermaine's","pyre","pygmalion","pushers","pusan","purview","purification","pumpin","puller","pubescent","psychiatrist's","prudes","provolone","protestants","prospero","propriety","propped","prom's","procrastinate","processors","processional","princely","preyed","preventive","pretrial","preside","premiums","preface","preachers","pounder","ports","portrays","portrayal","portent","populations","poorest","pooling","poofy","pontoon","pompeii","polymerization","polloi","policia","poacher","pluses","pleasuring","pleads","playgrounds","platitudes","platforms","plateaued","plate's","plantations","plaguing","pittance","pitcher's","pinky's","pinheads","pincushion","pimply","pimped","piggyback","pierce's","piecing","physiological","physician's","phosphate","phillipe","philipse","philby","phased","pharaohs","petyr","petitioner","peshtigo","pesaram","perspectives","persnickety","perpetrate","percolating","pepto","pensions","penne","penell","pemmican","peeks","pedaling","peacemaker","pawnshop","patting","pathologically","patchouli","pasts","pasties","passin","parlors","panda's","panache","paltrow","palamon","padlock","paddy's","paddling","oversleep","overheating","overdosed","overcharge","overcame","overblown","outset","outrageously","outfitted","orsini's","ornery","origami","orgasmic","orga","order's","opportune","ooow","oooooooooh","oohhhh","olympian","olfactory","okum","ohhhhhh","ogres","odysseus","odorless","occupations","occupancy","obscenity","obliterated","nyong","nymphomaniac","nutsack","numa","ntozake","novocain","nough","noth","nosh","norwegians","northstar","nonnie","nonissue","nodules","nightmarish","nightline","nighthawk","niggas","nicu","nicolae","nicknamed","niceties","newsman","neverland","negatively","needra","nedry","necking","navour","nauseam","nauls","narim","nanda","namath","nagged","nads","naboo","n'sync","mythological","mysticism","myslexia","mutator","mustafi","mussels","muskie","musketeer","murtaugh","murderess","murder's","murals","munching","mumsy","muley","mouseville","mosque","mosh","mortifying","morgendorffers","moola","montel","mongoloid","molten","molestered","moldings","mocarbies","mo'ss","mixers","misrell","misnomer","misheard","mishandled","miscreant","misconceptions","miniscule","minimalist","millie's","millgate","migrate","michelangelo's","mettle","metricconverter","methodology","meter's","meteors","mesozoic","menorah","mengele","mendy's","membranes","melding","meanness","mcneil's","mcgruff","mcarnold","matzoh","matted","mathematically","materialized","mated","masterpieces","mastectomy","massager","masons","marveling","marta's","marquee","marooned","marone's","marmaduke","marick","marcie's","manhandled","mangoes","manatees","managerial","man'll","maltin","maliciously","malfeasance","malahide","maketh","makeshift","makeovers","maiming","magazine's","machismo","maarten","lutheran","lumpectomy","lumbering","luigi's","luge","lubrication","lording","lorca","lookouts","loogie","loners","london's","loin","lodgings","locomotive","lobes","loathed","lissen","linus","lighthearted","ligament","lifetime's","lifer","lier","lido","lickin","lewen","levitation","lestercorp","lessee","lentils","lena's","lemur","lein","legislate","legalizing","lederhosen","lawmen","laundry's","lasskopf","lardner","landscapes","landfall","lambeau","lamagra","lagging","ladonn","lactic","lacquer","laborers","labatier","kwan's","krit","krabappel","kpxy","kooks","knobby","knickknacks","klutzy","kleynach","klendathu","kinross","kinko's","kinkaid","kind'a","kimberly's","kilometer","khruschev's","khaki","keyboards","kewl","ketch","kesher","ken's","karikos","karenina","kanamits","junshi","juno's","jumbled","jujitsu","judith's","jt's","joust","journeyed","jotted","jonathan's","jizz","jingling","jigalong","jerseys","jerries","jellybean","jellies","jeeps","jeannie's","javna","jamestown","james's","jamboree","jail's","islanders","irresistable","irene's","ious","investigation's","investigates","invaders","inundated","introductory","interviewer","interrupts","interpreting","interplanetary","internist","intercranial","inspections","inspecting","inseminated","inquisitor","inland","infused","infuriate","influx","inflating","infidelities","inference","inexpensive","industrialist","incessantly","inception","incensed","incase","incapacitate","inca","inasmuch","inaccuracies","imus","improvised","imploding","impeding","impediments","immaturity","ills","illegible","idols","iditarod","identifiable","id'n","icicles","ibuprofen","i'i'm","hymie","hydrolase","hybrids","hunsecker's","hunker","humps","humons","humidor","humdinger","humbling","humankind","huggin","huffing","households","housecleaning","hothouse","hotcakes","hosty","hootenanny","hootchie","hoosegow","honouring","honks","honeymooners","homophobic","homily","homeopathic","hoffman's","hnnn","hitchhikers","hissed","hispanics","hillnigger","hexavalent","hewwo","heston's","hershe","herodotus","hermey","hergott","heresy","henny","hennigans","henhouse","hemolytic","hells","helipad","heifer","hebrews","hebbing","heaved","heartland","heah","headlock","hatchback","harvard's","harrowing","harnessed","harding's","happy's","hannibal's","hangovers","handi","handbasket","handbags","halloween's","hall's","halfrek","halfback","hagrid","hacene","gyges","guys're","gut's","gundersons","gumption","guardia","gruntmaster","grubs","group's","grouch","grossie","grosser","groped","grins","grime","grigio","griff's","greaseball","gravesite","gratuity","graphite","granma","grandfathers","grandbaby","gradski","gracing","got's","gossips","goonie","gooble","goobers","goners","golitsyn","gofer","godsake","goddaughter","gnats","gluing","glub","global's","glares","gizmos","givers","ginza","gimmie","gimmee","georgia's","gennero","gazpacho","gazed","gato","gated","gassy","gargling","gandhiji","galvanized","gallery's","gallbladder","gabriel's","gaaah","furtive","furthering","fungal","fumigation","fudd","fucka","fronkonsteen","fromby's","frills","fresher","freezin","freewald","freeloader","franklin's","framework","frailty","fortified","forger","forestry","foreclosure","forbade","foray","football's","foolhardy","fondest","fomin","followin","follower","follicle","flue","flowering","flotation","flopping","floodgates","flogged","flog","flicked","flenders","fleabag","flanks","fixings","fixable","fistful","firewater","firestarter","firelight","fingerbang","finalizing","fillin","filipov","fido","fiderer","feminists","felling","feldberg","feign","favorably","fave","faunia","faun","fatale","fasting","farkus","fared","fallible","faithfulness","factoring","facilitated","fable","eyeful","extramarital","extracts","extinguished","exterminated","exposes","exporter","exponential","exhumed","exhume","exasperated","eviscerate","evidenced","evanston","estoy","estimating","esmerelda","esme","escapades","erosion","erie","equitable","epsom","epoxy","enticed","enthused","entendre","ensued","enhances","engulfed","engrossing","engraving","endorphins","enamel","emptive","empirical","emmys","emission","eminently","embody","embezzler","embarressed","embarrassingly","embalmed","emancipation","eludes","eling","elevation","electorate","elated","eirie","egotitis","effecting","eerily","eeew","eecom","editorials","edict","eczema","ecumenical","ecklie's","earthy","earlobes","eally","dyeing","dwells","dvds","duvet","duncans","dulcet","duckling","droves","droppin","drools","drey'auc","dreamers","dowser's","downriver","downgraded","doping","doodie","dominicans","dominating","domesticity","dollop","doesnt","doer","dobler","divulged","divisional","diversionary","distancing","dissolves","dissipated","displaying","dispensers","dispensation","disorienting","disneyworld","dismissive","dismantling","disingenuous","disheveled","disfiguring","discourse","discontinued","disallowed","dinning","dimming","diminutive","diligently","dilettante","dilation","diggity","diggers","dickensian","diaphragms","diagnoses","dewy","developer","devastatingly","determining","destabilize","desecrate","derives","deposing","denzel","denouncing","denominations","denominational","deniece","demony","delving","delt","delicates","deigned","degrassi's","degeneration","defraud","deflower","defibrillator","defiantly","deferred","defenceless","defacing","dedicating","deconstruction","decompose","deciphering","decibels","deceptively","deceptions","decapitation","debutantes","debonair","deadlier","dawdling","davic","databases","darwinism","darnit","darks","danke","danieljackson","dangled","daimler","cytoxan","cylinders","cutout","cutlery","cuss","cushing's","curveball","curiously","curfews","cummerbund","cuckoo's","crunches","crucifixion","crouched","croix","criterion","crisps","cripples","crilly","cribs","crewman","cretaceous","creepin","creeds","credenza","creak","crawly","crawlin","crawlers","crated","crasher","crackheads","coworker","counterpart","councillor","coun","couldn't've","cots","costanza's","cosgrove's","corwins","corset","correspondents","coriander","copiously","convenes","contraceptives","continuously","contingencies","contaminating","consul","constantinople","conniption","connie's","conk","conjugate","condiment","concurrently","concocting","conclave","concert's","con's","comprehending","compliant","complacency","compilation","competitiveness","commendatore","comedies","comedians","comebacks","combines","com'on","colonized","colonization","collided","collectively","collarbone","collaborating","collaborated","colitis","coldly","coiffure","coffers","coeds","codependent","cocksucking","cockney","cockles","clutched","cluett's","cloverleaf","closeted","cloistered","clinched","clicker","cleve","clergyman","cleats","clarifying","clapped","citations","cinnabar","cinco","chunnel","chumps","chucks","christof","cholinesterase","choirboy","chocolatey","chlamydia","chili's","chigliak","cheesie","cheeses","chechnya","chauvinistic","chasm","chartreuse","charnier","chapil","chapel's","chalked","chadway","cerveza","cerulean","certifiably","celsius","cellulite","celled","ceiling's","cavalry's","cavalcade","catty","caters","cataloging","casy","castrated","cassio","cashman's","cashews","carwash","cartouche","carnivore","carcinogens","carasco's","carano's","capulet","captives","captivated","capt'n","capsized","canoes","cannes","candidate's","cancellations","camshaft","campin","callate","callar","calendar's","calculators","cair","caffeinated","cadavers","cacophony","cackle","byproduct","bwana","buzzes","buyout","buttoning","busload","burglaries","burbs","bura","buona","bunions","bungalows","bundles","bunches","bullheaded","buffs","bucyk","buckling","bruschetta","browbeating","broomsticks","broody","bromly","brolin","brigadier","briefings","bridgeport","brewskies","breathalyzer","breakups","breadth","bratwurst","brania","branching","braiding","brags","braggin","bradywood","bozo's","bottomed","bottom's","bottling","botany","boston's","bossa","bordello","booo","bookshelf","boogida","bondsman","bolsheviks","bolder","boggles","boarder","boar's","bludgeoned","blowtorch","blotter","blips","blends","blemish","bleaching","blainetologists","blading","blabbermouth","bismarck","bishops","biscayne","birdseed","birdcage","bionic","biographies","biographical","bimmel","biloxi","biggly","bianchinni","bette's","betadine","berg's","berenson","belus","belt's","belly's","belloq","bella's","belfast","behavior's","begets","befitting","beethoven's","beepers","beelzebub","beefed","bedroom's","bedrock","bedridden","bedevere","beckons","beckett's","beauty's","beaded","baubles","bauble","battlestar","battleground","battle's","bathrobes","basketballs","basements","barroom","barnacle","barkin","barked","barium","baretta","bangles","bangler","banality","bambang","baltar","ballplayers","baio","bahrain","bagman","baffles","backstroke","backroom","bachelor's","babysat","babylonian","baboons","aviv","avez","averse","availability","augmentation","auditory","auditor","audiotape","auctioneer","atten","attained","attackers","atcha","astonishment","asshole's","assembler","arugula","arsonist's","arroz","arigato","arif","ardent","archaic","approximation","approving","appointing","apartheid","antihistamines","antarctica","annoyances","annals","annabelle's","angrily","angelou","angelo's","anesthesiology","android","anatomically","anarchists","analyse","anachronism","amiable","amex","ambivalent","amassed","amaretto","alumnus","alternating","alternates","alteration","aloft","alluding","allen's","allahu","alight","alfred's","alfie","airlift","aimin","ailment","aground","agile","ageing","afterglow","africans","affronte","affectionately","aerobic","adviser","advil","adventist","advancements","adrenals","admiral's","administrators","adjutant","adherence","adequately","additives","additions","adapting","adaptable","actualization","activating","acrost","ached","accursed","accoutrements","absconded","aboveboard","abou","abetted","abbot's","abbey's","aargh","aaaahh","zuzu's","zuwicky","zolda","zits","ziploc","zakamatak","yutz","yumm","youve","yolk","yippie","yields","yiddish","yesterdays","yella","yearns","yearnings","yearned","yawning","yalta","yahtzee","yacht's","y'mean","y'are","xand","wuthering","wreaks","woul","worsened","worrisome","workstation","workiiing","worcestershire","woop","wooooooo","wooded","wonky","womanizing","wolodarsky","wnkw","wnat","wiwith","withdraws","wishy","wisht","wipers","wiper","winos","winery","windthorne","windsurfing","windermere","wiggles","wiggled","wiggen","whys","whwhat","whuh","whos","whore's","whodunit","whoaaa","whittling","whitesnake","whirling","whereof","wheezing","wheeze","whatley's","whatd'ya","whataya","whammo","whackin","wets","westbound","wellll","wellesley","welch's","weirdo's","weightless","weevil","wedgies","webbing","weasly","weapon's","wean","wayside","waxes","wavelengths","waturi","washy","washrooms","warton's","wandell","wakeup","waitaminute","waddya","wabash","waaaah","vornac","voir","voicing","vocational","vocalist","vixens","vishnoor","viscount","virulent","virtuoso","vindictiveness","vinceres","vince's","villier","viii","vigeous","viennese","viceroy","vestigial","vernacular","venza's","ventilate","vented","venereal","vell","vegetative","veering","veered","veddy","vaslova","valosky","vailsburg","vaginas","vagas","vacation's","uuml","urethra","upstaged","uploading","upgrades","unwrapping","unwieldy","untenable","untapped","unsatisfied","unsatisfactory","unquenchable","unnerved","unmentionable","unlovable","unknowns","universes","uninformed","unimpressed","unhappily","unguarded","unexplored","underpass","undergarment","underdeveloped","undeniably","uncompromising","unclench","unclaimed","uncharacteristically","unbuttoned","unblemished","unas","umpa","ululd","uhhhm","tweeze","tutsami","tusk","tushy","tuscarora","turkle","turghan","turbulent","turbinium","tuffy","tubers","tsun","trucoat","troxa","trou","tropicana","triquetra","tripled","trimmers","triceps","tribeca","trespassed","traya","travellers","traumatizing","transvestites","transatlantic","tran's","trainors","tradin","trackers","townies","tourelles","toughness","toucha","totals","totalled","tossin","tortious","topshop","topes","tonics","tongs","tomsk","tomorrows","toiling","toddle","tobs","tizzy","tiramisu","tippers","timmi","timbre","thwap","thusly","ththe","thruway","thrusts","throwers","throwed","throughway","thrice","thomas's","thickening","thia","thermonuclear","therapy's","thelwall","thataway","th's","textile","texans","terry's","terrifically","tenets","tendons","tendon","telescopic","teleportation","telepathically","telekinetic","teetering","teaspoons","teamsters","taunts","tatoo","tarantulas","tapas","tanzania","tanned","tank's","tangling","tangerine","tamales","tallied","tailors","tai's","tahitian","tag's","tactful","tackles","tachy","tablespoon","tableau","syrah","syne","synchronicity","synch","synaptic","synapses","swooning","switchman","swimsuits","swimmer's","sweltering","swelling's","sweetly","sweeper","suvolte","suss","suslov","surname","surfed","supremacy","supposition","suppertime","supervillains","superman's","superfluous","superego","sunspots","sunnydale's","sunny's","sunning","sunless","sundress","sump","suki","suffolk","sue's","suckah","succotash","substation","subscriptions","submarines","sublevel","subbasement","styled","studious","studio's","striping","stresses","strenuously","streamlined","strains","straights","stony","stonewalled","stonehenge","stomper","stipulates","stinging","stimulated","stillness","stilettos","stewards","stevesy","steno","sten","stemmed","steenwyck","statesmen","statehood","stargates","standstill","stammering","staedert","squiggly","squiggle","squashing","squaring","spurred","sprints","spreadsheet","spramp","spotters","sporto","spooking","sponsorship","splendido","spittin","spirulina","spiky","speculations","spectral","spate","spartacus","spans","spacerun","sown","southbound","sorr","sorcery","soonest","sono","sondheim","something'll","someth","somepin","someone'll","solicitor","sofas","sodomy","sobs","soberly","sobered","soared","soapy","snowmen","snowbank","snowballing","snorkel","snivelling","sniffling","snakeskin","snagging","smush","smooter","smidgen","smackers","smackdown","slumlord","slugging","slossum","slimmer","slighted","sleepwalk","sleazeball","skokie","skirmishes","skipper's","skeptic","sitka","sitarides","sistah","sipped","sindell","simpletons","simp","simony","simba's","silkwood","silks","silken","silicone","sightless","sideboard","shuttles","shrugging","shrouds","showy","shoveled","shouldn'ta","shoplifters","shitstorm","shipyard","shielded","sheldon's","sheeny","shaven","shapetype","shankar","shaming","shallows","shale","shading","shackle","shabbily","shabbas","severus","settlements","seppuku","senility","semite","semiautomatic","semester's","selznick","secretarial","sebacio","sear","seamless","scuzzy","scummy","scud","scrutinized","scrunchie","scriptures","scribbled","scouted","scotches","scolded","scissor","schooner","schmidt's","schlub","scavenging","scarin","scarfing","scarecrow's","scant","scallions","scald","scabby","say's","savour","savored","sarcoidosis","sandbar","saluted","salted","salish","saith","sailboats","sagittarius","sagan","safeguards","sacre","saccharine","sacamano","sabe","rushdie","rumpled","rumba","rulebook","rubbers","roughage","rotterdam","roto","rotisserie","rosebuds","rootie","roosters","roosevelt's","rooney's","roofy","roofie","romanticize","roma's","rolodex","rolf's","roland's","rodney's","robotic","robin's","rittle","ristorante","rippin","rioting","rinsing","ringin","rincess","rickety","rewritten","revising","reveling","rety","retreats","retest","retaliating","resumed","restructuring","restrict","restorative","reston","restaurateur","residences","reshoots","resetting","resentments","rescuers","rerouted","reprogramming","reprisals","reprisal","repossess","repartee","renzo","renfield","remore","remitting","remeber","reliability","relaxants","rejuvenate","rejections","rehu","regularity","registrar's","regionals","regimes","regenerated","regency","refocus","referrals","reeno","reelected","redevelopment","recycles","recrimination","recombinant","reclining","recanting","recalling","reattach","reassigning","realises","reactors","reactionary","rbis","razor's","razgul","raved","rattlesnakes","rattles","rashly","raquetball","rappers","rapido","ransack","rankings","rajah","raisinettes","raheem","radisson","radishes","radically","radiance","rabbi's","raban","quoth","qumari","quints","quilts","quilting","quien","queue","quarreled","qualifying","pygmy","purty","puritans","purblind","puppy's","punctuation","punchbowl","puget","publically","psychotics","psychopaths","psychoanalyze","pruning","provasik","protruding","protracted","protons","protections","protectin","prospector","prosecutor's","propping","proportioned","prophylactic","propelled","proofed","prompting","prompter","professed","procreate","proclivities","prioritizing","prinze","princess's","pricked","press'll","presets","prescribes","preocupe","prejudicial","prefex","preconceived","precipice","preamble","pram","pralines","pragmatist","powering","powerbar","pottie","pottersville","potsie","potholes","potency","posses","posner's","posies","portkey","porterhouse","pornographers","poring","poppycock","poppet","poppers","poopsie","pomponi","pokin","poitier","poes","podiatry","plush","pleeze","pleadings","playbook","platelets","plane'arium","placebos","place'll","pj's","pixels","pitted","pistachios","pisa","pirated","pirate's","pinochle","pineapples","pinafore","pimples","piggly","piggies","pie's","piddling","picon","pickpockets","picchu","physiologically","physic","photo's","phobic","philosophies","philosophers","philly's","philandering","phenomenally","pheasants","phasing","phantoms","pewter","petticoat","petronis","petitioning","perturbed","perth","persists","persians","perpetuating","permutat","perishable","periphery","perimeters","perfumed","percocet","per'sus","pepperjack","pensioners","penalize","pelting","pellet","peignoir","pedicures","pedestrians","peckers","pecans","payback's","pay's","pawning","paulsson","pattycake","patrolmen","patrolled","patois","pathos","pasted","passer","partnerships","parp","parishioners","parishioner","parcheesi","parachuting","pappa","paperclip","papayas","paolo's","pantheon","pantaloons","panhandle","pampers","palpitations","paler","palantine","paintballing","pago","owow","overtired","overstress","oversensitive","overnights","overexcited","overanxious","overachiever","outwitted","outvoted","outnumber","outlived","outlined","outlast","outlander","outfield","out've","ortolani's","orphey","ornate","ornamental","orienteering","orchestrating","orator","oppressive","operator's","openers","opec","ooky","oliver's","olde","okies","okee","ohhhhhhhhh","ohhhhhhhh","ogling","offline","offbeat","oceanographic","obsessively","obeyed","oaths","o'leary's","o'hana","o'bannon","o'bannion","numpce","nummy","nuked","nuff","nuances","nourishing","noticeably","notably","nosedive","northeastern","norbu","nomlies","nomine","nomads","noge","nixed","niro","nihilist","nightshift","newmeat","nevis","nemo's","neighborhood's","neglectful","neediness","needin","necromancer","neck's","ncic","nathaniel's","nashua","naphthalene","nanotechnology","nanocytes","nanite","naivete","nacho","n'yeah","mystifying","myhnegon","mutating","muskrat","musing","museum's","muppets","mumbles","mulled","muggy","muerto","muckraker","muchachos","mris","move's","mourners","mountainside","moulin","mould","motherless","motherfuck","mosquitos","morphed","mopped","moodoo","montage","monsignor","moncho","monarchs","mollem","moisturiser","moil","mohicans","moderator","mocks","mobs","mizz","mites","mistresses","misspent","misinterpretation","mishka","miscarry","minuses","minotaur","minoan","mindee","mimicking","millisecond","milked","militants","migration","mightn't","mightier","mierzwiak","midwives","micronesia","microchips","microbes","michele's","mhmm","mezzanine","meyerling","meticulously","meteorite","metaphorical","mesmerizing","mershaw","meir","meg's","meecrob","medicate","medea","meddled","mckinnons","mcgewan","mcdunnough","mcats","mbien","maytag","mayors","matzah","matriarch","matic","mathematicians","masturbated","masselin","marxist","martyrs","martini's","martialed","marten's","marlboros","marksmanship","marishka","marion's","marinate","marge's","marchin","manifestations","manicured","mandela","mamma's","mame","malnourished","malk","malign","majorek","maidens","mahoney's","magnon","magnificently","maestro's","macking","machiavellian","macdougal","macchiato","macaws","macanaw","m'self","lynx","lynn's","lyman's","lydells","lusts","lures","luna's","ludwig's","lucite","lubricants","louise's","lopper","lopped","loneliest","lonelier","lomez","lojack","localized","locale","loath","lloyd's","literate","liquidated","liquefy","lippy","linguistic","limps","lillian's","likin","lightness","liesl","liebchen","licious","libris","libation","lhamo","lewis's","leveraged","leticia's","leotards","leopards","leonid","leonardo's","lemmings","leland's","legitimacy","leanin","laxatives","lavished","latka","later's","larval","lanyard","lans","lanky","landscaping","landmines","lameness","lakeshore","laddies","lackluster","lacerated","labored","laboratories","l'amour","kyrgyzstan","kreskin","krazy","kovitch","kournikova","kootchy","konoss","know's","knknow","knickety","knackety","kmart","klicks","kiwanis","kitty's","kitties","kites","kissable","kirby's","kingdoms","kindergartners","kimota","kimble's","kilter","kidnet","kidman","kid'll","kicky","kickbacks","kickback","kickass","khrushchev","kholokov","kewpie","kent's","keno","kendo","keller's","kcdm","katrina's","katra","kareoke","kaia","kafelnikov","kabob","ka's","junjun","jumba","julep","jordie","jondy","jolson","jinnah","jeweler's","jerkin","jenoff","jefferson's","jaye's","jawbone","janitorial","janiro","janie's","iron's","ipecac","invigorated","inverted","intruded","intros","intravenously","interruptus","interrogations","interracial","interpretive","internment","intermediate","intermediary","interject","interfacing","interestin","insuring","instilled","instantaneous","insistence","insensitivity","inscrutable","inroads","innards","inlaid","injector","initiatives","inhe","ingratitude","infuriates","infra","informational","infliction","infighting","induction","indonesian","indochina","indistinguishable","indicators","indian's","indelicate","incubators","incrimination","increments","inconveniencing","inconsolable","incite","incestuous","incas","incarnation","incarcerate","inbreeding","inaccessible","impudence","impressionists","implemented","impeached","impassioned","impacts","imipenem","idling","idiosyncrasies","icicle","icebreaker","icebergs","i'se","hyundai","hypotensive","hydrochloride","huuh","hushed","humus","humph","hummm","hulking","hubcaps","hubald","http","howya","howbout","how'll","houseguests","housebroken","hotwire","hotspots","hotheaded","horticulture","horrace","horde","horace's","hopsfield","honto","honkin","honeymoons","homophobia","homewrecker","hombres","hollow's","hollers","hollerin","hokkaido","hohh","hogwarts","hoedown","hoboes","hobbling","hobble","hoarse","hinky","himmler","hillcrest","hijacking","highlighters","hiccup","hibernation","hexes","heru'ur","hernias","herding","heppleman","henderson's","hell're","heine's","heighten","heheheheheh","heheheh","hedging","heckling","heckled","heavyset","heatshield","heathens","heartthrob","headpiece","headliner","he'p","hazelnut","hazards","hayseed","haveo","hauls","hattie's","hathor's","hasten","harriers","harridan","harpoons","harlin's","hardens","harcesis","harbouring","hangouts","hangman","handheld","halkein","haleh","halberstam","hairpin","hairnet","hairdressers","hacky","haah","haaaa","h'yah","gyms","gusta","gushy","gusher","gurgling","gunnery","guilted","guilt's","gruel","grudging","grrrrrr","grouse","grossing","grosses","groomsmen","griping","gretchen's","gregorian","gray's","gravest","gratified","grated","graphs","grandad","goulash","goopy","goonies","goona","goodman's","goodly","goldwater","godliness","godawful","godamn","gobs","gob's","glycerin","glutes","glowy","glop","globetrotters","glimpsed","glenville","glaucoma","girlscout","giraffes","gimp","gilbey","gil's","gigglepuss","ghora","gestating","geologists","geographically","gelato","gekko's","geishas","geek's","gearshift","gear's","gayness","gasped","gaslighting","garretts","garba","gams","gags","gablyczyck","g'head","fungi","fumigating","fumbling","fulton's","fudged","fuckwad","fuck're","fuchsia","fruition","freud's","fretting","freshest","frenchies","freezers","fredrica","fraziers","francesca's","fraidy","foxholes","fourty","fossilized","forsake","formulate","forfeits","foreword","foreclosed","foreal","foraging","footsies","focussed","focal","florists","flopped","floorshow","floorboard","flinching","flecks","flavours","flaubert","flatware","flatulence","flatlined","flashdance","flail","flagging","fizzle","fiver","fitzy","fishsticks","finster","finetti","finelli","finagle","filko","filipino","figurines","figurative","fifi","fieldstone","fibber","fiance's","feuds","feta","ferrini","female's","feedin","fedora","fect","feasting","favore","fathering","farrouhk","farmin","far's","fanny's","fajita","fairytale","fairservice","fairgrounds","fads","factoid","facet","facedown","fabled","eyeballin","extortionist","exquisitely","exporting","explicitly","expenditures","expedited","expands","exorcise","existentialist","exhaustive","execs","exculpatory","excommunicated","exacerbate","everthing","eventuality","evander","eustace","euphoric","euphemisms","eton","esto","estimation","estamos","establishes","erred","environmentalist","entrepreneurial","entitle","enquiries","enormity","engages","enfants","enen","endive","end's","encyclopedias","emulating","emts","employee's","emphasized","embossed","embittered","embassies","eliot","elicit","electrolyte","ejection","effortless","effectiveness","edvard","educators","edmonton's","ecuador","ectopic","ecirc","easely","earphones","earmarks","earmarked","earl's","dysentery","dwindling","dwight's","dweller","dusky","durslar","durned","dunois","dunking","dunked","dumdum","dullard","dudleys","duce","druthers","druggist","drug's","drossos","drosophila","drooled","driveways","drippy","dreamless","drawstring","drang","drainpipe","dragoons","dozing","down's","dour","dougie's","dotes","dorsal","dorkface","doorknobs","doohickey","donnell's","donnatella","doncha","don's","dominates","domicile","dokos","dobermans","djez","dizzying","divola","dividends","ditsy","distaste","disservice","disregarded","dispensed","dismay","dislodged","dislodge","disinherit","disinformation","discrete","discounting","disciplines","disapproved","dirtball","dinka","dimly","dilute","dilucca's","digesting","diello","diddling","dictatorships","dictators","diagonal","diagnostician","devours","devilishly","detract","detoxing","detours","detente","destructs","desecrated","descends","derris","deplore","deplete","depicts","depiction","depicted","denver's","denounce","demure","demolitions","demean","deluge","dell's","delish","deliberation","delbruck","delaford","deities","degaulle","deftly","deft","deformity","deflate","definatly","defense's","defector","deducted","decrypted","decontamination","decker's","decapitate","decanter","deadline's","dardis","danger's","dampener","damme","daddy'll","dabbling","dabbled","d'etre","d'argent","d'alene","d'agnasti","czechs","czechoslovakian","cyrillic","cymbal","cyberdyne","cutoffs","cuticle","cut's","curvaceous","curiousity","curfew's","culturally","cued","cubby","cruised","crucible","crowing","crowed","croutons","cropped","croaker","cristobel's","criminy","crested","crescentis","cred","cream's","crashers","crapola","cranwell","coverin","cousteau","courtrooms","counterattack","countenance","counselor's","cottages","cosmically","cosign","cosa","corroboration","corresponds","correspond","coroners","coro","cornflakes","corbett's","copy's","copperpot","copperhead","copacetic","coordsize","convulsing","contradicted","contract's","continuation","consults","consultations","constraints","conjures","congenial","confluence","conferring","confederation","condominium","concourse","concealer","compulsory","complexities","comparatively","compactor","commodities","commercialism","colleague's","collaborator","cokey","coiled","cognizant","cofell's","cobweb","co's","cnbc","clyde's","clunkers","clumsily","clucking","cloves","cloven","cloths","clothe","clop","clods","clocking","clings","climbers","clef","clearances","clavicle","claudia's","classless","clashing","clanking","clanging","clamping","civvies","citywide","citing","circulatory","circuited","circ","chung's","chronisters","chromic","choppy","choos","chongo","chloroformed","chilton's","chillun","chil","chicky","cheetos","cheesed","chatterbox","charlies","chaperoned","channukah","chamberlain's","chairman's","chaim","cessation","cerebellum","centred","centerpieces","centerfold","cellars","ceecee","ccedil","cavorting","cavemen","cavaliers","cauterized","caustic","cauldwell","catting","cathy's","caterine","castor's","cassiopeia","cascade's","carves","cartwheel","cartridges","carpeted","carob","carlsbad","caressing","carelessly","careening","carcinoma","capricious","capitalistic","capillaries","capes","candle's","candidly","canaan","camaraderie","calumet","callously","calligraphy","calfskin","cake's","caddies","cabinet's","buzzers","buttholes","butler's","busywork","busses","burps","burgomeister","buoy","bunny's","bunkhouse","bungchow","bulkhead","builders","bugler","buffets","buffed","buckaroo's","brutish","brusque","browser","bronchitis","bromden","brolly","brody's","broached","brewskis","brewski","brewin","brewers","brean","breadwinner","brana","brackets","bozz","bountiful","bounder","bouncin","bosoms","borgnine","bopping","bootlegs","booing","bons","boneyard","bombosity","bolting","bolivia","boilerplate","boba","bluey","blowback","blouses","bloodsuckers","bloodstained","blonde's","bloat","bleeth","blazed","blaine's","blackhawk","blackface","blackest","blackened","blacken","blackballed","blabs","blabbering","birdbrain","bipartisanship","biodegradable","binghamton","biltmore","billiards","bilked","big'uns","bidwell's","bidet","bessie's","besotted","beset","berth","bernheim","benson's","beni","benegas","bendiga","belushi","beltway","bellboys","belittling","belinda's","behinds","behemoth","begone","beeline","beehive","bedsheets","beckoning","beaute","beaudine","beastly","beachfront","be's","bauk","bathes","batak","bastion","baser","baseballs","barker's","barber's","barbella","bans","bankrolling","bangladesh","bandaged","bamba","bally's","bagpipe","bagger","baerly","backlog","backin","babying","azkaban","ayatollah","axes","awwwww","awakens","aviary","avery's","autonomic","authorizes","austero","aunty","augustine's","attics","atreus","astronomers","astounded","astonish","assertion","asserting","assailants","asha's","artemus","arses","arousal","armin","arintero","argon's","arduous","archers","archdiocese","archaeology","arbitrarily","ararat","appropriated","appraiser","applicable","apathetic","anybody'd","anxieties","anwar's","anticlimactic","antar","ankle's","anima","anglos","angleman","anesthetist","androscoggin","andromeda","andover","andolini","andale","anan","amway","amuck","amphibian","amniocentesis","amnesiac","ammonium","americano","amara","alway","alvah","alum","altruism","alternapalooza","alphabetize","alpaca","almanac","ally's","allus","alluded","allocation","alliances","allergist","alleges","alexandros","alec's","alaikum","alabam","akimbo","airy","ahab's","agoraphobia","agides","aggrhh","agatha's","aftertaste","affiliations","aegis","adoptions","adjuster","addictions","adamantium","acumen","activator","activates","acrylic","accomplishes","acclaimed","absorbs","aberrant","abbu","aarp","aaaaargh","aaaaaaaaaaaaa","a'ight","zucchini","zoos","zookeeper","zirconia","zippers","zequiel","zephyr's","zellary","zeitgeist","zanuck","zambia","zagat","ylang","yielded","yes'm","yenta","yegg","yecchh","yecch","yayo","yawp","yawns","yankin","yahdah","yaaah","y'got","xeroxed","wwooww","wristwatch","wrangled","wouldst","worthiness","wort","worshiping","worsen","wormy","wormtail","wormholes","woosh","woodworking","wonka","womens","wolverines","wollsten","wolfing","woefully","wobbling","witter's","wisp","wiry","wire's","wintry","wingding","windstorm","windowtext","wiluna","wilting","wilted","willick","willenholly","wildflowers","wildebeest","wilco","wiggum","wields","widened","whyyy","whoppers","whoaa","whizzing","whizz","whitest","whitefish","whistled","whist","whinny","whereupon","whereby","wheelies","wheaties","whazzup","whatwhatwhaaat","whato","whatdya","what'dya","whar","whacks","wexler's","wewell","wewe","wetsuit","wetland","westport","welluh","weight's","weeps","webpage","waylander","wavin","watercolors","wassail","wasnt","warships","warns","warneford","warbucks","waltons","wallbanger","waiving","waitwait","vowing","voucher","vornoff","vork","vorhees","voldemort","vivre","vittles","vishnu","vips","vindaloo","videogames","victors","vicky's","vichyssoise","vicarious","vet's","vesuvius","verve","verguenza","venturing","ventura's","venezuelan","ven't","velveteen","velour","velociraptor","vegetation","vaudeville","vastness","vasectomies","vapors","vanderhof","valmont","validates","valiantly","valerian","vacuums","vaccines","uzbekistan","usurp","usernum","us'll","urinals","unyielding","unwillingness","unvarnished","unturned","untouchables","untangled","unsecured","unscramble","unreturned","unremarkable","unregistered","unpublished","unpretentious","unopposed","unnerstand","unmade","unlicensed","unites","union's","uninhabited","unimpeachable","unilateral","unicef","unfolded","unfashionable","undisturbed","underwriting","underwrite","underlining","underling","underestimates","underappreciated","undamaged","uncouth","uncork","uncontested","uncommonly","unclog","uncircumcised","unchallenged","uncas","unbuttoning","unapproved","unamerican","unafraid","umpteen","umhmm","uhwhy","uhmm","ughuh","ughh","ufo's","typewriters","twitches","twitched","twirly","twinkling","twink","twinges","twiddling","twiddle","tutored","tutelage","turners","turnabout","ture","tunisian","tumultuous","tumour","tumblin","tryed","truckin","trubshaw's","trowel","trousseau","trivialize","trifles","tribianni","trib","triangulation","trenchcoat","trembled","traumatize","transplanted","translations","transitory","transients","transfuse","transforms","transcribing","transcend","tranq","trampy","traipsed","trainin","trail's","trafalgar","trachea","traceable","touristy","toughie","totality","totaling","toscanini","tortola","tortilla","tories","toreador","tooo","tonka","tommorrow","tollbooth","tollans","toidy","togs","togas","tofurkey","toddling","toddies","tobruk","toasties","toadstool","to've","tive","tingles","timin","timey","timetables","tightest","tide's","tibetans","thunderstorms","thuggee","thrusting","thrombus","throes","throated","thrifty","thoroughbred","thornharts","thinnest","thicket","thetas","thesulac","tethered","testimonial","testaburger","tersenadine","terrif","teresa's","terdlington","tepui","tenured","tentacle","temping","temperance","temp's","teller's","televisions","telefono","tele","teddies","tector","taxidermy","taxi's","taxation","tastebuds","tasker's","tartlets","tartabull","tard","tar'd","tantamount","tans","tangy","tangles","tamer","talmud","taiwan's","tabula","tabletops","tabithia","tabernacle","szechwan","syrian","synthedyne","synopsis","synonyms","swaps","swahili","svenjolly","svengali","suvs","sush","survivalists","surmise","surfboards","surefire","suprise","supremacists","suppositories","supervisors","superstore","supermen","supercop","supercilious","suntac","sunburned","summercliff","sullied","suite's","sugared","sufficiency","suerte","suckle","sucker's","sucka","succumbing","subtleties","substantiated","subsidiaries","subsides","subliminal","subhuman","stst","strowman","stroked","stroganoff","strikers","strengthening","streetlight","straying","strainer","straighter","straightener","storytelling","stoplight","stockade","stirrups","stink's","sting's","stimulates","stifler's","stewing","stetson's","stereotyping","ster","stepmommy","stephano","steeped","statesman","stashing","starshine","stand's","stamping","stamford","stairwells","stabilization","squatsie","squandering","squalid","squabbling","squab","sprinkling","spring's","spreader","spongy","spongebob","spokeswoman","spokesmen","splintered","spittle","spitter","spiced","spews","spendin","spect","speckled","spearchucker","spatulas","sparse","sparking","spares","spaceboy","soybeans","southtown","southside","southport","southland","soused","sotheby's","soshi","sorter","sorrowful","sorceress","sooth","songwriters","some'in","solstice","soliloquy","sods","sodomized","sode","sociologist","sobriki","soaping","snows","snowcone","snowcat","snitching","snitched","sneering","snausages","snaking","smoothed","smoochies","smolensk","smarten","smallish","slushy","slurring","sluman","slobber","slithers","slippin","sleuthing","sleeveless","slade's","skinner's","skinless","skillfully","sketchbook","skagnetti","sista","sioux","sinning","sinjin","singularly","sinewy","sinclair's","simultaneous","silverlake","silva's","siguto","signorina","signature's","signalling","sieve","sids","sidearms","shyster","shying","shunning","shtud","shrooms","shrieks","shorting","shortbread","shopkeepers","shmuck","shmancy","shizzit","shitheads","shitfaced","shitbag","shipmates","shiftless","sherpa","shelving","shelley's","sheik","shedlow","shecky","sheath","shavings","shatters","sharifa","shampoos","shallots","shafter","sha'nauc","sextant","settlers","setter","seti","serviceable","serrated","serbian","sequentially","sepsis","senores","sendin","semis","semanski","seller's","selflessly","selects","selectively","seinfelds","seers","seer's","seeps","see's","seductress","sedimentary","sediment","second's","secaucus","seater","seashore","sealant","seaborn's","scuttling","scusa","sculpting","scrunched","scrimmage","screenwriter","scotsman","scorer","sclerosis","scissorhands","schreber","scholastic","schmancy","schlong","scathing","scandinavia","scamps","scalloped","savoir","savagery","sasha's","sarong","sarnia","santangel","samool","samba","salons","sallow","salino","safecracker","sadism","saddles","sacrilegious","sabrini","sabath","s'aright","ruttheimer","russia's","rudest","rubbery","rousting","rotarian","roslin","rosey","rosa's","roomed","romari","romanticism","romanica","rolltop","rolfski","rod's","rockland","rockettes","roared","riverfront","rinpoche","ringleader","rims","riker's","riffing","ricans","ribcage","riana's","rhythmic","rhah","rewired","retroactive","retrial","reting","reticulum","resuscitated","resuming","restricting","restorations","restock","resilience","reservoirs","resembled","resale","requisitioned","reprogrammed","reproducing","repressive","replicant","repentant","repellant","repays","repainting","reorganization","renounced","renegotiating","rendez","renamed","reminiscent","remem","remade","relived","relinquishes","reliant","relearn","relaxant","rekindling","rehydrate","regulatory","regiments","regan's","refueled","refrigeration","refreshingly","reflector","refine","refilling","reexamine","reeseman","redness","redirected","redeemable","redder","redcoats","rectangles","recoup","reconstituted","reciprocated","recipients","recessed","recalls","rebounded","reassessing","realy","reality's","realisation","realer","reachin","re'kali","rawlston","ravages","rattlers","rasa","raps","rappaports","ramoray","ramming","ramadan","raindrops","rahesh","radioactivity","radials","racists","racin","rabartu","quotas","quintus","quiches","ques","queries","quench","quel","quarrels","quarreling","quaintly","quagmire","quadrants","pylon","putumayo","put'em","purifier","purified","pureed","punitis","pullout","pukin","pudgy","puddings","puckering","puccini","pterodactyl","psychodrama","pseudonym","psats","proximal","providers","protestations","protectee","prospered","prosaic","propositioned","prolific","progressively","proficiency","professions","prodigious","proclivity","probed","probabilities","pro's","prison's","printouts","principally","prig","prevision","prevailing","presumptive","pressers","preset","presentations","preposition","preparatory","preliminaries","preempt","preemie","predetermined","preconceptions","precipitate","prancan","powerpuff","powerfully","potties","potters","potpie","poseur","portraying","portico","porthole","portfolios","poops","pooping","pone","pomp","pomade","polyps","polymerized","politic","politeness","polisher","polack","pokers","pocketknife","poatia","plebeian","playgroup","platonically","plato's","platitude","platelet","plastering","plasmapheresis","plaques","plaids","placemats","place's","pizzazz","piracy","pipelines","pip's","pintauro","pinstripes","pinpoints","pinkner","pincer","pimento","pillaged","pileup","pilates","pigment","pigmen","pieter","pieeee","picturesque","piano's","phrasing","phrased","photojournalist","photocopies","phosphorus","phonograph","phoebes","phoe","philistines","philippine","philanderer","pheromone","phasers","pharaoh's","pfff","pfeffernuesse","petrov","petitions","peterman's","peso","pervs","perspire","personify","perservere","perplexed","perpetrating","perp's","perkiness","perjurer","periodontist","perfunctory","performa","perdido","percodan","penzance","pentameter","pentagon's","pentacle","pensive","pensione","pennybaker","pennbrooke","penhall","pengin","penetti","penetrates","pegs","pegnoir","peeve","peephole","pectorals","peckin","peaky","peaksville","payout","paxcow","paused","pauline's","patted","pasteur","passe","parochial","parkland","parkishoff","parkers","pardoning","paraplegic","paraphrasing","parapet","paperers","papered","panoramic","pangs","paneling","pander","pandemonium","pamela's","palooza","palmed","palmdale","palisades","palestinian","paleolithic","palatable","pakistanis","pageants","packaged","pacify","pacified","oyes","owwwww","overthrown","overt","oversexed","overriding","overrides","overpaying","overdrawn","overcompensate","overcomes","overcharged","outtakes","outmaneuver","outlying","outlining","outfoxed","ousted","oust","ouse","ould","oughtn't","ough","othe","ostentatious","oshun","oscillation","orthopedist","organizational","organization's","orca","orbits","or'derves","opting","ophthalmologist","operatic","operagirl","oozes","oooooooh","only's","onesie","omnis","omelets","oktoberfest","okeydoke","ofthe","ofher","obstetrics","obstetrical","obeys","obeah","o'rourke","o'reily's","o'henry","nyquil","nyanyanyanyah","nuttin","nutsy","nutrients","nutball","nurhachi","numbskull","nullifies","nullification","nucking","nubbin","ntnt","nourished","notoriety","northland","nonspecific","nonfiction","noing","noinch","nohoho","nobler","nitwits","nitric","nips","nibs","nibbles","newton's","newsprint","newspaperman","newspaper's","newscaster","never's","neuter","neuropathy","netherworld","nests","nerf","neee","neediest","neath","navasky","naturalization","nat's","narcissists","napped","nando","nags","nafta","myocardial","mylie's","mykonos","mutilating","mutherfucker","mutha","mutations","mutates","mutate","musn't","muskets","murray's","murchy","mulwray's","multitasking","muldoon's","mujeeb","muerte","mudslinging","muckraking","mrsa","mown","mousie","mousetrap","mourns","mournful","motivating","motherland","motherf","mostro","mosaic","morphing","morphate","mormons","moralistic","moored","moochy","mooching","monotonous","monorail","monopolize","monogram","monocle","molehill","molar","moland","mofet","modestly","mockup","moca","mobilizing","mitzvahs","mitre","mistreating","misstep","misrepresentation","misjudge","misinformation","miserables","misdirected","miscarriages","minute's","miniskirt","minimizing","mindwarped","minced","milquetoast","millimeters","miguelito","migrating","mightily","midsummer","midstream","midriff","mideast","midas","microbe","metropolis","methuselah","mesdames","mescal","mercury's","menudo","menu's","mentors","men'll","memorial's","memma","melvins","melanie's","megaton","megara","megalomaniac","meeee","medulla","medivac","mediate","meaninglessness","mcnuggets","mccarthyism","maypole","may've","mauve","maturing","matter's","mateys","mate's","mastering","masher","marxism","martimmy's","marshack","marseille","markles","marketed","marketable","mansiere","manservant","manse","manhandling","manco's","manana","maman","malnutrition","mallomars","malkovich's","malcontent","malaise","makeup's","majesties","mainsail","mailmen","mahandra","magnolias","magnified","magev","maelstrom","madcap","mack's","machu","macfarlane's","macado","ma'm","m'boy","m'appelle","lying's","lustrous","lureen","lunges","lumped","lumberyard","lulled","luego","lucks","lubricated","loveseat","loused","lounger","loski","lorre","loora","looong","loonies","lonnegan's","lola's","loire","loincloth","logistical","lofts","lodges","lodgers","lobbing","loaner","livered","lithuania","liqueur","linkage","ling's","lillienfield's","ligourin","lighter's","lifesaving","lifeguards","lifeblood","library's","liberte","liaisons","liabilities","let'em","lesbianism","lenny's","lennart","lence","lemonlyman","legz","legitimize","legalized","legalization","leadin","lazars","lazarro","layoffs","lawyering","lawson's","lawndale's","laugher","laudanum","latte's","latrines","lations","laters","lastly","lapels","lansing's","lan's","lakefront","lait","lahit","lafortunata","lachrymose","laborer","l'italien","l'il","kwaini","kuzmich","kuato's","kruczynski","kramerica","krakatoa","kowtow","kovinsky","koufax","korsekov","kopek","knoxville","knowakowski","knievel","knacks","klux","klein's","kiran","kiowas","kinshasa","kinkle's","kincaid's","killington","kidnapper's","kickoff","kickball","khan's","keyworth","keymaster","kevie","keveral","kenyons","keggers","keepsakes","kechner","keaty","kavorka","katmandu","katan's","karajan","kamerev","kamal's","kaggs","juvi","jurisdictional","jujyfruit","judeo","jostled","joni's","jonestown","jokey","joists","joint's","johnnie's","jocko","jimmied","jiggled","jig's","jests","jessy","jenzen","jensen's","jenko","jellyman","jeet","jedediah","jealitosis","jaya's","jaunty","jarmel","jankle","jagoff","jagielski","jacky","jackrabbits","jabbing","jabberjaw","izzat","iuml","isolating","irreverent","irresponsibly","irrepressible","irregularity","irredeemable","investigator's","inuvik","intuitions","intubated","introspective","intrinsically","intra","intimates","interval","intersections","interred","interned","interminable","interloper","intercostal","interchange","integer","intangible","instyle","instrumentation","instigate","instantaneously","innumerable","inns","injustices","ining","inhabits","ings","ingrown","inglewood","ingestion","ingesting","infusion","infusing","infringing","infringe","inflection","infinitum","infact","inexplicably","inequities","ineligible","industry's","induces","indubitably","indisputable","indirect","indescribably","independents","indentation","indefinable","incursion","incontrovertible","inconsequential","incompletes","incoherently","inclement","inciting","incidentals","inarticulate","inadequacies","imprudent","improvisation","improprieties","imprison","imprinted","impressively","impostors","importante","implicit","imperious","impale","immortalized","immodest","immobile","imbued","imbedded","imbecilic","illustrates","illegals","iliad","idn't","idiom","icons","hysteric","hypotenuse","hygienic","hyeah","hushpuppies","hunhh","hungarians","humpback","humored","hummed","humiliates","humidifier","huggy","huggers","huckster","html","hows","howlin","hoth","hotbed","hosing","hosers","horsehair","homegrown","homebody","homebake","holographic","holing","holies","hoisting","hogwallop","hogan's","hocks","hobbits","hoaxes","hmmmmm","hisses","hippos","hippest","hindrance","hindi","him's","hillbillies","hilarity","highball","hibiscus","heyday","heurh","hershey's","herniated","hermaphrodite","hera","hennifer","hemlines","hemline","hemery","helplessness","helmsley","hellhound","heheheheh","heey","heeey","hedda","heck's","heartbeats","heaped","healers","headstart","headsets","headlong","headlining","hawkland","havta","havana's","haulin","hastened","hasn","harvey'll","harpo","hardass","haps","hanta","hansom","hangnail","handstand","handrail","handoff","hander","han's","hamlet's","hallucinogen","hallor","halitosis","halen","hahah","hado","haberdashery","gypped","guy'll","guni","gumbel","gulch","gues","guerillas","guava","guatemalan","guardrail","guadalajara","grunther","grunick","grunemann's","growers","groppi","groomer","grodin","gris","gripes","grinds","grimaldi's","grifters","griffins","gridlock","gretch","greevey","greasing","graveyards","grandkid","grainy","graced","governed","gouging","gordie's","gooney","googly","golfers","goldmuff","goldenrod","goingo","godly","gobbledygook","gobbledegook","goa'uld's","glues","gloriously","glengarry","glassware","glamor","glaciers","ginseng","gimmicks","gimlet","gilded","giggly","gig's","giambetti","ghoulish","ghettos","ghandi","ghali","gether","get's","gestation","geriatrics","gerbils","gerace's","geosynchronous","georgio","geopolitical","genus","gente","genital","geneticist","generation's","generates","gendarme","gelbman","gazillionth","gayest","gauging","gastro","gaslight","gasbag","garters","garish","garas","garages","gantu","gangy","gangly","gangland","gamer","galling","galilee","galactica's","gaiety","gadda","gacy","futuristic","futs","furrowed","funny's","funnies","funkytown","fundraisers","fundamentalist","fulcrum","fugimotto","fuente","fueling","fudging","fuckup","fuckeen","frutt's","frustrates","froufrou","froot","frontiers","fromberge","frog's","frizzies","fritters","fringes","frightfully","frigate","friendliest","freeloading","freelancing","fredonia","freakazoid","fraternization","frankfurter","francine's","franchises","framers","fostered","fortune's","fornication","fornicating","formulating","formations","forman's","forgeries","forethought","forage","footstool","foisting","focussing","focking","foal","flutes","flurries","fluffed","flourished","florida's","floe","flintstones","fleischman's","fledgling","fledermaus","flayed","flay","flawlessly","flatters","flashbang","flapped","flanking","flamer","fission","fishies","firmer","fireproof","fireman's","firebug","firebird","fingerpainting","finessed","findin","financials","finality","fillets","fighter's","fiercest","fiefdom","fibrosis","fiberglass","fibbing","feudal","festus","fervor","fervent","fentanyl","fenelon","fenders","fedorchuk","feckless","feathering","fearsome","fauna","faucets","farmland","farewells","fantasyland","fanaticism","faltered","fallacy","fairway","faggy","faberge","extremism","extorting","extorted","exterminating","exhumation","exhilaration","exhausts","exfoliate","exemptions","excesses","excels","exasperating","exacting","evoked","evocative","everyman","everybody'd","evasions","evangelical","establishments","espressos","esoteric","esmail","errrr","erratically","eroding","erode","ernswiler","episcopalian","ephemeral","epcot","entrenched","entomology","entomologist","enthralled","ensuing","ensenada","enriching","enrage","enlisting","enhancer","enhancements","endorsing","endear","encrusted","encino","enacted","employing","emperors","empathic","embodied","embezzle","embarked","emanates","elton's","eloquence","eloi","elmwood","elliptical","ellenor's","elemental","electricians","electing","elapsed","eking","egomaniacal","eggo","egging","effected","effacing","eeww","edits","editor's","edging","ectoplasm","economical","ecch","eavesdropped","eastbound","earwig","e'er","durable","dunbar's","dummkopf","dugray","duchaisne","duality","drusilla's","drunkard","drudge","drucilla's","droop","droids","drips","dripped","dribbles","drew's","dressings","drazens","downy","downsize","downpour","dowager","dote","dosages","dorothy's","doppler","doppelganger","dopes","doorman's","doohicky","doof","dontcha","donovon's","doneghy","domi","domes","dojo","documentaries","divinity","divining","divest","diuretics","diuretic","distrustful","distortions","dissident","disrupts","disruptions","disproportionate","dispensary","disparity","dismemberment","dismember","disinfect","disillusionment","disheartening","discriminated","discourteous","discotheque","discolored","disassembled","disabling","dirtiest","diphtheria","dinks","dimpled","digg","diffusion","differs","didya","dickweed","dickwad","dickson's","diatribes","diathesis","diabetics","dewars","deviants","detrimental","detonates","detests","detestable","detaining","despondent","desecration","descriptive","derision","derailing","deputized","depressors","depo","depicting","depict","dependant","dentures","denominators","demur","demonstrators","demonology","delts","dellarte","delinquency","delacour","deflated","definitively","defib","defected","defaced","deeded","decorators","debit","deaqon","davola","datin","dasilva's","darwinian","darling's","darklighters","dandelions","dandelion","dancer's","dampened","dame's","damaskinos","dama","dalrimple","dagobah","dack","d'peshu","d'hoffryn","d'astier","cystic","cynics","cybernetic","cutoff","cutesy","cutaway","customarily","curtain's","cursive","curmudgeon","curdle","cuneiform","cultivated","culpability","culo","cuisinart","cuffing","crypts","cryptid","cryogenic","crux","crunched","crumblers","crudely","crosscheck","croon","crissake","crime's","cribbage","crevasse","creswood","creepo","creases","creased","creaky","cranks","cran","craftsmen","crafting","crabgrass","cowboy's","coveralls","couple'a","councilors","coughs","cotton's","cosmology","coslaw","corresponded","corporeal","corollary","cornucopia","cornering","corks","cordoned","coolly","coolin","cooley's","coolant","cookbooks","converging","contrived","contrite","contributors","contradictory","contra","contours","contented","contenders","contemplated","contact's","constrictor","congressman's","congestion","confrontations","confound","conform","confit","confiscating","conferred","condoned","conditioners","concussions","concentric","conceding","coms","comprised","comprise","comprendo","composers","commuted","commercially","commentator","commentaries","commemorating","commander's","comers","comedic","combustible","combusted","columbo","columbia's","colourful","colonials","collingswood","coliseum","coldness","cojones","coitus","cohesive","cohesion","cohen's","coffey's","codicil","cochran's","coasting","clydesdale","cluttering","clunker","clunk","clumsiness","clumps","clotted","clothesline","clinches","clincher","cleverness","clench","clein","cleave","cleanses","claymores","clarisse","clarissa's","clammed","civilisation","ciudad","circumvent","circulated","circuit's","cinnamon's","cind","church's","chugging","chronically","christsakes","chris's","choque","chompers","choco","chiseling","chirpy","chirp","chinks","chingachgook","chigger","chicklet","chickenpox","chickadee","chewin","chessboard","cherub","chemo's","chauffeur's","chaucer","chariots","chargin","characterizing","chanteuse","chandeliers","chamdo","chalupa","chagrined","chaff","certs","certify","certification","certainties","cerreno","cerebrum","cerebro","century's","centennial","censured","cemetary","cellist","celine's","cedar's","cayo","caterwauling","caterpillars","categorized","catchers","cataclysmic","cassidy's","casitas","casino's","cased","carvel","cartographers","carting","cartels","carriages","carrear","carr's","carolling","carolinas","carolers","carnie","carne","cardiovascular","cardiogram","carbuncle","caramba","capulets","capping","canyons","canines","candaules","canape","canadiens","campaigned","cambodian","camberwell","caldecott","calamitous","caff","cadillacs","cachet","cabeza","cabdriver","byzantium","buzzkill","buzzards","buzz's","buyer's","butai","bustling","businesswomen","bunyan","bungled","bumpkins","bummers","bulletins","bullet's","bulldoze","bulbous","bug's","buffybot","budgeted","budda","bubut","bubbies","brunei","brrrrr","brownout","brouhaha","bronzing","bronchial","broiler","broadening","briskly","briefcases","bricked","breezing","breeher","breckinridge","breakwater","breakable","breadstick","bravenet","braved","brass's","brandies","brandeis","branched","brainwaves","brainiest","braggart","bradlee","boys're","boys'll","boys'd","boyd's","boutonniere","bottle's","bossed","bosomy","bosnian","borans","boosts","boombox","bookshelves","bookmark","booklet","bookends","bontecou's","bongos","boneless","bone's","bond's","bombarding","bombarded","bollo","boinked","boink","boilers","bogart's","bobbo","bobbin","bluest","bluebells","blowjobs","bloodshot","blondie's","blockhead","blockbusters","blithely","blim","bleh","blather","blasters","blankly","bladders","blackhawks","blackbeard","bjorn","bitte","bippy","bios","biohazard","biogenetics","biochemistry","biochemist","bilingual","bilge","bigmouth","bighorn","bigglesworth","bicuspids","beususe","betaseron","besmirch","besieged","bernece","bergman's","bereavement","bentonville","benthic","benjie","benji's","benefactors","benchley","benching","bembe","bellyaching","bellhops","belie","beleaguered","being's","behrle","beginnin","begining","beenie","beefs","beechwood","bee's","bedbug","becau","beaverhausen","beakers","beacon's","bazillion","baudouin","bat's","bartlett's","barrytown","barringtons","baroque","baronet","barneys","barbs","barbers","barbatus","baptists","bankrupted","banker's","bamn","bambi's","ballon's","balinese","bakeries","bailiffs","backslide","baby'd","baaad","b'fore","awwwk","aways","awakes","averages","avengers","avatars","autonomous","automotive","automaton","automatics","autism","authoritative","authenticated","authenticate","aught","audition's","aubyn","attired","attagirl","atrophied","atonement","atherton's","asystole","astroturf","assimilated","assimilate","assertiveness","assemblies","assassin's","artiste","article's","artichokes","arsehole","arrears","arquillians","arnie's","aright","archenemy","arched","arcade's","aquatic","apps","appraise","applauded","appendages","appeased","apostle","apollo's","antwerp","antler","antiquity","antin","antidepressant","antibody","anthropologists","anthology","anthea","antagonism","ant's","anspaugh","annually","anka","angola","anesthetics","anda","ancients","anchoring","anaphylactic","anaheim","ana's","amtrak","amscray","amputated","amounted","americas","amended","ambivalence","amalio","amah","altoid","alriiight","alphabetized","alpena","alouette","allowable","allora","alliteration","allenwood","alleging","allegiances","aligning","algerians","alerts","alchemist","alcerro","alastor","airway's","airmen","ahaha","ah'm","agitators","agitation","aforethought","afis","aesthetics","aerospace","aerodynamics","advertises","advert","advantageous","admonition","administration's","adirondacks","adenoids","adebisi's","acupuncturist","acula","actuarial","activators","actionable","acme's","acknowledges","achmed","achingly","acetate","accusers","accumulation","accorded","acclimated","acclimate","absurdly","absorbent","absolvo","absolutes","absences","abraham's","aboriginal","ablaze","abdomenizer","aaaaaaaaah","aaaaaaaaaa","a'right"]}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/FemaleNames.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/FemaleNames.json
deleted file mode 100644
index 1a7a904d81..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/FemaleNames.json
+++ /dev/null
@@ -1,3819 +0,0 @@
-{
-  "List": [
-    "mary",
-    "patricia",
-    "linda",
-    "barbara",
-    "elizabeth",
-    "jennifer",
-    "maria",
-    "susan",
-    "margaret",
-    "dorothy",
-    "lisa",
-    "nancy",
-    "karen",
-    "betty",
-    "helen",
-    "sandra",
-    "donna",
-    "carol",
-    "ruth",
-    "sharon",
-    "michelle",
-    "laura",
-    "sarah",
-    "kimberly",
-    "deborah",
-    "jessica",
-    "shirley",
-    "cynthia",
-    "angela",
-    "melissa",
-    "brenda",
-    "amy",
-    "anna",
-    "rebecca",
-    "virginia",
-    "kathleen",
-    "pamela",
-    "martha",
-    "debra",
-    "amanda",
-    "stephanie",
-    "carolyn",
-    "christine",
-    "marie",
-    "janet",
-    "catherine",
-    "frances",
-    "ann",
-    "joyce",
-    "diane",
-    "alice",
-    "julie",
-    "heather",
-    "teresa",
-    "doris",
-    "gloria",
-    "evelyn",
-    "jean",
-    "cheryl",
-    "mildred",
-    "katherine",
-    "joan",
-    "ashley",
-    "judith",
-    "rose",
-    "janice",
-    "kelly",
-    "nicole",
-    "judy",
-    "christina",
-    "kathy",
-    "theresa",
-    "beverly",
-    "denise",
-    "tammy",
-    "irene",
-    "jane",
-    "lori",
-    "rachel",
-    "marilyn",
-    "andrea",
-    "kathryn",
-    "louise",
-    "sara",
-    "anne",
-    "jacqueline",
-    "wanda",
-    "bonnie",
-    "julia",
-    "ruby",
-    "lois",
-    "tina",
-    "phyllis",
-    "norma",
-    "paula",
-    "diana",
-    "annie",
-    "lillian",
-    "emily",
-    "robin",
-    "peggy",
-    "crystal",
-    "gladys",
-    "rita",
-    "dawn",
-    "connie",
-    "florence",
-    "tracy",
-    "edna",
-    "tiffany",
-    "carmen",
-    "rosa",
-    "cindy",
-    "grace",
-    "wendy",
-    "victoria",
-    "edith",
-    "kim",
-    "sherry",
-    "sylvia",
-    "josephine",
-    "thelma",
-    "shannon",
-    "sheila",
-    "ethel",
-    "ellen",
-    "elaine",
-    "marjorie",
-    "carrie",
-    "charlotte",
-    "monica",
-    "esther",
-    "pauline",
-    "emma",
-    "juanita",
-    "anita",
-    "rhonda",
-    "hazel",
-    "amber",
-    "eva",
-    "debbie",
-    "april",
-    "leslie",
-    "clara",
-    "lucille",
-    "jamie",
-    "joanne",
-    "eleanor",
-    "valerie",
-    "danielle",
-    "megan",
-    "alicia",
-    "suzanne",
-    "michele",
-    "gail",
-    "bertha",
-    "darlene",
-    "veronica",
-    "jill",
-    "erin",
-    "geraldine",
-    "lauren",
-    "cathy",
-    "joann",
-    "lorraine",
-    "lynn",
-    "sally",
-    "regina",
-    "erica",
-    "beatrice",
-    "dolores",
-    "bernice",
-    "audrey",
-    "yvonne",
-    "annette",
-    "june",
-    "marion",
-    "dana",
-    "stacy",
-    "ana",
-    "renee",
-    "ida",
-    "vivian",
-    "roberta",
-    "holly",
-    "brittany",
-    "melanie",
-    "loretta",
-    "yolanda",
-    "jeanette",
-    "laurie",
-    "katie",
-    "kristen",
-    "vanessa",
-    "alma",
-    "sue",
-    "elsie",
-    "beth",
-    "jeanne",
-    "vicki",
-    "carla",
-    "tara",
-    "rosemary",
-    "eileen",
-    "terri",
-    "gertrude",
-    "lucy",
-    "tonya",
-    "ella",
-    "stacey",
-    "wilma",
-    "gina",
-    "kristin",
-    "jessie",
-    "natalie",
-    "agnes",
-    "vera",
-    "charlene",
-    "bessie",
-    "delores",
-    "melinda",
-    "pearl",
-    "arlene",
-    "maureen",
-    "colleen",
-    "allison",
-    "tamara",
-    "joy",
-    "georgia",
-    "constance",
-    "lillie",
-    "claudia",
-    "jackie",
-    "marcia",
-    "tanya",
-    "nellie",
-    "minnie",
-    "marlene",
-    "heidi",
-    "glenda",
-    "lydia",
-    "viola",
-    "courtney",
-    "marian",
-    "stella",
-    "caroline",
-    "dora",
-    "jo",
-    "vickie",
-    "mattie",
-    "maxine",
-    "irma",
-    "mabel",
-    "marsha",
-    "myrtle",
-    "lena",
-    "christy",
-    "deanna",
-    "patsy",
-    "hilda",
-    "gwendolyn",
-    "jennie",
-    "nora",
-    "margie",
-    "nina",
-    "cassandra",
-    "leah",
-    "penny",
-    "kay",
-    "priscilla",
-    "naomi",
-    "carole",
-    "olga",
-    "billie",
-    "dianne",
-    "tracey",
-    "leona",
-    "jenny",
-    "felicia",
-    "sonia",
-    "miriam",
-    "velma",
-    "becky",
-    "bobbie",
-    "violet",
-    "kristina",
-    "toni",
-    "misty",
-    "mae",
-    "shelly",
-    "daisy",
-    "ramona",
-    "sherri",
-    "erika",
-    "katrina",
-    "claire",
-    "lindsey",
-    "lindsay",
-    "geneva",
-    "guadalupe",
-    "belinda",
-    "margarita",
-    "sheryl",
-    "cora",
-    "faye",
-    "ada",
-    "natasha",
-    "sabrina",
-    "isabel",
-    "marguerite",
-    "hattie",
-    "harriet",
-    "molly",
-    "cecilia",
-    "kristi",
-    "brandi",
-    "blanche",
-    "sandy",
-    "rosie",
-    "joanna",
-    "iris",
-    "eunice",
-    "angie",
-    "inez",
-    "lynda",
-    "madeline",
-    "amelia",
-    "alberta",
-    "genevieve",
-    "monique",
-    "jodi",
-    "janie",
-    "kayla",
-    "sonya",
-    "jan",
-    "kristine",
-    "candace",
-    "fannie",
-    "maryann",
-    "opal",
-    "alison",
-    "yvette",
-    "melody",
-    "luz",
-    "susie",
-    "olivia",
-    "flora",
-    "shelley",
-    "kristy",
-    "mamie",
-    "lula",
-    "lola",
-    "verna",
-    "beulah",
-    "antoinette",
-    "candice",
-    "juana",
-    "jeannette",
-    "pam",
-    "kelli",
-    "whitney",
-    "bridget",
-    "karla",
-    "celia",
-    "latoya",
-    "patty",
-    "shelia",
-    "gayle",
-    "della",
-    "vicky",
-    "lynne",
-    "sheri",
-    "marianne",
-    "kara",
-    "jacquelyn",
-    "erma",
-    "blanca",
-    "myra",
-    "leticia",
-    "pat",
-    "krista",
-    "roxanne",
-    "angelica",
-    "robyn",
-    "adrienne",
-    "rosalie",
-    "alexandra",
-    "brooke",
-    "bethany",
-    "sadie",
-    "bernadette",
-    "traci",
-    "jody",
-    "kendra",
-    "nichole",
-    "rachael",
-    "mable",
-    "ernestine",
-    "muriel",
-    "marcella",
-    "elena",
-    "krystal",
-    "angelina",
-    "nadine",
-    "kari",
-    "estelle",
-    "dianna",
-    "paulette",
-    "lora",
-    "mona",
-    "doreen",
-    "rosemarie",
-    "desiree",
-    "antonia",
-    "janis",
-    "betsy",
-    "christie",
-    "freda",
-    "meredith",
-    "lynette",
-    "teri",
-    "cristina",
-    "eula",
-    "leigh",
-    "meghan",
-    "sophia",
-    "eloise",
-    "rochelle",
-    "gretchen",
-    "cecelia",
-    "raquel",
-    "henrietta",
-    "alyssa",
-    "jana",
-    "gwen",
-    "jenna",
-    "tricia",
-    "laverne",
-    "olive",
-    "tasha",
-    "silvia",
-    "elvira",
-    "delia",
-    "kate",
-    "patti",
-    "lorena",
-    "kellie",
-    "sonja",
-    "lila",
-    "lana",
-    "darla",
-    "mindy",
-    "essie",
-    "mandy",
-    "lorene",
-    "elsa",
-    "josefina",
-    "jeannie",
-    "miranda",
-    "dixie",
-    "lucia",
-    "marta",
-    "faith",
-    "lela",
-    "johanna",
-    "shari",
-    "camille",
-    "tami",
-    "shawna",
-    "elisa",
-    "ebony",
-    "melba",
-    "ora",
-    "nettie",
-    "tabitha",
-    "ollie",
-    "winifred",
-    "kristie",
-    "marina",
-    "alisha",
-    "aimee",
-    "rena",
-    "myrna",
-    "marla",
-    "tammie",
-    "latasha",
-    "bonita",
-    "patrice",
-    "ronda",
-    "sherrie",
-    "addie",
-    "francine",
-    "deloris",
-    "stacie",
-    "adriana",
-    "cheri",
-    "abigail",
-    "celeste",
-    "jewel",
-    "cara",
-    "adele",
-    "rebekah",
-    "lucinda",
-    "dorthy",
-    "effie",
-    "trina",
-    "reba",
-    "sallie",
-    "aurora",
-    "lenora",
-    "etta",
-    "lottie",
-    "kerri",
-    "trisha",
-    "nikki",
-    "estella",
-    "francisca",
-    "josie",
-    "tracie",
-    "marissa",
-    "karin",
-    "brittney",
-    "janelle",
-    "lourdes",
-    "laurel",
-    "helene",
-    "fern",
-    "elva",
-    "corinne",
-    "kelsey",
-    "ina",
-    "bettie",
-    "elisabeth",
-    "aida",
-    "caitlin",
-    "ingrid",
-    "iva",
-    "eugenia",
-    "christa",
-    "goldie",
-    "maude",
-    "jenifer",
-    "therese",
-    "dena",
-    "lorna",
-    "janette",
-    "latonya",
-    "candy",
-    "consuelo",
-    "tamika",
-    "rosetta",
-    "debora",
-    "cherie",
-    "polly",
-    "dina",
-    "jewell",
-    "fay",
-    "jillian",
-    "dorothea",
-    "nell",
-    "trudy",
-    "esperanza",
-    "patrica",
-    "kimberley",
-    "shanna",
-    "helena",
-    "cleo",
-    "stefanie",
-    "rosario",
-    "ola",
-    "janine",
-    "mollie",
-    "lupe",
-    "alisa",
-    "lou",
-    "maribel",
-    "susanne",
-    "bette",
-    "susana",
-    "elise",
-    "cecile",
-    "isabelle",
-    "lesley",
-    "jocelyn",
-    "paige",
-    "joni",
-    "rachelle",
-    "leola",
-    "daphne",
-    "alta",
-    "ester",
-    "petra",
-    "graciela",
-    "imogene",
-    "jolene",
-    "keisha",
-    "lacey",
-    "glenna",
-    "gabriela",
-    "keri",
-    "ursula",
-    "lizzie",
-    "kirsten",
-    "shana",
-    "adeline",
-    "mayra",
-    "jayne",
-    "jaclyn",
-    "gracie",
-    "sondra",
-    "carmela",
-    "marisa",
-    "rosalind",
-    "charity",
-    "tonia",
-    "beatriz",
-    "marisol",
-    "clarice",
-    "jeanine",
-    "sheena",
-    "angeline",
-    "frieda",
-    "lily",
-    "shauna",
-    "millie",
-    "claudette",
-    "cathleen",
-    "angelia",
-    "gabrielle",
-    "autumn",
-    "katharine",
-    "jodie",
-    "staci",
-    "lea",
-    "christi",
-    "justine",
-    "elma",
-    "luella",
-    "margret",
-    "dominique",
-    "socorro",
-    "martina",
-    "margo",
-    "mavis",
-    "callie",
-    "bobbi",
-    "maritza",
-    "lucile",
-    "leanne",
-    "jeannine",
-    "deana",
-    "aileen",
-    "lorie",
-    "ladonna",
-    "willa",
-    "manuela",
-    "gale",
-    "selma",
-    "dolly",
-    "sybil",
-    "abby",
-    "ivy",
-    "dee",
-    "winnie",
-    "marcy",
-    "luisa",
-    "jeri",
-    "magdalena",
-    "ofelia",
-    "meagan",
-    "audra",
-    "matilda",
-    "leila",
-    "cornelia",
-    "bianca",
-    "simone",
-    "bettye",
-    "randi",
-    "virgie",
-    "latisha",
-    "barbra",
-    "georgina",
-    "eliza",
-    "leann",
-    "bridgette",
-    "rhoda",
-    "haley",
-    "adela",
-    "nola",
-    "bernadine",
-    "flossie",
-    "ila",
-    "greta",
-    "ruthie",
-    "nelda",
-    "minerva",
-    "lilly",
-    "terrie",
-    "letha",
-    "hilary",
-    "estela",
-    "valarie",
-    "brianna",
-    "rosalyn",
-    "earline",
-    "catalina",
-    "ava",
-    "mia",
-    "clarissa",
-    "lidia",
-    "corrine",
-    "alexandria",
-    "concepcion",
-    "tia",
-    "sharron",
-    "rae",
-    "dona",
-    "ericka",
-    "jami",
-    "elnora",
-    "chandra",
-    "lenore",
-    "neva",
-    "marylou",
-    "melisa",
-    "tabatha",
-    "serena",
-    "avis",
-    "allie",
-    "sofia",
-    "jeanie",
-    "odessa",
-    "nannie",
-    "harriett",
-    "loraine",
-    "penelope",
-    "milagros",
-    "emilia",
-    "benita",
-    "allyson",
-    "ashlee",
-    "tania",
-    "esmeralda",
-    "karina",
-    "eve",
-    "pearlie",
-    "zelma",
-    "malinda",
-    "noreen",
-    "tameka",
-    "saundra",
-    "hillary",
-    "amie",
-    "althea",
-    "rosalinda",
-    "lilia",
-    "alana",
-    "clare",
-    "alejandra",
-    "elinor",
-    "lorrie",
-    "jerri",
-    "darcy",
-    "earnestine",
-    "carmella",
-    "noemi",
-    "marcie",
-    "liza",
-    "annabelle",
-    "louisa",
-    "earlene",
-    "mallory",
-    "carlene",
-    "nita",
-    "selena",
-    "tanisha",
-    "katy",
-    "julianne",
-    "lakisha",
-    "edwina",
-    "maricela",
-    "margery",
-    "kenya",
-    "dollie",
-    "roxie",
-    "roslyn",
-    "kathrine",
-    "nanette",
-    "charmaine",
-    "lavonne",
-    "ilene",
-    "tammi",
-    "suzette",
-    "corine",
-    "kaye",
-    "chrystal",
-    "lina",
-    "deanne",
-    "lilian",
-    "juliana",
-    "aline",
-    "luann",
-    "kasey",
-    "maryanne",
-    "evangeline",
-    "colette",
-    "melva",
-    "lawanda",
-    "yesenia",
-    "nadia",
-    "madge",
-    "kathie",
-    "ophelia",
-    "valeria",
-    "nona",
-    "mitzi",
-    "mari",
-    "georgette",
-    "claudine",
-    "fran",
-    "alissa",
-    "roseann",
-    "lakeisha",
-    "susanna",
-    "reva",
-    "deidre",
-    "chasity",
-    "sheree",
-    "elvia",
-    "alyce",
-    "deirdre",
-    "gena",
-    "briana",
-    "araceli",
-    "katelyn",
-    "rosanne",
-    "wendi",
-    "tessa",
-    "berta",
-    "marva",
-    "imelda",
-    "marietta",
-    "marci",
-    "leonor",
-    "arline",
-    "sasha",
-    "madelyn",
-    "janna",
-    "juliette",
-    "deena",
-    "aurelia",
-    "josefa",
-    "augusta",
-    "liliana",
-    "lessie",
-    "amalia",
-    "savannah",
-    "anastasia",
-    "vilma",
-    "natalia",
-    "rosella",
-    "lynnette",
-    "corina",
-    "alfreda",
-    "leanna",
-    "amparo",
-    "coleen",
-    "tamra",
-    "aisha",
-    "wilda",
-    "karyn",
-    "queen",
-    "maura",
-    "mai",
-    "evangelina",
-    "rosanna",
-    "hallie",
-    "erna",
-    "enid",
-    "mariana",
-    "lacy",
-    "juliet",
-    "jacklyn",
-    "freida",
-    "madeleine",
-    "mara",
-    "cathryn",
-    "lelia",
-    "casandra",
-    "bridgett",
-    "angelita",
-    "jannie",
-    "dionne",
-    "annmarie",
-    "katina",
-    "beryl",
-    "millicent",
-    "katheryn",
-    "diann",
-    "carissa",
-    "maryellen",
-    "liz",
-    "lauri",
-    "helga",
-    "gilda",
-    "rhea",
-    "marquita",
-    "hollie",
-    "tisha",
-    "tamera",
-    "angelique",
-    "francesca",
-    "kaitlin",
-    "lolita",
-    "florine",
-    "rowena",
-    "reyna",
-    "twila",
-    "fanny",
-    "janell",
-    "ines",
-    "concetta",
-    "bertie",
-    "alba",
-    "brigitte",
-    "alyson",
-    "vonda",
-    "pansy",
-    "elba",
-    "noelle",
-    "letitia",
-    "deann",
-    "brandie",
-    "louella",
-    "leta",
-    "felecia",
-    "sharlene",
-    "lesa",
-    "beverley",
-    "isabella",
-    "herminia",
-    "terra",
-    "celina",
-    "tori",
-    "octavia",
-    "jade",
-    "denice",
-    "germaine",
-    "michell",
-    "cortney",
-    "nelly",
-    "doretha",
-    "deidra",
-    "monika",
-    "lashonda",
-    "judi",
-    "chelsey",
-    "antionette",
-    "margot",
-    "adelaide",
-    "nan",
-    "leeann",
-    "elisha",
-    "dessie",
-    "libby",
-    "kathi",
-    "gayla",
-    "latanya",
-    "mina",
-    "mellisa",
-    "kimberlee",
-    "jasmin",
-    "renae",
-    "zelda",
-    "elda",
-    "justina",
-    "gussie",
-    "emilie",
-    "camilla",
-    "abbie",
-    "rocio",
-    "kaitlyn",
-    "edythe",
-    "ashleigh",
-    "selina",
-    "lakesha",
-    "geri",
-    "allene",
-    "pamala",
-    "michaela",
-    "dayna",
-    "caryn",
-    "rosalia",
-    "sun",
-    "jacquline",
-    "rebeca",
-    "marybeth",
-    "krystle",
-    "iola",
-    "dottie",
-    "belle",
-    "griselda",
-    "ernestina",
-    "elida",
-    "adrianne",
-    "demetria",
-    "delma",
-    "jaqueline",
-    "arleen",
-    "virgina",
-    "retha",
-    "fatima",
-    "tillie",
-    "eleanore",
-    "cari",
-    "treva",
-    "wilhelmina",
-    "rosalee",
-    "maurine",
-    "latrice",
-    "jena",
-    "taryn",
-    "elia",
-    "debby",
-    "maudie",
-    "jeanna",
-    "delilah",
-    "catrina",
-    "shonda",
-    "hortencia",
-    "theodora",
-    "teresita",
-    "robbin",
-    "danette",
-    "delphine",
-    "brianne",
-    "nilda",
-    "danna",
-    "cindi",
-    "bess",
-    "iona",
-    "winona",
-    "vida",
-    "rosita",
-    "marianna",
-    "racheal",
-    "guillermina",
-    "eloisa",
-    "celestine",
-    "caren",
-    "malissa",
-    "lona",
-    "chantel",
-    "shellie",
-    "marisela",
-    "leora",
-    "agatha",
-    "soledad",
-    "migdalia",
-    "ivette",
-    "christen",
-    "janel",
-    "veda",
-    "pattie",
-    "tessie",
-    "tera",
-    "marilynn",
-    "lucretia",
-    "karrie",
-    "dinah",
-    "daniela",
-    "alecia",
-    "adelina",
-    "vernice",
-    "shiela",
-    "portia",
-    "merry",
-    "lashawn",
-    "dara",
-    "tawana",
-    "oma",
-    "verda",
-    "alene",
-    "zella",
-    "sandi",
-    "rafaela",
-    "maya",
-    "kira",
-    "candida",
-    "alvina",
-    "suzan",
-    "shayla",
-    "lyn",
-    "lettie",
-    "samatha",
-    "oralia",
-    "matilde",
-    "larissa",
-    "vesta",
-    "renita",
-    "india",
-    "delois",
-    "shanda",
-    "phillis",
-    "lorri",
-    "erlinda",
-    "cathrine",
-    "barb",
-    "zoe",
-    "isabell",
-    "ione",
-    "gisela",
-    "roxanna",
-    "mayme",
-    "kisha",
-    "ellie",
-    "mellissa",
-    "dorris",
-    "dalia",
-    "bella",
-    "annetta",
-    "zoila",
-    "reta",
-    "reina",
-    "lauretta",
-    "kylie",
-    "christal",
-    "pilar",
-    "charla",
-    "elissa",
-    "tiffani",
-    "tana",
-    "paulina",
-    "leota",
-    "breanna",
-    "jayme",
-    "carmel",
-    "vernell",
-    "tomasa",
-    "mandi",
-    "dominga",
-    "santa",
-    "melodie",
-    "lura",
-    "alexa",
-    "tamela",
-    "mirna",
-    "kerrie",
-    "venus",
-    "felicita",
-    "cristy",
-    "carmelita",
-    "berniece",
-    "annemarie",
-    "tiara",
-    "roseanne",
-    "missy",
-    "cori",
-    "roxana",
-    "pricilla",
-    "kristal",
-    "jung",
-    "elyse",
-    "haydee",
-    "aletha",
-    "bettina",
-    "marge",
-    "gillian",
-    "filomena",
-    "zenaida",
-    "harriette",
-    "caridad",
-    "vada",
-    "una",
-    "aretha",
-    "pearline",
-    "marjory",
-    "marcela",
-    "flor",
-    "evette",
-    "elouise",
-    "alina",
-    "damaris",
-    "catharine",
-    "belva",
-    "nakia",
-    "marlena",
-    "luanne",
-    "lorine",
-    "karon",
-    "dorene",
-    "danita",
-    "brenna",
-    "tatiana",
-    "louann",
-    "julianna",
-    "andria",
-    "philomena",
-    "lucila",
-    "leonora",
-    "dovie",
-    "romona",
-    "mimi",
-    "jacquelin",
-    "gaye",
-    "tonja",
-    "misti",
-    "chastity",
-    "stacia",
-    "roxann",
-    "micaela",
-    "nikita",
-    "mei",
-    "velda",
-    "marlys",
-    "johnna",
-    "aura",
-    "ivonne",
-    "hayley",
-    "nicki",
-    "majorie",
-    "herlinda",
-    "yadira",
-    "perla",
-    "gregoria",
-    "antonette",
-    "shelli",
-    "mozelle",
-    "mariah",
-    "joelle",
-    "cordelia",
-    "josette",
-    "chiquita",
-    "trista",
-    "laquita",
-    "georgiana",
-    "candi",
-    "shanon",
-    "hildegard",
-    "valentina",
-    "stephany",
-    "magda",
-    "karol",
-    "gabriella",
-    "tiana",
-    "roma",
-    "richelle",
-    "oleta",
-    "jacque",
-    "idella",
-    "alaina",
-    "suzanna",
-    "jovita",
-    "tosha",
-    "nereida",
-    "marlyn",
-    "kyla",
-    "delfina",
-    "tena",
-    "stephenie",
-    "sabina",
-    "nathalie",
-    "marcelle",
-    "gertie",
-    "darleen",
-    "thea",
-    "sharonda",
-    "shantel",
-    "belen",
-    "venessa",
-    "rosalina",
-    "ona",
-    "genoveva",
-    "clementine",
-    "rosalba",
-    "renate",
-    "renata",
-    "georgianna",
-    "floy",
-    "dorcas",
-    "ariana",
-    "tyra",
-    "theda",
-    "mariam",
-    "juli",
-    "jesica",
-    "vikki",
-    "verla",
-    "roselyn",
-    "melvina",
-    "jannette",
-    "ginny",
-    "debrah",
-    "corrie",
-    "asia",
-    "violeta",
-    "myrtis",
-    "latricia",
-    "collette",
-    "charleen",
-    "anissa",
-    "viviana",
-    "twyla",
-    "nedra",
-    "latonia",
-    "lan",
-    "hellen",
-    "fabiola",
-    "annamarie",
-    "adell",
-    "sharyn",
-    "chantal",
-    "niki",
-    "maud",
-    "lizette",
-    "lindy",
-    "kia",
-    "kesha",
-    "jeana",
-    "danelle",
-    "charline",
-    "chanel",
-    "valorie",
-    "lia",
-    "dortha",
-    "cristal",
-    "leone",
-    "leilani",
-    "gerri",
-    "debi",
-    "andra",
-    "keshia",
-    "ima",
-    "eulalia",
-    "easter",
-    "dulce",
-    "natividad",
-    "linnie",
-    "kami",
-    "georgie",
-    "catina",
-    "brook",
-    "alda",
-    "winnifred",
-    "sharla",
-    "ruthann",
-    "meaghan",
-    "magdalene",
-    "lissette",
-    "adelaida",
-    "venita",
-    "trena",
-    "shirlene",
-    "shameka",
-    "elizebeth",
-    "dian",
-    "shanta",
-    "latosha",
-    "carlotta",
-    "windy",
-    "rosina",
-    "mariann",
-    "leisa",
-    "jonnie",
-    "dawna",
-    "cathie",
-    "astrid",
-    "laureen",
-    "janeen",
-    "holli",
-    "fawn",
-    "vickey",
-    "teressa",
-    "shante",
-    "rubye",
-    "marcelina",
-    "chanda",
-    "terese",
-    "scarlett",
-    "marnie",
-    "lulu",
-    "lisette",
-    "jeniffer",
-    "elenor",
-    "dorinda",
-    "donita",
-    "carman",
-    "bernita",
-    "altagracia",
-    "aleta",
-    "adrianna",
-    "zoraida",
-    "nicola",
-    "lyndsey",
-    "janina",
-    "ami",
-    "starla",
-    "phylis",
-    "phuong",
-    "kyra",
-    "charisse",
-    "blanch",
-    "sanjuanita",
-    "rona",
-    "nanci",
-    "marilee",
-    "maranda",
-    "brigette",
-    "sanjuana",
-    "marita",
-    "kassandra",
-    "joycelyn",
-    "felipa",
-    "chelsie",
-    "bonny",
-    "mireya",
-    "lorenza",
-    "kyong",
-    "ileana",
-    "candelaria",
-    "sherie",
-    "lucie",
-    "leatrice",
-    "lakeshia",
-    "gerda",
-    "edie",
-    "bambi",
-    "marylin",
-    "lavon",
-    "hortense",
-    "garnet",
-    "evie",
-    "tressa",
-    "shayna",
-    "lavina",
-    "kyung",
-    "jeanetta",
-    "sherrill",
-    "shara",
-    "phyliss",
-    "mittie",
-    "anabel",
-    "alesia",
-    "thuy",
-    "tawanda",
-    "joanie",
-    "tiffanie",
-    "lashanda",
-    "karissa",
-    "enriqueta",
-    "daria",
-    "daniella",
-    "corinna",
-    "alanna",
-    "abbey",
-    "roxane",
-    "roseanna",
-    "magnolia",
-    "lida",
-    "joellen",
-    "era",
-    "coral",
-    "carleen",
-    "tresa",
-    "peggie",
-    "novella",
-    "nila",
-    "maybelle",
-    "jenelle",
-    "carina",
-    "nova",
-    "melina",
-    "marquerite",
-    "margarette",
-    "josephina",
-    "evonne",
-    "cinthia",
-    "albina",
-    "toya",
-    "tawnya",
-    "sherita",
-    "myriam",
-    "lizabeth",
-    "lise",
-    "keely",
-    "jenni",
-    "giselle",
-    "cheryle",
-    "ardith",
-    "ardis",
-    "alesha",
-    "adriane",
-    "shaina",
-    "linnea",
-    "karolyn",
-    "felisha",
-    "dori",
-    "darci",
-    "artie",
-    "armida",
-    "zola",
-    "xiomara",
-    "vergie",
-    "shamika",
-    "nena",
-    "nannette",
-    "maxie",
-    "lovie",
-    "jeane",
-    "jaimie",
-    "inge",
-    "farrah",
-    "elaina",
-    "caitlyn",
-    "felicitas",
-    "cherly",
-    "caryl",
-    "yolonda",
-    "yasmin",
-    "teena",
-    "prudence",
-    "pennie",
-    "nydia",
-    "mackenzie",
-    "orpha",
-    "marvel",
-    "lizbeth",
-    "laurette",
-    "jerrie",
-    "hermelinda",
-    "carolee",
-    "tierra",
-    "mirian",
-    "meta",
-    "melony",
-    "kori",
-    "jennette",
-    "jamila",
-    "ena",
-    "anh",
-    "yoshiko",
-    "susannah",
-    "salina",
-    "rhiannon",
-    "joleen",
-    "cristine",
-    "ashton",
-    "aracely",
-    "tomeka",
-    "shalonda",
-    "marti",
-    "lacie",
-    "kala",
-    "jada",
-    "ilse",
-    "hailey",
-    "brittani",
-    "zona",
-    "syble",
-    "sherryl",
-    "nidia",
-    "marlo",
-    "kandice",
-    "kandi",
-    "deb",
-    "alycia",
-    "ronna",
-    "norene",
-    "mercy",
-    "ingeborg",
-    "giovanna",
-    "gemma",
-    "christel",
-    "audry",
-    "zora",
-    "vita",
-    "trish",
-    "stephaine",
-    "shirlee",
-    "shanika",
-    "melonie",
-    "mazie",
-    "jazmin",
-    "inga",
-    "hoa",
-    "hettie",
-    "geralyn",
-    "fonda",
-    "estrella",
-    "adella",
-    "sarita",
-    "rina",
-    "milissa",
-    "maribeth",
-    "golda",
-    "evon",
-    "ethelyn",
-    "enedina",
-    "cherise",
-    "chana",
-    "velva",
-    "tawanna",
-    "sade",
-    "mirta",
-    "karie",
-    "jacinta",
-    "elna",
-    "davina",
-    "cierra",
-    "ashlie",
-    "albertha",
-    "tanesha",
-    "nelle",
-    "mindi",
-    "lorinda",
-    "larue",
-    "florene",
-    "demetra",
-    "dedra",
-    "ciara",
-    "chantelle",
-    "ashly",
-    "suzy",
-    "rosalva",
-    "noelia",
-    "lyda",
-    "leatha",
-    "krystyna",
-    "kristan",
-    "karri",
-    "darline",
-    "darcie",
-    "cinda",
-    "cherrie",
-    "awilda",
-    "almeda",
-    "rolanda",
-    "lanette",
-    "jerilyn",
-    "gisele",
-    "evalyn",
-    "cyndi",
-    "cleta",
-    "carin",
-    "zina",
-    "zena",
-    "velia",
-    "tanika",
-    "charissa",
-    "talia",
-    "margarete",
-    "lavonda",
-    "kaylee",
-    "kathlene",
-    "jonna",
-    "irena",
-    "ilona",
-    "idalia",
-    "candis",
-    "candance",
-    "brandee",
-    "anitra",
-    "alida",
-    "sigrid",
-    "nicolette",
-    "maryjo",
-    "linette",
-    "hedwig",
-    "christiana",
-    "alexia",
-    "tressie",
-    "modesta",
-    "lupita",
-    "lita",
-    "gladis",
-    "evelia",
-    "davida",
-    "cherri",
-    "cecily",
-    "ashely",
-    "annabel",
-    "agustina",
-    "wanita",
-    "shirly",
-    "rosaura",
-    "hulda",
-    "eun",
-    "yetta",
-    "verona",
-    "thomasina",
-    "sibyl",
-    "shannan",
-    "mechelle",
-    "lue",
-    "leandra",
-    "lani",
-    "kylee",
-    "kandy",
-    "jolynn",
-    "ferne",
-    "eboni",
-    "corene",
-    "alysia",
-    "zula",
-    "nada",
-    "moira",
-    "lyndsay",
-    "lorretta",
-    "jammie",
-    "hortensia",
-    "gaynell",
-    "adria",
-    "vina",
-    "vicenta",
-    "tangela",
-    "stephine",
-    "norine",
-    "nella",
-    "liana",
-    "leslee",
-    "kimberely",
-    "iliana",
-    "glory",
-    "felica",
-    "emogene",
-    "elfriede",
-    "eden",
-    "eartha",
-    "carma",
-    "bea",
-    "ocie",
-    "lennie",
-    "kiara",
-    "jacalyn",
-    "carlota",
-    "arielle",
-    "otilia",
-    "kirstin",
-    "kacey",
-    "johnetta",
-    "joetta",
-    "jeraldine",
-    "jaunita",
-    "elana",
-    "dorthea",
-    "cami",
-    "amada",
-    "adelia",
-    "vernita",
-    "tamar",
-    "siobhan",
-    "renea",
-    "rashida",
-    "ouida",
-    "nilsa",
-    "meryl",
-    "kristyn",
-    "julieta",
-    "danica",
-    "breanne",
-    "aurea",
-    "anglea",
-    "sherron",
-    "odette",
-    "malia",
-    "lorelei",
-    "leesa",
-    "kenna",
-    "kathlyn",
-    "fiona",
-    "charlette",
-    "suzie",
-    "shantell",
-    "sabra",
-    "racquel",
-    "myong",
-    "mira",
-    "martine",
-    "lucienne",
-    "lavada",
-    "juliann",
-    "elvera",
-    "delphia",
-    "christiane",
-    "charolette",
-    "carri",
-    "asha",
-    "angella",
-    "paola",
-    "ninfa",
-    "leda",
-    "lai",
-    "eda",
-    "stefani",
-    "shanell",
-    "palma",
-    "machelle",
-    "lissa",
-    "kecia",
-    "kathryne",
-    "karlene",
-    "julissa",
-    "jettie",
-    "jenniffer",
-    "hui",
-    "corrina",
-    "carolann",
-    "alena",
-    "rosaria",
-    "myrtice",
-    "marylee",
-    "liane",
-    "kenyatta",
-    "judie",
-    "janey",
-    "elmira",
-    "eldora",
-    "denna",
-    "cristi",
-    "cathi",
-    "zaida",
-    "vonnie",
-    "viva",
-    "vernie",
-    "rosaline",
-    "mariela",
-    "luciana",
-    "lesli",
-    "karan",
-    "felice",
-    "deneen",
-    "adina",
-    "wynona",
-    "tarsha",
-    "sheron",
-    "shanita",
-    "shani",
-    "shandra",
-    "randa",
-    "pinkie",
-    "nelida",
-    "marilou",
-    "lyla",
-    "laurene",
-    "laci",
-    "joi",
-    "janene",
-    "dorotha",
-    "daniele",
-    "dani",
-    "carolynn",
-    "carlyn",
-    "berenice",
-    "ayesha",
-    "anneliese",
-    "alethea",
-    "thersa",
-    "tamiko",
-    "rufina",
-    "oliva",
-    "mozell",
-    "marylyn",
-    "kristian",
-    "kathyrn",
-    "kasandra",
-    "kandace",
-    "janae",
-    "domenica",
-    "debbra",
-    "dannielle",
-    "arcelia",
-    "aja",
-    "zenobia",
-    "sharen",
-    "sharee",
-    "lavinia",
-    "kum",
-    "kacie",
-    "jackeline",
-    "huong",
-    "felisa",
-    "emelia",
-    "eleanora",
-    "cythia",
-    "cristin",
-    "claribel",
-    "anastacia",
-    "zulma",
-    "zandra",
-    "yoko",
-    "tenisha",
-    "susann",
-    "sherilyn",
-    "shay",
-    "shawanda",
-    "romana",
-    "mathilda",
-    "linsey",
-    "keiko",
-    "joana",
-    "isela",
-    "gretta",
-    "georgetta",
-    "eugenie",
-    "desirae",
-    "delora",
-    "corazon",
-    "antonina",
-    "anika",
-    "willene",
-    "tracee",
-    "tamatha",
-    "nichelle",
-    "mickie",
-    "maegan",
-    "luana",
-    "lanita",
-    "kelsie",
-    "edelmira",
-    "bree",
-    "afton",
-    "teodora",
-    "tamie",
-    "shena",
-    "meg",
-    "linh",
-    "keli",
-    "kaci",
-    "danyelle",
-    "arlette",
-    "albertine",
-    "adelle",
-    "tiffiny",
-    "simona",
-    "nicolasa",
-    "nichol",
-    "nia",
-    "nakisha",
-    "mee",
-    "maira",
-    "loreen",
-    "kizzy",
-    "fallon",
-    "christene",
-    "bobbye",
-    "vincenza",
-    "tanja",
-    "rubie",
-    "roni",
-    "queenie",
-    "margarett",
-    "kimberli",
-    "irmgard",
-    "idell",
-    "hilma",
-    "evelina",
-    "esta",
-    "emilee",
-    "dennise",
-    "dania",
-    "carie",
-    "wai",
-    "risa",
-    "rikki",
-    "particia",
-    "mui",
-    "masako",
-    "luvenia",
-    "loree",
-    "loni",
-    "lien",
-    "gigi",
-    "florencia",
-    "denita",
-    "billye",
-    "tomika",
-    "sharita",
-    "rana",
-    "nikole",
-    "neoma",
-    "margarite",
-    "madalyn",
-    "lucina",
-    "laila",
-    "kali",
-    "jenette",
-    "gabriele",
-    "evelyne",
-    "elenora",
-    "clementina",
-    "alejandrina",
-    "zulema",
-    "violette",
-    "vannessa",
-    "thresa",
-    "retta",
-    "pia",
-    "patience",
-    "noella",
-    "nickie",
-    "jonell",
-    "chaya",
-    "camelia",
-    "bethel",
-    "anya",
-    "suzann",
-    "shu",
-    "mila",
-    "lilla",
-    "laverna",
-    "keesha",
-    "kattie",
-    "georgene",
-    "eveline",
-    "estell",
-    "elizbeth",
-    "vivienne",
-    "vallie",
-    "trudie",
-    "stephane",
-    "magaly",
-    "madie",
-    "kenyetta",
-    "karren",
-    "janetta",
-    "hermine",
-    "drucilla",
-    "debbi",
-    "celestina",
-    "candie",
-    "britni",
-    "beckie",
-    "amina",
-    "zita",
-    "yun",
-    "yolande",
-    "vivien",
-    "vernetta",
-    "trudi",
-    "sommer",
-    "pearle",
-    "patrina",
-    "ossie",
-    "nicolle",
-    "loyce",
-    "letty",
-    "larisa",
-    "katharina",
-    "joselyn",
-    "jonelle",
-    "jenell",
-    "iesha",
-    "heide",
-    "florinda",
-    "florentina",
-    "flo",
-    "elodia",
-    "dorine",
-    "brunilda",
-    "brigid",
-    "ashli",
-    "ardella",
-    "twana",
-    "thu",
-    "tarah",
-    "shavon",
-    "serina",
-    "rayna",
-    "ramonita",
-    "nga",
-    "margurite",
-    "lucrecia",
-    "kourtney",
-    "kati",
-    "jesenia",
-    "crista",
-    "ayana",
-    "alica",
-    "alia",
-    "vinnie",
-    "suellen",
-    "romelia",
-    "rachell",
-    "olympia",
-    "michiko",
-    "kathaleen",
-    "jolie",
-    "jessi",
-    "janessa",
-    "hana",
-    "elease",
-    "carletta",
-    "britany",
-    "shona",
-    "salome",
-    "rosamond",
-    "regena",
-    "raina",
-    "ngoc",
-    "nelia",
-    "louvenia",
-    "lesia",
-    "latrina",
-    "laticia",
-    "larhonda",
-    "jina",
-    "jacki",
-    "emmy",
-    "deeann",
-    "coretta",
-    "arnetta",
-    "thalia",
-    "shanice",
-    "neta",
-    "mikki",
-    "micki",
-    "lonna",
-    "leana",
-    "lashunda",
-    "kiley",
-    "joye",
-    "jacqulyn",
-    "ignacia",
-    "hyun",
-    "hiroko",
-    "henriette",
-    "elayne",
-    "delinda",
-    "dahlia",
-    "coreen",
-    "consuela",
-    "conchita",
-    "celine",
-    "babette",
-    "ayanna",
-    "anette",
-    "albertina",
-    "shawnee",
-    "shaneka",
-    "quiana",
-    "pamelia",
-    "min",
-    "merri",
-    "merlene",
-    "margit",
-    "kiesha",
-    "kiera",
-    "kaylene",
-    "jodee",
-    "jenise",
-    "erlene",
-    "emmie",
-    "dalila",
-    "daisey",
-    "casie",
-    "belia",
-    "babara",
-    "versie",
-    "vanesa",
-    "shelba",
-    "shawnda",
-    "nikia",
-    "naoma",
-    "marna",
-    "margeret",
-    "madaline",
-    "lawana",
-    "kindra",
-    "jutta",
-    "jazmine",
-    "janett",
-    "hannelore",
-    "glendora",
-    "gertrud",
-    "garnett",
-    "freeda",
-    "frederica",
-    "florance",
-    "flavia",
-    "carline",
-    "beverlee",
-    "anjanette",
-    "valda",
-    "tamala",
-    "shonna",
-    "sha",
-    "sarina",
-    "oneida",
-    "merilyn",
-    "marleen",
-    "lurline",
-    "lenna",
-    "katherin",
-    "jin",
-    "jeni",
-    "hae",
-    "gracia",
-    "glady",
-    "farah",
-    "enola",
-    "ema",
-    "dominque",
-    "devona",
-    "delana",
-    "cecila",
-    "caprice",
-    "alysha",
-    "alethia",
-    "vena",
-    "theresia",
-    "tawny",
-    "shakira",
-    "samara",
-    "sachiko",
-    "rachele",
-    "pamella",
-    "marni",
-    "mariel",
-    "maren",
-    "malisa",
-    "ligia",
-    "lera",
-    "latoria",
-    "larae",
-    "kimber",
-    "kathern",
-    "karey",
-    "jennefer",
-    "janeth",
-    "halina",
-    "fredia",
-    "delisa",
-    "debroah",
-    "ciera",
-    "angelika",
-    "andree",
-    "altha",
-    "yen",
-    "vivan",
-    "terresa",
-    "tanna",
-    "suk",
-    "sudie",
-    "soo",
-    "signe",
-    "salena",
-    "ronni",
-    "rebbecca",
-    "myrtie",
-    "malika",
-    "maida",
-    "loan",
-    "leonarda",
-    "kayleigh",
-    "ethyl",
-    "ellyn",
-    "dayle",
-    "cammie",
-    "brittni",
-    "birgit",
-    "avelina",
-    "asuncion",
-    "arianna",
-    "akiko",
-    "venice",
-    "tyesha",
-    "tonie",
-    "tiesha",
-    "takisha",
-    "steffanie",
-    "sindy",
-    "meghann",
-    "manda",
-    "macie",
-    "kellye",
-    "kellee",
-    "joslyn",
-    "inger",
-    "indira",
-    "glinda",
-    "glennis",
-    "fernanda",
-    "faustina",
-    "eneida",
-    "elicia",
-    "dot",
-    "digna",
-    "dell",
-    "arletta",
-    "willia",
-    "tammara",
-    "tabetha",
-    "sherrell",
-    "sari",
-    "rebbeca",
-    "pauletta",
-    "natosha",
-    "nakita",
-    "mammie",
-    "kenisha",
-    "kazuko",
-    "kassie",
-    "earlean",
-    "daphine",
-    "corliss",
-    "clotilde",
-    "carolyne",
-    "bernetta",
-    "augustina",
-    "audrea",
-    "annis",
-    "annabell",
-    "yan",
-    "tennille",
-    "tamica",
-    "selene",
-    "rosana",
-    "regenia",
-    "qiana",
-    "markita",
-    "macy",
-    "leeanne",
-    "laurine",
-    "kym",
-    "jessenia",
-    "janita",
-    "georgine",
-    "genie",
-    "emiko",
-    "elvie",
-    "deandra",
-    "dagmar",
-    "corie",
-    "collen",
-    "cherish",
-    "romaine",
-    "porsha",
-    "pearlene",
-    "micheline",
-    "merna",
-    "margorie",
-    "margaretta",
-    "lore",
-    "jenine",
-    "hermina",
-    "fredericka",
-    "elke",
-    "drusilla",
-    "dorathy",
-    "dione",
-    "celena",
-    "brigida",
-    "angeles",
-    "allegra",
-    "tamekia",
-    "synthia",
-    "sook",
-    "slyvia",
-    "rosann",
-    "reatha",
-    "raye",
-    "marquetta",
-    "margart",
-    "layla",
-    "kymberly",
-    "kiana",
-    "kayleen",
-    "katlyn",
-    "karmen",
-    "joella",
-    "irina",
-    "emelda",
-    "eleni",
-    "detra",
-    "clemmie",
-    "cheryll",
-    "chantell",
-    "cathey",
-    "arnita",
-    "arla",
-    "angle",
-    "angelic",
-    "alyse",
-    "zofia",
-    "thomasine",
-    "tennie",
-    "sherly",
-    "sherley",
-    "sharyl",
-    "remedios",
-    "petrina",
-    "nickole",
-    "myung",
-    "myrle",
-    "mozella",
-    "louanne",
-    "lisha",
-    "latia",
-    "krysta",
-    "julienne",
-    "jeanene",
-    "jacqualine",
-    "isaura",
-    "gwenda",
-    "earleen",
-    "cleopatra",
-    "carlie",
-    "audie",
-    "antonietta",
-    "alise",
-    "verdell",
-    "tomoko",
-    "thao",
-    "talisha",
-    "shemika",
-    "savanna",
-    "santina",
-    "rosia",
-    "raeann",
-    "odilia",
-    "nana",
-    "minna",
-    "magan",
-    "lynelle",
-    "karma",
-    "joeann",
-    "ivana",
-    "inell",
-    "ilana",
-    "hye",
-    "hee",
-    "gudrun",
-    "dreama",
-    "crissy",
-    "chante",
-    "carmelina",
-    "arvilla",
-    "annamae",
-    "alvera",
-    "aleida",
-    "yanira",
-    "vanda",
-    "tianna",
-    "tam",
-    "stefania",
-    "shira",
-    "nicol",
-    "nancie",
-    "monserrate",
-    "melynda",
-    "melany",
-    "lovella",
-    "laure",
-    "kacy",
-    "jacquelynn",
-    "hyon",
-    "gertha",
-    "eliana",
-    "christena",
-    "christeen",
-    "charise",
-    "caterina",
-    "carley",
-    "candyce",
-    "arlena",
-    "ammie",
-    "willette",
-    "vanita",
-    "tuyet",
-    "syreeta",
-    "penney",
-    "nyla",
-    "maryam",
-    "marya",
-    "magen",
-    "ludie",
-    "loma",
-    "livia",
-    "lanell",
-    "kimberlie",
-    "julee",
-    "donetta",
-    "diedra",
-    "denisha",
-    "deane",
-    "dawne",
-    "clarine",
-    "cherryl",
-    "bronwyn",
-    "alla",
-    "valery",
-    "tonda",
-    "sueann",
-    "soraya",
-    "shoshana",
-    "shela",
-    "sharleen",
-    "shanelle",
-    "nerissa",
-    "meridith",
-    "mellie",
-    "maye",
-    "maple",
-    "magaret",
-    "lili",
-    "leonila",
-    "leonie",
-    "leeanna",
-    "lavonia",
-    "lavera",
-    "kristel",
-    "kathey",
-    "kathe",
-    "jann",
-    "ilda",
-    "hildred",
-    "hildegarde",
-    "genia",
-    "fumiko",
-    "evelin",
-    "ermelinda",
-    "elly",
-    "dung",
-    "doloris",
-    "dionna",
-    "danae",
-    "berneice",
-    "annice",
-    "alix",
-    "verena",
-    "verdie",
-    "shawnna",
-    "shawana",
-    "shaunna",
-    "rozella",
-    "randee",
-    "ranae",
-    "milagro",
-    "lynell",
-    "luise",
-    "loida",
-    "lisbeth",
-    "karleen",
-    "junita",
-    "jona",
-    "isis",
-    "hyacinth",
-    "hedy",
-    "gwenn",
-    "ethelene",
-    "erline",
-    "donya",
-    "domonique",
-    "delicia",
-    "dannette",
-    "cicely",
-    "branda",
-    "blythe",
-    "bethann",
-    "ashlyn",
-    "annalee",
-    "alline",
-    "yuko",
-    "vella",
-    "trang",
-    "towanda",
-    "tesha",
-    "sherlyn",
-    "narcisa",
-    "miguelina",
-    "meri",
-    "maybell",
-    "marlana",
-    "marguerita",
-    "madlyn",
-    "lory",
-    "loriann",
-    "leonore",
-    "leighann",
-    "laurice",
-    "latesha",
-    "laronda",
-    "katrice",
-    "kasie",
-    "kaley",
-    "jadwiga",
-    "glennie",
-    "gearldine",
-    "francina",
-    "epifania",
-    "dyan",
-    "dorie",
-    "diedre",
-    "denese",
-    "demetrice",
-    "delena",
-    "cristie",
-    "cleora",
-    "catarina",
-    "carisa",
-    "barbera",
-    "almeta",
-    "trula",
-    "tereasa",
-    "solange",
-    "sheilah",
-    "shavonne",
-    "sanora",
-    "rochell",
-    "mathilde",
-    "margareta",
-    "maia",
-    "lynsey",
-    "lawanna",
-    "launa",
-    "kena",
-    "keena",
-    "katia",
-    "glynda",
-    "gaylene",
-    "elvina",
-    "elanor",
-    "danuta",
-    "danika",
-    "cristen",
-    "cordie",
-    "coletta",
-    "clarita",
-    "carmon",
-    "brynn",
-    "azucena",
-    "aundrea",
-    "angele",
-    "verlie",
-    "verlene",
-    "tamesha",
-    "silvana",
-    "sebrina",
-    "samira",
-    "reda",
-    "raylene",
-    "penni",
-    "norah",
-    "noma",
-    "mireille",
-    "melissia",
-    "maryalice",
-    "laraine",
-    "kimbery",
-    "karyl",
-    "karine",
-    "kam",
-    "jolanda",
-    "johana",
-    "jesusa",
-    "jaleesa",
-    "jacquelyne",
-    "iluminada",
-    "hilaria",
-    "hanh",
-    "gennie",
-    "francie",
-    "floretta",
-    "exie",
-    "edda",
-    "drema",
-    "delpha",
-    "bev",
-    "barbar",
-    "assunta",
-    "ardell",
-    "annalisa",
-    "alisia",
-    "yukiko",
-    "yolando",
-    "wonda",
-    "wei",
-    "waltraud",
-    "veta",
-    "temeka",
-    "tameika",
-    "shirleen",
-    "shenita",
-    "piedad",
-    "ozella",
-    "mirtha",
-    "marilu",
-    "kimiko",
-    "juliane",
-    "jenice",
-    "janay",
-    "jacquiline",
-    "hilde",
-    "fae",
-    "elois",
-    "echo",
-    "devorah",
-    "chau",
-    "brinda",
-    "betsey",
-    "arminda",
-    "aracelis",
-    "apryl",
-    "annett",
-    "alishia",
-    "veola",
-    "usha",
-    "toshiko",
-    "theola",
-    "tashia",
-    "talitha",
-    "shery",
-    "renetta",
-    "reiko",
-    "rasheeda",
-    "obdulia",
-    "mika",
-    "melaine",
-    "meggan",
-    "marlen",
-    "marget",
-    "marceline",
-    "mana",
-    "magdalen",
-    "librada",
-    "lezlie",
-    "latashia",
-    "lasandra",
-    "kelle",
-    "isidra",
-    "isa",
-    "inocencia",
-    "gwyn",
-    "francoise",
-    "erminia",
-    "erinn",
-    "dimple",
-    "devora",
-    "criselda",
-    "armanda",
-    "arie",
-    "ariane",
-    "angelena",
-    "aliza",
-    "adriene",
-    "adaline",
-    "xochitl",
-    "twanna",
-    "tomiko",
-    "tamisha",
-    "taisha",
-    "susy",
-    "siu",
-    "rutha",
-    "rhona",
-    "noriko",
-    "natashia",
-    "merrie",
-    "marinda",
-    "mariko",
-    "margert",
-    "loris",
-    "lizzette",
-    "leisha",
-    "kaila",
-    "joannie",
-    "jerrica",
-    "jene",
-    "jannet",
-    "janee",
-    "jacinda",
-    "herta",
-    "elenore",
-    "doretta",
-    "delaine",
-    "daniell",
-    "claudie",
-    "britta",
-    "apolonia",
-    "amberly",
-    "alease",
-    "yuri",
-    "yuk",
-    "wen",
-    "waneta",
-    "ute",
-    "tomi",
-    "sharri",
-    "sandie",
-    "roselle",
-    "reynalda",
-    "raguel",
-    "phylicia",
-    "patria",
-    "olimpia",
-    "odelia",
-    "mitzie",
-    "minda",
-    "mignon",
-    "mica",
-    "mendy",
-    "marivel",
-    "maile",
-    "lynetta",
-    "lavette",
-    "lauryn",
-    "latrisha",
-    "lakiesha",
-    "kiersten",
-    "kary",
-    "josphine",
-    "jolyn",
-    "jetta",
-    "janise",
-    "jacquie",
-    "ivelisse",
-    "glynis",
-    "gianna",
-    "gaynelle",
-    "danyell",
-    "danille",
-    "dacia",
-    "coralee",
-    "cher",
-    "ceola",
-    "arianne",
-    "aleshia",
-    "yung",
-    "williemae",
-    "trinh",
-    "thora",
-    "tai",
-    "svetlana",
-    "sherika",
-    "shemeka",
-    "shaunda",
-    "roseline",
-    "ricki",
-    "melda",
-    "mallie",
-    "lavonna",
-    "latina",
-    "laquanda",
-    "lala",
-    "lachelle",
-    "klara",
-    "kandis",
-    "johna",
-    "jeanmarie",
-    "jaye",
-    "grayce",
-    "gertude",
-    "emerita",
-    "ebonie",
-    "clorinda",
-    "ching",
-    "chery",
-    "carola",
-    "breann",
-    "blossom",
-    "bernardine",
-    "becki",
-    "arletha",
-    "argelia",
-    "ara",
-    "alita",
-    "yulanda",
-    "yon",
-    "yessenia",
-    "tobi",
-    "tasia",
-    "sylvie",
-    "shirl",
-    "shirely",
-    "shella",
-    "shantelle",
-    "sacha",
-    "rebecka",
-    "providencia",
-    "paulene",
-    "misha",
-    "miki",
-    "marline",
-    "marica",
-    "lorita",
-    "latoyia",
-    "lasonya",
-    "kerstin",
-    "kenda",
-    "keitha",
-    "kathrin",
-    "jaymie",
-    "gricelda",
-    "ginette",
-    "eryn",
-    "elina",
-    "elfrieda",
-    "danyel",
-    "cheree",
-    "chanelle",
-    "barrie",
-    "aurore",
-    "annamaria",
-    "alleen",
-    "ailene",
-    "aide",
-    "yasmine",
-    "vashti",
-    "treasa",
-    "tiffaney",
-    "sheryll",
-    "sharie",
-    "shanae",
-    "sau",
-    "raisa",
-    "neda",
-    "mitsuko",
-    "mirella",
-    "milda",
-    "maryanna",
-    "maragret",
-    "mabelle",
-    "luetta",
-    "lorina",
-    "letisha",
-    "latarsha",
-    "lanelle",
-    "lajuana",
-    "krissy",
-    "karly",
-    "karena",
-    "jessika",
-    "jerica",
-    "jeanelle",
-    "jalisa",
-    "jacelyn",
-    "izola",
-    "euna",
-    "etha",
-    "domitila",
-    "dominica",
-    "daina",
-    "creola",
-    "carli",
-    "camie",
-    "brittny",
-    "ashanti",
-    "anisha",
-    "aleen",
-    "adah",
-    "yasuko",
-    "valrie",
-    "tona",
-    "tinisha",
-    "thi",
-    "terisa",
-    "taneka",
-    "simonne",
-    "shalanda",
-    "serita",
-    "ressie",
-    "refugia",
-    "olene",
-    "margherita",
-    "mandie",
-    "maire",
-    "lyndia",
-    "luci",
-    "lorriane",
-    "loreta",
-    "leonia",
-    "lavona",
-    "lashawnda",
-    "lakia",
-    "kyoko",
-    "krystina",
-    "krysten",
-    "kenia",
-    "kelsi",
-    "jeanice",
-    "isobel",
-    "georgiann",
-    "genny",
-    "felicidad",
-    "eilene",
-    "deloise",
-    "conception",
-    "clora",
-    "cherilyn",
-    "calandra",
-    "armandina",
-    "anisa",
-    "ula",
-    "tiera",
-    "theressa",
-    "stephania",
-    "sima",
-    "shyla",
-    "shonta",
-    "shera",
-    "shaquita",
-    "shala",
-    "rossana",
-    "nohemi",
-    "nery",
-    "moriah",
-    "melita",
-    "melida",
-    "melani",
-    "marylynn",
-    "marisha",
-    "mariette",
-    "malorie",
-    "madelene",
-    "ludivina",
-    "loria",
-    "lorette",
-    "loralee",
-    "lianne",
-    "lavenia",
-    "laurinda",
-    "lashon",
-    "kit",
-    "kimi",
-    "keila",
-    "katelynn",
-    "kai",
-    "jone",
-    "joane",
-    "jayna",
-    "janella",
-    "hue",
-    "hertha",
-    "francene",
-    "elinore",
-    "despina",
-    "delsie",
-    "deedra",
-    "clemencia",
-    "carolin",
-    "bulah",
-    "brittanie",
-    "bok",
-    "blondell",
-    "bibi",
-    "beaulah",
-    "beata",
-    "annita",
-    "agripina",
-    "virgen",
-    "valene",
-    "twanda",
-    "tommye",
-    "toi",
-    "tarra",
-    "tari",
-    "tammera",
-    "shakia",
-    "sadye",
-    "ruthanne",
-    "rochel",
-    "rivka",
-    "pura",
-    "nenita",
-    "natisha",
-    "merrilee",
-    "melodee",
-    "marvis",
-    "lucilla",
-    "leena",
-    "laveta",
-    "larita",
-    "lanie",
-    "keren",
-    "ileen",
-    "georgeann",
-    "genna",
-    "frida",
-    "ewa",
-    "eufemia",
-    "emely",
-    "ela",
-    "edyth",
-    "deonna",
-    "deadra",
-    "darlena",
-    "chanell",
-    "cathern",
-    "cassondra",
-    "cassaundra",
-    "bernarda",
-    "berna",
-    "arlinda",
-    "anamaria",
-    "vertie",
-    "valeri",
-    "torri",
-    "tatyana",
-    "stasia",
-    "sherise",
-    "sherill",
-    "sanda",
-    "ruthe",
-    "rosy",
-    "robbi",
-    "ranee",
-    "quyen",
-    "pearly",
-    "palmira",
-    "onita",
-    "nisha",
-    "niesha",
-    "nida",
-    "nam",
-    "merlyn",
-    "mayola",
-    "marylouise",
-    "marth",
-    "margene",
-    "madelaine",
-    "londa",
-    "leontine",
-    "leoma",
-    "leia",
-    "lauralee",
-    "lanora",
-    "lakita",
-    "kiyoko",
-    "keturah",
-    "katelin",
-    "kareen",
-    "jonie",
-    "johnette",
-    "jenee",
-    "jeanett",
-    "izetta",
-    "hiedi",
-    "heike",
-    "hassie",
-    "giuseppina",
-    "georgann",
-    "fidela",
-    "fernande",
-    "elwanda",
-    "ellamae",
-    "eliz",
-    "dusti",
-    "dotty",
-    "cyndy",
-    "coralie",
-    "celesta",
-    "argentina",
-    "alverta",
-    "xenia",
-    "wava",
-    "vanetta",
-    "torrie",
-    "tashina",
-    "tandy",
-    "tambra",
-    "tama",
-    "stepanie",
-    "shila",
-    "shaunta",
-    "sharan",
-    "shaniqua",
-    "shae",
-    "setsuko",
-    "serafina",
-    "sandee",
-    "rosamaria",
-    "priscila",
-    "olinda",
-    "nadene",
-    "muoi",
-    "michelina",
-    "mercedez",
-    "maryrose",
-    "marcene",
-    "mao",
-    "magali",
-    "mafalda",
-    "lannie",
-    "kayce",
-    "karoline",
-    "kamilah",
-    "kamala",
-    "justa",
-    "joline",
-    "jennine",
-    "jacquetta",
-    "iraida",
-    "georgeanna",
-    "franchesca",
-    "emeline",
-    "elane",
-    "ehtel",
-    "earlie",
-    "dulcie",
-    "dalene",
-    "classie",
-    "chere",
-    "charis",
-    "caroyln",
-    "carmina",
-    "carita",
-    "bethanie",
-    "ayako",
-    "arica",
-    "alysa",
-    "alessandra",
-    "akilah",
-    "adrien",
-    "zetta",
-    "youlanda",
-    "yelena",
-    "yahaira",
-    "wendolyn",
-    "tijuana",
-    "terina",
-    "teresia",
-    "suzi",
-    "sherell",
-    "shavonda",
-    "shaunte",
-    "sharda",
-    "shakita",
-    "sena",
-    "ryann",
-    "rubi",
-    "riva",
-    "reginia",
-    "rachal",
-    "parthenia",
-    "pamula",
-    "monnie",
-    "monet",
-    "michaele",
-    "melia",
-    "malka",
-    "maisha",
-    "lisandra",
-    "lekisha",
-    "lean",
-    "lakendra",
-    "krystin",
-    "kortney",
-    "kizzie",
-    "kittie",
-    "kera",
-    "kendal",
-    "kemberly",
-    "kanisha",
-    "julene",
-    "jule",
-    "johanne",
-    "jamee",
-    "halley",
-    "gidget",
-    "galina",
-    "fredricka",
-    "fleta",
-    "fatimah",
-    "eusebia",
-    "elza",
-    "eleonore",
-    "dorthey",
-    "doria",
-    "donella",
-    "dinorah",
-    "delorse",
-    "claretha",
-    "christinia",
-    "charlyn",
-    "bong",
-    "belkis",
-    "azzie",
-    "andera",
-    "aiko",
-    "adena",
-    "yer",
-    "yajaira",
-    "wan",
-    "vania",
-    "ulrike",
-    "toshia",
-    "tifany",
-    "stefany",
-    "shizue",
-    "shenika",
-    "shawanna",
-    "sharolyn",
-    "sharilyn",
-    "shaquana",
-    "shantay",
-    "rozanne",
-    "roselee",
-    "remona",
-    "reanna",
-    "raelene",
-    "phung",
-    "petronila",
-    "natacha",
-    "nancey",
-    "myrl",
-    "miyoko",
-    "miesha",
-    "merideth",
-    "marvella",
-    "marquitta",
-    "marhta",
-    "marchelle",
-    "lizeth",
-    "libbie",
-    "lahoma",
-    "ladawn",
-    "kina",
-    "katheleen",
-    "katharyn",
-    "karisa",
-    "kaleigh",
-    "junie",
-    "julieann",
-    "johnsie",
-    "janean",
-    "jaimee",
-    "jackqueline",
-    "hisako",
-    "herma",
-    "helaine",
-    "gwyneth",
-    "gita",
-    "eustolia",
-    "emelina",
-    "elin",
-    "edris",
-    "donnette",
-    "donnetta",
-    "dierdre",
-    "denae",
-    "darcel",
-    "clarisa",
-    "cinderella",
-    "chia",
-    "charlesetta",
-    "charita",
-    "celsa",
-    "cassy",
-    "cassi",
-    "carlee",
-    "bruna",
-    "brittaney",
-    "brande",
-    "billi",
-    "bao",
-    "antonetta",
-    "angla",
-    "angelyn",
-    "analisa",
-    "alane",
-    "wenona",
-    "wendie",
-    "veronique",
-    "vannesa",
-    "tobie",
-    "tempie",
-    "sumiko",
-    "sulema",
-    "sparkle",
-    "somer",
-    "sheba",
-    "sharice",
-    "shanel",
-    "shalon",
-    "rosio",
-    "roselia",
-    "renay",
-    "rema",
-    "reena",
-    "ozie",
-    "oretha",
-    "oralee",
-    "oda",
-    "ngan",
-    "nakesha",
-    "milly",
-    "marybelle",
-    "margrett",
-    "maragaret",
-    "manie",
-    "lurlene",
-    "lillia",
-    "lieselotte",
-    "lavelle",
-    "lashaunda",
-    "lakeesha",
-    "kaycee",
-    "kalyn",
-    "joya",
-    "joette",
-    "jenae",
-    "janiece",
-    "illa",
-    "grisel",
-    "glayds",
-    "genevie",
-    "gala",
-    "fredda",
-    "eleonor",
-    "debera",
-    "deandrea",
-    "corrinne",
-    "cordia",
-    "contessa",
-    "colene",
-    "cleotilde",
-    "chantay",
-    "cecille",
-    "beatris",
-    "azalee",
-    "arlean",
-    "ardath",
-    "anjelica",
-    "anja",
-    "alfredia",
-    "aleisha",
-    "zada",
-    "yuonne",
-    "willodean",
-    "vennie",
-    "vanna",
-    "tyisha",
-    "tova",
-    "torie",
-    "tonisha",
-    "tilda",
-    "tien",
-    "sirena",
-    "sherril",
-    "shanti",
-    "senaida",
-    "samella",
-    "robbyn",
-    "renda",
-    "reita",
-    "phebe",
-    "paulita",
-    "nobuko",
-    "nguyet",
-    "neomi",
-    "mikaela",
-    "melania",
-    "maximina",
-    "marg",
-    "maisie",
-    "lynna",
-    "lilli",
-    "lashaun",
-    "lakenya",
-    "lael",
-    "kirstie",
-    "kathline",
-    "kasha",
-    "karlyn",
-    "karima",
-    "jovan",
-    "josefine",
-    "jennell",
-    "jacqui",
-    "jackelyn",
-    "hyo",
-    "hien",
-    "grazyna",
-    "florrie",
-    "floria",
-    "eleonora",
-    "dwana",
-    "dorla",
-    "delmy",
-    "deja",
-    "dede",
-    "dann",
-    "crysta",
-    "clelia",
-    "claris",
-    "chieko",
-    "cherlyn",
-    "cherelle",
-    "charmain",
-    "chara",
-    "cammy",
-    "bee",
-    "arnette",
-    "ardelle",
-    "annika",
-    "amiee",
-    "amee",
-    "allena",
-    "yvone",
-    "yuki",
-    "yoshie",
-    "yevette",
-    "yael",
-    "willetta",
-    "voncile",
-    "venetta",
-    "tula",
-    "tonette",
-    "timika",
-    "temika",
-    "telma",
-    "teisha",
-    "taren",
-    "stacee",
-    "shawnta",
-    "saturnina",
-    "ricarda",
-    "pok",
-    "pasty",
-    "onie",
-    "nubia",
-    "marielle",
-    "mariella",
-    "marianela",
-    "mardell",
-    "luanna",
-    "loise",
-    "lisabeth",
-    "lindsy",
-    "lilliana",
-    "lilliam",
-    "lelah",
-    "leigha",
-    "leanora",
-    "kristeen",
-    "khalilah",
-    "keeley",
-    "kandra",
-    "junko",
-    "joaquina",
-    "jerlene",
-    "jani",
-    "jamika",
-    "hsiu",
-    "hermila",
-    "genevive",
-    "evia",
-    "eugena",
-    "emmaline",
-    "elfreda",
-    "elene",
-    "donette",
-    "delcie",
-    "deeanna",
-    "darcey",
-    "cuc",
-    "clarinda",
-    "cira",
-    "chae",
-    "celinda",
-    "catheryn",
-    "casimira",
-    "carmelia",
-    "camellia",
-    "breana",
-    "bobette",
-    "bernardina",
-    "bebe",
-    "basilia",
-    "arlyne",
-    "amal",
-    "alayna",
-    "zonia",
-    "zenia",
-    "yuriko",
-    "yaeko",
-    "wynell",
-    "willena",
-    "vernia",
-    "tora",
-    "terrilyn",
-    "terica",
-    "tenesha",
-    "tawna",
-    "tajuana",
-    "taina",
-    "stephnie",
-    "sona",
-    "sina",
-    "shondra",
-    "shizuko",
-    "sherlene",
-    "sherice",
-    "sharika",
-    "rossie",
-    "rosena",
-    "rima",
-    "ria",
-    "rheba",
-    "renna",
-    "natalya",
-    "nancee",
-    "melodi",
-    "meda",
-    "matha",
-    "marketta",
-    "maricruz",
-    "marcelene",
-    "malvina",
-    "luba",
-    "louetta",
-    "leida",
-    "lecia",
-    "lauran",
-    "lashawna",
-    "laine",
-    "khadijah",
-    "katerine",
-    "kasi",
-    "kallie",
-    "julietta",
-    "jesusita",
-    "jestine",
-    "jessia",
-    "jeffie",
-    "janyce",
-    "isadora",
-    "georgianne",
-    "fidelia",
-    "evita",
-    "eura",
-    "eulah",
-    "estefana",
-    "elsy",
-    "eladia",
-    "dodie",
-    "dia",
-    "denisse",
-    "deloras",
-    "delila",
-    "daysi",
-    "crystle",
-    "concha",
-    "claretta",
-    "charlsie",
-    "charlena",
-    "carylon",
-    "bettyann",
-    "asley",
-    "ashlea",
-    "amira",
-    "agueda",
-    "agnus",
-    "yuette",
-    "vinita",
-    "victorina",
-    "tynisha",
-    "treena",
-    "toccara",
-    "tish",
-    "thomasena",
-    "tegan",
-    "soila",
-    "shenna",
-    "sharmaine",
-    "shantae",
-    "shandi",
-    "september",
-    "saran",
-    "sarai",
-    "sana",
-    "rosette",
-    "rolande",
-    "regine",
-    "otelia",
-    "olevia",
-    "nicholle",
-    "necole",
-    "naida",
-    "myrta",
-    "myesha",
-    "mitsue",
-    "minta",
-    "mertie",
-    "margy",
-    "mahalia",
-    "madalene",
-    "loura",
-    "lorean",
-    "lesha",
-    "leonida",
-    "lenita",
-    "lavone",
-    "lashell",
-    "lashandra",
-    "lamonica",
-    "kimbra",
-    "katherina",
-    "karry",
-    "kanesha",
-    "jong",
-    "jeneva",
-    "jaquelyn",
-    "hwa",
-    "gilma",
-    "ghislaine",
-    "gertrudis",
-    "fransisca",
-    "fermina",
-    "ettie",
-    "etsuko",
-    "ellan",
-    "elidia",
-    "edra",
-    "dorethea",
-    "doreatha",
-    "denyse",
-    "deetta",
-    "daine",
-    "cyrstal",
-    "corrin",
-    "cayla",
-    "carlita",
-    "camila",
-    "burma",
-    "bula",
-    "buena",
-    "barabara",
-    "avril",
-    "alaine",
-    "zana",
-    "wilhemina",
-    "wanetta",
-    "veronika",
-    "verline",
-    "vasiliki",
-    "tonita",
-    "tisa",
-    "teofila",
-    "tayna",
-    "taunya",
-    "tandra",
-    "takako",
-    "sunni",
-    "suanne",
-    "sixta",
-    "sharell",
-    "seema",
-    "rosenda",
-    "robena",
-    "raymonde",
-    "pei",
-    "pamila",
-    "ozell",
-    "neida",
-    "mistie",
-    "micha",
-    "merissa",
-    "maurita",
-    "maryln",
-    "maryetta",
-    "marcell",
-    "malena",
-    "makeda",
-    "lovetta",
-    "lourie",
-    "lorrine",
-    "lorilee",
-    "laurena",
-    "lashay",
-    "larraine",
-    "laree",
-    "lacresha",
-    "kristle",
-    "krishna",
-    "keva",
-    "keira",
-    "karole",
-    "joie",
-    "jinny",
-    "jeannetta",
-    "jama",
-    "heidy",
-    "gilberte",
-    "gema",
-    "faviola",
-    "evelynn",
-    "enda",
-    "elli",
-    "ellena",
-    "divina",
-    "dagny",
-    "collene",
-    "codi",
-    "cindie",
-    "chassidy",
-    "chasidy",
-    "catrice",
-    "catherina",
-    "cassey",
-    "caroll",
-    "carlena",
-    "candra",
-    "calista",
-    "bryanna",
-    "britteny",
-    "beula",
-    "bari",
-    "audrie",
-    "audria",
-    "ardelia",
-    "annelle",
-    "angila",
-    "alona",
-    "allyn"
-  ]
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Keypad.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Keypad.json
deleted file mode 100644
index 376b850099..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Keypad.json
+++ /dev/null
@@ -1,154 +0,0 @@
-{
-  "Graph": {
-    "0": [
-      null,
-      "1",
-      "2",
-      "3",
-      ".",
-      null,
-      null,
-      null
-    ],
-    "1": [
-      null,
-      null,
-      "4",
-      "5",
-      "2",
-      "0",
-      null,
-      null
-    ],
-    "2": [
-      "1",
-      "4",
-      "5",
-      "6",
-      "3",
-      ".",
-      "0",
-      null
-    ],
-    "3": [
-      "2",
-      "5",
-      "6",
-      null,
-      null,
-      null,
-      ".",
-      "0"
-    ],
-    "4": [
-      null,
-      null,
-      "7",
-      "8",
-      "5",
-      "2",
-      "1",
-      null
-    ],
-    "5": [
-      "4",
-      "7",
-      "8",
-      "9",
-      "6",
-      "3",
-      "2",
-      "1"
-    ],
-    "6": [
-      "5",
-      "8",
-      "9",
-      "+",
-      null,
-      null,
-      "3",
-      "2"
-    ],
-    "7": [
-      null,
-      null,
-      null,
-      "/",
-      "8",
-      "5",
-      "4",
-      null
-    ],
-    "8": [
-      "7",
-      null,
-      "/",
-      "*",
-      "9",
-      "6",
-      "5",
-      "4"
-    ],
-    "9": [
-      "8",
-      "/",
-      "*",
-      "-",
-      "+",
-      null,
-      "6",
-      "5"
-    ],
-    "*": [
-      "/",
-      null,
-      null,
-      null,
-      "-",
-      "+",
-      "9",
-      "8"
-    ],
-    "+": [
-      "9",
-      "*",
-      "-",
-      null,
-      null,
-      null,
-      null,
-      "6"
-    ],
-    "-": [
-      "*",
-      null,
-      null,
-      null,
-      null,
-      null,
-      "+",
-      "9"
-    ],
-    ".": [
-      "0",
-      "2",
-      "3",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "/": [
-      null,
-      null,
-      null,
-      null,
-      "*",
-      "9",
-      "8",
-      "7"
-    ]
-  }
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/L33t.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/L33t.json
deleted file mode 100644
index 73967bf53a..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/L33t.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "graph": {
-    "a": [
-      "4",
-      "@"
-    ],
-    "b": [
-      "8"
-    ],
-    "c": [
-      "(",
-      "{",
-      "[",
-      "<"
-    ],
-    "e": [
-      "3"
-    ],
-    "g": [
-      "6",
-      "9"
-    ],
-    "i": [
-      "1",
-      "!",
-      "|"
-    ],
-    "l": [
-      "1",
-      "|",
-      "7"
-    ],
-    "o": [
-      "0"
-    ],
-    "s": [
-      "$",
-      "5"
-    ],
-    "t": [
-      "+",
-      "7"
-    ],
-    "x": [
-      "%"
-    ],
-    "z": [
-      "2"
-    ]
-  }
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MacKeypad.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MacKeypad.json
deleted file mode 100644
index 11c6d38bba..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MacKeypad.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-  "Graph": {
-    "0": [
-      null,
-      "1",
-      "2",
-      "3",
-      ".",
-      null,
-      null,
-      null
-    ],
-    "1": [
-      null,
-      null,
-      "4",
-      "5",
-      "2",
-      "0",
-      null,
-      null
-    ],
-    "2": [
-      "1",
-      "4",
-      "5",
-      "6",
-      "3",
-      ".",
-      "0",
-      null
-    ],
-    "3": [
-      "2",
-      "5",
-      "6",
-      "+",
-      null,
-      null,
-      ".",
-      "0"
-    ],
-    "4": [
-      null,
-      null,
-      "7",
-      "8",
-      "5",
-      "2",
-      "1",
-      null
-    ],
-    "5": [
-      "4",
-      "7",
-      "8",
-      "9",
-      "6",
-      "3",
-      "2",
-      "1"
-    ],
-    "6": [
-      "5",
-      "8",
-      "9",
-      "-",
-      "+",
-      null,
-      "3",
-      "2"
-    ],
-    "7": [
-      null,
-      null,
-      null,
-      "=",
-      "8",
-      "5",
-      "4",
-      null
-    ],
-    "8": [
-      "7",
-      null,
-      "=",
-      "/",
-      "9",
-      "6",
-      "5",
-      "4"
-    ],
-    "9": [
-      "8",
-      "=",
-      "/",
-      "*",
-      "-",
-      "+",
-      "6",
-      "5"
-    ],
-    "*": [
-      "/",
-      null,
-      null,
-      null,
-      null,
-      null,
-      "-",
-      "9"
-    ],
-    "+": [
-      "6",
-      "9",
-      "-",
-      null,
-      null,
-      null,
-      null,
-      "3"
-    ],
-    "-": [
-      "9",
-      "/",
-      "*",
-      null,
-      null,
-      null,
-      "+",
-      "6"
-    ],
-    ".": [
-      "0",
-      "2",
-      "3",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "/": [
-      "=",
-      null,
-      null,
-      null,
-      "*",
-      "-",
-      "9",
-      "8"
-    ],
-    "=": [
-      null,
-      null,
-      null,
-      null,
-      "/",
-      "9",
-      "8",
-      "7"
-    ]
-  }
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MaleNames.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MaleNames.json
deleted file mode 100644
index cb6927405c..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/MaleNames.json
+++ /dev/null
@@ -1,1006 +0,0 @@
-{"List":[
-  "james",
-  "john",
-  "robert",
-  "michael",
-  "william",
-  "david",
-  "richard",
-  "charles",
-  "joseph",
-  "thomas",
-  "christopher",
-  "daniel",
-  "paul",
-  "mark",
-  "donald",
-  "george",
-  "kenneth",
-  "steven",
-  "edward",
-  "brian",
-  "ronald",
-  "anthony",
-  "kevin",
-  "jason",
-  "matthew",
-  "gary",
-  "timothy",
-  "jose",
-  "larry",
-  "jeffrey",
-  "frank",
-  "scott",
-  "eric",
-  "stephen",
-  "andrew",
-  "raymond",
-  "gregory",
-  "joshua",
-  "jerry",
-  "dennis",
-  "walter",
-  "patrick",
-  "peter",
-  "harold",
-  "douglas",
-  "henry",
-  "carl",
-  "arthur",
-  "ryan",
-  "roger",
-  "joe",
-  "juan",
-  "jack",
-  "albert",
-  "jonathan",
-  "justin",
-  "terry",
-  "gerald",
-  "keith",
-  "samuel",
-  "willie",
-  "ralph",
-  "lawrence",
-  "nicholas",
-  "roy",
-  "benjamin",
-  "bruce",
-  "brandon",
-  "adam",
-  "harry",
-  "fred",
-  "wayne",
-  "billy",
-  "steve",
-  "louis",
-  "jeremy",
-  "aaron",
-  "randy",
-  "eugene",
-  "carlos",
-  "russell",
-  "bobby",
-  "victor",
-  "ernest",
-  "phillip",
-  "todd",
-  "jesse",
-  "craig",
-  "alan",
-  "shawn",
-  "clarence",
-  "sean",
-  "philip",
-  "chris",
-  "johnny",
-  "earl",
-  "jimmy",
-  "antonio",
-  "danny",
-  "bryan",
-  "tony",
-  "luis",
-  "mike",
-  "stanley",
-  "leonard",
-  "nathan",
-  "dale",
-  "manuel",
-  "rodney",
-  "curtis",
-  "norman",
-  "marvin",
-  "vincent",
-  "glenn",
-  "jeffery",
-  "travis",
-  "jeff",
-  "chad",
-  "jacob",
-  "melvin",
-  "alfred",
-  "kyle",
-  "francis",
-  "bradley",
-  "jesus",
-  "herbert",
-  "frederick",
-  "ray",
-  "joel",
-  "edwin",
-  "don",
-  "eddie",
-  "ricky",
-  "troy",
-  "randall",
-  "barry",
-  "bernard",
-  "mario",
-  "leroy",
-  "francisco",
-  "marcus",
-  "micheal",
-  "theodore",
-  "clifford",
-  "miguel",
-  "oscar",
-  "jay",
-  "jim",
-  "tom",
-  "calvin",
-  "alex",
-  "jon",
-  "ronnie",
-  "bill",
-  "lloyd",
-  "tommy",
-  "leon",
-  "derek",
-  "darrell",
-  "jerome",
-  "floyd",
-  "leo",
-  "alvin",
-  "tim",
-  "wesley",
-  "dean",
-  "greg",
-  "jorge",
-  "dustin",
-  "pedro",
-  "derrick",
-  "dan",
-  "zachary",
-  "corey",
-  "herman",
-  "maurice",
-  "vernon",
-  "roberto",
-  "clyde",
-  "glen",
-  "hector",
-  "shane",
-  "ricardo",
-  "sam",
-  "rick",
-  "lester",
-  "brent",
-  "ramon",
-  "tyler",
-  "gilbert",
-  "gene",
-  "marc",
-  "reginald",
-  "ruben",
-  "brett",
-  "angel",
-  "nathaniel",
-  "rafael",
-  "edgar",
-  "milton",
-  "raul",
-  "ben",
-  "cecil",
-  "duane",
-  "andre",
-  "elmer",
-  "brad",
-  "gabriel",
-  "ron",
-  "roland",
-  "jared",
-  "adrian",
-  "karl",
-  "cory",
-  "claude",
-  "erik",
-  "darryl",
-  "neil",
-  "christian",
-  "javier",
-  "fernando",
-  "clinton",
-  "ted",
-  "mathew",
-  "tyrone",
-  "darren",
-  "lonnie",
-  "lance",
-  "cody",
-  "julio",
-  "kurt",
-  "allan",
-  "clayton",
-  "hugh",
-  "max",
-  "dwayne",
-  "dwight",
-  "armando",
-  "felix",
-  "jimmie",
-  "everett",
-  "ian",
-  "ken",
-  "bob",
-  "jaime",
-  "casey",
-  "alfredo",
-  "alberto",
-  "dave",
-  "ivan",
-  "johnnie",
-  "sidney",
-  "byron",
-  "julian",
-  "isaac",
-  "clifton",
-  "willard",
-  "daryl",
-  "virgil",
-  "andy",
-  "salvador",
-  "kirk",
-  "sergio",
-  "seth",
-  "kent",
-  "terrance",
-  "rene",
-  "eduardo",
-  "terrence",
-  "enrique",
-  "freddie",
-  "stuart",
-  "fredrick",
-  "arturo",
-  "alejandro",
-  "joey",
-  "nick",
-  "luther",
-  "wendell",
-  "jeremiah",
-  "evan",
-  "julius",
-  "donnie",
-  "otis",
-  "trevor",
-  "luke",
-  "homer",
-  "gerard",
-  "doug",
-  "kenny",
-  "hubert",
-  "angelo",
-  "shaun",
-  "lyle",
-  "matt",
-  "alfonso",
-  "orlando",
-  "rex",
-  "carlton",
-  "ernesto",
-  "pablo",
-  "lorenzo",
-  "omar",
-  "wilbur",
-  "blake",
-  "horace",
-  "roderick",
-  "kerry",
-  "abraham",
-  "rickey",
-  "ira",
-  "andres",
-  "cesar",
-  "johnathan",
-  "malcolm",
-  "rudolph",
-  "damon",
-  "kelvin",
-  "rudy",
-  "preston",
-  "alton",
-  "archie",
-  "marco",
-  "wm",
-  "pete",
-  "randolph",
-  "garry",
-  "geoffrey",
-  "jonathon",
-  "felipe",
-  "bennie",
-  "gerardo",
-  "ed",
-  "dominic",
-  "loren",
-  "delbert",
-  "colin",
-  "guillermo",
-  "earnest",
-  "benny",
-  "noel",
-  "rodolfo",
-  "myron",
-  "edmund",
-  "salvatore",
-  "cedric",
-  "lowell",
-  "gregg",
-  "sherman",
-  "devin",
-  "sylvester",
-  "roosevelt",
-  "israel",
-  "jermaine",
-  "forrest",
-  "wilbert",
-  "leland",
-  "simon",
-  "irving",
-  "owen",
-  "rufus",
-  "woodrow",
-  "kristopher",
-  "levi",
-  "marcos",
-  "gustavo",
-  "lionel",
-  "marty",
-  "gilberto",
-  "clint",
-  "nicolas",
-  "laurence",
-  "ismael",
-  "orville",
-  "drew",
-  "ervin",
-  "dewey",
-  "al",
-  "wilfred",
-  "josh",
-  "hugo",
-  "ignacio",
-  "caleb",
-  "tomas",
-  "sheldon",
-  "erick",
-  "frankie",
-  "darrel",
-  "rogelio",
-  "terence",
-  "alonzo",
-  "elias",
-  "bert",
-  "elbert",
-  "ramiro",
-  "conrad",
-  "noah",
-  "grady",
-  "phil",
-  "cornelius",
-  "lamar",
-  "rolando",
-  "clay",
-  "percy",
-  "dexter",
-  "bradford",
-  "merle",
-  "darin",
-  "amos",
-  "terrell",
-  "moses",
-  "irvin",
-  "saul",
-  "roman",
-  "darnell",
-  "randal",
-  "tommie",
-  "timmy",
-  "darrin",
-  "brendan",
-  "toby",
-  "van",
-  "abel",
-  "dominick",
-  "emilio",
-  "elijah",
-  "cary",
-  "domingo",
-  "aubrey",
-  "emmett",
-  "marlon",
-  "emanuel",
-  "jerald",
-  "edmond",
-  "emil",
-  "dewayne",
-  "otto",
-  "teddy",
-  "reynaldo",
-  "bret",
-  "jess",
-  "trent",
-  "humberto",
-  "emmanuel",
-  "stephan",
-  "louie",
-  "vicente",
-  "lamont",
-  "garland",
-  "micah",
-  "efrain",
-  "heath",
-  "rodger",
-  "demetrius",
-  "ethan",
-  "eldon",
-  "rocky",
-  "pierre",
-  "eli",
-  "bryce",
-  "antoine",
-  "robbie",
-  "kendall",
-  "royce",
-  "sterling",
-  "grover",
-  "elton",
-  "cleveland",
-  "dylan",
-  "chuck",
-  "damian",
-  "reuben",
-  "stan",
-  "leonardo",
-  "russel",
-  "erwin",
-  "benito",
-  "hans",
-  "monte",
-  "blaine",
-  "ernie",
-  "curt",
-  "quentin",
-  "agustin",
-  "jamal",
-  "devon",
-  "adolfo",
-  "tyson",
-  "wilfredo",
-  "bart",
-  "jarrod",
-  "vance",
-  "denis",
-  "damien",
-  "joaquin",
-  "harlan",
-  "desmond",
-  "elliot",
-  "darwin",
-  "gregorio",
-  "kermit",
-  "roscoe",
-  "esteban",
-  "anton",
-  "solomon",
-  "norbert",
-  "elvin",
-  "nolan",
-  "carey",
-  "rod",
-  "quinton",
-  "hal",
-  "brain",
-  "rob",
-  "elwood",
-  "kendrick",
-  "darius",
-  "moises",
-  "marlin",
-  "fidel",
-  "thaddeus",
-  "cliff",
-  "marcel",
-  "ali",
-  "raphael",
-  "bryon",
-  "armand",
-  "alvaro",
-  "jeffry",
-  "dane",
-  "joesph",
-  "thurman",
-  "ned",
-  "sammie",
-  "rusty",
-  "michel",
-  "monty",
-  "rory",
-  "fabian",
-  "reggie",
-  "kris",
-  "isaiah",
-  "gus",
-  "avery",
-  "loyd",
-  "diego",
-  "adolph",
-  "millard",
-  "rocco",
-  "gonzalo",
-  "derick",
-  "rodrigo",
-  "gerry",
-  "rigoberto",
-  "alphonso",
-  "ty",
-  "rickie",
-  "noe",
-  "vern",
-  "elvis",
-  "bernardo",
-  "mauricio",
-  "hiram",
-  "donovan",
-  "basil",
-  "nickolas",
-  "scot",
-  "vince",
-  "quincy",
-  "eddy",
-  "sebastian",
-  "federico",
-  "ulysses",
-  "heriberto",
-  "donnell",
-  "denny",
-  "gavin",
-  "emery",
-  "romeo",
-  "jayson",
-  "dion",
-  "dante",
-  "clement",
-  "coy",
-  "odell",
-  "jarvis",
-  "bruno",
-  "issac",
-  "dudley",
-  "sanford",
-  "colby",
-  "carmelo",
-  "nestor",
-  "hollis",
-  "stefan",
-  "donny",
-  "art",
-  "linwood",
-  "beau",
-  "weldon",
-  "galen",
-  "isidro",
-  "truman",
-  "delmar",
-  "johnathon",
-  "silas",
-  "frederic",
-  "irwin",
-  "merrill",
-  "charley",
-  "marcelino",
-  "carlo",
-  "trenton",
-  "kurtis",
-  "aurelio",
-  "winfred",
-  "vito",
-  "collin",
-  "denver",
-  "leonel",
-  "emory",
-  "pasquale",
-  "mohammad",
-  "mariano",
-  "danial",
-  "landon",
-  "dirk",
-  "branden",
-  "adan",
-  "numbers",
-  "clair",
-  "buford",
-  "german",
-  "bernie",
-  "wilmer",
-  "emerson",
-  "zachery",
-  "jacques",
-  "errol",
-  "josue",
-  "edwardo",
-  "wilford",
-  "theron",
-  "raymundo",
-  "daren",
-  "tristan",
-  "robby",
-  "lincoln",
-  "jame",
-  "genaro",
-  "octavio",
-  "cornell",
-  "hung",
-  "arron",
-  "antony",
-  "herschel",
-  "alva",
-  "giovanni",
-  "garth",
-  "cyrus",
-  "cyril",
-  "ronny",
-  "stevie",
-  "lon",
-  "kennith",
-  "carmine",
-  "augustine",
-  "erich",
-  "chadwick",
-  "wilburn",
-  "russ",
-  "myles",
-  "jonas",
-  "mitchel",
-  "mervin",
-  "zane",
-  "jamel",
-  "lazaro",
-  "alphonse",
-  "randell",
-  "major",
-  "johnie",
-  "jarrett",
-  "ariel",
-  "abdul",
-  "dusty",
-  "luciano",
-  "seymour",
-  "scottie",
-  "eugenio",
-  "mohammed",
-  "valentin",
-  "arnulfo",
-  "lucien",
-  "ferdinand",
-  "thad",
-  "ezra",
-  "aldo",
-  "rubin",
-  "royal",
-  "mitch",
-  "earle",
-  "abe",
-  "marquis",
-  "lanny",
-  "kareem",
-  "jamar",
-  "boris",
-  "isiah",
-  "emile",
-  "elmo",
-  "aron",
-  "leopoldo",
-  "everette",
-  "josef",
-  "eloy",
-  "dorian",
-  "rodrick",
-  "reinaldo",
-  "lucio",
-  "jerrod",
-  "weston",
-  "hershel",
-  "lemuel",
-  "lavern",
-  "burt",
-  "jules",
-  "gil",
-  "eliseo",
-  "ahmad",
-  "nigel",
-  "efren",
-  "antwan",
-  "alden",
-  "margarito",
-  "refugio",
-  "dino",
-  "osvaldo",
-  "les",
-  "deandre",
-  "normand",
-  "kieth",
-  "ivory",
-  "trey",
-  "norberto",
-  "napoleon",
-  "jerold",
-  "fritz",
-  "rosendo",
-  "milford",
-  "sang",
-  "deon",
-  "christoper",
-  "alfonzo",
-  "lyman",
-  "josiah",
-  "brant",
-  "wilton",
-  "rico",
-  "jamaal",
-  "dewitt",
-  "brenton",
-  "yong",
-  "olin",
-  "faustino",
-  "claudio",
-  "judson",
-  "gino",
-  "edgardo",
-  "alec",
-  "jarred",
-  "donn",
-  "trinidad",
-  "tad",
-  "porfirio",
-  "odis",
-  "lenard",
-  "chauncey",
-  "tod",
-  "mel",
-  "marcelo",
-  "kory",
-  "augustus",
-  "keven",
-  "hilario",
-  "bud",
-  "sal",
-  "orval",
-  "mauro",
-  "dannie",
-  "zachariah",
-  "olen",
-  "anibal",
-  "milo",
-  "jed",
-  "thanh",
-  "amado",
-  "lenny",
-  "tory",
-  "richie",
-  "horacio",
-  "brice",
-  "mohamed",
-  "delmer",
-  "dario",
-  "mac",
-  "jonah",
-  "jerrold",
-  "robt",
-  "hank",
-  "sung",
-  "rupert",
-  "rolland",
-  "kenton",
-  "damion",
-  "chi",
-  "antone",
-  "waldo",
-  "fredric",
-  "bradly",
-  "kip",
-  "burl",
-  "tyree",
-  "jefferey",
-  "ahmed",
-  "willy",
-  "stanford",
-  "oren",
-  "moshe",
-  "mikel",
-  "enoch",
-  "brendon",
-  "quintin",
-  "jamison",
-  "florencio",
-  "darrick",
-  "tobias",
-  "minh",
-  "hassan",
-  "giuseppe",
-  "demarcus",
-  "cletus",
-  "tyrell",
-  "lyndon",
-  "keenan",
-  "werner",
-  "theo",
-  "geraldo",
-  "columbus",
-  "chet",
-  "bertram",
-  "markus",
-  "huey",
-  "hilton",
-  "dwain",
-  "donte",
-  "tyron",
-  "omer",
-  "isaias",
-  "hipolito",
-  "fermin",
-  "chung",
-  "adalberto",
-  "jamey",
-  "teodoro",
-  "mckinley",
-  "maximo",
-  "sol",
-  "raleigh",
-  "lawerence",
-  "abram",
-  "rashad",
-  "emmitt",
-  "daron",
-  "chong",
-  "samual",
-  "otha",
-  "miquel",
-  "eusebio",
-  "dong",
-  "domenic",
-  "darron",
-  "wilber",
-  "renato",
-  "hoyt",
-  "haywood",
-  "ezekiel",
-  "chas",
-  "florentino",
-  "elroy",
-  "clemente",
-  "arden",
-  "neville",
-  "edison",
-  "deshawn",
-  "carrol",
-  "shayne",
-  "nathanial",
-  "jordon",
-  "danilo",
-  "claud",
-  "val",
-  "sherwood",
-  "raymon",
-  "rayford",
-  "cristobal",
-  "ambrose",
-  "titus",
-  "hyman",
-  "felton",
-  "ezequiel",
-  "erasmo",
-  "lonny",
-  "len",
-  "ike",
-  "milan",
-  "lino",
-  "jarod",
-  "herb",
-  "andreas",
-  "rhett",
-  "jude",
-  "douglass",
-  "cordell",
-  "oswaldo",
-  "ellsworth",
-  "virgilio",
-  "toney",
-  "nathanael",
-  "del",
-  "benedict",
-  "mose",
-  "hong",
-  "isreal",
-  "garret",
-  "fausto",
-  "asa",
-  "arlen",
-  "zack",
-  "modesto",
-  "francesco",
-  "manual",
-  "jae",
-  "gaylord",
-  "gaston",
-  "filiberto",
-  "deangelo",
-  "michale",
-  "granville",
-  "wes",
-  "malik",
-  "zackary",
-  "tuan",
-  "nicky",
-  "cristopher",
-  "antione",
-  "malcom",
-  "korey",
-  "jospeh",
-  "colton",
-  "waylon",
-  "von",
-  "hosea",
-  "shad",
-  "santo",
-  "rudolf",
-  "rolf",
-  "rey",
-  "renaldo",
-  "marcellus",
-  "lucius",
-  "kristofer",
-  "harland",
-  "arnoldo",
-  "rueben",
-  "leandro",
-  "kraig",
-  "jerrell",
-  "jeromy",
-  "hobert",
-  "cedrick",
-  "arlie",
-  "winford",
-  "wally",
-  "luigi",
-  "keneth",
-  "jacinto",
-  "graig",
-  "franklyn",
-  "edmundo",
-  "sid",
-  "leif",
-  "jeramy",
-  "willian",
-  "vincenzo",
-  "shon",
-  "michal",
-  "lynwood",
-  "jere",
-  "hai",
-  "elden",
-  "darell",
-  "broderick",
-  "alonso"
-]}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Passwords.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Passwords.json
deleted file mode 100644
index bac7cf2815..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Passwords.json
+++ /dev/null
@@ -1 +0,0 @@
-{"List":["password","123456","12345678","1234","qwerty","12345","dragon","pussy","baseball","football","letmein","monkey","696969","abc123","mustang","shadow","master","111111","2000","jordan","superman","harley","1234567","fuckme","hunter","fuckyou","trustno1","ranger","buster","tigger","soccer","fuck","batman","test","pass","killer","hockey","charlie","love","sunshine","asshole","6969","pepper","access","123456789","654321","maggie","starwars","silver","dallas","yankees","123123","666666","hello","orange","biteme","freedom","computer","sexy","thunder","ginger","hammer","summer","corvette","fucker","austin","1111","merlin","121212","golfer","cheese","princess","chelsea","diamond","yellow","bigdog","secret","asdfgh","sparky","cowboy","camaro","matrix","falcon","iloveyou","guitar","purple","scooter","phoenix","aaaaaa","tigers","porsche","mickey","maverick","cookie","nascar","peanut","131313","money","horny","samantha","panties","steelers","snoopy","boomer","whatever","iceman","smokey","gateway","dakota","cowboys","eagles","chicken","dick","black","zxcvbn","ferrari","knight","hardcore","compaq","coffee","booboo","bitch","bulldog","xxxxxx","welcome","player","ncc1701","wizard","scooby","junior","internet","bigdick","brandy","tennis","blowjob","banana","monster","spider","lakers","rabbit","enter","mercedes","fender","yamaha","diablo","boston","tiger","marine","chicago","rangers","gandalf","winter","bigtits","barney","raiders","porn","badboy","blowme","spanky","bigdaddy","chester","london","midnight","blue","fishing","000000","hannah","slayer","11111111","sexsex","redsox","thx1138","asdf","marlboro","panther","zxcvbnm","arsenal","qazwsx","mother","7777777","jasper","winner","golden","butthead","viking","iwantu","angels","prince","cameron","girls","madison","hooters","startrek","captain","maddog","jasmine","butter","booger","golf","rocket","theman","liverpoo","flower","forever","muffin","turtle","sophie","redskins","toyota","sierra","winston","giants","packers","newyork","casper","bubba","112233","lovers","mountain","united","driver","helpme","fucking","pookie","lucky","maxwell","8675309","bear","suckit","gators","5150","222222","shithead","fuckoff","jaguar","hotdog","tits","gemini","lover","xxxxxxxx","777777","canada","florida","88888888","rosebud","metallic","doctor","trouble","success","stupid","tomcat","warrior","peaches","apples","fish","qwertyui","magic","buddy","dolphins","rainbow","gunner","987654","freddy","alexis","braves","cock","2112","1212","cocacola","xavier","dolphin","testing","bond007","member","voodoo","7777","samson","apollo","fire","tester","beavis","voyager","porno","rush2112","beer","apple","scorpio","skippy","sydney","red123","power","beaver","star","jackass","flyers","boobs","232323","zzzzzz","scorpion","doggie","legend","ou812","yankee","blazer","runner","birdie","bitches","555555","topgun","asdfasdf","heaven","viper","animal","2222","bigboy","4444","private","godzilla","lifehack","phantom","rock","august","sammy","cool","platinum","jake","bronco","heka6w2","copper","cumshot","garfield","willow","cunt","slut","69696969","kitten","super","jordan23","eagle1","shelby","america","11111","free","123321","chevy","bullshit","broncos","horney","surfer","nissan","999999","saturn","airborne","elephant","shit","action","adidas","qwert","1313","explorer","police","christin","december","wolf","sweet","therock","online","dickhead","brooklyn","cricket","racing","penis","0000","teens","redwings","dreams","michigan","hentai","magnum","87654321","donkey","trinity","digital","333333","cartman","guinness","123abc","speedy","buffalo","kitty","pimpin","eagle","einstein","nirvana","vampire","xxxx","playboy","pumpkin","snowball","test123","sucker","mexico","beatles","fantasy","celtic","cherry","cassie","888888","sniper","genesis","hotrod","reddog","alexande","college","jester","passw0rd","bigcock","lasvegas","slipknot","3333","death","1q2w3e","eclipse","1q2w3e4r","drummer","montana","music","aaaa","carolina","colorado","creative","hello1","goober","friday","bollocks","scotty","abcdef","bubbles","hawaii","fluffy","horses","thumper","5555","pussies","darkness","asdfghjk","boobies","buddha","sandman","naughty","honda","azerty","6666","shorty","money1","beach","loveme","4321","simple","poohbear","444444","badass","destiny","vikings","lizard","assman","nintendo","123qwe","november","xxxxx","october","leather","bastard","101010","extreme","password1","pussy1","lacrosse","hotmail","spooky","amateur","alaska","badger","paradise","maryjane","poop","mozart","video","vagina","spitfire","cherokee","cougar","420420","horse","enigma","raider","brazil","blonde","55555","dude","drowssap","lovely","1qaz2wsx","booty","snickers","nipples","diesel","rocks","eminem","westside","suzuki","passion","hummer","ladies","alpha","suckme","147147","pirate","semperfi","jupiter","redrum","freeuser","wanker","stinky","ducati","paris","babygirl","windows","spirit","pantera","monday","patches","brutus","smooth","penguin","marley","forest","cream","212121","flash","maximus","nipple","vision","pokemon","champion","fireman","indian","softball","picard","system","cobra","enjoy","lucky1","boogie","marines","security","dirty","admin","wildcats","pimp","dancer","hardon","fucked","abcd1234","abcdefg","ironman","wolverin","freepass","bigred","squirt","justice","hobbes","pearljam","mercury","domino","9999","rascal","hitman","mistress","bbbbbb","peekaboo","naked","budlight","electric","sluts","stargate","saints","bondage","bigman","zombie","swimming","duke","qwerty1","babes","scotland","disney","rooster","mookie","swordfis","hunting","blink182","8888","samsung","bubba1","whore","general","passport","aaaaaaaa","erotic","liberty","arizona","abcd","newport","skipper","rolltide","balls","happy1","galore","christ","weasel","242424","wombat","digger","classic","bulldogs","poopoo","accord","popcorn","turkey","bunny","mouse","007007","titanic","liverpool","dreamer","everton","chevelle","psycho","nemesis","pontiac","connor","eatme","lickme","cumming","ireland","spiderma","patriots","goblue","devils","empire","asdfg","cardinal","shaggy","froggy","qwer","kawasaki","kodiak","phpbb","54321","chopper","hooker","whynot","lesbian","snake","teen","ncc1701d","qqqqqq","airplane","britney","avalon","sugar","sublime","wildcat","raven","scarface","elizabet","123654","trucks","wolfpack","pervert","redhead","american","bambam","woody","shaved","snowman","tiger1","chicks","raptor","1969","stingray","shooter","france","stars","madmax","sports","789456","simpsons","lights","chronic","hahaha","packard","hendrix","service","spring","srinivas","spike","252525","bigmac","suck","single","popeye","tattoo","texas","bullet","taurus","sailor","wolves","panthers","japan","strike","pussycat","chris1","loverboy","berlin","sticky","tarheels","russia","wolfgang","testtest","mature","catch22","juice","michael1","nigger","159753","alpha1","trooper","hawkeye","freaky","dodgers","pakistan","machine","pyramid","vegeta","katana","moose","tinker","coyote","infinity","pepsi","letmein1","bang","hercules","james1","tickle","outlaw","browns","billybob","pickle","test1","sucks","pavilion","changeme","caesar","prelude","darkside","bowling","wutang","sunset","alabama","danger","zeppelin","pppppp","2001","ping","darkstar","madonna","qwe123","bigone","casino","charlie1","mmmmmm","integra","wrangler","apache","tweety","qwerty12","bobafett","transam","2323","seattle","ssssss","openup","pandora","pussys","trucker","indigo","storm","malibu","weed","review","babydoll","doggy","dilbert","pegasus","joker","catfish","flipper","fuckit","detroit","cheyenne","bruins","smoke","marino","fetish","xfiles","stinger","pizza","babe","stealth","manutd","gundam","cessna","longhorn","presario","mnbvcxz","wicked","mustang1","victory","21122112","awesome","athena","q1w2e3r4","holiday","knicks","redneck","12341234","gizmo","scully","dragon1","devildog","triumph","bluebird","shotgun","peewee","angel1","metallica","madman","impala","lennon","omega","access14","enterpri","search","smitty","blizzard","unicorn","tight","asdf1234","trigger","truck","beauty","thailand","1234567890","cadillac","castle","bobcat","buddy1","sunny","stones","asian","butt","loveyou","hellfire","hotsex","indiana","panzer","lonewolf","trumpet","colors","blaster","12121212","fireball","precious","jungle","atlanta","gold","corona","polaris","timber","theone","baller","chipper","skyline","dragons","dogs","licker","engineer","kong","pencil","basketba","hornet","barbie","wetpussy","indians","redman","foobar","travel","morpheus","target","141414","hotstuff","photos","rocky1","fuck_inside","dollar","turbo","design","hottie","202020","blondes","4128","lestat","avatar","goforit","random","abgrtyu","jjjjjj","cancer","q1w2e3","smiley","express","virgin","zipper","wrinkle1","babylon","consumer","monkey1","serenity","samurai","99999999","bigboobs","skeeter","joejoe","master1","aaaaa","chocolat","christia","stephani","tang","1234qwer","98765432","sexual","maxima","77777777","buckeye","highland","seminole","reaper","bassman","nugget","lucifer","airforce","nasty","warlock","2121","dodge","chrissy","burger","snatch","pink","gang","maddie","huskers","piglet","photo","dodger","paladin","chubby","buckeyes","hamlet","abcdefgh","bigfoot","sunday","manson","goldfish","garden","deftones","icecream","blondie","spartan","charger","stormy","juventus","galaxy","escort","zxcvb","planet","blues","david1","ncc1701e","1966","51505150","cavalier","gambit","ripper","oicu812","nylons","aardvark","whiskey","bing","plastic","anal","babylon5","loser","racecar","insane","yankees1","mememe","hansolo","chiefs","fredfred","freak","frog","salmon","concrete","zxcv","shamrock","atlantis","wordpass","rommel","1010","predator","massive","cats","sammy1","mister","stud","marathon","rubber","ding","trunks","desire","montreal","justme","faster","irish","1999","jessica1","alpine","diamonds","00000","swinger","shan","stallion","pitbull","letmein2","ming","shadow1","clitoris","fuckers","jackoff","bluesky","sundance","renegade","hollywoo","151515","wolfman","soldier","ling","goddess","manager","sweety","titans","fang","ficken","niners","bubble","hello123","ibanez","sweetpea","stocking","323232","tornado","content","aragorn","trojan","christop","rockstar","geronimo","pascal","crimson","google","fatcat","lovelove","cunts","stimpy","finger","wheels","viper1","latin","greenday","987654321","creampie","hiphop","snapper","funtime","duck","trombone","adult","cookies","mulder","westham","latino","jeep","ravens","drizzt","madness","energy","kinky","314159","slick","rocker","55555555","mongoose","speed","dddddd","catdog","cheng","ghost","gogogo","tottenha","curious","butterfl","mission","january","shark","techno","lancer","lalala","chichi","orion","trixie","delta","bobbob","bomber","kang","1968","spunky","liquid","beagle","granny","network","kkkkkk","1973","biggie","beetle","teacher","toronto","anakin","genius","cocks","dang","karate","snakes","bangkok","fuckyou2","pacific","daytona","infantry","skywalke","sailing","raistlin","vanhalen","huang","blackie","tarzan","strider","sherlock","gong","dietcoke","ultimate","shai","sprite","ting","artist","chai","chao","devil","python","ninja","ytrewq","superfly","456789","tian","jing","jesus1","freedom1","drpepper","chou","hobbit","shen","nolimit","mylove","biscuit","yahoo","shasta","sex4me","smoker","pebbles","pics","philly","tong","tintin","lesbians","cactus","frank1","tttttt","chun","danni","emerald","showme","pirates","lian","dogg","xiao","xian","tazman","tanker","toshiba","gotcha","rang","keng","jazz","bigguy","yuan","tomtom","chaos","fossil","racerx","creamy","bobo","musicman","warcraft","blade","shuang","shun","lick","jian","microsoft","rong","feng","getsome","quality","1977","beng","wwwwww","yoyoyo","zhang","seng","harder","qazxsw","qian","cong","chuan","deng","nang","boeing","keeper","western","1963","subaru","sheng","thuglife","teng","jiong","miao","mang","maniac","pussie","a1b2c3","zhou","zhuang","xing","stonecol","spyder","liang","jiang","memphis","ceng","magic1","logitech","chuang","sesame","shao","poison","titty","kuan","kuai","mian","guan","hamster","guai","ferret","geng","duan","pang","maiden","quan","velvet","nong","neng","nookie","buttons","bian","bingo","biao","zhong","zeng","zhun","ying","zong","xuan","zang","0.0.000","suan","shei","shui","sharks","shang","shua","peng","pian","piao","liao","meng","miami","reng","guang","cang","ruan","diao","luan","qing","chui","chuo","cuan","nuan","ning","heng","huan","kansas","muscle","weng","1passwor","bluemoon","zhui","zhua","xiang","zheng","zhen","zhei","zhao","zhan","yomama","zhai","zhuo","zuan","tarheel","shou","shuo","tiao","leng","kuang","jiao","13579","basket","qiao","qiong","qiang","chuai","nian","niao","niang","huai","22222222","zhuan","zhuai","shuan","shuai","stardust","jumper","66666666","charlott","qwertz","bones","waterloo","2002","11223344","oldman","trains","vertigo","246810","black1","swallow","smiles","standard","alexandr","parrot","user","1976","surfing","pioneer","apple1","asdasd","auburn","hannibal","frontier","panama","welcome1","vette","blue22","shemale","111222","baggins","groovy","global","181818","1979","blades","spanking","byteme","lobster","dawg","japanese","1970","1964","2424","polo","coco","deedee","mikey","1972","171717","1701","strip","jersey","green1","capital","putter","vader","seven7","banshee","grendel","dicks","hidden","iloveu","1980","ledzep","147258","female","bugger","buffett","molson","2020","wookie","sprint","jericho","102030","ranger1","trebor","deepthroat","bonehead","molly1","mirage","models","1984","2468","showtime","squirrel","pentium","anime","gator","powder","twister","connect","neptune","engine","eatshit","mustangs","woody1","shogun","septembe","pooh","jimbo","russian","sabine","voyeur","2525","363636","camel","germany","giant","qqqq","nudist","bone","sleepy","tequila","fighter","obiwan","makaveli","vacation","walnut","1974","ladybug","cantona","ccbill","satan","rusty1","passwor1","columbia","kissme","motorola","william1","1967","zzzz","skater","smut","matthew1","valley","coolio","dagger","boner","bull","horndog","jason1","penguins","rescue","griffey","8j4ye3uz","californ","champs","qwertyuiop","portland","colt45","xxxxxxx","xanadu","tacoma","carpet","gggggg","safety","palace","italia","picturs","picasso","thongs","tempest","asd123","hairy","foxtrot","nimrod","hotboy","343434","1111111","asdfghjkl","goose","overlord","stranger","454545","shaolin","sooners","socrates","spiderman","peanuts","13131313","andrew1","filthy","ohyeah","africa","intrepid","pickles","assass","fright","potato","hhhhhh","kingdom","weezer","424242","pepsi1","throat","looker","puppy","butch","sweets","megadeth","analsex","nymets","ddddddd","bigballs","oakland","oooooo","qweasd","chucky","carrot","chargers","discover","dookie","condor","horny1","sunrise","sinner","jojo","megapass","martini","assfuck","ffffff","mushroom","jamaica","7654321","77777","cccccc","gizmodo","tractor","mypass","hongkong","1975","blue123","pissing","thomas1","redred","basketball","satan666","dublin","bollox","kingkong","1971","22222","272727","sexx","bbbb","grizzly","passat","defiant","bowler","knickers","monitor","wisdom","slappy","thor","letsgo","robert1","brownie","098765","playtime","lightnin","atomic","goku","llllll","qwaszx","cosmos","bosco","knights","beast","slapshot","assword","frosty","dumbass","mallard","dddd","159357","titleist","aussie","golfing","doobie","loveit","werewolf","vipers","1965","blabla","surf","sucking","tardis","thegame","legion","rebels","sarah1","onelove","loulou","toto","blackcat","0007","tacobell","soccer1","jedi","method","poopie","boob","breast","kittycat","belly","pikachu","thunder1","thankyou","celtics","frogger","scoobydo","sabbath","coltrane","budman","jackal","zzzzz","licking","gopher","geheim","lonestar","primus","pooper","newpass","brasil","heather1","husker","element","moomoo","beefcake","zzzzzzzz","shitty","smokin","jjjj","anthony1","anubis","backup","gorilla","fuckface","lowrider","punkrock","traffic","delta1","amazon","fatass","dodgeram","dingdong","qqqqqqqq","breasts","boots","honda1","spidey","poker","temp","johnjohn","147852","asshole1","dogdog","tricky","crusader","syracuse","spankme","speaker","meridian","amadeus","harley1","falcons","turkey50","kenwood","keyboard","ilovesex","1978","shazam","shalom","lickit","jimbob","roller","fatman","sandiego","magnus","cooldude","clover","mobile","plumber","texas1","tool","topper","mariners","rebel","caliente","celica","oxford","osiris","orgasm","punkin","porsche9","tuesday","breeze","bossman","kangaroo","latinas","astros","scruffy","qwertyu","hearts","jammer","java","1122","goodtime","chelsea1","freckles","flyboy","doodle","nebraska","bootie","kicker","webmaster","vulcan","191919","blueeyes","321321","farside","rugby","director","pussy69","power1","hershey","hermes","monopoly","birdman","blessed","blackjac","southern","peterpan","thumbs","fuckyou1","rrrrrr","a1b2c3d4","coke","bohica","elvis1","blacky","sentinel","snake1","richard1","1234abcd","guardian","candyman","fisting","scarlet","dildo","pancho","mandingo","lucky7","condom","munchkin","billyboy","summer1","sword","skiing","site","sony","thong","rootbeer","assassin","fffff","fitness","durango","postal","achilles","kisses","warriors","plymouth","topdog","asterix","hallo","cameltoe","fuckfuck","eeeeee","sithlord","theking","avenger","backdoor","chevrole","trance","cosworth","houses","homers","eternity","kingpin","verbatim","incubus","1961","blond","zaphod","shiloh","spurs","mighty","aliens","charly","dogman","omega1","printer","aggies","deadhead","bitch1","stone55","pineappl","thekid","rockets","camels","formula","oracle","pussey","porkchop","abcde","clancy","mystic","inferno","blackdog","steve1","alfa","grumpy","flames","puffy","proxy","valhalla","unreal","herbie","engage","yyyyyy","010101","pistol","celeb","gggg","portugal","a12345","newbie","mmmm","1qazxsw2","zorro","writer","stripper","sebastia","spread","links","metal","1221","565656","funfun","trojans","cyber","hurrican","moneys","1x2zkg8w","zeus","tomato","lion","atlantic","usa123","trans","aaaaaaa","homerun","hyperion","kevin1","blacks","44444444","skittles","fart","gangbang","fubar","sailboat","oilers","buster1","hithere","immortal","sticks","pilot","lexmark","jerkoff","maryland","cheers","possum","cutter","muppet","swordfish","sport","sonic","peter1","jethro","rockon","asdfghj","pass123","pornos","ncc1701a","bootys","buttman","bonjour","1960","bears","362436","spartans","tinman","threesom","maxmax","1414","bbbbb","camelot","chewie","gogo","fusion","saint","dilligaf","nopass","hustler","hunter1","whitey","beast1","yesyes","spank","smudge","pinkfloy","patriot","lespaul","hammers","formula1","sausage","scooter1","orioles","oscar1","colombia","cramps","exotic","iguana","suckers","slave","topcat","lancelot","magelan","racer","crunch","british","steph","456123","skinny","seeking","rockhard","filter","freaks","sakura","pacman","poontang","newlife","homer1","klingon","watcher","walleye","tasty","sinatra","starship","steel","starbuck","poncho","amber1","gonzo","catherin","candle","firefly","goblin","scotch","diver","usmc","huskies","kentucky","kitkat","beckham","bicycle","yourmom","studio","33333333","splash","jimmy1","12344321","sapphire","mailman","raiders1","ddddd","excalibu","illini","imperial","lansing","maxx","gothic","golfball","facial","front242","macdaddy","qwer1234","vectra","cowboys1","crazy1","dannyboy","aquarius","franky","ffff","sassy","pppp","pppppppp","prodigy","noodle","eatpussy","vortex","wanking","billy1","siemens","phillies","groups","chevy1","cccc","gggggggg","doughboy","dracula","nurses","loco","lollipop","utopia","chrono","cooler","nevada","wibble","summit","1225","capone","fugazi","panda","qazwsxed","puppies","triton","9876","nnnnnn","momoney","iforgot","wolfie","studly","hamburg","81fukkc","741852","catman","china","gagging","scott1","oregon","qweqwe","crazybab","daniel1","cutlass","holes","mothers","music1","walrus","1957","bigtime","xtreme","simba","ssss","rookie","bathing","rotten","maestro","turbo1","99999","butthole","hhhh","yoda","shania","phish","thecat","rightnow","baddog","greatone","gateway1","abstr","napster","brian1","bogart","hitler","wildfire","jackson1","1981","beaner","yoyo","0.0.0.000","super1","select","snuggles","slutty","phoenix1","technics","toon","raven1","rayray","123789","1066","albion","greens","gesperrt","brucelee","hehehe","kelly1","mojo","1998","bikini","woofwoof","yyyy","strap","sites","central","f**k","nyjets","punisher","username","vanilla","twisted","bunghole","viagra","veritas","pony","titts","labtec","jenny1","masterbate","mayhem","redbull","govols","gremlin","505050","gmoney","rovers","diamond1","trident","abnormal","deskjet","cuddles","bristol","milano","vh5150","jarhead","1982","bigbird","bizkit","sixers","slider","star69","starfish","penetration","tommy1","john316","caligula","flicks","films","railroad","cosmo","cthulhu","br0d3r","bearbear","swedish","spawn","patrick1","reds","anarchy","groove","fuckher","oooo","airbus","cobra1","clips","delete","duster","kitty1","mouse1","monkeys","jazzman","1919","262626","swinging","stroke","stocks","sting","pippen","labrador","jordan1","justdoit","meatball","females","vector","cooter","defender","nike","bubbas","bonkers","kahuna","wildman","4121","sirius","static","piercing","terror","teenage","leelee","microsof","mechanic","robotech","rated","chaser","salsero","macross","quantum","tsunami","daddy1","cruise","newpass6","nudes","hellyeah","1959","zaq12wsx","striker","spice","spectrum","smegma","thumb","jjjjjjjj","mellow","cancun","cartoon","sabres","samiam","oranges","oklahoma","lust","denali","nude","noodles","brest","hooter","mmmmmmmm","warthog","blueblue","zappa","wolverine","sniffing","jjjjj","calico","freee","rover","pooter","closeup","bonsai","emily1","keystone","iiii","1955","yzerman","theboss","tolkien","megaman","rasta","bbbbbbbb","hal9000","goofy","gringo","gofish","gizmo1","samsam","scuba","onlyme","tttttttt","corrado","clown","clapton","bulls","jayhawk","wwww","sharky","seeker","ssssssss","pillow","thesims","lighter","lkjhgf","melissa1","marcius2","guiness","gymnast","casey1","goalie","godsmack","lolo","rangers1","poppy","clemson","clipper","deeznuts","holly1","eeee","kingston","yosemite","sucked","sex123","sexy69","pic's","tommyboy","masterbating","gretzky","happyday","frisco","orchid","orange1","manchest","aberdeen","ne1469","boxing","korn","intercourse","161616","1985","ziggy","supersta","stoney","amature","babyboy","bcfields","goliath","hack","hardrock","frodo","scout","scrappy","qazqaz","tracker","active","craving","commando","cohiba","cyclone","bubba69","katie1","mpegs","vsegda","irish1","sexy1","smelly","squerting","lions","jokers","jojojo","meathead","ashley1","groucho","cheetah","champ","firefox","gandalf1","packer","love69","tyler1","typhoon","tundra","bobby1","kenworth","village","volley","wolf359","0420","000007","swimmer","skydive","smokes","peugeot","pompey","legolas","redhot","rodman","redalert","grapes","4runner","carrera","floppy","ou8122","quattro","cloud9","davids","nofear","busty","homemade","mmmmm","whisper","vermont","webmaste","wives","insertion","jayjay","philips","topher","temptress","midget","ripken","havefun","canon","celebrity","ghetto","ragnarok","usnavy","conover","cruiser","dalshe","nicole1","buzzard","hottest","kingfish","misfit","milfnew","warlord","wassup","bigsexy","blackhaw","zippy","tights","kungfu","labia","meatloaf","area51","batman1","bananas","636363","ggggg","paradox","queens","adults","aikido","cigars","hoosier","eeyore","moose1","warez","interacial","streaming","313131","pertinant","pool6123","mayday","animated","banker","baddest","gordon24","ccccc","fantasies","aisan","deadman","homepage","ejaculation","whocares","iscool","jamesbon","1956","1pussy","womam","sweden","skidoo","spock","sssss","pepper1","pinhead","micron","allsop","amsterda","gunnar","666999","february","fletch","george1","sapper","sasha1","luckydog","lover1","magick","popopo","ultima","cypress","businessbabe","brandon1","vulva","vvvv","jabroni","bigbear","yummy","010203","searay","secret1","sinbad","sexxxx","soleil","software","piccolo","thirteen","leopard","legacy","memorex","redwing","rasputin","134679","anfield","greenbay","catcat","feather","scanner","pa55word","contortionist","danzig","daisy1","hores","exodus","iiiiii","1001","subway","snapple","sneakers","sonyfuck","picks","poodle","test1234","llll","junebug","marker","mellon","ronaldo","roadkill","amanda1","asdfjkl","beaches","great1","cheerleaers","doitnow","ozzy","boxster","brighton","housewifes","kkkk","mnbvcx","moocow","vides","1717","bigmoney","blonds","1000","storys","stereo","4545","420247","seductive","sexygirl","lesbean","justin1","124578","cabbage","canadian","gangbanged","dodge1","dimas","malaka","puss","probes","coolman","nacked","hotpussy","erotica","kool","implants","intruder","bigass","zenith","woohoo","womans","tango","pisces","laguna","maxell","andyod22","barcelon","chainsaw","chickens","flash1","orgasms","magicman","profit","pusyy","pothead","coconut","chuckie","clevelan","builder","budweise","hotshot","horizon","experienced","mondeo","wifes","1962","stumpy","smiths","slacker","pitchers","passwords","laptop","allmine","alliance","bbbbbbb","asscock","halflife","88888","chacha","saratoga","sandy1","doogie","qwert40","transexual","close-up","ib6ub9","volvo","jacob1","iiiii","beastie","sunnyday","stoned","sonics","starfire","snapon","pictuers","pepe","testing1","tiberius","lisalisa","lesbain","litle","retard","ripple","austin1","badgirl","golfgolf","flounder","royals","dragoon","dickie","passwor","majestic","poppop","trailers","nokia","bobobo","br549","minime","mikemike","whitesox","1954","3232","353535","seamus","solo","sluttey","pictere","titten","lback","1024","goodluck","fingerig","gallaries","goat","passme","oasis","lockerroom","logan1","rainman","treasure","custom","cyclops","nipper","bucket","homepage-","hhhhh","momsuck","indain","2345","beerbeer","bimmer","stunner","456456","tootsie","testerer","reefer","1012","harcore","gollum","545454","chico","caveman","fordf150","fishes","gaymen","saleen","doodoo","pa55w0rd","presto","qqqqq","cigar","bogey","helloo","dutch","kamikaze","wasser","vietnam","visa","japanees","0123","swords","slapper","peach","masterbaiting","redwood","1005","ametuer","chiks","fucing","sadie1","panasoni","mamas","rambo","unknown","absolut","dallas1","housewife","keywest","kipper","18436572","1515","zxczxc","303030","shaman","terrapin","masturbation","mick","redfish","1492","angus","goirish","hardcock","forfun","galary","freeporn","duchess","olivier","lotus","pornographic","ramses","purdue","traveler","crave","brando","enter1","killme","moneyman","welder","windsor","wifey","indon","yyyyy","taylor1","4417","picher","pickup","thumbnils","johnboy","jets","ameteur","amateurs","apollo13","hambone","goldwing","5050","sally1","doghouse","padres","pounding","quest","truelove","underdog","trader","climber","bolitas","hohoho","beanie","beretta","wrestlin","stroker","sexyman","jewels","johannes","mets","rhino","bdsm","balloons","grils","happy123","flamingo","route66","devo","outkast","paintbal","magpie","llllllll","twilight","critter","cupcake","nickel","bullseye","knickerless","videoes","binladen","xerxes","slim","slinky","pinky","thanatos","meister","menace","retired","albatros","balloon","goten","5551212","getsdown","donuts","nwo4life","tttt","comet","deer","dddddddd","deeznutz","nasty1","nonono","enterprise","eeeee","misfit99","milkman","vvvvvv","1818","blueboy","bigbutt","tech","toolman","juggalo","jetski","barefoot","50spanks","gobears","scandinavian","cubbies","nitram","kings","bilbo","yumyum","zzzzzzz","stylus","321654","shannon1","server","squash","starman","steeler","phrases","techniques","laser","135790","athens","cbr600","chemical","fester","gangsta","fucku2","droopy","objects","passwd","lllll","manchester","vedder","clit","chunky","darkman","buckshot","buddah","boobed","henti","winter1","bigmike","beta","zidane","talon","slave1","pissoff","thegreat","lexus","matador","readers","armani","goldstar","5656","fmale","fuking","fucku","ggggggg","sauron","diggler","pacers","looser","pounded","premier","triangle","cosmic","depeche","norway","helmet","mustard","misty1","jagger","3x7pxr","silver1","snowboar","penetrating","photoes","lesbens","lindros","roadking","rockford","1357","143143","asasas","goodboy","898989","chicago1","ferrari1","galeries","godfathe","gawker","gargoyle","gangster","rubble","rrrr","onetime","pussyman","pooppoop","trapper","cinder","newcastl","boricua","bunny1","boxer","hotred","hockey1","edward1","moscow","mortgage","bigtit","snoopdog","joshua1","july","1230","assholes","frisky","sanity","divine","dharma","lucky13","akira","butterfly","hotbox","hootie","howdy","earthlink","kiteboy","westwood","1988","blackbir","biggles","wrench","wrestle","slippery","pheonix","penny1","pianoman","thedude","jenn","jonjon","jones1","roadrunn","arrow","azzer","seahawks","diehard","dotcom","tunafish","chivas","cinnamon","clouds","deluxe","northern","boobie","momomo","modles","volume","23232323","bluedog","wwwwwww","zerocool","yousuck","pluto","limewire","joung","awnyce","gonavy","haha","films+pic+galeries","girsl","fuckthis","girfriend","uncencored","a123456","chrisbln","combat","cygnus","cupoi","netscape","hhhhhhhh","eagles1","elite","knockers","1958","tazmania","shonuf","pharmacy","thedog","midway","arsenal1","anaconda","australi","gromit","gotohell","787878","66666","carmex2","camber","gator1","ginger1","fuzzy","seadoo","lovesex","rancid","uuuuuu","911911","bulldog1","heater","monalisa","mmmmmmm","whiteout","virtual","jamie1","japanes","james007","2727","2469","blam","bitchass","zephyr","stiffy","sweet1","southpar","spectre","tigger1","tekken","lakota","lionking","jjjjjjj","megatron","1369","hawaiian","gymnastic","golfer1","gunners","7779311","515151","sanfran","optimus","panther1","love1","maggie1","pudding","aaron1","delphi","niceass","bounce","house1","killer1","momo","musashi","jammin","2003","234567","wp2003wp","submit","sssssss","spikes","sleeper","passwort","kume","meme","medusa","mantis","reebok","1017","artemis","harry1","cafc91","fettish","oceans","oooooooo","mango","ppppp","trainer","uuuu","909090","death1","bullfrog","hokies","holyshit","eeeeeee","jasmine1","&amp","&amp;","spinner","jockey","babyblue","gooner","474747","cheeks","pass1234","parola","okokok","poseidon","989898","crusher","cubswin","nnnn","kotaku","mittens","whatsup","vvvvv","iomega","insertions","bengals","biit","yellow1","012345","spike1","sowhat","pitures","pecker","theend","hayabusa","hawkeyes","florian","qaz123","usarmy","twinkle","chuckles","hounddog","hover","hothot","europa","kenshin","kojak","mikey1","water1","196969","wraith","zebra","wwwww","33333","simon1","spider1","snuffy","philippe","thunderb","teddy1","marino13","maria1","redline","renault","aloha","handyman","cerberus","gamecock","gobucks","freesex","duffman","ooooo","nuggets","magician","longbow","preacher","porno1","chrysler","contains","dalejr","navy","buffy1","hedgehog","hoosiers","honey1","hott","heyhey","dutchess","everest","wareagle","ihateyou","sunflowe","3434","senators","shag","spoon","sonoma","stalker","poochie","terminal","terefon","maradona","1007","142536","alibaba","america1","bartman","astro","goth","chicken1","cheater","ghost1","passpass","oral","r2d2c3po","civic","cicero","myxworld","kkkkk","missouri","wishbone","infiniti","1a2b3c","1qwerty","wonderboy","shojou","sparky1","smeghead","poiuy","titanium","lantern","jelly","1213","bayern","basset","gsxr750","cattle","fishing1","fullmoon","gilles","dima","obelix","popo","prissy","ramrod","bummer","hotone","dynasty","entry","konyor","missy1","282828","xyz123","426hemi","404040","seinfeld","pingpong","lazarus","marine1","12345a","beamer","babyface","greece","gustav","7007","ccccccc","faggot","foxy","gladiato","duckie","dogfood","packers1","longjohn","radical","tuna","clarinet","danny1","novell","bonbon","kashmir","kiki","mortimer","modelsne","moondog","vladimir","insert","1953","zxc123","supreme","3131","sexxx","softail","poipoi","pong","mars","martin1","rogue","avalanch","audia4","55bgates","cccccccc","came11","figaro","dogboy","dnsadm","dipshit","paradigm","othello","operator","tripod","chopin","coucou","cocksuck","borussia","heritage","hiziad","homerj","mullet","whisky","4242","speedo","starcraf","skylar","spaceman","piggy","tiger2","legos","jezebel","joker1","mazda","727272","chester1","rrrrrrrr","dundee","lumber","ppppppp","tranny","aaliyah","admiral","comics","delight","buttfuck","homeboy","eternal","kilroy","violin","wingman","walmart","bigblue","blaze","beemer","beowulf","bigfish","yyyyyyy","woodie","yeahbaby","0123456","tbone","syzygy","starter","linda1","merlot","mexican","11235813","banner","bangbang","badman","barfly","grease","charles1","ffffffff","doberman","dogshit","overkill","coolguy","claymore","demo","nomore","hhhhhhh","hondas","iamgod","enterme","electron","eastside","minimoni","mybaby","wildbill","wildcard","ipswich","200000","bearcat","zigzag","yyyyyyyy","sweetnes","369369","skyler","skywalker","pigeon","tipper","asdf123","alphabet","asdzxc","babybaby","banane","guyver","graphics","chinook","florida1","flexible","fuckinside","ursitesux","tototo","adam12","christma","chrome","buddie","bombers","hippie","misfits","292929","woofer","wwwwwwww","stubby","sheep","sparta","stang","spud","sporty","pinball","just4fun","maxxxx","rebecca1","fffffff","freeway","garion","rrrrr","sancho","outback","maggot","puddin","987456","hoops","mydick","19691969","bigcat","shiner","silverad","templar","lamer","juicy","mike1","maximum","1223","10101010","arrows","alucard","haggis","cheech","safari","dog123","orion1","paloma","qwerasdf","presiden","vegitto","969696","adonis","cookie1","newyork1","buddyboy","hellos","heineken","eraser","moritz","millwall","visual","jaybird","1983","beautifu","zodiac","steven1","sinister","slammer","smashing","slick1","sponge","teddybea","ticklish","jonny","1211","aptiva","applepie","bailey1","guitar1","canyon","gagged","fuckme1","digital1","dinosaur","98765","90210","clowns","cubs","deejay","nigga","naruto","boxcar","icehouse","hotties","electra","widget","1986","2004","bluefish","bingo1","*****","stratus","sultan","storm1","44444","4200","sentnece","sexyboy","sigma","smokie","spam","pippo","temppass","manman","1022","bacchus","aztnm","axio","bamboo","hakr","gregor","hahahaha","5678","camero1","dolphin1","paddle","magnet","qwert1","pyon","porsche1","tripper","noway","burrito","bozo","highheel","hookem","eddie1","entropy","kkkkkkkk","kkkkkkk","illinois","1945","1951","24680","21212121","100000","stonecold","taco","subzero","sexxxy","skolko","skyhawk","spurs1","sputnik","testpass","jiggaman","1224","hannah1","525252","4ever","carbon","scorpio1","rt6ytere","madison1","loki","coolness","coldbeer","citadel","monarch","morgan1","washingt","1997","bella1","yaya","superb","taxman","studman","3636","pizzas","tiffany1","lassie","larry1","joseph1","mephisto","reptile","razor","1013","hammer1","gypsy","grande","camper","chippy","cat123","chimera","fiesta","glock","domain","dieter","dragonba","onetwo","nygiants","password2","quartz","prowler","prophet","towers","ultra","cocker","corleone","dakota1","cumm","nnnnnnn","boxers","heynow","iceberg","kittykat","wasabi","vikings1","beerman","splinter","snoopy1","pipeline","mickey1","mermaid","micro","meowmeow","redbird","baura","chevys","caravan","frogman","diving","dogger","draven","drifter","oatmeal","paris1","longdong","quant4307s","rachel1","vegitta","cobras","corsair","dadada","mylife","bowwow","hotrats","eastwood","moonligh","modena","illusion","iiiiiii","jayhawks","swingers","shocker","shrimp","sexgod","squall","poiu","tigers1","toejam","tickler","julie1","jimbo1","jefferso","michael2","rodeo","robot","1023","annie1","bball","happy2","charter","flasher","falcon1","fiction","fastball","gadget","scrabble","diaper","dirtbike","oliver1","paco","macman","poopy","popper","postman","ttttttt","acura","cowboy1","conan","daewoo","nemrac58","nnnnn","nextel","bobdylan","eureka","kimmie","kcj9wx5n","killbill","musica","volkswag","wage","windmill","wert","vintage","iloveyou1","itsme","zippo","311311","starligh","smokey1","snappy","soulmate","plasma","krusty","just4me","marius","rebel1","1123","audi","fick","goaway","rusty2","dogbone","doofus","ooooooo","oblivion","mankind","mahler","lllllll","pumper","puck","pulsar","valkyrie","tupac","compass","concorde","cougars","delaware","niceguy","nocturne","bob123","boating","bronze","herewego","hewlett","houhou","earnhard","eeeeeeee","mingus","mobydick","venture","verizon","imation","1950","1948","1949","223344","bigbig","wowwow","sissy","spiker","snooker","sluggo","player1","jsbach","jumbo","medic","reddevil","reckless","123456a","1125","1031","astra","gumby","757575","585858","chillin","fuck1","radiohea","upyours","trek","coolcool","classics","choochoo","nikki1","nitro","boytoy","excite","kirsty","wingnut","wireless","icu812","1master","beatle","bigblock","wolfen","summer99","sugar1","tartar","sexysexy","senna","sexman","soprano","platypus","pixies","telephon","laura1","laurent","rimmer","1020","12qwaszx","hamish","halifax","fishhead","forum","dododo","doit","paramedi","lonesome","mandy1","uuuuu","uranus","ttttt","bruce1","helper","hopeful","eduard","dusty1","kathy1","moonbeam","muscles","monster1","monkeybo","windsurf","vvvvvvv","vivid","install","1947","187187","1941","1952","susan1","31415926","sinned","sexxy","smoothie","snowflak","playstat","playa","playboy1","toaster","jerry1","marie1","mason1","merlin1","roger1","roadster","112358","1121","andrea1","bacardi","hardware","789789","5555555","captain1","fergus","sascha","rrrrrrr","dome","onion","lololo","qqqqqqq","undertak","uuuuuuuu","uuuuuuu","cobain","cindy1","coors","descent","nimbus","nomad","nanook","norwich","bombay","broker","hookup","kiwi","winners","jackpot","1a2b3c4d","1776","beardog","bighead","bird33","0987","spooge","pelican","peepee","titan","thedoors","jeremy1","altima","baba","hardone","5454","catwoman","finance","farmboy","farscape","genesis1","salomon","loser1","r2d2","pumpkins","chriss","cumcum","ninjas","ninja1","killers","miller1","islander","jamesbond","intel","19841984","2626","bizzare","blue12","biker","yoyoma","sushi","shitface","spanker","steffi","sphinx","please1","paulie","pistons","tiburon","maxwell1","mdogg","rockies","armstron","alejandr","arctic","banger","audio","asimov","753951","4you","chilly","care1839","flyfish","fantasia","freefall","sandrine","oreo","ohshit","macbeth","madcat","loveya","qwerqwer","colnago","chocha","cobalt","crystal1","dabears","nevets","nineinch","broncos1","epsilon","kestrel","winston1","warrior1","iiiiiiii","iloveyou2","1616","woowoo","sloppy","specialk","tinkerbe","jellybea","reader","redsox1","1215","1112","arcadia","baggio","555666","cayman","cbr900rr","gabriell","glennwei","sausages","disco","pass1","lovebug","macmac","puffin","vanguard","trinitro","airwolf","aaa111","cocaine","cisco","datsun","bricks","bumper","eldorado","kidrock","wizard1","whiskers","wildwood","istheman","25802580","bigones","woodland","wolfpac","strawber","3030","sheba1","sixpack","peace1","physics","tigger2","toad","megan1","meow","ringo","amsterdam","717171","686868","5424","canuck","football1","footjob","fulham","seagull","orgy","lobo","mancity","vancouve","vauxhall","acidburn","derf","myspace1","boozer","buttercu","hola","minemine","munch","1dragon","biology","bestbuy","bigpoppa","blackout","blowfish","bmw325","bigbob","stream","talisman","tazz","sundevil","3333333","skate","shutup","shanghai","spencer1","slowhand","pinky1","tootie","thecrow","jubilee","jingle","matrix1","manowar","messiah","resident","redbaron","romans","andromed","athlon","beach1","badgers","guitars","harald","harddick","gotribe","6996","7grout","5wr2i7h8","635241","chase1","fallout","fiddle","fenris","francesc","fortuna","fairlane","felix1","gasman","fucks","sahara","sassy1","dogpound","dogbert","divx1","manila","pornporn","quasar","venom","987987","access1","clippers","daman","crusty","nathan1","nnnnnnnn","bruno1","budapest","kittens","kerouac","mother1","waldo1","whistler","whatwhat","wanderer","idontkno","1942","1946","bigdawg","bigpimp","zaqwsx","414141","3000gt","434343","serpent","smurf","pasword","thisisit","john1","robotics","redeye","rebelz","1011","alatam","asians","bama","banzai","harvest","575757","5329","fatty","fender1","flower2","funky","sambo","drummer1","dogcat","oedipus","osama","prozac","private1","rampage","concord","cinema","cornwall","cleaner","ciccio","clutch","corvet07","daemon","bruiser","boiler","hjkl","egghead","mordor","jamess","iverson3","bluesman","zouzou","090909","1002","stone1","4040","sexo","smith1","sperma","sneaky","polska","thewho","terminat","krypton","lekker","johnson1","johann","rockie","aspire","goodie","cheese1","fenway","fishon","fishin","fuckoff1","girls1","doomsday","pornking","ramones","rabbits","transit","aaaaa1","boyz","bookworm","bongo","bunnies","buceta","highbury","henry1","eastern","mischief","mopar","ministry","vienna","wildone","bigbooty","beavis1","xxxxxx1","yogibear","000001","0815","zulu","420000","sigmar","sprout","stalin","lkjhgfds","lagnaf","rolex","redfox","referee","123123123","1231","angus1","ballin","attila","greedy","grunt","747474","carpedie","caramel","foxylady","gatorade","futbol","frosch","saiyan","drums","donner","doggy1","drum","doudou","nutmeg","quebec","valdepen","tosser","tuscl","comein","cola","deadpool","bremen","hotass","hotmail1","eskimo","eggman","koko","kieran","katrin","kordell1","komodo","mone","munich","vvvvvvvv","jackson5","2222222","bergkamp","bigben","zanzibar","xxx123","sunny1","373737","slayer1","snoop","peachy","thecure","little1","jennaj","rasta69","1114","aries","havana","gratis","calgary","checkers","flanker","salope","dirty1","draco","dogface","luv2epus","rainbow6","qwerty123","umpire","turnip","vbnm","tucson","troll","codered","commande","neon","nico","nightwin","boomer1","bushido","hotmail0","enternow","keepout","karen1","mnbv","viewsoni","volcom","wizards","1995","berkeley","woodstoc","tarpon","shinobi","starstar","phat","toolbox","julien","johnny1","joebob","riders","reflex","120676","1235","angelus","anthrax","atlas","grandam","harlem","hawaii50","655321","cabron","challeng","callisto","firewall","firefire","flyer","flower1","gambler","frodo1","sam123","scania","dingo","papito","passmast","ou8123","randy1","twiggy","travis1","treetop","addict","admin1","963852","aceace","cirrus","bobdole","bonjovi","bootsy","boater","elway7","kenny1","moonshin","montag","wayne1","white1","jazzy","jakejake","1994","1991","2828","bluejays","belmont","sensei","southpark","peeper","pharao","pigpen","tomahawk","teensex","leedsutd","jeepster","jimjim","josephin","melons","matthias","robocop","1003","1027","antelope","azsxdc","gordo","hazard","granada","8989","7894","ceasar","cabernet","cheshire","chelle","candy1","fergie","fidelio","giorgio","fuckhead","dominion","qawsed","trucking","chloe1","daddyo","nostromo","boyboy","booster","bucky","honolulu","esquire","dynamite","mollydog","windows1","waffle","wealth","vincent1","jabber","jaguars","javelin","irishman","idefix","bigdog1","blue42","blanked","blue32","biteme1","bearcats","yessir","sylveste","sunfire","tbird","stryker","3ip76k2","sevens","pilgrim","tenchi","titman","leeds","lithium","linkin","marijuan","mariner","markie","midnite","reddwarf","1129","123asd","12312312","allstar","albany","asdf12","aspen","hardball","goldfing","7734","49ers","carnage","callum","carlos1","fitter","fandango","gofast","gamma","fucmy69","scrapper","dogwood","django","magneto","premium","9999999","abc1234","newyear","bookie","bounty","brown1","bologna","elway","killjoy","klondike","mouser","wayer","impreza","insomnia","24682468","2580","24242424","billbill","bellaco","blues1","blunts","teaser","sf49ers","shovel","solitude","spikey","pimpdadd","timeout","toffee","lefty","johndoe","johndeer","mega","manolo","ratman","robin1","1124","1210","1028","1226","babylove","barbados","gramma","646464","carpente","chaos1","fishbone","fireblad","frogs","screamer","scuba1","ducks","doggies","dicky","obsidian","rams","tottenham","aikman","comanche","corolla","cumslut","cyborg","boston1","houdini","helmut","elvisp","keksa12","monty1","wetter","watford","wiseguy","1989","1987","20202020","biatch","beezer","bigguns","blueball","bitchy","wyoming","yankees2","wrestler","stupid1","sealteam","sidekick","simple1","smackdow","sporting","spiral","smeller","plato","tophat","test2","toomuch","jello","junkie","maxim","maxime","meadow","remingto","roofer","124038","1018","1269","1227","123457","arkansas","aramis","beaker","barcelona","baltimor","googoo","goochi","852456","4711","catcher","champ1","fortress","fishfish","firefigh","geezer","rsalinas","samuel1","saigon","scooby1","dick1","doom","dontknow","magpies","manfred","vader1","universa","tulips","mygirl","bowtie","holycow","honeys","enforcer","waterboy","1992","23skidoo","bimbo","blue11","birddog","zildjian","030303","stinker","stoppedby","sexybabe","speakers","slugger","spotty","smoke1","polopolo","perfect1","torpedo","lakeside","jimmys","junior1","masamune","1214","april1","grinch","767676","5252","cherries","chipmunk","cezer121","carnival","capecod","finder","fearless","goats","funstuff","gideon","savior","seabee","sandro","schalke","salasana","disney1","duckman","pancake","pantera1","malice","love123","qwert123","tracer","creation","cwoui","nascar24","hookers","erection","ericsson","edthom","kokoko","kokomo","mooses","inter","1michael","1993","19781978","25252525","shibby","shamus","skibum","sheepdog","sex69","spliff","slipper","spoons","spanner","snowbird","toriamos","temp123","tennesse","lakers1","jomama","mazdarx7","recon","revolver","1025","1101","barney1","babycake","gotham","gravity","hallowee","616161","515000","caca","cannabis","chilli","fdsa","getout","fuck69","gators1","sable","rumble","dolemite","dork","duffer","dodgers1","onions","logger","lookout","magic32","poon","twat","coventry","citroen","civicsi","cocksucker","coochie","compaq1","nancy1","buzzer","boulder","butkus","bungle","hogtied","hotgirls","heidi1","eggplant","mustang6","monkey12","wapapapa","wendy1","volleyba","vibrate","blink","birthday4","xxxxx1","stephen1","suburban","sheeba","start1","soccer10","starcraft","soccer12","peanut1","plastics","penthous","peterbil","tetsuo","torino","tennis1","termite","lemmein","lakewood","jughead","melrose","megane","redone","angela1","goodgirl","gonzo1","golden1","gotyoass","656565","626262","capricor","chains","calvin1","getmoney","gabber","runaway","salami","dungeon","dudedude","opus","paragon","panhead","pasadena","opendoor","odyssey","magellan","printing","prince1","trustme","nono","buffet","hound","kajak","killkill","moto","winner1","vixen","whiteboy","versace","voyager1","indy","jackjack","bigal","beech","biggun","blake1","blue99","big1","synergy","success1","336699","sixty9","shark1","simba1","sebring","spongebo","spunk","springs","sliver","phialpha","password9","pizza1","pookey","tickling","lexingky","lawman","joe123","mike123","romeo1","redheads","apple123","backbone","aviation","green123","carlitos","byebye","cartman1","camden","chewy","camaross","favorite6","forumwp","ginscoot","fruity","sabrina1","devil666","doughnut","pantie","oldone","paintball","lumina","rainbow1","prosper","umbrella","ajax","951753","achtung","abc12345","compact","corndog","deerhunt","darklord","dank","nimitz","brandy1","hetfield","holein1","hillbill","hugetits","evolutio","kenobi","whiplash","wg8e3wjf","istanbul","invis","1996","bigjohn","bluebell","beater","benji","bluejay","xyzzy","suckdick","taichi","stellar","shaker","semper","splurge","squeak","pearls","playball","pooky","titfuck","joemama","johnny5","marcello","maxi","rhubarb","ratboy","reload","1029","1030","1220","bbking","baritone","gryphon","57chevy","494949","celeron","fishy","gladiator","fucker1","roswell","dougie","dicker","diva","donjuan","nympho","racers","truck1","trample","acer","cricket1","climax","denmark","cuervo","notnow","nittany","neutron","bosco1","buffa","breaker","hello2","hydro","kisskiss","kittys","montecar","modem","mississi","20012001","bigdick1","benfica","yahoo1","striper","tabasco","supra","383838","456654","seneca","shuttle","penguin1","pathfind","testibil","thethe","jeter2","marma","mark1","metoo","republic","rollin","redleg","redbone","redskin","1245","anthony7","altoids","barley","asswipe","bauhaus","bbbbbb1","gohome","harrier","golfpro","goldeney","818181","6666666","5000","5rxypn","cameron1","checker","calibra","freefree","faith1","fdm7ed","giraffe","giggles","fringe","scamper","rrpass1","screwyou","dimples","pacino","ontario","passthie","oberon","quest1","postov1000","puppydog","puffer","qwerty7","tribal","adam25","a1234567","collie","cleopatr","davide","namaste","buffalo1","bonovox","bukkake","burner","bordeaux","burly","hun999","enters","mohawk","vgirl","jayden","1812","1943","222333","bigjim","bigd","zoom","wordup","ziggy1","yahooo","workout","young1","xmas","zzzzzz1","surfer1","strife","sunlight","tasha1","skunk","sprinter","peaches1","pinetree","plum","pimping","theforce","thedon","toocool","laddie","lkjh","jupiter1","matty","redrose","1200","102938","antares","austin31","goose1","737373","78945612","789987","6464","calimero","caster","casper1","cement","chevrolet","chessie","caddy","canucks","fellatio","f00tball","gateway2","gamecube","rugby1","scheisse","dshade","dixie1","offshore","lucas1","macaroni","manga","pringles","puff","trouble1","ussy","coolhand","colonial","colt","darthvad","cygnusx1","natalie1","newark","hiking","errors","elcamino","koolaid","knight1","murphy1","volcano","idunno","2005","2233","blueberr","biguns","yamahar1","zapper","zorro1","0911","3006","sixsix","shopper","sextoy","snowboard","speedway","pokey","playboy2","titi","toonarmy","lambda","joecool","juniper","max123","mariposa","met2002","reggae","ricky1","1236","1228","1016","all4one","baberuth","asgard","484848","5683","6669","catnip","charisma","capslock","cashmone","galant","frenchy","gizmodo1","girlies","screwy","doubled","divers","dte4uw","dragonfl","treble","twinkie","tropical","crescent","cococo","dabomb","daffy","dandfa","cyrano","nathanie","boners","helium","hellas","espresso","killa","kikimora","w4g8at","ilikeit","iforget","1944","20002000","birthday1","beatles1","blue1","bigdicks","beethove","blacklab","blazers","benny1","woodwork","0069","0101","taffy","4567","shodan","pavlov","pinnacle","petunia","tito","teenie","lemonade","lalakers","lebowski","lalalala","ladyboy","jeeper","joyjoy","mercury1","mantle","mannn","rocknrol","riversid","123aaa","11112222","121314","1021","1004","1120","allen1","ambers","amstel","alice1","alleycat","allegro","ambrosia","gspot","goodsex","hattrick","harpoon","878787","8inches","4wwvte","cassandr","charlie123","gatsby","generic","gareth","fuckme2","samm","seadog","satchmo","scxakv","santafe","dipper","outoutout","madmad","london1","qbg26i","pussy123","tzpvaw","vamp","comp","cowgirl","coldplay","dawgs","nt5d27","novifarm","notredam","newness","mykids","bryan1","bouncer","hihihi","honeybee","iceman1","hotlips","dynamo","kappa","kahlua","muffy","mizzou","wannabe","wednesda","whatup","waterfal","willy1","bear1","billabon","youknow","yyyyyy1","zachary1","01234567","070462","zurich","superstar","stiletto","strat","427900","sigmachi","shells","sexy123","smile1","sophie1","stayout","somerset","playmate","pinkfloyd","phish1","payday","thebear","telefon","laetitia","kswbdu","jerky","metro","revoluti","1216","1201","1204","1222","1115","archange","barry1","handball","676767","chewbacc","furball","gocubs","fullback","gman","dewalt","dominiqu","diver1","dhip6a","olemiss","mandrake","mangos","pretzel","pusssy","tripleh","vagabond","clovis","dandan","csfbr5yy","deadspin","ninguna","ncc74656","bootsie","bp2002","bourbon","bumble","heyyou","houston1","hemlock","hippo","hornets","horseman","excess","extensa","muffin1","virginie","werdna","idontknow","jack1","1bitch","151nxjmt","bendover","bmwbmw","zaq123","wxcvbn","supernov","tahoe","shakur","sexyone","seviyi","smart1","speed1","pepito","phantom1","playoffs","terry1","terrier","laser1","lite","lancia","johngalt","jenjen","midori","maserati","matteo","miami1","riffraff","ronald1","1218","1026","123987","1015","1103","armada","architec","austria","gotmilk","cambridg","camero","flex","foreplay","getoff","glacier","glotest","froggie","gerbil","rugger","sanity72","donna1","orchard","oyster","palmtree","pajero","m5wkqf","magenta","luckyone","treefrog","vantage","usmarine","tyvugq","uptown","abacab","aaaaaa1","chuck1","darkange","cyclones","navajo","bubba123","iawgk2","hrfzlz","dylan1","enrico","encore","eclipse1","mutant","mizuno","mustang2","video1","viewer","weed420","whales","jaguar1","1990","159159","1love","bears1","bigtruck","bigboss","blitz","xqgann","yeahyeah","zeke","zardoz","stickman","3825","sentra","shiva","skipper1","singapor","southpaw","sonora","squid","slamdunk","slimjim","placid","photon","placebo","pearl1","test12","therock1","tiger123","leinad","legman","jeepers","joeblow","mike23","redcar","rhinos","rjw7x4","1102","13576479","112211","gwju3g","greywolf","7bgiqk","7878","535353","4snz9g","candyass","cccccc1","catfight","cali","fister","fosters","finland","frankie1","gizzmo","royalty","rugrat","dodo","oemdlg","out3xf","paddy","opennow","puppy1","qazwsxedc","ramjet","abraxas","cn42qj","dancer1","death666","nudity","nimda2k","buick","bobb","braves1","henrik","hooligan","everlast","karachi","mortis","monies","motocros","wally1","willie1","inspiron","1test","2929","bigblack","xytfu7","yackwin","zaq1xsw2","yy5rbfsc","100100","0660","tahiti","takehana","332211","3535","sedona","seawolf","skydiver","spleen","slash","spjfet","special1","slimshad","sopranos","spock1","penis1","patches1","thierry","thething","toohot","limpone","mash4077","matchbox","masterp","maxdog","ribbit","rockin","redhat","1113","14789632","1331","allday","aladin","andrey","amethyst","baseball1","athome","goofy1","greenman","goofball","ha8fyp","goodday","778899","charon","chappy","caracas","cardiff","capitals","canada1","cajun","catter","freddy1","favorite2","forme","forsaken","feelgood","gfxqx686","saskia","sanjose","salsa","dilbert1","dukeduke","downhill","longhair","locutus","lockdown","malachi","mamacita","lolipop","rainyday","pumpkin1","punker","prospect","rambo1","rainbows","quake","trinity1","trooper1","citation","coolcat","default","deniro","d9ungl","daddys","nautica","nermal","bukowski","bubbles1","bogota","buds","hulk","hitachi","ender","export","kikiki","kcchiefs","kram","morticia","montrose","mongo","waqw3p","wizzard","whdbtp","whkzyc","154ugeiu","1fuck","binky","bigred1","blubber","becky1","year2005","wonderfu","xrated","0001","tampabay","survey","tammy1","stuffer","3mpz4r","3000","3some","sierra1","shampoo","shyshy","slapnuts","standby","spartan1","sprocket","stanley1","poker1","theshit","lavalamp","light1","laserjet","jediknig","jjjjj1","mazda626","menthol","margaux","medic1","rhino1","1209","1234321","amigos","apricot","asdfgh1","hairball","hatter","grimace","7xm5rq","6789","cartoons","capcom","cashflow","carrots","fanatic","format","girlie","safeway","dogfart","dondon","outsider","odin","opiate","lollol","love12","mallrats","prague","primetime21","pugsley","r29hqq","valleywa","airman","abcdefg1","darkone","cummer","natedogg","nineball","ndeyl5","natchez","newone","normandy","nicetits","buddy123","buddys","homely","husky","iceland","hr3ytm","highlife","holla","earthlin","exeter","eatmenow","kimkim","k2trix","kernel","money123","moonman","miles1","mufasa","mousey","whites","warhamme","jackass1","2277","20spanks","blobby","blinky","bikers","blackjack","becca","blue23","xman","wyvern","085tzzqi","zxzxzx","zsmj2v","suede","t26gn4","sugars","tantra","swoosh","4226","4271","321123","383pdjvl","shane1","shelby1","spades","smother","sparhawk","pisser","photo1","pebble","peavey","pavement","thistle","kronos","lilbit","linux","melanie1","marbles","redlight","1208","1138","1008","alchemy","aolsucks","alexalex","atticus","auditt","b929ezzh","goodyear","gubber","863abgsg","7474","797979","464646","543210","4zqauf","4949","ch5nmk","carlito","chewey","carebear","checkmat","cheddar","chachi","forgetit","forlife","giants1","getit","gerhard","galileo","g3ujwg","ganja","rufus1","rushmore","discus","dudeman","olympus","oscars","osprey","madcow","locust","loyola","mammoth","proton","rabbit1","ptfe3xxp","pwxd5x","purple1","punkass","prophecy","uyxnyd","tyson1","aircraft","access99","abcabc","colts","civilwar","claudia1","contour","dddddd1","cypher","dapzu455","daisydog","noles","hoochie","hoser","eldiablo","kingrich","mudvayne","motown","mp8o6d","vipergts","italiano","2055","2211","bloke","blade1","yamato","zooropa","yqlgr667","050505","zxcvbnm1","zw6syj","suckcock","tango1","swampy","445566","333666","380zliki","sexpot","sexylady","sixtynin","sickboy","spiffy","skylark","sparkles","pintail","phreak","teller","timtim","thighs","latex","letsdoit","lkjhg","landmark","lizzard","marlins","marauder","metal1","manu","righton","1127","alain","alcat","amigo","basebal1","azertyui","azrael","hamper","gotenks","golfgti","hawkwind","h2slca","grace1","6chid8","789654","canine","casio","cazzo","cbr900","cabrio","calypso","capetown","feline","flathead","fisherma","flipmode","fungus","g9zns4","giggle","gabriel1","fuck123","saffron","dogmeat","dreamcas","dirtydog","douche","dresden","dickdick","destiny1","pappy","oaktree","luft4","puta","ramada","trumpet1","vcradq","tulip","tracy71","tycoon","aaaaaaa1","conquest","chitown","creepers","cornhole","danman","dada","density","d9ebk7","darth","nirvana1","nestle","brenda1","bonanza","hotspur","hufmqw","electro","erasure","elisabet","etvww4","ewyuza","eric1","kenken","kismet","klaatu","milamber","willi","isacs155","igor","1million","1letmein","x35v8l","yogi","ywvxpz","xngwoj","zippy1","020202","****","stonewal","sentry","sexsexsex","sonysony","smirnoff","star12","solace","star1","pkxe62","pilot1","pommes","paulpaul","tical","tictac","lighthou","lemans","kubrick","letmein22","letmesee","jys6wz","jonesy","jjjjjj1","jigga","redstorm","riley1","14141414","1126","allison1","badboy1","asthma","auggie","hardwood","gumbo","616913","57np39","56qhxs","4mnveh","fatluvr69","fqkw5m","fidelity","feathers","fresno","godiva","gecko","gibson1","gogators","general1","saxman","rowing","sammys","scotts","scout1","sasasa","samoht","dragon69","ducky","dragonball","driller","p3wqaw","papillon","oneone","openit","optimist","longshot","rapier","pussy2","ralphie","tuxedo","undertow","copenhag","delldell","culinary","deltas","mytime","noname","noles1","bucker","bopper","burnout","ibilltes","hihje863","hitter","ekim","espana","eatme69","elpaso","express1","eeeeee1","eatme1","karaoke","mustang5","wellingt","willem","waterski","webcam","jasons","infinite","iloveyou!","jakarta","belair","bigdad","beerme","yoshi","yinyang","x24ik3","063dyjuy","0000007","ztmfcq","stopit","stooges","symow8","strato","2hot4u","skins","shakes","sex1","snacks","softtail","slimed123","pizzaman","tigercat","tonton","lager","lizzy","juju","john123","jesse1","jingles","martian","mario1","rootedit","rochard","redwine","requiem","riverrat","1117","1014","1205","amor","amiga","alpina","atreides","banana1","bahamut","golfman","happines","7uftyx","5432","5353","5151","4747","foxfire","ffvdj474","foreskin","gayboy","gggggg1","gameover","glitter","funny1","scoobydoo","saxophon","dingbat","digimon","omicron","panda1","loloxx","macintos","lululu","lollypop","racer1","queen1","qwertzui","upnfmc","tyrant","trout1","9skw5g","aceman","acls2h","aaabbb","acapulco","aggie","comcast","cloudy","cq2kph","d6o8pm","cybersex","davecole","darian","crumbs","davedave","dasani","mzepab","myporn","narnia","booger1","bravo1","budgie","btnjey","highlander","hotel6","humbug","ewtosi","kristin1","kobe","knuckles","keith1","katarina","muff","muschi","montana1","wingchun","wiggle","whatthe","vette1","vols","virago","intj3a","ishmael","jachin","illmatic","199999","2010","blender","bigpenis","bengal","blue1234","zaqxsw","xray","xxxxxxx1","zebras","yanks","tadpole","stripes","3737","4343","3728","4444444","368ejhih","solar","sonne","sniffer","sonata","squirts","playstation","pktmxr","pescator","texaco","lesbos","l8v53x","jo9k2jw2","jimbeam","jimi","jupiter2","jurassic","marines1","rocket1","14725836","12345679","1219","123098","1233","alessand","althor","arch","alpha123","basher","barefeet","balboa","bbbbb1","badabing","gopack","golfnut","gsxr1000","gregory1","766rglqy","8520","753159","8dihc6","69camaro","666777","cheeba","chino","cheeky","camel1","fishcake","flubber","gianni","gnasher23","frisbee","fuzzy1","fuzzball","save13tx","russell1","sandra1","scrotum","scumbag","sabre","samdog","dripping","dragon12","dragster","orwell","mainland","maine","qn632o","poophead","rapper","porn4life","rapunzel","velocity","vanessa1","trueblue","vampire1","abacus","902100","crispy","chooch","d6wnro","dabulls","dehpye","navyseal","njqcw4","nownow","nigger1","nightowl","nonenone","nightmar","bustle","buddy2","boingo","bugman","bosshog","hybrid","hillside","hilltop","hotlegs","hzze929b","hhhhh1","hellohel","evilone","edgewise","e5pftu","eded","embalmer","excalibur","elefant","kenzie","killah","kleenex","mouses","mounta1n","motors","mutley","muffdive","vivitron","w00t88","iloveit","jarjar","incest","indycar","17171717","1664","17011701","222777","2663","beelch","benben","yitbos","yyyyy1","zzzzz1","stooge","tangerin","taztaz","stewart1","summer69","system1","surveyor","stirling","3qvqod","3way","456321","sizzle","simhrq","sparty","ssptx452","sphere","persian","ploppy","pn5jvw","poobear","pianos","plaster","testme","tiff","thriller","master12","rockey","1229","1217","1478","1009","anastasi","amonra","argentin","albino","azazel","grinder","6uldv8","83y6pv","8888888","4tlved","515051","carsten","flyers88","ffffff1","firehawk","firedog","flashman","ggggg1","godspeed","galway","giveitup","funtimes","gohan","giveme","geryfe","frenchie","sayang","rudeboy","sandals","dougal","drag0n","dga9la","desktop","onlyone","otter","pandas","mafia","luckys","lovelife","manders","qqh92r","qcmfd454","radar1","punani","ptbdhw","turtles","undertaker","trs8f7","ugejvp","abba","911turbo","acdc","abcd123","crash1","colony","delboy","davinci","notebook","nitrox","borabora","bonzai","brisbane","heeled","hooyah","hotgirl","i62gbq","horse1","hpk2qc","epvjb6","mnbvc","mommy1","munster","wiccan","2369","bettyboo","blondy","bismark","beanbag","bjhgfi","blackice","yvtte545","ynot","yess","zlzfrh","wolvie","007bond","******","tailgate","tanya1","sxhq65","stinky1","3234412","3ki42x","seville","shimmer","sienna","shitshit","skillet","sooners1","solaris","smartass","pedros","pennywis","pfloyd","tobydog","thetruth","letme1n","mario66","micky","rocky2","rewq","reindeer","1128","1207","1104","1432","aprilia","allstate","bagels","baggies","barrage","guru","72d5tn","606060","4wcqjn","chance1","flange","fartman","geil","gbhcf2","fussball","fuaqz4","gameboy","geneviev","rotary","seahawk","saab","samadams","devlt4","ditto","drevil","drinker","deuce","dipstick","octopus","ottawa","losangel","loverman","porky","q9umoz","rapture","pussy4me","triplex","ue8fpw","turbos","aaa340","churchil","crazyman","cutiepie","ddddd1","dejavu","cuxldv","nbvibt","nikon","niko","nascar1","bubba2","boobear","boogers","bullwink","bulldawg","horsemen","escalade","eagle2","dynamic","efyreg","minnesot","mogwai","msnxbi","mwq6qlzo","werder","verygood","voodoo1","iiiiii1","159951","1624","1911a1","2244","bellagio","bedlam","belkin","bill1","xirt2k","??????","susieq","sundown","sukebe","swifty","2fast4u","sexe","shroom","seaweed","skeeter1","snicker","spanky1","spook","phaedrus","pilots","peddler","thumper1","tiger7","tmjxn151","thematri","l2g7k3","letmeinn","jeffjeff","johnmish","mantra","mike69","mazda6","riptide","robots","1107","1130","142857","11001001","1134","armored","allnight","amatuers","bartok","astral","baboon","balls1","bassoon","hcleeb","happyman","granite","graywolf","golf1","gomets","8vjzus","7890","789123","8uiazp","5757","474jdvff","551scasi","50cent","camaro1","cherry1","chemist","firenze","fishtank","freewill","glendale","frogfrog","ganesh","scirocco","devilman","doodles","okinawa","olympic","orpheus","ohmygod","paisley","pallmall","lunchbox","manhatta","mahalo","mandarin","qwqwqw","qguvyt","pxx3eftp","rambler","poppy1","turk182","vdlxuc","tugboat","valiant","uwrl7c","chris123","cmfnpu","decimal","debbie1","dandy","daedalus","natasha1","nissan1","nancy123","nevermin","napalm","newcastle","bonghit","ibxnsm","hhhhhh1","holger","edmonton","equinox","dvader","kimmy","knulla","mustafa","monsoon","mistral","morgana","monica1","mojave","monterey","mrbill","vkaxcs","victor1","violator","vfdhif","wilson1","wavpzt","wildstar","winter99","iqzzt580","imback","1914","19741974","1monkey","1q2w3e4r5t","2500","2255","bigshow","bigbucks","blackcoc","zoomer","wtcacq","wobble","xmen","xjznq5","yesterda","yhwnqc","zzzxxx","393939","2fchbg","skinhead","skilled","shadow12","seaside","sinful","silicon","smk7366","snapshot","sniper1","soccer11","smutty","peepers","plokij","pdiddy","pimpdaddy","thrust","terran","topaz","today1","lionhear","littlema","lauren1","lincoln1","lgnu9d","juneau","methos","rogue1","romulus","redshift","1202","1469","12locked","arizona1","alfarome","al9agd","aol123","altec","apollo1","arse","baker1","bbb747","axeman","astro1","hawthorn","goodfell","hawks1","gstring","hannes","8543852","868686","4ng62t","554uzpad","5401","567890","5232","catfood","fire1","flipflop","fffff1","fozzie","fluff","fzappa","rustydog","scarab","satin","ruger","samsung1","destin","diablo2","dreamer1","detectiv","doqvq3","drywall","paladin1","papabear","offroad","panasonic","nyyankee","luetdi","qcfmtz","pyf8ah","puddles","pussyeat","ralph1","princeto","trivia","trewq","tri5a3","advent","9898","agyvorc","clarkie","coach1","courier","christo","chowder","cyzkhw","davidb","dad2ownu","daredevi","de7mdf","nazgul","booboo1","bonzo","butch1","huskers1","hgfdsa","hornyman","elektra","england1","elodie","kermit1","kaboom","morten","mocha","monday1","morgoth","weewee","weenie","vorlon","wahoo","ilovegod","insider","jayman","1911","1dallas","1900","1ranger","201jedlz","2501","1qaz","bignuts","bigbad","beebee","billows","belize","wvj5np","wu4etd","yamaha1","wrinkle5","zebra1","yankee1","zoomzoom","09876543","0311","?????","stjabn","tainted","3tmnej","skooter","skelter","starlite","spice1","stacey1","smithy","pollux","peternorth","pixie","piston","poets","toons","topspin","kugm7b","legends","jeepjeep","joystick","junkmail","jojojojo","jonboy","midland","mayfair","riches","reznor","rockrock","reboot","renee1","roadway","rasta220","1411","1478963","1019","archery","andyandy","barks","bagpuss","auckland","gooseman","hazmat","gucci","grammy","happydog","7kbe9d","7676","6bjvpe","5lyedn","5858","5291","charlie2","c7lrwu","candys","chateau","ccccc1","cardinals","fihdfv","fortune12","gocats","gaelic","fwsadn","godboy","gldmeo","fx3tuo","fubar1","generals","gforce","rxmtkp","rulz","sairam","dunhill","dogggg","ozlq6qwm","ov3ajy","lockout","makayla","macgyver","mallorca","prima","pvjegu","qhxbij","prelude1","totoro","tusymo","trousers","tulane","turtle1","tracy1","aerosmit","abbey1","clticic","cooper1","comets","delpiero","cyprus","dante1","dave1","nounours","nexus6","nogard","norfolk","brent1","booyah","bootleg","bulls23","bulls1","booper","heretic","icecube","hellno","hounds","honeydew","hooters1","hoes","hevnm4","hugohugo","epson","evangeli","eeeee1","eyphed"]}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Qwerty.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Qwerty.json
deleted file mode 100644
index 23ef4df83c..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Qwerty.json
+++ /dev/null
@@ -1,756 +0,0 @@
-{
-  "Graph": {
-    "!": [
-      "`~",
-      null,
-      null,
-      "2@",
-      "qQ",
-      null
-    ],
-    "\"": [
-      ";:",
-      "[{",
-      "]}",
-      null,
-      null,
-      "/?"
-    ],
-    "#": [
-      "2@",
-      null,
-      null,
-      "4$",
-      "eE",
-      "wW"
-    ],
-    "$": [
-      "3#",
-      null,
-      null,
-      "5%",
-      "rR",
-      "eE"
-    ],
-    "%": [
-      "4$",
-      null,
-      null,
-      "6^",
-      "tT",
-      "rR"
-    ],
-    "&": [
-      "6^",
-      null,
-      null,
-      "8*",
-      "uU",
-      "yY"
-    ],
-    "'": [
-      ";:",
-      "[{",
-      "]}",
-      null,
-      null,
-      "/?"
-    ],
-    "(": [
-      "8*",
-      null,
-      null,
-      "0)",
-      "oO",
-      "iI"
-    ],
-    ")": [
-      "9(",
-      null,
-      null,
-      "-_",
-      "pP",
-      "oO"
-    ],
-    "*": [
-      "7&",
-      null,
-      null,
-      "9(",
-      "iI",
-      "uU"
-    ],
-    "+": [
-      "-_",
-      null,
-      null,
-      null,
-      "]}",
-      "[{"
-    ],
-    ",": [
-      "mM",
-      "kK",
-      "lL",
-      ".>",
-      null,
-      null
-    ],
-    "-": [
-      "0)",
-      null,
-      null,
-      "=+",
-      "[{",
-      "pP"
-    ],
-    ".": [
-      ",<",
-      "lL",
-      ";:",
-      "/?",
-      null,
-      null
-    ],
-    "/": [
-      ".>",
-      ";:",
-      "'\"",
-      null,
-      null,
-      null
-    ],
-    "0": [
-      "9(",
-      null,
-      null,
-      "-_",
-      "pP",
-      "oO"
-    ],
-    "1": [
-      "`~",
-      null,
-      null,
-      "2@",
-      "qQ",
-      null
-    ],
-    "2": [
-      "1!",
-      null,
-      null,
-      "3#",
-      "wW",
-      "qQ"
-    ],
-    "3": [
-      "2@",
-      null,
-      null,
-      "4$",
-      "eE",
-      "wW"
-    ],
-    "4": [
-      "3#",
-      null,
-      null,
-      "5%",
-      "rR",
-      "eE"
-    ],
-    "5": [
-      "4$",
-      null,
-      null,
-      "6^",
-      "tT",
-      "rR"
-    ],
-    "6": [
-      "5%",
-      null,
-      null,
-      "7&",
-      "yY",
-      "tT"
-    ],
-    "7": [
-      "6^",
-      null,
-      null,
-      "8*",
-      "uU",
-      "yY"
-    ],
-    "8": [
-      "7&",
-      null,
-      null,
-      "9(",
-      "iI",
-      "uU"
-    ],
-    "9": [
-      "8*",
-      null,
-      null,
-      "0)",
-      "oO",
-      "iI"
-    ],
-    ":": [
-      "lL",
-      "pP",
-      "[{",
-      "'\"",
-      "/?",
-      ".>"
-    ],
-    ";": [
-      "lL",
-      "pP",
-      "[{",
-      "'\"",
-      "/?",
-      ".>"
-    ],
-    "<": [
-      "mM",
-      "kK",
-      "lL",
-      ".>",
-      null,
-      null
-    ],
-    "=": [
-      "-_",
-      null,
-      null,
-      null,
-      "]}",
-      "[{"
-    ],
-    ">": [
-      ",<",
-      "lL",
-      ";:",
-      "/?",
-      null,
-      null
-    ],
-    "?": [
-      ".>",
-      ";:",
-      "'\"",
-      null,
-      null,
-      null
-    ],
-    "@": [
-      "1!",
-      null,
-      null,
-      "3#",
-      "wW",
-      "qQ"
-    ],
-    "A": [
-      null,
-      "qQ",
-      "wW",
-      "sS",
-      "zZ",
-      null
-    ],
-    "B": [
-      "vV",
-      "gG",
-      "hH",
-      "nN",
-      null,
-      null
-    ],
-    "C": [
-      "xX",
-      "dD",
-      "fF",
-      "vV",
-      null,
-      null
-    ],
-    "D": [
-      "sS",
-      "eE",
-      "rR",
-      "fF",
-      "cC",
-      "xX"
-    ],
-    "E": [
-      "wW",
-      "3#",
-      "4$",
-      "rR",
-      "dD",
-      "sS"
-    ],
-    "F": [
-      "dD",
-      "rR",
-      "tT",
-      "gG",
-      "vV",
-      "cC"
-    ],
-    "G": [
-      "fF",
-      "tT",
-      "yY",
-      "hH",
-      "bB",
-      "vV"
-    ],
-    "H": [
-      "gG",
-      "yY",
-      "uU",
-      "jJ",
-      "nN",
-      "bB"
-    ],
-    "I": [
-      "uU",
-      "8*",
-      "9(",
-      "oO",
-      "kK",
-      "jJ"
-    ],
-    "J": [
-      "hH",
-      "uU",
-      "iI",
-      "kK",
-      "mM",
-      "nN"
-    ],
-    "K": [
-      "jJ",
-      "iI",
-      "oO",
-      "lL",
-      ",<",
-      "mM"
-    ],
-    "L": [
-      "kK",
-      "oO",
-      "pP",
-      ";:",
-      ".>",
-      ",<"
-    ],
-    "M": [
-      "nN",
-      "jJ",
-      "kK",
-      ",<",
-      null,
-      null
-    ],
-    "N": [
-      "bB",
-      "hH",
-      "jJ",
-      "mM",
-      null,
-      null
-    ],
-    "O": [
-      "iI",
-      "9(",
-      "0)",
-      "pP",
-      "lL",
-      "kK"
-    ],
-    "P": [
-      "oO",
-      "0)",
-      "-_",
-      "[{",
-      ";:",
-      "lL"
-    ],
-    "Q": [
-      null,
-      "1!",
-      "2@",
-      "wW",
-      "aA",
-      null
-    ],
-    "R": [
-      "eE",
-      "4$",
-      "5%",
-      "tT",
-      "fF",
-      "dD"
-    ],
-    "S": [
-      "aA",
-      "wW",
-      "eE",
-      "dD",
-      "xX",
-      "zZ"
-    ],
-    "T": [
-      "rR",
-      "5%",
-      "6^",
-      "yY",
-      "gG",
-      "fF"
-    ],
-    "U": [
-      "yY",
-      "7&",
-      "8*",
-      "iI",
-      "jJ",
-      "hH"
-    ],
-    "V": [
-      "cC",
-      "fF",
-      "gG",
-      "bB",
-      null,
-      null
-    ],
-    "W": [
-      "qQ",
-      "2@",
-      "3#",
-      "eE",
-      "sS",
-      "aA"
-    ],
-    "X": [
-      "zZ",
-      "sS",
-      "dD",
-      "cC",
-      null,
-      null
-    ],
-    "Y": [
-      "tT",
-      "6^",
-      "7&",
-      "uU",
-      "hH",
-      "gG"
-    ],
-    "Z": [
-      null,
-      "aA",
-      "sS",
-      "xX",
-      null,
-      null
-    ],
-    "[": [
-      "pP",
-      "-_",
-      "=+",
-      "]}",
-      "'\"",
-      ";:"
-    ],
-    "\\": [
-      "]}",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "]": [
-      "[{",
-      "=+",
-      null,
-      "\\|",
-      null,
-      "'\""
-    ],
-    "^": [
-      "5%",
-      null,
-      null,
-      "7&",
-      "yY",
-      "tT"
-    ],
-    "_": [
-      "0)",
-      null,
-      null,
-      "=+",
-      "[{",
-      "pP"
-    ],
-    "`": [
-      null,
-      null,
-      null,
-      "1!",
-      null,
-      null
-    ],
-    "a": [
-      null,
-      "qQ",
-      "wW",
-      "sS",
-      "zZ",
-      null
-    ],
-    "b": [
-      "vV",
-      "gG",
-      "hH",
-      "nN",
-      null,
-      null
-    ],
-    "c": [
-      "xX",
-      "dD",
-      "fF",
-      "vV",
-      null,
-      null
-    ],
-    "d": [
-      "sS",
-      "eE",
-      "rR",
-      "fF",
-      "cC",
-      "xX"
-    ],
-    "e": [
-      "wW",
-      "3#",
-      "4$",
-      "rR",
-      "dD",
-      "sS"
-    ],
-    "f": [
-      "dD",
-      "rR",
-      "tT",
-      "gG",
-      "vV",
-      "cC"
-    ],
-    "g": [
-      "fF",
-      "tT",
-      "yY",
-      "hH",
-      "bB",
-      "vV"
-    ],
-    "h": [
-      "gG",
-      "yY",
-      "uU",
-      "jJ",
-      "nN",
-      "bB"
-    ],
-    "i": [
-      "uU",
-      "8*",
-      "9(",
-      "oO",
-      "kK",
-      "jJ"
-    ],
-    "j": [
-      "hH",
-      "uU",
-      "iI",
-      "kK",
-      "mM",
-      "nN"
-    ],
-    "k": [
-      "jJ",
-      "iI",
-      "oO",
-      "lL",
-      ",<",
-      "mM"
-    ],
-    "l": [
-      "kK",
-      "oO",
-      "pP",
-      ";:",
-      ".>",
-      ",<"
-    ],
-    "m": [
-      "nN",
-      "jJ",
-      "kK",
-      ",<",
-      null,
-      null
-    ],
-    "n": [
-      "bB",
-      "hH",
-      "jJ",
-      "mM",
-      null,
-      null
-    ],
-    "o": [
-      "iI",
-      "9(",
-      "0)",
-      "pP",
-      "lL",
-      "kK"
-    ],
-    "p": [
-      "oO",
-      "0)",
-      "-_",
-      "[{",
-      ";:",
-      "lL"
-    ],
-    "q": [
-      null,
-      "1!",
-      "2@",
-      "wW",
-      "aA",
-      null
-    ],
-    "r": [
-      "eE",
-      "4$",
-      "5%",
-      "tT",
-      "fF",
-      "dD"
-    ],
-    "s": [
-      "aA",
-      "wW",
-      "eE",
-      "dD",
-      "xX",
-      "zZ"
-    ],
-    "t": [
-      "rR",
-      "5%",
-      "6^",
-      "yY",
-      "gG",
-      "fF"
-    ],
-    "u": [
-      "yY",
-      "7&",
-      "8*",
-      "iI",
-      "jJ",
-      "hH"
-    ],
-    "v": [
-      "cC",
-      "fF",
-      "gG",
-      "bB",
-      null,
-      null
-    ],
-    "w": [
-      "qQ",
-      "2@",
-      "3#",
-      "eE",
-      "sS",
-      "aA"
-    ],
-    "x": [
-      "zZ",
-      "sS",
-      "dD",
-      "cC",
-      null,
-      null
-    ],
-    "y": [
-      "tT",
-      "6^",
-      "7&",
-      "uU",
-      "hH",
-      "gG"
-    ],
-    "z": [
-      null,
-      "aA",
-      "sS",
-      "xX",
-      null,
-      null
-    ],
-    "{": [
-      "pP",
-      "-_",
-      "=+",
-      "]}",
-      "'\"",
-      ";:"
-    ],
-    "|": [
-      "]}",
-      null,
-      null,
-      null,
-      null,
-      null
-    ],
-    "}": [
-      "[{",
-      "=+",
-      null,
-      "\\|",
-      null,
-      "'\""
-    ],
-    "~": [
-      null,
-      null,
-      null,
-      "1!",
-      null,
-      null
-    ]
-  }
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Surnames.json b/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Surnames.json
deleted file mode 100644
index 2d947b5fdf..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/data/data/Surnames.json
+++ /dev/null
@@ -1 +0,0 @@
-{"List":["smith","johnson","williams","jones","brown","davis","miller","wilson","moore","taylor","anderson","jackson","white","harris","martin","thompson","garcia","martinez","robinson","clark","rodriguez","lewis","lee","walker","hall","allen","young","hernandez","king","wright","lopez","hill","green","adams","baker","gonzalez","nelson","carter","mitchell","perez","roberts","turner","phillips","campbell","parker","evans","edwards","collins","stewart","sanchez","morris","rogers","reed","cook","morgan","bell","murphy","bailey","rivera","cooper","richardson","cox","howard","ward","torres","peterson","gray","ramirez","watson","brooks","sanders","price","bennett","wood","barnes","ross","henderson","coleman","jenkins","perry","powell","long","patterson","hughes","flores","washington","butler","simmons","foster","gonzales","bryant","alexander","griffin","diaz","hayes","myers","ford","hamilton","graham","sullivan","wallace","woods","cole","west","owens","reynolds","fisher","ellis","harrison","gibson","mcdonald","cruz","marshall","ortiz","gomez","murray","freeman","wells","webb","simpson","stevens","tucker","porter","hicks","crawford","boyd","mason","morales","kennedy","warren","dixon","ramos","reyes","burns","gordon","shaw","holmes","rice","robertson","hunt","daniels","palmer","mills","nichols","grant","ferguson","stone","hawkins","dunn","perkins","hudson","spencer","gardner","stephens","payne","pierce","berry","matthews","arnold","wagner","willis","watkins","olson","carroll","duncan","snyder","hart","cunningham","lane","andrews","ruiz","harper","fox","riley","armstrong","carpenter","weaver","greene","elliott","chavez","sims","peters","kelley","franklin","lawson","fields","gutierrez","schmidt","carr","vasquez","castillo","wheeler","chapman","oliver","montgomery","richards","williamson","johnston","banks","meyer","bishop","mccoy","howell","alvarez","morrison","hansen","fernandez","garza","burton","nguyen","jacobs","reid","fuller","lynch","garrett","romero","welch","larson","frazier","burke","hanson","mendoza","moreno","bowman","medina","fowler","brewer","hoffman","carlson","silva","pearson","holland","fleming","jensen","vargas","byrd","davidson","hopkins","may","herrera","wade","soto","walters","neal","caldwell","lowe","jennings","barnett","graves","jimenez","horton","shelton","barrett","obrien","castro","sutton","mckinney","lucas","miles","rodriquez","chambers","holt","lambert","fletcher","watts","bates","hale","rhodes","pena","beck","newman","haynes","mcdaniel","mendez","bush","vaughn","parks","dawson","santiago","norris","hardy","steele","curry","powers","schultz","barker","guzman","page","munoz","ball","keller","chandler","weber","walsh","lyons","ramsey","wolfe","schneider","mullins","benson","sharp","bowen","barber","cummings","hines","baldwin","griffith","valdez","hubbard","salazar","reeves","warner","stevenson","burgess","santos","tate","cross","garner","mann","mack","moss","thornton","mcgee","farmer","delgado","aguilar","vega","glover","manning","cohen","harmon","rodgers","robbins","newton","blair","higgins","ingram","reese","cannon","strickland","townsend","potter","goodwin","walton","rowe","hampton","ortega","patton","swanson","goodman","maldonado","yates","becker","erickson","hodges","rios","conner","adkins","webster","malone","hammond","flowers","cobb","moody","quinn","pope","osborne","mccarthy","guerrero","estrada","sandoval","gibbs","gross","fitzgerald","stokes","doyle","saunders","wise","colon","gill","alvarado","greer","padilla","waters","nunez","ballard","schwartz","mcbride","houston","christensen","klein","pratt","briggs","parsons","mclaughlin","zimmerman","french","buchanan","moran","copeland","pittman","brady","mccormick","holloway","brock","poole","logan","bass","marsh","drake","wong","jefferson","park","morton","abbott","sparks","norton","huff","massey","figueroa","carson","bowers","roberson","barton","tran","lamb","harrington","boone","cortez","clarke","mathis","singleton","wilkins","cain","underwood","hogan","mckenzie","collier","luna","phelps","mcguire","bridges","wilkerson","nash","summers","atkins","wilcox","pitts","conley","marquez","burnett","cochran","chase","davenport","hood","gates","ayala","sawyer","vazquez","dickerson","hodge","acosta","flynn","espinoza","nicholson","monroe","morrow","whitaker","oconnor","skinner","ware","molina","kirby","huffman","gilmore","dominguez","oneal","lang","combs","kramer","hancock","gallagher","gaines","shaffer","short","wiggins","mathews","mcclain","fischer","wall","small","melton","hensley","bond","dyer","grimes","contreras","wyatt","baxter","snow","mosley","shepherd","larsen","hoover","beasley","petersen","whitehead","meyers","garrison","shields","horn","savage","olsen","schroeder","hartman","woodard","mueller","kemp","deleon","booth","patel","calhoun","wiley","eaton","cline","navarro","harrell","humphrey","parrish","duran","hutchinson","hess","dorsey","bullock","robles","beard","dalton","avila","rich","blackwell","york","johns","blankenship","trevino","salinas","campos","pruitt","callahan","montoya","hardin","guerra","mcdowell","stafford","gallegos","henson","wilkinson","booker","merritt","atkinson","orr","decker","hobbs","tanner","knox","pacheco","stephenson","glass","rojas","serrano","marks","hickman","english","sweeney","strong","mcclure","conway","roth","maynard","farrell","lowery","hurst","nixon","weiss","trujillo","ellison","sloan","juarez","winters","mclean","boyer","villarreal","mccall","gentry","carrillo","ayers","lara","sexton","pace","hull","leblanc","browning","velasquez","leach","chang","sellers","herring","noble","foley","bartlett","mercado","landry","durham","walls","barr","mckee","bauer","rivers","bradshaw","pugh","velez","rush","estes","dodson","morse","sheppard","weeks","camacho","bean","barron","livingston","middleton","spears","branch","blevins","chen","kerr","mcconnell","hatfield","harding","solis","frost","giles","blackburn","pennington","woodward","finley","mcintosh","koch","mccullough","blanchard","rivas","brennan","mejia","kane","benton","buckley","valentine","maddox","russo","mcknight","buck","moon","mcmillan","crosby","berg","dotson","mays","roach","church","chan","richmond","meadows","faulkner","oneill","knapp","kline","ochoa","jacobson","gay","hendricks","horne","shepard","hebert","cardenas","mcintyre","waller","holman","donaldson","cantu","morin","gillespie","fuentes","tillman","bentley","peck","key","salas","rollins","gamble","dickson","battle","santana","cabrera","cervantes","howe","hinton","hurley","spence","zamora","yang","mcneil","suarez","petty","gould","mcfarland","sampson","carver","bray","macdonald","stout","hester","melendez","dillon","farley","hopper","galloway","potts","joyner","stein","aguirre","osborn","mercer","bender","franco","rowland","sykes","pickett","sears","mayo","dunlap","hayden","wilder","mckay","coffey","mccarty","ewing","cooley","vaughan","bonner","cotton","holder","stark","ferrell","cantrell","fulton","lott","calderon","pollard","hooper","burch","mullen","fry","riddle","levy","odonnell","britt","daugherty","berger","dillard","alston","frye","riggs","chaney","odom","duffy","fitzpatrick","valenzuela","mayer","alford","mcpherson","acevedo","barrera","cote","reilly","compton","mooney","mcgowan","craft","clemons","wynn","nielsen","baird","stanton","snider","rosales","bright","witt","hays","holden","rutledge","kinney","clements","castaneda","slater","hahn","burks","delaney","pate","lancaster","sharpe","whitfield","talley","macias","burris","ratliff","mccray","madden","kaufman","goff","cash","bolton","mcfadden","levine","byers","kirkland","kidd","workman","carney","mcleod","holcomb","england","finch","sosa","haney","franks","sargent","nieves","downs","rasmussen","bird","hewitt","foreman","valencia","oneil","delacruz","vinson","dejesus","hyde","forbes","gilliam","guthrie","wooten","huber","barlow","boyle","mcmahon","buckner","rocha","puckett","langley","knowles","cooke","velazquez","whitley","vang","shea","rouse","hartley","mayfield","elder","rankin","hanna","cowan","lucero","arroyo","slaughter","haas","oconnell","minor","boucher","archer","boggs","dougherty","andersen","newell","crowe","wang","friedman","bland","swain","holley","pearce","childs","yarbrough","galvan","proctor","meeks","lozano","mora","rangel","bacon","villanueva","schaefer","rosado","helms","boyce","goss","stinson","lake","ibarra","hutchins","covington","crowley","hatcher","mackey","bunch","womack","polk","dodd","childress","childers","camp","villa","dye","springer","mahoney","dailey","belcher","lockhart","griggs","costa","brandt","walden","moser","tatum","mccann","akers","lutz","pryor","orozco","mcallister","lugo","davies","shoemaker","rutherford","newsome","magee","chamberlain","blanton","simms","godfrey","flanagan","crum","cordova","escobar","downing","sinclair","donahue","krueger","mcginnis","gore","farris","webber","corbett","andrade","starr","lyon","yoder","hastings","mcgrath","spivey","krause","harden","crabtree","kirkpatrick","arrington","ritter","mcghee","bolden","maloney","gagnon","dunbar","ponce","pike","mayes","beatty","mobley","kimball","butts","montes","eldridge","braun","hamm","gibbons","moyer","manley","herron","plummer","elmore","cramer","rucker","pierson","fontenot","field","rubio","goldstein","elkins","wills","novak","hickey","worley","gorman","katz","dickinson","broussard","woodruff","crow","britton","nance","lehman","bingham","zuniga","whaley","shafer","coffman","steward","delarosa","nix","neely","mata","davila","mccabe","kessler","hinkle","welsh","pagan","goldberg","goins","crouch","cuevas","quinones","mcdermott","hendrickson","samuels","denton","bergeron","lam","ivey","locke","haines","snell","hoskins","byrne","arias","roe","corbin","beltran","chappell","downey","dooley","tuttle","couch","payton","mcelroy","crockett","groves","cartwright","dickey","mcgill","dubois","muniz","tolbert","dempsey","cisneros","sewell","latham","vigil","tapia","rainey","norwood","stroud","meade","tipton","kuhn","hilliard","bonilla","teague","gunn","greenwood","correa","reece","poe","pineda","phipps","frey","kaiser","ames","gunter","schmitt","milligan","espinosa","bowden","vickers","lowry","pritchard","costello","piper","mcclellan","lovell","sheehan","hatch","dobson","singh","jeffries","hollingsworth","sorensen","meza","fink","donnelly","burrell","tomlinson","colbert","billings","ritchie","helton","sutherland","peoples","mcqueen","thomason","givens","crocker","vogel","robison","dunham","coker","swartz","keys","ladner","richter","hargrove","edmonds","brantley","albright","murdock","boswell","muller","quintero","padgett","kenney","daly","connolly","inman","quintana","lund","barnard","villegas","simons","land","huggins","tidwell","sanderson","bullard","mcclendon","duarte","draper","marrero","dwyer","abrams","stover","goode","fraser","crews","bernal","godwin","conklin","mcneal","baca","esparza","crowder","bower","brewster","mcneill","rodrigues","leal","coates","raines","mccain","mccord","miner","holbrook","swift","dukes","carlisle","aldridge","ackerman","starks","ricks","holliday","ferris","hairston","sheffield","lange","fountain","doss","betts","kaplan","carmichael","bloom","ruffin","penn","kern","bowles","sizemore","larkin","dupree","seals","metcalf","hutchison","henley","farr","mccauley","hankins","gustafson","curran","ash","waddell","ramey","cates","pollock","cummins","messer","heller","lin","funk","cornett","palacios","galindo","cano","hathaway","singer","pham","enriquez","salgado","pelletier","painter","wiseman","blount","feliciano","temple","houser","doherty","mead","mcgraw","swan","capps","blanco","blackmon","thomson","mcmanus","burkett","post","gleason","ott","dickens","cormier","voss","rushing","rosenberg","hurd","dumas","benitez","arellano","marin","caudill","bragg","jaramillo","huerta","gipson","colvin","biggs","vela","platt","cassidy","tompkins","mccollum","dolan","daley","crump","sneed","kilgore","grove","grimm","davison","brunson","prater","marcum","devine","stratton","rosas","choi","tripp","ledbetter","hightower","feldman","epps","yeager","posey","scruggs","cope","stubbs","richey","overton","trotter","sprague","cordero","butcher","stiles","burgos","woodson","horner","bassett","purcell","haskins","akins","ziegler","spaulding","hadley","grubbs","sumner","murillo","zavala","shook","lockwood","driscoll","dahl","thorpe","redmond","putnam","mcwilliams","mcrae","romano","joiner","sadler","hedrick","hager","hagen","fitch","coulter","thacker","mansfield","langston","guidry","ferreira","corley","conn","rossi","lackey","baez","saenz","mcnamara","mcmullen","mckenna","mcdonough","link","engel","browne","roper","peacock","eubanks","drummond","stringer","pritchett","parham","mims","landers","ham","grayson","schafer","egan","timmons","ohara","keen","hamlin","finn","cortes","mcnair","nadeau","moseley","michaud","rosen","oakes","kurtz","jeffers","calloway","beal","bautista","winn","suggs","stern","stapleton","lyles","laird","montano","dawkins","hagan","goldman","bryson","barajas","lovett","segura","metz","lockett","langford","hinson","eastman","hooks","smallwood","shapiro","crowell","whalen","triplett","chatman","aldrich","cahill","youngblood","ybarra","stallings","sheets","reeder","connelly","bateman","abernathy","winkler","wilkes","masters","hackett","granger","gillis","schmitz","sapp","napier","souza","lanier","gomes","weir","otero","ledford","burroughs","babcock","ventura","siegel","dugan","bledsoe","atwood","wray","varner","spangler","anaya","staley","kraft","fournier","belanger","wolff","thorne","bynum","burnette","boykin","swenson","purvis","pina","khan","duvall","darby","xiong","kauffman","healy","engle","benoit","valle","steiner","spicer","shaver","randle","lundy","dow","chin","calvert","staton","neff","kearney","darden","oakley","medeiros","mccracken","crenshaw","block","perdue","dill","whittaker","tobin","washburn","hogue","goodrich","easley","bravo","dennison","shipley","kerns","jorgensen","crain","villalobos","maurer","longoria","keene","coon","witherspoon","staples","pettit","kincaid","eason","madrid","echols","lusk","stahl","currie","thayer","shultz","mcnally","seay","north","maher","gagne","barrow","nava","moreland","honeycutt","hearn","diggs","caron","whitten","westbrook","stovall","ragland","munson","meier","looney","kimble","jolly","hobson","goddard","culver","burr","presley","negron","connell","tovar","huddleston","ashby","salter","root","pendleton","oleary","nickerson","myrick","judd","jacobsen","bain","adair","starnes","matos","busby","herndon","hanley","bellamy","doty","bartley","yazzie","rowell","parson","gifford","cullen","christiansen","benavides","barnhart","talbot","mock","crandall","connors","bonds","whitt","gage","bergman","arredondo","addison","lujan","dowdy","jernigan","huynh","bouchard","dutton","rhoades","ouellette","kiser","herrington","hare","blackman","babb","allred","rudd","paulson","ogden","koenig","geiger","begay","parra","lassiter","hawk","esposito","cho","waldron","ransom","prather","chacon","vick","sands","roark","parr","mayberry","greenberg","coley","bruner","whitman","skaggs","shipman","leary","hutton","romo","medrano","ladd","kruse","askew","schulz","alfaro","tabor","mohr","gallo","bermudez","pereira","bliss","reaves","flint","comer","woodall","naquin","guevara","delong","carrier","pickens","brand","tilley","schaffer","lim","knutson","fenton","doran","chu","vogt","vann","prescott","mclain","landis","corcoran","zapata","hyatt","hemphill","faulk","dove","boudreaux","aragon","whitlock","trejo","tackett","shearer","saldana","hanks","mckinnon","koehler","bourgeois","keyes","goodson","foote","lunsford","goldsmith","flood","winslow","sams","reagan","mccloud","hough","esquivel","naylor","loomis","coronado","ludwig","braswell","bearden","fagan","ezell","edmondson","cyr","cronin","nunn","lemon","guillory","grier","dubose","traylor","ryder","dobbins","coyle","aponte","whitmore","smalls","rowan","malloy","cardona","braxton","borden","humphries","carrasco","ruff","metzger","huntley","hinojosa","finney","madsen","hills","ernst","dozier","burkhart","bowser","peralta","daigle","whittington","sorenson","saucedo","roche","redding","fugate","avalos","waite","lind","huston","hay","hawthorne","hamby","boyles","boles","regan","faust","crook","beam","barger","hinds","gallardo","willoughby","willingham","eckert","busch","zepeda","worthington","tinsley","hoff","hawley","carmona","varela","rector","newcomb","kinsey","dube","whatley","ragsdale","bernstein","becerra","yost","mattson","felder","cheek","handy","grossman","gauthier","escobedo","braden","beckman","mott","hillman","flaherty","dykes","doe","stockton","stearns","lofton","coats","cavazos","beavers","barrios","parish","mosher","cardwell","coles","burnham","weller","lemons","beebe","aguilera","parnell","harman","couture","alley","schumacher","redd","dobbs","blum","blalock","merchant","ennis","denson","cottrell","brannon","bagley","aviles","watt","sousa","rosenthal","rooney","dietz","blank","paquette","mcclelland","duff","velasco","lentz","grubb","burrows","barbour","ulrich","shockley","rader","beyer","mixon","layton","altman","weathers","stoner","squires","shipp","priest","lipscomb","cutler","caballero","zimmer","willett","thurston","storey","medley","epperson","shah","mcmillian","baggett","torrez","laws","hirsch","dent","poirier","peachey","farrar","creech","barth","trimble","dupre","albrecht","sample","lawler","crisp","conroy","wetzel","nesbitt","murry","jameson","wilhelm","patten","minton","matson","kimbrough","iverson","guinn","croft","toth","pulliam","nugent","newby","littlejohn","dias","canales","bernier","baron","singletary","renteria","pruett","mchugh","mabry","landrum","brower","stoddard","cagle","stjohn","scales","kohler","kellogg","hopson","gant","tharp","gann","zeigler","pringle","hammons","fairchild","deaton","chavis","carnes","rowley","matlock","kearns","irizarry","carrington","starkey","lopes","jarrell","craven","baum","spain","littlefield","linn","humphreys","etheridge","cuellar","chastain","bundy","speer","skelton","quiroz","pyle","portillo","ponder","moulton","machado","liu","killian","hutson","hitchcock","dowling","cloud","burdick","spann","pedersen","levin","leggett","hayward","hacker","dietrich","beaulieu","barksdale","wakefield","snowden","briscoe","bowie","berman","ogle","mcgregor","laughlin","helm","burden","wheatley","schreiber","pressley","parris","alaniz","agee","urban","swann","snodgrass","schuster","radford","monk","mattingly","harp","girard","cheney","yancey","wagoner","ridley","lombardo","lau","hudgins","gaskins","duckworth","coe","coburn","willey","prado","newberry","magana","hammonds","elam","whipple","slade","serna","ojeda","liles","dorman","diehl","upton","reardon","michaels","goetz","eller","bauman","baer","layne","hummel","brenner","amaya","adamson","ornelas","dowell","cloutier","castellanos","wing","wellman","saylor","orourke","moya","montalvo","kilpatrick","durbin","shell","oldham","garvin","foss","branham","bartholomew","templeton","maguire","holton","rider","monahan","mccormack","beaty","anders","streeter","nieto","nielson","moffett","lankford","keating","heck","gatlin","delatorre","callaway","adcock","worrell","unger","robinette","nowak","jeter","brunner","steen","parrott","overstreet","nobles","montanez","clevenger","brinkley","trahan","quarles","pickering","pederson","jansen","grantham","gilchrist","crespo","aiken","schell","schaeffer","lorenz","leyva","harms","dyson","wallis","pease","leavitt","cavanaugh","batts","warden","seaman","rockwell","quezada","paxton","linder","houck","fontaine","durant","caruso","adler","pimentel","mize","lytle","cleary","cason","acker","switzer","isaacs","higginbotham","han","waterman","vandyke","stamper","sisk","shuler","riddick","mcmahan","levesque","hatton","bronson","bollinger","arnett","okeefe","gerber","gannon","farnsworth","baughman","silverman","satterfield","mccrary","kowalski","grigsby","greco","cabral","trout","rinehart","mahon","linton","gooden","curley","baugh","wyman","weiner","schwab","schuler","morrissey","mahan","bunn","thrasher","spear","waggoner","qualls","purdy","mcwhorter","mauldin","gilman","perryman","newsom","menard","martino","graf","billingsley","artis","simpkins","salisbury","quintanilla","gilliland","fraley","foust","crouse","scarborough","ngo","grissom","fultz","marlow","markham","madrigal","lawton","barfield","whiting","varney","schwarz","gooch","arce","wheat","truong","poulin","hurtado","selby","gaither","fortner","culpepper","coughlin","brinson","boudreau","barkley","bales","stepp","holm","tan","schilling","morrell","kahn","heaton","gamez","causey","turpin","shanks","schrader","meek","isom","hardison","carranza","yanez","scroggins","schofield","runyon","ratcliff","murrell","moeller","irby","currier","butterfield","yee","ralston","pullen","pinson","estep","carbone","hawks","ellington","casillas","spurlock","sikes","motley","mccartney","kruger","isbell","houle","burk","tomlin","quigley","neumann","lovelace","fennell","cheatham","bustamante","skidmore","hidalgo","forman","culp","bowens","betancourt","aquino","robb","rea","milner","martel","gresham","wiles","ricketts","dowd","collazo","bostic","blakely","sherrod","kenyon","gandy","ebert","deloach","allard","sauer","robins","olivares","gillette","chestnut","bourque","paine","hite","hauser","devore","crawley","chapa","talbert","poindexter","meador","mcduffie","mattox","kraus","harkins","choate","wren","sledge","sanborn","kinder","geary","cornwell","barclay","abney","seward","rhoads","howland","fortier","benner","vines","tubbs","troutman","rapp","mccurdy","deluca","westmoreland","havens","guajardo","ely","clary","seal","meehan","herzog","guillen","ashcraft","waugh","renner","milam","elrod","churchill","breaux","bolin","asher","windham","tirado","pemberton","nolen","noland","knott","emmons","cornish","christenson","brownlee","barbee","waldrop","pitt","olvera","lombardi","gruber","gaffney","eggleston","banda","archuleta","slone","prewitt","pfeiffer","nettles","mena","mcadams","henning","gardiner","cromwell","chisholm","burleson","vest","oglesby","mccarter","lumpkin","grey","wofford","vanhorn","thorn","teel","swafford","stclair","stanfield","ocampo","herrmann","hannon","arsenault","roush","mcalister","hiatt","gunderson","forsythe","duggan","delvalle","cintron","wilks","weinstein","uribe","rizzo","noyes","mclendon","gurley","bethea","winstead","maples","guyton","giordano","alderman","valdes","polanco","pappas","lively","grogan","griffiths","arevalo","whitson","sowell","rendon","fernandes","farrow","benavidez","ayres","alicea","stump","smalley","seitz","schulte","gilley","gallant","canfield","wolford","omalley","mcnutt","mcnulty","mcgovern","hardman","harbin","cowart","chavarria","brink","beckett","bagwell","armstead","anglin","abreu","reynoso","krebs","jett","hoffmann","greenfield","forte","burney","broome","sisson","trammell","partridge","mace","lomax","lemieux","gossett","frantz","fogle","cooney","broughton","pence","paulsen","muncy","mcarthur","hollins","beauchamp","withers","osorio","mulligan","hoyle","foy","dockery","cockrell","begley","amador","roby","rains","lindquist","gentile","everhart","bohannon","wylie","sommers","purnell","fortin","dunning","breeden","vail","phelan","phan","marx","cosby","colburn","boling","biddle","ledesma","gaddis","denney","chow","bueno","berrios","wicker","tolliver","thibodeaux","nagle","lavoie","fisk","crist","barbosa","reedy","march","locklear","kolb","himes","behrens","beckwith","weems","wahl","shorter","shackelford","rees","muse","cerda","valadez","thibodeau","saavedra","ridgeway","reiter","mchenry","majors","lachance","keaton","ferrara","clemens","blocker","applegate","paz","needham","mojica","kuykendall","hamel","escamilla","doughty","burchett","ainsworth","vidal","upchurch","thigpen","strauss","spruill","sowers","riggins","ricker","mccombs","harlow","buffington","sotelo","olivas","negrete","morey","macon","logsdon","lapointe","bigelow","bello","westfall","stubblefield","peak","lindley","hein","hawes","farrington","breen","birch","wilde","steed","sepulveda","reinhardt","proffitt","minter","messina","mcnabb","maier","keeler","gamboa","donohue","basham","shinn","crooks","cota","borders","bills","bachman","tisdale","tavares","schmid","pickard","gulley","fonseca","delossantos","condon","batista","wicks","wadsworth","martell","littleton","ison","haag","folsom","brumfield","broyles","brito","mireles","mcdonnell","leclair","hamblin","gough","fanning","binder","winfield","whitworth","soriano","palumbo","newkirk","mangum","hutcherson","comstock","carlin","beall","bair","wendt","watters","walling","putman","otoole","morley","mares","lemus","keener","hundley","dial","damico","billups","strother","mcfarlane","lamm","eaves","crutcher","caraballo","canty","atwell","taft","siler","rust","rawls","rawlings","prieto","mcneely","mcafee","hulsey","hackney","galvez","escalante","delagarza","crider","charlton","bandy","wilbanks","stowe","steinberg","renfro","masterson","massie","lanham","haskell","hamrick","fort","dehart","burdette","branson","bourne","babin","aleman","worthy","tibbs","smoot","slack","paradis","mull","luce","houghton","gantt","furman","danner","christianson","burge","ashford","arndt","almeida","stallworth","shade","searcy","sager","noonan","mclemore","mcintire","maxey","lavigne","jobe","ferrer","falk","coffin","byrnes","aranda","apodaca","stamps","rounds","peek","olmstead","lewandowski","kaminski","dunaway","bruns","brackett","amato","reich","mcclung","lacroix","koontz","herrick","hardesty","flanders","cousins","cato","cade","vickery","shank","nagel","dupuis","croteau","cotter","cable","stuckey","stine","porterfield","pauley","nye","moffitt","knudsen","hardwick","goforth","dupont","blunt","barrows","barnhill","shull","rash","loftis","lemay","kitchens","horvath","grenier","fuchs","fairbanks","culbertson","calkins","burnside","beattie","ashworth","albertson","wertz","vaught","vallejo","turk","tuck","tijerina","sage","peterman","marroquin","marr","lantz","hoang","demarco","daily","cone","berube","barnette","wharton","stinnett","slocum","scanlon","sander","pinto","mancuso","lima","headley","epstein","counts","clarkson","carnahan","boren","arteaga","adame","zook","whittle","whitehurst","wenzel","saxton","reddick","puente","handley","haggerty","earley","devlin","chaffin","cady","acuna","solano","sigler","pollack","pendergrass","ostrander","janes","francois","crutchfield","chamberlin","brubaker","baptiste","willson","reis","neeley","mullin","mercier","lira","layman","keeling","higdon","espinal","chapin","warfield","toledo","pulido","peebles","nagy","montague","mello","lear","jaeger","hogg","graff","furr","soliz","poore","mendenhall","mclaurin","maestas","gable","barraza","tillery","snead","pond","neill","mcculloch","mccorkle","lightfoot","hutchings","holloman","harness","dorn","council","bock","zielinski","turley","treadwell","stpierre","starling","somers","oswald","merrick","easterling","bivens","truitt","poston","parry","ontiveros","olivarez","moreau","medlin","lenz","knowlton","fairley","cobbs","chisolm","bannister","woodworth","toler","ocasio","noriega","neuman","moye","milburn","mcclanahan","lilley","hanes","flannery","dellinger","danielson","conti","blodgett","beers","weatherford","strain","karr","hitt","denham","custer","coble","clough","casteel","bolduc","batchelor","ammons","whitlow","tierney","staten","sibley","seifert","schubert","salcedo","mattison","laney","haggard","grooms","dix","dees","cromer","cooks","colson","caswell","zarate","swisher","shin","ragan","pridgen","mcvey","matheny","lafleur","franz","ferraro","dugger","whiteside","rigsby","mcmurray","lehmann","jacoby","hildebrand","hendrick","headrick","goad","fincher","drury","borges","archibald","albers","woodcock","trapp","soares","seaton","monson","luckett","lindberg","kopp","keeton","hsu","healey","garvey","gaddy","fain","burchfield","wentworth","strand","stack","spooner","saucier","sales","ricci","plunkett","pannell","ness","leger","hoy","freitas","fong","elizondo","duval","beaudoin","urbina","rickard","partin","moe","mcgrew","mcclintock","ledoux","forsyth","faison","devries","bertrand","wasson","tilton","scarbrough","leung","irvine","garber","denning","corral","colley","castleberry","bowlin","bogan","beale","baines","trice","rayburn","parkinson","pak","nunes","mcmillen","leahy","kimmel","higgs","fulmer","carden","bedford","taggart","spearman","register","prichard","morrill","koonce","heinz","hedges","guenther","grice","findley","dover","creighton","boothe","bayer","arreola","vitale","valles","raney","osgood","hanlon","burley","bounds","worden","weatherly","vetter","tanaka","stiltner","nevarez","mosby","montero","melancon","harter","hamer","goble","gladden","gist","ginn","akin","zaragoza","towns","tarver","sammons","royster","oreilly","muir","morehead","luster","kingsley","kelso","grisham","glynn","baumann","alves","yount","tamayo","paterson","oates","menendez","longo","hargis","gillen","desantis","breedlove","sumpter","scherer","rupp","reichert","heredia","creel","cohn","clemmons","casas","bickford","belton","bach","williford","whitcomb","tennant","sutter","stull","sessions","mccallum","langlois","keel","keegan","dangelo","dancy","damron","clapp","clanton","bankston","oliveira","mintz","mcinnis","martens","mabe","laster","jolley","hildreth","hefner","glaser","duckett","demers","brockman","blais","alcorn","agnew","toliver","tice","seeley","najera","musser","mcfall","laplante","galvin","fajardo","doan","coyne","copley","clawson","cheung","barone","wynne","woodley","tremblay","stoll","sparrow","sparkman","schweitzer","sasser","samples","roney","legg","heim","farias","colwell","christman","bratcher","winchester","upshaw","southerland","sorrell","sells","mount","mccloskey","martindale","luttrell","loveless","lovejoy","linares","latimer","embry","coombs","bratton","bostick","venable","tuggle","toro","staggs","sandlin","jefferies","heckman","griffis","crayton","clem","browder","thorton","sturgill","sprouse","royer","rousseau","ridenour","pogue","perales","peeples","metzler","mesa","mccutcheon","mcbee","hornsby","heffner","corrigan","armijo","vue","plante","peyton","paredes","macklin","hussey","hodgson","granados","frias","becnel","batten","almanza","turney","teal","sturgeon","meeker","mcdaniels","limon","keeney","kee","hutto","holguin","gorham","fishman","fierro","blanchette","rodrigue","reddy","osburn","oden","lerma","kirkwood","keefer","haugen","hammett","chalmers","brinkman","baumgartner","valerio","tellez","steffen","shumate","sauls","ripley","kemper","jacks","guffey","evers","craddock","carvalho","blaylock","banuelos","balderas","wooden","wheaton","turnbull","shuman","pointer","mosier","mccue","ligon","kozlowski","johansen","ingle","herr","briones","snipes","rickman","pipkin","pantoja","orosco","moniz","lawless","kunkel","hibbard","galarza","enos","bussey","schott","salcido","perreault","mcdougal","mccool","haight","garris","ferry","easton","conyers","atherton","wimberly","utley","spellman","smithson","slagle","ritchey","rand","petit","osullivan","oaks","nutt","mcvay","mccreary","mayhew","knoll","jewett","harwood","cardoza","ashe","arriaga","zeller","wirth","whitmire","stauffer","rountree","redden","mccaffrey","martz","larose","langdon","humes","gaskin","faber","devito","cass","almond","wingfield","wingate","villareal","tyner","smothers","severson","reno","pennell","maupin","leighton","janssen","hassell","hallman","halcomb","folse","fitzsimmons","fahey","cranford","bolen","battles","battaglia","wooldridge","trask","rosser","regalado","mcewen","keefe","fuqua","echevarria","caro","boynton","andrus","viera","vanmeter","taber","spradlin","seibert","provost","prentice","oliphant","laporte","hwang","hatchett","hass","greiner","freedman","covert","chilton","byars","wiese","venegas","swank","shrader","roberge","mullis","mortensen","mccune","marlowe","kirchner","keck","isaacson","hostetler","halverson","gunther","griswold","fenner","durden","blackwood","ahrens","sawyers","savoy","nabors","mcswain","mackay","loy","lavender","lash","labbe","jessup","fullerton","cruse","crittenden","correia","centeno","caudle","canady","callender","alarcon","ahern","winfrey","tribble","styles","salley","roden","musgrove","minnick","fortenberry","carrion","bunting","batiste","whited","underhill","stillwell","rauch","pippin","perrin","messenger","mancini","lister","kinard","hartmann","fleck","broadway","wilt","treadway","thornhill","spalding","rafferty","pitre","patino","ordonez","linkous","kelleher","homan","galbraith","feeney","curtin","coward","camarillo","buss","bunnell","bolt","beeler","autry","alcala","witte","wentz","stidham","shively","nunley","meacham","martins","lemke","lefebvre","hynes","horowitz","hoppe","holcombe","dunne","derr","cochrane","brittain","bedard","beauregard","torrence","strunk","soria","simonson","shumaker","scoggins","oconner","moriarty","kuntz","ives","hutcheson","horan","hales","garmon","fitts","bohn","atchison","wisniewski","vanwinkle","sturm","sallee","prosser","moen","lundberg","kunz","kohl","keane","jorgenson","jaynes","funderburk","freed","durr","creamer","cosgrove","batson","vanhoose","thomsen","teeter","smyth","redmon","orellana","maness","heflin","goulet","frick","forney","bunker","asbury","aguiar","talbott","southard","mowery","mears","lemmon","krieger","hickson","elston","duong","delgadillo","dayton","dasilva","conaway","catron","bruton","bradbury","bordelon","bivins","bittner","bergstrom","beals","abell","whelan","tejada","pulley","pino","norfleet","nealy","maes","loper","gatewood","frierson","freund","finnegan","cupp","covey","catalano","boehm","bader","yoon","walston","tenney","sipes","rawlins","medlock","mccaskill","mccallister","marcotte","maclean","hughey","henke","harwell","gladney","gilson","dew","chism","caskey","brandenburg","baylor","villasenor","veal","thatcher","stegall","shore","petrie","nowlin","navarrete","muhammad","lombard","loftin","lemaster","kroll","kovach","kimbrell","kidwell","hershberger","fulcher","eng","cantwell","bustos","boland","bobbitt","binkley","wester","weis","verdin","tiller","sisco","sharkey","seymore","rosenbaum","rohr","quinonez","pinkston","nation","malley","logue","lessard","lerner","lebron","krauss","klinger","halstead","haller","getz","burrow","alger","shores","pfeifer","perron","nelms","munn","mcmaster","mckenney","manns","knudson","hutchens","huskey","goebel","flagg","cushman","click","castellano","carder","bumgarner","wampler","spinks","robson","neel","mcreynolds","mathias","maas","loera","kasper","jenson","florez","coons","buckingham","brogan","berryman","wilmoth","wilhite","thrash","shephard","seidel","schulze","roldan","pettis","obryan","maki","mackie","hatley","frazer","fiore","chesser","bui","bottoms","bisson","benefield","allman","wilke","trudeau","timm","shifflett","rau","mundy","milliken","mayers","leake","kohn","huntington","horsley","hermann","guerin","fryer","frizzell","foret","flemming","fife","criswell","carbajal","bozeman","boisvert","angulo","wallen","tapp","silvers","ramsay","oshea","orta","moll","mckeever","mcgehee","linville","kiefer","ketchum","howerton","groce","gass","fusco","corbitt","betz","bartels","amaral","aiello","yoo","weddle","sperry","seiler","runyan","raley","overby","osteen","olds","mckeown","matney","lauer","lattimore","hindman","hartwell","fredrickson","fredericks","espino","clegg","carswell","cambell","burkholder","woodbury","welker","totten","thornburg","theriault","stitt","stamm","stackhouse","scholl","saxon","rife","razo","quinlan","pinkerton","olivo","nesmith","nall","mattos","lafferty","justus","giron","geer","fielder","drayton","dortch","conners","conger","boatwright","billiot","barden","armenta","tibbetts","steadman","slattery","rinaldi","raynor","pinckney","pettigrew","milne","matteson","halsey","gonsalves","fellows","durand","desimone","cowley","cowles","brill","barham","barela","barba","ashmore","withrow","valenti","tejeda","spriggs","sayre","salerno","peltier","peel","merriman","matheson","lowman","lindstrom","hyland","giroux","earls","dugas","dabney","collado","briseno","baxley","whyte","wenger","vanover","vanburen","thiel","schindler","schiller","rigby","pomeroy","passmore","marble","manzo","mahaffey","lindgren","laflamme","greathouse","fite","calabrese","bayne","yamamoto","wick","townes","thames","reinhart","peeler","naranjo","montez","mcdade","mast","markley","marchand","leeper","kellum","hudgens","hennessey","hadden","gainey","coppola","borrego","bolling","beane","ault","slaton","poland","pape","null","mulkey","lightner","langer","hillard","glasgow","ethridge","enright","derosa","baskin","weinberg","turman","somerville","pardo","noll","lashley","ingraham","hiller","hendon","glaze","cothran","cooksey","conte","carrico","abner","wooley","swope","summerlin","sturgis","sturdivant","stott","spurgeon","spillman","speight","roussel","popp","nutter","mckeon","mazza","magnuson","lanning","kozak","jankowski","heyward","forster","corwin","callaghan","bays","wortham","usher","theriot","sayers","sabo","poling","loya","lieberman","laroche","labelle","howes","harr","garay","fogarty","everson","durkin","dominquez","chaves","chambliss","witcher","vieira","vandiver","terrill","stoker","schreiner","moorman","liddell","lew","lawhorn","krug","irons","hylton","hollenbeck","herrin","hembree","goolsby","goodin","gilmer","foltz","dinkins","daughtry","caban","brim","briley","bilodeau","wyant","vergara","tallent","swearingen","stroup","scribner","quillen","pitman","monaco","mccants","maxfield","martinson","holtz","flournoy","brookins","brody","baumgardner","straub","sills","roybal","roundtree","oswalt","mcgriff","mcdougall","mccleary","maggard","gragg","gooding","godinez","doolittle","donato","cowell","cassell","bracken","appel","zambrano","reuter","perea","nakamura","monaghan","mickens","mcclinton","mcclary","marler","kish","judkins","gilbreath","freese","flanigan","felts","erdmann","dodds","chew","brownell","boatright","barreto","slayton","sandberg","saldivar","pettway","odum","narvaez","moultrie","montemayor","merrell","lees","keyser","hoke","hardaway","hannan","gilbertson","fogg","dumont","deberry","coggins","buxton","bucher","broadnax","beeson","araujo","appleton","amundson","aguayo","ackley","yocum","worsham","shivers","sanches","sacco","robey","rhoden","pender","ochs","mccurry","madera","luong","knotts","jackman","heinrich","hargrave","gault","comeaux","chitwood","caraway","boettcher","bernhardt","barrientos","zink","wickham","whiteman","thorp","stillman","settles","schoonover","roque","riddell","pilcher","phifer","novotny","macleod","hardee","haase","grider","doucette","clausen","bevins","beamon","badillo","tolley","tindall","soule","snook","seale","pitcher","pinkney","pellegrino","nowell","nemeth","mondragon","mclane","lundgren","ingalls","hudspeth","hixson","gearhart","furlong","downes","dibble","deyoung","cornejo","camara","brookshire","boyette","wolcott","surratt","sellars","segal","salyer","reeve","rausch","labonte","haro","gower","freeland","fawcett","eads","driggers","donley","collett","bromley","boatman","ballinger","baldridge","volz","trombley","stonge","shanahan","rivard","rhyne","pedroza","matias","jamieson","hedgepeth","hartnett","estevez","eskridge","denman","chiu","chinn","catlett","carmack","buie","bechtel","beardsley","bard","ballou","ulmer","skeen","robledo","rincon","reitz","piazza","munger","moten","mcmichael","loftus","ledet","kersey","groff","fowlkes","folk","crumpton","clouse","bettis","villagomez","timmerman","strom","santoro","roddy","penrod","musselman","macpherson","leboeuf","harless","haddad","guido","golding","fulkerson","fannin","dulaney","dowdell","cottle","ceja","cate","bosley","benge","albritton","voigt","trowbridge","soileau","seely","rohde","pearsall","paulk","orth","nason","mota","mcmullin","marquardt","madigan","hoag","gillum","gabbard","fenwick","eck","danforth","cushing","cress","creed","cazares","casanova","bey","bettencourt","barringer","baber","stansberry","schramm","rutter","rivero","oquendo","necaise","mouton","montenegro","miley","mcgough","marra","macmillan","lamontagne","jasso","horst","hetrick","heilman","gaytan","gall","fortney","dingle","desjardins","dabbs","burbank","brigham","breland","beaman","arriola","yarborough","wallin","toscano","stowers","reiss","pichardo","orton","michels","mcnamee","mccrory","leatherman","kell","keister","horning","hargett","guay","ferro","deboer","dagostino","carper","blanks","beaudry","towle","tafoya","stricklin","strader","soper","sonnier","sigmon","schenk","saddler","pedigo","mendes","lunn","lohr","lahr","kingsbury","jarman","hume","holliman","hofmann","haworth","harrelson","hambrick","flick","edmunds","dacosta","crossman","colston","chaplin","carrell","budd","weiler","waits","valentino","trantham","tarr","solorio","roebuck","powe","plank","pettus","palm","pagano","mink","luker","leathers","joslin","hartzell","gambrell","deutsch","cepeda","carty","caputo","brewington","bedell","ballew","applewhite","warnock","walz","urena","tudor","reel","pigg","parton","mickelson","meagher","mclellan","mcculley","mandel","leech","lavallee","kraemer","kling","kipp","kehoe","hochstetler","harriman","gregoire","grabowski","gosselin","gammon","fancher","edens","desai","brannan","armendariz","woolsey","whitehouse","whetstone","ussery","towne","testa","tallman","studer","strait","steinmetz","sorrells","sauceda","rolfe","paddock","mitchem","mcginn","mccrea","lovato","hazen","gilpin","gaynor","fike","devoe","delrio","curiel","burkhardt","bode","backus","zinn","watanabe","wachter","vanpelt","turnage","shaner","schroder","sato","riordan","quimby","portis","natale","mckoy","mccown","kilmer","hotchkiss","hesse","halbert","gwinn","godsey","delisle","chrisman","canter","arbogast","angell","acree","yancy","woolley","wesson","weatherspoon","trainor","stockman","spiller","sipe","rooks","reavis","propst","porras","neilson","mullens","loucks","llewellyn","kumar","koester","klingensmith","kirsch","kester","honaker","hodson","hennessy","helmick","garrity","garibay","fee","drain","casarez","callis","botello","aycock","avant","wingard","wayman","tully","theisen","szymanski","stansbury","segovia","rainwater","preece","pirtle","padron","mincey","mckelvey","mathes","larrabee","kornegay","klug","ingersoll","hecht","germain","eggers","dykstra","deering","decoteau","deason","dearing","cofield","carrigan","bonham","bahr","aucoin","appleby","almonte","yager","womble","wimmer","weimer","vanderpool","stancil","sprinkle","romine","remington","pfaff","peckham","olivera","meraz","maze","lathrop","koehn","hazelton","halvorson","hallock","haddock","ducharme","dehaven","caruthers","brehm","bosworth","bost","bias","beeman","basile","bane","aikens","wold","walther","tabb","suber","strawn","stocker","shirey","schlosser","riedel","rembert","reimer","pyles","peele","merriweather","letourneau","latta","kidder","hixon","hillis","hight","herbst","henriquez","haygood","hamill","gabel","fritts","eubank","dawes","correll","cha","bushey","buchholz","brotherton","botts","barnwell","auger","atchley","westphal","veilleux","ulloa","stutzman","shriver","ryals","prior","pilkington","moyers","marrs","mangrum","maddux","lockard","laing","kuhl","harney","hammock","hamlett","felker","doerr","depriest","carrasquillo","carothers","bogle","bischoff","bergen","albanese","wyckoff","vermillion","vansickle","thibault","tetreault","stickney","shoemake","ruggiero","rawson","racine","philpot","paschal","mcelhaney","mathison","legrand","lapierre","kwan","kremer","jiles","hilbert","geyer","faircloth","ehlers","egbert","desrosiers","dalrymple","cotten","cashman","cadena","breeding","boardman","alcaraz","ahn","wyrick","therrien","tankersley","strickler","puryear","plourde","pattison","pardue","mcginty","mcevoy","landreth","kuhns","koon","hewett","giddens","emerick","eades","deangelis","cosme","ceballos","birdsong","benham","bemis","armour","anguiano","welborn","tsosie","storms","shoup","sessoms","samaniego","rood","rojo","rhinehart","raby","northcutt","myer","munguia","morehouse","mcdevitt","mallett","lozada","lemoine","kuehn","hallett","grim","gillard","gaylor","garman","gallaher","feaster","faris","darrow","dardar","coney","carreon","braithwaite","boylan","boyett","bixler","bigham","benford","barragan","barnum","zuber","wyche","westcott","vining","stoltzfus","simonds","shupe","sabin","ruble","rittenhouse","richman","perrone","mulholland","millan","lomeli","kite","jemison","hulett","holler","hickerson","herold","hazelwood","griffen","gause","forde","eisenberg","dilworth","charron","chaisson","brodie","bristow","breunig","brace","boutwell","bentz","belk","bayless","batchelder","baran","baeza","zimmermann","weathersby","volk","toole","theis","tedesco","searle","schenck","satterwhite","ruelas","rankins","partida","nesbit","morel","menchaca","levasseur","kaylor","johnstone","hulse","hollar","hersey","harrigan","harbison","guyer","gish","giese","gerlach","geller","geisler","falcone","elwell","doucet","deese","darr","corder","chafin","byler","bussell","burdett","brasher","bowe","bellinger","bastian","barner","alleyne","wilborn","weil","wegner","wales","tatro","spitzer","smithers","schoen","resendez","parisi","overman","obrian","mudd","moy","mclaren","maggio","lindner","lalonde","lacasse","laboy","killion","kahl","jessen","jamerson","houk","henshaw","gustin","graber","durst","duenas","davey","cundiff","conlon","colunga","coakley","chiles","capers","buell","bricker","bissonnette","birmingham","bartz","bagby","zayas","volpe","treece","toombs","thom","terrazas","swinney","skiles","silveira","shouse","senn","ramage","nez","moua","langham","kyles","holston","hoagland","herd","feller","denison","carraway","burford","bickel","ambriz","abercrombie","yamada","weidner","waddle","verduzco","thurmond","swindle","schrock","sanabria","rosenberger","probst","peabody","olinger","nazario","mccafferty","mcbroom","mcabee","mazur","matherne","mapes","leverett","killingsworth","heisler","griego","gosnell","frankel","franke","ferrante","fenn","ehrlich","christopherso","chasse","chancellor","caton","brunelle","bly","bloomfield","babbitt","azevedo","abramson","ables","abeyta","youmans","wozniak","wainwright","stowell","smitherman","samuelson","runge","rothman","rosenfeld","peake","owings","olmos","munro","moreira","leatherwood","larkins","krantz","kovacs","kizer","kindred","karnes","jaffe","hubbell","hosey","hauck","goodell","erdman","dvorak","doane","cureton","cofer","buehler","bierman","berndt","banta","abdullah","warwick","waltz","turcotte","torrey","stith","seger","sachs","quesada","pinder","peppers","pascual","paschall","parkhurst","ozuna","oster","nicholls","lheureux","lavalley","kimura","jablonski","haun","gourley","gilligan","derby","croy","cotto","cargill","burwell","burgett","buckman","booher","adorno","wrenn","whittemore","urias","szabo","sayles","saiz","rutland","rael","pharr","pelkey","ogrady","nickell","musick","moats","mather","massa","kirschner","kieffer","kellar","hendershot","gott","godoy","gadson","furtado","fiedler","erskine","dutcher","dever","daggett","chevalier","brake","ballesteros","amerson","wingo","waldon","trott","silvey","showers","schlegel","rue","ritz","pepin","pelayo","parsley","palermo","moorehead","mchale","lett","kocher","kilburn","iglesias","humble","hulbert","huckaby","hix","haven","hartford","hardiman","gurney","grigg","grasso","goings","fillmore","farber","depew","dandrea","dame","cowen","covarrubias","burrus","bracy","ardoin","thompkins","standley","radcliffe","pohl","persaud","parenteau","pabon","newson","newhouse","napolitano","mulcahy","malave","keim","hooten","hernandes","heffernan","hearne","greenleaf","glick","fuhrman","fetter","faria","dishman","dickenson","crites","criss","clapper","chenault","castor","casto","bugg","bove","bonney","ard","anderton","allgood","alderson","woodman","warrick","toomey","tooley","tarrant","summerville","stebbins","sokol","searles","schutz","schumann","scheer","remillard","raper","proulx","palmore","monroy","messier","melo","melanson","mashburn","manzano","lussier","jenks","huneycutt","hartwig","grimsley","fulk","fielding","fidler","engstrom","eldred","dantzler","crandell","calder","brumley","breton","brann","bramlett","boykins","bianco","bancroft","almaraz","alcantar","whitmer","whitener","welton","vineyard","rahn","paquin","mizell","mcmillin","mckean","marston","maciel","lundquist","liggins","lampkin","kranz","koski","kirkham","jiminez","hazzard","harrod","graziano","grammer","gendron","garrido","fordham","englert","dryden","demoss","deluna","crabb","comeau","brummett","blume","benally","wessel","vanbuskirk","thorson","stumpf","stockwell","reams","radtke","rackley","pelton","niemi","newland","nelsen","morrissette","miramontes","mcginley","mccluskey","marchant","luevano","lampe","lail","jeffcoat","infante","hinman","gaona","erb","eady","desmarais","decosta","dansby","choe","breckenridge","bostwick","borg","bianchi","alberts","wilkie","whorton","vargo","tait","soucy","schuman","ousley","mumford","lum","lippert","leath","lavergne","laliberte","kirksey","kenner","johnsen","izzo","hiles","gullett","greenwell","gaspar","galbreath","gaitan","ericson","delapaz","croom","cottingham","clift","bushnell","bice","beason","arrowood","waring","voorhees","truax","shreve","shockey","schatz","sandifer","rubino","rozier","roseberry","pieper","peden","nester","nave","murphey","malinowski","macgregor","lafrance","kunkle","kirkman","hipp","hasty","haddix","gervais","gerdes","gamache","fouts","fitzwater","dillingham","deming","deanda","cedeno","cannady","burson","bouldin","arceneaux","woodhouse","whitford","wescott","welty","weigel","torgerson","toms","surber","sunderland","sterner","setzer","riojas","pumphrey","puga","metts","mcgarry","mccandless","magill","lupo","loveland","llamas","leclerc","koons","kahler","huss","holbert","heintz","haupt","grimmett","gaskill","ellingson","dorr","dingess","deweese","desilva","crossley","cordeiro","converse","conde","caldera","cairns","burmeister","burkhalter","brawner","bott","youngs","vierra","valladares","shrum","shropshire","sevilla","rusk","rodarte","pedraza","nino","merino","mcminn","markle","mapp","lajoie","koerner","kittrell","kato","hyder","hollifield","heiser","hazlett","greenwald","fant","eldredge","dreher","delafuente","cravens","claypool","beecher","aronson","alanis","worthen","wojcik","winger","whitacre","wellington","valverde","valdivia","troupe","thrower","swindell","suttles","suh","stroman","spires","slate","shealy","sarver","sartin","sadowski","rondeau","rolon","rascon","priddy","paulino","nolte","munroe","molloy","mciver","lykins","loggins","lenoir","klotz","kempf","hupp","hollowell","hollander","haynie","harkness","harker","gottlieb","frith","eddins","driskell","doggett","densmore","charette","cassady","byrum","burcham","buggs","benn","whitted","warrington","vandusen","vaillancourt","steger","siebert","scofield","quirk","purser","plumb","orcutt","nordstrom","mosely","michalski","mcphail","mcdavid","mccraw","marchese","mannino","lefevre","largent","lanza","kress","isham","hunsaker","hoch","hildebrandt","guarino","grijalva","graybill","ewell","ewald","cusick","crumley","coston","cathcart","carruthers","bullington","bowes","blain","blackford","barboza","yingling","weiland","varga","silverstein","sievers","shuster","shumway","runnels","rumsey","renfroe","provencher","polley","mohler","middlebrooks","kutz","koster","groth","glidden","fazio","deen","chipman","chenoweth","champlin","cedillo","carrero","carmody","buckles","brien","boutin","bosch","berkowitz","altamirano","wilfong","wiegand","waites","truesdale","toussaint","tobey","tedder","steelman","sirois","schnell","robichaud","richburg","plumley","pizarro","piercy","ortego","oberg","neace","mertz","mcnew","matta","lapp","lair","kibler","howlett","hollister","hofer","hatten","hagler","falgoust","engelhardt","eberle","dombrowski","dinsmore","daye","casares","braud","balch","autrey","wendel","tyndall","strobel","stoltz","spinelli","serrato","rochester","reber","rathbone","palomino","nickels","mayle","mathers","mach","loeffler","littrell","levinson","leong","lemire","lejeune","lazo","lasley","koller","kennard","hoelscher","hintz","hagerman","greaves","fore","eudy","engler","corrales","cordes","brunet","bidwell","bennet","tyrrell","tharpe","swinton","stribling","southworth","sisneros","savoie","samons","ruvalcaba","ries","ramer","omara","mosqueda","millar","mcpeak","macomber","luckey","litton","lehr","lavin","hubbs","hoard","hibbs","hagans","futrell","exum","evenson","culler","carbaugh","callen","brashear","bloomer","blakeney","bigler","addington","woodford","unruh","tolentino","sumrall","stgermain","smock","sherer","rayner","pooler","oquinn","nero","mcglothlin","linden","kowal","kerrigan","ibrahim","harvell","hanrahan","goodall","geist","fussell","fung","ferebee","eley","eggert","dorsett","dingman","destefano","colucci","clemmer","burnell","brumbaugh","boddie","berryhill","avelar","alcantara","winder","winchell","vandenberg","trotman","thurber","thibeault","stlouis","stilwell","sperling","shattuck","sarmiento","ruppert","rumph","renaud","randazzo","rademacher","quiles","pearman","palomo","mercurio","lowrey","lindeman","lawlor","larosa","lander","labrecque","hovis","holifield","henninger","hawkes","hartfield","hann","hague","genovese","garrick","fudge","frink","eddings","dinh","cribbs","calvillo","bunton","brodeur","bolding","blanding","agosto","zahn","wiener","trussell","tew","tello","teixeira","speck","sharma","shanklin","sealy","scanlan","santamaria","roundy","robichaux","ringer","rigney","prevost","polson","nord","moxley","medford","mccaslin","mcardle","macarthur","lewin","lasher","ketcham","keiser","heine","hackworth","grose","grizzle","gillman","gartner","frazee","fleury","edson","edmonson","derry","cronk","conant","burress","burgin","broom","brockington","bolick","boger","birchfield","billington","baily","bahena","armbruster","anson","yoho","wilcher","tinney","timberlake","thoma","thielen","sutphin","stultz","sikora","serra","schulman","scheffler","santillan","rego","preciado","pinkham","mickle","luu","lomas","lizotte","lent","kellerman","keil","johanson","hernadez","hartsfield","haber","gorski","farkas","eberhardt","duquette","delano","cropper","cozart","cockerham","chamblee","cartagena","cahoon","buzzell","brister","brewton","blackshear","benfield","aston","ashburn","arruda","wetmore","weise","vaccaro","tucci","sudduth","stromberg","stoops","showalter","shears","runion","rowden","rosenblum","riffle","renfrow","peres","obryant","leftwich","lark","landeros","kistler","killough","kerley","kastner","hoggard","hartung","guertin","govan","gatling","gailey","fullmer","fulford","flatt","esquibel","endicott","edmiston","edelstein","dufresne","dressler","dickman","chee","busse","bonnett","berard","arena","yoshida","velarde","veach","vanhouten","vachon","tolson","tolman","tennyson","stites","soler","shutt","ruggles","rhone","pegues","ong","neese","muro","moncrief","mefford","mcphee","mcmorris","mceachern","mcclurg","mansour","mader","leija","lecompte","lafountain","labrie","jaquez","heald","hash","hartle","gainer","frisby","farina","eidson","edgerton","dyke","durrett","duhon","cuomo","cobos","cervantez","bybee","brockway","borowski","binion","beery","arguello","amaro","acton","yuen","winton","wigfall","weekley","vidrine","vannoy","tardiff","shoop","shilling","schick","safford","prendergast","pellerin","osuna","nissen","nalley","moller","messner","messick","merrifield","mcguinness","matherly","marcano","mahone","lemos","lebrun","jara","hoffer","herren","hecker","haws","haug","gwin","gober","gilliard","fredette","favela","echeverria","downer","donofrio","desrochers","crozier","corson","bechtold","argueta","aparicio","zamudio","westover","westerman","utter","troyer","thies","tapley","slavin","shirk","sandler","roop","raymer","radcliff","otten","moorer","millet","mckibben","mccutchen","mcavoy","mcadoo","mayorga","mastin","martineau","marek","madore","leflore","kroeger","kennon","jimerson","hostetter","hornback","hendley","hance","guardado","granado","gowen","goodale","flinn","fleetwood","fitz","durkee","duprey","dipietro","dilley","clyburn","brawley","beckley","arana","weatherby","vollmer","vestal","tunnell","trigg","tingle","takahashi","sweatt","storer","snapp","shiver","rooker","rathbun","poisson","perrine","perri","pastor","parmer","parke","pare","palmieri","nottingham","midkiff","mecham","mccomas","mcalpine","lovelady","lillard","lally","knopp","kile","kiger","haile","gupta","goldsberry","gilreath","fulks","friesen","franzen","flack","findlay","ferland","dreyer","dore","dennard","deckard","debose","crim","coulombe","cork","chancey","cantor","branton","bissell","barns","woolard","witham","wasserman","spiegel","shoffner","scholz","ruch","rossman","petry","palacio","paez","neary","mortenson","millsap","miele","menke","mckim","mcanally","martines","manor","lemley","larochelle","klaus","klatt","kaufmann","kapp","helmer","hedge","halloran","glisson","frechette","fontana","eagan","distefano","danley","creekmore","chartier","chaffee","carillo","burg","bolinger","berkley","benz","basso","bash","barrier","zelaya","woodring","witkowski","wilmot","wilkens","wieland","verdugo","urquhart","tsai","timms","swiger","swaim","sussman","pires","molnar","mcatee","lowder","loos","linker","landes","kingery","hufford","higa","hendren","hammack","hamann","gillam","gerhardt","edelman","eby","delk","deans","curl","constantine","cleaver","claar","casiano","carruth","carlyle","brophy","bolanos","bibbs","bessette","beggs","baugher","bartel","averill","andresen","amin","adames","via","valente","turnbow","tse","swink","sublett","stroh","stringfellow","ridgway","pugliese","poteat","ohare","neubauer","murchison","mingo","lemmons","kwon","kellam","kean","jarmon","hyden","hudak","hollinger","henkel","hemingway","hasson","hansel","halter","haire","ginsberg","gillispie","fogel","flory","etter","elledge","eckman","deas","currin","crafton","coomer","colter","claxton","bulter","braddock","bowyer","binns","bellows","baskerville","barros","ansley","woolf","wight","waldman","wadley","tull","trull","tesch","stouffer","stadler","slay","shubert","sedillo","santacruz","reinke","poynter","neri","neale","mowry","moralez","monger","mitchum","merryman","manion","macdougall","lux","litchfield","ley","levitt","lepage","lasalle","khoury","kavanagh","karns","ivie","huebner","hodgkins","halpin","garica","eversole","dutra","dunagan","duffey","dillman","dillion","deville","dearborn","damato","courson","coulson","burdine","bousquet","bonin","bish","atencio","westbrooks","wages","vaca","tye","toner","tillis","swett","struble","stanfill","solorzano","slusher","sipple","sim","silvas","shults","schexnayder","saez","rodas","rager","pulver","plaza","penton","paniagua","meneses","mcfarlin","mcauley","matz","maloy","magruder","lohman","landa","lacombe","jaimes","hom","holzer","holst","heil","hackler","grundy","gilkey","farnham","durfee","dunton","dunston","duda","dews","craver","corriveau","conwell","colella","chambless","bremer","boutte","bourassa","blaisdell","backman","babineaux","audette","alleman","towner","taveras","tarango","sullins","suiter","stallard","solberg","schlueter","poulos","pimental","owsley","okelley","nations","moffatt","metcalfe","meekins","medellin","mcglynn","mccowan","marriott","marable","lennox","lamoureux","koss","kerby","karp","isenberg","howze","hockenberry","highsmith","harbour","hallmark","gusman","greeley","giddings","gaudet","gallup","fleenor","eicher","edington","dimaggio","dement","demello","decastro","bushman","brundage","brooker","bourg","blackstock","bergmann","beaton","banister","argo","appling","wortman","watterson","villalpando","tillotson","tighe","sundberg","sternberg","stamey","shipe","seeger","scarberry","sattler","sain","rothstein","poteet","plowman","pettiford","penland","partain","pankey","oyler","ogletree","ogburn","moton","merkel","lucier","lakey","kratz","kinser","kershaw","josephson","imhoff","hendry","hammon","frisbie","friedrich","frawley","fraga","forester","eskew","emmert","drennan","doyon","dandridge","cawley","carvajal","bracey","belisle","batey","ahner","wysocki","weiser","veliz","tincher","sansone","sankey","sandstrom","rohrer","risner","pridemore","pfeffer","persinger","peery","oubre","nowicki","musgrave","murdoch","mullinax","mccary","mathieu","livengood","kyser","klink","kimes","kellner","kavanaugh","kasten","imes","hoey","hinshaw","hake","gurule","grube","grillo","geter","gatto","garver","garretson","farwell","eiland","dunford","decarlo","corso","colman","collard","cleghorn","chasteen","cavender","carlile","calvo","byerly","brogdon","broadwater","breault","bono","bergin","behr","ballenger","amick","tamez","stiffler","steinke","simmon","shankle","schaller","salmons","sackett","saad","rideout","ratcliffe","rao","ranson","plascencia","petterson","olszewski","olney","olguin","nilsson","nevels","morelli","montiel","monge","michaelson","mertens","mcchesney","mcalpin","mathewson","loudermilk","lineberry","liggett","kinlaw","kight","jost","hereford","hardeman","halpern","halliday","hafer","gaul","friel","freitag","forsberg","evangelista","doering","dicarlo","dendy","delp","deguzman","dameron","curtiss","cosper","cauthen","cao","bradberry","bouton","bonnell","bixby","bieber","beveridge","bedwell","barhorst","bannon","baltazar","baier","ayotte","attaway","arenas","abrego","turgeon","tunstall","thaxton","thai","tenorio","stotts","sthilaire","shedd","seabolt","scalf","salyers","ruhl","rowlett","robinett","pfister","perlman","parkman","nunnally","norvell","napper","modlin","mckellar","mcclean","mascarenas","leibowitz","ledezma","kuhlman","kobayashi","hunley","holmquist","hinkley","hartsell","gribble","gravely","fifield","eliason","doak","crossland","carleton","bridgeman","bojorquez","boggess","auten","woosley","whiteley","wexler","twomey","tullis","townley","standridge","santoyo","rueda","riendeau","revell","pless","ottinger","nigro","nickles","mulvey","menefee","mcshane","mcloughlin","mckinzie","markey","lockridge","lipsey","knisley","knepper","kitts","kiel","jinks","hathcock","godin","gallego","fikes","fecteau","estabrook","ellinger","dunlop","dudek","countryman","chauvin","chatham","bullins","brownfield","boughton","bloodworth","bibb","baucom","barbieri","aubin","armitage","alessi","absher","abbate","zito","woolery","wiggs","wacker","tynes","tolle","telles","tarter","swarey","strode","stockdale","stalnaker","spina","schiff","saari","risley","rameriz","rakes","pettaway","penner","paulus","palladino","omeara","montelongo","melnick","mehta","mcgary","mccourt","mccollough","marchetti","manzanares","lowther","leiva","lauderdale","lafontaine","kowalczyk","knighton","joubert","jaworski","ide","huth","hurdle","housley","hackman","gulick","gordy","gilstrap","gehrke","gebhart","gaudette","foxworth","essex","endres","dunkle","cimino","caddell","brauer","braley","bodine","blackmore","belden","backer","ayer","andress","wisner","vuong","valliere","twigg","tso","tavarez","strahan","steib","staub","sowder","seiber","schutt","scharf","schade","rodriques","risinger","renshaw","rahman","presnell","piatt","nieman","nevins","mcilwain","mcgaha","mccully","mccomb","massengale","macedo","lesher","kearse","jauregui","husted","hudnall","holmberg","hertel","hardie","glidewell","frausto","fassett","dalessandro","dahlgren","corum","constantino","conlin","colquitt","colombo","claycomb","cardin","buller","boney","bocanegra","biggers","benedetto","araiza","andino","albin","zorn","werth","weisman","walley","vanegas","ulibarri","towe","tedford","teasley","suttle","steffens","stcyr","squire","singley","sifuentes","shuck","schram","sass","rieger","ridenhour","rickert","richerson","rayborn","rabe","raab","pendley","pastore","ordway","moynihan","mellott","mckissick","mcgann","mccready","mauney","marrufo","lenhart","lazar","lafave","keele","kautz","jardine","jahnke","jacobo","hord","hardcastle","hageman","giglio","gehring","fortson","duque","duplessis","dicken","derosier","deitz","dalessio","cram","castleman","candelario","callison","caceres","bozarth","biles","bejarano","bashaw","avina","armentrout","alverez","acord","waterhouse","vereen","vanlandingham","uhl","strawser","shotwell","severance","seltzer","schoonmaker","schock","schaub","schaffner","roeder","rodrigez","riffe","rhine","rasberry","rancourt","railey","quade","pursley","prouty","perdomo","oxley","osterman","nickens","murphree","mounts","merida","maus","mattern","masse","martinelli","mangan","lutes","ludwick","loney","laureano","lasater","knighten","kissinger","kimsey","kessinger","honea","hollingshead","hockett","heyer","heron","gurrola","gove","glasscock","gillett","galan","featherstone","eckhardt","duron","dunson","dasher","culbreth","cowden","cowans","claypoole","churchwell","chabot","caviness","cater","caston","callan","byington","burkey","boden","beckford","atwater","archambault","alvey","alsup","whisenant","weese","voyles","verret","tsang","tessier","sweitzer","sherwin","shaughnessy","revis","remy","prine","philpott","peavy","paynter","parmenter","ovalle","offutt","nightingale","newlin","nakano","myatt","muth","mohan","mcmillon","mccarley","mccaleb","maxson","marinelli","maley","liston","letendre","kain","huntsman","hirst","hagerty","gulledge","greenway","grajeda","gorton","goines","gittens","frederickson","fanelli","embree","eichelberger","dunkin","dixson","dillow","defelice","chumley","burleigh","borkowski","binette","biggerstaff","berglund","beller","audet","arbuckle","allain","alfano","youngman","wittman","weintraub","vanzant","vaden","twitty","stollings","standifer","sines","shope","scalise","saville","posada","pisano","otte","nolasco","napoli","mier","merkle","mendiola","melcher","mejias","mcmurry","mccalla","markowitz","manis","mallette","macfarlane","lough","looper","landin","kittle","kinsella","kinnard","hobart","herald","helman","hellman","hartsock","halford","hage","gordan","glasser","gayton","gattis","gastelum","gaspard","frisch","fitzhugh","eckstein","eberly","dowden","despain","crumpler","crotty","cornelison","chouinard","chamness","catlin","cann","bumgardner","budde","branum","bradfield","braddy","borst","birdwell","bazan","banas","bade","arango","ahearn","addis","zumwalt","wurth","wilk","widener","wagstaff","urrutia","terwilliger","tart","steinman","staats","sloat","rives","riggle","revels","reichard","prickett","poff","pitzer","petro","pell","northrup","nicks","moline","mielke","maynor","mallon","magness","lingle","lindell","lieb","lesko","lebeau","lammers","lafond","kiernan","ketron","jurado","holmgren","hilburn","hayashi","hashimoto","harbaugh","guillot","gard","froehlich","feinberg","falco","dufour","drees","doney","diep","delao","daves","dail","crowson","coss","congdon","carner","camarena","butterworth","burlingame","bouffard","bloch","bilyeu","barta","bakke","baillargeon","avent","aquilar","ake","aho","zeringue","yarber","wolfson","vogler","voelker","truss","troxell","thrift","strouse","spielman","sistrunk","sevigny","schuller","schaaf","ruffner","routh","roseman","ricciardi","peraza","pegram","overturf","olander","odaniel","neu","millner","melchor","maroney","machuca","macaluso","livesay","layfield","laskowski","kwiatkowski","kilby","hovey","heywood","hayman","havard","harville","haigh","hagood","grieco","glassman","gebhardt","fleischer","fann","elson","eccles","cunha","crumb","blakley","bardwell","abshire","woodham","wines","welter","wargo","varnado","tutt","traynor","swaney","svoboda","stricker","stoffel","stambaugh","sickler","shackleford","selman","seaver","sansom","sanmiguel","royston","rourke","rockett","rioux","puleo","pitchford","nardi","mulvaney","middaugh","malek","leos","lathan","kujawa","kimbro","killebrew","houlihan","hinckley","herod","hepler","hamner","hammel","hallowell","gonsalez","gingerich","gambill","funkhouser","fricke","fewell","falkner","endsley","dulin","drennen","deaver","dambrosio","chadwell","castanon","burkes","brune","brisco","brinker","bowker","boldt","berner","beaumont","beaird","bazemore","barrick","albano","younts","wunderlich","weidman","vanness","toland","theobald","stickler","steiger","stanger","spies","spector","sollars","smedley","seibel","scoville","saito","rye","rummel","rowles","rouleau","roos","rogan","roemer","ream","raya","purkey","priester","perreira","penick","paulin","parkins","overcash","oleson","neves","muldrow","minard","midgett","michalak","melgar","mcentire","mcauliffe","marte","lydon","lindholm","leyba","langevin","lagasse","lafayette","kesler","kelton","kao","kaminsky","jaggers","humbert","huck","howarth","hinrichs","higley","gupton","guimond","gravois","giguere","fretwell","fontes","feeley","faucher","eichhorn","ecker","earp","dole","dinger","derryberry","demars","deel","copenhaver","collinsworth","colangelo","cloyd","claiborne","caulfield","carlsen","calzada","caffey","broadus","brenneman","bouie","bodnar","blaney","blanc","beltz","behling","barahona","yockey","winkle","windom","wimer","villatoro","trexler","teran","taliaferro","sydnor","swinson","snelling","smtih","simonton","simoneaux","simoneau","sherrer","seavey","scheel","rushton","rupe","ruano","rippy","reiner","reiff","rabinowitz","quach","penley","odle","nock","minnich","mckown","mccarver","mcandrew","longley","laux","lamothe","lafreniere","kropp","krick","kates","jepson","huie","howse","howie","henriques","haydon","haught","hartzog","harkey","grimaldo","goshorn","gormley","gluck","gilroy","gillenwater","giffin","fluker","feder","eyre","eshelman","eakins","detwiler","delrosario","davisson","catalan","canning","calton","brammer","botelho","blakney","bartell","averett","askins","aker","zak","worcester","witmer","wiser","winkelman","widmer","whittier","weitzel","wardell","wagers","ullman","tupper","tingley","tilghman","talton","simard","seda","scheller","sala","rundell","rost","roa","ribeiro","rabideau","primm","pinon","peart","ostrom","ober","nystrom","nussbaum","naughton","murr","moorhead","monti","monteiro","melson","meissner","mclin","mcgruder","marotta","makowski","majewski","madewell","lunt","lukens","leininger","lebel","lakin","kepler","jaques","hunnicutt","hungerford","hoopes","hertz","heins","halliburton","grosso","gravitt","glasper","gallman","gallaway","funke","fulbright","falgout","eakin","dostie","dorado","dewberry","derose","cutshall","crampton","costanzo","colletti","cloninger","claytor","chiang","canterbury","campagna","burd","brokaw","broaddus","bretz","brainard","binford","bilbrey","alpert","aitken","ahlers","zajac","woolfolk","witten","windle","wayland","tramel","tittle","talavera","suter","straley","specht","sommerville","soloman","skeens","sigman","sibert","shavers","schuck","schmit","sartain","sabol","rosenblatt","rollo","rashid","rabb","province","polston","nyberg","northrop","navarra","muldoon","mikesell","mcdougald","mcburney","mariscal","lui","lozier","lingerfelt","legere","latour","lagunas","lacour","kurth","killen","kiely","kayser","kahle","isley","huertas","hower","hinz","haugh","gumm","galicia","fortunato","flake","dunleavy","duggins","doby","digiovanni","devaney","deltoro","cribb","corpuz","coronel","coen","charbonneau","caine","burchette","blakey","blakemore","bergquist","beene","beaudette","bayles","ballance","bakker","bailes","asberry","arwood","zucker","willman","whitesell","wald","walcott","vancleave","trump","strasser","simas","shick","schleicher","schaal","saleh","rotz","resnick","rainer","partee","ollis","oller","oday","munday","mong","millican","merwin","mazzola","mansell","magallanes","llanes","lewellen","lepore","kisner","keesee","jeanlouis","ingham","hornbeck","hawn","hartz","harber","haffner","gutshall","guth","grays","gowan","finlay","finkelstein","eyler","enloe","dungan","diez","dearman","cull","crosson","chronister","cassity","campion","callihan","butz","breazeale","blumenthal","berkey","batty","batton","arvizu","alderete","aldana","albaugh","abernethy","wolter","wille","tweed","tollefson","thomasson","teter","testerman","sproul","spates","southwick","soukup","skelly","senter","sealey","sawicki","sargeant","rossiter","rosemond","repp","pifer","ormsby","nickelson","naumann","morabito","monzon","millsaps","millen","mcelrath","marcoux","mantooth","madson","macneil","mackinnon","louque","leister","lampley","kushner","krouse","kirwan","jessee","janson","jahn","jacquez","islas","hutt","holladay","hillyer","hepburn","hensel","harrold","gingrich","geis","gales","fults","finnell","ferri","featherston","epley","ebersole","eames","dunigan","drye","dismuke","devaughn","delorenzo","damiano","confer","collum","clower","clow","claussen","clack","caylor","cawthon","casias","carreno","bluhm","bingaman","bewley","belew","beckner","auld","amey","wolfenbarger","wilkey","wicklund","waltman","villalba","valero","valdovinos","ung","ullrich","tyus","twyman","trost","tardif","tanguay","stripling","steinbach","shumpert","sasaki","sappington","sandusky","reinhold","reinert","quijano","pye","placencia","pinkard","phinney","perrotta","pernell","parrett","oxendine","owensby","orman","nuno","mori","mcroberts","mcneese","mckamey","mccullum","markel","mardis","maines","lueck","lubin","lefler","leffler","larios","labarbera","kershner","josey","jeanbaptiste","izaguirre","hermosillo","haviland","hartshorn","hafner","ginter","getty","franck","fiske","dufrene","doody","davie","dangerfield","dahlberg","cuthbertson","crone","coffelt","chidester","chesson","cauley","caudell","cantara","campo","caines","bullis","bucci","brochu","bogard","bickerstaff","benning","arzola","antonelli","adkinson","zellers","wulf","worsley","woolridge","whitton","westerfield","walczak","vassar","truett","trueblood","trawick","townsley","topping","tobar","telford","steverson","stagg","sitton","sill","sergent","schoenfeld","sarabia","rutkowski","rubenstein","rigdon","prentiss","pomerleau","plumlee","philbrick","peer","patnode","oloughlin","obregon","nuss","morell","mikell","mele","mcinerney","mcguigan","mcbrayer","lor","lollar","lakes","kuehl","kinzer","kamp","joplin","jacobi","howells","holstein","hedden","hassler","harty","halle","greig","gouge","goodrum","gerhart","geier","geddes","gast","forehand","ferree","fendley","feltner","esqueda","encarnacion","eichler","egger","edmundson","eatmon","doud","donohoe","donelson","dilorenzo","digiacomo","diggins","delozier","dejong","danford","crippen","coppage","cogswell","clardy","cioffi","cabe","brunette","bresnahan","bramble","blomquist","blackstone","biller","bevis","bevan","bethune","benbow","baty","basinger","balcom","andes","aman","aguero","adkisson","yandell","wilds","whisenhunt","weigand","weeden","voight","villar","trottier","tillett","suazo","setser","scurry","schuh","schreck","schauer","samora","roane","rinker","reimers","ratchford","popovich","parkin","natal","melville","mcbryde","magdaleno","loehr","lockman","lingo","leduc","larocca","lao","lamere","laclair","krall","korte","koger","jalbert","hughs","higbee","henton","heaney","haith","gump","greeson","goodloe","gholston","gasper","gagliardi","fregoso","farthing","fabrizio","ensor","elswick","elgin","eklund","eaddy","drouin","dorton","dizon","derouen","deherrera","davy","dampier","cullum","culley","cowgill","cardoso","cardinale","brodsky","broadbent","brimmer","briceno","branscum","bolyard","boley","bennington","beadle","baur","ballentine","azure","aultman","arciniega","aguila","aceves","yepez","yap","woodrum","wethington","weissman","veloz","trusty","troup","trammel","tarpley","stivers","steck","sprayberry","spraggins","spitler","spiers","sohn","seagraves","schiffman","rudnick","rizo","riccio","rennie","quackenbush","puma","plott","pearcy","parada","paiz","munford","moskowitz","mease","mcnary","mccusker","lozoya","longmire","loesch","lasky","kuhlmann","krieg","koziol","kowalewski","konrad","kindle","jowers","jolin","jaco","hua","horgan","hine","hileman","hepner","heise","heady","hawkinson","hannigan","haberman","guilford","grimaldi","garton","gagliano","fruge","follett","fiscus","ferretti","ebner","easterday","eanes","dirks","dimarco","depalma","deforest","cruce","craighead","christner","candler","cadwell","burchell","buettner","brinton","brazier","brannen","brame","bova","bomar","blakeslee","belknap","bangs","balzer","athey","armes","alvis","alverson","alvardo","yeung","wheelock","westlund","wessels","volkman","threadgill","thelen","tague","symons","swinford","sturtevant","straka","stier","stagner","segarra","seawright","rutan","roux","ringler","riker","ramsdell","quattlebaum","purifoy","poulson","permenter","peloquin","pasley","pagel","osman","obannon","nygaard","newcomer","munos","motta","meadors","mcquiston","mcniel","mcmann","mccrae","mayne","matte","legault","lechner","kucera","krohn","kratzer","koopman","jeske","horrocks","hock","hibbler","hesson","hersh","harvin","halvorsen","griner","grindle","gladstone","garofalo","frampton","forbis","eddington","diorio","dingus","dewar","desalvo","curcio","creasy","cortese","cordoba","connally","cluff","cascio","capuano","canaday","calabro","bussard","brayton","borja","bigley","arnone","arguelles","acuff","zamarripa","wooton","widner","wideman","threatt","thiele","templin","teeters","synder","swint","swick","sturges","stogner","stedman","spratt","siegfried","shetler","scull","savino","sather","rothwell","rook","rone","rhee","quevedo","privett","pouliot","poche","pickel","petrillo","pellegrini","peaslee","partlow","otey","nunnery","morelock","morello","meunier","messinger","mckie","mccubbin","mccarron","lerch","lavine","laverty","lariviere","lamkin","kugler","krol","kissel","keeter","hubble","hickox","hetzel","hayner","hagy","hadlock","groh","gottschalk","goodsell","gassaway","garrard","galligan","fye","firth","fenderson","feinstein","etienne","engleman","emrick","ellender","drews","doiron","degraw","deegan","dart","crissman","corr","cookson","coil","cleaves","charest","chapple","chaparro","castano","carpio","byer","bufford","bridgewater","bridgers","brandes","borrero","bonanno","aube","ancheta","abarca","abad","yim","wooster","wimbush","willhite","willams","wigley","weisberg","wardlaw","vigue","vanhook","unknow","torre","tasker","tarbox","strachan","slover","shamblin","semple","schuyler","schrimsher","sayer","salzman","rubalcava","riles","reneau","reichel","rayfield","rabon","pyatt","prindle","poss","polito","plemmons","pesce","perrault","pereyra","ostrowski","nilsen","niemeyer","munsey","mundell","moncada","miceli","meader","mcmasters","mckeehan","matsumoto","marron","marden","lizarraga","lingenfelter","lewallen","langan","lamanna","kovac","kinsler","kephart","keown","kass","kammerer","jeffreys","hysell","householder","hosmer","hardnett","hanner","guyette","greening","glazer","ginder","fromm","fluellen","finkle","fey","fessler","essary","eisele","duren","dittmer","crochet","cosentino","cogan","coelho","cavin","carrizales","campuzano","brough","bopp","bookman","blouin","beesley","battista","bascom","bakken","badgett","arneson","anselmo","ahumada","woodyard","wolters","wireman","willison","warman","waldrup","vowell","vantassel","vale","twombly","toomer","tennison","teets","tedeschi","swanner","stutz","stelly","sheehy","schermerhorn","scala","sandidge","salters","salo","saechao","roseboro","rolle","ressler","renz","renn","redford","raposa","rainbolt","pelfrey","orndorff","oney","nolin","nimmons","ney","nardone","myhre","morman","menjivar","mcglone","mccammon","maxon","marciano","manus","lowrance","lorenzen","lonergan","lollis","littles","lindahl","lamas","lach","kuster","krawczyk","knuth","knecht","kirkendall","keitt","keever","kantor","jarboe","hoye","houchens","holter","holsinger","hickok","helwig","helgeson","hassett","harner","hamman","hames","hadfield","goree","goldfarb","gaughan","gaudreau","gantz","gallion","frady","foti","flesher","ferrin","faught","engram","donegan","desouza","degroot","cutright","crowl","criner","coan","clinkscales","chewning","chavira","catchings","carlock","bulger","buenrostro","bramblett","brack","boulware","bookout","bitner","birt","baranowski","baisden","augustin","allmon","acklin","yoakum","wilbourn","whisler","weinberger","washer","vasques","vanzandt","vanatta","troxler","tomes","tindle","tims","throckmorton","thach","stpeter","stlaurent","stenson","spry","spitz","songer","snavely","sly","shroyer","shortridge","shenk","sevier","seabrook","scrivner","saltzman","rosenberry","rockwood","robeson","roan","reiser","ramires","raber","posner","popham","piotrowski","pinard","peterkin","pelham","peiffer","peay","nadler","musso","millett","mestas","mcgowen","marques","marasco","manriquez","manos","mair","lipps","leiker","krumm","knorr","kinslow","kessel","kendricks","kelm","ito","irick","ickes","hurlburt","horta","hoekstra","heuer","helmuth","heatherly","hampson","hagar","haga","greenlaw","grau","godbey","gingras","gillies","gibb","gayden","gauvin","garrow","fontanez","florio","finke","fasano","ezzell","ewers","eveland","eckenrode","duclos","drumm","dimmick","delancey","defazio","dashiell","cusack","crowther","crigger","cray","coolidge","coldiron","cleland","chalfant","cassel","camire","cabrales","broomfield","brittingham","brisson","brickey","braziel","brazell","bragdon","boulanger","bos","boman","bohannan","beem","barre","baptist","azar","ashbaugh","armistead","almazan","adamski","zendejas","winburn","willaims","wilhoit","westberry","wentzel","wendling","visser","vanscoy","vankirk","vallee","tweedy","thornberry","sweeny","spradling","spano","smelser","shim","sechrist","schall","scaife","rugg","rothrock","roesler","riehl","ridings","render","ransdell","radke","pinero","petree","pendergast","peluso","pecoraro","pascoe","panek","oshiro","navarrette","murguia","moores","moberg","michaelis","mcwhirter","mcsweeney","mcquade","mccay","mauk","mariani","marceau","mandeville","maeda","lunde","ludlow","loeb","lindo","linderman","leveille","leith","larock","lambrecht","kulp","kinsley","kimberlin","kesterson","hoyos","helfrich","hanke","grisby","goyette","gouveia","glazier","gile","gerena","gelinas","gasaway","funches","fujimoto","flynt","fenske","fellers","fehr","eslinger","escalera","enciso","duley","dittman","dineen","diller","devault","dao","collings","clymer","clowers","chavers","charland","castorena","castello","camargo","bunce","bullen","boyes","borchers","borchardt","birnbaum","birdsall","billman","benites","bankhead","ange","ammerman","adkison","winegar","wickman","warr","warnke","villeneuve","veasey","vassallo","vannatta","vadnais","twilley","towery","tomblin","tippett","theiss","talkington","talamantes","swart","swanger","streit","stines","stabler","spurling","sobel","sine","simmers","shippy","shiflett","shearin","sauter","sanderlin","rusch","runkle","ruckman","rorie","roesch","richert","rehm","randel","ragin","quesenberry","puentes","plyler","plotkin","paugh","oshaughnessy","ohalloran","norsworthy","niemann","nader","moorefield","mooneyham","modica","miyamoto","mickel","mebane","mckinnie","mazurek","mancilla","lukas","lovins","loughlin","lotz","lindsley","liddle","levan","lederman","leclaire","lasseter","lapoint","lamoreaux","lafollette","kubiak","kirtley","keffer","kaczmarek","housman","hiers","hibbert","herrod","hegarty","hathorn","greenhaw","grafton","govea","futch","furst","franko","forcier","foran","flickinger","fairfield","eure","emrich","embrey","edgington","ecklund","eckard","durante","deyo","delvecchio","dade","currey","creswell","cottrill","casavant","cartier","cargile","capel","cammack","calfee","burse","burruss","brust","brousseau","bridwell","braaten","borkholder","bloomquist","bjork","bartelt","arp","amburgey","yeary","yao","whitefield","vinyard","vanvalkenburg","twitchell","timmins","tapper","stringham","starcher","spotts","slaugh","simonsen","sheffer","sequeira","rosati","rhymes","reza","quint","pollak","peirce","patillo","parkerson","paiva","nilson","nevin","narcisse","nair","mitton","merriam","merced","meiners","mckain","mcelveen","mcbeth","marsden","marez","manke","mahurin","mabrey","luper","krull","kees","iles","hunsicker","hornbuckle","holtzclaw","hirt","hinnant","heston","hering","hemenway","hegwood","hearns","halterman","guiterrez","grote","granillo","grainger","glasco","gilder","garren","garlock","garey","fryar","fredricks","fraizer","foxx","foshee","ferrel","felty","everitt","evens","esser","elkin","eberhart","durso","duguay","driskill","doster","dewall","deveau","demps","demaio","delreal","deleo","deem","darrah","cumberbatch","culberson","cranmer","cordle","colgan","chesley","cavallo","castellon","castelli","carreras","carnell","carlucci","bontrager","blumberg","blasingame","becton","ayon","artrip","andujar","alkire","alder","agan","zukowski","zuckerman","zehr","wroblewski","wrigley","woodside","wigginton","westman","westgate","werts","washam","wardlow","walser","waiters","tadlock","stringfield","stimpson","stickley","standish","spurlin","spindler","speller","spaeth","sotomayor","sok","sluder","shryock","shepardson","shatley","scannell","santistevan","rosner","rhode","resto","reinhard","rathburn","prisco","poulsen","pinney","phares","pennock","pastrana","oviedo","ostler","noto","nauman","mulford","moise","moberly","mirabal","metoyer","metheny","mentzer","meldrum","mcinturff","mcelyea","mcdougle","massaro","lumpkins","loveday","lofgren","loe","lirette","lesperance","lefkowitz","ledger","lauzon","lain","lachapelle","kurz","klassen","keough","kempton","kaelin","jeffords","huot","hsieh","hoyer","horwitz","hopp","hoeft","hennig","haskin","gourdine","golightly","girouard","fulgham","fritsch","freer","frasher","foulk","firestone","fiorentino","fedor","ensley","englehart","eells","ebel","dunphy","donahoe","dileo","dibenedetto","dabrowski","crick","coonrod","conder","coddington","chunn","choy","chaput","cerna","carreiro","calahan","braggs","bourdon","bollman","bittle","behm","bauder","batt","barreras","aubuchon","anzalone","adamo","zerbe","wirt","willcox","westberg","weikel","waymire","vroman","vinci","vallejos","truesdell","troutt","trotta","tollison","toles","tichenor","symonds","surles","strayer","stgeorge","sroka","sorrentino","solares","snelson","silvestri","sikorski","shawver","schumaker","schorr","schooley","scates","satterlee","satchell","sacks","rymer","roselli","robitaille","riegel","regis","reames","provenzano","priestley","plaisance","pettey","palomares","oman","nowakowski","nace","monette","minyard","mclamb","mchone","mccarroll","masson","magoon","maddy","lundin","loza","licata","leonhardt","lema","landwehr","kircher","kinch","karpinski","johannsen","hussain","houghtaling","hoskinson","hollaway","holeman","hobgood","hilt","hiebert","gros","goggin","geissler","gadbois","gabaldon","fleshman","flannigan","fairman","epp","eilers","dycus","dunmire","duffield","dowler","deloatch","dehaan","deemer","clayborn","christofferso","chilson","chesney","chatfield","carron","canale","brigman","branstetter","bosse","borton","bonar","blau","biron","barroso","arispe","zacharias","zabel","yaeger","woolford","whetzel","weakley","veatch","vandeusen","tufts","troxel","troche","traver","townsel","tosh","talarico","swilley","sterrett","stenger","speakman","sowards","sours","souders","souder","soles","sobers","snoddy","smither","sias","shute","shoaf","shahan","schuetz","scaggs","santini","rosson","rolen","robidoux","rentas","recio","pixley","pawlowski","pawlak","paull","overbey","orear","oliveri","oldenburg","nutting","naugle","mote","mossman","moor","misner","milazzo","michelson","mcentee","mccullar","mccree","mcaleer","mazzone","mandell","manahan","malott","maisonet","mailloux","lumley","lowrie","louviere","lipinski","lindemann","leppert","leopold","leasure","labarge","kubik","knisely","knepp","kenworthy","kennelly","kelch","karg","kanter","hyer","houchin","hosley","hosler","hollon","holleman","heitman","hebb","haggins","gwaltney","guin","goulding","gorden","geraci","georges","gathers","frison","feagin","falconer","espada","erving","erikson","eisenhauer","eder","ebeling","durgin","dowdle","dinwiddie","delcastillo","dedrick","crimmins","covell","cournoyer","coria","cohan","cataldo","carpentier","canas","campa","brode","brashears","blaser","bicknell","berk","bednar","barwick","ascencio","althoff","almodovar","alamo","zirkle","zabala","wolverton","winebrenner","wetherell","westlake","wegener","weddington","vong","tuten","trosclair","tressler","theroux","teske","swinehart","swensen","sundquist","southall","socha","sizer","silverberg","shortt","shimizu","sherrard","shaeffer","scheid","scheetz","saravia","sanner","rubinstein","rozell","romer","rheaume","reisinger","randles","pullum","petrella","payan","papp","nordin","norcross","nicoletti","nicholes","newbold","nakagawa","mraz","monteith","milstead","milliner","mellen","mccardle","luft","liptak","lipp","leitch","latimore","larrison","landau","laborde","koval","izquierdo","hymel","hoskin","holte","hoefer","hayworth","hausman","harrill","harrel","hardt","gully","groover","grinnell","greenspan","graver","grandberry","gorrell","goldenberg","goguen","gilleland","garr","fuson","foye","feldmann","everly","dyess","dyal","dunnigan","downie","dolby","deatherage","cosey","cheever","celaya","caver","cashion","caplinger","cansler","byrge","bruder","breuer","breslin","brazelton","botkin","bonneau","bondurant","bohanan","bogue","boes","bodner","boatner","blatt","bickley","belliveau","beiler","beier","beckstead","bachmann","atkin","altizer","alloway","allaire","albro","abron","zellmer","yetter","yelverton","wiltshire","wiens","whidden","viramontes","vanwormer","tarantino","tanksley","sumlin","strauch","strang","stice","spahn","sosebee","sigala","shrout","seamon","schrum","schneck","schantz","ruddy","romig","roehl","renninger","reding","pyne","polak","pohlman","pasillas","oldfield","oldaker","ohanlon","ogilvie","norberg","nolette","nies","neufeld","nellis","mummert","mulvihill","mullaney","monteleone","mendonca","meisner","mcmullan","mccluney","mattis","massengill","manfredi","luedtke","lounsbury","liberatore","leek","lamphere","laforge","kuo","koo","jourdan","ismail","iorio","iniguez","ikeda","hubler","hodgdon","hocking","heacock","haslam","haralson","hanshaw","hannum","hallam","haden","garnes","garces","gammage","gambino","finkel","faucett","fahy","ehrhardt","eggen","dusek","durrant","dubay","dones","dey","depasquale","delucia","degraff","decamp","davalos","cullins","conard","clouser","clontz","cifuentes","chappel","chaffins","celis","carwile","byram","bruggeman","bressler","brathwaite","brasfield","bradburn","boose","boon","bodie","blosser","blas","bise","bertsch","bernardi","bernabe","bengtson","barrette","astorga","alday","albee","abrahamson","yarnell","wiltse","wile","wiebe","waguespack","vasser","upham","tyre","turek","traxler","torain","tomaszewski","tinnin","tiner","tindell","teed","styron","stahlman","staab","skiba","shih","sheperd","seidl","secor","schutte","sanfilippo","ruder","rondon","rearick","procter","prochaska","pettengill","pauly","neilsen","nally","mutter","mullenax","morano","meads","mcnaughton","mcmurtry","mcmath","mckinsey","matthes","massenburg","marlar","margolis","malin","magallon","mackin","lovette","loughran","loring","longstreet","loiselle","lenihan","laub","kunze","kull","koepke","kerwin","kalinowski","kagan","innis","innes","holtzman","heinemann","harshman","haider","haack","guss","grondin","grissett","greenawalt","gravel","goudy","goodlett","goldston","gokey","gardea","galaviz","gafford","gabrielson","furlow","fritch","fordyce","folger","elizalde","ehlert","eckhoff","eccleston","ealey","dubin","diemer","deschamps","delapena","decicco","debolt","daum","cullinan","crittendon","crase","cossey","coppock","coots","colyer","cluck","chamberland","burkhead","bumpus","buchan","borman","bork","boe","birkholz","berardi","benda","behnke","barter","auer","amezquita","wotring","wirtz","wingert","wiesner","whitesides","weyant","wainscott","venezia","varnell","tussey","thurlow","tabares","stiver","stell","starke","stanhope","stanek","sisler","sinnott","siciliano","shehan","selph","seager","scurlock","scranton","santucci","santangelo","saltsman","ruel","ropp","rogge","rettig","renwick","reidy","reider","redfield","quam","premo","peet","parente","paolucci","palmquist","orme","ohler","ogg","netherton","mutchler","morita","mistretta","minnis","middendorf","menzel","mendosa","mendelson","meaux","mcspadden","mcquaid","mcnatt","manigault","maney","mager","lukes","lopresti","liriano","lipton","letson","lechuga","lazenby","lauria","larimore","kwok","kwak","krupp","krupa","krum","kopec","kinchen","kifer","kerney","kerner","kennison","kegley","kays","karcher","justis","johson","jellison","janke","huskins","holzman","hinojos","hefley","hatmaker","harte","halloway","hallenbeck","goodwyn","glaspie","geise","fullwood","fryman","frew","frakes","fraire","farrer","enlow","engen","ellzey","eckles","earles","ealy","dunkley","drinkard","dreiling","draeger","dinardo","dills","desroches","desantiago","curlee","crumbley","critchlow","coury","courtright","coffield","cleek","charpentier","cardone","caples","cantin","buntin","bugbee","brinkerhoff","brackin","bourland","bohl","bogdan","blassingame","beacham","banning","auguste","andreasen","amann","almon","alejo","adelman","abston","zeno","yerger","wymer","woodberry","windley","whiteaker","westfield","weibel","wanner","waldrep","villani","vanarsdale","utterback","updike","triggs","topete","tolar","tigner","thoms","tauber","tarvin","tally","swiney","sweatman","studebaker","stennett","starrett","stannard","stalvey","sonnenberg","smithey","sieber","sickles","shinault","segars","sanger","salmeron","rothe","rizzi","rine","ricard","restrepo","ralls","ragusa","quiroga","pero","pegg","pavlik","papenfuss","oropeza","okane","neer","nee","mudge","mozingo","molinaro","mcvicker","mcgarvey","mcfalls","mccraney","matus","magers","llanos","livermore","liss","linehan","leto","leitner","laymon","lawing","lacourse","kwong","kollar","kneeland","keo","kennett","kellett","kangas","janzen","hutter","huse","huling","hoss","hohn","hofmeister","hewes","hern","harjo","habib","gust","guice","grullon","greggs","grayer","granier","grable","gowdy","giannini","getchell","gartman","garnica","ganey","gallimore","fray","fetters","fergerson","farlow","fagundes","exley","esteves","enders","edenfield","easterwood","drakeford","dipasquale","desousa","deshields","deeter","dedmon","debord","daughtery","cutts","courtemanche","coursey","copple","coomes","collis","coll","cogburn","clopton","choquette","chaidez","castrejon","calhoon","burbach","bulloch","buchman","bruhn","bohon","blough","bien","baynes","barstow","zeman","zackery","yardley","yamashita","wulff","wilken","wiliams","wickersham","wible","whipkey","wedgeworth","walmsley","walkup","vreeland","verrill","valera","umana","traub","swingle","summey","stroupe","stockstill","steffey","stefanski","statler","stapp","speights","solari","soderberg","shunk","shorey","shewmaker","sheilds","schiffer","schank","schaff","sagers","rochon","riser","rickett","reale","raglin","polen","plata","pitcock","percival","palen","pahl","orona","oberle","nocera","navas","nault","mullings","moos","montejano","monreal","minick","middlebrook","meece","mcmillion","mccullen","mauck","marshburn","maillet","mahaney","magner","maclin","lucey","litteral","lippincott","leite","leis","leaks","lamarre","kost","jurgens","jerkins","jager","hurwitz","hughley","hotaling","horstman","hohman","hocker","hively","hipps","hile","hessler","hermanson","hepworth","henn","helland","hedlund","harkless","haigler","gutierez","grindstaff","glantz","giardina","gerken","gadsden","finnerty","feld","farnum","encinas","drakes","dennie","cutlip","curtsinger","couto","cortinas","corby","chiasson","carle","carballo","brindle","borum","bober","blagg","birk","berthiaume","beahm","batres","basnight","backes","axtell","aust","atterberry","alvares","alt","alegria","yow","yip","woodell","wojciechowski","winfree","winbush","wiest","wesner","wamsley","wakeman","verner","truex","trafton","toman","thorsen","theus","tellier","tallant","szeto","strope","stills","sorg","simkins","shuey","shaul","servin","serio","serafin","salguero","saba","ryerson","rudder","ruark","rother","rohrbaugh","rohrbach","rohan","rogerson","risher","rigg","reeser","pryce","prokop","prins","priebe","prejean","pinheiro","petrone","petri","penson","pearlman","parikh","natoli","murakami","mullikin","mullane","motes","morningstar","monks","mcveigh","mcgrady","mcgaughey","mccurley","masi","marchan","manske","maez","lusby","linde","lile","likens","licon","leroux","lemaire","legette","lax","laskey","laprade","laplant","kolar","kittredge","kinley","kerber","kanagy","jetton","janik","ippolito","inouye","hunsinger","howley","howery","horrell","holthaus","hiner","hilson","hilderbrand","hasan","hartzler","harnish","harada","hansford","halligan","hagedorn","gwynn","gudino","greenstein","greear","gracey","goudeau","gose","goodner","ginsburg","gerth","gerner","fyfe","fujii","frier","frenette","folmar","fleisher","fleischmann","fetzer","eisenman","earhart","dupuy","dunkelberger","drexler","dillinger","dilbeck","dewald","demby","deford","dake","craine","como","chesnut","casady","carstens","carrick","carino","carignan","canchola","cale","bushong","burman","buono","brownlow","broach","britten","brickhouse","boyden","boulton","borne","borland","bohrer","blubaugh","bever","berggren","benevides","arocho","arends","amezcua","almendarez","zalewski","witzel","winkfield","wilhoite","vara","vangundy","vanfleet","vanetten","vandergriff","urbanski","troiano","thibodaux","straus","stoneking","stjean","stillings","stange","speicher","speegle","sowa","smeltzer","slawson","simmonds","shuttleworth","serpa","senger","seidman","schweiger","schloss","schimmel","schechter","sayler","sabb","sabatini","ronan","rodiguez","riggleman","richins","reep","reamer","prunty","porath","plunk","piland","philbrook","pettitt","perna","peralez","pascale","padula","oboyle","nivens","nickols","murph","mundt","munden","montijo","mcmanis","mcgrane","mccrimmon","manzi","mangold","malick","mahar","maddock","losey","litten","liner","leff","leedy","leavell","ladue","krahn","kluge","junker","iversen","imler","hurtt","huizar","hubbert","howington","hollomon","holdren","hoisington","hise","heiden","hauge","hartigan","gutirrez","griffie","greenhill","gratton","granata","gottfried","gertz","gautreaux","furry","furey","funderburg","flippen","fitzgibbon","dyar","drucker","donoghue","dildy","devers","detweiler","despres","denby","degeorge","cueto","cranston","courville","clukey","cirillo","chon","chivers","caudillo","catt","butera","bulluck","buckmaster","braunstein","bracamonte","bourdeau","bonnette","bobadilla","boaz","blackledge","beshears","bernhard","bergeson","baver","barthel","balsamo","bak","aziz","awad","authement","altom","altieri","abels","zigler","zhu","younker","yeomans","yearwood","wurster","winget","whitsett","wechsler","weatherwax","wathen","warriner","wanamaker","walraven","viens","vandemark","vancamp","uchida","triana","tinoco","terpstra","tellis","tarin","taranto","takacs","studdard","struthers","strout","stiller","spataro","soderquist","sliger","silberman","shurtleff","sheetz","ritch","reif","raybon","ratzlaff","radley","putt","putney","pinette","piner","petrin","parise","osbourne","nyman","northington","noblitt","nishimura","neher","nalls","naccarato","mucha","mounce","miron","millis","meaney","mcnichols","mckinnis","mcjunkin","mcduffy","manrique","mannion","mangual","malveaux","mains","lumsden","lohmann","lipe","lightsey","lemasters","leist","laxton","laverriere","latorre","lamons","kral","kopf","knauer","kitt","kaul","karas","kamps","jusino","islam","hullinger","huges","hornung","hiser","hempel","helsel","hassinger","hargraves","hammes","hallberg","gutman","gumbs","gruver","graddy","gonsales","goncalves","glennon","gilford","geno","freshour","flippo","fifer","fason","farrish","fallin","ewert","estepp","escudero","ensminger","emberton","elms","ellerbe","eide","dysart","dougan","dierking","dicus","detrick","deroche","depue","demartino","delosreyes","dalke","culbreath","crownover","crisler","crass","corsi","chagnon","centers","cavanagh","casson","carollo","cadwallader","burnley","burciaga","burchard","broadhead","bolte","berens","bellman","bellard","baril","antonucci","wolfgram","winsor","wimbish","wier","wallach","viveros","vento","varley","vanslyke","vangorder","touchstone","tomko","tiemann","throop","tamura","talmadge","swayze","sturdevant","strauser","stolz","stenberg","stayton","spohn","spillers","spillane","sluss","slavens","simonetti","shofner","shead","senecal","seales","schueler","schley","schacht","sauve","sarno","salsbury","rothschild","rosier","rines","reveles","rein","redus","redfern","reck","ranney","raggs","prout","prill","preble","prager","plemons","pilon","piccirillo","pewitt","pesina","pecora","otani","orsini","oestreich","odea","ocallaghan","northup","niehaus","newberg","nasser","narron","monarrez","mishler","mcsherry","mcelfresh","mayon","mauer","mattice","marrone","marmolejo","marini","malm","machen","lunceford","loewen","liverman","litwin","linscott","levins","lenox","legaspi","leeman","leavy","lannon","lamson","lambdin","labarre","knouse","klemm","kleinschmidt","kirklin","keels","juliano","howser","hosier","hopwood","holyfield","hodnett","hirsh","heimann","heckel","harger","hamil","hajek","gurganus","gunning","grange","gonzalas","goggins","gerow","gaydos","garduno","ganley","galey","farner","engles","emond","emert","ellenburg","edick","duell","dorazio","dimond","diederich","depuy","dempster","demaria","dehoyos","dearth","dealba","czech","crose","crespin","cogdill","clinard","cipriano","chretien","cerny","ceniceros","celestin","caple","cacho","burrill","buhr","buckland","branam","boysen","bovee","boos","boler","blom","blasko","beyers","belz","belmonte","bednarz","beckmann","beaudin","bazile","barbeau","balentine","abrahams","zielke","yunker","yeates","wrobel","wike","whisnant","wherry","wagnon","vogan","vansant","vannest","vallo","ullery","towles","towell","thill","taormina","tannehill","taing","storrs","stickles","stetler","sparling","solt","silcox","sheard","shadle","seman","selleck","schlemmer","scher","sapien","sainz","roye","romain","rizzuto","resch","rentz","rasch","ranieri","purtell","primmer","portwood","pontius","pons","pletcher","pledger","pirkle","pillsbury","pentecost","paxson","ortez","oles","mullett","muirhead","mouzon","mork","mollett","mohn","mitcham","melillo","medders","mcmiller","mccleery","mccaughey","mak","maciejewski","macaulay","lute","lipman","lewter","larocque","langton","kriner","knipp","killeen","karn","kalish","kaczor","jonson","jerez","jarrard","janda","hymes","hollman","hollandsworth","holl","hobdy","hennen","hemmer","hagins","haddox","guitierrez","guernsey","gorsuch","gholson","genova","gazaway","gauna","gammons","freels","fonville","fetterman","fava","farquhar","farish","fabela","escoto","eisen","dossett","dority","dorfman","demmer","dehn","dawley","darbonne","damore","damm","crosley","cron","crompton","crichton","cotner","cordon","conerly","colvard","clauson","cheeseman","cavallaro","castille","cabello","burgan","buffum","bruss","brassfield","bowerman","bothwell","borgen","bonaparte","bombard","boivin","boissonneault","bogner","bodden","boan","bittinger","bickham","bedolla","bale","bainbridge","aybar","avendano","ashlock","amidon","almanzar","akridge","ackermann","zager","worrall","winans","wilsey","wightman","westrick","wenner","warne","warford","verville","utecht","upson","tuma","tseng","troncoso","trollinger","torbert","taulbee","sutterfield","stough","storch","stonebraker","stolle","stilson","stiefel","steptoe","stepney","stender","stemple","staggers","spurrier","spinney","spengler","smartt","skoog","silvis","sieg","shuford","selfridge","seguin","sedgwick","sease","scotti","schroer","schlenker","schill","savarese","sapienza","sanson","sandefur","salamone","rusnak","rudisill","rothermel","roca","resendiz","reliford","rasco","raiford","quisenberry","quijada","pullins","puccio","postell","poppe","pinter","piche","petrucci","pellegrin","pelaez","paton","pasco","parkes","paden","pabst","olmsted","newlon","mynatt","mower","morrone","moree","moffat","mixson","minner","millette","mederos","mcgahan","mcconville","maughan","massingill","marano","macri","lovern","lichtenstein","leonetti","lehner","lawley","laramie","lappin","lahti","lago","lacayo","kuester","kincade","juhl","jiron","jessop","jarosz","jain","hults","hoge","hodgins","hoban","hinkson","hillyard","herzig","hervey","henriksen","hawker","hause","hankerson","gregson","golliday","gilcrease","gessner","gerace","garwood","garst","gaillard","flinchum","fishel","fishback","filkins","fentress","fabre","ethier","eisner","ehrhart","efird","drennon","dominy","domingue","dipaolo","dinan","dimartino","deskins","dengler","defreitas","defranco","dahlin","cutshaw","cuthbert","croyle","crothers","critchfield","cowie","costner","coppedge","copes","ciccone","caufield","capo","cambron","cambridge","buser","burnes","buhl","buendia","brindley","brecht","bourgoin","blackshire","birge","benninger","bembry","beil","begaye","barrentine","banton","balmer","baity","auerbach","ambler","alexandre","ackerson","zurcher","zell","wynkoop","wallick","waid","vos","vizcaino","vester","veale","vandermark","vanderford","tuthill","trivette","thiessen","tewksbury","tao","tabron","swasey","swanigan","stoughton","stoudt","stimson","stecker","stead","spady","souther","smoak","sklar","simcox","sidwell","seybert","sesco","seeman","schwenk","schmeling","rossignol","robillard","robicheaux","riveria","rippeon","ridgley","remaley","rehkop","reddish","rauscher","quirion","pusey","pruden","pressler","potvin","pospisil","paradiso","pangburn","palmateer","ownby","otwell","osterberg","osmond","olsson","oberlander","nusbaum","novack","nokes","nicastro","nehls","naber","mulhern","motter","moretz","milian","mckeel","mcclay","mccart","matsuda","martucci","marple","marko","marciniak","manes","mancia","macrae","lybarger","lint","lineberger","levingston","lecroy","lattimer","laseter","kulick","krier","knutsen","klem","kinne","kinkade","ketterman","kerstetter","kersten","karam","joshi","jent","jefcoat","hillier","hillhouse","hettinger","henthorn","henline","helzer","heitzman","heineman","heenan","haughton","haris","harbert","haman","grinstead","gremillion","gorby","giraldo","gioia","gerardi","geraghty","gaunt","gatson","gardin","gans","gammill","friedlander","frahm","fossett","fosdick","forbush","fondren","fleckenstein","fitchett","filer","feliz","feist","ewart","esters","elsner","edgin","easterly","dussault","durazo","devereaux","deshotel","deckert","dargan","cornman","conkle","condit","claunch","clabaugh","cheesman","chea","charney","casella","carone","carbonell","canipe","campana","calles","cabezas","cabell","buttram","bustillos","buskirk","boyland","bourke","blakeley","berumen","berrier","belli","behrendt","baumbach","bartsch","baney","arambula","alldredge","allbritton","ziemba","zanders","youngquist","yoshioka","yohe","wunder","woodfin","wojtowicz","winkel","wilmore","willbanks","wesolowski","wendland","walko","votaw","vanek","uriarte","urbano","turnipseed","triche","trautman","towler","tokarz","temples","tefft","teegarden","syed","swigart","stoller","stapler","stansfield","smit","smelley","sicard","shulman","shew","shear","sheahan","sharpton","selvidge","schlesinger","savell","sandford","sabatino","rosenbloom","roepke","rish","rhames","renken","reger","quarterman","puig","prasad","poplar","pizano","pigott","phair","petrick","patt","pascua","paramore","papineau","olivieri","ogren","norden","noga","nisbet","munk","morvant","moro","moloney","merz","meltzer","mellinger","mehl","mcnealy","mckernan","mchaney","mccleskey","mcandrews","mayton","markert","maresca","maner","mandujano","malpass","macintyre","lytton","lyall","lummus","longshore","longfellow","lokey","locher","leverette","lepe","lefever","leeson","lederer","lampert","lagrone","kreider","korth","knopf","kleist","keltner","kelling","kaspar","kappler","josephs","huckins","holub","hofstetter","hoehn","higginson","hennings","heid","havel","hauer","harnden","hargreaves","hanger","guild","guidi","grate","grandy","grandstaff","goza","goodridge","goodfellow","goggans","godley","giusti","gilyard","geoghegan","galyon","gaeta","funes","font","flanary","fales","erlandson","ellett","edinger","dziedzic","duerr","draughn","donoho","dimatteo","devos","dematteo","degnan","darlington","danis","dahlstrom","dahlke","czajkowski","cumbie","culbert","crosier","croley","corry","clinger","chalker","cephas","caywood","capehart","cales","cadiz","bussiere","burriss","burkart","brundidge","bronstein","bradt","boydston","bostrom","borel","bolles","blay","blackwelder","bissett","bevers","bester","bernardino","benefiel","belote","beedle","beckles","baysinger","bassler","bartee","barlett","bargas","barefield","baptista","arterburn","armas","apperson","amoroso","amedee","zullo","zellner","yelton","willems","wilkin","wiggin","widman","welk","weingarten","walla","viers","vess","verdi","veazey","vannote","tullos","trudell","trower","trosper","trimm","trew","tousignant","topp","tocco","thoreson","terhune","tatom","suniga","sumter","steeves","stansell","soltis","sloss","slaven","shisler","shanley","servantes","selders","segrest","seese","seeber","schaible","savala","sartor","rutt","rumbaugh","ruis","roten","roessler","ritenour","riney","restivo","renard","rakestraw","rake","quiros","pullin","prudhomme","primeaux","prestridge","presswood","ponte","polzin","poarch","pittenger","piggott","pickell","phaneuf","parvin","parmley","palmeri","ozment","ormond","ordaz","ono","olea","obanion","oakman","novick","nicklas","nemec","nappi","mund","morfin","mera","melgoza","melby","mcgoldrick","mcelwain","mcchristian","mccaw","marquart","marlatt","markovich","mahr","lupton","lucus","lorusso","lerman","leddy","leaman","leachman","lavalle","laduke","kummer","koury","konopka","koh","koepp","kloss","klock","khalil","kernan","kappel","jakes","inoue","hutsell","howle","honore","hockman","hockaday","hiltz","hetherington","hesser","hershman","heffron","headen","haskett","hartline","harned","guillemette","guglielmo","guercio","greenbaum","goris","glines","gilmour","gardella","gadd","gabler","gabbert","fuselier","freudenburg","fragoso","follis","flemings","feltman","febus","farren","fallis","evert","ekstrom","eastridge","dyck","dufault","dubreuil","drapeau","domingues","dolezal","dinkel","didonato","devitt","demott","daughtrey","daubert","das","creason","crary","costilla","chipps","cheatwood","carmean","canton","caffrey","burgher","buker","brunk","brodbeck","brantner","bolivar","boerner","bodkin","biel","bencomo","bellino","beliveau","beauvais","beaupre","baylis","baskett","barcus","baltz","asay","arney","arcuri","ankney","agostini","addy","zwilling","zubia","zollinger","zeitz","yanes","winship","winningham","wickline","webre","waddington","vosburgh","verrett","varnum","vandeventer","vacca","usry","towry","touchet","tookes","tonkin","timko","tibbitts","thedford","tarleton","talty","talamantez","tafolla","sugg","strecker","steffan","spiva","slape","shatzer","seyler","seamans","schmaltz","schipper","sasso","ruppe","roudebush","riemer","richarson","revilla","reichenbach","ratley","railsback","quayle","poplin","poorman","ponton","pollitt","poitras","piscitelli","piedra","pew","perera","penwell","pelt","parkhill","paladino","ore","oram","olmo","oliveras","olivarria","ogorman","naron","muncie","mowbray","morones","moretti","monn","mitts","minks","minarik","mimms","milliron","millington","millhouse","messersmith","mcnett","mckinstry","mcgeorge","mcdill","mcateer","mazzeo","matchett","mahood","mabery","lundell","louden","losoya","lisk","lezama","leib","lebo","lanoue","lanford","lafortune","kump","krone","kreps","kott","kopecky","kolodziej","kinman","kimmons","kelty","kaster","karlson","kania","joyal","jenner","jasinski","jandreau","isenhour","hunziker","huhn","houde","houchins","holtman","hodo","heyman","hentges","hedberg","hayne","haycraft","harshbarger","harshaw","harriss","haring","hansell","hanford","handler","hamblen","gunnell","groat","gorecki","gochenour","gleeson","genest","geiser","fulghum","friese","fridley","freeborn","frailey","flaugher","fiala","ettinger","etheredge","espitia","eriksen","engelbrecht","engebretson","elie","eickhoff","edney","edelen","eberhard","eastin","eakes","driggs","doner","donaghy","disalvo","deshong","dahms","dahlquist","curren","cripe","cree","creager","corle","conatser","commons","coggin","coder","coaxum","closson","clodfelter","classen","chittenden","castilleja","casale","cartee","carriere","canup","canizales","burgoon","bunger","bugarin","buchanon","bruning","bruck","brookes","broadwell","brier","brekke","breese","bracero","bowley","bowersox","bose","bogar","blauser","blacker","bjorklund","baumer","basler","baize","baden","auman","amundsen","amore","alvarenga","adamczyk","yerkes","yerby","yamaguchi","worthey","wolk","wixom","wiersma","wieczorek","whiddon","weyer","wetherington","wein","watchman","warf","wansley","vesely","velazco","vannorman","valasquez","utz","urso","turco","turbeville","trivett","toothaker","toohey","tondreau","thaler","sylvain","swindler","swigert","swider","stiner","stever","steffes","stampley","stair","smidt","skeete","silvestre","shutts","shealey","seigler","schweizer","schuldt","schlichting","scherr","saulsberry","saner","rosin","rosato","roling","rohn","rix","rister","remley","remick","recinos","ramm","raabe","pursell","poythress","poli","pokorny","pettry","petrey","petitt","penman","payson","paquet","pappalardo","outland","orenstein","nuttall","nuckols","nott","nimmo","murtagh","mousseau","moulder","mooneyhan","moak","minch","miera","mercuri","meighan","mcnelly","mcguffin","mccreery","mcclaskey","mainor","luongo","lundstrom","loughman","lobb","linhart","lever","leu","leiter","lehoux","lehn","lares","lapan","langhorne","lamon","ladwig","ladson","kuzma","kreitzer","knop","keech","kea","kadlec","jhonson","jantz","inglis","husk","hulme","housel","hofman","hillery","heidenreich","heaps","haslett","harting","hartig","hamler","halton","hallum","gutierres","guida","guerrier","grossi","gress","greenhalgh","gravelle","gow","goslin","gonyea","gipe","gerstner","gasser","garceau","gannaway","gama","gallop","gaiser","fullilove","foutz","fossum","flannagan","farrior","faller","ericksen","entrekin","enochs","englund","ellenberger","eastland","earwood","dudash","drozd","desoto","delph","dekker","dejohn","degarmo","defeo","defalco","deblois","dacus","cudd","crossen","crooms","cronan","costin","cordray","comerford","colegrove","coldwell","claassen","chartrand","castiglione","carte","cardella","carberry","capp","capobianco","cangelosi","buch","brunell","brucker","brockett","brizendine","brinegar","brimer","brase","bosque","bonk","bolger","bohanon","bohan","blazek","berning","bergan","bennette","beauchemin","battiste","barra","balogh","avallone","aubry","ashcroft","asencio","arledge","anchondo","alvord","acheson","zaleski","yonker","wyss","wycoff","woodburn","wininger","winders","willmon","wiechmann","westley","weatherholt","warnick","wardle","warburton","volkert","villanveva","veit","vass","vanallen","tung","toribio","toothman","tiggs","thornsberry","thome","tepper","teeple","tebo","tassone","tann","stucker","stotler","stoneman","stehle","stanback","stallcup","spurr","speers","spada","solum","smolen","sinn","silvernail","sholes","shives","shain","secrest","seagle","schuette","schoch","schnieders","schild","schiavone","schiavo","scharff","santee","sandell","salvo","rollings","rivenburg","ritzman","rist","reynosa","retana","regnier","rarick","ransome","rall","propes","prall","poyner","ponds","poitra","pippins","pinion","phu","perillo","penrose","pendergraft","pelchat","patenaude","palko","odoms","oddo","novoa","noone","newburn","negri","nantz","mosser","moshier","molter","molinari","moler","millman","meurer","mendel","mcray","mcnicholas","mcnerney","mckillip","mcilvain","mcadory","marmol","marinez","manzer","mankin","makris","majeski","maffei","luoma","luman","luebke","luby","lomonaco","loar","litchford","lintz","licht","levenson","legge","lanigan","krom","kreger","koop","kober","klima","kitterman","kinkead","kimbell","kilian","kibbe","kendig","kemmer","kash","jenkin","inniss","hurlbut","hunsucker","huckabee","hoxie","hoglund","hockensmith","hoadley","hinkel","higuera","herrman","heiner","hausmann","haubrich","hassen","hanlin","hallinan","haglund","hagberg","gullo","gullion","groner","greenwalt","gobert","glowacki","glessner","gines","gildersleeve","gildea","gerke","gebhard","gatton","gately","galasso","fralick","fouse","fluharty","faucette","fairfax","evanoff","elser","ellard","egerton","ector","ebling","dunkel","duhart","drysdale","dostal","dorey","dolph","doles","dismukes","digregorio","digby","dewees","deramus","denniston","dennett","deloney","delaughter","cuneo","cumberland","crotts","crosswhite","cremeans","creasey","cottman","cothern","costales","cosner","corpus","colligan","cobble","clutter","chupp","chevez","chatmon","chaires","caplan","caffee","cabana","burrough","burditt","buckler","brunswick","brouillard","broady","bowlby","bouley","borgman","boltz","boddy","blackston","birdsell","bedgood","bate","bartos","barriga","barna","barcenas","banach","baccus","auclair","ashman","arter","arendt","ansell","allums","allender","alber","albarran","adelson","zoll","wysong","wimbley","wildes","whitis","whitehill","whicker","weymouth","weldy","wark","wareham","waddy","viveiros","vath","vandoren","vanderhoof","unrein","uecker","tsan","trepanier","tregre","torkelson","tobler","tineo","timmer","swopes","swofford","sweeten","swarts","summerfield","sumler","stucky","strozier","stigall","stickel","stennis","stelzer","steely","slayden","skillern","shurtz","shelor","shellenbarger","shand","shabazz","seo","scroggs","schwandt","schrecengost","schoenrock","schirmer","sandridge","ruzicka","rozek","rowlands","roser","rosendahl","romanowski","rolston","riggio","reichman","redondo","reay","rawlinson","raskin","raine","quandt","purpura","pruneda","prevatte","prettyman","pinedo","pierro","pidgeon","phillippi","pfeil","penix","peasley","paro","ospina","ortegon","ogata","ogara","normandin","nordman","nims","nassar","motz","morlan","mooring","moles","moir","mizrahi","mire","minaya","millwood","mikula","messmer","meikle","mctaggart","mcgonagle","mcewan","mccasland","mccane","mccaffery","mcalexander","mattocks","matranga","martone","markland","maravilla","manno","mancha","mallery","magno","lorentz","locklin","livingstone","lipford","lininger","lepley","leming","lemelin","leadbetter","lawhon","lattin","langworthy","lampman","lambeth","lamarr","lahey","krajewski","klopp","kinnison","kestner","kennell","karim","jozwiak","jakubowski","ivery","iliff","iddings","hudkins","houseman","holz","holderman","hoehne","highfill","hiett","heskett","heldt","hedman","hayslett","hatchell","hasse","hamon","hamada","hakala","haislip","haffey","hackbarth","guo","gullickson","guerrette","greenblatt","goudreau","gongora","godbout","glaude","gills","gillison","gigliotti","gargano","gallucci","galli","galante","frasure","fodor","fizer","fishburn","finkbeiner","finck","fager","estey","espiritu","eppinger","epperly","emig","eckley","dray","dorsch","dille","devita","deslauriers","demery","delorme","delbosque","dauphin","dantonio","curd","crume","cozad","cossette","comacho","climer","chadbourne","cespedes","cayton","castaldo","carpino","carls","capozzi","canela","buzard","busick","burlison","brinkmann","bridgeforth","bourbeau","bornstein","bonfiglio","boice","boese","biondi","bilski","betton","berwick","berlanga","behan","becraft","barrientez","banh","balke","balderrama","bahe","bachand","armer","arceo","aliff","alatorre","zermeno","younce","yeoman","yamasaki","wroten","woodby","winer","willits","wilcoxon","wehmeyer","waterbury","wass","wann","wachtel","vizcarra","veitch","vanderbilt","vallone","vallery","ureno","tyer","tipps","tiedeman","theberge","texeira","taub","tapscott","stutts","stults","stukes","spink","sottile","smithwick","slane","simeone","silvester","siegrist","shiffer","sheedy","sheaffer","severin","sellman","scotto","schupp","schueller","schreier","schoolcraft","schoenberger","schnabel","sangster","samford","saliba","ryles","ryans","rossetti","rodriguz","risch","riel","rezendes","rester","rencher","recker","rathjen","profitt","poteete","polizzi","perrigo","patridge","osby","orvis","opperman","oppenheim","onorato","olaughlin","ohagan","ogles","oehler","obyrne","nuzzo","nickle","nease","neagle","navarette","nagata","musto","morison","montz","mogensen","mizer","miraglia","migliore","menges","mellor","mcnear","mcnab","mcloud","mcelligott","mccollom","maynes","marquette","markowski","marcantonio","maldanado","macey","lundeen","longino","lisle","linthicum","limones","lesure","lesage","lauver","laubach","latshaw","lary","lapham","lacoste","lacher","kutcher","knickerbocker","klos","klingler","kleiman","kittleson","kimbrel","kemmerer","kelson","keese","kallas","jurgensen","junkins","juergens","jolliff","jelks","janicki","jang","ingles","huguley","huggard","howton","hone","holford","hogle","hipple","heimbach","heider","heidel","havener","hattaway","harrah","hanscom","hankinson","hamdan","gridley","goulette","goulart","goodrow","girardi","gent","gautreau","gandara","gamblin","galipeau","fyffe","furrow","fulp","fricks","frase","frandsen","fout","foulks","fouche","foskey","forgey","foor","fobbs","finklea","fincham","figueiredo","festa","ferrier","fellman","eslick","eilerman","eckart","eaglin","dunfee","dumond","drewry","douse","dimick","diener","dickert","deines","declue","daw","dattilo","danko","custodio","cuccia","crunk","crispin","corp","corea","coppin","considine","coniglio","conboy","cockrum","clute","clewis","christiano","channell","cerrato","cecere","catoe","castillon","castile","carstarphen","carmouche","caperton","buteau","bumpers","brey","brazeal","brassard","braga","bradham","bourget","borrelli","borba","boothby","bohr","bohm","boehme","bodin","bloss","blocher","bizzell","bieker","berthelot","bernardini","berends","benard","belser","baze","bartling","barrientes","barras","barcia","banfield","aurand","artman","arnott","arend","amon","almaguer","allee","albarado","alameda","abdo","zuehlke","zoeller","yokoyama","yocom","wyllie","woolum","wint","winland","wilner","wilmes","whitlatch","westervelt","walthall","walkowiak","walburn","viviano","vanderhoff","valez","ugalde","trumbull","todaro","tilford","tidd","tibbits","terranova","templeman","tannenbaum","talmage","tabarez","swearengin","swartwood","svendsen","strum","strack","storie","stockard","steinbeck","starns","stanko","stankiewicz","stacks","stach","sproles","spenser","smotherman","slusser","sinha","silber","siefert","siddiqui","shuff","sherburne","seldon","seddon","schweigert","schroeter","schmucker","saffold","rutz","rundle","rosinski","rosenow","rogalski","ridout","rhymer","replogle","raygoza","ratner","rascoe","rahm","quast","pressnell","predmore","pou","porto","pleasants","pigford","pavone","patnaude","parramore","papadopoulos","palmatier","ouzts","oshields","ortis","olmeda","olden","okamoto","norby","nitz","niebuhr","nevius","neiman","neidig","neece","murawski","mroz","moylan","moultry","mosteller","moring","morganti","mook","moffet","mettler","merlo","mengel","mendelsohn","meli","melchior","mcmeans","mcfaddin","mccullers","mccollister","mccloy","mcclaine","maury","maser","martelli","manthey","malkin","maio","magwood","maginnis","mabon","luton","lusher","lucht","lobato","levis","letellier","legendre","latson","larmon","largo","landreneau","landgraf","lamberson","kurland","kresge","korman","korando","klapper","kitson","kinyon","kincheloe","kawamoto","kawakami","jenney","jeanpierre","ivers","issa","ince","hollier","hollars","hoerner","hodgkinson","hiott","hibbitts","herlihy","henricks","heavner","hayhurst","harvill","harewood","hanselman","hanning","gustavson","grizzard","graybeal","gravley","gorney","goll","goehring","godines","gobeil","glickman","giuliano","gimbel","geib","gayhart","gatti","gains","gadberry","frei","fraise","fouch","forst","forsman","folden","fogleman","fetty","feely","fabry","eury","estill","epling","elamin","echavarria","dutil","duryea","dumais","drago","downard","douthit","doolin","dobos","dison","dinges","diebold","desilets","deshazo","depaz","degennaro","dall","cyphers","cryer","croce","crisman","credle","coriell","copp","compos","colmenero","cogar","carnevale","campanella","caley","calderone","burtch","brouwer","brehmer","brassell","brafford","bourquin","bourn","bohnert","blewett","blass","blakes","bhakta","besser","berge","bellis","balfour","avera","applin","ammon","alsop","aleshire","akbar","zoller","zapien","wymore","wyble","wolken","wix","wickstrom","whobrey","whigham","westerlund","welsch","weisser","weisner","weinstock","wehner","watlington","wakeland","wafer","victorino","veltri","veith","urich","uresti","umberger","twedt","tuohy","tschida","trumble","troia","trimmer","topps","tonn","tiernan","threet","thrall","thetford","teneyck","tartaglia","strohl","streater","strausbaugh","stradley","stonecipher","steadham","stansel","stalcup","stabile","sprenger","spradley","speier","southwood","sorrels","slezak","skow","sirmans","simental","sifford","sievert","shover","sheley","selzer","scriven","schwindt","schwan","schroth","saylors","saragosa","sant","salaam","saephan","routt","rousey","ros","rolfes","rieke","rieder","richeson","redinger","rasnick","rapoza","rambert","quist","pyron","pullman","przybylski","pridmore","pooley","pines","perkinson","perine","perham","pecor","peavler","partington","panton","oliverio","olague","ohman","ohearn","noyola","nicolai","nebel","murtha","mowrey","moroney","morgenstern","morant","monsour","moffit","mijares","meriwether","mendieta","melendrez","mejorado","mckittrick","mckey","mckenny","mckelvy","mcelvain","mccoin","mazzarella","mazon","maurin","matthies","maston","maske","marzano","marmon","marburger","mangus","mangino","mallet","luo","losada","londono","lobdell","lipson","lesniak","leighty","lei","lavallie","lareau","laperle","lape","laforce","laffey","kuehner","kravitz","kowalsky","kohr","kinsman","keppler","kennemer","keiper","kaler","jun","jelinek","jarnagin","isakson","hypes","hutzler","huls","horak","hitz","hice","herrell","henslee","heitz","heiss","heiman","hasting","hartwick","harmer","hammontree","hakes","guse","guillotte","groleau","greve","greenough","golub","golson","goldschmidt","golder","godbolt","gilmartin","gies","gibby","geren","genthner","gendreau","gemmill","gaymon","galyean","galeano","friar","folkerts","fleeman","fitzgibbons","ferranti","felan","farrand","eoff","enger","engels","ducksworth","duby","drumheller","douthitt","donis","dixion","dittrich","dials","descoteaux","depaul","denker","demuth","demelo","delacerda","deforge","danos","dalley","daigneault","cybulski","cothren","corns","corkery","copas","clubb","clore","chitty","chichester","chace","catanzaro","castonguay","cassella","carlberg","cammarata","calle","cajigas","byas","buzbee","busey","burling","bufkin","brzezinski","brun","brickner","brabham","boller","bockman","bleich","blakeman","bisbee","bier","bezanson","bevilacqua","besaw","berrian","bequette","beauford","baumgarten","baudoin","batie","basaldua","bardin","bangert","banes","backlund","avitia","artz","archey","apel","amico","alam","aden","zebrowski","yokota","wormley","wootton","womac","wiltz","wigington","whitehorn","whisman","weisgerber","weigle","weedman","watkin","wasilewski","wadlington","wadkins","viverette","vidaurri","vidales","vezina","vanleer","vanhoy","vanguilder","vanbrunt","updegraff","tylor","trinkle","touchette","tilson","tilman","tengan","tarkington","surrett","summy","streetman","straughter","steere","spruell","spadaro","solley","smathers","silvera","siems","shreffler","sholar","selden","schaper","samayoa","ruggeri","rowen","rosso","rosenbalm","roose","ronquillo","rogowski","rexford","repass","renzi","renick","rehberg","ranck","raffa","rackers","raap","puglisi","prinz","pounders","pon","pompa","plasencia","pipkins","petrosky","pelley","pauls","pauli","parkison","parisien","pangle","pancoast","palazzolo","owenby","overbay","orris","orlowski","nipp","newbern","nedd","nealon","najar","mysliwiec","myres","musson","murrieta","munsell","mumma","muldowney","moyle","mowen","morejon","moodie","monier","mikkelsen","miers","metzinger","melin","mcquay","mcpeek","mcneeley","mcglothin","mcghie","mcdonell","mccumber","mccranie","mcbean","mayhugh","marts","marenco","manges","lynam","lupien","luff","luebbert","loh","loflin","lococo","loch","lis","linke","lightle","lewellyn","leishman","lebow","lebouef","leanos","lanz","landy","landaverde","lacefield","kyler","kuebler","kropf","kroeker","kluesner","klass","kimberling","kilkenny","kiker","ketter","kelemen","keasler","kawamura","karst","kardos","igo","huseman","huseby","hurlbert","huard","hottinger","hornberger","hopps","holdsworth","hensen","heilig","heeter","harpole","haak","gutowski","gunnels","grimmer","gravatt","granderson","gotcher","gleaves","genao","garfinkel","frerichs","foushee","flanery","finnie","feldt","fagin","ewalt","ellefson","eiler","eckhart","eastep","digirolamo","didomenico","devera","delavega","defilippo","debusk","daub","damiani","cupples","crofoot","courter","coto","costigan","corning","corman","corlett","cooperman","collison","coghlan","cobbins","coady","coachman","clothier","cipolla","chmielewski","chiodo","chatterton","chappelle","chairez","ceron","casperson","casler","casados","carrow","carlino","carico","cardillo","caouette","canto","canavan","cambra","byard","buterbaugh","buse","bucy","buckwalter","bubb","bryd","brissette","brault","bradwell","boshears","borchert","blansett","biondo","biehl","bessey","belles","beeks","beekman","beaufort","bayliss","bardsley","avilla","astudillo","ardito","antunez","aderholt","abate","yowell","yin","yearby","wurst","woolverton","woolbright","wildermuth","whittenburg","whitely","wetherbee","wenz","welliver","welling","wason","warlick","voorhies","vivier","villines","verde","veiga","varghese","vanwyk","vanwingerden","vanhorne","umstead","twiggs","tusing","trego","tompson","tinkle","thoman","thole","tatman","tartt","suda","studley","strock","strawbridge","stokely","stec","stalter","speidel","spafford","sontag","sokolowski","skillman","skelley","skalski","sison","sippel","sinquefield","siegle","sher","sharrow","setliff","sellner","selig","seibold","seery","scriber","schull","schrupp","schippers","saulsbury","sao","santillo","sanor","rubalcaba","roosa","ronk","robbs","roache","riebe","reinoso","quin","preuss","pottorff","pontiff","plouffe","picou","picklesimer","pettyjohn","petti","penaloza","parmelee","pardee","palazzo","overholt","ogawa","ofarrell","nolting","noda","nickson","nevitt","neveu","navarre","murrow","munz","mulloy","monzo","milliman","metivier","merlino","mcpeters","mckissack","mckeen","mcgurk","mcfee","mcfarren","mcelwee","mceachin","mcdonagh","mccarville","mayhall","mattoon","martello","marconi","marbury","manzella","maly","malec","maitland","maheu","maclennan","lyke","luera","lowenstein","losh","lopiccolo","longacre","loman","loden","loaiza","lieber","libbey","lenhardt","lefebre","lauterbach","lauritsen","lass","larocco","larimer","lansford","lanclos","lamay","lal","kulikowski","kriebel","kosinski","kleinman","kleiner","kleckner","kistner","kissner","kissell","keisler","keeble","keaney","kale","joly","jimison","ikner","hursey","hruska","hove","hou","hosking","hoose","holle","hoeppner","hittle","hitchens","hirth","hinerman","higby","hertzog","hentz","hensler","heier","hegg","hassel","harpe","hara","hain","hagopian","grimshaw","grado","gowin","gowans","googe","goodlow","goering","gleaton","gidley","giannone","gascon","garneau","gambrel","galaz","fuentez","frisina","fresquez","fraher","feuerstein","felten","everman","ertel","erazo","ensign","endo","ellerman","eichorn","edgell","ebron","eaker","dundas","duncanson","duchene","ducan","dombroski","doman","dickison","dewoody","deloera","delahoussaye","dejean","degroat","decaro","dearmond","dashner","dales","crossett","cressey","cowger","cornette","corbo","coplin","coover","condie","cokley","ceaser","cannaday","callanan","cadle","buscher","bullion","bucklin","bruening","bruckner","brose","branan","bradway","botsford","bortz","borelli","bonetti","bolan","boerger","bloomberg","bingman","bilger","berns","beringer","beres","beets","beede","beaudet","beachum","baughn","bator","bastien","basquez","barreiro","barga","baratta","balser","baillie","axford","attebery","arakaki","annunziata","andrzejewski","ament","amendola","adcox","abril","zenon","zeitler","zambrana","ybanez","yagi","wolak","wilcoxson","whitesel","whitehair","weyand","westendorf","welke","weinmann","weesner","weekes","wedel","weatherall","warthen","vose","villalta","viator","vaz","valtierra","urbanek","tulley","trojanowski","trapani","toups","torpey","tomita","tindal","tieman","tevis","tedrow","taul","tash","tammaro","sylva","swiderski","sweeting","sund","stutler","stich","sterns","stegner","stalder","splawn","speirs","southwell","soltys","smead","slye","skipworth","sipos","simmerman","sidhu","shuffler","shingleton","shadwick","sermons","seefeldt","scipio","schwanke","schreffler","schiro","scheiber","sandoz","samsel","ruddell","royse","rouillard","rotella","rosalez","romriell","rizer","riner","rickards","rhoton","rhem","reppert","rayl","raulston","raposo","rainville","radel","quinney","purdie","pizzo","pincus","petrus","pendelton","pendarvis","peltz","peguero","peete","patricio","patchett","parrino","papke","palafox","ottley","ostby","oritz","ogan","odegaard","oatman","noell","nicoll","newhall","newbill","netzer","nettleton","neblett","murley","mungo","mulhall","mosca","morissette","morford","monsen","mitzel","miskell","minder","mehaffey","mcquillen","mclennan","mcgrail","mccreight","mayville","maysonet","maust","mathieson","mastrangelo","maskell","manz","malmberg","makela","madruga","lotts","longnecker","logston","littell","liska","lindauer","lillibridge","levron","letchworth","lesh","leffel","leday","leamon","kulas","kula","kucharski","kromer","kraatz","konieczny","konen","komar","kivett","kirts","kinnear","kersh","keithley","keifer","judah","jimenes","jeppesen","jansson","huntsberry","hund","huitt","huffine","hosford","holmstrom","hollen","hodgin","hirschman","hiltner","hilliker","hibner","hennis","helt","heidelberg","heger","heer","hartness","hardrick","halladay","gula","guillaume","guerriero","grunewald","grosse","griffeth","grenz","grassi","grandison","ginther","gimenez","gillingham","gillham","gess","gelman","gearheart","gaskell","gariepy","gamino","gallien","galentine","fuquay","froman","froelich","friedel","foos","fomby","focht","flythe","fiqueroa","filson","filip","fierros","fett","fedele","fasching","farney","fargo","everts","etzel","elzey","eichner","eger","eatman","ducker","duchesne","donati","domenech","dollard","dodrill","dinapoli","denn","delfino","delcid","delaune","delatte","deems","daluz","cusson","cullison","cuadrado","crumrine","cruickshank","crosland","croll","criddle","crepeau","coutu","couey","cort","coppinger","collman","cockburn","coca","clayborne","claflin","cissell","chowdhury","chicoine","chenier","causby","caulder","cassano","casner","cardiel","brunton","bruch","broxton","brosius","brooking","branco","bracco","bourgault","bosserman","bonet","bolds","bolander","bohman","boelter","blohm","blea","blaise","bischof","beus","bellew","bastarache","bast","bartolome","barcomb","barco","balk","balas","bakos","avey","atnip","ashbrook","arno","arbour","aquirre","appell","aldaco","alban","ahlstrom","abadie","zylstra","zick","yother","wyse","wunsch","whitty","weist","vrooman","villalon","vidrio","vavra","vasbinder","vanmatre","vandorn","ugarte","turberville","tuel","trogdon","toupin","toone","tolleson","tinkham","tinch","tiano","teston","teer","tawney","taplin","tant","tansey","swayne","sutcliffe","sunderman","strothers","stromain","stork","stoneburner","stolte","stolp","stoehr","stingley","stegman","stangl","spinella","spier","soules","sommerfield","sipp","simek","siders","shufelt","shue","shor","shires","shellenberger","sheely","sepe","seaberg","schwing","scherrer","scalzo","sasse","sarvis","santora","sansbury","salls","saleem","ryland","rybicki","ruggieri","rothenberg","rosenstein","roquemore","rollison","rodden","rivet","ridlon","riche","riccardi","reiley","regner","rech","rayo","raff","radabaugh","quon","quill","privette","prange","pickrell","perino","penning","pankratz","orlandi","nyquist","norrell","noren","naples","nale","nakashima","musselwhite","murrin","murch","mullinix","mullican","mullan","morneau","mondor","molinar","minjares","minix","minchew","milewski","mikkelson","mifflin","merkley","meis","meas","mcroy","mcphearson","mcneel","mcmunn","mcmorrow","mcdorman","mccroskey","mccoll","mcclusky","mcclaran","mccampbell","mazzariello","mauzy","mauch","mastro","martinek","marsala","marcantel","mahle","luciani","lubbers","lobel","linch","liller","legros","layden","lapine","lansberry","lage","laforest","labriola","koga","knupp","klimek","kittinger","kirchoff","kinzel","killinger","kilbourne","ketner","kepley","kemble","kells","kear","kaya","karsten","kaneshiro","kamm","joines","joachim","jacobus","iler","holgate","hoar","hisey","hird","hilyard","heslin","herzberg","hennigan","hegland","hartl","haner","handel","gualtieri","greenly","grasser","goetsch","godbold","gilland","gidney","gibney","giancola","gettinger","garzon","galle","galgano","gaier","gaertner","fuston","freel","fortes","fiorillo","figgs","fenstermacher","fedler","facer","fabiano","evins","euler","esquer","enyeart","elem","eich","edgerly","durocher","durgan","duffin","drolet","drewes","dotts","dossantos","dockins","dirksen","difiore","dierks","dickerman","dery","denault","demaree","delmonte","delcambre","daulton","darst","dahle","curnutt","cully","culligan","cueva","crosslin","croskey","cromartie","crofts","covin","coutee","coppa","coogan","condrey","concannon","coger","cloer","clatterbuck","cieslak","chumbley","choudhury","chiaramonte","charboneau","carneal","cappello","campisi","callicoat","burgoyne","bucholz","brumback","brosnan","brogden","broder","brendle","breece","bown","bou","boser","bondy","bolster","boll","bluford","blandon","biscoe","bevill","bence","battin","basel","bartram","barnaby","barmore","balbuena","badgley","backstrom","auyeung","ater","arrellano","arant","ansari","alling","alejandre","alcock","alaimo","aguinaldo","aarons","zurita","zeiger","zawacki","yutzy","yarger","wygant","wurm","wuest","witherell","wisneski","whitby","whelchel","weisz","weisinger","weishaar","wehr","waxman","waldschmidt","walck","waggener","vosburg","villela","vercher","venters","vanscyoc","vandyne","valenza","utt","urick","ungar","ulm","tumlin","tsao","tryon","trudel","treiber","tober","tipler","tillson","tiedemann","thornley","tetrault","temme","tarrance","tackitt","sykora","sweetman","swatzell","sutliff","suhr","sturtz","strub","strayhorn","stormer","steveson","stengel","steinfeldt","spiro","spieker","speth","spero","soza","souliere","soucie","snedeker","slifer","skillings","situ","siniard","simeon","signorelli","siggers","shultis","shrewsbury","shippee","shimp","shepler","sharpless","shadrick","severt","severs","semon","semmes","seiter","segers","sclafani","sciortino","schroyer","schrack","schoenberg","schober","scheidt","scheele","satter","sartori","sarratt","salvaggio","saladino","sakamoto","saine","ryman","rumley","ruggerio","rucks","roughton","robards","ricca","rexroad","resler","reny","rentschler","redrick","redick","reagle","raymo","raker","racette","pyburn","pritt","presson","pressman","pough","pisani","perz","perras","pelzer","pedrosa","palos","palmisano","paille","orem","orbison","oliveros","nourse","nordquist","newbury","nelligan","nawrocki","myler","mumaw","morphis","moldenhauer","miyashiro","mignone","mickelsen","michalec","mesta","mcree","mcqueary","mcninch","mcneilly","mclelland","mclawhorn","mcgreevy","mcconkey","mattes","maselli","marten","marcucci","manseau","manjarrez","malbrough","machin","mabie","lynde","lykes","lueras","lokken","loken","linzy","lillis","lilienthal","levey","legler","leedom","lebowitz","lazzaro","larabee","lapinski","langner","langenfeld","lampkins","lamotte","lambright","lagarde","ladouceur","labounty","lablanc","laberge","kyte","kroon","kron","kraker","kouba","kirwin","kincer","kimbler","kegler","keach","katzman","katzer","kalman","jimmerson","jenning","janus","iacovelli","hust","huson","husby","humphery","hufnagel","honig","holsey","holoman","hohl","hogge","hinderliter","hildebrant","hemby","helle","heintzelman","heidrick","hearon","hazelip","hauk","hasbrouck","harton","hartin","harpster","hansley","hanchett","haar","guthridge","gulbranson","guill","guerrera","grund","grosvenor","grist","grell","grear","granberry","gonser","giunta","giuliani","gillon","gillmore","gillan","gibbon","gettys","gelb","gano","galliher","fullen","frese","frates","foxwell","fleishman","fleener","fielden","ferrera","fells","feemster","fauntleroy","evatt","espy","eno","emmerich","edler","eastham","dunavant","duca","drinnon","dowe","dorgan","dollinger","dipalma","difranco","dietrick","denzer","demarest","delee","delariva","delany","decesare","debellis","deavers","deardorff","dawe","darosa","darley","dalzell","dahlen","curto","cupps","cunniff","cude","crivello","cripps","cresswell","cousar","cotta","compo","clyne","clayson","cearley","catania","carini","cantero","buttrey","buttler","burpee","bulkley","buitron","buda","bublitz","bryer","bryden","brouillette","brott","brookman","bronk","breshears","brennen","brannum","brandl","braman","bracewell","boyter","bomberger","bogen","boeding","blauvelt","blandford","biermann","bielecki","bibby","berthold","berkman","belvin","bellomy","beland","behne","beecham","becher","bax","bassham","barret","baley","auxier","atkison","ary","arocha","arechiga","anspach","algarin","alcott","alberty","ager","ackman","abdallah","zwick","ziemer","zastrow","zajicek","yokum","yokley","wittrock","winebarger","wilker","wilham","whitham","wetzler","westling","westbury","wendler","wellborn","weitzman","weitz","wallner","waldroup","vrabel","vowels","volker","vitiello","visconti","villicana","vibbert","vesey","vannatter","vangilder","vandervort","vandegrift","vanalstyne","vallecillo","usrey","tynan","turpen","tuller","trisler","townson","tillmon","threlkeld","thornell","terrio","taunton","tarry","tardy","swoboda","swihart","sustaita","suitt","stuber","strine","stookey","stmartin","stiger","stainbrook","solem","smail","sligh","siple","sieben","shumake","shriner","showman","sheen","sheckler","seim","secrist","scoggin","schultheis","schmalz","schendel","schacher","savard","saulter","santillanes","sandiford","sande","salzer","salvato","saltz","sakai","ryckman","ryant","ruck","rittenberry","ristau","richart","rhynes","reyer","reulet","reser","redington","reddington","rebello","reasor","raftery","rabago","raasch","quintanar","pylant","purington","provencal","prioleau","prestwood","pothier","popa","polster","politte","poffenberger","pinner","pietrzak","pettie","penaflor","pellot","pellham","paylor","payeur","papas","paik","oyola","osbourn","orzechowski","oppenheimer","olesen","oja","ohl","nuckolls","nordberg","noonkester","nold","nitta","niblett","neuhaus","nesler","nanney","myrie","mutch","mosquera","morena","montalto","montagna","mizelle","mincy","millikan","millay","miler","milbourn","mikels","migues","miesner","mershon","merrow","meigs","mealey","mcraney","mcmartin","mclachlan","mcgeehan","mcferren","mcdole","mccaulley","mcanulty","maziarz","maul","mateer","martinsen","marson","mariotti","manna","mance","malbon","magnusson","maclachlan","macek","lurie","luc","lown","loranger","lonon","lisenby","linsley","lenk","leavens","lauritzen","lathem","lashbrook","landman","lamarche","lamantia","laguerre","lagrange","kogan","klingbeil","kist","kimpel","kime","kier","kerfoot","kennamer","kellems","kammer","kamen","jepsen","jarnigan","isler","ishee","hux","hungate","hummell","hultgren","huffaker","hruby","hornick","hooser","hooley","hoggan","hirano","hilley","higham","heuser","henrickson","henegar","hellwig","hedley","hasegawa","hartt","hambright","halfacre","hafley","guion","guinan","grunwald","grothe","gries","greaney","granda","grabill","gothard","gossman","gosser","gossard","gosha","goldner","gobin","ginyard","gilkes","gilden","gerson","gephart","gengler","gautier","gassett","garon","galusha","gallager","galdamez","fulmore","fritsche","fowles","foutch","footman","fludd","ferriera","ferrero","ferreri","fenimore","fegley","fegan","fearn","farrier","fansler","fane","falzone","fairweather","etherton","elsberry","dykema","duppstadt","dunnam","dunklin","duet","dudgeon","dubuc","doxey","donmoyer","dodgen","disanto","dingler","dimattia","dilday","digennaro","diedrich","derossett","depp","demasi","degraffenreid","deakins","deady","davin","daigre","daddario","czerwinski","cullens","cubbage","cracraft","combest","coletti","coghill","claybrooks","christofferse","chiesa","chason","chamorro","celentano","cayer","carolan","carnegie","capetillo","callier","cadogan","caba","byrom","byrns","burrowes","burket","burdge","burbage","buchholtz","brunt","brungardt","brunetti","brumbelow","brugger","broadhurst","brigance","brandow","bouknight","bottorff","bottomley","bosarge","borger","bombardier","boggan","blumer","blecha","birney","birkland","betances","beran","belin","belgrave","bealer","bauch","bashir","bartow","baro","barnhouse","barile","ballweg","baisley","bains","baehr","badilla","bachus","bacher","bachelder","auzenne","aten","astle","allis","agarwal","adger","adamek","ziolkowski","zinke","zazueta","zamorano","younkin","wittig","witman","winsett","winkles","wiedman","whitner","whitcher","wetherby","westra","westhoff","wehrle","wagaman","voris","vicknair","veasley","vaugh","vanderburg","valletta","tunney","trumbo","truluck","trueman","truby","trombly","tourville","tostado","titcomb","timpson","tignor","thrush","thresher","thiede","tews","tamplin","taff","tacker","syverson","sylvestre","summerall","stumbaugh","strouth","straker","stradford","stokley","steinhoff","steinberger","spigner","soltero","snively","sletten","sinkler","sinegal","simoes","siller","sigel","shire","shinkle","shellman","sheller","sheats","sharer","selvage","sedlak","schriver","schimke","scheuerman","schanz","savory","saulters","sauers","sais","rusin","rumfelt","ruhland","rozar","rosborough","ronning","rolph","roloff","robie","rimer","riehle","ricco","rhein","retzlaff","reisman","reimann","rayes","raub","raminez","quesinberry","pua","procopio","priolo","printz","prewett","preas","prahl","poovey","ploof","platz","plaisted","pinzon","pineiro","pickney","petrovich","perl","pehrson","peets","pavon","pautz","pascarella","paras","paolini","pafford","oyer","ovellette","outten","outen","orduna","odriscoll","oberlin","nosal","niven","nisbett","nevers","nathanson","mukai","mozee","mowers","motyka","morency","montford","mollica","molden","mitten","miser","millender","midgette","messerly","melendy","meisel","meidinger","meany","mcnitt","mcnemar","mcmakin","mcgaugh","mccaa","mauriello","maudlin","matzke","mattia","matsumura","masuda","mangels","maloof","malizia","mahmoud","maglione","maddix","lucchesi","lochner","linquist","lietz","leventhal","lemanski","leiser","laury","lauber","lamberth","kuss","kulik","kuiper","krout","kotter","kort","kohlmeier","koffler","koeller","knipe","knauss","kleiber","kissee","kirst","kirch","kilgo","kerlin","kellison","kehl","kalb","jorden","jantzen","inabinet","ikard","husman","hunsberger","hundt","hucks","houtz","houseknecht","hoots","hogsett","hogans","hintze","hession","henault","hemming","helsley","heinen","heffington","heberling","heasley","hazley","hazeltine","hayton","hayse","hawke","haston","harward","harrow","hanneman","hafford","hadnot","guerro","grahm","gowins","gordillo","goosby","glatt","gibbens","ghent","gerrard","germann","gebo","gean","garling","gardenhire","garbutt","gagner","furguson","funchess","fujiwara","fujita","friley","frigo","forshee","folkes","filler","fernald","ferber","feingold","faul","farrelly","fairbank","failla","espey","eshleman","ertl","erhart","erhardt","erbe","elsea","ells","ellman","eisenhart","ehmann","earnhardt","duplantis","dulac","ducote","draves","dosch","dolce","divito","dimauro","derringer","demeo","demartini","delima","dehner","degen","defrancisco","defoor","dedeaux","debnam","cypert","cutrer","cusumano","custis","croker","courtois","costantino","cormack","corbeil","copher","conlan","conkling","cogdell","cilley","chapdelaine","cendejas","castiglia","cashin","carstensen","caprio","calcote","calaway","byfield","butner","bushway","burritt","browner","brobst","briner","bridger","brickley","brendel","bratten","bratt","brainerd","brackman","bowne","bouck","borunda","bordner","bonenfant","boer","boehmer","bodiford","bleau","blankinship","blane","blaha","bitting","bissonette","bigby","bibeau","bermudes","berke","bergevin","bergerson","bendel","belville","bechard","bearce","beadles","batz","bartlow","ayoub","avans","aumiller","arviso","arpin","arnwine","armwood","arent","arehart","arcand","antle","ambrosino","alongi","alm","allshouse","ahart","aguon","ziebarth","zeledon","zakrzewski","yuhas","yingst","yedinak","wommack","winnett","wingler","wilcoxen","whitmarsh","wayt","watley","warkentin","voll","vogelsang","voegele","vivanco","vinton","villafane","viles","ver","venne","vanwagoner","vanwagenen","vanleuven","vanauken","uselton","uren","trumbauer","tritt","treadaway","tozier","tope","tomczak","tomberlin","tomasini","tollett","toller","titsworth","tirrell","tilly","tavera","tarnowski","tanouye","swarthout","sutera","surette","styers","styer","stipe","stickland","stembridge","stearn","starkes","stanberry","stahr","spino","spicher","sperber","speece","sonntag","sneller","smalling","slowik","slocumb","sliva","slemp","slama","sitz","sisto","sisemore","sindelar","shipton","shillings","sheeley","sharber","shaddix","severns","severino","sensabaugh","seder","seawell","seamons","schrantz","schooler","scheffer","scheerer","scalia","saum","santibanez","sano","sanjuan","sampley","sailer","sabella","sabbagh","royall","rottman","rivenbark","rikard","ricketson","rickel","rethman","reily","reddin","reasoner","rast","ranallo","quintal","pung","pucci","proto","prosperie","prim","preusser","preslar","powley","postma","pinnix","pilla","pietsch","pickerel","pica","pharris","petway","petillo","perin","pereda","pennypacker","pennebaker","pedrick","patin","patchell","parodi","parman","pantano","padua","padro","osterhout","orner","olivar","ohlson","odonoghue","oceguera","oberry","novello","noguera","newquist","newcombe","neihoff","nehring","nees","nebeker","mundo","mullenix","morrisey","moronta","morillo","morefield","mongillo","molino","minto","midgley","michie","menzies","medved","mechling","mealy","mcshan","mcquaig","mcnees","mcglade","mcgarity","mcgahey","mcduff","mayweather","mastropietro","masten","maranto","maniscalco","maize","mahmood","maddocks","maday","macha","maag","luken","lopp","lolley","llanas","litz","litherland","lindenberg","lieu","letcher","lentini","lemelle","leet","lecuyer","leber","laursen","larrick","lantigua","langlinais","lalli","lafever","labat","labadie","krogman","kohut","knarr","klimas","klar","kittelson","kirschbaum","kintzel","kincannon","kimmell","killgore","kettner","kelsch","karle","kapoor","johansson","jenkinson","janney","iraheta","insley","hyslop","huckstep","holleran","hoerr","hinze","hinnenkamp","hilger","higgin","hicklin","heroux","henkle","helfer","heikkinen","heckstall","heckler","heavener","haydel","haveman","haubert","harrop","harnois","hansard","hanover","hammitt","haliburton","haefner","hadsell","haakenson","guynn","guizar","grout","grosz","gomer","golla","godby","glanz","glancy","givan","giesen","gerst","gayman","garraway","gabor","furness","frisk","fremont","frary","forand","fessenden","ferrigno","fearon","favreau","faulks","falbo","ewen","eurich","etchison","esterly","entwistle","ellingsworth","eisenbarth","edelson","eckel","earnshaw","dunneback","doyal","donnellan","dolin","dibiase","deschenes","dermody","degregorio","darnall","dant","dansereau","danaher","dammann","dames","czarnecki","cuyler","custard","cummingham","cuffie","cuffee","cudney","cuadra","crigler","creger","coughlan","corvin","cortright","corchado","connery","conforti","condron","colosimo","colclough","cohee","ciotti","chien","chacko","cevallos","cavitt","cavins","castagna","cashwell","carrozza","carrara","capra","campas","callas","caison","caggiano","bynoe","buswell","burpo","burnam","burges","buerger","buelow","bueche","bruni","brummitt","brodersen","briese","breit","brakebill","braatz","boyers","boughner","borror","borquez","bonelli","bohner","blaker","blackmer","bissette","bibbins","bhatt","bhatia","bessler","bergh","beresford","bensen","benningfield","bellantoni","behler","beehler","beazley","beauchesne","bargo","bannerman","baltes","balog","ballantyne","axelson","apgar","aoki","anstett","alejos","alcocer","albury","aichele","ackles","zerangue","zehner","zank","zacarias","youngberg","yorke","yarbro","wydra","worthley","wolbert","wittmer","witherington","wishart","winkleman","willilams","willer","wiedeman","whittingham","whitbeck","whetsel","wheless","westerberg","welcher","wegman","waterfield","wasinger","warfel","wannamaker","walborn","wada","vogl","vizcarrondo","vitela","villeda","veras","venuti","veney","ulrey","uhlig","turcios","tremper","torian","torbett","thrailkill","terrones","teitelbaum","teems","swoope","sunseri","stutes","stthomas","strohm","stroble","striegel","streicher","stodola","stinchcomb","steves","steppe","steller","staudt","starner","stamant","stam","stackpole","sprankle","speciale","spahr","sowders","sova","soluri","soderlund","slinkard","sjogren","sirianni","siewert","sickels","sica","shugart","shoults","shive","shimer","shier","shepley","sheeran","sevin","seto","segundo","sedlacek","scuderi","schurman","schuelke","scholten","schlater","schisler","schiefelbein","schalk","sanon","sabala","ruyle","ruybal","rueb","rowsey","rosol","rocheleau","rishel","rippey","ringgold","rieves","ridinger","retherford","rempe","reith","rafter","raffaele","quinto","putz","purdom","puls","pulaski","propp","principato","preiss","prada","polansky","poch","plath","pittard","pinnock","pfarr","pfannenstiel","penniman","pauling","patchen","paschke","parkey","pando","ouimet","ottman","ostlund","ormiston","occhipinti","nowacki","norred","noack","nishida","nilles","nicodemus","neth","nealey","myricks","murff","mungia","motsinger","moscato","morado","monnier","molyneux","modzelewski","miura","minich","militello","milbrandt","michalik","meserve","mendivil","melara","mcnish","mcelhannon","mccroy","mccrady","mazzella","maule","mattera","mathena","matas","mascorro","marinello","marguez","manwaring","manhart","mangano","maggi","lymon","luter","luse","lukasik","luiz","ludlum","luczak","lowenthal","lossett","lorentzen","loredo","longworth","lomanto","lisi","lish","lipsky","linck","liedtke","levering","lessman","lemond","lembo","ledonne","leatham","laufer","lanphear","langlais","lamphear","lamberton","lafon","lade","lacross","kyzer","krok","kring","krell","krehbiel","kratochvil","krach","kovar","kostka","knudtson","knaack","kliebert","klahn","kirkley","kimzey","kerrick","kennerson","keesler","karlin","janousek","imel","icenhour","hyler","hudock","houpt","holquin","holiman","holahan","hodapp","hillen","hickmon","hersom","henrich","helvey","heidt","heideman","hedstrom","hedin","hebron","hayter","harn","hardage","halsted","hahne","hagemann","guzik","guel","groesbeck","gritton","grego","graziani","grasty","graney","gouin","gossage","golston","goheen","godina","glade","giorgi","giambrone","gerrity","gerrish","gero","gerling","gaulke","garlick","galiano","gaiter","gahagan","gagnier","friddle","fredericksen","franqui","follansbee","foerster","flury","fitzmaurice","fiorini","finlayson","fiecke","fickes","fichter","ferron","farrel","fackler","eyman","escarcega","errico","erler","erby","engman","engelmann","elsass","elliston","eddleman","eadie","dummer","drost","dorrough","dorrance","doolan","donalson","domenico","ditullio","dittmar","dishon","dionisio","dike","devinney","desir","deschamp","derrickson","delamora","deitch","dechant","danek","dahmen","curci","cudjoe","croxton","creasman","craney","crader","cowling","coulston","cortina","corlew","corl","copland","convery","cohrs","clune","clausing","cipriani","cianciolo","chubb","chittum","chenard","charlesworth","charlebois","champine","chamlee","chagoya","casselman","cardello","capasso","cannella","calderwood","byford","buttars","bushee","burrage","buentello","brzozowski","bryner","brumit","brookover","bronner","bromberg","brixey","brinn","briganti","bremner","brawn","branscome","brannigan","bradsher","bozek","boulay","bormann","bongiorno","bollin","bohler","bogert","bodenhamer","blose","bivona","billips","bibler","benfer","benedetti","belue","bellanger","belford","behn","barnhardt","baltzell","balling","balducci","bainter","babineau","babich","baade","attwood","asmus","asaro","artiaga","applebaum","anding","amar","amaker","allsup","alligood","alers","agin","agar","achenbach","abramowitz","abbas","aasen","zehnder","yopp","yelle","yeldell","wynter","woodmansee","wooding","woll","winborne","willsey","willeford","widger","whiten","whitchurch","whang","weissinger","weinman","weingartner","weidler","waltrip","wagar","wafford","vitagliano","villalvazo","villacorta","vigna","vickrey","vicini","ventimiglia","vandenbosch","valvo","valazquez","utsey","urbaniak","unzueta","trombetta","trevizo","trembley","tremaine","traverso","tores","tolan","tillison","tietjen","teachout","taube","tatham","tarwater","tarbell","sydow","swims","swader","striplin","stoltenberg","steinhauer","steil","steigerwald","starkweather","stallman","squier","sparacino","spadafora","shiflet","shibata","shevlin","sherrick","sessums","servais","senters","seevers","seelye","searfoss","seabrooks","scoles","schwager","schrom","schmeltzer","scheffel","sawin","saterfiel","sardina","sanroman","sandin","salamanca","saladin","sabia","rustin","rushin","ruley","rueter","rotter","rosenzweig","rohe","roder","riter","rieth","ried","ridder","rennick","remmers","remer","relyea","reilley","reder","rasheed","rakowski","rabin","queener","pursel","prowell","pritts","presler","pouncy","porche","porcaro","pollman","pleas","planas","pinkley","pinegar","pilger","philson","petties","perrodin","pendergrast","patao","pasternak","passarelli","pasko","parshall","panos","panella","palombo","padillo","oyama","overlock","overbeck","otterson","orrell","ornellas","opitz","okelly","obando","noggle","nicosia","netto","negrin","natali","nakayama","nagao","nadel","musial","murrill","murrah","munsch","mucci","mrozek","moyes","mowrer","moris","morais","moorhouse","monico","mondy","moncayo","miltenberger","milsap","milone","millikin","milardo","micheals","micco","meyerson","mericle","mendell","meinhardt","meachum","mcleroy","mcgray","mcgonigal","maultsby","matis","matheney","matamoros","marro","marcil","marcial","mantz","mannings","maltby","malchow","maiorano","mahn","mahlum","maglio","maberry","lustig","luellen","longwell","longenecker","lofland","locascio","linney","linneman","lighty","levell","levay","lenahan","lemen","lehto","lebaron","lanctot","lamy","lainez","laffoon","labombard","kujawski","kroger","kreutzer","korhonen","kondo","kollman","kohan","kogut","knaus","kivi","kittel","kinner","kindig","kindel","kiesel","kibby","khang","kettler","ketterer","kepner","kelliher","keenum","kanode","kail","juhasz","jowett","jolicoeur","jeon","iser","ingrassia","imai","hutchcraft","humiston","hulings","hukill","huizenga","hugley","hornyak","hodder","hisle","hillenbrand","hille","higuchi","hertzler","herdon","heppner","hepp","heitmann","heckart","hazlewood","hayles","hayek","hawkin","haugland","hasler","harbuck","happel","hambly","hambleton","hagaman","guzzi","gullette","guinyard","grogg","grise","griffing","goto","gosney","goley","goldblatt","gledhill","girton","giltner","gillock","gilham","gilfillan","giblin","gentner","gehlert","gehl","garten","garney","garlow","garett","galles","galeana","futral","fuhr","friedland","franson","fransen","foulds","follmer","foland","flax","flavin","firkins","fillion","figueredo","ferrill","fenster","fenley","fauver","farfan","eustice","eppler","engelman","engelke","emmer","elzy","ellwood","ellerbee","elks","ehret","ebbert","durrah","dupras","dubuque","dragoo","donlon","dolloff","dibella","derrico","demko","demar","darrington","czapla","crooker","creagh","cranor","craner","crabill","coyer","cowman","cowherd","cottone","costillo","coster","costas","cosenza","corker","collinson","coello","clingman","clingerman","claborn","chmura","chausse","chaudhry","chapell","chancy","cerrone","caverly","caulkins","carn","campfield","campanelli","callaham","cadorette","butkovich","buske","burrier","burkley","bunyard","buckelew","buchheit","broman","brescia","brasel","boyster","booe","bonomo","bondi","bohnsack","blomberg","blanford","bilderback","biggins","bently","behrends","beegle","bedoya","bechtol","beaubien","bayerl","baumgart","baumeister","barratt","barlowe","barkman","barbagallo","baldree","baine","baggs","bacote","aylward","ashurst","arvidson","arthurs","arrieta","arrey","arreguin","arrant","arner","arizmendi","anker","amis","amend","alphin","allbright","aikin","zupan","zuchowski","zeolla","zanchez","zahradnik","zahler","younan","yeater","yearta","yarrington","yantis","woomer","wollard","wolfinger","woerner","witek","wishon","wisener","wingerter","willet","wilding","wiedemann","weisel","wedeking","waybright","wardwell","walkins","waldorf","voth","voit","virden","viloria","villagran","vasta","vashon","vaquera","vantassell","vanderlinden","vandergrift","vancuren","valenta","underdahl","tygart","twining","twiford","turlington","tullius","tubman","trowell","trieu","transue","tousant","torgersen","tooker","tome","toma","tocci","tippins","tinner","timlin","tillinghast","tidmore","teti","tedrick","tacey","swanberg","sunde","summitt","summerford","summa","stratman","strandberg","storck","stober","steitz","stayer","stauber","staiger","sponaugle","spofford","sparano","spagnola","sokoloski","snay","slough","skowronski","sieck","shimkus","sheth","sherk","shankles","shahid","sevy","senegal","seiden","seidell","searls","searight","schwalm","schug","schilke","schier","scheck","sawtelle","santore","sanks","sandquist","sanden","saling","saathoff","ryberg","rustad","ruffing","rudnicki","ruane","rozzi","rowse","rosenau","rodes","risser","riggin","riess","riese","rhoten","reinecke","reigle","reichling","redner","rebelo","raynes","raimondi","rahe","rada","querry","quellette","pulsifer","prochnow","prato","poulton","poudrier","policastro","polhemus","polasek","poissant","pohlmann","plotner","pitkin","pita","pinkett","piekarski","pichon","pfau","petroff","petermann","peplinski","peller","pecinovsky","pearse","pattillo","patague","parlier","parenti","parchman","pane","paff","ortner","oros","nolley","noakes","nigh","nicolosi","nicolay","newnam","netter","nass","napoles","nakata","nakamoto","morlock","moraga","montilla","mongeau","molitor","mohney","mitchener","meyerhoff","medel","mcniff","mcmonagle","mcglown","mcglinchey","mcgarrity","mccright","mccorvey","mcconnel","mccargo","mazzei","matula","mastroianni","massingale","maring","maricle","mans","mannon","mannix","manney","manalo","malo","malan","mahony","madril","mackowiak","macko","macintosh","lurry","luczynski","lucke","lucarelli","losee","lorence","loiacono","lohse","loder","lipari","linebarger","lindamood","limbaugh","letts","leleux","leep","leeder","leard","laxson","lawry","laverdiere","laughton","lastra","kurek","kriss","krishnan","kretschmer","krebsbach","kontos","knobel","knauf","klick","kleven","klawitter","kitchin","kirkendoll","kinkel","kingrey","kilbourn","kensinger","kennerly","kamin","justiniano","jurek","junkin","judon","jordahl","jeanes","jarrells","iwamoto","ishida","immel","iman","ihle","hyre","hurn","hunn","hultman","huffstetler","huffer","hubner","howey","hooton","holts","holscher","holen","hoggatt","hilaire","herz","henne","helstrom","hellickson","heinlein","heckathorn","heckard","headlee","hauptman","haughey","hatt","harring","harford","hammill","hamed","halperin","haig","hagwood","hagstrom","gunnells","gundlach","guardiola","greeno","greenland","gonce","goldsby","gobel","gisi","gillins","gillie","germano","geibel","gauger","garriott","garbarino","gajewski","funari","fullbright","fuell","fritzler","freshwater","freas","fortino","forbus","flohr","flemister","fisch","finks","fenstermaker","feldstein","farhat","fankhauser","fagg","fader","exline","emigh","eguia","edman","eckler","eastburn","dunmore","dubuisson","dubinsky","drayer","doverspike","doubleday","doten","dorner","dolson","dohrmann","disla","direnzo","dipaola","dines","diblasi","dewolf","desanti","dennehy","demming","delker","decola","davilla","daughtridge","darville","darland","danzy","dagenais","culotta","cruzado","crudup","croswell","coverdale","covelli","couts","corbell","coplan","coolbaugh","conyer","conlee","conigliaro","comiskey","coberly","clendening","clairmont","cienfuegos","chojnacki","chilcote","champney","cassara","casazza","casado","carew","carbin","carabajal","calcagni","cail","busbee","burts","burbridge","bunge","bundick","buhler","bucholtz","bruen","broce","brite","brignac","brierly","bridgman","braham","bradish","boyington","borjas","bonn","bonhomme","bohlen","bogardus","bockelman","blick","blackerby","bizier","biro","binney","bertolini","bertin","berti","bento","beno","belgarde","belding","beckel","becerril","bazaldua","bayes","bayard","barrus","barris","baros","bara","ballow","bakewell","baginski","badalamenti","backhaus","avilez","auvil","atteberry","ardon","anzaldua","anello","amsler","ambrosio","althouse","alles","alberti","alberson","aitchison","aguinaga","ziemann","zickefoose","zerr","zeck","zartman","zahm","zabriskie","yohn","yellowhair","yeaton","yarnall","yaple","wolski","wixon","willner","willms","whitsitt","wheelwright","weyandt","wess","wengerd","weatherholtz","wattenbarger","walrath","walpole","waldrip","voges","vinzant","viars","veres","veneziano","veillon","vawter","vaughns","vanwart","vanostrand","valiente","valderas","uhrig","tunison","tulloch","trostle","treaster","traywick","toye","tomson","tomasello","tomasek","tippit","tinajero","tift","tienda","thorington","thieme","thibeau","thakkar","tewell","telfer","sweetser","stratford","stracener","stoke","stiverson","stelling","spatz","spagnoli","sorge","slevin","slabaugh","simson","shupp","shoultz","shotts","shiroma","shetley","sherrow","sheffey","shawgo","shamburger","sester","segraves","seelig","scioneaux","schwartzkopf","schwabe","scholes","schluter","schlecht","schillaci","schildgen","schieber","schewe","schecter","scarpelli","scaglione","sautter","santelli","salmi","sabado","ryer","rydberg","ryba","rushford","runk","ruddick","rotondo","rote","rosenfield","roesner","rocchio","ritzer","rippel","rimes","riffel","richison","ribble","reynold","resh","rehn","ratti","rasor","rasnake","rappold","rando","radosevich","pulice","prichett","pribble","poynor","plowden","pitzen","pittsley","pitter","philyaw","philipps","pestana","perro","perone","pera","peil","pedone","pawlowicz","pattee","parten","parlin","pariseau","paredez","paek","pacifico","otts","ostrow","osornio","oslund","orso","ooten","onken","oniel","onan","ollison","ohlsen","ohlinger","odowd","niemiec","neubert","nembhard","neaves","neathery","nakasone","myerson","muto","muntz","munez","mumme","mumm","mujica","muise","muench","morriss","molock","mishoe","minier","metzgar","mero","meiser","meese","mcsween","mcquire","mcquinn","mcpheeters","mckeller","mcilrath","mcgown","mcdavis","mccuen","mcclenton","maxham","matsui","marriner","marlette","mansur","mancino","maland","majka","maisch","maheux","madry","madriz","mackley","macke","lydick","lutterman","luppino","lundahl","lovingood","loudon","longmore","liefer","leveque","lescarbeau","lemmer","ledgerwood","lawver","lawrie","lattea","lasko","lahman","kulpa","kukowski","kukla","kubota","kubala","krizan","kriz","krikorian","kravetz","kramp","kowaleski","knobloch","klosterman","kloster","klepper","kirven","kinnaman","kinnaird","killam","kiesling","kesner","keebler","keagle","karls","kapinos","kantner","kaba","junious","jefferys","jacquet","izzi","ishii","irion","ifill","hotard","horman","hoppes","hopkin","hokanson","hoda","hocutt","hoaglin","hites","hirai","hindle","hinch","hilty","hild","hier","hickle","hibler","henrichs","hempstead","helmers","hellard","heims","heidler","hawbaker","harkleroad","harari","hanney","hannaford","hamid","haltom","hallford","guilliams","guerette","gryder","groseclose","groen","grimley","greenidge","graffam","goucher","goodenough","goldsborough","gloster","glanton","gladson","gladding","ghee","gethers","gerstein","geesey","geddie","gayer","gaver","gauntt","gartland","garriga","garoutte","fronk","fritze","frenzel","forgione","fluitt","flinchbaugh","flach","fiorito","finan","finamore","fimbres","fillman","figeroa","ficklin","feher","feddersen","fambro","fairbairn","eves","escalona","elsey","eisenstein","ehrenberg","eargle","drane","dogan","dively","dewolfe","dettman","desiderio","desch","dennen","denk","demaris","delsignore","dejarnette","deere","dedman","daws","dauphinais","danz","dantin","dannenberg","dalby","currence","culwell","cuesta","croston","crossno","cromley","crisci","craw","coryell","condra","colpitts","colas","clink","clevinger","clermont","cistrunk","cirilo","chirico","chiarello","cephus","cecena","cavaliere","caughey","casimir","carwell","carlon","carbonaro","caraveo","cantley","callejas","cagney","cadieux","cabaniss","bushard","burlew","buras","budzinski","bucklew","bruneau","brummer","brueggemann","brotzman","bross","brittian","brimage","briles","brickman","breneman","breitenstein","brandel","brackins","boydstun","botta","bosket","boros","borgmann","bordeau","bonifacio","bolten","boehman","blundell","bloodsaw","bjerke","biffle","bickett","bickers","beville","bergren","bergey","benzing","belfiore","beirne","beckert","bebout","baumert","battey","barrs","barriere","barcelo","barbe","balliet","baham","babst","auton","asper","asbell","arzate","argento","arel","araki","arai","antley","amodeo","ammann","allensworth","aldape","akey","abeita","zweifel","zeiler","zamor","zalenski","yzaguirre","yousef","yetman","wyer","woolwine","wohlgemuth","wohlers","wittenberg","wingrove","wimsatt","willimas","wilkenson","wildey","wilderman","wilczynski","wigton","whorley","wellons","welle","weirich","weideman","weide","weast","wasmund","warshaw","walson","waldner","walch","walberg","wagener","wageman","vrieze","vossen","vorce","voorhis","vonderheide","viruet","vicari","verne","velasques","vautour","vartanian","varona","vankeuren","vandine","vandermeer","ursery","underdown","uhrich","uhlman","tworek","twine","twellman","tweedie","tutino","turmelle","tubb","trivedi","triano","trevathan","treese","treanor","treacy","traina","topham","toenjes","tippetts","tieu","thomure","thatch","tetzlaff","tetterton","teamer","tappan","talcott","tagg","szczepanski","syring","surace","sulzer","sugrue","sugarman","suess","styons","stwart","stupka","strey","straube","strate","stoddart","stockbridge","stjames","steimle","steenberg","stamand","staller","stahly","stager","spurgin","sprow","sponsler","speas","spainhour","sones","smits","smelcer","slovak","slaten","singleterry","simien","sidebottom","sibrian","shellhammer","shelburne","shambo","sepeda","seigel","scogin","scianna","schmoll","schmelzer","scheu","schachter","savant","sauseda","satcher","sandor","sampsell","rugh","rufener","rotenberry","rossow","rossbach","rollman","rodrique","rodreguez","rodkey","roda","rini","riggan","rients","riedl","rhines","ress","reinbold","raschke","rardin","racicot","quillin","pushard","primrose","pries","pressey","precourt","pratts","postel","poppell","plumer","pingree","pieroni","pflug","petre","petrarca","peterka","perkin","pergande","peranio","penna","paulhus","pasquariello","parras","parmentier","pamplin","oviatt","osterhoudt","ostendorf","osmun","ortman","orloff","orban","onofrio","olveda","oltman","okeeffe","ocana","nunemaker","novy","noffsinger","nish","niday","nethery","nemitz","neidert","nadal","nack","muszynski","munsterman","mulherin","mortimore","morter","montesino","montalvan","montalbano","momon","moman","mogan","minns","millward","milling","michelsen","mewborn","metayer","mensch","meloy","meggs","meaders","mcsorley","mcmenamin","mclead","mclauchlin","mcguffey","mcguckin","mcglaughlin","mcferron","mcentyre","mccrum","mccawley","mcbain","mayhue","matzen","matton","marsee","marrin","marland","markum","mantilla","manfre","makuch","madlock","macauley","luzier","luthy","lufkin","lucena","loudin","lothrop","lorch","loll","loadholt","lippold","lichtman","liberto","liakos","lewicki","levett","lentine","leja","legree","lawhead","lauro","lauder","lanman","lank","laning","lalor","krob","kriger","kriegel","krejci","kreisel","kozel","konkel","kolstad","koenen","kocsis","knoblock","knebel","klopfer","klee","kilday","kesten","kerbs","kempker","keathley","kazee","kaur","kamer","kamaka","kallenbach","jehle","jaycox","jardin","jahns","ivester","hyppolite","hyche","huppert","hulin","hubley","horsey","hornak","holzwarth","holmon","hollabaugh","holaway","hodes","hoak","hinesley","hillwig","hillebrand","highfield","heslop","herrada","hendryx","hellums","heit","heishman","heindel","hayslip","hayford","hastie","hartgrove","hanus","hakim","hains","hadnott","gundersen","gulino","guidroz","guebert","gressett","graydon","gramling","grahn","goupil","gorelick","goodreau","goodnough","golay","goers","glatz","gillikin","gieseke","giammarino","getman","gensler","gazda","garibaldi","gahan","funderburke","fukuda","fugitt","fuerst","fortman","forsgren","formica","flink","fitton","feltz","fekete","feit","fehrenbach","farone","farinas","faries","fagen","ewin","esquilin","esch","enderle","ellery","ellers","ekberg","egli","effinger","dymond","dulle","dula","duhe","dudney","dowless","dower","dorminey","dopp","dooling","domer","disher","dillenbeck","difilippo","dibernardo","deyoe","devillier","denley","deland","defibaugh","deeb","debow","dauer","datta","darcangelo","daoust","damelio","dahm","dahlman","curlin","cupit","culton","cuenca","cropp","croke","cremer","crace","cosio","corzine","coombe","coman","colone","coloma","collingwood","coderre","cocke","cobler","claybrook","cincotta","cimmino","christoff","chisum","chillemi","chevere","chachere","cervone","cermak","cefalu","cauble","cather","caso","carns","carcamo","carbo","capoccia","capello","capell","canino","cambareri","calvi","cabiness","bushell","burtt","burstein","burkle","bunner","bundren","buechler","bryand","bruso","brownstein","brouse","brodt","brisbin","brightman","brenes","breitenbach","brazzell","brazee","bramwell","bramhall","bradstreet","boyton","bowland","boulter","bossert","bonura","bonebrake","bonacci","boeck","blystone","birchard","bilal","biddy","bibee","bevans","bethke","bertelsen","berney","bergfeld","benware","bellon","bellah","batterton","barberio","bamber","bagdon","badeaux","averitt","augsburger","ates","arvie","aronowitz","arens","araya","angelos","andrada","amell","amante","almy","almquist","alls","aispuro","aguillon","agudelo","aceto","abalos","zdenek","zaremba","zaccaria","youssef","wrona","wrede","wotton","woolston","wolpert","wollman","wince","wimberley","willmore","willetts","wikoff","wieder","wickert","whitenack","wernick","welte","welden","weisenberger","weich","wallington","walder","vossler","vore","vigo","vierling","victorine","verdun","vencill","vazguez","vassel","vanzile","vanvliet","vantrease","vannostrand","vanderveer","vanderveen","vancil","uyeda","umphrey","uhler","uber","tutson","turrentine","tullier","tugwell","trundy","tripodi","tomer","tomasi","tomaselli","tokarski","tisher","tibbets","thweatt","tharrington","tesar","telesco","teasdale","tatem","taniguchi","suriel","sudler","stutsman","sturman","strite","strelow","streight","strawder","stransky","strahl","stours","stong","stinebaugh","stillson","steyer","stelle","steffensmeier","statham","squillante","spiess","spargo","southward","soller","soden","snuggs","snellgrove","smyers","smiddy","slonaker","skyles","skowron","sivils","siqueiros","siers","siddall","shontz","shingler","shiley","shibley","sherard","shelnutt","shedrick","shasteen","sereno","selke","scovil","scola","schuett","schuessler","schreckengost","schranz","schoepp","schneiderman","schlanger","schiele","scheuermann","schertz","scheidler","scheff","schaner","schamber","scardina","savedra","saulnier","sater","sarro","sambrano","salomone","sabourin","ruud","rutten","ruffino","ruddock","rowser","roussell","rosengarten","rominger","rollinson","rohman","roeser","rodenberg","roberds","ridgell","rhodus","reynaga","rexrode","revelle","rempel","remigio","reising","reiling","reetz","rayos","ravenscroft","ravenell","raulerson","rasmusson","rask","rase","ragon","quesnel","quashie","puzo","puterbaugh","ptak","prost","prisbrey","principe","pricer","pratte","pouncey","portman","pontious","pomerantz","planck","pilkenton","pilarski","phegley","pertuit","penta","pelc","peffer","pech","peagler","pavelka","pavao","patman","paskett","parrilla","pardini","papazian","panter","palin","paley","paetzold","packett","pacheo","ostrem","orsborn","olmedo","okamura","oiler","oglesbee","oatis","nuckles","notter","nordyke","nogueira","niswander","nibert","nesby","neloms","nading","naab","munns","mullarkey","moudy","moret","monnin","molder","modisette","moczygemba","moctezuma","mischke","miro","mings","milot","milledge","milhorn","milera","mieles","mickley","micek","metellus","mersch","merola","mercure","mencer","mellin","mell","meinke","mcquillan","mcmurtrie","mckillop","mckiernan","mckendrick","mckamie","mcilvaine","mcguffie","mcgonigle","mcgarrah","mcfetridge","mcenaney","mcdow","mccutchan","mccallie","mcadam","maycock","maybee","mattei","massi","masser","masiello","marshell","marmo","marksberry","markell","marchal","manross","manganaro","mally","mallow","mailhot","magyar","madero","madding","maddalena","macfarland","lynes","lugar","luckie","lucca","lovitt","loveridge","loux","loth","loso","lorenzana","lorance","lockley","lockamy","littler","litman","litke","liebel","lichtenberger","licea","leverich","letarte","lesesne","leno","legleiter","leffew","laurin","launius","laswell","lassen","lasala","laraway","laramore","landrith","lancon","lanahan","laiche","laford","lachermeier","kunst","kugel","kuck","kuchta","kube","korus","koppes","kolbe","koerber","kochan","knittel","kluck","kleve","kleine","kitch","kirton","kirker","kintz","kinghorn","kindell","kimrey","kilduff","kilcrease","kicklighter","kibble","kervin","keplinger","keogh","kellog","keeth","kealey","kazmierczak","karner","kamel","kalina","kaczynski","juel","jerman","jeppson","jawad","jasik","jaqua","janusz","janco","inskeep","inks","ingold","hyndman","hymer","hunte","hunkins","humber","huffstutler","huffines","hudon","hudec","hovland","houze","hout","hougland","hopf","holsapple","holness","hollenbach","hoffmeister","hitchings","hirata","hieber","hickel","hewey","herriman","hermansen","herandez","henze","heffelfinger","hedgecock","hazlitt","hazelrigg","haycock","harren","harnage","harling","harcrow","hannold","hanline","hanel","hanberry","hammersley","hamernik","hajduk","haithcock","haff","hadaway","haan","gullatt","guilbault","guidotti","gruner","grisson","grieves","granato","grabert","gover","gorka","glueck","girardin","giesler","gersten","gering","geers","gaut","gaulin","gaskamp","garbett","gallivan","galland","gaeth","fullenkamp","fullam","friedrichs","freire","freeney","fredenburg","frappier","fowkes","foree","fleurant","fleig","fleagle","fitzsimons","fischetti","fiorenza","finneran","filippi","figueras","fesler","fertig","fennel","feltmann","felps","felmlee","fannon","familia","fairall","fadden","esslinger","enfinger","elsasser","elmendorf","ellisor","einhorn","ehrman","egner","edmisten","edlund","ebinger","dyment","dykeman","durling","dunstan","dunsmore","dugal","duer","drescher","doyel","dossey","donelan","dockstader","dobyns","divis","dilks","didier","desrosier","desanto","deppe","delosh","delange","defrank","debo","dauber","dartez","daquila","dankert","dahn","cygan","cusic","curfman","croghan","croff","criger","creviston","crays","cravey","crandle","crail","crago","craghead","cousineau","couchman","cothron","corella","conine","coller","colberg","cogley","coatney","coale","clendenin","claywell","clagon","cifaldi","choiniere","chickering","chica","chennault","chavarin","chattin","chaloux","challis","cesario","cazarez","caughman","catledge","casebolt","carrel","carra","carlow","capote","canez","camillo","caliendo","calbert","bylsma","buskey","buschman","burkhard","burghardt","burgard","buonocore","bunkley","bungard","bundrick","bumbrey","buice","buffkin","brundige","brockwell","brion","briant","bredeson","bransford","brannock","brakefield","brackens","brabant","bowdoin","bouyer","bothe","boor","bonavita","bollig","blurton","blunk","blanke","blanck","birden","bierbaum","bevington","beutler","betters","bettcher","bera","benway","bengston","benesh","behar","bedsole","becenti","beachy","battersby","basta","bartmess","bartle","bartkowiak","barsky","barrio","barletta","barfoot","banegas","baldonado","azcona","avants","austell","aungst","aune","aumann","audia","atterbury","asselin","asmussen","ashline","asbill","arvizo","arnot","ariola","ardrey","angstadt","anastasio","amsden","amerman","alred","allington","alewine","alcina","alberico","ahlgren","aguas","agrawal","agosta","adolphsen","acey","aburto","abler","zwiebel","zepp","zentz","ybarbo","yarberry","yamauchi","yamashiro","wurtz","wronski","worster","wootten","wongus","woltz","wolanski","witzke","withey","wisecarver","wingham","wineinger","winegarden","windholz","wilgus","wiesen","wieck","widrick","wickliffe","whittenberg","westby","werley","wengert","wendorf","weimar","weick","weckerly","watrous","wasden","walford","wainright","wahlstrom","wadlow","vrba","voisin","vives","vivas","vitello","villescas","villavicencio","villanova","vialpando","vetrano","vensel","vassell","varano","vanriper","vankleeck","vanduyne","vanderpol","vanantwerp","valenzula","udell","turnquist","tuff","trickett","tramble","tingey","timbers","tietz","thiem","tercero","tenner","tenaglia","teaster","tarlton","taitt","tabon","sward","swaby","suydam","surita","suman","suddeth","stumbo","studivant","strobl","streich","stoodley","stoecker","stillwagon","stickle","stellmacher","stefanik","steedley","starbird","stainback","stacker","speir","spath","sommerfeld","soltani","solie","sojka","sobota","sobieski","sobczak","smullen","sleeth","slaymaker","skolnick","skoglund","sires","singler","silliman","shrock","shott","shirah","shimek","shepperd","sheffler","sheeler","sharrock","sharman","shalash","seyfried","seybold","selander","seip","seifried","sedor","sedlock","sebesta","seago","scutt","scrivens","sciacca","schultze","schoemaker","schleifer","schlagel","schlachter","schempp","scheider","scarboro","santi","sandhu","salim","saia","rylander","ryburn","rutigliano","ruocco","ruland","rudloff","rott","rosenburg","rosenbeck","romberger","romanelli","rohloff","rohlfing","rodda","rodd","ritacco","rielly","rieck","rickles","rickenbacker","respass","reisner","reineck","reighard","rehbein","rega","reddix","rawles","raver","rattler","ratledge","rathman","ramsburg","raisor","radovich","radigan","quail","puskar","purtee","priestly","prestidge","presti","pressly","pozo","pottinger","portier","porta","porcelli","poplawski","polin","poeppelman","pocock","plump","plantz","placek","piro","pinnell","pinkowski","pietz","picone","philbeck","pflum","peveto","perret","pentz","payer","patlan","paterno","papageorge","overmyer","overland","osier","orwig","orum","orosz","oquin","opie","ochsner","oathout","nygard","norville","northway","niver","nicolson","newhart","neitzel","nath","nanez","murnane","mortellaro","morreale","morino","moriarity","morgado","moorehouse","mongiello","molton","mirza","minnix","millspaugh","milby","miland","miguez","mickles","michaux","mento","melugin","melito","meinecke","mehr","meares","mcneece","mckane","mcglasson","mcgirt","mcgilvery","mcculler","mccowen","mccook","mcclintic","mccallon","mazzotta","maza","mayse","mayeda","matousek","matley","martyn","marney","marnell","marling","manuelito","maltos","malson","mahi","maffucci","macken","maass","lyttle","lynd","lyden","lukasiewicz","luebbers","lovering","loveall","longtin","lobue","loberg","lipka","lightbody","lichty","levert","lettieri","letsinger","lepak","lemmond","lembke","leitz","lasso","lasiter","lango","landsman","lamirande","lamey","laber","kuta","kulesza","krenz","kreiner","krein","kreiger","kraushaar","kottke","koser","kornreich","kopczynski","konecny","koff","koehl","kocian","knaub","kmetz","kluender","klenke","kleeman","kitzmiller","kirsh","kilman","kildow","kielbasa","ketelsen","kesinger","kehr","keef","kauzlarich","karter","kahre","jobin","jinkins","jines","jeffress","jaquith","jaillet","jablonowski","ishikawa","irey","ingerson","indelicato","huntzinger","huisman","huett","howson","houge","hosack","hora","hoobler","holtzen","holtsclaw","hollingworth","hollin","hoberg","hobaugh","hilker","hilgefort","higgenbotham","heyen","hetzler","hessel","hennessee","hendrie","hellmann","heft","heesch","haymond","haymon","haye","havlik","havis","haverland","haus","harstad","harriston","harju","hardegree","hammell","hamaker","halbrook","halberg","guptill","guntrum","gunderman","gunder","gularte","guarnieri","groll","grippo","greely","gramlich","goewey","goetzinger","goding","giraud","giefer","giberson","gennaro","gemmell","gearing","gayles","gaudin","gatz","gatts","gasca","garn","gandee","gammel","galindez","galati","gagliardo","fulop","fukushima","friedt","fretz","frenz","freeberg","fravel","fountaine","forry","forck","fonner","flippin","flewelling","flansburg","filippone","fettig","fenlon","felter","felkins","fein","favero","faulcon","farver","farless","fahnestock","facemire","faas","eyer","evett","esses","escareno","ensey","ennals","engelking","empey","ellithorpe","effler","edling","edgley","durrell","dunkerson","draheim","domina","dombrosky","doescher","dobbin","divens","dinatale","dieguez","diede","devivo","devilbiss","devaul","determan","desjardin","deshaies","delpozo","delorey","delman","delapp","delamater","deibert","degroff","debelak","dapolito","dano","dacruz","dacanay","cushenberry","cruze","crosbie","cregan","cousino","corrao","corney","cookingham","conry","collingsworth","coldren","cobian","coate","clauss","christenberry","chmiel","chauez","charters","chait","cesare","cella","caya","castenada","cashen","cantrelle","canova","campione","calixte","caicedo","byerley","buttery","burda","burchill","bulmer","bulman","buesing","buczek","buckholz","buchner","buchler","buban","bryne","brunkhorst","brumsey","brumer","brownson","brodnax","brezinski","brazile","braverman","branning","boye","boulden","bough","bossard","bosak","borth","borgmeyer","borge","blowers","blaschke","blann","blankenbaker","bisceglia","billingslea","bialek","beverlin","besecker","berquist","benigno","benavente","belizaire","beisner","behrman","beausoleil","baylon","bayley","bassi","basnett","basilio","basden","basco","banerjee","balli","bagnell","bady","averette","arzu","archambeault","arboleda","arbaugh","arata","antrim","amrhein","amerine","alpers","alfrey","alcon","albus","albertini","aguiniga","aday","acquaviva","accardi","zygmont","zych","zollner","zobel","zinck","zertuche","zaragosa","zale","zaldivar","yeadon","wykoff","woullard","wolfrum","wohlford","wison","wiseley","wisecup","winchenbach","wiltsie","whittlesey","whitelow","whiteford","wever","westrich","wertman","wensel","wenrich","weisbrod","weglarz","wedderburn","weatherhead","wease","warring","wadleigh","voltz","vise","villano","vicario","vermeulen","vazques","vasko","varughese","vangieson","vanfossen","vanepps","vanderploeg","vancleve","valerius","uyehara","unsworth","twersky","turrell","tuner","tsui","trunzo","trousdale","trentham","traughber","torgrimson","toppin","tokar","tobia","tippens","tigue","thiry","thackston","terhaar","tenny","tassin","tadeo","sweigart","sutherlin","sumrell","suen","stuhr","strzelecki","strosnider","streiff","stottlemyer","storment","storlie","stonesifer","stogsdill","stenzel","stemen","stellhorn","steidl","stecklein","statton","stangle","spratling","spoor","spight","spelman","spece","spanos","spadoni","southers","sola","sobol","smyre","slaybaugh","sizelove","sirmons","simington","silversmith","siguenza","sieren","shelman","sharples","sharif","sessler","serrata","serino","serafini","semien","selvey","seedorf","seckman","seawood","scoby","scicchitano","schorn","schommer","schnitzer","schleusner","schlabach","schiel","schepers","schaber","scally","sautner","sartwell","santerre","sandage","salvia","salvetti","salsman","sallis","salais","saeger","sabat","saar","ruther","russom","ruoff","rumery","rubottom","rozelle","rowton","routon","rotolo","rostad","roseborough","rorick","ronco","roher","roberie","robare","ritts","rison","rippe","rinke","ringwood","righter","rieser","rideaux","rickerson","renfrew","releford","reinsch","reiman","reifsteck","reidhead","redfearn","reddout","reaux","rado","radebaugh","quinby","quigg","provo","provenza","provence","pridgeon","praylow","powel","poulter","portner","pontbriand","poirrier","poirer","platero","pixler","pintor","pigman","piersall","piel","pichette","phou","pharis","phalen","petsche","perrier","penfield","pelosi","pebley","peat","pawloski","pawlik","pavlick","pavel","patz","patout","pascucci","pasch","parrinello","parekh","pantaleo","pannone","pankow","pangborn","pagani","pacelli","orsi","oriley","orduno","oommen","olivero","okada","ocon","ocheltree","oberman","nyland","noss","norling","nolton","nobile","nitti","nishimoto","nghiem","neuner","neuberger","neifert","negus","nagler","mullally","moulden","morra","morquecho","moots","mizzell","mirsky","mirabito","minardi","milholland","mikus","mijangos","michener","michalek","methvin","merrit","menter","meneely","meiers","mehring","mees","mcwhirt","mcwain","mcphatter","mcnichol","mcnaught","mclarty","mcivor","mcginness","mcgaughy","mcferrin","mcfate","mcclenny","mcclard","mccaskey","mccallion","mcamis","mathisen","marton","marsico","marchi","mani","mangione","macaraeg","lupi","lunday","lukowski","lucious","locicero","loach","littlewood","litt","lipham","linley","lindon","lightford","lieser","leyendecker","lewey","lesane","lenzi","lenart","leisinger","lehrman","lefebure","lazard","laycock","laver","launer","lastrapes","lastinger","lasker","larkey","lanser","lanphere","landey","lampton","lamark","kumm","kullman","krzeminski","krasner","koran","koning","kohls","kohen","kobel","kniffen","knick","kneip","knappenberger","klumpp","klausner","kitamura","kisling","kirshner","kinloch","kingman","kimery","kestler","kellen","keleher","keehn","kearley","kasprzak","kampf","kamerer","kalis","kahan","kaestner","kadel","kabel","junge","juckett","joynt","jorstad","jetter","jelley","jefferis","jeansonne","janecek","jaffee","izzard","istre","isherwood","ipock","iannuzzi","hypolite","humfeld","hotz","hosein","honahni","holzworth","holdridge","holdaway","holaday","hodak","hitchman","hippler","hinchey","hillin","hiler","hibdon","hevey","heth","hepfer","henneman","hemsley","hemmings","hemminger","helbert","helberg","heinze","heeren","heber","haver","hauff","haswell","harvison","hartson","harshberger","harryman","harries","hane","hamsher","haggett","hagemeier","haecker","haddon","haberkorn","guttman","guttierrez","guthmiller","guillet","guilbert","gugino","grumbles","griffy","gregerson","grana","goya","goranson","gonsoulin","goettl","goertz","godlewski","glandon","gilsdorf","gillogly","gilkison","giard","giampaolo","gheen","gettings","gesell","gershon","gaumer","gartrell","garside","garrigan","garmany","garlitz","garlington","gamet","furlough","funston","funaro","frix","frasca","francoeur","forshey","foose","flatley","flagler","fils","fillers","fickett","feth","fennelly","fencl","felch","fedrick","febres","fazekas","farnan","fairless","ewan","etsitty","enterline","elsworth","elliff","eleby","eldreth","eidem","edgecomb","edds","ebarb","dworkin","dusenberry","durrance","duropan","durfey","dungy","dundon","dumbleton","dubon","dubberly","droz","drinkwater","dressel","doughtie","doshier","dorrell","dople","doonan","donadio","dollison","doig","ditzler","dishner","discher","dimaio","digman","difalco","devino","devens","derosia","deppen","depaola","deniz","denardo","demos","demay","delgiudice","davi","danielsen","dally","dais","dahmer","cutsforth","cusimano","curington","cumbee","cryan","crusoe","crowden","crete","cressman","crapo","cowens","coupe","councill","coty","cotnoir","correira","copen","consiglio","combes","coffer","cockrill","coad","clogston","clasen","chesnutt","charrier","chadburn","cerniglia","cebula","castruita","castilla","castaldi","casebeer","casagrande","carta","carrales","carnley","cardon","capshaw","capron","cappiello","capito","canney","candela","caminiti","califano","calabria","caiazzo","cahall","buscemi","burtner","burgdorf","burdo","buffaloe","buchwald","brwon","brunke","brummond","brumm","broe","brocious","brocato","briski","brisker","brightwell","bresett","breiner","brazeau","braz","brayman","brandis","bramer","bradeen","boyko","bossi","boshart","bortle","boniello","bomgardner","bolz","bolenbaugh","bohling","bohland","bochenek","blust","bloxham","blowe","blish","blackwater","bjelland","biros","biederman","bickle","bialaszewski","bevil","beumer","bettinger","besse","bernett","bermejo","bement","belfield","beckler","baxendale","batdorf","bastin","bashore","bascombe","bartlebaugh","barsh","ballantine","bahl","badon","autin","astin","askey","ascher","arrigo","arbeiter","antes","angers","amburn","amarante","alvidrez","althaus","allmond","alfieri","aldinger","akerley","akana","aikins","ader","acebedo","accardo","abila","aberle","abele","abboud","zollars","zimmerer","zieman","zerby","zelman","zellars","yoshimura","yonts","yeats","yant","yamanaka","wyland","wuensche","worman","wordlaw","wohl","winslett","winberg","wilmeth","willcutt","wiers","wiemer","wickwire","wichman","whitting","whidbee","westergard","wemmer","wellner","weishaupt","weinert","weedon","waynick","wasielewski","waren","walworth","wallingford","walke","waechter","viviani","vitti","villagrana","vien","vicks","venema","varnes","varnadoe","varden","vanpatten","vanorden","vanderzee","vandenburg","vandehey","valls","vallarta","valderrama","valade","urman","ulery","tusa","tuft","tripoli","trimpe","trickey","tortora","torrens","torchia","toft","tjaden","tison","tindel","thurmon","thode","tardugno","tancredi","taketa","taillon","tagle","sytsma","symes","swindall","swicegood","swartout","sundstrom","sumners","sulton","studstill","stroop","stonerock","stmarie","stlawrence","stemm","steinhauser","steinert","steffensen","stefaniak","starck","stalzer","spidle","spake","sowinski","sosnowski","sorber","somma","soliday","soldner","soja","soderstrom","soder","sockwell","sobus","sloop","sinkfield","simerly","silguero","sigg","siemers","siegmund","shum","sholtis","shkreli","sheikh","shattles","sharlow","shambaugh","shaikh","serrao","serafino","selley","selle","seel","sedberry","secord","schunk","schuch","schor","scholze","schnee","schmieder","schleich","schimpf","scherf","satterthwaite","sasson","sarkisian","sarinana","sanzone","salvas","salone","salido","saiki","sahr","rusher","rusek","ruppel","rubel","rothfuss","rothenberger","rossell","rosenquist","rosebrook","romito","romines","rolan","roker","roehrig","rockhold","rocca","robuck","riss","rinaldo","riggenbach","rezentes","reuther","renolds","rench","remus","remsen","reller","relf","reitzel","reiher","rehder","redeker","ramero","rahaim","radice","quijas","qualey","purgason","prum","proudfoot","prock","probert","printup","primer","primavera","prenatt","pratico","polich","podkowka","podesta","plattner","plasse","plamondon","pittmon","pippenger","pineo","pierpont","petzold","petz","pettiway","petters","petroski","petrik","pesola","pershall","perlmutter","penepent","peevy","pechacek","peaden","pazos","pavia","pascarelli","parm","parillo","parfait","paoletti","palomba","palencia","pagaduan","oxner","overfield","overcast","oullette","ostroff","osei","omarah","olenick","olah","odem","nygren","notaro","northcott","nodine","nilges","neyman","neve","neuendorf","neisler","neault","narciso","naff","muscarella","morrisette","morphew","morein","montville","montufar","montesinos","monterroso","mongold","mojarro","moitoso","mirarchi","mirando","minogue","milici","miga","midyett","michna","meuser","messana","menzie","menz","mendicino","melone","mellish","meller","melle","meints","mechem","mealer","mcwilliam","mcwhite","mcquiggan","mcphillips","mcpartland","mcnellis","mcmackin","mclaughin","mckinny","mckeithan","mcguirk","mcgillivray","mcgarr","mcgahee","mcfaul","mcfadin","mceuen","mccullah","mcconico","mcclaren","mccaul","mccalley","mccalister","mazer","mayson","mayhan","maugeri","mauger","mattix","mattews","maslowski","masek","martir","marsch","marquess","maron","markwell","markow","marinaro","marcinek","mannella","mallen","majeed","mahnke","mahabir","magby","magallan","madere","machnik","lybrand","luque","lundholm","lueders","lucian","lubinski","lowy","loew","lippard","linson","lindblad","lightcap","levitsky","levens","leonardi","lenton","lengyel","leitzel","leicht","leaver","laubscher","lashua","larusso","larrimore","lanterman","lanni","lanasa","lamoureaux","lambros","lamborn","lamberti","lall","lafuente","laferriere","laconte","kyger","kupiec","kunzman","kuehne","kuder","kubat","krogh","kreidler","krawiec","krauth","kratky","kottwitz","korb","kono","kolman","kolesar","koeppel","knapper","klingenberg","kjos","keppel","kennan","keltz","kealoha","kasel","karney","kanne","kamrowski","kagawa","johnosn","jilek","jarvie","jarret","jansky","jacquemin","jacox","jacome","iriarte","ingwersen","imboden","iglesia","huyser","hurston","hursh","huntoon","hudman","hoying","horsman","horrigan","hornbaker","horiuchi","hopewell","hommel","homeyer","holzinger","holmer","hipsher","hinchman","hilts","higginbottom","hieb","heyne","hessling","hesler","hertlein","herford","heras","henricksen","hennemann","henery","hendershott","hemstreet","heiney","heckert","heatley","hazell","hazan","hayashida","hausler","hartsoe","harth","harriott","harriger","harpin","hardisty","hardge","hannaman","hannahs","hamp","hammersmith","hamiton","halsell","halderman","hagge","habel","gusler","gushiken","gurr","gummer","gullick","grunden","grosch","greenburg","greb","greaver","gratz","grajales","gourlay","gotto","gorley","goodpasture","godard","glorioso","gloor","glascock","gizzi","giroir","gibeault","gauldin","gauer","gartin","garrels","gamber","gallogly","gade","fusaro","fripp","freyer","freiberg","franzoni","fragale","foston","forti","forness","folts","followell","foard","flom","flett","fleitas","flamm","fino","finnen","finchum","filippelli","fickel","feucht","feiler","feenstra","feagins","faver","faulkenberry","farabaugh","fandel","faler","faivre","fairey","facey","exner","evensen","erion","erben","epting","epping","ephraim","engberg","elsen","ellingwood","eisenmann","eichman","ehle","edsall","durall","dupler","dunker","dumlao","duford","duffie","dudding","dries","doung","dorantes","donahoo","domenick","dollins","dobles","dipiazza","dimeo","diehm","dicicco","devenport","desormeaux","derrow","depaolo","demas","delpriore","delosantos","degreenia","degenhardt","defrancesco","defenbaugh","deets","debonis","deary","dazey","dargie","dambrosia","dalal","dagen","cuen","crupi","crossan","crichlow","creque","coutts","counce","coram","constante","connon","collelo","coit","cocklin","coblentz","cobey","coard","clutts","clingan","clampitt","claeys","ciulla","cimini","ciampa","christon","choat","chiou","chenail","chavous","catto","catalfamo","casterline","cassinelli","caspers","carroway","carlen","carithers","cappel","calo","callow","cagley","cafferty","byun","byam","buttner","buth","burtenshaw","burget","burfield","buresh","bunt","bultman","bulow","buchta","buchmann","brunett","bruemmer","brueggeman","britto","briney","brimhall","bribiesca","bresler","brazan","brashier","brar","brandstetter","boze","boonstra","bluitt","blomgren","blattner","blasi","bladen","bitterman","bilby","bierce","biello","bettes","bertone","berrey","bernat","berberich","benshoof","bendickson","bellefeuille","bednarski","beddingfield","beckerman","beaston","bavaro","batalla","basye","baskins","bartolotta","bartkowski","barranco","barkett","banaszak","bame","bamberger","balsley","ballas","balicki","badura","aymond","aylor","aylesworth","axley","axelrod","aubert","armond","ariza","apicella","anstine","ankrom","angevine","andreotti","alto","alspaugh","alpaugh","almada","allinder","alequin","aguillard","agron","agena","afanador","ackerley","abrev","abdalla","aaronson","zynda","zucco","zipp","zetina","zenz","zelinski","youngren","yochum","yearsley","yankey","woodfork","wohlwend","woelfel","wiste","wismer","winzer","winker","wilkison","wigger","wierenga","whipps","westray","wesch","weld","weible","wedell","weddell","wawrzyniak","wasko","washinton","wantz","walts","wallander","wain","wahlen","wachowiak","voshell","viteri","vire","villafuerte","vieyra","viau","vescio","verrier","verhey","vause","vandermolen","vanderhorst","valois","valla","valcourt","vacek","uzzle","umland","ulman","ulland","turvey","tuley","trembath","trabert","towsend","totman","toews","tisch","tisby","tierce","thivierge","tenenbaum","teagle","tacy","tabler","szewczyk","swearngin","suire","sturrock","stubbe","stronach","stoute","stoudemire","stoneberg","sterba","stejskal","steier","stehr","steckel","stearman","steakley","stanforth","stancill","srour","sprowl","spevak","sokoloff","soderman","snover","sleeman","slaubaugh","sitzman","simes","siegal","sidoti","sidler","sider","sidener","siddiqi","shireman","shima","sheroan","shadduck","seyal","sentell","sennett","senko","seligman","seipel","seekins","seabaugh","scouten","schweinsberg","schwartzberg","schurr","schult","schrick","schoening","schmitmeyer","schlicher","schlager","schack","schaar","scavuzzo","scarpa","sassano","santigo","sandavol","sampsel","samms","samet","salzano","salyards","salva","saidi","sabir","saam","runions","rundquist","rousselle","rotunno","rosch","romney","rohner","roff","rockhill","rocamora","ringle","riggie","ricklefs","rexroat","reves","reuss","repka","rentfro","reineke","recore","recalde","rease","rawling","ravencraft","ravelo","rappa","randol","ramsier","ramerez","rahimi","rahim","radney","racey","raborn","rabalais","quebedeaux","pujol","puchalski","prothro","proffit","prigge","prideaux","prevo","portales","porco","popovic","popek","popejoy","pompei","plude","platner","pizzuto","pizer","pistone","piller","pierri","piehl","pickert","piasecki","phong","philipp","peugh","pesqueira","perrett","perfetti","percell","penhollow","pelto","pellett","pavlak","paulo","pastorius","parsell","parrales","pareja","parcell","pappan","pajak","owusu","ovitt","orrick","oniell","olliff","olberding","oesterling","odwyer","ocegueda","obermiller","nylander","nulph","nottage","northam","norgard","nodal","niel","nicols","newhard","nellum","neira","nazzaro","nassif","narducci","nalbandian","musil","murga","muraoka","mumper","mulroy","mountjoy","mossey","moreton","morea","montoro","montesdeoca","montealegre","montanye","montandon","moisan","mohl","modeste","mitra","minson","minjarez","milbourne","michaelsen","metheney","mestre","mescher","mervis","mennenga","melgarejo","meisinger","meininger","mcwaters","mckern","mckendree","mchargue","mcglothlen","mcgibbon","mcgavock","mcduffee","mcclurkin","mccausland","mccardell","mccambridge","mazzoni","mayen","maxton","mawson","mauffray","mattinson","mattila","matsunaga","mascia","marse","marotz","marois","markin","markee","marcinko","marcin","manville","mantyla","manser","manry","manderscheid","mallari","malecha","malcomb","majerus","macinnis","mabey","lyford","luth","lupercio","luhman","luedke","lovick","lossing","lookabaugh","longway","loisel","logiudice","loffredo","lobaugh","lizaola","livers","littlepage","linnen","limmer","liebsch","liebman","leyden","levitan","levison","levier","leven","levalley","lettinga","lessley","lessig","lepine","leight","leick","leggio","leffingwell","leffert","lefevers","ledlow","leaton","leander","leaming","lazos","laviolette","lauffer","latz","lasorsa","lasch","larin","laporta","lanter","langstaff","landi","lamica","lambson","lambe","lamarca","laman","lamagna","lajeunesse","lafontant","lafler","labrum","laakso","kush","kuether","kuchar","kruk","kroner","kroh","kridler","kreuzer","kovats","koprowski","kohout","knicely","knell","klutts","kindrick","kiddy","khanna","ketcher","kerschner","kerfien","kensey","kenley","kenan","kemplin","kellerhouse","keesling","keas","kaplin","kanady","kampen","jutras","jungers","jeschke","janowski","janas","iskra","imperato","ikerd","igoe","hyneman","hynek","husain","hurrell","hultquist","hullett","hulen","huberty","hoyte","hossain","hornstein","hori","hopton","holms","hollmann","holdman","holdeman","holben","hoffert","himel","hillsman","herdt","hellyer","heister","heimer","heidecker","hedgpeth","hedgepath","hebel","heatwole","hayer","hausner","haskew","haselden","hartranft","harsch","harres","harps","hardimon","halm","hallee","hallahan","hackley","hackenberg","hachey","haapala","guynes","gunnerson","gunby","gulotta","gudger","groman","grignon","griebel","gregori","greenan","grauer","gourd","gorin","gorgone","gooslin","goold","goltz","goldberger","glotfelty","glassford","gladwin","giuffre","gilpatrick","gerdts","geisel","gayler","gaunce","gaulding","gateley","gassman","garson","garron","garand","gangestad","gallow","galbo","gabrielli","fullington","fucci","frum","frieden","friberg","frasco","francese","fowle","foucher","fothergill","foraker","fonder","foisy","fogal","flurry","flenniken","fitzhenry","fishbein","finton","filmore","filice","feola","felberbaum","fausnaught","fasciano","farquharson","faires","estridge","essman","enriques","emmick","ekker","ekdahl","eisman","eggleton","eddinger","eakle","eagar","durio","dunwoody","duhaime","duenes","duden","dudas","dresher","dresel","doutt","donlan","donathan","domke","dobrowolski","dingee","dimmitt","dimery","dilullo","deveaux","devalle","desper","desnoyers","desautels","derouin","derbyshire","denmon","demski","delucca","delpino","delmont","deller","dejulio","deibler","dehne","deharo","degner","defore","deerman","decuir","deckman","deasy","dease","deaner","dawdy","daughdrill","darrigo","darity","dalbey","dagenhart","daffron","curro","curnutte","curatolo","cruikshank","crosswell","croslin","croney","crofton","criado","crecelius","coscia","conniff","commodore","coltharp","colonna","collyer","collington","cobbley","coache","clonts","cloe","cliett","clemans","chrisp","chiarini","cheatam","cheadle","chand","chadd","cervera","cerulli","cerezo","cedano","cayetano","cawthorne","cavalieri","cattaneo","cartlidge","carrithers","carreira","carranco","cargle","candanoza","camburn","calender","calderin","calcagno","cahn","cadden","byham","buttry","burry","burruel","burkitt","burgio","burgener","buescher","buckalew","brymer","brumett","brugnoli","brugman","brosnahan","bronder","broeckel","broderson","brisbon","brinsfield","brinks","bresee","bregman","branner","brambila","brailsford","bouska","boster","borucki","bortner","boroughs","borgeson","bonier","bomba","bolender","boesch","boeke","bloyd","bley","binger","bilbro","biery","bichrest","bezio","bevel","berrett","bermeo","bergdoll","bercier","benzel","bentler","belnap","bellini","beitz","behrend","bednarczyk","bearse","bartolini","bartol","barretta","barbero","barbaro","banvelos","bankes","ballengee","baldon","ausmus","atilano","atienza","aschenbrenner","arora","armstong","aquilino","appleberry","applebee","apolinar","antos","andrepont","ancona","amesquita","alvino","altschuler","allin","alire","ainslie","agular","aeschliman","accetta","abdulla","abbe","zwart","zufelt","zirbel","zingaro","zilnicki","zenteno","zent","zemke","zayac","zarrella","yoshimoto","yearout","womer","woltman","wolin","wolery","woldt","witts","wittner","witherow","winward","winrow","wiemann","wichmann","whitwell","whitelaw","wheeless","whalley","wessner","wenzl","wene","weatherbee","waye","wattles","wanke","walkes","waldeck","vonruden","voisine","vogus","vittetoe","villalva","villacis","venturini","venturi","venson","vanloan","vanhooser","vanduzer","vandever","vanderwal","vanderheyden","vanbeek","vanbebber","vallance","vales","vahle","urbain","upshur","umfleet","tsuji","trybus","triolo","trimarchi","trezza","trenholm","tovey","tourigny","torry","torrain","torgeson","tomey","tischler","tinkler","tinder","ticknor","tibbles","tibbals","throneberry","thormahlen","thibert","thibeaux","theurer","templet","tegeler","tavernier","taubman","tamashiro","tallon","tallarico","taboada","sypher","sybert","swyers","switalski","swedberg","suther","surprenant","sullen","sulik","sugden","suder","suchan","strube","stroope","strittmatter","streett","straughn","strasburg","stjacques","stimage","stimac","stifter","stgelais","steinhart","stehlik","steffenson","steenbergen","stanbery","stallone","spraggs","spoto","spilman","speno","spanbauer","spalla","spagnolo","soliman","solan","sobolik","snelgrove","snedden","smale","sliter","slankard","sircy","shutter","shurtliff","shur","shirkey","shewmake","shams","shadley","shaddox","sgro","serfass","seppala","segawa","segalla","seaberry","scruton","scism","schwein","schwartzman","schwantes","schomer","schoenborn","schlottmann","schissler","scheurer","schepis","scheidegger","saunier","sauders","sassman","sannicolas","sanderfur","salser","sagar","saffer","saeed","sadberry","saban","ryce","rybak","rumore","rummell","rudasill","rozman","rota","rossin","rosell","rosel","romberg","rojero","rochin","robideau","robarge","roath","risko","ringel","ringdahl","riera","riemann","ribas","revard","renegar","reinwald","rehman","redel","raysor","rathke","rapozo","rampton","ramaker","rakow","raia","radin","raco","rackham","racca","racanelli","rabun","quaranta","purves","pundt","protsman","prezioso","presutti","presgraves","poydras","portnoy","portalatin","pontes","poehler","poblete","poat","plumadore","pleiman","pizana","piscopo","piraino","pinelli","pillai","picken","picha","piccoli","philen","petteway","petros","peskin","perugini","perrella","pernice","peper","pensinger","pembleton","passman","parrent","panetta","pallas","palka","pais","paglia","padmore","ottesen","oser","ortmann","ormand","oriol","orick","oler","okafor","ohair","obert","oberholtzer","nowland","nosek","nordeen","nolf","nogle","nobriga","nicley","niccum","newingham","neumeister","neugebauer","netherland","nerney","neiss","neis","neider","neeld","nailor","mustain","mussman","musante","murton","murden","munyon","muldrew","motton","moscoso","moschella","moroz","morelos","morace","moone","montesano","montemurro","montas","montalbo","molander","mleczko","miyake","mitschke","minger","minelli","minear","millener","mihelich","miedema","miah","metzer","mery","merrigan","merck","mennella","membreno","melecio","melder","mehling","mehler","medcalf","meche","mealing","mcqueeney","mcphaul","mcmickle","mcmeen","mcmains","mclees","mcgowin","mcfarlain","mcdivitt","mccotter","mcconn","mccaster","mcbay","mcbath","mayoral","mayeux","matsuo","masur","massman","marzette","martensen","marlett","markgraf","marcinkowski","marchbanks","mansir","mandez","mancil","malagon","magnani","madonia","madill","madia","mackiewicz","macgillivray","macdowell","mabee","lundblad","lovvorn","lovings","loreto","linz","linnell","linebaugh","lindstedt","lindbloom","limberg","liebig","lickteig","lichtenberg","licari","lewison","levario","levar","lepper","lenzen","lenderman","lemarr","leinen","leider","legrande","lefort","lebleu","leask","leacock","lazano","lawalin","laven","laplaca","lant","langsam","langone","landress","landen","lande","lamorte","lairsey","laidlaw","laffin","lackner","lacaze","labuda","labree","labella","labar","kyer","kuyper","kulinski","kulig","kuhnert","kuchera","kubicek","kruckeberg","kruchten","krider","kotch","kornfeld","koren","koogler","koll","kole","kohnke","kohli","kofoed","koelling","kluth","klump","klopfenstein","klippel","klinge","klett","klemp","kleis","klann","kitzman","kinnan","kingsberry","kilmon","killpack","kilbane","kijowski","kies","kierstead","kettering","kesselman","kennington","keniston","kehrer","kearl","keala","kassa","kasahara","kantz","kalin","kaina","jupin","juntunen","juares","joynes","jovel","joos","jiggetts","jervis","jerabek","jennison","jaso","janz","izatt","ishibashi","iannotti","hymas","huneke","hulet","hougen","horvat","horstmann","hopple","holtkamp","holsten","hohenstein","hoefle","hoback","hiney","hiemstra","herwig","herter","herriott","hermsen","herdman","herder","herbig","helling","helbig","heitkamp","heinrichs","heinecke","heileman","heffley","heavrin","heaston","haymaker","hauenstein","hartlage","harig","hardenbrook","hankin","hamiter","hagens","hagel","grizzell","griest","griese","grennan","graden","gosse","gorder","goldin","goatley","gillespi","gilbride","giel","ghoston","gershman","geisinger","gehringer","gedeon","gebert","gaxiola","gawronski","gathright","gatchell","gargiulo","garg","galang","gadison","fyock","furniss","furby","funnell","frizell","frenkel","freeburg","frankhouser","franchi","foulger","formby","forkey","fonte","folson","follette","flavell","finegan","filippini","ferencz","ference","fennessey","feggins","feehan","fazzino","fazenbaker","faunce","farraj","farnell","farler","farabee","falkowski","facio","etzler","ethington","esterline","esper","esker","erxleben","engh","emling","elridge","ellenwood","elfrink","ekhoff","eisert","eifert","eichenlaub","egnor","eggebrecht","edlin","edberg","eble","eber","easler","duwe","dutta","dutremble","dusseault","durney","dunworth","dumire","dukeman","dufner","duey","duble","dreese","dozal","douville","ditmore","distin","dimuzio","dildine","dieterich","dieckman","didonna","dhillon","dezern","devereux","devall","detty","detamore","derksen","deremer","deras","denslow","deno","denicola","denbow","demma","demille","delira","delawder","delara","delahanty","dejonge","deininger","dedios","dederick","decelles","debus","debruyn","deborde","deak","dauenhauer","darsey","dansie","dalman","dakin","dagley","czaja","cybart","cutchin","currington","curbelo","croucher","crinklaw","cremin","cratty","cranfield","crafford","cowher","couvillion","couturier","corter","coombes","contos","consolini","connaughton","conely","collom","cockett","clepper","cleavenger","claro","clarkin","ciriaco","ciesla","cichon","ciancio","cianci","chynoweth","chrzanowski","christion","cholewa","chipley","chilcott","cheyne","cheslock","chenevert","charlot","chagolla","chabolla","cesena","cerutti","cava","caul","cassone","cassin","cassese","casaus","casali","cartledge","cardamone","carcia","carbonneau","carboni","carabello","capozzoli","capella","cannata","campoverde","campeau","cambre","camberos","calvery","calnan","calmes","calley","callery","calise","cacciotti","cacciatore","butterbaugh","burgo","burgamy","burell","bunde","bumbalough","buel","buechner","buchannon","brunn","brost","broadfoot","brittan","brevard","breda","brazel","brayboy","brasier","boyea","boxx","boso","bosio","boruff","borda","bongiovanni","bolerjack","boedeker","blye","blumstein","blumenfeld","blinn","bleakley","blatter","blan","bjornson","bisignano","billick","bieniek","bhatti","bevacqua","berra","berenbaum","bensinger","bennefield","belvins","belson","bellin","beighley","beecroft","beaudreau","baynard","bautch","bausch","basch","bartleson","barthelemy","barak","balzano","balistreri","bailer","bagnall","bagg","auston","augustyn","aslinger","ashalintubbi","arjona","arebalo","appelbaum","angert","angelucci","andry","andersson","amorim","amavisca","alward","alvelo","alvear","alumbaugh","alsobrook","allgeier","allende","aldrete","akiyama","ahlquist","adolphson","addario","acoff","abelson","abasta","zulauf","zirkind","zeoli","zemlicka","zawislak","zappia","zanella","yelvington","yeatman","yanni","wragg","wissing","wischmeier","wirta","wiren","wilmouth","williard","willert","willaert","wildt","whelpley","weingart","weidenbach","weidemann","weatherman","weakland","watwood","wattley","waterson","wambach","walzer","waldow","waag","vorpahl","volkmann","vitolo","visitacion","vincelette","viggiano","vieth","vidana","vert","verges","verdejo","venzon","velardi","varian","vargus","vandermeulen","vandam","vanasse","vanaman","utzinger","uriostegui","uplinger","twiss","tumlinson","tschanz","trunnell","troung","troublefield","trojacek","treloar","tranmer","touchton","torsiello","torina","tootle","toki","toepfer","tippie","thronson","thomes","tezeno","texada","testani","tessmer","terrel","terlizzi","tempel","temblador","tayler","tawil","tasch","tames","talor","talerico","swinderman","sweetland","swager","sulser","sullens","subia","sturgell","stumpff","stufflebeam","stucki","strohmeyer","strebel","straughan","strackbein","stobaugh","stetz","stelter","steinmann","steinfeld","stecher","stanwood","stanislawski","stander","speziale","soppe","soni","sobotka","smuin","slee","skerrett","sjoberg","sittig","simonelli","simo","silverio","silveria","silsby","sillman","sienkiewicz","shomo","shoff","shoener","shiba","sherfey","shehane","sexson","setton","sergi","selvy","seiders","seegmiller","sebree","seabury","scroggin","sconyers","schwalb","schurg","schulenberg","schuld","schrage","schow","schon","schnur","schneller","schmidtke","schlatter","schieffer","schenkel","scheeler","schauwecker","schartz","schacherer","scafe","sayegh","savidge","saur","sarles","sarkissian","sarkis","sarcone","sagucio","saffell","saenger","sacher","rylee","ruvolo","ruston","ruple","rulison","ruge","ruffo","ruehl","rueckert","rudman","rudie","rubert","rozeboom","roysden","roylance","rothchild","rosse","rosecrans","rodi","rockmore","robnett","roberti","rivett","ritzel","rierson","ricotta","ricken","rezac","rendell","reitman","reindl","reeb","reddic","reddell","rebuck","reali","raso","ramthun","ramsden","rameau","ralphs","rago","racz","quinteros","quinter","quinley","quiggle","purvines","purinton","purdum","pummill","puglia","puett","ptacek","przybyla","prowse","prestwich","pracht","poutre","poucher","portera","polinsky","poage","platts","pineau","pinckard","pilson","pilling","pilkins","pili","pikes","pigram","pietila","pickron","philippi","philhower","pflueger","pfalzgraf","pettibone","pett","petrosino","persing","perrino","perotti","periera","peri","peredo","peralto","pennywell","pennel","pellegren","pella","pedroso","paulos","paulding","pates","pasek","paramo","paolino","panganiban","paneto","paluch","ozaki","ownbey","overfelt","outman","opper","onstad","oland","okuda","oertel","oelke","normandeau","nordby","nordahl","noecker","noblin","niswonger","nishioka","nett","negley","nedeau","natera","nachman","naas","musich","mungin","mourer","mounsey","mottola","mothershed","moskal","mosbey","morini","moreles","montaluo","moneypenny","monda","moench","moates","moad","missildine","misiewicz","mirabella","minott","mincks","milum","milani","mikelson","mestayer","mertes","merrihew","merlos","meritt","melnyk","medlen","meder","mcvea","mcquarrie","mcquain","mclucas","mclester","mckitrick","mckennon","mcinnes","mcgrory","mcgranahan","mcglamery","mcgivney","mcgilvray","mccuiston","mccuin","mccrystal","mccolley","mcclerkin","mcclenon","mccamey","mcaninch","mazariegos","maynez","mattioli","mastronardi","masone","marzett","marsland","margulies","margolin","malatesta","mainer","maietta","magrath","maese","madkins","madeiros","madamba","mackson","maben","lytch","lundgreen","lumb","lukach","luick","luetkemeyer","luechtefeld","ludy","ludden","luckow","lubinsky","lowes","lorenson","loran","lopinto","looby","lones","livsey","liskey","lisby","lintner","lindow","lindblom","liming","liechty","leth","lesniewski","lenig","lemonds","leisy","lehrer","lehnen","lehmkuhl","leeth","leeks","lechler","lebsock","lavere","lautenschlage","laughridge","lauderback","laudenslager","lassonde","laroque","laramee","laracuente","lapeyrouse","lampron","lamers","laino","lague","lafromboise","lafata","lacount","lachowicz","kysar","kwiecien","kuffel","kueter","kronenberg","kristensen","kristek","krings","kriesel","krey","krebbs","kreamer","krabbe","kossman","kosakowski","kosak","kopacz","konkol","koepsell","koening","koen","knerr","knapik","kluttz","klocke","klenk","klemme","klapp","kitchell","kita","kissane","kirkbride","kirchhoff","kinter","kinsel","kingsland","kimmer","kimler","killoran","kieser","khalsa","khalaf","kettel","kerekes","keplin","kentner","kennebrew","kenison","kellough","keatts","keasey","kauppi","katon","kanner","kampa","kall","kaczorowski","kaczmarski","juarbe","jordison","jobst","jezierski","jeanbart","jarquin","jagodzinski","ishak","isett","infantino","imburgia","illingworth","hysmith","hynson","hydrick","hurla","hunton","hunnell","humbertson","housand","hottle","hosch","hoos","honn","hohlt","hodel","hochmuth","hixenbaugh","hislop","hisaw","hintzen","hilgendorf","hilchey","higgens","hersman","herrara","hendrixson","hendriks","hemond","hemmingway","heminger","helgren","heisey","heilmann","hehn","hegna","heffern","hawrylak","haverty","hauger","haslem","harnett","harb","happ","hanzlik","hanway","hanby","hanan","hamric","hammaker","halas","hagenbuch","habeck","gwozdz","gunia","guadarrama","grubaugh","grivas","griffieth","grieb","grewell","gregorich","grazier","graeber","graciano","gowens","goodpaster","gondek","gohr","goffney","godbee","gitlin","gisler","gillyard","gillooly","gilchrest","gilbo","gierlach","giebler","giang","geske","gervasio","gertner","gehling","geeter","gaus","gattison","gatica","gathings","gath","gassner","gassert","garabedian","gamon","gameros","galban","gabourel","gaal","fuoco","fullenwider","fudala","friscia","franceschini","foronda","fontanilla","florey","flore","flegle","flecha","fisler","fischbach","fiorita","figura","figgins","fichera","ferra","fawley","fawbush","fausett","farnes","farago","fairclough","fahie","fabiani","evanson","eutsey","eshbaugh","ertle","eppley","englehardt","engelhard","emswiler","elling","elderkin","eland","efaw","edstrom","edgemon","ecton","echeverri","ebright","earheart","dynes","dygert","dyches","dulmage","duhn","duhamel","dubrey","dubray","dubbs","drey","drewery","dreier","dorval","dorough","dorais","donlin","donatelli","dohm","doetsch","dobek","disbrow","dinardi","dillahunty","dillahunt","diers","dier","diekmann","diangelo","deskin","deschaine","depaoli","denner","demyan","demont","demaray","delillo","deleeuw","deibel","decato","deblasio","debartolo","daubenspeck","darner","dardon","danziger","danials","damewood","dalpiaz","dallman","dallaire","cunniffe","cumpston","cumbo","cubero","cruzan","cronkhite","critelli","crimi","creegan","crean","craycraft","cranfill","coyt","courchesne","coufal","corradino","corprew","colville","cocco","coby","clinch","clickner","clavette","claggett","cirigliano","ciesielski","christain","chesbro","chavera","chard","casteneda","castanedo","casseus","caruana","carnero","cappelli","capellan","canedy","cancro","camilleri","calero","cada","burghart","burbidge","bulfer","buis","budniewski","bruney","brugh","brossard","brodmerkel","brockmann","brigmond","briere","bremmer","breck","breau","brautigam","brasch","brandenberger","bragan","bozell","bowsher","bosh","borgia","borey","boomhower","bonneville","bonam","bolland","boise","boeve","boettger","boersma","boateng","bliven","blazier","blahnik","bjornstad","bitton","biss","birkett","billingsly","biagioni","bettle","bertucci","bertolino","bermea","bergner","berber","bensley","bendixen","beltrami","bellone","belland","behringer","begum","bayona","batiz","bassin","baskette","bartolomeo","bartolo","bartholow","barkan","barish","barett","bardo","bamburg","ballerini","balla","balis","bakley","bailon","bachicha","babiarz","ayars","axton","axel","awong","awalt","auslander","ausherman","aumick","atha","atchinson","aslett","askren","arrowsmith","arras","arnhold","armagost","arey","arcos","archibeque","antunes","antilla","andras","amyx","amison","amero","alzate","alper","aller","alioto","aigner","agtarap","agbayani","adami","achorn","aceuedo","acedo","abundis","aber","abee","zuccaro","ziglar","zier","ziebell","zieba","zamzow","zahl","yurko","yurick","yonkers","yerian","yeaman","yarman","yann","yahn","yadon","yadao","woodbridge","wolske","wollenberg","wojtczak","wnuk","witherite","winther","winick","widell","wickens","whichard","wheelis","wesely","wentzell","wenthold","wemple","weisenburger","wehling","weger","weaks","wassink","walquist","wadman","wacaster","waage","voliva","vlcek","villafana","vigliotti","viger","viernes","viands","veselka","versteeg","vero","verhoeven","vendetti","velardo","vatter","vasconcellos","varn","vanwagner","vanvoorhis","vanhecke","vanduyn","vandervoort","vanderslice","valone","vallier","vails","uvalle","ursua","urenda","uphoff","tustin","turton","turnbough","turck","tullio","tuch","truehart","tropea","troester","trippe","tricarico","trevarthen","trembly","trabue","traber","tosi","toal","tinley","tingler","timoteo","tiffin","ticer","thorman","therriault","theel","tessman","tekulve","tejera","tebbs","tavernia","tarpey","tallmadge","takemoto","szot","sylvest","swindoll","swearinger","swantek","swaner","swainston","susi","surrette","sullenger","sudderth","suddarth","suckow","strege","strassburg","stoval","stotz","stoneham","stilley","stille","stierwalt","stfleur","steuck","stermer","stclaire","stano","staker","stahler","stablein","srinivasan","squillace","sprvill","sproull","sprau","sporer","spore","spittler","speelman","sparr","sparkes","spang","spagnuolo","sosinski","sorto","sorkin","sondag","sollers","socia","snarr","smrekar","smolka","slyter","slovinsky","sliwa","slavik","slatter","skiver","skeem","skala","sitzes","sitsler","sitler","sinko","simser","siegler","sideris","shrewsberry","shoopman","shoaff","shindler","shimmin","shill","shenkel","shemwell","shehorn","severa","semones","selsor","sekulski","segui","sechrest","schwer","schwebach","schur","schmiesing","schlick","schlender","schebler","schear","schapiro","sauro","saunder","sauage","satterly","saraiva","saracino","saperstein","sanmartin","sanluis","sandt","sandrock","sammet","sama","salk","sakata","saini","sackrider","russum","russi","russaw","rozzell","roza","rowlette","rothberg","rossano","rosebrock","romanski","romanik","romani","roiger","roig","roehr","rodenberger","rodela","rochford","ristow","rispoli","rigo","riesgo","riebel","ribera","ribaudo","reys","resendes","repine","reisdorf","reisch","rebman","rasmus","raske","ranum","rames","rambin","raman","rajewski","raffield","rady","radich","raatz","quinnie","pyper","puthoff","prow","proehl","pribyl","pretti","prete","presby","poyer","powelson","porteous","poquette","pooser","pollan","ploss","plewa","placide","pion","pinnick","pinales","pillot","pille","pilato","piggee","pietrowski","piermarini","pickford","piccard","phenix","pevey","petrowski","petrillose","pesek","perrotti","peppler","peppard","penfold","pellitier","pelland","pehowic","pedretti","paules","passero","pasha","panza","pallante","palau","pakele","pacetti","paavola","overy","overson","outler","osegueda","oplinger","oldenkamp","ohern","oetting","odums","nowlen","nowack","nordlund","noblett","nobbe","nierman","nichelson","niblock","newbrough","nemetz","needleman","navin","nastasi","naslund","naramore","nakken","nakanishi","najarro","mushrush","muma","mulero","morganfield","moreman","morain","moquin","monterrosa","monsivais","monroig","monje","monfort","moffa","moeckel","mobbs","misiak","mires","mirelez","mineo","mineau","milnes","mikeska","michelin","michalowski","meszaros","messineo","meshell","merten","meola","menton","mends","mende","memmott","melius","mehan","mcnickle","mcmorran","mclennon","mcleish","mclaine","mckendry","mckell","mckeighan","mcisaac","mcie","mcguinn","mcgillis","mcfatridge","mcfarling","mcelravy","mcdonalds","mcculla","mcconnaughy","mcconnaughey","mcchriston","mcbeath","mayr","matyas","matthiesen","matsuura","matinez","mathys","matarazzo","masker","masden","mascio","martis","marrinan","marinucci","margerum","marengo","manthe","mansker","manoogian","mankey","manigo","manier","mangini","maltese","malsam","mallo","maliszewski","mainolfi","maharaj","maggart","magar","maffett","macmaster","macky","macdonnell","lyvers","luzzi","lutman","lovan","lonzo","longerbeam","lofthouse","loethen","lodi","llorens","lizama","litscher","lisowski","lipski","lipsett","lipkin","linzey","lineman","limerick","limas","lige","lierman","liebold","liberti","leverton","levene","lesueur","lenser","lenker","legnon","lefrancois","ledwell","lavecchia","laurich","lauricella","lannigan","landor","lamprecht","lamountain","lamore","lammert","lamboy","lamarque","lamacchia","lalley","lagace","lacorte","lacomb","kyllonen","kyker","kuschel","kupfer","kunde","kucinski","kubacki","kroenke","krech","koziel","kovacich","kothari","koth","kotek","kostelnik","kosloski","knoles","knabe","kmiecik","klingman","kliethermes","kleffman","klees","klaiber","kittell","kissling","kisinger","kintner","kinoshita","kiener","khouri","kerman","kelii","keirn","keezer","kaup","kathan","kaser","karlsen","kapur","kandoll","kammel","kahele","justesen","jonason","johnsrud","joerling","jochim","jespersen","jeong","jenness","jedlicka","jakob","isaman","inghram","ingenito","iadarola","hynd","huxtable","huwe","hurless","humpal","hughston","hughart","huggett","hugar","huether","howdyshell","houtchens","houseworth","hoskie","holshouser","holmen","holloran","hohler","hoefler","hodsdon","hochman","hjort","hippert","hippe","hinzman","hillock","hilden","heyn","heyden","heyd","hergert","henrikson","henningsen","hendel","helget","helf","helbing","heintzman","heggie","hege","hecox","heatherington","heare","haxton","haverstock","haverly","hatler","haselton","hase","hartzfeld","harten","harken","hargrow","haran","hanton","hammar","hamamoto","halper","halko","hackathorn","haberle","haake","gunnoe","gunkel","gulyas","guiney","guilbeau","guider","guerrant","gudgel","guarisco","grossen","grossberg","gropp","groome","grobe","gremminger","greenley","grauberger","grabenstein","gowers","gostomski","gosier","goodenow","gonzoles","goliday","goettle","goens","goates","glymph","glavin","glassco","gladfelter","glackin","githens","girgis","gimpel","gilbreth","gilbeau","giffen","giannotti","gholar","gervasi","gertsch","gernatt","gephardt","genco","gehr","geddis","gase","garrott","garrette","gapinski","ganter","ganser","gangi","gangemi","gallina","galdi","gailes","gaetano","gadomski","gaccione","fuschetto","furtick","furfaro","fullman","frutos","fruchter","frogge","freytag","freudenthal","fregoe","franzone","frankum","francia","franceschi","forys","forero","folkers","flug","flitter","flemons","fitzer","firpo","finizio","filiault","figg","fichtner","fetterolf","ferringer","feil","fayne","farro","faddis","ezzo","ezelle","eynon","evitt","eutsler","euell","escovedo","erne","eriksson","enriguez","empson","elkington","eisenmenger","eidt","eichenberger","ehrmann","ediger","earlywine","eacret","duzan","dunnington","ducasse","dubiel","drovin","drager","drage","donham","donat","dolinger","dokken","doepke","dodwell","docherty","distasio","disandro","diniz","digangi","didion","dezzutti","detmer","deshon","derrigo","dentler","demoura","demeter","demeritt","demayo","demark","demario","delzell","delnero","delgrosso","dejarnett","debernardi","dearmas","dashnaw","daris","danks","danker","dangler","daignault","dafoe","dace","curet","cumberledge","culkin","crowner","crocket","crawshaw","craun","cranshaw","cragle","courser","costella","cornforth","corkill","coopersmith","conzemius","connett","connely","condict","condello","comley","cohoon","coday","clugston","clowney","clippard","clinkenbeard","clines","clelland","clapham","clancey","clabough","cichy","cicalese","chua","chittick","chisom","chisley","chinchilla","cheramie","cerritos","cercone","cena","cawood","cavness","catanzarite","casada","carvell","carmicheal","carll","cardozo","caplin","candia","canby","cammon","callister","calligan","calkin","caillouet","buzzelli","bute","bustillo","bursey","burgeson","bupp","bulson","buist","buffey","buczkowski","buckbee","bucio","brueckner","broz","brookhart","brong","brockmeyer","broberg","brittenham","brisbois","bridgmon","breyer","brede","breakfield","breakey","brauner","branigan","brandewie","branche","brager","brader","bovell","bouthot","bostock","bosma","boseman","boschee","borthwick","borneman","borer","borek","boomershine","boni","bommarito","bolman","boleware","boisse","boehlke","bodle","blash","blasco","blakesley","blacklock","blackley","bittick","birks","birdin","bircher","bilbao","bick","biby","bertoni","bertino","bertini","berson","bern","berkebile","bergstresser","benne","benevento","belzer","beltre","bellomo","bellerose","beilke","begeman","bebee","beazer","beaven","beamish","baymon","baston","bastidas","basom","basey","bartles","baroni","barocio","barnet","barclift","banville","balthazor","balleza","balkcom","baires","bailie","baik","baggott","bagen","bachner","babington","babel","asmar","arvelo","artega","arrendondo","arreaga","arrambide","arquette","aronoff","arico","argentieri","arevalos","archbold","apuzzo","antczak","ankeny","angelle","angelini","anfinson","amer","amarillas","altier","altenburg","alspach","alosa","allsbrook","alexopoulos","aleem","aldred","albertsen","akerson","agler","adley","addams","acoba","achille","abplanalp","abella","abare","zwolinski","zollicoffer","zins","ziff","zenner","zender","zelnick","zelenka","zeches","zaucha","zauala","zangari","zagorski","youtsey","yasso","yarde","yarbough","woolever","woodsmall","woodfolk","wobig","wixson","wittwer","wirtanen","winson","wingerd","wilkening","wilhelms","wierzbicki","wiechman","weyrick","wessell","wenrick","wenning","weltz","weinrich","weiand","wehunt","wareing","walth","waibel","wahlquist","vona","voelkel","vitek","vinsant","vincente","vilar","viel","vicars","vermette","verma","venner","veazie","vayda","vashaw","varon","vardeman","vandevelde","vanbrocklin","vaccarezza","urquidez","urie","urbach","uram","ungaro","umali","ulsh","tutwiler","turnbaugh","tumminello","tuite","tueller","trulove","troha","trivino","trisdale","trippett","tribbett","treptow","tremain","travelstead","trautwein","trautmann","tram","traeger","tonelli","tomsic","tomich","tomasulo","tomasino","tole","todhunter","toborg","tischer","tirpak","tircuit","tinnon","tinnel","tines","timbs","tilden","tiede","thumm","throgmorton","thorndike","thornburgh","thoren","thomann","therrell","thau","thammavong","tetrick","tessitore","tesreau","teicher","teaford","tauscher","tauer","tanabe","talamo","takeuchi","taite","tadych","sweeton","swecker","swartzentrube","swarner","surrell","surbaugh","suppa","sumbry","suchy","stuteville","studt","stromer","strome","streng","stonestreet","stockley","stmichel","stfort","sternisha","stensrud","steinhardt","steinback","steichen","stauble","stasiak","starzyk","stango","standerfer","stachowiak","springston","spratlin","spracklen","sponseller","spilker","spiegelman","spellacy","speiser","spaziani","spader","spackman","sorum","sopha","sollis","sollenberger","solivan","solheim","sokolsky","sogge","smyser","smitley","sloas","slinker","skora","skiff","skare","siverd","sivels","siska","siordia","simmering","simko","sime","silmon","silano","sieger","siebold","shukla","shreves","shoun","shortle","shonkwiler","shoals","shimmel","shiel","shieh","sherbondy","shenkman","shein","shearon","shean","shatz","shanholtz","shafran","shaff","shackett","sgroi","sewall","severy","sethi","sessa","sequra","sepulvado","seper","senteno","sendejo","semmens","seipp","segler","seegers","sedwick","sedore","sechler","sebastiano","scovel","scotton","scopel","schwend","schwarting","schutter","schrier","schons","scholtes","schnetzer","schnelle","schmutz","schlichter","schelling","schams","schamp","scarber","scallan","scalisi","scaffidi","saxby","sawrey","sauvageau","sauder","sarrett","sanzo","santizo","santella","santander","sandez","sandel","sammon","salsedo","salge","sagun","safi","sader","sacchetti","sablan","saade","runnion","runkel","rumbo","ruesch","ruegg","ruckle","ruchti","rubens","rubano","rozycki","roupe","roufs","rossel","rosmarin","rosero","rosenwald","ronca","romos","rolla","rohling","rohleder","roell","roehm","rochefort","roch","robotham","rivenburgh","riopel","riederer","ridlen","rias","rhudy","reynard","retter","respess","reppond","repko","rengifo","reinking","reichelt","reeh","redenius","rebolledo","rauh","ratajczak","rapley","ranalli","ramie","raitt","radloff","radle","rabbitt","quay","quant","pusateri","puffinberger","puerta","provencio","proano","privitera","prenger","prellwitz","pousson","potier","portz","portlock","porth","portela","portee","porchia","pollick","polinski","polfer","polanski","polachek","pluta","plourd","plauche","pitner","piontkowski","pileggi","pierotti","pico","piacente","phinisee","phaup","pfost","pettinger","pettet","petrich","peto","persley","persad","perlstein","perko","pere","penders","peifer","peco","pawley","pash","parrack","parady","papen","pangilinan","pandolfo","palone","palmertree","padin","ottey","ottem","ostroski","ornstein","ormonde","onstott","oncale","oltremari","olcott","olan","oishi","oien","odonell","odonald","obeso","obeirne","oatley","nusser","novo","novicki","nitschke","nistler","nikkel","niese","nierenberg","nield","niedzwiecki","niebla","niebel","nicklin","neyhart","newsum","nevares","nageotte","nagai","mutz","murata","muralles","munnerlyn","mumpower","muegge","muckle","muchmore","moulthrop","motl","moskos","mortland","morring","mormile","morimoto","morikawa","morgon","mordecai","montour","mont","mongan","monell","miyasato","mish","minshew","mimbs","millin","milliard","mihm","middlemiss","miano","mesick","merlan","mendonsa","mench","melonson","melling","meachem","mctighe","mcnelis","mcmurtrey","mckesson","mckenrick","mckelvie","mcjunkins","mcgory","mcgirr","mcgeever","mcfield","mcelhinney","mccrossen","mccommon","mccannon","mazyck","mawyer","maull","matute","mathies","maschino","marzan","martinie","marrotte","marmion","markarian","marinacci","margolies","margeson","marak","maraia","maracle","manygoats","manker","mank","mandich","manderson","maltz","malmquist","malacara","majette","magnan","magliocca","madina","madara","macwilliams","macqueen","maccallum","lyde","lyday","lutrick","lurz","lurvey","lumbreras","luhrs","luhr","lowrimore","lowndes","lourenco","lougee","lorona","longstreth","loht","lofquist","loewenstein","lobos","lizardi","lionberger","limoli","liljenquist","liguori","liebl","liburd","leukhardt","letizia","lesinski","lepisto","lenzini","leisenring","leipold","leier","leggitt","legare","leaphart","lazor","lazaga","lavey","laue","laudermilk","lauck","lassalle","larsson","larison","lanzo","lantzy","lanners","langtry","landford","lancour","lamour","lambertson","lalone","lairson","lainhart","lagreca","lacina","labranche","labate","kurtenbach","kuipers","kuechle","kubo","krinsky","krauser","kraeger","kracht","kozeliski","kozar","kowalik","kotler","kotecki","koslosky","kosel","koob","kolasinski","koizumi","kohlman","koffman","knutt","knore","knaff","kmiec","klamm","kittler","kitner","kirkeby","kiper","kindler","kilmartin","kilbride","kerchner","kendell","keddy","keaveney","kearsley","karlsson","karalis","kappes","kapadia","kallman","kallio","kalil","kader","jurkiewicz","jitchaku","jillson","jeune","jarratt","jarchow","janak","ivins","ivans","isenhart","inocencio","inoa","imhof","iacono","hynds","hutching","hutchin","hulsman","hulsizer","hueston","huddleson","hrbek","howry","housey","hounshell","hosick","hortman","horky","horine","hootman","honeywell","honeyestewa","holste","holien","holbrooks","hoffmeyer","hoese","hoenig","hirschfeld","hildenbrand","higson","higney","hibert","hibbetts","hewlin","hesley","herrold","hermon","hepker","henwood","helbling","heinzman","heidtbrink","hedger","havey","hatheway","hartshorne","harpel","haning","handelman","hamalainen","hamad","halasz","haigwood","haggans","hackshaw","guzzo","gundrum","guilbeault","gugliuzza","guglielmi","guderian","gruwell","grunow","grundman","gruen","grotzke","grossnickle","groomes","grode","grochowski","grob","grein","greif","greenwall","greenup","grassl","grannis","grandfield","grames","grabski","grabe","gouldsberry","gosch","goodling","goodermote","gonzale","golebiowski","goldson","godlove","glanville","gillin","gilkerson","giessler","giambalvo","giacomini","giacobbe","ghio","gergen","gentz","genrich","gelormino","gelber","geitner","geimer","gauthreaux","gaultney","garvie","gareau","garbacz","ganoe","gangwer","gandarilla","galyen","galt","galluzzo","galardo","gager","gaddie","gaber","gabehart","gaarder","fusilier","furnari","furbee","fugua","fruth","frohman","friske","frilot","fridman","frescas","freier","frayer","franzese","frankenberry","frain","fosse","foresman","forbess","flook","fletes","fleer","fleek","fleegle","fishburne","fiscalini","finnigan","fini","filipiak","figueira","fiero","ficek","fiaschetti","ferren","ferrando","ferman","fergusson","fenech","feiner","feig","faulds","fariss","falor","falke","ewings","eversley","everding","etling","essen","erskin","enstrom","engebretsen","eitel","eichberger","ehler","eekhoff","edrington","edmonston","edgmon","edes","eberlein","dwinell","dupee","dunklee","dungey","dunagin","dumoulin","duggar","duenez","dudzic","dudenhoeffer","ducey","drouillard","dreibelbis","dreger","dreesman","draughon","downen","dorminy","dombeck","dolman","doebler","dittberner","dishaw","disanti","dinicola","dinham","dimino","dilling","difrancesco","dicello","dibert","deshazer","deserio","descoteau","deruyter","dering","depinto","dente","demus","demattos","demarsico","delude","dekok","debrito","debois","deakin","dayley","dawsey","dauria","datson","darty","darsow","darragh","darensbourg","dalleva","dalbec","dadd","cutcher","cung","cuello","cuadros","crute","crutchley","crispino","crislip","crisco","crevier","creekmur","crance","cragg","crager","cozby","coyan","coxon","covalt","couillard","costley","costilow","cossairt","corvino","corigliano","cordaro","corbridge","corban","coor","conkel","conary","coltrain","collopy","colgin","colen","colbath","coiro","coffie","cochrum","cobbett","clopper","cliburn","clendenon","clemon","clementi","clausi","cirino","cina","churchman","chilcutt","cherney","cheetham","cheatom","chatelain","chalifour","cesa","cervenka","cerullo","cerreta","cerbone","cecchini","ceccarelli","cawthorn","cavalero","castner","castlen","castine","casimiro","casdorph","cartmill","cartmell","carro","carriger","carias","caravella","cappas","capen","cantey","canedo","camuso","campanaro","cambria","calzado","callejo","caligiuri","cafaro","cadotte","cacace","byrant","busbey","burtle","burres","burnworth","burggraf","burback","bunte","bunke","bulle","bugos","budlong","buckhalter","buccellato","brummet","bruff","brubeck","brouk","broten","brosky","broner","brislin","brimm","brillhart","bridgham","brideau","brennecke","breer","breeland","bredesen","brackney","brackeen","boza","boyum","bowdry","bowdish","bouwens","bouvier","bougie","bouche","bottenfield","bostian","bossie","bosler","boschert","boroff","borello","bonser","bonfield","bole","boldue","bogacz","boemer","bloxom","blickenstaff","blessinger","bleazard","blatz","blanchet","blacksher","birchler","binning","binkowski","biltz","bilotta","bilagody","bigbee","bieri","biehle","bidlack","betker","bethers","bethell","bero","bernacchi","bermingham","berkshire","benvenuto","bensman","benoff","bencivenga","beman","bellow","bellany","belflower","belch","bekker","bejar","beisel","beichner","beedy","beas","beanblossom","bawek","baus","baugus","battie","battershell","bateson","basque","basford","bartone","barritt","barko","bann","bamford","baltrip","balon","balliew","ballam","baldus","ayling","avelino","ashwell","ashland","arseneau","arroyos","armendarez","arita","argust","archuletta","arcement","antonacci","anthis","antal","annan","anderman","amster","amiri","amadon","alveraz","altomari","altmann","altenhofen","allers","allbee","allaway","aleo","alcoser","alcorta","akhtar","ahuna","agramonte","agard","adkerson","achord","abdi","abair","zurn","zoellner","zirk","zion","zarro","zarco","zambo","zaiser","zaino","zachry","youd","yonan","yniguez","yepes","yellock","yellen","yeatts","yearling","yatsko","yannone","wyler","woodridge","wolfrom","wolaver","wolanin","wojnar","wojciak","wittmann","wittich","wiswell","wisser","wintersteen","wineland","willford","wiginton","wigfield","wierman","wice","wiater","whitsel","whitbread","wheller","wettstein","werling","wente","wenig","wempe","welz","weinhold","weigelt","weichman","wedemeyer","weddel","wayment","waycaster","wauneka","watzka","watton","warnell","warnecke","warmack","warder","wands","waldvogel","waldridge","wahs","wagganer","waddill","vyas","vought","votta","voiles","virga","viner","villella","villaverde","villaneda","viele","vickroy","vicencio","vetere","vermilyea","verley","verburg","ventresca","veno","venard","venancio","velaquez","veenstra","vasil","vanzee","vanwie","vantine","vant","vanschoyck","vannice","vankampen","vanicek","vandersloot","vanderpoel","vanderlinde","vallieres","uzzell","uzelac","uranga","uptain","updyke","uong","untiedt","umbrell","umbaugh","umbarger","ulysse","ullmann","ullah","tutko","turturro","turnmire","turnley","turcott","turbyfill","turano","tuminello","tumbleson","tsou","truscott","trulson","troutner","trone","trinklein","tremmel","tredway","trease","traynham","traw","totty","torti","torregrossa","torok","tomkins","tomaino","tkach","tirey","tinsman","timpe","tiefenauer","tiedt","tidball","thwaites","thulin","throneburg","thorell","thorburn","thiemann","thieman","thesing","tham","terrien","telfair","taybron","tasson","tasso","tarro","tanenbaum","taddeo","taborn","tabios","szekely","szatkowski","sylve","swineford","swartzfager","swanton","swagerty","surrency","sunderlin","sumerlin","suero","suddith","sublette","stumpe","stueve","stuckert","strycker","struve","struss","strubbe","strough","strothmann","strahle","stoutner","stooksbury","stonebarger","stokey","stoffer","stimmel","stief","stephans","stemper","steltenpohl","stellato","steinle","stegeman","steffler","steege","steckman","stapel","stansbery","stanaland","stahley","stagnaro","stachowski","squibb","sprunger","sproule","sprehe","spreen","sprecher","sposato","spivery","souter","sopher","sommerfeldt","soffer","snowberger","snape","smylie","smyer","slaydon","slatton","slaght","skovira","skeans","sjolund","sjodin","siragusa","singelton","silis","siebenaler","shuffield","shobe","shiring","shimabukuro","shilts","sherbert","shelden","sheil","shedlock","shearn","shaub","sharbono","shapley","shands","shaheen","shaffner","servantez","sentz","seney","selin","seitzinger","seider","sehr","sego","segall","sebastien","scimeca","schwenck","schweiss","schwark","schwalbe","schucker","schronce","schrag","schouten","schoppe","schomaker","schnarr","schmied","schmader","schlicht","schlag","schield","schiano","scheve","scherbarth","schaumburg","schauman","scarpino","savinon","sassaman","saporito","sanville","santilli","santaana","salzmann","salman","sagraves","safran","saccone","rutty","russett","rupard","rumbley","ruffins","ruacho","rozema","roxas","routson","rourk","rought","rotunda","rotermund","rosman","rork","rooke","rolin","rohm","rohlman","rohl","roeske","roecker","rober","robenson","riso","rinne","riina","rigsbee","riggles","riester","rials","rhinehardt","reynaud","reyburn","rewis","revermann","reutzel","retz","rende","rendall","reistad","reinders","reichardt","rehrig","rehrer","recendez","reamy","rauls","ratz","rattray","rasband","rapone","ragle","ragins","radican","raczka","rachels","raburn","rabren","raboin","quesnell","quaintance","puccinelli","pruner","prouse","prosise","proffer","prochazka","probasco","previte","portell","porcher","popoca","pomroy","poma","polsky","polsgrove","polidore","podraza","plymale","plescia","pleau","platte","pizzi","pinchon","picot","piccione","picazo","philibert","phebus","pfohl","petell","pesso","pesante","pervis","perrins","perley","perkey","pereida","penate","peloso","pellerito","peffley","peddicord","pecina","peale","payette","paxman","pawlikowski","pavy","patry","patmon","patil","pater","patak","pasqua","pasche","partyka","parody","parmeter","pares","pardi","paonessa","panozzo","panameno","paletta","pait","oyervides","ossman","oshima","ortlieb","orsak","onley","oldroyd","okano","ohora","offley","oestreicher","odonovan","odham","odegard","obst","obriant","obrecht","nuccio","nowling","nowden","novelli","nost","norstrom","nordgren","nopper","noller","nisonger","niskanen","nienhuis","nienaber","neuwirth","neumeyer","neice","naugher","naiman","nagamine","mustin","murrietta","murdaugh","munar","muhlbauer","mroczkowski","mowdy","mouw","mousel","mountcastle","moscowitz","mosco","morro","moresi","morago","moomaw","montroy","montpas","montieth","montanaro","mongelli","mollison","mollette","moldovan","mohar","mitchelle","mishra","misenheimer","minshall","minozzi","minniefield","milhous","migliaccio","migdal","mickell","meyering","methot","mester","mesler","meriweather","mensing","mensah","menge","mendibles","meloche","melnik","mellas","meinert","mehrhoff","medas","meckler","mctague","mcspirit","mcshea","mcquown","mcquiller","mclarney","mckiney","mckearney","mcguyer","mcfarlan","mcfadyen","mcdanial","mcdanel","mccurtis","mccrohan","mccorry","mcclune","mccant","mccanna","mccandlish","mcaloon","mayall","maver","maune","matza","matsuzaki","matott","mathey","mateos","masoner","masino","marzullo","marz","marsolek","marquard","marchetta","marberry","manzione","manthei","manka","mangram","mangle","mangel","mandato","mancillas","mammen","malina","maletta","malecki","majkut","mages","maestre","macphail","maco","macneill","macadam","lysiak","lyne","luxton","luptak","lundmark","luginbill","lovallo","louthan","lousteau","loupe","lotti","lopresto","lonsdale","longsworth","lohnes","loghry","logemann","lofaro","loeber","locastro","livings","litzinger","litts","liotta","lingard","lineback","lindhorst","lill","lide","lickliter","liberman","lewinski","levandowski","leimbach","leifer","leidholt","leiby","leibel","leibee","lehrke","lehnherr","lego","leese","leen","ledo","lech","leblond","leahey","lazzari","lawrance","lawlis","lawhorne","lawes","lavigna","lavell","lauzier","lauter","laumann","latsha","latourette","latona","latney","laska","larner","larmore","larke","larence","lapier","lanzarin","lammey","lamke","laminack","lamastus","lamaster","lacewell","labarr","laabs","kutch","kuper","kuna","kubis","krzemien","krupinski","krepps","kreeger","kraner","krammer","kountz","kothe","korpela","komara","kolenda","kolek","kohnen","koelzer","koelsch","kocurek","knoke","knauff","knaggs","knab","kluver","klose","klien","klahr","kitagawa","kissler","kirstein","kinnon","kinnebrew","kinnamon","kimmins","kilgour","kilcoyne","kiester","kiehm","kesselring","kerestes","kenniston","kennamore","kenebrew","kelderman","keitel","kefauver","katzenberger","katt","kast","kassel","kamara","kalmbach","kaizer","kaiwi","kainz","jurczyk","jumonville","juliar","jourdain","johndrow","johanning","johannesen","joffrion","jobes","jerde","jentzsch","jenkens","jendro","jellerson","jefferds","jaure","jaquish","janeway","jago","iwasaki","ishman","isaza","inmon","inlow","inclan","ildefonso","iezzi","ianni","iacovetto","hyldahl","huxhold","huser","humpherys","humburg","hult","hullender","hulburt","huckabay","howeth","hovermale","hoven","houtman","hourigan","hosek","hopgood","homrich","holstine","holsclaw","hokama","hoffpauir","hoffner","hochstein","hochstatter","hochberg","hjelm","hiscox","hinsley","hineman","hineline","hinck","hilbun","hewins","herzing","hertzberg","hertenstein","herrea","herington","henrie","henman","hengst","hemmen","helmke","helgerson","heinsohn","heigl","hegstad","heggen","hegge","hefti","heathcock","haylett","haupert","haufler","hatala","haslip","hartless","hartje","hartis","harpold","harmsen","harbach","hanten","hanington","hammen","hameister","hallstrom","habersham","habegger","gussman","gundy","guitterez","guisinger","guilfoyle","groulx","grismer","griesbach","grawe","grall","graben","goulden","gornick","gori","gookin","gonzalaz","gonyer","gonder","golphin","goller","goergen","glosson","glor","gladin","girdler","gillim","gillians","gillaspie","gilhooly","gildon","gignac","gibler","gibbins","giardino","giampietro","gettman","gerringer","gerrald","gerlich","georgiou","georgi","geiselman","gehman","gangl","gamage","gallian","gallen","gallatin","galea","gainor","gahr","furbush","fulfer","fuhrmann","fritter","friis","friedly","freudenberger","freemon","fratus","frans","foulke","fosler","forquer","fontan","folwell","foeller","fodge","fobes","florek","fliss","flesner","flegel","fitzloff","fiser","firmin","firestine","finfrock","fineberg","fiegel","fickling","fesperman","fernadez","felber","feimster","feazel","favre","faughn","fatula","fasone","farron","faron","farino","falvey","falkenberg","faley","faletti","faeth","fackrell","espe","eskola","escott","esaw","erps","erker","erath","enfield","emfinger","embury","embleton","emanuele","elvers","ellwanger","ellegood","eichinger","egge","egeland","edgett","echard","eblen","eastmond","duteau","durland","dure","dunlavy","dungee","dukette","dugay","duboise","dubey","dsouza","druck","dralle","doubek","dorta","dorch","dorce","dopson","dolney","dockter","distler","dippel","dichiara","dicerbo","dewindt","dewan","deveney","devargas","deutscher","deuel","detter","dess","derrington","deroberts","dern","deponte","denogean","denardi","denard","demary","demarais","delucas","deloe","delmonico","delisi","delio","delduca","deihl","dehmer","decoste","dechick","decatur","debruce","debold","debell","deats","daunt","daquilante","dambrosi","damas","dalin","dahman","dahlem","daffin","dacquel","cutrell","cusano","curtner","currens","curnow","cuppett","cummiskey","cullers","culhane","crull","crossin","cropsey","cromie","crofford","criscuolo","crisafulli","crego","creeden","covello","covel","corse","correra","cordner","cordier","coplen","copeman","contini","conteras","consalvo","conduff","compher","colliver","colan","cohill","cohenour","cogliano","codd","cockayne","clum","clowdus","clarida","clance","clairday","clagg","citron","citino","ciriello","cicciarelli","chrostowski","christley","chrisco","chrest","chisler","chieffo","cherne","cherico","cherian","cheirs","chauhan","chamblin","cerra","cepero","cellini","celedon","cejka","cavagnaro","cauffman","catanese","castrillo","castrellon","casserly","caseres","carthen","carse","carragher","carpentieri","carmony","carmer","carlozzi","caradine","cappola","capece","capaldi","cantres","cantos","canevari","canete","calcaterra","cadigan","cabbell","byrn","bykowski","butchko","busler","bushaw","buschmann","burow","buri","burgman","bunselmeyer","bunning","buhrman","budnick","buckson","buckhannon","brunjes","brumleve","bruckman","brouhard","brougham","brostrom","broerman","brocks","brison","brining","brindisi","brereton","breon","breitling","breedon","brasseaux","branaman","bramon","brackenridge","boyan","boxley","bouman","bouillion","botting","botti","bosshart","borup","borner","bordonaro","bonsignore","bonsall","bolter","bojko","bohne","bohlmann","bogdon","boen","bodenschatz","bockoven","bobrow","blondin","blissett","bligen","blasini","blankenburg","bjorkman","bistline","bisset","birdow","biondolillo","bielski","biele","biddix","biddinger","bianchini","bevens","bevard","betancur","bernskoetter","bernet","bernardez","berliner","berland","berkheimer","berent","bensch","benesch","belleau","bedingfield","beckstrom","beckim","bechler","beachler","bazzell","basa","bartoszek","barsch","barrell","barnas","barnaba","barillas","barbier","baltodano","baltierra","balle","balint","baldi","balderson","balderama","baldauf","balcazar","balay","baiz","bairos","azim","aversa","avellaneda","ausburn","auila","augusto","atwill","artiles","arterberry","arnow","arnaud","arnall","arenz","arduini","archila","arakawa","appleman","aplin","antonini","anstey","anglen","andros","amweg","amstutz","amari","amadeo","alteri","aloi","allebach","aley","alamillo","airhart","ahrendt","aegerter","adragna","admas","adderly","adderley","addair","abelar","abbamonte","abadi","zurek","zundel","zuidema","zuelke","zuck","zogg","zody","zets","zech","zecca","zavaleta","zarr","yousif","yoes","yoast","yeagley","yaney","yanda","yackel","wyles","wyke","woolman","woollard","woodis","woodin","wonderly","wombles","woloszyn","wollam","wnek","wittie","withee","wissman","wisham","wintle","winokur","wilmarth","willhoite","wildner","wikel","wieser","wien","wicke","wiatrek","whitehall","whetstine","wheelus","weyrauch","weyers","westerling","wendelken","welner","weinreb","weinheimer","weilbacher","weihe","weider","wecker","wead","watler","watkinson","wasmer","waskiewicz","wasik","warneke","wares","wangerin","wamble","walken","waker","wakeley","wahlgren","wahlberg","wagler","wachob","vorhies","vonseggern","vittitow","vink","villarruel","villamil","villamar","villalovos","vidmar","victorero","vespa","vertrees","verissimo","veltman","vecchione","veals","varrone","varma","vanveen","vanterpool","vaneck","vandyck","vancise","vanausdal","vanalphen","valdiviezo","urton","urey","updegrove","unrue","ulbrich","tysinger","twiddy","tunson","trueheart","troyan","trier","traweek","trafford","tozzi","toulouse","tosto","toste","torez","tooke","tonini","tonge","tomerlin","tolmie","tobe","tippen","tierno","tichy","thuss","thran","thornbury","thone","theunissen","thelmon","theall","textor","teters","tesh","tench","tekautz","tehrani","teat","teare","tavenner","tartaglione","tanski","tanis","tanguma","tangeman","taney","tammen","tamburri","tamburello","talsma","tallie","takeda","taira","taheri","tademy","taddei","taaffe","szymczak","szczepaniak","szafranski","swygert","swem","swartzlander","sutley","supernaw","sundell","sullivant","suderman","sudbury","suares","stueber","stromme","streeper","streck","strebe","stonehouse","stoia","stohr","stodghill","stirewalt","sterry","stenstrom","stene","steinbrecher","stear","stdenis","stanphill","staniszewski","stanard","stahlhut","stachowicz","srivastava","spong","spomer","spinosa","spindel","spera","soward","sopp","sooter","sonnek","soland","sojourner","soeder","sobolewski","snellings","smola","smetana","smeal","smarr","sloma","sligar","skenandore","skalsky","sissom","sirko","simkin","silverthorn","silman","sikkink","signorile","siddens","shumsky","shrider","shoulta","shonk","shomaker","shippey","shimada","shillingburg","shifflet","shiels","shepheard","sheerin","shedden","sheckles","sharrieff","sharpley","shappell","shaneyfelt","shampine","shaefer","shaddock","shadd","sforza","severtson","setzler","sepich","senne","senatore","sementilli","selway","selover","sellick","seigworth","sefton","seegars","sebourn","seaquist","sealock","seabreeze","scriver","scinto","schumer","schulke","schryver","schriner","schramek","schoon","schoolfield","schonberger","schnieder","schnider","schlitz","schlather","schirtzinger","scherman","schenker","scheiner","scheible","schaus","schakel","schaad","saxe","savely","savary","sardinas","santarelli","sanschagrin","sanpedro","sandine","sandigo","sandgren","sanderford","sandahl","salzwedel","salzar","salvino","salvatierra","salminen","salierno","salberg","sahagun","saelee","sabel","rynearson","ryker","rupprecht","runquist","rumrill","ruhnke","rovira","rottenberg","rosoff","rosete","rosebrough","roppolo","roope","romas","roley","rohrback","rohlfs","rogriguez","roel","rodriguiz","rodewald","roback","rizor","ritt","rippee","riolo","rinkenberger","riggsby","rigel","rieman","riedesel","rideau","ricke","rhinebolt","rheault","revak","relford","reinsmith","reichmann","regula","redlinger","rayno","raycroft","raus","raupp","rathmann","rastorfer","rasey","raponi","rantz","ranno","ranes","ramnauth","rahal","raddatz","quattrocchi","quang","pullis","pulanco","pryde","prohaska","primiano","prez","prevatt","prechtl","pottle","potenza","portes","porowski","poppleton","pontillo","politz","politi","poggi","plonka","plaskett","placzek","pizzuti","pizzaro","pisciotta","pippens","pinkins","pinilla","pini","pingitore","piercey","piccola","piccioni","picciano","philps","philp","philo","philmon","philbin","pflieger","pezzullo","petruso","petrea","petitti","peth","peshlakai","peschel","persico","persichetti","persechino","perris","perlow","perico","pergola","penniston","pembroke","pellman","pekarek","peirson","pearcey","pealer","pavlicek","passino","pasquarello","pasion","parzych","parziale","parga","papalia","papadakis","paino","pacini","oyen","ownes","owczarzak","outley","ouelette","ottosen","otting","ostwinkle","osment","oshita","osario","orlow","oriordan","orefice","orantes","oran","orahood","opel","olpin","oliveria","okon","okerlund","okazaki","ohta","offerman","nyce","nutall","northey","norcia","noor","niehoff","niederhauser","nickolson","nguy","neylon","newstrom","nevill","netz","nesselrodt","nemes","neally","nauyen","nascimento","nardella","nanni","myren","murchinson","munter","mundschenk","mujalli","muckleroy","moussa","mouret","moulds","mottram","motte","morre","montreuil","monton","montellano","monninger","monhollen","mongeon","monestime","monegro","mondesir","monceaux","mola","moga","moening","moccia","misko","miske","mishaw","minturn","mingione","milstein","milla","milks","michl","micheletti","michals","mesia","merson","meras","menifee","meluso","mella","melick","mehlman","meffert","medoza","mecum","meaker","meahl","mczeal","mcwatters","mcomber","mcmonigle","mckiddy","mcgranor","mcgeary","mcgaw","mcenery","mcelderry","mcduffey","mccuistion","mccrudden","mccrossin","mccosh","mccolgan","mcclish","mcclenahan","mcclam","mccartt","mccarrell","mcbane","maybury","mayben","maulden","mauceri","matko","mathie","matheis","mathai","masucci","massiah","martorano","martnez","martindelcamp","marschke","marovich","markiewicz","marinaccio","marhefka","marcrum","manton","mannarino","manlove","mangham","manasco","malpica","mallernee","malinsky","malhotra","maish","maisel","mainville","maharrey","magid","maertz","mada","maclaughlin","macina","macdermott","macallister","macadangdang","maack","lynk","lydic","luyando","lutke","lupinacci","lunz","lundsten","lujano","luhn","luecke","luebbe","ludolph","luckman","lucker","luckenbill","luckenbach","lucido","lowney","lowitz","lovaglio","louro","louk","loudy","louderback","lorick","lorenzini","lorensen","lorenc","lomuscio","loguidice","lockner","lockart","lochridge","litaker","lisowe","liptrap","linnane","linhares","lindfors","lindenmuth","lincourt","liew","liebowitz","levengood","leskovec","lesch","leoni","lennard","legner","leaser","leas","leadingham","lazarski","layland","laurito","laulu","laughner","laughman","laughery","laube","latiolais","lasserre","lasser","larrow","larrea","lapsley","lantrip","lanthier","langwell","langelier","landaker","lampi","lamond","lamblin","lambie","lakins","laipple","lagrimas","lafrancois","laffitte","laday","lacko","lacava","labianca","kutsch","kuske","kunert","kubly","kuamoo","krummel","krise","krenek","kreiser","krausz","kraska","krakowski","kradel","kozik","koza","kotowski","koslow","korber","kojima","kochel","knabjian","klunder","klugh","klinkhammer","kliewer","klever","kleber","klages","klaas","kizziar","kitchel","kishimoto","kirschenman","kirschenbaum","kinnick","kinn","kiner","kindla","kindall","kincaide","kilson","killins","kightlinger","kienzle","kiah","khim","ketcherside","kerl","kelsoe","kelker","keizer","keir","kawano","kawa","kaveney","kasparek","kaplowitz","kantrowitz","kant","kanoff","kano","kamalii","kalt","kaleta","kalbach","kalauli","kalata","kalas","kaigler","kachel","juran","jubb","jonker","jonke","jolivette","joles","joas","jividen","jeffus","jeanty","jarvi","jardon","janvier","janosko","janoski","janiszewski","janish","janek","iwanski","iuliano","irle","ingmire","imber","ijames","iiams","ihrig","ichikawa","hynum","hutzel","hutts","huskin","husak","hurndon","huntsinger","hulette","huitron","huguenin","hugg","hugee","huelskamp","huch","howen","hovanec","hoston","hostettler","horsfall","horodyski","holzhauer","hollimon","hollender","hogarth","hoffelmeyer","histand","hissem","hisel","hirayama","hinegardner","hinde","hinchcliffe","hiltbrand","hilsinger","hillstrom","hiley","hickenbottom","hickam","hibley","heying","hewson","hetland","hersch","herlong","herda","henzel","henshall","helson","helfen","heinbach","heikkila","heggs","hefferon","hebard","heathcote","hearl","heaberlin","hauth","hauschild","haughney","hauch","hattori","hasley","hartpence","harroun","harelson","hardgrove","hardel","hansbrough","handshoe","handly","haluska","hally","halling","halfhill","halferty","hakanson","haist","hairgrove","hahner","hagg","hafele","haaland","guttierez","gutknecht","gunnarson","gunlock","gummersheimer","gullatte","guity","guilmette","guhl","guenette","guardino","groshong","grober","gripp","grillot","grilli","greulich","gretzinger","greenwaldt","graven","grassman","granberg","graeser","graeff","graef","grabow","grabau","gotchy","goswick","gosa","gordineer","gorczyca","goodchild","golz","gollihue","goldwire","goldbach","goffredo","glassburn","glaeser","gillilan","gigante","giere","gieger","gidcumb","giarrusso","giannelli","gettle","gesualdi","geschke","gerwig","gervase","geoffrion","gentilcore","genther","gemes","gemberling","gelles","geitz","geeslin","gedney","gebauer","gawron","gavia","gautney","gaustad","gasmen","gargus","ganske","ganger","galvis","gallinger","gallichio","galletta","gaede","gadlin","gaby","gabrielsen","gaboriault","furlan","furgerson","fujioka","fugett","fuehrer","frint","frigon","frevert","frautschi","fraker","fradette","foulkes","forslund","forni","fontenette","fones","folz","folmer","follman","folkman","flourney","flickner","flemmings","fleischacker","flander","flament","fithian","fiorello","fiorelli","fioravanti","fieck","ficke","fiallos","fiacco","feuer","ferrington","fernholz","feria","fergurson","feick","febles","favila","faulkingham","fath","farnam","falter","fakhouri","fairhurst","fahs","estrello","essick","espree","esmond","eskelson","escue","escatel","erebia","epperley","epler","enyart","engelbert","enderson","emch","elisondo","elford","ekman","eick","eichmann","ehrich","ehlen","edwardson","edley","edghill","edel","eastes","easterbrooks","eagleson","eagen","eade","dyle","dutkiewicz","dunnagan","duncil","duling","drumgoole","droney","dreyfus","dragan","dowty","doscher","dornan","doremus","doogan","donaho","donahey","dombkowski","dolton","dolen","dobratz","diveley","dittemore","ditsch","disque","dishmon","disch","dirickson","dippolito","dimuccio","dilger","diefenderfer","dicola","diblasio","dibello","devan","dettmer","deschner","desbiens","derusha","denkins","demonbreun","demchak","delucchi","delprete","deloy","deliz","deline","delap","deiter","deignan","degiacomo","degaetano","defusco","deboard","debiase","deaville","deadwyler","davanzo","daughton","darter","danser","dandrade","dando","dampeer","dalziel","dalen","dain","dague","czekanski","cutwright","cutliff","curle","cuozzo","cunnington","cunnigham","cumings","crowston","crittle","crispell","crisostomo","crear","creach","craigue","crabbs","cozzi","cozza","coxe","cowsert","coviello","couse","coull","cottier","costagliola","corra","corpening","cormany","corless","corkern","conteh","conkey","conditt","conaty","colomb","collura","colledge","colins","colgate","coleson","colemon","coffland","coccia","clougherty","clewell","cleckley","cleaveland","clarno","civils","cillo","cifelli","ciesluk","christison","chowning","chouteau","choung","childres","cherrington","chenette","cheeves","cheairs","chaddock","cernoch","cerino","cazier","castel","casselberry","caserta","carvey","carris","carmant","cariello","cardarelli","caras","caracciolo","capitano","cantoni","cantave","cancio","campillo","callens","caldero","calamia","cahee","cahan","cahalan","cabanilla","cabal","bywater","bynes","byassee","busker","bushby","busack","burtis","burrola","buroker","burnias","burlock","burham","burak","bulla","buffin","buening","budney","buchannan","buchalter","brule","brugler","broxson","broun","brosh","brissey","brisby","brinlee","brinkmeyer","brimley","brickell","breth","breger","brees","brank","braker","bozak","bowlds","bowersock","bousman","boushie","botz","bordwell","bonkowski","bonine","bonifay","bonesteel","boldin","bohringer","bohlander","boecker","bocook","bocock","boblett","bobbett","boas","boarman","bleser","blazejewski","blaustein","blausey","blancarte","blaize","blackson","blacketer","blackard","bisch","birchett","billa","bilder","bierner","bienvenu","bielinski","bialas","biagini","beynon","beyl","bettini","betcher","bessent","beshara","besch","bernd","bergemann","bergeaux","berdan","bens","benedicto","bendall","beltron","beltram","bellville","beisch","behney","beechler","beckum","batzer","batte","bastida","bassette","basley","bartosh","bartolone","barraclough","barnick","barket","barkdoll","baringer","barella","barbian","barbati","bannan","balles","baldo","balasubramani","baig","bahn","bachmeier","babyak","baas","baars","ayuso","avinger","avella","ausbrooks","aull","augello","atkeson","atkerson","atherley","athan","assad","asebedo","arrison","armon","armfield","arkin","archambeau","antonellis","angotti","amorose","amini","amborn","amano","aluarez","allgaier","allegood","alen","aldama","aird","ahsing","ahmann","aguado","agostino","agostinelli","adwell","adsit","adelstein","actis","acierno","achee","abbs","abbitt","zwagerman","zuercher","zinno","zettler","zeff","zavalza","zaugg","zarzycki","zappulla","zanotti","zachman","zacher","yundt","yslas","younes","yontz","yglesias","yeske","yeargin","yauger","yamane","xang","wylam","wrobleski","wratchford","woodlee","wolsey","wolfinbarger","wohlenhaus","wittler","wittenmyer","witkop","wishman","wintz","winkelmann","windus","winborn","wims","wiltrout","willmott","williston","wilemon","wilbourne","wiedyk","widmann","wickland","wickes","wichert","whitsell","whisenand","whidby","wetz","westmeyer","wertheim","wernert","werle","werkheiser","weldin","weissenborn","weingard","weinfeld","weihl","weightman","weichel","wehrheim","wegrzyn","wegmann","waszak","wankum","walthour","waltermire","walstad","waldren","walbert","walawender","wahlund","wahlert","wahlers","wach","vuncannon","vredenburgh","vonk","vollmar","voisinet","vlahos","viscardi","vires","vipperman","violante","vidro","vessey","vesper","veron","vergari","verbeck","venturino","velastegui","vegter","varas","vanwey","vanvranken","vanvalkenbur","vanorsdale","vanoli","vanochten","vanier","vanevery","vane","vanduser","vandersteen","vandell","vandall","vallot","vallon","vallez","vallely","vadenais","uthe","usery","unga","ultsch","ullom","tyminski","twogood","tursi","turay","tungate","truxillo","trulock","trovato","troise","tripi","trinks","trimboli","trickel","trezise","trefry","treen","trebilcock","travieso","trachtenberg","touhey","tougas","tortorella","tormey","torelli","torborg","toran","tomek","tomassi","tollerson","tolden","toda","tobon","tjelmeland","titmus","tilbury","tietje","thurner","thum","thrope","thornbrough","thibaudeau","thackeray","tesoro","territo","ternes","teich","tecson","teater","teagarden","tatsch","tarallo","tapanes","tanberg","tamm","sylvis","swenor","swedlund","sutfin","sura","sundt","sundin","summerson","sumatzkuku","sultemeier","sulivan","suggitt","suermann","sturkie","sturgess","stumph","stuemke","struckhoff","strose","stroder","stricklen","strick","streib","strei","strawther","stratis","strahm","stortz","storrer","storino","stohler","stohl","stockel","stinnette","stile","stieber","steffenhagen","stefanowicz","steever","steagall","statum","stapley","stanish","standiford","standen","stamos","stahlecker","stadtler","spratley","spraker","sposito","spickard","spehar","spees","spearing","spangle","spallone","soulard","sora","sopko","sood","sonnen","solly","solesbee","soldano","sobey","sobczyk","snedegar","sneddon","smolinski","smolik","slota","slavick","skorupski","skolnik","skirvin","skeels","skains","skahan","skaar","siwiec","siverly","siver","sivak","sirk","sinton","sinor","sincell","silberstein","sieminski","sidelinger","shurman","shunnarah","shirer","shidler","sherlin","shepperson","shemanski","sharum","shartrand","shapard","shanafelt","shamp","shader","shackelton","seyer","seroka","sernas","seright","serano","sengupta","selinger","seith","seidler","seehusen","seefried","scovell","scorzelli","sconiers","schwind","schwichtenber","schwerin","schwenke","schwaderer","schussler","schuneman","schumpert","schultheiss","schroll","schroepfer","schroeden","schrimpf","schook","schoof","schomburg","schoenfeldt","schoener","schnoor","schmick","schlereth","schindele","schildt","schildknecht","schemmel","scharfenberg","schanno","schane","schaer","schad","scearce","scardino","sawka","sawinski","savoca","savery","saults","sarpy","saris","sardinha","sarafin","sankar","sanjurjo","sanderfer","sanagustin","samudio","sammartino","samas","salz","salmen","salkeld","salamon","sakurai","sakoda","safley","sada","sachse","ryden","ryback","russow","russey","ruprecht","rumple","ruffini","rudzinski","rudel","rudden","rovero","routledge","roussin","rousse","rouser","rougeau","rosica","romey","romaniello","rolfs","rogoff","rogne","rodriquz","rodrequez","rodin","rocray","rocke","riviere","rivette","riske","risenhoover","rindfleisch","rinaudo","rimbey","riha","righi","ridner","ridling","riden","rhue","reyome","reynoldson","reusch","rensing","rensch","rennels","renderos","reininger","reiners","reigel","rehmer","regier","reff","redlin","recchia","reaume","reagor","rawe","rattigan","raska","rashed","ranta","ranft","randlett","ramiez","ramella","rallis","rajan","raisbeck","raimondo","raible","ragone","rackliffe","quirino","quiring","quero","quaife","pyke","purugganan","pursifull","purkett","purdon","pulos","puccia","provance","propper","preis","prehn","prata","prasek","pranger","pradier","portor","portley","porte","popiel","popescu","pomales","polowy","pollett","politis","polit","poley","pohler","poggio","podolak","poag","plymel","ploeger","planty","piskura","pirrone","pirro","piroso","pinsky","pilant","pickerill","piccolomini","picart","piascik","phann","petruzzelli","petosa","persson","perretta","perkowski","perilli","percifield","perault","peppel","pember","pelotte","pelcher","peixoto","pehl","peatross","pearlstein","peacher","payden","paya","pawelek","pavey","pauda","pathak","parrillo","parness","parlee","paoli","pannebaker","palomar","palo","palmberg","paganelli","paffrath","padovano","padden","pachucki","ovando","othman","osowski","osler","osika","orsburn","orlowsky","oregel","oppelt","opfer","opdyke","onell","olivos","okumura","okoro","ogas","oelschlaeger","oder","ocanas","obrion","obarr","oare","nyhus","nyenhuis","nunnelley","nunamaker","nuckels","noyd","nowlan","novakovich","noteboom","norviel","nortz","norment","norland","nolt","nolie","nixson","nitka","nissley","nishiyama","niland","niewiadomski","niemeier","nieland","nickey","nicholsen","neugent","neto","nerren","neikirk","neigh","nedrow","neave","nazaire","navaro","navalta","nasworthy","nasif","nalepa","nakao","nakai","nadolny","myklebust","mussel","murthy","muratore","murat","mundie","mulverhill","muilenburg","muetzel","mudra","mudgett","mrozinski","moura","mottinger","morson","moretto","morentin","mordan","mooreland","mooers","monts","montone","montondo","montiero","monie","monat","monares","mollo","mollet","molacek","mokry","mohrmann","mohabir","mogavero","moes","moceri","miyoshi","mitzner","misra","mirr","minish","minge","minckler","milroy","mille","mileski","milanesi","miko","mihok","mihalik","mieczkowski","messerli","meskill","mesenbrink","merton","merryweather","merkl","menser","menner","menk","menden","menapace","melbourne","mekus","meinzer","meers","mctigue","mcquitty","mcpheron","mcmurdie","mcleary","mclafferty","mckinzy","mckibbin","mckethan","mcintee","mcgurl","mceachran","mcdowall","mcdermitt","mccuaig","mccreedy","mccoskey","mcclosky","mcclintick","mccleese","mccanless","mazzucco","mazzocco","mazurkiewicz","mazariego","mayhorn","maxcy","mavity","mauzey","maulding","matuszewski","mattsson","mattke","matsushita","matsuno","matsko","matkin","mathur","masterman","massett","massart","massari","mashni","martella","marren","margotta","marder","marczak","maran","maradiaga","manwarren","manter","mantelli","manso","mangone","manfredonia","malden","malboeuf","malanga","makara","maison","maisano","mairs","mailhiot","magri","madron","madole","mackall","macduff","macartney","lynds","lusane","luffman","louth","loughmiller","lougheed","lotspeich","lorenzi","loosli","longe","longanecker","lonero","lohmeyer","loeza","lobstein","lobner","lober","littman","litalien","lippe","lints","lijewski","ligas","liebert","liebermann","liberati","lezcano","levinthal","lessor","lesieur","lenning","lengel","lempke","lemp","lemar","leitzke","leinweber","legrone","lege","leder","lawnicki","lauth","laun","laughary","lassley","lashway","larrivee","largen","lare","lanouette","lanno","langille","langen","lamonte","lalin","laible","lafratta","laforte","lacuesta","lacer","labore","laboe","labeau","kwasniewski","kunselman","kuhr","kuchler","krugman","kruckenberg","krotzer","kroemer","krist","krigbaum","kreke","kreisman","kreisler","kreft","krasnow","kras","krag","kouyate","kough","kotz","kostura","korner","kornblum","korczynski","koppa","kopczyk","konz","komorowski","kollen","kolander","koepnick","koehne","kochis","knoch","knippers","knaebel","klipp","klinedinst","klimczyk","klier","klement","klaphake","kisler","kinzie","kines","kindley","kimple","kimm","kimbel","kilker","kilborn","kibbey","khong","ketchie","kerbow","kennemore","kennebeck","kenneally","kenndy","kenmore","kemnitz","kemler","kemery","kelnhofer","kellstrom","kellis","kellams","keiter","keirstead","keeny","keelin","keefauver","keams","kautzman","kaus","katayama","kasson","kassim","kasparian","kase","karwoski","kapuscinski","kaneko","kamerling","kamada","kalka","kalar","kakacek","kaczmarczyk","jurica","junes","journell","jolliffe","johnsey","jindra","jimenz","jette","jesperson","jerido","jenrette","jencks","jech","jayroe","jayo","javens","jaskot","jaros","jaquet","janowiak","jaegers","jackel","izumi","irelan","inzunza","imoto","imme","iglehart","iannone","iannacone","huyler","hussaini","hurlock","hurlbutt","huprich","humphry","hulslander","huelsman","hudelson","hudecek","hsia","hreha","hoyland","howk","housholder","housden","houff","horkey","honan","homme","holtzberg","hollyfield","hollings","hollenbaugh","hokenson","hogrefe","hogland","hoel","hodgkin","hochhalter","hjelle","hittson","hinderman","hinchliffe","hime","hilyer","hilby","hibshman","heydt","hewell","heward","hetu","hestand","heslep","herridge","herner","hernande","hermandez","hermance","herbold","heon","henthorne","henion","henao","heming","helmkamp","hellberg","heidgerken","heichel","hehl","hegedus","heckathorne","hearron","haymer","haycook","havlicek","hausladen","haseman","hartsook","hartog","harns","harne","harmann","haren","hanserd","hanners","hanekamp","hamra","hamley","hamelin","hamblet","hakimi","hagle","hagin","haehn","haeck","hackleman","haacke","gulan","guirand","guiles","guggemos","guerrieri","guerreiro","guereca","gudiel","guccione","gubler","gruenwald","gritz","grieser","grewe","grenon","gregersen","grefe","grech","grecco","gravette","grassia","granholm","graner","grandi","grahan","gradowski","gradney","graczyk","gouthier","gottschall","goracke","gootee","goodknight","goodine","gonzalea","gonterman","gonalez","gomm","goleman","goldtooth","goldstone","goldey","golan","goen","goeller","goel","goecke","godek","goan","glunz","gloyd","glodowski","glinski","glawe","girod","girdley","gindi","gillings","gildner","giger","giesbrecht","gierke","gier","giboney","giaquinto","giannakopoulo","giaimo","giaccio","giacalone","gessel","gerould","gerlt","gerhold","geralds","genson","genereux","gellatly","geigel","gehrig","gehle","geerdes","geagan","gawel","gavina","gauss","gatwood","gathman","gaster","garske","garratt","garms","garis","gansburg","gammell","gambale","gamba","galimore","gadway","gadoury","furrer","furino","fullard","fukui","fryou","friesner","friedli","friedl","friedberg","freyermuth","fremin","fredell","fraze","franken","foth","fote","fortini","fornea","formanek","forker","forgette","folan","foister","foglesong","flinck","flewellen","flaten","flaig","fitgerald","fischels","firman","finstad","finkelman","finister","fina","fetterhoff","ferriter","ferch","fennessy","feltus","feltes","feinman","farve","farry","farrall","farag","falzarano","falck","falanga","fakhoury","fairbrother","fagley","faggins","facteau","ewer","ewbank","evola","evener","eustis","estwick","estel","essa","espinola","escutia","eschmann","erpelding","ernsberger","erling","entz","engelhart","enbody","emick","elsinger","ellinwood","ellingsen","ellicott","elkind","eisinger","eisenbeisz","eischen","eimer","eigner","eichhorst","ehmke","egleston","eggett","efurd","edgeworth","eckels","ebey","eberling","eagleton","dwiggins","dweck","dunnings","dunnavant","dumler","duman","dugue","duerksen","dudeck","dreisbach","drawdy","drawbaugh","draine","draggoo","dowse","dovel","doughton","douds","doubrava","dort","dorshorst","dornier","doolen","donavan","dominik","domingez","dolder","dold","dobies","diskin","disano","dirden","diponio","dipirro","dimock","diltz","dillabough","diley","dikes","digges","digerolamo","diel","dicharry","dicecco","dibartolomeo","diamant","dewire","devone","dessecker","dertinger","derousselle","derk","depauw","depalo","denherder","demeyer","demetro","demastus","delvillar","deloye","delosrios","delgreco","delarge","delangel","dejongh","deitsch","degiorgio","degidio","defreese","defoe","decambra","debenedetto","deaderick","daza","dauzat","daughenbaugh","dato","dass","darwish","dantuono","danton","dammeyer","daloia","daleo","dagg","dacey","curts","cuny","cunneen","culverhouse","cucinella","cubit","crumm","crudo","crowford","crout","crotteau","crossfield","crooke","crom","critz","cristaldi","crickmore","cribbin","cremeens","crayne","cradduck","couvertier","cottam","cossio","correy","cordrey","coplon","copass","coone","coody","contois","consla","connelley","connard","congleton","condry","coltey","colindres","colgrove","colfer","colasurdo","cochell","cobbin","clouthier","closs","cloonan","clizbe","clennon","clayburn","claybourn","clausell","clasby","clagett","ciskowski","cirrincione","cinque","cinelli","cimaglia","ciaburri","christiani","christeson","chladek","chizmar","chinnici","chiarella","chevrier","cheves","chernow","cheong","chelton","chanin","cham","chaligoj","celestino","cayce","cavey","cavaretta","caughron","catmull","catapano","cashaw","carullo","carualho","carthon","cartelli","carruba","carrere","carolus","carlstrom","carfora","carello","carbary","caplette","cannell","cancilla","campell","cammarota","camilo","camejo","camarata","caisse","cacioppo","cabbagestalk","cabatu","cabanas","byles","buxbaum","butland","burrington","burnsed","burningham","burlingham","burgy","buitrago","bueti","buehring","buday","bucknell","buchbinder","bucey","bruster","brunston","brouillet","brosious","broomes","brodin","broddy","brochard","britsch","britcher","brierley","brezina","bressi","bressette","breslow","brenden","breier","brei","braymer","brasuell","branscomb","branin","brandley","brahler","bracht","bracamontes","brabson","boyne","boxell","bowery","bovard","boutelle","boulette","bottini","botkins","bosen","boscia","boscarino","borich","boreman","bordoy","bordley","bordenet","boquet","boocks","bolner","boissy","boilard","bohnen","bohall","boening","boccia","boccella","bobe","blyth","biviano","bitto","bisel","binstock","bines","billiter","bigsby","bighorse","bielawski","bickmore","bettin","bettenhausen","besson","beseau","berton","berroa","berntson","bernas","berisford","berhow","bergsma","benyo","benyard","bente","bennion","benko","belsky","bellavance","belasco","belardo","beidler","behring","begnaud","bega","befort","beek","bedore","beddard","becknell","beardslee","beardall","beagan","bayly","bauza","bautz","bausman","baumler","batterson","battenfield","bassford","basse","basemore","baruch","bartholf","barman","baray","barabas","banghart","banez","balsam","ballester","ballagh","baldock","bagnoli","bagheri","bacus","bacho","baccam","axson","averhart","aver","austill","auberry","athans","atcitty","atay","astarita","ascolese","artzer","arrasmith","argenbright","aresco","aranjo","appleyard","appenzeller","apilado","antonetti","antis","annas","angwin","andris","andries","andreozzi","ando","andis","anderegg","amyot","aminov","amelung","amelio","amason","alviar","allendorf","aldredge","alcivar","alaya","alapai","airington","aina","ailor","ahrns","ahmadi","agresta","affolter","aeschlimann","adney","aderhold","adachi","ackiss","aben","abdelhamid","abar","aase","zorilla","zordan","zollman","zoch","zipfel","zimmerle","zike","ziel","zens","zelada","zaman","zahner","zadora","zachar","zaborowski","zabinski","yzquierdo","yoshizawa","yori","yielding","yerton","yehl","yeargain","yeakley","yamaoka","yagle","yablonski","wynia","wyne","wyers","wrzesinski","wrye","wriston","woolums","woolen","woodlock","woodle","wonser","wombacher","wollschlager","wollen","wolfley","wolfer","wisse","wisell","wirsing","winstanley","winsley","winiecki","winiarski","winge","winesett","windell","winberry","willyard","willemsen","wilkosz","wilensky","wikle","wiford","wienke","wieneke","wiederhold","wiebold","widick","wickenhauser","whitrock","whisner","whinery","wherley","whedbee","wheadon","whary","wessling","wessells","wenninger","wendroth","wende","wellard","weirick","weinkauf","wehrman","weech","weathersbee","warncke","wardrip","walstrom","walkowski","walcutt","waight","wagman","waggett","wadford","vowles","vormwald","vondran","vohs","vitt","vitalo","viser","vinas","villena","villaneuva","villafranca","villaflor","vilain","vicory","viana","vian","verucchi","verra","venzke","venske","veley","veile","veeder","vaske","vasconez","vargason","varble","vanwert","vantol","vanscooter","vanmetre","vanmaanen","vanhise","vaneaton","vandyk","vandriel","vandorp","vandewater","vandervelden","vanderstelt","vanderhoef","vanderbeck","vanbibber","vanalstine","vanacore","valdespino","vaill","vailes","vagliardo","ursini","urrea","urive","uriegas","umphress","ucci","uballe","tynon","twiner","tutton","tudela","tuazon","troisi","tripplett","trias","trescott","treichel","tredo","tranter","tozer","toxey","tortorici","tornow","topolski","topia","topel","topalian","tonne","tondre","tola","toepke","tisdell","tiscareno","thornborrow","thomison","thilges","theuret","therien","thagard","thacher","texter","terzo","tenpenny","tempesta","teetz","teaff","tavella","taussig","tatton","tasler","tarrence","tardie","tarazon","tantillo","tanney","tankson","tangen","tamburo","tabone","szilagyi","syphers","swistak","swiatkowski","sweigert","swayzer","swapp","svehla","sutphen","sutch","susa","surma","surls","sundermeyer","sundeen","sulek","sughrue","sudol","sturms","stupar","stum","stuckman","strole","strohman","streed","strebeck","strausser","strassel","stpaul","storts","storr","stommes","stmary","stjulien","stika","stiggers","sthill","stevick","sterman","stepanek","stemler","stelman","stelmack","steinkamp","steinbock","stcroix","stcharles","staudinger","stanly","stallsworth","stalley","srock","spritzer","spracklin","spinuzzi","spidell","speyrer","sperbeck","spendlove","speckman","spargur","spangenberg","spaid","sowle","soulier","sotolongo","sostre","sorey","sonier","somogyi","somera","soldo","soderholm","snoots","snooks","snoke","snodderly","snee","smithhart","smillie","smay","smallman","sliwinski","slentz","sledd","slager","skogen","skog","skarda","skalicky","siwek","sitterson","sisti","sissel","sinopoli","similton","simila","simenson","silvertooth","silos","siggins","sieler","siburt","sianez","shurley","shular","shuecraft","shreeves","shollenberger","shoen","shishido","shipps","shipes","shinall","sherfield","shawe","sharrett","sharrard","shankman","sessum","serviss","servello","serice","serda","semler","semenza","selmon","sellen","seley","seidner","seib","sehgal","seelbach","sedivy","sebren","sebo","seanez","seagroves","seagren","seabron","schwertner","schwegel","schwarzer","schrunk","schriefer","schreder","schrank","schopp","schonfeld","schoenwetter","schnall","schnackenberg","schnack","schmutzler","schmierer","schmidgall","schlup","schloemer","schlitt","schermann","scherff","schellenberg","schain","schaedler","schabel","scaccia","saye","saurez","sasseen","sasnett","sarti","sarra","sarber","santoy","santeramo","sansoucy","sando","sandles","sandau","samra","samaha","salizar","salam","saindon","sagaser","saeteun","sadusky","sackman","sabater","saas","ruthven","ruszkowski","rusche","rumpf","ruhter","ruhenkamp","rufo","rudge","ruddle","rowlee","rowand","routhier","rougeot","rotramel","rotan","rosten","rosillo","rookard","roode","rongstad","rollie","roider","roffe","roettger","rodick","rochez","rochat","rivkin","rivadeneira","riston","risso","rinderknecht","riis","riggsbee","rieker","riegle","riedy","richwine","richmon","ricciuti","riccardo","ricardson","rhew","revier","remsberg","remiszewski","rembold","rella","reinken","reiland","reidel","reichart","rehak","redway","rednour","redifer","redgate","redenbaugh","redburn","readus","raybuck","rauhuff","rauda","ratte","rathje","rappley","rands","ramseyer","ramseur","ramsdale","ramo","ramariz","raitz","raisch","rainone","rahr","ragasa","rafalski","radunz","quenzer","queja","queenan","pyun","putzier","puskas","purrington","puri","punt","pullar","pruse","pring","primeau","prevette","preuett","prestage","pownell","pownall","potthoff","potratz","poth","poter","posthuma","posen","porritt","popkin","poormon","polidoro","polcyn","pokora","poer","pluviose","plock","pleva","placke","pioli","pingleton","pinchback","pieretti","piccone","piatkowski","philley","phibbs","phay","phagan","pfund","peyer","pettersen","petter","petrucelli","petropoulos","petras","petix","pester","pepperman","pennick","penado","pelot","pelis","peeden","pechon","peal","pazmino","patchin","pasierb","parran","parilla","pardy","parcells","paragas","paradee","papin","panko","pangrazio","pangelinan","pandya","pancheri","panas","palmiter","pallares","palinkas","palek","pagliaro","packham","pacitti","ozier","overbaugh","oursler","ouimette","otteson","otsuka","othon","osmundson","oroz","orgill","ordeneaux","orama","oppy","opheim","onkst","oltmanns","olstad","olofson","ollivier","olejniczak","okura","okuna","ohrt","oharra","oguendo","ogier","offermann","oetzel","oechsle","odoherty","oddi","ockerman","occhiogrosso","obryon","obremski","nyreen","nylund","nylen","nyholm","nuon","nuanes","norrick","noris","nordell","norbury","nooner","nomura","nole","nolden","nofsinger","nocito","niedbala","niebergall","nicolini","nevils","neuburger","nemerofsky","nemecek","nazareno","nastri","nast","nagorski","myre","muzzey","mutschler","muther","musumeci","muranaka","muramoto","murad","murach","muns","munno","muncrief","mugrage","muecke","mozer","moyet","mowles","mottern","mosman","mosconi","morine","morge","moravec","morad","mones","moncur","monarez","molzahn","moglia","moesch","mody","modisett","mitnick","mithcell","mitchiner","mistry","misercola","mirabile","minvielle","mino","minkler","minifield","minichiello","mindell","minasian","milteer","millwee","millstein","millien","mikrut","mihaly","miggins","michard","mezo","metzner","mesquita","merriwether","merk","merfeld","mercik","mercadante","menna","mendizabal","mender","melusky","melquist","mellado","meler","melendes","mekeel","meiggs","megginson","meck","mcwherter","mcwayne","mcsparren","mcrea","mcneff","mcnease","mcmurrin","mckeag","mchughes","mcguiness","mcgilton","mcelreath","mcelhone","mcelhenney","mceldowney","mccurtain","mccure","mccosker","mccory","mccormic","mccline","mccleave","mcclatchey","mccarney","mccanse","mcallen","mazzie","mazin","mazanec","mayette","mautz","maun","mattas","mathurin","mathiesen","massmann","masri","masias","mascolo","mascetti","mascagni","marzolf","maruska","martain","marszalek","marolf","marmas","marlor","markwood","marinero","marier","marich","marcom","marciante","marchman","marchio","marbach","manzone","mantey","mannina","manhardt","manaois","malmgren","mallonee","mallin","mallary","malette","makinson","makins","makarewicz","mainwaring","maiava","magro","magouyrk","magett","maeder","madyun","maduena","maden","madeira","mackins","mackel","macinnes","macia","macgowan","lyssy","lyerly","lyalls","lutter","lunney","luksa","ludeman","lucidi","lucci","lowden","lovier","loughridge","losch","lorson","lorenzano","lorden","lorber","lopardo","loosier","loomer","longsdorf","longchamps","loncar","loker","logwood","loeffelholz","lockmiller","livoti","linford","linenberger","lindloff","lindenbaum","limoges","liley","lighthill","lightbourne","lieske","leza","levandoski","leuck","lepere","leonhart","lenon","lemma","lemler","leising","leinonen","lehtinen","lehan","leetch","leeming","ledyard","ledwith","ledingham","leclere","leck","lebert","leandry","lazzell","layo","laye","laxen","lawther","lawerance","lavoy","lavertu","laverde","latouche","latner","lathen","laskin","lashbaugh","lascala","larroque","larick","laraia","laplume","lanzilotta","lannom","landrigan","landolt","landess","lamkins","lalla","lalk","lakeman","lakatos","laib","lahay","lagrave","lagerquist","lafoy","lafleche","lader","labrada","kwiecinski","kutner","kunshier","kulakowski","kujak","kuehnle","kubisiak","krzyminski","krugh","krois","kritikos","krill","kriener","krewson","kretzschmar","kretz","kresse","kreiter","kreischer","krebel","krans","kraling","krahenbuhl","kouns","kotson","kossow","kopriva","konkle","kolter","kolk","kolich","kohner","koeppen","koenigs","kock","kochanski","kobus","knowling","knouff","knoerzer","knippel","kloberdanz","kleinert","klarich","klaassen","kisamore","kirn","kiraly","kipps","kinson","kinneman","kington","kine","kimbriel","kille","kibodeaux","khamvongsa","keylon","kever","keser","kertz","kercheval","kendrix","kendle","kempt","kemple","keesey","keatley","kazmierski","kazda","kazarian","kawashima","katsch","kasun","kassner","kassem","kasperski","kasinger","kaschak","karels","kantola","kana","kamai","kalthoff","kalla","kalani","kahrs","kahanek","kacher","jurasek","jungels","jukes","juelfs","judice","juda","josselyn","jonsson","jonak","joens","jobson","jegede","jeanjacques","jaworowski","jaspers","jannsen","janner","jankowiak","jank","janiak","jackowski","jacklin","jabbour","iyer","iveson","isner","iniquez","ingwerson","ingber","imbrogno","ille","ikehara","iannelli","hyson","huxford","huseth","hurns","hurney","hurles","hunnings","humbarger","hulan","huisinga","hughett","hughen","hudler","hubiak","hricko","hoversten","hottel","hosaka","horsch","hormann","hordge","honzell","homburg","holten","holme","hollopeter","hollinsworth","hollibaugh","holberg","hohmann","hoenstine","hodell","hodde","hiter","hirko","hinzmann","hinrichsen","hinger","hincks","hilz","hilborn","highley","higashi","hieatt","hicken","heverly","hesch","hervert","hershkowitz","herreras","hermanns","herget","henriguez","hennon","hengel","helmlinger","helmig","heldman","heizer","heinitz","heifner","heidorn","heglin","heffler","hebner","heathman","heaslip","hazlip","haymes","hayase","hawver","havermale","havas","hauber","hashim","hasenauer","harvel","hartney","hartel","harsha","harpine","harkrider","harkin","harer","harclerode","hanzely","hanni","hannagan","hampel","hammerschmidt","hamar","hallums","hallin","hainline","haid","haggart","hafen","haer","hadiaris","hadad","hackford","habeeb","guymon","guttery","gunnett","guillette","guiliano","guilbeaux","guiher","guignard","guerry","gude","gucman","guadian","grzybowski","grzelak","grussendorf","grumet","gruenhagen","grudzinski","grossmann","grof","grisso","grisanti","griffitts","griesbaum","grella","gregston","graveline","grandusky","grandinetti","gramm","goynes","gowing","goudie","gosman","gort","gorsline","goralski","goodstein","goodroe","goodlin","goodheart","goodhart","gonzelez","gonthier","goldsworthy","goldade","goettel","goerlitz","goepfert","goehner","goben","gobeille","gliem","gleich","glasson","glascoe","gladwell","giusto","girdner","gipple","giller","giesing","giammona","ghormley","germon","geringer","gergely","gerberich","gepner","gens","genier","gemme","gelsinger","geigle","gebbia","gayner","gavitt","gatrell","gastineau","gasiewski","gascoigne","garro","garin","ganong","ganga","galpin","gallus","galizia","gajda","gahm","gagen","gaffigan","furno","furnia","furgason","fronczak","frishman","friess","frierdich","freestone","franta","frankovich","fors","forres","forrer","florido","flis","flicek","flens","flegal","finkler","finkenbinder","finefrock","filpo","filion","fierman","fieldman","ferreyra","fernendez","fergeson","fera","fencil","feith","feight","federici","federer","fechtner","feagan","fausnaugh","faubert","fata","farman","farinella","fantauzzi","fanara","falso","falardeau","fagnani","fabro","excell","ewton","evey","everetts","evarts","etherington","estremera","estis","estabrooks","essig","esplin","espenschied","ernzen","eppes","eppard","entwisle","emison","elison","elguezabal","eledge","elbaz","eisler","eiden","eichorst","eichert","egle","eggler","eggimann","edey","eckerman","echelberger","ebbs","ebanks","dziak","dyche","dyce","dusch","duross","durley","durate","dunsworth","dumke","dulek","duhl","duggin","dufford","dudziak","ducrepin","dubree","dubre","dubie","dubas","droste","drisko","drewniak","doxtator","dowtin","downum","doubet","dottle","dosier","doshi","dorst","dorset","dornbusch","donze","donica","domanski","domagala","dohse","doerner","doerfler","doble","dobkins","dilts","digiulio","digaetano","dietzel","diddle","dickel","dezarn","devoy","devoss","devilla","devere","deters","desvergnes","deshay","desena","deross","depedro","densley","demorest","demore","demora","demirjian","demerchant","dematteis","demateo","delgardo","delfavero","delaurentis","delamar","delacy","deitrich","deisher","degracia","degraaf","defries","defilippis","decoursey","debruin","debiasi","debar","dearden","dealy","dayhoff","davino","darvin","darrisaw","darbyshire","daquino","daprile","danh","danahy","dalsanto","dallavalle","dagel","dadamo","dacy","dacunha","dabadie","czyz","cutsinger","curney","cuppernell","cunliffe","cumby","cullop","cullinane","cugini","cudmore","cuda","cucuzza","cuch","crumby","crouser","critton","critchley","cremona","cremar","crehan","creary","crasco","crall","crabbe","cozzolino","cozier","coyner","couvillier","counterman","coulthard","coudriet","cottom","corzo","cornutt","corkran","corda","copelin","coonan","consolo","conrow","conran","connerton","conkwright","condren","comly","comisky","colli","collet","colello","colbeck","colarusso","coiner","cohron","codere","cobia","clure","clowser","clingenpeel","clenney","clendaniel","clemenson","cleere","cleckler","claybaugh","clason","cirullo","ciraulo","ciolek","ciampi","christopherse","chovanec","chopra","chol","chiem","chestnutt","chesterman","chernoff","chermak","chelette","checketts","charpia","charo","chargois","champman","challender","chafins","cerruto","celi","cazenave","cavaluzzi","cauthon","caudy","catino","catano","cassaro","cassarino","carrano","carozza","carow","carmickle","carlyon","carlew","cardena","caputi","capley","capalbo","canseco","candella","campton","camposano","calleros","calleja","callegari","calica","calarco","calais","caillier","cahue","cadenhead","cadenas","cabera","buzzo","busto","bussmann","busenbark","burzynski","bursley","bursell","burle","burkleo","burkette","burczyk","bullett","buikema","buenaventura","buege","buechel","budreau","budhram","bucknam","brye","brushwood","brumbalow","brulotte","bruington","bruderer","brougher","bromfield","broege","brodhead","brocklesby","broadie","brizuela","britz","brisendine","brilla","briggeman","brierton","bridgeford","breyfogle","brevig","breuninger","bresse","bresette","brelsford","breitbach","brayley","braund","branscom","brandner","brahm","braboy","brabble","bozman","boyte","boynes","boyken","bowell","bowan","boutet","bouse","boulet","boule","bottcher","bosquez","borrell","boria","bordes","borchard","bonson","bonino","bonas","bonamico","bolstad","bolser","bollis","bolich","bolf","boker","boileau","bohac","bogucki","bogren","boeger","bodziony","bodo","bodley","boback","blyther","blenker","blazina","blase","blamer","blacknall","blackmond","bitz","biser","biscardi","binz","bilton","billotte","billafuerte","bigford","biegler","bibber","bhandari","beyersdorf","bevelle","bettendorf","bessard","bertsche","berne","berlinger","berish","beranek","bentson","bentsen","benskin","benoy","benoist","benitz","belongia","belmore","belka","beitzel","beiter","beitel","behrns","becka","beaudion","beary","beare","beames","beabout","beaber","bazzano","bazinet","baucum","batrez","baswell","bastos","bascomb","bartha","barstad","barrilleaux","barretto","barresi","barona","barkhurst","barke","bardales","barczak","barca","barash","banfill","balonek","balmes","balko","balestrieri","baldino","baldelli","baken","baiza","bahner","baek","badour","badley","badia","backmon","bacich","bacca","ayscue","aynes","ausiello","auringer","auiles","aspinwall","askwith","artiga","arroliga","arns","arman","arellanes","aracena","antwine","antuna","anselmi","annen","angelino","angeli","angarola","andrae","amodio","ameen","alwine","alverio","altro","altobello","altemus","alquicira","allphin","allemand","allam","alessio","akpan","akerman","aiona","agyeman","agredano","adamik","adamczak","acrey","acevado","abreo","abrahamsen","abild","zwicker","zweig","zuvich","zumpano","zuluaga","zubek","zornes","zoglmann","ziminski","zimbelman","zhanel","zenor","zechman","zauner","zamarron","zaffino","yusuf","ytuarte","yett","yerkovich","yelder","yasuda","yapp","yaden","yackley","yaccarino","wytch","wyre","wussow","worthing","wormwood","wormack","wordell","woodroof","woodington","woodhams","wooddell","wollner","wojtkowski","wojcicki","wogan","wlodarczyk","wixted","withington","withem","wisler","wirick","winterhalter","winski","winne","winemiller","wimett","wiltfong","willibrand","willes","wilkos","wilbon","wiktor","wiggers","wigg","wiegmann","wickliff","wiberg","whittler","whittenton","whitling","whitledge","whitherspoon","whiters","whitecotton","whitebird","wheary","wetherill","westmark","westaby","wertenberger","wentland","wenstrom","wenker","wellen","weier","wegleitner","wedekind","wawers","wassel","warehime","wandersee","waltmon","waltersheid","walbridge","wakely","wakeham","wajda","waithe","waidelich","wahler","wahington","wagster","wadel","vuyovich","vuolo","vulich","vukovich","volmer","vollrath","vollbrecht","vogelgesang","voeller","vlach","vivar","vitullo","vitanza","visker","visalli","viray","vinning","viniard","villapando","villaman","vier","viar","viall","verstraete","vermilya","verdon","venn","velten","velis","vanoven","vanorder","vanlue","vanheel","vanderwoude","vanderheide","vandenheuvel","vandenbos","vandeberg","vandal","vanblarcom","vanaken","vanacker","vallian","valine","valent","vaine","vaile","vadner","uttech","urioste","urbanik","unrath","unnasch","underkofler","uehara","tyrer","tyburski","twaddle","turntine","tunis","tullock","tropp","troilo","tritsch","triola","trigo","tribou","tribley","trethewey","tress","trela","treharne","trefethen","trayler","trax","traut","tranel","trager","traczyk","towsley","torrecillas","tornatore","tork","torivio","toriello","tooles","tomme","tolosa","tolen","toca","titterington","tipsword","tinklenberg","tigney","tigert","thygerson","thurn","thur","thorstad","thornberg","thoresen","thomaston","tholen","thicke","theiler","thebeau","theaux","thaker","tewani","teufel","tetley","terrebonne","terrano","terpening","tela","teig","teichert","tegethoff","teele","tatar","tashjian","tarte","tanton","tanimoto","tamimi","tamas","talman","taal","szydlowski","szostak","swoyer","swerdlow","sweeden","sweda","swanke","swander","suyama","suriano","suri","surdam","suprenant","sundet","summerton","sult","suleiman","suffridge","suby","stych","studeny","strupp","struckman","strief","strictland","stremcha","strehl","stramel","stoy","stoutamire","storozuk","stordahl","stopher","stolley","stolfi","stoeger","stockhausen","stjulian","stivanson","stinton","stinchfield","stigler","stieglitz","stgermaine","steuer","steuber","steuart","stepter","stepnowski","stepanian","steimer","stefanelli","stebner","stears","steans","stayner","staubin","statz","stasik","starn","starmer","stargel","stanzione","stankovich","stamour","staib","stadelman","stadel","stachura","squadrito","springstead","spragg","spigelmyer","spieler","spaur","sovocool","soundara","soulia","souffrant","sorce","sonkin","sodhi","soble","sniffen","smouse","smittle","smithee","smedick","slowinski","slovacek","slominski","skowronek","skokan","skanes","sivertson","sinyard","sinka","sinard","simonin","simonian","simmions","silcott","silberg","siefken","siddon","shuttlesworth","shubin","shubeck","shiro","shiraki","shipper","shina","shilt","shikles","shideler","shenton","shelvey","shellito","shelhorse","shawcroft","shatto","shanholtzer","shamonsky","shadden","seymer","seyfarth","setlock","serratos","serr","sepulueda","senay","semmel","semans","selvig","selkirk","selk","seligson","seldin","seiple","seiersen","seidling","seidensticker","secker","searson","scordo","scollard","scoggan","scobee","sciandra","scialdone","schwimmer","schwieger","schweer","schwanz","schutzenhofer","schuetze","schrodt","schriever","schriber","schremp","schrecongost","schraeder","schonberg","scholtz","scholle","schoettle","schoenemann","schoene","schnitker","schmuhl","schmith","schlotterbeck","schleppenbach","schlee","schickel","schibi","schein","scheide","scheibe","scheib","schaumberg","schardein","schaalma","scantlin","scantlebury","sayle","sausedo","saurer","sassone","sarracino","saric","sanz","santarpia","santano","santaniello","sangha","sandvik","sandoral","sandobal","sandercock","sanantonio","salviejo","salsberry","salois","salazer","sagon","saglibene","sagel","sagal","saetern","saefong","sadiq","sabori","saballos","rygiel","rushlow","runco","rulli","ruller","ruffcorn","ruess","ruebush","rudlong","rudin","rudgers","rudesill","ruderman","rucki","rucinski","rubner","rubinson","rubiano","roznowski","rozanski","rowson","rower","rounsaville","roudabush","rotundo","rothell","rotchford","rosiles","roshak","rosetti","rosenkranz","rorer","rollyson","rokosz","rojek","roitman","rohrs","rogel","roewe","rodriges","rodocker","rodgerson","rodan","rodak","rocque","rochholz","robicheau","robbinson","roady","ritchotte","ripplinger","rippetoe","ringstaff","ringenberg","rinard","rigler","rightmire","riesen","riek","ridges","richner","richberg","riback","rial","rhyner","rhees","resse","renno","rendleman","reisz","reisenauer","reinschmidt","reinholt","reinard","reifsnyder","rehfeld","reha","regester","reffitt","redler","rediske","reckner","reckart","rebolloso","rebollar","reasonover","reasner","reaser","reano","reagh","raval","ratterman","ratigan","rater","rasp","raneses","randolf","ramil","ramdas","ramberg","rajaniemi","raggio","ragel","ragain","rade","radaker","racioppi","rabinovich","quickle","quertermous","queal","quartucci","quander","quain","pynes","putzel","purl","pulizzi","pugliares","prusak","prueter","protano","propps","primack","prieur","presta","preister","prawl","pratley","pozzo","powless","povey","pottorf","pote","postley","porzio","portney","ponzi","pontoriero","ponto","pont","poncedeleon","polimeni","polhamus","polan","poetker","poellnitz","podgurski","plotts","pliego","plaugher","plantenberg","plair","plagmann","pizzitola","pittinger","pitcavage","pischke","piontek","pintar","pinnow","pinneo","pinley","pingel","pinello","pimenta","pillard","piker","pietras","piere","phillps","pfleger","pfahl","pezzuti","petruccelli","petrello","peteet","pescatore","peruzzi","perusse","perotta","perona","perini","perelman","perciful","peppin","pennix","pennino","penalosa","pemble","pelz","peltzer","pelphrey","pelote","pellum","pellecchia","pelikan","peitz","pebworth","peary","pawlicki","pavelich","paster","pasquarella","paskey","paseur","paschel","parslow","parrow","parlow","parlett","parler","pargo","parco","paprocki","panepinto","panebianco","pandy","pandey","pamphile","pamintuan","pamer","paluso","paleo","paker","pagett","paczkowski","ozburn","ovington","overmeyer","ouellet","osterlund","oslin","oseguera","osaki","orrock","ormsbee","orlikowski","organista","oregan","orebaugh","orabuena","openshaw","ontiveroz","ondo","omohundro","ollom","ollivierre","olivencia","oley","olazabal","okino","offenberger","oestmann","ocker","obar","oakeson","nuzum","nurre","nowinski","novosel","norquist","nordlie","noorani","nonnemacher","nolder","njoku","niznik","niwa","niss","ninneman","nimtz","niemczyk","nieder","nicolo","nichlos","niblack","newtown","newill","newcom","neverson","neuhart","neuenschwande","nestler","nenno","nejman","neiffer","neidlinger","neglia","nazarian","navor","nary","narayan","nangle","nakama","naish","naik","nadolski","muscato","murphrey","murdick","murchie","muratalla","munnis","mundwiller","muncey","munce","mullenbach","mulhearn","mulcahey","muhammed","muchow","mountford","moudry","mosko","morvay","morrical","morr","moros","mormann","morgen","moredock","morden","mordarski","moravek","morandi","mooradian","montejo","montegut","montan","monsanto","monford","moncus","molinas","molek","mohd","moehrle","moehring","modzeleski","modafferi","moala","moake","miyahira","mitani","mischel","minges","minella","mimes","milles","milbrett","milanes","mikolajczyk","mikami","meucci","metler","methven","metge","messmore","messerschmidt","mesrobian","meservey","merseal","menor","menon","menear","melott","melley","melfi","meinhart","megivern","megeath","meester","meeler","meegan","medoff","medler","meckley","meath","mearns","mcquigg","mcpadden","mclure","mckellips","mckeithen","mcglathery","mcginnes","mcghan","mcdonel","mccullom","mccraken","mccrackin","mcconathy","mccloe","mcclaughry","mcclaflin","mccarren","mccaig","mcaulay","mcaffee","mazzuca","maytubby","mayner","maymi","mattiello","matthis","matthees","matthai","mathiason","mastrogiovann","masteller","mashack","marucci","martorana","martiniz","marter","martellaro","marsteller","marris","marrara","maroni","marolda","marocco","maritn","maresh","maready","marchione","marbut","maranan","maragno","mapps","manrriquez","mannis","manni","mangina","manganelli","mancera","mamon","maloch","mallozzi","maller","majchrzak","majano","mainella","mahanna","maertens","madon","macumber","macioce","machuga","machlin","machala","mabra","lybbert","luvert","lutts","luttrull","lupez","lukehart","ludewig","luchsinger","lovecchio","louissaint","loughney","lostroh","lorton","lopeman","loparo","londo","lombera","lokietek","loiko","lohrenz","lohan","lofties","locklar","lockaby","lobianco","llano","livesey","litster","liske","linsky","linne","lindbeck","licudine","leyua","levie","leonelli","lenzo","lenze","lents","leitao","leidecker","leibold","lehne","legan","lefave","leehy","ledue","lecount","lecea","leadley","lazzara","lazcano","lazalde","lavi","lavancha","lavan","latu","latty","lato","larranaga","lapidus","lapenta","langridge","langeveld","langel","landowski","landgren","landfried","lamattina","lallier","lairmore","lahaie","lagazo","lagan","lafoe","lafluer","laflame","lafevers","lada","lacoss","lachney","labreck","labreche","labay","kwasnik","kuzyk","kutzner","kushnir","kusek","kurtzman","kurian","kulhanek","kuklinski","kueny","kuczynski","kubitz","kruschke","krous","krompel","kritz","krimple","kriese","krenzer","kreis","kratzke","krane","krage","kraebel","kozub","kozma","kouri","koudelka","kotcher","kotas","kostic","kosh","kosar","kopko","kopka","kooy","konigsberg","konarski","kolmer","kohlmeyer","kobbe","knoop","knoedler","knocke","knipple","knippenberg","knickrehm","kneisel","kluss","klossner","klipfel","klawiter","klasen","kittles","kissack","kirtland","kirschenmann","kirckof","kiphart","kinstler","kinion","kilton","killman","kiehl","kief","kett","kesling","keske","kerstein","kepple","keneipp","kempson","kempel","kehm","kehler","keeran","keedy","kebert","keast","kearbey","kawaguchi","kaupu","kauble","katzenbach","katcher","kartes","karpowicz","karpf","karban","kanzler","kanarek","kamper","kaman","kalsow","kalafut","kaeser","kaercher","kaeo","kaeding","jurewicz","julson","jozwick","jollie","johnigan","johll","jochum","jewkes","jestes","jeska","jereb","jaurez","jarecki","jansma","janosik","jandris","jamin","jahr","jacot","ivens","itson","isenhower","iovino","ionescu","ingrum","ingels","imrie","imlay","ihlenfeld","ihde","igou","ibach","huyett","huppe","hultberg","hullihen","hugi","hueso","huesman","hsiao","hronek","hovde","housewright","houlahan","hougham","houchen","hostler","hoster","hosang","hornik","hornes","horio","honyumptewa","honeyman","honer","hommerding","holsworth","hollobaugh","hollinshead","hollands","hollan","holecek","holdorf","hokes","hogston","hoesly","hodkinson","hodgman","hodgens","hochstedler","hochhauser","hobbie","hoare","hnat","hiskey","hirschy","hinostroza","hink","hing","hillmer","hillian","hillerman","hietala","hierro","hickling","hickingbottom","heye","heubusch","hesselschward","herriot","hernon","hermida","hermans","hentschel","henningson","henneke","henk","heninger","heltsley","helmle","helminiak","helmes","hellner","hellmuth","helke","heitmeyer","heird","heinle","heinicke","heinandez","heimsoth","heibel","hegyi","heggan","hefel","heeralall","hedrington","heacox","hazlegrove","hazelett","haymore","havenhill","hautala","hascall","harvie","hartrick","hartling","harrer","harles","hargenrader","hanshew","hanly","hankla","hanisch","hancox","hammann","hambelton","halseth","hallisey","halleck","hallas","haisley","hairr","hainey","hainer","hailstock","haertel","guzek","guyett","guster","gussler","gurwitz","gurka","gunsolus","guinane","guiden","gugliotti","guevin","guevarra","guerard","gudaitis","guadeloupe","gschwind","grupe","grumbach","gruenes","gruenberg","grom","grodski","groden","grizzel","gritten","griswald","grishaber","grinage","grimwood","grims","griffon","griffies","gribben","gressley","gren","greenstreet","grealish","gravett","grantz","granfield","granade","gowell","gossom","gorsky","goring","goodnow","goodfriend","goodemote","golob","gollnick","golladay","goldwyn","goldsboro","golds","goldrick","gohring","gohn","goettsch","goertzen","goelz","godinho","goans","glumac","gleisner","gleen","glassner","glanzer","gladue","gjelaj","givhan","girty","girone","girgenti","giorgianni","gilpatric","gillihan","gillet","gilbar","gierut","gierhart","gibert","gianotti","giannetto","giambanco","gharing","geurts","gettis","gettel","gest","germani","gerdis","gerbitz","geppert","gennings","gemmer","gelvin","gellert","gehler","geddings","gearon","geach","gazaille","gayheart","gauld","gaukel","gaudio","gathing","gasque","garstka","garsee","garringer","garofano","garo","garnsey","garigen","garcias","garbe","ganoung","ganfield","ganaway","gamero","galuska","galster","gallacher","galinski","galimi","galik","galeazzi","galdo","galdames","galas","galanis","gaglio","gaeddert","gadapee","fussner","furukawa","fuhs","fuerte","fuerstenberg","fryrear","froese","fringer","frieson","friesenhahn","frieler","friede","freymuth","freyman","freudenberg","freman","fredricksen","frech","frasch","frantum","frankin","franca","frago","fragnoli","fouquet","fossen","foskett","forner","formosa","formisano","fooks","fons","folino","flott","flesch","flener","flemmons","flanagin","flamino","flamand","fitzerald","findling","filsinger","fillyaw","fillinger","fiechter","ferre","ferdon","feldkamp","fazzio","favia","faulconer","faughnan","faubel","fassler","faso","farrey","farrare","farnworth","farland","fairrow","faille","faherty","fagnant","fabula","fabbri","eylicio","esteve","estala","espericueta","escajeda","equia","enrriquez","enomoto","enmon","engemann","emmerson","emmel","emler","elstad","ellwein","ellerson","eliott","eliassen","elchert","eisenbeis","eisel","eikenberry","eichholz","ehmer","edgerson","echenique","eberley","eans","dziuk","dykhouse","dworak","dutt","dupas","duntz","dunshee","dunovant","dunnaway","dummermuth","duerson","ducotey","duchon","duchesneau","ducci","dubord","duberry","dubach","drummonds","droege","drish","drexel","dresch","dresbach","drenner","drechsler","dowen","dotter","dosreis","doser","dorward","dorin","dorf","domeier","doler","doleman","dolbow","dolbin","dobrunz","dobransky","dobberstein","dlouhy","diosdado","dingmann","dimmer","dimarino","dimaria","dillenburg","dilaura","dieken","dickhaus","dibbles","dibben","diamante","dewilde","dewaard","devich","devenney","devaux","dettinger","desroberts","dershem","dersch","derita","derickson","depina","deorio","deoliveira","denzler","dentremont","denoble","demshar","demond","demint","demichele","demel","delzer","delval","delorbe","delli","delbridge","delanoy","delancy","delahoya","dekle","deitrick","deis","dehnert","degrate","defrance","deetz","deeg","decoster","decena","dearment","daughety","datt","darrough","danzer","danielovich","dandurand","dancause","dalo","dalgleish","daisley","dadlani","daddona","daddio","dacpano","cyprian","cutillo","curz","curvin","cuna","cumber","cullom","cudworth","cubas","crysler","cryderman","crummey","crumbly","crookshanks","croes","criscione","crespi","cresci","creaser","craton","cowin","cowdrey","coutcher","cotterman","cosselman","cosgriff","cortner","corsini","corporan","corniel","cornick","cordts","copening","connick","conlisk","conelli","comito","colten","colletta","coldivar","colclasure","colantuono","colaizzi","coggeshall","cockman","cockfield","cobourn","cobo","cobarrubias","clyatt","cloney","clonch","climes","cleckner","clearo","claybourne","clavin","claridge","claffey","ciufo","cisnero","cipollone","cieslik","ciejka","cichocki","cicchetti","cianflone","chrusciel","christesen","chmielowiec","chirino","chillis","chhoun","chevas","chehab","chaviano","chavaria","chasten","charbonnet","chanley","champoux","champa","chalifoux","cerio","cedotal","cech","cavett","cavendish","catoire","castronovo","castellucci","castellow","castaner","casso","cassels","cassatt","cassar","cashon","cartright","carros","carrisalez","carrig","carrejo","carnicelli","carnett","carlise","carhart","cardova","cardell","carchi","caram","caquias","capper","capizzi","capano","cannedy","campese","calvello","callon","callins","callies","callicutt","calix","calin","califf","calderaro","caldeira","cadriel","cadmus","cadman","caccamise","buttermore","butay","bustamente","busa","burmester","burkard","burhans","burgert","bure","burdin","bullman","bulin","buelna","buehner","budin","buco","buckhanon","bryars","brutger","brus","brumitt","brum","bruer","brucato","broyhill","broy","brownrigg","brossart","brookings","broden","brocklehurst","brockert","bristo","briskey","bringle","bries","bressman","branyan","brands","bramson","brammell","brallier","bozich","boysel","bowthorpe","bowron","bowin","boutilier","boulos","boullion","boughter","bottiglieri","borruso","borreggine","borns","borkoski","borghese","borenstein","boran","booton","bonvillain","bonini","bonello","bolls","boitnott","boike","bohnet","bohnenkamp","bohmer","boeson","boeneke","bodey","bocchino","bobrowski","bobic","bluestein","bloomingdale","blogg","blewitt","blenman","bleck","blaszak","blankenbeckle","blando","blanchfield","blancato","blalack","blakenship","blackett","bisping","birkner","birckhead","bingle","bineau","billiel","bigness","bies","bierer","bhalla","beyerlein","betesh","besler","berzins","bertalan","berntsen","bergo","berganza","bennis","benney","benkert","benjamen","benincasa","bengochia","bendle","bendana","benchoff","benbrook","belsito","belshaw","belinsky","belak","beigert","beidleman","behen","befus","beel","bedonie","beckstrand","beckerle","beato","bauguess","baughan","bauerle","battis","batis","bastone","bassetti","bashor","bary","bartunek","bartoletti","barro","barno","barnicle","barlage","barkus","barkdull","barcellos","barbarino","baranski","baranick","bankert","banchero","bambrick","bamberg","bambenek","balthrop","balmaceda","ballman","balistrieri","balcomb","balboni","balbi","bagner","bagent","badasci","bacot","bache","babione","babic","babers","babbs","avitabile","avers","avena","avance","ausley","auker","audas","aubut","athearn","atcheson","astorino","asplund","aslanian","askari","ashmead","asby","asai","arterbury","artalejo","arqueta","arquero","arostegui","arnell","armeli","arista","arender","arca","arballo","aprea","applen","applegarth","apfel","antonello","antolin","antkowiak","angis","angione","angerman","angelilli","andujo","andrick","anderberg","amigon","amalfitano","alviso","alvez","altice","altes","almarez","allton","allston","allgeyer","allegretti","aliaga","algood","alberg","albarez","albaladejo","akre","aitkin","ahles","ahlberg","agnello","adinolfi","adamis","abramek","abolt","abitong","zurawski","zufall","zubke","zizzo","zipperer","zinner","zinda","ziller","zill","zevallos","zesati","zenzen","zentner","zellmann","zelinsky","zboral","zarcone","zapalac","zaldana","zakes","zaker","zahniser","zacherl","zabawa","zabaneh","youree","younis","yorty","yonce","yero","yerkey","yeck","yeargan","yauch","yashinski","yambo","wrinn","wrightsman","worton","wortley","worland","woolworth","woolfrey","woodhead","woltjer","wolfenden","wolden","wolchesky","wojick","woessner","witters","witchard","wissler","wisnieski","wisinski","winnike","winkowski","winkels","wingenter","wineman","winegardner","wilridge","wilmont","willians","williamsen","wilhide","wilhelmsen","wilhelmi","wildrick","wilden","wiland","wiker","wigglesworth","wiebusch","widdowson","wiant","wiacek","whittet","whitelock","whiteis","whiley","westrope","westpfahl","westin","wessman","wessinger","wesemann","wesby","wertheimer","weppler","wenke","wengler","wender","welp","weitzner","weissberg","weisenborn","weipert","weiman","weidmann","wehrsig","wehrenberg","weemes","weeman","wayner","waston","wasicek","wascom","wasco","warmath","warbritton","waltner","wallenstein","waldoch","waldal","wala","waide","wadlinger","wadhams","vullo","voorheis","vonbargen","volner","vollstedt","vollman","vold","voge","vittorio","violett","viney","vinciguerra","vinal","villata","villarrvel","vilanova","vigneault","vielma","veyna","vessella","versteegh","verderber","venier","venditti","velotta","vejarano","vecchia","vecchi","vastine","vasguez","varella","vanry","vannah","vanhyning","vanhuss","vanhoff","vanhoesen","vandivort","vandevender","vanderlip","vanderkooi","vandebrink","vancott","vallien","vallas","vallandingham","valiquette","valasek","vahey","vagott","uyematsu","urbani","uran","umbach","tyon","tyma","twyford","twombley","twohig","tutterrow","turnes","turkington","turchi","tunks","tumey","tumbaga","tuinstra","tsukamoto","tschetter","trussel","trubey","trovillion","troth","trostel","tron","trinka","trine","triarsi","treto","trautz","tragesser","tooman","toolson","tonozzi","tomkiewicz","tomasso","tolin","tolfree","toelle","tisor","tiry","tinstman","timmermann","tickner","tiburcio","thunberg","thronton","thompsom","theil","thayne","thaggard","teschner","tensley","tenery","tellman","tellado","telep","teigen","teator","teall","tayag","tavis","tattersall","tassoni","tarshis","tappin","tappe","tansley","talone","talford","tainter","taha","taguchi","tacheny","tabak","szymczyk","szwaja","szopinski","syvertsen","swogger","switcher","swist","swierczek","swiech","swickard","swiatek","swezey","swepson","sweezy","swaringen","swanagan","swailes","swade","sveum","svenningsen","svec","suttie","supry","sunga","summerhill","summars","sulit","stys","stutesman","stupak","stumpo","stuller","stuekerjuerge","stuckett","stuckel","stuchlik","stuard","strutton","strop","stromski","stroebel","strehlow","strause","strano","straney","stoyle","stormo","stopyra","stoots","stonis","stoltenburg","stoiber","stoessel","stitzer","stien","stichter","stezzi","stewert","stepler","steinkraus","stegemann","steeples","steenburg","steeley","staszak","stasko","starkson","stanwick","stanke","stanifer","stangel","stai","squiers","spraglin","spragins","spraberry","spoelstra","spisak","spirko","spille","spidel","speyer","speroni","spenst","spartz","sparlin","sparacio","spaman","spainhower","souers","souchet","sosbee","sorn","sorice","sorbo","soqui","solon","soehl","sodergren","sobie","smucker","smsith","smoley","smolensky","smolenski","smolder","smethers","slusar","slowey","slonski","slemmons","slatkin","slates","slaney","slagter","slacum","skutnik","skrzypek","skibbe","sjostrom","sjoquist","sivret","sitko","sisca","sinnett","sineath","simoni","simar","simao","silvestro","silleman","silha","silfies","silberhorn","silacci","sigrist","sieczkowski","sieczka","shure","shulz","shugrue","shrode","shovlin","shortell","shonka","shiyou","shiraishi","shiplett","sheu","shermer","sherick","sheeks","shantz","shakir","shaheed","shadoan","shadid","shackford","shabot","seung","seufert","setty","setters","servis","serres","serrell","serpas","sensenig","senft","semenec","semas","semaan","selvera","sellmeyer","segar","seever","seeney","seeliger","seehafer","seebach","sebben","seaward","seary","searl","searby","scordino","scolieri","scolaro","schwiebert","schwartze","schwaner","schuur","schupbach","schumacker","schum","schudel","schubbe","schroader","schramel","schollmeyer","schoenherr","schoeffler","schoeder","schnurr","schnorr","schneeman","schnake","schnaible","schmaus","schlotter","schinke","schimming","schimek","schikora","scheulen","scherping","schermer","scherb","schember","schellhase","schedler","schanck","schaffhauser","schaffert","schadler","scarola","scarfo","scarff","scantling","scaff","sayward","sayas","saxbury","savel","savastano","sault","satre","sarkar","santellan","sandmeier","sampica","salvesen","saltis","salloum","salling","salce","salatino","salata","salamy","sadowsky","sadlier","sabbatini","sabatelli","sabal","sabados","rydzewski","rybka","rybczyk","rusconi","rupright","rufino","ruffalo","rudiger","rudig","ruda","rubyor","royea","roxberry","rouzer","roumeliotis","rossmann","rosko","rosene","rosenbluth","roseland","rosasco","rosano","rosal","rorabaugh","romie","romaro","rolstad","rollow","rohrich","roghair","rogala","roets","roen","roemmich","roelfs","roeker","roedl","roedel","rodeheaver","roddenberry","rockstad","rocchi","robirds","robben","robasciotti","robaina","rizzotto","rizzio","ritcher","rissman","riseden","ripa","rion","rintharamy","rinehimer","rinck","riling","rietschlin","riesenberg","riemenschneid","rieland","rickenbaugh","rickenbach","rhody","revells","reutter","respress","resnik","remmel","reitmeyer","reitan","reister","reinstein","reino","reinkemeyer","reifschneider","reierson","reichle","rehmeier","rehl","reeds","rede","recar","rebeiro","raybourn","rawl","rautio","raugust","raudenbush","raudales","rattan","rapuano","rapoport","rantanen","ransbottom","raner","ramkissoon","rambousek","raio","rainford","radakovich","rabenhorst","quivers","quispe","quinoes","quilici","quattrone","quates","quance","quale","purswell","purpora","pulera","pulcher","puckhaber","pryer","pruyne","pruit","prudencio","prows","protzman","prothero","prosperi","prospal","privott","pritchet","priem","prest","prell","preer","pree","preddy","preda","pravata","pradhan","potocki","postier","postema","posadas","poremba","popichak","ponti","pomrenke","pomarico","pollok","polkinghorn","polino","pock","plater","plagman","pipher","pinzone","pinkleton","pillette","pillers","pilapil","pignone","pignatelli","piersol","piepho","picton","pickrel","pichard","picchi","piatek","pharo","phanthanouvon","pettingill","pettinato","petrovits","pethtel","petersheim","pershing","perrez","perra","pergram","peretz","perego","perches","pennello","pennella","pendry","penaz","pellish","pecanty","peare","paysour","pavlovich","pavick","pavelko","paustian","patzer","patete","patadia","paszkiewicz","pase","pasculli","pascascio","parrotte","parajon","paparo","papandrea","paone","pantaleon","panning","paniccia","panarello","palmeter","pallan","palardy","pahmeier","padget","padel","oxborrow","oveson","outwater","ottaway","otake","ostermeyer","osmer","osinski","osiecki","oroak","orndoff","orms","orkin","ordiway","opatz","onsurez","onishi","oliger","okubo","okoye","ohlmann","offord","offner","offerdahl","oesterle","oesch","odonnel","odeh","odebralski","obie","obermeier","oberhausen","obenshain","obenchain","nute","nulty","norrington","norlin","nore","nordling","nordhoff","norder","nordan","norals","nogales","noboa","nitsche","niermann","nienhaus","niedringhaus","niedbalski","nicolella","nicolais","nickleberry","nicewander","newfield","neurohr","neumeier","netterville","nersesian","nern","nerio","nerby","nerbonne","neitz","neidecker","neason","nead","navratil","naves","nastase","nasir","nasca","narine","narimatsu","nard","narayanan","nappo","namm","nalbone","nakonechny","nabarro","myott","muthler","muscatello","murriel","murin","muoio","mundel","munafo","mukherjee","muffoletto","muessig","muckey","mucher","mruk","moyd","mowell","mowatt","moutray","motzer","moster","morgenroth","morga","morataya","montross","montezuma","monterroza","montemarano","montello","montbriand","montavon","montaque","monigold","monforte","molgard","moleski","mohsin","mohead","mofield","moerbe","moeder","mochizuki","miyazaki","miyasaki","mital","miskin","mischler","minniear","minero","milosevic","mildenhall","mielsch","midden","michonski","michniak","michitsch","michelotti","micheli","michelfelder","michand","metelus","merkt","merando","meranda","mentz","meneley","menaker","melino","mehaffy","meehl","meech","meczywor","mcweeney","mcumber","mcredmond","mcneer","mcnay","mcmikle","mcmaken","mclaurine","mclauglin","mclaney","mckune","mckinnies","mckague","mchattie","mcgrapth","mcglothen","mcgath","mcfolley","mcdannell","mccurty","mccort","mcclymonds","mcclimon","mcclamy","mccaughan","mccartan","mccan","mccadden","mcburnie","mcburnett","mcbryar","mcannally","mcalevy","mcaleese","maytorena","mayrant","mayland","mayeaux","mauter","matthewson","mathiew","matern","matera","maslow","mashore","masaki","maruco","martorell","martenez","marrujo","marrison","maroun","markway","markos","markoff","markman","marello","marbry","marban","maphis","manuele","mansel","manganello","mandrell","mandoza","manard","manago","maltba","mallick","mallak","maline","malikowski","majure","majcher","maise","mahl","maffit","maffeo","madueno","madlem","madariaga","macvane","mackler","macconnell","macchi","maccarone","lyng","lynchard","lunning","luneau","lunden","lumbra","lumbert","lueth","ludington","luckado","lucchini","lucatero","luallen","lozeau","lowen","lovera","lovelock","louck","lothian","lorio","lorimer","lorge","loretto","longhenry","lonas","loiseau","lohrman","logel","lockie","llerena","livington","liuzzi","liscomb","lippeatt","liou","linhardt","lindelof","lindbo","limehouse","limage","lillo","lilburn","liggons","lidster","liddick","lich","liberato","leysath","lewelling","lesney","leser","lescano","leonette","lentsch","lenius","lemmo","lemming","lemcke","leggette","legerski","legard","leever","leete","ledin","lecomte","lecocq","leakes","leab","lazarz","layous","lawrey","lawery","lauze","lautz","laughinghouse","latulippe","lattus","lattanzio","lascano","larmer","laris","larcher","laprise","lapin","lapage","lano","langseth","langman","langland","landstrom","landsberg","landsaw","landram","lamphier","lamendola","lamberty","lakhani","lajara","lagrow","lagman","ladewig","laderman","ladden","lacrue","laclaire","lachut","lachner","kwit","kvamme","kvam","kutscher","kushi","kurgan","kunsch","kundert","kulju","kukene","kudo","kubin","kubes","kuberski","krystofiak","kruppa","krul","krukowski","kruegel","kronemeyer","krock","kriston","kretzer","krenn","kralik","krafft","krabill","kozisek","koverman","kovatch","kovarik","kotlowski","kosmala","kosky","kosir","kosa","korpi","kornbluth","koppen","kooistra","kohlhepp","kofahl","koeneman","koebel","koczur","kobrin","kobashigawa","koba","knuteson","knoff","knoble","knipper","knierim","kneisley","klusman","kloc","klitzing","klinko","klinefelter","klemetson","kleinpeter","klauser","klatte","klaren","klare","kissam","kirkhart","kirchmeier","kinzinger","kindt","kincy","kincey","kimoto","killingworth","kilcullen","kilbury","kietzman","kienle","kiedrowski","kidane","khamo","khalili","ketterling","ketchem","kessenich","kessell","kepp","kenon","kenning","kennady","kendzior","kemppainen","kellermann","keirns","keilen","keiffer","kehew","keelan","keawe","keator","kealy","keady","kathman","kastler","kastanes","kassab","karpin","karau","karathanasis","kaps","kaplun","kapaun","kannenberg","kanipe","kander","kandel","kanas","kanan","kamke","kaltenbach","kallenberger","kallam","kafton","kafer","kabler","kaaihue","jundt","jovanovich","jojola","johnstad","jodon","joachin","jinright","jessick","jeronimo","jenne","jelsma","jeannotte","jeangilles","jaworsky","jaubert","jarry","jarrette","jarreau","jarett","janos","janecka","janczak","jalomo","jagoda","jagla","jacquier","jaber","iwata","ivanoff","isola","iserman","isais","isaacks","inverso","infinger","ibsen","hyser","hylan","hybarger","hwee","hutchenson","hutchcroft","husar","hurlebaus","hunsley","humberson","hulst","hulon","huhtala","hugill","hugghins","huffmaster","huckeba","hrabovsky","howden","hoverson","houts","houskeeper","housh","hosten","horras","horchler","hopke","hooke","honie","holtsoi","holsomback","holoway","holmstead","hoistion","hohnstein","hoheisel","hoguet","hoggle","hogenson","hoffstetter","hoffler","hofe","hoefling","hoague","hizer","hirschfield","hironaka","hiraldo","hinote","hingston","hinaman","hillie","hillesheim","hilderman","hiestand","heyser","heys","hews","hertler","herrandez","heppe","henle","henkensiefken","henigan","henandez","henagan","hemberger","heman","helser","helmich","hellinger","helfrick","heldenbrand","heinonen","heineck","heikes","heidkamp","heglar","heffren","heelan","hedgebeth","heckmann","heckaman","hechmer","hazelhurst","hawken","haverkamp","havatone","hausauer","hasch","harwick","hartse","harrower","harle","hargroder","hardway","hardinger","hardemon","harbeck","hant","hamre","hamberg","hallback","haisten","hailstone","hahl","hagner","hagman","hagemeyer","haeussler","hackwell","haby","haataja","gverrero","gustovich","gustave","guske","gushee","gurski","gurnett","gura","gunto","gunselman","gugler","gudmundson","gudinas","guarneri","grumbine","gruis","grotz","grosskopf","grosman","grosbier","grinter","grilley","grieger","grewal","gressler","greaser","graus","grasman","graser","grannan","granath","gramer","graboski","goyne","gowler","gottwald","gottesman","goshay","gorr","gorovitz","gores","goossens","goodier","goodhue","gonzeles","gonzalos","gonnella","golomb","golick","golembiewski","goeke","godzik","goar","glosser","glendenning","glendening","glatter","glas","gittings","gitter","gisin","giscombe","gimlin","gillitzer","gillick","gilliand","gilb","gigler","gidden","gibeau","gibble","gianunzio","giannattasio","gertelman","gerosa","gerold","gerland","gerig","gerecke","gerbino","genz","genovesi","genet","gelrud","geitgey","geiszler","gehrlein","gawrys","gavilanes","gaulden","garthwaite","garmoe","gargis","gara","gannett","galligher","galler","galleher","gallahan","galford","gahn","gacek","gabert","fuster","furuya","furse","fujihara","fuhriman","frueh","fromme","froemming","friskney","frietas","freiler","freelove","freber","frear","frankl","frankenfield","franey","francke","foxworthy","formella","foringer","forgue","fonnesbeck","fonceca","folland","fodera","fode","floresca","fleurent","fleshner","flentge","fleischhacker","fleeger","flecher","flam","flaim","fivecoat","firebaugh","fioretti","finucane","filley","figuroa","figuerda","fiddelke","feurtado","fetterly","fessel","femia","feild","fehling","fegett","fedde","fechter","fawver","faulhaber","fatchett","fassnacht","fashaw","fasel","farrugia","farran","farness","farhart","fama","falwell","falvo","falkenstein","falin","failor","faigin","fagundo","fague","fagnan","fagerstrom","faden","eytchison","eyles","everage","evangelist","estrin","estorga","esponda","espindola","escher","esche","escarsega","escandon","erven","erding","eplin","enix","englade","engdahl","enck","emmette","embery","emberson","eltzroth","elsayed","ellerby","ellens","elhard","elfers","elazegui","eisermann","eilertson","eiben","ehrhard","ehresman","egolf","egnew","eggins","efron","effland","edminster","edgeston","eckstrom","eckhard","eckford","echoles","ebsen","eatherly","eastlick","earnheart","dykhuizen","dyas","duttweiler","dutka","dusenbury","dusenbery","durre","durnil","durnell","durie","durhan","durando","dupriest","dunsmoor","dunseith","dunnum","dunman","dunlevy","duma","dulude","dulong","duignan","dugar","dufek","ducos","duchaine","duch","dubow","drowne","dross","drollinger","droke","driggars","drawhorn","drach","drabek","doyne","doukas","dorvil","dorow","doroski","dornak","dormer","donnelson","donivan","dondero","dompe","dolle","doakes","diza","divirgilio","ditore","distel","disimone","disbro","dipiero","dingson","diluzio","dillehay","digiorgio","diflorio","dietzler","dietsch","dieterle","dierolf","dierker","dicostanzo","dicesare","dexheimer","dewitte","dewing","devoti","devincentis","devary","deutschman","dettloff","detienne","destasio","dest","despard","desmet","deslatte","desfosses","derise","derenzo","deppner","depolo","denoyer","denoon","denno","denne","deniston","denike","denes","demoya","demick","demicco","demetriou","demange","delva","delorge","delley","delisio","delhoyo","delgrande","delgatto","delcour","delair","deinert","degruy","degrave","degeyter","defino","deffenbaugh","deener","decook","decant","deboe","deblanc","deatley","dearmitt","deale","deaguiar","dayan","daus","dauberman","datz","dase","dary","dartt","darocha","dari","danowski","dancel","dami","dallmann","dalere","dalba","dakan","daise","dailing","dahan","dagnan","daggs","dagan","czarkowski","czaplinski","cutten","curtice","curenton","curboy","cura","culliton","culberth","cucchiara","cubbison","csaszar","crytser","crotzer","crossgrove","crosser","croshaw","crocco","critzer","creveling","cressy","creps","creese","cratic","craigo","craigen","craib","cracchiolo","crable","coykendall","cowick","coville","couzens","coutch","cousens","cousain","counselman","coult","cotterell","cott","cotham","corsaut","corriere","corredor","cornet","corkum","coreas","cordoza","corbet","corathers","conwill","contreas","consuegra","constanza","conolly","conedy","comins","combee","colosi","colom","colmenares","collymore","colleran","colina","colaw","colatruglio","colantro","colantonio","cohea","cogill","codner","codding","cockram","cocanougher","cobine","cluckey","clucas","cloward","cloke","clisham","clinebell","cliffe","clendenen","cisowski","cirelli","ciraolo","ciocca","cintora","ciesco","cibrian","chupka","chugg","christmann","choma","chiverton","chirinos","chinen","chimenti","chima","cheuvront","chesla","chesher","chesebro","chern","chehebar","cheatum","chastine","chapnick","chapelle","chambley","cercy","celius","celano","cayea","cavicchi","cattell","catanach","catacutan","castelluccio","castellani","cassmeyer","cassetta","cassada","caspi","cashmore","casebier","casanas","carrothers","carrizal","carriveau","carretero","carradine","carosella","carnine","carloni","carkhuff","cardosi","cardo","carchidi","caravello","caranza","carandang","cantrall","canpos","canoy","cannizzaro","canion","canida","canham","cangemi","cange","cancelliere","canard","camarda","calverley","calogero","callendar","calame","cadrette","cachero","caccavale","cabreros","cabrero","cabrara","cabler","butzer","butte","butrick","butala","bustios","busser","busic","bushorn","busher","burmaster","burkland","burkins","burkert","burgueno","burgraff","burel","burck","burby","bumford","bulock","bujnowski","buggie","budine","bucciero","bubier","brzoska","brydges","brumlow","brosseau","brooksher","brokke","broeker","brittin","bristle","briano","briand","brettschneide","bresnan","brentson","brenneis","brender","brazle","brassil","brasington","branstrom","branon","branker","brandwein","brandau","bralley","brailey","brague","brade","bozzi","bownds","bowmer","bournes","bour","bouchey","botto","boteler","borroel","borra","boroski","boothroyd","boord","bonga","bonato","bonadonna","bolejack","boldman","boiser","boggio","bogacki","boerboom","boehnlein","boehle","bodah","bobst","boak","bluemel","blockmon","blitch","blincoe","bleier","blaydes","blasius","bittel","binsfeld","bindel","bilotti","billiott","bilbrew","bihm","biersner","bielat","bidrowski","bickler","biasi","bhola","bhat","bewick","betzen","bettridge","betti","betsch","besley","beshero","besa","bertoli","berstein","berrien","berrie","berrell","bermel","berenguer","benzer","bensing","benedix","bemo","belile","beilman","behunin","behrmann","bedient","becht","beaule","beaudreault","bealle","beagley","bayuk","bayot","bayliff","baugess","battistoni","batrum","basinski","basgall","bartolomei","bartnik","bartl","bartko","bartholomay","barthlow","bartgis","barsness","barski","barlette","barickman","bargen","bardon","barcliff","barbu","barakat","baracani","baraban","banos","banko","bambach","balok","balogun","bally","baldini","balck","balcer","balash","baim","bailor","bahm","bahar","bagshaw","baggerly","badie","badal","backues","babino","aydelott","awbrey","aversano","avansino","auyon","aukamp","aujla","augenstein","astacio","asplin","asato","asano","aruizu","artale","arrick","arneecher","armelin","armbrester","armacost","arkell","argrave","areizaga","apolo","anzures","anzualda","antwi","antillon","antenor","annand","anhalt","angove","anglemyer","anglada","angiano","angeloni","andaya","ancrum","anagnos","ammirati","amescua","ambrosius","amacker","amacher","amabile","alvizo","alvernaz","alvara","altobelli","altobell","althauser","alterman","altavilla","alsip","almeyda","almeter","alman","allscheid","allaman","aliotta","aliberti","alghamdi","albiston","alberding","alarie","alano","ailes","ahsan","ahrenstorff","ahler","aerni","ackland","achor","acero","acebo","abshier","abruzzo","abrom","abood","abnet","abend","abegg","abbruzzese","aaberg","zysk","zutell","zumstein","zummo","zuhlke","zuehlsdorff","zuch","zucconi","zortman","zohn","zingone","zingg","zingale","zima","zientek","zieg","zervas","zerger","zenk","zeldin","zeiss","zeiders","zediker","zavodny","zarazua","zappone","zappala","zapanta","zaniboni","zanchi","zampedri","zaller","zakrajsek","zagar","zadrozny","zablocki","zable","yust","yunk","youngkin","yosten","yockers","yochim","yerke","yerena","yanos","wysinger","wyner","wrisley","woznicki","wortz","worsell","wooters","woon","woolcock","woodke","wonnacott","wolnik","wittstock","witting","witry","witfield","witcraft","wissmann","wissink","wisehart","wiscount","wironen","wipf","winterrowd","wingett","windon","windish","windisch","windes","wiltbank","willmarth","wiler","wieseler","wiedmaier","wiederstein","wiedenheft","wieberg","wickware","wickkiser","wickell","whittmore","whitker","whitegoat","whitcraft","whisonant","whisby","whetsell","whedon","westry","westcoat","wernimont","wentling","wendlandt","wencl","weisgarber","weininger","weikle","weigold","weigl","weichbrodt","wehrli","wehe","weege","weare","watland","wassmann","warzecha","warrix","warrell","warnack","waples","wantland","wanger","wandrei","wanat","wampole","waltjen","walterscheid","waligora","walding","waldie","walczyk","wakins","waitman","wair","wainio","wahpekeche","wahlman","wagley","wagenknecht","wadle","waddoups","wadding","vuono","vuillemot","vugteveen","vosmus","vorkink","vories","vondra","voelz","vlashi","vitelli","vitali","viscarra","vinet","vimont","villega","villard","vignola","viereck","videtto","vicoy","vessell","vescovi","verros","vernier","vernaglia","vergin","verdone","verdier","verastequi","vejar","vasile","vasi","varnadore","vardaro","vanzanten","vansumeren","vanschuyver","vanleeuwen","vanhowe","vanhoozer","vaness","vandewalker","vandevoorde","vandeveer","vanderzwaag","vanderweide","vanderhyde","vandellen","vanamburg","vanalst","vallin","valk","valentini","valcarcel","valasco","valadao","vacher","urquijo","unterreiner","unsicker","unser","unrau","undercoffler","uffelman","uemura","ueda","tyszko","tyska","tymon","tyce","tyacke","twinam","tutas","tussing","turmel","turkowski","turkel","turchetta","tupick","tukes","tufte","tufo","tuey","tuell","tuckerman","tsutsumi","tsuchiya","trossbach","trivitt","trippi","trippensee","trimbach","trillo","triller","trible","tribby","trevisan","tresch","tramonte","traff","trad","tousey","totaro","torregrosa","torralba","tolly","tofil","tofani","tobiassen","tiogangco","tino","tinnes","tingstrom","tingen","tindol","tifft","tiffee","tiet","thuesen","thruston","throndson","thornsbury","thornes","thiery","thielman","thie","theilen","thede","thate","thane","thalacker","thaden","teuscher","terracina","terell","terada","tepfer","tenneson","temores","temkin","telleria","teaque","tealer","teachey","tavakoli","tauras","taucher","tartaglino","tarpy","tannery","tani","tams","tamlin","tambe","tallis","talamante","takayama","takaki","taibl","taffe","tadesse","tade","tabeling","tabag","szoke","szoc","szala","szady","sysak","sylver","syler","swonger","swiggett","swensson","sweis","sweers","sweene","sweany","sweaney","swartwout","swamy","swales","susman","surman","sundblad","summerset","summerhays","sumerall","sule","sugimoto","subramanian","sturch","stupp","stunkard","stumpp","struiksma","stropes","stromyer","stromquist","strede","strazza","strauf","storniolo","storjohann","stonum","stonier","stonecypher","stoneberger","stollar","stokke","stokan","stoetzel","stoeckel","stockner","stockinger","stockert","stockdill","stobbe","stitzel","stitely","stirgus","stigers","stettner","stettler","sterlin","sterbenz","stemp","stelluti","steinmeyer","steininger","steinauer","steigerwalt","steider","stavrou","staufenberger","stassi","stankus","stanaway","stammer","stakem","staino","stahlnecker","stagnitta","staelens","staal","srsen","sprott","sprigg","sprenkle","sprenkel","spreitzer","spraque","sprandel","sporn","spivak","spira","spiewak","spieth","spiering","sperow","speh","specking","spease","spead","sparger","spanier","spall","sower","southcott","sosna","soran","sookram","sonders","solak","sohr","sohl","sofranko","soderling","sochor","sobon","smutz","smudrick","smithj","smid","slosser","sliker","slenker","sleger","slaby","skousen","skilling","skibinski","skees","skane","skafidas","sivic","sivertsen","sivers","sitra","sito","siracusa","sinicki","simpers","simley","simbeck","silberberg","siever","siegwarth","sidman","siddle","sibbett","shumard","shubrooks","shough","shorb","shoptaw","sholty","shoffstall","shiverdecker","shininger","shimasaki","shifrin","shiffler","sheston","sherr","shere","shepeard","shelquist","sheler","shauf","sharrar","sharpnack","shamsiddeen","shambley","shallenberger","shadler","shaban","sferra","seys","sexauer","sevey","severo","setlak","seta","sesko","sersen","serratore","serdula","senechal","seldomridge","seilhamer","seifer","seidlitz","sehnert","sedam","sebron","seber","sebek","seavers","scullark","scroger","scovill","sciascia","sciarra","schweers","schwarze","schummer","schultes","schuchardt","schuchard","schrieber","schrenk","schreifels","schowalter","schoultz","scholer","schofill","schoff","schnuerer","schnettler","schmitke","schmiege","schloop","schlinger","schlessman","schlesser","schlageter","schiess","schiefer","schiavoni","scherzer","scherich","schechtman","schebel","scharpman","schaich","schaap","scappaticci","scadlock","savocchia","savini","savers","savageau","sauvage","sause","sauerwein","sary","sarwary","sarnicola","santone","santoli","santalucia","santacruce","sansoucie","sankoff","sanes","sandri","sanderman","sammartano","salmonson","salmela","salmans","sallaz","salis","sakuma","sakowski","sajdak","sahm","sagredo","safrit","sackey","sabio","sabino","rybolt","ruzzo","ruthstrom","ruta","russin","russak","rusko","ruskin","rusiecki","ruscher","rupar","rumberger","rullan","ruliffson","ruhlman","rufenacht","ruelle","rudisell","rudi","rucci","rublee","ruberto","rubeck","rowett","rottinghaus","roton","rothgeb","rothgaber","rothermich","rostek","rossini","roskelley","rosing","rosi","rosewell","rosberg","roon","ronin","romesburg","romelus","rolley","rollerson","rollefson","rolins","rolens","rois","rohrig","rohrbacher","rohland","rohen","rogness","roes","roering","roehrick","roebke","rodregez","rodabaugh","rockingham","roblee","robel","roadcap","rizzolo","riviezzo","rivest","riveron","risto","rissler","rippentrop","ripka","rinn","ringuette","ringering","rindone","rindels","rieffer","riedman","riede","riecke","riebow","riddlebarger","rhome","rhodd","rhatigan","rhame","reyers","rewitzer","revalee","retzer","rettinger","reschke","requa","reper","reopell","renzelman","renne","renker","renk","renicker","rendina","rendel","remund","remmele","remiasz","remaklus","remak","reitsma","reitmeier","reiswig","reishus","reining","reim","reidinger","reick","reiche","regans","reffett","reesor","reekie","redpath","redditt","rechtzigel","recht","rearden","raynoso","raxter","ratkowski","rasulo","rassmussen","rassel","raser","rappleye","rappe","randrup","randleman","ramson","rampey","radziewicz","quirarte","quintyne","quickel","quattrini","quakenbush","quaile","pytel","pushaw","pusch","purslow","punzo","pullam","pugmire","puello","przekop","pruss","pruiett","provow","prophete","procaccini","pritz","prillaman","priess","pretlow","prestia","presha","prescod","preast","praytor","prashad","praino","pozzi","pottenger","potash","porada","popplewell","ponzo","ponter","pommier","polland","polidori","polasky","pola","poisso","poire","pofahl","podolsky","podell","plueger","plowe","plotz","plotnik","ploch","pliska","plessner","plaut","platzer","plake","pizzino","pirog","piquette","pipho","pioche","pintos","pinkert","pinet","pilkerton","pilch","pilarz","pignataro","piermatteo","picozzi","pickler","pickette","pichler","philogene","phare","phang","pfrogner","pfisterer","pettinelli","petruzzi","petrovic","petretti","petermeier","pestone","pesterfield","pessin","pesch","persky","perruzza","perrott","perritt","perretti","perrera","peroutka","peroni","peron","peret","perdew","perazzo","peppe","peno","penberthy","penagos","peles","pelech","peiper","peight","pefferman","peddie","peckenpaugh","pean","payen","pavloski","pavlica","paullin","patteson","passon","passey","passalacqua","pasquini","paskel","partch","parriott","parrella","parraz","parmely","parizo","papelian","papasergi","pantojz","panto","panich","panchal","palys","pallone","palinski","pali","palevic","pagels","paciorek","pacho","pacella","paar","ozbun","overweg","overholser","ovalles","outcalt","otterbein","otta","ostergren","osher","osbon","orzech","orwick","orrico","oropesa","ormes","orillion","onorati","onnen","omary","olding","okonski","okimoto","ohlrich","ohayon","oguin","ogley","oftedahl","offen","ofallon","oeltjen","odam","ockmond","ockimey","obermeyer","oberdorf","obanner","oballe","oard","oakden","nyhan","nydam","numan","noyer","notte","nothstein","notestine","noser","nork","nolde","nishihara","nishi","nikolic","nihart","nietupski","niesen","niehus","nidiffer","nicoulin","nicolaysen","nicklow","nickl","nickeson","nichter","nicholl","ngyun","newsham","newmann","neveux","neuzil","neumayer","netland","nessen","nesheim","nelli","nelke","necochea","nazari","navorro","navarez","navan","natter","natt","nater","nasta","narvaiz","nardelli","napp","nakahara","nairn","nagg","nager","nagano","nafziger","naffziger","nadelson","muzzillo","murri","murrey","murgia","murcia","muno","munier","mulqueen","mulliniks","mulkins","mulik","muhs","muffley","moynahan","mounger","mottley","motil","moseman","moseby","mosakowski","mortell","morrisroe","morrero","mormino","morland","morger","morgenthaler","moren","morelle","morawski","morasca","morang","morand","moog","montney","montera","montee","montane","montagne","mons","monohan","monnett","monkhouse","moncure","momphard","molyneaux","molles","mollenkopf","molette","mohs","mohmand","mohlke","moessner","moers","mockus","moccio","mlinar","mizzelle","mittler","mitri","mitchusson","mitchen","mistrot","mistler","misch","miriello","minkin","mininger","minerich","minehart","minderman","minden","minahan","milonas","millon","millholland","milleson","millerbernd","millage","militante","milionis","milhoan","mildenberger","milbury","mikolajczak","miklos","mikkola","migneault","mifsud","mietus","mieszala","mielnicki","midy","michon","michioka","micheau","michaeli","micali","methe","metallo","messler","mesch","merow","meroney","mergenthaler","meres","menuey","menousek","menning","menn","menghini","mendia","memmer","melot","mellenthin","melland","meland","meixner","meisenheimer","meineke","meinders","mehrens","mehlig","meglio","medsker","medero","mederios","meabon","mcwright","mcright","mcreath","mcrary","mcquirter","mcquerry","mcquary","mcphie","mcnurlen","mcnelley","mcnee","mcnairy","mcmanamy","mcmahen","mckowen","mckiver","mckinlay","mckearin","mcirvin","mcintrye","mchorse","mchaffie","mcgroarty","mcgoff","mcgivern","mceniry","mcelhiney","mcdiarmid","mccullars","mccubbins","mccrimon","mccovery","mccommons","mcclour","mccarrick","mccarey","mccallen","mcbrien","mcarthy","mayone","maybin","maxam","maurais","maughn","matzek","matts","matin","mathre","mathia","mateen","matava","masso","massar","massanet","masingale","mascaro","marthaler","martes","marso","marshman","marsalis","marrano","marolt","marold","markins","margulis","mardirosian","marchiano","marchak","marandola","marana","manues","mante","mansukhani","mansi","mannan","maniccia","mangine","manery","mandigo","mancell","mamo","malstrom","malouf","malenfant","maldenado","malandruccolo","malak","malabanan","makino","maisonave","mainord","maino","mainard","maillard","mahmud","mahdi","mahapatra","mahaley","mahaffy","magouirk","maglaras","magat","maga","maffia","madrazo","madrano","maditz","mackert","mackellar","mackell","macht","macchia","maccarthy","maahs","lytal","luzar","luzader","lutjen","lunger","lunan","luma","lukins","luhmann","luers","ludvigsen","ludlam","ludemann","luchini","lucente","lubrano","lubow","luber","lubeck","lowing","loven","loup","louge","losco","lorts","lormand","lorenzetti","longford","longden","longbrake","lokhmatov","loge","loeven","loeser","locey","locatelli","litka","lista","lisonbee","lisenbee","liscano","liranzo","liquori","liptrot","lionetti","linscomb","linkovich","linington","lingefelt","lindler","lindig","lindall","lincks","linander","linan","limburg","limbrick","limbach","likos","lighthall","liford","lietzke","liebe","liddicoat","lickley","lichter","liapis","lezo","lewan","levitz","levesgue","leverson","levander","leuthauser","letbetter","lesuer","lesmeister","lesly","lerer","leppanen","lepinski","lenherr","lembrick","lelonek","leisten","leiss","leins","leingang","leinberger","leinbach","leikam","leidig","lehtonen","lehnert","lehew","legier","lefchik","lecy","leconte","lecher","lebrecht","leaper","lawter","lawrenz","lavy","laur","lauderbaugh","lauden","laudato","latting","latsko","latini","lassere","lasseigne","laspina","laso","laslie","laskowitz","laske","lasenby","lascola","lariosa","larcade","lapete","laperouse","lanuza","lanting","lantagne","lansdale","lanphier","langmaid","langella","lanese","landrus","lampros","lamens","laizure","laitinen","laigle","lahm","lagueux","lagorio","lagomarsino","lagasca","lagana","lafont","laflen","lafavor","lafarge","laducer","ladnier","ladesma","lacognata","lackland","lacerte","labuff","laborin","labine","labauve","kuzio","kusterer","kussman","kusel","kusch","kurutz","kurdyla","kupka","kunzler","kunsman","kuni","kuney","kunc","kulish","kuliga","kulaga","kuilan","kuhre","kuhnke","kuemmerle","kueker","kudla","kudelka","kubinski","kubicki","kubal","krzyzanowski","krupicka","krumwiede","krumme","kropidlowski","krokos","kroell","kritzer","kribs","kreitlow","kreisher","kraynak","krass","kranzler","kramb","kozyra","kozicki","kovalik","kovalchik","kovacevic","kotula","kotrba","koteles","kosowski","koskela","kosiba","koscinski","kosch","korab","kopple","kopper","koppelman","koppel","konwinski","kolosky","koloski","kolinsky","kolinski","kolbeck","kolasa","koepf","koda","kochevar","kochert","kobs","knust","knueppel","knoy","knieriem","knier","kneller","knappert","klitz","klintworth","klinkenberg","klinck","kleindienst","kleeb","klecker","kjellberg","kitsmiller","kisor","kisiel","kise","kirbo","kinzle","kingsford","kingry","kimpton","kimel","killmon","killick","kilgallon","kilcher","kihn","kiggins","kiecker","kher","khaleel","keziah","kettell","ketchen","keshishian","kersting","kersch","kerins","kercher","kenefick","kemph","kempa","kelsheimer","kelln","kellenberger","kekahuna","keisling","keirnan","keimig","kehn","keal","kaupp","kaufhold","kauffmann","katzenberg","katona","kaszynski","kaszuba","kassebaum","kasa","kartye","kartchner","karstens","karpinsky","karmely","karel","karasek","kapral","kaper","kanelos","kanahele","kampmann","kampe","kalp","kallus","kallevig","kallen","kaliszewski","kaleohano","kalchthaler","kalama","kalahiki","kaili","kahawai","kagey","justiss","jurkowski","jurgensmeyer","juilfs","jopling","jondahl","jomes","joice","johannessen","joeckel","jezewski","jezek","jeswald","jervey","jeppsen","jenniges","jennett","jemmott","jeffs","jaurequi","janisch","janick","jacek","jacaruso","iwanicki","ishihara","isenberger","isbister","iruegas","inzer","inyart","inscore","innocenti","inglish","infantolino","indovina","inaba","imondi","imdieke","imbert","illes","iarocci","iannucci","huver","hutley","husser","husmann","hupf","huntsberger","hunnewell","hullum","huit","huish","hughson","huft","hufstetler","hueser","hudnell","hovden","housen","houghtling","hossack","hoshaw","horsford","horry","hornbacher","hoppenstedt","hopkinson","honza","homann","holzmeister","holycross","holverson","holtzlander","holroyd","holmlund","holderness","holderfield","holck","hojnacki","hohlfeld","hohenberger","hoganson","hogancamp","hoffses","hoerauf","hoell","hoefert","hodum","hoder","hockenbury","hoage","hisserich","hislip","hirons","hippensteel","hippen","hinkston","hindes","hinchcliff","himmel","hillberry","hildring","hiester","hiefnar","hibberd","hibben","heyliger","heyl","heyes","hevia","hettrick","hert","hersha","hernandz","herkel","herber","henscheid","hennesy","henly","henegan","henebry","hench","hemsath","hemm","hemken","hemann","heltzel","hellriegel","hejny","heinl","heinke","heidinger","hegeman","hefferan","hedglin","hebdon","hearnen","heape","heagy","headings","headd","hazelbaker","havlick","hauschildt","haury","hassenfritz","hasenbeck","haseltine","hartstein","hartry","hartnell","harston","harpool","harmen","hardister","hardey","harders","harbolt","harbinson","haraway","haque","hansmann","hanser","hansch","hansberry","hankel","hanigan","haneline","hampe","hamons","hammerstone","hammerle","hamme","hammargren","hamelton","hamberger","hamasaki","halprin","halman","hallihan","haldane","haifley","hages","hagadorn","hadwin","habicht","habermehl","gyles","gutzman","gutekunst","gustason","gusewelle","gurnsey","gurnee","gunterman","gumina","gulliver","gulbrandson","guiterez","guerino","guedry","gucwa","guardarrama","guagliano","guadagno","grulke","groote","groody","groft","groeneweg","grochow","grippe","grimstead","griepentrog","greenfeld","greenaway","grebe","graziosi","graw","gravina","grassie","granzow","grandjean","granby","gramacy","gozalez","goyer","gotch","gosden","gorny","gormont","goodgion","gonya","gonnerman","gompert","golish","goligoski","goldmann","goike","goetze","godeaux","glaza","glassel","glaspy","glander","giumarro","gitelman","gisondi","gismondi","girvan","girten","gironda","giovinco","ginkel","gilster","giesy","gierman","giddins","giardini","gianino","ghea","geurin","gett","getson","gerrero","germond","gentsy","genta","gennette","genito","genis","gendler","geltz","geiss","gehret","gegenheimer","geffert","geeting","gebel","gavette","gavenda","gaumond","gaudioso","gatzke","gatza","gattshall","gaton","gatchel","gasperi","gaska","gasiorowski","garritson","garrigus","garnier","garnick","gardinier","gardenas","garcy","garate","gandolfi","gamm","gamel","gambel","gallmon","gallemore","gallati","gainous","gainforth","gahring","gaffey","gaebler","gadzinski","gadbury","gabri","gaba","fyke","furtaw","furnas","furcron","funn","funck","fulwood","fulvio","fullmore","fukumoto","fuest","fuery","frymire","frush","frohlich","froedge","frodge","fritzinger","fricker","frericks","frein","freid","freggiaro","fratto","franzi","franciscus","fralix","fowble","fotheringham","foslien","foshie","fortmann","forsey","forkner","foppiano","fontanetta","fonohema","fogler","fockler","fluty","flusche","flud","flori","flenory","fleharty","fleeks","flaxman","fiumara","fitzmorris","finnicum","finkley","fineran","fillhart","filipi","fijal","fieldson","ficarra","festerman","ferryman","ferner","fergason","ferell","fennern","femmer","feldmeier","feeser","feenan","federick","fedak","febbo","feazell","fazzone","fauth","fauset","faurote","faulker","faubion","fatzinger","fasick","fanguy","fambrough","falks","fahl","faaita","exler","ewens","estrado","esten","esteen","esquivez","espejo","esmiol","esguerra","esco","ertz","erspamer","ernstes","erisman","erhard","ereaux","ercanbrack","erbes","epple","entsminger","entriken","enslow","ennett","engquist","englebert","englander","engesser","engert","engeman","enge","enerson","emhoff","emge","elting","ellner","ellenberg","ellenbecker","elio","elfert","elawar","ekstrand","eison","eismont","eisenbrandt","eiseman","eischens","ehrgott","egley","egert","eddlemon","eckerson","eckersley","eckberg","echeverry","eberts","earthman","earnhart","eapen","eachus","dykas","dusi","durning","durdan","dunomes","duncombe","dume","dullen","dullea","dulay","duffett","dubs","dubard","drook","drenth","drahos","dragone","downin","downham","dowis","dowhower","doward","dovalina","dopazo","donson","donnan","dominski","dollarhide","dolinar","dolecki","dolbee","doege","dockus","dobkin","dobias","divoll","diviney","ditter","ditman","dissinger","dismang","dirlam","dinneen","dini","dingwall","diloreto","dilmore","dillaman","dikeman","diiorio","dighton","diffley","dieudonne","dietel","dieringer","diercks","dienhart","diekrager","diefendorf","dicke","dicamillo","dibrito","dibona","dezeeuw","dewhurst","devins","deviney","deupree","detherage","despino","desmith","desjarlais","deshner","desha","desanctis","derring","derousse","derobertis","deridder","derego","derden","deprospero","deprofio","depping","deperro","denty","denoncourt","dencklau","demler","demirchyan","demichiel","demesa","demere","demaggio","delung","deluise","delmoral","delmastro","delmas","delligatti","delle","delasbour","delarme","delargy","delagrange","delafontaine","deist","deiss","deighan","dehoff","degrazia","degman","defosses","deforrest","deeks","decoux","decarolis","debuhr","deberg","debarr","debari","dearmon","deare","deardurff","daywalt","dayer","davoren","davignon","daviau","dauteuil","dauterive","daul","darnley","darakjy","dapice","dannunzio","danison","daniello","damario","dalonzo","dallis","daleske","dalenberg","daiz","dains","daines","dagnese","dady","dadey","czyzewski","czapor","czaplewski","czajka","cyganiewicz","cuttino","cutrona","cussins","cusanelli","cuperus","cundy","cumiskey","cumins","cuizon","cuffia","cuffe","cuffari","cuccaro","cubie","cryder","cruson","crounse","cromedy","cring","creer","credeur","crea","cozort","cozine","cowee","cowdery","couser","courtway","courington","cotman","costlow","costell","corton","corsaro","corrieri","corrick","corradini","coron","coren","corbi","corado","copus","coppenger","cooperwood","coontz","coonce","contrera","connealy","conell","comtois","compere","commins","commings","comegys","colyar","colo","collister","collick","collella","coler","colborn","cohran","cogbill","coffen","cocuzzo","clynes","closter","clipp","clingingsmith","clemence","clayman","classon","clas","clarey","clague","ciubal","citrino","citarella","cirone","cipponeri","cindrich","cimo","ciliberto","cichowski","ciccarello","cicala","chura","chubbuck","chronis","christlieb","chizek","chittester","chiquito","chimento","childree","chianese","chevrette","checo","chastang","chargualaf","chapmon","chantry","chahal","chafetz","cezar","ceruantes","cerrillo","cerrano","cerecedes","cerami","cegielski","cavallero","catinella","cassata","caslin","casano","casacchia","caruth","cartrette","carten","carodine","carnrike","carnall","carmicle","carlan","carlacci","caris","cariaga","cardine","cardimino","cardani","carbonara","capua","capponi","cappellano","caporale","canupp","cantrel","cantone","canterberry","cannizzo","cannan","canelo","caneer","candill","candee","campbel","caminero","camble","caluya","callicott","calk","caito","caffie","caden","cadavid","cacy","cachu","cachola","cabreja","cabiles","cabada","caamano","byran","byon","buyck","bussman","bussie","bushner","burston","burnison","burkman","burkhammer","bures","burdeshaw","bumpass","bullinger","bullers","bulgrin","bugay","budak","buczynski","buckendorf","buccieri","bubrig","brynteson","brunz","brunmeier","brunkow","brunetto","brunelli","brumwell","bruggman","brucki","brucculeri","brozovich","browing","brotman","brocker","broadstreet","brix","britson","brinck","brimmage","brierre","bridenstine","brezenski","brezee","brevik","brentlinger","brentley","breidenbach","breckel","brech","brazzle","braughton","brauch","brattin","brattain","branhan","branford","braner","brander","braly","braegelmann","brabec","boyt","boyack","bowren","bovian","boughan","botton","botner","bosques","borzea","borre","boron","bornhorst","borgstrom","borella","bontempo","bonniwell","bonnes","bonillo","bonano","bolek","bohol","bohaty","boffa","boetcher","boesen","boepple","boehler","boedecker","boeckx","bodi","boal","bloodsworth","bloodgood","blome","blockett","blixt","blanchett","blackhurst","blackaby","bjornberg","bitzer","bittenbender","bitler","birchall","binnicker","binggeli","billett","bilberry","biglow","bierly","bielby","biegel","berzas","berte","bertagnolli","berreth","bernhart","bergum","berentson","berdy","bercegeay","bentle","bentivegna","bentham","benscoter","benns","bennick","benjamine","beneze","benett","beneke","bendure","bendix","bendick","benauides","belman","bellus","bellott","bellefleur","bellas","beljan","belgard","beith","beinlich","beierle","behme","beevers","beermann","beeching","bedward","bedrosian","bedner","bedeker","bechel","becera","beaubrun","beardmore","bealmear","bazin","bazer","baumhoer","baumgarner","bauknecht","battson","battiest","basulto","baster","basques","basista","basiliere","bashi","barzey","barz","bartus","bartucca","bartek","barrero","barreca","barnoski","barndt","barklow","baribeau","barette","bares","barentine","bareilles","barbre","barberi","barbagelata","baraw","baratto","baranoski","baptise","bankson","bankey","bankard","banik","baltzley","ballen","balkey","balius","balderston","bakula","bakalar","baffuto","baerga","badoni","backous","bachtel","bachrach","baccari","babine","babilonia","baar","azbill","azad","aycox","ayalla","avolio","austerberry","aughtry","aufderheide","auch","attanasio","athayde","atcher","asselta","aslin","aslam","ashwood","ashraf","ashbacher","asbridge","asakura","arzaga","arriaza","arrez","arrequin","arrants","armiger","armenteros","armbrister","arko","argumedo","arguijo","ardolino","arcia","arbizo","aravjo","aper","anzaldo","antu","antrikin","antonetty","antinoro","anthon","antenucci","anstead","annese","ankrum","andreason","andrado","andaverde","anastos","anable","amspoker","amrine","amrein","amorin","amel","ambrosini","alsbrook","alnutt","almasi","allessio","allateef","aldous","alderink","aldaz","akmal","akard","aiton","aites","ainscough","aikey","ahrends","ahlm","aguada","agans","adelmann","addesso","adaway","adamaitis","ackison","abud","abendroth","abdur","abdool","aamodt","zywiec","zwiefelhofer","zwahlen","zunino","zuehl","zmuda","zmolek","zizza","ziska","zinser","zinkievich","zinger","zingarelli","ziesmer","ziegenfuss","ziebol","zettlemoyer","zettel","zervos","zenke","zembower","zelechowski","zelasko","zeise","zeek","zeeb","zarlenga","zarek","zaidi","zahnow","zahnke","zaharis","zacate","zabrocki","zaborac","yurchak","yuengling","younie","youngers","youell","yott","yoshino","yorks","yordy","yochem","yerico","yerdon","yeiser","yearous","yearick","yeaney","ybarro","yasutake","yasin","yanke","yanish","yanik","yamazaki","yamat","yaggi","ximenez","wyzard","wynder","wyly","wykle","wutzke","wuori","wuertz","wuebker","wrightsel","worobel","worlie","worford","worek","woolson","woodrome","woodly","woodling","wontor","wondra","woltemath","wollmer","wolinski","wolfert","wojtanik","wojtak","wohlfarth","woeste","wobbleton","witz","wittmeyer","witchey","wisotzkey","wisnewski","wisman","wirch","wippert","wineberg","wimpee","wilusz","wiltsey","willig","williar","willers","willadsen","wildhaber","wilday","wigham","wiewel","wieting","wietbrock","wiesel","wiesehan","wiersema","wiegert","widney","widmark","wickson","wickings","wichern","whtie","whittie","whitlinger","whitfill","whitebread","whispell","whetten","wheeley","wheeles","wheelen","whatcott","weyland","weter","westrup","westphalen","westly","westland","wessler","wesolick","wesler","wesche","werry","wero","wernecke","werkhoven","wellspeak","wellings","welford","welander","weissgerber","weisheit","weins","weill","weigner","wehrmann","wehrley","wehmeier","wege","weers","weavers","watring","wassum","wassman","wassil","washabaugh","wascher","warth","warbington","wanca","wammack","wamboldt","walterman","walkington","walkenhorst","walinski","wakley","wagg","wadell","vuckovich","voogd","voller","vokes","vogle","vogelsberg","vodicka","vissering","vipond","vincik","villalona","vickerman","vettel","veteto","vesperman","vesco","vertucci","versaw","verba","ventris","venecia","vendela","venanzi","veldhuizen","vehrs","vaughen","vasilopoulos","vascocu","varvel","varno","varlas","varland","vario","vareschi","vanwyhe","vanweelden","vansciver","vannaman","vanluven","vanloo","vanlaningham","vankomen","vanhout","vanhampler","vangorp","vangorden","vanella","vandresar","vandis","vandeyacht","vandewerker","vandevsen","vanderwall","vandercook","vanderberg","vanbergen","valko","valesquez","valeriano","valen","vachula","vacha","uzee","uselman","urizar","urion","urben","upthegrove","unzicker","unsell","unick","umscheid","umin","umanzor","ullo","ulicki","uhlir","uddin","tytler","tymeson","tyger","twisdale","twedell","tweddle","turrey","tures","turell","tupa","tuitt","tuberville","tryner","trumpower","trumbore","troglen","troff","troesch","trivisonno","tritto","tritten","tritle","trippany","tringali","tretheway","treon","trejos","tregoning","treffert","traycheff","travali","trauth","trauernicht","transou","trane","trana","toves","tosta","torp","tornquist","tornes","torchio","toor","tooks","tonks","tomblinson","tomala","tollinchi","tolles","tokich","tofte","todman","titze","timpone","tillema","tienken","tiblier","thyberg","thursby","thurrell","thurm","thruman","thorsted","thorley","thomer","thoen","thissen","theimer","thayn","thanpaeng","thammavongsa","thalman","texiera","texidor","teverbaugh","teska","ternullo","teplica","tepe","teno","tenholder","tenbusch","tenbrink","temby","tejedor","teitsworth","teichmann","tehan","tegtmeyer","tees","teem","tays","taubert","tauares","taschler","tartamella","tarquinio","tarbutton","tappendorf","tapija","tansil","tannahill","tamondong","talahytewa","takashima","taecker","tabora","tabin","tabbert","szymkowski","szymanowski","syversen","syrett","synnott","sydnes","swimm","sweney","swearegene","swartzel","swanstrom","svedin","suryan","supplice","supnet","suoboda","sundby","sumaya","sumabat","sulzen","sukovaty","sukhu","sugerman","sugalski","sudweeks","sudbeck","sucharski","stutheit","stumfoll","stuffle","struyk","strutz","strumpf","strowbridge","strothman","strojny","strohschein","stroffolino","stribble","strevel","strenke","stremming","strehle","stranak","stram","stracke","stoudamire","storks","stopp","stonebreaker","stolt","stoica","stofer","stockham","stockfisch","stjuste","stiteler","stiman","stillions","stillabower","stierle","sterlace","sterk","stepps","stenquist","stenner","stellman","steines","steinbaugh","steinbacher","steiling","steidel","steffee","stavinoha","staver","stastny","stasiuk","starrick","starliper","starlin","staniford","staner","standre","standefer","standafer","stanczyk","stallsmith","stagliano","staehle","staebler","stady","stadtmiller","squyres","spurbeck","sprunk","spranger","spoonamore","spoden","spilde","spezio","speros","sperandio","specchio","spearin","spayer","spallina","spadafino","sovie","sotello","sortor","sortino","soros","sorola","sorbello","sonner","sonday","somes","soloway","soens","soellner","soderblom","sobin","sniezek","sneary","smyly","smutnick","smoots","smoldt","smitz","smitreski","smallen","smades","slunaker","sluka","slown","slovick","slocomb","slinger","slife","sleeter","slanker","skufca","skubis","skrocki","skov","skjei","skilton","skarke","skalka","skalak","skaff","sixkiller","sitze","siter","sisko","sirman","sirls","sinotte","sinon","sincock","sincebaugh","simmoms","similien","silvius","silton","silloway","sikkema","sieracki","sienko","siemon","siemer","siefker","sieberg","siebens","siebe","sicurella","sicola","sickle","shumock","shumiloff","shuffstall","shuemaker","shuart","shroff","shreeve","shostak","shortes","shorr","shivley","shintaku","shindo","shimomura","shiigi","sherow","sherburn","shepps","shenefield","shelvin","shelstad","shelp","sheild","sheaman","shaulis","sharrer","sharps","sharpes","shappy","shapero","shanor","shandy","seyller","severn","sessom","sesley","servidio","serrin","sero","septon","septer","sennott","sengstock","senff","senese","semprini","semone","sembrat","selva","sella","selbig","seiner","seif","seidt","sehrt","seemann","seelbinder","sedlay","sebert","seaholm","seacord","seaburg","scungio","scroggie","scritchfield","scrimpsher","scrabeck","scorca","scobey","scivally","schwulst","schwinn","schwieson","schwery","schweppe","schwartzenbur","schurz","schumm","schulenburg","schuff","schuerholz","schryer","schrager","schorsch","schonhardt","schoenfelder","schoeck","schoeb","schnitzler","schnick","schnautz","schmig","schmelter","schmeichel","schluneger","schlosberg","schlobohm","schlenz","schlembach","schleisman","schleining","schleiff","schleider","schink","schilz","schiffler","schiavi","scheuer","schemonia","scheman","schelb","schaul","schaufelberge","scharer","schardt","scharbach","schabacker","scee","scavone","scarth","scarfone","scalese","sayne","sayed","savitz","satterlund","sattazahn","satow","sastre","sarr","sarjeant","sarff","sardella","santoya","santoni","santai","sankowski","sanft","sandow","sandoe","sandhaus","sandefer","sampey","samperi","sammarco","samia","samek","samay","samaan","salvadore","saltness","salsgiver","saller","salaz","salano","sakal","saka","saintlouis","saile","sahota","saggese","sagastume","sadri","sadak","sachez","saalfrank","saal","saadeh","rynn","ryley","ryle","rygg","rybarczyk","ruzich","ruyter","ruvo","rupel","ruopp","rundlett","runde","rundall","runck","rukavina","ruggiano","rufi","ruef","rubright","rubbo","rowbottom","rotner","rotman","rothweiler","rothlisberger","rosseau","rossean","rossa","roso","rosiek","roshia","rosenkrans","rosener","rosencrantz","rosencrans","rosello","roques","rookstool","rondo","romasanta","romack","rokus","rohweder","roethler","roediger","rodwell","rodrigus","rodenbeck","rodefer","rodarmel","rockman","rockholt","rochow","roches","roblin","roblez","roble","robers","roat","rizza","rizvi","rizk","rixie","riveiro","rius","ritschard","ritrovato","risi","rishe","rippon","rinks","ringley","ringgenberg","ringeisen","rimando","rilley","rijos","rieks","rieken","riechman","riddley","ricord","rickabaugh","richmeier","richesin","reyolds","rexach","requena","reppucci","reposa","renzulli","renter","remondini","reither","reisig","reifsnider","reifer","reibsome","reibert","rehor","rehmann","reedus","redshaw","reczek","recupero","recor","reckard","recher","realbuto","razer","rayman","raycraft","rayas","rawle","raviscioni","ravetto","ravenelle","rauth","raup","rattliff","rattley","rathfon","rataj","rasnic","rappleyea","rapaport","ransford","rann","rampersad","ramis","ramcharan","rainha","rainforth","ragans","ragains","rafidi","raffety","raducha","radsky","radler","radatz","raczkowski","rabenold","quraishi","quinerly","quercia","quarnstrom","pusser","puppo","pullan","pulis","pugel","puca","pruna","prowant","provines","pronk","prinkleton","prindall","primas","priesmeyer","pridgett","prevento","preti","presser","presnall","preseren","presas","presa","prchal","prattis","pratillo","praska","prak","powis","powderly","postlewait","postle","posch","porteus","porraz","popwell","popoff","poplaski","poniatoski","pollina","polle","polhill","poletti","polaski","pokorney","pointdexter","poinsette","ploszaj","plitt","pletz","pletsch","plemel","pleitez","playford","plaxco","platek","plambeck","plagens","placido","pisarski","pinuelas","pinnette","pinick","pinell","pinciaro","pinal","pilz","piltz","pillion","pilkinton","pikul","piepenburg","piening","piehler","piedrahita","piechocki","picknell","pickelsimer","pich","picariello","phoeuk","phillipson","philbert","pherigo","phelka","peverini","petrash","petramale","petraglia","pery","personius","perrington","perrill","perpall","perot","perman","peragine","pentland","pennycuff","penninger","pennachio","pendexter","penalver","pelzel","pelter","pelow","pelo","peli","peinado","pedley","pecue","pecore","pechar","peairs","paynes","payano","pawelk","pavlock","pavlich","pavich","pavek","pautler","paulik","patmore","patella","patee","patalano","passini","passeri","paskell","parrigan","parmar","parayno","paparelli","pantuso","pante","panico","panduro","panagos","pama","palmo","pallotta","paling","palamino","pake","pajtas","pailthorpe","pahler","pagon","paglinawan","pagley","paget","paetz","paet","padley","pacleb","pachelo","paccione","pabey","ozley","ozimek","ozawa","owney","outram","ouillette","oudekerk","ostrosky","ostermiller","ostermann","osterloh","osterfeld","ossenfort","osoria","oshell","orsino","orscheln","orrison","ororke","orellano","orejuela","ordoyne","opsahl","opland","onofre","onaga","omahony","olszowka","olshan","ollig","oliff","olien","olexy","oldridge","oldfather","olalde","okun","okumoto","oktavec","okin","ohme","ohlemacher","ohanesian","odneal","odgers","oderkirk","odden","ocain","obradovich","oakey","nussey","nunziato","nunoz","nunnenkamp","nuncio","noviello","novacek","nothstine","northum","norsen","norlander","norkus","norgaard","norena","nored","nobrega","niziolek","ninnemann","nievas","nieratko","nieng","niedermeyer","niedermaier","nicolls","newham","newcome","newberger","nevills","nevens","nevel","neumiller","netti","nessler","neria","nemet","nelon","nellon","neller","neisen","neilly","neifer","neid","neering","neehouse","neef","needler","nebergall","nealis","naumoff","naufzinger","narum","narro","narramore","naraine","napps","nansteel","namisnak","namanny","nallie","nakhle","naito","naccari","nabb","myracle","myhand","mwakitwile","muzzy","muscolino","musco","muscente","muscat","muscara","musacchia","musa","murrish","murfin","muray","munnelly","munley","munivez","mundine","mundahl","munari","mullennex","mullendore","mulkhey","mulinix","mulders","muhl","muenchow","muellner","mudget","mudger","muckenfuss","muchler","mozena","movius","mouldin","motola","mosseri","mossa","moselle","mory","morsell","morrish","morles","morie","morguson","moresco","morck","moppin","moosman","montuori","montono","montogomery","montis","monterio","monter","monsalve","mongomery","mongar","mondello","moncivais","monard","monagan","molt","mollenhauer","moldrem","moldonado","molano","mokler","moisant","moilanen","mohrman","mohamad","moger","mogel","modine","modin","modic","modha","mlynek","miya","mittiga","mittan","mitcheltree","misfeldt","misener","mirchandani","miralles","miotke","miosky","mintey","mins","minassian","minar","mimis","milon","milloy","millison","milito","milfort","milbradt","mikulich","mikos","miklas","mihelcic","migliorisi","migliori","miesch","midura","miclette","michela","micale","mezey","mews","mewes","mettert","mesker","mesich","mesecher","merthie","mersman","mersereau","merrithew","merriott","merring","merenda","merchen","mercardo","merati","mentzel","mentis","mentel","menotti","meno","mengle","mendolia","mellick","mellett","melichar","melhorn","melendres","melchiorre","meitzler","mehtani","mehrtens","meditz","medeiras","meckes","mcteer","mctee","mcparland","mcniell","mcnealey","mcmanaway","mcleon","mclay","mclavrin","mcklveen","mckinzey","mcken","mckeand","mckale","mcilwraith","mcilroy","mcgreal","mcgougan","mcgettigan","mcgarey","mcfeeters","mcelhany","mcdaris","mccomis","mccomber","mccolm","mccollins","mccollin","mccollam","mccoach","mcclory","mcclennon","mccathern","mccarthey","mccarson","mccarrel","mccargar","mccandles","mccamish","mccally","mccage","mcbrearty","mcaneny","mcanallen","mcalarney","mcaferty","mazzo","mazy","mazurowski","mazique","mayoras","mayden","maxberry","mauller","matusiak","mattsen","matthey","matkins","mathiasen","mathe","mateus","matalka","masullo","massay","mashak","mascroft","martinex","martenson","marsiglia","marsella","maroudas","marotte","marner","markes","maret","mareno","marean","marcinkiewicz","marchel","marasigan","manzueta","manzanilla","manternach","manring","manquero","manoni","manne","mankowski","manjarres","mangen","mangat","mandonado","mandia","mancias","manbeck","mamros","maltez","mallia","mallar","malla","malen","malaspina","malahan","malagisi","malachowski","makowsky","makinen","makepeace","majkowski","majid","majercin","maisey","mainguy","mailliard","maignan","mahlman","maha","magsamen","magpusao","magnano","magley","magedanz","magarelli","magaddino","maenner","madnick","maddrey","madaffari","macnaughton","macmullen","macksey","macknight","macki","macisaac","maciejczyk","maciag","machenry","machamer","macguire","macdaniel","maccormack","maccabe","mabbott","mabb","lynott","lycan","lutwin","luscombe","lusco","lusardi","luria","lunetta","lundsford","lumas","luisi","luevanos","lueckenhoff","ludgate","ludd","lucherini","lubbs","lozado","lourens","lounsberry","loughrey","loughary","lotton","losser","loshbaugh","loseke","loscalzo","lortz","loperena","loots","loosle","looman","longstaff","longobardi","longbottom","lomay","lomasney","lohrmann","lohmiller","logalbo","loetz","loeffel","lodwick","lodrigue","lockrem","llera","llarena","littrel","littmann","lisser","lippa","lipner","linnemann","lingg","lindemuth","lindeen","lillig","likins","lieurance","liesmann","liesman","liendo","lickert","lichliter","leyvas","leyrer","lewy","leubner","lesslie","lesnick","lesmerises","lerno","lequire","lepera","lepard","lenske","leneau","lempka","lemmen","lemm","lemere","leinhart","leichner","leicher","leibman","lehmberg","leggins","lebeda","leavengood","leanard","lazaroff","laventure","lavant","lauster","laumea","latigo","lasota","lashure","lasecki","lascurain","lartigue","larouche","lappe","laplaunt","laplace","lanum","lansdell","lanpher","lanoie","lankard","laniado","langowski","langhorn","langfield","langfeldt","landt","landerman","landavazo","lampo","lampke","lamper","lamery","lambey","lamadrid","lallemand","laisure","laigo","laguer","lagerman","lageman","lagares","lacosse","lachappelle","laborn","labonne","kuzia","kutt","kutil","kurylo","kurowski","kuriger","kupcho","kulzer","kulesa","kules","kuhs","kuhne","krutz","krus","krupka","kronberg","kromka","kroese","krizek","krivanek","kringel","kreiss","kratofil","krapp","krakowsky","kracke","kozlow","kowald","kover","kovaleski","kothakota","kosten","koskinen","kositzke","korff","korbar","kopplin","koplin","koos","konyn","konczak","komp","komo","kolber","kolash","kolakowski","kohm","kogen","koestner","koegler","kodama","kocik","kochheiser","kobler","kobara","knezevich","kneifl","knapchuck","knabb","klugman","klosner","klingel","klimesh","klice","kley","kleppe","klemke","kleinmann","kleinhans","kleinberg","kleffner","kleckley","klase","kisto","kissick","kisselburg","kirschman","kirks","kirkner","kirkey","kirchman","kinville","kinnunen","kimmey","kimmerle","kimbley","kilty","kilts","killmeyer","killilea","killay","kiest","kierce","kiepert","kielman","khalid","kewal","keszler","kesson","kesich","kerwood","kerksiek","kerkhoff","kerbo","keranen","keomuangtai","kenter","kennelley","keniry","kendzierski","kempner","kemmis","kemerling","kelsay","kelchner","kela","keithly","keipe","kegg","keer","keahey","kaywood","kayes","kawahara","kasuboski","kastendieck","kassin","kasprzyk","karraker","karnofski","karman","karger","karge","karella","karbowski","kapphahn","kannel","kamrath","kaminer","kamansky","kalua","kaltz","kalpakoff","kalkbrenner","kaku","kaib","kaehler","kackley","kaber","justo","juris","jurich","jurgenson","jurez","junor","juniel","juncker","jugo","jubert","jowell","jovanovic","joosten","joncas","joma","johnso","johanns","jodoin","jockers","joans","jinwright","jinenez","jimeson","jerrett","jergens","jerden","jerdee","jepperson","jendras","jeanfrancois","jazwa","jaussi","jaster","jarzombek","jarencio","janocha","jakab","jadlowiec","jacobsma","jach","izaquirre","iwaoka","ivaska","iturbe","israelson","isles","isachsen","isaak","irland","inzerillo","insogna","ingegneri","ingalsbe","inciong","inagaki","icenogle","hyett","hyers","huyck","hutti","hutten","hutnak","hussar","hurrle","hurford","hurde","hupper","hunkin","hunkele","hunke","humann","huhtasaari","hugel","hufft","huegel","hrobsky","hren","hoyles","hovsepian","hovenga","hovatter","houdek","hotze","hossler","hossfeld","hosseini","horten","hort","horr","horgen","horen","hoopii","hoon","hoogland","hontz","honnold","homewood","holway","holtgrewe","holtan","holstrom","holstege","hollway","hollingshed","hollenback","hollard","holberton","hoines","hogeland","hofstad","hoetger","hoen","hoaglund","hirota","hintermeister","hinnen","hinders","hinderer","hinchee","himelfarb","himber","hilzer","hilling","hillers","hillegas","hildinger","hignight","highman","hierholzer","heyde","hettich","hesketh","herzfeld","herzer","hershenson","hershberg","hernando","hermenegildo","hereth","hererra","hereda","herbin","heraty","herard","hepa","henschel","henrichsen","hennes","henneberger","heningburg","henig","hendron","hendericks","hemple","hempe","hemmingsen","hemler","helvie","helmly","helmbrecht","heling","helin","helfrey","helble","helaire","heizman","heisser","heiny","heinbaugh","heidemann","heidema","heiberger","hegel","heerdt","heeg","heefner","heckerman","heckendorf","heavin","headman","haynesworth","haylock","hayakawa","hawksley","haverstick","haut","hausen","hauke","haubold","hattan","hattabaugh","hasstedt","hashem","haselhorst","harrist","harpst","haroldsen","harmison","harkema","harison","hariri","harcus","harcum","harcharik","hanzel","hanvey","hantz","hansche","hansberger","hannig","hanken","hanhardt","hanf","hanauer","hamberlin","halward","halsall","hals","hallquist","hallmon","halk","halbach","halat","hajdas","hainsworth","haik","hahm","hagger","haggar","hader","hadel","haddick","hackmann","haasch","haaf","guzzetta","guzy","gutterman","gutmann","gutkowski","gustine","gursky","gurner","gunsolley","gumpert","gulla","guilmain","guiliani","guier","guers","guerero","guerena","guebara","guadiana","grunder","grothoff","grosland","grosh","groos","grohs","grohmann","groepper","grodi","grizzaffi","grissinger","grippi","grinde","griffee","grether","greninger","greigo","gregorski","greger","grega","greenberger","graza","grattan","grasse","grano","gramby","gradilla","govin","goutremout","goulas","gotay","gosling","gorey","gordner","goossen","goodwater","gonzaga","gonyo","gonska","gongalves","gomillion","gombos","golonka","gollman","goldtrap","goldammer","golas","golab","gola","gogan","goffman","goeppinger","godkin","godette","glore","glomb","glauner","glassey","glasner","gividen","giuffrida","gishal","giovanelli","ginoza","ginns","gindlesperger","gindhart","gillem","gilger","giggey","giebner","gibbson","giacomo","giacolone","giaccone","giacchino","ghere","gherardini","gherardi","gfeller","getts","gerwitz","gervin","gerstle","gerfin","geremia","gercak","gener","gencarelli","gehron","gehrmann","geffers","geery","geater","gawlik","gaudino","garsia","garrahan","garrabrant","garofolo","garigliano","garfinkle","garelick","gardocki","garafola","gappa","gantner","ganther","gangelhoff","gamarra","galstad","gally","gallik","gallier","galimba","gali","galassi","gaige","gadsby","gabbin","gabak","fyall","furney","funez","fulwider","fulson","fukunaga","fujikawa","fugere","fuertes","fuda","fryson","frump","frothingham","froning","froncillo","frohling","froberg","froats","fritchman","frische","friedrichsen","friedmann","friddell","frid","fresch","frentzel","freno","frelow","freimuth","freidel","freehan","freeby","freeburn","fredieu","frederiksen","fredeen","frazell","frayser","fratzke","frattini","franze","franich","francescon","framer","fragman","frack","foxe","fowlston","fosberg","fortna","fornataro","forden","foots","foody","fogt","foglia","fogerty","fogelson","flygare","flowe","flinner","flem","flath","flater","flahaven","flad","fjeld","fitanides","fistler","fishbaugh","firsching","finzel","finical","fingar","filosa","filicetti","filby","fierst","fierra","ficklen","ficher","fersner","ferrufino","ferrucci","fero","ferlenda","ferko","fergerstrom","ferge","fenty","fent","fennimore","fendt","femat","felux","felman","feldhaus","feisthamel","feijoo","feiertag","fehrman","fehl","feezell","feeback","fedigan","fedder","fechner","feary","fayson","faylor","fauteux","faustini","faure","fauci","fauber","fattig","farruggio","farrens","faraci","fantini","fantin","fanno","fannings","faniel","fallaw","falker","falkenhagen","fajen","fahrner","fabel","fabacher","eytcheson","eyster","exford","exel","evetts","evenstad","evanko","euresti","euber","etcitty","estler","essner","essinger","esplain","espenshade","espaillat","escribano","escorcia","errington","errett","errera","erlanger","erenrich","erekson","erber","entinger","ensworth","ensell","enno","ennen","englin","engblom","engberson","encinias","enama","emel","elzie","elsbree","elman","ellebracht","elkan","elfstrom","elerson","eleazer","eleam","eldrige","elcock","einspahr","eike","eidschun","eickman","eichele","eiche","ehlke","eguchi","eggink","edouard","edgehill","eckes","eblin","ebberts","eavenson","earvin","eardley","eagon","eader","dzubak","dylla","dyckman","dwire","dutrow","dutile","dusza","dustman","dusing","duryee","durupan","durtschi","durtsche","durell","dunny","dunnegan","dunken","dumm","dulak","duker","dukelow","dufort","dufilho","duffee","duett","dueck","dudzinski","dudasik","duckwall","duchemin","dubrow","dubis","dubicki","duba","drust","druckman","drinnen","drewett","drewel","dreitzler","dreckman","drappo","draffen","drabant","doyen","dowding","doub","dorson","dorschner","dorrington","dorney","dormaier","dorff","dorcy","donges","donelly","donel","domangue","dols","dollahite","dolese","doldo","doiley","dohrman","dohn","doheny","doceti","dobry","dobrinski","dobey","divincenzo","dischinger","dirusso","dirocco","dipiano","diop","dinitto","dinehart","dimsdale","diminich","dimalanta","dillavou","dilello","difusco","diffey","diffenderfer","diffee","difelice","difabio","dietzman","dieteman","diepenbrock","dieckmann","dicampli","dibari","diazdeleon","diallo","dewitz","dewiel","devoll","devol","devincent","devier","devendorf","devalk","detten","detraglia","dethomas","detemple","desler","desharnais","desanty","derocco","dermer","derks","derito","derhammer","deraney","dequattro","depass","depadua","denyes","denyer","dentino","denlinger","deneal","demory","demopoulos","demontigny","demonte","demeza","delsol","delrosso","delpit","delpapa","delouise","delone","delo","delmundo","delmore","dellapaolera","delfin","delfierro","deleonardis","delenick","delcarlo","delcampo","delcamp","delawyer","delaroca","delaluz","delahunt","delaguardia","dekeyser","dekay","dejaeger","dejackome","dehay","dehass","degraffenried","degenhart","degan","deever","deedrick","deckelbaum","dechico","dececco","decasas","debrock","debona","debeaumont","debarros","debaca","dearmore","deangelus","dealmeida","dawood","davney","daudt","datri","dasgupta","darring","darracott","darcus","daoud","dansbury","dannels","danielski","danehy","dancey","damour","dambra","dalcour","dahlheimer","dadisman","dacunto","dacamara","dabe","cyrulik","cyphert","cwik","cussen","curles","curit","curby","curbo","cunas","cunard","cunanan","cumpton","culcasi","cucinotta","cucco","csubak","cruthird","crumwell","crummitt","crumedy","crouthamel","cronce","cromack","crisafi","crimin","cresto","crescenzo","cremonese","creedon","crankshaw","cozzens","coval","courtwright","courcelle","coupland","counihan","coullard","cotrell","cosgrave","cornelio","corish","cordoua","corbit","coppersmith","coonfield","conville","contrell","contento","conser","conrod","connole","congrove","conery","condray","colver","coltman","colflesh","colcord","colavito","colar","coile","coggan","coenen","codling","coda","cockroft","cockrel","cockerill","cocca","coberley","clouden","clos","clish","clinkscale","clester","clammer","cittadino","citrano","ciresi","cillis","ciccarelli","ciborowski","ciarlo","ciardullo","chritton","chopp","chirco","chilcoat","chevarie","cheslak","chernak","chay","chatterjee","chatten","chatagnier","chastin","chappuis","channey","champlain","chalupsky","chalfin","chaffer","chadek","chadderton","cestone","cestero","cestari","cerros","cermeno","centola","cedrone","cayouette","cavan","cavaliero","casuse","castricone","castoreno","casten","castanada","castagnola","casstevens","cassanova","caspari","casher","cashatt","casco","casassa","casad","carville","cartland","cartegena","carsey","carsen","carrino","carrilo","carpinteyro","carmley","carlston","carlsson","cariddi","caricofe","carel","cardy","carducci","carby","carangelo","capriotti","capria","caprario","capelo","canul","cantua","cantlow","canny","cangialosi","canepa","candland","campolo","campi","camors","camino","camfield","camelo","camarero","camaeho","calvano","calliste","caldarella","calcutt","calcano","caissie","cager","caccamo","cabotage","cabble","byman","buzby","butkowski","bussler","busico","bushovisky","busbin","busard","busalacchi","burtman","burrous","burridge","burrer","burno","burin","burgette","burdock","burdier","burckhard","bunten","bungay","bundage","bumby","bultema","bulinski","bulan","bukhari","buganski","buerkle","buen","buehl","budzynski","buckham","bryk","brydon","bruyere","brunsvold","brunnett","brunker","brunfield","brumble","brue","brozina","brossman","brosey","brookens","broersma","brodrick","brockmeier","brockhouse","brisky","brinkly","brincefield","brighenti","brigante","brieno","briede","bridenbaugh","brickett","breske","brener","brenchley","breitkreutz","breitbart","breister","breining","breighner","breidel","brehon","breheny","breard","breakell","brazill","braymiller","braum","brau","brashaw","bransom","brandolino","brancato","branagan","braff","brading","bracker","brackenbury","bracher","braasch","boylen","boyda","boyanton","bowlus","bowditch","boutot","bouthillette","boursiquot","bourjolly","bouret","boulerice","bouer","bouchillon","bouchie","bottin","boteilho","bosko","bosack","borys","bors","borla","borjon","borghi","borah","booten","boore","bonuz","bonne","bongers","boneta","bonawitz","bonanni","bomer","bollen","bollard","bolla","bolio","boisseau","boies","boiani","bohorquez","boghossian","boespflug","boeser","boehl","boegel","bodrick","bodkins","bodenstein","bodell","bockover","bocci","bobbs","boals","boahn","boadway","bluma","bluett","bloor","blomker","blevens","blethen","bleecker","blayney","blaske","blasetti","blancas","blackner","bjorkquist","bjerk","bizub","bisono","bisges","bisaillon","birr","birnie","bires","birdtail","birdine","bina","billock","billinger","billig","billet","bigwood","bigalk","bielicki","biddick","biccum","biafore","bhagat","beza","beyah","bevier","bevell","beute","betzer","betthauser","bethay","bethard","beshaw","bertholf","bertels","berridge","bernot","bernath","bernabei","berkson","berkovitz","berkich","bergsten","berget","berezny","berdin","beougher","benthin","benhaim","benenati","benejan","bemiss","beloate","bellucci","bellotti","belling","bellido","bellaire","bellafiore","bekins","bekele","beish","behnken","beerly","beddo","becket","becke","bebeau","beauchaine","beaucage","beadling","beacher","bazar","baysmore"]}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/entropy/entropyCalculator_test.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/entropy/entropyCalculator_test.go
deleted file mode 100644
index 594b9be7f2..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/entropy/entropyCalculator_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-package entropy
-
-import (
-	"github.com/nbutton23/zxcvbn-go/match"
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestDictionaryEntropyCalculation(t *testing.T) {
-	match := match.Match{
-		Pattern: "dictionary",
-		I:       0,
-		J:       4,
-		Token:   "first",
-	}
-
-	entropy := DictionaryEntropy(match, float64(20))
-
-	assert.Equal(t, 4.321928094887363, entropy)
-}
-
-func TestSpatialEntropyCalculation(t *testing.T) {
-	matchPlain := match.Match{
-		Pattern:        "spatial",
-		I:              0,
-		J:              5,
-		Token:          "asdfgh",
-		DictionaryName: "qwerty",
-	}
-	entropy := SpatialEntropy(matchPlain, 0, 0)
-	assert.Equal(t, 9.754887502163468, entropy)
-
-	matchShift := match.Match{
-		Pattern:        "spatial",
-		I:              0,
-		J:              5,
-		Token:          "asdFgh",
-		DictionaryName: "qwerty",
-	}
-	entropyShift := SpatialEntropy(matchShift, 0, 1)
-	assert.Equal(t, 12.562242424221072, entropyShift)
-
-	matchTurn := match.Match{
-		Pattern:        "spatial",
-		I:              0,
-		J:              5,
-		Token:          "asdcxz",
-		DictionaryName: "qwerty",
-	}
-	entropyTurn := SpatialEntropy(matchTurn, 2, 0)
-	assert.Equal(t, 14.080500893768884, entropyTurn)
-}
-
-func TestRepeatMatchEntropyCalculation(t *testing.T) {
-	matchRepeat := match.Match{
-		Pattern: "repeat",
-		I:       0,
-		J:       4,
-		Token:   "aaaaa",
-	}
-	entropy := RepeatEntropy(matchRepeat)
-	assert.Equal(t, 7.022367813028454, entropy)
-}
-
-func TestSequenceCalculation(t *testing.T) {
-	matchLower := match.Match{
-		Pattern: "sequence",
-		I:       0,
-		J:       4,
-		Token:   "jklmn",
-	}
-	entropy := SequenceEntropy(matchLower, len("abcdefghijklmnopqrstuvwxyz"), true)
-	assert.Equal(t, 7.022367813028454, entropy)
-
-	matchUpper := match.Match{
-		Pattern: "sequence",
-		I:       0,
-		J:       4,
-		Token:   "JKLMN",
-	}
-	entropy = SequenceEntropy(matchUpper, len("abcdefghijklmnopqrstuvwxyz"), true)
-	assert.Equal(t, 8.022367813028454, entropy)
-
-	matchUpperDec := match.Match{
-		Pattern: "sequence",
-		I:       0,
-		J:       4,
-		Token:   "JKLMN",
-	}
-	entropy = SequenceEntropy(matchUpperDec, len("abcdefghijklmnopqrstuvwxyz"), false)
-	assert.Equal(t, 9.022367813028454, entropy)
-
-	matchDigit := match.Match{
-		Pattern: "sequence",
-		I:       0,
-		J:       4,
-		Token:   "34567",
-	}
-	entropy = SequenceEntropy(matchDigit, 10, true)
-	assert.Equal(t, 5.643856189774724, entropy)
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/matching/matching_test.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/matching/matching_test.go
deleted file mode 100644
index d0763b54e6..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/matching/matching_test.go
+++ /dev/null
@@ -1,187 +0,0 @@
-package matching
-
-import (
-	"encoding/json"
-	"fmt"
-	"github.com/nbutton23/zxcvbn-go/match"
-	"github.com/stretchr/testify/assert"
-	"log"
-	"strings"
-	"testing"
-)
-
-//DateSepMatch("1991-09-11jibjab11.9.1991")
-//[{date 16 25  . 9 11 1991} {date 0 10  - 9 11 1991}]
-
-//TODO think about how to write this test. . .
-//func TestDateSepMatch(t *testing.T) {
-//	matches := dateSepMatchHelper("1991-09-11jibjab11.9.1991")
-//
-//	assert.Len(t, matches, 2, "Length should be 2")
-//
-//	for _, match := range matches {
-//		if match.Separator == "." {
-//			assert.Equal(t, 16, match.I)
-//			assert.Equal(t, 25, match.J)
-//			assert.Equal(t, int64(9), match.Day)
-//			assert.Equal(t, int64(11), match.Month)
-//			assert.Equal(t, int64(1991), match.Year)
-//		} else {
-//			assert.Equal(t, 0, match.I)
-//			assert.Equal(t, 10, match.J)
-//			assert.Equal(t, int64(9), match.Day)
-//			assert.Equal(t, int64(11), match.Month)
-//			assert.Equal(t, int64(1991), match.Year)
-//		}
-//	}
-//
-//}
-//
-func TestRepeatMatch(t *testing.T) {
-	//aaaBbBb
-	matches := repeatMatch("aaabBbB")
-
-	assert.Len(t, matches, 2, "Lenght should be 2")
-
-	for _, match := range matches {
-		if strings.ToLower(match.DictionaryName) == "b" {
-			assert.Equal(t, 3, match.I)
-			assert.Equal(t, 6, match.J)
-			assert.Equal(t, "bBbB", match.Token)
-			assert.NotZero(t, match.Entropy, "Entropy should be set")
-		} else {
-			assert.Equal(t, 0, match.I)
-			assert.Equal(t, 2, match.J)
-			assert.Equal(t, "aaa", match.Token)
-			assert.NotZero(t, match.Entropy, "Entropy should be set")
-
-		}
-	}
-}
-
-func TestSequenceMatch(t *testing.T) {
-	//abcdjibjacLMNOPjibjac1234  => abcd LMNOP 1234
-
-	matches := sequenceMatch("abcdjibjacLMNOPjibjac1234")
-	assert.Len(t, matches, 3, "Lenght should be 3")
-
-	for _, match := range matches {
-		if match.DictionaryName == "lower" {
-			assert.Equal(t, 0, match.I)
-			assert.Equal(t, 3, match.J)
-			assert.Equal(t, "abcd", match.Token)
-			assert.NotZero(t, match.Entropy, "Entropy should be set")
-		} else if match.DictionaryName == "upper" {
-			assert.Equal(t, 10, match.I)
-			assert.Equal(t, 14, match.J)
-			assert.Equal(t, "LMNOP", match.Token)
-			assert.NotZero(t, match.Entropy, "Entropy should be set")
-		} else if match.DictionaryName == "digits" {
-			assert.Equal(t, 21, match.I)
-			assert.Equal(t, 24, match.J)
-			assert.Equal(t, "1234", match.Token)
-			assert.NotZero(t, match.Entropy, "Entropy should be set")
-		} else {
-			assert.True(t, false, "Unknow dictionary")
-		}
-	}
-}
-
-func TestSpatialMatchQwerty(t *testing.T) {
-	matches := spatialMatch("qwerty")
-	assert.Len(t, matches, 1, "Lenght should be 1")
-	assert.NotZero(t, matches[0].Entropy, "Entropy should be set")
-
-	matches = spatialMatch("asdf")
-	assert.Len(t, matches, 1, "Lenght should be 1")
-	assert.NotZero(t, matches[0].Entropy, "Entropy should be set")
-
-}
-
-func TestSpatialMatchDvorak(t *testing.T) {
-	matches := spatialMatch("aoeuidhtns")
-	assert.Len(t, matches, 1, "Lenght should be 1")
-	assert.NotZero(t, matches[0].Entropy, "Entropy should be set")
-
-}
-
-func TestDictionaryMatch(t *testing.T) {
-	var matches []match.Match
-	for _, dicMatcher := range DICTIONARY_MATCHERS {
-		matchesTemp := dicMatcher.MatchingFunc("first")
-		matches = append(matches, matchesTemp...)
-	}
-
-	assert.Len(t, matches, 4, "Lenght should be 4")
-	for _, match := range matches {
-		assert.NotZero(t, match.Entropy, "Entropy should be set")
-
-	}
-
-}
-
-func TestDateWithoutSepMatch(t *testing.T) {
-	matches := dateWithoutSepMatch("11091991")
-	assert.Len(t, matches, 1, "Lenght should be 1")
-
-	matches = dateWithoutSepMatch("20010911")
-	assert.Len(t, matches, 1, "Lenght should be 1")
-	log.Println(matches)
-
-	//matches := dateWithoutSepMatch("110991")
-	//assert.Len(t, matches, 21, "Lenght should be blarg")
-}
-
-//l33t
-func TestLeetSubTable(t *testing.T) {
-	subs := relevantL33tSubtable("password")
-	assert.Len(t, subs, 0, "password should produce no leet subs")
-
-	subs = relevantL33tSubtable("p4ssw0rd")
-	assert.Len(t, subs, 2, "p4ssw0rd should produce 2 subs")
-
-	subs = relevantL33tSubtable("1eet")
-	assert.Len(t, subs, 2, "1eet should produce 2 subs")
-	assert.Equal(t, subs["i"][0], "1")
-	assert.Equal(t, subs["l"][0], "1")
-
-	subs = relevantL33tSubtable("4pple@pple")
-	assert.Len(t, subs, 1, "4pple@pple should produce 1 subs")
-	assert.Len(t, subs["a"], 2)
-
-}
-
-func TestPermutationsOfLeetSubstitutions(t *testing.T) {
-	password := "p4ssw0rd" //[passw0rd, password, p4ssword]
-	possibleSubs := relevantL33tSubtable(password)
-
-	permutations := getAllPermutationsOfLeetSubstitutions(password, possibleSubs)
-
-	assert.Len(t, permutations, 3, "There should be 3 permutations for "+password)
-
-	password = "p4$sw0rd" //[pa$sw0rd, passw0rd, password, pa$sword, p4ssw0rd, p4ssword, p4$sword]
-	possibleSubs = relevantL33tSubtable(password)
-
-	permutations = getAllPermutationsOfLeetSubstitutions(password, possibleSubs)
-	assert.Len(t, permutations, 7, "There should be 7 (? check my math) permutations for "+password)
-
-	password = "p4$$w0rd" //[pa$sw0rd, passw0rd, password, pa$sword, p4ssw0rd, p4ssword, p4$sword]
-	possibleSubs = relevantL33tSubtable(password)
-
-	permutations = getAllPermutationsOfLeetSubstitutions(password, possibleSubs)
-	assert.Len(t, permutations, 15, "Check my math 2*2*2*2 - 1 "+password)
-
-	password = "1337"
-	possibleSubs = relevantL33tSubtable(password)
-	permutations = getAllPermutationsOfLeetSubstitutions(password, possibleSubs)
-	assert.Len(t, permutations, 35, "check my math 3*2*2*3 -1 ")
-}
-
-func TestLeet(t *testing.T) {
-	password := "1337"
-	matches := l33tMatch(password)
-	bytes, _ := json.Marshal(matches)
-	fmt.Println(string(bytes))
-
-	fmt.Println(matches[0].J)
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/testapp/main.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/testapp/main.go
deleted file mode 100644
index e6d7fe6dd4..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/testapp/main.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/nbutton23/zxcvbn-go"
-)
-
-func main() {
-	password := "Testaaatyhg890l33t"
-
-	passwordStenght := zxcvbn.PasswordStrength(password, nil)
-
-	fmt.Printf(
-		`Password score    (0-4): %d
-Estimated entropy (bit): %f
-Estimated time to crack: %s%s`,
-		passwordStenght.Score,
-		passwordStenght.Entropy,
-		passwordStenght.CrackTimeDisplay, "\n",
-	)
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/utils/math/mathutils_test.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/utils/math/mathutils_test.go
deleted file mode 100644
index a085bd4c24..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/utils/math/mathutils_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package zxcvbn_math
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestNchoseK100and2(t *testing.T) {
-	nCk := NChoseK(100, 2)
-
-	assert.Equal(t, float64(4950), nCk, "100 chose 2 should equal 4950")
-}
-
-func TestNChoseKwereNlessK(t *testing.T) {
-	nCk := NChoseK(1, 2)
-
-	assert.Equal(t, float64(0), nCk, "When n is less than k always 0")
-}
-
-func TestNChoseKWereKis0(t *testing.T) {
-	nCk := NChoseK(50, 0)
-
-	assert.Equal(t, float64(1), nCk, "When K is 0 then 1")
-}
diff --git a/installer/vendor/github.com/nbutton23/zxcvbn-go/zxcvbn_test.go b/installer/vendor/github.com/nbutton23/zxcvbn-go/zxcvbn_test.go
deleted file mode 100644
index a25bd92c03..0000000000
--- a/installer/vendor/github.com/nbutton23/zxcvbn-go/zxcvbn_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package zxcvbn
-
-import (
-	"testing"
-
-	"fmt"
-	"math"
-	"strconv"
-)
-
-/**
-Use these test to see how close to feature parity the library is.
-*/
-
-const (
-	allowableError = float64(0.05)
-)
-
-type failedTest struct {
-	Password string
-	Expect   float64
-	Actual   float64
-	PError   float64
-}
-
-var failedTests []failedTest
-var numTestRan int
-
-func TestPasswordStrength(t *testing.T) {
-
-	//	Expected calculated by running zxcvbn-python
-	runTest(t, "zxcvbn", float64(6.845490050944376))
-	runTest(t, "Tr0ub4dour&3", float64(17.296))
-	runTest(t, "qwER43@!", float64(26.44))
-	runTest(t, "correcthorsebatterystaple", float64(45.212))
-	runTest(t, "coRrecth0rseba++ery9.23.2007staple$", float64(66.018))
-	runTest(t, "D0g..................", float64(20.678))
-	runTest(t, "abcdefghijk987654321", float64(11.951))
-	runTest(t, "neverforget", float64(2)) // I think this is wrong. . .
-	runTest(t, "13/3/1997", float64(2))   // I think this is wrong. . .
-	runTest(t, "neverforget13/3/1997", float64(32.628))
-	runTest(t, "1qaz2wsx3edc", float64(19.314))
-	runTest(t, "temppass22", float64(22.179))
-	runTest(t, "briansmith", float64(4.322))
-	runTest(t, "briansmith4mayor", float64(18.64))
-	runTest(t, "password1", float64(2.0))
-	runTest(t, "viking", float64(7.531))
-	runTest(t, "thx1138", float64(7.426))
-	runTest(t, "ScoRpi0ns", float64(20.621))
-	runTest(t, "do you know", float64(4.585))
-	runTest(t, "ryanhunter2000", float64(14.506))
-	runTest(t, "rianhunter2000", float64(21.734))
-	runTest(t, "asdfghju7654rewq", float64(29.782))
-	runTest(t, "AOEUIDHG&*()LS_", float64(33.254))
-	runTest(t, "12345678", float64(1.585))
-	runTest(t, "defghi6789", float64(12.607))
-	runTest(t, "rosebud", float64(7.937))
-	runTest(t, "Rosebud", float64(8.937))
-	runTest(t, "ROSEBUD", float64(8.937))
-	runTest(t, "rosebuD", float64(8.937))
-	runTest(t, "ros3bud99", float64(19.276))
-	runTest(t, "r0s3bud99", float64(19.276))
-	runTest(t, "R0$38uD99", float64(34.822))
-	runTest(t, "verlineVANDERMARK", float64(26.293))
-	runTest(t, "eheuczkqyq", float64(42.813))
-	runTest(t, "rWibMFACxAUGZmxhVncy", float64(104.551))
-	runTest(t, "Ba9ZyWABu99[BK#6MBgbH88Tofv)vs$", float64(161.278))
-
-	formatString := "%s : error should be less than %.2f \t Acctual error was: %.4f  \t Expected entropy %.4f \t Actual entropy %.4f \n"
-	for _, test := range failedTests {
-		fmt.Printf(formatString, test.Password, allowableError, test.PError, test.Expect, test.Actual)
-	}
-
-	pTestPassed := (float64(numTestRan-len(failedTests)) / float64(numTestRan)) * float64(100)
-
-	fmt.Println("\n % of the test passed " + strconv.FormatFloat(pTestPassed, 'f', -1, 64))
-
-}
-
-func runTest(t *testing.T, password string, pythonEntropy float64) {
-	//Calculated by running it through python-zxcvbn
-	goEntropy := GoPasswordStrength(password, nil)
-	perror := math.Abs(goEntropy-pythonEntropy) / pythonEntropy
-
-	numTestRan++
-	if perror > allowableError {
-		failedTests = append(failedTests, failedTest{Password: password, Expect: pythonEntropy, Actual: goEntropy, PError: perror})
-	}
-}
-
-func GoPasswordStrength(password string, userInputs []string) float64 {
-	return PasswordStrength(password, userInputs).Entropy
-}
diff --git a/installer/vendor/github.com/nightlyone/lockfile/.gitignore b/installer/vendor/github.com/nightlyone/lockfile/.gitignore
deleted file mode 100644
index 5a05665dee..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/.gitignore
+++ /dev/null
@@ -1,27 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# popular temporaries
-.err
-.out
-.diff
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
diff --git a/installer/vendor/github.com/nightlyone/lockfile/.gitmodules b/installer/vendor/github.com/nightlyone/lockfile/.gitmodules
deleted file mode 100644
index 6faa9e3469..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "git-hooks"]
-	path = git-hooks
-	url = https://github.com/nightlyone/git-hooks
diff --git a/installer/vendor/github.com/nightlyone/lockfile/.travis.yml b/installer/vendor/github.com/nightlyone/lockfile/.travis.yml
deleted file mode 100644
index 76e5962bf1..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/.travis.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-language: go
-go:
-  - 1.4.3
-  - 1.6.2
-  - tip
-
-# Only test commits to production branch and all pull requests
-branches:
-  only:
-    - master
-
-matrix:
-  allow_failures:
-  - go: tip
diff --git a/installer/vendor/github.com/nightlyone/lockfile/README.md b/installer/vendor/github.com/nightlyone/lockfile/README.md
deleted file mode 100644
index c35235cdae..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-lockfile
-=========
-Handle locking via pid files.
-
-[![Build Status Unix][1]][2]
-[![Build status Windows][3]][4]
-
-[1]: https://secure.travis-ci.org/nightlyone/lockfile.png
-[2]: https://travis-ci.org/nightlyone/lockfile
-[3]: https://ci.appveyor.com/api/projects/status/7mojkmauj81uvp8u/branch/master?svg=true
-[4]: https://ci.appveyor.com/project/nightlyone/lockfile/branch/master
-
-
-
-install
--------
-Install [Go 1][5], either [from source][6] or [with a prepackaged binary][7].
-For Windows suport, Go 1.4 or newer is required.
-
-Then run
-
-	go get github.com/nightlyone/lockfile
-
-[5]: http://golang.org
-[6]: http://golang.org/doc/install/source
-[7]: http://golang.org/doc/install
-
-LICENSE
--------
-MIT
-
-documentation
--------------
-[package documentation at godoc.org](http://godoc.org/github.com/nightlyone/lockfile)
-
-install
--------------------
-	go get github.com/nightlyone/lockfile
-
-
-contributing
-============
-
-Contributions are welcome. Please open an issue or send me a pull request for a dedicated branch.
-Make sure the git commit hooks show it works.
-
-git commit hooks
------------------------
-enable commit hooks via
-
-        cd .git ; rm -rf hooks; ln -s ../git-hooks hooks ; cd ..
-
diff --git a/installer/vendor/github.com/nightlyone/lockfile/appveyor.yml b/installer/vendor/github.com/nightlyone/lockfile/appveyor.yml
deleted file mode 100644
index cf72a58b13..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/appveyor.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-clone_folder: c:\gopath\src\github.com\nightlyone\lockfile
-
-environment:
-  GOPATH: c:\gopath
-
-install:
-  - go version
-  - go env
-  - go get -v -t ./...
-
-build_script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/nightlyone/lockfile/lockfile_test.go b/installer/vendor/github.com/nightlyone/lockfile/lockfile_test.go
deleted file mode 100644
index be2c821e21..0000000000
--- a/installer/vendor/github.com/nightlyone/lockfile/lockfile_test.go
+++ /dev/null
@@ -1,308 +0,0 @@
-package lockfile
-
-import (
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path/filepath"
-	"strconv"
-	"testing"
-)
-
-func ExampleLockfile() {
-	lock, err := New(filepath.Join(os.TempDir(), "lock.me.now.lck"))
-	if err != nil {
-		fmt.Printf("Cannot init lock. reason: %v", err)
-		panic(err) // handle properly please!
-	}
-	err = lock.TryLock()
-
-	// Error handling is essential, as we only try to get the lock.
-	if err != nil {
-		fmt.Printf("Cannot lock %q, reason: %v", lock, err)
-		panic(err) // handle properly please!
-	}
-
-	defer lock.Unlock()
-
-	fmt.Println("Do stuff under lock")
-	// Output: Do stuff under lock
-}
-
-func TestBasicLockUnlock(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		panic(err)
-	}
-
-	lf, err := New(path)
-	if err != nil {
-		t.Fail()
-		fmt.Println("Error making lockfile: ", err)
-		return
-	}
-
-	err = lf.TryLock()
-	if err != nil {
-		t.Fail()
-		fmt.Println("Error locking lockfile: ", err)
-		return
-	}
-
-	err = lf.Unlock()
-	if err != nil {
-		t.Fail()
-		fmt.Println("Error unlocking lockfile: ", err)
-		return
-	}
-}
-
-func GetDeadPID() int {
-	// I have no idea how windows handles large PIDs, or if they even exist.
-	// So limit it to be less or equal to 4096 to be safe.
-
-	const maxPid = 4095
-
-	// limited iteration, so we finish one day
-	seen := map[int]bool{}
-	for len(seen) < maxPid {
-		pid := rand.Intn(maxPid + 1) // see https://godoc.org/math/rand#Intn why
-		if seen[pid] {
-			continue
-		}
-		seen[pid] = true
-		running, err := isRunning(pid)
-		if err != nil {
-			fmt.Println("Error checking PID: ", err)
-			continue
-		}
-
-		if !running {
-			return pid
-		}
-	}
-	panic(fmt.Sprintf("all pids lower %d are used, cannot test this", maxPid))
-}
-
-func TestBusy(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	pid := os.Getppid()
-
-	if err := ioutil.WriteFile(path, []byte(strconv.Itoa(pid)+"\n"), 0666); err != nil {
-		t.Fatal(err)
-		return
-	}
-	defer os.Remove(path)
-
-	lf, err := New(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	got := lf.TryLock()
-	if got != ErrBusy {
-		t.Fatalf("expected error %q, got %v", ErrBusy, got)
-		return
-	}
-}
-
-func TestRogueDeletion(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	lf, err := New(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	err = lf.TryLock()
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	err = os.Remove(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	got := lf.Unlock()
-	if got != ErrRogueDeletion {
-		t.Fatalf("unexpected error: %v", got)
-		return
-	}
-}
-
-func TestRogueDeletionDeadPid(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	lf, err := New(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	err = lf.TryLock()
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	pid := GetDeadPID()
-	if err := ioutil.WriteFile(path, []byte(strconv.Itoa(pid)+"\n"), 0666); err != nil {
-		t.Fatal(err)
-		return
-	}
-	defer os.Remove(path)
-
-	err = lf.Unlock()
-	if err != ErrRogueDeletion {
-		t.Fatalf("unexpected error: %v", err)
-		return
-	}
-
-	if _, err := os.Stat(path); os.IsNotExist(err) {
-		t.Fatal("lockfile should not be deleted by us, if we didn't create it")
-	} else {
-		if err != nil {
-			t.Fatalf("unexpected error %v", err)
-		}
-	}
-}
-
-func TestRemovesStaleLockOnDeadOwner(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	lf, err := New(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	pid := GetDeadPID()
-	if err := ioutil.WriteFile(path, []byte(strconv.Itoa(pid)+"\n"), 0666); err != nil {
-		t.Fatal(err)
-		return
-	}
-	err = lf.TryLock()
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	if err := lf.Unlock(); err != nil {
-		t.Fatal(err)
-		return
-	}
-}
-
-func TestInvalidPidLeadToReplacedLockfileAndSuccess(t *testing.T) {
-	path, err := filepath.Abs("test_lockfile.pid")
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-	if err := ioutil.WriteFile(path, []byte("\n"), 0666); err != nil {
-		t.Fatal(err)
-		return
-	}
-	defer os.Remove(path)
-
-	lf, err := New(path)
-	if err != nil {
-		t.Fatal(err)
-		return
-	}
-
-	if err := lf.TryLock(); err != nil {
-		t.Fatalf("unexpected error: %v", err)
-		return
-	}
-
-	// now check if file exists and contains the correct content
-	got, err := ioutil.ReadFile(path)
-	if err != nil {
-		t.Fatalf("unexpected error %v", err)
-		return
-	}
-	want := fmt.Sprintf("%d\n", os.Getpid())
-	if string(got) != want {
-		t.Fatalf("got %q, want %q", got, want)
-	}
-}
-
-func TestScanPidLine(t *testing.T) {
-	tests := [...]struct {
-		input []byte
-		pid   int
-		xfail error
-	}{
-		{
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte(""),
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte("\n"),
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte("-1\n"),
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte("0\n"),
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte("a\n"),
-			xfail: ErrInvalidPid,
-		},
-		{
-			input: []byte("1\n"),
-			pid:   1,
-		},
-	}
-
-	// test positive cases first
-	for step, tc := range tests {
-		if tc.xfail != nil {
-			continue
-		}
-		want := tc.pid
-		got, err := scanPidLine(tc.input)
-		if err != nil {
-			t.Fatalf("%d: unexpected error %v", step, err)
-		}
-		if got != want {
-			t.Errorf("%d: expected pid %d, got %d", step, want, got)
-		}
-	}
-
-	// test negative cases now
-	for step, tc := range tests {
-		if tc.xfail == nil {
-			continue
-		}
-		want := tc.xfail
-		_, got := scanPidLine(tc.input)
-		if got != want {
-			t.Errorf("%d: expected error %v, got %v", step, want, got)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/README.md b/installer/vendor/github.com/nsf/termbox-go/README.md
deleted file mode 100644
index 51744353c9..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/README.md
+++ /dev/null
@@ -1,32 +0,0 @@
-## Termbox
-Termbox is a library that provides a minimalistic API which allows the programmer to write text-based user interfaces. The library is crossplatform and has both terminal-based implementations on *nix operating systems and a winapi console based implementation for windows operating systems. The basic idea is an abstraction of the greatest common subset of features available on all major terminals and other terminal-like APIs in a minimalistic fashion. Small API means it is easy to implement, test, maintain and learn it, that's what makes the termbox a distinct library in its area.
-
-### Installation
-Install and update this go package with `go get -u github.com/nsf/termbox-go`
-
-### Examples
-For examples of what can be done take a look at demos in the _demos directory. You can try them with go run: `go run _demos/keyboard.go`
-
-There are also some interesting projects using termbox-go:
- - [godit](https://github.com/nsf/godit) is an emacsish lightweight text editor written using termbox.
- - [gomatrix](https://github.com/GeertJohan/gomatrix) connects to The Matrix and displays its data streams in your terminal.
- - [gotetris](https://github.com/jjinux/gotetris) is an implementation of Tetris.
- - [sokoban-go](https://github.com/rn2dy/sokoban-go) is an implementation of sokoban game.
- - [hecate](https://github.com/evanmiller/hecate) is a hex editor designed by Satan.
- - [httopd](https://github.com/verdverm/httopd) is top for httpd logs.
- - [mop](https://github.com/michaeldv/mop) is stock market tracker for hackers.
- - [termui](https://github.com/gizak/termui) is a terminal dashboard.
- - [termloop](https://github.com/JoelOtter/termloop) is a terminal game engine.
- - [xterm-color-chart](https://github.com/kutuluk/xterm-color-chart) is a XTerm 256 color chart.
- - [gocui](https://github.com/jroimartin/gocui) is a minimalist Go library aimed at creating console user interfaces.
- - [dry](https://github.com/moncho/dry) is an interactive cli to manage Docker containers.
- - [pxl](https://github.com/ichinaski/pxl) displays images in the terminal.
- - [snake-game](https://github.com/DyegoCosta/snake-game) is an implementation of the Snake game.
- - [gone](https://github.com/guillaumebreton/gone) is a CLI pomodoro® timer.
- - [Spoof.go](https://github.com/sabey/spoofgo) controllable movement spoofing from the cli
- - [lf](https://github.com/gokcehan/lf) is a terminal file manager
- - [rat](https://github.com/ericfreese/rat) lets you compose shell commands to build terminal applications.
- - [httplab](https://github.com/gchaincl/httplab) An interactive web server.
-
-### API reference
-[godoc.org/github.com/nsf/termbox-go](http://godoc.org/github.com/nsf/termbox-go)
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/editbox.go b/installer/vendor/github.com/nsf/termbox-go/_demos/editbox.go
deleted file mode 100644
index e429080d31..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/editbox.go
+++ /dev/null
@@ -1,300 +0,0 @@
-package main
-
-import (
-	"github.com/mattn/go-runewidth"
-	"github.com/nsf/termbox-go"
-	"unicode/utf8"
-)
-
-func tbprint(x, y int, fg, bg termbox.Attribute, msg string) {
-	for _, c := range msg {
-		termbox.SetCell(x, y, c, fg, bg)
-		x += runewidth.RuneWidth(c)
-	}
-}
-
-func fill(x, y, w, h int, cell termbox.Cell) {
-	for ly := 0; ly < h; ly++ {
-		for lx := 0; lx < w; lx++ {
-			termbox.SetCell(x+lx, y+ly, cell.Ch, cell.Fg, cell.Bg)
-		}
-	}
-}
-
-func rune_advance_len(r rune, pos int) int {
-	if r == '\t' {
-		return tabstop_length - pos%tabstop_length
-	}
-	return runewidth.RuneWidth(r)
-}
-
-func voffset_coffset(text []byte, boffset int) (voffset, coffset int) {
-	text = text[:boffset]
-	for len(text) > 0 {
-		r, size := utf8.DecodeRune(text)
-		text = text[size:]
-		coffset += 1
-		voffset += rune_advance_len(r, voffset)
-	}
-	return
-}
-
-func byte_slice_grow(s []byte, desired_cap int) []byte {
-	if cap(s) < desired_cap {
-		ns := make([]byte, len(s), desired_cap)
-		copy(ns, s)
-		return ns
-	}
-	return s
-}
-
-func byte_slice_remove(text []byte, from, to int) []byte {
-	size := to - from
-	copy(text[from:], text[to:])
-	text = text[:len(text)-size]
-	return text
-}
-
-func byte_slice_insert(text []byte, offset int, what []byte) []byte {
-	n := len(text) + len(what)
-	text = byte_slice_grow(text, n)
-	text = text[:n]
-	copy(text[offset+len(what):], text[offset:])
-	copy(text[offset:], what)
-	return text
-}
-
-const preferred_horizontal_threshold = 5
-const tabstop_length = 8
-
-type EditBox struct {
-	text           []byte
-	line_voffset   int
-	cursor_boffset int // cursor offset in bytes
-	cursor_voffset int // visual cursor offset in termbox cells
-	cursor_coffset int // cursor offset in unicode code points
-}
-
-// Draws the EditBox in the given location, 'h' is not used at the moment
-func (eb *EditBox) Draw(x, y, w, h int) {
-	eb.AdjustVOffset(w)
-
-	const coldef = termbox.ColorDefault
-	fill(x, y, w, h, termbox.Cell{Ch: ' '})
-
-	t := eb.text
-	lx := 0
-	tabstop := 0
-	for {
-		rx := lx - eb.line_voffset
-		if len(t) == 0 {
-			break
-		}
-
-		if lx == tabstop {
-			tabstop += tabstop_length
-		}
-
-		if rx >= w {
-			termbox.SetCell(x+w-1, y, '→',
-				coldef, coldef)
-			break
-		}
-
-		r, size := utf8.DecodeRune(t)
-		if r == '\t' {
-			for ; lx < tabstop; lx++ {
-				rx = lx - eb.line_voffset
-				if rx >= w {
-					goto next
-				}
-
-				if rx >= 0 {
-					termbox.SetCell(x+rx, y, ' ', coldef, coldef)
-				}
-			}
-		} else {
-			if rx >= 0 {
-				termbox.SetCell(x+rx, y, r, coldef, coldef)
-			}
-			lx += runewidth.RuneWidth(r)
-		}
-	next:
-		t = t[size:]
-	}
-
-	if eb.line_voffset != 0 {
-		termbox.SetCell(x, y, '←', coldef, coldef)
-	}
-}
-
-// Adjusts line visual offset to a proper value depending on width
-func (eb *EditBox) AdjustVOffset(width int) {
-	ht := preferred_horizontal_threshold
-	max_h_threshold := (width - 1) / 2
-	if ht > max_h_threshold {
-		ht = max_h_threshold
-	}
-
-	threshold := width - 1
-	if eb.line_voffset != 0 {
-		threshold = width - ht
-	}
-	if eb.cursor_voffset-eb.line_voffset >= threshold {
-		eb.line_voffset = eb.cursor_voffset + (ht - width + 1)
-	}
-
-	if eb.line_voffset != 0 && eb.cursor_voffset-eb.line_voffset < ht {
-		eb.line_voffset = eb.cursor_voffset - ht
-		if eb.line_voffset < 0 {
-			eb.line_voffset = 0
-		}
-	}
-}
-
-func (eb *EditBox) MoveCursorTo(boffset int) {
-	eb.cursor_boffset = boffset
-	eb.cursor_voffset, eb.cursor_coffset = voffset_coffset(eb.text, boffset)
-}
-
-func (eb *EditBox) RuneUnderCursor() (rune, int) {
-	return utf8.DecodeRune(eb.text[eb.cursor_boffset:])
-}
-
-func (eb *EditBox) RuneBeforeCursor() (rune, int) {
-	return utf8.DecodeLastRune(eb.text[:eb.cursor_boffset])
-}
-
-func (eb *EditBox) MoveCursorOneRuneBackward() {
-	if eb.cursor_boffset == 0 {
-		return
-	}
-	_, size := eb.RuneBeforeCursor()
-	eb.MoveCursorTo(eb.cursor_boffset - size)
-}
-
-func (eb *EditBox) MoveCursorOneRuneForward() {
-	if eb.cursor_boffset == len(eb.text) {
-		return
-	}
-	_, size := eb.RuneUnderCursor()
-	eb.MoveCursorTo(eb.cursor_boffset + size)
-}
-
-func (eb *EditBox) MoveCursorToBeginningOfTheLine() {
-	eb.MoveCursorTo(0)
-}
-
-func (eb *EditBox) MoveCursorToEndOfTheLine() {
-	eb.MoveCursorTo(len(eb.text))
-}
-
-func (eb *EditBox) DeleteRuneBackward() {
-	if eb.cursor_boffset == 0 {
-		return
-	}
-
-	eb.MoveCursorOneRuneBackward()
-	_, size := eb.RuneUnderCursor()
-	eb.text = byte_slice_remove(eb.text, eb.cursor_boffset, eb.cursor_boffset+size)
-}
-
-func (eb *EditBox) DeleteRuneForward() {
-	if eb.cursor_boffset == len(eb.text) {
-		return
-	}
-	_, size := eb.RuneUnderCursor()
-	eb.text = byte_slice_remove(eb.text, eb.cursor_boffset, eb.cursor_boffset+size)
-}
-
-func (eb *EditBox) DeleteTheRestOfTheLine() {
-	eb.text = eb.text[:eb.cursor_boffset]
-}
-
-func (eb *EditBox) InsertRune(r rune) {
-	var buf [utf8.UTFMax]byte
-	n := utf8.EncodeRune(buf[:], r)
-	eb.text = byte_slice_insert(eb.text, eb.cursor_boffset, buf[:n])
-	eb.MoveCursorOneRuneForward()
-}
-
-// Please, keep in mind that cursor depends on the value of line_voffset, which
-// is being set on Draw() call, so.. call this method after Draw() one.
-func (eb *EditBox) CursorX() int {
-	return eb.cursor_voffset - eb.line_voffset
-}
-
-var edit_box EditBox
-
-const edit_box_width = 30
-
-func redraw_all() {
-	const coldef = termbox.ColorDefault
-	termbox.Clear(coldef, coldef)
-	w, h := termbox.Size()
-
-	midy := h / 2
-	midx := (w - edit_box_width) / 2
-
-	// unicode box drawing chars around the edit box
-	termbox.SetCell(midx-1, midy, '│', coldef, coldef)
-	termbox.SetCell(midx+edit_box_width, midy, '│', coldef, coldef)
-	termbox.SetCell(midx-1, midy-1, '┌', coldef, coldef)
-	termbox.SetCell(midx-1, midy+1, '└', coldef, coldef)
-	termbox.SetCell(midx+edit_box_width, midy-1, '┐', coldef, coldef)
-	termbox.SetCell(midx+edit_box_width, midy+1, '┘', coldef, coldef)
-	fill(midx, midy-1, edit_box_width, 1, termbox.Cell{Ch: '─'})
-	fill(midx, midy+1, edit_box_width, 1, termbox.Cell{Ch: '─'})
-
-	edit_box.Draw(midx, midy, edit_box_width, 1)
-	termbox.SetCursor(midx+edit_box.CursorX(), midy)
-
-	tbprint(midx+6, midy+3, coldef, coldef, "Press ESC to quit")
-	termbox.Flush()
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-	termbox.SetInputMode(termbox.InputEsc)
-
-	redraw_all()
-mainloop:
-	for {
-		switch ev := termbox.PollEvent(); ev.Type {
-		case termbox.EventKey:
-			switch ev.Key {
-			case termbox.KeyEsc:
-				break mainloop
-			case termbox.KeyArrowLeft, termbox.KeyCtrlB:
-				edit_box.MoveCursorOneRuneBackward()
-			case termbox.KeyArrowRight, termbox.KeyCtrlF:
-				edit_box.MoveCursorOneRuneForward()
-			case termbox.KeyBackspace, termbox.KeyBackspace2:
-				edit_box.DeleteRuneBackward()
-			case termbox.KeyDelete, termbox.KeyCtrlD:
-				edit_box.DeleteRuneForward()
-			case termbox.KeyTab:
-				edit_box.InsertRune('\t')
-			case termbox.KeySpace:
-				edit_box.InsertRune(' ')
-			case termbox.KeyCtrlK:
-				edit_box.DeleteTheRestOfTheLine()
-			case termbox.KeyHome, termbox.KeyCtrlA:
-				edit_box.MoveCursorToBeginningOfTheLine()
-			case termbox.KeyEnd, termbox.KeyCtrlE:
-				edit_box.MoveCursorToEndOfTheLine()
-			default:
-				if ev.Ch != 0 {
-					edit_box.InsertRune(ev.Ch)
-				}
-			}
-		case termbox.EventError:
-			panic(ev.Err)
-		}
-		redraw_all()
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/interrupt.go b/installer/vendor/github.com/nsf/termbox-go/_demos/interrupt.go
deleted file mode 100644
index 55345219fd..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/interrupt.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/nsf/termbox-go"
-	"time"
-)
-
-func tbPrint(x, y int, fg, bg termbox.Attribute, msg string) {
-	for _, c := range msg {
-		termbox.SetCell(x, y, c, fg, bg)
-		x++
-	}
-}
-
-func draw(i int) {
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-	defer termbox.Flush()
-
-	w, h := termbox.Size()
-	s := fmt.Sprintf("count = %d", i)
-
-	tbPrint((w/2)-(len(s)/2), h/2, termbox.ColorRed, termbox.ColorDefault, s)
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	termbox.SetInputMode(termbox.InputEsc)
-
-	go func() {
-		time.Sleep(5 * time.Second)
-		termbox.Interrupt()
-
-		// This should never run - the Interrupt(), above, should cause the event
-		// loop below to exit, which then exits the process.  If something goes
-		// wrong, this panic will trigger and show what happened.
-		time.Sleep(1 * time.Second)
-		panic("this should never run")
-	}()
-
-	var count int
-
-	draw(count)
-mainloop:
-	for {
-		switch ev := termbox.PollEvent(); ev.Type {
-		case termbox.EventKey:
-			if ev.Ch == '+' {
-				count++
-			} else if ev.Ch == '-' {
-				count--
-			}
-
-		case termbox.EventError:
-			panic(ev.Err)
-
-		case termbox.EventInterrupt:
-			break mainloop
-		}
-
-		draw(count)
-	}
-	termbox.Close()
-
-	fmt.Println("Finished")
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/keyboard.go b/installer/vendor/github.com/nsf/termbox-go/_demos/keyboard.go
deleted file mode 100644
index b6a258e4ca..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/keyboard.go
+++ /dev/null
@@ -1,722 +0,0 @@
-package main
-
-import "github.com/nsf/termbox-go"
-import "fmt"
-
-type key struct {
-	x  int
-	y  int
-	ch rune
-}
-
-var K_ESC = []key{{1, 1, 'E'}, {2, 1, 'S'}, {3, 1, 'C'}}
-var K_F1 = []key{{6, 1, 'F'}, {7, 1, '1'}}
-var K_F2 = []key{{9, 1, 'F'}, {10, 1, '2'}}
-var K_F3 = []key{{12, 1, 'F'}, {13, 1, '3'}}
-var K_F4 = []key{{15, 1, 'F'}, {16, 1, '4'}}
-var K_F5 = []key{{19, 1, 'F'}, {20, 1, '5'}}
-var K_F6 = []key{{22, 1, 'F'}, {23, 1, '6'}}
-var K_F7 = []key{{25, 1, 'F'}, {26, 1, '7'}}
-var K_F8 = []key{{28, 1, 'F'}, {29, 1, '8'}}
-var K_F9 = []key{{33, 1, 'F'}, {34, 1, '9'}}
-var K_F10 = []key{{36, 1, 'F'}, {37, 1, '1'}, {38, 1, '0'}}
-var K_F11 = []key{{40, 1, 'F'}, {41, 1, '1'}, {42, 1, '1'}}
-var K_F12 = []key{{44, 1, 'F'}, {45, 1, '1'}, {46, 1, '2'}}
-var K_PRN = []key{{50, 1, 'P'}, {51, 1, 'R'}, {52, 1, 'N'}}
-var K_SCR = []key{{54, 1, 'S'}, {55, 1, 'C'}, {56, 1, 'R'}}
-var K_BRK = []key{{58, 1, 'B'}, {59, 1, 'R'}, {60, 1, 'K'}}
-var K_LED1 = []key{{66, 1, '-'}}
-var K_LED2 = []key{{70, 1, '-'}}
-var K_LED3 = []key{{74, 1, '-'}}
-var K_TILDE = []key{{1, 4, '`'}}
-var K_TILDE_SHIFT = []key{{1, 4, '~'}}
-var K_1 = []key{{4, 4, '1'}}
-var K_1_SHIFT = []key{{4, 4, '!'}}
-var K_2 = []key{{7, 4, '2'}}
-var K_2_SHIFT = []key{{7, 4, '@'}}
-var K_3 = []key{{10, 4, '3'}}
-var K_3_SHIFT = []key{{10, 4, '#'}}
-var K_4 = []key{{13, 4, '4'}}
-var K_4_SHIFT = []key{{13, 4, '$'}}
-var K_5 = []key{{16, 4, '5'}}
-var K_5_SHIFT = []key{{16, 4, '%'}}
-var K_6 = []key{{19, 4, '6'}}
-var K_6_SHIFT = []key{{19, 4, '^'}}
-var K_7 = []key{{22, 4, '7'}}
-var K_7_SHIFT = []key{{22, 4, '&'}}
-var K_8 = []key{{25, 4, '8'}}
-var K_8_SHIFT = []key{{25, 4, '*'}}
-var K_9 = []key{{28, 4, '9'}}
-var K_9_SHIFT = []key{{28, 4, '('}}
-var K_0 = []key{{31, 4, '0'}}
-var K_0_SHIFT = []key{{31, 4, ')'}}
-var K_MINUS = []key{{34, 4, '-'}}
-var K_MINUS_SHIFT = []key{{34, 4, '_'}}
-var K_EQUALS = []key{{37, 4, '='}}
-var K_EQUALS_SHIFT = []key{{37, 4, '+'}}
-var K_BACKSLASH = []key{{40, 4, '\\'}}
-var K_BACKSLASH_SHIFT = []key{{40, 4, '|'}}
-var K_BACKSPACE = []key{{44, 4, 0x2190}, {45, 4, 0x2500}, {46, 4, 0x2500}}
-var K_INS = []key{{50, 4, 'I'}, {51, 4, 'N'}, {52, 4, 'S'}}
-var K_HOM = []key{{54, 4, 'H'}, {55, 4, 'O'}, {56, 4, 'M'}}
-var K_PGU = []key{{58, 4, 'P'}, {59, 4, 'G'}, {60, 4, 'U'}}
-var K_K_NUMLOCK = []key{{65, 4, 'N'}}
-var K_K_SLASH = []key{{68, 4, '/'}}
-var K_K_STAR = []key{{71, 4, '*'}}
-var K_K_MINUS = []key{{74, 4, '-'}}
-var K_TAB = []key{{1, 6, 'T'}, {2, 6, 'A'}, {3, 6, 'B'}}
-var K_q = []key{{6, 6, 'q'}}
-var K_Q = []key{{6, 6, 'Q'}}
-var K_w = []key{{9, 6, 'w'}}
-var K_W = []key{{9, 6, 'W'}}
-var K_e = []key{{12, 6, 'e'}}
-var K_E = []key{{12, 6, 'E'}}
-var K_r = []key{{15, 6, 'r'}}
-var K_R = []key{{15, 6, 'R'}}
-var K_t = []key{{18, 6, 't'}}
-var K_T = []key{{18, 6, 'T'}}
-var K_y = []key{{21, 6, 'y'}}
-var K_Y = []key{{21, 6, 'Y'}}
-var K_u = []key{{24, 6, 'u'}}
-var K_U = []key{{24, 6, 'U'}}
-var K_i = []key{{27, 6, 'i'}}
-var K_I = []key{{27, 6, 'I'}}
-var K_o = []key{{30, 6, 'o'}}
-var K_O = []key{{30, 6, 'O'}}
-var K_p = []key{{33, 6, 'p'}}
-var K_P = []key{{33, 6, 'P'}}
-var K_LSQB = []key{{36, 6, '['}}
-var K_LCUB = []key{{36, 6, '{'}}
-var K_RSQB = []key{{39, 6, ']'}}
-var K_RCUB = []key{{39, 6, '}'}}
-var K_ENTER = []key{
-	{43, 6, 0x2591}, {44, 6, 0x2591}, {45, 6, 0x2591}, {46, 6, 0x2591},
-	{43, 7, 0x2591}, {44, 7, 0x2591}, {45, 7, 0x21B5}, {46, 7, 0x2591},
-	{41, 8, 0x2591}, {42, 8, 0x2591}, {43, 8, 0x2591}, {44, 8, 0x2591},
-	{45, 8, 0x2591}, {46, 8, 0x2591},
-}
-var K_DEL = []key{{50, 6, 'D'}, {51, 6, 'E'}, {52, 6, 'L'}}
-var K_END = []key{{54, 6, 'E'}, {55, 6, 'N'}, {56, 6, 'D'}}
-var K_PGD = []key{{58, 6, 'P'}, {59, 6, 'G'}, {60, 6, 'D'}}
-var K_K_7 = []key{{65, 6, '7'}}
-var K_K_8 = []key{{68, 6, '8'}}
-var K_K_9 = []key{{71, 6, '9'}}
-var K_K_PLUS = []key{{74, 6, ' '}, {74, 7, '+'}, {74, 8, ' '}}
-var K_CAPS = []key{{1, 8, 'C'}, {2, 8, 'A'}, {3, 8, 'P'}, {4, 8, 'S'}}
-var K_a = []key{{7, 8, 'a'}}
-var K_A = []key{{7, 8, 'A'}}
-var K_s = []key{{10, 8, 's'}}
-var K_S = []key{{10, 8, 'S'}}
-var K_d = []key{{13, 8, 'd'}}
-var K_D = []key{{13, 8, 'D'}}
-var K_f = []key{{16, 8, 'f'}}
-var K_F = []key{{16, 8, 'F'}}
-var K_g = []key{{19, 8, 'g'}}
-var K_G = []key{{19, 8, 'G'}}
-var K_h = []key{{22, 8, 'h'}}
-var K_H = []key{{22, 8, 'H'}}
-var K_j = []key{{25, 8, 'j'}}
-var K_J = []key{{25, 8, 'J'}}
-var K_k = []key{{28, 8, 'k'}}
-var K_K = []key{{28, 8, 'K'}}
-var K_l = []key{{31, 8, 'l'}}
-var K_L = []key{{31, 8, 'L'}}
-var K_SEMICOLON = []key{{34, 8, ';'}}
-var K_PARENTHESIS = []key{{34, 8, ':'}}
-var K_QUOTE = []key{{37, 8, '\''}}
-var K_DOUBLEQUOTE = []key{{37, 8, '"'}}
-var K_K_4 = []key{{65, 8, '4'}}
-var K_K_5 = []key{{68, 8, '5'}}
-var K_K_6 = []key{{71, 8, '6'}}
-var K_LSHIFT = []key{{1, 10, 'S'}, {2, 10, 'H'}, {3, 10, 'I'}, {4, 10, 'F'}, {5, 10, 'T'}}
-var K_z = []key{{9, 10, 'z'}}
-var K_Z = []key{{9, 10, 'Z'}}
-var K_x = []key{{12, 10, 'x'}}
-var K_X = []key{{12, 10, 'X'}}
-var K_c = []key{{15, 10, 'c'}}
-var K_C = []key{{15, 10, 'C'}}
-var K_v = []key{{18, 10, 'v'}}
-var K_V = []key{{18, 10, 'V'}}
-var K_b = []key{{21, 10, 'b'}}
-var K_B = []key{{21, 10, 'B'}}
-var K_n = []key{{24, 10, 'n'}}
-var K_N = []key{{24, 10, 'N'}}
-var K_m = []key{{27, 10, 'm'}}
-var K_M = []key{{27, 10, 'M'}}
-var K_COMMA = []key{{30, 10, ','}}
-var K_LANB = []key{{30, 10, '<'}}
-var K_PERIOD = []key{{33, 10, '.'}}
-var K_RANB = []key{{33, 10, '>'}}
-var K_SLASH = []key{{36, 10, '/'}}
-var K_QUESTION = []key{{36, 10, '?'}}
-var K_RSHIFT = []key{{42, 10, 'S'}, {43, 10, 'H'}, {44, 10, 'I'}, {45, 10, 'F'}, {46, 10, 'T'}}
-var K_ARROW_UP = []key{{54, 10, '('}, {55, 10, 0x2191}, {56, 10, ')'}}
-var K_K_1 = []key{{65, 10, '1'}}
-var K_K_2 = []key{{68, 10, '2'}}
-var K_K_3 = []key{{71, 10, '3'}}
-var K_K_ENTER = []key{{74, 10, 0x2591}, {74, 11, 0x2591}, {74, 12, 0x2591}}
-var K_LCTRL = []key{{1, 12, 'C'}, {2, 12, 'T'}, {3, 12, 'R'}, {4, 12, 'L'}}
-var K_LWIN = []key{{6, 12, 'W'}, {7, 12, 'I'}, {8, 12, 'N'}}
-var K_LALT = []key{{10, 12, 'A'}, {11, 12, 'L'}, {12, 12, 'T'}}
-var K_SPACE = []key{
-	{14, 12, ' '}, {15, 12, ' '}, {16, 12, ' '}, {17, 12, ' '}, {18, 12, ' '},
-	{19, 12, 'S'}, {20, 12, 'P'}, {21, 12, 'A'}, {22, 12, 'C'}, {23, 12, 'E'},
-	{24, 12, ' '}, {25, 12, ' '}, {26, 12, ' '}, {27, 12, ' '}, {28, 12, ' '},
-}
-var K_RALT = []key{{30, 12, 'A'}, {31, 12, 'L'}, {32, 12, 'T'}}
-var K_RWIN = []key{{34, 12, 'W'}, {35, 12, 'I'}, {36, 12, 'N'}}
-var K_RPROP = []key{{38, 12, 'P'}, {39, 12, 'R'}, {40, 12, 'O'}, {41, 12, 'P'}}
-var K_RCTRL = []key{{43, 12, 'C'}, {44, 12, 'T'}, {45, 12, 'R'}, {46, 12, 'L'}}
-var K_ARROW_LEFT = []key{{50, 12, '('}, {51, 12, 0x2190}, {52, 12, ')'}}
-var K_ARROW_DOWN = []key{{54, 12, '('}, {55, 12, 0x2193}, {56, 12, ')'}}
-var K_ARROW_RIGHT = []key{{58, 12, '('}, {59, 12, 0x2192}, {60, 12, ')'}}
-var K_K_0 = []key{{65, 12, ' '}, {66, 12, '0'}, {67, 12, ' '}, {68, 12, ' '}}
-var K_K_PERIOD = []key{{71, 12, '.'}}
-
-type combo struct {
-	keys [][]key
-}
-
-var combos = []combo{
-	{[][]key{K_TILDE, K_2, K_SPACE, K_LCTRL, K_RCTRL}},
-	{[][]key{K_A, K_LCTRL, K_RCTRL}},
-	{[][]key{K_B, K_LCTRL, K_RCTRL}},
-	{[][]key{K_C, K_LCTRL, K_RCTRL}},
-	{[][]key{K_D, K_LCTRL, K_RCTRL}},
-	{[][]key{K_E, K_LCTRL, K_RCTRL}},
-	{[][]key{K_F, K_LCTRL, K_RCTRL}},
-	{[][]key{K_G, K_LCTRL, K_RCTRL}},
-	{[][]key{K_H, K_BACKSPACE, K_LCTRL, K_RCTRL}},
-	{[][]key{K_I, K_TAB, K_LCTRL, K_RCTRL}},
-	{[][]key{K_J, K_LCTRL, K_RCTRL}},
-	{[][]key{K_K, K_LCTRL, K_RCTRL}},
-	{[][]key{K_L, K_LCTRL, K_RCTRL}},
-	{[][]key{K_M, K_ENTER, K_K_ENTER, K_LCTRL, K_RCTRL}},
-	{[][]key{K_N, K_LCTRL, K_RCTRL}},
-	{[][]key{K_O, K_LCTRL, K_RCTRL}},
-	{[][]key{K_P, K_LCTRL, K_RCTRL}},
-	{[][]key{K_Q, K_LCTRL, K_RCTRL}},
-	{[][]key{K_R, K_LCTRL, K_RCTRL}},
-	{[][]key{K_S, K_LCTRL, K_RCTRL}},
-	{[][]key{K_T, K_LCTRL, K_RCTRL}},
-	{[][]key{K_U, K_LCTRL, K_RCTRL}},
-	{[][]key{K_V, K_LCTRL, K_RCTRL}},
-	{[][]key{K_W, K_LCTRL, K_RCTRL}},
-	{[][]key{K_X, K_LCTRL, K_RCTRL}},
-	{[][]key{K_Y, K_LCTRL, K_RCTRL}},
-	{[][]key{K_Z, K_LCTRL, K_RCTRL}},
-	{[][]key{K_LSQB, K_ESC, K_3, K_LCTRL, K_RCTRL}},
-	{[][]key{K_4, K_BACKSLASH, K_LCTRL, K_RCTRL}},
-	{[][]key{K_RSQB, K_5, K_LCTRL, K_RCTRL}},
-	{[][]key{K_6, K_LCTRL, K_RCTRL}},
-	{[][]key{K_7, K_SLASH, K_MINUS_SHIFT, K_LCTRL, K_RCTRL}},
-	{[][]key{K_SPACE}},
-	{[][]key{K_1_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_DOUBLEQUOTE, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_3_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_4_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_5_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_7_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_QUOTE}},
-	{[][]key{K_9_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_0_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_8_SHIFT, K_K_STAR, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_EQUALS_SHIFT, K_K_PLUS, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_COMMA}},
-	{[][]key{K_MINUS, K_K_MINUS}},
-	{[][]key{K_PERIOD, K_K_PERIOD}},
-	{[][]key{K_SLASH, K_K_SLASH}},
-	{[][]key{K_0, K_K_0}},
-	{[][]key{K_1, K_K_1}},
-	{[][]key{K_2, K_K_2}},
-	{[][]key{K_3, K_K_3}},
-	{[][]key{K_4, K_K_4}},
-	{[][]key{K_5, K_K_5}},
-	{[][]key{K_6, K_K_6}},
-	{[][]key{K_7, K_K_7}},
-	{[][]key{K_8, K_K_8}},
-	{[][]key{K_9, K_K_9}},
-	{[][]key{K_PARENTHESIS, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_SEMICOLON}},
-	{[][]key{K_LANB, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_EQUALS}},
-	{[][]key{K_RANB, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_QUESTION, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_2_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_A, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_B, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_C, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_D, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_E, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_F, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_G, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_H, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_I, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_J, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_K, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_L, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_M, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_N, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_O, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_P, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_Q, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_R, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_S, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_T, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_U, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_V, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_W, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_X, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_Y, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_Z, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_LSQB}},
-	{[][]key{K_BACKSLASH}},
-	{[][]key{K_RSQB}},
-	{[][]key{K_6_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_MINUS_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_TILDE}},
-	{[][]key{K_a}},
-	{[][]key{K_b}},
-	{[][]key{K_c}},
-	{[][]key{K_d}},
-	{[][]key{K_e}},
-	{[][]key{K_f}},
-	{[][]key{K_g}},
-	{[][]key{K_h}},
-	{[][]key{K_i}},
-	{[][]key{K_j}},
-	{[][]key{K_k}},
-	{[][]key{K_l}},
-	{[][]key{K_m}},
-	{[][]key{K_n}},
-	{[][]key{K_o}},
-	{[][]key{K_p}},
-	{[][]key{K_q}},
-	{[][]key{K_r}},
-	{[][]key{K_s}},
-	{[][]key{K_t}},
-	{[][]key{K_u}},
-	{[][]key{K_v}},
-	{[][]key{K_w}},
-	{[][]key{K_x}},
-	{[][]key{K_y}},
-	{[][]key{K_z}},
-	{[][]key{K_LCUB, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_BACKSLASH_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_RCUB, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_TILDE_SHIFT, K_LSHIFT, K_RSHIFT}},
-	{[][]key{K_8, K_BACKSPACE, K_LCTRL, K_RCTRL}},
-}
-
-var func_combos = []combo{
-	{[][]key{K_F1}},
-	{[][]key{K_F2}},
-	{[][]key{K_F3}},
-	{[][]key{K_F4}},
-	{[][]key{K_F5}},
-	{[][]key{K_F6}},
-	{[][]key{K_F7}},
-	{[][]key{K_F8}},
-	{[][]key{K_F9}},
-	{[][]key{K_F10}},
-	{[][]key{K_F11}},
-	{[][]key{K_F12}},
-	{[][]key{K_INS}},
-	{[][]key{K_DEL}},
-	{[][]key{K_HOM}},
-	{[][]key{K_END}},
-	{[][]key{K_PGU}},
-	{[][]key{K_PGD}},
-	{[][]key{K_ARROW_UP}},
-	{[][]key{K_ARROW_DOWN}},
-	{[][]key{K_ARROW_LEFT}},
-	{[][]key{K_ARROW_RIGHT}},
-}
-
-func print_tb(x, y int, fg, bg termbox.Attribute, msg string) {
-	for _, c := range msg {
-		termbox.SetCell(x, y, c, fg, bg)
-		x++
-	}
-}
-
-func printf_tb(x, y int, fg, bg termbox.Attribute, format string, args ...interface{}) {
-	s := fmt.Sprintf(format, args...)
-	print_tb(x, y, fg, bg, s)
-}
-
-func draw_key(k []key, fg, bg termbox.Attribute) {
-	for _, k := range k {
-		termbox.SetCell(k.x+2, k.y+4, k.ch, fg, bg)
-	}
-}
-
-func draw_keyboard() {
-	termbox.SetCell(0, 0, 0x250C, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(79, 0, 0x2510, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(0, 23, 0x2514, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(79, 23, 0x2518, termbox.ColorWhite, termbox.ColorBlack)
-
-	for i := 1; i < 79; i++ {
-		termbox.SetCell(i, 0, 0x2500, termbox.ColorWhite, termbox.ColorBlack)
-		termbox.SetCell(i, 23, 0x2500, termbox.ColorWhite, termbox.ColorBlack)
-		termbox.SetCell(i, 17, 0x2500, termbox.ColorWhite, termbox.ColorBlack)
-		termbox.SetCell(i, 4, 0x2500, termbox.ColorWhite, termbox.ColorBlack)
-	}
-	for i := 1; i < 23; i++ {
-		termbox.SetCell(0, i, 0x2502, termbox.ColorWhite, termbox.ColorBlack)
-		termbox.SetCell(79, i, 0x2502, termbox.ColorWhite, termbox.ColorBlack)
-	}
-	termbox.SetCell(0, 17, 0x251C, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(79, 17, 0x2524, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(0, 4, 0x251C, termbox.ColorWhite, termbox.ColorBlack)
-	termbox.SetCell(79, 4, 0x2524, termbox.ColorWhite, termbox.ColorBlack)
-	for i := 5; i < 17; i++ {
-		termbox.SetCell(1, i, 0x2588, termbox.ColorYellow, termbox.ColorYellow)
-		termbox.SetCell(78, i, 0x2588, termbox.ColorYellow, termbox.ColorYellow)
-	}
-
-	draw_key(K_ESC, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F1, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F2, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F3, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F4, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F5, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F6, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F7, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F8, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F9, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F10, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F11, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_F12, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_PRN, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_SCR, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_BRK, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LED1, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LED2, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LED3, termbox.ColorWhite, termbox.ColorBlue)
-
-	draw_key(K_TILDE, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_1, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_2, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_3, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_4, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_5, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_6, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_7, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_8, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_9, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_0, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_MINUS, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_EQUALS, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_BACKSLASH, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_BACKSPACE, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_INS, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_HOM, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_PGU, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_NUMLOCK, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_SLASH, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_STAR, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_MINUS, termbox.ColorWhite, termbox.ColorBlue)
-
-	draw_key(K_TAB, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_q, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_w, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_e, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_r, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_t, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_y, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_u, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_i, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_o, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_p, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LSQB, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RSQB, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_ENTER, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_DEL, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_END, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_PGD, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_7, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_8, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_9, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_PLUS, termbox.ColorWhite, termbox.ColorBlue)
-
-	draw_key(K_CAPS, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_a, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_s, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_d, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_f, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_g, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_h, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_j, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_k, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_l, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_SEMICOLON, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_QUOTE, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_4, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_5, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_6, termbox.ColorWhite, termbox.ColorBlue)
-
-	draw_key(K_LSHIFT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_z, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_x, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_c, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_v, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_b, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_n, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_m, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_COMMA, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_PERIOD, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_SLASH, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RSHIFT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_ARROW_UP, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_1, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_2, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_3, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_ENTER, termbox.ColorWhite, termbox.ColorBlue)
-
-	draw_key(K_LCTRL, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LWIN, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_LALT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_SPACE, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RCTRL, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RPROP, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RWIN, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_RALT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_ARROW_LEFT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_ARROW_DOWN, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_ARROW_RIGHT, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_0, termbox.ColorWhite, termbox.ColorBlue)
-	draw_key(K_K_PERIOD, termbox.ColorWhite, termbox.ColorBlue)
-
-	printf_tb(33, 1, termbox.ColorMagenta|termbox.AttrBold, termbox.ColorBlack, "Keyboard demo!")
-	printf_tb(21, 2, termbox.ColorMagenta, termbox.ColorBlack, "(press CTRL+X and then CTRL+Q to exit)")
-	printf_tb(15, 3, termbox.ColorMagenta, termbox.ColorBlack, "(press CTRL+X and then CTRL+C to change input mode)")
-
-	inputmode := termbox.SetInputMode(termbox.InputCurrent)
-	inputmode_str := ""
-	switch {
-	case inputmode&termbox.InputEsc != 0:
-		inputmode_str = "termbox.InputEsc"
-	case inputmode&termbox.InputAlt != 0:
-		inputmode_str = "termbox.InputAlt"
-	}
-
-	if inputmode&termbox.InputMouse != 0 {
-		inputmode_str += " | termbox.InputMouse"
-	}
-	printf_tb(3, 18, termbox.ColorWhite, termbox.ColorBlack, "Input mode: %s", inputmode_str)
-}
-
-var fcmap = []string{
-	"CTRL+2, CTRL+~",
-	"CTRL+A",
-	"CTRL+B",
-	"CTRL+C",
-	"CTRL+D",
-	"CTRL+E",
-	"CTRL+F",
-	"CTRL+G",
-	"CTRL+H, BACKSPACE",
-	"CTRL+I, TAB",
-	"CTRL+J",
-	"CTRL+K",
-	"CTRL+L",
-	"CTRL+M, ENTER",
-	"CTRL+N",
-	"CTRL+O",
-	"CTRL+P",
-	"CTRL+Q",
-	"CTRL+R",
-	"CTRL+S",
-	"CTRL+T",
-	"CTRL+U",
-	"CTRL+V",
-	"CTRL+W",
-	"CTRL+X",
-	"CTRL+Y",
-	"CTRL+Z",
-	"CTRL+3, ESC, CTRL+[",
-	"CTRL+4, CTRL+\\",
-	"CTRL+5, CTRL+]",
-	"CTRL+6",
-	"CTRL+7, CTRL+/, CTRL+_",
-	"SPACE",
-}
-
-var fkmap = []string{
-	"F1",
-	"F2",
-	"F3",
-	"F4",
-	"F5",
-	"F6",
-	"F7",
-	"F8",
-	"F9",
-	"F10",
-	"F11",
-	"F12",
-	"INSERT",
-	"DELETE",
-	"HOME",
-	"END",
-	"PGUP",
-	"PGDN",
-	"ARROW UP",
-	"ARROW DOWN",
-	"ARROW LEFT",
-	"ARROW RIGHT",
-}
-
-func funckeymap(k termbox.Key) string {
-	if k == termbox.KeyCtrl8 {
-		return "CTRL+8, BACKSPACE 2" /* 0x7F */
-	} else if k >= termbox.KeyArrowRight && k <= 0xFFFF {
-		return fkmap[0xFFFF-k]
-	} else if k <= termbox.KeySpace {
-		return fcmap[k]
-	}
-	return "UNKNOWN"
-}
-
-func pretty_print_press(ev *termbox.Event) {
-	printf_tb(3, 19, termbox.ColorWhite, termbox.ColorBlack, "Key: ")
-	printf_tb(8, 19, termbox.ColorYellow, termbox.ColorBlack, "decimal: %d", ev.Key)
-	printf_tb(8, 20, termbox.ColorGreen, termbox.ColorBlack, "hex:     0x%X", ev.Key)
-	printf_tb(8, 21, termbox.ColorCyan, termbox.ColorBlack, "octal:   0%o", ev.Key)
-	printf_tb(8, 22, termbox.ColorRed, termbox.ColorBlack, "string:  %s", funckeymap(ev.Key))
-
-	printf_tb(54, 19, termbox.ColorWhite, termbox.ColorBlack, "Char: ")
-	printf_tb(60, 19, termbox.ColorYellow, termbox.ColorBlack, "decimal: %d", ev.Ch)
-	printf_tb(60, 20, termbox.ColorGreen, termbox.ColorBlack, "hex:     0x%X", ev.Ch)
-	printf_tb(60, 21, termbox.ColorCyan, termbox.ColorBlack, "octal:   0%o", ev.Ch)
-	printf_tb(60, 22, termbox.ColorRed, termbox.ColorBlack, "string:  %s", string(ev.Ch))
-
-	modifier := "none"
-	if ev.Mod != 0 {
-		modifier = "termbox.ModAlt"
-	}
-	printf_tb(54, 18, termbox.ColorWhite, termbox.ColorBlack, "Modifier: %s", modifier)
-}
-
-func pretty_print_resize(ev *termbox.Event) {
-	printf_tb(3, 19, termbox.ColorWhite, termbox.ColorBlack, "Resize event: %d x %d", ev.Width, ev.Height)
-}
-
-var counter = 0
-
-func pretty_print_mouse(ev *termbox.Event) {
-	printf_tb(3, 19, termbox.ColorWhite, termbox.ColorBlack, "Mouse event: %d x %d", ev.MouseX, ev.MouseY)
-	button := ""
-	switch ev.Key {
-	case termbox.MouseLeft:
-		button = "MouseLeft: %d"
-	case termbox.MouseMiddle:
-		button = "MouseMiddle: %d"
-	case termbox.MouseRight:
-		button = "MouseRight: %d"
-	case termbox.MouseWheelUp:
-		button = "MouseWheelUp: %d"
-	case termbox.MouseWheelDown:
-		button = "MouseWheelDown: %d"
-	case termbox.MouseRelease:
-		button = "MouseRelease: %d"
-	}
-	if ev.Mod&termbox.ModMotion != 0 {
-		button += "*"
-	}
-	counter++
-	printf_tb(43, 19, termbox.ColorWhite, termbox.ColorBlack, "Key: ")
-	printf_tb(48, 19, termbox.ColorYellow, termbox.ColorBlack, button, counter)
-}
-
-func dispatch_press(ev *termbox.Event) {
-	if ev.Mod&termbox.ModAlt != 0 {
-		draw_key(K_LALT, termbox.ColorWhite, termbox.ColorRed)
-		draw_key(K_RALT, termbox.ColorWhite, termbox.ColorRed)
-	}
-
-	var k *combo
-	if ev.Key >= termbox.KeyArrowRight {
-		k = &func_combos[0xFFFF-ev.Key]
-	} else if ev.Ch < 128 {
-		if ev.Ch == 0 && ev.Key < 128 {
-			k = &combos[ev.Key]
-		} else {
-			k = &combos[ev.Ch]
-		}
-	}
-	if k == nil {
-		return
-	}
-
-	keys := k.keys
-	for _, k := range keys {
-		draw_key(k, termbox.ColorWhite, termbox.ColorRed)
-	}
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-
-	termbox.SetInputMode(termbox.InputEsc | termbox.InputMouse)
-
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-	draw_keyboard()
-	termbox.Flush()
-	inputmode := 0
-	ctrlxpressed := false
-loop:
-	for {
-		switch ev := termbox.PollEvent(); ev.Type {
-		case termbox.EventKey:
-			if ev.Key == termbox.KeyCtrlS && ctrlxpressed {
-				termbox.Sync()
-			}
-			if ev.Key == termbox.KeyCtrlQ && ctrlxpressed {
-				break loop
-			}
-			if ev.Key == termbox.KeyCtrlC && ctrlxpressed {
-				chmap := []termbox.InputMode{
-					termbox.InputEsc | termbox.InputMouse,
-					termbox.InputAlt | termbox.InputMouse,
-					termbox.InputEsc,
-					termbox.InputAlt,
-				}
-				inputmode++
-				if inputmode >= len(chmap) {
-					inputmode = 0
-				}
-				termbox.SetInputMode(chmap[inputmode])
-			}
-			if ev.Key == termbox.KeyCtrlX {
-				ctrlxpressed = true
-			} else {
-				ctrlxpressed = false
-			}
-
-			termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-			draw_keyboard()
-			dispatch_press(&ev)
-			pretty_print_press(&ev)
-			termbox.Flush()
-		case termbox.EventResize:
-			termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-			draw_keyboard()
-			pretty_print_resize(&ev)
-			termbox.Flush()
-		case termbox.EventMouse:
-			termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-			draw_keyboard()
-			pretty_print_mouse(&ev)
-			termbox.Flush()
-		case termbox.EventError:
-			panic(ev.Err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/output.go b/installer/vendor/github.com/nsf/termbox-go/_demos/output.go
deleted file mode 100644
index 2b9479b078..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/output.go
+++ /dev/null
@@ -1,228 +0,0 @@
-package main
-
-import "github.com/mattn/go-runewidth"
-import "github.com/nsf/termbox-go"
-
-const chars = "nnnnnnnnnbbbbbbbbbuuuuuuuuuBBBBBBBBB"
-
-var output_mode = termbox.OutputNormal
-
-func next_char(current int) int {
-	current++
-	if current >= len(chars) {
-		return 0
-	}
-	return current
-}
-
-func print_combinations_table(sx, sy int, attrs []termbox.Attribute) {
-	var bg termbox.Attribute
-	current_char := 0
-	y := sy
-
-	all_attrs := []termbox.Attribute{
-		0,
-		termbox.AttrBold,
-		termbox.AttrUnderline,
-		termbox.AttrBold | termbox.AttrUnderline,
-	}
-
-	draw_line := func() {
-		x := sx
-		for _, a := range all_attrs {
-			for c := termbox.ColorDefault; c <= termbox.ColorWhite; c++ {
-				fg := a | c
-				termbox.SetCell(x, y, rune(chars[current_char]), fg, bg)
-				current_char = next_char(current_char)
-				x++
-			}
-		}
-	}
-
-	for _, a := range attrs {
-		for c := termbox.ColorDefault; c <= termbox.ColorWhite; c++ {
-			bg = a | c
-			draw_line()
-			y++
-		}
-	}
-}
-
-func print_wide(x, y int, s string) {
-	red := false
-	for _, r := range s {
-		c := termbox.ColorDefault
-		if red {
-			c = termbox.ColorRed
-		}
-		termbox.SetCell(x, y, r, termbox.ColorDefault, c)
-		w := runewidth.RuneWidth(r)
-		if w == 0 || (w == 2 && runewidth.IsAmbiguousWidth(r)) {
-			w = 1
-		}
-		x += w
-
-		red = !red
-	}
-}
-
-const hello_world = "こんにちは世界"
-
-func draw_all() {
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-
-	switch output_mode {
-
-	case termbox.OutputNormal:
-		print_combinations_table(1, 1, []termbox.Attribute{
-			0,
-			termbox.AttrBold,
-		})
-		print_combinations_table(2+len(chars), 1, []termbox.Attribute{
-			termbox.AttrReverse,
-		})
-		print_wide(2+len(chars), 11, hello_world)
-
-	case termbox.OutputGrayscale:
-		for y := 0; y < 26; y++ {
-			for x := 0; x < 26; x++ {
-				termbox.SetCell(x, y, 'n',
-					termbox.Attribute(x+1),
-					termbox.Attribute(y+1))
-				termbox.SetCell(x+27, y, 'b',
-					termbox.Attribute(x+1)|termbox.AttrBold,
-					termbox.Attribute(26-y))
-				termbox.SetCell(x+54, y, 'u',
-					termbox.Attribute(x+1)|termbox.AttrUnderline,
-					termbox.Attribute(y+1))
-			}
-			termbox.SetCell(82, y, 'd',
-				termbox.Attribute(y+1),
-				termbox.ColorDefault)
-			termbox.SetCell(83, y, 'd',
-				termbox.ColorDefault,
-				termbox.Attribute(26-y))
-		}
-
-	case termbox.Output216:
-		for r := 0; r < 6; r++ {
-			for g := 0; g < 6; g++ {
-				for b := 0; b < 6; b++ {
-					y := r
-					x := g + 6*b
-					c1 := termbox.Attribute(1 + r*36 + g*6 + b)
-					bg := termbox.Attribute(1 + g*36 + b*6 + r)
-					c2 := termbox.Attribute(1 + b*36 + r*6 + g)
-					bc1 := c1 | termbox.AttrBold
-					uc1 := c1 | termbox.AttrUnderline
-					bc2 := c2 | termbox.AttrBold
-					uc2 := c2 | termbox.AttrUnderline
-					termbox.SetCell(x, y, 'n', c1, bg)
-					termbox.SetCell(x, y+6, 'b', bc1, bg)
-					termbox.SetCell(x, y+12, 'u', uc1, bg)
-					termbox.SetCell(x, y+18, 'B', bc1|uc1, bg)
-					termbox.SetCell(x+37, y, 'n', c2, bg)
-					termbox.SetCell(x+37, y+6, 'b', bc2, bg)
-					termbox.SetCell(x+37, y+12, 'u', uc2, bg)
-					termbox.SetCell(x+37, y+18, 'B', bc2|uc2, bg)
-				}
-				c1 := termbox.Attribute(1 + g*6 + r*36)
-				c2 := termbox.Attribute(6 + g*6 + r*36)
-				termbox.SetCell(74+g, r, 'd', c1, termbox.ColorDefault)
-				termbox.SetCell(74+g, r+6, 'd', c2, termbox.ColorDefault)
-				termbox.SetCell(74+g, r+12, 'd', termbox.ColorDefault, c1)
-				termbox.SetCell(74+g, r+18, 'd', termbox.ColorDefault, c2)
-			}
-		}
-
-	case termbox.Output256:
-		for y := 0; y < 4; y++ {
-			for x := 0; x < 8; x++ {
-				for z := 0; z < 8; z++ {
-					bg := termbox.Attribute(1 + y*64 + x*8 + z)
-					c1 := termbox.Attribute(256 - y*64 - x*8 - z)
-					c2 := termbox.Attribute(1 + y*64 + z*8 + x)
-					c3 := termbox.Attribute(256 - y*64 - z*8 - x)
-					c4 := termbox.Attribute(1 + y*64 + x*4 + z*4)
-					bold := c2 | termbox.AttrBold
-					under := c3 | termbox.AttrUnderline
-					both := c1 | termbox.AttrBold | termbox.AttrUnderline
-					termbox.SetCell(z+8*x, y, ' ', 0, bg)
-					termbox.SetCell(z+8*x, y+5, 'n', c4, bg)
-					termbox.SetCell(z+8*x, y+10, 'b', bold, bg)
-					termbox.SetCell(z+8*x, y+15, 'u', under, bg)
-					termbox.SetCell(z+8*x, y+20, 'B', both, bg)
-				}
-			}
-		}
-		for x := 0; x < 12; x++ {
-			for y := 0; y < 2; y++ {
-				c1 := termbox.Attribute(233 + y*12 + x)
-				termbox.SetCell(66+x, y, 'd', c1, termbox.ColorDefault)
-				termbox.SetCell(66+x, 2+y, 'd', termbox.ColorDefault, c1)
-			}
-		}
-		for x := 0; x < 6; x++ {
-			for y := 0; y < 6; y++ {
-				c1 := termbox.Attribute(17 + x*6 + y*36)
-				c2 := termbox.Attribute(17 + 5 + x*6 + y*36)
-				termbox.SetCell(66+x, 6+y, 'd', c1, termbox.ColorDefault)
-				termbox.SetCell(66+x, 12+y, 'd', c2, termbox.ColorDefault)
-				termbox.SetCell(72+x, 6+y, 'd', termbox.ColorDefault, c1)
-				termbox.SetCell(72+x, 12+y, 'd', termbox.ColorDefault, c2)
-			}
-		}
-
-	}
-
-	termbox.Flush()
-}
-
-var available_modes = []termbox.OutputMode{
-	termbox.OutputNormal,
-	termbox.OutputGrayscale,
-	termbox.Output216,
-	termbox.Output256,
-}
-
-var output_mode_index = 0
-
-func switch_output_mode(direction int) {
-	output_mode_index += direction
-	if output_mode_index < 0 {
-		output_mode_index = len(available_modes) - 1
-	} else if output_mode_index >= len(available_modes) {
-		output_mode_index = 0
-	}
-	output_mode = termbox.SetOutputMode(available_modes[output_mode_index])
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-	termbox.Sync()
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-
-	draw_all()
-loop:
-	for {
-		switch ev := termbox.PollEvent(); ev.Type {
-		case termbox.EventKey:
-			switch ev.Key {
-			case termbox.KeyEsc:
-				break loop
-			case termbox.KeyArrowUp, termbox.KeyArrowRight:
-				switch_output_mode(1)
-				draw_all()
-			case termbox.KeyArrowDown, termbox.KeyArrowLeft:
-				switch_output_mode(-1)
-				draw_all()
-			}
-		case termbox.EventResize:
-			draw_all()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/paint.go b/installer/vendor/github.com/nsf/termbox-go/_demos/paint.go
deleted file mode 100644
index fbafd18ae9..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/paint.go
+++ /dev/null
@@ -1,105 +0,0 @@
-package main
-
-import (
-	"github.com/nsf/termbox-go"
-)
-
-var curCol = 0
-var curRune = 0
-var backbuf []termbox.Cell
-var bbw, bbh int
-
-var runes = []rune{' ', '░', '▒', '▓', '█'}
-var colors = []termbox.Attribute{
-	termbox.ColorBlack,
-	termbox.ColorRed,
-	termbox.ColorGreen,
-	termbox.ColorYellow,
-	termbox.ColorBlue,
-	termbox.ColorMagenta,
-	termbox.ColorCyan,
-	termbox.ColorWhite,
-}
-
-type attrFunc func(int) (rune, termbox.Attribute, termbox.Attribute)
-
-func updateAndDrawButtons(current *int, x, y int, mx, my int, n int, attrf attrFunc) {
-	lx, ly := x, y
-	for i := 0; i < n; i++ {
-		if lx <= mx && mx <= lx+3 && ly <= my && my <= ly+1 {
-			*current = i
-		}
-		r, fg, bg := attrf(i)
-		termbox.SetCell(lx+0, ly+0, r, fg, bg)
-		termbox.SetCell(lx+1, ly+0, r, fg, bg)
-		termbox.SetCell(lx+2, ly+0, r, fg, bg)
-		termbox.SetCell(lx+3, ly+0, r, fg, bg)
-		termbox.SetCell(lx+0, ly+1, r, fg, bg)
-		termbox.SetCell(lx+1, ly+1, r, fg, bg)
-		termbox.SetCell(lx+2, ly+1, r, fg, bg)
-		termbox.SetCell(lx+3, ly+1, r, fg, bg)
-		lx += 4
-	}
-	lx, ly = x, y
-	for i := 0; i < n; i++ {
-		if *current == i {
-			fg := termbox.ColorRed | termbox.AttrBold
-			bg := termbox.ColorDefault
-			termbox.SetCell(lx+0, ly+2, '^', fg, bg)
-			termbox.SetCell(lx+1, ly+2, '^', fg, bg)
-			termbox.SetCell(lx+2, ly+2, '^', fg, bg)
-			termbox.SetCell(lx+3, ly+2, '^', fg, bg)
-		}
-		lx += 4
-	}
-}
-
-func update_and_redraw_all(mx, my int) {
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-	if mx != -1 && my != -1 {
-		backbuf[bbw*my+mx] = termbox.Cell{Ch: runes[curRune], Fg: colors[curCol]}
-	}
-	copy(termbox.CellBuffer(), backbuf)
-	_, h := termbox.Size()
-	updateAndDrawButtons(&curRune, 0, 0, mx, my, len(runes), func(i int) (rune, termbox.Attribute, termbox.Attribute) {
-		return runes[i], termbox.ColorDefault, termbox.ColorDefault
-	})
-	updateAndDrawButtons(&curCol, 0, h-3, mx, my, len(colors), func(i int) (rune, termbox.Attribute, termbox.Attribute) {
-		return ' ', termbox.ColorDefault, colors[i]
-	})
-	termbox.Flush()
-}
-
-func reallocBackBuffer(w, h int) {
-	bbw, bbh = w, h
-	backbuf = make([]termbox.Cell, w*h)
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-	termbox.SetInputMode(termbox.InputEsc | termbox.InputMouse)
-	reallocBackBuffer(termbox.Size())
-	update_and_redraw_all(-1, -1)
-
-mainloop:
-	for {
-		mx, my := -1, -1
-		switch ev := termbox.PollEvent(); ev.Type {
-		case termbox.EventKey:
-			if ev.Key == termbox.KeyEsc {
-				break mainloop
-			}
-		case termbox.EventMouse:
-			if ev.Key == termbox.MouseLeft {
-				mx, my = ev.MouseX, ev.MouseY
-			}
-		case termbox.EventResize:
-			reallocBackBuffer(ev.Width, ev.Height)
-		}
-		update_and_redraw_all(mx, my)
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/random_output.go b/installer/vendor/github.com/nsf/termbox-go/_demos/random_output.go
deleted file mode 100644
index efcf0b7c9d..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/random_output.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package main
-
-import "github.com/nsf/termbox-go"
-import "math/rand"
-import "time"
-
-func draw() {
-	w, h := termbox.Size()
-	termbox.Clear(termbox.ColorDefault, termbox.ColorDefault)
-	for y := 0; y < h; y++ {
-		for x := 0; x < w; x++ {
-			termbox.SetCell(x, y, ' ', termbox.ColorDefault,
-				termbox.Attribute(rand.Int()%8)+1)
-		}
-	}
-	termbox.Flush()
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-
-	event_queue := make(chan termbox.Event)
-	go func() {
-		for {
-			event_queue <- termbox.PollEvent()
-		}
-	}()
-
-	draw()
-loop:
-	for {
-		select {
-		case ev := <-event_queue:
-			if ev.Type == termbox.EventKey && ev.Key == termbox.KeyEsc {
-				break loop
-			}
-		default:
-			draw()
-			time.Sleep(10 * time.Millisecond)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/_demos/raw_input.go b/installer/vendor/github.com/nsf/termbox-go/_demos/raw_input.go
deleted file mode 100644
index 97a489758f..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/_demos/raw_input.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"github.com/nsf/termbox-go"
-	"strings"
-)
-
-func tbprint(x, y int, fg, bg termbox.Attribute, msg string) {
-	for _, c := range msg {
-		termbox.SetCell(x, y, c, fg, bg)
-		x++
-	}
-}
-
-var current string
-var curev termbox.Event
-
-func mouse_button_str(k termbox.Key) string {
-	switch k {
-	case termbox.MouseLeft:
-		return "MouseLeft"
-	case termbox.MouseMiddle:
-		return "MouseMiddle"
-	case termbox.MouseRight:
-		return "MouseRight"
-	case termbox.MouseRelease:
-		return "MouseRelease"
-	case termbox.MouseWheelUp:
-		return "MouseWheelUp"
-	case termbox.MouseWheelDown:
-		return "MouseWheelDown"
-	}
-	return "Key"
-}
-
-func mod_str(m termbox.Modifier) string {
-	var out []string
-	if m&termbox.ModAlt != 0 {
-		out = append(out, "ModAlt")
-	}
-	if m&termbox.ModMotion != 0 {
-		out = append(out, "ModMotion")
-	}
-	return strings.Join(out, " | ")
-}
-
-func redraw_all() {
-	const coldef = termbox.ColorDefault
-	termbox.Clear(coldef, coldef)
-	tbprint(0, 0, termbox.ColorMagenta, coldef, "Press 'q' to quit")
-	tbprint(0, 1, coldef, coldef, current)
-	switch curev.Type {
-	case termbox.EventKey:
-		tbprint(0, 2, coldef, coldef,
-			fmt.Sprintf("EventKey: k: %d, c: %c, mod: %s", curev.Key, curev.Ch, mod_str(curev.Mod)))
-	case termbox.EventMouse:
-		tbprint(0, 2, coldef, coldef,
-			fmt.Sprintf("EventMouse: x: %d, y: %d, b: %s, mod: %s",
-				curev.MouseX, curev.MouseY, mouse_button_str(curev.Key), mod_str(curev.Mod)))
-	case termbox.EventNone:
-		tbprint(0, 2, coldef, coldef, "EventNone")
-	}
-	tbprint(0, 3, coldef, coldef, fmt.Sprintf("%d", curev.N))
-	termbox.Flush()
-}
-
-func main() {
-	err := termbox.Init()
-	if err != nil {
-		panic(err)
-	}
-	defer termbox.Close()
-	termbox.SetInputMode(termbox.InputAlt | termbox.InputMouse)
-	redraw_all()
-
-	data := make([]byte, 0, 64)
-mainloop:
-	for {
-		if cap(data)-len(data) < 32 {
-			newdata := make([]byte, len(data), len(data)+32)
-			copy(newdata, data)
-			data = newdata
-		}
-		beg := len(data)
-		d := data[beg : beg+32]
-		switch ev := termbox.PollRawEvent(d); ev.Type {
-		case termbox.EventRaw:
-			data = data[:beg+ev.N]
-			current = fmt.Sprintf("%q", data)
-			if current == `"q"` {
-				break mainloop
-			}
-
-			for {
-				ev := termbox.ParseEvent(data)
-				if ev.N == 0 {
-					break
-				}
-				curev = ev
-				copy(data, data[curev.N:])
-				data = data[:len(data)-curev.N]
-			}
-		case termbox.EventError:
-			panic(ev.Err)
-		}
-		redraw_all()
-	}
-}
diff --git a/installer/vendor/github.com/nsf/termbox-go/api.go b/installer/vendor/github.com/nsf/termbox-go/api.go
index b242ddcf3a..d530ab5c51 100644
--- a/installer/vendor/github.com/nsf/termbox-go/api.go
+++ b/installer/vendor/github.com/nsf/termbox-go/api.go
@@ -8,6 +8,7 @@ import "os"
 import "os/signal"
 import "syscall"
 import "runtime"
+import "time"
 
 // public API
 
@@ -253,8 +254,8 @@ func CellBuffer() []Cell {
 // NOTE: This API is experimental and may change in future.
 func ParseEvent(data []byte) Event {
 	event := Event{Type: EventKey}
-	ok := extract_event(data, &event)
-	if !ok {
+	status := extract_event(data, &event, false)
+	if status != event_extracted {
 		return Event{Type: EventNone, N: event.N}
 	}
 	return event
@@ -303,34 +304,65 @@ func PollRawEvent(data []byte) Event {
 
 // Wait for an event and return it. This is a blocking function call.
 func PollEvent() Event {
+	// Constant governing macOS specific behavior. See https://github.com/nsf/termbox-go/issues/132
+	// This is an arbitrary delay which hopefully will be enough time for any lagging
+	// partial escape sequences to come through.
+	const esc_wait_delay = 100 * time.Millisecond
+
 	var event Event
+	var esc_wait_timer *time.Timer
+	var esc_timeout <-chan time.Time
 
 	// try to extract event from input buffer, return on success
 	event.Type = EventKey
-	ok := extract_event(inbuf, &event)
+	status := extract_event(inbuf, &event, true)
 	if event.N != 0 {
 		copy(inbuf, inbuf[event.N:])
 		inbuf = inbuf[:len(inbuf)-event.N]
 	}
-	if ok {
+	if status == event_extracted {
 		return event
+	} else if status == esc_wait {
+		esc_wait_timer = time.NewTimer(esc_wait_delay)
+		esc_timeout = esc_wait_timer.C
 	}
 
 	for {
 		select {
 		case ev := <-input_comm:
+			if esc_wait_timer != nil {
+				if !esc_wait_timer.Stop() {
+					<-esc_wait_timer.C
+				}
+				esc_wait_timer = nil
+			}
+
 			if ev.err != nil {
 				return Event{Type: EventError, Err: ev.err}
 			}
 
 			inbuf = append(inbuf, ev.data...)
 			input_comm <- ev
-			ok := extract_event(inbuf, &event)
+			status := extract_event(inbuf, &event, true)
+			if event.N != 0 {
+				copy(inbuf, inbuf[event.N:])
+				inbuf = inbuf[:len(inbuf)-event.N]
+			}
+			if status == event_extracted {
+				return event
+			} else if status == esc_wait {
+				esc_wait_timer = time.NewTimer(esc_wait_delay)
+				esc_timeout = esc_wait_timer.C
+			}
+		case <-esc_timeout:
+			esc_wait_timer = nil
+
+			status := extract_event(inbuf, &event, false)
 			if event.N != 0 {
 				copy(inbuf, inbuf[event.N:])
 				inbuf = inbuf[:len(inbuf)-event.N]
 			}
-			if ok {
+			if status == event_extracted {
 				return event
 			}
 		case <-interrupt_comm:
@@ -418,12 +450,12 @@ func SetInputMode(mode InputMode) InputMode {
 //
 // 3. Output216 => [1..216]
 //    This mode supports the 3rd range of the 256 mode only.
-//    But you dont need to provide an offset.
+//    But you don't need to provide an offset.
 //
 // 4. OutputGrayscale => [1..26]
 //    This mode supports the 4th range of the 256 mode
 //    and black and white colors from 3th range of the 256 mode
-//    But you dont need to provide an offset.
+//    But you don't need to provide an offset.
 //
 // In all modes, 0x00 represents the default color.
 //
diff --git a/installer/vendor/github.com/nsf/termbox-go/api_common.go b/installer/vendor/github.com/nsf/termbox-go/api_common.go
index 9f23661f56..5ca1371a5b 100644
--- a/installer/vendor/github.com/nsf/termbox-go/api_common.go
+++ b/installer/vendor/github.com/nsf/termbox-go/api_common.go
@@ -148,7 +148,7 @@ const (
 // using bitwise OR ('|'). Although, colors cannot be combined. But you can
 // combine attributes and a single color.
 //
-// It's worth mentioning that some platforms don't support certain attibutes.
+// It's worth mentioning that some platforms don't support certain attributes.
 // For example windows console doesn't support AttrUnderline. And on some
 // terminals applying AttrBold to background may result in blinking text. Use
 // them with caution and test your code on various terminals.
diff --git a/installer/vendor/github.com/nsf/termbox-go/collect_terminfo.py b/installer/vendor/github.com/nsf/termbox-go/collect_terminfo.py
deleted file mode 100755
index 5e50975e63..0000000000
--- a/installer/vendor/github.com/nsf/termbox-go/collect_terminfo.py
+++ /dev/null
@@ -1,110 +0,0 @@
-#!/usr/bin/env python
-
-import sys, os, subprocess
-
-def escaped(s):
-	return repr(s)[1:-1]
-
-def tput(term, name):
-	try:
-		return subprocess.check_output(['tput', '-T%s' % term, name]).decode()
-	except subprocess.CalledProcessError as e:
-		return e.output.decode()
-
-
-def w(s):
-	if s == None:
-		return
-	sys.stdout.write(s)
-
-terminals = {
-	'xterm' : 'xterm',
-	'rxvt-256color' : 'rxvt_256color',
-	'rxvt-unicode' : 'rxvt_unicode',
-	'linux' : 'linux',
-	'Eterm' : 'eterm',
-	'screen' : 'screen'
-}
-
-keys = [
-	"F1",		"kf1",
-	"F2",		"kf2",
-	"F3",		"kf3",
-	"F4",		"kf4",
-	"F5",		"kf5",
-	"F6",		"kf6",
-	"F7",		"kf7",
-	"F8",		"kf8",
-	"F9",		"kf9",
-	"F10",		"kf10",
-	"F11",		"kf11",
-	"F12",		"kf12",
-	"INSERT",	"kich1",
-	"DELETE",	"kdch1",
-	"HOME",		"khome",
-	"END",		"kend",
-	"PGUP",		"kpp",
-	"PGDN",		"knp",
-	"KEY_UP",	"kcuu1",
-	"KEY_DOWN",	"kcud1",
-	"KEY_LEFT",	"kcub1",
-	"KEY_RIGHT",	"kcuf1"
-]
-
-funcs = [
-	"T_ENTER_CA",		"smcup",
-	"T_EXIT_CA",		"rmcup",
-	"T_SHOW_CURSOR",	"cnorm",
-	"T_HIDE_CURSOR",	"civis",
-	"T_CLEAR_SCREEN",	"clear",
-	"T_SGR0",		"sgr0",
-	"T_UNDERLINE",		"smul",
-	"T_BOLD",		"bold",
-	"T_BLINK",		"blink",
-	"T_REVERSE",            "rev",
-	"T_ENTER_KEYPAD",	"smkx",
-	"T_EXIT_KEYPAD",	"rmkx"
-]
-
-def iter_pairs(iterable):
-	iterable = iter(iterable)
-	while True:
-		yield (next(iterable), next(iterable))
-
-def do_term(term, nick):
-	w("// %s\n" % term)
-	w("var %s_keys = []string{\n\t" % nick)
-	for k, v in iter_pairs(keys):
-		w('"')
-		w(escaped(tput(term, v)))
-		w('",')
-	w("\n}\n")
-	w("var %s_funcs = []string{\n\t" % nick)
-	for k,v in iter_pairs(funcs):
-		w('"')
-		if v == "sgr":
-			w("\\033[3%d;4%dm")
-		elif v == "cup":
-			w("\\033[%d;%dH")
-		else:
-			w(escaped(tput(term, v)))
-		w('", ')
-	w("\n}\n\n")
-
-def do_terms(d):
-	w("var terms = []struct {\n")
-	w("\tname  string\n")
-	w("\tkeys  []string\n")
-	w("\tfuncs []string\n")
-	w("}{\n")
-	for k, v in d.items():
-		w('\t{"%s", %s_keys, %s_funcs},\n' % (k, v, v))
-	w("}\n\n")
-
-w("// +build !windows\n\npackage termbox\n\n")
-
-for k,v in terminals.items():
-	do_term(k, v)
-
-do_terms(terminals)
-
diff --git a/installer/vendor/github.com/nsf/termbox-go/escwait.go b/installer/vendor/github.com/nsf/termbox-go/escwait.go
new file mode 100644
index 0000000000..b7bbb891fa
--- /dev/null
+++ b/installer/vendor/github.com/nsf/termbox-go/escwait.go
@@ -0,0 +1,11 @@
+// +build !darwin
+
+package termbox
+
+// On all systems other than macOS, disable behavior which will wait before
+// deciding that the escape key was pressed, to account for partially send
+// escape sequences, especially with regard to lengthy mouse sequences.
+// See https://github.com/nsf/termbox-go/issues/132
+func enable_wait_for_escape_sequence() bool {
+	return false
+}
diff --git a/installer/vendor/github.com/nsf/termbox-go/escwait_darwin.go b/installer/vendor/github.com/nsf/termbox-go/escwait_darwin.go
new file mode 100644
index 0000000000..dde69b6cbc
--- /dev/null
+++ b/installer/vendor/github.com/nsf/termbox-go/escwait_darwin.go
@@ -0,0 +1,9 @@
+package termbox
+
+// On macOS, enable behavior which will wait before deciding that the escape
+// key was pressed, to account for partially send escape sequences, especially
+// with regard to lengthy mouse sequences.
+// See https://github.com/nsf/termbox-go/issues/132
+func enable_wait_for_escape_sequence() bool {
+	return true
+}
diff --git a/installer/vendor/github.com/nsf/termbox-go/termbox.go b/installer/vendor/github.com/nsf/termbox-go/termbox.go
index c2d86c6584..fbe4c3de9d 100644
--- a/installer/vendor/github.com/nsf/termbox-go/termbox.go
+++ b/installer/vendor/github.com/nsf/termbox-go/termbox.go
@@ -41,6 +41,14 @@ type input_event struct {
 	err  error
 }
 
+type extract_event_res int
+
+const (
+	event_not_extracted extract_event_res = iota
+	event_extracted
+	esc_wait
+)
+
 var (
 	// term specific sequences
 	keys  []string
@@ -417,7 +425,7 @@ func parse_escape_sequence(event *Event, buf []byte) (int, bool) {
 		}
 	}
 
-	// if none of the keys match, let's try mouse seqences
+	// if none of the keys match, let's try mouse sequences
 	return parse_mouse_event(event, bufstr)
 }
 
@@ -440,17 +448,27 @@ func extract_raw_event(data []byte, event *Event) bool {
 	return true
 }
 
-func extract_event(inbuf []byte, event *Event) bool {
+func extract_event(inbuf []byte, event *Event, allow_esc_wait bool) extract_event_res {
 	if len(inbuf) == 0 {
 		event.N = 0
-		return false
+		return event_not_extracted
 	}
 
 	if inbuf[0] == '\033' {
 		// possible escape sequence
 		if n, ok := parse_escape_sequence(event, inbuf); n != 0 {
 			event.N = n
-			return ok
+			if ok {
+				return event_extracted
+			} else {
+				return event_not_extracted
+			}
+		}
+
+		// possible partially read escape sequence; trigger a wait if appropriate
+		if enable_wait_for_escape_sequence() && allow_esc_wait {
+			event.N = 0
+			return esc_wait
 		}
 
 		// it's not escape sequence, then it's Alt or Esc, check input_mode
@@ -461,17 +479,17 @@ func extract_event(inbuf []byte, event *Event) bool {
 			event.Key = KeyEsc
 			event.Mod = 0
 			event.N = 1
-			return true
+			return event_extracted
 		case input_mode&InputAlt != 0:
 			// if we're in alt mode, set Alt modifier to event and redo parsing
 			event.Mod = ModAlt
-			ok := extract_event(inbuf[1:], event)
-			if ok {
+			status := extract_event(inbuf[1:], event, false)
+			if status == event_extracted {
 				event.N++
 			} else {
 				event.N = 0
 			}
-			return ok
+			return status
 		default:
 			panic("unreachable")
 		}
@@ -486,7 +504,7 @@ func extract_event(inbuf []byte, event *Event) bool {
 		event.Ch = 0
 		event.Key = Key(inbuf[0])
 		event.N = 1
-		return true
+		return event_extracted
 	}
 
 	// the only possible option is utf8 rune
@@ -494,10 +512,10 @@ func extract_event(inbuf []byte, event *Event) bool {
 		event.Ch = r
 		event.Key = 0
 		event.N = n
-		return true
+		return event_extracted
 	}
 
-	return false
+	return event_not_extracted
 }
 
 func fcntl(fd int, cmd int, arg int) (val int, err error) {
diff --git a/installer/vendor/github.com/nsf/termbox-go/termbox_windows.go b/installer/vendor/github.com/nsf/termbox-go/termbox_windows.go
index f7dad7b8a5..7752a175b7 100644
--- a/installer/vendor/github.com/nsf/termbox-go/termbox_windows.go
+++ b/installer/vendor/github.com/nsf/termbox-go/termbox_windows.go
@@ -1,5 +1,6 @@
 package termbox
 
+import "math"
 import "syscall"
 import "unsafe"
 import "unicode/utf16"
@@ -57,12 +58,18 @@ type (
 		control_key_state dword
 		event_flags       dword
 	}
+	console_font_info struct {
+		font      uint32
+		font_size coord
+	}
 )
 
 const (
 	mouse_lmb = 0x1
 	mouse_rmb = 0x2
 	mouse_mmb = 0x4 | 0x8 | 0x10
+	SM_CXMIN  = 28
+	SM_CYMIN  = 29
 )
 
 func (this coord) uintptr() uintptr {
@@ -70,6 +77,7 @@ func (this coord) uintptr() uintptr {
 }
 
 var kernel32 = syscall.NewLazyDLL("kernel32.dll")
+var moduser32 = syscall.NewLazyDLL("user32.dll")
 var is_cjk = runewidth.IsEastAsian()
 
 var (
@@ -91,6 +99,8 @@ var (
 	proc_create_event                     = kernel32.NewProc("CreateEventW")
 	proc_wait_for_multiple_objects        = kernel32.NewProc("WaitForMultipleObjects")
 	proc_set_event                        = kernel32.NewProc("SetEvent")
+	proc_get_current_console_font         = kernel32.NewProc("GetCurrentConsoleFont")
+	get_system_metrics                    = moduser32.NewProc("GetSystemMetrics")
 )
 
 func set_console_active_screen_buffer(h syscall.Handle) (err error) {
@@ -335,6 +345,19 @@ func set_event(ev syscall.Handle) (err error) {
 	return
 }
 
+func get_current_console_font(h syscall.Handle, info *console_font_info) (err error) {
+	r0, _, e1 := syscall.Syscall(proc_get_current_console_font.Addr(),
+		3, uintptr(h), 0, uintptr(unsafe.Pointer(info)))
+	if int(r0) == 0 {
+		if e1 != 0 {
+			err = error(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 type diff_msg struct {
 	pos   short
 	lines short
@@ -379,6 +402,7 @@ var (
 	tmp_coord0 = coord{0, 0}
 	tmp_coord  = coord{0, 0}
 	tmp_rect   = small_rect{0, 0, 0, 0}
+	tmp_finfo  console_font_info
 )
 
 func get_cursor_position(out syscall.Handle) coord {
@@ -397,20 +421,55 @@ func get_term_size(out syscall.Handle) coord {
 	return tmp_info.size
 }
 
+func get_win_min_size(out syscall.Handle) coord {
+	x, _, err := get_system_metrics.Call(SM_CXMIN)
+	y, _, err := get_system_metrics.Call(SM_CYMIN)
+
+	if x == 0 || y == 0 {
+		if err != nil {
+			panic(err)
+		}
+	}
+
+	err1 := get_current_console_font(out, &tmp_finfo)
+	if err1 != nil {
+		panic(err1)
+	}
+
+	return coord{
+		x: short(math.Ceil(float64(x) / float64(tmp_finfo.font_size.x))),
+		y: short(math.Ceil(float64(y) / float64(tmp_finfo.font_size.y))),
+	}
+}
+
 func get_win_size(out syscall.Handle) coord {
 	err := get_console_screen_buffer_info(out, &tmp_info)
 	if err != nil {
 		panic(err)
 	}
-	return coord{
+
+	min_size := get_win_min_size(out)
+
+	size := coord{
 		x: tmp_info.window.right - tmp_info.window.left + 1,
 		y: tmp_info.window.bottom - tmp_info.window.top + 1,
 	}
+
+	if size.x < min_size.x {
+		size.x = min_size.x
+	}
+
+	if size.y < min_size.y {
+		size.y = min_size.y
+	}
+
+	return size
 }
 
 func update_size_maybe() {
-	size := get_term_size(out)
+	size := get_win_size(out)
 	if size.x != term_size.x || size.y != term_size.y {
+		set_console_screen_buffer_size(out, size)
 		term_size = size
 		back_buffer.resize(int(size.x), int(size.y))
 		front_buffer.resize(int(size.x), int(size.y))
diff --git a/installer/vendor/github.com/nsf/termbox-go/terminfo.go b/installer/vendor/github.com/nsf/termbox-go/terminfo.go
index 35dbd70b89..ab2e7a1989 100644
--- a/installer/vendor/github.com/nsf/termbox-go/terminfo.go
+++ b/installer/vendor/github.com/nsf/termbox-go/terminfo.go
@@ -69,6 +69,12 @@ func load_terminfo() ([]byte, error) {
 		}
 	}
 
+	// next, /lib/terminfo
+	data, err = ti_try_path("/lib/terminfo")
+	if err == nil {
+		return data, nil
+	}
+
 	// fall back to /usr/share/terminfo
 	return ti_try_path("/usr/share/terminfo")
 }
@@ -151,11 +157,16 @@ func setup_term() (err error) {
 		return
 	}
 
+	number_sec_len := int16(2)
+	if header[0] == 542 { // doc says it should be octal 0542, but what I see it terminfo files is 542, learn to program please... thank you..
+		number_sec_len = 4
+	}
+
 	if (header[1]+header[2])%2 != 0 {
 		// old quirk to align everything on word boundaries
 		header[2] += 1
 	}
-	str_offset = ti_header_length + header[1] + header[2] + 2*header[3]
+	str_offset = ti_header_length + header[1] + header[2] + number_sec_len*header[3]
 	table_offset = str_offset + 2*header[4]
 
 	keys = make([]string, 0xFFFF-key_min)
diff --git a/installer/vendor/github.com/pelletier/go-toml/.gitignore b/installer/vendor/github.com/pelletier/go-toml/.gitignore
deleted file mode 100644
index 99e38bbc53..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-test_program/test_program_bin
-fuzz/
diff --git a/installer/vendor/github.com/pelletier/go-toml/.travis.yml b/installer/vendor/github.com/pelletier/go-toml/.travis.yml
deleted file mode 100644
index 6e644fdfd5..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/.travis.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-sudo: false
-language: go
-go:
-  - 1.8.4
-  - 1.9.1
-  - tip
-matrix:
-  allow_failures:
-    - go: tip
-  fast_finish: true
-script:
-  - if [ -n "$(go fmt ./...)" ]; then exit 1; fi
-  - ./test.sh
-  - ./benchmark.sh $TRAVIS_BRANCH https://github.com/$TRAVIS_REPO_SLUG.git
-before_install:
-  - go get github.com/axw/gocov/gocov
-  - go get github.com/mattn/goveralls
-  - if ! go get code.google.com/p/go.tools/cmd/cover; then go get golang.org/x/tools/cmd/cover; fi
-branches:
-  only: [master]
-after_success:
-  - $HOME/gopath/bin/goveralls -service=travis-ci -coverprofile=coverage.out -repotoken $COVERALLS_TOKEN
diff --git a/installer/vendor/github.com/pelletier/go-toml/README.md b/installer/vendor/github.com/pelletier/go-toml/README.md
deleted file mode 100644
index 0d357acf35..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/README.md
+++ /dev/null
@@ -1,131 +0,0 @@
-# go-toml
-
-Go library for the [TOML](https://github.com/mojombo/toml) format.
-
-This library supports TOML version
-[v0.4.0](https://github.com/toml-lang/toml/blob/master/versions/en/toml-v0.4.0.md)
-
-[![GoDoc](https://godoc.org/github.com/pelletier/go-toml?status.svg)](http://godoc.org/github.com/pelletier/go-toml)
-[![license](https://img.shields.io/github/license/pelletier/go-toml.svg)](https://github.com/pelletier/go-toml/blob/master/LICENSE)
-[![Build Status](https://travis-ci.org/pelletier/go-toml.svg?branch=master)](https://travis-ci.org/pelletier/go-toml)
-[![Coverage Status](https://coveralls.io/repos/github/pelletier/go-toml/badge.svg?branch=master)](https://coveralls.io/github/pelletier/go-toml?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/github.com/pelletier/go-toml)](https://goreportcard.com/report/github.com/pelletier/go-toml)
-
-## Features
-
-Go-toml provides the following features for using data parsed from TOML documents:
-
-* Load TOML documents from files and string data
-* Easily navigate TOML structure using Tree
-* Mashaling and unmarshaling to and from data structures
-* Line & column position data for all parsed elements
-* [Query support similar to JSON-Path](query/)
-* Syntax errors contain line and column numbers
-
-## Import
-
-```go
-import "github.com/pelletier/go-toml"
-```
-
-## Usage example
-
-Read a TOML document:
-
-```go
-config, _ := toml.Load(`
-[postgres]
-user = "pelletier"
-password = "mypassword"`)
-// retrieve data directly
-user := config.Get("postgres.user").(string)
-
-// or using an intermediate object
-postgresConfig := config.Get("postgres").(*toml.Tree)
-password := postgresConfig.Get("password").(string)
-```
-
-Or use Unmarshal:
-
-```go
-type Postgres struct {
-    User     string
-    Password string
-}
-type Config struct {
-    Postgres Postgres
-}
-
-doc := []byte(`
-[Postgres]
-User = "pelletier"
-Password = "mypassword"`)
-
-config := Config{}
-toml.Unmarshal(doc, &config)
-fmt.Println("user=", config.Postgres.User)
-```
-
-Or use a query:
-
-```go
-// use a query to gather elements without walking the tree
-q, _ := query.Compile("$..[user,password]")
-results := q.Execute(config)
-for ii, item := range results.Values() {
-    fmt.Println("Query result %d: %v", ii, item)
-}
-```
-
-## Documentation
-
-The documentation and additional examples are available at
-[godoc.org](http://godoc.org/github.com/pelletier/go-toml).
-
-## Tools
-
-Go-toml provides two handy command line tools:
-
-* `tomll`: Reads TOML files and lint them.
-
-    ```
-    go install github.com/pelletier/go-toml/cmd/tomll
-    tomll --help
-    ```
-* `tomljson`: Reads a TOML file and outputs its JSON representation.
-
-    ```
-    go install github.com/pelletier/go-toml/cmd/tomljson
-    tomljson --help
-    ```
-
-## Contribute
-
-Feel free to report bugs and patches using GitHub's pull requests system on
-[pelletier/go-toml](https://github.com/pelletier/go-toml). Any feedback would be
-much appreciated!
-
-### Run tests
-
-You have to make sure two kind of tests run:
-
-1. The Go unit tests
-2. The TOML examples base
-
-You can run both of them using `./test.sh`.
-
-### Fuzzing
-
-The script `./fuzz.sh` is available to
-run [go-fuzz](https://github.com/dvyukov/go-fuzz) on go-toml.
-
-## Versioning
-
-Go-toml follows [Semantic Versioning](http://semver.org/). The supported version
-of [TOML](https://github.com/toml-lang/toml) is indicated at the beginning of
-this document. The last two major versions of Go are supported
-(see [Go Release Policy](https://golang.org/doc/devel/release.html#policy)).
-
-## License
-
-The MIT License (MIT). Read [LICENSE](LICENSE).
diff --git a/installer/vendor/github.com/pelletier/go-toml/benchmark.json b/installer/vendor/github.com/pelletier/go-toml/benchmark.json
deleted file mode 100644
index 86f99c6a87..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/benchmark.json
+++ /dev/null
@@ -1,164 +0,0 @@
-{
-    "array": {
-        "key1": [
-            1,
-            2,
-            3
-        ],
-        "key2": [
-            "red",
-            "yellow",
-            "green"
-        ],
-        "key3": [
-            [
-                1,
-                2
-            ],
-            [
-                3,
-                4,
-                5
-            ]
-        ],
-        "key4": [
-            [
-                1,
-                2
-            ],
-            [
-                "a",
-                "b",
-                "c"
-            ]
-        ],
-        "key5": [
-            1,
-            2,
-            3
-        ],
-        "key6": [
-            1,
-            2
-        ]
-    },
-    "boolean": {
-        "False": false,
-        "True": true
-    },
-    "datetime": {
-        "key1": "1979-05-27T07:32:00Z",
-        "key2": "1979-05-27T00:32:00-07:00",
-        "key3": "1979-05-27T00:32:00.999999-07:00"
-    },
-    "float": {
-        "both": {
-            "key": 6.626e-34
-        },
-        "exponent": {
-            "key1": 5e+22,
-            "key2": 1000000,
-            "key3": -0.02
-        },
-        "fractional": {
-            "key1": 1,
-            "key2": 3.1415,
-            "key3": -0.01
-        },
-        "underscores": {
-            "key1": 9224617.445991227,
-            "key2": 1e+100
-        }
-    },
-    "fruit": [{
-            "name": "apple",
-            "physical": {
-                "color": "red",
-                "shape": "round"
-            },
-            "variety": [{
-                    "name": "red delicious"
-                },
-                {
-                    "name": "granny smith"
-                }
-            ]
-        },
-        {
-            "name": "banana",
-            "variety": [{
-                "name": "plantain"
-            }]
-        }
-    ],
-    "integer": {
-        "key1": 99,
-        "key2": 42,
-        "key3": 0,
-        "key4": -17,
-        "underscores": {
-            "key1": 1000,
-            "key2": 5349221,
-            "key3": 12345
-        }
-    },
-    "products": [{
-            "name": "Hammer",
-            "sku": 738594937
-        },
-        {},
-        {
-            "color": "gray",
-            "name": "Nail",
-            "sku": 284758393
-        }
-    ],
-    "string": {
-        "basic": {
-            "basic": "I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."
-        },
-        "literal": {
-            "multiline": {
-                "lines": "The first newline is\ntrimmed in raw strings.\n   All other whitespace\n   is preserved.\n",
-                "regex2": "I [dw]on't need \\d{2} apples"
-            },
-            "quoted": "Tom \"Dubs\" Preston-Werner",
-            "regex": "\u003c\\i\\c*\\s*\u003e",
-            "winpath": "C:\\Users\\nodejs\\templates",
-            "winpath2": "\\\\ServerX\\admin$\\system32\\"
-        },
-        "multiline": {
-            "continued": {
-                "key1": "The quick brown fox jumps over the lazy dog.",
-                "key2": "The quick brown fox jumps over the lazy dog.",
-                "key3": "The quick brown fox jumps over the lazy dog."
-            },
-            "key1": "One\nTwo",
-            "key2": "One\nTwo",
-            "key3": "One\nTwo"
-        }
-    },
-    "table": {
-        "inline": {
-            "name": {
-                "first": "Tom",
-                "last": "Preston-Werner"
-            },
-            "point": {
-                "x": 1,
-                "y": 2
-            }
-        },
-        "key": "value",
-        "subtable": {
-            "key": "another value"
-        }
-    },
-    "x": {
-        "y": {
-            "z": {
-                "w": {}
-            }
-        }
-    }
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/benchmark.sh b/installer/vendor/github.com/pelletier/go-toml/benchmark.sh
deleted file mode 100755
index 8b8bb528e7..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/benchmark.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-
-set -e
-
-reference_ref=${1:-master}
-reference_git=${2:-.}
-
-if ! `hash benchstat 2>/dev/null`; then
-    echo "Installing benchstat"
-    go get golang.org/x/perf/cmd/benchstat
-    go install golang.org/x/perf/cmd/benchstat
-fi
-
-tempdir=`mktemp -d /tmp/go-toml-benchmark-XXXXXX`
-ref_tempdir="${tempdir}/ref"
-ref_benchmark="${ref_tempdir}/benchmark-`echo -n ${reference_ref}|tr -s '/' '-'`.txt"
-local_benchmark="`pwd`/benchmark-local.txt"
-
-echo "=== ${reference_ref} (${ref_tempdir})"
-git clone ${reference_git} ${ref_tempdir} >/dev/null 2>/dev/null
-pushd ${ref_tempdir} >/dev/null
-git checkout ${reference_ref} >/dev/null 2>/dev/null
-go test -bench=. -benchmem | tee ${ref_benchmark}
-popd >/dev/null
-
-echo ""
-echo "=== local"
-go test -bench=. -benchmem  | tee ${local_benchmark}
-
-echo ""
-echo "=== diff"
-benchstat -delta-test=none ${ref_benchmark} ${local_benchmark}
\ No newline at end of file
diff --git a/installer/vendor/github.com/pelletier/go-toml/benchmark.toml b/installer/vendor/github.com/pelletier/go-toml/benchmark.toml
deleted file mode 100644
index dfd77e0962..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/benchmark.toml
+++ /dev/null
@@ -1,244 +0,0 @@
-################################################################################
-## Comment
-
-# Speak your mind with the hash symbol. They go from the symbol to the end of
-# the line.
-
-
-################################################################################
-## Table
-
-# Tables (also known as hash tables or dictionaries) are collections of
-# key/value pairs. They appear in square brackets on a line by themselves.
-
-[table]
-
-key = "value" # Yeah, you can do this.
-
-# Nested tables are denoted by table names with dots in them. Name your tables
-# whatever crap you please, just don't use #, ., [ or ].
-
-[table.subtable]
-
-key = "another value"
-
-# You don't need to specify all the super-tables if you don't want to. TOML
-# knows how to do it for you.
-
-# [x] you
-# [x.y] don't
-# [x.y.z] need these
-[x.y.z.w] # for this to work
-
-
-################################################################################
-## Inline Table
-
-# Inline tables provide a more compact syntax for expressing tables. They are
-# especially useful for grouped data that can otherwise quickly become verbose.
-# Inline tables are enclosed in curly braces `{` and `}`. No newlines are
-# allowed between the curly braces unless they are valid within a value.
-
-[table.inline]
-
-name = { first = "Tom", last = "Preston-Werner" }
-point = { x = 1, y = 2 }
-
-
-################################################################################
-## String
-
-# There are four ways to express strings: basic, multi-line basic, literal, and
-# multi-line literal. All strings must contain only valid UTF-8 characters.
-
-[string.basic]
-
-basic = "I'm a string. \"You can quote me\". Name\tJos\u00E9\nLocation\tSF."
-
-[string.multiline]
-
-# The following strings are byte-for-byte equivalent:
-key1 = "One\nTwo"
-key2 = """One\nTwo"""
-key3 = """
-One
-Two"""
-
-[string.multiline.continued]
-
-# The following strings are byte-for-byte equivalent:
-key1 = "The quick brown fox jumps over the lazy dog."
-
-key2 = """
-The quick brown \
-
-
-  fox jumps over \
-    the lazy dog."""
-
-key3 = """\
-       The quick brown \
-       fox jumps over \
-       the lazy dog.\
-       """
-
-[string.literal]
-
-# What you see is what you get.
-winpath  = 'C:\Users\nodejs\templates'
-winpath2 = '\\ServerX\admin$\system32\'
-quoted   = 'Tom "Dubs" Preston-Werner'
-regex    = '<\i\c*\s*>'
-
-
-[string.literal.multiline]
-
-regex2 = '''I [dw]on't need \d{2} apples'''
-lines  = '''
-The first newline is
-trimmed in raw strings.
-   All other whitespace
-   is preserved.
-'''
-
-
-################################################################################
-## Integer
-
-# Integers are whole numbers. Positive numbers may be prefixed with a plus sign.
-# Negative numbers are prefixed with a minus sign.
-
-[integer]
-
-key1 = +99
-key2 = 42
-key3 = 0
-key4 = -17
-
-[integer.underscores]
-
-# For large numbers, you may use underscores to enhance readability. Each
-# underscore must be surrounded by at least one digit.
-key1 = 1_000
-key2 = 5_349_221
-key3 = 1_2_3_4_5     # valid but inadvisable
-
-
-################################################################################
-## Float
-
-# A float consists of an integer part (which may be prefixed with a plus or
-# minus sign) followed by a fractional part and/or an exponent part.
-
-[float.fractional]
-
-key1 = +1.0
-key2 = 3.1415
-key3 = -0.01
-
-[float.exponent]
-
-key1 = 5e+22
-key2 = 1e6
-key3 = -2E-2
-
-[float.both]
-
-key = 6.626e-34
-
-[float.underscores]
-
-key1 = 9_224_617.445_991_228_313
-key2 = 1e1_00
-
-
-################################################################################
-## Boolean
-
-# Booleans are just the tokens you're used to. Always lowercase.
-
-[boolean]
-
-True = true
-False = false
-
-
-################################################################################
-## Datetime
-
-# Datetimes are RFC 3339 dates.
-
-[datetime]
-
-key1 = 1979-05-27T07:32:00Z
-key2 = 1979-05-27T00:32:00-07:00
-key3 = 1979-05-27T00:32:00.999999-07:00
-
-
-################################################################################
-## Array
-
-# Arrays are square brackets with other primitives inside. Whitespace is
-# ignored. Elements are separated by commas. Data types may not be mixed.
-
-[array]
-
-key1 = [ 1, 2, 3 ]
-key2 = [ "red", "yellow", "green" ]
-key3 = [ [ 1, 2 ], [3, 4, 5] ]
-#key4 = [ [ 1, 2 ], ["a", "b", "c"] ] # this is ok
-
-# Arrays can also be multiline. So in addition to ignoring whitespace, arrays
-# also ignore newlines between the brackets.  Terminating commas are ok before
-# the closing bracket.
-
-key5 = [
-  1, 2, 3
-]
-key6 = [
-  1,
-  2, # this is ok
-]
-
-
-################################################################################
-## Array of Tables
-
-# These can be expressed by using a table name in double brackets. Each table
-# with the same double bracketed name will be an element in the array. The
-# tables are inserted in the order encountered.
-
-[[products]]
-
-name = "Hammer"
-sku = 738594937
-
-[[products]]
-
-[[products]]
-
-name = "Nail"
-sku = 284758393
-color = "gray"
-
-
-# You can create nested arrays of tables as well.
-
-[[fruit]]
-  name = "apple"
-
-  [fruit.physical]
-    color = "red"
-    shape = "round"
-
-  [[fruit.variety]]
-    name = "red delicious"
-
-  [[fruit.variety]]
-    name = "granny smith"
-
-[[fruit]]
-  name = "banana"
-
-  [[fruit.variety]]
-    name = "plantain"
diff --git a/installer/vendor/github.com/pelletier/go-toml/benchmark.yml b/installer/vendor/github.com/pelletier/go-toml/benchmark.yml
deleted file mode 100644
index 0bd19f08a6..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/benchmark.yml
+++ /dev/null
@@ -1,121 +0,0 @@
----
-array:
-  key1:
-  - 1
-  - 2
-  - 3
-  key2:
-  - red
-  - yellow
-  - green
-  key3:
-  - - 1
-    - 2
-  - - 3
-    - 4
-    - 5
-  key4:
-  - - 1
-    - 2
-  - - a
-    - b
-    - c
-  key5:
-  - 1
-  - 2
-  - 3
-  key6:
-  - 1
-  - 2
-boolean:
-  'False': false
-  'True': true
-datetime:
-  key1: '1979-05-27T07:32:00Z'
-  key2: '1979-05-27T00:32:00-07:00'
-  key3: '1979-05-27T00:32:00.999999-07:00'
-float:
-  both:
-    key: 6.626e-34
-  exponent:
-    key1: 5.0e+22
-    key2: 1000000
-    key3: -0.02
-  fractional:
-    key1: 1
-    key2: 3.1415
-    key3: -0.01
-  underscores:
-    key1: 9224617.445991227
-    key2: 1.0e+100
-fruit:
-- name: apple
-  physical:
-    color: red
-    shape: round
-  variety:
-  - name: red delicious
-  - name: granny smith
-- name: banana
-  variety:
-  - name: plantain
-integer:
-  key1: 99
-  key2: 42
-  key3: 0
-  key4: -17
-  underscores:
-    key1: 1000
-    key2: 5349221
-    key3: 12345
-products:
-- name: Hammer
-  sku: 738594937
-- {}
-- color: gray
-  name: Nail
-  sku: 284758393
-string:
-  basic:
-    basic: "I'm a string. \"You can quote me\". Name\tJosé\nLocation\tSF."
-  literal:
-    multiline:
-      lines: |
-        The first newline is
-        trimmed in raw strings.
-           All other whitespace
-           is preserved.
-      regex2: I [dw]on't need \d{2} apples
-    quoted: Tom "Dubs" Preston-Werner
-    regex: "<\\i\\c*\\s*>"
-    winpath: C:\Users\nodejs\templates
-    winpath2: "\\\\ServerX\\admin$\\system32\\"
-  multiline:
-    continued:
-      key1: The quick brown fox jumps over the lazy dog.
-      key2: The quick brown fox jumps over the lazy dog.
-      key3: The quick brown fox jumps over the lazy dog.
-    key1: |-
-      One
-      Two
-    key2: |-
-      One
-      Two
-    key3: |-
-      One
-      Two
-table:
-  inline:
-    name:
-      first: Tom
-      last: Preston-Werner
-    point:
-      x: 1
-      y: 2
-  key: value
-  subtable:
-    key: another value
-x:
-  y:
-    z:
-      w: {}
diff --git a/installer/vendor/github.com/pelletier/go-toml/benchmark_test.go b/installer/vendor/github.com/pelletier/go-toml/benchmark_test.go
deleted file mode 100644
index e1f209dfac..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/benchmark_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-package toml
-
-import (
-	"bytes"
-	"encoding/json"
-	"io/ioutil"
-	"testing"
-	"time"
-
-	burntsushi "github.com/BurntSushi/toml"
-	yaml "gopkg.in/yaml.v2"
-)
-
-type benchmarkDoc struct {
-	Table struct {
-		Key      string
-		Subtable struct {
-			Key string
-		}
-		Inline struct {
-			Name struct {
-				First string
-				Last  string
-			}
-			Point struct {
-				X int64
-				U int64
-			}
-		}
-	}
-	String struct {
-		Basic struct {
-			Basic string
-		}
-		Multiline struct {
-			Key1      string
-			Key2      string
-			Key3      string
-			Continued struct {
-				Key1 string
-				Key2 string
-				Key3 string
-			}
-		}
-		Literal struct {
-			Winpath   string
-			Winpath2  string
-			Quoted    string
-			Regex     string
-			Multiline struct {
-				Regex2 string
-				Lines  string
-			}
-		}
-	}
-	Integer struct {
-		Key1        int64
-		Key2        int64
-		Key3        int64
-		Key4        int64
-		Underscores struct {
-			Key1 int64
-			Key2 int64
-			Key3 int64
-		}
-	}
-	Float struct {
-		Fractional struct {
-			Key1 float64
-			Key2 float64
-			Key3 float64
-		}
-		Exponent struct {
-			Key1 float64
-			Key2 float64
-			Key3 float64
-		}
-		Both struct {
-			Key float64
-		}
-		Underscores struct {
-			Key1 float64
-			Key2 float64
-		}
-	}
-	Boolean struct {
-		True  bool
-		False bool
-	}
-	Datetime struct {
-		Key1 time.Time
-		Key2 time.Time
-		Key3 time.Time
-	}
-	Array struct {
-		Key1 []int64
-		Key2 []string
-		Key3 [][]int64
-		// TODO: Key4 not supported by go-toml's Unmarshal
-		Key5 []int64
-		Key6 []int64
-	}
-	Products []struct {
-		Name  string
-		Sku   int64
-		Color string
-	}
-	Fruit []struct {
-		Name     string
-		Physical struct {
-			Color   string
-			Shape   string
-			Variety []struct {
-				Name string
-			}
-		}
-	}
-}
-
-func BenchmarkParseToml(b *testing.B) {
-	fileBytes, err := ioutil.ReadFile("benchmark.toml")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		_, err := LoadReader(bytes.NewReader(fileBytes))
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkUnmarshalToml(b *testing.B) {
-	bytes, err := ioutil.ReadFile("benchmark.toml")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		target := benchmarkDoc{}
-		err := Unmarshal(bytes, &target)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkUnmarshalBurntSushiToml(b *testing.B) {
-	bytes, err := ioutil.ReadFile("benchmark.toml")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		target := benchmarkDoc{}
-		err := burntsushi.Unmarshal(bytes, &target)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkUnmarshalJson(b *testing.B) {
-	bytes, err := ioutil.ReadFile("benchmark.json")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		target := benchmarkDoc{}
-		err := json.Unmarshal(bytes, &target)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkUnmarshalYaml(b *testing.B) {
-	bytes, err := ioutil.ReadFile("benchmark.yml")
-	if err != nil {
-		b.Fatal(err)
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		target := benchmarkDoc{}
-		err := yaml.Unmarshal(bytes, &target)
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/cmd/test_program.go b/installer/vendor/github.com/pelletier/go-toml/cmd/test_program.go
deleted file mode 100644
index 73077f614b..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/cmd/test_program.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"time"
-
-	"github.com/pelletier/go-toml"
-)
-
-func main() {
-	bytes, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		log.Fatalf("Error during TOML read: %s", err)
-		os.Exit(2)
-	}
-	tree, err := toml.Load(string(bytes))
-	if err != nil {
-		log.Fatalf("Error during TOML load: %s", err)
-		os.Exit(1)
-	}
-
-	typedTree := translate(*tree)
-
-	if err := json.NewEncoder(os.Stdout).Encode(typedTree); err != nil {
-		log.Fatalf("Error encoding JSON: %s", err)
-		os.Exit(3)
-	}
-
-	os.Exit(0)
-}
-
-func translate(tomlData interface{}) interface{} {
-	switch orig := tomlData.(type) {
-	case map[string]interface{}:
-		typed := make(map[string]interface{}, len(orig))
-		for k, v := range orig {
-			typed[k] = translate(v)
-		}
-		return typed
-	case *toml.Tree:
-		return translate(*orig)
-	case toml.Tree:
-		keys := orig.Keys()
-		typed := make(map[string]interface{}, len(keys))
-		for _, k := range keys {
-			typed[k] = translate(orig.GetPath([]string{k}))
-		}
-		return typed
-	case []*toml.Tree:
-		typed := make([]map[string]interface{}, len(orig))
-		for i, v := range orig {
-			typed[i] = translate(v).(map[string]interface{})
-		}
-		return typed
-	case []map[string]interface{}:
-		typed := make([]map[string]interface{}, len(orig))
-		for i, v := range orig {
-			typed[i] = translate(v).(map[string]interface{})
-		}
-		return typed
-	case []interface{}:
-		typed := make([]interface{}, len(orig))
-		for i, v := range orig {
-			typed[i] = translate(v)
-		}
-		return tag("array", typed)
-	case time.Time:
-		return tag("datetime", orig.Format("2006-01-02T15:04:05Z"))
-	case bool:
-		return tag("bool", fmt.Sprintf("%v", orig))
-	case int64:
-		return tag("integer", fmt.Sprintf("%d", orig))
-	case float64:
-		return tag("float", fmt.Sprintf("%v", orig))
-	case string:
-		return tag("string", orig)
-	}
-
-	panic(fmt.Sprintf("Unknown type: %T", tomlData))
-}
-
-func tag(typeName string, data interface{}) map[string]interface{} {
-	return map[string]interface{}{
-		"type":  typeName,
-		"value": data,
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main.go b/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main.go
deleted file mode 100644
index b2d6fc6735..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Tomljson reads TOML and converts to JSON.
-//
-// Usage:
-//   cat file.toml | tomljson > file.json
-//   tomljson file1.toml > file.json
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/pelletier/go-toml"
-)
-
-func main() {
-	flag.Usage = func() {
-		fmt.Fprintln(os.Stderr, `tomljson can be used in two ways:
-Writing to STDIN and reading from STDOUT:
-  cat file.toml | tomljson > file.json
-
-Reading from a file name:
-  tomljson file.toml
-`)
-	}
-	flag.Parse()
-	os.Exit(processMain(flag.Args(), os.Stdin, os.Stdout, os.Stderr))
-}
-
-func processMain(files []string, defaultInput io.Reader, output io.Writer, errorOutput io.Writer) int {
-	// read from stdin and print to stdout
-	inputReader := defaultInput
-
-	if len(files) > 0 {
-		var err error
-		inputReader, err = os.Open(files[0])
-		if err != nil {
-			printError(err, errorOutput)
-			return -1
-		}
-	}
-	s, err := reader(inputReader)
-	if err != nil {
-		printError(err, errorOutput)
-		return -1
-	}
-	io.WriteString(output, s+"\n")
-	return 0
-}
-
-func printError(err error, output io.Writer) {
-	io.WriteString(output, err.Error()+"\n")
-}
-
-func reader(r io.Reader) (string, error) {
-	tree, err := toml.LoadReader(r)
-	if err != nil {
-		return "", err
-	}
-	return mapToJSON(tree)
-}
-
-func mapToJSON(tree *toml.Tree) (string, error) {
-	treeMap := tree.ToMap()
-	bytes, err := json.MarshalIndent(treeMap, "", "  ")
-	if err != nil {
-		return "", err
-	}
-	return string(bytes[:]), nil
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main_test.go b/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main_test.go
deleted file mode 100644
index 0b4bdbb11b..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/cmd/tomljson/main_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"strings"
-	"testing"
-)
-
-func expectBufferEquality(t *testing.T, name string, buffer *bytes.Buffer, expected string) {
-	output := buffer.String()
-	if output != expected {
-		t.Errorf("incorrect %s:\n%s\n\nexpected %s:\n%s", name, output, name, expected)
-		t.Log([]rune(output))
-		t.Log([]rune(expected))
-	}
-}
-
-func expectProcessMainResults(t *testing.T, input string, args []string, exitCode int, expectedOutput string, expectedError string) {
-	inputReader := strings.NewReader(input)
-	outputBuffer := new(bytes.Buffer)
-	errorBuffer := new(bytes.Buffer)
-
-	returnCode := processMain(args, inputReader, outputBuffer, errorBuffer)
-
-	expectBufferEquality(t, "output", outputBuffer, expectedOutput)
-	expectBufferEquality(t, "error", errorBuffer, expectedError)
-
-	if returnCode != exitCode {
-		t.Error("incorrect return code:", returnCode, "expected", exitCode)
-	}
-}
-
-func TestProcessMainReadFromStdin(t *testing.T) {
-	input := `
-		[mytoml]
-		a = 42`
-	expectedOutput := `{
-  "mytoml": {
-    "a": 42
-  }
-}
-`
-	expectedError := ``
-	expectedExitCode := 0
-
-	expectProcessMainResults(t, input, []string{}, expectedExitCode, expectedOutput, expectedError)
-}
-
-func TestProcessMainReadFromFile(t *testing.T) {
-	input := `
-		[mytoml]
-		a = 42`
-
-	tmpfile, err := ioutil.TempFile("", "example.toml")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := tmpfile.Write([]byte(input)); err != nil {
-		t.Fatal(err)
-	}
-
-	defer os.Remove(tmpfile.Name())
-
-	expectedOutput := `{
-  "mytoml": {
-    "a": 42
-  }
-}
-`
-	expectedError := ``
-	expectedExitCode := 0
-
-	expectProcessMainResults(t, ``, []string{tmpfile.Name()}, expectedExitCode, expectedOutput, expectedError)
-}
-
-func TestProcessMainReadFromMissingFile(t *testing.T) {
-	expectedError := `open /this/file/does/not/exist: no such file or directory
-`
-	expectProcessMainResults(t, ``, []string{"/this/file/does/not/exist"}, -1, ``, expectedError)
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/cmd/tomll/main.go b/installer/vendor/github.com/pelletier/go-toml/cmd/tomll/main.go
deleted file mode 100644
index 36c7e3759c..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/cmd/tomll/main.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Tomll is a linter for TOML
-//
-// Usage:
-//   cat file.toml | tomll > file_linted.toml
-//   tomll file1.toml file2.toml # lint the two files in place
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/pelletier/go-toml"
-)
-
-func main() {
-	flag.Usage = func() {
-		fmt.Fprintln(os.Stderr, `tomll can be used in two ways:
-Writing to STDIN and reading from STDOUT:
-  cat file.toml | tomll > file.toml
-
-Reading and updating a list of files:
-  tomll a.toml b.toml c.toml
-
-When given a list of files, tomll will modify all files in place without asking.
-`)
-	}
-	flag.Parse()
-	// read from stdin and print to stdout
-	if flag.NArg() == 0 {
-		s, err := lintReader(os.Stdin)
-		if err != nil {
-			io.WriteString(os.Stderr, err.Error())
-			os.Exit(-1)
-		}
-		io.WriteString(os.Stdout, s)
-	} else {
-		// otherwise modify a list of files
-		for _, filename := range flag.Args() {
-			s, err := lintFile(filename)
-			if err != nil {
-				io.WriteString(os.Stderr, err.Error())
-				os.Exit(-1)
-			}
-			ioutil.WriteFile(filename, []byte(s), 0644)
-		}
-	}
-}
-
-func lintFile(filename string) (string, error) {
-	tree, err := toml.LoadFile(filename)
-	if err != nil {
-		return "", err
-	}
-	return tree.String(), nil
-}
-
-func lintReader(r io.Reader) (string, error) {
-	tree, err := toml.LoadReader(r)
-	if err != nil {
-		return "", err
-	}
-	return tree.String(), nil
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/doc_test.go b/installer/vendor/github.com/pelletier/go-toml/doc_test.go
deleted file mode 100644
index 3b8171b228..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/doc_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// code examples for godoc
-
-package toml_test
-
-import (
-	"fmt"
-	"log"
-
-	toml "github.com/pelletier/go-toml"
-)
-
-func Example_tree() {
-	config, err := toml.LoadFile("config.toml")
-
-	if err != nil {
-		fmt.Println("Error ", err.Error())
-	} else {
-		// retrieve data directly
-		user := config.Get("postgres.user").(string)
-		password := config.Get("postgres.password").(string)
-
-		// or using an intermediate object
-		configTree := config.Get("postgres").(*toml.Tree)
-		user = configTree.Get("user").(string)
-		password = configTree.Get("password").(string)
-		fmt.Println("User is", user, " and password is", password)
-
-		// show where elements are in the file
-		fmt.Printf("User position: %v\n", configTree.GetPosition("user"))
-		fmt.Printf("Password position: %v\n", configTree.GetPosition("password"))
-	}
-}
-
-func Example_unmarshal() {
-	type Employer struct {
-		Name  string
-		Phone string
-	}
-	type Person struct {
-		Name     string
-		Age      int64
-		Employer Employer
-	}
-
-	document := []byte(`
-	name = "John"
-	age = 30
-	[employer]
-		name = "Company Inc."
-		phone = "+1 234 567 89012"
-	`)
-
-	person := Person{}
-	toml.Unmarshal(document, &person)
-	fmt.Println(person.Name, "is", person.Age, "and works at", person.Employer.Name)
-	// Output:
-	// John is 30 and works at Company Inc.
-}
-
-func ExampleMarshal() {
-	type Postgres struct {
-		User     string `toml:"user"`
-		Password string `toml:"password"`
-		Database string `toml:"db" commented:"true" comment:"not used anymore"`
-	}
-	type Config struct {
-		Postgres Postgres `toml:"postgres" comment:"Postgres configuration"`
-	}
-
-	config := Config{Postgres{User: "pelletier", Password: "mypassword", Database: "old_database"}}
-	b, err := toml.Marshal(config)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(string(b))
-	// Output:
-	// # Postgres configuration
-	// [postgres]
-	//
-	//   # not used anymore
-	//   # db = "old_database"
-	//   password = "mypassword"
-	//   user = "pelletier"
-}
-
-func ExampleUnmarshal() {
-	type Postgres struct {
-		User     string
-		Password string
-	}
-	type Config struct {
-		Postgres Postgres
-	}
-
-	doc := []byte(`
-	[postgres]
-	user = "pelletier"
-	password = "mypassword"`)
-
-	config := Config{}
-	toml.Unmarshal(doc, &config)
-	fmt.Println("user=", config.Postgres.User)
-	// Output:
-	// user= pelletier
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/example-crlf.toml b/installer/vendor/github.com/pelletier/go-toml/example-crlf.toml
deleted file mode 100644
index 12950a163d..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/example-crlf.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-organization = "GitHub"
-bio = "GitHub Cofounder & CEO\nLikes tater tots and beer."
-dob = 1979-05-27T07:32:00Z # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it
diff --git a/installer/vendor/github.com/pelletier/go-toml/example.toml b/installer/vendor/github.com/pelletier/go-toml/example.toml
deleted file mode 100644
index 3d902f2820..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/example.toml
+++ /dev/null
@@ -1,29 +0,0 @@
-# This is a TOML document. Boom.
-
-title = "TOML Example"
-
-[owner]
-name = "Tom Preston-Werner"
-organization = "GitHub"
-bio = "GitHub Cofounder & CEO\nLikes tater tots and beer."
-dob = 1979-05-27T07:32:00Z # First class dates? Why not?
-
-[database]
-server = "192.168.1.1"
-ports = [ 8001, 8001, 8002 ]
-connection_max = 5000
-enabled = true
-
-[servers]
-
-  # You can indent as you please. Tabs or spaces. TOML don't care.
-  [servers.alpha]
-  ip = "10.0.0.1"
-  dc = "eqdc10"
-
-  [servers.beta]
-  ip = "10.0.0.2"
-  dc = "eqdc10"
-
-[clients]
-data = [ ["gamma", "delta"], [1, 2] ] # just an update to make sure parsers support it
diff --git a/installer/vendor/github.com/pelletier/go-toml/fuzz.sh b/installer/vendor/github.com/pelletier/go-toml/fuzz.sh
deleted file mode 100755
index 3204b4c446..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/fuzz.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#! /bin/sh
-set -eu
-
-go get github.com/dvyukov/go-fuzz/go-fuzz
-go get github.com/dvyukov/go-fuzz/go-fuzz-build
-
-if [ ! -e toml-fuzz.zip ]; then
-    go-fuzz-build github.com/pelletier/go-toml
-fi
-
-rm -fr fuzz
-mkdir -p fuzz/corpus
-cp *.toml fuzz/corpus
-
-go-fuzz -bin=toml-fuzz.zip -workdir=fuzz
diff --git a/installer/vendor/github.com/pelletier/go-toml/keysparsing.go b/installer/vendor/github.com/pelletier/go-toml/keysparsing.go
index 9707c68840..284db64678 100644
--- a/installer/vendor/github.com/pelletier/go-toml/keysparsing.go
+++ b/installer/vendor/github.com/pelletier/go-toml/keysparsing.go
@@ -6,36 +6,16 @@ import (
 	"bytes"
 	"errors"
 	"fmt"
-	"strconv"
 	"unicode"
 )
 
-var escapeSequenceMap = map[rune]rune{
-	'b':  '\b',
-	't':  '\t',
-	'n':  '\n',
-	'f':  '\f',
-	'r':  '\r',
-	'"':  '"',
-	'\\': '\\',
-}
-
-type parseKeyState int
-
-const (
-	BARE parseKeyState = iota
-	BASIC
-	LITERAL
-	ESC
-	UNICODE_4
-	UNICODE_8
-)
-
+// Convert the bare key group string to an array.
+// The input supports double quotation to allow "." inside the key name,
+// but escape sequences are not supported. Lexers must unescape them beforehand.
 func parseKey(key string) ([]string, error) {
 	groups := []string{}
 	var buffer bytes.Buffer
-	var hex bytes.Buffer
-	state := BARE
+	inQuotes := false
 	wasInQuotes := false
 	ignoreSpace := true
 	expectDot := false
@@ -47,67 +27,17 @@ func parseKey(key string) ([]string, error) {
 			}
 			ignoreSpace = false
 		}
-
-		if state == ESC {
-			if char == 'u' {
-				state = UNICODE_4
-				hex.Reset()
-			} else if char == 'U' {
-				state = UNICODE_8
-				hex.Reset()
-			} else if newChar, ok := escapeSequenceMap[char]; ok {
-				buffer.WriteRune(newChar)
-				state = BASIC
-			} else {
-				return nil, fmt.Errorf(`invalid escape sequence \%c`, char)
-			}
-			continue
-		}
-
-		if state == UNICODE_4 || state == UNICODE_8 {
-			if isHexDigit(char) {
-				hex.WriteRune(char)
-			}
-			if (state == UNICODE_4 && hex.Len() == 4) || (state == UNICODE_8 && hex.Len() == 8) {
-				if value, err := strconv.ParseInt(hex.String(), 16, 32); err == nil {
-					buffer.WriteRune(rune(value))
-				} else {
-					return nil, err
-				}
-				state = BASIC
-			}
-			continue
-		}
-
 		switch char {
-		case '\\':
-			if state == BASIC {
-				state = ESC
-			} else if state == LITERAL {
-				buffer.WriteRune(char)
-			}
-		case '\'':
-			if state == BARE {
-				state = LITERAL
-			} else if state == LITERAL {
-				groups = append(groups, buffer.String())
-				buffer.Reset()
-				wasInQuotes = true
-				state = BARE
-			}
-			expectDot = false
 		case '"':
-			if state == BARE {
-				state = BASIC
-			} else if state == BASIC {
+			if inQuotes {
 				groups = append(groups, buffer.String())
 				buffer.Reset()
-				state = BARE
 				wasInQuotes = true
 			}
+			inQuotes = !inQuotes
 			expectDot = false
 		case '.':
-			if state != BARE {
+			if inQuotes {
 				buffer.WriteRune(char)
 			} else {
 				if !wasInQuotes {
@@ -122,31 +52,25 @@ func parseKey(key string) ([]string, error) {
 				wasInQuotes = false
 			}
 		case ' ':
-			if state == BASIC {
+			if inQuotes {
 				buffer.WriteRune(char)
 			} else {
 				expectDot = true
 			}
 		default:
-			if state == BARE {
-				if !isValidBareChar(char) {
-					return nil, fmt.Errorf("invalid bare character: %c", char)
-				} else if expectDot {
-					return nil, errors.New("what?")
-				}
+			if !inQuotes && !isValidBareChar(char) {
+				return nil, fmt.Errorf("invalid bare character: %c", char)
+			}
+			if !inQuotes && expectDot {
+				return nil, errors.New("what?")
 			}
 			buffer.WriteRune(char)
 			expectDot = false
 		}
 	}
-
-	// state must be BARE at the end
-	if state == ESC {
-		return nil, errors.New("unfinished escape sequence")
-	} else if state != BARE {
+	if inQuotes {
 		return nil, errors.New("mismatched quotes")
 	}
-
 	if buffer.Len() > 0 {
 		groups = append(groups, buffer.String())
 	}
diff --git a/installer/vendor/github.com/pelletier/go-toml/keysparsing_test.go b/installer/vendor/github.com/pelletier/go-toml/keysparsing_test.go
deleted file mode 100644
index 7aa4cd64a6..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/keysparsing_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"testing"
-)
-
-func testResult(t *testing.T, key string, expected []string) {
-	parsed, err := parseKey(key)
-	t.Logf("key=%s expected=%s parsed=%s", key, expected, parsed)
-	if err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-	if len(expected) != len(parsed) {
-		t.Fatal("Expected length", len(expected), "but", len(parsed), "parsed")
-	}
-	for index, expectedKey := range expected {
-		if expectedKey != parsed[index] {
-			t.Fatal("Expected", expectedKey, "at index", index, "but found", parsed[index])
-		}
-	}
-}
-
-func testError(t *testing.T, key string, expectedError string) {
-	res, err := parseKey(key)
-	if err == nil {
-		t.Fatalf("Expected error, but succesfully parsed key %s", res)
-	}
-	if fmt.Sprintf("%s", err) != expectedError {
-		t.Fatalf("Expected error \"%s\", but got \"%s\".", expectedError, err)
-	}
-}
-
-func TestBareKeyBasic(t *testing.T) {
-	testResult(t, "test", []string{"test"})
-}
-
-func TestBareKeyDotted(t *testing.T) {
-	testResult(t, "this.is.a.key", []string{"this", "is", "a", "key"})
-}
-
-func TestDottedKeyBasic(t *testing.T) {
-	testResult(t, "\"a.dotted.key\"", []string{"a.dotted.key"})
-}
-
-func TestBaseKeyPound(t *testing.T) {
-	testError(t, "hello#world", "invalid bare character: #")
-}
-
-func TestQuotedKeys(t *testing.T) {
-	testResult(t, `hello."foo".bar`, []string{"hello", "foo", "bar"})
-	testResult(t, `"hello!"`, []string{"hello!"})
-	testResult(t, `"hello\tworld"`, []string{"hello\tworld"})
-	testResult(t, `"\U0001F914"`, []string{"\U0001F914"})
-	testResult(t, `"\u2764"`, []string{"\u2764"})
-
-	testResult(t, `hello.'foo'.bar`, []string{"hello", "foo", "bar"})
-	testResult(t, `'hello!'`, []string{"hello!"})
-	testResult(t, `'hello\tworld'`, []string{`hello\tworld`})
-
-	testError(t, `"\w"`, `invalid escape sequence \w`)
-	testError(t, `"\`, `unfinished escape sequence`)
-	testError(t, `"\t`, `mismatched quotes`)
-}
-
-func TestEmptyKey(t *testing.T) {
-	testError(t, "", "empty key")
-	testError(t, " ", "empty key")
-	testResult(t, `""`, []string{""})
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/lexer.go b/installer/vendor/github.com/pelletier/go-toml/lexer.go
index 1b6647d66f..d11de42859 100644
--- a/installer/vendor/github.com/pelletier/go-toml/lexer.go
+++ b/installer/vendor/github.com/pelletier/go-toml/lexer.go
@@ -204,6 +204,14 @@ func (l *tomlLexer) lexRvalue() tomlLexStateFn {
 			return l.lexFalse
 		}
 
+		if l.follow("inf") {
+			return l.lexInf
+		}
+
+		if l.follow("nan") {
+			return l.lexNan
+		}
+
 		if isSpace(next) {
 			l.skip()
 			continue
@@ -265,6 +273,18 @@ func (l *tomlLexer) lexFalse() tomlLexStateFn {
 	return l.lexRvalue
 }
 
+func (l *tomlLexer) lexInf() tomlLexStateFn {
+	l.fastForward(3)
+	l.emit(tokenInf)
+	return l.lexRvalue
+}
+
+func (l *tomlLexer) lexNan() tomlLexStateFn {
+	l.fastForward(3)
+	l.emit(tokenNan)
+	return l.lexRvalue
+}
+
 func (l *tomlLexer) lexEqual() tomlLexStateFn {
 	l.next()
 	l.emit(tokenEqual)
@@ -277,6 +297,8 @@ func (l *tomlLexer) lexComma() tomlLexStateFn {
 	return l.lexRvalue
 }
 
+// Parse the key and emits its value without escape sequences.
+// bare keys, basic string keys and literal string keys are supported.
 func (l *tomlLexer) lexKey() tomlLexStateFn {
 	growingString := ""
 
@@ -287,7 +309,16 @@ func (l *tomlLexer) lexKey() tomlLexStateFn {
 			if err != nil {
 				return l.errorf(err.Error())
 			}
-			growingString += `"` + str + `"`
+			growingString += str
+			l.next()
+			continue
+		} else if r == '\'' {
+			l.next()
+			str, err := l.lexLiteralStringAsString(`'`, false)
+			if err != nil {
+				return l.errorf(err.Error())
+			}
+			growingString += str
 			l.next()
 			continue
 		} else if r == '\n' {
@@ -527,6 +558,7 @@ func (l *tomlLexer) lexTableKey() tomlLexStateFn {
 	return l.lexInsideTableKey
 }
 
+// Parse the key till "]]", but only bare keys are supported
 func (l *tomlLexer) lexInsideTableArrayKey() tomlLexStateFn {
 	for r := l.peek(); r != eof; r = l.peek() {
 		switch r {
@@ -550,6 +582,7 @@ func (l *tomlLexer) lexInsideTableArrayKey() tomlLexStateFn {
 	return l.errorf("unclosed table array key")
 }
 
+// Parse the key till "]" but only bare keys are supported
 func (l *tomlLexer) lexInsideTableKey() tomlLexStateFn {
 	for r := l.peek(); r != eof; r = l.peek() {
 		switch r {
@@ -575,11 +608,77 @@ func (l *tomlLexer) lexRightBracket() tomlLexStateFn {
 	return l.lexRvalue
 }
 
+type validRuneFn func(r rune) bool
+
+func isValidHexRune(r rune) bool {
+	return r >= 'a' && r <= 'f' ||
+		r >= 'A' && r <= 'F' ||
+		r >= '0' && r <= '9' ||
+		r == '_'
+}
+
+func isValidOctalRune(r rune) bool {
+	return r >= '0' && r <= '7' || r == '_'
+}
+
+func isValidBinaryRune(r rune) bool {
+	return r == '0' || r == '1' || r == '_'
+}
+
 func (l *tomlLexer) lexNumber() tomlLexStateFn {
 	r := l.peek()
+
+	if r == '0' {
+		follow := l.peekString(2)
+		if len(follow) == 2 {
+			var isValidRune validRuneFn
+			switch follow[1] {
+			case 'x':
+				isValidRune = isValidHexRune
+			case 'o':
+				isValidRune = isValidOctalRune
+			case 'b':
+				isValidRune = isValidBinaryRune
+			default:
+				if follow[1] >= 'a' && follow[1] <= 'z' || follow[1] >= 'A' && follow[1] <= 'Z' {
+					return l.errorf("unknown number base: %s. possible options are x (hex) o (octal) b (binary)", string(follow[1]))
+				}
+			}
+
+			if isValidRune != nil {
+				l.next()
+				l.next()
+				digitSeen := false
+				for {
+					next := l.peek()
+					if !isValidRune(next) {
+						break
+					}
+					digitSeen = true
+					l.next()
+				}
+
+				if !digitSeen {
+					return l.errorf("number needs at least one digit")
+				}
+
+				l.emit(tokenInteger)
+
+				return l.lexRvalue
+			}
+		}
+	}
+
 	if r == '+' || r == '-' {
 		l.next()
+		if l.follow("inf") {
+			return l.lexInf
+		}
+		if l.follow("nan") {
+			return l.lexNan
+		}
 	}
+
 	pointSeen := false
 	expSeen := false
 	digitSeen := false
diff --git a/installer/vendor/github.com/pelletier/go-toml/lexer_test.go b/installer/vendor/github.com/pelletier/go-toml/lexer_test.go
deleted file mode 100644
index 313b83c5d1..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/lexer_test.go
+++ /dev/null
@@ -1,750 +0,0 @@
-package toml
-
-import (
-	"reflect"
-	"testing"
-)
-
-func testFlow(t *testing.T, input string, expectedFlow []token) {
-	tokens := lexToml([]byte(input))
-	if !reflect.DeepEqual(tokens, expectedFlow) {
-		t.Fatal("Different flows. Expected\n", expectedFlow, "\nGot:\n", tokens)
-	}
-}
-
-func TestValidKeyGroup(t *testing.T) {
-	testFlow(t, "[hello world]", []token{
-		{Position{1, 1}, tokenLeftBracket, "["},
-		{Position{1, 2}, tokenKeyGroup, "hello world"},
-		{Position{1, 13}, tokenRightBracket, "]"},
-		{Position{1, 14}, tokenEOF, ""},
-	})
-}
-
-func TestNestedQuotedUnicodeKeyGroup(t *testing.T) {
-	testFlow(t, `[ j . "ʞ" . l ]`, []token{
-		{Position{1, 1}, tokenLeftBracket, "["},
-		{Position{1, 2}, tokenKeyGroup, ` j . "ʞ" . l `},
-		{Position{1, 15}, tokenRightBracket, "]"},
-		{Position{1, 16}, tokenEOF, ""},
-	})
-}
-
-func TestUnclosedKeyGroup(t *testing.T) {
-	testFlow(t, "[hello world", []token{
-		{Position{1, 1}, tokenLeftBracket, "["},
-		{Position{1, 2}, tokenError, "unclosed table key"},
-	})
-}
-
-func TestComment(t *testing.T) {
-	testFlow(t, "# blahblah", []token{
-		{Position{1, 11}, tokenEOF, ""},
-	})
-}
-
-func TestKeyGroupComment(t *testing.T) {
-	testFlow(t, "[hello world] # blahblah", []token{
-		{Position{1, 1}, tokenLeftBracket, "["},
-		{Position{1, 2}, tokenKeyGroup, "hello world"},
-		{Position{1, 13}, tokenRightBracket, "]"},
-		{Position{1, 25}, tokenEOF, ""},
-	})
-}
-
-func TestMultipleKeyGroupsComment(t *testing.T) {
-	testFlow(t, "[hello world] # blahblah\n[test]", []token{
-		{Position{1, 1}, tokenLeftBracket, "["},
-		{Position{1, 2}, tokenKeyGroup, "hello world"},
-		{Position{1, 13}, tokenRightBracket, "]"},
-		{Position{2, 1}, tokenLeftBracket, "["},
-		{Position{2, 2}, tokenKeyGroup, "test"},
-		{Position{2, 6}, tokenRightBracket, "]"},
-		{Position{2, 7}, tokenEOF, ""},
-	})
-}
-
-func TestSimpleWindowsCRLF(t *testing.T) {
-	testFlow(t, "a=4\r\nb=2", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 2}, tokenEqual, "="},
-		{Position{1, 3}, tokenInteger, "4"},
-		{Position{2, 1}, tokenKey, "b"},
-		{Position{2, 2}, tokenEqual, "="},
-		{Position{2, 3}, tokenInteger, "2"},
-		{Position{2, 4}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKey(t *testing.T) {
-	testFlow(t, "hello", []token{
-		{Position{1, 1}, tokenKey, "hello"},
-		{Position{1, 6}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKeyWithUnderscore(t *testing.T) {
-	testFlow(t, "hello_hello", []token{
-		{Position{1, 1}, tokenKey, "hello_hello"},
-		{Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKeyWithDash(t *testing.T) {
-	testFlow(t, "hello-world", []token{
-		{Position{1, 1}, tokenKey, "hello-world"},
-		{Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKeyWithUppercaseMix(t *testing.T) {
-	testFlow(t, "helloHELLOHello", []token{
-		{Position{1, 1}, tokenKey, "helloHELLOHello"},
-		{Position{1, 16}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKeyWithInternationalCharacters(t *testing.T) {
-	testFlow(t, "héllÖ", []token{
-		{Position{1, 1}, tokenKey, "héllÖ"},
-		{Position{1, 6}, tokenEOF, ""},
-	})
-}
-
-func TestBasicKeyAndEqual(t *testing.T) {
-	testFlow(t, "hello =", []token{
-		{Position{1, 1}, tokenKey, "hello"},
-		{Position{1, 7}, tokenEqual, "="},
-		{Position{1, 8}, tokenEOF, ""},
-	})
-}
-
-func TestKeyWithSharpAndEqual(t *testing.T) {
-	testFlow(t, "key#name = 5", []token{
-		{Position{1, 1}, tokenError, "keys cannot contain # character"},
-	})
-}
-
-func TestKeyWithSymbolsAndEqual(t *testing.T) {
-	testFlow(t, "~!@$^&*()_+-`1234567890[]\\|/?><.,;:' = 5", []token{
-		{Position{1, 1}, tokenError, "keys cannot contain ~ character"},
-	})
-}
-
-func TestKeyEqualStringEscape(t *testing.T) {
-	testFlow(t, `foo = "hello\""`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "hello\""},
-		{Position{1, 16}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualStringUnfinished(t *testing.T) {
-	testFlow(t, `foo = "bar`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unclosed string"},
-	})
-}
-
-func TestKeyEqualString(t *testing.T) {
-	testFlow(t, `foo = "bar"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "bar"},
-		{Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualTrue(t *testing.T) {
-	testFlow(t, "foo = true", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenTrue, "true"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualFalse(t *testing.T) {
-	testFlow(t, "foo = false", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenFalse, "false"},
-		{Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestArrayNestedString(t *testing.T) {
-	testFlow(t, `a = [ ["hello", "world"] ]`, []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenLeftBracket, "["},
-		{Position{1, 7}, tokenLeftBracket, "["},
-		{Position{1, 9}, tokenString, "hello"},
-		{Position{1, 15}, tokenComma, ","},
-		{Position{1, 18}, tokenString, "world"},
-		{Position{1, 24}, tokenRightBracket, "]"},
-		{Position{1, 26}, tokenRightBracket, "]"},
-		{Position{1, 27}, tokenEOF, ""},
-	})
-}
-
-func TestArrayNestedInts(t *testing.T) {
-	testFlow(t, "a = [ [42, 21], [10] ]", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenLeftBracket, "["},
-		{Position{1, 7}, tokenLeftBracket, "["},
-		{Position{1, 8}, tokenInteger, "42"},
-		{Position{1, 10}, tokenComma, ","},
-		{Position{1, 12}, tokenInteger, "21"},
-		{Position{1, 14}, tokenRightBracket, "]"},
-		{Position{1, 15}, tokenComma, ","},
-		{Position{1, 17}, tokenLeftBracket, "["},
-		{Position{1, 18}, tokenInteger, "10"},
-		{Position{1, 20}, tokenRightBracket, "]"},
-		{Position{1, 22}, tokenRightBracket, "]"},
-		{Position{1, 23}, tokenEOF, ""},
-	})
-}
-
-func TestArrayInts(t *testing.T) {
-	testFlow(t, "a = [ 42, 21, 10, ]", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenLeftBracket, "["},
-		{Position{1, 7}, tokenInteger, "42"},
-		{Position{1, 9}, tokenComma, ","},
-		{Position{1, 11}, tokenInteger, "21"},
-		{Position{1, 13}, tokenComma, ","},
-		{Position{1, 15}, tokenInteger, "10"},
-		{Position{1, 17}, tokenComma, ","},
-		{Position{1, 19}, tokenRightBracket, "]"},
-		{Position{1, 20}, tokenEOF, ""},
-	})
-}
-
-func TestMultilineArrayComments(t *testing.T) {
-	testFlow(t, "a = [1, # wow\n2, # such items\n3, # so array\n]", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenLeftBracket, "["},
-		{Position{1, 6}, tokenInteger, "1"},
-		{Position{1, 7}, tokenComma, ","},
-		{Position{2, 1}, tokenInteger, "2"},
-		{Position{2, 2}, tokenComma, ","},
-		{Position{3, 1}, tokenInteger, "3"},
-		{Position{3, 2}, tokenComma, ","},
-		{Position{4, 1}, tokenRightBracket, "]"},
-		{Position{4, 2}, tokenEOF, ""},
-	})
-}
-
-func TestNestedArraysComment(t *testing.T) {
-	toml := `
-someArray = [
-# does not work
-["entry1"]
-]`
-	testFlow(t, toml, []token{
-		{Position{2, 1}, tokenKey, "someArray"},
-		{Position{2, 11}, tokenEqual, "="},
-		{Position{2, 13}, tokenLeftBracket, "["},
-		{Position{4, 1}, tokenLeftBracket, "["},
-		{Position{4, 3}, tokenString, "entry1"},
-		{Position{4, 10}, tokenRightBracket, "]"},
-		{Position{5, 1}, tokenRightBracket, "]"},
-		{Position{5, 2}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualArrayBools(t *testing.T) {
-	testFlow(t, "foo = [true, false, true]", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenLeftBracket, "["},
-		{Position{1, 8}, tokenTrue, "true"},
-		{Position{1, 12}, tokenComma, ","},
-		{Position{1, 14}, tokenFalse, "false"},
-		{Position{1, 19}, tokenComma, ","},
-		{Position{1, 21}, tokenTrue, "true"},
-		{Position{1, 25}, tokenRightBracket, "]"},
-		{Position{1, 26}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualArrayBoolsWithComments(t *testing.T) {
-	testFlow(t, "foo = [true, false, true] # YEAH", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenLeftBracket, "["},
-		{Position{1, 8}, tokenTrue, "true"},
-		{Position{1, 12}, tokenComma, ","},
-		{Position{1, 14}, tokenFalse, "false"},
-		{Position{1, 19}, tokenComma, ","},
-		{Position{1, 21}, tokenTrue, "true"},
-		{Position{1, 25}, tokenRightBracket, "]"},
-		{Position{1, 33}, tokenEOF, ""},
-	})
-}
-
-func TestDateRegexp(t *testing.T) {
-	if dateRegexp.FindString("1979-05-27T07:32:00Z") == "" {
-		t.Error("basic lexing")
-	}
-	if dateRegexp.FindString("1979-05-27T00:32:00-07:00") == "" {
-		t.Error("offset lexing")
-	}
-	if dateRegexp.FindString("1979-05-27T00:32:00.999999-07:00") == "" {
-		t.Error("nano precision lexing")
-	}
-}
-
-func TestKeyEqualDate(t *testing.T) {
-	testFlow(t, "foo = 1979-05-27T07:32:00Z", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenDate, "1979-05-27T07:32:00Z"},
-		{Position{1, 27}, tokenEOF, ""},
-	})
-	testFlow(t, "foo = 1979-05-27T00:32:00-07:00", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenDate, "1979-05-27T00:32:00-07:00"},
-		{Position{1, 32}, tokenEOF, ""},
-	})
-	testFlow(t, "foo = 1979-05-27T00:32:00.999999-07:00", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenDate, "1979-05-27T00:32:00.999999-07:00"},
-		{Position{1, 39}, tokenEOF, ""},
-	})
-}
-
-func TestFloatEndingWithDot(t *testing.T) {
-	testFlow(t, "foo = 42.", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenError, "float cannot end with a dot"},
-	})
-}
-
-func TestFloatWithTwoDots(t *testing.T) {
-	testFlow(t, "foo = 4.2.", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenError, "cannot have two dots in one float"},
-	})
-}
-
-func TestFloatWithExponent1(t *testing.T) {
-	testFlow(t, "a = 5e+22", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenFloat, "5e+22"},
-		{Position{1, 10}, tokenEOF, ""},
-	})
-}
-
-func TestFloatWithExponent2(t *testing.T) {
-	testFlow(t, "a = 5E+22", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenFloat, "5E+22"},
-		{Position{1, 10}, tokenEOF, ""},
-	})
-}
-
-func TestFloatWithExponent3(t *testing.T) {
-	testFlow(t, "a = -5e+22", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenFloat, "-5e+22"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-}
-
-func TestFloatWithExponent4(t *testing.T) {
-	testFlow(t, "a = -5e-22", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenFloat, "-5e-22"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-}
-
-func TestFloatWithExponent5(t *testing.T) {
-	testFlow(t, "a = 6.626e-34", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenFloat, "6.626e-34"},
-		{Position{1, 14}, tokenEOF, ""},
-	})
-}
-
-func TestInvalidEsquapeSequence(t *testing.T) {
-	testFlow(t, `foo = "\x"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "invalid escape sequence: \\x"},
-	})
-}
-
-func TestNestedArrays(t *testing.T) {
-	testFlow(t, "foo = [[[]]]", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenLeftBracket, "["},
-		{Position{1, 8}, tokenLeftBracket, "["},
-		{Position{1, 9}, tokenLeftBracket, "["},
-		{Position{1, 10}, tokenRightBracket, "]"},
-		{Position{1, 11}, tokenRightBracket, "]"},
-		{Position{1, 12}, tokenRightBracket, "]"},
-		{Position{1, 13}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualNumber(t *testing.T) {
-	testFlow(t, "foo = 42", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "42"},
-		{Position{1, 9}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = +42", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "+42"},
-		{Position{1, 10}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = -42", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "-42"},
-		{Position{1, 10}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = 4.2", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenFloat, "4.2"},
-		{Position{1, 10}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = +4.2", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenFloat, "+4.2"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = -4.2", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenFloat, "-4.2"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = 1_000", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "1_000"},
-		{Position{1, 12}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = 5_349_221", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "5_349_221"},
-		{Position{1, 16}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = 1_2_3_4_5", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "1_2_3_4_5"},
-		{Position{1, 16}, tokenEOF, ""},
-	})
-
-	testFlow(t, "flt8 = 9_224_617.445_991_228_313", []token{
-		{Position{1, 1}, tokenKey, "flt8"},
-		{Position{1, 6}, tokenEqual, "="},
-		{Position{1, 8}, tokenFloat, "9_224_617.445_991_228_313"},
-		{Position{1, 33}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = +", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenError, "no digit in that number"},
-	})
-}
-
-func TestMultiline(t *testing.T) {
-	testFlow(t, "foo = 42\nbar=21", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 7}, tokenInteger, "42"},
-		{Position{2, 1}, tokenKey, "bar"},
-		{Position{2, 4}, tokenEqual, "="},
-		{Position{2, 5}, tokenInteger, "21"},
-		{Position{2, 7}, tokenEOF, ""},
-	})
-}
-
-func TestKeyEqualStringUnicodeEscape(t *testing.T) {
-	testFlow(t, `foo = "hello \u2665"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "hello ♥"},
-		{Position{1, 21}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "hello \U000003B4"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "hello δ"},
-		{Position{1, 25}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "\uabcd"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "\uabcd"},
-		{Position{1, 15}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "\uABCD"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "\uABCD"},
-		{Position{1, 15}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "\U000bcdef"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "\U000bcdef"},
-		{Position{1, 19}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "\U000BCDEF"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "\U000BCDEF"},
-		{Position{1, 19}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = "\u2"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unfinished unicode escape"},
-	})
-	testFlow(t, `foo = "\U2"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unfinished unicode escape"},
-	})
-}
-
-func TestKeyEqualStringNoEscape(t *testing.T) {
-	testFlow(t, "foo = \"hello \u0002\"", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unescaped control character U+0002"},
-	})
-	testFlow(t, "foo = \"hello \u001F\"", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unescaped control character U+001F"},
-	})
-}
-
-func TestLiteralString(t *testing.T) {
-	testFlow(t, `foo = 'C:\Users\nodejs\templates'`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, `C:\Users\nodejs\templates`},
-		{Position{1, 34}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = '\\ServerX\admin$\system32\'`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, `\\ServerX\admin$\system32\`},
-		{Position{1, 35}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = 'Tom "Dubs" Preston-Werner'`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, `Tom "Dubs" Preston-Werner`},
-		{Position{1, 34}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = '<\i\c*\s*>'`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, `<\i\c*\s*>`},
-		{Position{1, 19}, tokenEOF, ""},
-	})
-	testFlow(t, `foo = 'C:\Users\nodejs\unfinis`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenError, "unclosed string"},
-	})
-}
-
-func TestMultilineLiteralString(t *testing.T) {
-	testFlow(t, `foo = '''hello 'literal' world'''`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 10}, tokenString, `hello 'literal' world`},
-		{Position{1, 34}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = '''\nhello\n'literal'\nworld'''", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{2, 1}, tokenString, "hello\n'literal'\nworld"},
-		{Position{4, 9}, tokenEOF, ""},
-	})
-	testFlow(t, "foo = '''\r\nhello\r\n'literal'\r\nworld'''", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{2, 1}, tokenString, "hello\r\n'literal'\r\nworld"},
-		{Position{4, 9}, tokenEOF, ""},
-	})
-}
-
-func TestMultilineString(t *testing.T) {
-	testFlow(t, `foo = """hello "literal" world"""`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 10}, tokenString, `hello "literal" world`},
-		{Position{1, 34}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = \"\"\"\r\nhello\\\r\n\"literal\"\\\nworld\"\"\"", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{2, 1}, tokenString, "hello\"literal\"world"},
-		{Position{4, 9}, tokenEOF, ""},
-	})
-
-	testFlow(t, "foo = \"\"\"\\\n    \\\n    \\\n    hello\\\nmultiline\\\nworld\"\"\"", []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 10}, tokenString, "hellomultilineworld"},
-		{Position{6, 9}, tokenEOF, ""},
-	})
-
-	testFlow(t, "key2 = \"\"\"\nThe quick brown \\\n\n\n  fox jumps over \\\n    the lazy dog.\"\"\"", []token{
-		{Position{1, 1}, tokenKey, "key2"},
-		{Position{1, 6}, tokenEqual, "="},
-		{Position{2, 1}, tokenString, "The quick brown fox jumps over the lazy dog."},
-		{Position{6, 21}, tokenEOF, ""},
-	})
-
-	testFlow(t, "key2 = \"\"\"\\\n       The quick brown \\\n       fox jumps over \\\n       the lazy dog.\\\n       \"\"\"", []token{
-		{Position{1, 1}, tokenKey, "key2"},
-		{Position{1, 6}, tokenEqual, "="},
-		{Position{1, 11}, tokenString, "The quick brown fox jumps over the lazy dog."},
-		{Position{5, 11}, tokenEOF, ""},
-	})
-
-	testFlow(t, `key2 = "Roses are red\nViolets are blue"`, []token{
-		{Position{1, 1}, tokenKey, "key2"},
-		{Position{1, 6}, tokenEqual, "="},
-		{Position{1, 9}, tokenString, "Roses are red\nViolets are blue"},
-		{Position{1, 41}, tokenEOF, ""},
-	})
-
-	testFlow(t, "key2 = \"\"\"\nRoses are red\nViolets are blue\"\"\"", []token{
-		{Position{1, 1}, tokenKey, "key2"},
-		{Position{1, 6}, tokenEqual, "="},
-		{Position{2, 1}, tokenString, "Roses are red\nViolets are blue"},
-		{Position{3, 20}, tokenEOF, ""},
-	})
-}
-
-func TestUnicodeString(t *testing.T) {
-	testFlow(t, `foo = "hello ♥ world"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "hello ♥ world"},
-		{Position{1, 22}, tokenEOF, ""},
-	})
-}
-func TestEscapeInString(t *testing.T) {
-	testFlow(t, `foo = "\b\f\/"`, []token{
-		{Position{1, 1}, tokenKey, "foo"},
-		{Position{1, 5}, tokenEqual, "="},
-		{Position{1, 8}, tokenString, "\b\f/"},
-		{Position{1, 15}, tokenEOF, ""},
-	})
-}
-
-func TestKeyGroupArray(t *testing.T) {
-	testFlow(t, "[[foo]]", []token{
-		{Position{1, 1}, tokenDoubleLeftBracket, "[["},
-		{Position{1, 3}, tokenKeyGroupArray, "foo"},
-		{Position{1, 6}, tokenDoubleRightBracket, "]]"},
-		{Position{1, 8}, tokenEOF, ""},
-	})
-}
-
-func TestQuotedKey(t *testing.T) {
-	testFlow(t, "\"a b\" = 42", []token{
-		{Position{1, 1}, tokenKey, "\"a b\""},
-		{Position{1, 7}, tokenEqual, "="},
-		{Position{1, 9}, tokenInteger, "42"},
-		{Position{1, 11}, tokenEOF, ""},
-	})
-}
-
-func TestKeyNewline(t *testing.T) {
-	testFlow(t, "a\n= 4", []token{
-		{Position{1, 1}, tokenError, "keys cannot contain new lines"},
-	})
-}
-
-func TestInvalidFloat(t *testing.T) {
-	testFlow(t, "a=7e1_", []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 2}, tokenEqual, "="},
-		{Position{1, 3}, tokenFloat, "7e1_"},
-		{Position{1, 7}, tokenEOF, ""},
-	})
-}
-
-func TestLexUnknownRvalue(t *testing.T) {
-	testFlow(t, `a = !b`, []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenError, "no value can start with !"},
-	})
-
-	testFlow(t, `a = \b`, []token{
-		{Position{1, 1}, tokenKey, "a"},
-		{Position{1, 3}, tokenEqual, "="},
-		{Position{1, 5}, tokenError, `no value can start with \`},
-	})
-}
-
-func BenchmarkLexer(b *testing.B) {
-	sample := `title = "Hugo: A Fast and Flexible Website Generator"
-baseurl = "http://gohugo.io/"
-MetaDataFormat = "yaml"
-pluralizeListTitles = false
-
-[params]
-  description = "Documentation of Hugo, a fast and flexible static site generator built with love by spf13, bep and friends in Go"
-  author = "Steve Francia (spf13) and friends"
-  release = "0.22-DEV"
-
-[[menu.main]]
-	name = "Download Hugo"
-	pre = "<i class='fa fa-download'></i>"
-	url = "https://github.com/spf13/hugo/releases"
-	weight = -200
-`
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		lexToml([]byte(sample))
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/marshal.go b/installer/vendor/github.com/pelletier/go-toml/marshal.go
index 1bbdfa1d89..f584ba4eca 100644
--- a/installer/vendor/github.com/pelletier/go-toml/marshal.go
+++ b/installer/vendor/github.com/pelletier/go-toml/marshal.go
@@ -20,7 +20,8 @@ type tomlOpts struct {
 }
 
 type encOpts struct {
-	quoteMapKeys bool
+	quoteMapKeys            bool
+	arraysOneElementPerLine bool
 }
 
 var encOptsDefaults = encOpts{
@@ -174,6 +175,25 @@ func (e *Encoder) QuoteMapKeys(v bool) *Encoder {
 	return e
 }
 
+// ArraysWithOneElementPerLine sets up the encoder to encode arrays
+// with more than one element on multiple lines instead of one.
+//
+// For example:
+//
+//   A = [1,2,3]
+//
+// Becomes
+//
+//   A = [
+//     1,
+//     2,
+//     3,
+//   ]
+func (e *Encoder) ArraysWithOneElementPerLine(v bool) *Encoder {
+	e.arraysOneElementPerLine = v
+	return e
+}
+
 func (e *Encoder) marshal(v interface{}) ([]byte, error) {
 	mtype := reflect.TypeOf(v)
 	if mtype.Kind() != reflect.Struct {
@@ -187,8 +207,11 @@ func (e *Encoder) marshal(v interface{}) ([]byte, error) {
 	if err != nil {
 		return []byte{}, err
 	}
-	s, err := t.ToTomlString()
-	return []byte(s), err
+
+	var buf bytes.Buffer
+	_, err = t.writeTo(&buf, "", "", 0, e.arraysOneElementPerLine)
+
+	return buf.Bytes(), err
 }
 
 // Convert given marshal struct or map value to toml tree
@@ -207,7 +230,7 @@ func (e *Encoder) valueToTree(mtype reflect.Type, mval reflect.Value) (*Tree, er
 				if err != nil {
 					return nil, err
 				}
-				tval.Set(opts.name, opts.comment, opts.commented, val)
+				tval.SetWithComment(opts.name, opts.comment, opts.commented, val)
 			}
 		}
 	case reflect.Map:
@@ -218,13 +241,13 @@ func (e *Encoder) valueToTree(mtype reflect.Type, mval reflect.Value) (*Tree, er
 				return nil, err
 			}
 			if e.quoteMapKeys {
-				keyStr, err := tomlValueStringRepresentation(key.String())
+				keyStr, err := tomlValueStringRepresentation(key.String(), "", e.arraysOneElementPerLine)
 				if err != nil {
 					return nil, err
 				}
-				tval.SetPath([]string{keyStr}, "", false, val)
+				tval.SetPath([]string{keyStr}, val)
 			} else {
-				tval.Set(key.String(), "", false, val)
+				tval.Set(key.String(), val)
 			}
 		}
 	}
@@ -449,113 +472,69 @@ func (d *Decoder) valueFromToml(mtype reflect.Type, tval interface{}) (reflect.V
 	case *Tree:
 		if isTree(mtype) {
 			return d.valueFromTree(mtype, tval.(*Tree))
-		} else {
-			return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to a tree", tval, tval)
 		}
+		return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to a tree", tval, tval)
 	case []*Tree:
 		if isTreeSlice(mtype) {
 			return d.valueFromTreeSlice(mtype, tval.([]*Tree))
-		} else {
-			return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to trees", tval, tval)
 		}
+		return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to trees", tval, tval)
 	case []interface{}:
 		if isOtherSlice(mtype) {
 			return d.valueFromOtherSlice(mtype, tval.([]interface{}))
-		} else {
-			return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to a slice", tval, tval)
 		}
+		return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to a slice", tval, tval)
 	default:
 		switch mtype.Kind() {
-		case reflect.Bool:
-			val, ok := tval.(bool)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to bool", tval, tval)
-			}
-			return reflect.ValueOf(val), nil
-		case reflect.Int:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to int", tval, tval)
+		case reflect.Bool, reflect.Struct:
+			val := reflect.ValueOf(tval)
+			// if this passes for when mtype is reflect.Struct, tval is a time.Time
+			if !val.Type().ConvertibleTo(mtype) {
+				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(int(val)), nil
-		case reflect.Int8:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to int", tval, tval)
-			}
-			return reflect.ValueOf(int8(val)), nil
-		case reflect.Int16:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to int", tval, tval)
-			}
-			return reflect.ValueOf(int16(val)), nil
-		case reflect.Int32:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to int", tval, tval)
-			}
-			return reflect.ValueOf(int32(val)), nil
-		case reflect.Int64:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to int", tval, tval)
-			}
-			return reflect.ValueOf(val), nil
-		case reflect.Uint:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to uint", tval, tval)
-			}
-			return reflect.ValueOf(uint(val)), nil
-		case reflect.Uint8:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to uint", tval, tval)
+
+			return val.Convert(mtype), nil
+		case reflect.String:
+			val := reflect.ValueOf(tval)
+			// stupidly, int64 is convertible to string. So special case this.
+			if !val.Type().ConvertibleTo(mtype) || val.Kind() == reflect.Int64 {
+				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(uint8(val)), nil
-		case reflect.Uint16:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to uint", tval, tval)
+
+			return val.Convert(mtype), nil
+		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+			val := reflect.ValueOf(tval)
+			if !val.Type().ConvertibleTo(mtype) {
+				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(uint16(val)), nil
-		case reflect.Uint32:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to uint", tval, tval)
+			if reflect.Indirect(reflect.New(mtype)).OverflowInt(val.Int()) {
+				return reflect.ValueOf(nil), fmt.Errorf("%v(%T) would overflow %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(uint32(val)), nil
-		case reflect.Uint64:
-			val, ok := tval.(int64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to uint", tval, tval)
+
+			return val.Convert(mtype), nil
+		case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+			val := reflect.ValueOf(tval)
+			if !val.Type().ConvertibleTo(mtype) {
+				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(uint64(val)), nil
-		case reflect.Float32:
-			val, ok := tval.(float64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to float", tval, tval)
+			if val.Int() < 0 {
+				return reflect.ValueOf(nil), fmt.Errorf("%v(%T) is negative so does not fit in %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(float32(val)), nil
-		case reflect.Float64:
-			val, ok := tval.(float64)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to float", tval, tval)
+			if reflect.Indirect(reflect.New(mtype)).OverflowUint(uint64(val.Int())) {
+				return reflect.ValueOf(nil), fmt.Errorf("%v(%T) would overflow %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(val), nil
-		case reflect.String:
-			val, ok := tval.(string)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to string", tval, tval)
+
+			return val.Convert(mtype), nil
+		case reflect.Float32, reflect.Float64:
+			val := reflect.ValueOf(tval)
+			if !val.Type().ConvertibleTo(mtype) {
+				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(val), nil
-		case reflect.Struct:
-			val, ok := tval.(time.Time)
-			if !ok {
-				return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to time", tval, tval)
+			if reflect.Indirect(reflect.New(mtype)).OverflowFloat(val.Float()) {
+				return reflect.ValueOf(nil), fmt.Errorf("%v(%T) would overflow %v", tval, tval, mtype.String())
 			}
-			return reflect.ValueOf(val), nil
+
+			return val.Convert(mtype), nil
 		default:
 			return reflect.ValueOf(nil), fmt.Errorf("Can't convert %v(%T) to %v(%v)", tval, tval, mtype, mtype.Kind())
 		}
diff --git a/installer/vendor/github.com/pelletier/go-toml/marshal_test.go b/installer/vendor/github.com/pelletier/go-toml/marshal_test.go
deleted file mode 100644
index e7d1d6e4dc..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/marshal_test.go
+++ /dev/null
@@ -1,734 +0,0 @@
-package toml
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-type basicMarshalTestStruct struct {
-	String     string                      `toml:"string"`
-	StringList []string                    `toml:"strlist"`
-	Sub        basicMarshalTestSubStruct   `toml:"subdoc"`
-	SubList    []basicMarshalTestSubStruct `toml:"sublist"`
-}
-
-type basicMarshalTestSubStruct struct {
-	String2 string
-}
-
-var basicTestData = basicMarshalTestStruct{
-	String:     "Hello",
-	StringList: []string{"Howdy", "Hey There"},
-	Sub:        basicMarshalTestSubStruct{"One"},
-	SubList:    []basicMarshalTestSubStruct{{"Two"}, {"Three"}},
-}
-
-var basicTestToml = []byte(`string = "Hello"
-strlist = ["Howdy","Hey There"]
-
-[subdoc]
-  String2 = "One"
-
-[[sublist]]
-  String2 = "Two"
-
-[[sublist]]
-  String2 = "Three"
-`)
-
-func TestBasicMarshal(t *testing.T) {
-	result, err := Marshal(basicTestData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := basicTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestBasicUnmarshal(t *testing.T) {
-	result := basicMarshalTestStruct{}
-	err := Unmarshal(basicTestToml, &result)
-	expected := basicTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-type testDoc struct {
-	Title       string            `toml:"title"`
-	Basics      testDocBasics     `toml:"basic"`
-	BasicLists  testDocBasicLists `toml:"basic_lists"`
-	BasicMap    map[string]string `toml:"basic_map"`
-	Subdocs     testDocSubs       `toml:"subdoc"`
-	SubDocList  []testSubDoc      `toml:"subdoclist"`
-	SubDocPtrs  []*testSubDoc     `toml:"subdocptrs"`
-	err         int               `toml:"shouldntBeHere"`
-	unexported  int               `toml:"shouldntBeHere"`
-	Unexported2 int               `toml:"-"`
-}
-
-type testDocBasics struct {
-	Bool       bool      `toml:"bool"`
-	Date       time.Time `toml:"date"`
-	Float      float32   `toml:"float"`
-	Int        int       `toml:"int"`
-	Uint       uint      `toml:"uint"`
-	String     *string   `toml:"string"`
-	unexported int       `toml:"shouldntBeHere"`
-}
-
-type testDocBasicLists struct {
-	Bools   []bool      `toml:"bools"`
-	Dates   []time.Time `toml:"dates"`
-	Floats  []*float32  `toml:"floats"`
-	Ints    []int       `toml:"ints"`
-	Strings []string    `toml:"strings"`
-	UInts   []uint      `toml:"uints"`
-}
-
-type testDocSubs struct {
-	First  testSubDoc  `toml:"first"`
-	Second *testSubDoc `toml:"second"`
-}
-
-type testSubDoc struct {
-	Name       string `toml:"name"`
-	unexported int    `toml:"shouldntBeHere"`
-}
-
-var biteMe = "Bite me"
-var float1 float32 = 12.3
-var float2 float32 = 45.6
-var float3 float32 = 78.9
-var subdoc = testSubDoc{"Second", 0}
-
-var docData = testDoc{
-	Title:       "TOML Marshal Testing",
-	unexported:  0,
-	Unexported2: 0,
-	Basics: testDocBasics{
-		Bool:       true,
-		Date:       time.Date(1979, 5, 27, 7, 32, 0, 0, time.UTC),
-		Float:      123.4,
-		Int:        5000,
-		Uint:       5001,
-		String:     &biteMe,
-		unexported: 0,
-	},
-	BasicLists: testDocBasicLists{
-		Bools: []bool{true, false, true},
-		Dates: []time.Time{
-			time.Date(1979, 5, 27, 7, 32, 0, 0, time.UTC),
-			time.Date(1980, 5, 27, 7, 32, 0, 0, time.UTC),
-		},
-		Floats:  []*float32{&float1, &float2, &float3},
-		Ints:    []int{8001, 8001, 8002},
-		Strings: []string{"One", "Two", "Three"},
-		UInts:   []uint{5002, 5003},
-	},
-	BasicMap: map[string]string{
-		"one": "one",
-		"two": "two",
-	},
-	Subdocs: testDocSubs{
-		First:  testSubDoc{"First", 0},
-		Second: &subdoc,
-	},
-	SubDocList: []testSubDoc{
-		testSubDoc{"List.First", 0},
-		testSubDoc{"List.Second", 0},
-	},
-	SubDocPtrs: []*testSubDoc{&subdoc},
-}
-
-func TestDocMarshal(t *testing.T) {
-	result, err := Marshal(docData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected, _ := ioutil.ReadFile("marshal_test.toml")
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestDocUnmarshal(t *testing.T) {
-	result := testDoc{}
-	tomlData, _ := ioutil.ReadFile("marshal_test.toml")
-	err := Unmarshal(tomlData, &result)
-	expected := docData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		resStr, _ := json.MarshalIndent(result, "", "  ")
-		expStr, _ := json.MarshalIndent(expected, "", "  ")
-		t.Errorf("Bad unmarshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expStr, resStr)
-	}
-}
-
-func TestDocPartialUnmarshal(t *testing.T) {
-	result := testDocSubs{}
-
-	tree, _ := LoadFile("marshal_test.toml")
-	subTree := tree.Get("subdoc").(*Tree)
-	err := subTree.Unmarshal(&result)
-	expected := docData.Subdocs
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		resStr, _ := json.MarshalIndent(result, "", "  ")
-		expStr, _ := json.MarshalIndent(expected, "", "  ")
-		t.Errorf("Bad partial unmartial: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expStr, resStr)
-	}
-}
-
-type tomlTypeCheckTest struct {
-	name string
-	item interface{}
-	typ  int //0=primitive, 1=otherslice, 2=treeslice, 3=tree
-}
-
-func TestTypeChecks(t *testing.T) {
-	tests := []tomlTypeCheckTest{
-		{"integer", 2, 0},
-		{"time", time.Date(2015, 1, 1, 0, 0, 0, 0, time.UTC), 0},
-		{"stringlist", []string{"hello", "hi"}, 1},
-		{"timelist", []time.Time{time.Date(2015, 1, 1, 0, 0, 0, 0, time.UTC)}, 1},
-		{"objectlist", []tomlTypeCheckTest{}, 2},
-		{"object", tomlTypeCheckTest{}, 3},
-	}
-
-	for _, test := range tests {
-		expected := []bool{false, false, false, false}
-		expected[test.typ] = true
-		result := []bool{
-			isPrimitive(reflect.TypeOf(test.item)),
-			isOtherSlice(reflect.TypeOf(test.item)),
-			isTreeSlice(reflect.TypeOf(test.item)),
-			isTree(reflect.TypeOf(test.item)),
-		}
-		if !reflect.DeepEqual(expected, result) {
-			t.Errorf("Bad type check on %q: expected %v, got %v", test.name, expected, result)
-		}
-	}
-}
-
-type unexportedMarshalTestStruct struct {
-	String      string                      `toml:"string"`
-	StringList  []string                    `toml:"strlist"`
-	Sub         basicMarshalTestSubStruct   `toml:"subdoc"`
-	SubList     []basicMarshalTestSubStruct `toml:"sublist"`
-	unexported  int                         `toml:"shouldntBeHere"`
-	Unexported2 int                         `toml:"-"`
-}
-
-var unexportedTestData = unexportedMarshalTestStruct{
-	String:      "Hello",
-	StringList:  []string{"Howdy", "Hey There"},
-	Sub:         basicMarshalTestSubStruct{"One"},
-	SubList:     []basicMarshalTestSubStruct{{"Two"}, {"Three"}},
-	unexported:  0,
-	Unexported2: 0,
-}
-
-var unexportedTestToml = []byte(`string = "Hello"
-strlist = ["Howdy","Hey There"]
-unexported = 1
-shouldntBeHere = 2
-
-[subdoc]
-  String2 = "One"
-
-[[sublist]]
-  String2 = "Two"
-
-[[sublist]]
-  String2 = "Three"
-`)
-
-func TestUnexportedUnmarshal(t *testing.T) {
-	result := unexportedMarshalTestStruct{}
-	err := Unmarshal(unexportedTestToml, &result)
-	expected := unexportedTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad unexported unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-type errStruct struct {
-	Bool   bool      `toml:"bool"`
-	Date   time.Time `toml:"date"`
-	Float  float64   `toml:"float"`
-	Int    int16     `toml:"int"`
-	String *string   `toml:"string"`
-}
-
-var errTomls = []string{
-	"bool = truly\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:3200Z\nfloat = 123.4\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123a4\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = j000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = 5000\nstring = Bite me",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = 5000\nstring = Bite me",
-	"bool = 1\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1\nfloat = 123.4\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\n\"sorry\"\nint = 5000\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = \"sorry\"\nstring = \"Bite me\"",
-	"bool = true\ndate = 1979-05-27T07:32:00Z\nfloat = 123.4\nint = 5000\nstring = 1",
-}
-
-type mapErr struct {
-	Vals map[string]float64
-}
-
-type intErr struct {
-	Int1  int
-	Int2  int8
-	Int3  int16
-	Int4  int32
-	Int5  int64
-	UInt1 uint
-	UInt2 uint8
-	UInt3 uint16
-	UInt4 uint32
-	UInt5 uint64
-	Flt1  float32
-	Flt2  float64
-}
-
-var intErrTomls = []string{
-	"Int1 = []\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = []\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = []\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = []\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = []\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = []\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = []\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = []\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = []\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = []\nFlt1 = 1.0\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = []\nFlt2 = 2.0",
-	"Int1 = 1\nInt2 = 2\nInt3 = 3\nInt4 = 4\nInt5 = 5\nUInt1 = 1\nUInt2 = 2\nUInt3 = 3\nUInt4 = 4\nUInt5 = 5\nFlt1 = 1.0\nFlt2 = []",
-}
-
-func TestErrUnmarshal(t *testing.T) {
-	for ind, toml := range errTomls {
-		result := errStruct{}
-		err := Unmarshal([]byte(toml), &result)
-		if err == nil {
-			t.Errorf("Expected err from case %d\n", ind)
-		}
-	}
-	result2 := mapErr{}
-	err := Unmarshal([]byte("[Vals]\nfred=\"1.2\""), &result2)
-	if err == nil {
-		t.Errorf("Expected err from map")
-	}
-	for ind, toml := range intErrTomls {
-		result3 := intErr{}
-		err := Unmarshal([]byte(toml), &result3)
-		if err == nil {
-			t.Errorf("Expected int err from case %d\n", ind)
-		}
-	}
-}
-
-type emptyMarshalTestStruct struct {
-	Title      string                  `toml:"title"`
-	Bool       bool                    `toml:"bool"`
-	Int        int                     `toml:"int"`
-	String     string                  `toml:"string"`
-	StringList []string                `toml:"stringlist"`
-	Ptr        *basicMarshalTestStruct `toml:"ptr"`
-	Map        map[string]string       `toml:"map"`
-}
-
-var emptyTestData = emptyMarshalTestStruct{
-	Title:      "Placeholder",
-	Bool:       false,
-	Int:        0,
-	String:     "",
-	StringList: []string{},
-	Ptr:        nil,
-	Map:        map[string]string{},
-}
-
-var emptyTestToml = []byte(`bool = false
-int = 0
-string = ""
-stringlist = []
-title = "Placeholder"
-
-[map]
-`)
-
-type emptyMarshalTestStruct2 struct {
-	Title      string                  `toml:"title"`
-	Bool       bool                    `toml:"bool,omitempty"`
-	Int        int                     `toml:"int, omitempty"`
-	String     string                  `toml:"string,omitempty "`
-	StringList []string                `toml:"stringlist,omitempty"`
-	Ptr        *basicMarshalTestStruct `toml:"ptr,omitempty"`
-	Map        map[string]string       `toml:"map,omitempty"`
-}
-
-var emptyTestData2 = emptyMarshalTestStruct2{
-	Title:      "Placeholder",
-	Bool:       false,
-	Int:        0,
-	String:     "",
-	StringList: []string{},
-	Ptr:        nil,
-	Map:        map[string]string{},
-}
-
-var emptyTestToml2 = []byte(`title = "Placeholder"
-`)
-
-func TestEmptyMarshal(t *testing.T) {
-	result, err := Marshal(emptyTestData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := emptyTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad empty marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestEmptyMarshalOmit(t *testing.T) {
-	result, err := Marshal(emptyTestData2)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := emptyTestToml2
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad empty omit marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestEmptyUnmarshal(t *testing.T) {
-	result := emptyMarshalTestStruct{}
-	err := Unmarshal(emptyTestToml, &result)
-	expected := emptyTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad empty unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-func TestEmptyUnmarshalOmit(t *testing.T) {
-	result := emptyMarshalTestStruct2{}
-	err := Unmarshal(emptyTestToml, &result)
-	expected := emptyTestData2
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad empty omit unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-type pointerMarshalTestStruct struct {
-	Str       *string
-	List      *[]string
-	ListPtr   *[]*string
-	Map       *map[string]string
-	MapPtr    *map[string]*string
-	EmptyStr  *string
-	EmptyList *[]string
-	EmptyMap  *map[string]string
-	DblPtr    *[]*[]*string
-}
-
-var pointerStr = "Hello"
-var pointerList = []string{"Hello back"}
-var pointerListPtr = []*string{&pointerStr}
-var pointerMap = map[string]string{"response": "Goodbye"}
-var pointerMapPtr = map[string]*string{"alternate": &pointerStr}
-var pointerTestData = pointerMarshalTestStruct{
-	Str:       &pointerStr,
-	List:      &pointerList,
-	ListPtr:   &pointerListPtr,
-	Map:       &pointerMap,
-	MapPtr:    &pointerMapPtr,
-	EmptyStr:  nil,
-	EmptyList: nil,
-	EmptyMap:  nil,
-}
-
-var pointerTestToml = []byte(`List = ["Hello back"]
-ListPtr = ["Hello"]
-Str = "Hello"
-
-[Map]
-  response = "Goodbye"
-
-[MapPtr]
-  alternate = "Hello"
-`)
-
-func TestPointerMarshal(t *testing.T) {
-	result, err := Marshal(pointerTestData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := pointerTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad pointer marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestPointerUnmarshal(t *testing.T) {
-	result := pointerMarshalTestStruct{}
-	err := Unmarshal(pointerTestToml, &result)
-	expected := pointerTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad pointer unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-func TestUnmarshalTypeMismatch(t *testing.T) {
-	result := pointerMarshalTestStruct{}
-	err := Unmarshal([]byte("List = 123"), &result)
-	if !strings.HasPrefix(err.Error(), "(1, 1): Can't convert 123(int64) to []string(slice)") {
-		t.Errorf("Type mismatch must be reported: got %v", err.Error())
-	}
-}
-
-type nestedMarshalTestStruct struct {
-	String [][]string
-	//Struct [][]basicMarshalTestSubStruct
-	StringPtr *[]*[]*string
-	// StructPtr *[]*[]*basicMarshalTestSubStruct
-}
-
-var str1 = "Three"
-var str2 = "Four"
-var strPtr = []*string{&str1, &str2}
-var strPtr2 = []*[]*string{&strPtr}
-
-var nestedTestData = nestedMarshalTestStruct{
-	String:    [][]string{[]string{"Five", "Six"}, []string{"One", "Two"}},
-	StringPtr: &strPtr2,
-}
-
-var nestedTestToml = []byte(`String = [["Five","Six"],["One","Two"]]
-StringPtr = [["Three","Four"]]
-`)
-
-func TestNestedMarshal(t *testing.T) {
-	result, err := Marshal(nestedTestData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := nestedTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad nested marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestNestedUnmarshal(t *testing.T) {
-	result := nestedMarshalTestStruct{}
-	err := Unmarshal(nestedTestToml, &result)
-	expected := nestedTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad nested unmarshal: expected %v, got %v", expected, result)
-	}
-}
-
-type customMarshalerParent struct {
-	Self    customMarshaler   `toml:"me"`
-	Friends []customMarshaler `toml:"friends"`
-}
-
-type customMarshaler struct {
-	FirsName string
-	LastName string
-}
-
-func (c customMarshaler) MarshalTOML() ([]byte, error) {
-	fullName := fmt.Sprintf("%s %s", c.FirsName, c.LastName)
-	return []byte(fullName), nil
-}
-
-var customMarshalerData = customMarshaler{FirsName: "Sally", LastName: "Fields"}
-var customMarshalerToml = []byte(`Sally Fields`)
-var nestedCustomMarshalerData = customMarshalerParent{
-	Self:    customMarshaler{FirsName: "Maiku", LastName: "Suteda"},
-	Friends: []customMarshaler{customMarshalerData},
-}
-var nestedCustomMarshalerToml = []byte(`friends = ["Sally Fields"]
-me = "Maiku Suteda"
-`)
-
-func TestCustomMarshaler(t *testing.T) {
-	result, err := Marshal(customMarshalerData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := customMarshalerToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad custom marshaler: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-func TestNestedCustomMarshaler(t *testing.T) {
-	result, err := Marshal(nestedCustomMarshalerData)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := nestedCustomMarshalerToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad nested custom marshaler: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-var commentTestToml = []byte(`
-# it's a comment on type
-[postgres]
-  # isCommented = "dvalue"
-  noComment = "cvalue"
-
-  # A comment on AttrB with a
-  # break line
-  password = "bvalue"
-
-  # A comment on AttrA
-  user = "avalue"
-
-  [[postgres.My]]
-
-    # a comment on my on typeC
-    My = "Foo"
-
-  [[postgres.My]]
-
-    # a comment on my on typeC
-    My = "Baar"
-`)
-
-func TestMarshalComment(t *testing.T) {
-	type TypeC struct {
-		My string `comment:"a comment on my on typeC"`
-	}
-	type TypeB struct {
-		AttrA string `toml:"user" comment:"A comment on AttrA"`
-		AttrB string `toml:"password" comment:"A comment on AttrB with a\n break line"`
-		AttrC string `toml:"noComment"`
-		AttrD string `toml:"isCommented" commented:"true"`
-		My    []TypeC
-	}
-	type TypeA struct {
-		TypeB TypeB `toml:"postgres" comment:"it's a comment on type"`
-	}
-
-	ta := []TypeC{{My: "Foo"}, {My: "Baar"}}
-	config := TypeA{TypeB{AttrA: "avalue", AttrB: "bvalue", AttrC: "cvalue", AttrD: "dvalue", My: ta}}
-	result, err := Marshal(config)
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := commentTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-
-type mapsTestStruct struct {
-	Simple map[string]string
-	Paths  map[string]string
-	Other  map[string]float64
-	X      struct {
-		Y struct {
-			Z map[string]bool
-		}
-	}
-}
-
-var mapsTestData = mapsTestStruct{
-	Simple: map[string]string{
-		"one plus one": "two",
-		"next":         "three",
-	},
-	Paths: map[string]string{
-		"/this/is/a/path": "/this/is/also/a/path",
-		"/heloo.txt":      "/tmp/lololo.txt",
-	},
-	Other: map[string]float64{
-		"testing": 3.9999,
-	},
-	X: struct{ Y struct{ Z map[string]bool } }{
-		Y: struct{ Z map[string]bool }{
-			Z: map[string]bool{
-				"is.Nested": true,
-			},
-		},
-	},
-}
-var mapsTestToml = []byte(`
-[Other]
-  "testing" = 3.9999
-
-[Paths]
-  "/heloo.txt" = "/tmp/lololo.txt"
-  "/this/is/a/path" = "/this/is/also/a/path"
-
-[Simple]
-  "next" = "three"
-  "one plus one" = "two"
-
-[X]
-
-  [X.Y]
-
-    [X.Y.Z]
-      "is.Nested" = true
-`)
-
-func TestEncodeQuotedMapKeys(t *testing.T) {
-	var buf bytes.Buffer
-	if err := NewEncoder(&buf).QuoteMapKeys(true).Encode(mapsTestData); err != nil {
-		t.Fatal(err)
-	}
-	result := buf.Bytes()
-	expected := mapsTestToml
-	if !bytes.Equal(result, expected) {
-		t.Errorf("Bad maps marshal: expected\n-----\n%s\n-----\ngot\n-----\n%s\n-----\n", expected, result)
-	}
-}
-func TestDecodeQuotedMapKeys(t *testing.T) {
-	result := mapsTestStruct{}
-	err := NewDecoder(bytes.NewBuffer(mapsTestToml)).Decode(&result)
-	expected := mapsTestData
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(result, expected) {
-		t.Errorf("Bad maps unmarshal: expected %v, got %v", expected, result)
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/marshal_test.toml b/installer/vendor/github.com/pelletier/go-toml/marshal_test.toml
deleted file mode 100644
index 1c5f98e7a8..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/marshal_test.toml
+++ /dev/null
@@ -1,38 +0,0 @@
-title = "TOML Marshal Testing"
-
-[basic]
-  bool = true
-  date = 1979-05-27T07:32:00Z
-  float = 123.4
-  int = 5000
-  string = "Bite me"
-  uint = 5001
-
-[basic_lists]
-  bools = [true,false,true]
-  dates = [1979-05-27T07:32:00Z,1980-05-27T07:32:00Z]
-  floats = [12.3,45.6,78.9]
-  ints = [8001,8001,8002]
-  strings = ["One","Two","Three"]
-  uints = [5002,5003]
-
-[basic_map]
-  one = "one"
-  two = "two"
-
-[subdoc]
-
-  [subdoc.first]
-    name = "First"
-
-  [subdoc.second]
-    name = "Second"
-
-[[subdoclist]]
-  name = "List.First"
-
-[[subdoclist]]
-  name = "List.Second"
-
-[[subdocptrs]]
-  name = "Second"
diff --git a/installer/vendor/github.com/pelletier/go-toml/parser.go b/installer/vendor/github.com/pelletier/go-toml/parser.go
index d492a1e6ff..2d27599a99 100644
--- a/installer/vendor/github.com/pelletier/go-toml/parser.go
+++ b/installer/vendor/github.com/pelletier/go-toml/parser.go
@@ -5,6 +5,7 @@ package toml
 import (
 	"errors"
 	"fmt"
+	"math"
 	"reflect"
 	"regexp"
 	"strconv"
@@ -110,7 +111,7 @@ func (p *tomlParser) parseGroupArray() tomlParserStateFn {
 	newTree := newTree()
 	newTree.position = startToken.Position
 	array = append(array, newTree)
-	p.tree.SetPath(p.currentTable, "", false, array)
+	p.tree.SetPath(p.currentTable, array)
 
 	// remove all keys that were children of this table array
 	prefix := key.val + "."
@@ -185,10 +186,7 @@ func (p *tomlParser) parseAssign() tomlParserStateFn {
 	}
 
 	// assign value to the found table
-	keyVals, err := parseKey(key.val)
-	if err != nil {
-		p.raiseError(key, "%s", err)
-	}
+	keyVals := []string{key.val}
 	if len(keyVals) != 1 {
 		p.raiseError(key, "Invalid key")
 	}
@@ -212,13 +210,25 @@ func (p *tomlParser) parseAssign() tomlParserStateFn {
 }
 
 var numberUnderscoreInvalidRegexp *regexp.Regexp
+var hexNumberUnderscoreInvalidRegexp *regexp.Regexp
 
-func cleanupNumberToken(value string) (string, error) {
+func numberContainsInvalidUnderscore(value string) error {
 	if numberUnderscoreInvalidRegexp.MatchString(value) {
-		return "", errors.New("invalid use of _ in number")
+		return errors.New("invalid use of _ in number")
+	}
+	return nil
+}
+
+func hexNumberContainsInvalidUnderscore(value string) error {
+	if hexNumberUnderscoreInvalidRegexp.MatchString(value) {
+		return errors.New("invalid use of _ in hex number")
 	}
+	return nil
+}
+
+func cleanupNumberToken(value string) string {
 	cleanedVal := strings.Replace(value, "_", "", -1)
-	return cleanedVal, nil
+	return cleanedVal
 }
 
 func (p *tomlParser) parseRvalue() interface{} {
@@ -234,21 +244,57 @@ func (p *tomlParser) parseRvalue() interface{} {
 		return true
 	case tokenFalse:
 		return false
+	case tokenInf:
+		if tok.val[0] == '-' {
+			return math.Inf(-1)
+		}
+		return math.Inf(1)
+	case tokenNan:
+		return math.NaN()
 	case tokenInteger:
-		cleanedVal, err := cleanupNumberToken(tok.val)
-		if err != nil {
-			p.raiseError(tok, "%s", err)
+		cleanedVal := cleanupNumberToken(tok.val)
+		var err error
+		var val int64
+		if len(cleanedVal) >= 3 && cleanedVal[0] == '0' {
+			switch cleanedVal[1] {
+			case 'x':
+				err = hexNumberContainsInvalidUnderscore(tok.val)
+				if err != nil {
+					p.raiseError(tok, "%s", err)
+				}
+				val, err = strconv.ParseInt(cleanedVal[2:], 16, 64)
+			case 'o':
+				err = numberContainsInvalidUnderscore(tok.val)
+				if err != nil {
+					p.raiseError(tok, "%s", err)
+				}
+				val, err = strconv.ParseInt(cleanedVal[2:], 8, 64)
+			case 'b':
+				err = numberContainsInvalidUnderscore(tok.val)
+				if err != nil {
+					p.raiseError(tok, "%s", err)
+				}
+				val, err = strconv.ParseInt(cleanedVal[2:], 2, 64)
+			default:
+				panic("invalid base") // the lexer should catch this first
+			}
+		} else {
+			err = numberContainsInvalidUnderscore(tok.val)
+			if err != nil {
+				p.raiseError(tok, "%s", err)
+			}
+			val, err = strconv.ParseInt(cleanedVal, 10, 64)
 		}
-		val, err := strconv.ParseInt(cleanedVal, 10, 64)
 		if err != nil {
 			p.raiseError(tok, "%s", err)
 		}
 		return val
 	case tokenFloat:
-		cleanedVal, err := cleanupNumberToken(tok.val)
+		err := numberContainsInvalidUnderscore(tok.val)
 		if err != nil {
 			p.raiseError(tok, "%s", err)
 		}
+		cleanedVal := cleanupNumberToken(tok.val)
 		val, err := strconv.ParseFloat(cleanedVal, 64)
 		if err != nil {
 			p.raiseError(tok, "%s", err)
@@ -299,7 +345,7 @@ Loop:
 			key := p.getToken()
 			p.assume(tokenEqual)
 			value := p.parseRvalue()
-			tree.Set(key.val, "", false, value)
+			tree.Set(key.val, value)
 		case tokenComma:
 			if previous == nil {
 				p.raiseError(follow, "inline table cannot start with a comma")
@@ -309,7 +355,7 @@ Loop:
 			}
 			p.getToken()
 		default:
-			p.raiseError(follow, "unexpected token type in inline table: %s", follow.typ.String())
+			p.raiseError(follow, "unexpected token type in inline table: %s", follow.String())
 		}
 		previous = follow
 	}
@@ -379,5 +425,6 @@ func parseToml(flow []token) *Tree {
 }
 
 func init() {
-	numberUnderscoreInvalidRegexp = regexp.MustCompile(`([^\d]_|_[^\d]|_$|^_)`)
+	numberUnderscoreInvalidRegexp = regexp.MustCompile(`([^\d]_|_[^\d])|_$|^_`)
+	hexNumberUnderscoreInvalidRegexp = regexp.MustCompile(`(^0x_)|([^\da-f]_|_[^\da-f])|_$|^_`)
 }
diff --git a/installer/vendor/github.com/pelletier/go-toml/parser_test.go b/installer/vendor/github.com/pelletier/go-toml/parser_test.go
deleted file mode 100644
index 029bc52c30..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/parser_test.go
+++ /dev/null
@@ -1,785 +0,0 @@
-package toml
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-)
-
-func assertSubTree(t *testing.T, path []string, tree *Tree, err error, ref map[string]interface{}) {
-	if err != nil {
-		t.Error("Non-nil error:", err.Error())
-		return
-	}
-	for k, v := range ref {
-		nextPath := append(path, k)
-		t.Log("asserting path", nextPath)
-		// NOTE: directly access key instead of resolve by path
-		// NOTE: see TestSpecialKV
-		switch node := tree.GetPath([]string{k}).(type) {
-		case []*Tree:
-			t.Log("\tcomparing key", nextPath, "by array iteration")
-			for idx, item := range node {
-				assertSubTree(t, nextPath, item, err, v.([]map[string]interface{})[idx])
-			}
-		case *Tree:
-			t.Log("\tcomparing key", nextPath, "by subtree assestion")
-			assertSubTree(t, nextPath, node, err, v.(map[string]interface{}))
-		default:
-			t.Log("\tcomparing key", nextPath, "by string representation because it's of type", reflect.TypeOf(node))
-			if fmt.Sprintf("%v", node) != fmt.Sprintf("%v", v) {
-				t.Errorf("was expecting %v at %v but got %v", v, k, node)
-			}
-		}
-	}
-}
-
-func assertTree(t *testing.T, tree *Tree, err error, ref map[string]interface{}) {
-	t.Log("Asserting tree:\n", spew.Sdump(tree))
-	assertSubTree(t, []string{}, tree, err, ref)
-	t.Log("Finished tree assertion.")
-}
-
-func TestCreateSubTree(t *testing.T) {
-	tree := newTree()
-	tree.createSubTree([]string{"a", "b", "c"}, Position{})
-	tree.Set("a.b.c", "", false, 42)
-	if tree.Get("a.b.c") != 42 {
-		t.Fail()
-	}
-}
-
-func TestSimpleKV(t *testing.T) {
-	tree, err := Load("a = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(42),
-	})
-
-	tree, _ = Load("a = 42\nb = 21")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(42),
-		"b": int64(21),
-	})
-}
-
-func TestNumberInKey(t *testing.T) {
-	tree, err := Load("hello2 = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"hello2": int64(42),
-	})
-}
-
-func TestSimpleNumbers(t *testing.T) {
-	tree, err := Load("a = +42\nb = -21\nc = +4.2\nd = -2.1")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(42),
-		"b": int64(-21),
-		"c": float64(4.2),
-		"d": float64(-2.1),
-	})
-}
-
-func TestNumbersWithUnderscores(t *testing.T) {
-	tree, err := Load("a = 1_000")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(1000),
-	})
-
-	tree, err = Load("a = 5_349_221")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(5349221),
-	})
-
-	tree, err = Load("a = 1_2_3_4_5")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": int64(12345),
-	})
-
-	tree, err = Load("flt8 = 9_224_617.445_991_228_313")
-	assertTree(t, tree, err, map[string]interface{}{
-		"flt8": float64(9224617.445991228313),
-	})
-
-	tree, err = Load("flt9 = 1e1_00")
-	assertTree(t, tree, err, map[string]interface{}{
-		"flt9": float64(1e100),
-	})
-}
-
-func TestFloatsWithExponents(t *testing.T) {
-	tree, err := Load("a = 5e+22\nb = 5E+22\nc = -5e+22\nd = -5e-22\ne = 6.626e-34")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": float64(5e+22),
-		"b": float64(5E+22),
-		"c": float64(-5e+22),
-		"d": float64(-5e-22),
-		"e": float64(6.626e-34),
-	})
-}
-
-func TestSimpleDate(t *testing.T) {
-	tree, err := Load("a = 1979-05-27T07:32:00Z")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
-	})
-}
-
-func TestDateOffset(t *testing.T) {
-	tree, err := Load("a = 1979-05-27T00:32:00-07:00")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": time.Date(1979, time.May, 27, 0, 32, 0, 0, time.FixedZone("", -7*60*60)),
-	})
-}
-
-func TestDateNano(t *testing.T) {
-	tree, err := Load("a = 1979-05-27T00:32:00.999999999-07:00")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": time.Date(1979, time.May, 27, 0, 32, 0, 999999999, time.FixedZone("", -7*60*60)),
-	})
-}
-
-func TestSimpleString(t *testing.T) {
-	tree, err := Load("a = \"hello world\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": "hello world",
-	})
-}
-
-func TestSpaceKey(t *testing.T) {
-	tree, err := Load("\"a b\" = \"hello world\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a b": "hello world",
-	})
-}
-
-func TestStringEscapables(t *testing.T) {
-	tree, err := Load("a = \"a \\n b\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": "a \n b",
-	})
-
-	tree, err = Load("a = \"a \\t b\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": "a \t b",
-	})
-
-	tree, err = Load("a = \"a \\r b\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": "a \r b",
-	})
-
-	tree, err = Load("a = \"a \\\\ b\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": "a \\ b",
-	})
-}
-
-func TestEmptyQuotedString(t *testing.T) {
-	tree, err := Load(`[""]
-"" = 1`)
-	assertTree(t, tree, err, map[string]interface{}{
-		"": map[string]interface{}{
-			"": int64(1),
-		},
-	})
-}
-
-func TestBools(t *testing.T) {
-	tree, err := Load("a = true\nb = false")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": true,
-		"b": false,
-	})
-}
-
-func TestNestedKeys(t *testing.T) {
-	tree, err := Load("[a.b.c]\nd = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": map[string]interface{}{
-			"b": map[string]interface{}{
-				"c": map[string]interface{}{
-					"d": int64(42),
-				},
-			},
-		},
-	})
-}
-
-func TestNestedQuotedUnicodeKeys(t *testing.T) {
-	tree, err := Load("[ j . \"ʞ\" . l ]\nd = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"j": map[string]interface{}{
-			"ʞ": map[string]interface{}{
-				"l": map[string]interface{}{
-					"d": int64(42),
-				},
-			},
-		},
-	})
-
-	tree, err = Load("[ g . h . i ]\nd = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"g": map[string]interface{}{
-			"h": map[string]interface{}{
-				"i": map[string]interface{}{
-					"d": int64(42),
-				},
-			},
-		},
-	})
-
-	tree, err = Load("[ d.e.f ]\nk = 42")
-	assertTree(t, tree, err, map[string]interface{}{
-		"d": map[string]interface{}{
-			"e": map[string]interface{}{
-				"f": map[string]interface{}{
-					"k": int64(42),
-				},
-			},
-		},
-	})
-}
-
-func TestArrayOne(t *testing.T) {
-	tree, err := Load("a = [1]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(1)},
-	})
-}
-
-func TestArrayZero(t *testing.T) {
-	tree, err := Load("a = []")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []interface{}{},
-	})
-}
-
-func TestArraySimple(t *testing.T) {
-	tree, err := Load("a = [42, 21, 10]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(42), int64(21), int64(10)},
-	})
-
-	tree, _ = Load("a = [42, 21, 10,]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(42), int64(21), int64(10)},
-	})
-}
-
-func TestArrayMultiline(t *testing.T) {
-	tree, err := Load("a = [42,\n21, 10,]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(42), int64(21), int64(10)},
-	})
-}
-
-func TestArrayNested(t *testing.T) {
-	tree, err := Load("a = [[42, 21], [10]]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": [][]int64{{int64(42), int64(21)}, {int64(10)}},
-	})
-}
-
-func TestNestedArrayComment(t *testing.T) {
-	tree, err := Load(`
-someArray = [
-# does not work
-["entry1"]
-]`)
-	assertTree(t, tree, err, map[string]interface{}{
-		"someArray": [][]string{{"entry1"}},
-	})
-}
-
-func TestNestedEmptyArrays(t *testing.T) {
-	tree, err := Load("a = [[[]]]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": [][][]interface{}{{{}}},
-	})
-}
-
-func TestArrayMixedTypes(t *testing.T) {
-	_, err := Load("a = [42, 16.0]")
-	if err.Error() != "(1, 10): mixed types in array" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a = [42, \"hello\"]")
-	if err.Error() != "(1, 11): mixed types in array" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestArrayNestedStrings(t *testing.T) {
-	tree, err := Load("data = [ [\"gamma\", \"delta\"], [\"Foo\"] ]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"data": [][]string{{"gamma", "delta"}, {"Foo"}},
-	})
-}
-
-func TestParseUnknownRvalue(t *testing.T) {
-	_, err := Load("a = !bssss")
-	if err == nil {
-		t.Error("Expecting a parse error")
-	}
-
-	_, err = Load("a = /b")
-	if err == nil {
-		t.Error("Expecting a parse error")
-	}
-}
-
-func TestMissingValue(t *testing.T) {
-	_, err := Load("a = ")
-	if err.Error() != "(1, 5): expecting a value" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestUnterminatedArray(t *testing.T) {
-	_, err := Load("a = [1,")
-	if err.Error() != "(1, 8): unterminated array" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a = [1")
-	if err.Error() != "(1, 7): unterminated array" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a = [1 2")
-	if err.Error() != "(1, 8): missing comma" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestNewlinesInArrays(t *testing.T) {
-	tree, err := Load("a = [1,\n2,\n3]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(1), int64(2), int64(3)},
-	})
-}
-
-func TestArrayWithExtraComma(t *testing.T) {
-	tree, err := Load("a = [1,\n2,\n3,\n]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(1), int64(2), int64(3)},
-	})
-}
-
-func TestArrayWithExtraCommaComment(t *testing.T) {
-	tree, err := Load("a = [1, # wow\n2, # such items\n3, # so array\n]")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": []int64{int64(1), int64(2), int64(3)},
-	})
-}
-
-func TestSimpleInlineGroup(t *testing.T) {
-	tree, err := Load("key = {a = 42}")
-	assertTree(t, tree, err, map[string]interface{}{
-		"key": map[string]interface{}{
-			"a": int64(42),
-		},
-	})
-}
-
-func TestDoubleInlineGroup(t *testing.T) {
-	tree, err := Load("key = {a = 42, b = \"foo\"}")
-	assertTree(t, tree, err, map[string]interface{}{
-		"key": map[string]interface{}{
-			"a": int64(42),
-			"b": "foo",
-		},
-	})
-}
-
-func TestExampleInlineGroup(t *testing.T) {
-	tree, err := Load(`name = { first = "Tom", last = "Preston-Werner" }
-point = { x = 1, y = 2 }`)
-	assertTree(t, tree, err, map[string]interface{}{
-		"name": map[string]interface{}{
-			"first": "Tom",
-			"last":  "Preston-Werner",
-		},
-		"point": map[string]interface{}{
-			"x": int64(1),
-			"y": int64(2),
-		},
-	})
-}
-
-func TestExampleInlineGroupInArray(t *testing.T) {
-	tree, err := Load(`points = [{ x = 1, y = 2 }]`)
-	assertTree(t, tree, err, map[string]interface{}{
-		"points": []map[string]interface{}{
-			{
-				"x": int64(1),
-				"y": int64(2),
-			},
-		},
-	})
-}
-
-func TestInlineTableUnterminated(t *testing.T) {
-	_, err := Load("foo = {")
-	if err.Error() != "(1, 8): unterminated inline table" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestInlineTableCommaExpected(t *testing.T) {
-	_, err := Load("foo = {hello = 53 test = foo}")
-	if err.Error() != "(1, 19): comma expected between fields in inline table" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestInlineTableCommaStart(t *testing.T) {
-	_, err := Load("foo = {, hello = 53}")
-	if err.Error() != "(1, 8): inline table cannot start with a comma" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestInlineTableDoubleComma(t *testing.T) {
-	_, err := Load("foo = {hello = 53,, foo = 17}")
-	if err.Error() != "(1, 19): need field between two commas in inline table" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestDuplicateGroups(t *testing.T) {
-	_, err := Load("[foo]\na=2\n[foo]b=3")
-	if err.Error() != "(3, 2): duplicated tables" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestDuplicateKeys(t *testing.T) {
-	_, err := Load("foo = 2\nfoo = 3")
-	if err.Error() != "(2, 1): The following key was defined twice: foo" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestEmptyIntermediateTable(t *testing.T) {
-	_, err := Load("[foo..bar]")
-	if err.Error() != "(1, 2): invalid table array key: empty table key" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestImplicitDeclarationBefore(t *testing.T) {
-	tree, err := Load("[a.b.c]\nanswer = 42\n[a]\nbetter = 43")
-	assertTree(t, tree, err, map[string]interface{}{
-		"a": map[string]interface{}{
-			"b": map[string]interface{}{
-				"c": map[string]interface{}{
-					"answer": int64(42),
-				},
-			},
-			"better": int64(43),
-		},
-	})
-}
-
-func TestFloatsWithoutLeadingZeros(t *testing.T) {
-	_, err := Load("a = .42")
-	if err.Error() != "(1, 5): cannot start float with a dot" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a = -.42")
-	if err.Error() != "(1, 5): cannot start float with a dot" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestMissingFile(t *testing.T) {
-	_, err := LoadFile("foo.toml")
-	if err.Error() != "open foo.toml: no such file or directory" &&
-		err.Error() != "open foo.toml: The system cannot find the file specified." {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestParseFile(t *testing.T) {
-	tree, err := LoadFile("example.toml")
-
-	assertTree(t, tree, err, map[string]interface{}{
-		"title": "TOML Example",
-		"owner": map[string]interface{}{
-			"name":         "Tom Preston-Werner",
-			"organization": "GitHub",
-			"bio":          "GitHub Cofounder & CEO\nLikes tater tots and beer.",
-			"dob":          time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
-		},
-		"database": map[string]interface{}{
-			"server":         "192.168.1.1",
-			"ports":          []int64{8001, 8001, 8002},
-			"connection_max": 5000,
-			"enabled":        true,
-		},
-		"servers": map[string]interface{}{
-			"alpha": map[string]interface{}{
-				"ip": "10.0.0.1",
-				"dc": "eqdc10",
-			},
-			"beta": map[string]interface{}{
-				"ip": "10.0.0.2",
-				"dc": "eqdc10",
-			},
-		},
-		"clients": map[string]interface{}{
-			"data": []interface{}{
-				[]string{"gamma", "delta"},
-				[]int64{1, 2},
-			},
-		},
-	})
-}
-
-func TestParseFileCRLF(t *testing.T) {
-	tree, err := LoadFile("example-crlf.toml")
-
-	assertTree(t, tree, err, map[string]interface{}{
-		"title": "TOML Example",
-		"owner": map[string]interface{}{
-			"name":         "Tom Preston-Werner",
-			"organization": "GitHub",
-			"bio":          "GitHub Cofounder & CEO\nLikes tater tots and beer.",
-			"dob":          time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
-		},
-		"database": map[string]interface{}{
-			"server":         "192.168.1.1",
-			"ports":          []int64{8001, 8001, 8002},
-			"connection_max": 5000,
-			"enabled":        true,
-		},
-		"servers": map[string]interface{}{
-			"alpha": map[string]interface{}{
-				"ip": "10.0.0.1",
-				"dc": "eqdc10",
-			},
-			"beta": map[string]interface{}{
-				"ip": "10.0.0.2",
-				"dc": "eqdc10",
-			},
-		},
-		"clients": map[string]interface{}{
-			"data": []interface{}{
-				[]string{"gamma", "delta"},
-				[]int64{1, 2},
-			},
-		},
-	})
-}
-
-func TestParseKeyGroupArray(t *testing.T) {
-	tree, err := Load("[[foo.bar]] a = 42\n[[foo.bar]] a = 69")
-	assertTree(t, tree, err, map[string]interface{}{
-		"foo": map[string]interface{}{
-			"bar": []map[string]interface{}{
-				{"a": int64(42)},
-				{"a": int64(69)},
-			},
-		},
-	})
-}
-
-func TestParseKeyGroupArrayUnfinished(t *testing.T) {
-	_, err := Load("[[foo.bar]\na = 42")
-	if err.Error() != "(1, 10): was expecting token [[, but got unclosed table array key instead" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("[[foo.[bar]\na = 42")
-	if err.Error() != "(1, 3): unexpected token table array key cannot contain ']', was expecting a table array key" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestParseKeyGroupArrayQueryExample(t *testing.T) {
-	tree, err := Load(`
-      [[book]]
-      title = "The Stand"
-      author = "Stephen King"
-      [[book]]
-      title = "For Whom the Bell Tolls"
-      author = "Ernest Hemmingway"
-      [[book]]
-      title = "Neuromancer"
-      author = "William Gibson"
-    `)
-
-	assertTree(t, tree, err, map[string]interface{}{
-		"book": []map[string]interface{}{
-			{"title": "The Stand", "author": "Stephen King"},
-			{"title": "For Whom the Bell Tolls", "author": "Ernest Hemmingway"},
-			{"title": "Neuromancer", "author": "William Gibson"},
-		},
-	})
-}
-
-func TestParseKeyGroupArraySpec(t *testing.T) {
-	tree, err := Load("[[fruit]]\n name=\"apple\"\n [fruit.physical]\n color=\"red\"\n shape=\"round\"\n [[fruit]]\n name=\"banana\"")
-	assertTree(t, tree, err, map[string]interface{}{
-		"fruit": []map[string]interface{}{
-			{"name": "apple", "physical": map[string]interface{}{"color": "red", "shape": "round"}},
-			{"name": "banana"},
-		},
-	})
-}
-
-func TestTomlValueStringRepresentation(t *testing.T) {
-	for idx, item := range []struct {
-		Value  interface{}
-		Expect string
-	}{
-		{int64(12345), "12345"},
-		{uint64(50), "50"},
-		{float64(123.45), "123.45"},
-		{bool(true), "true"},
-		{"hello world", "\"hello world\""},
-		{"\b\t\n\f\r\"\\", "\"\\b\\t\\n\\f\\r\\\"\\\\\""},
-		{"\x05", "\"\\u0005\""},
-		{time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
-			"1979-05-27T07:32:00Z"},
-		{[]interface{}{"gamma", "delta"},
-			"[\"gamma\",\"delta\"]"},
-		{nil, ""},
-	} {
-		result, err := tomlValueStringRepresentation(item.Value)
-		if err != nil {
-			t.Errorf("Test %d - unexpected error: %s", idx, err)
-		}
-		if result != item.Expect {
-			t.Errorf("Test %d - got '%s', expected '%s'", idx, result, item.Expect)
-		}
-	}
-}
-
-func TestToStringMapStringString(t *testing.T) {
-	tree, err := TreeFromMap(map[string]interface{}{"m": map[string]interface{}{"v": "abc"}})
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	want := "\n[m]\n  v = \"abc\"\n"
-	got := tree.String()
-
-	if got != want {
-		t.Errorf("want:\n%q\ngot:\n%q", want, got)
-	}
-}
-
-func assertPosition(t *testing.T, text string, ref map[string]Position) {
-	tree, err := Load(text)
-	if err != nil {
-		t.Errorf("Error loading document text: `%v`", text)
-		t.Errorf("Error: %v", err)
-	}
-	for path, pos := range ref {
-		testPos := tree.GetPosition(path)
-		if testPos.Invalid() {
-			t.Errorf("Failed to query tree path or path has invalid position: %s", path)
-		} else if pos != testPos {
-			t.Errorf("Expected position %v, got %v instead", pos, testPos)
-		}
-	}
-}
-
-func TestDocumentPositions(t *testing.T) {
-	assertPosition(t,
-		"[foo]\nbar=42\nbaz=69",
-		map[string]Position{
-			"":        {1, 1},
-			"foo":     {1, 1},
-			"foo.bar": {2, 1},
-			"foo.baz": {3, 1},
-		})
-}
-
-func TestDocumentPositionsWithSpaces(t *testing.T) {
-	assertPosition(t,
-		"  [foo]\n  bar=42\n  baz=69",
-		map[string]Position{
-			"":        {1, 1},
-			"foo":     {1, 3},
-			"foo.bar": {2, 3},
-			"foo.baz": {3, 3},
-		})
-}
-
-func TestDocumentPositionsWithGroupArray(t *testing.T) {
-	assertPosition(t,
-		"[[foo]]\nbar=42\nbaz=69",
-		map[string]Position{
-			"":        {1, 1},
-			"foo":     {1, 1},
-			"foo.bar": {2, 1},
-			"foo.baz": {3, 1},
-		})
-}
-
-func TestNestedTreePosition(t *testing.T) {
-	assertPosition(t,
-		"[foo.bar]\na=42\nb=69",
-		map[string]Position{
-			"":          {1, 1},
-			"foo":       {1, 1},
-			"foo.bar":   {1, 1},
-			"foo.bar.a": {2, 1},
-			"foo.bar.b": {3, 1},
-		})
-}
-
-func TestInvalidGroupArray(t *testing.T) {
-	_, err := Load("[table#key]\nanswer = 42")
-	if err == nil {
-		t.Error("Should error")
-	}
-
-	_, err = Load("[foo.[bar]\na = 42")
-	if err.Error() != "(1, 2): unexpected token table key cannot contain ']', was expecting a table key" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestDoubleEqual(t *testing.T) {
-	_, err := Load("foo= = 2")
-	if err.Error() != "(1, 6): cannot have multiple equals for the same key" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestGroupArrayReassign(t *testing.T) {
-	_, err := Load("[hello]\n[[hello]]")
-	if err.Error() != "(2, 3): key \"hello\" is already assigned and not of type table array" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
-
-func TestInvalidFloatParsing(t *testing.T) {
-	_, err := Load("a=1e_2")
-	if err.Error() != "(1, 3): invalid use of _ in number" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a=1e2_")
-	if err.Error() != "(1, 3): invalid use of _ in number" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a=1__2")
-	if err.Error() != "(1, 3): invalid use of _ in number" {
-		t.Error("Bad error message:", err.Error())
-	}
-
-	_, err = Load("a=_1_2")
-	if err.Error() != "(1, 3): cannot start number with underscore" {
-		t.Error("Bad error message:", err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/position_test.go b/installer/vendor/github.com/pelletier/go-toml/position_test.go
deleted file mode 100644
index 63ad1afc86..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/position_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Testing support for go-toml
-
-package toml
-
-import (
-	"testing"
-)
-
-func TestPositionString(t *testing.T) {
-	p := Position{123, 456}
-	expected := "(123, 456)"
-	value := p.String()
-
-	if value != expected {
-		t.Errorf("Expected %v, got %v instead", expected, value)
-	}
-}
-
-func TestInvalid(t *testing.T) {
-	for i, v := range []Position{
-		{0, 1234},
-		{1234, 0},
-		{0, 0},
-	} {
-		if !v.Invalid() {
-			t.Errorf("Position at %v is valid: %v", i, v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/doc.go b/installer/vendor/github.com/pelletier/go-toml/query/doc.go
deleted file mode 100644
index ed63c11096..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/doc.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Package query performs JSONPath-like queries on a TOML document.
-//
-// The query path implementation is based loosely on the JSONPath specification:
-// http://goessner.net/articles/JsonPath/.
-//
-// The idea behind a query path is to allow quick access to any element, or set
-// of elements within TOML document, with a single expression.
-//
-//   result, err := query.CompileAndExecute("$.foo.bar.baz", tree)
-//
-// This is roughly equivalent to:
-//
-//   next := tree.Get("foo")
-//   if next != nil {
-//     next = next.Get("bar")
-//     if next != nil {
-//       next = next.Get("baz")
-//     }
-//   }
-//   result := next
-//
-// err is nil if any parsing exception occurs.
-//
-// If no node in the tree matches the query, result will simply contain an empty list of
-// items.
-//
-// As illustrated above, the query path is much more efficient, especially since
-// the structure of the TOML file can vary.  Rather than making assumptions about
-// a document's structure, a query allows the programmer to make structured
-// requests into the document, and get zero or more values as a result.
-//
-// Query syntax
-//
-// The syntax of a query begins with a root token, followed by any number
-// sub-expressions:
-//
-//   $
-//                    Root of the TOML tree.  This must always come first.
-//   .name
-//                    Selects child of this node, where 'name' is a TOML key
-//                    name.
-//   ['name']
-//                    Selects child of this node, where 'name' is a string
-//                    containing a TOML key name.
-//   [index]
-//                    Selcts child array element at 'index'.
-//   ..expr
-//                    Recursively selects all children, filtered by an a union,
-//                    index, or slice expression.
-//   ..*
-//                    Recursive selection of all nodes at this point in the
-//                    tree.
-//   .*
-//                    Selects all children of the current node.
-//   [expr,expr]
-//                    Union operator - a logical 'or' grouping of two or more
-//                    sub-expressions: index, key name, or filter.
-//   [start:end:step]
-//                    Slice operator - selects array elements from start to
-//                    end-1, at the given step.  All three arguments are
-//                    optional.
-//   [?(filter)]
-//                    Named filter expression - the function 'filter' is
-//                    used to filter children at this node.
-//
-// Query Indexes And Slices
-//
-// Index expressions perform no bounds checking, and will contribute no
-// values to the result set if the provided index or index range is invalid.
-// Negative indexes represent values from the end of the array, counting backwards.
-//
-//   // select the last index of the array named 'foo'
-//   query.CompileAndExecute("$.foo[-1]", tree)
-//
-// Slice expressions are supported, by using ':' to separate a start/end index pair.
-//
-//   // select up to the first five elements in the array
-//   query.CompileAndExecute("$.foo[0:5]", tree)
-//
-// Slice expressions also allow negative indexes for the start and stop
-// arguments.
-//
-//   // select all array elements.
-//   query.CompileAndExecute("$.foo[0:-1]", tree)
-//
-// Slice expressions may have an optional stride/step parameter:
-//
-//   // select every other element
-//   query.CompileAndExecute("$.foo[0:-1:2]", tree)
-//
-// Slice start and end parameters are also optional:
-//
-//   // these are all equivalent and select all the values in the array
-//   query.CompileAndExecute("$.foo[:]", tree)
-//   query.CompileAndExecute("$.foo[0:]", tree)
-//   query.CompileAndExecute("$.foo[:-1]", tree)
-//   query.CompileAndExecute("$.foo[0:-1:]", tree)
-//   query.CompileAndExecute("$.foo[::1]", tree)
-//   query.CompileAndExecute("$.foo[0::1]", tree)
-//   query.CompileAndExecute("$.foo[:-1:1]", tree)
-//   query.CompileAndExecute("$.foo[0:-1:1]", tree)
-//
-// Query Filters
-//
-// Query filters are used within a Union [,] or single Filter [] expression.
-// A filter only allows nodes that qualify through to the next expression,
-// and/or into the result set.
-//
-//   // returns children of foo that are permitted by the 'bar' filter.
-//   query.CompileAndExecute("$.foo[?(bar)]", tree)
-//
-// There are several filters provided with the library:
-//
-//   tree
-//          Allows nodes of type Tree.
-//   int
-//          Allows nodes of type int64.
-//   float
-//          Allows nodes of type float64.
-//   string
-//          Allows nodes of type string.
-//   time
-//          Allows nodes of type time.Time.
-//   bool
-//          Allows nodes of type bool.
-//
-// Query Results
-//
-// An executed query returns a Result object.  This contains the nodes
-// in the TOML tree that qualify the query expression.  Position information
-// is also available for each value in the set.
-//
-//   // display the results of a query
-//   results := query.CompileAndExecute("$.foo.bar.baz", tree)
-//   for idx, value := results.Values() {
-//       fmt.Println("%v: %v", results.Positions()[idx], value)
-//   }
-//
-// Compiled Queries
-//
-// Queries may be executed directly on a Tree object, or compiled ahead
-// of time and executed discretely.  The former is more convenient, but has the
-// penalty of having to recompile the query expression each time.
-//
-//   // basic query
-//   results := query.CompileAndExecute("$.foo.bar.baz", tree)
-//
-//   // compiled query
-//   query, err := toml.Compile("$.foo.bar.baz")
-//   results := query.Execute(tree)
-//
-//   // run the compiled query again on a different tree
-//   moreResults := query.Execute(anotherTree)
-//
-// User Defined Query Filters
-//
-// Filter expressions may also be user defined by using the SetFilter()
-// function on the Query object.  The function must return true/false, which
-// signifies if the passed node is kept or discarded, respectively.
-//
-//   // create a query that references a user-defined filter
-//   query, _ := query.Compile("$[?(bazOnly)]")
-//
-//   // define the filter, and assign it to the query
-//   query.SetFilter("bazOnly", func(node interface{}) bool{
-//       if tree, ok := node.(*Tree); ok {
-//           return tree.Has("baz")
-//       }
-//       return false  // reject all other node types
-//   })
-//
-//   // run the query
-//   query.Execute(tree)
-//
-package query
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/lexer.go b/installer/vendor/github.com/pelletier/go-toml/query/lexer.go
deleted file mode 100644
index 2dc319408e..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/lexer.go
+++ /dev/null
@@ -1,357 +0,0 @@
-// TOML JSONPath lexer.
-//
-// Written using the principles developed by Rob Pike in
-// http://www.youtube.com/watch?v=HxaD_trXwRE
-
-package query
-
-import (
-	"fmt"
-	"github.com/pelletier/go-toml"
-	"strconv"
-	"strings"
-	"unicode/utf8"
-)
-
-// Lexer state function
-type queryLexStateFn func() queryLexStateFn
-
-// Lexer definition
-type queryLexer struct {
-	input      string
-	start      int
-	pos        int
-	width      int
-	tokens     chan token
-	depth      int
-	line       int
-	col        int
-	stringTerm string
-}
-
-func (l *queryLexer) run() {
-	for state := l.lexVoid; state != nil; {
-		state = state()
-	}
-	close(l.tokens)
-}
-
-func (l *queryLexer) nextStart() {
-	// iterate by runes (utf8 characters)
-	// search for newlines and advance line/col counts
-	for i := l.start; i < l.pos; {
-		r, width := utf8.DecodeRuneInString(l.input[i:])
-		if r == '\n' {
-			l.line++
-			l.col = 1
-		} else {
-			l.col++
-		}
-		i += width
-	}
-	// advance start position to next token
-	l.start = l.pos
-}
-
-func (l *queryLexer) emit(t tokenType) {
-	l.tokens <- token{
-		Position: toml.Position{Line: l.line, Col: l.col},
-		typ:      t,
-		val:      l.input[l.start:l.pos],
-	}
-	l.nextStart()
-}
-
-func (l *queryLexer) emitWithValue(t tokenType, value string) {
-	l.tokens <- token{
-		Position: toml.Position{Line: l.line, Col: l.col},
-		typ:      t,
-		val:      value,
-	}
-	l.nextStart()
-}
-
-func (l *queryLexer) next() rune {
-	if l.pos >= len(l.input) {
-		l.width = 0
-		return eof
-	}
-	var r rune
-	r, l.width = utf8.DecodeRuneInString(l.input[l.pos:])
-	l.pos += l.width
-	return r
-}
-
-func (l *queryLexer) ignore() {
-	l.nextStart()
-}
-
-func (l *queryLexer) backup() {
-	l.pos -= l.width
-}
-
-func (l *queryLexer) errorf(format string, args ...interface{}) queryLexStateFn {
-	l.tokens <- token{
-		Position: toml.Position{Line: l.line, Col: l.col},
-		typ:      tokenError,
-		val:      fmt.Sprintf(format, args...),
-	}
-	return nil
-}
-
-func (l *queryLexer) peek() rune {
-	r := l.next()
-	l.backup()
-	return r
-}
-
-func (l *queryLexer) accept(valid string) bool {
-	if strings.ContainsRune(valid, l.next()) {
-		return true
-	}
-	l.backup()
-	return false
-}
-
-func (l *queryLexer) follow(next string) bool {
-	return strings.HasPrefix(l.input[l.pos:], next)
-}
-
-func (l *queryLexer) lexVoid() queryLexStateFn {
-	for {
-		next := l.peek()
-		switch next {
-		case '$':
-			l.pos++
-			l.emit(tokenDollar)
-			continue
-		case '.':
-			if l.follow("..") {
-				l.pos += 2
-				l.emit(tokenDotDot)
-			} else {
-				l.pos++
-				l.emit(tokenDot)
-			}
-			continue
-		case '[':
-			l.pos++
-			l.emit(tokenLeftBracket)
-			continue
-		case ']':
-			l.pos++
-			l.emit(tokenRightBracket)
-			continue
-		case ',':
-			l.pos++
-			l.emit(tokenComma)
-			continue
-		case '*':
-			l.pos++
-			l.emit(tokenStar)
-			continue
-		case '(':
-			l.pos++
-			l.emit(tokenLeftParen)
-			continue
-		case ')':
-			l.pos++
-			l.emit(tokenRightParen)
-			continue
-		case '?':
-			l.pos++
-			l.emit(tokenQuestion)
-			continue
-		case ':':
-			l.pos++
-			l.emit(tokenColon)
-			continue
-		case '\'':
-			l.ignore()
-			l.stringTerm = string(next)
-			return l.lexString
-		case '"':
-			l.ignore()
-			l.stringTerm = string(next)
-			return l.lexString
-		}
-
-		if isSpace(next) {
-			l.next()
-			l.ignore()
-			continue
-		}
-
-		if isAlphanumeric(next) {
-			return l.lexKey
-		}
-
-		if next == '+' || next == '-' || isDigit(next) {
-			return l.lexNumber
-		}
-
-		if l.next() == eof {
-			break
-		}
-
-		return l.errorf("unexpected char: '%v'", next)
-	}
-	l.emit(tokenEOF)
-	return nil
-}
-
-func (l *queryLexer) lexKey() queryLexStateFn {
-	for {
-		next := l.peek()
-		if !isAlphanumeric(next) {
-			l.emit(tokenKey)
-			return l.lexVoid
-		}
-
-		if l.next() == eof {
-			break
-		}
-	}
-	l.emit(tokenEOF)
-	return nil
-}
-
-func (l *queryLexer) lexString() queryLexStateFn {
-	l.pos++
-	l.ignore()
-	growingString := ""
-
-	for {
-		if l.follow(l.stringTerm) {
-			l.emitWithValue(tokenString, growingString)
-			l.pos++
-			l.ignore()
-			return l.lexVoid
-		}
-
-		if l.follow("\\\"") {
-			l.pos++
-			growingString += "\""
-		} else if l.follow("\\'") {
-			l.pos++
-			growingString += "'"
-		} else if l.follow("\\n") {
-			l.pos++
-			growingString += "\n"
-		} else if l.follow("\\b") {
-			l.pos++
-			growingString += "\b"
-		} else if l.follow("\\f") {
-			l.pos++
-			growingString += "\f"
-		} else if l.follow("\\/") {
-			l.pos++
-			growingString += "/"
-		} else if l.follow("\\t") {
-			l.pos++
-			growingString += "\t"
-		} else if l.follow("\\r") {
-			l.pos++
-			growingString += "\r"
-		} else if l.follow("\\\\") {
-			l.pos++
-			growingString += "\\"
-		} else if l.follow("\\u") {
-			l.pos += 2
-			code := ""
-			for i := 0; i < 4; i++ {
-				c := l.peek()
-				l.pos++
-				if !isHexDigit(c) {
-					return l.errorf("unfinished unicode escape")
-				}
-				code = code + string(c)
-			}
-			l.pos--
-			intcode, err := strconv.ParseInt(code, 16, 32)
-			if err != nil {
-				return l.errorf("invalid unicode escape: \\u" + code)
-			}
-			growingString += string(rune(intcode))
-		} else if l.follow("\\U") {
-			l.pos += 2
-			code := ""
-			for i := 0; i < 8; i++ {
-				c := l.peek()
-				l.pos++
-				if !isHexDigit(c) {
-					return l.errorf("unfinished unicode escape")
-				}
-				code = code + string(c)
-			}
-			l.pos--
-			intcode, err := strconv.ParseInt(code, 16, 32)
-			if err != nil {
-				return l.errorf("invalid unicode escape: \\u" + code)
-			}
-			growingString += string(rune(intcode))
-		} else if l.follow("\\") {
-			l.pos++
-			return l.errorf("invalid escape sequence: \\" + string(l.peek()))
-		} else {
-			growingString += string(l.peek())
-		}
-
-		if l.next() == eof {
-			break
-		}
-	}
-
-	return l.errorf("unclosed string")
-}
-
-func (l *queryLexer) lexNumber() queryLexStateFn {
-	l.ignore()
-	if !l.accept("+") {
-		l.accept("-")
-	}
-	pointSeen := false
-	digitSeen := false
-	for {
-		next := l.next()
-		if next == '.' {
-			if pointSeen {
-				return l.errorf("cannot have two dots in one float")
-			}
-			if !isDigit(l.peek()) {
-				return l.errorf("float cannot end with a dot")
-			}
-			pointSeen = true
-		} else if isDigit(next) {
-			digitSeen = true
-		} else {
-			l.backup()
-			break
-		}
-		if pointSeen && !digitSeen {
-			return l.errorf("cannot start float with a dot")
-		}
-	}
-
-	if !digitSeen {
-		return l.errorf("no digit in that number")
-	}
-	if pointSeen {
-		l.emit(tokenFloat)
-	} else {
-		l.emit(tokenInteger)
-	}
-	return l.lexVoid
-}
-
-// Entry point
-func lexQuery(input string) chan token {
-	l := &queryLexer{
-		input:  input,
-		tokens: make(chan token),
-		line:   1,
-		col:    1,
-	}
-	go l.run()
-	return l.tokens
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/lexer_test.go b/installer/vendor/github.com/pelletier/go-toml/query/lexer_test.go
deleted file mode 100644
index 8ce0501fed..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/lexer_test.go
+++ /dev/null
@@ -1,179 +0,0 @@
-package query
-
-import (
-	"github.com/pelletier/go-toml"
-	"testing"
-)
-
-func testQLFlow(t *testing.T, input string, expectedFlow []token) {
-	ch := lexQuery(input)
-	for idx, expected := range expectedFlow {
-		token := <-ch
-		if token != expected {
-			t.Log("While testing #", idx, ":", input)
-			t.Log("compared (got)", token, "to (expected)", expected)
-			t.Log("\tvalue:", token.val, "<->", expected.val)
-			t.Log("\tvalue as bytes:", []byte(token.val), "<->", []byte(expected.val))
-			t.Log("\ttype:", token.typ.String(), "<->", expected.typ.String())
-			t.Log("\tline:", token.Line, "<->", expected.Line)
-			t.Log("\tcolumn:", token.Col, "<->", expected.Col)
-			t.Log("compared", token, "to", expected)
-			t.FailNow()
-		}
-	}
-
-	tok, ok := <-ch
-	if ok {
-		t.Log("channel is not closed!")
-		t.Log(len(ch)+1, "tokens remaining:")
-
-		t.Log("token ->", tok)
-		for token := range ch {
-			t.Log("token ->", token)
-		}
-		t.FailNow()
-	}
-}
-
-func TestLexSpecialChars(t *testing.T) {
-	testQLFlow(t, " .$[]..()?*", []token{
-		{toml.Position{1, 2}, tokenDot, "."},
-		{toml.Position{1, 3}, tokenDollar, "$"},
-		{toml.Position{1, 4}, tokenLeftBracket, "["},
-		{toml.Position{1, 5}, tokenRightBracket, "]"},
-		{toml.Position{1, 6}, tokenDotDot, ".."},
-		{toml.Position{1, 8}, tokenLeftParen, "("},
-		{toml.Position{1, 9}, tokenRightParen, ")"},
-		{toml.Position{1, 10}, tokenQuestion, "?"},
-		{toml.Position{1, 11}, tokenStar, "*"},
-		{toml.Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestLexString(t *testing.T) {
-	testQLFlow(t, "'foo\n'", []token{
-		{toml.Position{1, 2}, tokenString, "foo\n"},
-		{toml.Position{2, 2}, tokenEOF, ""},
-	})
-}
-
-func TestLexDoubleString(t *testing.T) {
-	testQLFlow(t, `"bar"`, []token{
-		{toml.Position{1, 2}, tokenString, "bar"},
-		{toml.Position{1, 6}, tokenEOF, ""},
-	})
-}
-
-func TestLexStringEscapes(t *testing.T) {
-	testQLFlow(t, `"foo \" \' \b \f \/ \t \r \\ \u03A9 \U00012345 \n bar"`, []token{
-		{toml.Position{1, 2}, tokenString, "foo \" ' \b \f / \t \r \\ \u03A9 \U00012345 \n bar"},
-		{toml.Position{1, 55}, tokenEOF, ""},
-	})
-}
-
-func TestLexStringUnfinishedUnicode4(t *testing.T) {
-	testQLFlow(t, `"\u000"`, []token{
-		{toml.Position{1, 2}, tokenError, "unfinished unicode escape"},
-	})
-}
-
-func TestLexStringUnfinishedUnicode8(t *testing.T) {
-	testQLFlow(t, `"\U0000"`, []token{
-		{toml.Position{1, 2}, tokenError, "unfinished unicode escape"},
-	})
-}
-
-func TestLexStringInvalidEscape(t *testing.T) {
-	testQLFlow(t, `"\x"`, []token{
-		{toml.Position{1, 2}, tokenError, "invalid escape sequence: \\x"},
-	})
-}
-
-func TestLexStringUnfinished(t *testing.T) {
-	testQLFlow(t, `"bar`, []token{
-		{toml.Position{1, 2}, tokenError, "unclosed string"},
-	})
-}
-
-func TestLexKey(t *testing.T) {
-	testQLFlow(t, "foo", []token{
-		{toml.Position{1, 1}, tokenKey, "foo"},
-		{toml.Position{1, 4}, tokenEOF, ""},
-	})
-}
-
-func TestLexRecurse(t *testing.T) {
-	testQLFlow(t, "$..*", []token{
-		{toml.Position{1, 1}, tokenDollar, "$"},
-		{toml.Position{1, 2}, tokenDotDot, ".."},
-		{toml.Position{1, 4}, tokenStar, "*"},
-		{toml.Position{1, 5}, tokenEOF, ""},
-	})
-}
-
-func TestLexBracketKey(t *testing.T) {
-	testQLFlow(t, "$[foo]", []token{
-		{toml.Position{1, 1}, tokenDollar, "$"},
-		{toml.Position{1, 2}, tokenLeftBracket, "["},
-		{toml.Position{1, 3}, tokenKey, "foo"},
-		{toml.Position{1, 6}, tokenRightBracket, "]"},
-		{toml.Position{1, 7}, tokenEOF, ""},
-	})
-}
-
-func TestLexSpace(t *testing.T) {
-	testQLFlow(t, "foo bar baz", []token{
-		{toml.Position{1, 1}, tokenKey, "foo"},
-		{toml.Position{1, 5}, tokenKey, "bar"},
-		{toml.Position{1, 9}, tokenKey, "baz"},
-		{toml.Position{1, 12}, tokenEOF, ""},
-	})
-}
-
-func TestLexInteger(t *testing.T) {
-	testQLFlow(t, "100 +200 -300", []token{
-		{toml.Position{1, 1}, tokenInteger, "100"},
-		{toml.Position{1, 5}, tokenInteger, "+200"},
-		{toml.Position{1, 10}, tokenInteger, "-300"},
-		{toml.Position{1, 14}, tokenEOF, ""},
-	})
-}
-
-func TestLexFloat(t *testing.T) {
-	testQLFlow(t, "100.0 +200.0 -300.0", []token{
-		{toml.Position{1, 1}, tokenFloat, "100.0"},
-		{toml.Position{1, 7}, tokenFloat, "+200.0"},
-		{toml.Position{1, 14}, tokenFloat, "-300.0"},
-		{toml.Position{1, 20}, tokenEOF, ""},
-	})
-}
-
-func TestLexFloatWithMultipleDots(t *testing.T) {
-	testQLFlow(t, "4.2.", []token{
-		{toml.Position{1, 1}, tokenError, "cannot have two dots in one float"},
-	})
-}
-
-func TestLexFloatLeadingDot(t *testing.T) {
-	testQLFlow(t, "+.1", []token{
-		{toml.Position{1, 1}, tokenError, "cannot start float with a dot"},
-	})
-}
-
-func TestLexFloatWithTrailingDot(t *testing.T) {
-	testQLFlow(t, "42.", []token{
-		{toml.Position{1, 1}, tokenError, "float cannot end with a dot"},
-	})
-}
-
-func TestLexNumberWithoutDigit(t *testing.T) {
-	testQLFlow(t, "+", []token{
-		{toml.Position{1, 1}, tokenError, "no digit in that number"},
-	})
-}
-
-func TestLexUnknown(t *testing.T) {
-	testQLFlow(t, "^", []token{
-		{toml.Position{1, 1}, tokenError, "unexpected char: '94'"},
-	})
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/match.go b/installer/vendor/github.com/pelletier/go-toml/query/match.go
deleted file mode 100644
index d7bb15a45a..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/match.go
+++ /dev/null
@@ -1,232 +0,0 @@
-package query
-
-import (
-	"fmt"
-	"github.com/pelletier/go-toml"
-)
-
-// base match
-type matchBase struct {
-	next pathFn
-}
-
-func (f *matchBase) setNext(next pathFn) {
-	f.next = next
-}
-
-// terminating functor - gathers results
-type terminatingFn struct {
-	// empty
-}
-
-func newTerminatingFn() *terminatingFn {
-	return &terminatingFn{}
-}
-
-func (f *terminatingFn) setNext(next pathFn) {
-	// do nothing
-}
-
-func (f *terminatingFn) call(node interface{}, ctx *queryContext) {
-	ctx.result.appendResult(node, ctx.lastPosition)
-}
-
-// match single key
-type matchKeyFn struct {
-	matchBase
-	Name string
-}
-
-func newMatchKeyFn(name string) *matchKeyFn {
-	return &matchKeyFn{Name: name}
-}
-
-func (f *matchKeyFn) call(node interface{}, ctx *queryContext) {
-	if array, ok := node.([]*toml.Tree); ok {
-		for _, tree := range array {
-			item := tree.Get(f.Name)
-			if item != nil {
-				ctx.lastPosition = tree.GetPosition(f.Name)
-				f.next.call(item, ctx)
-			}
-		}
-	} else if tree, ok := node.(*toml.Tree); ok {
-		item := tree.Get(f.Name)
-		if item != nil {
-			ctx.lastPosition = tree.GetPosition(f.Name)
-			f.next.call(item, ctx)
-		}
-	}
-}
-
-// match single index
-type matchIndexFn struct {
-	matchBase
-	Idx int
-}
-
-func newMatchIndexFn(idx int) *matchIndexFn {
-	return &matchIndexFn{Idx: idx}
-}
-
-func (f *matchIndexFn) call(node interface{}, ctx *queryContext) {
-	if arr, ok := node.([]interface{}); ok {
-		if f.Idx < len(arr) && f.Idx >= 0 {
-			if treesArray, ok := node.([]*toml.Tree); ok {
-				if len(treesArray) > 0 {
-					ctx.lastPosition = treesArray[0].Position()
-				}
-			}
-			f.next.call(arr[f.Idx], ctx)
-		}
-	}
-}
-
-// filter by slicing
-type matchSliceFn struct {
-	matchBase
-	Start, End, Step int
-}
-
-func newMatchSliceFn(start, end, step int) *matchSliceFn {
-	return &matchSliceFn{Start: start, End: end, Step: step}
-}
-
-func (f *matchSliceFn) call(node interface{}, ctx *queryContext) {
-	if arr, ok := node.([]interface{}); ok {
-		// adjust indexes for negative values, reverse ordering
-		realStart, realEnd := f.Start, f.End
-		if realStart < 0 {
-			realStart = len(arr) + realStart
-		}
-		if realEnd < 0 {
-			realEnd = len(arr) + realEnd
-		}
-		if realEnd < realStart {
-			realEnd, realStart = realStart, realEnd // swap
-		}
-		// loop and gather
-		for idx := realStart; idx < realEnd; idx += f.Step {
-			if treesArray, ok := node.([]*toml.Tree); ok {
-				if len(treesArray) > 0 {
-					ctx.lastPosition = treesArray[0].Position()
-				}
-			}
-			f.next.call(arr[idx], ctx)
-		}
-	}
-}
-
-// match anything
-type matchAnyFn struct {
-	matchBase
-}
-
-func newMatchAnyFn() *matchAnyFn {
-	return &matchAnyFn{}
-}
-
-func (f *matchAnyFn) call(node interface{}, ctx *queryContext) {
-	if tree, ok := node.(*toml.Tree); ok {
-		for _, k := range tree.Keys() {
-			v := tree.Get(k)
-			ctx.lastPosition = tree.GetPosition(k)
-			f.next.call(v, ctx)
-		}
-	}
-}
-
-// filter through union
-type matchUnionFn struct {
-	Union []pathFn
-}
-
-func (f *matchUnionFn) setNext(next pathFn) {
-	for _, fn := range f.Union {
-		fn.setNext(next)
-	}
-}
-
-func (f *matchUnionFn) call(node interface{}, ctx *queryContext) {
-	for _, fn := range f.Union {
-		fn.call(node, ctx)
-	}
-}
-
-// match every single last node in the tree
-type matchRecursiveFn struct {
-	matchBase
-}
-
-func newMatchRecursiveFn() *matchRecursiveFn {
-	return &matchRecursiveFn{}
-}
-
-func (f *matchRecursiveFn) call(node interface{}, ctx *queryContext) {
-	originalPosition := ctx.lastPosition
-	if tree, ok := node.(*toml.Tree); ok {
-		var visit func(tree *toml.Tree)
-		visit = func(tree *toml.Tree) {
-			for _, k := range tree.Keys() {
-				v := tree.Get(k)
-				ctx.lastPosition = tree.GetPosition(k)
-				f.next.call(v, ctx)
-				switch node := v.(type) {
-				case *toml.Tree:
-					visit(node)
-				case []*toml.Tree:
-					for _, subtree := range node {
-						visit(subtree)
-					}
-				}
-			}
-		}
-		ctx.lastPosition = originalPosition
-		f.next.call(tree, ctx)
-		visit(tree)
-	}
-}
-
-// match based on an externally provided functional filter
-type matchFilterFn struct {
-	matchBase
-	Pos  toml.Position
-	Name string
-}
-
-func newMatchFilterFn(name string, pos toml.Position) *matchFilterFn {
-	return &matchFilterFn{Name: name, Pos: pos}
-}
-
-func (f *matchFilterFn) call(node interface{}, ctx *queryContext) {
-	fn, ok := (*ctx.filters)[f.Name]
-	if !ok {
-		panic(fmt.Sprintf("%s: query context does not have filter '%s'",
-			f.Pos.String(), f.Name))
-	}
-	switch castNode := node.(type) {
-	case *toml.Tree:
-		for _, k := range castNode.Keys() {
-			v := castNode.Get(k)
-			if fn(v) {
-				ctx.lastPosition = castNode.GetPosition(k)
-				f.next.call(v, ctx)
-			}
-		}
-	case []*toml.Tree:
-		for _, v := range castNode {
-			if fn(v) {
-				if len(castNode) > 0 {
-					ctx.lastPosition = castNode[0].Position()
-				}
-				f.next.call(v, ctx)
-			}
-		}
-	case []interface{}:
-		for _, v := range castNode {
-			if fn(v) {
-				f.next.call(v, ctx)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/match_test.go b/installer/vendor/github.com/pelletier/go-toml/query/match_test.go
deleted file mode 100644
index 429b8f6b9a..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/match_test.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package query
-
-import (
-	"fmt"
-	"github.com/pelletier/go-toml"
-	"testing"
-)
-
-// dump path tree to a string
-func pathString(root pathFn) string {
-	result := fmt.Sprintf("%T:", root)
-	switch fn := root.(type) {
-	case *terminatingFn:
-		result += "{}"
-	case *matchKeyFn:
-		result += fmt.Sprintf("{%s}", fn.Name)
-		result += pathString(fn.next)
-	case *matchIndexFn:
-		result += fmt.Sprintf("{%d}", fn.Idx)
-		result += pathString(fn.next)
-	case *matchSliceFn:
-		result += fmt.Sprintf("{%d:%d:%d}",
-			fn.Start, fn.End, fn.Step)
-		result += pathString(fn.next)
-	case *matchAnyFn:
-		result += "{}"
-		result += pathString(fn.next)
-	case *matchUnionFn:
-		result += "{["
-		for _, v := range fn.Union {
-			result += pathString(v) + ", "
-		}
-		result += "]}"
-	case *matchRecursiveFn:
-		result += "{}"
-		result += pathString(fn.next)
-	case *matchFilterFn:
-		result += fmt.Sprintf("{%s}", fn.Name)
-		result += pathString(fn.next)
-	}
-	return result
-}
-
-func assertPathMatch(t *testing.T, path, ref *Query) bool {
-	pathStr := pathString(path.root)
-	refStr := pathString(ref.root)
-	if pathStr != refStr {
-		t.Errorf("paths do not match")
-		t.Log("test:", pathStr)
-		t.Log("ref: ", refStr)
-		return false
-	}
-	return true
-}
-
-func assertPath(t *testing.T, query string, ref *Query) {
-	path, _ := parseQuery(lexQuery(query))
-	assertPathMatch(t, path, ref)
-}
-
-func buildPath(parts ...pathFn) *Query {
-	query := newQuery()
-	for _, v := range parts {
-		query.appendPath(v)
-	}
-	return query
-}
-
-func TestPathRoot(t *testing.T) {
-	assertPath(t,
-		"$",
-		buildPath(
-		// empty
-		))
-}
-
-func TestPathKey(t *testing.T) {
-	assertPath(t,
-		"$.foo",
-		buildPath(
-			newMatchKeyFn("foo"),
-		))
-}
-
-func TestPathBracketKey(t *testing.T) {
-	assertPath(t,
-		"$[foo]",
-		buildPath(
-			newMatchKeyFn("foo"),
-		))
-}
-
-func TestPathBracketStringKey(t *testing.T) {
-	assertPath(t,
-		"$['foo']",
-		buildPath(
-			newMatchKeyFn("foo"),
-		))
-}
-
-func TestPathIndex(t *testing.T) {
-	assertPath(t,
-		"$[123]",
-		buildPath(
-			newMatchIndexFn(123),
-		))
-}
-
-func TestPathSliceStart(t *testing.T) {
-	assertPath(t,
-		"$[123:]",
-		buildPath(
-			newMatchSliceFn(123, maxInt, 1),
-		))
-}
-
-func TestPathSliceStartEnd(t *testing.T) {
-	assertPath(t,
-		"$[123:456]",
-		buildPath(
-			newMatchSliceFn(123, 456, 1),
-		))
-}
-
-func TestPathSliceStartEndColon(t *testing.T) {
-	assertPath(t,
-		"$[123:456:]",
-		buildPath(
-			newMatchSliceFn(123, 456, 1),
-		))
-}
-
-func TestPathSliceStartStep(t *testing.T) {
-	assertPath(t,
-		"$[123::7]",
-		buildPath(
-			newMatchSliceFn(123, maxInt, 7),
-		))
-}
-
-func TestPathSliceEndStep(t *testing.T) {
-	assertPath(t,
-		"$[:456:7]",
-		buildPath(
-			newMatchSliceFn(0, 456, 7),
-		))
-}
-
-func TestPathSliceStep(t *testing.T) {
-	assertPath(t,
-		"$[::7]",
-		buildPath(
-			newMatchSliceFn(0, maxInt, 7),
-		))
-}
-
-func TestPathSliceAll(t *testing.T) {
-	assertPath(t,
-		"$[123:456:7]",
-		buildPath(
-			newMatchSliceFn(123, 456, 7),
-		))
-}
-
-func TestPathAny(t *testing.T) {
-	assertPath(t,
-		"$.*",
-		buildPath(
-			newMatchAnyFn(),
-		))
-}
-
-func TestPathUnion(t *testing.T) {
-	assertPath(t,
-		"$[foo, bar, baz]",
-		buildPath(
-			&matchUnionFn{[]pathFn{
-				newMatchKeyFn("foo"),
-				newMatchKeyFn("bar"),
-				newMatchKeyFn("baz"),
-			}},
-		))
-}
-
-func TestPathRecurse(t *testing.T) {
-	assertPath(t,
-		"$..*",
-		buildPath(
-			newMatchRecursiveFn(),
-		))
-}
-
-func TestPathFilterExpr(t *testing.T) {
-	assertPath(t,
-		"$[?('foo'),?(bar)]",
-		buildPath(
-			&matchUnionFn{[]pathFn{
-				newMatchFilterFn("foo", toml.Position{}),
-				newMatchFilterFn("bar", toml.Position{}),
-			}},
-		))
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/parser.go b/installer/vendor/github.com/pelletier/go-toml/query/parser.go
deleted file mode 100644
index 5f69b70d45..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/parser.go
+++ /dev/null
@@ -1,275 +0,0 @@
-/*
-  Based on the "jsonpath" spec/concept.
-
-  http://goessner.net/articles/JsonPath/
-  https://code.google.com/p/json-path/
-*/
-
-package query
-
-import (
-	"fmt"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-type queryParser struct {
-	flow         chan token
-	tokensBuffer []token
-	query        *Query
-	union        []pathFn
-	err          error
-}
-
-type queryParserStateFn func() queryParserStateFn
-
-// Formats and panics an error message based on a token
-func (p *queryParser) parseError(tok *token, msg string, args ...interface{}) queryParserStateFn {
-	p.err = fmt.Errorf(tok.Position.String()+": "+msg, args...)
-	return nil // trigger parse to end
-}
-
-func (p *queryParser) run() {
-	for state := p.parseStart; state != nil; {
-		state = state()
-	}
-}
-
-func (p *queryParser) backup(tok *token) {
-	p.tokensBuffer = append(p.tokensBuffer, *tok)
-}
-
-func (p *queryParser) peek() *token {
-	if len(p.tokensBuffer) != 0 {
-		return &(p.tokensBuffer[0])
-	}
-
-	tok, ok := <-p.flow
-	if !ok {
-		return nil
-	}
-	p.backup(&tok)
-	return &tok
-}
-
-func (p *queryParser) lookahead(types ...tokenType) bool {
-	result := true
-	buffer := []token{}
-
-	for _, typ := range types {
-		tok := p.getToken()
-		if tok == nil {
-			result = false
-			break
-		}
-		buffer = append(buffer, *tok)
-		if tok.typ != typ {
-			result = false
-			break
-		}
-	}
-	// add the tokens back to the buffer, and return
-	p.tokensBuffer = append(p.tokensBuffer, buffer...)
-	return result
-}
-
-func (p *queryParser) getToken() *token {
-	if len(p.tokensBuffer) != 0 {
-		tok := p.tokensBuffer[0]
-		p.tokensBuffer = p.tokensBuffer[1:]
-		return &tok
-	}
-	tok, ok := <-p.flow
-	if !ok {
-		return nil
-	}
-	return &tok
-}
-
-func (p *queryParser) parseStart() queryParserStateFn {
-	tok := p.getToken()
-
-	if tok == nil || tok.typ == tokenEOF {
-		return nil
-	}
-
-	if tok.typ != tokenDollar {
-		return p.parseError(tok, "Expected '$' at start of expression")
-	}
-
-	return p.parseMatchExpr
-}
-
-// handle '.' prefix, '[]', and '..'
-func (p *queryParser) parseMatchExpr() queryParserStateFn {
-	tok := p.getToken()
-	switch tok.typ {
-	case tokenDotDot:
-		p.query.appendPath(&matchRecursiveFn{})
-		// nested parse for '..'
-		tok := p.getToken()
-		switch tok.typ {
-		case tokenKey:
-			p.query.appendPath(newMatchKeyFn(tok.val))
-			return p.parseMatchExpr
-		case tokenLeftBracket:
-			return p.parseBracketExpr
-		case tokenStar:
-			// do nothing - the recursive predicate is enough
-			return p.parseMatchExpr
-		}
-
-	case tokenDot:
-		// nested parse for '.'
-		tok := p.getToken()
-		switch tok.typ {
-		case tokenKey:
-			p.query.appendPath(newMatchKeyFn(tok.val))
-			return p.parseMatchExpr
-		case tokenStar:
-			p.query.appendPath(&matchAnyFn{})
-			return p.parseMatchExpr
-		}
-
-	case tokenLeftBracket:
-		return p.parseBracketExpr
-
-	case tokenEOF:
-		return nil // allow EOF at this stage
-	}
-	return p.parseError(tok, "expected match expression")
-}
-
-func (p *queryParser) parseBracketExpr() queryParserStateFn {
-	if p.lookahead(tokenInteger, tokenColon) {
-		return p.parseSliceExpr
-	}
-	if p.peek().typ == tokenColon {
-		return p.parseSliceExpr
-	}
-	return p.parseUnionExpr
-}
-
-func (p *queryParser) parseUnionExpr() queryParserStateFn {
-	var tok *token
-
-	// this state can be traversed after some sub-expressions
-	// so be careful when setting up state in the parser
-	if p.union == nil {
-		p.union = []pathFn{}
-	}
-
-loop: // labeled loop for easy breaking
-	for {
-		if len(p.union) > 0 {
-			// parse delimiter or terminator
-			tok = p.getToken()
-			switch tok.typ {
-			case tokenComma:
-				// do nothing
-			case tokenRightBracket:
-				break loop
-			default:
-				return p.parseError(tok, "expected ',' or ']', not '%s'", tok.val)
-			}
-		}
-
-		// parse sub expression
-		tok = p.getToken()
-		switch tok.typ {
-		case tokenInteger:
-			p.union = append(p.union, newMatchIndexFn(tok.Int()))
-		case tokenKey:
-			p.union = append(p.union, newMatchKeyFn(tok.val))
-		case tokenString:
-			p.union = append(p.union, newMatchKeyFn(tok.val))
-		case tokenQuestion:
-			return p.parseFilterExpr
-		default:
-			return p.parseError(tok, "expected union sub expression, not '%s', %d", tok.val, len(p.union))
-		}
-	}
-
-	// if there is only one sub-expression, use that instead
-	if len(p.union) == 1 {
-		p.query.appendPath(p.union[0])
-	} else {
-		p.query.appendPath(&matchUnionFn{p.union})
-	}
-
-	p.union = nil // clear out state
-	return p.parseMatchExpr
-}
-
-func (p *queryParser) parseSliceExpr() queryParserStateFn {
-	// init slice to grab all elements
-	start, end, step := 0, maxInt, 1
-
-	// parse optional start
-	tok := p.getToken()
-	if tok.typ == tokenInteger {
-		start = tok.Int()
-		tok = p.getToken()
-	}
-	if tok.typ != tokenColon {
-		return p.parseError(tok, "expected ':'")
-	}
-
-	// parse optional end
-	tok = p.getToken()
-	if tok.typ == tokenInteger {
-		end = tok.Int()
-		tok = p.getToken()
-	}
-	if tok.typ == tokenRightBracket {
-		p.query.appendPath(newMatchSliceFn(start, end, step))
-		return p.parseMatchExpr
-	}
-	if tok.typ != tokenColon {
-		return p.parseError(tok, "expected ']' or ':'")
-	}
-
-	// parse optional step
-	tok = p.getToken()
-	if tok.typ == tokenInteger {
-		step = tok.Int()
-		if step < 0 {
-			return p.parseError(tok, "step must be a positive value")
-		}
-		tok = p.getToken()
-	}
-	if tok.typ != tokenRightBracket {
-		return p.parseError(tok, "expected ']'")
-	}
-
-	p.query.appendPath(newMatchSliceFn(start, end, step))
-	return p.parseMatchExpr
-}
-
-func (p *queryParser) parseFilterExpr() queryParserStateFn {
-	tok := p.getToken()
-	if tok.typ != tokenLeftParen {
-		return p.parseError(tok, "expected left-parenthesis for filter expression")
-	}
-	tok = p.getToken()
-	if tok.typ != tokenKey && tok.typ != tokenString {
-		return p.parseError(tok, "expected key or string for filter function name")
-	}
-	name := tok.val
-	tok = p.getToken()
-	if tok.typ != tokenRightParen {
-		return p.parseError(tok, "expected right-parenthesis for filter expression")
-	}
-	p.union = append(p.union, newMatchFilterFn(name, tok.Position))
-	return p.parseUnionExpr
-}
-
-func parseQuery(flow chan token) (*Query, error) {
-	parser := &queryParser{
-		flow:         flow,
-		tokensBuffer: []token{},
-		query:        newQuery(),
-	}
-	parser.run()
-	return parser.query, parser.err
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/parser_test.go b/installer/vendor/github.com/pelletier/go-toml/query/parser_test.go
deleted file mode 100644
index 473896a025..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/parser_test.go
+++ /dev/null
@@ -1,482 +0,0 @@
-package query
-
-import (
-	"fmt"
-	"github.com/pelletier/go-toml"
-	"io/ioutil"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-)
-
-type queryTestNode struct {
-	value    interface{}
-	position toml.Position
-}
-
-func valueString(root interface{}) string {
-	result := "" //fmt.Sprintf("%T:", root)
-	switch node := root.(type) {
-	case *Result:
-		items := []string{}
-		for i, v := range node.Values() {
-			items = append(items, fmt.Sprintf("%s:%s",
-				node.Positions()[i].String(), valueString(v)))
-		}
-		sort.Strings(items)
-		result = "[" + strings.Join(items, ", ") + "]"
-	case queryTestNode:
-		result = fmt.Sprintf("%s:%s",
-			node.position.String(), valueString(node.value))
-	case []interface{}:
-		items := []string{}
-		for _, v := range node {
-			items = append(items, valueString(v))
-		}
-		sort.Strings(items)
-		result = "[" + strings.Join(items, ", ") + "]"
-	case *toml.Tree:
-		// workaround for unreliable map key ordering
-		items := []string{}
-		for _, k := range node.Keys() {
-			v := node.GetPath([]string{k})
-			items = append(items, k+":"+valueString(v))
-		}
-		sort.Strings(items)
-		result = "{" + strings.Join(items, ", ") + "}"
-	case map[string]interface{}:
-		// workaround for unreliable map key ordering
-		items := []string{}
-		for k, v := range node {
-			items = append(items, k+":"+valueString(v))
-		}
-		sort.Strings(items)
-		result = "{" + strings.Join(items, ", ") + "}"
-	case int64:
-		result += fmt.Sprintf("%d", node)
-	case string:
-		result += "'" + node + "'"
-	case float64:
-		result += fmt.Sprintf("%f", node)
-	case bool:
-		result += fmt.Sprintf("%t", node)
-	case time.Time:
-		result += fmt.Sprintf("'%v'", node)
-	}
-	return result
-}
-
-func assertValue(t *testing.T, result, ref interface{}) {
-	pathStr := valueString(result)
-	refStr := valueString(ref)
-	if pathStr != refStr {
-		t.Errorf("values do not match")
-		t.Log("test:", pathStr)
-		t.Log("ref: ", refStr)
-	}
-}
-
-func assertQueryPositions(t *testing.T, tomlDoc string, query string, ref []interface{}) {
-	tree, err := toml.Load(tomlDoc)
-	if err != nil {
-		t.Errorf("Non-nil toml parse error: %v", err)
-		return
-	}
-	q, err := Compile(query)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	results := q.Execute(tree)
-	assertValue(t, results, ref)
-}
-
-func TestQueryRoot(t *testing.T) {
-	assertQueryPositions(t,
-		"a = 42",
-		"$",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(42),
-				}, toml.Position{1, 1},
-			},
-		})
-}
-
-func TestQueryKey(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo]\na = 42",
-		"$.foo.a",
-		[]interface{}{
-			queryTestNode{
-				int64(42), toml.Position{2, 1},
-			},
-		})
-}
-
-func TestQueryKeyString(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo]\na = 42",
-		"$.foo['a']",
-		[]interface{}{
-			queryTestNode{
-				int64(42), toml.Position{2, 1},
-			},
-		})
-}
-
-func TestQueryIndex(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo]\na = [1,2,3,4,5,6,7,8,9,0]",
-		"$.foo.a[5]",
-		[]interface{}{
-			queryTestNode{
-				int64(6), toml.Position{2, 1},
-			},
-		})
-}
-
-func TestQuerySliceRange(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo]\na = [1,2,3,4,5,6,7,8,9,0]",
-		"$.foo.a[0:5]",
-		[]interface{}{
-			queryTestNode{
-				int64(1), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(2), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(3), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(4), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(5), toml.Position{2, 1},
-			},
-		})
-}
-
-func TestQuerySliceStep(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo]\na = [1,2,3,4,5,6,7,8,9,0]",
-		"$.foo.a[0:5:2]",
-		[]interface{}{
-			queryTestNode{
-				int64(1), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(3), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(5), toml.Position{2, 1},
-			},
-		})
-}
-
-func TestQueryAny(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo.bar]\na=1\nb=2\n[foo.baz]\na=3\nb=4",
-		"$.foo.*",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(1),
-					"b": int64(2),
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(3),
-					"b": int64(4),
-				}, toml.Position{4, 1},
-			},
-		})
-}
-func TestQueryUnionSimple(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo.bar]\na=1\nb=2\n[baz.foo]\na=3\nb=4\n[gorf.foo]\na=5\nb=6",
-		"$.*[bar,foo]",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(1),
-					"b": int64(2),
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(3),
-					"b": int64(4),
-				}, toml.Position{4, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(5),
-					"b": int64(6),
-				}, toml.Position{7, 1},
-			},
-		})
-}
-
-func TestQueryRecursionAll(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo.bar]\na=1\nb=2\n[baz.foo]\na=3\nb=4\n[gorf.foo]\na=5\nb=6",
-		"$..*",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"foo": map[string]interface{}{
-						"bar": map[string]interface{}{
-							"a": int64(1),
-							"b": int64(2),
-						},
-					},
-					"baz": map[string]interface{}{
-						"foo": map[string]interface{}{
-							"a": int64(3),
-							"b": int64(4),
-						},
-					},
-					"gorf": map[string]interface{}{
-						"foo": map[string]interface{}{
-							"a": int64(5),
-							"b": int64(6),
-						},
-					},
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"bar": map[string]interface{}{
-						"a": int64(1),
-						"b": int64(2),
-					},
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(1),
-					"b": int64(2),
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				int64(1), toml.Position{2, 1},
-			},
-			queryTestNode{
-				int64(2), toml.Position{3, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"foo": map[string]interface{}{
-						"a": int64(3),
-						"b": int64(4),
-					},
-				}, toml.Position{4, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(3),
-					"b": int64(4),
-				}, toml.Position{4, 1},
-			},
-			queryTestNode{
-				int64(3), toml.Position{5, 1},
-			},
-			queryTestNode{
-				int64(4), toml.Position{6, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"foo": map[string]interface{}{
-						"a": int64(5),
-						"b": int64(6),
-					},
-				}, toml.Position{7, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(5),
-					"b": int64(6),
-				}, toml.Position{7, 1},
-			},
-			queryTestNode{
-				int64(5), toml.Position{8, 1},
-			},
-			queryTestNode{
-				int64(6), toml.Position{9, 1},
-			},
-		})
-}
-
-func TestQueryRecursionUnionSimple(t *testing.T) {
-	assertQueryPositions(t,
-		"[foo.bar]\na=1\nb=2\n[baz.foo]\na=3\nb=4\n[gorf.foo]\na=5\nb=6",
-		"$..['foo','bar']",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"bar": map[string]interface{}{
-						"a": int64(1),
-						"b": int64(2),
-					},
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(3),
-					"b": int64(4),
-				}, toml.Position{4, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(1),
-					"b": int64(2),
-				}, toml.Position{1, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"a": int64(5),
-					"b": int64(6),
-				}, toml.Position{7, 1},
-			},
-		})
-}
-
-func TestQueryFilterFn(t *testing.T) {
-	buff, err := ioutil.ReadFile("../example.toml")
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	assertQueryPositions(t, string(buff),
-		"$..[?(int)]",
-		[]interface{}{
-			queryTestNode{
-				int64(8001), toml.Position{13, 1},
-			},
-			queryTestNode{
-				int64(8001), toml.Position{13, 1},
-			},
-			queryTestNode{
-				int64(8002), toml.Position{13, 1},
-			},
-			queryTestNode{
-				int64(5000), toml.Position{14, 1},
-			},
-		})
-
-	assertQueryPositions(t, string(buff),
-		"$..[?(string)]",
-		[]interface{}{
-			queryTestNode{
-				"TOML Example", toml.Position{3, 1},
-			},
-			queryTestNode{
-				"Tom Preston-Werner", toml.Position{6, 1},
-			},
-			queryTestNode{
-				"GitHub", toml.Position{7, 1},
-			},
-			queryTestNode{
-				"GitHub Cofounder & CEO\nLikes tater tots and beer.",
-				toml.Position{8, 1},
-			},
-			queryTestNode{
-				"192.168.1.1", toml.Position{12, 1},
-			},
-			queryTestNode{
-				"10.0.0.1", toml.Position{21, 3},
-			},
-			queryTestNode{
-				"eqdc10", toml.Position{22, 3},
-			},
-			queryTestNode{
-				"10.0.0.2", toml.Position{25, 3},
-			},
-			queryTestNode{
-				"eqdc10", toml.Position{26, 3},
-			},
-		})
-
-	assertQueryPositions(t, string(buff),
-		"$..[?(float)]",
-		[]interface{}{
-		// no float values in document
-		})
-
-	tv, _ := time.Parse(time.RFC3339, "1979-05-27T07:32:00Z")
-	assertQueryPositions(t, string(buff),
-		"$..[?(tree)]",
-		[]interface{}{
-			queryTestNode{
-				map[string]interface{}{
-					"name":         "Tom Preston-Werner",
-					"organization": "GitHub",
-					"bio":          "GitHub Cofounder & CEO\nLikes tater tots and beer.",
-					"dob":          tv,
-				}, toml.Position{5, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"server":         "192.168.1.1",
-					"ports":          []interface{}{int64(8001), int64(8001), int64(8002)},
-					"connection_max": int64(5000),
-					"enabled":        true,
-				}, toml.Position{11, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"alpha": map[string]interface{}{
-						"ip": "10.0.0.1",
-						"dc": "eqdc10",
-					},
-					"beta": map[string]interface{}{
-						"ip": "10.0.0.2",
-						"dc": "eqdc10",
-					},
-				}, toml.Position{17, 1},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"ip": "10.0.0.1",
-					"dc": "eqdc10",
-				}, toml.Position{20, 3},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"ip": "10.0.0.2",
-					"dc": "eqdc10",
-				}, toml.Position{24, 3},
-			},
-			queryTestNode{
-				map[string]interface{}{
-					"data": []interface{}{
-						[]interface{}{"gamma", "delta"},
-						[]interface{}{int64(1), int64(2)},
-					},
-				}, toml.Position{28, 1},
-			},
-		})
-
-	assertQueryPositions(t, string(buff),
-		"$..[?(time)]",
-		[]interface{}{
-			queryTestNode{
-				tv, toml.Position{9, 1},
-			},
-		})
-
-	assertQueryPositions(t, string(buff),
-		"$..[?(bool)]",
-		[]interface{}{
-			queryTestNode{
-				true, toml.Position{15, 1},
-			},
-		})
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/query.go b/installer/vendor/github.com/pelletier/go-toml/query/query.go
deleted file mode 100644
index 1c6cd80143..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/query.go
+++ /dev/null
@@ -1,158 +0,0 @@
-package query
-
-import (
-	"time"
-
-	"github.com/pelletier/go-toml"
-)
-
-// NodeFilterFn represents a user-defined filter function, for use with
-// Query.SetFilter().
-//
-// The return value of the function must indicate if 'node' is to be included
-// at this stage of the TOML path.  Returning true will include the node, and
-// returning false will exclude it.
-//
-// NOTE: Care should be taken to write script callbacks such that they are safe
-// to use from multiple goroutines.
-type NodeFilterFn func(node interface{}) bool
-
-// Result is the result of Executing a Query.
-type Result struct {
-	items     []interface{}
-	positions []toml.Position
-}
-
-// appends a value/position pair to the result set.
-func (r *Result) appendResult(node interface{}, pos toml.Position) {
-	r.items = append(r.items, node)
-	r.positions = append(r.positions, pos)
-}
-
-// Values is a set of values within a Result.  The order of values is not
-// guaranteed to be in document order, and may be different each time a query is
-// executed.
-func (r Result) Values() []interface{} {
-	return r.items
-}
-
-// Positions is a set of positions for values within a Result.  Each index
-// in Positions() corresponds to the entry in Value() of the same index.
-func (r Result) Positions() []toml.Position {
-	return r.positions
-}
-
-// runtime context for executing query paths
-type queryContext struct {
-	result       *Result
-	filters      *map[string]NodeFilterFn
-	lastPosition toml.Position
-}
-
-// generic path functor interface
-type pathFn interface {
-	setNext(next pathFn)
-	// it is the caller's responsibility to set the ctx.lastPosition before invoking call()
-	// node can be one of: *toml.Tree, []*toml.Tree, or a scalar
-	call(node interface{}, ctx *queryContext)
-}
-
-// A Query is the representation of a compiled TOML path.  A Query is safe
-// for concurrent use by multiple goroutines.
-type Query struct {
-	root    pathFn
-	tail    pathFn
-	filters *map[string]NodeFilterFn
-}
-
-func newQuery() *Query {
-	return &Query{
-		root:    nil,
-		tail:    nil,
-		filters: &defaultFilterFunctions,
-	}
-}
-
-func (q *Query) appendPath(next pathFn) {
-	if q.root == nil {
-		q.root = next
-	} else {
-		q.tail.setNext(next)
-	}
-	q.tail = next
-	next.setNext(newTerminatingFn()) // init the next functor
-}
-
-// Compile compiles a TOML path expression. The returned Query can be used
-// to match elements within a Tree and its descendants. See Execute.
-func Compile(path string) (*Query, error) {
-	return parseQuery(lexQuery(path))
-}
-
-// Execute executes a query against a Tree, and returns the result of the query.
-func (q *Query) Execute(tree *toml.Tree) *Result {
-	result := &Result{
-		items:     []interface{}{},
-		positions: []toml.Position{},
-	}
-	if q.root == nil {
-		result.appendResult(tree, tree.GetPosition(""))
-	} else {
-		ctx := &queryContext{
-			result:  result,
-			filters: q.filters,
-		}
-		ctx.lastPosition = tree.Position()
-		q.root.call(tree, ctx)
-	}
-	return result
-}
-
-// CompileAndExecute is a shorthand for Compile(path) followed by Execute(tree).
-func CompileAndExecute(path string, tree *toml.Tree) (*Result, error) {
-	query, err := Compile(path)
-	if err != nil {
-		return nil, err
-	}
-	return query.Execute(tree), nil
-}
-
-// SetFilter sets a user-defined filter function.  These may be used inside
-// "?(..)" query expressions to filter TOML document elements within a query.
-func (q *Query) SetFilter(name string, fn NodeFilterFn) {
-	if q.filters == &defaultFilterFunctions {
-		// clone the static table
-		q.filters = &map[string]NodeFilterFn{}
-		for k, v := range defaultFilterFunctions {
-			(*q.filters)[k] = v
-		}
-	}
-	(*q.filters)[name] = fn
-}
-
-var defaultFilterFunctions = map[string]NodeFilterFn{
-	"tree": func(node interface{}) bool {
-		_, ok := node.(*toml.Tree)
-		return ok
-	},
-	"int": func(node interface{}) bool {
-		_, ok := node.(int64)
-		return ok
-	},
-	"float": func(node interface{}) bool {
-		_, ok := node.(float64)
-		return ok
-	},
-	"string": func(node interface{}) bool {
-		_, ok := node.(string)
-		return ok
-	},
-	"time": func(node interface{}) bool {
-		_, ok := node.(time.Time)
-		return ok
-	},
-	"bool": func(node interface{}) bool {
-		_, ok := node.(bool)
-		return ok
-	},
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/query_test.go b/installer/vendor/github.com/pelletier/go-toml/query/query_test.go
deleted file mode 100644
index 903a8dc731..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/query_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package query
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/pelletier/go-toml"
-)
-
-func assertArrayContainsInAnyOrder(t *testing.T, array []interface{}, objects ...interface{}) {
-	if len(array) != len(objects) {
-		t.Fatalf("array contains %d objects but %d are expected", len(array), len(objects))
-	}
-
-	for _, o := range objects {
-		found := false
-		for _, a := range array {
-			if a == o {
-				found = true
-				break
-			}
-		}
-		if !found {
-			t.Fatal(o, "not found in array", array)
-		}
-	}
-}
-
-func TestQueryExample(t *testing.T) {
-	config, _ := toml.Load(`
-      [[book]]
-      title = "The Stand"
-      author = "Stephen King"
-      [[book]]
-      title = "For Whom the Bell Tolls"
-      author = "Ernest Hemmingway"
-      [[book]]
-      title = "Neuromancer"
-      author = "William Gibson"
-    `)
-	authors, err := CompileAndExecute("$.book.author", config)
-	if err != nil {
-		t.Fatal("unexpected error:", err)
-	}
-	names := authors.Values()
-	if len(names) != 3 {
-		t.Fatalf("query should return 3 names but returned %d", len(names))
-	}
-	assertArrayContainsInAnyOrder(t, names, "Stephen King", "Ernest Hemmingway", "William Gibson")
-}
-
-func TestQueryReadmeExample(t *testing.T) {
-	config, _ := toml.Load(`
-[postgres]
-user = "pelletier"
-password = "mypassword"
-`)
-
-	query, err := Compile("$..[user,password]")
-	if err != nil {
-		t.Fatal("unexpected error:", err)
-	}
-	results := query.Execute(config)
-	values := results.Values()
-	if len(values) != 2 {
-		t.Fatalf("query should return 2 values but returned %d", len(values))
-	}
-	assertArrayContainsInAnyOrder(t, values, "pelletier", "mypassword")
-}
-
-func TestQueryPathNotPresent(t *testing.T) {
-	config, _ := toml.Load(`a = "hello"`)
-	query, err := Compile("$.foo.bar")
-	if err != nil {
-		t.Fatal("unexpected error:", err)
-	}
-	results := query.Execute(config)
-	if err != nil {
-		t.Fatalf("err should be nil. got %s instead", err)
-	}
-	if len(results.items) != 0 {
-		t.Fatalf("no items should be matched. %d matched instead", len(results.items))
-	}
-}
-
-func ExampleNodeFilterFn_filterExample() {
-	tree, _ := toml.Load(`
-      [struct_one]
-      foo = "foo"
-      bar = "bar"
-
-      [struct_two]
-      baz = "baz"
-      gorf = "gorf"
-    `)
-
-	// create a query that references a user-defined-filter
-	query, _ := Compile("$[?(bazOnly)]")
-
-	// define the filter, and assign it to the query
-	query.SetFilter("bazOnly", func(node interface{}) bool {
-		if tree, ok := node.(*toml.Tree); ok {
-			return tree.Has("baz")
-		}
-		return false // reject all other node types
-	})
-
-	// results contain only the 'struct_two' Tree
-	query.Execute(tree)
-}
-
-func ExampleQuery_queryExample() {
-	config, _ := toml.Load(`
-      [[book]]
-      title = "The Stand"
-      author = "Stephen King"
-      [[book]]
-      title = "For Whom the Bell Tolls"
-      author = "Ernest Hemmingway"
-      [[book]]
-      title = "Neuromancer"
-      author = "William Gibson"
-    `)
-
-	// find and print all the authors in the document
-	query, _ := Compile("$.book.author")
-	authors := query.Execute(config)
-	for _, name := range authors.Values() {
-		fmt.Println(name)
-	}
-}
-
-func TestTomlQuery(t *testing.T) {
-	tree, err := toml.Load("[foo.bar]\na=1\nb=2\n[baz.foo]\na=3\nb=4\n[gorf.foo]\na=5\nb=6")
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	query, err := Compile("$.foo.bar")
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	result := query.Execute(tree)
-	values := result.Values()
-	if len(values) != 1 {
-		t.Errorf("Expected resultset of 1, got %d instead: %v", len(values), values)
-	}
-
-	if tt, ok := values[0].(*toml.Tree); !ok {
-		t.Errorf("Expected type of Tree: %T", values[0])
-	} else if tt.Get("a") != int64(1) {
-		t.Errorf("Expected 'a' with a value 1: %v", tt.Get("a"))
-	} else if tt.Get("b") != int64(2) {
-		t.Errorf("Expected 'b' with a value 2: %v", tt.Get("b"))
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/query/tokens.go b/installer/vendor/github.com/pelletier/go-toml/query/tokens.go
deleted file mode 100644
index 9ae579de2d..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/query/tokens.go
+++ /dev/null
@@ -1,106 +0,0 @@
-package query
-
-import (
-	"fmt"
-	"github.com/pelletier/go-toml"
-	"strconv"
-	"unicode"
-)
-
-// Define tokens
-type tokenType int
-
-const (
-	eof = -(iota + 1)
-)
-
-const (
-	tokenError tokenType = iota
-	tokenEOF
-	tokenKey
-	tokenString
-	tokenInteger
-	tokenFloat
-	tokenLeftBracket
-	tokenRightBracket
-	tokenLeftParen
-	tokenRightParen
-	tokenComma
-	tokenColon
-	tokenDollar
-	tokenStar
-	tokenQuestion
-	tokenDot
-	tokenDotDot
-)
-
-var tokenTypeNames = []string{
-	"Error",
-	"EOF",
-	"Key",
-	"String",
-	"Integer",
-	"Float",
-	"[",
-	"]",
-	"(",
-	")",
-	",",
-	":",
-	"$",
-	"*",
-	"?",
-	".",
-	"..",
-}
-
-type token struct {
-	toml.Position
-	typ tokenType
-	val string
-}
-
-func (tt tokenType) String() string {
-	idx := int(tt)
-	if idx < len(tokenTypeNames) {
-		return tokenTypeNames[idx]
-	}
-	return "Unknown"
-}
-
-func (t token) Int() int {
-	if result, err := strconv.Atoi(t.val); err != nil {
-		panic(err)
-	} else {
-		return result
-	}
-}
-
-func (t token) String() string {
-	switch t.typ {
-	case tokenEOF:
-		return "EOF"
-	case tokenError:
-		return t.val
-	}
-
-	return fmt.Sprintf("%q", t.val)
-}
-
-func isSpace(r rune) bool {
-	return r == ' ' || r == '\t'
-}
-
-func isAlphanumeric(r rune) bool {
-	return unicode.IsLetter(r) || r == '_'
-}
-
-func isDigit(r rune) bool {
-	return unicode.IsNumber(r)
-}
-
-func isHexDigit(r rune) bool {
-	return isDigit(r) ||
-		(r >= 'a' && r <= 'f') ||
-		(r >= 'A' && r <= 'F')
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/test.sh b/installer/vendor/github.com/pelletier/go-toml/test.sh
deleted file mode 100755
index 91a889670f..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/test.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-# fail out of the script if anything here fails
-set -e
-
-# set the path to the present working directory
-export GOPATH=`pwd`
-
-function git_clone() {
-  path=$1
-  branch=$2
-  version=$3
-  if [ ! -d "src/$path" ]; then
-    mkdir -p src/$path
-    git clone https://$path.git src/$path
-  fi
-  pushd src/$path
-  git checkout "$branch"
-  git reset --hard "$version"
-  popd
-}
-
-# Remove potential previous runs
-rm -rf src test_program_bin toml-test
-
-# Run go vet
-go vet ./...
-
-go get github.com/pelletier/go-buffruneio
-go get github.com/davecgh/go-spew/spew
-go get gopkg.in/yaml.v2
-go get github.com/BurntSushi/toml
-
-# get code for BurntSushi TOML validation
-# pinning all to 'HEAD' for version 0.3.x work (TODO: pin to commit hash when tests stabilize)
-git_clone github.com/BurntSushi/toml master HEAD
-git_clone github.com/BurntSushi/toml-test master HEAD #was: 0.2.0 HEAD
-
-# build the BurntSushi test application
-go build -o toml-test github.com/BurntSushi/toml-test
-
-# vendorize the current lib for testing
-# NOTE: this basically mocks an install without having to go back out to github for code
-mkdir -p src/github.com/pelletier/go-toml/cmd
-mkdir -p src/github.com/pelletier/go-toml/query
-cp *.go *.toml src/github.com/pelletier/go-toml
-cp -R cmd/* src/github.com/pelletier/go-toml/cmd
-cp -R query/* src/github.com/pelletier/go-toml/query
-go build -o test_program_bin src/github.com/pelletier/go-toml/cmd/test_program.go
-
-# Run basic unit tests
-go test github.com/pelletier/go-toml -covermode=count -coverprofile=coverage.out
-go test github.com/pelletier/go-toml/cmd/tomljson
-go test github.com/pelletier/go-toml/query
-
-# run the entire BurntSushi test suite
-if [[ $# -eq 0 ]] ; then
-  echo "Running all BurntSushi tests"
-  ./toml-test ./test_program_bin | tee test_out
-else
-  # run a specific test
-  test=$1
-  test_path='src/github.com/BurntSushi/toml-test/tests'
-  valid_test="$test_path/valid/$test"
-  invalid_test="$test_path/invalid/$test"
-
-  if [ -e "$valid_test.toml" ]; then
-    echo "Valid Test TOML for $test:"
-    echo "===="
-    cat "$valid_test.toml"
-
-    echo "Valid Test JSON for $test:"
-    echo "===="
-    cat "$valid_test.json"
-
-    echo "Go-TOML Output for $test:"
-    echo "===="
-    cat "$valid_test.toml" | ./test_program_bin
-  fi
-
-  if [ -e "$invalid_test.toml" ]; then
-    echo "Invalid Test TOML for $test:"
-    echo "===="
-    cat "$invalid_test.toml"
-
-    echo "Go-TOML Output for $test:"
-    echo "===="
-    echo "go-toml Output:"
-    cat "$invalid_test.toml" | ./test_program_bin
-  fi
-fi
diff --git a/installer/vendor/github.com/pelletier/go-toml/token.go b/installer/vendor/github.com/pelletier/go-toml/token.go
index 5581fe0bcc..1a90813466 100644
--- a/installer/vendor/github.com/pelletier/go-toml/token.go
+++ b/installer/vendor/github.com/pelletier/go-toml/token.go
@@ -23,6 +23,8 @@ const (
 	tokenTrue
 	tokenFalse
 	tokenFloat
+	tokenInf
+	tokenNan
 	tokenEqual
 	tokenLeftBracket
 	tokenRightBracket
@@ -55,6 +57,8 @@ var tokenTypeNames = []string{
 	"True",
 	"False",
 	"Float",
+	"Inf",
+	"NaN",
 	"=",
 	"[",
 	"]",
diff --git a/installer/vendor/github.com/pelletier/go-toml/token_test.go b/installer/vendor/github.com/pelletier/go-toml/token_test.go
deleted file mode 100644
index 20b560d510..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/token_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package toml
-
-import "testing"
-
-func TestTokenStringer(t *testing.T) {
-	var tests = []struct {
-		tt     tokenType
-		expect string
-	}{
-		{tokenError, "Error"},
-		{tokenEOF, "EOF"},
-		{tokenComment, "Comment"},
-		{tokenKey, "Key"},
-		{tokenString, "String"},
-		{tokenInteger, "Integer"},
-		{tokenTrue, "True"},
-		{tokenFalse, "False"},
-		{tokenFloat, "Float"},
-		{tokenEqual, "="},
-		{tokenLeftBracket, "["},
-		{tokenRightBracket, "]"},
-		{tokenLeftCurlyBrace, "{"},
-		{tokenRightCurlyBrace, "}"},
-		{tokenLeftParen, "("},
-		{tokenRightParen, ")"},
-		{tokenDoubleLeftBracket, "]]"},
-		{tokenDoubleRightBracket, "[["},
-		{tokenDate, "Date"},
-		{tokenKeyGroup, "KeyGroup"},
-		{tokenKeyGroupArray, "KeyGroupArray"},
-		{tokenComma, ","},
-		{tokenColon, ":"},
-		{tokenDollar, "$"},
-		{tokenStar, "*"},
-		{tokenQuestion, "?"},
-		{tokenDot, "."},
-		{tokenDotDot, ".."},
-		{tokenEOL, "EOL"},
-		{tokenEOL + 1, "Unknown"},
-	}
-
-	for i, test := range tests {
-		got := test.tt.String()
-		if got != test.expect {
-			t.Errorf("[%d] invalid string of token type; got %q, expected %q", i, got, test.expect)
-		}
-	}
-}
-
-func TestTokenString(t *testing.T) {
-	var tests = []struct {
-		tok    token
-		expect string
-	}{
-		{token{Position{1, 1}, tokenEOF, ""}, "EOF"},
-		{token{Position{1, 1}, tokenError, "Δt"}, "Δt"},
-		{token{Position{1, 1}, tokenString, "bar"}, `"bar"`},
-		{token{Position{1, 1}, tokenString, "123456789012345"}, `"123456789012345"`},
-	}
-
-	for i, test := range tests {
-		got := test.tok.String()
-		if got != test.expect {
-			t.Errorf("[%d] invalid of string token; got %q, expected %q", i, got, test.expect)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/toml.go b/installer/vendor/github.com/pelletier/go-toml/toml.go
index c3e324374a..05493a444b 100644
--- a/installer/vendor/github.com/pelletier/go-toml/toml.go
+++ b/installer/vendor/github.com/pelletier/go-toml/toml.go
@@ -71,18 +71,15 @@ func (t *Tree) Keys() []string {
 }
 
 // Get the value at key in the Tree.
-// Key is a dot-separated path (e.g. a.b.c).
+// Key is a dot-separated path (e.g. a.b.c) without single/double quoted strings.
+// If you need to retrieve non-bare keys, use GetPath.
 // Returns nil if the path does not exist in the tree.
 // If keys is of length zero, the current tree is returned.
 func (t *Tree) Get(key string) interface{} {
 	if key == "" {
 		return t
 	}
-	comps, err := parseKey(key)
-	if err != nil {
-		return nil
-	}
-	return t.GetPath(comps)
+	return t.GetPath(strings.Split(key, "."))
 }
 
 // GetPath returns the element in the tree indicated by 'keys'.
@@ -181,14 +178,26 @@ func (t *Tree) GetDefault(key string, def interface{}) interface{} {
 // Set an element in the tree.
 // Key is a dot-separated path (e.g. a.b.c).
 // Creates all necessary intermediate trees, if needed.
-func (t *Tree) Set(key string, comment string, commented bool, value interface{}) {
-	t.SetPath(strings.Split(key, "."), comment, commented, value)
+func (t *Tree) Set(key string, value interface{}) {
+	t.SetWithComment(key, "", false, value)
+}
+
+// SetWithComment is the same as Set, but allows you to provide comment
+// information to the key, that will be reused by Marshal().
+func (t *Tree) SetWithComment(key string, comment string, commented bool, value interface{}) {
+	t.SetPathWithComment(strings.Split(key, "."), comment, commented, value)
 }
 
 // SetPath sets an element in the tree.
 // Keys is an array of path elements (e.g. {"a","b","c"}).
 // Creates all necessary intermediate trees, if needed.
-func (t *Tree) SetPath(keys []string, comment string, commented bool, value interface{}) {
+func (t *Tree) SetPath(keys []string, value interface{}) {
+	t.SetPathWithComment(keys, "", false, value)
+}
+
+// SetPathWithComment is the same as SetPath, but allows you to provide comment
+// information to the key, that will be reused by Marshal().
+func (t *Tree) SetPathWithComment(keys []string, comment string, commented bool, value interface{}) {
 	subtree := t
 	for _, intermediateKey := range keys[:len(keys)-1] {
 		nextTree, exists := subtree.values[intermediateKey]
diff --git a/installer/vendor/github.com/pelletier/go-toml/toml_test.go b/installer/vendor/github.com/pelletier/go-toml/toml_test.go
deleted file mode 100644
index ab9c242535..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/toml_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Testing support for go-toml
-
-package toml
-
-import (
-	"testing"
-)
-
-func TestTomlHas(t *testing.T) {
-	tree, _ := Load(`
-		[test]
-		key = "value"
-	`)
-
-	if !tree.Has("test.key") {
-		t.Errorf("Has - expected test.key to exists")
-	}
-
-	if tree.Has("") {
-		t.Errorf("Should return false if the key is not provided")
-	}
-}
-
-func TestTomlGet(t *testing.T) {
-	tree, _ := Load(`
-		[test]
-		key = "value"
-	`)
-
-	if tree.Get("") != tree {
-		t.Errorf("Get should return the tree itself when given an empty path")
-	}
-
-	if tree.Get("test.key") != "value" {
-		t.Errorf("Get should return the value")
-	}
-	if tree.Get(`\`) != nil {
-		t.Errorf("should return nil when the key is malformed")
-	}
-}
-
-func TestTomlGetDefault(t *testing.T) {
-	tree, _ := Load(`
-		[test]
-		key = "value"
-	`)
-
-	if tree.GetDefault("", "hello") != tree {
-		t.Error("GetDefault should return the tree itself when given an empty path")
-	}
-
-	if tree.GetDefault("test.key", "hello") != "value" {
-		t.Error("Get should return the value")
-	}
-
-	if tree.GetDefault("whatever", "hello") != "hello" {
-		t.Error("GetDefault should return the default value if the key does not exist")
-	}
-}
-
-func TestTomlHasPath(t *testing.T) {
-	tree, _ := Load(`
-		[test]
-		key = "value"
-	`)
-
-	if !tree.HasPath([]string{"test", "key"}) {
-		t.Errorf("HasPath - expected test.key to exists")
-	}
-}
-
-func TestTomlGetPath(t *testing.T) {
-	node := newTree()
-	//TODO: set other node data
-
-	for idx, item := range []struct {
-		Path     []string
-		Expected *Tree
-	}{
-		{ // empty path test
-			[]string{},
-			node,
-		},
-	} {
-		result := node.GetPath(item.Path)
-		if result != item.Expected {
-			t.Errorf("GetPath[%d] %v - expected %v, got %v instead.", idx, item.Path, item.Expected, result)
-		}
-	}
-
-	tree, _ := Load("[foo.bar]\na=1\nb=2\n[baz.foo]\na=3\nb=4\n[gorf.foo]\na=5\nb=6")
-	if tree.GetPath([]string{"whatever"}) != nil {
-		t.Error("GetPath should return nil when the key does not exist")
-	}
-}
-
-func TestTomlFromMap(t *testing.T) {
-	simpleMap := map[string]interface{}{"hello": 42}
-	tree, err := TreeFromMap(simpleMap)
-	if err != nil {
-		t.Fatal("unexpected error:", err)
-	}
-	if tree.Get("hello") != int64(42) {
-		t.Fatal("hello should be 42, not", tree.Get("hello"))
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/tomltree_create_test.go b/installer/vendor/github.com/pelletier/go-toml/tomltree_create_test.go
deleted file mode 100644
index 1ca108a524..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/tomltree_create_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-package toml
-
-import (
-	"strconv"
-	"testing"
-	"time"
-)
-
-type customString string
-
-type stringer struct{}
-
-func (s stringer) String() string {
-	return "stringer"
-}
-
-func validate(t *testing.T, path string, object interface{}) {
-	switch o := object.(type) {
-	case *Tree:
-		for key, tree := range o.values {
-			validate(t, path+"."+key, tree)
-		}
-	case []*Tree:
-		for index, tree := range o {
-			validate(t, path+"."+strconv.Itoa(index), tree)
-		}
-	case *tomlValue:
-		switch o.value.(type) {
-		case int64, uint64, bool, string, float64, time.Time,
-			[]int64, []uint64, []bool, []string, []float64, []time.Time:
-		default:
-			t.Fatalf("tomlValue at key %s containing incorrect type %T", path, o.value)
-		}
-	default:
-		t.Fatalf("value at key %s is of incorrect type %T", path, object)
-	}
-	t.Logf("validation ok %s as %T", path, object)
-}
-
-func validateTree(t *testing.T, tree *Tree) {
-	validate(t, "", tree)
-}
-
-func TestTreeCreateToTree(t *testing.T) {
-	data := map[string]interface{}{
-		"a_string": "bar",
-		"an_int":   42,
-		"time":     time.Now(),
-		"int8":     int8(2),
-		"int16":    int16(2),
-		"int32":    int32(2),
-		"uint8":    uint8(2),
-		"uint16":   uint16(2),
-		"uint32":   uint32(2),
-		"float32":  float32(2),
-		"a_bool":   false,
-		"stringer": stringer{},
-		"nested": map[string]interface{}{
-			"foo": "bar",
-		},
-		"array":                 []string{"a", "b", "c"},
-		"array_uint":            []uint{uint(1), uint(2)},
-		"array_table":           []map[string]interface{}{map[string]interface{}{"sub_map": 52}},
-		"array_times":           []time.Time{time.Now(), time.Now()},
-		"map_times":             map[string]time.Time{"now": time.Now()},
-		"custom_string_map_key": map[customString]interface{}{customString("custom"): "custom"},
-	}
-	tree, err := TreeFromMap(data)
-	if err != nil {
-		t.Fatal("unexpected error:", err)
-	}
-	validateTree(t, tree)
-}
-
-func TestTreeCreateToTreeInvalidLeafType(t *testing.T) {
-	_, err := TreeFromMap(map[string]interface{}{"foo": t})
-	expected := "cannot convert type *testing.T to Tree"
-	if err.Error() != expected {
-		t.Fatalf("expected error %s, got %s", expected, err.Error())
-	}
-}
-
-func TestTreeCreateToTreeInvalidMapKeyType(t *testing.T) {
-	_, err := TreeFromMap(map[string]interface{}{"foo": map[int]interface{}{2: 1}})
-	expected := "map key needs to be a string, not int (int)"
-	if err.Error() != expected {
-		t.Fatalf("expected error %s, got %s", expected, err.Error())
-	}
-}
-
-func TestTreeCreateToTreeInvalidArrayMemberType(t *testing.T) {
-	_, err := TreeFromMap(map[string]interface{}{"foo": []*testing.T{t}})
-	expected := "cannot convert type *testing.T to Tree"
-	if err.Error() != expected {
-		t.Fatalf("expected error %s, got %s", expected, err.Error())
-	}
-}
-
-func TestTreeCreateToTreeInvalidTableGroupType(t *testing.T) {
-	_, err := TreeFromMap(map[string]interface{}{"foo": []map[string]interface{}{map[string]interface{}{"hello": t}}})
-	expected := "cannot convert type *testing.T to Tree"
-	if err.Error() != expected {
-		t.Fatalf("expected error %s, got %s", expected, err.Error())
-	}
-}
-
-func TestRoundTripArrayOfTables(t *testing.T) {
-	orig := "\n[[stuff]]\n  name = \"foo\"\n  things = [\"a\",\"b\"]\n"
-	tree, err := Load(orig)
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-
-	m := tree.ToMap()
-
-	tree, err = TreeFromMap(m)
-	if err != nil {
-		t.Fatalf("unexpected error: %s", err)
-	}
-	want := orig
-	got := tree.String()
-
-	if got != want {
-		t.Errorf("want:\n%s\ngot:\n%s", want, got)
-	}
-}
diff --git a/installer/vendor/github.com/pelletier/go-toml/tomltree_write.go b/installer/vendor/github.com/pelletier/go-toml/tomltree_write.go
index 449f35a441..b5600a588d 100644
--- a/installer/vendor/github.com/pelletier/go-toml/tomltree_write.go
+++ b/installer/vendor/github.com/pelletier/go-toml/tomltree_write.go
@@ -44,7 +44,7 @@ func encodeTomlString(value string) string {
 	return b.String()
 }
 
-func tomlValueStringRepresentation(v interface{}) (string, error) {
+func tomlValueStringRepresentation(v interface{}, indent string, arraysOneElementPerLine bool) (string, error) {
 	switch value := v.(type) {
 	case uint64:
 		return strconv.FormatUint(value, 10), nil
@@ -54,14 +54,14 @@ func tomlValueStringRepresentation(v interface{}) (string, error) {
 		// Ensure a round float does contain a decimal point. Otherwise feeding
 		// the output back to the parser would convert to an integer.
 		if math.Trunc(value) == value {
-			return strconv.FormatFloat(value, 'f', 1, 32), nil
+			return strings.ToLower(strconv.FormatFloat(value, 'f', 1, 32)), nil
 		}
-		return strconv.FormatFloat(value, 'f', -1, 32), nil
+		return strings.ToLower(strconv.FormatFloat(value, 'f', -1, 32)), nil
 	case string:
 		return "\"" + encodeTomlString(value) + "\"", nil
 	case []byte:
 		b, _ := v.([]byte)
-		return tomlValueStringRepresentation(string(b))
+		return tomlValueStringRepresentation(string(b), indent, arraysOneElementPerLine)
 	case bool:
 		if value {
 			return "true", nil
@@ -76,21 +76,38 @@ func tomlValueStringRepresentation(v interface{}) (string, error) {
 	rv := reflect.ValueOf(v)
 
 	if rv.Kind() == reflect.Slice {
-		values := []string{}
+		var values []string
 		for i := 0; i < rv.Len(); i++ {
 			item := rv.Index(i).Interface()
-			itemRepr, err := tomlValueStringRepresentation(item)
+			itemRepr, err := tomlValueStringRepresentation(item, indent, arraysOneElementPerLine)
 			if err != nil {
 				return "", err
 			}
 			values = append(values, itemRepr)
 		}
+		if arraysOneElementPerLine && len(values) > 1 {
+			stringBuffer := bytes.Buffer{}
+			valueIndent := indent + `  ` // TODO: move that to a shared encoder state
+
+			stringBuffer.WriteString("[\n")
+
+			for _, value := range values {
+				stringBuffer.WriteString(valueIndent)
+				stringBuffer.WriteString(value)
+				stringBuffer.WriteString(`,`)
+				stringBuffer.WriteString("\n")
+			}
+
+			stringBuffer.WriteString(indent + "]")
+
+			return stringBuffer.String(), nil
+		}
 		return "[" + strings.Join(values, ",") + "]", nil
 	}
 	return "", fmt.Errorf("unsupported value type %T: %v", v, v)
 }
 
-func (t *Tree) writeTo(w io.Writer, indent, keyspace string, bytesCount int64) (int64, error) {
+func (t *Tree) writeTo(w io.Writer, indent, keyspace string, bytesCount int64, arraysOneElementPerLine bool) (int64, error) {
 	simpleValuesKeys := make([]string, 0)
 	complexValuesKeys := make([]string, 0)
 
@@ -113,7 +130,7 @@ func (t *Tree) writeTo(w io.Writer, indent, keyspace string, bytesCount int64) (
 			return bytesCount, fmt.Errorf("invalid value type at %s: %T", k, t.values[k])
 		}
 
-		repr, err := tomlValueStringRepresentation(v.value)
+		repr, err := tomlValueStringRepresentation(v.value, indent, arraysOneElementPerLine)
 		if err != nil {
 			return bytesCount, err
 		}
@@ -178,7 +195,7 @@ func (t *Tree) writeTo(w io.Writer, indent, keyspace string, bytesCount int64) (
 			if err != nil {
 				return bytesCount, err
 			}
-			bytesCount, err = node.writeTo(w, indent+"  ", combinedKey, bytesCount)
+			bytesCount, err = node.writeTo(w, indent+"  ", combinedKey, bytesCount, arraysOneElementPerLine)
 			if err != nil {
 				return bytesCount, err
 			}
@@ -190,7 +207,7 @@ func (t *Tree) writeTo(w io.Writer, indent, keyspace string, bytesCount int64) (
 					return bytesCount, err
 				}
 
-				bytesCount, err = subTree.writeTo(w, indent+"  ", combinedKey, bytesCount)
+				bytesCount, err = subTree.writeTo(w, indent+"  ", combinedKey, bytesCount, arraysOneElementPerLine)
 				if err != nil {
 					return bytesCount, err
 				}
@@ -216,7 +233,7 @@ func writeStrings(w io.Writer, s ...string) (int, error) {
 // WriteTo encode the Tree as Toml and writes it to the writer w.
 // Returns the number of bytes written in case of success, or an error if anything happened.
 func (t *Tree) WriteTo(w io.Writer) (int64, error) {
-	return t.writeTo(w, "", "", 0)
+	return t.writeTo(w, "", "", 0, false)
 }
 
 // ToTomlString generates a human-readable representation of the current tree.
diff --git a/installer/vendor/github.com/pelletier/go-toml/tomltree_write_test.go b/installer/vendor/github.com/pelletier/go-toml/tomltree_write_test.go
deleted file mode 100644
index 5ea59bc1a7..0000000000
--- a/installer/vendor/github.com/pelletier/go-toml/tomltree_write_test.go
+++ /dev/null
@@ -1,358 +0,0 @@
-package toml
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-type failingWriter struct {
-	failAt  int
-	written int
-	buffer  bytes.Buffer
-}
-
-func (f *failingWriter) Write(p []byte) (n int, err error) {
-	count := len(p)
-	toWrite := f.failAt - (count + f.written)
-	if toWrite < 0 {
-		toWrite = 0
-	}
-	if toWrite > count {
-		f.written += count
-		f.buffer.Write(p)
-		return count, nil
-	}
-
-	f.buffer.Write(p[:toWrite])
-	f.written = f.failAt
-	return toWrite, fmt.Errorf("failingWriter failed after writing %d bytes", f.written)
-}
-
-func assertErrorString(t *testing.T, expected string, err error) {
-	expectedErr := errors.New(expected)
-	if err == nil || err.Error() != expectedErr.Error() {
-		t.Errorf("expecting error %s, but got %s instead", expected, err)
-	}
-}
-
-func TestTreeWriteToEmptyTable(t *testing.T) {
-	doc := `[[empty-tables]]
-[[empty-tables]]`
-
-	toml, err := Load(doc)
-	if err != nil {
-		t.Fatal("Unexpected Load error:", err)
-	}
-	tomlString, err := toml.ToTomlString()
-	if err != nil {
-		t.Fatal("Unexpected ToTomlString error:", err)
-	}
-
-	expected := `
-[[empty-tables]]
-
-[[empty-tables]]
-`
-
-	if tomlString != expected {
-		t.Fatalf("Expected:\n%s\nGot:\n%s", expected, tomlString)
-	}
-}
-
-func TestTreeWriteToTomlString(t *testing.T) {
-	toml, err := Load(`name = { first = "Tom", last = "Preston-Werner" }
-points = { x = 1, y = 2 }`)
-
-	if err != nil {
-		t.Fatal("Unexpected error:", err)
-	}
-
-	tomlString, _ := toml.ToTomlString()
-	reparsedTree, err := Load(tomlString)
-
-	assertTree(t, reparsedTree, err, map[string]interface{}{
-		"name": map[string]interface{}{
-			"first": "Tom",
-			"last":  "Preston-Werner",
-		},
-		"points": map[string]interface{}{
-			"x": int64(1),
-			"y": int64(2),
-		},
-	})
-}
-
-func TestTreeWriteToTomlStringSimple(t *testing.T) {
-	tree, err := Load("[foo]\n\n[[foo.bar]]\na = 42\n\n[[foo.bar]]\na = 69\n")
-	if err != nil {
-		t.Errorf("Test failed to parse: %v", err)
-		return
-	}
-	result, err := tree.ToTomlString()
-	if err != nil {
-		t.Errorf("Unexpected error: %s", err)
-	}
-	expected := "\n[foo]\n\n  [[foo.bar]]\n    a = 42\n\n  [[foo.bar]]\n    a = 69\n"
-	if result != expected {
-		t.Errorf("Expected got '%s', expected '%s'", result, expected)
-	}
-}
-
-func TestTreeWriteToTomlStringKeysOrders(t *testing.T) {
-	for i := 0; i < 100; i++ {
-		tree, _ := Load(`
-		foobar = true
-		bar = "baz"
-		foo = 1
-		[qux]
-		  foo = 1
-		  bar = "baz2"`)
-
-		stringRepr, _ := tree.ToTomlString()
-
-		t.Log("Intermediate string representation:")
-		t.Log(stringRepr)
-
-		r := strings.NewReader(stringRepr)
-		toml, err := LoadReader(r)
-
-		if err != nil {
-			t.Fatal("Unexpected error:", err)
-		}
-
-		assertTree(t, toml, err, map[string]interface{}{
-			"foobar": true,
-			"bar":    "baz",
-			"foo":    1,
-			"qux": map[string]interface{}{
-				"foo": 1,
-				"bar": "baz2",
-			},
-		})
-	}
-}
-
-func testMaps(t *testing.T, actual, expected map[string]interface{}) {
-	if !reflect.DeepEqual(actual, expected) {
-		t.Fatal("trees aren't equal.\n", "Expected:\n", expected, "\nActual:\n", actual)
-	}
-}
-
-func TestTreeWriteToMapSimple(t *testing.T) {
-	tree, _ := Load("a = 42\nb = 17")
-
-	expected := map[string]interface{}{
-		"a": int64(42),
-		"b": int64(17),
-	}
-
-	testMaps(t, tree.ToMap(), expected)
-}
-
-func TestTreeWriteToInvalidTreeSimpleValue(t *testing.T) {
-	tree := Tree{values: map[string]interface{}{"foo": int8(1)}}
-	_, err := tree.ToTomlString()
-	assertErrorString(t, "invalid value type at foo: int8", err)
-}
-
-func TestTreeWriteToInvalidTreeTomlValue(t *testing.T) {
-	tree := Tree{values: map[string]interface{}{"foo": &tomlValue{value: int8(1), comment: "", position: Position{}}}}
-	_, err := tree.ToTomlString()
-	assertErrorString(t, "unsupported value type int8: 1", err)
-}
-
-func TestTreeWriteToInvalidTreeTomlValueArray(t *testing.T) {
-	tree := Tree{values: map[string]interface{}{"foo": &tomlValue{value: int8(1), comment: "", position: Position{}}}}
-	_, err := tree.ToTomlString()
-	assertErrorString(t, "unsupported value type int8: 1", err)
-}
-
-func TestTreeWriteToFailingWriterInSimpleValue(t *testing.T) {
-	toml, _ := Load(`a = 2`)
-	writer := failingWriter{failAt: 0, written: 0}
-	_, err := toml.WriteTo(&writer)
-	assertErrorString(t, "failingWriter failed after writing 0 bytes", err)
-}
-
-func TestTreeWriteToFailingWriterInTable(t *testing.T) {
-	toml, _ := Load(`
-[b]
-a = 2`)
-	writer := failingWriter{failAt: 2, written: 0}
-	_, err := toml.WriteTo(&writer)
-	assertErrorString(t, "failingWriter failed after writing 2 bytes", err)
-
-	writer = failingWriter{failAt: 13, written: 0}
-	_, err = toml.WriteTo(&writer)
-	assertErrorString(t, "failingWriter failed after writing 13 bytes", err)
-}
-
-func TestTreeWriteToFailingWriterInArray(t *testing.T) {
-	toml, _ := Load(`
-[[b]]
-a = 2`)
-	writer := failingWriter{failAt: 2, written: 0}
-	_, err := toml.WriteTo(&writer)
-	assertErrorString(t, "failingWriter failed after writing 2 bytes", err)
-
-	writer = failingWriter{failAt: 15, written: 0}
-	_, err = toml.WriteTo(&writer)
-	assertErrorString(t, "failingWriter failed after writing 15 bytes", err)
-}
-
-func TestTreeWriteToMapExampleFile(t *testing.T) {
-	tree, _ := LoadFile("example.toml")
-	expected := map[string]interface{}{
-		"title": "TOML Example",
-		"owner": map[string]interface{}{
-			"name":         "Tom Preston-Werner",
-			"organization": "GitHub",
-			"bio":          "GitHub Cofounder & CEO\nLikes tater tots and beer.",
-			"dob":          time.Date(1979, time.May, 27, 7, 32, 0, 0, time.UTC),
-		},
-		"database": map[string]interface{}{
-			"server":         "192.168.1.1",
-			"ports":          []interface{}{int64(8001), int64(8001), int64(8002)},
-			"connection_max": int64(5000),
-			"enabled":        true,
-		},
-		"servers": map[string]interface{}{
-			"alpha": map[string]interface{}{
-				"ip": "10.0.0.1",
-				"dc": "eqdc10",
-			},
-			"beta": map[string]interface{}{
-				"ip": "10.0.0.2",
-				"dc": "eqdc10",
-			},
-		},
-		"clients": map[string]interface{}{
-			"data": []interface{}{
-				[]interface{}{"gamma", "delta"},
-				[]interface{}{int64(1), int64(2)},
-			},
-		},
-	}
-	testMaps(t, tree.ToMap(), expected)
-}
-
-func TestTreeWriteToMapWithTablesInMultipleChunks(t *testing.T) {
-	tree, _ := Load(`
-	[[menu.main]]
-        a = "menu 1"
-        b = "menu 2"
-        [[menu.main]]
-        c = "menu 3"
-        d = "menu 4"`)
-	expected := map[string]interface{}{
-		"menu": map[string]interface{}{
-			"main": []interface{}{
-				map[string]interface{}{"a": "menu 1", "b": "menu 2"},
-				map[string]interface{}{"c": "menu 3", "d": "menu 4"},
-			},
-		},
-	}
-	treeMap := tree.ToMap()
-
-	testMaps(t, treeMap, expected)
-}
-
-func TestTreeWriteToMapWithArrayOfInlineTables(t *testing.T) {
-	tree, _ := Load(`
-    	[params]
-	language_tabs = [
-    		{ key = "shell", name = "Shell" },
-    		{ key = "ruby", name = "Ruby" },
-    		{ key = "python", name = "Python" }
-	]`)
-
-	expected := map[string]interface{}{
-		"params": map[string]interface{}{
-			"language_tabs": []interface{}{
-				map[string]interface{}{
-					"key":  "shell",
-					"name": "Shell",
-				},
-				map[string]interface{}{
-					"key":  "ruby",
-					"name": "Ruby",
-				},
-				map[string]interface{}{
-					"key":  "python",
-					"name": "Python",
-				},
-			},
-		},
-	}
-
-	treeMap := tree.ToMap()
-	testMaps(t, treeMap, expected)
-}
-
-func TestTreeWriteToFloat(t *testing.T) {
-	tree, err := Load(`a = 3.0`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	str, err := tree.ToTomlString()
-	if err != nil {
-		t.Fatal(err)
-	}
-	expected := `a = 3.0`
-	if strings.TrimSpace(str) != strings.TrimSpace(expected) {
-		t.Fatalf("Expected:\n%s\nGot:\n%s", expected, str)
-	}
-}
-
-func BenchmarkTreeToTomlString(b *testing.B) {
-	toml, err := Load(sampleHard)
-	if err != nil {
-		b.Fatal("Unexpected error:", err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		_, err := toml.ToTomlString()
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-var sampleHard = `# Test file for TOML
-# Only this one tries to emulate a TOML file written by a user of the kind of parser writers probably hate
-# This part you'll really hate
-
-[the]
-test_string = "You'll hate me after this - #"          # " Annoying, isn't it?
-
-    [the.hard]
-    test_array = [ "] ", " # "]      # ] There you go, parse this!
-    test_array2 = [ "Test #11 ]proved that", "Experiment #9 was a success" ]
-    # You didn't think it'd as easy as chucking out the last #, did you?
-    another_test_string = " Same thing, but with a string #"
-    harder_test_string = " And when \"'s are in the string, along with # \""   # "and comments are there too"
-    # Things will get harder
-
-        [the.hard."bit#"]
-        "what?" = "You don't think some user won't do that?"
-        multi_line_array = [
-            "]",
-            # ] Oh yes I did
-            ]
-
-# Each of the following keygroups/key value pairs should produce an error. Uncomment to them to test
-
-#[error]   if you didn't catch this, your parser is broken
-#string = "Anything other than tabs, spaces and newline after a keygroup or key value pair has ended should produce an error unless it is a comment"   like this
-#array = [
-#         "This might most likely happen in multiline arrays",
-#         Like here,
-#         "or here,
-#         and here"
-#         ]     End of array comment, forgot the #
-#number = 3.14  pi <--again forgot the #         `
diff --git a/installer/vendor/github.com/pkg/errors/.gitignore b/installer/vendor/github.com/pkg/errors/.gitignore
deleted file mode 100644
index daf913b1b3..0000000000
--- a/installer/vendor/github.com/pkg/errors/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
diff --git a/installer/vendor/github.com/pkg/errors/.travis.yml b/installer/vendor/github.com/pkg/errors/.travis.yml
deleted file mode 100644
index 588ceca183..0000000000
--- a/installer/vendor/github.com/pkg/errors/.travis.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-language: go
-go_import_path: github.com/pkg/errors
-go:
-  - 1.4.3
-  - 1.5.4
-  - 1.6.2
-  - 1.7.1
-  - tip
-
-script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/pkg/errors/README.md b/installer/vendor/github.com/pkg/errors/README.md
deleted file mode 100644
index 273db3c98a..0000000000
--- a/installer/vendor/github.com/pkg/errors/README.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# errors [![Travis-CI](https://travis-ci.org/pkg/errors.svg)](https://travis-ci.org/pkg/errors) [![AppVeyor](https://ci.appveyor.com/api/projects/status/b98mptawhudj53ep/branch/master?svg=true)](https://ci.appveyor.com/project/davecheney/errors/branch/master) [![GoDoc](https://godoc.org/github.com/pkg/errors?status.svg)](http://godoc.org/github.com/pkg/errors) [![Report card](https://goreportcard.com/badge/github.com/pkg/errors)](https://goreportcard.com/report/github.com/pkg/errors)
-
-Package errors provides simple error handling primitives.
-
-`go get github.com/pkg/errors`
-
-The traditional error handling idiom in Go is roughly akin to
-```go
-if err != nil {
-        return err
-}
-```
-which applied recursively up the call stack results in error reports without context or debugging information. The errors package allows programmers to add context to the failure path in their code in a way that does not destroy the original value of the error.
-
-## Adding context to an error
-
-The errors.Wrap function returns a new error that adds context to the original error. For example
-```go
-_, err := ioutil.ReadAll(r)
-if err != nil {
-        return errors.Wrap(err, "read failed")
-}
-```
-## Retrieving the cause of an error
-
-Using `errors.Wrap` constructs a stack of errors, adding context to the preceding error. Depending on the nature of the error it may be necessary to reverse the operation of errors.Wrap to retrieve the original error for inspection. Any error value which implements this interface can be inspected by `errors.Cause`.
-```go
-type causer interface {
-        Cause() error
-}
-```
-`errors.Cause` will recursively retrieve the topmost error which does not implement `causer`, which is assumed to be the original cause. For example:
-```go
-switch err := errors.Cause(err).(type) {
-case *MyError:
-        // handle specifically
-default:
-        // unknown error
-}
-```
-
-[Read the package documentation for more information](https://godoc.org/github.com/pkg/errors).
-
-## Contributing
-
-We welcome pull requests, bug fixes and issue reports. With that said, the bar for adding new symbols to this package is intentionally set high.
-
-Before proposing a change, please discuss your change by raising an issue.
-
-## Licence
-
-BSD-2-Clause
diff --git a/installer/vendor/github.com/pkg/errors/appveyor.yml b/installer/vendor/github.com/pkg/errors/appveyor.yml
deleted file mode 100644
index a932eade02..0000000000
--- a/installer/vendor/github.com/pkg/errors/appveyor.yml
+++ /dev/null
@@ -1,32 +0,0 @@
-version: build-{build}.{branch}
-
-clone_folder: C:\gopath\src\github.com\pkg\errors
-shallow_clone: true # for startup speed
-
-environment:
-  GOPATH: C:\gopath
-
-platform:
-  - x64
-
-# http://www.appveyor.com/docs/installed-software
-install:
-  # some helpful output for debugging builds
-  - go version
-  - go env
-  # pre-installed MinGW at C:\MinGW is 32bit only
-  # but MSYS2 at C:\msys64 has mingw64
-  - set PATH=C:\msys64\mingw64\bin;%PATH%
-  - gcc --version
-  - g++ --version
-
-build_script:
-  - go install -v ./...
-
-test_script:
-  - set PATH=C:\gopath\bin;%PATH%
-  - go test -v ./...
-
-#artifacts:
-#  - path: '%GOPATH%\bin\*.exe'
-deploy: off
diff --git a/installer/vendor/github.com/pkg/errors/bench_test.go b/installer/vendor/github.com/pkg/errors/bench_test.go
deleted file mode 100644
index 0416a3cbb8..0000000000
--- a/installer/vendor/github.com/pkg/errors/bench_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// +build go1.7
-
-package errors
-
-import (
-	"fmt"
-	"testing"
-
-	stderrors "errors"
-)
-
-func noErrors(at, depth int) error {
-	if at >= depth {
-		return stderrors.New("no error")
-	}
-	return noErrors(at+1, depth)
-}
-func yesErrors(at, depth int) error {
-	if at >= depth {
-		return New("ye error")
-	}
-	return yesErrors(at+1, depth)
-}
-
-func BenchmarkErrors(b *testing.B) {
-	var toperr error
-	type run struct {
-		stack int
-		std   bool
-	}
-	runs := []run{
-		{10, false},
-		{10, true},
-		{100, false},
-		{100, true},
-		{1000, false},
-		{1000, true},
-	}
-	for _, r := range runs {
-		part := "pkg/errors"
-		if r.std {
-			part = "errors"
-		}
-		name := fmt.Sprintf("%s-stack-%d", part, r.stack)
-		b.Run(name, func(b *testing.B) {
-			var err error
-			f := yesErrors
-			if r.std {
-				f = noErrors
-			}
-			b.ReportAllocs()
-			for i := 0; i < b.N; i++ {
-				err = f(0, r.stack)
-			}
-			b.StopTimer()
-			toperr = err
-		})
-	}
-}
diff --git a/installer/vendor/github.com/pkg/errors/errors_test.go b/installer/vendor/github.com/pkg/errors/errors_test.go
deleted file mode 100644
index 1d8c635586..0000000000
--- a/installer/vendor/github.com/pkg/errors/errors_test.go
+++ /dev/null
@@ -1,226 +0,0 @@
-package errors
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"testing"
-)
-
-func TestNew(t *testing.T) {
-	tests := []struct {
-		err  string
-		want error
-	}{
-		{"", fmt.Errorf("")},
-		{"foo", fmt.Errorf("foo")},
-		{"foo", New("foo")},
-		{"string with format specifiers: %v", errors.New("string with format specifiers: %v")},
-	}
-
-	for _, tt := range tests {
-		got := New(tt.err)
-		if got.Error() != tt.want.Error() {
-			t.Errorf("New.Error(): got: %q, want %q", got, tt.want)
-		}
-	}
-}
-
-func TestWrapNil(t *testing.T) {
-	got := Wrap(nil, "no error")
-	if got != nil {
-		t.Errorf("Wrap(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWrap(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{Wrap(io.EOF, "read error"), "client error", "client error: read error: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := Wrap(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("Wrap(%v, %q): got: %v, want %v", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-type nilError struct{}
-
-func (nilError) Error() string { return "nil error" }
-
-func TestCause(t *testing.T) {
-	x := New("error")
-	tests := []struct {
-		err  error
-		want error
-	}{{
-		// nil error is nil
-		err:  nil,
-		want: nil,
-	}, {
-		// explicit nil error is nil
-		err:  (error)(nil),
-		want: nil,
-	}, {
-		// typed nil is nil
-		err:  (*nilError)(nil),
-		want: (*nilError)(nil),
-	}, {
-		// uncaused error is unaffected
-		err:  io.EOF,
-		want: io.EOF,
-	}, {
-		// caused error returns cause
-		err:  Wrap(io.EOF, "ignored"),
-		want: io.EOF,
-	}, {
-		err:  x, // return from errors.New
-		want: x,
-	}, {
-		WithMessage(nil, "whoops"),
-		nil,
-	}, {
-		WithMessage(io.EOF, "whoops"),
-		io.EOF,
-	}, {
-		WithStack(nil),
-		nil,
-	}, {
-		WithStack(io.EOF),
-		io.EOF,
-	}}
-
-	for i, tt := range tests {
-		got := Cause(tt.err)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("test %d: got %#v, want %#v", i+1, got, tt.want)
-		}
-	}
-}
-
-func TestWrapfNil(t *testing.T) {
-	got := Wrapf(nil, "no error")
-	if got != nil {
-		t.Errorf("Wrapf(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWrapf(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{Wrapf(io.EOF, "read error without format specifiers"), "client error", "client error: read error without format specifiers: EOF"},
-		{Wrapf(io.EOF, "read error with %d format specifier", 1), "client error", "client error: read error with 1 format specifier: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := Wrapf(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("Wrapf(%v, %q): got: %v, want %v", tt.err, tt.message, got, tt.want)
-		}
-	}
-}
-
-func TestErrorf(t *testing.T) {
-	tests := []struct {
-		err  error
-		want string
-	}{
-		{Errorf("read error without format specifiers"), "read error without format specifiers"},
-		{Errorf("read error with %d format specifier", 1), "read error with 1 format specifier"},
-	}
-
-	for _, tt := range tests {
-		got := tt.err.Error()
-		if got != tt.want {
-			t.Errorf("Errorf(%v): got: %q, want %q", tt.err, got, tt.want)
-		}
-	}
-}
-
-func TestWithStackNil(t *testing.T) {
-	got := WithStack(nil)
-	if got != nil {
-		t.Errorf("WithStack(nil): got %#v, expected nil", got)
-	}
-}
-
-func TestWithStack(t *testing.T) {
-	tests := []struct {
-		err  error
-		want string
-	}{
-		{io.EOF, "EOF"},
-		{WithStack(io.EOF), "EOF"},
-	}
-
-	for _, tt := range tests {
-		got := WithStack(tt.err).Error()
-		if got != tt.want {
-			t.Errorf("WithStack(%v): got: %v, want %v", tt.err, got, tt.want)
-		}
-	}
-}
-
-func TestWithMessageNil(t *testing.T) {
-	got := WithMessage(nil, "no error")
-	if got != nil {
-		t.Errorf("WithMessage(nil, \"no error\"): got %#v, expected nil", got)
-	}
-}
-
-func TestWithMessage(t *testing.T) {
-	tests := []struct {
-		err     error
-		message string
-		want    string
-	}{
-		{io.EOF, "read error", "read error: EOF"},
-		{WithMessage(io.EOF, "read error"), "client error", "client error: read error: EOF"},
-	}
-
-	for _, tt := range tests {
-		got := WithMessage(tt.err, tt.message).Error()
-		if got != tt.want {
-			t.Errorf("WithMessage(%v, %q): got: %q, want %q", tt.err, tt.message, got, tt.want)
-		}
-	}
-
-}
-
-// errors.New, etc values are not expected to be compared by value
-// but the change in errors#27 made them incomparable. Assert that
-// various kinds of errors have a functional equality operator, even
-// if the result of that equality is always false.
-func TestErrorEquality(t *testing.T) {
-	vals := []error{
-		nil,
-		io.EOF,
-		errors.New("EOF"),
-		New("EOF"),
-		Errorf("EOF"),
-		Wrap(io.EOF, "EOF"),
-		Wrapf(io.EOF, "EOF%d", 2),
-		WithMessage(nil, "whoops"),
-		WithMessage(io.EOF, "whoops"),
-		WithStack(io.EOF),
-		WithStack(nil),
-	}
-
-	for i := range vals {
-		for j := range vals {
-			_ = vals[i] == vals[j] // mustn't panic
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pkg/errors/example_test.go b/installer/vendor/github.com/pkg/errors/example_test.go
deleted file mode 100644
index c1fc13e384..0000000000
--- a/installer/vendor/github.com/pkg/errors/example_test.go
+++ /dev/null
@@ -1,205 +0,0 @@
-package errors_test
-
-import (
-	"fmt"
-
-	"github.com/pkg/errors"
-)
-
-func ExampleNew() {
-	err := errors.New("whoops")
-	fmt.Println(err)
-
-	// Output: whoops
-}
-
-func ExampleNew_printf() {
-	err := errors.New("whoops")
-	fmt.Printf("%+v", err)
-
-	// Example output:
-	// whoops
-	// github.com/pkg/errors_test.ExampleNew_printf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:17
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-}
-
-func ExampleWithMessage() {
-	cause := errors.New("whoops")
-	err := errors.WithMessage(cause, "oh noes")
-	fmt.Println(err)
-
-	// Output: oh noes: whoops
-}
-
-func ExampleWithStack() {
-	cause := errors.New("whoops")
-	err := errors.WithStack(cause)
-	fmt.Println(err)
-
-	// Output: whoops
-}
-
-func ExampleWithStack_printf() {
-	cause := errors.New("whoops")
-	err := errors.WithStack(cause)
-	fmt.Printf("%+v", err)
-
-	// Example Output:
-	// whoops
-	// github.com/pkg/errors_test.ExampleWithStack_printf
-	//         /home/fabstu/go/src/github.com/pkg/errors/example_test.go:55
-	// testing.runExample
-	//         /usr/lib/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /usr/lib/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /usr/lib/go/src/testing/testing.go:744
-	// main.main
-	//         github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /usr/lib/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /usr/lib/go/src/runtime/asm_amd64.s:2086
-	// github.com/pkg/errors_test.ExampleWithStack_printf
-	//         /home/fabstu/go/src/github.com/pkg/errors/example_test.go:56
-	// testing.runExample
-	//         /usr/lib/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /usr/lib/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /usr/lib/go/src/testing/testing.go:744
-	// main.main
-	//         github.com/pkg/errors/_test/_testmain.go:106
-	// runtime.main
-	//         /usr/lib/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /usr/lib/go/src/runtime/asm_amd64.s:2086
-}
-
-func ExampleWrap() {
-	cause := errors.New("whoops")
-	err := errors.Wrap(cause, "oh noes")
-	fmt.Println(err)
-
-	// Output: oh noes: whoops
-}
-
-func fn() error {
-	e1 := errors.New("error")
-	e2 := errors.Wrap(e1, "inner")
-	e3 := errors.Wrap(e2, "middle")
-	return errors.Wrap(e3, "outer")
-}
-
-func ExampleCause() {
-	err := fn()
-	fmt.Println(err)
-	fmt.Println(errors.Cause(err))
-
-	// Output: outer: middle: inner: error
-	// error
-}
-
-func ExampleWrap_extended() {
-	err := fn()
-	fmt.Printf("%+v\n", err)
-
-	// Example output:
-	// error
-	// github.com/pkg/errors_test.fn
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:47
-	// github.com/pkg/errors_test.ExampleCause_printf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:63
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:104
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-	// github.com/pkg/errors_test.fn
-	// 	  /home/dfc/src/github.com/pkg/errors/example_test.go:48: inner
-	// github.com/pkg/errors_test.fn
-	//        /home/dfc/src/github.com/pkg/errors/example_test.go:49: middle
-	// github.com/pkg/errors_test.fn
-	//      /home/dfc/src/github.com/pkg/errors/example_test.go:50: outer
-}
-
-func ExampleWrapf() {
-	cause := errors.New("whoops")
-	err := errors.Wrapf(cause, "oh noes #%d", 2)
-	fmt.Println(err)
-
-	// Output: oh noes #2: whoops
-}
-
-func ExampleErrorf_extended() {
-	err := errors.Errorf("whoops: %s", "foo")
-	fmt.Printf("%+v", err)
-
-	// Example output:
-	// whoops: foo
-	// github.com/pkg/errors_test.ExampleErrorf
-	//         /home/dfc/src/github.com/pkg/errors/example_test.go:101
-	// testing.runExample
-	//         /home/dfc/go/src/testing/example.go:114
-	// testing.RunExamples
-	//         /home/dfc/go/src/testing/example.go:38
-	// testing.(*M).Run
-	//         /home/dfc/go/src/testing/testing.go:744
-	// main.main
-	//         /github.com/pkg/errors/_test/_testmain.go:102
-	// runtime.main
-	//         /home/dfc/go/src/runtime/proc.go:183
-	// runtime.goexit
-	//         /home/dfc/go/src/runtime/asm_amd64.s:2059
-}
-
-func Example_stackTrace() {
-	type stackTracer interface {
-		StackTrace() errors.StackTrace
-	}
-
-	err, ok := errors.Cause(fn()).(stackTracer)
-	if !ok {
-		panic("oops, err does not implement stackTracer")
-	}
-
-	st := err.StackTrace()
-	fmt.Printf("%+v", st[0:2]) // top two frames
-
-	// Example output:
-	// github.com/pkg/errors_test.fn
-	//	/home/dfc/src/github.com/pkg/errors/example_test.go:47
-	// github.com/pkg/errors_test.Example_stackTrace
-	//	/home/dfc/src/github.com/pkg/errors/example_test.go:127
-}
-
-func ExampleCause_printf() {
-	err := errors.Wrap(func() error {
-		return func() error {
-			return errors.Errorf("hello %s", fmt.Sprintf("world"))
-		}()
-	}(), "failed")
-
-	fmt.Printf("%v", err)
-
-	// Output: failed: hello world
-}
diff --git a/installer/vendor/github.com/pkg/errors/format_test.go b/installer/vendor/github.com/pkg/errors/format_test.go
deleted file mode 100644
index 15fd7d89d7..0000000000
--- a/installer/vendor/github.com/pkg/errors/format_test.go
+++ /dev/null
@@ -1,535 +0,0 @@
-package errors
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"regexp"
-	"strings"
-	"testing"
-)
-
-func TestFormatNew(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		New("error"),
-		"%s",
-		"error",
-	}, {
-		New("error"),
-		"%v",
-		"error",
-	}, {
-		New("error"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatNew\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:26",
-	}, {
-		New("error"),
-		"%q",
-		`"error"`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatErrorf(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Errorf("%s", "error"),
-		"%s",
-		"error",
-	}, {
-		Errorf("%s", "error"),
-		"%v",
-		"error",
-	}, {
-		Errorf("%s", "error"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatErrorf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:56",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWrap(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Wrap(New("error"), "error2"),
-		"%s",
-		"error2: error",
-	}, {
-		Wrap(New("error"), "error2"),
-		"%v",
-		"error2: error",
-	}, {
-		Wrap(New("error"), "error2"),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:82",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%s",
-		"error: EOF",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%v",
-		"error: EOF",
-	}, {
-		Wrap(io.EOF, "error"),
-		"%+v",
-		"EOF\n" +
-			"error\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:96",
-	}, {
-		Wrap(Wrap(io.EOF, "error1"), "error2"),
-		"%+v",
-		"EOF\n" +
-			"error1\n" +
-			"github.com/pkg/errors.TestFormatWrap\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:103\n",
-	}, {
-		Wrap(New("error with space"), "context"),
-		"%q",
-		`"context: error with space"`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWrapf(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   string
-	}{{
-		Wrapf(io.EOF, "error%d", 2),
-		"%s",
-		"error2: EOF",
-	}, {
-		Wrapf(io.EOF, "error%d", 2),
-		"%v",
-		"error2: EOF",
-	}, {
-		Wrapf(io.EOF, "error%d", 2),
-		"%+v",
-		"EOF\n" +
-			"error2\n" +
-			"github.com/pkg/errors.TestFormatWrapf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:134",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%s",
-		"error2: error",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%v",
-		"error2: error",
-	}, {
-		Wrapf(New("error"), "error%d", 2),
-		"%+v",
-		"error\n" +
-			"github.com/pkg/errors.TestFormatWrapf\n" +
-			"\t.+/github.com/pkg/errors/format_test.go:149",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.error, tt.format, tt.want)
-	}
-}
-
-func TestFormatWithStack(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   []string
-	}{{
-		WithStack(io.EOF),
-		"%s",
-		[]string{"EOF"},
-	}, {
-		WithStack(io.EOF),
-		"%v",
-		[]string{"EOF"},
-	}, {
-		WithStack(io.EOF),
-		"%+v",
-		[]string{"EOF",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:175"},
-	}, {
-		WithStack(New("error")),
-		"%s",
-		[]string{"error"},
-	}, {
-		WithStack(New("error")),
-		"%v",
-		[]string{"error"},
-	}, {
-		WithStack(New("error")),
-		"%+v",
-		[]string{"error",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:189",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:189"},
-	}, {
-		WithStack(WithStack(io.EOF)),
-		"%+v",
-		[]string{"EOF",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:197",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:197"},
-	}, {
-		WithStack(WithStack(Wrapf(io.EOF, "message"))),
-		"%+v",
-		[]string{"EOF",
-			"message",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:205"},
-	}, {
-		WithStack(Errorf("error%d", 1)),
-		"%+v",
-		[]string{"error1",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:216",
-			"github.com/pkg/errors.TestFormatWithStack\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:216"},
-	}}
-
-	for i, tt := range tests {
-		testFormatCompleteCompare(t, i, tt.error, tt.format, tt.want, true)
-	}
-}
-
-func TestFormatWithMessage(t *testing.T) {
-	tests := []struct {
-		error
-		format string
-		want   []string
-	}{{
-		WithMessage(New("error"), "error2"),
-		"%s",
-		[]string{"error2: error"},
-	}, {
-		WithMessage(New("error"), "error2"),
-		"%v",
-		[]string{"error2: error"},
-	}, {
-		WithMessage(New("error"), "error2"),
-		"%+v",
-		[]string{
-			"error",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:244",
-			"error2"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%s",
-		[]string{"addition1: EOF"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%v",
-		[]string{"addition1: EOF"},
-	}, {
-		WithMessage(io.EOF, "addition1"),
-		"%+v",
-		[]string{"EOF", "addition1"},
-	}, {
-		WithMessage(WithMessage(io.EOF, "addition1"), "addition2"),
-		"%v",
-		[]string{"addition2: addition1: EOF"},
-	}, {
-		WithMessage(WithMessage(io.EOF, "addition1"), "addition2"),
-		"%+v",
-		[]string{"EOF", "addition1", "addition2"},
-	}, {
-		Wrap(WithMessage(io.EOF, "error1"), "error2"),
-		"%+v",
-		[]string{"EOF", "error1", "error2",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:272"},
-	}, {
-		WithMessage(Errorf("error%d", 1), "error2"),
-		"%+v",
-		[]string{"error1",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:278",
-			"error2"},
-	}, {
-		WithMessage(WithStack(io.EOF), "error"),
-		"%+v",
-		[]string{
-			"EOF",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:285",
-			"error"},
-	}, {
-		WithMessage(Wrap(WithStack(io.EOF), "inside-error"), "outside-error"),
-		"%+v",
-		[]string{
-			"EOF",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:293",
-			"inside-error",
-			"github.com/pkg/errors.TestFormatWithMessage\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:293",
-			"outside-error"},
-	}}
-
-	for i, tt := range tests {
-		testFormatCompleteCompare(t, i, tt.error, tt.format, tt.want, true)
-	}
-}
-
-func TestFormatGeneric(t *testing.T) {
-	starts := []struct {
-		err  error
-		want []string
-	}{
-		{New("new-error"), []string{
-			"new-error",
-			"github.com/pkg/errors.TestFormatGeneric\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:315"},
-		}, {Errorf("errorf-error"), []string{
-			"errorf-error",
-			"github.com/pkg/errors.TestFormatGeneric\n" +
-				"\t.+/github.com/pkg/errors/format_test.go:319"},
-		}, {errors.New("errors-new-error"), []string{
-			"errors-new-error"},
-		},
-	}
-
-	wrappers := []wrapper{
-		{
-			func(err error) error { return WithMessage(err, "with-message") },
-			[]string{"with-message"},
-		}, {
-			func(err error) error { return WithStack(err) },
-			[]string{
-				"github.com/pkg/errors.(func·002|TestFormatGeneric.func2)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:333",
-			},
-		}, {
-			func(err error) error { return Wrap(err, "wrap-error") },
-			[]string{
-				"wrap-error",
-				"github.com/pkg/errors.(func·003|TestFormatGeneric.func3)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:339",
-			},
-		}, {
-			func(err error) error { return Wrapf(err, "wrapf-error%d", 1) },
-			[]string{
-				"wrapf-error1",
-				"github.com/pkg/errors.(func·004|TestFormatGeneric.func4)\n\t" +
-					".+/github.com/pkg/errors/format_test.go:346",
-			},
-		},
-	}
-
-	for s := range starts {
-		err := starts[s].err
-		want := starts[s].want
-		testFormatCompleteCompare(t, s, err, "%+v", want, false)
-		testGenericRecursive(t, err, want, wrappers, 3)
-	}
-}
-
-func testFormatRegexp(t *testing.T, n int, arg interface{}, format, want string) {
-	got := fmt.Sprintf(format, arg)
-	gotLines := strings.SplitN(got, "\n", -1)
-	wantLines := strings.SplitN(want, "\n", -1)
-
-	if len(wantLines) > len(gotLines) {
-		t.Errorf("test %d: wantLines(%d) > gotLines(%d):\n got: %q\nwant: %q", n+1, len(wantLines), len(gotLines), got, want)
-		return
-	}
-
-	for i, w := range wantLines {
-		match, err := regexp.MatchString(w, gotLines[i])
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !match {
-			t.Errorf("test %d: line %d: fmt.Sprintf(%q, err):\n got: %q\nwant: %q", n+1, i+1, format, got, want)
-		}
-	}
-}
-
-var stackLineR = regexp.MustCompile(`\.`)
-
-// parseBlocks parses input into a slice, where:
-//  - incase entry contains a newline, its a stacktrace
-//  - incase entry contains no newline, its a solo line.
-//
-// Detecting stack boundaries only works incase the WithStack-calls are
-// to be found on the same line, thats why it is optionally here.
-//
-// Example use:
-//
-// for _, e := range blocks {
-//   if strings.ContainsAny(e, "\n") {
-//     // Match as stack
-//   } else {
-//     // Match as line
-//   }
-// }
-//
-func parseBlocks(input string, detectStackboundaries bool) ([]string, error) {
-	var blocks []string
-
-	stack := ""
-	wasStack := false
-	lines := map[string]bool{} // already found lines
-
-	for _, l := range strings.Split(input, "\n") {
-		isStackLine := stackLineR.MatchString(l)
-
-		switch {
-		case !isStackLine && wasStack:
-			blocks = append(blocks, stack, l)
-			stack = ""
-			lines = map[string]bool{}
-		case isStackLine:
-			if wasStack {
-				// Detecting two stacks after another, possible cause lines match in
-				// our tests due to WithStack(WithStack(io.EOF)) on same line.
-				if detectStackboundaries {
-					if lines[l] {
-						if len(stack) == 0 {
-							return nil, errors.New("len of block must not be zero here")
-						}
-
-						blocks = append(blocks, stack)
-						stack = l
-						lines = map[string]bool{l: true}
-						continue
-					}
-				}
-
-				stack = stack + "\n" + l
-			} else {
-				stack = l
-			}
-			lines[l] = true
-		case !isStackLine && !wasStack:
-			blocks = append(blocks, l)
-		default:
-			return nil, errors.New("must not happen")
-		}
-
-		wasStack = isStackLine
-	}
-
-	// Use up stack
-	if stack != "" {
-		blocks = append(blocks, stack)
-	}
-	return blocks, nil
-}
-
-func testFormatCompleteCompare(t *testing.T, n int, arg interface{}, format string, want []string, detectStackBoundaries bool) {
-	gotStr := fmt.Sprintf(format, arg)
-
-	got, err := parseBlocks(gotStr, detectStackBoundaries)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(got) != len(want) {
-		t.Fatalf("test %d: fmt.Sprintf(%s, err) -> wrong number of blocks: got(%d) want(%d)\n got: %s\nwant: %s\ngotStr: %q",
-			n+1, format, len(got), len(want), prettyBlocks(got), prettyBlocks(want), gotStr)
-	}
-
-	for i := range got {
-		if strings.ContainsAny(want[i], "\n") {
-			// Match as stack
-			match, err := regexp.MatchString(want[i], got[i])
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !match {
-				t.Fatalf("test %d: block %d: fmt.Sprintf(%q, err):\ngot:\n%q\nwant:\n%q\nall-got:\n%s\nall-want:\n%s\n",
-					n+1, i+1, format, got[i], want[i], prettyBlocks(got), prettyBlocks(want))
-			}
-		} else {
-			// Match as message
-			if got[i] != want[i] {
-				t.Fatalf("test %d: fmt.Sprintf(%s, err) at block %d got != want:\n got: %q\nwant: %q", n+1, format, i+1, got[i], want[i])
-			}
-		}
-	}
-}
-
-type wrapper struct {
-	wrap func(err error) error
-	want []string
-}
-
-func prettyBlocks(blocks []string, prefix ...string) string {
-	var out []string
-
-	for _, b := range blocks {
-		out = append(out, fmt.Sprintf("%v", b))
-	}
-
-	return "   " + strings.Join(out, "\n   ")
-}
-
-func testGenericRecursive(t *testing.T, beforeErr error, beforeWant []string, list []wrapper, maxDepth int) {
-	if len(beforeWant) == 0 {
-		panic("beforeWant must not be empty")
-	}
-	for _, w := range list {
-		if len(w.want) == 0 {
-			panic("want must not be empty")
-		}
-
-		err := w.wrap(beforeErr)
-
-		// Copy required cause append(beforeWant, ..) modified beforeWant subtly.
-		beforeCopy := make([]string, len(beforeWant))
-		copy(beforeCopy, beforeWant)
-
-		beforeWant := beforeCopy
-		last := len(beforeWant) - 1
-		var want []string
-
-		// Merge two stacks behind each other.
-		if strings.ContainsAny(beforeWant[last], "\n") && strings.ContainsAny(w.want[0], "\n") {
-			want = append(beforeWant[:last], append([]string{beforeWant[last] + "((?s).*)" + w.want[0]}, w.want[1:]...)...)
-		} else {
-			want = append(beforeWant, w.want...)
-		}
-
-		testFormatCompleteCompare(t, maxDepth, err, "%+v", want, false)
-		if maxDepth > 0 {
-			testGenericRecursive(t, err, want, list, maxDepth-1)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/pkg/errors/stack_test.go b/installer/vendor/github.com/pkg/errors/stack_test.go
deleted file mode 100644
index 510c27a9f9..0000000000
--- a/installer/vendor/github.com/pkg/errors/stack_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-package errors
-
-import (
-	"fmt"
-	"runtime"
-	"testing"
-)
-
-var initpc, _, _, _ = runtime.Caller(0)
-
-func TestFrameLine(t *testing.T) {
-	var tests = []struct {
-		Frame
-		want int
-	}{{
-		Frame(initpc),
-		9,
-	}, {
-		func() Frame {
-			var pc, _, _, _ = runtime.Caller(0)
-			return Frame(pc)
-		}(),
-		20,
-	}, {
-		func() Frame {
-			var pc, _, _, _ = runtime.Caller(1)
-			return Frame(pc)
-		}(),
-		28,
-	}, {
-		Frame(0), // invalid PC
-		0,
-	}}
-
-	for _, tt := range tests {
-		got := tt.Frame.line()
-		want := tt.want
-		if want != got {
-			t.Errorf("Frame(%v): want: %v, got: %v", uintptr(tt.Frame), want, got)
-		}
-	}
-}
-
-type X struct{}
-
-func (x X) val() Frame {
-	var pc, _, _, _ = runtime.Caller(0)
-	return Frame(pc)
-}
-
-func (x *X) ptr() Frame {
-	var pc, _, _, _ = runtime.Caller(0)
-	return Frame(pc)
-}
-
-func TestFrameFormat(t *testing.T) {
-	var tests = []struct {
-		Frame
-		format string
-		want   string
-	}{{
-		Frame(initpc),
-		"%s",
-		"stack_test.go",
-	}, {
-		Frame(initpc),
-		"%+s",
-		"github.com/pkg/errors.init\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go",
-	}, {
-		Frame(0),
-		"%s",
-		"unknown",
-	}, {
-		Frame(0),
-		"%+s",
-		"unknown",
-	}, {
-		Frame(initpc),
-		"%d",
-		"9",
-	}, {
-		Frame(0),
-		"%d",
-		"0",
-	}, {
-		Frame(initpc),
-		"%n",
-		"init",
-	}, {
-		func() Frame {
-			var x X
-			return x.ptr()
-		}(),
-		"%n",
-		`\(\*X\).ptr`,
-	}, {
-		func() Frame {
-			var x X
-			return x.val()
-		}(),
-		"%n",
-		"X.val",
-	}, {
-		Frame(0),
-		"%n",
-		"",
-	}, {
-		Frame(initpc),
-		"%v",
-		"stack_test.go:9",
-	}, {
-		Frame(initpc),
-		"%+v",
-		"github.com/pkg/errors.init\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:9",
-	}, {
-		Frame(0),
-		"%v",
-		"unknown:0",
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.Frame, tt.format, tt.want)
-	}
-}
-
-func TestFuncname(t *testing.T) {
-	tests := []struct {
-		name, want string
-	}{
-		{"", ""},
-		{"runtime.main", "main"},
-		{"github.com/pkg/errors.funcname", "funcname"},
-		{"funcname", "funcname"},
-		{"io.copyBuffer", "copyBuffer"},
-		{"main.(*R).Write", "(*R).Write"},
-	}
-
-	for _, tt := range tests {
-		got := funcname(tt.name)
-		want := tt.want
-		if got != want {
-			t.Errorf("funcname(%q): want: %q, got %q", tt.name, want, got)
-		}
-	}
-}
-
-func TestTrimGOPATH(t *testing.T) {
-	var tests = []struct {
-		Frame
-		want string
-	}{{
-		Frame(initpc),
-		"github.com/pkg/errors/stack_test.go",
-	}}
-
-	for i, tt := range tests {
-		pc := tt.Frame.pc()
-		fn := runtime.FuncForPC(pc)
-		file, _ := fn.FileLine(pc)
-		got := trimGOPATH(fn.Name(), file)
-		testFormatRegexp(t, i, got, "%s", tt.want)
-	}
-}
-
-func TestStackTrace(t *testing.T) {
-	tests := []struct {
-		err  error
-		want []string
-	}{{
-		New("ooh"), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:172",
-		},
-	}, {
-		Wrap(New("ooh"), "ahh"), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:177", // this is the stack of Wrap, not New
-		},
-	}, {
-		Cause(Wrap(New("ooh"), "ahh")), []string{
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:182", // this is the stack of New
-		},
-	}, {
-		func() error { return New("ooh") }(), []string{
-			`github.com/pkg/errors.(func·009|TestStackTrace.func1)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:187", // this is the stack of New
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:187", // this is the stack of New's caller
-		},
-	}, {
-		Cause(func() error {
-			return func() error {
-				return Errorf("hello %s", fmt.Sprintf("world"))
-			}()
-		}()), []string{
-			`github.com/pkg/errors.(func·010|TestStackTrace.func2.1)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:196", // this is the stack of Errorf
-			`github.com/pkg/errors.(func·011|TestStackTrace.func2)` +
-				"\n\t.+/github.com/pkg/errors/stack_test.go:197", // this is the stack of Errorf's caller
-			"github.com/pkg/errors.TestStackTrace\n" +
-				"\t.+/github.com/pkg/errors/stack_test.go:198", // this is the stack of Errorf's caller's caller
-		},
-	}}
-	for i, tt := range tests {
-		x, ok := tt.err.(interface {
-			StackTrace() StackTrace
-		})
-		if !ok {
-			t.Errorf("expected %#v to implement StackTrace() StackTrace", tt.err)
-			continue
-		}
-		st := x.StackTrace()
-		for j, want := range tt.want {
-			testFormatRegexp(t, i, st[j], "%+v", want)
-		}
-	}
-}
-
-func stackTrace() StackTrace {
-	const depth = 8
-	var pcs [depth]uintptr
-	n := runtime.Callers(1, pcs[:])
-	var st stack = pcs[0:n]
-	return st.StackTrace()
-}
-
-func TestStackTraceFormat(t *testing.T) {
-	tests := []struct {
-		StackTrace
-		format string
-		want   string
-	}{{
-		nil,
-		"%s",
-		`\[\]`,
-	}, {
-		nil,
-		"%v",
-		`\[\]`,
-	}, {
-		nil,
-		"%+v",
-		"",
-	}, {
-		nil,
-		"%#v",
-		`\[\]errors.Frame\(nil\)`,
-	}, {
-		make(StackTrace, 0),
-		"%s",
-		`\[\]`,
-	}, {
-		make(StackTrace, 0),
-		"%v",
-		`\[\]`,
-	}, {
-		make(StackTrace, 0),
-		"%+v",
-		"",
-	}, {
-		make(StackTrace, 0),
-		"%#v",
-		`\[\]errors.Frame{}`,
-	}, {
-		stackTrace()[:2],
-		"%s",
-		`\[stack_test.go stack_test.go\]`,
-	}, {
-		stackTrace()[:2],
-		"%v",
-		`\[stack_test.go:225 stack_test.go:272\]`,
-	}, {
-		stackTrace()[:2],
-		"%+v",
-		"\n" +
-			"github.com/pkg/errors.stackTrace\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:225\n" +
-			"github.com/pkg/errors.TestStackTraceFormat\n" +
-			"\t.+/github.com/pkg/errors/stack_test.go:276",
-	}, {
-		stackTrace()[:2],
-		"%#v",
-		`\[\]errors.Frame{stack_test.go:225, stack_test.go:284}`,
-	}}
-
-	for i, tt := range tests {
-		testFormatRegexp(t, i, tt.StackTrace, tt.format, tt.want)
-	}
-}
diff --git a/installer/vendor/github.com/pmezard/go-difflib/.travis.yml b/installer/vendor/github.com/pmezard/go-difflib/.travis.yml
deleted file mode 100644
index 90c9c6f917..0000000000
--- a/installer/vendor/github.com/pmezard/go-difflib/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: go
-go:
-  - 1.5
-  - tip
-
diff --git a/installer/vendor/github.com/pmezard/go-difflib/README.md b/installer/vendor/github.com/pmezard/go-difflib/README.md
deleted file mode 100644
index e87f307ed4..0000000000
--- a/installer/vendor/github.com/pmezard/go-difflib/README.md
+++ /dev/null
@@ -1,50 +0,0 @@
-go-difflib
-==========
-
-[![Build Status](https://travis-ci.org/pmezard/go-difflib.png?branch=master)](https://travis-ci.org/pmezard/go-difflib)
-[![GoDoc](https://godoc.org/github.com/pmezard/go-difflib/difflib?status.svg)](https://godoc.org/github.com/pmezard/go-difflib/difflib)
-
-Go-difflib is a partial port of python 3 difflib package. Its main goal
-was to make unified and context diff available in pure Go, mostly for
-testing purposes.
-
-The following class and functions (and related tests) have be ported:
-
-* `SequenceMatcher`
-* `unified_diff()`
-* `context_diff()`
-
-## Installation
-
-```bash
-$ go get github.com/pmezard/go-difflib/difflib
-```
-
-### Quick Start
-
-Diffs are configured with Unified (or ContextDiff) structures, and can
-be output to an io.Writer or returned as a string.
-
-```Go
-diff := UnifiedDiff{
-    A:        difflib.SplitLines("foo\nbar\n"),
-    B:        difflib.SplitLines("foo\nbaz\n"),
-    FromFile: "Original",
-    ToFile:   "Current",
-    Context:  3,
-}
-text, _ := GetUnifiedDiffString(diff)
-fmt.Printf(text)
-```
-
-would output:
-
-```
---- Original
-+++ Current
-@@ -1,3 +1,3 @@
- foo
--bar
-+baz
-```
-
diff --git a/installer/vendor/github.com/pmezard/go-difflib/difflib/difflib_test.go b/installer/vendor/github.com/pmezard/go-difflib/difflib/difflib_test.go
deleted file mode 100644
index d725119620..0000000000
--- a/installer/vendor/github.com/pmezard/go-difflib/difflib/difflib_test.go
+++ /dev/null
@@ -1,426 +0,0 @@
-package difflib
-
-import (
-	"bytes"
-	"fmt"
-	"math"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func assertAlmostEqual(t *testing.T, a, b float64, places int) {
-	if math.Abs(a-b) > math.Pow10(-places) {
-		t.Errorf("%.7f != %.7f", a, b)
-	}
-}
-
-func assertEqual(t *testing.T, a, b interface{}) {
-	if !reflect.DeepEqual(a, b) {
-		t.Errorf("%v != %v", a, b)
-	}
-}
-
-func splitChars(s string) []string {
-	chars := make([]string, 0, len(s))
-	// Assume ASCII inputs
-	for i := 0; i != len(s); i++ {
-		chars = append(chars, string(s[i]))
-	}
-	return chars
-}
-
-func TestSequenceMatcherRatio(t *testing.T) {
-	s := NewMatcher(splitChars("abcd"), splitChars("bcde"))
-	assertEqual(t, s.Ratio(), 0.75)
-	assertEqual(t, s.QuickRatio(), 0.75)
-	assertEqual(t, s.RealQuickRatio(), 1.0)
-}
-
-func TestGetOptCodes(t *testing.T) {
-	a := "qabxcd"
-	b := "abycdf"
-	s := NewMatcher(splitChars(a), splitChars(b))
-	w := &bytes.Buffer{}
-	for _, op := range s.GetOpCodes() {
-		fmt.Fprintf(w, "%s a[%d:%d], (%s) b[%d:%d] (%s)\n", string(op.Tag),
-			op.I1, op.I2, a[op.I1:op.I2], op.J1, op.J2, b[op.J1:op.J2])
-	}
-	result := string(w.Bytes())
-	expected := `d a[0:1], (q) b[0:0] ()
-e a[1:3], (ab) b[0:2] (ab)
-r a[3:4], (x) b[2:3] (y)
-e a[4:6], (cd) b[3:5] (cd)
-i a[6:6], () b[5:6] (f)
-`
-	if expected != result {
-		t.Errorf("unexpected op codes: \n%s", result)
-	}
-}
-
-func TestGroupedOpCodes(t *testing.T) {
-	a := []string{}
-	for i := 0; i != 39; i++ {
-		a = append(a, fmt.Sprintf("%02d", i))
-	}
-	b := []string{}
-	b = append(b, a[:8]...)
-	b = append(b, " i")
-	b = append(b, a[8:19]...)
-	b = append(b, " x")
-	b = append(b, a[20:22]...)
-	b = append(b, a[27:34]...)
-	b = append(b, " y")
-	b = append(b, a[35:]...)
-	s := NewMatcher(a, b)
-	w := &bytes.Buffer{}
-	for _, g := range s.GetGroupedOpCodes(-1) {
-		fmt.Fprintf(w, "group\n")
-		for _, op := range g {
-			fmt.Fprintf(w, "  %s, %d, %d, %d, %d\n", string(op.Tag),
-				op.I1, op.I2, op.J1, op.J2)
-		}
-	}
-	result := string(w.Bytes())
-	expected := `group
-  e, 5, 8, 5, 8
-  i, 8, 8, 8, 9
-  e, 8, 11, 9, 12
-group
-  e, 16, 19, 17, 20
-  r, 19, 20, 20, 21
-  e, 20, 22, 21, 23
-  d, 22, 27, 23, 23
-  e, 27, 30, 23, 26
-group
-  e, 31, 34, 27, 30
-  r, 34, 35, 30, 31
-  e, 35, 38, 31, 34
-`
-	if expected != result {
-		t.Errorf("unexpected op codes: \n%s", result)
-	}
-}
-
-func ExampleGetUnifiedDiffCode() {
-	a := `one
-two
-three
-four
-fmt.Printf("%s,%T",a,b)`
-	b := `zero
-one
-three
-four`
-	diff := UnifiedDiff{
-		A:        SplitLines(a),
-		B:        SplitLines(b),
-		FromFile: "Original",
-		FromDate: "2005-01-26 23:30:50",
-		ToFile:   "Current",
-		ToDate:   "2010-04-02 10:20:52",
-		Context:  3,
-	}
-	result, _ := GetUnifiedDiffString(diff)
-	fmt.Println(strings.Replace(result, "\t", " ", -1))
-	// Output:
-	// --- Original 2005-01-26 23:30:50
-	// +++ Current 2010-04-02 10:20:52
-	// @@ -1,5 +1,4 @@
-	// +zero
-	//  one
-	// -two
-	//  three
-	//  four
-	// -fmt.Printf("%s,%T",a,b)
-}
-
-func ExampleGetContextDiffCode() {
-	a := `one
-two
-three
-four
-fmt.Printf("%s,%T",a,b)`
-	b := `zero
-one
-tree
-four`
-	diff := ContextDiff{
-		A:        SplitLines(a),
-		B:        SplitLines(b),
-		FromFile: "Original",
-		ToFile:   "Current",
-		Context:  3,
-		Eol:      "\n",
-	}
-	result, _ := GetContextDiffString(diff)
-	fmt.Print(strings.Replace(result, "\t", " ", -1))
-	// Output:
-	// *** Original
-	// --- Current
-	// ***************
-	// *** 1,5 ****
-	//   one
-	// ! two
-	// ! three
-	//   four
-	// - fmt.Printf("%s,%T",a,b)
-	// --- 1,4 ----
-	// + zero
-	//   one
-	// ! tree
-	//   four
-}
-
-func ExampleGetContextDiffString() {
-	a := `one
-two
-three
-four`
-	b := `zero
-one
-tree
-four`
-	diff := ContextDiff{
-		A:        SplitLines(a),
-		B:        SplitLines(b),
-		FromFile: "Original",
-		ToFile:   "Current",
-		Context:  3,
-		Eol:      "\n",
-	}
-	result, _ := GetContextDiffString(diff)
-	fmt.Printf(strings.Replace(result, "\t", " ", -1))
-	// Output:
-	// *** Original
-	// --- Current
-	// ***************
-	// *** 1,4 ****
-	//   one
-	// ! two
-	// ! three
-	//   four
-	// --- 1,4 ----
-	// + zero
-	//   one
-	// ! tree
-	//   four
-}
-
-func rep(s string, count int) string {
-	return strings.Repeat(s, count)
-}
-
-func TestWithAsciiOneInsert(t *testing.T) {
-	sm := NewMatcher(splitChars(rep("b", 100)),
-		splitChars("a"+rep("b", 100)))
-	assertAlmostEqual(t, sm.Ratio(), 0.995, 3)
-	assertEqual(t, sm.GetOpCodes(),
-		[]OpCode{{'i', 0, 0, 0, 1}, {'e', 0, 100, 1, 101}})
-	assertEqual(t, len(sm.bPopular), 0)
-
-	sm = NewMatcher(splitChars(rep("b", 100)),
-		splitChars(rep("b", 50)+"a"+rep("b", 50)))
-	assertAlmostEqual(t, sm.Ratio(), 0.995, 3)
-	assertEqual(t, sm.GetOpCodes(),
-		[]OpCode{{'e', 0, 50, 0, 50}, {'i', 50, 50, 50, 51}, {'e', 50, 100, 51, 101}})
-	assertEqual(t, len(sm.bPopular), 0)
-}
-
-func TestWithAsciiOnDelete(t *testing.T) {
-	sm := NewMatcher(splitChars(rep("a", 40)+"c"+rep("b", 40)),
-		splitChars(rep("a", 40)+rep("b", 40)))
-	assertAlmostEqual(t, sm.Ratio(), 0.994, 3)
-	assertEqual(t, sm.GetOpCodes(),
-		[]OpCode{{'e', 0, 40, 0, 40}, {'d', 40, 41, 40, 40}, {'e', 41, 81, 40, 80}})
-}
-
-func TestWithAsciiBJunk(t *testing.T) {
-	isJunk := func(s string) bool {
-		return s == " "
-	}
-	sm := NewMatcherWithJunk(splitChars(rep("a", 40)+rep("b", 40)),
-		splitChars(rep("a", 44)+rep("b", 40)), true, isJunk)
-	assertEqual(t, sm.bJunk, map[string]struct{}{})
-
-	sm = NewMatcherWithJunk(splitChars(rep("a", 40)+rep("b", 40)),
-		splitChars(rep("a", 44)+rep("b", 40)+rep(" ", 20)), false, isJunk)
-	assertEqual(t, sm.bJunk, map[string]struct{}{" ": struct{}{}})
-
-	isJunk = func(s string) bool {
-		return s == " " || s == "b"
-	}
-	sm = NewMatcherWithJunk(splitChars(rep("a", 40)+rep("b", 40)),
-		splitChars(rep("a", 44)+rep("b", 40)+rep(" ", 20)), false, isJunk)
-	assertEqual(t, sm.bJunk, map[string]struct{}{" ": struct{}{}, "b": struct{}{}})
-}
-
-func TestSFBugsRatioForNullSeqn(t *testing.T) {
-	sm := NewMatcher(nil, nil)
-	assertEqual(t, sm.Ratio(), 1.0)
-	assertEqual(t, sm.QuickRatio(), 1.0)
-	assertEqual(t, sm.RealQuickRatio(), 1.0)
-}
-
-func TestSFBugsComparingEmptyLists(t *testing.T) {
-	groups := NewMatcher(nil, nil).GetGroupedOpCodes(-1)
-	assertEqual(t, len(groups), 0)
-	diff := UnifiedDiff{
-		FromFile: "Original",
-		ToFile:   "Current",
-		Context:  3,
-	}
-	result, err := GetUnifiedDiffString(diff)
-	assertEqual(t, err, nil)
-	assertEqual(t, result, "")
-}
-
-func TestOutputFormatRangeFormatUnified(t *testing.T) {
-	// Per the diff spec at http://www.unix.org/single_unix_specification/
-	//
-	// Each <range> field shall be of the form:
-	//   %1d", <beginning line number>  if the range contains exactly one line,
-	// and:
-	//  "%1d,%1d", <beginning line number>, <number of lines> otherwise.
-	// If a range is empty, its beginning line number shall be the number of
-	// the line just before the range, or 0 if the empty range starts the file.
-	fm := formatRangeUnified
-	assertEqual(t, fm(3, 3), "3,0")
-	assertEqual(t, fm(3, 4), "4")
-	assertEqual(t, fm(3, 5), "4,2")
-	assertEqual(t, fm(3, 6), "4,3")
-	assertEqual(t, fm(0, 0), "0,0")
-}
-
-func TestOutputFormatRangeFormatContext(t *testing.T) {
-	// Per the diff spec at http://www.unix.org/single_unix_specification/
-	//
-	// The range of lines in file1 shall be written in the following format
-	// if the range contains two or more lines:
-	//     "*** %d,%d ****\n", <beginning line number>, <ending line number>
-	// and the following format otherwise:
-	//     "*** %d ****\n", <ending line number>
-	// The ending line number of an empty range shall be the number of the preceding line,
-	// or 0 if the range is at the start of the file.
-	//
-	// Next, the range of lines in file2 shall be written in the following format
-	// if the range contains two or more lines:
-	//     "--- %d,%d ----\n", <beginning line number>, <ending line number>
-	// and the following format otherwise:
-	//     "--- %d ----\n", <ending line number>
-	fm := formatRangeContext
-	assertEqual(t, fm(3, 3), "3")
-	assertEqual(t, fm(3, 4), "4")
-	assertEqual(t, fm(3, 5), "4,5")
-	assertEqual(t, fm(3, 6), "4,6")
-	assertEqual(t, fm(0, 0), "0")
-}
-
-func TestOutputFormatTabDelimiter(t *testing.T) {
-	diff := UnifiedDiff{
-		A:        splitChars("one"),
-		B:        splitChars("two"),
-		FromFile: "Original",
-		FromDate: "2005-01-26 23:30:50",
-		ToFile:   "Current",
-		ToDate:   "2010-04-12 10:20:52",
-		Eol:      "\n",
-	}
-	ud, err := GetUnifiedDiffString(diff)
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(ud)[:2], []string{
-		"--- Original\t2005-01-26 23:30:50\n",
-		"+++ Current\t2010-04-12 10:20:52\n",
-	})
-	cd, err := GetContextDiffString(ContextDiff(diff))
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(cd)[:2], []string{
-		"*** Original\t2005-01-26 23:30:50\n",
-		"--- Current\t2010-04-12 10:20:52\n",
-	})
-}
-
-func TestOutputFormatNoTrailingTabOnEmptyFiledate(t *testing.T) {
-	diff := UnifiedDiff{
-		A:        splitChars("one"),
-		B:        splitChars("two"),
-		FromFile: "Original",
-		ToFile:   "Current",
-		Eol:      "\n",
-	}
-	ud, err := GetUnifiedDiffString(diff)
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(ud)[:2], []string{"--- Original\n", "+++ Current\n"})
-
-	cd, err := GetContextDiffString(ContextDiff(diff))
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(cd)[:2], []string{"*** Original\n", "--- Current\n"})
-}
-
-func TestOmitFilenames(t *testing.T) {
-	diff := UnifiedDiff{
-		A:   SplitLines("o\nn\ne\n"),
-		B:   SplitLines("t\nw\no\n"),
-		Eol: "\n",
-	}
-	ud, err := GetUnifiedDiffString(diff)
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(ud), []string{
-		"@@ -0,0 +1,2 @@\n",
-		"+t\n",
-		"+w\n",
-		"@@ -2,2 +3,0 @@\n",
-		"-n\n",
-		"-e\n",
-		"\n",
-	})
-
-	cd, err := GetContextDiffString(ContextDiff(diff))
-	assertEqual(t, err, nil)
-	assertEqual(t, SplitLines(cd), []string{
-		"***************\n",
-		"*** 0 ****\n",
-		"--- 1,2 ----\n",
-		"+ t\n",
-		"+ w\n",
-		"***************\n",
-		"*** 2,3 ****\n",
-		"- n\n",
-		"- e\n",
-		"--- 3 ----\n",
-		"\n",
-	})
-}
-
-func TestSplitLines(t *testing.T) {
-	allTests := []struct {
-		input string
-		want  []string
-	}{
-		{"foo", []string{"foo\n"}},
-		{"foo\nbar", []string{"foo\n", "bar\n"}},
-		{"foo\nbar\n", []string{"foo\n", "bar\n", "\n"}},
-	}
-	for _, test := range allTests {
-		assertEqual(t, SplitLines(test.input), test.want)
-	}
-}
-
-func benchmarkSplitLines(b *testing.B, count int) {
-	str := strings.Repeat("foo\n", count)
-
-	b.ResetTimer()
-
-	n := 0
-	for i := 0; i < b.N; i++ {
-		n += len(SplitLines(str))
-	}
-}
-
-func BenchmarkSplitLines100(b *testing.B) {
-	benchmarkSplitLines(b, 100)
-}
-
-func BenchmarkSplitLines10000(b *testing.B) {
-	benchmarkSplitLines(b, 10000)
-}
diff --git a/installer/vendor/github.com/ryanuber/go-glob/.travis.yml b/installer/vendor/github.com/ryanuber/go-glob/.travis.yml
deleted file mode 100644
index 9d1ca3c378..0000000000
--- a/installer/vendor/github.com/ryanuber/go-glob/.travis.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-language: go
-go:
-  - tip
-script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/ryanuber/go-glob/README.md b/installer/vendor/github.com/ryanuber/go-glob/README.md
deleted file mode 100644
index 48f7fcb05a..0000000000
--- a/installer/vendor/github.com/ryanuber/go-glob/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# String globbing in golang [![Build Status](https://travis-ci.org/ryanuber/go-glob.svg)](https://travis-ci.org/ryanuber/go-glob)
-
-`go-glob` is a single-function library implementing basic string glob support.
-
-Globs are an extremely user-friendly way of supporting string matching without
-requiring knowledge of regular expressions or Go's particular regex engine. Most
-people understand that if you put a `*` character somewhere in a string, it is
-treated as a wildcard. Surprisingly, this functionality isn't found in Go's
-standard library, except for `path.Match`, which is intended to be used while
-comparing paths (not arbitrary strings), and contains specialized logic for this
-use case. A better solution might be a POSIX basic (non-ERE) regular expression
-engine for Go, which doesn't exist currently.
-
-Example
-=======
-
-```
-package main
-
-import "github.com/ryanuber/go-glob"
-
-func main() {
-    glob.Glob("*World!", "Hello, World!") // true
-    glob.Glob("Hello,*", "Hello, World!") // true
-    glob.Glob("*ello,*", "Hello, World!") // true
-    glob.Glob("World!", "Hello, World!")  // false
-    glob.Glob("/home/*", "/home/ryanuber/.bashrc") // true
-}
-```
diff --git a/installer/vendor/github.com/ryanuber/go-glob/glob_test.go b/installer/vendor/github.com/ryanuber/go-glob/glob_test.go
deleted file mode 100644
index e609df4d2a..0000000000
--- a/installer/vendor/github.com/ryanuber/go-glob/glob_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package glob
-
-import (
-	"strings"
-	"testing"
-)
-
-func testGlobMatch(t *testing.T, pattern, subj string) {
-	if !Glob(pattern, subj) {
-		t.Fatalf("%s should match %s", pattern, subj)
-	}
-}
-
-func testGlobNoMatch(t *testing.T, pattern, subj string) {
-	if Glob(pattern, subj) {
-		t.Fatalf("%s should not match %s", pattern, subj)
-	}
-}
-
-func TestEmptyPattern(t *testing.T) {
-	testGlobMatch(t, "", "")
-	testGlobNoMatch(t, "", "test")
-}
-
-func TestEmptySubject(t *testing.T) {
-	for _, pattern := range []string{
-		"",
-		"*",
-		"**",
-		"***",
-		"****************",
-		strings.Repeat("*", 1000000),
-	} {
-		testGlobMatch(t, pattern, "")
-	}
-
-	for _, pattern := range []string{
-		// No globs/non-glob characters
-		"test",
-		"*test*",
-
-		// Trailing characters
-		"*x",
-		"*****************x",
-		strings.Repeat("*", 1000000) + "x",
-
-		// Leading characters
-		"x*",
-		"x*****************",
-		"x" + strings.Repeat("*", 1000000),
-
-		// Mixed leading/trailing characters
-		"x*x",
-		"x****************x",
-		"x" + strings.Repeat("*", 1000000) + "x",
-	} {
-		testGlobNoMatch(t, pattern, "")
-	}
-}
-
-func TestPatternWithoutGlobs(t *testing.T) {
-	testGlobMatch(t, "test", "test")
-}
-
-func TestGlob(t *testing.T) {
-	// Matches
-	for _, pattern := range []string{
-		"*test",           // Leading glob
-		"this*",           // Trailing glob
-		"this*test",       // Middle glob
-		"*is *",           // String in between two globs
-		"*is*a*",          // Lots of globs
-		"**test**",        // Double glob characters
-		"**is**a***test*", // Varying number of globs
-		"* *",             // White space between globs
-		"*",               // Lone glob
-		"**********",      // Nothing but globs
-		"*Ѿ*",             // Unicode with globs
-		"*is a ϗѾ *",      // Mixed ASCII/unicode
-	} {
-		testGlobMatch(t, pattern, "this is a ϗѾ test")
-	}
-
-	// Non-matches
-	for _, pattern := range []string{
-		"test*", // Implicit substring match
-		"*is",   // Partial match
-		"*no*",  // Globs without a match between them
-		" ",     // Plain white space
-		"* ",    // Trailing white space
-		" *",    // Leading white space
-		"*ʤ*",   // Non-matching unicode
-	} {
-		testGlobNoMatch(t, pattern, "this is a test")
-	}
-}
-
-func BenchmarkGlob(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		if !Glob("*quick*fox*dog", "The quick brown fox jumped over the lazy dog") {
-			b.Fatalf("should match")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/sdboyer/constext/README.md b/installer/vendor/github.com/sdboyer/constext/README.md
deleted file mode 100644
index e267fd5478..0000000000
--- a/installer/vendor/github.com/sdboyer/constext/README.md
+++ /dev/null
@@ -1,78 +0,0 @@
-# constext [![Doc Status](https://godoc.org/github.com/sdboyer/constext?status.png)](https://godoc.org/github.com/sdboyer/constext)
-
-constext allows you to [`cons`](https://en.wikipedia.org/wiki/Cons) `Context`s
-together as a pair, conjoining them for the purpose of all `Context` behaviors:
-
-1. If either parent context is canceled, the constext is canceled. The
-   err is set to whatever the err of the parent that was canceled.
-2. If either parent has a deadline, the constext uses that same
-   deadline. If both have a deadline, it uses the sooner/lesser one.
-3. Values from both parents are unioned together. When a key is present in both
-   parent trees, the left (first) context supercedes the right (second).
-
-Paired contexts can be recombined using the standard `context.With*()`
-functions.
-
-## Usage
-
-Use is simple, and patterned after the `context` package. The `constext.Cons()`
-function takes two `context.Context` arguments and returns a single, unified
-one, along with a `context.CancelFunc`.
-
-```go
-cctx, cancelFunc := constext.Cons(context.Background(), context.Background())
-```
-
-True to the spirit of `cons`, recursive trees can be formed through
-nesting:
-
-```go
-bg := context.Background()
-cctx := constext.Cons(bg, constext.Cons(bg, constext.Cons(bg, bg)))
-```
-
-This probably isn't a good idea, but it's possible.
-
-## Rationale
-
-While the unary model of context works well for the original vision - an object
-operating within an [HTTP] request's scope - there are times when we need a
-little more.
-
-For example: in [dep](https://github.com/golang/dep), the subsystem that
-manages interaction with source repositories is called a
-[`SourceManager`](https://godoc.org/github.com/sdboyer/gps#SourceManager). It
-is a long-lived object; generally, only one is created over the course of any
-single `dep` invocation. The `SourceManager` has a number of methods on it that
-may initiate network and/or disk interaction. As such, these methods need to
-take a `context.Context`, so that the caller can cancel them if needed.
-
-However, this is not sufficient. The `SourceManager` itself may need to be
-terminated (e.g., if the process received a signal). In such a case, in-flight
-method calls also need to be canceled, to avoid leaving disk in inconsistent
-state.
-
-As a result, each in-flight request serves two parents - the initator of the
-request, and the `SourceManager` itself. We can abstract away this complexity
-by having a `Context` for each, and `Cons`ing them together on a per-call
-basis.
-
-## Caveats
-
-_tl;dr: GC doesn't work right, so explicitly cancel constexts when done with them._
-
-The stdlib context packages uses internal tree-walking trickery to avoid
-spawning goroutines unless it actually has to. We can't rely on that same
-trickery, in part because we can't access the tree internals, but also because
-it's not so straightforward when multiple parents are involved. Consequently,
-`Cons()` almost always must spawn a goroutine to ensure correct cancellation
-behavior, whereas e.g. `context.WithCancel()` rarely has to.
-
-If, as in the use case above, your constext has one short-lived and one
-long-lived parent, and the short-lived parent is not explicitly canceled (which
-is typical), then until the long-lived parent is canceled, neither the
-constext, nor any otherwise-unreachable members of the short-lived context tree
-will be GCed.
-
-So, for now, explicitly cancel your constexts before they go out of scope,
-otherwise you'll leak memory.
diff --git a/installer/vendor/github.com/sdboyer/constext/constext_test.go b/installer/vendor/github.com/sdboyer/constext/constext_test.go
deleted file mode 100644
index 907483b218..0000000000
--- a/installer/vendor/github.com/sdboyer/constext/constext_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-package constext
-
-import (
-	"context"
-	"runtime"
-	"testing"
-	"time"
-)
-
-var bgc = context.Background()
-
-func TestConsCancel(t *testing.T) {
-	c1, cancel1 := context.WithCancel(bgc)
-	c2, cancel2 := context.WithCancel(bgc)
-
-	cc, _ := Cons(c1, c2)
-	if _, has := cc.Deadline(); has {
-		t.Fatal("constext should not have a deadline if parents do not")
-	}
-
-	cancel1()
-	select {
-	case <-cc.Done():
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for parent to quit; stacks:\n%s", buf[:n])
-	}
-
-	cc, _ = Cons(c1, c2)
-	if cc.Err() == nil {
-		t.Fatal("pre-canceled car constext did not begin canceled")
-	}
-
-	cc, _ = Cons(c2, c1)
-	if cc.Err() == nil {
-		t.Fatal("pre-canceled cdr constext did not begin canceled")
-	}
-
-	c3, _ := context.WithCancel(bgc)
-	cc, _ = Cons(c3, c2)
-	cancel2()
-	select {
-	case <-cc.Done():
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for cdr to quit; stacks:\n%s", buf[:n])
-	}
-}
-
-func TestCancelPassdown(t *testing.T) {
-	c1, cancel1 := context.WithCancel(bgc)
-	c2, _ := context.WithCancel(bgc)
-	cc, _ := Cons(c1, c2)
-	c3, _ := context.WithCancel(cc)
-
-	cancel1()
-	select {
-	case <-c3.Done():
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for parent to quit; stacks:\n%s", buf[:n])
-	}
-
-	c1, cancel1 = context.WithCancel(bgc)
-	cc, _ = Cons(c1, c2)
-	c3 = context.WithValue(cc, "foo", "bar")
-
-	cancel1()
-	select {
-	case <-c3.Done():
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for parent to quit; stacks:\n%s", buf[:n])
-	}
-}
-
-func TestValueUnion(t *testing.T) {
-	c1 := context.WithValue(bgc, "foo", "bar")
-	c2 := context.WithValue(bgc, "foo", "baz")
-	cc, _ := Cons(c1, c2)
-
-	v := cc.Value("foo")
-	if v != "bar" {
-		t.Fatalf("wanted value of \"foo\" from car, \"bar\", got %q", v)
-	}
-
-	c3 := context.WithValue(bgc, "bar", "quux")
-	cc2, _ := Cons(c1, c3)
-	v = cc2.Value("bar")
-	if v != "quux" {
-		t.Fatalf("wanted value from cdr, \"quux\", got %q", v)
-	}
-
-	cc, _ = Cons(cc, c3)
-	v = cc.Value("bar")
-	if v != "quux" {
-		t.Fatalf("wanted value from nested cdr, \"quux\", got %q", v)
-	}
-}
-
-func TestDeadline(t *testing.T) {
-	t1 := time.Now().Add(1 * time.Second)
-	c1, _ := context.WithDeadline(bgc, t1)
-	cc, _ := Cons(c1, bgc)
-
-	cct, ok := cc.Deadline()
-	if !ok {
-		t.Fatal("constext claimed to not have any deadline, but car did")
-	}
-	if cct != t1 {
-		t.Fatal("constext did not have correct deadline")
-	}
-
-	cc, _ = Cons(bgc, c1)
-	cct, ok = cc.Deadline()
-	if !ok {
-		t.Fatal("constext claimed to not have any deadline, but cdr did")
-	}
-	if cct != t1 {
-		t.Fatal("constext did not have correct deadline")
-	}
-
-	t2 := time.Now().Add(1 * time.Second)
-	c2, _ := context.WithDeadline(bgc, t2)
-	cc, _ = Cons(c1, c2)
-	cct, ok = cc.Deadline()
-	if !ok {
-		t.Fatal("constext claimed to not have any deadline, but both parents did")
-	}
-
-	if cct != t1 {
-		t.Fatal("got wrong deadline time back")
-	}
-
-	cc, _ = Cons(c2, c1)
-	cct, ok = cc.Deadline()
-	if !ok {
-		t.Fatal("constext claimed to not have any deadline, but both parents did")
-	}
-
-	if cct != t1 {
-		t.Fatal("got wrong deadline time back")
-	}
-
-	select {
-	case <-cc.Done():
-	case <-time.After(t1.Sub(time.Now()) + 5*time.Millisecond):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("car did not quit after deadline; stacks:\n%s", buf[:n])
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/.gitignore b/installer/vendor/github.com/spf13/pflag/.gitignore
deleted file mode 100644
index c3da290134..0000000000
--- a/installer/vendor/github.com/spf13/pflag/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.idea/*
-
diff --git a/installer/vendor/github.com/spf13/pflag/.travis.yml b/installer/vendor/github.com/spf13/pflag/.travis.yml
deleted file mode 100644
index f8a63b308b..0000000000
--- a/installer/vendor/github.com/spf13/pflag/.travis.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-sudo: false
-
-language: go
-
-go:
-  - 1.7.3
-  - 1.8.1
-  - tip
-
-matrix:
-  allow_failures:
-    - go: tip
-
-install:
-  - go get github.com/golang/lint/golint
-  - export PATH=$GOPATH/bin:$PATH
-  - go install ./...
-
-script:
-  - verify/all.sh -v
-  - go test ./...
diff --git a/installer/vendor/github.com/spf13/pflag/README.md b/installer/vendor/github.com/spf13/pflag/README.md
deleted file mode 100644
index b052414d12..0000000000
--- a/installer/vendor/github.com/spf13/pflag/README.md
+++ /dev/null
@@ -1,296 +0,0 @@
-[![Build Status](https://travis-ci.org/spf13/pflag.svg?branch=master)](https://travis-ci.org/spf13/pflag)
-[![Go Report Card](https://goreportcard.com/badge/github.com/spf13/pflag)](https://goreportcard.com/report/github.com/spf13/pflag)
-[![GoDoc](https://godoc.org/github.com/spf13/pflag?status.svg)](https://godoc.org/github.com/spf13/pflag)
-
-## Description
-
-pflag is a drop-in replacement for Go's flag package, implementing
-POSIX/GNU-style --flags.
-
-pflag is compatible with the [GNU extensions to the POSIX recommendations
-for command-line options][1]. For a more precise description, see the
-"Command-line flag syntax" section below.
-
-[1]: http://www.gnu.org/software/libc/manual/html_node/Argument-Syntax.html
-
-pflag is available under the same style of BSD license as the Go language,
-which can be found in the LICENSE file.
-
-## Installation
-
-pflag is available using the standard `go get` command.
-
-Install by running:
-
-    go get github.com/spf13/pflag
-
-Run tests by running:
-
-    go test github.com/spf13/pflag
-
-## Usage
-
-pflag is a drop-in replacement of Go's native flag package. If you import
-pflag under the name "flag" then all code should continue to function
-with no changes.
-
-``` go
-import flag "github.com/spf13/pflag"
-```
-
-There is one exception to this: if you directly instantiate the Flag struct
-there is one more field "Shorthand" that you will need to set.
-Most code never instantiates this struct directly, and instead uses
-functions such as String(), BoolVar(), and Var(), and is therefore
-unaffected.
-
-Define flags using flag.String(), Bool(), Int(), etc.
-
-This declares an integer flag, -flagname, stored in the pointer ip, with type *int.
-
-``` go
-var ip *int = flag.Int("flagname", 1234, "help message for flagname")
-```
-
-If you like, you can bind the flag to a variable using the Var() functions.
-
-``` go
-var flagvar int
-func init() {
-    flag.IntVar(&flagvar, "flagname", 1234, "help message for flagname")
-}
-```
-
-Or you can create custom flags that satisfy the Value interface (with
-pointer receivers) and couple them to flag parsing by
-
-``` go
-flag.Var(&flagVal, "name", "help message for flagname")
-```
-
-For such flags, the default value is just the initial value of the variable.
-
-After all flags are defined, call
-
-``` go
-flag.Parse()
-```
-
-to parse the command line into the defined flags.
-
-Flags may then be used directly. If you're using the flags themselves,
-they are all pointers; if you bind to variables, they're values.
-
-``` go
-fmt.Println("ip has value ", *ip)
-fmt.Println("flagvar has value ", flagvar)
-```
-
-There are helpers function to get values later if you have the FlagSet but
-it was difficult to keep up with all of the flag pointers in your code.
-If you have a pflag.FlagSet with a flag called 'flagname' of type int you
-can use GetInt() to get the int value. But notice that 'flagname' must exist
-and it must be an int. GetString("flagname") will fail.
-
-``` go
-i, err := flagset.GetInt("flagname")
-```
-
-After parsing, the arguments after the flag are available as the
-slice flag.Args() or individually as flag.Arg(i).
-The arguments are indexed from 0 through flag.NArg()-1.
-
-The pflag package also defines some new functions that are not in flag,
-that give one-letter shorthands for flags. You can use these by appending
-'P' to the name of any function that defines a flag.
-
-``` go
-var ip = flag.IntP("flagname", "f", 1234, "help message")
-var flagvar bool
-func init() {
-	flag.BoolVarP(&flagvar, "boolname", "b", true, "help message")
-}
-flag.VarP(&flagVal, "varname", "v", "help message")
-```
-
-Shorthand letters can be used with single dashes on the command line.
-Boolean shorthand flags can be combined with other shorthand flags.
-
-The default set of command-line flags is controlled by
-top-level functions.  The FlagSet type allows one to define
-independent sets of flags, such as to implement subcommands
-in a command-line interface. The methods of FlagSet are
-analogous to the top-level functions for the command-line
-flag set.
-
-## Setting no option default values for flags
-
-After you create a flag it is possible to set the pflag.NoOptDefVal for
-the given flag. Doing this changes the meaning of the flag slightly. If
-a flag has a NoOptDefVal and the flag is set on the command line without
-an option the flag will be set to the NoOptDefVal. For example given:
-
-``` go
-var ip = flag.IntP("flagname", "f", 1234, "help message")
-flag.Lookup("flagname").NoOptDefVal = "4321"
-```
-
-Would result in something like
-
-| Parsed Arguments | Resulting Value |
-| -------------    | -------------   |
-| --flagname=1357  | ip=1357         |
-| --flagname       | ip=4321         |
-| [nothing]        | ip=1234         |
-
-## Command line flag syntax
-
-```
---flag    // boolean flags, or flags with no option default values
---flag x  // only on flags without a default value
---flag=x
-```
-
-Unlike the flag package, a single dash before an option means something
-different than a double dash. Single dashes signify a series of shorthand
-letters for flags. All but the last shorthand letter must be boolean flags
-or a flag with a default value
-
-```
-// boolean or flags where the 'no option default value' is set
--f
--f=true
--abc
-but
--b true is INVALID
-
-// non-boolean and flags without a 'no option default value'
--n 1234
--n=1234
--n1234
-
-// mixed
--abcs "hello"
--absd="hello"
--abcs1234
-```
-
-Flag parsing stops after the terminator "--". Unlike the flag package,
-flags can be interspersed with arguments anywhere on the command line
-before this terminator.
-
-Integer flags accept 1234, 0664, 0x1234 and may be negative.
-Boolean flags (in their long form) accept 1, 0, t, f, true, false,
-TRUE, FALSE, True, False.
-Duration flags accept any input valid for time.ParseDuration.
-
-## Mutating or "Normalizing" Flag names
-
-It is possible to set a custom flag name 'normalization function.' It allows flag names to be mutated both when created in the code and when used on the command line to some 'normalized' form. The 'normalized' form is used for comparison. Two examples of using the custom normalization func follow.
-
-**Example #1**: You want -, _, and . in flags to compare the same. aka --my-flag == --my_flag == --my.flag
-
-``` go
-func wordSepNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
-	from := []string{"-", "_"}
-	to := "."
-	for _, sep := range from {
-		name = strings.Replace(name, sep, to, -1)
-	}
-	return pflag.NormalizedName(name)
-}
-
-myFlagSet.SetNormalizeFunc(wordSepNormalizeFunc)
-```
-
-**Example #2**: You want to alias two flags. aka --old-flag-name == --new-flag-name
-
-``` go
-func aliasNormalizeFunc(f *pflag.FlagSet, name string) pflag.NormalizedName {
-	switch name {
-	case "old-flag-name":
-		name = "new-flag-name"
-		break
-	}
-	return pflag.NormalizedName(name)
-}
-
-myFlagSet.SetNormalizeFunc(aliasNormalizeFunc)
-```
-
-## Deprecating a flag or its shorthand
-It is possible to deprecate a flag, or just its shorthand. Deprecating a flag/shorthand hides it from help text and prints a usage message when the deprecated flag/shorthand is used.
-
-**Example #1**: You want to deprecate a flag named "badflag" as well as inform the users what flag they should use instead.
-```go
-// deprecate a flag by specifying its name and a usage message
-flags.MarkDeprecated("badflag", "please use --good-flag instead")
-```
-This hides "badflag" from help text, and prints `Flag --badflag has been deprecated, please use --good-flag instead` when "badflag" is used.
-
-**Example #2**: You want to keep a flag name "noshorthandflag" but deprecate its shortname "n".
-```go
-// deprecate a flag shorthand by specifying its flag name and a usage message
-flags.MarkShorthandDeprecated("noshorthandflag", "please use --noshorthandflag only")
-```
-This hides the shortname "n" from help text, and prints `Flag shorthand -n has been deprecated, please use --noshorthandflag only` when the shorthand "n" is used.
-
-Note that usage message is essential here, and it should not be empty.
-
-## Hidden flags
-It is possible to mark a flag as hidden, meaning it will still function as normal, however will not show up in usage/help text.
-
-**Example**: You have a flag named "secretFlag" that you need for internal use only and don't want it showing up in help text, or for its usage text to be available.
-```go
-// hide a flag by specifying its name
-flags.MarkHidden("secretFlag")
-```
-
-## Disable sorting of flags
-`pflag` allows you to disable sorting of flags for help and usage message.
-
-**Example**:
-```go
-flags.BoolP("verbose", "v", false, "verbose output")
-flags.String("coolflag", "yeaah", "it's really cool flag")
-flags.Int("usefulflag", 777, "sometimes it's very useful")
-flags.SortFlags = false
-flags.PrintDefaults()
-```
-**Output**:
-```
-  -v, --verbose           verbose output
-      --coolflag string   it's really cool flag (default "yeaah")
-      --usefulflag int    sometimes it's very useful (default 777)
-```
-
-
-## Supporting Go flags when using pflag
-In order to support flags defined using Go's `flag` package, they must be added to the `pflag` flagset. This is usually necessary
-to support flags defined by third-party dependencies (e.g. `golang/glog`).
-
-**Example**: You want to add the Go flags to the `CommandLine` flagset
-```go
-import (
-	goflag "flag"
-	flag "github.com/spf13/pflag"
-)
-
-var ip *int = flag.Int("flagname", 1234, "help message for flagname")
-
-func main() {
-	flag.CommandLine.AddGoFlagSet(goflag.CommandLine)
-	flag.Parse()
-}
-```
-
-## More info
-
-You can see the full reference documentation of the pflag package
-[at godoc.org][3], or through go's standard documentation system by
-running `godoc -http=:6060` and browsing to
-[http://localhost:6060/pkg/github.com/spf13/pflag][2] after
-installation.
-
-[2]: http://localhost:6060/pkg/github.com/spf13/pflag
-[3]: http://godoc.org/github.com/spf13/pflag
diff --git a/installer/vendor/github.com/spf13/pflag/bool_slice_test.go b/installer/vendor/github.com/spf13/pflag/bool_slice_test.go
deleted file mode 100644
index b617dd237f..0000000000
--- a/installer/vendor/github.com/spf13/pflag/bool_slice_test.go
+++ /dev/null
@@ -1,215 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func setUpBSFlagSet(bsp *[]bool) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.BoolSliceVar(bsp, "bs", []bool{}, "Command separated list!")
-	return f
-}
-
-func setUpBSFlagSetWithDefault(bsp *[]bool) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.BoolSliceVar(bsp, "bs", []bool{false, true}, "Command separated list!")
-	return f
-}
-
-func TestEmptyBS(t *testing.T) {
-	var bs []bool
-	f := setUpBSFlagSet(&bs)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getBS, err := f.GetBoolSlice("bs")
-	if err != nil {
-		t.Fatal("got an error from GetBoolSlice():", err)
-	}
-	if len(getBS) != 0 {
-		t.Fatalf("got bs %v with len=%d but expected length=0", getBS, len(getBS))
-	}
-}
-
-func TestBS(t *testing.T) {
-	var bs []bool
-	f := setUpBSFlagSet(&bs)
-
-	vals := []string{"1", "F", "TRUE", "0"}
-	arg := fmt.Sprintf("--bs=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range bs {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if b != v {
-			t.Fatalf("expected is[%d] to be %s but got: %t", i, vals[i], v)
-		}
-	}
-	getBS, err := f.GetBoolSlice("bs")
-	if err != nil {
-		t.Fatalf("got error: %v", err)
-	}
-	for i, v := range getBS {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if b != v {
-			t.Fatalf("expected bs[%d] to be %s but got: %t from GetBoolSlice", i, vals[i], v)
-		}
-	}
-}
-
-func TestBSDefault(t *testing.T) {
-	var bs []bool
-	f := setUpBSFlagSetWithDefault(&bs)
-
-	vals := []string{"false", "T"}
-
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range bs {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if b != v {
-			t.Fatalf("expected bs[%d] to be %t from GetBoolSlice but got: %t", i, b, v)
-		}
-	}
-
-	getBS, err := f.GetBoolSlice("bs")
-	if err != nil {
-		t.Fatal("got an error from GetBoolSlice():", err)
-	}
-	for i, v := range getBS {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatal("got an error from GetBoolSlice():", err)
-		}
-		if b != v {
-			t.Fatalf("expected bs[%d] to be %t from GetBoolSlice but got: %t", i, b, v)
-		}
-	}
-}
-
-func TestBSWithDefault(t *testing.T) {
-	var bs []bool
-	f := setUpBSFlagSetWithDefault(&bs)
-
-	vals := []string{"FALSE", "1"}
-	arg := fmt.Sprintf("--bs=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range bs {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if b != v {
-			t.Fatalf("expected bs[%d] to be %t but got: %t", i, b, v)
-		}
-	}
-
-	getBS, err := f.GetBoolSlice("bs")
-	if err != nil {
-		t.Fatal("got an error from GetBoolSlice():", err)
-	}
-	for i, v := range getBS {
-		b, err := strconv.ParseBool(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if b != v {
-			t.Fatalf("expected bs[%d] to be %t from GetBoolSlice but got: %t", i, b, v)
-		}
-	}
-}
-
-func TestBSCalledTwice(t *testing.T) {
-	var bs []bool
-	f := setUpBSFlagSet(&bs)
-
-	in := []string{"T,F", "T"}
-	expected := []bool{true, false, true}
-	argfmt := "--bs=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range bs {
-		if expected[i] != v {
-			t.Fatalf("expected bs[%d] to be %t but got %t", i, expected[i], v)
-		}
-	}
-}
-
-func TestBSBadQuoting(t *testing.T) {
-
-	tests := []struct {
-		Want    []bool
-		FlagArg []string
-	}{
-		{
-			Want:    []bool{true, false, true},
-			FlagArg: []string{"1", "0", "true"},
-		},
-		{
-			Want:    []bool{true, false},
-			FlagArg: []string{"True", "F"},
-		},
-		{
-			Want:    []bool{true, false},
-			FlagArg: []string{"T", "0"},
-		},
-		{
-			Want:    []bool{true, false},
-			FlagArg: []string{"1", "0"},
-		},
-		{
-			Want:    []bool{true, false, false},
-			FlagArg: []string{"true,false", "false"},
-		},
-		{
-			Want:    []bool{true, false, false, true, false, true, false},
-			FlagArg: []string{`"true,false,false,1,0,     T"`, " false "},
-		},
-		{
-			Want:    []bool{false, false, true, false, true, false, true},
-			FlagArg: []string{`"0, False,  T,false  , true,F"`, "true"},
-		},
-	}
-
-	for i, test := range tests {
-
-		var bs []bool
-		f := setUpBSFlagSet(&bs)
-
-		if err := f.Parse([]string{fmt.Sprintf("--bs=%s", strings.Join(test.FlagArg, ","))}); err != nil {
-			t.Fatalf("flag parsing failed with error: %s\nparsing:\t%#v\nwant:\t\t%#v",
-				err, test.FlagArg, test.Want[i])
-		}
-
-		for j, b := range bs {
-			if b != test.Want[j] {
-				t.Fatalf("bad value parsed for test %d on bool %d:\nwant:\t%t\ngot:\t%t", i, j, test.Want[j], b)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/bool_test.go b/installer/vendor/github.com/spf13/pflag/bool_test.go
deleted file mode 100644
index a4319e79fc..0000000000
--- a/installer/vendor/github.com/spf13/pflag/bool_test.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"bytes"
-	"strconv"
-	"testing"
-)
-
-// This value can be a boolean ("true", "false") or "maybe"
-type triStateValue int
-
-const (
-	triStateFalse triStateValue = 0
-	triStateTrue  triStateValue = 1
-	triStateMaybe triStateValue = 2
-)
-
-const strTriStateMaybe = "maybe"
-
-func (v *triStateValue) IsBoolFlag() bool {
-	return true
-}
-
-func (v *triStateValue) Get() interface{} {
-	return triStateValue(*v)
-}
-
-func (v *triStateValue) Set(s string) error {
-	if s == strTriStateMaybe {
-		*v = triStateMaybe
-		return nil
-	}
-	boolVal, err := strconv.ParseBool(s)
-	if boolVal {
-		*v = triStateTrue
-	} else {
-		*v = triStateFalse
-	}
-	return err
-}
-
-func (v *triStateValue) String() string {
-	if *v == triStateMaybe {
-		return strTriStateMaybe
-	}
-	return strconv.FormatBool(*v == triStateTrue)
-}
-
-// The type of the flag as required by the pflag.Value interface
-func (v *triStateValue) Type() string {
-	return "version"
-}
-
-func setUpFlagSet(tristate *triStateValue) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	*tristate = triStateFalse
-	flag := f.VarPF(tristate, "tristate", "t", "tristate value (true, maybe or false)")
-	flag.NoOptDefVal = "true"
-	return f
-}
-
-func TestExplicitTrue(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{"--tristate=true"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateTrue {
-		t.Fatal("expected", triStateTrue, "(triStateTrue) but got", tristate, "instead")
-	}
-}
-
-func TestImplicitTrue(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{"--tristate"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateTrue {
-		t.Fatal("expected", triStateTrue, "(triStateTrue) but got", tristate, "instead")
-	}
-}
-
-func TestShortFlag(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{"-t"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateTrue {
-		t.Fatal("expected", triStateTrue, "(triStateTrue) but got", tristate, "instead")
-	}
-}
-
-func TestShortFlagExtraArgument(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	// The"maybe"turns into an arg, since short boolean options will only do true/false
-	err := f.Parse([]string{"-t", "maybe"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateTrue {
-		t.Fatal("expected", triStateTrue, "(triStateTrue) but got", tristate, "instead")
-	}
-	args := f.Args()
-	if len(args) != 1 || args[0] != "maybe" {
-		t.Fatal("expected an extra 'maybe' argument to stick around")
-	}
-}
-
-func TestExplicitMaybe(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{"--tristate=maybe"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateMaybe {
-		t.Fatal("expected", triStateMaybe, "(triStateMaybe) but got", tristate, "instead")
-	}
-}
-
-func TestExplicitFalse(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{"--tristate=false"})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateFalse {
-		t.Fatal("expected", triStateFalse, "(triStateFalse) but got", tristate, "instead")
-	}
-}
-
-func TestImplicitFalse(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	if tristate != triStateFalse {
-		t.Fatal("expected", triStateFalse, "(triStateFalse) but got", tristate, "instead")
-	}
-}
-
-func TestInvalidValue(t *testing.T) {
-	var tristate triStateValue
-	f := setUpFlagSet(&tristate)
-	var buf bytes.Buffer
-	f.SetOutput(&buf)
-	err := f.Parse([]string{"--tristate=invalid"})
-	if err == nil {
-		t.Fatal("expected an error but did not get any, tristate has value", tristate)
-	}
-}
-
-func TestBoolP(t *testing.T) {
-	b := BoolP("bool", "b", false, "bool value in CommandLine")
-	c := BoolP("c", "c", false, "other bool value")
-	args := []string{"--bool"}
-	if err := CommandLine.Parse(args); err != nil {
-		t.Error("expected no error, got ", err)
-	}
-	if *b != true {
-		t.Errorf("expected b=true got b=%v", *b)
-	}
-	if *c != false {
-		t.Errorf("expect c=false got c=%v", *c)
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/bytes.go b/installer/vendor/github.com/spf13/pflag/bytes.go
new file mode 100644
index 0000000000..12c58db9fe
--- /dev/null
+++ b/installer/vendor/github.com/spf13/pflag/bytes.go
@@ -0,0 +1,105 @@
+package pflag
+
+import (
+	"encoding/hex"
+	"fmt"
+	"strings"
+)
+
+// BytesHex adapts []byte for use as a flag. Value of flag is HEX encoded
+type bytesHexValue []byte
+
+func (bytesHex bytesHexValue) String() string {
+	return fmt.Sprintf("%X", []byte(bytesHex))
+}
+
+func (bytesHex *bytesHexValue) Set(value string) error {
+	bin, err := hex.DecodeString(strings.TrimSpace(value))
+
+	if err != nil {
+		return err
+	}
+
+	*bytesHex = bin
+
+	return nil
+}
+
+func (*bytesHexValue) Type() string {
+	return "bytesHex"
+}
+
+func newBytesHexValue(val []byte, p *[]byte) *bytesHexValue {
+	*p = val
+	return (*bytesHexValue)(p)
+}
+
+func bytesHexConv(sval string) (interface{}, error) {
+
+	bin, err := hex.DecodeString(sval)
+
+	if err == nil {
+		return bin, nil
+	}
+
+	return nil, fmt.Errorf("invalid string being converted to Bytes: %s %s", sval, err)
+}
+
+// GetBytesHex return the []byte value of a flag with the given name
+func (f *FlagSet) GetBytesHex(name string) ([]byte, error) {
+	val, err := f.getFlagType(name, "bytesHex", bytesHexConv)
+
+	if err != nil {
+		return []byte{}, err
+	}
+
+	return val.([]byte), nil
+}
+
+// BytesHexVar defines an []byte flag with specified name, default value, and usage string.
+// The argument p points to an []byte variable in which to store the value of the flag.
+func (f *FlagSet) BytesHexVar(p *[]byte, name string, value []byte, usage string) {
+	f.VarP(newBytesHexValue(value, p), name, "", usage)
+}
+
+// BytesHexVarP is like BytesHexVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) BytesHexVarP(p *[]byte, name, shorthand string, value []byte, usage string) {
+	f.VarP(newBytesHexValue(value, p), name, shorthand, usage)
+}
+
+// BytesHexVar defines an []byte flag with specified name, default value, and usage string.
+// The argument p points to an []byte variable in which to store the value of the flag.
+func BytesHexVar(p *[]byte, name string, value []byte, usage string) {
+	CommandLine.VarP(newBytesHexValue(value, p), name, "", usage)
+}
+
+// BytesHexVarP is like BytesHexVar, but accepts a shorthand letter that can be used after a single dash.
+func BytesHexVarP(p *[]byte, name, shorthand string, value []byte, usage string) {
+	CommandLine.VarP(newBytesHexValue(value, p), name, shorthand, usage)
+}
+
+// BytesHex defines an []byte flag with specified name, default value, and usage string.
+// The return value is the address of an []byte variable that stores the value of the flag.
+func (f *FlagSet) BytesHex(name string, value []byte, usage string) *[]byte {
+	p := new([]byte)
+	f.BytesHexVarP(p, name, "", value, usage)
+	return p
+}
+
+// BytesHexP is like BytesHex, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) BytesHexP(name, shorthand string, value []byte, usage string) *[]byte {
+	p := new([]byte)
+	f.BytesHexVarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// BytesHex defines an []byte flag with specified name, default value, and usage string.
+// The return value is the address of an []byte variable that stores the value of the flag.
+func BytesHex(name string, value []byte, usage string) *[]byte {
+	return CommandLine.BytesHexP(name, "", value, usage)
+}
+
+// BytesHexP is like BytesHex, but accepts a shorthand letter that can be used after a single dash.
+func BytesHexP(name, shorthand string, value []byte, usage string) *[]byte {
+	return CommandLine.BytesHexP(name, shorthand, value, usage)
+}
diff --git a/installer/vendor/github.com/spf13/pflag/count.go b/installer/vendor/github.com/spf13/pflag/count.go
index 250a43814c..aa126e44d1 100644
--- a/installer/vendor/github.com/spf13/pflag/count.go
+++ b/installer/vendor/github.com/spf13/pflag/count.go
@@ -11,13 +11,13 @@ func newCountValue(val int, p *int) *countValue {
 }
 
 func (i *countValue) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	// -1 means that no specific value was passed, so increment
-	if v == -1 {
+	// "+1" means that no specific value was passed, so increment
+	if s == "+1" {
 		*i = countValue(*i + 1)
-	} else {
-		*i = countValue(v)
+		return nil
 	}
+	v, err := strconv.ParseInt(s, 0, 0)
+	*i = countValue(v)
 	return err
 }
 
@@ -54,7 +54,7 @@ func (f *FlagSet) CountVar(p *int, name string, usage string) {
 // CountVarP is like CountVar only take a shorthand for the flag name.
 func (f *FlagSet) CountVarP(p *int, name, shorthand string, usage string) {
 	flag := f.VarPF(newCountValue(0, p), name, shorthand, usage)
-	flag.NoOptDefVal = "-1"
+	flag.NoOptDefVal = "+1"
 }
 
 // CountVar like CountVar only the flag is placed on the CommandLine instead of a given flag set
diff --git a/installer/vendor/github.com/spf13/pflag/count_test.go b/installer/vendor/github.com/spf13/pflag/count_test.go
deleted file mode 100644
index 460d96a6f1..0000000000
--- a/installer/vendor/github.com/spf13/pflag/count_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package pflag
-
-import (
-	"os"
-	"testing"
-)
-
-func setUpCount(c *int) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.CountVarP(c, "verbose", "v", "a counter")
-	return f
-}
-
-func TestCount(t *testing.T) {
-	testCases := []struct {
-		input    []string
-		success  bool
-		expected int
-	}{
-		{[]string{"-vvv"}, true, 3},
-		{[]string{"-v", "-v", "-v"}, true, 3},
-		{[]string{"-v", "--verbose", "-v"}, true, 3},
-		{[]string{"-v=3", "-v"}, true, 4},
-		{[]string{"-v=a"}, false, 0},
-	}
-
-	devnull, _ := os.Open(os.DevNull)
-	os.Stderr = devnull
-	for i := range testCases {
-		var count int
-		f := setUpCount(&count)
-
-		tc := &testCases[i]
-
-		err := f.Parse(tc.input)
-		if err != nil && tc.success == true {
-			t.Errorf("expected success, got %q", err)
-			continue
-		} else if err == nil && tc.success == false {
-			t.Errorf("expected failure, got success")
-			continue
-		} else if tc.success {
-			c, err := f.GetCount("verbose")
-			if err != nil {
-				t.Errorf("Got error trying to fetch the counter flag")
-			}
-			if c != tc.expected {
-				t.Errorf("expected %q, got %q", tc.expected, c)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/duration_slice.go b/installer/vendor/github.com/spf13/pflag/duration_slice.go
new file mode 100644
index 0000000000..52c6b6dc10
--- /dev/null
+++ b/installer/vendor/github.com/spf13/pflag/duration_slice.go
@@ -0,0 +1,128 @@
+package pflag
+
+import (
+	"fmt"
+	"strings"
+	"time"
+)
+
+// -- durationSlice Value
+type durationSliceValue struct {
+	value   *[]time.Duration
+	changed bool
+}
+
+func newDurationSliceValue(val []time.Duration, p *[]time.Duration) *durationSliceValue {
+	dsv := new(durationSliceValue)
+	dsv.value = p
+	*dsv.value = val
+	return dsv
+}
+
+func (s *durationSliceValue) Set(val string) error {
+	ss := strings.Split(val, ",")
+	out := make([]time.Duration, len(ss))
+	for i, d := range ss {
+		var err error
+		out[i], err = time.ParseDuration(d)
+		if err != nil {
+			return err
+		}
+
+	}
+	if !s.changed {
+		*s.value = out
+	} else {
+		*s.value = append(*s.value, out...)
+	}
+	s.changed = true
+	return nil
+}
+
+func (s *durationSliceValue) Type() string {
+	return "durationSlice"
+}
+
+func (s *durationSliceValue) String() string {
+	out := make([]string, len(*s.value))
+	for i, d := range *s.value {
+		out[i] = fmt.Sprintf("%s", d)
+	}
+	return "[" + strings.Join(out, ",") + "]"
+}
+
+func durationSliceConv(val string) (interface{}, error) {
+	val = strings.Trim(val, "[]")
+	// Empty string would cause a slice with one (empty) entry
+	if len(val) == 0 {
+		return []time.Duration{}, nil
+	}
+	ss := strings.Split(val, ",")
+	out := make([]time.Duration, len(ss))
+	for i, d := range ss {
+		var err error
+		out[i], err = time.ParseDuration(d)
+		if err != nil {
+			return nil, err
+		}
+
+	}
+	return out, nil
+}
+
+// GetDurationSlice returns the []time.Duration value of a flag with the given name
+func (f *FlagSet) GetDurationSlice(name string) ([]time.Duration, error) {
+	val, err := f.getFlagType(name, "durationSlice", durationSliceConv)
+	if err != nil {
+		return []time.Duration{}, err
+	}
+	return val.([]time.Duration), nil
+}
+
+// DurationSliceVar defines a durationSlice flag with specified name, default value, and usage string.
+// The argument p points to a []time.Duration variable in which to store the value of the flag.
+func (f *FlagSet) DurationSliceVar(p *[]time.Duration, name string, value []time.Duration, usage string) {
+	f.VarP(newDurationSliceValue(value, p), name, "", usage)
+}
+
+// DurationSliceVarP is like DurationSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) DurationSliceVarP(p *[]time.Duration, name, shorthand string, value []time.Duration, usage string) {
+	f.VarP(newDurationSliceValue(value, p), name, shorthand, usage)
+}
+
+// DurationSliceVar defines a duration[] flag with specified name, default value, and usage string.
+// The argument p points to a duration[] variable in which to store the value of the flag.
+func DurationSliceVar(p *[]time.Duration, name string, value []time.Duration, usage string) {
+	CommandLine.VarP(newDurationSliceValue(value, p), name, "", usage)
+}
+
+// DurationSliceVarP is like DurationSliceVar, but accepts a shorthand letter that can be used after a single dash.
+func DurationSliceVarP(p *[]time.Duration, name, shorthand string, value []time.Duration, usage string) {
+	CommandLine.VarP(newDurationSliceValue(value, p), name, shorthand, usage)
+}
+
+// DurationSlice defines a []time.Duration flag with specified name, default value, and usage string.
+// The return value is the address of a []time.Duration variable that stores the value of the flag.
+func (f *FlagSet) DurationSlice(name string, value []time.Duration, usage string) *[]time.Duration {
+	p := []time.Duration{}
+	f.DurationSliceVarP(&p, name, "", value, usage)
+	return &p
+}
+
+// DurationSliceP is like DurationSlice, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) DurationSliceP(name, shorthand string, value []time.Duration, usage string) *[]time.Duration {
+	p := []time.Duration{}
+	f.DurationSliceVarP(&p, name, shorthand, value, usage)
+	return &p
+}
+
+// DurationSlice defines a []time.Duration flag with specified name, default value, and usage string.
+// The return value is the address of a []time.Duration variable that stores the value of the flag.
+func DurationSlice(name string, value []time.Duration, usage string) *[]time.Duration {
+	return CommandLine.DurationSliceP(name, "", value, usage)
+}
+
+// DurationSliceP is like DurationSlice, but accepts a shorthand letter that can be used after a single dash.
+func DurationSliceP(name, shorthand string, value []time.Duration, usage string) *[]time.Duration {
+	return CommandLine.DurationSliceP(name, shorthand, value, usage)
+}
diff --git a/installer/vendor/github.com/spf13/pflag/example_test.go b/installer/vendor/github.com/spf13/pflag/example_test.go
deleted file mode 100644
index abd7806fad..0000000000
--- a/installer/vendor/github.com/spf13/pflag/example_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag_test
-
-import (
-	"fmt"
-
-	"github.com/spf13/pflag"
-)
-
-func ExampleShorthandLookup() {
-	name := "verbose"
-	short := name[:1]
-
-	pflag.BoolP(name, short, false, "verbose output")
-
-	// len(short) must be == 1
-	flag := pflag.ShorthandLookup(short)
-
-	fmt.Println(flag.Name)
-}
-
-func ExampleFlagSet_ShorthandLookup() {
-	name := "verbose"
-	short := name[:1]
-
-	fs := pflag.NewFlagSet("Example", pflag.ContinueOnError)
-	fs.BoolP(name, short, false, "verbose output")
-
-	// len(short) must be == 1
-	flag := fs.ShorthandLookup(short)
-
-	fmt.Println(flag.Name)
-}
diff --git a/installer/vendor/github.com/spf13/pflag/export_test.go b/installer/vendor/github.com/spf13/pflag/export_test.go
deleted file mode 100644
index 9318fee00e..0000000000
--- a/installer/vendor/github.com/spf13/pflag/export_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"io/ioutil"
-	"os"
-)
-
-// Additional routines compiled into the package only during testing.
-
-// ResetForTesting clears all flag state and sets the usage function as directed.
-// After calling ResetForTesting, parse errors in flag handling will not
-// exit the program.
-func ResetForTesting(usage func()) {
-	CommandLine = &FlagSet{
-		name:          os.Args[0],
-		errorHandling: ContinueOnError,
-		output:        ioutil.Discard,
-	}
-	Usage = usage
-}
-
-// GetCommandLine returns the default FlagSet.
-func GetCommandLine() *FlagSet {
-	return CommandLine
-}
diff --git a/installer/vendor/github.com/spf13/pflag/flag.go b/installer/vendor/github.com/spf13/pflag/flag.go
index 6f1fc3007a..5eadc84e3c 100644
--- a/installer/vendor/github.com/spf13/pflag/flag.go
+++ b/installer/vendor/github.com/spf13/pflag/flag.go
@@ -101,6 +101,7 @@ package pflag
 import (
 	"bytes"
 	"errors"
+	goflag "flag"
 	"fmt"
 	"io"
 	"os"
@@ -123,6 +124,12 @@ const (
 	PanicOnError
 )
 
+// ParseErrorsWhitelist defines the parsing errors that can be ignored
+type ParseErrorsWhitelist struct {
+	// UnknownFlags will ignore unknown flags errors and continue parsing rest of the flags
+	UnknownFlags bool
+}
+
 // NormalizedName is a flag name that has been normalized according to rules
 // for the FlagSet (e.g. making '-' and '_' equivalent).
 type NormalizedName string
@@ -138,6 +145,9 @@ type FlagSet struct {
 	// help/usage messages.
 	SortFlags bool
 
+	// ParseErrorsWhitelist is used to configure a whitelist of errors
+	ParseErrorsWhitelist ParseErrorsWhitelist
+
 	name              string
 	parsed            bool
 	actual            map[NormalizedName]*Flag
@@ -153,6 +163,8 @@ type FlagSet struct {
 	output            io.Writer // nil means stderr; use out() accessor
 	interspersed      bool      // allow interspersed option/non-option args
 	normalizeNameFunc func(f *FlagSet, name string) NormalizedName
+
+	addedGoFlagSets []*goflag.FlagSet
 }
 
 // A Flag represents the state of a flag.
@@ -202,12 +214,18 @@ func sortFlags(flags map[NormalizedName]*Flag) []*Flag {
 func (f *FlagSet) SetNormalizeFunc(n func(f *FlagSet, name string) NormalizedName) {
 	f.normalizeNameFunc = n
 	f.sortedFormal = f.sortedFormal[:0]
-	for k, v := range f.orderedFormal {
-		delete(f.formal, NormalizedName(v.Name))
-		nname := f.normalizeFlagName(v.Name)
-		v.Name = string(nname)
-		f.formal[nname] = v
-		f.orderedFormal[k] = v
+	for fname, flag := range f.formal {
+		nname := f.normalizeFlagName(flag.Name)
+		if fname == nname {
+			continue
+		}
+		flag.Name = string(nname)
+		delete(f.formal, fname)
+		f.formal[nname] = flag
+		if _, set := f.actual[fname]; set {
+			delete(f.actual, fname)
+			f.actual[nname] = flag
+		}
 	}
 }
 
@@ -261,16 +279,16 @@ func (f *FlagSet) VisitAll(fn func(*Flag)) {
 	}
 }
 
-// HasFlags returns a bool to indicate if the FlagSet has any flags definied.
+// HasFlags returns a bool to indicate if the FlagSet has any flags defined.
 func (f *FlagSet) HasFlags() bool {
 	return len(f.formal) > 0
 }
 
 // HasAvailableFlags returns a bool to indicate if the FlagSet has any flags
-// definied that are not hidden or deprecated.
+// that are not hidden.
 func (f *FlagSet) HasAvailableFlags() bool {
 	for _, flag := range f.formal {
-		if !flag.Hidden && len(flag.Deprecated) == 0 {
+		if !flag.Hidden {
 			return true
 		}
 	}
@@ -380,6 +398,7 @@ func (f *FlagSet) MarkDeprecated(name string, usageMessage string) error {
 		return fmt.Errorf("deprecated message for flag %q must be set", name)
 	}
 	flag.Deprecated = usageMessage
+	flag.Hidden = true
 	return nil
 }
 
@@ -440,13 +459,15 @@ func (f *FlagSet) Set(name, value string) error {
 		return fmt.Errorf("invalid argument %q for %q flag: %v", value, flagName, err)
 	}
 
-	if f.actual == nil {
-		f.actual = make(map[NormalizedName]*Flag)
-	}
-	f.actual[normalName] = flag
-	f.orderedActual = append(f.orderedActual, flag)
+	if !flag.Changed {
+		if f.actual == nil {
+			f.actual = make(map[NormalizedName]*Flag)
+		}
+		f.actual[normalName] = flag
+		f.orderedActual = append(f.orderedActual, flag)
 
-	flag.Changed = true
+		flag.Changed = true
+	}
 
 	if flag.Deprecated != "" {
 		fmt.Fprintf(f.out(), "Flag --%s has been deprecated, %s\n", flag.Name, flag.Deprecated)
@@ -556,6 +577,14 @@ func UnquoteUsage(flag *Flag) (name string, usage string) {
 		name = "int"
 	case "uint64":
 		name = "uint"
+	case "stringSlice":
+		name = "strings"
+	case "intSlice":
+		name = "ints"
+	case "uintSlice":
+		name = "uints"
+	case "boolSlice":
+		name = "bools"
 	}
 
 	return
@@ -570,11 +599,14 @@ func wrapN(i, slop int, s string) (string, string) {
 		return s, ""
 	}
 
-	w := strings.LastIndexAny(s[:i], " \t")
+	w := strings.LastIndexAny(s[:i], " \t\n")
 	if w <= 0 {
 		return s, ""
 	}
-
+	nlPos := strings.LastIndex(s[:i], "\n")
+	if nlPos > 0 && nlPos < w {
+		return s[:nlPos], s[nlPos+1:]
+	}
 	return s[:w], s[w+1:]
 }
 
@@ -583,7 +615,7 @@ func wrapN(i, slop int, s string) (string, string) {
 // caller). Pass `w` == 0 to do no wrapping
 func wrap(i, w int, s string) string {
 	if w == 0 {
-		return s
+		return strings.Replace(s, "\n", "\n"+strings.Repeat(" ", i), -1)
 	}
 
 	// space between indent i and end of line width w into which
@@ -601,7 +633,7 @@ func wrap(i, w int, s string) string {
 	}
 	// If still not enough space then don't even try to wrap.
 	if wrap < 24 {
-		return s
+		return strings.Replace(s, "\n", r, -1)
 	}
 
 	// Try to avoid short orphan words on the final line, by
@@ -613,14 +645,14 @@ func wrap(i, w int, s string) string {
 	// Handle first line, which is indented by the caller (or the
 	// special case above)
 	l, s = wrapN(wrap, slop, s)
-	r = r + l
+	r = r + strings.Replace(l, "\n", "\n"+strings.Repeat(" ", i), -1)
 
 	// Now wrap the rest
 	for s != "" {
 		var t string
 
 		t, s = wrapN(wrap, slop, s)
-		r = r + "\n" + strings.Repeat(" ", i) + t
+		r = r + "\n" + strings.Repeat(" ", i) + strings.Replace(t, "\n", "\n"+strings.Repeat(" ", i), -1)
 	}
 
 	return r
@@ -637,7 +669,7 @@ func (f *FlagSet) FlagUsagesWrapped(cols int) string {
 
 	maxlen := 0
 	f.VisitAll(func(flag *Flag) {
-		if flag.Deprecated != "" || flag.Hidden {
+		if flag.Hidden {
 			return
 		}
 
@@ -660,6 +692,10 @@ func (f *FlagSet) FlagUsagesWrapped(cols int) string {
 				if flag.NoOptDefVal != "true" {
 					line += fmt.Sprintf("[=%s]", flag.NoOptDefVal)
 				}
+			case "count":
+				if flag.NoOptDefVal != "+1" {
+					line += fmt.Sprintf("[=%s]", flag.NoOptDefVal)
+				}
 			default:
 				line += fmt.Sprintf("[=%s]", flag.NoOptDefVal)
 			}
@@ -680,6 +716,9 @@ func (f *FlagSet) FlagUsagesWrapped(cols int) string {
 				line += fmt.Sprintf(" (default %s)", flag.DefValue)
 			}
 		}
+		if len(flag.Deprecated) != 0 {
+			line += fmt.Sprintf(" (DEPRECATED: %s)", flag.Deprecated)
+		}
 
 		lines = append(lines, line)
 	})
@@ -857,8 +896,10 @@ func VarP(value Value, name, shorthand, usage string) {
 // returns the error.
 func (f *FlagSet) failf(format string, a ...interface{}) error {
 	err := fmt.Errorf(format, a...)
-	fmt.Fprintln(f.out(), err)
-	f.usage()
+	if f.errorHandling != ContinueOnError {
+		fmt.Fprintln(f.out(), err)
+		f.usage()
+	}
 	return err
 }
 
@@ -874,6 +915,25 @@ func (f *FlagSet) usage() {
 	}
 }
 
+//--unknown (args will be empty)
+//--unknown --next-flag ... (args will be --next-flag ...)
+//--unknown arg ... (args will be arg ...)
+func stripUnknownFlagValue(args []string) []string {
+	if len(args) == 0 {
+		//--unknown
+		return args
+	}
+
+	first := args[0]
+	if first[0] == '-' {
+		//--unknown --next-flag ...
+		return args
+	}
+
+	//--unknown arg ... (args will be arg ...)
+	return args[1:]
+}
+
 func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []string, err error) {
 	a = args
 	name := s[2:]
@@ -885,13 +945,24 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin
 	split := strings.SplitN(name, "=", 2)
 	name = split[0]
 	flag, exists := f.formal[f.normalizeFlagName(name)]
+
 	if !exists {
-		if name == "help" { // special case for nice help message.
+		switch {
+		case name == "help":
 			f.usage()
 			return a, ErrHelp
+		case f.ParseErrorsWhitelist.UnknownFlags:
+			// --unknown=unknownval arg ...
+			// we do not want to lose arg in this case
+			if len(split) >= 2 {
+				return a, nil
+			}
+
+			return stripUnknownFlagValue(a), nil
+		default:
+			err = f.failf("unknown flag: --%s", name)
+			return
 		}
-		err = f.failf("unknown flag: --%s", name)
-		return
 	}
 
 	var value string
@@ -912,6 +983,9 @@ func (f *FlagSet) parseLongArg(s string, args []string, fn parseFunc) (a []strin
 	}
 
 	err = fn(flag, value)
+	if err != nil {
+		f.failf(err.Error())
+	}
 	return
 }
 
@@ -926,13 +1000,25 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse
 
 	flag, exists := f.shorthands[c]
 	if !exists {
-		if c == 'h' { // special case for nice help message.
+		switch {
+		case c == 'h':
 			f.usage()
 			err = ErrHelp
 			return
+		case f.ParseErrorsWhitelist.UnknownFlags:
+			// '-f=arg arg ...'
+			// we do not want to lose arg in this case
+			if len(shorthands) > 2 && shorthands[1] == '=' {
+				outShorts = ""
+				return
+			}
+
+			outArgs = stripUnknownFlagValue(outArgs)
+			return
+		default:
+			err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
+			return
 		}
-		err = f.failf("unknown shorthand flag: %q in -%s", c, shorthands)
-		return
 	}
 
 	var value string
@@ -962,6 +1048,9 @@ func (f *FlagSet) parseSingleShortArg(shorthands string, args []string, fn parse
 	}
 
 	err = fn(flag, value)
+	if err != nil {
+		f.failf(err.Error())
+	}
 	return
 }
 
@@ -1016,6 +1105,11 @@ func (f *FlagSet) parseArgs(args []string, fn parseFunc) (err error) {
 // are defined and before flags are accessed by the program.
 // The return value will be ErrHelp if -help was set but not defined.
 func (f *FlagSet) Parse(arguments []string) error {
+	if f.addedGoFlagSets != nil {
+		for _, goFlagSet := range f.addedGoFlagSets {
+			goFlagSet.Parse(nil)
+		}
+	}
 	f.parsed = true
 
 	if len(arguments) < 0 {
@@ -1034,6 +1128,7 @@ func (f *FlagSet) Parse(arguments []string) error {
 		case ContinueOnError:
 			return err
 		case ExitOnError:
+			fmt.Println(err)
 			os.Exit(2)
 		case PanicOnError:
 			panic(err)
diff --git a/installer/vendor/github.com/spf13/pflag/flag_test.go b/installer/vendor/github.com/spf13/pflag/flag_test.go
deleted file mode 100644
index c3def0fd41..0000000000
--- a/installer/vendor/github.com/spf13/pflag/flag_test.go
+++ /dev/null
@@ -1,1085 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-)
-
-var (
-	testBool                     = Bool("test_bool", false, "bool value")
-	testInt                      = Int("test_int", 0, "int value")
-	testInt64                    = Int64("test_int64", 0, "int64 value")
-	testUint                     = Uint("test_uint", 0, "uint value")
-	testUint64                   = Uint64("test_uint64", 0, "uint64 value")
-	testString                   = String("test_string", "0", "string value")
-	testFloat                    = Float64("test_float64", 0, "float64 value")
-	testDuration                 = Duration("test_duration", 0, "time.Duration value")
-	testOptionalInt              = Int("test_optional_int", 0, "optional int value")
-	normalizeFlagNameInvocations = 0
-)
-
-func boolString(s string) string {
-	if s == "0" {
-		return "false"
-	}
-	return "true"
-}
-
-func TestEverything(t *testing.T) {
-	m := make(map[string]*Flag)
-	desired := "0"
-	visitor := func(f *Flag) {
-		if len(f.Name) > 5 && f.Name[0:5] == "test_" {
-			m[f.Name] = f
-			ok := false
-			switch {
-			case f.Value.String() == desired:
-				ok = true
-			case f.Name == "test_bool" && f.Value.String() == boolString(desired):
-				ok = true
-			case f.Name == "test_duration" && f.Value.String() == desired+"s":
-				ok = true
-			}
-			if !ok {
-				t.Error("Visit: bad value", f.Value.String(), "for", f.Name)
-			}
-		}
-	}
-	VisitAll(visitor)
-	if len(m) != 9 {
-		t.Error("VisitAll misses some flags")
-		for k, v := range m {
-			t.Log(k, *v)
-		}
-	}
-	m = make(map[string]*Flag)
-	Visit(visitor)
-	if len(m) != 0 {
-		t.Errorf("Visit sees unset flags")
-		for k, v := range m {
-			t.Log(k, *v)
-		}
-	}
-	// Now set all flags
-	Set("test_bool", "true")
-	Set("test_int", "1")
-	Set("test_int64", "1")
-	Set("test_uint", "1")
-	Set("test_uint64", "1")
-	Set("test_string", "1")
-	Set("test_float64", "1")
-	Set("test_duration", "1s")
-	Set("test_optional_int", "1")
-	desired = "1"
-	Visit(visitor)
-	if len(m) != 9 {
-		t.Error("Visit fails after set")
-		for k, v := range m {
-			t.Log(k, *v)
-		}
-	}
-	// Now test they're visited in sort order.
-	var flagNames []string
-	Visit(func(f *Flag) { flagNames = append(flagNames, f.Name) })
-	if !sort.StringsAreSorted(flagNames) {
-		t.Errorf("flag names not sorted: %v", flagNames)
-	}
-}
-
-func TestUsage(t *testing.T) {
-	called := false
-	ResetForTesting(func() { called = true })
-	if GetCommandLine().Parse([]string{"--x"}) == nil {
-		t.Error("parse did not fail for unknown flag")
-	}
-	if !called {
-		t.Error("did not call Usage for unknown flag")
-	}
-}
-
-func TestAddFlagSet(t *testing.T) {
-	oldSet := NewFlagSet("old", ContinueOnError)
-	newSet := NewFlagSet("new", ContinueOnError)
-
-	oldSet.String("flag1", "flag1", "flag1")
-	oldSet.String("flag2", "flag2", "flag2")
-
-	newSet.String("flag2", "flag2", "flag2")
-	newSet.String("flag3", "flag3", "flag3")
-
-	oldSet.AddFlagSet(newSet)
-
-	if len(oldSet.formal) != 3 {
-		t.Errorf("Unexpected result adding a FlagSet to a FlagSet %v", oldSet)
-	}
-}
-
-func TestAnnotation(t *testing.T) {
-	f := NewFlagSet("shorthand", ContinueOnError)
-
-	if err := f.SetAnnotation("missing-flag", "key", nil); err == nil {
-		t.Errorf("Expected error setting annotation on non-existent flag")
-	}
-
-	f.StringP("stringa", "a", "", "string value")
-	if err := f.SetAnnotation("stringa", "key", nil); err != nil {
-		t.Errorf("Unexpected error setting new nil annotation: %v", err)
-	}
-	if annotation := f.Lookup("stringa").Annotations["key"]; annotation != nil {
-		t.Errorf("Unexpected annotation: %v", annotation)
-	}
-
-	f.StringP("stringb", "b", "", "string2 value")
-	if err := f.SetAnnotation("stringb", "key", []string{"value1"}); err != nil {
-		t.Errorf("Unexpected error setting new annotation: %v", err)
-	}
-	if annotation := f.Lookup("stringb").Annotations["key"]; !reflect.DeepEqual(annotation, []string{"value1"}) {
-		t.Errorf("Unexpected annotation: %v", annotation)
-	}
-
-	if err := f.SetAnnotation("stringb", "key", []string{"value2"}); err != nil {
-		t.Errorf("Unexpected error updating annotation: %v", err)
-	}
-	if annotation := f.Lookup("stringb").Annotations["key"]; !reflect.DeepEqual(annotation, []string{"value2"}) {
-		t.Errorf("Unexpected annotation: %v", annotation)
-	}
-}
-
-func testParse(f *FlagSet, t *testing.T) {
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	boolFlag := f.Bool("bool", false, "bool value")
-	bool2Flag := f.Bool("bool2", false, "bool2 value")
-	bool3Flag := f.Bool("bool3", false, "bool3 value")
-	intFlag := f.Int("int", 0, "int value")
-	int8Flag := f.Int8("int8", 0, "int value")
-	int32Flag := f.Int32("int32", 0, "int value")
-	int64Flag := f.Int64("int64", 0, "int64 value")
-	uintFlag := f.Uint("uint", 0, "uint value")
-	uint8Flag := f.Uint8("uint8", 0, "uint value")
-	uint16Flag := f.Uint16("uint16", 0, "uint value")
-	uint32Flag := f.Uint32("uint32", 0, "uint value")
-	uint64Flag := f.Uint64("uint64", 0, "uint64 value")
-	stringFlag := f.String("string", "0", "string value")
-	float32Flag := f.Float32("float32", 0, "float32 value")
-	float64Flag := f.Float64("float64", 0, "float64 value")
-	ipFlag := f.IP("ip", net.ParseIP("127.0.0.1"), "ip value")
-	maskFlag := f.IPMask("mask", ParseIPv4Mask("0.0.0.0"), "mask value")
-	durationFlag := f.Duration("duration", 5*time.Second, "time.Duration value")
-	optionalIntNoValueFlag := f.Int("optional-int-no-value", 0, "int value")
-	f.Lookup("optional-int-no-value").NoOptDefVal = "9"
-	optionalIntWithValueFlag := f.Int("optional-int-with-value", 0, "int value")
-	f.Lookup("optional-int-no-value").NoOptDefVal = "9"
-	extra := "one-extra-argument"
-	args := []string{
-		"--bool",
-		"--bool2=true",
-		"--bool3=false",
-		"--int=22",
-		"--int8=-8",
-		"--int32=-32",
-		"--int64=0x23",
-		"--uint", "24",
-		"--uint8=8",
-		"--uint16=16",
-		"--uint32=32",
-		"--uint64=25",
-		"--string=hello",
-		"--float32=-172e12",
-		"--float64=2718e28",
-		"--ip=10.11.12.13",
-		"--mask=255.255.255.0",
-		"--duration=2m",
-		"--optional-int-no-value",
-		"--optional-int-with-value=42",
-		extra,
-	}
-	if err := f.Parse(args); err != nil {
-		t.Fatal(err)
-	}
-	if !f.Parsed() {
-		t.Error("f.Parse() = false after Parse")
-	}
-	if *boolFlag != true {
-		t.Error("bool flag should be true, is ", *boolFlag)
-	}
-	if v, err := f.GetBool("bool"); err != nil || v != *boolFlag {
-		t.Error("GetBool does not work.")
-	}
-	if *bool2Flag != true {
-		t.Error("bool2 flag should be true, is ", *bool2Flag)
-	}
-	if *bool3Flag != false {
-		t.Error("bool3 flag should be false, is ", *bool2Flag)
-	}
-	if *intFlag != 22 {
-		t.Error("int flag should be 22, is ", *intFlag)
-	}
-	if v, err := f.GetInt("int"); err != nil || v != *intFlag {
-		t.Error("GetInt does not work.")
-	}
-	if *int8Flag != -8 {
-		t.Error("int8 flag should be 0x23, is ", *int8Flag)
-	}
-	if v, err := f.GetInt8("int8"); err != nil || v != *int8Flag {
-		t.Error("GetInt8 does not work.")
-	}
-	if *int32Flag != -32 {
-		t.Error("int32 flag should be 0x23, is ", *int32Flag)
-	}
-	if v, err := f.GetInt32("int32"); err != nil || v != *int32Flag {
-		t.Error("GetInt32 does not work.")
-	}
-	if *int64Flag != 0x23 {
-		t.Error("int64 flag should be 0x23, is ", *int64Flag)
-	}
-	if v, err := f.GetInt64("int64"); err != nil || v != *int64Flag {
-		t.Error("GetInt64 does not work.")
-	}
-	if *uintFlag != 24 {
-		t.Error("uint flag should be 24, is ", *uintFlag)
-	}
-	if v, err := f.GetUint("uint"); err != nil || v != *uintFlag {
-		t.Error("GetUint does not work.")
-	}
-	if *uint8Flag != 8 {
-		t.Error("uint8 flag should be 8, is ", *uint8Flag)
-	}
-	if v, err := f.GetUint8("uint8"); err != nil || v != *uint8Flag {
-		t.Error("GetUint8 does not work.")
-	}
-	if *uint16Flag != 16 {
-		t.Error("uint16 flag should be 16, is ", *uint16Flag)
-	}
-	if v, err := f.GetUint16("uint16"); err != nil || v != *uint16Flag {
-		t.Error("GetUint16 does not work.")
-	}
-	if *uint32Flag != 32 {
-		t.Error("uint32 flag should be 32, is ", *uint32Flag)
-	}
-	if v, err := f.GetUint32("uint32"); err != nil || v != *uint32Flag {
-		t.Error("GetUint32 does not work.")
-	}
-	if *uint64Flag != 25 {
-		t.Error("uint64 flag should be 25, is ", *uint64Flag)
-	}
-	if v, err := f.GetUint64("uint64"); err != nil || v != *uint64Flag {
-		t.Error("GetUint64 does not work.")
-	}
-	if *stringFlag != "hello" {
-		t.Error("string flag should be `hello`, is ", *stringFlag)
-	}
-	if v, err := f.GetString("string"); err != nil || v != *stringFlag {
-		t.Error("GetString does not work.")
-	}
-	if *float32Flag != -172e12 {
-		t.Error("float32 flag should be -172e12, is ", *float32Flag)
-	}
-	if v, err := f.GetFloat32("float32"); err != nil || v != *float32Flag {
-		t.Errorf("GetFloat32 returned %v but float32Flag was %v", v, *float32Flag)
-	}
-	if *float64Flag != 2718e28 {
-		t.Error("float64 flag should be 2718e28, is ", *float64Flag)
-	}
-	if v, err := f.GetFloat64("float64"); err != nil || v != *float64Flag {
-		t.Errorf("GetFloat64 returned %v but float64Flag was %v", v, *float64Flag)
-	}
-	if !(*ipFlag).Equal(net.ParseIP("10.11.12.13")) {
-		t.Error("ip flag should be 10.11.12.13, is ", *ipFlag)
-	}
-	if v, err := f.GetIP("ip"); err != nil || !v.Equal(*ipFlag) {
-		t.Errorf("GetIP returned %v but ipFlag was %v", v, *ipFlag)
-	}
-	if (*maskFlag).String() != ParseIPv4Mask("255.255.255.0").String() {
-		t.Error("mask flag should be 255.255.255.0, is ", (*maskFlag).String())
-	}
-	if v, err := f.GetIPv4Mask("mask"); err != nil || v.String() != (*maskFlag).String() {
-		t.Errorf("GetIP returned %v maskFlag was %v error was %v", v, *maskFlag, err)
-	}
-	if *durationFlag != 2*time.Minute {
-		t.Error("duration flag should be 2m, is ", *durationFlag)
-	}
-	if v, err := f.GetDuration("duration"); err != nil || v != *durationFlag {
-		t.Error("GetDuration does not work.")
-	}
-	if _, err := f.GetInt("duration"); err == nil {
-		t.Error("GetInt parsed a time.Duration?!?!")
-	}
-	if *optionalIntNoValueFlag != 9 {
-		t.Error("optional int flag should be the default value, is ", *optionalIntNoValueFlag)
-	}
-	if *optionalIntWithValueFlag != 42 {
-		t.Error("optional int flag should be 42, is ", *optionalIntWithValueFlag)
-	}
-	if len(f.Args()) != 1 {
-		t.Error("expected one argument, got", len(f.Args()))
-	} else if f.Args()[0] != extra {
-		t.Errorf("expected argument %q got %q", extra, f.Args()[0])
-	}
-}
-
-func testParseAll(f *FlagSet, t *testing.T) {
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	f.BoolP("boola", "a", false, "bool value")
-	f.BoolP("boolb", "b", false, "bool2 value")
-	f.BoolP("boolc", "c", false, "bool3 value")
-	f.BoolP("boold", "d", false, "bool4 value")
-	f.StringP("stringa", "s", "0", "string value")
-	f.StringP("stringz", "z", "0", "string value")
-	f.StringP("stringx", "x", "0", "string value")
-	f.StringP("stringy", "y", "0", "string value")
-	f.Lookup("stringx").NoOptDefVal = "1"
-	args := []string{
-		"-ab",
-		"-cs=xx",
-		"--stringz=something",
-		"-d=true",
-		"-x",
-		"-y",
-		"ee",
-	}
-	want := []string{
-		"boola", "true",
-		"boolb", "true",
-		"boolc", "true",
-		"stringa", "xx",
-		"stringz", "something",
-		"boold", "true",
-		"stringx", "1",
-		"stringy", "ee",
-	}
-	got := []string{}
-	store := func(flag *Flag, value string) error {
-		got = append(got, flag.Name)
-		if len(value) > 0 {
-			got = append(got, value)
-		}
-		return nil
-	}
-	if err := f.ParseAll(args, store); err != nil {
-		t.Errorf("expected no error, got %s", err)
-	}
-	if !f.Parsed() {
-		t.Errorf("f.Parse() = false after Parse")
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("f.ParseAll() fail to restore the args")
-		t.Errorf("Got: %v", got)
-		t.Errorf("Want: %v", want)
-	}
-}
-
-func TestShorthand(t *testing.T) {
-	f := NewFlagSet("shorthand", ContinueOnError)
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	boolaFlag := f.BoolP("boola", "a", false, "bool value")
-	boolbFlag := f.BoolP("boolb", "b", false, "bool2 value")
-	boolcFlag := f.BoolP("boolc", "c", false, "bool3 value")
-	booldFlag := f.BoolP("boold", "d", false, "bool4 value")
-	stringaFlag := f.StringP("stringa", "s", "0", "string value")
-	stringzFlag := f.StringP("stringz", "z", "0", "string value")
-	extra := "interspersed-argument"
-	notaflag := "--i-look-like-a-flag"
-	args := []string{
-		"-ab",
-		extra,
-		"-cs",
-		"hello",
-		"-z=something",
-		"-d=true",
-		"--",
-		notaflag,
-	}
-	f.SetOutput(ioutil.Discard)
-	if err := f.Parse(args); err != nil {
-		t.Error("expected no error, got ", err)
-	}
-	if !f.Parsed() {
-		t.Error("f.Parse() = false after Parse")
-	}
-	if *boolaFlag != true {
-		t.Error("boola flag should be true, is ", *boolaFlag)
-	}
-	if *boolbFlag != true {
-		t.Error("boolb flag should be true, is ", *boolbFlag)
-	}
-	if *boolcFlag != true {
-		t.Error("boolc flag should be true, is ", *boolcFlag)
-	}
-	if *booldFlag != true {
-		t.Error("boold flag should be true, is ", *booldFlag)
-	}
-	if *stringaFlag != "hello" {
-		t.Error("stringa flag should be `hello`, is ", *stringaFlag)
-	}
-	if *stringzFlag != "something" {
-		t.Error("stringz flag should be `something`, is ", *stringzFlag)
-	}
-	if len(f.Args()) != 2 {
-		t.Error("expected one argument, got", len(f.Args()))
-	} else if f.Args()[0] != extra {
-		t.Errorf("expected argument %q got %q", extra, f.Args()[0])
-	} else if f.Args()[1] != notaflag {
-		t.Errorf("expected argument %q got %q", notaflag, f.Args()[1])
-	}
-	if f.ArgsLenAtDash() != 1 {
-		t.Errorf("expected argsLenAtDash %d got %d", f.ArgsLenAtDash(), 1)
-	}
-}
-
-func TestShorthandLookup(t *testing.T) {
-	f := NewFlagSet("shorthand", ContinueOnError)
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	f.BoolP("boola", "a", false, "bool value")
-	f.BoolP("boolb", "b", false, "bool2 value")
-	args := []string{
-		"-ab",
-	}
-	f.SetOutput(ioutil.Discard)
-	if err := f.Parse(args); err != nil {
-		t.Error("expected no error, got ", err)
-	}
-	if !f.Parsed() {
-		t.Error("f.Parse() = false after Parse")
-	}
-	flag := f.ShorthandLookup("a")
-	if flag == nil {
-		t.Errorf("f.ShorthandLookup(\"a\") returned nil")
-	}
-	if flag.Name != "boola" {
-		t.Errorf("f.ShorthandLookup(\"a\") found %q instead of \"boola\"", flag.Name)
-	}
-	flag = f.ShorthandLookup("")
-	if flag != nil {
-		t.Errorf("f.ShorthandLookup(\"\") did not return nil")
-	}
-	defer func() {
-		recover()
-	}()
-	flag = f.ShorthandLookup("ab")
-	// should NEVER get here. lookup should panic. defer'd func should recover it.
-	t.Errorf("f.ShorthandLookup(\"ab\") did not panic")
-}
-
-func TestParse(t *testing.T) {
-	ResetForTesting(func() { t.Error("bad parse") })
-	testParse(GetCommandLine(), t)
-}
-
-func TestParseAll(t *testing.T) {
-	ResetForTesting(func() { t.Error("bad parse") })
-	testParseAll(GetCommandLine(), t)
-}
-
-func TestFlagSetParse(t *testing.T) {
-	testParse(NewFlagSet("test", ContinueOnError), t)
-}
-
-func TestChangedHelper(t *testing.T) {
-	f := NewFlagSet("changedtest", ContinueOnError)
-	f.Bool("changed", false, "changed bool")
-	f.Bool("settrue", true, "true to true")
-	f.Bool("setfalse", false, "false to false")
-	f.Bool("unchanged", false, "unchanged bool")
-
-	args := []string{"--changed", "--settrue", "--setfalse=false"}
-	if err := f.Parse(args); err != nil {
-		t.Error("f.Parse() = false after Parse")
-	}
-	if !f.Changed("changed") {
-		t.Errorf("--changed wasn't changed!")
-	}
-	if !f.Changed("settrue") {
-		t.Errorf("--settrue wasn't changed!")
-	}
-	if !f.Changed("setfalse") {
-		t.Errorf("--setfalse wasn't changed!")
-	}
-	if f.Changed("unchanged") {
-		t.Errorf("--unchanged was changed!")
-	}
-	if f.Changed("invalid") {
-		t.Errorf("--invalid was changed!")
-	}
-	if f.ArgsLenAtDash() != -1 {
-		t.Errorf("Expected argsLenAtDash: %d but got %d", -1, f.ArgsLenAtDash())
-	}
-}
-
-func replaceSeparators(name string, from []string, to string) string {
-	result := name
-	for _, sep := range from {
-		result = strings.Replace(result, sep, to, -1)
-	}
-	// Type convert to indicate normalization has been done.
-	return result
-}
-
-func wordSepNormalizeFunc(f *FlagSet, name string) NormalizedName {
-	seps := []string{"-", "_"}
-	name = replaceSeparators(name, seps, ".")
-	normalizeFlagNameInvocations++
-
-	return NormalizedName(name)
-}
-
-func testWordSepNormalizedNames(args []string, t *testing.T) {
-	f := NewFlagSet("normalized", ContinueOnError)
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	withDashFlag := f.Bool("with-dash-flag", false, "bool value")
-	// Set this after some flags have been added and before others.
-	f.SetNormalizeFunc(wordSepNormalizeFunc)
-	withUnderFlag := f.Bool("with_under_flag", false, "bool value")
-	withBothFlag := f.Bool("with-both_flag", false, "bool value")
-	if err := f.Parse(args); err != nil {
-		t.Fatal(err)
-	}
-	if !f.Parsed() {
-		t.Error("f.Parse() = false after Parse")
-	}
-	if *withDashFlag != true {
-		t.Error("withDashFlag flag should be true, is ", *withDashFlag)
-	}
-	if *withUnderFlag != true {
-		t.Error("withUnderFlag flag should be true, is ", *withUnderFlag)
-	}
-	if *withBothFlag != true {
-		t.Error("withBothFlag flag should be true, is ", *withBothFlag)
-	}
-}
-
-func TestWordSepNormalizedNames(t *testing.T) {
-	args := []string{
-		"--with-dash-flag",
-		"--with-under-flag",
-		"--with-both-flag",
-	}
-	testWordSepNormalizedNames(args, t)
-
-	args = []string{
-		"--with_dash_flag",
-		"--with_under_flag",
-		"--with_both_flag",
-	}
-	testWordSepNormalizedNames(args, t)
-
-	args = []string{
-		"--with-dash_flag",
-		"--with-under_flag",
-		"--with-both_flag",
-	}
-	testWordSepNormalizedNames(args, t)
-}
-
-func aliasAndWordSepFlagNames(f *FlagSet, name string) NormalizedName {
-	seps := []string{"-", "_"}
-
-	oldName := replaceSeparators("old-valid_flag", seps, ".")
-	newName := replaceSeparators("valid-flag", seps, ".")
-
-	name = replaceSeparators(name, seps, ".")
-	switch name {
-	case oldName:
-		name = newName
-		break
-	}
-
-	return NormalizedName(name)
-}
-
-func TestCustomNormalizedNames(t *testing.T) {
-	f := NewFlagSet("normalized", ContinueOnError)
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-
-	validFlag := f.Bool("valid-flag", false, "bool value")
-	f.SetNormalizeFunc(aliasAndWordSepFlagNames)
-	someOtherFlag := f.Bool("some-other-flag", false, "bool value")
-
-	args := []string{"--old_valid_flag", "--some-other_flag"}
-	if err := f.Parse(args); err != nil {
-		t.Fatal(err)
-	}
-
-	if *validFlag != true {
-		t.Errorf("validFlag is %v even though we set the alias --old_valid_falg", *validFlag)
-	}
-	if *someOtherFlag != true {
-		t.Error("someOtherFlag should be true, is ", *someOtherFlag)
-	}
-}
-
-// Every flag we add, the name (displayed also in usage) should normalized
-func TestNormalizationFuncShouldChangeFlagName(t *testing.T) {
-	// Test normalization after addition
-	f := NewFlagSet("normalized", ContinueOnError)
-
-	f.Bool("valid_flag", false, "bool value")
-	if f.Lookup("valid_flag").Name != "valid_flag" {
-		t.Error("The new flag should have the name 'valid_flag' instead of ", f.Lookup("valid_flag").Name)
-	}
-
-	f.SetNormalizeFunc(wordSepNormalizeFunc)
-	if f.Lookup("valid_flag").Name != "valid.flag" {
-		t.Error("The new flag should have the name 'valid.flag' instead of ", f.Lookup("valid_flag").Name)
-	}
-
-	// Test normalization before addition
-	f = NewFlagSet("normalized", ContinueOnError)
-	f.SetNormalizeFunc(wordSepNormalizeFunc)
-
-	f.Bool("valid_flag", false, "bool value")
-	if f.Lookup("valid_flag").Name != "valid.flag" {
-		t.Error("The new flag should have the name 'valid.flag' instead of ", f.Lookup("valid_flag").Name)
-	}
-}
-
-// Declare a user-defined flag type.
-type flagVar []string
-
-func (f *flagVar) String() string {
-	return fmt.Sprint([]string(*f))
-}
-
-func (f *flagVar) Set(value string) error {
-	*f = append(*f, value)
-	return nil
-}
-
-func (f *flagVar) Type() string {
-	return "flagVar"
-}
-
-func TestUserDefined(t *testing.T) {
-	var flags FlagSet
-	flags.Init("test", ContinueOnError)
-	var v flagVar
-	flags.VarP(&v, "v", "v", "usage")
-	if err := flags.Parse([]string{"--v=1", "-v2", "-v", "3"}); err != nil {
-		t.Error(err)
-	}
-	if len(v) != 3 {
-		t.Fatal("expected 3 args; got ", len(v))
-	}
-	expect := "[1 2 3]"
-	if v.String() != expect {
-		t.Errorf("expected value %q got %q", expect, v.String())
-	}
-}
-
-func TestSetOutput(t *testing.T) {
-	var flags FlagSet
-	var buf bytes.Buffer
-	flags.SetOutput(&buf)
-	flags.Init("test", ContinueOnError)
-	flags.Parse([]string{"--unknown"})
-	if out := buf.String(); !strings.Contains(out, "--unknown") {
-		t.Logf("expected output mentioning unknown; got %q", out)
-	}
-}
-
-// This tests that one can reset the flags. This still works but not well, and is
-// superseded by FlagSet.
-func TestChangingArgs(t *testing.T) {
-	ResetForTesting(func() { t.Fatal("bad parse") })
-	oldArgs := os.Args
-	defer func() { os.Args = oldArgs }()
-	os.Args = []string{"cmd", "--before", "subcmd"}
-	before := Bool("before", false, "")
-	if err := GetCommandLine().Parse(os.Args[1:]); err != nil {
-		t.Fatal(err)
-	}
-	cmd := Arg(0)
-	os.Args = []string{"subcmd", "--after", "args"}
-	after := Bool("after", false, "")
-	Parse()
-	args := Args()
-
-	if !*before || cmd != "subcmd" || !*after || len(args) != 1 || args[0] != "args" {
-		t.Fatalf("expected true subcmd true [args] got %v %v %v %v", *before, cmd, *after, args)
-	}
-}
-
-// Test that -help invokes the usage message and returns ErrHelp.
-func TestHelp(t *testing.T) {
-	var helpCalled = false
-	fs := NewFlagSet("help test", ContinueOnError)
-	fs.Usage = func() { helpCalled = true }
-	var flag bool
-	fs.BoolVar(&flag, "flag", false, "regular flag")
-	// Regular flag invocation should work
-	err := fs.Parse([]string{"--flag=true"})
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-	if !flag {
-		t.Error("flag was not set by --flag")
-	}
-	if helpCalled {
-		t.Error("help called for regular flag")
-		helpCalled = false // reset for next test
-	}
-	// Help flag should work as expected.
-	err = fs.Parse([]string{"--help"})
-	if err == nil {
-		t.Fatal("error expected")
-	}
-	if err != ErrHelp {
-		t.Fatal("expected ErrHelp; got ", err)
-	}
-	if !helpCalled {
-		t.Fatal("help was not called")
-	}
-	// If we define a help flag, that should override.
-	var help bool
-	fs.BoolVar(&help, "help", false, "help flag")
-	helpCalled = false
-	err = fs.Parse([]string{"--help"})
-	if err != nil {
-		t.Fatal("expected no error for defined --help; got ", err)
-	}
-	if helpCalled {
-		t.Fatal("help was called; should not have been for defined help flag")
-	}
-}
-
-func TestNoInterspersed(t *testing.T) {
-	f := NewFlagSet("test", ContinueOnError)
-	f.SetInterspersed(false)
-	f.Bool("true", true, "always true")
-	f.Bool("false", false, "always false")
-	err := f.Parse([]string{"--true", "break", "--false"})
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-	args := f.Args()
-	if len(args) != 2 || args[0] != "break" || args[1] != "--false" {
-		t.Fatal("expected interspersed options/non-options to fail")
-	}
-}
-
-func TestTermination(t *testing.T) {
-	f := NewFlagSet("termination", ContinueOnError)
-	boolFlag := f.BoolP("bool", "l", false, "bool value")
-	if f.Parsed() {
-		t.Error("f.Parse() = true before Parse")
-	}
-	arg1 := "ls"
-	arg2 := "-l"
-	args := []string{
-		"--",
-		arg1,
-		arg2,
-	}
-	f.SetOutput(ioutil.Discard)
-	if err := f.Parse(args); err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-	if !f.Parsed() {
-		t.Error("f.Parse() = false after Parse")
-	}
-	if *boolFlag {
-		t.Error("expected boolFlag=false, got true")
-	}
-	if len(f.Args()) != 2 {
-		t.Errorf("expected 2 arguments, got %d: %v", len(f.Args()), f.Args())
-	}
-	if f.Args()[0] != arg1 {
-		t.Errorf("expected argument %q got %q", arg1, f.Args()[0])
-	}
-	if f.Args()[1] != arg2 {
-		t.Errorf("expected argument %q got %q", arg2, f.Args()[1])
-	}
-	if f.ArgsLenAtDash() != 0 {
-		t.Errorf("expected argsLenAtDash %d got %d", 0, f.ArgsLenAtDash())
-	}
-}
-
-func TestDeprecatedFlagInDocs(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	f.Bool("badflag", true, "always true")
-	f.MarkDeprecated("badflag", "use --good-flag instead")
-
-	out := new(bytes.Buffer)
-	f.SetOutput(out)
-	f.PrintDefaults()
-
-	if strings.Contains(out.String(), "badflag") {
-		t.Errorf("found deprecated flag in usage!")
-	}
-}
-
-func TestDeprecatedFlagShorthandInDocs(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	name := "noshorthandflag"
-	f.BoolP(name, "n", true, "always true")
-	f.MarkShorthandDeprecated("noshorthandflag", fmt.Sprintf("use --%s instead", name))
-
-	out := new(bytes.Buffer)
-	f.SetOutput(out)
-	f.PrintDefaults()
-
-	if strings.Contains(out.String(), "-n,") {
-		t.Errorf("found deprecated flag shorthand in usage!")
-	}
-}
-
-func parseReturnStderr(t *testing.T, f *FlagSet, args []string) (string, error) {
-	oldStderr := os.Stderr
-	r, w, _ := os.Pipe()
-	os.Stderr = w
-
-	err := f.Parse(args)
-
-	outC := make(chan string)
-	// copy the output in a separate goroutine so printing can't block indefinitely
-	go func() {
-		var buf bytes.Buffer
-		io.Copy(&buf, r)
-		outC <- buf.String()
-	}()
-
-	w.Close()
-	os.Stderr = oldStderr
-	out := <-outC
-
-	return out, err
-}
-
-func TestDeprecatedFlagUsage(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	f.Bool("badflag", true, "always true")
-	usageMsg := "use --good-flag instead"
-	f.MarkDeprecated("badflag", usageMsg)
-
-	args := []string{"--badflag"}
-	out, err := parseReturnStderr(t, f, args)
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-
-	if !strings.Contains(out, usageMsg) {
-		t.Errorf("usageMsg not printed when using a deprecated flag!")
-	}
-}
-
-func TestDeprecatedFlagShorthandUsage(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	name := "noshorthandflag"
-	f.BoolP(name, "n", true, "always true")
-	usageMsg := fmt.Sprintf("use --%s instead", name)
-	f.MarkShorthandDeprecated(name, usageMsg)
-
-	args := []string{"-n"}
-	out, err := parseReturnStderr(t, f, args)
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-
-	if !strings.Contains(out, usageMsg) {
-		t.Errorf("usageMsg not printed when using a deprecated flag!")
-	}
-}
-
-func TestDeprecatedFlagUsageNormalized(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	f.Bool("bad-double_flag", true, "always true")
-	f.SetNormalizeFunc(wordSepNormalizeFunc)
-	usageMsg := "use --good-flag instead"
-	f.MarkDeprecated("bad_double-flag", usageMsg)
-
-	args := []string{"--bad_double_flag"}
-	out, err := parseReturnStderr(t, f, args)
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-
-	if !strings.Contains(out, usageMsg) {
-		t.Errorf("usageMsg not printed when using a deprecated flag!")
-	}
-}
-
-// Name normalization function should be called only once on flag addition
-func TestMultipleNormalizeFlagNameInvocations(t *testing.T) {
-	normalizeFlagNameInvocations = 0
-
-	f := NewFlagSet("normalized", ContinueOnError)
-	f.SetNormalizeFunc(wordSepNormalizeFunc)
-	f.Bool("with_under_flag", false, "bool value")
-
-	if normalizeFlagNameInvocations != 1 {
-		t.Fatal("Expected normalizeFlagNameInvocations to be 1; got ", normalizeFlagNameInvocations)
-	}
-}
-
-//
-func TestHiddenFlagInUsage(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	f.Bool("secretFlag", true, "shhh")
-	f.MarkHidden("secretFlag")
-
-	out := new(bytes.Buffer)
-	f.SetOutput(out)
-	f.PrintDefaults()
-
-	if strings.Contains(out.String(), "secretFlag") {
-		t.Errorf("found hidden flag in usage!")
-	}
-}
-
-//
-func TestHiddenFlagUsage(t *testing.T) {
-	f := NewFlagSet("bob", ContinueOnError)
-	f.Bool("secretFlag", true, "shhh")
-	f.MarkHidden("secretFlag")
-
-	args := []string{"--secretFlag"}
-	out, err := parseReturnStderr(t, f, args)
-	if err != nil {
-		t.Fatal("expected no error; got ", err)
-	}
-
-	if strings.Contains(out, "shhh") {
-		t.Errorf("usage message printed when using a hidden flag!")
-	}
-}
-
-const defaultOutput = `      --A                         for bootstrapping, allow 'any' type
-      --Alongflagname             disable bounds checking
-  -C, --CCC                       a boolean defaulting to true (default true)
-      --D path                    set relative path for local imports
-  -E, --EEE num[=1234]            a num with NoOptDefVal (default 4321)
-      --F number                  a non-zero number (default 2.7)
-      --G float                   a float that defaults to zero
-      --IP ip                     IP address with no default
-      --IPMask ipMask             Netmask address with no default
-      --IPNet ipNet               IP network with no default
-      --Ints intSlice             int slice with zero default
-      --N int                     a non-zero int (default 27)
-      --ND1 string[="bar"]        a string with NoOptDefVal (default "foo")
-      --ND2 num[=4321]            a num with NoOptDefVal (default 1234)
-      --StringArray stringArray   string array with zero default
-      --StringSlice stringSlice   string slice with zero default
-      --Z int                     an int that defaults to zero
-      --custom custom             custom Value implementation
-      --customP custom            a VarP with default (default 10)
-      --maxT timeout              set timeout for dial
-`
-
-// Custom value that satisfies the Value interface.
-type customValue int
-
-func (cv *customValue) String() string { return fmt.Sprintf("%v", *cv) }
-
-func (cv *customValue) Set(s string) error {
-	v, err := strconv.ParseInt(s, 0, 64)
-	*cv = customValue(v)
-	return err
-}
-
-func (cv *customValue) Type() string { return "custom" }
-
-func TestPrintDefaults(t *testing.T) {
-	fs := NewFlagSet("print defaults test", ContinueOnError)
-	var buf bytes.Buffer
-	fs.SetOutput(&buf)
-	fs.Bool("A", false, "for bootstrapping, allow 'any' type")
-	fs.Bool("Alongflagname", false, "disable bounds checking")
-	fs.BoolP("CCC", "C", true, "a boolean defaulting to true")
-	fs.String("D", "", "set relative `path` for local imports")
-	fs.Float64("F", 2.7, "a non-zero `number`")
-	fs.Float64("G", 0, "a float that defaults to zero")
-	fs.Int("N", 27, "a non-zero int")
-	fs.IntSlice("Ints", []int{}, "int slice with zero default")
-	fs.IP("IP", nil, "IP address with no default")
-	fs.IPMask("IPMask", nil, "Netmask address with no default")
-	fs.IPNet("IPNet", net.IPNet{}, "IP network with no default")
-	fs.Int("Z", 0, "an int that defaults to zero")
-	fs.Duration("maxT", 0, "set `timeout` for dial")
-	fs.String("ND1", "foo", "a string with NoOptDefVal")
-	fs.Lookup("ND1").NoOptDefVal = "bar"
-	fs.Int("ND2", 1234, "a `num` with NoOptDefVal")
-	fs.Lookup("ND2").NoOptDefVal = "4321"
-	fs.IntP("EEE", "E", 4321, "a `num` with NoOptDefVal")
-	fs.ShorthandLookup("E").NoOptDefVal = "1234"
-	fs.StringSlice("StringSlice", []string{}, "string slice with zero default")
-	fs.StringArray("StringArray", []string{}, "string array with zero default")
-
-	var cv customValue
-	fs.Var(&cv, "custom", "custom Value implementation")
-
-	cv2 := customValue(10)
-	fs.VarP(&cv2, "customP", "", "a VarP with default")
-
-	fs.PrintDefaults()
-	got := buf.String()
-	if got != defaultOutput {
-		fmt.Println("\n" + got)
-		fmt.Println("\n" + defaultOutput)
-		t.Errorf("got %q want %q\n", got, defaultOutput)
-	}
-}
-
-func TestVisitAllFlagOrder(t *testing.T) {
-	fs := NewFlagSet("TestVisitAllFlagOrder", ContinueOnError)
-	fs.SortFlags = false
-	// https://github.com/spf13/pflag/issues/120
-	fs.SetNormalizeFunc(func(f *FlagSet, name string) NormalizedName {
-		return NormalizedName(name)
-	})
-
-	names := []string{"C", "B", "A", "D"}
-	for _, name := range names {
-		fs.Bool(name, false, "")
-	}
-
-	i := 0
-	fs.VisitAll(func(f *Flag) {
-		if names[i] != f.Name {
-			t.Errorf("Incorrect order. Expected %v, got %v", names[i], f.Name)
-		}
-		i++
-	})
-}
-
-func TestVisitFlagOrder(t *testing.T) {
-	fs := NewFlagSet("TestVisitFlagOrder", ContinueOnError)
-	fs.SortFlags = false
-	names := []string{"C", "B", "A", "D"}
-	for _, name := range names {
-		fs.Bool(name, false, "")
-		fs.Set(name, "true")
-	}
-
-	i := 0
-	fs.Visit(func(f *Flag) {
-		if names[i] != f.Name {
-			t.Errorf("Incorrect order. Expected %v, got %v", names[i], f.Name)
-		}
-		i++
-	})
-}
diff --git a/installer/vendor/github.com/spf13/pflag/golangflag.go b/installer/vendor/github.com/spf13/pflag/golangflag.go
index c4f47ebe59..d3dd72b7fe 100644
--- a/installer/vendor/github.com/spf13/pflag/golangflag.go
+++ b/installer/vendor/github.com/spf13/pflag/golangflag.go
@@ -98,4 +98,8 @@ func (f *FlagSet) AddGoFlagSet(newSet *goflag.FlagSet) {
 	newSet.VisitAll(func(goflag *goflag.Flag) {
 		f.AddGoFlag(goflag)
 	})
+	if f.addedGoFlagSets == nil {
+		f.addedGoFlagSets = make([]*goflag.FlagSet, 0)
+	}
+	f.addedGoFlagSets = append(f.addedGoFlagSets, newSet)
 }
diff --git a/installer/vendor/github.com/spf13/pflag/golangflag_test.go b/installer/vendor/github.com/spf13/pflag/golangflag_test.go
deleted file mode 100644
index 77e2d7d80a..0000000000
--- a/installer/vendor/github.com/spf13/pflag/golangflag_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	goflag "flag"
-	"testing"
-)
-
-func TestGoflags(t *testing.T) {
-	goflag.String("stringFlag", "stringFlag", "stringFlag")
-	goflag.Bool("boolFlag", false, "boolFlag")
-
-	f := NewFlagSet("test", ContinueOnError)
-
-	f.AddGoFlagSet(goflag.CommandLine)
-	err := f.Parse([]string{"--stringFlag=bob", "--boolFlag"})
-	if err != nil {
-		t.Fatal("expected no error; get", err)
-	}
-
-	getString, err := f.GetString("stringFlag")
-	if err != nil {
-		t.Fatal("expected no error; get", err)
-	}
-	if getString != "bob" {
-		t.Fatalf("expected getString=bob but got getString=%s", getString)
-	}
-
-	getBool, err := f.GetBool("boolFlag")
-	if err != nil {
-		t.Fatal("expected no error; get", err)
-	}
-	if getBool != true {
-		t.Fatalf("expected getBool=true but got getBool=%v", getBool)
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/int16.go b/installer/vendor/github.com/spf13/pflag/int16.go
new file mode 100644
index 0000000000..f1a01d05e6
--- /dev/null
+++ b/installer/vendor/github.com/spf13/pflag/int16.go
@@ -0,0 +1,88 @@
+package pflag
+
+import "strconv"
+
+// -- int16 Value
+type int16Value int16
+
+func newInt16Value(val int16, p *int16) *int16Value {
+	*p = val
+	return (*int16Value)(p)
+}
+
+func (i *int16Value) Set(s string) error {
+	v, err := strconv.ParseInt(s, 0, 16)
+	*i = int16Value(v)
+	return err
+}
+
+func (i *int16Value) Type() string {
+	return "int16"
+}
+
+func (i *int16Value) String() string { return strconv.FormatInt(int64(*i), 10) }
+
+func int16Conv(sval string) (interface{}, error) {
+	v, err := strconv.ParseInt(sval, 0, 16)
+	if err != nil {
+		return 0, err
+	}
+	return int16(v), nil
+}
+
+// GetInt16 returns the int16 value of a flag with the given name
+func (f *FlagSet) GetInt16(name string) (int16, error) {
+	val, err := f.getFlagType(name, "int16", int16Conv)
+	if err != nil {
+		return 0, err
+	}
+	return val.(int16), nil
+}
+
+// Int16Var defines an int16 flag with specified name, default value, and usage string.
+// The argument p points to an int16 variable in which to store the value of the flag.
+func (f *FlagSet) Int16Var(p *int16, name string, value int16, usage string) {
+	f.VarP(newInt16Value(value, p), name, "", usage)
+}
+
+// Int16VarP is like Int16Var, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int16VarP(p *int16, name, shorthand string, value int16, usage string) {
+	f.VarP(newInt16Value(value, p), name, shorthand, usage)
+}
+
+// Int16Var defines an int16 flag with specified name, default value, and usage string.
+// The argument p points to an int16 variable in which to store the value of the flag.
+func Int16Var(p *int16, name string, value int16, usage string) {
+	CommandLine.VarP(newInt16Value(value, p), name, "", usage)
+}
+
+// Int16VarP is like Int16Var, but accepts a shorthand letter that can be used after a single dash.
+func Int16VarP(p *int16, name, shorthand string, value int16, usage string) {
+	CommandLine.VarP(newInt16Value(value, p), name, shorthand, usage)
+}
+
+// Int16 defines an int16 flag with specified name, default value, and usage string.
+// The return value is the address of an int16 variable that stores the value of the flag.
+func (f *FlagSet) Int16(name string, value int16, usage string) *int16 {
+	p := new(int16)
+	f.Int16VarP(p, name, "", value, usage)
+	return p
+}
+
+// Int16P is like Int16, but accepts a shorthand letter that can be used after a single dash.
+func (f *FlagSet) Int16P(name, shorthand string, value int16, usage string) *int16 {
+	p := new(int16)
+	f.Int16VarP(p, name, shorthand, value, usage)
+	return p
+}
+
+// Int16 defines an int16 flag with specified name, default value, and usage string.
+// The return value is the address of an int16 variable that stores the value of the flag.
+func Int16(name string, value int16, usage string) *int16 {
+	return CommandLine.Int16P(name, "", value, usage)
+}
+
+// Int16P is like Int16, but accepts a shorthand letter that can be used after a single dash.
+func Int16P(name, shorthand string, value int16, usage string) *int16 {
+	return CommandLine.Int16P(name, shorthand, value, usage)
+}
diff --git a/installer/vendor/github.com/spf13/pflag/int_slice_test.go b/installer/vendor/github.com/spf13/pflag/int_slice_test.go
deleted file mode 100644
index 745aecb950..0000000000
--- a/installer/vendor/github.com/spf13/pflag/int_slice_test.go
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func setUpISFlagSet(isp *[]int) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.IntSliceVar(isp, "is", []int{}, "Command separated list!")
-	return f
-}
-
-func setUpISFlagSetWithDefault(isp *[]int) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.IntSliceVar(isp, "is", []int{0, 1}, "Command separated list!")
-	return f
-}
-
-func TestEmptyIS(t *testing.T) {
-	var is []int
-	f := setUpISFlagSet(&is)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getIS, err := f.GetIntSlice("is")
-	if err != nil {
-		t.Fatal("got an error from GetIntSlice():", err)
-	}
-	if len(getIS) != 0 {
-		t.Fatalf("got is %v with len=%d but expected length=0", getIS, len(getIS))
-	}
-}
-
-func TestIS(t *testing.T) {
-	var is []int
-	f := setUpISFlagSet(&is)
-
-	vals := []string{"1", "2", "4", "3"}
-	arg := fmt.Sprintf("--is=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range is {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %s but got: %d", i, vals[i], v)
-		}
-	}
-	getIS, err := f.GetIntSlice("is")
-	if err != nil {
-		t.Fatalf("got error: %v", err)
-	}
-	for i, v := range getIS {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %s but got: %d from GetIntSlice", i, vals[i], v)
-		}
-	}
-}
-
-func TestISDefault(t *testing.T) {
-	var is []int
-	f := setUpISFlagSetWithDefault(&is)
-
-	vals := []string{"0", "1"}
-
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range is {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %d but got: %d", i, d, v)
-		}
-	}
-
-	getIS, err := f.GetIntSlice("is")
-	if err != nil {
-		t.Fatal("got an error from GetIntSlice():", err)
-	}
-	for i, v := range getIS {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatal("got an error from GetIntSlice():", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %d from GetIntSlice but got: %d", i, d, v)
-		}
-	}
-}
-
-func TestISWithDefault(t *testing.T) {
-	var is []int
-	f := setUpISFlagSetWithDefault(&is)
-
-	vals := []string{"1", "2"}
-	arg := fmt.Sprintf("--is=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range is {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %d but got: %d", i, d, v)
-		}
-	}
-
-	getIS, err := f.GetIntSlice("is")
-	if err != nil {
-		t.Fatal("got an error from GetIntSlice():", err)
-	}
-	for i, v := range getIS {
-		d, err := strconv.Atoi(vals[i])
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if d != v {
-			t.Fatalf("expected is[%d] to be %d from GetIntSlice but got: %d", i, d, v)
-		}
-	}
-}
-
-func TestISCalledTwice(t *testing.T) {
-	var is []int
-	f := setUpISFlagSet(&is)
-
-	in := []string{"1,2", "3"}
-	expected := []int{1, 2, 3}
-	argfmt := "--is=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range is {
-		if expected[i] != v {
-			t.Fatalf("expected is[%d] to be %d but got: %d", i, expected[i], v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/ip_slice_test.go b/installer/vendor/github.com/spf13/pflag/ip_slice_test.go
deleted file mode 100644
index b0c681c5b2..0000000000
--- a/installer/vendor/github.com/spf13/pflag/ip_slice_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"strings"
-	"testing"
-)
-
-func setUpIPSFlagSet(ipsp *[]net.IP) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.IPSliceVar(ipsp, "ips", []net.IP{}, "Command separated list!")
-	return f
-}
-
-func setUpIPSFlagSetWithDefault(ipsp *[]net.IP) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.IPSliceVar(ipsp, "ips",
-		[]net.IP{
-			net.ParseIP("192.168.1.1"),
-			net.ParseIP("0:0:0:0:0:0:0:1"),
-		},
-		"Command separated list!")
-	return f
-}
-
-func TestEmptyIP(t *testing.T) {
-	var ips []net.IP
-	f := setUpIPSFlagSet(&ips)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getIPS, err := f.GetIPSlice("ips")
-	if err != nil {
-		t.Fatal("got an error from GetIPSlice():", err)
-	}
-	if len(getIPS) != 0 {
-		t.Fatalf("got ips %v with len=%d but expected length=0", getIPS, len(getIPS))
-	}
-}
-
-func TestIPS(t *testing.T) {
-	var ips []net.IP
-	f := setUpIPSFlagSet(&ips)
-
-	vals := []string{"192.168.1.1", "10.0.0.1", "0:0:0:0:0:0:0:2"}
-	arg := fmt.Sprintf("--ips=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ips {
-		if ip := net.ParseIP(vals[i]); ip == nil {
-			t.Fatalf("invalid string being converted to IP address: %s", vals[i])
-		} else if !ip.Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s from GetIPSlice", i, vals[i], v)
-		}
-	}
-}
-
-func TestIPSDefault(t *testing.T) {
-	var ips []net.IP
-	f := setUpIPSFlagSetWithDefault(&ips)
-
-	vals := []string{"192.168.1.1", "0:0:0:0:0:0:0:1"}
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ips {
-		if ip := net.ParseIP(vals[i]); ip == nil {
-			t.Fatalf("invalid string being converted to IP address: %s", vals[i])
-		} else if !ip.Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getIPS, err := f.GetIPSlice("ips")
-	if err != nil {
-		t.Fatal("got an error from GetIPSlice")
-	}
-	for i, v := range getIPS {
-		if ip := net.ParseIP(vals[i]); ip == nil {
-			t.Fatalf("invalid string being converted to IP address: %s", vals[i])
-		} else if !ip.Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestIPSWithDefault(t *testing.T) {
-	var ips []net.IP
-	f := setUpIPSFlagSetWithDefault(&ips)
-
-	vals := []string{"192.168.1.1", "0:0:0:0:0:0:0:1"}
-	arg := fmt.Sprintf("--ips=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ips {
-		if ip := net.ParseIP(vals[i]); ip == nil {
-			t.Fatalf("invalid string being converted to IP address: %s", vals[i])
-		} else if !ip.Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getIPS, err := f.GetIPSlice("ips")
-	if err != nil {
-		t.Fatal("got an error from GetIPSlice")
-	}
-	for i, v := range getIPS {
-		if ip := net.ParseIP(vals[i]); ip == nil {
-			t.Fatalf("invalid string being converted to IP address: %s", vals[i])
-		} else if !ip.Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestIPSCalledTwice(t *testing.T) {
-	var ips []net.IP
-	f := setUpIPSFlagSet(&ips)
-
-	in := []string{"192.168.1.2,0:0:0:0:0:0:0:1", "10.0.0.1"}
-	expected := []net.IP{net.ParseIP("192.168.1.2"), net.ParseIP("0:0:0:0:0:0:0:1"), net.ParseIP("10.0.0.1")}
-	argfmt := "ips=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ips {
-		if !expected[i].Equal(v) {
-			t.Fatalf("expected ips[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
-
-func TestIPSBadQuoting(t *testing.T) {
-
-	tests := []struct {
-		Want    []net.IP
-		FlagArg []string
-	}{
-		{
-			Want: []net.IP{
-				net.ParseIP("a4ab:61d:f03e:5d7d:fad7:d4c2:a1a5:568"),
-				net.ParseIP("203.107.49.208"),
-				net.ParseIP("14.57.204.90"),
-			},
-			FlagArg: []string{
-				"a4ab:61d:f03e:5d7d:fad7:d4c2:a1a5:568",
-				"203.107.49.208",
-				"14.57.204.90",
-			},
-		},
-		{
-			Want: []net.IP{
-				net.ParseIP("204.228.73.195"),
-				net.ParseIP("86.141.15.94"),
-			},
-			FlagArg: []string{
-				"204.228.73.195",
-				"86.141.15.94",
-			},
-		},
-		{
-			Want: []net.IP{
-				net.ParseIP("c70c:db36:3001:890f:c6ea:3f9b:7a39:cc3f"),
-				net.ParseIP("4d17:1d6e:e699:bd7a:88c5:5e7e:ac6a:4472"),
-			},
-			FlagArg: []string{
-				"c70c:db36:3001:890f:c6ea:3f9b:7a39:cc3f",
-				"4d17:1d6e:e699:bd7a:88c5:5e7e:ac6a:4472",
-			},
-		},
-		{
-			Want: []net.IP{
-				net.ParseIP("5170:f971:cfac:7be3:512a:af37:952c:bc33"),
-				net.ParseIP("93.21.145.140"),
-				net.ParseIP("2cac:61d3:c5ff:6caf:73e0:1b1a:c336:c1ca"),
-			},
-			FlagArg: []string{
-				" 5170:f971:cfac:7be3:512a:af37:952c:bc33  , 93.21.145.140     ",
-				"2cac:61d3:c5ff:6caf:73e0:1b1a:c336:c1ca",
-			},
-		},
-		{
-			Want: []net.IP{
-				net.ParseIP("2e5e:66b2:6441:848:5b74:76ea:574c:3a7b"),
-				net.ParseIP("2e5e:66b2:6441:848:5b74:76ea:574c:3a7b"),
-				net.ParseIP("2e5e:66b2:6441:848:5b74:76ea:574c:3a7b"),
-				net.ParseIP("2e5e:66b2:6441:848:5b74:76ea:574c:3a7b"),
-			},
-			FlagArg: []string{
-				`"2e5e:66b2:6441:848:5b74:76ea:574c:3a7b,        2e5e:66b2:6441:848:5b74:76ea:574c:3a7b,2e5e:66b2:6441:848:5b74:76ea:574c:3a7b     "`,
-				" 2e5e:66b2:6441:848:5b74:76ea:574c:3a7b"},
-		},
-	}
-
-	for i, test := range tests {
-
-		var ips []net.IP
-		f := setUpIPSFlagSet(&ips)
-
-		if err := f.Parse([]string{fmt.Sprintf("--ips=%s", strings.Join(test.FlagArg, ","))}); err != nil {
-			t.Fatalf("flag parsing failed with error: %s\nparsing:\t%#v\nwant:\t\t%s",
-				err, test.FlagArg, test.Want[i])
-		}
-
-		for j, b := range ips {
-			if !b.Equal(test.Want[j]) {
-				t.Fatalf("bad value parsed for test %d on net.IP %d:\nwant:\t%s\ngot:\t%s", i, j, test.Want[j], b)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/ip_test.go b/installer/vendor/github.com/spf13/pflag/ip_test.go
deleted file mode 100644
index 1fec50e425..0000000000
--- a/installer/vendor/github.com/spf13/pflag/ip_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"testing"
-)
-
-func setUpIP(ip *net.IP) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.IPVar(ip, "address", net.ParseIP("0.0.0.0"), "IP Address")
-	return f
-}
-
-func TestIP(t *testing.T) {
-	testCases := []struct {
-		input    string
-		success  bool
-		expected string
-	}{
-		{"0.0.0.0", true, "0.0.0.0"},
-		{" 0.0.0.0 ", true, "0.0.0.0"},
-		{"1.2.3.4", true, "1.2.3.4"},
-		{"127.0.0.1", true, "127.0.0.1"},
-		{"255.255.255.255", true, "255.255.255.255"},
-		{"", false, ""},
-		{"0", false, ""},
-		{"localhost", false, ""},
-		{"0.0.0", false, ""},
-		{"0.0.0.", false, ""},
-		{"0.0.0.0.", false, ""},
-		{"0.0.0.256", false, ""},
-		{"0 . 0 . 0 . 0", false, ""},
-	}
-
-	devnull, _ := os.Open(os.DevNull)
-	os.Stderr = devnull
-	for i := range testCases {
-		var addr net.IP
-		f := setUpIP(&addr)
-
-		tc := &testCases[i]
-
-		arg := fmt.Sprintf("--address=%s", tc.input)
-		err := f.Parse([]string{arg})
-		if err != nil && tc.success == true {
-			t.Errorf("expected success, got %q", err)
-			continue
-		} else if err == nil && tc.success == false {
-			t.Errorf("expected failure")
-			continue
-		} else if tc.success {
-			ip, err := f.GetIP("address")
-			if err != nil {
-				t.Errorf("Got error trying to fetch the IP flag: %v", err)
-			}
-			if ip.String() != tc.expected {
-				t.Errorf("expected %q, got %q", tc.expected, ip.String())
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/ipnet_test.go b/installer/vendor/github.com/spf13/pflag/ipnet_test.go
deleted file mode 100644
index 335b6fa156..0000000000
--- a/installer/vendor/github.com/spf13/pflag/ipnet_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"testing"
-)
-
-func setUpIPNet(ip *net.IPNet) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	_, def, _ := net.ParseCIDR("0.0.0.0/0")
-	f.IPNetVar(ip, "address", *def, "IP Address")
-	return f
-}
-
-func TestIPNet(t *testing.T) {
-	testCases := []struct {
-		input    string
-		success  bool
-		expected string
-	}{
-		{"0.0.0.0/0", true, "0.0.0.0/0"},
-		{" 0.0.0.0/0 ", true, "0.0.0.0/0"},
-		{"1.2.3.4/8", true, "1.0.0.0/8"},
-		{"127.0.0.1/16", true, "127.0.0.0/16"},
-		{"255.255.255.255/19", true, "255.255.224.0/19"},
-		{"255.255.255.255/32", true, "255.255.255.255/32"},
-		{"", false, ""},
-		{"/0", false, ""},
-		{"0", false, ""},
-		{"0/0", false, ""},
-		{"localhost/0", false, ""},
-		{"0.0.0/4", false, ""},
-		{"0.0.0./8", false, ""},
-		{"0.0.0.0./12", false, ""},
-		{"0.0.0.256/16", false, ""},
-		{"0.0.0.0 /20", false, ""},
-		{"0.0.0.0/ 24", false, ""},
-		{"0 . 0 . 0 . 0 / 28", false, ""},
-		{"0.0.0.0/33", false, ""},
-	}
-
-	devnull, _ := os.Open(os.DevNull)
-	os.Stderr = devnull
-	for i := range testCases {
-		var addr net.IPNet
-		f := setUpIPNet(&addr)
-
-		tc := &testCases[i]
-
-		arg := fmt.Sprintf("--address=%s", tc.input)
-		err := f.Parse([]string{arg})
-		if err != nil && tc.success == true {
-			t.Errorf("expected success, got %q", err)
-			continue
-		} else if err == nil && tc.success == false {
-			t.Errorf("expected failure")
-			continue
-		} else if tc.success {
-			ip, err := f.GetIPNet("address")
-			if err != nil {
-				t.Errorf("Got error trying to fetch the IP flag: %v", err)
-			}
-			if ip.String() != tc.expected {
-				t.Errorf("expected %q, got %q", tc.expected, ip.String())
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/string_array.go b/installer/vendor/github.com/spf13/pflag/string_array.go
index 276b7ed49e..fa7bc60187 100644
--- a/installer/vendor/github.com/spf13/pflag/string_array.go
+++ b/installer/vendor/github.com/spf13/pflag/string_array.go
@@ -52,7 +52,7 @@ func (f *FlagSet) GetStringArray(name string) ([]string, error) {
 
 // StringArrayVar defines a string flag with specified name, default value, and usage string.
 // The argument p points to a []string variable in which to store the values of the multiple flags.
-// The value of each argument will not try to be separated by comma
+// The value of each argument will not try to be separated by comma. Use a StringSlice for that.
 func (f *FlagSet) StringArrayVar(p *[]string, name string, value []string, usage string) {
 	f.VarP(newStringArrayValue(value, p), name, "", usage)
 }
@@ -64,7 +64,7 @@ func (f *FlagSet) StringArrayVarP(p *[]string, name, shorthand string, value []s
 
 // StringArrayVar defines a string flag with specified name, default value, and usage string.
 // The argument p points to a []string variable in which to store the value of the flag.
-// The value of each argument will not try to be separated by comma
+// The value of each argument will not try to be separated by comma. Use a StringSlice for that.
 func StringArrayVar(p *[]string, name string, value []string, usage string) {
 	CommandLine.VarP(newStringArrayValue(value, p), name, "", usage)
 }
@@ -76,7 +76,7 @@ func StringArrayVarP(p *[]string, name, shorthand string, value []string, usage
 
 // StringArray defines a string flag with specified name, default value, and usage string.
 // The return value is the address of a []string variable that stores the value of the flag.
-// The value of each argument will not try to be separated by comma
+// The value of each argument will not try to be separated by comma. Use a StringSlice for that.
 func (f *FlagSet) StringArray(name string, value []string, usage string) *[]string {
 	p := []string{}
 	f.StringArrayVarP(&p, name, "", value, usage)
@@ -92,7 +92,7 @@ func (f *FlagSet) StringArrayP(name, shorthand string, value []string, usage str
 
 // StringArray defines a string flag with specified name, default value, and usage string.
 // The return value is the address of a []string variable that stores the value of the flag.
-// The value of each argument will not try to be separated by comma
+// The value of each argument will not try to be separated by comma. Use a StringSlice for that.
 func StringArray(name string, value []string, usage string) *[]string {
 	return CommandLine.StringArrayP(name, "", value, usage)
 }
diff --git a/installer/vendor/github.com/spf13/pflag/string_array_test.go b/installer/vendor/github.com/spf13/pflag/string_array_test.go
deleted file mode 100644
index 1ceac8c6c6..0000000000
--- a/installer/vendor/github.com/spf13/pflag/string_array_test.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"fmt"
-	"testing"
-)
-
-func setUpSAFlagSet(sap *[]string) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.StringArrayVar(sap, "sa", []string{}, "Command separated list!")
-	return f
-}
-
-func setUpSAFlagSetWithDefault(sap *[]string) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.StringArrayVar(sap, "sa", []string{"default", "values"}, "Command separated list!")
-	return f
-}
-
-func TestEmptySA(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSet(&sa)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getSA, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("got an error from GetStringArray():", err)
-	}
-	if len(getSA) != 0 {
-		t.Fatalf("got sa %v with len=%d but expected length=0", getSA, len(getSA))
-	}
-}
-
-func TestEmptySAValue(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSet(&sa)
-	err := f.Parse([]string{"--sa="})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getSA, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("got an error from GetStringArray():", err)
-	}
-	if len(getSA) != 0 {
-		t.Fatalf("got sa %v with len=%d but expected length=0", getSA, len(getSA))
-	}
-}
-
-func TestSADefault(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSetWithDefault(&sa)
-
-	vals := []string{"default", "values"}
-
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range sa {
-		if vals[i] != v {
-			t.Fatalf("expected sa[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getSA, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("got an error from GetStringArray():", err)
-	}
-	for i, v := range getSA {
-		if vals[i] != v {
-			t.Fatalf("expected sa[%d] to be %s from GetStringArray but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestSAWithDefault(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSetWithDefault(&sa)
-
-	val := "one"
-	arg := fmt.Sprintf("--sa=%s", val)
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(sa) != 1 {
-		t.Fatalf("expected number of values to be %d but %d", 1, len(sa))
-	}
-
-	if sa[0] != val {
-		t.Fatalf("expected value to be %s but got: %s", sa[0], val)
-	}
-
-	getSA, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("got an error from GetStringArray():", err)
-	}
-
-	if len(getSA) != 1 {
-		t.Fatalf("expected number of values to be %d but %d", 1, len(getSA))
-	}
-
-	if getSA[0] != val {
-		t.Fatalf("expected value to be %s but got: %s", getSA[0], val)
-	}
-}
-
-func TestSACalledTwice(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSet(&sa)
-
-	in := []string{"one", "two"}
-	expected := []string{"one", "two"}
-	argfmt := "--sa=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(sa) {
-		t.Fatalf("expected number of sa to be %d but got: %d", len(expected), len(sa))
-	}
-	for i, v := range sa {
-		if expected[i] != v {
-			t.Fatalf("expected sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(sa))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
-
-func TestSAWithSpecialChar(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSet(&sa)
-
-	in := []string{"one,two", `"three"`, `"four,five",six`, "seven eight"}
-	expected := []string{"one,two", `"three"`, `"four,five",six`, "seven eight"}
-	argfmt := "--sa=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	arg3 := fmt.Sprintf(argfmt, in[2])
-	arg4 := fmt.Sprintf(argfmt, in[3])
-	err := f.Parse([]string{arg1, arg2, arg3, arg4})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(sa) {
-		t.Fatalf("expected number of sa to be %d but got: %d", len(expected), len(sa))
-	}
-	for i, v := range sa {
-		if expected[i] != v {
-			t.Fatalf("expected sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(values))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
-
-func TestSAWithSquareBrackets(t *testing.T) {
-	var sa []string
-	f := setUpSAFlagSet(&sa)
-
-	in := []string{"][]-[", "[a-z]", "[a-z]+"}
-	expected := []string{"][]-[", "[a-z]", "[a-z]+"}
-	argfmt := "--sa=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	arg3 := fmt.Sprintf(argfmt, in[2])
-	err := f.Parse([]string{arg1, arg2, arg3})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(sa) {
-		t.Fatalf("expected number of sa to be %d but got: %d", len(expected), len(sa))
-	}
-	for i, v := range sa {
-		if expected[i] != v {
-			t.Fatalf("expected sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringArray("sa")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(values))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got sa[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/string_slice.go b/installer/vendor/github.com/spf13/pflag/string_slice.go
index 05eee75438..0cd3ccc083 100644
--- a/installer/vendor/github.com/spf13/pflag/string_slice.go
+++ b/installer/vendor/github.com/spf13/pflag/string_slice.go
@@ -82,6 +82,11 @@ func (f *FlagSet) GetStringSlice(name string) ([]string, error) {
 
 // StringSliceVar defines a string flag with specified name, default value, and usage string.
 // The argument p points to a []string variable in which to store the value of the flag.
+// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
+// For example:
+//   --ss="v1,v2" -ss="v3"
+// will result in
+//   []string{"v1", "v2", "v3"}
 func (f *FlagSet) StringSliceVar(p *[]string, name string, value []string, usage string) {
 	f.VarP(newStringSliceValue(value, p), name, "", usage)
 }
@@ -93,6 +98,11 @@ func (f *FlagSet) StringSliceVarP(p *[]string, name, shorthand string, value []s
 
 // StringSliceVar defines a string flag with specified name, default value, and usage string.
 // The argument p points to a []string variable in which to store the value of the flag.
+// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
+// For example:
+//   --ss="v1,v2" -ss="v3"
+// will result in
+//   []string{"v1", "v2", "v3"}
 func StringSliceVar(p *[]string, name string, value []string, usage string) {
 	CommandLine.VarP(newStringSliceValue(value, p), name, "", usage)
 }
@@ -104,6 +114,11 @@ func StringSliceVarP(p *[]string, name, shorthand string, value []string, usage
 
 // StringSlice defines a string flag with specified name, default value, and usage string.
 // The return value is the address of a []string variable that stores the value of the flag.
+// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
+// For example:
+//   --ss="v1,v2" -ss="v3"
+// will result in
+//   []string{"v1", "v2", "v3"}
 func (f *FlagSet) StringSlice(name string, value []string, usage string) *[]string {
 	p := []string{}
 	f.StringSliceVarP(&p, name, "", value, usage)
@@ -119,6 +134,11 @@ func (f *FlagSet) StringSliceP(name, shorthand string, value []string, usage str
 
 // StringSlice defines a string flag with specified name, default value, and usage string.
 // The return value is the address of a []string variable that stores the value of the flag.
+// Compared to StringArray flags, StringSlice flags take comma-separated value as arguments and split them accordingly.
+// For example:
+//   --ss="v1,v2" -ss="v3"
+// will result in
+//   []string{"v1", "v2", "v3"}
 func StringSlice(name string, value []string, usage string) *[]string {
 	return CommandLine.StringSliceP(name, "", value, usage)
 }
diff --git a/installer/vendor/github.com/spf13/pflag/string_slice_test.go b/installer/vendor/github.com/spf13/pflag/string_slice_test.go
deleted file mode 100644
index c41f3bd660..0000000000
--- a/installer/vendor/github.com/spf13/pflag/string_slice_test.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pflag
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func setUpSSFlagSet(ssp *[]string) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.StringSliceVar(ssp, "ss", []string{}, "Command separated list!")
-	return f
-}
-
-func setUpSSFlagSetWithDefault(ssp *[]string) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.StringSliceVar(ssp, "ss", []string{"default", "values"}, "Command separated list!")
-	return f
-}
-
-func TestEmptySS(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getSS, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("got an error from GetStringSlice():", err)
-	}
-	if len(getSS) != 0 {
-		t.Fatalf("got ss %v with len=%d but expected length=0", getSS, len(getSS))
-	}
-}
-
-func TestEmptySSValue(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-	err := f.Parse([]string{"--ss="})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getSS, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("got an error from GetStringSlice():", err)
-	}
-	if len(getSS) != 0 {
-		t.Fatalf("got ss %v with len=%d but expected length=0", getSS, len(getSS))
-	}
-}
-
-func TestSS(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-
-	vals := []string{"one", "two", "4", "3"}
-	arg := fmt.Sprintf("--ss=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ss {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getSS, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("got an error from GetStringSlice():", err)
-	}
-	for i, v := range getSS {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s from GetStringSlice but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestSSDefault(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSetWithDefault(&ss)
-
-	vals := []string{"default", "values"}
-
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ss {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getSS, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("got an error from GetStringSlice():", err)
-	}
-	for i, v := range getSS {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s from GetStringSlice but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestSSWithDefault(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSetWithDefault(&ss)
-
-	vals := []string{"one", "two", "4", "3"}
-	arg := fmt.Sprintf("--ss=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range ss {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, vals[i], v)
-		}
-	}
-
-	getSS, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("got an error from GetStringSlice():", err)
-	}
-	for i, v := range getSS {
-		if vals[i] != v {
-			t.Fatalf("expected ss[%d] to be %s from GetStringSlice but got: %s", i, vals[i], v)
-		}
-	}
-}
-
-func TestSSCalledTwice(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-
-	in := []string{"one,two", "three"}
-	expected := []string{"one", "two", "three"}
-	argfmt := "--ss=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(ss) {
-		t.Fatalf("expected number of ss to be %d but got: %d", len(expected), len(ss))
-	}
-	for i, v := range ss {
-		if expected[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(ss))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
-
-func TestSSWithComma(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-
-	in := []string{`"one,two"`, `"three"`, `"four,five",six`}
-	expected := []string{"one,two", "three", "four,five", "six"}
-	argfmt := "--ss=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	arg3 := fmt.Sprintf(argfmt, in[2])
-	err := f.Parse([]string{arg1, arg2, arg3})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(ss) {
-		t.Fatalf("expected number of ss to be %d but got: %d", len(expected), len(ss))
-	}
-	for i, v := range ss {
-		if expected[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(values))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
-
-func TestSSWithSquareBrackets(t *testing.T) {
-	var ss []string
-	f := setUpSSFlagSet(&ss)
-
-	in := []string{`"[a-z]"`, `"[a-z]+"`}
-	expected := []string{"[a-z]", "[a-z]+"}
-	argfmt := "--ss=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(ss) {
-		t.Fatalf("expected number of ss to be %d but got: %d", len(expected), len(ss))
-	}
-	for i, v := range ss {
-		if expected[i] != v {
-			t.Fatalf("expected ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-
-	values, err := f.GetStringSlice("ss")
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	if len(expected) != len(values) {
-		t.Fatalf("expected number of values to be %d but got: %d", len(expected), len(values))
-	}
-	for i, v := range values {
-		if expected[i] != v {
-			t.Fatalf("expected got ss[%d] to be %s but got: %s", i, expected[i], v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/uint_slice_test.go b/installer/vendor/github.com/spf13/pflag/uint_slice_test.go
deleted file mode 100644
index db1a19dc2d..0000000000
--- a/installer/vendor/github.com/spf13/pflag/uint_slice_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-package pflag
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func setUpUISFlagSet(uisp *[]uint) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.UintSliceVar(uisp, "uis", []uint{}, "Command separated list!")
-	return f
-}
-
-func setUpUISFlagSetWithDefault(uisp *[]uint) *FlagSet {
-	f := NewFlagSet("test", ContinueOnError)
-	f.UintSliceVar(uisp, "uis", []uint{0, 1}, "Command separated list!")
-	return f
-}
-
-func TestEmptyUIS(t *testing.T) {
-	var uis []uint
-	f := setUpUISFlagSet(&uis)
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-
-	getUIS, err := f.GetUintSlice("uis")
-	if err != nil {
-		t.Fatal("got an error from GetUintSlice():", err)
-	}
-	if len(getUIS) != 0 {
-		t.Fatalf("got is %v with len=%d but expected length=0", getUIS, len(getUIS))
-	}
-}
-
-func TestUIS(t *testing.T) {
-	var uis []uint
-	f := setUpUISFlagSet(&uis)
-
-	vals := []string{"1", "2", "4", "3"}
-	arg := fmt.Sprintf("--uis=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range uis {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expected uis[%d] to be %s but got %d", i, vals[i], v)
-		}
-	}
-	getUIS, err := f.GetUintSlice("uis")
-	if err != nil {
-		t.Fatalf("got error: %v", err)
-	}
-	for i, v := range getUIS {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expected uis[%d] to be %s but got: %d from GetUintSlice", i, vals[i], v)
-		}
-	}
-}
-
-func TestUISDefault(t *testing.T) {
-	var uis []uint
-	f := setUpUISFlagSetWithDefault(&uis)
-
-	vals := []string{"0", "1"}
-
-	err := f.Parse([]string{})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range uis {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expect uis[%d] to be %d but got: %d", i, u, v)
-		}
-	}
-
-	getUIS, err := f.GetUintSlice("uis")
-	if err != nil {
-		t.Fatal("got an error from GetUintSlice():", err)
-	}
-	for i, v := range getUIS {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatal("got an error from GetIntSlice():", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expected uis[%d] to be %d from GetUintSlice but got: %d", i, u, v)
-		}
-	}
-}
-
-func TestUISWithDefault(t *testing.T) {
-	var uis []uint
-	f := setUpUISFlagSetWithDefault(&uis)
-
-	vals := []string{"1", "2"}
-	arg := fmt.Sprintf("--uis=%s", strings.Join(vals, ","))
-	err := f.Parse([]string{arg})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range uis {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expected uis[%d] to be %d from GetUintSlice but got: %d", i, u, v)
-		}
-	}
-
-	getUIS, err := f.GetUintSlice("uis")
-	if err != nil {
-		t.Fatal("got an error from GetUintSlice():", err)
-	}
-	for i, v := range getUIS {
-		u, err := strconv.ParseUint(vals[i], 10, 0)
-		if err != nil {
-			t.Fatalf("got error: %v", err)
-		}
-		if uint(u) != v {
-			t.Fatalf("expected uis[%d] to be %d from GetUintSlice but got: %d", i, u, v)
-		}
-	}
-}
-
-func TestUISCalledTwice(t *testing.T) {
-	var uis []uint
-	f := setUpUISFlagSet(&uis)
-
-	in := []string{"1,2", "3"}
-	expected := []int{1, 2, 3}
-	argfmt := "--uis=%s"
-	arg1 := fmt.Sprintf(argfmt, in[0])
-	arg2 := fmt.Sprintf(argfmt, in[1])
-	err := f.Parse([]string{arg1, arg2})
-	if err != nil {
-		t.Fatal("expected no error; got", err)
-	}
-	for i, v := range uis {
-		if uint(expected[i]) != v {
-			t.Fatalf("expected uis[%d] to be %d but got: %d", i, expected[i], v)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/spf13/pflag/verify/all.sh b/installer/vendor/github.com/spf13/pflag/verify/all.sh
deleted file mode 100755
index 739f89c0b4..0000000000
--- a/installer/vendor/github.com/spf13/pflag/verify/all.sh
+++ /dev/null
@@ -1,69 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-
-# Some useful colors.
-if [[ -z "${color_start-}" ]]; then
-  declare -r color_start="\033["
-  declare -r color_red="${color_start}0;31m"
-  declare -r color_yellow="${color_start}0;33m"
-  declare -r color_green="${color_start}0;32m"
-  declare -r color_norm="${color_start}0m"
-fi
-
-SILENT=true
-
-function is-excluded {
-  for e in $EXCLUDE; do
-    if [[ $1 -ef ${BASH_SOURCE} ]]; then
-      return
-    fi
-    if [[ $1 -ef "$ROOT/hack/$e" ]]; then
-      return
-    fi
-  done
-  return 1
-}
-
-while getopts ":v" opt; do
-  case $opt in
-    v)
-      SILENT=false
-      ;;
-    \?)
-      echo "Invalid flag: -$OPTARG" >&2
-      exit 1
-      ;;
-  esac
-done
-
-if $SILENT ; then
-  echo "Running in the silent mode, run with -v if you want to see script logs."
-fi
-
-EXCLUDE="all.sh"
-
-ret=0
-for t in `ls $ROOT/verify/*.sh`
-do
-  if is-excluded $t ; then
-    echo "Skipping $t"
-    continue
-  fi
-  if $SILENT ; then
-    echo -e "Verifying $t"
-    if bash "$t" &> /dev/null; then
-      echo -e "${color_green}SUCCESS${color_norm}"
-    else
-      echo -e "${color_red}FAILED${color_norm}"
-      ret=1
-    fi
-  else
-    bash "$t" || ret=1
-  fi
-done
-exit $ret
diff --git a/installer/vendor/github.com/spf13/pflag/verify/gofmt.sh b/installer/vendor/github.com/spf13/pflag/verify/gofmt.sh
deleted file mode 100755
index f66acf803b..0000000000
--- a/installer/vendor/github.com/spf13/pflag/verify/gofmt.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-set -o nounset
-set -o pipefail
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-
-pushd "${ROOT}" > /dev/null
-
-GOFMT=${GOFMT:-"gofmt"}
-bad_files=$(find . -name '*.go' | xargs $GOFMT -s -l)
-if [[ -n "${bad_files}" ]]; then
-  echo "!!! '$GOFMT' needs to be run on the following files: "
-  echo "${bad_files}"
-  exit 1
-fi
-
-# ex: ts=2 sw=2 et filetype=sh
diff --git a/installer/vendor/github.com/spf13/pflag/verify/golint.sh b/installer/vendor/github.com/spf13/pflag/verify/golint.sh
deleted file mode 100755
index 685c1778e5..0000000000
--- a/installer/vendor/github.com/spf13/pflag/verify/golint.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-ROOT=$(dirname "${BASH_SOURCE}")/..
-GOLINT=${GOLINT:-"golint"}
-
-pushd "${ROOT}" > /dev/null
-  bad_files=$($GOLINT -min_confidence=0.9 ./...)
-  if [[ -n "${bad_files}" ]]; then
-    echo "!!! '$GOLINT' problems: "
-    echo "${bad_files}"
-    exit 1
-  fi
-popd > /dev/null
-
-# ex: ts=2 sw=2 et filetype=sh
diff --git a/installer/vendor/github.com/stretchr/testify/.gitignore b/installer/vendor/github.com/stretchr/testify/.gitignore
deleted file mode 100644
index 5aacdb7cca..0000000000
--- a/installer/vendor/github.com/stretchr/testify/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-
-.DS_Store
diff --git a/installer/vendor/github.com/stretchr/testify/.travis.yml b/installer/vendor/github.com/stretchr/testify/.travis.yml
deleted file mode 100644
index ffb9e0ddbc..0000000000
--- a/installer/vendor/github.com/stretchr/testify/.travis.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-language: go
-
-sudo: false
-
-go:
-  - 1.1
-  - 1.2
-  - 1.3
-  - 1.4
-  - 1.5
-  - 1.6
-  - 1.7
-  - tip
-
-script:
-  - go test -v ./...
diff --git a/installer/vendor/github.com/stretchr/testify/Godeps/Godeps.json b/installer/vendor/github.com/stretchr/testify/Godeps/Godeps.json
deleted file mode 100644
index df032ac313..0000000000
--- a/installer/vendor/github.com/stretchr/testify/Godeps/Godeps.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"ImportPath": "github.com/stretchr/testify",
-	"GoVersion": "go1.5",
-	"GodepVersion": "v74",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/davecgh/go-spew/spew",
-			"Comment": "v1.0.0-3-g6d21280",
-			"Rev": "6d212800a42e8ab5c146b8ace3490ee17e5225f9"
-		},
-		{
-			"ImportPath": "github.com/pmezard/go-difflib/difflib",
-			"Rev": "d8ed2627bdf02c080bf22230dbb337003b7aba2d"
-		},
-		{
-			"ImportPath": "github.com/stretchr/objx",
-			"Rev": "cbeaeb16a013161a98496fad62933b1d21786672"
-		}
-	]
-}
diff --git a/installer/vendor/github.com/stretchr/testify/Godeps/Readme b/installer/vendor/github.com/stretchr/testify/Godeps/Readme
deleted file mode 100644
index 4cdaa53d56..0000000000
--- a/installer/vendor/github.com/stretchr/testify/Godeps/Readme
+++ /dev/null
@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.
diff --git a/installer/vendor/github.com/stretchr/testify/LICENCE.txt b/installer/vendor/github.com/stretchr/testify/LICENCE.txt
deleted file mode 100644
index 473b670a7c..0000000000
--- a/installer/vendor/github.com/stretchr/testify/LICENCE.txt
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell
-
-Please consider promoting this project if you find it useful.
-
-Permission is hereby granted, free of charge, to any person 
-obtaining a copy of this software and associated documentation 
-files (the "Software"), to deal in the Software without restriction, 
-including without limitation the rights to use, copy, modify, merge, 
-publish, distribute, sublicense, and/or sell copies of the Software, 
-and to permit persons to whom the Software is furnished to do so, 
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, 
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES 
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. 
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, 
-DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT 
-OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE 
-OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/installer/vendor/github.com/stretchr/testify/README.md b/installer/vendor/github.com/stretchr/testify/README.md
deleted file mode 100644
index e57b1811f0..0000000000
--- a/installer/vendor/github.com/stretchr/testify/README.md
+++ /dev/null
@@ -1,332 +0,0 @@
-Testify - Thou Shalt Write Tests
-================================
-
-[![Build Status](https://travis-ci.org/stretchr/testify.svg)](https://travis-ci.org/stretchr/testify) [![Go Report Card](https://goreportcard.com/badge/github.com/stretchr/testify)](https://goreportcard.com/report/github.com/stretchr/testify) [![GoDoc](https://godoc.org/github.com/stretchr/testify?status.svg)](https://godoc.org/github.com/stretchr/testify)
-
-Go code (golang) set of packages that provide many tools for testifying that your code will behave as you intend.
-
-Features include:
-
-  * [Easy assertions](#assert-package)
-  * [Mocking](#mock-package)
-  * [HTTP response trapping](#http-package)
-  * [Testing suite interfaces and functions](#suite-package)
-
-Get started:
-
-  * Install testify with [one line of code](#installation), or [update it with another](#staying-up-to-date)
-  * For an introduction to writing test code in Go, see http://golang.org/doc/code.html#Testing
-  * Check out the API Documentation http://godoc.org/github.com/stretchr/testify
-  * To make your testing life easier, check out our other project, [gorc](http://github.com/stretchr/gorc)
-  * A little about [Test-Driven Development (TDD)](http://en.wikipedia.org/wiki/Test-driven_development)
-
-
-
-[`assert`](http://godoc.org/github.com/stretchr/testify/assert "API documentation") package
--------------------------------------------------------------------------------------------
-
-The `assert` package provides some helpful methods that allow you to write better test code in Go.
-
-  * Prints friendly, easy to read failure descriptions
-  * Allows for very readable code
-  * Optionally annotate each assertion with a message
-
-See it in action:
-
-```go
-package yours
-
-import (
-  "testing"
-  "github.com/stretchr/testify/assert"
-)
-
-func TestSomething(t *testing.T) {
-
-  // assert equality
-  assert.Equal(t, 123, 123, "they should be equal")
-
-  // assert inequality
-  assert.NotEqual(t, 123, 456, "they should not be equal")
-
-  // assert for nil (good for errors)
-  assert.Nil(t, object)
-
-  // assert for not nil (good when you expect something)
-  if assert.NotNil(t, object) {
-
-    // now we know that object isn't nil, we are safe to make
-    // further assertions without causing any errors
-    assert.Equal(t, "Something", object.Value)
-
-  }
-
-}
-```
-
-  * Every assert func takes the `testing.T` object as the first argument.  This is how it writes the errors out through the normal `go test` capabilities.
-  * Every assert func returns a bool indicating whether the assertion was successful or not, this is useful for if you want to go on making further assertions under certain conditions.
-
-if you assert many times, use the below:
-
-```go
-package yours
-
-import (
-  "testing"
-  "github.com/stretchr/testify/assert"
-)
-
-func TestSomething(t *testing.T) {
-  assert := assert.New(t)
-
-  // assert equality
-  assert.Equal(123, 123, "they should be equal")
-
-  // assert inequality
-  assert.NotEqual(123, 456, "they should not be equal")
-
-  // assert for nil (good for errors)
-  assert.Nil(object)
-
-  // assert for not nil (good when you expect something)
-  if assert.NotNil(object) {
-
-    // now we know that object isn't nil, we are safe to make
-    // further assertions without causing any errors
-    assert.Equal("Something", object.Value)
-  }
-}
-```
-
-[`require`](http://godoc.org/github.com/stretchr/testify/require "API documentation") package
----------------------------------------------------------------------------------------------
-
-The `require` package provides same global functions as the `assert` package, but instead of returning a boolean result they terminate current test.
-
-See [t.FailNow](http://golang.org/pkg/testing/#T.FailNow) for details.
-
-
-[`http`](http://godoc.org/github.com/stretchr/testify/http "API documentation") package
----------------------------------------------------------------------------------------
-
-The `http` package contains test objects useful for testing code that relies on the `net/http` package.  Check out the [(deprecated) API documentation for the `http` package](http://godoc.org/github.com/stretchr/testify/http).
-
-We recommend you use [httptest](http://golang.org/pkg/net/http/httptest) instead.
-
-[`mock`](http://godoc.org/github.com/stretchr/testify/mock "API documentation") package
-----------------------------------------------------------------------------------------
-
-The `mock` package provides a mechanism for easily writing mock objects that can be used in place of real objects when writing test code.
-
-An example test function that tests a piece of code that relies on an external object `testObj`, can setup expectations (testify) and assert that they indeed happened:
-
-```go
-package yours
-
-import (
-  "testing"
-  "github.com/stretchr/testify/mock"
-)
-
-/*
-  Test objects
-*/
-
-// MyMockedObject is a mocked object that implements an interface
-// that describes an object that the code I am testing relies on.
-type MyMockedObject struct{
-  mock.Mock
-}
-
-// DoSomething is a method on MyMockedObject that implements some interface
-// and just records the activity, and returns what the Mock object tells it to.
-//
-// In the real object, this method would do something useful, but since this
-// is a mocked object - we're just going to stub it out.
-//
-// NOTE: This method is not being tested here, code that uses this object is.
-func (m *MyMockedObject) DoSomething(number int) (bool, error) {
-
-  args := m.Called(number)
-  return args.Bool(0), args.Error(1)
-
-}
-
-/*
-  Actual test functions
-*/
-
-// TestSomething is an example of how to use our test object to
-// make assertions about some target code we are testing.
-func TestSomething(t *testing.T) {
-
-  // create an instance of our test object
-  testObj := new(MyMockedObject)
-
-  // setup expectations
-  testObj.On("DoSomething", 123).Return(true, nil)
-
-  // call the code we are testing
-  targetFuncThatDoesSomethingWithObj(testObj)
-
-  // assert that the expectations were met
-  testObj.AssertExpectations(t)
-
-}
-```
-
-For more information on how to write mock code, check out the [API documentation for the `mock` package](http://godoc.org/github.com/stretchr/testify/mock).
-
-You can use the [mockery tool](http://github.com/vektra/mockery) to autogenerate the mock code against an interface as well, making using mocks much quicker.
-
-[`suite`](http://godoc.org/github.com/stretchr/testify/suite "API documentation") package
------------------------------------------------------------------------------------------
-
-The `suite` package provides functionality that you might be used to from more common object oriented languages.  With it, you can build a testing suite as a struct, build setup/teardown methods and testing methods on your struct, and run them with 'go test' as per normal.
-
-An example suite is shown below:
-
-```go
-// Basic imports
-import (
-    "testing"
-    "github.com/stretchr/testify/assert"
-    "github.com/stretchr/testify/suite"
-)
-
-// Define the suite, and absorb the built-in basic suite
-// functionality from testify - including a T() method which
-// returns the current testing context
-type ExampleTestSuite struct {
-    suite.Suite
-    VariableThatShouldStartAtFive int
-}
-
-// Make sure that VariableThatShouldStartAtFive is set to five
-// before each test
-func (suite *ExampleTestSuite) SetupTest() {
-    suite.VariableThatShouldStartAtFive = 5
-}
-
-// All methods that begin with "Test" are run as tests within a
-// suite.
-func (suite *ExampleTestSuite) TestExample() {
-    assert.Equal(suite.T(), 5, suite.VariableThatShouldStartAtFive)
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestExampleTestSuite(t *testing.T) {
-    suite.Run(t, new(ExampleTestSuite))
-}
-```
-
-For a more complete example, using all of the functionality provided by the suite package, look at our [example testing suite](https://github.com/stretchr/testify/blob/master/suite/suite_test.go)
-
-For more information on writing suites, check out the [API documentation for the `suite` package](http://godoc.org/github.com/stretchr/testify/suite).
-
-`Suite` object has assertion methods:
-
-```go
-// Basic imports
-import (
-    "testing"
-    "github.com/stretchr/testify/suite"
-)
-
-// Define the suite, and absorb the built-in basic suite
-// functionality from testify - including assertion methods.
-type ExampleTestSuite struct {
-    suite.Suite
-    VariableThatShouldStartAtFive int
-}
-
-// Make sure that VariableThatShouldStartAtFive is set to five
-// before each test
-func (suite *ExampleTestSuite) SetupTest() {
-    suite.VariableThatShouldStartAtFive = 5
-}
-
-// All methods that begin with "Test" are run as tests within a
-// suite.
-func (suite *ExampleTestSuite) TestExample() {
-    suite.Equal(suite.VariableThatShouldStartAtFive, 5)
-}
-
-// In order for 'go test' to run this suite, we need to create
-// a normal test function and pass our suite to suite.Run
-func TestExampleTestSuite(t *testing.T) {
-    suite.Run(t, new(ExampleTestSuite))
-}
-```
-
-------
-
-Installation
-============
-
-To install Testify, use `go get`:
-
-    * Latest version: go get github.com/stretchr/testify
-    * Specific version: go get gopkg.in/stretchr/testify.v1
-
-This will then make the following packages available to you:
-
-    github.com/stretchr/testify/assert
-    github.com/stretchr/testify/mock
-    github.com/stretchr/testify/http
-
-Import the `testify/assert` package into your code using this template:
-
-```go
-package yours
-
-import (
-  "testing"
-  "github.com/stretchr/testify/assert"
-)
-
-func TestSomething(t *testing.T) {
-
-  assert.True(t, true, "True is true!")
-
-}
-```
-
-------
-
-Staying up to date
-==================
-
-To update Testify to the latest version, use `go get -u github.com/stretchr/testify`.
-
-------
-
-Version History
-===============
-
-   * 1.0 - New package versioning strategy adopted.
-
-------
-
-Contributing
-============
-
-Please feel free to submit issues, fork the repository and send pull requests!
-
-When submitting an issue, we ask that you please include a complete test function that demonstrates the issue.  Extra credit for those using Testify to write the test code that demonstrates it.
-
-------
-
-Licence
-=======
-Copyright (c) 2012 - 2013 Mat Ryer and Tyler Bunnell
-
-Please consider promoting this project if you find it useful.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/installer/vendor/github.com/stretchr/testify/_codegen/main.go b/installer/vendor/github.com/stretchr/testify/_codegen/main.go
deleted file mode 100644
index 328009f84c..0000000000
--- a/installer/vendor/github.com/stretchr/testify/_codegen/main.go
+++ /dev/null
@@ -1,287 +0,0 @@
-// This program reads all assertion functions from the assert package and
-// automatically generates the corersponding requires and forwarded assertions
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/doc"
-	"go/importer"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"strings"
-	"text/template"
-
-	"github.com/ernesto-jimenez/gogen/imports"
-)
-
-var (
-	pkg       = flag.String("assert-path", "github.com/stretchr/testify/assert", "Path to the assert package")
-	outputPkg = flag.String("output-package", "", "package for the resulting code")
-	tmplFile  = flag.String("template", "", "What file to load the function template from")
-	out       = flag.String("out", "", "What file to write the source code to")
-)
-
-func main() {
-	flag.Parse()
-
-	scope, docs, err := parsePackageSource(*pkg)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	importer, funcs, err := analyzeCode(scope, docs)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if err := generateCode(importer, funcs); err != nil {
-		log.Fatal(err)
-	}
-}
-
-func generateCode(importer imports.Importer, funcs []testFunc) error {
-	buff := bytes.NewBuffer(nil)
-
-	tmplHead, tmplFunc, err := parseTemplates()
-	if err != nil {
-		return err
-	}
-
-	// Generate header
-	if err := tmplHead.Execute(buff, struct {
-		Name    string
-		Imports map[string]string
-	}{
-		*outputPkg,
-		importer.Imports(),
-	}); err != nil {
-		return err
-	}
-
-	// Generate funcs
-	for _, fn := range funcs {
-		buff.Write([]byte("\n\n"))
-		if err := tmplFunc.Execute(buff, &fn); err != nil {
-			return err
-		}
-	}
-
-	// Write file
-	output, err := outputFile()
-	if err != nil {
-		return err
-	}
-	defer output.Close()
-	_, err = io.Copy(output, buff)
-	return err
-}
-
-func parseTemplates() (*template.Template, *template.Template, error) {
-	tmplHead, err := template.New("header").Parse(headerTemplate)
-	if err != nil {
-		return nil, nil, err
-	}
-	if *tmplFile != "" {
-		f, err := ioutil.ReadFile(*tmplFile)
-		if err != nil {
-			return nil, nil, err
-		}
-		funcTemplate = string(f)
-	}
-	tmpl, err := template.New("function").Parse(funcTemplate)
-	if err != nil {
-		return nil, nil, err
-	}
-	return tmplHead, tmpl, nil
-}
-
-func outputFile() (*os.File, error) {
-	filename := *out
-	if filename == "-" || (filename == "" && *tmplFile == "") {
-		return os.Stdout, nil
-	}
-	if filename == "" {
-		filename = strings.TrimSuffix(strings.TrimSuffix(*tmplFile, ".tmpl"), ".go") + ".go"
-	}
-	return os.Create(filename)
-}
-
-// analyzeCode takes the types scope and the docs and returns the import
-// information and information about all the assertion functions.
-func analyzeCode(scope *types.Scope, docs *doc.Package) (imports.Importer, []testFunc, error) {
-	testingT := scope.Lookup("TestingT").Type().Underlying().(*types.Interface)
-
-	importer := imports.New(*outputPkg)
-	var funcs []testFunc
-	// Go through all the top level functions
-	for _, fdocs := range docs.Funcs {
-		// Find the function
-		obj := scope.Lookup(fdocs.Name)
-
-		fn, ok := obj.(*types.Func)
-		if !ok {
-			continue
-		}
-		// Check function signatuer has at least two arguments
-		sig := fn.Type().(*types.Signature)
-		if sig.Params().Len() < 2 {
-			continue
-		}
-		// Check first argument is of type testingT
-		first, ok := sig.Params().At(0).Type().(*types.Named)
-		if !ok {
-			continue
-		}
-		firstType, ok := first.Underlying().(*types.Interface)
-		if !ok {
-			continue
-		}
-		if !types.Implements(firstType, testingT) {
-			continue
-		}
-
-		funcs = append(funcs, testFunc{*outputPkg, fdocs, fn})
-		importer.AddImportsFrom(sig.Params())
-	}
-	return importer, funcs, nil
-}
-
-// parsePackageSource returns the types scope and the package documentation from the pa
-func parsePackageSource(pkg string) (*types.Scope, *doc.Package, error) {
-	pd, err := build.Import(pkg, ".", 0)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	fset := token.NewFileSet()
-	files := make(map[string]*ast.File)
-	fileList := make([]*ast.File, len(pd.GoFiles))
-	for i, fname := range pd.GoFiles {
-		src, err := ioutil.ReadFile(path.Join(pd.SrcRoot, pd.ImportPath, fname))
-		if err != nil {
-			return nil, nil, err
-		}
-		f, err := parser.ParseFile(fset, fname, src, parser.ParseComments|parser.AllErrors)
-		if err != nil {
-			return nil, nil, err
-		}
-		files[fname] = f
-		fileList[i] = f
-	}
-
-	cfg := types.Config{
-		Importer: importer.Default(),
-	}
-	info := types.Info{
-		Defs: make(map[*ast.Ident]types.Object),
-	}
-	tp, err := cfg.Check(pkg, fset, fileList, &info)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	scope := tp.Scope()
-
-	ap, _ := ast.NewPackage(fset, files, nil, nil)
-	docs := doc.New(ap, pkg, 0)
-
-	return scope, docs, nil
-}
-
-type testFunc struct {
-	CurrentPkg string
-	DocInfo    *doc.Func
-	TypeInfo   *types.Func
-}
-
-func (f *testFunc) Qualifier(p *types.Package) string {
-	if p == nil || p.Name() == f.CurrentPkg {
-		return ""
-	}
-	return p.Name()
-}
-
-func (f *testFunc) Params() string {
-	sig := f.TypeInfo.Type().(*types.Signature)
-	params := sig.Params()
-	p := ""
-	comma := ""
-	to := params.Len()
-	var i int
-
-	if sig.Variadic() {
-		to--
-	}
-	for i = 1; i < to; i++ {
-		param := params.At(i)
-		p += fmt.Sprintf("%s%s %s", comma, param.Name(), types.TypeString(param.Type(), f.Qualifier))
-		comma = ", "
-	}
-	if sig.Variadic() {
-		param := params.At(params.Len() - 1)
-		p += fmt.Sprintf("%s%s ...%s", comma, param.Name(), types.TypeString(param.Type().(*types.Slice).Elem(), f.Qualifier))
-	}
-	return p
-}
-
-func (f *testFunc) ForwardedParams() string {
-	sig := f.TypeInfo.Type().(*types.Signature)
-	params := sig.Params()
-	p := ""
-	comma := ""
-	to := params.Len()
-	var i int
-
-	if sig.Variadic() {
-		to--
-	}
-	for i = 1; i < to; i++ {
-		param := params.At(i)
-		p += fmt.Sprintf("%s%s", comma, param.Name())
-		comma = ", "
-	}
-	if sig.Variadic() {
-		param := params.At(params.Len() - 1)
-		p += fmt.Sprintf("%s%s...", comma, param.Name())
-	}
-	return p
-}
-
-func (f *testFunc) Comment() string {
-	return "// " + strings.Replace(strings.TrimSpace(f.DocInfo.Doc), "\n", "\n// ", -1)
-}
-
-func (f *testFunc) CommentWithoutT(receiver string) string {
-	search := fmt.Sprintf("assert.%s(t, ", f.DocInfo.Name)
-	replace := fmt.Sprintf("%s.%s(", receiver, f.DocInfo.Name)
-	return strings.Replace(f.Comment(), search, replace, -1)
-}
-
-var headerTemplate = `/*
-* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
-* THIS FILE MUST NOT BE EDITED BY HAND
-*/
-
-package {{.Name}}
-
-import (
-{{range $path, $name := .Imports}}
-	{{$name}} "{{$path}}"{{end}}
-)
-`
-
-var funcTemplate = `{{.Comment}}
-func (fwd *AssertionsForwarder) {{.DocInfo.Name}}({{.Params}}) bool {
-	return assert.{{.DocInfo.Name}}({{.ForwardedParams}})
-}`
diff --git a/installer/vendor/github.com/stretchr/testify/assert/assertion_format.go b/installer/vendor/github.com/stretchr/testify/assert/assertion_format.go
new file mode 100644
index 0000000000..ae06a54e20
--- /dev/null
+++ b/installer/vendor/github.com/stretchr/testify/assert/assertion_format.go
@@ -0,0 +1,349 @@
+/*
+* CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
+* THIS FILE MUST NOT BE EDITED BY HAND
+ */
+
+package assert
+
+import (
+	http "net/http"
+	url "net/url"
+	time "time"
+)
+
+// Conditionf uses a Comparison to assert a complex condition.
+func Conditionf(t TestingT, comp Comparison, msg string, args ...interface{}) bool {
+	return Condition(t, comp, append([]interface{}{msg}, args...)...)
+}
+
+// Containsf asserts that the specified string, list(array, slice...) or map contains the
+// specified substring or element.
+//
+//    assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
+//    assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
+//    assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
+func Containsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) bool {
+	return Contains(t, s, contains, append([]interface{}{msg}, args...)...)
+}
+
+// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func DirExistsf(t TestingT, path string, msg string, args ...interface{}) bool {
+	return DirExists(t, path, append([]interface{}{msg}, args...)...)
+}
+
+// ElementsMatchf asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// assert.ElementsMatchf(t, [1, 3, 2, 3], [1, 3, 3, 2], "error message %s", "formatted")
+func ElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg string, args ...interface{}) bool {
+	return ElementsMatch(t, listA, listB, append([]interface{}{msg}, args...)...)
+}
+
+// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  assert.Emptyf(t, obj, "error message %s", "formatted")
+func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
+	return Empty(t, object, append([]interface{}{msg}, args...)...)
+}
+
+// Equalf asserts that two objects are equal.
+//
+//    assert.Equalf(t, 123, 123, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
+func Equalf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return Equal(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
+// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// and that it is equal to the provided error.
+//
+//   actualObj, err := SomeFunction()
+//   assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
+func EqualErrorf(t TestingT, theError error, errString string, msg string, args ...interface{}) bool {
+	return EqualError(t, theError, errString, append([]interface{}{msg}, args...)...)
+}
+
+// EqualValuesf asserts that two objects are equal or convertable to the same types
+// and equal.
+//
+//    assert.EqualValuesf(t, uint32(123, "error message %s", "formatted"), int32(123))
+func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return EqualValues(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
+// Errorf asserts that a function returned an error (i.e. not `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if assert.Errorf(t, err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedErrorf, err)
+//   }
+func Errorf(t TestingT, err error, msg string, args ...interface{}) bool {
+	return Error(t, err, append([]interface{}{msg}, args...)...)
+}
+
+// Exactlyf asserts that two objects are equal in value and type.
+//
+//    assert.Exactlyf(t, int32(123, "error message %s", "formatted"), int64(123))
+func Exactlyf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return Exactly(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
+// Failf reports a failure through
+func Failf(t TestingT, failureMessage string, msg string, args ...interface{}) bool {
+	return Fail(t, failureMessage, append([]interface{}{msg}, args...)...)
+}
+
+// FailNowf fails test
+func FailNowf(t TestingT, failureMessage string, msg string, args ...interface{}) bool {
+	return FailNow(t, failureMessage, append([]interface{}{msg}, args...)...)
+}
+
+// Falsef asserts that the specified value is false.
+//
+//    assert.Falsef(t, myBool, "error message %s", "formatted")
+func Falsef(t TestingT, value bool, msg string, args ...interface{}) bool {
+	return False(t, value, append([]interface{}{msg}, args...)...)
+}
+
+// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func FileExistsf(t TestingT, path string, msg string, args ...interface{}) bool {
+	return FileExists(t, path, append([]interface{}{msg}, args...)...)
+}
+
+// HTTPBodyContainsf asserts that a specified handler returns a
+// body that contains a string.
+//
+//  assert.HTTPBodyContainsf(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
+	return HTTPBodyContains(t, handler, method, url, values, str, append([]interface{}{msg}, args...)...)
+}
+
+// HTTPBodyNotContainsf asserts that a specified handler returns a
+// body that does not contain a string.
+//
+//  assert.HTTPBodyNotContainsf(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
+	return HTTPBodyNotContains(t, handler, method, url, values, str, append([]interface{}{msg}, args...)...)
+}
+
+// HTTPErrorf asserts that a specified handler returns an error status code.
+//
+//  assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPError(t, handler, method, url, values, append([]interface{}{msg}, args...)...)
+}
+
+// HTTPRedirectf asserts that a specified handler returns a redirect status code.
+//
+//  assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPRedirect(t, handler, method, url, values, append([]interface{}{msg}, args...)...)
+}
+
+// HTTPSuccessf asserts that a specified handler returns a success status code.
+//
+//  assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPSuccess(t, handler, method, url, values, append([]interface{}{msg}, args...)...)
+}
+
+// Implementsf asserts that an object is implemented by the specified interface.
+//
+//    assert.Implementsf(t, (*MyInterface, "error message %s", "formatted")(nil), new(MyObject))
+func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, msg string, args ...interface{}) bool {
+	return Implements(t, interfaceObject, object, append([]interface{}{msg}, args...)...)
+}
+
+// InDeltaf asserts that the two numerals are within delta of each other.
+//
+// 	 assert.InDeltaf(t, math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01)
+func InDeltaf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDelta(t, expected, actual, delta, append([]interface{}{msg}, args...)...)
+}
+
+// InDeltaMapValuesf is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func InDeltaMapValuesf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDeltaMapValues(t, expected, actual, delta, append([]interface{}{msg}, args...)...)
+}
+
+// InDeltaSlicef is the same as InDelta, except it compares two slices.
+func InDeltaSlicef(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDeltaSlice(t, expected, actual, delta, append([]interface{}{msg}, args...)...)
+}
+
+// InEpsilonf asserts that expected and actual have a relative error less than epsilon
+func InEpsilonf(t TestingT, expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) bool {
+	return InEpsilon(t, expected, actual, epsilon, append([]interface{}{msg}, args...)...)
+}
+
+// InEpsilonSlicef is the same as InEpsilon, except it compares each value from two slices.
+func InEpsilonSlicef(t TestingT, expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) bool {
+	return InEpsilonSlice(t, expected, actual, epsilon, append([]interface{}{msg}, args...)...)
+}
+
+// IsTypef asserts that the specified objects are of the same type.
+func IsTypef(t TestingT, expectedType interface{}, object interface{}, msg string, args ...interface{}) bool {
+	return IsType(t, expectedType, object, append([]interface{}{msg}, args...)...)
+}
+
+// JSONEqf asserts that two JSON strings are equivalent.
+//
+//  assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+func JSONEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) bool {
+	return JSONEq(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
+// Lenf asserts that the specified object has specific length.
+// Lenf also fails if the object has a type that len() not accept.
+//
+//    assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
+func Lenf(t TestingT, object interface{}, length int, msg string, args ...interface{}) bool {
+	return Len(t, object, length, append([]interface{}{msg}, args...)...)
+}
+
+// Nilf asserts that the specified object is nil.
+//
+//    assert.Nilf(t, err, "error message %s", "formatted")
+func Nilf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
+	return Nil(t, object, append([]interface{}{msg}, args...)...)
+}
+
+// NoErrorf asserts that a function returned no error (i.e. `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if assert.NoErrorf(t, err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedObj, actualObj)
+//   }
+func NoErrorf(t TestingT, err error, msg string, args ...interface{}) bool {
+	return NoError(t, err, append([]interface{}{msg}, args...)...)
+}
+
+// NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
+// specified substring or element.
+//
+//    assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
+//    assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
+//    assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
+func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) bool {
+	return NotContains(t, s, contains, append([]interface{}{msg}, args...)...)
+}
+
+// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
+//    assert.Equal(t, "two", obj[1])
+//  }
+func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
+	return NotEmpty(t, object, append([]interface{}{msg}, args...)...)
+}
+
+// NotEqualf asserts that the specified values are NOT equal.
+//
+//    assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
+func NotEqualf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return NotEqual(t, expected, actual, append([]interface{}{msg}, args...)...)
+}
+
+// NotNilf asserts that the specified object is not nil.
+//
+//    assert.NotNilf(t, err, "error message %s", "formatted")
+func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) bool {
+	return NotNil(t, object, append([]interface{}{msg}, args...)...)
+}
+
+// NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
+//
+//   assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
+func NotPanicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool {
+	return NotPanics(t, f, append([]interface{}{msg}, args...)...)
+}
+
+// NotRegexpf asserts that a specified regexp does not match a string.
+//
+//  assert.NotRegexpf(t, regexp.MustCompile("starts", "error message %s", "formatted"), "it's starting")
+//  assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
+func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) bool {
+	return NotRegexp(t, rx, str, append([]interface{}{msg}, args...)...)
+}
+
+// NotSubsetf asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+func NotSubsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
+	return NotSubset(t, list, subset, append([]interface{}{msg}, args...)...)
+}
+
+// NotZerof asserts that i is not the zero value for its type.
+func NotZerof(t TestingT, i interface{}, msg string, args ...interface{}) bool {
+	return NotZero(t, i, append([]interface{}{msg}, args...)...)
+}
+
+// Panicsf asserts that the code inside the specified PanicTestFunc panics.
+//
+//   assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
+func Panicsf(t TestingT, f PanicTestFunc, msg string, args ...interface{}) bool {
+	return Panics(t, f, append([]interface{}{msg}, args...)...)
+}
+
+// PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+func PanicsWithValuef(t TestingT, expected interface{}, f PanicTestFunc, msg string, args ...interface{}) bool {
+	return PanicsWithValue(t, expected, f, append([]interface{}{msg}, args...)...)
+}
+
+// Regexpf asserts that a specified regexp matches a string.
+//
+//  assert.Regexpf(t, regexp.MustCompile("start", "error message %s", "formatted"), "it's starting")
+//  assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
+func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) bool {
+	return Regexp(t, rx, str, append([]interface{}{msg}, args...)...)
+}
+
+// Subsetf asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) bool {
+	return Subset(t, list, subset, append([]interface{}{msg}, args...)...)
+}
+
+// Truef asserts that the specified value is true.
+//
+//    assert.Truef(t, myBool, "error message %s", "formatted")
+func Truef(t TestingT, value bool, msg string, args ...interface{}) bool {
+	return True(t, value, append([]interface{}{msg}, args...)...)
+}
+
+// WithinDurationf asserts that the two times are within duration delta of each other.
+//
+//   assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) bool {
+	return WithinDuration(t, expected, actual, delta, append([]interface{}{msg}, args...)...)
+}
+
+// Zerof asserts that i is the zero value for its type.
+func Zerof(t TestingT, i interface{}, msg string, args ...interface{}) bool {
+	return Zero(t, i, append([]interface{}{msg}, args...)...)
+}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go b/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go
index e6a796046c..ffa5428f34 100644
--- a/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go
+++ b/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go
@@ -1,387 +1,686 @@
 /*
 * CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
 * THIS FILE MUST NOT BE EDITED BY HAND
-*/
+ */
 
 package assert
 
 import (
-
 	http "net/http"
 	url "net/url"
 	time "time"
 )
 
-
 // Condition uses a Comparison to assert a complex condition.
 func (a *Assertions) Condition(comp Comparison, msgAndArgs ...interface{}) bool {
 	return Condition(a.t, comp, msgAndArgs...)
 }
 
+// Conditionf uses a Comparison to assert a complex condition.
+func (a *Assertions) Conditionf(comp Comparison, msg string, args ...interface{}) bool {
+	return Conditionf(a.t, comp, msg, args...)
+}
 
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
-// 
-//    a.Contains("Hello World", "World", "But 'Hello World' does contain 'World'")
-//    a.Contains(["Hello", "World"], "World", "But ["Hello", "World"] does contain 'World'")
-//    a.Contains({"Hello": "World"}, "Hello", "But {'Hello': 'World'} does contain 'Hello'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Contains("Hello World", "World")
+//    a.Contains(["Hello", "World"], "World")
+//    a.Contains({"Hello": "World"}, "Hello")
 func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ...interface{}) bool {
 	return Contains(a.t, s, contains, msgAndArgs...)
 }
 
+// Containsf asserts that the specified string, list(array, slice...) or map contains the
+// specified substring or element.
+//
+//    a.Containsf("Hello World", "World", "error message %s", "formatted")
+//    a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
+//    a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
+func (a *Assertions) Containsf(s interface{}, contains interface{}, msg string, args ...interface{}) bool {
+	return Containsf(a.t, s, contains, msg, args...)
+}
+
+// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func (a *Assertions) DirExists(path string, msgAndArgs ...interface{}) bool {
+	return DirExists(a.t, path, msgAndArgs...)
+}
+
+// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func (a *Assertions) DirExistsf(path string, msg string, args ...interface{}) bool {
+	return DirExistsf(a.t, path, msg, args...)
+}
+
+// ElementsMatch asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// a.ElementsMatch([1, 3, 2, 3], [1, 3, 3, 2])
+func (a *Assertions) ElementsMatch(listA interface{}, listB interface{}, msgAndArgs ...interface{}) bool {
+	return ElementsMatch(a.t, listA, listB, msgAndArgs...)
+}
+
+// ElementsMatchf asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// a.ElementsMatchf([1, 3, 2, 3], [1, 3, 3, 2], "error message %s", "formatted")
+func (a *Assertions) ElementsMatchf(listA interface{}, listB interface{}, msg string, args ...interface{}) bool {
+	return ElementsMatchf(a.t, listA, listB, msg, args...)
+}
 
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  a.Empty(obj)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) bool {
 	return Empty(a.t, object, msgAndArgs...)
 }
 
+// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  a.Emptyf(obj, "error message %s", "formatted")
+func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{}) bool {
+	return Emptyf(a.t, object, msg, args...)
+}
 
 // Equal asserts that two objects are equal.
-// 
-//    a.Equal(123, 123, "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Equal(123, 123)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
 func (a *Assertions) Equal(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	return Equal(a.t, expected, actual, msgAndArgs...)
 }
 
-
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
-//   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//   a.EqualError(err,  expectedErrorString)
 func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) bool {
 	return EqualError(a.t, theError, errString, msgAndArgs...)
 }
 
+// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// and that it is equal to the provided error.
+//
+//   actualObj, err := SomeFunction()
+//   a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
+func (a *Assertions) EqualErrorf(theError error, errString string, msg string, args ...interface{}) bool {
+	return EqualErrorf(a.t, theError, errString, msg, args...)
+}
 
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
-// 
-//    a.EqualValues(uint32(123), int32(123), "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.EqualValues(uint32(123), int32(123))
 func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	return EqualValues(a.t, expected, actual, msgAndArgs...)
 }
 
+// EqualValuesf asserts that two objects are equal or convertable to the same types
+// and equal.
+//
+//    a.EqualValuesf(uint32(123, "error message %s", "formatted"), int32(123))
+func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return EqualValuesf(a.t, expected, actual, msg, args...)
+}
+
+// Equalf asserts that two objects are equal.
+//
+//    a.Equalf(123, 123, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
+func (a *Assertions) Equalf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return Equalf(a.t, expected, actual, msg, args...)
+}
 
 // Error asserts that a function returned an error (i.e. not `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if a.Error(err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
+//   if a.Error(err) {
+// 	   assert.Equal(t, expectedError, err)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Error(err error, msgAndArgs ...interface{}) bool {
 	return Error(a.t, err, msgAndArgs...)
 }
 
+// Errorf asserts that a function returned an error (i.e. not `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if a.Errorf(err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedErrorf, err)
+//   }
+func (a *Assertions) Errorf(err error, msg string, args ...interface{}) bool {
+	return Errorf(a.t, err, msg, args...)
+}
 
-// Exactly asserts that two objects are equal is value and type.
-// 
-//    a.Exactly(int32(123), int64(123), "123 and 123 should NOT be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+// Exactly asserts that two objects are equal in value and type.
+//
+//    a.Exactly(int32(123), int64(123))
 func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	return Exactly(a.t, expected, actual, msgAndArgs...)
 }
 
+// Exactlyf asserts that two objects are equal in value and type.
+//
+//    a.Exactlyf(int32(123, "error message %s", "formatted"), int64(123))
+func (a *Assertions) Exactlyf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return Exactlyf(a.t, expected, actual, msg, args...)
+}
 
 // Fail reports a failure through
 func (a *Assertions) Fail(failureMessage string, msgAndArgs ...interface{}) bool {
 	return Fail(a.t, failureMessage, msgAndArgs...)
 }
 
-
 // FailNow fails test
 func (a *Assertions) FailNow(failureMessage string, msgAndArgs ...interface{}) bool {
 	return FailNow(a.t, failureMessage, msgAndArgs...)
 }
 
+// FailNowf fails test
+func (a *Assertions) FailNowf(failureMessage string, msg string, args ...interface{}) bool {
+	return FailNowf(a.t, failureMessage, msg, args...)
+}
+
+// Failf reports a failure through
+func (a *Assertions) Failf(failureMessage string, msg string, args ...interface{}) bool {
+	return Failf(a.t, failureMessage, msg, args...)
+}
 
 // False asserts that the specified value is false.
-// 
-//    a.False(myBool, "myBool should be false")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.False(myBool)
 func (a *Assertions) False(value bool, msgAndArgs ...interface{}) bool {
 	return False(a.t, value, msgAndArgs...)
 }
 
+// Falsef asserts that the specified value is false.
+//
+//    a.Falsef(myBool, "error message %s", "formatted")
+func (a *Assertions) Falsef(value bool, msg string, args ...interface{}) bool {
+	return Falsef(a.t, value, msg, args...)
+}
+
+// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func (a *Assertions) FileExists(path string, msgAndArgs ...interface{}) bool {
+	return FileExists(a.t, path, msgAndArgs...)
+}
+
+// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func (a *Assertions) FileExistsf(path string, msg string, args ...interface{}) bool {
+	return FileExistsf(a.t, path, msg, args...)
+}
 
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
-// 
+//
 //  a.HTTPBodyContains(myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) bool {
-	return HTTPBodyContains(a.t, handler, method, url, values, str)
+func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
+	return HTTPBodyContains(a.t, handler, method, url, values, str, msgAndArgs...)
 }
 
+// HTTPBodyContainsf asserts that a specified handler returns a
+// body that contains a string.
+//
+//  a.HTTPBodyContainsf(myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
+	return HTTPBodyContainsf(a.t, handler, method, url, values, str, msg, args...)
+}
 
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
-// 
+//
 //  a.HTTPBodyNotContains(myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) bool {
-	return HTTPBodyNotContains(a.t, handler, method, url, values, str)
+func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
+	return HTTPBodyNotContains(a.t, handler, method, url, values, str, msgAndArgs...)
 }
 
+// HTTPBodyNotContainsf asserts that a specified handler returns a
+// body that does not contain a string.
+//
+//  a.HTTPBodyNotContainsf(myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) bool {
+	return HTTPBodyNotContainsf(a.t, handler, method, url, values, str, msg, args...)
+}
 
 // HTTPError asserts that a specified handler returns an error status code.
-// 
+//
 //  a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values) bool {
-	return HTTPError(a.t, handler, method, url, values)
+func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	return HTTPError(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPErrorf asserts that a specified handler returns an error status code.
+//
+//  a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPErrorf(a.t, handler, method, url, values, msg, args...)
+}
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
-// 
+//
 //  a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values) bool {
-	return HTTPRedirect(a.t, handler, method, url, values)
+func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	return HTTPRedirect(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPRedirectf asserts that a specified handler returns a redirect status code.
+//
+//  a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPRedirectf(a.t, handler, method, url, values, msg, args...)
+}
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
-// 
+//
 //  a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values) bool {
-	return HTTPSuccess(a.t, handler, method, url, values)
+func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	return HTTPSuccess(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPSuccessf asserts that a specified handler returns a success status code.
+//
+//  a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) bool {
+	return HTTPSuccessf(a.t, handler, method, url, values, msg, args...)
+}
 
 // Implements asserts that an object is implemented by the specified interface.
-// 
-//    a.Implements((*MyInterface)(nil), new(MyObject), "MyObject")
+//
+//    a.Implements((*MyInterface)(nil), new(MyObject))
 func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
 	return Implements(a.t, interfaceObject, object, msgAndArgs...)
 }
 
+// Implementsf asserts that an object is implemented by the specified interface.
+//
+//    a.Implementsf((*MyInterface, "error message %s", "formatted")(nil), new(MyObject))
+func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}, msg string, args ...interface{}) bool {
+	return Implementsf(a.t, interfaceObject, object, msg, args...)
+}
 
 // InDelta asserts that the two numerals are within delta of each other.
-// 
+//
 // 	 a.InDelta(math.Pi, (22 / 7.0), 0.01)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) InDelta(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
 	return InDelta(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// InDeltaMapValues is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func (a *Assertions) InDeltaMapValues(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
+	return InDeltaMapValues(a.t, expected, actual, delta, msgAndArgs...)
+}
+
+// InDeltaMapValuesf is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func (a *Assertions) InDeltaMapValuesf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDeltaMapValuesf(a.t, expected, actual, delta, msg, args...)
+}
 
 // InDeltaSlice is the same as InDelta, except it compares two slices.
 func (a *Assertions) InDeltaSlice(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
 	return InDeltaSlice(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// InDeltaSlicef is the same as InDelta, except it compares two slices.
+func (a *Assertions) InDeltaSlicef(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDeltaSlicef(a.t, expected, actual, delta, msg, args...)
+}
+
+// InDeltaf asserts that the two numerals are within delta of each other.
+//
+// 	 a.InDeltaf(math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01)
+func (a *Assertions) InDeltaf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) bool {
+	return InDeltaf(a.t, expected, actual, delta, msg, args...)
+}
 
 // InEpsilon asserts that expected and actual have a relative error less than epsilon
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) InEpsilon(expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) bool {
 	return InEpsilon(a.t, expected, actual, epsilon, msgAndArgs...)
 }
 
+// InEpsilonSlice is the same as InEpsilon, except it compares each value from two slices.
+func (a *Assertions) InEpsilonSlice(expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) bool {
+	return InEpsilonSlice(a.t, expected, actual, epsilon, msgAndArgs...)
+}
 
-// InEpsilonSlice is the same as InEpsilon, except it compares two slices.
-func (a *Assertions) InEpsilonSlice(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
-	return InEpsilonSlice(a.t, expected, actual, delta, msgAndArgs...)
+// InEpsilonSlicef is the same as InEpsilon, except it compares each value from two slices.
+func (a *Assertions) InEpsilonSlicef(expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) bool {
+	return InEpsilonSlicef(a.t, expected, actual, epsilon, msg, args...)
 }
 
+// InEpsilonf asserts that expected and actual have a relative error less than epsilon
+func (a *Assertions) InEpsilonf(expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) bool {
+	return InEpsilonf(a.t, expected, actual, epsilon, msg, args...)
+}
 
 // IsType asserts that the specified objects are of the same type.
 func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAndArgs ...interface{}) bool {
 	return IsType(a.t, expectedType, object, msgAndArgs...)
 }
 
+// IsTypef asserts that the specified objects are of the same type.
+func (a *Assertions) IsTypef(expectedType interface{}, object interface{}, msg string, args ...interface{}) bool {
+	return IsTypef(a.t, expectedType, object, msg, args...)
+}
 
 // JSONEq asserts that two JSON strings are equivalent.
-// 
+//
 //  a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interface{}) bool {
 	return JSONEq(a.t, expected, actual, msgAndArgs...)
 }
 
+// JSONEqf asserts that two JSON strings are equivalent.
+//
+//  a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ...interface{}) bool {
+	return JSONEqf(a.t, expected, actual, msg, args...)
+}
 
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
-// 
-//    a.Len(mySlice, 3, "The size of slice is not 3")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Len(mySlice, 3)
 func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) bool {
 	return Len(a.t, object, length, msgAndArgs...)
 }
 
+// Lenf asserts that the specified object has specific length.
+// Lenf also fails if the object has a type that len() not accept.
+//
+//    a.Lenf(mySlice, 3, "error message %s", "formatted")
+func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...interface{}) bool {
+	return Lenf(a.t, object, length, msg, args...)
+}
 
 // Nil asserts that the specified object is nil.
-// 
-//    a.Nil(err, "err should be nothing")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Nil(err)
 func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) bool {
 	return Nil(a.t, object, msgAndArgs...)
 }
 
+// Nilf asserts that the specified object is nil.
+//
+//    a.Nilf(err, "error message %s", "formatted")
+func (a *Assertions) Nilf(object interface{}, msg string, args ...interface{}) bool {
+	return Nilf(a.t, object, msg, args...)
+}
 
 // NoError asserts that a function returned no error (i.e. `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
 //   if a.NoError(err) {
-// 	   assert.Equal(t, actualObj, expectedObj)
+// 	   assert.Equal(t, expectedObj, actualObj)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) bool {
 	return NoError(a.t, err, msgAndArgs...)
 }
 
+// NoErrorf asserts that a function returned no error (i.e. `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if a.NoErrorf(err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedObj, actualObj)
+//   }
+func (a *Assertions) NoErrorf(err error, msg string, args ...interface{}) bool {
+	return NoErrorf(a.t, err, msg, args...)
+}
 
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
-// 
-//    a.NotContains("Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//    a.NotContains(["Hello", "World"], "Earth", "But ['Hello', 'World'] does NOT contain 'Earth'")
-//    a.NotContains({"Hello": "World"}, "Earth", "But {'Hello': 'World'} does NOT contain 'Earth'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotContains("Hello World", "Earth")
+//    a.NotContains(["Hello", "World"], "Earth")
+//    a.NotContains({"Hello": "World"}, "Earth")
 func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs ...interface{}) bool {
 	return NotContains(a.t, s, contains, msgAndArgs...)
 }
 
+// NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
+// specified substring or element.
+//
+//    a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
+//    a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
+//    a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
+func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg string, args ...interface{}) bool {
+	return NotContainsf(a.t, s, contains, msg, args...)
+}
 
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  if a.NotEmpty(obj) {
 //    assert.Equal(t, "two", obj[1])
 //  }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) bool {
 	return NotEmpty(a.t, object, msgAndArgs...)
 }
 
+// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  if a.NotEmptyf(obj, "error message %s", "formatted") {
+//    assert.Equal(t, "two", obj[1])
+//  }
+func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface{}) bool {
+	return NotEmptyf(a.t, object, msg, args...)
+}
 
 // NotEqual asserts that the specified values are NOT equal.
-// 
-//    a.NotEqual(obj1, obj2, "two objects shouldn't be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotEqual(obj1, obj2)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
 func (a *Assertions) NotEqual(expected interface{}, actual interface{}, msgAndArgs ...interface{}) bool {
 	return NotEqual(a.t, expected, actual, msgAndArgs...)
 }
 
+// NotEqualf asserts that the specified values are NOT equal.
+//
+//    a.NotEqualf(obj1, obj2, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
+func (a *Assertions) NotEqualf(expected interface{}, actual interface{}, msg string, args ...interface{}) bool {
+	return NotEqualf(a.t, expected, actual, msg, args...)
+}
 
 // NotNil asserts that the specified object is not nil.
-// 
-//    a.NotNil(err, "err should be something")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotNil(err)
 func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) bool {
 	return NotNil(a.t, object, msgAndArgs...)
 }
 
+// NotNilf asserts that the specified object is not nil.
+//
+//    a.NotNilf(err, "error message %s", "formatted")
+func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}) bool {
+	return NotNilf(a.t, object, msg, args...)
+}
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-// 
-//   a.NotPanics(func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.NotPanics(func(){ RemainCalm() })
 func (a *Assertions) NotPanics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	return NotPanics(a.t, f, msgAndArgs...)
 }
 
+// NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
+//
+//   a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
+func (a *Assertions) NotPanicsf(f PanicTestFunc, msg string, args ...interface{}) bool {
+	return NotPanicsf(a.t, f, msg, args...)
+}
 
 // NotRegexp asserts that a specified regexp does not match a string.
-// 
+//
 //  a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
 //  a.NotRegexp("^start", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	return NotRegexp(a.t, rx, str, msgAndArgs...)
 }
 
+// NotRegexpf asserts that a specified regexp does not match a string.
+//
+//  a.NotRegexpf(regexp.MustCompile("starts", "error message %s", "formatted"), "it's starting")
+//  a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
+func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, args ...interface{}) bool {
+	return NotRegexpf(a.t, rx, str, msg, args...)
+}
+
+// NotSubset asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
+	return NotSubset(a.t, list, subset, msgAndArgs...)
+}
 
-// NotZero asserts that i is not the zero value for its type and returns the truth.
+// NotSubsetf asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+func (a *Assertions) NotSubsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
+	return NotSubsetf(a.t, list, subset, msg, args...)
+}
+
+// NotZero asserts that i is not the zero value for its type.
 func (a *Assertions) NotZero(i interface{}, msgAndArgs ...interface{}) bool {
 	return NotZero(a.t, i, msgAndArgs...)
 }
 
+// NotZerof asserts that i is not the zero value for its type.
+func (a *Assertions) NotZerof(i interface{}, msg string, args ...interface{}) bool {
+	return NotZerof(a.t, i, msg, args...)
+}
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
-// 
-//   a.Panics(func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.Panics(func(){ GoCrazy() })
 func (a *Assertions) Panics(f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	return Panics(a.t, f, msgAndArgs...)
 }
 
+// PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   a.PanicsWithValue("crazy error", func(){ GoCrazy() })
+func (a *Assertions) PanicsWithValue(expected interface{}, f PanicTestFunc, msgAndArgs ...interface{}) bool {
+	return PanicsWithValue(a.t, expected, f, msgAndArgs...)
+}
+
+// PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+func (a *Assertions) PanicsWithValuef(expected interface{}, f PanicTestFunc, msg string, args ...interface{}) bool {
+	return PanicsWithValuef(a.t, expected, f, msg, args...)
+}
+
+// Panicsf asserts that the code inside the specified PanicTestFunc panics.
+//
+//   a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
+func (a *Assertions) Panicsf(f PanicTestFunc, msg string, args ...interface{}) bool {
+	return Panicsf(a.t, f, msg, args...)
+}
 
 // Regexp asserts that a specified regexp matches a string.
-// 
+//
 //  a.Regexp(regexp.MustCompile("start"), "it's starting")
 //  a.Regexp("start...$", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	return Regexp(a.t, rx, str, msgAndArgs...)
 }
 
+// Regexpf asserts that a specified regexp matches a string.
+//
+//  a.Regexpf(regexp.MustCompile("start", "error message %s", "formatted"), "it's starting")
+//  a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
+func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args ...interface{}) bool {
+	return Regexpf(a.t, rx, str, msg, args...)
+}
+
+// Subset asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...interface{}) bool {
+	return Subset(a.t, list, subset, msgAndArgs...)
+}
+
+// Subsetf asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, args ...interface{}) bool {
+	return Subsetf(a.t, list, subset, msg, args...)
+}
 
 // True asserts that the specified value is true.
-// 
-//    a.True(myBool, "myBool should be true")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.True(myBool)
 func (a *Assertions) True(value bool, msgAndArgs ...interface{}) bool {
 	return True(a.t, value, msgAndArgs...)
 }
 
+// Truef asserts that the specified value is true.
+//
+//    a.Truef(myBool, "error message %s", "formatted")
+func (a *Assertions) Truef(value bool, msg string, args ...interface{}) bool {
+	return Truef(a.t, value, msg, args...)
+}
 
 // WithinDuration asserts that the two times are within duration delta of each other.
-// 
-//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
 func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
 	return WithinDuration(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// WithinDurationf asserts that the two times are within duration delta of each other.
+//
+//   a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) bool {
+	return WithinDurationf(a.t, expected, actual, delta, msg, args...)
+}
 
-// Zero asserts that i is the zero value for its type and returns the truth.
+// Zero asserts that i is the zero value for its type.
 func (a *Assertions) Zero(i interface{}, msgAndArgs ...interface{}) bool {
 	return Zero(a.t, i, msgAndArgs...)
 }
+
+// Zerof asserts that i is the zero value for its type.
+func (a *Assertions) Zerof(i interface{}, msg string, args ...interface{}) bool {
+	return Zerof(a.t, i, msg, args...)
+}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go.tmpl b/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go.tmpl
deleted file mode 100644
index 99f9acfbba..0000000000
--- a/installer/vendor/github.com/stretchr/testify/assert/assertion_forward.go.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{.CommentWithoutT "a"}}
-func (a *Assertions) {{.DocInfo.Name}}({{.Params}}) bool {
-	return {{.DocInfo.Name}}(a.t, {{.ForwardedParams}})
-}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/assertions.go b/installer/vendor/github.com/stretchr/testify/assert/assertions.go
index b3f4e170d6..47bda77866 100644
--- a/installer/vendor/github.com/stretchr/testify/assert/assertions.go
+++ b/installer/vendor/github.com/stretchr/testify/assert/assertions.go
@@ -4,8 +4,10 @@ import (
 	"bufio"
 	"bytes"
 	"encoding/json"
+	"errors"
 	"fmt"
 	"math"
+	"os"
 	"reflect"
 	"regexp"
 	"runtime"
@@ -18,9 +20,7 @@ import (
 	"github.com/pmezard/go-difflib/difflib"
 )
 
-func init() {
-	spew.Config.SortKeys = true
-}
+//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_format.go.tmpl
 
 // TestingT is an interface wrapper around *testing.T
 type TestingT interface {
@@ -42,7 +42,15 @@ func ObjectsAreEqual(expected, actual interface{}) bool {
 	if expected == nil || actual == nil {
 		return expected == actual
 	}
-
+	if exp, ok := expected.([]byte); ok {
+		act, ok := actual.([]byte)
+		if !ok {
+			return false
+		} else if exp == nil || act == nil {
+			return exp == nil && act == nil
+		}
+		return bytes.Equal(exp, act)
+	}
 	return reflect.DeepEqual(expected, actual)
 
 }
@@ -112,10 +120,12 @@ func CallerInfo() []string {
 		}
 
 		parts := strings.Split(file, "/")
-		dir := parts[len(parts)-2]
 		file = parts[len(parts)-1]
-		if (dir != "assert" && dir != "mock" && dir != "require") || file == "mock_test.go" {
-			callers = append(callers, fmt.Sprintf("%s:%d", file, line))
+		if len(parts) > 1 {
+			dir := parts[len(parts)-2]
+			if (dir != "assert" && dir != "mock" && dir != "require") || file == "mock_test.go" {
+				callers = append(callers, fmt.Sprintf("%s:%d", file, line))
+			}
 		}
 
 		// Drop the package
@@ -157,7 +167,7 @@ func getWhitespaceString() string {
 	parts := strings.Split(file, "/")
 	file = parts[len(parts)-1]
 
-	return strings.Repeat(" ", len(fmt.Sprintf("%s:%d:      ", file, line)))
+	return strings.Repeat(" ", len(fmt.Sprintf("%s:%d:        ", file, line)))
 
 }
 
@@ -174,22 +184,18 @@ func messageFromMsgAndArgs(msgAndArgs ...interface{}) string {
 	return ""
 }
 
-// Indents all lines of the message by appending a number of tabs to each line, in an output format compatible with Go's
-// test printing (see inner comment for specifics)
-func indentMessageLines(message string, tabs int) string {
+// Aligns the provided message so that all lines after the first line start at the same location as the first line.
+// Assumes that the first line starts at the correct location (after carriage return, tab, label, spacer and tab).
+// The longestLabelLen parameter specifies the length of the longest label in the output (required becaues this is the
+// basis on which the alignment occurs).
+func indentMessageLines(message string, longestLabelLen int) string {
 	outBuf := new(bytes.Buffer)
 
 	for i, scanner := 0, bufio.NewScanner(strings.NewReader(message)); scanner.Scan(); i++ {
+		// no need to align first line because it starts at the correct location (after the label)
 		if i != 0 {
-			outBuf.WriteRune('\n')
-		}
-		for ii := 0; ii < tabs; ii++ {
-			outBuf.WriteRune('\t')
-			// Bizarrely, all lines except the first need one fewer tabs prepended, so deliberately advance the counter
-			// by 1 prematurely.
-			if ii == 0 && i > 0 {
-				ii++
-			}
+			// append alignLen+1 spaces to align with "{{longestLabel}}:" before adding tab
+			outBuf.WriteString("\n\r\t" + strings.Repeat(" ", longestLabelLen+1) + "\t")
 		}
 		outBuf.WriteString(scanner.Text())
 	}
@@ -221,42 +227,70 @@ func FailNow(t TestingT, failureMessage string, msgAndArgs ...interface{}) bool
 
 // Fail reports a failure through
 func Fail(t TestingT, failureMessage string, msgAndArgs ...interface{}) bool {
+	content := []labeledContent{
+		{"Error Trace", strings.Join(CallerInfo(), "\n\r\t\t\t")},
+		{"Error", failureMessage},
+	}
 
-	message := messageFromMsgAndArgs(msgAndArgs...)
+	// Add test name if the Go version supports it
+	if n, ok := t.(interface {
+		Name() string
+	}); ok {
+		content = append(content, labeledContent{"Test", n.Name()})
+	}
 
-	errorTrace := strings.Join(CallerInfo(), "\n\r\t\t\t")
+	message := messageFromMsgAndArgs(msgAndArgs...)
 	if len(message) > 0 {
-		t.Errorf("\r%s\r\tError Trace:\t%s\n"+
-			"\r\tError:%s\n"+
-			"\r\tMessages:\t%s\n\r",
-			getWhitespaceString(),
-			errorTrace,
-			indentMessageLines(failureMessage, 2),
-			message)
-	} else {
-		t.Errorf("\r%s\r\tError Trace:\t%s\n"+
-			"\r\tError:%s\n\r",
-			getWhitespaceString(),
-			errorTrace,
-			indentMessageLines(failureMessage, 2))
+		content = append(content, labeledContent{"Messages", message})
 	}
 
+	t.Errorf("%s", "\r"+getWhitespaceString()+labeledOutput(content...))
+
 	return false
 }
 
+type labeledContent struct {
+	label   string
+	content string
+}
+
+// labeledOutput returns a string consisting of the provided labeledContent. Each labeled output is appended in the following manner:
+//
+//   \r\t{{label}}:{{align_spaces}}\t{{content}}\n
+//
+// The initial carriage return is required to undo/erase any padding added by testing.T.Errorf. The "\t{{label}}:" is for the label.
+// If a label is shorter than the longest label provided, padding spaces are added to make all the labels match in length. Once this
+// alignment is achieved, "\t{{content}}\n" is added for the output.
+//
+// If the content of the labeledOutput contains line breaks, the subsequent lines are aligned so that they start at the same location as the first line.
+func labeledOutput(content ...labeledContent) string {
+	longestLabel := 0
+	for _, v := range content {
+		if len(v.label) > longestLabel {
+			longestLabel = len(v.label)
+		}
+	}
+	var output string
+	for _, v := range content {
+		output += "\r\t" + v.label + ":" + strings.Repeat(" ", longestLabel-len(v.label)) + "\t" + indentMessageLines(v.content, longestLabel) + "\n"
+	}
+	return output
+}
+
 // Implements asserts that an object is implemented by the specified interface.
 //
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
+//    assert.Implements(t, (*MyInterface)(nil), new(MyObject))
 func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) bool {
-
 	interfaceType := reflect.TypeOf(interfaceObject).Elem()
 
+	if object == nil {
+		return Fail(t, fmt.Sprintf("Cannot check if nil implements %v", interfaceType), msgAndArgs...)
+	}
 	if !reflect.TypeOf(object).Implements(interfaceType) {
 		return Fail(t, fmt.Sprintf("%T must implement %v", object, interfaceType), msgAndArgs...)
 	}
 
 	return true
-
 }
 
 // IsType asserts that the specified objects are of the same type.
@@ -271,16 +305,23 @@ func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs
 
 // Equal asserts that two objects are equal.
 //
-//    assert.Equal(t, 123, 123, "123 and 123 should be equal")
+//    assert.Equal(t, 123, 123)
 //
-// Returns whether the assertion was successful (true) or not (false).
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
 func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+	if err := validateEqualArgs(expected, actual); err != nil {
+		return Fail(t, fmt.Sprintf("Invalid operation: %#v == %#v (%s)",
+			expected, actual, err), msgAndArgs...)
+	}
 
 	if !ObjectsAreEqual(expected, actual) {
 		diff := diff(expected, actual)
 		expected, actual = formatUnequalValues(expected, actual)
-		return Fail(t, fmt.Sprintf("Not equal: %s (expected)\n"+
-			"        != %s (actual)%s", expected, actual, diff), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Not equal: \n"+
+			"expected: %s\n"+
+			"actual  : %s%s", expected, actual, diff), msgAndArgs...)
 	}
 
 	return true
@@ -294,53 +335,36 @@ func Equal(t TestingT, expected, actual interface{}, msgAndArgs ...interface{})
 // with the type name, and the value will be enclosed in parenthesis similar
 // to a type conversion in the Go grammar.
 func formatUnequalValues(expected, actual interface{}) (e string, a string) {
-	aType := reflect.TypeOf(expected)
-	bType := reflect.TypeOf(actual)
-
-	if aType != bType && isNumericType(aType) && isNumericType(bType) {
-		return fmt.Sprintf("%v(%#v)", aType, expected),
-			fmt.Sprintf("%v(%#v)", bType, actual)
+	if reflect.TypeOf(expected) != reflect.TypeOf(actual) {
+		return fmt.Sprintf("%T(%#v)", expected, expected),
+			fmt.Sprintf("%T(%#v)", actual, actual)
 	}
 
 	return fmt.Sprintf("%#v", expected),
 		fmt.Sprintf("%#v", actual)
 }
 
-func isNumericType(t reflect.Type) bool {
-	switch t.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		return true
-	case reflect.Float32, reflect.Float64:
-		return true
-	}
-
-	return false
-}
-
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
 //
-//    assert.EqualValues(t, uint32(123), int32(123), "123 and 123 should be equal")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.EqualValues(t, uint32(123), int32(123))
 func EqualValues(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
 
 	if !ObjectsAreEqualValues(expected, actual) {
-		return Fail(t, fmt.Sprintf("Not equal: %#v (expected)\n"+
-			"        != %#v (actual)", expected, actual), msgAndArgs...)
+		diff := diff(expected, actual)
+		expected, actual = formatUnequalValues(expected, actual)
+		return Fail(t, fmt.Sprintf("Not equal: \n"+
+			"expected: %s\n"+
+			"actual  : %s%s", expected, actual, diff), msgAndArgs...)
 	}
 
 	return true
 
 }
 
-// Exactly asserts that two objects are equal is value and type.
-//
-//    assert.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
+// Exactly asserts that two objects are equal in value and type.
 //
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.Exactly(t, int32(123), int64(123))
 func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
 
 	aType := reflect.TypeOf(expected)
@@ -356,9 +380,7 @@ func Exactly(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}
 
 // NotNil asserts that the specified object is not nil.
 //
-//    assert.NotNil(t, err, "err should be something")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.NotNil(t, err)
 func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if !isNil(object) {
 		return true
@@ -383,9 +405,7 @@ func isNil(object interface{}) bool {
 
 // Nil asserts that the specified object is nil.
 //
-//    assert.Nil(t, err, "err should be nothing")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.Nil(t, err)
 func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	if isNil(object) {
 		return true
@@ -393,74 +413,38 @@ func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 	return Fail(t, fmt.Sprintf("Expected nil, but got: %#v", object), msgAndArgs...)
 }
 
-var numericZeros = []interface{}{
-	int(0),
-	int8(0),
-	int16(0),
-	int32(0),
-	int64(0),
-	uint(0),
-	uint8(0),
-	uint16(0),
-	uint32(0),
-	uint64(0),
-	float32(0),
-	float64(0),
-}
-
 // isEmpty gets whether the specified object is considered empty or not.
 func isEmpty(object interface{}) bool {
 
+	// get nil case out of the way
 	if object == nil {
 		return true
-	} else if object == "" {
-		return true
-	} else if object == false {
-		return true
-	}
-
-	for _, v := range numericZeros {
-		if object == v {
-			return true
-		}
 	}
 
 	objValue := reflect.ValueOf(object)
 
 	switch objValue.Kind() {
-	case reflect.Map:
-		fallthrough
-	case reflect.Slice, reflect.Chan:
-		{
-			return (objValue.Len() == 0)
-		}
-	case reflect.Struct:
-		switch object.(type) {
-		case time.Time:
-			return object.(time.Time).IsZero()
-		}
+	// collection types are empty when they have no element
+	case reflect.Array, reflect.Chan, reflect.Map, reflect.Slice:
+		return objValue.Len() == 0
+	// pointers are empty if nil or if the value they point to is empty
 	case reflect.Ptr:
-		{
-			if objValue.IsNil() {
-				return true
-			}
-			switch object.(type) {
-			case *time.Time:
-				return object.(*time.Time).IsZero()
-			default:
-				return false
-			}
+		if objValue.IsNil() {
+			return true
 		}
+		deref := objValue.Elem().Interface()
+		return isEmpty(deref)
+	// for all other types, compare against the zero value
+	default:
+		zero := reflect.Zero(objValue.Type())
+		return reflect.DeepEqual(object, zero.Interface())
 	}
-	return false
 }
 
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
 //
 //  assert.Empty(t, obj)
-//
-// Returns whether the assertion was successful (true) or not (false).
 func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 
 	pass := isEmpty(object)
@@ -478,8 +462,6 @@ func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 //  if assert.NotEmpty(t, obj) {
 //    assert.Equal(t, "two", obj[1])
 //  }
-//
-// Returns whether the assertion was successful (true) or not (false).
 func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) bool {
 
 	pass := !isEmpty(object)
@@ -506,9 +488,7 @@ func getLen(x interface{}) (ok bool, length int) {
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
 //
-//    assert.Len(t, mySlice, 3, "The size of slice is not 3")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.Len(t, mySlice, 3)
 func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) bool {
 	ok, l := getLen(object)
 	if !ok {
@@ -523,9 +503,7 @@ func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{})
 
 // True asserts that the specified value is true.
 //
-//    assert.True(t, myBool, "myBool should be true")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.True(t, myBool)
 func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 	if value != true {
@@ -538,9 +516,7 @@ func True(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 // False asserts that the specified value is false.
 //
-//    assert.False(t, myBool, "myBool should be false")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.False(t, myBool)
 func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 	if value != false {
@@ -553,10 +529,15 @@ func False(t TestingT, value bool, msgAndArgs ...interface{}) bool {
 
 // NotEqual asserts that the specified values are NOT equal.
 //
-//    assert.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
+//    assert.NotEqual(t, obj1, obj2)
 //
-// Returns whether the assertion was successful (true) or not (false).
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
 func NotEqual(t TestingT, expected, actual interface{}, msgAndArgs ...interface{}) bool {
+	if err := validateEqualArgs(expected, actual); err != nil {
+		return Fail(t, fmt.Sprintf("Invalid operation: %#v != %#v (%s)",
+			expected, actual, err), msgAndArgs...)
+	}
 
 	if ObjectsAreEqual(expected, actual) {
 		return Fail(t, fmt.Sprintf("Should not be: %#v\n", actual), msgAndArgs...)
@@ -607,11 +588,9 @@ func includeElement(list interface{}, element interface{}) (ok, found bool) {
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
 //
-//    assert.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
-//    assert.Contains(t, ["Hello", "World"], "World", "But ["Hello", "World"] does contain 'World'")
-//    assert.Contains(t, {"Hello": "World"}, "Hello", "But {'Hello': 'World'} does contain 'Hello'")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.Contains(t, "Hello World", "World")
+//    assert.Contains(t, ["Hello", "World"], "World")
+//    assert.Contains(t, {"Hello": "World"}, "Hello")
 func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
 
 	ok, found := includeElement(s, contains)
@@ -629,11 +608,9 @@ func Contains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bo
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
 //
-//    assert.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//    assert.NotContains(t, ["Hello", "World"], "Earth", "But ['Hello', 'World'] does NOT contain 'Earth'")
-//    assert.NotContains(t, {"Hello": "World"}, "Earth", "But {'Hello': 'World'} does NOT contain 'Earth'")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//    assert.NotContains(t, "Hello World", "Earth")
+//    assert.NotContains(t, ["Hello", "World"], "Earth")
+//    assert.NotContains(t, {"Hello": "World"}, "Earth")
 func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{}) bool {
 
 	ok, found := includeElement(s, contains)
@@ -648,6 +625,142 @@ func NotContains(t TestingT, s, contains interface{}, msgAndArgs ...interface{})
 
 }
 
+// Subset asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+func Subset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
+	if subset == nil {
+		return true // we consider nil to be equal to the nil set
+	}
+
+	subsetValue := reflect.ValueOf(subset)
+	defer func() {
+		if e := recover(); e != nil {
+			ok = false
+		}
+	}()
+
+	listKind := reflect.TypeOf(list).Kind()
+	subsetKind := reflect.TypeOf(subset).Kind()
+
+	if listKind != reflect.Array && listKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", list, listKind), msgAndArgs...)
+	}
+
+	if subsetKind != reflect.Array && subsetKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
+	}
+
+	for i := 0; i < subsetValue.Len(); i++ {
+		element := subsetValue.Index(i).Interface()
+		ok, found := includeElement(list, element)
+		if !ok {
+			return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
+		}
+		if !found {
+			return Fail(t, fmt.Sprintf("\"%s\" does not contain \"%s\"", list, element), msgAndArgs...)
+		}
+	}
+
+	return true
+}
+
+// NotSubset asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+func NotSubset(t TestingT, list, subset interface{}, msgAndArgs ...interface{}) (ok bool) {
+	if subset == nil {
+		return Fail(t, fmt.Sprintf("nil is the empty set which is a subset of every set"), msgAndArgs...)
+	}
+
+	subsetValue := reflect.ValueOf(subset)
+	defer func() {
+		if e := recover(); e != nil {
+			ok = false
+		}
+	}()
+
+	listKind := reflect.TypeOf(list).Kind()
+	subsetKind := reflect.TypeOf(subset).Kind()
+
+	if listKind != reflect.Array && listKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", list, listKind), msgAndArgs...)
+	}
+
+	if subsetKind != reflect.Array && subsetKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", subset, subsetKind), msgAndArgs...)
+	}
+
+	for i := 0; i < subsetValue.Len(); i++ {
+		element := subsetValue.Index(i).Interface()
+		ok, found := includeElement(list, element)
+		if !ok {
+			return Fail(t, fmt.Sprintf("\"%s\" could not be applied builtin len()", list), msgAndArgs...)
+		}
+		if !found {
+			return true
+		}
+	}
+
+	return Fail(t, fmt.Sprintf("%q is a subset of %q", subset, list), msgAndArgs...)
+}
+
+// ElementsMatch asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// assert.ElementsMatch(t, [1, 3, 2, 3], [1, 3, 3, 2])
+func ElementsMatch(t TestingT, listA, listB interface{}, msgAndArgs ...interface{}) (ok bool) {
+	if isEmpty(listA) && isEmpty(listB) {
+		return true
+	}
+
+	aKind := reflect.TypeOf(listA).Kind()
+	bKind := reflect.TypeOf(listB).Kind()
+
+	if aKind != reflect.Array && aKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", listA, aKind), msgAndArgs...)
+	}
+
+	if bKind != reflect.Array && bKind != reflect.Slice {
+		return Fail(t, fmt.Sprintf("%q has an unsupported type %s", listB, bKind), msgAndArgs...)
+	}
+
+	aValue := reflect.ValueOf(listA)
+	bValue := reflect.ValueOf(listB)
+
+	aLen := aValue.Len()
+	bLen := bValue.Len()
+
+	if aLen != bLen {
+		return Fail(t, fmt.Sprintf("lengths don't match: %d != %d", aLen, bLen), msgAndArgs...)
+	}
+
+	// Mark indexes in bValue that we already used
+	visited := make([]bool, bLen)
+	for i := 0; i < aLen; i++ {
+		element := aValue.Index(i).Interface()
+		found := false
+		for j := 0; j < bLen; j++ {
+			if visited[j] {
+				continue
+			}
+			if ObjectsAreEqual(bValue.Index(j).Interface(), element) {
+				visited[j] = true
+				found = true
+				break
+			}
+		}
+		if !found {
+			return Fail(t, fmt.Sprintf("element %s appears more times in %s than in %s", element, aValue, bValue), msgAndArgs...)
+		}
+	}
+
+	return true
+}
+
 // Condition uses a Comparison to assert a complex condition.
 func Condition(t TestingT, comp Comparison, msgAndArgs ...interface{}) bool {
 	result := comp()
@@ -685,11 +798,7 @@ func didPanic(f PanicTestFunc) (bool, interface{}) {
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
 //
-//   assert.Panics(t, func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//   assert.Panics(t, func(){ GoCrazy() })
 func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 
 	if funcDidPanic, panicValue := didPanic(f); !funcDidPanic {
@@ -699,13 +808,26 @@ func Panics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 	return true
 }
 
-// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
+// PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
 //
-//   assert.NotPanics(t, func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
+//   assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
+func PanicsWithValue(t TestingT, expected interface{}, f PanicTestFunc, msgAndArgs ...interface{}) bool {
+
+	funcDidPanic, panicValue := didPanic(f)
+	if !funcDidPanic {
+		return Fail(t, fmt.Sprintf("func %#v should panic\n\r\tPanic value:\t%v", f, panicValue), msgAndArgs...)
+	}
+	if panicValue != expected {
+		return Fail(t, fmt.Sprintf("func %#v should panic with value:\t%v\n\r\tPanic value:\t%v", f, expected, panicValue), msgAndArgs...)
+	}
+
+	return true
+}
+
+// NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
 //
-// Returns whether the assertion was successful (true) or not (false).
+//   assert.NotPanics(t, func(){ RemainCalm() })
 func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 
 	if funcDidPanic, panicValue := didPanic(f); funcDidPanic {
@@ -717,9 +839,7 @@ func NotPanics(t TestingT, f PanicTestFunc, msgAndArgs ...interface{}) bool {
 
 // WithinDuration asserts that the two times are within duration delta of each other.
 //
-//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
 func WithinDuration(t TestingT, expected, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) bool {
 
 	dt := expected.Sub(actual)
@@ -757,6 +877,8 @@ func toFloat(x interface{}) (float64, bool) {
 		xf = float64(xn)
 	case float64:
 		xf = float64(xn)
+	case time.Duration:
+		xf = float64(xn)
 	default:
 		xok = false
 	}
@@ -767,8 +889,6 @@ func toFloat(x interface{}) (float64, bool) {
 // InDelta asserts that the two numerals are within delta of each other.
 //
 // 	 assert.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-//
-// Returns whether the assertion was successful (true) or not (false).
 func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
 
 	af, aok := toFloat(expected)
@@ -779,7 +899,7 @@ func InDelta(t TestingT, expected, actual interface{}, delta float64, msgAndArgs
 	}
 
 	if math.IsNaN(af) {
-		return Fail(t, fmt.Sprintf("Actual must not be NaN"), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Expected must not be NaN"), msgAndArgs...)
 	}
 
 	if math.IsNaN(bf) {
@@ -806,7 +926,7 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn
 	expectedSlice := reflect.ValueOf(expected)
 
 	for i := 0; i < actualSlice.Len(); i++ {
-		result := InDelta(t, actualSlice.Index(i).Interface(), expectedSlice.Index(i).Interface(), delta)
+		result := InDelta(t, actualSlice.Index(i).Interface(), expectedSlice.Index(i).Interface(), delta, msgAndArgs...)
 		if !result {
 			return result
 		}
@@ -815,6 +935,47 @@ func InDeltaSlice(t TestingT, expected, actual interface{}, delta float64, msgAn
 	return true
 }
 
+// InDeltaMapValues is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func InDeltaMapValues(t TestingT, expected, actual interface{}, delta float64, msgAndArgs ...interface{}) bool {
+	if expected == nil || actual == nil ||
+		reflect.TypeOf(actual).Kind() != reflect.Map ||
+		reflect.TypeOf(expected).Kind() != reflect.Map {
+		return Fail(t, "Arguments must be maps", msgAndArgs...)
+	}
+
+	expectedMap := reflect.ValueOf(expected)
+	actualMap := reflect.ValueOf(actual)
+
+	if expectedMap.Len() != actualMap.Len() {
+		return Fail(t, "Arguments must have the same number of keys", msgAndArgs...)
+	}
+
+	for _, k := range expectedMap.MapKeys() {
+		ev := expectedMap.MapIndex(k)
+		av := actualMap.MapIndex(k)
+
+		if !ev.IsValid() {
+			return Fail(t, fmt.Sprintf("missing key %q in expected map", k), msgAndArgs...)
+		}
+
+		if !av.IsValid() {
+			return Fail(t, fmt.Sprintf("missing key %q in actual map", k), msgAndArgs...)
+		}
+
+		if !InDelta(
+			t,
+			ev.Interface(),
+			av.Interface(),
+			delta,
+			msgAndArgs...,
+		) {
+			return false
+		}
+	}
+
+	return true
+}
+
 func calcRelativeError(expected, actual interface{}) (float64, error) {
 	af, aok := toFloat(expected)
 	if !aok {
@@ -825,15 +986,13 @@ func calcRelativeError(expected, actual interface{}) (float64, error) {
 	}
 	bf, bok := toFloat(actual)
 	if !bok {
-		return 0, fmt.Errorf("expected value %q cannot be converted to float", actual)
+		return 0, fmt.Errorf("actual value %q cannot be converted to float", actual)
 	}
 
 	return math.Abs(af-bf) / math.Abs(af), nil
 }
 
 // InEpsilon asserts that expected and actual have a relative error less than epsilon
-//
-// Returns whether the assertion was successful (true) or not (false).
 func InEpsilon(t TestingT, expected, actual interface{}, epsilon float64, msgAndArgs ...interface{}) bool {
 	actualEpsilon, err := calcRelativeError(expected, actual)
 	if err != nil {
@@ -841,7 +1000,7 @@ func InEpsilon(t TestingT, expected, actual interface{}, epsilon float64, msgAnd
 	}
 	if actualEpsilon > epsilon {
 		return Fail(t, fmt.Sprintf("Relative error is too high: %#v (expected)\n"+
-			"        < %#v (actual)", actualEpsilon, epsilon), msgAndArgs...)
+			"        < %#v (actual)", epsilon, actualEpsilon), msgAndArgs...)
 	}
 
 	return true
@@ -876,13 +1035,11 @@ func InEpsilonSlice(t TestingT, expected, actual interface{}, epsilon float64, m
 //
 //   actualObj, err := SomeFunction()
 //   if assert.NoError(t, err) {
-//	   assert.Equal(t, actualObj, expectedObj)
+//	   assert.Equal(t, expectedObj, actualObj)
 //   }
-//
-// Returns whether the assertion was successful (true) or not (false).
 func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
 	if err != nil {
-		return Fail(t, fmt.Sprintf("Received unexpected error %+v", err), msgAndArgs...)
+		return Fail(t, fmt.Sprintf("Received unexpected error:\n%+v", err), msgAndArgs...)
 	}
 
 	return true
@@ -891,11 +1048,9 @@ func NoError(t TestingT, err error, msgAndArgs ...interface{}) bool {
 // Error asserts that a function returned an error (i.e. not `nil`).
 //
 //   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-//	   assert.Equal(t, err, expectedError)
+//   if assert.Error(t, err) {
+//	   assert.Equal(t, expectedError, err)
 //   }
-//
-// Returns whether the assertion was successful (true) or not (false).
 func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 
 	if err == nil {
@@ -909,18 +1064,20 @@ func Error(t TestingT, err error, msgAndArgs ...interface{}) bool {
 // and that it is equal to the provided error.
 //
 //   actualObj, err := SomeFunction()
-//   assert.EqualError(t, err,  expectedErrorString, "An error was expected")
-//
-// Returns whether the assertion was successful (true) or not (false).
+//   assert.EqualError(t, err,  expectedErrorString)
 func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) bool {
-
-	message := messageFromMsgAndArgs(msgAndArgs...)
-	if !NotNil(t, theError, "An error is expected but got nil. %s", message) {
+	if !Error(t, theError, msgAndArgs...) {
 		return false
 	}
-	s := "An error with value \"%s\" is expected but got \"%s\". %s"
-	return Equal(t, errString, theError.Error(),
-		s, errString, theError.Error(), message)
+	expected := errString
+	actual := theError.Error()
+	// don't need to use deep equals here, we know they are both strings
+	if expected != actual {
+		return Fail(t, fmt.Sprintf("Error message not equal:\n"+
+			"expected: %q\n"+
+			"actual  : %q", expected, actual), msgAndArgs...)
+	}
+	return true
 }
 
 // matchRegexp return true if a specified regexp matches a string.
@@ -941,8 +1098,6 @@ func matchRegexp(rx interface{}, str interface{}) bool {
 //
 //  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
 //  assert.Regexp(t, "start...$", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
 func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 
 	match := matchRegexp(rx, str)
@@ -958,8 +1113,6 @@ func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface
 //
 //  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
 //  assert.NotRegexp(t, "^start", "it's not starting")
-//
-// Returns whether the assertion was successful (true) or not (false).
 func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) bool {
 	match := matchRegexp(rx, str)
 
@@ -971,7 +1124,7 @@ func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interf
 
 }
 
-// Zero asserts that i is the zero value for its type and returns the truth.
+// Zero asserts that i is the zero value for its type.
 func Zero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
 	if i != nil && !reflect.DeepEqual(i, reflect.Zero(reflect.TypeOf(i)).Interface()) {
 		return Fail(t, fmt.Sprintf("Should be zero, but was %v", i), msgAndArgs...)
@@ -979,7 +1132,7 @@ func Zero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
 	return true
 }
 
-// NotZero asserts that i is not the zero value for its type and returns the truth.
+// NotZero asserts that i is not the zero value for its type.
 func NotZero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
 	if i == nil || reflect.DeepEqual(i, reflect.Zero(reflect.TypeOf(i)).Interface()) {
 		return Fail(t, fmt.Sprintf("Should not be zero, but was %v", i), msgAndArgs...)
@@ -987,11 +1140,39 @@ func NotZero(t TestingT, i interface{}, msgAndArgs ...interface{}) bool {
 	return true
 }
 
+// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func FileExists(t TestingT, path string, msgAndArgs ...interface{}) bool {
+	info, err := os.Lstat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return Fail(t, fmt.Sprintf("unable to find file %q", path), msgAndArgs...)
+		}
+		return Fail(t, fmt.Sprintf("error when running os.Lstat(%q): %s", path, err), msgAndArgs...)
+	}
+	if info.IsDir() {
+		return Fail(t, fmt.Sprintf("%q is a directory", path), msgAndArgs...)
+	}
+	return true
+}
+
+// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func DirExists(t TestingT, path string, msgAndArgs ...interface{}) bool {
+	info, err := os.Lstat(path)
+	if err != nil {
+		if os.IsNotExist(err) {
+			return Fail(t, fmt.Sprintf("unable to find file %q", path), msgAndArgs...)
+		}
+		return Fail(t, fmt.Sprintf("error when running os.Lstat(%q): %s", path, err), msgAndArgs...)
+	}
+	if !info.IsDir() {
+		return Fail(t, fmt.Sprintf("%q is a file", path), msgAndArgs...)
+	}
+	return true
+}
+
 // JSONEq asserts that two JSON strings are equivalent.
 //
 //  assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-//
-// Returns whether the assertion was successful (true) or not (false).
 func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) bool {
 	var expectedJSONAsInterface, actualJSONAsInterface interface{}
 
@@ -1035,8 +1216,8 @@ func diff(expected interface{}, actual interface{}) string {
 		return ""
 	}
 
-	e := spew.Sdump(expected)
-	a := spew.Sdump(actual)
+	e := spewConfig.Sdump(expected)
+	a := spewConfig.Sdump(actual)
 
 	diff, _ := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{
 		A:        difflib.SplitLines(e),
@@ -1050,3 +1231,26 @@ func diff(expected interface{}, actual interface{}) string {
 
 	return "\n\nDiff:\n" + diff
 }
+
+// validateEqualArgs checks whether provided arguments can be safely used in the
+// Equal/NotEqual functions.
+func validateEqualArgs(expected, actual interface{}) error {
+	if isFunction(expected) || isFunction(actual) {
+		return errors.New("cannot take func type as argument")
+	}
+	return nil
+}
+
+func isFunction(arg interface{}) bool {
+	if arg == nil {
+		return false
+	}
+	return reflect.TypeOf(arg).Kind() == reflect.Func
+}
+
+var spewConfig = spew.ConfigState{
+	Indent:                  " ",
+	DisablePointerAddresses: true,
+	DisableCapacities:       true,
+	SortKeys:                true,
+}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/assertions_test.go b/installer/vendor/github.com/stretchr/testify/assert/assertions_test.go
deleted file mode 100644
index ac9b701725..0000000000
--- a/installer/vendor/github.com/stretchr/testify/assert/assertions_test.go
+++ /dev/null
@@ -1,1210 +0,0 @@
-package assert
-
-import (
-	"errors"
-	"io"
-	"math"
-	"os"
-	"reflect"
-	"regexp"
-	"testing"
-	"time"
-)
-
-var (
-	i     interface{}
-	zeros = []interface{}{
-		false,
-		byte(0),
-		complex64(0),
-		complex128(0),
-		float32(0),
-		float64(0),
-		int(0),
-		int8(0),
-		int16(0),
-		int32(0),
-		int64(0),
-		rune(0),
-		uint(0),
-		uint8(0),
-		uint16(0),
-		uint32(0),
-		uint64(0),
-		uintptr(0),
-		"",
-		[0]interface{}{},
-		[]interface{}(nil),
-		struct{ x int }{},
-		(*interface{})(nil),
-		(func())(nil),
-		nil,
-		interface{}(nil),
-		map[interface{}]interface{}(nil),
-		(chan interface{})(nil),
-		(<-chan interface{})(nil),
-		(chan<- interface{})(nil),
-	}
-	nonZeros = []interface{}{
-		true,
-		byte(1),
-		complex64(1),
-		complex128(1),
-		float32(1),
-		float64(1),
-		int(1),
-		int8(1),
-		int16(1),
-		int32(1),
-		int64(1),
-		rune(1),
-		uint(1),
-		uint8(1),
-		uint16(1),
-		uint32(1),
-		uint64(1),
-		uintptr(1),
-		"s",
-		[1]interface{}{1},
-		[]interface{}{},
-		struct{ x int }{1},
-		(*interface{})(&i),
-		(func())(func() {}),
-		interface{}(1),
-		map[interface{}]interface{}{},
-		(chan interface{})(make(chan interface{})),
-		(<-chan interface{})(make(chan interface{})),
-		(chan<- interface{})(make(chan interface{})),
-	}
-)
-
-// AssertionTesterInterface defines an interface to be used for testing assertion methods
-type AssertionTesterInterface interface {
-	TestMethod()
-}
-
-// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
-type AssertionTesterConformingObject struct {
-}
-
-func (a *AssertionTesterConformingObject) TestMethod() {
-}
-
-// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
-type AssertionTesterNonConformingObject struct {
-}
-
-func TestObjectsAreEqual(t *testing.T) {
-
-	if !ObjectsAreEqual("Hello World", "Hello World") {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(123, 123) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(123.5, 123.5) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual([]byte("Hello World"), []byte("Hello World")) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if !ObjectsAreEqual(nil, nil) {
-		t.Error("objectsAreEqual should return true")
-	}
-	if ObjectsAreEqual(map[int]int{5: 10}, map[int]int{10: 20}) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual('x', "x") {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual("x", 'x') {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(0, 0.1) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(0.1, 0) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if ObjectsAreEqual(uint32(10), int32(10)) {
-		t.Error("objectsAreEqual should return false")
-	}
-	if !ObjectsAreEqualValues(uint32(10), int32(10)) {
-		t.Error("ObjectsAreEqualValues should return true")
-	}
-	if ObjectsAreEqualValues(0, nil) {
-		t.Fail()
-	}
-	if ObjectsAreEqualValues(nil, 0) {
-		t.Fail()
-	}
-
-}
-
-func TestImplements(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
-		t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
-	}
-	if Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
-		t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
-	}
-
-}
-
-func TestIsType(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
-	}
-	if IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
-		t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
-	}
-
-}
-
-func TestEqual(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Equal(mockT, "Hello World", "Hello World") {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, 123, 123) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, 123.5, 123.5) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, []byte("Hello World"), []byte("Hello World")) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, nil, nil) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, int32(123), int32(123)) {
-		t.Error("Equal should return true")
-	}
-	if !Equal(mockT, uint64(123), uint64(123)) {
-		t.Error("Equal should return true")
-	}
-
-}
-
-func TestFormatUnequalValues(t *testing.T) {
-	expected, actual := formatUnequalValues("foo", "bar")
-	Equal(t, `"foo"`, expected, "value should not include type")
-	Equal(t, `"bar"`, actual, "value should not include type")
-
-	expected, actual = formatUnequalValues(123, 123)
-	Equal(t, `123`, expected, "value should not include type")
-	Equal(t, `123`, actual, "value should not include type")
-
-	expected, actual = formatUnequalValues(int64(123), int32(123))
-	Equal(t, `int64(123)`, expected, "value should include type")
-	Equal(t, `int32(123)`, actual, "value should include type")
-
-	type testStructType struct {
-		Val string
-	}
-
-	expected, actual = formatUnequalValues(&testStructType{Val: "test"}, &testStructType{Val: "test"})
-	Equal(t, `&assert.testStructType{Val:"test"}`, expected, "value should not include type annotation")
-	Equal(t, `&assert.testStructType{Val:"test"}`, actual, "value should not include type annotation")
-}
-
-func TestNotNil(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotNil(mockT, new(AssertionTesterConformingObject)) {
-		t.Error("NotNil should return true: object is not nil")
-	}
-	if NotNil(mockT, nil) {
-		t.Error("NotNil should return false: object is nil")
-	}
-	if NotNil(mockT, (*struct{})(nil)) {
-		t.Error("NotNil should return false: object is (*struct{})(nil)")
-	}
-
-}
-
-func TestNil(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Nil(mockT, nil) {
-		t.Error("Nil should return true: object is nil")
-	}
-	if !Nil(mockT, (*struct{})(nil)) {
-		t.Error("Nil should return true: object is (*struct{})(nil)")
-	}
-	if Nil(mockT, new(AssertionTesterConformingObject)) {
-		t.Error("Nil should return false: object is not nil")
-	}
-
-}
-
-func TestTrue(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !True(mockT, true) {
-		t.Error("True should return true")
-	}
-	if True(mockT, false) {
-		t.Error("True should return false")
-	}
-
-}
-
-func TestFalse(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !False(mockT, false) {
-		t.Error("False should return true")
-	}
-	if False(mockT, true) {
-		t.Error("False should return false")
-	}
-
-}
-
-func TestExactly(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	a := float32(1)
-	b := float64(1)
-	c := float32(1)
-	d := float32(2)
-
-	if Exactly(mockT, a, b) {
-		t.Error("Exactly should return false")
-	}
-	if Exactly(mockT, a, d) {
-		t.Error("Exactly should return false")
-	}
-	if !Exactly(mockT, a, c) {
-		t.Error("Exactly should return true")
-	}
-
-	if Exactly(mockT, nil, a) {
-		t.Error("Exactly should return false")
-	}
-	if Exactly(mockT, a, nil) {
-		t.Error("Exactly should return false")
-	}
-
-}
-
-func TestNotEqual(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotEqual(mockT, "Hello World", "Hello World!") {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, 123, 1234) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, 123.5, 123.55) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, []byte("Hello World"), []byte("Hello World!")) {
-		t.Error("NotEqual should return true")
-	}
-	if !NotEqual(mockT, nil, new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return true")
-	}
-	funcA := func() int { return 23 }
-	funcB := func() int { return 42 }
-	if !NotEqual(mockT, funcA, funcB) {
-		t.Error("NotEqual should return true")
-	}
-
-	if NotEqual(mockT, "Hello World", "Hello World") {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, 123, 123) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, 123.5, 123.5) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, []byte("Hello World"), []byte("Hello World")) {
-		t.Error("NotEqual should return false")
-	}
-	if NotEqual(mockT, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return false")
-	}
-}
-
-type A struct {
-	Name, Value string
-}
-
-func TestContains(t *testing.T) {
-
-	mockT := new(testing.T)
-	list := []string{"Foo", "Bar"}
-	complexList := []*A{
-		{"b", "c"},
-		{"d", "e"},
-		{"g", "h"},
-		{"j", "k"},
-	}
-	simpleMap := map[interface{}]interface{}{"Foo": "Bar"}
-
-	if !Contains(mockT, "Hello World", "Hello") {
-		t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
-	}
-	if Contains(mockT, "Hello World", "Salut") {
-		t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
-	}
-
-	if !Contains(mockT, list, "Bar") {
-		t.Error("Contains should return true: \"[\"Foo\", \"Bar\"]\" contains \"Bar\"")
-	}
-	if Contains(mockT, list, "Salut") {
-		t.Error("Contains should return false: \"[\"Foo\", \"Bar\"]\" does not contain \"Salut\"")
-	}
-	if !Contains(mockT, complexList, &A{"g", "h"}) {
-		t.Error("Contains should return true: complexList contains {\"g\", \"h\"}")
-	}
-	if Contains(mockT, complexList, &A{"g", "e"}) {
-		t.Error("Contains should return false: complexList contains {\"g\", \"e\"}")
-	}
-	if Contains(mockT, complexList, &A{"g", "e"}) {
-		t.Error("Contains should return false: complexList contains {\"g\", \"e\"}")
-	}
-	if !Contains(mockT, simpleMap, "Foo") {
-		t.Error("Contains should return true: \"{\"Foo\": \"Bar\"}\" contains \"Foo\"")
-	}
-	if Contains(mockT, simpleMap, "Bar") {
-		t.Error("Contains should return false: \"{\"Foo\": \"Bar\"}\" does not contains \"Bar\"")
-	}
-}
-
-func TestNotContains(t *testing.T) {
-
-	mockT := new(testing.T)
-	list := []string{"Foo", "Bar"}
-	simpleMap := map[interface{}]interface{}{"Foo": "Bar"}
-
-	if !NotContains(mockT, "Hello World", "Hello!") {
-		t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
-	}
-	if NotContains(mockT, "Hello World", "Hello") {
-		t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
-	}
-
-	if !NotContains(mockT, list, "Foo!") {
-		t.Error("NotContains should return true: \"[\"Foo\", \"Bar\"]\" does not contain \"Foo!\"")
-	}
-	if NotContains(mockT, list, "Foo") {
-		t.Error("NotContains should return false: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-	if NotContains(mockT, simpleMap, "Foo") {
-		t.Error("Contains should return true: \"{\"Foo\": \"Bar\"}\" contains \"Foo\"")
-	}
-	if !NotContains(mockT, simpleMap, "Bar") {
-		t.Error("Contains should return false: \"{\"Foo\": \"Bar\"}\" does not contains \"Bar\"")
-	}
-}
-
-func Test_includeElement(t *testing.T) {
-
-	list1 := []string{"Foo", "Bar"}
-	list2 := []int{1, 2}
-	simpleMap := map[interface{}]interface{}{"Foo": "Bar"}
-
-	ok, found := includeElement("Hello World", "World")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Foo")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Bar")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list2, 1)
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list2, 2)
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(list1, "Foo!")
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(list2, 3)
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(list2, "1")
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(simpleMap, "Foo")
-	True(t, ok)
-	True(t, found)
-
-	ok, found = includeElement(simpleMap, "Bar")
-	True(t, ok)
-	False(t, found)
-
-	ok, found = includeElement(1433, "1")
-	False(t, ok)
-	False(t, found)
-}
-
-func TestCondition(t *testing.T) {
-	mockT := new(testing.T)
-
-	if !Condition(mockT, func() bool { return true }, "Truth") {
-		t.Error("Condition should return true")
-	}
-
-	if Condition(mockT, func() bool { return false }, "Lie") {
-		t.Error("Condition should return false")
-	}
-
-}
-
-func TestDidPanic(t *testing.T) {
-
-	if funcDidPanic, _ := didPanic(func() {
-		panic("Panic!")
-	}); !funcDidPanic {
-		t.Error("didPanic should return true")
-	}
-
-	if funcDidPanic, _ := didPanic(func() {
-	}); funcDidPanic {
-		t.Error("didPanic should return false")
-	}
-
-}
-
-func TestPanics(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !Panics(mockT, func() {
-		panic("Panic!")
-	}) {
-		t.Error("Panics should return true")
-	}
-
-	if Panics(mockT, func() {
-	}) {
-		t.Error("Panics should return false")
-	}
-
-}
-
-func TestNotPanics(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	if !NotPanics(mockT, func() {
-	}) {
-		t.Error("NotPanics should return true")
-	}
-
-	if NotPanics(mockT, func() {
-		panic("Panic!")
-	}) {
-		t.Error("NotPanics should return false")
-	}
-
-}
-
-func TestNoError(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-
-	True(t, NoError(mockT, err), "NoError should return True for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-
-	False(t, NoError(mockT, err), "NoError with error should return False")
-
-	// returning an empty error interface
-	err = func() error {
-		var err *customError
-		if err != nil {
-			t.Fatal("err should be nil here")
-		}
-		return err
-	}()
-
-	if err == nil { // err is not nil here!
-		t.Errorf("Error should be nil due to empty interface", err)
-	}
-
-	False(t, NoError(mockT, err), "NoError should fail with empty error interface")
-}
-
-type customError struct{}
-
-func (*customError) Error() string { return "fail" }
-
-func TestError(t *testing.T) {
-
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-
-	False(t, Error(mockT, err), "Error should return False for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-
-	True(t, Error(mockT, err), "Error with error should return True")
-
-	// returning an empty error interface
-	err = func() error {
-		var err *customError
-		if err != nil {
-			t.Fatal("err should be nil here")
-		}
-		return err
-	}()
-
-	if err == nil { // err is not nil here!
-		t.Errorf("Error should be nil due to empty interface", err)
-	}
-
-	True(t, Error(mockT, err), "Error should pass with empty error interface")
-}
-
-func TestEqualError(t *testing.T) {
-	mockT := new(testing.T)
-
-	// start with a nil error
-	var err error
-	False(t, EqualError(mockT, err, ""),
-		"EqualError should return false for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-	False(t, EqualError(mockT, err, "Not some error"),
-		"EqualError should return false for different error string")
-	True(t, EqualError(mockT, err, "some error"),
-		"EqualError should return true")
-}
-
-func Test_isEmpty(t *testing.T) {
-
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-
-	True(t, isEmpty(""))
-	True(t, isEmpty(nil))
-	True(t, isEmpty([]string{}))
-	True(t, isEmpty(0))
-	True(t, isEmpty(int32(0)))
-	True(t, isEmpty(int64(0)))
-	True(t, isEmpty(false))
-	True(t, isEmpty(map[string]string{}))
-	True(t, isEmpty(new(time.Time)))
-	True(t, isEmpty(time.Time{}))
-	True(t, isEmpty(make(chan struct{})))
-	False(t, isEmpty("something"))
-	False(t, isEmpty(errors.New("something")))
-	False(t, isEmpty([]string{"something"}))
-	False(t, isEmpty(1))
-	False(t, isEmpty(true))
-	False(t, isEmpty(map[string]string{"Hello": "World"}))
-	False(t, isEmpty(chWithValue))
-
-}
-
-func TestEmpty(t *testing.T) {
-
-	mockT := new(testing.T)
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-	var tiP *time.Time
-	var tiNP time.Time
-	var s *string
-	var f *os.File
-
-	True(t, Empty(mockT, ""), "Empty string is empty")
-	True(t, Empty(mockT, nil), "Nil is empty")
-	True(t, Empty(mockT, []string{}), "Empty string array is empty")
-	True(t, Empty(mockT, 0), "Zero int value is empty")
-	True(t, Empty(mockT, false), "False value is empty")
-	True(t, Empty(mockT, make(chan struct{})), "Channel without values is empty")
-	True(t, Empty(mockT, s), "Nil string pointer is empty")
-	True(t, Empty(mockT, f), "Nil os.File pointer is empty")
-	True(t, Empty(mockT, tiP), "Nil time.Time pointer is empty")
-	True(t, Empty(mockT, tiNP), "time.Time is empty")
-
-	False(t, Empty(mockT, "something"), "Non Empty string is not empty")
-	False(t, Empty(mockT, errors.New("something")), "Non nil object is not empty")
-	False(t, Empty(mockT, []string{"something"}), "Non empty string array is not empty")
-	False(t, Empty(mockT, 1), "Non-zero int value is not empty")
-	False(t, Empty(mockT, true), "True value is not empty")
-	False(t, Empty(mockT, chWithValue), "Channel with values is not empty")
-}
-
-func TestNotEmpty(t *testing.T) {
-
-	mockT := new(testing.T)
-	chWithValue := make(chan struct{}, 1)
-	chWithValue <- struct{}{}
-
-	False(t, NotEmpty(mockT, ""), "Empty string is empty")
-	False(t, NotEmpty(mockT, nil), "Nil is empty")
-	False(t, NotEmpty(mockT, []string{}), "Empty string array is empty")
-	False(t, NotEmpty(mockT, 0), "Zero int value is empty")
-	False(t, NotEmpty(mockT, false), "False value is empty")
-	False(t, NotEmpty(mockT, make(chan struct{})), "Channel without values is empty")
-
-	True(t, NotEmpty(mockT, "something"), "Non Empty string is not empty")
-	True(t, NotEmpty(mockT, errors.New("something")), "Non nil object is not empty")
-	True(t, NotEmpty(mockT, []string{"something"}), "Non empty string array is not empty")
-	True(t, NotEmpty(mockT, 1), "Non-zero int value is not empty")
-	True(t, NotEmpty(mockT, true), "True value is not empty")
-	True(t, NotEmpty(mockT, chWithValue), "Channel with values is not empty")
-}
-
-func Test_getLen(t *testing.T) {
-	falseCases := []interface{}{
-		nil,
-		0,
-		true,
-		false,
-		'A',
-		struct{}{},
-	}
-	for _, v := range falseCases {
-		ok, l := getLen(v)
-		False(t, ok, "Expected getLen fail to get length of %#v", v)
-		Equal(t, 0, l, "getLen should return 0 for %#v", v)
-	}
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-	trueCases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range trueCases {
-		ok, l := getLen(c.v)
-		True(t, ok, "Expected getLen success to get length of %#v", c.v)
-		Equal(t, c.l, l)
-	}
-}
-
-func TestLen(t *testing.T) {
-	mockT := new(testing.T)
-
-	False(t, Len(mockT, nil, 0), "nil does not have length")
-	False(t, Len(mockT, 0, 0), "int does not have length")
-	False(t, Len(mockT, true, 0), "true does not have length")
-	False(t, Len(mockT, false, 0), "false does not have length")
-	False(t, Len(mockT, 'A', 0), "Rune does not have length")
-	False(t, Len(mockT, struct{}{}, 0), "Struct does not have length")
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-
-	cases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range cases {
-		True(t, Len(mockT, c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-
-	cases = []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 4},
-		{[...]int{1, 2, 3}, 2},
-		{"ABC", 2},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 4},
-		{ch, 2},
-
-		{[]int{}, 1},
-		{map[int]int{}, 1},
-		{make(chan int), 1},
-
-		{[]int(nil), 1},
-		{map[int]int(nil), 1},
-		{(chan int)(nil), 1},
-	}
-
-	for _, c := range cases {
-		False(t, Len(mockT, c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-}
-
-func TestWithinDuration(t *testing.T) {
-
-	mockT := new(testing.T)
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	True(t, WithinDuration(mockT, a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
-	True(t, WithinDuration(mockT, b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
-
-	False(t, WithinDuration(mockT, a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	False(t, WithinDuration(mockT, a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	False(t, WithinDuration(mockT, a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
-	False(t, WithinDuration(mockT, b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
-}
-
-func TestInDelta(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InDelta(mockT, 1.001, 1, 0.01), "|1.001 - 1| <= 0.01")
-	True(t, InDelta(mockT, 1, 1.001, 0.01), "|1 - 1.001| <= 0.01")
-	True(t, InDelta(mockT, 1, 2, 1), "|1 - 2| <= 1")
-	False(t, InDelta(mockT, 1, 2, 0.5), "Expected |1 - 2| <= 0.5 to fail")
-	False(t, InDelta(mockT, 2, 1, 0.5), "Expected |2 - 1| <= 0.5 to fail")
-	False(t, InDelta(mockT, "", nil, 1), "Expected non numerals to fail")
-	False(t, InDelta(mockT, 42, math.NaN(), 0.01), "Expected NaN for actual to fail")
-	False(t, InDelta(mockT, math.NaN(), 42, 0.01), "Expected NaN for expected to fail")
-
-	cases := []struct {
-		a, b  interface{}
-		delta float64
-	}{
-		{uint8(2), uint8(1), 1},
-		{uint16(2), uint16(1), 1},
-		{uint32(2), uint32(1), 1},
-		{uint64(2), uint64(1), 1},
-
-		{int(2), int(1), 1},
-		{int8(2), int8(1), 1},
-		{int16(2), int16(1), 1},
-		{int32(2), int32(1), 1},
-		{int64(2), int64(1), 1},
-
-		{float32(2), float32(1), 1},
-		{float64(2), float64(1), 1},
-	}
-
-	for _, tc := range cases {
-		True(t, InDelta(mockT, tc.a, tc.b, tc.delta), "Expected |%V - %V| <= %v", tc.a, tc.b, tc.delta)
-	}
-}
-
-func TestInDeltaSlice(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InDeltaSlice(mockT,
-		[]float64{1.001, 0.999},
-		[]float64{1, 1},
-		0.1), "{1.001, 0.009} is element-wise close to {1, 1} in delta=0.1")
-
-	True(t, InDeltaSlice(mockT,
-		[]float64{1, 2},
-		[]float64{0, 3},
-		1), "{1, 2} is element-wise close to {0, 3} in delta=1")
-
-	False(t, InDeltaSlice(mockT,
-		[]float64{1, 2},
-		[]float64{0, 3},
-		0.1), "{1, 2} is not element-wise close to {0, 3} in delta=0.1")
-
-	False(t, InDeltaSlice(mockT, "", nil, 1), "Expected non numeral slices to fail")
-}
-
-func TestInEpsilon(t *testing.T) {
-	mockT := new(testing.T)
-
-	cases := []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), uint16(2), .001},
-		{2.1, 2.2, 0.1},
-		{2.2, 2.1, 0.1},
-		{-2.1, -2.2, 0.1},
-		{-2.2, -2.1, 0.1},
-		{uint64(100), uint8(101), 0.01},
-		{0.1, -0.1, 2},
-		{0.1, 0, 2},
-	}
-
-	for _, tc := range cases {
-		True(t, InEpsilon(t, tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon), "test: %q", tc)
-	}
-
-	cases = []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), int16(-2), .001},
-		{uint64(100), uint8(102), 0.01},
-		{2.1, 2.2, 0.001},
-		{2.2, 2.1, 0.001},
-		{2.1, -2.2, 1},
-		{2.1, "bla-bla", 0},
-		{0.1, -0.1, 1.99},
-		{0, 0.1, 2}, // expected must be different to zero
-	}
-
-	for _, tc := range cases {
-		False(t, InEpsilon(mockT, tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-
-}
-
-func TestInEpsilonSlice(t *testing.T) {
-	mockT := new(testing.T)
-
-	True(t, InEpsilonSlice(mockT,
-		[]float64{2.2, 2.0},
-		[]float64{2.1, 2.1},
-		0.06), "{2.2, 2.0} is element-wise close to {2.1, 2.1} in espilon=0.06")
-
-	False(t, InEpsilonSlice(mockT,
-		[]float64{2.2, 2.0},
-		[]float64{2.1, 2.1},
-		0.04), "{2.2, 2.0} is not element-wise close to {2.1, 2.1} in espilon=0.04")
-
-	False(t, InEpsilonSlice(mockT, "", nil, 1), "Expected non numeral slices to fail")
-}
-
-func TestRegexp(t *testing.T) {
-	mockT := new(testing.T)
-
-	cases := []struct {
-		rx, str string
-	}{
-		{"^start", "start of the line"},
-		{"end$", "in the end"},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12.34"},
-	}
-
-	for _, tc := range cases {
-		True(t, Regexp(mockT, tc.rx, tc.str))
-		True(t, Regexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-		False(t, NotRegexp(mockT, tc.rx, tc.str))
-		False(t, NotRegexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-	}
-
-	cases = []struct {
-		rx, str string
-	}{
-		{"^asdfastart", "Not the start of the line"},
-		{"end$", "in the end."},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12a.34"},
-	}
-
-	for _, tc := range cases {
-		False(t, Regexp(mockT, tc.rx, tc.str), "Expected \"%s\" to not match \"%s\"", tc.rx, tc.str)
-		False(t, Regexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-		True(t, NotRegexp(mockT, tc.rx, tc.str))
-		True(t, NotRegexp(mockT, regexp.MustCompile(tc.rx), tc.str))
-	}
-}
-
-func testAutogeneratedFunction() {
-	defer func() {
-		if err := recover(); err == nil {
-			panic("did not panic")
-		}
-		CallerInfo()
-	}()
-	t := struct {
-		io.Closer
-	}{}
-	var c io.Closer
-	c = t
-	c.Close()
-}
-
-func TestCallerInfoWithAutogeneratedFunctions(t *testing.T) {
-	NotPanics(t, func() {
-		testAutogeneratedFunction()
-	})
-}
-
-func TestZero(t *testing.T) {
-	mockT := new(testing.T)
-
-	for _, test := range zeros {
-		True(t, Zero(mockT, test, "%#v is not the %v zero value", test, reflect.TypeOf(test)))
-	}
-
-	for _, test := range nonZeros {
-		False(t, Zero(mockT, test, "%#v is not the %v zero value", test, reflect.TypeOf(test)))
-	}
-}
-
-func TestNotZero(t *testing.T) {
-	mockT := new(testing.T)
-
-	for _, test := range zeros {
-		False(t, NotZero(mockT, test, "%#v is not the %v zero value", test, reflect.TypeOf(test)))
-	}
-
-	for _, test := range nonZeros {
-		True(t, NotZero(mockT, test, "%#v is not the %v zero value", test, reflect.TypeOf(test)))
-	}
-}
-
-func TestJSONEq_EqualSONString(t *testing.T) {
-	mockT := new(testing.T)
-	True(t, JSONEq(mockT, `{"hello": "world", "foo": "bar"}`, `{"hello": "world", "foo": "bar"}`))
-}
-
-func TestJSONEq_EquivalentButNotEqual(t *testing.T) {
-	mockT := new(testing.T)
-	True(t, JSONEq(mockT, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`))
-}
-
-func TestJSONEq_HashOfArraysAndHashes(t *testing.T) {
-	mockT := new(testing.T)
-	True(t, JSONEq(mockT, "{\r\n\t\"numeric\": 1.5,\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]],\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\"\r\n}",
-		"{\r\n\t\"numeric\": 1.5,\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\",\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]]\r\n}"))
-}
-
-func TestJSONEq_Array(t *testing.T) {
-	mockT := new(testing.T)
-	True(t, JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `["foo", {"nested": "hash", "hello": "world"}]`))
-}
-
-func TestJSONEq_HashAndArrayNotEquivalent(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `{"foo": "bar", {"nested": "hash", "hello": "world"}}`))
-}
-
-func TestJSONEq_HashesNotEquivalent(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, `{"foo": "bar"}`, `{"foo": "bar", "hello": "world"}`))
-}
-
-func TestJSONEq_ActualIsNotJSON(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, `{"foo": "bar"}`, "Not JSON"))
-}
-
-func TestJSONEq_ExpectedIsNotJSON(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, "Not JSON", `{"foo": "bar", "hello": "world"}`))
-}
-
-func TestJSONEq_ExpectedAndActualNotJSON(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, "Not JSON", "Not JSON"))
-}
-
-func TestJSONEq_ArraysOfDifferentOrder(t *testing.T) {
-	mockT := new(testing.T)
-	False(t, JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `[{ "hello": "world", "nested": "hash"}, "foo"]`))
-}
-
-func TestDiff(t *testing.T) {
-	expected := `
-
-Diff:
---- Expected
-+++ Actual
-@@ -1,3 +1,3 @@
- (struct { foo string }) {
-- foo: (string) (len=5) "hello"
-+ foo: (string) (len=3) "bar"
- }
-`
-	actual := diff(
-		struct{ foo string }{"hello"},
-		struct{ foo string }{"bar"},
-	)
-	Equal(t, expected, actual)
-
-	expected = `
-
-Diff:
---- Expected
-+++ Actual
-@@ -2,5 +2,5 @@
-  (int) 1,
-- (int) 2,
-  (int) 3,
-- (int) 4
-+ (int) 5,
-+ (int) 7
- }
-`
-	actual = diff(
-		[]int{1, 2, 3, 4},
-		[]int{1, 3, 5, 7},
-	)
-	Equal(t, expected, actual)
-
-	expected = `
-
-Diff:
---- Expected
-+++ Actual
-@@ -2,4 +2,4 @@
-  (int) 1,
-- (int) 2,
-- (int) 3
-+ (int) 3,
-+ (int) 5
- }
-`
-	actual = diff(
-		[]int{1, 2, 3, 4}[0:3],
-		[]int{1, 3, 5, 7}[0:3],
-	)
-	Equal(t, expected, actual)
-
-	expected = `
-
-Diff:
---- Expected
-+++ Actual
-@@ -1,6 +1,6 @@
- (map[string]int) (len=4) {
-- (string) (len=4) "four": (int) 4,
-+ (string) (len=4) "five": (int) 5,
-  (string) (len=3) "one": (int) 1,
-- (string) (len=5) "three": (int) 3,
-- (string) (len=3) "two": (int) 2
-+ (string) (len=5) "seven": (int) 7,
-+ (string) (len=5) "three": (int) 3
- }
-`
-
-	actual = diff(
-		map[string]int{"one": 1, "two": 2, "three": 3, "four": 4},
-		map[string]int{"one": 1, "three": 3, "five": 5, "seven": 7},
-	)
-	Equal(t, expected, actual)
-}
-
-func TestDiffEmptyCases(t *testing.T) {
-	Equal(t, "", diff(nil, nil))
-	Equal(t, "", diff(struct{ foo string }{}, nil))
-	Equal(t, "", diff(nil, struct{ foo string }{}))
-	Equal(t, "", diff(1, 2))
-	Equal(t, "", diff(1, 2))
-	Equal(t, "", diff([]int{1}, []bool{true}))
-}
-
-// Ensure there are no data races
-func TestDiffRace(t *testing.T) {
-	t.Parallel()
-
-	expected := map[string]string{
-		"a": "A",
-		"b": "B",
-		"c": "C",
-	}
-
-	actual := map[string]string{
-		"d": "D",
-		"e": "E",
-		"f": "F",
-	}
-
-	// run diffs in parallel simulating tests with t.Parallel()
-	numRoutines := 10
-	rChans := make([]chan string, numRoutines)
-	for idx := range rChans {
-		rChans[idx] = make(chan string)
-		go func(ch chan string) {
-			defer close(ch)
-			ch <- diff(expected, actual)
-		}(rChans[idx])
-	}
-
-	for _, ch := range rChans {
-		for msg := range ch {
-			NotZero(t, msg) // dummy assert
-		}
-	}
-}
-
-type mockTestingT struct {
-}
-
-func (m *mockTestingT) Errorf(format string, args ...interface{}) {}
-
-func TestFailNowWithPlainTestingT(t *testing.T) {
-	mockT := &mockTestingT{}
-
-	Panics(t, func() {
-		FailNow(mockT, "failed")
-	}, "should panic since mockT is missing FailNow()")
-}
-
-type mockFailNowTestingT struct {
-}
-
-func (m *mockFailNowTestingT) Errorf(format string, args ...interface{}) {}
-
-func (m *mockFailNowTestingT) FailNow() {}
-
-func TestFailNowWithFullTestingT(t *testing.T) {
-	mockT := &mockFailNowTestingT{}
-
-	NotPanics(t, func() {
-		FailNow(mockT, "failed")
-	}, "should call mockT.FailNow() rather than panicking")
-}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/forward_assertions.go b/installer/vendor/github.com/stretchr/testify/assert/forward_assertions.go
index b867e95ea5..9ad56851d9 100644
--- a/installer/vendor/github.com/stretchr/testify/assert/forward_assertions.go
+++ b/installer/vendor/github.com/stretchr/testify/assert/forward_assertions.go
@@ -13,4 +13,4 @@ func New(t TestingT) *Assertions {
 	}
 }
 
-//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_forward.go.tmpl
+//go:generate go run ../_codegen/main.go -output-package=assert -template=assertion_forward.go.tmpl -include-format-funcs
diff --git a/installer/vendor/github.com/stretchr/testify/assert/forward_assertions_test.go b/installer/vendor/github.com/stretchr/testify/assert/forward_assertions_test.go
deleted file mode 100644
index 22e1df1d96..0000000000
--- a/installer/vendor/github.com/stretchr/testify/assert/forward_assertions_test.go
+++ /dev/null
@@ -1,611 +0,0 @@
-package assert
-
-import (
-	"errors"
-	"regexp"
-	"testing"
-	"time"
-)
-
-func TestImplementsWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject)) {
-		t.Error("Implements method should return true: AssertionTesterConformingObject implements AssertionTesterInterface")
-	}
-	if assert.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject)) {
-		t.Error("Implements method should return false: AssertionTesterNonConformingObject does not implements AssertionTesterInterface")
-	}
-}
-
-func TestIsTypeWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.IsType(new(AssertionTesterConformingObject), new(AssertionTesterConformingObject)) {
-		t.Error("IsType should return true: AssertionTesterConformingObject is the same type as AssertionTesterConformingObject")
-	}
-	if assert.IsType(new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject)) {
-		t.Error("IsType should return false: AssertionTesterConformingObject is not the same type as AssertionTesterNonConformingObject")
-	}
-
-}
-
-func TestEqualWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Equal("Hello World", "Hello World") {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(123, 123) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(123.5, 123.5) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal([]byte("Hello World"), []byte("Hello World")) {
-		t.Error("Equal should return true")
-	}
-	if !assert.Equal(nil, nil) {
-		t.Error("Equal should return true")
-	}
-}
-
-func TestEqualValuesWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.EqualValues(uint32(10), int32(10)) {
-		t.Error("EqualValues should return true")
-	}
-}
-
-func TestNotNilWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.NotNil(new(AssertionTesterConformingObject)) {
-		t.Error("NotNil should return true: object is not nil")
-	}
-	if assert.NotNil(nil) {
-		t.Error("NotNil should return false: object is nil")
-	}
-
-}
-
-func TestNilWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.Nil(nil) {
-		t.Error("Nil should return true: object is nil")
-	}
-	if assert.Nil(new(AssertionTesterConformingObject)) {
-		t.Error("Nil should return false: object is not nil")
-	}
-
-}
-
-func TestTrueWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.True(true) {
-		t.Error("True should return true")
-	}
-	if assert.True(false) {
-		t.Error("True should return false")
-	}
-
-}
-
-func TestFalseWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	if !assert.False(false) {
-		t.Error("False should return true")
-	}
-	if assert.False(true) {
-		t.Error("False should return false")
-	}
-
-}
-
-func TestExactlyWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	a := float32(1)
-	b := float64(1)
-	c := float32(1)
-	d := float32(2)
-
-	if assert.Exactly(a, b) {
-		t.Error("Exactly should return false")
-	}
-	if assert.Exactly(a, d) {
-		t.Error("Exactly should return false")
-	}
-	if !assert.Exactly(a, c) {
-		t.Error("Exactly should return true")
-	}
-
-	if assert.Exactly(nil, a) {
-		t.Error("Exactly should return false")
-	}
-	if assert.Exactly(a, nil) {
-		t.Error("Exactly should return false")
-	}
-
-}
-
-func TestNotEqualWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.NotEqual("Hello World", "Hello World!") {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(123, 1234) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(123.5, 123.55) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual([]byte("Hello World"), []byte("Hello World!")) {
-		t.Error("NotEqual should return true")
-	}
-	if !assert.NotEqual(nil, new(AssertionTesterConformingObject)) {
-		t.Error("NotEqual should return true")
-	}
-}
-
-func TestContainsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-	list := []string{"Foo", "Bar"}
-
-	if !assert.Contains("Hello World", "Hello") {
-		t.Error("Contains should return true: \"Hello World\" contains \"Hello\"")
-	}
-	if assert.Contains("Hello World", "Salut") {
-		t.Error("Contains should return false: \"Hello World\" does not contain \"Salut\"")
-	}
-
-	if !assert.Contains(list, "Foo") {
-		t.Error("Contains should return true: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-	if assert.Contains(list, "Salut") {
-		t.Error("Contains should return false: \"[\"Foo\", \"Bar\"]\" does not contain \"Salut\"")
-	}
-
-}
-
-func TestNotContainsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-	list := []string{"Foo", "Bar"}
-
-	if !assert.NotContains("Hello World", "Hello!") {
-		t.Error("NotContains should return true: \"Hello World\" does not contain \"Hello!\"")
-	}
-	if assert.NotContains("Hello World", "Hello") {
-		t.Error("NotContains should return false: \"Hello World\" contains \"Hello\"")
-	}
-
-	if !assert.NotContains(list, "Foo!") {
-		t.Error("NotContains should return true: \"[\"Foo\", \"Bar\"]\" does not contain \"Foo!\"")
-	}
-	if assert.NotContains(list, "Foo") {
-		t.Error("NotContains should return false: \"[\"Foo\", \"Bar\"]\" contains \"Foo\"")
-	}
-
-}
-
-func TestConditionWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.Condition(func() bool { return true }, "Truth") {
-		t.Error("Condition should return true")
-	}
-
-	if assert.Condition(func() bool { return false }, "Lie") {
-		t.Error("Condition should return false")
-	}
-
-}
-
-func TestDidPanicWrapper(t *testing.T) {
-
-	if funcDidPanic, _ := didPanic(func() {
-		panic("Panic!")
-	}); !funcDidPanic {
-		t.Error("didPanic should return true")
-	}
-
-	if funcDidPanic, _ := didPanic(func() {
-	}); funcDidPanic {
-		t.Error("didPanic should return false")
-	}
-
-}
-
-func TestPanicsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.Panics(func() {
-		panic("Panic!")
-	}) {
-		t.Error("Panics should return true")
-	}
-
-	if assert.Panics(func() {
-	}) {
-		t.Error("Panics should return false")
-	}
-
-}
-
-func TestNotPanicsWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	if !assert.NotPanics(func() {
-	}) {
-		t.Error("NotPanics should return true")
-	}
-
-	if assert.NotPanics(func() {
-		panic("Panic!")
-	}) {
-		t.Error("NotPanics should return false")
-	}
-
-}
-
-func TestNoErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-
-	assert.True(mockAssert.NoError(err), "NoError should return True for nil arg")
-
-	// now set an error
-	err = errors.New("Some error")
-
-	assert.False(mockAssert.NoError(err), "NoError with error should return False")
-
-}
-
-func TestErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-
-	assert.False(mockAssert.Error(err), "Error should return False for nil arg")
-
-	// now set an error
-	err = errors.New("Some error")
-
-	assert.True(mockAssert.Error(err), "Error with error should return True")
-
-}
-
-func TestEqualErrorWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	// start with a nil error
-	var err error
-	assert.False(mockAssert.EqualError(err, ""),
-		"EqualError should return false for nil arg")
-
-	// now set an error
-	err = errors.New("some error")
-	assert.False(mockAssert.EqualError(err, "Not some error"),
-		"EqualError should return false for different error string")
-	assert.True(mockAssert.EqualError(err, "some error"),
-		"EqualError should return true")
-}
-
-func TestEmptyWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.True(mockAssert.Empty(""), "Empty string is empty")
-	assert.True(mockAssert.Empty(nil), "Nil is empty")
-	assert.True(mockAssert.Empty([]string{}), "Empty string array is empty")
-	assert.True(mockAssert.Empty(0), "Zero int value is empty")
-	assert.True(mockAssert.Empty(false), "False value is empty")
-
-	assert.False(mockAssert.Empty("something"), "Non Empty string is not empty")
-	assert.False(mockAssert.Empty(errors.New("something")), "Non nil object is not empty")
-	assert.False(mockAssert.Empty([]string{"something"}), "Non empty string array is not empty")
-	assert.False(mockAssert.Empty(1), "Non-zero int value is not empty")
-	assert.False(mockAssert.Empty(true), "True value is not empty")
-
-}
-
-func TestNotEmptyWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.False(mockAssert.NotEmpty(""), "Empty string is empty")
-	assert.False(mockAssert.NotEmpty(nil), "Nil is empty")
-	assert.False(mockAssert.NotEmpty([]string{}), "Empty string array is empty")
-	assert.False(mockAssert.NotEmpty(0), "Zero int value is empty")
-	assert.False(mockAssert.NotEmpty(false), "False value is empty")
-
-	assert.True(mockAssert.NotEmpty("something"), "Non Empty string is not empty")
-	assert.True(mockAssert.NotEmpty(errors.New("something")), "Non nil object is not empty")
-	assert.True(mockAssert.NotEmpty([]string{"something"}), "Non empty string array is not empty")
-	assert.True(mockAssert.NotEmpty(1), "Non-zero int value is not empty")
-	assert.True(mockAssert.NotEmpty(true), "True value is not empty")
-
-}
-
-func TestLenWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.False(mockAssert.Len(nil, 0), "nil does not have length")
-	assert.False(mockAssert.Len(0, 0), "int does not have length")
-	assert.False(mockAssert.Len(true, 0), "true does not have length")
-	assert.False(mockAssert.Len(false, 0), "false does not have length")
-	assert.False(mockAssert.Len('A', 0), "Rune does not have length")
-	assert.False(mockAssert.Len(struct{}{}, 0), "Struct does not have length")
-
-	ch := make(chan int, 5)
-	ch <- 1
-	ch <- 2
-	ch <- 3
-
-	cases := []struct {
-		v interface{}
-		l int
-	}{
-		{[]int{1, 2, 3}, 3},
-		{[...]int{1, 2, 3}, 3},
-		{"ABC", 3},
-		{map[int]int{1: 2, 2: 4, 3: 6}, 3},
-		{ch, 3},
-
-		{[]int{}, 0},
-		{map[int]int{}, 0},
-		{make(chan int), 0},
-
-		{[]int(nil), 0},
-		{map[int]int(nil), 0},
-		{(chan int)(nil), 0},
-	}
-
-	for _, c := range cases {
-		assert.True(mockAssert.Len(c.v, c.l), "%#v have %d items", c.v, c.l)
-	}
-}
-
-func TestWithinDurationWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	assert.True(mockAssert.WithinDuration(a, b, 10*time.Second), "A 10s difference is within a 10s time difference")
-	assert.True(mockAssert.WithinDuration(b, a, 10*time.Second), "A 10s difference is within a 10s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, 9*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, 9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, -9*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, -9*time.Second), "A 10s difference is not within a 9s time difference")
-
-	assert.False(mockAssert.WithinDuration(a, b, -11*time.Second), "A 10s difference is not within a 9s time difference")
-	assert.False(mockAssert.WithinDuration(b, a, -11*time.Second), "A 10s difference is not within a 9s time difference")
-}
-
-func TestInDeltaWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	True(t, assert.InDelta(1.001, 1, 0.01), "|1.001 - 1| <= 0.01")
-	True(t, assert.InDelta(1, 1.001, 0.01), "|1 - 1.001| <= 0.01")
-	True(t, assert.InDelta(1, 2, 1), "|1 - 2| <= 1")
-	False(t, assert.InDelta(1, 2, 0.5), "Expected |1 - 2| <= 0.5 to fail")
-	False(t, assert.InDelta(2, 1, 0.5), "Expected |2 - 1| <= 0.5 to fail")
-	False(t, assert.InDelta("", nil, 1), "Expected non numerals to fail")
-
-	cases := []struct {
-		a, b  interface{}
-		delta float64
-	}{
-		{uint8(2), uint8(1), 1},
-		{uint16(2), uint16(1), 1},
-		{uint32(2), uint32(1), 1},
-		{uint64(2), uint64(1), 1},
-
-		{int(2), int(1), 1},
-		{int8(2), int8(1), 1},
-		{int16(2), int16(1), 1},
-		{int32(2), int32(1), 1},
-		{int64(2), int64(1), 1},
-
-		{float32(2), float32(1), 1},
-		{float64(2), float64(1), 1},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.InDelta(tc.a, tc.b, tc.delta), "Expected |%V - %V| <= %v", tc.a, tc.b, tc.delta)
-	}
-}
-
-func TestInEpsilonWrapper(t *testing.T) {
-	assert := New(new(testing.T))
-
-	cases := []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), uint16(2), .001},
-		{2.1, 2.2, 0.1},
-		{2.2, 2.1, 0.1},
-		{-2.1, -2.2, 0.1},
-		{-2.2, -2.1, 0.1},
-		{uint64(100), uint8(101), 0.01},
-		{0.1, -0.1, 2},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.InEpsilon(tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-
-	cases = []struct {
-		a, b    interface{}
-		epsilon float64
-	}{
-		{uint8(2), int16(-2), .001},
-		{uint64(100), uint8(102), 0.01},
-		{2.1, 2.2, 0.001},
-		{2.2, 2.1, 0.001},
-		{2.1, -2.2, 1},
-		{2.1, "bla-bla", 0},
-		{0.1, -0.1, 1.99},
-	}
-
-	for _, tc := range cases {
-		False(t, assert.InEpsilon(tc.a, tc.b, tc.epsilon, "Expected %V and %V to have a relative difference of %v", tc.a, tc.b, tc.epsilon))
-	}
-}
-
-func TestRegexpWrapper(t *testing.T) {
-
-	assert := New(new(testing.T))
-
-	cases := []struct {
-		rx, str string
-	}{
-		{"^start", "start of the line"},
-		{"end$", "in the end"},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12.34"},
-	}
-
-	for _, tc := range cases {
-		True(t, assert.Regexp(tc.rx, tc.str))
-		True(t, assert.Regexp(regexp.MustCompile(tc.rx), tc.str))
-		False(t, assert.NotRegexp(tc.rx, tc.str))
-		False(t, assert.NotRegexp(regexp.MustCompile(tc.rx), tc.str))
-	}
-
-	cases = []struct {
-		rx, str string
-	}{
-		{"^asdfastart", "Not the start of the line"},
-		{"end$", "in the end."},
-		{"[0-9]{3}[.-]?[0-9]{2}[.-]?[0-9]{2}", "My phone number is 650.12a.34"},
-	}
-
-	for _, tc := range cases {
-		False(t, assert.Regexp(tc.rx, tc.str), "Expected \"%s\" to not match \"%s\"", tc.rx, tc.str)
-		False(t, assert.Regexp(regexp.MustCompile(tc.rx), tc.str))
-		True(t, assert.NotRegexp(tc.rx, tc.str))
-		True(t, assert.NotRegexp(regexp.MustCompile(tc.rx), tc.str))
-	}
-}
-
-func TestZeroWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	for _, test := range zeros {
-		assert.True(mockAssert.Zero(test), "Zero should return true for %v", test)
-	}
-
-	for _, test := range nonZeros {
-		assert.False(mockAssert.Zero(test), "Zero should return false for %v", test)
-	}
-}
-
-func TestNotZeroWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	for _, test := range zeros {
-		assert.False(mockAssert.NotZero(test), "Zero should return true for %v", test)
-	}
-
-	for _, test := range nonZeros {
-		assert.True(mockAssert.NotZero(test), "Zero should return false for %v", test)
-	}
-}
-
-func TestJSONEqWrapper_EqualSONString(t *testing.T) {
-	assert := New(new(testing.T))
-	if !assert.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"hello": "world", "foo": "bar"}`) {
-		t.Error("JSONEq should return true")
-	}
-
-}
-
-func TestJSONEqWrapper_EquivalentButNotEqual(t *testing.T) {
-	assert := New(new(testing.T))
-	if !assert.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`) {
-		t.Error("JSONEq should return true")
-	}
-
-}
-
-func TestJSONEqWrapper_HashOfArraysAndHashes(t *testing.T) {
-	assert := New(new(testing.T))
-	if !assert.JSONEq("{\r\n\t\"numeric\": 1.5,\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]],\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\"\r\n}",
-		"{\r\n\t\"numeric\": 1.5,\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\",\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]]\r\n}") {
-		t.Error("JSONEq should return true")
-	}
-}
-
-func TestJSONEqWrapper_Array(t *testing.T) {
-	assert := New(new(testing.T))
-	if !assert.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `["foo", {"nested": "hash", "hello": "world"}]`) {
-		t.Error("JSONEq should return true")
-	}
-
-}
-
-func TestJSONEqWrapper_HashAndArrayNotEquivalent(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `{"foo": "bar", {"nested": "hash", "hello": "world"}}`) {
-		t.Error("JSONEq should return false")
-	}
-}
-
-func TestJSONEqWrapper_HashesNotEquivalent(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq(`{"foo": "bar"}`, `{"foo": "bar", "hello": "world"}`) {
-		t.Error("JSONEq should return false")
-	}
-}
-
-func TestJSONEqWrapper_ActualIsNotJSON(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq(`{"foo": "bar"}`, "Not JSON") {
-		t.Error("JSONEq should return false")
-	}
-}
-
-func TestJSONEqWrapper_ExpectedIsNotJSON(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq("Not JSON", `{"foo": "bar", "hello": "world"}`) {
-		t.Error("JSONEq should return false")
-	}
-}
-
-func TestJSONEqWrapper_ExpectedAndActualNotJSON(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq("Not JSON", "Not JSON") {
-		t.Error("JSONEq should return false")
-	}
-}
-
-func TestJSONEqWrapper_ArraysOfDifferentOrder(t *testing.T) {
-	assert := New(new(testing.T))
-	if assert.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `[{ "hello": "world", "nested": "hash"}, "foo"]`) {
-		t.Error("JSONEq should return false")
-	}
-}
diff --git a/installer/vendor/github.com/stretchr/testify/assert/http_assertions.go b/installer/vendor/github.com/stretchr/testify/assert/http_assertions.go
index fa7ab89b18..3101e78ddc 100644
--- a/installer/vendor/github.com/stretchr/testify/assert/http_assertions.go
+++ b/installer/vendor/github.com/stretchr/testify/assert/http_assertions.go
@@ -8,16 +8,16 @@ import (
 	"strings"
 )
 
-// httpCode is a helper that returns HTTP code of the response. It returns -1
-// if building a new request fails.
-func httpCode(handler http.HandlerFunc, method, url string, values url.Values) int {
+// httpCode is a helper that returns HTTP code of the response. It returns -1 and
+// an error if building a new request fails.
+func httpCode(handler http.HandlerFunc, method, url string, values url.Values) (int, error) {
 	w := httptest.NewRecorder()
 	req, err := http.NewRequest(method, url+"?"+values.Encode(), nil)
 	if err != nil {
-		return -1
+		return -1, err
 	}
 	handler(w, req)
-	return w.Code
+	return w.Code, nil
 }
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
@@ -25,12 +25,19 @@ func httpCode(handler http.HandlerFunc, method, url string, values url.Values) i
 //  assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
 //
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
+func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	code, err := httpCode(handler, method, url, values)
+	if err != nil {
+		Fail(t, fmt.Sprintf("Failed to build test request, got error: %s", err))
 		return false
 	}
-	return code >= http.StatusOK && code <= http.StatusPartialContent
+
+	isSuccessCode := code >= http.StatusOK && code <= http.StatusPartialContent
+	if !isSuccessCode {
+		Fail(t, fmt.Sprintf("Expected HTTP success status code for %q but received %d", url+"?"+values.Encode(), code))
+	}
+
+	return isSuccessCode
 }
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
@@ -38,12 +45,19 @@ func HTTPSuccess(t TestingT, handler http.HandlerFunc, method, url string, value
 //  assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
+func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	code, err := httpCode(handler, method, url, values)
+	if err != nil {
+		Fail(t, fmt.Sprintf("Failed to build test request, got error: %s", err))
 		return false
 	}
-	return code >= http.StatusMultipleChoices && code <= http.StatusTemporaryRedirect
+
+	isRedirectCode := code >= http.StatusMultipleChoices && code <= http.StatusTemporaryRedirect
+	if !isRedirectCode {
+		Fail(t, fmt.Sprintf("Expected HTTP redirect status code for %q but received %d", url+"?"+values.Encode(), code))
+	}
+
+	return isRedirectCode
 }
 
 // HTTPError asserts that a specified handler returns an error status code.
@@ -51,12 +65,19 @@ func HTTPRedirect(t TestingT, handler http.HandlerFunc, method, url string, valu
 //  assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
 //
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPError(t TestingT, handler http.HandlerFunc, method, url string, values url.Values) bool {
-	code := httpCode(handler, method, url, values)
-	if code == -1 {
+func HTTPError(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, msgAndArgs ...interface{}) bool {
+	code, err := httpCode(handler, method, url, values)
+	if err != nil {
+		Fail(t, fmt.Sprintf("Failed to build test request, got error: %s", err))
 		return false
 	}
-	return code >= http.StatusBadRequest
+
+	isErrorCode := code >= http.StatusBadRequest
+	if !isErrorCode {
+		Fail(t, fmt.Sprintf("Expected HTTP error status code for %q but received %d", url+"?"+values.Encode(), code))
+	}
+
+	return isErrorCode
 }
 
 // HTTPBody is a helper that returns HTTP body of the response. It returns
@@ -77,7 +98,7 @@ func HTTPBody(handler http.HandlerFunc, method, url string, values url.Values) s
 //  assert.HTTPBodyContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
+func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
 	body := HTTPBody(handler, method, url, values)
 
 	contains := strings.Contains(body, fmt.Sprint(str))
@@ -94,7 +115,7 @@ func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method, url string,
 //  assert.HTTPBodyNotContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
 //
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}) bool {
+func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) bool {
 	body := HTTPBody(handler, method, url, values)
 
 	contains := strings.Contains(body, fmt.Sprint(str))
diff --git a/installer/vendor/github.com/stretchr/testify/assert/http_assertions_test.go b/installer/vendor/github.com/stretchr/testify/assert/http_assertions_test.go
deleted file mode 100644
index 684c2d5d1c..0000000000
--- a/installer/vendor/github.com/stretchr/testify/assert/http_assertions_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package assert
-
-import (
-	"fmt"
-	"net/http"
-	"net/url"
-	"testing"
-)
-
-func httpOK(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusOK)
-}
-
-func httpRedirect(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusTemporaryRedirect)
-}
-
-func httpError(w http.ResponseWriter, r *http.Request) {
-	w.WriteHeader(http.StatusInternalServerError)
-}
-
-func TestHTTPStatuses(t *testing.T) {
-	assert := New(t)
-	mockT := new(testing.T)
-
-	assert.Equal(HTTPSuccess(mockT, httpOK, "GET", "/", nil), true)
-	assert.Equal(HTTPSuccess(mockT, httpRedirect, "GET", "/", nil), false)
-	assert.Equal(HTTPSuccess(mockT, httpError, "GET", "/", nil), false)
-
-	assert.Equal(HTTPRedirect(mockT, httpOK, "GET", "/", nil), false)
-	assert.Equal(HTTPRedirect(mockT, httpRedirect, "GET", "/", nil), true)
-	assert.Equal(HTTPRedirect(mockT, httpError, "GET", "/", nil), false)
-
-	assert.Equal(HTTPError(mockT, httpOK, "GET", "/", nil), false)
-	assert.Equal(HTTPError(mockT, httpRedirect, "GET", "/", nil), false)
-	assert.Equal(HTTPError(mockT, httpError, "GET", "/", nil), true)
-}
-
-func TestHTTPStatusesWrapper(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.Equal(mockAssert.HTTPSuccess(httpOK, "GET", "/", nil), true)
-	assert.Equal(mockAssert.HTTPSuccess(httpRedirect, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPSuccess(httpError, "GET", "/", nil), false)
-
-	assert.Equal(mockAssert.HTTPRedirect(httpOK, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPRedirect(httpRedirect, "GET", "/", nil), true)
-	assert.Equal(mockAssert.HTTPRedirect(httpError, "GET", "/", nil), false)
-
-	assert.Equal(mockAssert.HTTPError(httpOK, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPError(httpRedirect, "GET", "/", nil), false)
-	assert.Equal(mockAssert.HTTPError(httpError, "GET", "/", nil), true)
-}
-
-func httpHelloName(w http.ResponseWriter, r *http.Request) {
-	name := r.FormValue("name")
-	w.Write([]byte(fmt.Sprintf("Hello, %s!", name)))
-}
-
-func TestHttpBody(t *testing.T) {
-	assert := New(t)
-	mockT := new(testing.T)
-
-	assert.True(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.True(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.False(HTTPBodyContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-	assert.False(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.False(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.True(HTTPBodyNotContains(mockT, httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-}
-
-func TestHttpBodyWrappers(t *testing.T) {
-	assert := New(t)
-	mockAssert := New(new(testing.T))
-
-	assert.True(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.True(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.False(mockAssert.HTTPBodyContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-	assert.False(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "Hello, World!"))
-	assert.False(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "World"))
-	assert.True(mockAssert.HTTPBodyNotContains(httpHelloName, "GET", "/", url.Values{"name": []string{"World"}}, "world"))
-
-}
diff --git a/installer/vendor/github.com/stretchr/testify/doc.go b/installer/vendor/github.com/stretchr/testify/doc.go
deleted file mode 100644
index 377d5cc56a..0000000000
--- a/installer/vendor/github.com/stretchr/testify/doc.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Package testify is a set of packages that provide many tools for testifying that your code will behave as you intend.
-//
-// testify contains the following packages:
-//
-// The assert package provides a comprehensive set of assertion functions that tie in to the Go testing system.
-//
-// The http package contains tools to make it easier to test http activity using the Go testing system.
-//
-// The mock package provides a system by which it is possible to mock your objects and verify calls are happening as expected.
-//
-// The suite package provides a basic structure for using structs as testing suites, and methods on those structs as tests.  It includes setup/teardown functionality in the way of interfaces.
-package testify
-
-// blank imports help docs.
-import (
-	// assert package
-	_ "github.com/stretchr/testify/assert"
-	// http package
-	_ "github.com/stretchr/testify/http"
-	// mock package
-	_ "github.com/stretchr/testify/mock"
-)
diff --git a/installer/vendor/github.com/stretchr/testify/http/doc.go b/installer/vendor/github.com/stretchr/testify/http/doc.go
deleted file mode 100644
index 695167c6de..0000000000
--- a/installer/vendor/github.com/stretchr/testify/http/doc.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// Package http DEPRECATED USE net/http/httptest
-package http
diff --git a/installer/vendor/github.com/stretchr/testify/http/test_response_writer.go b/installer/vendor/github.com/stretchr/testify/http/test_response_writer.go
deleted file mode 100644
index 5c3f813fae..0000000000
--- a/installer/vendor/github.com/stretchr/testify/http/test_response_writer.go
+++ /dev/null
@@ -1,49 +0,0 @@
-package http
-
-import (
-	"net/http"
-)
-
-// TestResponseWriter DEPRECATED: We recommend you use http://golang.org/pkg/net/http/httptest instead.
-type TestResponseWriter struct {
-
-	// StatusCode is the last int written by the call to WriteHeader(int)
-	StatusCode int
-
-	// Output is a string containing the written bytes using the Write([]byte) func.
-	Output string
-
-	// header is the internal storage of the http.Header object
-	header http.Header
-}
-
-// Header DEPRECATED: We recommend you use http://golang.org/pkg/net/http/httptest instead.
-func (rw *TestResponseWriter) Header() http.Header {
-
-	if rw.header == nil {
-		rw.header = make(http.Header)
-	}
-
-	return rw.header
-}
-
-// Write DEPRECATED: We recommend you use http://golang.org/pkg/net/http/httptest instead.
-func (rw *TestResponseWriter) Write(bytes []byte) (int, error) {
-
-	// assume 200 success if no header has been set
-	if rw.StatusCode == 0 {
-		rw.WriteHeader(200)
-	}
-
-	// add these bytes to the output string
-	rw.Output = rw.Output + string(bytes)
-
-	// return normal values
-	return 0, nil
-
-}
-
-// WriteHeader DEPRECATED: We recommend you use http://golang.org/pkg/net/http/httptest instead.
-func (rw *TestResponseWriter) WriteHeader(i int) {
-	rw.StatusCode = i
-}
diff --git a/installer/vendor/github.com/stretchr/testify/http/test_round_tripper.go b/installer/vendor/github.com/stretchr/testify/http/test_round_tripper.go
deleted file mode 100644
index b1e32f1d86..0000000000
--- a/installer/vendor/github.com/stretchr/testify/http/test_round_tripper.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package http
-
-import (
-	"github.com/stretchr/testify/mock"
-	"net/http"
-)
-
-// TestRoundTripper DEPRECATED USE net/http/httptest
-type TestRoundTripper struct {
-	mock.Mock
-}
-
-// RoundTrip DEPRECATED USE net/http/httptest
-func (t *TestRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	args := t.Called(req)
-	return args.Get(0).(*http.Response), args.Error(1)
-}
diff --git a/installer/vendor/github.com/stretchr/testify/mock/doc.go b/installer/vendor/github.com/stretchr/testify/mock/doc.go
deleted file mode 100644
index 7324128ef1..0000000000
--- a/installer/vendor/github.com/stretchr/testify/mock/doc.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Package mock provides a system by which it is possible to mock your objects
-// and verify calls are happening as expected.
-//
-// Example Usage
-//
-// The mock package provides an object, Mock, that tracks activity on another object.  It is usually
-// embedded into a test object as shown below:
-//
-//   type MyTestObject struct {
-//     // add a Mock object instance
-//     mock.Mock
-//
-//     // other fields go here as normal
-//   }
-//
-// When implementing the methods of an interface, you wire your functions up
-// to call the Mock.Called(args...) method, and return the appropriate values.
-//
-// For example, to mock a method that saves the name and age of a person and returns
-// the year of their birth or an error, you might write this:
-//
-//     func (o *MyTestObject) SavePersonDetails(firstname, lastname string, age int) (int, error) {
-//       args := o.Called(firstname, lastname, age)
-//       return args.Int(0), args.Error(1)
-//     }
-//
-// The Int, Error and Bool methods are examples of strongly typed getters that take the argument
-// index position. Given this argument list:
-//
-//     (12, true, "Something")
-//
-// You could read them out strongly typed like this:
-//
-//     args.Int(0)
-//     args.Bool(1)
-//     args.String(2)
-//
-// For objects of your own type, use the generic Arguments.Get(index) method and make a type assertion:
-//
-//     return args.Get(0).(*MyObject), args.Get(1).(*AnotherObjectOfMine)
-//
-// This may cause a panic if the object you are getting is nil (the type assertion will fail), in those
-// cases you should check for nil first.
-package mock
diff --git a/installer/vendor/github.com/stretchr/testify/mock/mock.go b/installer/vendor/github.com/stretchr/testify/mock/mock.go
deleted file mode 100644
index 20d7b8b1ff..0000000000
--- a/installer/vendor/github.com/stretchr/testify/mock/mock.go
+++ /dev/null
@@ -1,763 +0,0 @@
-package mock
-
-import (
-	"fmt"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/davecgh/go-spew/spew"
-	"github.com/pmezard/go-difflib/difflib"
-	"github.com/stretchr/objx"
-	"github.com/stretchr/testify/assert"
-)
-
-func inin() {
-	spew.Config.SortKeys = true
-}
-
-// TestingT is an interface wrapper around *testing.T
-type TestingT interface {
-	Logf(format string, args ...interface{})
-	Errorf(format string, args ...interface{})
-	FailNow()
-}
-
-/*
-	Call
-*/
-
-// Call represents a method call and is used for setting expectations,
-// as well as recording activity.
-type Call struct {
-	Parent *Mock
-
-	// The name of the method that was or will be called.
-	Method string
-
-	// Holds the arguments of the method.
-	Arguments Arguments
-
-	// Holds the arguments that should be returned when
-	// this method is called.
-	ReturnArguments Arguments
-
-	// The number of times to return the return arguments when setting
-	// expectations. 0 means to always return the value.
-	Repeatability int
-
-	// Amount of times this call has been called
-	totalCalls int
-
-	// Holds a channel that will be used to block the Return until it either
-	// receives a message or is closed. nil means it returns immediately.
-	WaitFor <-chan time.Time
-
-	// Holds a handler used to manipulate arguments content that are passed by
-	// reference. It's useful when mocking methods such as unmarshalers or
-	// decoders.
-	RunFn func(Arguments)
-}
-
-func newCall(parent *Mock, methodName string, methodArguments ...interface{}) *Call {
-	return &Call{
-		Parent:          parent,
-		Method:          methodName,
-		Arguments:       methodArguments,
-		ReturnArguments: make([]interface{}, 0),
-		Repeatability:   0,
-		WaitFor:         nil,
-		RunFn:           nil,
-	}
-}
-
-func (c *Call) lock() {
-	c.Parent.mutex.Lock()
-}
-
-func (c *Call) unlock() {
-	c.Parent.mutex.Unlock()
-}
-
-// Return specifies the return arguments for the expectation.
-//
-//    Mock.On("DoSomething").Return(errors.New("failed"))
-func (c *Call) Return(returnArguments ...interface{}) *Call {
-	c.lock()
-	defer c.unlock()
-
-	c.ReturnArguments = returnArguments
-
-	return c
-}
-
-// Once indicates that that the mock should only return the value once.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Once()
-func (c *Call) Once() *Call {
-	return c.Times(1)
-}
-
-// Twice indicates that that the mock should only return the value twice.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Twice()
-func (c *Call) Twice() *Call {
-	return c.Times(2)
-}
-
-// Times indicates that that the mock should only return the indicated number
-// of times.
-//
-//    Mock.On("MyMethod", arg1, arg2).Return(returnArg1, returnArg2).Times(5)
-func (c *Call) Times(i int) *Call {
-	c.lock()
-	defer c.unlock()
-	c.Repeatability = i
-	return c
-}
-
-// WaitUntil sets the channel that will block the mock's return until its closed
-// or a message is received.
-//
-//    Mock.On("MyMethod", arg1, arg2).WaitUntil(time.After(time.Second))
-func (c *Call) WaitUntil(w <-chan time.Time) *Call {
-	c.lock()
-	defer c.unlock()
-	c.WaitFor = w
-	return c
-}
-
-// After sets how long to block until the call returns
-//
-//    Mock.On("MyMethod", arg1, arg2).After(time.Second)
-func (c *Call) After(d time.Duration) *Call {
-	return c.WaitUntil(time.After(d))
-}
-
-// Run sets a handler to be called before returning. It can be used when
-// mocking a method such as unmarshalers that takes a pointer to a struct and
-// sets properties in such struct
-//
-//    Mock.On("Unmarshal", AnythingOfType("*map[string]interface{}").Return().Run(func(args Arguments) {
-//    	arg := args.Get(0).(*map[string]interface{})
-//    	arg["foo"] = "bar"
-//    })
-func (c *Call) Run(fn func(Arguments)) *Call {
-	c.lock()
-	defer c.unlock()
-	c.RunFn = fn
-	return c
-}
-
-// On chains a new expectation description onto the mocked interface. This
-// allows syntax like.
-//
-//    Mock.
-//       On("MyMethod", 1).Return(nil).
-//       On("MyOtherMethod", 'a', 'b', 'c').Return(errors.New("Some Error"))
-func (c *Call) On(methodName string, arguments ...interface{}) *Call {
-	return c.Parent.On(methodName, arguments...)
-}
-
-// Mock is the workhorse used to track activity on another object.
-// For an example of its usage, refer to the "Example Usage" section at the top
-// of this document.
-type Mock struct {
-	// Represents the calls that are expected of
-	// an object.
-	ExpectedCalls []*Call
-
-	// Holds the calls that were made to this mocked object.
-	Calls []Call
-
-	// TestData holds any data that might be useful for testing.  Testify ignores
-	// this data completely allowing you to do whatever you like with it.
-	testData objx.Map
-
-	mutex sync.Mutex
-}
-
-// TestData holds any data that might be useful for testing.  Testify ignores
-// this data completely allowing you to do whatever you like with it.
-func (m *Mock) TestData() objx.Map {
-
-	if m.testData == nil {
-		m.testData = make(objx.Map)
-	}
-
-	return m.testData
-}
-
-/*
-	Setting expectations
-*/
-
-// On starts a description of an expectation of the specified method
-// being called.
-//
-//     Mock.On("MyMethod", arg1, arg2)
-func (m *Mock) On(methodName string, arguments ...interface{}) *Call {
-	for _, arg := range arguments {
-		if v := reflect.ValueOf(arg); v.Kind() == reflect.Func {
-			panic(fmt.Sprintf("cannot use Func in expectations. Use mock.AnythingOfType(\"%T\")", arg))
-		}
-	}
-
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	c := newCall(m, methodName, arguments...)
-	m.ExpectedCalls = append(m.ExpectedCalls, c)
-	return c
-}
-
-// /*
-// 	Recording and responding to activity
-// */
-
-func (m *Mock) findExpectedCall(method string, arguments ...interface{}) (int, *Call) {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	for i, call := range m.ExpectedCalls {
-		if call.Method == method && call.Repeatability > -1 {
-
-			_, diffCount := call.Arguments.Diff(arguments)
-			if diffCount == 0 {
-				return i, call
-			}
-
-		}
-	}
-	return -1, nil
-}
-
-func (m *Mock) findClosestCall(method string, arguments ...interface{}) (bool, *Call) {
-	diffCount := 0
-	var closestCall *Call
-
-	for _, call := range m.expectedCalls() {
-		if call.Method == method {
-
-			_, tempDiffCount := call.Arguments.Diff(arguments)
-			if tempDiffCount < diffCount || diffCount == 0 {
-				diffCount = tempDiffCount
-				closestCall = call
-			}
-
-		}
-	}
-
-	if closestCall == nil {
-		return false, nil
-	}
-
-	return true, closestCall
-}
-
-func callString(method string, arguments Arguments, includeArgumentValues bool) string {
-
-	var argValsString string
-	if includeArgumentValues {
-		var argVals []string
-		for argIndex, arg := range arguments {
-			argVals = append(argVals, fmt.Sprintf("%d: %#v", argIndex, arg))
-		}
-		argValsString = fmt.Sprintf("\n\t\t%s", strings.Join(argVals, "\n\t\t"))
-	}
-
-	return fmt.Sprintf("%s(%s)%s", method, arguments.String(), argValsString)
-}
-
-// Called tells the mock object that a method has been called, and gets an array
-// of arguments to return.  Panics if the call is unexpected (i.e. not preceded by
-// appropriate .On .Return() calls)
-// If Call.WaitFor is set, blocks until the channel is closed or receives a message.
-func (m *Mock) Called(arguments ...interface{}) Arguments {
-	// get the calling function's name
-	pc, _, _, ok := runtime.Caller(1)
-	if !ok {
-		panic("Couldn't get the caller information")
-	}
-	functionPath := runtime.FuncForPC(pc).Name()
-	//Next four lines are required to use GCCGO function naming conventions.
-	//For Ex:  github_com_docker_libkv_store_mock.WatchTree.pN39_github_com_docker_libkv_store_mock.Mock
-	//uses inteface information unlike golang github.com/docker/libkv/store/mock.(*Mock).WatchTree
-	//With GCCGO we need to remove interface information starting from pN<dd>.
-	re := regexp.MustCompile("\\.pN\\d+_")
-	if re.MatchString(functionPath) {
-		functionPath = re.Split(functionPath, -1)[0]
-	}
-	parts := strings.Split(functionPath, ".")
-	functionName := parts[len(parts)-1]
-
-	found, call := m.findExpectedCall(functionName, arguments...)
-
-	if found < 0 {
-		// we have to fail here - because we don't know what to do
-		// as the return arguments.  This is because:
-		//
-		//   a) this is a totally unexpected call to this method,
-		//   b) the arguments are not what was expected, or
-		//   c) the developer has forgotten to add an accompanying On...Return pair.
-
-		closestFound, closestCall := m.findClosestCall(functionName, arguments...)
-
-		if closestFound {
-			panic(fmt.Sprintf("\n\nmock: Unexpected Method Call\n-----------------------------\n\n%s\n\nThe closest call I have is: \n\n%s\n\n%s\n", callString(functionName, arguments, true), callString(functionName, closestCall.Arguments, true), diffArguments(arguments, closestCall.Arguments)))
-		} else {
-			panic(fmt.Sprintf("\nassert: mock: I don't know what to return because the method call was unexpected.\n\tEither do Mock.On(\"%s\").Return(...) first, or remove the %s() call.\n\tThis method was unexpected:\n\t\t%s\n\tat: %s", functionName, functionName, callString(functionName, arguments, true), assert.CallerInfo()))
-		}
-	} else {
-		m.mutex.Lock()
-		switch {
-		case call.Repeatability == 1:
-			call.Repeatability = -1
-			call.totalCalls++
-
-		case call.Repeatability > 1:
-			call.Repeatability--
-			call.totalCalls++
-
-		case call.Repeatability == 0:
-			call.totalCalls++
-		}
-		m.mutex.Unlock()
-	}
-
-	// add the call
-	m.mutex.Lock()
-	m.Calls = append(m.Calls, *newCall(m, functionName, arguments...))
-	m.mutex.Unlock()
-
-	// block if specified
-	if call.WaitFor != nil {
-		<-call.WaitFor
-	}
-
-	if call.RunFn != nil {
-		call.RunFn(arguments)
-	}
-
-	return call.ReturnArguments
-}
-
-/*
-	Assertions
-*/
-
-type assertExpectationser interface {
-	AssertExpectations(TestingT) bool
-}
-
-// AssertExpectationsForObjects asserts that everything specified with On and Return
-// of the specified objects was in fact called as expected.
-//
-// Calls may have occurred in any order.
-func AssertExpectationsForObjects(t TestingT, testObjects ...interface{}) bool {
-	for _, obj := range testObjects {
-		if m, ok := obj.(Mock); ok {
-			t.Logf("Deprecated mock.AssertExpectationsForObjects(myMock.Mock) use mock.AssertExpectationsForObjects(myMock)")
-			obj = &m
-		}
-		m := obj.(assertExpectationser)
-		if !m.AssertExpectations(t) {
-			return false
-		}
-	}
-	return true
-}
-
-// AssertExpectations asserts that everything specified with On and Return was
-// in fact called as expected.  Calls may have occurred in any order.
-func (m *Mock) AssertExpectations(t TestingT) bool {
-	var somethingMissing bool
-	var failedExpectations int
-
-	// iterate through each expectation
-	expectedCalls := m.expectedCalls()
-	for _, expectedCall := range expectedCalls {
-		if !m.methodWasCalled(expectedCall.Method, expectedCall.Arguments) && expectedCall.totalCalls == 0 {
-			somethingMissing = true
-			failedExpectations++
-			t.Logf("\u274C\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
-		} else {
-			m.mutex.Lock()
-			if expectedCall.Repeatability > 0 {
-				somethingMissing = true
-				failedExpectations++
-			} else {
-				t.Logf("\u2705\t%s(%s)", expectedCall.Method, expectedCall.Arguments.String())
-			}
-			m.mutex.Unlock()
-		}
-	}
-
-	if somethingMissing {
-		t.Errorf("FAIL: %d out of %d expectation(s) were met.\n\tThe code you are testing needs to make %d more call(s).\n\tat: %s", len(expectedCalls)-failedExpectations, len(expectedCalls), failedExpectations, assert.CallerInfo())
-	}
-
-	return !somethingMissing
-}
-
-// AssertNumberOfCalls asserts that the method was called expectedCalls times.
-func (m *Mock) AssertNumberOfCalls(t TestingT, methodName string, expectedCalls int) bool {
-	var actualCalls int
-	for _, call := range m.calls() {
-		if call.Method == methodName {
-			actualCalls++
-		}
-	}
-	return assert.Equal(t, expectedCalls, actualCalls, fmt.Sprintf("Expected number of calls (%d) does not match the actual number of calls (%d).", expectedCalls, actualCalls))
-}
-
-// AssertCalled asserts that the method was called.
-// It can produce a false result when an argument is a pointer type and the underlying value changed after calling the mocked method.
-func (m *Mock) AssertCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-	if !assert.True(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method should have been called with %d argument(s), but was not.", methodName, len(arguments))) {
-		t.Logf("%v", m.expectedCalls())
-		return false
-	}
-	return true
-}
-
-// AssertNotCalled asserts that the method was not called.
-// It can produce a false result when an argument is a pointer type and the underlying value changed after calling the mocked method.
-func (m *Mock) AssertNotCalled(t TestingT, methodName string, arguments ...interface{}) bool {
-	if !assert.False(t, m.methodWasCalled(methodName, arguments), fmt.Sprintf("The \"%s\" method was called with %d argument(s), but should NOT have been.", methodName, len(arguments))) {
-		t.Logf("%v", m.expectedCalls())
-		return false
-	}
-	return true
-}
-
-func (m *Mock) methodWasCalled(methodName string, expected []interface{}) bool {
-	for _, call := range m.calls() {
-		if call.Method == methodName {
-
-			_, differences := Arguments(expected).Diff(call.Arguments)
-
-			if differences == 0 {
-				// found the expected call
-				return true
-			}
-
-		}
-	}
-	// we didn't find the expected call
-	return false
-}
-
-func (m *Mock) expectedCalls() []*Call {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	return append([]*Call{}, m.ExpectedCalls...)
-}
-
-func (m *Mock) calls() []Call {
-	m.mutex.Lock()
-	defer m.mutex.Unlock()
-	return append([]Call{}, m.Calls...)
-}
-
-/*
-	Arguments
-*/
-
-// Arguments holds an array of method arguments or return values.
-type Arguments []interface{}
-
-const (
-	// Anything is used in Diff and Assert when the argument being tested
-	// shouldn't be taken into consideration.
-	Anything string = "mock.Anything"
-)
-
-// AnythingOfTypeArgument is a string that contains the type of an argument
-// for use when type checking.  Used in Diff and Assert.
-type AnythingOfTypeArgument string
-
-// AnythingOfType returns an AnythingOfTypeArgument object containing the
-// name of the type to check for.  Used in Diff and Assert.
-//
-// For example:
-//	Assert(t, AnythingOfType("string"), AnythingOfType("int"))
-func AnythingOfType(t string) AnythingOfTypeArgument {
-	return AnythingOfTypeArgument(t)
-}
-
-// argumentMatcher performs custom argument matching, returning whether or
-// not the argument is matched by the expectation fixture function.
-type argumentMatcher struct {
-	// fn is a function which accepts one argument, and returns a bool.
-	fn reflect.Value
-}
-
-func (f argumentMatcher) Matches(argument interface{}) bool {
-	expectType := f.fn.Type().In(0)
-
-	if reflect.TypeOf(argument).AssignableTo(expectType) {
-		result := f.fn.Call([]reflect.Value{reflect.ValueOf(argument)})
-		return result[0].Bool()
-	}
-	return false
-}
-
-func (f argumentMatcher) String() string {
-	return fmt.Sprintf("func(%s) bool", f.fn.Type().In(0).Name())
-}
-
-// MatchedBy can be used to match a mock call based on only certain properties
-// from a complex struct or some calculation. It takes a function that will be
-// evaluated with the called argument and will return true when there's a match
-// and false otherwise.
-//
-// Example:
-// m.On("Do", MatchedBy(func(req *http.Request) bool { return req.Host == "example.com" }))
-//
-// |fn|, must be a function accepting a single argument (of the expected type)
-// which returns a bool. If |fn| doesn't match the required signature,
-// MathedBy() panics.
-func MatchedBy(fn interface{}) argumentMatcher {
-	fnType := reflect.TypeOf(fn)
-
-	if fnType.Kind() != reflect.Func {
-		panic(fmt.Sprintf("assert: arguments: %s is not a func", fn))
-	}
-	if fnType.NumIn() != 1 {
-		panic(fmt.Sprintf("assert: arguments: %s does not take exactly one argument", fn))
-	}
-	if fnType.NumOut() != 1 || fnType.Out(0).Kind() != reflect.Bool {
-		panic(fmt.Sprintf("assert: arguments: %s does not return a bool", fn))
-	}
-
-	return argumentMatcher{fn: reflect.ValueOf(fn)}
-}
-
-// Get Returns the argument at the specified index.
-func (args Arguments) Get(index int) interface{} {
-	if index+1 > len(args) {
-		panic(fmt.Sprintf("assert: arguments: Cannot call Get(%d) because there are %d argument(s).", index, len(args)))
-	}
-	return args[index]
-}
-
-// Is gets whether the objects match the arguments specified.
-func (args Arguments) Is(objects ...interface{}) bool {
-	for i, obj := range args {
-		if obj != objects[i] {
-			return false
-		}
-	}
-	return true
-}
-
-// Diff gets a string describing the differences between the arguments
-// and the specified objects.
-//
-// Returns the diff string and number of differences found.
-func (args Arguments) Diff(objects []interface{}) (string, int) {
-
-	var output = "\n"
-	var differences int
-
-	var maxArgCount = len(args)
-	if len(objects) > maxArgCount {
-		maxArgCount = len(objects)
-	}
-
-	for i := 0; i < maxArgCount; i++ {
-		var actual, expected interface{}
-
-		if len(objects) <= i {
-			actual = "(Missing)"
-		} else {
-			actual = objects[i]
-		}
-
-		if len(args) <= i {
-			expected = "(Missing)"
-		} else {
-			expected = args[i]
-		}
-
-		if matcher, ok := expected.(argumentMatcher); ok {
-			if matcher.Matches(actual) {
-				output = fmt.Sprintf("%s\t%d: \u2705  %s matched by %s\n", output, i, actual, matcher)
-			} else {
-				differences++
-				output = fmt.Sprintf("%s\t%d: \u2705  %s not matched by %s\n", output, i, actual, matcher)
-			}
-		} else if reflect.TypeOf(expected) == reflect.TypeOf((*AnythingOfTypeArgument)(nil)).Elem() {
-
-			// type checking
-			if reflect.TypeOf(actual).Name() != string(expected.(AnythingOfTypeArgument)) && reflect.TypeOf(actual).String() != string(expected.(AnythingOfTypeArgument)) {
-				// not match
-				differences++
-				output = fmt.Sprintf("%s\t%d: \u274C  type %s != type %s - %s\n", output, i, expected, reflect.TypeOf(actual).Name(), actual)
-			}
-
-		} else {
-
-			// normal checking
-
-			if assert.ObjectsAreEqual(expected, Anything) || assert.ObjectsAreEqual(actual, Anything) || assert.ObjectsAreEqual(actual, expected) {
-				// match
-				output = fmt.Sprintf("%s\t%d: \u2705  %s == %s\n", output, i, actual, expected)
-			} else {
-				// not match
-				differences++
-				output = fmt.Sprintf("%s\t%d: \u274C  %s != %s\n", output, i, actual, expected)
-			}
-		}
-
-	}
-
-	if differences == 0 {
-		return "No differences.", differences
-	}
-
-	return output, differences
-
-}
-
-// Assert compares the arguments with the specified objects and fails if
-// they do not exactly match.
-func (args Arguments) Assert(t TestingT, objects ...interface{}) bool {
-
-	// get the differences
-	diff, diffCount := args.Diff(objects)
-
-	if diffCount == 0 {
-		return true
-	}
-
-	// there are differences... report them...
-	t.Logf(diff)
-	t.Errorf("%sArguments do not match.", assert.CallerInfo())
-
-	return false
-
-}
-
-// String gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-//
-// If no index is provided, String() returns a complete string representation
-// of the arguments.
-func (args Arguments) String(indexOrNil ...int) string {
-
-	if len(indexOrNil) == 0 {
-		// normal String() method - return a string representation of the args
-		var argsStr []string
-		for _, arg := range args {
-			argsStr = append(argsStr, fmt.Sprintf("%s", reflect.TypeOf(arg)))
-		}
-		return strings.Join(argsStr, ",")
-	} else if len(indexOrNil) == 1 {
-		// Index has been specified - get the argument at that index
-		var index = indexOrNil[0]
-		var s string
-		var ok bool
-		if s, ok = args.Get(index).(string); !ok {
-			panic(fmt.Sprintf("assert: arguments: String(%d) failed because object wasn't correct type: %s", index, args.Get(index)))
-		}
-		return s
-	}
-
-	panic(fmt.Sprintf("assert: arguments: Wrong number of arguments passed to String.  Must be 0 or 1, not %d", len(indexOrNil)))
-
-}
-
-// Int gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Int(index int) int {
-	var s int
-	var ok bool
-	if s, ok = args.Get(index).(int); !ok {
-		panic(fmt.Sprintf("assert: arguments: Int(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
-
-// Error gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Error(index int) error {
-	obj := args.Get(index)
-	var s error
-	var ok bool
-	if obj == nil {
-		return nil
-	}
-	if s, ok = obj.(error); !ok {
-		panic(fmt.Sprintf("assert: arguments: Error(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
-
-// Bool gets the argument at the specified index. Panics if there is no argument, or
-// if the argument is of the wrong type.
-func (args Arguments) Bool(index int) bool {
-	var s bool
-	var ok bool
-	if s, ok = args.Get(index).(bool); !ok {
-		panic(fmt.Sprintf("assert: arguments: Bool(%d) failed because object wasn't correct type: %v", index, args.Get(index)))
-	}
-	return s
-}
-
-func typeAndKind(v interface{}) (reflect.Type, reflect.Kind) {
-	t := reflect.TypeOf(v)
-	k := t.Kind()
-
-	if k == reflect.Ptr {
-		t = t.Elem()
-		k = t.Kind()
-	}
-	return t, k
-}
-
-func diffArguments(expected Arguments, actual Arguments) string {
-	for x := range expected {
-		if diffString := diff(expected[x], actual[x]); diffString != "" {
-			return fmt.Sprintf("Difference found in argument %v:\n\n%s", x, diffString)
-		}
-	}
-
-	return ""
-}
-
-// diff returns a diff of both values as long as both are of the same type and
-// are a struct, map, slice or array. Otherwise it returns an empty string.
-func diff(expected interface{}, actual interface{}) string {
-	if expected == nil || actual == nil {
-		return ""
-	}
-
-	et, ek := typeAndKind(expected)
-	at, _ := typeAndKind(actual)
-
-	if et != at {
-		return ""
-	}
-
-	if ek != reflect.Struct && ek != reflect.Map && ek != reflect.Slice && ek != reflect.Array {
-		return ""
-	}
-
-	e := spew.Sdump(expected)
-	a := spew.Sdump(actual)
-
-	diff, _ := difflib.GetUnifiedDiffString(difflib.UnifiedDiff{
-		A:        difflib.SplitLines(e),
-		B:        difflib.SplitLines(a),
-		FromFile: "Expected",
-		FromDate: "",
-		ToFile:   "Actual",
-		ToDate:   "",
-		Context:  1,
-	})
-
-	return diff
-}
diff --git a/installer/vendor/github.com/stretchr/testify/mock/mock_test.go b/installer/vendor/github.com/stretchr/testify/mock/mock_test.go
deleted file mode 100644
index 8cb4615db7..0000000000
--- a/installer/vendor/github.com/stretchr/testify/mock/mock_test.go
+++ /dev/null
@@ -1,1132 +0,0 @@
-package mock
-
-import (
-	"errors"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"testing"
-	"time"
-)
-
-/*
-	Test objects
-*/
-
-// ExampleInterface represents an example interface.
-type ExampleInterface interface {
-	TheExampleMethod(a, b, c int) (int, error)
-}
-
-// TestExampleImplementation is a test implementation of ExampleInterface
-type TestExampleImplementation struct {
-	Mock
-}
-
-func (i *TestExampleImplementation) TheExampleMethod(a, b, c int) (int, error) {
-	args := i.Called(a, b, c)
-	return args.Int(0), errors.New("Whoops")
-}
-
-func (i *TestExampleImplementation) TheExampleMethod2(yesorno bool) {
-	i.Called(yesorno)
-}
-
-type ExampleType struct {
-	ran bool
-}
-
-func (i *TestExampleImplementation) TheExampleMethod3(et *ExampleType) error {
-	args := i.Called(et)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodFunc(fn func(string) error) error {
-	args := i.Called(fn)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodVariadic(a ...int) error {
-	args := i.Called(a)
-	return args.Error(0)
-}
-
-func (i *TestExampleImplementation) TheExampleMethodVariadicInterface(a ...interface{}) error {
-	args := i.Called(a)
-	return args.Error(0)
-}
-
-type ExampleFuncType func(string) error
-
-func (i *TestExampleImplementation) TheExampleMethodFuncType(fn ExampleFuncType) error {
-	args := i.Called(fn)
-	return args.Error(0)
-}
-
-/*
-	Mock
-*/
-
-func Test_Mock_TestData(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	if assert.NotNil(t, mockedService.TestData()) {
-
-		mockedService.TestData().Set("something", 123)
-		assert.Equal(t, 123, mockedService.TestData().Get("something").Data())
-	}
-}
-
-func Test_Mock_On(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.On("TheExampleMethod")
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, "TheExampleMethod", c.Method)
-}
-
-func Test_Mock_Chained_On(t *testing.T) {
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.
-		On("TheExampleMethod", 1, 2, 3).
-		Return(0).
-		On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).
-		Return(nil)
-
-	expectedCalls := []*Call{
-		&Call{
-			Parent:          &mockedService.Mock,
-			Method:          "TheExampleMethod",
-			Arguments:       []interface{}{1, 2, 3},
-			ReturnArguments: []interface{}{0},
-		},
-		&Call{
-			Parent:          &mockedService.Mock,
-			Method:          "TheExampleMethod3",
-			Arguments:       []interface{}{AnythingOfType("*mock.ExampleType")},
-			ReturnArguments: []interface{}{nil},
-		},
-	}
-	assert.Equal(t, expectedCalls, mockedService.ExpectedCalls)
-}
-
-func Test_Mock_On_WithArgs(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.On("TheExampleMethod", 1, 2, 3, 4)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, "TheExampleMethod", c.Method)
-	assert.Equal(t, Arguments{1, 2, 3, 4}, c.Arguments)
-}
-
-func Test_Mock_On_WithFuncArg(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethodFunc", AnythingOfType("func(string) error")).
-		Return(nil)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, "TheExampleMethodFunc", c.Method)
-	assert.Equal(t, 1, len(c.Arguments))
-	assert.Equal(t, AnythingOfType("func(string) error"), c.Arguments[0])
-
-	fn := func(string) error { return nil }
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodFunc(fn)
-	})
-}
-
-func Test_Mock_On_WithIntArgMatcher(t *testing.T) {
-	var mockedService TestExampleImplementation
-
-	mockedService.On("TheExampleMethod",
-		MatchedBy(func(a int) bool {
-			return a == 1
-		}), MatchedBy(func(b int) bool {
-			return b == 2
-		}), MatchedBy(func(c int) bool {
-			return c == 3
-		})).Return(0, nil)
-
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethod(1, 2, 4)
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethod(2, 2, 3)
-	})
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethod(1, 2, 3)
-	})
-}
-
-func Test_Mock_On_WithPtrArgMatcher(t *testing.T) {
-	var mockedService TestExampleImplementation
-
-	mockedService.On("TheExampleMethod3",
-		MatchedBy(func(a *ExampleType) bool { return a.ran == true }),
-	).Return(nil)
-
-	mockedService.On("TheExampleMethod3",
-		MatchedBy(func(a *ExampleType) bool { return a.ran == false }),
-	).Return(errors.New("error"))
-
-	assert.Equal(t, mockedService.TheExampleMethod3(&ExampleType{true}), nil)
-	assert.EqualError(t, mockedService.TheExampleMethod3(&ExampleType{false}), "error")
-}
-
-func Test_Mock_On_WithFuncArgMatcher(t *testing.T) {
-	var mockedService TestExampleImplementation
-
-	fixture1, fixture2 := errors.New("fixture1"), errors.New("fixture2")
-
-	mockedService.On("TheExampleMethodFunc",
-		MatchedBy(func(a func(string) error) bool { return a("string") == fixture1 }),
-	).Return(errors.New("fixture1"))
-
-	mockedService.On("TheExampleMethodFunc",
-		MatchedBy(func(a func(string) error) bool { return a("string") == fixture2 }),
-	).Return(errors.New("fixture2"))
-
-	assert.EqualError(t, mockedService.TheExampleMethodFunc(
-		func(string) error { return fixture1 }), "fixture1")
-	assert.EqualError(t, mockedService.TheExampleMethodFunc(
-		func(string) error { return fixture2 }), "fixture2")
-}
-
-func Test_Mock_On_WithVariadicFunc(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethodVariadic", []int{1, 2, 3}).
-		Return(nil)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, 1, len(c.Arguments))
-	assert.Equal(t, []int{1, 2, 3}, c.Arguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadic(1, 2, 3)
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadic(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithVariadicFuncWithInterface(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.On("TheExampleMethodVariadicInterface", []interface{}{1, 2, 3}).
-		Return(nil)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, 1, len(c.Arguments))
-	assert.Equal(t, []interface{}{1, 2, 3}, c.Arguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2, 3)
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithVariadicFuncWithEmptyInterfaceArray(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	var expected []interface{}
-	c := mockedService.
-		On("TheExampleMethodVariadicInterface", expected).
-		Return(nil)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, 1, len(c.Arguments))
-	assert.Equal(t, expected, c.Arguments[0])
-
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface()
-	})
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethodVariadicInterface(1, 2)
-	})
-
-}
-
-func Test_Mock_On_WithFuncPanics(t *testing.T) {
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	assert.Panics(t, func() {
-		mockedService.On("TheExampleMethodFunc", func(string) error { return nil })
-	})
-}
-
-func Test_Mock_On_WithFuncTypeArg(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethodFuncType", AnythingOfType("mock.ExampleFuncType")).
-		Return(nil)
-
-	assert.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-	assert.Equal(t, 1, len(c.Arguments))
-	assert.Equal(t, AnythingOfType("mock.ExampleFuncType"), c.Arguments[0])
-
-	fn := func(string) error { return nil }
-	assert.NotPanics(t, func() {
-		mockedService.TheExampleMethodFuncType(fn)
-	})
-}
-
-func Test_Mock_Return(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethod", "A", "B", true).
-		Return(1, "two", true)
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 0, call.Repeatability)
-	assert.Nil(t, call.WaitFor)
-}
-
-func Test_Mock_Return_WaitUntil(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-	ch := time.After(time.Second)
-
-	c := mockedService.Mock.
-		On("TheExampleMethod", "A", "B", true).
-		WaitUntil(ch).
-		Return(1, "two", true)
-
-	// assert that the call was created
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 0, call.Repeatability)
-	assert.Equal(t, ch, call.WaitFor)
-}
-
-func Test_Mock_Return_After(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.Mock.
-		On("TheExampleMethod", "A", "B", true).
-		Return(1, "two", true).
-		After(time.Second)
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.Mock.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 0, call.Repeatability)
-	assert.NotEqual(t, nil, call.WaitFor)
-
-}
-
-func Test_Mock_Return_Run(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	fn := func(args Arguments) {
-		arg := args.Get(0).(*ExampleType)
-		arg.ran = true
-	}
-
-	c := mockedService.Mock.
-		On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).
-		Return(nil).
-		Run(fn)
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.Mock.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod3", call.Method)
-	assert.Equal(t, AnythingOfType("*mock.ExampleType"), call.Arguments[0])
-	assert.Equal(t, nil, call.ReturnArguments[0])
-	assert.Equal(t, 0, call.Repeatability)
-	assert.NotEqual(t, nil, call.WaitFor)
-	assert.NotNil(t, call.Run)
-
-	et := ExampleType{}
-	assert.Equal(t, false, et.ran)
-	mockedService.TheExampleMethod3(&et)
-	assert.Equal(t, true, et.ran)
-}
-
-func Test_Mock_Return_Run_Out_Of_Order(t *testing.T) {
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-	f := func(args Arguments) {
-		arg := args.Get(0).(*ExampleType)
-		arg.ran = true
-	}
-
-	c := mockedService.Mock.
-		On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).
-		Run(f).
-		Return(nil)
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.Mock.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod3", call.Method)
-	assert.Equal(t, AnythingOfType("*mock.ExampleType"), call.Arguments[0])
-	assert.Equal(t, nil, call.ReturnArguments[0])
-	assert.Equal(t, 0, call.Repeatability)
-	assert.NotEqual(t, nil, call.WaitFor)
-	assert.NotNil(t, call.Run)
-}
-
-func Test_Mock_Return_Once(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.On("TheExampleMethod", "A", "B", true).
-		Return(1, "two", true).
-		Once()
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 1, call.Repeatability)
-	assert.Nil(t, call.WaitFor)
-}
-
-func Test_Mock_Return_Twice(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethod", "A", "B", true).
-		Return(1, "two", true).
-		Twice()
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 2, call.Repeatability)
-	assert.Nil(t, call.WaitFor)
-}
-
-func Test_Mock_Return_Times(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethod", "A", "B", true).
-		Return(1, "two", true).
-		Times(5)
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 1, call.ReturnArguments[0])
-	assert.Equal(t, "two", call.ReturnArguments[1])
-	assert.Equal(t, true, call.ReturnArguments[2])
-	assert.Equal(t, 5, call.Repeatability)
-	assert.Nil(t, call.WaitFor)
-}
-
-func Test_Mock_Return_Nothing(t *testing.T) {
-
-	// make a test impl object
-	var mockedService = new(TestExampleImplementation)
-
-	c := mockedService.
-		On("TheExampleMethod", "A", "B", true).
-		Return()
-
-	require.Equal(t, []*Call{c}, mockedService.ExpectedCalls)
-
-	call := mockedService.ExpectedCalls[0]
-
-	assert.Equal(t, "TheExampleMethod", call.Method)
-	assert.Equal(t, "A", call.Arguments[0])
-	assert.Equal(t, "B", call.Arguments[1])
-	assert.Equal(t, true, call.Arguments[2])
-	assert.Equal(t, 0, len(call.ReturnArguments))
-}
-
-func Test_Mock_findExpectedCall(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two")
-	m.On("Two", 3).Return("three")
-
-	f, c := m.findExpectedCall("Two", 3)
-
-	if assert.Equal(t, 2, f) {
-		if assert.NotNil(t, c) {
-			assert.Equal(t, "Two", c.Method)
-			assert.Equal(t, 3, c.Arguments[0])
-			assert.Equal(t, "three", c.ReturnArguments[0])
-		}
-	}
-
-}
-
-func Test_Mock_findExpectedCall_For_Unknown_Method(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two")
-	m.On("Two", 3).Return("three")
-
-	f, _ := m.findExpectedCall("Two")
-
-	assert.Equal(t, -1, f)
-
-}
-
-func Test_Mock_findExpectedCall_Respects_Repeatability(t *testing.T) {
-
-	m := new(Mock)
-	m.On("One", 1).Return("one")
-	m.On("Two", 2).Return("two").Once()
-	m.On("Two", 3).Return("three").Twice()
-	m.On("Two", 3).Return("three").Times(8)
-
-	f, c := m.findExpectedCall("Two", 3)
-
-	if assert.Equal(t, 2, f) {
-		if assert.NotNil(t, c) {
-			assert.Equal(t, "Two", c.Method)
-			assert.Equal(t, 3, c.Arguments[0])
-			assert.Equal(t, "three", c.ReturnArguments[0])
-		}
-	}
-
-}
-
-func Test_callString(t *testing.T) {
-
-	assert.Equal(t, `Method(int,bool,string)`, callString("Method", []interface{}{1, true, "something"}, false))
-
-}
-
-func Test_Mock_Called(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_Called", 1, 2, 3).Return(5, "6", true)
-
-	returnArguments := mockedService.Called(1, 2, 3)
-
-	if assert.Equal(t, 1, len(mockedService.Calls)) {
-		assert.Equal(t, "Test_Mock_Called", mockedService.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[0].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments)) {
-		assert.Equal(t, 5, returnArguments[0])
-		assert.Equal(t, "6", returnArguments[1])
-		assert.Equal(t, true, returnArguments[2])
-	}
-
-}
-
-func asyncCall(m *Mock, ch chan Arguments) {
-	ch <- m.Called(1, 2, 3)
-}
-
-func Test_Mock_Called_blocks(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.Mock.On("asyncCall", 1, 2, 3).Return(5, "6", true).After(2 * time.Millisecond)
-
-	ch := make(chan Arguments)
-
-	go asyncCall(&mockedService.Mock, ch)
-
-	select {
-	case <-ch:
-		t.Fatal("should have waited")
-	case <-time.After(1 * time.Millisecond):
-	}
-
-	returnArguments := <-ch
-
-	if assert.Equal(t, 1, len(mockedService.Mock.Calls)) {
-		assert.Equal(t, "asyncCall", mockedService.Mock.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Mock.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Mock.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Mock.Calls[0].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments)) {
-		assert.Equal(t, 5, returnArguments[0])
-		assert.Equal(t, "6", returnArguments[1])
-		assert.Equal(t, true, returnArguments[2])
-	}
-
-}
-
-func Test_Mock_Called_For_Bounded_Repeatability(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.
-		On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).
-		Return(5, "6", true).
-		Once()
-	mockedService.
-		On("Test_Mock_Called_For_Bounded_Repeatability", 1, 2, 3).
-		Return(-1, "hi", false)
-
-	returnArguments1 := mockedService.Called(1, 2, 3)
-	returnArguments2 := mockedService.Called(1, 2, 3)
-
-	if assert.Equal(t, 2, len(mockedService.Calls)) {
-		assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Calls[0].Method)
-		assert.Equal(t, 1, mockedService.Calls[0].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[0].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[0].Arguments[2])
-
-		assert.Equal(t, "Test_Mock_Called_For_Bounded_Repeatability", mockedService.Calls[1].Method)
-		assert.Equal(t, 1, mockedService.Calls[1].Arguments[0])
-		assert.Equal(t, 2, mockedService.Calls[1].Arguments[1])
-		assert.Equal(t, 3, mockedService.Calls[1].Arguments[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments1)) {
-		assert.Equal(t, 5, returnArguments1[0])
-		assert.Equal(t, "6", returnArguments1[1])
-		assert.Equal(t, true, returnArguments1[2])
-	}
-
-	if assert.Equal(t, 3, len(returnArguments2)) {
-		assert.Equal(t, -1, returnArguments2[0])
-		assert.Equal(t, "hi", returnArguments2[1])
-		assert.Equal(t, false, returnArguments2[2])
-	}
-
-}
-
-func Test_Mock_Called_For_SetTime_Expectation(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod", 1, 2, 3).Return(5, "6", true).Times(4)
-
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	mockedService.TheExampleMethod(1, 2, 3)
-	assert.Panics(t, func() {
-		mockedService.TheExampleMethod(1, 2, 3)
-	})
-
-}
-
-func Test_Mock_Called_Unexpected(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	// make sure it panics if no expectation was made
-	assert.Panics(t, func() {
-		mockedService.Called(1, 2, 3)
-	}, "Calling unexpected method should panic")
-
-}
-
-func Test_AssertExpectationsForObjects_Helper(t *testing.T) {
-
-	var mockedService1 = new(TestExampleImplementation)
-	var mockedService2 = new(TestExampleImplementation)
-	var mockedService3 = new(TestExampleImplementation)
-
-	mockedService1.On("Test_AssertExpectationsForObjects_Helper", 1).Return()
-	mockedService2.On("Test_AssertExpectationsForObjects_Helper", 2).Return()
-	mockedService3.On("Test_AssertExpectationsForObjects_Helper", 3).Return()
-
-	mockedService1.Called(1)
-	mockedService2.Called(2)
-	mockedService3.Called(3)
-
-	assert.True(t, AssertExpectationsForObjects(t, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-	assert.True(t, AssertExpectationsForObjects(t, mockedService1, mockedService2, mockedService3))
-
-}
-
-func Test_AssertExpectationsForObjects_Helper_Failed(t *testing.T) {
-
-	var mockedService1 = new(TestExampleImplementation)
-	var mockedService2 = new(TestExampleImplementation)
-	var mockedService3 = new(TestExampleImplementation)
-
-	mockedService1.On("Test_AssertExpectationsForObjects_Helper_Failed", 1).Return()
-	mockedService2.On("Test_AssertExpectationsForObjects_Helper_Failed", 2).Return()
-	mockedService3.On("Test_AssertExpectationsForObjects_Helper_Failed", 3).Return()
-
-	mockedService1.Called(1)
-	mockedService3.Called(3)
-
-	tt := new(testing.T)
-	assert.False(t, AssertExpectationsForObjects(tt, mockedService1.Mock, mockedService2.Mock, mockedService3.Mock))
-	assert.False(t, AssertExpectationsForObjects(tt, mockedService1, mockedService2, mockedService3))
-
-}
-
-func Test_Mock_AssertExpectations(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations", 1, 2, 3).Return(5, 6, 7)
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called(1, 2, 3)
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectations_Placeholder_NoArgs(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations_Placeholder_NoArgs").Return(5, 6, 7).Once()
-	mockedService.On("Test_Mock_AssertExpectations_Placeholder_NoArgs").Return(7, 6, 5)
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called()
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectations_Placeholder(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations_Placeholder", 1, 2, 3).Return(5, 6, 7).Once()
-	mockedService.On("Test_Mock_AssertExpectations_Placeholder", 3, 2, 1).Return(7, 6, 5)
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called(1, 2, 3)
-
-	// now assert expectations
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make call to the second expectation
-	mockedService.Called(3, 2, 1)
-
-	// now assert expectations again
-	assert.True(t, mockedService.AssertExpectations(tt))
-}
-
-func Test_Mock_AssertExpectations_With_Pointers(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations_With_Pointers", &struct{ Foo int }{1}).Return(1)
-	mockedService.On("Test_Mock_AssertExpectations_With_Pointers", &struct{ Foo int }{2}).Return(2)
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	s := struct{ Foo int }{1}
-	// make the calls now
-	mockedService.Called(&s)
-	s.Foo = 2
-	mockedService.Called(&s)
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectationsCustomType(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("TheExampleMethod3", AnythingOfType("*mock.ExampleType")).Return(nil).Once()
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.TheExampleMethod3(&ExampleType{})
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_AssertExpectations_With_Repeatability(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertExpectations_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Twice()
-
-	tt := new(testing.T)
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	// make the call now
-	mockedService.Called(1, 2, 3)
-
-	assert.False(t, mockedService.AssertExpectations(tt))
-
-	mockedService.Called(1, 2, 3)
-
-	// now assert expectations
-	assert.True(t, mockedService.AssertExpectations(tt))
-
-}
-
-func Test_Mock_TwoCallsWithDifferentArguments(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_TwoCallsWithDifferentArguments", 1, 2, 3).Return(5, 6, 7)
-	mockedService.On("Test_Mock_TwoCallsWithDifferentArguments", 4, 5, 6).Return(5, 6, 7)
-
-	args1 := mockedService.Called(1, 2, 3)
-	assert.Equal(t, 5, args1.Int(0))
-	assert.Equal(t, 6, args1.Int(1))
-	assert.Equal(t, 7, args1.Int(2))
-
-	args2 := mockedService.Called(4, 5, 6)
-	assert.Equal(t, 5, args2.Int(0))
-	assert.Equal(t, 6, args2.Int(1))
-	assert.Equal(t, 7, args2.Int(2))
-
-}
-
-func Test_Mock_AssertNumberOfCalls(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertNumberOfCalls", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-	assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 1))
-
-	mockedService.Called(1, 2, 3)
-	assert.True(t, mockedService.AssertNumberOfCalls(t, "Test_Mock_AssertNumberOfCalls", 2))
-
-}
-
-func Test_Mock_AssertCalled(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled", 1, 2, 3))
-
-}
-
-func Test_Mock_AssertCalled_WithAnythingOfTypeArgument(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.
-		On("Test_Mock_AssertCalled_WithAnythingOfTypeArgument", Anything, Anything, Anything).
-		Return()
-
-	mockedService.Called(1, "two", []uint8("three"))
-
-	assert.True(t, mockedService.AssertCalled(t, "Test_Mock_AssertCalled_WithAnythingOfTypeArgument", AnythingOfType("int"), AnythingOfType("string"), AnythingOfType("[]uint8")))
-
-}
-
-func Test_Mock_AssertCalled_WithArguments(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled_WithArguments", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	tt := new(testing.T)
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 1, 2, 3))
-	assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments", 2, 3, 4))
-
-}
-
-func Test_Mock_AssertCalled_WithArguments_With_Repeatability(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3).Return(5, 6, 7).Once()
-	mockedService.On("Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4).Return(5, 6, 7).Once()
-
-	mockedService.Called(1, 2, 3)
-	mockedService.Called(2, 3, 4)
-
-	tt := new(testing.T)
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 1, 2, 3))
-	assert.True(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 2, 3, 4))
-	assert.False(t, mockedService.AssertCalled(tt, "Test_Mock_AssertCalled_WithArguments_With_Repeatability", 3, 4, 5))
-
-}
-
-func Test_Mock_AssertNotCalled(t *testing.T) {
-
-	var mockedService = new(TestExampleImplementation)
-
-	mockedService.On("Test_Mock_AssertNotCalled", 1, 2, 3).Return(5, 6, 7)
-
-	mockedService.Called(1, 2, 3)
-
-	assert.True(t, mockedService.AssertNotCalled(t, "Test_Mock_NotCalled"))
-
-}
-
-/*
-	Arguments helper methods
-*/
-func Test_Arguments_Get(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-
-	assert.Equal(t, "string", args.Get(0).(string))
-	assert.Equal(t, 123, args.Get(1).(int))
-	assert.Equal(t, true, args.Get(2).(bool))
-
-}
-
-func Test_Arguments_Is(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-
-	assert.True(t, args.Is("string", 123, true))
-	assert.False(t, args.Is("wrong", 456, false))
-
-}
-
-func Test_Arguments_Diff(t *testing.T) {
-
-	var args = Arguments([]interface{}{"Hello World", 123, true})
-	var diff string
-	var count int
-	diff, count = args.Diff([]interface{}{"Hello World", 456, "false"})
-
-	assert.Equal(t, 2, count)
-	assert.Contains(t, diff, `%!s(int=456) != %!s(int=123)`)
-	assert.Contains(t, diff, `false != %!s(bool=true)`)
-
-}
-
-func Test_Arguments_Diff_DifferentNumberOfArgs(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	var diff string
-	var count int
-	diff, count = args.Diff([]interface{}{"string", 456, "false", "extra"})
-
-	assert.Equal(t, 3, count)
-	assert.Contains(t, diff, `extra != (Missing)`)
-
-}
-
-func Test_Arguments_Diff_WithAnythingArgument(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	var count int
-	_, count = args.Diff([]interface{}{"string", Anything, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingArgument_InActualToo(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", Anything, true})
-	var count int
-	_, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingOfTypeArgument(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", AnythingOfType("int"), true})
-	var count int
-	_, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 0, count)
-
-}
-
-func Test_Arguments_Diff_WithAnythingOfTypeArgument_Failing(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", AnythingOfType("string"), true})
-	var count int
-	var diff string
-	diff, count = args.Diff([]interface{}{"string", 123, true})
-
-	assert.Equal(t, 1, count)
-	assert.Contains(t, diff, `string != type int - %!s(int=123)`)
-
-}
-
-func Test_Arguments_Diff_WithArgMatcher(t *testing.T) {
-	matchFn := func(a int) bool {
-		return a == 123
-	}
-	var args = Arguments([]interface{}{"string", MatchedBy(matchFn), true})
-
-	diff, count := args.Diff([]interface{}{"string", 124, true})
-	assert.Equal(t, 1, count)
-	assert.Contains(t, diff, `%!s(int=124) not matched by func(int) bool`)
-
-	diff, count = args.Diff([]interface{}{"string", false, true})
-	assert.Equal(t, 1, count)
-	assert.Contains(t, diff, `%!s(bool=false) not matched by func(int) bool`)
-
-	diff, count = args.Diff([]interface{}{"string", 123, false})
-	assert.Contains(t, diff, `%!s(int=123) matched by func(int) bool`)
-
-	diff, count = args.Diff([]interface{}{"string", 123, true})
-	assert.Equal(t, 0, count)
-	assert.Contains(t, diff, `No differences.`)
-}
-
-func Test_Arguments_Assert(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-
-	assert.True(t, args.Assert(t, "string", 123, true))
-
-}
-
-func Test_Arguments_String_Representation(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	assert.Equal(t, `string,int,bool`, args.String())
-
-}
-
-func Test_Arguments_String(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	assert.Equal(t, "string", args.String(0))
-
-}
-
-func Test_Arguments_Error(t *testing.T) {
-
-	var err = errors.New("An Error")
-	var args = Arguments([]interface{}{"string", 123, true, err})
-	assert.Equal(t, err, args.Error(3))
-
-}
-
-func Test_Arguments_Error_Nil(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true, nil})
-	assert.Equal(t, nil, args.Error(3))
-
-}
-
-func Test_Arguments_Int(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	assert.Equal(t, 123, args.Int(1))
-
-}
-
-func Test_Arguments_Bool(t *testing.T) {
-
-	var args = Arguments([]interface{}{"string", 123, true})
-	assert.Equal(t, true, args.Bool(2))
-
-}
diff --git a/installer/vendor/github.com/stretchr/testify/package_test.go b/installer/vendor/github.com/stretchr/testify/package_test.go
deleted file mode 100644
index 7ac5d6d8ed..0000000000
--- a/installer/vendor/github.com/stretchr/testify/package_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package testify
-
-import (
-	"github.com/stretchr/testify/assert"
-	"testing"
-)
-
-func TestImports(t *testing.T) {
-	if assert.Equal(t, 1, 1) != true {
-		t.Error("Something is wrong.")
-	}
-}
diff --git a/installer/vendor/github.com/stretchr/testify/require/forward_requirements.go b/installer/vendor/github.com/stretchr/testify/require/forward_requirements.go
index d3c2ab9bc7..ac71d40581 100644
--- a/installer/vendor/github.com/stretchr/testify/require/forward_requirements.go
+++ b/installer/vendor/github.com/stretchr/testify/require/forward_requirements.go
@@ -13,4 +13,4 @@ func New(t TestingT) *Assertions {
 	}
 }
 
-//go:generate go run ../_codegen/main.go -output-package=require -template=require_forward.go.tmpl
+//go:generate go run ../_codegen/main.go -output-package=require -template=require_forward.go.tmpl -include-format-funcs
diff --git a/installer/vendor/github.com/stretchr/testify/require/forward_requirements_test.go b/installer/vendor/github.com/stretchr/testify/require/forward_requirements_test.go
deleted file mode 100644
index b120ae3b8f..0000000000
--- a/installer/vendor/github.com/stretchr/testify/require/forward_requirements_test.go
+++ /dev/null
@@ -1,385 +0,0 @@
-package require
-
-import (
-	"errors"
-	"testing"
-	"time"
-)
-
-func TestImplementsWrapper(t *testing.T) {
-	require := New(t)
-
-	require.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Implements((*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestIsTypeWrapper(t *testing.T) {
-	require := New(t)
-	require.IsType(new(AssertionTesterConformingObject), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.IsType(new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualWrapper(t *testing.T) {
-	require := New(t)
-	require.Equal(1, 1)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Equal(1, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEqualWrapper(t *testing.T) {
-	require := New(t)
-	require.NotEqual(1, 2)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotEqual(2, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestExactlyWrapper(t *testing.T) {
-	require := New(t)
-
-	a := float32(1)
-	b := float32(1)
-	c := float64(1)
-
-	require.Exactly(a, b)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Exactly(a, c)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotNilWrapper(t *testing.T) {
-	require := New(t)
-	require.NotNil(t, new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotNil(nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNilWrapper(t *testing.T) {
-	require := New(t)
-	require.Nil(nil)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Nil(new(AssertionTesterConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestTrueWrapper(t *testing.T) {
-	require := New(t)
-	require.True(true)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.True(false)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestFalseWrapper(t *testing.T) {
-	require := New(t)
-	require.False(false)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.False(true)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestContainsWrapper(t *testing.T) {
-	require := New(t)
-	require.Contains("Hello World", "Hello")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Contains("Hello World", "Salut")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotContainsWrapper(t *testing.T) {
-	require := New(t)
-	require.NotContains("Hello World", "Hello!")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotContains("Hello World", "Hello")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestPanicsWrapper(t *testing.T) {
-	require := New(t)
-	require.Panics(func() {
-		panic("Panic!")
-	})
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Panics(func() {})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotPanicsWrapper(t *testing.T) {
-	require := New(t)
-	require.NotPanics(func() {})
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotPanics(func() {
-		panic("Panic!")
-	})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNoErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.NoError(nil)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NoError(errors.New("some error"))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.Error(errors.New("some error"))
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Error(nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualErrorWrapper(t *testing.T) {
-	require := New(t)
-	require.EqualError(errors.New("some error"), "some error")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.EqualError(errors.New("some error"), "Not some error")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEmptyWrapper(t *testing.T) {
-	require := New(t)
-	require.Empty("")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Empty("x")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEmptyWrapper(t *testing.T) {
-	require := New(t)
-	require.NotEmpty("x")
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotEmpty("")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestWithinDurationWrapper(t *testing.T) {
-	require := New(t)
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	require.WithinDuration(a, b, 15*time.Second)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.WithinDuration(a, b, 5*time.Second)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestInDeltaWrapper(t *testing.T) {
-	require := New(t)
-	require.InDelta(1.001, 1, 0.01)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.InDelta(1, 2, 0.5)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestZeroWrapper(t *testing.T) {
-	require := New(t)
-	require.Zero(0)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.Zero(1)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotZeroWrapper(t *testing.T) {
-	require := New(t)
-	require.NotZero(1)
-
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-	mockRequire.NotZero(0)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_EqualSONString(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"hello": "world", "foo": "bar"}`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEqWrapper_EquivalentButNotEqual(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEqWrapper_HashOfArraysAndHashes(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq("{\r\n\t\"numeric\": 1.5,\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]],\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\"\r\n}",
-		"{\r\n\t\"numeric\": 1.5,\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\",\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]]\r\n}")
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEqWrapper_Array(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `["foo", {"nested": "hash", "hello": "world"}]`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEqWrapper_HashAndArrayNotEquivalent(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `{"foo": "bar", {"nested": "hash", "hello": "world"}}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_HashesNotEquivalent(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`{"foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_ActualIsNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`{"foo": "bar"}`, "Not JSON")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_ExpectedIsNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq("Not JSON", `{"foo": "bar", "hello": "world"}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_ExpectedAndActualNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq("Not JSON", "Not JSON")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEqWrapper_ArraysOfDifferentOrder(t *testing.T) {
-	mockT := new(MockT)
-	mockRequire := New(mockT)
-
-	mockRequire.JSONEq(`["foo", {"hello": "world", "nested": "hash"}]`, `[{ "hello": "world", "nested": "hash"}, "foo"]`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
diff --git a/installer/vendor/github.com/stretchr/testify/require/require.go b/installer/vendor/github.com/stretchr/testify/require/require.go
index 1bcfcb0d94..ac3c308788 100644
--- a/installer/vendor/github.com/stretchr/testify/require/require.go
+++ b/installer/vendor/github.com/stretchr/testify/require/require.go
@@ -1,464 +1,867 @@
 /*
 * CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
 * THIS FILE MUST NOT BE EDITED BY HAND
-*/
+ */
 
 package require
 
 import (
-
 	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
 )
 
-
 // Condition uses a Comparison to assert a complex condition.
 func Condition(t TestingT, comp assert.Comparison, msgAndArgs ...interface{}) {
-  if !assert.Condition(t, comp, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Condition(t, comp, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Conditionf uses a Comparison to assert a complex condition.
+func Conditionf(t TestingT, comp assert.Comparison, msg string, args ...interface{}) {
+	if !assert.Conditionf(t, comp, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
-// 
-//    assert.Contains(t, "Hello World", "World", "But 'Hello World' does contain 'World'")
-//    assert.Contains(t, ["Hello", "World"], "World", "But ["Hello", "World"] does contain 'World'")
-//    assert.Contains(t, {"Hello": "World"}, "Hello", "But {'Hello': 'World'} does contain 'Hello'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.Contains(t, "Hello World", "World")
+//    assert.Contains(t, ["Hello", "World"], "World")
+//    assert.Contains(t, {"Hello": "World"}, "Hello")
 func Contains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...interface{}) {
-  if !assert.Contains(t, s, contains, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Contains(t, s, contains, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Containsf asserts that the specified string, list(array, slice...) or map contains the
+// specified substring or element.
+//
+//    assert.Containsf(t, "Hello World", "World", "error message %s", "formatted")
+//    assert.Containsf(t, ["Hello", "World"], "World", "error message %s", "formatted")
+//    assert.Containsf(t, {"Hello": "World"}, "Hello", "error message %s", "formatted")
+func Containsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) {
+	if !assert.Containsf(t, s, contains, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func DirExists(t TestingT, path string, msgAndArgs ...interface{}) {
+	if !assert.DirExists(t, path, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func DirExistsf(t TestingT, path string, msg string, args ...interface{}) {
+	if !assert.DirExistsf(t, path, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// ElementsMatch asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// assert.ElementsMatch(t, [1, 3, 2, 3], [1, 3, 3, 2])
+func ElementsMatch(t TestingT, listA interface{}, listB interface{}, msgAndArgs ...interface{}) {
+	if !assert.ElementsMatch(t, listA, listB, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// ElementsMatchf asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// assert.ElementsMatchf(t, [1, 3, 2, 3], [1, 3, 3, 2], "error message %s", "formatted")
+func ElementsMatchf(t TestingT, listA interface{}, listB interface{}, msg string, args ...interface{}) {
+	if !assert.ElementsMatchf(t, listA, listB, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  assert.Empty(t, obj)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func Empty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.Empty(t, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Empty(t, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  assert.Emptyf(t, obj, "error message %s", "formatted")
+func Emptyf(t TestingT, object interface{}, msg string, args ...interface{}) {
+	if !assert.Emptyf(t, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Equal asserts that two objects are equal.
-// 
-//    assert.Equal(t, 123, 123, "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.Equal(t, 123, 123)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
 func Equal(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
-  if !assert.Equal(t, expected, actual, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Equal(t, expected, actual, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
-
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
-//   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//   assert.EqualError(t, err,  expectedErrorString)
 func EqualError(t TestingT, theError error, errString string, msgAndArgs ...interface{}) {
-  if !assert.EqualError(t, theError, errString, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.EqualError(t, theError, errString, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// and that it is equal to the provided error.
+//
+//   actualObj, err := SomeFunction()
+//   assert.EqualErrorf(t, err,  expectedErrorString, "error message %s", "formatted")
+func EqualErrorf(t TestingT, theError error, errString string, msg string, args ...interface{}) {
+	if !assert.EqualErrorf(t, theError, errString, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
-// 
-//    assert.EqualValues(t, uint32(123), int32(123), "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.EqualValues(t, uint32(123), int32(123))
 func EqualValues(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
-  if !assert.EqualValues(t, expected, actual, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.EqualValues(t, expected, actual, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// EqualValuesf asserts that two objects are equal or convertable to the same types
+// and equal.
+//
+//    assert.EqualValuesf(t, uint32(123, "error message %s", "formatted"), int32(123))
+func EqualValuesf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if !assert.EqualValuesf(t, expected, actual, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// Equalf asserts that two objects are equal.
+//
+//    assert.Equalf(t, 123, 123, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
+func Equalf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if !assert.Equalf(t, expected, actual, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Error asserts that a function returned an error (i.e. not `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
+//   if assert.Error(t, err) {
+// 	   assert.Equal(t, expectedError, err)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func Error(t TestingT, err error, msgAndArgs ...interface{}) {
-  if !assert.Error(t, err, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Error(t, err, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Errorf asserts that a function returned an error (i.e. not `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if assert.Errorf(t, err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedErrorf, err)
+//   }
+func Errorf(t TestingT, err error, msg string, args ...interface{}) {
+	if !assert.Errorf(t, err, msg, args...) {
+		t.FailNow()
+	}
+}
 
-// Exactly asserts that two objects are equal is value and type.
-// 
-//    assert.Exactly(t, int32(123), int64(123), "123 and 123 should NOT be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+// Exactly asserts that two objects are equal in value and type.
+//
+//    assert.Exactly(t, int32(123), int64(123))
 func Exactly(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
-  if !assert.Exactly(t, expected, actual, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Exactly(t, expected, actual, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Exactlyf asserts that two objects are equal in value and type.
+//
+//    assert.Exactlyf(t, int32(123, "error message %s", "formatted"), int64(123))
+func Exactlyf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if !assert.Exactlyf(t, expected, actual, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Fail reports a failure through
 func Fail(t TestingT, failureMessage string, msgAndArgs ...interface{}) {
-  if !assert.Fail(t, failureMessage, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Fail(t, failureMessage, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
-
 // FailNow fails test
 func FailNow(t TestingT, failureMessage string, msgAndArgs ...interface{}) {
-  if !assert.FailNow(t, failureMessage, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.FailNow(t, failureMessage, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// FailNowf fails test
+func FailNowf(t TestingT, failureMessage string, msg string, args ...interface{}) {
+	if !assert.FailNowf(t, failureMessage, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// Failf reports a failure through
+func Failf(t TestingT, failureMessage string, msg string, args ...interface{}) {
+	if !assert.Failf(t, failureMessage, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // False asserts that the specified value is false.
-// 
-//    assert.False(t, myBool, "myBool should be false")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.False(t, myBool)
 func False(t TestingT, value bool, msgAndArgs ...interface{}) {
-  if !assert.False(t, value, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.False(t, value, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Falsef asserts that the specified value is false.
+//
+//    assert.Falsef(t, myBool, "error message %s", "formatted")
+func Falsef(t TestingT, value bool, msg string, args ...interface{}) {
+	if !assert.Falsef(t, value, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func FileExists(t TestingT, path string, msgAndArgs ...interface{}) {
+	if !assert.FileExists(t, path, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func FileExistsf(t TestingT, path string, msg string, args ...interface{}) {
+	if !assert.FileExistsf(t, path, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
-// 
+//
 //  assert.HTTPBodyContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) {
-  if !assert.HTTPBodyContains(t, handler, method, url, values, str) {
-    t.FailNow()
-  }
+func HTTPBodyContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
+	if !assert.HTTPBodyContains(t, handler, method, url, values, str, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// HTTPBodyContainsf asserts that a specified handler returns a
+// body that contains a string.
+//
+//  assert.HTTPBodyContainsf(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPBodyContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
+	if !assert.HTTPBodyContainsf(t, handler, method, url, values, str, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
-// 
+//
 //  assert.HTTPBodyNotContains(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) {
-  if !assert.HTTPBodyNotContains(t, handler, method, url, values, str) {
-    t.FailNow()
-  }
+func HTTPBodyNotContains(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
+	if !assert.HTTPBodyNotContains(t, handler, method, url, values, str, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// HTTPBodyNotContainsf asserts that a specified handler returns a
+// body that does not contain a string.
+//
+//  assert.HTTPBodyNotContainsf(t, myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPBodyNotContainsf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
+	if !assert.HTTPBodyNotContainsf(t, handler, method, url, values, str, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // HTTPError asserts that a specified handler returns an error status code.
-// 
+//
 //  assert.HTTPError(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPError(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values) {
-  if !assert.HTTPError(t, handler, method, url, values) {
-    t.FailNow()
-  }
+func HTTPError(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	if !assert.HTTPError(t, handler, method, url, values, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// HTTPErrorf asserts that a specified handler returns an error status code.
+//
+//  assert.HTTPErrorf(t, myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func HTTPErrorf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	if !assert.HTTPErrorf(t, handler, method, url, values, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
-// 
+//
 //  assert.HTTPRedirect(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPRedirect(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values) {
-  if !assert.HTTPRedirect(t, handler, method, url, values) {
-    t.FailNow()
-  }
+func HTTPRedirect(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	if !assert.HTTPRedirect(t, handler, method, url, values, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// HTTPRedirectf asserts that a specified handler returns a redirect status code.
+//
+//  assert.HTTPRedirectf(t, myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func HTTPRedirectf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	if !assert.HTTPRedirectf(t, handler, method, url, values, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
-// 
+//
 //  assert.HTTPSuccess(t, myHandler, "POST", "http://www.google.com", nil)
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func HTTPSuccess(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values) {
-  if !assert.HTTPSuccess(t, handler, method, url, values) {
-    t.FailNow()
-  }
+func HTTPSuccess(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	if !assert.HTTPSuccess(t, handler, method, url, values, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// HTTPSuccessf asserts that a specified handler returns a success status code.
+//
+//  assert.HTTPSuccessf(t, myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func HTTPSuccessf(t TestingT, handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	if !assert.HTTPSuccessf(t, handler, method, url, values, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Implements asserts that an object is implemented by the specified interface.
-// 
-//    assert.Implements(t, (*MyInterface)(nil), new(MyObject), "MyObject")
+//
+//    assert.Implements(t, (*MyInterface)(nil), new(MyObject))
 func Implements(t TestingT, interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.Implements(t, interfaceObject, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Implements(t, interfaceObject, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Implementsf asserts that an object is implemented by the specified interface.
+//
+//    assert.Implementsf(t, (*MyInterface, "error message %s", "formatted")(nil), new(MyObject))
+func Implementsf(t TestingT, interfaceObject interface{}, object interface{}, msg string, args ...interface{}) {
+	if !assert.Implementsf(t, interfaceObject, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // InDelta asserts that the two numerals are within delta of each other.
-// 
+//
 // 	 assert.InDelta(t, math.Pi, (22 / 7.0), 0.01)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func InDelta(t TestingT, expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-  if !assert.InDelta(t, expected, actual, delta, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.InDelta(t, expected, actual, delta, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// InDeltaMapValues is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func InDeltaMapValues(t TestingT, expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
+	if !assert.InDeltaMapValues(t, expected, actual, delta, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// InDeltaMapValuesf is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func InDeltaMapValuesf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	if !assert.InDeltaMapValuesf(t, expected, actual, delta, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // InDeltaSlice is the same as InDelta, except it compares two slices.
 func InDeltaSlice(t TestingT, expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-  if !assert.InDeltaSlice(t, expected, actual, delta, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.InDeltaSlice(t, expected, actual, delta, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// InDeltaSlicef is the same as InDelta, except it compares two slices.
+func InDeltaSlicef(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	if !assert.InDeltaSlicef(t, expected, actual, delta, msg, args...) {
+		t.FailNow()
+	}
 }
 
+// InDeltaf asserts that the two numerals are within delta of each other.
+//
+// 	 assert.InDeltaf(t, math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01)
+func InDeltaf(t TestingT, expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	if !assert.InDeltaf(t, expected, actual, delta, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // InEpsilon asserts that expected and actual have a relative error less than epsilon
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func InEpsilon(t TestingT, expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
-  if !assert.InEpsilon(t, expected, actual, epsilon, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.InEpsilon(t, expected, actual, epsilon, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// InEpsilonSlice is the same as InEpsilon, except it compares each value from two slices.
+func InEpsilonSlice(t TestingT, expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
+	if !assert.InEpsilonSlice(t, expected, actual, epsilon, msgAndArgs...) {
+		t.FailNow()
+	}
+}
 
-// InEpsilonSlice is the same as InEpsilon, except it compares two slices.
-func InEpsilonSlice(t TestingT, expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-  if !assert.InEpsilonSlice(t, expected, actual, delta, msgAndArgs...) {
-    t.FailNow()
-  }
+// InEpsilonSlicef is the same as InEpsilon, except it compares each value from two slices.
+func InEpsilonSlicef(t TestingT, expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) {
+	if !assert.InEpsilonSlicef(t, expected, actual, epsilon, msg, args...) {
+		t.FailNow()
+	}
 }
 
+// InEpsilonf asserts that expected and actual have a relative error less than epsilon
+func InEpsilonf(t TestingT, expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) {
+	if !assert.InEpsilonf(t, expected, actual, epsilon, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // IsType asserts that the specified objects are of the same type.
 func IsType(t TestingT, expectedType interface{}, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.IsType(t, expectedType, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.IsType(t, expectedType, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// IsTypef asserts that the specified objects are of the same type.
+func IsTypef(t TestingT, expectedType interface{}, object interface{}, msg string, args ...interface{}) {
+	if !assert.IsTypef(t, expectedType, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // JSONEq asserts that two JSON strings are equivalent.
-// 
+//
 //  assert.JSONEq(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func JSONEq(t TestingT, expected string, actual string, msgAndArgs ...interface{}) {
-  if !assert.JSONEq(t, expected, actual, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.JSONEq(t, expected, actual, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// JSONEqf asserts that two JSON strings are equivalent.
+//
+//  assert.JSONEqf(t, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+func JSONEqf(t TestingT, expected string, actual string, msg string, args ...interface{}) {
+	if !assert.JSONEqf(t, expected, actual, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
-// 
-//    assert.Len(t, mySlice, 3, "The size of slice is not 3")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.Len(t, mySlice, 3)
 func Len(t TestingT, object interface{}, length int, msgAndArgs ...interface{}) {
-  if !assert.Len(t, object, length, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Len(t, object, length, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Lenf asserts that the specified object has specific length.
+// Lenf also fails if the object has a type that len() not accept.
+//
+//    assert.Lenf(t, mySlice, 3, "error message %s", "formatted")
+func Lenf(t TestingT, object interface{}, length int, msg string, args ...interface{}) {
+	if !assert.Lenf(t, object, length, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Nil asserts that the specified object is nil.
-// 
-//    assert.Nil(t, err, "err should be nothing")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.Nil(t, err)
 func Nil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.Nil(t, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Nil(t, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Nilf asserts that the specified object is nil.
+//
+//    assert.Nilf(t, err, "error message %s", "formatted")
+func Nilf(t TestingT, object interface{}, msg string, args ...interface{}) {
+	if !assert.Nilf(t, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NoError asserts that a function returned no error (i.e. `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
 //   if assert.NoError(t, err) {
-// 	   assert.Equal(t, actualObj, expectedObj)
+// 	   assert.Equal(t, expectedObj, actualObj)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func NoError(t TestingT, err error, msgAndArgs ...interface{}) {
-  if !assert.NoError(t, err, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NoError(t, err, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NoErrorf asserts that a function returned no error (i.e. `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if assert.NoErrorf(t, err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedObj, actualObj)
+//   }
+func NoErrorf(t TestingT, err error, msg string, args ...interface{}) {
+	if !assert.NoErrorf(t, err, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
-// 
-//    assert.NotContains(t, "Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//    assert.NotContains(t, ["Hello", "World"], "Earth", "But ['Hello', 'World'] does NOT contain 'Earth'")
-//    assert.NotContains(t, {"Hello": "World"}, "Earth", "But {'Hello': 'World'} does NOT contain 'Earth'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.NotContains(t, "Hello World", "Earth")
+//    assert.NotContains(t, ["Hello", "World"], "Earth")
+//    assert.NotContains(t, {"Hello": "World"}, "Earth")
 func NotContains(t TestingT, s interface{}, contains interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotContains(t, s, contains, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotContains(t, s, contains, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
+// specified substring or element.
+//
+//    assert.NotContainsf(t, "Hello World", "Earth", "error message %s", "formatted")
+//    assert.NotContainsf(t, ["Hello", "World"], "Earth", "error message %s", "formatted")
+//    assert.NotContainsf(t, {"Hello": "World"}, "Earth", "error message %s", "formatted")
+func NotContainsf(t TestingT, s interface{}, contains interface{}, msg string, args ...interface{}) {
+	if !assert.NotContainsf(t, s, contains, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  if assert.NotEmpty(t, obj) {
 //    assert.Equal(t, "two", obj[1])
 //  }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func NotEmpty(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotEmpty(t, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotEmpty(t, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  if assert.NotEmptyf(t, obj, "error message %s", "formatted") {
+//    assert.Equal(t, "two", obj[1])
+//  }
+func NotEmptyf(t TestingT, object interface{}, msg string, args ...interface{}) {
+	if !assert.NotEmptyf(t, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotEqual asserts that the specified values are NOT equal.
-// 
-//    assert.NotEqual(t, obj1, obj2, "two objects shouldn't be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.NotEqual(t, obj1, obj2)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
 func NotEqual(t TestingT, expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotEqual(t, expected, actual, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotEqual(t, expected, actual, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotEqualf asserts that the specified values are NOT equal.
+//
+//    assert.NotEqualf(t, obj1, obj2, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
+func NotEqualf(t TestingT, expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	if !assert.NotEqualf(t, expected, actual, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotNil asserts that the specified object is not nil.
-// 
-//    assert.NotNil(t, err, "err should be something")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.NotNil(t, err)
 func NotNil(t TestingT, object interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotNil(t, object, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotNil(t, object, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotNilf asserts that the specified object is not nil.
+//
+//    assert.NotNilf(t, err, "error message %s", "formatted")
+func NotNilf(t TestingT, object interface{}, msg string, args ...interface{}) {
+	if !assert.NotNilf(t, object, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-// 
-//   assert.NotPanics(t, func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   assert.NotPanics(t, func(){ RemainCalm() })
 func NotPanics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-  if !assert.NotPanics(t, f, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotPanics(t, f, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
+//
+//   assert.NotPanicsf(t, func(){ RemainCalm() }, "error message %s", "formatted")
+func NotPanicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interface{}) {
+	if !assert.NotPanicsf(t, f, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // NotRegexp asserts that a specified regexp does not match a string.
-// 
+//
 //  assert.NotRegexp(t, regexp.MustCompile("starts"), "it's starting")
 //  assert.NotRegexp(t, "^start", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func NotRegexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotRegexp(t, rx, str, msgAndArgs...) {
-    t.FailNow()
-  }
-}
-
-
-// NotZero asserts that i is not the zero value for its type and returns the truth.
+	if !assert.NotRegexp(t, rx, str, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// NotRegexpf asserts that a specified regexp does not match a string.
+//
+//  assert.NotRegexpf(t, regexp.MustCompile("starts", "error message %s", "formatted"), "it's starting")
+//  assert.NotRegexpf(t, "^start", "it's not starting", "error message %s", "formatted")
+func NotRegexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) {
+	if !assert.NotRegexpf(t, rx, str, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// NotSubset asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.NotSubset(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+func NotSubset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...interface{}) {
+	if !assert.NotSubset(t, list, subset, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// NotSubsetf asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.NotSubsetf(t, [1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+func NotSubsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) {
+	if !assert.NotSubsetf(t, list, subset, msg, args...) {
+		t.FailNow()
+	}
+}
+
+// NotZero asserts that i is not the zero value for its type.
 func NotZero(t TestingT, i interface{}, msgAndArgs ...interface{}) {
-  if !assert.NotZero(t, i, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.NotZero(t, i, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// NotZerof asserts that i is not the zero value for its type.
+func NotZerof(t TestingT, i interface{}, msg string, args ...interface{}) {
+	if !assert.NotZerof(t, i, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
-// 
-//   assert.Panics(t, func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   assert.Panics(t, func(){ GoCrazy() })
 func Panics(t TestingT, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
-  if !assert.Panics(t, f, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Panics(t, f, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   assert.PanicsWithValue(t, "crazy error", func(){ GoCrazy() })
+func PanicsWithValue(t TestingT, expected interface{}, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
+	if !assert.PanicsWithValue(t, expected, f, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   assert.PanicsWithValuef(t, "crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+func PanicsWithValuef(t TestingT, expected interface{}, f assert.PanicTestFunc, msg string, args ...interface{}) {
+	if !assert.PanicsWithValuef(t, expected, f, msg, args...) {
+		t.FailNow()
+	}
 }
 
+// Panicsf asserts that the code inside the specified PanicTestFunc panics.
+//
+//   assert.Panicsf(t, func(){ GoCrazy() }, "error message %s", "formatted")
+func Panicsf(t TestingT, f assert.PanicTestFunc, msg string, args ...interface{}) {
+	if !assert.Panicsf(t, f, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // Regexp asserts that a specified regexp matches a string.
-// 
+//
 //  assert.Regexp(t, regexp.MustCompile("start"), "it's starting")
 //  assert.Regexp(t, "start...$", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func Regexp(t TestingT, rx interface{}, str interface{}, msgAndArgs ...interface{}) {
-  if !assert.Regexp(t, rx, str, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Regexp(t, rx, str, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// Regexpf asserts that a specified regexp matches a string.
+//
+//  assert.Regexpf(t, regexp.MustCompile("start", "error message %s", "formatted"), "it's starting")
+//  assert.Regexpf(t, "start...$", "it's not starting", "error message %s", "formatted")
+func Regexpf(t TestingT, rx interface{}, str interface{}, msg string, args ...interface{}) {
+	if !assert.Regexpf(t, rx, str, msg, args...) {
+		t.FailNow()
+	}
 }
 
+// Subset asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.Subset(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+func Subset(t TestingT, list interface{}, subset interface{}, msgAndArgs ...interface{}) {
+	if !assert.Subset(t, list, subset, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// Subsetf asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    assert.Subsetf(t, [1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+func Subsetf(t TestingT, list interface{}, subset interface{}, msg string, args ...interface{}) {
+	if !assert.Subsetf(t, list, subset, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // True asserts that the specified value is true.
-// 
-//    assert.True(t, myBool, "myBool should be true")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    assert.True(t, myBool)
 func True(t TestingT, value bool, msgAndArgs ...interface{}) {
-  if !assert.True(t, value, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.True(t, value, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// Truef asserts that the specified value is true.
+//
+//    assert.Truef(t, myBool, "error message %s", "formatted")
+func Truef(t TestingT, value bool, msg string, args ...interface{}) {
+	if !assert.Truef(t, value, msg, args...) {
+		t.FailNow()
+	}
+}
 
 // WithinDuration asserts that the two times are within duration delta of each other.
-// 
-//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   assert.WithinDuration(t, time.Now(), time.Now(), 10*time.Second)
 func WithinDuration(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
-  if !assert.WithinDuration(t, expected, actual, delta, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.WithinDuration(t, expected, actual, delta, msgAndArgs...) {
+		t.FailNow()
+	}
 }
 
+// WithinDurationf asserts that the two times are within duration delta of each other.
+//
+//   assert.WithinDurationf(t, time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+func WithinDurationf(t TestingT, expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) {
+	if !assert.WithinDurationf(t, expected, actual, delta, msg, args...) {
+		t.FailNow()
+	}
+}
 
-// Zero asserts that i is the zero value for its type and returns the truth.
+// Zero asserts that i is the zero value for its type.
 func Zero(t TestingT, i interface{}, msgAndArgs ...interface{}) {
-  if !assert.Zero(t, i, msgAndArgs...) {
-    t.FailNow()
-  }
+	if !assert.Zero(t, i, msgAndArgs...) {
+		t.FailNow()
+	}
+}
+
+// Zerof asserts that i is the zero value for its type.
+func Zerof(t TestingT, i interface{}, msg string, args ...interface{}) {
+	if !assert.Zerof(t, i, msg, args...) {
+		t.FailNow()
+	}
 }
diff --git a/installer/vendor/github.com/stretchr/testify/require/require.go.tmpl b/installer/vendor/github.com/stretchr/testify/require/require.go.tmpl
deleted file mode 100644
index ab1b1e9fd5..0000000000
--- a/installer/vendor/github.com/stretchr/testify/require/require.go.tmpl
+++ /dev/null
@@ -1,6 +0,0 @@
-{{.Comment}}
-func {{.DocInfo.Name}}(t TestingT, {{.Params}}) {
-  if !assert.{{.DocInfo.Name}}(t, {{.ForwardedParams}}) {
-    t.FailNow()
-  }
-}
diff --git a/installer/vendor/github.com/stretchr/testify/require/require_forward.go b/installer/vendor/github.com/stretchr/testify/require/require_forward.go
index 58324f1055..299ceb95ad 100644
--- a/installer/vendor/github.com/stretchr/testify/require/require_forward.go
+++ b/installer/vendor/github.com/stretchr/testify/require/require_forward.go
@@ -1,388 +1,687 @@
 /*
 * CODE GENERATED AUTOMATICALLY WITH github.com/stretchr/testify/_codegen
 * THIS FILE MUST NOT BE EDITED BY HAND
-*/
+ */
 
 package require
 
 import (
-
 	assert "github.com/stretchr/testify/assert"
 	http "net/http"
 	url "net/url"
 	time "time"
 )
 
-
 // Condition uses a Comparison to assert a complex condition.
 func (a *Assertions) Condition(comp assert.Comparison, msgAndArgs ...interface{}) {
 	Condition(a.t, comp, msgAndArgs...)
 }
 
+// Conditionf uses a Comparison to assert a complex condition.
+func (a *Assertions) Conditionf(comp assert.Comparison, msg string, args ...interface{}) {
+	Conditionf(a.t, comp, msg, args...)
+}
 
 // Contains asserts that the specified string, list(array, slice...) or map contains the
 // specified substring or element.
-// 
-//    a.Contains("Hello World", "World", "But 'Hello World' does contain 'World'")
-//    a.Contains(["Hello", "World"], "World", "But ["Hello", "World"] does contain 'World'")
-//    a.Contains({"Hello": "World"}, "Hello", "But {'Hello': 'World'} does contain 'Hello'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Contains("Hello World", "World")
+//    a.Contains(["Hello", "World"], "World")
+//    a.Contains({"Hello": "World"}, "Hello")
 func (a *Assertions) Contains(s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	Contains(a.t, s, contains, msgAndArgs...)
 }
 
+// Containsf asserts that the specified string, list(array, slice...) or map contains the
+// specified substring or element.
+//
+//    a.Containsf("Hello World", "World", "error message %s", "formatted")
+//    a.Containsf(["Hello", "World"], "World", "error message %s", "formatted")
+//    a.Containsf({"Hello": "World"}, "Hello", "error message %s", "formatted")
+func (a *Assertions) Containsf(s interface{}, contains interface{}, msg string, args ...interface{}) {
+	Containsf(a.t, s, contains, msg, args...)
+}
+
+// DirExists checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func (a *Assertions) DirExists(path string, msgAndArgs ...interface{}) {
+	DirExists(a.t, path, msgAndArgs...)
+}
+
+// DirExistsf checks whether a directory exists in the given path. It also fails if the path is a file rather a directory or there is an error checking whether it exists.
+func (a *Assertions) DirExistsf(path string, msg string, args ...interface{}) {
+	DirExistsf(a.t, path, msg, args...)
+}
+
+// ElementsMatch asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// a.ElementsMatch([1, 3, 2, 3], [1, 3, 3, 2])
+func (a *Assertions) ElementsMatch(listA interface{}, listB interface{}, msgAndArgs ...interface{}) {
+	ElementsMatch(a.t, listA, listB, msgAndArgs...)
+}
+
+// ElementsMatchf asserts that the specified listA(array, slice...) is equal to specified
+// listB(array, slice...) ignoring the order of the elements. If there are duplicate elements,
+// the number of appearances of each of them in both lists should match.
+//
+// a.ElementsMatchf([1, 3, 2, 3], [1, 3, 3, 2], "error message %s", "formatted")
+func (a *Assertions) ElementsMatchf(listA interface{}, listB interface{}, msg string, args ...interface{}) {
+	ElementsMatchf(a.t, listA, listB, msg, args...)
+}
 
 // Empty asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  a.Empty(obj)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Empty(object interface{}, msgAndArgs ...interface{}) {
 	Empty(a.t, object, msgAndArgs...)
 }
 
+// Emptyf asserts that the specified object is empty.  I.e. nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  a.Emptyf(obj, "error message %s", "formatted")
+func (a *Assertions) Emptyf(object interface{}, msg string, args ...interface{}) {
+	Emptyf(a.t, object, msg, args...)
+}
 
 // Equal asserts that two objects are equal.
-// 
-//    a.Equal(123, 123, "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Equal(123, 123)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
 func (a *Assertions) Equal(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	Equal(a.t, expected, actual, msgAndArgs...)
 }
 
-
 // EqualError asserts that a function returned an error (i.e. not `nil`)
 // and that it is equal to the provided error.
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if assert.Error(t, err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
-//   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//   a.EqualError(err,  expectedErrorString)
 func (a *Assertions) EqualError(theError error, errString string, msgAndArgs ...interface{}) {
 	EqualError(a.t, theError, errString, msgAndArgs...)
 }
 
+// EqualErrorf asserts that a function returned an error (i.e. not `nil`)
+// and that it is equal to the provided error.
+//
+//   actualObj, err := SomeFunction()
+//   a.EqualErrorf(err,  expectedErrorString, "error message %s", "formatted")
+func (a *Assertions) EqualErrorf(theError error, errString string, msg string, args ...interface{}) {
+	EqualErrorf(a.t, theError, errString, msg, args...)
+}
 
 // EqualValues asserts that two objects are equal or convertable to the same types
 // and equal.
-// 
-//    a.EqualValues(uint32(123), int32(123), "123 and 123 should be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.EqualValues(uint32(123), int32(123))
 func (a *Assertions) EqualValues(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	EqualValues(a.t, expected, actual, msgAndArgs...)
 }
 
+// EqualValuesf asserts that two objects are equal or convertable to the same types
+// and equal.
+//
+//    a.EqualValuesf(uint32(123, "error message %s", "formatted"), int32(123))
+func (a *Assertions) EqualValuesf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	EqualValuesf(a.t, expected, actual, msg, args...)
+}
+
+// Equalf asserts that two objects are equal.
+//
+//    a.Equalf(123, 123, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses). Function equality
+// cannot be determined and will always fail.
+func (a *Assertions) Equalf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	Equalf(a.t, expected, actual, msg, args...)
+}
 
 // Error asserts that a function returned an error (i.e. not `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
-//   if a.Error(err, "An error was expected") {
-// 	   assert.Equal(t, err, expectedError)
+//   if a.Error(err) {
+// 	   assert.Equal(t, expectedError, err)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Error(err error, msgAndArgs ...interface{}) {
 	Error(a.t, err, msgAndArgs...)
 }
 
+// Errorf asserts that a function returned an error (i.e. not `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if a.Errorf(err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedErrorf, err)
+//   }
+func (a *Assertions) Errorf(err error, msg string, args ...interface{}) {
+	Errorf(a.t, err, msg, args...)
+}
 
-// Exactly asserts that two objects are equal is value and type.
-// 
-//    a.Exactly(int32(123), int64(123), "123 and 123 should NOT be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+// Exactly asserts that two objects are equal in value and type.
+//
+//    a.Exactly(int32(123), int64(123))
 func (a *Assertions) Exactly(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	Exactly(a.t, expected, actual, msgAndArgs...)
 }
 
+// Exactlyf asserts that two objects are equal in value and type.
+//
+//    a.Exactlyf(int32(123, "error message %s", "formatted"), int64(123))
+func (a *Assertions) Exactlyf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	Exactlyf(a.t, expected, actual, msg, args...)
+}
 
 // Fail reports a failure through
 func (a *Assertions) Fail(failureMessage string, msgAndArgs ...interface{}) {
 	Fail(a.t, failureMessage, msgAndArgs...)
 }
 
-
 // FailNow fails test
 func (a *Assertions) FailNow(failureMessage string, msgAndArgs ...interface{}) {
 	FailNow(a.t, failureMessage, msgAndArgs...)
 }
 
+// FailNowf fails test
+func (a *Assertions) FailNowf(failureMessage string, msg string, args ...interface{}) {
+	FailNowf(a.t, failureMessage, msg, args...)
+}
+
+// Failf reports a failure through
+func (a *Assertions) Failf(failureMessage string, msg string, args ...interface{}) {
+	Failf(a.t, failureMessage, msg, args...)
+}
 
 // False asserts that the specified value is false.
-// 
-//    a.False(myBool, "myBool should be false")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.False(myBool)
 func (a *Assertions) False(value bool, msgAndArgs ...interface{}) {
 	False(a.t, value, msgAndArgs...)
 }
 
+// Falsef asserts that the specified value is false.
+//
+//    a.Falsef(myBool, "error message %s", "formatted")
+func (a *Assertions) Falsef(value bool, msg string, args ...interface{}) {
+	Falsef(a.t, value, msg, args...)
+}
+
+// FileExists checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func (a *Assertions) FileExists(path string, msgAndArgs ...interface{}) {
+	FileExists(a.t, path, msgAndArgs...)
+}
+
+// FileExistsf checks whether a file exists in the given path. It also fails if the path points to a directory or there is an error when trying to check the file.
+func (a *Assertions) FileExistsf(path string, msg string, args ...interface{}) {
+	FileExistsf(a.t, path, msg, args...)
+}
 
 // HTTPBodyContains asserts that a specified handler returns a
 // body that contains a string.
-// 
+//
 //  a.HTTPBodyContains(myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) {
-	HTTPBodyContains(a.t, handler, method, url, values, str)
+func (a *Assertions) HTTPBodyContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
+	HTTPBodyContains(a.t, handler, method, url, values, str, msgAndArgs...)
 }
 
+// HTTPBodyContainsf asserts that a specified handler returns a
+// body that contains a string.
+//
+//  a.HTTPBodyContainsf(myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPBodyContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
+	HTTPBodyContainsf(a.t, handler, method, url, values, str, msg, args...)
+}
 
 // HTTPBodyNotContains asserts that a specified handler returns a
 // body that does not contain a string.
-// 
+//
 //  a.HTTPBodyNotContains(myHandler, "www.google.com", nil, "I'm Feeling Lucky")
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}) {
-	HTTPBodyNotContains(a.t, handler, method, url, values, str)
+func (a *Assertions) HTTPBodyNotContains(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msgAndArgs ...interface{}) {
+	HTTPBodyNotContains(a.t, handler, method, url, values, str, msgAndArgs...)
 }
 
+// HTTPBodyNotContainsf asserts that a specified handler returns a
+// body that does not contain a string.
+//
+//  a.HTTPBodyNotContainsf(myHandler, "www.google.com", nil, "I'm Feeling Lucky", "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPBodyNotContainsf(handler http.HandlerFunc, method string, url string, values url.Values, str interface{}, msg string, args ...interface{}) {
+	HTTPBodyNotContainsf(a.t, handler, method, url, values, str, msg, args...)
+}
 
 // HTTPError asserts that a specified handler returns an error status code.
-// 
+//
 //  a.HTTPError(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values) {
-	HTTPError(a.t, handler, method, url, values)
+func (a *Assertions) HTTPError(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	HTTPError(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPErrorf asserts that a specified handler returns an error status code.
+//
+//  a.HTTPErrorf(myHandler, "POST", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func (a *Assertions) HTTPErrorf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	HTTPErrorf(a.t, handler, method, url, values, msg, args...)
+}
 
 // HTTPRedirect asserts that a specified handler returns a redirect status code.
-// 
+//
 //  a.HTTPRedirect(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values) {
-	HTTPRedirect(a.t, handler, method, url, values)
+func (a *Assertions) HTTPRedirect(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	HTTPRedirect(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPRedirectf asserts that a specified handler returns a redirect status code.
+//
+//  a.HTTPRedirectf(myHandler, "GET", "/a/b/c", url.Values{"a": []string{"b", "c"}}
+//
+// Returns whether the assertion was successful (true, "error message %s", "formatted") or not (false).
+func (a *Assertions) HTTPRedirectf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	HTTPRedirectf(a.t, handler, method, url, values, msg, args...)
+}
 
 // HTTPSuccess asserts that a specified handler returns a success status code.
-// 
+//
 //  a.HTTPSuccess(myHandler, "POST", "http://www.google.com", nil)
-// 
+//
 // Returns whether the assertion was successful (true) or not (false).
-func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values) {
-	HTTPSuccess(a.t, handler, method, url, values)
+func (a *Assertions) HTTPSuccess(handler http.HandlerFunc, method string, url string, values url.Values, msgAndArgs ...interface{}) {
+	HTTPSuccess(a.t, handler, method, url, values, msgAndArgs...)
 }
 
+// HTTPSuccessf asserts that a specified handler returns a success status code.
+//
+//  a.HTTPSuccessf(myHandler, "POST", "http://www.google.com", nil, "error message %s", "formatted")
+//
+// Returns whether the assertion was successful (true) or not (false).
+func (a *Assertions) HTTPSuccessf(handler http.HandlerFunc, method string, url string, values url.Values, msg string, args ...interface{}) {
+	HTTPSuccessf(a.t, handler, method, url, values, msg, args...)
+}
 
 // Implements asserts that an object is implemented by the specified interface.
-// 
-//    a.Implements((*MyInterface)(nil), new(MyObject), "MyObject")
+//
+//    a.Implements((*MyInterface)(nil), new(MyObject))
 func (a *Assertions) Implements(interfaceObject interface{}, object interface{}, msgAndArgs ...interface{}) {
 	Implements(a.t, interfaceObject, object, msgAndArgs...)
 }
 
+// Implementsf asserts that an object is implemented by the specified interface.
+//
+//    a.Implementsf((*MyInterface, "error message %s", "formatted")(nil), new(MyObject))
+func (a *Assertions) Implementsf(interfaceObject interface{}, object interface{}, msg string, args ...interface{}) {
+	Implementsf(a.t, interfaceObject, object, msg, args...)
+}
 
 // InDelta asserts that the two numerals are within delta of each other.
-// 
+//
 // 	 a.InDelta(math.Pi, (22 / 7.0), 0.01)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) InDelta(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
 	InDelta(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// InDeltaMapValues is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func (a *Assertions) InDeltaMapValues(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
+	InDeltaMapValues(a.t, expected, actual, delta, msgAndArgs...)
+}
+
+// InDeltaMapValuesf is the same as InDelta, but it compares all values between two maps. Both maps must have exactly the same keys.
+func (a *Assertions) InDeltaMapValuesf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	InDeltaMapValuesf(a.t, expected, actual, delta, msg, args...)
+}
 
 // InDeltaSlice is the same as InDelta, except it compares two slices.
 func (a *Assertions) InDeltaSlice(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
 	InDeltaSlice(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// InDeltaSlicef is the same as InDelta, except it compares two slices.
+func (a *Assertions) InDeltaSlicef(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	InDeltaSlicef(a.t, expected, actual, delta, msg, args...)
+}
+
+// InDeltaf asserts that the two numerals are within delta of each other.
+//
+// 	 a.InDeltaf(math.Pi, (22 / 7.0, "error message %s", "formatted"), 0.01)
+func (a *Assertions) InDeltaf(expected interface{}, actual interface{}, delta float64, msg string, args ...interface{}) {
+	InDeltaf(a.t, expected, actual, delta, msg, args...)
+}
 
 // InEpsilon asserts that expected and actual have a relative error less than epsilon
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) InEpsilon(expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
 	InEpsilon(a.t, expected, actual, epsilon, msgAndArgs...)
 }
 
+// InEpsilonSlice is the same as InEpsilon, except it compares each value from two slices.
+func (a *Assertions) InEpsilonSlice(expected interface{}, actual interface{}, epsilon float64, msgAndArgs ...interface{}) {
+	InEpsilonSlice(a.t, expected, actual, epsilon, msgAndArgs...)
+}
 
-// InEpsilonSlice is the same as InEpsilon, except it compares two slices.
-func (a *Assertions) InEpsilonSlice(expected interface{}, actual interface{}, delta float64, msgAndArgs ...interface{}) {
-	InEpsilonSlice(a.t, expected, actual, delta, msgAndArgs...)
+// InEpsilonSlicef is the same as InEpsilon, except it compares each value from two slices.
+func (a *Assertions) InEpsilonSlicef(expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) {
+	InEpsilonSlicef(a.t, expected, actual, epsilon, msg, args...)
 }
 
+// InEpsilonf asserts that expected and actual have a relative error less than epsilon
+func (a *Assertions) InEpsilonf(expected interface{}, actual interface{}, epsilon float64, msg string, args ...interface{}) {
+	InEpsilonf(a.t, expected, actual, epsilon, msg, args...)
+}
 
 // IsType asserts that the specified objects are of the same type.
 func (a *Assertions) IsType(expectedType interface{}, object interface{}, msgAndArgs ...interface{}) {
 	IsType(a.t, expectedType, object, msgAndArgs...)
 }
 
+// IsTypef asserts that the specified objects are of the same type.
+func (a *Assertions) IsTypef(expectedType interface{}, object interface{}, msg string, args ...interface{}) {
+	IsTypef(a.t, expectedType, object, msg, args...)
+}
 
 // JSONEq asserts that two JSON strings are equivalent.
-// 
+//
 //  a.JSONEq(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) JSONEq(expected string, actual string, msgAndArgs ...interface{}) {
 	JSONEq(a.t, expected, actual, msgAndArgs...)
 }
 
+// JSONEqf asserts that two JSON strings are equivalent.
+//
+//  a.JSONEqf(`{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`, "error message %s", "formatted")
+func (a *Assertions) JSONEqf(expected string, actual string, msg string, args ...interface{}) {
+	JSONEqf(a.t, expected, actual, msg, args...)
+}
 
 // Len asserts that the specified object has specific length.
 // Len also fails if the object has a type that len() not accept.
-// 
-//    a.Len(mySlice, 3, "The size of slice is not 3")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Len(mySlice, 3)
 func (a *Assertions) Len(object interface{}, length int, msgAndArgs ...interface{}) {
 	Len(a.t, object, length, msgAndArgs...)
 }
 
+// Lenf asserts that the specified object has specific length.
+// Lenf also fails if the object has a type that len() not accept.
+//
+//    a.Lenf(mySlice, 3, "error message %s", "formatted")
+func (a *Assertions) Lenf(object interface{}, length int, msg string, args ...interface{}) {
+	Lenf(a.t, object, length, msg, args...)
+}
 
 // Nil asserts that the specified object is nil.
-// 
-//    a.Nil(err, "err should be nothing")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.Nil(err)
 func (a *Assertions) Nil(object interface{}, msgAndArgs ...interface{}) {
 	Nil(a.t, object, msgAndArgs...)
 }
 
+// Nilf asserts that the specified object is nil.
+//
+//    a.Nilf(err, "error message %s", "formatted")
+func (a *Assertions) Nilf(object interface{}, msg string, args ...interface{}) {
+	Nilf(a.t, object, msg, args...)
+}
 
 // NoError asserts that a function returned no error (i.e. `nil`).
-// 
+//
 //   actualObj, err := SomeFunction()
 //   if a.NoError(err) {
-// 	   assert.Equal(t, actualObj, expectedObj)
+// 	   assert.Equal(t, expectedObj, actualObj)
 //   }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NoError(err error, msgAndArgs ...interface{}) {
 	NoError(a.t, err, msgAndArgs...)
 }
 
+// NoErrorf asserts that a function returned no error (i.e. `nil`).
+//
+//   actualObj, err := SomeFunction()
+//   if a.NoErrorf(err, "error message %s", "formatted") {
+// 	   assert.Equal(t, expectedObj, actualObj)
+//   }
+func (a *Assertions) NoErrorf(err error, msg string, args ...interface{}) {
+	NoErrorf(a.t, err, msg, args...)
+}
 
 // NotContains asserts that the specified string, list(array, slice...) or map does NOT contain the
 // specified substring or element.
-// 
-//    a.NotContains("Hello World", "Earth", "But 'Hello World' does NOT contain 'Earth'")
-//    a.NotContains(["Hello", "World"], "Earth", "But ['Hello', 'World'] does NOT contain 'Earth'")
-//    a.NotContains({"Hello": "World"}, "Earth", "But {'Hello': 'World'} does NOT contain 'Earth'")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotContains("Hello World", "Earth")
+//    a.NotContains(["Hello", "World"], "Earth")
+//    a.NotContains({"Hello": "World"}, "Earth")
 func (a *Assertions) NotContains(s interface{}, contains interface{}, msgAndArgs ...interface{}) {
 	NotContains(a.t, s, contains, msgAndArgs...)
 }
 
+// NotContainsf asserts that the specified string, list(array, slice...) or map does NOT contain the
+// specified substring or element.
+//
+//    a.NotContainsf("Hello World", "Earth", "error message %s", "formatted")
+//    a.NotContainsf(["Hello", "World"], "Earth", "error message %s", "formatted")
+//    a.NotContainsf({"Hello": "World"}, "Earth", "error message %s", "formatted")
+func (a *Assertions) NotContainsf(s interface{}, contains interface{}, msg string, args ...interface{}) {
+	NotContainsf(a.t, s, contains, msg, args...)
+}
 
 // NotEmpty asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
 // a slice or a channel with len == 0.
-// 
+//
 //  if a.NotEmpty(obj) {
 //    assert.Equal(t, "two", obj[1])
 //  }
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NotEmpty(object interface{}, msgAndArgs ...interface{}) {
 	NotEmpty(a.t, object, msgAndArgs...)
 }
 
+// NotEmptyf asserts that the specified object is NOT empty.  I.e. not nil, "", false, 0 or either
+// a slice or a channel with len == 0.
+//
+//  if a.NotEmptyf(obj, "error message %s", "formatted") {
+//    assert.Equal(t, "two", obj[1])
+//  }
+func (a *Assertions) NotEmptyf(object interface{}, msg string, args ...interface{}) {
+	NotEmptyf(a.t, object, msg, args...)
+}
 
 // NotEqual asserts that the specified values are NOT equal.
-// 
-//    a.NotEqual(obj1, obj2, "two objects shouldn't be equal")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotEqual(obj1, obj2)
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
 func (a *Assertions) NotEqual(expected interface{}, actual interface{}, msgAndArgs ...interface{}) {
 	NotEqual(a.t, expected, actual, msgAndArgs...)
 }
 
+// NotEqualf asserts that the specified values are NOT equal.
+//
+//    a.NotEqualf(obj1, obj2, "error message %s", "formatted")
+//
+// Pointer variable equality is determined based on the equality of the
+// referenced values (as opposed to the memory addresses).
+func (a *Assertions) NotEqualf(expected interface{}, actual interface{}, msg string, args ...interface{}) {
+	NotEqualf(a.t, expected, actual, msg, args...)
+}
 
 // NotNil asserts that the specified object is not nil.
-// 
-//    a.NotNil(err, "err should be something")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.NotNil(err)
 func (a *Assertions) NotNil(object interface{}, msgAndArgs ...interface{}) {
 	NotNil(a.t, object, msgAndArgs...)
 }
 
+// NotNilf asserts that the specified object is not nil.
+//
+//    a.NotNilf(err, "error message %s", "formatted")
+func (a *Assertions) NotNilf(object interface{}, msg string, args ...interface{}) {
+	NotNilf(a.t, object, msg, args...)
+}
 
 // NotPanics asserts that the code inside the specified PanicTestFunc does NOT panic.
-// 
-//   a.NotPanics(func(){
-//     RemainCalm()
-//   }, "Calling RemainCalm() should NOT panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.NotPanics(func(){ RemainCalm() })
 func (a *Assertions) NotPanics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	NotPanics(a.t, f, msgAndArgs...)
 }
 
+// NotPanicsf asserts that the code inside the specified PanicTestFunc does NOT panic.
+//
+//   a.NotPanicsf(func(){ RemainCalm() }, "error message %s", "formatted")
+func (a *Assertions) NotPanicsf(f assert.PanicTestFunc, msg string, args ...interface{}) {
+	NotPanicsf(a.t, f, msg, args...)
+}
 
 // NotRegexp asserts that a specified regexp does not match a string.
-// 
+//
 //  a.NotRegexp(regexp.MustCompile("starts"), "it's starting")
 //  a.NotRegexp("^start", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) NotRegexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	NotRegexp(a.t, rx, str, msgAndArgs...)
 }
 
+// NotRegexpf asserts that a specified regexp does not match a string.
+//
+//  a.NotRegexpf(regexp.MustCompile("starts", "error message %s", "formatted"), "it's starting")
+//  a.NotRegexpf("^start", "it's not starting", "error message %s", "formatted")
+func (a *Assertions) NotRegexpf(rx interface{}, str interface{}, msg string, args ...interface{}) {
+	NotRegexpf(a.t, rx, str, msg, args...)
+}
+
+// NotSubset asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    a.NotSubset([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]")
+func (a *Assertions) NotSubset(list interface{}, subset interface{}, msgAndArgs ...interface{}) {
+	NotSubset(a.t, list, subset, msgAndArgs...)
+}
 
-// NotZero asserts that i is not the zero value for its type and returns the truth.
+// NotSubsetf asserts that the specified list(array, slice...) contains not all
+// elements given in the specified subset(array, slice...).
+//
+//    a.NotSubsetf([1, 3, 4], [1, 2], "But [1, 3, 4] does not contain [1, 2]", "error message %s", "formatted")
+func (a *Assertions) NotSubsetf(list interface{}, subset interface{}, msg string, args ...interface{}) {
+	NotSubsetf(a.t, list, subset, msg, args...)
+}
+
+// NotZero asserts that i is not the zero value for its type.
 func (a *Assertions) NotZero(i interface{}, msgAndArgs ...interface{}) {
 	NotZero(a.t, i, msgAndArgs...)
 }
 
+// NotZerof asserts that i is not the zero value for its type.
+func (a *Assertions) NotZerof(i interface{}, msg string, args ...interface{}) {
+	NotZerof(a.t, i, msg, args...)
+}
 
 // Panics asserts that the code inside the specified PanicTestFunc panics.
-// 
-//   a.Panics(func(){
-//     GoCrazy()
-//   }, "Calling GoCrazy() should panic")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.Panics(func(){ GoCrazy() })
 func (a *Assertions) Panics(f assert.PanicTestFunc, msgAndArgs ...interface{}) {
 	Panics(a.t, f, msgAndArgs...)
 }
 
+// PanicsWithValue asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   a.PanicsWithValue("crazy error", func(){ GoCrazy() })
+func (a *Assertions) PanicsWithValue(expected interface{}, f assert.PanicTestFunc, msgAndArgs ...interface{}) {
+	PanicsWithValue(a.t, expected, f, msgAndArgs...)
+}
+
+// PanicsWithValuef asserts that the code inside the specified PanicTestFunc panics, and that
+// the recovered panic value equals the expected panic value.
+//
+//   a.PanicsWithValuef("crazy error", func(){ GoCrazy() }, "error message %s", "formatted")
+func (a *Assertions) PanicsWithValuef(expected interface{}, f assert.PanicTestFunc, msg string, args ...interface{}) {
+	PanicsWithValuef(a.t, expected, f, msg, args...)
+}
+
+// Panicsf asserts that the code inside the specified PanicTestFunc panics.
+//
+//   a.Panicsf(func(){ GoCrazy() }, "error message %s", "formatted")
+func (a *Assertions) Panicsf(f assert.PanicTestFunc, msg string, args ...interface{}) {
+	Panicsf(a.t, f, msg, args...)
+}
 
 // Regexp asserts that a specified regexp matches a string.
-// 
+//
 //  a.Regexp(regexp.MustCompile("start"), "it's starting")
 //  a.Regexp("start...$", "it's not starting")
-// 
-// Returns whether the assertion was successful (true) or not (false).
 func (a *Assertions) Regexp(rx interface{}, str interface{}, msgAndArgs ...interface{}) {
 	Regexp(a.t, rx, str, msgAndArgs...)
 }
 
+// Regexpf asserts that a specified regexp matches a string.
+//
+//  a.Regexpf(regexp.MustCompile("start", "error message %s", "formatted"), "it's starting")
+//  a.Regexpf("start...$", "it's not starting", "error message %s", "formatted")
+func (a *Assertions) Regexpf(rx interface{}, str interface{}, msg string, args ...interface{}) {
+	Regexpf(a.t, rx, str, msg, args...)
+}
+
+// Subset asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    a.Subset([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]")
+func (a *Assertions) Subset(list interface{}, subset interface{}, msgAndArgs ...interface{}) {
+	Subset(a.t, list, subset, msgAndArgs...)
+}
+
+// Subsetf asserts that the specified list(array, slice...) contains all
+// elements given in the specified subset(array, slice...).
+//
+//    a.Subsetf([1, 2, 3], [1, 2], "But [1, 2, 3] does contain [1, 2]", "error message %s", "formatted")
+func (a *Assertions) Subsetf(list interface{}, subset interface{}, msg string, args ...interface{}) {
+	Subsetf(a.t, list, subset, msg, args...)
+}
 
 // True asserts that the specified value is true.
-// 
-//    a.True(myBool, "myBool should be true")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//    a.True(myBool)
 func (a *Assertions) True(value bool, msgAndArgs ...interface{}) {
 	True(a.t, value, msgAndArgs...)
 }
 
+// Truef asserts that the specified value is true.
+//
+//    a.Truef(myBool, "error message %s", "formatted")
+func (a *Assertions) Truef(value bool, msg string, args ...interface{}) {
+	Truef(a.t, value, msg, args...)
+}
 
 // WithinDuration asserts that the two times are within duration delta of each other.
-// 
-//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second, "The difference should not be more than 10s")
-// 
-// Returns whether the assertion was successful (true) or not (false).
+//
+//   a.WithinDuration(time.Now(), time.Now(), 10*time.Second)
 func (a *Assertions) WithinDuration(expected time.Time, actual time.Time, delta time.Duration, msgAndArgs ...interface{}) {
 	WithinDuration(a.t, expected, actual, delta, msgAndArgs...)
 }
 
+// WithinDurationf asserts that the two times are within duration delta of each other.
+//
+//   a.WithinDurationf(time.Now(), time.Now(), 10*time.Second, "error message %s", "formatted")
+func (a *Assertions) WithinDurationf(expected time.Time, actual time.Time, delta time.Duration, msg string, args ...interface{}) {
+	WithinDurationf(a.t, expected, actual, delta, msg, args...)
+}
 
-// Zero asserts that i is the zero value for its type and returns the truth.
+// Zero asserts that i is the zero value for its type.
 func (a *Assertions) Zero(i interface{}, msgAndArgs ...interface{}) {
 	Zero(a.t, i, msgAndArgs...)
 }
+
+// Zerof asserts that i is the zero value for its type.
+func (a *Assertions) Zerof(i interface{}, msg string, args ...interface{}) {
+	Zerof(a.t, i, msg, args...)
+}
diff --git a/installer/vendor/github.com/stretchr/testify/require/require_forward.go.tmpl b/installer/vendor/github.com/stretchr/testify/require/require_forward.go.tmpl
deleted file mode 100644
index b93569e0a9..0000000000
--- a/installer/vendor/github.com/stretchr/testify/require/require_forward.go.tmpl
+++ /dev/null
@@ -1,4 +0,0 @@
-{{.CommentWithoutT "a"}}
-func (a *Assertions) {{.DocInfo.Name}}({{.Params}}) {
-	{{.DocInfo.Name}}(a.t, {{.ForwardedParams}})
-}
diff --git a/installer/vendor/github.com/stretchr/testify/require/requirements.go b/installer/vendor/github.com/stretchr/testify/require/requirements.go
index 41147562d8..e404f016d1 100644
--- a/installer/vendor/github.com/stretchr/testify/require/requirements.go
+++ b/installer/vendor/github.com/stretchr/testify/require/requirements.go
@@ -6,4 +6,4 @@ type TestingT interface {
 	FailNow()
 }
 
-//go:generate go run ../_codegen/main.go -output-package=require -template=require.go.tmpl
+//go:generate go run ../_codegen/main.go -output-package=require -template=require.go.tmpl -include-format-funcs
diff --git a/installer/vendor/github.com/stretchr/testify/require/requirements_test.go b/installer/vendor/github.com/stretchr/testify/require/requirements_test.go
deleted file mode 100644
index d2ccc99c9a..0000000000
--- a/installer/vendor/github.com/stretchr/testify/require/requirements_test.go
+++ /dev/null
@@ -1,369 +0,0 @@
-package require
-
-import (
-	"errors"
-	"testing"
-	"time"
-)
-
-// AssertionTesterInterface defines an interface to be used for testing assertion methods
-type AssertionTesterInterface interface {
-	TestMethod()
-}
-
-// AssertionTesterConformingObject is an object that conforms to the AssertionTesterInterface interface
-type AssertionTesterConformingObject struct {
-}
-
-func (a *AssertionTesterConformingObject) TestMethod() {
-}
-
-// AssertionTesterNonConformingObject is an object that does not conform to the AssertionTesterInterface interface
-type AssertionTesterNonConformingObject struct {
-}
-
-type MockT struct {
-	Failed bool
-}
-
-func (t *MockT) FailNow() {
-	t.Failed = true
-}
-
-func (t *MockT) Errorf(format string, args ...interface{}) {
-	_, _ = format, args
-}
-
-func TestImplements(t *testing.T) {
-
-	Implements(t, (*AssertionTesterInterface)(nil), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	Implements(mockT, (*AssertionTesterInterface)(nil), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestIsType(t *testing.T) {
-
-	IsType(t, new(AssertionTesterConformingObject), new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	IsType(mockT, new(AssertionTesterConformingObject), new(AssertionTesterNonConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqual(t *testing.T) {
-
-	Equal(t, 1, 1)
-
-	mockT := new(MockT)
-	Equal(mockT, 1, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-
-}
-
-func TestNotEqual(t *testing.T) {
-
-	NotEqual(t, 1, 2)
-	mockT := new(MockT)
-	NotEqual(mockT, 2, 2)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestExactly(t *testing.T) {
-
-	a := float32(1)
-	b := float32(1)
-	c := float64(1)
-
-	Exactly(t, a, b)
-
-	mockT := new(MockT)
-	Exactly(mockT, a, c)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotNil(t *testing.T) {
-
-	NotNil(t, new(AssertionTesterConformingObject))
-
-	mockT := new(MockT)
-	NotNil(mockT, nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNil(t *testing.T) {
-
-	Nil(t, nil)
-
-	mockT := new(MockT)
-	Nil(mockT, new(AssertionTesterConformingObject))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestTrue(t *testing.T) {
-
-	True(t, true)
-
-	mockT := new(MockT)
-	True(mockT, false)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestFalse(t *testing.T) {
-
-	False(t, false)
-
-	mockT := new(MockT)
-	False(mockT, true)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestContains(t *testing.T) {
-
-	Contains(t, "Hello World", "Hello")
-
-	mockT := new(MockT)
-	Contains(mockT, "Hello World", "Salut")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotContains(t *testing.T) {
-
-	NotContains(t, "Hello World", "Hello!")
-
-	mockT := new(MockT)
-	NotContains(mockT, "Hello World", "Hello")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestPanics(t *testing.T) {
-
-	Panics(t, func() {
-		panic("Panic!")
-	})
-
-	mockT := new(MockT)
-	Panics(mockT, func() {})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotPanics(t *testing.T) {
-
-	NotPanics(t, func() {})
-
-	mockT := new(MockT)
-	NotPanics(mockT, func() {
-		panic("Panic!")
-	})
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNoError(t *testing.T) {
-
-	NoError(t, nil)
-
-	mockT := new(MockT)
-	NoError(mockT, errors.New("some error"))
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestError(t *testing.T) {
-
-	Error(t, errors.New("some error"))
-
-	mockT := new(MockT)
-	Error(mockT, nil)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEqualError(t *testing.T) {
-
-	EqualError(t, errors.New("some error"), "some error")
-
-	mockT := new(MockT)
-	EqualError(mockT, errors.New("some error"), "Not some error")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestEmpty(t *testing.T) {
-
-	Empty(t, "")
-
-	mockT := new(MockT)
-	Empty(mockT, "x")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotEmpty(t *testing.T) {
-
-	NotEmpty(t, "x")
-
-	mockT := new(MockT)
-	NotEmpty(mockT, "")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestWithinDuration(t *testing.T) {
-
-	a := time.Now()
-	b := a.Add(10 * time.Second)
-
-	WithinDuration(t, a, b, 15*time.Second)
-
-	mockT := new(MockT)
-	WithinDuration(mockT, a, b, 5*time.Second)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestInDelta(t *testing.T) {
-
-	InDelta(t, 1.001, 1, 0.01)
-
-	mockT := new(MockT)
-	InDelta(mockT, 1, 2, 0.5)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestZero(t *testing.T) {
-
-	Zero(t, "")
-
-	mockT := new(MockT)
-	Zero(mockT, "x")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestNotZero(t *testing.T) {
-
-	NotZero(t, "x")
-
-	mockT := new(MockT)
-	NotZero(mockT, "")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_EqualSONString(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `{"hello": "world", "foo": "bar"}`, `{"hello": "world", "foo": "bar"}`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEq_EquivalentButNotEqual(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `{"hello": "world", "foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEq_HashOfArraysAndHashes(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, "{\r\n\t\"numeric\": 1.5,\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]],\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\"\r\n}",
-		"{\r\n\t\"numeric\": 1.5,\r\n\t\"hash\": {\"nested\": \"hash\", \"nested_slice\": [\"this\", \"is\", \"nested\"]},\r\n\t\"string\": \"foo\",\r\n\t\"array\": [{\"foo\": \"bar\"}, 1, \"string\", [\"nested\", \"array\", 5.5]]\r\n}")
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEq_Array(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `["foo", {"nested": "hash", "hello": "world"}]`)
-	if mockT.Failed {
-		t.Error("Check should pass")
-	}
-}
-
-func TestJSONEq_HashAndArrayNotEquivalent(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `{"foo": "bar", {"nested": "hash", "hello": "world"}}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_HashesNotEquivalent(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `{"foo": "bar"}`, `{"foo": "bar", "hello": "world"}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_ActualIsNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `{"foo": "bar"}`, "Not JSON")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_ExpectedIsNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, "Not JSON", `{"foo": "bar", "hello": "world"}`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_ExpectedAndActualNotJSON(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, "Not JSON", "Not JSON")
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
-
-func TestJSONEq_ArraysOfDifferentOrder(t *testing.T) {
-	mockT := new(MockT)
-	JSONEq(mockT, `["foo", {"hello": "world", "nested": "hash"}]`, `[{ "hello": "world", "nested": "hash"}, "foo"]`)
-	if !mockT.Failed {
-		t.Error("Check should fail")
-	}
-}
diff --git a/installer/vendor/github.com/stretchr/testify/suite/doc.go b/installer/vendor/github.com/stretchr/testify/suite/doc.go
deleted file mode 100644
index f91a245d3f..0000000000
--- a/installer/vendor/github.com/stretchr/testify/suite/doc.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Package suite contains logic for creating testing suite structs
-// and running the methods on those structs as tests.  The most useful
-// piece of this package is that you can create setup/teardown methods
-// on your testing suites, which will run before/after the whole suite
-// or individual tests (depending on which interface(s) you
-// implement).
-//
-// A testing suite is usually built by first extending the built-in
-// suite functionality from suite.Suite in testify.  Alternatively,
-// you could reproduce that logic on your own if you wanted (you
-// just need to implement the TestingSuite interface from
-// suite/interfaces.go).
-//
-// After that, you can implement any of the interfaces in
-// suite/interfaces.go to add setup/teardown functionality to your
-// suite, and add any methods that start with "Test" to add tests.
-// Methods that do not match any suite interfaces and do not begin
-// with "Test" will not be run by testify, and can safely be used as
-// helper methods.
-//
-// Once you've built your testing suite, you need to run the suite
-// (using suite.Run from testify) inside any function that matches the
-// identity that "go test" is already looking for (i.e.
-// func(*testing.T)).
-//
-// Regular expression to select test suites specified command-line
-// argument "-run". Regular expression to select the methods
-// of test suites specified command-line argument "-m".
-// Suite object has assertion methods.
-//
-// A crude example:
-//     // Basic imports
-//     import (
-//         "testing"
-//         "github.com/stretchr/testify/assert"
-//         "github.com/stretchr/testify/suite"
-//     )
-//
-//     // Define the suite, and absorb the built-in basic suite
-//     // functionality from testify - including a T() method which
-//     // returns the current testing context
-//     type ExampleTestSuite struct {
-//         suite.Suite
-//         VariableThatShouldStartAtFive int
-//     }
-//
-//     // Make sure that VariableThatShouldStartAtFive is set to five
-//     // before each test
-//     func (suite *ExampleTestSuite) SetupTest() {
-//         suite.VariableThatShouldStartAtFive = 5
-//     }
-//
-//     // All methods that begin with "Test" are run as tests within a
-//     // suite.
-//     func (suite *ExampleTestSuite) TestExample() {
-//         assert.Equal(suite.T(), 5, suite.VariableThatShouldStartAtFive)
-//         suite.Equal(5, suite.VariableThatShouldStartAtFive)
-//     }
-//
-//     // In order for 'go test' to run this suite, we need to create
-//     // a normal test function and pass our suite to suite.Run
-//     func TestExampleTestSuite(t *testing.T) {
-//         suite.Run(t, new(ExampleTestSuite))
-//     }
-package suite
diff --git a/installer/vendor/github.com/stretchr/testify/suite/interfaces.go b/installer/vendor/github.com/stretchr/testify/suite/interfaces.go
deleted file mode 100644
index 20969472c7..0000000000
--- a/installer/vendor/github.com/stretchr/testify/suite/interfaces.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package suite
-
-import "testing"
-
-// TestingSuite can store and return the current *testing.T context
-// generated by 'go test'.
-type TestingSuite interface {
-	T() *testing.T
-	SetT(*testing.T)
-}
-
-// SetupAllSuite has a SetupSuite method, which will run before the
-// tests in the suite are run.
-type SetupAllSuite interface {
-	SetupSuite()
-}
-
-// SetupTestSuite has a SetupTest method, which will run before each
-// test in the suite.
-type SetupTestSuite interface {
-	SetupTest()
-}
-
-// TearDownAllSuite has a TearDownSuite method, which will run after
-// all the tests in the suite have been run.
-type TearDownAllSuite interface {
-	TearDownSuite()
-}
-
-// TearDownTestSuite has a TearDownTest method, which will run after
-// each test in the suite.
-type TearDownTestSuite interface {
-	TearDownTest()
-}
diff --git a/installer/vendor/github.com/stretchr/testify/suite/suite.go b/installer/vendor/github.com/stretchr/testify/suite/suite.go
deleted file mode 100644
index db74130009..0000000000
--- a/installer/vendor/github.com/stretchr/testify/suite/suite.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package suite
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"reflect"
-	"regexp"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-var matchMethod = flag.String("testify.m", "", "regular expression to select tests of the testify suite to run")
-
-// Suite is a basic testing suite with methods for storing and
-// retrieving the current *testing.T context.
-type Suite struct {
-	*assert.Assertions
-	require *require.Assertions
-	t       *testing.T
-}
-
-// T retrieves the current *testing.T context.
-func (suite *Suite) T() *testing.T {
-	return suite.t
-}
-
-// SetT sets the current *testing.T context.
-func (suite *Suite) SetT(t *testing.T) {
-	suite.t = t
-	suite.Assertions = assert.New(t)
-	suite.require = require.New(t)
-}
-
-// Require returns a require context for suite.
-func (suite *Suite) Require() *require.Assertions {
-	if suite.require == nil {
-		suite.require = require.New(suite.T())
-	}
-	return suite.require
-}
-
-// Assert returns an assert context for suite.  Normally, you can call
-// `suite.NoError(expected, actual)`, but for situations where the embedded
-// methods are overridden (for example, you might want to override
-// assert.Assertions with require.Assertions), this method is provided so you
-// can call `suite.Assert().NoError()`.
-func (suite *Suite) Assert() *assert.Assertions {
-	if suite.Assertions == nil {
-		suite.Assertions = assert.New(suite.T())
-	}
-	return suite.Assertions
-}
-
-// Run takes a testing suite and runs all of the tests attached
-// to it.
-func Run(t *testing.T, suite TestingSuite) {
-	suite.SetT(t)
-
-	if setupAllSuite, ok := suite.(SetupAllSuite); ok {
-		setupAllSuite.SetupSuite()
-	}
-	defer func() {
-		if tearDownAllSuite, ok := suite.(TearDownAllSuite); ok {
-			tearDownAllSuite.TearDownSuite()
-		}
-	}()
-
-	methodFinder := reflect.TypeOf(suite)
-	tests := []testing.InternalTest{}
-	for index := 0; index < methodFinder.NumMethod(); index++ {
-		method := methodFinder.Method(index)
-		ok, err := methodFilter(method.Name)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "testify: invalid regexp for -m: %s\n", err)
-			os.Exit(1)
-		}
-		if ok {
-			test := testing.InternalTest{
-				Name: method.Name,
-				F: func(t *testing.T) {
-					parentT := suite.T()
-					suite.SetT(t)
-					if setupTestSuite, ok := suite.(SetupTestSuite); ok {
-						setupTestSuite.SetupTest()
-					}
-					defer func() {
-						if tearDownTestSuite, ok := suite.(TearDownTestSuite); ok {
-							tearDownTestSuite.TearDownTest()
-						}
-						suite.SetT(parentT)
-					}()
-					method.Func.Call([]reflect.Value{reflect.ValueOf(suite)})
-				},
-			}
-			tests = append(tests, test)
-		}
-	}
-
-	if !testing.RunTests(func(_, _ string) (bool, error) { return true, nil },
-		tests) {
-		t.Fail()
-	}
-}
-
-// Filtering method according to set regular expression
-// specified command-line argument -m
-func methodFilter(name string) (bool, error) {
-	if ok, _ := regexp.MatchString("^Test", name); !ok {
-		return false, nil
-	}
-	return regexp.MatchString(*matchMethod, name)
-}
diff --git a/installer/vendor/github.com/stretchr/testify/suite/suite_test.go b/installer/vendor/github.com/stretchr/testify/suite/suite_test.go
deleted file mode 100644
index c7c4e88f7a..0000000000
--- a/installer/vendor/github.com/stretchr/testify/suite/suite_test.go
+++ /dev/null
@@ -1,239 +0,0 @@
-package suite
-
-import (
-	"errors"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// SuiteRequireTwice is intended to test the usage of suite.Require in two
-// different tests
-type SuiteRequireTwice struct{ Suite }
-
-// TestSuiteRequireTwice checks for regressions of issue #149 where
-// suite.requirements was not initialised in suite.SetT()
-// A regression would result on these tests panicking rather than failing.
-func TestSuiteRequireTwice(t *testing.T) {
-	ok := testing.RunTests(
-		func(_, _ string) (bool, error) { return true, nil },
-		[]testing.InternalTest{{
-			Name: "TestSuiteRequireTwice",
-			F: func(t *testing.T) {
-				suite := new(SuiteRequireTwice)
-				Run(t, suite)
-			},
-		}},
-	)
-	assert.Equal(t, false, ok)
-}
-
-func (s *SuiteRequireTwice) TestRequireOne() {
-	r := s.Require()
-	r.Equal(1, 2)
-}
-
-func (s *SuiteRequireTwice) TestRequireTwo() {
-	r := s.Require()
-	r.Equal(1, 2)
-}
-
-// This suite is intended to store values to make sure that only
-// testing-suite-related methods are run.  It's also a fully
-// functional example of a testing suite, using setup/teardown methods
-// and a helper method that is ignored by testify.  To make this look
-// more like a real world example, all tests in the suite perform some
-// type of assertion.
-type SuiteTester struct {
-	// Include our basic suite logic.
-	Suite
-
-	// Keep counts of how many times each method is run.
-	SetupSuiteRunCount    int
-	TearDownSuiteRunCount int
-	SetupTestRunCount     int
-	TearDownTestRunCount  int
-	TestOneRunCount       int
-	TestTwoRunCount       int
-	NonTestMethodRunCount int
-}
-
-type SuiteSkipTester struct {
-	// Include our basic suite logic.
-	Suite
-
-	// Keep counts of how many times each method is run.
-	SetupSuiteRunCount    int
-	TearDownSuiteRunCount int
-}
-
-// The SetupSuite method will be run by testify once, at the very
-// start of the testing suite, before any tests are run.
-func (suite *SuiteTester) SetupSuite() {
-	suite.SetupSuiteRunCount++
-}
-
-func (suite *SuiteSkipTester) SetupSuite() {
-	suite.SetupSuiteRunCount++
-	suite.T().Skip()
-}
-
-// The TearDownSuite method will be run by testify once, at the very
-// end of the testing suite, after all tests have been run.
-func (suite *SuiteTester) TearDownSuite() {
-	suite.TearDownSuiteRunCount++
-}
-
-func (suite *SuiteSkipTester) TearDownSuite() {
-	suite.TearDownSuiteRunCount++
-}
-
-// The SetupTest method will be run before every test in the suite.
-func (suite *SuiteTester) SetupTest() {
-	suite.SetupTestRunCount++
-}
-
-// The TearDownTest method will be run after every test in the suite.
-func (suite *SuiteTester) TearDownTest() {
-	suite.TearDownTestRunCount++
-}
-
-// Every method in a testing suite that begins with "Test" will be run
-// as a test.  TestOne is an example of a test.  For the purposes of
-// this example, we've included assertions in the tests, since most
-// tests will issue assertions.
-func (suite *SuiteTester) TestOne() {
-	beforeCount := suite.TestOneRunCount
-	suite.TestOneRunCount++
-	assert.Equal(suite.T(), suite.TestOneRunCount, beforeCount+1)
-	suite.Equal(suite.TestOneRunCount, beforeCount+1)
-}
-
-// TestTwo is another example of a test.
-func (suite *SuiteTester) TestTwo() {
-	beforeCount := suite.TestTwoRunCount
-	suite.TestTwoRunCount++
-	assert.NotEqual(suite.T(), suite.TestTwoRunCount, beforeCount)
-	suite.NotEqual(suite.TestTwoRunCount, beforeCount)
-}
-
-func (suite *SuiteTester) TestSkip() {
-	suite.T().Skip()
-}
-
-// NonTestMethod does not begin with "Test", so it will not be run by
-// testify as a test in the suite.  This is useful for creating helper
-// methods for your tests.
-func (suite *SuiteTester) NonTestMethod() {
-	suite.NonTestMethodRunCount++
-}
-
-// TestRunSuite will be run by the 'go test' command, so within it, we
-// can run our suite using the Run(*testing.T, TestingSuite) function.
-func TestRunSuite(t *testing.T) {
-	suiteTester := new(SuiteTester)
-	Run(t, suiteTester)
-
-	// Normally, the test would end here.  The following are simply
-	// some assertions to ensure that the Run function is working as
-	// intended - they are not part of the example.
-
-	// The suite was only run once, so the SetupSuite and TearDownSuite
-	// methods should have each been run only once.
-	assert.Equal(t, suiteTester.SetupSuiteRunCount, 1)
-	assert.Equal(t, suiteTester.TearDownSuiteRunCount, 1)
-
-	// There are three test methods (TestOne, TestTwo, and TestSkip), so
-	// the SetupTest and TearDownTest methods (which should be run once for
-	// each test) should have been run three times.
-	assert.Equal(t, suiteTester.SetupTestRunCount, 3)
-	assert.Equal(t, suiteTester.TearDownTestRunCount, 3)
-
-	// Each test should have been run once.
-	assert.Equal(t, suiteTester.TestOneRunCount, 1)
-	assert.Equal(t, suiteTester.TestTwoRunCount, 1)
-
-	// Methods that don't match the test method identifier shouldn't
-	// have been run at all.
-	assert.Equal(t, suiteTester.NonTestMethodRunCount, 0)
-
-	suiteSkipTester := new(SuiteSkipTester)
-	Run(t, suiteSkipTester)
-
-	// The suite was only run once, so the SetupSuite and TearDownSuite
-	// methods should have each been run only once, even though SetupSuite
-	// called Skip()
-	assert.Equal(t, suiteSkipTester.SetupSuiteRunCount, 1)
-	assert.Equal(t, suiteSkipTester.TearDownSuiteRunCount, 1)
-
-}
-
-func TestSuiteGetters(t *testing.T) {
-	suite := new(SuiteTester)
-	suite.SetT(t)
-	assert.NotNil(t, suite.Assert())
-	assert.Equal(t, suite.Assertions, suite.Assert())
-	assert.NotNil(t, suite.Require())
-	assert.Equal(t, suite.require, suite.Require())
-}
-
-type SuiteLoggingTester struct {
-	Suite
-}
-
-func (s *SuiteLoggingTester) TestLoggingPass() {
-	s.T().Log("TESTLOGPASS")
-}
-
-func (s *SuiteLoggingTester) TestLoggingFail() {
-	s.T().Log("TESTLOGFAIL")
-	assert.NotNil(s.T(), nil) // expected to fail
-}
-
-type StdoutCapture struct {
-	oldStdout *os.File
-	readPipe  *os.File
-}
-
-func (sc *StdoutCapture) StartCapture() {
-	sc.oldStdout = os.Stdout
-	sc.readPipe, os.Stdout, _ = os.Pipe()
-}
-
-func (sc *StdoutCapture) StopCapture() (string, error) {
-	if sc.oldStdout == nil || sc.readPipe == nil {
-		return "", errors.New("StartCapture not called before StopCapture")
-	}
-	os.Stdout.Close()
-	os.Stdout = sc.oldStdout
-	bytes, err := ioutil.ReadAll(sc.readPipe)
-	if err != nil {
-		return "", err
-	}
-	return string(bytes), nil
-}
-
-func TestSuiteLogging(t *testing.T) {
-	testT := testing.T{}
-
-	suiteLoggingTester := new(SuiteLoggingTester)
-
-	capture := StdoutCapture{}
-	capture.StartCapture()
-	Run(&testT, suiteLoggingTester)
-	output, err := capture.StopCapture()
-
-	assert.Nil(t, err, "Got an error trying to capture stdout!")
-
-	// Failed tests' output is always printed
-	assert.Contains(t, output, "TESTLOGFAIL")
-
-	if testing.Verbose() {
-		// In verbose mode, output from successful tests is also printed
-		assert.Contains(t, output, "TESTLOGPASS")
-	} else {
-		assert.NotContains(t, output, "TESTLOGPASS")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/.drone.sec b/installer/vendor/github.com/vmware/govmomi/.drone.sec
deleted file mode 100644
index ad52e59ac8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/.drone.sec
+++ /dev/null
@@ -1 +0,0 @@
-eyJhbGciOiJSU0EtT0FFUCIsImVuYyI6IkExMjhHQ00ifQ.kK6pryC8R-O1R0Gj9ydLvQuIZlcYLGze23WdW7xbpiEEKdz6nweJrMm7ysy8lgu1tM47JVo19p2_b26bNKSQshCUOETvd7Hb2UMZOjnyUnqdyAAyoi6UkIquXfUUbHTNS0iMxwSxxW9KMp2GXNq8-o6T8xQZTDirBJFKKd8ZNUasTaoa5j8U9IfdR1aCavTBuOhvk8IVs-jSbY5TVJMJiE0IOPXois7aRJ6uAiANQBk9VKLegEcZD_qAewecXHDsHi-u0jbmg3o3PPaJaK_Qv5dsPlR2M-E2kE3AGUn0-zn5zYRngoAZ8WZr2O4GvLdltJKq9i2z7jOrdOzzRcDRow.96qvwl_E1Hj15u7Q.hWs-jQ8FsqQFD7pE9N-UEP1BWQ9rsJIcCaPvQRIp8Fukm_vvlw9YEaEq0ERLrsUWsJWpd1ca8_h8x7xD6f_d5YppwRqRHIeGIsdBOTMhNs0lG8ikkQXLat-UroCpy8EC17nuUtDE2E2Kdxrk4Cdd6Bk-dKk0Ta4w3Ud0YBKa.P8zrO7xizgv0i98eVWWzEg
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/govmomi/.drone.yml b/installer/vendor/github.com/vmware/govmomi/.drone.yml
deleted file mode 100644
index dee4bf5b38..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/.drone.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-clone:
-  tags: true
-  path: github.com/vmware/govmomi
-build:
-  image: golang:1.7
-  pull: true
-  environment:
-    - GOVC_TEST_URL=$$GOVC_TEST_URL
-    - GOVC_INSECURE=1
-    - VCA=1
-  commands:
-    - make all install
-    - git clone https://github.com/sstephenson/bats.git /tmp/bats
-    - /tmp/bats/install.sh /usr/local
-    - apt-get -qq update && apt-get install -yqq uuid-runtime bsdmainutils jq
-    - govc/test/images/update.sh
-    - bats govc/test
diff --git a/installer/vendor/github.com/vmware/govmomi/.gitignore b/installer/vendor/github.com/vmware/govmomi/.gitignore
deleted file mode 100644
index 769c244007..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-secrets.yml
diff --git a/installer/vendor/github.com/vmware/govmomi/.mailmap b/installer/vendor/github.com/vmware/govmomi/.mailmap
deleted file mode 100644
index b6f07fac36..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/.mailmap
+++ /dev/null
@@ -1,17 +0,0 @@
-Amit Bathla <abathla@.vmware.com> <abathla@promb-1s-dhcp216.eng.vmware.com>
-Bruce Downs <bruceadowns@gmail.com> <bdowns@vmware.com>
-Bruce Downs <bruceadowns@gmail.com> <bruce.downs@jivesoftware.com>
-Clint Greenwood <cgreenwood@vmware.com> <clint.greenwood@gmail.com>
-Cédric Blomart <cblomart@gmail.com> <cedric.blomart@minfin.fed.be>
-Cédric Blomart <cblomart@gmail.com> cedric <cblomart@gmail.com>
-David Stark <dave@davidstark.name> <david.stark@bskyb.com>
-Eric Gray <egray@vmware.com> <ericgray@users.noreply.github.com>
-Eric Yutao <eric.yutao@gmail.com> eric <eric.yutao@gmail.com>
-Henrik Hodne <henrik@travis-ci.com> <henrik@hodne.io>
-Jeremy Canady <jcanady@jackhenry.com> <jcanady@gmail.com>
-Pieter Noordhuis <pnoordhuis@vmware.com> <pcnoordhuis@gmail.com>
-Takaaki Furukawa <takaaki.frkw@gmail.com> takaaki.furukawa <takaaki.furukawa@mail.rakuten.com>
-Takaaki Furukawa <takaaki.frkw@gmail.com> tkak <takaaki.frkw@gmail.com>
-Vadim Egorov <vegorov@vmware.com> <egorovv@gmail.com>
-Zach Tucker <ztucker@vmware.com> <jzt@users.noreply.github.com>
-Zee Yang <zeey@vmware.com> <zee.yang@gmail.com>
diff --git a/installer/vendor/github.com/vmware/govmomi/.travis.yml b/installer/vendor/github.com/vmware/govmomi/.travis.yml
deleted file mode 100644
index 23798f283d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/.travis.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-sudo: false
-
-language: go
-
-go:
-   - 1.8
-
-before_install:
-  - make vendor
-
-script:
-  - make check test
diff --git a/installer/vendor/github.com/vmware/govmomi/CHANGELOG.md b/installer/vendor/github.com/vmware/govmomi/CHANGELOG.md
deleted file mode 100644
index 2dc436bf18..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/CHANGELOG.md
+++ /dev/null
@@ -1,263 +0,0 @@
-# changelog
-
-### 0.15.0 (2017-06-19)
-
-* WaitOptions.MaxWaitSeconds is now optional
-
-* Support removal of ExtraConfig entries
-
-* GuestPosixFileAttributes OwnerId and GroupId fields are now pointers,
-  rather than omitempty ints to allow chown with root uid:gid
-
-* Updated examples/ using view package
-
-* Add DatastoreFile.TailFunc method
-
-* Export VirtualMachine.FindSnapshot method
-
-* Add AuthorizationManager {Enable,Disable}Methods
-
-* Add PBM client
-
-### 0.14.0 (2017-04-08)
-
-* Add view.ContainerView type and methods
-
-* Add Collector.RetrieveWithFilter method
-
-* Add property.Filter type
-
-* Implement EthernetCardBackingInfo for OpaqueNetwork
-
-* Finder: support changing object root in find mode
-
-* Add VirtualDiskManager.QueryVirtualDiskInfo
-
-* Add performance.Manager APIs
-
-### 0.13.0 (2017-03-02)
-
-* Add DatastoreFileManager API wrapper
-
-* Add HostVsanInternalSystem API wrappers
-
-* Add Container support to view package
-
-* Finder supports Folder recursion without specifying a path
-
-* Add VirtualMachine.QueryConfigTarget method
-
-* Add device option to VirtualMachine.WaitForNetIP
-
-* Remove _Task suffix from vapp methods
-
-### 0.12.1 (2016-12-19)
-
-* Add DiagnosticLog helper
-
-* Add DatastorePath helper
-
-### 0.12.0 (2016-12-01)
-
-* Disable use of service ticket for datastore HTTP access by default
-
-* Attach context to HTTP requests for cancellations
-
-* Update to vim25/6.5 API
-
-### 0.11.4 (2016-11-15)
-
-* Add object.AuthorizationManager methods: RetrieveRolePermissions, RetrieveAllPermissions, AddRole, RemoveRole, UpdateRole
-
-### 0.11.3 (2016-11-08)
-
-* Allow DatastoreFile.Follow reader to drain current body after stopping
-
-### 0.11.2 (2016-11-01)
-
-* Avoid possible NPE in VirtualMachine.Device method
-
-* Add support for OpaqueNetwork type to Finder
-
-* Add HostConfigManager.AccountManager support for ESX 5.5
-
-### 0.11.1 (2016-10-27)
-
-* Add Finder.ResourcePoolListAll method
-
-### 0.11.0 (2016-10-25)
-
-* Add object.DistributedVirtualPortgroup.Reconfigure method
-
-### 0.10.0 (2016-10-20)
-
-* Add option to set soap.Client.UserAgent
-
-* Add service ticket thumbprint validation
-
-* Update use of http.DefaultTransport fields to 1.7
-
-* Set default locale to en_US (override with GOVMOMI_LOCALE env var)
-
-* Add object.HostCertificateInfo (types.HostCertificateManagerCertificateInfo helpers)
-
-* Add object.HostCertificateManager type and HostConfigManager.CertificateManager method
-
-* Add soap.Client SetRootCAs and SetDialTLS methods
-
-### 0.9.0 (2016-09-09)
-
-* Add object.DatastoreFile helpers for streaming and tailing datastore files
-
-* Add object VirtualMachine.Unregister method
-
-* Add object.ListView methods: Add, Remove, Reset
-
-* Update to Go 1.7 - using stdlib's context package
-
-### 0.8.0 (2016-06-30)
-
-* Add session.Manager.AcquireLocalTicket
-
-* Include StoragePod in Finder.FolderList
-
-* Add Finder methods for finding by ManagedObjectReference: Element, ObjectReference
-
-* Add mo.ManagedObjectReference methods: Reference, String, FromString
-
-* Add support using SessionManagerGenericServiceTicket.HostName for Datastore HTTP access
-
-### 0.7.1 (2016-06-03)
-
-* Fix object.ObjectName method
-
-### 0.7.0 (2016-06-02)
-
-* Move InventoryPath field to object.Common
-
-* Add HostDatastoreSystem.CreateLocalDatastore method
-
-* Add DatastoreNamespaceManager methods: CreateDirectory, DeleteDirectory
-
-* Add HostServiceSystem
-
-* Add HostStorageSystem methods: MarkAsSdd, MarkAsNonSdd, MarkAsLocal, MarkAsNonLocal
-
-* Add HostStorageSystem.RescanAllHba method
-
-### 0.6.2 (2016-05-11)
-
-* Get complete file details in Datastore.Stat
-
-* SOAP decoding fixes
-
-* Add VirtualMachine.RemoveAllSnapshot
-
-### 0.6.1 (2016-04-30)
-
-* Fix mo.Entity interface
-
-### 0.6.0 (2016-04-29)
-
-* Add Common.Rename method
-
-* Add mo.Entity interface
-
-* Add OptionManager
-
-* Add Finder.FolderList method
-
-* Add VirtualMachine.WaitForNetIP method
-
-* Add VirtualMachine.RevertToSnapshot method
-
-* Add Datastore.Download method
-
-### 0.5.0 (2016-03-30)
-
-Generated fields using xsd type 'int' change to Go type 'int32'
-
-VirtualDevice.UnitNumber field changed to pointer type
-
-### 0.4.0 (2016-02-26)
-
-* Add method to convert virtual device list to array with virtual device
-  changes that can be used in the VirtualMachineConfigSpec.
-
-* Make datastore cluster traversable in lister
-
-* Add finder.DatastoreCluster methods (also known as storage pods)
-
-* Add Drone CI check
-
-* Add object.Datastore Type and AttachedClusterHosts methods
-
-* Add finder.*OrDefault methods
-
-### 0.3.0 (2016-01-16)
-
-* Add object.VirtualNicManager wrapper
-
-* Add object.HostVsanSystem wrapper
-
-* Add object.HostSystem methods: EnterMaintenanceMode, ExitMaintenanceMode, Disconnect, Reconnect
-
-* Add finder.Folder method
-
-* Add object.Common.Destroy method
-
-* Add object.ComputeResource.Reconfigure method
-
-* Add license.AssignmentManager wrapper
-
-* Add object.HostFirewallSystem wrapper
-
-* Add object.DiagnosticManager wrapper
-
-* Add LoginExtensionByCertificate support
-
-* Add object.ExtensionManager
-
-...
-
-### 0.2.0 (2015-09-15)
-
-* Update to vim25/6.0 API
-
-* Stop returning children from `ManagedObjectList`
-
-    Change the `ManagedObjectList` function in the `find` package to only
-    return the managed objects specified by the path argument and not their
-    children. The original behavior was used by govc's `ls` command and is
-    now available in the newly added function `ManagedObjectListChildren`.
-
-* Add retry functionality to vim25 package
-
-* Change finder functions to no longer take varargs
-
-    The `find` package had functions to return a list of objects, given a
-    variable number of patterns. This makes it impossible to distinguish which
-    patterns produced results and which ones didn't.
-
-    In particular for govc, where multiple arguments can be passed from the
-    command line, it is useful to let the user know which ones produce results
-    and which ones don't.
-
-    To evaluate multiple patterns, the user should call the find functions
-    multiple times (either serially or in parallel).
-
-* Make optional boolean fields pointers (`vim25/types`).
-
-    False is the zero value of a boolean field, which means they are not serialized
-    if the field is marked "omitempty". If the field is a pointer instead, the zero
-    value will be the nil pointer, and both true and false values are serialized.
-
-### 0.1.0 (2015-03-17)
-
-Prior to this version the API of this library was in flux.
-
-Notable changes w.r.t. the state of this library before March 2015 are:
-
-* All functions that may execute a request take a `context.Context` parameter.
-* The `vim25` package contains a minimal client implementation.
-* The property collector and its convenience functions live in the `property` package.
diff --git a/installer/vendor/github.com/vmware/govmomi/CONTRIBUTING.md b/installer/vendor/github.com/vmware/govmomi/CONTRIBUTING.md
deleted file mode 100644
index f6645cbf4f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/CONTRIBUTING.md
+++ /dev/null
@@ -1,101 +0,0 @@
-# Contributing to govmomi
-
-## Getting started
-
-First, fork the repository on GitHub to your personal account.
-
-Note that _GOPATH_ can be any directory, the example below uses _$HOME/govmomi_.
-Change _$USER_ below to your github username if they are not the same.
-
-``` shell
-export GOPATH=$HOME/govmomi
-go get github.com/vmware/govmomi
-cd $GOPATH/src/github.com/vmware/govmomi
-git config push.default nothing # anything to avoid pushing to vmware/govmomi by default
-git remote rename origin vmware
-git remote add $USER git@github.com:$USER/govmomi.git
-git fetch $USER
-```
-
-## Installing from source
-
-Compile the govmomi libraries and install govc using:
-
-``` shell
-go install -v github.com/vmware/govmomi/govc
-```
-
-Note that **govc/build.sh** is only used for building release binaries.
-
-## Contribution flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work.
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Update CHANGELOG.md and/or govc/CHANGELOG.md when appropriate.
-- Push your changes to a topic branch in your fork of the repository.
-- Submit a pull request to vmware/govmomi.
-
-Example:
-
-``` shell
-git checkout -b my-new-feature vmware/master
-git commit -a
-git push $USER my-new-feature
-```
-
-### Stay in sync with upstream
-
-When your branch gets out of sync with the vmware/master branch, use the following to update:
-
-``` shell
-git checkout my-new-feature
-git fetch -a
-git rebase vmware/master
-git push --force-with-lease $USER my-new-feature
-```
-
-### Updating pull requests
-
-If your PR fails to pass CI or needs changes based on code review, you'll most likely want to squash these changes into
-existing commits.
-
-If your pull request contains a single commit or your changes are related to the most recent commit, you can simply
-amend the commit.
-
-``` shell
-git add .
-git commit --amend
-git push --force-with-lease $USER my-new-feature
-```
-
-If you need to squash changes into an earlier commit, you can use:
-
-``` shell
-git add .
-git commit --fixup <commit>
-git rebase -i --autosquash vmware/master
-git push --force-with-lease $USER my-new-feature
-```
-
-Be sure to add a comment to the PR indicating your new changes are ready to review, as github does not generate a
-notification when you git push.
-
-### Code style
-
-The coding style suggested by the Golang community is used in govmomi. See the
-[style doc](https://github.com/golang/go/wiki/CodeReviewComments) for details.
-
-Try to limit column width to 120 characters for both code and markdown documents such as this one.
-
-### Format of the Commit Message
-
-We follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/).
-
-Be sure to include any related GitHub issue references in the commit message.
-
-## Reporting Bugs and Creating Issues
-
-When opening a new issue, try to roughly follow the commit message format conventions above.
diff --git a/installer/vendor/github.com/vmware/govmomi/CONTRIBUTORS b/installer/vendor/github.com/vmware/govmomi/CONTRIBUTORS
index 22630d95e5..11cf9de09f 100644
--- a/installer/vendor/github.com/vmware/govmomi/CONTRIBUTORS
+++ b/installer/vendor/github.com/vmware/govmomi/CONTRIBUTORS
@@ -3,11 +3,17 @@
 # This script is generated by contributors.sh
 #
 
+Abhijeet Kasurde <akasurde@redhat.com>
 abrarshivani <abrarshivani@users.noreply.github.com>
+Adam Shannon <adamkshannon@gmail.com>
+Alessandro Cortiana <alessandro.cortiana@gmail.com>
+Alex Bozhenko <alexbozhenko@fb.com>
 Alvaro Miranda <kikitux@gmail.com>
-amandahla <amanda.andrade@serpro.gov.br>
+Amanda H. L. de Andrade <amanda.andrade@serpro.gov.br>
 Amit Bathla <abathla@.vmware.com>
+amit bezalel <amit.bezalel@hpe.com>
 Andrew Chin <andrew@andrewtchin.com>
+Anfernee Yongkun Gui <agui@vmware.com>
 aniketGslab <aniket.shinde@gslab.com>
 Arran Walker <arran.walker@zopa.com>
 Aryeh Weinreb <aryehweinreb@gmail.com>
@@ -17,17 +23,19 @@ bastienbc <bastien.barbe.creuly@gmail.com>
 Bob Killen <killen.bob@gmail.com>
 Brad Fitzpatrick <bradfitz@golang.org>
 Bruce Downs <bruceadowns@gmail.com>
-Cédric Blomart <cblomart@gmail.com>
+Chris Marchesi <chrism@vancluevertech.com>
 Christian Höltje <docwhat@gerf.org>
 Clint Greenwood <cgreenwood@vmware.com>
+Cédric Blomart <cblomart@gmail.com>
 Danny Lockard <danny.lockard@banno.com>
 Dave Tucker <dave@dtucker.co.uk>
-Davide Agnello <dagnello@hp.com>
 David Stark <dave@davidstark.name>
+Davide Agnello <dagnello@hp.com>
 Doug MacEachern <dougm@vmware.com>
 Eloy Coto <eloy.coto@gmail.com>
 Eric Gray <egray@vmware.com>
 Eric Yutao <eric.yutao@gmail.com>
+Erik Hollensbe <github@hollensbe.org>
 Fabio Rapposelli <fabio@vmware.com>
 Faiyaz Ahmed <ahmedf@vmware.com>
 forkbomber <forkbomber@users.noreply.github.com>
@@ -42,19 +50,27 @@ Isaac Rodman <isaac@eyz.us>
 Ivan Porto Carrero <icarrero@vmware.com>
 Jason Kincl <jkincl@gmail.com>
 Jeremy Canady <jcanady@jackhenry.com>
+jeremy-clerc <jeremy@clerc.io>
+João Pereira <joaodrp@gmail.com>
 Louie Jiang <jiangl@vmware.com>
 Marc Carmier <mcarmier@gmail.com>
+Matthew Cosgrove <matthew.cosgrove@dell.com>
 Mevan Samaratunga <mevansam@gmail.com>
 Nicolas Lamirault <nicolas.lamirault@gmail.com>
+Parham Alvani <parham.alvani@gmail.com>
 Pieter Noordhuis <pnoordhuis@vmware.com>
 runner.mei <runner.mei@gmail.com>
 S.Çağlar Onur <conur@vmware.com>
 Sergey Ignatov <sergey.ignatov@jetbrains.com>
 Steve Purcell <steve@sanityinc.com>
 Takaaki Furukawa <takaaki.frkw@gmail.com>
+tanishi <tanishi503@gmail.com>
 Ted Zlatanov <tzz@lifelogs.com>
 Thibaut Ackermann <thibaut.ackermann@alcatel-lucent.com>
+Trevor Dawe <trevor.dawe@gmail.com>
 Vadim Egorov <vegorov@vmware.com>
+Volodymyr Bobyr <pupsua@gmail.com>
+Witold Krecicki <wpk@culm.net>
 Yang Yang <yangy@vmware.com>
 Yuya Kusakabe <yuya.kusakabe@gmail.com>
 Zach Tucker <ztucker@vmware.com>
diff --git a/installer/vendor/github.com/vmware/govmomi/Makefile b/installer/vendor/github.com/vmware/govmomi/Makefile
deleted file mode 100644
index 9886b45ceb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-.PHONY: test
-
-all: check test
-
-check: goimports govet
-
-goimports:
-	@echo checking go imports...
-	@go get golang.org/x/tools/cmd/goimports
-	@! goimports -d . 2>&1 | egrep -v '^$$'
-
-govet:
-	@echo checking go vet...
-	@go tool vet -structtags=false -methods=false $$(find . -mindepth 1 -maxdepth 1 -type d -not -name vendor)
-
-install:
-	go install -v github.com/vmware/govmomi/govc
-	go install -v github.com/vmware/govmomi/vcsim
-
-go-test:
-	go test -v $(TEST_OPTS) ./...
-
-govc-test: install
-	(cd govc/test && ./vendor/github.com/sstephenson/bats/libexec/bats -t .)
-
-test: go-test govc-test
-
-doc: install
-	./govc/usage.sh > ./govc/USAGE.md
diff --git a/installer/vendor/github.com/vmware/govmomi/README.md b/installer/vendor/github.com/vmware/govmomi/README.md
deleted file mode 100644
index ef3a276dae..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/README.md
+++ /dev/null
@@ -1,82 +0,0 @@
-[![Build Status](https://travis-ci.org/vmware/govmomi.png?branch=master)](https://travis-ci.org/vmware/govmomi)
-[![Go Report Card](https://goreportcard.com/badge/github.com/vmware/govmomi)](https://goreportcard.com/report/github.com/vmware/govmomi)
-
-# govmomi
-
-A Go library for interacting with VMware vSphere APIs (ESXi and/or vCenter).
-
-For `govc`, a CLI built on top of govmomi, check out the [govc](./govc) directory and [USAGE](./govc/USAGE.md) document.
-
-## Compatibility
-
-This library is built for and tested against ESXi and vCenter 5.5, 6.0 and 6.5.
-
-If you're able to use it against older versions of ESXi and/or vCenter, please
-leave a note and we'll include it in this compatibility list.
-
-## Documentation
-
-The APIs exposed by this library very closely follow the API described in the [VMware vSphere API Reference Documentation][apiref].
-Refer to this document to become familiar with the upstream API.
-
-The code in the `govmomi` package is a wrapper for the code that is generated from the vSphere API description.
-It primarily provides convenience functions for working with the vSphere API.
-See [godoc.org][godoc] for documentation.
-
-[apiref]:http://pubs.vmware.com/vsphere-6-5/index.jsp#com.vmware.wssdk.apiref.doc/right-pane.html
-[godoc]:http://godoc.org/github.com/vmware/govmomi
-[drone]:https://drone.io
-[dronesrc]:https://github.com/drone/drone
-[dronecli]:http://readme.drone.io/devs/cli/
-
-#### Building with CI
-Merges to this repository will trigger builds in both Travis and [Drone][drone].
-
-To build locally with Drone:
-- Ensure that you have Docker 1.6 or higher installed.
-- Install the [Drone command line tools][dronecli].
-- Run `drone exec` from within the root directory of the govmomi repository.
-
-## Installation
-
-`go get -u github.com/vmware/govmomi`
-
-## Discussion
-
-Contributors and users are encouraged to collaborate using GitHub issues and/or
-[Slack](https://vmwarecode.slack.com/messages/govmomi).
-Access to Slack requires a [VMware {code} membership](https://code.vmware.com/join/).
-
-## Status
-
-Changes to the API are subject to [semantic versioning](http://semver.org).
-
-Refer to the [CHANGELOG](CHANGELOG.md) for version to version changes.
-
-## Projects using govmomi
-
-* [Docker Machine](https://github.com/docker/machine/tree/master/drivers/vmwarevsphere)
-
-* [Kubernetes](https://github.com/kubernetes/kubernetes/tree/master/pkg/cloudprovider/providers/vsphere)
-
-* [Terraform](https://github.com/hashicorp/terraform/tree/master/builtin/providers/vsphere)
-
-* [VMware VIC Engine](https://github.com/vmware/vic)
-
-* [Travis CI](https://github.com/travis-ci/jupiter-brain)
-
-* [collectd-vsphere](https://github.com/travis-ci/collectd-vsphere)
-
-* [Gru](https://github.com/dnaeon/gru)
-
-* [Libretto](https://github.com/apcera/libretto/tree/master/virtualmachine/vsphere)
-
-## Related projects
-
-* [rbvmomi](https://github.com/vmware/rbvmomi)
-
-* [pyvmomi](https://github.com/vmware/pyvmomi)
-
-## License
-
-govmomi is available under the [Apache 2 license](LICENSE).
diff --git a/installer/vendor/github.com/vmware/govmomi/client_test.go b/installer/vendor/github.com/vmware/govmomi/client_test.go
deleted file mode 100644
index a28b272d7b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/client_test.go
+++ /dev/null
@@ -1,138 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package govmomi
-
-import (
-	"context"
-	"errors"
-	"net/http"
-	"net/url"
-	"testing"
-
-	"github.com/vmware/govmomi/test"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestNewClient(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	c, err := NewClient(context.Background(), u, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f := func() error {
-		var x mo.Folder
-		err = mo.RetrieveProperties(context.Background(), c, c.ServiceContent.PropertyCollector, c.ServiceContent.RootFolder, &x)
-		if err != nil {
-			return err
-		}
-		if len(x.Name) == 0 {
-			return errors.New("empty response")
-		}
-		return nil
-	}
-
-	// check cookie is valid with an sdk request
-	if err := f(); err != nil {
-		t.Fatal(err)
-	}
-
-	// check cookie is valid with a non-sdk request
-	u.User = nil // turn off Basic auth
-	u.Path = "/folder"
-	r, err := c.Client.Get(u.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if r.StatusCode != http.StatusOK {
-		t.Fatal(r)
-	}
-
-	// sdk request should fail w/o a valid cookie
-	c.Client.Jar = nil
-	if err := f(); err == nil {
-		t.Fatal("should fail")
-	}
-
-	// invalid login
-	u.Path = "/sdk"
-	u.User = url.UserPassword("ENOENT", "EINVAL")
-	_, err = NewClient(context.Background(), u, true)
-	if err == nil {
-		t.Fatal("should fail")
-	}
-}
-
-func TestInvalidSdk(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	// a URL other than a valid /sdk should error, not panic
-	u.Path = "/mob"
-	_, err := NewClient(context.Background(), u, true)
-	if err == nil {
-		t.Fatal("should fail")
-	}
-}
-
-func TestPropertiesN(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	c, err := NewClient(context.Background(), u, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var f mo.Folder
-	err = c.RetrieveOne(context.Background(), c.ServiceContent.RootFolder, nil, &f)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var dc mo.Datacenter
-	err = c.RetrieveOne(context.Background(), f.ChildEntity[0], nil, &dc)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var folderReferences = []types.ManagedObjectReference{
-		dc.DatastoreFolder,
-		dc.HostFolder,
-		dc.NetworkFolder,
-		dc.VmFolder,
-	}
-
-	var folders []mo.Folder
-	err = c.Retrieve(context.Background(), folderReferences, []string{"name"}, &folders)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(folders) != len(folderReferences) {
-		t.Fatalf("Expected %d, got %d", len(folderReferences), len(folders))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/event/history_collector.go b/installer/vendor/github.com/vmware/govmomi/event/history_collector.go
deleted file mode 100644
index f3165b7032..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/event/history_collector.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package event
-
-import (
-	"context"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HistoryCollector struct {
-	*object.HistoryCollector
-}
-
-func NewHistoryCollector(c *vim25.Client, ref types.ManagedObjectReference) *HistoryCollector {
-	return &HistoryCollector{
-		HistoryCollector: object.NewHistoryCollector(c, ref),
-	}
-}
-
-func (h HistoryCollector) LatestPage(ctx context.Context) ([]types.BaseEvent, error) {
-	var o mo.EventHistoryCollector
-
-	err := h.Properties(ctx, h.Reference(), []string{"latestPage"}, &o)
-	if err != nil {
-		return nil, err
-	}
-
-	return o.LatestPage, nil
-}
-
-func (h HistoryCollector) ReadNextEvents(ctx context.Context, maxCount int32) ([]types.BaseEvent, error) {
-	req := types.ReadNextEvents{
-		This:     h.Reference(),
-		MaxCount: maxCount,
-	}
-
-	res, err := methods.ReadNextEvents(ctx, h.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (h HistoryCollector) ReadPreviousEvents(ctx context.Context, maxCount int32) ([]types.BaseEvent, error) {
-	req := types.ReadPreviousEvents{
-		This:     h.Reference(),
-		MaxCount: maxCount,
-	}
-
-	res, err := methods.ReadPreviousEvents(ctx, h.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/event/manager.go b/installer/vendor/github.com/vmware/govmomi/event/manager.go
deleted file mode 100644
index 3feede10ec..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/event/manager.go
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package event
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"sync"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Manager struct {
-	object.Common
-
-	eventCategory   map[string]string
-	eventCategoryMu *sync.Mutex
-	maxObjects      int
-}
-
-func NewManager(c *vim25.Client) *Manager {
-	m := Manager{
-		Common: object.NewCommon(c, *c.ServiceContent.EventManager),
-
-		eventCategory:   make(map[string]string),
-		eventCategoryMu: new(sync.Mutex),
-		maxObjects:      10,
-	}
-
-	return &m
-}
-
-func (m Manager) CreateCollectorForEvents(ctx context.Context, filter types.EventFilterSpec) (*HistoryCollector, error) {
-	req := types.CreateCollectorForEvents{
-		This:   m.Common.Reference(),
-		Filter: filter,
-	}
-
-	res, err := methods.CreateCollectorForEvents(ctx, m.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewHistoryCollector(m.Client(), res.Returnval), nil
-}
-
-func (m Manager) LogUserEvent(ctx context.Context, entity types.ManagedObjectReference, msg string) error {
-	req := types.LogUserEvent{
-		This:   m.Common.Reference(),
-		Entity: entity,
-		Msg:    msg,
-	}
-
-	_, err := methods.LogUserEvent(ctx, m.Client(), &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m Manager) PostEvent(ctx context.Context, eventToPost types.BaseEvent, taskInfo types.TaskInfo) error {
-	req := types.PostEvent{
-		This:        m.Common.Reference(),
-		EventToPost: eventToPost,
-		TaskInfo:    &taskInfo,
-	}
-
-	_, err := methods.PostEvent(ctx, m.Client(), &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (m Manager) QueryEvents(ctx context.Context, filter types.EventFilterSpec) ([]types.BaseEvent, error) {
-	req := types.QueryEvents{
-		This:   m.Common.Reference(),
-		Filter: filter,
-	}
-
-	res, err := methods.QueryEvents(ctx, m.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m Manager) RetrieveArgumentDescription(ctx context.Context, eventTypeID string) ([]types.EventArgDesc, error) {
-	req := types.RetrieveArgumentDescription{
-		This:        m.Common.Reference(),
-		EventTypeId: eventTypeID,
-	}
-
-	res, err := methods.RetrieveArgumentDescription(ctx, m.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m Manager) eventCategoryMap(ctx context.Context) (map[string]string, error) {
-	m.eventCategoryMu.Lock()
-	defer m.eventCategoryMu.Unlock()
-
-	if len(m.eventCategory) != 0 {
-		return m.eventCategory, nil
-	}
-
-	var o mo.EventManager
-
-	ps := []string{"description.eventInfo"}
-	err := property.DefaultCollector(m.Client()).RetrieveOne(ctx, m.Common.Reference(), ps, &o)
-	if err != nil {
-		return nil, err
-	}
-
-	for _, info := range o.Description.EventInfo {
-		m.eventCategory[info.Key] = info.Category
-	}
-
-	return m.eventCategory, nil
-}
-
-// EventCategory returns the category for an event, such as "info" or "error" for example.
-func (m Manager) EventCategory(ctx context.Context, event types.BaseEvent) (string, error) {
-	// Most of the event details are included in the Event.FullFormattedMessage, but the category
-	// is only available via the EventManager description.eventInfo property.  The value of this
-	// property is static, so we fetch and once and cache.
-	eventCategory, err := m.eventCategoryMap(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	switch e := event.(type) {
-	case *types.EventEx:
-		if e.Severity == "" {
-			return "info", nil
-		}
-		return e.Severity, nil
-	}
-
-	class := reflect.TypeOf(event).Elem().Name()
-
-	return eventCategory[class], nil
-}
-
-// Get the events from the specified object(s) and optionanlly tail the event stream
-func (m Manager) Events(ctx context.Context, objects []types.ManagedObjectReference, pageSize int32, tail bool, force bool, f func(types.ManagedObjectReference, []types.BaseEvent) error) error {
-
-	if len(objects) >= m.maxObjects && !force {
-		return fmt.Errorf("Maximum number of objects to monitor (%d) exceeded, refine search", m.maxObjects)
-	}
-
-	proc := newEventProcessor(m, pageSize, f)
-	for _, o := range objects {
-		proc.addObject(ctx, o)
-	}
-
-	return proc.run(ctx, tail)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/event/processor.go b/installer/vendor/github.com/vmware/govmomi/event/processor.go
deleted file mode 100644
index 18084d4895..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/event/processor.go
+++ /dev/null
@@ -1,183 +0,0 @@
-/*
-Copyright (c) 2016-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package event
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type tailInfo struct {
-	t         *eventTailer
-	obj       types.ManagedObjectReference
-	collector types.ManagedObjectReference
-}
-
-type eventProcessor struct {
-	mgr      Manager
-	pageSize int32
-	tailers  map[types.ManagedObjectReference]*tailInfo // tailers by collector ref
-	callback func(types.ManagedObjectReference, []types.BaseEvent) error
-}
-
-func newEventProcessor(mgr Manager, pageSize int32, callback func(types.ManagedObjectReference, []types.BaseEvent) error) *eventProcessor {
-	return &eventProcessor{
-		mgr:      mgr,
-		tailers:  make(map[types.ManagedObjectReference]*tailInfo),
-		callback: callback,
-		pageSize: pageSize,
-	}
-}
-
-func (p *eventProcessor) addObject(ctx context.Context, obj types.ManagedObjectReference) error {
-	filter := types.EventFilterSpec{
-		Entity: &types.EventFilterSpecByEntity{
-			Entity:    obj,
-			Recursion: types.EventFilterSpecRecursionOptionAll,
-		},
-	}
-
-	collector, err := p.mgr.CreateCollectorForEvents(ctx, filter)
-	if err != nil {
-		return fmt.Errorf("[%#v] %s", obj, err)
-	}
-
-	err = collector.SetPageSize(ctx, p.pageSize)
-	if err != nil {
-		return err
-	}
-
-	p.tailers[collector.Reference()] = &tailInfo{
-		t:         newEventTailer(),
-		obj:       obj,
-		collector: collector.Reference(),
-	}
-
-	return nil
-}
-
-func (p *eventProcessor) run(ctx context.Context, tail bool) error {
-	if len(p.tailers) == 0 {
-		return nil
-	}
-
-	var collectors []types.ManagedObjectReference
-	for _, t := range p.tailers {
-		collectors = append(collectors, t.collector)
-	}
-
-	c := property.DefaultCollector(p.mgr.Client())
-	props := []string{"latestPage"}
-
-	if len(collectors) == 1 {
-		// only one object to follow, don't bother creating a view
-		return property.Wait(ctx, c, collectors[0], props, func(pc []types.PropertyChange) bool {
-			if err := p.process(collectors[0], pc); err != nil {
-				return false
-			}
-
-			return !tail
-		})
-	}
-
-	// create and populate a ListView
-	m := view.NewManager(p.mgr.Client())
-
-	list, err := m.CreateListView(ctx, collectors)
-	if err != nil {
-		return err
-	}
-
-	defer list.Destroy(context.Background())
-
-	ref := list.Reference()
-	filter := new(property.WaitFilter).Add(ref, collectors[0].Type, props, list.TraversalSpec())
-
-	return property.WaitForUpdates(ctx, c, filter, func(updates []types.ObjectUpdate) bool {
-		for _, update := range updates {
-			if err := p.process(update.Obj, update.ChangeSet); err != nil {
-				return false
-			}
-		}
-
-		return !tail
-	})
-}
-
-func (p *eventProcessor) process(c types.ManagedObjectReference, pc []types.PropertyChange) error {
-	t := p.tailers[c]
-	if t == nil {
-		return fmt.Errorf("unknown collector %s", c.String())
-	}
-
-	for _, u := range pc {
-		evs := t.t.newEvents(u.Val.(types.ArrayOfEvent).Event)
-		if len(evs) == 0 {
-			continue
-		}
-
-		if err := p.callback(t.obj, evs); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-const invalidKey = int32(-1)
-
-type eventTailer struct {
-	lastKey int32
-}
-
-func newEventTailer() *eventTailer {
-	return &eventTailer{
-		lastKey: invalidKey,
-	}
-}
-
-func (t *eventTailer) newEvents(evs []types.BaseEvent) []types.BaseEvent {
-	var ret []types.BaseEvent
-	if t.lastKey == invalidKey {
-		ret = evs
-	} else {
-		found := false
-		for i := range evs {
-			if evs[i].GetEvent().Key != t.lastKey {
-				continue
-			}
-
-			found = true
-			ret = evs[:i]
-			break
-		}
-
-		if !found {
-			ret = evs
-		}
-	}
-
-	if len(ret) > 0 {
-		t.lastKey = ret[0].GetEvent().Key
-	}
-
-	return ret
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/event/sort.go b/installer/vendor/github.com/vmware/govmomi/event/sort.go
deleted file mode 100644
index dab2b2c376..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/event/sort.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package event
-
-import (
-	"sort"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Sort events in ascending order base on Key
-// From the EventHistoryCollector.latestPage sdk docs:
-//   The "oldest event" is the one with the smallest key (event ID).
-//   The events in the returned page are unordered.
-func Sort(events []types.BaseEvent) {
-	sort.Sort(baseEvent(events))
-}
-
-type baseEvent []types.BaseEvent
-
-func (d baseEvent) Len() int {
-	return len(d)
-}
-
-func (d baseEvent) Less(i, j int) bool {
-	return d[i].GetEvent().Key < d[j].GetEvent().Key
-}
-
-func (d baseEvent) Swap(i, j int) {
-	d[i], d[j] = d[j], d[i]
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/examples/datastores/main.go b/installer/vendor/github.com/vmware/govmomi/examples/datastores/main.go
deleted file mode 100644
index 67c8720c57..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/examples/datastores/main.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-This example program shows how the `view` and `property` packages can
-be used to navigate a vSphere inventory structure using govmomi.
-*/
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/examples"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-func main() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Connect and log in to ESX or vCenter
-	c, err := examples.NewClient(ctx)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer c.Logout(ctx)
-
-	// Create a view of Datastore objects
-	m := view.NewManager(c.Client)
-
-	v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{"Datastore"}, true)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer v.Destroy(ctx)
-
-	// Retrieve summary property for all datastores
-	// Reference: http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.Datastore.html
-	var dss []mo.Datastore
-	err = v.Retrieve(ctx, []string{"Datastore"}, []string{"summary"}, &dss)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Print summary per datastore (see also: govc/datastore/info.go)
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Name:\tType:\tCapacity:\tFree:\n")
-
-	for _, ds := range dss {
-		fmt.Fprintf(tw, "%s\t", ds.Summary.Name)
-		fmt.Fprintf(tw, "%s\t", ds.Summary.Type)
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(ds.Summary.Capacity))
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(ds.Summary.FreeSpace))
-		fmt.Fprintf(tw, "\n")
-	}
-
-	_ = tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/examples/examples.go b/installer/vendor/github.com/vmware/govmomi/examples/examples.go
deleted file mode 100644
index 1bd0728f10..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/examples/examples.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package examples
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"net/url"
-	"os"
-	"strings"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-// getEnvString returns string from environment variable.
-func getEnvString(v string, def string) string {
-	r := os.Getenv(v)
-	if r == "" {
-		return def
-	}
-
-	return r
-}
-
-// getEnvBool returns boolean from environment variable.
-func getEnvBool(v string, def bool) bool {
-	r := os.Getenv(v)
-	if r == "" {
-		return def
-	}
-
-	switch strings.ToLower(r[0:1]) {
-	case "t", "y", "1":
-		return true
-	}
-
-	return false
-}
-
-const (
-	envURL      = "GOVMOMI_URL"
-	envUserName = "GOVMOMI_USERNAME"
-	envPassword = "GOVMOMI_PASSWORD"
-	envInsecure = "GOVMOMI_INSECURE"
-)
-
-var urlDescription = fmt.Sprintf("ESX or vCenter URL [%s]", envURL)
-var urlFlag = flag.String("url", getEnvString(envURL, "https://username:password@host/sdk"), urlDescription)
-
-var insecureDescription = fmt.Sprintf("Don't verify the server's certificate chain [%s]", envInsecure)
-var insecureFlag = flag.Bool("insecure", getEnvBool(envInsecure, false), insecureDescription)
-
-func processOverride(u *url.URL) {
-	envUsername := os.Getenv(envUserName)
-	envPassword := os.Getenv(envPassword)
-
-	// Override username if provided
-	if envUsername != "" {
-		var password string
-		var ok bool
-
-		if u.User != nil {
-			password, ok = u.User.Password()
-		}
-
-		if ok {
-			u.User = url.UserPassword(envUsername, password)
-		} else {
-			u.User = url.User(envUsername)
-		}
-	}
-
-	// Override password if provided
-	if envPassword != "" {
-		var username string
-
-		if u.User != nil {
-			username = u.User.Username()
-		}
-
-		u.User = url.UserPassword(username, envPassword)
-	}
-}
-
-// NewClient creates a govmomi.Client for use in the examples
-func NewClient(ctx context.Context) (*govmomi.Client, error) {
-	flag.Parse()
-
-	// Parse URL from string
-	u, err := soap.ParseURL(*urlFlag)
-	if err != nil {
-		return nil, err
-	}
-
-	// Override username and/or password as required
-	processOverride(u)
-
-	// Connect and log in to ESX or vCenter
-	return govmomi.NewClient(ctx, u, *insecureFlag)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/examples/hosts/main.go b/installer/vendor/github.com/vmware/govmomi/examples/hosts/main.go
deleted file mode 100644
index 625e2aed4f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/examples/hosts/main.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-This example program shows how the `view` and `property` packages can
-be used to navigate a vSphere inventory structure using govmomi.
-*/
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/examples"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-func main() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Connect and login to ESX or vCenter
-	c, err := examples.NewClient(ctx)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer c.Logout(ctx)
-
-	// Create a view of HostSystem objects
-	m := view.NewManager(c.Client)
-
-	v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{"HostSystem"}, true)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer v.Destroy(ctx)
-
-	// Retrieve summary property for all hosts
-	// Reference: http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.HostSystem.html
-	var hss []mo.HostSystem
-	err = v.Retrieve(ctx, []string{"HostSystem"}, []string{"summary"}, &hss)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Print summary per host (see also: govc/host/info.go)
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Name:\tUsed CPU:\tTotal CPU:\tFree CPU:\tUsed Memory:\tTotal Memory:\tFree Memory\t:\n")
-
-	for _, hs := range hss {
-		totalCPU := int64(hs.Summary.Hardware.CpuMhz) * int64(hs.Summary.Hardware.NumCpuCores)
-		freeCPU := int64(totalCPU) - int64(hs.Summary.QuickStats.OverallCpuUsage)
-		freeMemory := int64(hs.Summary.Hardware.MemorySize) - (int64(hs.Summary.QuickStats.OverallMemoryUsage) * 1024 * 1024)
-		fmt.Fprintf(tw, "%s\t", hs.Summary.Config.Name)
-		fmt.Fprintf(tw, "%d\t", hs.Summary.QuickStats.OverallCpuUsage)
-		fmt.Fprintf(tw, "%d\t", totalCPU)
-		fmt.Fprintf(tw, "%d\t", freeCPU)
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(hs.Summary.QuickStats.OverallMemoryUsage))
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(hs.Summary.Hardware.MemorySize))
-		fmt.Fprintf(tw, "%d\t", freeMemory)
-		fmt.Fprintf(tw, "\n")
-	}
-
-	_ = tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/examples/networks/main.go b/installer/vendor/github.com/vmware/govmomi/examples/networks/main.go
deleted file mode 100644
index 1640af3429..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/examples/networks/main.go
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/vmware/govmomi/examples"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-func main() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Connect and login to ESX or vCenter
-	c, err := examples.NewClient(ctx)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer c.Logout(ctx)
-
-	// Create a view of Network types
-	m := view.NewManager(c.Client)
-
-	v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{"Network"}, true)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer v.Destroy(ctx)
-
-	// Reference: http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.Network.html
-	var networks []mo.Network
-	err = v.Retrieve(ctx, []string{"Network"}, nil, &networks)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for _, net := range networks {
-		fmt.Printf("%s: %s\n", net.Name, net.Reference())
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/examples/virtualmachines/main.go b/installer/vendor/github.com/vmware/govmomi/examples/virtualmachines/main.go
deleted file mode 100644
index f6982e41ca..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/examples/virtualmachines/main.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-This example program shows how the `view` package can
-be used to navigate a vSphere inventory structure using govmomi.
-*/
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"log"
-
-	"github.com/vmware/govmomi/examples"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-func main() {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	// Connect and login to ESX or vCenter
-	c, err := examples.NewClient(ctx)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer c.Logout(ctx)
-
-	// Create view of VirtualMachine objects
-	m := view.NewManager(c.Client)
-
-	v, err := m.CreateContainerView(ctx, c.ServiceContent.RootFolder, []string{"VirtualMachine"}, true)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer v.Destroy(ctx)
-
-	// Retrieve summary property for all machines
-	// Reference: http://pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.VirtualMachine.html
-	var vms []mo.VirtualMachine
-	err = v.Retrieve(ctx, []string{"VirtualMachine"}, []string{"summary"}, &vms)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Print summary per vm (see also: govc/vm/info.go)
-
-	for _, vm := range vms {
-		fmt.Printf("%s: %s\n", vm.Summary.Config.Name, vm.Summary.Config.GuestFullName)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/find/finder.go b/installer/vendor/github.com/vmware/govmomi/find/finder.go
index 04d0e891a9..2e9727e484 100644
--- a/installer/vendor/github.com/vmware/govmomi/find/finder.go
+++ b/installer/vendor/github.com/vmware/govmomi/find/finder.go
@@ -625,6 +625,15 @@ func (f *Finder) ClusterComputeResourceList(ctx context.Context, path string) ([
 	return ccrs, nil
 }
 
+func (f *Finder) DefaultClusterComputeResource(ctx context.Context) (*object.ClusterComputeResource, error) {
+	cr, err := f.ClusterComputeResource(ctx, "*")
+	if err != nil {
+		return nil, toDefaultError(err)
+	}
+
+	return cr, nil
+}
+
 func (f *Finder) ClusterComputeResource(ctx context.Context, path string) (*object.ClusterComputeResource, error) {
 	ccrs, err := f.ClusterComputeResourceList(ctx, path)
 	if err != nil {
@@ -638,6 +647,18 @@ func (f *Finder) ClusterComputeResource(ctx context.Context, path string) (*obje
 	return ccrs[0], nil
 }
 
+func (f *Finder) ClusterComputeResourceOrDefault(ctx context.Context, path string) (*object.ClusterComputeResource, error) {
+	if path != "" {
+		cr, err := f.ClusterComputeResource(ctx, path)
+		if err != nil {
+			return nil, err
+		}
+		return cr, nil
+	}
+
+	return f.DefaultClusterComputeResource(ctx)
+}
+
 func (f *Finder) HostSystemList(ctx context.Context, path string) ([]*object.HostSystem, error) {
 	s := &spec{
 		Relative: f.hostFolder,
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/Gemfile b/installer/vendor/github.com/vmware/govmomi/gen/Gemfile
deleted file mode 100644
index 26a4f14774..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/Gemfile
+++ /dev/null
@@ -1,3 +0,0 @@
-source "https://rubygems.org"
-
-gem "nokogiri"
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/Gemfile.lock b/installer/vendor/github.com/vmware/govmomi/gen/Gemfile.lock
deleted file mode 100644
index 6cdeaae5a3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/Gemfile.lock
+++ /dev/null
@@ -1,12 +0,0 @@
-GEM
-  remote: https://rubygems.org/
-  specs:
-    mini_portile (0.6.0)
-    nokogiri (1.6.3.1)
-      mini_portile (= 0.6.0)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  nokogiri
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/gen.sh b/installer/vendor/github.com/vmware/govmomi/gen/gen.sh
deleted file mode 100755
index 4a5a0557e5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/gen.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-generate() {
-  dst="$1"
-  wsdl="$2"
-  modl="$3"
-
-  pkgs=(types methods)
-  if [ -n "$modl" ] ; then
-    pkgs+=(mo)
-  fi
-
-  for p in "${pkgs[@]}"
-  do
-    mkdir -p "$dst/$p"
-  done
-
-  echo "generating $dst/..."
-
-  bundle exec ruby gen_from_wsdl.rb "$dst" "$wsdl"
-  if [ -n "$modl" ] ; then
-    bundle exec ruby gen_from_vmodl.rb "$dst" "$wsdl" "$modl"
-  fi
-
-  for p in "${pkgs[@]}"
-  do
-    pushd "$dst/$p" >/dev/null
-    goimports -w ./*.go
-    go install
-    popd >/dev/null
-  done
-}
-
-# ./sdk/ contains the contents of wsdl.zip from vimbase build 5037323
-
-generate "../vim25" "vim" "./rbvmomi/vmodl.db" # from github.com/vmware/rbvmomi@f6907e6
-generate "../pbm" "pbm"
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb b/installer/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb
deleted file mode 100644
index 7149d6844e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/gen_from_vmodl.rb
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$:.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require "vim_wsdl"
-
-require "test/unit"
-
-def read(file)
-  File.open(file)
-end
-
-class Prop
-  def initialize(vmodl, data)
-    @vmodl = vmodl
-    @data = data
-  end
-
-  def slice?
-    @data["is-array"]
-  end
-
-  def optional?
-    @data["is-optional"]
-  end
-
-  def name
-    @data["name"]
-  end
-
-  def var_field
-    n = name
-    n[0].capitalize + n[1..-1]
-  end
-
-  def var_type_prefix(base=false)
-    if slice?
-      "[]"
-    else
-      if optional? && !base
-        "*"
-      else
-        ""
-      end
-    end
-  end
-
-  def var_type
-    type = @data["wsdl_type"]
-    if @vmodl.managed_hash.has_key?(type)
-      type = "ManagedObjectReference"
-    end
-
-    # Fix up type from vmodl
-    case type
-    when "TypeName", "MethodName"
-      type = "xsd:string"
-    when "ManagedObject"
-      type = "ManagedObjectReference"
-    when "xsd:anyType"
-      type = "AnyType"
-    end
-
-    if type =~ /^xsd:(.*)$/
-      type = $1
-      case type
-      when "string"
-      when "int"
-        type = "int32"
-      when "boolean"
-        type ="bool"
-      when "long"
-        type ="int64"
-      when "dateTime"
-        type ="time.Time"
-        prefix += "*" if !slice? && optional?
-      when "byte"
-      when "double"
-        type ="float64"
-      when "float"
-        type ="float32"
-      when "short"
-        type ="int16"
-      when "base64Binary"
-        type ="[]byte"
-      else
-        raise "unknown type: %s" % type
-      end
-    else
-      if Peek.base?(type)
-        type = "Base" + type
-        base = true
-      end
-      type = "types." + type
-    end
-
-    var_type_prefix(base) + type
-  end
-
-  def var_tag
-    "mo:\"%s\"" % name
-  end
-
-  def dump(io)
-    io.print "%s %s `%s`\n" % [var_field, var_type, var_tag]
-  end
-end
-
-class Managed
-  def initialize(vmodl, name, data)
-    @vmodl = vmodl
-    @name = name
-    @data = data
-  end
-
-  def name
-    @name
-  end
-
-  def props
-    @data["props"].map do |p|
-      Prop.new(@vmodl, p)
-    end
-  end
-
-  def dump(io)
-    include_ref_getter = false
-    include_ent_getter = false
-
-    io.print "type %s struct {\n" % name
-
-    case @data["wsdl_base"]
-    when nil, "ManagedObject", "View"
-      include_ref_getter = true
-      io.print "Self types.ManagedObjectReference\n\n"
-    else
-      io.print "%s\n\n" % @data["wsdl_base"]
-      if @data["wsdl_base"] == "ManagedEntity"
-        include_ent_getter = true
-      end
-    end
-
-    props.each do |p|
-      p.dump(io)
-    end
-    io.print "}\n\n"
-
-    if include_ref_getter
-      io.print "func (m %s) Reference() types.ManagedObjectReference {\n" % [name]
-      io.print "return m.Self\n"
-      io.print "}\n\n"
-    end
-
-    if include_ent_getter
-      io.print "func (m *%s) Entity() *ManagedEntity {\n" % [name]
-      io.print "return &m.ManagedEntity\n"
-      io.print "}\n\n"
-    end
-  end
-
-  def dump_init(io)
-    io.print "func init() {\n"
-    io.print "t[\"%s\"] = reflect.TypeOf((*%s)(nil)).Elem()\n" % [name, name]
-    io.print "}\n\n"
-  end
-end
-
-class Vmodl
-  def initialize(data)
-    @data = Marshal.load(data)
-  end
-
-  def managed_hash
-    @managed_hash ||= begin
-                        h = {}
-                        managed.each do |m|
-                          h[m.name] = m
-                        end
-                        h
-                      end
-  end
-
-  def managed
-    @data.map do |k,v|
-      next if !v.is_a?(Hash)
-      next if v["kind"] != "managed"
-      # rbvmomi/vmodl.db includes pbm mo's, but we don't need the types as they have no properties
-      next if k =~ /^pbm/i
-
-      Managed.new(self, k, v)
-    end.compact
-  end
-end
-
-if !File.directory?(ARGV.first)
-  raise "first argument not a directory"
-end
-
-wsdl = WSDL.new(WSDL.read ARGV[1]+".wsdl")
-wsdl.validate_assumptions!
-wsdl.peek()
-
-vmodl = Vmodl.new(read ARGV[2] || "./rbvmomi/vmodl.db")
-
-File.open(File.join(ARGV.first, "mo/mo.go"), "w") do |io|
-  io.print WSDL.header("mo")
-  io.print <<EOF
-import (
-        "github.com/vmware/govmomi/vim25/types"
-)
-EOF
-
-  vmodl.
-    managed.
-    sort_by { |m| m.name }.
-    each { |m| m.dump(io); m.dump_init(io); }
-end
-
-exit(0)
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb b/installer/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb
deleted file mode 100644
index 69c42a2dea..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/gen_from_wsdl.rb
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-$:.unshift(File.expand_path(File.dirname(__FILE__)))
-
-require "vim_wsdl"
-
-if !File.directory?(ARGV.first)
-  raise "first argument not a directory"
-end
-
-target = ARGV[1]
-wsdl = WSDL.new(WSDL.read target+".wsdl")
-wsdl.validate_assumptions!
-wsdl.peek()
-
-ifs = Peek.types.keys.select { |name| Peek.base?(name) }.size()
-puts "%d classes, %d interfaces" % [Peek.types.size(), ifs]
-
-File.open(File.join(ARGV.first, "types/enum.go"), "w") do |io|
-  io.print WSDL.header("types")
-
-  wsdl.
-    types.
-    sort_by { |x| x.name }.
-    uniq { |x| x.name }.
-    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
-    select { |t| t.is_enum? }.
-    each { |e| e.dump(io); e.dump_init(io) }
-end
-
-File.open(File.join(ARGV.first, "types/types.go"), "w") do |io|
-  io.print WSDL.header("types")
-  if target != "vim"
-    io.print <<EOF
-import (
-        "context"
-        "github.com/vmware/govmomi/vim25/types"
-)
-EOF
-  end
-
-  wsdl.
-    types.
-    sort_by { |x| x.name }.
-    uniq { |x| x.name }.
-    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
-    select { |t| !t.is_enum? }.
-    each { |e| e.dump(io); e.dump_init(io) }
-end
-
-File.open(File.join(ARGV.first, "types/if.go"), "w") do |io|
-  io.print WSDL.header("types")
-
-  Peek.dump_interfaces(io)
-end
-
-File.open(File.join(ARGV.first, "methods/methods.go"), "w") do |io|
-  io.print WSDL.header("methods")
-  if target == "vim"
-    target += "25"
-  end
-
-  io.print <<EOF
-import (
-        "context"
-        "github.com/vmware/govmomi/#{target}/types"
-        "github.com/vmware/govmomi/vim25/soap"
-)
-EOF
-
-  wsdl.
-    operations.
-    sort_by { |x| x.name }.
-    select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
-    each { |e| e.dump(io) }
-end
-
-exit(0)
diff --git a/installer/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb b/installer/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb
deleted file mode 100644
index 873a2ff9e5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/gen/vim_wsdl.rb
+++ /dev/null
@@ -1,866 +0,0 @@
-# Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require "nokogiri"
-require "test/unit"
-
-$namespaces = %w(vim25)
-
-def valid_ns?(t)
-  $namespaces.include?(t)
-end
-
-def init_type(io, name, kind)
-  t = "reflect.TypeOf((*#{kind})(nil)).Elem()"
-
-  io.print "func init() {\n"
-
-  if $target == "vim25"
-    io.print "t[\"#{name}\"] = #{t}\n"
-  else
-    unless name.start_with? "Base"
-      name = "#{$target}:#{name}"
-    end
-    io.print "types.Add(\"#{name}\", #{t})\n"
-  end
-
-  io.print "}\n\n"
-end
-
-class Peek
-  class Type
-    attr_accessor :parent, :children, :klass
-
-    def initialize(name)
-      @name = name
-      @children = []
-    end
-
-    def base?
-      # VrpResourceAllocationInfo is removed in 6.7, so base will no longer generated
-      return false if @name == "ResourceAllocationInfo"
-
-      return !children.empty?
-    end
-  end
-
-  @@types = {}
-  @@refs = {}
-  @@enums = {}
-
-  def self.types
-    return @@types
-  end
-
-  def self.refs
-    return @@refs
-  end
-
-  def self.enums
-    return @@enums
-  end
-
-  def self.ref(type)
-    refs[type] = true
-  end
-
-  def self.enum(type)
-    enums[type] = true
-  end
-
-  def self.enum?(type)
-    enums[type]
-  end
-
-  def self.register(name)
-    raise unless name
-    types[name] ||= Type.new(name)
-  end
-
-  def self.base?(name)
-    return unless c = types[name]
-    c.base?
-  end
-
-  def self.dump_interfaces(io)
-    types.keys.sort.each do |name|
-      next unless base?(name)
-      klass = types[name].klass
-      klass.dump_interface(io, name) if klass
-    end
-  end
-end
-
-class EnumValue
-  def initialize(type, value)
-    @type = type
-    @value = value
-  end
-
-  def type_name
-    @type.name
-  end
-
-  def var_name
-    n = @type.name
-    v = var_value
-    if v == ""
-      n += "Null"
-    else
-      n += (v[0].capitalize + v[1..-1])
-    end
-
-    return n
-  end
-
-  def var_value
-    @value
-  end
-
-  def dump(io)
-    io.print "%s = %s(\"%s\")\n" % [var_name, type_name, var_value]
-  end
-end
-
-class Simple
-  include Test::Unit::Assertions
-
-  attr_accessor :name, :type
-
-  def initialize(node)
-    @node = node
-  end
-
-  def name
-    @name || @node["name"]
-  end
-
-  def type
-    @type || @node["type"]
-  end
-
-  def is_enum?
-    false
-  end
-
-  def dump_init(io)
-    # noop
-  end
-
-  def var_name
-    n = self.name
-    n = n[1..-1] if n[0] == "_" # Strip leading _
-    n = n[0].capitalize + n[1..-1] # Capitalize
-    return n
-  end
-
-  def ns(t = self.type)
-    t.split(":", 2)[0]
-  end
-
-  def vim_type?
-    valid_ns? ns
-  end
-
-  def vim_type(t = self.type)
-    ns, kind = t.split(":", 2)
-    if ! valid_ns? ns
-        raise
-    end
-    kind
-  end
-
-  def base_type?
-    vim_type? && Peek.base?(vim_type)
-  end
-
-  def enum_type?
-    vim_type? && Peek.enum?(vim_type)
-  end
-
-  def any_type?
-    self.type == "xsd:anyType"
-  end
-
-  def pointer_type?
-    ["UnitNumber"].include?(var_name) or
-      optional? && ["OwnerId", "GroupId", "MaxWaitSeconds", "Reservation", "Limit", "OverheadLimit"].include?(var_name)
-  end
-
-  def var_type
-    t = self.type
-    prefix = ""
-
-    prefix += "[]" if slice?
-
-    if t =~ /^xsd:(.*)$/
-      t = $1
-      case t
-      when "string"
-      when "int"
-        if pointer_type?
-          prefix += "*"
-          self.need_omitempty = false
-        end
-        t = "int32"
-      when "boolean"
-        t = "bool"
-        if !slice? && optional?
-          prefix += "*"
-          self.need_omitempty = false
-        end
-      when "long"
-        if pointer_type?
-          prefix += "*"
-          self.need_omitempty = false
-        end
-        t = "int64"
-      when "dateTime"
-        t = "time.Time"
-        if !slice? && optional?
-          prefix += "*"
-          self.need_omitempty = false
-        end
-      when "anyType"
-        pkg = ""
-        if $target != "vim25"
-          pkg = "types."
-        end
-        t = "#{pkg}AnyType"
-        if ["Value", "Val"].include?(var_name)
-          self.need_omitempty = false
-        end
-      when "byte"
-      when "double"
-        t = "float64"
-      when "float"
-        t = "float32"
-      when "short"
-        t = "int16"
-      when "base64Binary"
-        t = "[]byte"
-      when "anyURI"
-        t = "url.URL"
-      else
-        raise "unknown type: %s" % t
-      end
-    else
-      pkg = ""
-      if $target != self.ns
-        pkg = "types."
-      end
-
-      t = vim_type
-
-      if base_type?
-        prefix += "#{pkg}Base"
-      else
-        t = pkg + t
-        prefix += "*" if !slice? && !enum_type? && optional?
-      end
-    end
-
-    prefix + t
-  end
-
-  def slice?
-    test_attr("maxOccurs", "unbounded")
-  end
-
-  def optional?
-    test_attr("minOccurs", "0")
-  end
-
-  def need_omitempty=(v)
-    @need_omitempty = v
-  end
-
-  def need_omitempty?
-    var_type # HACK: trigger setting need_omitempty if necessary
-    if @need_omitempty.nil?
-      @need_omitempty = optional?
-    else
-      @need_omitempty
-    end
-  end
-
-  def need_typeattr?
-    base_type? || any_type?
-  end
-
-  protected
-
-  def test_attr(attr, expected)
-    actual = @node.attr(attr)
-    if actual != nil
-      case actual
-      when expected
-        true
-      else
-        raise "%s=%s" % [value, type.attr(value)]
-      end
-    else
-      false
-    end
-  end
-end
-
-class Element < Simple
-  def initialize(node)
-    super(node)
-  end
-
-  def has_type?
-    !@node["type"].nil?
-  end
-
-  def child
-    cs = @node.element_children
-    assert_equal 1, cs.length
-    assert_equal "complexType", cs.first.name
-
-    t = ComplexType.new(cs.first)
-    t.name = self.name
-    t
-  end
-
-  def dump(io)
-    if has_type?
-      io.print "type %s %s\n\n" % [name, var_type]
-    else
-      child.dump(io)
-    end
-  end
-
-  def dump_init(io)
-    if has_type?
-      init_type io, name, name
-    end
-  end
-
-  def dump_field(io)
-    tag = name
-    tag += ",omitempty" if need_omitempty?
-    tag += ",typeattr" if need_typeattr?
-    io.print "%s %s `xml:\"%s\"`\n" % [var_name, var_type, tag]
-  end
-
-  def peek(type=nil)
-    if has_type?
-      return if self.type =~ /^xsd:/
-
-      Peek.ref(vim_type)
-    else
-      child.peek()
-    end
-  end
-end
-
-class Attribute < Simple
-  def dump_field(io)
-    tag = name
-    tag += ",omitempty" if need_omitempty?
-    tag += ",attr"
-    io.print "%s %s `xml:\"%s\"`\n" % [var_name, var_type, tag]
-  end
-end
-
-class SimpleType < Simple
-  def is_enum?
-    true
-  end
-
-  def dump(io)
-    enums = @node.xpath(".//xsd:enumeration").map do |n|
-      EnumValue.new(self, n["value"])
-    end
-
-    io.print "type %s string\n\n" % name
-    io.print "const (\n"
-    enums.each { |e| e.dump(io) }
-    io.print ")\n\n"
-  end
-
-  def dump_init(io)
-    init_type io, name, name
-  end
-
-  def peek
-    Peek.enum(name)
-  end
-end
-
-class ComplexType < Simple
-  class SimpleContent < Simple
-    def dump(io)
-      attr = Attribute.new(@node.at_xpath(".//xsd:attribute"))
-      attr.dump_field(io)
-
-      # HACK DELUXE(PN)
-      extension = @node.at_xpath(".//xsd:extension")
-      type = extension["base"].split(":", 2)[1]
-      io.print "Value %s `xml:\",chardata\"`\n" % type
-    end
-
-    def peek
-    end
-  end
-
-  class ComplexContent < Simple
-    def base
-      extension = @node.at_xpath(".//xsd:extension")
-      assert_not_nil extension
-
-      base = extension["base"]
-      assert_not_nil base
-
-      base
-    end
-
-    def dump(io)
-      Sequence.new(@node).dump(io, base)
-    end
-
-    def dump_interface(io, name)
-      Sequence.new(@node).dump_interface(io, name)
-    end
-
-    def peek
-      Sequence.new(@node).peek(vim_type(base))
-    end
-  end
-
-  class Sequence < Simple
-    def sequence
-      sequence = @node.at_xpath(".//xsd:sequence")
-      if sequence != nil
-        sequence.element_children.map do |n|
-          Element.new(n)
-        end
-      else
-        nil
-      end
-    end
-
-    def dump(io, base = nil)
-      return unless elements = sequence
-      if base != nil
-        kind = vim_type(base)
-
-        pkg = ""
-        if $target != ns(base)
-          pkg = "types."
-        end
-        io.print "#{pkg}#{kind}\n\n"
-      end
-
-      elements.each do |e|
-        e.dump_field(io)
-      end
-    end
-
-    def dump_interface(io, name)
-      method = "Get%s() *%s" % [name, name]
-      io.print "func (b *%s) %s { return b }\n" % [name, method]
-      io.print "type Base%s interface {\n" % name
-      io.print "%s\n" % method
-      io.print "}\n\n"
-      init_type io, "Base#{name}", name
-    end
-
-    def peek(base = nil)
-      return unless elements = sequence
-      name = @node.attr("name")
-      return unless name
-
-      elements.each do |e|
-        e.peek(name)
-      end
-
-      c = Peek.register(name)
-      if base
-        c.parent = base
-        Peek.register(c.parent).children << name
-      end
-    end
-  end
-
-  def klass
-    @klass ||= begin
-                 cs = @node.element_children
-                 if !cs.empty?
-                   assert_equal 1, cs.length
-
-                   case cs.first.name
-                   when "simpleContent"
-                     SimpleContent.new(@node)
-                   when "complexContent"
-                     ComplexContent.new(@node)
-                   when "sequence"
-                     Sequence.new(@node)
-                   else
-                     raise "don't know what to do for element: %s..." % cs.first.name
-                   end
-                 end
-               end
-  end
-
-  def dump_init(io)
-    init_type io, name, name
-  end
-
-  def dump(io)
-    io.print "type %s struct {\n" % name
-    klass.dump(io) if klass
-    io.print "}\n\n"
-  end
-
-  def peek
-    Peek.register(name).klass = klass
-    klass.peek if klass
-  end
-end
-
-class Schema
-  include Test::Unit::Assertions
-
-  attr_accessor :namespace
-
-  def initialize(xml)
-    @xml = Nokogiri::XML.parse(xml)
-    @namespace = @xml.root.attr("targetNamespace").split(":", 2)[1]
-    @xml
-  end
-
-  # We have some assumptions about structure, make sure they hold.
-  def validate_assumptions!
-    # Every enumeration is part of a restriction
-    @xml.xpath(".//xsd:enumeration").each do |n|
-      assert_equal "restriction", n.parent.name
-    end
-
-    # See type == enum
-    @xml.xpath(".//xsd:restriction").each do |n|
-      # Every restriction has type xsd:string (it's an enum)
-      assert_equal "xsd:string", n["base"]
-
-      # Every restriction is part of a simpleType
-      assert_equal "simpleType", n.parent.name
-
-      # Every restriction is alone
-      assert_equal 1, n.parent.element_children.size
-    end
-
-    # See type == complex_content
-    @xml.xpath(".//xsd:complexContent").each do |n|
-      # complexContent is child of complexType
-      assert_equal "complexType", n.parent.name
-
-    end
-
-    # See type == complex_type
-    @xml.xpath(".//xsd:complexType").each do |n|
-      cc = n.element_children
-
-      # OK to have an empty complexType
-      next if cc.size == 0
-
-      # Require 1 element otherwise
-      assert_equal 1, cc.size
-
-      case cc.first.name
-      when "complexContent"
-        # complexContent has 1 "extension" element
-        cc = cc.first.element_children
-        assert_equal 1, cc.size
-        assert_equal "extension", cc.first.name
-
-        # extension has 1 "sequence" element
-        ec = cc.first.element_children
-        assert_equal 1, ec.size
-        assert_equal "sequence", ec.first.name
-
-        # sequence has N "element" elements
-        sc = ec.first.element_children
-        assert sc.all? { |e| e.name == "element" }
-      when "simpleContent"
-        # simpleContent has 1 "extension" element
-        cc = cc.first.element_children
-        assert_equal 1, cc.size
-        assert_equal "extension", cc.first.name
-
-        # extension has 1 or more "attribute" elements
-        ec = cc.first.element_children
-        assert_not_equal 0, ec.size
-        assert_equal "attribute", ec.first.name
-      when "sequence"
-        # sequence has N "element" elements
-        sc = cc.first.element_children
-        assert sc.all? { |e| e.name == "element" }
-      else
-        raise "unknown element: %s" % cc.first.name
-      end
-    end
-
-    imports.each do |i|
-      i.validate_assumptions!
-    end
-
-    includes.each do |i|
-      i.validate_assumptions!
-    end
-  end
-
-  def types
-    return to_enum(:types) unless block_given?
-
-    if $target != self.namespace
-      return
-    end
-
-    imports.each do |i|
-      i.types do |t|
-        yield t
-      end
-    end
-
-    includes.each do |i|
-      i.types do |t|
-        yield t
-      end
-    end
-
-    @xml.root.children.each do |n|
-      case n.class.to_s
-      when "Nokogiri::XML::Text"
-        next
-      when "Nokogiri::XML::Element"
-        case n.name
-        when "include", "import"
-          next
-        when "element"
-          e = Element.new(n)
-          if e.has_type? && e.vim_type?
-            if e.ns == $target
-              yield e
-            end
-          else
-            yield e
-          end
-        when "simpleType"
-          yield SimpleType.new(n)
-        when "complexType"
-          yield ComplexType.new(n)
-        else
-          raise "unknown child: %s" % n.name
-        end
-      else
-        raise "unknown type: %s" % n.class
-      end
-    end
-  end
-
-  def imports
-    @imports ||= @xml.root.xpath(".//xmlns:import").map do |n|
-      Schema.new(WSDL.read n["schemaLocation"])
-    end
-  end
-
-  def includes
-    @includes ||= @xml.root.xpath(".//xmlns:include").map do |n|
-      Schema.new(WSDL.read n["schemaLocation"])
-    end
-  end
-end
-
-
-class Operation
-  include Test::Unit::Assertions
-
-  def initialize(wsdl, operation_node)
-    @wsdl = wsdl
-    @operation_node = operation_node
-  end
-
-  def name
-    @operation_node["name"]
-  end
-
-  def namespace
-    type = @operation_node.at_xpath("./xmlns:input").attr("message")
-    keep_ns(type)
-  end
-
-  def remove_ns(x)
-    ns, x = x.split(":", 2)
-    if ! valid_ns? ns
-        raise
-    end
-    x
-  end
-
-  def keep_ns(x)
-    ns, x = x.split(":", 2)
-    if ! valid_ns? ns
-        raise
-    end
-    ns
-  end
-
-  def find_type_for(type)
-    type = remove_ns(type)
-
-    message = @wsdl.message(type)
-    assert_not_nil message
-
-    part = message.at_xpath("./xmlns:part")
-    assert_not_nil message
-
-    remove_ns(part["element"])
-  end
-
-  def input
-    type = @operation_node.at_xpath("./xmlns:input").attr("message")
-    find_type_for(type)
-  end
-
-  def go_input
-    "types." + input
-  end
-
-  def output
-    type = @operation_node.at_xpath("./xmlns:output").attr("message")
-    find_type_for(type)
-  end
-
-  def go_output
-    "types." + output
-  end
-
-  def dump(io)
-    io.print <<EOS
-  type #{name}Body struct{
-    Req *#{go_input} `xml:"urn:#{namespace} #{input},omitempty"`
-    Res *#{go_output} `xml:"urn:#{namespace} #{output},omitempty"`
-    Fault_ *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-  }
-
-  func (b *#{name}Body) Fault() *soap.Fault { return b.Fault_ }
-
-EOS
-
-    io.print "func %s(ctx context.Context, r soap.RoundTripper, req *%s) (*%s, error) {\n" % [name, go_input, go_output]
-    io.print <<EOS
-  var reqBody, resBody #{name}Body
-
-  reqBody.Req = req
-
-  if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-    return nil, err
-  }
-
-  return resBody.Res, nil
-EOS
-
-    io.print "}\n\n"
-  end
-end
-
-class WSDL
-  attr_reader :xml
-
-  PATH = File.expand_path("../sdk", __FILE__)
-
-  def self.read(file)
-    File.open(File.join(PATH, file))
-  end
-
-  def initialize(xml)
-    @xml = Nokogiri::XML.parse(xml)
-    $target = @xml.root["targetNamespace"].split(":", 2)[1]
-
-    unless $namespaces.include? $target
-      $namespaces.push $target
-    end
-  end
-
-  def validate_assumptions!
-    schemas.each do |s|
-      s.validate_assumptions!
-    end
-  end
-
-  def types(&blk)
-    return to_enum(:types) unless block_given?
-
-    schemas.each do |s|
-      s.types(&blk)
-    end
-  end
-
-  def schemas
-    @schemas ||= @xml.xpath('.//xmlns:types/xsd:schema').map do |n|
-      Schema.new(n.to_xml)
-    end
-  end
-
-  def operations
-    @operations ||= @xml.xpath('.//xmlns:portType/xmlns:operation').map do |o|
-      Operation.new(self, o)
-    end
-  end
-
-  def message(type)
-    @messages ||= begin
-                    h = {}
-                    @xml.xpath('.//xmlns:message').each do |n|
-                      h[n.attr("name")] = n
-                    end
-                    h
-                  end
-
-    @messages[type]
-  end
-
-  def peek
-    types.
-      sort_by { |x| x.name }.
-      uniq { |x| x.name }.
-      select { |x| x.name[0] == x.name[0].upcase }. # Only capitalized methods for now...
-      each { |e| e.peek() }
-  end
-
-  def self.header(name)
-    return <<EOF
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package #{name}
-
-EOF
-  end
-end
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/.gitignore b/installer/vendor/github.com/vmware/govmomi/govc/.gitignore
deleted file mode 100644
index 0bbfe4231d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/govc*
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md b/installer/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md
deleted file mode 100644
index 971ab141db..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/CHANGELOG.md
+++ /dev/null
@@ -1,292 +0,0 @@
-# changelog
-
-### 0.15.0 (2017-06-19)
-
-* Remove FileAttr flags from guest.chmod command,
-  chown functionality moved to its own command
-
-* Add optional path to guest mktemp file methods
-
-* Add guest.touch and guest.mv commands
-
-* Add host.shutdown command
-
-* Add option flags to host.autostart.add
-
-* Add object.method command
-
-* Add options.{ls,set} commands
-
-### 0.14.0 (2017-04-08)
-
-* Add find command
-
-* Add '-wait' option to vm.ip to allow a non-waiting query
-
-* Add datastore.disk.info command
-
-* Add bash completion script
-
-* Add metric commands: change, ls, info, sample, reset, interval.change, interval.info
-
-### 0.13.0 (2017-03-02)
-
-* Add vm.guest.tools command
-
-* Add datastore.disk.create command
-
-* Add datastore.vsan.dom.ls and datastore.vsan.dom.rm commands
-
-* Add vm.disk.change command
-
-* Add vm.rdm attach and ls commands
-
-* Add '-n' option to vm.ip to wait for a specific NIC
-
-* Add '-annotation' option to vm.create and vm.clone commands
-
-* Add '-sync-time-with-host-' flag to vm.change command
-
-* Add object.collect command (MOB for cli + Emacs)
-
-### 0.12.1 (2016-12-19)
-
-* Add '-f' flag to logs command
-
-* Add storage support to vm.migrate
-
-* Add support for file backed serialport devices
-
-### 0.12.0 (2016-12-01)
-
-* Add optional '-host' flag to datastore download/tail commands
-
-* Support InjectOvfEnv without PowerOn when importing
-
-* Support stdin as import options source
-
-* Add basic NVME controller support
-
-### 0.11.4 (2016-11-15)
-
-* Add role create, remove, update, ls and usage commands
-
-### 0.11.3 (2016-11-08)
-
-* Add `-product-version` flag to dvs.create
-
-* datastore.tail -f will exit without error if the file no longer exists
-
-### 0.11.2 (2016-11-01)
-
-* Add object.reload command
-
-* Add ESX 5.5 support to host.account commands
-
-### 0.11.1 (2016-10-27)
-
-* Add support for VirtualApp in pool.change command
-
-### 0.11.0 (2016-10-25)
-
-* Add object.destroy and object.rename commands
-
-* Remove datacenter.destroy command (use object.destroy instead)
-
-* Remove folder.destroy command (use object.destroy instead)
-
-* Rename folder.move_into -> object.mv
-
-* Add dvs.portgroup.change command
-
-* Add vlan flag to dvs.portgroup.add command
-
-### 0.10.0 (2016-10-20)
-
-* Add generated govc/USAGE.md
-
-* Add host.date info and change commands
-
-* Add session ls and rm commands
-
-* Add `-tls-known-hosts` and `-tls-ca-certs` flags
-
-* Add host.cert commands : info, csr, import
-
-* Add about.cert command (similar to the Chrome Certificate Viewer)
-
-* Add `-vspc-proxy` flag to device.serial.connect command
-
-* Rename license.list -> license.ls, license.assigned.list -> license.assigned.ls
-
-### 0.9.0 (2016-09-09)
-
-* Add `-R` option to datastore.ls
-
-* Add datastore.tail command
-
-* Add vm.migrate command
-
-* Add govc vm.register and vm.unregister commands
-
-* Add govc vm snapshot commands: create, remove, revert, tree
-
-* Add device.usb.add command
-
-* Support stdin/stdout in datastore upload/download
-
-* Add host.portgroup.change command
-
-* Add host.portgroup.info command
-
-* Add HostNetworkPolicy to host.vswitch.info
-
-* Add `-json` support to host.vswitch.info command
-
-* Support instance uuid in SearchFlag
-
-* Add `-json` support to esxcli command
-
-* Add `-unclaimed` flag to host.storage.info command
-
-* Support Network mapping in import.{ova,ovf} commands
-
-### 0.8.0 (2016-06-30)
-
-* If username (`-u` / GOVC_USERNAME) is empty, attempt login via local ticket (Workstation)
-
-* Add StoragePod support to govc folder.create
-
-* Add `-folder` flag to datacenter.create command
-
-* Logout when session persistence is disabled
-
-* Add `-L` flag to ls command for resolving by managed object reference
-
-* Add `-i` flag to ls command for listing the managed object reference
-
-* Add vm.markasvm command
-
-* Add vm.markastemplate command
-
-### 0.7.1 (2016-06-03)
-
-* Fix datastore.{upload,download} against VirtualCenter
-
-### 0.7.0 (2016-06-02)
-
-* Add `-require` flag to version command
-
-* Add support for local type in the datastore.create command
-
-* Add `-namespace` option to datastore.mkdir and datastore.rm to create/remove namespaces on VSANs
-
-* Add host.service command
-
-* Add host.storage.mark command
-
-* Add `-rescan` option to host.storage.info command
-
-### 0.6.0 (2016-04-29)
-
-* Add folder commands: info, create, destroy, rename, moveinto
-
-* Add datastore.info command
-
-* Add `-a` and `-v4` flags to vm.ip command
-
-* Add host.account.{create,update,remove} commands
-
-* Add env command
-
-* Add vm.clone command
-
-### 0.5.0 (2016-03-30)
-
-* Add dvs.portgroup.info command
-
-* Add `-folder` flag to vm.create command
-
-* Add `-dump` flag to OutputFlag
-
-* Add `-f` flag to events command
-
-* Add `-mode` flag to vm.disk.create command
-
-* Add `-net` flag to device.info command
-
-* Add `-eager` and `-thick` options to vm.create command
-
-### 0.4.0 (2016-02-26)
-
-* Add support for placement in datastore cluster to vm.create command
-
-* Add support for creating new disks in vm.create command
-
-* Add `-p` and `-a` options to govc datastore.ls command
-
-### 0.3.0 (2016-01-16)
-
-* Add permissions.{ls,set,remove} commands
-
-* Add datastore.{create,remove} commands.
-  The new create command supports both creating NAS and VMFS datastores.
-
-* Add dvs.{create,add} and dvs.portgroup.add commands
-
-* Add host.vnic.{service,info} commands
-
-* Add cluster.{create,change,add} commands
-
-* Add host.{disconnect,reconnect,remove,maintenance.enter,maintenance.exit} commands
-
-* Add license.decode, license.assigned.list and license.assign commands
-
-* Add firewall.ruleset.find command
-
-* Add logs, logs.ls and logs.download commands
-
-* Add support for LoginExtensionByCertificate with new `-cert` and `-key` flags
-
-* Add govc extension.{info,register,unregister,setcert} commands
-
-* Add govc vapp.{info,destroy,power} commands
-
-### 0.2.0 (2015-09-15)
-
-* The `vm.power` guest `-s` and `-r` options will fallback to hard `-off` / `-reset` if tools is unavailable and `-force` flag is given
-
-* Add `PowerOn, InjectOvfEnv, WaitForIP` options to `import.ovf` and `import.ova` option spec file
-
-* Add `import.spec` to produce an example json document
-
-* Add `-options` to `import.ovf` and `import.ova`
-
-* Add `-folder` to `import.ovf` and `import.ova`
-
-* Add `fields` command to manage custom fields
-
-* Add `datastore.info` command
-
-* Add `events` command
-
-* Add `-net.address` (Hardware Address) option to `vm.change` and `vm.create`
-
-* Add `host.add` command to add host to datacenter.
-
-* Add `GOVC_USERNAME` and `GOVC_PASSWORD` to allow overriding username and/or
-  password (used when they contain special characters that prevent them from
-  being embedded in the URL).
-
-* Add `-e' (ExtraConfig) option to `vm.change` and `vm.info`
-
-* Retry twice on temporary network errors.
-
-* Add `host.autostart` commands to manage VM autostart.
-
-* Add `-persist-session` flag to control whether or not the session is
-  persisted to disk (defaults to true).
-
-### 0.1.0 (2015-03-17)
-
-Prior to this version the changes to govc's command set were not documented.
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/README.md b/installer/vendor/github.com/vmware/govmomi/govc/README.md
deleted file mode 100644
index a1b27d8084..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/README.md
+++ /dev/null
@@ -1,176 +0,0 @@
-# govc
-
-govc is a vSphere CLI built on top of govmomi.
-
-## Installation
-
-You can find prebuilt govc binaries on the [releases page](https://github.com/vmware/govmomi/releases).
-
-Download and install a binary locally like this:
-
-```sh
-curl -L $URL_TO_BINARY | gunzip > /usr/local/bin/govc
-chmod +x /usr/local/bin/govc
-```
-
-### Source
-
-You can install the latest govc version from source if you have the Go toolchain installed.
-
-```sh
-go get -u github.com/vmware/govmomi/govc
-```
-
-(make sure `$GOPATH/bin` is in your `PATH`)
-
-## Usage
-
-For the complete list of commands and flags, refer to the [USAGE](USAGE.md) document.
-
-Common flags include:
-
-* `-u`: ESXi or vCenter URL (ex: `user:pass@host`)
-* `-debug`: Trace requests and responses (to `~/.govmomi/debug`)
-
-Managed entities can be referred to by their absolute path or by their relative
-path. For example, when specifying a datastore to use for a subcommand, you can
-either specify it as `/mydatacenter/datastore/mydatastore`, or as
-`mydatastore`. If you're not sure about the name of the datastore, or even the
-full path to the datastore, you can specify a pattern to match. Both
-`/*center/*/my*` (absolute) and `my*store` (relative) will resolve to the same
-datastore, given there are no other datastores that match those globs.
-
-The relative path in this example can only be used if the command can
-umambigously resolve a datacenter to use as origin for the query. If no
-datacenter is specified, govc defaults to the only datacenter, if there is only
-one. The datacenter itself can be specified as a pattern as well, enabling the
-following arguments: `-dc='my*' -ds='*store'`. The datastore pattern is looked
-up and matched relative to the datacenter which itself is specified as a
-pattern.
-
-Besides specifying managed entities as arguments, they can also be specified
-using environment variables. The following environment variables are used by govc
-to set defaults:
-
-* `GOVC_URL`: URL of ESXi or vCenter instance to connect to.
-
-    The URL scheme defaults to `https` and the URL path defaults to `/sdk`.
-    This means that specifying `user:pass@host` is equivalent to
-    `https://user:pass@host/sdk`.
-
-    If password include special characters like `#` or `:` you can use
-    `GOVC_USERNAME` and `GOVC_PASSWORD` to have a simple `GOVC_URL`
-
-    When using govc against VMware Workstation, GOVC_URL can be set to "localhost"
-    without a user or pass, in which case local ticket based authentication is used.
-
-* `GOVC_USERNAME`: USERNAME to use if not specified in GOVC_URL.
-
-* `GOVC_PASSWORD`: PASSWORD to use if not specified in GOVC_URL.
-
-* `GOVC_TLS_CA_CERTS`: Override system root certificate authorities.
-
-    ``` console
-    $ export GOVC_TLS_CA_CERTS=~/.govc_ca.crt
-    # Use path separator to specify multiple files:
-    $ export GOVC_TLS_CA_CERTS=~/ca-certificates/bar.crt:~/ca-certificates/foo.crt
-    ```
-
-* `GOVC_TLS_KNOWN_HOSTS`: File(s) for thumbprint based certificate verification.
-
-    ``` console
-    # Thumbprint based verification can be used in addition to or as an alternative to
-    $ GOVC_TLS_CA_CERTS for self-signed certificates.  Example:
-    $ export GOVC_TLS_KNOWN_HOSTS=~/.govc_known_hosts
-    $ govc about.cert -u host -k -thumbprint | tee -a $GOVC_TLS_KNOWN_HOSTS
-    $ govc about -u user:pass@host
-    ```
-
-* `GOVC_TLS_HANDSHAKE_TIMEOUT`: Limits the time spent performing the TLS handshake.
-
-* `GOVC_INSECURE`: Disable certificate verification.
-
-    This option sets Go's `tls.Config.InsecureSkipVerify` flag and is false by default.
-    Quoting https://golang.org/pkg/crypto/tls/#Config:
-    > `InsecureSkipVerify` controls whether a client verifies the
-    > server's certificate chain and host name.
-    >
-    > If `InsecureSkipVerify` is true, TLS accepts any certificate
-    > presented by the server and any host name in that certificate.
-    >
-    > In this mode, TLS is susceptible to man-in-the-middle attacks.
-    > This should be used only for testing.
-
-* `GOVC_DATACENTER`
-
-* `GOVC_DATASTORE`
-
-* `GOVC_NETWORK`
-
-* `GOVC_RESOURCE_POOL`
-
-* `GOVC_HOST`
-
-* `GOVC_GUEST_LOGIN`: Guest credentials for guest operations
-
-* `GOVC_VIM_NAMESPACE`: Vim namespace defaults to `urn:vim25`
-
-* `GOVC_VIM_VERSION`: Vim version defaults to `6.0`
-
-## Platform specific notes
-
-### MSYS2 (Windows)
-
-Inventory path arguments with a leading '/' are subject
-to [Posix path conversion](http://www.mingw.org/wiki/Posix_path_conversion).
-
-## Examples
-
-Several examples are embedded in the govc command [help](USAGE.md)
-
-* [Upload ssh public key to a VM](examples/lib/ssh.sh)
-
-* [Create a CoreOS VM](https://github.com/vmware/govmomi/blob/master/toolbox/toolbox-test.sh)
-
-* [Create a Debian VM](https://github.com/kubernetes/kubernetes/tree/master/cluster/vsphere)
-
-* [Create a Windows VM](https://github.com/dougm/govc-windows-box/blob/master/provision-esx.sh)
-
-* [Create an ESX VM](../scripts/vcsa/create-esxi-vm.sh)
-
-* [Create a vCenter VM](../scripts/vcsa/create-vcsa-vm.sh)
-
-* [Create a Cluster](../scripts/vcsa/create-cluster.sh)
-
-## Status
-
-Changes to the cli are subject to [semantic versioning](http://semver.org).
-
-Refer to the [CHANGELOG](CHANGELOG.md) for version to version changes.
-
-When new govc commands or flags are added, the PATCH version will be incremented.  This enables you to require a minimum
-version from within a script, for example:
-
-```
-govc version -require 0.14
-```
-
-## Projects using govc
-
-* [Emacs govc package](./emacs)
-
-* [Kubernetes vSphere Provider](https://github.com/kubernetes/kubernetes/tree/master/cluster/vsphere)
-
-* [VMware VIC Engine](https://github.com/vmware/vic)
-
-* [vSphere Docker Volume Service](https://github.com/vmware/docker-volume-vsphere)
-
-* [golang/build](https://github.com/golang/build)
-
-## Related projects
-
-* [rvc](https://github.com/vmware/rvc)
-
-## License
-
-govc is available under the [Apache 2 license](../LICENSE).
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/USAGE.md b/installer/vendor/github.com/vmware/govmomi/govc/USAGE.md
deleted file mode 100644
index 9ed32347da..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/USAGE.md
+++ /dev/null
@@ -1,3058 +0,0 @@
-# govc usage
-
-This document is generated from `govc -h` and `govc $cmd -h` commands.
-
-The following common options are filtered out in this document,
-but appear via `govc $cmd -h`:
-
-```
-  -cert=                    Certificate [GOVC_CERTIFICATE]
-  -debug=false              Store debug logs [GOVC_DEBUG]
-  -dump=false               Enable output dump
-  -json=false               Enable JSON output
-  -k=false                  Skip verification of server certificate [GOVC_INSECURE]
-  -key=                     Private key [GOVC_PRIVATE_KEY]
-  -persist-session=true     Persist session to disk [GOVC_PERSIST_SESSION]
-  -tls-ca-certs=            TLS CA certificates file [GOVC_TLS_CA_CERTS]
-  -tls-known-hosts=         TLS known hosts file [GOVC_TLS_KNOWN_HOSTS]
-  -u=                       ESX or vCenter URL [GOVC_URL]
-  -vim-namespace=urn:vim25  Vim namespace [GOVC_VIM_NAMESPACE]
-  -vim-version=6.0          Vim version [GOVC_VIM_VERSION]
-  -dc=                      Datacenter [GOVC_DATACENTER]
-  -host.dns=                Find host by FQDN
-  -host.ip=                 Find host by IP address
-  -host.ipath=              Find host by inventory path
-  -host.uuid=               Find host by UUID
-  -vm.dns=                  Find VM by FQDN
-  -vm.ip=                   Find VM by IP address
-  -vm.ipath=                Find VM by inventory path
-  -vm.path=                 Find VM by path to .vmx file
-  -vm.uuid=                 Find VM by UUID
-```
-
-## about
-
-```
-Usage: govc about [OPTIONS]
-
-Display About info for HOST.
-
-System information including the name, type, version, and build number.
-
-Examples:
-  govc about
-  govc about -json | jq -r .About.ProductLineId
-
-Options:
-  -l=false                  Include service content
-```
-
-## about.cert
-
-```
-Usage: govc about.cert [OPTIONS]
-
-Display TLS certificate info for HOST.
-
-If the HOST certificate cannot be verified, about.cert will return with exit code 60 (as curl does).
-If the '-k' flag is provided, about.cert will return with exit code 0 in this case.
-The SHA1 thumbprint can also be used as '-thumbprint' for the 'host.add' and 'cluster.add' commands.
-
-Examples:
-  govc about.cert -k -json | jq -r .ThumbprintSHA1
-  govc about.cert -k -show | sudo tee /usr/local/share/ca-certificates/host.crt
-  govc about.cert -k -thumbprint | tee -a ~/.govmomi/known_hosts
-
-Options:
-  -show=false               Show PEM encoded server certificate only
-  -thumbprint=false         Output host hash and thumbprint only
-```
-
-## cluster.add
-
-```
-Usage: govc cluster.add [OPTIONS]
-
-Add HOST to CLUSTER.
-
-The host is added to the cluster specified by the 'cluster' flag.
-
-Examples:
-  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
-  govc cluster.add -cluster ClusterA -hostname host.example.com -username root -password pass -thumbprint $thumbprint
-  govc cluster.add -cluster ClusterB -hostname 10.0.6.1 -username root -password pass -noverify
-
-Options:
-  -cluster=*                Path to cluster
-  -connect=true             Immediately connect to host
-  -force=false              Force when host is managed by another VC
-  -hostname=                Hostname or IP address of the host
-  -license=                 Assign license key
-  -noverify=false           Accept host thumbprint without verification
-  -password=                Password of administration account on the host
-  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
-  -username=                Username of administration account on the host
-```
-
-## cluster.change
-
-```
-Usage: govc cluster.change [OPTIONS] CLUSTER...
-
-Change configuration of the given clusters.
-
-Examples:
-  govc cluster.change -drs-enabled -vsan-enabled -vsan-autoclaim ClusterA
-  govc cluster.change -drs-enabled=false ClusterB
-
-Options:
-  -drs-enabled=<nil>        Enable DRS
-  -drs-mode=                DRS behavior for virtual machines: manual, partiallyAutomated, fullyAutomated
-  -ha-enabled=<nil>         Enable HA
-  -vsan-autoclaim=<nil>     Autoclaim storage on cluster hosts
-  -vsan-enabled=<nil>       Enable vSAN
-```
-
-## cluster.create
-
-```
-Usage: govc cluster.create [OPTIONS] CLUSTER
-
-Create CLUSTER in datacenter.
-
-The cluster is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the host folder in the specified or default datacenter.
-
-Examples:
-  govc cluster.create ClusterA
-  govc cluster.create -folder /dc2/test-folder ClusterB
-
-Options:
-  -folder=                  Inventory folder [GOVC_FOLDER]
-```
-
-## datacenter.create
-
-```
-Usage: govc datacenter.create [OPTIONS] NAME...
-
-Options:
-  -folder=                  Inventory folder [GOVC_FOLDER]
-```
-
-## datacenter.info
-
-```
-Usage: govc datacenter.info [OPTIONS] [PATH]...
-
-Options:
-```
-
-## datastore.cp
-
-```
-Usage: govc datastore.cp [OPTIONS] SRC DST
-
-Copy SRC to DST on DATASTORE.
-
-Examples:
-  govc datastore.cp foo/foo.vmx foo/foo.vmx.old
-  govc datastore.cp -f my.vmx foo/foo.vmx
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -f=false                  If true, overwrite any identically named file at the destination
-```
-
-## datastore.create
-
-```
-Usage: govc datastore.create [OPTIONS] HOST...
-
-Create datastore on HOST.
-
-Examples:
-  govc datastore.create -type nfs -name nfsDatastore -remote-host 10.143.2.232 -remote-path /share cluster1
-  govc datastore.create -type vmfs -name vmfsDatastore -disk=mpx.vmhba0:C0:T0:L0 cluster1
-  govc datastore.create -type local -name localDatastore -path /var/datastore host1
-
-Options:
-  -disk=                    Canonical name of disk (VMFS only)
-  -force=false              Ignore DuplicateName error if datastore is already mounted on a host
-  -host=                    Host system [GOVC_HOST]
-  -mode=readOnly            Access mode for the mount point (readOnly|readWrite)
-  -name=                    Datastore name
-  -password=                Password to use when connecting (CIFS only)
-  -path=                    Local directory path for the datastore (local only)
-  -remote-host=             Remote hostname of the NAS datastore
-  -remote-path=             Remote path of the NFS mount point
-  -type=                    Datastore type (NFS|NFS41|CIFS|VMFS|local)
-  -username=                Username to use when connecting (CIFS only)
-```
-
-## datastore.disk.create
-
-```
-Usage: govc datastore.disk.create [OPTIONS] VMDK
-
-Create VMDK on DS.
-
-Examples:
-  govc datastore.mkdir disks
-  govc datastore.disk.create -size 24G disks/disk1.vmdk
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -size=10.0GB              Size of new disk
-```
-
-## datastore.disk.info
-
-```
-Usage: govc datastore.disk.info [OPTIONS] VMDK
-
-Query VMDK info on DS.
-
-Examples:
-  govc datastore.disk.info disks/disk1.vmdk
-
-Options:
-  -c=false                  Chain format
-  -d=false                  Include datastore in output
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -p=true                   Include parents
-```
-
-## datastore.download
-
-```
-Usage: govc datastore.download [OPTIONS] SOURCE DEST
-
-Copy SOURCE from DS to DEST on the local system.
-
-If DEST name is "-", source is written to stdout.
-
-Examples:
-  govc datastore.download vm-name/vmware.log ./local.log
-  govc datastore.download vm-name/vmware.log - | grep -i error
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -host=                    Host system [GOVC_HOST]
-```
-
-## datastore.info
-
-```
-Usage: govc datastore.info [OPTIONS] [PATH]...
-
-Options:
-```
-
-## datastore.ls
-
-```
-Usage: govc datastore.ls [OPTIONS] [FILE]...
-
-Options:
-  -R=false                  List subdirectories recursively
-  -a=false                  Do not ignore entries starting with .
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -l=false                  Long listing format
-  -p=false                  Append / indicator to directories
-```
-
-## datastore.mkdir
-
-```
-Usage: govc datastore.mkdir [OPTIONS] DIRECTORY
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -namespace=false          Return uuid of namespace created on vsan datastore
-  -p=false                  Create intermediate directories as needed
-```
-
-## datastore.mv
-
-```
-Usage: govc datastore.mv [OPTIONS] SRC DST
-
-Move SRC to DST on DATASTORE.
-
-Examples:
-  govc datastore.mv foo/foo.vmx foo/foo.vmx.old
-  govc datastore.mv -f my.vmx foo/foo.vmx
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -f=false                  If true, overwrite any identically named file at the destination
-```
-
-## datastore.remove
-
-```
-Usage: govc datastore.remove [OPTIONS] HOST...
-
-Remove datastore from HOST.
-
-Examples:
-  govc datastore.remove -ds nfsDatastore cluster1
-  govc datastore.remove -ds nasDatastore host1 host2 host3
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -host=                    Host system [GOVC_HOST]
-```
-
-## datastore.rm
-
-```
-Usage: govc datastore.rm [OPTIONS] FILE
-
-Remove FILE from DATASTORE.
-
-Examples:
-  govc datastore.rm vm/vmware.log
-  govc datastore.rm vm
-  govc datastore.rm -f images/base.vmdk
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -f=false                  Force; ignore nonexistent files and arguments
-  -namespace=false          Path is uuid of namespace on vsan datastore
-  -t=true                   Use file type to choose disk or file manager
-```
-
-## datastore.tail
-
-```
-Usage: govc datastore.tail [OPTIONS] PATH
-
-Output the last part of datastore files.
-
-Examples:
-  govc datastore.tail -n 100 vm-name/vmware.log
-  govc datastore.tail -n 0 -f vm-name/vmware.log
-
-Options:
-  -c=-1                     Output the last NUM bytes
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -f=false                  Output appended data as the file grows
-  -host=                    Host system [GOVC_HOST]
-  -n=10                     Output the last NUM lines
-```
-
-## datastore.upload
-
-```
-Usage: govc datastore.upload [OPTIONS] SOURCE DEST
-
-Copy SOURCE from the local system to DEST on DS.
-
-If SOURCE name is "-", read source from stdin.
-
-Examples:
-  govc datastore.upload -ds datastore1 ./config.iso vm-name/config.iso
-  genisoimage ... | govc datastore.upload -ds datastore1 - vm-name/config.iso
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-```
-
-## datastore.vsan.dom.ls
-
-```
-Usage: govc datastore.vsan.dom.ls [OPTIONS] [UUID]...
-
-List vSAN DOM objects in DS.
-
-Examples:
-  govc datastore.vsan.dom.ls
-  govc datastore.vsan.dom.ls -ds vsanDatastore -l
-  govc datastore.vsan.dom.ls -l d85aa758-63f5-500a-3150-0200308e589c
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -l=false                  Long listing
-  -o=false                  List orphan objects
-```
-
-## datastore.vsan.dom.rm
-
-```
-Usage: govc datastore.vsan.dom.rm [OPTIONS] UUID...
-
-Remove vSAN DOM objects in DS.
-
-Examples:
-  govc datastore.vsan.dom.rm d85aa758-63f5-500a-3150-0200308e589c
-  govc datastore.vsan.dom.rm -f d85aa758-63f5-500a-3150-0200308e589c
-  govc datastore.vsan.dom.ls -o | xargs govc datastore.vsan.dom.rm
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -f=false                  Force delete
-  -v=false                  Print deleted UUIDs to stdout, failed to stderr
-```
-
-## device.boot
-
-```
-Usage: govc device.boot [OPTIONS]
-
-Configure VM boot settings.
-
-Examples:
-  govc device.boot -vm $vm -delay 1000 -order floppy,cdrom,ethernet,disk
-
-Options:
-  -delay=0                  Delay in ms before starting the boot sequence
-  -order=                   Boot device order
-  -retry=false              If true, retry boot after retry-delay
-  -retry-delay=0            Delay in ms before a boot retry
-  -setup=false              If true, enter BIOS setup on next boot
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.cdrom.add
-
-```
-Usage: govc device.cdrom.add [OPTIONS]
-
-Add CD-ROM device to VM.
-
-Examples:
-  govc device.cdrom.add -vm $vm
-  govc device.ls -vm $vm | grep ide-
-  govc device.cdrom.add -vm $vm -controller ide-200
-  govc device.info cdrom-*
-
-Options:
-  -controller=              IDE controller name
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.cdrom.eject
-
-```
-Usage: govc device.cdrom.eject [OPTIONS]
-
-Eject media from CD-ROM device.
-
-If device is not specified, the first CD-ROM device is used.
-
-Examples:
-  govc device.cdrom.eject -vm vm-1
-  govc device.cdrom.eject -vm vm-1 -device floppy-1
-
-Options:
-  -device=                  CD-ROM device name
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.cdrom.insert
-
-```
-Usage: govc device.cdrom.insert [OPTIONS] ISO
-
-Insert media on datastore into CD-ROM device.
-
-If device is not specified, the first CD-ROM device is used.
-
-Examples:
-  govc device.cdrom.insert -vm vm-1 -device cdrom-3000 images/boot.iso
-
-Options:
-  -device=                  CD-ROM device name
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.connect
-
-```
-Usage: govc device.connect [OPTIONS] DEVICE...
-
-Connect DEVICE on VM.
-
-Examples:
-  govc device.connect -vm $name cdrom-3000
-
-Options:
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.disconnect
-
-```
-Usage: govc device.disconnect [OPTIONS] DEVICE...
-
-Disconnect DEVICE on VM.
-
-Examples:
-  govc device.disconnect -vm $name cdrom-3000
-
-Options:
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.floppy.add
-
-```
-Usage: govc device.floppy.add [OPTIONS]
-
-Add floppy device to VM.
-
-Examples:
-  govc device.floppy.add -vm $vm
-  govc device.info floppy-*
-
-Options:
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.floppy.eject
-
-```
-Usage: govc device.floppy.eject [OPTIONS]
-
-Eject image from floppy device.
-
-If device is not specified, the first floppy device is used.
-
-Examples:
-  govc device.floppy.eject -vm vm-1
-
-Options:
-  -device=                  Floppy device name
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.floppy.insert
-
-```
-Usage: govc device.floppy.insert [OPTIONS] IMG
-
-Insert IMG on datastore into floppy device.
-
-If device is not specified, the first floppy device is used.
-
-Examples:
-  govc device.floppy.insert -vm vm-1 vm-1/config.img
-
-Options:
-  -device=                  Floppy device name
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.info
-
-```
-Usage: govc device.info [OPTIONS] [DEVICE]...
-
-Device info for VM.
-
-Examples:
-  govc device.info -vm $name
-  govc device.info -vm $name disk-*
-  govc device.info -vm $name -json ethernet-0 | jq -r .Devices[].MacAddress
-
-Options:
-  -net=                     Network [GOVC_NETWORK]
-  -net.adapter=e1000        Network adapter type
-  -net.address=             Network hardware address
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.ls
-
-```
-Usage: govc device.ls [OPTIONS]
-
-List devices for VM.
-
-Examples:
-  govc device.ls -vm $name
-
-Options:
-  -boot=false               List devices configured in the VM's boot options
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.remove
-
-```
-Usage: govc device.remove [OPTIONS] DEVICE...
-
-Remove DEVICE from VM.
-
-Examples:
-  govc device.remove -vm $name cdrom-3000
-  govc device.remove -vm $name -keep disk-1000
-
-Options:
-  -keep=false               Keep files in datastore
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.scsi.add
-
-```
-Usage: govc device.scsi.add [OPTIONS]
-
-Add SCSI controller to VM.
-
-Examples:
-  govc device.scsi.add -vm $vm
-  govc device.scsi.add -vm $vm -type pvscsi
-  govc device.info -vm $vm {lsi,pv}*
-
-Options:
-  -hot=false                Enable hot-add/remove
-  -sharing=noSharing        SCSI sharing
-  -type=lsilogic            SCSI controller type (lsilogic|buslogic|pvscsi|lsilogic-sas)
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.serial.add
-
-```
-Usage: govc device.serial.add [OPTIONS]
-
-Add serial port to VM.
-
-Examples:
-  govc device.serial.add -vm $vm
-  govc device.info -vm $vm serialport-*
-
-Options:
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.serial.connect
-
-```
-Usage: govc device.serial.connect [OPTIONS] URI
-
-Connect service URI to serial port.
-
-If "-" is given as URI, connects file backed device with file name of
-device name + .log suffix in the VM Config.Files.LogDirectory.
-
-Defaults to the first serial port if no DEVICE is given.
-
-Examples:
-  govc device.ls | grep serialport-
-  govc device.serial.connect -vm $vm -device serialport-8000 telnet://:33233
-  govc device.info -vm $vm serialport-*
-  govc device.serial.connect -vm $vm "[datastore1] $vm/console.log"
-  govc device.serial.connect -vm $vm -
-  govc datastore.tail -f $vm/serialport-8000.log
-
-Options:
-  -client=false             Use client direction
-  -device=                  serial port device name
-  -vm=                      Virtual machine [GOVC_VM]
-  -vspc-proxy=              vSPC proxy URI
-```
-
-## device.serial.disconnect
-
-```
-Usage: govc device.serial.disconnect [OPTIONS]
-
-Disconnect service URI from serial port.
-
-Examples:
-  govc device.ls | grep serialport-
-  govc device.serial.disconnect -vm $vm -device serialport-8000
-  govc device.info -vm $vm serialport-*
-
-Options:
-  -device=                  serial port device name
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## device.usb.add
-
-```
-Usage: govc device.usb.add [OPTIONS]
-
-Add USB device to VM.
-
-Examples:
-  govc device.usb.add -vm $vm
-  govc device.usb.add -type xhci -vm $vm
-  govc device.info usb*
-
-Options:
-  -auto=true                Enable ability to hot plug devices
-  -ehci=true                Enable enhanced host controller interface (USB 2.0)
-  -type=usb                 USB controller type (usb|xhci)
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## dvs.add
-
-```
-Usage: govc dvs.add [OPTIONS] HOST...
-
-Add hosts to DVS.
-
-Examples:
-  govc dvs.add -dvs dvsName -pnic vmnic1 hostA hostB hostC
-
-Options:
-  -dvs=                     DVS path
-  -host=                    Host system [GOVC_HOST]
-  -pnic=vmnic0              Name of the host physical NIC
-```
-
-## dvs.create
-
-```
-Usage: govc dvs.create [OPTIONS] DVS
-
-Create DVS (DistributedVirtualSwitch) in datacenter.
-
-The dvs is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the network folder in the specified or default datacenter.
-
-Examples:
-  govc dvs.create DSwitch
-  govc dvs.create -product-version 5.5.0 DSwitch
-
-Options:
-  -folder=                  Inventory folder [GOVC_FOLDER]
-  -product-version=         DVS product version
-```
-
-## dvs.portgroup.add
-
-```
-Usage: govc dvs.portgroup.add [OPTIONS] NAME
-
-Add portgroup to DVS.
-
-Examples:
-  govc dvs.create DSwitch
-  govc dvs.portgroup.add -dvs DSwitch -type earlyBinding -nports 16 ExternalNetwork
-  govc dvs.portgroup.add -dvs DSwitch -type ephemeral InternalNetwork
-
-Options:
-  -dvs=                     DVS path
-  -nports=128               Number of ports
-  -type=earlyBinding        Portgroup type (earlyBinding|lateBinding|ephemeral)
-  -vlan=0                   VLAN ID
-```
-
-## dvs.portgroup.change
-
-```
-Usage: govc dvs.portgroup.change [OPTIONS] PATH
-
-Change DVS portgroup configuration.
-
-Examples:
-  govc dvs.portgroup.change -nports 26 ExternalNetwork
-  govc dvs.portgroup.change -vlan 3214 ExternalNetwork
-
-Options:
-  -nports=0                 Number of ports
-  -type=earlyBinding        Portgroup type (earlyBinding|lateBinding|ephemeral)
-  -vlan=0                   VLAN ID
-```
-
-## dvs.portgroup.info
-
-```
-Usage: govc dvs.portgroup.info [OPTIONS] DVS
-
-Portgroup info for DVS.
-
-Examples:
-  govc dvs.portgroup.info DSwitch
-  govc find / -type DistributedVirtualSwitch | xargs -n1 govc dvs.portgroup.info
-
-Options:
-  -active=false             Filter by port active or inactive status
-  -connected=false          Filter by port connected or disconnected status
-  -count=0                  Number of matches to return (0 = unlimited)
-  -inside=true              Filter by port inside or outside status
-  -pg=                      Distributed Virtual Portgroup
-  -uplinkPort=false         Filter for uplink ports
-  -vlan=0                   Filter by VLAN ID (0 = unfiltered)
-```
-
-## env
-
-```
-Usage: govc env [OPTIONS]
-
-Output the environment variables for this client.
-
-If credentials are included in the url, they are split into separate variables.
-Useful as bash scripting helper to parse GOVC_URL.
-
-Options:
-  -x=false                  Output variables for each GOVC_URL component
-```
-
-## events
-
-```
-Usage: govc events [OPTIONS] [PATH]...
-
-Display events.
-
-Examples:
-  govc events vm/my-vm1 vm/my-vm2
-  govc events /dc1/vm/* /dc2/vm/*
-  govc ls -t HostSystem host/* | xargs govc events | grep -i vsan
-
-Options:
-  -f=false                  Follow event stream
-  -force=false              Disable number objects to monitor limit
-  -n=25                     Output the last N events
-```
-
-## extension.info
-
-```
-Usage: govc extension.info [OPTIONS] [KEY]...
-
-Options:
-```
-
-## extension.register
-
-```
-Usage: govc extension.register [OPTIONS]
-
-Options:
-  -update=false             Update extension
-```
-
-## extension.setcert
-
-```
-Usage: govc extension.setcert [OPTIONS] ID
-
-Set certificate for the extension ID.
-
-The '-cert-pem' option can be one of the following:
-'-' : Read the certificate from stdin
-'+' : Generate a new key pair and save locally to ID.crt and ID.key
-... : Any other value is passed as-is to ExtensionManager.SetCertificate
-
-Options:
-  -cert-pem=-               PEM encoded certificate
-  -org=VMware               Organization for generated certificate
-```
-
-## extension.unregister
-
-```
-Usage: govc extension.unregister [OPTIONS]
-
-Options:
-```
-
-## fields.add
-
-```
-Usage: govc fields.add [OPTIONS] NAME
-
-Options:
-```
-
-## fields.ls
-
-```
-Usage: govc fields.ls [OPTIONS]
-
-Options:
-```
-
-## fields.rename
-
-```
-Usage: govc fields.rename [OPTIONS] KEY NAME
-
-Options:
-```
-
-## fields.rm
-
-```
-Usage: govc fields.rm [OPTIONS] KEY...
-
-Options:
-```
-
-## fields.set
-
-```
-Usage: govc fields.set [OPTIONS] KEY VALUE PATH...
-
-Options:
-```
-
-## find
-
-```
-Usage: govc find [OPTIONS] [ROOT] [KEY VAL]...
-
-Find managed objects.
-
-ROOT can be an inventory path or ManagedObjectReference.
-ROOT defaults to '.', an alias for the root folder or DC if set.
-
-Optional KEY VAL pairs can be used to filter results against object instance properties.
-
-The '-type' flag value can be a managed entity type or one of the following aliases:
-
-  a    VirtualApp
-  c    ClusterComputeResource
-  d    Datacenter
-  f    Folder
-  g    DistributedVirtualPortgroup
-  h    HostSystem
-  m    VirtualMachine
-  n    Network
-  o    OpaqueNetwork
-  p    ResourcePool
-  r    ComputeResource
-  s    Datastore
-  w    DistributedVirtualSwitch
-
-Examples:
-  govc find
-  govc find /dc1 -type c
-  govc find vm -name my-vm-*
-  govc find . -type n
-  govc find . -type m -runtime.powerState poweredOn
-  govc find . -type m -datastore $(govc find -i datastore -name vsanDatastore)
-  govc find . -type s -summary.type vsan
-  govc find . -type h -hardware.cpuInfo.numCpuCores 16
-
-Options:
-  -i=false                  Print the managed object reference
-  -maxdepth=-1              Max depth
-  -name=*                   Resource name
-  -type=[]                  Resource type
-```
-
-## firewall.ruleset.find
-
-```
-Usage: govc firewall.ruleset.find [OPTIONS]
-
-Find firewall rulesets matching the given rule.
-
-For a complete list of rulesets: govc host.esxcli network firewall ruleset list
-For a complete list of rules:    govc host.esxcli network firewall ruleset rule list
-
-Examples:
-  govc firewall.ruleset.find -direction inbound -port 22
-  govc firewall.ruleset.find -direction outbound -port 2377
-
-Options:
-  -c=true                   Check if esx firewall is enabled
-  -direction=outbound       Direction
-  -enabled=true             Find enabled rule sets if true, disabled if false
-  -host=                    Host system [GOVC_HOST]
-  -port=0                   Port
-  -proto=tcp                Protocol
-  -type=dst                 Port type
-```
-
-## folder.create
-
-```
-Usage: govc folder.create [OPTIONS] PATH...
-
-Create folder with PATH.
-
-Examples:
-  govc folder.create /dc1/vm/folder-foo
-  govc object.mv /dc1/vm/vm-foo-* /dc1/vm/folder-foo
-  govc folder.create -pod /dc1/datastore/sdrs
-  govc object.mv /dc1/datastore/iscsi-* /dc1/datastore/sdrs
-
-Options:
-  -pod=false                Create folder(s) of type StoragePod (DatastoreCluster)
-```
-
-## folder.info
-
-```
-Usage: govc folder.info [OPTIONS] [PATH]...
-
-Options:
-```
-
-## guest.chmod
-
-```
-Usage: govc guest.chmod [OPTIONS] MODE FILE
-
-Change FILE MODE on VM.
-
-Examples:
-  govc guest.chmod -vm $name 0644 /var/log/foo.log
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.chown
-
-```
-Usage: govc guest.chown [OPTIONS] UID[:GID] FILE
-
-Change FILE UID and GID on VM.
-
-Examples:
-  govc guest.chown -vm $name UID[:GID] /var/log/foo.log
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.download
-
-```
-Usage: govc guest.download [OPTIONS] SOURCE DEST
-
-Copy SOURCE from the guest VM to DEST on the local system.
-
-If DEST name is "-", source is written to stdout.
-
-Examples:
-  govc guest.download -l user:pass -vm=my-vm /var/log/my.log ./local.log
-  govc guest.download -l user:pass -vm=my-vm /etc/motd -
-
-Options:
-  -f=false                  If set, the local destination file is clobbered
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.getenv
-
-```
-Usage: govc guest.getenv [OPTIONS] [NAME]...
-
-Read NAME environment variables from VM.
-
-Examples:
-  govc guest.getenv -vm $name
-  govc guest.getenv -vm $name HOME
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.kill
-
-```
-Usage: govc guest.kill [OPTIONS]
-
-Kill process ID on VM.
-
-Examples:
-  govc guest.kill -vm $name -p 12345
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -p=[]                     Process ID
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.ls
-
-```
-Usage: govc guest.ls [OPTIONS] PATH
-
-List PATH files in VM.
-
-Examples:
-  govc guest.ls -vm $name /tmp
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -s=false                  Simple path only listing
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.mkdir
-
-```
-Usage: govc guest.mkdir [OPTIONS] PATH
-
-Create directory PATH in VM.
-
-Examples:
-  govc guest.mkdir -vm $name /tmp/logs
-  govc guest.mkdir -vm $name -p /tmp/logs/foo/bar
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -p=false                  Create intermediate directories as needed
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.mktemp
-
-```
-Usage: govc guest.mktemp [OPTIONS]
-
-Create a temporary file or directory in VM.
-
-Examples:
-  govc guest.mktemp -vm $name
-  govc guest.mktemp -vm $name -d
-  govc guest.mktemp -vm $name -t myprefix
-  govc guest.mktemp -vm $name -p /var/tmp/$USER
-
-Options:
-  -d=false                  Make a directory instead of a file
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -p=                       If specified, create relative to this directory
-  -s=                       Suffix
-  -t=                       Prefix
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.mv
-
-```
-Usage: govc guest.mv [OPTIONS] SOURCE DEST
-
-Move (rename) files in VM.
-
-Examples:
-  govc guest.mv -vm $name /tmp/foo.sh /tmp/bar.sh
-  govc guest.mv -vm $name -n /tmp/baz.sh /tmp/bar.sh
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -n=false                  Do not overwrite an existing file
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.ps
-
-```
-Usage: govc guest.ps [OPTIONS]
-
-List processes in VM.
-
-By default, unless the '-e', '-p' or '-U' flag is specified, only processes owned
-by the '-l' flag user are displayed.
-
-The '-x' and '-X' flags only apply to processes started by vmware-tools,
-such as those started with the govc guest.start command.
-
-Examples:
-  govc guest.ps -vm $name
-  govc guest.ps -vm $name -e
-  govc guest.ps -vm $name -p 12345
-  govc guest.ps -vm $name -U root
-
-Options:
-  -U=                       Select by process UID
-  -X=false                  Wait for process to exit
-  -e=false                  Select all processes
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -p=[]                     Select by process ID
-  -vm=                      Virtual machine [GOVC_VM]
-  -x=false                  Output exit time and code
-```
-
-## guest.rm
-
-```
-Usage: govc guest.rm [OPTIONS] PATH
-
-Remove file PATH in VM.
-
-Examples:
-  govc guest.rm -vm $name /tmp/foo.log
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.rmdir
-
-```
-Usage: govc guest.rmdir [OPTIONS] PATH
-
-Remove directory PATH in VM.
-
-Examples:
-  govc guest.rmdir -vm $name /tmp/empty-dir
-  govc guest.rmdir -vm $name -r /tmp/non-empty-dir
-
-Options:
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -r=false                  Recursive removal
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.start
-
-```
-Usage: govc guest.start [OPTIONS] PATH [ARG]...
-
-Start program in VM.
-
-The process can have its status queried with govc guest.ps.
-When the process completes, its exit code and end time will be available for 5 minutes after completion.
-
-Examples:
-  govc guest.start -vm $name /bin/mount /dev/hdb1 /data
-  pid=$(govc guest.start -vm $name /bin/long-running-thing)
-  govc guest.ps -vm $name -p $pid -X
-
-Options:
-  -C=                       The absolute path of the working directory for the program to start
-  -e=[]                     Set environment variable (key=val)
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.touch
-
-```
-Usage: govc guest.touch [OPTIONS] FILE
-
-Change FILE times on VM.
-
-Examples:
-  govc guest.touch -vm $name /var/log/foo.log
-  govc guest.touch -vm $name -d "$(date -d '1 day ago')" /var/log/foo.log
-
-Options:
-  -a=false                  Change only the access time
-  -c=false                  Do not create any files
-  -d=                       Use DATE instead of current time
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## guest.upload
-
-```
-Usage: govc guest.upload [OPTIONS] SOURCE DEST
-
-Copy SOURCE from the local system to DEST in the guest VM.
-
-If SOURCE name is "-", read source from stdin.
-
-Examples:
-  govc guest.upload -l user:pass -vm=my-vm ~/.ssh/id_rsa.pub /home/$USER/.ssh/authorized_keys
-  cowsay "have a great day" | govc guest.upload -l user:pass -vm=my-vm - /etc/motd
-
-Options:
-  -f=false                  If set, the guest destination file is clobbered
-  -gid=<nil>                Group ID
-  -l=:                      Guest VM credentials [GOVC_GUEST_LOGIN]
-  -perm=0                   File permissions
-  -uid=<nil>                User ID
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## host.account.create
-
-```
-Usage: govc host.account.create [OPTIONS]
-
-Create local account on HOST.
-
-Examples:
-  govc host.account.create -id $USER -password password-for-esx60
-
-Options:
-  -description=             The description of the specified account
-  -host=                    Host system [GOVC_HOST]
-  -id=                      The ID of the specified account
-  -password=                The password for the specified account id
-```
-
-## host.account.remove
-
-```
-Usage: govc host.account.remove [OPTIONS]
-
-Remove local account on HOST.
-
-Examples:
-  govc host.account.remove -id $USER
-
-Options:
-  -description=             The description of the specified account
-  -host=                    Host system [GOVC_HOST]
-  -id=                      The ID of the specified account
-  -password=                The password for the specified account id
-```
-
-## host.account.update
-
-```
-Usage: govc host.account.update [OPTIONS]
-
-Update local account on HOST.
-
-Examples:
-  govc host.account.update -id root -password password-for-esx60
-
-Options:
-  -description=             The description of the specified account
-  -host=                    Host system [GOVC_HOST]
-  -id=                      The ID of the specified account
-  -password=                The password for the specified account id
-```
-
-## host.add
-
-```
-Usage: govc host.add [OPTIONS]
-
-Add host to datacenter.
-
-The host is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the host folder in the specified or default datacenter.
-
-Examples:
-  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
-  govc host.add -hostname host.example.com -username root -password pass -thumbprint $thumbprint
-  govc host.add -hostname 10.0.6.1 -username root -password pass -noverify
-
-Options:
-  -connect=true             Immediately connect to host
-  -folder=                  Inventory folder [GOVC_FOLDER]
-  -force=false              Force when host is managed by another VC
-  -hostname=                Hostname or IP address of the host
-  -noverify=false           Accept host thumbprint without verification
-  -password=                Password of administration account on the host
-  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
-  -username=                Username of administration account on the host
-```
-
-## host.autostart.add
-
-```
-Usage: govc host.autostart.add [OPTIONS] VM...
-
-Options:
-  -host=                      Host system [GOVC_HOST]
-  -start-action=powerOn       Start Action
-  -start-delay=-1             Start Delay
-  -start-order=-1             Start Order
-  -stop-action=systemDefault  Stop Action
-  -stop-delay=-1              Stop Delay
-  -wait=systemDefault         Wait for Hearbeat Setting (systemDefault|yes|no)
-```
-
-## host.autostart.configure
-
-```
-Usage: govc host.autostart.configure [OPTIONS] 
-
-Options:
-  -enabled=<nil>             
-  -host=                     Host system [GOVC_HOST]
-  -start-delay=0             
-  -stop-action=              
-  -stop-delay=0              
-  -wait-for-heartbeat=<nil>  
-```
-
-## host.autostart.info
-
-```
-Usage: govc host.autostart.info [OPTIONS] 
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.autostart.remove
-
-```
-Usage: govc host.autostart.remove [OPTIONS] VM...
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.cert.csr
-
-```
-Usage: govc host.cert.csr [OPTIONS]
-
-Generate a certificate-signing request (CSR) for HOST.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -ip=false                 Use IP address as CN
-```
-
-## host.cert.import
-
-```
-Usage: govc host.cert.import [OPTIONS] FILE
-
-Install SSL certificate FILE on HOST.
-
-If FILE name is "-", read certificate from stdin.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.cert.info
-
-```
-Usage: govc host.cert.info [OPTIONS]
-
-Display SSL certificate info for HOST.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.date.change
-
-```
-Usage: govc host.date.change [OPTIONS]
-
-Change date and time for HOST.
-
-Examples:
-  govc host.date.change -date "$(date -u)"
-  govc host.date.change -server time.vmware.com
-  govc host.service enable ntpd
-  govc host.service start ntpd
-
-Options:
-  -date=                    Update the date/time on the host
-  -host=                    Host system [GOVC_HOST]
-  -server=                  IP or FQDN for NTP server(s)
-  -tz=                      Change timezone of the host
-```
-
-## host.date.info
-
-```
-Usage: govc host.date.info [OPTIONS]
-
-Display date and time info for HOST.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.disconnect
-
-```
-Usage: govc host.disconnect [OPTIONS]
-
-Disconnect HOST from vCenter.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.esxcli
-
-```
-Usage: govc host.esxcli [OPTIONS] COMMAND [ARG]...
-
-Invoke esxcli command on HOST.
-
-Output is rendered in table form when possible, unless disabled with '-hints=false'.
-
-Examples:
-  govc host.esxcli network ip connection list
-  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
-  govc host.esxcli network firewall ruleset set -r remoteSerialPort -e true
-  govc host.esxcli network firewall set -e false
-
-Options:
-  -hints=true               Use command info hints when formatting output
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.info
-
-```
-Usage: govc host.info [OPTIONS]
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.maintenance.enter
-
-```
-Usage: govc host.maintenance.enter [OPTIONS] HOST...
-
-Put HOST in maintenance mode.
-
-While this task is running and when the host is in maintenance mode,
-no VMs can be powered on and no provisioning operations can be performed on the host.
-
-Options:
-  -evacuate=false           Evacuate powered off VMs
-  -host=                    Host system [GOVC_HOST]
-  -timeout=0                Timeout
-```
-
-## host.maintenance.exit
-
-```
-Usage: govc host.maintenance.exit [OPTIONS] HOST...
-
-Take HOST out of maintenance mode.
-
-This blocks if any concurrent running maintenance-only host configurations operations are being performed.
-For example, if VMFS volumes are being upgraded.
-
-The 'timeout' flag is the number of seconds to wait for the exit maintenance mode to succeed.
-If the timeout is less than or equal to zero, there is no timeout.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -timeout=0                Timeout
-```
-
-## host.option.ls
-
-```
-Usage: govc host.option.ls [OPTIONS] [NAME]
-
-List option with the given NAME.
-
-If NAME ends with a dot, all options for that subtree are listed.
-
-Examples:
-  govc host.option.ls
-  govc host.option.ls Config.HostAgent.
-  govc host.option.ls Config.HostAgent.plugins.solo.enableMob
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.option.set
-
-```
-Usage: govc host.option.set [OPTIONS] NAME VALUE
-
-Set option NAME to VALUE.
-
-Examples:
-  govc host.option.set Config.HostAgent.plugins.solo.enableMob true
-  govc host.option.set Config.HostAgent.log.level verbose
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.portgroup.add
-
-```
-Usage: govc host.portgroup.add [OPTIONS] NAME
-
-Add portgroup to HOST.
-
-Examples:
-  govc host.portgroup.add -vswitch vSwitch0 -vlan 3201 bridge
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -vlan=0                   VLAN ID
-  -vswitch=                 vSwitch Name
-```
-
-## host.portgroup.change
-
-```
-Usage: govc host.portgroup.change [OPTIONS] NAME
-
-Change configuration of HOST portgroup NAME.
-
-Examples:
-  govc host.portgroup.change -allow-promiscuous -forged-transmits -mac-changes "VM Network"
-  govc host.portgroup.change -vswitch-name vSwitch1 "Management Network"
-
-Options:
-  -allow-promiscuous=<nil>  Allow promiscuous mode
-  -forged-transmits=<nil>   Allow forged transmits
-  -host=                    Host system [GOVC_HOST]
-  -mac-changes=<nil>        Allow MAC changes
-  -name=                    Portgroup name
-  -vlan-id=-1               VLAN ID
-  -vswitch-name=            vSwitch name
-```
-
-## host.portgroup.info
-
-```
-Usage: govc host.portgroup.info [OPTIONS]
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.portgroup.remove
-
-```
-Usage: govc host.portgroup.remove [OPTIONS] NAME
-
-Remove portgroup from HOST.
-
-Examples:
-  govc host.portgroup.remove bridge
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.reconnect
-
-```
-Usage: govc host.reconnect [OPTIONS]
-
-Reconnect HOST to vCenter.
-
-This command can also be used to change connection properties (hostname, fingerprint, username, password),
-without disconnecting the host.
-
-Options:
-  -force=false              Force when host is managed by another VC
-  -host=                    Host system [GOVC_HOST]
-  -hostname=                Hostname or IP address of the host
-  -noverify=false           Accept host thumbprint without verification
-  -password=                Password of administration account on the host
-  -sync-state=false         Sync state
-  -thumbprint=              SHA-1 thumbprint of the host's SSL certificate
-  -username=                Username of administration account on the host
-```
-
-## host.remove
-
-```
-Usage: govc host.remove [OPTIONS] HOST...
-
-Remove HOST from vCenter.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.service
-
-```
-Usage: govc host.service [OPTIONS] ACTION ID
-
-Apply host service ACTION to service ID.
-
-Where ACTION is one of: start, stop, restart, status, enable, disable
-
-Examples:
-  govc host.service enable TSM-SSH
-  govc host.service start TSM-SSH
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.service.ls
-
-```
-Usage: govc host.service.ls [OPTIONS]
-
-List HOST services.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.shutdown
-
-```
-Usage: govc host.shutdown [OPTIONS]
-
-Shutdown HOST.
-
-Options:
-  -f=false                  Force shutdown when host is not in maintenance mode
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.storage.info
-
-```
-Usage: govc host.storage.info [OPTIONS]
-
-Show HOST storage system information.
-
-Examples:
-  govc ls -t HostSystem host/* | xargs -n1 govc host.storage.info -unclaimed -host
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -rescan=false             Rescan for new storage devices
-  -t=lun                    Type (hba,lun)
-  -unclaimed=false          Only show disks that can be used as new VMFS datastores
-```
-
-## host.storage.mark
-
-```
-Usage: govc host.storage.mark [OPTIONS] DEVICE_PATH
-
-Mark device at DEVICE_PATH.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -local=<nil>              Mark as local
-  -ssd=<nil>                Mark as SSD
-```
-
-## host.storage.partition
-
-```
-Usage: govc host.storage.partition [OPTIONS] DEVICE_PATH
-
-Show partition table for device at DEVICE_PATH.
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.vnic.info
-
-```
-Usage: govc host.vnic.info [OPTIONS]
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.vnic.service
-
-```
-Usage: govc host.vnic.service [OPTIONS] SERVICE DEVICE
-
-
-Enable or disable service on a virtual nic device.
-
-Where SERVICE is one of: vmotion|faultToleranceLogging|vSphereReplication|vSphereReplicationNFC|management|vsan|vSphereProvisioning
-Where DEVICE is one of: vmk0|vmk1|...
-
-Examples:
-  govc host.vnic.service -host hostname -enable vsan vmk0
-  govc host.vnic.service -host hostname -enable=false vmotion vmk1
-
-Options:
-  -enable=true              Enable service
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.vswitch.add
-
-```
-Usage: govc host.vswitch.add [OPTIONS] NAME
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -mtu=0                    MTU
-  -nic=                     Bridge nic device
-  -ports=128                Number of ports
-```
-
-## host.vswitch.info
-
-```
-Usage: govc host.vswitch.info [OPTIONS]
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## host.vswitch.remove
-
-```
-Usage: govc host.vswitch.remove [OPTIONS] NAME
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## import.ova
-
-```
-Usage: govc import.ova [OPTIONS] PATH_TO_OVA
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -folder=                  Path to folder to add the VM to
-  -host=                    Host system [GOVC_HOST]
-  -name=                    Name to use for new entity
-  -options=                 Options spec file path for VM deployment
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-```
-
-## import.ovf
-
-```
-Usage: govc import.ovf [OPTIONS] PATH_TO_OVF
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -folder=                  Path to folder to add the VM to
-  -host=                    Host system [GOVC_HOST]
-  -name=                    Name to use for new entity
-  -options=                 Options spec file path for VM deployment
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-```
-
-## import.spec
-
-```
-Usage: govc import.spec [OPTIONS] PATH_TO_OVF_OR_OVA
-
-Options:
-  -verbose=false  Verbose spec output
-```
-
-## import.vmdk
-
-```
-Usage: govc import.vmdk [OPTIONS] PATH_TO_VMDK [REMOTE_DIRECTORY]
-
-Options:
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -force=false              Overwrite existing disk
-  -keep=false               Keep uploaded disk after import
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-  -upload=true              Upload specified disk
-```
-
-## license.add
-
-```
-Usage: govc license.add [OPTIONS] KEY...
-
-Options:
-```
-
-## license.assign
-
-```
-Usage: govc license.assign [OPTIONS] KEY
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -name=                    Display name
-  -remove=false             Remove assignment
-```
-
-## license.assigned.ls
-
-```
-Usage: govc license.assigned.ls [OPTIONS]
-
-Options:
-  -id=                      Entity ID
-```
-
-## license.decode
-
-```
-Usage: govc license.decode [OPTIONS] KEY...
-
-Options:
-  -feature=                 List licenses with given feature
-```
-
-## license.ls
-
-```
-Usage: govc license.ls [OPTIONS]
-
-Options:
-  -feature=                 List licenses with given feature
-```
-
-## license.remove
-
-```
-Usage: govc license.remove [OPTIONS] KEY...
-
-Options:
-```
-
-## logs
-
-```
-Usage: govc logs [OPTIONS]
-
-View VPX and ESX logs.
-
-The '-log' option defaults to "hostd" when connected directly to a host or
-when connected to VirtualCenter and a '-host' option is given.  Otherwise,
-the '-log' option defaults to "vpxd:vpxd.log".  The '-host' option is ignored
-when connected directly to a host.  See 'govc logs.ls' for other '-log' options.
-
-Examples:
-  govc logs -n 1000 -f
-  govc logs -host esx1
-  govc logs -host esx1 -log vmkernel
-
-Options:
-  -f=false                  Follow log file changes
-  -host=                    Host system [GOVC_HOST]
-  -log=                     Log file key
-  -n=25                     Output the last N log lines
-```
-
-## logs.download
-
-```
-Usage: govc logs.download [OPTIONS] [PATH]...
-
-Generate diagnostic bundles.
-
-A diagnostic bundle includes log files and other configuration information.
-
-Use PATH to include a specific set of hosts to include.
-
-Examples:
-  govc logs.download
-  govc logs.download host-a host-b
-
-Options:
-  -default=true             Specifies if the bundle should include the default server
-```
-
-## logs.ls
-
-```
-Usage: govc logs.ls [OPTIONS]
-
-List diagnostic log keys.
-
-Examples:
-  govc logs.ls
-  govc logs.ls -host host-a
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-```
-
-## ls
-
-```
-Usage: govc ls [OPTIONS] [PATH]...
-
-List inventory items.
-
-Examples:
-  govc ls -l '*'
-  govc ls -t ClusterComputeResource host
-  govc ls -t Datastore host/ClusterA/* | grep -v local | xargs -n1 basename | sort | uniq
-
-Options:
-  -L=false                  Follow managed object references
-  -i=false                  Print the managed object reference
-  -l=false                  Long listing format
-  -t=                       Object type
-```
-
-## metric.change
-
-```
-Usage: govc metric.change [OPTIONS] NAME...
-
-Change counter NAME levels.
-
-Examples:
-  govc metric.change -level 1 net.bytesRx.average net.bytesTx.average
-
-Options:
-  -device-level=0           Level for the per device counter
-  -i=0                      Interval ID
-  -level=0                  Level for the aggregate counter
-```
-
-## metric.info
-
-```
-Usage: govc metric.info [OPTIONS] PATH [NAME]...
-
-Metric info for NAME.
-
-If PATH is a value other than '-', provider summary and instance list are included
-for the given object type.
-
-If NAME is not specified, all available metrics for the given INTERVAL are listed.
-An object PATH must be provided in this case.
-
-Examples:
-  govc metric.info vm/my-vm
-  govc metric.info -i 300 vm/my-vm
-  govc metric.info - cpu.usage.average
-  govc metric.info /dc1/host/cluster cpu.usage.average
-
-Options:
-  -i=0                      Interval ID
-```
-
-## metric.interval.change
-
-```
-Usage: govc metric.interval.change [OPTIONS]
-
-Change historical metric intervals.
-
-Examples:
-  govc metric.interval.change -i 300 -level 2
-  govc metric.interval.change -i 86400 -enabled=false
-
-Options:
-  -enabled=<nil>            Enable or disable
-  -i=0                      Interval ID
-  -level=0                  Level
-```
-
-## metric.interval.info
-
-```
-Usage: govc metric.interval.info [OPTIONS]
-
-List historical metric intervals.
-
-Examples:
-  govc metric.interval.info
-  govc metric.interval.info -i 300
-
-Options:
-  -i=0                      Interval ID
-```
-
-## metric.ls
-
-```
-Usage: govc metric.ls [OPTIONS] PATH
-
-List available metrics for PATH.
-
-Examples:
-  govc metric.ls /dc1/host/cluster1
-  govc metric.ls datastore/*
-  govc metric.ls vm/* | grep mem. | xargs govc metric.sample vm/*
-
-Options:
-  -i=0                      Interval ID
-  -l=false                  Long listing format
-```
-
-## metric.reset
-
-```
-Usage: govc metric.reset [OPTIONS] NAME...
-
-Reset counter NAME to the default level of data collection.
-
-Examples:
-  govc metric.reset net.bytesRx.average net.bytesTx.average
-
-Options:
-  -i=0                      Interval ID
-```
-
-## metric.sample
-
-```
-Usage: govc metric.sample [OPTIONS] PATH... NAME...
-
-Sample for object PATH of metric NAME.
-
-Interval ID defaults to 20 (realtime) if supported, otherwise 300 (5m interval).
-
-By default, INSTANCE '*' samples all instances and the aggregate counter.
-An INSTANCE value of '-' will only sample the aggregate counter.
-An INSTANCE value other than '*' or '-' will only sample the given instance counter.
-
-If PLOT value is set to '-', output a gnuplot script.  If non-empty with another
-value, PLOT will pipe the script to gnuplot for you.  The value is also used to set
-the gnuplot 'terminal' variable, unless the value is that of the DISPLAY env var.
-Only 1 metric NAME can be specified when the PLOT flag is set.
-
-Examples:
-  govc metric.sample host/cluster1/* cpu.usage.average
-  govc metric.sample -plot .png host/cluster1/* cpu.usage.average | xargs open
-  govc metric.sample vm/* net.bytesTx.average net.bytesTx.average
-  govc metric.sample -instance vmnic0 vm/* net.bytesTx.average
-  govc metric.sample -instance - vm/* net.bytesTx.average
-
-Options:
-  -d=30                     Limit object display name to D chars
-  -i=0                      Interval ID
-  -instance=*               Instance
-  -n=6                      Max number of samples
-  -plot=                    Plot data using gnuplot
-  -t=false                  Include sample times
-```
-
-## object.collect
-
-```
-Usage: govc object.collect [OPTIONS] [MOID] [PROPERTY]...
-
-Collect managed object properties.
-
-MOID can be an inventory path or ManagedObjectReference.
-MOID defaults to '-', an alias for 'ServiceInstance:ServiceInstance'.
-
-By default only the current property value(s) are collected.  Use the '-n' flag to wait for updates.
-
-Examples:
-  govc object.collect - content
-  govc object.collect -s HostSystem:ha-host hardware.systemInfo.uuid
-  govc object.collect -s /ha-datacenter/vm/foo overallStatus
-  govc object.collect -json -n=-1 EventManager:ha-eventmgr latestEvent | jq .
-  govc object.collect -json -s $(govc object.collect -s - content.perfManager) description.counterType | jq .
-
-Options:
-  -n=0                      Wait for N property updates
-  -s=false                  Output property value only
-```
-
-## object.destroy
-
-```
-Usage: govc object.destroy [OPTIONS] PATH...
-
-Destroy managed objects.
-
-Examples:
-  govc object.destroy /dc1/network/dvs /dc1/host/cluster
-
-Options:
-```
-
-## object.method
-
-```
-Usage: govc object.method [OPTIONS] PATH...
-
-Enable or disable methods for managed objects.
-
-Examples:
-  govc object.method -name Destroy_Task -enable=false /dc1/vm/foo
-  govc object.collect /dc1/vm/foo disabledMethod | grep --color Destroy_Task
-  govc object.method -name Destroy_Task -enable /dc1/vm/foo
-
-Options:
-  -enable=true              Enable method
-  -name=                    Method name
-  -reason=                  Reason for disabling method
-  -source=govc              Source ID
-```
-
-## object.mv
-
-```
-Usage: govc object.mv [OPTIONS] PATH... FOLDER
-
-Move managed entities to FOLDER.
-
-Examples:
-  govc folder.create /dc1/host/example
-  govc object.mv /dc2/host/*.example.com /dc1/host/example
-
-Options:
-```
-
-## object.reload
-
-```
-Usage: govc object.reload [OPTIONS] PATH...
-
-Reload managed object state.
-
-Examples:
-  govc datastore.upload $vm.vmx $vm/$vm.vmx
-  govc object.reload /dc1/vm/$vm
-
-Options:
-```
-
-## object.rename
-
-```
-Usage: govc object.rename [OPTIONS] PATH NAME
-
-Rename managed objects.
-
-Examples:
-  govc object.rename /dc1/network/dvs1 Switch1
-
-Options:
-```
-
-## option.ls
-
-```
-Usage: govc option.ls [OPTIONS] [NAME]
-
-List option with the given NAME.
-
-If NAME ends with a dot, all options for that subtree are listed.
-
-Examples:
-  govc option.ls
-  govc option.ls config.vpxd.sso.
-  govc option.ls config.vpxd.sso.sts.uri
-
-Options:
-```
-
-## option.set
-
-```
-Usage: govc option.set [OPTIONS] NAME VALUE
-
-Set option NAME to VALUE.
-
-Examples:
-  govc option.set log.level info
-  govc option.set logger.Vsan verbose
-
-Options:
-```
-
-## permissions.ls
-
-```
-Usage: govc permissions.ls [OPTIONS] [PATH]...
-
-List the permissions defined on or effective on managed entities.
-
-Examples:
-  govc permissions.ls
-  govc permissions.ls /dc1/host/cluster1
-
-Options:
-  -a=true                   Include inherited permissions defined by parent entities
-  -i=false                  Use moref instead of inventory path
-```
-
-## permissions.remove
-
-```
-Usage: govc permissions.remove [OPTIONS] [PATH]...
-
-Removes a permission rule from managed entities.
-
-Examples:
-  govc permissions.remove -principal root
-  govc permissions.remove -principal $USER@vsphere.local -role Admin /dc1/host/cluster1
-
-Options:
-  -group=false              True, if principal refers to a group name; false, for a user name
-  -i=false                  Use moref instead of inventory path
-  -principal=               User or group for which the permission is defined
-```
-
-## permissions.set
-
-```
-Usage: govc permissions.set [OPTIONS] [PATH]...
-
-Set the permissions managed entities.
-
-Examples:
-  govc permissions.set -principal root -role Admin
-  govc permissions.set -principal $USER@vsphere.local -role Admin /dc1/host/cluster1
-
-Options:
-  -group=false              True, if principal refers to a group name; false, for a user name
-  -i=false                  Use moref instead of inventory path
-  -principal=               User or group for which the permission is defined
-  -propagate=true           Whether or not this permission propagates down the hierarchy to sub-entities
-  -role=Admin               Permission role name
-```
-
-## pool.change
-
-```
-Usage: govc pool.change [OPTIONS] POOL...
-
-Change the configuration of one or more resource POOLs.
-
-POOL may be an absolute or relative path to a resource pool or a (clustered)
-compute host. If it resolves to a compute host, the associated root resource
-pool is returned. If a relative path is specified, it is resolved with respect
-to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
-
-Paths to nested resource pools must traverse through the root resource pool of
-the selected compute host, i.e. "compute-host/Resources/nested-pool".
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-POOL may be specified as "*/Resources/*" to expand to all resource pools that
-are nested one level under the root resource pool, on all (clustered) compute
-hosts in the current datacenter.
-
-Options:
-  -cpu.expandable=<nil>     CPU expandable reservation
-  -cpu.limit=0              CPU limit in MHz
-  -cpu.reservation=0        CPU reservation in MHz
-  -cpu.shares=              CPU shares level or number
-  -mem.expandable=<nil>     Memory expandable reservation
-  -mem.limit=0              Memory limit in MB
-  -mem.reservation=0        Memory reservation in MB
-  -mem.shares=              Memory shares level or number
-  -name=                    Resource pool name
-```
-
-## pool.create
-
-```
-Usage: govc pool.create [OPTIONS] POOL...
-
-Create one or more resource POOLs.
-
-POOL may be an absolute or relative path to a resource pool. The parent of the
-specified POOL must be an existing resource pool. If a relative path is
-specified, it is resolved with respect to the current datacenter's "host"
-folder (i.e. /ha-datacenter/host). The basename of the specified POOL is used
-as the name for the new resource pool.
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-the path to the parent resource pool in POOL may be specified as "*/Resources"
-to expand to the root resource pools on all (clustered) compute hosts in the
-current datacenter.
-
-For example:
-  */Resources/test             Create resource pool "test" on all (clustered)
-                               compute hosts in the current datacenter.
-  somehost/Resources/*/nested  Create resource pool "nested" in every
-                               resource pool that is a direct descendant of
-                               the root resource pool on "somehost".
-
-Options:
-  -cpu.expandable=true      CPU expandable reservation
-  -cpu.limit=0              CPU limit in MHz
-  -cpu.reservation=0        CPU reservation in MHz
-  -cpu.shares=normal        CPU shares level or number
-  -mem.expandable=true      Memory expandable reservation
-  -mem.limit=0              Memory limit in MB
-  -mem.reservation=0        Memory reservation in MB
-  -mem.shares=normal        Memory shares level or number
-```
-
-## pool.destroy
-
-```
-Usage: govc pool.destroy [OPTIONS] POOL...
-
-Destroy one or more resource POOLs.
-
-POOL may be an absolute or relative path to a resource pool or a (clustered)
-compute host. If it resolves to a compute host, the associated root resource
-pool is returned. If a relative path is specified, it is resolved with respect
-to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
-
-Paths to nested resource pools must traverse through the root resource pool of
-the selected compute host, i.e. "compute-host/Resources/nested-pool".
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-POOL may be specified as "*/Resources/*" to expand to all resource pools that
-are nested one level under the root resource pool, on all (clustered) compute
-hosts in the current datacenter.
-
-Options:
-  -children=false           Remove all children pools
-```
-
-## pool.info
-
-```
-Usage: govc pool.info [OPTIONS] POOL...
-
-Retrieve information about one or more resource POOLs.
-
-POOL may be an absolute or relative path to a resource pool or a (clustered)
-compute host. If it resolves to a compute host, the associated root resource
-pool is returned. If a relative path is specified, it is resolved with respect
-to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
-
-Paths to nested resource pools must traverse through the root resource pool of
-the selected compute host, i.e. "compute-host/Resources/nested-pool".
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-POOL may be specified as "*/Resources/*" to expand to all resource pools that
-are nested one level under the root resource pool, on all (clustered) compute
-hosts in the current datacenter.
-
-Options:
-  -a=false                  List virtual app resource pools
-  -p=true                   List resource pools
-```
-
-## role.create
-
-```
-Usage: govc role.create [OPTIONS] NAME [PRIVILEGE]...
-
-Create authorization role.
-
-Optionally populate the role with the given PRIVILEGE(s).
-
-Examples:
-  govc role.create MyRole
-  govc role.create NoDC $(govc role.ls Admin | grep -v Datacenter.)
-
-Options:
-  -i=false                  Use moref instead of inventory path
-```
-
-## role.ls
-
-```
-Usage: govc role.ls [OPTIONS] [NAME]
-
-List authorization roles.
-
-If NAME is provided, list privileges for the role.
-
-Examples:
-  govc role.ls
-  govc role.ls Admin
-
-Options:
-  -i=false                  Use moref instead of inventory path
-```
-
-## role.remove
-
-```
-Usage: govc role.remove [OPTIONS] NAME
-
-Remove authorization role.
-
-Examples:
-  govc role.remove MyRole
-  govc role.remove MyRole -force
-
-Options:
-  -force=false              Force removal if role is in use
-  -i=false                  Use moref instead of inventory path
-```
-
-## role.update
-
-```
-Usage: govc role.update [OPTIONS] NAME [PRIVILEGE]...
-
-Update authorization role.
-
-Set, Add or Remove role PRIVILEGE(s).
-
-Examples:
-  govc role.update MyRole $(govc role.ls Admin | grep VirtualMachine.)
-  govc role.update -r MyRole $(govc role.ls Admin | grep VirtualMachine.GuestOperations.)
-  govc role.update -a MyRole $(govc role.ls Admin | grep Datastore.)
-  govc role.update -name RockNRole MyRole
-
-Options:
-  -a=false                  Add given PRIVILEGE(s)
-  -i=false                  Use moref instead of inventory path
-  -name=                    Change role name
-  -r=false                  Remove given PRIVILEGE(s)
-```
-
-## role.usage
-
-```
-Usage: govc role.usage [OPTIONS] NAME...
-
-List usage for role NAME.
-
-Examples:
-  govc role.usage
-  govc role.usage Admin
-
-Options:
-  -i=false                  Use moref instead of inventory path
-```
-
-## session.ls
-
-```
-Usage: govc session.ls [OPTIONS]
-
-List active sessions.
-
-Examples:
-  govc session.ls
-  govc session.ls -json | jq -r .CurrentSession.Key
-
-Options:
-```
-
-## session.rm
-
-```
-Usage: govc session.rm [OPTIONS] KEY...
-
-Remove active sessions.
-
-Examples:
-  govc session.ls | grep root
-  govc session.rm 5279e245-e6f1-4533-4455-eb94353b213a
-
-Options:
-```
-
-## snapshot.create
-
-```
-Usage: govc snapshot.create [OPTIONS] NAME
-
-Create snapshot of VM with NAME.
-
-Examples:
-  govc snapshot.create -vm my-vm happy-vm-state
-
-Options:
-  -d=                       Snapshot description
-  -m=true                   Include memory state
-  -q=false                  Quiesce guest file system
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## snapshot.remove
-
-```
-Usage: govc snapshot.remove [OPTIONS] NAME
-
-Remove snapshot of VM with given NAME.
-
-NAME can be the snapshot name, tree path, moid or '*' to remove all snapshots.
-
-Examples:
-  govc snapshot.remove -vm my-vm happy-vm-state
-
-Options:
-  -c=true                   Consolidate disks
-  -r=false                  Remove snapshot children
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## snapshot.revert
-
-```
-Usage: govc snapshot.revert [OPTIONS] [NAME]
-
-Revert to snapshot of VM with given NAME.
-
-If NAME is not provided, revert to the current snapshot.
-Otherwise, NAME can be the snapshot name, tree path or moid.
-
-Examples:
-  govc snapshot.revert -vm my-vm happy-vm-state
-
-Options:
-  -s=false                  Suppress power on
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## snapshot.tree
-
-```
-Usage: govc snapshot.tree [OPTIONS]
-
-List VM snapshots in a tree-like format.
-
-The command will exit 0 with no output if VM does not have any snapshots.
-
-Examples:
-  govc snapshot.tree -vm my-vm
-  govc snapshot.tree -vm my-vm -D -i
-
-Options:
-  -D=false                  Print the snapshot creation date
-  -c=true                   Print the current snapshot
-  -f=false                  Print the full path prefix for snapshot
-  -i=false                  Print the snapshot id
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vapp.destroy
-
-```
-Usage: govc vapp.destroy [OPTIONS] VAPP...
-
-Options:
-```
-
-## vapp.power
-
-```
-Usage: govc vapp.power [OPTIONS]
-
-Options:
-  -force=false              Force (If force is false, the shutdown order in the vApp is executed. If force is true, all virtual machines are powered-off (regardless of shutdown order))
-  -off=false                Power off
-  -on=false                 Power on
-  -suspend=false            Power suspend
-  -vapp.ipath=              Find vapp by inventory path
-```
-
-## version
-
-```
-Usage: govc version [OPTIONS]
-
-Options:
-  -require=  Require govc version >= this value
-```
-
-## vm.change
-
-```
-Usage: govc vm.change [OPTIONS]
-
-Change VM configuration.
-
-To add ExtraConfig variables that can read within the guest, use the 'guestinfo.' prefix.
-
-Examples:
-  govc vm.change -vm $vm -e smc.present=TRUE -e ich7m.present=TRUE
-  govc vm.change -vm $vm -e guestinfo.vmname $vm
-  # Read the variable set above inside the guest:
-  vmware-rpctool "info-get guestinfo.vmname"
-
-Options:
-  -c=0                        Number of CPUs
-  -e=[]                       ExtraConfig. <key>=<value>
-  -g=                         Guest OS
-  -m=0                        Size in MB of memory
-  -name=                      Display name
-  -nested-hv-enabled=<nil>    Enable nested hardware-assisted virtualization
-  -sync-time-with-host=<nil>  Enable SyncTimeWithHost
-  -vm=                        Virtual machine [GOVC_VM]
-```
-
-## vm.clone
-
-```
-Usage: govc vm.clone [OPTIONS] NAME
-
-Clone VM to NAME.
-
-Examples:
-  govc vm.clone -vm template-vm new-vm
-
-Options:
-  -annotation=              VM description
-  -c=0                      Number of CPUs
-  -customization=           Customization Specification Name
-  -datastore-cluster=       Datastore cluster [GOVC_DATASTORE_CLUSTER]
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -folder=                  Inventory folder [GOVC_FOLDER]
-  -force=false              Create VM if vmx already exists
-  -host=                    Host system [GOVC_HOST]
-  -m=0                      Size in MB of memory
-  -net=                     Network [GOVC_NETWORK]
-  -net.adapter=e1000        Network adapter type
-  -net.address=             Network hardware address
-  -on=true                  Power on VM
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-  -template=false           Create a Template
-  -vm=                      Virtual machine [GOVC_VM]
-  -waitip=false             Wait for VM to acquire IP address
-```
-
-## vm.create
-
-```
-Usage: govc vm.create [OPTIONS]
-
-Options:
-  -annotation=              VM description
-  -c=1                      Number of CPUs
-  -datastore-cluster=       Datastore cluster [GOVC_DATASTORE_CLUSTER]
-  -disk=                    Disk path (to use existing) OR size (to create new, e.g. 20GB)
-  -disk-datastore=          Datastore for disk file
-  -disk.controller=scsi     Disk controller type
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -folder=                  Inventory folder [GOVC_FOLDER]
-  -force=false              Create VM if vmx already exists
-  -g=otherGuest             Guest OS
-  -host=                    Host system [GOVC_HOST]
-  -iso=                     ISO path
-  -iso-datastore=           Datastore for ISO file
-  -link=true                Link specified disk
-  -m=1024                   Size in MB of memory
-  -net=                     Network [GOVC_NETWORK]
-  -net.adapter=e1000        Network adapter type
-  -net.address=             Network hardware address
-  -on=true                  Power on VM. Default is true if -disk argument is given.
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-```
-
-## vm.destroy
-
-```
-Usage: govc vm.destroy [OPTIONS]
-
-Options:
-```
-
-## vm.disk.attach
-
-```
-Usage: govc vm.disk.attach [OPTIONS]
-
-Options:
-  -controller=              Disk controller
-  -disk=                    Disk path name
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -link=true                Link specified disk
-  -persist=true             Persist attached disk
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.disk.change
-
-```
-Usage: govc vm.disk.change [OPTIONS]
-
-Change some properties of a VM's DISK
-
-In particular, you can change the DISK mode, and the size (as long as it is bigger)
-
-Examples:
-  govc vm.disk.change -vm VM -disk.key 2001 -size 10G
-  govc vm.disk.change -vm VM -disk.label "BDD disk" -size 10G
-  govc vm.disk.change -vm VM -disk.name "hard-1000-0" -size 12G
-  govc vm.disk.change -vm VM -disk.filePath "[DS] VM/VM-1.vmdk" -mode nonpersistent
-
-Options:
-  -disk.filePath=           Disk file name
-  -disk.key=0               Disk unique key
-  -disk.label=              Disk label
-  -disk.name=               Disk name
-  -mode=                    Disk mode (persistent|nonpersistent|undoable|independent_persistent|independent_nonpersistent|append)
-  -size=0B                  New disk size
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.disk.create
-
-```
-Usage: govc vm.disk.create [OPTIONS]
-
-Create disk and attach to VM.
-
-Examples:
-  govc vm.disk.create -vm $name -name $name/disk1 -size 10G
-
-Options:
-  -controller=              Disk controller
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -eager=false              Eagerly scrub new disk
-  -mode=persistent          Disk mode (persistent|nonpersistent|undoable|independent_persistent|independent_nonpersistent|append)
-  -name=                    Name for new disk
-  -size=10.0GB              Size of new disk
-  -thick=false              Thick provision new disk
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.guest.tools
-
-```
-Usage: govc vm.guest.tools [OPTIONS] VM...
-
-Manage guest tools in VM.
-
-Examples:
-  govc vm.guest.tools -mount VM
-  govc vm.guest.tools -unmount VM
-  govc vm.guest.tools -upgrade -options "opt1 opt2" VM
-
-Options:
-  -mount=false              Mount tools CD installer in the guest
-  -options=                 Installer options
-  -unmount=false            Unmount tools CD installer in the guest
-  -upgrade=false            Upgrade tools in the guest
-```
-
-## vm.info
-
-```
-Usage: govc vm.info [OPTIONS]
-
-Options:
-  -e=false                  Show ExtraConfig
-  -g=true                   Show general summary
-  -r=false                  Show resource summary
-  -t=false                  Show ToolsConfigInfo
-  -waitip=false             Wait for VM to acquire IP address
-```
-
-## vm.ip
-
-```
-Usage: govc vm.ip [OPTIONS] VM...
-
-List IPs for VM.
-
-By default the vm.ip command depends on vmware-tools to report the 'guest.ipAddress' field and will
-wait until it has done so.  This value can also be obtained using:
-
-  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.IpAddress
-
-When given the '-a' flag, only IP addresses for which there is a corresponding virtual nic are listed.
-If there are multiple nics, the listed addresses will be comma delimited.  The '-a' flag depends on
-vmware-tools to report the 'guest.net' field and will wait until it has done so for all nics.
-Note that this list includes IPv6 addresses if any, use '-v4' to filter them out.  IP addresses reported
-by tools for which there is no virtual nic are not included, for example that of the 'docker0' interface.
-
-These values can also be obtained using:
-
-  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.Net[].IpConfig.IpAddress[].IpAddress
-
-When given the '-n' flag, filters '-a' behavior to the nic specified by MAC address or device name.
-
-The 'esxcli' flag does not require vmware-tools to be installed, but does require the ESX host to
-have the /Net/GuestIPHack setting enabled.
-
-The 'wait' flag default to 1hr (original default was infinite).  If a VM does not obtain an IP within
-the wait time, the command will still exit with status 0.
-
-Examples:
-  govc vm.ip $vm
-  govc vm.ip -wait 5m $vm
-  govc vm.ip -a -v4 $vm
-  govc vm.ip -n 00:0c:29:57:7b:c3 $vm
-  govc vm.ip -n ethernet-0 $vm
-  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
-  govc vm.ip -esxcli $vm
-
-Options:
-  -a=false                  Wait for an IP address on all NICs
-  -esxcli=false             Use esxcli instead of guest tools
-  -n=                       Wait for IP address on NIC, specified by device name or MAC
-  -v4=false                 Only report IPv4 addresses
-  -wait=1h0m0s              Wait time for the VM obtain an IP address
-```
-
-## vm.markastemplate
-
-```
-Usage: govc vm.markastemplate [OPTIONS] VM...
-
-Mark VM as a virtual machine template.
-
-Examples:
-  govc vm.markastemplate $name
-
-Options:
-```
-
-## vm.markasvm
-
-```
-Usage: govc vm.markasvm [OPTIONS] VM...
-
-Mark VM template as a virtual machine.
-
-Examples:
-  govc vm.markasvm $name -host host1
-  govc vm.markasvm $name -pool cluster1/Resources
-
-Options:
-  -host=                    Host system [GOVC_HOST]
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-```
-
-## vm.migrate
-
-```
-Usage: govc vm.migrate [OPTIONS] VM...
-
-Migrates VM to a specific resource pool, host or datastore.
-
-Examples:
-  govc vm.migrate -host another-host vm-1 vm-2 vm-3
-  govc vm.migrate -ds another-ds vm-1 vm-2 vm-3
-
-Options:
-  -ds=                       Datastore [GOVC_DATASTORE]
-  -host=                     Host system [GOVC_HOST]
-  -pool=                     Resource pool [GOVC_RESOURCE_POOL]
-  -priority=defaultPriority  The task priority
-```
-
-## vm.network.add
-
-```
-Usage: govc vm.network.add [OPTIONS]
-
-Add network adapter to VM.
-
-Examples:
-  govc vm.network.add -vm $vm -net "VM Network" -net.adapter e1000e
-  govc device.info -vm $vm ethernet-*
-
-Options:
-  -net=                     Network [GOVC_NETWORK]
-  -net.adapter=e1000        Network adapter type
-  -net.address=             Network hardware address
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.network.change
-
-```
-Usage: govc vm.network.change [OPTIONS] DEVICE
-
-Change network DEVICE configuration.
-
-Examples:
-  govc vm.network.change -vm $vm -net PG2 ethernet-0
-  govc vm.network.change -vm $vm -net.address 00:00:0f:2e:5d:69 ethernet-0
-  govc device.info -vm $vm ethernet-*
-
-Options:
-  -net=                     Network [GOVC_NETWORK]
-  -net.adapter=e1000        Network adapter type
-  -net.address=             Network hardware address
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.power
-
-```
-Usage: govc vm.power [OPTIONS]
-
-Options:
-  -force=false              Force (ignore state error and hard shutdown/reboot if tools unavailable)
-  -off=false                Power off
-  -on=false                 Power on
-  -r=false                  Reboot guest
-  -reset=false              Power reset
-  -s=false                  Shutdown guest
-  -suspend=false            Power suspend
-```
-
-## vm.question
-
-```
-Usage: govc vm.question [OPTIONS]
-
-Options:
-  -answer=                  Answer to question
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.rdm.attach
-
-```
-Usage: govc vm.rdm.attach [OPTIONS]
-
-Attach DEVICE to VM with RDM.
-
-Examples:
-  govc vm.rdm.attach -vm VM -device /vmfs/devices/disks/naa.000000000000000000000000000000000
-
-Options:
-  -device=                  Device Name
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.rdm.ls
-
-```
-Usage: govc vm.rdm.ls [OPTIONS]
-
-List available devices that could be attach to VM with RDM.
-
-Examples:
-  govc vm.rdm.ls -vm VM
-
-Options:
-  -vm=                      Virtual machine [GOVC_VM]
-```
-
-## vm.register
-
-```
-Usage: govc vm.register [OPTIONS] VMX
-
-Add an existing VM to the inventory.
-
-VMX is a path to the vm config file, relative to DATASTORE.
-
-Examples:
-  govc vm.register path/name.vmx
-
-Options:
-  -as-template=false        Mark VM as template
-  -ds=                      Datastore [GOVC_DATASTORE]
-  -folder=                  Inventory folder [GOVC_FOLDER]
-  -host=                    Host system [GOVC_HOST]
-  -name=                    Name of the VM
-  -pool=                    Resource pool [GOVC_RESOURCE_POOL]
-```
-
-## vm.unregister
-
-```
-Usage: govc vm.unregister [OPTIONS] VM...
-
-Remove VM from inventory without removing any of the VM files on disk.
-
-Options:
-```
-
-## vm.vnc
-
-```
-Usage: govc vm.vnc [OPTIONS] VM...
-
-Enable or disable VNC for VM.
-
-Port numbers are automatically chosen if not specified.
-
-If neither -enable or -disable is specified, the current state is returned.
-
-Examples:
-  govc vm.vnc -enable -password 1234 $vm | awk '{print $2}' | xargs open
-
-Options:
-  -disable=false            Disable VNC
-  -enable=false             Enable VNC
-  -password=                VNC password
-  -port=-1                  VNC port (-1 for auto-select)
-  -port-range=5900-5999     VNC port auto-select range
-```
-
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/about/cert.go b/installer/vendor/github.com/vmware/govmomi/govc/about/cert.go
deleted file mode 100644
index 37bea94a03..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/about/cert.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package about
-
-import (
-	"context"
-	"encoding/pem"
-	"flag"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type cert struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-
-	show       bool
-	thumbprint bool
-}
-
-func init() {
-	cli.Register("about.cert", &cert{})
-}
-
-func (cmd *cert) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.show, "show", false, "Show PEM encoded server certificate only")
-	f.BoolVar(&cmd.thumbprint, "thumbprint", false, "Output host hash and thumbprint only")
-}
-
-func (cmd *cert) Description() string {
-	return `Display TLS certificate info for HOST.
-
-If the HOST certificate cannot be verified, about.cert will return with exit code 60 (as curl does).
-If the '-k' flag is provided, about.cert will return with exit code 0 in this case.
-The SHA1 thumbprint can also be used as '-thumbprint' for the 'host.add' and 'cluster.add' commands.
-
-Examples:
-  govc about.cert -k -json | jq -r .ThumbprintSHA1
-  govc about.cert -k -show | sudo tee /usr/local/share/ca-certificates/host.crt
-  govc about.cert -k -thumbprint | tee -a ~/.govmomi/known_hosts`
-}
-
-func (cmd *cert) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type certResult struct {
-	cmd  *cert
-	info object.HostCertificateInfo
-}
-
-func (r *certResult) Write(w io.Writer) error {
-	if r.cmd.show {
-		return pem.Encode(w, &pem.Block{Type: "CERTIFICATE", Bytes: r.info.Certificate.Raw})
-	}
-
-	if r.cmd.thumbprint {
-		u := r.cmd.URLWithoutPassword()
-		_, err := fmt.Fprintf(w, "%s %s\n", u.Host, r.info.ThumbprintSHA1)
-		return err
-	}
-
-	return r.cmd.WriteResult(&r.info)
-}
-
-func (cmd *cert) Run(ctx context.Context, f *flag.FlagSet) error {
-	u := cmd.URLWithoutPassword()
-	c := soap.NewClient(u, false)
-	t := c.Client.Transport.(*http.Transport)
-	r := certResult{cmd: cmd}
-
-	if err := cmd.SetRootCAs(c); err != nil {
-		return err
-	}
-
-	if err := r.info.FromURL(u, t.TLSClientConfig); err != nil {
-		return err
-	}
-
-	if r.info.Err != nil && r.cmd.IsSecure() {
-		cmd.Out = os.Stderr
-		// using same exit code as curl:
-		defer os.Exit(60)
-	}
-
-	return r.Write(cmd.Out)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/about/command.go b/installer/vendor/github.com/vmware/govmomi/govc/about/command.go
deleted file mode 100644
index e36a222b53..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/about/command.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package about
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type about struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-
-	Long bool
-}
-
-func init() {
-	cli.Register("about", &about{})
-}
-
-func (cmd *about) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.Long, "l", false, "Include service content")
-}
-
-func (cmd *about) Description() string {
-	return `Display About info for HOST.
-
-System information including the name, type, version, and build number.
-
-Examples:
-  govc about
-  govc about -json | jq -r .About.ProductLineId`
-}
-
-func (cmd *about) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *about) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	res := infoResult{
-		a: &c.ServiceContent.About,
-	}
-
-	if cmd.Long {
-		res.Content = &c.ServiceContent
-	} else {
-		res.About = res.a
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Content *types.ServiceContent `json:",omitempty"`
-	About   *types.AboutInfo      `json:",omitempty"`
-	a       *types.AboutInfo
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Name:\t%s\n", r.a.Name)
-	fmt.Fprintf(tw, "Vendor:\t%s\n", r.a.Vendor)
-	fmt.Fprintf(tw, "Version:\t%s\n", r.a.Version)
-	fmt.Fprintf(tw, "Build:\t%s\n", r.a.Build)
-	fmt.Fprintf(tw, "OS type:\t%s\n", r.a.OsType)
-	fmt.Fprintf(tw, "API type:\t%s\n", r.a.ApiType)
-	fmt.Fprintf(tw, "API version:\t%s\n", r.a.ApiVersion)
-	fmt.Fprintf(tw, "Product ID:\t%s\n", r.a.ProductLineId)
-	fmt.Fprintf(tw, "UUID:\t%s\n", r.a.InstanceUuid)
-	return tw.Flush()
-}
-
-func (r *infoResult) Dump() interface{} {
-	if r.Content != nil {
-		return r.Content
-	}
-	return r.About
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/build.sh b/installer/vendor/github.com/vmware/govmomi/govc/build.sh
deleted file mode 100755
index dcde210af1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/build.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash -e
-
-git_version=$(git describe)
-if git_status=$(git status --porcelain 2>/dev/null) && [ -n "${git_status}" ]; then
-  git_version="${git_version}-dirty"
-fi
-
-ldflags="-X github.com/vmware/govmomi/govc/version.gitVersion=${git_version}"
-
-BUILD_OS=${BUILD_OS:-darwin linux windows freebsd}
-BUILD_ARCH=${BUILD_ARCH:-386 amd64}
-
-for os in ${BUILD_OS}; do
-  export GOOS="${os}"
-  for arch in ${BUILD_ARCH}; do
-    export GOARCH="${arch}"
-
-    out="govc_${os}_${arch}"
-    if [ "${os}" == "windows" ]; then
-      out="${out}.exe"
-    fi
-
-    set -x
-    go build \
-      -o="${out}" \
-      -pkgdir="./_pkg" \
-      -compiler='gc' \
-      -ldflags="${ldflags}" \
-      github.com/vmware/govmomi/govc &
-    set +x
-  done
-done
-
-wait
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/cluster/add.go b/installer/vendor/github.com/vmware/govmomi/govc/cluster/add.go
deleted file mode 100644
index e29af5ab80..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/cluster/add.go
+++ /dev/null
@@ -1,122 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cluster
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type add struct {
-	*flags.DatacenterFlag
-	*flags.HostConnectFlag
-
-	cluster string
-	connect bool
-	license string
-}
-
-func init() {
-	cli.Register("cluster.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
-	cmd.HostConnectFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.cluster, "cluster", "*", "Path to cluster")
-
-	f.StringVar(&cmd.license, "license", "", "Assign license key")
-
-	f.BoolVar(&cmd.connect, "connect", true, "Immediately connect to host")
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
-		return err
-	}
-	if cmd.HostName == "" {
-		return flag.ErrHelp
-	}
-	if cmd.UserName == "" {
-		return flag.ErrHelp
-	}
-	if cmd.Password == "" {
-		return flag.ErrHelp
-	}
-	return nil
-}
-
-func (cmd *add) Description() string {
-	return `Add HOST to CLUSTER.
-
-The host is added to the cluster specified by the 'cluster' flag.
-
-Examples:
-  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
-  govc cluster.add -cluster ClusterA -hostname host.example.com -username root -password pass -thumbprint $thumbprint
-  govc cluster.add -cluster ClusterB -hostname 10.0.6.1 -username root -password pass -noverify`
-}
-
-func (cmd *add) Add(ctx context.Context, cluster *object.ClusterComputeResource) error {
-	spec := cmd.HostConnectSpec
-
-	var license *string
-	if cmd.license != "" {
-		license = &cmd.license
-	}
-
-	task, err := cluster.AddHost(ctx, cmd.Spec(cluster.Client()), cmd.connect, license, nil)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to cluster %s... ", spec.HostName, cluster.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	cluster, err := finder.ClusterComputeResource(ctx, cmd.cluster)
-	if err != nil {
-		return err
-	}
-
-	return cmd.Fault(cmd.Add(ctx, cluster))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/cluster/change.go b/installer/vendor/github.com/vmware/govmomi/govc/cluster/change.go
deleted file mode 100644
index 2ef8fe5fa2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/cluster/change.go
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cluster
-
-import (
-	"context"
-	"flag"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.DatacenterFlag
-
-	types.ClusterConfigSpecEx
-}
-
-func init() {
-	cli.Register("cluster.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.DrsConfig = new(types.ClusterDrsConfigInfo)
-	cmd.DasConfig = new(types.ClusterDasConfigInfo)
-	cmd.VsanConfig = new(types.VsanClusterConfigInfo)
-	cmd.VsanConfig.DefaultConfig = new(types.VsanClusterConfigInfoHostDefaultInfo)
-
-	// DRS
-	f.Var(flags.NewOptionalBool(&cmd.DrsConfig.Enabled), "drs-enabled", "Enable DRS")
-
-	drsModes := []string{
-		string(types.DrsBehaviorManual),
-		string(types.DrsBehaviorPartiallyAutomated),
-		string(types.DrsBehaviorFullyAutomated),
-	}
-	f.StringVar((*string)(&cmd.DrsConfig.DefaultVmBehavior), "drs-mode", "",
-		"DRS behavior for virtual machines: "+strings.Join(drsModes, ", "))
-
-	// HA
-	f.Var(flags.NewOptionalBool(&cmd.DasConfig.Enabled), "ha-enabled", "Enable HA")
-
-	// vSAN
-	f.Var(flags.NewOptionalBool(&cmd.VsanConfig.Enabled), "vsan-enabled", "Enable vSAN")
-	f.Var(flags.NewOptionalBool(&cmd.VsanConfig.DefaultConfig.AutoClaimStorage), "vsan-autoclaim", "Autoclaim storage on cluster hosts")
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Usage() string {
-	return "CLUSTER..."
-}
-
-func (cmd *change) Description() string {
-	return `Change configuration of the given clusters.
-
-Examples:
-  govc cluster.change -drs-enabled -vsan-enabled -vsan-autoclaim ClusterA
-  govc cluster.change -drs-enabled=false ClusterB`
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, path := range f.Args() {
-		clusters, err := finder.ClusterComputeResourceList(ctx, path)
-		if err != nil {
-			return err
-		}
-
-		for _, cluster := range clusters {
-			task, err := cluster.Reconfigure(ctx, &cmd.ClusterConfigSpecEx, true)
-			if err != nil {
-				return err
-			}
-
-			_, err = task.WaitForResult(ctx, nil)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/cluster/create.go b/installer/vendor/github.com/vmware/govmomi/govc/cluster/create.go
deleted file mode 100644
index 265e9d301f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/cluster/create.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cluster
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.FolderFlag
-
-	types.ClusterConfigSpecEx
-}
-
-func init() {
-	cli.Register("cluster.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-}
-
-func (cmd *create) Usage() string {
-	return "CLUSTER"
-}
-
-func (cmd *create) Description() string {
-	return `Create CLUSTER in datacenter.
-
-The cluster is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the host folder in the specified or default datacenter.
-
-Examples:
-  govc cluster.create ClusterA
-  govc cluster.create -folder /dc2/test-folder ClusterB`
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	folder, err := cmd.FolderOrDefault("host")
-	if err != nil {
-		return err
-	}
-
-	_, err = folder.CreateCluster(ctx, f.Arg(0), cmd.ClusterConfigSpecEx)
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datacenter/create.go b/installer/vendor/github.com/vmware/govmomi/govc/datacenter/create.go
deleted file mode 100644
index 733bc7af63..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datacenter/create.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datacenter
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type create struct {
-	*flags.FolderFlag
-}
-
-func init() {
-	cli.Register("datacenter.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-}
-
-func (cmd *create) Usage() string {
-	return "NAME..."
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	folder, err := cmd.FolderOrDefault("/")
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	for _, name := range f.Args() {
-		_, err := folder.CreateDatacenter(ctx, name)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datacenter/info.go b/installer/vendor/github.com/vmware/govmomi/govc/datacenter/info.go
deleted file mode 100644
index 8674df20e1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datacenter/info.go
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datacenter
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"path"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("datacenter.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	args := f.Args()
-	if len(args) == 0 {
-		args = []string{"*"}
-	}
-
-	var props []string
-	res := infoResult{
-		finder: finder,
-		ctx:    ctx,
-	}
-
-	if !cmd.OutputFlag.All() {
-		props = []string{
-			"name",
-			"vmFolder",
-			"hostFolder",
-			"datastoreFolder",
-			"networkFolder",
-			"datastore",
-			"network",
-		}
-	}
-
-	for _, arg := range args {
-		objects, err := finder.DatacenterList(ctx, arg)
-		if err != nil {
-			return err
-		}
-		res.objects = append(res.objects, objects...)
-	}
-
-	if len(res.objects) != 0 {
-		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
-		for _, o := range res.objects {
-			refs = append(refs, o.Reference())
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &res.Datacenters)
-		if err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Datacenters []mo.Datacenter
-	objects     []*object.Datacenter
-	finder      *find.Finder
-	ctx         context.Context
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.Datacenter, len(r.Datacenters))
-	for _, o := range r.Datacenters {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		dc := objects[o.Reference()]
-		fmt.Fprintf(tw, "Name:\t%s\n", dc.Name)
-		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-
-		folders, err := o.Folders(r.ctx)
-		if err != nil {
-			return err
-		}
-
-		r.finder.SetDatacenter(o)
-
-		hosts, _ := r.finder.HostSystemList(r.ctx, path.Join(folders.HostFolder.InventoryPath, "*"))
-		fmt.Fprintf(tw, "  Hosts:\t%d\n", len(hosts))
-
-		clusters, _ := r.finder.ClusterComputeResourceList(r.ctx, path.Join(folders.HostFolder.InventoryPath, "*"))
-		fmt.Fprintf(tw, "  Clusters:\t%d\n", len(clusters))
-
-		vms, _ := r.finder.VirtualMachineList(r.ctx, path.Join(folders.VmFolder.InventoryPath, "*"))
-		fmt.Fprintf(tw, "  Virtual Machines:\t%d\n", len(vms))
-
-		fmt.Fprintf(tw, "  Networks:\t%d\n", len(dc.Network))
-		fmt.Fprintf(tw, "  Datastores:\t%d\n", len(dc.Datastore))
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/cp.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/cp.go
deleted file mode 100644
index 83c4955358..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/cp.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type cp struct {
-	*flags.OutputFlag
-	*flags.DatastoreFlag
-
-	force bool
-}
-
-func init() {
-	cli.Register("datastore.cp", &cp{})
-}
-
-func (cmd *cp) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "f", false, "If true, overwrite any identically named file at the destination")
-}
-
-func (cmd *cp) Process(ctx context.Context) error {
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *cp) Usage() string {
-	return "SRC DST"
-}
-
-func (cmd *cp) Description() string {
-	return `Copy SRC to DST on DATASTORE.
-
-Examples:
-  govc datastore.cp foo/foo.vmx foo/foo.vmx.old
-  govc datastore.cp -f my.vmx foo/foo.vmx`
-}
-
-func (cmd *cp) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) != 2 {
-		return errors.New("SRC and DST arguments are required")
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	dc, err := cmd.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	// TODO: support cross-datacenter copy
-
-	src, err := cmd.DatastorePath(args[0])
-	if err != nil {
-		return err
-	}
-
-	dst, err := cmd.DatastorePath(args[1])
-	if err != nil {
-		return err
-	}
-
-	m := object.NewFileManager(c)
-	task, err := m.CopyDatastoreFile(ctx, src, dc, dst, dc, cmd.force)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/create.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/create.go
deleted file mode 100644
index 2e9890152b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/create.go
+++ /dev/null
@@ -1,321 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.HostSystemFlag
-
-	// Generic options
-	Type  typeFlag
-	Name  string
-	Force bool
-
-	// Options for NAS
-	RemoteHost string
-	RemotePath string
-	AccessMode string
-	UserName   string
-	Password   string
-
-	// Options for VMFS
-	DiskCanonicalName string
-
-	// Options for local
-	Path string
-}
-
-func init() {
-	cli.Register("datastore.create", &create{})
-}
-
-var nasTypes = []string{
-	string(types.HostFileSystemVolumeFileSystemTypeNFS),
-	string(types.HostFileSystemVolumeFileSystemTypeNFS41),
-	string(types.HostFileSystemVolumeFileSystemTypeCIFS),
-}
-
-var vmfsTypes = []string{
-	string(types.HostFileSystemVolumeFileSystemTypeVMFS),
-}
-
-var localTypes = []string{
-	"local",
-}
-
-var allTypes = []string{}
-
-func init() {
-	allTypes = append(allTypes, nasTypes...)
-	allTypes = append(allTypes, vmfsTypes...)
-	allTypes = append(allTypes, localTypes...)
-}
-
-type typeFlag string
-
-func (t *typeFlag) Set(s string) error {
-	s = strings.ToLower(s)
-	for _, e := range allTypes {
-		if s == strings.ToLower(e) {
-			*t = typeFlag(e)
-			return nil
-		}
-	}
-
-	return fmt.Errorf("unknown type")
-}
-
-func (t *typeFlag) String() string {
-	return string(*t)
-}
-
-func (t *typeFlag) partOf(m []string) bool {
-	for _, e := range m {
-		if t.String() == e {
-			return true
-		}
-	}
-	return false
-}
-
-func (t *typeFlag) IsNasType() bool {
-	return t.partOf(nasTypes)
-}
-
-func (t *typeFlag) IsVmfsType() bool {
-	return t.partOf(vmfsTypes)
-}
-
-func (t *typeFlag) IsLocalType() bool {
-	return t.partOf(localTypes)
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	modes := []string{
-		string(types.HostMountModeReadOnly),
-		string(types.HostMountModeReadWrite),
-	}
-
-	f.StringVar(&cmd.Name, "name", "", "Datastore name")
-	f.Var(&cmd.Type, "type", fmt.Sprintf("Datastore type (%s)", strings.Join(allTypes, "|")))
-	f.BoolVar(&cmd.Force, "force", false, "Ignore DuplicateName error if datastore is already mounted on a host")
-
-	// Options for NAS
-	f.StringVar(&cmd.RemoteHost, "remote-host", "", "Remote hostname of the NAS datastore")
-	f.StringVar(&cmd.RemotePath, "remote-path", "", "Remote path of the NFS mount point")
-	f.StringVar(&cmd.AccessMode, "mode", modes[0],
-		fmt.Sprintf("Access mode for the mount point (%s)", strings.Join(modes, "|")))
-	f.StringVar(&cmd.UserName, "username", "", "Username to use when connecting (CIFS only)")
-	f.StringVar(&cmd.Password, "password", "", "Password to use when connecting (CIFS only)")
-
-	// Options for VMFS
-	f.StringVar(&cmd.DiskCanonicalName, "disk", "", "Canonical name of disk (VMFS only)")
-
-	// Options for Local
-	f.StringVar(&cmd.Path, "path", "", "Local directory path for the datastore (local only)")
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *create) Description() string {
-	return `Create datastore on HOST.
-
-Examples:
-  govc datastore.create -type nfs -name nfsDatastore -remote-host 10.143.2.232 -remote-path /share cluster1
-  govc datastore.create -type vmfs -name vmfsDatastore -disk=mpx.vmhba0:C0:T0:L0 cluster1
-  govc datastore.create -type local -name localDatastore -path /var/datastore host1`
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	switch {
-	case cmd.Type.IsNasType():
-		return cmd.CreateNasDatastore(ctx, hosts)
-	case cmd.Type.IsVmfsType():
-		return cmd.CreateVmfsDatastore(ctx, hosts)
-	case cmd.Type.IsLocalType():
-		return cmd.CreateLocalDatastore(ctx, hosts)
-	default:
-		return fmt.Errorf("unhandled type %#v", cmd.Type)
-	}
-}
-
-func (cmd *create) GetHostNasVolumeSpec() types.HostNasVolumeSpec {
-	localPath := cmd.Path
-	if localPath == "" {
-		localPath = cmd.Name
-	}
-
-	s := types.HostNasVolumeSpec{
-		LocalPath:  localPath,
-		Type:       cmd.Type.String(),
-		RemoteHost: cmd.RemoteHost,
-		RemotePath: cmd.RemotePath,
-		AccessMode: cmd.AccessMode,
-		UserName:   cmd.UserName,
-		Password:   cmd.Password,
-	}
-
-	return s
-}
-
-func (cmd *create) CreateNasDatastore(ctx context.Context, hosts []*object.HostSystem) error {
-	object := types.ManagedObjectReference{
-		Type:  "Datastore",
-		Value: fmt.Sprintf("%s:%s", cmd.RemoteHost, cmd.RemotePath),
-	}
-
-	spec := cmd.GetHostNasVolumeSpec()
-
-	for _, host := range hosts {
-		ds, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		_, err = ds.CreateNasDatastore(ctx, spec)
-		if err != nil {
-			if soap.IsSoapFault(err) {
-				switch fault := soap.ToSoapFault(err).VimFault().(type) {
-				case types.PlatformConfigFault:
-					if len(fault.FaultMessage) != 0 {
-						return errors.New(fault.FaultMessage[0].Message)
-					}
-				case types.DuplicateName:
-					if cmd.Force && fault.Object == object {
-						fmt.Fprintf(os.Stderr, "%s: '%s' already mounted\n",
-							host.InventoryPath, cmd.Name)
-						continue
-					}
-				}
-			}
-
-			return fmt.Errorf("%s: %s", host.InventoryPath, err)
-		}
-	}
-
-	return nil
-}
-
-func (cmd *create) CreateVmfsDatastore(ctx context.Context, hosts []*object.HostSystem) error {
-	for _, host := range hosts {
-		ds, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		// Find the specified disk
-		disks, err := ds.QueryAvailableDisksForVmfs(ctx)
-		if err != nil {
-			return err
-		}
-
-		var disk *types.HostScsiDisk
-		for _, e := range disks {
-			if e.CanonicalName == cmd.DiskCanonicalName {
-				disk = &e
-				break
-			}
-		}
-
-		if disk == nil {
-			return fmt.Errorf("no eligible disk found for name %#v", cmd.DiskCanonicalName)
-		}
-
-		// Query for creation options and pick the right one
-		options, err := ds.QueryVmfsDatastoreCreateOptions(ctx, disk.DevicePath)
-		if err != nil {
-			return err
-		}
-
-		var option *types.VmfsDatastoreOption
-		for _, e := range options {
-			if _, ok := e.Info.(*types.VmfsDatastoreAllExtentOption); ok {
-				option = &e
-				break
-			}
-		}
-
-		if option == nil {
-			return fmt.Errorf("cannot use entire disk for datastore for name %#v", cmd.DiskCanonicalName)
-		}
-
-		spec := *option.Spec.(*types.VmfsDatastoreCreateSpec)
-		spec.Vmfs.VolumeName = cmd.Name
-		_, err = ds.CreateVmfsDatastore(ctx, spec)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (cmd *create) CreateLocalDatastore(ctx context.Context, hosts []*object.HostSystem) error {
-	for _, host := range hosts {
-		ds, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		if cmd.Path == "" {
-			cmd.Path = cmd.Name
-		}
-
-		if cmd.Name == "" {
-			cmd.Name = filepath.Base(cmd.Path)
-		}
-
-		_, err = ds.CreateLocalDatastore(ctx, cmd.Name, cmd.Path)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
deleted file mode 100644
index c629c2a2ce..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/create.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package disk
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.DatastoreFlag
-
-	Bytes units.ByteSize
-}
-
-func init() {
-	cli.Register("datastore.disk.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	_ = cmd.Bytes.Set("10G")
-	f.Var(&cmd.Bytes, "size", "Size of new disk")
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Usage() string {
-	return "VMDK"
-}
-
-func (cmd *create) Description() string {
-	return `Create VMDK on DS.
-
-Examples:
-  govc datastore.mkdir disks
-  govc datastore.disk.create -size 24G disks/disk1.vmdk`
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	dc, err := cmd.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	m := object.NewVirtualDiskManager(ds.Client())
-
-	spec := &types.FileBackedVirtualDiskSpec{
-		VirtualDiskSpec: types.VirtualDiskSpec{
-			AdapterType: string(types.VirtualDiskAdapterTypeLsiLogic),
-			DiskType:    string(types.VirtualDiskTypeThin),
-		},
-		CapacityKb: int64(cmd.Bytes) / 1024,
-	}
-
-	task, err := m.CreateVirtualDisk(ctx, ds.Path(f.Arg(0)), dc, spec)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go
deleted file mode 100644
index 338c5c8230..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/disk/info.go
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package disk
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type info struct {
-	*flags.DatastoreFlag
-
-	c bool
-	d bool
-	p bool
-}
-
-func init() {
-	cli.Register("datastore.disk.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.c, "c", false, "Chain format")
-	f.BoolVar(&cmd.d, "d", false, "Include datastore in output")
-	f.BoolVar(&cmd.p, "p", true, "Include parents")
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "VMDK"
-}
-
-func (cmd *info) Description() string {
-	return `Query VMDK info on DS.
-
-Examples:
-  govc datastore.disk.info disks/disk1.vmdk`
-}
-
-func fullPath(s string) string {
-	return s
-}
-
-func dsPath(s string) string {
-	var p object.DatastorePath
-
-	if p.FromString(s) {
-		return p.Path
-	}
-
-	return s
-}
-
-var infoPath = dsPath
-
-type infoResult []object.VirtualDiskInfo
-
-func (r infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, info := range r {
-		fmt.Fprintf(tw, "Name:\t%s\n", infoPath(info.Name))
-		fmt.Fprintf(tw, "  Type:\t%s\n", info.DiskType)
-		fmt.Fprintf(tw, "  Parent:\t%s\n", infoPath(info.Parent))
-	}
-
-	return tw.Flush()
-}
-
-type chainResult []object.VirtualDiskInfo
-
-func (r chainResult) Write(w io.Writer) error {
-	for i, info := range r {
-		fmt.Fprint(w, strings.Repeat(" ", i*2))
-		fmt.Fprintln(w, infoPath(info.Name))
-	}
-
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	dc, err := cmd.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	m := object.NewVirtualDiskManager(ds.Client())
-
-	info, err := m.QueryVirtualDiskInfo(ctx, ds.Path(f.Arg(0)), dc, cmd.p)
-	if err != nil {
-		return err
-	}
-
-	if cmd.d {
-		infoPath = fullPath
-	}
-
-	var r flags.OutputWriter = infoResult(info)
-
-	if cmd.c {
-		r = chainResult(info)
-	}
-
-	return cmd.WriteResult(r)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/download.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/download.go
deleted file mode 100644
index bb4cb8e7de..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/download.go
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type download struct {
-	*flags.DatastoreFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("datastore.download", &download{})
-}
-
-func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *download) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *download) Usage() string {
-	return "SOURCE DEST"
-}
-
-func (cmd *download) Description() string {
-	return `Copy SOURCE from DS to DEST on the local system.
-
-If DEST name is "-", source is written to stdout.
-
-Examples:
-  govc datastore.download vm-name/vmware.log ./local.log
-  govc datastore.download vm-name/vmware.log - | grep -i error`
-}
-
-func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) != 2 {
-		return errors.New("invalid arguments")
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	h, err := cmd.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	var via string
-
-	if h != nil {
-		via = fmt.Sprintf(" via %s", h.InventoryPath)
-		ctx = ds.HostContext(ctx, h)
-	}
-
-	p := soap.DefaultDownload
-
-	src := args[0]
-	dst := args[1]
-
-	if dst == "-" {
-		f, _, err := ds.Download(ctx, src, &p)
-		if err != nil {
-			return err
-		}
-		_, err = io.Copy(os.Stdout, f)
-		return err
-	}
-
-	if cmd.DatastoreFlag.OutputFlag.TTY {
-		logger := cmd.DatastoreFlag.ProgressLogger(fmt.Sprintf("Downloading%s... ", via))
-		p.Progress = logger
-		defer logger.Wait()
-	}
-
-	return ds.DownloadFile(ctx, src, dst, &p)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/info.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/info.go
deleted file mode 100644
index aef3d59bc8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/info.go
+++ /dev/null
@@ -1,153 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("datastore.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	args := f.Args()
-	if len(args) == 0 {
-		args = []string{"*"}
-	}
-
-	var res infoResult
-	var props []string
-
-	if cmd.OutputFlag.All() {
-		props = nil // Load everything
-	} else {
-		props = []string{"info", "summary"} // Load summary
-	}
-
-	for _, arg := range args {
-		objects, err := finder.DatastoreList(ctx, arg)
-		if err != nil {
-			return err
-		}
-		res.objects = append(res.objects, objects...)
-	}
-
-	if len(res.objects) != 0 {
-		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
-		for _, o := range res.objects {
-			refs = append(refs, o.Reference())
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &res.Datastores)
-		if err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Datastores []mo.Datastore
-	objects    []*object.Datastore
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.Datastore, len(r.Datastores))
-	for _, o := range r.Datastores {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		ds := objects[o.Reference()]
-		s := ds.Summary
-		fmt.Fprintf(tw, "Name:\t%s\n", s.Name)
-		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-		fmt.Fprintf(tw, "  Type:\t%s\n", s.Type)
-		fmt.Fprintf(tw, "  URL:\t%s\n", s.Url)
-		fmt.Fprintf(tw, "  Capacity:\t%.1f GB\n", float64(s.Capacity)/(1<<30))
-		fmt.Fprintf(tw, "  Free:\t%.1f GB\n", float64(s.FreeSpace)/(1<<30))
-
-		switch info := ds.Info.(type) {
-		case *types.NasDatastoreInfo:
-			fmt.Fprintf(tw, "  Remote:\t%s:%s\n", info.Nas.RemoteHost, info.Nas.RemotePath)
-		}
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/ls.go
deleted file mode 100644
index fc0e82f184..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/ls.go
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"path"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*flags.DatastoreFlag
-	*flags.OutputFlag
-
-	long    bool
-	slash   bool
-	all     bool
-	recurse bool
-}
-
-func init() {
-	cli.Register("datastore.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.long, "l", false, "Long listing format")
-	f.BoolVar(&cmd.slash, "p", false, "Append / indicator to directories")
-	f.BoolVar(&cmd.all, "a", false, "Do not ignore entries starting with .")
-	f.BoolVar(&cmd.recurse, "R", false, "List subdirectories recursively")
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "[FILE]..."
-}
-
-func isInvalid(err error) bool {
-	if f, ok := err.(types.HasFault); ok {
-		switch f.Fault().(type) {
-		case *types.InvalidArgument:
-			return true
-		}
-	}
-
-	return false
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := cmd.Args(f.Args())
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	b, err := ds.Browser(ctx)
-	if err != nil {
-		return err
-	}
-
-	if len(args) == 0 {
-		args = append(args, object.DatastorePath{})
-	}
-
-	result := &listOutput{
-		rs:  make([]types.HostDatastoreBrowserSearchResults, 0),
-		cmd: cmd,
-	}
-
-	for _, p := range args {
-		arg := p.Path
-
-		spec := types.HostDatastoreBrowserSearchSpec{
-			MatchPattern: []string{"*"},
-		}
-
-		if cmd.long {
-			spec.Details = &types.FileQueryFlags{
-				FileType:     true,
-				FileSize:     true,
-				FileOwner:    types.NewBool(true), // TODO: omitempty is generated, but seems to be required
-				Modification: true,
-			}
-		}
-
-		for i := 0; ; i++ {
-			r, err := cmd.ListPath(b, arg, spec)
-			if err != nil {
-				// Treat the argument as a match pattern if not found as directory
-				if i == 0 && types.IsFileNotFound(err) || isInvalid(err) {
-					spec.MatchPattern[0] = path.Base(arg)
-					arg = path.Dir(arg)
-					continue
-				}
-
-				return err
-			}
-
-			// Treat an empty result against match pattern as file not found
-			if i == 1 && len(r) == 1 && len(r[0].File) == 0 {
-				return fmt.Errorf("File %s/%s was not found", r[0].FolderPath, spec.MatchPattern[0])
-			}
-
-			for n := range r {
-				result.add(r[n])
-			}
-
-			break
-		}
-	}
-
-	return cmd.WriteResult(result)
-}
-
-func (cmd *ls) ListPath(b *object.HostDatastoreBrowser, path string, spec types.HostDatastoreBrowserSearchSpec) ([]types.HostDatastoreBrowserSearchResults, error) {
-	ctx := context.TODO()
-
-	path, err := cmd.DatastorePath(path)
-	if err != nil {
-		return nil, err
-	}
-
-	search := b.SearchDatastore
-	if cmd.recurse {
-		search = b.SearchDatastoreSubFolders
-	}
-
-	task, err := search(ctx, path, &spec)
-	if err != nil {
-		return nil, err
-	}
-
-	info, err := task.WaitForResult(ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	switch r := info.Result.(type) {
-	case types.HostDatastoreBrowserSearchResults:
-		return []types.HostDatastoreBrowserSearchResults{r}, nil
-	case types.ArrayOfHostDatastoreBrowserSearchResults:
-		return r.HostDatastoreBrowserSearchResults, nil
-	default:
-		panic(fmt.Sprintf("unknown result type: %T", r))
-	}
-}
-
-type listOutput struct {
-	rs  []types.HostDatastoreBrowserSearchResults
-	cmd *ls
-}
-
-func (o *listOutput) add(r types.HostDatastoreBrowserSearchResults) {
-	if o.cmd.recurse && !o.cmd.all {
-		// filter out ".hidden" directories
-		path := strings.SplitN(r.FolderPath, " ", 2)
-		if len(path) == 2 {
-			path = strings.Split(path[1], "/")
-			if path[0] == "." {
-				path = path[1:]
-			}
-
-			for _, p := range path {
-				if len(p) != 0 && p[0] == '.' {
-					return
-				}
-			}
-		}
-	}
-
-	res := r
-	res.File = nil
-
-	for _, f := range r.File {
-		if f.GetFileInfo().Path[0] == '.' && !o.cmd.all {
-			continue
-		}
-
-		if o.cmd.slash {
-			if d, ok := f.(*types.FolderFileInfo); ok {
-				d.Path += "/"
-			}
-		}
-
-		res.File = append(res.File, f)
-	}
-
-	o.rs = append(o.rs, res)
-}
-
-// hasMultiplePaths returns whether or not the slice of search results contains
-// results from more than one folder path.
-func (o *listOutput) hasMultiplePaths() bool {
-	if len(o.rs) == 0 {
-		return false
-	}
-
-	p := o.rs[0].FolderPath
-
-	// Multiple paths if any entry is not equal to the first one.
-	for _, e := range o.rs {
-		if e.FolderPath != p {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (o *listOutput) MarshalJSON() ([]byte, error) {
-	return json.Marshal(o.rs)
-}
-
-func (o *listOutput) Write(w io.Writer) error {
-	// Only include path header if we're dealing with more than one path.
-	includeHeader := false
-	if o.hasMultiplePaths() {
-		includeHeader = true
-	}
-
-	tw := tabwriter.NewWriter(w, 3, 0, 2, ' ', 0)
-	for i, r := range o.rs {
-		if includeHeader {
-			if i > 0 {
-				fmt.Fprintf(tw, "\n")
-			}
-			fmt.Fprintf(tw, "%s:\n", r.FolderPath)
-		}
-		for _, file := range r.File {
-			info := file.GetFileInfo()
-			if o.cmd.long {
-				fmt.Fprintf(tw, "%s\t%s\t%s\n", units.ByteSize(info.FileSize), info.Modification.Format("Mon Jan 2 15:04:05 2006"), info.Path)
-			} else {
-				fmt.Fprintf(tw, "%s\n", info.Path)
-			}
-		}
-	}
-	tw.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go
deleted file mode 100644
index 7cc21e766b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/mkdir.go
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type mkdir struct {
-	*flags.DatastoreFlag
-
-	createParents bool
-	isNamespace   bool
-}
-
-func init() {
-	cli.Register("datastore.mkdir", &mkdir{})
-}
-
-func (cmd *mkdir) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.createParents, "p", false, "Create intermediate directories as needed")
-	f.BoolVar(&cmd.isNamespace, "namespace", false, "Return uuid of namespace created on vsan datastore")
-}
-
-func (cmd *mkdir) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mkdir) Usage() string {
-	return "DIRECTORY"
-}
-
-func (cmd *mkdir) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) == 0 {
-		return errors.New("missing operand")
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	if cmd.isNamespace {
-		var uuid string
-		var ds *object.Datastore
-
-		if ds, err = cmd.Datastore(); err != nil {
-			return err
-		}
-
-		path := args[0]
-
-		nm := object.NewDatastoreNamespaceManager(c)
-		if uuid, err = nm.CreateDirectory(ctx, ds, path, ""); err != nil {
-			return err
-		}
-
-		fmt.Println(uuid)
-	} else {
-		var dc *object.Datacenter
-		var path string
-
-		dc, err = cmd.Datacenter()
-		if err != nil {
-			return err
-		}
-
-		path, err = cmd.DatastorePath(args[0])
-		if err != nil {
-			return err
-		}
-
-		m := object.NewFileManager(c)
-		err = m.MakeDirectory(ctx, path, dc, cmd.createParents)
-
-		// ignore EEXIST if -p flag is given
-		if err != nil && cmd.createParents {
-			if soap.IsSoapFault(err) {
-				soapFault := soap.ToSoapFault(err)
-				if _, ok := soapFault.VimFault().(types.FileAlreadyExists); ok {
-					return nil
-				}
-			}
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/mv.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/mv.go
deleted file mode 100644
index ee11c37660..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/mv.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type mv struct {
-	*flags.DatastoreFlag
-
-	force bool
-}
-
-func init() {
-	cli.Register("datastore.mv", &mv{})
-}
-
-func (cmd *mv) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "f", false, "If true, overwrite any identically named file at the destination")
-}
-
-func (cmd *mv) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mv) Usage() string {
-	return "SRC DST"
-}
-
-func (cmd *mv) Description() string {
-	return `Move SRC to DST on DATASTORE.
-
-Examples:
-  govc datastore.mv foo/foo.vmx foo/foo.vmx.old
-  govc datastore.mv -f my.vmx foo/foo.vmx`
-}
-
-func (cmd *mv) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) != 2 {
-		return errors.New("SRC and DST arguments are required")
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	dc, err := cmd.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	// TODO: support cross-datacenter move
-
-	src, err := cmd.DatastorePath(args[0])
-	if err != nil {
-		return err
-	}
-
-	dst, err := cmd.DatastorePath(args[1])
-	if err != nil {
-		return err
-	}
-
-	m := object.NewFileManager(c)
-	task, err := m.MoveDatastoreFile(ctx, src, dc, dst, dc, cmd.force)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/remove.go
deleted file mode 100644
index 12ec9a467a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/remove.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type remove struct {
-	*flags.HostSystemFlag
-	*flags.DatastoreFlag
-}
-
-func init() {
-	cli.Register("datastore.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *remove) Description() string {
-	return `Remove datastore from HOST.
-
-Examples:
-  govc datastore.remove -ds nfsDatastore cluster1
-  govc datastore.remove -ds nasDatastore host1 host2 host3`
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		hds, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		err = hds.Remove(ctx, ds)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/rm.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/rm.go
deleted file mode 100644
index 9c292024f7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/rm.go
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type rm struct {
-	*flags.DatastoreFlag
-
-	kind        bool
-	force       bool
-	isNamespace bool
-}
-
-func init() {
-	cli.Register("datastore.rm", &rm{})
-	cli.Alias("datastore.rm", "datastore.delete")
-}
-
-func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.kind, "t", true, "Use file type to choose disk or file manager")
-	f.BoolVar(&cmd.force, "f", false, "Force; ignore nonexistent files and arguments")
-	f.BoolVar(&cmd.isNamespace, "namespace", false, "Path is uuid of namespace on vsan datastore")
-}
-
-func (cmd *rm) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rm) Usage() string {
-	return "FILE"
-}
-
-func (cmd *rm) Description() string {
-	return `Remove FILE from DATASTORE.
-
-Examples:
-  govc datastore.rm vm/vmware.log
-  govc datastore.rm vm
-  govc datastore.rm -f images/base.vmdk`
-}
-
-func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) == 0 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	var dc *object.Datacenter
-	dc, err = cmd.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	if cmd.isNamespace {
-		path := args[0]
-
-		nm := object.NewDatastoreNamespaceManager(c)
-		err = nm.DeleteDirectory(ctx, dc, path)
-	} else {
-		fm := ds.NewFileManager(dc, cmd.force)
-
-		remove := fm.DeleteFile // File delete
-		if cmd.kind {
-			remove = fm.Delete // VirtualDisk or File delete
-		}
-
-		err = remove(ctx, args[0])
-	}
-
-	if err != nil {
-		if types.IsFileNotFound(err) && cmd.force {
-			// Ignore error
-			return nil
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/tail.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/tail.go
deleted file mode 100644
index 5e5ef6d542..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/tail.go
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"flag"
-	"io"
-	"os"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type tail struct {
-	*flags.DatastoreFlag
-	*flags.HostSystemFlag
-
-	count  int64
-	lines  int
-	follow bool
-}
-
-func init() {
-	cli.Register("datastore.tail", &tail{})
-}
-
-func (cmd *tail) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.Int64Var(&cmd.count, "c", -1, "Output the last NUM bytes")
-	f.IntVar(&cmd.lines, "n", 10, "Output the last NUM lines")
-	f.BoolVar(&cmd.follow, "f", false, "Output appended data as the file grows")
-}
-
-func (cmd *tail) Description() string {
-	return `Output the last part of datastore files.
-
-Examples:
-  govc datastore.tail -n 100 vm-name/vmware.log
-  govc datastore.tail -n 0 -f vm-name/vmware.log`
-}
-
-func (cmd *tail) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *tail) Usage() string {
-	return "PATH"
-}
-
-func (cmd *tail) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	p := cmd.Args(f.Args())[0]
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	h, err := cmd.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if h != nil {
-		ctx = ds.HostContext(ctx, h)
-	}
-
-	file, err := ds.Open(ctx, p.Path)
-	if err != nil {
-		return err
-	}
-
-	var reader io.ReadCloser = file
-
-	var offset int64
-
-	if cmd.count >= 0 {
-		info, serr := file.Stat()
-		if serr != nil {
-			return serr
-		}
-
-		if info.Size() > cmd.count {
-			offset = info.Size() - cmd.count
-
-			_, err = file.Seek(offset, io.SeekStart)
-			if err != nil {
-				return err
-			}
-		}
-	} else if cmd.lines >= 0 {
-		err = file.Tail(cmd.lines)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.follow {
-		reader = file.Follow(time.Second)
-	}
-
-	_, err = io.Copy(os.Stdout, reader)
-
-	_ = reader.Close()
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/upload.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/upload.go
deleted file mode 100644
index 2d9420d28f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/upload.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package datastore
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type upload struct {
-	*flags.OutputFlag
-	*flags.DatastoreFlag
-}
-
-func init() {
-	cli.Register("datastore.upload", &upload{})
-}
-
-func (cmd *upload) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-}
-
-func (cmd *upload) Process(ctx context.Context) error {
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *upload) Usage() string {
-	return "SOURCE DEST"
-}
-
-func (cmd *upload) Description() string {
-	return `Copy SOURCE from the local system to DEST on DS.
-
-If SOURCE name is "-", read source from stdin.
-
-Examples:
-  govc datastore.upload -ds datastore1 ./config.iso vm-name/config.iso
-  genisoimage ... | govc datastore.upload -ds datastore1 - vm-name/config.iso`
-}
-
-func (cmd *upload) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) != 2 {
-		return errors.New("invalid arguments")
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	p := soap.DefaultUpload
-
-	src := args[0]
-	dst := args[1]
-
-	if src == "-" {
-		return ds.Upload(ctx, os.Stdin, dst, &p)
-	}
-
-	if cmd.OutputFlag.TTY {
-		logger := cmd.ProgressLogger("Uploading... ")
-		p.Progress = logger
-		defer logger.Wait()
-	}
-
-	return ds.UploadFile(ctx, src, dst, &p)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go
deleted file mode 100644
index 3b7b50f180..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/ls.go
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vsan
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"net/url"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type ls struct {
-	*flags.DatastoreFlag
-
-	long   bool
-	orphan bool
-}
-
-func init() {
-	cli.Register("datastore.vsan.dom.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.long, "l", false, "Long listing")
-	f.BoolVar(&cmd.orphan, "o", false, "List orphan objects")
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "[UUID]..."
-}
-
-func (cmd *ls) Description() string {
-	return `List vSAN DOM objects in DS.
-
-Examples:
-  govc datastore.vsan.dom.ls
-  govc datastore.vsan.dom.ls -ds vsanDatastore -l
-  govc datastore.vsan.dom.ls -l d85aa758-63f5-500a-3150-0200308e589c`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	var mds mo.Datastore
-	err = ds.Properties(ctx, ds.Reference(), []string{"summary"}, &mds)
-	if err != nil {
-		return err
-	}
-
-	if mds.Summary.Type != "vsan" {
-		return flag.ErrHelp
-	}
-
-	hosts, err := ds.AttachedHosts(ctx)
-	if err != nil {
-		return err
-	}
-
-	if len(hosts) == 0 {
-		return flag.ErrHelp
-	}
-
-	m, err := hosts[0].ConfigManager().VsanInternalSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	ids, err := m.QueryVsanObjectUuidsByFilter(ctx, f.Args(), 0, 0)
-	if err != nil {
-		return err
-	}
-
-	if len(ids) == 0 {
-		return nil
-	}
-
-	if !cmd.long && !cmd.orphan {
-		for _, id := range ids {
-			fmt.Fprintln(cmd.Out, id)
-		}
-
-		return nil
-	}
-
-	objs, err := m.GetVsanObjExtAttrs(ctx, ids)
-	if err != nil {
-		return err
-	}
-
-	u, err := url.Parse(mds.Summary.Url)
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(cmd.Out, 2, 0, 2, ' ', 0)
-	cmd.Out = tw
-
-	for id, obj := range objs {
-		path := obj.DatastorePath(u.Path)
-
-		if cmd.orphan {
-			_, err = ds.Stat(ctx, path)
-			if err == nil {
-				continue
-			}
-
-			switch err.(type) {
-			case object.DatastoreNoSuchDirectoryError, object.DatastoreNoSuchFileError:
-			default:
-				return err
-			}
-
-			if !cmd.long {
-				fmt.Fprintln(cmd.Out, id)
-				continue
-			}
-		}
-
-		fmt.Fprintf(cmd.Out, "%s\t%s\t%s\n", id, obj.Class, path)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go b/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go
deleted file mode 100644
index 2302471609..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/datastore/vsan/rm.go
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vsan
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type rm struct {
-	*flags.DatastoreFlag
-
-	force   bool
-	verbose bool
-}
-
-func init() {
-	cli.Register("datastore.vsan.dom.rm", &rm{})
-}
-
-func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "f", false, "Force delete")
-	f.BoolVar(&cmd.verbose, "v", false, "Print deleted UUIDs to stdout, failed to stderr")
-}
-
-func (cmd *rm) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rm) Usage() string {
-	return "UUID..."
-}
-
-func (cmd *rm) Description() string {
-	return `Remove vSAN DOM objects in DS.
-
-Examples:
-  govc datastore.vsan.dom.rm d85aa758-63f5-500a-3150-0200308e589c
-  govc datastore.vsan.dom.rm -f d85aa758-63f5-500a-3150-0200308e589c
-  govc datastore.vsan.dom.ls -o | xargs govc datastore.vsan.dom.rm`
-}
-
-func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	hosts, err := ds.AttachedHosts(ctx)
-	if err != nil {
-		return err
-	}
-
-	if len(hosts) == 0 {
-		return flag.ErrHelp
-	}
-
-	m, err := hosts[0].ConfigManager().VsanInternalSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	res, err := m.DeleteVsanObjects(ctx, f.Args(), &cmd.force)
-	if err != nil {
-		return err
-	}
-
-	if cmd.verbose {
-		for _, r := range res {
-			if r.Success {
-				fmt.Fprintln(cmd.Out, r.Uuid)
-			} else {
-				fmt.Fprintf(os.Stderr, "%s %s\n", r.Uuid, r.FailureReason[0].Message)
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/boot.go b/installer/vendor/github.com/vmware/govmomi/govc/device/boot.go
deleted file mode 100644
index 481f49e70f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/boot.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"flag"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type boot struct {
-	*flags.VirtualMachineFlag
-
-	order string
-	types.VirtualMachineBootOptions
-}
-
-func init() {
-	cli.Register("device.boot", &boot{})
-}
-
-func (cmd *boot) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.Int64Var(&cmd.BootDelay, "delay", 0, "Delay in ms before starting the boot sequence")
-	f.StringVar(&cmd.order, "order", "", "Boot device order [-,floppy,cdrom,ethernet,disk]")
-	f.Int64Var(&cmd.BootRetryDelay, "retry-delay", 0, "Delay in ms before a boot retry")
-
-	cmd.BootRetryEnabled = types.NewBool(false)
-	f.BoolVar(cmd.BootRetryEnabled, "retry", false, "If true, retry boot after retry-delay")
-
-	cmd.EnterBIOSSetup = types.NewBool(false)
-	f.BoolVar(cmd.EnterBIOSSetup, "setup", false, "If true, enter BIOS setup on next boot")
-}
-
-func (cmd *boot) Description() string {
-	return `Configure VM boot settings.
-
-Examples:
-  govc device.boot -vm $vm -delay 1000 -order floppy,cdrom,ethernet,disk
-  govc device.boot -vm $vm -order - # reset boot order`
-}
-
-func (cmd *boot) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *boot) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.order != "" {
-		o := strings.Split(cmd.order, ",")
-		cmd.BootOrder = devices.BootOrder(o)
-	}
-
-	return vm.SetBootOptions(ctx, &cmd.VirtualMachineBootOptions)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go b/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go
deleted file mode 100644
index 24089a4880..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/add.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cdrom
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-
-	controller string
-}
-
-func init() {
-	cli.Register("device.cdrom.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.controller, "controller", "", "IDE controller name")
-}
-
-func (cmd *add) Description() string {
-	return `Add CD-ROM device to VM.
-
-Examples:
-  govc device.cdrom.add -vm $vm
-  govc device.ls -vm $vm | grep ide-
-  govc device.cdrom.add -vm $vm -controller ide-200
-  govc device.info cdrom-*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	c, err := devices.FindIDEController(cmd.controller)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.CreateCdrom(c)
-	if err != nil {
-		return err
-	}
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		return err
-	}
-
-	// output name of device we just created
-	devices, err = vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	devices = devices.SelectByType(d)
-
-	name := devices.Name(devices[len(devices)-1])
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go b/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go
deleted file mode 100644
index 330ba3d8ad..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/eject.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cdrom
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type eject struct {
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("device.cdrom.eject", &eject{})
-}
-
-func (cmd *eject) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "CD-ROM device name")
-}
-
-func (cmd *eject) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *eject) Description() string {
-	return `Eject media from CD-ROM device.
-
-If device is not specified, the first CD-ROM device is used.
-
-Examples:
-  govc device.cdrom.eject -vm vm-1
-  govc device.cdrom.eject -vm vm-1 -device floppy-1`
-}
-
-func (cmd *eject) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	c, err := devices.FindCdrom(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	return vm.EditDevice(ctx, devices.EjectIso(c))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go b/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go
deleted file mode 100644
index fef8d996c5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/cdrom/insert.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cdrom
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type insert struct {
-	*flags.DatastoreFlag
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("device.cdrom.insert", &insert{})
-}
-
-func (cmd *insert) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "CD-ROM device name")
-}
-
-func (cmd *insert) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *insert) Usage() string {
-	return "ISO"
-}
-
-func (cmd *insert) Description() string {
-	return `Insert media on datastore into CD-ROM device.
-
-If device is not specified, the first CD-ROM device is used.
-
-Examples:
-  govc device.cdrom.insert -vm vm-1 -device cdrom-3000 images/boot.iso`
-}
-
-func (cmd *insert) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil || f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	c, err := devices.FindCdrom(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	iso, err := cmd.DatastorePath(f.Arg(0))
-	if err != nil {
-		return nil
-	}
-
-	return vm.EditDevice(ctx, devices.InsertIso(c, iso))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/connect.go b/installer/vendor/github.com/vmware/govmomi/govc/device/connect.go
deleted file mode 100644
index a0fc57aa22..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/connect.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type connect struct {
-	*flags.VirtualMachineFlag
-}
-
-func init() {
-	cli.Register("device.connect", &connect{})
-}
-
-func (cmd *connect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-}
-
-func (cmd *connect) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *connect) Usage() string {
-	return "DEVICE..."
-}
-
-func (cmd *connect) Description() string {
-	return `Connect DEVICE on VM.
-
-Examples:
-  govc device.connect -vm $name cdrom-3000`
-}
-
-func (cmd *connect) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, name := range f.Args() {
-		device := devices.Find(name)
-		if device == nil {
-			return fmt.Errorf("device '%s' not found", name)
-		}
-
-		if err = devices.Connect(device); err != nil {
-			return err
-		}
-
-		if err = vm.EditDevice(ctx, device); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/disconnect.go b/installer/vendor/github.com/vmware/govmomi/govc/device/disconnect.go
deleted file mode 100644
index 503de17f11..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/disconnect.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type disconnect struct {
-	*flags.VirtualMachineFlag
-}
-
-func init() {
-	cli.Register("device.disconnect", &disconnect{})
-}
-
-func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-}
-
-func (cmd *disconnect) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *disconnect) Usage() string {
-	return "DEVICE..."
-}
-
-func (cmd *disconnect) Description() string {
-	return `Disconnect DEVICE on VM.
-
-Examples:
-  govc device.disconnect -vm $name cdrom-3000`
-}
-
-func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, name := range f.Args() {
-		device := devices.Find(name)
-		if device == nil {
-			return fmt.Errorf("device '%s' not found", name)
-		}
-
-		if err = devices.Disconnect(device); err != nil {
-			return err
-		}
-
-		if err = vm.EditDevice(ctx, device); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go b/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go
deleted file mode 100644
index bcb5512ab6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/add.go
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package floppy
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-}
-
-func init() {
-	cli.Register("device.floppy.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-}
-
-func (cmd *add) Description() string {
-	return `Add floppy device to VM.
-
-Examples:
-  govc device.floppy.add -vm $vm
-  govc device.info floppy-*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.CreateFloppy()
-	if err != nil {
-		return err
-	}
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		return err
-	}
-
-	// output name of device we just created
-	devices, err = vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	devices = devices.SelectByType(d)
-
-	name := devices.Name(devices[len(devices)-1])
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go b/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go
deleted file mode 100644
index 37c1aae1fa..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/eject.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package floppy
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type eject struct {
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("device.floppy.eject", &eject{})
-}
-
-func (cmd *eject) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "Floppy device name")
-}
-
-func (cmd *eject) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *eject) Description() string {
-	return `Eject image from floppy device.
-
-If device is not specified, the first floppy device is used.
-
-Examples:
-  govc device.floppy.eject -vm vm-1`
-}
-
-func (cmd *eject) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	c, err := devices.FindFloppy(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	return vm.EditDevice(ctx, devices.EjectImg(c))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go b/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go
deleted file mode 100644
index 83f6f804c6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/floppy/insert.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package floppy
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type insert struct {
-	*flags.DatastoreFlag
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("device.floppy.insert", &insert{})
-}
-
-func (cmd *insert) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "Floppy device name")
-}
-
-func (cmd *insert) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *insert) Usage() string {
-	return "IMG"
-}
-
-func (cmd *insert) Description() string {
-	return `Insert IMG on datastore into floppy device.
-
-If device is not specified, the first floppy device is used.
-
-Examples:
-  govc device.floppy.insert -vm vm-1 vm-1/config.img`
-}
-
-func (cmd *insert) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil || f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	c, err := devices.FindFloppy(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	img, err := cmd.DatastorePath(f.Arg(0))
-	if err != nil {
-		return nil
-	}
-
-	return vm.EditDevice(ctx, devices.InsertImg(c, img))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/info.go b/installer/vendor/github.com/vmware/govmomi/govc/device/info.go
deleted file mode 100644
index 6c4a801f6f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/info.go
+++ /dev/null
@@ -1,244 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.VirtualMachineFlag
-	*flags.OutputFlag
-	*flags.NetworkFlag
-}
-
-func init() {
-	cli.Register("device.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
-	cmd.NetworkFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.NetworkFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "[DEVICE]..."
-}
-
-func (cmd *info) Description() string {
-	return `Device info for VM.
-
-Examples:
-  govc device.info -vm $name
-  govc device.info -vm $name disk-*
-  govc device.info -vm $name -json ethernet-0 | jq -r .Devices[].MacAddress`
-}
-
-func (cmd *info) match(p string, devices object.VirtualDeviceList) object.VirtualDeviceList {
-	var matches object.VirtualDeviceList
-	match := func(name string) bool {
-		matched, _ := path.Match(p, name)
-		return matched
-	}
-
-	for _, device := range devices {
-		name := devices.Name(device)
-		eq := name == p
-		if eq || match(name) {
-			matches = append(matches, device)
-		}
-		if eq {
-			break
-		}
-	}
-
-	return matches
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	res := infoResult{
-		list: devices,
-	}
-
-	if cmd.NetworkFlag.IsSet() {
-		net, err := cmd.Network()
-		if err != nil {
-			return err
-		}
-
-		backing, err := net.EthernetCardBackingInfo(ctx)
-		if err != nil {
-			return err
-		}
-
-		devices = devices.SelectByBackingInfo(backing)
-	}
-
-	if f.NArg() == 0 {
-		res.Devices = toInfoList(devices)
-	} else {
-		for _, name := range f.Args() {
-			matches := cmd.match(name, devices)
-			if len(matches) == 0 {
-				return fmt.Errorf("device '%s' not found", name)
-			}
-
-			res.Devices = append(res.Devices, toInfoList(matches)...)
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-func toInfoList(devices object.VirtualDeviceList) []infoDevice {
-	var res []infoDevice
-
-	for _, device := range devices {
-		res = append(res, infoDevice{devices.Name(device), device})
-	}
-
-	return res
-}
-
-type infoDevice struct {
-	Name string
-	types.BaseVirtualDevice
-}
-
-func (d *infoDevice) MarshalJSON() ([]byte, error) {
-	b, err := json.Marshal(d.BaseVirtualDevice)
-	if err != nil {
-		return b, err
-	}
-
-	// TODO: make use of "inline" tag if it comes to be: https://github.com/golang/go/issues/6213
-
-	return append([]byte(fmt.Sprintf(`{"Name":"%s",`, d.Name)), b[1:]...), err
-}
-
-type infoResult struct {
-	Devices []infoDevice
-	// need the full list of devices to lookup attached devices and controllers
-	list object.VirtualDeviceList
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for i := range r.Devices {
-		device := r.Devices[i].BaseVirtualDevice
-		d := device.GetVirtualDevice()
-		info := d.DeviceInfo.GetDescription()
-
-		fmt.Fprintf(tw, "Name:\t%s\n", r.Devices[i].Name)
-		fmt.Fprintf(tw, "  Type:\t%s\n", r.list.TypeName(device))
-		fmt.Fprintf(tw, "  Label:\t%s\n", info.Label)
-		fmt.Fprintf(tw, "  Summary:\t%s\n", info.Summary)
-		fmt.Fprintf(tw, "  Key:\t%d\n", d.Key)
-
-		if c, ok := device.(types.BaseVirtualController); ok {
-			var attached []string
-			for _, key := range c.GetVirtualController().Device {
-				attached = append(attached, r.list.Name(r.list.FindByKey(key)))
-			}
-			fmt.Fprintf(tw, "  Devices:\t%s\n", strings.Join(attached, ", "))
-		} else {
-			if c := r.list.FindByKey(d.ControllerKey); c != nil {
-				fmt.Fprintf(tw, "  Controller:\t%s\n", r.list.Name(c))
-				if d.UnitNumber != nil {
-					fmt.Fprintf(tw, "  Unit number:\t%d\n", *d.UnitNumber)
-				} else {
-					fmt.Fprintf(tw, "  Unit number:\t<nil>\n")
-				}
-			}
-		}
-
-		if ca := d.Connectable; ca != nil {
-			fmt.Fprintf(tw, "  Connected:\t%t\n", ca.Connected)
-			fmt.Fprintf(tw, "  Start connected:\t%t\n", ca.StartConnected)
-			fmt.Fprintf(tw, "  Guest control:\t%t\n", ca.AllowGuestControl)
-			fmt.Fprintf(tw, "  Status:\t%s\n", ca.Status)
-		}
-
-		switch md := device.(type) {
-		case types.BaseVirtualEthernetCard:
-			fmt.Fprintf(tw, "  MAC Address:\t%s\n", md.GetVirtualEthernetCard().MacAddress)
-			fmt.Fprintf(tw, "  Address type:\t%s\n", md.GetVirtualEthernetCard().AddressType)
-		case *types.VirtualDisk:
-			if b, ok := md.Backing.(types.BaseVirtualDeviceFileBackingInfo); ok {
-				fmt.Fprintf(tw, "  File:\t%s\n", b.GetVirtualDeviceFileBackingInfo().FileName)
-			}
-			if b, ok := md.Backing.(*types.VirtualDiskFlatVer2BackingInfo); ok && b.Parent != nil {
-				fmt.Fprintf(tw, "  Parent:\t%s\n", b.Parent.GetVirtualDeviceFileBackingInfo().FileName)
-			}
-		case *types.VirtualSerialPort:
-			if b, ok := md.Backing.(*types.VirtualSerialPortURIBackingInfo); ok {
-				fmt.Fprintf(tw, "  Direction:\t%s\n", b.Direction)
-				fmt.Fprintf(tw, "  Service URI:\t%s\n", b.ServiceURI)
-				fmt.Fprintf(tw, "  Proxy URI:\t%s\n", b.ProxyURI)
-			}
-		}
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/device/ls.go
deleted file mode 100644
index 1775ebd35a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/ls.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type ls struct {
-	*flags.VirtualMachineFlag
-
-	boot bool
-}
-
-func init() {
-	cli.Register("device.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.boot, "boot", false, "List devices configured in the VM's boot options")
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Description() string {
-	return `List devices for VM.
-
-Examples:
-  govc device.ls -vm $name`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.boot {
-		options, err := vm.BootOptions(ctx)
-		if err != nil {
-			return err
-		}
-
-		devices = devices.SelectBootOrder(options.BootOrder)
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 3, 0, 2, ' ', 0)
-
-	for _, device := range devices {
-		fmt.Fprintf(tw, "%s\t%s\t%s\n", devices.Name(device), devices.TypeName(device),
-			device.GetVirtualDevice().DeviceInfo.GetDescription().Summary)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/device/remove.go
deleted file mode 100644
index fb776fc05e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/remove.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package device
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type remove struct {
-	*flags.VirtualMachineFlag
-	keepFiles bool
-}
-
-func init() {
-	cli.Register("device.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-	f.BoolVar(&cmd.keepFiles, "keep", false, "Keep files in datastore")
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "DEVICE..."
-}
-
-func (cmd *remove) Description() string {
-	return `Remove DEVICE from VM.
-
-Examples:
-  govc device.remove -vm $name cdrom-3000
-  govc device.remove -vm $name -keep disk-1000`
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, name := range f.Args() {
-		device := devices.Find(name)
-		if device == nil {
-			return fmt.Errorf("device '%s' not found", name)
-		}
-
-		if err = vm.RemoveDevice(ctx, cmd.keepFiles, device); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go b/installer/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go
deleted file mode 100644
index 855fc5be5d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/scsi/add.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package scsi
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-
-	controller   string
-	sharedBus    string
-	hotAddRemove bool
-}
-
-func init() {
-	cli.Register("device.scsi.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	var ctypes []string
-	ct := object.SCSIControllerTypes()
-	for _, t := range ct {
-		ctypes = append(ctypes, ct.Type(t))
-	}
-	f.StringVar(&cmd.controller, "type", ct.Type(ct[0]),
-		fmt.Sprintf("SCSI controller type (%s)", strings.Join(ctypes, "|")))
-	f.StringVar(&cmd.sharedBus, "sharing", string(types.VirtualSCSISharingNoSharing), "SCSI sharing")
-	f.BoolVar(&cmd.hotAddRemove, "hot", false, "Enable hot-add/remove")
-}
-
-func (cmd *add) Description() string {
-	return `Add SCSI controller to VM.
-
-Examples:
-  govc device.scsi.add -vm $vm
-  govc device.scsi.add -vm $vm -type pvscsi
-  govc device.info -vm $vm {lsi,pv}*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.CreateSCSIController(cmd.controller)
-	if err != nil {
-		return err
-	}
-
-	c := d.(types.BaseVirtualSCSIController).GetVirtualSCSIController()
-	c.HotAddRemove = &cmd.hotAddRemove
-	c.SharedBus = types.VirtualSCSISharing(cmd.sharedBus)
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		return err
-	}
-
-	// output name of device we just created
-	devices, err = vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	devices = devices.SelectByType(d)
-
-	name := devices.Name(devices[len(devices)-1])
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/add.go b/installer/vendor/github.com/vmware/govmomi/govc/device/serial/add.go
deleted file mode 100644
index d7206142da..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/add.go
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package serial
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-}
-
-func init() {
-	cli.Register("device.serial.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-}
-
-func (cmd *add) Description() string {
-	return `Add serial port to VM.
-
-Examples:
-  govc device.serial.add -vm $vm
-  govc device.info -vm $vm serialport-*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.CreateSerialPort()
-	if err != nil {
-		return err
-	}
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		return err
-	}
-
-	// output name of device we just created
-	devices, err = vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	devices = devices.SelectByType(d)
-
-	name := devices.Name(devices[len(devices)-1])
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go b/installer/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go
deleted file mode 100644
index 84cb994847..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/connect.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package serial
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"path"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type connect struct {
-	*flags.VirtualMachineFlag
-
-	proxy  string
-	device string
-	client bool
-}
-
-func init() {
-	cli.Register("device.serial.connect", &connect{})
-}
-
-func (cmd *connect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.proxy, "vspc-proxy", "", "vSPC proxy URI")
-	f.StringVar(&cmd.device, "device", "", "serial port device name")
-	f.BoolVar(&cmd.client, "client", false, "Use client direction")
-}
-
-func (cmd *connect) Usage() string {
-	return "URI"
-}
-
-func (cmd *connect) Description() string {
-	return `Connect service URI to serial port.
-
-If "-" is given as URI, connects file backed device with file name of
-device name + .log suffix in the VM Config.Files.LogDirectory.
-
-Defaults to the first serial port if no DEVICE is given.
-
-Examples:
-  govc device.ls | grep serialport-
-  govc device.serial.connect -vm $vm -device serialport-8000 telnet://:33233
-  govc device.info -vm $vm serialport-*
-  govc device.serial.connect -vm $vm "[datastore1] $vm/console.log"
-  govc device.serial.connect -vm $vm -
-  govc datastore.tail -f $vm/serialport-8000.log`
-}
-
-func (cmd *connect) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *connect) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.FindSerialPort(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	uri := f.Arg(0)
-
-	if uri == "-" {
-		var mvm mo.VirtualMachine
-		err = vm.Properties(ctx, vm.Reference(), []string{"config.files.logDirectory"}, &mvm)
-		if err != nil {
-			return err
-		}
-
-		uri = path.Join(mvm.Config.Files.LogDirectory, fmt.Sprintf("%s.log", devices.Name(d)))
-	}
-
-	return vm.EditDevice(ctx, devices.ConnectSerialPort(d, uri, cmd.client, cmd.proxy))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go b/installer/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go
deleted file mode 100644
index 5bc9c8d234..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/serial/disconnect.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package serial
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type disconnect struct {
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("device.serial.disconnect", &disconnect{})
-}
-
-func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "serial port device name")
-}
-
-func (cmd *disconnect) Description() string {
-	return `Disconnect service URI from serial port.
-
-Examples:
-  govc device.ls | grep serialport-
-  govc device.serial.disconnect -vm $vm -device serialport-8000
-  govc device.info -vm $vm serialport-*`
-}
-
-func (cmd *disconnect) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	d, err := devices.FindSerialPort(cmd.device)
-	if err != nil {
-		return err
-	}
-
-	return vm.EditDevice(ctx, devices.DisconnectSerialPort(d))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/device/usb/add.go b/installer/vendor/github.com/vmware/govmomi/govc/device/usb/add.go
deleted file mode 100644
index 582348bea3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/device/usb/add.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package usb
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-
-	controller  string
-	autoConnect bool
-	ehciEnabled bool
-}
-
-func init() {
-	cli.Register("device.usb.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	ctypes := []string{"usb", "xhci"}
-	f.StringVar(&cmd.controller, "type", ctypes[0],
-		fmt.Sprintf("USB controller type (%s)", strings.Join(ctypes, "|")))
-
-	f.BoolVar(&cmd.autoConnect, "auto", true, "Enable ability to hot plug devices")
-	f.BoolVar(&cmd.ehciEnabled, "ehci", true, "Enable enhanced host controller interface (USB 2.0)")
-}
-
-func (cmd *add) Description() string {
-	return `Add USB device to VM.
-
-Examples:
-  govc device.usb.add -vm $vm
-  govc device.usb.add -type xhci -vm $vm
-  govc device.info usb*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	var d types.BaseVirtualDevice
-
-	switch cmd.controller {
-	case "usb":
-		c := new(types.VirtualUSBController)
-		c.AutoConnectDevices = &cmd.autoConnect
-		c.EhciEnabled = &cmd.ehciEnabled
-		d = c
-	case "xhci":
-		c := new(types.VirtualUSBXHCIController)
-		c.AutoConnectDevices = &cmd.autoConnect
-		d = c
-	default:
-		return flag.ErrHelp
-	}
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		return err
-	}
-
-	// output name of device we just created
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	devices = devices.SelectByType(d)
-
-	name := devices.Name(devices[len(devices)-1])
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/add.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/add.go
deleted file mode 100644
index f51ded6507..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/add.go
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package dvs
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.HostSystemFlag
-
-	path string
-	pnic string
-}
-
-func init() {
-	cli.Register("dvs.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.path, "dvs", "", "DVS path")
-	f.StringVar(&cmd.pnic, "pnic", "vmnic0", "Name of the host physical NIC")
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *add) Description() string {
-	return `Add hosts to DVS.
-
-Examples:
-  govc dvs.add -dvs dvsName -pnic vmnic1 hostA hostB hostC`
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	net, err := finder.Network(ctx, cmd.path)
-	if err != nil {
-		return err
-	}
-
-	dvs, ok := net.(*object.DistributedVirtualSwitch)
-	if !ok {
-		return fmt.Errorf("%s (%T) is not of type %T", cmd.path, net, dvs)
-	}
-
-	var s mo.VmwareDistributedVirtualSwitch
-	err = dvs.Properties(ctx, dvs.Reference(), []string{"config"}, &s)
-	if err != nil {
-		return err
-	}
-
-	backing := new(types.DistributedVirtualSwitchHostMemberPnicBacking)
-
-	for _, vmnic := range strings.Split(cmd.pnic, ",") {
-		backing.PnicSpec = append(backing.PnicSpec, types.DistributedVirtualSwitchHostMemberPnicSpec{
-			PnicDevice: strings.TrimSpace(vmnic),
-		})
-	}
-
-	config := &types.DVSConfigSpec{
-		ConfigVersion: s.Config.GetDVSConfigInfo().ConfigVersion,
-	}
-
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	existing := make(map[string]bool)
-	// TODO: host.pnic.info command
-	for _, member := range s.Config.GetDVSConfigInfo().Host {
-		existing[member.Config.Host.Value] = true
-	}
-
-	for _, host := range hosts {
-		ref := host.Reference()
-		if existing[ref.Value] {
-			fmt.Fprintf(os.Stderr, "%s is already a member of %s\n", host.InventoryPath, dvs.InventoryPath)
-			continue
-		}
-
-		config.Host = append(config.Host, types.DistributedVirtualSwitchHostMemberConfigSpec{
-			Operation: "add",
-			Host:      ref,
-			Backing:   backing,
-		})
-	}
-
-	if len(config.Host) == 0 {
-		return nil
-	}
-
-	task, err := dvs.Reconfigure(ctx, config)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("adding %d hosts to dvs %s... ", len(config.Host), dvs.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/create.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/create.go
deleted file mode 100644
index fe7df7f17d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/create.go
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package dvs
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.FolderFlag
-
-	types.DVSCreateSpec
-
-	configSpec *types.VMwareDVSConfigSpec
-}
-
-func init() {
-	cli.Register("dvs.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	cmd.configSpec = new(types.VMwareDVSConfigSpec)
-
-	cmd.DVSCreateSpec.ConfigSpec = cmd.configSpec
-	cmd.DVSCreateSpec.ProductInfo = new(types.DistributedVirtualSwitchProductSpec)
-
-	f.StringVar(&cmd.ProductInfo.Version, "product-version", "", "DVS product version")
-}
-
-func (cmd *create) Usage() string {
-	return "DVS"
-}
-
-func (cmd *create) Description() string {
-	return `Create DVS (DistributedVirtualSwitch) in datacenter.
-
-The dvs is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the network folder in the specified or default datacenter.
-
-Examples:
-  govc dvs.create DSwitch
-  govc dvs.create -product-version 5.5.0 DSwitch`
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	name := f.Arg(0)
-
-	cmd.configSpec.Name = name
-
-	folder, err := cmd.FolderOrDefault("network")
-	if err != nil {
-		return err
-	}
-
-	task, err := folder.CreateDVS(ctx, cmd.DVSCreateSpec)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to folder %s... ", name, folder.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go
deleted file mode 100644
index 689ea3f6d0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/add.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.DatacenterFlag
-
-	DVPortgroupConfigSpec
-
-	path string
-}
-
-func init() {
-	cli.Register("dvs.portgroup.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.path, "dvs", "", "DVS path")
-
-	cmd.DVPortgroupConfigSpec.NumPorts = 128 // default
-
-	cmd.DVPortgroupConfigSpec.Register(ctx, f)
-}
-
-func (cmd *add) Description() string {
-	return `Add portgroup to DVS.
-
-Examples:
-  govc dvs.create DSwitch
-  govc dvs.portgroup.add -dvs DSwitch -type earlyBinding -nports 16 ExternalNetwork
-  govc dvs.portgroup.add -dvs DSwitch -type ephemeral InternalNetwork`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "NAME"
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	name := f.Arg(0)
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	net, err := finder.Network(ctx, cmd.path)
-	if err != nil {
-		return err
-	}
-
-	dvs, ok := net.(*object.DistributedVirtualSwitch)
-	if !ok {
-		return fmt.Errorf("%s (%T) is not of type %T", cmd.path, net, dvs)
-	}
-
-	cmd.DVPortgroupConfigSpec.Name = name
-
-	task, err := dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{cmd.Spec()})
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s portgroup to dvs %s... ", name, dvs.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go
deleted file mode 100644
index e3c1643a2d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/change.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type change struct {
-	*flags.DatacenterFlag
-
-	DVPortgroupConfigSpec
-}
-
-func init() {
-	cli.Register("dvs.portgroup.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.DVPortgroupConfigSpec.Register(ctx, f)
-}
-
-func (cmd *change) Description() string {
-	return `Change DVS portgroup configuration.
-
-Examples:
-  govc dvs.portgroup.change -nports 26 ExternalNetwork
-  govc dvs.portgroup.change -vlan 3214 ExternalNetwork`
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Usage() string {
-	return "PATH"
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	path := f.Arg(0)
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	net, err := finder.Network(ctx, path)
-	if err != nil {
-		return err
-	}
-
-	pg, ok := net.(*object.DistributedVirtualPortgroup)
-	if !ok {
-		return fmt.Errorf("%s (%T) is not of type %T", path, net, pg)
-	}
-
-	var s mo.DistributedVirtualPortgroup
-	err = pg.Properties(ctx, pg.Reference(), []string{"config.configVersion"}, &s)
-	if err != nil {
-		return err
-	}
-
-	spec := cmd.Spec()
-	spec.ConfigVersion = s.Config.ConfigVersion
-
-	task, err := pg.Reconfigure(ctx, spec)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("changing %s portgroup configuration %s... ", pg.Name(), pg.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
deleted file mode 100644
index 6fd05ef6e3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/info.go
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.DatacenterFlag
-
-	pg         string
-	active     bool
-	connected  bool
-	inside     bool
-	uplinkPort bool
-	vlanID     int
-	count      uint
-}
-
-func init() {
-	cli.Register("dvs.portgroup.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.pg, "pg", "", "Distributed Virtual Portgroup")
-	f.BoolVar(&cmd.active, "active", false, "Filter by port active or inactive status")
-	f.BoolVar(&cmd.connected, "connected", false, "Filter by port connected or disconnected status")
-	f.BoolVar(&cmd.inside, "inside", true, "Filter by port inside or outside status")
-	f.BoolVar(&cmd.uplinkPort, "uplinkPort", false, "Filter for uplink ports")
-	f.IntVar(&cmd.vlanID, "vlan", 0, "Filter by VLAN ID (0 = unfiltered)")
-	f.UintVar(&cmd.count, "count", 0, "Number of matches to return (0 = unlimited)")
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "DVS"
-}
-
-func (cmd *info) Description() string {
-	return `Portgroup info for DVS.
-
-Examples:
-  govc dvs.portgroup.info DSwitch
-  govc find / -type DistributedVirtualSwitch | xargs -n1 govc dvs.portgroup.info`
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	// Retrieve DVS reference
-	net, err := finder.Network(ctx, f.Arg(0))
-	if err != nil {
-		return err
-	}
-
-	// Convert to DVS object type
-	dvs, ok := net.(*object.DistributedVirtualSwitch)
-	if !ok {
-		return fmt.Errorf("%s (%s) is not a DVS", f.Arg(0), net.Reference().Type)
-	}
-
-	// Set base search criteria
-	criteria := types.DistributedVirtualSwitchPortCriteria{
-		Connected:  types.NewBool(cmd.connected),
-		Active:     types.NewBool(cmd.active),
-		UplinkPort: types.NewBool(cmd.uplinkPort),
-		Inside:     types.NewBool(cmd.inside),
-	}
-
-	// If a distributed virtual portgroup path is set, then add its portgroup key to the base criteria
-	if len(cmd.pg) > 0 {
-		// Retrieve distributed virtual portgroup reference
-		net, err = finder.Network(ctx, cmd.pg)
-		if err != nil {
-			return err
-		}
-
-		// Convert distributed virtual portgroup object type
-		dvpg, ok := net.(*object.DistributedVirtualPortgroup)
-		if !ok {
-			return fmt.Errorf("%s (%s) is not a DVPG", cmd.pg, net.Reference().Type)
-		}
-
-		// Obtain portgroup key property
-		var dvp mo.DistributedVirtualPortgroup
-		if err := dvpg.Properties(ctx, dvpg.Reference(), []string{"key"}, &dvp); err != nil {
-			return err
-		}
-
-		// Add portgroup key to port search criteria
-		criteria.PortgroupKey = []string{dvp.Key}
-	}
-
-	res, err := dvs.FetchDVPorts(ctx)
-	if err != nil {
-		return err
-	}
-
-	var returnedPorts uint
-
-	// Iterate over returned ports
-	for _, port := range res {
-		portConfigSetting := port.Config.Setting.(*types.VMwareDVSPortSetting)
-		portVlan := portConfigSetting.Vlan.(*types.VmwareDistributedVirtualSwitchVlanIdSpec)
-		portVlanID := portVlan.VlanId
-
-		// Show port info if: VLAN ID is not defined, or VLAN ID matches requested VLAN
-		if cmd.vlanID == 0 || portVlanID == int32(cmd.vlanID) {
-			returnedPorts++
-
-			fmt.Printf("PortgroupKey: %s\n", port.PortgroupKey)
-			fmt.Printf("DvsUuid:      %s\n", port.DvsUuid)
-			fmt.Printf("VlanId:       %d\n", portVlanID)
-			fmt.Printf("PortKey:      %s\n\n", port.Key)
-
-			// If we are limiting the count and have reached the count, then stop returning output
-			if cmd.count > 0 && returnedPorts == cmd.count {
-				break
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go b/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go
deleted file mode 100644
index fb643d2020..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/dvs/portgroup/spec.go
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type DVPortgroupConfigSpec struct {
-	types.DVPortgroupConfigSpec
-}
-
-func (spec *DVPortgroupConfigSpec) Register(ctx context.Context, f *flag.FlagSet) {
-	ptypes := []string{
-		string(types.DistributedVirtualPortgroupPortgroupTypeEarlyBinding),
-		string(types.DistributedVirtualPortgroupPortgroupTypeLateBinding),
-		string(types.DistributedVirtualPortgroupPortgroupTypeEphemeral),
-	}
-
-	f.StringVar(&spec.Type, "type", ptypes[0],
-		fmt.Sprintf("Portgroup type (%s)", strings.Join(ptypes, "|")))
-
-	f.Var(flags.NewInt32(&spec.NumPorts), "nports", "Number of ports")
-
-	config := new(types.VMwareDVSPortSetting)
-	vlan := new(types.VmwareDistributedVirtualSwitchVlanIdSpec)
-	spec.DefaultPortConfig = config
-	config.Vlan = vlan
-
-	f.Var(flags.NewInt32(&vlan.VlanId), "vlan", "VLAN ID")
-}
-
-func (spec *DVPortgroupConfigSpec) Spec() types.DVPortgroupConfigSpec {
-	return spec.DVPortgroupConfigSpec
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore b/installer/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore
deleted file mode 100644
index 56179efce3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-.cask
-elpa
-*.elc
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/Cask b/installer/vendor/github.com/vmware/govmomi/govc/emacs/Cask
deleted file mode 100644
index aa7cf639cf..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/Cask
+++ /dev/null
@@ -1,10 +0,0 @@
-(source gnu)
-(source melpa)
-
-(package-file "govc.el")
-
-(development
- (depends-on "dash")
- (depends-on "json-mode")
- (depends-on "magit")
- (depends-on "s"))
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/Makefile b/installer/vendor/github.com/vmware/govmomi/govc/emacs/Makefile
deleted file mode 100644
index 0508993db4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/Makefile
+++ /dev/null
@@ -1,27 +0,0 @@
-CASK = cask
-EMACS_BIN ?= emacs
-EMACS_FLAGS =
-EMACS_EXEC = $(CASK) exec $(EMACS_BIN) --no-site-file --no-site-lisp --batch $(EMACS_FLAGS)
-
-OBJECTS = govc.elc
-
-elpa:
-	$(CASK) install
-	$(CASK) update
-	touch $@
-
-.PHONY: build test docs clean
-
-build: elpa $(OBJECTS)
-
-test: build docs
-	$(EMACS_EXEC) -l test/make.el -f make-test
-
-docs: build
-	$(EMACS_EXEC) -l test/make.el -f make-docs
-clean:
-	rm -f $(OBJECTS) elpa
-	rm -rf .cask
-
-%.elc: %.el
-	$(EMACS_EXEC) -f batch-byte-compile $<
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/README.md b/installer/vendor/github.com/vmware/govmomi/govc/emacs/README.md
deleted file mode 100644
index 2957665200..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/README.md
+++ /dev/null
@@ -1,290 +0,0 @@
-# govc.el
-
-Interface to govc for managing VMware ESXi and vCenter.
-
-
-The goal of this package is to provide a simple interface for commonly used
-govc commands within Emacs.  This includes table based inventory/state modes
-for vms, hosts, datastores and pools.  The keymap for each mode provides
-shortcuts for easily feeding the data in view to other govc commands.
-
-Within the various govc modes, press `?` to see a popup menu of options.
-A menu bar is enabled for certain modes, such as `govc-vm-mode` and `govc-host-mode`.
-There is also a `govc` menu at all times under the `Tools` menu.
-
-The recommended way to install govc.el is via MELPA (http://melpa.org/).
-
-## govc-mode
-
-Running `govc-global-mode` creates key bindings to the various govc modes.
-The default prefix is `C-c ;` and can be changed by setting `govc-keymap-prefix`.
-
-### govc-command-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>h</kbd>   | Host info via govc
-<kbd>p</kbd>   | Pool info via govc
-<kbd>v</kbd>   | VM info via govc
-<kbd>s</kbd>   | Datastore info via govc
-
-### govc-urls
-
-List of URLs for use with `govc-session`.
-The `govc-session-name` displayed by `govc-mode-line` uses `url-target` (anchor)
-if set, otherwise `url-host` is used.
-
-Example:
-```
-  (setq govc-urls `("root:vagrant@localhost:18443#Vagrant-ESXi"
-                    "root:password@192.168.1.192#Intel-NUC"
-                    "Administrator@vsphere.local:password!@vcva-clovervm"))
-```
-To enter a URL that is not in the list, prefix `universal-argument`, for example:
-
-  `C-u M-x govc-vm`
-
-To avoid putting your credentials in a variable, you can use the
-auth-source search integration.
-
-```
-  (setq govc-urls `("myserver-vmware-2"))
-```
-
-And then put this line in your `auth-sources` (e.g. `~/.authinfo.gpg`):
-```
-    machine myserver-vmware-2 login tzz password mypass url "myserver-vmware-2.some.domain.here:443?insecure=true"
-```
-
-Which will result in the URL "tzz:mypass@myserver-vmware-2.some.domain.here:443?insecure=true".
-For more details on `auth-sources`, see Info node `(auth) Help for users`.
-
-When in `govc-vm` or `govc-host` mode, a default URL is composed with the
-current session credentials and the IP address of the current vm/host and
-the vm/host name as the session name.  This makes it easier to connect to
-nested ESX/vCenter VMs or directly to an ESX host.
-
-### govc-session-url
-
-ESX or vCenter URL set by `govc-session` via `govc-urls` selection.
-
-### govc-session-insecure
-
-Skip verification of server certificate when true.
-This variable is set to the value of the `GOVC_INSECURE` env var by default.
-It can also be set per-url via the query string (insecure=true).  For example:
-```
-  (setq govc-urls `("root:password@hostname?insecure=true"))
-```
-
-### govc-session-datacenter
-
-Datacenter to use for the current `govc-session`.
-If the endpoint has a single Datacenter it will be used by default, otherwise
-`govc-session` will prompt for selection.  It can also be set per-url via the
-query string.  For example:
-```
-  (setq govc-urls `("root:password@hostname?datacenter=dc1"))
-```
-
-### govc-session-datastore
-
-Datastore to use for the current `govc-session`.
-If the endpoint has a single Datastore it will be used by default, otherwise
-`govc-session` will prompt for selection.  It can also be set per-url via the
-query string.  For example:
-```
-  (setq govc-urls `("root:password@hostname?datastore=vsanDatastore"))
-```
-
-### govc-session-network
-
-Network to use for the current `govc-session`.
-
-## govc-tabulated-list-mode
-
-Generic table bindings to mark/unmark rows.
-
-In addition to any hooks its parent mode `tabulated-list-mode` might have run,
-this mode runs the hook `govc-tabulated-list-mode-hook`, as the final step
-during initialization.
-
-### govc-tabulated-list-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>m</kbd>   | Mark and move to the next line
-<kbd>u</kbd>   | Unmark and move to the next line
-<kbd>t</kbd>   | Toggle mark
-<kbd>U</kbd>   | Unmark all
-<kbd>M-&</kbd> | Shell CMD with current `govc-session` exported as GOVC_ env vars
-<kbd>M-w</kbd> | Copy current selection or region to the kill ring
-<kbd>M-E</kbd> | Export session to `process-environment` and `kill-ring`
-
-## govc-host-mode
-
-Major mode for handling a list of govc hosts.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-host-mode-hook`, as the final step
-during initialization.
-
-### govc-host-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
-<kbd>L</kbd>   | Logs via govc logs -n `govc-max-events`
-<kbd>J</kbd>   | JSON via govc host
-<kbd>M</kbd>   | Metrics info
-<kbd>N</kbd>   | Netstat via `govc-esxcli-netstat-info` with current host id
-<kbd>O</kbd>   | Object browser via govc object
-<kbd>c</kbd>   | Connect new session for the current govc mode
-<kbd>p</kbd>   | Pool-mode with current session
-<kbd>s</kbd>   | Datastore-mode with current session
-<kbd>v</kbd>   | VM-mode with current session
-
-## govc-pool-mode
-
-Major mode for handling a list of govc pools.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-pool-mode-hook`, as the final step
-during initialization.
-
-### govc-pool-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>D</kbd>   | Destroy via `govc-pool-destroy` on the pool selection
-<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
-<kbd>J</kbd>   | JSON via govc pool
-<kbd>M</kbd>   | Metrics info
-<kbd>O</kbd>   | Object browser via govc object
-<kbd>c</kbd>   | Connect new session for the current govc mode
-<kbd>h</kbd>   | Host-mode with current session
-<kbd>s</kbd>   | Datastore-mode with current session
-<kbd>v</kbd>   | VM-mode with current session
-
-## govc-datastore-mode
-
-Major mode for govc datastore.info.
-
-In addition to any hooks its parent mode `tabulated-list-mode` might have run,
-this mode runs the hook `govc-datastore-mode-hook`, as the final step
-during initialization.
-
-### govc-datastore-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>J</kbd>   | JSON via govc datastore
-<kbd>M</kbd>   | Metrics info
-<kbd>O</kbd>   | Object browser via govc object
-<kbd>RET</kbd> | Browse datastore
-<kbd>c</kbd>   | Connect new session for the current govc mode
-<kbd>h</kbd>   | Host-mode with current session
-<kbd>p</kbd>   | Pool-mode with current session
-<kbd>v</kbd>   | VM-mode with current session
-
-## govc-datastore-ls-mode
-
-Major mode govc datastore.ls.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-datastore-ls-mode-hook`, as the final step
-during initialization.
-
-### govc-datastore-ls-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>J</kbd>   | JSON via govc datastore
-<kbd>S</kbd>   | Search via govc datastore
-<kbd>D</kbd>   | Delete selected datastore paths
-<kbd>T</kbd>   | Tail datastore file
-<kbd>+</kbd>   | Mkdir via govc datastore
-<kbd>DEL</kbd> | Up to parent folder
-<kbd>RET</kbd> | Open datastore folder or file
-
-## govc-vm-mode
-
-Major mode for handling a list of govc vms.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-vm-mode-hook`, as the final step
-during initialization.
-
-### govc-vm-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>E</kbd>   | Events via govc events -n `govc-max-events`
-<kbd>J</kbd>   | JSON via govc vm
-<kbd>O</kbd>   | Object browser via govc object
-<kbd>X</kbd>   | ExtraConfig via `govc-vm-extra-config` on the current selection
-<kbd>RET</kbd> | Devices via `govc-device` on the current selection
-<kbd>C</kbd>   | Console screenshot via `govc-vm-screen` on the current selection
-<kbd>V</kbd>   | VNC via `govc-vm-vnc` on the current selection
-<kbd>D</kbd>   | Destroy via `govc-vm-destroy` on the current selection
-<kbd>^</kbd>   | Start via `govc-vm-start` on the current selection
-<kbd>!</kbd>   | Shutdown via `govc-vm-shutdown` on the current selection
-<kbd>@</kbd>   | Reboot via `govc-vm-reboot` on the current selection
-<kbd>&</kbd>   | Suspend via `govc-vm-suspend` on the current selection
-<kbd>H</kbd>   | Host info via `govc-host` with host(s) of current selection
-<kbd>M</kbd>   | Metrics info
-<kbd>P</kbd>   | Ping VM
-<kbd>S</kbd>   | Datastore via `govc-datastore-ls` with datastore of current selection
-<kbd>c</kbd>   | Connect new session for the current govc mode
-<kbd>h</kbd>   | Host-mode with current session
-<kbd>p</kbd>   | Pool-mode with current session
-<kbd>s</kbd>   | Datastore-mode with current session
-
-## govc-device-mode
-
-Major mode for handling a govc device.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-device-mode-hook`, as the final step
-during initialization.
-
-### govc-device-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>J</kbd>   | JSON via govc device
-<kbd>RET</kbd> | Tabulated govc device
-
-## govc-object-mode
-
-Major mode for handling a govc object.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-object-mode-hook`, as the final step
-during initialization.
-
-### govc-object-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>J</kbd>   | JSON object selection via govc object
-<kbd>N</kbd>   | Next managed object reference
-<kbd>O</kbd>   | Object browser via govc object
-<kbd>DEL</kbd> | Parent object selection if reachable, otherwise prompt with `govc-object-history`
-<kbd>RET</kbd> | Expand object selection via govc object
-
-## govc-metric-mode
-
-Major mode for handling a govc metric.
-
-In addition to any hooks its parent mode `govc-tabulated-list-mode` might have run,
-this mode runs the hook `govc-metric-mode-hook`, as the final step
-during initialization.
-
-### govc-metric-mode-map
-
-Keybinding     | Description
----------------|------------------------------------------------------------
-<kbd>RET</kbd> | Sample metrics
-<kbd>P</kbd>   | Plot metric sample
-<kbd>s</kbd>   | Select metric names
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/govc.el b/installer/vendor/github.com/vmware/govmomi/govc/emacs/govc.el
deleted file mode 100644
index d92f3e01c1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/govc.el
+++ /dev/null
@@ -1,1652 +0,0 @@
-;;; govc.el --- Interface to govc for managing VMware ESXi and vCenter
-
-;; Author: The govc developers
-;; URL: https://github.com/vmware/govmomi/tree/master/govc/emacs
-;; Keywords: convenience
-;; Version: 0.14.0
-;; Package-Requires: ((emacs "24.3") (dash "1.5.0") (s "1.9.0") (magit-popup "2.0.50") (json-mode "1.6.0"))
-
-;; This file is NOT part of GNU Emacs.
-
-;; Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-;;
-;; Licensed under the Apache License, Version 2.0 (the "License");
-;; you may not use this file except in compliance with the License.
-;; You may obtain a copy of the License at
-;;
-;; http://www.apache.org/licenses/LICENSE-2.0
-;;
-;; Unless required by applicable law or agreed to in writing, software
-;; distributed under the License is distributed on an "AS IS" BASIS,
-;; WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-;; See the License for the specific language governing permissions and
-;; limitations under the License.
-
-;;; Commentary:
-
-;; The goal of this package is to provide a simple interface for commonly used
-;; govc commands within Emacs.  This includes table based inventory/state modes
-;; for vms, hosts, datastores and pools.  The keymap for each mode provides
-;; shortcuts for easily feeding the data in view to other govc commands.
-;;
-;; Within the various govc modes, press `?' to see a popup menu of options.
-;; A menu bar is enabled for certain modes, such as `govc-vm-mode' and `govc-host-mode'.
-;; There is also a `govc' menu at all times under the `Tools' menu.
-;;
-;; The recommended way to install govc.el is via MELPA (http://melpa.org/).
-
-;;; Code:
-
-(eval-when-compile
-  (require 'cl))
-(require 'dash)
-(require 'diff)
-(require 'dired)
-(require 'json-mode)
-(require 'magit-popup)
-(require 'url-parse)
-(require 's)
-
-(autoload 'auth-source-search "auth-source")
-
-(defgroup govc nil
-  "Emacs customization group for govc."
-  :group 'convenience)
-
-(defcustom govc-keymap-prefix "C-c ;"
-  "Prefix for `govc-mode'."
-  :group 'govc)
-
-(defcustom govc-command "govc"
-  "Executable path to the govc utility."
-  :type 'string
-  :group 'govc)
-
-(defvar govc-command-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "h" 'govc-host)
-    (define-key map "p" 'govc-pool)
-    (define-key map "v" 'govc-vm)
-    (define-key map "s" 'govc-datastore)
-    (define-key map "?" 'govc-popup)
-    map)
-  "Keymap for `govc-mode' after `govc-keymap-prefix' was pressed.")
-
-(defvar govc-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd govc-keymap-prefix) govc-command-map)
-    map)
-  "Keymap for `govc-mode'.")
-
-;;;###autoload
-(define-minor-mode govc-mode
-  "Running `govc-global-mode' creates key bindings to the various govc modes.
-The default prefix is `C-c ;' and can be changed by setting `govc-keymap-prefix'.
-
-\\{govc-mode-map\}"
-  nil govc-mode-line govc-mode-map
-  :group 'govc)
-
-;;;###autoload
-(define-globalized-minor-mode govc-global-mode govc-mode govc-mode)
-
-(defcustom govc-mode-line
-  '(:eval (format " govc[%s]" (or (govc-session-name) "-")))
-  "Mode line lighter for govc."
-  :group 'govc
-  :type 'sexp
-  :risky t)
-
-
-;;; Tabulated list mode extensions (derived from https://github.com/Silex/docker.el tabulated-list-ext.el)
-(defun govc-tabulated-list-mark ()
-  "Mark and move to the next line."
-  (interactive)
-  (tabulated-list-put-tag (char-to-string dired-marker-char) t))
-
-(defun govc-tabulated-list-unmark ()
-  "Unmark and move to the next line."
-  (interactive)
-  (tabulated-list-put-tag "" t))
-
-(defun govc-tabulated-list-toggle-marks ()
-  "Toggle mark."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (let ((cmd))
-      (while (not (eobp))
-        (setq cmd (char-after))
-        (tabulated-list-put-tag
-         (if (eq cmd dired-marker-char)
-             ""
-           (char-to-string dired-marker-char)) t)))))
-
-(defun govc-tabulated-list-unmark-all ()
-  "Unmark all."
-  (interactive)
-  (save-excursion
-    (goto-char (point-min))
-    (while (not (eobp))
-      (tabulated-list-put-tag "" t))))
-
-(defun govc-selection ()
-  "Get the current selection as a list of names."
-  (let ((selection))
-    (save-excursion
-      (goto-char (point-min))
-      (while (not (eobp))
-        (when (eq (char-after) ?*)
-          (add-to-list 'selection (tabulated-list-get-id)))
-        (forward-line)))
-    (or selection (let ((id (tabulated-list-get-id)))
-                    (if id
-                        (list id))))))
-
-(defun govc-do-selection (fn action)
-  "Call FN with `govc-selection' confirming ACTION."
-  (let* ((selection (govc-selection))
-         (count (length selection))
-         (prompt (if (= count 1)
-                     (car selection)
-                   (format "* [%d] marked" count))))
-    (if (yes-or-no-p (format "%s %s ?" action prompt))
-        (funcall fn selection))))
-
-(defun govc-copy-selection ()
-  "Copy current selection or region to the kill ring."
-  (interactive)
-  (if (region-active-p)
-      (copy-region-as-kill (mark) (point) 'region)
-    (kill-new (message "%s" (s-join " " (--map (format "\"%s\"" it) (govc-selection)))))))
-
-(defvar govc-font-lock-keywords
-  `(("\"[^\"]*\"" . (0 font-lock-string-face))
-    ("'[^']*'" . (0 font-lock-string-face))
-    ("[.0-9]+%" . (0 font-lock-type-face))
-    (,(mapconcat 'identity (make-list 4 "[0-9]+") "\\.") ;; IP address
-     . (0 font-lock-variable-name-face))
-    (,(let ((host-expression "[-A-Za-z0-9]+")) ;; Hostname
-        (concat
-         (mapconcat 'identity (make-list 3 host-expression) "\\.")
-         "\\(\\." host-expression "\\)*")) .
-         (0 font-lock-variable-name-face))
-    ("\\<\\(success\\|poweredOn\\)\\>" . (1 font-lock-doc-face))
-    ("\\<\\(error\\|poweredOff\\)\\>" . (1 font-lock-warning-face))
-    ("\\<\\(running\\|info\\)\\>" . (1 font-lock-variable-name-face))
-    ("\\<\\(warning\\|suspended\\)\\>" . (1 font-lock-keyword-face))
-    ("\\<\\(verbose\\|trivia\\)\\>" . (1 whitespace-line))
-    (,dired-re-maybe-mark . (0 dired-mark-face))
-    ("types.ManagedObjectReference\\(.*\\)" . (1 dired-directory-face))
-    ("[^ ]*/$" . (0 dired-directory-face))
-    ("\\.\\.\\.$" . (0 dired-symlink-face))
-    ("^\\([ A-Za-z0-9_]+: \\).*" . (1 font-lock-comment-face))
-    ("<[^>]*>" . (0 font-lock-comment-face))
-    ("\\[[^]]*\\]" . (0 font-lock-comment-face))
-    ("([^)]*)" . (0 font-lock-comment-face))))
-
-(defvar govc-tabulated-list-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "m" 'govc-tabulated-list-mark)
-    (define-key map "u" 'govc-tabulated-list-unmark)
-    (define-key map "t" 'govc-tabulated-list-toggle-marks)
-    (define-key map "U" 'govc-tabulated-list-unmark-all)
-    (define-key map (kbd "M-&") 'govc-shell-command)
-    (define-key map (kbd "M-w") 'govc-copy-selection)
-    (define-key map (kbd "M-E") 'govc-copy-environment)
-    map)
-  "Keymap for `govc-tabulated-list-mode'.")
-
-(define-derived-mode govc-tabulated-list-mode tabulated-list-mode "Tabulated govc"
-  "Generic table bindings to mark/unmark rows."
-  (setq-local font-lock-defaults
-              '(govc-font-lock-keywords t nil nil beginning-of-line)))
-
-
-;;; Keymap helpers for generating menus and popups
-(defun govc-keymap-list (keymap)
-  "Return a list of (key name function) for govc bindings in the given KEYMAP.
-The name returned is the first word of the function `documentation'."
-  (let ((map))
-    (map-keymap
-     (lambda (k f)
-       (when (keymapp f)
-         (setq map (append map
-                           (--map (and (setcar it (kbd (format "M-%s" (char-to-string (car it))))) it)
-                                  (govc-keymap-list f)))))
-       (when (and (symbolp f)
-                  (s-starts-with? "govc-" (symbol-name f)))
-         (if (not (eq ?? k))
-             (add-to-list 'map (list k (car (split-string (documentation f))) f))))) keymap)
-    map))
-
-(defun govc-keymap-menu (keymap)
-  "Return a list of [key function t] for govc bindings in the given KEYMAP.
-For use with `easy-menu-define'."
-  (-map (lambda (item)
-          (vector (nth 1 item) (nth 2 item) t))
-        (govc-keymap-list keymap)))
-
-(defun govc-key-description (key)
-  "Call `key-description' ensuring KEY is a sequence."
-  (key-description (if (integerp key) (list key) key)))
-
-(defun govc-keymap-list-to-help (keymap)
-  "Convert KEYMAP to list of help text."
-  (--map (list (govc-key-description (car it))
-               (car (split-string (documentation (nth 2 it)) "\\.")))
-         keymap))
-
-(defun govc-keymap-popup-help ()
-  "Default keymap help for `govc-keymap-popup'."
-  (append (govc-keymap-list-to-help (govc-keymap-list govc-tabulated-list-mode-map))
-          '(("g" "Refresh current buffer")
-            ("C-h m" "Show all key bindings"))))
-
-(defun govc-keymap-popup (keymap)
-  "Convert a `govc-keymap-list' using KEYMAP for use with `magit-define-popup'.
-Keys in the ASCII range of 32-97 are mapped to popup commands, all others are listed as help text."
-  (let* ((maps (--separate (and (integerp (car it))
-                                (>= (car it) 32)
-                                (<= (car it) 97))
-                           (govc-keymap-list keymap)))
-         (help (govc-keymap-list-to-help (cadr maps))))
-    (append
-     '("Commands")
-     (car maps)
-     (list (s-join "\n" (--map (format " %-6s %s" (car it) (cadr it))
-                               (append help (govc-keymap-popup-help))))
-           nil))))
-
-
-;;; govc process helpers
-(defcustom govc-urls nil
-  "List of URLs for use with `govc-session'.
-The `govc-session-name' displayed by `govc-mode-line' uses `url-target' (anchor)
-if set, otherwise `url-host' is used.
-
-Example:
-```
-  (setq govc-urls '(\"root:vagrant@localhost:18443#Vagrant-ESXi\"
-                    \"root:password@192.168.1.192#Intel-NUC\"
-                    \"Administrator@vsphere.local:password!@vcva-clovervm\"))
-```
-To enter a URL that is not in the list, prefix `universal-argument', for example:
-
-  `\\[universal-argument] \\[govc-vm]'
-
-To avoid putting your credentials in a variable, you can use the
-auth-source search integration.
-
-```
-  (setq govc-urls '(\"myserver-vmware-2\"))
-```
-
-And then put this line in your `auth-sources' (e.g. `~/.authinfo.gpg'):
-```
-    machine myserver-vmware-2 login tzz password mypass url \"myserver-vmware-2.some.domain.here:443?insecure=true\"
-```
-
-Which will result in the URL \"tzz:mypass@myserver-vmware-2.some.domain.here:443?insecure=true\".
-For more details on `auth-sources', see Info node `(auth) Help for users'.
-
-When in `govc-vm' or `govc-host' mode, a default URL is composed with the
-current session credentials and the IP address of the current vm/host and
-the vm/host name as the session name.  This makes it easier to connect to
-nested ESX/vCenter VMs or directly to an ESX host."
-  :group 'govc
-  :type '(repeat (string :tag "vcenter URL or auth-source machine reference")))
-
-(defvar-local govc-session-url nil
-  "ESX or vCenter URL set by `govc-session' via `govc-urls' selection.")
-
-(defvar-local govc-session-path nil)
-
-(defvar-local govc-session-insecure nil
-  "Skip verification of server certificate when true.
-This variable is set to the value of the `GOVC_INSECURE' env var by default.
-It can also be set per-url via the query string (insecure=true).  For example:
-```
-  (setq govc-urls '(\"root:password@hostname?insecure=true\"))
-```")
-
-(defvar-local govc-session-datacenter nil
-  "Datacenter to use for the current `govc-session'.
-If the endpoint has a single Datacenter it will be used by default, otherwise
-`govc-session' will prompt for selection.  It can also be set per-url via the
-query string.  For example:
-```
-  (setq govc-urls '(\"root:password@hostname?datacenter=dc1\"))
-```")
-
-(defvar-local govc-session-datastore nil
-  "Datastore to use for the current `govc-session'.
-If the endpoint has a single Datastore it will be used by default, otherwise
-`govc-session' will prompt for selection.  It can also be set per-url via the
-query string.  For example:
-```
-  (setq govc-urls '(\"root:password@hostname?datastore=vsanDatastore\"))
-```")
-
-(defvar-local govc-session-network nil
-  "Network to use for the current `govc-session'.")
-
-(defvar-local govc-filter nil
-  "Resource path filter.")
-
-(defvar-local govc-args nil
-  "Additional govc arguments.")
-
-(defun govc-session-name ()
-  "Return a name for the current session.
-Derived from `govc-session-url' if set, otherwise from the 'GOVC_URL' env var.
-Return value is the url anchor if set, otherwise the hostname is returned."
-  (let* ((u (or govc-session-url (getenv "GOVC_URL")))
-         (url (if u (govc-url-parse u))))
-    (if url
-        (concat (or (url-target url) (url-host url)) govc-session-path))))
-
-(defun govc-format-command (command &rest args)
-  "Format govc COMMAND ARGS."
-  (format "%s %s %s" govc-command command
-          (s-join " " (--map (format "'%s'" it)
-                             (-flatten (-non-nil args))))))
-
-(defconst govc-environment-map (--map (cons (concat "GOVC_" (upcase it))
-                                            (intern (concat "govc-session-" it)))
-                                      '("url" "insecure" "datacenter" "datastore" "network"))
-
-  "Map of `GOVC_*' environment variable names to `govc-session-*' symbol names.")
-
-(defun govc-environment (&optional unset)
-  "Return `process-environment' for govc.
-Optionally clear govc env if UNSET is non-nil."
-  (let ((process-environment (copy-sequence process-environment)))
-    (dolist (e govc-environment-map)
-      (setenv (car e) (unless unset (symbol-value (cdr e)))))
-    process-environment))
-
-(defun govc-export-environment (arg)
-  "Set if ARG is \\[universal-argument], unset if ARG is \\[negative-argument]."
-  (if (equal arg '-)
-      (progn (setq process-environment (govc-environment t))
-             (cons "unset" (--map (car it)
-                                  govc-environment-map)))
-    (progn (setq process-environment (govc-environment))
-           (cons "export" (--map (format "%s='%s'" (car it) (or (symbol-value (cdr it)) ""))
-                                 govc-environment-map)))))
-
-(defun govc-copy-environment (&optional arg)
-  "Export session to `process-environment' and `kill-ring'.
-Optionally set `GOVC_*' vars in `process-environment' using prefix
-\\[universal-argument] ARG or unset with prefix \\[negative-argument] ARG."
-  (interactive "P")
-  (message (kill-new (if arg (s-join " " (govc-export-environment arg)) govc-session-url))))
-
-(defun govc-process (command handler)
-  "Run COMMAND, calling HANDLER upon successful exit of the process."
-  (message "%s" command)
-  (let ((process-environment (govc-environment))
-        (exit-code))
-    (add-to-list 'govc-command-history command)
-    (with-temp-buffer
-      (setq exit-code (call-process-shell-command command nil (current-buffer)))
-      (if (zerop exit-code)
-          (funcall handler)
-        (error (buffer-string))))))
-
-(defun govc (command &rest args)
-  "Execute govc COMMAND with ARGS.
-Return value is `buffer-string' split on newlines."
-  (govc-process (govc-format-command command args)
-                (lambda ()
-                  (split-string (buffer-string) "\n" t))))
-
-(defun govc-json (command &rest args)
-  "Execute govc COMMAND passing arguments ARGS.
-Return value is `json-read'."
-  (govc-process (govc-format-command command (cons "-json" args))
-                (lambda ()
-                  (goto-char (point-min))
-                  (let ((json-object-type 'plist))
-                    (json-read)))))
-
-(defun govc-ls-datacenter ()
-  "List datacenters."
-  (govc "ls" "-t" "Datacenter" "./..."))
-
-(defun govc-object-prompt (prompt ls)
-  "PROMPT for object name via LS function.  Return object without PROMPT if there is just one instance."
-  (let ((objs (if (listp ls) ls (funcall ls))))
-    (if (eq 1 (length objs))
-        (car objs)
-      (completing-read prompt objs))))
-
-(defun govc-url-parse (url)
-  "A `url-generic-parse-url' wrapper to handle URL with password, but no scheme.
-Also fixes the case where user contains an '@'."
-  (let* ((full (s-contains? "://" url))
-         (u (url-generic-parse-url (concat (unless full "https://") url))))
-    (unless full
-      (setf (url-type u) nil)
-      (setf (url-fullness u) nil))
-    (if (s-contains? "@" (url-host u))
-        (let* ((h (split-string (url-host u) "@"))
-               (p (split-string (car h) ":")))
-          (setf (url-host u) (cadr h))
-          (setf (url-user u) (concat (url-user u) "@" (car p)))
-          (setf (url-password u) (cadr p))))
-    u))
-
-(defun govc-url-default ()
-  "Default URL when creating a new session."
-  (if govc-session-url
-      (let ((url (govc-url-parse govc-session-url)))
-        (if (equal major-mode 'govc-host-mode)
-            (progn (setf (url-host url) (govc-table-column-value "Name"))
-                   (setf (url-target url) nil))
-          (progn (setf (url-host url) (govc-table-column-value "IP address"))
-                 (setf (url-target url) (govc-table-column-value "Name"))))
-        (setf (url-filename url) "") ; erase query string
-        (if (string-empty-p (url-user url))
-            (setf (url-user url) "root")) ; local workstation url has no user set
-        (url-recreate-url url))))
-
-(defun govc-urls-completing-read ()
-  "A wrapper for `completing-read' to mask credentials in `govc-urls'."
-  (let ((alist))
-    (dolist (ent govc-urls)
-      (let ((u (govc-url-parse ent)))
-        (setf (url-password u) nil)
-        (add-to-list 'alist `(,(url-recreate-url u) . ,ent) t)))
-    (let ((u (completing-read "govc url: " (-map 'car alist))))
-      (cdr (assoc u alist)))))
-
-(defun govc-session-url-lookup-auth-source (url-or-address)
-  "Check if URL-OR-ADDRESS is a logical name in the authinfo file.
-Given URL-OR-ADDRESS `myserver-vmware-2' this function will find
-a line like
-    machine myserver-vmware-2 login tzz password mypass url \"myserver-vmware-2.some.domain.here:443?insecure=true\"
-
-and will return the URL \"tzz:mypass@myserver-vmware-2.some.domain.here:443?insecure=true\".
-
-If the line is not found, the original URL-OR-ADDRESS is
-returned, assuming that's what the user wanted."
-  (let ((found (nth 0 (auth-source-search :max 1
-                                          :host url-or-address
-                                          :require '(:user :secret :url)
-                                          :create nil))))
-    (if found
-        (format "%s:%s@%s"
-                (plist-get found :user)
-                (let ((secret (plist-get found :secret)))
-                  (if (functionp secret)
-                      (funcall secret)
-                    secret))
-                (plist-get found :url))
-      url-or-address)))
-
-(defun govc-session-set-url (url)
-  "Set `govc-session-url' to URL and optionally set other govc-session-* variables via URL query."
-  ;; Replace the original URL with the auth-source lookup if there is no user.
-  (unless (url-user (govc-url-parse url))
-    (setq url (govc-session-url-lookup-auth-source url)))
-
-  (let ((q (cdr (url-path-and-query (govc-url-parse url)))))
-    (dolist (opt (if q (url-parse-query-string q)))
-      (let ((var (intern (concat "govc-session-" (car opt)))))
-        (if (boundp var)
-            (set var (cadr opt))))))
-  (setq govc-session-url url))
-
-(defun govc-session ()
-  "Initialize a govc session."
-  (interactive)
-  (let ((url (if (or current-prefix-arg (eq 0 (length govc-urls)))
-                 (read-string "govc url: " (govc-url-default))
-               (if (eq 1 (length govc-urls))
-                   (car govc-urls)
-                 (govc-urls-completing-read)))))
-    ;; Wait until this point to clear so current session is preserved in the
-    ;; event of `keyboard-quit' in `read-string'.
-    (setq govc-session-datacenter nil
-          govc-session-datastore nil
-          govc-session-network nil
-          govc-filter nil)
-    (govc-session-set-url url))
-  (unless govc-session-insecure
-    (setq govc-session-insecure (or (getenv "GOVC_INSECURE")
-                                    (completing-read "govc insecure: " '("true" "false")))))
-  (unless govc-session-datacenter
-    (setq govc-session-datacenter (govc-object-prompt "govc datacenter: " 'govc-ls-datacenter)))
-  (add-to-list 'govc-urls govc-session-url))
-
-(defalias 'govc-current-session 'buffer-local-variables)
-
-(defun govc-session-clone (session)
-  "Clone a session from SESSION buffer locals."
-  (dolist (v session)
-    (let ((s (car v)))
-      (when (s-starts-with? "govc-session-" (symbol-name s))
-        (set s (assoc-default s session))))))
-
-(defvar govc-command-history nil
-  "History list for govc commands used by `govc-shell-command'.")
-
-(defvar govc-shell--revert-cmd nil)
-
-(defun govc-shell--revert-function (&optional _ _)
-  "Re-run the buffer's most recent govc-shell-run command."
-  (apply (car govc-shell--revert-cmd) (cdr govc-shell--revert-cmd)))
-
-(defun govc-shell-filter (proc string)
-  "Process filter for govc-shell PROC, append STRING."
-  (when (buffer-live-p (process-buffer proc))
-    (with-current-buffer (process-buffer proc)
-      (let ((moving (= (point) (process-mark proc))))
-        (save-excursion
-          (let ((inhibit-read-only t))
-            (goto-char (process-mark proc))
-            (insert string)
-            (set-marker (process-mark proc) (point))))
-        (display-buffer (process-buffer proc))
-        (if moving
-            (with-selected-window (get-buffer-window (current-buffer))
-              (goto-char (point-max))))))))
-
-(defun govc-shell-run (name args buffer)
-  "Run NAME command with ARGS in BUFFER."
-  (with-current-buffer (if (stringp buffer) (get-buffer-create buffer) buffer)
-    (let ((proc (get-buffer-process (current-buffer)))
-          (process-environment (govc-environment))
-          (session (govc-current-session))
-          (inhibit-read-only t))
-      (when proc
-        (set-process-filter proc nil)
-        (delete-process proc))
-      (erase-buffer)
-      (if (--any? (member (file-name-extension it) '("vmx" "vmdk")) args)
-          (conf-mode)
-        (govc-shell-mode))
-      (govc-session-clone session)
-      (setq-local govc-shell--revert-cmd `(govc-shell-run ,name ,args ,(current-buffer)))
-      (setq mode-line-process '(:propertize ":run" face compilation-mode-line-run))
-      (setq proc (apply 'start-process name (current-buffer) name args))
-      (set-process-sentinel proc 'govc-shell-process-sentinel)
-      (set-process-filter proc 'govc-shell-filter))))
-
-(defun govc-shell-kill ()
-  "Kill the process started by \\[govc-shell-command]."
-  (interactive)
-  (let ((buffer (current-buffer)))
-    (if (get-buffer-process buffer)
-        (interrupt-process (get-buffer-process buffer))
-      (error "The %s process is not running" (downcase mode-name)))))
-
-(defun govc-shell-process-sentinel (process event)
-  "Process sentinel used by `govc-shell-run'.  When PROCESS exits EVENT is logged."
-  (when (memq (process-status process) '(exit signal))
-    (with-current-buffer (process-buffer process)
-      (setq mode-line-process nil)
-      (message "%s %s" (process-name process) (substring event 0 -1)))))
-
-(defvar govc-shell-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "C-c C-k") 'govc-shell-kill)
-    map))
-
-(define-derived-mode govc-shell-mode special-mode "govc-shell"
-  "Mode for running govc commands."
-  (setq-local font-lock-defaults '(govc-font-lock-keywords))
-  (setq-local revert-buffer-function #'govc-shell--revert-function))
-
-(defun govc-shell-command (&optional cmd buffer)
-  "Shell CMD in BUFFER with current `govc-session' exported as GOVC_ env vars."
-  (interactive)
-  (let* ((session (govc-current-session))
-         (args (if cmd (--map (format "%s" it) (-flatten (-non-nil (list govc-command cmd))))
-                 (split-string-and-unquote (read-shell-command "command: " nil 'govc-command-history)))))
-    (with-current-buffer (get-buffer-create (or buffer "*govc*"))
-      (govc-session-clone session)
-      (govc-shell-run (car args) (cdr args) (current-buffer)))))
-
-(defcustom govc-max-events 100
-  "Limit events output to the last N events."
-  :type 'integer
-  :group 'govc)
-
-(defun govc-events ()
-  "Events via govc events -n `govc-max-events'."
-  (interactive)
-  (govc-shell-command
-   (list "events" "-n" govc-max-events (if current-prefix-arg "-f") (govc-selection)) "*govc-event*"))
-
-(defun govc-tasks ()
-  "Tasks via govc tasks."
-  (interactive)
-  (govc-shell-command
-   (list "tasks" "-l" "-n" govc-max-events (if current-prefix-arg "-f") (govc-selection)) "*govc-task*"))
-
-(defun govc-logs ()
-  "Logs via govc logs -n `govc-max-events'."
-  (interactive)
-  (govc-shell-command
-   (let ((host (govc-selection)))
-     (list "logs" "-n" govc-max-events (if current-prefix-arg "-f") (if host (list "-host" host)))) "*govc-log*"))
-
-(defun govc-parse-info (output)
-  "Parse govc info command OUTPUT."
-  (let* ((entries)
-         (entry)
-         (entry-key))
-    (-each output
-      (lambda (line)
-        (let* ((ix (s-index-of ":" line))
-               (key (s-trim (substring line 0 ix)))
-               (val (s-trim (substring line (+ ix 1)))))
-          (unless entry-key
-            (setq entry-key key))
-          (when (s-equals? key entry-key)
-            (setq entry (make-hash-table :test 'equal))
-            (add-to-list 'entries entry))
-          (puthash key val entry))))
-    entries))
-
-(defun govc-table-column-names ()
-  "Return a list of column names from `tabulated-list-format'."
-  (--map (car (aref tabulated-list-format it))
-         (number-sequence 0 (- (length tabulated-list-format) 1))))
-
-(defun govc-table-column-value (key)
-  "Return current column value for given KEY."
-  (let ((names (govc-table-column-names))
-        (entry (tabulated-list-get-entry))
-        (value))
-    (dotimes (ix (- (length names) 1))
-      (if (s-equals? key (nth ix names))
-          (setq value (elt entry ix))))
-    value))
-
-(defun govc-table-info (command &optional args)
-  "Convert `govc-parse-info' COMMAND ARGS output to `tabulated-list-entries' format."
-  (let ((names (govc-table-column-names)))
-    (-map (lambda (info)
-            (let ((id (or (gethash "Path" info)
-                          (gethash (car names) info))))
-              (list id (vconcat
-                        (--map (or (gethash it info) "-")
-                               names)))))
-          (govc-parse-info (govc command args)))))
-
-(defun govc-map-info (command &optional args)
-  "Populate key=val map table with govc COMMAND ARGS output."
-  (-map (lambda (line)
-          (let* ((ix (s-index-of ":" line))
-                 (key (s-trim (substring line 0 ix)))
-                 (val (s-trim (substring line (+ ix 1)))))
-            (list key (vector key val))))
-        (govc command args)))
-
-(defun govc-map-info-table (entries)
-  "Tabulated `govc-map-info' data via ENTRIES."
-  (let ((session (govc-current-session))
-        (args (append govc-args (govc-selection)))
-        (buffer (get-buffer-create "*govc-info*")))
-    (pop-to-buffer buffer)
-    (tabulated-list-mode)
-    (setq govc-args args)
-    (govc-session-clone session)
-    (setq tabulated-list-format [("Name" 50)
-                                 ("Value" 50)]
-          tabulated-list-padding 2
-          tabulated-list-entries entries)
-    (tabulated-list-print)))
-
-(defun govc-type-list-entries (command)
-  "Convert govc COMMAND type table output to `tabulated-list-entries'."
-  (-map (lambda (line)
-          (let* ((entry (s-split-up-to " " (s-collapse-whitespace line) 2))
-                 (name (car entry))
-                 (type (nth 1 entry))
-                 (value (car (last entry))))
-            (list name (vector name type value))))
-        (govc command govc-args)))
-
-(defun govc-json-info-selection (command)
-  "Run govc COMMAND -json on `govc-selection'."
-  (if current-prefix-arg
-      (--each (govc-selection) (govc-json-info command it))
-    (govc-json-info command (govc-selection))))
-
-(defun govc-json-diff ()
-  "Diff two *govc-json* buffers in view."
-  (let ((buffers))
-    (-each (window-list-1)
-      (lambda (w)
-        (with-current-buffer (window-buffer w)
-          (if (and (eq major-mode 'json-mode)
-                   (s-starts-with? "*govc-json*" (buffer-name)))
-              (push (current-buffer) buffers)))) )
-    (if (= (length buffers) 2)
-        (pop-to-buffer
-         (diff-no-select (car buffers) (cadr buffers))))))
-
-(defun govc-json-info (command selection)
-  "Run govc COMMAND -json on SELECTION."
-  (govc-process (govc-format-command command "-json" govc-args selection)
-                (lambda ()
-                  (let ((buffer (get-buffer-create (concat "*govc-json*" (if current-prefix-arg selection)))))
-                    (copy-to-buffer buffer (point-min) (point-max))
-                    (with-current-buffer buffer
-                      (json-mode)
-                      ;; We use `json-mode-beautify' as `json-pretty-print-buffer' does not work for `govc-host-json-info'
-                      (json-mode-beautify))
-                    (display-buffer buffer))))
-  (if current-prefix-arg
-      (govc-json-diff)))
-
-(defun govc-mode-new-session ()
-  "Connect new session for the current govc mode."
-  (interactive)
-  (call-interactively 'govc-session)
-  (revert-buffer))
-
-(defun govc-host-with-session ()
-  "Host-mode with current session."
-  (interactive)
-  (govc-host nil (govc-current-session)))
-
-(defun govc-vm-with-session ()
-  "VM-mode with current session."
-  (interactive)
-  (govc-vm nil (govc-current-session)))
-
-(defun govc-datastore-with-session ()
-  "Datastore-mode with current session."
-  (interactive)
-  (govc-datastore nil (govc-current-session)))
-
-(defun govc-pool-with-session ()
-  "Pool-mode with current session."
-  (interactive)
-  (govc-pool nil (govc-current-session)))
-
-
-;;; govc object mode
-(defvar-local govc-object-history '("-")
-  "History list of visited objects.")
-
-(defun govc-object-collect ()
-  "Wrapper for govc object.collect."
-  (interactive)
-  (let ((id (car govc-args)))
-    (add-to-list 'govc-object-history id)
-    (setq govc-session-path id))
-  (govc-type-list-entries "object.collect"))
-
-(defun govc-object-collect-selection (&optional json)
-  "Expand object selection via govc object.collect.
-Optionally specify JSON encoding."
-  (interactive)
-  (let* ((entry (or (tabulated-list-get-entry) (error "No entry")))
-         (name (elt entry 0))
-         (type (elt entry 1))
-         (val (elt entry 2)))
-
-    (setq govc-args (list (car govc-args) name))
-
-    (cond
-     ((s-blank? val))
-     ((and (not json) (s-ends-with? "types.ManagedObjectReference" type))
-      (let ((ids (govc "ls" "-L" (split-string val ","))))
-        (setq govc-args (list (govc-object-prompt "moid: " ids)))))
-     ((string= val "...")
-      (if (s-starts-with? "[]" type) (setq json t))))
-
-    (if json
-        (govc-json-info "object.collect" nil)
-      (tabulated-list-revert))))
-
-(defun govc-object-collect-selection-json ()
-  "JSON object selection via govc object.collect."
-  (interactive)
-  (govc-object-collect-selection t))
-
-(defun govc-object-next ()
-  "Next managed object reference."
-  (interactive)
-  (if (search-forward "types.ManagedObjectReference" nil t)
-      (progn (govc-tabulated-list-unmark-all)
-             (tabulated-list-put-tag (char-to-string dired-marker-char)))
-    (goto-char (point-min))))
-
-(defun govc-object-collect-parent ()
-  "Parent object selection if reachable, otherwise prompt with `govc-object-history'."
-  (interactive)
-  (if (cadr govc-args)
-      (let ((prop (butlast (split-string (cadr govc-args) "\\."))))
-        (setq govc-args (list (car govc-args) (if prop (s-join "." prop)))))
-    (save-excursion
-      (goto-char (point-min))
-      (if (re-search-forward "^[[:space:]]*parent" nil t)
-          (govc-object-collect-selection)
-        (let ((id (govc-object-prompt "moid: " govc-object-history)))
-          (setq govc-args (list id (if (string= id "-") "content")))))))
-  (tabulated-list-revert))
-
-(defun govc-object (&optional moid property session)
-  "Object browser aka MOB (Managed Object Browser).
-Optionally starting at MOID and PROPERTY if given.
-Inherit SESSION if given."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-object*")))
-    (if (called-interactively-p 'interactive)
-        (switch-to-buffer buffer)
-      (pop-to-buffer buffer))
-    (govc-object-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-args (list (or moid "-") property))
-    (tabulated-list-print)))
-
-(defun govc-object-info ()
-  "Object browser via govc object.collect on `govc-selection'."
-  (interactive)
-  (if (equal major-mode 'govc-object-mode)
-      (progn
-        (setq govc-args (list (govc-object-prompt "moid: " govc-object-history)))
-        (tabulated-list-revert))
-    (govc-object (tabulated-list-get-id) nil (govc-current-session))))
-
-(defvar govc-object-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "J" 'govc-object-collect-selection-json)
-    (define-key map "N" 'govc-object-next)
-    (define-key map "O" 'govc-object-info)
-    (define-key map (kbd "DEL") 'govc-object-collect-parent)
-    (define-key map (kbd "RET") 'govc-object-collect-selection)
-    (define-key map "?" 'govc-object-popup)
-    map)
-  "Keymap for `govc-object-mode'.")
-
-(define-derived-mode govc-object-mode govc-tabulated-list-mode "Object"
-  "Major mode for handling a govc object."
-  (setq tabulated-list-format [("Name" 40 t)
-                               ("Type" 40 t)
-                               ("Value" 40 t)]
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-object-collect)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-object-popup
-  "Object popup."
-  :actions (govc-keymap-popup govc-object-mode-map))
-
-
-;;; govc metric mode
-(defun govc-metric-sample ()
-  "Sample metrics."
-  (interactive)
-  (govc-shell-command (list "metric.sample" govc-args govc-filter (govc-selection))))
-
-(defun govc-metric-sample-plot ()
-  "Plot metric sample."
-  (interactive)
-  (let* ((type (if (and (display-images-p) (not (eq current-prefix-arg '-))) 'png 'dumb))
-         (max (if (member "-i" govc-args) "60" "180"))
-         (args (append govc-args (list "-n" max "-plot" type govc-filter)))
-         (session (govc-current-session))
-         (metrics (govc-selection))
-         (inhibit-read-only t))
-    (with-current-buffer (get-buffer-create "*govc*")
-      (govc-session-clone session)
-      (erase-buffer)
-      (delete-other-windows)
-      (if (eq type 'dumb)
-          (split-window-right)
-        (split-window-below))
-      (display-buffer-use-some-window (current-buffer) '((inhibit-same-window . t)))
-      (--each metrics
-        (let* ((cmd (govc-format-command "metric.sample" args it))
-               (data (govc-process cmd 'buffer-string)))
-          (if (eq type 'dumb)
-              (insert data)
-            (insert-image (create-image (string-as-unibyte data) type t))))))))
-
-(defun govc-metric-select (metrics)
-  "Select metric names.  METRICS is a regexp."
-  (interactive (list (read-regexp "Select metrics" (regexp-quote ".usage."))))
-  (save-excursion
-    (goto-char (point-min))
-    (while (not (eobp))
-      (if (string-match-p metrics (tabulated-list-get-id))
-          (govc-tabulated-list-mark)
-        (govc-tabulated-list-unmark)))))
-
-(defun govc-metric-info ()
-  "Wrapper for govc metric.info."
-  (govc-table-info "metric.info" (list govc-args (car govc-filter))))
-
-(defvar govc-metric-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "RET") 'govc-metric-sample)
-    (define-key map (kbd "P") 'govc-metric-sample-plot)
-    (define-key map (kbd "s") 'govc-metric-select)
-    map)
-  "Keymap for `govc-metric-mode'.")
-
-(defun govc-metric ()
-  "Metrics info."
-  (interactive)
-  (let ((session (govc-current-session))
-        (filter (or (govc-selection) (list govc-session-path)))
-        (buffer (get-buffer-create "*govc-metric*")))
-    (pop-to-buffer buffer)
-    (govc-metric-mode)
-    (govc-session-clone session)
-    (if current-prefix-arg (setq govc-args '("-i" "300")))
-    (setq govc-filter filter)
-    (tabulated-list-print)))
-
-(define-derived-mode govc-metric-mode govc-tabulated-list-mode "Metric"
-  "Major mode for handling a govc metric."
-  (setq tabulated-list-format [("Name" 35 t)
-                               ("Group" 15 t)
-                               ("Unit" 4 t)
-                               ("Level" 5 t)
-                               ("Summary" 50)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-metric-info)
-  (tabulated-list-init-header))
-
-
-;;; govc host mode
-(defun govc-ls-host ()
-  "List hosts."
-  (govc "ls" "-t" "HostSystem" "host/*"))
-
-(defun govc-esxcli-netstat-info ()
-  "Wrapper for govc host.esxcli network ip connection list."
-  (govc-table-info "host.esxcli"
-                   (append govc-args '("-hints=false" "--" "network" "ip" "connection" "list"))))
-
-(defun govc-esxcli-netstat (host)
-  "Tabulated `govc-esxcli-netstat-info' HOST."
-  (interactive (list (govc-object-prompt "Host: " 'govc-ls-host)))
-  (let ((session (govc-current-session))
-        (buffer (get-buffer-create "*govc-esxcli*")))
-    (pop-to-buffer buffer)
-    (tabulated-list-mode)
-    (setq govc-args (list "-host" host))
-    (govc-session-clone session)
-    (setq tabulated-list-format [("CCAlgo" 10 t)
-                                 ("ForeignAddress" 20 t)
-                                 ("LocalAddress" 20 t)
-                                 ("Proto" 5 t)
-                                 ("RecvQ" 5 t)
-                                 ("SendQ" 5 t)
-                                 ("State" 15 t)
-                                 ("WorldID" 7 t)
-                                 ("WorldName" 10 t)]
-          tabulated-list-padding 2
-          tabulated-list-entries #'govc-esxcli-netstat-info)
-    (tabulated-list-init-header)
-    (tabulated-list-print)))
-
-(defun govc-host-esxcli-netstat ()
-  "Netstat via `govc-esxcli-netstat-info' with current host id."
-  (interactive)
-  (govc-esxcli-netstat (tabulated-list-get-id)))
-
-(defun govc-host-info ()
-  "Wrapper for govc host.info."
-  (govc-table-info "host.info" (or govc-filter "*")))
-
-(defun govc-host-json-info ()
-  "JSON via govc host.info -json on current selection."
-  (interactive)
-  (govc-json-info-selection "host.info"))
-
-(defvar govc-host-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "E" 'govc-events)
-    (define-key map "L" 'govc-logs)
-    (define-key map "J" 'govc-host-json-info)
-    (define-key map "M" 'govc-metric)
-    (define-key map "N" 'govc-host-esxcli-netstat)
-    (define-key map "O" 'govc-object-info)
-    (define-key map "T" 'govc-tasks)
-    (define-key map "c" 'govc-mode-new-session)
-    (define-key map "p" 'govc-pool-with-session)
-    (define-key map "s" 'govc-datastore-with-session)
-    (define-key map "v" 'govc-vm-with-session)
-    (define-key map "?" 'govc-host-popup)
-    map)
-  "Keymap for `govc-host-mode'.")
-
-(defun govc-host (&optional filter session)
-  "Host info via govc.
-Optionally filter by FILTER and inherit SESSION."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-host*")))
-    (pop-to-buffer buffer)
-    (govc-host-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-filter filter)
-    (tabulated-list-print)))
-
-(define-derived-mode govc-host-mode govc-tabulated-list-mode "Host"
-  "Major mode for handling a list of govc hosts."
-  (setq tabulated-list-format [("Name" 30 t)
-                               ("Logical CPUs" 20 t)
-                               ("CPU usage" 25 t)
-                               ("Memory" 10 t)
-                               ("Memory usage" 25 t)
-                               ("Manufacturer" 13 t)
-                               ("Boot time" 15 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-host-info)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-host-popup
-  "Host popup."
-  :actions (govc-keymap-popup govc-host-mode-map))
-
-(easy-menu-define govc-host-mode-menu govc-host-mode-map
-  "Host menu."
-  (cons "Host" (govc-keymap-menu govc-host-mode-map)))
-
-
-;;; govc pool mode
-(defun govc-pool-destroy (name)
-  "Destroy pool with given NAME."
-  (interactive (list (completing-read "Destroy pool: " (govc "ls" "-t" "ResourcePool" "host/*"))))
-  (govc "pool.destroy" name))
-
-(defun govc-pool-destroy-selection ()
-  "Destroy via `govc-pool-destroy' on the pool selection."
-  (interactive)
-  (govc-do-selection 'govc-pool-destroy "Delete")
-  (tabulated-list-revert))
-
-(defun govc-pool-info ()
-  "Wrapper for govc pool.info."
-  (govc-table-info "pool.info" (list "-a" (or govc-filter (setq govc-filter "*")))))
-
-(defun govc-pool-json-info ()
-  "JSON via govc pool.info -json on current selection."
-  (interactive)
-  (govc-json-info-selection "pool.info"))
-
-(defvar govc-pool-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "D" 'govc-pool-destroy-selection)
-    (define-key map "E" 'govc-events)
-    (define-key map "J" 'govc-pool-json-info)
-    (define-key map "M" 'govc-metric)
-    (define-key map "O" 'govc-object-info)
-    (define-key map "T" 'govc-tasks)
-    (define-key map "c" 'govc-mode-new-session)
-    (define-key map "h" 'govc-host-with-session)
-    (define-key map "s" 'govc-datastore-with-session)
-    (define-key map "v" 'govc-vm-with-session)
-    (define-key map "?" 'govc-pool-popup)
-    map)
-  "Keymap for `govc-pool-mode'.")
-
-(defun govc-pool (&optional filter session)
-  "Pool info via govc.
-Optionally filter by FILTER and inherit SESSION."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-pool*")))
-    (pop-to-buffer buffer)
-    (govc-pool-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-filter filter)
-    (tabulated-list-print)))
-
-(define-derived-mode govc-pool-mode govc-tabulated-list-mode "Pool"
-  "Major mode for handling a list of govc pools."
-  (setq tabulated-list-format [("Name" 30 t)
-                               ("CPU Usage" 25 t)
-                               ("CPU Shares" 25 t)
-                               ("CPU Reservation" 25 t)
-                               ("CPU Limit" 10 t)
-                               ("Mem Usage" 25 t)
-                               ("Mem Shares" 25 t)
-                               ("Mem Reservation" 25 t)
-                               ("Mem Limit" 10 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-pool-info)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-pool-popup
-  "Pool popup."
-  :actions (govc-keymap-popup govc-pool-mode-map))
-
-(easy-menu-define govc-host-mode-menu govc-pool-mode-map
-  "Pool menu."
-  (cons "Pool" (govc-keymap-menu govc-pool-mode-map)))
-
-
-;;; govc datastore mode
-(defun govc-ls-datastore ()
-  "List datastores."
-  (govc "ls" "datastore"))
-
-(defun govc-datastore-ls-entries ()
-  "Wrapper for govc datastore.ls."
-  (let* ((data (govc-json "datastore.ls" "-l" "-p" govc-filter))
-         (file (plist-get (elt data 0) :File)))
-    (-map (lambda (ent)
-            (let ((name (plist-get ent :Path))
-                  (size (plist-get ent :FileSize))
-                  (time (plist-get ent :Modification))
-                  (user (plist-get ent :Owner)))
-              (list (concat govc-filter name)
-                    (vector (file-size-human-readable size)
-                            (current-time-string (date-to-time time))
-                            name)))) file)))
-
-(defun govc-datastore-ls-parent ()
-  "Up to parent folder."
-  (interactive)
-  (if (s-blank? govc-filter)
-      (let ((session (govc-current-session)))
-        (govc-datastore-mode)
-        (govc-session-clone session))
-    (setq govc-filter (file-name-directory (directory-file-name govc-filter))))
-  (tabulated-list-revert))
-
-(defun govc-datastore-ls-child ()
-  "Open datastore folder or file."
-  (interactive)
-  (let ((id (tabulated-list-get-id)))
-    (if current-prefix-arg
-        (govc-shell-command (list "datastore.ls" "-l" "-p" "-R" id))
-      (if (s-ends-with? "/" id)
-          (progn (setq govc-filter id)
-                 (tabulated-list-revert))
-        (govc-datastore-open)))))
-
-(defun govc-datastore-open ()
-  "Open datastore file."
-  (lexical-let* ((srcfile (tabulated-list-get-id))
-                 (srcpath (format "[%s] %s" (file-name-nondirectory govc-session-datastore) (s-chop-prefix "/" srcfile)))
-                 (suffix (file-name-extension srcfile t))
-                 (tmpfile (make-temp-file "govc-ds" nil suffix))
-                 (session (govc-current-session)))
-    (when (yes-or-no-p (concat "Open " srcpath "?"))
-      (govc "datastore.download" srcfile tmpfile)
-      (with-current-buffer (pop-to-buffer (find-file-noselect tmpfile))
-        (govc-session-clone session)
-        (add-hook 'kill-buffer-hook (lambda ()
-                                      (with-demoted-errors
-                                          (delete-file tmpfile))) t t)
-        (add-hook 'after-save-hook (lambda ()
-                                     (if (yes-or-no-p (concat "Upload changes to " srcpath "?"))
-                                         (with-demoted-errors
-                                             (govc "datastore.upload" tmpfile srcfile)))) t t)))))
-
-(defun govc-datastore-tail (&optional file)
-  "Tail datastore FILE."
-  (interactive)
-  (govc-shell-command
-   (list "datastore.tail" "-n" govc-max-events (if current-prefix-arg "-f") (or file (govc-selection)))))
-
-(defun govc-datastore-disk-info ()
-  "Info datastore disk."
-  (interactive)
-  (delete-other-windows)
-  (govc-shell-command
-   (list "datastore.disk.info" (if current-prefix-arg "-c") (govc-selection))))
-
-(defun govc-datastore-ls-json ()
-  "JSON via govc datastore.ls -json on current selection."
-  (interactive)
-  (let ((govc-args '("-l" "-p")))
-    (govc-json-info-selection "datastore.ls")))
-
-(defun govc-datastore-ls-r-json ()
-  "Search via govc datastore.ls -json -R on current selection."
-  (interactive)
-  (let ((govc-args '("-l" "-p" "-R")))
-    (govc-json-info-selection "datastore.ls")))
-
-(defun govc-datastore-mkdir (name)
-  "Mkdir via govc datastore.mkdir with given NAME."
-  (interactive (list (read-from-minibuffer "Create directory: " govc-filter)))
-  (govc "datastore.mkdir" name)
-  (tabulated-list-revert))
-
-(defun govc-datastore-rm (paths)
-  "Delete datastore PATHS."
-  (--each paths (govc "datastore.rm" (if current-prefix-arg "-f") it)))
-
-(defun govc-datastore-rm-selection ()
-  "Delete selected datastore paths."
-  (interactive)
-  (govc-do-selection 'govc-datastore-rm "Delete")
-  (tabulated-list-revert))
-
-(defvar govc-datastore-ls-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "I" 'govc-datastore-disk-info)
-    (define-key map "J" 'govc-datastore-ls-json)
-    (define-key map "S" 'govc-datastore-ls-r-json)
-    (define-key map "D" 'govc-datastore-rm-selection)
-    (define-key map "T" 'govc-datastore-tail)
-    (define-key map "+" 'govc-datastore-mkdir)
-    (define-key map (kbd "DEL") 'govc-datastore-ls-parent)
-    (define-key map (kbd "RET") 'govc-datastore-ls-child)
-    (define-key map "?" 'govc-datastore-ls-popup)
-    map)
-  "Keymap for `govc-datastore-ls-mode'.")
-
-(defun govc-datastore-ls (&optional datastore session filter)
-  "List govc datastore.  Optionally specify DATASTORE, SESSION and FILTER."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-datastore*")))
-    (pop-to-buffer buffer)
-    (govc-datastore-ls-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-session-datastore (or datastore (govc-object-prompt "govc datastore: " 'govc-ls-datastore)))
-    (setq govc-filter filter)
-    (tabulated-list-print)))
-
-(define-derived-mode govc-datastore-ls-mode govc-tabulated-list-mode "Datastore"
-  "Major mode govc datastore.ls."
-  (setq tabulated-list-format [("Size" 10 t)
-                               ("Modification time" 25 t)
-                               ("Name" 40 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-datastore-ls-entries)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-datastore-ls-popup
-  "Datastore ls popup."
-  :actions (govc-keymap-popup govc-datastore-ls-mode-map))
-
-(easy-menu-define govc-datastore-ls-mode-menu govc-datastore-ls-mode-map
-  "Datastore ls menu."
-  (cons "Datastore" (govc-keymap-menu govc-datastore-ls-mode-map)))
-
-(defvar govc-datastore-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "J" 'govc-datastore-json-info)
-    (define-key map "M" 'govc-metric)
-    (define-key map "O" 'govc-object-info)
-    (define-key map (kbd "RET") 'govc-datastore-ls-selection)
-    (define-key map "c" 'govc-mode-new-session)
-    (define-key map "h" 'govc-host-with-session)
-    (define-key map "p" 'govc-pool-with-session)
-    (define-key map "v" 'govc-vm-with-session)
-    (define-key map "?" 'govc-datastore-popup)
-    map)
-  "Keymap for `govc-datastore-mode'.")
-
-(defun govc-datastore-json-info ()
-  "JSON via govc datastore.info -json on current selection."
-  (interactive)
-  (govc-json-info-selection "datastore.info"))
-
-(defun govc-datastore-info ()
-  "Wrapper for govc datastore.info."
-  (govc-table-info "datastore.info" (or govc-filter "*")))
-
-(defun govc-datastore-ls-selection ()
-  "Browse datastore."
-  (interactive)
-  (govc-datastore-ls (tabulated-list-get-id) (govc-current-session)))
-
-(defun govc-datastore (&optional filter session)
-  "Datastore info via govc.
-Optionally filter by FILTER and inherit SESSION."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-datastore*")))
-    (pop-to-buffer buffer)
-    (govc-datastore-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-filter filter)
-    (tabulated-list-print)
-    (if (and govc-session-datastore (search-forward govc-session-datastore nil t))
-        (beginning-of-line))))
-
-(define-derived-mode govc-datastore-mode tabulated-list-mode "Datastore"
-  "Major mode for govc datastore.info."
-  (setq tabulated-list-format [("Name" 15 t)
-                               ("Type" 10 t)
-                               ("Capacity" 10 t)
-                               ("Free" 10 t)
-                               ("Remote" 30 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-datastore-info)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-datastore-popup
-  "Datastore popup."
-  :actions (govc-keymap-popup govc-datastore-mode-map))
-
-(easy-menu-define govc-datastore-mode-menu govc-datastore-mode-map
-  "Datastore menu."
-  (cons "Datastore" (govc-keymap-menu govc-datastore-mode-map)))
-
-
-;;; govc vm mode
-(defun govc-vm-prompt (prompt)
-  "PROMPT for a vm name."
-  (completing-read prompt (govc "ls" "vm")))
-
-(defun govc-vm-start (name)
-  "Start vm with given NAME."
-  (interactive (list (govc-vm-prompt "Start vm: ")))
-  (govc "vm.power" "-on" name))
-
-(defun govc-vm-shutdown (name)
-  "Shutdown vm with given NAME."
-  (interactive (list (govc-vm-prompt "Shutdown vm: ")))
-  (govc "vm.power" "-s" "-force" name))
-
-(defun govc-vm-reboot (name)
-  "Reboot vm with given NAME."
-  (interactive (list (govc-vm-prompt "Reboot vm: ")))
-  (govc "vm.power" "-r" "-force" name))
-
-(defun govc-vm-suspend (name)
-  "Suspend vm with given NAME."
-  (interactive (list (govc-vm-prompt "Suspend vm: ")))
-  (govc "vm.power" "-suspend" name))
-
-(defun govc-vm-destroy (name)
-  "Destroy vm with given NAME."
-  (interactive (list (govc-vm-prompt "Destroy vm: ")))
-  (govc "vm.destroy" name))
-
-(defun govc-vm-vnc-enable (name)
-  "Enable vnc on vm with given NAME."
-  (--map (last (split-string it))
-         (govc "vm.vnc" "-enable"
-               "-port" "-1"
-               "-password" (format "%08x" (random (expt 16 8))) name)))
-
-(defun govc-vm-vnc (name &optional arg)
-  "VNC for vm with given NAME.
-By default, enable and open VNC for the given vm NAME.
-With prefix \\[negative-argument] ARG, VNC will be disabled.
-With prefix \\[universal-argument] ARG, VNC will be enabled but not opened."
-  (interactive (list (govc-vm-prompt "VNC vm: ")
-                     current-prefix-arg))
-  (if (equal arg '-)
-      (govc "vm.vnc" "-disable" name)
-    (let ((urls (govc-vm-vnc-enable name)))
-      (unless arg
-        (-each (-flatten urls) 'browse-url)))))
-
-(defun govc-vm-console (name &optional arg)
-  "Console for vm with given NAME.
-By default, displays a console screen capture.
-With prefix \\[universal-argument] ARG, launches an interactive console (VMRC)."
-  (interactive (list (govc-vm-prompt "Console vm: ")
-                     current-prefix-arg))
-  (if arg
-      (browse-url (car (govc "vm.console" name)))
-    (let* ((data (govc-process (govc-format-command "vm.console" "-capture" "-" name) 'buffer-string))
-           (inhibit-read-only t))
-      (with-current-buffer (get-buffer-create "*govc*")
-        (erase-buffer)
-        (insert-image (create-image (string-as-unibyte data) 'png t))
-        (read-only-mode)
-        (display-buffer (current-buffer))))))
-
-(defun govc-vm-start-selection ()
-  "Start via `govc-vm-start' on the current selection."
-  (interactive)
-  (govc-vm-start (govc-selection))
-  (tabulated-list-revert))
-
-(defun govc-vm-shutdown-selection ()
-  "Shutdown via `govc-vm-shutdown' on the current selection."
-  (interactive)
-  (govc-vm-shutdown (govc-selection))
-  (tabulated-list-revert))
-
-(defun govc-vm-reboot-selection ()
-  "Reboot via `govc-vm-reboot' on the current selection."
-  (interactive)
-  (govc-vm-reboot (govc-selection))
-  (tabulated-list-revert))
-
-(defun govc-vm-suspend-selection ()
-  "Suspend via `govc-vm-suspend' on the current selection."
-  (interactive)
-  (govc-vm-suspend (govc-selection))
-  (tabulated-list-revert))
-
-(defun govc-vm-destroy-selection ()
-  "Destroy via `govc-vm-destroy' on the current selection."
-  (interactive)
-  (govc-do-selection 'govc-vm-destroy "Destroy")
-  (tabulated-list-revert))
-
-(defun govc-vm-vnc-selection ()
-  "VNC via `govc-vm-vnc' on the current selection."
-  (interactive)
-  (govc-vm-vnc (govc-selection) current-prefix-arg))
-
-(defun govc-vm-console-selection ()
-  "Console via `govc-vm-console' on the current selection."
-  (interactive)
-  (govc-vm-console (tabulated-list-get-id) current-prefix-arg))
-
-(defun govc-vm-info ()
-  "Wrapper for govc vm.info."
-  (govc-table-info "vm.info" (list "-r" (or govc-filter (setq govc-filter "*")))))
-
-(defun govc-vm-host ()
-  "Host info via `govc-host' with host(s) of current selection."
-  (interactive)
-  (govc-host (concat "*/" (govc-table-column-value "Host"))
-             (govc-current-session)))
-
-(defun govc-vm-log-directory ()
-  "VM log directory of current selection."
-  (car (govc "object.collect" "-s" (tabulated-list-get-id) "config.files.logDirectory")))
-
-(defun govc-vm-datastore ()
-  "Datastore via `govc-datastore-ls' with datastore of current selection."
-  (interactive)
-  (if current-prefix-arg
-      (govc-datastore (s-split ", " (govc-table-column-value "Storage") t)
-                      (govc-current-session))
-    (let ((dir (govc-vm-log-directory)))
-      (govc-datastore-ls dir (govc-current-session) (concat dir "/")))))
-
-(defun govc-vm-logs ()
-  "Logs via `govc-datastore-tail' with logDirectory of current selection."
-  (interactive)
-  (govc-datastore-tail (concat (govc-vm-log-directory) "/vmware.log")))
-
-(defun govc-vm-ping ()
-  "Ping VM."
-  (interactive)
-  (let ((ping-program-options '("-c" "20")))
-    (ping (govc-table-column-value "IP address"))))
-
-(defun govc-vm-device-ls ()
-  "Devices via `govc-device' on the current selection."
-  (interactive)
-  (govc-device (tabulated-list-get-id)
-               (govc-current-session)))
-
-(defun govc-vm-extra-config ()
-  "Populate table with govc vm.info -e output."
-  (let* ((data (govc-json "vm.info" govc-args))
-         (vms (plist-get data :VirtualMachines))
-         (info))
-    (mapc
-     (lambda (vm)
-       (let* ((config (plist-get vm :Config))
-              (name (plist-get config :Name)))
-         (mapc (lambda (x)
-                 (let ((key (plist-get x :Key))
-                       (val (plist-get x :Value)))
-                   (push (list key (vector key val)) info)))
-               (plist-get config :ExtraConfig))
-         (if (> (length vms) 1)
-             (push (list name (vector "vm.name" name)) info))))
-     vms)
-    info))
-
-(defun govc-vm-extra-config-table ()
-  "ExtraConfig via `govc-vm-extra-config' on the current selection."
-  (interactive)
-  (govc-map-info-table #'govc-vm-extra-config))
-
-(defun govc-vm-json-info ()
-  "JSON via govc vm.info -json on current selection."
-  (interactive)
-  (govc-json-info-selection "vm.info"))
-
-(defvar govc-vm-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map "E" 'govc-events)
-    (define-key map "L" 'govc-vm-logs)
-    (define-key map "J" 'govc-vm-json-info)
-    (define-key map "O" 'govc-object-info)
-    (define-key map "T" 'govc-tasks)
-    (define-key map "X" 'govc-vm-extra-config-table)
-    (define-key map (kbd "RET") 'govc-vm-device-ls)
-    (define-key map "C" 'govc-vm-console-selection)
-    (define-key map "V" 'govc-vm-vnc-selection)
-    (define-key map "D" 'govc-vm-destroy-selection)
-    (define-key map "^" 'govc-vm-start-selection)
-    (define-key map "!" 'govc-vm-shutdown-selection)
-    (define-key map "@" 'govc-vm-reboot-selection)
-    (define-key map "&" 'govc-vm-suspend-selection)
-    (define-key map "H" 'govc-vm-host)
-    (define-key map "M" 'govc-metric)
-    (define-key map "P" 'govc-vm-ping)
-    (define-key map "S" 'govc-vm-datastore)
-    (define-key map "c" 'govc-mode-new-session)
-    (define-key map "h" 'govc-host-with-session)
-    (define-key map "p" 'govc-pool-with-session)
-    (define-key map "s" 'govc-datastore-with-session)
-    (define-key map "?" 'govc-vm-popup)
-    map)
-  "Keymap for `govc-vm-mode'.")
-
-(defun govc-vm (&optional filter session)
-  "VM info via govc.
-Optionally filter by FILTER and inherit SESSION."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-vm*")))
-    (pop-to-buffer buffer)
-    (govc-vm-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-filter filter)
-    (tabulated-list-print)))
-
-(define-derived-mode govc-vm-mode govc-tabulated-list-mode "VM"
-  "Major mode for handling a list of govc vms."
-  (setq tabulated-list-format [("Name" 40 t)
-                               ("Power state" 12 t)
-                               ("Boot time" 13 t)
-                               ("IP address" 15 t)
-                               ("Guest name" 20 t)
-                               ("Host" 20 t)
-                               ("CPU usage" 15 t)
-                               ("Host memory usage" 18 t)
-                               ("Guest memory usage" 19 t)
-                               ("Storage committed" 18 t)
-                               ("Storage" 10 t)
-                               ("Network" 10 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-vm-info)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-vm-popup
-  "VM popup."
-  :actions (govc-keymap-popup govc-vm-mode-map))
-
-(easy-menu-define govc-vm-mode-menu govc-vm-mode-map
-  "VM menu."
-  (cons "VM" (govc-keymap-menu govc-vm-mode-map)))
-
-
-;;; govc device mode
-(defun govc-device-ls ()
-  "Wrapper for govc device.ls -vm VM."
-  (govc-type-list-entries "device.ls"))
-
-(defun govc-device-info ()
-  "Populate table with govc device.info output."
-  (govc-map-info "device.info" govc-args))
-
-(defun govc-device-info-table ()
-  "Tabulated govc device.info."
-  (interactive)
-  (govc-map-info-table #'govc-device-info))
-
-(defun govc-device-json-info ()
-  "JSON via govc device.info -json on current selection."
-  (interactive)
-  (govc-json-info-selection "device.info"))
-
-(defvar govc-device-mode-map
-  (let ((map (make-sparse-keymap)))
-    (define-key map (kbd "J") 'govc-device-json-info)
-    (define-key map (kbd "RET") 'govc-device-info-table)
-    map)
-  "Keymap for `govc-device-mode'.")
-
-(defun govc-device (&optional vm session)
-  "List govc devices for VM.  Optionally inherit SESSION."
-  (interactive)
-  (let ((buffer (get-buffer-create "*govc-device*")))
-    (pop-to-buffer buffer)
-    (govc-device-mode)
-    (if session
-        (govc-session-clone session)
-      (call-interactively 'govc-session))
-    (setq govc-args (list "-vm" (or vm (govc-vm-prompt "vm: "))))
-    (tabulated-list-print)))
-
-(define-derived-mode govc-device-mode govc-tabulated-list-mode "Device"
-  "Major mode for handling a govc device."
-  (setq tabulated-list-format [("Name" 15 t)
-                               ("Type" 30 t)
-                               ("Summary" 40 t)]
-        tabulated-list-sort-key (cons "Name" nil)
-        tabulated-list-padding 2
-        tabulated-list-entries #'govc-device-ls)
-  (tabulated-list-init-header))
-
-(magit-define-popup govc-popup
-  "govc popup."
-  :actions (govc-keymap-list govc-command-map))
-
-(easy-menu-change
- '("Tools") "govc"
- (govc-keymap-menu govc-command-map)
- "Search Files (Grep)...")
-
-(provide 'govc)
-
-;;; govc.el ends here
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el b/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el
deleted file mode 100644
index dd0fb3b844..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/govc-test.el
+++ /dev/null
@@ -1,138 +0,0 @@
-(defconst testsuite-dir
-  (if load-file-name
-      (file-name-directory load-file-name)
-    ;; Fall back to default directory (in case of M-x eval-buffer)
-    default-directory)
-  "Directory of the test suite.")
-
-(defconst govc-test-helper-path
-  (concat (expand-file-name (concat testsuite-dir "/../../test/test_helper.bash"))))
-
-(load (expand-file-name "../govc" testsuite-dir) nil :no-message)
-
-(ert-deftest test-govc-url-parse ()
-  (dolist (u '("root:vagrant@localhost:18443"
-               "Administrator@vsphere.local:vagrant@localhost"
-               "https://root:vagrant@localhost:18443/sdk"
-               "https://Administrator@vsphere.local:vagrant@localhost/sdk"))
-    (should (equal u (url-recreate-url (govc-url-parse u))))))
-
-(ert-deftest test-govc-session-set-url ()
-  (should (equal govc-session-insecure nil))
-  (should (equal govc-session-datacenter nil))
-  (with-temp-buffer
-    (govc-session-set-url "vc.example.com?insecure=true&datacenter=foo&ignored=true")
-    (should (equal govc-session-insecure "true"))
-    (should (equal govc-session-datacenter "foo"))
-    (should (equal govc-session-datastore nil))))
-
-(ert-deftest test-govc-copy-environment ()
-  (let ((process-environment)
-        (govc-session-url "vc.example.com")
-        (govc-session-insecure "false")
-        (govc-session-datacenter "dc1")
-        (govc-session-datastore "ds1")
-        (govc-session-network "net1"))
-    (govc-export-environment '-)
-    (dolist (e govc-environment-map)
-      (should (equal nil (getenv (car e)))))
-    (govc-export-environment (universal-argument))
-    (dolist (e govc-environment-map)
-      (should (not (equal nil (getenv (car e))))))))
-
-(defun govc-test-env ()
-  (let ((url (getenv "GOVC_TEST_URL")))
-    (unless url
-      (ert-skip "env GOVC_TEST_URL not set"))
-    (setq govc-session-url url
-          govc-session-insecure "true")))
-
-(defun govc-test-helper (arg)
-  (shell-command-to-string (format "bash -c \"source %s; %s\"" govc-test-helper-path arg)))
-
-(defun govc-test-new-vm ()
-  (s-trim-right (govc-test-helper "new_empty_vm")))
-
-(defun govc-test-new-id ()
-  (s-trim-right (govc-test-helper "new_id")))
-
-(defun govc-test-teardown ()
-  (ignore-errors
-    (govc-test-helper "teardown")))
-
-(ert-deftest test-govc-vm-info ()
-  (govc-test-env)
-  (unwind-protect
-      (let ((id (govc-test-new-vm)))
-        (govc-json-info "vm.info" (list id))
-        (with-current-buffer "*govc-json*"
-          (goto-char (point-min))
-          (let ((data (json-read)))
-            (should (= (length data) 1))
-            (should (cdr (assq 'VirtualMachines data)))))
-
-        (govc-json-info "vm.info" (list "ENOENT"))
-        (with-current-buffer "*govc-json*"
-          (goto-char (point-min))
-          (let ((data (json-read)))
-            (should (= (length data) 1))
-            (should (not (cdr (assq 'VirtualMachines data))))))
-
-        (let ((govc-args (list id))
-              (len1)
-              (len2))
-          (setq len1 (length (govc-vm-extra-config)))
-          (should (>= len1 1))
-          (govc "vm.change" "-vm" id
-                "-e" "govc-test-one=1"
-                "-e" "govc-test-two:2.2=2"
-                ;; test that we don't choke on \n
-                "-e" "foo=bar
-baz")
-          (setq len2 (length (govc-vm-extra-config)))
-
-          (should (= (- len2 len1) 3)))
-
-        (let ((govc-filter "*"))
-          (should (>= (length (govc-vm-info)) 1)))
-
-        (let ((govc-filter "ENOENT"))
-          (should (= (length (govc-vm-info)) 0)))
-
-        (govc-vm-screen id))
-    (govc-test-teardown)))
-
-(ert-deftest test-govc-datastore-ls-entries ()
-  (govc-test-env)
-  (unwind-protect
-      (let ((id (govc-test-new-id)))
-        (should (>= (length (govc-datastore-ls-entries)) 1))
-
-        (let ((govc-filter (concat id "/")))
-          (should-error (govc-datastore-ls-entries))
-          (govc "datastore.mkdir" id)
-          (should (= (length (govc-datastore-ls-entries)) 0))
-          (dotimes (i 3)
-            (govc "datastore.mkdir" (format "%s/dir %d" id i)))
-          (let ((entries (govc-datastore-ls-entries)))
-            (should (= (length entries) 3))
-            (should (s-starts-with? (concat id "/dir ") (caar entries))))))
-    (govc-test-teardown)))
-
-(ert-deftest test-govc-pool-ls ()
-  (govc-test-env)
-  (unwind-protect
-      (let* ((pools (govc-ls-pool))
-             (num (length pools))
-             (path (concat (car pools) "/" (govc-test-new-id))))
-        (should (>= num 1))
-        (message "%d existing pools [%S]" num pools)
-        (govc "pool.create" path)
-        (setq pools (govc-ls-pool))
-        (govc-pool-destroy path)
-        (should (= (- (length pools) num) 1)))
-    (govc-test-teardown)))
-
-(ert-deftest test-govc-about ()
-  (govc-test-env)
-  (govc "about"))
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el b/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el
deleted file mode 100755
index 505c1e64f2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/emacs/test/make.el
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env emacs --script
-
-(let ((current-directory (file-name-directory load-file-name)))
-  (setq project-test-path (expand-file-name "." current-directory))
-  (setq project-root-path (expand-file-name ".." current-directory)))
-
-(add-to-list 'load-path project-root-path)
-(add-to-list 'load-path project-test-path)
-
-(require 'lisp-mnt)
-(require 'govc)
-(require 's)
-
-(defun make-test ()
-  (dolist (test-file (or argv (directory-files project-test-path t "-test.el$")))
-    (load test-file nil t))
-  (ert-run-tests-batch-and-exit t))
-
-(defun govc-help ()
-  "Summary of govc modes in markdown format."
-  (interactive)
-  (with-help-window (help-buffer) ; TODO: this turned into a mess, but does the job of generating README.md from govc.el
-    (dolist (kind '(govc-mode govc-urls
-                    govc-session-url govc-session-insecure govc-session-datacenter govc-session-datastore govc-session-network
-                    tabulated-list host pool datastore datastore-ls vm device object metric))
-      (let* ((name (if (boundp kind) (symbol-name kind) (format "govc-%s-mode" kind)))
-             (map (if (equal 'govc-mode kind) 'govc-command-map (intern (concat name "-map"))))
-             (doc (lambda (f &optional all)
-                    (let* ((txt (if (functionp f) (documentation f t) (documentation-property f 'variable-documentation)))
-                           (ix (if all (length txt) (s-index-of "." txt))))
-                      (s-replace (format "\n\n\\\{%s\}" (concat name "-map")) ""
-                                 (s-replace "'" "`" (substring txt 0 ix)))))))
-        (princ (concat (s-repeat (if (and (boundp kind) (not (fboundp kind))) 3 2) "#") " " name "\n"))
-        (princ (concat "\n" (funcall doc (intern name) t) "\n\n"))
-        (when (boundp map)
-          (princ (concat "### " (symbol-name map) "\n\n"))
-          (princ "Keybinding     | Description\n")
-          (princ "---------------|------------------------------------------------------------\n")
-          (dolist (kl (govc-keymap-list (symbol-value map)))
-            (let ((key (govc-key-description (car kl))))
-              (princ (format "<kbd>%s</kbd>%s| %s\n" key (s-repeat (- 4 (length key)) " ") (funcall doc (nth 2 kl))))))
-          (princ "\n"))))))
-
-(defun make-docs ()
-  (let ((commentary)
-        (summary))
-    (with-current-buffer (find-file-noselect (concat project-root-path "/govc.el"))
-      (setq commentary (s-replace ";;; Commentary:" "" (lm-commentary))
-            summary (lm-summary)))
-    (let ((readme (find-file-noselect (concat project-root-path "/README.md"))))
-      (with-current-buffer readme
-        (erase-buffer)
-        (govc-help)
-        (with-current-buffer (help-buffer)
-          (copy-to-buffer readme (point-min) (point-max)))
-        (goto-char (point-min))
-        (insert (concat "# govc.el\n\n" summary ".\n"))
-        (insert (s-replace "'" "`" (replace-regexp-in-string ";; ?" "" commentary t t)))
-        (save-buffer 0)))))
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/env/command.go b/installer/vendor/github.com/vmware/govmomi/govc/env/command.go
deleted file mode 100644
index b48f5d1c4f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/env/command.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package env
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type env struct {
-	*flags.OutputFlag
-	*flags.ClientFlag
-
-	extra bool
-}
-
-func init() {
-	cli.Register("env", &env{})
-}
-
-func (cmd *env) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.extra, "x", false, "Output variables for each GOVC_URL component")
-}
-
-func (cmd *env) Process(ctx context.Context) error {
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *env) Description() string {
-	return `Output the environment variables for this client.
-
-If credentials are included in the url, they are split into separate variables.
-Useful as bash scripting helper to parse GOVC_URL.`
-}
-
-func (cmd *env) Run(ctx context.Context, f *flag.FlagSet) error {
-	env := envResult(cmd.ClientFlag.Environ(cmd.extra))
-
-	if f.NArg() > 1 {
-		return flag.ErrHelp
-	}
-
-	// Option to just output the value, example use:
-	// password=$(govc env GOVC_PASSWORD)
-	if f.NArg() == 1 {
-		var output []string
-
-		prefix := fmt.Sprintf("%s=", f.Arg(0))
-
-		for _, e := range env {
-			if strings.HasPrefix(e, prefix) {
-				output = append(output, e[len(prefix):])
-				break
-			}
-		}
-
-		return cmd.WriteResult(envResult(output))
-	}
-
-	return cmd.WriteResult(env)
-}
-
-type envResult []string
-
-func (r envResult) Write(w io.Writer) error {
-	for _, e := range r {
-		fmt.Println(e)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/events/command.go b/installer/vendor/github.com/vmware/govmomi/govc/events/command.go
deleted file mode 100644
index e57112b859..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/events/command.go
+++ /dev/null
@@ -1,178 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package events
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/event"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type events struct {
-	*flags.DatacenterFlag
-
-	write func(io.Writer, *record) error
-
-	Max   int32
-	Tail  bool
-	Force bool
-}
-
-func init() {
-	// initialize with the maximum allowed objects set
-	cli.Register("events", &events{})
-}
-
-func (cmd *events) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.Max = 25 // default
-	f.Var(flags.NewInt32(&cmd.Max), "n", "Output the last N events")
-	f.BoolVar(&cmd.Tail, "f", false, "Follow event stream")
-	f.BoolVar(&cmd.Force, "force", false, "Disable number objects to monitor limit")
-}
-
-func (cmd *events) Description() string {
-	return `Display events.
-
-Examples:
-  govc events vm/my-vm1 vm/my-vm2
-  govc events /dc1/vm/* /dc2/vm/*
-  govc ls -t HostSystem host/* | xargs govc events | grep -i vsan`
-}
-
-func (cmd *events) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *events) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *events) printEvents(ctx context.Context, obj *types.ManagedObjectReference, page []types.BaseEvent, m *event.Manager) error {
-	event.Sort(page)
-	source := ""
-	if obj != nil {
-		source = obj.String()
-		if !cmd.JSON {
-			// print the object reference
-			fmt.Fprintf(os.Stdout, "\n==> %s <==\n", source)
-		}
-	}
-	for _, e := range page {
-		cat, err := m.EventCategory(ctx, e)
-		if err != nil {
-			return err
-		}
-
-		event := e.GetEvent()
-		r := &record{
-			Object:      source,
-			CreatedTime: event.CreatedTime,
-			Category:    cat,
-			Message:     strings.TrimSpace(event.FullFormattedMessage),
-		}
-
-		// if this is a TaskEvent gather a little more information
-		if t, ok := e.(*types.TaskEvent); ok {
-			// some tasks won't have this information, so just use the event message
-			if t.Info.Entity != nil {
-				r.Message = fmt.Sprintf("%s (target=%s %s)", r.Message, t.Info.Entity.Type, t.Info.EntityName)
-			}
-		}
-
-		if err = cmd.write(os.Stdout, r); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-type record struct {
-	Object      string `json:",omitempty"`
-	CreatedTime time.Time
-	Category    string
-	Message     string
-}
-
-func writeEventAsJSON(w io.Writer, r *record) error {
-	return json.NewEncoder(w).Encode(r)
-}
-
-func writeEvent(w io.Writer, r *record) error {
-	when := r.CreatedTime.Local().Format(time.ANSIC)
-
-	_, err := fmt.Fprintf(w, "[%s] [%s] %s\n", when, r.Category, r.Message)
-	return err
-}
-
-func (cmd *events) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	if cmd.JSON {
-		cmd.write = writeEventAsJSON
-	} else {
-		cmd.write = writeEvent
-	}
-
-	if len(objs) > 0 {
-		// need an event manager
-		m := event.NewManager(c)
-
-		// get the event stream
-		err = m.Events(ctx, objs, cmd.Max, cmd.Tail, cmd.Force, func(obj types.ManagedObjectReference, ee []types.BaseEvent) error {
-			var o *types.ManagedObjectReference
-			if len(objs) > 1 {
-				o = &obj
-			}
-			err = cmd.printEvents(ctx, o, ee, m)
-			if err != nil {
-				return err
-			}
-			return nil
-		})
-
-		if err != nil {
-			return err
-		}
-
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh b/installer/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh
deleted file mode 100644
index 60910e9fb3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/examples/lib/ssh.sh
+++ /dev/null
@@ -1,44 +0,0 @@
-function public-key {
-  local dir=${HOME}/.ssh
-
-  for f in $HOME/.ssh/{id_{rsa,dsa},*}.pub; do
-    if [ -r $f ]; then
-      echo $f
-      return
-    fi
-  done
-
-  echo "Can't find public key file..."
-  exit 1
-}
-
-PUBLIC_KEY_FILE=${PUBLIC_KEY_FILE-$(public-key)}
-SSH_OPTS="-oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=quiet"
-
-function upload-public-key {
-  local vm_name=$1
-  local dir=$2
-
-  if [ -z "$dir" ]
-  then
-    uid=$(echo $GOVC_GUEST_LOGIN | awk -F: '{print $1}')
-    dir=$(govc guest.getenv -vm ${vm_name} HOME | awk -F= '{print $2}')
-
-    if [ -z "$dir" ]
-    then
-      echo "Can't find ${uid}'s HOME dir..."
-      exit 1
-    fi
-  fi
-
-  govc guest.mkdir \
-       -vm ${vm_name} \
-       -p \
-       ${dir}/.ssh
-
-  govc guest.upload \
-       -vm ${vm_name} \
-       -f \
-       ${PUBLIC_KEY_FILE} \
-       ${dir}/.ssh/authorized_keys
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/export/ovf.go b/installer/vendor/github.com/vmware/govmomi/govc/export/ovf.go
deleted file mode 100644
index 8969dfd332..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/export/ovf.go
+++ /dev/null
@@ -1,251 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package export
-
-import (
-	"bytes"
-	"context"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"flag"
-	"fmt"
-	"hash"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/nfc"
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ovfx struct {
-	*flags.VirtualMachineFlag
-
-	dest   string
-	name   string
-	force  bool
-	images bool
-	sha    int
-
-	mf bytes.Buffer
-}
-
-var sha = map[int]func() hash.Hash{
-	1:   sha1.New,
-	256: sha256.New,
-	512: sha512.New,
-}
-
-func init() {
-	cli.Register("export.ovf", &ovfx{})
-}
-
-func (cmd *ovfx) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Specifies target name (defaults to source name)")
-	f.BoolVar(&cmd.force, "f", false, "Overwrite existing")
-	f.BoolVar(&cmd.images, "i", false, "Include image files (*.{iso,img})")
-	f.IntVar(&cmd.sha, "sha", 0, "Generate manifest using SHA 1, 256, 512 or 0 to skip")
-}
-
-func (cmd *ovfx) Usage() string {
-	return "DIR"
-}
-
-func (cmd *ovfx) Description() string {
-	return `Export VM.
-
-Examples:
-  govc export.ovf -vm $vm DIR`
-}
-
-func (cmd *ovfx) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ovfx) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		// TODO: output summary similar to ovftool's
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	if cmd.sha != 0 {
-		if _, ok := sha[cmd.sha]; !ok {
-			return fmt.Errorf("unknown hash: sha%d", cmd.sha)
-		}
-	}
-
-	if cmd.name == "" {
-		cmd.name = vm.Name()
-	}
-
-	cmd.dest = filepath.Join(f.Arg(0), cmd.name)
-
-	target := filepath.Join(cmd.dest, cmd.name+".ovf")
-
-	if !cmd.force {
-		if _, err = os.Stat(target); err == nil {
-			return fmt.Errorf("File already exists: %s", target)
-		}
-	}
-
-	if err = os.MkdirAll(cmd.dest, 0755); err != nil {
-		return err
-	}
-
-	lease, err := vm.Export(ctx)
-	if err != nil {
-		return err
-	}
-
-	info, err := lease.Wait(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	u := lease.StartUpdater(ctx, info)
-	defer u.Done()
-
-	cdp := types.OvfCreateDescriptorParams{
-		Name: cmd.name,
-	}
-
-	for _, i := range info.Items {
-		if !cmd.include(&i) {
-			continue
-		}
-
-		if !strings.HasPrefix(i.Path, cmd.name) {
-			i.Path = cmd.name + "-" + i.Path
-		}
-
-		err = cmd.Download(ctx, lease, i)
-		if err != nil {
-			return err
-		}
-
-		cdp.OvfFiles = append(cdp.OvfFiles, i.File())
-	}
-
-	if err = lease.Complete(ctx); err != nil {
-		return err
-	}
-
-	m := ovf.NewManager(vm.Client())
-
-	desc, err := m.CreateDescriptor(ctx, vm, cdp)
-	if err != nil {
-		return err
-	}
-
-	file, err := os.Create(target)
-	if err != nil {
-		return err
-	}
-
-	var w io.Writer = file
-	h, ok := cmd.newHash()
-	if ok {
-		w = io.MultiWriter(file, h)
-	}
-
-	_, err = io.WriteString(w, desc.OvfDescriptor)
-	if err != nil {
-		return err
-	}
-
-	if err = file.Close(); err != nil {
-		return err
-	}
-
-	if cmd.sha == 0 {
-		return nil
-	}
-
-	cmd.addHash(filepath.Base(target), h)
-
-	file, err = os.Create(filepath.Join(cmd.dest, cmd.name+".mf"))
-	if err != nil {
-		return err
-	}
-
-	_, err = io.Copy(file, &cmd.mf)
-	if err != nil {
-		return err
-	}
-
-	return file.Close()
-}
-
-func (cmd *ovfx) include(item *nfc.FileItem) bool {
-	if cmd.images {
-		return true
-	}
-
-	return filepath.Ext(item.Path) == ".vmdk"
-}
-
-func (cmd *ovfx) newHash() (hash.Hash, bool) {
-	if h, ok := sha[cmd.sha]; ok {
-		return h(), true
-	}
-
-	return nil, false
-}
-
-func (cmd *ovfx) addHash(p string, h hash.Hash) {
-	_, _ = fmt.Fprintf(&cmd.mf, "SHA%d(%s)= %x\n", cmd.sha, p, h.Sum(nil))
-}
-
-func (cmd *ovfx) Download(ctx context.Context, lease *nfc.Lease, item nfc.FileItem) error {
-	path := filepath.Join(cmd.dest, item.Path)
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("Downloading %s... ", item.Path))
-	defer logger.Wait()
-
-	opts := soap.Download{
-		Progress: logger,
-	}
-
-	if h, ok := cmd.newHash(); ok {
-		opts.Writer = h
-
-		defer cmd.addHash(item.Path, h)
-	}
-
-	return lease.DownloadFile(ctx, path, item, opts)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/extension/info.go b/installer/vendor/github.com/vmware/govmomi/govc/extension/info.go
deleted file mode 100644
index feff009942..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/extension/info.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package extension
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("extension.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "[KEY]..."
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetExtensionManager(c)
-	if err != nil {
-		return err
-	}
-
-	list, err := m.List(ctx)
-	if err != nil {
-		return err
-	}
-
-	var res infoResult
-
-	if f.NArg() == 0 {
-		res.Extensions = list
-	} else {
-		exts := make(map[string]types.Extension)
-		for _, e := range list {
-			exts[e.Key] = e
-		}
-
-		for _, key := range f.Args() {
-			if e, ok := exts[key]; ok {
-				res.Extensions = append(res.Extensions, e)
-			} else {
-				return fmt.Errorf("extension %s not found", key)
-			}
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Extensions []types.Extension
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, e := range r.Extensions {
-		fmt.Fprintf(tw, "Name:\t%s\n", e.Key)
-		fmt.Fprintf(tw, "  Version:\t%s\n", e.Version)
-		fmt.Fprintf(tw, "  Description:\t%s\n", e.Description.GetDescription().Summary)
-		fmt.Fprintf(tw, "  Company:\t%s\n", e.Company)
-		fmt.Fprintf(tw, "  Last heartbeat time:\t%s\n", e.LastHeartbeatTime)
-		fmt.Fprintf(tw, "  Subject name:\t%s\n", e.SubjectName)
-		fmt.Fprintf(tw, "  Type:\t%s\n", e.Type)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/extension/register.go b/installer/vendor/github.com/vmware/govmomi/govc/extension/register.go
deleted file mode 100644
index 10186c1ee4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/extension/register.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package extension
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"os"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type register struct {
-	*flags.ClientFlag
-
-	update bool
-}
-
-func init() {
-	cli.Register("extension.register", &register{})
-}
-
-func (cmd *register) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.update, "update", false, "Update extension")
-}
-
-func (cmd *register) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *register) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetExtensionManager(c)
-	if err != nil {
-		return err
-	}
-
-	var e types.Extension
-	e.Description = new(types.Description)
-
-	if err = json.NewDecoder(os.Stdin).Decode(&e); err != nil {
-		return err
-	}
-
-	e.LastHeartbeatTime = time.Now().UTC()
-
-	if cmd.update {
-		return m.Update(ctx, e)
-	}
-
-	return m.Register(ctx, e)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/extension/setcert.go b/installer/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
deleted file mode 100644
index 6c58f09d87..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/extension/setcert.go
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package extension
-
-import (
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"math/big"
-	"os"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type setcert struct {
-	*flags.ClientFlag
-
-	cert string
-	org  string
-
-	encodedCert bytes.Buffer
-}
-
-func init() {
-	cli.Register("extension.setcert", &setcert{})
-}
-
-func (cmd *setcert) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.cert, "cert-pem", "-", "PEM encoded certificate")
-	f.StringVar(&cmd.org, "org", "VMware", "Organization for generated certificate")
-}
-
-func (cmd *setcert) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *setcert) Usage() string {
-	return "ID"
-}
-
-func (cmd *setcert) Description() string {
-	return `Set certificate for the extension ID.
-
-The '-cert-pem' option can be one of the following:
-'-' : Read the certificate from stdin
-'+' : Generate a new key pair and save locally to ID.crt and ID.key
-... : Any other value is passed as-is to ExtensionManager.SetCertificate`
-}
-
-func (cmd *setcert) create(id string) error {
-	certFile, err := os.Create(id + ".crt")
-	if err != nil {
-		return err
-	}
-	defer certFile.Close()
-
-	keyFile, err := os.Create(id + ".key")
-	if err != nil {
-		return err
-	}
-	defer keyFile.Close()
-
-	priv, err := rsa.GenerateKey(rand.Reader, 2048)
-	if err != nil {
-		return err
-	}
-
-	notBefore := time.Now()
-	notAfter := notBefore.Add(5 * 365 * 24 * time.Hour) // 5 years
-
-	serialNumberLimit := new(big.Int).Lsh(big.NewInt(1), 128)
-	serialNumber, err := rand.Int(rand.Reader, serialNumberLimit)
-	if err != nil {
-		return err
-	}
-
-	template := x509.Certificate{
-		SerialNumber: serialNumber,
-		Subject: pkix.Name{
-			Organization: []string{cmd.org},
-		},
-		NotBefore:             notBefore,
-		NotAfter:              notAfter,
-		KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-		BasicConstraintsValid: true,
-	}
-
-	derBytes, err := x509.CreateCertificate(rand.Reader, &template, &template, &priv.PublicKey, priv)
-	if err != nil {
-		return err
-	}
-
-	err = pem.Encode(&cmd.encodedCert, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
-	if err != nil {
-		return err
-	}
-
-	_, err = certFile.Write(cmd.encodedCert.Bytes())
-	if err != nil {
-		return err
-	}
-
-	err = pem.Encode(keyFile, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *setcert) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetExtensionManager(c)
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	key := f.Arg(0)
-
-	if cmd.cert == "-" {
-		b, err := ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			return err
-		}
-		cmd.cert = string(b)
-	} else if cmd.cert == "+" {
-		if err := cmd.create(key); err != nil {
-			return fmt.Errorf("creating certificate: %s", err)
-		}
-		cmd.cert = cmd.encodedCert.String()
-	}
-
-	return m.SetCertificate(ctx, key, cmd.cert)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/extension/unregister.go b/installer/vendor/github.com/vmware/govmomi/govc/extension/unregister.go
deleted file mode 100644
index f3b5692a92..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/extension/unregister.go
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package extension
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type unregister struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("extension.unregister", &unregister{})
-}
-
-func (cmd *unregister) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *unregister) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *unregister) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetExtensionManager(c)
-	if err != nil {
-		return err
-	}
-
-	for _, key := range f.Args() {
-		if err = m.Unregister(ctx, key); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/fields/add.go b/installer/vendor/github.com/vmware/govmomi/govc/fields/add.go
deleted file mode 100644
index 053ba4f151..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/fields/add.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fields
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type add struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("fields.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "NAME"
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetCustomFieldsManager(c)
-	if err != nil {
-		return err
-	}
-
-	name := f.Arg(0)
-
-	def, err := m.Add(ctx, name, "", nil, nil)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("%d\n", def.Key)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/fields/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/fields/ls.go
deleted file mode 100644
index 085c7684e9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/fields/ls.go
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fields
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type ls struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("fields.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetCustomFieldsManager(c)
-	if err != nil {
-		return err
-	}
-
-	field, err := m.Field(ctx)
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, def := range field {
-		fmt.Fprintf(tw, "%d\t%s\n", def.Key, def.Name)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/fields/rename.go b/installer/vendor/github.com/vmware/govmomi/govc/fields/rename.go
deleted file mode 100644
index c59a1628e9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/fields/rename.go
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fields
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type rename struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("fields.rename", &rename{})
-}
-
-func (cmd *rename) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *rename) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rename) Usage() string {
-	return "KEY NAME"
-}
-
-func (cmd *rename) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetCustomFieldsManager(c)
-	if err != nil {
-		return err
-	}
-
-	key, err := m.FindKey(ctx, f.Arg(0))
-	if err != nil {
-		return err
-	}
-
-	name := f.Arg(1)
-
-	return m.Rename(ctx, key, name)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/fields/rm.go b/installer/vendor/github.com/vmware/govmomi/govc/fields/rm.go
deleted file mode 100644
index 74da4a04ae..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/fields/rm.go
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fields
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type rm struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("fields.rm", &rm{})
-}
-
-func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *rm) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rm) Usage() string {
-	return "KEY..."
-}
-
-func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetCustomFieldsManager(c)
-	if err != nil {
-		return err
-	}
-
-	for _, name := range f.Args() {
-		key, err := m.FindKey(ctx, name)
-		if err != nil {
-			return err
-		}
-
-		if err := m.Remove(ctx, key); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/fields/set.go b/installer/vendor/github.com/vmware/govmomi/govc/fields/set.go
deleted file mode 100644
index 33c9456f66..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/fields/set.go
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package fields
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type set struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("fields.set", &set{})
-}
-
-func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *set) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *set) Usage() string {
-	return "KEY VALUE PATH..."
-}
-
-func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() < 3 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := object.GetCustomFieldsManager(c)
-	if err != nil {
-		return err
-	}
-
-	args := f.Args()
-
-	key, err := m.FindKey(ctx, args[0])
-	if err != nil {
-		return err
-	}
-
-	val := args[1]
-
-	objs, err := cmd.ManagedObjects(ctx, args[2:])
-	if err != nil {
-		return err
-	}
-
-	for _, ref := range objs {
-		err := m.Set(ctx, ref, key, val)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/client.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/client.go
index f0fe5ee0a2..703cbb9377 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/client.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/client.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -39,19 +39,18 @@ import (
 )
 
 const (
-	envURL                 = "GOVC_URL"
-	envUsername            = "GOVC_USERNAME"
-	envPassword            = "GOVC_PASSWORD"
-	envCertificate         = "GOVC_CERTIFICATE"
-	envPrivateKey          = "GOVC_PRIVATE_KEY"
-	envInsecure            = "GOVC_INSECURE"
-	envPersist             = "GOVC_PERSIST_SESSION"
-	envMinAPIVersion       = "GOVC_MIN_API_VERSION"
-	envVimNamespace        = "GOVC_VIM_NAMESPACE"
-	envVimVersion          = "GOVC_VIM_VERSION"
-	envTLSCaCerts          = "GOVC_TLS_CA_CERTS"
-	envTLSKnownHosts       = "GOVC_TLS_KNOWN_HOSTS"
-	envTLSHandshakeTimeout = "GOVC_TLS_HANDSHAKE_TIMEOUT"
+	envURL           = "GOVC_URL"
+	envUsername      = "GOVC_USERNAME"
+	envPassword      = "GOVC_PASSWORD"
+	envCertificate   = "GOVC_CERTIFICATE"
+	envPrivateKey    = "GOVC_PRIVATE_KEY"
+	envInsecure      = "GOVC_INSECURE"
+	envPersist       = "GOVC_PERSIST_SESSION"
+	envMinAPIVersion = "GOVC_MIN_API_VERSION"
+	envVimNamespace  = "GOVC_VIM_NAMESPACE"
+	envVimVersion    = "GOVC_VIM_VERSION"
+	envTLSCaCerts    = "GOVC_TLS_CA_CERTS"
+	envTLSKnownHosts = "GOVC_TLS_KNOWN_HOSTS"
 )
 
 const cDescr = "ESX or vCenter URL"
@@ -61,21 +60,21 @@ type ClientFlag struct {
 
 	*DebugFlag
 
-	url                 *url.URL
-	username            string
-	password            string
-	cert                string
-	key                 string
-	insecure            bool
-	persist             bool
-	minAPIVersion       string
-	vimNamespace        string
-	vimVersion          string
-	tlsCaCerts          string
-	tlsKnownHosts       string
-	tlsHostHash         string
-	tlsHandshakeTimeout time.Duration
-	client              *vim25.Client
+	url           *url.URL
+	username      string
+	password      string
+	cert          string
+	key           string
+	insecure      bool
+	persist       bool
+	minAPIVersion string
+	vimNamespace  string
+	vimVersion    string
+	tlsCaCerts    string
+	tlsKnownHosts string
+	client        *vim25.Client
+
+	Login func(context.Context, *vim25.Client) error
 }
 
 var (
@@ -95,6 +94,7 @@ func NewClientFlag(ctx context.Context) (*ClientFlag, context.Context) {
 	}
 
 	v := &ClientFlag{}
+	v.Login = v.login
 	v.DebugFlag, ctx = NewDebugFlag(ctx)
 	ctx = context.WithValue(ctx, clientFlagKey, v)
 	return v, ctx
@@ -218,15 +218,6 @@ func (flag *ClientFlag) Register(ctx context.Context, f *flag.FlagSet) {
 			usage := fmt.Sprintf("TLS known hosts file [%s]", envTLSKnownHosts)
 			f.StringVar(&flag.tlsKnownHosts, "tls-known-hosts", value, usage)
 		}
-
-		{
-			value, err := time.ParseDuration(os.Getenv(envTLSHandshakeTimeout))
-			if err != nil {
-				value = 10 * time.Second
-			}
-			usage := fmt.Sprintf("TLS handshake timeout [%s]", envTLSHandshakeTimeout)
-			f.DurationVar(&flag.tlsHandshakeTimeout, "tls-handshake-timeout", value, usage)
-		}
 	})
 }
 
@@ -288,7 +279,15 @@ func (flag *ClientFlag) configure(sc *soap.Client) (soap.RoundTripper, error) {
 	}
 
 	if t, ok := sc.Transport.(*http.Transport); ok {
-		t.TLSHandshakeTimeout = flag.tlsHandshakeTimeout
+		var err error
+
+		value := os.Getenv("GOVC_TLS_HANDSHAKE_TIMEOUT")
+		if value != "" {
+			t.TLSHandshakeTimeout, err = time.ParseDuration(value)
+			if err != nil {
+				return nil, err
+			}
+		}
 	}
 
 	// Retry twice when a temporary I/O error occurs.
@@ -401,13 +400,42 @@ func (flag *ClientFlag) SetRootCAs(c *soap.Client) error {
 	return nil
 }
 
+func (flag *ClientFlag) login(ctx context.Context, c *vim25.Client) error {
+	m := session.NewManager(c)
+	u := flag.url.User
+
+	if u.Username() == "" {
+		if !c.IsVC() {
+			// If no username is provided, try to acquire a local ticket.
+			// When invoked remotely, ESX returns an InvalidRequestFault.
+			// So, rather than return an error here, fallthrough to Login() with the original User to
+			// to avoid what would be a confusing error message.
+			luser, lerr := flag.localTicket(ctx, m)
+			if lerr == nil {
+				// We are running directly on an ESX or Workstation host and can use the ticket with Login()
+				u = luser
+			} else {
+				flag.persist = true // Not persisting, but this avoids the call to Logout()
+				return nil          // Avoid SaveSession for non-authenticated session
+			}
+		}
+	}
+
+	if flag.cert != "" {
+		err := m.LoginExtensionByCertificate(ctx, u.Username(), "")
+		if err != nil {
+			return err
+		}
+	}
+
+	return m.Login(ctx, u)
+}
+
 func (flag *ClientFlag) newClient() (*vim25.Client, error) {
 	ctx := context.TODO()
 	sc := soap.NewClient(flag.url, flag.insecure)
-	isTunnel := false
 
 	if flag.cert != "" {
-		isTunnel = true
 		cert, err := tls.LoadX509KeyPair(flag.cert, flag.key)
 		if err != nil {
 			return nil, err
@@ -429,35 +457,11 @@ func (flag *ClientFlag) newClient() (*vim25.Client, error) {
 	// Set client, since we didn't pass it in the constructor
 	c.Client = sc
 
-	m := session.NewManager(c)
-	u := flag.url.User
-
-	if u.Username() == "" {
-		// Assume we are running on an ESX or Workstation host if no username is provided
-		u, err = flag.localTicket(ctx, m)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if isTunnel {
-		err = m.LoginExtensionByCertificate(ctx, u.Username(), "")
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		err = m.Login(ctx, u)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	err = flag.saveClient(c)
-	if err != nil {
+	if err := flag.Login(ctx, c); err != nil {
 		return nil, err
 	}
 
-	return c, nil
+	return c, flag.saveClient(c)
 }
 
 func (flag *ClientFlag) localTicket(ctx context.Context, m *session.Manager) (*url.Userinfo, error) {
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/cluster.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/cluster.go
new file mode 100644
index 0000000000..f89b151cce
--- /dev/null
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/cluster.go
@@ -0,0 +1,191 @@
+/*
+Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package flags
+
+import (
+	"context"
+	"flag"
+	"fmt"
+	"os"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/view"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type ClusterFlag struct {
+	common
+
+	*DatacenterFlag
+
+	Name string
+
+	cluster *object.ClusterComputeResource
+	pc      *property.Collector
+}
+
+var clusterFlagKey = flagKey("cluster")
+
+func NewClusterFlag(ctx context.Context) (*ClusterFlag, context.Context) {
+	if v := ctx.Value(clusterFlagKey); v != nil {
+		return v.(*ClusterFlag), ctx
+	}
+
+	v := &ClusterFlag{}
+	v.DatacenterFlag, ctx = NewDatacenterFlag(ctx)
+	ctx = context.WithValue(ctx, clusterFlagKey, v)
+	return v, ctx
+}
+
+func (f *ClusterFlag) Register(ctx context.Context, fs *flag.FlagSet) {
+	f.RegisterOnce(func() {
+		f.DatacenterFlag.Register(ctx, fs)
+
+		env := "GOVC_CLUSTER"
+		value := os.Getenv(env)
+		usage := fmt.Sprintf("Cluster [%s]", env)
+		fs.StringVar(&f.Name, "cluster", value, usage)
+	})
+}
+
+func (f *ClusterFlag) Process(ctx context.Context) error {
+	return f.ProcessOnce(func() error {
+		if err := f.DatacenterFlag.Process(ctx); err != nil {
+			return err
+		}
+		return nil
+	})
+}
+
+func (f *ClusterFlag) Cluster() (*object.ClusterComputeResource, error) {
+	if f.cluster != nil {
+		return f.cluster, nil
+	}
+
+	finder, err := f.Finder()
+	if err != nil {
+		return nil, err
+	}
+
+	if f.cluster, err = finder.ClusterComputeResourceOrDefault(context.TODO(), f.Name); err != nil {
+		return nil, err
+	}
+
+	f.pc = property.DefaultCollector(f.cluster.Client())
+
+	return f.cluster, nil
+}
+
+func (f *ClusterFlag) ClusterIfSpecified() (*object.ClusterComputeResource, error) {
+	if f.Name == "" {
+		return nil, nil
+	}
+	return f.Cluster()
+}
+
+func (f *ClusterFlag) Reconfigure(ctx context.Context, spec types.BaseComputeResourceConfigSpec) error {
+	cluster, err := f.Cluster()
+	if err != nil {
+		return err
+	}
+
+	task, err := cluster.Reconfigure(ctx, spec, true)
+	if err != nil {
+		return err
+	}
+
+	logger := f.ProgressLogger(fmt.Sprintf("Reconfigure %s...", cluster.InventoryPath))
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}
+
+func (f *ClusterFlag) objectMap(ctx context.Context, kind string, names []string) (map[string]types.ManagedObjectReference, error) {
+	cluster, err := f.Cluster()
+	if err != nil {
+		return nil, err
+	}
+
+	objects := make(map[string]types.ManagedObjectReference, len(names))
+	for _, name := range names {
+		objects[name] = types.ManagedObjectReference{}
+	}
+
+	m := view.NewManager(cluster.Client())
+	v, err := m.CreateContainerView(ctx, cluster.Reference(), []string{kind}, true)
+	if err != nil {
+		return nil, err
+	}
+	defer v.Destroy(ctx)
+
+	var entities []mo.ManagedEntity
+
+	err = v.Retrieve(ctx, []string{"ManagedEntity"}, []string{"name"}, &entities)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, e := range entities {
+		if _, ok := objects[e.Name]; ok {
+			objects[e.Name] = e.Self
+		}
+	}
+
+	for name, ref := range objects {
+		if ref.Value == "" {
+			return nil, fmt.Errorf("%s %q not found", kind, name)
+		}
+	}
+
+	return objects, nil
+}
+
+func (f *ClusterFlag) ObjectList(ctx context.Context, kind string, names []string) ([]types.ManagedObjectReference, error) {
+	objs, err := f.objectMap(ctx, kind, names)
+	if err != nil {
+		return nil, err
+	}
+
+	var refs []types.ManagedObjectReference
+
+	for _, name := range names { // preserve order
+		refs = append(refs, objs[name])
+	}
+
+	return refs, nil
+}
+
+func (f *ClusterFlag) Names(ctx context.Context, refs []types.ManagedObjectReference) (map[types.ManagedObjectReference]string, error) {
+	names := make(map[types.ManagedObjectReference]string, len(refs))
+
+	if len(refs) != 0 {
+		var objs []mo.ManagedEntity
+		err := f.pc.Retrieve(ctx, refs, []string{"name"}, &objs)
+		if err != nil {
+			return nil, err
+		}
+
+		for _, obj := range objs {
+			names[obj.Self] = obj.Name
+		}
+	}
+
+	return names, nil
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
index 8ae8787a41..3c1957da09 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/datacenter.go
@@ -33,7 +33,7 @@ type DatacenterFlag struct {
 	*ClientFlag
 	*OutputFlag
 
-	path   string
+	Name   string
 	dc     *object.Datacenter
 	finder *find.Finder
 	err    error
@@ -61,7 +61,7 @@ func (flag *DatacenterFlag) Register(ctx context.Context, f *flag.FlagSet) {
 		env := "GOVC_DATACENTER"
 		value := os.Getenv(env)
 		usage := fmt.Sprintf("Datacenter [%s]", env)
-		f.StringVar(&flag.path, "dc", value, usage)
+		f.StringVar(&flag.Name, "dc", value, usage)
 	})
 }
 
@@ -93,10 +93,10 @@ func (flag *DatacenterFlag) Finder() (*find.Finder, error) {
 	// Set for relative func if dc flag is given or
 	// if there is a single (default) Datacenter
 	ctx := context.TODO()
-	if flag.path == "" {
+	if flag.Name == "" {
 		flag.dc, flag.err = finder.DefaultDatacenter(ctx)
 	} else {
-		if flag.dc, err = finder.Datacenter(ctx, flag.path); err != nil {
+		if flag.dc, err = finder.Datacenter(ctx, flag.Name); err != nil {
 			return nil, err
 		}
 	}
@@ -127,7 +127,7 @@ func (flag *DatacenterFlag) Datacenter() (*object.Datacenter, error) {
 }
 
 func (flag *DatacenterFlag) DatacenterIfSpecified() (*object.Datacenter, error) {
-	if flag.path == "" {
+	if flag.Name == "" {
 		return nil, nil
 	}
 	return flag.Datacenter()
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/int32.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/int32.go
index 503b4ec416..a993c3eeac 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/int32.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/int32.go
@@ -57,8 +57,8 @@ func (i *int32ptrValue) Set(s string) error {
 }
 
 func (i *int32ptrValue) Get() interface{} {
-	if i.val == nil {
-		return -1
+	if i.val == nil || *i.val == nil {
+		return nil
 	}
 	return *i.val
 }
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/int64.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/int64.go
index 4e35c3b655..e3b8cc5a95 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/int64.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/int64.go
@@ -57,10 +57,10 @@ func (i *int64ptrValue) Set(s string) error {
 }
 
 func (i *int64ptrValue) Get() interface{} {
-	if i.val == nil {
-		return -1
+	if i.val == nil || *i.val == nil {
+		return nil
 	}
-	return *i.val
+	return **i.val
 }
 
 func (i *int64ptrValue) String() string {
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/network.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/network.go
index d2f4643f65..842fd31844 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/network.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/network.go
@@ -129,3 +129,19 @@ func (flag *NetworkFlag) Device() (types.BaseVirtualDevice, error) {
 
 	return device, nil
 }
+
+// Change applies update backing and hardware address changes to the given network device.
+func (flag *NetworkFlag) Change(device types.BaseVirtualDevice, update types.BaseVirtualDevice) {
+	current := device.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+	changed := update.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
+
+	current.Backing = changed.Backing
+
+	if changed.MacAddress != "" {
+		current.MacAddress = changed.MacAddress
+	}
+
+	if changed.AddressType != "" {
+		current.AddressType = changed.AddressType
+	}
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go
deleted file mode 100644
index 4080312199..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/optional_bool_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package flags
-
-import (
-	"flag"
-	"testing"
-)
-
-func TestOptionalBool(t *testing.T) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var val *bool
-
-	fs.Var(NewOptionalBool(&val), "obool", "optional bool")
-
-	b := fs.Lookup("obool")
-
-	if b.DefValue != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.String() != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != nil {
-		t.Fail()
-	}
-
-	b.Value.Set("true")
-
-	if b.Value.String() != "true" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != true {
-		t.Fail()
-	}
-
-	if val == nil || *val != true {
-		t.Fail()
-	}
-
-	b.Value.Set("false")
-
-	if b.Value.String() != "false" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != false {
-		t.Fail()
-	}
-
-	if val == nil || *val != false {
-		t.Fail()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/resource_allocation_info.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/resource_allocation_info.go
new file mode 100644
index 0000000000..99a262ec45
--- /dev/null
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/resource_allocation_info.go
@@ -0,0 +1,85 @@
+/*
+Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package flags
+
+import (
+	"context"
+	"flag"
+	"strconv"
+	"strings"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type sharesInfo types.SharesInfo
+
+func (s *sharesInfo) String() string {
+	return string(s.Level)
+}
+
+func (s *sharesInfo) Set(val string) error {
+	switch val {
+	case string(types.SharesLevelNormal), string(types.SharesLevelLow), string(types.SharesLevelHigh):
+		s.Level = types.SharesLevel(val)
+	default:
+		n, err := strconv.Atoi(val)
+		if err != nil {
+			return err
+		}
+
+		s.Level = types.SharesLevelCustom
+		s.Shares = int32(n)
+	}
+
+	return nil
+}
+
+type ResourceAllocationFlag struct {
+	cpu, mem              *types.ResourceAllocationInfo
+	ExpandableReservation bool
+}
+
+func NewResourceAllocationFlag(cpu, mem *types.ResourceAllocationInfo) *ResourceAllocationFlag {
+	return &ResourceAllocationFlag{cpu, mem, true}
+}
+
+func (r *ResourceAllocationFlag) Register(ctx context.Context, f *flag.FlagSet) {
+	opts := []struct {
+		name  string
+		units string
+		*types.ResourceAllocationInfo
+	}{
+		{"CPU", "MHz", r.cpu},
+		{"Memory", "MB", r.mem},
+	}
+
+	for _, opt := range opts {
+		prefix := strings.ToLower(opt.name)[:3]
+		shares := (*sharesInfo)(opt.Shares)
+
+		f.Var(NewOptionalInt64(&opt.Limit), prefix+".limit", opt.name+" limit in "+opt.units)
+		f.Var(NewOptionalInt64(&opt.Reservation), prefix+".reservation", opt.name+" reservation in "+opt.units)
+		if r.ExpandableReservation {
+			f.Var(NewOptionalBool(&opt.ExpandableReservation), prefix+".expandable", opt.name+" expandable reservation")
+		}
+		f.Var(shares, prefix+".shares", opt.name+" shares level or number")
+	}
+}
+
+func (s *ResourceAllocationFlag) Process(ctx context.Context) error {
+	return nil
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/version.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/version.go
index 597613652d..eaa99cc6b3 100644
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/version.go
+++ b/installer/vendor/github.com/vmware/govmomi/govc/flags/version.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -21,13 +21,16 @@ import (
 	"strings"
 )
 
-const Version = "0.15.0"
+const Version = "0.17.2-dev"
+
+var GitVersion string
 
 type version []int
 
 func ParseVersion(s string) (version, error) {
 	v := make(version, 0)
-	ps := strings.Split(s, ".")
+	ds := strings.Split(s, "-")
+	ps := strings.Split(ds[0], ".")
 	for _, p := range ps {
 		i, err := strconv.Atoi(p)
 		if err != nil {
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/flags/version_test.go b/installer/vendor/github.com/vmware/govmomi/govc/flags/version_test.go
deleted file mode 100644
index d45173d38d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/flags/version_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package flags
-
-import "testing"
-
-func TestParseVersion(t *testing.T) {
-	var v version
-	var err error
-
-	v, err = ParseVersion("5.5.5.5")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if len(v) != 4 {
-		t.Errorf("Expected %d elements, got %d", 4, len(v))
-	}
-
-	for i := 0; i < len(v); i++ {
-		if v[i] != 5 {
-			t.Errorf("Expected %d, got %d", 5, v[i])
-		}
-	}
-}
-
-func TestLte(t *testing.T) {
-	v1, err := ParseVersion("5.5")
-	if err != nil {
-		panic(err)
-	}
-
-	v2, err := ParseVersion("5.6")
-	if err != nil {
-		panic(err)
-	}
-
-	if !v1.Lte(v1) {
-		t.Errorf("Expected 5.5 <= 5.5")
-	}
-
-	if !v1.Lte(v2) {
-		t.Errorf("Expected 5.5 <= 5.6")
-	}
-
-	if v2.Lte(v1) {
-		t.Errorf("Expected not 5.6 <= 5.5")
-	}
-}
-
-func TestDevelopmentVersion(t *testing.T) {
-	if !isDevelopmentVersion("6.5.x") {
-		t.Error("expected true")
-	}
-
-	if !isDevelopmentVersion("r4A70F") {
-		t.Error("expected true")
-	}
-
-	if isDevelopmentVersion("6.5") {
-		t.Error("expected false")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/folder/create.go b/installer/vendor/github.com/vmware/govmomi/govc/folder/create.go
deleted file mode 100644
index b0356019a1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/folder/create.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package folder
-
-import (
-	"context"
-	"flag"
-	"path"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type create struct {
-	*flags.DatacenterFlag
-
-	pod bool
-}
-
-func init() {
-	cli.Register("folder.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.pod, "pod", false, "Create folder(s) of type StoragePod (DatastoreCluster)")
-}
-
-func (cmd *create) Usage() string {
-	return "PATH..."
-}
-
-func (cmd *create) Description() string {
-	return `Create folder with PATH.
-
-Examples:
-  govc folder.create /dc1/vm/folder-foo
-  govc object.mv /dc1/vm/vm-foo-* /dc1/vm/folder-foo
-  govc folder.create -pod /dc1/datastore/sdrs
-  govc object.mv /dc1/datastore/iscsi-* /dc1/datastore/sdrs`
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, arg := range f.Args() {
-		dir := path.Dir(arg)
-		name := path.Base(arg)
-
-		if dir == "" {
-			dir = "/"
-		}
-
-		folder, err := finder.Folder(ctx, dir)
-		if err != nil {
-			return err
-		}
-
-		var create func() error
-		if cmd.pod {
-			create = func() error {
-				_, err = folder.CreateStoragePod(ctx, name)
-				return err
-			}
-		} else {
-			create = func() error {
-				_, err = folder.CreateFolder(ctx, name)
-				return err
-			}
-		}
-
-		err = create()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/folder/info.go b/installer/vendor/github.com/vmware/govmomi/govc/folder/info.go
deleted file mode 100644
index d8cd2e258f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/folder/info.go
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package folder
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("folder.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	args := f.Args()
-	if len(args) == 0 {
-		args = []string{"/"}
-	}
-
-	var props []string
-	var res infoResult
-
-	if !cmd.OutputFlag.All() {
-		props = []string{
-			"name",
-			"childEntity",
-			"childType",
-		}
-	}
-
-	for _, arg := range args {
-		object, err := finder.FolderList(ctx, arg)
-		if err != nil {
-			return err
-		}
-		res.objects = append(res.objects, object...)
-	}
-
-	if len(res.objects) != 0 {
-		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
-		for _, o := range res.objects {
-			refs = append(refs, o.Reference())
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &res.Folders)
-		if err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Folders []mo.Folder
-	objects []*object.Folder
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.Folder, len(r.Folders))
-	for _, o := range r.Folders {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		info := objects[o.Reference()]
-		fmt.Fprintf(tw, "Name:\t%s\n", info.Name)
-		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-		fmt.Fprintf(tw, "  Types:\t%v\n", strings.Join(info.ChildType, ","))
-		fmt.Fprintf(tw, "  Children:\t%d\n", len(info.ChildEntity))
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/account/account.go b/installer/vendor/github.com/vmware/govmomi/govc/host/account/account.go
deleted file mode 100644
index 61cc9597ee..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/account/account.go
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package account
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type AccountFlag struct {
-	*flags.ClientFlag
-	*flags.DatacenterFlag
-	*flags.HostSystemFlag
-
-	types.HostAccountSpec
-}
-
-func newAccountFlag(ctx context.Context) (*AccountFlag, context.Context) {
-	f := &AccountFlag{}
-	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	f.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	return f, ctx
-}
-
-func (f *AccountFlag) Register(ctx context.Context, fs *flag.FlagSet) {
-	f.ClientFlag.Register(ctx, fs)
-	f.DatacenterFlag.Register(ctx, fs)
-	f.HostSystemFlag.Register(ctx, fs)
-
-	fs.StringVar(&f.Id, "id", "", "The ID of the specified account")
-	fs.StringVar(&f.Password, "password", "", "The password for the specified account id")
-	fs.StringVar(&f.Description, "description", "", "The description of the specified account")
-}
-
-func (f *AccountFlag) Process(ctx context.Context) error {
-	if err := f.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (f *AccountFlag) HostAccountManager(ctx context.Context) (*object.HostAccountManager, error) {
-	h, err := f.HostSystem()
-	if err != nil {
-		return nil, err
-	}
-
-	return h.ConfigManager().AccountManager(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/account/create.go b/installer/vendor/github.com/vmware/govmomi/govc/host/account/create.go
deleted file mode 100644
index ade5a9d4b7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/account/create.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package account
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type create struct {
-	*AccountFlag
-}
-
-func init() {
-	cli.Register("host.account.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AccountFlag, ctx = newAccountFlag(ctx)
-	cmd.AccountFlag.Register(ctx, f)
-}
-
-func (cmd *create) Description() string {
-	return `Create local account on HOST.
-
-Examples:
-  govc host.account.create -id $USER -password password-for-esx60`
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.AccountFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.AccountFlag.HostAccountManager(ctx)
-	if err != nil {
-		return err
-	}
-	return m.Create(ctx, &cmd.HostAccountSpec)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/account/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/host/account/remove.go
deleted file mode 100644
index a600c64be8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/account/remove.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package account
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type remove struct {
-	*AccountFlag
-}
-
-func init() {
-	cli.Register("host.account.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AccountFlag, ctx = newAccountFlag(ctx)
-	cmd.AccountFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Description() string {
-	return `Remove local account on HOST.
-
-Examples:
-  govc host.account.remove -id $USER`
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.AccountFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.AccountFlag.HostAccountManager(ctx)
-	if err != nil {
-		return err
-	}
-	return m.Remove(ctx, cmd.HostAccountSpec.Id)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/account/update.go b/installer/vendor/github.com/vmware/govmomi/govc/host/account/update.go
deleted file mode 100644
index e6ac5e1457..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/account/update.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package account
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type update struct {
-	*AccountFlag
-}
-
-func init() {
-	cli.Register("host.account.update", &update{})
-}
-
-func (cmd *update) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AccountFlag, ctx = newAccountFlag(ctx)
-	cmd.AccountFlag.Register(ctx, f)
-}
-
-func (cmd *update) Description() string {
-	return `Update local account on HOST.
-
-Examples:
-  govc host.account.update -id root -password password-for-esx60`
-}
-
-func (cmd *update) Process(ctx context.Context) error {
-	if err := cmd.AccountFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *update) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.AccountFlag.HostAccountManager(ctx)
-	if err != nil {
-		return err
-	}
-	return m.Update(ctx, &cmd.HostAccountSpec)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/add.go b/installer/vendor/github.com/vmware/govmomi/govc/host/add.go
deleted file mode 100644
index 2a5807a536..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/add.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.FolderFlag
-	*flags.HostConnectFlag
-
-	connect bool
-}
-
-func init() {
-	cli.Register("host.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
-	cmd.HostConnectFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.connect, "connect", true, "Immediately connect to host")
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
-		return err
-	}
-	if cmd.HostName == "" {
-		return flag.ErrHelp
-	}
-	if cmd.UserName == "" {
-		return flag.ErrHelp
-	}
-	if cmd.Password == "" {
-		return flag.ErrHelp
-	}
-	return nil
-}
-
-func (cmd *add) Description() string {
-	return `Add host to datacenter.
-
-The host is added to the folder specified by the 'folder' flag. If not given,
-this defaults to the host folder in the specified or default datacenter.
-
-Examples:
-  thumbprint=$(govc about.cert -k -u host.example.com -thumbprint | awk '{print $2}')
-  govc host.add -hostname host.example.com -username root -password pass -thumbprint $thumbprint
-  govc host.add -hostname 10.0.6.1 -username root -password pass -noverify`
-}
-
-func (cmd *add) Add(ctx context.Context, parent *object.Folder) error {
-	spec := cmd.Spec(parent.Client())
-
-	req := types.AddStandaloneHost_Task{
-		This:         parent.Reference(),
-		Spec:         spec,
-		AddConnected: cmd.connect,
-	}
-
-	res, err := methods.AddStandaloneHost_Task(ctx, parent.Client(), &req)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("adding %s to folder %s... ", spec.HostName, parent.InventoryPath))
-	defer logger.Wait()
-
-	task := object.NewTask(parent.Client(), res.Returnval)
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 0 {
-		return flag.ErrHelp
-	}
-
-	folder, err := cmd.FolderOrDefault("host")
-	if err != nil {
-		return err
-	}
-
-	return cmd.Fault(cmd.Add(ctx, folder))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go b/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go
deleted file mode 100644
index 4cabbd3db4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/add.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package autostart
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*AutostartFlag
-	// from types.AutoStartPowerInfo
-	StartOrder       int32
-	StartDelay       int32
-	WaitForHeartbeat string
-	StartAction      string
-	StopDelay        int32
-	StopAction       string
-}
-
-func init() {
-	cli.Register("host.autostart.add", &add{})
-}
-
-var waitHeartbeatTypes = []string{
-	string(types.AutoStartWaitHeartbeatSettingSystemDefault),
-	string(types.AutoStartWaitHeartbeatSettingYes),
-	string(types.AutoStartWaitHeartbeatSettingNo),
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
-	cmd.AutostartFlag.Register(ctx, f)
-
-	cmd.StartOrder = -1
-	cmd.StartDelay = -1
-	cmd.StopDelay = -1
-	f.Var(flags.NewInt32(&cmd.StartOrder), "start-order", "Start Order")
-	f.Var(flags.NewInt32(&cmd.StartDelay), "start-delay", "Start Delay")
-	f.Var(flags.NewInt32(&cmd.StopDelay), "stop-delay", "Stop Delay")
-	f.StringVar(&cmd.StartAction, "start-action", "powerOn", "Start Action")
-	f.StringVar(&cmd.StopAction, "stop-action", "systemDefault", "Stop Action")
-	f.StringVar(&cmd.WaitForHeartbeat, "wait", waitHeartbeatTypes[0],
-		fmt.Sprintf("Wait for Hearbeat Setting (%s)", strings.Join(waitHeartbeatTypes, "|")))
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.AutostartFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "VM..."
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	powerInfo := types.AutoStartPowerInfo{
-		StartOrder:       cmd.StartOrder,
-		StartDelay:       cmd.StartDelay,
-		WaitForHeartbeat: types.AutoStartWaitHeartbeatSetting(cmd.WaitForHeartbeat),
-		StartAction:      cmd.StartAction,
-		StopDelay:        cmd.StopDelay,
-		StopAction:       cmd.StopAction,
-	}
-	return cmd.ReconfigureVMs(f.Args(), powerInfo)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go b/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go
deleted file mode 100644
index b22b67d98a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/autostart.go
+++ /dev/null
@@ -1,177 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package autostart
-
-import (
-	"context"
-	"errors"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type AutostartFlag struct {
-	*flags.ClientFlag
-	*flags.DatacenterFlag
-	*flags.HostSystemFlag
-}
-
-func newAutostartFlag(ctx context.Context) (*AutostartFlag, context.Context) {
-	f := &AutostartFlag{}
-	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	f.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	return f, ctx
-}
-
-func (f *AutostartFlag) Register(ctx context.Context, fs *flag.FlagSet) {
-	f.ClientFlag.Register(ctx, fs)
-	f.DatacenterFlag.Register(ctx, fs)
-	f.HostSystemFlag.Register(ctx, fs)
-}
-
-func (f *AutostartFlag) Process(ctx context.Context) error {
-	if err := f.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-// VirtualMachines returns list of virtual machine objects based on the
-// arguments specified on the command line. This helper is defined in
-// flags.SearchFlag as well, but that pulls in other virtual machine flags that
-// are not relevant here.
-func (f *AutostartFlag) VirtualMachines(args []string) ([]*object.VirtualMachine, error) {
-	ctx := context.TODO()
-	if len(args) == 0 {
-		return nil, errors.New("no argument")
-	}
-
-	finder, err := f.Finder()
-	if err != nil {
-		return nil, err
-	}
-
-	var out []*object.VirtualMachine
-	for _, arg := range args {
-		vms, err := finder.VirtualMachineList(ctx, arg)
-		if err != nil {
-			return nil, err
-		}
-
-		out = append(out, vms...)
-	}
-
-	return out, nil
-}
-
-func (f *AutostartFlag) HostAutoStartManager() (*mo.HostAutoStartManager, error) {
-	ctx := context.TODO()
-	h, err := f.HostSystem()
-	if err != nil {
-		return nil, err
-	}
-
-	var mhs mo.HostSystem
-	err = h.Properties(ctx, h.Reference(), []string{"configManager.autoStartManager"}, &mhs)
-	if err != nil {
-		return nil, err
-	}
-
-	var mhas mo.HostAutoStartManager
-	err = h.Properties(ctx, *mhs.ConfigManager.AutoStartManager, nil, &mhas)
-	if err != nil {
-		return nil, err
-	}
-
-	return &mhas, nil
-}
-
-func (f *AutostartFlag) ReconfigureDefaults(template types.AutoStartDefaults) error {
-	ctx := context.TODO()
-	c, err := f.Client()
-	if err != nil {
-		return err
-	}
-
-	mhas, err := f.HostAutoStartManager()
-	if err != nil {
-		return err
-	}
-
-	req := types.ReconfigureAutostart{
-		This: mhas.Reference(),
-		Spec: types.HostAutoStartManagerConfig{
-			Defaults: &template,
-		},
-	}
-
-	_, err = methods.ReconfigureAutostart(ctx, c, &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (f *AutostartFlag) ReconfigureVMs(args []string, template types.AutoStartPowerInfo) error {
-	ctx := context.TODO()
-	c, err := f.Client()
-	if err != nil {
-		return err
-	}
-
-	mhas, err := f.HostAutoStartManager()
-	if err != nil {
-		return err
-	}
-
-	req := types.ReconfigureAutostart{
-		This: mhas.Reference(),
-		Spec: types.HostAutoStartManagerConfig{
-			PowerInfo: make([]types.AutoStartPowerInfo, 0),
-		},
-	}
-
-	vms, err := f.VirtualMachines(args)
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		pi := template
-		pi.Key = vm.Reference()
-		req.Spec.PowerInfo = append(req.Spec.PowerInfo, pi)
-	}
-
-	_, err = methods.ReconfigureAutostart(ctx, c, &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go b/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go
deleted file mode 100644
index a391055a43..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/configure.go
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package autostart
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type configure struct {
-	*AutostartFlag
-
-	types.AutoStartDefaults
-}
-
-func init() {
-	cli.Register("host.autostart.configure", &configure{})
-}
-
-func (cmd *configure) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
-	cmd.AutostartFlag.Register(ctx, f)
-
-	f.Var(flags.NewOptionalBool(&cmd.Enabled), "enabled", "")
-	f.Var(flags.NewInt32(&cmd.StartDelay), "start-delay", "")
-	f.StringVar(&cmd.StopAction, "stop-action", "", "")
-	f.Var(flags.NewInt32(&cmd.StopDelay), "stop-delay", "")
-	f.Var(flags.NewOptionalBool(&cmd.WaitForHeartbeat), "wait-for-heartbeat", "")
-}
-
-func (cmd *configure) Process(ctx context.Context) error {
-	if err := cmd.AutostartFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *configure) Usage() string {
-	return ""
-}
-
-func (cmd *configure) Run(ctx context.Context, f *flag.FlagSet) error {
-	return cmd.ReconfigureDefaults(cmd.AutoStartDefaults)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go
deleted file mode 100644
index 9c66cab1f3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/info.go
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package autostart
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type info struct {
-	cli.Command
-
-	*AutostartFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("host.autostart.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
-	cmd.AutostartFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.AutostartFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return ""
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	mhas, err := cmd.HostAutoStartManager()
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(&infoResult{client, mhas})
-}
-
-type infoResult struct {
-	client *vim25.Client
-	mhas   *mo.HostAutoStartManager
-}
-
-func (r *infoResult) MarshalJSON() ([]byte, error) {
-	return json.Marshal(r.mhas)
-}
-
-// vmPaths resolves the paths for the VMs in the result.
-func (r *infoResult) vmPaths() (map[string]string, error) {
-	ctx := context.TODO()
-	paths := make(map[string]string)
-	for _, info := range r.mhas.Config.PowerInfo {
-		mes, err := mo.Ancestors(ctx, r.client, r.client.ServiceContent.PropertyCollector, info.Key)
-		if err != nil {
-			return nil, err
-		}
-
-		path := ""
-		for _, me := range mes {
-			// Skip root entity in building inventory path.
-			if me.Parent == nil {
-				continue
-			}
-			path += "/" + me.Name
-		}
-
-		paths[info.Key.Value] = path
-	}
-
-	return paths, nil
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	paths, err := r.vmPaths()
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "VM")
-	fmt.Fprintf(tw, "\tStartAction")
-	fmt.Fprintf(tw, "\tStartDelay")
-	fmt.Fprintf(tw, "\tStartOrder")
-	fmt.Fprintf(tw, "\tStopAction")
-	fmt.Fprintf(tw, "\tStopDelay")
-	fmt.Fprintf(tw, "\tWaitForHeartbeat")
-	fmt.Fprintf(tw, "\n")
-
-	for _, info := range r.mhas.Config.PowerInfo {
-		fmt.Fprintf(tw, "%s", paths[info.Key.Value])
-		fmt.Fprintf(tw, "\t%s", info.StartAction)
-		fmt.Fprintf(tw, "\t%d", info.StartDelay)
-		fmt.Fprintf(tw, "\t%d", info.StartOrder)
-		fmt.Fprintf(tw, "\t%s", info.StopAction)
-		fmt.Fprintf(tw, "\t%d", info.StopDelay)
-		fmt.Fprintf(tw, "\t%s", info.WaitForHeartbeat)
-		fmt.Fprintf(tw, "\n")
-	}
-
-	_ = tw.Flush()
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go
deleted file mode 100644
index af120b3380..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/autostart/remove.go
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package autostart
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type remove struct {
-	*AutostartFlag
-}
-
-func init() {
-	cli.Register("host.autostart.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.AutostartFlag, ctx = newAutostartFlag(ctx)
-	cmd.AutostartFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.AutostartFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "VM..."
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	var powerInfo = types.AutoStartPowerInfo{
-		StartAction:      "none",
-		StartDelay:       -1,
-		StartOrder:       -1,
-		StopAction:       "none",
-		StopDelay:        -1,
-		WaitForHeartbeat: types.AutoStartWaitHeartbeatSettingSystemDefault,
-	}
-
-	return cmd.ReconfigureVMs(f.Args(), powerInfo)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go b/installer/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go
deleted file mode 100644
index 8cd543378b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/csr.go
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cert
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type csr struct {
-	*flags.HostSystemFlag
-
-	ip bool
-}
-
-func init() {
-	cli.Register("host.cert.csr", &csr{})
-}
-
-func (cmd *csr) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.ip, "ip", false, "Use IP address as CN")
-}
-
-func (cmd *csr) Description() string {
-	return `Generate a certificate-signing request (CSR) for HOST.`
-}
-
-func (cmd *csr) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *csr) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().CertificateManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	output, err := m.GenerateCertificateSigningRequest(ctx, cmd.ip)
-	if err != nil {
-		return err
-	}
-
-	_, err = fmt.Println(output)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/cert/info.go
deleted file mode 100644
index ffec1ab00f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/info.go
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cert
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type info struct {
-	*flags.HostSystemFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("host.cert.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *info) Description() string {
-	return `Display SSL certificate info for HOST.`
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().CertificateManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	info, err := m.CertificateInfo(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(info)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/install.go b/installer/vendor/github.com/vmware/govmomi/govc/host/cert/install.go
deleted file mode 100644
index 8daea9900a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/cert/install.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package cert
-
-import (
-	"bytes"
-	"context"
-	"flag"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type install struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.cert.import", &install{})
-}
-
-func (cmd *install) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *install) Usage() string {
-	return "FILE"
-}
-
-func (cmd *install) Description() string {
-	return `Install SSL certificate FILE on HOST.
-
-If FILE name is "-", read certificate from stdin.`
-}
-
-func (cmd *install) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *install) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().CertificateManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	var cert string
-
-	name := f.Arg(0)
-	if name == "-" || name == "" {
-		var buf bytes.Buffer
-		if _, err := io.Copy(&buf, os.Stdin); err != nil {
-			return err
-		}
-		cert = buf.String()
-	} else {
-		b, err := ioutil.ReadFile(name)
-		if err != nil {
-			return err
-		}
-		cert = string(b)
-	}
-
-	return m.InstallServerCertificate(ctx, cert)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/date/change.go b/installer/vendor/github.com/vmware/govmomi/govc/host/date/change.go
deleted file mode 100644
index 3287014ad7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/date/change.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package date
-
-import (
-	"context"
-	"flag"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.HostSystemFlag
-
-	types.HostNtpConfig
-	types.HostDateTimeConfig
-	date string
-}
-
-func init() {
-	cli.Register("host.date.change", &change{})
-}
-
-type serverConfig types.HostNtpConfig
-
-func (s *serverConfig) String() string {
-	return strings.Join(s.Server, ",")
-}
-
-func (s *serverConfig) Set(v string) error {
-	s.Server = append(s.Server, v)
-	return nil
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.Var((*serverConfig)(&cmd.HostNtpConfig), "server", "IP or FQDN for NTP server(s)")
-	f.StringVar(&cmd.TimeZone, "tz", "", "Change timezone of the host")
-	f.StringVar(&cmd.date, "date", "", "Update the date/time on the host")
-}
-
-func (cmd *change) Description() string {
-	return `Change date and time for HOST.
-
-Examples:
-  govc host.date.change -date "$(date -u)"
-  govc host.date.change -server time.vmware.com
-  govc host.service enable ntpd
-  govc host.service start ntpd`
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	s, err := host.ConfigManager().DateTimeSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.date != "" {
-		d, err := time.Parse(time.UnixDate, cmd.date)
-		if err != nil {
-			return err
-		}
-		return s.Update(ctx, d)
-	}
-
-	if len(cmd.HostNtpConfig.Server) > 0 {
-		cmd.NtpConfig = &cmd.HostNtpConfig
-	}
-
-	return s.UpdateConfig(ctx, cmd.HostDateTimeConfig)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/date/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/date/info.go
deleted file mode 100644
index 7494e186d1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/date/info.go
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package date
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/host/service"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.HostSystemFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("host.date.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *info) Description() string {
-	return `Display date and time info for HOST.`
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type dateInfo struct {
-	types.HostDateTimeInfo
-	Service *types.HostService
-	Current *time.Time
-}
-
-func (info *dateInfo) servers() string {
-	if len(info.NtpConfig.Server) == 0 {
-		return "None"
-	}
-	return strings.Join(info.NtpConfig.Server, ", ")
-}
-
-func (info *dateInfo) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "Current date and time:\t%s\n", info.Current.Format(time.UnixDate))
-	if info.Service != nil {
-		fmt.Fprintf(tw, "NTP client status:\t%s\n", service.Policy(*info.Service))
-		fmt.Fprintf(tw, "NTP service status:\t%s\n", service.Status(*info.Service))
-	}
-	fmt.Fprintf(tw, "NTP servers:\t%s\n", info.servers())
-
-	return tw.Flush()
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	s, err := host.ConfigManager().DateTimeSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	var hs mo.HostDateTimeSystem
-	if err = s.Properties(ctx, s.Reference(), nil, &hs); err != nil {
-		return nil
-	}
-
-	ss, err := host.ConfigManager().ServiceSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	services, err := ss.Service(ctx)
-	if err != nil {
-		return err
-	}
-
-	res := &dateInfo{HostDateTimeInfo: hs.DateTimeInfo}
-
-	for i, service := range services {
-		if service.Key == "ntpd" {
-			res.Service = &services[i]
-			break
-		}
-	}
-
-	res.Current, err = s.Query(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(res)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/disconnect.go b/installer/vendor/github.com/vmware/govmomi/govc/host/disconnect.go
deleted file mode 100644
index 7a67b5cbcf..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/disconnect.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type disconnect struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.disconnect", &disconnect{})
-}
-
-func (cmd *disconnect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *disconnect) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *disconnect) Description() string {
-	return `Disconnect HOST from vCenter.`
-}
-
-func (cmd *disconnect) Disconnect(ctx context.Context, host *object.HostSystem) error {
-	task, err := host.Disconnect(ctx)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s disconnecting... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *disconnect) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		err = cmd.Disconnect(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go b/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go
deleted file mode 100644
index 60b4a5a4a4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/command_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esxcli
-
-import (
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/internal"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestSystemSettingsAdvancedSetCommand(t *testing.T) {
-	c := NewCommand([]string{"system", "settings", "advanced", "set", "-o", "/Net/GuestIPHack", "-i", "1"})
-
-	tests := []struct {
-		f      func() string
-		expect string
-	}{
-		{c.Name, "set"},
-		{c.Namespace, "system.settings.advanced"},
-		{c.Method, "vim.EsxCLI.system.settings.advanced.set"},
-		{c.Moid, "ha-cli-handler-system-settings-advanced"},
-	}
-
-	for _, test := range tests {
-		actual := test.f()
-		if actual != test.expect {
-			t.Errorf("%s != %s", actual, test.expect)
-		}
-	}
-
-	params := []CommandInfoParam{
-		{
-			CommandInfoItem: CommandInfoItem{Name: "default", DisplayName: "default", Help: "Reset the option to its default value."},
-			Aliases:         []string{"-d", "--default"},
-			Flag:            true,
-		},
-		{
-			CommandInfoItem: CommandInfoItem{Name: "intvalue", DisplayName: "int-value", Help: "If the option is an integer value use this option."},
-			Aliases:         []string{"-i", "--int-value"},
-			Flag:            false,
-		},
-		{
-			CommandInfoItem: CommandInfoItem{Name: "option", DisplayName: "option", Help: "The name of the option to set the value of. Example: \"/Misc/HostName\""},
-			Aliases:         []string{"-o", "--option"},
-			Flag:            false,
-		},
-		{
-			CommandInfoItem: CommandInfoItem{Name: "stringvalue", DisplayName: "string-value", Help: "If the option is a string use this option."},
-			Aliases:         []string{"-s", "--string-value"},
-			Flag:            false,
-		},
-	}
-
-	args, err := c.Parse(params)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expect := []internal.ReflectManagedMethodExecuterSoapArgument{
-		{
-			DynamicData: types.DynamicData{},
-			Name:        "intvalue",
-			Val:         "<intvalue>1</intvalue>",
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Name:        "option",
-			Val:         "<option>/Net/GuestIPHack</option>",
-		},
-	}
-
-	if !reflect.DeepEqual(args, expect) {
-		t.Errorf("%s != %s", args, expect)
-	}
-}
-
-func TestNetworkVmListCommand(t *testing.T) {
-	c := NewCommand([]string{"network", "vm", "list"})
-
-	tests := []struct {
-		f      func() string
-		expect string
-	}{
-		{c.Name, "list"},
-		{c.Namespace, "network.vm"},
-		{c.Method, "vim.EsxCLI.network.vm.list"},
-		{c.Moid, "ha-cli-handler-network-vm"},
-	}
-
-	for _, test := range tests {
-		actual := test.f()
-		if actual != test.expect {
-			t.Errorf("%s != %s", actual, test.expect)
-		}
-	}
-
-	var params []CommandInfoParam
-
-	args, err := c.Parse(params)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expect := []internal.ReflectManagedMethodExecuterSoapArgument{}
-
-	if !reflect.DeepEqual(args, expect) {
-		t.Errorf("%s != %s", args, expect)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml b/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml
deleted file mode 100644
index 087144974c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_list.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="ArrayOfDataObject">
- <DataObject xsi:type="VimEsxCLInetworkvmlistVM">
-  <Name>foo</Name>
-  <Networks>VM Network</Networks>
-  <Networks>dougm</Networks>
-  <NumPorts>2</NumPorts>
-  <WorldID>98842</WorldID>
- </DataObject>
- <DataObject xsi:type="VimEsxCLInetworkvmlistVM">
-  <Name>bar</Name>
-  <Networks>VM Network</Networks>
-  <NumPorts>1</NumPorts>
-  <WorldID>236235</WorldID>
- </DataObject>
-</obj>
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml b/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml
deleted file mode 100644
index b9e3474a79..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/network_vm_port_list.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="ArrayOfDataObject">
- <DataObject xsi:type="VimEsxCLInetworkvmportlistPort">
-  <DVPortID></DVPortID>
-  <IPAddress>192.168.247.149</IPAddress>
-  <MACAddress>00:0c:29:12:b2:cf</MACAddress>
-  <PortID>33554438</PortID>
-  <Portgroup>VM Network</Portgroup>
-  <TeamUplink>vmnic0</TeamUplink>
-  <UplinkPortID>33554434</UplinkPortID>
-  <vSwitch>vSwitch0</vSwitch>
- </DataObject>
-</obj>
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml b/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml
deleted file mode 100644
index 9c1e9462f8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/fixtures/system_hostname_get.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<obj xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="urn:vim25" versionId="5.0" xsi:type="VimEsxCLIsystemhostnamegetFullyQualifiedHostName">
- <DomainName>localdomain</DomainName>
- <FullyQualifiedDomainName>esxbox.localdomain</FullyQualifiedDomainName>
- <HostName>esxbox</HostName>
-</obj>
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go b/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go
deleted file mode 100644
index 2d96ccef2b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/esxcli/response_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esxcli
-
-import (
-	"os"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-func load(name string) *Response {
-	f, err := os.Open(name)
-	if err != nil {
-		panic(err)
-	}
-
-	defer f.Close()
-
-	var b Response
-
-	dec := xml.NewDecoder(f)
-	dec.TypeFunc = types.TypeFunc()
-	if err := dec.Decode(&b); err != nil {
-		panic(err)
-	}
-
-	return &b
-}
-
-func TestSystemHostnameGetResponse(t *testing.T) {
-	res := load("fixtures/system_hostname_get.xml")
-
-	expect := []Values{
-		{
-			"DomainName":               {"localdomain"},
-			"FullyQualifiedDomainName": {"esxbox.localdomain"},
-			"HostName":                 {"esxbox"},
-		},
-	}
-
-	if !reflect.DeepEqual(res.Values, expect) {
-		t.Errorf("%s != %s", res.Values, expect)
-	}
-}
-
-func TestNetworkVmList(t *testing.T) {
-	res := load("fixtures/network_vm_list.xml")
-
-	expect := []Values{
-		{
-			"Name":     {"foo"},
-			"Networks": {"VM Network", "dougm"},
-			"NumPorts": {"2"},
-			"WorldID":  {"98842"},
-		},
-		{
-			"Name":     {"bar"},
-			"Networks": {"VM Network"},
-			"NumPorts": {"1"},
-			"WorldID":  {"236235"},
-		},
-	}
-
-	if !reflect.DeepEqual(res.Values, expect) {
-		t.Errorf("%s != %s", res.Values, expect)
-	}
-}
-
-func TestNetworkVmPortList(t *testing.T) {
-	r := load("fixtures/network_vm_port_list.xml")
-
-	expect := []Values{
-		{
-			"IPAddress":    {"192.168.247.149"},
-			"MACAddress":   {"00:0c:29:12:b2:cf"},
-			"PortID":       {"33554438"},
-			"Portgroup":    {"VM Network"},
-			"TeamUplink":   {"vmnic0"},
-			"UplinkPortID": {"33554434"},
-			"vSwitch":      {"vSwitch0"},
-			"DVPortID":     {""},
-		},
-	}
-
-	if !reflect.DeepEqual(r.Values, expect) {
-		t.Errorf("%s != %s", r.Values, expect)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go b/installer/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go
deleted file mode 100644
index 7492df79d4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/firewall/find.go
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package firewall
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/host/esxcli"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type find struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-
-	enabled bool
-	check   bool
-
-	types.HostFirewallRule
-}
-
-func init() {
-	cli.Register("firewall.ruleset.find", &find{})
-}
-
-func (cmd *find) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.check, "c", true, "Check if esx firewall is enabled")
-	f.BoolVar(&cmd.enabled, "enabled", true, "Find enabled rule sets if true, disabled if false")
-	f.StringVar((*string)(&cmd.Direction), "direction", string(types.HostFirewallRuleDirectionOutbound), "Direction")
-	f.StringVar((*string)(&cmd.PortType), "type", string(types.HostFirewallRulePortTypeDst), "Port type")
-	f.StringVar((*string)(&cmd.Protocol), "proto", string(types.HostFirewallRuleProtocolTcp), "Protocol")
-	f.Var(flags.NewInt32(&cmd.Port), "port", "Port")
-}
-
-func (cmd *find) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *find) Description() string {
-	return `Find firewall rulesets matching the given rule.
-
-For a complete list of rulesets: govc host.esxcli network firewall ruleset list
-For a complete list of rules:    govc host.esxcli network firewall ruleset rule list
-
-Examples:
-  govc firewall.ruleset.find -direction inbound -port 22
-  govc firewall.ruleset.find -direction outbound -port 2377`
-}
-
-func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	fs, err := host.ConfigManager().FirewallSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.check {
-		esxfw, err := esxcli.GetFirewallInfo(host)
-		if err != nil {
-			return err
-		}
-
-		if !esxfw.Enabled {
-			fmt.Fprintln(os.Stderr, "host firewall is disabled")
-		}
-	}
-
-	info, err := fs.Info(ctx)
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() != 0 {
-		// TODO: f.Args() -> types.HostFirewallRulesetIpList
-		return flag.ErrHelp
-	}
-
-	rs := object.HostFirewallRulesetList(info.Ruleset)
-	matched, err := rs.EnabledByRule(cmd.HostFirewallRule, cmd.enabled)
-
-	if err != nil {
-		return err
-	}
-
-	for _, r := range matched {
-		fmt.Println(r.Key)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/info.go
deleted file mode 100644
index d4d97f1c25..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/info.go
+++ /dev/null
@@ -1,163 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	var res infoResult
-	var props []string
-
-	if cmd.OutputFlag.All() {
-		props = nil // Load everything
-	} else {
-		props = []string{"summary"} // Load summary
-	}
-
-	// We could do without the -host flag, leaving it for compat
-	host, err := cmd.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	// Default only if there is a single host
-	if host == nil && f.NArg() == 0 {
-		host, err = cmd.HostSystem()
-		if err != nil {
-			return err
-		}
-	}
-
-	if host != nil {
-		res.objects = append(res.objects, host)
-	} else {
-		res.objects, err = cmd.HostSystems(f.Args())
-		if err != nil {
-			return err
-		}
-	}
-
-	if len(res.objects) != 0 {
-		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
-		for _, o := range res.objects {
-			refs = append(refs, o.Reference())
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &res.HostSystems)
-		if err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	HostSystems []mo.HostSystem
-	objects     []*object.HostSystem
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.HostSystem, len(r.HostSystems))
-	for _, o := range r.HostSystems {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		host := objects[o.Reference()]
-		s := host.Summary
-		h := s.Hardware
-		z := s.QuickStats
-		ncpu := int32(h.NumCpuPkgs * h.NumCpuCores)
-		cpuUsage := 100 * float64(z.OverallCpuUsage) / float64(ncpu*h.CpuMhz)
-		memUsage := 100 * float64(z.OverallMemoryUsage) / float64(h.MemorySize>>20)
-
-		fmt.Fprintf(tw, "Name:\t%s\n", s.Config.Name)
-		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-		fmt.Fprintf(tw, "  Manufacturer:\t%s\n", h.Vendor)
-		fmt.Fprintf(tw, "  Logical CPUs:\t%d CPUs @ %dMHz\n", ncpu, h.CpuMhz)
-		fmt.Fprintf(tw, "  Processor type:\t%s\n", h.CpuModel)
-		fmt.Fprintf(tw, "  CPU usage:\t%d MHz (%.1f%%)\n", z.OverallCpuUsage, cpuUsage)
-		fmt.Fprintf(tw, "  Memory:\t%dMB\n", h.MemorySize/(1024*1024))
-		fmt.Fprintf(tw, "  Memory usage:\t%d MB (%.1f%%)\n", z.OverallMemoryUsage, memUsage)
-		fmt.Fprintf(tw, "  Boot time:\t%s\n", s.Runtime.BootTime)
-		if s.Runtime.InMaintenanceMode {
-			fmt.Fprint(tw, "  State: Maintenance Mode")
-		} else {
-			fmt.Fprintf(tw, "  State:\t%s\n", s.Runtime.ConnectionState)
-		}
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go b/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go
deleted file mode 100644
index 4b7fe9dc73..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/enter.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package maintenance
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type enter struct {
-	*flags.HostSystemFlag
-
-	timeout  int32
-	evacuate bool
-}
-
-func init() {
-	cli.Register("host.maintenance.enter", &enter{})
-}
-
-func (cmd *enter) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.Var(flags.NewInt32(&cmd.timeout), "timeout", "Timeout")
-	f.BoolVar(&cmd.evacuate, "evacuate", false, "Evacuate powered off VMs")
-}
-
-func (cmd *enter) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *enter) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *enter) Description() string {
-	return `Put HOST in maintenance mode.
-
-While this task is running and when the host is in maintenance mode,
-no VMs can be powered on and no provisioning operations can be performed on the host.`
-}
-
-func (cmd *enter) EnterMaintenanceMode(ctx context.Context, host *object.HostSystem) error {
-	task, err := host.EnterMaintenanceMode(ctx, cmd.timeout, cmd.evacuate, nil) // TODO: spec param
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s entering maintenance mode... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *enter) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		err = cmd.EnterMaintenanceMode(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go b/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go
deleted file mode 100644
index 6259033ea4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/maintenance/exit.go
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package maintenance
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type exit struct {
-	*flags.HostSystemFlag
-
-	timeout int32
-}
-
-func init() {
-	cli.Register("host.maintenance.exit", &exit{})
-}
-
-func (cmd *exit) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.Var(flags.NewInt32(&cmd.timeout), "timeout", "Timeout")
-}
-
-func (cmd *exit) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *exit) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *exit) Description() string {
-	return `Take HOST out of maintenance mode.
-
-This blocks if any concurrent running maintenance-only host configurations operations are being performed.
-For example, if VMFS volumes are being upgraded.
-
-The 'timeout' flag is the number of seconds to wait for the exit maintenance mode to succeed.
-If the timeout is less than or equal to zero, there is no timeout.`
-}
-
-func (cmd *exit) ExitMaintenanceMode(ctx context.Context, host *object.HostSystem) error {
-	task, err := host.ExitMaintenanceMode(ctx, cmd.timeout)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s exiting maintenance mode... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *exit) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		err = cmd.ExitMaintenanceMode(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/option/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/host/option/ls.go
deleted file mode 100644
index 9077492f1b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/option/ls.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2016-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package option
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/option"
-)
-
-type ls struct {
-	*option.List
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.option.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.List = &option.List{}
-	cmd.List.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.List.ClientFlag.Register(ctx, f)
-
-	cmd.List.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.List.OutputFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.List.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Description() string {
-	return option.ListDescription + `
-
-Examples:
-  govc host.option.ls
-  govc host.option.ls Config.HostAgent.
-  govc host.option.ls Config.HostAgent.plugins.solo.enableMob`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().OptionManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.Query(ctx, f, m)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/option/set.go b/installer/vendor/github.com/vmware/govmomi/govc/host/option/set.go
deleted file mode 100644
index a347718bf1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/option/set.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2016-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package option
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/option"
-)
-
-type set struct {
-	*option.Set
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.option.set", &set{})
-}
-
-func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.Set = &option.Set{}
-	cmd.Set.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.Set.ClientFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *set) Process(ctx context.Context) error {
-	if err := cmd.Set.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *set) Description() string {
-	return option.SetDescription + `
-
-Examples:
-  govc host.option.set Config.HostAgent.plugins.solo.enableMob true
-  govc host.option.set Config.HostAgent.log.level verbose`
-}
-
-func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().OptionManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.Update(ctx, f, m)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go b/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go
deleted file mode 100644
index 40ccf9121c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/add.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.HostSystemFlag
-
-	spec types.HostPortGroupSpec
-}
-
-func init() {
-	cli.Register("host.portgroup.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.spec.VswitchName, "vswitch", "", "vSwitch Name")
-	f.Var(flags.NewInt32(&cmd.spec.VlanId), "vlan", "VLAN ID")
-}
-
-func (cmd *add) Description() string {
-	return `Add portgroup to HOST.
-
-Examples:
-  govc host.portgroup.add -vswitch vSwitch0 -vlan 3201 bridge`
-}
-
-func (cmd *add) Usage() string {
-	return "NAME"
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	cmd.spec.Name = f.Arg(0)
-
-	return ns.AddPortGroup(ctx, cmd.spec)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go b/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go
deleted file mode 100644
index 75babb532e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/change.go
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.ClientFlag
-	*flags.HostSystemFlag
-
-	types.HostPortGroupSpec
-	types.HostNetworkSecurityPolicy
-}
-
-func init() {
-	cli.Register("host.portgroup.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.VlanId = -1
-	f.Var(flags.NewInt32(&cmd.VlanId), "vlan-id", "VLAN ID")
-	f.StringVar(&cmd.Name, "name", "", "Portgroup name")
-	f.StringVar(&cmd.VswitchName, "vswitch-name", "", "vSwitch name")
-
-	f.Var(flags.NewOptionalBool(&cmd.AllowPromiscuous), "allow-promiscuous", "Allow promiscuous mode")
-	f.Var(flags.NewOptionalBool(&cmd.ForgedTransmits), "forged-transmits", "Allow forged transmits")
-	f.Var(flags.NewOptionalBool(&cmd.MacChanges), "mac-changes", "Allow MAC changes")
-}
-
-func (cmd *change) Description() string {
-	return `Change configuration of HOST portgroup NAME.
-
-Examples:
-  govc host.portgroup.change -allow-promiscuous -forged-transmits -mac-changes "VM Network"
-  govc host.portgroup.change -vswitch-name vSwitch1 "Management Network"`
-}
-
-func (cmd *change) Usage() string {
-	return "NAME"
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	pg, err := networkInfoPortgroup(ctx, cmd.ClientFlag, cmd.HostSystemFlag)
-	if err != nil {
-		return err
-	}
-
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	name := f.Arg(0)
-	var current *types.HostPortGroupSpec
-
-	for _, g := range pg {
-		if g.Spec.Name == name {
-			current = &g.Spec
-			break
-		}
-	}
-
-	if current != nil {
-		if cmd.Name == "" {
-			cmd.Name = current.Name
-		}
-		if cmd.VswitchName == "" {
-			cmd.VswitchName = current.VswitchName
-		}
-		if cmd.VlanId < 0 {
-			cmd.VlanId = current.VlanId
-		}
-	}
-
-	cmd.HostPortGroupSpec.Policy.Security = &cmd.HostNetworkSecurityPolicy
-
-	return ns.UpdatePortGroup(ctx, name, cmd.HostPortGroupSpec)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go
deleted file mode 100644
index e821c3c3c2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/info.go
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/host/vswitch"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.portgroup.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func networkInfoPortgroup(ctx context.Context, c *flags.ClientFlag, h *flags.HostSystemFlag) ([]types.HostPortGroup, error) {
-	client, err := c.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	ns, err := h.HostNetworkSystem()
-	if err != nil {
-		return nil, err
-	}
-
-	var mns mo.HostNetworkSystem
-
-	pc := property.DefaultCollector(client)
-	err = pc.RetrieveOne(ctx, ns.Reference(), []string{"networkInfo.portgroup"}, &mns)
-	if err != nil {
-		return nil, err
-	}
-
-	return mns.NetworkInfo.Portgroup, nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	pg, err := networkInfoPortgroup(ctx, cmd.ClientFlag, cmd.HostSystemFlag)
-	if err != nil {
-		return err
-	}
-
-	r := &infoResult{pg}
-
-	return cmd.WriteResult(r)
-}
-
-type infoResult struct {
-	Portgroup []types.HostPortGroup
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for i, s := range r.Portgroup {
-		if i > 0 {
-			fmt.Fprintln(tw)
-		}
-		fmt.Fprintf(tw, "Name:\t%s\n", s.Spec.Name)
-		fmt.Fprintf(tw, "Virtual switch:\t%s\n", s.Spec.VswitchName)
-		fmt.Fprintf(tw, "VLAN ID:\t%d\n", s.Spec.VlanId)
-		fmt.Fprintf(tw, "Active ports:\t%d\n", len(s.Port))
-		vswitch.HostNetworkPolicy(tw, &s.ComputedPolicy)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go
deleted file mode 100644
index 6249d575f0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/portgroup/remove.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package portgroup
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type remove struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.portgroup.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Description() string {
-	return `Remove portgroup from HOST.
-
-Examples:
-  govc host.portgroup.remove bridge`
-}
-
-func (cmd *remove) Usage() string {
-	return "NAME"
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	return ns.RemovePortGroup(ctx, f.Arg(0))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/reconnect.go b/installer/vendor/github.com/vmware/govmomi/govc/host/reconnect.go
deleted file mode 100644
index f26906c368..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/reconnect.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type reconnect struct {
-	*flags.HostSystemFlag
-	*flags.HostConnectFlag
-
-	types.HostSystemReconnectSpec
-}
-
-func init() {
-	cli.Register("host.reconnect", &reconnect{})
-}
-
-func (cmd *reconnect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.HostConnectFlag, ctx = flags.NewHostConnectFlag(ctx)
-	cmd.HostConnectFlag.Register(ctx, f)
-
-	cmd.HostSystemReconnectSpec.SyncState = types.NewBool(false)
-	f.BoolVar(cmd.HostSystemReconnectSpec.SyncState, "sync-state", false, "Sync state")
-}
-
-func (cmd *reconnect) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostConnectFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *reconnect) Description() string {
-	return `Reconnect HOST to vCenter.
-
-This command can also be used to change connection properties (hostname, fingerprint, username, password),
-without disconnecting the host.`
-}
-
-func (cmd *reconnect) Reconnect(ctx context.Context, host *object.HostSystem) error {
-	task, err := host.Reconnect(ctx, &cmd.HostConnectSpec, &cmd.HostSystemReconnectSpec)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s reconnecting... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *reconnect) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		err = cmd.Reconnect(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/host/remove.go
deleted file mode 100644
index 6c2ef70800..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/remove.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type remove struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "HOST..."
-}
-
-func (cmd *remove) Description() string {
-	return `Remove HOST from vCenter.`
-}
-
-func (cmd *remove) Remove(ctx context.Context, host *object.HostSystem) error {
-	var h mo.HostSystem
-	err := host.Properties(ctx, host.Reference(), []string{"parent"}, &h)
-	if err != nil {
-		return err
-	}
-
-	remove := host.Destroy
-
-	if h.Parent.Type == "ComputeResource" {
-		// Standalone host.  From the docs:
-		// "Invoking remove on a HostSystem of standalone type throws a NotSupported fault.
-		//  A standalone HostSystem can be removeed only by invoking remove on its parent ComputeResource."
-		remove = object.NewComputeResource(host.Client(), *h.Parent).Destroy
-	}
-
-	task, err := remove(ctx)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s removing... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, host := range hosts {
-		err = cmd.Remove(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/service/command.go b/installer/vendor/github.com/vmware/govmomi/govc/host/service/command.go
deleted file mode 100644
index 8290d1391c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/service/command.go
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package service
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type service struct {
-	*flags.ClientFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.service", &service{})
-}
-
-func (cmd *service) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *service) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *service) Usage() string {
-	return "ACTION ID"
-}
-
-func (cmd *service) Description() string {
-	return `Apply host service ACTION to service ID.
-
-Where ACTION is one of: start, stop, restart, status, enable, disable
-
-Examples:
-  govc host.service enable TSM-SSH
-  govc host.service start TSM-SSH`
-}
-
-func (cmd *service) status(ctx context.Context, s *object.HostServiceSystem, id string) (string, error) {
-	services, err := s.Service(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	for _, service := range services {
-		if id == service.Key {
-			return Status(service), nil
-		}
-	}
-
-	return "N/A", nil
-}
-
-func (cmd *service) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	arg := f.Arg(0)
-	id := f.Arg(1)
-
-	s, err := host.ConfigManager().ServiceSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	switch arg {
-	case "start":
-		return s.Start(ctx, id)
-	case "stop":
-		return s.Stop(ctx, id)
-	case "restart":
-		return s.Restart(ctx, id)
-	case "status":
-		ss, err := cmd.status(ctx, s, id)
-		if err != nil {
-			return err
-		}
-		fmt.Println(ss)
-		return nil
-	case "enable":
-		return s.UpdatePolicy(ctx, id, string(types.HostServicePolicyOn))
-	case "disable":
-		return s.UpdatePolicy(ctx, id, string(types.HostServicePolicyOff))
-	}
-
-	return flag.ErrHelp
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/service/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/host/service/ls.go
deleted file mode 100644
index f5a65708ca..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/service/ls.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package service
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.service.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Description() string {
-	return `List HOST services.`
-}
-
-func Status(s types.HostService) string {
-	if s.Running {
-		return "Running"
-	}
-	return "Stopped"
-}
-
-func Policy(s types.HostService) string {
-	switch types.HostServicePolicy(s.Policy) {
-	case types.HostServicePolicyOff:
-		return "Disabled"
-	case types.HostServicePolicyOn:
-		return "Enabled"
-	case types.HostServicePolicyAutomatic:
-		return "Automatic"
-	default:
-		return s.Policy
-	}
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	s, err := host.ConfigManager().ServiceSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	services, err := s.Service(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(optionResult(services))
-}
-
-type optionResult []types.HostService
-
-func (services optionResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "%s\t%s\t%v\t%s\n", "Key", "Policy", "Status", "Label")
-
-	for _, s := range services {
-		fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", s.Key, s.Policy, Status(s), s.Label)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/shutdown.go b/installer/vendor/github.com/vmware/govmomi/govc/host/shutdown.go
deleted file mode 100644
index 97d1b01a1b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/shutdown.go
+++ /dev/null
@@ -1,119 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package host
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type shutdown struct {
-	*flags.HostSystemFlag
-	force  bool
-	reboot bool
-}
-
-func init() {
-	cli.Register("host.shutdown", &shutdown{})
-}
-
-func (cmd *shutdown) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "f", false, "Force shutdown when host is not in maintenance mode")
-	f.BoolVar(&cmd.reboot, "r", false, "Reboot host")
-}
-
-func (cmd *shutdown) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *shutdown) Description() string {
-	return `Shutdown HOST.`
-}
-
-func (cmd *shutdown) Shutdown(ctx context.Context, host *object.HostSystem) error {
-	req := types.ShutdownHost_Task{
-		This:  host.Reference(),
-		Force: cmd.force,
-	}
-
-	res, err := methods.ShutdownHost_Task(ctx, host.Client(), &req)
-	if err != nil {
-		return err
-	}
-
-	task := object.NewTask(host.Client(), res.Returnval)
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s shutdown... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *shutdown) Reboot(ctx context.Context, host *object.HostSystem) error {
-	req := types.RebootHost_Task{
-		This:  host.Reference(),
-		Force: cmd.force,
-	}
-
-	res, err := methods.RebootHost_Task(ctx, host.Client(), &req)
-	if err != nil {
-		return err
-	}
-
-	task := object.NewTask(host.Client(), res.Returnval)
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("%s reboot... ", host.InventoryPath))
-	defer logger.Wait()
-
-	_, err = task.WaitForResult(ctx, logger)
-	return err
-}
-
-func (cmd *shutdown) Run(ctx context.Context, f *flag.FlagSet) error {
-	hosts, err := cmd.HostSystems(f.Args())
-	if err != nil {
-		return err
-	}
-
-	s := cmd.Shutdown
-	if cmd.reboot {
-		s = cmd.Reboot
-	}
-
-	for _, host := range hosts {
-		err = s(ctx, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/storage/info.go
deleted file mode 100644
index 799a055183..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/info.go
+++ /dev/null
@@ -1,236 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package storage
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var infoTypes = []string{"hba", "lun"}
-
-type infoType string
-
-func (t *infoType) Set(s string) error {
-	s = strings.ToLower(s)
-
-	for _, e := range infoTypes {
-		if s == e {
-			*t = infoType(s)
-			return nil
-		}
-	}
-
-	return fmt.Errorf("invalid type")
-}
-
-func (t *infoType) String() string {
-	return string(*t)
-}
-
-func (t *infoType) Result(hss mo.HostStorageSystem) flags.OutputWriter {
-	switch string(*t) {
-	case "hba":
-		return hbaResult(hss)
-	case "lun":
-		return lunResult(hss)
-	default:
-		panic("unsupported")
-	}
-}
-
-type info struct {
-	*flags.HostSystemFlag
-	*flags.OutputFlag
-
-	typ       infoType
-	rescan    bool
-	refresh   bool
-	unclaimed bool
-}
-
-func init() {
-	cli.Register("host.storage.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	err := cmd.typ.Set("lun")
-	if err != nil {
-		panic(err)
-	}
-
-	f.Var(&cmd.typ, "t", fmt.Sprintf("Type (%s)", strings.Join(infoTypes, ",")))
-
-	f.BoolVar(&cmd.rescan, "rescan", false, "Rescan all host bus adapters")
-	f.BoolVar(&cmd.refresh, "refresh", false, "Refresh the storage system provider")
-	f.BoolVar(&cmd.unclaimed, "unclaimed", false, "Only show disks that can be used as new VMFS datastores")
-}
-
-func (cmd *info) Description() string {
-	return `Show HOST storage system information.
-
-Examples:
-  govc find / -type h | xargs -n1 govc host.storage.info -unclaimed -host`
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	ss, err := host.ConfigManager().StorageSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.rescan {
-		err = ss.RescanAllHba(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.refresh {
-		err = ss.Refresh(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	var hss mo.HostStorageSystem
-	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
-	if err != nil {
-		return nil
-	}
-
-	if cmd.unclaimed {
-		ds, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		disks, err := ds.QueryAvailableDisksForVmfs(ctx)
-		if err != nil {
-			return err
-		}
-
-		var luns []types.BaseScsiLun
-		for i := range disks {
-			luns = append(luns, &disks[i])
-		}
-		hss.StorageDeviceInfo.ScsiLun = luns
-	}
-
-	return cmd.WriteResult(cmd.typ.Result(hss))
-}
-
-type hbaResult mo.HostStorageSystem
-
-func (r hbaResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "Device\t")
-	fmt.Fprintf(tw, "PCI\t")
-	fmt.Fprintf(tw, "Driver\t")
-	fmt.Fprintf(tw, "Status\t")
-	fmt.Fprintf(tw, "Model\t")
-	fmt.Fprintf(tw, "\n")
-
-	for _, e := range r.StorageDeviceInfo.HostBusAdapter {
-		hba := e.GetHostHostBusAdapter()
-
-		fmt.Fprintf(tw, "%s\t", hba.Device)
-		fmt.Fprintf(tw, "%s\t", hba.Pci)
-		fmt.Fprintf(tw, "%s\t", hba.Driver)
-		fmt.Fprintf(tw, "%s\t", hba.Status)
-		fmt.Fprintf(tw, "%s\t", hba.Model)
-		fmt.Fprintf(tw, "\n")
-	}
-
-	return tw.Flush()
-}
-
-type lunResult mo.HostStorageSystem
-
-func (r lunResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "Name\t")
-	fmt.Fprintf(tw, "Type\t")
-	fmt.Fprintf(tw, "Capacity\t")
-	fmt.Fprintf(tw, "Model\t")
-	fmt.Fprintf(tw, "\n")
-
-	for _, e := range r.StorageDeviceInfo.ScsiLun {
-		var tags []string
-		var capacity int64
-
-		lun := e.GetScsiLun()
-		if disk, ok := e.(*types.HostScsiDisk); ok {
-			capacity = int64(disk.Capacity.Block) * int64(disk.Capacity.BlockSize)
-			if disk.LocalDisk != nil && *disk.LocalDisk {
-				tags = append(tags, "local")
-			}
-			if disk.Ssd != nil && *disk.Ssd {
-				tags = append(tags, "ssd")
-			}
-		}
-
-		fmt.Fprintf(tw, "%s\t", lun.DeviceName)
-		fmt.Fprintf(tw, "%s\t", lun.DeviceType)
-
-		if capacity == 0 {
-			fmt.Fprintf(tw, "-\t")
-		} else {
-			fmt.Fprintf(tw, "%s\t", units.ByteSize(capacity))
-		}
-
-		fmt.Fprintf(tw, "%s", lun.Model)
-		if len(tags) > 0 {
-			fmt.Fprintf(tw, " (%s)", strings.Join(tags, ","))
-		}
-		fmt.Fprintf(tw, "\n")
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go b/installer/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go
deleted file mode 100644
index badb2a720f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/mark.go
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package storage
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type mark struct {
-	*flags.HostSystemFlag
-
-	ssd   *bool
-	local *bool
-}
-
-func init() {
-	cli.Register("host.storage.mark", &mark{})
-}
-
-func (cmd *mark) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.Var(flags.NewOptionalBool(&cmd.ssd), "ssd", "Mark as SSD")
-	f.Var(flags.NewOptionalBool(&cmd.local), "local", "Mark as local")
-}
-
-func (cmd *mark) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mark) Usage() string {
-	return "DEVICE_PATH"
-}
-
-func (cmd *mark) Description() string {
-	return `Mark device at DEVICE_PATH.`
-}
-
-func (cmd *mark) Mark(ctx context.Context, ss *object.HostStorageSystem, uuid string) error {
-	var err error
-	var task *object.Task
-
-	if cmd.ssd != nil {
-		if *cmd.ssd {
-			task, err = ss.MarkAsSsd(ctx, uuid)
-		} else {
-			task, err = ss.MarkAsNonSsd(ctx, uuid)
-		}
-
-		if err != nil {
-			return err
-		}
-
-		err = task.Wait(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.local != nil {
-		if *cmd.local {
-			task, err = ss.MarkAsLocal(ctx, uuid)
-		} else {
-			task, err = ss.MarkAsNonLocal(ctx, uuid)
-		}
-
-		if err != nil {
-			return err
-		}
-
-		err = task.Wait(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (cmd *mark) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return fmt.Errorf("specify device path")
-	}
-
-	path := f.Args()[0]
-
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	ss, err := host.ConfigManager().StorageSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	var hss mo.HostStorageSystem
-	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
-	if err != nil {
-		return nil
-	}
-
-	for _, e := range hss.StorageDeviceInfo.ScsiLun {
-		disk, ok := e.(*types.HostScsiDisk)
-		if !ok {
-			continue
-		}
-
-		if disk.DevicePath == path {
-			return cmd.Mark(ctx, ss, disk.Uuid)
-		}
-	}
-
-	return fmt.Errorf("%s not found", path)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go b/installer/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go
deleted file mode 100644
index 7ed6e17209..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/storage/partition.go
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package storage
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type partition struct {
-	*flags.HostSystemFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("host.storage.partition", &partition{})
-}
-
-func (cmd *partition) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *partition) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *partition) Usage() string {
-	return "DEVICE_PATH"
-}
-
-func (cmd *partition) Description() string {
-	return `Show partition table for device at DEVICE_PATH.`
-}
-
-func (cmd *partition) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return fmt.Errorf("specify device path")
-	}
-
-	path := f.Args()[0]
-
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	ss, err := host.ConfigManager().StorageSystem(ctx)
-	if err != nil {
-		return err
-	}
-
-	var hss mo.HostStorageSystem
-	err = ss.Properties(ctx, ss.Reference(), nil, &hss)
-	if err != nil {
-		return nil
-	}
-
-	info, err := ss.RetrieveDiskPartitionInfo(ctx, path)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(partitionInfo(*info))
-}
-
-type partitionInfo types.HostDiskPartitionInfo
-
-func (p partitionInfo) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "Table format: %s\n", p.Spec.PartitionFormat)
-	fmt.Fprintf(tw, "Number of sectors: %d\n", p.Spec.TotalSectors)
-	fmt.Fprintf(tw, "\n")
-
-	fmt.Fprintf(tw, "Number\t")
-	fmt.Fprintf(tw, "Start\t")
-	fmt.Fprintf(tw, "End\t")
-	fmt.Fprintf(tw, "Size\t")
-	fmt.Fprintf(tw, "Type\t")
-	fmt.Fprintf(tw, "\n")
-
-	for _, e := range p.Spec.Partition {
-		sectors := e.EndSector - e.StartSector
-
-		fmt.Fprintf(tw, "%d\t", e.Partition)
-		fmt.Fprintf(tw, "%d\t", e.StartSector)
-		fmt.Fprintf(tw, "%d\t", e.EndSector)
-		fmt.Fprintf(tw, "%s\t", units.ByteSize(sectors*512))
-		fmt.Fprintf(tw, "%s\t", e.Type)
-		fmt.Fprintf(tw, "\n")
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go
deleted file mode 100644
index 3b6ed0a1ce..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/info.go
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vnic
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.vnic.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	var mns mo.HostNetworkSystem
-
-	m, err := host.ConfigManager().VirtualNicManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	info, err := m.Info(ctx)
-	if err != nil {
-		return err
-	}
-
-	err = ns.Properties(ctx, ns.Reference(), []string{"networkInfo"}, &mns)
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	type dnet struct {
-		dvp mo.DistributedVirtualPortgroup
-		dvs mo.VmwareDistributedVirtualSwitch
-	}
-
-	dnets := make(map[string]*dnet)
-
-	for _, nic := range mns.NetworkInfo.Vnic {
-		fmt.Fprintf(tw, "Device:\t%s\n", nic.Device)
-
-		if dvp := nic.Spec.DistributedVirtualPort; dvp != nil {
-			dn, ok := dnets[dvp.PortgroupKey]
-
-			if !ok {
-				dn = new(dnet)
-				o := object.NewDistributedVirtualPortgroup(host.Client(), types.ManagedObjectReference{
-					Type:  "DistributedVirtualPortgroup",
-					Value: dvp.PortgroupKey,
-				})
-
-				err = o.Properties(ctx, o.Reference(), []string{"name", "config.distributedVirtualSwitch"}, &dn.dvp)
-				if err != nil {
-					return err
-				}
-
-				err = o.Properties(ctx, *dn.dvp.Config.DistributedVirtualSwitch, []string{"name"}, &dn.dvs)
-				if err != nil {
-					return err
-				}
-
-				dnets[dvp.PortgroupKey] = dn
-			}
-
-			fmt.Fprintf(tw, "Network label:\t%s\n", dn.dvp.Name)
-			fmt.Fprintf(tw, "Switch:\t%s\n", dn.dvs.Name)
-		} else {
-			fmt.Fprintf(tw, "Network label:\t%s\n", nic.Portgroup)
-			for _, pg := range mns.NetworkInfo.Portgroup {
-				if pg.Spec.Name == nic.Portgroup {
-					fmt.Fprintf(tw, "Switch:\t%s\n", pg.Spec.VswitchName)
-					break
-				}
-			}
-		}
-
-		fmt.Fprintf(tw, "IP address:\t%s\n", nic.Spec.Ip.IpAddress)
-		fmt.Fprintf(tw, "TCP/IP stack:\t%s\n", nic.Spec.NetStackInstanceKey)
-
-		var services []string
-		for _, nc := range info.NetConfig {
-			for _, dev := range nc.SelectedVnic {
-				key := nc.NicType + "." + nic.Key
-				if dev == key {
-					services = append(services, nc.NicType)
-				}
-			}
-
-		}
-		fmt.Fprintf(tw, "Enabled services:\t%s\n", strings.Join(services, ", "))
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go b/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go
deleted file mode 100644
index f759ab7ae3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/vnic/service.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vnic
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type service struct {
-	*flags.HostSystemFlag
-
-	Enable bool
-}
-
-func init() {
-	cli.Register("host.vnic.service", &service{})
-}
-
-func (cmd *service) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.Enable, "enable", true, "Enable service")
-}
-
-func (cmd *service) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *service) Usage() string {
-	return "SERVICE DEVICE"
-}
-
-func (cmd *service) Description() string {
-	nicTypes := []string{
-		string(types.HostVirtualNicManagerNicTypeVmotion),
-		string(types.HostVirtualNicManagerNicTypeFaultToleranceLogging),
-		string(types.HostVirtualNicManagerNicTypeVSphereReplication),
-		string(types.HostVirtualNicManagerNicTypeVSphereReplicationNFC),
-		string(types.HostVirtualNicManagerNicTypeManagement),
-		string(types.HostVirtualNicManagerNicTypeVsan),
-		string(types.HostVirtualNicManagerNicTypeVSphereProvisioning),
-	}
-
-	return fmt.Sprintf(`
-Enable or disable service on a virtual nic device.
-
-Where SERVICE is one of: %s
-Where DEVICE is one of: %s
-
-Examples:
-  govc host.vnic.service -host hostname -enable vsan vmk0
-  govc host.vnic.service -host hostname -enable=false vmotion vmk1`,
-		strings.Join(nicTypes, "|"),
-		strings.Join([]string{"vmk0", "vmk1", "..."}, "|"))
-}
-
-func (cmd *service) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	service := f.Arg(0)
-	device := f.Arg(1)
-
-	host, err := cmd.HostSystem()
-	if err != nil {
-		return err
-	}
-
-	m, err := host.ConfigManager().VirtualNicManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	var method func(context.Context, string, string) error
-
-	if cmd.Enable {
-		method = m.SelectVnic
-	} else {
-		method = m.DeselectVnic
-	}
-
-	if method == nil {
-		return flag.ErrHelp
-	}
-
-	return method(ctx, service, device)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go b/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go
deleted file mode 100644
index ebbe5301a0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/add.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vswitch
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.HostSystemFlag
-
-	nic  string
-	spec types.HostVirtualSwitchSpec
-}
-
-func init() {
-	cli.Register("host.vswitch.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.spec.NumPorts = 128 // default
-	f.Var(flags.NewInt32(&cmd.spec.NumPorts), "ports", "Number of ports")
-	f.Var(flags.NewInt32(&cmd.spec.Mtu), "mtu", "MTU")
-	f.StringVar(&cmd.nic, "nic", "", "Bridge nic device")
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "NAME"
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	if cmd.nic != "" {
-		cmd.spec.Bridge = &types.HostVirtualSwitchBondBridge{
-			NicDevice: []string{cmd.nic},
-		}
-	}
-
-	return ns.AddVirtualSwitch(ctx, f.Arg(0), &cmd.spec)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go b/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go
deleted file mode 100644
index f60a77b22d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/info.go
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vswitch
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.vswitch.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	var mns mo.HostNetworkSystem
-
-	pc := property.DefaultCollector(client)
-	err = pc.RetrieveOne(ctx, ns.Reference(), []string{"networkInfo.vswitch"}, &mns)
-	if err != nil {
-		return err
-	}
-
-	r := &infoResult{mns.NetworkInfo.Vswitch}
-
-	return cmd.WriteResult(r)
-}
-
-type infoResult struct {
-	Vswitch []types.HostVirtualSwitch
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for i, s := range r.Vswitch {
-		if i > 0 {
-			fmt.Fprintln(tw)
-		}
-		fmt.Fprintf(tw, "Name:\t%s\n", s.Name)
-		fmt.Fprintf(tw, "Portgroup:\t%s\n", keys("key-vim.host.PortGroup-", s.Portgroup))
-		fmt.Fprintf(tw, "Pnic:\t%s\n", keys("key-vim.host.PhysicalNic-", s.Pnic))
-		fmt.Fprintf(tw, "MTU:\t%d\n", s.Mtu)
-		fmt.Fprintf(tw, "Ports:\t%d\n", s.NumPorts)
-		fmt.Fprintf(tw, "Ports Available:\t%d\n", s.NumPortsAvailable)
-		HostNetworkPolicy(tw, s.Spec.Policy)
-	}
-
-	return tw.Flush()
-}
-
-func keys(key string, vals []string) string {
-	for i, val := range vals {
-		vals[i] = strings.TrimPrefix(val, key)
-	}
-	return strings.Join(vals, ", ")
-}
-
-func enabled(b *bool) string {
-	if b != nil && *b {
-		return "Yes"
-	}
-	return "No"
-}
-
-func HostNetworkPolicy(w io.Writer, p *types.HostNetworkPolicy) {
-	if p == nil || p.Security == nil {
-		return // e.g. Workstation
-	}
-	fmt.Fprintf(w, "Allow promiscuous mode:\t%s\n", enabled(p.Security.AllowPromiscuous))
-	fmt.Fprintf(w, "Allow forged transmits:\t%s\n", enabled(p.Security.ForgedTransmits))
-	fmt.Fprintf(w, "Allow MAC changes:\t%s\n", enabled(p.Security.MacChanges))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go
deleted file mode 100644
index 0810670074..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/host/vswitch/remove.go
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vswitch
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type remove struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("host.vswitch.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "NAME"
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	ns, err := cmd.HostNetworkSystem()
-	if err != nil {
-		return err
-	}
-
-	return ns.RemoveVirtualSwitch(ctx, f.Arg(0))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/archive.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/archive.go
deleted file mode 100644
index 1ef7d11803..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/archive.go
+++ /dev/null
@@ -1,186 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"archive/tar"
-	"bytes"
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-// ArchiveFlag doesn't register any flags;
-// only encapsulates some common archive related functionality.
-type ArchiveFlag struct {
-	Archive
-}
-
-func newArchiveFlag(ctx context.Context) (*ArchiveFlag, context.Context) {
-	return &ArchiveFlag{}, ctx
-}
-
-func (f *ArchiveFlag) Register(ctx context.Context, fs *flag.FlagSet) {
-}
-
-func (f *ArchiveFlag) Process(ctx context.Context) error {
-	return nil
-}
-
-func (f *ArchiveFlag) ReadOvf(fpath string) ([]byte, error) {
-	r, _, err := f.Archive.Open(fpath)
-	if err != nil {
-		return nil, err
-	}
-	defer r.Close()
-
-	return ioutil.ReadAll(r)
-}
-
-func (f *ArchiveFlag) ReadEnvelope(data []byte) (*ovf.Envelope, error) {
-	r := bytes.NewReader(data)
-
-	e, err := ovf.Unmarshal(r)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
-	}
-
-	return e, nil
-}
-
-type Archive interface {
-	Open(string) (io.ReadCloser, int64, error)
-}
-
-type TapeArchive struct {
-	path string
-	Opener
-}
-
-type TapeArchiveEntry struct {
-	io.Reader
-	f io.Closer
-}
-
-func (t *TapeArchiveEntry) Close() error {
-	return t.f.Close()
-}
-
-func (t *TapeArchive) Open(name string) (io.ReadCloser, int64, error) {
-	f, _, err := t.OpenFile(t.path)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	r := tar.NewReader(f)
-
-	for {
-		h, err := r.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return nil, 0, err
-		}
-
-		matched, err := path.Match(name, path.Base(h.Name))
-		if err != nil {
-			return nil, 0, err
-		}
-
-		if matched {
-			return &TapeArchiveEntry{r, f}, h.Size, nil
-		}
-	}
-
-	_ = f.Close()
-
-	return nil, 0, os.ErrNotExist
-}
-
-type FileArchive struct {
-	path string
-	Opener
-}
-
-func (t *FileArchive) Open(name string) (io.ReadCloser, int64, error) {
-	fpath := name
-	if name != t.path {
-		index := strings.LastIndex(t.path, "/")
-		if index != -1 {
-			fpath = t.path[:index] + "/" + name
-		}
-	}
-
-	return t.OpenFile(fpath)
-}
-
-type Opener struct {
-	*vim25.Client
-}
-
-func isRemotePath(path string) bool {
-	if strings.HasPrefix(path, "http://") || strings.HasPrefix(path, "https://") {
-		return true
-	}
-	return false
-}
-
-func (o Opener) OpenLocal(path string) (io.ReadCloser, int64, error) {
-	f, err := os.Open(path)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	s, err := f.Stat()
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return f, s.Size(), nil
-}
-
-func (o Opener) OpenFile(path string) (io.ReadCloser, int64, error) {
-	if isRemotePath(path) {
-		return o.OpenRemote(path)
-	}
-	return o.OpenLocal(path)
-}
-
-func (o Opener) OpenRemote(link string) (io.ReadCloser, int64, error) {
-	if o.Client == nil {
-		return nil, 0, errors.New("remote path not supported")
-	}
-
-	u, err := url.Parse(link)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return o.Download(u, &soap.DefaultDownload)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/importable.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/importable.go
deleted file mode 100644
index 14e31670b0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/importable.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"fmt"
-	"path"
-)
-
-type importable struct {
-	localPath  string
-	remotePath string
-}
-
-func (i importable) Ext() string {
-	return path.Ext(i.localPath)
-}
-
-func (i importable) Base() string {
-	return path.Base(i.localPath)
-}
-
-func (i importable) BaseClean() string {
-	b := i.Base()
-	e := i.Ext()
-	return b[:len(b)-len(e)]
-}
-
-func (i importable) RemoteSrcVMDK() string {
-	file := fmt.Sprintf("%s-src.vmdk", i.BaseClean())
-	return i.toRemotePath(file)
-}
-
-func (i importable) RemoteDstVMDK() string {
-	file := fmt.Sprintf("%s.vmdk", i.BaseClean())
-	return i.toRemotePath(file)
-}
-
-func (i importable) toRemotePath(p string) string {
-	if i.remotePath == "" {
-		return p
-	}
-
-	return path.Join(i.remotePath, p)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/options.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/options.go
deleted file mode 100644
index 231bb8d097..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/options.go
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"os"
-
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Property struct {
-	types.KeyValue
-	Spec *ovf.Property `json:",omitempty"`
-}
-
-type Network struct {
-	Name    string
-	Network string
-}
-
-type Options struct {
-	AllDeploymentOptions []string `json:",omitempty"`
-	Deployment           string   `json:",omitempty"`
-
-	AllDiskProvisioningOptions []string `json:",omitempty"`
-	DiskProvisioning           string
-
-	AllIPAllocationPolicyOptions []string `json:",omitempty"`
-	IPAllocationPolicy           string
-
-	AllIPProtocolOptions []string `json:",omitempty"`
-	IPProtocol           string
-
-	PropertyMapping []Property `json:",omitempty"`
-
-	NetworkMapping []Network `json:",omitempty"`
-
-	Annotation string `json:",omitempty"`
-
-	PowerOn      bool
-	InjectOvfEnv bool
-	WaitForIP    bool
-	Name         *string
-}
-
-type OptionsFlag struct {
-	Options Options
-
-	path string
-}
-
-func newOptionsFlag(ctx context.Context) (*OptionsFlag, context.Context) {
-	return &OptionsFlag{}, ctx
-}
-
-func (flag *OptionsFlag) Register(ctx context.Context, f *flag.FlagSet) {
-	f.StringVar(&flag.path, "options", "", "Options spec file path for VM deployment")
-}
-
-func (flag *OptionsFlag) Process(ctx context.Context) error {
-	if len(flag.path) == 0 {
-		return nil
-	}
-
-	var err error
-	in := os.Stdin
-
-	if flag.path != "-" {
-		in, err = os.Open(flag.path)
-		if err != nil {
-			return err
-		}
-		defer in.Close()
-	}
-
-	return json.NewDecoder(in).Decode(&flag.Options)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/ova.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/ova.go
deleted file mode 100644
index 5249f1b3b8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/ova.go
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ova struct {
-	*ovfx
-}
-
-func init() {
-	cli.Register("import.ova", &ova{&ovfx{}})
-}
-
-func (cmd *ova) Usage() string {
-	return "PATH_TO_OVA"
-}
-
-func (cmd *ova) Run(ctx context.Context, f *flag.FlagSet) error {
-	fpath, err := cmd.Prepare(f)
-	if err != nil {
-		return err
-	}
-
-	archive := &TapeArchive{path: fpath}
-	archive.Client = cmd.Client
-
-	cmd.Archive = archive
-
-	moref, err := cmd.Import(fpath)
-	if err != nil {
-		return err
-	}
-
-	vm := object.NewVirtualMachine(cmd.Client, *moref)
-	return cmd.Deploy(vm)
-}
-
-func (cmd *ova) Import(fpath string) (*types.ManagedObjectReference, error) {
-	ovf := "*.ovf"
-	return cmd.ovfx.Import(ovf)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/ovf.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
deleted file mode 100644
index 96f3f68dfb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/ovf.go
+++ /dev/null
@@ -1,417 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"path"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/nfc"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ovfx struct {
-	*flags.DatastoreFlag
-	*flags.HostSystemFlag
-	*flags.OutputFlag
-	*flags.ResourcePoolFlag
-	*flags.FolderFlag
-
-	*ArchiveFlag
-	*OptionsFlag
-
-	Name string
-
-	Client       *vim25.Client
-	Datacenter   *object.Datacenter
-	Datastore    *object.Datastore
-	ResourcePool *object.ResourcePool
-}
-
-func init() {
-	cli.Register("import.ovf", &ovfx{})
-}
-
-func (cmd *ovfx) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	cmd.ArchiveFlag, ctx = newArchiveFlag(ctx)
-	cmd.ArchiveFlag.Register(ctx, f)
-	cmd.OptionsFlag, ctx = newOptionsFlag(ctx)
-	cmd.OptionsFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.Name, "name", "", "Name to use for new entity")
-}
-
-func (cmd *ovfx) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ArchiveFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OptionsFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ovfx) Usage() string {
-	return "PATH_TO_OVF"
-}
-
-func (cmd *ovfx) Run(ctx context.Context, f *flag.FlagSet) error {
-	fpath, err := cmd.Prepare(f)
-	if err != nil {
-		return err
-	}
-
-	archive := &FileArchive{path: fpath}
-	archive.Client = cmd.Client
-
-	cmd.Archive = archive
-
-	moref, err := cmd.Import(fpath)
-	if err != nil {
-		return err
-	}
-
-	vm := object.NewVirtualMachine(cmd.Client, *moref)
-	return cmd.Deploy(vm)
-}
-
-func (cmd *ovfx) Prepare(f *flag.FlagSet) (string, error) {
-	var err error
-
-	args := f.Args()
-	if len(args) != 1 {
-		return "", errors.New("no file specified")
-	}
-
-	cmd.Client, err = cmd.DatastoreFlag.Client()
-	if err != nil {
-		return "", err
-	}
-
-	cmd.Datacenter, err = cmd.DatastoreFlag.Datacenter()
-	if err != nil {
-		return "", err
-	}
-
-	cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
-	if err != nil {
-		return "", err
-	}
-
-	cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool()
-	if err != nil {
-		return "", err
-	}
-
-	return f.Arg(0), nil
-}
-
-func (cmd *ovfx) Deploy(vm *object.VirtualMachine) error {
-	if err := cmd.InjectOvfEnv(vm); err != nil {
-		return err
-	}
-
-	if err := cmd.PowerOn(vm); err != nil {
-		return err
-	}
-
-	if err := cmd.WaitForIP(vm); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *ovfx) Map(op []Property) (p []types.KeyValue) {
-	for _, v := range op {
-		p = append(p, v.KeyValue)
-	}
-
-	return
-}
-
-func (cmd *ovfx) NetworkMap(e *ovf.Envelope) (p []types.OvfNetworkMapping) {
-	ctx := context.TODO()
-	finder, err := cmd.DatastoreFlag.Finder()
-	if err != nil {
-		return
-	}
-
-	networks := map[string]string{}
-
-	if e.Network != nil {
-		for _, net := range e.Network.Networks {
-			networks[net.Name] = net.Name
-		}
-	}
-
-	for _, net := range cmd.Options.NetworkMapping {
-		networks[net.Name] = net.Network
-	}
-
-	for src, dst := range networks {
-		if net, err := finder.Network(ctx, dst); err == nil {
-			p = append(p, types.OvfNetworkMapping{
-				Name:    src,
-				Network: net.Reference(),
-			})
-		}
-	}
-	return
-}
-
-func (cmd *ovfx) Import(fpath string) (*types.ManagedObjectReference, error) {
-	ctx := context.TODO()
-	o, err := cmd.ReadOvf(fpath)
-	if err != nil {
-		return nil, err
-	}
-
-	e, err := cmd.ReadEnvelope(o)
-	if err != nil {
-		return nil, fmt.Errorf("failed to parse ovf: %s", err.Error())
-	}
-
-	name := "Govc Virtual Appliance"
-	if e.VirtualSystem != nil {
-		name = e.VirtualSystem.ID
-		if e.VirtualSystem.Name != nil {
-			name = *e.VirtualSystem.Name
-		}
-	}
-
-	// Override name from options if specified
-	if cmd.Options.Name != nil {
-		name = *cmd.Options.Name
-	}
-
-	// Override name from arguments if specified
-	if cmd.Name != "" {
-		name = cmd.Name
-	}
-
-	cisp := types.OvfCreateImportSpecParams{
-		DiskProvisioning:   cmd.Options.DiskProvisioning,
-		EntityName:         name,
-		IpAllocationPolicy: cmd.Options.IPAllocationPolicy,
-		IpProtocol:         cmd.Options.IPProtocol,
-		OvfManagerCommonParams: types.OvfManagerCommonParams{
-			DeploymentOption: cmd.Options.Deployment,
-			Locale:           "US"},
-		PropertyMapping: cmd.Map(cmd.Options.PropertyMapping),
-		NetworkMapping:  cmd.NetworkMap(e),
-	}
-
-	m := ovf.NewManager(cmd.Client)
-	spec, err := m.CreateImportSpec(ctx, string(o), cmd.ResourcePool, cmd.Datastore, cisp)
-	if err != nil {
-		return nil, err
-	}
-	if spec.Error != nil {
-		return nil, errors.New(spec.Error[0].LocalizedMessage)
-	}
-	if spec.Warning != nil {
-		for _, w := range spec.Warning {
-			_, _ = cmd.Log(fmt.Sprintf("Warning: %s\n", w.LocalizedMessage))
-		}
-	}
-
-	if cmd.Options.Annotation != "" {
-		switch s := spec.ImportSpec.(type) {
-		case *types.VirtualMachineImportSpec:
-			s.ConfigSpec.Annotation = cmd.Options.Annotation
-		case *types.VirtualAppImportSpec:
-			s.VAppConfigSpec.Annotation = cmd.Options.Annotation
-		}
-	}
-
-	var host *object.HostSystem
-	if cmd.SearchFlag.IsSet() {
-		if host, err = cmd.HostSystem(); err != nil {
-			return nil, err
-		}
-	}
-
-	folder, err := cmd.FolderOrDefault("vm")
-	if err != nil {
-		return nil, err
-	}
-
-	lease, err := cmd.ResourcePool.ImportVApp(ctx, spec.ImportSpec, folder, host)
-	if err != nil {
-		return nil, err
-	}
-
-	info, err := lease.Wait(ctx, spec.FileItem)
-	if err != nil {
-		return nil, err
-	}
-
-	u := lease.StartUpdater(ctx, info)
-	defer u.Done()
-
-	for _, i := range info.Items {
-		err = cmd.Upload(ctx, lease, i)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &info.Entity, lease.Complete(ctx)
-}
-
-func (cmd *ovfx) Upload(ctx context.Context, lease *nfc.Lease, item nfc.FileItem) error {
-	file := item.Path
-
-	f, size, err := cmd.Open(file)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("Uploading %s... ", path.Base(file)))
-	defer logger.Wait()
-
-	opts := soap.Upload{
-		ContentLength: size,
-		Progress:      logger,
-	}
-
-	return lease.Upload(ctx, item, f, opts)
-}
-
-func (cmd *ovfx) PowerOn(vm *object.VirtualMachine) error {
-	ctx := context.TODO()
-	if !cmd.Options.PowerOn {
-		return nil
-	}
-
-	cmd.Log("Powering on VM...\n")
-
-	task, err := vm.PowerOn(ctx)
-	if err != nil {
-		return err
-	}
-
-	if _, err = task.WaitForResult(ctx, nil); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *ovfx) InjectOvfEnv(vm *object.VirtualMachine) error {
-	if !cmd.Options.InjectOvfEnv {
-		return nil
-	}
-
-	cmd.Log("Injecting OVF environment...\n")
-
-	var opts []types.BaseOptionValue
-
-	a := cmd.Client.ServiceContent.About
-
-	// build up Environment in order to marshal to xml
-	var props []ovf.EnvProperty
-	for _, p := range cmd.Options.PropertyMapping {
-		props = append(props, ovf.EnvProperty{
-			Key:   p.Key,
-			Value: p.Value,
-		})
-	}
-
-	env := ovf.Env{
-		EsxID: vm.Reference().Value,
-		Platform: &ovf.PlatformSection{
-			Kind:    a.Name,
-			Version: a.Version,
-			Vendor:  a.Vendor,
-			Locale:  "US",
-		},
-		Property: &ovf.PropertySection{
-			Properties: props,
-		},
-	}
-
-	opts = append(opts, &types.OptionValue{
-		Key:   "guestinfo.ovfEnv",
-		Value: env.MarshalManual(),
-	})
-
-	ctx := context.Background()
-
-	task, err := vm.Reconfigure(ctx, types.VirtualMachineConfigSpec{
-		ExtraConfig: opts,
-	})
-
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
-
-func (cmd *ovfx) WaitForIP(vm *object.VirtualMachine) error {
-	ctx := context.TODO()
-	if !cmd.Options.PowerOn || !cmd.Options.WaitForIP {
-		return nil
-	}
-
-	cmd.Log("Waiting for IP address...\n")
-	ip, err := vm.WaitForIP(ctx)
-	if err != nil {
-		return err
-	}
-
-	cmd.Log(fmt.Sprintf("Received IP address: %s\n", ip))
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/spec.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/spec.go
deleted file mode 100644
index eecfeae907..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/spec.go
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"path"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var (
-	allDiskProvisioningOptions   = []string{"thin", "monolithicSparse", "monolithicFlat", "twoGbMaxExtentSparse", "twoGbMaxExtentFlat", "seSparse", "eagerZeroedThick", "thick", "sparse", "flat"}
-	allIPAllocationPolicyOptions = []string{"dhcpPolicy", "transientPolicy", "fixedPolicy", "fixedAllocatedPolicy"}
-	allIPProtocolOptions         = []string{"IPv4", "IPv6"}
-)
-
-type spec struct {
-	*ArchiveFlag
-
-	verbose bool
-}
-
-func init() {
-	cli.Register("import.spec", &spec{})
-}
-
-func (cmd *spec) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ArchiveFlag, ctx = newArchiveFlag(ctx)
-	cmd.ArchiveFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.verbose, "verbose", false, "Verbose spec output")
-}
-
-func (cmd *spec) Process(ctx context.Context) error {
-	if err := cmd.ArchiveFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *spec) Usage() string {
-	return "PATH_TO_OVF_OR_OVA"
-}
-
-func (cmd *spec) Run(ctx context.Context, f *flag.FlagSet) error {
-	fpath := ""
-	args := f.Args()
-	if len(args) == 1 {
-		fpath = f.Arg(0)
-	}
-
-	if len(fpath) > 0 {
-		switch path.Ext(fpath) {
-		case ".ovf":
-			cmd.Archive = &FileArchive{path: fpath}
-		case "", ".ova":
-			cmd.Archive = &TapeArchive{path: fpath}
-			fpath = "*.ovf"
-		default:
-			return fmt.Errorf("invalid file extension %s", path.Ext(fpath))
-		}
-	}
-
-	return cmd.Spec(fpath)
-}
-
-func (cmd *spec) Map(e *ovf.Envelope) (res []Property) {
-	if e == nil || e.VirtualSystem == nil {
-		return nil
-	}
-
-	for _, p := range e.VirtualSystem.Product {
-		for i, v := range p.Property {
-			if v.UserConfigurable == nil || !*v.UserConfigurable {
-				continue
-			}
-
-			d := ""
-			if v.Default != nil {
-				d = *v.Default
-			}
-
-			// vSphere only accept True/False as boolean values for some reason
-			if v.Type == "boolean" {
-				d = strings.Title(d)
-			}
-
-			// From OVF spec, section 9.5.1:
-			// key-value-env = [class-value "."] key-value-prod ["." instance-value]
-			k := v.Key
-			if p.Class != nil {
-				k = fmt.Sprintf("%s.%s", *p.Class, k)
-			}
-			if p.Instance != nil {
-				k = fmt.Sprintf("%s.%s", k, *p.Instance)
-			}
-
-			np := Property{KeyValue: types.KeyValue{Key: k, Value: d}}
-			if cmd.verbose {
-				np.Spec = &p.Property[i]
-			}
-
-			res = append(res, np)
-		}
-	}
-
-	return
-}
-
-func (cmd *spec) Spec(fpath string) error {
-	d, err := cmd.ReadOvf(fpath)
-	if err != nil {
-		return err
-	}
-
-	e, err := cmd.ReadEnvelope(d)
-	if err != nil {
-		return err
-	}
-
-	var deploymentOptions []string
-	if e.DeploymentOption != nil && e.DeploymentOption.Configuration != nil {
-		// add default first
-		for _, c := range e.DeploymentOption.Configuration {
-			if c.Default != nil && *c.Default {
-				deploymentOptions = append(deploymentOptions, c.ID)
-			}
-		}
-
-		for _, c := range e.DeploymentOption.Configuration {
-			if c.Default == nil || !*c.Default {
-				deploymentOptions = append(deploymentOptions, c.ID)
-			}
-		}
-	}
-
-	o := Options{
-		DiskProvisioning:   allDiskProvisioningOptions[0],
-		IPAllocationPolicy: allIPAllocationPolicyOptions[0],
-		IPProtocol:         allIPProtocolOptions[0],
-		PowerOn:            false,
-		WaitForIP:          false,
-		InjectOvfEnv:       false,
-		PropertyMapping:    cmd.Map(e),
-	}
-
-	if deploymentOptions != nil {
-		o.Deployment = deploymentOptions[0]
-	}
-
-	if e.VirtualSystem != nil && e.VirtualSystem.Annotation != nil {
-		for _, a := range e.VirtualSystem.Annotation {
-			o.Annotation += a.Annotation
-		}
-	}
-
-	if e.Network != nil {
-		for _, net := range e.Network.Networks {
-			o.NetworkMapping = append(o.NetworkMapping, Network{net.Name, ""})
-		}
-	}
-
-	if cmd.verbose {
-		if deploymentOptions != nil {
-			o.AllDeploymentOptions = deploymentOptions
-		}
-		o.AllDiskProvisioningOptions = allDiskProvisioningOptions
-		o.AllIPAllocationPolicyOptions = allIPAllocationPolicyOptions
-		o.AllIPProtocolOptions = allIPProtocolOptions
-	}
-
-	j, err := json.Marshal(&o)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println(string(j))
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go b/installer/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go
deleted file mode 100644
index 6e0ac5f992..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/importx/vmdk.go
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package importx
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"path"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vmdk"
-)
-
-type disk struct {
-	*flags.DatastoreFlag
-	*flags.ResourcePoolFlag
-	*flags.FolderFlag
-	*flags.OutputFlag
-
-	force bool
-}
-
-func init() {
-	cli.Register("import.vmdk", &disk{})
-}
-
-func (cmd *disk) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "force", false, "Overwrite existing disk")
-}
-
-func (cmd *disk) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *disk) Usage() string {
-	return "PATH_TO_VMDK [REMOTE_DIRECTORY]"
-}
-
-func (cmd *disk) Run(ctx context.Context, f *flag.FlagSet) error {
-	args := f.Args()
-	if len(args) < 1 {
-		return errors.New("no file to import")
-	}
-
-	src := f.Arg(0)
-
-	c, err := cmd.DatastoreFlag.Client()
-	if err != nil {
-		return err
-	}
-
-	dc, err := cmd.DatastoreFlag.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	ds, err := cmd.DatastoreFlag.Datastore()
-	if err != nil {
-		return err
-	}
-
-	pool, err := cmd.ResourcePoolFlag.ResourcePool()
-	if err != nil {
-		return err
-	}
-
-	folder, err := cmd.FolderOrDefault("vm")
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("Uploading %s... ", path.Base(src)))
-	defer logger.Wait()
-
-	p := vmdk.ImportParams{
-		Path:       f.Arg(1),
-		Logger:     logger,
-		Type:       "", // TODO: flag
-		Force:      cmd.force,
-		Datacenter: dc,
-		Pool:       pool,
-		Folder:     folder,
-	}
-
-	err = vmdk.Import(ctx, c, src, ds, p)
-	if err != nil && err == vmdk.ErrInvalidFormat {
-		return fmt.Errorf(`%s
-The vmdk can be converted using one of:
-  vmware-vdiskmanager -t 5 -r '%s' new.vmdk
-  qemu-img convert -O vmdk -o subformat=streamOptimized '%s' new.vmdk`, err, src, src)
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/add.go b/installer/vendor/github.com/vmware/govmomi/govc/license/add.go
deleted file mode 100644
index 97af99523d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/add.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type add struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("license.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Usage() string {
-	return "KEY..."
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := license.NewManager(client)
-
-	// From the vSphere 5.5 documentation:
-	//
-	//     To specify the edition type and any optional functions, use
-	//     updateLicense for ESX Server and addLicense follow by
-	//     LicenseAssingmentManager.updateAssignedLicense for VirtualCenter.
-	//
-	var addFunc func(ctx context.Context, key string, labels map[string]string) (types.LicenseManagerLicenseInfo, error)
-	switch t := client.ServiceContent.About.ApiType; t {
-	case "HostAgent":
-		addFunc = m.Update
-	case "VirtualCenter":
-		addFunc = m.Add
-	default:
-		return fmt.Errorf("unsupported ApiType: %s", t)
-	}
-
-	result := make(licenseOutput, 0)
-	for _, v := range f.Args() {
-		license, err := addFunc(ctx, v, nil)
-		if err != nil {
-			return err
-		}
-
-		result = append(result, license)
-	}
-
-	return cmd.WriteResult(licenseOutput(result))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/assign.go b/installer/vendor/github.com/vmware/govmomi/govc/license/assign.go
deleted file mode 100644
index d8b064b662..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/assign.go
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type assign struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.HostSystemFlag
-
-	name   string
-	remove bool
-}
-
-func init() {
-	cli.Register("license.assign", &assign{})
-}
-
-func (cmd *assign) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Display name")
-	f.BoolVar(&cmd.remove, "remove", false, "Remove assignment")
-}
-
-func (cmd *assign) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *assign) Usage() string {
-	return "KEY"
-}
-
-func (cmd *assign) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	key := f.Arg(0)
-
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := license.NewManager(client).AssignmentManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	host, err := cmd.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	var id string
-
-	if host == nil {
-		// Default to vCenter UUID
-		id = client.ServiceContent.About.InstanceUuid
-	} else {
-		id = host.Reference().Value
-	}
-
-	if cmd.remove {
-		return m.Remove(ctx, id)
-	}
-
-	info, err := m.Update(ctx, id, key, cmd.name)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(licenseOutput([]types.LicenseManagerLicenseInfo{*info}))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/assigned.go b/installer/vendor/github.com/vmware/govmomi/govc/license/assigned.go
deleted file mode 100644
index 9546ca5837..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/assigned.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type assigned struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-
-	id string
-}
-
-func init() {
-	cli.Register("license.assigned.ls", &assigned{})
-}
-
-func (cmd *assigned) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.id, "id", "", "Entity ID")
-}
-
-func (cmd *assigned) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *assigned) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m, err := license.NewManager(client).AssignmentManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	assigned, err := m.QueryAssigned(ctx, cmd.id)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(assignedOutput(assigned))
-}
-
-type assignedOutput []types.LicenseAssignmentManagerLicenseAssignment
-
-func (res assignedOutput) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 4, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Id:\tScope:\tName:\tLicense:\n")
-	for _, v := range res {
-		fmt.Fprintf(tw, "%s\t", v.EntityId)
-		fmt.Fprintf(tw, "%s\t", v.Scope)
-		fmt.Fprintf(tw, "%s\t", v.EntityDisplayName)
-		fmt.Fprintf(tw, "%s\t", v.AssignedLicense.LicenseKey)
-		fmt.Fprintf(tw, "\n")
-	}
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/decode.go b/installer/vendor/github.com/vmware/govmomi/govc/license/decode.go
deleted file mode 100644
index 4cccc5be89..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/decode.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-)
-
-type decode struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-
-	feature string
-}
-
-func init() {
-	cli.Register("license.decode", &decode{})
-}
-
-func (cmd *decode) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.feature, "feature", "", featureUsage)
-}
-
-func (cmd *decode) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *decode) Usage() string {
-	return "KEY..."
-}
-
-func (cmd *decode) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	var result license.InfoList
-	m := license.NewManager(client)
-	for _, v := range f.Args() {
-		license, err := m.Decode(ctx, v)
-		if err != nil {
-			return err
-		}
-
-		result = append(result, license)
-	}
-
-	if cmd.feature != "" {
-		result = result.WithFeature(cmd.feature)
-	}
-
-	return cmd.WriteResult(licenseOutput(result))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/license/ls.go
deleted file mode 100644
index 8ee1e08fc5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/ls.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-)
-
-var featureUsage = "List licenses with given feature"
-
-type ls struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-
-	feature string
-}
-
-func init() {
-	cli.Register("license.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.feature, "feature", "", featureUsage)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := license.NewManager(client)
-	result, err := m.List(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.feature != "" {
-		result = result.WithFeature(cmd.feature)
-	}
-
-	return cmd.WriteResult(licenseOutput(result))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/output.go b/installer/vendor/github.com/vmware/govmomi/govc/license/output.go
deleted file mode 100644
index e4cfe42a5f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/output.go
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type licenseOutput []types.LicenseManagerLicenseInfo
-
-func (res licenseOutput) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 4, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "Key:\tEdition:\tUsed:\tTotal:\n")
-	for _, v := range res {
-		fmt.Fprintf(tw, "%s\t", v.LicenseKey)
-		fmt.Fprintf(tw, "%s\t", v.EditionKey)
-		fmt.Fprintf(tw, "%d\t", v.Used)
-		fmt.Fprintf(tw, "%d\t", v.Total)
-		fmt.Fprintf(tw, "\n")
-	}
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/license/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/license/remove.go
deleted file mode 100644
index 79b5eac469..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/license/remove.go
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package license
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/license"
-)
-
-type remove struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("license.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "KEY..."
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := license.NewManager(client)
-	for _, v := range f.Args() {
-		err = m.Remove(ctx, v)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/logs/command.go b/installer/vendor/github.com/vmware/govmomi/govc/logs/command.go
deleted file mode 100644
index a921432988..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/logs/command.go
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package logs
-
-import (
-	"context"
-	"flag"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type logs struct {
-	*flags.HostSystemFlag
-
-	Max int32
-	Key string
-
-	follow bool
-}
-
-func init() {
-	cli.Register("logs", &logs{})
-}
-
-func (cmd *logs) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.Max = 25 // default
-	f.Var(flags.NewInt32(&cmd.Max), "n", "Output the last N log lines")
-	f.StringVar(&cmd.Key, "log", "", "Log file key")
-	f.BoolVar(&cmd.follow, "f", false, "Follow log file changes")
-}
-
-func (cmd *logs) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *logs) Description() string {
-	return `View VPX and ESX logs.
-
-The '-log' option defaults to "hostd" when connected directly to a host or
-when connected to VirtualCenter and a '-host' option is given.  Otherwise,
-the '-log' option defaults to "vpxd:vpxd.log".  The '-host' option is ignored
-when connected directly to a host.  See 'govc logs.ls' for other '-log' options.
-
-Examples:
-  govc logs -n 1000 -f
-  govc logs -host esx1
-  govc logs -host esx1 -log vmkernel`
-}
-
-func (cmd *logs) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	defaultKey := "hostd"
-	var host *object.HostSystem
-
-	if c.IsVC() {
-		host, err = cmd.HostSystemIfSpecified()
-		if err != nil {
-			return err
-		}
-
-		if host == nil {
-			defaultKey = "vpxd:vpxd.log"
-		}
-	}
-
-	m := object.NewDiagnosticManager(c)
-
-	key := cmd.Key
-	if key == "" {
-		key = defaultKey
-	}
-
-	l := m.Log(ctx, host, key)
-
-	err = l.Seek(ctx, cmd.Max)
-	if err != nil {
-		return err
-	}
-
-	for {
-		_, err = l.Copy(ctx, cmd.Out)
-		if err != nil {
-			return nil
-		}
-
-		if !cmd.follow {
-			break
-		}
-
-		<-time.After(time.Second)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/logs/download.go b/installer/vendor/github.com/vmware/govmomi/govc/logs/download.go
deleted file mode 100644
index 62f95a5075..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/logs/download.go
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package logs
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"path"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type download struct {
-	*flags.DatacenterFlag
-
-	IncludeDefault bool
-}
-
-func init() {
-	cli.Register("logs.download", &download{})
-}
-
-func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.IncludeDefault, "default", true, "Specifies if the bundle should include the default server")
-}
-
-func (cmd *download) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *download) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *download) Description() string {
-	return `Generate diagnostic bundles.
-
-A diagnostic bundle includes log files and other configuration information.
-
-Use PATH to include a specific set of hosts to include.
-
-Examples:
-  govc logs.download
-  govc logs.download host-a host-b`
-}
-
-func (cmd *download) DownloadFile(c *vim25.Client, b string) error {
-	u, err := c.Client.ParseURL(b)
-	if err != nil {
-		return err
-	}
-
-	dst := path.Base(u.Path)
-	p := soap.DefaultDownload
-	if cmd.OutputFlag.TTY {
-		logger := cmd.ProgressLogger(fmt.Sprintf("Downloading %s... ", dst))
-		defer logger.Wait()
-		p.Progress = logger
-	}
-
-	return c.Client.DownloadFile(dst, u, &p)
-}
-
-func (cmd *download) GenerateLogBundles(m *object.DiagnosticManager, host []*object.HostSystem) ([]types.DiagnosticManagerBundleInfo, error) {
-	ctx := context.TODO()
-	logger := cmd.ProgressLogger("Generating log bundles... ")
-	defer logger.Wait()
-
-	task, err := m.GenerateLogBundles(ctx, cmd.IncludeDefault, host)
-	if err != nil {
-		return nil, err
-	}
-
-	r, err := task.WaitForResult(ctx, logger)
-	if err != nil {
-		return nil, err
-	}
-
-	return r.Result.(types.ArrayOfDiagnosticManagerBundleInfo).DiagnosticManagerBundleInfo, nil
-}
-
-func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	var host []*object.HostSystem
-
-	for _, arg := range f.Args() {
-		hs, err := finder.HostSystemList(ctx, arg)
-		if err != nil {
-			return err
-		}
-
-		host = append(host, hs...)
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := object.NewDiagnosticManager(c)
-
-	bundles, err := cmd.GenerateLogBundles(m, host)
-	if err != nil {
-		return err
-	}
-
-	for _, bundle := range bundles {
-		err := cmd.DownloadFile(c, bundle.Url)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/logs/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/logs/ls.go
deleted file mode 100644
index 49a2aa369e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/logs/ls.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright (c) 2015-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package logs
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type ls struct {
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("logs.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Description() string {
-	return `List diagnostic log keys.
-
-Examples:
-  govc logs.ls
-  govc logs.ls -host host-a`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	var host *object.HostSystem
-
-	if c.IsVC() {
-		host, err = cmd.HostSystemIfSpecified()
-		if err != nil {
-			return err
-		}
-	}
-
-	m := object.NewDiagnosticManager(c)
-
-	desc, err := m.QueryDescriptions(ctx, host)
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, d := range desc {
-		fmt.Fprintf(tw, "%s\t%s\n", d.Key, d.FileName)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/ls/command.go b/installer/vendor/github.com/vmware/govmomi/govc/ls/command.go
deleted file mode 100644
index 06a9b409fb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/ls/command.go
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ls
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/list"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*flags.DatacenterFlag
-
-	Long  bool
-	Type  string
-	ToRef bool
-	DeRef bool
-}
-
-func init() {
-	cli.Register("ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.Long, "l", false, "Long listing format")
-	f.BoolVar(&cmd.ToRef, "i", false, "Print the managed object reference")
-	f.BoolVar(&cmd.DeRef, "L", false, "Follow managed object references")
-	f.StringVar(&cmd.Type, "t", "", "Object type")
-}
-
-func (cmd *ls) Description() string {
-	return `List inventory items.
-
-Examples:
-  govc ls -l '*'
-  govc ls -t ClusterComputeResource host
-  govc ls -t Datastore host/ClusterA/* | grep -v local | xargs -n1 basename | sort | uniq`
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *ls) typeMatch(ref types.ManagedObjectReference) bool {
-	if cmd.Type == "" {
-		return true
-	}
-
-	return strings.ToLower(cmd.Type) == strings.ToLower(ref.Type)
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	lr := listResult{
-		ls:       cmd,
-		Elements: nil,
-	}
-
-	args := f.Args()
-	if len(args) == 0 {
-		args = []string{"."}
-	}
-
-	var ref = new(types.ManagedObjectReference)
-
-	var types []string
-	if cmd.Type != "" {
-		// TODO: support multiple -t flags
-		types = []string{cmd.Type}
-	}
-
-	for _, arg := range args {
-		if cmd.DeRef && ref.FromString(arg) {
-			e, err := finder.Element(ctx, *ref)
-			if err == nil {
-				if cmd.typeMatch(*ref) {
-					if e.Path == "/" && ref.Type != "Folder" {
-						// Special case: when given a moref with no ancestors,
-						// just echo the moref.
-						e.Path = ref.String()
-					}
-					lr.Elements = append(lr.Elements, *e)
-				}
-				continue
-			}
-		}
-
-		es, err := finder.ManagedObjectListChildren(ctx, arg, types...)
-		if err != nil {
-			return err
-		}
-
-		for _, e := range es {
-			if cmd.typeMatch(e.Object.Reference()) {
-				lr.Elements = append(lr.Elements, e)
-			}
-		}
-	}
-
-	return cmd.WriteResult(lr)
-}
-
-type listResult struct {
-	*ls
-	Elements []list.Element `json:"elements"`
-}
-
-func (l listResult) Write(w io.Writer) error {
-	var err error
-
-	for _, e := range l.Elements {
-		if l.ToRef {
-			fmt.Fprint(w, e.Object.Reference().String())
-			if l.Long {
-				fmt.Fprintf(w, " %s", e.Path)
-			}
-			fmt.Fprintln(w)
-			continue
-		}
-
-		if !l.Long {
-			fmt.Fprintf(w, "%s\n", e.Path)
-			continue
-		}
-
-		switch e.Object.(type) {
-		case mo.Folder:
-			if _, err = fmt.Fprintf(w, "%s/\n", e.Path); err != nil {
-				return err
-			}
-		default:
-			if _, err = fmt.Fprintf(w, "%s (%s)\n", e.Path, e.Object.Reference().Type); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/main.go b/installer/vendor/github.com/vmware/govmomi/govc/main.go
deleted file mode 100644
index 6df93034b1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/main.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-
-	_ "github.com/vmware/govmomi/govc/about"
-	_ "github.com/vmware/govmomi/govc/cluster"
-	_ "github.com/vmware/govmomi/govc/datacenter"
-	_ "github.com/vmware/govmomi/govc/datastore"
-	_ "github.com/vmware/govmomi/govc/datastore/disk"
-	_ "github.com/vmware/govmomi/govc/datastore/vsan"
-	_ "github.com/vmware/govmomi/govc/device"
-	_ "github.com/vmware/govmomi/govc/device/cdrom"
-	_ "github.com/vmware/govmomi/govc/device/floppy"
-	_ "github.com/vmware/govmomi/govc/device/scsi"
-	_ "github.com/vmware/govmomi/govc/device/serial"
-	_ "github.com/vmware/govmomi/govc/device/usb"
-	_ "github.com/vmware/govmomi/govc/dvs"
-	_ "github.com/vmware/govmomi/govc/dvs/portgroup"
-	_ "github.com/vmware/govmomi/govc/env"
-	_ "github.com/vmware/govmomi/govc/events"
-	_ "github.com/vmware/govmomi/govc/export"
-	_ "github.com/vmware/govmomi/govc/extension"
-	_ "github.com/vmware/govmomi/govc/fields"
-	_ "github.com/vmware/govmomi/govc/folder"
-	_ "github.com/vmware/govmomi/govc/host"
-	_ "github.com/vmware/govmomi/govc/host/account"
-	_ "github.com/vmware/govmomi/govc/host/autostart"
-	_ "github.com/vmware/govmomi/govc/host/cert"
-	_ "github.com/vmware/govmomi/govc/host/date"
-	_ "github.com/vmware/govmomi/govc/host/esxcli"
-	_ "github.com/vmware/govmomi/govc/host/firewall"
-	_ "github.com/vmware/govmomi/govc/host/maintenance"
-	_ "github.com/vmware/govmomi/govc/host/option"
-	_ "github.com/vmware/govmomi/govc/host/portgroup"
-	_ "github.com/vmware/govmomi/govc/host/service"
-	_ "github.com/vmware/govmomi/govc/host/storage"
-	_ "github.com/vmware/govmomi/govc/host/vnic"
-	_ "github.com/vmware/govmomi/govc/host/vswitch"
-	_ "github.com/vmware/govmomi/govc/importx"
-	_ "github.com/vmware/govmomi/govc/license"
-	_ "github.com/vmware/govmomi/govc/logs"
-	_ "github.com/vmware/govmomi/govc/ls"
-	_ "github.com/vmware/govmomi/govc/metric"
-	_ "github.com/vmware/govmomi/govc/metric/interval"
-	_ "github.com/vmware/govmomi/govc/object"
-	_ "github.com/vmware/govmomi/govc/option"
-	_ "github.com/vmware/govmomi/govc/permissions"
-	_ "github.com/vmware/govmomi/govc/pool"
-	_ "github.com/vmware/govmomi/govc/role"
-	_ "github.com/vmware/govmomi/govc/session"
-	_ "github.com/vmware/govmomi/govc/task"
-	_ "github.com/vmware/govmomi/govc/vapp"
-	_ "github.com/vmware/govmomi/govc/version"
-	_ "github.com/vmware/govmomi/govc/vm"
-	_ "github.com/vmware/govmomi/govc/vm/disk"
-	_ "github.com/vmware/govmomi/govc/vm/guest"
-	_ "github.com/vmware/govmomi/govc/vm/network"
-	_ "github.com/vmware/govmomi/govc/vm/rdm"
-	_ "github.com/vmware/govmomi/govc/vm/snapshot"
-)
-
-func main() {
-	os.Exit(cli.Run(os.Args[1:]))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/main_test.go b/installer/vendor/github.com/vmware/govmomi/govc/main_test.go
deleted file mode 100644
index 7cc28d800d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/main_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"context"
-	"flag"
-	"testing"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-func TestMain(t *testing.T) {
-	// Execute flag registration for every command to verify there are no
-	// commands with flag name collisions
-	for _, cmd := range cli.Commands() {
-		fs := flag.NewFlagSet("", flag.ContinueOnError)
-
-		// Use fresh context for every command
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		cmd.Register(ctx, fs)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/change.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/change.go
deleted file mode 100644
index 1a69ce3b79..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/change.go
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*PerformanceFlag
-
-	level  int
-	device int
-}
-
-func init() {
-	cli.Register("metric.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-
-	f.IntVar(&cmd.level, "level", 0, "Level for the aggregate counter")
-	f.IntVar(&cmd.device, "device-level", 0, "Level for the per device counter")
-}
-
-func (cmd *change) Usage() string {
-	return "NAME..."
-}
-
-func (cmd *change) Description() string {
-	return `Change counter NAME levels.
-
-Examples:
-  govc metric.change -level 1 net.bytesRx.average net.bytesTx.average`
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 || (cmd.level == 0 && cmd.device == 0) {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	counters, err := m.CounterInfoByName(ctx)
-	if err != nil {
-		return err
-	}
-
-	var mapping []types.PerformanceManagerCounterLevelMapping
-
-	for _, name := range f.Args() {
-		counter, ok := counters[name]
-		if !ok {
-			return cmd.ErrNotFound(name)
-		}
-
-		mapping = append(mapping, types.PerformanceManagerCounterLevelMapping{
-			CounterId:      counter.Key,
-			AggregateLevel: int32(cmd.level),
-			PerDeviceLevel: int32(cmd.device),
-		})
-	}
-
-	_, err = methods.UpdateCounterLevelMapping(ctx, m.Client(), &types.UpdateCounterLevelMapping{
-		This:            m.Reference(),
-		CounterLevelMap: mapping,
-	})
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/info.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/info.go
deleted file mode 100644
index 0e4ae10ec9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/info.go
+++ /dev/null
@@ -1,230 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*PerformanceFlag
-}
-
-func init() {
-	cli.Register("metric.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-}
-
-func (cmd *info) Usage() string {
-	return "PATH [NAME]..."
-}
-
-func (cmd *info) Description() string {
-	return `Metric info for NAME.
-
-If PATH is a value other than '-', provider summary and instance list are included
-for the given object type.
-
-If NAME is not specified, all available metrics for the given INTERVAL are listed.
-An object PATH must be provided in this case.
-
-Examples:
-  govc metric.info vm/my-vm
-  govc metric.info -i 300 vm/my-vm
-  govc metric.info - cpu.usage.average
-  govc metric.info /dc1/host/cluster cpu.usage.average`
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type EntityDetail struct {
-	Realtime   bool
-	Historical bool
-	Instance   []string
-}
-
-type MetricInfo struct {
-	Counter          *types.PerfCounterInfo
-	Enabled          []string
-	PerDeviceEnabled []string
-	Detail           *EntityDetail
-}
-
-type infoResult struct {
-	Info []*MetricInfo
-	cmd  *info
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, info := range r.Info {
-		counter := info.Counter
-
-		fmt.Fprintf(tw, "Name:\t%s\n", counter.Name())
-		fmt.Fprintf(tw, "  Label:\t%s\n", counter.NameInfo.GetElementDescription().Label)
-		fmt.Fprintf(tw, "  Summary:\t%s\n", counter.NameInfo.GetElementDescription().Summary)
-		fmt.Fprintf(tw, "  Group:\t%s\n", counter.GroupInfo.GetElementDescription().Label)
-		fmt.Fprintf(tw, "  Unit:\t%s\n", counter.UnitInfo.GetElementDescription().Label)
-		fmt.Fprintf(tw, "  Rollup type:\t%s\n", counter.RollupType)
-		fmt.Fprintf(tw, "  Stats type:\t%s\n", counter.StatsType)
-		fmt.Fprintf(tw, "  Level:\t%d\n", counter.Level)
-		fmt.Fprintf(tw, "    Intervals:\t%s\n", strings.Join(info.Enabled, ","))
-		fmt.Fprintf(tw, "  Per-device level:\t%d\n", counter.PerDeviceLevel)
-		fmt.Fprintf(tw, "    Intervals:\t%s\n", strings.Join(info.PerDeviceEnabled, ","))
-
-		summary := info.Detail
-		if summary == nil {
-			continue
-		}
-
-		fmt.Fprintf(tw, "  Realtime:\t%t\n", summary.Realtime)
-		fmt.Fprintf(tw, "  Historical:\t%t\n", summary.Historical)
-		fmt.Fprintf(tw, "  Instances:\t%s\n", strings.Join(summary.Instance, ","))
-	}
-
-	return tw.Flush()
-}
-
-func (r *infoResult) MarshalJSON() ([]byte, error) {
-	m := make(map[string]*MetricInfo)
-
-	for _, info := range r.Info {
-		m[info.Counter.Name()] = info
-	}
-
-	return json.Marshal(m)
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	names := f.Args()[1:]
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	counters, err := m.CounterInfoByName(ctx)
-	if err != nil {
-		return err
-	}
-
-	intervals, err := m.HistoricalInterval(ctx)
-	if err != nil {
-		return err
-	}
-	enabled := intervals.Enabled()
-
-	var summary *types.PerfProviderSummary
-	var mids map[int32][]*types.PerfMetricId
-
-	if f.Arg(0) == "-" {
-		if len(names) == 0 {
-			return flag.ErrHelp
-		}
-	} else {
-		objs, err := cmd.ManagedObjects(ctx, f.Args()[:1])
-		if err != nil {
-			return err
-		}
-
-		summary, err = m.ProviderSummary(ctx, objs[0])
-		if err != nil {
-			return err
-		}
-
-		all, err := m.AvailableMetric(ctx, objs[0], cmd.Interval(summary.RefreshRate))
-		if err != nil {
-			return err
-		}
-
-		mids = all.ByKey()
-
-		if len(names) == 0 {
-			nc, _ := m.CounterInfoByKey(ctx)
-
-			for i := range all {
-				id := &all[i]
-				if id.Instance != "" {
-					continue
-				}
-
-				names = append(names, nc[id.CounterId].Name())
-			}
-		}
-	}
-
-	var metrics []*MetricInfo
-
-	for _, name := range names {
-		counter, ok := counters[name]
-		if !ok {
-			return cmd.ErrNotFound(name)
-		}
-
-		info := &MetricInfo{
-			Counter:          counter,
-			Enabled:          enabled[counter.Level],
-			PerDeviceEnabled: enabled[counter.PerDeviceLevel],
-		}
-
-		metrics = append(metrics, info)
-
-		if summary == nil {
-			continue
-		}
-
-		var instances []string
-
-		for _, id := range mids[counter.Key] {
-			if id.Instance != "" {
-				instances = append(instances, id.Instance)
-			}
-		}
-
-		info.Detail = &EntityDetail{
-			Realtime:   summary.CurrentSupported,
-			Historical: summary.SummarySupported,
-			Instance:   instances,
-		}
-
-	}
-
-	return cmd.WriteResult(&infoResult{metrics, cmd})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/change.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/change.go
deleted file mode 100644
index ab034f9e8a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/change.go
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package interval
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/metric"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*metric.PerformanceFlag
-
-	enabled *bool
-	level   int
-}
-
-func init() {
-	cli.Register("metric.interval.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = metric.NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-
-	f.Var(flags.NewOptionalBool(&cmd.enabled), "enabled", "Enable or disable")
-	f.IntVar(&cmd.level, "level", 0, "Level")
-}
-
-func (cmd *change) Description() string {
-	return `Change historical metric intervals.
-
-Examples:
-  govc metric.interval.change -i 300 -level 2
-  govc metric.interval.change -i 86400 -enabled=false`
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	intervals, err := m.HistoricalInterval(ctx)
-	if err != nil {
-		return err
-	}
-
-	interval := cmd.Interval(0)
-	if interval == 0 {
-		return flag.ErrHelp
-	}
-
-	var current *types.PerfInterval
-
-	for _, i := range intervals {
-		if i.SamplingPeriod == interval {
-			current = &i
-			break
-		}
-	}
-
-	if current == nil {
-		return fmt.Errorf("%d interval ID not found", interval)
-	}
-
-	if cmd.level != 0 {
-		if cmd.level > 4 {
-			return flag.ErrHelp
-		}
-		current.Level = int32(cmd.level)
-	}
-
-	if cmd.enabled != nil {
-		current.Enabled = *cmd.enabled
-	}
-
-	_, err = methods.UpdatePerfInterval(ctx, m.Client(), &types.UpdatePerfInterval{
-		This:     m.Reference(),
-		Interval: *current,
-	})
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/info.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/info.go
deleted file mode 100644
index 01f66b9ece..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/interval/info.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package interval
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"text/tabwriter"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/metric"
-)
-
-type info struct {
-	*metric.PerformanceFlag
-}
-
-func init() {
-	cli.Register("metric.interval.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = metric.NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-}
-
-func (cmd *info) Description() string {
-	return `List historical metric intervals.
-
-Examples:
-  govc metric.interval.info
-  govc metric.interval.info -i 300`
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	intervals, err := m.HistoricalInterval(ctx)
-	if err != nil {
-		return err
-	}
-
-	tw := tabwriter.NewWriter(cmd.Out, 2, 0, 2, ' ', 0)
-	cmd.Out = tw
-
-	interval := cmd.Interval(0)
-
-	for _, i := range intervals {
-		if interval != 0 && i.SamplingPeriod != interval {
-			continue
-		}
-
-		fmt.Fprintf(cmd.Out, "ID:\t%d\n", i.SamplingPeriod)
-		fmt.Fprintf(cmd.Out, "  Enabled:\t%t\n", i.Enabled)
-		fmt.Fprintf(cmd.Out, "  Interval:\t%s\n", time.Duration(i.SamplingPeriod)*time.Second)
-		fmt.Fprintf(cmd.Out, "  Name:\t%s\n", i.Name)
-		fmt.Fprintf(cmd.Out, "  Level:\t%d\n", i.Level)
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/ls.go
deleted file mode 100644
index 69b30228bb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/ls.go
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/performance"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*PerformanceFlag
-
-	long bool
-}
-
-func init() {
-	cli.Register("metric.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.long, "l", false, "Long listing format")
-}
-
-func (cmd *ls) Usage() string {
-	return "PATH"
-}
-
-func (cmd *ls) Description() string {
-	return `List available metrics for PATH.
-
-Examples:
-  govc metric.ls /dc1/host/cluster1
-  govc metric.ls datastore/*
-  govc metric.ls vm/* | grep mem. | xargs govc metric.sample vm/*`
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type lsResult struct {
-	cmd      *ls
-	counters map[int32]*types.PerfCounterInfo
-	performance.MetricList
-}
-
-func (r *lsResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, id := range r.MetricList {
-		if id.Instance != "" {
-			continue
-		}
-
-		info := r.counters[id.CounterId]
-
-		if r.cmd.long {
-			fmt.Fprintf(w, "%s\t%s\n", info.Name(),
-				info.NameInfo.GetElementDescription().Label)
-			continue
-		}
-
-		fmt.Fprintln(w, info.Name())
-	}
-
-	return tw.Flush()
-}
-
-func (r *lsResult) MarshalJSON() ([]byte, error) {
-	m := make(map[string]*types.PerfCounterInfo)
-
-	for _, id := range r.MetricList {
-		info := r.counters[id.CounterId]
-
-		m[info.Name()] = info
-	}
-
-	return json.Marshal(m)
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	s, err := m.ProviderSummary(ctx, objs[0])
-	if err != nil {
-		return err
-	}
-
-	mids, err := m.AvailableMetric(ctx, objs[0], cmd.Interval(s.RefreshRate))
-	if err != nil {
-		return err
-	}
-
-	counters, err := m.CounterInfoByKey(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(&lsResult{cmd, counters, mids})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/performance.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/performance.go
deleted file mode 100644
index 893aeaa964..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/performance.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/performance"
-)
-
-type PerformanceFlag struct {
-	*flags.DatacenterFlag
-	*flags.OutputFlag
-
-	m *performance.Manager
-
-	interval int
-}
-
-func NewPerformanceFlag(ctx context.Context) (*PerformanceFlag, context.Context) {
-	f := &PerformanceFlag{}
-	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	f.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	return f, ctx
-}
-
-func (f *PerformanceFlag) Register(ctx context.Context, fs *flag.FlagSet) {
-	f.DatacenterFlag.Register(ctx, fs)
-	f.OutputFlag.Register(ctx, fs)
-
-	fs.IntVar(&f.interval, "i", 0, "Interval ID")
-}
-
-func (f *PerformanceFlag) Process(ctx context.Context) error {
-	if err := f.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (f *PerformanceFlag) Manager(ctx context.Context) (*performance.Manager, error) {
-	if f.m != nil {
-		return f.m, nil
-	}
-
-	c, err := f.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	f.m = performance.NewManager(c)
-
-	f.m.Sort = true
-
-	return f.m, err
-}
-
-func (f *PerformanceFlag) Interval(val int32) int32 {
-	interval := int32(f.interval)
-
-	if interval == 0 {
-		if val == -1 {
-			// realtime not supported
-			return 300
-		}
-
-		return val
-	}
-
-	return interval
-}
-
-func (f *PerformanceFlag) ErrNotFound(name string) error {
-	return fmt.Errorf("counter %q not found", name)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/reset.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/reset.go
deleted file mode 100644
index a73a220aa3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/reset.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type reset struct {
-	*PerformanceFlag
-}
-
-func init() {
-	cli.Register("metric.reset", &reset{})
-}
-
-func (cmd *reset) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-}
-
-func (cmd *reset) Usage() string {
-	return "NAME..."
-}
-
-func (cmd *reset) Description() string {
-	return `Reset counter NAME to the default level of data collection.
-
-Examples:
-  govc metric.reset net.bytesRx.average net.bytesTx.average`
-}
-
-func (cmd *reset) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *reset) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	counters, err := m.CounterInfoByName(ctx)
-	if err != nil {
-		return err
-	}
-
-	var ids []int32
-
-	for _, name := range f.Args() {
-		counter, ok := counters[name]
-		if !ok {
-			return cmd.ErrNotFound(name)
-		}
-
-		ids = append(ids, counter.Key)
-	}
-
-	_, err = methods.ResetCounterLevelMapping(ctx, m.Client(), &types.ResetCounterLevelMapping{
-		This:     m.Reference(),
-		Counters: ids,
-	})
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/metric/sample.go b/installer/vendor/github.com/vmware/govmomi/govc/metric/sample.go
deleted file mode 100644
index a85ca20fd3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/metric/sample.go
+++ /dev/null
@@ -1,330 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package metric
-
-import (
-	"context"
-	"crypto/md5"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/performance"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type sample struct {
-	*PerformanceFlag
-
-	d        int
-	n        int
-	t        bool
-	plot     string
-	instance string
-}
-
-func init() {
-	cli.Register("metric.sample", &sample{})
-}
-
-func (cmd *sample) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PerformanceFlag, ctx = NewPerformanceFlag(ctx)
-	cmd.PerformanceFlag.Register(ctx, f)
-
-	f.IntVar(&cmd.d, "d", 30, "Limit object display name to D chars")
-	f.IntVar(&cmd.n, "n", 6, "Max number of samples")
-	f.StringVar(&cmd.plot, "plot", "", "Plot data using gnuplot")
-	f.BoolVar(&cmd.t, "t", false, "Include sample times")
-	f.StringVar(&cmd.instance, "instance", "*", "Instance")
-}
-
-func (cmd *sample) Usage() string {
-	return "PATH... NAME..."
-}
-
-func (cmd *sample) Description() string {
-	return `Sample for object PATH of metric NAME.
-
-Interval ID defaults to 20 (realtime) if supported, otherwise 300 (5m interval).
-
-By default, INSTANCE '*' samples all instances and the aggregate counter.
-An INSTANCE value of '-' will only sample the aggregate counter.
-An INSTANCE value other than '*' or '-' will only sample the given instance counter.
-
-If PLOT value is set to '-', output a gnuplot script.  If non-empty with another
-value, PLOT will pipe the script to gnuplot for you.  The value is also used to set
-the gnuplot 'terminal' variable, unless the value is that of the DISPLAY env var.
-Only 1 metric NAME can be specified when the PLOT flag is set.
-
-Examples:
-  govc metric.sample host/cluster1/* cpu.usage.average
-  govc metric.sample -plot .png host/cluster1/* cpu.usage.average | xargs open
-  govc metric.sample vm/* net.bytesTx.average net.bytesTx.average
-  govc metric.sample -instance vmnic0 vm/* net.bytesTx.average
-  govc metric.sample -instance - vm/* net.bytesTx.average`
-}
-
-func (cmd *sample) Process(ctx context.Context) error {
-	if err := cmd.PerformanceFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type sampleResult struct {
-	cmd      *sample
-	m        *performance.Manager
-	counters map[string]*types.PerfCounterInfo
-	Sample   []performance.EntityMetric
-}
-
-func (r *sampleResult) name(e types.ManagedObjectReference) string {
-	var me mo.ManagedEntity
-	_ = r.m.Properties(context.Background(), e, []string{"name"}, &me)
-
-	name := me.Name
-
-	if r.cmd.d > 0 && len(name) > r.cmd.d {
-		return name[:r.cmd.d] + "*"
-	}
-
-	return name
-}
-
-func sampleInfoTimes(m *performance.EntityMetric) []string {
-	vals := make([]string, len(m.SampleInfo))
-
-	for i := range m.SampleInfo {
-		vals[i] = m.SampleInfo[i].Timestamp.Format(time.RFC3339)
-	}
-
-	return vals
-}
-
-func (r *sampleResult) Plot(w io.Writer) error {
-	if len(r.Sample) == 0 {
-		return nil
-	}
-
-	if r.cmd.plot != "-" {
-		cmd := exec.Command("gnuplot", "-persist")
-		cmd.Stdout = w
-		cmd.Stderr = os.Stderr
-		stdin, err := cmd.StdinPipe()
-		if err != nil {
-			return err
-		}
-
-		if err = cmd.Start(); err != nil {
-			return err
-		}
-
-		w = stdin
-		defer func() {
-			_ = stdin.Close()
-			_ = cmd.Wait()
-		}()
-	}
-
-	counter := r.counters[r.Sample[0].Value[0].Name]
-	unit := counter.UnitInfo.GetElementDescription()
-
-	fmt.Fprintf(w, "set title %q\n", counter.Name())
-	fmt.Fprintf(w, "set ylabel %q\n", unit.Label)
-	fmt.Fprintf(w, "set xlabel %q\n", "Time")
-	fmt.Fprintf(w, "set xdata %s\n", "time")
-	fmt.Fprintf(w, "set format x %q\n", "%H:%M")
-	fmt.Fprintf(w, "set timefmt %q\n", "%Y-%m-%dT%H:%M:%SZ")
-
-	ext := path.Ext(r.cmd.plot)
-	if ext != "" {
-		// If a file name is given, use the extension as terminal type.
-		// If just an ext is given, use the entities and counter as the file name.
-		file := r.cmd.plot
-		name := r.cmd.plot[:len(r.cmd.plot)-len(ext)]
-		r.cmd.plot = ext[1:]
-
-		if name == "" {
-			h := md5.New()
-
-			for i := range r.Sample {
-				_, _ = io.WriteString(h, r.Sample[i].Entity.String())
-			}
-			_, _ = io.WriteString(h, counter.Name())
-
-			file = fmt.Sprintf("govc-plot-%x%s", h.Sum(nil), ext)
-		}
-
-		fmt.Fprintf(w, "set output %q\n", file)
-
-		defer func() {
-			fmt.Fprintln(r.cmd.Out, file)
-		}()
-	}
-
-	switch r.cmd.plot {
-	case "-", os.Getenv("DISPLAY"):
-	default:
-		fmt.Fprintf(w, "set terminal %s\n", r.cmd.plot)
-	}
-
-	if unit.Key == string(types.PerformanceManagerUnitPercent) {
-		fmt.Fprintln(w, "set yrange [0:100]")
-	}
-
-	fmt.Fprintln(w)
-
-	var set []string
-
-	for i := range r.Sample {
-		name := r.name(r.Sample[i].Entity)
-		name = strings.Replace(name, "_", "*", -1) // underscore is some gnuplot markup?
-		set = append(set, fmt.Sprintf("'-' using 1:2 title '%s' with lines", name))
-	}
-
-	fmt.Fprintf(w, "plot %s\n", strings.Join(set, ", "))
-
-	for i := range r.Sample {
-		times := sampleInfoTimes(&r.Sample[i])
-
-		for _, value := range r.Sample[i].Value {
-			for j := range value.Value {
-				fmt.Fprintf(w, "%s %s\n", times[j], value.Format(value.Value[j]))
-			}
-		}
-
-		fmt.Fprintln(w, "e")
-	}
-
-	return nil
-}
-
-func (r *sampleResult) Write(w io.Writer) error {
-	if r.cmd.plot != "" {
-		return r.Plot(w)
-	}
-
-	cmd := r.cmd
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for i := range r.Sample {
-		metric := r.Sample[i]
-		name := r.name(metric.Entity)
-		t := ""
-		if cmd.t {
-			t = metric.SampleInfoCSV()
-		}
-
-		for _, v := range metric.Value {
-			counter := r.counters[v.Name]
-			units := counter.UnitInfo.GetElementDescription().Label
-
-			instance := v.Instance
-			if instance == "" {
-				instance = "-"
-			}
-
-			fmt.Fprintf(tw, "%s\t%s\t%s\t%v\t%s\t%s\n",
-				name, instance, v.Name, t, v.ValueCSV(), units)
-		}
-	}
-
-	return tw.Flush()
-}
-
-func (cmd *sample) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	var paths []string
-	var names []string
-
-	byName, err := m.CounterInfoByName(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, arg := range f.Args() {
-		if _, ok := byName[arg]; ok {
-			names = append(names, arg)
-		} else {
-			paths = append(paths, arg)
-		}
-	}
-
-	if len(paths) == 0 || len(names) == 0 {
-		return flag.ErrHelp
-	}
-
-	if cmd.plot != "" {
-		if len(names) > 1 {
-			return flag.ErrHelp
-		}
-
-		if cmd.instance == "*" {
-			cmd.instance = ""
-		}
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, paths)
-	if err != nil {
-		return err
-	}
-
-	s, err := m.ProviderSummary(ctx, objs[0])
-	if err != nil {
-		return err
-	}
-
-	if cmd.instance == "-" {
-		cmd.instance = ""
-	}
-
-	spec := types.PerfQuerySpec{
-		Format:     string(types.PerfFormatNormal),
-		MaxSample:  int32(cmd.n),
-		MetricId:   []types.PerfMetricId{{Instance: cmd.instance}},
-		IntervalId: cmd.Interval(s.RefreshRate),
-	}
-
-	sample, err := m.SampleByName(ctx, spec, names, objs)
-	if err != nil {
-		return err
-	}
-
-	result, err := m.ToMetricSeries(ctx, sample)
-	if err != nil {
-		return err
-	}
-
-	counters, err := m.CounterInfoByName(ctx)
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(&sampleResult{cmd, m, counters, result})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/collect.go b/installer/vendor/github.com/vmware/govmomi/govc/object/collect.go
deleted file mode 100644
index 62bf37a2a2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/collect.go
+++ /dev/null
@@ -1,373 +0,0 @@
-/*
-Copyright (c) 2016-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type collect struct {
-	*flags.DatacenterFlag
-
-	single bool
-	simple bool
-	n      int
-	kind   kinds
-
-	filter property.Filter
-	obj    string
-}
-
-func init() {
-	cli.Register("object.collect", &collect{})
-}
-
-func (cmd *collect) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.simple, "s", false, "Output property value only")
-	f.IntVar(&cmd.n, "n", 0, "Wait for N property updates")
-	f.Var(&cmd.kind, "type", "Resource type.  If specified, MOID is used for a container view root")
-}
-
-func (cmd *collect) Usage() string {
-	return "[MOID] [PROPERTY]..."
-}
-
-func (cmd *collect) Description() string {
-	return `Collect managed object properties.
-
-MOID can be an inventory path or ManagedObjectReference.
-MOID defaults to '-', an alias for 'ServiceInstance:ServiceInstance' or the root folder if a '-type' flag is given.
-
-If a '-type' flag is given, properties are collected using a ContainerView object where MOID is the root of the view.
-
-By default only the current property value(s) are collected.  To wait for updates, use the '-n' flag or
-specify a property filter.  A property filter can be specified by prefixing the property name with a '-',
-followed by the value to match.
-
-Examples:
-  govc object.collect - content
-  govc object.collect -s HostSystem:ha-host hardware.systemInfo.uuid
-  govc object.collect -s /ha-datacenter/vm/foo overallStatus
-  govc object.collect -s /ha-datacenter/vm/foo -guest.guestOperationsReady true # property filter
-  govc object.collect -type m / name runtime.powerState # collect properties for multiple objects
-  govc object.collect -json -n=-1 EventManager:ha-eventmgr latestEvent | jq .
-  govc object.collect -json -s $(govc object.collect -s - content.perfManager) description.counterType | jq .`
-}
-
-func (cmd *collect) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-var stringer = reflect.TypeOf((*fmt.Stringer)(nil)).Elem()
-
-type change struct {
-	cmd    *collect
-	Update types.ObjectUpdate
-}
-
-func (pc *change) MarshalJSON() ([]byte, error) {
-	if len(pc.cmd.kind) == 0 {
-		return json.Marshal(pc.Update.ChangeSet)
-	}
-
-	return json.Marshal(pc.Update)
-}
-
-func (pc *change) output(name string, rval reflect.Value, rtype reflect.Type) {
-	s := "..."
-
-	kind := rval.Kind()
-
-	if kind == reflect.Ptr || kind == reflect.Interface {
-		if rval.IsNil() {
-			s = ""
-		} else {
-			rval = rval.Elem()
-			kind = rval.Kind()
-		}
-	}
-
-	switch kind {
-	case reflect.Ptr, reflect.Interface:
-	case reflect.Slice:
-		if rval.Len() == 0 {
-			s = ""
-			break
-		}
-
-		etype := rtype.Elem()
-
-		if etype.Kind() != reflect.Interface && etype.Kind() != reflect.Struct || etype.Implements(stringer) {
-			var val []string
-
-			for i := 0; i < rval.Len(); i++ {
-				v := rval.Index(i).Interface()
-
-				if fstr, ok := v.(fmt.Stringer); ok {
-					s = fstr.String()
-				} else {
-					s = fmt.Sprintf("%v", v)
-				}
-
-				val = append(val, s)
-			}
-
-			s = strings.Join(val, ",")
-		}
-	case reflect.Struct:
-		if rtype.Implements(stringer) {
-			s = rval.Interface().(fmt.Stringer).String()
-		}
-	default:
-		s = fmt.Sprintf("%v", rval.Interface())
-	}
-
-	if pc.cmd.simple {
-		fmt.Fprintln(pc.cmd.Out, s)
-		return
-	}
-
-	if pc.cmd.obj != "" {
-		fmt.Fprintf(pc.cmd.Out, "%s\t", pc.cmd.obj)
-	}
-
-	fmt.Fprintf(pc.cmd.Out, "%s\t%s\t%s\n", name, rtype, s)
-}
-
-func (pc *change) writeStruct(name string, rval reflect.Value, rtype reflect.Type) {
-	for i := 0; i < rval.NumField(); i++ {
-		fval := rval.Field(i)
-		field := rtype.Field(i)
-
-		if field.Anonymous {
-			pc.writeStruct(name, fval, fval.Type())
-			continue
-		}
-
-		fname := fmt.Sprintf("%s.%s%s", name, strings.ToLower(field.Name[:1]), field.Name[1:])
-		pc.output(fname, fval, field.Type)
-	}
-}
-
-func (pc *change) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(pc.cmd.Out, 4, 0, 2, ' ', 0)
-	pc.cmd.Out = tw
-
-	for _, c := range pc.Update.ChangeSet {
-		if c.Val == nil {
-			// type is unknown in this case, as xsi:type was not provided - just skip for now
-			continue
-		}
-
-		rval := reflect.ValueOf(c.Val)
-		rtype := rval.Type()
-
-		if strings.HasPrefix(rtype.Name(), "ArrayOf") {
-			rval = rval.Field(0)
-			rtype = rval.Type()
-		}
-
-		if len(pc.cmd.kind) != 0 {
-			pc.cmd.obj = pc.Update.Obj.String()
-		}
-
-		if pc.cmd.single && rtype.Kind() == reflect.Struct && !rtype.Implements(stringer) {
-			pc.writeStruct(c.Name, rval, rtype)
-			continue
-		}
-
-		pc.output(c.Name, rval, rtype)
-	}
-
-	return tw.Flush()
-}
-
-func (pc *change) Dump() interface{} {
-	if pc.cmd.simple && len(pc.Update.ChangeSet) == 1 {
-		val := pc.Update.ChangeSet[0].Val
-		if val != nil {
-			rval := reflect.ValueOf(val)
-			rtype := rval.Type()
-
-			if strings.HasPrefix(rtype.Name(), "ArrayOf") {
-				return rval.Field(0).Interface()
-			}
-		}
-
-		return val
-	}
-
-	return pc.Update
-}
-
-func (cmd *collect) match(update types.ObjectUpdate) bool {
-	if len(cmd.filter) == 0 {
-		return false
-	}
-
-	for _, c := range update.ChangeSet {
-		if cmd.filter.MatchProperty(types.DynamicProperty{Name: c.Name, Val: c.Val}) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (cmd *collect) toFilter(f *flag.FlagSet, props []string) ([]string, error) {
-	// TODO: Only supporting 1 filter prop for now.  More than one would require some
-	// accounting / accumulating of multiple updates.  And need to consider objects
-	// then enter/leave a container view.
-	if len(props) != 2 || !strings.HasPrefix(props[0], "-") {
-		return props, nil
-	}
-
-	cmd.filter = property.Filter{props[0][1:]: props[1]}
-
-	return cmd.filter.Keys(), nil
-}
-
-func (cmd *collect) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	ref := methods.ServiceInstance
-	arg := f.Arg(0)
-
-	if len(cmd.kind) != 0 {
-		ref = client.ServiceContent.RootFolder
-	}
-
-	switch arg {
-	case "", "-":
-	default:
-		if !ref.FromString(arg) {
-			l, ferr := finder.ManagedObjectList(ctx, arg)
-			if ferr != nil {
-				return err
-			}
-
-			switch len(l) {
-			case 0:
-				return fmt.Errorf("%s not found", arg)
-			case 1:
-				ref = l[0].Object.Reference()
-			default:
-				return flag.ErrHelp
-			}
-		}
-	}
-
-	p := property.DefaultCollector(client)
-	filter := new(property.WaitFilter)
-
-	var props []string
-	if f.NArg() > 1 {
-		props = f.Args()[1:]
-		cmd.single = len(props) == 1
-	}
-
-	props, err = cmd.toFilter(f, props)
-	if err != nil {
-		return err
-	}
-
-	if len(cmd.kind) == 0 {
-		filter.Add(ref, ref.Type, props)
-	} else {
-		m := view.NewManager(client)
-
-		v, err := m.CreateContainerView(ctx, ref, cmd.kind, true)
-		if err != nil {
-			return err
-		}
-
-		defer v.Destroy(ctx)
-
-		for _, kind := range cmd.kind {
-			filter.Add(v.Reference(), kind, props, v.TraversalSpec())
-		}
-	}
-
-	entered := false
-	hasFilter := len(cmd.filter) != 0
-
-	return property.WaitForUpdates(ctx, p, filter, func(updates []types.ObjectUpdate) bool {
-		matches := 0
-
-		for _, update := range updates {
-			if entered && update.Kind == types.ObjectUpdateKindEnter {
-				// on the first update we only get kind "enter"
-				// if a new object is added, the next update with have both "enter" and "modify".
-				continue
-			}
-
-			c := &change{cmd, update}
-
-			if hasFilter {
-				if cmd.match(update) {
-					matches++
-				} else {
-					continue
-				}
-			}
-
-			_ = cmd.WriteResult(c)
-		}
-
-		entered = true
-
-		if hasFilter {
-			if matches > 0 {
-				return true
-			}
-
-			return false
-		}
-
-		cmd.n--
-
-		return cmd.n == -1
-	})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/destroy.go b/installer/vendor/github.com/vmware/govmomi/govc/object/destroy.go
deleted file mode 100644
index 7429bc51eb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/destroy.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type destroy struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("object.destroy", &destroy{})
-}
-
-func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *destroy) Usage() string {
-	return "PATH..."
-}
-
-func (cmd *destroy) Description() string {
-	return `Destroy managed objects.
-
-Examples:
-  govc object.destroy /dc1/network/dvs /dc1/host/cluster`
-}
-
-func (cmd *destroy) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, obj := range objs {
-		task, err := object.NewCommon(c, obj).Destroy(ctx)
-		if err != nil {
-			return err
-		}
-
-		logger := cmd.ProgressLogger(fmt.Sprintf("destroying %s... ", obj))
-		_, err = task.WaitForResult(ctx, logger)
-		logger.Wait()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/find.go b/installer/vendor/github.com/vmware/govmomi/govc/object/find.go
deleted file mode 100644
index 5b924566a0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/find.go
+++ /dev/null
@@ -1,324 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"bytes"
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type find struct {
-	*flags.DatacenterFlag
-
-	ref      bool
-	kind     kinds
-	name     string
-	maxdepth int
-}
-
-var alias = []struct {
-	name string
-	kind string
-}{
-	{"a", "VirtualApp"},
-	{"c", "ClusterComputeResource"},
-	{"d", "Datacenter"},
-	{"f", "Folder"},
-	{"g", "DistributedVirtualPortgroup"},
-	{"h", "HostSystem"},
-	{"m", "VirtualMachine"},
-	{"n", "Network"},
-	{"o", "OpaqueNetwork"},
-	{"p", "ResourcePool"},
-	{"r", "ComputeResource"},
-	{"s", "Datastore"},
-	{"w", "DistributedVirtualSwitch"},
-}
-
-func aliasHelp() string {
-	var help bytes.Buffer
-
-	for _, a := range alias {
-		fmt.Fprintf(&help, "  %s    %s\n", a.name, a.kind)
-	}
-
-	return help.String()
-}
-
-type kinds []string
-
-func (e *kinds) String() string {
-	return fmt.Sprint(*e)
-}
-
-func (e *kinds) Set(value string) error {
-	*e = append(*e, e.alias(value))
-	return nil
-}
-
-func (e *kinds) alias(value string) string {
-	if len(value) != 1 {
-		return value
-	}
-
-	for _, a := range alias {
-		if a.name == value {
-			return a.kind
-		}
-	}
-
-	return value
-}
-
-func (e *kinds) wanted(kind string) bool {
-	if len(*e) == 0 {
-		return true
-	}
-
-	for _, k := range *e {
-		if kind == k {
-			return true
-		}
-	}
-
-	return false
-}
-
-func init() {
-	cli.Register("find", &find{})
-}
-
-func (cmd *find) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.Var(&cmd.kind, "type", "Resource type")
-	f.StringVar(&cmd.name, "name", "*", "Resource name")
-	f.IntVar(&cmd.maxdepth, "maxdepth", -1, "Max depth")
-	f.BoolVar(&cmd.ref, "i", false, "Print the managed object reference")
-}
-
-func (cmd *find) Usage() string {
-	return "[ROOT] [KEY VAL]..."
-}
-
-func (cmd *find) Description() string {
-	atable := aliasHelp()
-
-	return fmt.Sprintf(`Find managed objects.
-
-ROOT can be an inventory path or ManagedObjectReference.
-ROOT defaults to '.', an alias for the root folder or DC if set.
-
-Optional KEY VAL pairs can be used to filter results against object instance properties.
-
-The '-type' flag value can be a managed entity type or one of the following aliases:
-
-%s
-Examples:
-  govc find
-  govc find /dc1 -type c
-  govc find vm -name my-vm-*
-  govc find . -type n
-  govc find . -type m -runtime.powerState poweredOn
-  govc find . -type m -datastore $(govc find -i datastore -name vsanDatastore)
-  govc find . -type s -summary.type vsan
-  govc find . -type h -hardware.cpuInfo.numCpuCores 16`, atable)
-}
-
-func (cmd *find) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-// rootMatch returns true if the root object path should be printed
-func (cmd *find) rootMatch(ctx context.Context, root object.Reference, client *vim25.Client, filter property.Filter) bool {
-	ref := root.Reference()
-
-	if !cmd.kind.wanted(ref.Type) {
-		return false
-	}
-
-	if len(filter) == 1 && filter["name"] == "*" {
-		return true
-	}
-
-	var content []types.ObjectContent
-
-	pc := property.DefaultCollector(client)
-	_ = pc.RetrieveWithFilter(ctx, []types.ManagedObjectReference{ref}, filter.Keys(), &content, filter)
-
-	return content != nil
-}
-
-func (cmd *find) Run(ctx context.Context, f *flag.FlagSet) error {
-	client, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	root := client.ServiceContent.RootFolder
-	rootPath := "/"
-
-	arg := f.Arg(0)
-	props := f.Args()
-
-	if len(props) > 0 {
-		if strings.HasPrefix(arg, "-") {
-			arg = "."
-		} else {
-			props = props[1:]
-		}
-	}
-
-	if len(props)%2 != 0 {
-		return flag.ErrHelp
-	}
-
-	switch arg {
-	case rootPath:
-	case "", ".":
-		dc, _ := cmd.DatacenterIfSpecified()
-		if dc == nil {
-			arg = rootPath
-		} else {
-			arg = "."
-			root = dc.Reference()
-			rootPath = dc.InventoryPath
-		}
-	default:
-		l, ferr := finder.ManagedObjectList(ctx, arg)
-		if ferr != nil {
-			return err
-		}
-
-		switch len(l) {
-		case 0:
-			return fmt.Errorf("%s not found", arg)
-		case 1:
-			root = l[0].Object.Reference()
-			rootPath = l[0].Path
-		default:
-			return flag.ErrHelp
-		}
-	}
-
-	filter := property.Filter{}
-
-	if len(props)%2 != 0 {
-		return flag.ErrHelp
-	}
-
-	for i := 0; i < len(props); i++ {
-		key := props[i]
-		if !strings.HasPrefix(key, "-") {
-			return flag.ErrHelp
-		}
-
-		key = key[1:]
-		i++
-		val := props[i]
-
-		if xf := f.Lookup(key); xf != nil {
-			// Support use of -flag following the ROOT arg (flag package does not do this)
-			if err = xf.Value.Set(val); err != nil {
-				return err
-			}
-		} else {
-			filter[key] = val
-		}
-	}
-
-	filter["name"] = cmd.name
-
-	printPath := func(o types.ManagedObjectReference, p string) {
-		if cmd.ref {
-			fmt.Fprintln(cmd.Out, o)
-			return
-		}
-
-		path := strings.Replace(p, rootPath, arg, 1)
-		fmt.Fprintln(cmd.Out, path)
-	}
-
-	recurse := false
-
-	switch cmd.maxdepth {
-	case -1:
-		recurse = true
-	case 0:
-	case 1:
-	default:
-		return flag.ErrHelp // TODO: ?
-	}
-
-	if cmd.rootMatch(ctx, root, client, filter) {
-		printPath(root, arg)
-	}
-
-	if cmd.maxdepth == 0 {
-		return nil
-	}
-
-	m := view.NewManager(client)
-
-	v, err := m.CreateContainerView(ctx, root, cmd.kind, recurse)
-	if err != nil {
-		return err
-	}
-
-	defer v.Destroy(ctx)
-
-	objs, err := v.Find(ctx, cmd.kind, filter)
-	if err != nil {
-		return err
-	}
-
-	for _, o := range objs {
-		var path string
-
-		if !cmd.ref {
-			e, err := finder.Element(ctx, o)
-			if err != nil {
-				return err
-			}
-			path = e.Path
-		}
-
-		printPath(o, path)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/method.go b/installer/vendor/github.com/vmware/govmomi/govc/object/method.go
deleted file mode 100644
index 3cc24e9860..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/method.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type method struct {
-	*flags.DatacenterFlag
-
-	name   string
-	reason string
-	source string
-	enable bool
-}
-
-func init() {
-	cli.Register("object.method", &method{})
-}
-
-func (cmd *method) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Method name")
-	f.StringVar(&cmd.reason, "reason", "", "Reason for disabling method")
-	f.StringVar(&cmd.source, "source", "govc", "Source ID")
-	f.BoolVar(&cmd.enable, "enable", true, "Enable method")
-}
-
-func (cmd *method) Usage() string {
-	return "PATH..."
-}
-
-func (cmd *method) Description() string {
-	return `Enable or disable methods for managed objects.
-
-Examples:
-  govc object.method -name Destroy_Task -enable=false /dc1/vm/foo
-  govc object.collect /dc1/vm/foo disabledMethod | grep --color Destroy_Task
-  govc object.method -name Destroy_Task -enable /dc1/vm/foo`
-}
-
-func (cmd *method) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *method) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	if cmd.name == "" {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	m := object.NewAuthorizationManager(c)
-
-	if cmd.enable {
-		return m.EnableMethods(ctx, objs, []string{cmd.name}, cmd.source)
-	}
-
-	method := []object.DisabledMethodRequest{
-		{
-			Method: cmd.name,
-			Reason: cmd.reason,
-		},
-	}
-
-	return m.DisableMethods(ctx, objs, method, cmd.source)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/mv.go b/installer/vendor/github.com/vmware/govmomi/govc/object/mv.go
deleted file mode 100644
index 42c288246b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/mv.go
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type mv struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("object.mv", &mv{})
-}
-
-func (cmd *mv) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *mv) Usage() string {
-	return "PATH... FOLDER"
-}
-
-func (cmd *mv) Description() string {
-	return `Move managed entities to FOLDER.
-
-Examples:
-  govc folder.create /dc1/host/example
-  govc object.mv /dc2/host/*.example.com /dc1/host/example`
-}
-
-func (cmd *mv) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mv) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() < 2 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	n := f.NArg() - 1
-
-	folder, err := finder.Folder(ctx, f.Arg(n))
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args()[:n])
-	if err != nil {
-		return err
-	}
-
-	task, err := folder.MoveInto(ctx, objs)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("moving %d objects to %s... ", len(objs), folder.InventoryPath))
-	_, err = task.WaitForResult(ctx, logger)
-	logger.Wait()
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/reload.go b/installer/vendor/github.com/vmware/govmomi/govc/object/reload.go
deleted file mode 100644
index 6546a7d38b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/reload.go
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type reload struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("object.reload", &reload{})
-}
-
-func (cmd *reload) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *reload) Usage() string {
-	return "PATH..."
-}
-
-func (cmd *reload) Description() string {
-	return `Reload managed object state.
-
-Examples:
-  govc datastore.upload $vm.vmx $vm/$vm.vmx
-  govc object.reload /dc1/vm/$vm`
-}
-
-func (cmd *reload) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *reload) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, obj := range objs {
-		req := types.Reload{
-			This: obj,
-		}
-
-		_, err = methods.Reload(ctx, c, &req)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/object/rename.go b/installer/vendor/github.com/vmware/govmomi/govc/object/rename.go
deleted file mode 100644
index 4684cb91d2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/object/rename.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type rename struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("object.rename", &rename{})
-}
-
-func (cmd *rename) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *rename) Usage() string {
-	return "PATH NAME"
-}
-
-func (cmd *rename) Description() string {
-	return `Rename managed objects.
-
-Examples:
-  govc object.rename /dc1/network/dvs1 Switch1`
-}
-
-func (cmd *rename) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rename) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	objs, err := cmd.ManagedObjects(ctx, f.Args()[:1])
-	if err != nil {
-		return err
-	}
-
-	task, err := object.NewCommon(c, objs[0]).Rename(ctx, f.Arg(1))
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("renaming %s... ", objs[0]))
-	_, err = task.WaitForResult(ctx, logger)
-	logger.Wait()
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/option/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/option/ls.go
deleted file mode 100644
index 4facb0c7d6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/option/ls.go
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package option
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type List struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("option.ls", &List{})
-}
-
-func (cmd *List) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *List) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *List) Usage() string {
-	return "[NAME]"
-}
-
-var ListDescription = `List option with the given NAME.
-
-If NAME ends with a dot, all options for that subtree are listed.`
-
-func (cmd *List) Description() string {
-	return ListDescription + `
-
-Examples:
-  govc option.ls
-  govc option.ls config.vpxd.sso.
-  govc option.ls config.vpxd.sso.sts.uri`
-}
-
-func (cmd *List) Query(ctx context.Context, f *flag.FlagSet, m *object.OptionManager) error {
-	var err error
-	var opts []types.BaseOptionValue
-
-	if f.NArg() > 1 {
-		return flag.ErrHelp
-	}
-
-	if f.NArg() == 1 {
-		opts, err = m.Query(ctx, f.Arg(0))
-	} else {
-		var om mo.OptionManager
-		err = m.Properties(ctx, m.Reference(), []string{"setting"}, &om)
-		opts = om.Setting
-	}
-
-	if err != nil {
-		return err
-	}
-
-	return cmd.WriteResult(optionResult(opts))
-}
-
-func (cmd *List) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := object.NewOptionManager(c, *c.ServiceContent.Setting)
-
-	return cmd.Query(ctx, f, m)
-}
-
-type optionResult []types.BaseOptionValue
-
-func (r optionResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-	for _, opt := range r {
-		o := opt.GetOptionValue()
-		fmt.Fprintf(tw, "%s:\t%v\n", o.Key, o.Value)
-	}
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/option/set.go b/installer/vendor/github.com/vmware/govmomi/govc/option/set.go
deleted file mode 100644
index 09d18f4488..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/option/set.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package option
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strconv"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Set struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("option.set", &Set{})
-}
-
-func (cmd *Set) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *Set) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *Set) Usage() string {
-	return "NAME VALUE"
-}
-
-var SetDescription = `Set option NAME to VALUE.`
-
-func (cmd *Set) Description() string {
-	return SetDescription + `
-
-Examples:
-  govc option.set log.level info
-  govc option.set logger.Vsan verbose`
-}
-
-func (cmd *Set) Update(ctx context.Context, f *flag.FlagSet, m *object.OptionManager) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	name := f.Arg(0)
-	opts, err := m.Query(ctx, name)
-	if err != nil {
-		return err
-	}
-
-	if len(opts) != 1 {
-		return flag.ErrHelp
-	}
-
-	val := f.Arg(1)
-	var set types.AnyType
-
-	switch x := opts[0].GetOptionValue().Value.(type) {
-	case string:
-		set = val
-	case bool:
-		set, err = strconv.ParseBool(val)
-		if err != nil {
-			return err
-		}
-	case int32:
-		s, err := strconv.ParseInt(val, 10, 32)
-		if err != nil {
-			return err
-		}
-		set = s
-	case int64:
-		set, err = strconv.ParseInt(val, 10, 64)
-		if err != nil {
-			return err
-		}
-	default:
-		return fmt.Errorf("type %T conversion not supported", x)
-	}
-
-	opts[0].GetOptionValue().Value = set
-
-	return m.Update(ctx, opts)
-}
-
-func (cmd *Set) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := object.NewOptionManager(c, *c.ServiceContent.Setting)
-
-	return cmd.Update(ctx, f, m)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/permissions/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/permissions/ls.go
deleted file mode 100644
index b121d08bbb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/permissions/ls.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package permissions
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type ls struct {
-	*PermissionFlag
-
-	inherited bool
-}
-
-func init() {
-	cli.Register("permissions.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.inherited, "a", true, "Include inherited permissions defined by parent entities")
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *ls) Description() string {
-	return `List the permissions defined on or effective on managed entities.
-
-Examples:
-  govc permissions.ls
-  govc permissions.ls /dc1/host/cluster1`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	refs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, ref := range refs {
-		perms, err := m.RetrieveEntityPermissions(ctx, ref, cmd.inherited)
-		if err != nil {
-			return err
-		}
-
-		cmd.List.Add(perms)
-	}
-
-	return cmd.WriteResult(&cmd.List)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go b/installer/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go
deleted file mode 100644
index 31b3de3232..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/permissions/permissions.go
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package permissions
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type List struct {
-	Roles object.AuthorizationRoleList `json:",omitempty"`
-
-	Permissions []types.Permission `json:",omitempty"`
-
-	f *PermissionFlag
-}
-
-type PermissionFlag struct {
-	*flags.DatacenterFlag
-	*flags.OutputFlag
-
-	asRef bool
-
-	m *object.AuthorizationManager
-
-	List
-}
-
-func NewPermissionFlag(ctx context.Context) (*PermissionFlag, context.Context) {
-	f := &PermissionFlag{}
-	f.List.f = f
-	f.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	f.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	return f, ctx
-}
-
-func (f *PermissionFlag) Register(ctx context.Context, fs *flag.FlagSet) {
-	f.DatacenterFlag.Register(ctx, fs)
-	f.OutputFlag.Register(ctx, fs)
-
-	fs.BoolVar(&f.asRef, "i", false, "Use moref instead of inventory path")
-}
-
-func (f *PermissionFlag) Process(ctx context.Context) error {
-	if err := f.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := f.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (f *PermissionFlag) Manager(ctx context.Context) (*object.AuthorizationManager, error) {
-	if f.m != nil {
-		return f.m, nil
-	}
-
-	c, err := f.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	f.m = object.NewAuthorizationManager(c)
-	f.Roles, err = f.m.RoleList(ctx)
-
-	return f.m, err
-}
-
-func (f *PermissionFlag) Role(name string) (*types.AuthorizationRole, error) {
-	role := f.Roles.ByName(name)
-	if role == nil {
-		return nil, fmt.Errorf("role %q not found", name)
-	}
-	return role, nil
-}
-
-func (f *PermissionFlag) ManagedObjects(ctx context.Context, args []string) ([]types.ManagedObjectReference, error) {
-	if !f.asRef {
-		return f.DatacenterFlag.ManagedObjects(ctx, args)
-	}
-
-	var refs []types.ManagedObjectReference
-
-	for _, arg := range args {
-		var ref types.ManagedObjectReference
-		if ref.FromString(arg) {
-			refs = append(refs, ref)
-		} else {
-			return nil, fmt.Errorf("invalid moref: %s", arg)
-		}
-	}
-
-	return refs, nil
-}
-
-func (l *List) Write(w io.Writer) error {
-	ctx := context.Background()
-	finder, err := l.f.Finder()
-	if err != nil {
-		return err
-	}
-
-	refs := make(map[types.ManagedObjectReference]string)
-
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", "Role", "Entity", "Principal", "Propagate")
-
-	for _, perm := range l.Permissions {
-		propagate := "No"
-		if perm.Propagate {
-			propagate = "Yes"
-		}
-
-		name := l.Roles.ById(perm.RoleId).Name
-
-		p := "-"
-		if perm.Entity != nil {
-			if l.f.asRef {
-				p = perm.Entity.String()
-			} else {
-				// convert moref to inventory path
-				if p = refs[*perm.Entity]; p == "" {
-					e, err := finder.Element(ctx, *perm.Entity)
-					if err == nil {
-						p = e.Path
-					}
-
-					refs[*perm.Entity] = p
-				}
-			}
-		}
-
-		fmt.Fprintf(tw, "%s\t%s\t%s\t%s\n", name, p, perm.Principal, propagate)
-	}
-
-	return tw.Flush()
-}
-
-func (l *List) Add(perms []types.Permission) {
-	l.Permissions = append(l.Permissions, perms...)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/permissions/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/permissions/remove.go
deleted file mode 100644
index 892bfae94a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/permissions/remove.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package permissions
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type remove struct {
-	*PermissionFlag
-
-	types.Permission
-}
-
-func init() {
-	cli.Register("permissions.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.Principal, "principal", "", "User or group for which the permission is defined")
-	f.BoolVar(&cmd.Group, "group", false, "True, if principal refers to a group name; false, for a user name")
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *remove) Description() string {
-	return `Removes a permission rule from managed entities.
-
-Examples:
-  govc permissions.remove -principal root
-  govc permissions.remove -principal $USER@vsphere.local /dc1/host/cluster1`
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	refs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, ref := range refs {
-		err = m.RemoveEntityPermission(ctx, ref, cmd.Principal, cmd.Group)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/permissions/set.go b/installer/vendor/github.com/vmware/govmomi/govc/permissions/set.go
deleted file mode 100644
index ffcc9f0aef..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/permissions/set.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package permissions
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type set struct {
-	*PermissionFlag
-
-	types.Permission
-
-	role string
-}
-
-func init() {
-	cli.Register("permissions.set", &set{})
-}
-
-func (cmd *set) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.Principal, "principal", "", "User or group for which the permission is defined")
-	f.BoolVar(&cmd.Group, "group", false, "True, if principal refers to a group name; false, for a user name")
-	f.BoolVar(&cmd.Propagate, "propagate", true, "Whether or not this permission propagates down the hierarchy to sub-entities")
-	f.StringVar(&cmd.role, "role", "Admin", "Permission role name")
-}
-
-func (cmd *set) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *set) Usage() string {
-	return "[PATH]..."
-}
-
-func (cmd *set) Description() string {
-	return `Set the permissions managed entities.
-
-Examples:
-  govc permissions.set -principal root -role Admin
-  govc permissions.set -principal $USER@vsphere.local -role Admin /dc1/host/cluster1`
-}
-
-func (cmd *set) Run(ctx context.Context, f *flag.FlagSet) error {
-	refs, err := cmd.ManagedObjects(ctx, f.Args())
-	if err != nil {
-		return err
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	role, err := cmd.Role(cmd.role)
-	if err != nil {
-		return err
-	}
-
-	cmd.Permission.RoleId = role.RoleId
-
-	perms := []types.Permission{cmd.Permission}
-
-	for _, ref := range refs {
-		err = m.SetEntityPermissions(ctx, ref, perms)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/change.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/change.go
deleted file mode 100644
index ff662e76c0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/change.go
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.DatacenterFlag
-	*ResourceConfigSpecFlag
-
-	name string
-}
-
-func init() {
-	cli.Register("pool.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-	cmd.ResourceConfigSpecFlag = &ResourceConfigSpecFlag{
-		ResourceConfigSpec: types.ResourceConfigSpec{
-			CpuAllocation: types.ResourceAllocationInfo{
-				Shares: new(types.SharesInfo),
-			},
-			MemoryAllocation: types.ResourceAllocationInfo{
-				Shares: new(types.SharesInfo),
-			},
-		},
-	}
-	cmd.ResourceConfigSpecFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Resource pool name")
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourceConfigSpecFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Usage() string {
-	return "POOL..."
-}
-
-func (cmd *change) Description() string {
-	return "Change the configuration of one or more resource POOLs.\n" + poolNameHelp
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, ra := range []*types.ResourceAllocationInfo{&cmd.CpuAllocation, &cmd.MemoryAllocation} {
-		if ra.Shares.Level == "" {
-			ra.Shares = nil
-		}
-	}
-
-	for _, arg := range f.Args() {
-		pools, err := finder.ResourcePoolListAll(ctx, arg)
-		if err != nil {
-			return err
-		}
-
-		for _, pool := range pools {
-			err := pool.UpdateConfig(ctx, cmd.name, &cmd.ResourceConfigSpec)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/create.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/create.go
deleted file mode 100644
index d089b0a93f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/create.go
+++ /dev/null
@@ -1,95 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"path"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type create struct {
-	*flags.DatacenterFlag
-	*ResourceConfigSpecFlag
-}
-
-func init() {
-	cli.Register("pool.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.ResourceConfigSpecFlag = NewResourceConfigSpecFlag()
-	cmd.ResourceConfigSpecFlag.Register(ctx, f)
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourceConfigSpecFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Usage() string {
-	return "POOL..."
-}
-
-func (cmd *create) Description() string {
-	return "Create one or more resource POOLs.\n" + poolCreateHelp
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, arg := range f.Args() {
-		dir := path.Dir(arg)
-		base := path.Base(arg)
-		parents, err := finder.ResourcePoolList(ctx, dir)
-		if err != nil {
-			if _, ok := err.(*find.NotFoundError); ok {
-				return fmt.Errorf("cannot create resource pool '%s': parent not found", base)
-			}
-			return err
-		}
-
-		for _, parent := range parents {
-			_, err = parent.Create(ctx, base, cmd.ResourceConfigSpec)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/destroy.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/destroy.go
deleted file mode 100644
index 32a042f5c6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/destroy.go
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type destroy struct {
-	*flags.DatacenterFlag
-
-	children bool
-}
-
-func init() {
-	cli.Register("pool.destroy", &destroy{})
-}
-
-func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.children, "children", false, "Remove all children pools")
-}
-
-func (cmd *destroy) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *destroy) Usage() string {
-	return "POOL..."
-}
-
-func (cmd *destroy) Description() string {
-	return "Destroy one or more resource POOLs.\n" + poolNameHelp
-}
-
-func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, arg := range f.Args() {
-		pools, err := finder.ResourcePoolList(ctx, arg)
-		if err != nil {
-			if _, ok := err.(*find.NotFoundError); ok {
-				// Ignore if pool cannot be found
-				continue
-			}
-
-			return err
-		}
-
-		for _, pool := range pools {
-			if cmd.children {
-				err = pool.DestroyChildren(ctx)
-				if err != nil {
-					return err
-				}
-			} else {
-				task, err := pool.Destroy(ctx)
-				if err != nil {
-					return err
-				}
-				err = task.Wait(ctx)
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/help.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/help.go
deleted file mode 100644
index dbd8ca23bd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/help.go
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-var poolNameHelp = `
-POOL may be an absolute or relative path to a resource pool or a (clustered)
-compute host. If it resolves to a compute host, the associated root resource
-pool is returned. If a relative path is specified, it is resolved with respect
-to the current datacenter's "host" folder (i.e. /ha-datacenter/host).
-
-Paths to nested resource pools must traverse through the root resource pool of
-the selected compute host, i.e. "compute-host/Resources/nested-pool".
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-POOL may be specified as "*/Resources/*" to expand to all resource pools that
-are nested one level under the root resource pool, on all (clustered) compute
-hosts in the current datacenter.`
-
-var poolCreateHelp = `
-POOL may be an absolute or relative path to a resource pool. The parent of the
-specified POOL must be an existing resource pool. If a relative path is
-specified, it is resolved with respect to the current datacenter's "host"
-folder (i.e. /ha-datacenter/host). The basename of the specified POOL is used
-as the name for the new resource pool.
-
-The same globbing rules that apply to the "ls" command apply here. For example,
-the path to the parent resource pool in POOL may be specified as "*/Resources"
-to expand to the root resource pools on all (clustered) compute hosts in the
-current datacenter.
-
-For example:
-  */Resources/test             Create resource pool "test" on all (clustered)
-                               compute hosts in the current datacenter.
-  somehost/Resources/*/nested  Create resource pool "nested" in every
-                               resource pool that is a direct descendant of
-                               the root resource pool on "somehost".`
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/info.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/info.go
deleted file mode 100644
index ce379f6ce3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/info.go
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.DatacenterFlag
-	*flags.OutputFlag
-
-	pools bool
-	apps  bool
-}
-
-func init() {
-	cli.Register("pool.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.pools, "p", true, "List resource pools")
-	f.BoolVar(&cmd.apps, "a", false, "List virtual app resource pools")
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Usage() string {
-	return "POOL..."
-}
-
-func (cmd *info) Description() string {
-	return "Retrieve information about one or more resource POOLs.\n" + poolNameHelp
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	var res infoResult
-	var props []string
-
-	if cmd.OutputFlag.All() {
-		props = nil
-	} else {
-		props = []string{
-			"name",
-			"config.cpuAllocation",
-			"config.memoryAllocation",
-			"runtime.cpu",
-			"runtime.memory",
-		}
-	}
-
-	var vapps []*object.VirtualApp
-
-	for _, arg := range f.Args() {
-		if cmd.pools {
-			objects, err := finder.ResourcePoolList(ctx, arg)
-			if err != nil {
-				if _, ok := err.(*find.NotFoundError); !ok {
-					return err
-				}
-			}
-			res.objects = append(res.objects, objects...)
-		}
-
-		if cmd.apps {
-			apps, err := finder.VirtualAppList(ctx, arg)
-			if err != nil {
-				if _, ok := err.(*find.NotFoundError); !ok {
-					return err
-				}
-			}
-			vapps = append(vapps, apps...)
-		}
-	}
-
-	if len(res.objects) != 0 {
-		refs := make([]types.ManagedObjectReference, 0, len(res.objects))
-		for _, o := range res.objects {
-			refs = append(refs, o.Reference())
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &res.ResourcePools)
-		if err != nil {
-			return err
-		}
-	}
-
-	if len(vapps) != 0 {
-		var apps []mo.VirtualApp
-		refs := make([]types.ManagedObjectReference, 0, len(vapps))
-		for _, o := range vapps {
-			refs = append(refs, o.Reference())
-			p := object.NewResourcePool(c, o.Reference())
-			p.InventoryPath = o.InventoryPath
-			res.objects = append(res.objects, p)
-		}
-
-		pc := property.DefaultCollector(c)
-		err = pc.Retrieve(ctx, refs, props, &apps)
-		if err != nil {
-			return err
-		}
-
-		for _, app := range apps {
-			res.ResourcePools = append(res.ResourcePools, app.ResourcePool)
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	ResourcePools []mo.ResourcePool
-	objects       []*object.ResourcePool
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.ResourcePool, len(r.ResourcePools))
-	for _, o := range r.ResourcePools {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		pool := objects[o.Reference()]
-		fmt.Fprintf(tw, "Name:\t%s\n", pool.Name)
-		fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-
-		writeInfo(tw, "CPU", "MHz", &pool.Runtime.Cpu, pool.Config.CpuAllocation)
-		pool.Runtime.Memory.MaxUsage >>= 20
-		pool.Runtime.Memory.OverallUsage >>= 20
-		writeInfo(tw, "Mem", "MB", &pool.Runtime.Memory, pool.Config.MemoryAllocation)
-	}
-
-	return tw.Flush()
-}
-
-func writeInfo(w io.Writer, name string, units string, ru *types.ResourcePoolResourceUsage, ra types.ResourceAllocationInfo) {
-	usage := 100.0 * float64(ru.OverallUsage) / float64(ru.MaxUsage)
-	shares := ""
-	limit := "unlimited"
-
-	if ra.Shares.Level == types.SharesLevelCustom {
-		shares = fmt.Sprintf(" (%d)", ra.Shares.Shares)
-	}
-
-	if ra.Limit != nil {
-		limit = fmt.Sprintf("%d%s", *ra.Limit, units)
-	}
-
-	fmt.Fprintf(w, "  %s Usage:\t%d%s (%0.1f%%)\n", name, ru.OverallUsage, units, usage)
-	fmt.Fprintf(w, "  %s Shares:\t%s%s\n", name, ra.Shares.Level, shares)
-	fmt.Fprintf(w, "  %s Reservation:\t%d%s (expandable=%v)\n", name, *ra.Reservation, units, *ra.ExpandableReservation)
-	fmt.Fprintf(w, "  %s Limit:\t%s\n", name, limit)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go b/installer/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go
deleted file mode 100644
index 45522ae7fd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/pool/resource_config_spec.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pool
-
-import (
-	"context"
-	"flag"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type sharesInfo types.SharesInfo
-
-func (s *sharesInfo) String() string {
-	return string(s.Level)
-}
-
-func (s *sharesInfo) Set(val string) error {
-	switch val {
-	case string(types.SharesLevelNormal), string(types.SharesLevelLow), string(types.SharesLevelHigh):
-		s.Level = types.SharesLevel(val)
-	default:
-		n, err := strconv.Atoi(val)
-		if err != nil {
-			return err
-		}
-
-		s.Level = types.SharesLevelCustom
-		s.Shares = int32(n)
-	}
-
-	return nil
-}
-
-func NewResourceConfigSpecFlag() *ResourceConfigSpecFlag {
-	return &ResourceConfigSpecFlag{types.DefaultResourceConfigSpec()}
-}
-
-type ResourceConfigSpecFlag struct {
-	types.ResourceConfigSpec
-}
-
-func (s *ResourceConfigSpecFlag) Register(ctx context.Context, f *flag.FlagSet) {
-	opts := []struct {
-		name  string
-		units string
-		*types.ResourceAllocationInfo
-	}{
-		{"CPU", "MHz", &s.CpuAllocation},
-		{"Memory", "MB", &s.MemoryAllocation},
-	}
-
-	for _, opt := range opts {
-		prefix := strings.ToLower(opt.name)[:3]
-		shares := (*sharesInfo)(opt.Shares)
-
-		f.Var(flags.NewOptionalInt64(&opt.Limit), prefix+".limit", opt.name+" limit in "+opt.units)
-		f.Var(flags.NewOptionalInt64(&opt.Reservation), prefix+".reservation", opt.name+" reservation in "+opt.units)
-		f.Var(flags.NewOptionalBool(&opt.ExpandableReservation), prefix+".expandable", opt.name+" expandable reservation")
-		f.Var(shares, prefix+".shares", opt.name+" shares level or number")
-	}
-}
-
-func (s *ResourceConfigSpecFlag) Process(ctx context.Context) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/release.sh b/installer/vendor/github.com/vmware/govmomi/govc/release.sh
deleted file mode 100755
index 9d2de7d260..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/release.sh
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/bin/bash -e
-
-if ! which github-release > /dev/null; then
-  echo 'Please install github-release...'
-  echo ''
-  echo '  $ go get github.com/aktau/github-release'
-  echo ''
-  exit 1
-fi
-
-if [ -z "${GITHUB_TOKEN}" ]; then
-  echo 'Please set GITHUB_TOKEN...'
-  exit 1
-fi
-
-export GITHUB_USER="${GITHUB_USER:-vmware}"
-export GITHUB_REPO="${GITHUB_REPO:-govmomi}"
-
-name="$(git describe)"
-release=(github-release release --draft --name "${name}")
-
-case "$1" in
-  release)
-    tag="${name}"
-    ;;
-  prerelease)
-    tag="prerelease-${name}"
-    release+=(--pre-release)
-    ;;
-  dryrun)
-    ;;
-  *)
-    echo "Usage: $0 [release|prerelease]"
-    exit 1
-    ;;
-esac
-
-echo "Building govc..."
-rm -f ./govc_*
-./build.sh
-
-for name in govc_* ; do
-  if [ "${name: -4}" == ".exe" ] ; then
-    zip "${name}.zip" "$name" &
-  else
-    gzip -f "$name" &
-  fi
-done
-
-wait
-
-if [ -n "$tag" ] ; then
-  echo "Pushing tag ${tag}..."
-  git tag -f "${tag}"
-  git push origin "refs/tags/${tag}"
-fi
-
-# Generate description
-description=$(
-if [[ "${tag}" == "prerelease-"* ]]; then
-  echo '**This is a PRERELEASE version.**'
-fi
-
-echo "
-Documentation:
-
-* [CHANGELOG](https://github.com/vmware/govmomi/blob/$tag/govc/CHANGELOG.md)
-
-* [README](https://github.com/vmware/govmomi/blob/$tag/govc/README.md)
-
-* [USAGE](https://github.com/vmware/govmomi/blob/$tag/govc/USAGE.md)
-
-The binaries below are provided without warranty, following the [Apache license](LICENSE).
-"
-
-echo '
-Instructions:
-* Download the file relevant to your operating system
-* Decompress (i.e. `gzip -d govc_linux_amd64.gz`)
-* Set the executable bit (i.e. `chmod +x govc_linux_amd64`)
-* Move the file to a directory in your `$PATH` (i.e. `mv govc_linux_amd64 /usr/local/bin/govc`)
-'
-
-echo '```'
-echo '$ sha1sum govc_*.gz'
-sha1sum govc_*.gz
-echo '$ sha1sum govc_*.zip'
-sha1sum govc_*.zip
-echo '```'
-)
-
-release+=(--tag "${tag}" --description "${description}")
-
-if [ -n "$tag" ] ; then
-  echo "Creating release..."
-  "${release[@]}"
-else
-  echo "${release[@]}"
-fi
-
-# Upload build artifacts
-for f in govc_*.{gz,zip}; do
-  echo "Uploading $f..."
-  if [ -n "$tag" ] ; then
-    github-release upload --tag "${tag}" --name "${f}" --file "${f}"
-  fi
-done
-
-echo "Remember to publish the draft release!"
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/role/create.go b/installer/vendor/github.com/vmware/govmomi/govc/role/create.go
deleted file mode 100644
index eff65b2aa5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/role/create.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package role
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/permissions"
-)
-
-type create struct {
-	*permissions.PermissionFlag
-}
-
-func init() {
-	cli.Register("role.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Usage() string {
-	return "NAME [PRIVILEGE]..."
-}
-
-func (cmd *create) Description() string {
-	return `Create authorization role.
-
-Optionally populate the role with the given PRIVILEGE(s).
-
-Examples:
-  govc role.create MyRole
-  govc role.create NoDC $(govc role.ls Admin | grep -v Datacenter.)`
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	_, err = m.AddRole(ctx, f.Arg(0), f.Args()[1:])
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/role/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/role/ls.go
deleted file mode 100644
index 6c701f517a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/role/ls.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package role
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/permissions"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*permissions.PermissionFlag
-}
-
-func init() {
-	cli.Register("role.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "[NAME]"
-}
-
-func (cmd *ls) Description() string {
-	return `List authorization roles.
-
-If NAME is provided, list privileges for the role.
-
-Examples:
-  govc role.ls
-  govc role.ls Admin`
-}
-
-type lsRoleList object.AuthorizationRoleList
-
-func (rl lsRoleList) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	for _, role := range rl {
-		fmt.Fprintf(tw, "%s\t%s\n", role.Name, role.Info.GetDescription().Summary)
-	}
-
-	return tw.Flush()
-}
-
-type lsRole types.AuthorizationRole
-
-func (r lsRole) Write(w io.Writer) error {
-	for _, p := range r.Privilege {
-		fmt.Println(p)
-	}
-	return nil
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() > 1 {
-		return flag.ErrHelp
-	}
-
-	_, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() == 1 {
-		role, err := cmd.Role(f.Arg(0))
-		if err != nil {
-			return err
-		}
-
-		return cmd.WriteResult(lsRole(*role))
-	}
-
-	return cmd.WriteResult(lsRoleList(cmd.Roles))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/role/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/role/remove.go
deleted file mode 100644
index 0614ca90ee..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/role/remove.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package role
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/permissions"
-)
-
-type remove struct {
-	*permissions.PermissionFlag
-
-	force bool
-}
-
-func init() {
-	cli.Register("role.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.force, "force", false, "Force removal if role is in use")
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Usage() string {
-	return "NAME"
-}
-
-func (cmd *remove) Description() string {
-	return `Remove authorization role.
-
-Examples:
-  govc role.remove MyRole
-  govc role.remove MyRole -force`
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	role, err := cmd.Role(f.Arg(0))
-	if err != nil {
-		return err
-	}
-
-	return m.RemoveRole(ctx, role.RoleId, !cmd.force)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/role/update.go b/installer/vendor/github.com/vmware/govmomi/govc/role/update.go
deleted file mode 100644
index ad059ad098..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/role/update.go
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package role
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/permissions"
-)
-
-type update struct {
-	*permissions.PermissionFlag
-
-	name   string
-	remove bool
-	add    bool
-}
-
-func init() {
-	cli.Register("role.update", &update{})
-}
-
-func (cmd *update) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Change role name")
-	f.BoolVar(&cmd.remove, "r", false, "Remove given PRIVILEGE(s)")
-	f.BoolVar(&cmd.add, "a", false, "Add given PRIVILEGE(s)")
-}
-
-func (cmd *update) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *update) Usage() string {
-	return "NAME [PRIVILEGE]..."
-}
-
-func (cmd *update) Description() string {
-	return `Update authorization role.
-
-Set, Add or Remove role PRIVILEGE(s).
-
-Examples:
-  govc role.update MyRole $(govc role.ls Admin | grep VirtualMachine.)
-  govc role.update -r MyRole $(govc role.ls Admin | grep VirtualMachine.GuestOperations.)
-  govc role.update -a MyRole $(govc role.ls Admin | grep Datastore.)
-  govc role.update -name RockNRole MyRole`
-}
-
-func (cmd *update) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	role, err := cmd.Role(f.Arg(0))
-	if err != nil {
-		return err
-	}
-
-	ids := role.Privilege
-	args := f.Args()[1:]
-
-	if cmd.add {
-		ids = append(ids, args...)
-	} else if cmd.remove {
-		ids = nil
-		rm := make(map[string]bool, len(args))
-		for _, arg := range args {
-			rm[arg] = true
-		}
-
-		for _, id := range role.Privilege {
-			if !rm[id] {
-				ids = append(ids, id)
-			}
-		}
-	} else if len(args) != 0 {
-		ids = args
-	}
-
-	if cmd.name == "" {
-		cmd.name = role.Name
-	}
-
-	return m.UpdateRole(ctx, role.RoleId, cmd.name, ids)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/role/usage.go b/installer/vendor/github.com/vmware/govmomi/govc/role/usage.go
deleted file mode 100644
index cafa77d79a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/role/usage.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package role
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/permissions"
-)
-
-type usage struct {
-	*permissions.PermissionFlag
-}
-
-func init() {
-	cli.Register("role.usage", &usage{})
-}
-
-func (cmd *usage) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.PermissionFlag, ctx = permissions.NewPermissionFlag(ctx)
-	cmd.PermissionFlag.Register(ctx, f)
-}
-
-func (cmd *usage) Process(ctx context.Context) error {
-	if err := cmd.PermissionFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *usage) Usage() string {
-	return "NAME..."
-}
-
-func (cmd *usage) Description() string {
-	return `List usage for role NAME.
-
-Examples:
-  govc role.usage
-  govc role.usage Admin`
-}
-
-func (cmd *usage) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.Manager(ctx)
-	if err != nil {
-		return err
-	}
-
-	if f.NArg() == 0 {
-		cmd.List.Permissions, err = m.RetrieveAllPermissions(ctx)
-		if err != nil {
-			return err
-		}
-	} else {
-		for _, name := range f.Args() {
-			role, err := cmd.Role(name)
-			if err != nil {
-				return err
-			}
-
-			perms, err := m.RetrieveRolePermissions(ctx, role.RoleId)
-			if err != nil {
-				return err
-			}
-
-			cmd.List.Add(perms)
-		}
-	}
-
-	return cmd.WriteResult(&cmd.List)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/session/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/session/ls.go
deleted file mode 100644
index ae077decec..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/session/ls.go
+++ /dev/null
@@ -1,121 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package session
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"text/tabwriter"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-type ls struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("session.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Description() string {
-	return `List active sessions.
-
-Examples:
-  govc session.ls
-  govc session.ls -json | jq -r .CurrentSession.Key`
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-type sessionInfo struct {
-	cmd *ls
-	mo.SessionManager
-}
-
-func (s *sessionInfo) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 4, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "Key\t")
-	fmt.Fprintf(tw, "Name\t")
-	fmt.Fprintf(tw, "Time\t")
-	fmt.Fprintf(tw, "Idle\t")
-	fmt.Fprintf(tw, "Host\t")
-	fmt.Fprintf(tw, "Agent\t")
-	fmt.Fprintf(tw, "\t")
-	fmt.Fprint(tw, "\n")
-
-	for _, v := range s.SessionList {
-		idle := "  ."
-		if v.Key != s.CurrentSession.Key {
-			since := time.Since(v.LastActiveTime)
-			if since > time.Hour {
-				idle = "old"
-			} else {
-				idle = (time.Duration(since.Seconds()) * time.Second).String()
-			}
-		}
-		fmt.Fprintf(tw, "%s\t", v.Key)
-		fmt.Fprintf(tw, "%s\t", v.UserName)
-		fmt.Fprintf(tw, "%s\t", v.LoginTime.Format("2006-01-02 15:04"))
-		fmt.Fprintf(tw, "%s\t", idle)
-		fmt.Fprintf(tw, "%s\t", v.IpAddress)
-		fmt.Fprintf(tw, "%s\t", v.UserAgent)
-		fmt.Fprint(tw, "\n")
-	}
-
-	return tw.Flush()
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	var m mo.SessionManager
-	pc := property.DefaultCollector(c)
-	err = pc.RetrieveOne(ctx, *c.ServiceContent.SessionManager, nil, &m)
-	if err != nil {
-		return nil
-	}
-
-	return cmd.WriteResult(&sessionInfo{cmd, m})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/session/rm.go b/installer/vendor/github.com/vmware/govmomi/govc/session/rm.go
deleted file mode 100644
index 9792dbe786..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/session/rm.go
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package session
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/session"
-)
-
-type rm struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("session.rm", &rm{})
-}
-
-func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *rm) Usage() string {
-	return "KEY..."
-}
-
-func (cmd *rm) Description() string {
-	return `Remove active sessions.
-
-Examples:
-  govc session.ls | grep root
-  govc session.rm 5279e245-e6f1-4533-4455-eb94353b213a`
-}
-
-func (cmd *rm) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	return session.NewManager(c).TerminateSession(ctx, f.Args())
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/task/cancel.go b/installer/vendor/github.com/vmware/govmomi/govc/task/cancel.go
deleted file mode 100644
index 7718718659..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/task/cancel.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package task
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type cancel struct {
-	*flags.ClientFlag
-}
-
-func init() {
-	cli.Register("task.cancel", &cancel{})
-}
-
-func (cmd *cancel) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-}
-
-func (cmd *cancel) Description() string {
-	return `Cancel tasks.
-
-Examples:
-  govc task.cancel task-759`
-}
-
-func (cmd *cancel) Usage() string {
-	return "ID..."
-}
-
-func (cmd *cancel) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *cancel) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	for _, id := range f.Args() {
-		var ref types.ManagedObjectReference
-
-		if !ref.FromString(id) {
-			ref.Type = "Task"
-			ref.Value = id
-		}
-
-		err = object.NewTask(c, ref).Cancel(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/task/recent.go b/installer/vendor/github.com/vmware/govmomi/govc/task/recent.go
deleted file mode 100644
index 864891a5ab..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/task/recent.go
+++ /dev/null
@@ -1,219 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package task
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type recent struct {
-	*flags.DatacenterFlag
-
-	max    int
-	follow bool
-	long   bool
-}
-
-func init() {
-	cli.Register("tasks", &recent{})
-}
-
-func (cmd *recent) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	f.IntVar(&cmd.max, "n", 25, "Output the last N tasks")
-	f.BoolVar(&cmd.follow, "f", false, "Follow recent task updates")
-	f.BoolVar(&cmd.long, "l", false, "Use long task description")
-}
-
-func (cmd *recent) Description() string {
-	return `Display info for recent tasks.
-
-When a task has completed, the result column includes the task duration on success or
-error message on failure.  If a task is still in progress, the result column displays
-the completion percentage and the task ID.  The task ID can be used as an argument to
-the 'task.cancel' command.
-
-By default, all recent tasks are included (via TaskManager), but can be limited by PATH
-to a specific inventory object.
-
-Examples:
-  govc tasks
-  govc tasks -f
-  govc tasks -f /dc1/host/cluster1`
-}
-
-func (cmd *recent) Usage() string {
-	return "[PATH]"
-}
-
-func (cmd *recent) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func chop(s string) string {
-	if len(s) < 30 {
-		return s
-	}
-
-	return s[:29] + "*"
-}
-
-// taskName describes the tasks similar to the ESX ui
-func taskName(info *types.TaskInfo) string {
-	name := strings.TrimSuffix(info.Name, "_Task")
-	switch name {
-	case "":
-		return info.DescriptionId
-	case "Destroy", "Rename":
-		return info.Entity.Type + "." + name
-	default:
-		return name
-	}
-}
-
-func (cmd *recent) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	m := c.ServiceContent.TaskManager
-
-	tn := taskName
-
-	if cmd.long {
-		var o mo.TaskManager
-		err = property.DefaultCollector(c).RetrieveOne(ctx, *m, []string{"description.methodInfo"}, &o)
-		if err != nil {
-			return err
-		}
-
-		desc := make(map[string]string, len(o.Description.MethodInfo))
-
-		for _, entry := range o.Description.MethodInfo {
-			info := entry.GetElementDescription()
-			desc[info.Key] = info.Label
-		}
-
-		tn = func(info *types.TaskInfo) string {
-			if name, ok := desc[info.DescriptionId]; ok {
-				return name
-			}
-
-			return taskName(info)
-		}
-	}
-
-	watch := *m
-
-	if f.NArg() == 1 {
-		refs, merr := cmd.ManagedObjects(ctx, f.Args())
-		if merr != nil {
-			return merr
-		}
-		watch = refs[0]
-	}
-
-	v, err := view.NewManager(c).CreateTaskView(ctx, &watch)
-	if err != nil {
-		return nil
-	}
-
-	defer v.Destroy(context.Background())
-
-	v.Follow = cmd.follow
-
-	stamp := "15:04:05"
-	tmpl := "%-40s %-30s %15s %9s %9s %9s %s\n"
-	fmt.Fprintf(cmd.Out, tmpl, "Task", "Target", "Initiator", "Queued", "Started", "Completed", "Result")
-
-	var last string
-	updated := false
-
-	return v.Collect(ctx, func(tasks []types.TaskInfo) {
-		if !updated && len(tasks) > cmd.max {
-			tasks = tasks[len(tasks)-cmd.max:]
-		}
-		updated = true
-
-		for _, info := range tasks {
-			var user string
-
-			switch x := info.Reason.(type) {
-			case *types.TaskReasonUser:
-				user = x.UserName
-			}
-
-			if info.EntityName == "" || user == "" {
-				continue
-			}
-
-			ruser := strings.SplitN(user, "\\", 2)
-			if len(ruser) == 2 {
-				user = ruser[1] // discard domain
-			} else {
-				user = strings.TrimPrefix(user, "com.vmware.") // e.g. com.vmware.vsan.health
-			}
-
-			queued := info.QueueTime.Format(stamp)
-			start := "-"
-			end := start
-
-			if info.StartTime != nil {
-				start = info.StartTime.Format(stamp)
-			}
-
-			msg := fmt.Sprintf("%2d%% %s", info.Progress, info.Task)
-
-			if info.CompleteTime != nil {
-				msg = info.CompleteTime.Sub(*info.StartTime).String()
-
-				if info.State == types.TaskInfoStateError {
-					msg = strings.TrimSuffix(info.Error.LocalizedMessage, ".")
-				}
-
-				end = info.CompleteTime.Format(stamp)
-			}
-
-			result := fmt.Sprintf("%-7s [%s]", info.State, msg)
-
-			item := fmt.Sprintf(tmpl, tn(&info), chop(info.EntityName), user, queued, start, end, result)
-
-			if item == last {
-				continue // task info was updated, but the fields we display were not
-			}
-			last = item
-
-			fmt.Fprint(cmd.Out, item)
-		}
-	})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/.gitignore b/installer/vendor/github.com/vmware/govmomi/govc/test/.gitignore
deleted file mode 100644
index 9b6adf2f29..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-govc_ca.*
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/README.md b/installer/vendor/github.com/vmware/govmomi/govc/test/README.md
deleted file mode 100644
index da48638676..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/README.md
+++ /dev/null
@@ -1,59 +0,0 @@
-# Functional tests for govc
-
-The govc tests use [bats](https://github.com/sstephenson/bats/)
-
-## Download test images
-
-Some tests depend on ttylinux images, these can be downloaded by running:
-
-```
-./images/update.sh
-```
-
-These images are uploaded to the `$GOVC_TEST_URL` as needed by tests and can be
-removed with the following command:
-
-```
-./clean.sh
-```
-
-## GOVC_TEST_URL
-
-Some of the govc tests need an ESX instance to run against.  Any ESX box can be used by exporting the following variable:
-
-```
-export GOVC_TEST_URL=user:pass@hostname
-```
-
-## Running tests
-
-Tests can be run using the top-level Makefile:
-
-```
-make govc-test
-```
-
-Or the following command:
-
-```
-bats .
-```
-
-Or individually, for example:
-
-```
-./cli.bats
-```
-
-Note that the test helper prepends `$GOPATH/bin` to `PATH` as the tests depend on both the *govc* and *vcsim* binaries.
-
-## Platform specific notes
-
-### Darwin (MacOSX)
-
-Install gxargs, greadlink and gmktemp on Darwin
-
-```
-brew install coreutils
-brew install findutils
-```
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh
deleted file mode 100755
index cc97f6ee46..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/boot_order_test.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/bin/bash -e
-
-# This test is not run via bats.
-# A VNC session will be opened to observe the VM boot order:
-# 1) from floppy  (followed by: eject floppy, reboot)
-# 2) from cdrom   (followed by: eject cdrom, reboot)
-# 3) from network (will timeout)
-# 4) from disk
-
-. $(dirname $0)/test_helper.bash
-
-upload_img
-upload_iso
-
-id=$(new_ttylinux_vm)
-
-function cleanup() {
-  quit_vnc $vnc
-  govc vm.destroy $id
-  pkill -TERM -g $$ ^nc
-}
-
-trap cleanup EXIT
-
-govc device.cdrom.add -vm $id > /dev/null
-govc device.cdrom.insert -vm $id $GOVC_TEST_ISO
-
-govc device.floppy.add -vm $id > /dev/null
-govc device.floppy.insert -vm $id $GOVC_TEST_IMG
-
-govc device.boot -vm $id -delay 1000 -order floppy,cdrom,ethernet,disk
-
-vnc=$(govc vm.vnc -port 21122 -password govmomi -enable "${id}" | awk '{print $2}')
-
-echo "booting from floppy..."
-govc vm.power -on $id
-
-open_vnc $vnc
-
-sleep 10
-
-govc vm.power -off $id
-
-govc device.floppy.eject -vm $id
-
-# this is ttylinux-live, notice the 'boot:' prompt vs 'login:' prompt when booted from disk
-echo "booting from cdrom..."
-govc vm.power -on $id
-
-sleep 10
-
-govc vm.power -off $id
-
-govc device.cdrom.eject -vm $id
-
-govc device.serial.add -vm $id > /dev/null
-govc device.serial.connect -vm $id -
-
-echo "booting from network, will timeout then boot from disk..."
-govc vm.power -on $id
-
-# serial console log
-device=$(govc device.ls -vm "$id" | grep serialport- | awk '{print $1}')
-govc datastore.tail -f "$id/$device.log" &
-
-ip=$(govc vm.ip $id)
-
-echo "VM booted from disk (ip=$ip)"
-
-sleep 5
-
-govc vm.power -s $id
-
-sleep 5
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/clean.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/clean.sh
deleted file mode 100755
index f910e5dabb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/clean.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-#
-# Cleanup any artifacts created by govc
-#
-
-. $(dirname $0)/test_helper.bash
-
-teardown
-
-datastore_rm() {
-  name=$1
-  govc datastore.rm $name 2> /dev/null
-}
-
-datastore_rm $GOVC_TEST_IMG
-datastore_rm $GOVC_TEST_ISO
-datastore_rm $GOVC_TEST_VMDK
-datastore_rm $(echo $GOVC_TEST_VMDK | sed 's/.vmdk/-flat.vmdk/')
-datastore_rm $(dirname $GOVC_TEST_VMDK)
-
-# Recursively destroy all resource pools created by the test suite
-govc ls host/*/Resources/govc-test-* | \
-  xargs -rt govc pool.destroy -r
-
-govc datastore.ls
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/cli.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/cli.bats
deleted file mode 100755
index da32e6f5d8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/cli.bats
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "about" {
-  vcsim_env -esx
-
-  run govc about
-  assert_success
-  assert_line "Vendor: VMware, Inc."
-
-  run govc about --tls-handshake-timeout=10s
-  assert_success
-  assert_line "Vendor: VMware, Inc."
-
-  run env GOVC_TLS_HANDSHAKE_TIMEOUT=10s govc about
-  assert_success
-  assert_line "Vendor: VMware, Inc."
-
-  run env GOVC_TLS_HANDSHAKE_TIMEOUT=NOT_A_DURATION govc about
-  assert_success
-  assert_line "Vendor: VMware, Inc."
-
-  run govc about --tls-handshake-timeout=1ns
-  assert_failure
-
-  run env GOVC_TLS_HANDSHAKE_TIMEOUT=1ns govc about
-  assert_failure
-
-  run govc about -json
-  assert_success
-
-  run govc about -json -l
-  assert_success
-
-  run govc about -dump
-  assert_success
-
-  run govc about -dump -l
-  assert_success
-}
-
-@test "about.cert" {
-  vcsim_env -esx
-
-  run govc about.cert
-  assert_success
-
-  run govc about.cert -json
-  assert_success
-
-  run govc about.cert -show
-  assert_success
-
-  # with -k=true we get thumbprint output and exit 0
-  thumbprint=$(govc about.cert -k=true -thumbprint)
-
-  # with -k=true we get thumbprint output and exit 60
-  run govc about.cert -k=false -thumbprint
-  if [ "$status" -ne 60 ]; then
-    flunk $(printf "expected failed exit status=60, got status=%d" $status)
-  fi
-  assert_output "$thumbprint"
-
-  run govc about -k=false
-  assert_failure
-
-  run govc about -k=false -tls-known-hosts <(echo "$thumbprint")
-  assert_success
-
-  run govc about -k=false -tls-known-hosts <(echo "nope nope")
-  assert_failure
-}
-
-@test "version" {
-  vcsim_env -esx
-
-  run govc version
-  assert_success
-
-  v=$(govc version | awk '{print $NF}')
-  run govc version -require "$v"
-  assert_success
-
-  run govc version -require "not-a-version-string"
-  assert_failure
-
-  run govc version -require 100.0.0
-  assert_failure
-}
-
-@test "login attempt without credentials" {
-  vcsim_env -esx
-
-  host=$(govc env -x GOVC_URL_HOST)
-  port=$(govc env -x GOVC_URL_PORT)
-  run govc about -u "enoent@$host:$port"
-  assert_failure "govc: ServerFaultCode: Login failure"
-}
-
-@test "login attempt with GOVC_URL, GOVC_USERNAME, and GOVC_PASSWORD" {
-  vcsim_env -esx
-
-  govc_url_to_vars
-  run govc about
-  assert_success
-}
-
-@test "API version check" {
-  vcsim_env -esx
-
-  run env GOVC_MIN_API_VERSION=24.4 govc about
-  assert grep -q "^govc: Require API version \"24.4\"," <<<"${output}"
-
-  run env GOVC_MIN_API_VERSION=no.no govc about
-  assert_failure
-
-  run env GOVC_MIN_API_VERSION=- govc about
-  assert_success
-
-  run env GOVC_MIN_API_VERSION=5.0 govc about
-  assert_success
-
-  run govc about -vim-namespace urn:vim25 -vim-version 6.0
-  assert_success
-}
-
-@test "govc env" {
-  output="$(govc env -x -u 'user:pass@enoent:99999?key=val#anchor')"
-  assert grep -q GOVC_URL=enoent:99999 <<<${output}
-  assert grep -q GOVC_USERNAME=user <<<${output}
-  assert grep -q GOVC_PASSWORD=pass <<<${output}
-
-  assert grep -q GOVC_URL_SCHEME=https <<<${output}
-  assert grep -q GOVC_URL_HOST=enoent <<<${output}
-  assert grep -q GOVC_URL_PORT=99999 <<<${output}
-  assert grep -q GOVC_URL_PATH=/sdk <<<${output}
-  assert grep -q GOVC_URL_QUERY=key=val <<<${output}
-  assert grep -q GOVC_URL_FRAGMENT=anchor <<<${output}
-
-  password="pa\$sword\!ok"
-  run govc env -u "user:${password}@enoent:99999" GOVC_PASSWORD
-  assert_output "$password"
-}
-
-@test "govc help" {
-  run govc
-  assert_failure
-
-  run govc -h
-  assert_success
-
-  run govc -enoent
-  assert_failure
-
-  run govc vm.create
-  assert_failure
-
-  run govc vm.create -h
-  assert_success
-
-  run govc vm.create -enoent
-  assert_failure
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats
deleted file mode 100755
index cc073bffee..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/datacenter.bats
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "datacenter.info" {
-  vcsim_env -esx
-
-  dc=$(govc ls -t Datacenter / | head -n1)
-  run govc datacenter.info "$dc"
-  assert_success
-
-  run govc datacenter.info -json "$dc"
-  assert_success
-
-  run govc datacenter.info /enoent
-  assert_failure
-}
-
-@test "datacenter.create" {
-  vcsim_env
-  unset GOVC_DATACENTER
-
-  # name not specified
-  run govc datacenter.create
-  assert_failure
-
-  dcs=($(new_id) $(new_id))
-  run govc datacenter.create "${dcs[@]}"
-  assert_success
-
-  for dc in ${dcs[*]}; do
-    run govc ls "/$dc"
-    assert_success
-    # /<datacenter>/{vm,network,host,datastore}
-    [ ${#lines[@]} -eq 4 ]
-
-    run govc datacenter.info "/$dc"
-    assert_success
-  done
-}
-
-@test "datacenter commands fail against ESX" {
-  vcsim_env -esx
-
-  run govc datacenter.create something
-  assert_failure
-
-  run govc object.destroy /ha-datacenter
-  assert_failure
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/datastore.bats
deleted file mode 100755
index 5ce01fcba8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore.bats
+++ /dev/null
@@ -1,291 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-upload_file() {
-  name=$(new_id)
-
-  echo "Hello world" | govc datastore.upload - "$name"
-  assert_success
-
-  echo "$name"
-}
-
-@test "datastore.ls" {
-  vcsim_env -esx
-
-  name=$(upload_file)
-
-  # Single argument
-  run govc datastore.ls "${name}"
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  # Multiple arguments
-  run govc datastore.ls "${name}" "${name}"
-  assert_success
-  [ ${#lines[@]} -eq 2 ]
-
-  # Pattern argument
-  run govc datastore.ls "./govc-test-*"
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-
-  # Long listing
-  run govc datastore.ls -l "./govc-test-*"
-  assert_success
-  assert_equal "12B" $(awk '{ print $1 }' <<<${output})
-}
-
-@test "datastore.ls-R" {
-  esx_env
-
-  dir=$(new_id)
-
-  run govc datastore.mkdir "$dir"
-  assert_success
-
-  for name in one two three ; do
-    echo "$name world" | govc datastore.upload - "$dir/file-$name"
-    run govc datastore.mkdir -p "$dir/dir-$name/subdir-$name"
-    run govc datastore.mkdir -p "$dir/dir-$name/.hidden"
-    assert_success
-    echo "$name world" | govc datastore.upload - "$dir/dir-$name/.hidden/other-$name"
-    echo "$name world" | govc datastore.upload - "$dir/dir-$name/other-$name"
-    echo "$name world" | govc datastore.upload - "$dir/dir-$name/subdir-$name/last-$name"
-  done
-
-  # without -R
-  json=$(govc datastore.ls -json -l -p "$dir")
-  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
-  [ "$result" -eq 6 ]
-
-  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
-  [ "$result" -eq 1 ]
-
-  # with -R
-  json=$(govc datastore.ls -json -l -p -R "$dir")
-  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
-  [ "$result" -eq 15 ]
-
-  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
-  [ "$result" -eq 7 ]
-
-  # with -R -a
-  json=$(govc datastore.ls -json -l -p -R -a "$dir")
-  result=$(jq -r .[].File[].Path <<<"$json" | wc -l)
-  [ "$result" -eq 21 ]
-
-  result=$(jq -r .[].FolderPath <<<"$json" | wc -l)
-  [ "$result" -eq 10 ]
-}
-
-@test "datastore.rm" {
-  vcsim_env -esx
-
-  name=$(upload_file)
-
-  # Not found is a failure
-  run govc datastore.rm "${name}.notfound"
-  assert_failure
-
-  # Not found is NOT a failure with the force flag
-  run govc datastore.rm -f "${name}.notfound"
-  assert_success
-  assert_empty "${output}"
-
-  # Verify the file is present
-  run govc datastore.ls "${name}"
-  assert_success
-
-  # Delete the file
-  run govc datastore.rm "${name}"
-  assert_success
-  assert_empty "${output}"
-
-  # Verify the file is gone
-  run govc datastore.ls "${name}"
-  assert_failure
-}
-
-@test "datastore.info" {
-  vcsim_env -esx
-
-  run govc datastore.info enoent
-  assert_failure
-
-  run govc datastore.info
-  assert_success
-  [ ${#lines[@]} -gt 1 ]
-}
-
-
-@test "datastore.mkdir" {
-  vcsim_env -esx
-
-  name=$(new_id)
-
-  # Not supported datastore type is a failure
-  run govc datastore.mkdir -namespace "notfound"
-  assert_failure
-  assert_matches "govc: ServerFaultCode: .*" "${output}"
-
-  run govc datastore.mkdir "${name}"
-  assert_success
-  assert_empty "${output}"
-
-  # Verify the dir is present
-  run govc datastore.ls "${name}"
-  assert_success
-
-  # Delete the dir on an unsupported datastore type is a failure
-  run govc datastore.rm -namespace "${name}"
-  assert_failure
-  assert_matches "govc: ServerFaultCode: .*" "${output}"
-
-  # Delete the dir
-  run govc datastore.rm "${name}"
-  assert_success
-  assert_empty "${output}"
-
-  # Verify the dir is gone
-  run govc datastore.ls "${name}"
-  assert_failure
-}
-
-@test "datastore.download" {
-  vcsim_env -esx
-
-  name=$(upload_file)
-  run govc datastore.download "$name" -
-  assert_success
-  assert_output "Hello world"
-
-  run govc datastore.download "$name" "$BATS_TMPDIR/$name"
-  assert_success
-  run cat "$BATS_TMPDIR/$name"
-  assert_output "Hello world"
-  rm "$BATS_TMPDIR/$name"
-}
-
-@test "datastore.upload" {
-  esx_env
-
-  name=$(new_id)
-  echo -n "Hello world" | govc datastore.upload - "$name"
-
-  run govc datastore.download "$name" -
-  assert_success
-  assert_output "Hello world"
-}
-
-@test "datastore.tail" {
-  esx_env
-
-  run govc datastore.tail "enoent/enoent.log"
-  assert_failure
-
-  id=$(new_id)
-  govc vm.create "$id"
-  govc vm.power -off "$id"
-
-  # test with .log (> bufSize) and .vmx (< bufSize)
-  for file in "$id/vmware.log" "$id/$id.vmx" ; do
-    log=$(govc datastore.download "$file" -)
-
-    for n in 0 1 5 10 123 456 7890 ; do
-      expect=$(tail -n $n <<<"$log")
-
-      run govc datastore.tail -n $n "$file"
-      assert_output "$expect"
-
-      expect=$(tail -c $n <<<"$log")
-
-      run govc datastore.tail -c $n "$file"
-      assert_output "$expect"
-    done
-  done
-}
-
-@test "datastore.disk" {
-  esx_env
-
-  id=$(new_id)
-  vmdk="$id/$id.vmdk"
-
-  run govc datastore.mkdir "$id"
-  assert_success
-
-  run govc datastore.disk.create "$vmdk"
-  assert_success
-
-  run govc datastore.disk.info "$vmdk"
-  assert_success
-
-  run govc datastore.rm "$vmdk"
-  assert_success
-
-  run govc datastore.mkdir -p "$id"
-  assert_success
-
-  run govc datastore.disk.create "$vmdk"
-  assert_success
-
-  id=$(new_id)
-  run govc vm.create -on=false -link -disk "$vmdk" "$id"
-  assert_success
-
-  run govc datastore.disk.info -d "$vmdk"
-  assert_success
-
-  run govc datastore.disk.info -p=false "$vmdk"
-  assert_success
-
-  run govc datastore.disk.info -c "$vmdk"
-  assert_success
-
-  run govc datastore.disk.info -json "$vmdk"
-  assert_success
-
-  # should fail due to: ddb.deletable=false
-  run govc datastore.rm "$vmdk"
-  assert_failure
-
-  run govc datastore.rm -f "$vmdk"
-  assert_success
-
-  # one more time, but rm the directory w/o -f
-  run govc datastore.mkdir -p "$id"
-  assert_success
-
-  run govc datastore.disk.create "$vmdk"
-  assert_success
-
-  id=$(new_id)
-  run govc vm.create -on=false -link -disk "$vmdk" "$id"
-  assert_success
-
-  run govc datastore.rm "$(dirname "$vmdk")"
-  assert_success
-}
-
-@test "datastore.disk.info" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  run govc datastore.disk.info
-  assert_failure
-
-  run govc datastore.disk.info enoent
-  assert_failure
-
-  run govc datastore.disk.info "$GOVC_TEST_VMDK"
-  assert_success
-
-  run govc datastore.disk.info -d "$GOVC_TEST_VMDK"
-  assert_success
-
-  run govc datastore.disk.info -c "$GOVC_TEST_VMDK"
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh
deleted file mode 100755
index c19de8b502..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_file_manager_test.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash -e
-
-# This test is not run via bats
-
-# See also: datastore.bats@test "datastore.disk"
-
-export GOVC_TEST_URL=$GOVC_URL
-
-. "$(dirname "$0")"/test_helper.bash
-
-echo -n "checking datastore type..."
-type=$(govc object.collect -s "datastore/$GOVC_DATASTORE" summary.type)
-echo "$type"
-
-if [ "$type" = "vsan" ] ; then
-  echo -n "checking for orphan objects..."
-  objs=($(govc datastore.vsan.dom.ls -o))
-  echo "${#objs[@]}"
-
-  if [ "${#objs[@]}" -ne "0" ] ; then
-    govc datastore.vsan.dom.rm "${objs[@]}"
-  fi
-fi
-
-dir=govc-test-dfm
-
-echo "uploading plain file..."
-cal | govc datastore.upload - $dir/cal.txt
-echo "removing plain file..."
-govc datastore.rm $dir/cal.txt
-
-scratch=$dir/govc-test-scratch/govc-test-scratch.vmdk
-
-govc datastore.mkdir -p "$(dirname $scratch)"
-
-echo "creating disk $scratch..."
-govc datastore.disk.create -size 1M $scratch
-
-id=$(new_id)
-
-echo "creating $id VM with disk linked to $scratch..."
-govc vm.create -on=false -link -disk $scratch "$id"
-info=$(govc device.info -vm "$id" disk-*)
-echo "$info"
-
-disk="$(grep Name: <<<"$info" | awk '{print $2}')"
-vmdk="$id/$id.vmdk"
-
-echo "removing $disk device but keeping the .vmdk backing file..."
-govc device.remove -vm "$id" -keep "$disk"
-
-echo -n "checking delta disk ddb.deletable..."
-govc datastore.download "$vmdk" - | grep -q -v ddb.deletable
-echo "yes"
-
-echo -n "checking scratch disk ddb.deletable..."
-govc datastore.download "$scratch" - | grep ddb.deletable | grep -q false
-echo "no"
-
-echo "removing $vmdk"
-govc datastore.rm "$vmdk"
-
-echo -n "checking that rm $scratch fails..."
-govc datastore.rm "$scratch" 2>/dev/null || echo "yes"
-
-echo -n "checking that rm -f $scratch deletes..."
-govc datastore.rm -f "$scratch" && echo "yes"
-
-echo "removing disk Directory via FileManager..."
-govc datastore.mkdir -p "$(dirname $scratch)"
-govc datastore.disk.create -size 1M $scratch
-govc datastore.rm "$(dirname $scratch)"
-
-echo -n "checking for remaining files..."
-govc datastore.ls -p -R $dir
-
-teardown
-
-status=0
-
-if [ "$type" = "vsan" ] ; then
-  echo -n "checking for leaked objects..."
-  objs=($(govc datastore.vsan.dom.ls -l -o | awk '{print $3}'))
-  echo "${#objs[@]}"
-
-  if [ "${#objs[@]}" -ne "0" ] ; then
-    printf "%s\n" "${objs[@]}"
-    status=1
-  else
-    # this is expected to leak on vSAN currently
-    echo -n "checking if FileManager.Delete still leaks..."
-    govc datastore.mkdir -p "$(dirname $scratch)"
-    govc datastore.disk.create -size 1M $scratch
-    # '-t=false' forces use of FileManager instead of VirtualDiskManager
-    govc datastore.rm -t=false $scratch
-    govc datastore.rm $dir
-
-    govc datastore.vsan.dom.ls -o | xargs -r govc datastore.vsan.dom.rm -v
-  fi
-fi
-
-exit $status
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh
deleted file mode 100755
index 6b7cfce2bd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/datastore_tail_test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash -xe
-
-# This test is not run via bats as the bats pipeline hangs when we background a process
-
-. "$(dirname "$0")"/test_helper.bash
-
-name=$(new_id)
-n=16
-tmp=$(mktemp --tmpdir "${name}-XXXXX")
-
-echo -n | govc datastore.upload - "$name"
-govc datastore.tail -f "$name" > "$tmp" &
-pid=$!
-
-sleep 1
-yes | dd bs=${n}K count=1 2>/dev/null | govc datastore.upload - "$name"
-sleep 2
-
-# stops following when the file has gone away
-govc datastore.mv "$name" "${name}.old"
-wait $pid
-
-govc datastore.download "${name}.old" - | cmp "$tmp" -
-
-rm "$tmp"
-teardown
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/device.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/device.bats
deleted file mode 100755
index 920e526de7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/device.bats
+++ /dev/null
@@ -1,317 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "device.ls" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep ethernet-0 | wc -l)
-  [ $result -eq 1 ]
-}
-
-@test "device.info" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  run govc device.info -vm $vm ide-200
-  assert_success
-
-  run govc device.info -vm $vm ide-20000
-  assert_failure
-
-  run govc device.info -vm $vm -net enoent
-  assert_failure
-
-  run govc device.info -vm $vm -net "VM Network" ide-200
-  assert_failure
-
-  result=$(govc device.info -vm $vm -net "VM Network" | grep "MAC Address" | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.info -vm $vm -json
-  assert_matches ethernet-0
-}
-
-@test "device.boot" {
-  esx_env
-
-  vm=$(new_ttylinux_vm)
-
-  result=$(govc device.ls -vm $vm -boot | wc -l)
-  [ $result -eq 0 ]
-
-  run govc device.boot -vm $vm -order floppy,cdrom,ethernet,disk
-  assert_success
-
-  result=$(govc device.ls -vm $vm -boot | wc -l)
-  [ $result -eq 2 ]
-
-  run govc device.cdrom.add -vm $vm
-  assert_success
-
-  run govc device.floppy.add -vm $vm
-  assert_success
-
-  run govc device.boot -vm $vm -order floppy,cdrom,ethernet,disk
-  assert_success
-
-  result=$(govc device.ls -vm $vm -boot | wc -l)
-  [ $result -eq 4 ]
-
-  run govc device.boot -vm $vm -order -
-  assert_success
-
-  result=$(govc device.ls -vm $vm -boot | wc -l)
-  [ $result -eq 0 ]
-}
-
-@test "device.cdrom" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep cdrom- | wc -l)
-  [ $result -eq 0 ]
-
-  run govc device.cdrom.add -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.info -vm $vm $id
-  assert_success
-
-  run govc device.cdrom.insert -vm $vm -device $id x.iso
-  assert_success
-
-  run govc device.info -vm $vm $id
-  assert_line "Summary: ISO [${GOVC_DATASTORE}] x.iso"
-
-  run govc device.disconnect -vm $vm $id
-  assert_success
-
-  run govc device.connect -vm $vm $id
-  assert_success
-
-  run govc device.remove -vm $vm $id
-  assert_success
-
-  run govc device.disconnect -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.cdrom.insert -vm $vm -device $id x.iso
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.remove -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-}
-
-@test "device.floppy" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep floppy- | wc -l)
-  [ $result -eq 0 ]
-
-  run govc device.floppy.add -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.info -vm $vm $id
-  assert_success
-
-  run govc device.floppy.insert -vm $vm -device $id x.img
-  assert_success
-
-  run govc device.info -vm $vm $id
-  assert_line "Summary: Image [${GOVC_DATASTORE}] x.img"
-
-  run govc device.disconnect -vm $vm $id
-  assert_success
-
-  run govc device.connect -vm $vm $id
-  assert_success
-
-  run govc device.remove -vm $vm $id
-  assert_success
-
-  run govc device.disconnect -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.floppy.insert -vm $vm -device $id x.img
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.remove -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-}
-
-@test "device.serial" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep serial- | wc -l)
-  [ $result -eq 0 ]
-
-  run govc device.serial.add -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.info -vm $vm $id
-  assert_success
-
-  run govc device.serial.connect -vm $vm -
-  assert_success
-
-  run govc device.info -vm $vm $id
-  assert_line "Summary: File [$GOVC_DATASTORE] $vm/${id}.log"
-
-  uri=telnet://:33233
-  run govc device.serial.connect -vm $vm -device $id $uri
-  assert_success
-
-  run govc device.info -vm $vm $id
-  assert_line "Summary: Remote $uri"
-
-  run govc device.serial.disconnect -vm $vm -device $id
-  assert_success
-
-  run govc device.info -vm $vm $id
-  assert_line "Summary: Remote localhost:0"
-
-  run govc device.disconnect -vm $vm $id
-  assert_success
-
-  run govc device.connect -vm $vm $id
-  assert_success
-
-  run govc device.remove -vm $vm $id
-  assert_success
-
-  run govc device.disconnect -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.serial.connect -vm $vm -device $id $uri
-  assert_failure "govc: device '$id' not found"
-
-  run govc device.remove -vm $vm $id
-  assert_failure "govc: device '$id' not found"
-}
-
-@test "device.scsi" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.scsi.add -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
-  [ $result -eq 2 ]
-
-  run govc device.scsi.add -vm $vm -type pvscsi
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-}
-
-@test "device.usb" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  result=$(govc device.ls -vm $vm | grep usb | wc -l)
-  [ $result -eq 0 ]
-
-  run govc device.usb.add -type enoent -vm $vm
-  assert_failure
-
-  run govc device.usb.add -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.usb.add -vm $vm
-  assert_failure # 1 per vm max
-
-  run govc device.usb.add -type xhci -vm $vm
-  assert_success
-  id=$output
-
-  result=$(govc device.ls -vm $vm | grep $id | wc -l)
-  [ $result -eq 1 ]
-
-  run govc device.usb.add -type xhci -vm $vm
-  assert_failure # 1 per vm max
-}
-
-@test "device.scsi slots" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  for i in $(seq 1 15) ; do
-    name="disk-${i}"
-    run govc vm.disk.create -vm "$vm" -name "$name" -size 1K
-    assert_success
-    result=$(govc device.ls -vm "$vm" | grep disk- | wc -l)
-    [ "$result" -eq "$i" ]
-  done
-
-  # We're at the max, so this will fail
-  run govc vm.disk.create -vm "$vm" -name disk-16 -size 1K
-  assert_failure
-
-  # Remove disk #2
-  run govc device.remove -vm "$vm" disk-1000-2
-  assert_success
-
-  # No longer at the max, this should use the UnitNumber released by the remove above
-  run govc vm.disk.create -vm "$vm" -name disk-16 -size 1K
-  assert_success
-}
-
-
-@test "device nil config" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  run govc device.ls -vm "$vm"
-  assert_success
-
-  run govc datastore.rm "$vm"
-  assert_success
-
-  run govc object.reload "vm/$vm"
-  assert_success
-
-  run govc device.ls -vm "$vm"
-  assert_failure
-
-  run govc vm.unregister "$vm"
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats
deleted file mode 100755
index e06d26130b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/esxcli.bats
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "network vm list" {
-  esx_env
-
-  # make sure there's at least 1 VM so we get a table header to count against
-  vm=$(new_empty_vm)
-  govc vm.power -on $vm
-
-  nlines=$(govc host.esxcli network vm list | wc -l)
-
-  vm=$(new_empty_vm)
-  govc vm.power -on $vm
-
-  xlines=$(govc host.esxcli network vm list | wc -l)
-
-  # test that we see a new row
-  [ $(($nlines + 1)) -eq $xlines ]
-
-  run govc host.esxcli network vm list enoent
-  assert_failure
-}
-
-@test "network ip connection list" {
-  esx_env
-
-  run govc host.esxcli -- network ip connection list -t tcp
-  assert_success
-
-  # test that we get the expected number of table columns
-  nf=$(echo "${lines[3]}" | awk '{print NF}')
-  [ $nf -eq 9 ]
-
-  run govc host.esxcli -- network ip connection list -t enoent
-  assert_failure
-}
-
-@test "system settings advanced list" {
-  esx_env
-
-  run govc host.esxcli -- system settings advanced list -o /Net/GuestIPHack
-  assert_success
-  assert_line "Path: /Net/GuestIPHack"
-
-  run govc host.esxcli -- system settings advanced list -o /Net/ENOENT
-  assert_failure
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/events.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/events.bats
deleted file mode 100755
index 5c5145271f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/events.bats
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "events dc" {
-  esx_env
-
-  run govc events
-  assert_success
-  nevents=${#lines[@]}
-  # there should be plenty more than 1 event at the top (dc) level
-  [ $nevents -ge 1 ]
-
-  # test -n flag
-  run govc events -n $((nevents - 1))
-  assert_success
-  [ ${#lines[@]} -le $nevents ]
-}
-
-@test "events host" {
-  esx_env
-
-  run govc events 'host/*'
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-}
-
-@test "events vm" {
-  esx_env
-
-  vm=$(new_id)
-
-  run govc vm.create -on=false $vm
-  assert_success
-
-  run govc events vm/$vm
-  assert_success
-  nevents=${#lines[@]}
-  [ $nevents -gt 1 ]
-
-  # glob should have same # of events
-  run govc events vm/${vm}*
-  assert_success
-  [ ${#lines[@]} -eq $nevents ]
-
-  # create a new vm, glob should match more events
-  run govc vm.create -on=false "${vm}-2"
-  assert_success
-  run govc events vm/${vm}*
-  assert_success
-  [ ${#lines[@]} -gt $nevents ]
-  nevents=${#lines[@]}
-
-  run govc events vm
-  assert_success
-  [ ${#lines[@]} -ge $nevents ]
-}
-
-@test "events json" {
-  esx_env
-
-  # make sure we fmt.Printf properly
-  govc events | grep -v '%!s(MISSING)'
-
-  govc events -json | jq .
-
-  # test multiple objects
-  govc vm.create "$(new_id)"
-  govc vm.create "$(new_id)"
-
-  govc events 'vm/*'
-  govc events -json 'vm/*' | jq .
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/export.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/export.bats
deleted file mode 100755
index d470360026..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/export.bats
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-# ovftool -tt=ovf --noSSLVerify --skipManifestCheck "vi://$GOVC_URL/$GOVC_VM" .
-@test "export.ovf" {
-  esx_env
-
-  id=$(new_ttylinux_vm)
-  dir=$BATS_TMPDIR/$id-export
-
-  run govc export.ovf -vm "$id" "$dir"
-  assert_success
-
-  run ls "$dir/$id/$id-disk-0.vmdk" "$dir/$id/$id.ovf"
-  assert_success
-
-  if [ -e "$dir/$id/$id.mf" ] ; then
-    flunk ".mf was created"
-  fi
-
-  run govc export.ovf -vm "$id" "$dir"
-  assert_failure
-
-  run govc export.ovf -i -f -sha 256 -vm "$id" "$dir"
-  assert_success
-
-  run ls "$dir/$id/$id.mf"
-  assert_success
-
-  # make it an ova
-  (cd "$dir/$id" && tar -cf "../$id.ova" .)
-
-  # ovftool --noSSLVerify --skipManifestCheck --name="$GOVC_VM-import" "$GOVC_VM/$GOVC_VM.ovf" "vi://$GOVC_URL"
-  run govc import.ova -name "${id}-import" "$dir/$id.ova"
-  assert_success
-
-  rm -rf "$dir"
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/extension.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/extension.bats
deleted file mode 100755
index bc82cf459c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/extension.bats
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "extension" {
-  vcsim_env_todo
-
-  govc extension.info | grep Name: | grep govc-test | awk '{print $2}' | $xargs -r govc extension.unregister
-
-  run govc extension.info enoent
-  assert_failure
-
-  id=$(new_id)
-
-  result=$(govc extension.info | grep $id | wc -l)
-  [ $result -eq 0 ]
-
-  # register extension
-  run govc extension.register $id <<EOS
-  {
-    "Description": {
-      "Label": "govc",
-      "Summary": "Go interface to vCenter"
-    },
-    "Key": "${id}",
-    "Company": "VMware, Inc.",
-    "Version": "0.2.0"
-  }
-EOS
-  assert_success
-
-  # check info output is legit
-  run govc extension.info $id
-  assert_line "Name: $id"
-
-  json=$(govc extension.info -json $id)
-  label=$(jq -r .Extensions[].Description.Label <<<"$json")
-  assert_equal "govc" "$label"
-
-  # change label and update extension
-  json=$(jq -r '.Extensions[] | .Description.Label = "novc"' <<<"$json")
-  run govc extension.register -update $id <<<"$json"
-  assert_success
-
-  # check label changed in info output
-  json=$(govc extension.info -json $id)
-  label=$(jq -r .Extensions[].Description.Label <<<"$json")
-  assert_equal "novc" "$label"
-
-  # set extension certificate to generated certificate
-  run govc extension.setcert -cert-pem '+' $id
-  assert_success
-
-  # test client certificate authentication
-  (
-    # remove password from env, set user to extension id and turn of session cache
-    govc_url_to_vars
-    unset GOVC_PASSWORD
-    GOVC_USERNAME=$id
-    export GOVC_PERSIST_SESSION=false
-    run govc about -cert "${id}.crt" -key "${id}.key"
-    assert_success
-  )
-
-  # remove generated cert and key
-  rm ${id}.{crt,key}
-
-  run govc extension.unregister $id
-  assert_success
-
-  result=$(govc extension.info | grep $id | wc -l)
-  [ $result -eq 0 ]
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/fields.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/fields.bats
deleted file mode 100755
index 4cfe4e8816..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/fields.bats
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "fields" {
-  vcsim_env
-
-  vm_id=$(new_id)
-  run govc vm.create $vm_id
-  assert_success
-
-  field=$(new_id)
-
-  result=$(govc fields.ls | grep $field | wc -l)
-  [ $result -eq 0 ]
-
-  key=$(govc fields.add $field)
-
-  result=$(govc fields.ls | grep $field | wc -l)
-  [ $result -eq 1 ]
-
-  key=$(govc fields.ls | grep $field | awk '{print $1}')
-
-  val="foo"
-  run govc fields.set $field $val vm/$vm_id
-  assert_success
-
-  info=$(govc vm.info -json $vm_id | jq .VirtualMachines[0].CustomValue[0])
-
-  ikey=$(jq -r .Key <<<"$info")
-  assert_equal $key $ikey
-
-  ival=$(jq -r .Value <<<"$info")
-  assert_equal $val $ival
-
-  old_field=$field
-  field=$(new_id)
-  run govc fields.rename $key $field
-  assert_success
-  result=$(govc fields.ls | grep $old_field | wc -l)
-  [ $result -eq 0 ]
-
-  run govc fields.rm $field
-  assert_success
-
-  result=$(govc fields.ls | grep $field | wc -l)
-  [ $result -eq 0 ]
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/firewall.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/firewall.bats
deleted file mode 100755
index 8fd476a277..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/firewall.bats
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "firewall.ruleset.find" {
-  vcsim_env -esx
-
-  # Assumes sshServer ruleset is enabled
-  run govc firewall.ruleset.find -c=false -direction inbound -port 22
-  assert_success
-
-  run govc firewall.ruleset.find -c=false -direction outbound -port 22
-  if [ "$status" -eq 1 ] ; then
-    # If outbound port 22 is blocked, we should be able to list disabled rules via:
-    run govc firewall.ruleset.find -c=false -direction outbound -port 22 -enabled=false
-    assert_success
-
-    # find disabled should include sshClient ruleset in output
-    result=$(govc firewall.ruleset.find -c=false -direction outbound -port 22 -enabled=false | grep sshClient | wc -l)
-    [ $result -eq 1 ]
-  fi
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/folder.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/folder.bats
deleted file mode 100755
index 600894c764..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/folder.bats
+++ /dev/null
@@ -1,76 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "folder.info" {
-  vcsim_env -esx
-
-  for name in / vm host network datastore ; do
-    run govc folder.info $name
-    assert_success
-
-    govc folder.info -json $name
-    assert_success
-  done
-
-  result=$(govc folder.info '*' | grep -c Name:)
-  [ "$result" -eq 4 ]
-
-  run govc info.info /enoent
-  assert_failure
-}
-
-@test "folder.create" {
-    vcsim_env
-
-    name=$(new_id)
-
-    # relative to $GOVC_DATACENTER
-    run govc folder.create $name
-    assert_failure
-
-    run govc folder.create vm/$name
-    assert_success
-
-    run govc folder.info vm/$name
-    assert_success
-
-    run govc folder.info /$GOVC_DATACENTER/vm/$name
-    assert_success
-
-    run govc object.destroy vm/$name
-    assert_failure # TODO: Folder:folder-N does not implement: Destroy_Task
-
-    unset GOVC_DATACENTER
-    # relative to /
-
-    run govc folder.create /$name
-    assert_success
-
-    run govc folder.info /$name
-    assert_success
-
-    child=$(new_id)
-    run govc folder.create /$child
-    assert_success
-
-    run govc folder.info /$name/$child
-    assert_failure
-
-    run govc object.mv /$child /$name
-    assert_success
-
-    run govc folder.info /$name/$child
-    assert_success
-
-    new=$(new_id)
-    run govc object.rename /$name $new
-    assert_success
-    name=$new
-
-    run govc folder.info /$name
-    assert_success
-
-    run govc object.destroy $name
-    assert_failure # TODO: Folder:folder-N does not implement: Destroy_Task
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh
deleted file mode 100755
index 633280fda0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/guest_operations_test.sh
+++ /dev/null
@@ -1,119 +0,0 @@
-#!/bin/bash -e
-
-# This test is not run via bats.
-# 1) Test guest operations (govc guest.* commands)
-# 2) Test vm disk persistence
-
-. "$(dirname "$0")"/test_helper.bash
-
-esx_env
-
-import_ttylinux_vmdk
-
-export GOVC_GUEST_LOGIN=root:password
-
-for persist in true false ; do
-  id=govc-test-persist-$persist
-  govc ls vm/$id | xargs -r govc vm.destroy
-
-  if [ "$persist" = "true" ] ; then
-    grepf=-v
-    mode=persistent
-  else
-    mode=independent_nonpersistent
-  fi
-
-  echo "Creating vm..."
-  govc vm.create -m 32 -disk.controller ide -on=false $id
-
-  # Save some noise by defaulting to '-vm $id'
-  export GOVC_VM=$id
-
-  echo "Attaching linked disk..."
-  govc vm.disk.attach -controller ide -persist=$persist -link=true -disk "$GOVC_TEST_VMDK"
-
-  echo "Creating data disk..."
-  govc vm.disk.create -controller ide -mode=$mode -name "$id"/data -size "10M"
-
-  echo "Powering on vm..."
-  govc vm.power -on $id 1>/dev/null
-  echo "Waiting for tools to initialize..."
-  govc vm.ip $id 1>/dev/null
-
-  echo "Formatting the data disk..."
-  govc guest.mkdir /data
-  script=$(govc guest.mktemp)
-
-  govc guest.upload -f - "$script" <<'EOF'
-#!/bin/sh -xe
-
-opts=(n p 1 1 ' ' w)
-printf "%s\n" "${opts[@]}" | fdisk /dev/hdb
-mkfs.ext3 /dev/hdb1
-mount /dev/hdb1 /data
-df -h
-cp /etc/motd /data
-EOF
-
-  govc guest.chown 65534 "$script"
-  govc guest.chown 65534:65534 "$script"
-  govc guest.ls "$script" | grep 65534
-  govc guest.chmod 0755 "$script"
-  pid=$(govc guest.start "$script" '>&' /tmp/disk.log)
-  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
-  govc guest.download /tmp/disk.log -
-  if [ "$status" -ne "0" ] ; then
-    exit 1
-  fi
-
-  echo "Writing some data to the disks..."
-  for d in /etc /data ; do
-    govc guest.touch "$d/motd.bak"
-    govc guest.touch -d "$(date -d '1 day ago')" "$d/motd"
-    govc guest.ls "$d/motd"
-    govc guest.download $d/motd - | grep Chop
-  done
-  govc version | govc guest.upload -f - /etc/motd
-  govc guest.download /etc/motd - | grep -v Chop
-
-  pid=$(govc guest.start /bin/sync)
-  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
-  if [ "$status" -ne "0" ] ; then
-    exit 1
-  fi
-
-  echo "Rebooting vm..."
-  govc vm.power -off $id
-  govc vm.power -on $id
-  echo "Waiting for tools to initialize..."
-  govc vm.ip $id 1>/dev/null
-
-  echo "Verifying data persistence..."
-  govc guest.download /etc/motd - | grep $grepf Chop
-  pid=$(govc guest.start /bin/mount /dev/hdb1 /data)
-  status=$(govc guest.ps -p "$pid" -json -X | jq .ProcessInfo[].ExitCode)
-
-  if [ "$persist" = "true" ] ; then
-    govc guest.ls /data
-    govc guest.download /data/motd - | grep -v Chop
-    govc guest.rm /data/motd
-
-    govc guest.mkdir /data/foo/bar/baz 2>/dev/null && exit 1 # should fail
-    govc guest.mkdir -p /data/foo/bar/baz
-
-    govc guest.rmdir /data/foo 2>/dev/null && exit 1 # should fail
-    govc guest.rmdir /data/foo/bar/baz
-    dir=$(govc guest.mktemp -d -p /data/foo -s govc)
-    file=$(govc guest.mktemp -p "$dir")
-    govc guest.mv -n "$(govc guest.mktemp)" "$file" 2>/dev/null && exit 1 # should fail
-    govc guest.mv "$file" "${file}-old"
-    govc guest.mv "$dir" "${dir}-old"
-    govc guest.rmdir -r /data/foo
-    govc guest.ls /data | grep -v foo
-  else
-    if [ "$status" -eq "0" ] ; then
-      echo "expected failure"
-      exit 1
-    fi
-  fi
-done
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/host.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/host.bats
deleted file mode 100755
index 2ebbb9ef5a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/host.bats
+++ /dev/null
@@ -1,237 +0,0 @@
-#!/usr/bin/env bats
-load test_helper
-
-@test "host info esx" {
-  esx_env
-
-  run govc host.info
-  assert_success
-  grep -q Manufacturer: <<<"$output"
-
-  run govc host.info -host enoent
-  assert_failure "govc: host 'enoent' not found"
-
-  for opt in dns ip ipath uuid
-  do
-    run govc host.info "-host.$opt" enoent
-    assert_failure "govc: no such host"
-  done
-
-  # avoid hardcoding the esxbox hostname
-  local name=$(govc ls '/*/host/*' | grep -v Resources)
-
-  run govc host.info -host "$name"
-  assert_success
-  grep -q Manufacturer: <<<"$output"
-
-  run govc host.info -host ${name##*/}
-  assert_success
-  grep -q Manufacturer: <<<"$output"
-
-  run govc host.info -host.ipath "$name"
-  assert_success
-
-  run govc host.info -host.dns "$(basename $(dirname $name))"
-  assert_success
-
-  uuid=$(govc host.info -json | jq -r .HostSystems[].Hardware.SystemInfo.Uuid)
-  run govc host.info -host.uuid "$uuid"
-  assert_success
-
-  run govc host.info "*"
-  assert_success
-}
-
-@test "host info vc" {
-  vcsim_env
-
-  run govc host.info
-  assert_success
-  grep -q Manufacturer: <<<"$output"
-
-  run govc host.info -host enoent
-  assert_failure "govc: host 'enoent' not found"
-
-  for opt in ipath uuid # dns ip # TODO: SearchIndex:SearchIndex does not implement: FindByDnsName
-  do
-    run govc host.info "-host.$opt" enoent
-    assert_failure "govc: no such host"
-  done
-
-  local name=$GOVC_HOST
-
-  unset GOVC_HOST
-  run govc host.info
-  assert_failure "govc: default host resolves to multiple instances, please specify"
-
-  run govc host.info -host "$name"
-  assert_success
-  grep -q Manufacturer: <<<"$output"
-
-  run govc host.info -host.ipath "$name"
-  assert_success
-
-  run govc host.info -host.dns $(basename "$name")
-  assert_failure # TODO: SearchIndex:SearchIndex does not implement: FindByDnsName
-
-  uuid=$(govc host.info -host "$name" -json | jq -r .HostSystems[].Summary.Hardware.Uuid)
-  run govc host.info -host.uuid "$uuid"
-  assert_success
-}
-
-@test "host maintenance vc" {
-  vcsim_env
-
-  run govc host.info
-  assert_success
-  grep -q -v Maintenance <<<"$output"
-
-  run govc host.maintenance.enter "$GOVC_HOST"
-  assert_success
-
-  run govc host.info
-  assert_success
-  grep -q Maintenance <<<"$output"
-
-  run govc host.maintenance.exit "$GOVC_HOST"
-  assert_success
-
-  run govc host.info
-  assert_success
-  grep -q -v Maintenance <<<"$output"
-}
-
-@test "host.vnic.info" {
-  esx_env
-
-  run govc host.vnic.info
-  assert_success
-}
-
-@test "host.vswitch.info" {
-  esx_env
-
-  run govc host.vswitch.info
-  assert_success
-
-  run govc host.vswitch.info -json
-  assert_success
-}
-
-@test "host.portgroup.info" {
-  esx_env
-
-  run govc host.portgroup.info
-  assert_success
-
-  run govc host.portgroup.info -json
-  assert_success
-}
-
-@test "host.storage.info" {
-    esx_env
-
-    run govc host.storage.info -rescan -refresh
-    assert_success
-}
-
-@test "host.options" {
-  esx_env
-
-  run govc host.option.ls Config.HostAgent.plugins.solo.enableMob
-  assert_success
-
-  run govc host.option.ls Config.HostAgent.plugins.
-  assert_success
-
-  run govc host.option.ls -json Config.HostAgent.plugins.
-  assert_success
-
-  run govc host.option.ls Config.HostAgent.plugins.solo.ENOENT
-  assert_failure
-}
-
-@test "host.service" {
-  esx_env
-
-  run govc host.service.ls
-  assert_success
-
-  run govc host.service.ls -json
-  assert_success
-
-  run govc host.service status TSM-SSH
-  assert_success
-}
-
-@test "host.cert.info" {
-  esx_env
-
-  run govc host.cert.info
-  assert_success
-
-  run govc host.cert.info -json
-  assert_success
-
-  expires=$(govc host.cert.info -json | jq -r .NotAfter)
-  about_expires=$(govc about.cert -json | jq -r .NotAfter)
-  assert_equal "$expires" "$about_expires"
-}
-
-@test "host.cert.csr" {
-  esx_env
-
-  #   Requested Extensions:
-  #       X509v3 Subject Alternative Name:
-  #       IP Address:...
-  result=$(govc host.cert.csr -ip | openssl req -text -noout)
-  assert_matches "IP Address:" "$result"
-  ! assert_matches "DNS:" "$result"
-
-  #   Requested Extensions:
-  #       X509v3 Subject Alternative Name:
-  #       DNS:...
-  result=$(govc host.cert.csr | openssl req -text -noout)
-  ! assert_matches "IP Address:" "$result"
-  assert_matches "DNS:" "$result"
-}
-
-@test "host.cert.import" {
-  esx_env
-
-  issuer=$(govc host.cert.info -json | jq -r .Issuer)
-  expires=$(govc host.cert.info -json | jq -r .NotAfter)
-
-  # only mess with the cert if its already been signed by our test CA
-  if [[ "$issuer" != CN=govc-ca,* ]] ; then
-    skip "host cert not signed by govc-ca"
-  fi
-
-  govc host.cert.csr -ip | ./host_cert_sign.sh | govc host.cert.import
-  expires2=$(govc host.cert.info -json | jq -r .NotAfter)
-
-  # cert expiration should have changed
-  [ "$expires" != "$expires2" ]
-
-  # verify hostd is using the new cert too
-  expires=$(govc about.cert -json | jq -r .NotAfter)
-  assert_equal "$expires" "$expires2"
-
-  # our cert is not trusted against the system CA list
-  status=$(govc about.cert | grep Status:)
-  assert_matches ERROR "$status"
-
-  # with our CA trusted, the cert should be too
-  status=$(govc about.cert -tls-ca-certs ./govc_ca.pem | grep Status:)
-  assert_matches good "$status"
-}
-
-@test "host.date.info" {
-  esx_env
-
-  run govc host.date.info
-  assert_success
-
-  run govc host.date.info -json
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh
deleted file mode 100755
index 3bbf5b597f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/host_cert_sign.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash -e
-
-# Usage: govc host.cert.csr | ./host_cert_sign.sh | govc host.cert.import
-
-pushd "$(dirname "$0")" >/dev/null
-
-days=$((365 * 5))
-
-if [ ! -e govc_ca.key ] ; then
-  echo "Generating CA private key..." 1>&2
-  openssl genrsa -out govc_ca.key 2048
-
-  echo "Generating CA self signed certificate..." 1>&2
-  openssl req -x509 -new -nodes -key govc_ca.key -out govc_ca.pem -subj /C=US/ST=CA/L=SF/O=VMware/OU=Eng/CN=govc-ca -days $days
-fi
-
-echo "Signing CSR with the CA certificate..." 1>&2
-
-# The hostd generated CSR includes:
-#   Requested Extensions:
-#       X509v3 Subject Alternative Name:
-#       IP Address:$ip
-# But seems it doesn't get copied by default, so we end up with:
-#   x509: cannot validate certificate for $ip because it doesn't contain any IP SANs (x509.HostnameError)
-# Using -extfile to add it to the signed cert.
-
-ip=$(govc env -x GOVC_URL_HOST)
-openssl x509 -req -CA govc_ca.pem -CAkey govc_ca.key -CAcreateserial -days $days -extfile <(echo "subjectAltName=IP:$ip")
-
-popd >/dev/null
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore b/installer/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore
deleted file mode 100644
index 170208c81f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/images/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-ttylinux-*
-floppybird.img
-
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/images/update.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/images/update.sh
deleted file mode 100755
index 1dfe23b1e6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/images/update.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-pushd $(dirname $0)
-
-# Sadly, the ttylinux project was abandoned in late 2015.
-# But this release still serves us well.
-base_url=http://dl.bintray.com/dougm/ttylinux
-ttylinux="ttylinux-pc_i486-16.1"
-files="${ttylinux}.iso ${ttylinux}-live.ova ${ttylinux}.ova"
-
-for name in $files ; do
-  wget -qO $name $base_url/$name
-done
-
-wget -qN https://github.com/icebreaker/floppybird/raw/master/build/floppybird.img
-
-# extract ova so we can also use the .vmdk and .ovf files directly
-tar -xvf ${ttylinux}.ova
-
-popd
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/import.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/import.bats
deleted file mode 100755
index 073e972b5b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/import.bats
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "import.ova" {
-  esx_env
-
-  run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}.ova
-  assert_success
-
-  run govc vm.destroy ${TTYLINUX_NAME}
-  assert_success
-}
-
-@test "import.ova with iso" {
-  esx_env
-
-  run govc import.ova $GOVC_IMAGES/${TTYLINUX_NAME}-live.ova
-  assert_success
-
-  run govc vm.destroy ${TTYLINUX_NAME}-live
-  assert_success
-}
-
-@test "import.ovf" {
-  esx_env
-
-  run govc import.ovf $GOVC_IMAGES/${TTYLINUX_NAME}.ovf
-  assert_success
-
-  run govc vm.destroy ${TTYLINUX_NAME}
-  assert_success
-
-  # test w/ relative dir
-  pushd $BATS_TEST_DIRNAME >/dev/null
-  run govc import.ovf ./images/${TTYLINUX_NAME}.ovf
-  assert_success
-  popd >/dev/null
-
-  run govc vm.destroy ${TTYLINUX_NAME}
-  assert_success
-}
-
-@test "import.ovf with name in options" {
-  esx_env
-
-  name=$(new_id)
-  file=$($mktemp --tmpdir govc-test-XXXXX)
-  echo "{ \"Name\": \"${name}\"}" > ${file}
-
-  run govc import.ovf -options="${file}" $GOVC_IMAGES/${TTYLINUX_NAME}.ovf
-  assert_success
-
-  run govc vm.destroy "${name}"
-  assert_success
-
-  rm -f ${file}
-}
-
-@test "import.ovf with import.spec result" {
-  esx_env
-
-  file=$($mktemp --tmpdir govc-test-XXXXX)
-  name=$(new_id)
-  
-  govc import.spec $GOVC_IMAGES/${TTYLINUX_NAME}.ovf > ${file}
-  
-  run govc import.ovf -name="${name}" -options="${file}" $GOVC_IMAGES/${TTYLINUX_NAME}.ovf
-  assert_success
-
-  run govc vm.destroy "${name}"
-  assert_success
-}
-
-@test "import.ovf with name as argument" {
-  esx_env
-
-  name=$(new_id)
-
-  run govc import.ova -name="${name}" $GOVC_IMAGES/${TTYLINUX_NAME}.ova
-  assert_success
-
-  run govc vm.destroy "${name}"
-  assert_success
-}
-
-@test "import.vmdk" {
-  esx_env
-
-  name=$(new_id)
-
-  run govc import.vmdk "$GOVC_TEST_VMDK_SRC" "$name"
-  assert_success
-
-  run govc import.vmdk "$GOVC_TEST_VMDK_SRC" "$name"
-  assert_failure # exists
-
-  run govc import.vmdk -force "$GOVC_TEST_VMDK_SRC" "$name"
-  assert_success # exists, but -force was used
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/logs.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/logs.bats
deleted file mode 100755
index a90f4c4efd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/logs.bats
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "logs" {
-  esx_env
-
-  run govc logs
-  assert_success
-  nlogs=${#lines[@]}
-  # there should be plenty more than 1 line of hostd logs
-  [ $nlogs -ge 1 ]
-
-  # test -n flag
-  run govc logs -n $((nlogs - 10))
-  assert_success
-  [ ${#lines[@]} -le $nlogs ]
-
-  run govc logs -log vmkernel
-  assert_success
-  nlogs=${#lines[@]}
-  # there should be plenty more than 1 line of vmkernel logs
-  [ $nlogs -ge 1 ]
-
-  # test > 1 call to BrowseLog()
-  run govc logs -n 2002
-  assert_success
-
-  # -host ignored against ESX
-  run govc logs -host enoent
-  assert_success
-
-  run govc logs -log enoent
-  assert_failure
-}
-
-@test "logs.ls" {
-  esx_env
-
-  run govc logs.ls
-  assert_success
-
-  # -host ignored against ESX
-  run govc logs.ls -host enoent
-  assert_success
-}
-
-@test "logs opid" {
-  esx_env
-
-  id=$(new_id)
-
-  run env GOVC_OPERATION_ID="$id" govc events
-  assert_success
-
-  govc logs | grep "$id"
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/ls.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/ls.bats
deleted file mode 100755
index 97a0b421c7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/ls.bats
+++ /dev/null
@@ -1,192 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "ls" {
-  vcsim_env
-
-  run govc ls
-  assert_success
-  # /dc/{vm,network,host,datastore}
-  n=${#lines[@]}
-  [ $n -ge 4 ]
-
-  # list entire inventory
-  run govc ls '/**'
-  assert_success
-  [ ${#lines[@]} -ge $n ]
-
-  run govc ls ./...
-  assert_success
-  [ ${#lines[@]} -ge $n ]
-
-  run govc ls -t HostSystem '*'
-  assert_success
-  [ ${#lines[@]} -eq 0 ]
-
-  run govc ls host
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-
-  run govc ls enoent
-  assert_success
-  [ ${#lines[@]} -eq 0 ]
-}
-
-@test "ls -R" {
-  vcsim_env -esx
-
-  # search entire inventory
-  run govc ls ./...
-  assert_success
-  # should have at least 1 dc + folders, 1 host, 1 network, 1 datastore
-  [ ${#lines[@]} -ge 9 ]
-
-  run govc ls -t HostSystem ./...
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  run govc ls -t Datacenter /...
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  run govc ls -t ResourcePool host/...
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-
-  run govc ls -t ResourcePool vm/...
-  assert_success
-  [ ${#lines[@]} -eq 0 ]
-
-  c=$(govc ls -t ComputeResource ./... | head -1)
-  run govc ls -t ResourcePool "$c/..."
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-}
-
-@test "ls vm" {
-  vcsim_env -esx
-
-  vm=$(new_empty_vm)
-
-  run govc ls vm
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-
-  run govc ls vm/$vm
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  run govc ls /*/vm/$vm
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-}
-
-@test "ls network" {
-  vcsim_env -esx
-
-  run govc ls network
-  assert_success
-  [ ${#lines[@]} -ge 1 ]
-
-  local path=${lines[0]}
-  run govc ls "$path"
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  run govc ls "network/$(basename "$path")"
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-
-  run govc ls "/*/network/$(basename "$path")"
-  assert_success
-  [ ${#lines[@]} -eq 1 ]
-}
-
-@test "ls multi ds" {
-  vcsim_env -dc 2
-
-  run govc ls
-  assert_success
-  # /DC0/{vm,network,host,datastore}
-  [ ${#lines[@]} -eq 4 ]
-
-  run govc ls /DC*
-  assert_success
-  # /DC[0,1]/{vm,network,host,datastore}
-  [ ${#lines[@]} -eq 8 ]
-
-  # here 'vm' is relative to /DC0
-  run govc ls vm
-  assert_success
-  [ ${#lines[@]} -gt 0 ]
-
-  unset GOVC_DATACENTER
-
-  run govc ls
-  assert_success
-  # /DC[0,1]
-  [ ${#lines[@]} -eq 2 ]
-
-  run govc ls -dc enoent
-  assert_failure
-  [ ${#lines[@]} -gt 0 ]
-
-  # here 'vm' is relative to '/' - so there are no matches
-  run govc ls vm
-  assert_success
-  [ ${#lines[@]} -eq 0 ]
-
-  # ls all vms in all datacenters
-  run govc ls */vm
-  assert_success
-  [ ${#lines[@]} -gt 0 ]
-}
-
-@test "ls moref" {
-  vcsim_env -esx
-
-  # ensure the vm folder isn't empty
-  run govc vm.create -on=false "$(new_id)"
-  assert_success
-
-  # list dc folder paths
-  folders1=$(govc ls)
-  # list dc folder refs | govc ls -L ; should output the same paths
-  folders2=$(govc ls -i | xargs govc ls -L)
-
-  assert_equal "$folders1" "$folders2"
-
-  for folder in $folders1
-  do
-    # list paths in $folder
-    items1=$(govc ls "$folder")
-    # list refs in $folder | govc ls -L ; should output the same paths
-    items2=$(govc ls -i "$folder" | xargs -d '\n' govc ls -L)
-
-    assert_equal "$items1" "$items2"
-  done
-
-  ref=ViewManager:ViewManager
-  path=$(govc ls -L $ref)
-  assert_equal "$ref" "$path"
-
-  path=$(govc ls -L Folder:ha-folder-root)
-  assert_equal "/" "$path"
-}
-
-@test "ls substr" {
-  # Test fix for issue #815, introduced by b35abbc
-
-  vcsim_env
-
-  id=$(new_id)
-
-  run govc vm.create -on=false "${id}"
-  assert_success
-
-  run govc vm.create -on=false "bar${id}"
-  assert_success
-
-  assert [ "$(govc ls "vm/$id" | wc -l)" -eq 1 ]
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/metric.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/metric.bats
deleted file mode 100755
index fae1941bca..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/metric.bats
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "metric.ls" {
-  esx_env
-
-  run govc metric.ls
-  assert_failure
-
-  run govc metric.ls enoent
-  assert_failure
-
-  host=$(govc ls -t HostSystem ./... | head -n 1)
-  pool=$(govc ls -t ResourcePool ./... | head -n 1)
-
-  run govc metric.ls "$host"
-  assert_success
-
-  run govc metric.ls -json "$host"
-  assert_success
-
-  run govc metric.ls "$pool"
-  assert_success
-}
-
-@test "metric.sample" {
-  esx_env
-
-  host=$(govc ls -t HostSystem ./... | head -n 1)
-  metrics=($(govc metric.ls "$host"))
-
-  run govc metric.sample "$host" enoent
-  assert_failure
-
-  run govc metric.sample "$host" "${metrics[@]}"
-  assert_success
-
-  run govc metric.sample -instance - "$host" "${metrics[@]}"
-  assert_success
-
-  run govc metric.sample -json "$host" "${metrics[@]}"
-  assert_success
-
-  vm=$(new_ttylinux_vm)
-
-  run govc metric.ls "$vm"
-  assert_output ""
-
-  run govc vm.power -on "$vm"
-  assert_success
-
-  run govc vm.ip "$vm"
-  assert_success
-
-  metrics=($(govc metric.ls "$vm"))
-
-  run govc metric.sample "$vm" "${metrics[@]}"
-  assert_success
-
-  run govc metric.sample -json "$vm" "${metrics[@]}"
-  assert_success
-
-  run govc metric.sample "govc-test-*" "${metrics[@]}"
-  assert_success
-}
-
-@test "metric.info" {
-  esx_env
-
-  host=$(govc ls -t HostSystem ./... | head -n 1)
-  metrics=($(govc metric.ls "$host"))
-
-  run govc metric.info "$host" enoent
-  assert_failure
-
-  run govc metric.info "$host"
-  assert_success
-
-  run govc metric.info -json "$host"
-  assert_success
-
-  run govc metric.info -dump "$host"
-  assert_success
-
-  run govc metric.sample "$host" "${metrics[@]}"
-  assert_success
-
-  run govc metric.info "$host" "${metrics[@]}"
-  assert_success
-
-  run govc metric.info - "${metrics[@]}"
-  assert_success
-}
-
-@test "metric manager" {
-  vcsim_env
-
-  moid=$(govc object.collect -s - content.perfManager)
-
-  govc object.collect -json "$moid" | jq .
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/metric_info_test.sh b/installer/vendor/github.com/vmware/govmomi/govc/test/metric_info_test.sh
deleted file mode 100755
index 748cb3109b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/metric_info_test.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash -e
-
-types="Datacenter HostSystem ClusterComputeResource ResourcePool VirtualMachine Datastore VirtualApp"
-
-for type in $types ; do
-  echo "$type..."
-
-  obj=$(govc ls -t "$type" ./... | head -n 1)
-  if [ -z "$obj" ] ; then
-    echo "...no instances found"
-    continue
-  fi
-
-  if ! govc metric.info "$obj" 2>/dev/null ; then
-    echo "...N/A" # Datacenter, Datastore on ESX for example
-    continue
-  fi
-
-  govc metric.ls "$obj" | xargs govc metric.sample -n 5 "$obj"
-done
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/network.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/network.bats
deleted file mode 100755
index dad5fe8cc1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/network.bats
+++ /dev/null
@@ -1,176 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "network dvs backing" {
-  vcsim_env
-
-  # DVS backed network by default (from vcsim_env)
-  vm=$(new_empty_vm)
-
-  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
-  run govc device.info -vm $vm $eth0
-  assert_success
-
-  summary=$(govc device.info -vm $vm $eth0 | grep Summary: | awk '{print $2}')
-  assert_equal "DVSwitch:" $summary
-
-  run govc device.remove -vm $vm $eth0
-  assert_success
-
-  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
-  [ -z "$eth0" ]
-
-  # Standard network backing
-  run govc vm.network.add -vm $vm -net "VM Network"
-  assert_success
-
-  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
-
-  run govc device.info -vm $vm $eth0
-  assert_success
-
-  summary=$(govc device.info -vm $vm $eth0 | grep Summary: | awk -F: '{print $2}')
-  assert_equal "VM Network" "$(collapse_ws $summary)"
-
-  run govc device.remove -vm $vm $eth0
-  assert_success
-
-  run govc device.remove -vm $vm $eth0
-  assert_failure "govc: device '$eth0' not found"
-}
-
-@test "network change backing" {
-  vcsim_env
-
-  vm=$(new_empty_vm)
-
-  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
-  run govc vm.network.change -vm $vm $eth0 enoent
-  assert_failure "govc: network 'enoent' not found"
-
-  run govc vm.network.change -vm $vm enoent "VM Network"
-  assert_failure "govc: device 'enoent' not found"
-
-  run govc vm.network.change -vm $vm $eth0 "VM Network"
-  assert_success
-
-  run govc vm.network.change -vm $vm $eth0
-  assert_success
-
-  unset GOVC_NETWORK
-  run govc vm.network.change -vm $vm $eth0
-  assert_failure "govc: default network resolves to multiple instances, please specify"
-
-  run govc vm.power -on $vm
-  assert_success
-  run govc vm.power -off $vm
-
-  mac=$(vm_mac $vm)
-  run govc vm.network.change -vm $vm -net "VM Network" $eth0
-  assert_success
-
-  # verify we didn't change the mac address
-  run govc vm.power -on $vm
-  assert_success
-  assert_equal $mac $(vm_mac $vm)
-}
-
-@test "network standard backing" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  run govc device.info -vm $vm ethernet-0
-  assert_success
-
-  run govc device.remove -vm $vm ethernet-0
-  assert_success
-
-  run govc device.info -vm $vm ethernet-0
-  assert_failure
-
-  run govc vm.network.add -vm $vm enoent
-  assert_failure "govc: network 'enoent' not found"
-
-  run govc vm.network.add -vm $vm "VM Network"
-  assert_success
-
-  run govc device.info -vm $vm ethernet-0
-  assert_success
-}
-
-@test "network adapter" {
-  vcsim_env -esx
-
-  vm=$(new_id)
-  run govc vm.create -on=false -net.adapter=enoent $vm
-  assert_failure "govc: unknown ethernet card type 'enoent'"
-
-  vm=$(new_id)
-  run govc vm.create -on=false -net.adapter=vmxnet3 $vm
-  assert_success
-
-  eth0=$(govc device.ls -vm $vm | grep ethernet- | awk '{print $1}')
-  type=$(govc device.info -vm $vm $eth0 | grep Type: | awk -F: '{print $2}')
-  assert_equal "VirtualVmxnet3" $(collapse_ws $type)
-
-  run govc vm.network.add -vm $vm -net.adapter e1000e "VM Network"
-  assert_success
-
-  eth1=$(govc device.ls -vm $vm | grep ethernet- | grep -v $eth0 | awk '{print $1}')
-  type=$(govc device.info -vm $vm $eth1 | grep Type: | awk -F: '{print $2}')
-  assert_equal "VirtualE1000e" $(collapse_ws $type)
-}
-
-@test "network flag required" {
-  vcsim_env
-
-  # -net flag is required when there are multiple networks
-  unset GOVC_NETWORK
-  run govc vm.create -on=false $(new_id)
-  assert_failure "govc: default network resolves to multiple instances, please specify"
-}
-
-@test "network change hardware address" {
-  esx_env
-
-  mac="00:00:0f$(dd bs=1 count=3 if=/dev/random 2>/dev/null | hexdump -v -e '/1 ":%02x"')"
-  vm=$(new_id)
-  run govc vm.create -on=false $vm
-  assert_success
-
-  run govc vm.network.change -vm $vm -net.address $mac ethernet-0
-  assert_success
-
-  run govc vm.power -on $vm
-  assert_success
-
-  assert_equal $mac $(vm_mac $vm)
-}
-
-@test "dvs.portgroup" {
-  vcsim_env
-  id=$(new_id)
-
-  run govc dvs.create "$id"
-  assert_success
-
-  run govc dvs.portgroup.add -dvs "$id" -type earlyBinding -nports 16 "${id}-ExternalNetwork"
-  assert_success
-
-  run govc dvs.portgroup.add -dvs "$id" -type ephemeral -vlan 3122 "${id}-InternalNetwork"
-  assert_success
-
-  info=$(govc dvs.portgroup.info "$id" | grep VlanId: | uniq | grep 3122)
-  [ -n "$info" ]
-
-  run govc dvs.portgroup.change -vlan 3123 "${id}-InternalNetwork"
-  assert_success
-
-  info=$(govc dvs.portgroup.info "$id" | grep VlanId: | uniq | grep 3123)
-  [ -n "$info" ]
-
-  run govc object.destroy "network/${id}-ExternalNetwork" "network/${id}-InternalNetwork" "network/${id}"
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/object.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/object.bats
deleted file mode 100755
index 3f1d2e087f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/object.bats
+++ /dev/null
@@ -1,432 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "object.destroy" {
-  vcsim_env
-
-  run govc object.destroy "/enoent"
-  assert_failure
-
-  run govc object.destroy
-  assert_failure
-
-  vm=$(new_id)
-  run govc vm.create "$vm"
-  assert_success
-
-  # fails when powered on
-  run govc object.destroy "vm/$vm"
-  assert_failure
-
-  run govc vm.power -off "$vm"
-  assert_success
-
-  run govc object.destroy "vm/$vm"
-  assert_success
-}
-
-@test "object.rename" {
-  esx_env
-
-  run govc object.rename "/enoent" "nope"
-  assert_failure
-
-  vm=$(new_id)
-  run govc vm.create -on=false "$vm"
-  assert_success
-
-  run govc object.rename "vm/$vm" "${vm}-renamed"
-  assert_success
-
-  run govc object.rename "vm/$vm" "${vm}-renamed"
-  assert_failure
-
-  run govc object.destroy "vm/${vm}-renamed"
-  assert_success
-}
-
-@test "object.mv" {
-  vcsim_env
-
-  folder=$(new_id)
-
-  run govc folder.create "vm/$folder"
-  assert_success
-
-  for _ in $(seq 1 3) ; do
-    vm=$(new_id)
-    run govc vm.create -folder "$folder" "$vm"
-    assert_success
-  done
-
-  result=$(govc ls "vm/$folder" | wc -l)
-  [ "$result" -eq "3" ]
-
-  run govc folder.create "vm/${folder}-2"
-  assert_success
-
-  run govc object.mv "vm/$folder/*" "vm/${folder}-2"
-  assert_success
-
-  result=$(govc ls "vm/${folder}-2" | wc -l)
-  [ "$result" -eq "3" ]
-
-  result=$(govc ls "vm/$folder" | wc -l)
-  [ "$result" -eq "0" ]
-}
-
-@test "object.collect" {
-  esx_env
-
-  run govc object.collect
-  assert_success
-
-  run govc object.collect -json
-  assert_success
-
-  run govc object.collect -
-  assert_success
-
-  run govc object.collect -json -
-  assert_success
-
-  run govc object.collect - content
-  assert_success
-
-  run govc object.collect -json - content
-  assert_success
-
-  root=$(govc object.collect - content | grep content.rootFolder | awk '{print $3}')
-
-  dc=$(govc object.collect "$root" childEntity | awk '{print $3}' | cut -d, -f1)
-
-  hostFolder=$(govc object.collect "$dc" hostFolder | awk '{print $3}')
-
-  cr=$(govc object.collect "$hostFolder" childEntity | awk '{print $3}' | cut -d, -f1)
-
-  host=$(govc object.collect "$cr" host | awk '{print $3}' | cut -d, -f1)
-
-  run govc object.collect "$host"
-  assert_success
-
-  run govc object.collect "$host" hardware
-  assert_success
-
-  run govc object.collect "$host" hardware.systemInfo
-  assert_success
-
-  uuid=$(govc object.collect "$host" hardware.systemInfo.uuid | awk '{print $3}')
-  uuid_s=$(govc object.collect -s "$host" hardware.systemInfo.uuid)
-  assert_equal "$uuid" "$uuid_s"
-
-  run govc object.collect "$(govc ls host | head -n1)"
-  assert_success
-
-  # test against slice of interface
-  perfman=$(govc object.collect -s - content.perfManager)
-  result=$(govc object.collect -s "$perfman" description.counterType)
-  assert_equal "..." "$result"
-
-  # test against an interface field
-  run govc object.collect '/ha-datacenter/network/VM Network' summary
-  assert_success
-}
-
-@test "object.collect vcsim" {
-  vcsim_env -app 1 -pool 1
-
-  run govc object.collect -s -type ClusterComputeResource / configStatus
-  assert_success green
-
-  run govc object.collect -s -type ClusterComputeResource / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / configStatus
-  assert_success "$(printf "green\ngreen")"
-
-  run govc object.collect -s -type ComputeResource / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type Datacenter / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type Datastore / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type DistributedVirtualPortgroup / config.key
-  assert_matches dvportgroup-
-
-  run govc object.collect -s -type DistributedVirtualPortgroup / config.name
-  assert_success DC0_DVPG0
-
-  run govc object.collect -s -type DistributedVirtualPortgroup / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type DistributedVirtualSwitch / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type DistributedVirtualSwitch / summary.name
-  assert_success DVS0
-
-  run govc object.collect -s -type DistributedVirtualSwitch / summary.productInfo.name
-  assert_success DVS
-
-  run govc object.collect -s -type DistributedVirtualSwitch / summary.productInfo.vendor
-  assert_success "VMware, Inc."
-
-  run govc object.collect -s -type DistributedVirtualSwitch / summary.productInfo.version
-  assert_success 6.0.0
-
-  run govc object.collect -s -type DistributedVirtualSwitch / summary.uuid
-  assert_matches "-"
-
-  run govc object.collect -s -type Folder / effectiveRole
-  assert_number
-
-  run govc object.collect -json -type HostSystem / config.storageDevice.scsiLun
-  assert_matches /vmfs/devices
-
-  run govc object.collect -json -type HostSystem / config.storageDevice.scsiTopology
-  assert_matches host.ScsiTopology
-
-  run govc object.collect -s -type HostSystem / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type Network / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type ResourcePool / resourcePool
-  # DC0_C0/Resources has 1 child ResourcePool and 1 child VirtualApp
-  assert_matches "ResourcePool:"
-  assert_matches "VirtualApp:"
-
-  run govc object.collect -s -type VirtualApp / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type VirtualApp / name
-  assert_success DC0_C0_APP0
-
-  run govc object.collect -s -type VirtualApp / owner
-  assert_matches ":"
-
-  run govc object.collect -s -type VirtualApp / parent
-  assert_matches ":"
-
-  run govc object.collect -s -type VirtualApp / resourcePool
-  assert_success "" # no VirtualApp children
-
-  run govc object.collect -s -type VirtualApp / summary.config.cpuAllocation.limit
-  assert_number
-
-  run govc object.collect -s -type VirtualApp / summary.config.cpuAllocation.reservation
-  assert_number
-
-  run govc object.collect -s -type VirtualApp / summary.config.memoryAllocation.limit
-  assert_number
-
-  run govc object.collect -s -type VirtualApp / summary.config.memoryAllocation.reservation
-  assert_number
-
-  run govc object.collect -s -type VirtualApp / vm
-  assert_matches "VirtualMachine:"
-
-  run govc object.collect -s -type VirtualMachine / config.tools.toolsVersion
-  assert_number
-
-  run govc object.collect -s -type VirtualMachine / effectiveRole
-  assert_number
-
-  run govc object.collect -s -type VirtualMachine / summary.guest.toolsStatus
-  assert_matches toolsNotInstalled
-
-  run govc object.collect -s -type ClusterComputeResource / summary.effectiveCpu
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.effectiveMemory
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.numCpuCores
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.numCpuThreads
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.numEffectiveHosts
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.numHosts
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.totalCpu
-  assert_number
-
-  run govc object.collect -s -type ClusterComputeResource / summary.totalMemory
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.effectiveCpu
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.effectiveMemory
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.numCpuCores
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.numCpuThreads
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.numEffectiveHosts
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.numHosts
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.totalCpu
-  assert_number
-
-  run govc object.collect -s -type ComputeResource / summary.totalMemory
-  assert_number
-
-  run govc object.collect -s -type Network / summary.accessible
-  assert_success "$(printf "true\ntrue")"
-
-  run govc object.collect -s -type Network / summary.ipPoolName
-  assert_success ""
-}
-
-@test "object.collect view" {
-  vcsim_env -dc 2 -folder 1
-
-  run govc object.collect -type m
-  assert_success
-
-  run govc object.collect -type m / -name '*C0*'
-  assert_success
-
-  run govc object.collect -type m / -name
-  assert_success
-
-  run govc object.collect -type m / name runtime.powerState
-  assert_success
-
-  run govc object.collect -type m -type h /F0 name
-  assert_success
-
-  run govc object.collect -type n / name
-  assert_success
-
-  run govc object.collect -type enoent / name
-  assert_failure
-}
-
-@test "object.find" {
-  esx_env
-
-  unset GOVC_DATACENTER
-
-  run govc find "/enoent"
-  assert_failure
-
-  run govc find
-  assert_success
-
-  run govc find .
-  assert_success
-
-  run govc find /
-  assert_success
-
-  run govc find . -type HostSystem
-  assert_success
-
-  dc=$(govc find / -type Datacenter | head -1)
-
-  run govc find "$dc" -maxdepth 0
-  assert_output "$dc"
-
-  run govc find "$dc/vm" -maxdepth 0
-  assert_output "$dc/vm"
-
-  run govc find "$dc" -maxdepth 1 -type Folder
-  assert_success
-  # /<datacenter>/{vm,network,host,datastore}
-  [ ${#lines[@]} -eq 4 ]
-
-  folder=$(govc find -type Folder -name vm)
-
-  vm=$(new_empty_vm)
-
-  run govc find . -name "$vm"
-  assert_output "$folder/$vm"
-
-  run govc find "$folder" -name "$vm"
-  assert_output "$folder/$vm"
-
-  # moref for VM Network
-  net=$(govc find -i network -name "$GOVC_NETWORK")
-
-  # $vm.network.contains($net) == true
-  run govc find . -type m -name "$vm" -network "$net"
-  assert_output "$folder/$vm"
-
-  # remove network reference
-  run govc device.remove -vm "$vm" ethernet-0
-  assert_success
-
-  # $vm.network.contains($net) == false
-  run govc find . -type VirtualMachine -name "$vm" -network "$net"
-  assert_output ""
-
-  run govc find "$folder" -type VirtualMachine -name "govc-test-*" -runtime.powerState poweredOn
-  assert_output ""
-
-  run govc find "$folder" -type VirtualMachine -name "govc-test-*" -runtime.powerState poweredOff
-  assert_output "$folder/$vm"
-
-  run govc vm.power -on "$vm"
-  assert_success
-
-  run govc find "$folder" -type VirtualMachine -name "govc-test-*" -runtime.powerState poweredOff
-  assert_output ""
-
-  run govc find "$folder" -type VirtualMachine -name "govc-test-*" -runtime.powerState poweredOn
-  assert_output "$folder/$vm"
-
-  # output paths should be relative to "." in these cases
-  export GOVC_DATACENTER=$dc
-
-  folder="./vm"
-
-  run govc find . -name "$vm"
-  assert_output "$folder/$vm"
-
-  run govc find "$folder" -name "$vm"
-}
-
-@test "object.method" {
-  vcsim_env_todo
-
-  vm=$(govc find vm -type m | head -1)
-
-  run govc object.method -enable=false -name NoSuchMethod "$vm"
-  assert_failure
-
-  run govc object.method -enable=false -name Destroy_Task enoent
-  assert_failure
-
-  run govc object.collect -s "$vm" disabledMethod
-  ! assert_matches "Destroy_Task" "$output"
-
-  run govc object.method -enable=false -name Destroy_Task "$vm"
-  assert_success
-
-  run govc object.collect -s "$vm" disabledMethod
-  assert_matches "Destroy_Task" "$output"
-
-  run govc object.method -enable -name Destroy_Task "$vm"
-  assert_success
-
-  run govc object.collect -s "$vm" disabledMethod
-  ! assert_matches "Destroy_Task" "$output"
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/pool.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/pool.bats
deleted file mode 100755
index a45db53468..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/pool.bats
+++ /dev/null
@@ -1,327 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "pool.create" {
-  vcsim_env -esx
-
-  path="*/Resources/$(new_id)/$(new_id)"
-  run govc pool.create $path
-  assert_failure
-  assert_line "govc: cannot create resource pool '$(basename ${path})': parent not found"
-
-  id=$(new_id)
-  path="*/Resources/$id"
-  run govc pool.create -cpu.shares low -mem.reservation 500 $path
-  assert_success
-
-  run govc pool.info $path
-  assert_success
-
-  assert_line "Name: $id"
-  assert_line "CPU Shares: low"
-  assert_line "Mem Reservation: 500MB (expandable=true)"
-
-  run govc pool.destroy $path
-  assert_success
-}
-
-@test "pool.create multiple" {
-  vcsim_env -esx
-
-  id=$(new_id)
-  path="*/Resources/$id"
-  govc pool.create $path
-
-  # Finder.List($path)
-  run govc pool.info "$path"
-  assert_success
-
-  # Finder.Find($name)
-  run govc pool.info "$id"
-  assert_success
-
-  # Create multiple parent pools with multiple arguments (without globbing)
-  run govc pool.create $path/a $path/b
-  assert_success
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 2 ]
-
-  # Create multiple child pools with one argument (with globbing)
-  run govc pool.create $path/*/{a,b}
-  assert_success
-  result=$(govc ls "host/$path/*/*" | wc -l)
-  [ $result -eq 4 ]
-
-  # Clean up
-  run govc pool.destroy $path/*/* $path/* $path
-  assert_success
-}
-
-@test "pool.change" {
-  vcsim_env -esx
-
-  id=$(new_id)
-  root=$(govc find /ha-datacenter/host -type p -name Resources)
-  path="$root/$id"
-
-  run govc pool.create -cpu.reservation 100 $path
-  assert_success
-
-  run govc object.collect -s $path config.cpuAllocation.reservation
-  assert_success "100"
-
-  run govc pool.change -cpu.reservation 0 -mem.shares high $path
-  assert_success
-  run govc pool.info $path
-  assert_success
-  assert_line "Mem Shares: high"
-  assert_line "CPU Shares: normal"
-  run govc object.collect -s $path config.cpuAllocation.reservation
-  assert_success "0"
-
-  nid=$(new_id)
-  run govc pool.change -name $nid $path
-  assert_success
-  path="*/Resources/$nid"
-
-  run govc pool.info $path
-  assert_success
-  assert_line "Name: $nid"
-
-  run govc pool.destroy $path
-  assert_success
-}
-
-@test "pool.change multiple" {
-  esx_env
-
-  id=$(new_id)
-  path="*/Resources/$id"
-  govc pool.create $path
-
-  # Create some nested pools so that we can test changing multiple in one call
-  govc pool.create $path/{a,b} $path/{a,b}/test
-
-  # Test precondition
-  run govc pool.info $path/a/test
-  assert_success
-  assert_line "Name: test"
-  run govc pool.info $path/b/test
-  assert_success
-  assert_line "Name: test"
-
-  # Change name of both test pools
-  run govc pool.change -name hello $path/*/test
-  assert_success
-
-  # Test postcondition
-  run govc pool.info $path/a/hello
-  assert_success
-  assert_line "Name: hello"
-  run govc pool.info $path/b/hello
-  assert_success
-  assert_line "Name: hello"
-
-  # Clean up
-  govc pool.destroy $path/a/hello
-  govc pool.destroy $path/a
-  govc pool.destroy $path/b/hello
-  govc pool.destroy $path/b
-  govc pool.destroy $path
-}
-
-@test "pool.destroy" {
-  esx_env
-
-  id=$(new_id)
-
-  # parent pool
-  path="*/Resources/$id"
-  run govc pool.create $path
-  assert_success
-
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 0 ]
-
-  # child pools
-  id1=$(new_id)
-  run govc pool.create $path/$id1
-  assert_success
-
-  id2=$(new_id)
-  run govc pool.create $path/$id2
-  assert_success
-
-  # 2 child pools
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 2 ]
-
-  # 1 parent pool
-  result=$(govc ls "host/$path" | wc -l)
-  [ $result -eq 1 ]
-
-  run govc pool.destroy $path
-  assert_success
-
-  # no more parent pool
-  result=$(govc ls "host/$path" | wc -l)
-  [ $result -eq 0 ]
-
-  # the child pools are not present anymore
-  # the only place they could pop into is the parent pool
-
-  # first child pool
-  result=$(govc ls "host/*/Resources/$id1" | wc -l)
-  [ $result -eq 0 ]
-
-  # second child pool
-  result=$(govc ls "host/*/Resources/$id2" | wc -l)
-  [ $result -eq 0 ]
-}
-
-@test "pool.destroy children" {
-  esx_env
-
-  id=$(new_id)
-
-  # parent pool
-  path="*/Resources/$id"
-  run govc pool.create $path
-  assert_success
-
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 0 ]
-
-  # child pools
-  run govc pool.create $path/$(new_id)
-  assert_success
-
-  run govc pool.create $path/$(new_id)
-  assert_success
-
-  # 2 child pools
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 2 ]
-
-  # 1 parent pool
-  result=$(govc ls "host/*/Resources/govc-test-*" | wc -l)
-  [ $result -eq 1 ]
-
-  # delete childs
-  run govc pool.destroy -children $path
-  assert_success
-
-  # no more child pools
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 0 ]
-
-  # cleanup
-  run govc pool.destroy $path
-  assert_success
-
-  # cleanup check
-  result=$(govc ls "host/$path" | wc -l)
-  [ $result -eq 0 ]
-}
-
-@test "pool.destroy multiple" {
-  vcsim_env -esx
-
-  id=$(new_id)
-  path="*/Resources/$id"
-  govc pool.create $path
-
-  # Create some nested pools so that we can test destroying multiple in one call
-  govc pool.create $path/{a,b}
-
-  # Test precondition
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 2 ]
-
-  # Destroy both pools
-  run govc pool.destroy $path/{a,b}
-  assert_success
-
-  # Test postcondition
-  result=$(govc ls "host/$path/*" | wc -l)
-  [ $result -eq 0 ]
-
-  # Clean up
-  govc pool.destroy $path
-}
-
-@test "vm.create -pool" {
-  esx_env
-
-  # test with full inventory path to pools
-  parent_path=$(govc ls 'host/*/Resources')
-  parent_name=$(basename $parent_path)
-  [ "$parent_name" = "Resources" ]
-
-  child_name=$(new_id)
-  child_path="$parent_path/$child_name"
-
-  grand_child_name=$(new_id)
-  grand_child_path="$child_path/$grand_child_name"
-
-  run govc pool.create $parent_path/$child_name{,/$grand_child_name}
-  assert_success
-
-  for path in $parent_path $child_path $grand_child_path
-  do
-    run govc vm.create -pool $path $(new_id)
-    assert_success
-  done
-
-  run govc pool.change -mem.limit 100 -mem.expandable=false $child_path
-  assert_failure
-
-  run govc pool.change -mem.limit 100 $child_path
-  assert_success
-
-  run govc pool.change -mem.limit 120 -mem.expandable $child_path
-  assert_success
-
-  # test with glob inventory path to pools
-  parent_path="*/$parent_name"
-  child_path="$parent_path/$child_name"
-  grand_child_path="$child_path/$grand_child_name"
-
-  for path in $grand_child_path $child_path
-  do
-    run govc pool.destroy $path
-    assert_success
-  done
-}
-
-@test "vm.create -pool host" {
-  vcsim_env -esx
-
-  id=$(new_id)
-
-  path=$(govc ls host)
-
-  run govc vm.create -on=false -pool enoent $id
-  assert_failure "govc: resource pool 'enoent' not found"
-
-  run govc vm.create -on=false -pool $path $id
-  assert_success
-}
-
-@test "vm.create -pool cluster" {
-  vcsim_env
-
-  id=$(new_id)
-
-  path=$(dirname $GOVC_HOST)
-
-  unset GOVC_HOST
-  unset GOVC_RESOURCE_POOL
-
-  run govc vm.create -on=false -pool enoent $id
-  assert_failure "govc: resource pool 'enoent' not found"
-
-  run govc vm.create -on=false -pool $path $id
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/role.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/role.bats
deleted file mode 100755
index e9a8959c6c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/role.bats
+++ /dev/null
@@ -1,121 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "permissions" {
-  vcsim_env
-
-  perm=$(govc permissions.ls /DC0)
-
-  run govc permissions.ls -json
-  assert_success
-
-  run govc permissions.set -principal root -role Admin /DC0
-  assert_success
-
-  run govc permissions.ls /DC0
-  refute_line "$perm"
-
-  run govc permissions.remove -principal root /DC0
-  assert_success
-
-  run govc permissions.ls /DC0
-  assert_success "$perm"
-}
-
-@test "role.ls" {
-  vcsim_env
-
-  run govc role.ls
-  assert_success
-
-  run govc role.ls -json
-  assert_success
-
-  run govc role.ls Admin
-  assert_success
-
-  run govc role.ls -json Admin
-  assert_success
-
-  run govc role.ls enoent
-  assert_failure
-}
-
-@test "role.usage" {
-  vcsim_env
-
-  run govc role.usage
-  assert_success
-
-  run govc role.usage -json
-  assert_success
-
-  run govc role.usage Admin
-  assert_success
-
-  run govc role.usage -json Admin
-  assert_success
-
-  run govc role.usage enoent
-  assert_failure
-}
-
-@test "role.create" {
-  vcsim_env
-
-  id=$(new_id)
-  run govc role.create "$id"
-  assert_success
-
-  run govc role.ls "$id"
-  assert_success
-
-  priv=$(govc role.ls "$id" | wc -l)
-  [ "$priv" -eq 3 ]
-
-  vm_priv=($(govc role.ls Admin | grep VirtualMachine.))
-
-  # Test set
-  run govc role.update "$id" "${vm_priv[@]}"
-  assert_success
-
-  # invalid priv id
-  run govc role.update "$id" enoent
-  assert_failure
-
-  npriv=$(govc role.ls "$id" | wc -l)
-  [ "$npriv" -gt "$priv" ]
-  priv=$npriv
-
-  op_priv=($(govc role.ls "$id" | grep VirtualMachine.GuestOperations.))
-  # Test remove
-  run govc role.update -r "$id" "${op_priv[@]}"
-  assert_success
-
-  npriv=$(govc role.ls "$id" | wc -l)
-  [ "$npriv" -lt "$priv" ]
-  priv=$npriv
-
-  # Test add
-  run govc role.update -a "$id" "${op_priv[@]}"
-  assert_success
-
-  npriv=$(govc role.ls "$id" | wc -l)
-  [ "$npriv" -gt "$priv" ]
-  priv=$npriv
-
-  # Test rename
-  run govc role.update -name "${id}-N" "$id"
-  assert_success
-
-  id="${id}-N"
-  # Test we didn't drop any privileges during rename
-  [ "$priv" -eq "$(govc role.ls "$id" | wc -l)" ]
-
-  run govc role.remove "${id}"
-  assert_success
-
-  run govc role.ls "$id"
-  assert_failure
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/session.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/session.bats
deleted file mode 100755
index 329a51dd24..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/session.bats
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "session.ls" {
-  esx_env
-
-  run govc session.ls
-  assert_success
-
-  run govc session.ls -json
-  assert_success
-
-  # Test User-Agent
-  govc session.ls | grep "$(govc version | tr ' ' /)"
-}
-
-@test "session.rm" {
-  esx_env
-
-  run govc session.rm enoent
-  assert_failure
-  assert_output "govc: ServerFaultCode: The object or item referred to could not be found."
-
-  # Can't remove the current session
-  id=$(govc session.ls -json | jq -r .CurrentSession.Key)
-  run govc session.rm "$id"
-  assert_failure
-
-  thumbprint=$(govc about.cert -thumbprint)
-  # persist session just to avoid the Logout() so we can session.rm below
-  dir=$(mktemp -d govc-test-XXXXX)
-
-  id=$(GOVMOMI_HOME="$dir" govc session.ls -json -k=false -persist-session -tls-known-hosts <(echo "$thumbprint") | jq -r .CurrentSession.Key)
-
-  rm -rf "$dir"
-
-  run govc session.rm "$id"
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/snapshot.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/snapshot.bats
deleted file mode 100755
index 03e6c56129..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/snapshot.bats
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-test_vm_snapshot() {
-  vm=$1
-  id=$(new_id)
-
-  # No snapshots == no output
-  run govc snapshot.tree -vm "$vm"
-  assert_success ""
-
-  run govc snapshot.remove -vm "$vm" '*'
-  assert_success
-
-  run govc snapshot.revert -vm "$vm"
-  assert_failure
-
-  run govc snapshot.create -vm "$vm" "$id"
-  assert_success
-
-  run govc snapshot.revert -vm "$vm" enoent
-  assert_failure
-
-  run govc snapshot.revert -vm "$vm"
-  assert_success
-
-  run govc snapshot.remove -vm "$vm" "$id"
-  assert_success
-
-  run govc snapshot.create -vm "$vm" root
-  assert_success
-
-  run govc snapshot.tree -C -vm "$vm"
-  assert_success "root"
-
-  run govc snapshot.create -vm "$vm" child
-  assert_success
-
-  run govc snapshot.tree -C -vm "$vm"
-  assert_success "child"
-
-  run govc snapshot.create -vm "$vm" grand
-  assert_success
-
-  run govc snapshot.create -vm "$vm" child
-  assert_success
-
-  result=$(govc snapshot.tree -vm "$vm" -f | grep -c root/child/grand/child)
-  [ "$result" -eq 1 ]
-
-  run govc snapshot.revert -vm "$vm" root
-  assert_success
-
-  run govc snapshot.create -vm "$vm" child
-  assert_success
-
-  # 3 snapshots named "child"
-  result=$(govc snapshot.tree -vm "$vm" | grep -c child)
-  [ "$result" -eq 3 ]
-
-  run govc snapshot.remove -vm "$vm" child
-  assert_failure
-
-  # 2 snapshots with path "root/child"
-  result=$(govc snapshot.tree -vm "$vm" -f | egrep -c 'root/child$')
-  [ "$result" -eq 2 ]
-
-  run govc snapshot.remove -vm "$vm" root/child
-  assert_failure
-
-  # path is unique
-  run govc snapshot.remove -vm "$vm" root/child/grand/child
-  assert_success
-
-  # set current to grand
-  run govc snapshot.revert -vm "$vm" grand
-
-  # name is unique
-  run govc snapshot.remove -vm "$vm" grand
-  assert_success
-
-  result=$(govc snapshot.tree -vm "$vm" -f | grep root/child/grand/child | wc -l)
-  [ "$result" -eq 0 ]
-
-  # current given to parent of previous current
-  result=$(govc snapshot.tree -vm "$vm" -f | grep '\.' | wc -l)
-  [ "$result" -eq 1 ]
-
-  id=$(govc snapshot.tree -vm "$vm" -f -i | egrep 'root/child$' | head -n1 | awk '{print $1}' | tr -d '[]')
-  # moid is unique
-  run govc snapshot.remove -vm "$vm" "$id"
-  assert_success
-
-  # now root/child is unique
-  run govc snapshot.remove -vm "$vm" root/child
-  assert_success
-
-  run govc snapshot.remove -vm "$vm" root
-  assert_success
-
-  # current is removed
-  result=$(govc snapshot.tree -vm "$vm" -f | grep '\.' | wc -l)
-  [ "$result" -eq 0 ]
-
-  # new root
-  run govc snapshot.create -vm "$vm" 2ndroot
-  assert_success
-
-  # new snapshot 2ndroot is current
-  result=$(govc snapshot.tree -vm "$vm" -f | grep '\.' | wc -l)
-  [ "$result" -eq 1 ]
-}
-
-@test "vm.snapshot vcsim" {
-  vcsim_env
-
-  vm=$(new_empty_vm)
-
-  test_vm_snapshot $vm
-}
-
-@test "vm.snapshot" {
-  esx_env
-
-  vm=$(new_ttylinux_vm)
-
-  test_vm_snapshot $vm
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/tasks.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/tasks.bats
deleted file mode 100755
index 11f987cade..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/tasks.bats
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "tasks" {
-  esx_env
-
-  run govc tasks
-  assert_success
-}
-
-@test "tasks host" {
-  esx_env
-
-  run govc tasks 'host/*'
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash b/installer/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash
deleted file mode 100644
index 87458f8331..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/test_helper.bash
+++ /dev/null
@@ -1,277 +0,0 @@
-# set the following variables only if they've not been set
-export GOVC_DATASTORE=${GOVC_DATASTORE-datastore1}
-export GOVC_NETWORK=${GOVC_NETWORK-"VM Network"}
-
-export GOVC_INSECURE=true
-export GOVC_PERSIST_SESSION=false
-unset GOVC_URL
-unset GOVC_DEBUG
-unset GOVC_TLS_KNOWN_HOSTS
-unset GOVC_TLS_HANDSHAKE_TIMEOUT
-unset GOVC_DATACENTER
-unset GOVC_HOST
-unset GOVC_USERNAME
-unset GOVC_PASSWORD
-
-if [ -z "$BATS_TEST_DIRNAME" ]; then
-  BATS_TEST_DIRNAME=$(dirname ${BASH_SOURCE})
-fi
-
-# gnu core utils
-readlink=$(type -p greadlink readlink | head -1)
-xargs=$(type -p gxargs xargs | head -1)
-mktemp=$(type -p gmktemp mktemp | head -1)
-
-BATS_TEST_DIRNAME=$($readlink -nf $BATS_TEST_DIRNAME)
-
-GOVC_IMAGES=$BATS_TEST_DIRNAME/images
-TTYLINUX_NAME=ttylinux-pc_i486-16.1
-
-GOVC_TEST_VMDK_SRC=$GOVC_IMAGES/${TTYLINUX_NAME}-disk1.vmdk
-GOVC_TEST_VMDK=govc-images/$(basename $GOVC_TEST_VMDK_SRC)
-
-GOVC_TEST_ISO_SRC=$GOVC_IMAGES/${TTYLINUX_NAME}.iso
-GOVC_TEST_ISO=govc-images/$(basename $GOVC_TEST_ISO_SRC)
-
-GOVC_TEST_IMG_SRC=$GOVC_IMAGES/floppybird.img
-GOVC_TEST_IMG=govc-images/$(basename $GOVC_TEST_IMG_SRC)
-
-PATH="$GOPATH/bin:$PATH"
-
-teardown() {
-  if [ -n "$GOVC_SIM_PID" ] ; then
-    kill "$GOVC_SIM_PID"
-    rm -f "$GOVC_SIM_ENV"
-  else
-    govc ls vm | grep govc-test- | $xargs -r govc vm.destroy
-    govc datastore.ls | grep govc-test- | awk '{print ($NF)}' | $xargs -n1 -r govc datastore.rm
-    govc ls "host/*/Resources/govc-test-*" | $xargs -r govc pool.destroy
-  fi
-}
-
-new_id() {
-  echo "govc-test-$(vcsim uuidgen)"
-}
-
-import_ttylinux_vmdk() {
-  govc datastore.mkdir -p govc-images
-  govc datastore.ls "$GOVC_TEST_VMDK" >/dev/null 2>&1 || \
-    govc import.vmdk "$GOVC_TEST_VMDK_SRC" govc-images > /dev/null
-}
-
-datastore_upload() {
-  src=$1
-  dst=govc-images/$(basename $src)
-
-  govc datastore.mkdir -p govc-images
-  govc datastore.ls "$dst" >/dev/null 2>&1 || \
-    govc datastore.upload "$src" "$dst" > /dev/null
-}
-
-upload_img() {
-  datastore_upload $GOVC_TEST_IMG_SRC
-}
-
-upload_iso() {
-  datastore_upload $GOVC_TEST_ISO_SRC
-}
-
-new_ttylinux_vm() {
-  import_ttylinux_vmdk
-  id=$(new_id)
-  govc vm.create -m 32 -disk $GOVC_TEST_VMDK -disk.controller ide -on=false $id
-  echo $id
-}
-
-new_empty_vm() {
-  id=$(new_id)
-  govc vm.create -on=false $id
-  echo $id
-}
-
-vm_power_state() {
-  govc vm.info "$1" | grep "Power state:" | awk -F: '{print $2}' | collapse_ws
-}
-
-vm_mac() {
-  govc device.info -vm "$1" ethernet-0 | grep "MAC Address" | awk '{print $NF}'
-}
-
-esx_env() {
-  if [ -z "$GOVC_TEST_URL" ] ; then
-    skip "GOVC_TEST_URL not set"
-  fi
-
-  export GOVC_URL=$GOVC_TEST_URL
-}
-
-vcsim_env_todo() {
-  skip "not yet supported by vcsim"
-}
-
-# starts vcsim and exports the environment
-vcsim_env() {
-  GOVC_SIM_ENV="$BATS_TMPDIR/$(new_id)"
-  export GOVC_SIM_ENV
-  mkfifo "$GOVC_SIM_ENV"
-
-  vcsim -httptest.serve=127.0.0.1:0 -E "$GOVC_SIM_ENV" "$@" &
-
-  eval "$(cat "$GOVC_SIM_ENV")"
-
-  export GOVC_DATASTORE=LocalDS_0
-
-  if [ "$1" != "-esx" ] ; then
-    export GOVC_DATACENTER=DC0 \
-           GOVC_HOST=/DC0/host/DC0_C0/DC0_C0_H0 \
-           GOVC_RESOURCE_POOL=/DC0/host/DC0_C0/Resources \
-           GOVC_NETWORK=/DC0/network/DC0_DVPG0
-  fi
-}
-
-# remove username/password from $GOVC_URL and set $GOVC_{USERNAME,PASSWORD}
-govc_url_to_vars() {
-  GOVC_USERNAME="$(govc env GOVC_USERNAME)"
-  GOVC_PASSWORD="$(govc env GOVC_PASSWORD)"
-  GOVC_URL="$(govc env GOVC_URL)"
-  export GOVC_URL GOVC_USERNAME GOVC_PASSWORD
-
-  # double check that we removed user/pass
-  grep -q -v @ <<<"$GOVC_URL"
-}
-
-quit_vnc() {
-  if [ "$(uname)" = "Darwin" ]; then
-    osascript <<EOF
-tell application "Screen Sharing"
-   quit
-end tell
-EOF
-  fi
-}
-
-open_vnc() {
-  url=$1
-  echo "open $url"
-
-  if [ "$(uname)" = "Darwin" ]; then
-    open $url
-  fi
-}
-
-# collapse spaces, for example testing against Go's tabwriter output
-collapse_ws() {
-  local line
-  if [ $# -eq 0 ]; then line="$(cat -)"
-  else line="$@"
-  fi
-  echo "$line" | tr -s ' ' | sed -e 's/^ //'
-}
-
-# the following helpers are borrowed from the test_helper.bash in https://github.com/sstephenson/rbenv
-
-flunk() {
-  { if [ "$#" -eq 0 ]; then cat -
-    else echo "$@"
-    fi
-  } >&2
-  return 1
-}
-
-assert_success() {
-  if [ "$status" -ne 0 ]; then
-    flunk "command failed with exit status $status: $output"
-  elif [ "$#" -gt 0 ]; then
-    assert_output "$1"
-  fi
-}
-
-assert_failure() {
-  if [ "$status" -ne 1 ]; then
-    flunk $(printf "expected failed exit status=1, got status=%d" $status)
-  elif [ "$#" -gt 0 ]; then
-    assert_output "$1"
-  fi
-}
-
-assert_equal() {
-  if [ "$1" != "$2" ]; then
-    { echo "expected: $1"
-      echo "actual:   $2"
-    } | flunk
-  fi
-}
-
-assert_output() {
-  local expected
-  if [ $# -eq 0 ]; then expected="$(cat -)"
-  else expected="$1"
-  fi
-  assert_equal "$expected" "$output"
-}
-
-assert_matches() {
-  local pattern="${1}"
-  local actual="${2}"
-
-  if [ $# -eq 1 ]; then
-    actual="$output"
-  fi
-
-  if ! grep -E -q "${pattern}" <<<"${actual}"; then
-    { echo "pattern: ${pattern}"
-      echo "actual:  ${actual}"
-    } | flunk
-  fi
-}
-
-assert_number() {
-  assert_matches "^-?[0-9]+$" "$output"
-}
-
-assert_empty() {
-  local actual="${1}"
-
-  if [ $# -eq 0 ]; then
-    actual="$(cat -)"
-  fi
-
-  if [ -n "${actual}" ]; then
-    { echo "actual: ${actual}"
-    } | flunk
-  fi
-}
-
-assert_line() {
-  if [ "$1" -ge 0 ] 2>/dev/null; then
-    assert_equal "$2" "$(collapse_ws ${lines[$1]})"
-  else
-    local line
-    for line in "${lines[@]}"; do
-      if [ "$(collapse_ws $line)" = "$1" ]; then return 0; fi
-    done
-    flunk "expected line \`$1'"
-  fi
-}
-
-refute_line() {
-  if [ "$1" -ge 0 ] 2>/dev/null; then
-    local num_lines="${#lines[@]}"
-    if [ "$1" -lt "$num_lines" ]; then
-      flunk "output has $num_lines lines"
-    fi
-  else
-    local line
-    for line in "${lines[@]}"; do
-      if [ "$line" = "$1" ]; then
-        flunk "expected to not find line \`$line'"
-      fi
-    done
-  fi
-}
-
-assert() {
-  if ! "$@"; then
-    flunk "failed: $*"
-  fi
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim.bats
deleted file mode 100755
index 2c326dd1fb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim.bats
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "vcsim rbvmomi" {
-  if ! ruby -e "require 'rbvmomi'" ; then
-    skip "requires rbvmomi"
-  fi
-
-  vcsim_env
-
-  ruby ./vcsim_test.rb "$(govc env -x GOVC_URL_PORT)"
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim_test.rb b/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim_test.rb
deleted file mode 100755
index cdfccf077f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/vcsim_test.rb
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'rbvmomi'
-
-VIM = RbVmomi::VIM
-
-vim = VIM.connect :user => "user", :password => "pass", :insecure => true, :host => "localhost", :port => ARGV[0] || 8989
-
-dc = vim.serviceInstance.content.rootFolder.traverse("DC0", VIM::Datacenter) or abort "datacenter not found"
-vm = dc.vmFolder.traverse("DC0_H0_VM1", VIM::VirtualMachine) or abort "VM not found"
-
-if vm.runtime.powerState == "poweredOn"
-  vm.PowerOffVM_Task.wait_for_completion
-end
-
-vm.PowerOnVM_Task.wait_for_completion
-
-begin
-  vm.PowerOnVM_Task.wait_for_completion
-  raise "expected InvalidPowerState"
-rescue VIM::InvalidPowerState
-  # ok
-end
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/test/vm.bats b/installer/vendor/github.com/vmware/govmomi/govc/test/vm.bats
deleted file mode 100755
index 672b8566db..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/test/vm.bats
+++ /dev/null
@@ -1,643 +0,0 @@
-#!/usr/bin/env bats
-
-load test_helper
-
-@test "vm.ip" {
-  esx_env
-
-  id=$(new_ttylinux_vm)
-
-  run govc vm.power -on $id
-  assert_success
-
-  run govc vm.ip $id
-  assert_success
-
-  run govc vm.ip -a -v4 $id
-  assert_success
-
-  run govc vm.ip -n $(vm_mac $id) $id
-  assert_success
-
-  run govc vm.ip -n ethernet-0 $id
-  assert_success
-
-  ip=$(govc vm.ip $id)
-
-  # add a second nic
-  run govc vm.network.add -vm $id "VM Network"
-  assert_success
-
-  res=$(govc vm.ip -n ethernet-0 $id)
-  assert_equal $ip $res
-}
-
-@test "vm.ip -esxcli" {
-  esx_env
-
-  ok=$(govc host.esxcli system settings advanced list -o /Net/GuestIPHack | grep ^IntValue: | awk '{print $2}')
-  if [ "$ok" != "1" ] ; then
-    skip "/Net/GuestIPHack=0"
-  fi
-  id=$(new_ttylinux_vm)
-
-  run govc vm.power -on $id
-  assert_success
-
-  run govc vm.ip -esxcli $id
-  assert_success
-
-  ip_esxcli=$output
-
-  run govc vm.ip $id
-  assert_success
-  ip_tools=$output
-
-  assert_equal $ip_esxcli $ip_tools
-}
-
-@test "vm.create" {
-  esx_env
-
-  id=$(new_ttylinux_vm)
-
-  run govc vm.power -on $id
-  assert_success
-
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 0 ]
-
-  result=$(govc device.ls -vm $vm | grep cdrom- | wc -l)
-  [ $result -eq 0 ]
-}
-
-@test "vm.change" {
-  esx_env
-
-  id=$(new_ttylinux_vm)
-
-  run govc vm.change -g ubuntu64Guest -m 1024 -c 2 -vm $id
-  assert_success
-
-  run govc vm.info $id
-  assert_success
-  assert_line "Guest name: Ubuntu Linux (64-bit)"
-  assert_line "Memory: 1024MB"
-  assert_line "CPU: 2 vCPU(s)"
-
-  run govc vm.change -e "guestinfo.a=1" -e "guestinfo.b=2" -vm $id
-  assert_success
-
-  run govc vm.info -e $id
-  assert_success
-  assert_line "guestinfo.a: 1"
-  assert_line "guestinfo.b: 2"
-
-  run govc vm.change -sync-time-with-host=false -vm $id
-  assert_success
-
-  run govc vm.info -t $id
-  assert_success
-  assert_line "SyncTimeWithHost: false"
-
-  run govc vm.change -sync-time-with-host=true -vm $id
-  assert_success
-
-  run govc vm.info -t $id
-  assert_success
-  assert_line "SyncTimeWithHost: true"
-
-  nid=$(new_id)
-  run govc vm.change -name $nid -vm $id
-  assert_success
-
-  run govc vm.info $id
-  [ ${#lines[@]} -eq 0 ]
-
-  run govc vm.info $nid
-  [ ${#lines[@]} -gt 0 ]
-}
-
-@test "vm.power" {
-  esx_env
-
-  vm=$(new_ttylinux_vm)
-
-  run vm_power_state $vm
-  assert_success "poweredOff"
-
-  run govc vm.power $vm
-  assert_failure
-
-  run govc vm.power -on -off $vm
-  assert_failure
-
-  run govc vm.power -on $vm
-  assert_success
-  run vm_power_state $vm
-  assert_success "poweredOn"
-
-  run govc vm.power -suspend $vm
-  assert_success
-  run vm_power_state $vm
-  assert_success "suspended"
-
-  run govc vm.power -on $vm
-  assert_success
-  run vm_power_state $vm
-  assert_success "poweredOn"
-}
-
-@test "vm.power -force" {
-  esx_env
-
-  vm=$(new_id)
-  govc vm.create $vm
-
-  run govc vm.power -r $vm
-  assert_failure
-
-  run govc vm.power -r -force $vm
-  assert_success
-
-  run govc vm.power -s $vm
-  assert_failure
-
-  run govc vm.power -s -force $vm
-  assert_success
-
-  run govc vm.power -off $vm
-  assert_failure
-
-  run govc vm.power -off -force $vm
-  assert_success
-
-  run govc vm.destroy $vm
-  assert_success
-
-  run govc vm.power -off $vm
-  assert_failure
-
-  run govc vm.power -off -force $vm
-  assert_failure
-}
-
-@test "vm.create pvscsi" {
-  esx_env
-
-  vm=$(new_id)
-  govc vm.create -on=false -disk.controller pvscsi $vm
-
-  result=$(govc device.ls -vm $vm | grep pvscsi- | wc -l)
-  [ $result -eq 1 ]
-
-  result=$(govc device.ls -vm $vm | grep lsilogic- | wc -l)
-  [ $result -eq 0 ]
-
-  vm=$(new_id)
-  govc vm.create -on=false -disk.controller pvscsi -disk=1GB $vm
-}
-
-@test "vm.create in cluster" {
-  vcsim_env
-
-  # using GOVC_HOST and its resource pool
-  run govc vm.create -on=false $(new_id)
-  assert_success
-
-  # using no -host and the default resource pool for DC0
-  unset GOVC_HOST
-  run govc vm.create -on=false $(new_id)
-  assert_success
-}
-
-@test "vm.info" {
-  vcsim_env -esx
-
-  local num=3
-
-  local prefix=$(new_id)
-
-  for x in $(seq $num)
-  do
-    local id="${prefix}-${x}"
-
-    # If VM is not found: No output, exit code==0
-    run govc vm.info $id
-    assert_success
-    [ ${#lines[@]} -eq 0 ]
-
-    # If VM is not found (using -json flag): Valid json output, exit code==0
-    run govc vm.info -json $id
-    assert_success
-    assert_line "{\"VirtualMachines\":null}"
-
-    run govc vm.info -dump $id
-    assert_success
-
-    run govc vm.create -on=false $id
-    assert_success
-
-    local info=$(govc vm.info -r $id)
-    local found=$(grep Name: <<<"$info" | wc -l)
-    [ "$found" -eq 1 ]
-
-    # test that mo names are printed
-    found=$(grep Host: <<<"$info" | awk '{print $2}')
-    [ -n "$found" ]
-    found=$(grep Storage: <<<"$info" | awk '{print $2}')
-    [ -n "$found" ]
-    found=$(grep Network: <<<"$info" | awk '{print $2}')
-    [ -n "$found" ]
-  done
-
-  # test find slice
-  local slice=$(govc vm.info ${prefix}-*)
-  local found=$(grep Name: <<<"$slice" | wc -l)
-  [ "$found" -eq $num ]
-
-  # test -r
-  found=$(grep Storage: <<<"$slice" | wc -l)
-  [ "$found" -eq 0 ]
-  found=$(grep Network: <<<"$slice" | wc -l)
-  [ "$found" -eq 0 ]
-  slice=$(govc vm.info -r ${prefix}-*)
-  found=$(grep Storage: <<<"$slice" | wc -l)
-  [ "$found" -eq $num ]
-  found=$(grep Network: <<<"$slice" | wc -l)
-  [ "$found" -eq $num ]
-
-  # test extraConfig
-  run govc vm.change -e "guestinfo.a=2" -vm $id
-  assert_success
-  run govc vm.info -e $id
-  assert_success
-  assert_line "guestinfo.a: 2"
-  run govc vm.change -e "guestinfo.a=" -vm $id
-  assert_success
-  refute_line "guestinfo.a: 2"
-}
-
-@test "vm.create linked ide disk" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  run govc vm.create -disk $GOVC_TEST_VMDK -disk.controller ide -on=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-200-0
-  assert_success
-  assert_line "Controller: ide-200"
-}
-
-@test "vm.create linked scsi disk" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  run govc vm.create -disk enoent -on=false $vm
-  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
-
-  run govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-1000-0
-  assert_success
-  assert_line "Controller: lsilogic-1000"
-  assert_line "Parent: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
-  assert_line "File: [${GOVC_DATASTORE##*/}] $vm/${vm}.vmdk"
-}
-
-@test "vm.create scsi disk" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  run govc vm.create -disk enoent -on=false $vm
-  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
-
-
-  run govc vm.create -disk $GOVC_TEST_VMDK -on=false -link=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-1000-0
-  assert_success
-  assert_line "Controller: lsilogic-1000"
-  refute_line "Parent: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
-  assert_line "File: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
-}
-
-@test "vm.create scsi disk with datastore argument" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  run govc vm.create -disk="${GOVC_TEST_VMDK}" -disk-datastore="${GOVC_DATASTORE}" -on=false -link=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-1000-0
-  assert_success
-  assert_line "File: [${GOVC_DATASTORE##*/}] $GOVC_TEST_VMDK"
-}
-
-@test "vm.create iso" {
-  esx_env
-
-  upload_iso
-
-  vm=$(new_id)
-
-  run govc vm.create -iso enoent -on=false $vm
-  assert_failure "govc: cannot stat '[${GOVC_DATASTORE##*/}] enoent': No such file"
-
-  run govc vm.create -iso $GOVC_TEST_ISO -on=false $vm
-  assert_success
-
-  run govc device.info -vm $vm cdrom-3000
-  assert_success
-  assert_line "Controller: ide-200"
-  assert_line "Summary: ISO [${GOVC_DATASTORE##*/}] $GOVC_TEST_ISO"
-}
-
-@test "vm.create iso with datastore argument" {
-  esx_env
-
-  upload_iso
-
-  vm=$(new_id)
-
-  run govc vm.create -iso="${GOVC_TEST_ISO}" -iso-datastore="${GOVC_DATASTORE}" -on=false $vm
-  assert_success
-
-  run govc device.info -vm $vm cdrom-3000
-  assert_success
-  assert_line "Summary: ISO [${GOVC_DATASTORE##*/}] $GOVC_TEST_ISO"
-}
-
-@test "vm.disk.create empty vm" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  local name=$(new_id)
-
-  run govc vm.disk.create -vm $vm -name $name -size 1G
-  assert_success
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 1 ]
-
-  name=$(new_id)
-
-  run govc vm.disk.create -vm $vm -name $name -controller lsilogic-1000 -size 2G
-  assert_success
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 2 ]
-}
-
-@test "vm.disk.create" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 1 ]
-
-  local name=$(new_id)
-
-  run govc vm.disk.create -vm $vm -name $name -size 1G
-  assert_success
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 2 ]
-
-  run govc vm.disk.create -vm $vm -name $name -size 1G
-  assert_success # TODO: should fail?
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 2 ]
-}
-
-@test "vm.disk.attach" {
-  esx_env
-
-  import_ttylinux_vmdk
-
-  vm=$(new_id)
-
-  govc vm.create -disk $GOVC_TEST_VMDK -on=false $vm
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 1 ]
-
-  id=$(new_id)
-  run govc import.vmdk $GOVC_TEST_VMDK_SRC $id
-  assert_success
-
-  run govc vm.disk.attach -vm $vm -link=false -disk enoent.vmdk
-  assert_failure "govc: File [${GOVC_DATASTORE##*/}] enoent.vmdk was not found"
-
-  run govc vm.disk.attach -vm $vm -disk enoent.vmdk
-  assert_failure "govc: Invalid configuration for device '0'."
-
-  run govc vm.disk.attach -vm $vm -disk $id/$(basename $GOVC_TEST_VMDK) -controller lsilogic-1000
-  assert_success
-  result=$(govc device.ls -vm $vm | grep disk- | wc -l)
-  [ $result -eq 2 ]
-}
-
-@test "vm.create new disk with datastore argument" {
-  esx_env
-
-  vm=$(new_id)
-
-  run govc vm.create -disk="1GiB" -ds="${GOVC_DATASTORE}" -on=false -link=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-1000-0
-  assert_success
-  assert_line "File: [${GOVC_DATASTORE##*/}] ${vm}/${vm}.vmdk"
-}
-
-@test "vm.create new disk with datastore cluster argument" {
-  if [ -z "${GOVC_DATASTORE_CLUSTER}" ]; then
-    skip "requires datastore cluster"
-  fi
-
-  vm=$(new_id)
-
-  run govc vm.create -disk="1GiB" -datastore-cluster="${GOVC_DATASTORE_CLUSTER}" -on=false -link=false $vm
-  assert_success
-
-  run govc device.info -vm $vm disk-1000-0
-  assert_success
-}
-
-@test "vm.register" {
-  esx_env
-
-  run govc vm.unregister enoent
-  assert_failure
-
-  vm=$(new_empty_vm)
-
-  run govc vm.unregister "$vm"
-  assert_success
-
-  run govc vm.register "$vm/${vm}.vmx"
-  assert_success
-}
-
-@test "vm.register vcsim" {
-  vcsim_env -autostart=false
-
-  host=$GOVC_HOST
-  pool=$GOVC_RESOURCE_POOL
-
-  unset GOVC_HOST GOVC_RESOURCE_POOL
-
-  vm=DC0_H0_VM0
-
-  run govc vm.unregister $vm
-  assert_success
-
-  run govc vm.register "$vm/${vm}.vmx"
-  assert_failure # -pool is required
-
-  run govc vm.register -pool "$pool" "$vm/${vm}.vmx"
-  assert_success
-
-  run govc vm.unregister $vm
-  assert_success
-
-  run govc vm.register -template -pool "$pool" "$vm/${vm}.vmx"
-  assert_failure # -pool is not allowed w/ template
-
-  run govc vm.register -template -host "$host" "$vm/${vm}.vmx"
-  assert_success
-}
-
-@test "vm.clone" {
-  vcsim_env
-
-  vm=$(new_empty_vm)
-  clone=$(new_id)
-
-  run govc vm.clone -vm "$vm" "$clone"
-  assert_success
-
-  clone=$(new_id)
-  run govc vm.clone -vm "$vm" -snapshot X "$clone"
-  assert_failure
-
-  run govc snapshot.create -vm "$vm" X
-  assert_success
-
-  run govc vm.clone -vm "$vm" -snapshot X "$clone"
-  assert_success
-}
-
-@test "vm.clone change resources" {
-  vcsim_env
-
-  vm=$(new_empty_vm)
-  clone=$(new_id)
-
-  run govc vm.clone -m 1024 -c 2 -vm $vm $clone
-  assert_success
-
-  run govc vm.info $clone
-  assert_success
-  assert_line "Memory: 1024MB"
-  assert_line "CPU: 2 vCPU(s)"
-}
-
-@test "vm.clone usage" {
-  # validate we require -vm flag
-  run govc vm.clone enoent
-  assert_failure
-}
-
-@test "vm.migrate" {
-  vcsim_env -cluster 2
-
-  vm=$(new_empty_vm)
-
-  # migrate from H0 to H1
-  run govc vm.migrate -host DC0_C0/DC0_C0_H1 "$vm"
-  assert_success
-
-  # migrate from C0 to C1
-  run govc vm.migrate -pool DC0_C1/Resources "$vm"
-  assert_success
-}
-
-@test "object name with slash" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  name="$vm/with-slash"
-
-  # rename VM to include a '/'
-  run govc vm.change -vm "$vm" -name "$name"
-  assert_success
-
-  path=$(govc ls "vm/$name")
-
-  run govc vm.info "$name"
-  assert_success
-  assert_line "Name: $name"
-  assert_line "Path: $path"
-
-  run govc vm.info "$path"
-  assert_success
-  assert_line "Name: $name"
-  assert_line "Path: $path"
-
-  run govc find vm -name "$name"
-  assert_success "vm/$name"
-
-  # create a portgroup where name includes a '/'
-  net=$(new_id)/with-slash
-
-  run govc host.portgroup.add -vswitch vSwitch0 "$net"
-  assert_success
-
-  run govc vm.network.change -vm "$name" -net "$net" ethernet-0
-  assert_success
-
-  # change VM eth0 to use network that includes a '/' in the name
-  run govc device.info -vm "$name" ethernet-0
-  assert_success
-  assert_line "Summary: $net"
-
-  run govc host.portgroup.remove "$net"
-  assert_success
-}
-
-@test "vm.console" {
-  esx_env
-
-  vm=$(new_empty_vm)
-
-  run govc vm.console "$vm"
-  assert_failure
-
-  run govc vm.power -on "$vm"
-  assert_success
-
-  run govc vm.console "$vm"
-  assert_success
-
-  run govc vm.console -capture - "$vm"
-  assert_success
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/usage.sh b/installer/vendor/github.com/vmware/govmomi/govc/usage.sh
deleted file mode 100755
index d153441537..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/usage.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/bin/bash -e
-
-for var in $(env | grep GOVC_) ; do
-  eval "unset ${var/=*}"
-done
-
-common_opts=$(cat <<EOF
-  -cert=                    Certificate [GOVC_CERTIFICATE]
-  -debug=false              Store debug logs [GOVC_DEBUG]
-  -dump=false               Enable output dump
-  -json=false               Enable JSON output
-  -k=false                  Skip verification of server certificate [GOVC_INSECURE]
-  -key=                     Private key [GOVC_PRIVATE_KEY]
-  -persist-session=true     Persist session to disk [GOVC_PERSIST_SESSION]
-  -tls-ca-certs=            TLS CA certificates file [GOVC_TLS_CA_CERTS]
-  -tls-known-hosts=         TLS known hosts file [GOVC_TLS_KNOWN_HOSTS]
-  -u=                       ESX or vCenter URL [GOVC_URL]
-  -vim-namespace=urn:vim25  Vim namespace [GOVC_VIM_NAMESPACE]
-  -vim-version=6.0          Vim version [GOVC_VIM_VERSION]
-  -dc=                      Datacenter [GOVC_DATACENTER]
-  -host.dns=                Find host by FQDN
-  -host.ip=                 Find host by IP address
-  -host.ipath=              Find host by inventory path
-  -host.uuid=               Find host by UUID
-  -vm.dns=                  Find VM by FQDN
-  -vm.ip=                   Find VM by IP address
-  -vm.ipath=                Find VM by inventory path
-  -vm.path=                 Find VM by path to .vmx file
-  -vm.uuid=                 Find VM by UUID
-EOF
-)
-
-cat <<'EOF'
-# govc usage
-
-This document is generated from `govc -h` and `govc $cmd -h` commands.
-
-The following common options are filtered out in this document,
-but appear via `govc $cmd -h`:
-
-```
-EOF
-
-printf "%s\n\`\`\`\n\n" "${common_opts}"
-
-cmds=($(govc -h | grep -v Usage))
-
-opts=($(cut -s -d= -f1 <<<"$common_opts" | xargs -n1 | sed -e 's/^/\\/'))
-filter=$(printf "|%s=" "${opts[@]}")
-
-for cmd in "${cmds[@]}" ; do
-    printf "## %s\n\n" "$cmd"
-    printf "\`\`\`\n"
-    govc "$cmd" -h | egrep -v "${filter:1}"
-    printf "\`\`\`\n\n"
-done
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go b/installer/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go
deleted file mode 100644
index a7af0582b2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vapp/destroy.go
+++ /dev/null
@@ -1,115 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vapp
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type destroy struct {
-	*flags.DatacenterFlag
-}
-
-func init() {
-	cli.Register("vapp.destroy", &destroy{})
-}
-
-func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-}
-
-func (cmd *destroy) Process(ctx context.Context) error {
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *destroy) Usage() string {
-	return "VAPP..."
-}
-
-func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() == 0 {
-		return flag.ErrHelp
-	}
-
-	finder, err := cmd.Finder()
-	if err != nil {
-		return err
-	}
-
-	for _, arg := range f.Args() {
-		vapps, err := finder.VirtualAppList(ctx, arg)
-		if err != nil {
-			if _, ok := err.(*find.NotFoundError); ok {
-				// Ignore if vapp cannot be found
-				continue
-			}
-
-			return err
-		}
-
-		for _, vapp := range vapps {
-			powerOff := func() error {
-				task, err := vapp.PowerOff(ctx, false)
-				if err != nil {
-					return err
-				}
-				err = task.Wait(ctx)
-				if err != nil {
-					// it's safe to ignore if the vapp is already powered off
-					if f, ok := err.(types.HasFault); ok {
-						switch f.Fault().(type) {
-						case *types.InvalidPowerState:
-							return nil
-						}
-					}
-					return err
-				}
-				return nil
-			}
-			if err := powerOff(); err != nil {
-				return err
-			}
-
-			destroy := func() error {
-				task, err := vapp.Destroy(ctx)
-				if err != nil {
-					return err
-				}
-				err = task.Wait(ctx)
-				if err != nil {
-					return err
-				}
-				return nil
-			}
-			if err := destroy(); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vapp/power.go b/installer/vendor/github.com/vmware/govmomi/govc/vapp/power.go
deleted file mode 100644
index e531b332f4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vapp/power.go
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vapp
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type power struct {
-	*flags.SearchFlag
-
-	On      bool
-	Off     bool
-	Suspend bool
-	Force   bool
-}
-
-func init() {
-	cli.Register("vapp.power", &power{})
-}
-
-func (cmd *power) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualApps)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.On, "on", false, "Power on")
-	f.BoolVar(&cmd.Off, "off", false, "Power off")
-	f.BoolVar(&cmd.Suspend, "suspend", false, "Power suspend")
-	f.BoolVar(&cmd.Force, "force", false, "Force (If force is false, the shutdown order in the vApp is executed. If force is true, all virtual machines are powered-off (regardless of shutdown order))")
-}
-
-func (cmd *power) Process(ctx context.Context) error {
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	opts := []bool{cmd.On, cmd.Off, cmd.Suspend}
-	selected := false
-
-	for _, opt := range opts {
-		if opt {
-			if selected {
-				return flag.ErrHelp
-			}
-			selected = opt
-		}
-	}
-
-	if !selected {
-		return flag.ErrHelp
-	}
-
-	return nil
-}
-
-func (cmd *power) Run(ctx context.Context, f *flag.FlagSet) error {
-	vapps, err := cmd.VirtualApps(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vapp := range vapps {
-		var task *object.Task
-
-		switch {
-		case cmd.On:
-			fmt.Fprintf(cmd, "Powering on %s... ", vapp.Reference())
-			task, err = vapp.PowerOn(ctx)
-		case cmd.Off:
-			fmt.Fprintf(cmd, "Powering off %s... ", vapp.Reference())
-			task, err = vapp.PowerOff(ctx, cmd.Force)
-		case cmd.Suspend:
-			fmt.Fprintf(cmd, "Suspend %s... ", vapp.Reference())
-			task, err = vapp.Suspend(ctx)
-		}
-
-		if err != nil {
-			return err
-		}
-
-		if task != nil {
-			err = task.Wait(ctx)
-		}
-		if err == nil {
-			fmt.Fprintf(cmd, "OK\n")
-			continue
-		}
-
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/version/command.go b/installer/vendor/github.com/vmware/govmomi/govc/version/command.go
deleted file mode 100644
index 627cff2a1a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/version/command.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package version
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"log"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-var gitVersion string
-
-type version struct {
-	*flags.EmptyFlag
-
-	require string
-}
-
-func init() {
-	// Check that git tag in the release builds match the hardcoded version
-	if gitVersion != "" && gitVersion[1:] != flags.Version {
-		log.Panicf("version mismatch: git=%s vs govc=%s", gitVersion[1:], flags.Version)
-	}
-
-	cli.Register("version", &version{})
-}
-
-func (cmd *version) Register(ctx context.Context, f *flag.FlagSet) {
-	f.StringVar(&cmd.require, "require", "", "Require govc version >= this value")
-}
-
-func (cmd *version) Run(ctx context.Context, f *flag.FlagSet) error {
-	if cmd.require != "" {
-		v, err := flags.ParseVersion(flags.Version)
-		if err != nil {
-			panic(err)
-		}
-
-		rv, err := flags.ParseVersion(cmd.require)
-		if err != nil {
-			return fmt.Errorf("failed to parse required version '%s': %s", cmd.require, err)
-		}
-
-		if !rv.Lte(v) {
-			return fmt.Errorf("version %s or higher is required, this is version %s", cmd.require, flags.Version)
-		}
-	}
-
-	fmt.Printf("govc %s\n", flags.Version)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/change.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/change.go
deleted file mode 100644
index af00b36c9d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/change.go
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type extraConfig []types.BaseOptionValue
-
-func (e *extraConfig) String() string {
-	return fmt.Sprintf("%v", *e)
-}
-
-func (e *extraConfig) Set(v string) error {
-	r := strings.SplitN(v, "=", 2)
-	if len(r) < 2 {
-		return fmt.Errorf("failed to parse extraConfig: %s", v)
-	}
-	*e = append(*e, &types.OptionValue{Key: r[0], Value: r[1]})
-	return nil
-}
-
-type change struct {
-	*flags.VirtualMachineFlag
-
-	types.VirtualMachineConfigSpec
-	extraConfig extraConfig
-}
-
-func init() {
-	cli.Register("vm.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.Int64Var(&cmd.MemoryMB, "m", 0, "Size in MB of memory")
-	f.Var(flags.NewInt32(&cmd.NumCPUs), "c", "Number of CPUs")
-	f.StringVar(&cmd.GuestId, "g", "", "Guest OS")
-	f.StringVar(&cmd.Name, "name", "", "Display name")
-	f.Var(&cmd.extraConfig, "e", "ExtraConfig. <key>=<value>")
-
-	f.Var(flags.NewOptionalBool(&cmd.NestedHVEnabled), "nested-hv-enabled", "Enable nested hardware-assisted virtualization")
-	cmd.Tools = &types.ToolsConfigInfo{}
-	f.Var(flags.NewOptionalBool(&cmd.Tools.SyncTimeWithHost), "sync-time-with-host", "Enable SyncTimeWithHost")
-}
-
-func (cmd *change) Description() string {
-	return `Change VM configuration.
-
-To add ExtraConfig variables that can read within the guest, use the 'guestinfo.' prefix.
-
-Examples:
-  govc vm.change -vm $vm -e smc.present=TRUE -e ich7m.present=TRUE
-  govc vm.change -vm $vm -e guestinfo.vmname $vm
-  # Read the variable set above inside the guest:
-  vmware-rpctool "info-get guestinfo.vmname"`
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	if len(cmd.extraConfig) > 0 {
-		cmd.VirtualMachineConfigSpec.ExtraConfig = cmd.extraConfig
-	}
-
-	task, err := vm.Reconfigure(ctx, cmd.VirtualMachineConfigSpec)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/clone.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/clone.go
deleted file mode 100644
index f096c63a6c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/clone.go
+++ /dev/null
@@ -1,440 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-	http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type clone struct {
-	*flags.ClientFlag
-	*flags.DatacenterFlag
-	*flags.DatastoreFlag
-	*flags.StoragePodFlag
-	*flags.ResourcePoolFlag
-	*flags.HostSystemFlag
-	*flags.NetworkFlag
-	*flags.FolderFlag
-	*flags.VirtualMachineFlag
-
-	name          string
-	memory        int
-	cpus          int
-	on            bool
-	force         bool
-	template      bool
-	customization string
-	waitForIP     bool
-	annotation    string
-	snapshot      string
-	link          bool
-
-	Client         *vim25.Client
-	Datacenter     *object.Datacenter
-	Datastore      *object.Datastore
-	StoragePod     *object.StoragePod
-	ResourcePool   *object.ResourcePool
-	HostSystem     *object.HostSystem
-	Folder         *object.Folder
-	VirtualMachine *object.VirtualMachine
-}
-
-func init() {
-	cli.Register("vm.clone", &clone{})
-}
-
-func (cmd *clone) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.StoragePodFlag, ctx = flags.NewStoragePodFlag(ctx)
-	cmd.StoragePodFlag.Register(ctx, f)
-
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
-	cmd.NetworkFlag.Register(ctx, f)
-
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.IntVar(&cmd.memory, "m", 0, "Size in MB of memory")
-	f.IntVar(&cmd.cpus, "c", 0, "Number of CPUs")
-	f.BoolVar(&cmd.on, "on", true, "Power on VM")
-	f.BoolVar(&cmd.force, "force", false, "Create VM if vmx already exists")
-	f.BoolVar(&cmd.template, "template", false, "Create a Template")
-	f.StringVar(&cmd.customization, "customization", "", "Customization Specification Name")
-	f.BoolVar(&cmd.waitForIP, "waitip", false, "Wait for VM to acquire IP address")
-	f.StringVar(&cmd.annotation, "annotation", "", "VM description")
-	f.StringVar(&cmd.snapshot, "snapshot", "", "Snapshot name to clone from")
-	f.BoolVar(&cmd.link, "link", false, "Creates a linked clone from snapshot or source VM")
-}
-
-func (cmd *clone) Usage() string {
-	return "NAME"
-}
-
-func (cmd *clone) Description() string {
-	return `Clone VM to NAME.
-
-Examples:
-  govc vm.clone -vm template-vm new-vm
-  govc vm.clone -vm template-vm -link new-vm
-  govc vm.clone -vm template-vm -snapshot s-name new-vm
-  govc vm.clone -vm template-vm -link -snapshot s-name new-vm
-  govc vm.clone -vm template-vm -snapshot $(govc snapshot.tree -vm template-vm -C) new-vm`
-}
-
-func (cmd *clone) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.StoragePodFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.NetworkFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *clone) Run(ctx context.Context, f *flag.FlagSet) error {
-	var err error
-
-	if len(f.Args()) != 1 {
-		return flag.ErrHelp
-	}
-
-	cmd.name = f.Arg(0)
-	if cmd.name == "" {
-		return flag.ErrHelp
-	}
-
-	cmd.Client, err = cmd.ClientFlag.Client()
-	if err != nil {
-		return err
-	}
-
-	cmd.Datacenter, err = cmd.DatacenterFlag.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	if cmd.StoragePodFlag.Isset() {
-		cmd.StoragePod, err = cmd.StoragePodFlag.StoragePod()
-		if err != nil {
-			return err
-		}
-	} else {
-		cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
-		if err != nil {
-			return err
-		}
-	}
-
-	cmd.HostSystem, err = cmd.HostSystemFlag.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if cmd.HostSystem != nil {
-		if cmd.ResourcePool, err = cmd.HostSystem.ResourcePool(ctx); err != nil {
-			return err
-		}
-	} else {
-		// -host is optional
-		if cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool(); err != nil {
-			return err
-		}
-	}
-
-	if cmd.Folder, err = cmd.FolderFlag.Folder(); err != nil {
-		return err
-	}
-
-	if cmd.VirtualMachine, err = cmd.VirtualMachineFlag.VirtualMachine(); err != nil {
-		return err
-	}
-
-	if cmd.VirtualMachine == nil {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.cloneVM(ctx)
-	if err != nil {
-		return err
-	}
-
-	if cmd.cpus > 0 || cmd.memory > 0 {
-		vmConfigSpec := types.VirtualMachineConfigSpec{}
-		if cmd.cpus > 0 {
-			vmConfigSpec.NumCPUs = int32(cmd.cpus)
-		}
-		if cmd.memory > 0 {
-			vmConfigSpec.MemoryMB = int64(cmd.memory)
-		}
-		vmConfigSpec.Annotation = cmd.annotation
-		task, err := vm.Reconfigure(ctx, vmConfigSpec)
-		if err != nil {
-			return err
-		}
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.on {
-		task, err := vm.PowerOn(ctx)
-		if err != nil {
-			return err
-		}
-
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
-			return err
-		}
-
-		if cmd.waitForIP {
-			_, err = vm.WaitForIP(ctx)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (cmd *clone) cloneVM(ctx context.Context) (*object.VirtualMachine, error) {
-	// search for the first network card of the source
-	devices, err := cmd.VirtualMachine.Device(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	var card *types.VirtualEthernetCard
-	for _, device := range devices {
-		if c, ok := device.(types.BaseVirtualEthernetCard); ok {
-			card = c.GetVirtualEthernetCard()
-			break
-		}
-	}
-
-	// prepare virtual device config spec for network card
-	configSpecs := []types.BaseVirtualDeviceConfigSpec{}
-
-	if card != nil {
-		// get the new backing information
-		dev, err := cmd.NetworkFlag.Device()
-		if err != nil {
-			return nil, err
-		}
-
-		// set backing info
-		card.Backing = dev.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard().Backing
-
-		configSpecs = append(configSpecs, &types.VirtualDeviceConfigSpec{
-			Operation: types.VirtualDeviceConfigSpecOperationEdit,
-			Device:    card,
-		})
-	}
-
-	folderref := cmd.Folder.Reference()
-	poolref := cmd.ResourcePool.Reference()
-
-	relocateSpec := types.VirtualMachineRelocateSpec{
-		DeviceChange: configSpecs,
-		Folder:       &folderref,
-		Pool:         &poolref,
-	}
-
-	if cmd.HostSystem != nil {
-		hostref := cmd.HostSystem.Reference()
-		relocateSpec.Host = &hostref
-	}
-
-	cloneSpec := &types.VirtualMachineCloneSpec{
-		PowerOn:  false,
-		Template: cmd.template,
-	}
-
-	if cmd.snapshot == "" {
-		if cmd.link {
-			relocateSpec.DiskMoveType = string(types.VirtualMachineRelocateDiskMoveOptionsMoveAllDiskBackingsAndAllowSharing)
-		}
-	} else {
-		if cmd.link {
-			relocateSpec.DiskMoveType = string(types.VirtualMachineRelocateDiskMoveOptionsCreateNewChildDiskBacking)
-		}
-
-		ref, ferr := cmd.VirtualMachine.FindSnapshot(ctx, cmd.snapshot)
-		if ferr != nil {
-			return nil, ferr
-		}
-
-		cloneSpec.Snapshot = ref
-	}
-
-	cloneSpec.Location = relocateSpec
-
-	// clone to storage pod
-	datastoreref := types.ManagedObjectReference{}
-	if cmd.StoragePod != nil && cmd.Datastore == nil {
-		storagePod := cmd.StoragePod.Reference()
-
-		// Build pod selection spec from config spec
-		podSelectionSpec := types.StorageDrsPodSelectionSpec{
-			StoragePod: &storagePod,
-		}
-
-		// Get the virtual machine reference
-		vmref := cmd.VirtualMachine.Reference()
-
-		// Build the placement spec
-		storagePlacementSpec := types.StoragePlacementSpec{
-			Folder:           &folderref,
-			Vm:               &vmref,
-			CloneName:        cmd.name,
-			CloneSpec:        cloneSpec,
-			PodSelectionSpec: podSelectionSpec,
-			Type:             string(types.StoragePlacementSpecPlacementTypeClone),
-		}
-
-		// Get the storage placement result
-		storageResourceManager := object.NewStorageResourceManager(cmd.Client)
-		result, err := storageResourceManager.RecommendDatastores(ctx, storagePlacementSpec)
-		if err != nil {
-			return nil, err
-		}
-
-		// Get the recommendations
-		recommendations := result.Recommendations
-		if len(recommendations) == 0 {
-			return nil, fmt.Errorf("no recommendations")
-		}
-
-		// Get the first recommendation
-		datastoreref = recommendations[0].Action[0].(*types.StoragePlacementAction).Destination
-	} else if cmd.StoragePod == nil && cmd.Datastore != nil {
-		datastoreref = cmd.Datastore.Reference()
-	} else {
-		return nil, fmt.Errorf("Please provide either a datastore or a storagepod")
-	}
-
-	// Set the destination datastore
-	cloneSpec.Location.Datastore = &datastoreref
-
-	// Check if vmx already exists
-	if !cmd.force {
-		vmxPath := fmt.Sprintf("%s/%s.vmx", cmd.name, cmd.name)
-
-		var mds mo.Datastore
-		err = property.DefaultCollector(cmd.Client).RetrieveOne(ctx, datastoreref, []string{"name"}, &mds)
-		if err != nil {
-			return nil, err
-		}
-
-		datastore := object.NewDatastore(cmd.Client, datastoreref)
-		datastore.InventoryPath = mds.Name
-
-		_, err := datastore.Stat(ctx, vmxPath)
-		if err == nil {
-			dsPath := cmd.Datastore.Path(vmxPath)
-			return nil, fmt.Errorf("File %s already exists", dsPath)
-		}
-	}
-
-	// check if customization specification requested
-	if len(cmd.customization) > 0 {
-		// get the customization spec manager
-		customizationSpecManager := object.NewCustomizationSpecManager(cmd.Client)
-		// check if customization specification exists
-		exists, err := customizationSpecManager.DoesCustomizationSpecExist(ctx, cmd.customization)
-		if err != nil {
-			return nil, err
-		}
-		if exists == false {
-			return nil, fmt.Errorf("Customization specification %s does not exists.", cmd.customization)
-		}
-		// get the customization specification
-		customSpecItem, err := customizationSpecManager.GetCustomizationSpec(ctx, cmd.customization)
-		if err != nil {
-			return nil, err
-		}
-		customSpec := customSpecItem.Spec
-		// set the customization
-		cloneSpec.Customization = &customSpec
-	}
-
-	task, err := cmd.VirtualMachine.Clone(ctx, cmd.Folder, cmd.name, *cloneSpec)
-	if err != nil {
-		return nil, err
-	}
-
-	logger := cmd.ProgressLogger(fmt.Sprintf("Cloning %s to %s...", cmd.VirtualMachine.InventoryPath, cmd.name))
-	defer logger.Wait()
-
-	info, err := task.WaitForResult(ctx, logger)
-	if err != nil {
-		return nil, err
-	}
-
-	return object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference)), nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/console.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/console.go
deleted file mode 100644
index 431fd80bd6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/console.go
+++ /dev/null
@@ -1,170 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/session"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type console struct {
-	*flags.VirtualMachineFlag
-
-	h5      bool
-	capture string
-}
-
-func init() {
-	cli.Register("vm.console", &console{})
-}
-
-func (cmd *console) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.h5, "h5", false, "Generate HTML5 UI console link")
-	f.StringVar(&cmd.capture, "capture", "", "Capture console screen shot to file")
-}
-
-func (cmd *console) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *console) Usage() string {
-	return "VM"
-}
-
-func (cmd *console) Description() string {
-	return `Generate console URL or screen capture for VM.
-
-One of VMRC, VMware Player, VMware Fusion or VMware Workstation must be installed to
-open VMRC console URLs.
-
-Examples:
-  govc vm.console my-vm
-  govc vm.console -capture screen.png my-vm  # screen capture
-  govc vm.console -capture - my-vm | display # screen capture to stdout
-  open $(govc vm.console my-vm)              # MacOSX VMRC
-  open $(govc vm.console -h5 my-vm)          # MacOSX H5
-  xdg-open $(govc vm.console my-vm)          # Linux VMRC
-  xdg-open $(govc vm.console -h5 my-vm)      # Linux H5`
-}
-
-func (cmd *console) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	if len(vms) != 1 {
-		return flag.ErrHelp
-	}
-
-	vm := vms[0]
-
-	state, err := vm.PowerState(ctx)
-	if err != nil {
-		return err
-	}
-
-	if state != types.VirtualMachinePowerStatePoweredOn {
-		return fmt.Errorf("vm is not powered on (%s)", state)
-	}
-
-	c := vm.Client()
-
-	u := c.URL()
-
-	if cmd.capture != "" {
-		u.Path = "/screen"
-		query := url.Values{"id": []string{vm.Reference().Value}}
-		u.RawQuery = query.Encode()
-
-		param := soap.DefaultDownload
-
-		if cmd.capture == "-" {
-			w, _, derr := c.Download(u, &param)
-			if derr != nil {
-				return derr
-			}
-
-			_, err = io.Copy(os.Stdout, w)
-			if err != nil {
-				return err
-			}
-
-			return w.Close()
-		}
-
-		return c.DownloadFile(cmd.capture, u, &param)
-	}
-
-	m := session.NewManager(c)
-	ticket, err := m.AcquireCloneTicket(ctx)
-	if err != nil {
-		return err
-	}
-
-	var link string
-
-	if cmd.h5 {
-		m := object.NewOptionManager(c, *c.ServiceContent.Setting)
-
-		opt, err := m.Query(ctx, "VirtualCenter.FQDN")
-		if err != nil {
-			return err
-		}
-
-		fqdn := opt[0].GetOptionValue().Value.(string)
-
-		var info object.HostCertificateInfo
-		_ = info.FromURL(u, nil)
-
-		u.Path = "/ui/webconsole.html"
-
-		u.RawQuery = url.Values{
-			"vmId":          []string{vm.Reference().Value},
-			"vmName":        []string{vm.Name()},
-			"serverGuid":    []string{c.ServiceContent.About.InstanceUuid},
-			"host":          []string{fqdn},
-			"sessionTicket": []string{ticket},
-			"thumbprint":    []string{info.ThumbprintSHA1},
-		}.Encode()
-
-		link = u.String()
-	} else {
-		link = fmt.Sprintf("vmrc://clone:%s@%s/?moid=%s", ticket, u.Hostname(), vm.Reference().Value)
-	}
-
-	fmt.Fprintln(os.Stdout, link)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/create.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/create.go
deleted file mode 100644
index 03889555cd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/create.go
+++ /dev/null
@@ -1,507 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.ClientFlag
-	*flags.DatacenterFlag
-	*flags.DatastoreFlag
-	*flags.StoragePodFlag
-	*flags.ResourcePoolFlag
-	*flags.HostSystemFlag
-	*flags.NetworkFlag
-	*flags.FolderFlag
-
-	name       string
-	memory     int
-	cpus       int
-	guestID    string
-	link       bool
-	on         bool
-	force      bool
-	controller string
-	annotation string
-
-	iso              string
-	isoDatastoreFlag *flags.DatastoreFlag
-	isoDatastore     *object.Datastore
-
-	disk              string
-	diskDatastoreFlag *flags.DatastoreFlag
-	diskDatastore     *object.Datastore
-
-	// Only set if the disk argument is a byte size, which means the disk
-	// doesn't exist yet and should be created
-	diskByteSize int64
-
-	Client       *vim25.Client
-	Datacenter   *object.Datacenter
-	Datastore    *object.Datastore
-	StoragePod   *object.StoragePod
-	ResourcePool *object.ResourcePool
-	HostSystem   *object.HostSystem
-	Folder       *object.Folder
-}
-
-func init() {
-	cli.Register("vm.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.DatacenterFlag, ctx = flags.NewDatacenterFlag(ctx)
-	cmd.DatacenterFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.StoragePodFlag, ctx = flags.NewStoragePodFlag(ctx)
-	cmd.StoragePodFlag.Register(ctx, f)
-
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
-	cmd.NetworkFlag.Register(ctx, f)
-
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	f.IntVar(&cmd.memory, "m", 1024, "Size in MB of memory")
-	f.IntVar(&cmd.cpus, "c", 1, "Number of CPUs")
-	f.StringVar(&cmd.guestID, "g", "otherGuest", "Guest OS")
-	f.BoolVar(&cmd.link, "link", true, "Link specified disk")
-	f.BoolVar(&cmd.on, "on", true, "Power on VM. Default is true if -disk argument is given.")
-	f.BoolVar(&cmd.force, "force", false, "Create VM if vmx already exists")
-	f.StringVar(&cmd.controller, "disk.controller", "scsi", "Disk controller type")
-	f.StringVar(&cmd.annotation, "annotation", "", "VM description")
-
-	f.StringVar(&cmd.iso, "iso", "", "ISO path")
-	cmd.isoDatastoreFlag, ctx = flags.NewCustomDatastoreFlag(ctx)
-	f.StringVar(&cmd.isoDatastoreFlag.Name, "iso-datastore", "", "Datastore for ISO file")
-
-	f.StringVar(&cmd.disk, "disk", "", "Disk path (to use existing) OR size (to create new, e.g. 20GB)")
-	cmd.diskDatastoreFlag, _ = flags.NewCustomDatastoreFlag(ctx)
-	f.StringVar(&cmd.diskDatastoreFlag.Name, "disk-datastore", "", "Datastore for disk file")
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatacenterFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.StoragePodFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.NetworkFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	// Default iso/disk datastores to the VM's datastore
-	if cmd.isoDatastoreFlag.Name == "" {
-		cmd.isoDatastoreFlag = cmd.DatastoreFlag
-	}
-	if cmd.diskDatastoreFlag.Name == "" {
-		cmd.diskDatastoreFlag = cmd.DatastoreFlag
-	}
-
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	var err error
-
-	if len(f.Args()) != 1 {
-		return flag.ErrHelp
-	}
-
-	cmd.name = f.Arg(0)
-	if cmd.name == "" {
-		return flag.ErrHelp
-	}
-
-	cmd.Client, err = cmd.ClientFlag.Client()
-	if err != nil {
-		return err
-	}
-
-	cmd.Datacenter, err = cmd.DatacenterFlag.Datacenter()
-	if err != nil {
-		return err
-	}
-
-	if cmd.StoragePodFlag.Isset() {
-		cmd.StoragePod, err = cmd.StoragePodFlag.StoragePod()
-		if err != nil {
-			return err
-		}
-	} else {
-		cmd.Datastore, err = cmd.DatastoreFlag.Datastore()
-		if err != nil {
-			return err
-		}
-	}
-
-	cmd.HostSystem, err = cmd.HostSystemFlag.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if cmd.HostSystem != nil {
-		if cmd.ResourcePool, err = cmd.HostSystem.ResourcePool(ctx); err != nil {
-			return err
-		}
-	} else {
-		// -host is optional
-		if cmd.ResourcePool, err = cmd.ResourcePoolFlag.ResourcePool(); err != nil {
-			return err
-		}
-	}
-
-	if cmd.Folder, err = cmd.FolderFlag.Folder(); err != nil {
-		return err
-	}
-
-	// Verify ISO exists
-	if cmd.iso != "" {
-		_, err = cmd.isoDatastoreFlag.Stat(ctx, cmd.iso)
-		if err != nil {
-			return err
-		}
-
-		cmd.isoDatastore, err = cmd.isoDatastoreFlag.Datastore()
-		if err != nil {
-			return err
-		}
-	}
-
-	// Verify disk exists
-	if cmd.disk != "" {
-		var b units.ByteSize
-
-		// If disk can be parsed as byte units, don't stat
-		err = b.Set(cmd.disk)
-		if err == nil {
-			cmd.diskByteSize = int64(b)
-		} else {
-			_, err = cmd.diskDatastoreFlag.Stat(ctx, cmd.disk)
-			if err != nil {
-				return err
-			}
-
-			cmd.diskDatastore, err = cmd.diskDatastoreFlag.Datastore()
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	task, err := cmd.createVM(ctx)
-	if err != nil {
-		return err
-	}
-
-	info, err := task.WaitForResult(ctx, nil)
-	if err != nil {
-		return err
-	}
-
-	vm := object.NewVirtualMachine(cmd.Client, info.Result.(types.ManagedObjectReference))
-
-	if cmd.on {
-		task, err := vm.PowerOn(ctx)
-		if err != nil {
-			return err
-		}
-
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (cmd *create) createVM(ctx context.Context) (*object.Task, error) {
-	var devices object.VirtualDeviceList
-	var err error
-
-	spec := &types.VirtualMachineConfigSpec{
-		Name:       cmd.name,
-		GuestId:    cmd.guestID,
-		NumCPUs:    int32(cmd.cpus),
-		MemoryMB:   int64(cmd.memory),
-		Annotation: cmd.annotation,
-	}
-
-	devices, err = cmd.addStorage(nil)
-	if err != nil {
-		return nil, err
-	}
-
-	devices, err = cmd.addNetwork(devices)
-	if err != nil {
-		return nil, err
-	}
-
-	deviceChange, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-	if err != nil {
-		return nil, err
-	}
-
-	spec.DeviceChange = deviceChange
-
-	var datastore *object.Datastore
-
-	// If storage pod is specified, collect placement recommendations
-	if cmd.StoragePod != nil {
-		datastore, err = cmd.recommendDatastore(ctx, spec)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		datastore = cmd.Datastore
-	}
-
-	if !cmd.force {
-		vmxPath := fmt.Sprintf("%s/%s.vmx", cmd.name, cmd.name)
-
-		_, err := datastore.Stat(ctx, vmxPath)
-		if err == nil {
-			dsPath := cmd.Datastore.Path(vmxPath)
-			return nil, fmt.Errorf("File %s already exists", dsPath)
-		}
-	}
-
-	folder := cmd.Folder
-
-	spec.Files = &types.VirtualMachineFileInfo{
-		VmPathName: fmt.Sprintf("[%s]", datastore.Name()),
-	}
-
-	return folder.CreateVM(ctx, *spec, cmd.ResourcePool, cmd.HostSystem)
-}
-
-func (cmd *create) addStorage(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
-	if cmd.controller != "ide" {
-		if cmd.controller == "nvme" {
-			nvme, err := devices.CreateNVMEController()
-			if err != nil {
-				return nil, err
-			}
-
-			devices = append(devices, nvme)
-			cmd.controller = devices.Name(nvme)
-		} else {
-			scsi, err := devices.CreateSCSIController(cmd.controller)
-			if err != nil {
-				return nil, err
-			}
-
-			devices = append(devices, scsi)
-			cmd.controller = devices.Name(scsi)
-		}
-	}
-
-	// If controller is specified to be IDE or if an ISO is specified, add IDE controller.
-	if cmd.controller == "ide" || cmd.iso != "" {
-		ide, err := devices.CreateIDEController()
-		if err != nil {
-			return nil, err
-		}
-
-		devices = append(devices, ide)
-	}
-
-	if cmd.diskByteSize != 0 {
-		controller, err := devices.FindDiskController(cmd.controller)
-		if err != nil {
-			return nil, err
-		}
-
-		disk := &types.VirtualDisk{
-			VirtualDevice: types.VirtualDevice{
-				Key: devices.NewKey(),
-				Backing: &types.VirtualDiskFlatVer2BackingInfo{
-					DiskMode:        string(types.VirtualDiskModePersistent),
-					ThinProvisioned: types.NewBool(true),
-				},
-			},
-			CapacityInKB: cmd.diskByteSize / 1024,
-		}
-
-		devices.AssignController(disk, controller)
-		devices = append(devices, disk)
-	} else if cmd.disk != "" {
-		controller, err := devices.FindDiskController(cmd.controller)
-		if err != nil {
-			return nil, err
-		}
-
-		ds := cmd.diskDatastore.Reference()
-		path := cmd.diskDatastore.Path(cmd.disk)
-		disk := devices.CreateDisk(controller, ds, path)
-
-		if cmd.link {
-			disk = devices.ChildDisk(disk)
-		}
-
-		devices = append(devices, disk)
-	}
-
-	if cmd.iso != "" {
-		ide, err := devices.FindIDEController("")
-		if err != nil {
-			return nil, err
-		}
-
-		cdrom, err := devices.CreateCdrom(ide)
-		if err != nil {
-			return nil, err
-		}
-
-		cdrom = devices.InsertIso(cdrom, cmd.isoDatastore.Path(cmd.iso))
-		devices = append(devices, cdrom)
-	}
-
-	return devices, nil
-}
-
-func (cmd *create) addNetwork(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
-	netdev, err := cmd.NetworkFlag.Device()
-	if err != nil {
-		return nil, err
-	}
-
-	devices = append(devices, netdev)
-	return devices, nil
-}
-
-func (cmd *create) recommendDatastore(ctx context.Context, spec *types.VirtualMachineConfigSpec) (*object.Datastore, error) {
-	sp := cmd.StoragePod.Reference()
-
-	// Build pod selection spec from config spec
-	podSelectionSpec := types.StorageDrsPodSelectionSpec{
-		StoragePod: &sp,
-	}
-
-	// Keep list of disks that need to be placed
-	var disks []*types.VirtualDisk
-
-	// Collect disks eligible for placement
-	for _, deviceConfigSpec := range spec.DeviceChange {
-		s := deviceConfigSpec.GetVirtualDeviceConfigSpec()
-		if s.Operation != types.VirtualDeviceConfigSpecOperationAdd {
-			continue
-		}
-
-		if s.FileOperation != types.VirtualDeviceConfigSpecFileOperationCreate {
-			continue
-		}
-
-		d, ok := s.Device.(*types.VirtualDisk)
-		if !ok {
-			continue
-		}
-
-		podConfigForPlacement := types.VmPodConfigForPlacement{
-			StoragePod: sp,
-			Disk: []types.PodDiskLocator{
-				{
-					DiskId:          d.Key,
-					DiskBackingInfo: d.Backing,
-				},
-			},
-		}
-
-		podSelectionSpec.InitialVmConfig = append(podSelectionSpec.InitialVmConfig, podConfigForPlacement)
-		disks = append(disks, d)
-	}
-
-	sps := types.StoragePlacementSpec{
-		Type:             string(types.StoragePlacementSpecPlacementTypeCreate),
-		ResourcePool:     types.NewReference(cmd.ResourcePool.Reference()),
-		PodSelectionSpec: podSelectionSpec,
-		ConfigSpec:       spec,
-	}
-
-	srm := object.NewStorageResourceManager(cmd.Client)
-	result, err := srm.RecommendDatastores(ctx, sps)
-	if err != nil {
-		return nil, err
-	}
-
-	// Use result to pin disks to recommended datastores
-	recs := result.Recommendations
-	if len(recs) == 0 {
-		return nil, fmt.Errorf("no recommendations")
-	}
-
-	ds := recs[0].Action[0].(*types.StoragePlacementAction).Destination
-
-	var mds mo.Datastore
-	err = property.DefaultCollector(cmd.Client).RetrieveOne(ctx, ds, []string{"name"}, &mds)
-	if err != nil {
-		return nil, err
-	}
-
-	datastore := object.NewDatastore(cmd.Client, ds)
-	datastore.InventoryPath = mds.Name
-
-	// Apply recommendation to eligible disks
-	for _, disk := range disks {
-		backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-		backing.Datastore = &ds
-	}
-
-	return datastore, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/destroy.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/destroy.go
deleted file mode 100644
index 4dc6b04979..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/destroy.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type destroy struct {
-	*flags.ClientFlag
-	*flags.SearchFlag
-}
-
-func init() {
-	cli.Register("vm.destroy", &destroy{})
-}
-
-func (cmd *destroy) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-}
-
-func (cmd *destroy) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *destroy) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		task, err := vm.PowerOff(ctx)
-		if err != nil {
-			return err
-		}
-
-		// Ignore error since the VM may already been in powered off state.
-		// vm.Destroy will fail if the VM is still powered on.
-		_ = task.Wait(ctx)
-
-		task, err = vm.Destroy(ctx)
-		if err != nil {
-			return err
-		}
-
-		err = task.Wait(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
deleted file mode 100644
index 883ba60061..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/attach.go
+++ /dev/null
@@ -1,110 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package disk
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type attach struct {
-	*flags.DatastoreFlag
-	*flags.VirtualMachineFlag
-
-	persist    bool
-	link       bool
-	disk       string
-	controller string
-}
-
-func init() {
-	cli.Register("vm.disk.attach", &attach{})
-}
-
-func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.persist, "persist", true, "Persist attached disk")
-	f.BoolVar(&cmd.link, "link", true, "Link specified disk")
-	f.StringVar(&cmd.controller, "controller", "", "Disk controller")
-	f.StringVar(&cmd.disk, "disk", "", "Disk path name")
-}
-
-func (cmd *attach) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	controller, err := devices.FindDiskController(cmd.controller)
-	if err != nil {
-		return err
-	}
-
-	disk := devices.CreateDisk(controller, ds.Reference(), ds.Path(cmd.disk))
-	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-
-	if cmd.link {
-		if cmd.persist {
-			backing.DiskMode = string(types.VirtualDiskModeIndependent_persistent)
-		} else {
-			backing.DiskMode = string(types.VirtualDiskModeIndependent_nonpersistent)
-		}
-
-		disk = devices.ChildDisk(disk)
-		return vm.AddDevice(ctx, disk)
-	}
-
-	if cmd.persist {
-		backing.DiskMode = string(types.VirtualDiskModePersistent)
-	} else {
-		backing.DiskMode = string(types.VirtualDiskModeNonpersistent)
-	}
-
-	return vm.AddDevice(ctx, disk)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
deleted file mode 100644
index 2157f0aa53..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/change.go
+++ /dev/null
@@ -1,174 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package disk
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.VirtualMachineFlag
-
-	name     string
-	key      int
-	label    string
-	filePath string
-
-	bytes units.ByteSize
-	mode  string
-}
-
-func init() {
-	cli.Register("vm.disk.change", &change{})
-}
-
-func (cmd *change) Description() string {
-	return `Change some properties of a VM's DISK
-
-In particular, you can change the DISK mode, and the size (as long as it is bigger)
-
-Examples:
-  govc vm.disk.change -vm VM -disk.key 2001 -size 10G
-  govc vm.disk.change -vm VM -disk.label "BDD disk" -size 10G
-  govc vm.disk.change -vm VM -disk.name "hard-1000-0" -size 12G
-  govc vm.disk.change -vm VM -disk.filePath "[DS] VM/VM-1.vmdk" -mode nonpersistent`
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-	err := (&cmd.bytes).Set("0G")
-	if err != nil {
-		panic(err)
-	}
-	f.Var(&cmd.bytes, "size", "New disk size")
-	f.StringVar(&cmd.name, "disk.name", "", "Disk name")
-	f.StringVar(&cmd.label, "disk.label", "", "Disk label")
-	f.StringVar(&cmd.filePath, "disk.filePath", "", "Disk file name")
-	f.IntVar(&cmd.key, "disk.key", 0, "Disk unique key")
-	f.StringVar(&cmd.mode, "mode", "", fmt.Sprintf("Disk mode (%s)", strings.Join(vdmTypes, "|")))
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) FindDisk(ctx context.Context, list object.VirtualDeviceList) (*types.VirtualDisk, error) {
-	var disks []*types.VirtualDisk
-	for _, device := range list {
-		switch md := device.(type) {
-		case *types.VirtualDisk:
-			if cmd.CheckDiskProperties(ctx, list.Name(device), md) {
-				disks = append(disks, md)
-			}
-		default:
-			continue
-		}
-	}
-
-	switch len(disks) {
-	case 0:
-		return nil, errors.New("No disk found using the given values")
-	case 1:
-		return disks[0], nil
-	}
-	return nil, errors.New("The given disk values match multiple disks")
-}
-
-func (cmd *change) CheckDiskProperties(ctx context.Context, name string, disk *types.VirtualDisk) bool {
-	switch {
-	case cmd.key != 0 && disk.Key != int32(cmd.key):
-		fallthrough
-	case cmd.name != "" && name != cmd.name:
-		fallthrough
-	case cmd.label != "" && disk.DeviceInfo.GetDescription().Label != cmd.label:
-		return false
-	case cmd.filePath != "":
-		if b, ok := disk.Backing.(types.BaseVirtualDeviceFileBackingInfo); ok {
-			if b.GetVirtualDeviceFileBackingInfo().FileName != cmd.filePath {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	editdisk, err := cmd.FindDisk(ctx, devices)
-	if err != nil {
-		return err
-	}
-
-	if int64(cmd.bytes) != 0 {
-		editdisk.CapacityInKB = int64(cmd.bytes) / 1024
-	}
-
-	backing := editdisk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-
-	if len(cmd.mode) != 0 {
-		backing.DiskMode = cmd.mode
-	}
-
-	spec := types.VirtualMachineConfigSpec{}
-
-	config := &types.VirtualDeviceConfigSpec{
-		Device:    editdisk,
-		Operation: types.VirtualDeviceConfigSpecOperationEdit,
-	}
-
-	config.FileOperation = ""
-
-	spec.DeviceChange = append(spec.DeviceChange, config)
-
-	task, err := vm.Reconfigure(ctx, spec)
-	if err != nil {
-		return err
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		return fmt.Errorf("Error resizing main disk\nLogged Item:  %s", err)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
deleted file mode 100644
index 4c0aac4eb2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/disk/create.go
+++ /dev/null
@@ -1,159 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package disk
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type create struct {
-	*flags.DatastoreFlag
-	*flags.OutputFlag
-	*flags.VirtualMachineFlag
-
-	controller string
-	Name       string
-	Bytes      units.ByteSize
-	Thick      bool
-	Eager      bool
-	DiskMode   string
-}
-
-var vdmTypes = []string{
-	string(types.VirtualDiskModePersistent),
-	string(types.VirtualDiskModeNonpersistent),
-	string(types.VirtualDiskModeUndoable),
-	string(types.VirtualDiskModeIndependent_persistent),
-	string(types.VirtualDiskModeIndependent_nonpersistent),
-	string(types.VirtualDiskModeAppend),
-}
-
-func init() {
-	cli.Register("vm.disk.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	err := (&cmd.Bytes).Set("10G")
-	if err != nil {
-		panic(err)
-	}
-
-	f.StringVar(&cmd.controller, "controller", "", "Disk controller")
-	f.StringVar(&cmd.Name, "name", "", "Name for new disk")
-	f.Var(&cmd.Bytes, "size", "Size of new disk")
-	f.BoolVar(&cmd.Thick, "thick", false, "Thick provision new disk")
-	f.BoolVar(&cmd.Eager, "eager", false, "Eagerly scrub new disk")
-	f.StringVar(&cmd.DiskMode, "mode", "persistent", fmt.Sprintf("Disk mode (%s)", strings.Join(vdmTypes, "|")))
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Description() string {
-	return `Create disk and attach to VM.
-
-Examples:
-  govc vm.disk.create -vm $name -name $name/disk1 -size 10G`
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if len(cmd.Name) == 0 {
-		return errors.New("please specify a disk name")
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-	if vm == nil {
-		return errors.New("please specify a vm")
-	}
-
-	ds, err := cmd.Datastore()
-	if err != nil {
-		return err
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	controller, err := devices.FindDiskController(cmd.controller)
-	if err != nil {
-		return err
-	}
-
-	vdmMatch := false
-	for _, vdm := range vdmTypes {
-		if cmd.DiskMode == vdm {
-			vdmMatch = true
-		}
-	}
-
-	if vdmMatch == false {
-		return errors.New("please specify a valid disk mode")
-	}
-
-	disk := devices.CreateDisk(controller, ds.Reference(), ds.Path(cmd.Name))
-
-	existing := devices.SelectByBackingInfo(disk.Backing)
-
-	if len(existing) > 0 {
-		cmd.Log("Disk already present\n")
-		return nil
-	}
-
-	backing := disk.Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-
-	if cmd.Thick {
-		backing.ThinProvisioned = types.NewBool(false)
-		backing.EagerlyScrub = types.NewBool(cmd.Eager)
-	}
-
-	backing.DiskMode = cmd.DiskMode
-
-	cmd.Log("Creating disk\n")
-	disk.CapacityInKB = int64(cmd.Bytes) / 1024
-	return vm.AddDevice(ctx, disk)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go
deleted file mode 100644
index c392eab14b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/auth.go
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type AuthFlag struct {
-	auth types.NamePasswordAuthentication
-}
-
-func newAuthFlag(ctx context.Context) (*AuthFlag, context.Context) {
-	return &AuthFlag{}, ctx
-}
-
-func (flag *AuthFlag) String() string {
-	return fmt.Sprintf("%s:%s", flag.auth.Username, strings.Repeat("x", len(flag.auth.Password)))
-}
-
-func (flag *AuthFlag) Set(s string) error {
-	c := strings.Split(s, ":")
-	if len(c) > 0 {
-		flag.auth.Username = c[0]
-		if len(c) > 1 {
-			flag.auth.Password = c[1]
-		}
-	}
-
-	return nil
-}
-
-func (flag *AuthFlag) Register(ctx context.Context, f *flag.FlagSet) {
-	env := "GOVC_GUEST_LOGIN"
-	value := os.Getenv(env)
-	flag.Set(value)
-	usage := fmt.Sprintf("Guest VM credentials [%s]", env)
-	f.Var(flag, "l", usage)
-}
-
-func (flag *AuthFlag) Process(ctx context.Context) error {
-	return nil
-}
-
-func (flag *AuthFlag) Auth() types.BaseGuestAuthentication {
-	return &flag.auth
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go
deleted file mode 100644
index 29f0745b79..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chmod.go
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"strconv"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type chmod struct {
-	*GuestFlag
-}
-
-func init() {
-	cli.Register("guest.chmod", &chmod{})
-}
-
-func (cmd *chmod) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-}
-
-func (cmd *chmod) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *chmod) Usage() string {
-	return "MODE FILE"
-}
-
-func (cmd *chmod) Description() string {
-	return `Change FILE MODE on VM.
-
-Examples:
-  govc guest.chmod -vm $name 0644 /var/log/foo.log`
-}
-
-func (cmd *chmod) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	var attr types.GuestPosixFileAttributes
-
-	attr.Permissions, err = strconv.ParseInt(f.Arg(0), 0, 64)
-	if err != nil {
-		return err
-	}
-
-	return m.ChangeFileAttributes(ctx, cmd.Auth(), f.Arg(1), &attr)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chown.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chown.go
deleted file mode 100644
index 0b6a455afb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/chown.go
+++ /dev/null
@@ -1,96 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type chown struct {
-	*GuestFlag
-}
-
-func init() {
-	cli.Register("guest.chown", &chown{})
-}
-
-func (cmd *chown) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-}
-
-func (cmd *chown) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *chown) Usage() string {
-	return "UID[:GID] FILE"
-}
-
-func (cmd *chown) Description() string {
-	return `Change FILE UID and GID on VM.
-
-Examples:
-  govc guest.chown -vm $name UID[:GID] /var/log/foo.log`
-}
-
-func (cmd *chown) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	var attr types.GuestPosixFileAttributes
-
-	ids := strings.SplitN(f.Arg(0), ":", 2)
-	if len(ids) == 0 {
-		return flag.ErrHelp
-	}
-
-	id, err := strconv.Atoi(ids[0])
-	if err != nil {
-		return err
-	}
-
-	attr.OwnerId = new(int32)
-	*attr.OwnerId = int32(id)
-
-	if len(ids) == 2 {
-		id, err = strconv.Atoi(ids[1])
-		if err != nil {
-			return err
-		}
-
-		attr.GroupId = new(int32)
-		*attr.GroupId = int32(id)
-	}
-
-	return m.ChangeFileAttributes(ctx, cmd.Auth(), f.Arg(1), &attr)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go
deleted file mode 100644
index fa8043788e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/download.go
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"flag"
-	"io"
-
-	"context"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/progress"
-)
-
-type download struct {
-	*GuestFlag
-
-	overwrite bool
-}
-
-func init() {
-	cli.Register("guest.download", &download{})
-}
-
-func (cmd *download) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.overwrite, "f", false, "If set, the local destination file is clobbered")
-}
-
-func (cmd *download) Usage() string {
-	return "SOURCE DEST"
-}
-
-func (cmd *download) Description() string {
-	return `Copy SOURCE from the guest VM to DEST on the local system.
-
-If DEST name is "-", source is written to stdout.
-
-Examples:
-  govc guest.download -l user:pass -vm=my-vm /var/log/my.log ./local.log
-  govc guest.download -l user:pass -vm=my-vm /etc/motd -`
-}
-
-func (cmd *download) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *download) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	src := f.Arg(0)
-	dst := f.Arg(1)
-
-	_, err := os.Stat(dst)
-	if err == nil && !cmd.overwrite {
-		return os.ErrExist
-	}
-
-	c, err := cmd.Toolbox()
-	if err != nil {
-		return err
-	}
-
-	s, n, err := c.Download(ctx, src)
-	if err != nil {
-		return err
-	}
-
-	if dst == "-" {
-		_, err = io.Copy(os.Stdout, s)
-		return err
-	}
-
-	var p progress.Sinker
-
-	if cmd.OutputFlag.TTY {
-		logger := cmd.ProgressLogger("Downloading... ")
-		p = logger
-		defer logger.Wait()
-	}
-
-	return c.ProcessManager.Client().WriteFile(dst, s, n, p, nil)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go
deleted file mode 100644
index 3e18602f15..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/file_attr.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type FileAttrFlag struct {
-	types.GuestPosixFileAttributes
-}
-
-func newFileAttrFlag(ctx context.Context) (*FileAttrFlag, context.Context) {
-	return &FileAttrFlag{}, ctx
-}
-
-func (flag *FileAttrFlag) Register(ctx context.Context, f *flag.FlagSet) {
-	f.Var(flags.NewOptionalInt32(&flag.OwnerId), "uid", "User ID")
-	f.Var(flags.NewOptionalInt32(&flag.GroupId), "gid", "Group ID")
-	f.Int64Var(&flag.Permissions, "perm", 0, "File permissions")
-}
-
-func (flag *FileAttrFlag) Process(ctx context.Context) error {
-	return nil
-}
-
-func (flag *FileAttrFlag) Attr() types.BaseGuestFileAttributes {
-	return &flag.GuestPosixFileAttributes
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go
deleted file mode 100644
index dc0c2b429c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/getenv.go
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type getenv struct {
-	*GuestFlag
-}
-
-func init() {
-	cli.Register("guest.getenv", &getenv{})
-}
-
-func (cmd *getenv) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-}
-
-func (cmd *getenv) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *getenv) Usage() string {
-	return "[NAME]..."
-}
-
-func (cmd *getenv) Description() string {
-	return `Read NAME environment variables from VM.
-
-Examples:
-  govc guest.getenv -vm $name
-  govc guest.getenv -vm $name HOME`
-}
-
-func (cmd *getenv) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.ProcessManager()
-	if err != nil {
-		return err
-	}
-
-	vars, err := m.ReadEnvironmentVariable(ctx, cmd.Auth(), f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, v := range vars {
-		fmt.Printf("%s\n", v)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go
deleted file mode 100644
index b71dfdda11..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/guest.go
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"errors"
-	"flag"
-
-	"context"
-	"net/url"
-
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/guest"
-	"github.com/vmware/govmomi/guest/toolbox"
-	"github.com/vmware/govmomi/object"
-)
-
-type GuestFlag struct {
-	*flags.ClientFlag
-	*flags.VirtualMachineFlag
-
-	*AuthFlag
-}
-
-func newGuestFlag(ctx context.Context) (*GuestFlag, context.Context) {
-	f := &GuestFlag{}
-	f.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	f.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	f.AuthFlag, ctx = newAuthFlag(ctx)
-	return f, ctx
-}
-
-func (flag *GuestFlag) Register(ctx context.Context, f *flag.FlagSet) {
-	flag.ClientFlag.Register(ctx, f)
-	flag.VirtualMachineFlag.Register(ctx, f)
-	flag.AuthFlag.Register(ctx, f)
-}
-
-func (flag *GuestFlag) Process(ctx context.Context) error {
-	if err := flag.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := flag.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := flag.AuthFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (flag *GuestFlag) Toolbox() (*toolbox.Client, error) {
-	pm, err := flag.ProcessManager()
-	if err != nil {
-		return nil, err
-	}
-
-	fm, err := flag.FileManager()
-	if err != nil {
-		return nil, err
-	}
-
-	return &toolbox.Client{
-		ProcessManager: pm,
-		FileManager:    fm,
-		Authentication: flag.Auth(),
-	}, nil
-}
-
-func (flag *GuestFlag) FileManager() (*guest.FileManager, error) {
-	ctx := context.TODO()
-	c, err := flag.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	vm, err := flag.VirtualMachine()
-	if err != nil {
-		return nil, err
-	}
-
-	o := guest.NewOperationsManager(c, vm.Reference())
-	return o.FileManager(ctx)
-}
-
-func (flag *GuestFlag) ProcessManager() (*guest.ProcessManager, error) {
-	ctx := context.TODO()
-	c, err := flag.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	vm, err := flag.VirtualMachine()
-	if err != nil {
-		return nil, err
-	}
-
-	o := guest.NewOperationsManager(c, vm.Reference())
-	return o.ProcessManager(ctx)
-}
-
-func (flag *GuestFlag) ParseURL(urlStr string) (*url.URL, error) {
-	c, err := flag.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	return c.Client.ParseURL(urlStr)
-}
-
-func (flag *GuestFlag) VirtualMachine() (*object.VirtualMachine, error) {
-	vm, err := flag.VirtualMachineFlag.VirtualMachine()
-	if err != nil {
-		return nil, err
-	}
-	if vm == nil {
-		return nil, errors.New("no vm specified")
-	}
-	return vm, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go
deleted file mode 100644
index ef1273d88f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/kill.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type kill struct {
-	*GuestFlag
-
-	pids pidSelector
-}
-
-func init() {
-	cli.Register("guest.kill", &kill{})
-}
-
-func (cmd *kill) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.Var(&cmd.pids, "p", "Process ID")
-}
-
-func (cmd *kill) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *kill) Description() string {
-	return `Kill process ID on VM.
-
-Examples:
-  govc guest.kill -vm $name -p 12345`
-}
-
-func (cmd *kill) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.ProcessManager()
-	if err != nil {
-		return err
-	}
-
-	for _, pid := range cmd.pids {
-		if err := m.TerminateProcess(ctx, cmd.Auth(), pid); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go
deleted file mode 100644
index 2d236ae0a0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ls.go
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"os"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*GuestFlag
-
-	simple bool
-}
-
-func init() {
-	cli.Register("guest.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.simple, "s", false, "Simple path only listing") // sadly we used '-l' for guest login
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Usage() string {
-	return "PATH"
-}
-
-func (cmd *ls) Description() string {
-	return `List PATH files in VM.
-
-Examples:
-  govc guest.ls -vm $name /tmp`
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	var offset int32
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for {
-		info, err := m.ListFiles(ctx, cmd.Auth(), f.Arg(0), offset, 0, f.Arg(1))
-		if err != nil {
-			return err
-		}
-
-		for _, f := range info.Files {
-			if cmd.simple {
-				fmt.Fprintln(tw, f.Path)
-				continue
-			}
-
-			var kind byte
-
-			switch types.GuestFileType(f.Type) {
-			case types.GuestFileTypeDirectory:
-				kind = 'd'
-				if f.Size == 0 {
-					f.Size = 4092
-				}
-			case types.GuestFileTypeSymlink:
-				kind = 'l'
-			case types.GuestFileTypeFile:
-				kind = '-'
-			}
-
-			switch x := f.Attributes.(type) {
-			case *types.GuestPosixFileAttributes:
-				perm := os.FileMode(x.Permissions).Perm().String()[1:]
-				fmt.Fprintf(tw, "%c%s\t%d\t%d\t", kind, perm, *x.OwnerId, *x.GroupId)
-			}
-
-			attr := f.Attributes.GetGuestFileAttributes()
-
-			fmt.Fprintf(tw, "%s\t%s\t%s", units.FileSize(f.Size), attr.ModificationTime.Format("Jan 2 15:04 2006"), f.Path)
-			if attr.SymlinkTarget != "" {
-				fmt.Fprintf(tw, " -> %s", attr.SymlinkTarget)
-			}
-			fmt.Fprintln(tw)
-		}
-
-		_ = tw.Flush()
-
-		if info.Remaining == 0 {
-			break
-		}
-		offset += int32(len(info.Files))
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go
deleted file mode 100644
index 541f6d7f36..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mkdir.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type mkdir struct {
-	*GuestFlag
-
-	createParents bool
-}
-
-func init() {
-	cli.Register("guest.mkdir", &mkdir{})
-}
-
-func (cmd *mkdir) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.createParents, "p", false, "Create intermediate directories as needed")
-}
-
-func (cmd *mkdir) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mkdir) Usage() string {
-	return "PATH"
-}
-
-func (cmd *mkdir) Description() string {
-	return `Create directory PATH in VM.
-
-Examples:
-  govc guest.mkdir -vm $name /tmp/logs
-  govc guest.mkdir -vm $name -p /tmp/logs/foo/bar`
-}
-
-func (cmd *mkdir) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	err = m.MakeDirectory(ctx, cmd.Auth(), f.Arg(0), cmd.createParents)
-
-	// ignore EEXIST if -p flag is given
-	if err != nil && cmd.createParents {
-		if soap.IsSoapFault(err) {
-			soapFault := soap.ToSoapFault(err)
-			if _, ok := soapFault.VimFault().(types.FileAlreadyExists); ok {
-				return nil
-			}
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go
deleted file mode 100644
index 3637bcefc6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mktemp.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type mktemp struct {
-	*GuestFlag
-
-	dir    bool
-	path   string
-	prefix string
-	suffix string
-}
-
-func init() {
-	cli.Register("guest.mktemp", &mktemp{})
-}
-
-func (cmd *mktemp) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.dir, "d", false, "Make a directory instead of a file")
-	f.StringVar(&cmd.path, "p", "", "If specified, create relative to this directory")
-	f.StringVar(&cmd.prefix, "t", "", "Prefix")
-	f.StringVar(&cmd.suffix, "s", "", "Suffix")
-}
-
-func (cmd *mktemp) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mktemp) Description() string {
-	return `Create a temporary file or directory in VM.
-
-Examples:
-  govc guest.mktemp -vm $name
-  govc guest.mktemp -vm $name -d
-  govc guest.mktemp -vm $name -t myprefix
-  govc guest.mktemp -vm $name -p /var/tmp/$USER`
-}
-
-func (cmd *mktemp) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	mk := m.CreateTemporaryFile
-	if cmd.dir {
-		mk = m.CreateTemporaryDirectory
-	}
-
-	name, err := mk(ctx, cmd.Auth(), cmd.prefix, cmd.suffix, cmd.path)
-	if err != nil {
-		return err
-	}
-
-	fmt.Println(name)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mv.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mv.go
deleted file mode 100644
index 4890a6f8a8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/mv.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type mv struct {
-	*GuestFlag
-
-	noclobber bool
-}
-
-func init() {
-	cli.Register("guest.mv", &mv{})
-}
-
-func (cmd *mv) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.noclobber, "n", false, "Do not overwrite an existing file")
-}
-
-func (cmd *mv) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *mv) Usage() string {
-	return "SOURCE DEST"
-}
-
-func (cmd *mv) Description() string {
-	return `Move (rename) files in VM.
-
-Examples:
-  govc guest.mv -vm $name /tmp/foo.sh /tmp/bar.sh
-  govc guest.mv -vm $name -n /tmp/baz.sh /tmp/bar.sh`
-}
-
-func (cmd *mv) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	src := f.Arg(0)
-	dst := f.Arg(1)
-
-	err = m.MoveFile(ctx, cmd.Auth(), src, dst, !cmd.noclobber)
-
-	if err != nil {
-		if soap.IsSoapFault(err) {
-			soapFault := soap.ToSoapFault(err)
-			if _, ok := soapFault.VimFault().(types.NotAFile); ok {
-				err = m.MoveDirectory(ctx, cmd.Auth(), src, dst)
-			}
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go
deleted file mode 100644
index 217986b9ba..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/ps.go
+++ /dev/null
@@ -1,199 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"text/tabwriter"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ps struct {
-	*flags.OutputFlag
-	*GuestFlag
-
-	every bool
-	exit  bool
-	wait  bool
-
-	pids pidSelector
-	uids uidSelector
-}
-
-type pidSelector []int64
-
-func (s *pidSelector) String() string {
-	return fmt.Sprint(*s)
-}
-
-func (s *pidSelector) Set(value string) error {
-	v, err := strconv.ParseInt(value, 0, 64)
-	if err != nil {
-		return err
-	}
-	*s = append(*s, v)
-	return nil
-}
-
-type uidSelector map[string]bool
-
-func (s uidSelector) String() string {
-	return ""
-}
-
-func (s uidSelector) Set(value string) error {
-	s[value] = true
-	return nil
-}
-
-func init() {
-	cli.Register("guest.ps", &ps{})
-}
-
-func (cmd *ps) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	cmd.uids = make(map[string]bool)
-	f.BoolVar(&cmd.every, "e", false, "Select all processes")
-	f.BoolVar(&cmd.exit, "x", false, "Output exit time and code")
-	f.BoolVar(&cmd.wait, "X", false, "Wait for process to exit")
-	f.Var(&cmd.pids, "p", "Select by process ID")
-	f.Var(&cmd.uids, "U", "Select by process UID")
-}
-
-func (cmd *ps) Process(ctx context.Context) error {
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ps) Description() string {
-	return `List processes in VM.
-
-By default, unless the '-e', '-p' or '-U' flag is specified, only processes owned
-by the '-l' flag user are displayed.
-
-The '-x' and '-X' flags only apply to processes started by vmware-tools,
-such as those started with the govc guest.start command.
-
-Examples:
-  govc guest.ps -vm $name
-  govc guest.ps -vm $name -e
-  govc guest.ps -vm $name -p 12345
-  govc guest.ps -vm $name -U root`
-}
-
-func running(procs []types.GuestProcessInfo) bool {
-	for _, p := range procs {
-		if p.EndTime == nil {
-			return true
-		}
-	}
-	return false
-}
-
-func (cmd *ps) list(ctx context.Context) ([]types.GuestProcessInfo, error) {
-	m, err := cmd.ProcessManager()
-	if err != nil {
-		return nil, err
-	}
-
-	auth := cmd.Auth()
-
-	for {
-		procs, err := m.ListProcesses(ctx, auth, cmd.pids)
-		if err != nil {
-			return nil, err
-		}
-
-		if cmd.wait && running(procs) {
-			<-time.After(time.Millisecond * 250)
-			continue
-		}
-
-		return procs, nil
-	}
-}
-
-func (cmd *ps) Run(ctx context.Context, f *flag.FlagSet) error {
-	procs, err := cmd.list(ctx)
-	if err != nil {
-		return err
-	}
-
-	r := &psResult{cmd, procs}
-
-	return cmd.WriteResult(r)
-}
-
-type psResult struct {
-	cmd         *ps
-	ProcessInfo []types.GuestProcessInfo
-}
-
-func (r *psResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(w, 2, 0, 2, ' ', 0)
-
-	fmt.Fprintf(tw, "%s\t%s\t%s", "UID", "PID", "STIME")
-	if r.cmd.exit {
-		fmt.Fprintf(tw, "\t%s\t%s", "XTIME", "XCODE")
-	}
-	fmt.Fprint(tw, "\tCMD\n")
-
-	if len(r.cmd.pids) != 0 {
-		r.cmd.every = true
-	}
-
-	if !r.cmd.every && len(r.cmd.uids) == 0 {
-		r.cmd.uids[r.cmd.auth.Username] = true
-	}
-
-	for _, p := range r.ProcessInfo {
-		if r.cmd.every || r.cmd.uids[p.Owner] {
-			fmt.Fprintf(tw, "%s\t%d\t%s", p.Owner, p.Pid, p.StartTime.Format("15:04"))
-			if r.cmd.exit {
-				etime := "-"
-				ecode := "-"
-				if p.EndTime != nil {
-					etime = p.EndTime.Format("15:04")
-					ecode = strconv.Itoa(int(p.ExitCode))
-				}
-				fmt.Fprintf(tw, "\t%s\t%s", etime, ecode)
-			}
-			fmt.Fprintf(tw, "\t%s\n", strings.TrimSpace(p.CmdLine))
-		}
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go
deleted file mode 100644
index bd21a55ebf..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rm.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type rm struct {
-	*GuestFlag
-}
-
-func init() {
-	cli.Register("guest.rm", &rm{})
-}
-
-func (cmd *rm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-}
-
-func (cmd *rm) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rm) Usage() string {
-	return "PATH"
-}
-
-func (cmd *rm) Description() string {
-	return `Remove file PATH in VM.
-
-Examples:
-  govc guest.rm -vm $name /tmp/foo.log`
-}
-
-func (cmd *rm) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	return m.DeleteFile(ctx, cmd.Auth(), f.Arg(0))
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go
deleted file mode 100644
index 7b69a879cb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/rmdir.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type rmdir struct {
-	*GuestFlag
-
-	recursive bool
-}
-
-func init() {
-	cli.Register("guest.rmdir", &rmdir{})
-}
-
-func (cmd *rmdir) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.recursive, "r", false, "Recursive removal")
-}
-
-func (cmd *rmdir) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *rmdir) Usage() string {
-	return "PATH"
-}
-
-func (cmd *rmdir) Description() string {
-	return `Remove directory PATH in VM.
-
-Examples:
-  govc guest.rmdir -vm $name /tmp/empty-dir
-  govc guest.rmdir -vm $name -r /tmp/non-empty-dir`
-}
-
-func (cmd *rmdir) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	return m.DeleteDirectory(ctx, cmd.Auth(), f.Arg(0), cmd.recursive)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/run.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/run.go
deleted file mode 100644
index 84dca19457..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/run.go
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"bytes"
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-)
-
-type run struct {
-	*GuestFlag
-
-	data    string
-	verbose bool
-	dir     string
-	vars    env
-}
-
-func init() {
-	cli.Register("guest.run", &run{})
-}
-
-func (cmd *run) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.data, "d", "", "Input data")
-	f.BoolVar(&cmd.verbose, "v", false, "Verbose")
-	f.StringVar(&cmd.dir, "C", "", "The absolute path of the working directory for the program to start")
-	f.Var(&cmd.vars, "e", "Set environment variable or HTTP header")
-}
-
-func (cmd *run) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *run) Usage() string {
-	return "NAME [ARG]..."
-}
-
-func (cmd *run) Description() string {
-	return `Run program NAME in VM and display output.
-
-This command depends on govmomi/toolbox running in the VM guest and does not work with standard VMware tools.
-
-If the program NAME is an HTTP verb, the toolbox's http.RoundTripper will be used as the HTTP transport.
-
-Examples:
-  govc guest.run -vm $name kubectl get pods
-  govc guest.run -vm $name -d - kubectl create -f - <svc.json
-  govc guest.run -vm $name kubectl delete pod,service my-service
-  govc guest.run -vm $name GET http://localhost:8080/api/v1/nodes
-  govc guest.run -vm $name -e Content-Type:application/json -d - POST http://localhost:8080/api/v1/namespaces/default/pods <svc.json
-  govc guest.run -vm $name DELETE http://localhost:8080/api/v1/namespaces/default/services/my-service`
-}
-
-func (cmd *run) do(c *http.Client, req *http.Request) error {
-	for _, v := range cmd.vars {
-		h := strings.SplitN(v, ":", 2)
-		if len(h) != 2 {
-			return fmt.Errorf("invalid header: %q", v)
-		}
-
-		req.Header.Set(strings.TrimSpace(h[0]), strings.TrimSpace(h[1]))
-	}
-
-	res, err := c.Do(req)
-	if err != nil {
-		return err
-	}
-
-	if cmd.verbose {
-		return res.Write(cmd.Out)
-	}
-
-	_, err = io.Copy(cmd.Out, res.Body)
-
-	_ = res.Body.Close()
-
-	return err
-}
-
-func (cmd *run) Run(ctx context.Context, f *flag.FlagSet) error {
-	name := f.Arg(0)
-
-	tc, err := cmd.Toolbox()
-	if err != nil {
-		return err
-	}
-
-	hc := &http.Client{
-		Transport: tc,
-	}
-
-	switch name {
-	case "HEAD", "GET", "DELETE":
-		req, err := http.NewRequest(name, f.Arg(1), nil)
-		if err != nil {
-			return err
-		}
-
-		return cmd.do(hc, req)
-	case "POST", "PUT":
-		req, err := http.NewRequest(name, f.Arg(1), os.Stdin)
-		if err != nil {
-			return err
-		}
-
-		return cmd.do(hc, req)
-	default:
-		ecmd := &exec.Cmd{
-			Path:   name,
-			Args:   f.Args()[1:],
-			Env:    cmd.vars,
-			Dir:    cmd.dir,
-			Stdout: os.Stdout,
-			Stderr: os.Stderr,
-		}
-
-		switch cmd.data {
-		case "":
-		case "-":
-			ecmd.Stdin = os.Stdin
-		default:
-			ecmd.Stdin = bytes.NewBuffer([]byte(cmd.data))
-		}
-
-		return tc.Run(ctx, ecmd)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go
deleted file mode 100644
index 0613f3cea1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/start.go
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type start struct {
-	*GuestFlag
-
-	dir  string
-	vars env
-}
-
-type env []string
-
-func (e *env) String() string {
-	return fmt.Sprint(*e)
-}
-
-func (e *env) Set(value string) error {
-	*e = append(*e, value)
-	return nil
-}
-
-func init() {
-	cli.Register("guest.start", &start{})
-}
-
-func (cmd *start) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.dir, "C", "", "The absolute path of the working directory for the program to start")
-	f.Var(&cmd.vars, "e", "Set environment variable (key=val)")
-}
-
-func (cmd *start) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *start) Usage() string {
-	return "PATH [ARG]..."
-}
-
-func (cmd *start) Description() string {
-	return `Start program in VM.
-
-The process can have its status queried with govc guest.ps.
-When the process completes, its exit code and end time will be available for 5 minutes after completion.
-
-Examples:
-  govc guest.start -vm $name /bin/mount /dev/hdb1 /data
-  pid=$(govc guest.start -vm $name /bin/long-running-thing)
-  govc guest.ps -vm $name -p $pid -X`
-}
-
-func (cmd *start) Run(ctx context.Context, f *flag.FlagSet) error {
-	m, err := cmd.ProcessManager()
-	if err != nil {
-		return err
-	}
-
-	spec := types.GuestProgramSpec{
-		ProgramPath:      f.Arg(0),
-		Arguments:        strings.Join(f.Args()[1:], " "),
-		WorkingDirectory: cmd.dir,
-		EnvVariables:     cmd.vars,
-	}
-
-	pid, err := m.StartProgram(ctx, cmd.Auth(), &spec)
-	if err != nil {
-		return err
-	}
-
-	fmt.Printf("%d\n", pid)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go
deleted file mode 100644
index 1e1e36a283..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/tools.go
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type tools struct {
-	*flags.ClientFlag
-	*flags.SearchFlag
-
-	mount   bool
-	upgrade bool
-	options string
-	unmount bool
-}
-
-func init() {
-	cli.Register("vm.guest.tools", &tools{})
-}
-
-func (cmd *tools) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.mount, "mount", false, "Mount tools CD installer in the guest")
-	f.BoolVar(&cmd.upgrade, "upgrade", false, "Upgrade tools in the guest")
-	f.StringVar(&cmd.options, "options", "", "Installer options")
-	f.BoolVar(&cmd.unmount, "unmount", false, "Unmount tools CD installer in the guest")
-}
-
-func (cmd *tools) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *tools) Usage() string {
-	return "VM..."
-}
-
-func (cmd *tools) Description() string {
-	return `Manage guest tools in VM.
-
-Examples:
-  govc vm.guest.tools -mount VM
-  govc vm.guest.tools -unmount VM
-  govc vm.guest.tools -upgrade -options "opt1 opt2" VM`
-}
-
-func (cmd *tools) Upgrade(ctx context.Context, vm *object.VirtualMachine) error {
-	task, err := vm.UpgradeTools(ctx, cmd.options)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
-
-func (cmd *tools) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		switch {
-		case cmd.mount:
-			err = vm.MountToolsInstaller(ctx)
-			if err != nil {
-				return err
-			}
-		case cmd.upgrade:
-			err = cmd.Upgrade(ctx, vm)
-			if err != nil {
-				return err
-			}
-		case cmd.unmount:
-			err = vm.UnmountToolsInstaller(ctx)
-			if err != nil {
-				return err
-			}
-		default:
-			return flag.ErrHelp
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/touch.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/touch.go
deleted file mode 100644
index 4f5e00f9e3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/touch.go
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"bytes"
-	"context"
-	"flag"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type touch struct {
-	*GuestFlag
-
-	nocreate bool
-	atime    bool
-	date     string
-}
-
-func init() {
-	cli.Register("guest.touch", &touch{})
-}
-
-func (cmd *touch) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.atime, "a", false, "Change only the access time")
-	f.BoolVar(&cmd.nocreate, "c", false, "Do not create any files")
-	f.StringVar(&cmd.date, "d", "", "Use DATE instead of current time")
-}
-
-func (cmd *touch) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *touch) Usage() string {
-	return "FILE"
-}
-
-func (cmd *touch) Description() string {
-	return `Change FILE times on VM.
-
-Examples:
-  govc guest.touch -vm $name /var/log/foo.log
-  govc guest.touch -vm $name -d "$(date -d '1 day ago')" /var/log/foo.log`
-}
-
-func (cmd *touch) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	m, err := cmd.FileManager()
-	if err != nil {
-		return err
-	}
-
-	name := f.Arg(0)
-
-	var attr types.GuestFileAttributes
-	now := time.Now()
-
-	if cmd.date != "" {
-		now, err = time.Parse(time.UnixDate, cmd.date)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.atime {
-		attr.AccessTime = &now
-	} else {
-		attr.ModificationTime = &now
-	}
-
-	err = m.ChangeFileAttributes(ctx, cmd.Auth(), name, &attr)
-	if err != nil && !cmd.nocreate && soap.IsSoapFault(err) {
-		fault := soap.ToSoapFault(err)
-		if _, ok := fault.VimFault().(types.FileNotFound); ok {
-			// create a new empty file
-			url, cerr := m.InitiateFileTransferToGuest(ctx, cmd.Auth(), name, &attr, 0, false)
-			if cerr != nil {
-				return cerr
-			}
-
-			u, cerr := cmd.ParseURL(url)
-			if cerr != nil {
-				return cerr
-			}
-
-			c, cerr := cmd.Client()
-			if cerr != nil {
-				return cerr
-			}
-
-			err = c.Client.Upload(new(bytes.Buffer), u, &soap.DefaultUpload)
-			if err == nil && cmd.date != "" {
-				err = m.ChangeFileAttributes(ctx, cmd.Auth(), name, &attr)
-			}
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go
deleted file mode 100644
index 9eb7a429cd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/guest/upload.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"flag"
-	"io"
-	"os"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type upload struct {
-	*GuestFlag
-	*FileAttrFlag
-
-	overwrite bool
-}
-
-func init() {
-	cli.Register("guest.upload", &upload{})
-}
-
-func (cmd *upload) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.GuestFlag, ctx = newGuestFlag(ctx)
-	cmd.GuestFlag.Register(ctx, f)
-	cmd.FileAttrFlag, ctx = newFileAttrFlag(ctx)
-	cmd.FileAttrFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.overwrite, "f", false, "If set, the guest destination file is clobbered")
-}
-
-func (cmd *upload) Usage() string {
-	return "SOURCE DEST"
-}
-
-func (cmd *upload) Description() string {
-	return `Copy SOURCE from the local system to DEST in the guest VM.
-
-If SOURCE name is "-", read source from stdin.
-
-Examples:
-  govc guest.upload -l user:pass -vm=my-vm ~/.ssh/id_rsa.pub /home/$USER/.ssh/authorized_keys
-  cowsay "have a great day" | govc guest.upload -l user:pass -vm=my-vm - /etc/motd`
-}
-
-func (cmd *upload) Process(ctx context.Context) error {
-	if err := cmd.GuestFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FileAttrFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *upload) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 2 {
-		return flag.ErrHelp
-	}
-
-	c, err := cmd.Toolbox()
-	if err != nil {
-		return err
-	}
-
-	src := f.Arg(0)
-	dst := f.Arg(1)
-
-	p := soap.DefaultUpload
-
-	var r io.Reader = os.Stdin
-
-	if src != "-" {
-		f, err := os.Open(src)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-
-		r = f
-
-		if cmd.OutputFlag.TTY {
-			logger := cmd.ProgressLogger("Uploading... ")
-			p.Progress = logger
-			defer logger.Wait()
-		}
-	}
-
-	return c.Upload(ctx, r, dst, p, cmd.Attr(), cmd.overwrite)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/info.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/info.go
deleted file mode 100644
index 1b37378cd1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/info.go
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"text/tabwriter"
-
-	"context"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-
-	"github.com/vmware/govmomi/units"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type info struct {
-	*flags.ClientFlag
-	*flags.OutputFlag
-	*flags.SearchFlag
-
-	WaitForIP       bool
-	General         bool
-	ExtraConfig     bool
-	Resources       bool
-	ToolsConfigInfo bool
-}
-
-func init() {
-	cli.Register("vm.info", &info{})
-}
-
-func (cmd *info) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.WaitForIP, "waitip", false, "Wait for VM to acquire IP address")
-	f.BoolVar(&cmd.General, "g", true, "Show general summary")
-	f.BoolVar(&cmd.ExtraConfig, "e", false, "Show ExtraConfig")
-	f.BoolVar(&cmd.Resources, "r", false, "Show resource summary")
-	f.BoolVar(&cmd.ToolsConfigInfo, "t", false, "Show ToolsConfigInfo")
-}
-
-func (cmd *info) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		if _, ok := err.(*find.NotFoundError); ok {
-			// Continue with empty VM slice
-		} else {
-			return err
-		}
-	}
-
-	refs := make([]types.ManagedObjectReference, 0, len(vms))
-	for _, vm := range vms {
-		refs = append(refs, vm.Reference())
-	}
-
-	var res infoResult
-	var props []string
-
-	if cmd.OutputFlag.All() {
-		props = nil // Load everything
-	} else {
-		props = []string{"summary"} // Load summary
-		if cmd.General {
-			props = append(props, "guest.ipAddress")
-		}
-		if cmd.ExtraConfig {
-			props = append(props, "config.extraConfig")
-		}
-		if cmd.Resources {
-			props = append(props, "datastore", "network")
-		}
-		if cmd.ToolsConfigInfo {
-			props = append(props, "config.tools")
-		}
-	}
-
-	pc := property.DefaultCollector(c)
-	if len(refs) != 0 {
-		err = pc.Retrieve(ctx, refs, props, &res.VirtualMachines)
-		if err != nil {
-			return err
-		}
-	}
-
-	if cmd.WaitForIP {
-		for i, vm := range res.VirtualMachines {
-			if vm.Guest == nil || vm.Guest.IpAddress == "" {
-				_, err = vms[i].WaitForIP(ctx)
-				if err != nil {
-					return err
-				}
-				// Reload virtual machine object
-				err = pc.RetrieveOne(ctx, vms[i].Reference(), props, &res.VirtualMachines[i])
-				if err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	if !cmd.OutputFlag.All() {
-		res.objects = vms
-		res.cmd = cmd
-		if err = res.collectReferences(pc, ctx); err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	VirtualMachines []mo.VirtualMachine
-	objects         []*object.VirtualMachine
-	entities        map[types.ManagedObjectReference]string
-	cmd             *info
-}
-
-// collectReferences builds a unique set of MORs to the set of VirtualMachines,
-// so we can collect properties in a single call for each reference type {host,datastore,network}.
-func (r *infoResult) collectReferences(pc *property.Collector, ctx context.Context) error {
-	r.entities = make(map[types.ManagedObjectReference]string) // MOR -> Name map
-
-	var host []mo.HostSystem
-	var network []mo.Network
-	var opaque []mo.OpaqueNetwork
-	var dvp []mo.DistributedVirtualPortgroup
-	var datastore []mo.Datastore
-	// Table to drive inflating refs to their mo.* counterparts (dest)
-	// and save() the Name to r.entities w/o using reflection here.
-	// Note that we cannot use a []mo.ManagedEntity here, since mo.Network has its own 'Name' field,
-	// the mo.Network.ManagedEntity.Name field will not be set.
-	vrefs := map[string]*struct {
-		dest interface{}
-		refs []types.ManagedObjectReference
-		save func()
-	}{
-		"HostSystem": {
-			&host, nil, func() {
-				for _, e := range host {
-					r.entities[e.Reference()] = e.Name
-				}
-			},
-		},
-		"Network": {
-			&network, nil, func() {
-				for _, e := range network {
-					r.entities[e.Reference()] = e.Name
-				}
-			},
-		},
-		"OpaqueNetwork": {
-			&opaque, nil, func() {
-				for _, e := range opaque {
-					r.entities[e.Reference()] = e.Name
-				}
-			},
-		},
-		"DistributedVirtualPortgroup": {
-			&dvp, nil, func() {
-				for _, e := range dvp {
-					r.entities[e.Reference()] = e.Name
-				}
-			},
-		},
-		"Datastore": {
-			&datastore, nil, func() {
-				for _, e := range datastore {
-					r.entities[e.Reference()] = e.Name
-				}
-			},
-		},
-	}
-
-	xrefs := make(map[types.ManagedObjectReference]bool)
-	// Add MOR to vrefs[kind].refs avoiding any duplicates.
-	addRef := func(refs ...types.ManagedObjectReference) {
-		for _, ref := range refs {
-			if _, exists := xrefs[ref]; exists {
-				return
-			}
-			xrefs[ref] = true
-			vref := vrefs[ref.Type]
-			vref.refs = append(vref.refs, ref)
-		}
-	}
-
-	for _, vm := range r.VirtualMachines {
-		if r.cmd.General {
-			if ref := vm.Summary.Runtime.Host; ref != nil {
-				addRef(*ref)
-			}
-		}
-
-		if r.cmd.Resources {
-			addRef(vm.Datastore...)
-			addRef(vm.Network...)
-		}
-	}
-
-	for _, vref := range vrefs {
-		if vref.refs == nil {
-			continue
-		}
-		err := pc.Retrieve(ctx, vref.refs, []string{"name"}, vref.dest)
-		if err != nil {
-			return err
-		}
-		vref.save()
-	}
-
-	return nil
-}
-
-func (r *infoResult) entityNames(refs []types.ManagedObjectReference) string {
-	var names []string
-	for _, ref := range refs {
-		names = append(names, r.entities[ref])
-	}
-	return strings.Join(names, ", ")
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	// Maintain order via r.objects as Property collector does not always return results in order.
-	objects := make(map[types.ManagedObjectReference]mo.VirtualMachine, len(r.VirtualMachines))
-	for _, o := range r.VirtualMachines {
-		objects[o.Reference()] = o
-	}
-
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-
-	for _, o := range r.objects {
-		vm := objects[o.Reference()]
-		s := vm.Summary
-
-		fmt.Fprintf(tw, "Name:\t%s\n", s.Config.Name)
-
-		if r.cmd.General {
-			hostName := "<unavailable>"
-
-			if href := vm.Summary.Runtime.Host; href != nil {
-				if name, ok := r.entities[*href]; ok {
-					hostName = name
-				}
-			}
-
-			fmt.Fprintf(tw, "  Path:\t%s\n", o.InventoryPath)
-			fmt.Fprintf(tw, "  UUID:\t%s\n", s.Config.Uuid)
-			fmt.Fprintf(tw, "  Guest name:\t%s\n", s.Config.GuestFullName)
-			fmt.Fprintf(tw, "  Memory:\t%dMB\n", s.Config.MemorySizeMB)
-			fmt.Fprintf(tw, "  CPU:\t%d vCPU(s)\n", s.Config.NumCpu)
-			fmt.Fprintf(tw, "  Power state:\t%s\n", s.Runtime.PowerState)
-			fmt.Fprintf(tw, "  Boot time:\t%s\n", s.Runtime.BootTime)
-			fmt.Fprintf(tw, "  IP address:\t%s\n", s.Guest.IpAddress)
-			fmt.Fprintf(tw, "  Host:\t%s\n", hostName)
-		}
-
-		if r.cmd.Resources {
-			if s.Storage == nil {
-				s.Storage = new(types.VirtualMachineStorageSummary)
-			}
-			fmt.Fprintf(tw, "  CPU usage:\t%dMHz\n", s.QuickStats.OverallCpuUsage)
-			fmt.Fprintf(tw, "  Host memory usage:\t%dMB\n", s.QuickStats.HostMemoryUsage)
-			fmt.Fprintf(tw, "  Guest memory usage:\t%dMB\n", s.QuickStats.GuestMemoryUsage)
-			fmt.Fprintf(tw, "  Storage uncommitted:\t%s\n", units.ByteSize(s.Storage.Uncommitted))
-			fmt.Fprintf(tw, "  Storage committed:\t%s\n", units.ByteSize(s.Storage.Committed))
-			fmt.Fprintf(tw, "  Storage unshared:\t%s\n", units.ByteSize(s.Storage.Unshared))
-			fmt.Fprintf(tw, "  Storage:\t%s\n", r.entityNames(vm.Datastore))
-			fmt.Fprintf(tw, "  Network:\t%s\n", r.entityNames(vm.Network))
-		}
-
-		if r.cmd.ExtraConfig {
-			fmt.Fprintf(tw, "  ExtraConfig:\n")
-			for _, v := range vm.Config.ExtraConfig {
-				fmt.Fprintf(tw, "    %s:\t%s\n", v.GetOptionValue().Key, v.GetOptionValue().Value)
-			}
-		}
-
-		if r.cmd.ToolsConfigInfo {
-			t := vm.Config.Tools
-			fmt.Fprintf(tw, "  ToolsConfigInfo:\n")
-			fmt.Fprintf(tw, "    ToolsVersion:\t%d\n", t.ToolsVersion)
-			fmt.Fprintf(tw, "    AfterPowerOn:\t%s\n", flags.NewOptionalBool(&t.AfterPowerOn).String())
-			fmt.Fprintf(tw, "    AfterResume:\t%s\n", flags.NewOptionalBool(&t.AfterResume).String())
-			fmt.Fprintf(tw, "    BeforeGuestStandby:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestStandby).String())
-			fmt.Fprintf(tw, "    BeforeGuestShutdown:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestShutdown).String())
-			fmt.Fprintf(tw, "    BeforeGuestReboot:\t%s\n", flags.NewOptionalBool(&t.BeforeGuestReboot).String())
-			fmt.Fprintf(tw, "    ToolsUpgradePolicy:\t%s\n", t.ToolsUpgradePolicy)
-			fmt.Fprintf(tw, "    PendingCustomization:\t%s\n", t.PendingCustomization)
-			fmt.Fprintf(tw, "    SyncTimeWithHost:\t%s\n", flags.NewOptionalBool(&t.SyncTimeWithHost).String())
-		}
-	}
-
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/ip.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/ip.go
deleted file mode 100644
index b721a096f9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/ip.go
+++ /dev/null
@@ -1,194 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/govc/host/esxcli"
-	"github.com/vmware/govmomi/object"
-)
-
-type ip struct {
-	*flags.OutputFlag
-	*flags.SearchFlag
-
-	esx  bool
-	all  bool
-	v4   bool
-	wait time.Duration
-	nic  string
-}
-
-func init() {
-	cli.Register("vm.ip", &ip{})
-}
-
-func (cmd *ip) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.esx, "esxcli", false, "Use esxcli instead of guest tools")
-	f.BoolVar(&cmd.all, "a", false, "Wait for an IP address on all NICs")
-	f.StringVar(&cmd.nic, "n", "", "Wait for IP address on NIC, specified by device name or MAC")
-	f.BoolVar(&cmd.v4, "v4", false, "Only report IPv4 addresses")
-	f.DurationVar(&cmd.wait, "wait", time.Hour, "Wait time for the VM obtain an IP address")
-}
-
-func (cmd *ip) Usage() string {
-	return "VM..."
-}
-
-func (cmd *ip) Description() string {
-	return `List IPs for VM.
-
-By default the vm.ip command depends on vmware-tools to report the 'guest.ipAddress' field and will
-wait until it has done so.  This value can also be obtained using:
-
-  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.IpAddress
-
-When given the '-a' flag, only IP addresses for which there is a corresponding virtual nic are listed.
-If there are multiple nics, the listed addresses will be comma delimited.  The '-a' flag depends on
-vmware-tools to report the 'guest.net' field and will wait until it has done so for all nics.
-Note that this list includes IPv6 addresses if any, use '-v4' to filter them out.  IP addresses reported
-by tools for which there is no virtual nic are not included, for example that of the 'docker0' interface.
-
-These values can also be obtained using:
-
-  govc vm.info -json $vm | jq -r .VirtualMachines[].Guest.Net[].IpConfig.IpAddress[].IpAddress
-
-When given the '-n' flag, filters '-a' behavior to the nic specified by MAC address or device name.
-
-The 'esxcli' flag does not require vmware-tools to be installed, but does require the ESX host to
-have the /Net/GuestIPHack setting enabled.
-
-The 'wait' flag default to 1hr (original default was infinite).  If a VM does not obtain an IP within
-the wait time, the command will still exit with status 0.
-
-Examples:
-  govc vm.ip $vm
-  govc vm.ip -wait 5m $vm
-  govc vm.ip -a -v4 $vm
-  govc vm.ip -n 00:0c:29:57:7b:c3 $vm
-  govc vm.ip -n ethernet-0 $vm
-  govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
-  govc vm.ip -esxcli $vm`
-}
-
-func (cmd *ip) Process(ctx context.Context) error {
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ip) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	var get func(*object.VirtualMachine, context.Context) (string, error)
-
-	if cmd.esx {
-		get = func(vm *object.VirtualMachine, deadline context.Context) (string, error) {
-			guest := esxcli.NewGuestInfo(c)
-
-			ticker := time.NewTicker(time.Millisecond * 500)
-			defer ticker.Stop()
-
-			for {
-				select {
-				case <-ticker.C:
-					ip, err := guest.IpAddress(vm)
-					if err != nil {
-						return "", err
-					}
-
-					if ip != "0.0.0.0" {
-						return ip, nil
-					}
-				case <-deadline.Done():
-					return "", nil
-				}
-			}
-		}
-	} else {
-		var hwaddr []string
-		if cmd.nic != "" {
-			hwaddr = strings.Split(cmd.nic, ",")
-		}
-
-		get = func(vm *object.VirtualMachine, deadline context.Context) (string, error) {
-			if cmd.all || hwaddr != nil {
-				macs, err := vm.WaitForNetIP(deadline, cmd.v4, hwaddr...)
-				if err != nil {
-					return "", err
-				}
-
-				var ips []string
-				for _, addrs := range macs {
-					for _, ip := range addrs {
-						ips = append(ips, ip)
-					}
-				}
-				return strings.Join(ips, ","), nil
-			}
-			return vm.WaitForIP(deadline)
-		}
-	}
-
-	for _, vm := range vms {
-		deadline, cancel := context.WithDeadline(ctx, time.Now().Add(cmd.wait))
-
-		ip, err := get(vm, deadline)
-		if err != nil {
-			if deadline.Err() != context.DeadlineExceeded {
-				cancel()
-				return err
-			}
-		}
-
-		cancel()
-
-		if ip == "" {
-			continue
-		}
-
-		// TODO(PN): Display inventory path to VM
-		fmt.Fprintf(cmd, "%s\n", ip)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go
deleted file mode 100644
index eccfb77e01..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/markastemplate.go
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type markastemplate struct {
-	*flags.SearchFlag
-}
-
-func init() {
-	cli.Register("vm.markastemplate", &markastemplate{})
-}
-
-func (cmd *markastemplate) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-}
-
-func (cmd *markastemplate) Process(ctx context.Context) error {
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *markastemplate) Usage() string {
-	return "VM..."
-}
-
-func (cmd *markastemplate) Description() string {
-	return `Mark VM as a virtual machine template.
-
-Examples:
-  govc vm.markastemplate $name`
-}
-
-func (cmd *markastemplate) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		err := vm.MarkAsTemplate(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go
deleted file mode 100644
index 0297863059..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/markasvm.go
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type markasvm struct {
-	*flags.SearchFlag
-	*flags.ResourcePoolFlag
-	*flags.HostSystemFlag
-}
-
-func init() {
-	cli.Register("vm.markasvm", &markasvm{})
-}
-
-func (cmd *markasvm) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-}
-
-func (cmd *markasvm) Process(ctx context.Context) error {
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *markasvm) Usage() string {
-	return "VM..."
-}
-
-func (cmd *markasvm) Description() string {
-	return `Mark VM template as a virtual machine.
-
-Examples:
-  govc vm.markasvm $name -host host1
-  govc vm.markasvm $name -pool cluster1/Resources`
-}
-
-func (cmd *markasvm) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	pool, err := cmd.ResourcePoolIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	host, err := cmd.HostSystemFlag.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if pool == nil {
-		if host == nil {
-			return flag.ErrHelp
-		}
-
-		pool, err = host.ResourcePool(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, vm := range vms {
-		err := vm.MarkAsVirtualMachine(ctx, *pool, host)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/migrate.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/migrate.go
deleted file mode 100644
index 6a746e7bb5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/migrate.go
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type migrate struct {
-	*flags.ResourcePoolFlag
-	*flags.HostSystemFlag
-	*flags.DatastoreFlag
-	*flags.SearchFlag
-
-	priority types.VirtualMachineMovePriority
-	spec     types.VirtualMachineRelocateSpec
-}
-
-func init() {
-	cli.Register("vm.migrate", &migrate{})
-}
-
-func (cmd *migrate) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	f.StringVar((*string)(&cmd.priority), "priority", string(types.VirtualMachineMovePriorityDefaultPriority), "The task priority")
-}
-
-func (cmd *migrate) Process(ctx context.Context) error {
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *migrate) Usage() string {
-	return "VM..."
-}
-
-func (cmd *migrate) Description() string {
-	return `Migrates VM to a specific resource pool, host or datastore.
-
-Examples:
-  govc vm.migrate -host another-host vm-1 vm-2 vm-3
-  govc vm.migrate -pool another-pool vm-1 vm-2 vm-3
-  govc vm.migrate -ds another-ds vm-1 vm-2 vm-3`
-}
-
-func (cmd *migrate) relocate(ctx context.Context, vm *object.VirtualMachine) error {
-	task, err := vm.Relocate(ctx, cmd.spec, cmd.priority)
-	if err != nil {
-		return err
-	}
-
-	logger := cmd.DatastoreFlag.ProgressLogger(fmt.Sprintf("migrating %s... ", vm.Reference()))
-	_, err = task.WaitForResult(ctx, logger)
-	if err != nil {
-		return err
-	}
-
-	logger.Wait()
-
-	return nil
-}
-
-func (cmd *migrate) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	host, err := cmd.HostSystemFlag.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if host != nil {
-		ref := host.Reference()
-		cmd.spec.Host = &ref
-	}
-
-	pool, err := cmd.ResourcePoolFlag.ResourcePoolIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if pool == nil && host != nil {
-		pool, err = host.ResourcePool(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	if pool != nil {
-		ref := pool.Reference()
-		cmd.spec.Pool = &ref
-	}
-
-	ds, err := cmd.DatastoreFlag.DatastoreIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if ds != nil {
-		ref := ds.Reference()
-		cmd.spec.Datastore = &ref
-	}
-
-	for _, vm := range vms {
-		err = cmd.relocate(ctx, vm)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/network/add.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/network/add.go
deleted file mode 100644
index 73330fe8c0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/network/add.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package network
-
-import (
-	"context"
-	"errors"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type add struct {
-	*flags.VirtualMachineFlag
-	*flags.NetworkFlag
-}
-
-func init() {
-	cli.Register("vm.network.add", &add{})
-}
-
-func (cmd *add) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
-	cmd.NetworkFlag.Register(ctx, f)
-}
-
-func (cmd *add) Description() string {
-	return `Add network adapter to VM.
-
-Examples:
-  govc vm.network.add -vm $vm -net "VM Network" -net.adapter e1000e
-  govc device.info -vm $vm ethernet-*`
-}
-
-func (cmd *add) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.NetworkFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *add) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachineFlag.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return errors.New("please specify a vm")
-	}
-
-	// Set network if specified as extra argument.
-	if f.NArg() > 0 {
-		_ = cmd.NetworkFlag.Set(f.Arg(0))
-	}
-
-	net, err := cmd.NetworkFlag.Device()
-	if err != nil {
-		return err
-	}
-
-	return vm.AddDevice(ctx, net)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/network/change.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/network/change.go
deleted file mode 100644
index 00e4708a51..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/network/change.go
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package network
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type change struct {
-	*flags.VirtualMachineFlag
-	*flags.NetworkFlag
-}
-
-func init() {
-	cli.Register("vm.network.change", &change{})
-}
-
-func (cmd *change) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-	cmd.NetworkFlag, ctx = flags.NewNetworkFlag(ctx)
-	cmd.NetworkFlag.Register(ctx, f)
-}
-
-func (cmd *change) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.NetworkFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *change) Usage() string {
-	return "DEVICE"
-}
-
-func (cmd *change) Description() string {
-	return `Change network DEVICE configuration.
-
-Examples:
-  govc vm.network.change -vm $vm -net PG2 ethernet-0
-  govc vm.network.change -vm $vm -net.address 00:00:0f:2e:5d:69 ethernet-0
-  govc device.info -vm $vm ethernet-*`
-}
-
-func (cmd *change) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachineFlag.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return errors.New("please specify a vm")
-	}
-
-	name := f.Arg(0)
-
-	if name == "" {
-		return errors.New("please specify a device name")
-	}
-
-	// Set network if specified as extra argument.
-	if f.NArg() > 1 {
-		_ = cmd.NetworkFlag.Set(f.Arg(1))
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	net := devices.Find(name)
-
-	if net == nil {
-		return fmt.Errorf("device '%s' not found", name)
-	}
-
-	dev, err := cmd.NetworkFlag.Device()
-	if err != nil {
-		return err
-	}
-
-	current := net.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
-	changed := dev.(types.BaseVirtualEthernetCard).GetVirtualEthernetCard()
-
-	current.Backing = changed.Backing
-
-	if changed.MacAddress != "" {
-		current.MacAddress = changed.MacAddress
-	}
-
-	if changed.AddressType != "" {
-		current.AddressType = changed.AddressType
-	}
-
-	return vm.EditDevice(ctx, net)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/power.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/power.go
deleted file mode 100644
index f38380b0cf..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/power.go
+++ /dev/null
@@ -1,160 +0,0 @@
-/*
-Copyright (c) 2014-2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type power struct {
-	*flags.ClientFlag
-	*flags.SearchFlag
-
-	On       bool
-	Off      bool
-	Reset    bool
-	Reboot   bool
-	Shutdown bool
-	Suspend  bool
-	Force    bool
-}
-
-func init() {
-	cli.Register("vm.power", &power{})
-}
-
-func (cmd *power) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.On, "on", false, "Power on")
-	f.BoolVar(&cmd.Off, "off", false, "Power off")
-	f.BoolVar(&cmd.Reset, "reset", false, "Power reset")
-	f.BoolVar(&cmd.Suspend, "suspend", false, "Power suspend")
-	f.BoolVar(&cmd.Reboot, "r", false, "Reboot guest")
-	f.BoolVar(&cmd.Shutdown, "s", false, "Shutdown guest")
-	f.BoolVar(&cmd.Force, "force", false, "Force (ignore state error and hard shutdown/reboot if tools unavailable)")
-}
-
-func (cmd *power) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	opts := []bool{cmd.On, cmd.Off, cmd.Reset, cmd.Suspend, cmd.Reboot, cmd.Shutdown}
-	selected := false
-
-	for _, opt := range opts {
-		if opt {
-			if selected {
-				return flag.ErrHelp
-			}
-			selected = opt
-		}
-	}
-
-	if !selected {
-		return flag.ErrHelp
-	}
-
-	return nil
-}
-
-func isToolsUnavailable(err error) bool {
-	if soap.IsSoapFault(err) {
-		soapFault := soap.ToSoapFault(err)
-		if _, ok := soapFault.VimFault().(types.ToolsUnavailable); ok {
-			return ok
-		}
-	}
-
-	return false
-}
-
-func (cmd *power) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		var task *object.Task
-
-		switch {
-		case cmd.On:
-			fmt.Fprintf(cmd, "Powering on %s... ", vm.Reference())
-			task, err = vm.PowerOn(ctx)
-		case cmd.Off:
-			fmt.Fprintf(cmd, "Powering off %s... ", vm.Reference())
-			task, err = vm.PowerOff(ctx)
-		case cmd.Reset:
-			fmt.Fprintf(cmd, "Reset %s... ", vm.Reference())
-			task, err = vm.Reset(ctx)
-		case cmd.Suspend:
-			fmt.Fprintf(cmd, "Suspend %s... ", vm.Reference())
-			task, err = vm.Suspend(ctx)
-		case cmd.Reboot:
-			fmt.Fprintf(cmd, "Reboot guest %s... ", vm.Reference())
-			err = vm.RebootGuest(ctx)
-
-			if err != nil && cmd.Force && isToolsUnavailable(err) {
-				task, err = vm.Reset(ctx)
-			}
-		case cmd.Shutdown:
-			fmt.Fprintf(cmd, "Shutdown guest %s... ", vm.Reference())
-			err = vm.ShutdownGuest(ctx)
-
-			if err != nil && cmd.Force && isToolsUnavailable(err) {
-				task, err = vm.PowerOff(ctx)
-			}
-		}
-
-		if err != nil {
-			return err
-		}
-
-		if task != nil {
-			err = task.Wait(ctx)
-		}
-		if err == nil {
-			fmt.Fprintf(cmd, "OK\n")
-			continue
-		}
-
-		if cmd.Force {
-			fmt.Fprintf(cmd, "Error: %s\n", err)
-			continue
-		}
-
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/question.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/question.go
deleted file mode 100644
index a8bcd296c7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/question.go
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type question struct {
-	*flags.VirtualMachineFlag
-
-	answer string
-}
-
-func init() {
-	cli.Register("vm.question", &question{})
-}
-
-func (cmd *question) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.answer, "answer", "", "Answer to question")
-}
-
-func (cmd *question) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *question) Run(ctx context.Context, f *flag.FlagSet) error {
-	c, err := cmd.Client()
-	if err != nil {
-		return err
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return errors.New("No VM specified")
-	}
-
-	var mvm mo.VirtualMachine
-
-	pc := property.DefaultCollector(c)
-	err = pc.RetrieveOne(ctx, vm.Reference(), []string{"runtime.question"}, &mvm)
-	if err != nil {
-		return err
-	}
-
-	q := mvm.Runtime.Question
-	if q == nil {
-		fmt.Printf("No pending question\n")
-		return nil
-	}
-
-	// Print question if no answer is specified
-	if cmd.answer == "" {
-		fmt.Printf("Question:\n%s\n\n", q.Text)
-		fmt.Printf("Possible answers:\n")
-		for _, e := range q.Choice.ChoiceInfo {
-			ed := e.(*types.ElementDescription)
-			fmt.Printf("%s) %s\n", ed.Key, ed.Description.Label)
-		}
-		return nil
-	}
-
-	// Answer question
-	return vm.Answer(ctx, q.Id, cmd.answer)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go
deleted file mode 100644
index 9c7ee28634..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/attach.go
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package rdm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type attach struct {
-	*flags.VirtualMachineFlag
-
-	device string
-}
-
-func init() {
-	cli.Register("vm.rdm.attach", &attach{})
-}
-
-func (cmd *attach) Register(ctx context.Context, f *flag.FlagSet) {
-
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.device, "device", "", "Device Name")
-}
-
-func (cmd *attach) Description() string {
-	return `Attach DEVICE to VM with RDM.
-
-Examples:
-  govc vm.rdm.attach -vm VM -device /vmfs/devices/disks/naa.000000000000000000000000000000000`
-}
-
-func (cmd *attach) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-//This piece of code was developped mainly thanks to the project govmax on github.com
-//This file in particular https://github.com/codedellemc/govmax/blob/master/api/v1/vmomi.go
-func (cmd *attach) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	devices, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	controller, err := devices.FindSCSIController("")
-	if err != nil {
-		return err
-	}
-
-	vmConfigOptions, err := vm.QueryConfigTarget(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, scsiDisk := range vmConfigOptions.ScsiDisk {
-		if !strings.Contains(scsiDisk.Disk.CanonicalName, cmd.device) {
-			continue
-		}
-		var backing types.VirtualDiskRawDiskMappingVer1BackingInfo
-		backing.CompatibilityMode = string(types.VirtualDiskCompatibilityModePhysicalMode)
-		backing.DeviceName = scsiDisk.Disk.DeviceName
-		for _, descriptor := range scsiDisk.Disk.Descriptor {
-			if strings.HasPrefix(descriptor.Id, "vml.") {
-				backing.LunUuid = descriptor.Id
-				break
-			}
-		}
-		var device types.VirtualDisk
-		device.Backing = &backing
-		device.ControllerKey = controller.VirtualController.Key
-
-		var unitNumber *int32
-		scsiCtrlUnitNumber := controller.VirtualController.UnitNumber
-		var u int32
-		for u = 0; u < 16; u++ {
-			free := true
-			for _, d := range devices {
-				if d.GetVirtualDevice().ControllerKey == device.GetVirtualDevice().ControllerKey {
-					if u == *(d.GetVirtualDevice().UnitNumber) || u == *scsiCtrlUnitNumber {
-						free = false
-					}
-				}
-			}
-			if free {
-				unitNumber = &u
-				break
-			}
-		}
-		device.UnitNumber = unitNumber
-
-		spec := types.VirtualMachineConfigSpec{}
-
-		config := &types.VirtualDeviceConfigSpec{
-			Device:    &device,
-			Operation: types.VirtualDeviceConfigSpecOperationAdd,
-		}
-
-		config.FileOperation = types.VirtualDeviceConfigSpecFileOperationCreate
-
-		spec.DeviceChange = append(spec.DeviceChange, config)
-
-		task, err := vm.Reconfigure(ctx, spec)
-		if err != nil {
-			return err
-		}
-
-		err = task.Wait(ctx)
-		if err != nil {
-			return fmt.Errorf("Error adding device %+v \n with backing %+v \nLogged Item:  %s", device, backing, err)
-		}
-		return nil
-
-	}
-	return fmt.Errorf("Error: No LUN with device name containing %s found", cmd.device)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go
deleted file mode 100644
index 1d5373f5dc..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/rdm/ls.go
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package rdm
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"text/tabwriter"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ls struct {
-	*flags.VirtualMachineFlag
-	*flags.OutputFlag
-}
-
-func init() {
-	cli.Register("vm.rdm.ls", &ls{})
-}
-
-func (cmd *ls) Register(ctx context.Context, f *flag.FlagSet) {
-
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-	cmd.OutputFlag, ctx = flags.NewOutputFlag(ctx)
-	cmd.OutputFlag.Register(ctx, f)
-}
-
-func (cmd *ls) Description() string {
-	return `List available devices that could be attach to VM with RDM.
-
-Examples:
-  govc vm.rdm.ls -vm VM`
-}
-
-func (cmd *ls) Process(ctx context.Context) error {
-
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.OutputFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *ls) Run(ctx context.Context, f *flag.FlagSet) error {
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	vmConfigOptions, err := vm.QueryConfigTarget(ctx)
-	if err != nil {
-		return err
-	}
-
-	res := infoResult{
-		Disks: vmConfigOptions.ScsiDisk,
-	}
-	return cmd.WriteResult(&res)
-}
-
-type infoResult struct {
-	Disks []types.VirtualMachineScsiDiskDeviceInfo
-}
-
-func (r *infoResult) Write(w io.Writer) error {
-	tw := tabwriter.NewWriter(os.Stdout, 2, 0, 2, ' ', 0)
-	for _, disk := range r.Disks {
-		fmt.Fprintf(tw, "Name:\t%s\n", disk.Name)
-		fmt.Fprintf(tw, "  Device name:\t%s\n", disk.Disk.DeviceName)
-		fmt.Fprintf(tw, "  Device path:\t%s\n", disk.Disk.DevicePath)
-		fmt.Fprintf(tw, "  Canonical Name:\t%s\n", disk.Disk.CanonicalName)
-
-		var uids []string
-		for _, descriptor := range disk.Disk.Descriptor {
-			uids = append(uids, descriptor.Id)
-		}
-
-		fmt.Fprintf(tw, "  UIDS:\t%s\n", strings.Join(uids, " ,"))
-	}
-	return tw.Flush()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/register.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/register.go
deleted file mode 100644
index aeaa6aaadc..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/register.go
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type register struct {
-	*flags.DatastoreFlag
-	*flags.ResourcePoolFlag
-	*flags.HostSystemFlag
-	*flags.FolderFlag
-
-	name     string
-	template bool
-}
-
-func init() {
-	cli.Register("vm.register", &register{})
-}
-
-func (cmd *register) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.DatastoreFlag, ctx = flags.NewDatastoreFlag(ctx)
-	cmd.DatastoreFlag.Register(ctx, f)
-
-	cmd.ResourcePoolFlag, ctx = flags.NewResourcePoolFlag(ctx)
-	cmd.ResourcePoolFlag.Register(ctx, f)
-
-	cmd.HostSystemFlag, ctx = flags.NewHostSystemFlag(ctx)
-	cmd.HostSystemFlag.Register(ctx, f)
-
-	cmd.FolderFlag, ctx = flags.NewFolderFlag(ctx)
-	cmd.FolderFlag.Register(ctx, f)
-
-	f.StringVar(&cmd.name, "name", "", "Name of the VM")
-	f.BoolVar(&cmd.template, "template", false, "Mark VM as template")
-}
-
-func (cmd *register) Process(ctx context.Context) error {
-	if err := cmd.DatastoreFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.ResourcePoolFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.HostSystemFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.FolderFlag.Process(ctx); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (cmd *register) Usage() string {
-	return "VMX"
-}
-
-func (cmd *register) Description() string {
-	return `Add an existing VM to the inventory.
-
-VMX is a path to the vm config file, relative to DATASTORE.
-
-Examples:
-  govc vm.register path/name.vmx
-  govc vm.register -template -host $host path/name.vmx`
-}
-
-func (cmd *register) Run(ctx context.Context, f *flag.FlagSet) error {
-	if len(f.Args()) != 1 {
-		return flag.ErrHelp
-	}
-
-	pool, err := cmd.ResourcePoolIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	host, err := cmd.HostSystemFlag.HostSystemIfSpecified()
-	if err != nil {
-		return err
-	}
-
-	if cmd.template {
-		if pool != nil || host == nil {
-			return flag.ErrHelp
-		}
-	} else if pool == nil {
-		if host != nil {
-			pool, err = host.ResourcePool(ctx)
-			if err != nil {
-				return err
-			}
-		} else {
-			// neither -host nor -pool were specified, so use the default pool (ESX)
-			pool, err = cmd.ResourcePool()
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	folder, err := cmd.FolderFlag.Folder()
-	if err != nil {
-		return err
-	}
-
-	path, err := cmd.DatastorePath(f.Arg(0))
-	if err != nil {
-		return err
-	}
-
-	task, err := folder.RegisterVM(ctx, path, cmd.name, cmd.template, pool, host)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go
deleted file mode 100644
index bc50c3e36b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/create.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package snapshot
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type create struct {
-	*flags.VirtualMachineFlag
-
-	description string
-	memory      bool
-	quiesce     bool
-}
-
-func init() {
-	cli.Register("snapshot.create", &create{})
-}
-
-func (cmd *create) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.memory, "m", true, "Include memory state")
-	f.BoolVar(&cmd.quiesce, "q", false, "Quiesce guest file system")
-	f.StringVar(&cmd.description, "d", "", "Snapshot description")
-}
-
-func (cmd *create) Usage() string {
-	return "NAME"
-}
-
-func (cmd *create) Description() string {
-	return `Create snapshot of VM with NAME.
-
-Examples:
-  govc snapshot.create -vm my-vm happy-vm-state`
-}
-
-func (cmd *create) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *create) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	task, err := vm.CreateSnapshot(ctx, f.Arg(0), cmd.description, cmd.memory, cmd.quiesce)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go
deleted file mode 100644
index b71fd9f06c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/remove.go
+++ /dev/null
@@ -1,94 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package snapshot
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type remove struct {
-	*flags.VirtualMachineFlag
-
-	recursive   bool
-	consolidate bool
-}
-
-func init() {
-	cli.Register("snapshot.remove", &remove{})
-}
-
-func (cmd *remove) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.recursive, "r", false, "Remove snapshot children")
-	f.BoolVar(&cmd.consolidate, "c", true, "Consolidate disks")
-}
-
-func (cmd *remove) Usage() string {
-	return "NAME"
-}
-
-func (cmd *remove) Description() string {
-	return `Remove snapshot of VM with given NAME.
-
-NAME can be the snapshot name, tree path, moid or '*' to remove all snapshots.
-
-Examples:
-  govc snapshot.remove -vm my-vm happy-vm-state`
-}
-
-func (cmd *remove) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *remove) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 1 {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	var task *object.Task
-
-	if f.Arg(0) == "*" {
-		task, err = vm.RemoveAllSnapshot(ctx, &cmd.consolidate)
-	} else {
-		task, err = vm.RemoveSnapshot(ctx, f.Arg(0), cmd.recursive, &cmd.consolidate)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go
deleted file mode 100644
index da89b0ccf6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/revert.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package snapshot
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-)
-
-type revert struct {
-	*flags.VirtualMachineFlag
-
-	suppressPowerOn bool
-}
-
-func init() {
-	cli.Register("snapshot.revert", &revert{})
-}
-
-func (cmd *revert) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.suppressPowerOn, "s", false, "Suppress power on")
-}
-
-func (cmd *revert) Usage() string {
-	return "[NAME]"
-}
-
-func (cmd *revert) Description() string {
-	return `Revert to snapshot of VM with given NAME.
-
-If NAME is not provided, revert to the current snapshot.
-Otherwise, NAME can be the snapshot name, tree path or moid.
-
-Examples:
-  govc snapshot.revert -vm my-vm happy-vm-state`
-}
-
-func (cmd *revert) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *revert) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() > 1 {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	var task *object.Task
-
-	if f.NArg() == 1 {
-		task, err = vm.RevertToSnapshot(ctx, f.Arg(0), cmd.suppressPowerOn)
-	} else {
-		task, err = vm.RevertToCurrentSnapshot(ctx, cmd.suppressPowerOn)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go
deleted file mode 100644
index 9874935e29..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/snapshot/tree.go
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package snapshot
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"path"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type tree struct {
-	*flags.VirtualMachineFlag
-
-	fullPath    bool
-	current     bool
-	currentName bool
-	date        bool
-	id          bool
-
-	info *types.VirtualMachineSnapshotInfo
-}
-
-func init() {
-	cli.Register("snapshot.tree", &tree{})
-}
-
-func (cmd *tree) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
-	cmd.VirtualMachineFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.fullPath, "f", false, "Print the full path prefix for snapshot")
-	f.BoolVar(&cmd.currentName, "C", false, "Print the current snapshot name only")
-	f.BoolVar(&cmd.current, "c", true, "Print the current snapshot")
-	f.BoolVar(&cmd.date, "D", false, "Print the snapshot creation date")
-	f.BoolVar(&cmd.id, "i", false, "Print the snapshot id")
-}
-
-func (cmd *tree) Description() string {
-	return `List VM snapshots in a tree-like format.
-
-The command will exit 0 with no output if VM does not have any snapshots.
-
-Examples:
-  govc snapshot.tree -vm my-vm
-  govc snapshot.tree -vm my-vm -D -i`
-}
-
-func (cmd *tree) Process(ctx context.Context) error {
-	if err := cmd.VirtualMachineFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *tree) write(level int, parent string, st []types.VirtualMachineSnapshotTree) {
-	for _, s := range st {
-		sname := s.Name
-
-		if cmd.fullPath && parent != "" {
-			sname = path.Join(parent, sname)
-		}
-
-		var names []string
-
-		if !cmd.currentName {
-			names = append(names, sname)
-		}
-
-		if s.Snapshot == *cmd.info.CurrentSnapshot {
-			if cmd.current {
-				names = append(names, ".")
-			} else if cmd.currentName {
-				fmt.Println(sname)
-				return
-			}
-		}
-
-		for _, name := range names {
-			var attr []string
-			var meta string
-
-			if cmd.id {
-				attr = append(attr, s.Snapshot.Value)
-			}
-
-			if cmd.date {
-				attr = append(attr, s.CreateTime.Format("Jan 2 15:04"))
-			}
-
-			if len(attr) > 0 {
-				meta = fmt.Sprintf("[%s]  ", strings.Join(attr, " "))
-			}
-
-			fmt.Printf("%s%s%s\n", strings.Repeat(" ", level), meta, name)
-		}
-
-		cmd.write(level+2, sname, s.ChildSnapshotList)
-	}
-}
-
-func (cmd *tree) Run(ctx context.Context, f *flag.FlagSet) error {
-	if f.NArg() != 0 {
-		return flag.ErrHelp
-	}
-
-	vm, err := cmd.VirtualMachine()
-	if err != nil {
-		return err
-	}
-
-	if vm == nil {
-		return flag.ErrHelp
-	}
-
-	var o mo.VirtualMachine
-
-	err = vm.Properties(ctx, vm.Reference(), []string{"snapshot"}, &o)
-	if err != nil {
-		return err
-	}
-
-	if o.Snapshot == nil {
-		return nil
-	}
-
-	if o.Snapshot.CurrentSnapshot == nil || cmd.currentName {
-		cmd.current = false
-	}
-
-	cmd.info = o.Snapshot
-
-	cmd.write(0, "", o.Snapshot.RootSnapshotList)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/unregister.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/unregister.go
deleted file mode 100644
index 789d1eea58..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/unregister.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"flag"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-)
-
-type unregister struct {
-	*flags.ClientFlag
-	*flags.SearchFlag
-}
-
-func init() {
-	cli.Register("vm.unregister", &unregister{})
-}
-
-func (cmd *unregister) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
-	cmd.ClientFlag.Register(ctx, f)
-
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-}
-
-func (cmd *unregister) Process(ctx context.Context) error {
-	if err := cmd.ClientFlag.Process(ctx); err != nil {
-		return err
-	}
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (cmd *unregister) Usage() string {
-	return "VM..."
-}
-
-func (cmd *unregister) Description() string {
-	return `Remove VM from inventory without removing any of the VM files on disk.`
-}
-
-func (cmd *unregister) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.VirtualMachines(f.Args())
-	if err != nil {
-		return err
-	}
-
-	for _, vm := range vms {
-		err := vm.Unregister(ctx)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/govc/vm/vnc.go b/installer/vendor/github.com/vmware/govmomi/govc/vm/vnc.go
deleted file mode 100644
index 1e268ae5f8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/govc/vm/vnc.go
+++ /dev/null
@@ -1,487 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vm
-
-import (
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"reflect"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/govmomi/govc/cli"
-	"github.com/vmware/govmomi/govc/flags"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type intRange struct {
-	low, high int
-}
-
-var intRangeRegexp = regexp.MustCompile("^([0-9]+)-([0-9]+)$")
-
-func (i *intRange) Set(s string) error {
-	m := intRangeRegexp.FindStringSubmatch(s)
-	if m == nil {
-		return fmt.Errorf("invalid range: %s", s)
-	}
-
-	low, _ := strconv.Atoi(m[1])
-	high, _ := strconv.Atoi(m[2])
-	if low > high {
-		return fmt.Errorf("invalid range: low > high")
-	}
-
-	i.low = low
-	i.high = high
-	return nil
-}
-
-func (i *intRange) String() string {
-	return fmt.Sprintf("%d-%d", i.low, i.high)
-}
-
-type vnc struct {
-	*flags.SearchFlag
-
-	Enable    bool
-	Disable   bool
-	Port      int
-	PortRange intRange
-	Password  string
-}
-
-func init() {
-	cmd := &vnc{}
-	cmd.PortRange.Set("5900-5999")
-	cli.Register("vm.vnc", cmd)
-}
-
-func (cmd *vnc) Register(ctx context.Context, f *flag.FlagSet) {
-	cmd.SearchFlag, ctx = flags.NewSearchFlag(ctx, flags.SearchVirtualMachines)
-	cmd.SearchFlag.Register(ctx, f)
-
-	f.BoolVar(&cmd.Enable, "enable", false, "Enable VNC")
-	f.BoolVar(&cmd.Disable, "disable", false, "Disable VNC")
-	f.IntVar(&cmd.Port, "port", -1, "VNC port (-1 for auto-select)")
-	f.Var(&cmd.PortRange, "port-range", "VNC port auto-select range")
-	f.StringVar(&cmd.Password, "password", "", "VNC password")
-}
-
-func (cmd *vnc) Process(ctx context.Context) error {
-	if err := cmd.SearchFlag.Process(ctx); err != nil {
-		return err
-	}
-	// Either may be true or none may be true.
-	if cmd.Enable && cmd.Disable {
-		return flag.ErrHelp
-	}
-
-	return nil
-}
-
-func (cmd *vnc) Usage() string {
-	return "VM..."
-}
-
-func (cmd *vnc) Description() string {
-	return `Enable or disable VNC for VM.
-
-Port numbers are automatically chosen if not specified.
-
-If neither -enable or -disable is specified, the current state is returned.
-
-Examples:
-  govc vm.vnc -enable -password 1234 $vm | awk '{print $2}' | xargs open`
-}
-
-func (cmd *vnc) Run(ctx context.Context, f *flag.FlagSet) error {
-	vms, err := cmd.loadVMs(f.Args())
-	if err != nil {
-		return err
-	}
-
-	// Actuate settings in VMs
-	for _, vm := range vms {
-		switch {
-		case cmd.Enable:
-			vm.enable(cmd.Port, cmd.Password)
-		case cmd.Disable:
-			vm.disable()
-		}
-	}
-
-	// Reconfigure VMs to reflect updates
-	for _, vm := range vms {
-		err = vm.reconfigure()
-		if err != nil {
-			return err
-		}
-	}
-
-	return cmd.WriteResult(vncResult(vms))
-}
-
-func (cmd *vnc) loadVMs(args []string) ([]*vncVM, error) {
-	c, err := cmd.Client()
-	if err != nil {
-		return nil, err
-	}
-
-	vms, err := cmd.VirtualMachines(args)
-	if err != nil {
-		return nil, err
-	}
-
-	var vncVMs []*vncVM
-	for _, vm := range vms {
-		v, err := newVNCVM(c, vm)
-		if err != nil {
-			return nil, err
-		}
-		vncVMs = append(vncVMs, v)
-	}
-
-	// Assign vncHosts to vncVMs
-	hosts := make(map[string]*vncHost)
-	for _, vm := range vncVMs {
-		if h, ok := hosts[vm.hostReference().Value]; ok {
-			vm.host = h
-			continue
-		}
-
-		hs := object.NewHostSystem(c, vm.hostReference())
-		h, err := newVNCHost(c, hs, cmd.PortRange.low, cmd.PortRange.high)
-		if err != nil {
-			return nil, err
-		}
-
-		hosts[vm.hostReference().Value] = h
-		vm.host = h
-	}
-
-	return vncVMs, nil
-}
-
-type vncVM struct {
-	c    *vim25.Client
-	vm   *object.VirtualMachine
-	mvm  mo.VirtualMachine
-	host *vncHost
-
-	curOptions vncOptions
-	newOptions vncOptions
-}
-
-func newVNCVM(c *vim25.Client, vm *object.VirtualMachine) (*vncVM, error) {
-	v := &vncVM{
-		c:  c,
-		vm: vm,
-	}
-
-	virtualMachineProperties := []string{
-		"name",
-		"config.extraConfig",
-		"runtime.host",
-	}
-
-	pc := property.DefaultCollector(c)
-	ctx := context.TODO()
-	err := pc.RetrieveOne(ctx, vm.Reference(), virtualMachineProperties, &v.mvm)
-	if err != nil {
-		return nil, err
-	}
-
-	v.curOptions = vncOptionsFromExtraConfig(v.mvm.Config.ExtraConfig)
-	v.newOptions = vncOptionsFromExtraConfig(v.mvm.Config.ExtraConfig)
-
-	return v, nil
-}
-
-func (v *vncVM) hostReference() types.ManagedObjectReference {
-	return *v.mvm.Runtime.Host
-}
-
-func (v *vncVM) enable(port int, password string) error {
-	v.newOptions["enabled"] = "true"
-	v.newOptions["port"] = fmt.Sprintf("%d", port)
-	v.newOptions["password"] = password
-
-	// Find port if auto-select
-	if port == -1 {
-		// Reuse port if If VM already has a port, reuse it.
-		// Otherwise, find unused VNC port on host.
-		if p, ok := v.curOptions["port"]; ok && p != "" {
-			v.newOptions["port"] = p
-		} else {
-			port, err := v.host.popUnusedPort()
-			if err != nil {
-				return err
-			}
-			v.newOptions["port"] = fmt.Sprintf("%d", port)
-		}
-	}
-	return nil
-}
-
-func (v *vncVM) disable() error {
-	v.newOptions["enabled"] = "false"
-	v.newOptions["port"] = ""
-	v.newOptions["password"] = ""
-	return nil
-}
-
-func (v *vncVM) reconfigure() error {
-	if reflect.DeepEqual(v.curOptions, v.newOptions) {
-		// No changes to settings
-		return nil
-	}
-
-	spec := types.VirtualMachineConfigSpec{
-		ExtraConfig: v.newOptions.ToExtraConfig(),
-	}
-
-	ctx := context.TODO()
-	task, err := v.vm.Reconfigure(ctx, spec)
-	if err != nil {
-		return err
-	}
-
-	return task.Wait(ctx)
-}
-
-func (v *vncVM) uri() (string, error) {
-	ip, err := v.host.managementIP()
-	if err != nil {
-		return "", err
-	}
-
-	uri := fmt.Sprintf("vnc://:%s@%s:%s",
-		v.newOptions["password"],
-		ip,
-		v.newOptions["port"])
-
-	return uri, nil
-}
-
-func (v *vncVM) write(w io.Writer) error {
-	if strings.EqualFold(v.newOptions["enabled"], "true") {
-		uri, err := v.uri()
-		if err != nil {
-			return err
-		}
-		fmt.Printf("%s: %s\n", v.mvm.Name, uri)
-	} else {
-		fmt.Printf("%s: disabled\n", v.mvm.Name)
-	}
-	return nil
-}
-
-type vncHost struct {
-	c     *vim25.Client
-	host  *object.HostSystem
-	ports map[int]struct{}
-	ip    string // This field is populated by `managementIP`
-}
-
-func newVNCHost(c *vim25.Client, host *object.HostSystem, low, high int) (*vncHost, error) {
-	ports := make(map[int]struct{})
-	for i := low; i <= high; i++ {
-		ports[i] = struct{}{}
-	}
-
-	used, err := loadUsedPorts(c, host.Reference())
-	if err != nil {
-		return nil, err
-	}
-
-	// Remove used ports from range
-	for _, u := range used {
-		delete(ports, u)
-	}
-
-	h := &vncHost{
-		c:     c,
-		host:  host,
-		ports: ports,
-	}
-
-	return h, nil
-}
-
-func loadUsedPorts(c *vim25.Client, host types.ManagedObjectReference) ([]int, error) {
-	ctx := context.TODO()
-	ospec := types.ObjectSpec{
-		Obj: host,
-		SelectSet: []types.BaseSelectionSpec{
-			&types.TraversalSpec{
-				Type: "HostSystem",
-				Path: "vm",
-				Skip: types.NewBool(false),
-			},
-		},
-		Skip: types.NewBool(false),
-	}
-
-	pspec := types.PropertySpec{
-		Type:    "VirtualMachine",
-		PathSet: []string{"config.extraConfig"},
-	}
-
-	req := types.RetrieveProperties{
-		This: c.ServiceContent.PropertyCollector,
-		SpecSet: []types.PropertyFilterSpec{
-			{
-				ObjectSet: []types.ObjectSpec{ospec},
-				PropSet:   []types.PropertySpec{pspec},
-			},
-		},
-	}
-
-	var vms []mo.VirtualMachine
-	err := mo.RetrievePropertiesForRequest(ctx, c, req, &vms)
-	if err != nil {
-		return nil, err
-	}
-
-	var ports []int
-	for _, vm := range vms {
-		if vm.Config == nil || vm.Config.ExtraConfig == nil {
-			continue
-		}
-
-		options := vncOptionsFromExtraConfig(vm.Config.ExtraConfig)
-		if ps, ok := options["port"]; ok && ps != "" {
-			pi, err := strconv.Atoi(ps)
-			if err == nil {
-				ports = append(ports, pi)
-			}
-		}
-	}
-
-	return ports, nil
-}
-
-func (h *vncHost) popUnusedPort() (int, error) {
-	if len(h.ports) == 0 {
-		return 0, fmt.Errorf("no unused ports in range")
-	}
-
-	// Return first port we get when iterating
-	var port int
-	for port = range h.ports {
-		break
-	}
-	delete(h.ports, port)
-	return port, nil
-}
-
-func (h *vncHost) managementIP() (string, error) {
-	ctx := context.TODO()
-	if h.ip != "" {
-		return h.ip, nil
-	}
-
-	ips, err := h.host.ManagementIPs(ctx)
-	if err != nil {
-		return "", err
-	}
-
-	if len(ips) > 0 {
-		h.ip = ips[0].String()
-	} else {
-		h.ip = "<unknown>"
-	}
-
-	return h.ip, nil
-}
-
-type vncResult []*vncVM
-
-func (vms vncResult) MarshalJSON() ([]byte, error) {
-	out := make(map[string]string)
-	for _, vm := range vms {
-		uri, err := vm.uri()
-		if err != nil {
-			return nil, err
-		}
-		out[vm.mvm.Name] = uri
-	}
-	return json.Marshal(out)
-}
-
-func (vms vncResult) Write(w io.Writer) error {
-	for _, vm := range vms {
-		err := vm.write(w)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type vncOptions map[string]string
-
-var vncPrefix = "RemoteDisplay.vnc."
-
-func vncOptionsFromExtraConfig(ov []types.BaseOptionValue) vncOptions {
-	vo := make(vncOptions)
-	for _, b := range ov {
-		o := b.GetOptionValue()
-		if strings.HasPrefix(o.Key, vncPrefix) {
-			key := o.Key[len(vncPrefix):]
-			if key != "key" {
-				vo[key] = o.Value.(string)
-			}
-		}
-	}
-	return vo
-}
-
-func (vo vncOptions) ToExtraConfig() []types.BaseOptionValue {
-	ov := make([]types.BaseOptionValue, 0, 0)
-	for k, v := range vo {
-		key := vncPrefix + k
-		value := v
-
-		o := types.OptionValue{
-			Key:   key,
-			Value: &value, // Pass pointer to avoid omitempty
-		}
-
-		ov = append(ov, &o)
-	}
-
-	// Don't know how to deal with the key option, set it to be empty...
-	o := types.OptionValue{
-		Key:   vncPrefix + "key",
-		Value: new(string), // Pass pointer to avoid omitempty
-	}
-
-	ov = append(ov, &o)
-
-	return ov
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/guest/auth_manager.go b/installer/vendor/github.com/vmware/govmomi/guest/auth_manager.go
deleted file mode 100644
index ed2ebd1696..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/guest/auth_manager.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type AuthManager struct {
-	types.ManagedObjectReference
-
-	vm types.ManagedObjectReference
-
-	c *vim25.Client
-}
-
-func (m AuthManager) Reference() types.ManagedObjectReference {
-	return m.ManagedObjectReference
-}
-
-func (m AuthManager) AcquireCredentials(ctx context.Context, requestedAuth types.BaseGuestAuthentication, sessionID int64) (types.BaseGuestAuthentication, error) {
-	req := types.AcquireCredentialsInGuest{
-		This:          m.Reference(),
-		Vm:            m.vm,
-		RequestedAuth: requestedAuth,
-		SessionID:     sessionID,
-	}
-
-	res, err := methods.AcquireCredentialsInGuest(ctx, m.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m AuthManager) ReleaseCredentials(ctx context.Context, auth types.BaseGuestAuthentication) error {
-	req := types.ReleaseCredentialsInGuest{
-		This: m.Reference(),
-		Vm:   m.vm,
-		Auth: auth,
-	}
-
-	_, err := methods.ReleaseCredentialsInGuest(ctx, m.c, &req)
-
-	return err
-}
-
-func (m AuthManager) ValidateCredentials(ctx context.Context, auth types.BaseGuestAuthentication) error {
-	req := types.ValidateCredentialsInGuest{
-		This: m.Reference(),
-		Vm:   m.vm,
-		Auth: auth,
-	}
-
-	_, err := methods.ValidateCredentialsInGuest(ctx, m.c, &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/guest/file_manager.go b/installer/vendor/github.com/vmware/govmomi/guest/file_manager.go
deleted file mode 100644
index 3beaec54f1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/guest/file_manager.go
+++ /dev/null
@@ -1,282 +0,0 @@
-/*
-Copyright (c) 2015-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"net"
-	"net/url"
-	"sync"
-
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type FileManager struct {
-	types.ManagedObjectReference
-
-	vm types.ManagedObjectReference
-
-	c *vim25.Client
-
-	mu    *sync.Mutex
-	hosts map[string]string
-}
-
-func (m FileManager) Reference() types.ManagedObjectReference {
-	return m.ManagedObjectReference
-}
-
-func (m FileManager) ChangeFileAttributes(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string, fileAttributes types.BaseGuestFileAttributes) error {
-	req := types.ChangeFileAttributesInGuest{
-		This:           m.Reference(),
-		Vm:             m.vm,
-		Auth:           auth,
-		GuestFilePath:  guestFilePath,
-		FileAttributes: fileAttributes,
-	}
-
-	_, err := methods.ChangeFileAttributesInGuest(ctx, m.c, &req)
-	return err
-}
-
-func (m FileManager) CreateTemporaryDirectory(ctx context.Context, auth types.BaseGuestAuthentication, prefix, suffix string, path string) (string, error) {
-	req := types.CreateTemporaryDirectoryInGuest{
-		This:          m.Reference(),
-		Vm:            m.vm,
-		Auth:          auth,
-		Prefix:        prefix,
-		Suffix:        suffix,
-		DirectoryPath: path,
-	}
-
-	res, err := methods.CreateTemporaryDirectoryInGuest(ctx, m.c, &req)
-	if err != nil {
-		return "", err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m FileManager) CreateTemporaryFile(ctx context.Context, auth types.BaseGuestAuthentication, prefix, suffix string, path string) (string, error) {
-	req := types.CreateTemporaryFileInGuest{
-		This:          m.Reference(),
-		Vm:            m.vm,
-		Auth:          auth,
-		Prefix:        prefix,
-		Suffix:        suffix,
-		DirectoryPath: path,
-	}
-
-	res, err := methods.CreateTemporaryFileInGuest(ctx, m.c, &req)
-	if err != nil {
-		return "", err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m FileManager) DeleteDirectory(ctx context.Context, auth types.BaseGuestAuthentication, directoryPath string, recursive bool) error {
-	req := types.DeleteDirectoryInGuest{
-		This:          m.Reference(),
-		Vm:            m.vm,
-		Auth:          auth,
-		DirectoryPath: directoryPath,
-		Recursive:     recursive,
-	}
-
-	_, err := methods.DeleteDirectoryInGuest(ctx, m.c, &req)
-	return err
-}
-
-func (m FileManager) DeleteFile(ctx context.Context, auth types.BaseGuestAuthentication, filePath string) error {
-	req := types.DeleteFileInGuest{
-		This:     m.Reference(),
-		Vm:       m.vm,
-		Auth:     auth,
-		FilePath: filePath,
-	}
-
-	_, err := methods.DeleteFileInGuest(ctx, m.c, &req)
-	return err
-}
-
-// TransferURL rewrites the url with a valid hostname and adds the host's thumbprint.
-// The InitiateFileTransfer{From,To}Guest methods return a URL with the host set to "*" when connected directly to ESX,
-// but return the address of VM's runtime host when connected to vCenter.
-func (m FileManager) TransferURL(ctx context.Context, u string) (*url.URL, error) {
-	url, err := m.c.ParseURL(u)
-	if err != nil {
-		return nil, err
-	}
-
-	if !m.c.IsVC() {
-		return url, nil // we already connected to the ESX host and have its thumbprint
-	}
-
-	name := url.Hostname()
-	port := url.Port()
-
-	m.mu.Lock()
-	mname, ok := m.hosts[name]
-	m.mu.Unlock()
-
-	if ok {
-		url.Host = net.JoinHostPort(mname, port)
-		return url, nil
-	}
-
-	c := property.DefaultCollector(m.c)
-
-	var vm mo.VirtualMachine
-	err = c.RetrieveOne(ctx, m.vm, []string{"runtime.host"}, &vm)
-	if err != nil {
-		return nil, err
-	}
-
-	if vm.Runtime.Host == nil {
-		return url, nil // won't matter if the VM was powered off since the call to InitiateFileTransfer
-	}
-
-	props := []string{"summary.config.sslThumbprint", "config.virtualNicManagerInfo.netConfig"}
-
-	var host mo.HostSystem
-	err = c.RetrieveOne(ctx, *vm.Runtime.Host, props, &host)
-	if err != nil {
-		return nil, err
-	}
-
-	kind := string(types.HostVirtualNicManagerNicTypeManagement)
-
-	// prefer an ESX management IP, as the hostname used when adding to VC may not be valid for this client
-	for _, nc := range host.Config.VirtualNicManagerInfo.NetConfig {
-		if len(nc.CandidateVnic) > 0 && nc.NicType == kind {
-			ip := net.ParseIP(nc.CandidateVnic[0].Spec.Ip.IpAddress)
-			if ip != nil {
-				mname = ip.String()
-				m.mu.Lock()
-				m.hosts[name] = mname
-				m.mu.Unlock()
-				name = mname
-				break
-			}
-		}
-	}
-
-	url.Host = net.JoinHostPort(name, port)
-
-	m.c.SetThumbprint(url.Host, host.Summary.Config.SslThumbprint)
-
-	return url, nil
-}
-
-func (m FileManager) InitiateFileTransferFromGuest(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string) (*types.FileTransferInformation, error) {
-	req := types.InitiateFileTransferFromGuest{
-		This:          m.Reference(),
-		Vm:            m.vm,
-		Auth:          auth,
-		GuestFilePath: guestFilePath,
-	}
-
-	res, err := methods.InitiateFileTransferFromGuest(ctx, m.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return &res.Returnval, nil
-}
-
-func (m FileManager) InitiateFileTransferToGuest(ctx context.Context, auth types.BaseGuestAuthentication, guestFilePath string, fileAttributes types.BaseGuestFileAttributes, fileSize int64, overwrite bool) (string, error) {
-	req := types.InitiateFileTransferToGuest{
-		This:           m.Reference(),
-		Vm:             m.vm,
-		Auth:           auth,
-		GuestFilePath:  guestFilePath,
-		FileAttributes: fileAttributes,
-		FileSize:       fileSize,
-		Overwrite:      overwrite,
-	}
-
-	res, err := methods.InitiateFileTransferToGuest(ctx, m.c, &req)
-	if err != nil {
-		return "", err
-	}
-
-	return res.Returnval, nil
-}
-
-func (m FileManager) ListFiles(ctx context.Context, auth types.BaseGuestAuthentication, filePath string, index int32, maxResults int32, matchPattern string) (*types.GuestListFileInfo, error) {
-	req := types.ListFilesInGuest{
-		This:         m.Reference(),
-		Vm:           m.vm,
-		Auth:         auth,
-		FilePath:     filePath,
-		Index:        index,
-		MaxResults:   maxResults,
-		MatchPattern: matchPattern,
-	}
-
-	res, err := methods.ListFilesInGuest(ctx, m.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return &res.Returnval, nil
-}
-
-func (m FileManager) MakeDirectory(ctx context.Context, auth types.BaseGuestAuthentication, directoryPath string, createParentDirectories bool) error {
-	req := types.MakeDirectoryInGuest{
-		This:                    m.Reference(),
-		Vm:                      m.vm,
-		Auth:                    auth,
-		DirectoryPath:           directoryPath,
-		CreateParentDirectories: createParentDirectories,
-	}
-
-	_, err := methods.MakeDirectoryInGuest(ctx, m.c, &req)
-	return err
-}
-
-func (m FileManager) MoveDirectory(ctx context.Context, auth types.BaseGuestAuthentication, srcDirectoryPath string, dstDirectoryPath string) error {
-	req := types.MoveDirectoryInGuest{
-		This:             m.Reference(),
-		Vm:               m.vm,
-		Auth:             auth,
-		SrcDirectoryPath: srcDirectoryPath,
-		DstDirectoryPath: dstDirectoryPath,
-	}
-
-	_, err := methods.MoveDirectoryInGuest(ctx, m.c, &req)
-	return err
-}
-
-func (m FileManager) MoveFile(ctx context.Context, auth types.BaseGuestAuthentication, srcFilePath string, dstFilePath string, overwrite bool) error {
-	req := types.MoveFileInGuest{
-		This:        m.Reference(),
-		Vm:          m.vm,
-		Auth:        auth,
-		SrcFilePath: srcFilePath,
-		DstFilePath: dstFilePath,
-		Overwrite:   overwrite,
-	}
-
-	_, err := methods.MoveFileInGuest(ctx, m.c, &req)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/guest/operations_manager.go b/installer/vendor/github.com/vmware/govmomi/guest/operations_manager.go
deleted file mode 100644
index d02fb4eae0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/guest/operations_manager.go
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-	"sync"
-
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type OperationsManager struct {
-	c  *vim25.Client
-	vm types.ManagedObjectReference
-}
-
-func NewOperationsManager(c *vim25.Client, vm types.ManagedObjectReference) *OperationsManager {
-	return &OperationsManager{c, vm}
-}
-
-func (m OperationsManager) retrieveOne(ctx context.Context, p string, dst *mo.GuestOperationsManager) error {
-	pc := property.DefaultCollector(m.c)
-	return pc.RetrieveOne(ctx, *m.c.ServiceContent.GuestOperationsManager, []string{p}, dst)
-}
-
-func (m OperationsManager) AuthManager(ctx context.Context) (*AuthManager, error) {
-	var g mo.GuestOperationsManager
-
-	err := m.retrieveOne(ctx, "authManager", &g)
-	if err != nil {
-		return nil, err
-	}
-
-	return &AuthManager{*g.AuthManager, m.vm, m.c}, nil
-}
-
-func (m OperationsManager) FileManager(ctx context.Context) (*FileManager, error) {
-	var g mo.GuestOperationsManager
-
-	err := m.retrieveOne(ctx, "fileManager", &g)
-	if err != nil {
-		return nil, err
-	}
-
-	return &FileManager{
-		ManagedObjectReference: *g.FileManager,
-		vm:    m.vm,
-		c:     m.c,
-		mu:    new(sync.Mutex),
-		hosts: make(map[string]string),
-	}, nil
-}
-
-func (m OperationsManager) ProcessManager(ctx context.Context) (*ProcessManager, error) {
-	var g mo.GuestOperationsManager
-
-	err := m.retrieveOne(ctx, "processManager", &g)
-	if err != nil {
-		return nil, err
-	}
-
-	return &ProcessManager{*g.ProcessManager, m.vm, m.c}, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/guest/process_manager.go b/installer/vendor/github.com/vmware/govmomi/guest/process_manager.go
deleted file mode 100644
index 74741a1cce..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/guest/process_manager.go
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package guest
-
-import (
-	"context"
-
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ProcessManager struct {
-	types.ManagedObjectReference
-
-	vm types.ManagedObjectReference
-
-	c *vim25.Client
-}
-
-func (m ProcessManager) Client() *vim25.Client {
-	return m.c
-}
-
-func (m ProcessManager) Reference() types.ManagedObjectReference {
-	return m.ManagedObjectReference
-}
-
-func (m ProcessManager) ListProcesses(ctx context.Context, auth types.BaseGuestAuthentication, pids []int64) ([]types.GuestProcessInfo, error) {
-	req := types.ListProcessesInGuest{
-		This: m.Reference(),
-		Vm:   m.vm,
-		Auth: auth,
-		Pids: pids,
-	}
-
-	res, err := methods.ListProcessesInGuest(ctx, m.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, err
-}
-
-func (m ProcessManager) ReadEnvironmentVariable(ctx context.Context, auth types.BaseGuestAuthentication, names []string) ([]string, error) {
-	req := types.ReadEnvironmentVariableInGuest{
-		This:  m.Reference(),
-		Vm:    m.vm,
-		Auth:  auth,
-		Names: names,
-	}
-
-	res, err := methods.ReadEnvironmentVariableInGuest(ctx, m.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, err
-}
-
-func (m ProcessManager) StartProgram(ctx context.Context, auth types.BaseGuestAuthentication, spec types.BaseGuestProgramSpec) (int64, error) {
-	req := types.StartProgramInGuest{
-		This: m.Reference(),
-		Vm:   m.vm,
-		Auth: auth,
-		Spec: spec,
-	}
-
-	res, err := methods.StartProgramInGuest(ctx, m.c, &req)
-	if err != nil {
-		return 0, err
-	}
-
-	return res.Returnval, err
-}
-
-func (m ProcessManager) TerminateProcess(ctx context.Context, auth types.BaseGuestAuthentication, pid int64) error {
-	req := types.TerminateProcessInGuest{
-		This: m.Reference(),
-		Vm:   m.vm,
-		Auth: auth,
-		Pid:  pid,
-	}
-
-	_, err := methods.TerminateProcessInGuest(ctx, m.c, &req)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/guest/toolbox/client.go b/installer/vendor/github.com/vmware/govmomi/guest/toolbox/client.go
deleted file mode 100644
index 5244e310f3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/guest/toolbox/client.go
+++ /dev/null
@@ -1,345 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
-	"strings"
-
-	"github.com/vmware/govmomi/guest"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Client attempts to expose guest.OperationsManager as idiomatic Go interfaces
-type Client struct {
-	ProcessManager *guest.ProcessManager
-	FileManager    *guest.FileManager
-	Authentication types.BaseGuestAuthentication
-}
-
-// procReader retries InitiateFileTransferFromGuest calls if toolbox is still running the process.
-// See also: ProcessManager.Stat
-func (c *Client) procReader(ctx context.Context, src string) (*types.FileTransferInformation, error) {
-	for {
-		info, err := c.FileManager.InitiateFileTransferFromGuest(ctx, c.Authentication, src)
-		if err != nil {
-			if soap.IsSoapFault(err) {
-				if _, ok := soap.ToSoapFault(err).VimFault().(types.CannotAccessFile); ok {
-					// We're not waiting in between retries since ProcessManager.Stat
-					// has already waited.  In the case that this client was pointed at
-					// standard vmware-tools, the types.NotFound fault would have been
-					// returned since the file "/proc/$pid/stdout" does not exist - in
-					// which case, we won't retry at all.
-					continue
-				}
-			}
-
-			return nil, err
-		}
-
-		return info, err
-	}
-}
-
-// RoundTrip implements http.RoundTripper over vmx guest RPC.
-// This transport depends on govmomi/toolbox running in the VM guest and does not work with standard VMware tools.
-// Using this transport makes it is possible to connect to HTTP endpoints that are bound to the VM's loopback address.
-// Note that the toolbox's http.RoundTripper only supports the "http" scheme, "https" is not supported.
-func (c *Client) RoundTrip(req *http.Request) (*http.Response, error) {
-	if req.URL.Scheme != "http" {
-		return nil, fmt.Errorf("%q scheme not supported", req.URL.Scheme)
-	}
-
-	ctx := req.Context()
-
-	req.Header.Set("Connection", "close") // we need the server to close the connection after 1 request
-
-	spec := types.GuestProgramSpec{
-		ProgramPath: "http.RoundTrip",
-		Arguments:   req.URL.Host,
-	}
-
-	pid, err := c.ProcessManager.StartProgram(ctx, c.Authentication, &spec)
-	if err != nil {
-		return nil, err
-	}
-
-	dst := fmt.Sprintf("/proc/%d/stdin", pid)
-	src := fmt.Sprintf("/proc/%d/stdout", pid)
-
-	var buf bytes.Buffer
-	err = req.Write(&buf)
-	if err != nil {
-		return nil, err
-	}
-
-	attr := new(types.GuestPosixFileAttributes)
-	size := int64(buf.Len())
-
-	url, err := c.FileManager.InitiateFileTransferToGuest(ctx, c.Authentication, dst, attr, size, true)
-	if err != nil {
-		return nil, err
-	}
-
-	vc := c.ProcessManager.Client()
-
-	u, err := c.FileManager.TransferURL(ctx, url)
-	if err != nil {
-		return nil, err
-	}
-
-	p := soap.DefaultUpload
-	p.ContentLength = size
-
-	err = vc.Client.Upload(&buf, u, &p)
-	if err != nil {
-		return nil, err
-	}
-
-	info, err := c.procReader(ctx, src)
-	if err != nil {
-		return nil, err
-	}
-
-	u, err = c.FileManager.TransferURL(ctx, info.Url)
-	if err != nil {
-		return nil, err
-	}
-
-	f, _, err := vc.Client.Download(u, &soap.DefaultDownload)
-	if err != nil {
-		return nil, err
-	}
-
-	return http.ReadResponse(bufio.NewReader(f), req)
-}
-
-// Run implements exec.Cmd.Run over vmx guest RPC.
-func (c *Client) Run(ctx context.Context, cmd *exec.Cmd) error {
-	vc := c.ProcessManager.Client()
-
-	spec := types.GuestProgramSpec{
-		ProgramPath:      cmd.Path,
-		Arguments:        strings.Join(cmd.Args, " "),
-		EnvVariables:     cmd.Env,
-		WorkingDirectory: cmd.Dir,
-	}
-
-	pid, serr := c.ProcessManager.StartProgram(ctx, c.Authentication, &spec)
-	if serr != nil {
-		return serr
-	}
-
-	if cmd.Stdin != nil {
-		dst := fmt.Sprintf("/proc/%d/stdin", pid)
-
-		var buf bytes.Buffer
-		size, err := io.Copy(&buf, cmd.Stdin)
-		if err != nil {
-			return err
-		}
-
-		attr := new(types.GuestPosixFileAttributes)
-
-		url, err := c.FileManager.InitiateFileTransferToGuest(ctx, c.Authentication, dst, attr, size, true)
-		if err != nil {
-			return err
-		}
-
-		u, err := c.FileManager.TransferURL(ctx, url)
-		if err != nil {
-			return err
-		}
-
-		p := soap.DefaultUpload
-		p.ContentLength = size
-
-		err = vc.Client.Upload(&buf, u, &p)
-		if err != nil {
-			return err
-		}
-	}
-
-	names := []string{"out", "err"}
-
-	for i, w := range []io.Writer{cmd.Stdout, cmd.Stderr} {
-		if w == nil {
-			continue
-		}
-
-		src := fmt.Sprintf("/proc/%d/std%s", pid, names[i])
-
-		info, err := c.procReader(ctx, src)
-		if err != nil {
-			return err
-		}
-
-		u, err := c.FileManager.TransferURL(ctx, info.Url)
-		if err != nil {
-			return err
-		}
-
-		f, _, err := vc.Client.Download(u, &soap.DefaultDownload)
-		if err != nil {
-			return err
-		}
-
-		_, err = io.Copy(w, f)
-		_ = f.Close()
-		if err != nil {
-			return err
-		}
-	}
-
-	procs, err := c.ProcessManager.ListProcesses(ctx, c.Authentication, []int64{pid})
-	if err != nil {
-		return err
-	}
-
-	if len(procs) == 1 {
-		rc := procs[0].ExitCode
-		if rc != 0 {
-			return fmt.Errorf("%s: exit %d", cmd.Path, rc)
-		}
-	}
-
-	return nil
-}
-
-// archiveReader wraps an io.ReadCloser to support streaming download
-// of a guest directory, stops reading once it sees the stream trailer.
-// This is only useful when guest tools is the Go toolbox.
-// The trailer is required since TransferFromGuest requires a Content-Length,
-// which toolbox doesn't know ahead of time as the gzip'd tarball never touches the disk.
-// We opted to wrap this here for now rather than guest.FileManager so
-// DownloadFile can be also be used as-is to handle this use case.
-type archiveReader struct {
-	io.ReadCloser
-}
-
-var (
-	gzipHeader    = []byte{0x1f, 0x8b, 0x08} // rfc1952 {ID1, ID2, CM}
-	gzipHeaderLen = len(gzipHeader)
-)
-
-func (r *archiveReader) Read(buf []byte) (int, error) {
-	nr, err := r.ReadCloser.Read(buf)
-
-	// Stop reading if the last N bytes are the gzipTrailer
-	if nr >= gzipHeaderLen {
-		if bytes.Equal(buf[nr-gzipHeaderLen:nr], gzipHeader) {
-			nr -= gzipHeaderLen
-			err = io.EOF
-		}
-	}
-
-	return nr, err
-}
-
-func isDir(src string) bool {
-	u, err := url.Parse(src)
-	if err != nil {
-		return false
-	}
-
-	return strings.HasSuffix(u.Path, "/")
-}
-
-// Download initiates a file transfer from the guest
-func (c *Client) Download(ctx context.Context, src string) (io.ReadCloser, int64, error) {
-	vc := c.ProcessManager.Client()
-
-	info, err := c.FileManager.InitiateFileTransferFromGuest(ctx, c.Authentication, src)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	u, err := c.FileManager.TransferURL(ctx, info.Url)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	p := soap.DefaultDownload
-
-	f, n, err := vc.Download(u, &p)
-	if err != nil {
-		return nil, n, err
-	}
-
-	if strings.HasPrefix(src, "/archive:/") || isDir(src) {
-		f = &archiveReader{ReadCloser: f} // look for the gzip trailer
-	}
-
-	return f, n, nil
-}
-
-// Upload transfers a file to the guest
-func (c *Client) Upload(ctx context.Context, src io.Reader, dst string, p soap.Upload, attr types.BaseGuestFileAttributes, force bool) error {
-	vc := c.ProcessManager.Client()
-
-	var err error
-
-	if p.ContentLength == 0 { // Content-Length is required
-		switch r := src.(type) {
-		case *bytes.Buffer:
-			p.ContentLength = int64(r.Len())
-		case *bytes.Reader:
-			p.ContentLength = int64(r.Len())
-		case *strings.Reader:
-			p.ContentLength = int64(r.Len())
-		case *os.File:
-			info, serr := r.Stat()
-			if serr != nil {
-				return serr
-			}
-
-			p.ContentLength = info.Size()
-		}
-
-		if p.ContentLength == 0 { // os.File for example could be a device (stdin)
-			buf := new(bytes.Buffer)
-
-			p.ContentLength, err = io.Copy(buf, src)
-			if err != nil {
-				return err
-			}
-
-			src = buf
-		}
-	}
-
-	url, err := c.FileManager.InitiateFileTransferToGuest(ctx, c.Authentication, dst, attr, p.ContentLength, force)
-	if err != nil {
-		return err
-	}
-
-	u, err := c.FileManager.TransferURL(ctx, url)
-	if err != nil {
-		return err
-	}
-
-	return vc.Client.Upload(src, u, &p)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/list/path_test.go b/installer/vendor/github.com/vmware/govmomi/list/path_test.go
deleted file mode 100644
index 8cb73c3844..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/list/path_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package list
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestToParts(t *testing.T) {
-	tests := []struct {
-		In  string
-		Out []string
-	}{
-		{
-			In:  "/",
-			Out: []string{},
-		},
-		{
-			In:  "/foo",
-			Out: []string{"foo"},
-		},
-		{
-			In:  "/foo/..",
-			Out: []string{},
-		},
-		{
-			In:  "/./foo",
-			Out: []string{"foo"},
-		},
-		{
-			In:  "/../foo",
-			Out: []string{"foo"},
-		},
-		{
-			In:  "/foo/bar",
-			Out: []string{"foo", "bar"},
-		},
-		{
-			In:  "/foo/bar/..",
-			Out: []string{"foo"},
-		},
-		{
-			In:  "",
-			Out: []string{"."},
-		},
-		{
-			In:  ".",
-			Out: []string{"."},
-		},
-		{
-			In:  "foo",
-			Out: []string{".", "foo"},
-		},
-		{
-			In:  "foo/..",
-			Out: []string{"."},
-		},
-		{
-			In:  "./foo",
-			Out: []string{".", "foo"},
-		},
-		{
-			In:  "../foo", // Special case...
-			Out: []string{"..", "foo"},
-		},
-		{
-			In:  "foo/bar/..",
-			Out: []string{".", "foo"},
-		},
-	}
-
-	for _, test := range tests {
-		out := ToParts(test.In)
-		if !reflect.DeepEqual(test.Out, out) {
-			t.Errorf("Expected %s to return: %#v, actual: %#v", test.In, test.Out, out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/nfc/lease.go b/installer/vendor/github.com/vmware/govmomi/nfc/lease.go
index 393c648353..3fb85ee6f6 100644
--- a/installer/vendor/github.com/vmware/govmomi/nfc/lease.go
+++ b/installer/vendor/github.com/vmware/govmomi/nfc/lease.go
@@ -224,7 +224,7 @@ func (l *Lease) Upload(ctx context.Context, item FileItem, f io.Reader, opts soa
 		opts.Type = "application/x-vnd.vmware-streamVmdk"
 	}
 
-	return l.c.Upload(f, item.URL, &opts)
+	return l.c.Upload(ctx, f, item.URL, &opts)
 }
 
 func (l *Lease) DownloadFile(ctx context.Context, file string, item FileItem, opts soap.Download) error {
@@ -234,5 +234,5 @@ func (l *Lease) DownloadFile(ctx context.Context, file string, item FileItem, op
 		opts.Progress = progress.Tee(item, opts.Progress)
 	}
 
-	return l.c.DownloadFile(file, item.URL, &opts)
+	return l.c.DownloadFile(ctx, file, item.URL, &opts)
 }
diff --git a/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go b/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
index 225f41b6d1..c9fe3aa035 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource.go
@@ -21,6 +21,7 @@ import (
 
 	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 )
 
@@ -34,19 +35,15 @@ func NewClusterComputeResource(c *vim25.Client, ref types.ManagedObjectReference
 	}
 }
 
-func (c ClusterComputeResource) ReconfigureCluster(ctx context.Context, spec types.ClusterConfigSpec) (*Task, error) {
-	req := types.ReconfigureCluster_Task{
-		This:   c.Reference(),
-		Spec:   spec,
-		Modify: true,
-	}
+func (c ClusterComputeResource) Configuration(ctx context.Context) (*types.ClusterConfigInfoEx, error) {
+	var obj mo.ClusterComputeResource
 
-	res, err := methods.ReconfigureCluster_Task(ctx, c.c, &req)
+	err := c.Properties(ctx, c.Reference(), []string{"configurationEx"}, &obj)
 	if err != nil {
 		return nil, err
 	}
 
-	return NewTask(c.c, res.Returnval), nil
+	return obj.ConfigurationEx.(*types.ClusterConfigInfoEx), nil
 }
 
 func (c ClusterComputeResource) AddHost(ctx context.Context, spec types.HostConnectSpec, asConnected bool, license *string, resourcePool *types.ManagedObjectReference) (*Task, error) {
@@ -71,16 +68,3 @@ func (c ClusterComputeResource) AddHost(ctx context.Context, spec types.HostConn
 
 	return NewTask(c.c, res.Returnval), nil
 }
-
-func (c ClusterComputeResource) Destroy(ctx context.Context) (*Task, error) {
-	req := types.Destroy_Task{
-		This: c.Reference(),
-	}
-
-	res, err := methods.Destroy_Task(ctx, c.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewTask(c.c, res.Returnval), nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource_test.go b/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource_test.go
deleted file mode 100644
index 684f4a6715..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/cluster_compute_resource_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// ComputeResource should implement the Reference interface.
-var _ Reference = ClusterComputeResource{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/common.go b/installer/vendor/github.com/vmware/govmomi/object/common.go
index 8f0a94ff68..dfeee4a365 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/common.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/common.go
@@ -85,7 +85,19 @@ func (c Common) ObjectName(ctx context.Context) (string, error) {
 		return "", err
 	}
 
-	return o.Name, nil
+	if o.Name != "" {
+		return o.Name, nil
+	}
+
+	// Network has its own "name" field...
+	var n mo.Network
+
+	err = c.Properties(ctx, c.Reference(), []string{"name"}, &n)
+	if err != nil {
+		return "", err
+	}
+
+	return n.Name, nil
 }
 
 func (c Common) Properties(ctx context.Context, r types.ManagedObjectReference, ps []string, dst interface{}) error {
diff --git a/installer/vendor/github.com/vmware/govmomi/object/common_test.go b/installer/vendor/github.com/vmware/govmomi/object/common_test.go
deleted file mode 100644
index 6b7d0749dc..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/common_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import "testing"
-
-func TestCommonName(t *testing.T) {
-	c := &Common{}
-
-	name := c.Name()
-	if name != "" {
-		t.Errorf("Name=%s", name)
-	}
-
-	c.InventoryPath = "/foo/bar"
-	name = c.Name()
-	if name != "bar" {
-		t.Errorf("Name=%s", name)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/compute_resource.go b/installer/vendor/github.com/vmware/govmomi/object/compute_resource.go
index ac1c73019f..7645fddaf3 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/compute_resource.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/compute_resource.go
@@ -109,16 +109,3 @@ func (c ComputeResource) Reconfigure(ctx context.Context, spec types.BaseCompute
 
 	return NewTask(c.c, res.Returnval), nil
 }
-
-func (c ComputeResource) Destroy(ctx context.Context) (*Task, error) {
-	req := types.Destroy_Task{
-		This: c.Reference(),
-	}
-
-	res, err := methods.Destroy_Task(ctx, c.c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewTask(c.c, res.Returnval), nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/compute_resource_test.go b/installer/vendor/github.com/vmware/govmomi/object/compute_resource_test.go
deleted file mode 100644
index 0f29d58e9d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/compute_resource_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// ComputeResource should implement the Reference interface.
-var _ Reference = ComputeResource{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datacenter.go b/installer/vendor/github.com/vmware/govmomi/object/datacenter.go
index adddc5ffa5..41fa352657 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/datacenter.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/datacenter.go
@@ -88,3 +88,42 @@ func (d Datacenter) Destroy(ctx context.Context) (*Task, error) {
 
 	return NewTask(d.c, res.Returnval), nil
 }
+
+// PowerOnVM powers on multiple virtual machines with a single vCenter call.
+// If called against ESX, serially powers on the list of VMs and the returned *Task will always be nil.
+func (d Datacenter) PowerOnVM(ctx context.Context, vm []types.ManagedObjectReference, option ...types.BaseOptionValue) (*Task, error) {
+	if d.Client().IsVC() {
+		req := types.PowerOnMultiVM_Task{
+			This:   d.Reference(),
+			Vm:     vm,
+			Option: option,
+		}
+
+		res, err := methods.PowerOnMultiVM_Task(ctx, d.c, &req)
+		if err != nil {
+			return nil, err
+		}
+
+		return NewTask(d.c, res.Returnval), nil
+	}
+
+	for _, ref := range vm {
+		obj := NewVirtualMachine(d.Client(), ref)
+		task, err := obj.PowerOn(ctx)
+		if err != nil {
+			return nil, err
+		}
+
+		err = task.Wait(ctx)
+		if err != nil {
+			// Ignore any InvalidPowerState fault, as it indicates the VM is already powered on
+			if f, ok := err.(types.HasFault); ok {
+				if _, ok = f.Fault().(*types.InvalidPowerState); !ok {
+					return nil, err
+				}
+			}
+		}
+	}
+
+	return nil, nil
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datacenter_test.go b/installer/vendor/github.com/vmware/govmomi/object/datacenter_test.go
deleted file mode 100644
index 1eb4105767..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/datacenter_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// Datacenter should implement the Reference interface.
-var _ Reference = Datacenter{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datastore.go b/installer/vendor/github.com/vmware/govmomi/object/datastore.go
index fc696cdf21..dfe6603aa5 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/datastore.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/datastore.go
@@ -284,7 +284,7 @@ func (d Datastore) Upload(ctx context.Context, f io.Reader, path string, param *
 	if err != nil {
 		return err
 	}
-	return d.Client().Upload(f, u, p)
+	return d.Client().Upload(ctx, f, u, p)
 }
 
 // UploadFile via soap.Upload with an http service ticket
@@ -293,7 +293,7 @@ func (d Datastore) UploadFile(ctx context.Context, file string, path string, par
 	if err != nil {
 		return err
 	}
-	return d.Client().UploadFile(file, u, p)
+	return d.Client().UploadFile(ctx, file, u, p)
 }
 
 // Download via soap.Download with an http service ticket
@@ -302,7 +302,7 @@ func (d Datastore) Download(ctx context.Context, path string, param *soap.Downlo
 	if err != nil {
 		return nil, 0, err
 	}
-	return d.Client().Download(u, p)
+	return d.Client().Download(ctx, u, p)
 }
 
 // DownloadFile via soap.Download with an http service ticket
@@ -311,7 +311,7 @@ func (d Datastore) DownloadFile(ctx context.Context, path string, file string, p
 	if err != nil {
 		return err
 	}
-	return d.Client().DownloadFile(file, u, p)
+	return d.Client().DownloadFile(ctx, file, u, p)
 }
 
 // AttachedHosts returns hosts that have this Datastore attached, accessible and writable.
@@ -406,12 +406,9 @@ func (d Datastore) Stat(ctx context.Context, file string) (types.BaseFileInfo, e
 
 	info, err := task.WaitForResult(ctx, nil)
 	if err != nil {
-		if info == nil || info.Error != nil {
-			_, ok := info.Error.Fault.(*types.FileNotFound)
-			if ok {
-				// FileNotFound means the base path doesn't exist.
-				return nil, DatastoreNoSuchDirectoryError{"stat", dsPath}
-			}
+		if types.IsFileNotFound(err) {
+			// FileNotFound means the base path doesn't exist.
+			return nil, DatastoreNoSuchDirectoryError{"stat", dsPath}
 		}
 
 		return nil, err
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datastore_file.go b/installer/vendor/github.com/vmware/govmomi/object/datastore_file.go
index a73990f12c..bc010fc36e 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/datastore_file.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/datastore_file.go
@@ -172,7 +172,7 @@ func (f *DatastoreFile) Stat() (os.FileInfo, error) {
 		return nil, err
 	}
 
-	res, err := f.d.Client().DownloadRequest(u, p)
+	res, err := f.d.Client().DownloadRequest(f.ctx, u, p)
 	if err != nil {
 		return nil, err
 	}
@@ -202,7 +202,7 @@ func (f *DatastoreFile) get() (io.Reader, error) {
 		}
 	}
 
-	res, err := f.d.Client().DownloadRequest(u, p)
+	res, err := f.d.Client().DownloadRequest(f.ctx, u, p)
 	if err != nil {
 		return nil, err
 	}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go b/installer/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go
index e484368060..a6e29c2c56 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/datastore_file_manager.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2017-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -26,6 +26,7 @@ import (
 	"path"
 	"strings"
 
+	"github.com/vmware/govmomi/vim25/progress"
 	"github.com/vmware/govmomi/vim25/soap"
 )
 
@@ -36,7 +37,8 @@ type DatastoreFileManager struct {
 	FileManager        *FileManager
 	VirtualDiskManager *VirtualDiskManager
 
-	Force bool
+	Force            bool
+	DatacenterTarget *Datacenter
 }
 
 // NewFileManager creates a new instance of DatastoreFileManager
@@ -49,11 +51,25 @@ func (d Datastore) NewFileManager(dc *Datacenter, force bool) *DatastoreFileMana
 		FileManager:        NewFileManager(c),
 		VirtualDiskManager: NewVirtualDiskManager(c),
 		Force:              force,
+		DatacenterTarget:   dc,
 	}
 
 	return m
 }
 
+func (m *DatastoreFileManager) WithProgress(ctx context.Context, s progress.Sinker) context.Context {
+	return context.WithValue(ctx, m, s)
+}
+
+func (m *DatastoreFileManager) wait(ctx context.Context, task *Task) error {
+	var logger progress.Sinker
+	if s, ok := ctx.Value(m).(progress.Sinker); ok {
+		logger = s
+	}
+	_, err := task.WaitForResult(ctx, logger)
+	return err
+}
+
 // Delete dispatches to the appropriate Delete method based on file name extension
 func (m *DatastoreFileManager) Delete(ctx context.Context, name string) error {
 	switch path.Ext(name) {
@@ -73,7 +89,7 @@ func (m *DatastoreFileManager) DeleteFile(ctx context.Context, name string) erro
 		return err
 	}
 
-	return task.Wait(ctx)
+	return m.wait(ctx, task)
 }
 
 // DeleteVirtualDisk calls VirtualDiskManager.DeleteVirtualDisk
@@ -94,10 +110,58 @@ func (m *DatastoreFileManager) DeleteVirtualDisk(ctx context.Context, name strin
 		return err
 	}
 
-	return task.Wait(ctx)
+	return m.wait(ctx, task)
+}
+
+// CopyFile calls FileManager.CopyDatastoreFile
+func (m *DatastoreFileManager) CopyFile(ctx context.Context, src string, dst string) error {
+	srcp := m.Path(src)
+	dstp := m.Path(dst)
+
+	task, err := m.FileManager.CopyDatastoreFile(ctx, srcp.String(), m.Datacenter, dstp.String(), m.DatacenterTarget, m.Force)
+	if err != nil {
+		return err
+	}
+
+	return m.wait(ctx, task)
+}
+
+// Copy dispatches to the appropriate FileManager or VirtualDiskManager Copy method based on file name extension
+func (m *DatastoreFileManager) Copy(ctx context.Context, src string, dst string) error {
+	srcp := m.Path(src)
+	dstp := m.Path(dst)
+
+	f := m.FileManager.CopyDatastoreFile
+
+	if srcp.IsVMDK() {
+		// types.VirtualDiskSpec=nil as it is not implemented by vCenter
+		f = func(ctx context.Context, src string, srcDC *Datacenter, dst string, dstDC *Datacenter, force bool) (*Task, error) {
+			return m.VirtualDiskManager.CopyVirtualDisk(ctx, src, srcDC, dst, dstDC, nil, force)
+		}
+	}
+
+	task, err := f(ctx, srcp.String(), m.Datacenter, dstp.String(), m.DatacenterTarget, m.Force)
+	if err != nil {
+		return err
+	}
+
+	return m.wait(ctx, task)
+}
+
+// MoveFile calls FileManager.MoveDatastoreFile
+func (m *DatastoreFileManager) MoveFile(ctx context.Context, src string, dst string) error {
+	srcp := m.Path(src)
+	dstp := m.Path(dst)
+
+	task, err := m.FileManager.MoveDatastoreFile(ctx, srcp.String(), m.Datacenter, dstp.String(), m.DatacenterTarget, m.Force)
+	if err != nil {
+		return err
+	}
+
+	return m.wait(ctx, task)
 }
 
-// Move dispatches to the appropriate Move method based on file name extension
+// Move dispatches to the appropriate FileManager or VirtualDiskManager Move method based on file name extension
 func (m *DatastoreFileManager) Move(ctx context.Context, src string, dst string) error {
 	srcp := m.Path(src)
 	dstp := m.Path(dst)
@@ -108,12 +172,12 @@ func (m *DatastoreFileManager) Move(ctx context.Context, src string, dst string)
 		f = m.VirtualDiskManager.MoveVirtualDisk
 	}
 
-	task, err := f(ctx, srcp.String(), m.Datacenter, dstp.String(), m.Datacenter, m.Force)
+	task, err := f(ctx, srcp.String(), m.Datacenter, dstp.String(), m.DatacenterTarget, m.Force)
 	if err != nil {
 		return err
 	}
 
-	return task.Wait(ctx)
+	return m.wait(ctx, task)
 }
 
 // Path converts path name to a DatastorePath
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datastore_path_test.go b/installer/vendor/github.com/vmware/govmomi/object/datastore_path_test.go
deleted file mode 100644
index ba85f74b2d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/datastore_path_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import "testing"
-
-func TestParseDatastorePath(t *testing.T) {
-	tests := []struct {
-		dsPath string
-		dsFile string
-		fail   bool
-	}{
-		{"", "", true},
-		{"x", "", true},
-		{"[", "", true},
-		{"[nope", "", true},
-		{"[te st]", "", false},
-		{"[te st] foo", "foo", false},
-		{"[te st] foo/foo.vmx", "foo/foo.vmx", false},
-		{"[te st]foo bar/foo bar.vmx", "foo bar/foo bar.vmx", false},
-		{" [te st]     bar/bar.vmx  ", "bar/bar.vmx", false},
-	}
-
-	for _, test := range tests {
-		p := new(DatastorePath)
-		ok := p.FromString(test.dsPath)
-
-		if test.fail {
-			if ok {
-				t.Errorf("expected error for: %s", test.dsPath)
-			}
-		} else {
-			if !ok {
-				t.Errorf("failed to parse: %q", test.dsPath)
-			} else {
-				if test.dsFile != p.Path {
-					t.Errorf("dsFile=%s", p.Path)
-				}
-				if p.Datastore != "te st" {
-					t.Errorf("ds=%s", p.Datastore)
-				}
-			}
-		}
-	}
-
-	s := "[datastore1] foo/bar.vmdk"
-	p := new(DatastorePath)
-	ok := p.FromString(s)
-	if !ok {
-		t.Fatal(s)
-	}
-
-	if p.String() != s {
-		t.Fatal(p.String())
-	}
-
-	p.Path = ""
-
-	if p.String() != "[datastore1]" {
-		t.Fatal(p.String())
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/datastore_test.go b/installer/vendor/github.com/vmware/govmomi/object/datastore_test.go
deleted file mode 100644
index 5b4f790fff..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/datastore_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// Datastore should implement the Reference interface.
-var _ Reference = Datastore{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go b/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go
deleted file mode 100644
index fcbbab26e9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_portgroup_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// DistributedVirtualPortgroup should implement the Reference interface.
-var _ Reference = DistributedVirtualPortgroup{}
-
-// DistributedVirtualPortgroup should implement the NetworkReference interface.
-var _ NetworkReference = DistributedVirtualPortgroup{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go b/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go
index 7a41258799..526ce4bf78 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/distributed_virtual_switch.go
@@ -66,9 +66,10 @@ func (s DistributedVirtualSwitch) AddPortgroup(ctx context.Context, spec []types
 	return NewTask(s.Client(), res.Returnval), nil
 }
 
-func (s DistributedVirtualSwitch) FetchDVPorts(ctx context.Context) ([]types.DistributedVirtualPort, error) {
+func (s DistributedVirtualSwitch) FetchDVPorts(ctx context.Context, criteria *types.DistributedVirtualSwitchPortCriteria) ([]types.DistributedVirtualPort, error) {
 	req := &types.FetchDVPorts{
-		This: s.Reference(),
+		This:     s.Reference(),
+		Criteria: criteria,
 	}
 
 	res, err := methods.FetchDVPorts(ctx, s.Client(), req)
diff --git a/installer/vendor/github.com/vmware/govmomi/object/folder_test.go b/installer/vendor/github.com/vmware/govmomi/object/folder_test.go
deleted file mode 100644
index 4423961f74..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/folder_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// Folder should implement the Reference interface.
-var _ Reference = Folder{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go b/installer/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go
deleted file mode 100644
index 23a1feb442..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/host_certificate_info_test.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright (c) 2016 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import "testing"
-
-func TestHostCertificateManagerCertificateInfo(t *testing.T) {
-	subject := "emailAddress=vmca@vmware.com,CN=w2-xlr8-autoroot-esx004.eng.vmware.com,OU=VMware Engineering,O=VMware,L=Palo Alto,ST=California,C=US"
-
-	var info HostCertificateInfo
-	name := info.toName(subject)
-	s := info.fromName(name)
-	if subject != s {
-		t.Errorf("%s != %s", s, subject)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/host_storage_system.go b/installer/vendor/github.com/vmware/govmomi/object/host_storage_system.go
index 6785eecdcd..5990a1d4e6 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/host_storage_system.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/host_storage_system.go
@@ -97,6 +97,15 @@ func (s HostStorageSystem) Refresh(ctx context.Context) error {
 	return err
 }
 
+func (s HostStorageSystem) RescanVmfs(ctx context.Context) error {
+	req := types.RescanVmfs{
+		This: s.Reference(),
+	}
+
+	_, err := methods.RescanVmfs(ctx, s.c, &req)
+	return err
+}
+
 func (s HostStorageSystem) MarkAsSsd(ctx context.Context, uuid string) (*Task, error) {
 	req := types.MarkAsSsd_Task{
 		This:         s.Reference(),
@@ -152,3 +161,14 @@ func (s HostStorageSystem) MarkAsNonLocal(ctx context.Context, uuid string) (*Ta
 
 	return NewTask(s.c, res.Returnval), nil
 }
+
+func (s HostStorageSystem) AttachScsiLun(ctx context.Context, uuid string) error {
+	req := types.AttachScsiLun{
+		This:    s.Reference(),
+		LunUuid: uuid,
+	}
+
+	_, err := methods.AttachScsiLun(ctx, s.c, &req)
+
+	return err
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/network_test.go b/installer/vendor/github.com/vmware/govmomi/object/network_test.go
deleted file mode 100644
index e957615452..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/network_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-// Network should implement the Reference interface.
-var _ Reference = Network{}
-
-// Network should implement the NetworkReference interface.
-var _ NetworkReference = Network{}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/search_index_test.go b/installer/vendor/github.com/vmware/govmomi/object/search_index_test.go
deleted file mode 100644
index 9860f9f4db..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/search_index_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/test"
-	"github.com/vmware/govmomi/vim25/mo"
-)
-
-func TestSearch(t *testing.T) {
-	c := test.NewAuthenticatedClient(t)
-	s := NewSearchIndex(c)
-
-	ref, err := s.FindChild(context.Background(), NewRootFolder(c), "ha-datacenter")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dc, ok := ref.(*Datacenter)
-	if !ok {
-		t.Errorf("Expected Datacenter: %#v", ref)
-	}
-
-	folders, err := dc.Folders(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ref, err = s.FindChild(context.Background(), folders.DatastoreFolder, "datastore1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, ok = ref.(*Datastore)
-	if !ok {
-		t.Errorf("Expected Datastore: %#v", ref)
-	}
-
-	ref, err = s.FindByInventoryPath(context.Background(), "/ha-datacenter/network/VM Network")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, ok = ref.(*Network)
-	if !ok {
-		t.Errorf("Expected Network: %#v", ref)
-	}
-
-	crs, err := folders.HostFolder.Children(context.Background())
-	if err != nil {
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-	if len(crs) != 0 {
-		var cr mo.ComputeResource
-		ref = crs[0]
-		err = s.Properties(context.Background(), ref.Reference(), []string{"host"}, &cr)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		var host mo.HostSystem
-		ref = NewHostSystem(c, cr.Host[0])
-		err = s.Properties(context.Background(), ref.Reference(), []string{"name", "hardware", "config"}, &host)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		dnsConfig := host.Config.Network.DnsConfig.GetHostDnsConfig()
-		dnsName := fmt.Sprintf("%s.%s", dnsConfig.HostName, dnsConfig.DomainName)
-		shost, err := s.FindByDnsName(context.Background(), dc, dnsName, false)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(ref, shost) {
-			t.Errorf("%#v != %#v\n", ref, shost)
-		}
-
-		shost, err = s.FindByUuid(context.Background(), dc, host.Hardware.SystemInfo.Uuid, false, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(ref, shost) {
-			t.Errorf("%#v != %#v\n", ref, shost)
-		}
-	}
-
-	vms, err := folders.VmFolder.Children(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(vms) != 0 {
-		var vm mo.VirtualMachine
-		ref = vms[0]
-		err = s.Properties(context.Background(), ref.Reference(), []string{"config", "guest"}, &vm)
-		if err != nil {
-			t.Fatal(err)
-		}
-		svm, err := s.FindByDatastorePath(context.Background(), dc, vm.Config.Files.VmPathName)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(ref, svm) {
-			t.Errorf("%#v != %#v\n", ref, svm)
-		}
-
-		svm, err = s.FindByUuid(context.Background(), dc, vm.Config.Uuid, true, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if !reflect.DeepEqual(ref, svm) {
-			t.Errorf("%#v != %#v\n", ref, svm)
-		}
-
-		if vm.Guest.HostName != "" {
-			svm, err := s.FindByDnsName(context.Background(), dc, vm.Guest.HostName, true)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !reflect.DeepEqual(ref, svm) {
-				t.Errorf("%#v != %#v\n", ref, svm)
-			}
-		}
-
-		if vm.Guest.IpAddress != "" {
-			svm, err := s.FindByIp(context.Background(), dc, vm.Guest.IpAddress, true)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if !reflect.DeepEqual(ref, svm) {
-				t.Errorf("%#v != %#v\n", ref, svm)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/types.go b/installer/vendor/github.com/vmware/govmomi/object/types.go
index aefb611fde..4eb8d1b8bb 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/types.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/types.go
@@ -47,8 +47,10 @@ func NewReference(c *vim25.Client, e types.ManagedObjectReference) Reference {
 		return NewClusterComputeResource(c, e)
 	case "HostSystem":
 		return NewHostSystem(c, e)
-	case "Network", "OpaqueNetwork":
+	case "Network":
 		return NewNetwork(c, e)
+	case "OpaqueNetwork":
+		return NewOpaqueNetwork(c, e)
 	case "ResourcePool":
 		return NewResourcePool(c, e)
 	case "DistributedVirtualSwitch":
diff --git a/installer/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go b/installer/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go
deleted file mode 100644
index 38197d4592..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/virtual_device_list_test.go
+++ /dev/null
@@ -1,877 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"math/rand"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func intPtrValue(val int32) *int32 {
-	return &val
-}
-
-var devices = VirtualDeviceList([]types.BaseVirtualDevice{
-	&types.VirtualIDEController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         200,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "IDE 0",
-					Summary:     "IDE 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    intPtrValue(0),
-			},
-			BusNumber: 0,
-			Device:    []int32{3001, 3000},
-		},
-	},
-	&types.VirtualIDEController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         201,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "IDE 1",
-					Summary:     "IDE 1",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    intPtrValue(0),
-			},
-			BusNumber: 1,
-			Device:    []int32{3002},
-		},
-	},
-	&types.VirtualPS2Controller{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         300,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "PS2 controller 0",
-					Summary:     "PS2 controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    intPtrValue(0),
-			},
-			BusNumber: 0,
-			Device:    []int32{600, 700},
-		},
-	},
-	&types.VirtualPCIController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         100,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "PCI controller 0",
-					Summary:     "PCI controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    intPtrValue(0),
-			},
-			BusNumber: 0,
-			Device:    []int32{500, 12000, 1000, 4000},
-		},
-	},
-	&types.VirtualSIOController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         400,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "SIO controller 0",
-					Summary:     "SIO controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    intPtrValue(0),
-			},
-			BusNumber: 0,
-			Device:    []int32{9000},
-		},
-	},
-	&types.VirtualKeyboard{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         600,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Keyboard ",
-				Summary:     "Keyboard",
-			},
-			Backing:       nil,
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 300,
-			UnitNumber:    intPtrValue(0),
-		},
-	},
-	&types.VirtualPointingDevice{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         700,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Pointing device",
-				Summary:     "Pointing device; Device",
-			},
-			Backing: &types.VirtualPointingDeviceDeviceBackingInfo{
-				VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{},
-				HostPointingDevice:             "autodetect",
-			},
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 300,
-			UnitNumber:    intPtrValue(1),
-		},
-	},
-	&types.VirtualMachineVideoCard{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         500,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Video card ",
-				Summary:     "Video card",
-			},
-			Backing:       nil,
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 100,
-			UnitNumber:    intPtrValue(0),
-		},
-		VideoRamSizeInKB: 4096,
-		NumDisplays:      1,
-		UseAutoDetect:    types.NewBool(false),
-		Enable3DSupport:  types.NewBool(false),
-		Use3dRenderer:    "automatic",
-	},
-	&types.VirtualMachineVMCIDevice{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         12000,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "VMCI device",
-				Summary:     "Device on the virtual machine PCI bus that provides support for the virtual machine communication interface",
-			},
-			Backing:     nil,
-			Connectable: (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo: &types.VirtualDevicePciBusSlotInfo{
-				VirtualDeviceBusSlotInfo: types.VirtualDeviceBusSlotInfo{},
-				PciSlotNumber:            33,
-			},
-			ControllerKey: 100,
-			UnitNumber:    intPtrValue(17),
-		},
-		Id: 1754519335,
-		AllowUnrestrictedCommunication: types.NewBool(false),
-	},
-	&types.VirtualLsiLogicController{
-		VirtualSCSIController: types.VirtualSCSIController{
-			VirtualController: types.VirtualController{
-				VirtualDevice: types.VirtualDevice{
-					DynamicData: types.DynamicData{},
-					Key:         1000,
-					DeviceInfo: &types.Description{
-						DynamicData: types.DynamicData{},
-						Label:       "SCSI controller 0",
-						Summary:     "LSI Logic",
-					},
-					Backing:       nil,
-					Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-					SlotInfo:      nil,
-					ControllerKey: 100,
-					UnitNumber:    intPtrValue(3),
-				},
-				BusNumber: 0,
-				Device:    nil,
-			},
-			HotAddRemove:       types.NewBool(true),
-			SharedBus:          "noSharing",
-			ScsiCtlrUnitNumber: 7,
-		},
-	},
-	&types.VirtualCdrom{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         3001,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "CD/DVD drive 1",
-				Summary:     "ISO [datastore1] ttylinux-pc_i486-16.1.iso",
-			},
-			Backing: &types.VirtualCdromIsoBackingInfo{
-				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					FileName:                 "[datastore1] foo.iso",
-					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
-					BackingObjectId:          "",
-				},
-			},
-			Connectable: &types.VirtualDeviceConnectInfo{
-				DynamicData:       types.DynamicData{},
-				StartConnected:    true,
-				AllowGuestControl: true,
-				Connected:         false,
-				Status:            "untried",
-			},
-			SlotInfo:      nil,
-			ControllerKey: 200,
-			UnitNumber:    intPtrValue(1),
-		},
-	},
-	&types.VirtualDisk{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         3000,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Hard disk 1",
-				Summary:     "30,720 KB",
-			},
-			Backing: &types.VirtualDiskFlatVer2BackingInfo{
-				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					FileName:                 "[datastore1] bar/bar.vmdk",
-					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
-					BackingObjectId:          "3-3000-0",
-				},
-				DiskMode:        "persistent",
-				Split:           types.NewBool(false),
-				WriteThrough:    types.NewBool(false),
-				ThinProvisioned: types.NewBool(false),
-				EagerlyScrub:    types.NewBool(true),
-				Uuid:            "6000C296-d0af-1209-1975-10c98eae10e4",
-				ContentId:       "d46395062e2d1b1790985bdec573b211",
-				ChangeId:        "",
-				Parent: &types.VirtualDiskFlatVer2BackingInfo{
-					VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-						VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-						FileName:                 "[datastore1] ttylinux.vmdk",
-						Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
-						BackingObjectId:          "3-3000-1",
-					},
-					DiskMode:        "persistent",
-					Split:           types.NewBool(false),
-					WriteThrough:    types.NewBool(false),
-					ThinProvisioned: types.NewBool(false),
-					EagerlyScrub:    types.NewBool(true),
-					Uuid:            "6000C296-d0af-1209-1975-10c98eae10e4",
-					ContentId:       "1c2dad9e1662219e962a620c6d238a7c",
-					ChangeId:        "",
-					Parent:          (*types.VirtualDiskFlatVer2BackingInfo)(nil),
-					DeltaDiskFormat: "",
-					DigestEnabled:   types.NewBool(false),
-					DeltaGrainSize:  0,
-				},
-				DeltaDiskFormat: "redoLogFormat",
-				DigestEnabled:   types.NewBool(false),
-				DeltaGrainSize:  0,
-			},
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 200,
-			UnitNumber:    intPtrValue(0),
-		},
-		CapacityInKB:    30720,
-		CapacityInBytes: 31457280,
-		Shares: &types.SharesInfo{
-			DynamicData: types.DynamicData{},
-			Shares:      1000,
-			Level:       "normal",
-		},
-		StorageIOAllocation: &types.StorageIOAllocationInfo{
-			DynamicData: types.DynamicData{},
-			Limit:       types.NewInt64(-1),
-			Shares: &types.SharesInfo{
-				DynamicData: types.DynamicData{},
-				Shares:      1000,
-				Level:       "normal",
-			},
-			Reservation: types.NewInt32(0),
-		},
-		DiskObjectId:          "3-3000",
-		VFlashCacheConfigInfo: (*types.VirtualDiskVFlashCacheConfigInfo)(nil),
-	},
-	&types.VirtualDisk{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         3002,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Hard disk 2",
-				Summary:     "10,000,000 KB",
-			},
-			Backing: &types.VirtualDiskFlatVer2BackingInfo{
-				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					FileName:                 "[datastore1] bar/disk-201-0.vmdk",
-					Datastore:                &types.ManagedObjectReference{Type: "Datastore", Value: "53fe43cc-75dc5110-3643-000c2918dc41"},
-					BackingObjectId:          "3-3002-0",
-				},
-				DiskMode:        "persistent",
-				Split:           types.NewBool(false),
-				WriteThrough:    types.NewBool(false),
-				ThinProvisioned: types.NewBool(true),
-				EagerlyScrub:    types.NewBool(false),
-				Uuid:            "6000C293-fde5-4457-5118-dd267ea992a7",
-				ContentId:       "90399989b9d520eed6793ab0fffffffe",
-				ChangeId:        "",
-				Parent:          (*types.VirtualDiskFlatVer2BackingInfo)(nil),
-				DeltaDiskFormat: "",
-				DigestEnabled:   types.NewBool(false),
-				DeltaGrainSize:  0,
-			},
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 201,
-			UnitNumber:    intPtrValue(0),
-		},
-		CapacityInKB:    10000000,
-		CapacityInBytes: 10240000000,
-		Shares: &types.SharesInfo{
-			DynamicData: types.DynamicData{},
-			Shares:      1000,
-			Level:       "normal",
-		},
-		StorageIOAllocation: &types.StorageIOAllocationInfo{
-			DynamicData: types.DynamicData{},
-			Limit:       types.NewInt64(-1),
-			Shares: &types.SharesInfo{
-				DynamicData: types.DynamicData{},
-				Shares:      1000,
-				Level:       "normal",
-			},
-			Reservation: types.NewInt32(0),
-		},
-		DiskObjectId:          "3-3002",
-		VFlashCacheConfigInfo: (*types.VirtualDiskVFlashCacheConfigInfo)(nil),
-	},
-	&types.VirtualE1000{
-		VirtualEthernetCard: types.VirtualEthernetCard{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         4000,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "Network adapter 1",
-					Summary:     "VM Network",
-				},
-				Backing: &types.VirtualEthernetCardNetworkBackingInfo{
-					VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
-						VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-						DeviceName:               "VM Network",
-						UseAutoDetect:            types.NewBool(false),
-					},
-					Network:           &types.ManagedObjectReference{Type: "Network", Value: "HaNetwork-VM Network"},
-					InPassthroughMode: types.NewBool(false),
-				},
-				Connectable: &types.VirtualDeviceConnectInfo{
-					DynamicData:       types.DynamicData{},
-					StartConnected:    true,
-					AllowGuestControl: true,
-					Connected:         false,
-					Status:            "untried",
-				},
-				SlotInfo: &types.VirtualDevicePciBusSlotInfo{
-					VirtualDeviceBusSlotInfo: types.VirtualDeviceBusSlotInfo{},
-					PciSlotNumber:            32,
-				},
-				ControllerKey: 100,
-				UnitNumber:    intPtrValue(7),
-			},
-			AddressType:      "generated",
-			MacAddress:       "00:0c:29:93:d7:27",
-			WakeOnLanEnabled: types.NewBool(true),
-		},
-	},
-	&types.VirtualSerialPort{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         9000,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Serial port 1",
-				Summary:     "Remote localhost:0",
-			},
-			Backing: &types.VirtualSerialPortURIBackingInfo{
-				VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					ServiceURI:               "localhost:0",
-					Direction:                "client",
-					ProxyURI:                 "",
-				},
-			},
-			Connectable: &types.VirtualDeviceConnectInfo{
-				DynamicData:       types.DynamicData{},
-				StartConnected:    true,
-				AllowGuestControl: true,
-				Connected:         false,
-				Status:            "untried",
-			},
-			SlotInfo:      nil,
-			ControllerKey: 400,
-			UnitNumber:    intPtrValue(0),
-		},
-		YieldOnPoll: true,
-	},
-})
-
-func TestSelectByType(t *testing.T) {
-	tests := []struct {
-		dtype  types.BaseVirtualDevice
-		expect int
-	}{
-		{
-			(*types.VirtualCdrom)(nil),
-			1,
-		},
-		{
-			(*types.VirtualEthernetCard)(nil),
-			1,
-		},
-		{
-			(*types.VirtualDisk)(nil),
-			2,
-		},
-		{
-			(*types.VirtualController)(nil),
-			6,
-		},
-		{
-			(*types.VirtualIDEController)(nil),
-			2,
-		},
-		{
-			(*types.VirtualSCSIController)(nil),
-			1,
-		},
-		{
-			(*types.VirtualLsiLogicController)(nil),
-			1,
-		},
-		{
-			(*types.ParaVirtualSCSIController)(nil),
-			0,
-		},
-	}
-
-	for _, test := range tests {
-		d := devices.SelectByType(test.dtype)
-
-		if len(d) != test.expect {
-			t.Errorf("%#v has %d", test.dtype, len(devices))
-		}
-	}
-}
-
-func TestSelectByBackingInfo(t *testing.T) {
-	tests := []types.BaseVirtualDeviceBackingInfo{
-		&types.VirtualEthernetCardNetworkBackingInfo{
-			VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
-				DeviceName: "VM Network",
-			},
-		},
-		&types.VirtualDiskFlatVer2BackingInfo{
-			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-				FileName: "[datastore1] bar/bar.vmdk",
-			},
-		},
-		&types.VirtualDiskFlatVer2BackingInfo{
-			Parent: &types.VirtualDiskFlatVer2BackingInfo{
-				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-					FileName: "[datastore1] ttylinux.vmdk",
-				},
-			},
-		},
-		&types.VirtualCdromIsoBackingInfo{
-			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-				VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-				FileName:                 "[datastore1] foo.iso",
-			},
-		},
-		(*types.VirtualCdromIsoBackingInfo)(nil),
-		&types.VirtualSerialPortURIBackingInfo{
-			VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
-				VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-				ServiceURI:               "localhost:0",
-				Direction:                "client",
-				ProxyURI:                 "",
-			},
-		},
-		(*types.VirtualSerialPortURIBackingInfo)(nil),
-	}
-
-	for _, test := range tests {
-		l := devices.SelectByBackingInfo(test)
-
-		if len(l) != 1 {
-			t.Errorf("Expected 1, got %d: %#v", len(l), test)
-		}
-	}
-
-	// test selecting by backing type
-	tests = []types.BaseVirtualDeviceBackingInfo{
-		(*types.VirtualDiskFlatVer2BackingInfo)(nil),
-	}
-
-	for _, test := range tests {
-		l := devices.SelectByBackingInfo(test)
-
-		if len(l) != 2 {
-			t.Errorf("Expected 2, got %d: %#v", len(l), test)
-		}
-	}
-}
-
-func TestFind(t *testing.T) {
-	for _, device := range devices {
-		name := devices.Name(device)
-		d := devices.Find(name)
-		if name != devices.Name(d) {
-			t.Errorf("expected name: %s, got: %s", name, devices.Name(d))
-		}
-	}
-
-	d := devices.Find("enoent")
-	if d != nil {
-		t.Errorf("unexpected: %#v", d)
-	}
-}
-
-func TestFindController(t *testing.T) {
-	for _, name := range []string{"", "ide-200"} {
-		_, err := devices.FindIDEController(name)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-
-	for _, name := range []string{"", "lsilogic-1000"} {
-		_, err := devices.FindSCSIController(name)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-
-	fns := []func() error{
-		func() error {
-			_, err := devices.FindIDEController("lsilogic-1000")
-			return err
-		},
-		func() error {
-			_, err := devices.FindSCSIController("ide-200")
-			return err
-		},
-	}
-
-	for _, f := range fns {
-		err := f()
-		if err == nil {
-			t.Error("should fail")
-		}
-	}
-}
-
-func TestPickController(t *testing.T) {
-	list := devices
-
-	tests := []struct {
-		ctype types.BaseVirtualController
-		key   int32
-		unit  int32
-	}{
-		{
-			(*types.VirtualIDEController)(nil), 201, 1,
-		},
-		{
-			(*types.VirtualSCSIController)(nil), 1000, 0,
-		},
-		{
-			(*types.VirtualSCSIController)(nil), 1000, 1,
-		},
-	}
-
-	for _, test := range tests {
-		c := list.PickController(test.ctype).GetVirtualController()
-
-		key := c.Key
-		if key != test.key {
-			t.Errorf("expected controller key: %d, got: %d\n", test.key, key)
-		}
-
-		unit := list.newUnitNumber(c)
-		if unit != test.unit {
-			t.Errorf("expected unit number: %d, got: %d\n", test.unit, unit)
-		}
-
-		dev := &types.VirtualDevice{
-			Key:           int32(rand.Int()),
-			UnitNumber:    new(int32),
-			ControllerKey: key,
-		}
-		*dev.UnitNumber = unit
-
-		list = append(list, dev)
-		c.Device = append(c.Device, dev.Key)
-	}
-
-	if list.PickController((*types.VirtualIDEController)(nil)) != nil {
-		t.Error("should be nil")
-	}
-
-	if list.PickController((*types.VirtualSCSIController)(nil)) == nil {
-		t.Errorf("should not be nil")
-	}
-}
-
-func TestCreateSCSIController(t *testing.T) {
-	for _, l := range []VirtualDeviceList{SCSIControllerTypes(), devices} {
-		_, err := l.CreateSCSIController("enoent")
-		if err == nil {
-			t.Error("should fail")
-		}
-
-		for _, name := range []string{"", "scsi", "pvscsi", "buslogic", "lsilogic", "lsilogic-sas"} {
-			_, err = l.CreateSCSIController(name)
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
-
-func TestCreateEthernetCard(t *testing.T) {
-	_, err := EthernetCardTypes().CreateEthernetCard("enoent", nil)
-	if err == nil {
-		t.Error("should fail")
-	}
-
-	for _, name := range []string{"", "e1000", "e1000e", "vmxnet3"} {
-		_, err := EthernetCardTypes().CreateEthernetCard(name, nil)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func TestCdrom(t *testing.T) {
-	c, err := devices.FindCdrom("")
-	if err != nil {
-		t.Error(err)
-	}
-
-	d := devices.Find(devices.Name(c))
-
-	if c.Key != d.GetVirtualDevice().Key {
-		t.Error("device key mismatch")
-	}
-
-	for _, name := range []string{"enoent", "ide-200"} {
-		c, err = devices.FindCdrom(name)
-		if err == nil {
-			t.Errorf("FindCdrom(%s) should fail", name)
-		}
-	}
-
-	c, err = devices.Select(func(device types.BaseVirtualDevice) bool {
-		if _, ok := device.(*types.VirtualCdrom); ok {
-			return false
-		}
-		return true
-	}).FindCdrom("")
-
-	if err == nil {
-		t.Error("FindCdrom('') should fail")
-	}
-}
-
-func TestSerialPort(t *testing.T) {
-	device, err := devices.CreateSerialPort()
-	if err != nil {
-		t.Error(err)
-	}
-	devices.ConnectSerialPort(device, "telnet://:33233", false, "")
-}
-
-func TestPrimaryMacAddress(t *testing.T) {
-	expect := "00:0c:29:93:d7:27"
-	mac := devices.PrimaryMacAddress()
-	if expect != mac {
-		t.Errorf("expected: %s, got: %s", expect, mac)
-	}
-}
-
-func TestBootOrder(t *testing.T) {
-	o := []string{DeviceTypeEthernet, DeviceTypeCdrom, DeviceTypeFloppy, DeviceTypeDisk}
-	list := devices
-
-	n := 4 // 1 ethernet, 1 cdrom, 2 disk
-	order := list.BootOrder(o)
-	if len(order) != n {
-		t.Errorf("expected %d boot devices, got: %d", n, len(order))
-	}
-
-	list = list.SelectBootOrder(order)
-	if len(list) != n {
-		t.Errorf("expected %d boot devices, got: %d", n, len(list))
-	}
-
-	// test lookup by name
-	var names []string
-	for _, x := range list {
-		names = append(names, list.Name(x))
-	}
-
-	order = list.BootOrder(names)
-	if len(order) != n {
-		t.Errorf("expected %d boot devices, got: %d", n, len(order))
-	}
-
-	if !reflect.DeepEqual(list, list.SelectBootOrder(order)) {
-		t.Error("boot order mismatch")
-	}
-
-	// remove disks
-	list = list.Select(func(device types.BaseVirtualDevice) bool {
-		if _, ok := device.(*types.VirtualDisk); ok {
-			return false
-		}
-		return true
-	})
-
-	n = 2 // 1 ethernet, 1 cdrom
-	order = list.BootOrder(o)
-	if len(order) != n {
-		t.Errorf("expected %d boot devices, got: %d", n, len(order))
-	}
-
-	if !reflect.DeepEqual(list, list.SelectBootOrder(order)) {
-		t.Error("boot order mismatch")
-	}
-
-	if len(list.BootOrder([]string{DeviceTypeDisk})) != 0 {
-		t.Error("expected 0 disks")
-	}
-
-	if len(list.BootOrder([]string{DeviceTypeNone})) != 1 {
-		t.Error("expected 1")
-	}
-}
-
-func TestName(t *testing.T) {
-	tests := []struct {
-		device types.BaseVirtualDevice
-		expect string
-	}{
-		{
-			&types.VirtualCdrom{},
-			"cdrom-0",
-		},
-		{
-			&types.VirtualDisk{},
-			"disk-0-0",
-		},
-		{
-			&types.VirtualFloppy{},
-			"floppy-0",
-		},
-		{
-			&types.VirtualIDEController{},
-			"ide-0",
-		},
-		{
-			&types.VirtualMachineVideoCard{},
-			"video-0",
-		},
-		{
-			&types.VirtualPointingDevice{},
-			"pointing-0",
-		},
-		{
-			&types.ParaVirtualSCSIController{},
-			"pvscsi-0",
-		},
-		{
-			&types.VirtualSerialPort{},
-			"serialport-0",
-		},
-		{
-			&types.VirtualE1000{
-				VirtualEthernetCard: types.VirtualEthernetCard{
-					VirtualDevice: types.VirtualDevice{
-						UnitNumber: intPtrValue(7),
-					},
-				},
-			},
-			"ethernet-0",
-		},
-	}
-
-	for _, test := range tests {
-		name := devices.Name(test.device)
-		if name != test.expect {
-			t.Errorf("expected: %s, got: %s", test.expect, name)
-		}
-	}
-}
-
-func TestChildDisk(t *testing.T) {
-	disks := devices.SelectByType((*types.VirtualDisk)(nil))
-
-	for _, disk := range disks {
-		child := disks.ChildDisk(disk.(*types.VirtualDisk))
-		name := child.Backing.(*types.VirtualDiskFlatVer2BackingInfo).VirtualDeviceFileBackingInfo.FileName
-
-		p := new(DatastorePath)
-		p.FromString(name)
-
-		if p.Datastore != "datastore1" {
-			t.Fatal(p.Datastore)
-		}
-
-		if p.Path != "" {
-			t.Fatal(p.Path)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go b/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
index b26e2f71c2..7bea49d51e 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager.go
@@ -145,6 +145,47 @@ func (m VirtualDiskManager) DeleteVirtualDisk(ctx context.Context, name string,
 	return NewTask(m.c, res.Returnval), nil
 }
 
+// InflateVirtualDisk inflates a virtual disk.
+func (m VirtualDiskManager) InflateVirtualDisk(ctx context.Context, name string, dc *Datacenter) (*Task, error) {
+	req := types.InflateVirtualDisk_Task{
+		This: m.Reference(),
+		Name: name,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.InflateVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
+// ShrinkVirtualDisk shrinks a virtual disk.
+func (m VirtualDiskManager) ShrinkVirtualDisk(ctx context.Context, name string, dc *Datacenter, copy *bool) (*Task, error) {
+	req := types.ShrinkVirtualDisk_Task{
+		This: m.Reference(),
+		Name: name,
+		Copy: copy,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.Datacenter = &ref
+	}
+
+	res, err := methods.ShrinkVirtualDisk_Task(ctx, m.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.c, res.Returnval), nil
+}
+
 // Queries virtual disk uuid
 func (m VirtualDiskManager) QueryVirtualDiskUuid(ctx context.Context, name string, dc *Datacenter) (string, error) {
 	req := types.QueryVirtualDiskUuid{
diff --git a/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager_internal.go b/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager_internal.go
index 642cd62f6e..faa9ecad5c 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager_internal.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/virtual_disk_manager_internal.go
@@ -46,9 +46,10 @@ type queryVirtualDiskInfoTaskResponse struct {
 }
 
 type queryVirtualDiskInfoTaskBody struct {
-	Req *queryVirtualDiskInfoTaskRequest  `xml:"urn:internalvim25 QueryVirtualDiskInfo_Task,omitempty"`
-	Res *queryVirtualDiskInfoTaskResponse `xml:"urn:vim25 QueryVirtualDiskInfo_TaskResponse,omitempty"`
-	Err *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+	Req         *queryVirtualDiskInfoTaskRequest  `xml:"urn:internalvim25 QueryVirtualDiskInfo_Task,omitempty"`
+	Res         *queryVirtualDiskInfoTaskResponse `xml:"urn:vim25 QueryVirtualDiskInfo_TaskResponse,omitempty"`
+	InternalRes *queryVirtualDiskInfoTaskResponse `xml:"urn:internalvim25 QueryVirtualDiskInfo_TaskResponse,omitempty"`
+	Err         *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
 }
 
 func (b *queryVirtualDiskInfoTaskBody) Fault() *soap.Fault { return b.Err }
@@ -62,7 +63,11 @@ func queryVirtualDiskInfoTask(ctx context.Context, r soap.RoundTripper, req *que
 		return nil, err
 	}
 
-	return resBody.Res, nil
+	if resBody.Res != nil {
+		return resBody.Res, nil
+	}
+
+	return resBody.InternalRes, nil
 }
 
 type VirtualDiskInfo struct {
@@ -95,3 +100,67 @@ func (m VirtualDiskManager) QueryVirtualDiskInfo(ctx context.Context, name strin
 
 	return info.Result.(arrayOfVirtualDiskInfo).VirtualDiskInfo, nil
 }
+
+type createChildDiskTaskRequest struct {
+	This             types.ManagedObjectReference  `xml:"_this"`
+	ChildName        string                        `xml:"childName"`
+	ChildDatacenter  *types.ManagedObjectReference `xml:"childDatacenter,omitempty"`
+	ParentName       string                        `xml:"parentName"`
+	ParentDatacenter *types.ManagedObjectReference `xml:"parentDatacenter,omitempty"`
+	IsLinkedClone    bool                          `xml:"isLinkedClone"`
+}
+
+type createChildDiskTaskResponse struct {
+	Returnval types.ManagedObjectReference `xml:"returnval"`
+}
+
+type createChildDiskTaskBody struct {
+	Req         *createChildDiskTaskRequest  `xml:"urn:internalvim25 CreateChildDisk_Task,omitempty"`
+	Res         *createChildDiskTaskResponse `xml:"urn:vim25 CreateChildDisk_TaskResponse,omitempty"`
+	InternalRes *createChildDiskTaskResponse `xml:"urn:internalvim25 CreateChildDisk_TaskResponse,omitempty"`
+	Err         *soap.Fault                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
+}
+
+func (b *createChildDiskTaskBody) Fault() *soap.Fault { return b.Err }
+
+func createChildDiskTask(ctx context.Context, r soap.RoundTripper, req *createChildDiskTaskRequest) (*createChildDiskTaskResponse, error) {
+	var reqBody, resBody createChildDiskTaskBody
+
+	reqBody.Req = req
+
+	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
+		return nil, err
+	}
+
+	if resBody.Res != nil {
+		return resBody.Res, nil // vim-version <= 6.5
+	}
+
+	return resBody.InternalRes, nil // vim-version >= 6.7
+}
+
+func (m VirtualDiskManager) CreateChildDisk(ctx context.Context, parent string, pdc *Datacenter, name string, dc *Datacenter, linked bool) (*Task, error) {
+	req := createChildDiskTaskRequest{
+		This:          m.Reference(),
+		ChildName:     name,
+		ParentName:    parent,
+		IsLinkedClone: linked,
+	}
+
+	if dc != nil {
+		ref := dc.Reference()
+		req.ChildDatacenter = &ref
+	}
+
+	if pdc != nil {
+		ref := pdc.Reference()
+		req.ParentDatacenter = &ref
+	}
+
+	res, err := createChildDiskTask(ctx, m.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(m.Client(), res.Returnval), nil
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/virtual_machine.go b/installer/vendor/github.com/vmware/govmomi/object/virtual_machine.go
index 700aab9244..511f557235 100644
--- a/installer/vendor/github.com/vmware/govmomi/object/virtual_machine.go
+++ b/installer/vendor/github.com/vmware/govmomi/object/virtual_machine.go
@@ -465,6 +465,20 @@ func (v VirtualMachine) Answer(ctx context.Context, id, answer string) error {
 	return nil
 }
 
+func (v VirtualMachine) AcquireTicket(ctx context.Context, kind string) (*types.VirtualMachineTicket, error) {
+	req := types.AcquireTicket{
+		This:       v.Reference(),
+		TicketType: kind,
+	}
+
+	res, err := methods.AcquireTicket(ctx, v.c, &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return &res.Returnval, nil
+}
+
 // CreateSnapshot creates a new snapshot of a virtual machine.
 func (v VirtualMachine) CreateSnapshot(ctx context.Context, name string, description string, memory bool, quiesce bool) (*Task, error) {
 	req := types.CreateSnapshot_Task{
@@ -771,3 +785,17 @@ func (v VirtualMachine) Export(ctx context.Context) (*nfc.Lease, error) {
 
 	return nfc.NewLease(v.c, res.Returnval), nil
 }
+
+func (v VirtualMachine) UpgradeVM(ctx context.Context, version string) (*Task, error) {
+	req := types.UpgradeVM_Task{
+		This:    v.Reference(),
+		Version: version,
+	}
+
+	res, err := methods.UpgradeVM_Task(ctx, v.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewTask(v.c, res.Returnval), nil
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go b/installer/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go
deleted file mode 100644
index e3a860d170..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/object/virtual_machine_test.go
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package object
-
-import (
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// VirtualMachine should implement the Reference interface.
-var _ Reference = VirtualMachine{}
-
-// pretty.Printf generated
-var snapshot = &types.VirtualMachineSnapshotInfo{
-	DynamicData:     types.DynamicData{},
-	CurrentSnapshot: &types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-11"},
-	RootSnapshotList: []types.VirtualMachineSnapshotTree{
-		{
-			DynamicData:    types.DynamicData{},
-			Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-1"},
-			Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-			Name:           "root",
-			Description:    "",
-			Id:             1,
-			CreateTime:     time.Now(),
-			State:          "poweredOn",
-			Quiesced:       false,
-			BackupManifest: "",
-			ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-				{
-					DynamicData:       types.DynamicData{},
-					Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-2"},
-					Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-					Name:              "child",
-					Description:       "",
-					Id:                2,
-					CreateTime:        time.Now(),
-					State:             "poweredOn",
-					Quiesced:          false,
-					BackupManifest:    "",
-					ChildSnapshotList: nil,
-					ReplaySupported:   types.NewBool(false),
-				},
-				{
-					DynamicData:    types.DynamicData{},
-					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-3"},
-					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-					Name:           "child",
-					Description:    "",
-					Id:             3,
-					CreateTime:     time.Now(),
-					State:          "poweredOn",
-					Quiesced:       false,
-					BackupManifest: "",
-					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-						{
-							DynamicData:    types.DynamicData{},
-							Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-9"},
-							Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-							Name:           "grandkid",
-							Description:    "",
-							Id:             9,
-							CreateTime:     time.Now(),
-							State:          "poweredOn",
-							Quiesced:       false,
-							BackupManifest: "",
-							ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-								{
-									DynamicData:       types.DynamicData{},
-									Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-10"},
-									Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-									Name:              "great",
-									Description:       "",
-									Id:                10,
-									CreateTime:        time.Now(),
-									State:             "poweredOn",
-									Quiesced:          false,
-									BackupManifest:    "",
-									ChildSnapshotList: nil,
-									ReplaySupported:   types.NewBool(false),
-								},
-							},
-							ReplaySupported: types.NewBool(false),
-						},
-					},
-					ReplaySupported: types.NewBool(false),
-				},
-				{
-					DynamicData:    types.DynamicData{},
-					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-5"},
-					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-					Name:           "voodoo",
-					Description:    "",
-					Id:             5,
-					CreateTime:     time.Now(),
-					State:          "poweredOn",
-					Quiesced:       false,
-					BackupManifest: "",
-					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-						{
-							DynamicData:       types.DynamicData{},
-							Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-11"},
-							Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-							Name:              "child",
-							Description:       "",
-							Id:                11,
-							CreateTime:        time.Now(),
-							State:             "poweredOn",
-							Quiesced:          false,
-							BackupManifest:    "",
-							ChildSnapshotList: nil,
-							ReplaySupported:   types.NewBool(false),
-						},
-					},
-					ReplaySupported: types.NewBool(false),
-				},
-				{
-					DynamicData:    types.DynamicData{},
-					Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-6"},
-					Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-					Name:           "better",
-					Description:    "",
-					Id:             6,
-					CreateTime:     time.Now(),
-					State:          "poweredOn",
-					Quiesced:       false,
-					BackupManifest: "",
-					ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-						{
-							DynamicData:    types.DynamicData{},
-							Snapshot:       types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-7"},
-							Vm:             types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-							Name:           "best",
-							Description:    "",
-							Id:             7,
-							CreateTime:     time.Now(),
-							State:          "poweredOn",
-							Quiesced:       false,
-							BackupManifest: "",
-							ChildSnapshotList: []types.VirtualMachineSnapshotTree{
-								{
-									DynamicData:       types.DynamicData{},
-									Snapshot:          types.ManagedObjectReference{Type: "VirtualMachineSnapshot", Value: "2-snapshot-8"},
-									Vm:                types.ManagedObjectReference{Type: "VirtualMachine", Value: "2"},
-									Name:              "betterer",
-									Description:       "",
-									Id:                8,
-									CreateTime:        time.Now(),
-									State:             "poweredOn",
-									Quiesced:          false,
-									BackupManifest:    "",
-									ChildSnapshotList: nil,
-									ReplaySupported:   types.NewBool(false),
-								},
-							},
-							ReplaySupported: types.NewBool(false),
-						},
-					},
-					ReplaySupported: types.NewBool(false),
-				},
-			},
-			ReplaySupported: types.NewBool(false),
-		},
-	},
-}
-
-func TestVirtualMachineSnapshotMap(t *testing.T) {
-	m := make(snapshotMap)
-	m.add("", snapshot.RootSnapshotList)
-
-	tests := []struct {
-		name   string
-		expect int
-	}{
-		{"enoent", 0},
-		{"root", 1},
-		{"child", 3},
-		{"root/child", 2},
-		{"root/voodoo/child", 1},
-		{"2-snapshot-6", 1},
-	}
-
-	for _, test := range tests {
-		s := m[test.name]
-
-		if len(s) != test.expect {
-			t.Errorf("%s: %d != %d", test.name, len(s), test.expect)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/ovf/env_test.go b/installer/vendor/github.com/vmware/govmomi/ovf/env_test.go
deleted file mode 100644
index fe68c0f0c5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/ovf/env_test.go
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-package ovf
-
-import "testing"
-
-func testEnv() Env {
-	return Env{
-		EsxID: "vm moref",
-		Platform: &PlatformSection{
-			Kind:    "VMware vCenter Server",
-			Version: "5.5.0",
-			Vendor:  "VMware, Inc.",
-			Locale:  "US",
-		},
-		Property: &PropertySection{
-			Properties: []EnvProperty{
-				{"foo", "bar"},
-				{"ham", "eggs"}}},
-	}
-}
-
-func TestMarshalEnv(t *testing.T) {
-	env := testEnv()
-
-	xenv, err := env.Marshal()
-	if err != nil {
-		t.Fatal("Error marshalling environment")
-	}
-	if len(xenv) < 1 {
-		t.Fatal("Marshalled document is empty")
-	}
-	t.Log(xenv)
-}
-
-func TestMarshalManualEnv(t *testing.T) {
-	env := testEnv()
-
-	xenv := env.MarshalManual()
-	if len(xenv) < 1 {
-		t.Fatal("Marshalled document is empty")
-	}
-	t.Log(xenv)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/ovf/ovf_test.go b/installer/vendor/github.com/vmware/govmomi/ovf/ovf_test.go
deleted file mode 100644
index 40f2f08b59..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/ovf/ovf_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package ovf
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"testing"
-	"text/tabwriter"
-)
-
-func testFile(t *testing.T) *os.File {
-	n := os.Getenv("OVF_TEST_FILE")
-	if n == "" {
-		t.Skip("Please specify OVF_TEST_FILE")
-	}
-
-	f, err := os.Open(n)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return f
-}
-
-func testEnvelope(t *testing.T) *Envelope {
-	f := testFile(t)
-	defer f.Close()
-
-	e, err := Unmarshal(f)
-	if err != nil {
-		t.Fatal(f)
-	}
-
-	if e == nil {
-		t.Fatal("Empty envelope")
-	}
-
-	return e
-}
-
-func TestUnmarshal(t *testing.T) {
-	testEnvelope(t)
-}
-
-func TestDeploymentOptions(t *testing.T) {
-	e := testEnvelope(t)
-
-	if e.DeploymentOption == nil {
-		t.Fatal("Missing DeploymentOptionSection")
-	}
-
-	var b bytes.Buffer
-	tw := tabwriter.NewWriter(&b, 2, 0, 2, ' ', 0)
-	fmt.Fprintf(tw, "\n")
-	for _, c := range e.DeploymentOption.Configuration {
-		fmt.Fprintf(tw, "id=%s\t", c.ID)
-		fmt.Fprintf(tw, "label=%s\t", c.Label)
-
-		d := false
-		if c.Default != nil {
-			d = *c.Default
-		}
-
-		fmt.Fprintf(tw, "default=%t\t", d)
-		fmt.Fprintf(tw, "\n")
-	}
-	tw.Flush()
-	t.Log(b.String())
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/client.go b/installer/vendor/github.com/vmware/govmomi/pbm/client.go
deleted file mode 100644
index a0f07fc9e2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/client.go
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pbm
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/vmware/govmomi/pbm/methods"
-	"github.com/vmware/govmomi/pbm/types"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/soap"
-	vim "github.com/vmware/govmomi/vim25/types"
-)
-
-type Client struct {
-	*soap.Client
-
-	ServiceContent types.PbmServiceInstanceContent
-}
-
-func NewClient(ctx context.Context, c *vim25.Client) (*Client, error) {
-	sc := c.Client.NewServiceClient("/pbm/sdk", "urn:pbm")
-
-	req := types.PbmRetrieveServiceContent{
-		This: vim.ManagedObjectReference{
-			Type:  "PbmServiceInstance",
-			Value: "ServiceInstance",
-		},
-	}
-
-	res, err := methods.PbmRetrieveServiceContent(ctx, sc, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return &Client{sc, res.Returnval}, nil
-}
-
-func (c *Client) QueryProfile(ctx context.Context, rtype types.PbmProfileResourceType, category string) ([]types.PbmProfileId, error) {
-	req := types.PbmQueryProfile{
-		This:            c.ServiceContent.ProfileManager,
-		ResourceType:    rtype,
-		ProfileCategory: category,
-	}
-
-	res, err := methods.PbmQueryProfile(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (c *Client) RetrieveContent(ctx context.Context, ids []types.PbmProfileId) ([]types.BasePbmProfile, error) {
-	req := types.PbmRetrieveContent{
-		This:       c.ServiceContent.ProfileManager,
-		ProfileIds: ids,
-	}
-
-	res, err := methods.PbmRetrieveContent(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-type PlacementCompatibilityResult []types.PbmPlacementCompatibilityResult
-
-func (c *Client) CheckRequirements(ctx context.Context, hubs []types.PbmPlacementHub, ref *types.PbmServerObjectRef, preq []types.BasePbmPlacementRequirement) (PlacementCompatibilityResult, error) {
-	req := types.PbmCheckRequirements{
-		This:                        c.ServiceContent.PlacementSolver,
-		HubsToSearch:                hubs,
-		PlacementSubjectRef:         ref,
-		PlacementSubjectRequirement: preq,
-	}
-
-	res, err := methods.PbmCheckRequirements(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (l PlacementCompatibilityResult) CompatibleDatastores() []types.PbmPlacementHub {
-	var compatibleDatastores []types.PbmPlacementHub
-
-	for _, res := range l {
-		if len(res.Error) == 0 {
-			compatibleDatastores = append(compatibleDatastores, res.Hub)
-		}
-	}
-	return compatibleDatastores
-}
-
-func (l PlacementCompatibilityResult) NonCompatibleDatastores() []types.PbmPlacementHub {
-	var nonCompatibleDatastores []types.PbmPlacementHub
-
-	for _, res := range l {
-		if len(res.Error) > 0 {
-			nonCompatibleDatastores = append(nonCompatibleDatastores, res.Hub)
-		}
-	}
-	return nonCompatibleDatastores
-}
-
-func (c *Client) CreateProfile(ctx context.Context, capabilityProfileCreateSpec types.PbmCapabilityProfileCreateSpec) (*types.PbmProfileId, error) {
-	req := types.PbmCreate{
-		This:       c.ServiceContent.ProfileManager,
-		CreateSpec: capabilityProfileCreateSpec,
-	}
-
-	res, err := methods.PbmCreate(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return &res.Returnval, nil
-}
-
-func (c *Client) UpdateProfile(ctx context.Context, id types.PbmProfileId, updateSpec types.PbmCapabilityProfileUpdateSpec) error {
-	req := types.PbmUpdate{
-		This:       c.ServiceContent.ProfileManager,
-		ProfileId:  id,
-		UpdateSpec: updateSpec,
-	}
-
-	_, err := methods.PbmUpdate(ctx, c, &req)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Client) DeleteProfile(ctx context.Context, ids []types.PbmProfileId) ([]types.PbmProfileOperationOutcome, error) {
-	req := types.PbmDelete{
-		This:      c.ServiceContent.ProfileManager,
-		ProfileId: ids,
-	}
-
-	res, err := methods.PbmDelete(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (c *Client) QueryAssociatedEntity(ctx context.Context, id types.PbmProfileId, entityType string) ([]types.PbmServerObjectRef, error) {
-	req := types.PbmQueryAssociatedEntity{
-		This:       c.ServiceContent.ProfileManager,
-		Profile:    id,
-		EntityType: entityType,
-	}
-
-	res, err := methods.PbmQueryAssociatedEntity(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (c *Client) QueryAssociatedEntities(ctx context.Context, ids []types.PbmProfileId) ([]types.PbmQueryProfileResult, error) {
-	req := types.PbmQueryAssociatedEntities{
-		This:     c.ServiceContent.ProfileManager,
-		Profiles: ids,
-	}
-
-	res, err := methods.PbmQueryAssociatedEntities(ctx, c, &req)
-	if err != nil {
-		return nil, err
-	}
-
-	return res.Returnval, nil
-}
-
-func (c *Client) ProfileIDByName(ctx context.Context, profileName string) (string, error) {
-	resourceType := types.PbmProfileResourceType{
-		ResourceType: string(types.PbmProfileResourceTypeEnumSTORAGE),
-	}
-	category := types.PbmProfileCategoryEnumREQUIREMENT
-	ids, err := c.QueryProfile(ctx, resourceType, string(category))
-	if err != nil {
-		return "", err
-	}
-
-	profiles, err := c.RetrieveContent(ctx, ids)
-	if err != nil {
-		return "", err
-	}
-
-	for i := range profiles {
-		profile := profiles[i].GetPbmProfile()
-		if profile.Name == profileName {
-			return profile.ProfileId.UniqueId, nil
-		}
-	}
-	return "", fmt.Errorf("no pbm profile found with name: %q", profileName)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/client_test.go b/installer/vendor/github.com/vmware/govmomi/pbm/client_test.go
deleted file mode 100644
index 8cf1c5b838..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/client_test.go
+++ /dev/null
@@ -1,301 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pbm
-
-import (
-	"context"
-	"os"
-	"reflect"
-	"sort"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/pbm/types"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	vim "github.com/vmware/govmomi/vim25/types"
-)
-
-func TestClient(t *testing.T) {
-	url := os.Getenv("GOVMOMI_PBM_URL")
-	if url == "" {
-		t.SkipNow()
-	}
-
-	clusterName := os.Getenv("GOVMOMI_PBM_CLUSTER")
-
-	u, err := soap.ParseURL(url)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, u, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pc, err := NewClient(ctx, c.Client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("PBM version=%s", pc.ServiceContent.AboutInfo.Version)
-
-	rtype := types.PbmProfileResourceType{
-		ResourceType: string(types.PbmProfileResourceTypeEnumSTORAGE),
-	}
-
-	category := types.PbmProfileCategoryEnumREQUIREMENT
-
-	// 1. Query all the profiles on the vCenter.
-	ids, err := pc.QueryProfile(ctx, rtype, string(category))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var qids []string
-
-	for _, id := range ids {
-		qids = append(qids, id.UniqueId)
-	}
-
-	var cids []string
-
-	// 2. Retrieve the content of all profiles.
-	policies, err := pc.RetrieveContent(ctx, ids)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i := range policies {
-		profile := policies[i].GetPbmProfile()
-		cids = append(cids, profile.ProfileId.UniqueId)
-	}
-
-	sort.Strings(qids)
-	sort.Strings(cids)
-
-	// Check whether ids retreived from QueryProfile and RetrieveContent are identical.
-	if !reflect.DeepEqual(qids, cids) {
-		t.Error("ids mismatch")
-	}
-
-	// 3. Get list of datastores in a cluster if cluster name is specified.
-	root := c.ServiceContent.RootFolder
-	var datastores []vim.ManagedObjectReference
-	var kind []string
-
-	if clusterName == "" {
-		kind = []string{"Datastore"}
-	} else {
-		kind = []string{"ClusterComputeResource"}
-	}
-
-	m := view.NewManager(c.Client)
-
-	v, err := m.CreateContainerView(ctx, root, kind, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if clusterName == "" {
-		datastores, err = v.Find(ctx, kind, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-	} else {
-		var cluster mo.ClusterComputeResource
-
-		err = v.RetrieveWithFilter(ctx, kind, []string{"datastore"}, &cluster, property.Filter{"name": clusterName})
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		datastores = cluster.Datastore
-	}
-
-	_ = v.Destroy(ctx)
-
-	t.Logf("checking %d datatores for compatibility results", len(datastores))
-
-	var hubs []types.PbmPlacementHub
-
-	for _, ds := range datastores {
-		hubs = append(hubs, types.PbmPlacementHub{
-			HubType: ds.Type,
-			HubId:   ds.Value,
-		})
-	}
-
-	var req []types.BasePbmPlacementRequirement
-
-	for _, id := range ids {
-		req = append(req, &types.PbmPlacementCapabilityProfileRequirement{
-			ProfileId: id,
-		})
-	}
-
-	// 4. Get the compatibility results for all the profiles on the vCenter.
-	res, err := pc.CheckRequirements(ctx, hubs, nil, req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	t.Logf("CheckRequirements results: %d", len(res))
-
-	// user spec for the profile.
-	// VSAN profile with 2 capability instances - hostFailuresToTolerate = 2, stripeWidth = 1
-	pbmCreateSpecForVSAN := CapabilityProfileCreateSpec{
-		Name:        "Kubernetes-VSAN-TestPolicy",
-		Description: "VSAN Test policy create",
-		Category:    string(types.PbmProfileCategoryEnumREQUIREMENT),
-		CapabilityList: []Capability{
-			Capability{
-				ID:        "hostFailuresToTolerate",
-				Namespace: "VSAN",
-				PropertyList: []Property{
-					Property{
-						ID:       "hostFailuresToTolerate",
-						Value:    "2",
-						DataType: "int",
-					},
-				},
-			},
-			Capability{
-				ID:        "stripeWidth",
-				Namespace: "VSAN",
-				PropertyList: []Property{
-					Property{
-						ID:       "stripeWidth",
-						Value:    "1",
-						DataType: "int",
-					},
-				},
-			},
-		},
-	}
-
-	// Create PBM capability spec for the above defined user spec.
-	createSpecVSAN, err := CreateCapabilityProfileSpec(pbmCreateSpecForVSAN)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// 5. Create SPBM VSAN profile.
-	vsanProfileID, err := pc.CreateProfile(ctx, *createSpecVSAN)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("VSAN Profile: %q successfully created", vsanProfileID.UniqueId)
-
-	// 6. Verify if profile created exists by issuing a RetrieveContent request.
-	_, err = pc.RetrieveContent(ctx, []types.PbmProfileId{*vsanProfileID})
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("Profile: %q exists on vCenter", vsanProfileID.UniqueId)
-
-	// 7. Get compatible datastores for the VSAN profile.
-	compatibleDatastores := res.CompatibleDatastores()
-	t.Logf("Found %d compatible-datastores for profile: %q", len(compatibleDatastores), vsanProfileID.UniqueId)
-
-	// 8. Get non-compatible datastores for the VSAN profile.
-	nonCompatibleDatastores := res.NonCompatibleDatastores()
-	t.Logf("Found %d non-compatible datastores for profile: %q", len(nonCompatibleDatastores), vsanProfileID.UniqueId)
-
-	// Check whether count of compatible and non-compatible datastores match the total number of datastores.
-	if (len(nonCompatibleDatastores) + len(compatibleDatastores)) != len(datastores) {
-		t.Error("datastore count mismatch")
-	}
-
-	// user spec for the profile.
-	// VSAN profile with 2 capability instances - stripeWidth = 1 and an SIOC profile.
-	pbmCreateSpecVSANandSIOC := CapabilityProfileCreateSpec{
-		Name:        "Kubernetes-VSAN-SIOC-TestPolicy",
-		Description: "VSAN-SIOC-Test policy create",
-		Category:    string(types.PbmProfileCategoryEnumREQUIREMENT),
-		CapabilityList: []Capability{
-			Capability{
-				ID:        "stripeWidth",
-				Namespace: "VSAN",
-				PropertyList: []Property{
-					Property{
-						ID:       "stripeWidth",
-						Value:    "1",
-						DataType: "int",
-					},
-				},
-			},
-			Capability{
-				ID:        "spm@DATASTOREIOCONTROL",
-				Namespace: "spm",
-				PropertyList: []Property{
-					Property{
-						ID:       "limit",
-						Value:    "200",
-						DataType: "int",
-					},
-					Property{
-						ID:       "reservation",
-						Value:    "1000",
-						DataType: "int",
-					},
-					Property{
-						ID:       "shares",
-						Value:    "2000",
-						DataType: "int",
-					},
-				},
-			},
-		},
-	}
-
-	// Create PBM capability spec for the above defined user spec.
-	createSpecVSANandSIOC, err := CreateCapabilityProfileSpec(pbmCreateSpecVSANandSIOC)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// 9. Create SPBM VSAN profile.
-	vsansiocProfileID, err := pc.CreateProfile(ctx, *createSpecVSANandSIOC)
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("VSAN-SIOC Profile: %q successfully created", vsansiocProfileID.UniqueId)
-
-	// 9. Get ProfileID by Name
-	profileID, err := pc.ProfileIDByName(ctx, "Kubernetes-VSAN-SIOC-TestPolicy")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if vsansiocProfileID.UniqueId != profileID {
-		t.Errorf("vsan-sioc profile: %q and retrieved profileID: %q successfully matched", vsansiocProfileID.UniqueId, profileID)
-	}
-	t.Logf("VSAN-SIOC profile: %q and retrieved profileID: %q successfully matched", vsansiocProfileID.UniqueId, profileID)
-
-	// 10. Delete VSAN and VSAN-SIOC profile.
-	_, err = pc.DeleteProfile(ctx, []types.PbmProfileId{*vsanProfileID, *vsansiocProfileID})
-	if err != nil {
-		t.Fatal(err)
-	}
-	t.Logf("Profile: %+v successfully deleted", []types.PbmProfileId{*vsanProfileID, *vsansiocProfileID})
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/methods/methods.go b/installer/vendor/github.com/vmware/govmomi/pbm/methods/methods.go
deleted file mode 100644
index 08ee48e990..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/methods/methods.go
+++ /dev/null
@@ -1,664 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package methods
-
-import (
-	"context"
-
-	"github.com/vmware/govmomi/pbm/types"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type PbmAssignDefaultRequirementProfileBody struct {
-	Req    *types.PbmAssignDefaultRequirementProfile         `xml:"urn:pbm PbmAssignDefaultRequirementProfile,omitempty"`
-	Res    *types.PbmAssignDefaultRequirementProfileResponse `xml:"urn:pbm PbmAssignDefaultRequirementProfileResponse,omitempty"`
-	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmAssignDefaultRequirementProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmAssignDefaultRequirementProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmAssignDefaultRequirementProfile) (*types.PbmAssignDefaultRequirementProfileResponse, error) {
-	var reqBody, resBody PbmAssignDefaultRequirementProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCheckCompatibilityBody struct {
-	Req    *types.PbmCheckCompatibility         `xml:"urn:pbm PbmCheckCompatibility,omitempty"`
-	Res    *types.PbmCheckCompatibilityResponse `xml:"urn:pbm PbmCheckCompatibilityResponse,omitempty"`
-	Fault_ *soap.Fault                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCheckCompatibilityBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCheckCompatibility(ctx context.Context, r soap.RoundTripper, req *types.PbmCheckCompatibility) (*types.PbmCheckCompatibilityResponse, error) {
-	var reqBody, resBody PbmCheckCompatibilityBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCheckCompatibilityWithSpecBody struct {
-	Req    *types.PbmCheckCompatibilityWithSpec         `xml:"urn:pbm PbmCheckCompatibilityWithSpec,omitempty"`
-	Res    *types.PbmCheckCompatibilityWithSpecResponse `xml:"urn:pbm PbmCheckCompatibilityWithSpecResponse,omitempty"`
-	Fault_ *soap.Fault                                  `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCheckCompatibilityWithSpecBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCheckCompatibilityWithSpec(ctx context.Context, r soap.RoundTripper, req *types.PbmCheckCompatibilityWithSpec) (*types.PbmCheckCompatibilityWithSpecResponse, error) {
-	var reqBody, resBody PbmCheckCompatibilityWithSpecBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCheckComplianceBody struct {
-	Req    *types.PbmCheckCompliance         `xml:"urn:pbm PbmCheckCompliance,omitempty"`
-	Res    *types.PbmCheckComplianceResponse `xml:"urn:pbm PbmCheckComplianceResponse,omitempty"`
-	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCheckComplianceBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCheckCompliance(ctx context.Context, r soap.RoundTripper, req *types.PbmCheckCompliance) (*types.PbmCheckComplianceResponse, error) {
-	var reqBody, resBody PbmCheckComplianceBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCheckRequirementsBody struct {
-	Req    *types.PbmCheckRequirements         `xml:"urn:pbm PbmCheckRequirements,omitempty"`
-	Res    *types.PbmCheckRequirementsResponse `xml:"urn:pbm PbmCheckRequirementsResponse,omitempty"`
-	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCheckRequirementsBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCheckRequirements(ctx context.Context, r soap.RoundTripper, req *types.PbmCheckRequirements) (*types.PbmCheckRequirementsResponse, error) {
-	var reqBody, resBody PbmCheckRequirementsBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCheckRollupComplianceBody struct {
-	Req    *types.PbmCheckRollupCompliance         `xml:"urn:pbm PbmCheckRollupCompliance,omitempty"`
-	Res    *types.PbmCheckRollupComplianceResponse `xml:"urn:pbm PbmCheckRollupComplianceResponse,omitempty"`
-	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCheckRollupComplianceBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCheckRollupCompliance(ctx context.Context, r soap.RoundTripper, req *types.PbmCheckRollupCompliance) (*types.PbmCheckRollupComplianceResponse, error) {
-	var reqBody, resBody PbmCheckRollupComplianceBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmCreateBody struct {
-	Req    *types.PbmCreate         `xml:"urn:pbm PbmCreate,omitempty"`
-	Res    *types.PbmCreateResponse `xml:"urn:pbm PbmCreateResponse,omitempty"`
-	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmCreateBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmCreate(ctx context.Context, r soap.RoundTripper, req *types.PbmCreate) (*types.PbmCreateResponse, error) {
-	var reqBody, resBody PbmCreateBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmDeleteBody struct {
-	Req    *types.PbmDelete         `xml:"urn:pbm PbmDelete,omitempty"`
-	Res    *types.PbmDeleteResponse `xml:"urn:pbm PbmDeleteResponse,omitempty"`
-	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmDeleteBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmDelete(ctx context.Context, r soap.RoundTripper, req *types.PbmDelete) (*types.PbmDeleteResponse, error) {
-	var reqBody, resBody PbmDeleteBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchCapabilityMetadataBody struct {
-	Req    *types.PbmFetchCapabilityMetadata         `xml:"urn:pbm PbmFetchCapabilityMetadata,omitempty"`
-	Res    *types.PbmFetchCapabilityMetadataResponse `xml:"urn:pbm PbmFetchCapabilityMetadataResponse,omitempty"`
-	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchCapabilityMetadataBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchCapabilityMetadata(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchCapabilityMetadata) (*types.PbmFetchCapabilityMetadataResponse, error) {
-	var reqBody, resBody PbmFetchCapabilityMetadataBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchCapabilitySchemaBody struct {
-	Req    *types.PbmFetchCapabilitySchema         `xml:"urn:pbm PbmFetchCapabilitySchema,omitempty"`
-	Res    *types.PbmFetchCapabilitySchemaResponse `xml:"urn:pbm PbmFetchCapabilitySchemaResponse,omitempty"`
-	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchCapabilitySchemaBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchCapabilitySchema(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchCapabilitySchema) (*types.PbmFetchCapabilitySchemaResponse, error) {
-	var reqBody, resBody PbmFetchCapabilitySchemaBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchComplianceResultBody struct {
-	Req    *types.PbmFetchComplianceResult         `xml:"urn:pbm PbmFetchComplianceResult,omitempty"`
-	Res    *types.PbmFetchComplianceResultResponse `xml:"urn:pbm PbmFetchComplianceResultResponse,omitempty"`
-	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchComplianceResultBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchComplianceResult(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchComplianceResult) (*types.PbmFetchComplianceResultResponse, error) {
-	var reqBody, resBody PbmFetchComplianceResultBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchResourceTypeBody struct {
-	Req    *types.PbmFetchResourceType         `xml:"urn:pbm PbmFetchResourceType,omitempty"`
-	Res    *types.PbmFetchResourceTypeResponse `xml:"urn:pbm PbmFetchResourceTypeResponse,omitempty"`
-	Fault_ *soap.Fault                         `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchResourceTypeBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchResourceType(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchResourceType) (*types.PbmFetchResourceTypeResponse, error) {
-	var reqBody, resBody PbmFetchResourceTypeBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchRollupComplianceResultBody struct {
-	Req    *types.PbmFetchRollupComplianceResult         `xml:"urn:pbm PbmFetchRollupComplianceResult,omitempty"`
-	Res    *types.PbmFetchRollupComplianceResultResponse `xml:"urn:pbm PbmFetchRollupComplianceResultResponse,omitempty"`
-	Fault_ *soap.Fault                                   `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchRollupComplianceResultBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchRollupComplianceResult(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchRollupComplianceResult) (*types.PbmFetchRollupComplianceResultResponse, error) {
-	var reqBody, resBody PbmFetchRollupComplianceResultBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFetchVendorInfoBody struct {
-	Req    *types.PbmFetchVendorInfo         `xml:"urn:pbm PbmFetchVendorInfo,omitempty"`
-	Res    *types.PbmFetchVendorInfoResponse `xml:"urn:pbm PbmFetchVendorInfoResponse,omitempty"`
-	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFetchVendorInfoBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFetchVendorInfo(ctx context.Context, r soap.RoundTripper, req *types.PbmFetchVendorInfo) (*types.PbmFetchVendorInfoResponse, error) {
-	var reqBody, resBody PbmFetchVendorInfoBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmFindApplicableDefaultProfileBody struct {
-	Req    *types.PbmFindApplicableDefaultProfile         `xml:"urn:pbm PbmFindApplicableDefaultProfile,omitempty"`
-	Res    *types.PbmFindApplicableDefaultProfileResponse `xml:"urn:pbm PbmFindApplicableDefaultProfileResponse,omitempty"`
-	Fault_ *soap.Fault                                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmFindApplicableDefaultProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmFindApplicableDefaultProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmFindApplicableDefaultProfile) (*types.PbmFindApplicableDefaultProfileResponse, error) {
-	var reqBody, resBody PbmFindApplicableDefaultProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryAssociatedEntitiesBody struct {
-	Req    *types.PbmQueryAssociatedEntities         `xml:"urn:pbm PbmQueryAssociatedEntities,omitempty"`
-	Res    *types.PbmQueryAssociatedEntitiesResponse `xml:"urn:pbm PbmQueryAssociatedEntitiesResponse,omitempty"`
-	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryAssociatedEntitiesBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryAssociatedEntities(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryAssociatedEntities) (*types.PbmQueryAssociatedEntitiesResponse, error) {
-	var reqBody, resBody PbmQueryAssociatedEntitiesBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryAssociatedEntityBody struct {
-	Req    *types.PbmQueryAssociatedEntity         `xml:"urn:pbm PbmQueryAssociatedEntity,omitempty"`
-	Res    *types.PbmQueryAssociatedEntityResponse `xml:"urn:pbm PbmQueryAssociatedEntityResponse,omitempty"`
-	Fault_ *soap.Fault                             `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryAssociatedEntityBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryAssociatedEntity(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryAssociatedEntity) (*types.PbmQueryAssociatedEntityResponse, error) {
-	var reqBody, resBody PbmQueryAssociatedEntityBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryAssociatedProfileBody struct {
-	Req    *types.PbmQueryAssociatedProfile         `xml:"urn:pbm PbmQueryAssociatedProfile,omitempty"`
-	Res    *types.PbmQueryAssociatedProfileResponse `xml:"urn:pbm PbmQueryAssociatedProfileResponse,omitempty"`
-	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryAssociatedProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryAssociatedProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryAssociatedProfile) (*types.PbmQueryAssociatedProfileResponse, error) {
-	var reqBody, resBody PbmQueryAssociatedProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryAssociatedProfilesBody struct {
-	Req    *types.PbmQueryAssociatedProfiles         `xml:"urn:pbm PbmQueryAssociatedProfiles,omitempty"`
-	Res    *types.PbmQueryAssociatedProfilesResponse `xml:"urn:pbm PbmQueryAssociatedProfilesResponse,omitempty"`
-	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryAssociatedProfilesBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryAssociatedProfiles(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryAssociatedProfiles) (*types.PbmQueryAssociatedProfilesResponse, error) {
-	var reqBody, resBody PbmQueryAssociatedProfilesBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryByRollupComplianceStatusBody struct {
-	Req    *types.PbmQueryByRollupComplianceStatus         `xml:"urn:pbm PbmQueryByRollupComplianceStatus,omitempty"`
-	Res    *types.PbmQueryByRollupComplianceStatusResponse `xml:"urn:pbm PbmQueryByRollupComplianceStatusResponse,omitempty"`
-	Fault_ *soap.Fault                                     `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryByRollupComplianceStatusBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryByRollupComplianceStatus(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryByRollupComplianceStatus) (*types.PbmQueryByRollupComplianceStatusResponse, error) {
-	var reqBody, resBody PbmQueryByRollupComplianceStatusBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryDefaultRequirementProfileBody struct {
-	Req    *types.PbmQueryDefaultRequirementProfile         `xml:"urn:pbm PbmQueryDefaultRequirementProfile,omitempty"`
-	Res    *types.PbmQueryDefaultRequirementProfileResponse `xml:"urn:pbm PbmQueryDefaultRequirementProfileResponse,omitempty"`
-	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryDefaultRequirementProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryDefaultRequirementProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryDefaultRequirementProfile) (*types.PbmQueryDefaultRequirementProfileResponse, error) {
-	var reqBody, resBody PbmQueryDefaultRequirementProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryDefaultRequirementProfilesBody struct {
-	Req    *types.PbmQueryDefaultRequirementProfiles         `xml:"urn:pbm PbmQueryDefaultRequirementProfiles,omitempty"`
-	Res    *types.PbmQueryDefaultRequirementProfilesResponse `xml:"urn:pbm PbmQueryDefaultRequirementProfilesResponse,omitempty"`
-	Fault_ *soap.Fault                                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryDefaultRequirementProfilesBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryDefaultRequirementProfiles(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryDefaultRequirementProfiles) (*types.PbmQueryDefaultRequirementProfilesResponse, error) {
-	var reqBody, resBody PbmQueryDefaultRequirementProfilesBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryMatchingHubBody struct {
-	Req    *types.PbmQueryMatchingHub         `xml:"urn:pbm PbmQueryMatchingHub,omitempty"`
-	Res    *types.PbmQueryMatchingHubResponse `xml:"urn:pbm PbmQueryMatchingHubResponse,omitempty"`
-	Fault_ *soap.Fault                        `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryMatchingHubBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryMatchingHub(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryMatchingHub) (*types.PbmQueryMatchingHubResponse, error) {
-	var reqBody, resBody PbmQueryMatchingHubBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryMatchingHubWithSpecBody struct {
-	Req    *types.PbmQueryMatchingHubWithSpec         `xml:"urn:pbm PbmQueryMatchingHubWithSpec,omitempty"`
-	Res    *types.PbmQueryMatchingHubWithSpecResponse `xml:"urn:pbm PbmQueryMatchingHubWithSpecResponse,omitempty"`
-	Fault_ *soap.Fault                                `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryMatchingHubWithSpecBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryMatchingHubWithSpec(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryMatchingHubWithSpec) (*types.PbmQueryMatchingHubWithSpecResponse, error) {
-	var reqBody, resBody PbmQueryMatchingHubWithSpecBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryProfileBody struct {
-	Req    *types.PbmQueryProfile         `xml:"urn:pbm PbmQueryProfile,omitempty"`
-	Res    *types.PbmQueryProfileResponse `xml:"urn:pbm PbmQueryProfileResponse,omitempty"`
-	Fault_ *soap.Fault                    `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryProfile) (*types.PbmQueryProfileResponse, error) {
-	var reqBody, resBody PbmQueryProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQueryReplicationGroupsBody struct {
-	Req    *types.PbmQueryReplicationGroups         `xml:"urn:pbm PbmQueryReplicationGroups,omitempty"`
-	Res    *types.PbmQueryReplicationGroupsResponse `xml:"urn:pbm PbmQueryReplicationGroupsResponse,omitempty"`
-	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQueryReplicationGroupsBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQueryReplicationGroups(ctx context.Context, r soap.RoundTripper, req *types.PbmQueryReplicationGroups) (*types.PbmQueryReplicationGroupsResponse, error) {
-	var reqBody, resBody PbmQueryReplicationGroupsBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmQuerySpaceStatsForStorageContainerBody struct {
-	Req    *types.PbmQuerySpaceStatsForStorageContainer         `xml:"urn:pbm PbmQuerySpaceStatsForStorageContainer,omitempty"`
-	Res    *types.PbmQuerySpaceStatsForStorageContainerResponse `xml:"urn:pbm PbmQuerySpaceStatsForStorageContainerResponse,omitempty"`
-	Fault_ *soap.Fault                                          `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmQuerySpaceStatsForStorageContainerBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmQuerySpaceStatsForStorageContainer(ctx context.Context, r soap.RoundTripper, req *types.PbmQuerySpaceStatsForStorageContainer) (*types.PbmQuerySpaceStatsForStorageContainerResponse, error) {
-	var reqBody, resBody PbmQuerySpaceStatsForStorageContainerBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmResetDefaultRequirementProfileBody struct {
-	Req    *types.PbmResetDefaultRequirementProfile         `xml:"urn:pbm PbmResetDefaultRequirementProfile,omitempty"`
-	Res    *types.PbmResetDefaultRequirementProfileResponse `xml:"urn:pbm PbmResetDefaultRequirementProfileResponse,omitempty"`
-	Fault_ *soap.Fault                                      `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmResetDefaultRequirementProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmResetDefaultRequirementProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmResetDefaultRequirementProfile) (*types.PbmResetDefaultRequirementProfileResponse, error) {
-	var reqBody, resBody PbmResetDefaultRequirementProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmResetVSanDefaultProfileBody struct {
-	Req    *types.PbmResetVSanDefaultProfile         `xml:"urn:pbm PbmResetVSanDefaultProfile,omitempty"`
-	Res    *types.PbmResetVSanDefaultProfileResponse `xml:"urn:pbm PbmResetVSanDefaultProfileResponse,omitempty"`
-	Fault_ *soap.Fault                               `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmResetVSanDefaultProfileBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmResetVSanDefaultProfile(ctx context.Context, r soap.RoundTripper, req *types.PbmResetVSanDefaultProfile) (*types.PbmResetVSanDefaultProfileResponse, error) {
-	var reqBody, resBody PbmResetVSanDefaultProfileBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmRetrieveContentBody struct {
-	Req    *types.PbmRetrieveContent         `xml:"urn:pbm PbmRetrieveContent,omitempty"`
-	Res    *types.PbmRetrieveContentResponse `xml:"urn:pbm PbmRetrieveContentResponse,omitempty"`
-	Fault_ *soap.Fault                       `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmRetrieveContentBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmRetrieveContent(ctx context.Context, r soap.RoundTripper, req *types.PbmRetrieveContent) (*types.PbmRetrieveContentResponse, error) {
-	var reqBody, resBody PbmRetrieveContentBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmRetrieveServiceContentBody struct {
-	Req    *types.PbmRetrieveServiceContent         `xml:"urn:pbm PbmRetrieveServiceContent,omitempty"`
-	Res    *types.PbmRetrieveServiceContentResponse `xml:"urn:pbm PbmRetrieveServiceContentResponse,omitempty"`
-	Fault_ *soap.Fault                              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmRetrieveServiceContentBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmRetrieveServiceContent(ctx context.Context, r soap.RoundTripper, req *types.PbmRetrieveServiceContent) (*types.PbmRetrieveServiceContentResponse, error) {
-	var reqBody, resBody PbmRetrieveServiceContentBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
-
-type PbmUpdateBody struct {
-	Req    *types.PbmUpdate         `xml:"urn:pbm PbmUpdate,omitempty"`
-	Res    *types.PbmUpdateResponse `xml:"urn:pbm PbmUpdateResponse,omitempty"`
-	Fault_ *soap.Fault              `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *PbmUpdateBody) Fault() *soap.Fault { return b.Fault_ }
-
-func PbmUpdate(ctx context.Context, r soap.RoundTripper, req *types.PbmUpdate) (*types.PbmUpdateResponse, error) {
-	var reqBody, resBody PbmUpdateBody
-
-	reqBody.Req = req
-
-	if err := r.RoundTrip(ctx, &reqBody, &resBody); err != nil {
-		return nil, err
-	}
-
-	return resBody.Res, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/pbm_util.go b/installer/vendor/github.com/vmware/govmomi/pbm/pbm_util.go
deleted file mode 100644
index 4cc8085f34..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/pbm_util.go
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package pbm
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/govmomi/pbm/types"
-)
-
-// A struct to capture pbm create spec details.
-type CapabilityProfileCreateSpec struct {
-	Name           string
-	Description    string
-	Category       string
-	CapabilityList []Capability
-}
-
-// A struct to capture pbm capability instance details.
-type Capability struct {
-	ID           string
-	Namespace    string
-	PropertyList []Property
-}
-
-// A struct to capture pbm property instance details.
-type Property struct {
-	ID       string
-	Operator string
-	Value    string
-	DataType string
-}
-
-func CreateCapabilityProfileSpec(pbmCreateSpec CapabilityProfileCreateSpec) (*types.PbmCapabilityProfileCreateSpec, error) {
-	capabilities, err := createCapabilityInstances(pbmCreateSpec.CapabilityList)
-	if err != nil {
-		return nil, err
-	}
-
-	pbmCapabilityProfileSpec := types.PbmCapabilityProfileCreateSpec{
-		Name:        pbmCreateSpec.Name,
-		Description: pbmCreateSpec.Description,
-		Category:    pbmCreateSpec.Category,
-		ResourceType: types.PbmProfileResourceType{
-			ResourceType: string(types.PbmProfileResourceTypeEnumSTORAGE),
-		},
-		Constraints: &types.PbmCapabilitySubProfileConstraints{
-			SubProfiles: []types.PbmCapabilitySubProfile{
-				types.PbmCapabilitySubProfile{
-					Capability: capabilities,
-				},
-			},
-		},
-	}
-	return &pbmCapabilityProfileSpec, nil
-}
-
-func createCapabilityInstances(rules []Capability) ([]types.PbmCapabilityInstance, error) {
-	var capabilityInstances []types.PbmCapabilityInstance
-	for _, capabilityRule := range rules {
-		capability := types.PbmCapabilityInstance{
-			Id: types.PbmCapabilityMetadataUniqueId{
-				Namespace: capabilityRule.Namespace,
-				Id:        capabilityRule.ID,
-			},
-		}
-
-		var propertyInstances []types.PbmCapabilityPropertyInstance
-		for _, propertyRule := range capabilityRule.PropertyList {
-			property := types.PbmCapabilityPropertyInstance{
-				Id: propertyRule.ID,
-			}
-			if propertyRule.Operator != "" {
-				property.Operator = propertyRule.Operator
-			}
-			var err error
-			switch strings.ToLower(propertyRule.DataType) {
-			case "int":
-				// Go int32 is marshalled to xsi:int whereas Go int is marshalled to xsi:long when sending down the wire.
-				var val int32
-				val, err = verifyPropertyValueIsInt(propertyRule.Value, propertyRule.DataType)
-				property.Value = val
-			case "bool":
-				var val bool
-				val, err = verifyPropertyValueIsBoolean(propertyRule.Value, propertyRule.DataType)
-				property.Value = val
-			case "string":
-				property.Value = propertyRule.Value
-			case "set":
-				set := types.PbmCapabilityDiscreteSet{}
-				for _, val := range strings.Split(propertyRule.Value, ",") {
-					set.Values = append(set.Values, val)
-				}
-				property.Value = set
-			default:
-				return nil, fmt.Errorf("invalid value: %q with datatype: %q", propertyRule.Value, propertyRule.Value)
-			}
-			if err != nil {
-				return nil, fmt.Errorf("invalid value: %q with datatype: %q", propertyRule.Value, propertyRule.Value)
-			}
-			propertyInstances = append(propertyInstances, property)
-		}
-		constraintInstances := []types.PbmCapabilityConstraintInstance{
-			types.PbmCapabilityConstraintInstance{
-				PropertyInstance: propertyInstances,
-			},
-		}
-		capability.Constraint = constraintInstances
-		capabilityInstances = append(capabilityInstances, capability)
-	}
-	return capabilityInstances, nil
-}
-
-// Verify if the capability value is of type integer.
-func verifyPropertyValueIsInt(propertyValue string, dataType string) (int32, error) {
-	val, err := strconv.ParseInt(propertyValue, 10, 32)
-	if err != nil {
-		return -1, err
-	}
-	return int32(val), nil
-}
-
-// Verify if the capability value is of type integer.
-func verifyPropertyValueIsBoolean(propertyValue string, dataType string) (bool, error) {
-	val, err := strconv.ParseBool(propertyValue)
-	if err != nil {
-		return false, err
-	}
-	return val, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/types/enum.go b/installer/vendor/github.com/vmware/govmomi/pbm/types/enum.go
deleted file mode 100644
index 7cee751417..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/types/enum.go
+++ /dev/null
@@ -1,211 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"reflect"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type PbmBuiltinGenericType string
-
-const (
-	PbmBuiltinGenericTypeVMW_RANGE = PbmBuiltinGenericType("VMW_RANGE")
-	PbmBuiltinGenericTypeVMW_SET   = PbmBuiltinGenericType("VMW_SET")
-)
-
-func init() {
-	types.Add("pbm:PbmBuiltinGenericType", reflect.TypeOf((*PbmBuiltinGenericType)(nil)).Elem())
-}
-
-type PbmBuiltinType string
-
-const (
-	PbmBuiltinTypeXSD_LONG     = PbmBuiltinType("XSD_LONG")
-	PbmBuiltinTypeXSD_SHORT    = PbmBuiltinType("XSD_SHORT")
-	PbmBuiltinTypeXSD_INTEGER  = PbmBuiltinType("XSD_INTEGER")
-	PbmBuiltinTypeXSD_INT      = PbmBuiltinType("XSD_INT")
-	PbmBuiltinTypeXSD_STRING   = PbmBuiltinType("XSD_STRING")
-	PbmBuiltinTypeXSD_BOOLEAN  = PbmBuiltinType("XSD_BOOLEAN")
-	PbmBuiltinTypeXSD_DOUBLE   = PbmBuiltinType("XSD_DOUBLE")
-	PbmBuiltinTypeXSD_DATETIME = PbmBuiltinType("XSD_DATETIME")
-	PbmBuiltinTypeVMW_TIMESPAN = PbmBuiltinType("VMW_TIMESPAN")
-	PbmBuiltinTypeVMW_POLICY   = PbmBuiltinType("VMW_POLICY")
-)
-
-func init() {
-	types.Add("pbm:PbmBuiltinType", reflect.TypeOf((*PbmBuiltinType)(nil)).Elem())
-}
-
-type PbmCapabilityOperator string
-
-const (
-	PbmCapabilityOperatorNOT = PbmCapabilityOperator("NOT")
-)
-
-func init() {
-	types.Add("pbm:PbmCapabilityOperator", reflect.TypeOf((*PbmCapabilityOperator)(nil)).Elem())
-}
-
-type PbmCapabilityTimeUnitType string
-
-const (
-	PbmCapabilityTimeUnitTypeSECONDS = PbmCapabilityTimeUnitType("SECONDS")
-	PbmCapabilityTimeUnitTypeMINUTES = PbmCapabilityTimeUnitType("MINUTES")
-	PbmCapabilityTimeUnitTypeHOURS   = PbmCapabilityTimeUnitType("HOURS")
-	PbmCapabilityTimeUnitTypeDAYS    = PbmCapabilityTimeUnitType("DAYS")
-	PbmCapabilityTimeUnitTypeWEEKS   = PbmCapabilityTimeUnitType("WEEKS")
-	PbmCapabilityTimeUnitTypeMONTHS  = PbmCapabilityTimeUnitType("MONTHS")
-	PbmCapabilityTimeUnitTypeYEARS   = PbmCapabilityTimeUnitType("YEARS")
-)
-
-func init() {
-	types.Add("pbm:PbmCapabilityTimeUnitType", reflect.TypeOf((*PbmCapabilityTimeUnitType)(nil)).Elem())
-}
-
-type PbmComplianceResultComplianceTaskStatus string
-
-const (
-	PbmComplianceResultComplianceTaskStatusInProgress = PbmComplianceResultComplianceTaskStatus("inProgress")
-	PbmComplianceResultComplianceTaskStatusSuccess    = PbmComplianceResultComplianceTaskStatus("success")
-	PbmComplianceResultComplianceTaskStatusFailed     = PbmComplianceResultComplianceTaskStatus("failed")
-)
-
-func init() {
-	types.Add("pbm:PbmComplianceResultComplianceTaskStatus", reflect.TypeOf((*PbmComplianceResultComplianceTaskStatus)(nil)).Elem())
-}
-
-type PbmComplianceStatus string
-
-const (
-	PbmComplianceStatusCompliant     = PbmComplianceStatus("compliant")
-	PbmComplianceStatusNonCompliant  = PbmComplianceStatus("nonCompliant")
-	PbmComplianceStatusUnknown       = PbmComplianceStatus("unknown")
-	PbmComplianceStatusNotApplicable = PbmComplianceStatus("notApplicable")
-	PbmComplianceStatusOutOfDate     = PbmComplianceStatus("outOfDate")
-)
-
-func init() {
-	types.Add("pbm:PbmComplianceStatus", reflect.TypeOf((*PbmComplianceStatus)(nil)).Elem())
-}
-
-type PbmIofilterInfoFilterType string
-
-const (
-	PbmIofilterInfoFilterTypeINSPECTION         = PbmIofilterInfoFilterType("INSPECTION")
-	PbmIofilterInfoFilterTypeCOMPRESSION        = PbmIofilterInfoFilterType("COMPRESSION")
-	PbmIofilterInfoFilterTypeENCRYPTION         = PbmIofilterInfoFilterType("ENCRYPTION")
-	PbmIofilterInfoFilterTypeREPLICATION        = PbmIofilterInfoFilterType("REPLICATION")
-	PbmIofilterInfoFilterTypeCACHE              = PbmIofilterInfoFilterType("CACHE")
-	PbmIofilterInfoFilterTypeDATAPROVIDER       = PbmIofilterInfoFilterType("DATAPROVIDER")
-	PbmIofilterInfoFilterTypeDATASTOREIOCONTROL = PbmIofilterInfoFilterType("DATASTOREIOCONTROL")
-)
-
-func init() {
-	types.Add("pbm:PbmIofilterInfoFilterType", reflect.TypeOf((*PbmIofilterInfoFilterType)(nil)).Elem())
-}
-
-type PbmLineOfServiceInfoLineOfServiceEnum string
-
-const (
-	PbmLineOfServiceInfoLineOfServiceEnumINSPECTION           = PbmLineOfServiceInfoLineOfServiceEnum("INSPECTION")
-	PbmLineOfServiceInfoLineOfServiceEnumCOMPRESSION          = PbmLineOfServiceInfoLineOfServiceEnum("COMPRESSION")
-	PbmLineOfServiceInfoLineOfServiceEnumENCRYPTION           = PbmLineOfServiceInfoLineOfServiceEnum("ENCRYPTION")
-	PbmLineOfServiceInfoLineOfServiceEnumREPLICATION          = PbmLineOfServiceInfoLineOfServiceEnum("REPLICATION")
-	PbmLineOfServiceInfoLineOfServiceEnumCACHING              = PbmLineOfServiceInfoLineOfServiceEnum("CACHING")
-	PbmLineOfServiceInfoLineOfServiceEnumPERSISTENCE          = PbmLineOfServiceInfoLineOfServiceEnum("PERSISTENCE")
-	PbmLineOfServiceInfoLineOfServiceEnumDATA_PROVIDER        = PbmLineOfServiceInfoLineOfServiceEnum("DATA_PROVIDER")
-	PbmLineOfServiceInfoLineOfServiceEnumDATASTORE_IO_CONTROL = PbmLineOfServiceInfoLineOfServiceEnum("DATASTORE_IO_CONTROL")
-)
-
-func init() {
-	types.Add("pbm:PbmLineOfServiceInfoLineOfServiceEnum", reflect.TypeOf((*PbmLineOfServiceInfoLineOfServiceEnum)(nil)).Elem())
-}
-
-type PbmObjectType string
-
-const (
-	PbmObjectTypeVirtualMachine         = PbmObjectType("virtualMachine")
-	PbmObjectTypeVirtualMachineAndDisks = PbmObjectType("virtualMachineAndDisks")
-	PbmObjectTypeVirtualDiskId          = PbmObjectType("virtualDiskId")
-	PbmObjectTypeVirtualDiskUUID        = PbmObjectType("virtualDiskUUID")
-	PbmObjectTypeDatastore              = PbmObjectType("datastore")
-	PbmObjectTypeUnknown                = PbmObjectType("unknown")
-)
-
-func init() {
-	types.Add("pbm:PbmObjectType", reflect.TypeOf((*PbmObjectType)(nil)).Elem())
-}
-
-type PbmProfileCategoryEnum string
-
-const (
-	PbmProfileCategoryEnumREQUIREMENT         = PbmProfileCategoryEnum("REQUIREMENT")
-	PbmProfileCategoryEnumRESOURCE            = PbmProfileCategoryEnum("RESOURCE")
-	PbmProfileCategoryEnumDATA_SERVICE_POLICY = PbmProfileCategoryEnum("DATA_SERVICE_POLICY")
-)
-
-func init() {
-	types.Add("pbm:PbmProfileCategoryEnum", reflect.TypeOf((*PbmProfileCategoryEnum)(nil)).Elem())
-}
-
-type PbmProfileResourceTypeEnum string
-
-const (
-	PbmProfileResourceTypeEnumSTORAGE = PbmProfileResourceTypeEnum("STORAGE")
-)
-
-func init() {
-	types.Add("pbm:PbmProfileResourceTypeEnum", reflect.TypeOf((*PbmProfileResourceTypeEnum)(nil)).Elem())
-}
-
-type PbmSystemCreatedProfileType string
-
-const (
-	PbmSystemCreatedProfileTypeVsanDefaultProfile = PbmSystemCreatedProfileType("VsanDefaultProfile")
-	PbmSystemCreatedProfileTypeVVolDefaultProfile = PbmSystemCreatedProfileType("VVolDefaultProfile")
-)
-
-func init() {
-	types.Add("pbm:PbmSystemCreatedProfileType", reflect.TypeOf((*PbmSystemCreatedProfileType)(nil)).Elem())
-}
-
-type PbmVmOperation string
-
-const (
-	PbmVmOperationCREATE      = PbmVmOperation("CREATE")
-	PbmVmOperationRECONFIGURE = PbmVmOperation("RECONFIGURE")
-	PbmVmOperationMIGRATE     = PbmVmOperation("MIGRATE")
-	PbmVmOperationCLONE       = PbmVmOperation("CLONE")
-)
-
-func init() {
-	types.Add("pbm:PbmVmOperation", reflect.TypeOf((*PbmVmOperation)(nil)).Elem())
-}
-
-type PbmVvolType string
-
-const (
-	PbmVvolTypeConfig = PbmVvolType("Config")
-	PbmVvolTypeData   = PbmVvolType("Data")
-	PbmVvolTypeSwap   = PbmVvolType("Swap")
-)
-
-func init() {
-	types.Add("pbm:PbmVvolType", reflect.TypeOf((*PbmVvolType)(nil)).Elem())
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/types/if.go b/installer/vendor/github.com/vmware/govmomi/pbm/types/if.go
deleted file mode 100644
index 2a3ac5acc0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/types/if.go
+++ /dev/null
@@ -1,139 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"reflect"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func (b *PbmCapabilityConstraints) GetPbmCapabilityConstraints() *PbmCapabilityConstraints { return b }
-
-type BasePbmCapabilityConstraints interface {
-	GetPbmCapabilityConstraints() *PbmCapabilityConstraints
-}
-
-func init() {
-	types.Add("BasePbmCapabilityConstraints", reflect.TypeOf((*PbmCapabilityConstraints)(nil)).Elem())
-}
-
-func (b *PbmCapabilityProfile) GetPbmCapabilityProfile() *PbmCapabilityProfile { return b }
-
-type BasePbmCapabilityProfile interface {
-	GetPbmCapabilityProfile() *PbmCapabilityProfile
-}
-
-func init() {
-	types.Add("BasePbmCapabilityProfile", reflect.TypeOf((*PbmCapabilityProfile)(nil)).Elem())
-}
-
-func (b *PbmCapabilityProfilePropertyMismatchFault) GetPbmCapabilityProfilePropertyMismatchFault() *PbmCapabilityProfilePropertyMismatchFault {
-	return b
-}
-
-type BasePbmCapabilityProfilePropertyMismatchFault interface {
-	GetPbmCapabilityProfilePropertyMismatchFault() *PbmCapabilityProfilePropertyMismatchFault
-}
-
-func init() {
-	types.Add("BasePbmCapabilityProfilePropertyMismatchFault", reflect.TypeOf((*PbmCapabilityProfilePropertyMismatchFault)(nil)).Elem())
-}
-
-func (b *PbmCapabilityTypeInfo) GetPbmCapabilityTypeInfo() *PbmCapabilityTypeInfo { return b }
-
-type BasePbmCapabilityTypeInfo interface {
-	GetPbmCapabilityTypeInfo() *PbmCapabilityTypeInfo
-}
-
-func init() {
-	types.Add("BasePbmCapabilityTypeInfo", reflect.TypeOf((*PbmCapabilityTypeInfo)(nil)).Elem())
-}
-
-func (b *PbmCompatibilityCheckFault) GetPbmCompatibilityCheckFault() *PbmCompatibilityCheckFault {
-	return b
-}
-
-type BasePbmCompatibilityCheckFault interface {
-	GetPbmCompatibilityCheckFault() *PbmCompatibilityCheckFault
-}
-
-func init() {
-	types.Add("BasePbmCompatibilityCheckFault", reflect.TypeOf((*PbmCompatibilityCheckFault)(nil)).Elem())
-}
-
-func (b *PbmFault) GetPbmFault() *PbmFault { return b }
-
-type BasePbmFault interface {
-	GetPbmFault() *PbmFault
-}
-
-func init() {
-	types.Add("BasePbmFault", reflect.TypeOf((*PbmFault)(nil)).Elem())
-}
-
-func (b *PbmLineOfServiceInfo) GetPbmLineOfServiceInfo() *PbmLineOfServiceInfo { return b }
-
-type BasePbmLineOfServiceInfo interface {
-	GetPbmLineOfServiceInfo() *PbmLineOfServiceInfo
-}
-
-func init() {
-	types.Add("BasePbmLineOfServiceInfo", reflect.TypeOf((*PbmLineOfServiceInfo)(nil)).Elem())
-}
-
-func (b *PbmPlacementMatchingResources) GetPbmPlacementMatchingResources() *PbmPlacementMatchingResources {
-	return b
-}
-
-type BasePbmPlacementMatchingResources interface {
-	GetPbmPlacementMatchingResources() *PbmPlacementMatchingResources
-}
-
-func init() {
-	types.Add("BasePbmPlacementMatchingResources", reflect.TypeOf((*PbmPlacementMatchingResources)(nil)).Elem())
-}
-
-func (b *PbmPlacementRequirement) GetPbmPlacementRequirement() *PbmPlacementRequirement { return b }
-
-type BasePbmPlacementRequirement interface {
-	GetPbmPlacementRequirement() *PbmPlacementRequirement
-}
-
-func init() {
-	types.Add("BasePbmPlacementRequirement", reflect.TypeOf((*PbmPlacementRequirement)(nil)).Elem())
-}
-
-func (b *PbmProfile) GetPbmProfile() *PbmProfile { return b }
-
-type BasePbmProfile interface {
-	GetPbmProfile() *PbmProfile
-}
-
-func init() {
-	types.Add("BasePbmProfile", reflect.TypeOf((*PbmProfile)(nil)).Elem())
-}
-
-func (b *PbmPropertyMismatchFault) GetPbmPropertyMismatchFault() *PbmPropertyMismatchFault { return b }
-
-type BasePbmPropertyMismatchFault interface {
-	GetPbmPropertyMismatchFault() *PbmPropertyMismatchFault
-}
-
-func init() {
-	types.Add("BasePbmPropertyMismatchFault", reflect.TypeOf((*PbmPropertyMismatchFault)(nil)).Elem())
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/pbm/types/types.go b/installer/vendor/github.com/vmware/govmomi/pbm/types/types.go
deleted file mode 100644
index 47bd73c17b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/pbm/types/types.go
+++ /dev/null
@@ -1,1712 +0,0 @@
-/*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"reflect"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ArrayOfPbmCapabilityConstraintInstance struct {
-	PbmCapabilityConstraintInstance []PbmCapabilityConstraintInstance `xml:"PbmCapabilityConstraintInstance,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityConstraintInstance", reflect.TypeOf((*ArrayOfPbmCapabilityConstraintInstance)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityInstance struct {
-	PbmCapabilityInstance []PbmCapabilityInstance `xml:"PbmCapabilityInstance,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityInstance", reflect.TypeOf((*ArrayOfPbmCapabilityInstance)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityMetadata struct {
-	PbmCapabilityMetadata []PbmCapabilityMetadata `xml:"PbmCapabilityMetadata,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityMetadata", reflect.TypeOf((*ArrayOfPbmCapabilityMetadata)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityMetadataPerCategory struct {
-	PbmCapabilityMetadataPerCategory []PbmCapabilityMetadataPerCategory `xml:"PbmCapabilityMetadataPerCategory,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityMetadataPerCategory", reflect.TypeOf((*ArrayOfPbmCapabilityMetadataPerCategory)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityPropertyInstance struct {
-	PbmCapabilityPropertyInstance []PbmCapabilityPropertyInstance `xml:"PbmCapabilityPropertyInstance,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityPropertyInstance", reflect.TypeOf((*ArrayOfPbmCapabilityPropertyInstance)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityPropertyMetadata struct {
-	PbmCapabilityPropertyMetadata []PbmCapabilityPropertyMetadata `xml:"PbmCapabilityPropertyMetadata,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityPropertyMetadata", reflect.TypeOf((*ArrayOfPbmCapabilityPropertyMetadata)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilitySchema struct {
-	PbmCapabilitySchema []PbmCapabilitySchema `xml:"PbmCapabilitySchema,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilitySchema", reflect.TypeOf((*ArrayOfPbmCapabilitySchema)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilitySubProfile struct {
-	PbmCapabilitySubProfile []PbmCapabilitySubProfile `xml:"PbmCapabilitySubProfile,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilitySubProfile", reflect.TypeOf((*ArrayOfPbmCapabilitySubProfile)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityVendorNamespaceInfo struct {
-	PbmCapabilityVendorNamespaceInfo []PbmCapabilityVendorNamespaceInfo `xml:"PbmCapabilityVendorNamespaceInfo,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityVendorNamespaceInfo", reflect.TypeOf((*ArrayOfPbmCapabilityVendorNamespaceInfo)(nil)).Elem())
-}
-
-type ArrayOfPbmCapabilityVendorResourceTypeInfo struct {
-	PbmCapabilityVendorResourceTypeInfo []PbmCapabilityVendorResourceTypeInfo `xml:"PbmCapabilityVendorResourceTypeInfo,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCapabilityVendorResourceTypeInfo", reflect.TypeOf((*ArrayOfPbmCapabilityVendorResourceTypeInfo)(nil)).Elem())
-}
-
-type ArrayOfPbmCompliancePolicyStatus struct {
-	PbmCompliancePolicyStatus []PbmCompliancePolicyStatus `xml:"PbmCompliancePolicyStatus,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmCompliancePolicyStatus", reflect.TypeOf((*ArrayOfPbmCompliancePolicyStatus)(nil)).Elem())
-}
-
-type ArrayOfPbmComplianceResult struct {
-	PbmComplianceResult []PbmComplianceResult `xml:"PbmComplianceResult,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmComplianceResult", reflect.TypeOf((*ArrayOfPbmComplianceResult)(nil)).Elem())
-}
-
-type ArrayOfPbmDatastoreSpaceStatistics struct {
-	PbmDatastoreSpaceStatistics []PbmDatastoreSpaceStatistics `xml:"PbmDatastoreSpaceStatistics,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmDatastoreSpaceStatistics", reflect.TypeOf((*ArrayOfPbmDatastoreSpaceStatistics)(nil)).Elem())
-}
-
-type ArrayOfPbmDefaultProfileInfo struct {
-	PbmDefaultProfileInfo []PbmDefaultProfileInfo `xml:"PbmDefaultProfileInfo,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmDefaultProfileInfo", reflect.TypeOf((*ArrayOfPbmDefaultProfileInfo)(nil)).Elem())
-}
-
-type ArrayOfPbmPlacementCompatibilityResult struct {
-	PbmPlacementCompatibilityResult []PbmPlacementCompatibilityResult `xml:"PbmPlacementCompatibilityResult,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmPlacementCompatibilityResult", reflect.TypeOf((*ArrayOfPbmPlacementCompatibilityResult)(nil)).Elem())
-}
-
-type ArrayOfPbmPlacementHub struct {
-	PbmPlacementHub []PbmPlacementHub `xml:"PbmPlacementHub,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmPlacementHub", reflect.TypeOf((*ArrayOfPbmPlacementHub)(nil)).Elem())
-}
-
-type ArrayOfPbmPlacementMatchingResources struct {
-	PbmPlacementMatchingResources []BasePbmPlacementMatchingResources `xml:"PbmPlacementMatchingResources,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmPlacementMatchingResources", reflect.TypeOf((*ArrayOfPbmPlacementMatchingResources)(nil)).Elem())
-}
-
-type ArrayOfPbmPlacementRequirement struct {
-	PbmPlacementRequirement []BasePbmPlacementRequirement `xml:"PbmPlacementRequirement,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmPlacementRequirement", reflect.TypeOf((*ArrayOfPbmPlacementRequirement)(nil)).Elem())
-}
-
-type ArrayOfPbmPlacementResourceUtilization struct {
-	PbmPlacementResourceUtilization []PbmPlacementResourceUtilization `xml:"PbmPlacementResourceUtilization,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmPlacementResourceUtilization", reflect.TypeOf((*ArrayOfPbmPlacementResourceUtilization)(nil)).Elem())
-}
-
-type ArrayOfPbmProfile struct {
-	PbmProfile []BasePbmProfile `xml:"PbmProfile,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmProfile", reflect.TypeOf((*ArrayOfPbmProfile)(nil)).Elem())
-}
-
-type ArrayOfPbmProfileId struct {
-	PbmProfileId []PbmProfileId `xml:"PbmProfileId,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmProfileId", reflect.TypeOf((*ArrayOfPbmProfileId)(nil)).Elem())
-}
-
-type ArrayOfPbmProfileOperationOutcome struct {
-	PbmProfileOperationOutcome []PbmProfileOperationOutcome `xml:"PbmProfileOperationOutcome,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmProfileOperationOutcome", reflect.TypeOf((*ArrayOfPbmProfileOperationOutcome)(nil)).Elem())
-}
-
-type ArrayOfPbmProfileResourceType struct {
-	PbmProfileResourceType []PbmProfileResourceType `xml:"PbmProfileResourceType,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmProfileResourceType", reflect.TypeOf((*ArrayOfPbmProfileResourceType)(nil)).Elem())
-}
-
-type ArrayOfPbmProfileType struct {
-	PbmProfileType []PbmProfileType `xml:"PbmProfileType,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmProfileType", reflect.TypeOf((*ArrayOfPbmProfileType)(nil)).Elem())
-}
-
-type ArrayOfPbmQueryProfileResult struct {
-	PbmQueryProfileResult []PbmQueryProfileResult `xml:"PbmQueryProfileResult,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmQueryProfileResult", reflect.TypeOf((*ArrayOfPbmQueryProfileResult)(nil)).Elem())
-}
-
-type ArrayOfPbmQueryReplicationGroupResult struct {
-	PbmQueryReplicationGroupResult []PbmQueryReplicationGroupResult `xml:"PbmQueryReplicationGroupResult,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmQueryReplicationGroupResult", reflect.TypeOf((*ArrayOfPbmQueryReplicationGroupResult)(nil)).Elem())
-}
-
-type ArrayOfPbmRollupComplianceResult struct {
-	PbmRollupComplianceResult []PbmRollupComplianceResult `xml:"PbmRollupComplianceResult,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmRollupComplianceResult", reflect.TypeOf((*ArrayOfPbmRollupComplianceResult)(nil)).Elem())
-}
-
-type ArrayOfPbmServerObjectRef struct {
-	PbmServerObjectRef []PbmServerObjectRef `xml:"PbmServerObjectRef,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:ArrayOfPbmServerObjectRef", reflect.TypeOf((*ArrayOfPbmServerObjectRef)(nil)).Elem())
-}
-
-type PbmAboutInfo struct {
-	types.DynamicData
-
-	Name         string `xml:"name"`
-	Version      string `xml:"version"`
-	InstanceUuid string `xml:"instanceUuid"`
-}
-
-func init() {
-	types.Add("pbm:PbmAboutInfo", reflect.TypeOf((*PbmAboutInfo)(nil)).Elem())
-}
-
-type PbmAlreadyExists struct {
-	PbmFault
-
-	Name string `xml:"name,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmAlreadyExists", reflect.TypeOf((*PbmAlreadyExists)(nil)).Elem())
-}
-
-type PbmAssignDefaultRequirementProfile PbmAssignDefaultRequirementProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmAssignDefaultRequirementProfile", reflect.TypeOf((*PbmAssignDefaultRequirementProfile)(nil)).Elem())
-}
-
-type PbmAssignDefaultRequirementProfileRequestType struct {
-	This       types.ManagedObjectReference `xml:"_this"`
-	Profile    PbmProfileId                 `xml:"profile"`
-	Datastores []PbmPlacementHub            `xml:"datastores"`
-}
-
-func init() {
-	types.Add("pbm:PbmAssignDefaultRequirementProfileRequestType", reflect.TypeOf((*PbmAssignDefaultRequirementProfileRequestType)(nil)).Elem())
-}
-
-type PbmAssignDefaultRequirementProfileResponse struct {
-}
-
-type PbmCapabilityConstraintInstance struct {
-	types.DynamicData
-
-	PropertyInstance []PbmCapabilityPropertyInstance `xml:"propertyInstance"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityConstraintInstance", reflect.TypeOf((*PbmCapabilityConstraintInstance)(nil)).Elem())
-}
-
-type PbmCapabilityConstraints struct {
-	types.DynamicData
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityConstraints", reflect.TypeOf((*PbmCapabilityConstraints)(nil)).Elem())
-}
-
-type PbmCapabilityDescription struct {
-	types.DynamicData
-
-	Description PbmExtendedElementDescription `xml:"description"`
-	Value       types.AnyType                 `xml:"value,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityDescription", reflect.TypeOf((*PbmCapabilityDescription)(nil)).Elem())
-}
-
-type PbmCapabilityDiscreteSet struct {
-	types.DynamicData
-
-	Values []types.AnyType `xml:"values,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityDiscreteSet", reflect.TypeOf((*PbmCapabilityDiscreteSet)(nil)).Elem())
-}
-
-type PbmCapabilityGenericTypeInfo struct {
-	PbmCapabilityTypeInfo
-
-	GenericTypeName string `xml:"genericTypeName"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityGenericTypeInfo", reflect.TypeOf((*PbmCapabilityGenericTypeInfo)(nil)).Elem())
-}
-
-type PbmCapabilityInstance struct {
-	types.DynamicData
-
-	Id         PbmCapabilityMetadataUniqueId     `xml:"id"`
-	Constraint []PbmCapabilityConstraintInstance `xml:"constraint"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityInstance", reflect.TypeOf((*PbmCapabilityInstance)(nil)).Elem())
-}
-
-type PbmCapabilityMetadata struct {
-	types.DynamicData
-
-	Id                       PbmCapabilityMetadataUniqueId   `xml:"id"`
-	Summary                  PbmExtendedElementDescription   `xml:"summary"`
-	Mandatory                *bool                           `xml:"mandatory"`
-	Hint                     *bool                           `xml:"hint"`
-	KeyId                    string                          `xml:"keyId,omitempty"`
-	AllowMultipleConstraints *bool                           `xml:"allowMultipleConstraints"`
-	PropertyMetadata         []PbmCapabilityPropertyMetadata `xml:"propertyMetadata"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityMetadata", reflect.TypeOf((*PbmCapabilityMetadata)(nil)).Elem())
-}
-
-type PbmCapabilityMetadataPerCategory struct {
-	types.DynamicData
-
-	SubCategory        string                  `xml:"subCategory"`
-	CapabilityMetadata []PbmCapabilityMetadata `xml:"capabilityMetadata"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityMetadataPerCategory", reflect.TypeOf((*PbmCapabilityMetadataPerCategory)(nil)).Elem())
-}
-
-type PbmCapabilityMetadataUniqueId struct {
-	types.DynamicData
-
-	Namespace string `xml:"namespace"`
-	Id        string `xml:"id"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityMetadataUniqueId", reflect.TypeOf((*PbmCapabilityMetadataUniqueId)(nil)).Elem())
-}
-
-type PbmCapabilityNamespaceInfo struct {
-	types.DynamicData
-
-	Version   string                         `xml:"version"`
-	Namespace string                         `xml:"namespace"`
-	Info      *PbmExtendedElementDescription `xml:"info,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityNamespaceInfo", reflect.TypeOf((*PbmCapabilityNamespaceInfo)(nil)).Elem())
-}
-
-type PbmCapabilityProfile struct {
-	PbmProfile
-
-	ProfileCategory          string                       `xml:"profileCategory"`
-	ResourceType             PbmProfileResourceType       `xml:"resourceType"`
-	Constraints              BasePbmCapabilityConstraints `xml:"constraints,typeattr"`
-	GenerationId             int64                        `xml:"generationId,omitempty"`
-	IsDefault                bool                         `xml:"isDefault"`
-	SystemCreatedProfileType string                       `xml:"systemCreatedProfileType,omitempty"`
-	LineOfService            string                       `xml:"lineOfService,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityProfile", reflect.TypeOf((*PbmCapabilityProfile)(nil)).Elem())
-}
-
-type PbmCapabilityProfileCreateSpec struct {
-	types.DynamicData
-
-	Name         string                       `xml:"name"`
-	Description  string                       `xml:"description,omitempty"`
-	Category     string                       `xml:"category,omitempty"`
-	ResourceType PbmProfileResourceType       `xml:"resourceType"`
-	Constraints  BasePbmCapabilityConstraints `xml:"constraints,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityProfileCreateSpec", reflect.TypeOf((*PbmCapabilityProfileCreateSpec)(nil)).Elem())
-}
-
-type PbmCapabilityProfilePropertyMismatchFault struct {
-	PbmPropertyMismatchFault
-
-	ResourcePropertyInstance PbmCapabilityPropertyInstance `xml:"resourcePropertyInstance"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityProfilePropertyMismatchFault", reflect.TypeOf((*PbmCapabilityProfilePropertyMismatchFault)(nil)).Elem())
-}
-
-type PbmCapabilityProfilePropertyMismatchFaultFault BasePbmCapabilityProfilePropertyMismatchFault
-
-func init() {
-	types.Add("pbm:PbmCapabilityProfilePropertyMismatchFaultFault", reflect.TypeOf((*PbmCapabilityProfilePropertyMismatchFaultFault)(nil)).Elem())
-}
-
-type PbmCapabilityProfileUpdateSpec struct {
-	types.DynamicData
-
-	Name        string                       `xml:"name,omitempty"`
-	Description string                       `xml:"description,omitempty"`
-	Constraints BasePbmCapabilityConstraints `xml:"constraints,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityProfileUpdateSpec", reflect.TypeOf((*PbmCapabilityProfileUpdateSpec)(nil)).Elem())
-}
-
-type PbmCapabilityPropertyInstance struct {
-	types.DynamicData
-
-	Id       string        `xml:"id"`
-	Operator string        `xml:"operator,omitempty"`
-	Value    types.AnyType `xml:"value,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityPropertyInstance", reflect.TypeOf((*PbmCapabilityPropertyInstance)(nil)).Elem())
-}
-
-type PbmCapabilityPropertyMetadata struct {
-	types.DynamicData
-
-	Id                   string                        `xml:"id"`
-	Summary              PbmExtendedElementDescription `xml:"summary"`
-	Mandatory            bool                          `xml:"mandatory"`
-	Type                 BasePbmCapabilityTypeInfo     `xml:"type,omitempty,typeattr"`
-	DefaultValue         types.AnyType                 `xml:"defaultValue,omitempty,typeattr"`
-	AllowedValue         types.AnyType                 `xml:"allowedValue,omitempty,typeattr"`
-	RequirementsTypeHint string                        `xml:"requirementsTypeHint,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityPropertyMetadata", reflect.TypeOf((*PbmCapabilityPropertyMetadata)(nil)).Elem())
-}
-
-type PbmCapabilityRange struct {
-	types.DynamicData
-
-	Min types.AnyType `xml:"min,typeattr"`
-	Max types.AnyType `xml:"max,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityRange", reflect.TypeOf((*PbmCapabilityRange)(nil)).Elem())
-}
-
-type PbmCapabilitySchema struct {
-	types.DynamicData
-
-	VendorInfo                    PbmCapabilitySchemaVendorInfo      `xml:"vendorInfo"`
-	NamespaceInfo                 PbmCapabilityNamespaceInfo         `xml:"namespaceInfo"`
-	LineOfService                 BasePbmLineOfServiceInfo           `xml:"lineOfService,omitempty,typeattr"`
-	CapabilityMetadataPerCategory []PbmCapabilityMetadataPerCategory `xml:"capabilityMetadataPerCategory"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilitySchema", reflect.TypeOf((*PbmCapabilitySchema)(nil)).Elem())
-}
-
-type PbmCapabilitySchemaVendorInfo struct {
-	types.DynamicData
-
-	VendorUuid string                        `xml:"vendorUuid"`
-	Info       PbmExtendedElementDescription `xml:"info"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilitySchemaVendorInfo", reflect.TypeOf((*PbmCapabilitySchemaVendorInfo)(nil)).Elem())
-}
-
-type PbmCapabilitySubProfile struct {
-	types.DynamicData
-
-	Name           string                  `xml:"name"`
-	Capability     []PbmCapabilityInstance `xml:"capability"`
-	ForceProvision *bool                   `xml:"forceProvision"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilitySubProfile", reflect.TypeOf((*PbmCapabilitySubProfile)(nil)).Elem())
-}
-
-type PbmCapabilitySubProfileConstraints struct {
-	PbmCapabilityConstraints
-
-	SubProfiles []PbmCapabilitySubProfile `xml:"subProfiles"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilitySubProfileConstraints", reflect.TypeOf((*PbmCapabilitySubProfileConstraints)(nil)).Elem())
-}
-
-type PbmCapabilityTimeSpan struct {
-	types.DynamicData
-
-	Value int32  `xml:"value"`
-	Unit  string `xml:"unit"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityTimeSpan", reflect.TypeOf((*PbmCapabilityTimeSpan)(nil)).Elem())
-}
-
-type PbmCapabilityTypeInfo struct {
-	types.DynamicData
-
-	TypeName string `xml:"typeName"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityTypeInfo", reflect.TypeOf((*PbmCapabilityTypeInfo)(nil)).Elem())
-}
-
-type PbmCapabilityVendorNamespaceInfo struct {
-	types.DynamicData
-
-	VendorInfo    PbmCapabilitySchemaVendorInfo `xml:"vendorInfo"`
-	NamespaceInfo PbmCapabilityNamespaceInfo    `xml:"namespaceInfo"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityVendorNamespaceInfo", reflect.TypeOf((*PbmCapabilityVendorNamespaceInfo)(nil)).Elem())
-}
-
-type PbmCapabilityVendorResourceTypeInfo struct {
-	types.DynamicData
-
-	ResourceType        string                             `xml:"resourceType"`
-	VendorNamespaceInfo []PbmCapabilityVendorNamespaceInfo `xml:"vendorNamespaceInfo"`
-}
-
-func init() {
-	types.Add("pbm:PbmCapabilityVendorResourceTypeInfo", reflect.TypeOf((*PbmCapabilityVendorResourceTypeInfo)(nil)).Elem())
-}
-
-type PbmCheckCompatibility PbmCheckCompatibilityRequestType
-
-func init() {
-	types.Add("pbm:PbmCheckCompatibility", reflect.TypeOf((*PbmCheckCompatibility)(nil)).Elem())
-}
-
-type PbmCheckCompatibilityRequestType struct {
-	This         types.ManagedObjectReference `xml:"_this"`
-	HubsToSearch []PbmPlacementHub            `xml:"hubsToSearch,omitempty"`
-	Profile      PbmProfileId                 `xml:"profile"`
-}
-
-func init() {
-	types.Add("pbm:PbmCheckCompatibilityRequestType", reflect.TypeOf((*PbmCheckCompatibilityRequestType)(nil)).Elem())
-}
-
-type PbmCheckCompatibilityResponse struct {
-	Returnval []PbmPlacementCompatibilityResult `xml:"returnval,omitempty"`
-}
-
-type PbmCheckCompatibilityWithSpec PbmCheckCompatibilityWithSpecRequestType
-
-func init() {
-	types.Add("pbm:PbmCheckCompatibilityWithSpec", reflect.TypeOf((*PbmCheckCompatibilityWithSpec)(nil)).Elem())
-}
-
-type PbmCheckCompatibilityWithSpecRequestType struct {
-	This         types.ManagedObjectReference   `xml:"_this"`
-	HubsToSearch []PbmPlacementHub              `xml:"hubsToSearch,omitempty"`
-	ProfileSpec  PbmCapabilityProfileCreateSpec `xml:"profileSpec"`
-}
-
-func init() {
-	types.Add("pbm:PbmCheckCompatibilityWithSpecRequestType", reflect.TypeOf((*PbmCheckCompatibilityWithSpecRequestType)(nil)).Elem())
-}
-
-type PbmCheckCompatibilityWithSpecResponse struct {
-	Returnval []PbmPlacementCompatibilityResult `xml:"returnval,omitempty"`
-}
-
-type PbmCheckCompliance PbmCheckComplianceRequestType
-
-func init() {
-	types.Add("pbm:PbmCheckCompliance", reflect.TypeOf((*PbmCheckCompliance)(nil)).Elem())
-}
-
-type PbmCheckComplianceRequestType struct {
-	This     types.ManagedObjectReference `xml:"_this"`
-	Entities []PbmServerObjectRef         `xml:"entities"`
-	Profile  *PbmProfileId                `xml:"profile,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmCheckComplianceRequestType", reflect.TypeOf((*PbmCheckComplianceRequestType)(nil)).Elem())
-}
-
-type PbmCheckComplianceResponse struct {
-	Returnval []PbmComplianceResult `xml:"returnval,omitempty"`
-}
-
-type PbmCheckRequirements PbmCheckRequirementsRequestType
-
-func init() {
-	types.Add("pbm:PbmCheckRequirements", reflect.TypeOf((*PbmCheckRequirements)(nil)).Elem())
-}
-
-type PbmCheckRequirementsRequestType struct {
-	This                        types.ManagedObjectReference  `xml:"_this"`
-	HubsToSearch                []PbmPlacementHub             `xml:"hubsToSearch,omitempty"`
-	PlacementSubjectRef         *PbmServerObjectRef           `xml:"placementSubjectRef,omitempty"`
-	PlacementSubjectRequirement []BasePbmPlacementRequirement `xml:"placementSubjectRequirement,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmCheckRequirementsRequestType", reflect.TypeOf((*PbmCheckRequirementsRequestType)(nil)).Elem())
-}
-
-type PbmCheckRequirementsResponse struct {
-	Returnval []PbmPlacementCompatibilityResult `xml:"returnval,omitempty"`
-}
-
-type PbmCheckRollupCompliance PbmCheckRollupComplianceRequestType
-
-func init() {
-	types.Add("pbm:PbmCheckRollupCompliance", reflect.TypeOf((*PbmCheckRollupCompliance)(nil)).Elem())
-}
-
-type PbmCheckRollupComplianceRequestType struct {
-	This   types.ManagedObjectReference `xml:"_this"`
-	Entity []PbmServerObjectRef         `xml:"entity"`
-}
-
-func init() {
-	types.Add("pbm:PbmCheckRollupComplianceRequestType", reflect.TypeOf((*PbmCheckRollupComplianceRequestType)(nil)).Elem())
-}
-
-type PbmCheckRollupComplianceResponse struct {
-	Returnval []PbmRollupComplianceResult `xml:"returnval,omitempty"`
-}
-
-type PbmCompatibilityCheckFault struct {
-	PbmFault
-
-	Hub PbmPlacementHub `xml:"hub"`
-}
-
-func init() {
-	types.Add("pbm:PbmCompatibilityCheckFault", reflect.TypeOf((*PbmCompatibilityCheckFault)(nil)).Elem())
-}
-
-type PbmCompatibilityCheckFaultFault BasePbmCompatibilityCheckFault
-
-func init() {
-	types.Add("pbm:PbmCompatibilityCheckFaultFault", reflect.TypeOf((*PbmCompatibilityCheckFaultFault)(nil)).Elem())
-}
-
-type PbmComplianceOperationalStatus struct {
-	types.DynamicData
-
-	Healthy           *bool      `xml:"healthy"`
-	OperationETA      *time.Time `xml:"operationETA"`
-	OperationProgress int64      `xml:"operationProgress,omitempty"`
-	Transitional      *bool      `xml:"transitional"`
-}
-
-func init() {
-	types.Add("pbm:PbmComplianceOperationalStatus", reflect.TypeOf((*PbmComplianceOperationalStatus)(nil)).Elem())
-}
-
-type PbmCompliancePolicyStatus struct {
-	types.DynamicData
-
-	ExpectedValue PbmCapabilityInstance  `xml:"expectedValue"`
-	CurrentValue  *PbmCapabilityInstance `xml:"currentValue,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmCompliancePolicyStatus", reflect.TypeOf((*PbmCompliancePolicyStatus)(nil)).Elem())
-}
-
-type PbmComplianceResult struct {
-	types.DynamicData
-
-	CheckTime            time.Time                       `xml:"checkTime"`
-	Entity               PbmServerObjectRef              `xml:"entity"`
-	Profile              *PbmProfileId                   `xml:"profile,omitempty"`
-	ComplianceTaskStatus string                          `xml:"complianceTaskStatus,omitempty"`
-	ComplianceStatus     string                          `xml:"complianceStatus"`
-	Mismatch             bool                            `xml:"mismatch"`
-	ViolatedPolicies     []PbmCompliancePolicyStatus     `xml:"violatedPolicies,omitempty"`
-	ErrorCause           []types.LocalizedMethodFault    `xml:"errorCause,omitempty"`
-	OperationalStatus    *PbmComplianceOperationalStatus `xml:"operationalStatus,omitempty"`
-	Info                 *PbmExtendedElementDescription  `xml:"info,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmComplianceResult", reflect.TypeOf((*PbmComplianceResult)(nil)).Elem())
-}
-
-type PbmCreate PbmCreateRequestType
-
-func init() {
-	types.Add("pbm:PbmCreate", reflect.TypeOf((*PbmCreate)(nil)).Elem())
-}
-
-type PbmCreateRequestType struct {
-	This       types.ManagedObjectReference   `xml:"_this"`
-	CreateSpec PbmCapabilityProfileCreateSpec `xml:"createSpec"`
-}
-
-func init() {
-	types.Add("pbm:PbmCreateRequestType", reflect.TypeOf((*PbmCreateRequestType)(nil)).Elem())
-}
-
-type PbmCreateResponse struct {
-	Returnval PbmProfileId `xml:"returnval"`
-}
-
-type PbmDataServiceToPoliciesMap struct {
-	types.DynamicData
-
-	DataServicePolicy     PbmProfileId                `xml:"dataServicePolicy"`
-	ParentStoragePolicies []PbmProfileId              `xml:"parentStoragePolicies,omitempty"`
-	Fault                 *types.LocalizedMethodFault `xml:"fault,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmDataServiceToPoliciesMap", reflect.TypeOf((*PbmDataServiceToPoliciesMap)(nil)).Elem())
-}
-
-type PbmDatastoreSpaceStatistics struct {
-	types.DynamicData
-
-	ProfileId         string `xml:"profileId,omitempty"`
-	PhysicalTotalInMB int64  `xml:"physicalTotalInMB"`
-	PhysicalFreeInMB  int64  `xml:"physicalFreeInMB"`
-	PhysicalUsedInMB  int64  `xml:"physicalUsedInMB"`
-	LogicalLimitInMB  int64  `xml:"logicalLimitInMB,omitempty"`
-	LogicalFreeInMB   int64  `xml:"logicalFreeInMB"`
-	LogicalUsedInMB   int64  `xml:"logicalUsedInMB"`
-}
-
-func init() {
-	types.Add("pbm:PbmDatastoreSpaceStatistics", reflect.TypeOf((*PbmDatastoreSpaceStatistics)(nil)).Elem())
-}
-
-type PbmDefaultCapabilityProfile struct {
-	PbmCapabilityProfile
-
-	VvolType    []string `xml:"vvolType"`
-	ContainerId string   `xml:"containerId"`
-}
-
-func init() {
-	types.Add("pbm:PbmDefaultCapabilityProfile", reflect.TypeOf((*PbmDefaultCapabilityProfile)(nil)).Elem())
-}
-
-type PbmDefaultProfileAppliesFault struct {
-	PbmCompatibilityCheckFault
-}
-
-func init() {
-	types.Add("pbm:PbmDefaultProfileAppliesFault", reflect.TypeOf((*PbmDefaultProfileAppliesFault)(nil)).Elem())
-}
-
-type PbmDefaultProfileAppliesFaultFault PbmDefaultProfileAppliesFault
-
-func init() {
-	types.Add("pbm:PbmDefaultProfileAppliesFaultFault", reflect.TypeOf((*PbmDefaultProfileAppliesFaultFault)(nil)).Elem())
-}
-
-type PbmDefaultProfileInfo struct {
-	types.DynamicData
-
-	Datastores     []PbmPlacementHub `xml:"datastores"`
-	DefaultProfile BasePbmProfile    `xml:"defaultProfile,omitempty,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmDefaultProfileInfo", reflect.TypeOf((*PbmDefaultProfileInfo)(nil)).Elem())
-}
-
-type PbmDelete PbmDeleteRequestType
-
-func init() {
-	types.Add("pbm:PbmDelete", reflect.TypeOf((*PbmDelete)(nil)).Elem())
-}
-
-type PbmDeleteRequestType struct {
-	This      types.ManagedObjectReference `xml:"_this"`
-	ProfileId []PbmProfileId               `xml:"profileId"`
-}
-
-func init() {
-	types.Add("pbm:PbmDeleteRequestType", reflect.TypeOf((*PbmDeleteRequestType)(nil)).Elem())
-}
-
-type PbmDeleteResponse struct {
-	Returnval []PbmProfileOperationOutcome `xml:"returnval,omitempty"`
-}
-
-type PbmDuplicateName struct {
-	PbmFault
-
-	Name string `xml:"name"`
-}
-
-func init() {
-	types.Add("pbm:PbmDuplicateName", reflect.TypeOf((*PbmDuplicateName)(nil)).Elem())
-}
-
-type PbmDuplicateNameFault PbmDuplicateName
-
-func init() {
-	types.Add("pbm:PbmDuplicateNameFault", reflect.TypeOf((*PbmDuplicateNameFault)(nil)).Elem())
-}
-
-type PbmExtendedElementDescription struct {
-	types.DynamicData
-
-	Label                   string              `xml:"label"`
-	Summary                 string              `xml:"summary"`
-	Key                     string              `xml:"key"`
-	MessageCatalogKeyPrefix string              `xml:"messageCatalogKeyPrefix"`
-	MessageArg              []types.KeyAnyValue `xml:"messageArg,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmExtendedElementDescription", reflect.TypeOf((*PbmExtendedElementDescription)(nil)).Elem())
-}
-
-type PbmFault struct {
-	types.MethodFault
-}
-
-func init() {
-	types.Add("pbm:PbmFault", reflect.TypeOf((*PbmFault)(nil)).Elem())
-}
-
-type PbmFaultFault BasePbmFault
-
-func init() {
-	types.Add("pbm:PbmFaultFault", reflect.TypeOf((*PbmFaultFault)(nil)).Elem())
-}
-
-type PbmFaultInvalidLogin struct {
-	PbmFault
-}
-
-func init() {
-	types.Add("pbm:PbmFaultInvalidLogin", reflect.TypeOf((*PbmFaultInvalidLogin)(nil)).Elem())
-}
-
-type PbmFaultInvalidLoginFault PbmFaultInvalidLogin
-
-func init() {
-	types.Add("pbm:PbmFaultInvalidLoginFault", reflect.TypeOf((*PbmFaultInvalidLoginFault)(nil)).Elem())
-}
-
-type PbmFaultNotFound struct {
-	PbmFault
-}
-
-func init() {
-	types.Add("pbm:PbmFaultNotFound", reflect.TypeOf((*PbmFaultNotFound)(nil)).Elem())
-}
-
-type PbmFaultNotFoundFault PbmFaultNotFound
-
-func init() {
-	types.Add("pbm:PbmFaultNotFoundFault", reflect.TypeOf((*PbmFaultNotFoundFault)(nil)).Elem())
-}
-
-type PbmFaultProfileStorageFault struct {
-	PbmFault
-}
-
-func init() {
-	types.Add("pbm:PbmFaultProfileStorageFault", reflect.TypeOf((*PbmFaultProfileStorageFault)(nil)).Elem())
-}
-
-type PbmFaultProfileStorageFaultFault PbmFaultProfileStorageFault
-
-func init() {
-	types.Add("pbm:PbmFaultProfileStorageFaultFault", reflect.TypeOf((*PbmFaultProfileStorageFaultFault)(nil)).Elem())
-}
-
-type PbmFetchCapabilityMetadata PbmFetchCapabilityMetadataRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchCapabilityMetadata", reflect.TypeOf((*PbmFetchCapabilityMetadata)(nil)).Elem())
-}
-
-type PbmFetchCapabilityMetadataRequestType struct {
-	This         types.ManagedObjectReference `xml:"_this"`
-	ResourceType *PbmProfileResourceType      `xml:"resourceType,omitempty"`
-	VendorUuid   string                       `xml:"vendorUuid,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchCapabilityMetadataRequestType", reflect.TypeOf((*PbmFetchCapabilityMetadataRequestType)(nil)).Elem())
-}
-
-type PbmFetchCapabilityMetadataResponse struct {
-	Returnval []PbmCapabilityMetadataPerCategory `xml:"returnval,omitempty"`
-}
-
-type PbmFetchCapabilitySchema PbmFetchCapabilitySchemaRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchCapabilitySchema", reflect.TypeOf((*PbmFetchCapabilitySchema)(nil)).Elem())
-}
-
-type PbmFetchCapabilitySchemaRequestType struct {
-	This          types.ManagedObjectReference `xml:"_this"`
-	VendorUuid    string                       `xml:"vendorUuid,omitempty"`
-	LineOfService []string                     `xml:"lineOfService,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchCapabilitySchemaRequestType", reflect.TypeOf((*PbmFetchCapabilitySchemaRequestType)(nil)).Elem())
-}
-
-type PbmFetchCapabilitySchemaResponse struct {
-	Returnval []PbmCapabilitySchema `xml:"returnval,omitempty"`
-}
-
-type PbmFetchComplianceResult PbmFetchComplianceResultRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchComplianceResult", reflect.TypeOf((*PbmFetchComplianceResult)(nil)).Elem())
-}
-
-type PbmFetchComplianceResultRequestType struct {
-	This     types.ManagedObjectReference `xml:"_this"`
-	Entities []PbmServerObjectRef         `xml:"entities"`
-	Profile  *PbmProfileId                `xml:"profile,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchComplianceResultRequestType", reflect.TypeOf((*PbmFetchComplianceResultRequestType)(nil)).Elem())
-}
-
-type PbmFetchComplianceResultResponse struct {
-	Returnval []PbmComplianceResult `xml:"returnval,omitempty"`
-}
-
-type PbmFetchResourceType PbmFetchResourceTypeRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchResourceType", reflect.TypeOf((*PbmFetchResourceType)(nil)).Elem())
-}
-
-type PbmFetchResourceTypeRequestType struct {
-	This types.ManagedObjectReference `xml:"_this"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchResourceTypeRequestType", reflect.TypeOf((*PbmFetchResourceTypeRequestType)(nil)).Elem())
-}
-
-type PbmFetchResourceTypeResponse struct {
-	Returnval []PbmProfileResourceType `xml:"returnval,omitempty"`
-}
-
-type PbmFetchRollupComplianceResult PbmFetchRollupComplianceResultRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchRollupComplianceResult", reflect.TypeOf((*PbmFetchRollupComplianceResult)(nil)).Elem())
-}
-
-type PbmFetchRollupComplianceResultRequestType struct {
-	This   types.ManagedObjectReference `xml:"_this"`
-	Entity []PbmServerObjectRef         `xml:"entity"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchRollupComplianceResultRequestType", reflect.TypeOf((*PbmFetchRollupComplianceResultRequestType)(nil)).Elem())
-}
-
-type PbmFetchRollupComplianceResultResponse struct {
-	Returnval []PbmRollupComplianceResult `xml:"returnval,omitempty"`
-}
-
-type PbmFetchVendorInfo PbmFetchVendorInfoRequestType
-
-func init() {
-	types.Add("pbm:PbmFetchVendorInfo", reflect.TypeOf((*PbmFetchVendorInfo)(nil)).Elem())
-}
-
-type PbmFetchVendorInfoRequestType struct {
-	This         types.ManagedObjectReference `xml:"_this"`
-	ResourceType *PbmProfileResourceType      `xml:"resourceType,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmFetchVendorInfoRequestType", reflect.TypeOf((*PbmFetchVendorInfoRequestType)(nil)).Elem())
-}
-
-type PbmFetchVendorInfoResponse struct {
-	Returnval []PbmCapabilityVendorResourceTypeInfo `xml:"returnval,omitempty"`
-}
-
-type PbmFindApplicableDefaultProfile PbmFindApplicableDefaultProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmFindApplicableDefaultProfile", reflect.TypeOf((*PbmFindApplicableDefaultProfile)(nil)).Elem())
-}
-
-type PbmFindApplicableDefaultProfileRequestType struct {
-	This       types.ManagedObjectReference `xml:"_this"`
-	Datastores []PbmPlacementHub            `xml:"datastores"`
-}
-
-func init() {
-	types.Add("pbm:PbmFindApplicableDefaultProfileRequestType", reflect.TypeOf((*PbmFindApplicableDefaultProfileRequestType)(nil)).Elem())
-}
-
-type PbmFindApplicableDefaultProfileResponse struct {
-	Returnval []BasePbmProfile `xml:"returnval,omitempty,typeattr"`
-}
-
-type PbmIncompatibleVendorSpecificRuleSet struct {
-	PbmCapabilityProfilePropertyMismatchFault
-}
-
-func init() {
-	types.Add("pbm:PbmIncompatibleVendorSpecificRuleSet", reflect.TypeOf((*PbmIncompatibleVendorSpecificRuleSet)(nil)).Elem())
-}
-
-type PbmIncompatibleVendorSpecificRuleSetFault PbmIncompatibleVendorSpecificRuleSet
-
-func init() {
-	types.Add("pbm:PbmIncompatibleVendorSpecificRuleSetFault", reflect.TypeOf((*PbmIncompatibleVendorSpecificRuleSetFault)(nil)).Elem())
-}
-
-type PbmLegacyHubsNotSupported struct {
-	PbmFault
-
-	Hubs []PbmPlacementHub `xml:"hubs"`
-}
-
-func init() {
-	types.Add("pbm:PbmLegacyHubsNotSupported", reflect.TypeOf((*PbmLegacyHubsNotSupported)(nil)).Elem())
-}
-
-type PbmLegacyHubsNotSupportedFault PbmLegacyHubsNotSupported
-
-func init() {
-	types.Add("pbm:PbmLegacyHubsNotSupportedFault", reflect.TypeOf((*PbmLegacyHubsNotSupportedFault)(nil)).Elem())
-}
-
-type PbmLineOfServiceInfo struct {
-	types.DynamicData
-
-	LineOfService string                         `xml:"lineOfService"`
-	Name          PbmExtendedElementDescription  `xml:"name"`
-	Description   *PbmExtendedElementDescription `xml:"description,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmLineOfServiceInfo", reflect.TypeOf((*PbmLineOfServiceInfo)(nil)).Elem())
-}
-
-type PbmNonExistentHubs struct {
-	PbmFault
-
-	Hubs []PbmPlacementHub `xml:"hubs"`
-}
-
-func init() {
-	types.Add("pbm:PbmNonExistentHubs", reflect.TypeOf((*PbmNonExistentHubs)(nil)).Elem())
-}
-
-type PbmNonExistentHubsFault PbmNonExistentHubs
-
-func init() {
-	types.Add("pbm:PbmNonExistentHubsFault", reflect.TypeOf((*PbmNonExistentHubsFault)(nil)).Elem())
-}
-
-type PbmPersistenceBasedDataServiceInfo struct {
-	PbmLineOfServiceInfo
-
-	CompatiblePersistenceSchemaNamespace []string `xml:"compatiblePersistenceSchemaNamespace,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmPersistenceBasedDataServiceInfo", reflect.TypeOf((*PbmPersistenceBasedDataServiceInfo)(nil)).Elem())
-}
-
-type PbmPlacementCapabilityConstraintsRequirement struct {
-	PbmPlacementRequirement
-
-	Constraints BasePbmCapabilityConstraints `xml:"constraints,typeattr"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementCapabilityConstraintsRequirement", reflect.TypeOf((*PbmPlacementCapabilityConstraintsRequirement)(nil)).Elem())
-}
-
-type PbmPlacementCapabilityProfileRequirement struct {
-	PbmPlacementRequirement
-
-	ProfileId PbmProfileId `xml:"profileId"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementCapabilityProfileRequirement", reflect.TypeOf((*PbmPlacementCapabilityProfileRequirement)(nil)).Elem())
-}
-
-type PbmPlacementCompatibilityResult struct {
-	types.DynamicData
-
-	Hub               PbmPlacementHub                     `xml:"hub"`
-	MatchingResources []BasePbmPlacementMatchingResources `xml:"matchingResources,omitempty,typeattr"`
-	HowMany           int64                               `xml:"howMany,omitempty"`
-	Utilization       []PbmPlacementResourceUtilization   `xml:"utilization,omitempty"`
-	Warning           []types.LocalizedMethodFault        `xml:"warning,omitempty"`
-	Error             []types.LocalizedMethodFault        `xml:"error,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementCompatibilityResult", reflect.TypeOf((*PbmPlacementCompatibilityResult)(nil)).Elem())
-}
-
-type PbmPlacementHub struct {
-	types.DynamicData
-
-	HubType string `xml:"hubType"`
-	HubId   string `xml:"hubId"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementHub", reflect.TypeOf((*PbmPlacementHub)(nil)).Elem())
-}
-
-type PbmPlacementMatchingReplicationResources struct {
-	PbmPlacementMatchingResources
-
-	ReplicationGroup []types.ReplicationGroupId `xml:"replicationGroup,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementMatchingReplicationResources", reflect.TypeOf((*PbmPlacementMatchingReplicationResources)(nil)).Elem())
-}
-
-type PbmPlacementMatchingResources struct {
-	types.DynamicData
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementMatchingResources", reflect.TypeOf((*PbmPlacementMatchingResources)(nil)).Elem())
-}
-
-type PbmPlacementRequirement struct {
-	types.DynamicData
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementRequirement", reflect.TypeOf((*PbmPlacementRequirement)(nil)).Elem())
-}
-
-type PbmPlacementResourceUtilization struct {
-	types.DynamicData
-
-	Name            PbmExtendedElementDescription `xml:"name"`
-	Description     PbmExtendedElementDescription `xml:"description"`
-	AvailableBefore int64                         `xml:"availableBefore,omitempty"`
-	AvailableAfter  int64                         `xml:"availableAfter,omitempty"`
-	Total           int64                         `xml:"total,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmPlacementResourceUtilization", reflect.TypeOf((*PbmPlacementResourceUtilization)(nil)).Elem())
-}
-
-type PbmProfile struct {
-	types.DynamicData
-
-	ProfileId       PbmProfileId `xml:"profileId"`
-	Name            string       `xml:"name"`
-	Description     string       `xml:"description,omitempty"`
-	CreationTime    time.Time    `xml:"creationTime"`
-	CreatedBy       string       `xml:"createdBy"`
-	LastUpdatedTime time.Time    `xml:"lastUpdatedTime"`
-	LastUpdatedBy   string       `xml:"lastUpdatedBy"`
-}
-
-func init() {
-	types.Add("pbm:PbmProfile", reflect.TypeOf((*PbmProfile)(nil)).Elem())
-}
-
-type PbmProfileId struct {
-	types.DynamicData
-
-	UniqueId string `xml:"uniqueId"`
-}
-
-func init() {
-	types.Add("pbm:PbmProfileId", reflect.TypeOf((*PbmProfileId)(nil)).Elem())
-}
-
-type PbmProfileOperationOutcome struct {
-	types.DynamicData
-
-	ProfileId PbmProfileId                `xml:"profileId"`
-	Fault     *types.LocalizedMethodFault `xml:"fault,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmProfileOperationOutcome", reflect.TypeOf((*PbmProfileOperationOutcome)(nil)).Elem())
-}
-
-type PbmProfileResourceType struct {
-	types.DynamicData
-
-	ResourceType string `xml:"resourceType"`
-}
-
-func init() {
-	types.Add("pbm:PbmProfileResourceType", reflect.TypeOf((*PbmProfileResourceType)(nil)).Elem())
-}
-
-type PbmProfileType struct {
-	types.DynamicData
-
-	UniqueId string `xml:"uniqueId"`
-}
-
-func init() {
-	types.Add("pbm:PbmProfileType", reflect.TypeOf((*PbmProfileType)(nil)).Elem())
-}
-
-type PbmPropertyMismatchFault struct {
-	PbmCompatibilityCheckFault
-
-	CapabilityInstanceId        PbmCapabilityMetadataUniqueId `xml:"capabilityInstanceId"`
-	RequirementPropertyInstance PbmCapabilityPropertyInstance `xml:"requirementPropertyInstance"`
-}
-
-func init() {
-	types.Add("pbm:PbmPropertyMismatchFault", reflect.TypeOf((*PbmPropertyMismatchFault)(nil)).Elem())
-}
-
-type PbmPropertyMismatchFaultFault BasePbmPropertyMismatchFault
-
-func init() {
-	types.Add("pbm:PbmPropertyMismatchFaultFault", reflect.TypeOf((*PbmPropertyMismatchFaultFault)(nil)).Elem())
-}
-
-type PbmQueryAssociatedEntities PbmQueryAssociatedEntitiesRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedEntities", reflect.TypeOf((*PbmQueryAssociatedEntities)(nil)).Elem())
-}
-
-type PbmQueryAssociatedEntitiesRequestType struct {
-	This     types.ManagedObjectReference `xml:"_this"`
-	Profiles []PbmProfileId               `xml:"profiles,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedEntitiesRequestType", reflect.TypeOf((*PbmQueryAssociatedEntitiesRequestType)(nil)).Elem())
-}
-
-type PbmQueryAssociatedEntitiesResponse struct {
-	Returnval []PbmQueryProfileResult `xml:"returnval,omitempty"`
-}
-
-type PbmQueryAssociatedEntity PbmQueryAssociatedEntityRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedEntity", reflect.TypeOf((*PbmQueryAssociatedEntity)(nil)).Elem())
-}
-
-type PbmQueryAssociatedEntityRequestType struct {
-	This       types.ManagedObjectReference `xml:"_this"`
-	Profile    PbmProfileId                 `xml:"profile"`
-	EntityType string                       `xml:"entityType,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedEntityRequestType", reflect.TypeOf((*PbmQueryAssociatedEntityRequestType)(nil)).Elem())
-}
-
-type PbmQueryAssociatedEntityResponse struct {
-	Returnval []PbmServerObjectRef `xml:"returnval,omitempty"`
-}
-
-type PbmQueryAssociatedProfile PbmQueryAssociatedProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedProfile", reflect.TypeOf((*PbmQueryAssociatedProfile)(nil)).Elem())
-}
-
-type PbmQueryAssociatedProfileRequestType struct {
-	This   types.ManagedObjectReference `xml:"_this"`
-	Entity PbmServerObjectRef           `xml:"entity"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedProfileRequestType", reflect.TypeOf((*PbmQueryAssociatedProfileRequestType)(nil)).Elem())
-}
-
-type PbmQueryAssociatedProfileResponse struct {
-	Returnval []PbmProfileId `xml:"returnval,omitempty"`
-}
-
-type PbmQueryAssociatedProfiles PbmQueryAssociatedProfilesRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedProfiles", reflect.TypeOf((*PbmQueryAssociatedProfiles)(nil)).Elem())
-}
-
-type PbmQueryAssociatedProfilesRequestType struct {
-	This     types.ManagedObjectReference `xml:"_this"`
-	Entities []PbmServerObjectRef         `xml:"entities"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryAssociatedProfilesRequestType", reflect.TypeOf((*PbmQueryAssociatedProfilesRequestType)(nil)).Elem())
-}
-
-type PbmQueryAssociatedProfilesResponse struct {
-	Returnval []PbmQueryProfileResult `xml:"returnval,omitempty"`
-}
-
-type PbmQueryByRollupComplianceStatus PbmQueryByRollupComplianceStatusRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryByRollupComplianceStatus", reflect.TypeOf((*PbmQueryByRollupComplianceStatus)(nil)).Elem())
-}
-
-type PbmQueryByRollupComplianceStatusRequestType struct {
-	This   types.ManagedObjectReference `xml:"_this"`
-	Status string                       `xml:"status"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryByRollupComplianceStatusRequestType", reflect.TypeOf((*PbmQueryByRollupComplianceStatusRequestType)(nil)).Elem())
-}
-
-type PbmQueryByRollupComplianceStatusResponse struct {
-	Returnval []PbmServerObjectRef `xml:"returnval,omitempty"`
-}
-
-type PbmQueryDefaultRequirementProfile PbmQueryDefaultRequirementProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryDefaultRequirementProfile", reflect.TypeOf((*PbmQueryDefaultRequirementProfile)(nil)).Elem())
-}
-
-type PbmQueryDefaultRequirementProfileRequestType struct {
-	This types.ManagedObjectReference `xml:"_this"`
-	Hub  PbmPlacementHub              `xml:"hub"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryDefaultRequirementProfileRequestType", reflect.TypeOf((*PbmQueryDefaultRequirementProfileRequestType)(nil)).Elem())
-}
-
-type PbmQueryDefaultRequirementProfileResponse struct {
-	Returnval *PbmProfileId `xml:"returnval,omitempty"`
-}
-
-type PbmQueryDefaultRequirementProfiles PbmQueryDefaultRequirementProfilesRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryDefaultRequirementProfiles", reflect.TypeOf((*PbmQueryDefaultRequirementProfiles)(nil)).Elem())
-}
-
-type PbmQueryDefaultRequirementProfilesRequestType struct {
-	This       types.ManagedObjectReference `xml:"_this"`
-	Datastores []PbmPlacementHub            `xml:"datastores"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryDefaultRequirementProfilesRequestType", reflect.TypeOf((*PbmQueryDefaultRequirementProfilesRequestType)(nil)).Elem())
-}
-
-type PbmQueryDefaultRequirementProfilesResponse struct {
-	Returnval []PbmDefaultProfileInfo `xml:"returnval"`
-}
-
-type PbmQueryMatchingHub PbmQueryMatchingHubRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryMatchingHub", reflect.TypeOf((*PbmQueryMatchingHub)(nil)).Elem())
-}
-
-type PbmQueryMatchingHubRequestType struct {
-	This         types.ManagedObjectReference `xml:"_this"`
-	HubsToSearch []PbmPlacementHub            `xml:"hubsToSearch,omitempty"`
-	Profile      PbmProfileId                 `xml:"profile"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryMatchingHubRequestType", reflect.TypeOf((*PbmQueryMatchingHubRequestType)(nil)).Elem())
-}
-
-type PbmQueryMatchingHubResponse struct {
-	Returnval []PbmPlacementHub `xml:"returnval,omitempty"`
-}
-
-type PbmQueryMatchingHubWithSpec PbmQueryMatchingHubWithSpecRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryMatchingHubWithSpec", reflect.TypeOf((*PbmQueryMatchingHubWithSpec)(nil)).Elem())
-}
-
-type PbmQueryMatchingHubWithSpecRequestType struct {
-	This         types.ManagedObjectReference   `xml:"_this"`
-	HubsToSearch []PbmPlacementHub              `xml:"hubsToSearch,omitempty"`
-	CreateSpec   PbmCapabilityProfileCreateSpec `xml:"createSpec"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryMatchingHubWithSpecRequestType", reflect.TypeOf((*PbmQueryMatchingHubWithSpecRequestType)(nil)).Elem())
-}
-
-type PbmQueryMatchingHubWithSpecResponse struct {
-	Returnval []PbmPlacementHub `xml:"returnval,omitempty"`
-}
-
-type PbmQueryProfile PbmQueryProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryProfile", reflect.TypeOf((*PbmQueryProfile)(nil)).Elem())
-}
-
-type PbmQueryProfileRequestType struct {
-	This            types.ManagedObjectReference `xml:"_this"`
-	ResourceType    PbmProfileResourceType       `xml:"resourceType"`
-	ProfileCategory string                       `xml:"profileCategory,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryProfileRequestType", reflect.TypeOf((*PbmQueryProfileRequestType)(nil)).Elem())
-}
-
-type PbmQueryProfileResponse struct {
-	Returnval []PbmProfileId `xml:"returnval,omitempty"`
-}
-
-type PbmQueryProfileResult struct {
-	types.DynamicData
-
-	Object    PbmServerObjectRef          `xml:"object"`
-	ProfileId []PbmProfileId              `xml:"profileId,omitempty"`
-	Fault     *types.LocalizedMethodFault `xml:"fault,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryProfileResult", reflect.TypeOf((*PbmQueryProfileResult)(nil)).Elem())
-}
-
-type PbmQueryReplicationGroupResult struct {
-	types.DynamicData
-
-	Object             PbmServerObjectRef          `xml:"object"`
-	ReplicationGroupId *types.ReplicationGroupId   `xml:"replicationGroupId,omitempty"`
-	Fault              *types.LocalizedMethodFault `xml:"fault,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryReplicationGroupResult", reflect.TypeOf((*PbmQueryReplicationGroupResult)(nil)).Elem())
-}
-
-type PbmQueryReplicationGroups PbmQueryReplicationGroupsRequestType
-
-func init() {
-	types.Add("pbm:PbmQueryReplicationGroups", reflect.TypeOf((*PbmQueryReplicationGroups)(nil)).Elem())
-}
-
-type PbmQueryReplicationGroupsRequestType struct {
-	This     types.ManagedObjectReference `xml:"_this"`
-	Entities []PbmServerObjectRef         `xml:"entities,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQueryReplicationGroupsRequestType", reflect.TypeOf((*PbmQueryReplicationGroupsRequestType)(nil)).Elem())
-}
-
-type PbmQueryReplicationGroupsResponse struct {
-	Returnval []PbmQueryReplicationGroupResult `xml:"returnval,omitempty"`
-}
-
-type PbmQuerySpaceStatsForStorageContainer PbmQuerySpaceStatsForStorageContainerRequestType
-
-func init() {
-	types.Add("pbm:PbmQuerySpaceStatsForStorageContainer", reflect.TypeOf((*PbmQuerySpaceStatsForStorageContainer)(nil)).Elem())
-}
-
-type PbmQuerySpaceStatsForStorageContainerRequestType struct {
-	This                types.ManagedObjectReference `xml:"_this"`
-	Datastore           PbmServerObjectRef           `xml:"datastore"`
-	CapabilityProfileId []PbmProfileId               `xml:"capabilityProfileId,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmQuerySpaceStatsForStorageContainerRequestType", reflect.TypeOf((*PbmQuerySpaceStatsForStorageContainerRequestType)(nil)).Elem())
-}
-
-type PbmQuerySpaceStatsForStorageContainerResponse struct {
-	Returnval []PbmDatastoreSpaceStatistics `xml:"returnval,omitempty"`
-}
-
-type PbmResetDefaultRequirementProfile PbmResetDefaultRequirementProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmResetDefaultRequirementProfile", reflect.TypeOf((*PbmResetDefaultRequirementProfile)(nil)).Elem())
-}
-
-type PbmResetDefaultRequirementProfileRequestType struct {
-	This    types.ManagedObjectReference `xml:"_this"`
-	Profile *PbmProfileId                `xml:"profile,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmResetDefaultRequirementProfileRequestType", reflect.TypeOf((*PbmResetDefaultRequirementProfileRequestType)(nil)).Elem())
-}
-
-type PbmResetDefaultRequirementProfileResponse struct {
-}
-
-type PbmResetVSanDefaultProfile PbmResetVSanDefaultProfileRequestType
-
-func init() {
-	types.Add("pbm:PbmResetVSanDefaultProfile", reflect.TypeOf((*PbmResetVSanDefaultProfile)(nil)).Elem())
-}
-
-type PbmResetVSanDefaultProfileRequestType struct {
-	This types.ManagedObjectReference `xml:"_this"`
-}
-
-func init() {
-	types.Add("pbm:PbmResetVSanDefaultProfileRequestType", reflect.TypeOf((*PbmResetVSanDefaultProfileRequestType)(nil)).Elem())
-}
-
-type PbmResetVSanDefaultProfileResponse struct {
-}
-
-type PbmResourceInUse struct {
-	PbmFault
-
-	Type string `xml:"type,omitempty"`
-	Name string `xml:"name,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmResourceInUse", reflect.TypeOf((*PbmResourceInUse)(nil)).Elem())
-}
-
-type PbmResourceInUseFault PbmResourceInUse
-
-func init() {
-	types.Add("pbm:PbmResourceInUseFault", reflect.TypeOf((*PbmResourceInUseFault)(nil)).Elem())
-}
-
-type PbmRetrieveContent PbmRetrieveContentRequestType
-
-func init() {
-	types.Add("pbm:PbmRetrieveContent", reflect.TypeOf((*PbmRetrieveContent)(nil)).Elem())
-}
-
-type PbmRetrieveContentRequestType struct {
-	This       types.ManagedObjectReference `xml:"_this"`
-	ProfileIds []PbmProfileId               `xml:"profileIds"`
-}
-
-func init() {
-	types.Add("pbm:PbmRetrieveContentRequestType", reflect.TypeOf((*PbmRetrieveContentRequestType)(nil)).Elem())
-}
-
-type PbmRetrieveContentResponse struct {
-	Returnval []BasePbmProfile `xml:"returnval,typeattr"`
-}
-
-type PbmRetrieveServiceContent PbmRetrieveServiceContentRequestType
-
-func init() {
-	types.Add("pbm:PbmRetrieveServiceContent", reflect.TypeOf((*PbmRetrieveServiceContent)(nil)).Elem())
-}
-
-type PbmRetrieveServiceContentRequestType struct {
-	This types.ManagedObjectReference `xml:"_this"`
-}
-
-func init() {
-	types.Add("pbm:PbmRetrieveServiceContentRequestType", reflect.TypeOf((*PbmRetrieveServiceContentRequestType)(nil)).Elem())
-}
-
-type PbmRetrieveServiceContentResponse struct {
-	Returnval PbmServiceInstanceContent `xml:"returnval"`
-}
-
-type PbmRollupComplianceResult struct {
-	types.DynamicData
-
-	OldestCheckTime             time.Time                    `xml:"oldestCheckTime"`
-	Entity                      PbmServerObjectRef           `xml:"entity"`
-	OverallComplianceStatus     string                       `xml:"overallComplianceStatus"`
-	OverallComplianceTaskStatus string                       `xml:"overallComplianceTaskStatus,omitempty"`
-	Result                      []PbmComplianceResult        `xml:"result,omitempty"`
-	ErrorCause                  []types.LocalizedMethodFault `xml:"errorCause,omitempty"`
-	ProfileMismatch             bool                         `xml:"profileMismatch"`
-}
-
-func init() {
-	types.Add("pbm:PbmRollupComplianceResult", reflect.TypeOf((*PbmRollupComplianceResult)(nil)).Elem())
-}
-
-type PbmServerObjectRef struct {
-	types.DynamicData
-
-	ObjectType string `xml:"objectType"`
-	Key        string `xml:"key"`
-	ServerUuid string `xml:"serverUuid,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmServerObjectRef", reflect.TypeOf((*PbmServerObjectRef)(nil)).Elem())
-}
-
-type PbmServiceInstanceContent struct {
-	types.DynamicData
-
-	AboutInfo                 PbmAboutInfo                  `xml:"aboutInfo"`
-	SessionManager            types.ManagedObjectReference  `xml:"sessionManager"`
-	CapabilityMetadataManager types.ManagedObjectReference  `xml:"capabilityMetadataManager"`
-	ProfileManager            types.ManagedObjectReference  `xml:"profileManager"`
-	ComplianceManager         types.ManagedObjectReference  `xml:"complianceManager"`
-	PlacementSolver           types.ManagedObjectReference  `xml:"placementSolver"`
-	ReplicationManager        *types.ManagedObjectReference `xml:"replicationManager,omitempty"`
-}
-
-func init() {
-	types.Add("pbm:PbmServiceInstanceContent", reflect.TypeOf((*PbmServiceInstanceContent)(nil)).Elem())
-}
-
-type PbmUpdate PbmUpdateRequestType
-
-func init() {
-	types.Add("pbm:PbmUpdate", reflect.TypeOf((*PbmUpdate)(nil)).Elem())
-}
-
-type PbmUpdateRequestType struct {
-	This       types.ManagedObjectReference   `xml:"_this"`
-	ProfileId  PbmProfileId                   `xml:"profileId"`
-	UpdateSpec PbmCapabilityProfileUpdateSpec `xml:"updateSpec"`
-}
-
-func init() {
-	types.Add("pbm:PbmUpdateRequestType", reflect.TypeOf((*PbmUpdateRequestType)(nil)).Elem())
-}
-
-type PbmUpdateResponse struct {
-}
-
-type PbmVaioDataServiceInfo struct {
-	PbmLineOfServiceInfo
-}
-
-func init() {
-	types.Add("pbm:PbmVaioDataServiceInfo", reflect.TypeOf((*PbmVaioDataServiceInfo)(nil)).Elem())
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/property/collector.go b/installer/vendor/github.com/vmware/govmomi/property/collector.go
index 04a9e77373..ccf712cf9d 100644
--- a/installer/vendor/github.com/vmware/govmomi/property/collector.go
+++ b/installer/vendor/github.com/vmware/govmomi/property/collector.go
@@ -121,6 +121,10 @@ func (p *Collector) RetrieveProperties(ctx context.Context, req types.RetrievePr
 // of the specified managed objects, with the relevant properties filled in. If
 // the properties slice is nil, all properties are loaded.
 func (p *Collector) Retrieve(ctx context.Context, objs []types.ManagedObjectReference, ps []string, dst interface{}) error {
+	if len(objs) == 0 {
+		return errors.New("object references is empty")
+	}
+
 	var propSpec *types.PropertySpec
 	var objectSet []types.ObjectSpec
 
diff --git a/installer/vendor/github.com/vmware/govmomi/property/filter_test.go b/installer/vendor/github.com/vmware/govmomi/property/filter_test.go
deleted file mode 100644
index c545e0d823..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/property/filter_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package property
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestMatchProperty(t *testing.T) {
-	tests := []struct {
-		key  string
-		val  types.AnyType
-		pass types.AnyType
-		fail types.AnyType
-	}{
-		{"string", "bar", "bar", "foo"},
-		{"match", "foo.bar", "foo.*", "foobarbaz"},
-		{"moref", types.ManagedObjectReference{Type: "HostSystem", Value: "foo"}, "HostSystem:foo", "bar"}, // implements fmt.Stringer
-		{"morefm", types.ManagedObjectReference{Type: "HostSystem", Value: "foo"}, "*foo", "bar"},
-		{"morefs", types.ArrayOfManagedObjectReference{ManagedObjectReference: []types.ManagedObjectReference{{Type: "HostSystem", Value: "foo"}}}, "*foo", "bar"},
-		{"enum", types.VirtualMachinePowerStatePoweredOn, "poweredOn", "poweredOff"},
-		{"int16", int32(16), int32(16), int32(42)},
-		{"int32", int32(32), int32(32), int32(42)},
-		{"int32s", int32(32), "32", "42"},
-		{"int64", int64(64), int64(64), int64(42)},
-		{"int64s", int64(64), "64", "42"},
-		{"float32", float32(32.32), float32(32.32), float32(42.0)},
-		{"float32s", float32(32.32), "32.32", "42.0"},
-		{"float64", float64(64.64), float64(64.64), float64(42.0)},
-		{"float64s", float64(64.64), "64.64", "42.0"},
-	}
-
-	for _, test := range tests {
-		p := types.DynamicProperty{Name: test.key, Val: test.val}
-
-		for match, value := range map[bool]types.AnyType{true: test.pass, false: test.fail} {
-			result := Filter{test.key: value}.MatchProperty(p)
-
-			if result != match {
-				t.Errorf("%s: %t", test.key, result)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/.gitignore b/installer/vendor/github.com/vmware/govmomi/scripts/.gitignore
deleted file mode 100644
index d0153ee292..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.wireshark-*
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh b/installer/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh
deleted file mode 100755
index 0cb51abf88..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/debug-ls.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-# This script shows for every request in a debug trace how long it took
-# and the name of the request body.
-
-function body-name {
-  (
-    xmllint --shell $1 <<EOS
-    setns soapenv=http://schemas.xmlsoap.org/soap/envelope/
-    xpath name(//soapenv:Body/*)
-EOS
-  )  | head -1 | sed 's/.*Object is a string : \(.*\)$/\1/'
-}
-
-if [ -n "$1" ]; then
-  cd $1
-fi
-
-for req in $(find . -name '*.req.xml'); do
-  base=$(basename $req .req.xml)
-  session=$(echo $base | awk -F'-' "{printf \"%d\", \$1}")
-  number=$(echo $base | awk -F'-' "{printf \"%d\", \$2}")
-  client_log=$(dirname $req)/${session}-client.log
-  took=$(awk "/ ${number} took / { print \$4 }" ${client_log})
-
-  printf "%s %8s: %s\n" ${base} ${took} $(body-name $req)
-done
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh b/installer/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh
deleted file mode 100755
index a33a28a51a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/debug-xmlformat.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash -e
-
-# pipe the most recent debug run to xmlformat
-cd ${GOVC_DEBUG_PATH-"$HOME/.govmomi/debug"}
-cd $(ls -t | head -1)
-
-header() {
-    printf "<!-- %s %s/%s\n%s\n-->\n" "$1" "$PWD" "$2" "$(tr -d '\r' < "$3")"
-}
-
-for file in *.req.xml; do
-    base=$(basename "$file" .req.xml)
-    header Request "$file" "${base}.req.headers"
-    xmlformat < "$file"
-    file="${base}.res.xml"
-    header Response "$file" "${base}.res.headers"
-    xmlformat < "$file"
-done
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/govc-env.bash b/installer/vendor/github.com/vmware/govmomi/scripts/govc-env.bash
deleted file mode 100644
index ed5fb2fc29..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/govc-env.bash
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Provide a simple shell extension to save and load govc
-# environments to disk. No more running `export GOVC_ABC=xyz`
-# in different shells over and over again. Loading the right
-# govc environment variables is now only one short and
-# autocompleted command away!
-#
-# Usage:
-# * Source this file from your `~/.bashrc` or running shell.
-# * Execute `govc-env` to print GOVC_* variables.
-# * Execute `govc-env --save <name>` to save GOVC_* variables.
-# * Execute `govc-env <name>` to load GOVC_* variables.
-#
-
-_govc_env_dir=$HOME/.govmomi/env
-mkdir -p "${_govc_env_dir}"
-
-_govc-env-complete() {
-  local w="${COMP_WORDS[COMP_CWORD]}"
-  local c="$(find ${_govc_env_dir} -mindepth 1 -maxdepth 1 -type f  | sort | xargs -r -L1 basename | xargs echo)"
-
-  # Only allow completion if preceding argument if the function itself
-  if [ "$3" == "govc-env" ]; then
-    COMPREPLY=( $(compgen -W "${c}" -- "${w}") )
-  fi
-}
-
-govc-env() {
-  # Print current environment
-  if [ -z "$1" ]; then
-    for VAR in $(env | grep ^GOVC_ | cut -d= -f1); do
-      echo "export ${VAR}='${!VAR}'"
-    done
-
-    return
-  fi
-
-  # Save current environment
-  if [ "$1" == "--save" ]; then
-    govc-env > ${_govc_env_dir}/$2
-    return
-  fi
-
-  # Load specified environment
-  source ${_govc_env_dir}/$1
-}
-
-complete -F _govc-env-complete govc-env
-
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/govc_bash_completion b/installer/vendor/github.com/vmware/govmomi/scripts/govc_bash_completion
deleted file mode 100644
index abef39359e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/govc_bash_completion
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-
-# govc Bash completion script
-# place in etc/bash_completion.d/ or source on command line with "."
-
-_govc_complete()
-{
-	local cur prev subcmd
-	prev=${COMP_WORDS[COMP_CWORD-1]}
-	cur=${COMP_WORDS[COMP_CWORD]}
-	subcmd=${COMP_WORDS[1]}
-	COMPREPLY=()
-
-	if [[ ${prev} == "govc" ]] ; then # show subcommands, no options
-		COMPREPLY=( $(compgen -W "$(govc -h | grep -v Usage | tr -s '\n' ' ')" -- ${cur}) )
-		return 0
-
-	elif [[ ${cur} == "-"* ]] ; then
-		: # drop out and show options
-
-	elif [[ ${subcmd} == "ls" ]] ; then # not completing an option, try for appropriate values
-		if [[ ${prev} == "-t" ]] ; then
-			COMPREPLY=( $(compgen -W "$(govc ls -l "/**" | awk '{print $2}' | \
-				sort -u | tr -d '()' | tr '\n' ' '  )" -- ${cur}) )
-		else
-			COMPREPLY=( $(compgen -W "$(govc ls "${cur:-/*}*" | tr -s '\n' ' ' )" -- ${cur}) )
-		fi
-
-	elif [[ ${subcmd} == "vm."* || ${prev} == "-vm" ]] ; then  
-		COMPREPLY=( $(compgen -W "$(govc ls -t VirtualMachine -l "${cur}*" | \
-			awk '{print $1}' | tr -s '\n' ' ' )" -- ${cur}) )
-	fi
-
-	# did not hit any specifcs so show all options from help
-	if [[ -z ${COMPREPLY} ]]; then
-		COMPREPLY=( $(compgen -W "-h $(govc ${subcmd} -h | awk '{print $1}' | \
-		   	grep "^-" | sed -e 's/=.*//g' | tr -s '\n' ' ' )" -- ${cur}) )
-	fi
-
-	return 0
-}
-complete -F _govc_complete govc
-
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/headers/go.txt b/installer/vendor/github.com/vmware/govmomi/scripts/headers/go.txt
deleted file mode 100644
index 7dfe744e99..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/headers/go.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-Copyright (c) ${YEARS} VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt b/installer/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt
deleted file mode 100644
index 1c3bd22d41..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/headers/rb.txt
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright (c) ${YEARS} VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/README.md b/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/README.md
deleted file mode 100644
index 948bdd85f7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/README.md
+++ /dev/null
@@ -1,117 +0,0 @@
-# vCenter cluster testbed automation
-
-## Overview
-
-This directory contains scripts to automate VCSA/ESXi install and cluster configuration for developing and testing.
-
-## Dependencies
-
-### govc
-
-Install the latest release via https://github.com/vmware/govmomi/releases
-
-### jq
-
-Used here to derive static VCSA networking from its parent ESXi host.
-But, you should already be using and loving jq for other tasks: http://stedolan.github.io/jq/
-
-## Scripts
-
-### create-esxi-vm.sh
-
-This script creates a VM running stateless ESXi, booted via cdrom/iso.
-It will create 2 disks by default:
-
-* vSAN cache disk (Virtual SSD)
-
-* vSAN store disk
-
-The two vSAN disks will be unformatted, leaving them to be autoclaimed
-by a vSAN enabled cluster.
-
-Note that for a cluster to use vSAN, it will need at least 3 of these
-ESXi VMs.
-
-To create an ESXi VM for standalone use, use the `-s` flag and optionally increase the default disk size with the `-d`
-flag:
-
-```
-./create-esxi-vm.sh -s -d 56 $GOVC_URL my-esxi-vm
-```
-
-The script can also be used directly against Workstation.  Without a username in the url, govc will use local ticket
-authentication.  No password is used in this case, but the script will still use this value to set the password for
-`root` in the ESX vm.  You may also want to decrease the default disk `-d` and memory `-m` sizes.  Example:
-
-```
-GOVC_NETWORK=NAT ./create-esxi-vm.sh -d 16 -m 4 -s :password-for-esx60@localhost $USER-esxbox
-```
-
-For use against Fusion, use `.` as the hostname:
-
-```
-./create-esxi-vm.sh -d 16 -m 4 -s root:password-for-esx60@. $USER-esxbox
-```
-
-### create-vcsa-vm.sh
-
-This script creates a VM with VCSA (Virtual Center Server Appliance) installed.
-
-### create-cluster.sh
-
-The first argument to the script is the IP address of VCSA.
-There must be at least three arguments that follow, IP addresses of ESXi hosts, to form the cluster.
-
-The script then creates the following managed objects:
-
-* Datacenter (dc1)
-
-* ClusterComputeResource (cluster1)
-
-* DistributedVirtualSwitch (DSwitch)
-
-* DistributedVirtualPortgroup (PublicNetwork)
-
-* DistributedVirtualPortgroup (InternalNetwork)
-
-All of the given host systems are:
-
-* Added to the ClusterComputeResource (cluster1)
-
-* Added to the DistributedVirtualSwitch (DSwitch)
-
-* Enabled for vSAN traffic (vmk0)
-
-* Firewall configured to enable the remoteSerialPort rule
-
-Cluster configuration includes:
-
-* DRS enabled
-
-* vSAN autoclaim of host system disks (results in shared Datastore "vsanDatastore")
-
-## Example
-
-This example will install VCSA, 3 ESXi VMs and create a cluster.
-
-```
-export GOVC_URL="root:password@some-esx-host"
-
-./create-vcsa-vm.sh -n "${USER}-vcsa" $GOVC_URL
-
-seq 1 3 | xargs printf "${USER}-esxi-%03d\n" | xargs -P3 -n1 ./create-esxi-vm.sh $GOVC_URL
-
-govc vm.ip -k "${USER}-vcsa" "${USER}-esxi-*" | xargs ./create-cluster.sh
-```
-
-## Licenses
-
-Optional, if you want to assign licenses to VCSA or ESXi hosts.
-
-Where "ESX_LICENSE" should be that of "vSphere 6 per CPU, Enterprise Plus".
-
-And "VCSA_LICENSE" should be that of "vCenter Server 6, Standard".
-
-```
-ESX_LICENSE=... VCSA_LICENSE=... ./assign-licenses.sh
-```
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/assign-licenses.sh b/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/assign-licenses.sh
deleted file mode 100755
index 13d7a9e2be..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/assign-licenses.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-export GOVC_INSECURE=true
-
-govc license.add "$VCSA_LICENSE" "$ESX_LICENSE" >/dev/null
-
-govc license.assign "$VCSA_LICENSE" >/dev/null
-
-govc ls -t HostSystem /dc1/host/cluster1 | xargs -I% -n1 govc license.assign -host % "$ESX_LICENSE" >/dev/null
-
-echo "Assigned licenses..."
-govc license.assigned.ls
-
-echo ""
-echo "License usage..."
-govc license.ls
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-cluster.sh b/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-cluster.sh
deleted file mode 100755
index 81179ac585..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-cluster.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Configure a vCenter cluster with vSAN datastore, DVS and DVPGs
-
-export GOVC_INSECURE=1
-export GOVC_USERNAME=${GOVC_USERNAME:-"Administrator@vsphere.local"}
-if [ -z "$GOVC_PASSWORD" ] ; then
-  # extract password from $GOVC_URL
-  GOVC_PASSWORD=$(govc env GOVC_PASSWORD)
-fi
-
-usage() {
-  echo "Usage: $0 [-d DATACENTER] [-c CLUSTER] VCSA_IP ESX_IP..." 1>&2
-  exit 1
-}
-
-# Defaults
-dc_name="dc1"
-cluster_name="cluster1"
-vsan_vnic="vmk0"
-
-while getopts c:d: flag
-do
-  case $flag in
-    c)
-      cluster_name=$OPTARG
-      ;;
-    d)
-      dc_name=$OPTARG
-      ;;
-    *)
-      usage
-      ;;
-  esac
-done
-
-shift $((OPTIND-1))
-
-if [ $# -lt 2 ] ; then
-  usage
-fi
-
-vc_ip=$1
-shift
-
-export GOVC_URL="${GOVC_USERNAME}:${GOVC_PASSWORD}@${vc_ip}"
-
-cluster_path="/$dc_name/host/$cluster_name"
-dvs_path="/$dc_name/network/DSwitch"
-public_network="/$dc_name/network/PublicNetwork"
-internal_network="/$dc_name/network/InternalNetwork"
-
-if [ -z "$(govc ls "/$dc_name")" ] ; then
-  echo "Creating datacenter ${dc_name}..."
-  govc datacenter.create "$dc_name"
-fi
-
-export GOVC_DATACENTER="$dc_name"
-
-if [ -z "$(govc ls "$cluster_path")" ] ; then
-  echo "Creating cluster ${cluster_path}..."
-  govc cluster.create "$cluster_name"
-fi
-
-if [ -z "$(govc ls "$dvs_path")" ] ; then
-  echo "Creating dvs ${dvs_path}..."
-  govc dvs.create -product-version 5.5.0 -folder "$(dirname "$dvs_path")" "$(basename "$dvs_path")"
-fi
-
-if [ -z "$(govc ls "$public_network")" ] ; then
-  govc dvs.portgroup.add -dvs "$dvs_path" -type earlyBinding -nports 16 "$(basename "$public_network")"
-fi
-
-if [ -z "$(govc ls "$internal_network")" ] ; then
-  govc dvs.portgroup.add -dvs "$dvs_path" -type ephemeral "$(basename "$internal_network")"
-fi
-
-hosts=()
-vsan_hosts=()
-
-for host_ip in "$@" ; do
-  host_path="$cluster_path/$host_ip"
-  hosts+=($host_path)
-
-  if [ -z "$(govc ls "$host_path")" ] ; then
-    echo "Adding host ($host_ip) to cluster $cluster_name"
-    govc cluster.add -cluster "$cluster_path" -noverify -force \
-         -hostname "$host_ip" -username root -password "$GOVC_PASSWORD"
-  fi
-
-  unclaimed=$(govc host.storage.info -host "$host_path" -unclaimed | tail -n+2 | wc -l)
-  if [ "$unclaimed" -eq 2 ] ; then
-    echo "Enabling vSAN traffic on ${vsan_vnic} for ${host_path}..."
-    govc host.vnic.service -host "$host_path" -enable vsan "$vsan_vnic"
-    vsan_hosts+=($host_path)
-  else
-    echo "Skipping vSAN configuration for ${host_path}: $unclaimed unclaimed disks"
-  fi
-done
-
-govc dvs.add -dvs "$dvs_path" -pnic vmnic1 "${hosts[@]}"
-
-echo "Enabling DRS for ${cluster_path}..."
-govc cluster.change -drs-enabled "$cluster_path"
-
-if [ ${#vsan_hosts[@]} -ge 3 ] ; then
-  echo "Enabling vSAN for ${cluster_path}..."
-  govc cluster.change -vsan-enabled -vsan-autoclaim "$cluster_path"
-fi
-
-echo "Granting Admin permissions for user root..."
-govc permissions.set -principal root -role Admin
-
-echo "Done."
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-esxi-vm.sh b/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-esxi-vm.sh
deleted file mode 100755
index cea12c080e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-esxi-vm.sh
+++ /dev/null
@@ -1,283 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Create a VM and boot stateless ESXi via cdrom/iso
-
-set -o pipefail
-
-usage() {
-  cat <<'EOF'
-Usage: $0 [-d DISK_GB] [-m MEM_GB] [-i ESX_ISO] [-s] ESX_URL VM_NAME
-
-GOVC_* environment variables also apply, see https://github.com/vmware/govmomi/tree/master/govc#usage
-If GOVC_USERNAME is set, it is used to create an account on the ESX vm.  Default is to use the existing root account.
-If GOVC_PASSWORD is set, the account password will be set to this value.  Default is to use the given ESX_URL password.
-EOF
-}
-
-disk=48
-mem=16
-# 6.5.0U1 - https://docs.vmware.com/en/VMware-vSphere/6.5/rn/vsphere-esxi-651-release-notes.html
-iso=VMware-VMvisor-6.5.0-5969303.x86_64.iso
-
-while getopts d:hi:m:s flag
-do
-  case $flag in
-    d)
-      disk=$OPTARG
-      ;;
-    h)
-      usage
-      exit
-      ;;
-    i)
-      iso=$OPTARG
-      ;;
-    m)
-      mem=$OPTARG
-      ;;
-    s)
-      standalone=true
-      ;;
-    *)
-      usage 1>&2
-      exit 1
-      ;;
-  esac
-done
-
-shift $((OPTIND-1))
-
-if [ $# -ne 2 ] ; then
-  usage
-  exit 1
-fi
-
-if [[ "$iso" == *"-Installer-"* ]] ; then
-  echo "Invalid iso name (need stateless, not installer): $iso" 1>&2
-  exit 1
-fi
-
-export GOVC_INSECURE=1
-export GOVC_URL=$1
-network=${GOVC_NETWORK:-"VM Network"}
-username=$GOVC_USERNAME
-password=$GOVC_PASSWORD
-unset GOVC_USERNAME GOVC_PASSWORD
-
-guest=${GUEST:-"vmkernel6Guest"}
-
-if [ -z "$password" ] ; then
-  # extract password from $GOVC_URL
-  password=$(govc env GOVC_PASSWORD)
-fi
-
-shift
-
-name=$1
-shift
-
-echo -n "Checking govc version..."
-govc version -require 0.15.0
-
-if [ "$(govc env -x GOVC_URL_HOST)" = "." ] ; then
-  if [ "$(uname -s)" = "Darwin" ]; then
-    PATH="/Applications/VMware Fusion.app/Contents/Library:$PATH"
-  fi
-
-  dir="${name}.vmwarevm"
-  vmx="$dir/${name}.vmx"
-
-  if [ -d "$dir" ] ; then
-    if vmrun list | grep -q "$vmx" ; then
-      vmrun stop "$vmx" hard
-    fi
-    rm -rf "$dir"
-  fi
-
-  mkdir "$dir"
-  vmware-vdiskmanager -c -s "${disk}GB" -a lsilogic -t 1 "$dir/${name}.vmdk" 2>/dev/null
-
-  cat > "$vmx" <<EOF
-config.version = "8"
-virtualHW.version = "11"
-numvcpus = "2"
-memsize = "$((mem*1024))"
-displayName = "$name"
-guestOS = "vmkernel6"
-vhv.enable = "TRUE"
-scsi0.present = "TRUE"
-scsi0.virtualDev = "lsilogic"
-scsi0:0.present = "TRUE"
-scsi0:0.fileName = "${name}.vmdk"
-ide1:0.present = "TRUE"
-ide1:0.fileName = "$(realpath "$iso")"
-ide1:0.deviceType = "cdrom-image"
-ethernet0.present = "TRUE"
-ethernet0.connectionType = "nat"
-ethernet0.virtualDev = "e1000"
-ethernet0.wakeOnPcktRcv = "FALSE"
-ethernet0.linkStatePropagation.enable = "TRUE"
-vmci0.present = "TRUE"
-hpet0.present = "TRUE"
-tools.syncTime = "TRUE"
-pciBridge0.present = "TRUE"
-pciBridge4.present = "TRUE"
-pciBridge4.virtualDev = "pcieRootPort"
-pciBridge4.functions = "8"
-pciBridge5.present = "TRUE"
-pciBridge5.virtualDev = "pcieRootPort"
-pciBridge5.functions = "8"
-pciBridge6.present = "TRUE"
-pciBridge6.virtualDev = "pcieRootPort"
-pciBridge6.functions = "8"
-pciBridge7.present = "TRUE"
-pciBridge7.virtualDev = "pcieRootPort"
-pciBridge7.functions = "8"
-EOF
-
-  vmrun start "$vmx" nogui
-  vm_ip=$(vmrun getGuestIPAddress "$vmx" -wait)
-else
-  export GOVC_DATASTORE=${GOVC_DATASTORE:-$(basename "$(govc ls datastore)")}
-  if [ "$(govc about -json | jq -r .About.ProductLineId)" == "embeddedEsx" ] ; then
-    policy=$(govc host.portgroup.info -json | jq -r ".Portgroup[] | select(.Spec.Name == \"$network\") | .Spec.Policy.Security")
-    if [ -n "$policy" ] && [ "$(jq -r <<<"$policy" .AllowPromiscuous)" != "true" ] ; then
-      echo "Enabling promiscuous mode for $network on $(govc env -x GOVC_URL_HOST)..."
-      govc host.portgroup.change -allow-promiscuous "$network"
-    fi
-  fi
-
-  boot=$(basename "$iso")
-  if ! govc datastore.ls "$boot" > /dev/null 2>&1 ; then
-    govc datastore.upload "$iso" "$boot"
-  fi
-
-  echo "Creating vm ${name}..."
-  govc vm.create -on=false -net "$network" -m $((mem*1024)) -c 2 -g "$guest" -net.adapter=vmxnet3 -disk.controller pvscsi "$name"
-
-  echo "Adding a second nic for ${name}..."
-  govc vm.network.add -net "$network" -net.adapter=vmxnet3 -vm "$name"
-
-  echo "Enabling nested hv for ${name}..."
-  govc vm.change -vm "$name" -nested-hv-enabled
-
-  echo "Enabling Mac Learning dvFilter for ${name}..."
-  seq 0 1 | xargs -I% govc vm.change -vm "$name" \
-                  -e ethernet%.filter4.name=dvfilter-maclearn \
-                  -e ethernet%.filter4.onFailure=failOpen
-
-  echo "Adding cdrom device to ${name}..."
-  id=$(govc device.cdrom.add -vm "$name")
-
-  echo "Inserting $boot into $name cdrom device..."
-  govc device.cdrom.insert -vm "$name" -device "$id" "$boot"
-
-  if [ -n "$standalone" ] ; then
-    echo "Creating $name disk for use by ESXi..."
-    govc vm.disk.create -vm "$name" -name "$name"/disk1 -size "${disk}G"
-  fi
-
-  echo "Powering on $name VM..."
-  govc vm.power -on "$name"
-
-  echo "Waiting for $name ESXi IP..."
-  vm_ip=$(govc vm.ip "$name")
-
-  ! govc events -n 100 "vm/$name" | grep -E 'warning|error'
-fi
-
-esx_url="root:@${vm_ip}"
-echo "Waiting for $name hostd (via GOVC_URL=$esx_url)..."
-while true; do
-  if govc about -u "$esx_url" 2>/dev/null; then
-    break
-  fi
-
-  printf "."
-  sleep 1
-done
-
-if [ -z "$standalone" ] ; then
-  # Create disk for vSAN after boot so they are unclaimed
-  echo "Creating $name disks for use by vSAN..."
-  govc vm.disk.create -vm "$name" -name "$name"/vsan-cache -size "$((disk/2))G"
-  govc vm.disk.create -vm "$name" -name "$name"/vsan-store -size "${disk}G"
-fi
-
-# Set target to the ESXi VM
-GOVC_URL="$esx_url"
-
-if [ -z "$standalone" ] ; then
-  echo "Rescanning ${name} HBA for new devices..."
-  disk=($(govc host.storage.info -rescan | grep /vmfs/devices/disks | awk '{print $1}' | sort))
-
-  echo "Marking ${name} disk ${disk[0]} as SSD..."
-  govc host.storage.mark -ssd "${disk[0]}"
-
-  echo "Marking ${name} disk ${disk[1]} as HDD..."
-  govc host.storage.mark -ssd=false "${disk[1]}"
-fi
-
-echo "Enabling MOB for ${name}..."
-govc host.option.set Config.HostAgent.plugins.solo.enableMob true
-
-echo "Configuring NTP for ${name}..."
-govc host.date.change -server 0.pool.ntp.org
-
-for id in TSM TSM-SSH ntpd ; do
-  printf "Enabling service %s for ${name}...\n" $id
-  govc host.service enable $id
-  govc host.service start $id
-done
-
-if [ -z "$username" ] ; then
-  username=root
-  action="update"
-else
-  action="create"
-fi
-
-echo "Disabling VSAN device monitoring for ${name}..."
-govc host.esxcli system settings advanced set -o /LSOM/VSANDeviceMonitoring -i 0
-
-# A setting of 1 means that vSwp files are created thin, with 0% Object Space Reservation
-govc host.esxcli system settings advanced set -o /VSAN/SwapThickProvisionDisabled -i 1
-govc host.esxcli system settings advanced set -o /VSAN/FakeSCSIReservations -i 1
-
-echo "ESX host account $action for user $username on ${name}..."
-govc host.account.$action -id $username -password "$password"
-
-echo "Granting Admin permissions for user $username on ${name}..."
-govc permissions.set -principal $username -role Admin
-
-echo "Enabling guest ARP inspection to get vm IPs without vmtools on ${name}..."
-govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
-
-echo "Opening firewall for serial port traffic for ${name}..."
-govc host.esxcli network firewall ruleset set -r remoteSerialPort -e true
-
-echo "Setting hostname for ${name}..."
-govc host.esxcli system hostname set -H "$name"
-
-if which sshpass >/dev/null && [ -e ~/.ssh/id_rsa.pub ] ; then
-  echo "Adding ssh authorized key to ${name}..."
-  sshpass -p "$password" scp \
-          -oStrictHostKeyChecking=no -oUserKnownHostsFile=/dev/null -oLogLevel=error \
-          ~/.ssh/id_rsa.pub "root@$vm_ip:/etc/ssh/keys-root/authorized_keys"
-fi
-
-echo "Done: GOVC_URL=${username}:${password}@${vm_ip}"
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-vcsa-vm.sh b/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-vcsa-vm.sh
deleted file mode 100755
index f5ec290407..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/vcsa/create-vcsa-vm.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Create a VCSA VM
-
-usage() {
-  echo "Usage: $0 [-n VM_NAME] [-i VCSA_OVA] [-a IP] ESX_URL" 1>&2
-  exit 1
-}
-
-export GOVC_INSECURE=1
-
-name=vcsa
-
-# 6.5.0U1 - https://docs.vmware.com/en/VMware-vSphere/6.5/rn/vsphere-vcenter-server-651-release-notes.html
-ova=VMware-vCenter-Server-Appliance-6.5.0.10000-5973321_OVF10.ova
-
-while getopts a:i:n: flag
-do
-  case $flag in
-    a)
-      ip=$OPTARG
-      ;;
-    i)
-      ova=$OPTARG
-      ;;
-    n)
-      name=$OPTARG
-      ;;
-    *)
-      usage
-      ;;
-  esac
-done
-
-if [ -d "$ova" ] ; then
-  ova=$(ls "$ova"/*.ovf)
-fi
-
-shift $((OPTIND-1))
-
-if [ $# -ne 1 ] ; then
-  usage
-fi
-
-export GOVC_URL=$1
-
-network=${GOVC_NETWORK:-$(basename "$(govc ls network)")}
-product=$(govc about -json | jq -r .About.ProductLineId)
-# Use the same password as GOVC_URL
-password=$(govc env GOVC_PASSWORD)
-
-if [ -z "$password" ] ; then
-  echo "password not set"
-  exit 1
-fi
-
-opts=(
-  cis.vmdir.password=$password
-  cis.appliance.root.passwd=$password
-  cis.appliance.root.shell=/bin/bash
-  cis.deployment.node.type=embedded
-  cis.vmdir.domain-name=vsphere.local
-  cis.vmdir.site-name=VCSA
-  cis.appliance.net.addr.family=ipv4
-  cis.appliance.ssh.enabled=True
-  cis.ceip_enabled=False
-  cis.deployment.autoconfig=True
-)
-
-if [ -z "$ip" ] ; then
-  mode=dhcp
-  ntp=0.pool.ntp.org
-else
-  mode=static
-
-  # Derive net config from the ESX server
-  config=$(govc host.info -k -json | jq -r .HostSystems[].Config)
-  gateway=$(jq -r .Network.IpRouteConfig.DefaultGateway <<<"$config")
-  dns=$(jq -r .Network.DnsConfig.Address[0] <<<"$config")
-  ntp=$(jq -r .DateTimeInfo.NtpConfig.Server[0] <<<"$config")
-  route=$(jq -r ".Network.RouteTableInfo.IpRoute[] | select(.DeviceName == \"vmk0\") | select(.Gateway == \"0.0.0.0\")" <<<"$config")
-  prefix=$(jq -r .PrefixLength <<<"$route")
-
-  opts+=(cis.appliance.net.addr=$ip
-         cis.appliance.net.prefix=$prefix
-         cis.appliance.net.dns.servers=$dns
-         cis.appliance.net.gateway=$gateway)
-fi
-
-opts+=(
-  cis.appliance.ntp.servers="$ntp"
-  cis.appliance.net.mode=$mode
-)
-
-if [ "$product" = "ws" ] ; then
-  # workstation does not suport NFC
-  dir=$(govc datastore.info -json | jq -r .Datastores[0].Info.Url)
-
-  ovftool --name="$name" --acceptAllEulas "$ova" "$dir"
-  vmx="$name/${name}.vmx"
-  printf "guestinfo.%s\n" "${opts[@]}" >> "$dir/$vmx"
-  govc vm.register "$vmx"
-  govc vm.network.change -vm "$name" -net NAT ethernet-0
-else
-  props=$(printf -- "guestinfo.%s\n" "${opts[@]}" | \
-             jq --slurp -R 'split("\n") | map(select(. != "")) | map(split("=")) | map({"Key": .[0], "Value": .[1]})')
-
-  cat <<EOF | govc import.${ova##*.} -options - "$ova"
-{
-  "Name": "$name",
-  "Deployment": "tiny",
-  "DiskProvisioning": "thin",
-  "IPProtocol": "IPv4",
-  "Annotation": "VMware vCenter Server Appliance",
-  "PowerOn": false,
-  "WaitForIP": false,
-  "InjectOvfEnv": true,
-  "NetworkMapping": [
-    {
-      "Name": "Network 1",
-      "Network": "${network}"
-    }
-  ],
-  "PropertyMapping": $props
-}
-EOF
-fi
-
-govc vm.power -on "$name"
-govc vm.ip "$name"
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh b/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh
deleted file mode 100755
index 2115ba45cd..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-esx.sh
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/bin/bash -e
-#
-# Capture ESXi traffic and decrypt SOAP traffic on port 443 via wireshark
-
-# Device to capture
-dev="${1-vmk0}"
-
-# Device to get the ip for wireshark ssl_keys config
-if [ "$dev" = "lo0" ] ; then
-  ip_dev="vmk0"
-else
-  ip_dev="$dev"
-fi
-
-ip=$(govc host.info -k -json | \
-        jq -r ".HostSystems[].Config.Network.Vnic[] | select(.Device == \"${ip_dev}\") | .Spec.Ip.IpAddress")
-
-scp=(scp)
-ssh=(ssh)
-
-# Check if vagrant ssh-config applies to $ip
-if [ -d ".vagrant" ] ; then
-  vssh_opts=($(vagrant ssh-config | awk NF | awk -v ORS=' ' '{print "-o " $1 "=" $2}'))
-  if grep "HostName=${ip}" >/dev/null <<<"${vssh_opts[*]}" ; then
-    ssh_opts=("${vssh_opts[@]}")
-  fi
-fi
-
-# Otherwise, use default ssh opts + sshpass if available
-if [ ${#ssh_opts[@]} -eq 0 ] ; then
-  user="$(govc env GOVC_USERNAME)"
-  ssh_opts=(-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -o LogLevel=FATAL -o User=$user)
-
-  if [ -x "$(which sshpass)" ] ; then
-    password="$(govc env GOVC_PASSWORD)"
-    scp=(sshpass -p $password scp)
-    ssh=(sshpass -p $password ssh)
-  fi
-fi
-
-if [ "$dev" != "lo0" ] ; then
-  # If you change this filter, be sure to exclude the ssh port (not tcp port 22)
-  filter="host $ip and \(port 80 or port 443\)"
-
-  dst="$HOME/.wireshark/rui-${ip}.key"
-  if [ ! -f "$dst" ] ; then
-    # Copy key from ESX
-    "${scp[@]}" "${ssh_opts[@]}" "${ip}:/etc/vmware/ssl/rui.key" "$dst"
-  fi
-
-  if ! grep "$ip" ~/.wireshark/ssl_keys 2>/dev/null ; then
-    # Add key to wireshark ssl_keys config
-    echo "adding rui.key for $ip"
-
-    cat <<EOF >> ~/.wireshark/ssl_keys
-"$ip","443","http","$dst",""
-EOF
-  fi
-fi
-
-echo "Capturing $dev on $ip..."
-
-"${ssh[@]}" "${ssh_opts[@]}" "$ip" tcpdump-uw -i "$dev" -s0 -v -w - "$filter" | wireshark -k -i -
diff --git a/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh b/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh
deleted file mode 100755
index bc52de4a16..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/scripts/wireshark-vcsa.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash -e
-#
-# Capture SOAP traffic between web client and vpxd on 127.0.0.1:8085.
-#
-# Caveats: tested with VCSA 6.0, unlikely to work for other versions.
-#
-
-set -e
-
-cache_deb() {
-  wget $1
-  ar x *.deb data.tar.gz
-  tar zxf data.tar.gz
-  rm -f data.tar.gz
-  rm -f *.deb
-}
-
-dirname="$(dirname $0)"
-basename="$(basename $0)"
-bindir="${dirname}/.${basename}"
-
-mkdir -p "${bindir}"
-
-# Cache binaries required to run tcpdump on vcsa
-if [ ! -f "${bindir}/.done" ]; then
-  pushd ${bindir}
-  cache_deb https://launchpadlibrarian.net/200649143/libssl0.9.8_0.9.8k-7ubuntu8.27_amd64.deb
-  cache_deb https://launchpadlibrarian.net/37430984/libpcap0.8_1.0.0-6_amd64.deb
-  cache_deb https://launchpadlibrarian.net/41774869/tcpdump_4.0.0-6ubuntu3_amd64.deb
-  touch .done
-  popd
-fi
-
-scp=(scp)
-ssh=(ssh)
-
-# Extract host from GOVC_URL
-host="$(govc env -x GOVC_HOST)"
-username=root
-password="$(govc env GOVC_PASSWORD)"
-
-if [ -x "$(which sshpass)" ] ; then
-  scp=(sshpass -p "$password" scp)
-  ssh=(sshpass -p "$password" ssh)
-fi
-
-ssh_opts=(-o UserKnownHostsFile=/dev/null
-          -o StrictHostKeyChecking=no
-          -o LogLevel=FATAL
-          -o User=${username}
-          -o ControlMaster=no)
-dev="lo"
-filter="port 8085"
-tcpdump="env LD_LIBRARY_PATH=/tmp /tmp/tcpdump"
-
-echo "Capturing $dev on $host..."
-
-"${scp[@]}" "${ssh_opts[@]}" \
-            "${bindir}/lib/libcrypto.so.0.9.8" \
-            "${bindir}/usr/lib/libpcap.so.0.8" \
-            "${bindir}/usr/sbin/tcpdump" \
-            "${host}:/tmp"
-
-"${ssh[@]}" "${ssh_opts[@]}" "$host" ${tcpdump} -i "$dev" -s0 -v -w - "$filter" | wireshark -k -i - 2>/dev/null
diff --git a/installer/vendor/github.com/vmware/govmomi/session/keep_alive_test.go b/installer/vendor/github.com/vmware/govmomi/session/keep_alive_test.go
deleted file mode 100644
index 5cdc81114d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/session/keep_alive_test.go
+++ /dev/null
@@ -1,280 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package session
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/test"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type testKeepAlive int
-
-func (t *testKeepAlive) Func(soap.RoundTripper) error {
-	*t++
-	return nil
-}
-
-func newManager(t *testing.T) (*Manager, *url.URL) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	soapClient := soap.NewClient(u, true)
-	vimClient, err := vim25.NewClient(context.Background(), soapClient)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return NewManager(vimClient), u
-}
-
-func TestKeepAlive(t *testing.T) {
-	var i testKeepAlive
-	var j int
-
-	m, u := newManager(t)
-	k := KeepAlive(m.client.RoundTripper, time.Millisecond)
-	k.(*keepAlive).keepAlive = i.Func
-	m.client.RoundTripper = k
-
-	// Expect keep alive to not have triggered yet
-	if i != 0 {
-		t.Errorf("Expected i == 0, got i: %d", i)
-	}
-
-	// Logging in starts keep alive
-	err := m.Login(context.Background(), u.User)
-	if err != nil {
-		t.Error(err)
-	}
-
-	time.Sleep(2 * time.Millisecond)
-
-	// Expect keep alive to triggered at least once
-	if i == 0 {
-		t.Errorf("Expected i != 0, got i: %d", i)
-	}
-
-	j = int(i)
-	time.Sleep(2 * time.Millisecond)
-
-	// Expect keep alive to triggered at least once more
-	if int(i) <= j {
-		t.Errorf("Expected i > j, got i: %d, j: %d", i, j)
-	}
-
-	// Logging out stops keep alive
-	err = m.Logout(context.Background())
-	if err != nil {
-		t.Error(err)
-	}
-
-	j = int(i)
-	time.Sleep(2 * time.Millisecond)
-
-	// Expect keep alive to have stopped
-	if int(i) != j {
-		t.Errorf("Expected i == j, got i: %d, j: %d", i, j)
-	}
-}
-
-func testSessionOK(t *testing.T, m *Manager, ok bool) {
-	s, err := m.UserSession(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, file, line, _ := runtime.Caller(1)
-	prefix := fmt.Sprintf("%s:%d", file, line)
-
-	if ok && s == nil {
-		t.Fatalf("%s: Expected session to be OK, but is invalid", prefix)
-	}
-
-	if !ok && s != nil {
-		t.Fatalf("%s: Expected session to be invalid, but is OK", prefix)
-	}
-}
-
-// Run with:
-//
-//   env GOVMOMI_KEEPALIVE_TEST=1 go test -timeout=60m -run TestRealKeepAlive
-//
-func TestRealKeepAlive(t *testing.T) {
-	if os.Getenv("GOVMOMI_KEEPALIVE_TEST") != "1" {
-		t.SkipNow()
-	}
-
-	m1, u1 := newManager(t)
-	m2, u2 := newManager(t)
-
-	// Enable keepalive on m2
-	k := KeepAlive(m2.client.RoundTripper, 10*time.Minute)
-	m2.client.RoundTripper = k
-
-	// Expect both sessions to be invalid
-	testSessionOK(t, m1, false)
-	testSessionOK(t, m2, false)
-
-	// Logging in starts keep alive
-	if err := m1.Login(context.Background(), u1.User); err != nil {
-		t.Error(err)
-	}
-	if err := m2.Login(context.Background(), u2.User); err != nil {
-		t.Error(err)
-	}
-
-	// Expect both sessions to be valid
-	testSessionOK(t, m1, true)
-	testSessionOK(t, m2, true)
-
-	// Wait for m1 to time out
-	delay := 31 * time.Minute
-	fmt.Printf("%s: Waiting %d minutes for session to time out...\n", time.Now(), int(delay.Minutes()))
-	time.Sleep(delay)
-
-	// Expect m1's session to be invalid, m2's session to be valid
-	testSessionOK(t, m1, false)
-	testSessionOK(t, m2, true)
-}
-
-func isNotAuthenticated(err error) bool {
-	if soap.IsSoapFault(err) {
-		switch soap.ToSoapFault(err).VimFault().(type) {
-		case types.NotAuthenticated:
-			return true
-		}
-	}
-	return false
-}
-
-func isInvalidLogin(err error) bool {
-	if soap.IsSoapFault(err) {
-		switch soap.ToSoapFault(err).VimFault().(type) {
-		case types.InvalidLogin:
-			return true
-		}
-	}
-	return false
-}
-
-func TestKeepAliveHandler(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	m1, u1 := newManager(t)
-	m2, u2 := newManager(t)
-
-	reauth := make(chan bool)
-
-	// Keep alive handler that will re-login.
-	// Real-world case: connectivity to ESX/VC is down long enough for the session to expire
-	// Test-world case: we call TerminateSession below
-	k := KeepAliveHandler(m2.client.RoundTripper, 2*time.Second, func(roundTripper soap.RoundTripper) error {
-		_, err := methods.GetCurrentTime(context.Background(), roundTripper)
-		if err != nil {
-			if isNotAuthenticated(err) {
-				err = m2.Login(context.Background(), u2.User)
-
-				if err != nil {
-					if isInvalidLogin(err) {
-						reauth <- false
-						t.Log("failed to re-authenticate, quitting keep alive handler")
-						return err
-					}
-				} else {
-					reauth <- true
-				}
-			}
-		}
-
-		return nil
-	})
-
-	m2.client.RoundTripper = k
-
-	// Logging in starts keep alive
-	if err := m1.Login(context.Background(), u1.User); err != nil {
-		t.Error(err)
-	}
-	if err := m2.Login(context.Background(), u2.User); err != nil {
-		t.Error(err)
-	}
-
-	// Terminate session for m2.  Note that self terminate fails, so we need 2 sessions for this test.
-	s, err := m2.UserSession(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = m1.TerminateSession(context.Background(), []string{s.Key})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = methods.GetCurrentTime(context.Background(), m2.client)
-	if err == nil {
-		t.Error("expected to fail")
-	}
-
-	// Wait for keepalive to re-authenticate
-	<-reauth
-
-	_, err = methods.GetCurrentTime(context.Background(), m2.client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Clear credentials to test re-authentication failure
-	u2.User = nil
-
-	s, err = m2.UserSession(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = m1.TerminateSession(context.Background(), []string{s.Key})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Wait for keepalive re-authenticate attempt
-	result := <-reauth
-
-	_, err = methods.GetCurrentTime(context.Background(), m2.client)
-	if err == nil {
-		t.Error("expected to fail")
-	}
-
-	if result {
-		t.Errorf("expected reauth to fail")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/session/manager_test.go b/installer/vendor/github.com/vmware/govmomi/session/manager_test.go
deleted file mode 100644
index d600d07325..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/session/manager_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package session
-
-import (
-	"context"
-	"net/url"
-	"testing"
-
-	"github.com/vmware/govmomi/test"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-func sessionClient(u *url.URL, t *testing.T) *Manager {
-	soapClient := soap.NewClient(u, true)
-	vimClient, err := vim25.NewClient(context.Background(), soapClient)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return NewManager(vimClient)
-}
-
-func TestLogin(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	session := sessionClient(u, t)
-	err := session.Login(context.Background(), u.User)
-	if err != nil {
-		t.Errorf("Expected no error, got %v", err)
-	}
-}
-
-func TestLogout(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	session := sessionClient(u, t)
-	err := session.Login(context.Background(), u.User)
-	if err != nil {
-		t.Error("Login Error: ", err)
-	}
-
-	err = session.Logout(context.Background())
-	if err != nil {
-		t.Errorf("Expected nil, got %v", err)
-	}
-
-	err = session.Logout(context.Background())
-	if err == nil {
-		t.Errorf("Expected NotAuthenticated, got nil")
-	}
-}
-
-func TestSessionIsActive(t *testing.T) {
-	u := test.URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	session := sessionClient(u, t)
-
-	// Skip test against ESXi -- SessionIsActive is not implemented
-	if session.client.ServiceContent.About.ApiType != "VirtualCenter" {
-		t.Skipf("Talking to %s instead of %s", session.client.ServiceContent.About.ApiType, "VirtualCenter")
-	}
-
-	err := session.Login(context.Background(), u.User)
-	if err != nil {
-		t.Error("Login Error: ", err)
-	}
-
-	active, err := session.SessionIsActive(context.Background())
-	if err != nil || !active {
-		t.Errorf("Expected %t, got %t", true, active)
-		t.Errorf("Expected nil, got %v", err)
-	}
-
-	session.Logout(context.Background())
-
-	active, err = session.SessionIsActive(context.Background())
-	if err == nil || active {
-		t.Errorf("Expected %t, got %t", false, active)
-		t.Errorf("Expected NotAuthenticated, got %v", err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/authorization_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/authorization_manager.go
deleted file mode 100644
index b65db933e8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/authorization_manager.go
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type AuthorizationManager struct {
-	mo.AuthorizationManager
-
-	permissions map[types.ManagedObjectReference][]types.Permission
-	privileges  map[string]struct{}
-	system      []string
-	nextID      int32
-}
-
-func NewAuthorizationManager(ref types.ManagedObjectReference) object.Reference {
-	m := &AuthorizationManager{}
-	m.Self = ref
-	m.RoleList = esx.RoleList
-	m.permissions = make(map[types.ManagedObjectReference][]types.Permission)
-
-	l := object.AuthorizationRoleList(m.RoleList)
-	m.system = l.ByName("ReadOnly").Privilege
-	admin := l.ByName("Admin")
-	m.privileges = make(map[string]struct{}, len(admin.Privilege))
-
-	for _, id := range admin.Privilege {
-		m.privileges[id] = struct{}{}
-	}
-
-	root := Map.content().RootFolder
-
-	for _, u := range DefaultUserGroup {
-		m.permissions[root] = append(m.permissions[root], types.Permission{
-			Entity:    &root,
-			Principal: u.Principal,
-			Group:     u.Group,
-			RoleId:    admin.RoleId,
-			Propagate: true,
-		})
-	}
-
-	return m
-}
-
-func (m *AuthorizationManager) RetrieveEntityPermissions(req *types.RetrieveEntityPermissions) soap.HasFault {
-	e := Map.Get(req.Entity).(mo.Entity)
-
-	p := m.permissions[e.Reference()]
-
-	if req.Inherited {
-		for {
-			parent := e.Entity().Parent
-			if parent == nil {
-				break
-			}
-
-			e = Map.Get(parent.Reference()).(mo.Entity)
-
-			p = append(p, m.permissions[e.Reference()]...)
-		}
-	}
-
-	return &methods.RetrieveEntityPermissionsBody{
-		Res: &types.RetrieveEntityPermissionsResponse{
-			Returnval: p,
-		},
-	}
-}
-
-func (m *AuthorizationManager) RetrieveAllPermissions(req *types.RetrieveAllPermissions) soap.HasFault {
-	var p []types.Permission
-
-	for _, v := range m.permissions {
-		p = append(p, v...)
-	}
-
-	return &methods.RetrieveAllPermissionsBody{
-		Res: &types.RetrieveAllPermissionsResponse{
-			Returnval: p,
-		},
-	}
-}
-
-func (m *AuthorizationManager) RemoveEntityPermission(req *types.RemoveEntityPermission) soap.HasFault {
-	var p []types.Permission
-
-	for _, v := range m.permissions[req.Entity] {
-		if v.Group == req.IsGroup && v.Principal == req.User {
-			continue
-		}
-		p = append(p, v)
-	}
-
-	m.permissions[req.Entity] = p
-
-	return &methods.RemoveEntityPermissionBody{
-		Res: &types.RemoveEntityPermissionResponse{},
-	}
-}
-
-func (m *AuthorizationManager) SetEntityPermissions(req *types.SetEntityPermissions) soap.HasFault {
-	m.permissions[req.Entity] = req.Permission
-
-	return &methods.SetEntityPermissionsBody{
-		Res: &types.SetEntityPermissionsResponse{},
-	}
-}
-
-func (m *AuthorizationManager) RetrieveRolePermissions(req *types.RetrieveRolePermissions) soap.HasFault {
-	var p []types.Permission
-
-	for _, set := range m.permissions {
-		for _, v := range set {
-			if v.RoleId == req.RoleId {
-				p = append(p, v)
-			}
-		}
-	}
-
-	return &methods.RetrieveRolePermissionsBody{
-		Res: &types.RetrieveRolePermissionsResponse{
-			Returnval: p,
-		},
-	}
-}
-
-func (m *AuthorizationManager) AddAuthorizationRole(req *types.AddAuthorizationRole) soap.HasFault {
-	body := &methods.AddAuthorizationRoleBody{}
-
-	for _, role := range m.RoleList {
-		if role.Name == req.Name {
-			body.Fault_ = Fault("", &types.AlreadyExists{})
-			return body
-		}
-	}
-
-	ids, err := m.privIDs(req.PrivIds)
-	if err != nil {
-		body.Fault_ = err
-		return body
-	}
-
-	m.RoleList = append(m.RoleList, types.AuthorizationRole{
-		Info: &types.Description{
-			Label:   req.Name,
-			Summary: req.Name,
-		},
-		RoleId:    m.nextID,
-		Privilege: ids,
-		Name:      req.Name,
-		System:    false,
-	})
-
-	m.nextID++
-
-	body.Res = &types.AddAuthorizationRoleResponse{}
-
-	return body
-}
-
-func (m *AuthorizationManager) UpdateAuthorizationRole(req *types.UpdateAuthorizationRole) soap.HasFault {
-	body := &methods.UpdateAuthorizationRoleBody{}
-
-	for _, role := range m.RoleList {
-		if role.Name == req.NewName && role.RoleId != req.RoleId {
-			body.Fault_ = Fault("", &types.AlreadyExists{})
-			return body
-		}
-	}
-
-	for i, role := range m.RoleList {
-		if role.RoleId == req.RoleId {
-			if len(req.PrivIds) != 0 {
-				ids, err := m.privIDs(req.PrivIds)
-				if err != nil {
-					body.Fault_ = err
-					return body
-				}
-				m.RoleList[i].Privilege = ids
-			}
-
-			m.RoleList[i].Name = req.NewName
-
-			body.Res = &types.UpdateAuthorizationRoleResponse{}
-			return body
-		}
-	}
-
-	body.Fault_ = Fault("", &types.NotFound{})
-
-	return body
-}
-
-func (m *AuthorizationManager) RemoveAuthorizationRole(req *types.RemoveAuthorizationRole) soap.HasFault {
-	body := &methods.RemoveAuthorizationRoleBody{}
-
-	for i, role := range m.RoleList {
-		if role.RoleId == req.RoleId {
-			m.RoleList = append(m.RoleList[:i], m.RoleList[i+1:]...)
-
-			body.Res = &types.RemoveAuthorizationRoleResponse{}
-			return body
-		}
-	}
-
-	body.Fault_ = Fault("", &types.NotFound{})
-
-	return body
-}
-
-func (m *AuthorizationManager) privIDs(ids []string) ([]string, *soap.Fault) {
-	system := make(map[string]struct{}, len(m.system))
-
-	for _, id := range ids {
-		if _, ok := m.privileges[id]; !ok {
-			return nil, Fault("", &types.InvalidArgument{InvalidProperty: "privIds"})
-		}
-
-		if strings.HasPrefix(id, "System.") {
-			system[id] = struct{}{}
-		}
-	}
-
-	for _, id := range m.system {
-		if _, ok := system[id]; ok {
-			continue
-		}
-
-		ids = append(ids, id)
-	}
-
-	return ids, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource.go b/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource.go
deleted file mode 100644
index 7cd967d315..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ClusterComputeResource struct {
-	mo.ClusterComputeResource
-}
-
-type addHost struct {
-	*ClusterComputeResource
-
-	req *types.AddHost_Task
-}
-
-func (add *addHost) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	spec := add.req.Spec
-
-	if spec.HostName == "" {
-		return nil, &types.NoHost{}
-	}
-
-	host := NewHostSystem(esx.HostSystem)
-	host.Summary.Config.Name = spec.HostName
-	host.Name = host.Summary.Config.Name
-	host.Runtime.ConnectionState = types.HostSystemConnectionStateDisconnected
-
-	cr := add.ClusterComputeResource
-	Map.PutEntity(cr, Map.NewEntity(host))
-
-	cr.Host = append(cr.Host, host.Reference())
-
-	if add.req.AsConnected {
-		host.Runtime.ConnectionState = types.HostSystemConnectionStateConnected
-	}
-
-	addComputeResource(add.ClusterComputeResource.Summary.GetComputeResourceSummary(), host)
-
-	return host.Reference(), nil
-}
-
-func (c *ClusterComputeResource) AddHostTask(add *types.AddHost_Task) soap.HasFault {
-	r := &methods.AddHost_TaskBody{}
-
-	task := NewTask(&addHost{c, add})
-
-	r.Res = &types.AddHost_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-func CreateClusterComputeResource(f *Folder, name string, spec types.ClusterConfigSpecEx) (*ClusterComputeResource, types.BaseMethodFault) {
-	if e := Map.FindByName(name, f.ChildEntity); e != nil {
-		return nil, &types.DuplicateName{
-			Name:   e.Entity().Name,
-			Object: e.Reference(),
-		}
-	}
-
-	cluster := &ClusterComputeResource{}
-	cluster.Name = name
-	cluster.Summary = &types.ClusterComputeResourceSummary{
-		UsageSummary: new(types.ClusterUsageSummary),
-	}
-
-	config := &types.ClusterConfigInfoEx{}
-	cluster.ConfigurationEx = config
-
-	config.DrsConfig.Enabled = types.NewBool(true)
-
-	pool := NewResourcePool()
-	Map.PutEntity(cluster, Map.NewEntity(pool))
-	cluster.ResourcePool = &pool.Self
-
-	f.putChild(cluster)
-	pool.Owner = cluster.Self
-
-	return cluster, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource_test.go
deleted file mode 100644
index c6791a81ce..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/cluster_compute_resource_test.go
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestClusterESX(t *testing.T) {
-	content := esx.ServiceContent
-	s := New(NewServiceInstance(content, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dc := object.NewDatacenter(c.Client, esx.Datacenter.Reference())
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = folders.HostFolder.CreateCluster(ctx, "cluster1", types.ClusterConfigSpecEx{})
-	if err == nil {
-		t.Fatal("expected error")
-	}
-}
-
-func TestClusterVC(t *testing.T) {
-	content := vpx.ServiceContent
-	s := New(NewServiceInstance(content, vpx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f := object.NewRootFolder(c.Client)
-
-	dc, err := f.CreateDatacenter(ctx, "foo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cluster, err := folders.HostFolder.CreateCluster(ctx, "cluster1", types.ClusterConfigSpecEx{})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = folders.HostFolder.CreateCluster(ctx, "cluster1", types.ClusterConfigSpecEx{})
-	if err == nil {
-		t.Error("expected DuplicateName error")
-	}
-
-	spec := types.HostConnectSpec{}
-
-	for _, fail := range []bool{true, false} {
-		task, err := cluster.AddHost(ctx, spec, true, nil, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		_, err = task.WaitForResult(ctx, nil)
-
-		if fail {
-			if err == nil {
-				t.Error("expected error")
-			}
-			spec.HostName = "localhost"
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager.go
deleted file mode 100644
index 3ae5ef0302..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager.go
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type CustomFieldsManager struct {
-	mo.CustomFieldsManager
-
-	nextKey int32
-}
-
-func NewCustomFieldsManager(ref types.ManagedObjectReference) object.Reference {
-	m := &CustomFieldsManager{}
-	m.Self = ref
-	return m
-}
-
-func (c *CustomFieldsManager) find(key int32) (int, *types.CustomFieldDef) {
-	for i, field := range c.Field {
-		if field.Key == key {
-			return i, &c.Field[i]
-		}
-	}
-
-	return -1, nil
-}
-
-func (c *CustomFieldsManager) AddCustomFieldDef(req *types.AddCustomFieldDef) soap.HasFault {
-	body := &methods.AddCustomFieldDefBody{}
-
-	def := types.CustomFieldDef{
-		Key:                     c.nextKey,
-		Name:                    req.Name,
-		ManagedObjectType:       req.MoType,
-		Type:                    req.MoType,
-		FieldDefPrivileges:      req.FieldDefPolicy,
-		FieldInstancePrivileges: req.FieldPolicy,
-	}
-
-	c.Field = append(c.Field, def)
-	c.nextKey++
-
-	body.Res = &types.AddCustomFieldDefResponse{
-		Returnval: def,
-	}
-	return body
-}
-
-func (c *CustomFieldsManager) RemoveCustomFieldDef(req *types.RemoveCustomFieldDef) soap.HasFault {
-	body := &methods.RemoveCustomFieldDefBody{}
-
-	i, field := c.find(req.Key)
-	if field == nil {
-		body.Fault_ = Fault("", &types.NotFound{})
-		return body
-	}
-
-	c.Field = append(c.Field[:i], c.Field[i+1:]...)
-
-	body.Res = &types.RemoveCustomFieldDefResponse{}
-	return body
-}
-
-func (c *CustomFieldsManager) RenameCustomFieldDef(req *types.RenameCustomFieldDef) soap.HasFault {
-	body := &methods.RenameCustomFieldDefBody{}
-
-	_, field := c.find(req.Key)
-	if field == nil {
-		body.Fault_ = Fault("", &types.NotFound{})
-		return body
-	}
-
-	field.Name = req.Name
-
-	body.Res = &types.RenameCustomFieldDefResponse{}
-	return body
-}
-
-func (c *CustomFieldsManager) SetField(req *types.SetField) soap.HasFault {
-	body := &methods.SetFieldBody{}
-
-	entity := Map.Get(req.Entity).(mo.Entity).Entity()
-	entity.CustomValue = append(entity.CustomValue, &types.CustomFieldStringValue{
-		CustomFieldValue: types.CustomFieldValue{Key: req.Key},
-		Value:            req.Value,
-	})
-
-	body.Res = &types.SetFieldResponse{}
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager_test.go
deleted file mode 100644
index e1c425f52b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/custom_fields_manager_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestCustomFieldsManager(t *testing.T) {
-	s := New(NewServiceInstance(vpx.ServiceContent, vpx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	fieldsManager, err := object.GetCustomFieldsManager(c.Client)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	field, err := fieldsManager.Add(ctx, "field_name", "VirtualMachine", nil, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if field.Name != "field_name" && field.Type != "VirtualMachine" {
-		t.Fatal("field add result mismatched with the inserted")
-	}
-
-	fields, err := fieldsManager.Field(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(fields) != 1 {
-		t.Fatalf("expect len(fields)=1; got %d", len(fields))
-	}
-	if !reflect.DeepEqual(&fields[0], field) {
-		t.Fatalf("expect fields[0]==field; got %+v,%+v", fields[0], field)
-	}
-
-	key, err := fieldsManager.FindKey(ctx, field.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if key != field.Key {
-		t.Fatalf("expect key == field.Key; got %d != %d", key, field.Key)
-	}
-
-	err = fieldsManager.Rename(ctx, key, "new_field_name")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	fields, err = fieldsManager.Field(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(fields) != 1 {
-		t.Fatalf("expect len(fields)=1; got %d", len(fields))
-	}
-	if fields[0].Name != "new_field_name" {
-		t.Fatalf("expect field.name to be %s; got %s", "new_field_name", fields[0].Name)
-	}
-
-	folder := Map.content().RootFolder
-	err = fieldsManager.Set(ctx, folder, 1, "value")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	values := Map.Get(folder.Reference()).(mo.Entity).Entity().CustomValue
-	if len(values) != 1 {
-		t.Fatalf("expect CustomValue has 1 item; got %d", len(values))
-	}
-	fkey := values[0].GetCustomFieldValue().Key
-	if fkey != 1 {
-		t.Fatalf("expect value.Key to be 1; got %d", fkey)
-	}
-	value := values[0].(*types.CustomFieldStringValue).Value
-	if value != "value" {
-		t.Fatalf("expect value.Value to be %q; got %q", "value", value)
-	}
-
-	err = fieldsManager.Remove(ctx, field.Key)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	fields, err = fieldsManager.Field(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(fields) != 0 {
-		t.Fatalf("expect fields to be empty; got %+v", fields)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/datacenter.go b/installer/vendor/github.com/vmware/govmomi/simulator/datacenter.go
deleted file mode 100644
index 15b5d43242..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/datacenter.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"strings"
-
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Create Datacenter Folders.
-// Every Datacenter has 4 inventory Folders: Vm, Host, Datastore and Network.
-// The ESX folder child types are limited to 1 type.
-// The VC folders have additional child types, including nested folders.
-func createDatacenterFolders(dc *mo.Datacenter, isVC bool) {
-	folders := []struct {
-		ref   *types.ManagedObjectReference
-		name  string
-		types []string
-	}{
-		{&dc.VmFolder, "vm", []string{"VirtualMachine", "VirtualApp", "Folder"}},
-		{&dc.HostFolder, "host", []string{"ComputeResource", "Folder"}},
-		{&dc.DatastoreFolder, "datastore", []string{"Datastore", "StoragePod", "Folder"}},
-		{&dc.NetworkFolder, "network", []string{"Network", "DistributedVirtualSwitch", "Folder"}},
-	}
-
-	for _, f := range folders {
-		folder := &Folder{}
-		folder.Name = f.name
-
-		if isVC {
-			folder.ChildType = f.types
-			e := Map.PutEntity(dc, folder)
-
-			// propagate the generated morefs to Datacenter
-			ref := e.Reference()
-			f.ref.Type = ref.Type
-			f.ref.Value = ref.Value
-		} else {
-			folder.ChildType = f.types[:1]
-			folder.Self = *f.ref
-			Map.PutEntity(dc, folder)
-		}
-	}
-
-	net := Map.Get(dc.NetworkFolder).(*Folder)
-
-	for _, ref := range esx.Datacenter.Network {
-		// Add VM Network by default to each Datacenter
-		network := &mo.Network{}
-		network.Self = ref
-		network.Name = strings.Split(ref.Value, "-")[1]
-		network.Entity().Name = network.Name
-		if isVC {
-			network.Self.Value = "" // we want a different moid per-DC
-		}
-
-		net.putChild(network)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/datacenter_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/datacenter_test.go
deleted file mode 100644
index 0a38739adb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/datacenter_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestDatacenterCreateFolders(t *testing.T) {
-	tests := []struct {
-		isVC bool
-		dc   mo.Datacenter
-	}{
-		{false, esx.Datacenter},
-		{true, mo.Datacenter{}},
-	}
-
-	for _, test := range tests {
-		Map.PutEntity(nil, &test.dc)
-
-		createDatacenterFolders(&test.dc, test.isVC)
-
-		folders := []types.ManagedObjectReference{
-			test.dc.VmFolder,
-			test.dc.HostFolder,
-			test.dc.DatastoreFolder,
-			test.dc.NetworkFolder,
-		}
-
-		for _, ref := range folders {
-			if ref.Type == "" || ref.Value == "" {
-				t.Errorf("invalid moref=%#v", ref)
-			}
-
-			e := Map.Get(ref).(mo.Entity)
-
-			if e.Entity().Name == "" {
-				t.Error("empty name")
-			}
-
-			if *e.Entity().Parent != test.dc.Self {
-				t.Fail()
-			}
-
-			f, ok := e.(*Folder)
-			if !ok {
-				t.Fatalf("unexpected type (%T) for %#v", e, ref)
-			}
-
-			if test.isVC {
-				if len(f.ChildType) < 2 {
-					t.Fail()
-				}
-			} else {
-				if len(f.ChildType) != 1 {
-					t.Fail()
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/datastore.go b/installer/vendor/github.com/vmware/govmomi/simulator/datastore.go
deleted file mode 100644
index 527f85dec1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/datastore.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"time"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Datastore struct {
-	mo.Datastore
-}
-
-func parseDatastorePath(dsPath string) (*object.DatastorePath, types.BaseMethodFault) {
-	var p object.DatastorePath
-
-	if p.FromString(dsPath) {
-		return &p, nil
-	}
-
-	return nil, &types.InvalidDatastorePath{DatastorePath: dsPath}
-}
-
-func (ds *Datastore) RefreshDatastore(*types.RefreshDatastore) soap.HasFault {
-	r := &methods.RefreshDatastoreBody{}
-
-	err := ds.stat()
-	if err != nil {
-		r.Fault_ = Fault(err.Error(), &types.HostConfigFault{})
-		return r
-	}
-
-	info := ds.Info.GetDatastoreInfo()
-
-	now := time.Now()
-
-	info.Timestamp = &now
-
-	return r
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/datastore_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/datastore_test.go
deleted file mode 100644
index 8c5f24b638..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/datastore_test.go
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"net/http"
-	"os"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestParseDatastorePath(t *testing.T) {
-	tests := []struct {
-		dsPath string
-		dsFile string
-		fail   bool
-	}{
-		{"", "", true},
-		{"x", "", true},
-		{"[", "", true},
-		{"[nope", "", true},
-		{"[test]", "", false},
-		{"[test] foo", "foo", false},
-		{"[test] foo/foo.vmx", "foo/foo.vmx", false},
-		{"[test]foo bar/foo bar.vmx", "foo bar/foo bar.vmx", false},
-	}
-
-	for _, test := range tests {
-		p, err := parseDatastorePath(test.dsPath)
-		if test.fail {
-			if err == nil {
-				t.Errorf("expected error for: %s", test.dsPath)
-			}
-		} else {
-			if err != nil {
-				t.Errorf("unexpected error '%#v' for: %s", err, test.dsPath)
-			} else {
-				if test.dsFile != p.Path {
-					t.Errorf("dsFile=%s", p.Path)
-				}
-				if p.Datastore != "test" {
-					t.Errorf("ds=%s", p.Datastore)
-				}
-			}
-		}
-	}
-}
-
-func TestRefreshDatastore(t *testing.T) {
-	tests := []struct {
-		dir  string
-		fail bool
-	}{
-		{".", false},
-		{"-", true},
-	}
-
-	for _, test := range tests {
-		ds := &Datastore{}
-		ds.Info = &types.LocalDatastoreInfo{
-			DatastoreInfo: types.DatastoreInfo{
-				Url: test.dir,
-			},
-		}
-
-		res := ds.RefreshDatastore(nil)
-		err := res.Fault()
-
-		if test.fail {
-			if err == nil {
-				t.Error("expected error")
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
-
-func TestDatastoreHTTP(t *testing.T) {
-	ctx := context.Background()
-	src := "datastore_test.go"
-	dst := "tmp.go"
-
-	for i, model := range []*Model{ESX(), VPX()} {
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		if i == 0 {
-			// Enable use of SessionManagerGenericServiceTicket.HostName in govmomi, disabled by default.
-			opts := s.URL.Query()
-			opts.Set("GOVMOMI_USE_SERVICE_TICKET_HOSTNAME", "true")
-			s.URL.RawQuery = opts.Encode()
-		}
-
-		c, err := govmomi.NewClient(ctx, s.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder := find.NewFinder(c.Client, false)
-
-		dc, err := finder.DefaultDatacenter(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder.SetDatacenter(dc)
-
-		ds, err := finder.DefaultDatastore(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if i == 0 {
-			// Cover the service ticket path
-			// TODO: govmomi requires HostSystem.Config.VirtualNicManagerInfo
-			// ctx = ds.HostContext(ctx, object.NewHostSystem(c.Client, esx.HostSystem.Reference()))
-		}
-
-		dsPath := ds.Path
-
-		if !c.IsVC() {
-			dc = nil // test using the default
-		}
-
-		fm := object.NewFileManager(c.Client)
-		browser, err := ds.Browser(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		download := func(name string, fail bool) {
-			st, serr := ds.Stat(ctx, name)
-
-			_, _, err = ds.Download(ctx, name, nil)
-			if fail {
-				if err == nil {
-					t.Fatal("expected Download error")
-				}
-				if serr == nil {
-					t.Fatal("expected Stat error")
-				}
-			} else {
-				if err != nil {
-					t.Errorf("Download error: %s", err)
-				}
-				if serr != nil {
-					t.Errorf("Stat error: %s", serr)
-				}
-
-				p := st.GetFileInfo().Path
-				if p != name {
-					t.Errorf("path=%s", p)
-				}
-			}
-		}
-
-		upload := func(name string, fail bool, method string) {
-			f, err := os.Open(src)
-			if err != nil {
-				t.Fatal(err)
-			}
-			defer f.Close()
-
-			p := soap.DefaultUpload
-			p.Method = method
-
-			err = ds.Upload(ctx, f, name, &p)
-			if fail {
-				if err == nil {
-					t.Fatalf("%s %s: expected error", method, name)
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		rm := func(name string, fail bool) {
-			task, err := fm.DeleteDatastoreFile(ctx, dsPath(name), dc)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = task.Wait(ctx)
-			if fail {
-				if err == nil {
-					t.Fatalf("rm %s: expected error", name)
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		mv := func(src string, dst string, fail bool, force bool) {
-			task, err := fm.MoveDatastoreFile(ctx, dsPath(src), dc, dsPath(dst), dc, force)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = task.Wait(ctx)
-			if fail {
-				if err == nil {
-					t.Fatalf("mv %s %s: expected error", src, dst)
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		mkdir := func(name string, fail bool, p bool) {
-			err := fm.MakeDirectory(ctx, dsPath(name), dc, p)
-			if fail {
-				if err == nil {
-					t.Fatalf("mkdir %s: expected error", name)
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		stat := func(name string, fail bool) {
-			_, err := ds.Stat(ctx, name)
-			if fail {
-				if err == nil {
-					t.Fatalf("stat %s: expected error", name)
-				}
-			} else {
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-
-		ls := func(name string, fail bool) []types.BaseFileInfo {
-			spec := types.HostDatastoreBrowserSearchSpec{
-				MatchPattern: []string{"*"},
-			}
-
-			task, err := browser.SearchDatastore(ctx, dsPath(name), &spec)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			info, err := task.WaitForResult(ctx, nil)
-			if err != nil {
-				if fail {
-					if err == nil {
-						t.Fatalf("ls %s: expected error", name)
-					}
-				} else {
-					if err != nil {
-						t.Fatal(err)
-					}
-				}
-				return nil
-			}
-
-			return info.Result.(types.HostDatastoreBrowserSearchResults).File
-		}
-
-		lsr := func(name string, fail bool, query ...types.BaseFileQuery) []types.HostDatastoreBrowserSearchResults {
-			spec := types.HostDatastoreBrowserSearchSpec{
-				MatchPattern: []string{"*"},
-				Query:        query,
-			}
-
-			task, err := browser.SearchDatastoreSubFolders(ctx, dsPath(name), &spec)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			info, err := task.WaitForResult(ctx, nil)
-			if err != nil {
-				if fail {
-					if err == nil {
-						t.Fatalf("find %s: expected error", name)
-					}
-				} else {
-					if err != nil {
-						t.Fatal(err)
-					}
-				}
-				return nil
-			}
-
-			return info.Result.(types.ArrayOfHostDatastoreBrowserSearchResults).HostDatastoreBrowserSearchResults
-		}
-
-		// GET file does not exist = fail
-		download(dst, true)
-		stat(dst, true)
-		ls(dst, true)
-		lsr(dst, true)
-
-		// delete file does not exist = fail
-		rm(dst, true)
-
-		// PUT file = ok
-		upload(dst, false, "PUT")
-		stat(dst, false)
-		ls("", false)
-		lsr("", false)
-
-		// GET file exists = ok
-		download(dst, false)
-
-		// POST file exists = fail
-		upload(dst, true, "POST")
-
-		// delete existing file = ok
-		rm(dst, false)
-		stat(dst, true)
-
-		// GET file does not exist = fail
-		download(dst, true)
-
-		// POST file does not exist = ok
-		upload(dst, false, "POST")
-
-		// PATCH method not supported = fail
-		upload(dst+".patch", true, "PATCH")
-
-		// PUT path is directory = fail
-		upload("", true, "PUT")
-
-		// mkdir parent does not exist = fail
-		mkdir("foo/bar", true, false)
-
-		// mkdir -p parent does not exist = ok
-		mkdir("foo/bar", false, true)
-
-		// mkdir = ok
-		mkdir("foo/bar/baz", false, false)
-
-		target := path.Join("foo", dst)
-
-		// mv dst not exist = ok
-		mv(dst, target, false, false)
-
-		// POST file does not exist = ok
-		upload(dst, false, "POST")
-
-		// mv dst exists = fail
-		mv(dst, target, true, false)
-
-		// mv dst exists, force=true = ok
-		mv(dst, target, false, true)
-
-		// mv src does not exist = fail
-		mv(dst, target, true, true)
-
-		// ls -R = ok
-		res := lsr("foo", false)
-
-		count := func(s string) int {
-			n := 0
-			for _, dir := range res {
-				for _, f := range dir.File {
-					if strings.HasSuffix(f.GetFileInfo().Path, s) {
-						n++
-					}
-				}
-			}
-			return n
-		}
-
-		n := len(res) + count("")
-
-		if n != 6 {
-			t.Errorf("ls -R foo==%d", n)
-		}
-
-		// test FileQuery
-		res = lsr("", false)
-		all := count(".vmdk") // foo-flat.vmdk + foo.vmdk
-
-		res = lsr("", false, new(types.VmDiskFileQuery))
-		allq := count(".vmdk") // foo.vmdk only
-		if allq*2 != all {
-			t.Errorf("ls -R *.vmdk: %d vs %d", all, allq)
-		}
-
-		res = lsr("", false, new(types.VmLogFileQuery), new(types.VmConfigFileQuery))
-		all = count("")
-		if all != model.Count().Machine*2 {
-			t.Errorf("ls -R vmware.log+.vmx: %d", all)
-		}
-
-		invalid := []string{
-			"",       //InvalidDatastorePath
-			"[nope]", // InvalidDatastore
-		}
-
-		// test FileType details
-		mkdir("exts", false, false)
-		stat("exts", false)
-		exts := []string{"img", "iso", "log", "nvram", "vmdk", "vmx"}
-		for _, ext := range exts {
-			name := dst + "." + ext
-			upload(name, false, "POST")
-			stat(name, false)
-		}
-
-		for _, p := range invalid {
-			dsPath = func(name string) string {
-				return p
-			}
-			mv(target, dst, true, false)
-			mkdir("sorry", true, false)
-			rm(target, true)
-			ls(target, true)
-		}
-
-		// cover the dst failure path
-		for _, p := range invalid {
-			dsPath = func(name string) string {
-				if name == dst {
-					return p
-				}
-				return ds.Path(name)
-			}
-			mv(target, dst, true, false)
-		}
-
-		dsPath = func(name string) string {
-			return ds.Path("enoent")
-		}
-		ls(target, true)
-
-		// cover the case where datacenter or datastore lookup fails
-		for _, q := range []string{"dcName=nope", "dsName=nope"} {
-			u := *s.URL
-			u.RawQuery = q
-			u.Path = path.Join(folderPrefix, dst)
-
-			r, err := http.Get(u.String())
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if r.StatusCode == http.StatusOK {
-				t.Error("expected failure")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/dvs.go b/installer/vendor/github.com/vmware/govmomi/simulator/dvs.go
deleted file mode 100644
index 7ff43e9493..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/dvs.go
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type DistributedVirtualSwitch struct {
-	mo.DistributedVirtualSwitch
-}
-
-func (s *DistributedVirtualSwitch) AddDVPortgroupTask(c *types.AddDVPortgroup_Task) soap.HasFault {
-	task := CreateTask(s, "addDVPortgroup", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		f := Map.getEntityParent(s, "Folder").(*Folder)
-
-		for _, spec := range c.Spec {
-			pg := &DistributedVirtualPortgroup{}
-			pg.Name = spec.Name
-			pg.Entity().Name = pg.Name
-
-			if obj := Map.FindByName(pg.Name, f.ChildEntity); obj != nil {
-				return nil, &types.DuplicateName{
-					Name:   pg.Name,
-					Object: obj.Reference(),
-				}
-			}
-
-			f.putChild(pg)
-
-			pg.Key = pg.Self.Value
-			pg.Config = types.DVPortgroupConfigInfo{
-				Key:                          pg.Key,
-				Name:                         pg.Name,
-				NumPorts:                     spec.NumPorts,
-				DistributedVirtualSwitch:     &s.Self,
-				DefaultPortConfig:            spec.DefaultPortConfig,
-				Description:                  spec.Description,
-				Type:                         spec.Type,
-				Policy:                       spec.Policy,
-				PortNameFormat:               spec.PortNameFormat,
-				Scope:                        spec.Scope,
-				VendorSpecificConfig:         spec.VendorSpecificConfig,
-				ConfigVersion:                spec.ConfigVersion,
-				AutoExpand:                   spec.AutoExpand,
-				VmVnicNetworkResourcePoolKey: spec.VmVnicNetworkResourcePoolKey,
-			}
-
-			s.Portgroup = append(s.Portgroup, pg.Self)
-			s.Summary.PortgroupName = append(s.Summary.PortgroupName, pg.Name)
-
-			for _, h := range s.Summary.HostMember {
-				pg.Host = AddReference(h, pg.Host)
-				host := Map.Get(h).(*HostSystem)
-				host.Network = append(host.Network, pg.Reference())
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.AddDVPortgroup_TaskBody{
-		Res: &types.AddDVPortgroup_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (s *DistributedVirtualSwitch) ReconfigureDvsTask(req *types.ReconfigureDvs_Task) soap.HasFault {
-	task := CreateTask(s, "reconfigureDvs", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		spec := req.Spec.GetDVSConfigSpec()
-
-		for _, member := range spec.Host {
-			h := Map.Get(member.Host)
-			if h == nil {
-				return nil, &types.ManagedObjectNotFound{Obj: member.Host}
-			}
-
-			host := h.(*HostSystem)
-
-			switch types.ConfigSpecOperation(member.Operation) {
-			case types.ConfigSpecOperationAdd:
-				if FindReference(host.Network, s.Self) != nil {
-					return nil, &types.AlreadyExists{Name: host.Name}
-				}
-
-				host.Network = append(host.Network, s.Self)
-				host.Network = append(host.Network, s.Portgroup...)
-				s.Summary.HostMember = append(s.Summary.HostMember, member.Host)
-
-				for _, ref := range s.Portgroup {
-					pg := Map.Get(ref).(*DistributedVirtualPortgroup)
-					pg.Host = AddReference(member.Host, pg.Host)
-				}
-			case types.ConfigSpecOperationRemove:
-				if pg := FindReference(host.Network, s.Portgroup...); pg != nil {
-					return nil, &types.ResourceInUse{
-						Type: pg.Type,
-						Name: pg.Value,
-					}
-				}
-
-				host.Network = RemoveReference(s.Self, host.Network)
-				s.Summary.HostMember = RemoveReference(s.Self, s.Summary.HostMember)
-			case types.ConfigSpecOperationEdit:
-				return nil, &types.NotSupported{}
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.ReconfigureDvs_TaskBody{
-		Res: &types.ReconfigureDvs_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (s *DistributedVirtualSwitch) FetchDVPorts(req *types.FetchDVPorts) soap.HasFault {
-	body := &methods.FetchDVPortsBody{}
-	body.Res = &types.FetchDVPortsResponse{
-		Returnval: s.dvPortgroups(req.Criteria),
-	}
-	return body
-}
-
-func (s *DistributedVirtualSwitch) DestroyTask(req *types.Destroy_Task) soap.HasFault {
-	task := CreateTask(s, "destroy", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		f := Map.getEntityParent(s, "Folder").(*Folder)
-		f.removeChild(s.Reference())
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.Destroy_TaskBody{
-		Res: &types.Destroy_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (s *DistributedVirtualSwitch) dvPortgroups(_ *types.DistributedVirtualSwitchPortCriteria) []types.DistributedVirtualPort {
-	// TODO(agui): Filter is not implemented yet
-	var res []types.DistributedVirtualPort
-	for _, ref := range s.Portgroup {
-		pg := Map.Get(ref).(*DistributedVirtualPortgroup)
-		res = append(res, types.DistributedVirtualPort{
-			DvsUuid: s.Uuid,
-			Key:     pg.Key,
-			Config: types.DVPortConfigInfo{
-				Setting: pg.Config.DefaultPortConfig,
-			},
-		})
-
-		if pg.PortKeys == nil {
-			continue
-		}
-
-		for _, key := range pg.PortKeys {
-			res = append(res, types.DistributedVirtualPort{
-				DvsUuid: s.Uuid,
-				Key:     key,
-				Config: types.DVPortConfigInfo{
-					Setting: pg.Config.DefaultPortConfig,
-				},
-			})
-		}
-	}
-	return res
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/dvs_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/dvs_test.go
deleted file mode 100644
index 78c54b2959..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/dvs_test.go
+++ /dev/null
@@ -1,149 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestDVS(t *testing.T) {
-	m := VPX()
-	m.Portgroup = 0 // disabled DVS creation
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ctx := context.Background()
-	c := m.Service.client
-
-	finder := find.NewFinder(c, false)
-	dc, _ := finder.DatacenterList(ctx, "*")
-	finder.SetDatacenter(dc[0])
-	folders, _ := dc[0].Folders(ctx)
-	hosts, _ := finder.HostSystemList(ctx, "*/*")
-
-	var spec types.DVSCreateSpec
-	spec.ConfigSpec = &types.VMwareDVSConfigSpec{}
-	spec.ConfigSpec.GetDVSConfigSpec().Name = "DVS0"
-
-	dtask, err := folders.NetworkFolder.CreateDVS(ctx, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	info, err := dtask.WaitForResult(ctx, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dvs := object.NewDistributedVirtualSwitch(c, info.Result.(types.ManagedObjectReference))
-
-	config := &types.DVSConfigSpec{}
-
-	for _, host := range hosts {
-		config.Host = append(config.Host, types.DistributedVirtualSwitchHostMemberConfigSpec{
-			Host: host.Reference(),
-		})
-	}
-
-	tests := []struct {
-		op  types.ConfigSpecOperation
-		pg  string
-		err types.BaseMethodFault
-	}{
-		{types.ConfigSpecOperationAdd, "", nil},                               // Add == OK
-		{types.ConfigSpecOperationAdd, "", &types.AlreadyExists{}},            // Add == fail (AlreadyExists)
-		{types.ConfigSpecOperationEdit, "", &types.NotSupported{}},            // Edit == fail (NotSupported)
-		{types.ConfigSpecOperationRemove, "", nil},                            // Remove == OK
-		{types.ConfigSpecOperationAdd, "", nil},                               // Add == OK
-		{types.ConfigSpecOperationAdd, "DVPG0", nil},                          // Add PG == OK
-		{types.ConfigSpecOperationRemove, "", &types.ResourceInUse{}},         // Remove == fail (ResourceInUse)
-		{types.ConfigSpecOperationRemove, "", &types.ManagedObjectNotFound{}}, // Remove == fail (ManagedObjectNotFound)
-	}
-
-	for x, test := range tests {
-		switch test.err.(type) {
-		case *types.ManagedObjectNotFound:
-			for i := range config.Host {
-				config.Host[i].Host.Value = "enoent"
-			}
-		}
-
-		if test.pg == "" {
-			for i := range config.Host {
-				config.Host[i].Operation = string(test.op)
-			}
-
-			dtask, err = dvs.Reconfigure(ctx, config)
-		} else {
-			switch test.op {
-			case types.ConfigSpecOperationAdd:
-				dtask, err = dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{{Name: test.pg}})
-			}
-		}
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = dtask.Wait(ctx)
-
-		if test.err == nil {
-			if err != nil {
-				t.Fatal(err)
-			}
-			continue
-		}
-
-		if err == nil {
-			t.Errorf("expected error in test %d", x)
-		}
-
-		if reflect.TypeOf(test.err) != reflect.TypeOf(err.(task.Error).Fault()) {
-			t.Errorf("expected %T fault in test %d", test.err, x)
-		}
-	}
-
-	ports, err := dvs.FetchDVPorts(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(ports) != 1 {
-		t.Fatalf("expected 1 ports in DVPorts; got %d", len(ports))
-	}
-
-	dtask, err = dvs.Destroy(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = dtask.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/entity.go b/installer/vendor/github.com/vmware/govmomi/simulator/entity.go
deleted file mode 100644
index 06c6141137..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/entity.go
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func RenameTask(e mo.Entity, r *types.Rename_Task) soap.HasFault {
-	task := CreateTask(e, "rename", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		obj := Map.Get(r.This).(mo.Entity).Entity()
-
-		if parent, ok := Map.Get(*obj.Parent).(*Folder); ok {
-			if Map.FindByName(r.NewName, parent.ChildEntity) != nil {
-				return nil, &types.InvalidArgument{InvalidProperty: "name"}
-			}
-		}
-
-		obj.Name = r.NewName
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.Rename_TaskBody{
-		Res: &types.Rename_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/entity_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/entity_test.go
deleted file mode 100644
index 76fbf1af36..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/entity_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestRename(t *testing.T) {
-	m := VPX()
-	m.Datacenter = 2
-	m.Folder = 2
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	dc := Map.Any("Datacenter").(*mo.Datacenter)
-	vmFolder := Map.Get(dc.VmFolder).(*Folder)
-
-	f1 := Map.Get(vmFolder.ChildEntity[0]).(*Folder) // "F1"
-
-	id := vmFolder.CreateFolder(&types.CreateFolder{
-		This: vmFolder.Reference(),
-		Name: "F2",
-	}).(*methods.CreateFolderBody).Res.Returnval
-
-	f2 := Map.Get(id).(*Folder) // "F2"
-
-	states := []types.TaskInfoState{types.TaskInfoStateError, types.TaskInfoStateSuccess}
-	name := f1.Name
-
-	for _, expect := range states {
-		id = f2.RenameTask(&types.Rename_Task{
-			This:    f2.Reference(),
-			NewName: name,
-		}).(*methods.Rename_TaskBody).Res.Returnval
-
-		task := Map.Get(id).(*Task)
-
-		if task.Info.State != expect {
-			t.Errorf("state=%s", task.Info.State)
-		}
-
-		name = name + "-uniq"
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/authorization_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/authorization_manager.go
deleted file mode 100644
index e72c06c851..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/authorization_manager.go
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// RoleList is the default template for the AuthorizationManager roleList property.
-// Capture method:
-//   govc object.collect -s -dump AuthorizationManager:ha-authmgr roleList
-var RoleList = []types.AuthorizationRole{
-	{
-		RoleId: -6,
-		System: true,
-		Name:   "NoCryptoAdmin",
-		Info: &types.Description{
-			Label:   "No cryptography administrator",
-			Summary: "Full access without Cryptographic operations privileges",
-		},
-		Privilege: nil,
-	},
-	{
-		RoleId: -5,
-		System: true,
-		Name:   "NoAccess",
-		Info: &types.Description{
-			Label:   "No access",
-			Summary: "Used for restricting granted access",
-		},
-		Privilege: nil,
-	},
-	{
-		RoleId: -4,
-		System: true,
-		Name:   "Anonymous",
-		Info: &types.Description{
-			Label:   "Anonymous",
-			Summary: "Not logged-in user (cannot be granted)",
-		},
-		Privilege: []string{"System.Anonymous"},
-	},
-	{
-		RoleId: -3,
-		System: true,
-		Name:   "View",
-		Info: &types.Description{
-			Label:   "View",
-			Summary: "Visibility access (cannot be granted)",
-		},
-		Privilege: []string{"System.Anonymous", "System.View"},
-	},
-	{
-		RoleId: -2,
-		System: true,
-		Name:   "ReadOnly",
-		Info: &types.Description{
-			Label:   "Read-only",
-			Summary: "See details of objects, but not make changes",
-		},
-		Privilege: []string{"System.Anonymous", "System.Read", "System.View"},
-	},
-	{
-		RoleId: -1,
-		System: true,
-		Name:   "Admin",
-		Info: &types.Description{
-			Label:   "Administrator",
-			Summary: "Full access rights",
-		},
-		Privilege: []string{"Alarm.Acknowledge", "Alarm.Create", "Alarm.Delete", "Alarm.DisableActions", "Alarm.Edit", "Alarm.SetStatus", "Authorization.ModifyPermissions", "Authorization.ModifyRoles", "Authorization.ReassignRolePermissions", "Certificate.Manage", "Cryptographer.Access", "Cryptographer.AddDisk", "Cryptographer.Clone", "Cryptographer.Decrypt", "Cryptographer.Encrypt", "Cryptographer.EncryptNew", "Cryptographer.ManageEncryptionPolicy", "Cryptographer.ManageKeyServers", "Cryptographer.ManageKeys", "Cryptographer.Migrate", "Cryptographer.Recrypt", "Cryptographer.RegisterHost", "Cryptographer.RegisterVM", "DVPortgroup.Create", "DVPortgroup.Delete", "DVPortgroup.Modify", "DVPortgroup.PolicyOp", "DVPortgroup.ScopeOp", "DVSwitch.Create", "DVSwitch.Delete", "DVSwitch.HostOp", "DVSwitch.Modify", "DVSwitch.Move", "DVSwitch.PolicyOp", "DVSwitch.PortConfig", "DVSwitch.PortSetting", "DVSwitch.ResourceManagement", "DVSwitch.Vspan", "Datacenter.Create", "Datacenter.Delete", "Datacenter.IpPoolConfig", "Datacenter.IpPoolQueryAllocations", "Datacenter.IpPoolReleaseIp", "Datacenter.Move", "Datacenter.Reconfigure", "Datacenter.Rename", "Datastore.AllocateSpace", "Datastore.Browse", "Datastore.Config", "Datastore.Delete", "Datastore.DeleteFile", "Datastore.FileManagement", "Datastore.Move", "Datastore.Rename", "Datastore.UpdateVirtualMachineFiles", "Datastore.UpdateVirtualMachineMetadata", "EAM.Config", "EAM.Modify", "EAM.View", "Extension.Register", "Extension.Unregister", "Extension.Update", "ExternalStatsProvider.Register", "ExternalStatsProvider.Unregister", "ExternalStatsProvider.Update", "Folder.Create", "Folder.Delete", "Folder.Move", "Folder.Rename", "Global.CancelTask", "Global.CapacityPlanning", "Global.Diagnostics", "Global.DisableMethods", "Global.EnableMethods", "Global.GlobalTag", "Global.Health", "Global.Licenses", "Global.LogEvent", "Global.ManageCustomFields", "Global.Proxy", "Global.ScriptAction", "Global.ServiceManagers", "Global.SetCustomField", "Global.Settings", "Global.SystemTag", "Global.VCServer", "HealthUpdateProvider.Register", "HealthUpdateProvider.Unregister", "HealthUpdateProvider.Update", "Host.Cim.CimInteraction", "Host.Config.AdvancedConfig", "Host.Config.AuthenticationStore", "Host.Config.AutoStart", "Host.Config.Connection", "Host.Config.DateTime", "Host.Config.Firmware", "Host.Config.HyperThreading", "Host.Config.Image", "Host.Config.Maintenance", "Host.Config.Memory", "Host.Config.NetService", "Host.Config.Network", "Host.Config.Patch", "Host.Config.PciPassthru", "Host.Config.Power", "Host.Config.Quarantine", "Host.Config.Resources", "Host.Config.Settings", "Host.Config.Snmp", "Host.Config.Storage", "Host.Config.SystemManagement", "Host.Hbr.HbrManagement", "Host.Inventory.AddHostToCluster", "Host.Inventory.AddStandaloneHost", "Host.Inventory.CreateCluster", "Host.Inventory.DeleteCluster", "Host.Inventory.EditCluster", "Host.Inventory.MoveCluster", "Host.Inventory.MoveHost", "Host.Inventory.RemoveHostFromCluster", "Host.Inventory.RenameCluster", "Host.Local.CreateVM", "Host.Local.DeleteVM", "Host.Local.InstallAgent", "Host.Local.ManageUserGroups", "Host.Local.ReconfigVM", "Network.Assign", "Network.Config", "Network.Delete", "Network.Move", "Performance.ModifyIntervals", "Profile.Clear", "Profile.Create", "Profile.Delete", "Profile.Edit", "Profile.Export", "Profile.View", "Resource.ApplyRecommendation", "Resource.AssignVAppToPool", "Resource.AssignVMToPool", "Resource.ColdMigrate", "Resource.CreatePool", "Resource.DeletePool", "Resource.EditPool", "Resource.HotMigrate", "Resource.MovePool", "Resource.QueryVMotion", "Resource.RenamePool", "ScheduledTask.Create", "ScheduledTask.Delete", "ScheduledTask.Edit", "ScheduledTask.Run", "Sessions.GlobalMessage", "Sessions.ImpersonateUser", "Sessions.TerminateSession", "Sessions.ValidateSession", "StoragePod.Config", "System.Anonymous", "System.Read", "System.View", "Task.Create", "Task.Update", "VApp.ApplicationConfig", "VApp.AssignResourcePool", "VApp.AssignVApp", "VApp.AssignVM", "VApp.Clone", "VApp.Create", "VApp.Delete", "VApp.Export", "VApp.ExtractOvfEnvironment", "VApp.Import", "VApp.InstanceConfig", "VApp.ManagedByConfig", "VApp.Move", "VApp.PowerOff", "VApp.PowerOn", "VApp.Rename", "VApp.ResourceConfig", "VApp.Suspend", "VApp.Unregister", "VRMPolicy.Query", "VRMPolicy.Update", "VirtualMachine.Config.AddExistingDisk", "VirtualMachine.Config.AddNewDisk", "VirtualMachine.Config.AddRemoveDevice", "VirtualMachine.Config.AdvancedConfig", "VirtualMachine.Config.Annotation", "VirtualMachine.Config.CPUCount", "VirtualMachine.Config.ChangeTracking", "VirtualMachine.Config.DiskExtend", "VirtualMachine.Config.DiskLease", "VirtualMachine.Config.EditDevice", "VirtualMachine.Config.HostUSBDevice", "VirtualMachine.Config.ManagedBy", "VirtualMachine.Config.Memory", "VirtualMachine.Config.MksControl", "VirtualMachine.Config.QueryFTCompatibility", "VirtualMachine.Config.QueryUnownedFiles", "VirtualMachine.Config.RawDevice", "VirtualMachine.Config.ReloadFromPath", "VirtualMachine.Config.RemoveDisk", "VirtualMachine.Config.Rename", "VirtualMachine.Config.ResetGuestInfo", "VirtualMachine.Config.Resource", "VirtualMachine.Config.Settings", "VirtualMachine.Config.SwapPlacement", "VirtualMachine.Config.ToggleForkParent", "VirtualMachine.Config.Unlock", "VirtualMachine.Config.UpgradeVirtualHardware", "VirtualMachine.GuestOperations.Execute", "VirtualMachine.GuestOperations.Modify", "VirtualMachine.GuestOperations.ModifyAliases", "VirtualMachine.GuestOperations.Query", "VirtualMachine.GuestOperations.QueryAliases", "VirtualMachine.Hbr.ConfigureReplication", "VirtualMachine.Hbr.MonitorReplication", "VirtualMachine.Hbr.ReplicaManagement", "VirtualMachine.Interact.AnswerQuestion", "VirtualMachine.Interact.Backup", "VirtualMachine.Interact.ConsoleInteract", "VirtualMachine.Interact.CreateScreenshot", "VirtualMachine.Interact.CreateSecondary", "VirtualMachine.Interact.DefragmentAllDisks", "VirtualMachine.Interact.DeviceConnection", "VirtualMachine.Interact.DisableSecondary", "VirtualMachine.Interact.DnD", "VirtualMachine.Interact.EnableSecondary", "VirtualMachine.Interact.GuestControl", "VirtualMachine.Interact.MakePrimary", "VirtualMachine.Interact.Pause", "VirtualMachine.Interact.PowerOff", "VirtualMachine.Interact.PowerOn", "VirtualMachine.Interact.PutUsbScanCodes", "VirtualMachine.Interact.Record", "VirtualMachine.Interact.Replay", "VirtualMachine.Interact.Reset", "VirtualMachine.Interact.SESparseMaintenance", "VirtualMachine.Interact.SetCDMedia", "VirtualMachine.Interact.SetFloppyMedia", "VirtualMachine.Interact.Suspend", "VirtualMachine.Interact.TerminateFaultTolerantVM", "VirtualMachine.Interact.ToolsInstall", "VirtualMachine.Interact.TurnOffFaultTolerance", "VirtualMachine.Inventory.Create", "VirtualMachine.Inventory.CreateFromExisting", "VirtualMachine.Inventory.Delete", "VirtualMachine.Inventory.Move", "VirtualMachine.Inventory.Register", "VirtualMachine.Inventory.Unregister", "VirtualMachine.Namespace.Event", "VirtualMachine.Namespace.EventNotify", "VirtualMachine.Namespace.Management", "VirtualMachine.Namespace.ModifyContent", "VirtualMachine.Namespace.Query", "VirtualMachine.Namespace.ReadContent", "VirtualMachine.Provisioning.Clone", "VirtualMachine.Provisioning.CloneTemplate", "VirtualMachine.Provisioning.CreateTemplateFromVM", "VirtualMachine.Provisioning.Customize", "VirtualMachine.Provisioning.DeployTemplate", "VirtualMachine.Provisioning.DiskRandomAccess", "VirtualMachine.Provisioning.DiskRandomRead", "VirtualMachine.Provisioning.FileRandomAccess", "VirtualMachine.Provisioning.GetVmFiles", "VirtualMachine.Provisioning.MarkAsTemplate", "VirtualMachine.Provisioning.MarkAsVM", "VirtualMachine.Provisioning.ModifyCustSpecs", "VirtualMachine.Provisioning.PromoteDisks", "VirtualMachine.Provisioning.PutVmFiles", "VirtualMachine.Provisioning.ReadCustSpecs", "VirtualMachine.State.CreateSnapshot", "VirtualMachine.State.RemoveSnapshot", "VirtualMachine.State.RenameSnapshot", "VirtualMachine.State.RevertToSnapshot"},
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/datacenter.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/datacenter.go
deleted file mode 100644
index c0f95eff9c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/datacenter.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import (
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Datacenter is the default template for Datacenter properties.
-// Capture method:
-//   govc datacenter.info -dump
-var Datacenter = mo.Datacenter{
-	ManagedEntity: mo.ManagedEntity{
-		ExtensibleManagedObject: mo.ExtensibleManagedObject{
-			Self:           types.ManagedObjectReference{Type: "Datacenter", Value: "ha-datacenter"},
-			Value:          nil,
-			AvailableField: nil,
-		},
-		Parent:              (*types.ManagedObjectReference)(nil),
-		CustomValue:         nil,
-		OverallStatus:       "",
-		ConfigStatus:        "",
-		ConfigIssue:         nil,
-		EffectiveRole:       nil,
-		Permission:          nil,
-		Name:                "ha-datacenter",
-		DisabledMethod:      nil,
-		RecentTask:          nil,
-		DeclaredAlarmState:  nil,
-		TriggeredAlarmState: nil,
-		AlarmActionsEnabled: (*bool)(nil),
-		Tag:                 nil,
-	},
-	VmFolder:        types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-vm"},
-	HostFolder:      types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-host"},
-	DatastoreFolder: types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-datastore"},
-	NetworkFolder:   types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-network"},
-	Datastore: []types.ManagedObjectReference{
-		{Type: "Datastore", Value: "57089c25-85e3ccd4-17b6-000c29d0beb3"},
-	},
-	Network: []types.ManagedObjectReference{
-		{Type: "Network", Value: "HaNetwork-VM Network"},
-	},
-	Configuration: types.DatacenterConfigInfo{},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/doc.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/doc.go
deleted file mode 100644
index 50b6202fa6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Package esx contains SOAP responses from an ESX server, captured using `govc ... -dump`.
-*/
-package esx
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go
deleted file mode 100644
index 3c8295a6c4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_config_info.go
+++ /dev/null
@@ -1,1091 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// HostConfigInfo is the default template for the HostSystem config property.
-// Capture method:
-//   govc object.collect -s -dump HostSystem:ha-host config
-var HostConfigInfo = types.HostConfigInfo{
-	Host: types.ManagedObjectReference{Type: "HostSystem", Value: "ha-host"},
-	Product: types.AboutInfo{
-		Name:                  "VMware ESXi",
-		FullName:              "VMware ESXi 6.5.0 build-5969303",
-		Vendor:                "VMware, Inc.",
-		Version:               "6.5.0",
-		Build:                 "5969303",
-		LocaleVersion:         "INTL",
-		LocaleBuild:           "000",
-		OsType:                "vmnix-x86",
-		ProductLineId:         "embeddedEsx",
-		ApiType:               "HostAgent",
-		ApiVersion:            "6.5",
-		InstanceUuid:          "",
-		LicenseProductName:    "VMware ESX Server",
-		LicenseProductVersion: "6.0",
-	},
-	DeploymentInfo: &types.HostDeploymentInfo{
-		BootedFromStatelessCache: types.NewBool(false),
-	},
-	HyperThread: &types.HostHyperThreadScheduleInfo{
-		Available: false,
-		Active:    false,
-		Config:    true,
-	},
-	ConsoleReservation:        (*types.ServiceConsoleReservationInfo)(nil),
-	VirtualMachineReservation: (*types.VirtualMachineMemoryReservationInfo)(nil),
-	StorageDevice:             &HostStorageDeviceInfo,
-	SystemFile:                nil,
-	Network: &types.HostNetworkInfo{
-		Vswitch: []types.HostVirtualSwitch{
-			{
-				Name:              "vSwitch0",
-				Key:               "key-vim.host.VirtualSwitch-vSwitch0",
-				NumPorts:          1536,
-				NumPortsAvailable: 1530,
-				Mtu:               1500,
-				Portgroup:         []string{"key-vim.host.PortGroup-VM Network", "key-vim.host.PortGroup-Management Network"},
-				Pnic:              []string{"key-vim.host.PhysicalNic-vmnic0"},
-				Spec: types.HostVirtualSwitchSpec{
-					NumPorts: 128,
-					Bridge: &types.HostVirtualSwitchBondBridge{
-						HostVirtualSwitchBridge: types.HostVirtualSwitchBridge{},
-						NicDevice:               []string{"vmnic0"},
-						Beacon: &types.HostVirtualSwitchBeaconConfig{
-							Interval: 1,
-						},
-						LinkDiscoveryProtocolConfig: &types.LinkDiscoveryProtocolConfig{
-							Protocol:  "cdp",
-							Operation: "listen",
-						},
-					},
-					Policy: &types.HostNetworkPolicy{
-						Security: &types.HostNetworkSecurityPolicy{
-							AllowPromiscuous: types.NewBool(false),
-							MacChanges:       types.NewBool(true),
-							ForgedTransmits:  types.NewBool(true),
-						},
-						NicTeaming: &types.HostNicTeamingPolicy{
-							Policy:         "loadbalance_srcid",
-							ReversePolicy:  types.NewBool(true),
-							NotifySwitches: types.NewBool(true),
-							RollingOrder:   types.NewBool(false),
-							FailureCriteria: &types.HostNicFailureCriteria{
-								CheckSpeed:        "minimum",
-								Speed:             10,
-								CheckDuplex:       types.NewBool(false),
-								FullDuplex:        types.NewBool(false),
-								CheckErrorPercent: types.NewBool(false),
-								Percentage:        0,
-								CheckBeacon:       types.NewBool(false),
-							},
-							NicOrder: &types.HostNicOrderPolicy{
-								ActiveNic:  []string{"vmnic0"},
-								StandbyNic: nil,
-							},
-						},
-						OffloadPolicy: &types.HostNetOffloadCapabilities{
-							CsumOffload:     types.NewBool(true),
-							TcpSegmentation: types.NewBool(true),
-							ZeroCopyXmit:    types.NewBool(true),
-						},
-						ShapingPolicy: &types.HostNetworkTrafficShapingPolicy{
-							Enabled:          types.NewBool(false),
-							AverageBandwidth: 0,
-							PeakBandwidth:    0,
-							BurstSize:        0,
-						},
-					},
-					Mtu: 0,
-				},
-			},
-		},
-		ProxySwitch: nil,
-		Portgroup: []types.HostPortGroup{
-			{
-				Key:     "key-vim.host.PortGroup-VM Network",
-				Port:    nil,
-				Vswitch: "key-vim.host.VirtualSwitch-vSwitch0",
-				ComputedPolicy: types.HostNetworkPolicy{
-					Security: &types.HostNetworkSecurityPolicy{
-						AllowPromiscuous: types.NewBool(false),
-						MacChanges:       types.NewBool(true),
-						ForgedTransmits:  types.NewBool(true),
-					},
-					NicTeaming: &types.HostNicTeamingPolicy{
-						Policy:         "loadbalance_srcid",
-						ReversePolicy:  types.NewBool(true),
-						NotifySwitches: types.NewBool(true),
-						RollingOrder:   types.NewBool(false),
-						FailureCriteria: &types.HostNicFailureCriteria{
-							CheckSpeed:        "minimum",
-							Speed:             10,
-							CheckDuplex:       types.NewBool(false),
-							FullDuplex:        types.NewBool(false),
-							CheckErrorPercent: types.NewBool(false),
-							Percentage:        0,
-							CheckBeacon:       types.NewBool(false),
-						},
-						NicOrder: &types.HostNicOrderPolicy{
-							ActiveNic:  []string{"vmnic0"},
-							StandbyNic: nil,
-						},
-					},
-					OffloadPolicy: &types.HostNetOffloadCapabilities{
-						CsumOffload:     types.NewBool(true),
-						TcpSegmentation: types.NewBool(true),
-						ZeroCopyXmit:    types.NewBool(true),
-					},
-					ShapingPolicy: &types.HostNetworkTrafficShapingPolicy{
-						Enabled:          types.NewBool(false),
-						AverageBandwidth: 0,
-						PeakBandwidth:    0,
-						BurstSize:        0,
-					},
-				},
-				Spec: types.HostPortGroupSpec{
-					Name:        "VM Network",
-					VlanId:      0,
-					VswitchName: "vSwitch0",
-					Policy: types.HostNetworkPolicy{
-						Security: &types.HostNetworkSecurityPolicy{},
-						NicTeaming: &types.HostNicTeamingPolicy{
-							Policy:          "",
-							ReversePolicy:   (*bool)(nil),
-							NotifySwitches:  (*bool)(nil),
-							RollingOrder:    (*bool)(nil),
-							FailureCriteria: &types.HostNicFailureCriteria{},
-							NicOrder:        (*types.HostNicOrderPolicy)(nil),
-						},
-						OffloadPolicy: &types.HostNetOffloadCapabilities{},
-						ShapingPolicy: &types.HostNetworkTrafficShapingPolicy{},
-					},
-				},
-			},
-			{
-				Key: "key-vim.host.PortGroup-Management Network",
-				Port: []types.HostPortGroupPort{
-					{
-						Key:  "key-vim.host.PortGroup.Port-33554436",
-						Mac:  []string{"00:0c:29:81:d8:a0"},
-						Type: "host",
-					},
-				},
-				Vswitch: "key-vim.host.VirtualSwitch-vSwitch0",
-				ComputedPolicy: types.HostNetworkPolicy{
-					Security: &types.HostNetworkSecurityPolicy{
-						AllowPromiscuous: types.NewBool(false),
-						MacChanges:       types.NewBool(true),
-						ForgedTransmits:  types.NewBool(true),
-					},
-					NicTeaming: &types.HostNicTeamingPolicy{
-						Policy:         "loadbalance_srcid",
-						ReversePolicy:  types.NewBool(true),
-						NotifySwitches: types.NewBool(true),
-						RollingOrder:   types.NewBool(false),
-						FailureCriteria: &types.HostNicFailureCriteria{
-							CheckSpeed:        "minimum",
-							Speed:             10,
-							CheckDuplex:       types.NewBool(false),
-							FullDuplex:        types.NewBool(false),
-							CheckErrorPercent: types.NewBool(false),
-							Percentage:        0,
-							CheckBeacon:       types.NewBool(false),
-						},
-						NicOrder: &types.HostNicOrderPolicy{
-							ActiveNic:  []string{"vmnic0"},
-							StandbyNic: nil,
-						},
-					},
-					OffloadPolicy: &types.HostNetOffloadCapabilities{
-						CsumOffload:     types.NewBool(true),
-						TcpSegmentation: types.NewBool(true),
-						ZeroCopyXmit:    types.NewBool(true),
-					},
-					ShapingPolicy: &types.HostNetworkTrafficShapingPolicy{
-						Enabled:          types.NewBool(false),
-						AverageBandwidth: 0,
-						PeakBandwidth:    0,
-						BurstSize:        0,
-					},
-				},
-				Spec: types.HostPortGroupSpec{
-					Name:        "Management Network",
-					VlanId:      0,
-					VswitchName: "vSwitch0",
-					Policy: types.HostNetworkPolicy{
-						Security: &types.HostNetworkSecurityPolicy{},
-						NicTeaming: &types.HostNicTeamingPolicy{
-							Policy:         "loadbalance_srcid",
-							ReversePolicy:  (*bool)(nil),
-							NotifySwitches: types.NewBool(true),
-							RollingOrder:   types.NewBool(false),
-							FailureCriteria: &types.HostNicFailureCriteria{
-								CheckSpeed:        "",
-								Speed:             0,
-								CheckDuplex:       (*bool)(nil),
-								FullDuplex:        (*bool)(nil),
-								CheckErrorPercent: (*bool)(nil),
-								Percentage:        0,
-								CheckBeacon:       types.NewBool(false),
-							},
-							NicOrder: &types.HostNicOrderPolicy{
-								ActiveNic:  []string{"vmnic0"},
-								StandbyNic: nil,
-							},
-						},
-						OffloadPolicy: &types.HostNetOffloadCapabilities{},
-						ShapingPolicy: &types.HostNetworkTrafficShapingPolicy{},
-					},
-				},
-			},
-		},
-		Pnic: []types.PhysicalNic{
-			{
-				Key:    "key-vim.host.PhysicalNic-vmnic0",
-				Device: "vmnic0",
-				Pci:    "0000:0b:00.0",
-				Driver: "nvmxnet3",
-				LinkSpeed: &types.PhysicalNicLinkInfo{
-					SpeedMb: 10000,
-					Duplex:  true,
-				},
-				ValidLinkSpecification: []types.PhysicalNicLinkInfo{
-					{
-						SpeedMb: 10000,
-						Duplex:  true,
-					},
-				},
-				Spec: types.PhysicalNicSpec{
-					Ip: &types.HostIpConfig{},
-					LinkSpeed: &types.PhysicalNicLinkInfo{
-						SpeedMb: 10000,
-						Duplex:  true,
-					},
-				},
-				WakeOnLanSupported: false,
-				Mac:                "00:0c:29:81:d8:a0",
-				FcoeConfiguration: &types.FcoeConfig{
-					PriorityClass: 3,
-					SourceMac:     "00:0c:29:81:d8:a0",
-					VlanRange: []types.FcoeConfigVlanRange{
-						{},
-					},
-					Capabilities: types.FcoeConfigFcoeCapabilities{
-						PriorityClass:    false,
-						SourceMacAddress: false,
-						VlanRange:        true,
-					},
-					FcoeActive: false,
-				},
-				VmDirectPathGen2Supported:             types.NewBool(false),
-				VmDirectPathGen2SupportedMode:         "",
-				ResourcePoolSchedulerAllowed:          types.NewBool(true),
-				ResourcePoolSchedulerDisallowedReason: nil,
-				AutoNegotiateSupported:                types.NewBool(false),
-			},
-			{
-				Key:    "key-vim.host.PhysicalNic-vmnic1",
-				Device: "vmnic1",
-				Pci:    "0000:13:00.0",
-				Driver: "nvmxnet3",
-				LinkSpeed: &types.PhysicalNicLinkInfo{
-					SpeedMb: 10000,
-					Duplex:  true,
-				},
-				ValidLinkSpecification: []types.PhysicalNicLinkInfo{
-					{
-						SpeedMb: 10000,
-						Duplex:  true,
-					},
-				},
-				Spec: types.PhysicalNicSpec{
-					Ip: &types.HostIpConfig{},
-					LinkSpeed: &types.PhysicalNicLinkInfo{
-						SpeedMb: 10000,
-						Duplex:  true,
-					},
-				},
-				WakeOnLanSupported: false,
-				Mac:                "00:0c:29:81:d8:aa",
-				FcoeConfiguration: &types.FcoeConfig{
-					PriorityClass: 3,
-					SourceMac:     "00:0c:29:81:d8:aa",
-					VlanRange: []types.FcoeConfigVlanRange{
-						{},
-					},
-					Capabilities: types.FcoeConfigFcoeCapabilities{
-						PriorityClass:    false,
-						SourceMacAddress: false,
-						VlanRange:        true,
-					},
-					FcoeActive: false,
-				},
-				VmDirectPathGen2Supported:             types.NewBool(false),
-				VmDirectPathGen2SupportedMode:         "",
-				ResourcePoolSchedulerAllowed:          types.NewBool(true),
-				ResourcePoolSchedulerDisallowedReason: nil,
-				AutoNegotiateSupported:                types.NewBool(false),
-			},
-		},
-		Vnic: []types.HostVirtualNic{
-			{
-				Device:    "vmk0",
-				Key:       "key-vim.host.VirtualNic-vmk0",
-				Portgroup: "Management Network",
-				Spec: types.HostVirtualNicSpec{
-					Ip: &types.HostIpConfig{
-						Dhcp:       true,
-						IpAddress:  "127.0.0.1",
-						SubnetMask: "255.0.0.0",
-						IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-					},
-					Mac: "00:0c:29:81:d8:a0",
-					DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-					Portgroup:              "Management Network",
-					Mtu:                    1500,
-					TsoEnabled:             types.NewBool(true),
-					NetStackInstanceKey:    "defaultTcpipStack",
-					OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-					ExternalId:             "",
-					PinnedPnic:             "",
-					IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-				},
-				Port: "key-vim.host.PortGroup.Port-33554436",
-			},
-		},
-		ConsoleVnic: nil,
-		DnsConfig: &types.HostDnsConfig{
-			Dhcp:             true,
-			VirtualNicDevice: "vmk0",
-			HostName:         "localhost",
-			DomainName:       "localdomain",
-			Address:          []string{"8.8.8.8"},
-			SearchDomain:     []string{"localdomain"},
-		},
-		IpRouteConfig: &types.HostIpRouteConfig{
-			DefaultGateway:     "127.0.0.1",
-			GatewayDevice:      "",
-			IpV6DefaultGateway: "",
-			IpV6GatewayDevice:  "",
-		},
-		ConsoleIpRouteConfig: nil,
-		RouteTableInfo: &types.HostIpRouteTableInfo{
-			IpRoute: []types.HostIpRouteEntry{
-				{
-					Network:      "0.0.0.0",
-					PrefixLength: 0,
-					Gateway:      "127.0.0.1",
-					DeviceName:   "vmk0",
-				},
-				{
-					Network:      "127.0.0.0",
-					PrefixLength: 8,
-					Gateway:      "0.0.0.0",
-					DeviceName:   "vmk0",
-				},
-			},
-			Ipv6Route: nil,
-		},
-		Dhcp:              nil,
-		Nat:               nil,
-		IpV6Enabled:       types.NewBool(false),
-		AtBootIpV6Enabled: types.NewBool(false),
-		NetStackInstance: []types.HostNetStackInstance{
-			{
-				Key:                             "vSphereProvisioning",
-				Name:                            "",
-				DnsConfig:                       &types.HostDnsConfig{},
-				IpRouteConfig:                   &types.HostIpRouteConfig{},
-				RequestedMaxNumberOfConnections: 11000,
-				CongestionControlAlgorithm:      "newreno",
-				IpV6Enabled:                     types.NewBool(true),
-				RouteTableConfig:                (*types.HostIpRouteTableConfig)(nil),
-			},
-			{
-				Key:                             "vmotion",
-				Name:                            "",
-				DnsConfig:                       &types.HostDnsConfig{},
-				IpRouteConfig:                   &types.HostIpRouteConfig{},
-				RequestedMaxNumberOfConnections: 11000,
-				CongestionControlAlgorithm:      "newreno",
-				IpV6Enabled:                     types.NewBool(true),
-				RouteTableConfig:                (*types.HostIpRouteTableConfig)(nil),
-			},
-			{
-				Key:  "defaultTcpipStack",
-				Name: "defaultTcpipStack",
-				DnsConfig: &types.HostDnsConfig{
-					Dhcp:             true,
-					VirtualNicDevice: "vmk0",
-					HostName:         "localhost",
-					DomainName:       "localdomain",
-					Address:          []string{"8.8.8.8"},
-					SearchDomain:     []string{"localdomain"},
-				},
-				IpRouteConfig: &types.HostIpRouteConfig{
-					DefaultGateway:     "127.0.0.1",
-					GatewayDevice:      "",
-					IpV6DefaultGateway: "",
-					IpV6GatewayDevice:  "",
-				},
-				RequestedMaxNumberOfConnections: 11000,
-				CongestionControlAlgorithm:      "newreno",
-				IpV6Enabled:                     types.NewBool(true),
-				RouteTableConfig: &types.HostIpRouteTableConfig{
-					IpRoute: []types.HostIpRouteOp{
-						{
-							ChangeOperation: "ignore",
-							Route: types.HostIpRouteEntry{
-								Network:      "0.0.0.0",
-								PrefixLength: 0,
-								Gateway:      "127.0.0.1",
-								DeviceName:   "vmk0",
-							},
-						},
-						{
-							ChangeOperation: "ignore",
-							Route: types.HostIpRouteEntry{
-								Network:      "127.0.0.0",
-								PrefixLength: 8,
-								Gateway:      "0.0.0.0",
-								DeviceName:   "vmk0",
-							},
-						},
-					},
-					Ipv6Route: nil,
-				},
-			},
-		},
-		OpaqueSwitch:  nil,
-		OpaqueNetwork: nil,
-	},
-	Vmotion: &types.HostVMotionInfo{
-		NetConfig: &types.HostVMotionNetConfig{
-			CandidateVnic: []types.HostVirtualNic{
-				{
-					Device:    "vmk0",
-					Key:       "VMotionConfig.vmotion.key-vim.host.VirtualNic-vmk0",
-					Portgroup: "Management Network",
-					Spec: types.HostVirtualNicSpec{
-						Ip: &types.HostIpConfig{
-							Dhcp:       true,
-							IpAddress:  "127.0.0.1",
-							SubnetMask: "255.0.0.0",
-							IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-						},
-						Mac: "00:0c:29:81:d8:a0",
-						DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-						Portgroup:              "Management Network",
-						Mtu:                    1500,
-						TsoEnabled:             types.NewBool(true),
-						NetStackInstanceKey:    "defaultTcpipStack",
-						OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-						ExternalId:             "",
-						PinnedPnic:             "",
-						IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-					},
-					Port: "",
-				},
-			},
-			SelectedVnic: "",
-		},
-		IpConfig: (*types.HostIpConfig)(nil),
-	},
-	VirtualNicManagerInfo: &types.HostVirtualNicManagerInfo{
-		NetConfig: []types.VirtualNicManagerNetConfig{
-			{
-				NicType:            "faultToleranceLogging",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "faultToleranceLogging.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "management",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "management.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: []string{"management.key-vim.host.VirtualNic-vmk0"},
-			},
-			{
-				NicType:            "vSphereProvisioning",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vSphereProvisioning.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "vSphereReplication",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vSphereReplication.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "vSphereReplicationNFC",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vSphereReplicationNFC.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "vmotion",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vmotion.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "vsan",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vsan.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-			{
-				NicType:            "vsanWitness",
-				MultiSelectAllowed: true,
-				CandidateVnic: []types.HostVirtualNic{
-					{
-						Device:    "vmk0",
-						Key:       "vsanWitness.key-vim.host.VirtualNic-vmk0",
-						Portgroup: "Management Network",
-						Spec: types.HostVirtualNicSpec{
-							Ip: &types.HostIpConfig{
-								Dhcp:       true,
-								IpAddress:  "127.0.0.1",
-								SubnetMask: "255.0.0.0",
-								IpV6Config: (*types.HostIpConfigIpV6AddressConfiguration)(nil),
-							},
-							Mac: "00:0c:29:81:d8:a0",
-							DistributedVirtualPort: (*types.DistributedVirtualSwitchPortConnection)(nil),
-							Portgroup:              "Management Network",
-							Mtu:                    1500,
-							TsoEnabled:             types.NewBool(true),
-							NetStackInstanceKey:    "defaultTcpipStack",
-							OpaqueNetwork:          (*types.HostVirtualNicOpaqueNetworkSpec)(nil),
-							ExternalId:             "",
-							PinnedPnic:             "",
-							IpRouteSpec:            (*types.HostVirtualNicIpRouteSpec)(nil),
-						},
-						Port: "",
-					},
-				},
-				SelectedVnic: nil,
-			},
-		},
-	},
-	Capabilities: &types.HostNetCapabilities{
-		CanSetPhysicalNicLinkSpeed: true,
-		SupportsNicTeaming:         true,
-		NicTeamingPolicy:           []string{"loadbalance_ip", "loadbalance_srcmac", "loadbalance_srcid", "failover_explicit"},
-		SupportsVlan:               true,
-		UsesServiceConsoleNic:      false,
-		SupportsNetworkHints:       true,
-		MaxPortGroupsPerVswitch:    0,
-		VswitchConfigSupported:     true,
-		VnicConfigSupported:        true,
-		IpRouteConfigSupported:     true,
-		DnsConfigSupported:         true,
-		DhcpOnVnicSupported:        true,
-		IpV6Supported:              types.NewBool(true),
-	},
-	DatastoreCapabilities: &types.HostDatastoreSystemCapabilities{
-		NfsMountCreationRequired:     true,
-		NfsMountCreationSupported:    true,
-		LocalDatastoreSupported:      false,
-		VmfsExtentExpansionSupported: types.NewBool(true),
-	},
-	OffloadCapabilities: &types.HostNetOffloadCapabilities{
-		CsumOffload:     types.NewBool(true),
-		TcpSegmentation: types.NewBool(true),
-		ZeroCopyXmit:    types.NewBool(true),
-	},
-	Service: &types.HostServiceInfo{
-		Service: []types.HostService{
-			{
-				Key:           "DCUI",
-				Label:         "Direct Console UI",
-				Required:      false,
-				Uninstallable: false,
-				Running:       true,
-				Ruleset:       nil,
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "TSM",
-				Label:         "ESXi Shell",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       nil,
-				Policy:        "off",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "TSM-SSH",
-				Label:         "SSH",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       nil,
-				Policy:        "off",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "lbtd",
-				Label:         "Load-Based Teaming Daemon",
-				Required:      false,
-				Uninstallable: false,
-				Running:       true,
-				Ruleset:       nil,
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "lwsmd",
-				Label:         "Active Directory Service",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       nil,
-				Policy:        "off",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "ntpd",
-				Label:         "NTP Daemon",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       []string{"ntpClient"},
-				Policy:        "off",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "pcscd",
-				Label:         "PC/SC Smart Card Daemon",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       nil,
-				Policy:        "off",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "sfcbd-watchdog",
-				Label:         "CIM Server",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       []string{"CIMHttpServer", "CIMHttpsServer"},
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "snmpd",
-				Label:         "SNMP Server",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       []string{"snmp"},
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "vmsyslogd",
-				Label:         "Syslog Server",
-				Required:      true,
-				Uninstallable: false,
-				Running:       true,
-				Ruleset:       nil,
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "vpxa",
-				Label:         "VMware vCenter Agent",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       []string{"vpxHeartbeats"},
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-base",
-					Description:       "This VIB contains all of the base functionality of vSphere ESXi.",
-				},
-			},
-			{
-				Key:           "xorg",
-				Label:         "X.Org Server",
-				Required:      false,
-				Uninstallable: false,
-				Running:       false,
-				Ruleset:       nil,
-				Policy:        "on",
-				SourcePackage: &types.HostServiceSourcePackage{
-					SourcePackageName: "esx-xserver",
-					Description:       "This VIB contains X Server used for virtual machine 3D hardware acceleration.",
-				},
-			},
-		},
-	},
-	Firewall: &HostFirewallInfo,
-	AutoStart: &types.HostAutoStartManagerConfig{
-		Defaults: &types.AutoStartDefaults{
-			Enabled:          (*bool)(nil),
-			StartDelay:       120,
-			StopDelay:        120,
-			WaitForHeartbeat: types.NewBool(false),
-			StopAction:       "PowerOff",
-		},
-		PowerInfo: nil,
-	},
-	ActiveDiagnosticPartition: &types.HostDiagnosticPartition{
-		StorageType:    "directAttached",
-		DiagnosticType: "singleHost",
-		Slots:          -15,
-		Id: types.HostScsiDiskPartition{
-			DiskName:  "mpx.vmhba0:C0:T0:L0",
-			Partition: 9,
-		},
-	},
-	Option:            nil,
-	OptionDef:         nil,
-	Flags:             &types.HostFlagInfo{},
-	AdminDisabled:     (*bool)(nil),
-	LockdownMode:      "lockdownDisabled",
-	Ipmi:              (*types.HostIpmiInfo)(nil),
-	SslThumbprintInfo: (*types.HostSslThumbprintInfo)(nil),
-	SslThumbprintData: nil,
-	Certificate:       []uint8{0x31, 0x30},
-	PciPassthruInfo:   nil,
-	AuthenticationManagerInfo: &types.HostAuthenticationManagerInfo{
-		AuthConfig: []types.BaseHostAuthenticationStoreInfo{
-			&types.HostLocalAuthenticationInfo{
-				HostAuthenticationStoreInfo: types.HostAuthenticationStoreInfo{
-					Enabled: true,
-				},
-			},
-			&types.HostActiveDirectoryInfo{
-				HostDirectoryStoreInfo:         types.HostDirectoryStoreInfo{},
-				JoinedDomain:                   "",
-				TrustedDomain:                  nil,
-				DomainMembershipStatus:         "",
-				SmartCardAuthenticationEnabled: types.NewBool(false),
-			},
-		},
-	},
-	FeatureVersion: nil,
-	PowerSystemCapability: &types.PowerSystemCapability{
-		AvailablePolicy: []types.HostPowerPolicy{
-			{
-				Key:         1,
-				Name:        "PowerPolicy.static.name",
-				ShortName:   "static",
-				Description: "PowerPolicy.static.description",
-			},
-			{
-				Key:         2,
-				Name:        "PowerPolicy.dynamic.name",
-				ShortName:   "dynamic",
-				Description: "PowerPolicy.dynamic.description",
-			},
-			{
-				Key:         3,
-				Name:        "PowerPolicy.low.name",
-				ShortName:   "low",
-				Description: "PowerPolicy.low.description",
-			},
-			{
-				Key:         4,
-				Name:        "PowerPolicy.custom.name",
-				ShortName:   "custom",
-				Description: "PowerPolicy.custom.description",
-			},
-		},
-	},
-	PowerSystemInfo: &types.PowerSystemInfo{
-		CurrentPolicy: types.HostPowerPolicy{
-			Key:         2,
-			Name:        "PowerPolicy.dynamic.name",
-			ShortName:   "dynamic",
-			Description: "PowerPolicy.dynamic.description",
-		},
-	},
-	CacheConfigurationInfo: []types.HostCacheConfigurationInfo{
-		{
-			Key:      types.ManagedObjectReference{Type: "Datastore", Value: "5980f676-21a5db76-9eef-000c2981d8a0"},
-			SwapSize: 0,
-		},
-	},
-	WakeOnLanCapable:        types.NewBool(false),
-	FeatureCapability:       nil,
-	MaskedFeatureCapability: nil,
-	VFlashConfigInfo:        nil,
-	VsanHostConfig: &types.VsanHostConfigInfo{
-		Enabled:     types.NewBool(false),
-		HostSystem:  &types.ManagedObjectReference{Type: "HostSystem", Value: "ha-host"},
-		ClusterInfo: &types.VsanHostConfigInfoClusterInfo{},
-		StorageInfo: &types.VsanHostConfigInfoStorageInfo{
-			AutoClaimStorage: types.NewBool(false),
-			DiskMapping:      nil,
-			DiskMapInfo:      nil,
-			ChecksumEnabled:  (*bool)(nil),
-		},
-		NetworkInfo:     &types.VsanHostConfigInfoNetworkInfo{},
-		FaultDomainInfo: &types.VsanHostFaultDomainInfo{},
-	},
-	DomainList:             nil,
-	ScriptCheckSum:         nil,
-	HostConfigCheckSum:     nil,
-	GraphicsInfo:           nil,
-	SharedPassthruGpuTypes: nil,
-	GraphicsConfig: &types.HostGraphicsConfig{
-		HostDefaultGraphicsType:        "shared",
-		SharedPassthruAssignmentPolicy: "performance",
-		DeviceType:                     nil,
-	},
-	IoFilterInfo: []types.HostIoFilterInfo{
-		{
-			IoFilterInfo: types.IoFilterInfo{
-				Id:          "VMW_spm_1.0.0",
-				Name:        "spm",
-				Vendor:      "VMW",
-				Version:     "1.0.230",
-				Type:        "datastoreIoControl",
-				Summary:     "VMware Storage I/O Control",
-				ReleaseDate: "2016-07-21",
-			},
-			Available: true,
-		},
-		{
-			IoFilterInfo: types.IoFilterInfo{
-				Id:          "VMW_vmwarevmcrypt_1.0.0",
-				Name:        "vmwarevmcrypt",
-				Vendor:      "VMW",
-				Version:     "1.0.0",
-				Type:        "encryption",
-				Summary:     "VMcrypt IO Filter",
-				ReleaseDate: "2016-07-21",
-			},
-			Available: true,
-		},
-	},
-	SriovDevicePool: nil,
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_firewall_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_firewall_system.go
deleted file mode 100644
index 11c1285aad..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_firewall_system.go
+++ /dev/null
@@ -1,1425 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// HostFirewallInfo is the default template for the HostSystem config.firewall property.
-// Capture method:
-//   govc object.collect -s -dump HostSystem:ha-host config.firewall
-var HostFirewallInfo = types.HostFirewallInfo{
-	DynamicData: types.DynamicData{},
-	DefaultPolicy: types.HostFirewallDefaultPolicy{
-		DynamicData:     types.DynamicData{},
-		IncomingBlocked: types.NewBool(true),
-		OutgoingBlocked: types.NewBool(true),
-	},
-	Ruleset: []types.HostFirewallRuleset{
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "CIMHttpServer",
-			Label:       "CIM Server",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        5988,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "sfcbd-watchdog",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "CIMHttpsServer",
-			Label:       "CIM Secure Server",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        5989,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "sfcbd-watchdog",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "CIMSLP",
-			Label:       "CIM SLP",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        427,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        427,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        427,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        427,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "DHCPv6",
-			Label:       "DHCPv6",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        547,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        546,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        547,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        546,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "DVFilter",
-			Label:       "DVFilter",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        2222,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "DVSSync",
-			Label:       "DVSSync",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8302,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8301,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8301,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8302,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "HBR",
-			Label:       "HBR",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        31031,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        44046,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "NFC",
-			Label:       "NFC",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        902,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        902,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "WOL",
-			Label:       "WOL",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        9,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "activeDirectoryAll",
-			Label:       "Active Directory All",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        88,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        88,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        123,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        137,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        139,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        389,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        389,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        445,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        464,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        464,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        3268,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        7476,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        2020,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "cmmds",
-			Label:       "Virtual SAN Clustering Service",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        12345,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        23451,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        12345,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        23451,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        12321,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        12321,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "dhcp",
-			Label:       "DHCP Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        68,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        68,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "src",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "dns",
-			Label:       "DNS Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        53,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        53,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        53,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "esxupdate",
-			Label:       "esxupdate",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        443,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "faultTolerance",
-			Label:       "Fault Tolerance",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        80,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8300,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8300,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "ftpClient",
-			Label:       "FTP Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        21,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        20,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "src",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "gdbserver",
-			Label:       "gdbserver",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        1000,
-					EndPort:     9999,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        50000,
-					EndPort:     50999,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "httpClient",
-			Label:       "httpClient",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        80,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        443,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "iSCSI",
-			Label:       "Software iSCSI Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        3260,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "iofiltervp",
-			Label:       "iofiltervp",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        9080,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "ipfam",
-			Label:       "NSX Distributed Logical Router Service",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        6999,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        6999,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "nfs41Client",
-			Label:       "nfs41Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "nfsClient",
-			Label:       "NFS Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "ntpClient",
-			Label:       "NTP Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        123,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "ntpd",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "pvrdma",
-			Label:       "pvrdma",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        28250,
-					EndPort:     28761,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        28250,
-					EndPort:     28761,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "rabbitmqproxy",
-			Label:       "rabbitmqproxy",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        5671,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "rdt",
-			Label:       "Virtual SAN Transport",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        2233,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        2233,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "remoteSerialPort",
-			Label:       "VM serial port connected over network",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        23,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        1024,
-					EndPort:     65535,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "snmp",
-			Label:       "SNMP Server",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        161,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "snmpd",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "sshClient",
-			Label:       "SSH Client",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        22,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "sshServer",
-			Label:       "SSH Server",
-			Required:    true,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        22,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "syslog",
-			Label:       "syslog",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        514,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        514,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        1514,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "updateManager",
-			Label:       "vCenter Update Manager",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        80,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        9000,
-					EndPort:     9100,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vMotion",
-			Label:       "vMotion",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8000,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8000,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vSPC",
-			Label:       "VM serial port connected to vSPC",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vSphereClient",
-			Label:       "vSphere Web Client",
-			Required:    true,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        902,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        443,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vpxHeartbeats",
-			Label:       "VMware vCenter Agent",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        902,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "vpxa",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vsanEncryption",
-			Label:       "vsanEncryption",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vsanhealth-multicasttest",
-			Label:       "vsanhealth-multicasttest",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        5001,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        5001,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "udp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vsanvp",
-			Label:       "vsanvp",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8080,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-				{
-					DynamicData: types.DynamicData{},
-					Port:        8080,
-					EndPort:     0,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "vvold",
-			Label:       "vvold",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        0,
-					EndPort:     65535,
-					Direction:   "outbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: false,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-		{
-			DynamicData: types.DynamicData{},
-			Key:         "webAccess",
-			Label:       "vSphere Web Access",
-			Required:    false,
-			Rule: []types.HostFirewallRule{
-				{
-					DynamicData: types.DynamicData{},
-					Port:        80,
-					EndPort:     0,
-					Direction:   "inbound",
-					PortType:    "dst",
-					Protocol:    "tcp",
-				},
-			},
-			Service: "",
-			Enabled: true,
-			AllowedHosts: &types.HostFirewallRulesetIpList{
-				DynamicData: types.DynamicData{},
-				IpAddress:   nil,
-				IpNetwork:   nil,
-				AllIp:       true,
-			},
-		},
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_hardware_info.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_hardware_info.go
deleted file mode 100644
index aa633ad34b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_hardware_info.go
+++ /dev/null
@@ -1,864 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import (
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// HostHardwareInfo is the default template for the HostSystem hardware property.
-// Capture method:
-//   govc object.collect -s -dump HostSystem:ha-host hardware
-var HostHardwareInfo = &types.HostHardwareInfo{
-	SystemInfo: types.HostSystemInfo{
-		Vendor: "VMware, Inc.",
-		Model:  "VMware Virtual Platform",
-		Uuid:   "e88d4d56-9f1e-3ea1-71fa-13a8e1a7fd70",
-		OtherIdentifyingInfo: []types.HostSystemIdentificationInfo{
-			{
-				IdentifierValue: " No Asset Tag",
-				IdentifierType: &types.ElementDescription{
-					Description: types.Description{
-						Label:   "Asset Tag",
-						Summary: "Asset tag of the system",
-					},
-					Key: "AssetTag",
-				},
-			},
-			{
-				IdentifierValue: "[MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]",
-				IdentifierType: &types.ElementDescription{
-					Description: types.Description{
-						Label:   "OEM specific string",
-						Summary: "OEM specific string",
-					},
-					Key: "OemSpecificString",
-				},
-			},
-			{
-				IdentifierValue: "Welcome to the Virtual Machine",
-				IdentifierType: &types.ElementDescription{
-					Description: types.Description{
-						Label:   "OEM specific string",
-						Summary: "OEM specific string",
-					},
-					Key: "OemSpecificString",
-				},
-			},
-			{
-				IdentifierValue: "VMware-56 4d 8d e8 1e 9f a1 3e-71 fa 13 a8 e1 a7 fd 70",
-				IdentifierType: &types.ElementDescription{
-					Description: types.Description{
-						Label:   "Service tag",
-						Summary: "Service tag of the system",
-					},
-					Key: "ServiceTag",
-				},
-			},
-		},
-	},
-	CpuPowerManagementInfo: &types.HostCpuPowerManagementInfo{
-		CurrentPolicy:   "Balanced",
-		HardwareSupport: "",
-	},
-	CpuInfo: types.HostCpuInfo{
-		NumCpuPackages: 2,
-		NumCpuCores:    2,
-		NumCpuThreads:  2,
-		Hz:             3591345000,
-	},
-	CpuPkg: []types.HostCpuPackage{
-		{
-			Index:       0,
-			Vendor:      "intel",
-			Hz:          3591345000,
-			BusHz:       115849838,
-			Description: "Intel(R) Xeon(R) CPU E5-1620 0 @ 3.60GHz",
-			ThreadId:    []int16{0},
-			CpuFeature: []types.HostCpuIdInfo{
-				{
-					Level:  0,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0000:0000:0000:1101",
-					Ebx:    "0111:0101:0110:1110:0110:0101:0100:0111",
-					Ecx:    "0110:1100:0110:0101:0111:0100:0110:1110",
-					Edx:    "0100:1001:0110:0101:0110:1110:0110:1001",
-				},
-				{
-					Level:  1,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0010:0000:0110:1101:0111",
-					Ebx:    "0000:0000:0000:0001:0000:1000:0000:0000",
-					Ecx:    "1001:0111:1011:1010:0010:0010:0010:1011",
-					Edx:    "0000:1111:1010:1011:1111:1011:1111:1111",
-				},
-				{
-					Level:  -2147483648,
-					Vendor: "",
-					Eax:    "1000:0000:0000:0000:0000:0000:0000:1000",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-				},
-				{
-					Level:  -2147483647,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0001",
-					Edx:    "0010:1000:0001:0000:0000:1000:0000:0000",
-				},
-				{
-					Level:  -2147483640,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0011:0000:0010:1010",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-				},
-			},
-		},
-		{
-			Index:       1,
-			Vendor:      "intel",
-			Hz:          3591345000,
-			BusHz:       115849838,
-			Description: "Intel(R) Xeon(R) CPU E5-1620 0 @ 3.60GHz",
-			ThreadId:    []int16{1},
-			CpuFeature: []types.HostCpuIdInfo{
-				{
-					Level:  0,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0000:0000:0000:1101",
-					Ebx:    "0111:0101:0110:1110:0110:0101:0100:0111",
-					Ecx:    "0110:1100:0110:0101:0111:0100:0110:1110",
-					Edx:    "0100:1001:0110:0101:0110:1110:0110:1001",
-				},
-				{
-					Level:  1,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0010:0000:0110:1101:0111",
-					Ebx:    "0000:0010:0000:0001:0000:1000:0000:0000",
-					Ecx:    "1001:0111:1011:1010:0010:0010:0010:1011",
-					Edx:    "0000:1111:1010:1011:1111:1011:1111:1111",
-				},
-				{
-					Level:  -2147483648,
-					Vendor: "",
-					Eax:    "1000:0000:0000:0000:0000:0000:0000:1000",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-				},
-				{
-					Level:  -2147483647,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0001",
-					Edx:    "0010:1000:0001:0000:0000:1000:0000:0000",
-				},
-				{
-					Level:  -2147483640,
-					Vendor: "",
-					Eax:    "0000:0000:0000:0000:0011:0000:0010:1010",
-					Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-					Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-				},
-			},
-		},
-	},
-	MemorySize: 4294430720,
-	NumaInfo: &types.HostNumaInfo{
-		Type:     "NUMA",
-		NumNodes: 1,
-		NumaNode: []types.HostNumaNode{
-			{
-				TypeId:            0x0,
-				CpuID:             []int16{1, 0},
-				MemoryRangeBegin:  4294967296,
-				MemoryRangeLength: 1073741824,
-			},
-		},
-	},
-	SmcPresent: types.NewBool(false),
-	PciDevice: []types.HostPciDevice{
-		{
-			Id:           "0000:00:00.0",
-			ClassId:      1536,
-			Bus:          0x0,
-			Slot:         0x0,
-			Function:     0x0,
-			VendorId:     -32634,
-			SubVendorId:  5549,
-			VendorName:   "Intel Corporation",
-			DeviceId:     29072,
-			SubDeviceId:  6518,
-			ParentBridge: "",
-			DeviceName:   "Virtual Machine Chipset",
-		},
-		{
-			Id:           "0000:00:01.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x1,
-			Function:     0x0,
-			VendorId:     -32634,
-			SubVendorId:  0,
-			VendorName:   "Intel Corporation",
-			DeviceId:     29073,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "440BX/ZX/DX - 82443BX/ZX/DX AGP bridge",
-		},
-		{
-			Id:           "0000:00:07.0",
-			ClassId:      1537,
-			Bus:          0x0,
-			Slot:         0x7,
-			Function:     0x0,
-			VendorId:     -32634,
-			SubVendorId:  5549,
-			VendorName:   "Intel Corporation",
-			DeviceId:     28944,
-			SubDeviceId:  6518,
-			ParentBridge: "",
-			DeviceName:   "Virtual Machine Chipset",
-		},
-		{
-			Id:           "0000:00:07.1",
-			ClassId:      257,
-			Bus:          0x0,
-			Slot:         0x7,
-			Function:     0x1,
-			VendorId:     -32634,
-			SubVendorId:  5549,
-			VendorName:   "Intel Corporation",
-			DeviceId:     28945,
-			SubDeviceId:  6518,
-			ParentBridge: "",
-			DeviceName:   "PIIX4 for 430TX/440BX/MX IDE Controller",
-		},
-		{
-			Id:           "0000:00:07.3",
-			ClassId:      1664,
-			Bus:          0x0,
-			Slot:         0x7,
-			Function:     0x3,
-			VendorId:     -32634,
-			SubVendorId:  5549,
-			VendorName:   "Intel Corporation",
-			DeviceId:     28947,
-			SubDeviceId:  6518,
-			ParentBridge: "",
-			DeviceName:   "Virtual Machine Chipset",
-		},
-		{
-			Id:           "0000:00:07.7",
-			ClassId:      2176,
-			Bus:          0x0,
-			Slot:         0x7,
-			Function:     0x7,
-			VendorId:     5549,
-			SubVendorId:  5549,
-			VendorName:   "VMware",
-			DeviceId:     1856,
-			SubDeviceId:  1856,
-			ParentBridge: "",
-			DeviceName:   "Virtual Machine Communication Interface",
-		},
-		{
-			Id:           "0000:00:0f.0",
-			ClassId:      768,
-			Bus:          0x0,
-			Slot:         0xf,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  5549,
-			VendorName:   "VMware",
-			DeviceId:     1029,
-			SubDeviceId:  1029,
-			ParentBridge: "",
-			DeviceName:   "SVGA II Adapter",
-		},
-		{
-			Id:           "0000:00:11.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x11,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1936,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI bridge",
-		},
-		{
-			Id:           "0000:00:15.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.1",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x1,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.2",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x2,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.3",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x3,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.4",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x4,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.5",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x5,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.6",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x6,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:15.7",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x15,
-			Function:     0x7,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.1",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x1,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.2",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x2,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.3",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x3,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.4",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x4,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.5",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x5,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.6",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x6,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:16.7",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x16,
-			Function:     0x7,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.1",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x1,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.2",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x2,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.3",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x3,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.4",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x4,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.5",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x5,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.6",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x6,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:17.7",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x17,
-			Function:     0x7,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.0",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.1",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x1,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.2",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x2,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.3",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x3,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.4",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x4,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.5",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x5,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.6",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x6,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:00:18.7",
-			ClassId:      1540,
-			Bus:          0x0,
-			Slot:         0x18,
-			Function:     0x7,
-			VendorId:     5549,
-			SubVendorId:  0,
-			VendorName:   "VMware",
-			DeviceId:     1952,
-			SubDeviceId:  0,
-			ParentBridge: "",
-			DeviceName:   "PCI Express Root Port",
-		},
-		{
-			Id:           "0000:03:00.0",
-			ClassId:      263,
-			Bus:          0x3,
-			Slot:         0x0,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  5549,
-			VendorName:   "VMware",
-			DeviceId:     1984,
-			SubDeviceId:  1984,
-			ParentBridge: "0000:00:15.0",
-			DeviceName:   "PVSCSI SCSI Controller",
-		},
-		{
-			Id:           "0000:0b:00.0",
-			ClassId:      512,
-			Bus:          0xb,
-			Slot:         0x0,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  5549,
-			VendorName:   "VMware Inc.",
-			DeviceId:     1968,
-			SubDeviceId:  1968,
-			ParentBridge: "0000:00:16.0",
-			DeviceName:   "vmxnet3 Virtual Ethernet Controller",
-		},
-		{
-			Id:           "0000:13:00.0",
-			ClassId:      512,
-			Bus:          0x13,
-			Slot:         0x0,
-			Function:     0x0,
-			VendorId:     5549,
-			SubVendorId:  5549,
-			VendorName:   "VMware Inc.",
-			DeviceId:     1968,
-			SubDeviceId:  1968,
-			ParentBridge: "0000:00:17.0",
-			DeviceName:   "vmxnet3 Virtual Ethernet Controller",
-		},
-	},
-	CpuFeature: []types.HostCpuIdInfo{
-		{
-			Level:  0,
-			Vendor: "",
-			Eax:    "0000:0000:0000:0000:0000:0000:0000:1101",
-			Ebx:    "0111:0101:0110:1110:0110:0101:0100:0111",
-			Ecx:    "0110:1100:0110:0101:0111:0100:0110:1110",
-			Edx:    "0100:1001:0110:0101:0110:1110:0110:1001",
-		},
-		{
-			Level:  1,
-			Vendor: "",
-			Eax:    "0000:0000:0000:0010:0000:0110:1101:0111",
-			Ebx:    "0000:0000:0000:0001:0000:1000:0000:0000",
-			Ecx:    "1001:0111:1011:1010:0010:0010:0010:1011",
-			Edx:    "0000:1111:1010:1011:1111:1011:1111:1111",
-		},
-		{
-			Level:  -2147483648,
-			Vendor: "",
-			Eax:    "1000:0000:0000:0000:0000:0000:0000:1000",
-			Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-		},
-		{
-			Level:  -2147483647,
-			Vendor: "",
-			Eax:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Ecx:    "0000:0000:0000:0000:0000:0000:0000:0001",
-			Edx:    "0010:1000:0001:0000:0000:1000:0000:0000",
-		},
-		{
-			Level:  -2147483640,
-			Vendor: "",
-			Eax:    "0000:0000:0000:0000:0011:0000:0010:1010",
-			Ebx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Ecx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-			Edx:    "0000:0000:0000:0000:0000:0000:0000:0000",
-		},
-	},
-	BiosInfo: &types.HostBIOSInfo{
-		BiosVersion:          "6.00",
-		ReleaseDate:          nil,
-		Vendor:               "",
-		MajorRelease:         0,
-		MinorRelease:         0,
-		FirmwareMajorRelease: 0,
-		FirmwareMinorRelease: 0,
-	},
-	ReliableMemoryInfo: &types.HostReliableMemoryInfo{},
-}
-
-func init() {
-	date, _ := time.Parse("2006-01-02", "2015-07-02")
-
-	HostHardwareInfo.BiosInfo.ReleaseDate = &date
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_storage_device_info.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_storage_device_info.go
deleted file mode 100644
index 9d1ae32dd4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_storage_device_info.go
+++ /dev/null
@@ -1,346 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// HostStorageDeviceInfo is the default template for the HostSystem config.storageDevice property.
-// Capture method:
-//   govc object.collect -s -dump HostSystem:ha-host config.storageDevice
-var HostStorageDeviceInfo = types.HostStorageDeviceInfo{
-	HostBusAdapter: []types.BaseHostHostBusAdapter{
-		&types.HostParallelScsiHba{
-			HostHostBusAdapter: types.HostHostBusAdapter{
-				Key:    "key-vim.host.ParallelScsiHba-vmhba0",
-				Device: "vmhba0",
-				Bus:    3,
-				Status: "unknown",
-				Model:  "PVSCSI SCSI Controller",
-				Driver: "pvscsi",
-				Pci:    "0000:03:00.0",
-			},
-		},
-		&types.HostBlockHba{
-			HostHostBusAdapter: types.HostHostBusAdapter{
-				Key:    "key-vim.host.BlockHba-vmhba1",
-				Device: "vmhba1",
-				Bus:    0,
-				Status: "unknown",
-				Model:  "PIIX4 for 430TX/440BX/MX IDE Controller",
-				Driver: "vmkata",
-				Pci:    "0000:00:07.1",
-			},
-		},
-		&types.HostBlockHba{
-			HostHostBusAdapter: types.HostHostBusAdapter{
-				Key:    "key-vim.host.BlockHba-vmhba64",
-				Device: "vmhba64",
-				Bus:    0,
-				Status: "unknown",
-				Model:  "PIIX4 for 430TX/440BX/MX IDE Controller",
-				Driver: "vmkata",
-				Pci:    "0000:00:07.1",
-			},
-		},
-	},
-	ScsiLun: []types.BaseScsiLun{
-		&types.ScsiLun{
-			HostDevice: types.HostDevice{
-				DeviceName: "/vmfs/devices/cdrom/mpx.vmhba1:C0:T0:L0",
-				DeviceType: "cdrom",
-			},
-			Key:  "key-vim.host.ScsiLun-0005000000766d686261313a303a30",
-			Uuid: "0005000000766d686261313a303a30",
-			Descriptor: []types.ScsiLunDescriptor{
-				{
-					Quality: "lowQuality",
-					Id:      "mpx.vmhba1:C0:T0:L0",
-				},
-				{
-					Quality: "lowQuality",
-					Id:      "vml.0005000000766d686261313a303a30",
-				},
-				{
-					Quality: "lowQuality",
-					Id:      "0005000000766d686261313a303a30",
-				},
-			},
-			CanonicalName: "mpx.vmhba1:C0:T0:L0",
-			DisplayName:   "Local NECVMWar CD-ROM (mpx.vmhba1:C0:T0:L0)",
-			LunType:       "cdrom",
-			Vendor:        "NECVMWar",
-			Model:         "VMware IDE CDR00",
-			Revision:      "1.00",
-			ScsiLevel:     5,
-			SerialNumber:  "unavailable",
-			DurableName:   (*types.ScsiLunDurableName)(nil),
-			AlternateName: []types.ScsiLunDurableName{
-				{
-					Namespace:   "GENERIC_VPD",
-					NamespaceId: 0x5,
-					Data:        []uint8{0x2d, 0x37, 0x39},
-				},
-				{
-					Namespace:   "GENERIC_VPD",
-					NamespaceId: 0x5,
-					Data:        []uint8{0x30},
-				},
-			},
-			StandardInquiry:  []uint8{0x30},
-			QueueDepth:       0,
-			OperationalState: []string{"ok"},
-			Capabilities:     &types.ScsiLunCapabilities{},
-			VStorageSupport:  "vStorageUnsupported",
-			ProtocolEndpoint: types.NewBool(false),
-		},
-		&types.HostScsiDisk{
-			ScsiLun: types.ScsiLun{
-				HostDevice: types.HostDevice{
-					DeviceName: "/vmfs/devices/disks/mpx.vmhba0:C0:T0:L0",
-					DeviceType: "disk",
-				},
-				Key:  "key-vim.host.ScsiDisk-0000000000766d686261303a303a30",
-				Uuid: "0000000000766d686261303a303a30",
-				Descriptor: []types.ScsiLunDescriptor{
-					{
-						Quality: "lowQuality",
-						Id:      "mpx.vmhba0:C0:T0:L0",
-					},
-					{
-						Quality: "lowQuality",
-						Id:      "vml.0000000000766d686261303a303a30",
-					},
-					{
-						Quality: "lowQuality",
-						Id:      "0000000000766d686261303a303a30",
-					},
-				},
-				CanonicalName: "mpx.vmhba0:C0:T0:L0",
-				DisplayName:   "Local VMware, Disk (mpx.vmhba0:C0:T0:L0)",
-				LunType:       "disk",
-				Vendor:        "VMware, ",
-				Model:         "VMware Virtual S",
-				Revision:      "1.0 ",
-				ScsiLevel:     2,
-				SerialNumber:  "unavailable",
-				DurableName:   (*types.ScsiLunDurableName)(nil),
-				AlternateName: []types.ScsiLunDurableName{
-					{
-						Namespace:   "GENERIC_VPD",
-						NamespaceId: 0x5,
-						Data:        []uint8{0x2d, 0x37, 0x39},
-					},
-					{
-						Namespace:   "GENERIC_VPD",
-						NamespaceId: 0x5,
-						Data:        []uint8{0x30},
-					},
-				},
-				StandardInquiry:  []uint8{0x30},
-				QueueDepth:       1024,
-				OperationalState: []string{"ok"},
-				Capabilities:     &types.ScsiLunCapabilities{},
-				VStorageSupport:  "vStorageUnsupported",
-				ProtocolEndpoint: types.NewBool(false),
-			},
-			Capacity: types.HostDiskDimensionsLba{
-				BlockSize: 512,
-				Block:     67108864,
-			},
-			DevicePath:            "/vmfs/devices/disks/mpx.vmhba0:C0:T0:L0",
-			Ssd:                   types.NewBool(true),
-			LocalDisk:             types.NewBool(true),
-			PhysicalLocation:      nil,
-			EmulatedDIXDIFEnabled: types.NewBool(false),
-			VsanDiskInfo:          (*types.VsanHostVsanDiskInfo)(nil),
-			ScsiDiskType:          "native512",
-		},
-	},
-	ScsiTopology: &types.HostScsiTopology{
-		Adapter: []types.HostScsiTopologyInterface{
-			{
-				Key:     "key-vim.host.ScsiTopology.Interface-vmhba0",
-				Adapter: "key-vim.host.ParallelScsiHba-vmhba0",
-				Target: []types.HostScsiTopologyTarget{
-					{
-						Key:    "key-vim.host.ScsiTopology.Target-vmhba0:0:0",
-						Target: 0,
-						Lun: []types.HostScsiTopologyLun{
-							{
-								Key:     "key-vim.host.ScsiTopology.Lun-0000000000766d686261303a303a30",
-								Lun:     0,
-								ScsiLun: "key-vim.host.ScsiDisk-0000000000766d686261303a303a30",
-							},
-						},
-						Transport: &types.HostParallelScsiTargetTransport{},
-					},
-				},
-			},
-			{
-				Key:     "key-vim.host.ScsiTopology.Interface-vmhba1",
-				Adapter: "key-vim.host.BlockHba-vmhba1",
-				Target: []types.HostScsiTopologyTarget{
-					{
-						Key:    "key-vim.host.ScsiTopology.Target-vmhba1:0:0",
-						Target: 0,
-						Lun: []types.HostScsiTopologyLun{
-							{
-								Key:     "key-vim.host.ScsiTopology.Lun-0005000000766d686261313a303a30",
-								Lun:     0,
-								ScsiLun: "key-vim.host.ScsiLun-0005000000766d686261313a303a30",
-							},
-						},
-						Transport: &types.HostBlockAdapterTargetTransport{},
-					},
-				},
-			},
-			{
-				Key:     "key-vim.host.ScsiTopology.Interface-vmhba64",
-				Adapter: "key-vim.host.BlockHba-vmhba64",
-				Target:  nil,
-			},
-		},
-	},
-	MultipathInfo: &types.HostMultipathInfo{
-		Lun: []types.HostMultipathInfoLogicalUnit{
-			{
-				Key: "key-vim.host.MultipathInfo.LogicalUnit-0005000000766d686261313a303a30",
-				Id:  "0005000000766d686261313a303a30",
-				Lun: "key-vim.host.ScsiLun-0005000000766d686261313a303a30",
-				Path: []types.HostMultipathInfoPath{
-					{
-						Key:           "key-vim.host.MultipathInfo.Path-vmhba1:C0:T0:L0",
-						Name:          "vmhba1:C0:T0:L0",
-						PathState:     "active",
-						State:         "active",
-						IsWorkingPath: types.NewBool(true),
-						Adapter:       "key-vim.host.BlockHba-vmhba1",
-						Lun:           "key-vim.host.MultipathInfo.LogicalUnit-0005000000766d686261313a303a30",
-						Transport:     &types.HostBlockAdapterTargetTransport{},
-					},
-				},
-				Policy: &types.HostMultipathInfoFixedLogicalUnitPolicy{
-					HostMultipathInfoLogicalUnitPolicy: types.HostMultipathInfoLogicalUnitPolicy{
-						Policy: "VMW_PSP_FIXED",
-					},
-					Prefer: "vmhba1:C0:T0:L0",
-				},
-				StorageArrayTypePolicy: &types.HostMultipathInfoLogicalUnitStorageArrayTypePolicy{
-					Policy: "VMW_SATP_LOCAL",
-				},
-			},
-			{
-				Key: "key-vim.host.MultipathInfo.LogicalUnit-0000000000766d686261303a303a30",
-				Id:  "0000000000766d686261303a303a30",
-				Lun: "key-vim.host.ScsiDisk-0000000000766d686261303a303a30",
-				Path: []types.HostMultipathInfoPath{
-					{
-						Key:           "key-vim.host.MultipathInfo.Path-vmhba0:C0:T0:L0",
-						Name:          "vmhba0:C0:T0:L0",
-						PathState:     "active",
-						State:         "active",
-						IsWorkingPath: types.NewBool(true),
-						Adapter:       "key-vim.host.ParallelScsiHba-vmhba0",
-						Lun:           "key-vim.host.MultipathInfo.LogicalUnit-0000000000766d686261303a303a30",
-						Transport:     &types.HostParallelScsiTargetTransport{},
-					},
-				},
-				Policy: &types.HostMultipathInfoFixedLogicalUnitPolicy{
-					HostMultipathInfoLogicalUnitPolicy: types.HostMultipathInfoLogicalUnitPolicy{
-						Policy: "VMW_PSP_FIXED",
-					},
-					Prefer: "vmhba0:C0:T0:L0",
-				},
-				StorageArrayTypePolicy: &types.HostMultipathInfoLogicalUnitStorageArrayTypePolicy{
-					Policy: "VMW_SATP_LOCAL",
-				},
-			},
-		},
-	},
-	PlugStoreTopology: &types.HostPlugStoreTopology{
-		Adapter: []types.HostPlugStoreTopologyAdapter{
-			{
-				Key:     "key-vim.host.PlugStoreTopology.Adapter-vmhba0",
-				Adapter: "key-vim.host.ParallelScsiHba-vmhba0",
-				Path:    []string{"key-vim.host.PlugStoreTopology.Path-vmhba0:C0:T0:L0"},
-			},
-			{
-				Key:     "key-vim.host.PlugStoreTopology.Adapter-vmhba1",
-				Adapter: "key-vim.host.BlockHba-vmhba1",
-				Path:    []string{"key-vim.host.PlugStoreTopology.Path-vmhba1:C0:T0:L0"},
-			},
-			{
-				Key:     "key-vim.host.PlugStoreTopology.Adapter-vmhba64",
-				Adapter: "key-vim.host.BlockHba-vmhba64",
-				Path:    nil,
-			},
-		},
-		Path: []types.HostPlugStoreTopologyPath{
-			{
-				Key:           "key-vim.host.PlugStoreTopology.Path-vmhba0:C0:T0:L0",
-				Name:          "vmhba0:C0:T0:L0",
-				ChannelNumber: 0,
-				TargetNumber:  0,
-				LunNumber:     0,
-				Adapter:       "key-vim.host.PlugStoreTopology.Adapter-vmhba0",
-				Target:        "key-vim.host.PlugStoreTopology.Target-pscsi.0:0",
-				Device:        "key-vim.host.PlugStoreTopology.Device-0000000000766d686261303a303a30",
-			},
-			{
-				Key:           "key-vim.host.PlugStoreTopology.Path-vmhba1:C0:T0:L0",
-				Name:          "vmhba1:C0:T0:L0",
-				ChannelNumber: 0,
-				TargetNumber:  0,
-				LunNumber:     0,
-				Adapter:       "key-vim.host.PlugStoreTopology.Adapter-vmhba1",
-				Target:        "key-vim.host.PlugStoreTopology.Target-ide.0:0",
-				Device:        "key-vim.host.PlugStoreTopology.Device-0005000000766d686261313a303a30",
-			},
-		},
-		Target: []types.HostPlugStoreTopologyTarget{
-			{
-				Key:       "key-vim.host.PlugStoreTopology.Target-pscsi.0:0",
-				Transport: &types.HostParallelScsiTargetTransport{},
-			},
-			{
-				Key:       "key-vim.host.PlugStoreTopology.Target-ide.0:0",
-				Transport: &types.HostBlockAdapterTargetTransport{},
-			},
-		},
-		Device: []types.HostPlugStoreTopologyDevice{
-			{
-				Key:  "key-vim.host.PlugStoreTopology.Device-0005000000766d686261313a303a30",
-				Lun:  "key-vim.host.ScsiLun-0005000000766d686261313a303a30",
-				Path: []string{"key-vim.host.PlugStoreTopology.Path-vmhba1:C0:T0:L0"},
-			},
-			{
-				Key:  "key-vim.host.PlugStoreTopology.Device-0000000000766d686261303a303a30",
-				Lun:  "key-vim.host.ScsiDisk-0000000000766d686261303a303a30",
-				Path: []string{"key-vim.host.PlugStoreTopology.Path-vmhba0:C0:T0:L0"},
-			},
-		},
-		Plugin: []types.HostPlugStoreTopologyPlugin{
-			{
-				Key:         "key-vim.host.PlugStoreTopology.Plugin-NMP",
-				Name:        "NMP",
-				Device:      []string{"key-vim.host.PlugStoreTopology.Device-0005000000766d686261313a303a30", "key-vim.host.PlugStoreTopology.Device-0000000000766d686261303a303a30"},
-				ClaimedPath: []string{"key-vim.host.PlugStoreTopology.Path-vmhba0:C0:T0:L0", "key-vim.host.PlugStoreTopology.Path-vmhba1:C0:T0:L0"},
-			},
-		},
-	},
-	SoftwareInternetScsiEnabled: false,
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go
deleted file mode 100644
index 13aa8b17a3..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/host_system.go
+++ /dev/null
@@ -1,1791 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import (
-	"time"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// HostSystem is the default template for HostSystem properties.
-// Capture method:
-//   govc host.info -dump
-var HostSystem = mo.HostSystem{
-	ManagedEntity: mo.ManagedEntity{
-		ExtensibleManagedObject: mo.ExtensibleManagedObject{
-			Self:           types.ManagedObjectReference{Type: "HostSystem", Value: "ha-host"},
-			Value:          nil,
-			AvailableField: nil,
-		},
-		Parent:              &types.ManagedObjectReference{Type: "ComputeResource", Value: "ha-compute-res"},
-		CustomValue:         nil,
-		OverallStatus:       "",
-		ConfigStatus:        "",
-		ConfigIssue:         nil,
-		EffectiveRole:       nil,
-		Permission:          nil,
-		Name:                "",
-		DisabledMethod:      nil,
-		RecentTask:          nil,
-		DeclaredAlarmState:  nil,
-		TriggeredAlarmState: nil,
-		AlarmActionsEnabled: (*bool)(nil),
-		Tag:                 nil,
-	},
-	Runtime: types.HostRuntimeInfo{
-		DynamicData:       types.DynamicData{},
-		ConnectionState:   "connected",
-		PowerState:        "poweredOn",
-		StandbyMode:       "",
-		InMaintenanceMode: false,
-		BootTime:          (*time.Time)(nil),
-		HealthSystemRuntime: &types.HealthSystemRuntime{
-			DynamicData: types.DynamicData{},
-			SystemHealthInfo: &types.HostSystemHealthInfo{
-				DynamicData: types.DynamicData{},
-				NumericSensorInfo: []types.HostNumericSensorInfo{
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware Rollup Health State",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "system",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #0 Level-1 Cache is 16384 B",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Processors",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #0 Level-2 Cache is 0 B",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Processors",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #1 Level-1 Cache is 16384 B",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Processors",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #1 Level-2 Cache is 0 B",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Processors",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "Phoenix Technologies LTD System BIOS 6.00 2014-05-20 00:00:00.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware, Inc. VMware ESXi 6.0.0 build-3634798 2016-03-07 00:00:00.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-ata-piix 2.12-10vmw.600.2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-lsi-mptsas-plugin 1.0.0-1vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-mlx4-core 1.9.7.0-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-lsi-mpt2sas-plugin 1.0.0-4vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-aacraid 1.1.5.1-9vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-via 0.3.3-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-qla4xxx 5.01.03.2-7vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-sata-promise 2.12-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-megaraid-mbox 2.20.5.1-6vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware vsan 6.0.0-2.34.3563498 2016-02-17 17:18:19.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-e1000 8.0.3.1-5vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-serverworks 0.4.3-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-mptspi 4.23.01.00-9vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-nx-nic 5.0.621-5vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware block-cciss 3.6.14-10vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-bnx2x 1.78.80.v60.12-1vmw.600.2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ipmi-ipmi-devintf 39.1-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-mptsas 4.23.01.00-9vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-megaraid2 2.00.4-9vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware nvme 1.0e.0.35-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware esx-xserver 6.0.0-2.34.3634798 2016-03-08 07:39:27.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware nmlx4-en 3.0.0.0-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-hp-hpsa-plugin 1.0.0-1vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-megaraid-sas 6.603.55.00-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-enic 2.1.2.38-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsi-msgpt3 06.255.12.00-8vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-ahci 3.0-22vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-forcedeth 0.61-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-atiixp 0.4.6-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware elxnet 10.2.309.6v-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware esx-dvfilter-generic-fastpath 6.0.0-2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware uhci-usb-uhci 1.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-amd 0.3.10-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-sata-sil24 1.1-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ohci-usb-ohci 1.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-igb 5.0.5.1.1-5vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-pdc2027x 1.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ehci-ehci-hcd 1.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-lsi-lsi-mr3-plugin 1.0.0-2vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-ixgbe 3.7.13.7.14iov-20vmw.600.2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware vsanhealth 6.0.0-3000000.3.0.2.34.3544323 2016-02-12 06:45:30.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-cnic 1.78.76.v60.13-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-sata-svw 2.3-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ipmi-ipmi-msghandler 39.1-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware emulex-esx-elxnetcli 10.2.309.6v-2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-aic79xx 3.1-5vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware qlnativefc 2.0.12.0-5vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-lsi-lsi-msgpt3-plugin 1.0.0-1vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ima-qla4xxx 2.02.18-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-mlx4-en 1.9.7.0-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-e1000e 3.2.2.1-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-tg3 3.131d.v60.4-2vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-hpsa 6.0.0.44-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-bnx2fc 1.78.78.v60.8-1vmw.600.2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware cpu-microcode 6.0.0-2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-fnic 1.5.0.45-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware nmlx4-rdma 3.0.0.0-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-vmxnet3 1.1.3.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lpfc 10.2.309.8-2vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware esx-ui 1.0.0-3617585 2016-03-03 04:52:43.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-cmd64x 0.2.5-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsi-mr3 6.605.08.00-7vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-hpt3x2n 0.3.4-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-sata-nv 3.5-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware misc-cnic-register 1.78.75.v60.7-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware lsu-lsi-megaraid-sas-plugin 1.0.0-2vmw.600.2.34.3634798 2016-03-08 07:39:28.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ata-pata-sil680 0.4.8-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware esx-tboot 6.0.0-2.34.3634798 2016-03-08 07:39:27.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware xhci-xhci 1.0-3vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-ips 7.12.05-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-adp94xx 1.0.8.12-6vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware rste 2.0.2.0088-4vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware ipmi-ipmi-si-drv 39.1-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMWARE mtip32xx-native 3.8.5-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-mpt2sas 19.00.00.00-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware misc-drivers 6.0.0-2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware nmlx4-core 3.0.0.0-1vmw.600.2.34.3634798 2016-03-08 07:38:46.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware sata-sata-sil 2.3-4vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware esx-base 6.0.0-2.34.3634798 2016-03-08 07:39:18.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware scsi-bnx2i 2.78.76.v60.8-1vmw.600.2.34.3634798 2016-03-08 07:38:41.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "VMware net-bnx2 2.2.4f.v60.10-1vmw.600.2.34.3634798 2016-03-08 07:38:45.000",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "e1000 driver 8.0.3.1-NAPI",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Name:        "e1000 device firmware N/A",
-						HealthState: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Sensor is operating under normal conditions",
-							},
-							Key: "green",
-						},
-						CurrentReading: 0,
-						UnitModifier:   0,
-						BaseUnits:      "",
-						RateUnits:      "",
-						SensorType:     "Software Components",
-					},
-				},
-			},
-			HardwareStatusInfo: &types.HostHardwareStatusInfo{
-				DynamicData:      types.DynamicData{},
-				MemoryStatusInfo: nil,
-				CpuStatusInfo: []types.BaseHostHardwareElementInfo{
-					&types.HostHardwareElementInfo{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #0",
-						Status: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Physical element is functioning as expected",
-							},
-							Key: "Green",
-						},
-					},
-					&types.HostHardwareElementInfo{
-						DynamicData: types.DynamicData{},
-						Name:        "CPU socket #1",
-						Status: &types.ElementDescription{
-							Description: types.Description{
-								DynamicData: types.DynamicData{},
-								Label:       "Green",
-								Summary:     "Physical element is functioning as expected",
-							},
-							Key: "Green",
-						},
-					},
-				},
-				StorageStatusInfo: nil,
-			},
-		},
-		DasHostState:    (*types.ClusterDasFdmHostState)(nil),
-		TpmPcrValues:    nil,
-		VsanRuntimeInfo: &types.VsanHostRuntimeInfo{},
-		NetworkRuntimeInfo: &types.HostRuntimeInfoNetworkRuntimeInfo{
-			DynamicData: types.DynamicData{},
-			NetStackInstanceRuntimeInfo: []types.HostRuntimeInfoNetStackInstanceRuntimeInfo{
-				{
-					DynamicData:            types.DynamicData{},
-					NetStackInstanceKey:    "defaultTcpipStack",
-					State:                  "active",
-					VmknicKeys:             []string{"vmk0"},
-					MaxNumberOfConnections: 11000,
-					CurrentIpV6Enabled:     types.NewBool(true),
-				},
-			},
-			NetworkResourceRuntime: (*types.HostNetworkResourceRuntime)(nil),
-		},
-		VFlashResourceRuntimeInfo:  (*types.HostVFlashManagerVFlashResourceRunTimeInfo)(nil),
-		HostMaxVirtualDiskCapacity: 68169720922112,
-	},
-	Summary: types.HostListSummary{
-		DynamicData: types.DynamicData{},
-		Host:        &types.ManagedObjectReference{Type: "HostSystem", Value: "ha-host"},
-		Hardware: &types.HostHardwareSummary{
-			DynamicData: types.DynamicData{},
-			Vendor:      "VMware, Inc.",
-			Model:       "VMware Virtual Platform",
-			Uuid:        "564d2f12-8041-639b-5018-05a835b72eaf",
-			OtherIdentifyingInfo: []types.HostSystemIdentificationInfo{
-				{
-					DynamicData:     types.DynamicData{},
-					IdentifierValue: " No Asset Tag",
-					IdentifierType: &types.ElementDescription{
-						Description: types.Description{
-							DynamicData: types.DynamicData{},
-							Label:       "Asset Tag",
-							Summary:     "Asset tag of the system",
-						},
-						Key: "AssetTag",
-					},
-				},
-				{
-					DynamicData:     types.DynamicData{},
-					IdentifierValue: "[MS_VM_CERT/SHA1/27d66596a61c48dd3dc7216fd715126e33f59ae7]",
-					IdentifierType: &types.ElementDescription{
-						Description: types.Description{
-							DynamicData: types.DynamicData{},
-							Label:       "OEM specific string",
-							Summary:     "OEM specific string",
-						},
-						Key: "OemSpecificString",
-					},
-				},
-				{
-					DynamicData:     types.DynamicData{},
-					IdentifierValue: "Welcome to the Virtual Machine",
-					IdentifierType: &types.ElementDescription{
-						Description: types.Description{
-							DynamicData: types.DynamicData{},
-							Label:       "OEM specific string",
-							Summary:     "OEM specific string",
-						},
-						Key: "OemSpecificString",
-					},
-				},
-				{
-					DynamicData:     types.DynamicData{},
-					IdentifierValue: "VMware-56 4d 2f 12 80 41 63 9b-50 18 05 a8 35 b7 2e af",
-					IdentifierType: &types.ElementDescription{
-						Description: types.Description{
-							DynamicData: types.DynamicData{},
-							Label:       "Service tag",
-							Summary:     "Service tag of the system",
-						},
-						Key: "ServiceTag",
-					},
-				},
-			},
-			MemorySize:    4294430720,
-			CpuModel:      "Intel(R) Core(TM) i7-3615QM CPU @ 2.30GHz",
-			CpuMhz:        2294,
-			NumCpuPkgs:    2,
-			NumCpuCores:   2,
-			NumCpuThreads: 2,
-			NumNics:       1,
-			NumHBAs:       3,
-		},
-		Runtime: (*types.HostRuntimeInfo)(nil),
-		Config: types.HostConfigSummary{
-			DynamicData:           types.DynamicData{},
-			Name:                  "localhost.localdomain",
-			Port:                  902,
-			SslThumbprint:         "",
-			Product:               &HostConfigInfo.Product,
-			VmotionEnabled:        false,
-			FaultToleranceEnabled: types.NewBool(true),
-			FeatureVersion:        nil,
-			AgentVmDatastore:      (*types.ManagedObjectReference)(nil),
-			AgentVmNetwork:        (*types.ManagedObjectReference)(nil),
-		},
-		QuickStats: types.HostListSummaryQuickStats{
-			DynamicData:               types.DynamicData{},
-			OverallCpuUsage:           67,
-			OverallMemoryUsage:        1404,
-			DistributedCpuFairness:    0,
-			DistributedMemoryFairness: 0,
-			Uptime: 77229,
-		},
-		OverallStatus:      "gray",
-		RebootRequired:     false,
-		CustomValue:        nil,
-		ManagementServerIp: "",
-		MaxEVCModeKey:      "",
-		CurrentEVCModeKey:  "",
-		Gateway:            (*types.HostListSummaryGatewaySummary)(nil),
-	},
-	Hardware:           (*types.HostHardwareInfo)(nil),
-	Capability:         (*types.HostCapability)(nil),
-	LicensableResource: types.HostLicensableResourceInfo{},
-	ConfigManager: types.HostConfigManager{
-		DynamicData:               types.DynamicData{},
-		CpuScheduler:              &types.ManagedObjectReference{Type: "HostCpuSchedulerSystem", Value: "cpuSchedulerSystem"},
-		DatastoreSystem:           &types.ManagedObjectReference{Type: "HostDatastoreSystem", Value: "ha-datastoresystem"},
-		MemoryManager:             &types.ManagedObjectReference{Type: "HostMemorySystem", Value: "memoryManagerSystem"},
-		StorageSystem:             &types.ManagedObjectReference{Type: "HostStorageSystem", Value: "storageSystem"},
-		NetworkSystem:             &types.ManagedObjectReference{Type: "HostNetworkSystem", Value: "networkSystem"},
-		VmotionSystem:             &types.ManagedObjectReference{Type: "HostVMotionSystem", Value: "ha-vmotion-system"},
-		VirtualNicManager:         &types.ManagedObjectReference{Type: "HostVirtualNicManager", Value: "ha-vnic-mgr"},
-		ServiceSystem:             &types.ManagedObjectReference{Type: "HostServiceSystem", Value: "serviceSystem"},
-		FirewallSystem:            &types.ManagedObjectReference{Type: "HostFirewallSystem", Value: "firewallSystem"},
-		AdvancedOption:            &types.ManagedObjectReference{Type: "OptionManager", Value: "ha-adv-options"},
-		DiagnosticSystem:          &types.ManagedObjectReference{Type: "HostDiagnosticSystem", Value: "diagnosticsystem"},
-		AutoStartManager:          &types.ManagedObjectReference{Type: "HostAutoStartManager", Value: "ha-autostart-mgr"},
-		SnmpSystem:                &types.ManagedObjectReference{Type: "HostSnmpSystem", Value: "ha-snmp-agent"},
-		DateTimeSystem:            &types.ManagedObjectReference{Type: "HostDateTimeSystem", Value: "dateTimeSystem"},
-		PatchManager:              &types.ManagedObjectReference{Type: "HostPatchManager", Value: "ha-host-patch-manager"},
-		ImageConfigManager:        &types.ManagedObjectReference{Type: "HostImageConfigManager", Value: "ha-image-config-manager"},
-		BootDeviceSystem:          (*types.ManagedObjectReference)(nil),
-		FirmwareSystem:            &types.ManagedObjectReference{Type: "HostFirmwareSystem", Value: "ha-firmwareSystem"},
-		HealthStatusSystem:        &types.ManagedObjectReference{Type: "HostHealthStatusSystem", Value: "healthStatusSystem"},
-		PciPassthruSystem:         &types.ManagedObjectReference{Type: "HostPciPassthruSystem", Value: "ha-pcipassthrusystem"},
-		LicenseManager:            &types.ManagedObjectReference{Type: "LicenseManager", Value: "ha-license-manager"},
-		KernelModuleSystem:        &types.ManagedObjectReference{Type: "HostKernelModuleSystem", Value: "kernelModuleSystem"},
-		AuthenticationManager:     &types.ManagedObjectReference{Type: "HostAuthenticationManager", Value: "ha-auth-manager"},
-		PowerSystem:               &types.ManagedObjectReference{Type: "HostPowerSystem", Value: "ha-power-system"},
-		CacheConfigurationManager: &types.ManagedObjectReference{Type: "HostCacheConfigurationManager", Value: "ha-cache-configuration-manager"},
-		EsxAgentHostManager:       (*types.ManagedObjectReference)(nil),
-		IscsiManager:              &types.ManagedObjectReference{Type: "IscsiManager", Value: "iscsiManager"},
-		VFlashManager:             &types.ManagedObjectReference{Type: "HostVFlashManager", Value: "ha-vflash-manager"},
-		VsanSystem:                &types.ManagedObjectReference{Type: "HostVsanSystem", Value: "vsanSystem"},
-		MessageBusProxy:           &types.ManagedObjectReference{Type: "MessageBusProxy", Value: "messageBusProxy"},
-		UserDirectory:             &types.ManagedObjectReference{Type: "UserDirectory", Value: "ha-user-directory"},
-		AccountManager:            &types.ManagedObjectReference{Type: "HostLocalAccountManager", Value: "ha-localacctmgr"},
-		HostAccessManager:         &types.ManagedObjectReference{Type: "HostAccessManager", Value: "ha-host-access-manager"},
-		GraphicsManager:           &types.ManagedObjectReference{Type: "HostGraphicsManager", Value: "ha-graphics-manager"},
-		VsanInternalSystem:        &types.ManagedObjectReference{Type: "HostVsanInternalSystem", Value: "ha-vsan-internal-system"},
-		CertificateManager:        &types.ManagedObjectReference{Type: "HostCertificateManager", Value: "ha-certificate-manager"},
-	},
-	Config:           &HostConfigInfo,
-	Vm:               nil,
-	Datastore:        nil,
-	Network:          nil,
-	DatastoreBrowser: types.ManagedObjectReference{Type: "HostDatastoreBrowser", Value: "ha-host-datastorebrowser"},
-	SystemResources:  (*types.HostSystemResourceInfo)(nil),
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go
deleted file mode 100644
index 584e3cad37..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/performance_manager.go
+++ /dev/null
@@ -1,9885 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// PerfCounter is the default template for the PerformanceManager perfCounter property.
-// Capture method:
-//   govc object.collect -s -dump PerformanceManager:ha-perfmgr perfCounter
-var PerfCounter = []types.PerfCounterInfo{
-	{
-		Key: 0,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "CPU usage as a percentage during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{1, 2, 3},
-	},
-	{
-		Key: 1,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "CPU usage as a percentage during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 2,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "CPU usage as a percentage during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 3,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "CPU usage as a percentage during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 4,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage in MHz",
-				Summary: "CPU usage in megahertz during the interval",
-			},
-			Key: "usagemhz",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{5, 6, 7},
-	},
-	{
-		Key: 5,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage in MHz",
-				Summary: "CPU usage in megahertz during the interval",
-			},
-			Key: "usagemhz",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 6,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage in MHz",
-				Summary: "CPU usage in megahertz during the interval",
-			},
-			Key: "usagemhz",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 7,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage in MHz",
-				Summary: "CPU usage in megahertz during the interval",
-			},
-			Key: "usagemhz",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 8,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reserved capacity",
-				Summary: "Total CPU capacity reserved by virtual machines",
-			},
-			Key: "reservedCapacity",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 9,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "Amount of time spent on system processes on each virtual CPU in the virtual machine",
-			},
-			Key: "system",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 10,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Wait",
-				Summary: "Total CPU time spent in wait state",
-			},
-			Key: "wait",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 11,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Ready",
-				Summary: "Time that the virtual machine was ready, but could not get scheduled to run on the physical CPU during last measurement interval",
-			},
-			Key: "ready",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 12,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Used",
-				Summary: "Total CPU usage",
-			},
-			Key: "used",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 13,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Idle",
-				Summary: "Total time that the CPU spent in an idle state",
-			},
-			Key: "idle",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 14,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap wait",
-				Summary: "CPU time spent waiting for swap-in",
-			},
-			Key: "swapwait",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 15,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "CPU utilization as a percentage during the interval (CPU usage and CPU utilization might be different due to power management technologies or hyper-threading)",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{16, 17, 18},
-	},
-	{
-		Key: 16,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "CPU utilization as a percentage during the interval (CPU usage and CPU utilization might be different due to power management technologies or hyper-threading)",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 17,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "CPU utilization as a percentage during the interval (CPU usage and CPU utilization might be different due to power management technologies or hyper-threading)",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 18,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "CPU utilization as a percentage during the interval (CPU usage and CPU utilization might be different due to power management technologies or hyper-threading)",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 19,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Core Utilization",
-				Summary: "CPU utilization of the corresponding core (if hyper-threading is enabled) as a percentage during the interval (A core is utilized if either or both of its logical CPUs are utilized)",
-			},
-			Key: "coreUtilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{20, 21, 22},
-	},
-	{
-		Key: 20,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Core Utilization",
-				Summary: "CPU utilization of the corresponding core (if hyper-threading is enabled) as a percentage during the interval (A core is utilized if either or both of its logical CPUs are utilized)",
-			},
-			Key: "coreUtilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 21,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Core Utilization",
-				Summary: "CPU utilization of the corresponding core (if hyper-threading is enabled) as a percentage during the interval (A core is utilized if either or both of its logical CPUs are utilized)",
-			},
-			Key: "coreUtilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 22,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Core Utilization",
-				Summary: "CPU utilization of the corresponding core (if hyper-threading is enabled) as a percentage during the interval (A core is utilized if either or both of its logical CPUs are utilized)",
-			},
-			Key: "coreUtilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 23,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Total capacity",
-				Summary: "Total CPU capacity reserved by and available for virtual machines",
-			},
-			Key: "totalCapacity",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 24,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Latency",
-				Summary: "Percent of time the virtual machine is unable to run because it is contending for access to the physical CPU(s)",
-			},
-			Key: "latency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 25,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Entitlement",
-				Summary: "CPU resources devoted by the ESX scheduler",
-			},
-			Key: "entitlement",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 26,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Demand",
-				Summary: "The amount of CPU resources a virtual machine would use if there were no CPU contention or CPU limit",
-			},
-			Key: "demand",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 27,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Co-stop",
-				Summary: "Time the virtual machine is ready to run, but is unable to run due to co-scheduling constraints",
-			},
-			Key: "costop",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 28,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Max limited",
-				Summary: "Time the virtual machine is ready to run, but is not run due to maxing out its CPU limit setting",
-			},
-			Key: "maxlimited",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 29,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overlap",
-				Summary: "Time the virtual machine was interrupted to perform system services on behalf of itself or other virtual machines",
-			},
-			Key: "overlap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 30,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Run",
-				Summary: "Time the virtual machine is scheduled to run",
-			},
-			Key: "run",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 31,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Demand-to-entitlement ratio",
-				Summary: "CPU resource entitlement to CPU demand ratio (in percents)",
-			},
-			Key: "demandEntitlementRatio",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 32,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Readiness",
-				Summary: "Percentage of time that the virtual machine was ready, but could not get scheduled to run on the physical CPU",
-			},
-			Key: "readiness",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU",
-				Summary: "CPU",
-			},
-			Key: "cpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65536,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host consumed %",
-				Summary: "Percentage of host physical memory that has been consumed",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65537, 65538, 65539},
-	},
-	{
-		Key: 65537,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host consumed %",
-				Summary: "Percentage of host physical memory that has been consumed",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65538,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host consumed %",
-				Summary: "Percentage of host physical memory that has been consumed",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65539,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host consumed %",
-				Summary: "Percentage of host physical memory that has been consumed",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65540,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Granted",
-				Summary: "Amount of host physical memory or physical memory that is mapped for a virtual machine or a host",
-			},
-			Key: "granted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65541, 65542, 65543},
-	},
-	{
-		Key: 65541,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Granted",
-				Summary: "Amount of host physical memory or physical memory that is mapped for a virtual machine or a host",
-			},
-			Key: "granted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65542,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Granted",
-				Summary: "Amount of host physical memory or physical memory that is mapped for a virtual machine or a host",
-			},
-			Key: "granted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65543,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Granted",
-				Summary: "Amount of host physical memory or physical memory that is mapped for a virtual machine or a host",
-			},
-			Key: "granted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65544,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active",
-				Summary: "Amount of guest physical memory that is being actively read or written by guest. Activeness is estimated by ESXi",
-			},
-			Key: "active",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65545, 65546, 65547},
-	},
-	{
-		Key: 65545,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active",
-				Summary: "Amount of guest physical memory that is being actively read or written by guest. Activeness is estimated by ESXi",
-			},
-			Key: "active",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65546,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active",
-				Summary: "Amount of guest physical memory that is being actively read or written by guest. Activeness is estimated by ESXi",
-			},
-			Key: "active",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65547,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active",
-				Summary: "Amount of guest physical memory that is being actively read or written by guest. Activeness is estimated by ESXi",
-			},
-			Key: "active",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65548,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared",
-				Summary: "Amount of guest physical memory that is shared within a single virtual machine or across virtual machines",
-			},
-			Key: "shared",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65549, 65550, 65551},
-	},
-	{
-		Key: 65549,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared",
-				Summary: "Amount of guest physical memory that is shared within a single virtual machine or across virtual machines",
-			},
-			Key: "shared",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65550,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared",
-				Summary: "Amount of guest physical memory that is shared within a single virtual machine or across virtual machines",
-			},
-			Key: "shared",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65551,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared",
-				Summary: "Amount of guest physical memory that is shared within a single virtual machine or across virtual machines",
-			},
-			Key: "shared",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65552,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Zero pages",
-				Summary: "Guest physical memory pages whose content is 0x00",
-			},
-			Key: "zero",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65553, 65554, 65555},
-	},
-	{
-		Key: 65553,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Zero pages",
-				Summary: "Guest physical memory pages whose content is 0x00",
-			},
-			Key: "zero",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65554,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Zero pages",
-				Summary: "Guest physical memory pages whose content is 0x00",
-			},
-			Key: "zero",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65555,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Zero pages",
-				Summary: "Guest physical memory pages whose content is 0x00",
-			},
-			Key: "zero",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65556,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reservation available",
-				Summary: "Amount by which reservation can be raised",
-			},
-			Key: "unreserved",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65557, 65558, 65559},
-	},
-	{
-		Key: 65557,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reservation available",
-				Summary: "Amount by which reservation can be raised",
-			},
-			Key: "unreserved",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65558,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reservation available",
-				Summary: "Amount by which reservation can be raised",
-			},
-			Key: "unreserved",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65559,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reservation available",
-				Summary: "Amount by which reservation can be raised",
-			},
-			Key: "unreserved",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65560,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap consumed",
-				Summary: "Swap storage space consumed",
-			},
-			Key: "swapused",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65561, 65562, 65563},
-	},
-	{
-		Key: 65561,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap consumed",
-				Summary: "Swap storage space consumed",
-			},
-			Key: "swapused",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65562,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap consumed",
-				Summary: "Swap storage space consumed",
-			},
-			Key: "swapused",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65563,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap consumed",
-				Summary: "Swap storage space consumed",
-			},
-			Key: "swapused",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65568,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared common",
-				Summary: "Amount of host physical memory that backs shared guest physical memory (Shared)",
-			},
-			Key: "sharedcommon",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65569, 65570, 65571},
-	},
-	{
-		Key: 65569,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared common",
-				Summary: "Amount of host physical memory that backs shared guest physical memory (Shared)",
-			},
-			Key: "sharedcommon",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65570,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared common",
-				Summary: "Amount of host physical memory that backs shared guest physical memory (Shared)",
-			},
-			Key: "sharedcommon",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65571,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Shared common",
-				Summary: "Amount of host physical memory that backs shared guest physical memory (Shared)",
-			},
-			Key: "sharedcommon",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65572,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap",
-				Summary: "Virtual address space of ESXi that is dedicated to its heap",
-			},
-			Key: "heap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65573, 65574, 65575},
-	},
-	{
-		Key: 65573,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap",
-				Summary: "Virtual address space of ESXi that is dedicated to its heap",
-			},
-			Key: "heap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65574,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap",
-				Summary: "Virtual address space of ESXi that is dedicated to its heap",
-			},
-			Key: "heap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65575,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap",
-				Summary: "Virtual address space of ESXi that is dedicated to its heap",
-			},
-			Key: "heap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65576,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap free",
-				Summary: "Free address space in the heap of ESXi. This is less than or equal to Heap",
-			},
-			Key: "heapfree",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65577, 65578, 65579},
-	},
-	{
-		Key: 65577,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap free",
-				Summary: "Free address space in the heap of ESXi. This is less than or equal to Heap",
-			},
-			Key: "heapfree",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65578,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap free",
-				Summary: "Free address space in the heap of ESXi. This is less than or equal to Heap",
-			},
-			Key: "heapfree",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65579,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heap free",
-				Summary: "Free address space in the heap of ESXi. This is less than or equal to Heap",
-			},
-			Key: "heapfree",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65580,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Free state",
-				Summary: "Current memory availability state of ESXi. Possible values are high, clear, soft, hard, low. The state value determines the techniques used for memory reclamation from virtual machines",
-			},
-			Key: "state",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65581,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Ballooned memory",
-				Summary: "Amount of guest physical memory reclaimed from the virtual machine by the balloon driver in the guest",
-			},
-			Key: "vmmemctl",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65582, 65583, 65584},
-	},
-	{
-		Key: 65582,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Ballooned memory",
-				Summary: "Amount of guest physical memory reclaimed from the virtual machine by the balloon driver in the guest",
-			},
-			Key: "vmmemctl",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65583,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Ballooned memory",
-				Summary: "Amount of guest physical memory reclaimed from the virtual machine by the balloon driver in the guest",
-			},
-			Key: "vmmemctl",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65584,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Ballooned memory",
-				Summary: "Amount of guest physical memory reclaimed from the virtual machine by the balloon driver in the guest",
-			},
-			Key: "vmmemctl",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65585,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead consumed",
-				Summary: "Host physical memory consumed by ESXi data structures for running the virtual machines",
-			},
-			Key: "overhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65586, 65587, 65588},
-	},
-	{
-		Key: 65586,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead consumed",
-				Summary: "Host physical memory consumed by ESXi data structures for running the virtual machines",
-			},
-			Key: "overhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65587,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead consumed",
-				Summary: "Host physical memory consumed by ESXi data structures for running the virtual machines",
-			},
-			Key: "overhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65588,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead consumed",
-				Summary: "Host physical memory consumed by ESXi data structures for running the virtual machines",
-			},
-			Key: "overhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65589,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reservation consumed",
-				Summary: "Memory reservation consumed by powered-on virtual machines",
-			},
-			Key: "reservedCapacity",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MB",
-				Summary: "Megabyte",
-			},
-			Key: "megaBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65590,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swapped",
-				Summary: "Amount of guest physical memory that is swapped out to the swap space",
-			},
-			Key: "swapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65591, 65592, 65593},
-	},
-	{
-		Key: 65591,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swapped",
-				Summary: "Amount of guest physical memory that is swapped out to the swap space",
-			},
-			Key: "swapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65592,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swapped",
-				Summary: "Amount of guest physical memory that is swapped out to the swap space",
-			},
-			Key: "swapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65593,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swapped",
-				Summary: "Amount of guest physical memory that is swapped out to the swap space",
-			},
-			Key: "swapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65594,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap target",
-				Summary: "Amount of memory that ESXi needs to reclaim by swapping",
-			},
-			Key: "swaptarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65595, 65596, 65597},
-	},
-	{
-		Key: 65595,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap target",
-				Summary: "Amount of memory that ESXi needs to reclaim by swapping",
-			},
-			Key: "swaptarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65596,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap target",
-				Summary: "Amount of memory that ESXi needs to reclaim by swapping",
-			},
-			Key: "swaptarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65597,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap target",
-				Summary: "Amount of memory that ESXi needs to reclaim by swapping",
-			},
-			Key: "swaptarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65598,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap in",
-				Summary: "Amount of guest physical memory that is swapped in from the swap space since the virtual machine has been powered on. This value is less than or equal to the 'Swap out' counter",
-			},
-			Key: "swapin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65599, 65600, 65601},
-	},
-	{
-		Key: 65599,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap in",
-				Summary: "Amount of guest physical memory that is swapped in from the swap space since the virtual machine has been powered on. This value is less than or equal to the 'Swap out' counter",
-			},
-			Key: "swapin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65600,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap in",
-				Summary: "Amount of guest physical memory that is swapped in from the swap space since the virtual machine has been powered on. This value is less than or equal to the 'Swap out' counter",
-			},
-			Key: "swapin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65601,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap in",
-				Summary: "Amount of guest physical memory that is swapped in from the swap space since the virtual machine has been powered on. This value is less than or equal to the 'Swap out' counter",
-			},
-			Key: "swapin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65602,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap out",
-				Summary: "Amount of guest physical memory that is swapped out from the virtual machine to its swap space since it has been powered on.",
-			},
-			Key: "swapout",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65603, 65604, 65605},
-	},
-	{
-		Key: 65603,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap out",
-				Summary: "Amount of guest physical memory that is swapped out from the virtual machine to its swap space since it has been powered on.",
-			},
-			Key: "swapout",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65604,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap out",
-				Summary: "Amount of guest physical memory that is swapped out from the virtual machine to its swap space since it has been powered on.",
-			},
-			Key: "swapout",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65605,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap out",
-				Summary: "Amount of guest physical memory that is swapped out from the virtual machine to its swap space since it has been powered on.",
-			},
-			Key: "swapout",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65606,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Balloon target",
-				Summary: "Desired amount of guest physical memory the balloon driver needs to reclaim, as determined by ESXi",
-			},
-			Key: "vmmemctltarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65607, 65608, 65609},
-	},
-	{
-		Key: 65607,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Balloon target",
-				Summary: "Desired amount of guest physical memory the balloon driver needs to reclaim, as determined by ESXi",
-			},
-			Key: "vmmemctltarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65608,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Balloon target",
-				Summary: "Desired amount of guest physical memory the balloon driver needs to reclaim, as determined by ESXi",
-			},
-			Key: "vmmemctltarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65609,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Balloon target",
-				Summary: "Desired amount of guest physical memory the balloon driver needs to reclaim, as determined by ESXi",
-			},
-			Key: "vmmemctltarget",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65610,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Consumed",
-				Summary: "Amount of host physical memory consumed for backing up guest physical memory pages",
-			},
-			Key: "consumed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65611, 65612, 65613},
-	},
-	{
-		Key: 65611,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Consumed",
-				Summary: "Amount of host physical memory consumed for backing up guest physical memory pages",
-			},
-			Key: "consumed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65612,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Consumed",
-				Summary: "Amount of host physical memory consumed for backing up guest physical memory pages",
-			},
-			Key: "consumed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65613,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Consumed",
-				Summary: "Amount of host physical memory consumed for backing up guest physical memory pages",
-			},
-			Key: "consumed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65614,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMkernel consumed",
-				Summary: "Amount of host physical memory consumed by VMkernel",
-			},
-			Key: "sysUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65615, 65616, 65617},
-	},
-	{
-		Key: 65615,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMkernel consumed",
-				Summary: "Amount of host physical memory consumed by VMkernel",
-			},
-			Key: "sysUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65616,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMkernel consumed",
-				Summary: "Amount of host physical memory consumed by VMkernel",
-			},
-			Key: "sysUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65617,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMkernel consumed",
-				Summary: "Amount of host physical memory consumed by VMkernel",
-			},
-			Key: "sysUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65618,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap in rate",
-				Summary: "Rate at which guest physical memory is swapped in from the swap space",
-			},
-			Key: "swapinRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65619,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Swap out rate",
-				Summary: "Rate at which guest physical memory is swapped out to the swap space",
-			},
-			Key: "swapoutRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65620,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active write",
-				Summary: "Amount of guest physical memory that is being actively written by guest. Activeness is estimated by ESXi",
-			},
-			Key: "activewrite",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65621,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Compressed",
-				Summary: "Guest physical memory pages that have undergone memory compression",
-			},
-			Key: "compressed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65622,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Compression rate",
-				Summary: "Rate of guest physical memory page compression by ESXi",
-			},
-			Key: "compressionRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65623,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Decompression rate",
-				Summary: "Rate of guest physical memory decompression",
-			},
-			Key: "decompressionRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65624,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead reserved",
-				Summary: "Host physical memory reserved by ESXi, for its data structures, for running the virtual machine",
-			},
-			Key: "overheadMax",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65625,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Total reservation",
-				Summary: "Total reservation, available and consumed, for powered-on virtual machines",
-			},
-			Key: "totalCapacity",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MB",
-				Summary: "Megabyte",
-			},
-			Key: "megaBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65626,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Compressed",
-				Summary: "Amount of guest physical memory pages compressed by ESXi",
-			},
-			Key: "zipped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65627,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Compression saved",
-				Summary: "Host physical memory, reclaimed from a virtual machine, by memory compression. This value is less than the value of 'Compressed' memory",
-			},
-			Key: "zipSaved",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65628,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Page-fault latency",
-				Summary: "Percentage of time the virtual machine spent waiting to swap in or decompress guest physical memory",
-			},
-			Key: "latency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65629,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Entitlement",
-				Summary: "Amount of host physical memory the virtual machine deserves, as determined by ESXi",
-			},
-			Key: "entitlement",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65630,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Reclamation threshold",
-				Summary: "Threshold of free host physical memory below which ESXi will begin actively reclaiming memory from virtual machines by swapping, compression and ballooning",
-			},
-			Key: "lowfreethreshold",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65631,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache consumed",
-				Summary: "Storage space consumed on the host swap cache for storing swapped guest physical memory pages",
-			},
-			Key: "llSwapUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65635, 65636, 65637},
-	},
-	{
-		Key: 65632,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap in rate",
-				Summary: "Rate at which guest physical memory is swapped in from the host swap cache",
-			},
-			Key: "llSwapInRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65633,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap out rate",
-				Summary: "Rate at which guest physical memory is swapped out to the host swap cache",
-			},
-			Key: "llSwapOutRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65634,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Overhead active",
-				Summary: "Estimate of the host physical memory, from Overhead consumed, that is actively read or written to by ESXi",
-			},
-			Key: "overheadTouched",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65635,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache consumed",
-				Summary: "Storage space consumed on the host swap cache for storing swapped guest physical memory pages",
-			},
-			Key: "llSwapUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65636,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache consumed",
-				Summary: "Storage space consumed on the host swap cache for storing swapped guest physical memory pages",
-			},
-			Key: "llSwapUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65637,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache consumed",
-				Summary: "Storage space consumed on the host swap cache for storing swapped guest physical memory pages",
-			},
-			Key: "llSwapUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65638,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap in",
-				Summary: "Amount of guest physical memory swapped in from host cache",
-			},
-			Key: "llSwapIn",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65639, 65640, 65641},
-	},
-	{
-		Key: 65639,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap in",
-				Summary: "Amount of guest physical memory swapped in from host cache",
-			},
-			Key: "llSwapIn",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65640,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap in",
-				Summary: "Amount of guest physical memory swapped in from host cache",
-			},
-			Key: "llSwapIn",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65641,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap in",
-				Summary: "Amount of guest physical memory swapped in from host cache",
-			},
-			Key: "llSwapIn",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65642,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap out",
-				Summary: "Amount of guest physical memory swapped out to the host swap cache",
-			},
-			Key: "llSwapOut",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{65643, 65644, 65645},
-	},
-	{
-		Key: 65643,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap out",
-				Summary: "Amount of guest physical memory swapped out to the host swap cache",
-			},
-			Key: "llSwapOut",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65644,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap out",
-				Summary: "Amount of guest physical memory swapped out to the host swap cache",
-			},
-			Key: "llSwapOut",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65645,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Host cache swap out",
-				Summary: "Amount of guest physical memory swapped out to the host swap cache",
-			},
-			Key: "llSwapOut",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65646,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMFS PB Cache Size",
-				Summary: "Space used for holding VMFS Pointer Blocks in memory",
-			},
-			Key: "vmfs.pbc.size",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MB",
-				Summary: "Megabyte",
-			},
-			Key: "megaBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65647,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Maximum VMFS PB Cache Size",
-				Summary: "Maximum size the VMFS Pointer Block Cache can grow to",
-			},
-			Key: "vmfs.pbc.sizeMax",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MB",
-				Summary: "Megabyte",
-			},
-			Key: "megaBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65648,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMFS Working Set",
-				Summary: "Amount of file blocks whose addresses are cached in the VMFS PB Cache",
-			},
-			Key: "vmfs.pbc.workingSet",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "TB",
-				Summary: "Terabyte",
-			},
-			Key: "teraBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65649,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Maximum VMFS Working Set",
-				Summary: "Maximum amount of file blocks whose addresses are cached in the VMFS PB Cache",
-			},
-			Key: "vmfs.pbc.workingSetMax",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "TB",
-				Summary: "Terabyte",
-			},
-			Key: "teraBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65650,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMFS PB Cache Overhead",
-				Summary: "Amount of VMFS heap used by the VMFS PB Cache",
-			},
-			Key: "vmfs.pbc.overhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 65651,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VMFS PB Cache Capacity Miss Ratio",
-				Summary: "Trailing average of the ratio of capacity misses to compulsory misses for the VMFS PB Cache",
-			},
-			Key: "vmfs.pbc.capMissRatio",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory",
-				Summary: "Memory",
-			},
-			Key: "mem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131072,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Aggregated disk I/O rate. For hosts, this metric includes the rates for all virtual machines running on the host during the collection interval.",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{131073, 131074, 131075},
-	},
-	{
-		Key: 131073,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Aggregated disk I/O rate. For hosts, this metric includes the rates for all virtual machines running on the host during the collection interval.",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131074,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Aggregated disk I/O rate. For hosts, this metric includes the rates for all virtual machines running on the host during the collection interval.",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131075,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Aggregated disk I/O rate. For hosts, this metric includes the rates for all virtual machines running on the host during the collection interval.",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131076,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read requests",
-				Summary: "Number of disk reads during the collection interval",
-			},
-			Key: "numberRead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131077,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write requests",
-				Summary: "Number of disk writes during the collection interval",
-			},
-			Key: "numberWrite",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131078,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read rate",
-				Summary: "Average number of kilobytes read from the disk each second during the collection interval",
-			},
-			Key: "read",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131079,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write rate",
-				Summary: "Average number of kilobytes written to disk each second during the collection interval",
-			},
-			Key: "write",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131080,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Commands issued",
-				Summary: "Number of SCSI commands issued during the collection interval",
-			},
-			Key: "commands",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131081,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Commands aborted",
-				Summary: "Number of SCSI commands aborted during the collection interval",
-			},
-			Key: "commandsAborted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131082,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Bus resets",
-				Summary: "Number of SCSI-bus reset commands issued during the collection interval",
-			},
-			Key: "busResets",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131083,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Physical device read latency",
-				Summary: "Average amount of time, in milliseconds, to read from the physical device",
-			},
-			Key: "deviceReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131084,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Kernel read latency",
-				Summary: "Average amount of time, in milliseconds, spent by VMkernel to process each SCSI read command",
-			},
-			Key: "kernelReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131085,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read latency",
-				Summary: "Average amount of time taken during the collection interval to process a SCSI read command issued from the guest OS to the virtual machine",
-			},
-			Key: "totalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131086,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Queue read latency",
-				Summary: "Average amount of time spent in the VMkernel queue, per SCSI read command, during the collection interval",
-			},
-			Key: "queueReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131087,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Physical device write latency",
-				Summary: "Average amount of time, in milliseconds, to write to the physical device",
-			},
-			Key: "deviceWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131088,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Kernel write latency",
-				Summary: "Average amount of time, in milliseconds, spent by VMkernel to process each SCSI write command",
-			},
-			Key: "kernelWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131089,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write latency",
-				Summary: "Average amount of time taken during the collection interval to process a SCSI write command issued by the guest OS to the virtual machine",
-			},
-			Key: "totalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131090,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Queue write latency",
-				Summary: "Average amount of time spent in the VMkernel queue, per SCSI write command, during the collection interval",
-			},
-			Key: "queueWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131091,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Physical device command latency",
-				Summary: "Average amount of time, in milliseconds, to complete a SCSI command from the physical device",
-			},
-			Key: "deviceLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131092,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Kernel command latency",
-				Summary: "Average amount of time, in milliseconds, spent by VMkernel to process each SCSI command",
-			},
-			Key: "kernelLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131093,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Command latency",
-				Summary: "Average amount of time taken during the collection interval to process a SCSI command issued by the guest OS to the virtual machine",
-			},
-			Key: "totalLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131094,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Queue command latency",
-				Summary: "Average amount of time spent in the VMkernel queue, per SCSI command, during the collection interval",
-			},
-			Key: "queueLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131095,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Highest latency",
-				Summary: "Highest latency value across all disks used by the host",
-			},
-			Key: "maxTotalLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131096,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Maximum queue depth",
-				Summary: "Maximum queue depth",
-			},
-			Key: "maxQueueDepth",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131097,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read requests per second",
-				Summary: "Average number of disk reads per second during the collection interval",
-			},
-			Key: "numberReadAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131098,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write requests per second",
-				Summary: "Average number of disk writes per second during the collection interval",
-			},
-			Key: "numberWriteAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 131099,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average commands issued per second",
-				Summary: "Average number of SCSI commands issued per second during the collection interval",
-			},
-			Key: "commandsAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk",
-				Summary: "Disk",
-			},
-			Key: "disk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196608,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Network utilization (combined transmit-rates and receive-rates) during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{196609, 196610, 196611},
-	},
-	{
-		Key: 196609,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Network utilization (combined transmit-rates and receive-rates) during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196610,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Network utilization (combined transmit-rates and receive-rates) during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196611,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Network utilization (combined transmit-rates and receive-rates) during the interval",
-			},
-			Key: "usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196612,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Packets received",
-				Summary: "Number of packets received during the interval",
-			},
-			Key: "packetsRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196613,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Packets transmitted",
-				Summary: "Number of packets transmitted during the interval",
-			},
-			Key: "packetsTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196614,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Data receive rate",
-				Summary: "Average rate at which data was received during the interval",
-			},
-			Key: "received",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196615,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Data transmit rate",
-				Summary: "Average rate at which data was transmitted during the interval",
-			},
-			Key: "transmitted",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196616,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Receive packets dropped",
-				Summary: "Number of receives dropped",
-			},
-			Key: "droppedRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196617,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Transmit packets dropped",
-				Summary: "Number of transmits dropped",
-			},
-			Key: "droppedTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196618,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Data receive rate",
-				Summary: "Average amount of data received per second",
-			},
-			Key: "bytesRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196619,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Data transmit rate",
-				Summary: "Average amount of data transmitted per second",
-			},
-			Key: "bytesTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196620,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Broadcast receives",
-				Summary: "Number of broadcast packets received during the sampling interval",
-			},
-			Key: "broadcastRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196621,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Broadcast transmits",
-				Summary: "Number of broadcast packets transmitted during the sampling interval",
-			},
-			Key: "broadcastTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196622,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Multicast receives",
-				Summary: "Number of multicast packets received during the sampling interval",
-			},
-			Key: "multicastRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196623,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Multicast transmits",
-				Summary: "Number of multicast packets transmitted during the sampling interval",
-			},
-			Key: "multicastTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196624,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Packet receive errors",
-				Summary: "Number of packets with errors received during the sampling interval",
-			},
-			Key: "errorsRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196625,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Packet transmit errors",
-				Summary: "Number of packets with errors transmitted during the sampling interval",
-			},
-			Key: "errorsTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196626,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Unknown protocol frames",
-				Summary: "Number of frames with unknown protocol received during the sampling interval",
-			},
-			Key: "unknownProtos",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196627,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "pnicBytesRx",
-				Summary: "pnicBytesRx",
-			},
-			Key: "pnicBytesRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 196628,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "pnicBytesTx",
-				Summary: "pnicBytesTx",
-			},
-			Key: "pnicBytesTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Network",
-				Summary: "Network",
-			},
-			Key: "net",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262144,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Uptime",
-				Summary: "Total time elapsed, in seconds, since last system startup",
-			},
-			Key: "uptime",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "s",
-				Summary: "Second",
-			},
-			Key: "second",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262145,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Heartbeat",
-				Summary: "Number of heartbeats issued per virtual machine during the interval",
-			},
-			Key: "heartbeat",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262146,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Disk usage",
-				Summary: "Amount of disk space usage for each mount point",
-			},
-			Key: "diskUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262147,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU usage (None)",
-				Summary: "Amount of CPU used by the Service Console and other applications during the interval",
-			},
-			Key: "resourceCpuUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "none",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{262148, 262149, 262150},
-	},
-	{
-		Key: 262148,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU usage (Average)",
-				Summary: "Amount of CPU used by the Service Console and other applications during the interval",
-			},
-			Key: "resourceCpuUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262149,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU usage (Maximum)",
-				Summary: "Amount of CPU used by the Service Console and other applications during the interval",
-			},
-			Key: "resourceCpuUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "maximum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262150,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU usage (Minimum)",
-				Summary: "Amount of CPU used by the Service Console and other applications during the interval",
-			},
-			Key: "resourceCpuUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "minimum",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262151,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory touched",
-				Summary: "Memory touched by the system resource group",
-			},
-			Key: "resourceMemTouched",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262152,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory mapped",
-				Summary: "Memory mapped by the system resource group",
-			},
-			Key: "resourceMemMapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262153,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory share saved",
-				Summary: "Memory saved due to sharing by the system resource group",
-			},
-			Key: "resourceMemShared",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262154,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory swapped",
-				Summary: "Memory swapped out by the system resource group",
-			},
-			Key: "resourceMemSwapped",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262155,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory overhead",
-				Summary: "Overhead memory consumed by the system resource group",
-			},
-			Key: "resourceMemOverhead",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262156,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory shared",
-				Summary: "Memory shared by the system resource group",
-			},
-			Key: "resourceMemCow",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262157,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory zero",
-				Summary: "Zero filled memory used by the system resource group",
-			},
-			Key: "resourceMemZero",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262158,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU running (1 min. average)",
-				Summary: "CPU running average over 1 minute of the system resource group",
-			},
-			Key: "resourceCpuRun1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262159,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU active (1 min average)",
-				Summary: "CPU active average over 1 minute of the system resource group",
-			},
-			Key: "resourceCpuAct1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262160,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU maximum limited (1 min)",
-				Summary: "CPU maximum limited over 1 minute of the system resource group",
-			},
-			Key: "resourceCpuMaxLimited1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262161,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU running (5 min average)",
-				Summary: "CPU running average over 5 minutes of the system resource group",
-			},
-			Key: "resourceCpuRun5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262162,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU active (5 min average)",
-				Summary: "CPU active average over 5 minutes of the system resource group",
-			},
-			Key: "resourceCpuAct5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262163,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU maximum limited (5 min)",
-				Summary: "CPU maximum limited over 5 minutes of the system resource group",
-			},
-			Key: "resourceCpuMaxLimited5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262164,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU allocation minimum (in MHz)",
-				Summary: "CPU allocation reservation (in MHz) of the system resource group",
-			},
-			Key: "resourceCpuAllocMin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262165,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU allocation maximum (in MHz)",
-				Summary: "CPU allocation limit (in MHz) of the system resource group",
-			},
-			Key: "resourceCpuAllocMax",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262166,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource CPU allocation shares",
-				Summary: "CPU allocation shares of the system resource group",
-			},
-			Key: "resourceCpuAllocShares",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262167,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory allocation minimum (in KB)",
-				Summary: "Memory allocation reservation (in KB) of the system resource group",
-			},
-			Key: "resourceMemAllocMin",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262168,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory allocation maximum (in KB)",
-				Summary: "Memory allocation limit (in KB) of the system resource group",
-			},
-			Key: "resourceMemAllocMax",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262169,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory allocation shares",
-				Summary: "Memory allocation shares of the system resource group",
-			},
-			Key: "resourceMemAllocShares",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262170,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "OS Uptime",
-				Summary: "Total time elapsed, in seconds, since last operating system boot-up",
-			},
-			Key: "osUptime",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "s",
-				Summary: "Second",
-			},
-			Key: "second",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262171,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource memory consumed",
-				Summary: "Memory consumed by the system resource group",
-			},
-			Key: "resourceMemConsumed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 262172,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "File descriptors used",
-				Summary: "Number of file descriptors used by the system resource group",
-			},
-			Key: "resourceFdUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "System",
-				Summary: "System",
-			},
-			Key: "sys",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327680,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (1 min average)",
-				Summary: "CPU active average over 1 minute",
-			},
-			Key: "actav1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327681,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (1 min peak)",
-				Summary: "CPU active peak over 1 minute",
-			},
-			Key: "actpk1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327682,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (1 min average)",
-				Summary: "CPU running average over 1 minute",
-			},
-			Key: "runav1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327683,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (5 min average)",
-				Summary: "CPU active average over 5 minutes",
-			},
-			Key: "actav5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327684,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (5 min peak)",
-				Summary: "CPU active peak over 5 minutes",
-			},
-			Key: "actpk5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327685,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (5 min average)",
-				Summary: "CPU running average over 5 minutes",
-			},
-			Key: "runav5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327686,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (15 min average)",
-				Summary: "CPU active average over 15 minutes",
-			},
-			Key: "actav15",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327687,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Active (15 min peak)",
-				Summary: "CPU active peak over 15 minutes",
-			},
-			Key: "actpk15",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327688,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (15 min average)",
-				Summary: "CPU running average over 15 minutes",
-			},
-			Key: "runav15",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327689,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (1 min peak)",
-				Summary: "CPU running peak over 1 minute",
-			},
-			Key: "runpk1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327690,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Throttled (1 min average)",
-				Summary: "Amount of CPU resources over the limit that were refused, average over 1 minute",
-			},
-			Key: "maxLimited1",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327691,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (5 min peak)",
-				Summary: "CPU running peak over 5 minutes",
-			},
-			Key: "runpk5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327692,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Throttled (5 min average)",
-				Summary: "Amount of CPU resources over the limit that were refused, average over 5 minutes",
-			},
-			Key: "maxLimited5",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327693,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Running (15 min peak)",
-				Summary: "CPU running peak over 15 minutes",
-			},
-			Key: "runpk15",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327694,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Throttled (15 min average)",
-				Summary: "Amount of CPU resources over the limit that were refused, average over 15 minutes",
-			},
-			Key: "maxLimited15",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327695,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Group CPU sample count",
-				Summary: "Group CPU sample count",
-			},
-			Key: "sampleCount",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 327696,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Group CPU sample period",
-				Summary: "Group CPU sample period",
-			},
-			Key: "samplePeriod",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Resource group CPU",
-				Summary: "Resource group CPU",
-			},
-			Key: "rescpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 393216,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory used",
-				Summary: "Amount of total configured memory that is available for use",
-			},
-			Key: "memUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Management agent",
-				Summary: "Management agent",
-			},
-			Key: "managementAgent",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 393217,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory swap used",
-				Summary: "Sum of the memory swapped by all powered-on virtual machines on the host",
-			},
-			Key: "swapUsed",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Management agent",
-				Summary: "Management agent",
-			},
-			Key: "managementAgent",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 393218,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory swap in",
-				Summary: "Amount of memory that is swapped in for the Service Console",
-			},
-			Key: "swapIn",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Management agent",
-				Summary: "Management agent",
-			},
-			Key: "managementAgent",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 393219,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory swap out",
-				Summary: "Amount of memory that is swapped out for the Service Console",
-			},
-			Key: "swapOut",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Management agent",
-				Summary: "Management agent",
-			},
-			Key: "managementAgent",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 393220,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "CPU usage",
-				Summary: "Amount of Service Console CPU usage",
-			},
-			Key: "cpuUsage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Management agent",
-				Summary: "Management agent",
-			},
-			Key: "managementAgent",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MHz",
-				Summary: "Megahertz",
-			},
-			Key: "megaHertz",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458752,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average commands issued per second",
-				Summary: "Average number of commands issued per second by the storage adapter during the collection interval",
-			},
-			Key: "commandsAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458753,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read requests per second",
-				Summary: "Average number of read commands issued per second by the storage adapter during the collection interval",
-			},
-			Key: "numberReadAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458754,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write requests per second",
-				Summary: "Average number of write commands issued per second by the storage adapter during the collection interval",
-			},
-			Key: "numberWriteAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458755,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read rate",
-				Summary: "Rate of reading data by the storage adapter",
-			},
-			Key: "read",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458756,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write rate",
-				Summary: "Rate of writing data by the storage adapter",
-			},
-			Key: "write",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458757,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read latency",
-				Summary: "The average time a read by the storage adapter takes",
-			},
-			Key: "totalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458758,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write latency",
-				Summary: "The average time a write by the storage adapter takes",
-			},
-			Key: "totalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 458759,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Highest latency",
-				Summary: "Highest latency value across all storage adapters used by the host",
-			},
-			Key: "maxTotalLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage adapter",
-				Summary: "Storage adapter",
-			},
-			Key: "storageAdapter",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524288,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average commands issued per second",
-				Summary: "Average number of commands issued per second on the storage path during the collection interval",
-			},
-			Key: "commandsAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524289,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read requests per second",
-				Summary: "Average number of read commands issued per second on the storage path during the collection interval",
-			},
-			Key: "numberReadAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524290,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write requests per second",
-				Summary: "Average number of write commands issued per second on the storage path during the collection interval",
-			},
-			Key: "numberWriteAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524291,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read rate",
-				Summary: "Rate of reading data on the storage path",
-			},
-			Key: "read",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524292,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write rate",
-				Summary: "Rate of writing data on the storage path",
-			},
-			Key: "write",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524293,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read latency",
-				Summary: "The average time a read issued on the storage path takes",
-			},
-			Key: "totalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524294,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write latency",
-				Summary: "The average time a write issued on the storage path takes",
-			},
-			Key: "totalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 524295,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Highest latency",
-				Summary: "Highest latency value across all storage paths used by the host",
-			},
-			Key: "maxTotalLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage path",
-				Summary: "Storage path",
-			},
-			Key: "storagePath",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589824,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read requests per second",
-				Summary: "Average number of read commands issued per second to the virtual disk during the collection interval",
-			},
-			Key: "numberReadAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589825,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write requests per second",
-				Summary: "Average number of write commands issued per second to the virtual disk during the collection interval",
-			},
-			Key: "numberWriteAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589826,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read rate",
-				Summary: "Rate of reading data from the virtual disk",
-			},
-			Key: "read",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589827,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write rate",
-				Summary: "Rate of writing data to the virtual disk",
-			},
-			Key: "write",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589828,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read latency",
-				Summary: "The average time a read from the virtual disk takes",
-			},
-			Key: "totalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589829,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write latency",
-				Summary: "The average time a write to the virtual disk takes",
-			},
-			Key: "totalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589830,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average number of outstanding read requests",
-				Summary: "Average number of outstanding read requests to the virtual disk during the collection interval",
-			},
-			Key: "readOIO",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589831,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average number of outstanding write requests",
-				Summary: "Average number of outstanding write requests to the virtual disk during the collection interval",
-			},
-			Key: "writeOIO",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589832,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read workload metric",
-				Summary: "Storage DRS virtual disk metric for the read workload model",
-			},
-			Key: "readLoadMetric",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589833,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write workload metric",
-				Summary: "Storage DRS virtual disk metric for the write workload model",
-			},
-			Key: "writeLoadMetric",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589834,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read request size",
-				Summary: "Average read request size in bytes",
-			},
-			Key: "readIOSize",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589835,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write request size",
-				Summary: "Average write request size in bytes",
-			},
-			Key: "writeIOSize",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589836,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Number of small seeks",
-				Summary: "Number of seeks during the interval that were less than 64 LBNs apart",
-			},
-			Key: "smallSeeks",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589837,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Number of medium seeks",
-				Summary: "Number of seeks during the interval that were between 64 and 8192 LBNs apart",
-			},
-			Key: "mediumSeeks",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589838,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Number of large seeks",
-				Summary: "Number of seeks during the interval that were greater than 8192 LBNs apart",
-			},
-			Key: "largeSeeks",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589839,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read Latency (us)",
-				Summary: "Read latency in microseconds",
-			},
-			Key: "readLatencyUS",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "µs",
-				Summary: "Microsecond",
-			},
-			Key: "microsecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589840,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write Latency (us)",
-				Summary: "Write latency in microseconds",
-			},
-			Key: "writeLatencyUS",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "µs",
-				Summary: "Microsecond",
-			},
-			Key: "microsecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589841,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual Flash Read Cache I/Os per second for the virtual disk",
-				Summary: "The average virtual Flash Read Cache I/Os per second value for the virtual disk",
-			},
-			Key: "vFlashCacheIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589842,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual Flash Read Cache latency for the virtual disk",
-				Summary: "The average virtual Flash Read Cache latency value for the virtual disk",
-			},
-			Key: "vFlashCacheLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "µs",
-				Summary: "Microsecond",
-			},
-			Key: "microsecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 589843,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual Flash Read Cache throughput for virtual disk",
-				Summary: "The average virtual Flash Read Cache throughput value for the virtual disk",
-			},
-			Key: "vFlashCacheThroughput",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual disk",
-				Summary: "Virtual disk",
-			},
-			Key: "virtualDisk",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655360,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read requests per second",
-				Summary: "Average number of read commands issued per second to the datastore during the collection interval",
-			},
-			Key: "numberReadAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655361,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write requests per second",
-				Summary: "Average number of write commands issued per second to the datastore during the collection interval",
-			},
-			Key: "numberWriteAveraged",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655362,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read rate",
-				Summary: "Rate of reading data from the datastore",
-			},
-			Key: "read",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655363,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write rate",
-				Summary: "Rate of writing data to the datastore",
-			},
-			Key: "write",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655364,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read latency",
-				Summary: "The average time a read from the datastore takes",
-			},
-			Key: "totalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655365,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write latency",
-				Summary: "The average time a write to the datastore takes",
-			},
-			Key: "totalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655366,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage I/O Control normalized latency",
-				Summary: "Storage I/O Control size-normalized I/O latency",
-			},
-			Key: "sizeNormalizedDatastoreLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "µs",
-				Summary: "Microsecond",
-			},
-			Key: "microsecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655367,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage I/O Control aggregated IOPS",
-				Summary: "Storage I/O Control aggregated IOPS",
-			},
-			Key: "datastoreIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655368,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore bytes read",
-				Summary: "Storage DRS datastore bytes read",
-			},
-			Key: "datastoreReadBytes",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655369,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore bytes written",
-				Summary: "Storage DRS datastore bytes written",
-			},
-			Key: "datastoreWriteBytes",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655370,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore read I/O rate",
-				Summary: "Storage DRS datastore read I/O rate",
-			},
-			Key: "datastoreReadIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655371,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore write I/O rate",
-				Summary: "Storage DRS datastore write I/O rate",
-			},
-			Key: "datastoreWriteIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655372,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore normalized read latency",
-				Summary: "Storage DRS datastore normalized read latency",
-			},
-			Key: "datastoreNormalReadLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655373,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore normalized write latency",
-				Summary: "Storage DRS datastore normalized write latency",
-			},
-			Key: "datastoreNormalWriteLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655374,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore outstanding read requests",
-				Summary: "Storage DRS datastore outstanding read requests",
-			},
-			Key: "datastoreReadOIO",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655375,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore outstanding write requests",
-				Summary: "Storage DRS datastore outstanding write requests",
-			},
-			Key: "datastoreWriteOIO",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655376,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage I/O Control datastore maximum queue depth",
-				Summary: "Storage I/O Control datastore maximum queue depth",
-			},
-			Key: "datastoreMaxQueueDepth",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655377,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore read workload metric",
-				Summary: "Storage DRS datastore metric for read workload model",
-			},
-			Key: "datastoreReadLoadMetric",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655378,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage DRS datastore write workload metric",
-				Summary: "Storage DRS datastore metric for write workload model",
-			},
-			Key: "datastoreWriteLoadMetric",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655379,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Highest latency",
-				Summary: "Highest latency value across all datastores used by the host",
-			},
-			Key: "maxTotalLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655380,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Storage I/O Control active time percentage",
-				Summary: "Percentage of time Storage I/O Control actively controlled datastore latency",
-			},
-			Key: "siocActiveTimePercentage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 655381,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore latency observed by VMs",
-				Summary: "The average datastore latency as seen by virtual machines",
-			},
-			Key: "datastoreVMObservedLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Datastore",
-				Summary: "Datastore",
-			},
-			Key: "datastore",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "µs",
-				Summary: "Microsecond",
-			},
-			Key: "microsecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 720896,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Usage",
-				Summary: "Current power usage",
-			},
-			Key: "power",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Power",
-				Summary: "Power",
-			},
-			Key: "power",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "W",
-				Summary: "Watt",
-			},
-			Key: "watt",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 720897,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Cap",
-				Summary: "Maximum allowed power usage",
-			},
-			Key: "powerCap",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Power",
-				Summary: "Power",
-			},
-			Key: "power",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "W",
-				Summary: "Watt",
-			},
-			Key: "watt",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 720898,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Energy usage",
-				Summary: "Total energy used since last stats reset",
-			},
-			Key: "energy",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Power",
-				Summary: "Power",
-			},
-			Key: "power",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "J",
-				Summary: "Joule",
-			},
-			Key: "joule",
-		},
-		RollupType:          "summation",
-		StatsType:           "delta",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 786432,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "vSphere Replication VM Count",
-				Summary: "Current number of replicated virtual machines",
-			},
-			Key: "hbrNumVms",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "vSphere Replication",
-				Summary: "vSphere Replication",
-			},
-			Key: "hbr",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 786433,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Replication Data Receive Rate",
-				Summary: "Average amount of data received per second",
-			},
-			Key: "hbrNetRx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "vSphere Replication",
-				Summary: "vSphere Replication",
-			},
-			Key: "hbr",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 786434,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Replication Data Transmit Rate",
-				Summary: "Average amount of data transmitted per second",
-			},
-			Key: "hbrNetTx",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "vSphere Replication",
-				Summary: "vSphere Replication",
-			},
-			Key: "hbr",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 851968,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Number of caches controlled by the virtual flash module",
-				Summary: "Number of caches controlled by the virtual flash module",
-			},
-			Key: "numActiveVMDKs",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Virtual flash",
-				Summary: "Virtual flash module related statistical values",
-			},
-			Key: "vflashModule",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245184,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read IOPS",
-				Summary: "Read IOPS",
-			},
-			Key: "readIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245185,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read throughput",
-				Summary: "Read throughput in kBps",
-			},
-			Key: "readThroughput",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245186,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average read latency",
-				Summary: "Average read latency in ms",
-			},
-			Key: "readAvgLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245187,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Max read latency",
-				Summary: "Max read latency in ms",
-			},
-			Key: "readMaxLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245188,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Cache hit rate",
-				Summary: "Cache hit rate percentage",
-			},
-			Key: "readCacheHitRate",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245189,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Read congestion per sampling interval",
-				Summary: "Read congestion",
-			},
-			Key: "readCongestion",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245190,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write IOPS",
-				Summary: "Write IOPS",
-			},
-			Key: "writeIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245191,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write throughput",
-				Summary: "Write throughput in kBps",
-			},
-			Key: "writeThroughput",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245192,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average write latency",
-				Summary: "Average write latency in ms",
-			},
-			Key: "writeAvgLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245193,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Max write latency",
-				Summary: "Max write latency in ms",
-			},
-			Key: "writeMaxLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245194,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Write congestion per sampling interval",
-				Summary: "Write congestion",
-			},
-			Key: "writeCongestion",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245195,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Recovery write IOPS",
-				Summary: "Recovery write IOPS",
-			},
-			Key: "recoveryWriteIops",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245196,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Recovery write through-put",
-				Summary: "Recovery write through-put in kBps",
-			},
-			Key: "recoveryWriteThroughput",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KBps",
-				Summary: "Kilobytes per second",
-			},
-			Key: "kiloBytesPerSecond",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245197,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Average recovery write latency",
-				Summary: "Average recovery write latency in ms",
-			},
-			Key: "recoveryWriteAvgLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245198,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Max recovery write latency",
-				Summary: "Max recovery write latency in ms",
-			},
-			Key: "recoveryWriteMaxLatency",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "ms",
-				Summary: "Millisecond",
-			},
-			Key: "millisecond",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1245199,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Recovery write congestion per sampling interval",
-				Summary: "Recovery write congestion",
-			},
-			Key: "recoveryWriteCongestion",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "VSAN DOM Objects",
-				Summary: "VSAN DOM object related statistical values",
-			},
-			Key: "vsanDomObj",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "num",
-				Summary: "Number",
-			},
-			Key: "number",
-		},
-		RollupType:          "average",
-		StatsType:           "rate",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310720,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "The utilization of a GPU in percentages",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{1310721, 1310722, 1310723},
-	},
-	{
-		Key: 1310721,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "The utilization of a GPU in percentages",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310722,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "The utilization of a GPU in percentages",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310723,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Utilization",
-				Summary: "The utilization of a GPU in percentages",
-			},
-			Key: "utilization",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310724,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory used",
-				Summary: "The amount of GPU memory used in kilobytes",
-			},
-			Key: "mem.used",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{1310725, 1310726, 1310727},
-	},
-	{
-		Key: 1310725,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory used",
-				Summary: "The amount of GPU memory used in kilobytes",
-			},
-			Key: "mem.used",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310726,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory used",
-				Summary: "The amount of GPU memory used in kilobytes",
-			},
-			Key: "mem.used",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310727,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory used",
-				Summary: "The amount of GPU memory used in kilobytes",
-			},
-			Key: "mem.used",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "KB",
-				Summary: "Kilobyte",
-			},
-			Key: "kiloBytes",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310728,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory usage",
-				Summary: "The amount of GPU memory used in percentages of the total available",
-			},
-			Key: "mem.usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "none",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: []int32{1310729, 1310730, 1310731},
-	},
-	{
-		Key: 1310729,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory usage",
-				Summary: "The amount of GPU memory used in percentages of the total available",
-			},
-			Key: "mem.usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310730,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory usage",
-				Summary: "The amount of GPU memory used in percentages of the total available",
-			},
-			Key: "mem.usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "maximum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310731,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Memory usage",
-				Summary: "The amount of GPU memory used in percentages of the total available",
-			},
-			Key: "mem.usage",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "%",
-				Summary: "Percentage",
-			},
-			Key: "percent",
-		},
-		RollupType:          "minimum",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1310732,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Temperature",
-				Summary: "The temperature of a GPU in degrees celsius",
-			},
-			Key: "temperature",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "GPU",
-				Summary: "GPU",
-			},
-			Key: "gpu",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "℃",
-				Summary: "Temperature in degrees Celsius",
-			},
-			Key: "celsius",
-		},
-		RollupType:          "average",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-	{
-		Key: 1376256,
-		NameInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "Persistent memory available reservation",
-				Summary: "Persistent memory available reservation on a host.",
-			},
-			Key: "available.reservation",
-		},
-		GroupInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "PMEM",
-				Summary: "PMEM",
-			},
-			Key: "pmem",
-		},
-		UnitInfo: &types.ElementDescription{
-			Description: types.Description{
-				Label:   "MB",
-				Summary: "Megabyte",
-			},
-			Key: "megaBytes",
-		},
-		RollupType:          "latest",
-		StatsType:           "absolute",
-		Level:               0,
-		PerDeviceLevel:      0,
-		AssociatedCounterId: nil,
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go
deleted file mode 100644
index b8cb91d8d4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/resource_pool.go
+++ /dev/null
@@ -1,165 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import (
-	"time"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// ResourcePool is the default template for ResourcePool properties.
-// Capture method:
-//   govc pool.info "*" -dump
-var ResourcePool = mo.ResourcePool{
-	ManagedEntity: mo.ManagedEntity{
-		ExtensibleManagedObject: mo.ExtensibleManagedObject{
-			Self:           types.ManagedObjectReference{Type: "ResourcePool", Value: "ha-root-pool"},
-			Value:          nil,
-			AvailableField: nil,
-		},
-		Parent:              &types.ManagedObjectReference{Type: "ComputeResource", Value: "ha-compute-res"},
-		CustomValue:         nil,
-		OverallStatus:       "green",
-		ConfigStatus:        "green",
-		ConfigIssue:         nil,
-		EffectiveRole:       []int32{-1},
-		Permission:          nil,
-		Name:                "Resources",
-		DisabledMethod:      []string{"CreateVApp", "CreateChildVM_Task"},
-		RecentTask:          nil,
-		DeclaredAlarmState:  nil,
-		TriggeredAlarmState: nil,
-		AlarmActionsEnabled: (*bool)(nil),
-		Tag:                 nil,
-	},
-	Summary: &types.ResourcePoolSummary{
-		DynamicData: types.DynamicData{},
-		Name:        "Resources",
-		Config: types.ResourceConfigSpec{
-			DynamicData:   types.DynamicData{},
-			Entity:        &types.ManagedObjectReference{Type: "ResourcePool", Value: "ha-root-pool"},
-			ChangeVersion: "",
-			LastModified:  (*time.Time)(nil),
-			CpuAllocation: types.ResourceAllocationInfo{
-				DynamicData:           types.DynamicData{},
-				Reservation:           types.NewInt64(4121),
-				ExpandableReservation: types.NewBool(false),
-				Limit: types.NewInt64(4121),
-				Shares: &types.SharesInfo{
-					DynamicData: types.DynamicData{},
-					Shares:      9000,
-					Level:       "custom",
-				},
-				OverheadLimit: nil,
-			},
-			MemoryAllocation: types.ResourceAllocationInfo{
-				DynamicData:           types.DynamicData{},
-				Reservation:           types.NewInt64(961),
-				ExpandableReservation: types.NewBool(false),
-				Limit: types.NewInt64(961),
-				Shares: &types.SharesInfo{
-					DynamicData: types.DynamicData{},
-					Shares:      9000,
-					Level:       "custom",
-				},
-				OverheadLimit: nil,
-			},
-		},
-		Runtime: types.ResourcePoolRuntimeInfo{
-			DynamicData: types.DynamicData{},
-			Memory: types.ResourcePoolResourceUsage{
-				DynamicData:          types.DynamicData{},
-				ReservationUsed:      0,
-				ReservationUsedForVm: 0,
-				UnreservedForPool:    1007681536,
-				UnreservedForVm:      1007681536,
-				OverallUsage:         0,
-				MaxUsage:             1007681536,
-			},
-			Cpu: types.ResourcePoolResourceUsage{
-				DynamicData:          types.DynamicData{},
-				ReservationUsed:      0,
-				ReservationUsedForVm: 0,
-				UnreservedForPool:    4121,
-				UnreservedForVm:      4121,
-				OverallUsage:         0,
-				MaxUsage:             4121,
-			},
-			OverallStatus: "green",
-		},
-		QuickStats:         (*types.ResourcePoolQuickStats)(nil),
-		ConfiguredMemoryMB: 0,
-	},
-	Runtime: types.ResourcePoolRuntimeInfo{
-		DynamicData: types.DynamicData{},
-		Memory: types.ResourcePoolResourceUsage{
-			DynamicData:          types.DynamicData{},
-			ReservationUsed:      0,
-			ReservationUsedForVm: 0,
-			UnreservedForPool:    1007681536,
-			UnreservedForVm:      1007681536,
-			OverallUsage:         0,
-			MaxUsage:             1007681536,
-		},
-		Cpu: types.ResourcePoolResourceUsage{
-			DynamicData:          types.DynamicData{},
-			ReservationUsed:      0,
-			ReservationUsedForVm: 0,
-			UnreservedForPool:    4121,
-			UnreservedForVm:      4121,
-			OverallUsage:         0,
-			MaxUsage:             4121,
-		},
-		OverallStatus: "green",
-	},
-	Owner:        types.ManagedObjectReference{Type: "ComputeResource", Value: "ha-compute-res"},
-	ResourcePool: nil,
-	Vm:           nil,
-	Config: types.ResourceConfigSpec{
-		DynamicData:   types.DynamicData{},
-		Entity:        &types.ManagedObjectReference{Type: "ResourcePool", Value: "ha-root-pool"},
-		ChangeVersion: "",
-		LastModified:  (*time.Time)(nil),
-		CpuAllocation: types.ResourceAllocationInfo{
-			DynamicData:           types.DynamicData{},
-			Reservation:           types.NewInt64(4121),
-			ExpandableReservation: types.NewBool(false),
-			Limit: types.NewInt64(4121),
-			Shares: &types.SharesInfo{
-				DynamicData: types.DynamicData{},
-				Shares:      9000,
-				Level:       "custom",
-			},
-			OverheadLimit: nil,
-		},
-		MemoryAllocation: types.ResourceAllocationInfo{
-			DynamicData:           types.DynamicData{},
-			Reservation:           types.NewInt64(961),
-			ExpandableReservation: types.NewBool(false),
-			Limit: types.NewInt64(961),
-			Shares: &types.SharesInfo{
-				DynamicData: types.DynamicData{},
-				Shares:      9000,
-				Level:       "custom",
-			},
-			OverheadLimit: nil,
-		},
-	},
-	ChildConfiguration: nil,
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/root_folder.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/root_folder.go
deleted file mode 100644
index 3aefd1d812..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/root_folder.go
+++ /dev/null
@@ -1,76 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import (
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// RootFolder is the default template for the ServiceContent rootFolder property.
-// Capture method:
-//   govc folder.info -dump /
-var RootFolder = mo.Folder{
-	ManagedEntity: mo.ManagedEntity{
-		ExtensibleManagedObject: mo.ExtensibleManagedObject{
-			Self:           types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-			Value:          nil,
-			AvailableField: nil,
-		},
-		Parent:        (*types.ManagedObjectReference)(nil),
-		CustomValue:   nil,
-		OverallStatus: "green",
-		ConfigStatus:  "green",
-		ConfigIssue:   nil,
-		EffectiveRole: []int32{-1},
-		Permission: []types.Permission{
-			{
-				DynamicData: types.DynamicData{},
-				Entity:      &types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-				Principal:   "vpxuser",
-				Group:       false,
-				RoleId:      -1,
-				Propagate:   true,
-			},
-			{
-				DynamicData: types.DynamicData{},
-				Entity:      &types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-				Principal:   "dcui",
-				Group:       false,
-				RoleId:      -1,
-				Propagate:   true,
-			},
-			{
-				DynamicData: types.DynamicData{},
-				Entity:      &types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-				Principal:   "root",
-				Group:       false,
-				RoleId:      -1,
-				Propagate:   true,
-			},
-		},
-		Name:                "ha-folder-root",
-		DisabledMethod:      nil,
-		RecentTask:          nil,
-		DeclaredAlarmState:  nil,
-		TriggeredAlarmState: nil,
-		AlarmActionsEnabled: (*bool)(nil),
-		Tag:                 nil,
-	},
-	ChildType:   []string{"Datacenter"},
-	ChildEntity: nil,
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/service_content.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/service_content.go
deleted file mode 100644
index 9c13cc0cc8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/service_content.go
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// ServiceContent is the default template for the ServiceInstance content property.
-// Capture method:
-//   govc object.collect -s -dump - content
-var ServiceContent = types.ServiceContent{
-	DynamicData:       types.DynamicData{},
-	RootFolder:        types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-	PropertyCollector: types.ManagedObjectReference{Type: "PropertyCollector", Value: "ha-property-collector"},
-	ViewManager:       &types.ManagedObjectReference{Type: "ViewManager", Value: "ViewManager"},
-	About: types.AboutInfo{
-		DynamicData:           types.DynamicData{},
-		Name:                  "VMware ESXi",
-		FullName:              "VMware ESXi 6.0.0 build-3620759",
-		Vendor:                "VMware, Inc.",
-		Version:               "6.0.0",
-		Build:                 "3620759",
-		LocaleVersion:         "INTL",
-		LocaleBuild:           "000",
-		OsType:                "vmnix-x86",
-		ProductLineId:         "embeddedEsx",
-		ApiType:               "HostAgent",
-		ApiVersion:            "6.0",
-		InstanceUuid:          "",
-		LicenseProductName:    "VMware ESX Server",
-		LicenseProductVersion: "6.0",
-	},
-	Setting:                   &types.ManagedObjectReference{Type: "OptionManager", Value: "HostAgentSettings"},
-	UserDirectory:             &types.ManagedObjectReference{Type: "UserDirectory", Value: "ha-user-directory"},
-	SessionManager:            &types.ManagedObjectReference{Type: "SessionManager", Value: "ha-sessionmgr"},
-	AuthorizationManager:      &types.ManagedObjectReference{Type: "AuthorizationManager", Value: "ha-authmgr"},
-	ServiceManager:            &types.ManagedObjectReference{Type: "ServiceManager", Value: "ha-servicemanager"},
-	PerfManager:               &types.ManagedObjectReference{Type: "PerformanceManager", Value: "ha-perfmgr"},
-	ScheduledTaskManager:      (*types.ManagedObjectReference)(nil),
-	AlarmManager:              (*types.ManagedObjectReference)(nil),
-	EventManager:              &types.ManagedObjectReference{Type: "EventManager", Value: "ha-eventmgr"},
-	TaskManager:               &types.ManagedObjectReference{Type: "TaskManager", Value: "ha-taskmgr"},
-	ExtensionManager:          (*types.ManagedObjectReference)(nil),
-	CustomizationSpecManager:  (*types.ManagedObjectReference)(nil),
-	CustomFieldsManager:       (*types.ManagedObjectReference)(nil),
-	AccountManager:            &types.ManagedObjectReference{Type: "HostLocalAccountManager", Value: "ha-localacctmgr"},
-	DiagnosticManager:         &types.ManagedObjectReference{Type: "DiagnosticManager", Value: "ha-diagnosticmgr"},
-	LicenseManager:            &types.ManagedObjectReference{Type: "LicenseManager", Value: "ha-license-manager"},
-	SearchIndex:               &types.ManagedObjectReference{Type: "SearchIndex", Value: "ha-searchindex"},
-	FileManager:               &types.ManagedObjectReference{Type: "FileManager", Value: "ha-nfc-file-manager"},
-	DatastoreNamespaceManager: &types.ManagedObjectReference{Type: "DatastoreNamespaceManager", Value: "ha-datastore-namespace-manager"},
-	VirtualDiskManager:        &types.ManagedObjectReference{Type: "VirtualDiskManager", Value: "ha-vdiskmanager"},
-	VirtualizationManager:     (*types.ManagedObjectReference)(nil),
-	SnmpSystem:                (*types.ManagedObjectReference)(nil),
-	VmProvisioningChecker:     (*types.ManagedObjectReference)(nil),
-	VmCompatibilityChecker:    (*types.ManagedObjectReference)(nil),
-	OvfManager:                &types.ManagedObjectReference{Type: "OvfManager", Value: "ha-ovf-manager"},
-	IpPoolManager:             (*types.ManagedObjectReference)(nil),
-	DvSwitchManager:           &types.ManagedObjectReference{Type: "DistributedVirtualSwitchManager", Value: "ha-dvsmanager"},
-	HostProfileManager:        (*types.ManagedObjectReference)(nil),
-	ClusterProfileManager:     (*types.ManagedObjectReference)(nil),
-	ComplianceManager:         (*types.ManagedObjectReference)(nil),
-	LocalizationManager:       &types.ManagedObjectReference{Type: "LocalizationManager", Value: "ha-l10n-manager"},
-	StorageResourceManager:    &types.ManagedObjectReference{Type: "StorageResourceManager", Value: "ha-storage-resource-manager"},
-	GuestOperationsManager:    &types.ManagedObjectReference{Type: "GuestOperationsManager", Value: "ha-guest-operations-manager"},
-	OverheadMemoryManager:     (*types.ManagedObjectReference)(nil),
-	CertificateManager:        (*types.ManagedObjectReference)(nil),
-	IoFilterManager:           (*types.ManagedObjectReference)(nil),
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/setting.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/setting.go
deleted file mode 100644
index 933eaa475d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/setting.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// Setting is captured from ESX's HostSystem.configManager.advancedOption
-// Capture method:
-//   govc object.collect -s -dump $(govc object.collect -s HostSystem:ha-host configManager.advancedOption) setting
-var Setting = []types.BaseOptionValue{
-	// This list is currently pruned to include a single option for testing
-	&types.OptionValue{
-		Key:   "Config.HostAgent.log.level",
-		Value: "info",
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go b/installer/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go
deleted file mode 100644
index 234113b453..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/esx/virtual_device.go
+++ /dev/null
@@ -1,242 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package esx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// VirtualDevice is the default set of VirtualDevice types created for a VirtualMachine
-// Capture method:
-//   govc vm.create foo
-//   govc object.collect -s -dump vm/foo config.hardware.device
-var VirtualDevice = []types.BaseVirtualDevice{
-	&types.VirtualIDEController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         200,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "IDE 0",
-					Summary:     "IDE 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    (*int32)(nil),
-			},
-			BusNumber: 0,
-			Device:    nil,
-		},
-	},
-	&types.VirtualIDEController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         201,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "IDE 1",
-					Summary:     "IDE 1",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    (*int32)(nil),
-			},
-			BusNumber: 1,
-			Device:    nil,
-		},
-	},
-	&types.VirtualPS2Controller{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         300,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "PS2 controller 0",
-					Summary:     "PS2 controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    (*int32)(nil),
-			},
-			BusNumber: 0,
-			Device:    []int32{600, 700},
-		},
-	},
-	&types.VirtualPCIController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         100,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "PCI controller 0",
-					Summary:     "PCI controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    (*int32)(nil),
-			},
-			BusNumber: 0,
-			Device:    []int32{500, 12000},
-		},
-	},
-	&types.VirtualSIOController{
-		VirtualController: types.VirtualController{
-			VirtualDevice: types.VirtualDevice{
-				DynamicData: types.DynamicData{},
-				Key:         400,
-				DeviceInfo: &types.Description{
-					DynamicData: types.DynamicData{},
-					Label:       "SIO controller 0",
-					Summary:     "SIO controller 0",
-				},
-				Backing:       nil,
-				Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-				SlotInfo:      nil,
-				ControllerKey: 0,
-				UnitNumber:    (*int32)(nil),
-			},
-			BusNumber: 0,
-			Device:    nil,
-		},
-	},
-	&types.VirtualKeyboard{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         600,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Keyboard ",
-				Summary:     "Keyboard",
-			},
-			Backing:       nil,
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 300,
-			UnitNumber:    types.NewInt32(0),
-		},
-	},
-	&types.VirtualPointingDevice{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         700,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Pointing device",
-				Summary:     "Pointing device; Device",
-			},
-			Backing: &types.VirtualPointingDeviceDeviceBackingInfo{
-				VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					DeviceName:               "",
-					UseAutoDetect:            types.NewBool(false),
-				},
-				HostPointingDevice: "autodetect",
-			},
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 300,
-			UnitNumber:    types.NewInt32(1),
-		},
-	},
-	&types.VirtualMachineVideoCard{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         500,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "Video card ",
-				Summary:     "Video card",
-			},
-			Backing:       nil,
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 100,
-			UnitNumber:    types.NewInt32(0),
-		},
-		VideoRamSizeInKB:       4096,
-		NumDisplays:            1,
-		UseAutoDetect:          types.NewBool(false),
-		Enable3DSupport:        types.NewBool(false),
-		Use3dRenderer:          "automatic",
-		GraphicsMemorySizeInKB: 262144,
-	},
-	&types.VirtualMachineVMCIDevice{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         12000,
-			DeviceInfo: &types.Description{
-				DynamicData: types.DynamicData{},
-				Label:       "VMCI device",
-				Summary:     "Device on the virtual machine PCI bus that provides support for the virtual machine communication interface",
-			},
-			Backing:       nil,
-			Connectable:   (*types.VirtualDeviceConnectInfo)(nil),
-			SlotInfo:      nil,
-			ControllerKey: 100,
-			UnitNumber:    types.NewInt32(17),
-		},
-		Id: -1,
-		AllowUnrestrictedCommunication: types.NewBool(false),
-		FilterEnable:                   types.NewBool(true),
-		FilterInfo:                     (*types.VirtualMachineVMCIDeviceFilterInfo)(nil),
-	},
-}
-
-// EthernetCard template for types.VirtualEthernetCard
-var EthernetCard = types.VirtualE1000{
-	VirtualEthernetCard: types.VirtualEthernetCard{
-		VirtualDevice: types.VirtualDevice{
-			DynamicData: types.DynamicData{},
-			Key:         4000,
-			Backing: &types.VirtualEthernetCardNetworkBackingInfo{
-				VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
-					VirtualDeviceBackingInfo: types.VirtualDeviceBackingInfo{},
-					DeviceName:               "VM Network",
-					UseAutoDetect:            types.NewBool(false),
-				},
-				Network:           (*types.ManagedObjectReference)(nil),
-				InPassthroughMode: types.NewBool(false),
-			},
-			Connectable: &types.VirtualDeviceConnectInfo{
-				DynamicData:       types.DynamicData{},
-				StartConnected:    true,
-				AllowGuestControl: true,
-				Connected:         false,
-				Status:            "untried",
-			},
-			SlotInfo: &types.VirtualDevicePciBusSlotInfo{
-				VirtualDeviceBusSlotInfo: types.VirtualDeviceBusSlotInfo{},
-				PciSlotNumber:            32,
-			},
-			ControllerKey: 100,
-			UnitNumber:    types.NewInt32(7),
-		},
-		AddressType:      "generated",
-		MacAddress:       "",
-		WakeOnLanEnabled: types.NewBool(true),
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/file_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/file_manager.go
deleted file mode 100644
index 26bb4a2522..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/file_manager.go
+++ /dev/null
@@ -1,257 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"io"
-	"os"
-	"path"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type FileManager struct {
-	mo.FileManager
-}
-
-func NewFileManager(ref types.ManagedObjectReference) object.Reference {
-	m := &FileManager{}
-	m.Self = ref
-	return m
-}
-
-func (f *FileManager) findDatastore(ref mo.Reference, name string) (*Datastore, types.BaseMethodFault) {
-	var refs []types.ManagedObjectReference
-
-	switch obj := ref.(type) {
-	case *Folder:
-		refs = obj.ChildEntity
-	case *StoragePod:
-		refs = obj.ChildEntity
-	}
-
-	for _, ref := range refs {
-		switch obj := Map.Get(ref).(type) {
-		case *Datastore:
-			if obj.Name == name {
-				return obj, nil
-			}
-		case *Folder, *StoragePod:
-			ds, _ := f.findDatastore(obj, name)
-			if ds != nil {
-				return ds, nil
-			}
-		}
-	}
-
-	return nil, &types.InvalidDatastore{Name: name}
-}
-
-func (f *FileManager) resolve(dc *types.ManagedObjectReference, name string) (string, types.BaseMethodFault) {
-	p, fault := parseDatastorePath(name)
-	if fault != nil {
-		return "", fault
-	}
-
-	if dc == nil {
-		if Map.IsESX() {
-			dc = &esx.Datacenter.Self
-		} else {
-			return "", &types.InvalidArgument{InvalidProperty: "dc"}
-		}
-	}
-
-	folder := Map.Get(*dc).(*mo.Datacenter).DatastoreFolder
-
-	ds, fault := f.findDatastore(Map.Get(folder), p.Datastore)
-	if fault != nil {
-		return "", fault
-	}
-
-	dir := ds.Info.GetDatastoreInfo().Url
-
-	return path.Join(dir, p.Path), nil
-}
-
-func (f *FileManager) fault(name string, err error, fault types.BaseFileFault) types.BaseMethodFault {
-	switch {
-	case os.IsNotExist(err):
-		fault = new(types.FileNotFound)
-	case os.IsExist(err):
-		fault = new(types.FileAlreadyExists)
-	}
-
-	fault.GetFileFault().File = name
-
-	return fault.(types.BaseMethodFault)
-}
-
-func (f *FileManager) deleteDatastoreFile(req *types.DeleteDatastoreFile_Task) types.BaseMethodFault {
-	file, fault := f.resolve(req.Datacenter, req.Name)
-	if fault != nil {
-		return fault
-	}
-
-	_, err := os.Stat(file)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return f.fault(file, err, new(types.CannotDeleteFile))
-		}
-	}
-
-	err = os.RemoveAll(file)
-	if err != nil {
-		return f.fault(file, err, new(types.CannotDeleteFile))
-	}
-
-	return nil
-}
-
-func (f *FileManager) DeleteDatastoreFileTask(req *types.DeleteDatastoreFile_Task) soap.HasFault {
-	task := CreateTask(f, "deleteDatastoreFile", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		return nil, f.deleteDatastoreFile(req)
-	})
-
-	task.Run()
-
-	return &methods.DeleteDatastoreFile_TaskBody{
-		Res: &types.DeleteDatastoreFile_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (f *FileManager) MakeDirectory(req *types.MakeDirectory) soap.HasFault {
-	body := &methods.MakeDirectoryBody{}
-
-	name, fault := f.resolve(req.Datacenter, req.Name)
-	if fault != nil {
-		body.Fault_ = Fault("", fault)
-		return body
-	}
-
-	mkdir := os.Mkdir
-
-	if isTrue(req.CreateParentDirectories) {
-		mkdir = os.MkdirAll
-	}
-
-	err := mkdir(name, 0700)
-	if err != nil {
-		fault = f.fault(req.Name, err, new(types.CannotCreateFile))
-		body.Fault_ = Fault(err.Error(), fault)
-		return body
-	}
-
-	return body
-}
-
-func (f *FileManager) moveDatastoreFile(req *types.MoveDatastoreFile_Task) types.BaseMethodFault {
-	src, fault := f.resolve(req.SourceDatacenter, req.SourceName)
-	if fault != nil {
-		return fault
-	}
-
-	dst, fault := f.resolve(req.DestinationDatacenter, req.DestinationName)
-	if fault != nil {
-		return fault
-	}
-
-	if !isTrue(req.Force) {
-		_, err := os.Stat(dst)
-		if err == nil {
-			return f.fault(dst, nil, new(types.FileAlreadyExistsFault))
-		}
-	}
-
-	err := os.Rename(src, dst)
-	if err != nil {
-		return f.fault(src, err, new(types.CannotAccessFile))
-	}
-
-	return nil
-}
-
-func (f *FileManager) MoveDatastoreFileTask(req *types.MoveDatastoreFile_Task) soap.HasFault {
-	task := CreateTask(f, "moveDatastoreFile", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		return nil, f.moveDatastoreFile(req)
-	})
-
-	task.Run()
-
-	return &methods.MoveDatastoreFile_TaskBody{
-		Res: &types.MoveDatastoreFile_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (f *FileManager) copyDatastoreFile(req *types.CopyDatastoreFile_Task) types.BaseMethodFault {
-	src, fault := f.resolve(req.SourceDatacenter, req.SourceName)
-	if fault != nil {
-		return fault
-	}
-
-	dst, fault := f.resolve(req.DestinationDatacenter, req.DestinationName)
-	if fault != nil {
-		return fault
-	}
-
-	if !isTrue(req.Force) {
-		_, err := os.Stat(dst)
-		if err == nil {
-			return f.fault(dst, nil, new(types.FileAlreadyExistsFault))
-		}
-	}
-
-	r, err := os.Open(src)
-	if err != nil {
-		return f.fault(dst, err, new(types.CannotAccessFile))
-	}
-	defer r.Close()
-
-	w, err := os.Create(dst)
-	if err != nil {
-		return f.fault(dst, err, new(types.CannotCreateFile))
-	}
-	defer w.Close()
-
-	if _, err = io.Copy(w, r); err != nil {
-		return f.fault(dst, err, new(types.CannotCreateFile))
-	}
-
-	return nil
-}
-
-func (f *FileManager) CopyDatastoreFileTask(req *types.CopyDatastoreFile_Task) soap.HasFault {
-	task := CreateTask(f, "copyDatastoreFile", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		return nil, f.copyDatastoreFile(req)
-	})
-
-	task.Run()
-
-	return &methods.CopyDatastoreFile_TaskBody{
-		Res: &types.CopyDatastoreFile_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/finder_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/finder_test.go
deleted file mode 100644
index 8e90a0358f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/finder_test.go
+++ /dev/null
@@ -1,220 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-)
-
-func TestFinderVPX(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-	m.Datacenter = 3
-	m.Folder = 2
-	m.Pool = 1
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	client, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(client.Client, false)
-	dc, _ := finder.Datacenter(ctx, "/F0/DC1")
-	finder.SetDatacenter(dc)
-
-	tests := []struct {
-		kind   string
-		path   string
-		expect int
-	}{
-		{"ManagedObjectList", "./*", 4},       // /F0/DC1/{vm,host,network,datastore}
-		{"ManagedObjectListChildren", ".", 4}, // ""
-		{"ManagedObjectList", "/", 1},
-		{"ManagedObjectList", "/*", m.Datacenter - m.Folder + m.Folder},
-		{"ManagedObjectList", "/DC0", 1},
-		{"ManagedObjectList", "/F[01]", 2},
-		{"ManagedObjectListChildren", "/*", m.Datacenter + 3},
-		{"ManagedObjectListChildren", "/*/*", 18},
-		{"ManagedObjectListChildren", "/*/*/*", 24},
-		{"FolderList", "/*", m.Folder},
-		{"DatacenterList", "/F0/*", 1},
-		{"DatacenterList", "/DC0", 1},
-		{"VirtualMachineList", "/DC0/vm/*", (m.Host + m.Cluster) * m.Machine},
-		{"VirtualMachineList", "F0/DC1_C0_RP0_VM0", 1},
-		{"VirtualMachineList", "./DC1_C0_RP0_VM0", 0},
-		{"VirtualMachineList", "DC1_C0_RP0_VM0", 1}, // find . -type VirtualMachine -name DC1_C0_RP0_VM0
-		{"VirtualAppList", "/DC0/vm/*", 0},
-		{"DatastoreList", "/DC0/datastore/*", m.Datastore},
-		{"DatastoreList", "./*", 0},
-		{"DatastoreList", "./F0/*", m.Datastore},
-		{"DatastoreList", "/F*/*/datastore/F*/*", m.Datastore * m.Folder},
-		{"DatastoreList", "/F0/DC1/datastore/F0/LocalDS_0", m.Datastore},
-		{"DatastoreList", "/F0/DC1/datastore/F0/*", m.Datastore},
-		{"DatastoreList", "/F1/DC2/datastore/F1/*", m.Datastore},
-		{"DatastoreList", "./LocalDS_0", 0},
-		{"DatastoreList", "LocalDS_0", 1}, // find . -type Datastore -name LocalDS_0
-		{"DatastoreClusterList", "/DC0/datastore/*", 0},
-		{"ComputeResourceList", "/DC0/host/*", m.Host + m.Cluster},
-		{"ClusterComputeResourceList", "/DC0/host/*", m.Cluster},
-		{"HostSystemList", "/DC0/host/*", m.Host + m.ClusterHost},
-		{"HostSystemList", "/F0/DC1/host/F0/*", m.Host + m.ClusterHost},
-		{"HostSystemList", "DC1_H0", 1},             // find . -type HostSystem -name DC1_H0
-		{"ComputeResourceList", "DC1_H0", 1},        // find . -type ComputeResource -name DC1_H0
-		{"ClusterComputeResourceList", "DC1_C0", 1}, // find . -type ClusterComputeResource -name DC1_H0
-		{"NetworkList", "/DC0/network/*", 2 + m.Portgroup},
-		{"NetworkList", "./*", 1},
-		{"NetworkList", "/F0/DC1/network/VM Network", 1},
-		{"NetworkList", "/F0/DC1/network/F0/*", 1 + m.Portgroup},
-		{"NetworkList", "./F0/DC1_DVPG0", 1},
-		{"NetworkList", "./F0/DC1_DVPG0", 1},
-		{"NetworkList", "DC1_DVPG0", 1}, // find . -type Network -name DC1_DVPG0
-		{"ResourcePoolList", "/F0/DC1/host/F0/*", m.Host + m.Cluster},
-		{"ResourcePoolList", "/F0/DC1/host/F0/*/*", m.Host + m.Cluster},
-		{"ResourcePoolList", "/DC0/host/*", m.Host + m.Cluster},
-		{"ResourcePoolList", "/DC0/host/*/*", m.Host + m.Cluster},
-		{"ResourcePoolList", "/DC0/host/DC0_H0/Resources", 1},
-		{"ResourcePoolList", "/F1/DC2/host/F1/DC2_C0/Resources", 1},
-		{"ResourcePoolList", "Resources", m.Host + m.Cluster},                // find . -type ResourcePool -name Resources
-		{"ResourcePoolList", "/F1/DC2/...", m.Pool + m.Host + 1},             // find $path -type ResourcePool
-		{"ResourcePoolList", "/F1/DC2/host/...", m.Pool + m.Host + 1},        // find $path -type ResourcePool
-		{"ResourcePoolList", "/F1/DC2/host/F1/...", m.Pool + m.Host + 1},     // find $path -type ResourcePool
-		{"ResourcePoolList", "/F1/DC2/host/F1/DC2_C0/...", m.Pool + 1},       // find $path -type ResourcePool
-		{"ResourcePoolList", "/F1/DC2/host/F1/DC2_C0/Resources/...", m.Pool}, // find $path -type ResourcePool
-		{"ResourcePoolList", "F0/DC1_C0", 1},
-		{"ResourcePoolList", "DC1_C0_RP1", 1},     // find . -type ResourcePool -name DC1_C0_RP1
-		{"", "", 0},                               // unset Datacenter
-		{"DatacenterList", "*", m.Datacenter},     // find . -type Datacenter
-		{"DatacenterList", "./...", m.Datacenter}, // find . -type Datacenter
-		{"DatacenterList", "DC2", 1},              // find . -type Datacenter -name DC2
-		{"DatacenterList", "/*", m.Datacenter - m.Folder},
-		{"DatacenterList", "/*/*", m.Folder},
-		{"DatastoreList", "/F1/DC2/datastore/F1/LocalDS_0", 1},
-		{"VirtualMachineList", "DC1_C0_RP0_VM0", 0}, // TODO: recurse all Datacenters?
-	}
-
-	f := reflect.ValueOf(finder)
-	c := reflect.ValueOf(ctx)
-
-	for i, test := range tests {
-		if test.kind == "" {
-			finder.SetDatacenter(nil)
-			continue
-		}
-
-		err = nil
-
-		arg := []reflect.Value{c, reflect.ValueOf(test.path)}
-		res := f.MethodByName(test.kind).Call(arg)
-
-		rval := res[0]
-		rerr := res[1]
-
-		if rval.Len() != test.expect {
-			msg := fmt.Sprintf("expected %d, got %d", test.expect, rval.Len())
-			if !rerr.IsNil() {
-				msg += fmt.Sprintf(" (%s)", rerr.Interface())
-			}
-			err = errors.New(msg)
-
-			if !rval.IsNil() {
-				for j := 0; j < rval.Len(); j++ {
-					t.Logf("%s\n", rval.Index(j).Interface())
-				}
-			}
-		} else if !rerr.IsNil() {
-			if test.expect != 0 {
-				err = rerr.Interface().(error)
-			}
-		}
-
-		if err != nil {
-			t.Errorf("%d) %s(%s): %s", i, test.kind, test.path, err)
-		}
-	}
-}
-
-func TestFinderESX(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	client, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(client.Client, false)
-
-	dc, err := finder.DefaultDatacenter(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder.SetDatacenter(dc)
-
-	f := reflect.ValueOf(finder)
-	c := reflect.ValueOf(ctx)
-
-	tests := []string{"Folder", "Datastore", "ComputeResource", "HostSystem", "Datastore", "Network"}
-
-	for _, test := range tests {
-		res := f.MethodByName("Default" + test).Call([]reflect.Value{c})
-		if !res[1].IsNil() {
-			t.Fatalf("%s: %s", test, res[1].Interface())
-		}
-
-		// test find by moref
-		ref := res[0].Interface().(object.Reference).Reference()
-		o, err := finder.Element(ctx, ref)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if o.Object.Reference() != ref {
-			t.Errorf("%s", ref)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/folder.go b/installer/vendor/github.com/vmware/govmomi/simulator/folder.go
deleted file mode 100644
index be89bc4d00..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/folder.go
+++ /dev/null
@@ -1,491 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"math/rand"
-	"path"
-	"sync"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Folder struct {
-	mo.Folder
-
-	m sync.Mutex
-}
-
-// update references when objects are added/removed from a Folder
-func (f *Folder) update(o mo.Reference, u func(types.ManagedObjectReference, []types.ManagedObjectReference) []types.ManagedObjectReference) {
-	ref := o.Reference()
-
-	if f.Parent == nil {
-		return // this is the root folder
-	}
-
-	switch ref.Type {
-	case "Datacenter", "Folder":
-		return // nothing to update
-	}
-
-	dc := Map.getEntityDatacenter(f)
-
-	switch ref.Type {
-	case "Network", "DistributedVirtualSwitch", "DistributedVirtualPortgroup":
-		dc.Network = u(ref, dc.Network)
-	case "Datastore":
-		dc.Datastore = u(ref, dc.Datastore)
-	}
-}
-
-func networkSummary(n *mo.Network) *types.NetworkSummary {
-	return &types.NetworkSummary{
-		Network:    &n.Self,
-		Name:       n.Name,
-		Accessible: true,
-	}
-}
-
-func (f *Folder) putChild(o mo.Entity) {
-	Map.PutEntity(f, o)
-
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	f.ChildEntity = AddReference(o.Reference(), f.ChildEntity)
-
-	f.update(o, AddReference)
-
-	switch e := o.(type) {
-	case *mo.Network:
-		e.Summary = networkSummary(e)
-	case *mo.OpaqueNetwork:
-		e.Summary = networkSummary(&e.Network)
-	case *DistributedVirtualPortgroup:
-		e.Summary = networkSummary(&e.Network)
-	}
-}
-
-func (f *Folder) removeChild(o mo.Reference) {
-	Map.Remove(o.Reference())
-
-	f.m.Lock()
-	defer f.m.Unlock()
-
-	f.ChildEntity = RemoveReference(o.Reference(), f.ChildEntity)
-
-	f.update(o, RemoveReference)
-}
-
-func (f *Folder) hasChildType(kind string) bool {
-	for _, t := range f.ChildType {
-		if t == kind {
-			return true
-		}
-	}
-	return false
-}
-
-func (f *Folder) typeNotSupported() *soap.Fault {
-	return Fault(fmt.Sprintf("%s supports types: %#v", f.Self, f.ChildType), &types.NotSupported{})
-}
-
-type addStandaloneHost struct {
-	*Folder
-
-	req *types.AddStandaloneHost_Task
-}
-
-func (add *addStandaloneHost) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	host, err := CreateStandaloneHost(add.Folder, add.req.Spec)
-	if err != nil {
-		return nil, err
-	}
-
-	if add.req.AddConnected {
-		host.Runtime.ConnectionState = types.HostSystemConnectionStateConnected
-	}
-
-	return host.Reference(), nil
-}
-
-func (f *Folder) AddStandaloneHostTask(a *types.AddStandaloneHost_Task) soap.HasFault {
-	r := &methods.AddStandaloneHost_TaskBody{}
-
-	if f.hasChildType("ComputeResource") && f.hasChildType("Folder") {
-		task := NewTask(&addStandaloneHost{f, a})
-
-		r.Res = &types.AddStandaloneHost_TaskResponse{
-			Returnval: task.Self,
-		}
-
-		task.Run()
-	} else {
-		r.Fault_ = f.typeNotSupported()
-	}
-
-	return r
-}
-
-func (f *Folder) CreateFolder(c *types.CreateFolder) soap.HasFault {
-	r := &methods.CreateFolderBody{}
-
-	if f.hasChildType("Folder") {
-		folder := &Folder{}
-
-		folder.Name = c.Name
-		folder.ChildType = f.ChildType
-
-		f.putChild(folder)
-
-		r.Res = &types.CreateFolderResponse{
-			Returnval: folder.Self,
-		}
-	} else {
-		r.Fault_ = f.typeNotSupported()
-	}
-
-	return r
-}
-
-// StoragePod aka "Datastore Cluster"
-type StoragePod struct {
-	mo.StoragePod
-}
-
-func (f *Folder) CreateStoragePod(c *types.CreateStoragePod) soap.HasFault {
-	r := &methods.CreateStoragePodBody{}
-
-	if f.hasChildType("StoragePod") {
-		pod := &StoragePod{}
-
-		pod.Name = c.Name
-		pod.ChildType = []string{"Datastore"}
-
-		f.putChild(pod)
-
-		r.Res = &types.CreateStoragePodResponse{
-			Returnval: pod.Self,
-		}
-	} else {
-		r.Fault_ = f.typeNotSupported()
-	}
-
-	return r
-}
-
-func (p *StoragePod) MoveIntoFolderTask(c *types.MoveIntoFolder_Task) soap.HasFault {
-	return (&Folder{Folder: p.Folder}).MoveIntoFolderTask(c)
-}
-
-func (f *Folder) CreateDatacenter(c *types.CreateDatacenter) soap.HasFault {
-	r := &methods.CreateDatacenterBody{}
-
-	if f.hasChildType("Datacenter") && f.hasChildType("Folder") {
-		dc := &mo.Datacenter{}
-
-		dc.Name = c.Name
-
-		f.putChild(dc)
-
-		createDatacenterFolders(dc, true)
-
-		r.Res = &types.CreateDatacenterResponse{
-			Returnval: dc.Self,
-		}
-	} else {
-		r.Fault_ = f.typeNotSupported()
-	}
-
-	return r
-}
-
-func (f *Folder) CreateClusterEx(c *types.CreateClusterEx) soap.HasFault {
-	r := &methods.CreateClusterExBody{}
-
-	if f.hasChildType("ComputeResource") && f.hasChildType("Folder") {
-		cluster, err := CreateClusterComputeResource(f, c.Name, c.Spec)
-		if err != nil {
-			r.Fault_ = Fault("", err)
-			return r
-		}
-
-		r.Res = &types.CreateClusterExResponse{
-			Returnval: cluster.Self,
-		}
-	} else {
-		r.Fault_ = f.typeNotSupported()
-	}
-
-	return r
-}
-
-type createVM struct {
-	*Folder
-
-	req *types.CreateVM_Task
-
-	register bool
-}
-
-func (c *createVM) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	vm, err := NewVirtualMachine(c.Folder.Self, &c.req.Config)
-	if err != nil {
-		return nil, err
-	}
-
-	vm.ResourcePool = &c.req.Pool
-
-	if c.req.Host == nil {
-		var hosts []types.ManagedObjectReference
-
-		pool := Map.Get(c.req.Pool).(mo.Entity)
-
-		switch cr := Map.getEntityComputeResource(pool).(type) {
-		case *mo.ComputeResource:
-			hosts = cr.Host
-		case *ClusterComputeResource:
-			hosts = cr.Host
-		}
-
-		// Assuming for now that all hosts have access to the datastore
-		host := hosts[rand.Intn(len(hosts))]
-		vm.Runtime.Host = &host
-	} else {
-		vm.Runtime.Host = c.req.Host
-	}
-
-	vm.Guest = &types.GuestInfo{
-		ToolsStatus:  types.VirtualMachineToolsStatusToolsNotInstalled,
-		ToolsVersion: "0",
-	}
-
-	vm.Summary.Guest = &types.VirtualMachineGuestSummary{
-		ToolsStatus: vm.Guest.ToolsStatus,
-	}
-	vm.Summary.Config.VmPathName = vm.Config.Files.VmPathName
-	vm.Summary.Runtime.Host = vm.Runtime.Host
-
-	err = vm.create(&c.req.Config, c.register)
-	if err != nil {
-		return nil, err
-	}
-
-	c.Folder.putChild(vm)
-
-	host := Map.Get(*vm.Runtime.Host).(*HostSystem)
-	host.Vm = append(host.Vm, vm.Self)
-
-	for i := range vm.Datastore {
-		ds := Map.Get(vm.Datastore[i]).(*Datastore)
-		ds.Vm = append(ds.Vm, vm.Self)
-	}
-
-	switch rp := Map.Get(*vm.ResourcePool).(type) {
-	case *ResourcePool:
-		rp.Vm = append(rp.Vm, vm.Self)
-	case *VirtualApp:
-		rp.Vm = append(rp.Vm, vm.Self)
-	}
-
-	return vm.Reference(), nil
-}
-
-func (f *Folder) CreateVMTask(c *types.CreateVM_Task) soap.HasFault {
-	r := &methods.CreateVM_TaskBody{}
-
-	task := NewTask(&createVM{f, c, false})
-
-	r.Res = &types.CreateVM_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-type registerVM struct {
-	*Folder
-
-	req *types.RegisterVM_Task
-}
-
-func (c *registerVM) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	host := c.req.Host
-	pool := c.req.Pool
-
-	if c.req.AsTemplate {
-		if host == nil {
-			return nil, &types.InvalidArgument{InvalidProperty: "host"}
-		} else if pool != nil {
-			return nil, &types.InvalidArgument{InvalidProperty: "pool"}
-		}
-
-		pool = hostParent(&Map.Get(*host).(*HostSystem).HostSystem).ResourcePool
-	} else {
-		if pool == nil {
-			return nil, &types.InvalidArgument{InvalidProperty: "pool"}
-		}
-	}
-
-	if c.req.Path == "" {
-		return nil, &types.InvalidArgument{InvalidProperty: "path"}
-	}
-
-	s := Map.SearchIndex()
-	r := s.FindByDatastorePath(&types.FindByDatastorePath{
-		This:       s.Reference(),
-		Path:       c.req.Path,
-		Datacenter: Map.getEntityDatacenter(c.Folder).Reference(),
-	})
-
-	if ref := r.(*methods.FindByDatastorePathBody).Res.Returnval; ref != nil {
-		return nil, &types.AlreadyExists{Name: ref.Value}
-	}
-
-	if c.req.Name == "" {
-		p, err := parseDatastorePath(c.req.Path)
-		if err != nil {
-			return nil, err
-		}
-
-		c.req.Name = path.Dir(p.Path)
-	}
-
-	create := NewTask(&createVM{
-		Folder:   c.Folder,
-		register: true,
-		req: &types.CreateVM_Task{
-			This: c.Folder.Reference(),
-			Config: types.VirtualMachineConfigSpec{
-				Name: c.req.Name,
-				Files: &types.VirtualMachineFileInfo{
-					VmPathName: c.req.Path,
-				},
-			},
-			Pool: *pool,
-			Host: host,
-		},
-	})
-
-	create.Run()
-
-	if create.Info.Error != nil {
-		return nil, create.Info.Error.Fault
-	}
-
-	return create.Info.Result, nil
-}
-
-func (f *Folder) RegisterVMTask(c *types.RegisterVM_Task) soap.HasFault {
-	r := &methods.RegisterVM_TaskBody{}
-
-	task := NewTask(&registerVM{f, c})
-
-	r.Res = &types.RegisterVM_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-func (f *Folder) MoveIntoFolderTask(c *types.MoveIntoFolder_Task) soap.HasFault {
-	task := CreateTask(f, "moveIntoFolder", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		for _, ref := range c.List {
-			obj := Map.Get(ref).(mo.Entity)
-
-			parent, ok := Map.Get(*(obj.Entity()).Parent).(*Folder)
-
-			if !ok || !f.hasChildType(ref.Type) {
-				return nil, &types.NotSupported{}
-			}
-
-			parent.removeChild(ref)
-			f.putChild(obj)
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.MoveIntoFolder_TaskBody{
-		Res: &types.MoveIntoFolder_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (f *Folder) CreateDVSTask(req *types.CreateDVS_Task) soap.HasFault {
-	task := CreateTask(f, "createDVS", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		spec := req.Spec.ConfigSpec.GetDVSConfigSpec()
-		dvs := &DistributedVirtualSwitch{}
-		dvs.Name = spec.Name
-		dvs.Entity().Name = dvs.Name
-
-		if Map.FindByName(dvs.Name, f.ChildEntity) != nil {
-			return nil, &types.InvalidArgument{InvalidProperty: "name"}
-		}
-
-		dvs.Uuid = uuid.New().String()
-
-		f.putChild(dvs)
-
-		dvs.Summary = types.DVSSummary{
-			Name:        dvs.Name,
-			Uuid:        dvs.Uuid,
-			NumPorts:    spec.NumStandalonePorts,
-			ProductInfo: req.Spec.ProductInfo,
-			Description: spec.Description,
-		}
-
-		if dvs.Summary.ProductInfo == nil {
-			product := Map.content().About
-			dvs.Summary.ProductInfo = &types.DistributedVirtualSwitchProductSpec{
-				Name:            "DVS",
-				Vendor:          product.Vendor,
-				Version:         product.Version,
-				Build:           product.Build,
-				ForwardingClass: "etherswitch",
-			}
-		}
-
-		return dvs.Reference(), nil
-	})
-
-	task.Run()
-
-	return &methods.CreateDVS_TaskBody{
-		Res: &types.CreateDVS_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (f *Folder) RenameTask(r *types.Rename_Task) soap.HasFault {
-	return RenameTask(f, r)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/folder_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/folder_test.go
deleted file mode 100644
index 1bdd8947fe..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/folder_test.go
+++ /dev/null
@@ -1,565 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func addStandaloneHostTask(folder *object.Folder, spec types.HostConnectSpec) (*object.Task, error) {
-	// TODO: add govmomi wrapper
-	req := types.AddStandaloneHost_Task{
-		This:         folder.Reference(),
-		Spec:         spec,
-		AddConnected: true,
-	}
-
-	res, err := methods.AddStandaloneHost_Task(context.TODO(), folder.Client(), &req)
-	if err != nil {
-		return nil, err
-	}
-
-	task := object.NewTask(folder.Client(), res.Returnval)
-	return task, nil
-}
-
-func TestFolderESX(t *testing.T) {
-	content := esx.ServiceContent
-	s := New(NewServiceInstance(content, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f := object.NewRootFolder(c.Client)
-
-	_, err = f.CreateFolder(ctx, "foo")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	_, err = f.CreateDatacenter(ctx, "foo")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	finder := find.NewFinder(c.Client, false)
-	dc, err := finder.DatacenterOrDefault(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	spec := types.HostConnectSpec{}
-	_, err = addStandaloneHostTask(folders.HostFolder, spec)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	_, err = folders.DatastoreFolder.CreateStoragePod(ctx, "pod")
-	if err == nil {
-		t.Fatal("expected error")
-	}
-}
-
-func TestFolderVC(t *testing.T) {
-	content := vpx.ServiceContent
-	s := New(NewServiceInstance(content, vpx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	f := object.NewRootFolder(c.Client)
-
-	ff, err := f.CreateFolder(ctx, "foo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	dc, err := f.CreateDatacenter(ctx, "bar")
-	if err != nil {
-		t.Error(err)
-	}
-
-	for _, ref := range []object.Reference{ff, dc} {
-		o := Map.Get(ref.Reference())
-		if o == nil {
-			t.Fatalf("failed to find %#v", ref)
-		}
-
-		e := o.(mo.Entity).Entity()
-		if *e.Parent != f.Reference() {
-			t.Fail()
-		}
-	}
-
-	dc, err = ff.CreateDatacenter(ctx, "biz")
-	if err != nil {
-		t.Error(err)
-	}
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = folders.VmFolder.CreateStoragePod(ctx, "pod")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	_, err = folders.DatastoreFolder.CreateStoragePod(ctx, "pod")
-	if err != nil {
-		t.Error(err)
-	}
-
-	tests := []struct {
-		name  string
-		state types.TaskInfoState
-	}{
-		{"", types.TaskInfoStateError},
-		{"foo.local", types.TaskInfoStateSuccess},
-	}
-
-	for _, test := range tests {
-		spec := types.HostConnectSpec{
-			HostName: test.name,
-		}
-
-		task, err := addStandaloneHostTask(folders.HostFolder, spec)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		res, err := task.WaitForResult(ctx, nil)
-		if test.state == types.TaskInfoStateError {
-			if err == nil {
-				t.Error("expected error")
-			}
-
-			if res.Result != nil {
-				t.Error("expected nil")
-			}
-		} else {
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			ref, ok := res.Result.(types.ManagedObjectReference)
-			if !ok {
-				t.Errorf("expected moref, got type=%T", res.Result)
-			}
-			host := Map.Get(ref).(*HostSystem)
-			if host.Name != test.name {
-				t.Fail()
-			}
-
-			if ref == esx.HostSystem.Self {
-				t.Error("expected new host Self reference")
-			}
-
-			pool := Map.Get(*host.Parent).(*mo.ComputeResource).ResourcePool
-			if *pool == esx.ResourcePool.Self {
-				t.Error("expected new pool Self reference")
-			}
-		}
-
-		if res.State != test.state {
-			t.Fatalf("%s", res.State)
-		}
-	}
-}
-
-func TestFolderFaults(t *testing.T) {
-	f := Folder{}
-	f.ChildType = []string{"VirtualMachine"}
-
-	if f.CreateFolder(nil).Fault() == nil {
-		t.Error("expected fault")
-	}
-
-	if f.CreateDatacenter(nil).Fault() == nil {
-		t.Error("expected fault")
-	}
-}
-
-func TestRegisterVm(t *testing.T) {
-	ctx := context.Background()
-
-	for i, model := range []*Model{ESX(), VPX()} {
-		match := "*"
-		if i == 1 {
-			model.App = 1
-			match = "*APP*"
-		}
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		c, err := govmomi.NewClient(ctx, s.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder := find.NewFinder(c.Client, false)
-		dc, err := finder.DefaultDatacenter(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder.SetDatacenter(dc)
-
-		folders, err := dc.Folders(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		vmFolder := folders.VmFolder
-
-		vms, err := finder.VirtualMachineList(ctx, match)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		vm := Map.Get(vms[0].Reference()).(*VirtualMachine)
-
-		req := types.RegisterVM_Task{
-			This:       vmFolder.Reference(),
-			AsTemplate: true,
-		}
-
-		steps := []struct {
-			e interface{}
-			f func()
-		}{
-			{
-				new(types.InvalidArgument), func() { req.AsTemplate = false },
-			},
-			{
-				new(types.InvalidArgument), func() { req.Pool = vm.ResourcePool },
-			},
-			{
-				new(types.InvalidArgument), func() { req.Path = "enoent" },
-			},
-			{
-				new(types.InvalidDatastorePath), func() { req.Path = vm.Config.Files.VmPathName + "-enoent" },
-			},
-			{
-				new(types.NotFound), func() { req.Path = vm.Config.Files.VmPathName },
-			},
-			{
-				new(types.AlreadyExists), func() { Map.Remove(vm.Reference()) },
-			},
-			{
-				nil, func() {},
-			},
-		}
-
-		for _, step := range steps {
-			res, err := methods.RegisterVM_Task(ctx, c.Client, &req)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			rt := Map.Get(res.Returnval).(*Task)
-
-			if step.e != nil {
-				fault := rt.Info.Error.Fault
-				if reflect.TypeOf(fault) != reflect.TypeOf(step.e) {
-					t.Errorf("%T != %T", fault, step.e)
-				}
-			} else {
-				if rt.Info.Error != nil {
-					t.Errorf("unexpected error: %#v", rt.Info.Error)
-				}
-			}
-
-			step.f()
-		}
-
-		nvm, err := finder.VirtualMachine(ctx, vm.Name)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if nvm.Reference() == vm.Reference() {
-			t.Error("expected new moref")
-		}
-
-		_, _ = nvm.PowerOn(ctx)
-
-		steps = []struct {
-			e interface{}
-			f func()
-		}{
-			{
-				types.InvalidPowerState{}, func() { _, _ = nvm.PowerOff(ctx) },
-			},
-			{
-				nil, func() {},
-			},
-			{
-				types.ManagedObjectNotFound{}, func() {},
-			},
-		}
-
-		for _, step := range steps {
-			err = nvm.Unregister(ctx)
-
-			if step.e != nil {
-				fault := soap.ToSoapFault(err).VimFault()
-				if reflect.TypeOf(fault) != reflect.TypeOf(step.e) {
-					t.Errorf("%T != %T", fault, step.e)
-				}
-			} else {
-				if err != nil {
-					t.Errorf("unexpected error: %#v", err)
-				}
-			}
-
-			step.f()
-		}
-	}
-}
-
-func TestFolderMoveInto(t *testing.T) {
-	content := vpx.ServiceContent
-	s := New(NewServiceInstance(content, vpx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	model := VPX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(c.Client, false)
-
-	dc, err := finder.DefaultDatacenter(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder.SetDatacenter(dc)
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ds, err := finder.DefaultDatastore(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Move Datastore into a vm folder should fail
-	task, err := folders.VmFolder.MoveInto(ctx, []types.ManagedObjectReference{ds.Reference()})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err == nil {
-		t.Errorf("expected error")
-	}
-
-	// Move Datacenter into a sub folder should pass
-	f, err := object.NewRootFolder(c.Client).CreateFolder(ctx, "foo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	task, _ = f.MoveInto(ctx, []types.ManagedObjectReference{dc.Reference()})
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pod, err := folders.DatastoreFolder.CreateStoragePod(ctx, "pod")
-	if err != nil {
-		t.Error(err)
-	}
-
-	// Moving any type other than Datastore into a StoragePod should fail
-	task, _ = pod.MoveInto(ctx, []types.ManagedObjectReference{dc.Reference()})
-	err = task.Wait(ctx)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// Move DS into a StoragePod
-	task, _ = pod.MoveInto(ctx, []types.ManagedObjectReference{ds.Reference()})
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestFolderCreateDVS(t *testing.T) {
-	content := vpx.ServiceContent
-	s := New(NewServiceInstance(content, vpx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	model := VPX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ctx := context.Background()
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(c.Client, false)
-
-	dc, err := finder.DefaultDatacenter(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder.SetDatacenter(dc)
-
-	folders, err := dc.Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var spec types.DVSCreateSpec
-	spec.ConfigSpec = &types.VMwareDVSConfigSpec{}
-	spec.ConfigSpec.GetDVSConfigSpec().Name = "foo"
-
-	task, err := folders.NetworkFolder.CreateDVS(ctx, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Error(err)
-	}
-
-	net, err := finder.Network(ctx, "foo")
-	if err != nil {
-		t.Error(err)
-	}
-
-	dvs, ok := net.(*object.DistributedVirtualSwitch)
-	if !ok {
-		t.Fatalf("%T is not of type %T", net, dvs)
-	}
-
-	task, err = folders.NetworkFolder.CreateDVS(ctx, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	pspec := types.DVPortgroupConfigSpec{Name: "xnet"}
-	task, err = dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{pspec})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Error(err)
-	}
-
-	net, err = finder.Network(ctx, "xnet")
-	if err != nil {
-		t.Error(err)
-	}
-
-	pg, ok := net.(*object.DistributedVirtualPortgroup)
-	if !ok {
-		t.Fatalf("%T is not of type %T", net, pg)
-	}
-
-	backing, err := net.EthernetCardBackingInfo(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	info, ok := backing.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo)
-	if ok {
-		if info.Port.SwitchUuid == "" || info.Port.PortgroupKey == "" {
-			t.Errorf("invalid port: %#v", info.Port)
-		}
-	} else {
-		t.Fatalf("%T is not of type %T", net, info)
-	}
-
-	task, err = dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{pspec})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err == nil {
-		t.Error("expected error")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_browser.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_browser.go
deleted file mode 100644
index d7e9ad7c67..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_browser.go
+++ /dev/null
@@ -1,258 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"strings"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HostDatastoreBrowser struct {
-	mo.HostDatastoreBrowser
-}
-
-type searchDatastore struct {
-	*HostDatastoreBrowser
-
-	DatastorePath string
-	SearchSpec    *types.HostDatastoreBrowserSearchSpec
-
-	res []types.HostDatastoreBrowserSearchResults
-
-	recurse bool
-}
-
-func (s *searchDatastore) addFile(file os.FileInfo, res *types.HostDatastoreBrowserSearchResults) {
-	details := s.SearchSpec.Details
-	if details == nil {
-		details = new(types.FileQueryFlags)
-	}
-
-	name := file.Name()
-
-	info := types.FileInfo{
-		Path: name,
-	}
-
-	var finfo types.BaseFileInfo = &info
-
-	if details.FileSize {
-		info.FileSize = file.Size()
-	}
-
-	if details.Modification {
-		mtime := file.ModTime()
-		info.Modification = &mtime
-	}
-
-	if isTrue(details.FileOwner) {
-		// Assume for now this process created all files in the datastore
-		user := os.Getenv("USER")
-
-		info.Owner = user
-	}
-
-	if file.IsDir() {
-		finfo = &types.FolderFileInfo{FileInfo: info}
-	} else if details.FileType {
-		switch path.Ext(name) {
-		case ".img":
-			finfo = &types.FloppyImageFileInfo{FileInfo: info}
-		case ".iso":
-			finfo = &types.IsoImageFileInfo{FileInfo: info}
-		case ".log":
-			finfo = &types.VmLogFileInfo{FileInfo: info}
-		case ".nvram":
-			finfo = &types.VmNvramFileInfo{FileInfo: info}
-		case ".vmdk":
-			// TODO: lookup device to set other fields
-			finfo = &types.VmDiskFileInfo{FileInfo: info}
-		case ".vmx":
-			finfo = &types.VmConfigFileInfo{FileInfo: info}
-		}
-	}
-
-	res.File = append(res.File, finfo)
-}
-
-func (s *searchDatastore) queryMatch(file os.FileInfo) bool {
-	if len(s.SearchSpec.Query) == 0 {
-		return true
-	}
-
-	name := file.Name()
-	ext := path.Ext(name)
-
-	for _, q := range s.SearchSpec.Query {
-		switch q.(type) {
-		case *types.FileQuery:
-			return true
-		case *types.FolderFileQuery:
-			if file.IsDir() {
-				return true
-			}
-		case *types.FloppyImageFileQuery:
-			if ext == ".img" {
-				return true
-			}
-		case *types.IsoImageFileQuery:
-			if ext == ".iso" {
-				return true
-			}
-		case *types.VmConfigFileQuery:
-			if ext == ".vmx" {
-				// TODO: check Filter and Details fields
-				return true
-			}
-		case *types.VmDiskFileQuery:
-			if ext == ".vmdk" {
-				if strings.HasSuffix(name, "-flat.vmdk") {
-					// only matches the descriptor, not the backing file(s)
-					return false
-				}
-				// TODO: check Filter and Details fields
-				return true
-			}
-		case *types.VmLogFileQuery:
-			if ext == ".log" {
-				return strings.HasPrefix(name, "vmware")
-			}
-		case *types.VmNvramFileQuery:
-			if ext == ".nvram" {
-				return true
-			}
-		case *types.VmSnapshotFileQuery:
-			if ext == ".vmsn" {
-				return true
-			}
-		}
-	}
-
-	return false
-}
-
-func (s *searchDatastore) search(ds *types.ManagedObjectReference, folder string, dir string) error {
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		log.Printf("search %s: %s", dir, err)
-		return err
-	}
-
-	res := types.HostDatastoreBrowserSearchResults{
-		Datastore:  ds,
-		FolderPath: folder,
-	}
-
-	for _, file := range files {
-		name := file.Name()
-
-		if s.queryMatch(file) {
-			for _, m := range s.SearchSpec.MatchPattern {
-				if ok, _ := path.Match(m, name); ok {
-					s.addFile(file, &res)
-					break
-				}
-			}
-		}
-
-		if s.recurse && file.IsDir() {
-			_ = s.search(ds, path.Join(folder, name), path.Join(dir, name))
-		}
-	}
-
-	s.res = append(s.res, res)
-
-	return nil
-}
-
-func (s *searchDatastore) Run(Task *Task) (types.AnyType, types.BaseMethodFault) {
-	p, fault := parseDatastorePath(s.DatastorePath)
-	if fault != nil {
-		return nil, fault
-	}
-
-	ref := Map.FindByName(p.Datastore, s.Datastore)
-	if ref == nil {
-		return nil, &types.InvalidDatastore{Name: p.Datastore}
-	}
-
-	ds := ref.(*Datastore)
-
-	dir := path.Join(ds.Info.GetDatastoreInfo().Url, p.Path)
-
-	err := s.search(&ds.Self, s.DatastorePath, dir)
-	if err != nil {
-		ff := types.FileFault{
-			File: p.Path,
-		}
-
-		if os.IsNotExist(err) {
-			return nil, &types.FileNotFound{FileFault: ff}
-		}
-
-		return nil, &types.InvalidArgument{InvalidProperty: p.Path}
-	}
-
-	if s.recurse {
-		return types.ArrayOfHostDatastoreBrowserSearchResults{
-			HostDatastoreBrowserSearchResults: s.res,
-		}, nil
-	}
-
-	return s.res[0], nil
-}
-
-func (b *HostDatastoreBrowser) SearchDatastoreTask(s *types.SearchDatastore_Task) soap.HasFault {
-	task := NewTask(&searchDatastore{
-		HostDatastoreBrowser: b,
-		DatastorePath:        s.DatastorePath,
-		SearchSpec:           s.SearchSpec,
-	})
-
-	task.Run()
-
-	return &methods.SearchDatastore_TaskBody{
-		Res: &types.SearchDatastore_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (b *HostDatastoreBrowser) SearchDatastoreSubFoldersTask(s *types.SearchDatastoreSubFolders_Task) soap.HasFault {
-	task := NewTask(&searchDatastore{
-		HostDatastoreBrowser: b,
-		DatastorePath:        s.DatastorePath,
-		SearchSpec:           s.SearchSpec,
-		recurse:              true,
-	})
-
-	task.Run()
-
-	return &methods.SearchDatastoreSubFolders_TaskBody{
-		Res: &types.SearchDatastoreSubFolders_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system.go
deleted file mode 100644
index ff3fce83d4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system.go
+++ /dev/null
@@ -1,161 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"os"
-	"path"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HostDatastoreSystem struct {
-	mo.HostDatastoreSystem
-
-	Host *mo.HostSystem
-}
-
-func (dss *HostDatastoreSystem) add(ds *Datastore) *soap.Fault {
-	info := ds.Info.GetDatastoreInfo()
-
-	info.Name = ds.Name
-
-	if e := Map.FindByName(ds.Name, dss.Datastore); e != nil {
-		return Fault(e.Reference().Value, &types.DuplicateName{
-			Name:   ds.Name,
-			Object: e.Reference(),
-		})
-	}
-
-	fi, err := os.Stat(info.Url)
-	if err == nil && !fi.IsDir() {
-		err = os.ErrInvalid
-	}
-
-	if err != nil {
-		switch {
-		case os.IsNotExist(err):
-			return Fault(err.Error(), &types.NotFound{})
-		default:
-			return Fault(err.Error(), &types.HostConfigFault{})
-		}
-	}
-
-	folder := Map.getEntityFolder(dss.Host, "datastore")
-	ds.Self.Type = typeName(ds)
-	// Datastore is the only type where create methods do not include the parent (Folder in this case),
-	// but we need the moref to be unique per DC/datastoreFolder, but not per-HostSystem.
-	ds.Self.Value += "@" + folder.Self.Value
-	// TODO: name should be made unique in the case of Local ds type
-
-	ds.Summary.Datastore = &ds.Self
-	ds.Summary.Name = ds.Name
-	ds.Summary.Url = info.Url
-
-	dss.Datastore = append(dss.Datastore, ds.Self)
-	dss.Host.Datastore = dss.Datastore
-	parent := hostParent(dss.Host)
-	parent.Datastore = AddReference(ds.Self, parent.Datastore)
-
-	browser := &HostDatastoreBrowser{}
-	browser.Datastore = dss.Datastore
-	ds.Browser = Map.Put(browser).Reference()
-
-	folder.putChild(ds)
-
-	return nil
-}
-
-func (dss *HostDatastoreSystem) CreateLocalDatastore(c *types.CreateLocalDatastore) soap.HasFault {
-	r := &methods.CreateLocalDatastoreBody{}
-
-	ds := &Datastore{}
-	ds.Name = c.Name
-	ds.Self.Value = c.Path
-
-	ds.Info = &types.LocalDatastoreInfo{
-		DatastoreInfo: types.DatastoreInfo{
-			Name: c.Name,
-			Url:  c.Path,
-		},
-		Path: c.Path,
-	}
-
-	ds.Summary.Type = "local"
-
-	if err := dss.add(ds); err != nil {
-		r.Fault_ = err
-		return r
-	}
-
-	ds.Host = append(ds.Host, types.DatastoreHostMount{
-		Key: dss.Host.Reference(),
-		MountInfo: types.HostMountInfo{
-			AccessMode: string(types.HostMountModeReadWrite),
-			Mounted:    types.NewBool(true),
-			Accessible: types.NewBool(true),
-		},
-	})
-
-	_ = ds.RefreshDatastore(&types.RefreshDatastore{This: ds.Self})
-
-	r.Res = &types.CreateLocalDatastoreResponse{
-		Returnval: ds.Self,
-	}
-
-	return r
-}
-
-func (dss *HostDatastoreSystem) CreateNasDatastore(c *types.CreateNasDatastore) soap.HasFault {
-	r := &methods.CreateNasDatastoreBody{}
-
-	ds := &Datastore{}
-	ds.Name = path.Base(c.Spec.LocalPath)
-	ds.Self.Value = c.Spec.RemoteHost + ":" + c.Spec.RemotePath
-
-	ds.Info = &types.NasDatastoreInfo{
-		DatastoreInfo: types.DatastoreInfo{
-			Url: c.Spec.LocalPath,
-		},
-		Nas: &types.HostNasVolume{
-			HostFileSystemVolume: types.HostFileSystemVolume{
-				Name: c.Spec.LocalPath,
-				Type: c.Spec.Type,
-			},
-			RemoteHost: c.Spec.RemoteHost,
-			RemotePath: c.Spec.RemotePath,
-		},
-	}
-
-	ds.Summary.Type = c.Spec.Type
-
-	if err := dss.add(ds); err != nil {
-		r.Fault_ = err
-		return r
-	}
-
-	_ = ds.RefreshDatastore(&types.RefreshDatastore{This: ds.Self})
-
-	r.Res = &types.CreateNasDatastoreResponse{
-		Returnval: ds.Self,
-	}
-
-	return r
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system_test.go
deleted file mode 100644
index ce55a348fb..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_datastore_system_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestHostDatastoreSystem(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	host := object.NewHostSystem(c.Client, esx.HostSystem.Reference())
-
-	dss, err := host.ConfigManager().DatastoreSystem(ctx)
-	if err != nil {
-		t.Error(err)
-	}
-
-	pwd, err := os.Getwd()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	spec := types.HostNasVolumeSpec{
-		Type:       string(types.HostFileSystemVolumeFileSystemTypeNFS),
-		RemoteHost: "localhost",
-	}
-
-	tests := []func(string) (*object.Datastore, error){
-		func(dir string) (*object.Datastore, error) {
-			spec.LocalPath = dir
-			spec.RemotePath = dir
-			return dss.CreateNasDatastore(ctx, spec)
-		},
-		func(dir string) (*object.Datastore, error) {
-			return dss.CreateLocalDatastore(ctx, filepath.Base(dir), dir)
-		},
-	}
-
-	for _, create := range tests {
-		for _, fail := range []bool{false, true} {
-			if fail {
-				_, err = create(pwd)
-				if err == nil {
-					t.Error("expected error")
-				}
-
-				// TODO: hds.Remove(ds)
-				pwd = filepath.Join(pwd, "esx")
-			} else {
-				_, err = create(pwd)
-				if err != nil {
-					t.Error(err)
-				}
-			}
-		}
-	}
-
-	for _, create := range tests {
-		for _, dir := range []string{"./enoent", "host_datastore_system.go"} {
-			_, err = create(dir)
-
-			if err == nil {
-				t.Error("expected error")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system.go
deleted file mode 100644
index fd596386aa..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system.go
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HostFirewallSystem struct {
-	mo.HostFirewallSystem
-}
-
-func NewHostFirewallSystem(_ *mo.HostSystem) *HostFirewallSystem {
-	info := esx.HostFirewallInfo
-
-	return &HostFirewallSystem{
-		HostFirewallSystem: mo.HostFirewallSystem{
-			FirewallInfo: &info,
-		},
-	}
-}
-
-func DisableRuleset(info *types.HostFirewallInfo, id string) bool {
-	for i := range info.Ruleset {
-		if info.Ruleset[i].Key == id {
-			info.Ruleset[i].Enabled = false
-			return true
-		}
-	}
-
-	return false
-}
-
-func (s *HostFirewallSystem) DisableRuleset(req *types.DisableRuleset) soap.HasFault {
-	body := &methods.DisableRulesetBody{}
-
-	if DisableRuleset(s.HostFirewallSystem.FirewallInfo, req.Id) {
-		body.Res = new(types.DisableRulesetResponse)
-		return body
-	}
-
-	body.Fault_ = Fault("", &types.NotFound{})
-
-	return body
-}
-
-func EnableRuleset(info *types.HostFirewallInfo, id string) bool {
-	for i := range info.Ruleset {
-		if info.Ruleset[i].Key == id {
-			info.Ruleset[i].Enabled = true
-			return true
-		}
-	}
-
-	return false
-}
-
-func (s *HostFirewallSystem) EnableRuleset(req *types.EnableRuleset) soap.HasFault {
-	body := &methods.EnableRulesetBody{}
-
-	if EnableRuleset(s.HostFirewallSystem.FirewallInfo, req.Id) {
-		body.Res = new(types.EnableRulesetResponse)
-		return body
-	}
-
-	body.Fault_ = Fault("", &types.NotFound{})
-
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system_test.go
deleted file mode 100644
index 3e33f1ab81..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_firewall_system_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-)
-
-func TestHostFirewallSystem(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	m.Datastore = 0
-	m.Machine = 0
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := m.Service.client
-
-	host := object.NewHostSystem(c, esx.HostSystem.Reference())
-
-	hfs, _ := host.ConfigManager().FirewallSystem(ctx)
-
-	err = hfs.DisableRuleset(ctx, "enoent")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	err = hfs.EnableRuleset(ctx, "enoent")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	err = hfs.DisableRuleset(ctx, "sshServer")
-	if err != nil {
-		t.Error(err)
-	}
-
-	err = hfs.EnableRuleset(ctx, "sshServer")
-	if err != nil {
-		t.Error(err)
-	}
-
-	_, err = hfs.Info(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system.go
deleted file mode 100644
index 64a2bd759c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system.go
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HostNetworkSystem struct {
-	mo.HostNetworkSystem
-
-	Host *mo.HostSystem
-}
-
-func NewHostNetworkSystem(host *mo.HostSystem) *HostNetworkSystem {
-	return &HostNetworkSystem{
-		Host: host,
-		HostNetworkSystem: mo.HostNetworkSystem{
-			NetworkInfo: &types.HostNetworkInfo{
-				Vswitch: []types.HostVirtualSwitch{
-					{
-						Name:      "vSwitch0",
-						Portgroup: []string{"VM Network"},
-					},
-				},
-			},
-		},
-	}
-}
-
-func (s *HostNetworkSystem) folder() *Folder {
-	f := Map.getEntityDatacenter(s.Host).NetworkFolder
-	return Map.Get(f).(*Folder)
-}
-
-func (s *HostNetworkSystem) AddVirtualSwitch(c *types.AddVirtualSwitch) soap.HasFault {
-	r := &methods.AddVirtualSwitchBody{}
-
-	for _, vswitch := range s.NetworkInfo.Vswitch {
-		if vswitch.Name == c.VswitchName {
-			r.Fault_ = Fault("", &types.AlreadyExists{Name: c.VswitchName})
-			return r
-		}
-	}
-
-	s.NetworkInfo.Vswitch = append(s.NetworkInfo.Vswitch, types.HostVirtualSwitch{
-		Name: c.VswitchName,
-	})
-
-	r.Res = &types.AddVirtualSwitchResponse{}
-
-	return r
-}
-
-func (s *HostNetworkSystem) RemoveVirtualSwitch(c *types.RemoveVirtualSwitch) soap.HasFault {
-	r := &methods.RemoveVirtualSwitchBody{}
-
-	vs := s.NetworkInfo.Vswitch
-
-	for i, v := range vs {
-		if v.Name == c.VswitchName {
-			s.NetworkInfo.Vswitch = append(vs[:i], vs[i+1:]...)
-			r.Res = &types.RemoveVirtualSwitchResponse{}
-			return r
-		}
-	}
-
-	r.Fault_ = Fault("", &types.NotFound{})
-
-	return r
-}
-
-func (s *HostNetworkSystem) AddPortGroup(c *types.AddPortGroup) soap.HasFault {
-	var vswitch *types.HostVirtualSwitch
-
-	r := &methods.AddPortGroupBody{}
-
-	if c.Portgrp.Name == "" {
-		r.Fault_ = Fault("", &types.InvalidArgument{InvalidProperty: "name"})
-		return r
-	}
-
-	for i := range s.NetworkInfo.Vswitch {
-		if s.NetworkInfo.Vswitch[i].Name == c.Portgrp.VswitchName {
-			vswitch = &s.NetworkInfo.Vswitch[i]
-			break
-		}
-	}
-
-	if vswitch == nil {
-		r.Fault_ = Fault("", &types.NotFound{})
-		return r
-	}
-
-	network := &mo.Network{}
-	network.Name = c.Portgrp.Name
-	network.Entity().Name = network.Name
-
-	folder := s.folder()
-
-	if obj := Map.FindByName(c.Portgrp.Name, folder.ChildEntity); obj != nil {
-		r.Fault_ = Fault("", &types.DuplicateName{
-			Name:   c.Portgrp.Name,
-			Object: obj.Reference(),
-		})
-
-		return r
-	}
-
-	folder.putChild(network)
-
-	vswitch.Portgroup = append(vswitch.Portgroup, c.Portgrp.Name)
-	r.Res = &types.AddPortGroupResponse{}
-
-	return r
-}
-
-func (s *HostNetworkSystem) RemovePortGroup(c *types.RemovePortGroup) soap.HasFault {
-	var vswitch *types.HostVirtualSwitch
-
-	r := &methods.RemovePortGroupBody{}
-
-	for i, v := range s.NetworkInfo.Vswitch {
-		for j, pg := range v.Portgroup {
-			if pg == c.PgName {
-				vswitch = &s.NetworkInfo.Vswitch[i]
-				vswitch.Portgroup = append(vswitch.Portgroup[:j], vswitch.Portgroup[j+1:]...)
-			}
-		}
-	}
-
-	if vswitch == nil {
-		r.Fault_ = Fault("", &types.NotFound{})
-		return r
-	}
-
-	folder := s.folder()
-	e := Map.FindByName(c.PgName, folder.ChildEntity)
-	folder.removeChild(e.Reference())
-
-	r.Res = &types.RemovePortGroupResponse{}
-
-	return r
-}
-
-func (s *HostNetworkSystem) UpdateNetworkConfig(req *types.UpdateNetworkConfig) soap.HasFault {
-	s.NetworkConfig = &req.Config
-
-	return &methods.UpdateNetworkConfigBody{
-		Res: &types.UpdateNetworkConfigResponse{
-			Returnval: types.HostNetworkConfigResult{},
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system_test.go
deleted file mode 100644
index 783917a872..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_network_system_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestHostNetworkSystem(t *testing.T) {
-	ctx := context.Background()
-
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	host := object.NewHostSystem(s.client, esx.HostSystem.Reference())
-
-	ns, err := host.ConfigManager().NetworkSystem(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(s.client, false)
-	finder.SetDatacenter(object.NewDatacenter(s.client, esx.Datacenter.Reference()))
-
-	// created by default
-	_, err = finder.Network(ctx, "VM Network")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// not created yet
-	_, err = finder.Network(ctx, "bridge")
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	err = ns.AddVirtualSwitch(ctx, "vSwitch0", nil)
-	if err == nil {
-		t.Fatal("expected error") // DuplicateName
-	}
-
-	err = ns.AddVirtualSwitch(ctx, "vSwitch1", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	spec := types.HostPortGroupSpec{}
-	err = ns.AddPortGroup(ctx, spec)
-	if err == nil {
-		t.Fatal("expected error") // InvalidArgument "name"
-	}
-
-	spec.Name = "bridge"
-	err = ns.AddPortGroup(ctx, spec)
-	if err == nil {
-		t.Fatal("expected error") // NotFound
-	}
-
-	spec.VswitchName = "vSwitch1"
-	err = ns.AddPortGroup(ctx, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = finder.Network(ctx, "bridge")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = ns.AddPortGroup(ctx, spec)
-	if err == nil {
-		t.Error("expected error") // DuplicateName
-	}
-
-	err = ns.RemovePortGroup(ctx, "bridge")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = finder.Network(ctx, "bridge")
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	err = ns.RemovePortGroup(ctx, "bridge")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	err = ns.RemoveVirtualSwitch(ctx, "vSwitch1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = ns.RemoveVirtualSwitch(ctx, "vSwitch1")
-	if err == nil {
-		t.Error("expected error")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_system.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_system.go
deleted file mode 100644
index 3d2ab39cd2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_system.go
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type HostSystem struct {
-	mo.HostSystem
-}
-
-func NewHostSystem(host mo.HostSystem) *HostSystem {
-	now := time.Now()
-
-	hs := &HostSystem{
-		HostSystem: host,
-	}
-
-	hs.Name = hs.Summary.Config.Name
-	hs.Summary.Runtime = &hs.Runtime
-	hs.Summary.Runtime.BootTime = &now
-
-	id := uuid.New().String()
-
-	hardware := *host.Summary.Hardware
-	hs.Summary.Hardware = &hardware
-	hs.Summary.Hardware.Uuid = id
-
-	info := *esx.HostHardwareInfo
-	info.SystemInfo.Uuid = id
-	hs.Hardware = &info
-
-	config := []struct {
-		ref **types.ManagedObjectReference
-		obj mo.Reference
-	}{
-		{&hs.ConfigManager.DatastoreSystem, &HostDatastoreSystem{Host: &hs.HostSystem}},
-		{&hs.ConfigManager.NetworkSystem, NewHostNetworkSystem(&hs.HostSystem)},
-		{&hs.ConfigManager.AdvancedOption, NewOptionManager(nil, esx.Setting)},
-		{&hs.ConfigManager.FirewallSystem, NewHostFirewallSystem(&hs.HostSystem)},
-	}
-
-	for _, c := range config {
-		ref := Map.Put(c.obj).Reference()
-
-		*c.ref = &ref
-	}
-
-	return hs
-}
-
-func hostParent(host *mo.HostSystem) *mo.ComputeResource {
-	switch parent := Map.Get(*host.Parent).(type) {
-	case *mo.ComputeResource:
-		return parent
-	case *ClusterComputeResource:
-		return &parent.ComputeResource
-	default:
-		return nil
-	}
-}
-
-func addComputeResource(s *types.ComputeResourceSummary, h *HostSystem) {
-	s.TotalCpu += h.Summary.Hardware.CpuMhz
-	s.TotalMemory += h.Summary.Hardware.MemorySize
-	s.NumCpuCores += h.Summary.Hardware.NumCpuCores
-	s.NumCpuThreads += h.Summary.Hardware.NumCpuThreads
-	s.EffectiveCpu += h.Summary.Hardware.CpuMhz
-	s.EffectiveMemory += h.Summary.Hardware.MemorySize
-	s.NumHosts++
-	s.NumEffectiveHosts++
-	s.OverallStatus = types.ManagedEntityStatusGreen
-}
-
-// CreateDefaultESX creates a standalone ESX
-// Adds objects of type: Datacenter, Network, ComputeResource, ResourcePool and HostSystem
-func CreateDefaultESX(f *Folder) {
-	dc := &esx.Datacenter
-	f.putChild(dc)
-	createDatacenterFolders(dc, false)
-
-	host := NewHostSystem(esx.HostSystem)
-
-	summary := new(types.ComputeResourceSummary)
-	addComputeResource(summary, host)
-
-	cr := &mo.ComputeResource{Summary: summary}
-	cr.Self = *host.Parent
-	cr.Name = host.Name
-	cr.Host = append(cr.Host, host.Reference())
-	Map.PutEntity(cr, host)
-
-	pool := NewResourcePool()
-	cr.ResourcePool = &pool.Self
-	Map.PutEntity(cr, pool)
-	pool.Owner = cr.Self
-
-	Map.Get(dc.HostFolder).(*Folder).putChild(cr)
-}
-
-// CreateStandaloneHost uses esx.HostSystem as a template, applying the given spec
-// and creating the ComputeResource parent and ResourcePool sibling.
-func CreateStandaloneHost(f *Folder, spec types.HostConnectSpec) (*HostSystem, types.BaseMethodFault) {
-	if spec.HostName == "" {
-		return nil, &types.NoHost{}
-	}
-
-	pool := NewResourcePool()
-	host := NewHostSystem(esx.HostSystem)
-
-	host.Summary.Config.Name = spec.HostName
-	host.Name = host.Summary.Config.Name
-	host.Runtime.ConnectionState = types.HostSystemConnectionStateDisconnected
-
-	summary := new(types.ComputeResourceSummary)
-	addComputeResource(summary, host)
-
-	cr := &mo.ComputeResource{Summary: summary}
-
-	Map.PutEntity(cr, Map.NewEntity(host))
-
-	Map.PutEntity(cr, Map.NewEntity(pool))
-
-	cr.Name = host.Name
-	cr.Host = append(cr.Host, host.Reference())
-	cr.ResourcePool = &pool.Self
-
-	f.putChild(cr)
-	pool.Owner = cr.Self
-
-	return host, nil
-}
-
-func (h *HostSystem) EnterMaintenanceModeTask(spec *types.EnterMaintenanceMode_Task) soap.HasFault {
-	task := CreateTask(h, "enterMaintenanceMode", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		h.Runtime.InMaintenanceMode = true
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.EnterMaintenanceMode_TaskBody{
-		Res: &types.EnterMaintenanceMode_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (h *HostSystem) ExitMaintenanceModeTask(spec *types.ExitMaintenanceMode_Task) soap.HasFault {
-	task := CreateTask(h, "exitMaintenanceMode", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		h.Runtime.InMaintenanceMode = false
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.ExitMaintenanceMode_TaskBody{
-		Res: &types.ExitMaintenanceMode_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/host_system_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/host_system_test.go
deleted file mode 100644
index 0d079ff8ae..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/host_system_test.go
+++ /dev/null
@@ -1,132 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-)
-
-func TestDefaultESX(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	client, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(client.Client, false)
-
-	dc, err := finder.DatacenterOrDefault(ctx, "")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder.SetDatacenter(dc)
-
-	host, err := finder.HostSystemOrDefault(ctx, "*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if host.Name() != esx.HostSystem.Summary.Config.Name {
-		t.Fail()
-	}
-
-	pool, err := finder.ResourcePoolOrDefault(ctx, "*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if pool.Name() != "Resources" {
-		t.Fail()
-	}
-}
-
-func TestMaintenanceMode(t *testing.T) {
-	ctx := context.Background()
-	m := ESX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c := m.Service.client
-
-	hs := Map.Get(esx.HostSystem.Reference()).(*HostSystem)
-	host := object.NewHostSystem(c, hs.Self)
-
-	task, err := host.EnterMaintenanceMode(ctx, 1, false, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hs.Runtime.InMaintenanceMode != true {
-		t.Fatal("expect InMaintenanceMode is true; got false")
-	}
-
-	task, err = host.ExitMaintenanceMode(ctx, 1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if hs.Runtime.InMaintenanceMode != false {
-		t.Fatal("expect InMaintenanceMode is false; got true")
-	}
-}
-
-func TestNewHostSystem(t *testing.T) {
-	m := ESX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	hs := NewHostSystem(esx.HostSystem)
-	if hs.Summary.Runtime != &hs.Runtime {
-		t.Fatal("expected hs.Summary.Runtime == &hs.Runtime; got !=")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go
deleted file mode 100644
index 9986c8f102..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager.go
+++ /dev/null
@@ -1,338 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var ipPool = MustNewIpPool(&types.IpPool{
-	Id:   1,
-	Name: "ip-pool",
-	AvailableIpv4Addresses: 250,
-	AvailableIpv6Addresses: 250,
-	AllocatedIpv6Addresses: 0,
-	AllocatedIpv4Addresses: 0,
-	Ipv4Config: &types.IpPoolIpPoolConfigInfo{
-		Netmask:       "10.10.10.255",
-		Gateway:       "10.10.10.1",
-		SubnetAddress: "10.10.10.0",
-		Range:         "10.10.10.2#250",
-	},
-	Ipv6Config: &types.IpPoolIpPoolConfigInfo{
-		Netmask:       "2001:4860:0:2001::ff",
-		Gateway:       "2001:4860:0:2001::1",
-		SubnetAddress: "2001:4860:0:2001::0",
-		Range:         "2001:4860:0:2001::2#250",
-	},
-})
-
-type IpPoolManager struct {
-	mo.IpPoolManager
-
-	pools      map[int32]*IpPool
-	nextPoolId int32
-}
-
-func NewIpPoolManager(ref types.ManagedObjectReference) *IpPoolManager {
-	m := &IpPoolManager{}
-	m.Self = ref
-
-	m.pools = map[int32]*IpPool{
-		1: ipPool,
-	}
-	m.nextPoolId = 2
-
-	return m
-}
-
-func (m *IpPoolManager) CreateIpPool(req *types.CreateIpPool) soap.HasFault {
-	return &methods.CreateIpPoolBody{
-		Fault_: Fault("not implemented", &types.RuntimeFault{}),
-	}
-}
-
-func (m *IpPoolManager) DestroyIpPool(req *types.DestroyIpPool) soap.HasFault {
-	return &methods.DestroyIpPoolBody{
-		Fault_: Fault("not implemented", &types.RuntimeFault{}),
-	}
-}
-
-func (m *IpPoolManager) QueryIpPools(req *types.QueryIpPools) soap.HasFault {
-	return &methods.QueryIpPoolsBody{
-		Fault_: Fault("not implemented", &types.RuntimeFault{}),
-	}
-}
-
-func (m *IpPoolManager) UpdateIpPool(req *types.UpdateIpPool) soap.HasFault {
-	return &methods.UpdateIpPoolBody{
-		Fault_: Fault("not implemented", &types.RuntimeFault{}),
-	}
-}
-
-func (m *IpPoolManager) AllocateIpv4Address(req *types.AllocateIpv4Address) soap.HasFault {
-	body := &methods.AllocateIpv4AddressBody{}
-
-	pool, ok := m.pools[req.PoolId]
-	if !ok {
-		body.Fault_ = Fault("", &types.InvalidArgument{})
-		return body
-	}
-
-	ip, err := pool.AllocateIPv4(req.AllocationId)
-	if err != nil {
-		body.Fault_ = Fault(err.Error(), &types.RuntimeFault{})
-		return body
-	}
-
-	body.Res = &types.AllocateIpv4AddressResponse{
-		Returnval: ip,
-	}
-
-	return body
-}
-
-func (m *IpPoolManager) AllocateIpv6Address(req *types.AllocateIpv6Address) soap.HasFault {
-	body := &methods.AllocateIpv6AddressBody{}
-
-	pool, ok := m.pools[req.PoolId]
-	if !ok {
-		body.Fault_ = Fault("", &types.InvalidArgument{})
-		return body
-	}
-
-	ip, err := pool.AllocateIPv6(req.AllocationId)
-	if err != nil {
-		body.Fault_ = Fault(err.Error(), &types.RuntimeFault{})
-		return body
-	}
-
-	body.Res = &types.AllocateIpv6AddressResponse{
-		Returnval: ip,
-	}
-
-	return body
-}
-
-func (m *IpPoolManager) ReleaseIpAllocation(req *types.ReleaseIpAllocation) soap.HasFault {
-	body := &methods.ReleaseIpAllocationBody{}
-
-	pool, ok := m.pools[req.PoolId]
-	if !ok {
-		body.Fault_ = Fault("", &types.InvalidArgument{})
-		return body
-	}
-
-	pool.ReleaseIpv4(req.AllocationId)
-	pool.ReleaseIpv6(req.AllocationId)
-
-	body.Res = &types.ReleaseIpAllocationResponse{}
-
-	return body
-}
-
-func (m *IpPoolManager) QueryIPAllocations(req *types.QueryIPAllocations) soap.HasFault {
-	body := &methods.QueryIPAllocationsBody{}
-
-	pool, ok := m.pools[req.PoolId]
-	if !ok {
-		body.Fault_ = Fault("", &types.InvalidArgument{})
-		return body
-	}
-
-	body.Res = &types.QueryIPAllocationsResponse{}
-
-	ipv4, ok := pool.ipv4Allocation[req.ExtensionKey]
-	if ok {
-		body.Res.Returnval = append(body.Res.Returnval, types.IpPoolManagerIpAllocation{
-			IpAddress:    ipv4,
-			AllocationId: req.ExtensionKey,
-		})
-	}
-
-	ipv6, ok := pool.ipv6Allocation[req.ExtensionKey]
-	if ok {
-		body.Res.Returnval = append(body.Res.Returnval, types.IpPoolManagerIpAllocation{
-			IpAddress:    ipv6,
-			AllocationId: req.ExtensionKey,
-		})
-	}
-
-	return body
-}
-
-var (
-	errNoIpAvailable     = errors.New("no ip address available")
-	errInvalidAllocation = errors.New("allocation id not recognized")
-)
-
-type IpPool struct {
-	config         *types.IpPool
-	ipv4Allocation map[string]string
-	ipv6Allocation map[string]string
-	ipv4Pool       []string
-	ipv6Pool       []string
-}
-
-func MustNewIpPool(config *types.IpPool) *IpPool {
-	pool, err := NewIpPool(config)
-	if err != nil {
-		panic(err)
-	}
-
-	return pool
-}
-
-func NewIpPool(config *types.IpPool) (*IpPool, error) {
-	pool := &IpPool{
-		config:         config,
-		ipv4Allocation: make(map[string]string),
-		ipv6Allocation: make(map[string]string),
-	}
-
-	return pool, pool.init()
-}
-
-func (p *IpPool) init() error {
-	// IPv4 range
-	if p.config.Ipv4Config != nil {
-		ranges := strings.Split(p.config.Ipv4Config.Range, ",")
-		for _, r := range ranges {
-			sp := strings.Split(r, "#")
-			if len(sp) != 2 {
-				return fmt.Errorf("format of range should be ip#number; got %q", r)
-			}
-
-			ip := net.ParseIP(strings.TrimSpace(sp[0])).To4()
-			if ip == nil {
-				return fmt.Errorf("bad ip format: %q", sp[0])
-			}
-
-			length, err := strconv.Atoi(sp[1])
-			if err != nil {
-				return err
-			}
-
-			for i := 0; i < length; i++ {
-				p.ipv4Pool = append(p.ipv4Pool, net.IPv4(ip[0], ip[1], ip[2], ip[3]+byte(i)).String())
-			}
-		}
-	}
-
-	// IPv6 range
-	if p.config.Ipv6Config != nil {
-		ranges := strings.Split(p.config.Ipv6Config.Range, ",")
-		for _, r := range ranges {
-			sp := strings.Split(r, "#")
-			if len(sp) != 2 {
-				return fmt.Errorf("format of range should be ip#number; got %q", r)
-			}
-
-			ip := net.ParseIP(strings.TrimSpace(sp[0])).To16()
-			if ip == nil {
-				return fmt.Errorf("bad ip format: %q", sp[0])
-			}
-
-			length, err := strconv.Atoi(sp[1])
-			if err != nil {
-				return err
-			}
-
-			for i := 0; i < length; i++ {
-				var ipv6 [16]byte
-				copy(ipv6[:], ip)
-				ipv6[15] += byte(i)
-				p.ipv6Pool = append(p.ipv6Pool, net.IP(ipv6[:]).String())
-			}
-		}
-	}
-
-	return nil
-}
-
-func (p *IpPool) AllocateIPv4(allocation string) (string, error) {
-	if ip, ok := p.ipv4Allocation[allocation]; ok {
-		return ip, nil
-	}
-
-	l := len(p.ipv4Pool)
-	if l == 0 {
-		return "", errNoIpAvailable
-	}
-
-	ip := p.ipv4Pool[l-1]
-
-	p.config.AvailableIpv4Addresses--
-	p.ipv4Pool = p.ipv4Pool[:l-1]
-	p.ipv4Allocation[allocation] = ip
-
-	return ip, nil
-}
-
-func (p *IpPool) ReleaseIpv4(allocation string) error {
-	ip, ok := p.ipv4Allocation[allocation]
-	if !ok {
-		return errInvalidAllocation
-	}
-
-	delete(p.ipv4Allocation, allocation)
-	p.config.AvailableIpv4Addresses++
-	p.ipv4Pool = append(p.ipv4Pool, ip)
-
-	return nil
-}
-
-func (p *IpPool) AllocateIPv6(allocation string) (string, error) {
-	if ip, ok := p.ipv6Allocation[allocation]; ok {
-		return ip, nil
-	}
-
-	l := len(p.ipv6Pool)
-	if l == 0 {
-		return "", errNoIpAvailable
-	}
-
-	ip := p.ipv6Pool[l-1]
-
-	p.config.AvailableIpv6Addresses--
-	p.ipv6Pool = p.ipv6Pool[:l-1]
-	p.ipv6Allocation[allocation] = ip
-
-	return ip, nil
-}
-
-func (p *IpPool) ReleaseIpv6(allocation string) error {
-	ip, ok := p.ipv6Allocation[allocation]
-	if !ok {
-		return errInvalidAllocation
-	}
-
-	delete(p.ipv6Allocation, allocation)
-	p.config.AvailableIpv6Addresses++
-	p.ipv6Pool = append(p.ipv6Pool, ip)
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager_test.go
deleted file mode 100644
index ef6582fe02..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/ip_pool_manager_test.go
+++ /dev/null
@@ -1,253 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestIpPoolv4(t *testing.T) {
-	tests := []struct {
-		ipRange string
-		length  int32
-	}{
-		{"10.10.10.2#250", 250},
-		{"10.10.10.2#10, 10.10.10.20#20", 30},
-		{"10.10.10.2#10, 10.10.10.20#20, 10.10.10.50#20", 50},
-	}
-
-	for _, test := range tests {
-		var ipPool = MustNewIpPool(&types.IpPool{
-			Id:   1,
-			Name: "ip-pool",
-			AvailableIpv4Addresses: test.length,
-			AvailableIpv6Addresses: 0,
-			AllocatedIpv6Addresses: 0,
-			AllocatedIpv4Addresses: 0,
-			Ipv4Config: &types.IpPoolIpPoolConfigInfo{
-				Netmask:       "10.10.10.255",
-				Gateway:       "10.10.10.1",
-				SubnetAddress: "10.10.10.0",
-				Range:         test.ipRange,
-			},
-		})
-
-		if len(ipPool.ipv4Pool) != int(test.length) {
-			t.Fatalf("expect length to be %d; got %d", test.length, len(ipPool.ipv4Pool))
-		}
-
-		ip, err := ipPool.AllocateIPv4("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		ip2, err := ipPool.AllocateIPv4("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if ip != ip2 {
-			t.Fatalf("same allocation key should allocate the same ip; got %s, %s", ip, ip2)
-		}
-
-		err = ipPool.ReleaseIpv4("bad-alloc")
-		if err == nil {
-			t.Fatal("expect error to release a bad allocation")
-		}
-
-		if len(ipPool.ipv4Pool) != int(test.length)-1 {
-			t.Fatalf("expect length to be %d; got %d", test.length-1, len(ipPool.ipv4Pool))
-		}
-
-		err = ipPool.ReleaseIpv4("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(ipPool.ipv4Pool) != int(test.length) {
-			t.Fatalf("expect length to be %d; got %d", test.length, len(ipPool.ipv4Pool))
-		}
-
-		allocated := map[string]bool{}
-		for i := 0; i < int(test.length); i++ {
-			ip, err := ipPool.AllocateIPv4(fmt.Sprintf("alloc-%d", i))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if _, ok := allocated[ip]; ok {
-				t.Fatalf("duplicated allocation of ip %q", ip)
-			}
-			allocated[ip] = true
-		}
-
-		_, err = ipPool.AllocateIPv4("last-allocation")
-		if err != errNoIpAvailable {
-			t.Fatalf("expect errNoIpAvailable; got %s", err)
-		}
-	}
-}
-
-func TestIpPoolv6(t *testing.T) {
-	tests := []struct {
-		ipRange string
-		length  int32
-	}{
-		{"2001:4860:0:2001::2#250", 250},
-	}
-
-	for _, test := range tests {
-		var ipPool = MustNewIpPool(&types.IpPool{
-			Id:   1,
-			Name: "ip-pool",
-			AvailableIpv4Addresses: 0,
-			AvailableIpv6Addresses: test.length,
-			AllocatedIpv6Addresses: 0,
-			AllocatedIpv4Addresses: 0,
-			Ipv6Config: &types.IpPoolIpPoolConfigInfo{
-				Netmask:       "2001:4860:0:2001::ff",
-				Gateway:       "2001:4860:0:2001::1",
-				SubnetAddress: "2001:4860:0:2001::0",
-				Range:         test.ipRange,
-			},
-		})
-
-		if len(ipPool.ipv6Pool) != int(test.length) {
-			t.Fatalf("expect length to be %d; got %d", test.length, len(ipPool.ipv4Pool))
-		}
-
-		ip, err := ipPool.AllocateIPv6("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		ip2, err := ipPool.AllocateIPv6("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if ip != ip2 {
-			t.Fatalf("same allocation key should allocate the same ip; got %s, %s", ip, ip2)
-		}
-
-		err = ipPool.ReleaseIpv6("bad-alloc")
-		if err == nil {
-			t.Fatal("expect error to release a bad allocation")
-		}
-
-		if len(ipPool.ipv6Pool) != int(test.length)-1 {
-			t.Fatalf("expect length to be %d; got %d", test.length-1, len(ipPool.ipv4Pool))
-		}
-
-		err = ipPool.ReleaseIpv6("alloc")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(ipPool.ipv6Pool) != int(test.length) {
-			t.Fatalf("expect length to be %d; got %d", test.length, len(ipPool.ipv4Pool))
-		}
-
-		allocated := map[string]bool{}
-		for i := 0; i < int(test.length); i++ {
-			ip, err := ipPool.AllocateIPv6(fmt.Sprintf("alloc-%d", i))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if _, ok := allocated[ip]; ok {
-				t.Fatalf("duplicated allocation of ip %q", ip)
-			}
-			allocated[ip] = true
-		}
-
-		_, err = ipPool.AllocateIPv6("last-allocation")
-		if err != errNoIpAvailable {
-			t.Fatalf("expect errNoIpAvailable; got %s", err)
-		}
-	}
-}
-
-func TestIpPoolManager(t *testing.T) {
-	ctx := context.Background()
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ref := types.ManagedObjectReference{Type: "IpPoolManager", Value: "IpPoolManager"}
-
-	// Allocate IPv4
-	allocateReq := &types.AllocateIpv4Address{
-		This:         ref,
-		PoolId:       1,
-		AllocationId: "alloc",
-	}
-
-	allocateResp, err := methods.AllocateIpv4Address(ctx, c.Client, allocateReq)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if net.ParseIP(allocateResp.Returnval) == nil {
-		t.Fatalf("%q is not IP address", allocateResp.Returnval)
-	}
-
-	releaseReq := &types.ReleaseIpAllocation{
-		This:         ref,
-		PoolId:       1,
-		AllocationId: "alloc",
-	}
-
-	queryReq := &types.QueryIPAllocations{
-		This:         ref,
-		PoolId:       1,
-		ExtensionKey: "alloc",
-	}
-
-	queryResp, err := methods.QueryIPAllocations(ctx, c.Client, queryReq)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(queryResp.Returnval) != 1 {
-		t.Fatalf("expect length of result 1; got %s", queryResp.Returnval)
-	}
-	if queryResp.Returnval[0].IpAddress != allocateResp.Returnval {
-		t.Fatalf("expect same IP address; got %s, %s", queryResp.Returnval[0].IpAddress, allocateResp.Returnval)
-	}
-
-	_, err = methods.ReleaseIpAllocation(ctx, c.Client, releaseReq)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/license_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/license_manager_test.go
deleted file mode 100644
index e0491cd35b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/license_manager_test.go
+++ /dev/null
@@ -1,206 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/license"
-)
-
-func TestLicenseManagerVPX(t *testing.T) {
-	ctx := context.Background()
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lm := license.NewManager(c.Client)
-	am, err := lm.AssignmentManager(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	la, err := am.QueryAssigned(ctx, "enoent")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(la) != 0 {
-		t.Errorf("unexpected license")
-	}
-
-	finder := find.NewFinder(c.Client, false)
-	hosts, err := finder.HostSystemList(ctx, "/...")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	host := hosts[0].Reference().Value
-	vcid := c.Client.ServiceContent.About.InstanceUuid
-
-	for _, name := range []string{"", host, vcid} {
-		la, err = am.QueryAssigned(ctx, name)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(la) != 1 {
-			t.Fatal("no licenses")
-		}
-
-		if !reflect.DeepEqual(la[0].AssignedLicense, EvalLicense) {
-			t.Fatal("invalid license")
-		}
-	}
-}
-
-func TestLicenseManagerESX(t *testing.T) {
-	ctx := context.Background()
-	m := ESX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lm := license.NewManager(c.Client)
-	_, err = lm.AssignmentManager(ctx)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	la, err := lm.List(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(la) != 1 {
-		t.Fatal("no licenses")
-	}
-
-	if !reflect.DeepEqual(la[0], EvalLicense) {
-		t.Fatal("invalid license")
-	}
-}
-
-func TestAddRemoveLicense(t *testing.T) {
-	ctx := context.Background()
-	m := ESX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lm := license.NewManager(c.Client)
-	key := "00000-00000-00000-00000-11111"
-	labels := map[string]string{"key": "value"}
-
-	info, err := lm.Add(ctx, key, labels)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if info.LicenseKey != key {
-		t.Fatalf("expect info.LicenseKey equal to %q; got %q", key, info.LicenseKey)
-	}
-
-	if len(info.Labels) != len(labels) {
-		t.Fatalf("expect len(info.Labels) eqaul to %d; got %d",
-			len(labels), len(info.Labels))
-	}
-
-	if info.Labels[0].Key != "key" || info.Labels[0].Value != "value" {
-		t.Fatalf("expect label to be {key:value}; got {%s:%s}",
-			info.Labels[0].Key, info.Labels[0].Value)
-	}
-
-	la, err := lm.List(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(la) != 2 {
-		t.Fatal("no licenses")
-	}
-
-	if la[1].LicenseKey != key {
-		t.Fatalf("expect info.LicenseKey equal to %q; got %q",
-			key, la[1].LicenseKey)
-	}
-
-	if len(la[1].Labels) != len(labels) {
-		t.Fatalf("expect len(info.Labels) eqaul to %d; got %d",
-			len(labels), len(la[1].Labels))
-	}
-
-	if la[1].Labels[0].Key != "key" || la[1].Labels[0].Value != "value" {
-		t.Fatalf("expect label to be {key:value}; got {%s:%s}",
-			la[1].Labels[0].Key, la[1].Labels[0].Value)
-	}
-
-	err = lm.Remove(ctx, key)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	la, err = lm.List(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(la) != 1 {
-		t.Fatal("no licenses")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/model.go b/installer/vendor/github.com/vmware/govmomi/simulator/model.go
deleted file mode 100644
index 4bc26f9793..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/model.go
+++ /dev/null
@@ -1,484 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Model is used to populate a Model with an initial set of managed entities.
-// This is a simple helper for tests running against a simulator, to populate an inventory
-// with commonly used models.
-type Model struct {
-	Service *Service
-
-	ServiceContent types.ServiceContent
-	RootFolder     mo.Folder
-
-	// Autostart will power on Model created VMs when true
-	Autostart bool
-
-	// Datacenter specifies the number of Datacenter entities to create
-	Datacenter int
-
-	// Portgroup specifies the number of DistributedVirtualPortgroup entities to create per Datacenter
-	Portgroup int
-
-	// Host specifies the number of standalone HostSystems entities to create per Datacenter
-	Host int
-
-	// Cluster specifies the number of ClusterComputeResource entities to create per Datacenter
-	Cluster int
-
-	// ClusterHost specifies the number of HostSystems entities to create within a Cluster
-	ClusterHost int
-
-	// Pool specifies the number of ResourcePool entities to create per Cluster
-	Pool int
-
-	// Datastore specifies the number of Datastore entities to create
-	// Each Datastore will have temporary local file storage and will be mounted
-	// on every HostSystem created by the ModelConfig
-	Datastore int
-
-	// Machine specifies the number of VirtualMachine entities to create per ResourcePool
-	Machine int
-
-	// Folder specifies the number of Datacenter to place within a Folder.
-	// This includes a folder for the Datacenter itself and its host, vm, network and datastore folders.
-	// All resources for the Datacenter are placed within these folders, rather than the top-level folders.
-	Folder int
-
-	// App specifies the number of VirtualApp to create per Cluster
-	App int
-
-	// Pod specifies the number of StoragePod to create per Cluster
-	Pod int
-
-	// total number of inventory objects, set by Count()
-	total int
-
-	dirs []string
-}
-
-// ESX is the default Model for a standalone ESX instance
-func ESX() *Model {
-	return &Model{
-		ServiceContent: esx.ServiceContent,
-		RootFolder:     esx.RootFolder,
-		Autostart:      true,
-		Datastore:      1,
-		Machine:        2,
-	}
-}
-
-// VPX is the default Model for a vCenter instance
-func VPX() *Model {
-	return &Model{
-		ServiceContent: vpx.ServiceContent,
-		RootFolder:     vpx.RootFolder,
-		Autostart:      true,
-		Datacenter:     1,
-		Portgroup:      1,
-		Host:           1,
-		Cluster:        1,
-		ClusterHost:    3,
-		Datastore:      1,
-		Machine:        2,
-	}
-}
-
-// Count returns a Model with total number of each existing type
-func (m *Model) Count() Model {
-	count := Model{}
-
-	for ref, obj := range Map.objects {
-		if _, ok := obj.(mo.Entity); !ok {
-			continue
-		}
-
-		count.total++
-
-		switch ref.Type {
-		case "Datacenter":
-			count.Datacenter++
-		case "DistributedVirtualPortgroup":
-			count.Portgroup++
-		case "ClusterComputeResource":
-			count.Cluster++
-		case "Datastore":
-			count.Datastore++
-		case "HostSystem":
-			count.Host++
-		case "VirtualMachine":
-			count.Machine++
-		case "ResourcePool":
-			count.Pool++
-		case "VirtualApp":
-			count.App++
-		case "Folder":
-			count.Folder++
-		case "StoragePod":
-			count.Pod++
-		}
-	}
-
-	return count
-}
-
-func (*Model) fmtName(prefix string, num int) string {
-	return fmt.Sprintf("%s%d", prefix, num)
-}
-
-// Create populates the Model with the given ModelConfig
-func (m *Model) Create() error {
-	m.Service = New(NewServiceInstance(m.ServiceContent, m.RootFolder))
-
-	ctx := context.Background()
-	client := m.Service.client
-	root := object.NewRootFolder(client)
-
-	// After all hosts are created, this var is used to mount the host datastores.
-	var hosts []*object.HostSystem
-	// We need to defer VM creation until after the datastores are created.
-	var vms []func() error
-	// 1 DVS per DC, added to all hosts
-	var dvs *object.DistributedVirtualSwitch
-	// 1 NIC per VM, backed by a DVPG if Model.Portgroup > 0
-	vmnet := esx.EthernetCard.Backing
-
-	// addHost adds a cluster host or a stanalone host.
-	addHost := func(name string, f func(types.HostConnectSpec) (*object.Task, error)) (*object.HostSystem, error) {
-		spec := types.HostConnectSpec{
-			HostName: name,
-		}
-
-		task, err := f(spec)
-		if err != nil {
-			return nil, err
-		}
-
-		info, err := task.WaitForResult(context.Background(), nil)
-		if err != nil {
-			return nil, err
-		}
-
-		host := object.NewHostSystem(client, info.Result.(types.ManagedObjectReference))
-		hosts = append(hosts, host)
-
-		if dvs != nil {
-			config := &types.DVSConfigSpec{
-				Host: []types.DistributedVirtualSwitchHostMemberConfigSpec{{
-					Operation: string(types.ConfigSpecOperationAdd),
-					Host:      host.Reference(),
-				}},
-			}
-
-			_, _ = dvs.Reconfigure(ctx, config)
-		}
-
-		return host, nil
-	}
-
-	// addMachine returns a func to create a VM.
-	addMachine := func(prefix string, host *object.HostSystem, pool *object.ResourcePool, folders *object.DatacenterFolders) {
-		nic := esx.EthernetCard
-		nic.Backing = vmnet
-		ds := types.ManagedObjectReference{}
-
-		f := func() error {
-			for i := 0; i < m.Machine; i++ {
-				name := m.fmtName(prefix+"_VM", i)
-
-				config := types.VirtualMachineConfigSpec{
-					Name:    name,
-					GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-					Files: &types.VirtualMachineFileInfo{
-						VmPathName: "[LocalDS_0]",
-					},
-				}
-
-				if pool == nil {
-					pool, _ = host.ResourcePool(ctx)
-				}
-
-				var devices object.VirtualDeviceList
-
-				scsi, _ := devices.CreateSCSIController("pvscsi")
-				ide, _ := devices.CreateIDEController()
-				cdrom, _ := devices.CreateCdrom(ide.(*types.VirtualIDEController))
-				disk := devices.CreateDisk(scsi.(types.BaseVirtualController), ds,
-					config.Files.VmPathName+" "+path.Join(name, "disk1.vmdk"))
-
-				devices = append(devices, scsi, cdrom, disk, &nic)
-
-				config.DeviceChange, _ = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-
-				task, err := folders.VmFolder.CreateVM(ctx, config, pool, host)
-				if err != nil {
-					return err
-				}
-
-				info, err := task.WaitForResult(ctx, nil)
-				if err != nil {
-					return err
-				}
-
-				vm := object.NewVirtualMachine(client, info.Result.(types.ManagedObjectReference))
-
-				if m.Autostart {
-					_, _ = vm.PowerOn(ctx)
-				}
-			}
-
-			return nil
-		}
-
-		vms = append(vms, f)
-	}
-
-	nfolder := 0
-
-	for ndc := 0; ndc < m.Datacenter; ndc++ {
-		dcName := m.fmtName("DC", ndc)
-		folder := root
-		fName := m.fmtName("F", nfolder)
-
-		// If Datacenter > Folder, don't create folders for the first N DCs.
-		if nfolder < m.Folder && ndc >= (m.Datacenter-m.Folder) {
-			f, err := folder.CreateFolder(ctx, fName)
-			if err != nil {
-				return err
-			}
-			folder = f
-		}
-
-		dc, err := folder.CreateDatacenter(ctx, dcName)
-		if err != nil {
-			return err
-		}
-
-		folders, err := dc.Folders(ctx)
-		if err != nil {
-			return err
-		}
-
-		if m.Pod > 0 {
-			for pod := 0; pod < m.Pod; pod++ {
-				_, _ = folders.DatastoreFolder.CreateStoragePod(ctx, m.fmtName(dcName+"_POD", pod))
-			}
-		}
-
-		if folder != root {
-			// Create sub-folders and use them to create any resources that follow
-			subs := []**object.Folder{&folders.DatastoreFolder, &folders.HostFolder, &folders.NetworkFolder, &folders.VmFolder}
-
-			for _, sub := range subs {
-				f, err := (*sub).CreateFolder(ctx, fName)
-				if err != nil {
-					return err
-				}
-
-				*sub = f
-			}
-
-			nfolder++
-		}
-
-		if m.Portgroup > 0 {
-			var spec types.DVSCreateSpec
-			spec.ConfigSpec = &types.VMwareDVSConfigSpec{}
-			spec.ConfigSpec.GetDVSConfigSpec().Name = m.fmtName("DVS", 0)
-
-			task, err := folders.NetworkFolder.CreateDVS(ctx, spec)
-			if err != nil {
-				return err
-			}
-
-			info, err := task.WaitForResult(ctx, nil)
-			if err != nil {
-				return err
-			}
-
-			dvs = object.NewDistributedVirtualSwitch(client, info.Result.(types.ManagedObjectReference))
-
-			for npg := 0; npg < m.Portgroup; npg++ {
-				name := m.fmtName(dcName+"_DVPG", npg)
-
-				task, err = dvs.AddPortgroup(ctx, []types.DVPortgroupConfigSpec{{Name: name}})
-				if err != nil {
-					return err
-				}
-
-				err = task.Wait(ctx)
-				if err != nil {
-					return err
-				}
-
-				// Use the 1st DVPG for the VMs eth0 backing
-				if npg == 0 {
-					// AddPortgroup_Task does not return the moid, so we look it up by name
-					net := Map.Get(folders.NetworkFolder.Reference()).(*Folder)
-					pg := Map.FindByName(name, net.ChildEntity)
-
-					vmnet, _ = object.NewDistributedVirtualPortgroup(client, pg.Reference()).EthernetCardBackingInfo(ctx)
-				}
-			}
-		}
-
-		for nhost := 0; nhost < m.Host; nhost++ {
-			name := m.fmtName(dcName+"_H", nhost)
-
-			host, err := addHost(name, func(spec types.HostConnectSpec) (*object.Task, error) {
-				return folders.HostFolder.AddStandaloneHost(ctx, spec, true, nil, nil)
-			})
-			if err != nil {
-				return err
-			}
-
-			addMachine(name, host, nil, folders)
-		}
-
-		for ncluster := 0; ncluster < m.Cluster; ncluster++ {
-			clusterName := m.fmtName(dcName+"_C", ncluster)
-
-			cluster, err := folders.HostFolder.CreateCluster(ctx, clusterName, types.ClusterConfigSpecEx{})
-			if err != nil {
-				return err
-			}
-
-			for nhost := 0; nhost < m.ClusterHost; nhost++ {
-				name := m.fmtName(clusterName+"_H", nhost)
-
-				_, err = addHost(name, func(spec types.HostConnectSpec) (*object.Task, error) {
-					return cluster.AddHost(ctx, spec, true, nil, nil)
-				})
-				if err != nil {
-					return err
-				}
-			}
-
-			pool, err := cluster.ResourcePool(ctx)
-			if err != nil {
-				return err
-			}
-
-			prefix := clusterName + "_RP"
-
-			addMachine(prefix+"0", nil, pool, folders)
-
-			for npool := 1; npool <= m.Pool; npool++ {
-				spec := types.DefaultResourceConfigSpec()
-
-				_, err = pool.Create(ctx, m.fmtName(prefix, npool), spec)
-				if err != nil {
-					return err
-				}
-			}
-
-			prefix = clusterName + "_APP"
-
-			for napp := 0; napp < m.App; napp++ {
-				rspec := types.DefaultResourceConfigSpec()
-				vspec := NewVAppConfigSpec()
-				name := m.fmtName(prefix, napp)
-
-				vapp, err := pool.CreateVApp(ctx, name, rspec, vspec, nil)
-				if err != nil {
-					return err
-				}
-
-				addMachine(name, nil, vapp.ResourcePool, folders)
-			}
-		}
-	}
-
-	if m.ServiceContent.RootFolder == esx.RootFolder.Reference() {
-		// ESX model
-		host := object.NewHostSystem(client, esx.HostSystem.Reference())
-		hosts = append(hosts, host)
-
-		dc := object.NewDatacenter(client, esx.Datacenter.Reference())
-		folders, err := dc.Folders(ctx)
-		if err != nil {
-			return err
-		}
-
-		addMachine(host.Reference().Value, host, nil, folders)
-	}
-
-	for i := 0; i < m.Datastore; i++ {
-		err := m.createLocalDatastore(m.fmtName("LocalDS_", i), hosts)
-		if err != nil {
-			return err
-		}
-	}
-
-	for _, createVM := range vms {
-		err := createVM()
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-var tempDir = func() (string, error) {
-	return ioutil.TempDir("", "govcsim-")
-}
-
-func (m *Model) createLocalDatastore(name string, hosts []*object.HostSystem) error {
-	ctx := context.Background()
-	dir, err := tempDir()
-	if err != nil {
-		return err
-	}
-
-	m.dirs = append(m.dirs, dir)
-
-	for _, host := range hosts {
-		dss, err := host.ConfigManager().DatastoreSystem(ctx)
-		if err != nil {
-			return err
-		}
-
-		_, err = dss.CreateLocalDatastore(ctx, name, dir)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Remove cleans up items created by the Model, such as local datastore directories
-func (m *Model) Remove() {
-	for _, dir := range m.dirs {
-		_ = os.RemoveAll(dir)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/model_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/model_test.go
deleted file mode 100644
index e712465423..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/model_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/simulator/vpx"
-)
-
-func compareModel(t *testing.T, m *Model) {
-	count := m.Count()
-
-	hosts := (m.Host + (m.ClusterHost * m.Cluster)) * m.Datacenter
-	vms := ((m.Host + m.Cluster) * m.Datacenter) * m.Machine
-	// child pools + root pools
-	pools := (m.Pool * m.Cluster * m.Datacenter) + (m.Host+m.Cluster)*m.Datacenter
-	// root folder + Datacenter folders {host,vm,datastore,network} + top-level folders
-	folders := 1 + (4 * m.Datacenter) + (5 * m.Folder)
-
-	tests := []struct {
-		expect int
-		actual int
-		kind   string
-	}{
-		{m.Datacenter, count.Datacenter, "Datacenter"},
-		{m.Cluster * m.Datacenter, count.Cluster, "Cluster"},
-		{m.Portgroup * m.Datacenter, count.Portgroup, "Portgroup"},
-		{m.Datastore * m.Datacenter, count.Datastore, "Datastore"},
-		{hosts, count.Host, "Host"},
-		{vms, count.Machine, "VirtualMachine"},
-		{pools, count.Pool, "ResourcePool"},
-		{folders, count.Folder, "Folder"},
-	}
-
-	for _, test := range tests {
-		if test.expect != test.actual {
-			t.Errorf("expected %d %s, actual: %d", test.expect, test.kind, test.actual)
-		}
-	}
-}
-
-func TestModelESX(t *testing.T) {
-	m := ESX()
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Set these for the compareModel math, and for m.Create to fail below
-	m.Datacenter = 1
-	m.Host = 1
-
-	compareModel(t, m)
-
-	err = m.Create()
-	if err == nil {
-		t.Error("expected error")
-	}
-}
-
-func TestModelVPX(t *testing.T) {
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	compareModel(t, m)
-}
-
-func TestModelNoSwitchVPX(t *testing.T) {
-	m := VPX()
-	m.Portgroup = 0 // disabled DVS creation
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	compareModel(t, m)
-}
-
-func TestModelCustomVPX(t *testing.T) {
-	m := &Model{
-		ServiceContent: vpx.ServiceContent,
-		RootFolder:     vpx.RootFolder,
-		Datacenter:     2,
-		Cluster:        2,
-		Host:           2,
-		ClusterHost:    3,
-		Datastore:      1,
-		Machine:        3,
-		Pool:           2,
-		Portgroup:      2,
-	}
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	compareModel(t, m)
-}
-
-func TestModelWithFolders(t *testing.T) {
-	m := VPX()
-	m.Datacenter = 3
-	m.Folder = 2
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	compareModel(t, m)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/option_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/option_manager.go
deleted file mode 100644
index 4615882c36..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/option_manager.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type OptionManager struct {
-	mo.OptionManager
-}
-
-func NewOptionManager(ref *types.ManagedObjectReference, setting []types.BaseOptionValue) object.Reference {
-	s := &OptionManager{}
-	if ref != nil {
-		s.Self = *ref
-	}
-	s.Setting = setting
-	return s
-}
-
-func (m *OptionManager) QueryOptions(req *types.QueryOptions) soap.HasFault {
-	body := &methods.QueryOptionsBody{}
-	res := &types.QueryOptionsResponse{}
-
-	for _, opt := range m.Setting {
-		if strings.HasPrefix(opt.GetOptionValue().Key, req.Name) {
-			res.Returnval = append(res.Returnval, opt)
-		}
-	}
-
-	if len(res.Returnval) == 0 {
-		body.Fault_ = Fault("", &types.InvalidName{Name: req.Name})
-	} else {
-		body.Res = res
-	}
-
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/option_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/option_manager_test.go
deleted file mode 100644
index aa785a8ff5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/option_manager_test.go
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-)
-
-func TestOptionManagerESX(t *testing.T) {
-	ctx := context.Background()
-
-	model := ESX()
-	model.Datastore = 0
-	model.Machine = 0
-
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := model.Service.client
-
-	m := object.NewOptionManager(c, *c.ServiceContent.Setting)
-	_, err = m.Query(ctx, "config.vpxd.")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	host := object.NewHostSystem(c, esx.HostSystem.Reference())
-	m, err = host.ConfigManager().OptionManager(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	res, err := m.Query(ctx, "Config.HostAgent.")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if len(res) == 0 {
-		t.Error("no results")
-	}
-}
-
-func TestOptionManagerVPX(t *testing.T) {
-	ctx := context.Background()
-
-	model := VPX()
-	model.Datastore = 0
-	model.Machine = 0
-
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := model.Service.client
-
-	m := object.NewOptionManager(c, *c.ServiceContent.Setting)
-	_, err = m.Query(ctx, "enoent")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	res, err := m.Query(ctx, "config.vpxd.")
-	if err != nil {
-		t.Error(err)
-	}
-
-	if len(res) == 0 {
-		t.Error("no results")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/os_unix.go b/installer/vendor/github.com/vmware/govmomi/simulator/os_unix.go
deleted file mode 100644
index 63c15621ac..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/os_unix.go
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import "syscall"
-
-func (ds *Datastore) stat() error {
-	info := ds.Info.GetDatastoreInfo()
-	var stat syscall.Statfs_t
-
-	err := syscall.Statfs(info.Url, &stat)
-	if err != nil {
-		return err
-	}
-
-	bsize := uint64(stat.Bsize) / 512
-
-	info.FreeSpace = int64(stat.Bfree*bsize) >> 1
-
-	ds.Summary.FreeSpace = info.FreeSpace
-	ds.Summary.Capacity = int64(stat.Blocks*bsize) >> 1
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/os_windows.go b/installer/vendor/github.com/vmware/govmomi/simulator/os_windows.go
deleted file mode 100644
index 55cf2ab07e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/os_windows.go
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import "os"
-
-func (ds *Datastore) stat() error {
-	info := ds.Info.GetDatastoreInfo()
-
-	_, err := os.Stat(info.Url)
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/performance_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/performance_manager.go
deleted file mode 100644
index e6a70efc0a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/performance_manager.go
+++ /dev/null
@@ -1,35 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type PerformanceManager struct {
-	mo.PerformanceManager
-}
-
-func NewPerformanceManager(ref types.ManagedObjectReference) object.Reference {
-	m := &PerformanceManager{}
-	m.Self = ref
-	m.PerfCounter = esx.PerfCounter
-	return m
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/portgroup.go b/installer/vendor/github.com/vmware/govmomi/simulator/portgroup.go
deleted file mode 100644
index 6c78077b03..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/portgroup.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type DistributedVirtualPortgroup struct {
-	mo.DistributedVirtualPortgroup
-}
-
-func (s *DistributedVirtualPortgroup) ReconfigureDVPortgroupTask(req *types.ReconfigureDVPortgroup_Task) soap.HasFault {
-	task := CreateTask(s, "reconfigureDvPortgroup", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		s.Config.DefaultPortConfig = req.Spec.DefaultPortConfig
-		s.Config.NumPorts = req.Spec.NumPorts
-		s.Config.AutoExpand = req.Spec.AutoExpand
-		s.Config.Type = req.Spec.Type
-		s.Config.Description = req.Spec.Description
-		s.Config.DynamicData = req.Spec.DynamicData
-		s.Config.Name = req.Spec.Name
-		s.Config.Policy = req.Spec.Policy
-		s.Config.PortNameFormat = req.Spec.PortNameFormat
-		s.Config.VmVnicNetworkResourcePoolKey = req.Spec.VmVnicNetworkResourcePoolKey
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.ReconfigureDVPortgroup_TaskBody{
-		Res: &types.ReconfigureDVPortgroup_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (s *DistributedVirtualPortgroup) DestroyTask(req *types.Destroy_Task) soap.HasFault {
-	task := CreateTask(s, "destroy", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		vswitch := Map.Get(*s.Config.DistributedVirtualSwitch).(*DistributedVirtualSwitch)
-		for i, pg := range vswitch.Portgroup {
-			if pg.Reference() == s.Reference() {
-				vswitch.Portgroup = append(vswitch.Portgroup[:i], vswitch.Portgroup[i+1:]...)
-				break
-			}
-		}
-
-		f := Map.getEntityParent(vswitch, "Folder").(*Folder)
-		f.removeChild(s.Reference())
-
-		for i, name := range vswitch.Summary.PortgroupName {
-			if name == s.Name {
-				vswitch.Summary.PortgroupName = append(vswitch.Summary.PortgroupName[:i],
-					vswitch.Summary.PortgroupName[i+1:]...)
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.Destroy_TaskBody{
-		Res: &types.Destroy_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/portgroup_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/portgroup_test.go
deleted file mode 100644
index 51d2f91ff2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/portgroup_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestReconfigurePortgroup(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer m.Remove()
-
-	c := m.Service.client
-
-	dvs := object.NewDistributedVirtualSwitch(c,
-		Map.Any("DistributedVirtualSwitch").Reference())
-
-	spec := []types.DVPortgroupConfigSpec{
-		types.DVPortgroupConfigSpec{
-			Name:     "pg1",
-			NumPorts: 10,
-		},
-	}
-
-	task, err := dvs.AddPortgroup(ctx, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pg := object.NewDistributedVirtualPortgroup(c,
-		Map.Any("DistributedVirtualPortgroup").Reference())
-	pgspec := types.DVPortgroupConfigSpec{
-		NumPorts: 5,
-		Name:     "pg1",
-	}
-
-	task, err = pg.Reconfigure(ctx, pgspec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pge := Map.Get(pg.Reference()).(*DistributedVirtualPortgroup)
-	if pge.Config.Name != "pg1" || pge.Config.NumPorts != 5 {
-		t.Fatalf("expect pg.Name==pg1 && pg.Config.NumPort==5; got %s,%d",
-			pge.Config.Name, pge.Config.NumPorts)
-	}
-
-	task, err = pg.Destroy(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/property_collector.go b/installer/vendor/github.com/vmware/govmomi/simulator/property_collector.go
deleted file mode 100644
index 8ef7898d84..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/property_collector.go
+++ /dev/null
@@ -1,548 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"errors"
-	"log"
-	"path"
-	"reflect"
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type PropertyCollector struct {
-	mo.PropertyCollector
-}
-
-func NewPropertyCollector(ref types.ManagedObjectReference) object.Reference {
-	s := &PropertyCollector{}
-	s.Self = ref
-	return s
-}
-
-var errMissingField = errors.New("missing field")
-var errEmptyField = errors.New("empty field")
-
-func getObject(ref types.ManagedObjectReference) (reflect.Value, bool) {
-	obj := Map.Get(ref)
-	if obj == nil {
-		return reflect.Value{}, false
-	}
-
-	rval := reflect.ValueOf(obj).Elem()
-	rtype := rval.Type()
-
-	// PropertyCollector is for Managed Object types only (package mo).
-	// If the registry object is not in the mo package, assume it is a wrapper
-	// type where the first field is an embedded mo type.
-	// We need to dig out the mo type for PropSet.All to work properly and
-	// for the case where the type has a field of the same name, for example:
-	// mo.ResourcePool.ResourcePool
-	for {
-		if path.Base(rtype.PkgPath()) != "mo" {
-			if rtype.Kind() != reflect.Struct || rtype.NumField() == 0 {
-				log.Printf("%#v does not have an embedded mo type", ref)
-				return reflect.Value{}, false
-			}
-			rval = rval.Field(0)
-			rtype = rval.Type()
-		} else {
-			break
-		}
-	}
-
-	return rval, true
-}
-
-func fieldValueInterface(f reflect.StructField, rval reflect.Value) interface{} {
-	if rval.Kind() == reflect.Ptr {
-		rval = rval.Elem()
-	}
-
-	pval := rval.Interface()
-
-	if rval.Kind() == reflect.Slice {
-		// Convert slice to types.ArrayOf*
-		switch v := pval.(type) {
-		case []string:
-			pval = &types.ArrayOfString{
-				String: v,
-			}
-		case []int32:
-			pval = &types.ArrayOfInt{
-				Int: v,
-			}
-		default:
-			kind := f.Type.Elem().Name()
-			// Remove govmomi interface prefix name
-			if strings.HasPrefix(kind, "Base") {
-				kind = kind[4:]
-			}
-			akind, _ := typeFunc("ArrayOf" + kind)
-			a := reflect.New(akind)
-			a.Elem().FieldByName(kind).Set(rval)
-			pval = a.Interface()
-		}
-	}
-
-	return pval
-}
-
-func fieldValue(rval reflect.Value, p string) (interface{}, error) {
-	var value interface{}
-
-	fields := strings.Split(p, ".")
-
-	for i, name := range fields {
-		kind := rval.Type().Kind()
-
-		if kind == reflect.Interface {
-			if rval.IsNil() {
-				continue
-			}
-			rval = rval.Elem()
-			kind = rval.Type().Kind()
-		}
-
-		if kind == reflect.Ptr {
-			if rval.IsNil() {
-				continue
-			}
-			rval = rval.Elem()
-		}
-
-		x := ucFirst(name)
-		val := rval.FieldByName(x)
-		if !val.IsValid() {
-			return nil, errMissingField
-		}
-
-		if isEmpty(val) {
-			return nil, errEmptyField
-		}
-
-		if i == len(fields)-1 {
-			ftype, _ := rval.Type().FieldByName(x)
-			value = fieldValueInterface(ftype, val)
-			break
-		}
-
-		rval = val
-	}
-
-	return value, nil
-}
-
-func fieldRefs(f interface{}) []types.ManagedObjectReference {
-	switch fv := f.(type) {
-	case types.ManagedObjectReference:
-		return []types.ManagedObjectReference{fv}
-	case *types.ArrayOfManagedObjectReference:
-		return fv.ManagedObjectReference
-	case nil:
-		// empty field
-	}
-
-	return nil
-}
-
-func isEmpty(rval reflect.Value) bool {
-	switch rval.Kind() {
-	case reflect.Ptr:
-		return rval.IsNil()
-	case reflect.String, reflect.Slice:
-		return rval.Len() == 0
-	}
-
-	return false
-}
-
-func isTrue(v *bool) bool {
-	return v != nil && *v
-}
-
-func isFalse(v *bool) bool {
-	return v == nil || *v == false
-}
-
-func lcFirst(s string) string {
-	return strings.ToLower(s[:1]) + s[1:]
-}
-
-func ucFirst(s string) string {
-	return strings.ToUpper(s[:1]) + s[1:]
-}
-
-type retrieveResult struct {
-	*types.RetrieveResult
-	req       *types.RetrievePropertiesEx
-	collected map[types.ManagedObjectReference]bool
-	specs     map[string]*types.TraversalSpec
-}
-
-func (rr *retrieveResult) collectAll(rval reflect.Value, rtype reflect.Type, content *types.ObjectContent) {
-	for i := 0; i < rval.NumField(); i++ {
-		val := rval.Field(i)
-
-		f := rtype.Field(i)
-
-		if isEmpty(val) || f.Name == "Self" {
-			continue
-		}
-
-		if f.Anonymous {
-			// recurse into embedded field
-			rr.collectAll(val, f.Type, content)
-			continue
-		}
-
-		content.PropSet = append(content.PropSet, types.DynamicProperty{
-			Name: lcFirst(f.Name),
-			Val:  fieldValueInterface(f, val),
-		})
-	}
-}
-
-func (rr *retrieveResult) collectFields(rval reflect.Value, fields []string, content *types.ObjectContent) {
-	seen := make(map[string]bool)
-
-	for i := range content.PropSet {
-		seen[content.PropSet[i].Name] = true // mark any already collected via embedded field
-	}
-
-	for _, name := range fields {
-		if seen[name] {
-			// rvc 'ls' includes the "name" property twice, then fails with no error message or stack trace
-			// in RbVmomi::VIM::ObjectContent.to_hash_uncached when it sees the 2nd "name" property.
-			continue
-		}
-		seen[name] = true
-
-		val, err := fieldValue(rval, name)
-		if err == nil {
-			prop := types.DynamicProperty{
-				Name: name,
-				Val:  val,
-			}
-
-			content.PropSet = append(content.PropSet, prop)
-			continue
-		}
-
-		switch err {
-		case errEmptyField:
-			// ok
-		case errMissingField:
-			content.MissingSet = append(content.MissingSet, types.MissingProperty{
-				Path: name,
-				Fault: types.LocalizedMethodFault{Fault: &types.InvalidProperty{
-					Name: name,
-				}},
-			})
-		}
-	}
-}
-
-func (rr *retrieveResult) collect(ref types.ManagedObjectReference) {
-	if rr.collected[ref] {
-		return
-	}
-
-	content := types.ObjectContent{
-		Obj: ref,
-	}
-
-	rval, ok := getObject(ref)
-	if !ok {
-		// Possible if a test uses Map.Remove instead of Destroy_Task
-		log.Printf("object %s no longer exists", ref)
-		return
-	}
-
-	rtype := rval.Type()
-
-	for _, spec := range rr.req.SpecSet {
-		for _, p := range spec.PropSet {
-			if p.Type != ref.Type {
-				// e.g. ManagedEntity, ComputeResource
-				field, ok := rtype.FieldByName(p.Type)
-
-				if !(ok && field.Anonymous) {
-					continue
-				}
-			}
-
-			if isTrue(p.All) {
-				rr.collectAll(rval, rtype, &content)
-				continue
-			}
-
-			rr.collectFields(rval, p.PathSet, &content)
-		}
-	}
-
-	if len(content.PropSet) != 0 || len(content.MissingSet) != 0 {
-		rr.Objects = append(rr.Objects, content)
-	}
-
-	rr.collected[ref] = true
-}
-
-func (rr *retrieveResult) selectSet(obj reflect.Value, s []types.BaseSelectionSpec, refs *[]types.ManagedObjectReference) types.BaseMethodFault {
-	for _, ss := range s {
-		ts, ok := ss.(*types.TraversalSpec)
-
-		if ok {
-			if ts.Name != "" {
-				rr.specs[ts.Name] = ts
-			}
-		}
-	}
-
-	for _, ss := range s {
-		ts, ok := ss.(*types.TraversalSpec)
-		if !ok {
-			ts = rr.specs[ss.GetSelectionSpec().Name]
-			if ts == nil {
-				return &types.InvalidArgument{InvalidProperty: "undefined TraversalSpec name"}
-			}
-		}
-
-		f, _ := fieldValue(obj, ts.Path)
-
-		for _, ref := range fieldRefs(f) {
-			if isFalse(ts.Skip) {
-				*refs = append(*refs, ref)
-			}
-
-			rval, ok := getObject(ref)
-			if ok {
-				if err := rr.selectSet(rval, ts.SelectSet, refs); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	return nil
-}
-
-func (pc *PropertyCollector) collect(r *types.RetrievePropertiesEx) (*types.RetrieveResult, types.BaseMethodFault) {
-	var refs []types.ManagedObjectReference
-
-	rr := &retrieveResult{
-		RetrieveResult: &types.RetrieveResult{},
-		req:            r,
-		collected:      make(map[types.ManagedObjectReference]bool),
-		specs:          make(map[string]*types.TraversalSpec),
-	}
-
-	// Select object references
-	for _, spec := range r.SpecSet {
-		for _, o := range spec.ObjectSet {
-			rval, ok := getObject(o.Obj)
-
-			if !ok {
-				if isFalse(spec.ReportMissingObjectsInResults) {
-					return nil, &types.ManagedObjectNotFound{Obj: o.Obj}
-				}
-				continue
-			}
-
-			if o.SelectSet == nil || isFalse(o.Skip) {
-				refs = append(refs, o.Obj)
-			}
-
-			if err := rr.selectSet(rval, o.SelectSet, &refs); err != nil {
-				return nil, err
-			}
-		}
-	}
-
-	for _, ref := range refs {
-		rr.collect(ref)
-	}
-
-	return rr.RetrieveResult, nil
-}
-
-func (pc *PropertyCollector) CreateFilter(c *types.CreateFilter) soap.HasFault {
-	body := &methods.CreateFilterBody{}
-
-	filter := &PropertyFilter{pc: pc}
-	filter.PartialUpdates = c.PartialUpdates
-	filter.Spec = c.Spec
-
-	pc.Filter = append(pc.Filter, Map.Put(filter).Reference())
-
-	body.Res = &types.CreateFilterResponse{
-		Returnval: filter.Self,
-	}
-
-	return body
-}
-
-func (pc *PropertyCollector) CreatePropertyCollector(c *types.CreatePropertyCollector) soap.HasFault {
-	body := &methods.CreatePropertyCollectorBody{}
-
-	cpc := &PropertyCollector{}
-
-	body.Res = &types.CreatePropertyCollectorResponse{
-		Returnval: Map.Put(cpc).Reference(),
-	}
-
-	return body
-}
-
-func (pc *PropertyCollector) DestroyPropertyCollector(c *types.DestroyPropertyCollector) soap.HasFault {
-	body := &methods.DestroyPropertyCollectorBody{}
-
-	for _, ref := range pc.Filter {
-		filter := Map.Get(ref).(*PropertyFilter)
-		filter.DestroyPropertyFilter(&types.DestroyPropertyFilter{This: ref})
-	}
-
-	Map.Remove(c.This)
-
-	body.Res = &types.DestroyPropertyCollectorResponse{}
-
-	return body
-}
-
-func (pc *PropertyCollector) RetrievePropertiesEx(r *types.RetrievePropertiesEx) soap.HasFault {
-	body := &methods.RetrievePropertiesExBody{}
-
-	res, fault := pc.collect(r)
-
-	if fault != nil {
-		body.Fault_ = Fault("", fault)
-	} else {
-		body.Res = &types.RetrievePropertiesExResponse{
-			Returnval: res,
-		}
-	}
-
-	return body
-}
-
-// RetrieveProperties is deprecated, but govmomi is still using it at the moment.
-func (pc *PropertyCollector) RetrieveProperties(r *types.RetrieveProperties) soap.HasFault {
-	body := &methods.RetrievePropertiesBody{}
-
-	res := pc.RetrievePropertiesEx(&types.RetrievePropertiesEx{
-		This:    r.This,
-		SpecSet: r.SpecSet,
-	})
-
-	if res.Fault() != nil {
-		body.Fault_ = res.Fault()
-	} else {
-		body.Res = &types.RetrievePropertiesResponse{
-			Returnval: res.(*methods.RetrievePropertiesExBody).Res.Returnval.Objects,
-		}
-	}
-
-	return body
-}
-
-func (pc *PropertyCollector) CancelWaitForUpdates(r *types.CancelWaitForUpdates) soap.HasFault {
-	return &methods.CancelWaitForUpdatesBody{Res: new(types.CancelWaitForUpdatesResponse)}
-}
-
-func (pc *PropertyCollector) WaitForUpdatesEx(r *types.WaitForUpdatesEx) soap.HasFault {
-	body := &methods.WaitForUpdatesExBody{}
-
-	// At the moment we need to support Task completion.  Handlers can simply set the Task
-	// state before returning and the non-incremental update is enough for the client.
-	// We can wait for incremental updates to simulate timeouts, etc.
-	if r.Version != "" {
-		body.Fault_ = Fault("incremental updates not supported yet", &types.NotSupported{})
-		return body
-	}
-
-	update := &types.UpdateSet{
-		Version: "-",
-	}
-
-	for _, ref := range pc.Filter {
-		filter := Map.Get(ref).(*PropertyFilter)
-
-		r := &types.RetrievePropertiesEx{}
-		r.SpecSet = append(r.SpecSet, filter.Spec)
-
-		res, fault := pc.collect(r)
-		if fault != nil {
-			body.Fault_ = Fault("", fault)
-			return body
-		}
-
-		fu := types.PropertyFilterUpdate{
-			Filter: ref,
-		}
-
-		for _, o := range res.Objects {
-			ou := types.ObjectUpdate{
-				Obj:  o.Obj,
-				Kind: types.ObjectUpdateKindEnter,
-			}
-
-			for _, p := range o.PropSet {
-				ou.ChangeSet = append(ou.ChangeSet, types.PropertyChange{
-					Op:   types.PropertyChangeOpAssign,
-					Name: p.Name,
-					Val:  p.Val,
-				})
-			}
-
-			fu.ObjectSet = append(fu.ObjectSet, ou)
-		}
-
-		update.FilterSet = append(update.FilterSet, fu)
-	}
-
-	body.Res = &types.WaitForUpdatesExResponse{
-		Returnval: update,
-	}
-
-	return body
-}
-
-// WaitForUpdates is deprecated, but pyvmomi is still using it at the moment.
-func (pc *PropertyCollector) WaitForUpdates(r *types.WaitForUpdates) soap.HasFault {
-	body := &methods.WaitForUpdatesBody{}
-
-	res := pc.WaitForUpdatesEx(&types.WaitForUpdatesEx{
-		This:    r.This,
-		Version: r.Version,
-	})
-
-	if res.Fault() != nil {
-		body.Fault_ = res.Fault()
-	} else {
-		body.Res = &types.WaitForUpdatesResponse{
-			Returnval: *res.(*methods.WaitForUpdatesExBody).Res.Returnval,
-		}
-	}
-
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/property_collector_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/property_collector_test.go
deleted file mode 100644
index f99fb19569..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/property_collector_test.go
+++ /dev/null
@@ -1,893 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestRetrieveProperties(t *testing.T) {
-	configs := []struct {
-		folder  mo.Folder
-		content types.ServiceContent
-		dc      *types.ManagedObjectReference
-	}{
-		{esx.RootFolder, esx.ServiceContent, &esx.Datacenter.Self},
-		{vpx.RootFolder, vpx.ServiceContent, nil},
-	}
-
-	for _, config := range configs {
-		s := New(NewServiceInstance(config.content, config.folder))
-
-		ts := s.NewServer()
-		defer ts.Close()
-
-		ctx := context.Background()
-
-		client, err := govmomi.NewClient(ctx, ts.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if config.dc == nil {
-			dc, cerr := object.NewRootFolder(client.Client).CreateDatacenter(ctx, "dc1")
-			if cerr != nil {
-				t.Fatal(cerr)
-			}
-			ref := dc.Reference()
-			config.dc = &ref
-		}
-
-		// Retrieve a specific property
-		f := mo.Folder{}
-		err = client.RetrieveOne(ctx, config.content.RootFolder, []string{"name"}, &f)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if f.Name != config.folder.Name {
-			t.Fail()
-		}
-
-		// Retrieve all properties
-		f = mo.Folder{}
-		err = client.RetrieveOne(ctx, config.content.RootFolder, nil, &f)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if f.Name != config.folder.Name {
-			t.Fatalf("'%s' vs '%s'", f.Name, config.folder.Name)
-		}
-
-		// Retrieve an ArrayOf property
-		f = mo.Folder{}
-		err = client.RetrieveOne(ctx, config.content.RootFolder, []string{"childEntity"}, &f)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(f.ChildEntity) != 1 {
-			t.Fail()
-		}
-
-		es, err := mo.Ancestors(ctx, client.Client, config.content.PropertyCollector, config.content.RootFolder)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(es) != 1 {
-			t.Fail()
-		}
-
-		finder := find.NewFinder(client.Client, false)
-		dc, err := finder.DatacenterOrDefault(ctx, "")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if dc.Reference() != *config.dc {
-			t.Fail()
-		}
-
-		finder.SetDatacenter(dc)
-
-		es, err = mo.Ancestors(ctx, client.Client, config.content.PropertyCollector, dc.Reference())
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		expect := map[string]types.ManagedObjectReference{
-			"Folder":     config.folder.Reference(),
-			"Datacenter": dc.Reference(),
-		}
-
-		if len(es) != len(expect) {
-			t.Fail()
-		}
-
-		for _, e := range es {
-			ref := e.Reference()
-			if r, ok := expect[ref.Type]; ok {
-				if r != ref {
-					t.Errorf("%#v vs %#v", r, ref)
-				}
-			} else {
-				t.Errorf("unexpected object %#v", e.Reference())
-			}
-		}
-
-		// finder tests
-		ls, err := finder.ManagedObjectListChildren(ctx, ".")
-		if err != nil {
-			t.Error(err)
-		}
-
-		folders, err := dc.Folders(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Validated name properties are recursively retrieved for the datacenter and its folder children
-		ipaths := []string{
-			folders.VmFolder.InventoryPath,
-			folders.HostFolder.InventoryPath,
-			folders.DatastoreFolder.InventoryPath,
-			folders.NetworkFolder.InventoryPath,
-		}
-
-		var lpaths []string
-		for _, p := range ls {
-			lpaths = append(lpaths, p.Path)
-		}
-
-		if !reflect.DeepEqual(ipaths, lpaths) {
-			t.Errorf("%#v != %#v\n", ipaths, lpaths)
-		}
-
-		// We have no VMs, expect NotFoundError
-		_, err = finder.VirtualMachineList(ctx, "*")
-		if err == nil {
-			t.Error("expected error")
-		} else {
-			if _, ok := err.(*find.NotFoundError); !ok {
-				t.Error(err)
-			}
-		}
-
-		// Retrieve a missing property
-		mdc := mo.Datacenter{}
-		err = client.RetrieveOne(ctx, dc.Reference(), []string{"enoent"}, &mdc)
-		if err == nil {
-			t.Error("expected error")
-		} else {
-			switch fault := soap.ToVimFault(err).(type) {
-			case *types.InvalidProperty:
-				// ok
-			default:
-				t.Errorf("unexpected fault: %#v", fault)
-			}
-		}
-
-		// Retrieve a nested property
-		Map.Get(dc.Reference()).(*mo.Datacenter).Configuration.DefaultHardwareVersionKey = "foo"
-		mdc = mo.Datacenter{}
-		err = client.RetrieveOne(ctx, dc.Reference(), []string{"configuration.defaultHardwareVersionKey"}, &mdc)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if mdc.Configuration.DefaultHardwareVersionKey != "foo" {
-			t.Fail()
-		}
-
-		// Retrieve a missing nested property
-		mdc = mo.Datacenter{}
-		err = client.RetrieveOne(ctx, dc.Reference(), []string{"configuration.enoent"}, &mdc)
-		if err == nil {
-			t.Error("expected error")
-		} else {
-			switch fault := soap.ToVimFault(err).(type) {
-			case *types.InvalidProperty:
-				// ok
-			default:
-				t.Errorf("unexpected fault: %#v", fault)
-			}
-		}
-
-		// Retrieve an empty property
-		err = client.RetrieveOne(ctx, dc.Reference(), []string{""}, &mdc)
-		if err != nil {
-			t.Error(err)
-		}
-
-		// Expect ManagedObjectNotFoundError
-		Map.Remove(dc.Reference())
-		err = client.RetrieveOne(ctx, dc.Reference(), []string{"name"}, &mdc)
-		if err == nil {
-			t.Fatal("expected error")
-		}
-	}
-}
-
-func TestWaitForUpdates(t *testing.T) {
-	folder := esx.RootFolder
-	s := New(NewServiceInstance(esx.ServiceContent, folder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cb := func(once bool) func([]types.PropertyChange) bool {
-		return func(pc []types.PropertyChange) bool {
-			if len(pc) != 1 {
-				t.Fail()
-			}
-
-			c := pc[0]
-			if c.Op != types.PropertyChangeOpAssign {
-				t.Fail()
-			}
-			if c.Name != "name" {
-				t.Fail()
-			}
-			if c.Val.(string) != folder.Name {
-				t.Fail()
-			}
-
-			return once
-		}
-	}
-
-	pc := property.DefaultCollector(c.Client)
-	props := []string{"name"}
-
-	err = property.Wait(ctx, pc, folder.Reference(), props, cb(true))
-	if err != nil {
-		t.Error(err)
-	}
-
-	// incremental updates not yet suppported
-	err = property.Wait(ctx, pc, folder.Reference(), props, cb(false))
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// test object not found
-	Map.Remove(folder.Reference())
-
-	err = property.Wait(ctx, pc, folder.Reference(), props, cb(true))
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// test CancelWaitForUpdates
-	p, err := pc.Create(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// test the deprecated WaitForUpdates methods
-	_, err = methods.WaitForUpdates(ctx, c.Client, &types.WaitForUpdates{This: p.Reference()})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = methods.CancelWaitForUpdates(ctx, c.Client, &types.CancelWaitForUpdates{This: p.Reference()})
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCollectInterfaceType(t *testing.T) {
-	// test that we properly collect an interface type (types.BaseVirtualDevice in this case)
-	var config types.VirtualMachineConfigInfo
-	config.Hardware.Device = append(config.Hardware.Device, new(types.VirtualFloppy))
-
-	_, err := fieldValue(reflect.ValueOf(&config), "hardware.device")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestExtractEmbeddedField(t *testing.T) {
-	type YourResourcePool struct {
-		mo.ResourcePool
-	}
-
-	type MyResourcePool struct {
-		YourResourcePool
-	}
-
-	x := new(MyResourcePool)
-
-	Map.Put(x)
-
-	obj, ok := getObject(x.Reference())
-	if !ok {
-		t.Error("expected obj")
-	}
-
-	if obj.Type() != reflect.ValueOf(new(mo.ResourcePool)).Elem().Type() {
-		t.Errorf("unexpected type=%s", obj.Type().Name())
-	}
-
-	// satisfies the mo.Reference interface, but does not embed a type from the "mo" package
-	type NoMo struct {
-		types.ManagedObjectReference
-
-		Self types.ManagedObjectReference
-	}
-
-	n := new(NoMo)
-	n.ManagedObjectReference = types.ManagedObjectReference{Type: "NoMo", Value: "no-mo"}
-	Map.Put(n)
-
-	_, ok = getObject(n.Reference())
-	if ok {
-		t.Error("expected not ok")
-	}
-}
-
-func TestPropertyCollectorFold(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	client, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cluster := Map.Any("ClusterComputeResource")
-	compute := Map.Any("ComputeResource")
-
-	// Test that we fold duplicate properties (rbvmomi depends on this)
-	var content []types.ObjectContent
-	err = client.Retrieve(ctx, []types.ManagedObjectReference{cluster.Reference()}, []string{"name", "name"}, &content)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(content) != 1 {
-		t.Fatalf("len(content)=%d", len(content))
-	}
-	if len(content[0].PropSet) != 1 {
-		t.Fatalf("len(PropSet)=%d", len(content[0].PropSet))
-	}
-
-	// Test that we fold embedded type properties (rbvmomi depends on this)
-	req := types.RetrieveProperties{
-		SpecSet: []types.PropertyFilterSpec{
-			{
-				PropSet: []types.PropertySpec{
-					{
-						DynamicData: types.DynamicData{},
-						Type:        "ComputeResource",
-						PathSet:     []string{"name"},
-					},
-					{
-						DynamicData: types.DynamicData{},
-						Type:        "ClusterComputeResource",
-						PathSet:     []string{"name"},
-					},
-				},
-				ObjectSet: []types.ObjectSpec{
-					{
-						Obj: compute.Reference(),
-					},
-					{
-						Obj: cluster.Reference(),
-					},
-				},
-			},
-		},
-	}
-
-	pc := client.PropertyCollector()
-
-	res, err := pc.RetrieveProperties(ctx, req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	content = res.Returnval
-
-	if len(content) != 2 {
-		t.Fatalf("len(content)=%d", len(content))
-	}
-
-	for _, oc := range content {
-		if len(oc.PropSet) != 1 {
-			t.Errorf("%s len(PropSet)=%d", oc.Obj, len(oc.PropSet))
-		}
-	}
-}
-
-func TestPropertyCollectorInvalidSpecName(t *testing.T) {
-	obj := Map.Put(new(Folder))
-	obj.(*Folder).putChild(new(Folder))
-
-	pc := &PropertyCollector{}
-
-	req := types.RetrievePropertiesEx{
-		SpecSet: []types.PropertyFilterSpec{
-			{
-				PropSet: []types.PropertySpec{
-					{
-						Type:    obj.Reference().Type,
-						PathSet: []string{"name"},
-					},
-				},
-				ObjectSet: []types.ObjectSpec{
-					{
-						Obj: obj.Reference(),
-						SelectSet: []types.BaseSelectionSpec{
-							&types.TraversalSpec{
-								Type: "Folder",
-								Path: "childEntity",
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "enoent",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	_, err := pc.collect(&req)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	if _, ok := err.(*types.InvalidArgument); !ok {
-		t.Errorf("unexpected fault: %#v", err)
-	}
-}
-
-func TestPropertyCollectorRecursiveSelectSet(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	client, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Capture of PowerCLI's Get-VM spec
-	req := types.RetrieveProperties{
-		SpecSet: []types.PropertyFilterSpec{
-			{
-				PropSet: []types.PropertySpec{
-					{
-						Type: "VirtualMachine",
-						PathSet: []string{
-							"runtime.host",
-							"parent",
-							"resourcePool",
-							"resourcePool",
-							"datastore",
-							"config.swapPlacement",
-							"config.version",
-							"config.instanceUuid",
-							"config.guestId",
-							"config.annotation",
-							"summary.storage.committed",
-							"summary.storage.uncommitted",
-							"summary.storage.committed",
-							"config.template",
-						},
-					},
-				},
-				ObjectSet: []types.ObjectSpec{
-					{
-						Obj:  client.ServiceContent.RootFolder,
-						Skip: types.NewBool(false),
-						SelectSet: []types.BaseSelectionSpec{
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "traverseFolders",
-								},
-								Type: "Folder",
-								Path: "childEntity",
-								Skip: types.NewBool(true),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.TraversalSpec{
-										Type: "HostSystem",
-										Path: "vm",
-										Skip: types.NewBool(false),
-									},
-									&types.TraversalSpec{
-										Type: "ComputeResource",
-										Path: "host",
-										Skip: types.NewBool(true),
-										SelectSet: []types.BaseSelectionSpec{
-											&types.TraversalSpec{
-												Type: "HostSystem",
-												Path: "vm",
-												Skip: types.NewBool(false),
-											},
-										},
-									},
-									&types.TraversalSpec{
-										Type: "Datacenter",
-										Path: "hostFolder",
-										Skip: types.NewBool(true),
-										SelectSet: []types.BaseSelectionSpec{
-											&types.SelectionSpec{
-												Name: "traverseFolders",
-											},
-										},
-									},
-									&types.SelectionSpec{
-										Name: "traverseFolders",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	pc := client.PropertyCollector()
-
-	res, err := pc.RetrieveProperties(ctx, req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	content := res.Returnval
-
-	count := m.Count()
-
-	if len(content) != count.Machine {
-		t.Fatalf("len(content)=%d", len(content))
-	}
-}
-
-func TestPropertyCollectorSelectionSpec(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	client, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Capture of PowerCLI's Start-VM spec
-	// Differs from the norm in that:
-	// 1) Named SelectionSpec before TraversalSpec is defined
-	// 2) Skip=false for all mo types, but PropSet only has Type VirtualMachine
-	req := types.RetrieveProperties{
-		SpecSet: []types.PropertyFilterSpec{
-			{
-				PropSet: []types.PropertySpec{
-					{
-						Type:    "VirtualMachine",
-						All:     types.NewBool(false),
-						PathSet: []string{"name", "parent", "runtime.host", "config.template"},
-					},
-				},
-				ObjectSet: []types.ObjectSpec{
-					{
-						Obj:  client.ServiceContent.RootFolder,
-						Skip: types.NewBool(false),
-						SelectSet: []types.BaseSelectionSpec{
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "folderTraversalSpec",
-								},
-								Type: "Folder",
-								Path: "childEntity",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "computeResourceRpTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "computeResourceHostTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "datacenterHostTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "hostVmTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "resourcePoolVmTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "hostRpTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "datacenterVmTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "datastoreVmTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "datacenterDatastoreTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "vappTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "datacenterNetworkTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "computeResourceHostTraversalSpec",
-								},
-								Type: "ComputeResource",
-								Path: "host",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "hostVmTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "computeResourceRpTraversalSpec",
-								},
-								Type: "ComputeResource",
-								Path: "resourcePool",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "resourcePoolTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "vappTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "datacenterHostTraversalSpec",
-								},
-								Type: "Datacenter",
-								Path: "hostFolder",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "resourcePoolTraversalSpec",
-								},
-								Type: "ResourcePool",
-								Path: "resourcePool",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "resourcePoolTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "resourcePoolVmTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "hostVmTraversalSpec",
-								},
-								Type: "HostSystem",
-								Path: "vm",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "datacenterVmTraversalSpec",
-								},
-								Type: "Datacenter",
-								Path: "vmFolder",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "resourcePoolVmTraversalSpec",
-								},
-								Type: "ResourcePool",
-								Path: "vm",
-								Skip: types.NewBool(false),
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "datastoreVmTraversalSpec",
-								},
-								Type: "Datastore",
-								Path: "vm",
-								Skip: types.NewBool(false),
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "datacenterDatastoreTraversalSpec",
-								},
-								Type: "Datacenter",
-								Path: "datastoreFolder",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "vappTraversalSpec",
-								},
-								Type: "VirtualApp",
-								Path: "resourcePool",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "vappTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "resourcePoolTraversalSpec",
-									},
-									&types.SelectionSpec{
-										Name: "resourcePoolVmTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "vappVmTraversalSpec",
-								},
-								Type: "VirtualApp",
-								Path: "vm",
-								Skip: types.NewBool(false),
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "distributedSwitchHostTraversalSpec",
-								},
-								Type: "DistributedVirtualSwitch",
-								Path: "summary.hostMember",
-								Skip: types.NewBool(false),
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "distributedSwitchVmTraversalSpec",
-								},
-								Type: "DistributedVirtualSwitch",
-								Path: "summary.vm",
-								Skip: types.NewBool(false),
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "datacenterNetworkTraversalSpec",
-								},
-								Type: "Datacenter",
-								Path: "networkFolder",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "folderTraversalSpec",
-									},
-								},
-							},
-							&types.TraversalSpec{
-								SelectionSpec: types.SelectionSpec{
-									Name: "hostRpTraversalSpec",
-								},
-								Type: "HostSystem",
-								Path: "parent",
-								Skip: types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{
-									&types.SelectionSpec{
-										Name: "computeResourceRpTraversalSpec",
-									},
-								},
-							},
-						},
-					},
-				},
-			},
-		},
-	}
-
-	pc := client.PropertyCollector()
-
-	res, err := pc.RetrieveProperties(ctx, req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	content := res.Returnval
-	count := m.Count()
-
-	if len(content) != count.Machine {
-		t.Fatalf("len(content)=%d", len(content))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/property_filter.go b/installer/vendor/github.com/vmware/govmomi/simulator/property_filter.go
deleted file mode 100644
index 0d7d9a38da..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/property_filter.go
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type PropertyFilter struct {
-	mo.PropertyFilter
-
-	pc *PropertyCollector
-}
-
-func (f *PropertyFilter) DestroyPropertyFilter(c *types.DestroyPropertyFilter) soap.HasFault {
-	body := &methods.DestroyPropertyFilterBody{}
-
-	f.pc.Filter = RemoveReference(c.This, f.pc.Filter)
-
-	Map.Remove(c.This)
-
-	body.Res = &types.DestroyPropertyFilterResponse{}
-
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/registry.go b/installer/vendor/github.com/vmware/govmomi/simulator/registry.go
deleted file mode 100644
index c825957d7a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/registry.go
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// This is a map from a reference type name to a reference value name prefix.
-// It's a convention that VirtualCenter follows. The map is not complete, but
-// it should cover the most popular objects.
-var refValueMap = map[string]string{
-	"DistributedVirtualPortgroup":    "dvportgroup",
-	"EnvironmentBrowser":             "envbrowser",
-	"HostSystem":                     "host",
-	"ResourcePool":                   "resgroup",
-	"VirtualMachine":                 "vm",
-	"VirtualMachineSnapshot":         "snapshot",
-	"VmwareDistributedVirtualSwitch": "dvs",
-}
-
-// Map is the default Registry instance.
-var Map = NewRegistry()
-
-// RegisterObject interface supports callbacks when objects are added and removed from the Registry
-type RegisterObject interface {
-	mo.Reference
-	PutObject(mo.Reference)
-	RemoveObject(types.ManagedObjectReference)
-}
-
-// Registry manages a map of mo.Reference objects
-type Registry struct {
-	m        sync.Mutex
-	objects  map[types.ManagedObjectReference]mo.Reference
-	handlers map[types.ManagedObjectReference]RegisterObject
-	counter  int
-}
-
-// NewRegistry creates a new instances of Registry
-func NewRegistry() *Registry {
-	r := &Registry{
-		objects:  make(map[types.ManagedObjectReference]mo.Reference),
-		handlers: make(map[types.ManagedObjectReference]RegisterObject),
-	}
-
-	return r
-}
-
-// typeName returns the type of the given object.
-func typeName(item mo.Reference) string {
-	return reflect.TypeOf(item).Elem().Name()
-}
-
-// valuePrefix returns the value name prefix of a given object
-func valuePrefix(typeName string) string {
-	if v, ok := refValueMap[typeName]; ok {
-		return v
-	}
-
-	return strings.ToLower(typeName)
-}
-
-// newReference returns a new MOR, where Type defaults to type of the given item
-// and Value defaults to a unique id for the given type.
-func (r *Registry) newReference(item mo.Reference) types.ManagedObjectReference {
-	ref := item.Reference()
-
-	if ref.Type == "" {
-		ref.Type = typeName(item)
-	}
-
-	if ref.Value == "" {
-		r.counter++
-		ref.Value = fmt.Sprintf("%s-%d", valuePrefix(ref.Type), r.counter)
-	}
-
-	return ref
-}
-
-// AddHandler adds a RegisterObject handler to the Registry.
-func (r *Registry) AddHandler(h RegisterObject) {
-	r.handlers[h.Reference()] = h
-}
-
-// NewEntity sets Entity().Self with a new, unique Value.
-// Useful for creating object instances from templates.
-func (r *Registry) NewEntity(item mo.Entity) mo.Entity {
-	e := item.Entity()
-	e.Self.Value = ""
-	e.Self = r.newReference(item)
-	return item
-}
-
-// PutEntity sets item.Parent to that of parent.Self before adding item to the Registry.
-func (r *Registry) PutEntity(parent mo.Entity, item mo.Entity) mo.Entity {
-	e := item.Entity()
-
-	if parent != nil {
-		e.Parent = &parent.Entity().Self
-	}
-
-	r.Put(item)
-
-	return item
-}
-
-// Get returns the object for the given reference.
-func (r *Registry) Get(ref types.ManagedObjectReference) mo.Reference {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	return r.objects[ref]
-}
-
-// Any returns the first instance of entity type specified by kind.
-func (r *Registry) Any(kind string) mo.Entity {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	for ref, val := range r.objects {
-		if ref.Type == kind {
-			return val.(mo.Entity)
-		}
-	}
-
-	return nil
-}
-
-// Put adds a new object to Registry, generating a ManagedObjectReference if not already set.
-func (r *Registry) Put(item mo.Reference) mo.Reference {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	ref := item.Reference()
-	if ref.Type == "" || ref.Value == "" {
-		ref = r.newReference(item)
-		// mo.Reference() returns a value, not a pointer so use reflect to set the Self field
-		reflect.ValueOf(item).Elem().FieldByName("Self").Set(reflect.ValueOf(ref))
-	}
-
-	if me, ok := item.(mo.Entity); ok {
-		me.Entity().ConfigStatus = types.ManagedEntityStatusGreen
-		me.Entity().OverallStatus = types.ManagedEntityStatusGreen
-		me.Entity().EffectiveRole = []int32{-1} // Admin
-	}
-
-	r.objects[ref] = item
-
-	for _, h := range r.handlers {
-		h.PutObject(item)
-	}
-
-	return item
-}
-
-// Remove removes an object from the Registry.
-func (r *Registry) Remove(item types.ManagedObjectReference) {
-	r.m.Lock()
-	defer r.m.Unlock()
-
-	for _, h := range r.handlers {
-		h.RemoveObject(item)
-	}
-
-	delete(r.objects, item)
-	delete(r.handlers, item)
-}
-
-// getEntityParent traverses up the inventory and returns the first object of type kind.
-// If no object of type kind is found, the method will panic when it reaches the
-// inventory root Folder where the Parent field is nil.
-func (r *Registry) getEntityParent(item mo.Entity, kind string) mo.Entity {
-	for {
-		parent := item.Entity().Parent
-
-		item = r.Get(*parent).(mo.Entity)
-
-		if item.Reference().Type == kind {
-			return item
-		}
-	}
-}
-
-// getEntityDatacenter returns the Datacenter containing the given item
-func (r *Registry) getEntityDatacenter(item mo.Entity) *mo.Datacenter {
-	return r.getEntityParent(item, "Datacenter").(*mo.Datacenter)
-}
-
-func (r *Registry) getEntityFolder(item mo.Entity, kind string) *Folder {
-	dc := Map.getEntityDatacenter(item)
-
-	var ref types.ManagedObjectReference
-
-	switch kind {
-	case "datastore":
-		ref = dc.DatastoreFolder
-	}
-
-	folder := r.Get(ref).(*Folder)
-
-	// If Model was created with Folder option, use that Folder; else use top-level folder
-	for _, child := range folder.ChildEntity {
-		if child.Type == "Folder" {
-			folder = Map.Get(child).(*Folder)
-			break
-		}
-	}
-
-	return folder
-}
-
-// getEntityComputeResource returns the ComputeResource parent for the given item.
-// A ResourcePool for example may have N Parents of type ResourcePool, but the top
-// most Parent pool is always a ComputeResource child.
-func (r *Registry) getEntityComputeResource(item mo.Entity) mo.Entity {
-	for {
-		parent := item.Entity().Parent
-
-		item = r.Get(*parent).(mo.Entity)
-
-		switch item.Reference().Type {
-		case "ComputeResource":
-			return item
-		case "ClusterComputeResource":
-			return item
-		}
-	}
-}
-
-// FindByName returns the first mo.Entity of the given refs whose Name field is equal to the given name.
-// If there is no match, nil is returned.
-// This method is useful for cases where objects are required to have a unique name, such as Datastore with
-// a HostStorageSystem or HostSystem within a ClusterComputeResource.
-func (r *Registry) FindByName(name string, refs []types.ManagedObjectReference) mo.Entity {
-	for _, ref := range refs {
-		if e, ok := r.Get(ref).(mo.Entity); ok {
-			if name == e.Entity().Name {
-				return e
-			}
-		}
-	}
-
-	return nil
-}
-
-// FindReference returns the 1st match found in refs, or nil if not found.
-func FindReference(refs []types.ManagedObjectReference, match ...types.ManagedObjectReference) *types.ManagedObjectReference {
-	for _, ref := range refs {
-		for _, m := range match {
-			if ref == m {
-				return &ref
-			}
-		}
-	}
-
-	return nil
-}
-
-// RemoveReference returns a slice with ref removed from refs
-func RemoveReference(ref types.ManagedObjectReference, refs []types.ManagedObjectReference) []types.ManagedObjectReference {
-	var result []types.ManagedObjectReference
-
-	for i, r := range refs {
-		if r == ref {
-			result = append(result, refs[i+1:]...)
-			break
-		}
-
-		result = append(result, r)
-	}
-
-	return result
-}
-
-// AddReference returns a slice with ref appended if not already in refs.
-func AddReference(ref types.ManagedObjectReference, refs []types.ManagedObjectReference) []types.ManagedObjectReference {
-	if FindReference(refs, ref) == nil {
-		return append(refs, ref)
-	}
-
-	return refs
-}
-
-func (r *Registry) content() types.ServiceContent {
-	return r.Get(serviceInstance).(*ServiceInstance).Content
-}
-
-// IsESX returns true if this Registry maps an ESX model
-func (r *Registry) IsESX() bool {
-	return r.content().About.ApiType == "HostAgent"
-}
-
-// IsVPX returns true if this Registry maps a VPX model
-func (r *Registry) IsVPX() bool {
-	return !r.IsESX()
-}
-
-// SearchIndex returns the SearchIndex singleton
-func (r *Registry) SearchIndex() *SearchIndex {
-	return r.Get(r.content().SearchIndex.Reference()).(*SearchIndex)
-}
-
-// FileManager returns the FileManager singleton
-func (r *Registry) FileManager() *FileManager {
-	return r.Get(r.content().FileManager.Reference()).(*FileManager)
-}
-
-// VirtualDiskManager returns the VirtualDiskManager singleton
-func (r *Registry) VirtualDiskManager() *VirtualDiskManager {
-	return r.Get(r.content().VirtualDiskManager.Reference()).(*VirtualDiskManager)
-}
-
-// ViewManager returns the ViewManager singleton
-func (r *Registry) ViewManager() *ViewManager {
-	return r.Get(r.content().ViewManager.Reference()).(*ViewManager)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/registry_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/registry_test.go
deleted file mode 100644
index 134e57f8c7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/registry_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestRegistry(t *testing.T) {
-	r := NewRegistry()
-
-	ref := types.ManagedObjectReference{Type: "Test", Value: "Test"}
-	f := &mo.Folder{}
-	f.Self = ref
-	r.PutEntity(nil, f)
-
-	e := r.Get(ref)
-
-	if e.Reference() != ref {
-		t.Fail()
-	}
-
-	r.Remove(ref)
-
-	if r.Get(ref) != nil {
-		t.Fail()
-	}
-
-	r.Put(e)
-	e = r.Get(ref)
-
-	if e.Reference() != ref {
-		t.Fail()
-	}
-}
-
-func TestRemoveReference(t *testing.T) {
-	var refs []types.ManagedObjectReference
-
-	for i := 0; i < 5; i++ {
-		refs = append(refs, types.ManagedObjectReference{Type: "any", Value: fmt.Sprintf("%d", i)})
-	}
-
-	n := len(refs)
-
-	nr := RemoveReference(refs[2], refs)
-
-	if len(nr) != n-1 {
-		t.Errorf("%d", len(nr))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool.go b/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool.go
deleted file mode 100644
index da6a0a3952..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool.go
+++ /dev/null
@@ -1,314 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"strings"
-
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ResourcePool struct {
-	mo.ResourcePool
-}
-
-func NewResourcePool() *ResourcePool {
-	pool := &ResourcePool{
-		ResourcePool: esx.ResourcePool,
-	}
-
-	if Map.IsVPX() {
-		pool.DisabledMethod = nil // Enable VApp methods for VC
-	}
-
-	return pool
-}
-
-func (p *ResourcePool) allFieldsSet(info types.ResourceAllocationInfo) bool {
-	return info.Reservation != nil &&
-		info.Limit != nil &&
-		info.ExpandableReservation != nil &&
-		info.Shares != nil
-}
-
-func (p *ResourcePool) allFieldsValid(info types.ResourceAllocationInfo) bool {
-	if info.Reservation != nil {
-		if *info.Reservation < 0 {
-			return false
-		}
-	}
-
-	if info.Limit != nil {
-		if *info.Limit < -1 {
-			return false
-		}
-	}
-
-	if info.Shares != nil {
-		if info.Shares.Level == types.SharesLevelCustom {
-			if info.Shares.Shares < 0 {
-				return false
-			}
-		}
-	}
-
-	if info.OverheadLimit != nil {
-		return false
-	}
-
-	return true
-}
-
-func (p *ResourcePool) createChild(name string, spec types.ResourceConfigSpec) (*ResourcePool, *soap.Fault) {
-	if e := Map.FindByName(name, p.ResourcePool.ResourcePool); e != nil {
-		return nil, Fault("", &types.DuplicateName{
-			Name:   e.Entity().Name,
-			Object: e.Reference(),
-		})
-	}
-
-	if !(p.allFieldsSet(spec.CpuAllocation) && p.allFieldsValid(spec.CpuAllocation)) {
-		return nil, Fault("", &types.InvalidArgument{
-			InvalidProperty: "spec.cpuAllocation",
-		})
-	}
-
-	if !(p.allFieldsSet(spec.MemoryAllocation) && p.allFieldsValid(spec.MemoryAllocation)) {
-		return nil, Fault("", &types.InvalidArgument{
-			InvalidProperty: "spec.memoryAllocation",
-		})
-	}
-
-	child := NewResourcePool()
-
-	child.Name = name
-	child.Owner = p.Owner
-	child.Summary.GetResourcePoolSummary().Name = name
-	child.Config.CpuAllocation = spec.CpuAllocation
-	child.Config.MemoryAllocation = spec.MemoryAllocation
-	child.Config.Entity = spec.Entity
-
-	return child, nil
-}
-
-func (p *ResourcePool) CreateResourcePool(c *types.CreateResourcePool) soap.HasFault {
-	body := &methods.CreateResourcePoolBody{}
-
-	child, err := p.createChild(c.Name, c.Spec)
-	if err != nil {
-		body.Fault_ = err
-		return body
-	}
-
-	Map.PutEntity(p, Map.NewEntity(child))
-
-	p.ResourcePool.ResourcePool = append(p.ResourcePool.ResourcePool, child.Reference())
-
-	body.Res = &types.CreateResourcePoolResponse{
-		Returnval: child.Reference(),
-	}
-
-	return body
-}
-
-func (p *ResourcePool) updateAllocation(kind string, src types.ResourceAllocationInfo, dst *types.ResourceAllocationInfo) *soap.Fault {
-	if !p.allFieldsValid(src) {
-		return Fault("", &types.InvalidArgument{
-			InvalidProperty: fmt.Sprintf("spec.%sAllocation", kind),
-		})
-	}
-
-	if src.Reservation != nil {
-		dst.Reservation = src.Reservation
-	}
-
-	if src.Limit != nil {
-		dst.Limit = src.Limit
-	}
-
-	if src.Shares != nil {
-		dst.Shares = src.Shares
-	}
-
-	return nil
-}
-
-func (p *ResourcePool) UpdateConfig(c *types.UpdateConfig) soap.HasFault {
-	body := &methods.UpdateConfigBody{}
-
-	if c.Name != "" {
-		if e := Map.FindByName(c.Name, p.ResourcePool.ResourcePool); e != nil {
-			body.Fault_ = Fault("", &types.DuplicateName{
-				Name:   e.Entity().Name,
-				Object: e.Reference(),
-			})
-			return body
-		}
-
-		p.Name = c.Name
-	}
-
-	spec := c.Config
-
-	if spec != nil {
-		if err := p.updateAllocation("memory", spec.MemoryAllocation, &p.Config.MemoryAllocation); err != nil {
-			body.Fault_ = err
-			return body
-		}
-
-		if err := p.updateAllocation("cpu", spec.CpuAllocation, &p.Config.CpuAllocation); err != nil {
-			body.Fault_ = err
-			return body
-		}
-	}
-
-	body.Res = &types.UpdateConfigResponse{}
-
-	return body
-}
-
-type VirtualApp struct {
-	mo.VirtualApp
-}
-
-func NewVAppConfigSpec() types.VAppConfigSpec {
-	spec := types.VAppConfigSpec{
-		Annotation: "vcsim",
-		VmConfigSpec: types.VmConfigSpec{
-			Product: []types.VAppProductSpec{
-				{
-					Info: &types.VAppProductInfo{
-						Name:      "vcsim",
-						Vendor:    "VMware",
-						VendorUrl: "http://www.vmware.com/",
-						Version:   "0.1",
-					},
-					ArrayUpdateSpec: types.ArrayUpdateSpec{
-						Operation: types.ArrayUpdateOperationAdd,
-					},
-				},
-			},
-		},
-	}
-
-	return spec
-}
-
-func (p *ResourcePool) CreateVApp(req *types.CreateVApp) soap.HasFault {
-	body := &methods.CreateVAppBody{}
-
-	pool, err := p.createChild(req.Name, req.ResSpec)
-	if err != nil {
-		body.Fault_ = err
-		return body
-	}
-
-	child := &VirtualApp{}
-	child.ResourcePool = pool.ResourcePool
-	child.Self.Type = "VirtualApp"
-	child.ParentFolder = req.VmFolder
-
-	if child.ParentFolder == nil {
-		folder := Map.getEntityDatacenter(p).VmFolder
-		child.ParentFolder = &folder
-	}
-
-	child.VAppConfig = &types.VAppConfigInfo{
-		VmConfigInfo: types.VmConfigInfo{},
-		Annotation:   req.ConfigSpec.Annotation,
-	}
-
-	for _, product := range req.ConfigSpec.Product {
-		child.VAppConfig.Product = append(child.VAppConfig.Product, *product.Info)
-	}
-
-	Map.PutEntity(p, Map.NewEntity(child))
-
-	p.ResourcePool.ResourcePool = append(p.ResourcePool.ResourcePool, child.Reference())
-
-	body.Res = &types.CreateVAppResponse{
-		Returnval: child.Reference(),
-	}
-
-	return body
-}
-
-func (a *VirtualApp) CreateChildVMTask(req *types.CreateChildVM_Task) soap.HasFault {
-	body := &methods.CreateChildVM_TaskBody{}
-
-	folder := Map.Get(*a.ParentFolder).(*Folder)
-
-	res := folder.CreateVMTask(&types.CreateVM_Task{
-		This:   folder.Self,
-		Config: req.Config,
-		Host:   req.Host,
-		Pool:   req.This,
-	})
-
-	body.Res = &types.CreateChildVM_TaskResponse{
-		Returnval: res.(*methods.CreateVM_TaskBody).Res.Returnval,
-	}
-
-	return body
-}
-
-func (a *VirtualApp) DestroyTask(req *types.Destroy_Task) soap.HasFault {
-	return (&ResourcePool{ResourcePool: a.ResourcePool}).DestroyTask(req)
-}
-
-func (p *ResourcePool) DestroyTask(req *types.Destroy_Task) soap.HasFault {
-	task := CreateTask(p, "destroy", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		if strings.HasSuffix(p.Parent.Type, "ComputeResource") {
-			// Can't destroy the root pool
-			return nil, &types.InvalidArgument{}
-		}
-
-		pp := Map.Get(*p.Parent).(*ResourcePool)
-
-		parent := &pp.ResourcePool
-		// Remove child reference from rp
-		parent.ResourcePool = RemoveReference(req.This, parent.ResourcePool)
-
-		// The grandchildren become children of the parent (rp)
-		parent.ResourcePool = append(parent.ResourcePool, p.ResourcePool.ResourcePool...)
-
-		// And VMs move to the parent
-		vms := p.ResourcePool.Vm
-		for _, vm := range vms {
-			Map.Get(vm).(*VirtualMachine).ResourcePool = &parent.Self
-		}
-
-		parent.Vm = append(parent.Vm, vms...)
-
-		Map.Remove(req.This)
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.Destroy_TaskBody{
-		Res: &types.Destroy_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool_test.go
deleted file mode 100644
index 16d8f00341..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/resource_pool_test.go
+++ /dev/null
@@ -1,325 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"reflect"
-	"testing"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestResourcePool(t *testing.T) {
-	ctx := context.Background()
-
-	m := &Model{
-		ServiceContent: esx.ServiceContent,
-		RootFolder:     esx.RootFolder,
-	}
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := m.Service.client
-
-	finder := find.NewFinder(c, false)
-	finder.SetDatacenter(object.NewDatacenter(c, esx.Datacenter.Reference()))
-
-	spec := types.DefaultResourceConfigSpec()
-
-	parent := object.NewResourcePool(c, esx.ResourcePool.Self)
-
-	spec.CpuAllocation.Reservation = nil
-	// missing required field (Reservation) for create
-	_, err = parent.Create(ctx, "fail", spec)
-	if err == nil {
-		t.Error("expected error")
-	}
-	spec = types.DefaultResourceConfigSpec()
-
-	// can't destroy a root pool
-	task, err := parent.Destroy(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = task.Wait(ctx); err == nil {
-		t.Fatal("expected error destroying a root pool")
-	}
-
-	// create a child pool
-	childName := uuid.New().String()
-
-	child, err := parent.Create(ctx, childName, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if child.Reference() == esx.ResourcePool.Self {
-		t.Error("expected new pool Self reference")
-	}
-
-	*spec.CpuAllocation.Reservation = -1
-	// invalid field value (Reservation) for update
-	err = child.UpdateConfig(ctx, "", &spec)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// valid config update
-	*spec.CpuAllocation.Reservation = 10
-	err = child.UpdateConfig(ctx, "", &spec)
-	if err != nil {
-		t.Error(err)
-	}
-
-	var p mo.ResourcePool
-	err = child.Properties(ctx, child.Reference(), []string{"config.cpuAllocation"}, &p)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if *p.Config.CpuAllocation.Reservation != 10 {
-		t.Error("config not updated")
-	}
-
-	// duplicate name
-	_, err = parent.Create(ctx, childName, spec)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// create a grandchild pool
-	grandChildName := uuid.New().String()
-	_, err = child.Create(ctx, grandChildName, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// create sibling (of the grand child) pool
-	siblingName := uuid.New().String()
-	_, err = child.Create(ctx, siblingName, spec)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// finder should return the 2 grand children
-	pools, err := finder.ResourcePoolList(ctx, "*/Resources/"+childName+"/*")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(pools) != 2 {
-		t.Fatalf("len(pools) == %d", len(pools))
-	}
-
-	// destroy the child
-	task, err = child.Destroy(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// finder should error not found after destroying the child
-	_, err = finder.ResourcePoolList(ctx, "*/Resources/"+childName+"/*")
-	if err == nil {
-		t.Fatal("expected not found error")
-	}
-
-	// since the child was destroyed, grand child pools should now be children of the root pool
-	pools, err = finder.ResourcePoolList(ctx, "*/Resources/*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(pools) != 2 {
-		t.Fatalf("len(pools) == %d", len(pools))
-	}
-}
-
-func TestCreateVAppESX(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	m.Datastore = 0
-	m.Machine = 0
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := m.Service.client
-
-	parent := object.NewResourcePool(c, esx.ResourcePool.Self)
-
-	rspec := types.DefaultResourceConfigSpec()
-	vspec := NewVAppConfigSpec()
-
-	_, err = parent.CreateVApp(ctx, "myapp", rspec, vspec, nil)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	fault := soap.ToSoapFault(err).Detail.Fault
-
-	if reflect.TypeOf(fault) != reflect.TypeOf(&types.MethodDisabled{}) {
-		t.Errorf("fault=%#v", fault)
-	}
-}
-
-func TestCreateVAppVPX(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer m.Remove()
-
-	c := m.Service.client
-
-	parent := object.NewResourcePool(c, Map.Any("ResourcePool").Reference())
-
-	rspec := types.DefaultResourceConfigSpec()
-	vspec := NewVAppConfigSpec()
-
-	vapp, err := parent.CreateVApp(ctx, "myapp", rspec, vspec, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = parent.CreateVApp(ctx, "myapp", rspec, vspec, nil)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	spec := types.VirtualMachineConfigSpec{
-		GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-		Files: &types.VirtualMachineFileInfo{
-			VmPathName: "[LocalDS_0]",
-		},
-	}
-
-	for _, fail := range []bool{true, false} {
-		task, cerr := vapp.CreateChildVM(ctx, spec, nil)
-		if cerr != nil {
-			t.Fatal(err)
-		}
-
-		cerr = task.Wait(ctx)
-		if fail {
-			if cerr == nil {
-				t.Error("expected error")
-			}
-		} else {
-			if cerr != nil {
-				t.Error(err)
-			}
-		}
-
-		spec.Name = "test"
-	}
-
-	si := object.NewSearchIndex(c)
-	vm, err := si.FindChild(ctx, vapp, spec.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if vm == nil {
-		t.Errorf("FindChild(%s)==nil", spec.Name)
-	}
-
-	task, err := vapp.Destroy(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = task.Wait(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestResourcePoolValidation(t *testing.T) {
-	var pool ResourcePool
-
-	tests := []func() bool{
-		func() bool {
-			return pool.allFieldsSet(types.ResourceAllocationInfo{})
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.Limit = nil
-			return pool.allFieldsSet(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.Reservation = nil
-			return pool.allFieldsSet(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.ExpandableReservation = nil
-			return pool.allFieldsSet(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.Shares = nil
-			return pool.allFieldsSet(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.Reservation = types.NewInt64(-1)
-			return pool.allFieldsValid(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			spec.CpuAllocation.Limit = types.NewInt64(-100)
-			return pool.allFieldsValid(spec.CpuAllocation)
-		},
-		func() bool {
-			spec := types.DefaultResourceConfigSpec()
-			shares := spec.CpuAllocation.Shares
-			shares.Level = types.SharesLevelCustom
-			shares.Shares = -1
-			return pool.allFieldsValid(spec.CpuAllocation)
-		},
-	}
-
-	for i, test := range tests {
-		ok := test()
-		if ok {
-			t.Errorf("%d: expected false", i)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/search_index.go b/installer/vendor/github.com/vmware/govmomi/simulator/search_index.go
deleted file mode 100644
index c56dff2cba..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/search_index.go
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type SearchIndex struct {
-	mo.SearchIndex
-}
-
-func NewSearchIndex(ref types.ManagedObjectReference) object.Reference {
-	m := &SearchIndex{}
-	m.Self = ref
-	return m
-}
-
-func (s *SearchIndex) FindByDatastorePath(r *types.FindByDatastorePath) soap.HasFault {
-	res := &methods.FindByDatastorePathBody{Res: new(types.FindByDatastorePathResponse)}
-
-	for ref, obj := range Map.objects {
-		vm, ok := obj.(*VirtualMachine)
-		if !ok {
-			continue
-		}
-
-		if vm.Config.Files.VmPathName == r.Path {
-			res.Res.Returnval = &ref
-			break
-		}
-	}
-
-	return res
-}
-
-func (s *SearchIndex) FindByInventoryPath(req *types.FindByInventoryPath) soap.HasFault {
-	body := &methods.FindByInventoryPathBody{Res: new(types.FindByInventoryPathResponse)}
-
-	path := strings.Split(req.InventoryPath, "/")
-	if len(path) <= 1 {
-		return body
-	}
-
-	root := Map.content().RootFolder
-	o := &root
-
-	for _, name := range path[1:] {
-		f := s.FindChild(&types.FindChild{Entity: *o, Name: name})
-
-		o = f.(*methods.FindChildBody).Res.Returnval
-		if o == nil {
-			break
-		}
-	}
-
-	body.Res.Returnval = o
-
-	return body
-}
-
-func (s *SearchIndex) FindChild(req *types.FindChild) soap.HasFault {
-	body := &methods.FindChildBody{}
-
-	obj := Map.Get(req.Entity)
-
-	if obj == nil {
-		body.Fault_ = Fault("", &types.ManagedObjectNotFound{Obj: req.Entity})
-		return body
-	}
-
-	body.Res = new(types.FindChildResponse)
-
-	var children []types.ManagedObjectReference
-
-	switch e := obj.(type) {
-	case *mo.Datacenter:
-		children = []types.ManagedObjectReference{e.VmFolder, e.HostFolder, e.DatastoreFolder, e.NetworkFolder}
-	case *Folder:
-		children = e.ChildEntity
-	case *mo.ComputeResource:
-		children = e.Host
-		children = append(children, *e.ResourcePool)
-	case *ClusterComputeResource:
-		children = e.Host
-		children = append(children, *e.ResourcePool)
-	case *ResourcePool:
-		children = e.ResourcePool.ResourcePool
-		children = append(children, e.Vm...)
-	case *VirtualApp:
-		children = e.ResourcePool.ResourcePool
-		children = append(children, e.Vm...)
-	}
-
-	match := Map.FindByName(req.Name, children)
-
-	if match != nil {
-		ref := match.Reference()
-		body.Res.Returnval = &ref
-	}
-
-	return body
-}
-
-func (s *SearchIndex) FindByUuid(req *types.FindByUuid) soap.HasFault {
-	body := &methods.FindByUuidBody{Res: new(types.FindByUuidResponse)}
-
-	if req.VmSearch {
-		// Find Virtual Machine using UUID
-		for ref, obj := range Map.objects {
-			vm, ok := obj.(*VirtualMachine)
-			if !ok {
-				continue
-			}
-			if vm.Config.Uuid == req.Uuid {
-				body.Res.Returnval = &ref
-				break
-			}
-		}
-	} else {
-		// Find Host System using UUID
-		for ref, obj := range Map.objects {
-			host, ok := obj.(*HostSystem)
-			if !ok {
-				continue
-			}
-			if host.Summary.Hardware.Uuid == req.Uuid {
-				body.Res.Returnval = &ref
-				break
-			}
-		}
-	}
-
-	return body
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/search_index_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/search_index_test.go
deleted file mode 100644
index 6ed680ceff..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/search_index_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"strings"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestSearchIndex(t *testing.T) {
-	ctx := context.Background()
-
-	for _, model := range []*Model{ESX(), VPX()} {
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		c, err := govmomi.NewClient(ctx, s.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder := find.NewFinder(c.Client, false)
-		dc, err := finder.DefaultDatacenter(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder.SetDatacenter(dc)
-
-		vms, err := finder.VirtualMachineList(ctx, "*")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		vm := Map.Get(vms[0].Reference()).(*VirtualMachine)
-
-		si := object.NewSearchIndex(c.Client)
-
-		ref, err := si.FindByDatastorePath(ctx, dc, vm.Config.Files.VmPathName)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref.Reference() != vm.Reference() {
-			t.Errorf("moref mismatch %s != %s", ref, vm.Reference())
-		}
-
-		ref, err = si.FindByDatastorePath(ctx, dc, vm.Config.Files.VmPathName+"enoent")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref != nil {
-			t.Errorf("ref=%s", ref)
-		}
-
-		ref, err = si.FindByUuid(ctx, dc, vm.Config.Uuid, true, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref.Reference() != vm.Reference() {
-			t.Errorf("moref mismatch %s != %s", ref, vm.Reference())
-		}
-
-		ref, err = si.FindByUuid(ctx, dc, vm.Config.Uuid, false, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref != nil {
-			t.Error("expected nil")
-		}
-
-		host := Map.Any("HostSystem").(*HostSystem)
-
-		ref, err = si.FindByUuid(ctx, dc, host.Summary.Hardware.Uuid, false, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref.Reference() != host.Reference() {
-			t.Errorf("moref mismatch %s != %s", ref, host.Reference())
-		}
-	}
-}
-
-func TestSearchIndexFindChild(t *testing.T) {
-	ctx := context.Background()
-
-	model := VPX()
-	model.Pool = 3
-
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := model.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	si := object.NewSearchIndex(c.Client)
-
-	tests := [][]string{
-		// Datacenter -> host Folder -> Cluster -> HostSystem
-		{"DC0", "host", "DC0_C0", "DC0_C0_H0"},
-		// Datacenter -> host Folder -> ComputeResource -> HostSystem
-		{"DC0", "host", "DC0_H0", "DC0_H0"},
-		// Datacenter -> host Folder -> Cluster -> ResourcePool -> ResourcePool
-		{"DC0", "host", "DC0_C0", "Resources", "DC0_C0_RP1"},
-		// Datacenter -> host Folder -> Cluster -> ResourcePool -> VirtualMachine
-		{"DC0", "host", "DC0_C0", "Resources", "DC0_C0_RP0_VM0"},
-		// Datacenter -> vm Folder -> VirtualMachine
-		{"DC0", "vm", "DC0_C0_RP0_VM0"},
-	}
-
-	root := c.ServiceContent.RootFolder
-
-	for _, path := range tests {
-		parent := root
-		ipath := []string{""}
-
-		for _, name := range path {
-			ref, err := si.FindChild(ctx, parent, name)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if ref == nil {
-				t.Fatalf("failed to match %s using %s", name, parent)
-			}
-
-			parent = ref.Reference()
-
-			ipath = append(ipath, name)
-
-			iref, err := si.FindByInventoryPath(ctx, strings.Join(ipath, "/"))
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if iref.Reference() != ref.Reference() {
-				t.Errorf("%s != %s", iref, ref)
-			}
-		}
-	}
-
-	ref, err := si.FindChild(ctx, root, "enoent")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if ref != nil {
-		t.Error("unexpected match")
-	}
-
-	root.Value = "enoent"
-	_, err = si.FindChild(ctx, root, "enoent")
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	if _, ok := soap.ToSoapFault(err).VimFault().(types.ManagedObjectNotFound); !ok {
-		t.Error("expected ManagedObjectNotFound fault")
-	}
-
-	for _, path := range []string{"", "/", "/enoent"} {
-		ref, err := si.FindByInventoryPath(ctx, path)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if ref != nil {
-			t.Error("unexpected match")
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/service_instance.go b/installer/vendor/github.com/vmware/govmomi/simulator/service_instance.go
deleted file mode 100644
index f452bdc029..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/service_instance.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"time"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ServiceInstance struct {
-	mo.ServiceInstance
-}
-
-var serviceInstance = types.ManagedObjectReference{
-	Type:  "ServiceInstance",
-	Value: "ServiceInstance",
-}
-
-func NewServiceInstance(content types.ServiceContent, folder mo.Folder) *ServiceInstance {
-	Map = NewRegistry()
-
-	s := &ServiceInstance{}
-
-	s.Self = serviceInstance
-	s.Content = content
-
-	Map.Put(s)
-
-	f := &Folder{Folder: folder}
-	Map.Put(f)
-
-	var setting []types.BaseOptionValue
-
-	if content.About.ApiType == "HostAgent" {
-		CreateDefaultESX(f)
-	} else {
-		setting = vpx.Setting
-	}
-
-	objects := []object.Reference{
-		NewSessionManager(*s.Content.SessionManager),
-		NewAuthorizationManager(*s.Content.AuthorizationManager),
-		NewPerformanceManager(*s.Content.PerfManager),
-		NewPropertyCollector(s.Content.PropertyCollector),
-		NewFileManager(*s.Content.FileManager),
-		NewVirtualDiskManager(*s.Content.VirtualDiskManager),
-		NewLicenseManager(*s.Content.LicenseManager),
-		NewSearchIndex(*s.Content.SearchIndex),
-		NewViewManager(*s.Content.ViewManager),
-		NewTaskManager(*s.Content.TaskManager),
-		NewUserDirectory(*s.Content.UserDirectory),
-		NewOptionManager(s.Content.Setting, setting),
-	}
-
-	if s.Content.CustomFieldsManager != nil {
-		objects = append(objects, NewCustomFieldsManager(*s.Content.CustomFieldsManager))
-	}
-
-	if s.Content.IpPoolManager != nil {
-		objects = append(objects, NewIpPoolManager(*s.Content.IpPoolManager))
-	}
-
-	for _, o := range objects {
-		Map.Put(o)
-	}
-
-	return s
-}
-
-func (s *ServiceInstance) RetrieveServiceContent(*types.RetrieveServiceContent) soap.HasFault {
-	return &methods.RetrieveServiceContentBody{
-		Res: &types.RetrieveServiceContentResponse{
-			Returnval: s.Content,
-		},
-	}
-}
-
-func (*ServiceInstance) CurrentTime(*types.CurrentTime) soap.HasFault {
-	return &methods.CurrentTimeBody{
-		Res: &types.CurrentTimeResponse{
-			Returnval: time.Now(),
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/session_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/session_manager.go
deleted file mode 100644
index 92a8f9b094..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/session_manager.go
+++ /dev/null
@@ -1,83 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"time"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/session"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type SessionManager struct {
-	mo.SessionManager
-
-	ServiceHostName string
-}
-
-func NewSessionManager(ref types.ManagedObjectReference) object.Reference {
-	s := &SessionManager{}
-	s.Self = ref
-	return s
-}
-
-func (s *SessionManager) Login(login *types.Login) soap.HasFault {
-	body := &methods.LoginBody{}
-
-	if login.Locale == "" {
-		login.Locale = session.Locale
-	}
-
-	if login.UserName == "" || login.Password == "" {
-		body.Fault_ = Fault("Login failure", &types.InvalidLogin{})
-	} else {
-		body.Res = &types.LoginResponse{
-			Returnval: types.UserSession{
-				Key:            uuid.New().String(),
-				UserName:       login.UserName,
-				FullName:       login.UserName,
-				LoginTime:      time.Now(),
-				LastActiveTime: time.Now(),
-				Locale:         login.Locale,
-				MessageLocale:  login.Locale,
-			},
-		}
-	}
-
-	return body
-}
-
-func (s *SessionManager) Logout(*types.Logout) soap.HasFault {
-	return &methods.LogoutBody{Res: new(types.LogoutResponse)}
-}
-
-func (s *SessionManager) AcquireGenericServiceTicket(ticket *types.AcquireGenericServiceTicket) soap.HasFault {
-	return &methods.AcquireGenericServiceTicketBody{
-		Res: &types.AcquireGenericServiceTicketResponse{
-			Returnval: types.SessionManagerGenericServiceTicket{
-				Id:       uuid.New().String(),
-				HostName: s.ServiceHostName,
-			},
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/simulator.go b/installer/vendor/github.com/vmware/govmomi/simulator/simulator.go
deleted file mode 100644
index 9a9cf0194b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/simulator.go
+++ /dev/null
@@ -1,551 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path"
-	"reflect"
-	"sort"
-	"strings"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-// Trace when set to true, writes SOAP traffic to stderr
-var Trace = false
-
-// Method encapsulates a decoded SOAP client request
-type Method struct {
-	Name string
-	This types.ManagedObjectReference
-	Body types.AnyType
-}
-
-// Service decodes incoming requests and dispatches to a Handler
-type Service struct {
-	client *vim25.Client
-
-	readAll func(io.Reader) ([]byte, error)
-
-	TLS *tls.Config
-}
-
-// Server provides a simulator Service over HTTP
-type Server struct {
-	*httptest.Server
-	URL *url.URL
-
-	caFile string
-}
-
-// New returns an initialized simulator Service instance
-func New(instance *ServiceInstance) *Service {
-	s := &Service{
-		readAll: ioutil.ReadAll,
-	}
-
-	s.client, _ = vim25.NewClient(context.Background(), s)
-
-	return s
-}
-
-type serverFaultBody struct {
-	Reason *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func (b *serverFaultBody) Fault() *soap.Fault { return b.Reason }
-
-func serverFault(msg string) soap.HasFault {
-	return &serverFaultBody{Reason: Fault(msg, &types.InvalidRequest{})}
-}
-
-// Fault wraps the given message and fault in a soap.Fault
-func Fault(msg string, fault types.BaseMethodFault) *soap.Fault {
-	f := &soap.Fault{
-		Code:   "ServerFaultCode",
-		String: msg,
-	}
-
-	f.Detail.Fault = fault
-
-	return f
-}
-
-func (s *Service) call(method *Method) soap.HasFault {
-	handler := Map.Get(method.This)
-
-	if handler == nil {
-		msg := fmt.Sprintf("managed object not found: %s", method.This)
-		log.Print(msg)
-		fault := &types.ManagedObjectNotFound{Obj: method.This}
-		return &serverFaultBody{Reason: Fault(msg, fault)}
-	}
-
-	name := method.Name
-
-	if strings.HasSuffix(name, vTaskSuffix) {
-		// Make golint happy renaming "Foo_Task" -> "FooTask"
-		name = name[:len(name)-len(vTaskSuffix)] + sTaskSuffix
-	}
-
-	m := reflect.ValueOf(handler).MethodByName(name)
-	if !m.IsValid() {
-		msg := fmt.Sprintf("%s does not implement: %s", method.This, method.Name)
-		log.Print(msg)
-		fault := &types.MethodNotFound{Receiver: method.This, Method: method.Name}
-		return &serverFaultBody{Reason: Fault(msg, fault)}
-	}
-
-	if e, ok := handler.(mo.Entity); ok {
-		for _, dm := range e.Entity().DisabledMethod {
-			if name == dm {
-				msg := fmt.Sprintf("%s method is disabled: %s", method.This, method.Name)
-				fault := &types.MethodDisabled{}
-				return &serverFaultBody{Reason: Fault(msg, fault)}
-			}
-		}
-	}
-
-	res := m.Call([]reflect.Value{reflect.ValueOf(method.Body)})
-
-	return res[0].Interface().(soap.HasFault)
-}
-
-// RoundTrip implements the soap.RoundTripper interface in process.
-// Rather than encode/decode SOAP over HTTP, this implementation uses reflection.
-func (s *Service) RoundTrip(ctx context.Context, request, response soap.HasFault) error {
-	field := func(r soap.HasFault, name string) reflect.Value {
-		return reflect.ValueOf(r).Elem().FieldByName(name)
-	}
-
-	// Every struct passed to soap.RoundTrip has "Req" and "Res" fields
-	req := field(request, "Req")
-
-	// Every request has a "This" field.
-	this := req.Elem().FieldByName("This")
-
-	method := &Method{
-		Name: req.Elem().Type().Name(),
-		This: this.Interface().(types.ManagedObjectReference),
-		Body: req.Interface(),
-	}
-
-	res := s.call(method)
-
-	if err := res.Fault(); err != nil {
-		return soap.WrapSoapFault(err)
-	}
-
-	field(response, "Res").Set(field(res, "Res"))
-
-	return nil
-}
-
-// soapEnvelope is a copy of soap.Envelope, with namespace changed to "soapenv",
-// and additional namespace attributes required by some client libraries.
-// Go still has issues decoding with such a namespace, but encoding is ok.
-type soapEnvelope struct {
-	XMLName xml.Name    `xml:"soapenv:Envelope"`
-	Enc     string      `xml:"xmlns:soapenc,attr"`
-	Env     string      `xml:"xmlns:soapenv,attr"`
-	XSD     string      `xml:"xmlns:xsd,attr"`
-	XSI     string      `xml:"xmlns:xsi,attr"`
-	Body    interface{} `xml:"soapenv:Body"`
-}
-
-// soapFault is a copy of soap.Fault, with the same changes as soapEnvelope
-type soapFault struct {
-	XMLName xml.Name `xml:"soapenv:Fault"`
-	Code    string   `xml:"faultcode"`
-	String  string   `xml:"faultstring"`
-	Detail  struct {
-		Fault types.AnyType `xml:",any,typeattr"`
-	} `xml:"detail"`
-}
-
-// About generates some info about the simulator.
-func (s *Service) About(w http.ResponseWriter, r *http.Request) {
-	var about struct {
-		Methods []string
-		Types   []string
-	}
-
-	seen := make(map[string]bool)
-
-	f := reflect.TypeOf((*soap.HasFault)(nil)).Elem()
-
-	for _, obj := range Map.objects {
-		kind := obj.Reference().Type
-		if seen[kind] {
-			continue
-		}
-		seen[kind] = true
-
-		about.Types = append(about.Types, kind)
-
-		t := reflect.TypeOf(obj)
-		for i := 0; i < t.NumMethod(); i++ {
-			m := t.Method(i)
-			if seen[m.Name] {
-				continue
-			}
-			seen[m.Name] = true
-
-			if m.Type.NumIn() != 2 || m.Type.NumOut() != 1 || m.Type.Out(0) != f {
-				continue
-			}
-
-			about.Methods = append(about.Methods, strings.Replace(m.Name, "Task", "_Task", 1))
-		}
-	}
-
-	sort.Strings(about.Methods)
-	sort.Strings(about.Types)
-
-	w.Header().Set("Content-Type", "application/json")
-	enc := json.NewEncoder(w)
-	enc.SetIndent("", "  ")
-	_ = enc.Encode(&about)
-}
-
-// ServeSDK implements the http.Handler interface
-func (s *Service) ServeSDK(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		w.WriteHeader(http.StatusMethodNotAllowed)
-		return
-	}
-
-	body, err := s.readAll(r.Body)
-	_ = r.Body.Close()
-	if err != nil {
-		log.Printf("error reading body: %s", err)
-		w.WriteHeader(http.StatusBadRequest)
-		return
-	}
-
-	if Trace {
-		fmt.Fprintf(os.Stderr, "Request: %s\n", string(body))
-	}
-
-	var res soap.HasFault
-	var soapBody interface{}
-
-	method, err := UnmarshalBody(body)
-	if err != nil {
-		res = serverFault(err.Error())
-	} else {
-		res = s.call(method)
-	}
-
-	if f := res.Fault(); f != nil {
-		w.WriteHeader(http.StatusInternalServerError)
-
-		// the generated method/*Body structs use the '*soap.Fault' type,
-		// so we need our own Body type to use the modified '*soapFault' type.
-		soapBody = struct {
-			Fault *soapFault
-		}{
-			&soapFault{
-				Code:   f.Code,
-				String: f.String,
-				Detail: f.Detail,
-			},
-		}
-	} else {
-		w.WriteHeader(http.StatusOK)
-
-		soapBody = res
-	}
-
-	var out bytes.Buffer
-
-	fmt.Fprint(&out, xml.Header)
-	e := xml.NewEncoder(&out)
-	err = e.Encode(&soapEnvelope{
-		Enc:  "http://schemas.xmlsoap.org/soap/encoding/",
-		Env:  "http://schemas.xmlsoap.org/soap/envelope/",
-		XSD:  "http://www.w3.org/2001/XMLSchema",
-		XSI:  "http://www.w3.org/2001/XMLSchema-instance",
-		Body: soapBody,
-	})
-	if err == nil {
-		err = e.Flush()
-	}
-
-	if err != nil {
-		log.Printf("error encoding %s response: %s", method.Name, err)
-		return
-	}
-
-	if Trace {
-		fmt.Fprintf(os.Stderr, "Response: %s\n", out.String())
-	}
-
-	_, _ = w.Write(out.Bytes())
-}
-
-func (s *Service) findDatastore(query url.Values) (*Datastore, error) {
-	ctx := context.Background()
-
-	finder := find.NewFinder(s.client, false)
-	dc, err := finder.DatacenterOrDefault(ctx, query.Get("dcName"))
-	if err != nil {
-		return nil, err
-	}
-
-	finder.SetDatacenter(dc)
-
-	ds, err := finder.DatastoreOrDefault(ctx, query.Get("dsName"))
-	if err != nil {
-		return nil, err
-	}
-
-	return Map.Get(ds.Reference()).(*Datastore), nil
-}
-
-const folderPrefix = "/folder/"
-
-// ServeDatastore handler for Datastore access via /folder path.
-func (s *Service) ServeDatastore(w http.ResponseWriter, r *http.Request) {
-	ds, ferr := s.findDatastore(r.URL.Query())
-	if ferr != nil {
-		log.Printf("failed to locate datastore with query params: %s", r.URL.RawQuery)
-		w.WriteHeader(http.StatusNotFound)
-		return
-	}
-
-	file := strings.TrimPrefix(r.URL.Path, folderPrefix)
-	p := path.Join(ds.Info.GetDatastoreInfo().Url, file)
-
-	switch r.Method {
-	case "GET":
-		f, err := os.Open(p)
-		if err != nil {
-			log.Printf("failed to %s '%s': %s", r.Method, p, err)
-			w.WriteHeader(http.StatusNotFound)
-			return
-		}
-		defer f.Close()
-
-		_, _ = io.Copy(w, f)
-	case "POST":
-		_, err := os.Stat(p)
-		if err == nil {
-			// File exists
-			w.WriteHeader(http.StatusConflict)
-			return
-		}
-
-		// File does not exist, fallthrough to create via PUT logic
-		fallthrough
-	case "PUT":
-		f, err := os.Create(p)
-		if err != nil {
-			log.Printf("failed to %s '%s': %s", r.Method, p, err)
-			w.WriteHeader(http.StatusInternalServerError)
-			return
-		}
-		defer f.Close()
-
-		_, _ = io.Copy(f, r.Body)
-	default:
-		w.WriteHeader(http.StatusMethodNotAllowed)
-	}
-}
-
-// ServiceVersions handler for the /sdk/vimServiceVersions.xml path.
-func (*Service) ServiceVersions(w http.ResponseWriter, r *http.Request) {
-	// pyvmomi depends on this
-
-	const versions = xml.Header + `<namespaces version="1.0">
- <namespace>
-  <name>urn:vim25</name>
-  <version>6.5</version>
-  <priorVersions>
-   <version>6.0</version>
-   <version>5.5</version>
-  </priorVersions>
- </namespace>
-</namespaces>
-`
-	fmt.Fprint(w, versions)
-}
-
-// NewServer returns an http Server instance for the given service
-func (s *Service) NewServer() *Server {
-	mux := http.NewServeMux()
-	path := "/sdk"
-
-	mux.HandleFunc(path, s.ServeSDK)
-	mux.HandleFunc(path+"/vimServiceVersions.xml", s.ServiceVersions)
-	mux.HandleFunc(folderPrefix, s.ServeDatastore)
-	mux.HandleFunc("/about", s.About)
-
-	// Using NewUnstartedServer() instead of NewServer(),
-	// for use in main.go, where Start() blocks, we can still set ServiceHostName
-	ts := httptest.NewUnstartedServer(mux)
-
-	u := &url.URL{
-		Scheme: "http",
-		Host:   ts.Listener.Addr().String(),
-		Path:   path,
-		User:   url.UserPassword("user", "pass"),
-	}
-
-	// Redirect clients to this http server, rather than HostSystem.Name
-	Map.Get(*s.client.ServiceContent.SessionManager).(*SessionManager).ServiceHostName = u.Host
-
-	if f := flag.Lookup("httptest.serve"); f != nil {
-		// Avoid the blocking behaviour of httptest.Server.Start() when this flag is set
-		_ = f.Value.Set("")
-	}
-
-	if s.TLS == nil {
-		ts.Start()
-	} else {
-		ts.TLS = s.TLS
-		ts.StartTLS()
-		u.Scheme += "s"
-	}
-
-	return &Server{
-		Server: ts,
-		URL:    u,
-	}
-}
-
-// Certificate returns the TLS certificate for the Server if started with TLS enabled.
-// This method will panic if TLS is not enabled for the server.
-func (s *Server) Certificate() *x509.Certificate {
-	// By default httptest.StartTLS uses http/internal.LocalhostCert, which we can access here:
-	cert, _ := x509.ParseCertificate(s.TLS.Certificates[0].Certificate[0])
-	return cert
-}
-
-// CertificateInfo returns Server.Certificate() as object.HostCertificateInfo
-func (s *Server) CertificateInfo() *object.HostCertificateInfo {
-	info := new(object.HostCertificateInfo)
-	info.FromCertificate(s.Certificate())
-	return info
-}
-
-// CertificateFile returns a file name, where the file contains the PEM encoded Server.Certificate.
-// The temporary file is removed when Server.Close() is called.
-func (s *Server) CertificateFile() (string, error) {
-	if s.caFile != "" {
-		return s.caFile, nil
-	}
-
-	f, err := ioutil.TempFile("", "vcsim-")
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-
-	s.caFile = f.Name()
-	cert := s.Certificate()
-	return s.caFile, pem.Encode(f, &pem.Block{Type: "CERTIFICATE", Bytes: cert.Raw})
-}
-
-// Close shuts down the server and blocks until all outstanding
-// requests on this server have completed.
-func (s *Server) Close() {
-	s.Server.Close()
-	if s.caFile != "" {
-		_ = os.Remove(s.caFile)
-	}
-}
-
-var typeFunc = types.TypeFunc()
-
-// UnmarshalBody extracts the Body from a soap.Envelope and unmarshals to the corresponding govmomi type
-func UnmarshalBody(data []byte) (*Method, error) {
-	body := struct {
-		Content string `xml:",innerxml"`
-	}{}
-
-	req := soap.Envelope{
-		Body: &body,
-	}
-
-	err := xml.Unmarshal(data, &req)
-	if err != nil {
-		return nil, fmt.Errorf("xml.Unmarshal: %s", err)
-	}
-
-	decoder := xml.NewDecoder(bytes.NewReader([]byte(body.Content)))
-	decoder.TypeFunc = typeFunc // required to decode interface types
-
-	var start *xml.StartElement
-
-	for {
-		tok, derr := decoder.Token()
-		if derr != nil {
-			return nil, fmt.Errorf("decoding body: %s", err)
-		}
-		if t, ok := tok.(xml.StartElement); ok {
-			start = &t
-			break
-		}
-	}
-
-	kind := start.Name.Local
-
-	rtype, ok := typeFunc(kind)
-	if !ok {
-		return nil, fmt.Errorf("no vmomi type defined for '%s'", kind)
-	}
-
-	var val interface{}
-	if rtype != nil {
-		val = reflect.New(rtype).Interface()
-	}
-
-	err = decoder.DecodeElement(val, start)
-	if err != nil {
-		return nil, fmt.Errorf("decoding %s: %s", kind, err)
-	}
-
-	method := &Method{Name: kind, Body: val}
-
-	field := reflect.ValueOf(val).Elem().FieldByName("This")
-
-	method.This = field.Interface().(types.ManagedObjectReference)
-
-	return method, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/simulator_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/simulator_test.go
deleted file mode 100644
index b393fcb7d4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/simulator_test.go
+++ /dev/null
@@ -1,498 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"errors"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-	"reflect"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/simulator/vpx"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestUnmarshal(t *testing.T) {
-	requests := []struct {
-		body interface{}
-		data string
-	}{
-		{
-			&types.RetrieveServiceContent{
-				This: types.ManagedObjectReference{
-					Type: "ServiceInstance", Value: "ServiceInstance",
-				},
-			},
-			`<?xml version="1.0" encoding="UTF-8"?>
-                         <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                           <Body>
-                             <RetrieveServiceContent xmlns="urn:vim25">
-                               <_this type="ServiceInstance">ServiceInstance</_this>
-                             </RetrieveServiceContent>
-                           </Body>
-                         </Envelope>`,
-		},
-		{
-			&types.Login{
-				This: types.ManagedObjectReference{
-					Type:  "SessionManager",
-					Value: "SessionManager",
-				},
-				UserName: "root",
-				Password: "secret",
-			},
-			`<?xml version="1.0" encoding="UTF-8"?>
-                         <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                           <Body>
-                             <Login xmlns="urn:vim25">
-                               <_this type="SessionManager">SessionManager</_this>
-                               <userName>root</userName>
-                               <password>secret</password>
-                             </Login>
-                           </Body>
-                         </Envelope>`,
-		},
-		{
-			&types.RetrieveProperties{
-				This: types.ManagedObjectReference{Type: "PropertyCollector", Value: "ha-property-collector"},
-				SpecSet: []types.PropertyFilterSpec{
-					{
-						DynamicData: types.DynamicData{},
-						PropSet: []types.PropertySpec{
-							{
-								DynamicData: types.DynamicData{},
-								Type:        "ManagedEntity",
-								All:         (*bool)(nil),
-								PathSet:     []string{"name", "parent"},
-							},
-						},
-						ObjectSet: []types.ObjectSpec{
-							{
-								DynamicData: types.DynamicData{},
-								Obj:         types.ManagedObjectReference{Type: "Folder", Value: "ha-folder-root"},
-								Skip:        types.NewBool(false),
-								SelectSet: []types.BaseSelectionSpec{ // test decode of interface
-									&types.TraversalSpec{
-										SelectionSpec: types.SelectionSpec{
-											DynamicData: types.DynamicData{},
-											Name:        "traverseParent",
-										},
-										Type: "ManagedEntity",
-										Path: "parent",
-										Skip: types.NewBool(false),
-										SelectSet: []types.BaseSelectionSpec{
-											&types.SelectionSpec{
-												DynamicData: types.DynamicData{},
-												Name:        "traverseParent",
-											},
-										},
-									},
-								},
-							},
-						},
-						ReportMissingObjectsInResults: (*bool)(nil),
-					},
-				}},
-			`<?xml version="1.0" encoding="UTF-8"?>
-                         <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                          <Body>
-                           <RetrieveProperties xmlns="urn:vim25">
-                            <_this type="PropertyCollector">ha-property-collector</_this>
-                            <specSet>
-                             <propSet>
-                              <type>ManagedEntity</type>
-                              <pathSet>name</pathSet>
-                              <pathSet>parent</pathSet>
-                             </propSet>
-                             <objectSet>
-                              <obj type="Folder">ha-folder-root</obj>
-                              <skip>false</skip>
-                              <selectSet xmlns:XMLSchema-instance="http://www.w3.org/2001/XMLSchema-instance" XMLSchema-instance:type="TraversalSpec">
-                               <name>traverseParent</name>
-                               <type>ManagedEntity</type>
-                               <path>parent</path>
-                               <skip>false</skip>
-                               <selectSet XMLSchema-instance:type="SelectionSpec">
-                                <name>traverseParent</name>
-                               </selectSet>
-                              </selectSet>
-                             </objectSet>
-                            </specSet>
-                           </RetrieveProperties>
-                          </Body>
-                         </Envelope>`,
-		},
-	}
-
-	for i, req := range requests {
-		method, err := UnmarshalBody([]byte(req.data))
-		if err != nil {
-			t.Errorf("failed to decode %d (%s): %s", i, req, err)
-		}
-		if !reflect.DeepEqual(method.Body, req.body) {
-			t.Errorf("malformed body %d (%#v):", i, method.Body)
-		}
-	}
-}
-
-func TestUnmarshalError(t *testing.T) {
-	requests := []string{
-		"", // io.EOF
-		`<?xml version="1.0" encoding="UTF-8"?>
-                 <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                   <Body>
-                   </MissingEndTag
-                 </Envelope>`,
-		`<?xml version="1.0" encoding="UTF-8"?>
-                 <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                   <Body>
-                     <UnknownType xmlns="urn:vim25">
-                       <_this type="ServiceInstance">ServiceInstance</_this>
-                     </UnknownType>
-                   </Body>
-                 </Envelope>`,
-		`<?xml version="1.0" encoding="UTF-8"?>
-                 <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                   <Body>
-                   <!-- no start tag -->
-                   </Body>
-                 </Envelope>`,
-		`<?xml version="1.0" encoding="UTF-8"?>
-                 <Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/">
-                   <Body>
-                     <RetrieveServiceContent xmlns="urn:vim25">
-                       <_this type="ServiceInstance">ServiceInstance</_this>
-                     </RetrieveServiceContent>
-                   </Body>
-                 </Envelope>`,
-	}
-
-	defer func() {
-		typeFunc = types.TypeFunc() // reset
-	}()
-
-	ttypes := map[string]reflect.Type{
-		// triggers xml.Decoder.DecodeElement error
-		"RetrieveServiceContent": reflect.TypeOf(nil),
-	}
-	typeFunc = func(name string) (reflect.Type, bool) {
-		typ, ok := ttypes[name]
-		return typ, ok
-	}
-
-	for i, data := range requests {
-		_, err := UnmarshalBody([]byte(data))
-		if err != nil {
-			continue
-		}
-		t.Errorf("expected %d (%s) to return an error", i, data)
-	}
-}
-
-func TestServeHTTP(t *testing.T) {
-	configs := []struct {
-		content types.ServiceContent
-		folder  mo.Folder
-	}{
-		{esx.ServiceContent, esx.RootFolder},
-		{vpx.ServiceContent, vpx.RootFolder},
-	}
-
-	for _, config := range configs {
-		s := New(NewServiceInstance(config.content, config.folder))
-		ts := s.NewServer()
-		defer ts.Close()
-
-		ctx := context.Background()
-		client, err := govmomi.NewClient(ctx, ts.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = client.Login(ctx, nil)
-		if err == nil {
-			t.Fatal("expected invalid login error")
-		}
-
-		err = client.Login(ctx, ts.URL.User)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Testing http client + reflect client
-		clients := []soap.RoundTripper{client, s.client}
-		for _, c := range clients {
-			now, err := methods.GetCurrentTime(ctx, c)
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if now.After(time.Now()) {
-				t.Fail()
-			}
-
-			// test the fail/Fault path
-			_, err = methods.QueryVMotionCompatibility(ctx, c, &types.QueryVMotionCompatibility{})
-			if err == nil {
-				t.Errorf("expected error")
-			}
-		}
-
-		err = client.Logout(ctx)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func TestServeAbout(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-	m.App = 1
-	m.Pod = 1
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	u := *s.URL
-	u.Path += "/vimServiceVersions.xml"
-	r, err := c.Get(u.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = r.Body.Close()
-
-	u.Path = "/about"
-	r, err = c.Get(u.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = r.Body.Close()
-}
-
-func TestServeHTTPS(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-	s.TLS = new(tls.Config)
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ts.Config.ErrorLog = log.New(ioutil.Discard, "", 0) // silence benign "TLS handshake error" log messages
-
-	ctx := context.Background()
-
-	// insecure=true OK
-	client, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = client.Login(ctx, ts.URL.User)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// insecure=false should FAIL
-	_, err = govmomi.NewClient(ctx, ts.URL, false)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	uerr, ok := err.(*url.Error)
-	if !ok {
-		t.Fatalf("err type=%T", err)
-	}
-
-	_, ok = uerr.Err.(x509.UnknownAuthorityError)
-	if !ok {
-		t.Fatalf("err type=%T", uerr.Err)
-	}
-
-	sinfo := ts.CertificateInfo()
-
-	// Test thumbprint validation
-	sc := soap.NewClient(ts.URL, false)
-	// Add host with thumbprint mismatch should fail
-	sc.SetThumbprint(ts.URL.Host, "nope")
-	_, err = vim25.NewClient(ctx, sc)
-	if err == nil {
-		t.Error("expected error")
-	}
-	// Add host with thumbprint match should pass
-	sc.SetThumbprint(ts.URL.Host, sinfo.ThumbprintSHA1)
-	_, err = vim25.NewClient(ctx, sc)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var pinfo object.HostCertificateInfo
-	err = pinfo.FromURL(ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pinfo.ThumbprintSHA1 != sinfo.ThumbprintSHA1 {
-		t.Error("thumbprint mismatch")
-	}
-
-	// Test custom RootCAs list
-	sc = soap.NewClient(ts.URL, false)
-	caFile, err := ts.CertificateFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = sc.SetRootCAs(caFile); err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = vim25.NewClient(ctx, sc)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-type errorMarshal struct {
-	mo.ServiceInstance
-}
-
-func (*errorMarshal) Fault() *soap.Fault {
-	return nil
-}
-
-func (*errorMarshal) MarshalText() ([]byte, error) {
-	return nil, errors.New("time has stopped")
-}
-
-func (h *errorMarshal) CurrentTime(types.AnyType) soap.HasFault {
-	return h
-}
-
-type errorNoSuchMethod struct {
-	mo.ServiceInstance
-}
-
-func TestServeHTTPErrors(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-	client, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// test response to unimplemented method
-	req := &types.QueryMemoryOverhead{This: esx.HostSystem.Reference()}
-	_, err = methods.QueryMemoryOverhead(ctx, client.Client, req)
-	if _, ok := soap.ToSoapFault(err).VimFault().(types.MethodNotFound); !ok {
-		t.Error("expected MethodNotFound fault")
-	}
-
-	// unregister type, covering the ServeHTTP UnmarshalBody error path
-	typeFunc = func(name string) (reflect.Type, bool) {
-		return nil, false
-	}
-
-	_, err = methods.GetCurrentTime(ctx, client)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	typeFunc = types.TypeFunc() // reset
-
-	// cover the does not implement method error path
-	Map.objects[serviceInstance] = &errorNoSuchMethod{}
-	_, err = methods.GetCurrentTime(ctx, client)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// cover the xml encode error path
-	Map.objects[serviceInstance] = &errorMarshal{}
-	_, err = methods.GetCurrentTime(ctx, client)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// cover the no such object path
-	Map.Remove(serviceInstance)
-	_, err = methods.GetCurrentTime(ctx, client)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	// verify we properly marshal the fault
-	fault := soap.ToSoapFault(err).VimFault()
-	f, ok := fault.(types.ManagedObjectNotFound)
-	if !ok {
-		t.Fatalf("fault=%#v", fault)
-	}
-	if f.Obj != serviceInstance.Reference() {
-		t.Errorf("obj=%#v", f.Obj)
-	}
-
-	// cover the method not supported path
-	res, err := http.Get(ts.URL.String())
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if res.StatusCode != http.StatusMethodNotAllowed {
-		t.Errorf("expected status %d, got %s", http.StatusMethodNotAllowed, res.Status)
-	}
-
-	// cover the ioutil.ReadAll error path
-	s.readAll = func(io.Reader) ([]byte, error) {
-		return nil, io.ErrShortBuffer
-	}
-	res, err = http.Post(ts.URL.String(), "none", nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if res.StatusCode != http.StatusBadRequest {
-		t.Errorf("expected status %d, got %s", http.StatusBadRequest, res.Status)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/snapshot.go b/installer/vendor/github.com/vmware/govmomi/simulator/snapshot.go
deleted file mode 100644
index 71f4925a3c..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/snapshot.go
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type VirtualMachineSnapshot struct {
-	mo.VirtualMachineSnapshot
-}
-
-func (v *VirtualMachineSnapshot) RemoveSnapshotTask(req *types.RemoveSnapshot_Task) soap.HasFault {
-	task := CreateTask(v, "removeSnapshot", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		Map.Remove(req.This)
-
-		vm := Map.Get(v.Vm).(*VirtualMachine)
-
-		if vm.Snapshot.CurrentSnapshot != nil && *vm.Snapshot.CurrentSnapshot == req.This {
-			parent := findParentSnapshotInTree(vm.Snapshot.RootSnapshotList, req.This)
-			vm.Snapshot.CurrentSnapshot = parent
-		}
-
-		vm.Snapshot.RootSnapshotList = removeSnapshotInTree(vm.Snapshot.RootSnapshotList, req.This, req.RemoveChildren)
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.RemoveSnapshot_TaskBody{
-		Res: &types.RemoveSnapshot_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (v *VirtualMachineSnapshot) RevertToSnapshotTask(req *types.RevertToSnapshot_Task) soap.HasFault {
-	task := CreateTask(v, "revertToSnapshot", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		vm := Map.Get(v.Vm).(*VirtualMachine)
-
-		ref := v.Reference()
-		vm.Snapshot.CurrentSnapshot = &ref
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.RevertToSnapshot_TaskBody{
-		Res: &types.RevertToSnapshot_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/task.go b/installer/vendor/github.com/vmware/govmomi/simulator/task.go
deleted file mode 100644
index 7ef17498c9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/task.go
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-const vTaskSuffix = "_Task" // vmomi suffix
-const sTaskSuffix = "Task"  // simulator suffix (avoiding golint warning)
-
-type Task struct {
-	mo.Task
-
-	Execute func(*Task) (types.AnyType, types.BaseMethodFault)
-}
-
-func NewTask(runner TaskRunner) *Task {
-	ref := runner.Reference()
-	name := reflect.TypeOf(runner).Elem().Name()
-	name = strings.Replace(name, "VM", "Vm", 1) // "VM" for the type to make go-lint happy, but "Vm" for the vmodl ID
-	return CreateTask(ref, name, runner.Run)
-}
-
-func CreateTask(e mo.Reference, name string, run func(*Task) (types.AnyType, types.BaseMethodFault)) *Task {
-	ref := e.Reference()
-	id := name
-
-	if strings.HasSuffix(id, sTaskSuffix) {
-		id = id[:len(id)-len(sTaskSuffix)]
-		name = id + vTaskSuffix
-	}
-
-	task := &Task{
-		Execute: run,
-	}
-
-	Map.Put(task)
-
-	task.Info.Key = task.Self.Value
-	task.Info.Task = task.Self
-	task.Info.Name = ucFirst(name)
-	task.Info.DescriptionId = fmt.Sprintf("%s.%s", ref.Type, id)
-	task.Info.Entity = &ref
-	task.Info.EntityName = ref.Value
-
-	task.Info.QueueTime = time.Now()
-	task.Info.State = types.TaskInfoStateQueued
-
-	return task
-}
-
-type TaskRunner interface {
-	mo.Reference
-
-	Run(*Task) (types.AnyType, types.BaseMethodFault)
-}
-
-func (t *Task) Run() {
-	now := time.Now()
-	t.Info.StartTime = &now
-
-	t.Info.State = types.TaskInfoStateRunning
-
-	res, err := t.Execute(t)
-
-	now = time.Now()
-	t.Info.CompleteTime = &now
-
-	if err != nil {
-		t.Info.State = types.TaskInfoStateError
-		t.Info.Error = &types.LocalizedMethodFault{
-			Fault:            err,
-			LocalizedMessage: fmt.Sprintf("%T", err),
-		}
-	} else {
-		t.Info.Result = res
-		t.Info.State = types.TaskInfoStateSuccess
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/task_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/task_manager.go
deleted file mode 100644
index df27108259..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/task_manager.go
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var recentTaskMax = 200 // the VC limit
-
-type TaskManager struct {
-	mo.TaskManager
-}
-
-func NewTaskManager(ref types.ManagedObjectReference) object.Reference {
-	s := &TaskManager{}
-	s.Self = ref
-	Map.AddHandler(s)
-	return s
-}
-
-func (m *TaskManager) PutObject(obj mo.Reference) {
-	ref := obj.Reference()
-	if ref.Type != "Task" {
-		return
-	}
-
-	m.RecentTask = append(m.RecentTask, ref)
-
-	if len(m.RecentTask) > recentTaskMax {
-		m.RecentTask = m.RecentTask[1:]
-	}
-}
-
-func (m *TaskManager) RemoveObject(_ types.ManagedObjectReference) {
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/task_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/task_manager_test.go
deleted file mode 100644
index d5a0c1a907..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/task_manager_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/simulator/esx"
-)
-
-func TestTaskManagerRecent(t *testing.T) {
-	m := ESX()
-	m.Datastore = 0
-	m.Machine = 0
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	recentTaskMax = 5
-
-	tm := Map.Get(*esx.ServiceContent.TaskManager).(*TaskManager)
-	tm.RecentTask = nil
-
-	for i := 0; i < recentTaskMax+2; i++ {
-		CreateTask(esx.RootFolder, "noop", nil)
-
-		if len(tm.RecentTask) > recentTaskMax {
-			t.Errorf("too many tasks %d > %d", len(tm.RecentTask), recentTaskMax)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/task_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/task_test.go
deleted file mode 100644
index de1d318507..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/task_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type addWaterTask struct {
-	*mo.Folder
-
-	fault types.BaseMethodFault
-}
-
-func (a *addWaterTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	return nil, a.fault
-}
-
-func TestNewTask(t *testing.T) {
-	f := &mo.Folder{}
-	Map.NewEntity(f)
-
-	add := &addWaterTask{f, nil}
-	task := NewTask(add)
-	info := &task.Info
-
-	if info.Name != "AddWater_Task" {
-		t.Errorf("name=%s", info.Name)
-	}
-
-	if info.DescriptionId != "Folder.addWater" {
-		t.Errorf("descriptionId=%s", info.DescriptionId)
-	}
-
-	task.Run()
-
-	if info.State != types.TaskInfoStateSuccess {
-		t.Fail()
-	}
-
-	add.fault = &types.ManagedObjectNotFound{}
-
-	task.Run()
-
-	if info.State != types.TaskInfoStateError {
-		t.Fail()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/user_directory.go b/installer/vendor/github.com/vmware/govmomi/simulator/user_directory.go
deleted file mode 100644
index 2a2f0a3aab..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/user_directory.go
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var DefaultUserGroup = []*types.UserSearchResult{
-	{FullName: "root", Group: true, Principal: "root"},
-	{FullName: "root", Group: false, Principal: "root"},
-	{FullName: "administrator", Group: false, Principal: "admin"},
-}
-
-type UserDirectory struct {
-	mo.UserDirectory
-
-	userGroup []*types.UserSearchResult
-}
-
-func NewUserDirectory(ref types.ManagedObjectReference) object.Reference {
-	u := &UserDirectory{}
-
-	u.Self = ref
-	u.userGroup = DefaultUserGroup
-
-	return u
-}
-
-func (u *UserDirectory) RetrieveUserGroups(req *types.RetrieveUserGroups) soap.HasFault {
-	compare := compareFunc(req.SearchStr, req.ExactMatch)
-
-	var res []types.BaseUserSearchResult
-	for _, ug := range u.userGroup {
-		if req.FindUsers && !ug.Group || req.FindGroups && ug.Group {
-			if compare(ug.Principal) {
-				res = append(res, ug)
-			}
-		}
-	}
-
-	body := &methods.RetrieveUserGroupsBody{
-		Res: &types.RetrieveUserGroupsResponse{
-			Returnval: res,
-		},
-	}
-
-	return body
-}
-
-func compareFunc(compared string, exactly bool) func(string) bool {
-	return func(s string) bool {
-		if exactly {
-			return s == compared
-		}
-		return strings.Contains(strings.ToLower(s), strings.ToLower(compared))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/user_directory_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/user_directory_test.go
deleted file mode 100644
index 6dde0c5876..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/user_directory_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestUserDirectory(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var tests = []struct {
-		findUsers  bool
-		findGroups bool
-	}{
-		{true, true},
-		{true, false},
-		{false, true},
-		{false, false},
-	}
-
-	ref := *c.ServiceContent.UserDirectory
-
-	for _, test := range tests {
-		req := types.RetrieveUserGroups{
-			This:       ref,
-			SearchStr:  "root",
-			ExactMatch: true,
-			FindUsers:  test.findUsers,
-			FindGroups: test.findGroups,
-		}
-
-		result, err := methods.RetrieveUserGroups(ctx, c.Client, &req)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		expectedSize := 0
-		if test.findGroups {
-			expectedSize++
-		}
-		if test.findUsers {
-			expectedSize++
-		}
-
-		if len(result.Returnval) != expectedSize {
-			t.Fatalf("expect search result for root is %d; got %d", expectedSize, len(result.Returnval))
-		}
-
-		for _, u := range result.Returnval {
-			if u.GetUserSearchResult().Principal != "root" {
-				t.Fatalf("expect principal to be root; got %s", u.GetUserSearchResult().Principal)
-			}
-			if !test.findGroups && u.GetUserSearchResult().Group {
-				t.Fatal("expect search result is non-group; got group")
-			}
-			if !test.findUsers && !u.GetUserSearchResult().Group {
-				t.Fatal("expect search result is non-user; got user")
-			}
-		}
-	}
-}
-
-func TestUserDirectoryExactlyMatch(t *testing.T) {
-	s := New(NewServiceInstance(esx.ServiceContent, esx.RootFolder))
-
-	ts := s.NewServer()
-	defer ts.Close()
-
-	ctx := context.Background()
-
-	c, err := govmomi.NewClient(ctx, ts.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var tests = []struct {
-		exactly      bool
-		search       string
-		expectedSize int
-	}{
-		{true, "root", 2},
-		{false, "ROO", 2},
-	}
-
-	ref := *c.ServiceContent.UserDirectory
-
-	for _, test := range tests {
-		req := types.RetrieveUserGroups{
-			This:       ref,
-			SearchStr:  test.search,
-			ExactMatch: test.exactly,
-			FindUsers:  true,
-			FindGroups: true,
-		}
-
-		result, err := methods.RetrieveUserGroups(ctx, c.Client, &req)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(result.Returnval) != test.expectedSize {
-			t.Fatalf("expect result contains %d results; got %d", test.expectedSize, len(result.Returnval))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/view_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/view_manager.go
deleted file mode 100644
index 959f22847b..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/view_manager.go
+++ /dev/null
@@ -1,184 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"reflect"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type ViewManager struct {
-	mo.ViewManager
-
-	entities map[string]bool
-}
-
-var entities = []struct {
-	Type      reflect.Type
-	Container bool
-}{
-	{reflect.TypeOf((*mo.ManagedEntity)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.Folder)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.StoragePod)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.Datacenter)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.ComputeResource)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.ClusterComputeResource)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.HostSystem)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.ResourcePool)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.VirtualApp)(nil)).Elem(), true},
-	{reflect.TypeOf((*mo.VirtualMachine)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.Datastore)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.Network)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.OpaqueNetwork)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.DistributedVirtualPortgroup)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.DistributedVirtualSwitch)(nil)).Elem(), false},
-	{reflect.TypeOf((*mo.VmwareDistributedVirtualSwitch)(nil)).Elem(), false},
-}
-
-func NewViewManager(ref types.ManagedObjectReference) object.Reference {
-	s := &ViewManager{
-		entities: make(map[string]bool),
-	}
-
-	s.Self = ref
-
-	for _, e := range entities {
-		s.entities[e.Type.Name()] = e.Container
-	}
-
-	return s
-}
-
-func destroyView(ref types.ManagedObjectReference) soap.HasFault {
-	m := Map.ViewManager()
-
-	m.ViewList = RemoveReference(ref, m.ViewList)
-
-	return &methods.DestroyViewBody{
-		Res: &types.DestroyViewResponse{},
-	}
-}
-
-func (m *ViewManager) CreateContainerView(req *types.CreateContainerView) soap.HasFault {
-	body := &methods.CreateContainerViewBody{}
-
-	root := Map.Get(req.Container)
-	if root == nil {
-		body.Fault_ = Fault("", &types.ManagedObjectNotFound{Obj: req.Container})
-		return body
-	}
-
-	if m.entities[root.Reference().Type] != true {
-		body.Fault_ = Fault("", &types.InvalidArgument{InvalidProperty: "container"})
-		return body
-	}
-
-	container := &ContainerView{
-		mo.ContainerView{
-			Container: root.Reference(),
-			Recursive: req.Recursive,
-			Type:      req.Type,
-		},
-		make(map[string]bool),
-	}
-
-	for _, ctype := range container.Type {
-		if _, ok := m.entities[ctype]; !ok {
-			body.Fault_ = Fault("", &types.InvalidArgument{InvalidProperty: "type"})
-			return body
-		}
-
-		container.types[ctype] = true
-
-		for _, e := range entities {
-			// Check for embedded types
-			if f, ok := e.Type.FieldByName(ctype); ok && f.Anonymous {
-				container.types[e.Type.Name()] = true
-			}
-		}
-	}
-
-	Map.Put(container)
-
-	m.ViewList = append(m.ViewList, container.Reference())
-
-	body.Res = &types.CreateContainerViewResponse{
-		Returnval: container.Self,
-	}
-
-	container.add(root)
-
-	return body
-}
-
-type ContainerView struct {
-	mo.ContainerView
-
-	types map[string]bool
-}
-
-func (v *ContainerView) DestroyView(c *types.DestroyView) soap.HasFault {
-	return destroyView(c.This)
-}
-
-func (v *ContainerView) include(o types.ManagedObjectReference) bool {
-	if len(v.types) == 0 {
-		return true
-	}
-
-	return v.types[o.Type]
-}
-
-func (v *ContainerView) add(root mo.Reference) {
-	var children []types.ManagedObjectReference
-
-	switch e := root.(type) {
-	case *mo.Datacenter:
-		children = []types.ManagedObjectReference{e.VmFolder, e.HostFolder, e.DatastoreFolder, e.NetworkFolder}
-	case *Folder:
-		children = e.ChildEntity
-	case *mo.ComputeResource:
-		children = e.Host
-		children = append(children, *e.ResourcePool)
-	case *ClusterComputeResource:
-		children = e.Host
-		children = append(children, *e.ResourcePool)
-	case *ResourcePool:
-		children = e.ResourcePool.ResourcePool
-		children = append(children, e.Vm...)
-	case *VirtualApp:
-		children = e.ResourcePool.ResourcePool
-		children = append(children, e.Vm...)
-	case *HostSystem:
-		children = e.Vm
-	}
-
-	for _, child := range children {
-		if v.include(child) {
-			v.View = AddReference(child, v.View)
-		}
-
-		if v.Recursive {
-			v.add(Map.Get(child))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/view_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/view_manager_test.go
deleted file mode 100644
index d72e71fc94..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/view_manager_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestContainerViewVPX(t *testing.T) {
-	ctx := context.Background()
-
-	m := VPX()
-	m.Datacenter = 3
-	m.Folder = 2
-	m.Pool = 1
-	m.App = 1
-	m.Pod = 1
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	v := view.NewManager(c.Client)
-	root := c.Client.ServiceContent.RootFolder
-
-	// test container type validation
-	_, err = v.CreateContainerView(ctx, v.Reference(), nil, false)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	// test container value validation
-	_, err = v.CreateContainerView(ctx, types.ManagedObjectReference{Value: "enoent"}, nil, false)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	// test types validation
-	_, err = v.CreateContainerView(ctx, root, []string{"enoent"}, false)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	vapp := object.NewVirtualApp(c.Client, Map.Any("VirtualApp").Reference())
-
-	count := m.Count()
-
-	tests := []struct {
-		root    types.ManagedObjectReference
-		recurse bool
-		kinds   []string
-		expect  int
-	}{
-		{root, false, nil, m.Datacenter - m.Folder + m.Folder},
-		{root, true, nil, count.total - 1},                             // not including the root Folder
-		{root, true, []string{"ManagedEntity"}, count.total - 1},       // not including the root Folder
-		{root, true, []string{"Folder"}, count.Folder + count.Pod - 1}, // not including the root Folder
-		{root, false, []string{"HostSystem"}, 0},
-		{root, true, []string{"HostSystem"}, count.Host},
-		{root, false, []string{"Datacenter"}, m.Datacenter - m.Folder},
-		{root, true, []string{"Datacenter"}, count.Datacenter},
-		{root, true, []string{"Datastore"}, count.Datastore},
-		{root, true, []string{"VirtualMachine"}, count.Machine},
-		{root, true, []string{"ResourcePool"}, count.Pool + count.App},
-		{root, true, []string{"VirtualApp"}, count.App},
-		{vapp.Reference(), true, []string{"VirtualMachine"}, m.Machine},
-		{root, true, []string{"ClusterComputeResource"}, count.Cluster},
-		{root, true, []string{"ComputeResource"}, (m.Cluster + m.Host) * m.Datacenter},
-		{root, true, []string{"DistributedVirtualSwitch"}, count.Datacenter},
-		{root, true, []string{"DistributedVirtualPortgroup"}, count.Portgroup},
-		{root, true, []string{"Network"}, count.Portgroup + m.Datacenter},
-		{root, true, []string{"OpaqueNetwork"}, 0},
-		{root, true, []string{"StoragePod"}, m.Pod * m.Datacenter},
-	}
-
-	pc := property.DefaultCollector(c.Client)
-
-	mvm := Map.ViewManager()
-
-	for i, test := range tests {
-		cv, err := v.CreateContainerView(ctx, test.root, test.kinds, test.recurse)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(mvm.ViewList) != 1 {
-			t.Errorf("ViewList=%s", mvm.ViewList)
-		}
-
-		var mcv mo.ContainerView
-		err = pc.RetrieveOne(ctx, cv.Reference(), nil, &mcv)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		n := len(mcv.View)
-
-		if n != test.expect {
-			t.Errorf("%d: %d != %d", i, n, test.expect)
-		}
-
-		err = cv.Destroy(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if len(mvm.ViewList) != 0 {
-			t.Errorf("ViewList=%s", mvm.ViewList)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go b/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go
deleted file mode 100644
index 622d272e66..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager.go
+++ /dev/null
@@ -1,175 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"os"
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type VirtualDiskManager struct {
-	mo.VirtualDiskManager
-}
-
-func NewVirtualDiskManager(ref types.ManagedObjectReference) object.Reference {
-	m := &VirtualDiskManager{}
-	m.Self = ref
-	return m
-}
-
-func (m *VirtualDiskManager) names(name string) []string {
-	return []string{
-		strings.Replace(name, ".vmdk", "-flat.vmdk", 1),
-		name,
-	}
-}
-
-func (m *VirtualDiskManager) createVirtualDisk(req *types.CreateVirtualDisk_Task) types.BaseMethodFault {
-	fm := Map.FileManager()
-
-	file, fault := fm.resolve(req.Datacenter, req.Name)
-	if fault != nil {
-		return fault
-	}
-
-	for _, name := range m.names(file) {
-		_, err := os.Stat(name)
-		if err == nil {
-			return fm.fault(name, nil, new(types.FileAlreadyExists))
-		}
-
-		f, err := os.Create(name)
-		if err != nil {
-			return fm.fault(name, err, new(types.CannotCreateFile))
-		}
-
-		_ = f.Close()
-	}
-
-	return nil
-}
-
-func (m *VirtualDiskManager) CreateVirtualDiskTask(req *types.CreateVirtualDisk_Task) soap.HasFault {
-	task := CreateTask(m, "createVirtualDisk", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		return nil, m.createVirtualDisk(req)
-	})
-
-	task.Run()
-
-	return &methods.CreateVirtualDisk_TaskBody{
-		Res: &types.CreateVirtualDisk_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (m *VirtualDiskManager) DeleteVirtualDiskTask(req *types.DeleteVirtualDisk_Task) soap.HasFault {
-	task := CreateTask(m, "deleteVirtualDisk", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		fm := Map.FileManager()
-
-		for _, name := range m.names(req.Name) {
-			err := fm.deleteDatastoreFile(&types.DeleteDatastoreFile_Task{
-				Name:       name,
-				Datacenter: req.Datacenter,
-			})
-
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.DeleteVirtualDisk_TaskBody{
-		Res: &types.DeleteVirtualDisk_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (m *VirtualDiskManager) MoveVirtualDiskTask(req *types.MoveVirtualDisk_Task) soap.HasFault {
-	task := CreateTask(m, "moveVirtualDisk", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		fm := Map.FileManager()
-
-		dest := m.names(req.DestName)
-
-		for i, name := range m.names(req.SourceName) {
-			err := fm.moveDatastoreFile(&types.MoveDatastoreFile_Task{
-				SourceName:            name,
-				SourceDatacenter:      req.SourceDatacenter,
-				DestinationName:       dest[i],
-				DestinationDatacenter: req.DestDatacenter,
-				Force: req.Force,
-			})
-
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.MoveVirtualDisk_TaskBody{
-		Res: &types.MoveVirtualDisk_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (m *VirtualDiskManager) CopyVirtualDiskTask(req *types.CopyVirtualDisk_Task) soap.HasFault {
-	task := CreateTask(m, "copyVirtualDisk", func(*Task) (types.AnyType, types.BaseMethodFault) {
-		fm := Map.FileManager()
-
-		dest := m.names(req.DestName)
-
-		for i, name := range m.names(req.SourceName) {
-			err := fm.copyDatastoreFile(&types.CopyDatastoreFile_Task{
-				SourceName:            name,
-				SourceDatacenter:      req.SourceDatacenter,
-				DestinationName:       dest[i],
-				DestinationDatacenter: req.DestDatacenter,
-				Force: req.Force,
-			})
-
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.CopyVirtualDisk_TaskBody{
-		Res: &types.CopyVirtualDisk_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager_test.go
deleted file mode 100644
index 990857f128..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_disk_manager_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestVirtualDiskManager(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	defer m.Remove()
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	dm := object.NewVirtualDiskManager(c.Client)
-	fm := object.NewFileManager(c.Client)
-
-	spec := &types.FileBackedVirtualDiskSpec{
-		VirtualDiskSpec: types.VirtualDiskSpec{
-			AdapterType: string(types.VirtualDiskAdapterTypeLsiLogic),
-			DiskType:    string(types.VirtualDiskTypeThin),
-		},
-		CapacityKb: 1024 * 1024,
-	}
-
-	name := "[LocalDS_0] disks/disk1.vmdk"
-
-	for i, fail := range []bool{true, false, true} {
-		task, err := dm.CreateVirtualDisk(ctx, name, nil, spec)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = task.Wait(ctx)
-		if fail {
-			if err == nil {
-				t.Error("expected error") // disk1 already exists
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-
-		if i == 0 {
-			err = fm.MakeDirectory(ctx, path.Dir(name), nil, true)
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	old := name
-	name = strings.Replace(old, "disk1", "disk2", 1)
-
-	for _, fail := range []bool{false, true} {
-		task, err := dm.MoveVirtualDisk(ctx, old, nil, name, nil, false)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = task.Wait(ctx)
-		if fail {
-			if err == nil {
-				t.Error("expected error") // disk1 no longer exists
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-
-	for _, fail := range []bool{false, true} {
-		task, err := dm.CopyVirtualDisk(ctx, name, nil, old, nil, &types.VirtualDiskSpec{}, false)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = task.Wait(ctx)
-		if fail {
-			if err == nil {
-				t.Error("expected error") // disk1 exists again
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-
-	for _, fail := range []bool{false, true} {
-		task, err := dm.DeleteVirtualDisk(ctx, name, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = task.Wait(ctx)
-		if fail {
-			if err == nil {
-				t.Error("expected error") // disk2 no longer exists
-			}
-		} else {
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go b/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go
deleted file mode 100644
index 4aaf0374e4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine.go
+++ /dev/null
@@ -1,876 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"os"
-	"path"
-	"strings"
-	"sync/atomic"
-	"time"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type VirtualMachine struct {
-	mo.VirtualMachine
-
-	log *log.Logger
-	out io.Closer
-	sid int32
-}
-
-func NewVirtualMachine(parent types.ManagedObjectReference, spec *types.VirtualMachineConfigSpec) (*VirtualMachine, types.BaseMethodFault) {
-	vm := &VirtualMachine{}
-	vm.Parent = &parent
-
-	if spec.Name == "" {
-		return nil, &types.InvalidVmConfig{Property: "configSpec.name"}
-	}
-
-	if spec.Files == nil || spec.Files.VmPathName == "" {
-		return nil, &types.InvalidVmConfig{Property: "configSpec.files.vmPathName"}
-	}
-
-	vm.Config = &types.VirtualMachineConfigInfo{
-		ExtraConfig: []types.BaseOptionValue{&types.OptionValue{Key: "govcsim", Value: "TRUE"}},
-		Tools:       &types.ToolsConfigInfo{},
-	}
-	vm.Summary.Guest = &types.VirtualMachineGuestSummary{}
-	vm.Summary.Storage = &types.VirtualMachineStorageSummary{}
-	vm.Summary.Vm = &vm.Self
-
-	// Append VM Name as the directory name if not specified
-	if strings.HasSuffix(spec.Files.VmPathName, "]") { // e.g. "[datastore1]"
-		spec.Files.VmPathName += " " + spec.Name
-	}
-
-	if !strings.HasSuffix(spec.Files.VmPathName, ".vmx") {
-		spec.Files.VmPathName = path.Join(spec.Files.VmPathName, spec.Name+".vmx")
-	}
-
-	dsPath := path.Dir(spec.Files.VmPathName)
-
-	defaults := types.VirtualMachineConfigSpec{
-		NumCPUs:           1,
-		NumCoresPerSocket: 1,
-		MemoryMB:          32,
-		Uuid:              uuid.New().String(),
-		Version:           "vmx-11",
-		Files: &types.VirtualMachineFileInfo{
-			SnapshotDirectory: dsPath,
-			SuspendDirectory:  dsPath,
-			LogDirectory:      dsPath,
-		},
-	}
-
-	// Add the default devices
-	defaults.DeviceChange, _ = object.VirtualDeviceList(esx.VirtualDevice).ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-
-	err := vm.configure(&defaults)
-	if err != nil {
-		return nil, err
-	}
-
-	vm.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOff
-	vm.Runtime.ConnectionState = types.VirtualMachineConnectionStateConnected
-	vm.Summary.Runtime = vm.Runtime
-
-	vm.Summary.QuickStats.GuestHeartbeatStatus = types.ManagedEntityStatusGray
-	vm.Summary.OverallStatus = types.ManagedEntityStatusGreen
-	vm.ConfigStatus = types.ManagedEntityStatusGreen
-
-	return vm, nil
-}
-
-func (vm *VirtualMachine) apply(spec *types.VirtualMachineConfigSpec) {
-	if spec.Files == nil {
-		spec.Files = new(types.VirtualMachineFileInfo)
-	}
-
-	apply := []struct {
-		src string
-		dst *string
-	}{
-		{spec.Name, &vm.Name},
-		{spec.Name, &vm.Config.Name},
-		{spec.Name, &vm.Summary.Config.Name},
-		{spec.GuestId, &vm.Config.GuestId},
-		{spec.GuestId, &vm.Config.GuestFullName},
-		{spec.GuestId, &vm.Summary.Guest.GuestId},
-		{spec.GuestId, &vm.Summary.Config.GuestId},
-		{spec.GuestId, &vm.Summary.Config.GuestFullName},
-		{spec.Uuid, &vm.Config.Uuid},
-		{spec.Version, &vm.Config.Version},
-		{spec.Files.VmPathName, &vm.Config.Files.VmPathName},
-		{spec.Files.VmPathName, &vm.Summary.Config.VmPathName},
-		{spec.Files.SnapshotDirectory, &vm.Config.Files.SnapshotDirectory},
-		{spec.Files.LogDirectory, &vm.Config.Files.LogDirectory},
-	}
-
-	for _, f := range apply {
-		if f.src != "" {
-			*f.dst = f.src
-		}
-	}
-
-	if spec.MemoryMB != 0 {
-		vm.Config.Hardware.MemoryMB = int32(spec.MemoryMB)
-		vm.Summary.Config.MemorySizeMB = vm.Config.Hardware.MemoryMB
-	}
-
-	if spec.NumCPUs != 0 {
-		vm.Config.Hardware.NumCPU = spec.NumCPUs
-		vm.Summary.Config.NumCpu = vm.Config.Hardware.NumCPU
-	}
-
-	vm.Config.ExtraConfig = append(vm.Config.ExtraConfig, spec.ExtraConfig...)
-
-	vm.Config.Modified = time.Now()
-
-	vm.Summary.Config.Uuid = vm.Config.Uuid
-}
-
-func (vm *VirtualMachine) configure(spec *types.VirtualMachineConfigSpec) types.BaseMethodFault {
-	vm.apply(spec)
-
-	return vm.configureDevices(spec)
-}
-
-func (vm *VirtualMachine) useDatastore(name string) *Datastore {
-	host := Map.Get(*vm.Runtime.Host).(*HostSystem)
-
-	ds := Map.FindByName(name, host.Datastore).(*Datastore)
-
-	vm.Datastore = AddReference(ds.Self, vm.Datastore)
-
-	return ds
-}
-
-func (vm *VirtualMachine) setLog(w io.WriteCloser) {
-	vm.out = w
-	vm.log = log.New(w, "vmx ", log.Flags())
-}
-
-func (vm *VirtualMachine) createFile(spec string, name string, register bool) (*os.File, types.BaseMethodFault) {
-	p, fault := parseDatastorePath(spec)
-	if fault != nil {
-		return nil, fault
-	}
-
-	ds := vm.useDatastore(p.Datastore)
-
-	file := path.Join(ds.Info.GetDatastoreInfo().Url, p.Path)
-
-	if name != "" {
-		if path.Ext(file) != "" {
-			file = path.Dir(file)
-		}
-
-		file = path.Join(file, name)
-	}
-
-	if register {
-		f, err := os.Open(file)
-		if err != nil {
-			log.Printf("register %s: %s", vm.Reference(), err)
-			if os.IsNotExist(err) {
-				return nil, &types.NotFound{}
-			}
-
-			return nil, &types.InvalidArgument{}
-		}
-
-		return f, nil
-	}
-
-	dir := path.Dir(file)
-
-	_ = os.MkdirAll(dir, 0700)
-
-	_, err := os.Stat(file)
-	if err == nil {
-		return nil, &types.FileAlreadyExists{
-			FileFault: types.FileFault{
-				File: file,
-			},
-		}
-	}
-
-	f, err := os.Create(file)
-	if err != nil {
-		return nil, &types.FileFault{
-			File: file,
-		}
-	}
-
-	return f, nil
-}
-
-func (vm *VirtualMachine) create(spec *types.VirtualMachineConfigSpec, register bool) types.BaseMethodFault {
-	vm.apply(spec)
-
-	files := []struct {
-		spec string
-		name string
-		use  func(w io.WriteCloser)
-	}{
-		{vm.Config.Files.VmPathName, "", nil},
-		{vm.Config.Files.VmPathName, fmt.Sprintf("%s.nvram", vm.Name), nil},
-		{vm.Config.Files.LogDirectory, "vmware.log", vm.setLog},
-	}
-
-	for _, file := range files {
-		f, err := vm.createFile(file.spec, file.name, register)
-		if err != nil {
-			return err
-		}
-
-		if file.use != nil {
-			file.use(f)
-		} else {
-			_ = f.Close()
-		}
-	}
-
-	vm.log.Print("created")
-
-	return vm.configureDevices(spec)
-}
-
-var vmwOUI = net.HardwareAddr([]byte{0x0, 0xc, 0x29})
-
-// From http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.vsphere.networking.doc%2FGUID-DC7478FF-DC44-4625-9AD7-38208C56A552.html
-// "The host generates generateMAC addresses that consists of the VMware OUI 00:0C:29 and the last three octets in hexadecimal
-//  format of the virtual machine UUID.  The virtual machine UUID is based on a hash calculated by using the UUID of the
-//  ESXi physical machine and the path to the configuration file (.vmx) of the virtual machine."
-func (vm *VirtualMachine) generateMAC() string {
-	id := uuid.New() // Random is fine for now.
-
-	offset := len(id) - len(vmwOUI)
-
-	mac := append(vmwOUI, id[offset:]...)
-
-	return mac.String()
-}
-
-func (vm *VirtualMachine) configureDevice(devices object.VirtualDeviceList, device types.BaseVirtualDevice) types.BaseMethodFault {
-	d := device.GetVirtualDevice()
-	var controller types.BaseVirtualController
-
-	if d.Key < 0 {
-		// Choose a unique key
-		if d.Key == -1 {
-			d.Key = devices.NewKey()
-		}
-
-		d.Key *= -1
-
-		for {
-			if devices.FindByKey(d.Key) == nil {
-				break
-			}
-			d.Key++
-		}
-	}
-
-	label := devices.Name(device)
-	summary := label
-	dc := Map.getEntityDatacenter(Map.Get(*vm.Parent).(mo.Entity))
-	dm := Map.VirtualDiskManager()
-
-	switch x := device.(type) {
-	case types.BaseVirtualEthernetCard:
-		controller = devices.PickController((*types.VirtualPCIController)(nil))
-		var net types.ManagedObjectReference
-
-		switch b := d.Backing.(type) {
-		case *types.VirtualEthernetCardNetworkBackingInfo:
-			summary = b.DeviceName
-			net = Map.FindByName(b.DeviceName, dc.Network).Reference()
-			b.Network = &net
-		case *types.VirtualEthernetCardDistributedVirtualPortBackingInfo:
-			summary = fmt.Sprintf("DVSwitch: %s", b.Port.SwitchUuid)
-			net.Type = "DistributedVirtualPortgroup"
-			net.Value = b.Port.PortgroupKey
-		}
-
-		vm.Network = append(vm.Network, net)
-
-		c := x.GetVirtualEthernetCard()
-		if c.MacAddress == "" {
-			c.MacAddress = vm.generateMAC()
-		}
-	case *types.VirtualDisk:
-		switch b := d.Backing.(type) {
-		case types.BaseVirtualDeviceFileBackingInfo:
-			info := b.GetVirtualDeviceFileBackingInfo()
-
-			if info.FileName == "" {
-				filename, err := vm.genVmdkPath()
-				if err != nil {
-					return err
-				}
-
-				info.FileName = filename
-			}
-
-			err := dm.createVirtualDisk(&types.CreateVirtualDisk_Task{
-				Datacenter: &dc.Self,
-				Name:       info.FileName,
-			})
-			if err != nil {
-				return err
-			}
-
-			p, _ := parseDatastorePath(info.FileName)
-
-			info.Datastore = &types.ManagedObjectReference{
-				Type:  "Datastore",
-				Value: p.Datastore,
-			}
-		}
-	}
-
-	if d.UnitNumber == nil && controller != nil {
-		devices.AssignController(device, controller)
-	}
-
-	if d.DeviceInfo == nil {
-		d.DeviceInfo = &types.Description{
-			Label:   label,
-			Summary: summary,
-		}
-	}
-
-	return nil
-}
-
-func removeDevice(devices object.VirtualDeviceList, device types.BaseVirtualDevice) object.VirtualDeviceList {
-	var result object.VirtualDeviceList
-
-	for i, d := range devices {
-		if d.GetVirtualDevice().Key == device.GetVirtualDevice().Key {
-			result = append(result, devices[i+1:]...)
-			break
-		}
-
-		result = append(result, d)
-	}
-
-	return result
-}
-
-func (vm *VirtualMachine) genVmdkPath() (string, types.BaseMethodFault) {
-	vmdir := path.Dir(vm.Config.Files.VmPathName)
-
-	index := 0
-	for {
-		var filename string
-		if index == 0 {
-			filename = fmt.Sprintf("%s.vmdk", vm.Config.Name)
-		} else {
-			filename = fmt.Sprintf("%s_%d.vmdk", vm.Config.Name, index)
-		}
-
-		f, err := vm.createFile(vmdir, filename, false)
-		if err != nil {
-			switch err.(type) {
-			case *types.FileAlreadyExists:
-				index++
-				continue
-			default:
-				return "", err
-			}
-		}
-
-		_ = f.Close()
-		_ = os.Remove(f.Name())
-
-		return path.Join(vmdir, filename), nil
-	}
-}
-
-func (vm *VirtualMachine) configureDevices(spec *types.VirtualMachineConfigSpec) types.BaseMethodFault {
-	devices := object.VirtualDeviceList(vm.Config.Hardware.Device)
-
-	for i, change := range spec.DeviceChange {
-		dspec := change.GetVirtualDeviceConfigSpec()
-		device := dspec.Device.GetVirtualDevice()
-		invalid := &types.InvalidDeviceSpec{DeviceIndex: int32(i)}
-
-		switch dspec.Operation {
-		case types.VirtualDeviceConfigSpecOperationAdd:
-			if devices.FindByKey(device.Key) != nil {
-				if vm.Self.Value != "" { // moid isn't set until CreateVM is done
-					return invalid
-				}
-
-				// In this case, the CreateVM() spec included one of the default devices
-				devices = removeDevice(devices, device)
-			}
-
-			err := vm.configureDevice(devices, dspec.Device)
-			if err != nil {
-				return err
-			}
-
-			devices = append(devices, dspec.Device)
-		case types.VirtualDeviceConfigSpecOperationRemove:
-			devices = removeDevice(devices, dspec.Device)
-		}
-	}
-
-	vm.Config.Hardware.Device = []types.BaseVirtualDevice(devices)
-
-	return nil
-}
-
-type powerVMTask struct {
-	*VirtualMachine
-
-	state types.VirtualMachinePowerState
-}
-
-func (c *powerVMTask) Run(task *Task) (types.AnyType, types.BaseMethodFault) {
-	c.log.Printf("running power task: requesting %s, existing %s",
-		c.state, c.VirtualMachine.Runtime.PowerState)
-
-	if c.VirtualMachine.Runtime.PowerState == c.state {
-		return nil, &types.InvalidPowerState{
-			RequestedState: c.state,
-			ExistingState:  c.VirtualMachine.Runtime.PowerState,
-		}
-	}
-
-	c.VirtualMachine.Runtime.PowerState = c.state
-	c.VirtualMachine.Summary.Runtime.PowerState = c.state
-
-	bt := &c.VirtualMachine.Summary.Runtime.BootTime
-	if c.state == types.VirtualMachinePowerStatePoweredOn {
-		now := time.Now()
-		*bt = &now
-	} else {
-		*bt = nil
-	}
-
-	return nil, nil
-}
-
-func (vm *VirtualMachine) PowerOnVMTask(c *types.PowerOnVM_Task) soap.HasFault {
-	r := &methods.PowerOnVM_TaskBody{}
-
-	runner := &powerVMTask{vm, types.VirtualMachinePowerStatePoweredOn}
-	task := CreateTask(runner.Reference(), "powerOn", runner.Run)
-
-	r.Res = &types.PowerOnVM_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-func (vm *VirtualMachine) PowerOffVMTask(c *types.PowerOffVM_Task) soap.HasFault {
-	r := &methods.PowerOffVM_TaskBody{}
-
-	runner := &powerVMTask{vm, types.VirtualMachinePowerStatePoweredOff}
-	task := CreateTask(runner.Reference(), "powerOff", runner.Run)
-
-	r.Res = &types.PowerOffVM_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-func (vm *VirtualMachine) ReconfigVMTask(req *types.ReconfigVM_Task) soap.HasFault {
-	task := CreateTask(vm, "reconfigVm", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		err := vm.configure(&req.Spec)
-		if err != nil {
-			return nil, err
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.ReconfigVM_TaskBody{
-		Res: &types.ReconfigVM_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) DestroyTask(req *types.Destroy_Task) soap.HasFault {
-	task := CreateTask(vm, "destroy", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		r := vm.UnregisterVM(&types.UnregisterVM{
-			This: req.This,
-		})
-
-		if r.Fault() != nil {
-			return nil, r.Fault().VimFault().(types.BaseMethodFault)
-		}
-
-		// Delete VM files from the datastore (ignoring result for now)
-		m := Map.FileManager()
-		dc := Map.getEntityDatacenter(vm).Reference()
-
-		_ = m.DeleteDatastoreFileTask(&types.DeleteDatastoreFile_Task{
-			This:       m.Reference(),
-			Name:       vm.Config.Files.LogDirectory,
-			Datacenter: &dc,
-		})
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.Destroy_TaskBody{
-		Res: &types.Destroy_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) UnregisterVM(c *types.UnregisterVM) soap.HasFault {
-	r := &methods.UnregisterVMBody{}
-
-	if vm.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOn {
-		r.Fault_ = Fault("", &types.InvalidPowerState{
-			RequestedState: types.VirtualMachinePowerStatePoweredOff,
-			ExistingState:  vm.Runtime.PowerState,
-		})
-
-		return r
-	}
-
-	_ = vm.out.Close() // Close log fd
-
-	Map.getEntityParent(vm, "Folder").(*Folder).removeChild(c.This)
-
-	host := Map.Get(*vm.Runtime.Host).(*HostSystem)
-	host.Vm = RemoveReference(vm.Self, host.Vm)
-
-	switch pool := Map.Get(*vm.ResourcePool).(type) {
-	case *ResourcePool:
-		pool.Vm = RemoveReference(vm.Self, pool.Vm)
-	case *VirtualApp:
-		pool.Vm = RemoveReference(vm.Self, pool.Vm)
-	}
-
-	for i := range vm.Datastore {
-		ds := Map.Get(vm.Datastore[i]).(*Datastore)
-		ds.Vm = RemoveReference(vm.Self, ds.Vm)
-	}
-
-	r.Res = new(types.UnregisterVMResponse)
-
-	return r
-}
-
-func (vm *VirtualMachine) CloneVMTask(req *types.CloneVM_Task) soap.HasFault {
-	task := CreateTask(vm, "cloneVm", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		folder := Map.Get(req.Folder).(*Folder)
-
-		config := types.VirtualMachineConfigSpec{
-			Name:    req.Name,
-			GuestId: vm.Config.GuestId,
-			Files: &types.VirtualMachineFileInfo{
-				VmPathName: strings.Replace(vm.Config.Files.VmPathName, vm.Name, req.Name, -1),
-			},
-		}
-
-		res := folder.CreateVMTask(&types.CreateVM_Task{
-			This:   folder.Self,
-			Config: config,
-			Pool:   *vm.ResourcePool,
-		})
-
-		ctask := Map.Get(res.(*methods.CreateVM_TaskBody).Res.Returnval).(*Task)
-		if ctask.Info.Error != nil {
-			return nil, ctask.Info.Error.Fault
-		}
-
-		return ctask.Info.Result.(types.ManagedObjectReference), nil
-	})
-
-	task.Run()
-
-	return &methods.CloneVM_TaskBody{
-		Res: &types.CloneVM_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) RelocateVMTask(req *types.RelocateVM_Task) soap.HasFault {
-	task := CreateTask(vm, "relocateVm", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		if ref := req.Spec.Datastore; ref != nil {
-			ds := Map.Get(*ref).(*Datastore)
-			ds.Vm = RemoveReference(*ref, ds.Vm)
-
-			vm.Datastore = []types.ManagedObjectReference{*ref}
-
-			// TODO: migrate vm.Config.Files (and vm.Summary.Config.VmPathName)
-		}
-
-		if ref := req.Spec.Pool; ref != nil {
-			pool := Map.Get(*ref).(*ResourcePool)
-			pool.Vm = RemoveReference(*ref, pool.Vm)
-
-			vm.ResourcePool = ref
-		}
-
-		if ref := req.Spec.Host; ref != nil {
-			host := Map.Get(*ref).(*HostSystem)
-			host.Vm = RemoveReference(*ref, host.Vm)
-
-			vm.Runtime.Host = ref
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.RelocateVM_TaskBody{
-		Res: &types.RelocateVM_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) CreateSnapshotTask(req *types.CreateSnapshot_Task) soap.HasFault {
-	task := CreateTask(vm, "createSnapshot", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		if vm.Snapshot == nil {
-			vm.Snapshot = &types.VirtualMachineSnapshotInfo{}
-		}
-
-		snapshot := &VirtualMachineSnapshot{}
-		snapshot.Vm = vm.Reference()
-		snapshot.Config = *vm.Config
-
-		Map.Put(snapshot)
-
-		treeItem := types.VirtualMachineSnapshotTree{
-			Snapshot:        snapshot.Self,
-			Vm:              snapshot.Vm,
-			Name:            req.Name,
-			Description:     req.Description,
-			Id:              atomic.AddInt32(&vm.sid, 1),
-			CreateTime:      time.Now(),
-			State:           vm.Runtime.PowerState,
-			Quiesced:        req.Quiesce,
-			BackupManifest:  "",
-			ReplaySupported: types.NewBool(false),
-		}
-
-		cur := vm.Snapshot.CurrentSnapshot
-		if cur != nil {
-			parent := Map.Get(*cur).(*VirtualMachineSnapshot)
-			parent.ChildSnapshot = append(parent.ChildSnapshot, snapshot.Self)
-
-			ss := findSnapshotInTree(vm.Snapshot.RootSnapshotList, *cur)
-			ss.ChildSnapshotList = append(ss.ChildSnapshotList, treeItem)
-		} else {
-			vm.Snapshot.RootSnapshotList = append(vm.Snapshot.RootSnapshotList, treeItem)
-		}
-
-		vm.Snapshot.CurrentSnapshot = &snapshot.Self
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.CreateSnapshot_TaskBody{
-		Res: &types.CreateSnapshot_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) RevertToCurrentSnapshotTask(req *types.RevertToCurrentSnapshot_Task) soap.HasFault {
-	body := &methods.RevertToCurrentSnapshot_TaskBody{}
-
-	if vm.Snapshot == nil || vm.Snapshot.CurrentSnapshot == nil {
-		body.Fault_ = Fault("snapshot not found", &types.NotFound{})
-
-		return body
-	}
-
-	task := CreateTask(vm, "revertSnapshot", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		return nil, nil
-	})
-
-	task.Run()
-
-	body.Res = &types.RevertToCurrentSnapshot_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	return body
-}
-
-func (vm *VirtualMachine) RemoveAllSnapshotsTask(req *types.RemoveAllSnapshots_Task) soap.HasFault {
-	task := CreateTask(vm, "RemoveAllSnapshots", func(t *Task) (types.AnyType, types.BaseMethodFault) {
-		if vm.Snapshot == nil {
-			return nil, nil
-		}
-
-		refs := allSnapshotsInTree(vm.Snapshot.RootSnapshotList)
-
-		vm.Snapshot.CurrentSnapshot = nil
-		vm.Snapshot.RootSnapshotList = nil
-
-		for _, ref := range refs {
-			Map.Remove(ref)
-		}
-
-		return nil, nil
-	})
-
-	task.Run()
-
-	return &methods.RemoveAllSnapshots_TaskBody{
-		Res: &types.RemoveAllSnapshots_TaskResponse{
-			Returnval: task.Self,
-		},
-	}
-}
-
-func (vm *VirtualMachine) ShutdownGuest(c *types.ShutdownGuest) soap.HasFault {
-	r := &methods.ShutdownGuestBody{}
-	// should be poweron
-	if vm.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOff {
-		r.Fault_ = Fault("", &types.InvalidPowerState{
-			RequestedState: types.VirtualMachinePowerStatePoweredOn,
-			ExistingState:  vm.Runtime.PowerState,
-		})
-
-		return r
-	}
-	// change state
-	vm.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOff
-	vm.Summary.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOff
-
-	r.Res = new(types.ShutdownGuestResponse)
-
-	return r
-}
-
-func findSnapshotInTree(tree []types.VirtualMachineSnapshotTree, ref types.ManagedObjectReference) *types.VirtualMachineSnapshotTree {
-	if tree == nil {
-		return nil
-	}
-
-	for i, ss := range tree {
-		if ss.Snapshot == ref {
-			return &tree[i]
-		}
-
-		target := findSnapshotInTree(ss.ChildSnapshotList, ref)
-		if target != nil {
-			return target
-		}
-	}
-
-	return nil
-}
-
-func findParentSnapshot(tree types.VirtualMachineSnapshotTree, ref types.ManagedObjectReference) *types.ManagedObjectReference {
-	for _, ss := range tree.ChildSnapshotList {
-		if ss.Snapshot == ref {
-			return &tree.Snapshot
-		}
-
-		res := findParentSnapshot(ss, ref)
-		if res != nil {
-			return res
-		}
-	}
-
-	return nil
-}
-
-func findParentSnapshotInTree(tree []types.VirtualMachineSnapshotTree, ref types.ManagedObjectReference) *types.ManagedObjectReference {
-	if tree == nil {
-		return nil
-	}
-
-	for _, ss := range tree {
-		res := findParentSnapshot(ss, ref)
-		if res != nil {
-			return res
-		}
-	}
-
-	return nil
-}
-
-func removeSnapshotInTree(tree []types.VirtualMachineSnapshotTree, ref types.ManagedObjectReference, removeChildren bool) []types.VirtualMachineSnapshotTree {
-	if tree == nil {
-		return tree
-	}
-
-	var result []types.VirtualMachineSnapshotTree
-
-	for _, ss := range tree {
-		if ss.Snapshot == ref {
-			if !removeChildren {
-				result = append(result, ss.ChildSnapshotList...)
-			}
-		} else {
-			ss.ChildSnapshotList = removeSnapshotInTree(ss.ChildSnapshotList, ref, removeChildren)
-			result = append(result, ss)
-		}
-	}
-
-	return result
-}
-
-func allSnapshotsInTree(tree []types.VirtualMachineSnapshotTree) []types.ManagedObjectReference {
-	var result []types.ManagedObjectReference
-
-	if tree == nil {
-		return result
-	}
-
-	for _, ss := range tree {
-		result = append(result, ss.Snapshot)
-		result = append(result, allSnapshotsInTree(ss.ChildSnapshotList)...)
-	}
-
-	return result
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine_test.go b/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine_test.go
deleted file mode 100644
index a83eb774c1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/virtual_machine_test.go
+++ /dev/null
@@ -1,515 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package simulator
-
-import (
-	"context"
-	"fmt"
-	"math/rand"
-	"testing"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestCreateVm(t *testing.T) {
-	ctx := context.Background()
-
-	for _, model := range []*Model{ESX(), VPX()} {
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		c, err := govmomi.NewClient(ctx, s.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		p := property.DefaultCollector(c.Client)
-
-		finder := find.NewFinder(c.Client, false)
-
-		dc, err := finder.DefaultDatacenter(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		finder.SetDatacenter(dc)
-
-		folders, err := dc.Folders(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		ds, err := finder.DefaultDatastore(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		hosts, err := finder.HostSystemList(ctx, "*/*")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		nhosts := len(hosts)
-		host := hosts[rand.Intn(nhosts)]
-		pool, err := host.ResourcePool(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if nhosts == 1 {
-			// test the default path against the ESX model
-			host = nil
-		}
-
-		vmFolder := folders.VmFolder
-
-		var vmx string
-
-		spec := types.VirtualMachineConfigSpec{
-			// Note: real ESX allows the VM to be created without a GuestId,
-			// but will power on will fail.
-			GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-		}
-
-		steps := []func(){
-			func() {
-				spec.Name = "test"
-				vmx = fmt.Sprintf("%s/%s.vmx", spec.Name, spec.Name)
-			},
-			func() {
-				spec.Files = &types.VirtualMachineFileInfo{
-					VmPathName: fmt.Sprintf("[%s] %s", ds.Name(), vmx),
-				}
-			},
-		}
-
-		// expecting CreateVM to fail until all steps are taken
-		for _, step := range steps {
-			task, cerr := vmFolder.CreateVM(ctx, spec, pool, host)
-			if cerr != nil {
-				t.Fatal(err)
-			}
-
-			cerr = task.Wait(ctx)
-			if cerr == nil {
-				t.Error("expected error")
-			}
-
-			step()
-		}
-
-		task, err := vmFolder.CreateVM(ctx, spec, pool, host)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		info, err := task.WaitForResult(ctx, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// Test that datastore files were created
-		_, err = ds.Stat(ctx, vmx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		vm := object.NewVirtualMachine(c.Client, info.Result.(types.ManagedObjectReference))
-
-		name, err := vm.ObjectName(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if name != spec.Name {
-			t.Errorf("name=%s", name)
-		}
-
-		_, err = vm.Device(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		recreate := func(context.Context) (*object.Task, error) {
-			return vmFolder.CreateVM(ctx, spec, pool, nil)
-		}
-
-		ops := []struct {
-			method func(context.Context) (*object.Task, error)
-			state  types.VirtualMachinePowerState
-			fail   bool
-		}{
-			// Powered off by default
-			{nil, types.VirtualMachinePowerStatePoweredOff, false},
-			// Create with same .vmx path should fail
-			{recreate, "", true},
-			// Off -> On  == ok
-			{vm.PowerOn, types.VirtualMachinePowerStatePoweredOn, false},
-			// On  -> On  == fail
-			{vm.PowerOn, types.VirtualMachinePowerStatePoweredOn, true},
-			// On  -> Off == ok
-			{vm.PowerOff, types.VirtualMachinePowerStatePoweredOff, false},
-			// Off -> Off == fail
-			{vm.PowerOff, types.VirtualMachinePowerStatePoweredOff, true},
-			// Off -> On  == ok
-			{vm.PowerOn, types.VirtualMachinePowerStatePoweredOn, false},
-			// Destroy == fail (power is On)
-			{vm.Destroy, types.VirtualMachinePowerStatePoweredOn, true},
-			// On  -> Off == ok
-			{vm.PowerOff, types.VirtualMachinePowerStatePoweredOff, false},
-			// Destroy == ok (power is Off)
-			{vm.Destroy, "", false},
-		}
-
-		for i, op := range ops {
-			if op.method != nil {
-				task, err = op.method(ctx)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				err = task.Wait(ctx)
-				if op.fail {
-					if err == nil {
-						t.Errorf("%d: expected error", i)
-					}
-				} else {
-					if err != nil {
-						t.Errorf("%d: %s", i, err)
-					}
-				}
-			}
-
-			if len(op.state) != 0 {
-				state, err := vm.PowerState(ctx)
-				if err != nil {
-					t.Fatal(err)
-				}
-
-				if state != op.state {
-					t.Errorf("state=%s", state)
-				}
-
-				err = property.Wait(ctx, p, vm.Reference(), []string{object.PropRuntimePowerState}, func(pc []types.PropertyChange) bool {
-					for _, c := range pc {
-						switch v := c.Val.(type) {
-						case types.VirtualMachinePowerState:
-							if v != op.state {
-								t.Errorf("state=%s", v)
-							}
-						default:
-							t.Errorf("unexpected type %T", v)
-						}
-
-					}
-					return false
-				})
-			}
-		}
-
-		// Test that datastore files were removed
-		_, err = ds.Stat(ctx, vmx)
-		if err == nil {
-			t.Error("expected error")
-		}
-	}
-}
-
-func TestReconfigVm(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	defer m.Remove()
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	finder := find.NewFinder(c.Client, false)
-	finder.SetDatacenter(object.NewDatacenter(c.Client, esx.Datacenter.Reference()))
-
-	vms, err := finder.VirtualMachineList(ctx, "*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vm := vms[0]
-	device, err := vm.Device(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// verify default device list
-	_, err = device.FindIDEController("")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// default list of devices + 1 NIC + 1 SCSI controller + 1 CDROM + 1 disk created by the Model
-	mdevices := len(esx.VirtualDevice) + 4
-
-	if len(device) != mdevices {
-		t.Errorf("expected %d devices, got %d", mdevices, len(device))
-	}
-
-	d := device.FindByKey(esx.EthernetCard.Key)
-
-	err = vm.AddDevice(ctx, d)
-	if _, ok := err.(task.Error).Fault().(*types.InvalidDeviceSpec); !ok {
-		t.Fatalf("err=%v", err)
-	}
-
-	err = vm.RemoveDevice(ctx, false, d)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	device, err = vm.Device(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(device) != mdevices-1 {
-		t.Error("device list mismatch")
-	}
-
-	// cover the path where the simulator assigns a UnitNumber
-	d.GetVirtualDevice().UnitNumber = nil
-	// cover the path where the simulator assigns a Key
-	d.GetVirtualDevice().Key = -1
-
-	err = vm.AddDevice(ctx, d)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	device, err = vm.Device(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(device) != mdevices {
-		t.Error("device list mismatch")
-	}
-
-	for _, d := range device.SelectByType((*types.VirtualDisk)(nil)) {
-		info := d.(*types.VirtualDisk).Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-
-		if info.Datastore.Type == "" || info.Datastore.Value == "" {
-			t.Errorf("invalid datastore for %s", device.Name(d))
-		}
-	}
-}
-
-func TestCreateVmWithDevices(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c := m.Service.client
-
-	folder := object.NewFolder(c, esx.Datacenter.VmFolder)
-	pool := object.NewResourcePool(c, esx.ResourcePool.Self)
-
-	// different set of devices from Model.Create's
-	var devices object.VirtualDeviceList
-	ide, _ := devices.CreateIDEController()
-	cdrom, _ := devices.CreateCdrom(ide.(*types.VirtualIDEController))
-	scsi, _ := devices.CreateSCSIController("scsi")
-	disk := &types.VirtualDisk{
-		VirtualDevice: types.VirtualDevice{
-			Backing: new(types.VirtualDiskFlatVer2BackingInfo), // Leave fields empty to test defaults
-		},
-	}
-	devices.AssignController(disk, scsi.(*types.VirtualLsiLogicController))
-	devices = append(devices, ide, cdrom, scsi, disk)
-	create, _ := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-
-	spec := types.VirtualMachineConfigSpec{
-		Name:         "foo",
-		GuestId:      string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-		DeviceChange: create,
-		Files: &types.VirtualMachineFileInfo{
-			VmPathName: "[LocalDS_0] foo/foo.vmx",
-		},
-	}
-
-	ctask, _ := folder.CreateVM(ctx, spec, pool, nil)
-	info, err := ctask.WaitForResult(ctx, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vm := Map.Get(info.Result.(types.ManagedObjectReference)).(*VirtualMachine)
-
-	expect := len(esx.VirtualDevice) + len(devices)
-	ndevice := len(vm.Config.Hardware.Device)
-
-	if expect != ndevice {
-		t.Errorf("expected %d, got %d", expect, ndevice)
-	}
-}
-
-func TestShutdownGuest(t *testing.T) {
-	// use the default vm for testing
-	ctx := context.Background()
-
-	for _, model := range []*Model{ESX(), VPX()} {
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		c, err := govmomi.NewClient(ctx, s.URL, true)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		vm := object.NewVirtualMachine(c.Client, Map.Any("VirtualMachine").Reference())
-		// shutdown the vm
-		err = vm.ShutdownGuest(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-		// state should be poweroff
-		state, err := vm.PowerState(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if state != types.VirtualMachinePowerStatePoweredOff {
-			t.Errorf("state=%s", state)
-		}
-
-		// shutdown a poweroff vm should fail
-		err = vm.ShutdownGuest(ctx)
-		if err == nil {
-			t.Error("expected error: InvalidPowerState")
-		}
-	}
-}
-
-func TestVmSnapshot(t *testing.T) {
-	ctx := context.Background()
-
-	m := ESX()
-	defer m.Remove()
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	c, err := govmomi.NewClient(ctx, s.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vm := object.NewVirtualMachine(c.Client, Map.Any("VirtualMachine").Reference())
-
-	task, err := vm.CreateSnapshot(ctx, "root", "description", true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	task, err = vm.CreateSnapshot(ctx, "child", "description", true, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	_, err = vm.FindSnapshot(ctx, "child")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task, err = vm.RevertToCurrentSnapshot(ctx, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	task, err = vm.RevertToSnapshot(ctx, "root", true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	task, err = vm.RemoveSnapshot(ctx, "child", false, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	_, err = vm.FindSnapshot(ctx, "child")
-	if err == nil {
-		t.Fatal("child should be removed")
-	}
-
-	task, err = vm.RemoveAllSnapshot(ctx, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	task.Wait(ctx)
-
-	_, err = vm.FindSnapshot(ctx, "root")
-	if err == nil {
-		t.Fatal("all snapshots should be removed")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/doc.go b/installer/vendor/github.com/vmware/govmomi/simulator/vpx/doc.go
deleted file mode 100644
index 1765887029..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/doc.go
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Package vpx contains SOAP responses from a vCenter server, captured using `govc ... -dump`.
-*/
-package vpx
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/root_folder.go b/installer/vendor/github.com/vmware/govmomi/simulator/vpx/root_folder.go
deleted file mode 100644
index a1cce0d8d9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/root_folder.go
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vpx
-
-import (
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var RootFolder = mo.Folder{
-	ManagedEntity: mo.ManagedEntity{
-		ExtensibleManagedObject: mo.ExtensibleManagedObject{
-			Self:           types.ManagedObjectReference{Type: "Folder", Value: "group-d1"},
-			Value:          nil,
-			AvailableField: nil,
-		},
-		Parent:        (*types.ManagedObjectReference)(nil),
-		CustomValue:   nil,
-		OverallStatus: "green",
-		ConfigStatus:  "green",
-		ConfigIssue:   nil,
-		EffectiveRole: []int32{-1},
-		Permission: []types.Permission{
-			{
-				DynamicData: types.DynamicData{},
-				Entity:      &types.ManagedObjectReference{Type: "Folder", Value: "group-d1"},
-				Principal:   "VSPHERE.LOCAL\\Administrator",
-				Group:       false,
-				RoleId:      -1,
-				Propagate:   true,
-			},
-			{
-				DynamicData: types.DynamicData{},
-				Entity:      &types.ManagedObjectReference{Type: "Folder", Value: "group-d1"},
-				Principal:   "VSPHERE.LOCAL\\Administrators",
-				Group:       true,
-				RoleId:      -1,
-				Propagate:   true,
-			},
-		},
-		Name:                "Datacenters",
-		DisabledMethod:      nil,
-		RecentTask:          nil,
-		DeclaredAlarmState:  nil,
-		AlarmActionsEnabled: (*bool)(nil),
-		Tag:                 nil,
-	},
-	ChildType:   []string{"Folder", "Datacenter"},
-	ChildEntity: nil,
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/service_content.go b/installer/vendor/github.com/vmware/govmomi/simulator/vpx/service_content.go
deleted file mode 100644
index 1c570f8025..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/service_content.go
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vpx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-var ServiceContent = types.ServiceContent{
-	DynamicData:       types.DynamicData{},
-	RootFolder:        types.ManagedObjectReference{Type: "Folder", Value: "group-d1"},
-	PropertyCollector: types.ManagedObjectReference{Type: "PropertyCollector", Value: "propertyCollector"},
-	ViewManager:       &types.ManagedObjectReference{Type: "ViewManager", Value: "ViewManager"},
-	About: types.AboutInfo{
-		DynamicData:           types.DynamicData{},
-		Name:                  "VMware vCenter Server",
-		FullName:              "VMware vCenter Server 6.0.0 build-3634794",
-		Vendor:                "VMware, Inc.",
-		Version:               "6.0.0",
-		Build:                 "3634794",
-		LocaleVersion:         "INTL",
-		LocaleBuild:           "000",
-		OsType:                "linux-x64",
-		ProductLineId:         "vpx",
-		ApiType:               "VirtualCenter",
-		ApiVersion:            "6.0",
-		InstanceUuid:          "8e7597d6-f720-4b5c-b9fc-3412faf07d99",
-		LicenseProductName:    "VMware VirtualCenter Server",
-		LicenseProductVersion: "6.0",
-	},
-	Setting:                   &types.ManagedObjectReference{Type: "OptionManager", Value: "VpxSettings"},
-	UserDirectory:             &types.ManagedObjectReference{Type: "UserDirectory", Value: "UserDirectory"},
-	SessionManager:            &types.ManagedObjectReference{Type: "SessionManager", Value: "SessionManager"},
-	AuthorizationManager:      &types.ManagedObjectReference{Type: "AuthorizationManager", Value: "AuthorizationManager"},
-	ServiceManager:            &types.ManagedObjectReference{Type: "ServiceManager", Value: "ServiceMgr"},
-	PerfManager:               &types.ManagedObjectReference{Type: "PerformanceManager", Value: "PerfMgr"},
-	ScheduledTaskManager:      &types.ManagedObjectReference{Type: "ScheduledTaskManager", Value: "ScheduledTaskManager"},
-	AlarmManager:              &types.ManagedObjectReference{Type: "AlarmManager", Value: "AlarmManager"},
-	EventManager:              &types.ManagedObjectReference{Type: "EventManager", Value: "EventManager"},
-	TaskManager:               &types.ManagedObjectReference{Type: "TaskManager", Value: "TaskManager"},
-	ExtensionManager:          &types.ManagedObjectReference{Type: "ExtensionManager", Value: "ExtensionManager"},
-	CustomizationSpecManager:  &types.ManagedObjectReference{Type: "CustomizationSpecManager", Value: "CustomizationSpecManager"},
-	CustomFieldsManager:       &types.ManagedObjectReference{Type: "CustomFieldsManager", Value: "CustomFieldsManager"},
-	AccountManager:            (*types.ManagedObjectReference)(nil),
-	DiagnosticManager:         &types.ManagedObjectReference{Type: "DiagnosticManager", Value: "DiagMgr"},
-	LicenseManager:            &types.ManagedObjectReference{Type: "LicenseManager", Value: "LicenseManager"},
-	SearchIndex:               &types.ManagedObjectReference{Type: "SearchIndex", Value: "SearchIndex"},
-	FileManager:               &types.ManagedObjectReference{Type: "FileManager", Value: "FileManager"},
-	DatastoreNamespaceManager: &types.ManagedObjectReference{Type: "DatastoreNamespaceManager", Value: "DatastoreNamespaceManager"},
-	VirtualDiskManager:        &types.ManagedObjectReference{Type: "VirtualDiskManager", Value: "virtualDiskManager"},
-	VirtualizationManager:     (*types.ManagedObjectReference)(nil),
-	SnmpSystem:                &types.ManagedObjectReference{Type: "HostSnmpSystem", Value: "SnmpSystem"},
-	VmProvisioningChecker:     &types.ManagedObjectReference{Type: "VirtualMachineProvisioningChecker", Value: "ProvChecker"},
-	VmCompatibilityChecker:    &types.ManagedObjectReference{Type: "VirtualMachineCompatibilityChecker", Value: "CompatChecker"},
-	OvfManager:                &types.ManagedObjectReference{Type: "OvfManager", Value: "OvfManager"},
-	IpPoolManager:             &types.ManagedObjectReference{Type: "IpPoolManager", Value: "IpPoolManager"},
-	DvSwitchManager:           &types.ManagedObjectReference{Type: "DistributedVirtualSwitchManager", Value: "DVSManager"},
-	HostProfileManager:        &types.ManagedObjectReference{Type: "HostProfileManager", Value: "HostProfileManager"},
-	ClusterProfileManager:     &types.ManagedObjectReference{Type: "ClusterProfileManager", Value: "ClusterProfileManager"},
-	ComplianceManager:         &types.ManagedObjectReference{Type: "ProfileComplianceManager", Value: "MoComplianceManager"},
-	LocalizationManager:       &types.ManagedObjectReference{Type: "LocalizationManager", Value: "LocalizationManager"},
-	StorageResourceManager:    &types.ManagedObjectReference{Type: "StorageResourceManager", Value: "StorageResourceManager"},
-	GuestOperationsManager:    &types.ManagedObjectReference{Type: "GuestOperationsManager", Value: "guestOperationsManager"},
-	OverheadMemoryManager:     &types.ManagedObjectReference{Type: "OverheadMemoryManager", Value: "OverheadMemoryManger"},
-	CertificateManager:        &types.ManagedObjectReference{Type: "CertificateManager", Value: "certificateManager"},
-	IoFilterManager:           &types.ManagedObjectReference{Type: "IoFilterManager", Value: "IoFilterManager"},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go b/installer/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go
deleted file mode 100644
index dfbb28b7ab..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/simulator/vpx/setting.go
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vpx
-
-import "github.com/vmware/govmomi/vim25/types"
-
-// Setting is captured from VC's ServiceContent.OptionManager.setting
-var Setting = []types.BaseOptionValue{
-	// This list is currently pruned to include sso options only with sso.enabled set to false
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.sts.uri",
-		Value: "https://127.0.0.1/sts/STSService/vsphere.local",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.solutionUser.privateKey",
-		Value: "/etc/vmware-vpx/ssl/vcsoluser.key",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.solutionUser.name",
-		Value: "vpxd-b643d01c-928f-469b-96a5-d571d762a78e@vsphere.local",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.solutionUser.certificate",
-		Value: "/etc/vmware-vpx/ssl/vcsoluser.crt",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.groupcheck.uri",
-		Value: "https://127.0.0.1/sso-adminserver/sdk/vsphere.local",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.enabled",
-		Value: "false",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.default.isGroup",
-		Value: "false",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.default.admin",
-		Value: "Administrator@vsphere.local",
-	},
-	&types.OptionValue{
-		Key:   "config.vpxd.sso.admin.uri",
-		Value: "https://127.0.0.1/sso-adminserver/sdk/vsphere.local",
-	},
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/task/wait_test.go b/installer/vendor/github.com/vmware/govmomi/task/wait_test.go
deleted file mode 100644
index 8ebd5b0aaa..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/task/wait_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package task
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestCallbackFn(t *testing.T) {
-	cb := &taskCallback{}
-
-	for _, o := range []types.PropertyChangeOp{types.PropertyChangeOpAdd, types.PropertyChangeOpRemove, types.PropertyChangeOpAssign, types.PropertyChangeOpIndirectRemove} {
-		for _, s := range []types.TaskInfoState{types.TaskInfoStateQueued, types.TaskInfoStateRunning, types.TaskInfoStateSuccess, types.TaskInfoStateError} {
-			c := types.PropertyChange{
-				Name: "info",
-				Op:   o,
-				Val: types.TaskInfo{
-					State: s,
-				},
-			}
-			t.Logf("Op: %s State: %s", o, s)
-			cb.fn([]types.PropertyChange{c})
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/test/doc.go b/installer/vendor/github.com/vmware/govmomi/test/doc.go
deleted file mode 100644
index 4bcff639af..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/test/doc.go
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-/*
-Package test contains functions that implement common functionality between
-tests. The code (non-test) in this package intentionally does not take any
-dependendies outside the vim25 tree.
-*/
-package test
diff --git a/installer/vendor/github.com/vmware/govmomi/test/functional/helper.go b/installer/vendor/github.com/vmware/govmomi/test/functional/helper.go
deleted file mode 100644
index 3061926387..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/test/functional/helper.go
+++ /dev/null
@@ -1,130 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package functional
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/test"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type Helper struct {
-	*testing.T
-
-	c   *vim25.Client
-	f   *find.Finder
-	fns []func()
-}
-
-func NewHelper(t *testing.T) *Helper {
-	h := &Helper{
-		T: t,
-
-		c:   test.NewAuthenticatedClient(t),
-		fns: make([]func(), 0),
-	}
-
-	h.f = find.NewFinder(h.c, true)
-
-	return h
-}
-
-func (h *Helper) Defer(fn func()) {
-	h.fns = append(h.fns, fn)
-}
-
-func (h *Helper) Teardown() {
-	for _, fn := range h.fns {
-		fn()
-	}
-}
-
-func (h *Helper) RequireVirtualCenter() {
-	var expect = "VirtualCenter"
-	var actual = h.c.ServiceContent.About.ApiType
-	if actual != expect {
-		h.Skipf("Requires %s, running against %s", expect, actual)
-	}
-}
-
-func (h *Helper) Datacenter() *object.Datacenter {
-	dc, err := h.f.DefaultDatacenter(context.Background())
-	if err != nil {
-		h.Fatal(err)
-	}
-
-	h.f.SetDatacenter(dc)
-
-	return dc
-}
-
-func (h *Helper) DatacenterFolders() *object.DatacenterFolders {
-	df, err := h.Datacenter().Folders(context.Background())
-	if err != nil {
-		h.Fatal(err)
-	}
-
-	return df
-}
-
-func (h *Helper) ComputeResource() *object.ComputeResource {
-	cr, err := h.f.DefaultComputeResource(context.Background())
-	if err != nil {
-		h.Fatal(err)
-	}
-
-	return cr
-}
-
-func (h *Helper) LocalDatastores(ctx context.Context, cr *object.ComputeResource) ([]*object.Datastore, error) {
-	// List datastores for compute resource
-	dss, err := cr.Datastores(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	// Filter local datastores
-	var ldss []*object.Datastore
-	for _, ds := range dss {
-		var mds mo.Datastore
-		err = property.DefaultCollector(h.c).RetrieveOne(ctx, ds.Reference(), nil, &mds)
-		if err != nil {
-			return nil, err
-		}
-
-		switch i := mds.Info.(type) {
-		case *types.VmfsDatastoreInfo:
-			if i.Vmfs.Local != nil && *i.Vmfs.Local == true {
-				break
-			}
-		default:
-			continue
-		}
-
-		ds.InventoryPath = mds.Name
-		ldss = append(ldss, ds)
-	}
-
-	return ldss, nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go b/installer/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go
deleted file mode 100644
index 1f10959ed0..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/test/functional/issue_242_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package functional
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestIssue242(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	h := NewHelper(t)
-	defer h.Teardown()
-
-	h.RequireVirtualCenter()
-
-	df, err := h.Datacenter().Folders(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cr := h.ComputeResource()
-
-	// Get local datastores for compute resource
-	dss, err := h.LocalDatastores(ctx, cr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(dss) == 0 {
-		t.Fatalf("No local datastores")
-	}
-
-	// Get root resource pool for compute resource
-	rp, err := cr.ResourcePool(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	spec := types.VirtualMachineConfigSpec{
-		Name:     fmt.Sprintf("govmomi-test-%s", time.Now().Format(time.RFC3339)),
-		Files:    &types.VirtualMachineFileInfo{VmPathName: fmt.Sprintf("[%s]", dss[0].Name())},
-		NumCPUs:  1,
-		MemoryMB: 32,
-	}
-
-	// Create new VM
-	task, err := df.VmFolder.CreateVM(context.Background(), spec, rp, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	info, err := task.WaitForResult(context.Background(), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vm := object.NewVirtualMachine(h.c, info.Result.(types.ManagedObjectReference))
-	defer func() {
-		task, err := vm.Destroy(context.Background())
-		if err != nil {
-			panic(err)
-		}
-		err = task.Wait(context.Background())
-		if err != nil {
-			panic(err)
-		}
-	}()
-
-	// Mark VM as template
-	err = vm.MarkAsTemplate(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Get "environmentBrowser" property for VM template
-	var mvm mo.VirtualMachine
-	err = property.DefaultCollector(h.c).RetrieveOne(ctx, vm.Reference(), []string{"environmentBrowser"}, &mvm)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/test/helper.go b/installer/vendor/github.com/vmware/govmomi/test/helper.go
deleted file mode 100644
index 7e515f38ed..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/test/helper.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package test
-
-import (
-	"context"
-	"net/url"
-	"os"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// URL parses the GOVMOMI_TEST_URL environment variable if set.
-func URL() *url.URL {
-	s := os.Getenv("GOVMOMI_TEST_URL")
-	if s == "" {
-		return nil
-	}
-	u, err := soap.ParseURL(s)
-	if err != nil {
-		panic(err)
-	}
-	return u
-}
-
-// NewAuthenticatedClient creates a new vim25.Client, authenticates the user
-// specified in the test URL, and returns it.
-func NewAuthenticatedClient(t *testing.T) *vim25.Client {
-	u := URL()
-	if u == nil {
-		t.SkipNow()
-	}
-
-	soapClient := soap.NewClient(u, true)
-	vimClient, err := vim25.NewClient(context.Background(), soapClient)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	req := types.Login{
-		This: *vimClient.ServiceContent.SessionManager,
-	}
-
-	req.UserName = u.User.Username()
-	if pw, ok := u.User.Password(); ok {
-		req.Password = pw
-	}
-
-	_, err = methods.Login(context.Background(), vimClient, &req)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	return vimClient
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/.gitignore b/installer/vendor/github.com/vmware/govmomi/toolbox/.gitignore
deleted file mode 100644
index 6267c43396..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.iso
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/README.md b/installer/vendor/github.com/vmware/govmomi/toolbox/README.md
deleted file mode 100644
index 4278c748e7..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/README.md
+++ /dev/null
@@ -1,158 +0,0 @@
-# toolbox - VMware guest tools library for Go #
-
-## Overview
-
-The toolbox library is a lightweight, extensible framework for implementing VMware guest tools functionality.
-The primary focus of the library is the implementation of VM guest RPC protocols, transport and dispatch.
-These protocols are undocumented for the most part, but [open-vm-tools](https://github.com/vmware/open-vm-tools) serves
-as a reference implementation.  The toolbox provides default implementations of the supported RPCs, which can be
-overridden and/or extended by consumers.
-
-## Supported features
-
-Feature list from the perspective of vSphere public API interaction.  The properties, objects and methods listed are
-relative to
-the [VirtualMachine](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.VirtualMachine.html)
-managed object type.
-
-### guest.toolsVersionStatus property
-
-The toolbox reports version as `guestToolsUnmanaged`.
-
-See [ToolsVersionStatus](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.GuestInfo.ToolsVersionStatus.html)
-
-### guest.toolsRunningStatus and guest.guestState properties
-
-The VMX determines these values based on the toolbox's response to the `ping` RPC.
-
-### guest.ipAddress property
-
-The VMX requests this value via the `Set_Option broadcastIP` RPC.
-
-The default value can be overridden by setting the `Service.PrimaryIP` function.
-
-See [vim.vm.GuestInfo](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.GuestInfo.html)
-
-### guest.net property
-
-This data is pushed to the VMX using the `SendGuestInfo(INFO_IPADDRESS_V3)` RPC.
-
-See [GuestNicInfo](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.GuestInfo.NicInfo.html).
-
-### ShutdownGuest and RebootGuest methods
-
-The [PowerCommandHandler](power.go) provides power hooks for customized guest shutdown and reboot.
-
-### GuestAuthManager object
-
-Not supported, but authentication can be customized.
-
-See [vim.vm.guest.AuthManager](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.guest.AuthManager.html)
-
-### GuestFileManager object
-
-| Method                          | Supported | Client Examples                                                                     |
-|---------------------------------|-----------|-------------------------------------------------------------------------------------|
-| ChangeFileAttributesInGuest     | Yes       | [chmod](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/chmod.go)       |
-|                                 |           | [chown](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/chown.go)       |
-|                                 |           | [touch](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/touch.go)       |
-| CreateTemporaryDirectoryInGuest | Yes       | [mktemp](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/mktemp.go)     |
-| CreateTemporaryFileInGuest      | Yes       | [mktemp](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/mktemp.go)     |
-| DeleteDirectoryInGuest          | Yes       | [rmdir](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/rmdir.go)       |
-| DeleteFileInGuest               | Yes       | [rm](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/rm.go)             |
-| InitiateFileTransferFromGuest   | Yes       | [download](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/download.go) |
-| InitiateFileTransferToGuest     | Yes       | [upload](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/upload.go)     |
-| ListFilesInGuest                | Yes       | [ls](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/ls.go)             |
-| MakeDirectoryInGuest            | Yes       | [mkdir](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/mkdir.go)       |
-| MoveDirectoryInGuest            | Yes       | [mv](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/mv.go)             |
-| MoveFileInGuest                 | Yes       | [mv](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/mv.go)             |
-
-See [vim.vm.guest.FileManager](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.guest.FileManager.html)
-
-### GuestProcessManager
-
-Currently, the `ListProcessesInGuest` and `TerminateProcessInGuest` methods only apply those processes and goroutines
-started by `StartProgramInGuest`.
-
-| Method                         | Supported | Client Examples                                                                     |
-|--------------------------------|-----------|-------------------------------------------------------------------------------------|
-| ListProcessesInGuest           | Yes       | [ps](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/ps.go)             |
-| ReadEnvironmentVariableInGuest | Yes       | [getenv](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/getenv.go)     |
-| StartProgramInGuest            | Yes       | [start](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/start.go)       |
-| TerminateProcessInGuest        | Yes       | [kill](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/kill.go)         |
-
-See [vim.vm.guest.ProcessManager](http://pubs.vmware.com/vsphere-60/index.jsp?topic=%2Fcom.vmware.wssdk.apiref.doc%2Fvim.vm.guest.ProcessManager.html)
-
-## Extensions
-
-### Authentication
-
-Guest operations can be authenticated using the `toolbox.CommandServer.Authenticate` hook.
-
-### Go functions
-
-The toolbox [ProcessManager](process.go) can manage both OS processes and Go functions running as go routines.
-
-### File handlers
-
-The `hgfs.FileHandler` interface can be used to customize file transfer.
-
-### Process I/O
-
-The toolbox provides support for I/O redirection without the use of disk files within the guest.
-Access to *stdin*, *stdout* and *stderr* streams is implemented as an `hgfs.FileHandler` within the `ProcessManager`.
-
-See [toolbox.Client](https://github.com/vmware/govmomi/blob/master/guest/toolbox/client.go) and
-[govc guest.run](https://github.com/vmware/govmomi/blob/master/govc/vm/guest/run.go)
-
-### http.RoundTripper
-
-Building on top of the process I/O functionality, `toolbox.NewProcessRoundTrip` can be used to start a Go function to
-implement the [http.RoundTripper](https://golang.org/pkg/net/http/#RoundTripper) interface over vmx guest RPC.  This
-makes it possible to use the Go [http.Client](https://golang.org/pkg/net/http/#Client) without network access to the VM
-or to a port that is bound to the guest's loopback address.  It is intended for use with bootstrap configuration for
-example.
-
-### Directory archives
-
-The toolbox provides support for transferring directories to and from guests as gzip'd tar streams, without writing the
-tar file itself to the guest file system.  Archive supports is implemented as an `hgfs.FileHandler` within the `hgfs`
-package.  See [hgfs.NewArchiveHandler](https://github.com/vmware/govmomi/blob/master/toolbox/hgfs/archive.go)
-
-### Linux /proc file access
-
-With standard vmware-tools, the file size is reported as returned by `stat()` and hence a `Content-Length` header of
-size `0`.  The toolbox reports /proc file size as `hgfs.LargePacketMax` to enable transfer of these files.  Note that if
-the file data fits within in `hgfs.LargePacketMax`, the `Content-Length` header will be correct as it is sent after the
-first read by the vmx.  However, if the file data exceeds `hgfs.LargePacketMax`, the `Content-Length` will be
-`hgfs.LargePacketMax`, and client side will truncate to that size.
-
-## Testing
-
-The Go tests cover most of the toolbox code and can be run on any Linux or MacOSX machine, virtual or otherwise.
-
-To test the toolbox with vSphere API interaction, it must be run inside a VM managed by vSphere without the standard
-vmtoolsd running.
-
-The [toolbox-test.sh](toolbox-test.sh) can be used to run the full suite of toolbox tests with vSphere API interaction.
-Use the `-s` flag to start the standalone version of the toolbox and leave it running, to test vSphere interaction
-without running the test suite.
-
-## Consumers of the toolbox library
-
-* [Toolbox example main](https://github.com/vmware/govmomi/blob/master/toolbox/toolbox/main.go)
-
-* [VIC tether toolbox extension](https://github.com/vmware/vic/blob/master/lib/tether/toolbox.go)
-
-* [VIC container VM tether](https://github.com/vmware/vic/blob/main/cmd/tether/main_linux.go)
-
-* [VIC container host tether](https://github.com/vmware/vic/blob/master/cmd/vic-init/main_linux.go)
-
-## Supported guests
-
-The toolbox guest RPC implementations tend to be simple and portable thanks to the Go standard library, but are only
-supported on Linux currently.  Support for other guests, such as Windows, has been kept in mind but not yet tested.
-
-## Supported vSphere Versions
-
-The toolbox is supported with vSphere 6.0 and 6.5, but may function with older versions.
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/backdoor_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/backdoor_test.go
deleted file mode 100644
index a91e3d603e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/backdoor_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import "testing"
-
-var _ Channel = new(backdoorChannel)
-
-func TestBackdoorChannel(t *testing.T) {
-	in := NewBackdoorChannelIn()
-	out := NewBackdoorChannelOut()
-
-	funcs := []func() error{
-		in.Start,
-		out.Start,
-		in.Stop,
-		out.Stop,
-	}
-
-	for _, f := range funcs {
-		err := f()
-
-		if err != nil {
-			if err == ErrNotVirtualWorld {
-				t.SkipNow()
-			}
-			t.Fatal(err)
-		}
-	}
-
-	// expect an error if we don't specify the protocol
-	err := new(backdoorChannel).Start()
-	if err == nil {
-		t.Error("expected error")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/command.go b/installer/vendor/github.com/vmware/govmomi/toolbox/command.go
index 84d4b808a5..83fd0173a0 100644
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/command.go
+++ b/installer/vendor/github.com/vmware/govmomi/toolbox/command.go
@@ -511,8 +511,11 @@ func (c *CommandServer) ListFiles(header vix.CommandRequestHeader, data []byte)
 
 	offset := r.Body.Offset + uint64(r.Body.Index)
 	total := uint64(len(files)) - offset
-
-	files = files[offset:]
+	if int(offset) < len(files) {
+		files = files[offset:]
+	} else {
+		total = 0 // offset is not valid (open-vm-tools behaves the same in this case)
+	}
 
 	var remaining uint64
 
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/command_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/command_test.go
deleted file mode 100644
index 57a4a037ca..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/command_test.go
+++ /dev/null
@@ -1,968 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"bytes"
-	"context"
-	"encoding"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/toolbox/hgfs"
-	"github.com/vmware/govmomi/toolbox/vix"
-)
-
-type CommandClient struct {
-	Service *Service
-	Header  *vix.CommandRequestHeader
-	creds   []byte
-}
-
-func NewCommandClient() *CommandClient {
-	Trace = testing.Verbose()
-	hgfs.Trace = Trace
-
-	creds, _ := (&vix.UserCredentialNamePassword{
-		Name:     "user",
-		Password: "pass",
-	}).MarshalBinary()
-
-	header := new(vix.CommandRequestHeader)
-	header.Magic = vix.CommandMagicWord
-
-	header.UserCredentialType = vix.UserCredentialTypeNamePassword
-	header.CredentialLength = uint32(len(creds))
-
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	return &CommandClient{
-		creds:   creds,
-		Header:  header,
-		Service: NewService(in, out),
-	}
-}
-
-func (c *CommandClient) Request(op uint32, m encoding.BinaryMarshaler) []byte {
-	b, err := m.MarshalBinary()
-	if err != nil {
-		panic(err)
-	}
-
-	c.Header.OpCode = op
-	c.Header.BodyLength = uint32(len(b))
-
-	var buf bytes.Buffer
-	_, _ = buf.Write([]byte("\"reqname\"\x00"))
-	_ = binary.Write(&buf, binary.LittleEndian, c.Header)
-
-	_, _ = buf.Write(b)
-
-	data := append(buf.Bytes(), c.creds...)
-	reply, err := c.Service.Command.Dispatch(data)
-	if err != nil {
-		panic(err)
-	}
-
-	return reply
-}
-
-func vixRC(buf []byte) int {
-	args := bytes.SplitN(buf, []byte{' '}, 2)
-	rc, err := strconv.Atoi(string(args[0]))
-	if err != nil {
-		panic(err)
-	}
-	return rc
-}
-
-func TestVixRelayedCommandHandler(t *testing.T) {
-	Trace = true
-	if !testing.Verbose() {
-		// cover Trace paths but discard output
-		traceLog = ioutil.Discard
-	}
-
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	service := NewService(in, out)
-
-	cmd := service.Command
-
-	msg := []byte("\"reqname\"\x00")
-
-	_, err := cmd.Dispatch(msg) // io.EOF
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	header := new(vix.CommandRequestHeader)
-
-	marshal := func(m ...encoding.BinaryMarshaler) []byte {
-		var buf bytes.Buffer
-		_, _ = buf.Write(msg)
-		_ = binary.Write(&buf, binary.LittleEndian, header)
-
-		for _, e := range m {
-			b, err := e.MarshalBinary()
-			if err != nil {
-				panic(err)
-			}
-			_, _ = buf.Write(b)
-		}
-
-		return buf.Bytes()
-	}
-
-	// header.Magic not set
-	reply, _ := cmd.Dispatch(marshal())
-	rc := vixRC(reply)
-	if rc != vix.InvalidMessageHeader {
-		t.Fatalf("%q", reply)
-	}
-
-	// header.OpCode not set
-	header.Magic = vix.CommandMagicWord
-	reply, _ = cmd.Dispatch(marshal())
-	rc = vixRC(reply)
-	if rc != vix.UnrecognizedCommandInGuest {
-		t.Fatalf("%q", reply)
-	}
-
-	// valid request for GetToolsState
-	header.OpCode = vix.CommandGetToolsState
-	reply, _ = cmd.Dispatch(marshal())
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("%q", reply)
-	}
-
-	// header.UserCredentialType not set
-	header.OpCode = vix.CommandStartProgram
-	request := new(vix.StartProgramRequest)
-	buf := marshal(request)
-	reply, _ = cmd.Dispatch(marshal())
-	rc = vixRC(reply)
-	if rc != vix.AuthenticationFail {
-		t.Fatalf("%q", reply)
-	}
-
-	creds, _ := (&vix.UserCredentialNamePassword{
-		Name:     "user",
-		Password: "pass",
-	}).MarshalBinary()
-
-	header.BodyLength = uint32(binary.Size(request.Body))
-	header.UserCredentialType = vix.UserCredentialTypeNamePassword
-	header.CredentialLength = uint32(len(creds))
-
-	// ProgramPath not set
-	buf = append(marshal(request), creds...)
-	reply, _ = cmd.Dispatch(buf)
-	rc = vixRC(reply)
-	if rc != vix.FileNotFound {
-		t.Fatalf("%q", reply)
-	}
-
-	cmd.ProcessStartCommand = func(pm *ProcessManager, r *vix.StartProgramRequest) (int64, error) {
-		return -1, nil
-	}
-
-	// valid request for StartProgram
-	buf = append(marshal(request), creds...)
-	reply, _ = cmd.Dispatch(buf)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("%q", reply)
-	}
-
-	cmd.Authenticate = func(_ vix.CommandRequestHeader, data []byte) error {
-		var c vix.UserCredentialNamePassword
-		if err := c.UnmarshalBinary(data); err != nil {
-			panic(err)
-		}
-
-		return errors.New("you shall not pass")
-	}
-
-	// fail auth with our own handler
-	buf = append(marshal(request), creds...)
-	reply, _ = cmd.Dispatch(buf)
-	rc = vixRC(reply)
-	if rc != vix.AuthenticationFail {
-		t.Fatalf("%q", reply)
-	}
-
-	cmd.Authenticate = nil
-
-	// cause Vix.UserCredentialNamePassword.UnmarshalBinary to error
-	// first by EOF reading header, second in base64 decode
-	for _, l := range []uint32{1, 10} {
-		header.CredentialLength = l
-		buf = append(marshal(request), creds...)
-		reply, _ = cmd.Dispatch(buf)
-		rc = vixRC(reply)
-		if rc != vix.AuthenticationFail {
-			t.Fatalf("%q", reply)
-		}
-	}
-}
-
-// cover misc error paths
-func TestVixCommandErrors(t *testing.T) {
-	r := new(vix.StartProgramRequest)
-	err := r.UnmarshalBinary(nil)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	r.Body.NumEnvVars = 1
-	buf, _ := r.MarshalBinary()
-	err = r.UnmarshalBinary(buf)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	c := new(CommandServer)
-	_, err = c.StartCommand(r.CommandRequestHeader, nil)
-	if err == nil {
-		t.Error("expected error")
-	}
-}
-
-func TestVixInitiateDirTransfer(t *testing.T) {
-	c := NewCommandClient()
-
-	dir := os.TempDir()
-
-	for _, enable := range []bool{true, false} {
-		expect := vix.NotAFile
-		if enable {
-			expect = vix.OK
-		} else {
-			// validate we behave as open-vm-tools does when the directory archive feature is disabled
-			c.Service.Command.FileServer.RegisterFileHandler(hgfs.ArchiveScheme, nil)
-		}
-
-		fromGuest := &vix.ListFilesRequest{GuestPathName: dir}
-		toGuest := &vix.InitiateFileTransferToGuestRequest{GuestPathName: dir}
-		toGuest.Body.Overwrite = true
-
-		tests := []struct {
-			op      uint32
-			request encoding.BinaryMarshaler
-		}{
-			{vix.CommandInitiateFileTransferFromGuest, fromGuest},
-			{vix.CommandInitiateFileTransferToGuest, toGuest},
-		}
-
-		for _, test := range tests {
-			reply := c.Request(test.op, test.request)
-
-			rc := vixRC(reply)
-
-			if rc != expect {
-				t.Errorf("rc=%d", rc)
-			}
-		}
-	}
-}
-
-func TestVixInitiateFileTransfer(t *testing.T) {
-	c := NewCommandClient()
-
-	request := new(vix.ListFilesRequest)
-
-	f, err := ioutil.TempFile("", "toolbox")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, s := range []string{"a", "b", "c", "d", "e"} {
-		_, _ = f.WriteString(strings.Repeat(s, 40))
-	}
-
-	_ = f.Close()
-
-	name := f.Name()
-
-	// 1st pass file exists == OK, 2nd pass does not exist == FAIL
-	for _, fail := range []bool{false, true} {
-		request.GuestPathName = name
-
-		reply := c.Request(vix.CommandInitiateFileTransferFromGuest, request)
-
-		rc := vixRC(reply)
-
-		if Trace {
-			fmt.Fprintf(os.Stderr, "%s: %s\n", name, string(reply))
-		}
-
-		if fail {
-			if rc == vix.OK {
-				t.Errorf("%s: %d", name, rc)
-			}
-		} else {
-			if rc != vix.OK {
-				t.Errorf("%s: %d", name, rc)
-			}
-
-			err = os.Remove(name)
-			if err != nil {
-				t.Error(err)
-			}
-		}
-	}
-}
-
-func TestVixInitiateFileTransferWrite(t *testing.T) {
-	c := NewCommandClient()
-
-	request := new(vix.InitiateFileTransferToGuestRequest)
-
-	f, err := ioutil.TempFile("", "toolbox")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_ = f.Close()
-
-	name := f.Name()
-
-	tests := []struct {
-		force bool
-		fail  bool
-	}{
-		{false, true},  // exists == FAIL
-		{true, false},  // exists, but overwrite == OK
-		{false, false}, // does not exist == OK
-	}
-
-	for i, test := range tests {
-		request.GuestPathName = name
-		request.Body.Overwrite = test.force
-
-		reply := c.Request(vix.CommandInitiateFileTransferToGuest, request)
-
-		rc := vixRC(reply)
-
-		if Trace {
-			fmt.Fprintf(os.Stderr, "%s: %s\n", name, string(reply))
-		}
-
-		if test.fail {
-			if rc == vix.OK {
-				t.Errorf("%d: %d", i, rc)
-			}
-		} else {
-			if rc != vix.OK {
-				t.Errorf("%d: %d", i, rc)
-			}
-			if test.force {
-				_ = os.Remove(name)
-			}
-		}
-	}
-}
-
-func TestVixProcessHgfsPacket(t *testing.T) {
-	c := NewCommandClient()
-
-	c.Header.CommonFlags = vix.CommandGuestReturnsBinary
-
-	request := new(vix.CommandHgfsSendPacket)
-
-	op := new(hgfs.RequestCreateSessionV4)
-	packet := new(hgfs.Packet)
-	packet.Payload, _ = op.MarshalBinary()
-	packet.Header.Version = hgfs.HeaderVersion
-	packet.Header.Dummy = hgfs.OpNewHeader
-	packet.Header.HeaderSize = uint32(binary.Size(&packet.Header))
-	packet.Header.PacketSize = packet.Header.HeaderSize + uint32(len(packet.Payload))
-	packet.Header.Op = hgfs.OpCreateSessionV4
-
-	request.Packet, _ = packet.MarshalBinary()
-	request.Body.PacketSize = uint32(len(request.Packet))
-
-	reply := c.Request(vix.HgfsSendPacketCommand, request)
-
-	rc := vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	ix := bytes.IndexByte(reply, '#')
-	reply = reply[ix+1:]
-	err := packet.UnmarshalBinary(reply)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if packet.Status != hgfs.StatusSuccess {
-		t.Errorf("status=%d", packet.Status)
-	}
-
-	if packet.Dummy != hgfs.OpNewHeader {
-		t.Errorf("dummy=%d", packet.Dummy)
-	}
-
-	session := new(hgfs.ReplyCreateSessionV4)
-	err = session.UnmarshalBinary(packet.Payload)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if session.NumCapabilities == 0 || int(session.NumCapabilities) != len(session.Capabilities) {
-		t.Errorf("NumCapabilities=%d", session.NumCapabilities)
-	}
-}
-
-func TestVixListProcessesEx(t *testing.T) {
-	c := NewCommandClient()
-	pm := c.Service.Command.ProcessManager
-
-	c.Service.Command.ProcessStartCommand = func(pm *ProcessManager, r *vix.StartProgramRequest) (int64, error) {
-		var p *Process
-		switch r.ProgramPath {
-		case "foo":
-			p = NewProcessFunc(func(ctx context.Context, arg string) error {
-				return nil
-			})
-		default:
-			return -1, os.ErrNotExist
-		}
-
-		return pm.Start(r, p)
-	}
-
-	exec := &vix.StartProgramRequest{
-		ProgramPath: "foo",
-	}
-
-	reply := c.Request(vix.CommandStartProgram, exec)
-	rc := vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	r := bytes.Trim(bytes.Split(reply, []byte{' '})[2], "\x00")
-	pid, _ := strconv.Atoi(string(r))
-
-	exec.ProgramPath = "bar"
-	reply = c.Request(vix.CommandStartProgram, exec)
-	rc = vixRC(reply)
-	t.Log(vix.Error(rc).Error())
-	if rc != vix.FileNotFound {
-		t.Fatalf("rc: %d", rc)
-	}
-	if vix.ErrorCode(os.ErrNotExist) != rc {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	pm.wg.Wait()
-
-	ps := new(vix.ListProcessesRequest)
-
-	ps.Pids = []int64{int64(pid)}
-
-	reply = c.Request(vix.CommandListProcessesEx, ps)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	n := bytes.Count(reply, []byte("<proc>"))
-	if n != len(ps.Pids) {
-		t.Errorf("ps -p %d=%d", pid, n)
-	}
-
-	kill := new(vix.KillProcessRequest)
-	kill.Body.Pid = ps.Pids[0]
-
-	reply = c.Request(vix.CommandTerminateProcess, kill)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	kill.Body.Pid = 33333
-	reply = c.Request(vix.CommandTerminateProcess, kill)
-	rc = vixRC(reply)
-	if rc != vix.NoSuchProcess {
-		t.Fatalf("rc: %d", rc)
-	}
-}
-
-func TestVixGetenv(t *testing.T) {
-	c := NewCommandClient()
-
-	env := os.Environ()
-	key := strings.SplitN(env[0], "=", 2)[0]
-
-	tests := []struct {
-		names  []string
-		expect int
-	}{
-		{nil, len(env)},              // all env
-		{[]string{key, "ENOENT"}, 1}, // specific vars, 1 exists 1 does not
-	}
-
-	for i, test := range tests {
-		env := &vix.ReadEnvironmentVariablesRequest{
-			Names: test.names,
-		}
-		reply := c.Request(vix.CommandReadEnvVariables, env)
-		rc := vixRC(reply)
-		if rc != vix.OK {
-			t.Fatalf("%d) rc: %d", i, rc)
-		}
-
-		num := bytes.Count(reply, []byte("<ev>"))
-		if num != test.expect {
-			t.Errorf("%d) getenv(%v): %d", i, test.names, num)
-		}
-	}
-}
-
-func TestVixDirectories(t *testing.T) {
-	c := NewCommandClient()
-
-	mktemp := &vix.CreateTempFileRequest{
-		FilePrefix: "toolbox-",
-	}
-
-	// mktemp -d
-	reply := c.Request(vix.CommandCreateTemporaryDirectory, mktemp)
-	rc := vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	dir := strings.TrimSuffix(string(reply[4:]), "\x00")
-
-	mkdir := &vix.DirRequest{
-		GuestPathName: dir,
-	}
-
-	// mkdir $dir == EEXIST
-	reply = c.Request(vix.CommandCreateDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.FileAlreadyExists {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// mkdir $dir/ok == OK
-	mkdir.GuestPathName = dir + "/ok"
-	reply = c.Request(vix.CommandCreateDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// rm of a dir should fail, regardless if empty or not
-	reply = c.Request(vix.CommandDeleteGuestFileEx, &vix.FileRequest{
-		GuestPathName: mkdir.GuestPathName,
-	})
-	rc = vixRC(reply)
-	if rc != vix.NotAFile {
-		t.Errorf("rc: %d", rc)
-	}
-
-	// rmdir $dir/ok == OK
-	reply = c.Request(vix.CommandDeleteGuestDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// rmdir $dir/ok == ENOENT
-	reply = c.Request(vix.CommandDeleteGuestDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.FileNotFound {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// mkdir $dir/1/2 == ENOENT (parent directory does not exist)
-	mkdir.GuestPathName = dir + "/1/2"
-	reply = c.Request(vix.CommandCreateDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.FileNotFound {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// mkdir -p $dir/1/2 == OK
-	mkdir.Body.Recursive = true
-	reply = c.Request(vix.CommandCreateDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// rmdir $dir == ENOTEMPTY
-	mkdir.GuestPathName = dir
-	mkdir.Body.Recursive = false
-	reply = c.Request(vix.CommandDeleteGuestDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.DirectoryNotEmpty {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	// rm -rf $dir == OK
-	mkdir.Body.Recursive = true
-	reply = c.Request(vix.CommandDeleteGuestDirectoryEx, mkdir)
-	rc = vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-}
-
-func TestVixFiles(t *testing.T) {
-	c := NewCommandClient()
-
-	mktemp := &vix.CreateTempFileRequest{
-		FilePrefix: "toolbox-",
-	}
-
-	// mktemp -d
-	reply := c.Request(vix.CommandCreateTemporaryDirectory, mktemp)
-	rc := vixRC(reply)
-	if rc != vix.OK {
-		t.Fatalf("rc: %d", rc)
-	}
-
-	dir := strings.TrimSuffix(string(reply[4:]), "\x00")
-
-	max := 12
-	var total int
-
-	// mktemp
-	for i := 0; i <= max; i++ {
-		mktemp = &vix.CreateTempFileRequest{
-			DirectoryPath: dir,
-		}
-
-		reply = c.Request(vix.CommandCreateTemporaryFileEx, mktemp)
-		rc = vixRC(reply)
-		if rc != vix.OK {
-			t.Fatalf("rc: %d", rc)
-		}
-	}
-
-	// name of the last file temp file we created, we'll mess around with it then delete it
-	name := strings.TrimSuffix(string(reply[4:]), "\x00")
-	// for testing symlinks
-	link := filepath.Join(dir, "a-link")
-	err := os.Symlink(name, link)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, fpath := range []string{name, link} {
-		// test ls of a single file
-		ls := &vix.ListFilesRequest{
-			GuestPathName: fpath,
-		}
-
-		reply = c.Request(vix.CommandListFiles, ls)
-
-		rc = vixRC(reply)
-		if rc != vix.OK {
-			t.Fatalf("rc: %d", rc)
-		}
-
-		num := bytes.Count(reply, []byte("<fxi>"))
-		if num != 1 {
-			t.Errorf("ls %s: %d", name, num)
-		}
-
-		num = bytes.Count(reply, []byte("<rem>0</rem>"))
-		if num != 1 {
-			t.Errorf("ls %s: %d", name, num)
-		}
-
-		ft := 0
-		target := ""
-		if fpath == link {
-			target = name
-			ft = vix.FileAttributesSymlink
-		}
-
-		num = bytes.Count(reply, []byte(fmt.Sprintf("<slt>%s</slt>", target)))
-		if num != 1 {
-			t.Errorf("ls %s: %d", name, num)
-		}
-
-		num = bytes.Count(reply, []byte(fmt.Sprintf("<ft>%d</ft>", ft)))
-		if num != 1 {
-			t.Errorf("ls %s: %d", name, num)
-		}
-	}
-
-	mv := &vix.RenameFileRequest{
-		OldPathName: name,
-		NewPathName: name + "-new",
-	}
-
-	for _, expect := range []int{vix.OK, vix.FileNotFound} {
-		reply = c.Request(vix.CommandMoveGuestFileEx, mv)
-		rc = vixRC(reply)
-		if rc != expect {
-			t.Errorf("rc: %d", rc)
-		}
-
-		if expect == vix.OK {
-			// test file type is properly checked
-			reply = c.Request(vix.CommandMoveGuestDirectory, &vix.RenameFileRequest{
-				OldPathName: mv.NewPathName,
-				NewPathName: name,
-			})
-			rc = vixRC(reply)
-			if rc != vix.NotADirectory {
-				t.Errorf("rc: %d", rc)
-			}
-
-			// test Overwrite flag is properly checked
-			reply = c.Request(vix.CommandMoveGuestFileEx, &vix.RenameFileRequest{
-				OldPathName: mv.NewPathName,
-				NewPathName: mv.NewPathName,
-			})
-			rc = vixRC(reply)
-			if rc != vix.FileAlreadyExists {
-				t.Errorf("rc: %d", rc)
-			}
-		}
-	}
-
-	// rmdir of a file should fail
-	reply = c.Request(vix.CommandDeleteGuestDirectoryEx, &vix.DirRequest{
-		GuestPathName: mv.NewPathName,
-	})
-
-	rc = vixRC(reply)
-	if rc != vix.NotADirectory {
-		t.Errorf("rc: %d", rc)
-	}
-
-	file := &vix.FileRequest{
-		GuestPathName: mv.NewPathName,
-	}
-
-	for _, expect := range []int{vix.OK, vix.FileNotFound} {
-		reply = c.Request(vix.CommandDeleteGuestFileEx, file)
-		rc = vixRC(reply)
-		if rc != expect {
-			t.Errorf("rc: %d", rc)
-		}
-	}
-
-	// ls again now that file is gone
-	reply = c.Request(vix.CommandListFiles, &vix.ListFilesRequest{
-		GuestPathName: name,
-	})
-
-	rc = vixRC(reply)
-	if rc != vix.FileNotFound {
-		t.Errorf("rc: %d", rc)
-	}
-
-	// ls
-	ls := &vix.ListFilesRequest{
-		GuestPathName: dir,
-	}
-	ls.Body.MaxResults = 5 // default is 50
-
-	for i := 0; i < 5; i++ {
-		reply = c.Request(vix.CommandListFiles, ls)
-
-		if Trace {
-			fmt.Fprintf(os.Stderr, "%s: %q\n", dir, string(reply[4:]))
-		}
-
-		var rem int
-		_, err := fmt.Fscanf(bytes.NewReader(reply[4:]), "<rem>%d</rem>", &rem)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		num := bytes.Count(reply, []byte("<fxi>"))
-		total += num
-		ls.Body.Offset += uint64(num)
-
-		if rem == 0 {
-			break
-		}
-	}
-
-	if total != max+1 {
-		t.Errorf("expected %d, got %d", max, total)
-	}
-
-	// mv $dir ${dir}-old
-	mv = &vix.RenameFileRequest{
-		OldPathName: dir,
-		NewPathName: dir + "-old",
-	}
-
-	for _, expect := range []int{vix.OK, vix.FileNotFound} {
-		reply = c.Request(vix.CommandMoveGuestDirectory, mv)
-		rc = vixRC(reply)
-		if rc != expect {
-			t.Errorf("rc: %d", rc)
-		}
-
-		if expect == vix.OK {
-			// test file type is properly checked
-			reply = c.Request(vix.CommandMoveGuestFileEx, &vix.RenameFileRequest{
-				OldPathName: mv.NewPathName,
-				NewPathName: dir,
-			})
-			rc = vixRC(reply)
-			if rc != vix.NotAFile {
-				t.Errorf("rc: %d", rc)
-			}
-
-			// test Overwrite flag is properly checked
-			reply = c.Request(vix.CommandMoveGuestDirectory, &vix.RenameFileRequest{
-				OldPathName: mv.NewPathName,
-				NewPathName: mv.NewPathName,
-			})
-			rc = vixRC(reply)
-			if rc != vix.FileAlreadyExists {
-				t.Errorf("rc: %d", rc)
-			}
-		}
-	}
-
-	rmdir := &vix.DirRequest{
-		GuestPathName: mv.NewPathName,
-	}
-
-	// rm -rm $dir
-	for _, rmr := range []bool{false, true} {
-		rmdir.Body.Recursive = rmr
-
-		reply = c.Request(vix.CommandDeleteGuestDirectoryEx, rmdir)
-		rc = vixRC(reply)
-		if rmr {
-			if rc != vix.OK {
-				t.Fatalf("rc: %d", rc)
-			}
-		} else {
-			if rc != vix.DirectoryNotEmpty {
-				t.Fatalf("rc: %d", rc)
-			}
-		}
-	}
-}
-
-func TestVixFileChangeAttributes(t *testing.T) {
-	if os.Getuid() == 0 {
-		t.Skip("running as root")
-	}
-
-	c := NewCommandClient()
-
-	f, err := ioutil.TempFile("", "toolbox-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = f.Close()
-	name := f.Name()
-
-	// touch,chown,chmod
-	chattr := &vix.SetGuestFileAttributesRequest{
-		GuestPathName: name,
-	}
-
-	h := &chattr.Body
-
-	tests := []struct {
-		expect int
-		f      func()
-	}{
-		{
-			vix.OK, func() {},
-		},
-		{
-			vix.OK, func() {
-				h.FileOptions = vix.FileAttributeSetModifyDate
-				h.ModificationTime = time.Now().Unix()
-			},
-		},
-		{
-			vix.OK, func() {
-				h.FileOptions = vix.FileAttributeSetAccessDate
-				h.AccessTime = time.Now().Unix()
-			},
-		},
-		{
-			vix.FileAccessError, func() {
-				h.FileOptions = vix.FileAttributeSetUnixOwnerid
-				h.OwnerID = 0 // fails as we are not root
-			},
-		},
-		{
-			vix.FileAccessError, func() {
-				h.FileOptions = vix.FileAttributeSetUnixGroupid
-				h.GroupID = 0 // fails as we are not root
-			},
-		},
-		{
-			vix.OK, func() {
-				h.FileOptions = vix.FileAttributeSetUnixOwnerid
-				h.OwnerID = int32(os.Getuid())
-			},
-		},
-		{
-			vix.OK, func() {
-				h.FileOptions = vix.FileAttributeSetUnixGroupid
-				h.GroupID = int32(os.Getgid())
-			},
-		},
-		{
-			vix.OK, func() {
-				h.FileOptions = vix.FileAttributeSetUnixPermissions
-				h.Permissions = int32(os.FileMode(0755).Perm())
-			},
-		},
-		{
-			vix.FileNotFound, func() {
-				_ = os.Remove(name)
-			},
-		},
-	}
-
-	for i, test := range tests {
-		test.f()
-		reply := c.Request(vix.CommandSetGuestFileAttributes, chattr)
-		rc := vixRC(reply)
-
-		if rc != test.expect {
-			t.Errorf("%d: rc=%d", i, rc)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/guest_info_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/guest_info_test.go
deleted file mode 100644
index a7a9a3e4df..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/guest_info_test.go
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"net"
-	"reflect"
-	"testing"
-)
-
-func TestDefaultGuestNicProto(t *testing.T) {
-	p := DefaultGuestNicInfo()
-
-	info := p.V3
-
-	for _, nic := range info.Nics {
-		if len(nic.MacAddress) == 0 {
-			continue
-		}
-		_, err := net.ParseMAC(nic.MacAddress)
-		if err != nil {
-			t.Errorf("invalid MAC %s: %s", nic.MacAddress, err)
-		}
-	}
-
-	b, err := EncodeXDR(p)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var dp GuestNicInfo
-	err = DecodeXDR(b, &dp)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(p, &dp) {
-		t.Error("decode mismatch")
-	}
-}
-
-func TestMaxGuestNic(t *testing.T) {
-	p := DefaultGuestNicInfo()
-
-	maxNics = len(p.V3.Nics)
-
-	a, _ := net.Interfaces()
-	a = append(a, a...) // double the number of interfaces returned
-	netInterfaces = func() ([]net.Interface, error) {
-		return a, nil
-	}
-
-	p = DefaultGuestNicInfo()
-
-	l := len(p.V3.Nics)
-	if l != maxNics {
-		t.Errorf("Nics=%d", l)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/archive_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/archive_test.go
deleted file mode 100644
index 7a5d058156..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/archive_test.go
+++ /dev/null
@@ -1,437 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package hgfs
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/url"
-	"os"
-	"os/exec"
-	"path"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestReadArchive(t *testing.T) {
-	Trace = testing.Verbose()
-
-	dir, err := ioutil.TempDir("", "toolbox-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	nfiles := 5
-	subdir := path.Join(dir, "hangar-18")
-	_ = os.MkdirAll(subdir, 0755)
-	dirs := []string{dir, subdir}
-
-	for i := 0; i < nfiles; i++ {
-		for _, p := range dirs {
-			data := bytes.NewBufferString(strings.Repeat("X", i+1024))
-
-			f, ferr := ioutil.TempFile(p, fmt.Sprintf("file-%d-", i))
-			if ferr != nil {
-				t.Fatal(ferr)
-			}
-			_, err = io.Copy(f, data)
-			if err != nil {
-				t.Fatal(err)
-			}
-			err = f.Close()
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			if i == 0 {
-				err = os.Symlink(f.Name(), path.Join(p, "first-file"))
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-	}
-
-	c := NewClient()
-	c.s.RegisterFileHandler(ArchiveScheme, NewArchiveHandler())
-
-	status := c.CreateSession()
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	_, status = c.GetAttr(dir)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	handle, status := c.Open(dir + "?format=tgz")
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	var req *RequestReadV3
-	var offset uint64
-
-	var buf bytes.Buffer
-
-	for {
-		req = &RequestReadV3{
-			Offset:       offset,
-			Handle:       handle,
-			RequiredSize: 4096,
-		}
-
-		res := new(ReplyReadV3)
-
-		status = c.Dispatch(OpReadV3, req, res).Status
-		if status != StatusSuccess {
-			t.Fatalf("status=%d", status)
-		}
-
-		if Trace {
-			fmt.Fprintf(os.Stderr, "read %d: %q\n", res.ActualSize, string(res.Payload))
-		}
-
-		offset += uint64(res.ActualSize)
-		_, _ = buf.Write(res.Payload)
-
-		if res.ActualSize == 0 {
-			break
-		}
-	}
-
-	status = c.Close(handle)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	status = c.DestroySession()
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	var files []string
-	gz, _ := gzip.NewReader(&buf)
-	tr := tar.NewReader(gz)
-
-	for {
-		header, terr := tr.Next()
-		if terr != nil {
-			if terr == io.EOF {
-				break
-			}
-			t.Fatal(terr)
-		}
-
-		files = append(files, header.Name)
-
-		if header.Typeflag == tar.TypeReg {
-			_, err = io.Copy(ioutil.Discard, tr)
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	nfiles++ // symlink
-	expect := nfiles*len(dirs) + len(dirs) - 1
-	if len(files) != expect {
-		t.Errorf("expected %d, files=%d", expect, len(files))
-	}
-
-	err = os.RemoveAll(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestWriteArchive(t *testing.T) {
-	Trace = testing.Verbose()
-
-	dir, err := ioutil.TempDir("", "toolbox-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	nfiles := 5
-
-	var buf bytes.Buffer
-
-	gz := gzip.NewWriter(&buf)
-	tw := tar.NewWriter(gz)
-
-	for i := 0; i < nfiles; i++ {
-		data := bytes.NewBufferString(strings.Repeat("X", i+1024))
-
-		header := &tar.Header{
-			Name:     fmt.Sprintf("toolbox-file-%d", i),
-			ModTime:  time.Now(),
-			Mode:     0644,
-			Typeflag: tar.TypeReg,
-			Size:     int64(data.Len()),
-		}
-
-		err = tw.WriteHeader(header)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		_, _ = tw.Write(data.Bytes())
-
-		if i == 0 {
-			err = tw.WriteHeader(&tar.Header{
-				Linkname: header.Name,
-				Name:     "first-file",
-				ModTime:  time.Now(),
-				Mode:     0644,
-				Typeflag: tar.TypeSymlink,
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = tw.WriteHeader(&tar.Header{
-				Name:     "subdir",
-				ModTime:  time.Now(),
-				Mode:     0755,
-				Typeflag: tar.TypeDir,
-			})
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	_ = tw.Close()
-	_ = gz.Close()
-
-	c := NewClient()
-	c.s.RegisterFileHandler(ArchiveScheme, NewArchiveHandler())
-
-	status := c.CreateSession()
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	_, status = c.GetAttr(dir)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	handle, status := c.OpenWrite(dir)
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	payload := buf.Bytes()
-	size := uint32(buf.Len())
-
-	req := &RequestWriteV3{
-		Handle:       handle,
-		WriteFlags:   WriteAppend,
-		Offset:       0,
-		RequiredSize: size,
-		Payload:      payload,
-	}
-
-	res := new(ReplyReadV3)
-
-	status = c.Dispatch(OpWriteV3, req, res).Status
-
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	var attr AttrV2
-	info, _ := os.Stat(dir)
-	attr.Stat(info)
-
-	status = c.SetAttr(dir, attr)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	status = c.Close(handle)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	status = c.DestroySession()
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		t.Error(err)
-	}
-	if len(files) != nfiles+2 {
-		t.Errorf("files=%d", len(files))
-	}
-
-	err = os.RemoveAll(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func cpTar(tr *tar.Reader, tw *tar.Writer) error {
-	for {
-		header, err := tr.Next()
-		if err != nil {
-			if err == io.EOF {
-				return nil
-			}
-
-			return err
-		}
-
-		if header.Typeflag != tar.TypeReg {
-			continue
-		}
-
-		if err = tw.WriteHeader(header); err != nil {
-			return err
-		}
-
-		_, err = io.Copy(tw, tr)
-		if err != nil {
-			log.Print(err)
-			return err
-		}
-	}
-}
-
-func TestArchiveFormat(t *testing.T) {
-	gzipTrailer = false
-
-	var buf bytes.Buffer
-
-	h := &ArchiveHandler{
-		Read: func(_ *url.URL, tr *tar.Reader) error {
-			tw := tar.NewWriter(&buf)
-			if err := cpTar(tr, tw); err != nil {
-				return err
-			}
-			return tw.Close()
-		},
-		Write: func(u *url.URL, tw *tar.Writer) error {
-			tr := tar.NewReader(&buf)
-
-			return cpTar(tr, tw)
-		},
-	}
-
-	for _, format := range []string{"tar", "tgz"} {
-		u := &url.URL{
-			Scheme:   ArchiveScheme,
-			Path:     ".",
-			RawQuery: "format=" + format,
-		}
-
-		_, err := h.Stat(u)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		// ToGuest: git archive | h.Read (to buf)
-		f, err := h.Open(u, OpenModeWriteOnly)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		cmd := exec.Command("git", "archive", "--format", format, "HEAD")
-
-		stdout, err := cmd.StdoutPipe()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = cmd.Start()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		n, err := io.Copy(f, stdout)
-		if err != nil {
-			t.Errorf("copy %d: %s", n, err)
-		}
-
-		err = f.Close()
-		if err != nil {
-			t.Error(err)
-		}
-
-		err = cmd.Wait()
-		if err != nil {
-			t.Error(err)
-		}
-
-		// FromGuest: h.Write (from buf) | tar -tvf-
-		f, err = h.Open(u, OpenModeReadOnly)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		cmd = exec.Command("tar", "-tvf-")
-
-		if format == "tgz" {
-			cmd.Args = append(cmd.Args, "-z")
-		}
-
-		stdin, err := cmd.StdinPipe()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if testing.Verbose() {
-			cmd.Stderr = os.Stderr
-			cmd.Stdout = os.Stderr
-		}
-
-		err = cmd.Start()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		n, err = io.Copy(stdin, f)
-		if err != nil {
-			t.Errorf("copy %d: %s", n, err)
-		}
-
-		_ = stdin.Close()
-
-		err = f.Close()
-		if err != nil {
-			t.Error(err)
-		}
-
-		err = cmd.Wait()
-		if err != nil {
-			t.Error(err)
-		}
-
-		buf.Reset()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/protocol_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/protocol_test.go
deleted file mode 100644
index ec2197d5e2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/protocol_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package hgfs
-
-import (
-	"bytes"
-	"encoding/base64"
-	"io"
-	"testing"
-)
-
-func TestProtocolEncoding(t *testing.T) {
-	ps := packetSize
-	defer func() {
-		packetSize = ps
-	}()
-
-	// a few structs have pading of some sort, leave PacketSize as-is for now with these tests
-	packetSize = func(r *Packet) uint32 {
-		return r.PacketSize
-	}
-
-	decode := func(s string) []byte {
-		b, _ := base64.StdEncoding.DecodeString(s)
-		return b
-	}
-
-	// base64 encoded packets below were captured from vmtoolsd during:
-	// govc guest.download /etc/hosts -
-	// govc guest.upload /etc/hosts /tmp/hosts
-	tests := []struct {
-		pkt string
-		dec interface{}
-	}{
-		{
-			"AQAAAP8AAABMAAAANAAAAAAAAIApAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA+AAAAAAAAAAAAAAAAAAAAAAAAA==",
-			new(RequestCreateSessionV4),
-		},
-		{
-			"AQAAAP8AAABYAgAANAAAAAAAAIApAAAAAAAAAAIAAAAAAAAA//////////8AAAAAAAAAAF/NcjwZ1DYAQQAAAAD4AAAAAAAAAQAAAAAAAAAAAAAAAQAAAAEAAAABAAAAAgAAAAEAAAADAAAAAQAAAAQAAAABAAAABQAAAAEAAAAGAAAAAQAAAAcAAAABAAAACAAAAAEAAAAJAAAAAQAAAAoAAAABAAAACwAAAAEAAAAMAAAAAQAAAA0AAAABAAAADgAAAAEAAAAPAAAAAQAAABAAAAABAAAAEQAAAAEAAAASAAAAAQAAABMAAAAAAAAAFAAAAAEAAAAVAAAAAQAAABYAAAABAAAAFwAAAAEAAAAYAAAAAQAAABkAAAABAAAAGgAAAAEAAAAbAAAAAQAAABwAAAABAAAAHQAAAAEAAAAeAAAAAQAAAB8AAAABAAAAIAAAAAEAAAAhAAAAAQAAACIAAAABAAAAIwAAAAEAAAAkAAAAAQAAACUAAAABAAAAJgAAAAEAAAAnAAAAAAAAACgAAAAAAAAAKQAAAAEAAAAqAAAAAQAAACsAAAAAAAAALAAAAAAAAAAtAAAAAAAAAC4AAAAAAAAALwAAAAAAAAAwAAAAAAAAADEAAAAAAAAAMgAAAAAAAAAzAAAAAAAAADQAAAAAAAAANQAAAAAAAAA2AAAAAAAAADcAAAAAAAAAOAAAAAAAAAA5AAAAAAAAADoAAAAAAAAAOwAAAAAAAAA8AAAAAAAAAD0AAAAAAAAAPgAAAAAAAAA/AAAAAAAAAEAAAAAAAAAA",
-			new(ReplyCreateSessionV4),
-		},
-		{
-			"AQAAAP8AAABbAAAANAAAAAAAAIAPAAAAAAAAAAEAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAIAPAAAAAAAAAAAAAAAAAACADgAAAHJvb3QAZXRjAGhvc3RzAA==",
-			new(RequestGetattrV2),
-		},
-		{
-			"AQAAAP8AAACpAAAANAAAAAAAAIAPAAAAAAAAAAIAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAA//sCAAAAAAAAAAAAxgAAAAAAAABkP/0QmUzSAaAHo3qfz9IBZD/9EJlM0gFkP/0QmUzSAQAGBAQAAAAAAAAAAAAQAAAAAAAAAAAAAAAAAABY9xMAAAAAAAD8AAAEAAAAAAAAAAAAAAAAAAAAAA==",
-			new(ReplyGetattrV2),
-		},
-		{
-			"AQAAAP8AAABYAAAANAAAAAAAAIAAAAAAAAAAAAEAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAGDgAAAHJvb3QAZXRjAGhvc3Rzcw==",
-			new(RequestOpen),
-		},
-		{
-			"AQAAAP8AAABAAAAANAAAAAAAAIAAAAAAAAAAAAIAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAAAAAAAA==",
-			new(ReplyOpen),
-		},
-		{
-			"AQAAAP8AAABMAAAANAAAAAAAAIAZAAAAAAAAAAEAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAAAAAAAADwAAAAAAAAAAAAAA==",
-			new(RequestReadV3),
-		},
-		{
-			"AQAAAP8AAAAHAQAANAAAAAAAAIAZAAAAAAAAAAIAAAAAAAAAX81yPBnUNgAAAAAAAAAAAMYAAAAAAAAAAAAAADEyNy4wLjAuMQlsb2NhbGhvc3QKMTI3LjAuMS4xCXZhZ3JhbnQudm0JdmFncmFudAoKIyBUaGUgZm9sbG93aW5nIGxpbmVzIGFyZSBkZXNpcmFibGUgZm9yIElQdjYgY2FwYWJsZSBob3N0cwo6OjEgICAgIGxvY2FsaG9zdCBpcDYtbG9jYWxob3N0IGlwNi1sb29wYmFjawpmZjAyOjoxIGlwNi1hbGxub2RlcwpmZjAyOjoyIGlwNi1hbGxyb3V0ZXJzCgA=",
-			new(ReplyReadV3),
-		},
-		{
-			"AQAAAP8AAABAAAAANAAAAAAAAIADAAAAAAAAAAEAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAIADAAAAAAAAAA==",
-			new(RequestClose),
-		},
-		{
-			"AQAAAP8AAAA8AAAANAAAAAAAAIADAAAAAAAAAAIAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAA",
-			new(ReplyClose),
-		},
-		{
-			"AQAAAP8AAAA8AAAANAAAAAAAAIAqAAAAAAAAAAEAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAA",
-			new(RequestDestroySessionV4),
-		},
-		{
-			"AQAAAP8AAAA8AAAANAAAAAAAAIAqAAAAAAAAAAIAAAAAAAAAX81yPBnUNgAAAAAAAAAAAAAAAAAAAAAA",
-			new(ReplyDestroySessionV4),
-		},
-		{
-			"AQAAAP8AAACZAAAANAAAAAAAAIAYAAAAAAAAAAEAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAAsIAAAAAAAAAQAAAAQAAAAABgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAAAAAAAAAAAAAAAAAcm9vdAB0bXAAcmVzb2x2LmNvbmYA",
-			new(RequestOpenV3),
-		},
-		{
-			"AQAAAP8AAABEAAAANAAAAAAAAIAYAAAAAAAAAAIAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=",
-			new(ReplyOpenV3),
-		},
-		{
-			"AQAAAP8AAADJAAAANAAAAAAAAIAQAAAAAAAAAAEAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAAAAAIAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAUAAAAcm9vdAB0bXAAcmVzb2x2LmNvbmYA",
-			new(RequestSetattrV2),
-		},
-		{
-			"AQAAAP8AAAA8AAAANAAAAAAAAIAQAAAAAAAAAAIAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAAAAAAAAAAAA",
-			new(ReplySetattrV2),
-		},
-		{
-			"AQAAAP8AAACTAAAANAAAAAAAAIAaAAAAAAAAAAEAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAAAAAAABAAAAAAAAAABGAAAAAAAAAAAAAABuYW1lc2VydmVyIDEwLjExOC42NS4xCm5hbWVzZXJ2ZXIgMTAuMTE4LjY1LjIKc2VhcmNoIGVuZy52bXdhcmUuY29tIAoK",
-			new(RequestWriteV3),
-		},
-		{
-			"AQAAAP8AAABAAAAANAAAAAAAAIAaAAAAAAAAAAIAAAAAAAAAyXxnMKrzOwAAAAAAAAAAAEYAAAAAAAAAAAAAAA==",
-			new(ReplyWriteV3),
-		},
-	}
-
-	for i, test := range tests {
-		dec := decode(test.pkt)
-		pkt := new(Packet)
-		err := pkt.UnmarshalBinary(dec)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		err = UnmarshalBinary(pkt.Payload, test.dec)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		pkt.Payload, err = MarshalBinary(test.dec)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		enc, err := pkt.MarshalBinary()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if !bytes.HasPrefix(dec, enc) {
-			t.Errorf("%d: %T != %s\n", i, test.dec, test.pkt)
-		}
-	}
-}
-
-func TestFileName(t *testing.T) {
-	tests := []struct {
-		raw  string
-		name string
-	}{
-		{
-			"root\x00etc\x00hosts",
-			"/etc/hosts",
-		},
-	}
-
-	for i, test := range tests {
-		fn := FileName{
-			Name:   test.raw,
-			Length: uint32(len(test.raw)),
-		}
-
-		if fn.Path() != test.name {
-			t.Errorf("%d: %q != %q", i, fn.Path(), test.name)
-		}
-
-		var fs FileName
-		fs.FromString(test.name)
-		if fs != fn {
-			t.Errorf("%d: %v != %v", i, fn, fs)
-		}
-	}
-}
-
-func TestProtocolMarshal(t *testing.T) {
-	var buf []byte
-	var x uint64
-	err := UnmarshalBinary(buf, x)
-	if err == nil {
-		t.Fatal("expected error")
-	}
-
-	status := err.(*Status)
-	if status.Error() != io.EOF.Error() {
-		t.Errorf("err=%s", status.Err)
-	}
-
-	status.Err = nil
-	if status.Error() == "" {
-		t.Error("status")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/server_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/server_test.go
deleted file mode 100644
index 8ccbf7c80e..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/hgfs/server_test.go
+++ /dev/null
@@ -1,443 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package hgfs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"testing"
-)
-
-type Client struct {
-	s         *Server
-	SessionID uint64
-}
-
-func NewClient() *Client {
-	s := NewServer()
-
-	return &Client{
-		s: s,
-	}
-}
-
-func (c *Client) Dispatch(op int32, req interface{}, res interface{}) *Packet {
-	var err error
-	p := new(Packet)
-	p.Payload, err = MarshalBinary(req)
-	if err != nil {
-		panic(err)
-	}
-
-	p.Header.Version = 0x1
-	p.Header.Dummy = OpNewHeader
-	p.Header.HeaderSize = headerSize
-	p.Header.PacketSize = headerSize + uint32(len(p.Payload))
-	p.Header.SessionID = c.SessionID
-	p.Header.Op = op
-
-	data, err := p.MarshalBinary()
-	if err != nil {
-		panic(err)
-	}
-
-	data, err = c.s.Dispatch(data)
-	if err != nil {
-		panic(err)
-	}
-
-	p = new(Packet)
-	err = p.UnmarshalBinary(data)
-	if err != nil {
-		panic(err)
-	}
-
-	if p.Status == StatusSuccess {
-		err = UnmarshalBinary(p.Payload, res)
-		if err != nil {
-			panic(err)
-		}
-	}
-
-	return p
-}
-
-func (c *Client) CreateSession() uint32 {
-	req := new(RequestCreateSessionV4)
-	res := new(ReplyCreateSessionV4)
-
-	p := c.Dispatch(OpCreateSessionV4, req, res)
-
-	if p.Status == StatusSuccess {
-		c.SessionID = res.SessionID
-	}
-
-	return p.Status
-}
-
-func (c *Client) DestroySession() uint32 {
-	req := new(RequestDestroySessionV4)
-	res := new(ReplyDestroySessionV4)
-
-	return c.Dispatch(OpDestroySessionV4, req, res).Status
-}
-
-func (c *Client) GetAttr(name string) (*AttrV2, uint32) {
-	req := new(RequestGetattrV2)
-	res := new(ReplyGetattrV2)
-
-	req.FileName.FromString(name)
-
-	p := c.Dispatch(OpGetattrV2, req, res)
-
-	if p.Status != StatusSuccess {
-		return nil, p.Status
-	}
-
-	return &res.Attr, p.Status
-}
-
-func (c *Client) SetAttr(name string, attr AttrV2) uint32 {
-	req := new(RequestSetattrV2)
-	res := new(ReplySetattrV2)
-
-	req.FileName.FromString(name)
-
-	req.Attr = attr
-
-	p := c.Dispatch(OpSetattrV2, req, res)
-
-	if p.Status != StatusSuccess {
-		return p.Status
-	}
-
-	return p.Status
-}
-
-func (c *Client) Open(name string, write ...bool) (uint32, uint32) {
-	req := new(RequestOpen)
-	res := new(ReplyOpen)
-
-	if len(write) == 1 && write[0] {
-		req.OpenMode = OpenModeWriteOnly
-	}
-
-	req.FileName.FromString(name)
-
-	p := c.Dispatch(OpOpen, req, res)
-	if p.Status != StatusSuccess {
-		return 0, p.Status
-	}
-
-	return res.Handle, p.Status
-}
-
-func (c *Client) OpenWrite(name string) (uint32, uint32) {
-	req := new(RequestOpenV3)
-	res := new(ReplyOpenV3)
-
-	req.OpenMode = OpenModeWriteOnly
-	req.OpenFlags = OpenCreateEmpty
-	req.FileName.FromString(name)
-
-	p := c.Dispatch(OpOpenV3, req, res)
-	if p.Status != StatusSuccess {
-		return 0, p.Status
-	}
-
-	// cover the unsupported lock type path
-	req.DesiredLock = LockOpportunistic
-	status := c.Dispatch(OpOpenV3, req, res).Status
-	if status != StatusOperationNotSupported {
-		return 0, status
-	}
-
-	// cover the unsupported open mode path
-	req.DesiredLock = LockNone
-	req.OpenMode = OpenCreateSafe
-	status = c.Dispatch(OpOpenV3, req, res).Status
-	if status != StatusAccessDenied {
-		return 0, status
-	}
-
-	return res.Handle, p.Status
-}
-
-func (c *Client) Close(handle uint32) uint32 {
-	req := new(RequestClose)
-	res := new(ReplyClose)
-
-	req.Handle = handle
-
-	return c.Dispatch(OpClose, req, res).Status
-}
-
-func TestStaleSession(t *testing.T) {
-	c := NewClient()
-
-	// list of methods that can return StatusStaleSession
-	invalid := []func() uint32{
-		func() uint32 { _, status := c.Open("enoent"); return status },
-		func() uint32 { return c.Dispatch(OpReadV3, new(RequestReadV3), new(ReplyReadV3)).Status },
-		func() uint32 { return c.Dispatch(OpWriteV3, new(RequestWriteV3), new(ReplyWriteV3)).Status },
-		func() uint32 { return c.Close(0) },
-		c.DestroySession,
-	}
-
-	for i, f := range invalid {
-		status := f()
-		if status != StatusStaleSession {
-			t.Errorf("%d: status=%d", i, status)
-		}
-	}
-}
-
-func TestSessionMax(t *testing.T) {
-	c := NewClient()
-	var status uint32
-
-	for i := 0; i <= maxSessions+1; i++ {
-		status = c.CreateSession()
-	}
-
-	if status != StatusTooManySessions {
-		t.Errorf("status=%d", status)
-	}
-}
-
-func TestSessionDestroy(t *testing.T) {
-	Trace = true
-	c := NewClient()
-	c.CreateSession()
-	_, status := c.Open("/etc/resolv.conf")
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-	c.DestroySession()
-
-	if c.s.removeSession(c.SessionID) {
-		t.Error("session was not removed")
-	}
-}
-
-func TestInvalidOp(t *testing.T) {
-	c := NewClient()
-	status := c.Dispatch(1024, new(RequestClose), new(ReplyClose)).Status
-	if status != StatusOperationNotSupported {
-		t.Errorf("status=%d", status)
-	}
-}
-
-func TestReadV3(t *testing.T) {
-	Trace = testing.Verbose()
-
-	c := NewClient()
-	c.CreateSession()
-
-	_, status := c.GetAttr("enoent")
-
-	if status != StatusNoSuchFileOrDir {
-		t.Errorf("status=%d", status)
-	}
-
-	_, status = c.Open("enoent")
-	if status != StatusNoSuchFileOrDir {
-		t.Errorf("status=%d", status)
-	}
-
-	fname := "/etc/resolv.conf"
-
-	attr, _ := c.GetAttr(path.Dir(fname))
-	if attr.Type != FileTypeDirectory {
-		t.Errorf("type=%d", attr.Type)
-	}
-
-	attr, _ = c.GetAttr(fname)
-	if attr.Type != FileTypeRegular {
-		t.Errorf("type=%d", attr.Type)
-	}
-
-	if attr.Size <= 0 {
-		t.Errorf("size=%d", attr.Size)
-	}
-
-	handle, status := c.Open(fname)
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	var req *RequestReadV3
-	var offset uint64
-	size := uint32(attr.Size / 2)
-
-	for offset = 0; offset < attr.Size; {
-		req = &RequestReadV3{
-			Offset:       offset,
-			Handle:       handle,
-			RequiredSize: size,
-		}
-
-		res := new(ReplyReadV3)
-
-		status = c.Dispatch(OpReadV3, req, res).Status
-
-		if status != StatusSuccess {
-			t.Fatalf("status=%d", status)
-		}
-
-		if Trace {
-			fmt.Fprintf(os.Stderr, "read %d: %q\n", res.ActualSize, string(res.Payload))
-		}
-
-		offset += uint64(res.ActualSize)
-	}
-
-	if uint64(offset) != attr.Size {
-		t.Errorf("size %d vs %d", offset, attr.Size)
-	}
-
-	status = c.Dispatch(OpReadV3, new(RequestReadV3), new(ReplyReadV3)).Status
-	if status != StatusInvalidHandle {
-		t.Fatalf("status=%d", status)
-	}
-
-	status = c.Close(0)
-	if status != StatusInvalidHandle {
-		t.Fatalf("status=%d", status)
-	}
-
-	status = c.Close(handle)
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	status = c.DestroySession()
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-}
-
-func TestWriteV3(t *testing.T) {
-	Trace = testing.Verbose()
-
-	f, err := ioutil.TempFile("", "toolbox")
-	if err != nil {
-		t.Fatal(err)
-	}
-	_ = f.Close()
-
-	name := f.Name()
-
-	c := NewClient()
-	c.CreateSession()
-
-	_, status := c.Open("enoent", true)
-	// write not supported yet
-	if status != StatusAccessDenied {
-		t.Errorf("status=%d", status)
-	}
-
-	handle, status := c.OpenWrite(name)
-	if status != StatusSuccess {
-		t.Fatalf("status=%d", status)
-	}
-
-	payload := []byte("one two three\n")
-	size := uint32(len(payload))
-
-	req := &RequestWriteV3{
-		Handle:       handle,
-		WriteFlags:   WriteAppend,
-		Offset:       0,
-		RequiredSize: size,
-		Payload:      payload,
-	}
-
-	res := new(ReplyReadV3)
-
-	status = c.Dispatch(OpWriteV3, req, res).Status
-
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	if size != res.ActualSize {
-		t.Errorf("%d vs %d", size, res.ActualSize)
-	}
-
-	status = c.Dispatch(OpWriteV3, new(RequestWriteV3), new(ReplyWriteV3)).Status
-	if status != StatusInvalidHandle {
-		t.Fatalf("status=%d", status)
-	}
-
-	status = c.Close(handle)
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	attr, _ := c.GetAttr(name)
-	if attr.Size != uint64(size) {
-		t.Errorf("%d vs %d", size, attr.Size)
-	}
-
-	attr.OwnerPerms |= PermExec
-
-	errors := []struct {
-		err    error
-		status uint32
-	}{
-		{os.ErrPermission, StatusOperationNotPermitted},
-		{os.ErrNotExist, StatusNoSuchFileOrDir},
-		{os.ErrExist, StatusFileExists},
-		{nil, StatusSuccess},
-	}
-
-	for _, e := range errors {
-		c.s.chown = func(_ string, _ int, _ int) error {
-			return e.err
-		}
-
-		status = c.SetAttr(name, *attr)
-		if status != e.status {
-			t.Errorf("status=%d", status)
-		}
-	}
-
-	c.s.chown = func(_ string, _ int, _ int) error {
-		return nil
-	}
-
-	for _, e := range errors {
-		c.s.chmod = func(_ string, _ os.FileMode) error {
-			return e.err
-		}
-
-		status = c.SetAttr(name, *attr)
-		if status != e.status {
-			t.Errorf("status=%d", status)
-		}
-	}
-
-	status = c.DestroySession()
-	if status != StatusSuccess {
-		t.Errorf("status=%d", status)
-	}
-
-	_ = os.Remove(name)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/power_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/power_test.go
deleted file mode 100644
index 8ec6de6408..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/power_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"errors"
-	"testing"
-)
-
-func TestPowerCommandHandler(t *testing.T) {
-	shutdown = "/bin/echo"
-
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	service := NewService(in, out)
-	power := service.Power
-
-	// cover nil Handler and out.Receive paths
-	_, _ = power.Halt.Dispatch(nil)
-
-	out.reply = append(out.reply, rpciOK, rpciOK)
-
-	power.Halt.Handler = Halt
-	power.Reboot.Handler = Reboot
-	power.Suspend.Handler = func() error {
-		return errors.New("an error")
-	}
-
-	commands := []PowerCommand{
-		power.Halt,
-		power.Reboot,
-		power.Suspend,
-	}
-
-	for _, cmd := range commands {
-		_, _ = cmd.Dispatch(nil)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/process_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/process_test.go
deleted file mode 100644
index 4896eb3e37..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/process_test.go
+++ /dev/null
@@ -1,312 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"strconv"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/toolbox/vix"
-)
-
-func TestProcessFunction(t *testing.T) {
-	m := NewProcessManager()
-	var pids []int64
-
-	for i := 0; i <= 2; i++ {
-		r := &vix.StartProgramRequest{
-			ProgramPath: "test",
-			Arguments:   strconv.Itoa(i),
-		}
-
-		pid, _ := m.Start(r, NewProcessFunc(func(_ context.Context, arg string) error {
-			rc, _ := strconv.Atoi(arg)
-			if rc == 0 {
-				return nil
-
-			}
-			return &ProcessError{Err: errors.New("fail"), ExitCode: int32(rc)}
-		}))
-
-		if pid == 0 {
-			t.Fatalf("no pid")
-		}
-
-		pids = append(pids, pid)
-	}
-
-	m.wg.Wait()
-
-	_ = m.ListProcesses(pids)
-
-	for i, pid := range pids {
-		p := m.entries[pid]
-		if p.ExitCode != int32(i) {
-			t.Errorf("%d: %d != %d", pid, p.ExitCode, i)
-		}
-	}
-}
-
-func TestProcessCommand(t *testing.T) {
-	m := NewProcessManager()
-	var pids []int64
-
-	for i := 0; i <= 2; i++ {
-		r := &vix.StartProgramRequest{
-			ProgramPath: "/bin/bash",
-			Arguments:   fmt.Sprintf(`-c "exit %d"`, i),
-		}
-
-		pid, _ := m.Start(r, NewProcess())
-		pids = append(pids, pid)
-	}
-
-	m.wg.Wait()
-
-	_ = m.ListProcesses(nil)
-
-	for i, pid := range pids {
-		p := m.entries[pid]
-		if p.ExitCode != int32(i) {
-			t.Errorf("%d: %d != %d", pid, p.ExitCode, i)
-		}
-	}
-
-	r := &vix.StartProgramRequest{
-		ProgramPath: shell,
-	}
-
-	shell = "/enoent/enoent"
-	_, err := m.Start(r, NewProcess())
-	if err == nil {
-		t.Error("expected error")
-	}
-	shell = r.ProgramPath
-
-	r.ProgramPath = "/enoent/enoent"
-	_, err = m.Start(r, NewProcess())
-	if err == nil {
-		t.Error("expected error")
-	}
-}
-
-func TestProcessKill(t *testing.T) {
-	m := NewProcessManager()
-	var pids []int64
-
-	procs := []struct {
-		r *vix.StartProgramRequest
-		p *Process
-	}{
-		{
-			&vix.StartProgramRequest{
-				ProgramPath: "test",
-				Arguments:   "none",
-			},
-			NewProcessFunc(func(ctx context.Context, _ string) error {
-				select {
-				case <-ctx.Done():
-					return &ProcessError{Err: ctx.Err(), ExitCode: 42}
-				case <-time.After(time.Minute):
-				}
-
-				return nil
-			}),
-		},
-		{
-			&vix.StartProgramRequest{
-				ProgramPath: "/bin/bash",
-				Arguments:   fmt.Sprintf(`-c "while true; do sleep 1; done"`),
-			},
-			NewProcess(),
-		},
-	}
-
-	for _, test := range procs {
-		pid, err := m.Start(test.r, test.p)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		pids = append(pids, pid)
-	}
-
-	for {
-		b := m.ListProcesses(pids)
-		if bytes.Count(b, []byte("<proc>")) == len(pids) {
-			break
-		}
-
-		<-time.After(time.Millisecond * 100)
-	}
-
-	for _, pid := range pids {
-		if !m.Kill(pid) {
-			t.Errorf("kill %d", pid)
-		}
-	}
-
-	m.wg.Wait()
-
-	for _, pid := range pids {
-		p := m.entries[pid]
-
-		if p.ExitCode == 0 {
-			t.Errorf("%s: exit=%d", p.Name, p.ExitCode)
-		}
-	}
-
-	if m.Kill(-1) {
-		t.Error("kill -1")
-	}
-}
-
-func TestProcessRemove(t *testing.T) {
-	m := NewProcessManager()
-
-	m.expire = time.Millisecond
-
-	r := &vix.StartProgramRequest{
-		ProgramPath: "test",
-	}
-
-	pid, _ := m.Start(r, NewProcessFunc(func(_ context.Context, arg string) error {
-		return nil
-	}))
-
-	m.wg.Wait()
-
-	<-time.After(m.expire * 20)
-	// pid should be removed by now
-	b := m.ListProcesses([]int64{pid})
-	if len(b) != 0 {
-		t.Error("expected 0 processes")
-	}
-}
-
-func TestEscapeXML(t *testing.T) {
-	tests := []struct {
-		in  string
-		out string
-	}{
-		{`echo "foo bar" > /dev/null`, "echo %22foo bar%22 %3E /dev/null"},
-	}
-
-	for i, test := range tests {
-		e := xmlEscape.Replace(test.in)
-		if e != test.out {
-			t.Errorf("%d: %s != %s", i, e, test.out)
-		}
-	}
-}
-
-func TestProcessError(t *testing.T) {
-	fault := errors.New("fail")
-	var err error
-
-	err = &ProcessError{Err: fault}
-
-	if err.Error() != fault.Error() {
-		t.Fatal()
-	}
-}
-
-func TestProcessIO(t *testing.T) {
-	m := NewProcessManager()
-
-	r := &vix.StartProgramRequest{
-		ProgramPath: "/bin/date",
-	}
-
-	p := NewProcess().WithIO()
-
-	_, err := m.Start(r, p)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m.wg.Wait()
-
-	var buf bytes.Buffer
-
-	_, _ = io.Copy(&buf, p.IO.Out)
-
-	if buf.Len() == 0 {
-		t.Error("no data")
-	}
-}
-
-type testRoundTripper struct {
-	*Process
-}
-
-func (c *testRoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	req.Header.Set("Connection", "close") // we need the server to close the connection after 1 request
-
-	err := req.Write(c.IO.In.Writer)
-	if err != nil {
-		return nil, err
-	}
-
-	_ = c.IO.In.Close()
-
-	<-c.ctx.Done()
-
-	return http.ReadResponse(bufio.NewReader(c.IO.Out), req)
-}
-
-func TestProcessRoundTripper(t *testing.T) {
-	echo := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_ = r.Write(w)
-	}))
-
-	u, _ := url.Parse(echo.URL)
-
-	m := NewProcessManager()
-
-	r := &vix.StartProgramRequest{
-		ProgramPath: "http.RoundTrip",
-		Arguments:   u.Host,
-	}
-
-	p := NewProcessRoundTrip()
-
-	_, err := m.Start(r, p)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	res, err := (&http.Client{Transport: &testRoundTripper{p}}).Get(echo.URL)
-	if err != nil {
-		t.Logf("Err: %s", p.IO.Err.String())
-		t.Fatal(err)
-	}
-
-	if res.ContentLength == 0 {
-		t.Errorf("len=%d", res.ContentLength)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/service_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/service_test.go
deleted file mode 100644
index 121eb37ef2..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/service_test.go
+++ /dev/null
@@ -1,465 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package toolbox
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"flag"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/toolbox/hgfs"
-	"github.com/vmware/govmomi/toolbox/vix"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestDefaultIP(t *testing.T) {
-	ip := DefaultIP()
-	if ip == "" {
-		t.Error("failed to get a default IP address")
-	}
-}
-
-type testRPC struct {
-	cmd    string
-	expect string
-}
-
-type mockChannelIn struct {
-	t       *testing.T
-	service *Service
-	rpc     []*testRPC
-	wg      sync.WaitGroup
-	start   error
-	sendErr int
-	count   struct {
-		send  int
-		stop  int
-		start int
-	}
-}
-
-func (c *mockChannelIn) Start() error {
-	c.count.start++
-	return c.start
-}
-
-func (c *mockChannelIn) Stop() error {
-	c.count.stop++
-	return nil
-}
-
-func (c *mockChannelIn) Receive() ([]byte, error) {
-	if len(c.rpc) == 0 {
-		if c.rpc != nil {
-			// All test RPC requests have been consumed
-			c.wg.Done()
-			c.rpc = nil
-		}
-		return nil, io.EOF
-	}
-
-	return []byte(c.rpc[0].cmd), nil
-}
-
-func (c *mockChannelIn) Send(buf []byte) error {
-	if c.sendErr > 0 {
-		c.count.send++
-		if c.count.send%c.sendErr == 0 {
-			c.wg.Done()
-			return errors.New("rpci send error")
-		}
-	}
-
-	if buf == nil {
-		return nil
-	}
-
-	expect := c.rpc[0].expect
-	if string(buf) != expect {
-		c.t.Errorf("expected %q reply for request %q, got: %q", expect, c.rpc[0].cmd, buf)
-	}
-
-	c.rpc = c.rpc[1:]
-
-	return nil
-}
-
-// discard rpc out for now
-type mockChannelOut struct {
-	reply [][]byte
-	start error
-}
-
-func (c *mockChannelOut) Start() error {
-	return c.start
-}
-
-func (c *mockChannelOut) Stop() error {
-	return nil
-}
-
-func (c *mockChannelOut) Receive() ([]byte, error) {
-	if len(c.reply) == 0 {
-		return nil, io.EOF
-	}
-	reply := c.reply[0]
-	c.reply = c.reply[1:]
-	return reply, nil
-}
-
-func (c *mockChannelOut) Send(buf []byte) error {
-	if len(buf) == 0 {
-		return io.ErrShortBuffer
-	}
-	return nil
-}
-
-func TestServiceRun(t *testing.T) {
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	service := NewService(in, out)
-
-	in.rpc = []*testRPC{
-		{"reset", "OK ATR toolbox"},
-		{"ping", "OK "},
-		{"Set_Option synctime 0", "OK "},
-		{"Capabilities_Register", "OK "},
-		{"Set_Option broadcastIP 1", "OK "},
-	}
-
-	in.wg.Add(1)
-
-	// replies to register capabilities
-	for i := 0; i < len(capabilities); i++ {
-		out.reply = append(out.reply, rpciOK)
-	}
-
-	out.reply = append(out.reply,
-		rpciOK, // reply to SendGuestInfo call in Reset()
-		rpciOK, // reply to IP broadcast
-	)
-
-	in.service = service
-
-	in.t = t
-
-	err := service.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	in.wg.Wait()
-
-	service.Stop()
-	service.Wait()
-
-	// verify we don't set delay > maxDelay
-	for i := 0; i <= maxDelay+1; i++ {
-		service.backoff()
-	}
-
-	if service.delay != maxDelay {
-		t.Errorf("delay=%d", service.delay)
-	}
-}
-
-func TestServiceErrors(t *testing.T) {
-	Trace = true
-	if !testing.Verbose() {
-		// cover TraceChannel but discard output
-		traceLog = ioutil.Discard
-	}
-
-	netInterfaceAddrs = func() ([]net.Addr, error) {
-		return nil, io.EOF
-	}
-
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	service := NewService(in, out)
-
-	service.RegisterHandler("Sorry", func([]byte) ([]byte, error) {
-		return nil, errors.New("i am so sorry")
-	})
-
-	ip := ""
-	service.PrimaryIP = func() string {
-		if ip == "" {
-			ip = "127"
-		} else if ip == "127" {
-			ip = "127.0.0.1"
-		} else if ip == "127.0.0.1" {
-			ip = ""
-		}
-		return ip
-	}
-
-	in.rpc = []*testRPC{
-		{"Capabilities_Register", "OK "},
-		{"Set_Option broadcastIP 1", "ERR "},
-		{"Set_Option broadcastIP 1", "OK "},
-		{"Set_Option broadcastIP 1", "OK "},
-		{"NOPE", "Unknown Command"},
-		{"Sorry", "ERR "},
-	}
-
-	in.wg.Add(1)
-
-	// replies to register capabilities
-	for i := 0; i < len(capabilities); i++ {
-		out.reply = append(out.reply, rpciERR)
-	}
-
-	foo := []byte("foo")
-	out.reply = append(
-		out.reply,
-		rpciERR,
-		rpciOK,
-		rpciOK,
-		append(rpciOK, foo...),
-		rpciERR,
-	)
-
-	in.service = service
-
-	in.t = t
-
-	err := service.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	in.wg.Wait()
-
-	// Done serving RPCs, test ChannelOut errors
-	reply, err := service.out.Request(rpciOK)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if !bytes.Equal(reply, foo) {
-		t.Errorf("reply=%q", foo)
-	}
-
-	_, err = service.out.Request(rpciOK)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	_, err = service.out.Request(nil)
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	service.Stop()
-	service.Wait()
-
-	// cover service start error paths
-	start := errors.New("fail")
-
-	in.start = start
-	err = service.Start()
-	if err != start {
-		t.Error("expected error")
-	}
-
-	in.start = nil
-	out.start = start
-	err = service.Start()
-	if err != start {
-		t.Error("expected error")
-	}
-}
-
-func TestServiceResetChannel(t *testing.T) {
-	in := new(mockChannelIn)
-	out := new(mockChannelOut)
-
-	service := NewService(in, out)
-
-	resetDelay = maxDelay
-
-	fails := 2
-	in.wg.Add(fails)
-	in.sendErr = 10
-
-	err := service.Start()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	in.wg.Wait()
-
-	service.Stop()
-	service.Wait()
-
-	expect := fails
-	if in.count.start != expect || in.count.stop != expect {
-		t.Errorf("count=%#v", in.count)
-	}
-}
-
-var (
-	testESX = flag.Bool("toolbox.testesx", false, "Test toolbox service against ESX (vmtoolsd must not be running)")
-	testPID = flag.Int64("toolbox.testpid", 0, "PID to return from toolbox start command")
-	testOn  = flag.String("toolbox.powerState", "", "Power state of VM prior to starting the test")
-)
-
-// echoHandler for testing hgfs.FileHandler
-type echoHandler struct{}
-
-func (e *echoHandler) Stat(u *url.URL) (os.FileInfo, error) {
-	if u.RawQuery == "" {
-		return nil, errors.New("no query")
-	}
-
-	if u.Query().Get("foo") != "bar" {
-		return nil, errors.New("invalid query")
-	}
-
-	return os.Stat(u.Path)
-}
-
-func (e *echoHandler) Open(u *url.URL, mode int32) (hgfs.File, error) {
-	_, err := e.Stat(u)
-	if err != nil {
-		return nil, err
-	}
-
-	return os.Open(u.Path)
-}
-
-func TestServiceRunESX(t *testing.T) {
-	if *testESX == false {
-		t.SkipNow()
-	}
-
-	Trace = testing.Verbose()
-
-	// A server that echos HTTP requests, for testing toolbox's http.RoundTripper
-	echo := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		_ = r.Write(w)
-	}))
-	// Client side can use 'govc guest.getenv' to get the URL w/ random port
-	_ = os.Setenv("TOOLBOX_ECHO_SERVER", echo.URL)
-
-	var wg sync.WaitGroup
-
-	in := NewBackdoorChannelIn()
-	out := NewBackdoorChannelOut()
-
-	service := NewService(in, out)
-	service.Command.FileServer.RegisterFileHandler("echo", new(echoHandler))
-
-	ping := sync.NewCond(new(sync.Mutex))
-
-	service.RegisterHandler("ping", func(b []byte) ([]byte, error) {
-		ping.Broadcast()
-		return service.Ping(b)
-	})
-
-	// assert that reset, ping, Set_Option and Capabilities_Register are called at least once
-	for _, name := range []string{"reset", "ping", "Set_Option", "Capabilities_Register"} {
-		n := name
-		h := service.handlers[name]
-		wg.Add(1)
-
-		service.handlers[name] = func(b []byte) ([]byte, error) {
-			defer wg.Done()
-
-			service.handlers[n] = h // reset
-
-			return h(b)
-		}
-	}
-
-	if *testOn == string(types.VirtualMachinePowerStatePoweredOff) {
-		wg.Add(1)
-		service.Power.PowerOn.Handler = func() error {
-			defer wg.Done()
-			log.Print("power on event")
-			return nil
-		}
-	} else {
-		log.Print("skipping power on test")
-	}
-
-	if *testPID != 0 {
-		service.Command.ProcessStartCommand = func(m *ProcessManager, r *vix.StartProgramRequest) (int64, error) {
-			wg.Add(1)
-			defer wg.Done()
-
-			switch r.ProgramPath {
-			case "/bin/date":
-				return *testPID, nil
-			case "sleep":
-				p := NewProcessFunc(func(ctx context.Context, arg string) error {
-					d, err := time.ParseDuration(arg)
-					if err != nil {
-						return err
-					}
-
-					select {
-					case <-ctx.Done():
-						return &ProcessError{Err: ctx.Err(), ExitCode: 42}
-					case <-time.After(d):
-					}
-
-					return nil
-				})
-				return m.Start(r, p)
-			default:
-				return DefaultStartCommand(m, r)
-			}
-		}
-	}
-
-	service.PrimaryIP = func() string {
-		log.Print("broadcasting IP")
-		return DefaultIP()
-	}
-
-	log.Print("starting toolbox service")
-	err := service.Start()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	wg.Wait()
-
-	// wait for 1 last ping to make sure the final response has reached the client before stopping
-	ping.L.Lock()
-	ping.Wait()
-	ping.L.Unlock()
-
-	service.Stop()
-	service.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox-test.sh b/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox-test.sh
deleted file mode 100755
index 8b18f14376..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox-test.sh
+++ /dev/null
@@ -1,259 +0,0 @@
-#!/bin/bash -e
-
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Create (or reuse) a VM to run toolbox and/or toolbox.test
-# Requires ESX to be configured with:
-# govc host.esxcli system settings advanced set -o /Net/GuestIPHack -i 1
-
-set -o pipefail
-
-vm="toolbox-test-$(uuidgen)"
-destroy=true
-verbose=true
-
-while getopts n:qstv flag
-do
-  case $flag in
-    n)
-      vm=$OPTARG
-      unset destroy
-      ;;
-    q)
-      verbose=false # you want this if generating lots of traffic, such as large file transfers
-      ;;
-    s)
-      start=true
-      ;;
-    t)
-      test=true
-      ;;
-    *)
-      echo "unknown option" 1>&2
-      exit 1
-      ;;
-  esac
-done
-
-echo "Building toolbox binaries..."
-pushd "$(git rev-parse --show-toplevel)" >/dev/null
-GOOS=linux GOARCH=amd64 go build -o "$GOPATH/bin/toolbox" -v ./toolbox/toolbox
-GOOS=linux GOARCH=amd64 go test -race -i -c ./toolbox -o "$GOPATH/bin/toolbox.test"
-popd >/dev/null
-
-iso=coreos_production_iso_image.iso
-
-govc datastore.mkdir -p images
-
-if ! govc datastore.ls images | grep -q $iso ; then
-  echo "Downloading ${iso}..."
-  if [ ! -e $iso ] ; then
-    wget http://beta.release.core-os.net/amd64-usr/current/$iso
-  fi
-
-  echo "Uploading ${iso}..."
-  govc datastore.upload $iso images/$iso
-fi
-
-if [ ! -e config.iso ] ; then
-  echo "Generating config.iso..."
-  keys=$(cat ~/.ssh/id_[rd]sa.pub)
-
-  dir=$(mktemp -d toolbox.XXXXXX)
-  pushd "${dir}" >/dev/null
-
-  mkdir -p drive/openstack/latest
-
-  cat > drive/openstack/latest/user_data <<EOF
-#!/bin/bash
-
-# Add ${USER}'s public key(s) to .ssh/authorized_keys
-echo "$keys" | update-ssh-keys -u core -a coreos-cloudinit
-EOF
-  genisoimage=$(type -p genisoimage mkisofs | head -1)
-  $genisoimage -R -V config-2 -o config.iso ./drive
-
-  popd >/dev/null
-
-  mv -f "$dir/config.iso" .
-  rm -rf "$dir"
-fi
-
-govc datastore.mkdir -p "$vm"
-
-vm_path="$(govc find / -type m -name "$vm")"
-
-if [ -z "$vm_path" ] ; then
-  echo "Creating VM ${vm}..."
-  govc vm.create -g otherGuest64 -m 1024 -on=false "$vm"
-
-  device=$(govc device.cdrom.add -vm "$vm")
-  govc device.cdrom.insert -vm "$vm" -device "$device" images/$iso
-
-  govc datastore.upload config.iso "$vm/config.iso" >/dev/null
-  device=$(govc device.cdrom.add -vm "$vm")
-  govc device.cdrom.insert -vm "$vm" -device "$device" "$vm/config.iso"
-
-  vm_path="$(govc find / -type m -name "$vm")"
-else
-  govc object.collect -s "$vm_path" -guest.toolsStatus toolsNot* # wait for previous toolbox to unregister
-fi
-
-state=$(govc object.collect -s "$vm_path" runtime.powerState)
-
-if [ "$state" != "poweredOn" ] ; then
-  govc vm.power -on "$vm"
-fi
-
-echo -n "Waiting for ${vm} ip..."
-ip=$(govc vm.ip -esxcli "$vm")
-
-opts=(-o "UserKnownHostsFile /dev/null" -o "StrictHostKeyChecking no" -o "LogLevel error" -o "BatchMode yes")
-
-destroy() {
-  if [ -n "$test" ] ; then
-    rm -f "$GOVC_TLS_KNOWN_HOSTS"
-  fi
-
-  if [ -n "$destroy" ] ; then
-    echo "Destroying VM ${vm}..."
-    govc vm.destroy "$vm"
-    govc datastore.rm -f "$vm"
-  else
-    ssh "${opts[@]}" "core@${ip}" pkill toolbox || true
-  fi
-}
-
-trap destroy EXIT
-
-scp "${opts[@]}" "$GOPATH"/bin/toolbox{,.test} "core@${ip}:"
-
-if [ -n "$test" ] ; then
-  # validate guest.FileManager adds the host thumbprint when transferring files
-  unset GOVC_INSECURE
-  GOVC_TLS_KNOWN_HOSTS=$(mktemp --tmpdir toolbox.XXXXXX)
-  govc about.cert -k -thumbprint > "$GOVC_TLS_KNOWN_HOSTS"
-
-  export GOVC_TLS_KNOWN_HOSTS GOVC_GUEST_LOGIN=user:pass
-
-  echo "Running toolbox tests..."
-  ssh "${opts[@]}" "core@${ip}" ./toolbox.test -test.v=$verbose -test.run TestServiceRunESX -toolbox.testesx \
-      -toolbox.testpid="$$" -toolbox.powerState="$state" &
-
-  echo "Waiting for VM ip from toolbox..."
-  ip=$(govc vm.ip "$vm")
-  echo "toolbox vm.ip=$ip"
-
-  echo "Testing guest.{start,kill,ps} operations via govc..."
-  export GOVC_VM="$vm"
-
-  # should be 0 procs as toolbox only lists processes it started, for now
-  test -z "$(govc guest.ps -e | grep -v STIME)"
-
-  out=$(govc guest.start /bin/date)
-
-  if [ "$out" != "$$" ] ; then
-    echo "'$out' != '$$'" 1>&2
-  fi
-
-  # These processes would run for 1h if we didn't kill them.
-  pid=$(govc guest.start sleep 1h)
-
-  echo "Killing func $pid..."
-  govc guest.kill -p "$pid"
-  govc guest.ps -e -p "$pid" -X | grep "$pid"
-  govc guest.ps -e -p "$pid" -json | jq -r .ProcessInfo[].ExitCode | grep -q 42
-
-  pid=$(govc guest.start /bin/sh -c "sleep 3600")
-  echo "Killing proc $pid..."
-  govc guest.kill -p "$pid"
-  govc guest.ps -e -p "$pid" -X | grep "$pid"
-
-  echo "Testing file copy to and from guest via govc..."
-  base="$(basename "$0")"
-  dest="/tmp/$base"
-
-  govc guest.upload -f -perm 0640 -gid 10 "$0" "$dest"
-  govc guest.download "$dest" - | md5sum --quiet -c <(<"$0" md5sum)
-  govc guest.chmod 0755 "$dest"
-  govc guest.ls "$dest" | grep rwxr-xr-x
-
-  echo "Testing custom hgfs.FileHandler..."
-  if ! govc guest.download "/echo:$dest" - 2>/dev/null ; then
-      govc guest.download "/echo:$dest?foo=bar" - >/dev/null
-  fi
-
-  home=$(govc guest.getenv HOME | cut -d= -f2)
-
-  if date | govc guest.upload -f - /tmp 2>/dev/null ; then
-    echo "guest.upload to directory should fail without .tgz source" 1>&2
-    exit 1
-  fi
-
-  if [ "$verbose" = "false" ] ; then # else you don't want to see this noise
-    # Download the $HOME directory, includes toolbox binaries (~30M total)
-    # Note: trailing slash is required
-    prefix=$(basename "$home")
-    govc guest.download "$home/?prefix=$prefix/&format=tgz" - | tar -tzvf - | grep "$prefix"/toolbox
-
-    govc guest.mkdir -p /tmp/toolbox-src
-    # Upload source files from this directory
-    # and validate that query string is not used as the file/dir name (see hgfs.ArchiveHandler)
-    git archive --format tgz HEAD | govc guest.upload -f - /tmp/toolbox-src?skip=stuff
-    # Upload .tar
-    git archive --format tar HEAD | govc guest.upload -f - /tmp/toolbox-src
-    # Download .tar
-    govc guest.download "/tmp/toolbox-src/" - | tar -tvf - | grep "$base"
-    # Download a single file as a .tar.gz (note: /archive: prefix is required)
-    govc guest.download "/archive:/tmp/toolbox-src/$base?format=tgz" - | tar -tvzf - | grep -v README.md
-    # Download a single file as a .tar (note: /archive: prefix is required)
-    govc guest.download "/archive:/tmp/toolbox-src/$base" - | tar -tvf - | grep -v README.md
-    govc guest.rmdir -r /tmp/toolbox-src
-  fi
-
-  echo "Testing we can download /proc files..."
-  for name in uptime diskstats net/dev ; do
-    test -n "$(govc guest.download /proc/$name -)"
-  done
-
-  addr=$(govc guest.getenv TOOLBOX_ECHO_SERVER | cut -d= -f2)
-
-  echo "Testing http.RoundTrip via $addr..."
-  govc guest.run GET "$addr/$vm" | grep "$vm"
-  echo "$vm" | govc guest.run -e Content-Type:text/plain -d - POST "$addr" | grep "$vm"
-
-  echo "Testing commands with IO..."
-  # Note that we don't use a pipe here, as guest.ps transitions the vm to VM_STATE_GUEST_OPERATION,
-  # which prevents guest.run from invoking guest operations.  By letting guest.ps complete before
-  # guest.run, the vm will have transitioned back to VM_STATE_POWERED_ON.
-  data=$(govc guest.ps -json)
-  govc guest.run -d "$data" jq .
-
-  # test ProcessIO download retries
-  govc version | govc guest.run -d - bash -c "'sleep 2 && cat'"
-
-  echo "Waiting for tests to complete..."
-  wait
-fi
-
-if [ -n "$start" ] ; then
-  (
-    govc object.collect -s "$vm_path" -guest.toolsStatus toolsOk # wait for toolbox to register
-    /usr/bin/time -f "Waiting for VM ip from toolbox...%e" govc vm.ip -v4 -n ethernet-0 "$vm"
-  ) &
-
-  echo "Starting toolbox..."
-  ssh "${opts[@]}" "core@${ip}" ./toolbox -toolbox.trace=$verbose
-fi
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox/main.go b/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox/main.go
deleted file mode 100644
index 083d9f1f71..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/toolbox/main.go
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"log"
-	"os"
-	"os/signal"
-	"syscall"
-
-	"github.com/vmware/govmomi/toolbox"
-)
-
-// This example can be run on a VM hosted by ESX, Fusion or Workstation
-func main() {
-	flag.Parse()
-
-	in := toolbox.NewBackdoorChannelIn()
-	out := toolbox.NewBackdoorChannelOut()
-
-	service := toolbox.NewService(in, out)
-
-	if os.Getuid() == 0 {
-		service.Power.Halt.Handler = toolbox.Halt
-		service.Power.Reboot.Handler = toolbox.Reboot
-	}
-
-	err := service.Start()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// handle the signals and gracefully shutdown the service
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
-
-	go func() {
-		log.Printf("signal %s received", <-sig)
-		service.Stop()
-	}()
-
-	service.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/vix/property_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/vix/property_test.go
deleted file mode 100644
index be08fcff51..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/vix/property_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vix
-
-import (
-	"encoding/base64"
-	"encoding/binary"
-	"math"
-	"reflect"
-	"testing"
-)
-
-func TestToolsStateProperties(t *testing.T) {
-	// captured from vmtoolsd
-	str := `lxEAAAIAAAAoAAAATGludXggNC40LjAtMjEtZ2VuZXJpYyBVYnVudHUgMTYuMDQgTFRTAKgRAAACAAAACgAAAHVidW50dS02NACfEQAAAgAAAA0AAABWTXdhcmUgVG9vbHMAlBEAAAIAAAAVAAAAMTAuMC41IGJ1aWxkLTMyMjc4NzIAmREAAAIAAAATAAAAdWJ1bnR1LTE2MDQtdm13YXJlAJURAAABAAAABAAAAAEAAACWEQAAAQAAAAQAAAABAAAAmBEAAAIAAAABAAAAAMsAAAACAAAAEQAAAC90bXAvdm13YXJlLXJvb3QApxEAAAEAAAAEAAAAQAAAAK0RAAACAAAACgAAAC9tbnQvaGdmcwC8EQAAAwAAAAEAAAAAvREAAAMAAAABAAAAAL4RAAADAAAAAQAAAAC/EQAAAwAAAAEAAAAAwBEAAAMAAAABAAAAAMERAAADAAAAAQAAAADCEQAAAwAAAAEAAAAAwxEAAAMAAAABAAAAAMQRAAADAAAAAQAAAADFEQAAAwAAAAEAAAAAxhEAAAMAAAABAAAAAMcRAAADAAAAAQAAAADIEQAAAwAAAAEAAAAAyREAAAMAAAABAAAAAMoRAAADAAAAAQAAAADLEQAAAwAAAAEAAAAAzBEAAAMAAAABAAAAAM0RAAADAAAAAQAAAADOEQAAAwAAAAEAAAAAzxEAAAMAAAABAAAAANARAAADAAAAAQAAAADREQAAAwAAAAEAAAAA0hEAAAMAAAABAAAAANMRAAADAAAAAQAAAADUEQAAAwAAAAEAAAAA1REAAAMAAAABAAAAANYRAAADAAAAAQAAAADXEQAAAwAAAAEAAAAA2BEAAAMAAAABAAAAAA==`
-
-	data, err := base64.StdEncoding.DecodeString(str)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var props PropertyList
-
-	err = props.UnmarshalBinary(data)
-	if err != nil {
-		t.Error(err)
-	}
-
-	data2, err := props.MarshalBinary()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	str2 := base64.StdEncoding.EncodeToString(data2)
-	if str != str2 {
-		t.Error("encoding mismatch")
-	}
-}
-
-func TestMarshalProperties(t *testing.T) {
-	in := PropertyList{
-		NewInt32Property(1, math.MaxInt32),
-		NewStringProperty(2, "foo"),
-		NewBoolProperty(3, true),
-		NewInt64Property(4, math.MaxInt64),
-		NewBlobProperty(5, []byte("deadbeef")),
-	}
-
-	buf, err := in.MarshalBinary()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var out PropertyList
-
-	err = out.UnmarshalBinary(buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if !reflect.DeepEqual(in, out) {
-		t.Error("marshal mismatch")
-	}
-
-}
-
-// hit unmarshal error paths
-func TestUnmarshalPropertiesErrors(t *testing.T) {
-	props := PropertyList{
-		NewBoolProperty(1, true),
-		NewStringProperty(1, "foo"),
-		NewBlobProperty(2, []byte("deadbeef")),
-	}
-
-	props[0].header.Kind = 0xff
-
-	for _, prop := range props {
-		buf, _ := prop.MarshalBinary()
-
-		for i, l := range []int{1, binary.Size(prop.header)} {
-			err := prop.UnmarshalBinary(buf[:l])
-			if err == nil {
-				t.Errorf("test %d (len=%d) expected error", i, l)
-			}
-		}
-	}
-
-	buf, _ := props.MarshalBinary()
-	err := props.UnmarshalBinary(buf)
-	if err == nil {
-		t.Error("expected error")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/toolbox/vix/protocol_test.go b/installer/vendor/github.com/vmware/govmomi/toolbox/vix/protocol_test.go
deleted file mode 100644
index fb4e8e1406..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/toolbox/vix/protocol_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vix
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestMarshalVixMsgStartProgramRequest(t *testing.T) {
-	requests := []*StartProgramRequest{
-		{},
-		{
-			ProgramPath: "/bin/date",
-		},
-		{
-			ProgramPath: "/bin/date",
-			Arguments:   "--date=@2147483647",
-		},
-		{
-			ProgramPath: "/bin/date",
-			WorkingDir:  "/tmp",
-		},
-		{
-			ProgramPath: "/bin/date",
-			WorkingDir:  "/tmp",
-			EnvVars:     []string{"FOO=bar"},
-		},
-		{
-			ProgramPath: "/bin/date",
-			WorkingDir:  "/tmp",
-			EnvVars:     []string{"FOO=bar", "BAR=foo"},
-		},
-	}
-
-	for i, in := range requests {
-		buf, err := in.MarshalBinary()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		out := new(StartProgramRequest)
-
-		err = out.UnmarshalBinary(buf)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if !reflect.DeepEqual(in, out) {
-			t.Errorf("%d marshal mismatch", i)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/units/size.go b/installer/vendor/github.com/vmware/govmomi/units/size.go
deleted file mode 100644
index f4ee3fcfc8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/units/size.go
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package units
-
-import (
-	"errors"
-	"fmt"
-	"regexp"
-	"strconv"
-)
-
-type ByteSize int64
-
-const (
-	_  = iota
-	KB = 1 << (10 * iota)
-	MB
-	GB
-	TB
-	PB
-	EB
-)
-
-func (b ByteSize) String() string {
-	switch {
-	case b >= EB:
-		return fmt.Sprintf("%.1fEB", float32(b)/EB)
-	case b >= PB:
-		return fmt.Sprintf("%.1fPB", float32(b)/PB)
-	case b >= TB:
-		return fmt.Sprintf("%.1fTB", float32(b)/TB)
-	case b >= GB:
-		return fmt.Sprintf("%.1fGB", float32(b)/GB)
-	case b >= MB:
-		return fmt.Sprintf("%.1fMB", float32(b)/MB)
-	case b >= KB:
-		return fmt.Sprintf("%.1fKB", float32(b)/KB)
-	}
-	return fmt.Sprintf("%dB", b)
-}
-
-type FileSize int64
-
-func (b FileSize) String() string {
-	switch {
-	case b >= EB:
-		return fmt.Sprintf("%.1fE", float32(b)/EB)
-	case b >= PB:
-		return fmt.Sprintf("%.1fP", float32(b)/PB)
-	case b >= TB:
-		return fmt.Sprintf("%.1fT", float32(b)/TB)
-	case b >= GB:
-		return fmt.Sprintf("%.1fG", float32(b)/GB)
-	case b >= MB:
-		return fmt.Sprintf("%.1fM", float32(b)/MB)
-	case b >= KB:
-		return fmt.Sprintf("%.1fK", float32(b)/KB)
-	}
-	return fmt.Sprintf("%d", b)
-}
-
-var bytesRegexp = regexp.MustCompile(`^(?i)(\d+)([BKMGTPE]?)(ib|b)?$`)
-
-func (b *ByteSize) Set(s string) error {
-	m := bytesRegexp.FindStringSubmatch(s)
-	if len(m) == 0 {
-		return errors.New("invalid byte value")
-	}
-
-	i, err := strconv.ParseInt(m[1], 10, 64)
-	if err != nil {
-		return err
-	}
-	*b = ByteSize(i)
-
-	switch m[2] {
-	case "B", "b", "":
-	case "K", "k":
-		*b *= ByteSize(KB)
-	case "M", "m":
-		*b *= ByteSize(MB)
-	case "G", "g":
-		*b *= ByteSize(GB)
-	case "T", "t":
-		*b *= ByteSize(TB)
-	case "P", "p":
-		*b *= ByteSize(PB)
-	case "E", "e":
-		*b *= ByteSize(EB)
-	default:
-		return errors.New("invalid byte suffix")
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/units/size_test.go b/installer/vendor/github.com/vmware/govmomi/units/size_test.go
deleted file mode 100644
index 14772887b6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/units/size_test.go
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package units
-
-import (
-	"fmt"
-	"math"
-	"testing"
-)
-
-func TestMB(t *testing.T) {
-	b := ByteSize(1024 * 1024)
-	expected := "1.0MB"
-	if b.String() != expected {
-		t.Errorf("Expected '%v' but got '%v'", expected, b)
-	}
-}
-
-func TestTenMB(t *testing.T) {
-	b := ByteSize(10 * 1024 * 1024)
-	actual := fmt.Sprintf("%s", b)
-	expected := "10.0MB"
-	if actual != expected {
-		t.Errorf("Expected '%v' but got '%v'", expected, actual)
-	}
-}
-
-func assertEquals(t *testing.T, expected string, actual ByteSize) {
-	if expected != actual.String() {
-		t.Errorf("Expected '%v' but got '%v'", expected, actual.String())
-	}
-}
-
-func TestByteSize(t *testing.T) {
-	assertEquals(t, "1B", ByteSize(1))
-	assertEquals(t, "10B", ByteSize(10))
-	assertEquals(t, "100B", ByteSize(100))
-	assertEquals(t, "1000B", ByteSize(1000))
-	assertEquals(t, "1.0KB", ByteSize(1024))
-	assertEquals(t, "1.0MB", ByteSize(1024*1024))
-	assertEquals(t, "1.0MB", ByteSize(1048576))
-	assertEquals(t, "10.0MB", ByteSize(10*math.Pow(1024, 2)))
-	assertEquals(t, "1.0GB", ByteSize(1024*1024*1024))
-	assertEquals(t, "1.0TB", ByteSize(1024*1024*1024*1024))
-	assertEquals(t, "1.0TB", ByteSize(1048576*1048576))
-	assertEquals(t, "1.0PB", ByteSize(1024*1024*1024*1024*1024))
-	assertEquals(t, "1.0EB", ByteSize(1024*1024*1024*1024*1024*1024))
-	assertEquals(t, "1.0EB", ByteSize(1048576*1048576*1048576))
-}
-
-func TestByteSizeSet(t *testing.T) {
-	var tests = []struct {
-		In     string
-		OutStr string
-		Out    ByteSize
-	}{
-		{
-			In:     "345",
-			OutStr: "345B",
-			Out:    345.0,
-		},
-		{
-			In:     "345b",
-			OutStr: "345B",
-			Out:    345.0,
-		},
-		{
-			In:     "345K",
-			OutStr: "345.0KB",
-			Out:    345 * KB,
-		},
-		{
-			In:     "345kb",
-			OutStr: "345.0KB",
-			Out:    345 * KB,
-		},
-		{
-			In:     "345kib",
-			OutStr: "345.0KB",
-			Out:    345 * KB,
-		},
-		{
-			In:     "345KiB",
-			OutStr: "345.0KB",
-			Out:    345 * KB,
-		},
-		{
-			In:     "345M",
-			OutStr: "345.0MB",
-			Out:    345 * MB,
-		},
-		{
-			In:     "345G",
-			OutStr: "345.0GB",
-			Out:    345 * GB,
-		},
-		{
-			In:     "345T",
-			OutStr: "345.0TB",
-			Out:    345 * TB,
-		},
-		{
-			In:     "345P",
-			OutStr: "345.0PB",
-			Out:    345 * PB,
-		},
-		{
-			In:     "3E",
-			OutStr: "3.0EB",
-			Out:    3 * EB,
-		},
-	}
-
-	for _, test := range tests {
-		var v ByteSize
-		err := v.Set(test.In)
-		if err != nil {
-			t.Errorf("Error: %s [%v]", err, test.In)
-			continue
-		}
-
-		if v != test.Out {
-			t.Errorf("Out: expect '%v' actual '%v'", test.Out, v)
-			continue
-		}
-
-		if v.String() != test.OutStr {
-			t.Errorf("String: expect '%v' actual '%v'", test.OutStr, v.String())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vcsim/.gitignore b/installer/vendor/github.com/vmware/govmomi/vcsim/.gitignore
deleted file mode 100644
index 52b1403c1f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vcsim/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-vcsim
diff --git a/installer/vendor/github.com/vmware/govmomi/vcsim/README.md b/installer/vendor/github.com/vmware/govmomi/vcsim/README.md
deleted file mode 100644
index 9594f2f877..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vcsim/README.md
+++ /dev/null
@@ -1,114 +0,0 @@
-# govcsim - A vCenter and ESXi API based simulator
-
-This package implements a vSphere Web Services (SOAP) SDK endpoint intended for testing consumers of the API.
-While the package is written in the Go language, it can be used by any language that can talk to the vSphere API.
-
-## Installation
-
-```
-% export GOPATH=$HOME/gopath
-% go get -u github.com/vmware/govmomi/vcsim
-% $GOPATH/bin/vcsim -h
-```
-
-## Usage
-
-The **vcsim** program by default creates a *vCenter* model with a datacenter, hosts, cluster, resource pools, networks
-and a datastore.  The naming is similar to that of the original *vcsim* mode that was included with vCenter.  The number
-of resources can be increased or decreased using the various resource type flags.  Resources can also be created and
-removed using the API.
-
-Example using the default settings:
-
-```
-% export GOVC_URL=https://user:pass@127.0.0.1:8989
-% $GOPATH/bin/vcsim
-% govc find
-/
-/DC0
-/DC0/vm
-/DC0/vm/DC0_H0_VM0
-/DC0/vm/DC0_H0_VM1
-/DC0/vm/DC0_C0_RP0_VM0
-/DC0/vm/DC0_C0_RP0_VM1
-/DC0/host
-/DC0/host/DC0_H0
-/DC0/host/DC0_H0/DC0_H0
-/DC0/host/DC0_H0/Resources
-/DC0/host/DC0_C0
-/DC0/host/DC0_C0/DC0_C0_H0
-/DC0/host/DC0_C0/DC0_C0_H1
-/DC0/host/DC0_C0/DC0_C0_H2
-/DC0/host/DC0_C0/Resources
-/DC0/datastore
-/DC0/datastore/LocalDS_0
-/DC0/network
-/DC0/network/VM Network
-/DC0/network/DVS0
-/DC0/network/DC0_DVPG0
-```
-
-Example using ESX mode:
-
-```
-% $GOPATH/vcsim -esx
-% govc find
-/
-/ha-datacenter
-/ha-datacenter/vm
-/ha-datacenter/vm/ha-host_VM0
-/ha-datacenter/vm/ha-host_VM1
-/ha-datacenter/host
-/ha-datacenter/host/localhost.localdomain
-/ha-datacenter/host/localhost.localdomain/localhost.localdomain
-/ha-datacenter/host/localhost.localdomain/Resources
-/ha-datacenter/datastore
-/ha-datacenter/datastore/LocalDS_0
-/ha-datacenter/network
-/ha-datacenter/network/VM Network
-
-```
-
-## Supported methods
-
-The simulator supports a subset of API methods.  However, the generated [govmomi](https://github.com/vmware/govmomi)
-code includes all types and methods defined in the vmodl, which can be used to implement any method documented in the
-[VMware vSphere API Reference](http://pubs.vmware.com/vsphere-6-5/index.jsp#com.vmware.wssdk.apiref.doc/right-pane.html).
-
-To see the list of supported methods:
-
-```
-curl -k https://user:pass@127.0.0.1:8989/about
-```
-
-## Listen address
-
-The default vcsim listen address is `127.0.0.1:8989`.  Use the `-httptest.serve` flag to listen on another address:
-
-
-``` shell
-vcsim -httptest.serve=10.118.69.224:8989 # specific address
-
-vcsim -httptest.serve=:8989 #any address
-```
-
-
-When given a port value of '0', an unused port will be chosen.  You can then source the GOVC_URL from another
-process, for example:
-
-``` shell
-govc_sim_env=$TMPDIR/vcsim-$(uuidgen)
-
-mkfifo $govc_sim_env
-
-vcsim -httptest.serve=127.0.0.1:0 -E $govc_sim_env &
-
-eval "$(cat $govc_sim_env)"
-
-# ... run tests ...
-
-kill $GOVC_SIM_PID
-rm -f $govc_sim_env
-```
-
-Tests written in Go can also use the simulator package directly, rather than the vcsim binary.
diff --git a/installer/vendor/github.com/vmware/govmomi/vcsim/main.go b/installer/vendor/github.com/vmware/govmomi/vcsim/main.go
deleted file mode 100644
index f8513031b6..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vcsim/main.go
+++ /dev/null
@@ -1,125 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package main
-
-import (
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"log"
-	"os"
-	"os/signal"
-	"runtime"
-	"syscall"
-
-	"github.com/google/uuid"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/simulator/esx"
-)
-
-func main() {
-	model := simulator.VPX()
-
-	flag.IntVar(&model.Datacenter, "dc", model.Datacenter, "Number of datacenters")
-	flag.IntVar(&model.Cluster, "cluster", model.Cluster, "Number of clusters")
-	flag.IntVar(&model.ClusterHost, "host", model.ClusterHost, "Number of hosts per cluster")
-	flag.IntVar(&model.Host, "standalone-host", model.Host, "Number of standalone hosts")
-	flag.IntVar(&model.Datastore, "ds", model.Datastore, "Number of local datastores")
-	flag.IntVar(&model.Machine, "vm", model.Machine, "Number of virtual machines per resource pool")
-	flag.IntVar(&model.Pool, "pool", model.Pool, "Number of resource pools per compute resource")
-	flag.IntVar(&model.App, "app", model.App, "Number of virtual apps per compute resource")
-	flag.IntVar(&model.Pod, "pod", model.Pod, "Number of storage pods per datacenter")
-	flag.IntVar(&model.Portgroup, "pg", model.Portgroup, "Number of port groups")
-	flag.IntVar(&model.Folder, "folder", model.Folder, "Number of folders")
-	flag.BoolVar(&model.Autostart, "autostart", model.Autostart, "Autostart model created VMs")
-
-	isESX := flag.Bool("esx", false, "Simulate standalone ESX")
-	isTLS := flag.Bool("tls", true, "Enable TLS")
-	cert := flag.String("tlscert", "", "Path to TLS certificate file")
-	key := flag.String("tlskey", "", "Path to TLS key file")
-	env := flag.String("E", "-", "Output vcsim variables to the given fifo or stdout")
-	flag.BoolVar(&simulator.Trace, "trace", simulator.Trace, "Trace SOAP to stderr")
-
-	flag.Parse()
-
-	switch flag.Arg(0) {
-	case "uuidgen": // util-linux not installed on Travis CI
-		fmt.Println(uuid.New().String())
-		return
-	}
-
-	var err error
-	out := os.Stdout
-
-	if *env != "-" {
-		out, err = os.OpenFile(*env, os.O_WRONLY, 0)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	f := flag.Lookup("httptest.serve")
-	if f.Value.String() == "" {
-		// #nosec: Errors unhandled
-		_ = f.Value.Set("127.0.0.1:8989")
-	}
-
-	if *isESX {
-		opts := model
-		model = simulator.ESX()
-		// Preserve options that also apply to ESX
-		model.Datastore = opts.Datastore
-		model.Machine = opts.Machine
-	}
-
-	tag := " (govmomi simulator)"
-	model.ServiceContent.About.Name += tag
-	model.ServiceContent.About.OsType = runtime.GOOS + "-" + runtime.GOARCH
-
-	esx.HostSystem.Summary.Hardware.Vendor += tag
-
-	err = model.Create()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	if *isTLS {
-		model.Service.TLS = new(tls.Config)
-		if *cert != "" {
-			c, err := tls.LoadX509KeyPair(*cert, *key)
-			if err != nil {
-				log.Fatal(err)
-			}
-
-			model.Service.TLS.Certificates = []tls.Certificate{c}
-		}
-	}
-
-	s := model.Service.NewServer()
-
-	fmt.Fprintf(out, "export GOVC_URL=%s GOVC_SIM_PID=%d\n", s.URL, os.Getpid())
-	if out != os.Stdout {
-		_ = out.Close()
-	}
-
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
-
-	<-sig
-
-	model.Remove()
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/client_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/client_test.go
deleted file mode 100644
index 46a83abc06..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/client_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vim25
-
-import (
-	"context"
-	"encoding/json"
-	"net/url"
-	"os"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-// Duplicated to prevent cyclic dependency...
-func testURL(t *testing.T) *url.URL {
-	s := os.Getenv("GOVMOMI_TEST_URL")
-	if s == "" {
-		t.SkipNow()
-	}
-	u, err := soap.ParseURL(s)
-	if err != nil {
-		panic(err)
-	}
-	return u
-}
-
-func sessionLogin(t *testing.T, c *Client) {
-	req := types.Login{
-		This: *c.ServiceContent.SessionManager,
-	}
-
-	u := testURL(t).User
-	req.UserName = u.Username()
-	if pw, ok := u.Password(); ok {
-		req.Password = pw
-	}
-
-	_, err := methods.Login(context.Background(), c, &req)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func sessionCheck(t *testing.T, c *Client) {
-	var mgr mo.SessionManager
-
-	err := mo.RetrieveProperties(context.Background(), c, c.ServiceContent.PropertyCollector, *c.ServiceContent.SessionManager, &mgr)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestClientSerialization(t *testing.T) {
-	var c1, c2 *Client
-
-	soapClient := soap.NewClient(testURL(t), true)
-	c1, err := NewClient(context.Background(), soapClient)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Login
-	sessionLogin(t, c1)
-	sessionCheck(t, c1)
-
-	// Serialize/deserialize
-	b, err := json.Marshal(c1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c2 = &Client{}
-	err = json.Unmarshal(b, c2)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check the session is still valid
-	sessionCheck(t, c2)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go
deleted file mode 100644
index 78bcaae811..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/methods/fault_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package methods
-
-import (
-	"bytes"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-var invalidLoginFault = `
-<?xml version="1.0" encoding="UTF-8"?>
-<soapenv:Envelope xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-<soapenv:Body>
-<soapenv:Fault><faultcode>ServerFaultCode</faultcode><faultstring>Cannot complete login due to an incorrect user name or password.</faultstring><detail><InvalidLoginFault xmlns="urn:vim25" xsi:type="InvalidLogin"></InvalidLoginFault></detail></soapenv:Fault>
-</soapenv:Body>
-</soapenv:Envelope>`
-
-type TestBody struct {
-	Fault *soap.Fault `xml:"http://schemas.xmlsoap.org/soap/envelope/ Fault,omitempty"`
-}
-
-func TestFaultDetail(t *testing.T) {
-	body := TestBody{}
-	env := soap.Envelope{Body: &body}
-
-	dec := xml.NewDecoder(bytes.NewReader([]byte(invalidLoginFault)))
-	dec.TypeFunc = types.TypeFunc()
-
-	err := dec.Decode(&env)
-	if err != nil {
-		t.Fatalf("Decode: %s", err)
-	}
-
-	if body.Fault == nil {
-		t.Fatal("Expected fault")
-	}
-
-	if _, ok := body.Fault.Detail.Fault.(types.InvalidLogin); !ok {
-		t.Fatalf("Expected InvalidLogin, got: %#v", body.Fault.Detail.Fault)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml b/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml
deleted file mode 100644
index be218c0521..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/cluster_host_property.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <returnval>
-  <obj type="ClusterComputeResource">domain-c7</obj>
-  <propSet>
-   <name>host</name>
-   <val xsi:type="ArrayOfManagedObjectReference">
-    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-14</ManagedObjectReference>
-    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-17</ManagedObjectReference>
-    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-19</ManagedObjectReference>
-    <ManagedObjectReference type="HostSystem" xsi:type="ManagedObjectReference">host-52</ManagedObjectReference>
-   </val>
-  </propSet>
- </returnval>
-</RetrievePropertiesResponse>
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml b/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml
deleted file mode 100644
index 05d369d85d..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/hostsystem_list_name_property.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <returnval>
-  <obj type="HostSystem">host-10</obj>
-  <propSet>
-   <name>name</name>
-   <val xsi:type="xsd:string">host-01.example.com</val>
-  </propSet>
- </returnval>
- <returnval>
-  <obj type="HostSystem">host-30</obj>
-  <propSet>
-   <name>name</name>
-   <val xsi:type="xsd:string">host-02.example.com</val>
-  </propSet>
- </returnval>
-</RetrievePropertiesResponse>
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml b/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml
deleted file mode 100644
index ed44167f45..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/nested_property.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <returnval>
-    <obj type="VirtualMachine">vm-411</obj>
-    <propSet>
-      <name>config.name</name>
-      <val xsi:type="xsd:string">kubernetes-master</val>
-    </propSet>
-    <propSet>
-      <name>config.uuid</name>
-      <val xsi:type="xsd:string">422ec880-ab06-06b4-23f3-beb7a052a4c9</val>
-    </propSet>
-  </returnval>
-</RetrievePropertiesResponse>
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml b/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml
deleted file mode 100644
index 2a7fcdbdfa..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/not_authenticated_fault.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <returnval>
-    <obj type="SessionManager">SessionManager</obj>
-    <propSet>
-      <name>defaultLocale</name>
-      <val xsi:type="xsd:string">en</val>
-    </propSet>
-    <propSet>
-      <name>messageLocaleList</name>
-      <val xsi:type="ArrayOfString">
-        <string xsi:type="xsd:string">ja</string>
-        <string xsi:type="xsd:string">zh_CN</string>
-        <string xsi:type="xsd:string">en</string>
-        <string xsi:type="xsd:string">de</string>
-        <string xsi:type="xsd:string">zh_TW</string>
-        <string xsi:type="xsd:string">ko</string>
-        <string xsi:type="xsd:string">fr</string>
-      </val>
-    </propSet>
-    <missingSet>
-      <path>message</path>
-      <fault>
-        <fault xsi:type="NotAuthenticated">
-          <object type="Folder">group-d1</object>
-          <privilegeId>System.View</privilegeId>
-        </fault>
-        <localizedMessage/>
-      </fault>
-    </missingSet>
-    <missingSet>
-      <path>sessionList</path>
-      <fault>
-        <fault xsi:type="NotAuthenticated">
-          <object type="Folder">group-d1</object>
-          <privilegeId>Sessions.TerminateSession</privilegeId>
-        </fault>
-        <localizedMessage/>
-      </fault>
-    </missingSet>
-  </returnval>
-</RetrievePropertiesResponse>
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml b/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml
deleted file mode 100644
index 54baaf5ffa..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/fixtures/pointer_property.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<RetrievePropertiesResponse xmlns="urn:vim25" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <returnval>
-    <obj type="VirtualMachine">vm-411</obj>
-    <propSet>
-      <name>config.bootOptions</name>
-      <val xsi:type="VirtualMachineBootOptions">
-        <bootDelay>0</bootDelay>
-        <enterBIOSSetup>false</enterBIOSSetup>
-        <bootRetryEnabled>false</bootRetryEnabled>
-        <bootRetryDelay>10000</bootRetryDelay>
-      </val>
-    </propSet>
-  </returnval>
-</RetrievePropertiesResponse>
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go
deleted file mode 100644
index 5d6e011df1..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/retrieve_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mo
-
-import (
-	"os"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-func load(name string) *types.RetrievePropertiesResponse {
-	f, err := os.Open(name)
-	if err != nil {
-		panic(err)
-	}
-
-	defer f.Close()
-
-	var b types.RetrievePropertiesResponse
-
-	dec := xml.NewDecoder(f)
-	dec.TypeFunc = types.TypeFunc()
-	if err := dec.Decode(&b); err != nil {
-		panic(err)
-	}
-
-	return &b
-}
-
-func TestNotAuthenticatedFault(t *testing.T) {
-	var s SessionManager
-
-	err := LoadRetrievePropertiesResponse(load("fixtures/not_authenticated_fault.xml"), &s)
-	if !soap.IsVimFault(err) {
-		t.Errorf("Expected IsVimFault")
-	}
-
-	fault := soap.ToVimFault(err).(*types.NotAuthenticated)
-	if fault.PrivilegeId != "System.View" {
-		t.Errorf("Expected first fault to be returned")
-	}
-}
-
-func TestNestedProperty(t *testing.T) {
-	var vm VirtualMachine
-
-	err := LoadRetrievePropertiesResponse(load("fixtures/nested_property.xml"), &vm)
-	if err != nil {
-		t.Fatalf("Expected no error, got: %s", err)
-	}
-
-	self := types.ManagedObjectReference{
-		Type:  "VirtualMachine",
-		Value: "vm-411",
-	}
-
-	if vm.Self != self {
-		t.Fatalf("Expected vm.Self to be set")
-	}
-
-	if vm.Config == nil {
-		t.Fatalf("Expected vm.Config to be set")
-	}
-
-	if vm.Config.Name != "kubernetes-master" {
-		t.Errorf("Got: %s", vm.Config.Name)
-	}
-
-	if vm.Config.Uuid != "422ec880-ab06-06b4-23f3-beb7a052a4c9" {
-		t.Errorf("Got: %s", vm.Config.Uuid)
-	}
-}
-
-func TestPointerProperty(t *testing.T) {
-	var vm VirtualMachine
-
-	err := LoadRetrievePropertiesResponse(load("fixtures/pointer_property.xml"), &vm)
-	if err != nil {
-		t.Fatalf("Expected no error, got: %s", err)
-	}
-
-	if vm.Config == nil {
-		t.Fatalf("Expected vm.Config to be set")
-	}
-
-	if vm.Config.BootOptions == nil {
-		t.Fatalf("Expected vm.Config.BootOptions to be set")
-	}
-}
-
-func TestEmbeddedTypeProperty(t *testing.T) {
-	// Test that we avoid in this case:
-	// panic: reflect.Set: value of type mo.ClusterComputeResource is not assignable to type mo.ComputeResource
-	var cr ComputeResource
-
-	err := LoadRetrievePropertiesResponse(load("fixtures/cluster_host_property.xml"), &cr)
-	if err != nil {
-		t.Fatalf("Expected no error, got: %s", err)
-	}
-
-	if len(cr.Host) != 4 {
-		t.Fatalf("Expected cr.Host to be set")
-	}
-}
-
-func TestEmbeddedTypePropertySlice(t *testing.T) {
-	var me []ManagedEntity
-
-	err := LoadRetrievePropertiesResponse(load("fixtures/hostsystem_list_name_property.xml"), &me)
-	if err != nil {
-		t.Fatalf("Expected no error, got: %s", err)
-	}
-
-	if len(me) != 2 {
-		t.Fatalf("Expected 2 elements")
-	}
-
-	for _, m := range me {
-		if m.Name == "" {
-			t.Fatal("Expected Name field to be set")
-		}
-	}
-
-	if me[0].Name == me[1].Name {
-		t.Fatal("Name fields should not be the same")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go
deleted file mode 100644
index 849d9eea46..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/mo/type_info_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package mo
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestLoadAll(*testing.T) {
-	for _, typ := range t {
-		newTypeInfo(typ)
-	}
-}
-
-// The virtual machine managed object has about 500 nested properties.
-// It's likely to be indicative of the function's performance in general.
-func BenchmarkLoadVirtualMachine(b *testing.B) {
-	vmtyp := reflect.TypeOf((*VirtualMachine)(nil)).Elem()
-	for i := 0; i < b.N; i++ {
-		newTypeInfo(vmtyp)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go
deleted file mode 100644
index bac9594284..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/aggregator_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-import (
-	"testing"
-	"time"
-)
-
-func TestAggregatorNoSinks(t *testing.T) {
-	ch := make(chan Report)
-	a := NewAggregator(dummySinker{ch})
-	a.Done()
-
-	_, ok := <-ch
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-}
-
-func TestAggregatorMultipleSinks(t *testing.T) {
-	ch := make(chan Report)
-	a := NewAggregator(dummySinker{ch})
-
-	for i := 0; i < 5; i++ {
-		go func(ch chan<- Report) {
-			ch <- dummyReport{}
-			ch <- dummyReport{}
-			close(ch)
-		}(a.Sink())
-
-		<-ch
-		<-ch
-	}
-
-	a.Done()
-
-	_, ok := <-ch
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-}
-
-func TestAggregatorSinkInFlightOnDone(t *testing.T) {
-	ch := make(chan Report)
-	a := NewAggregator(dummySinker{ch})
-
-	// Simulate upstream
-	go func(ch chan<- Report) {
-		time.Sleep(1 * time.Millisecond)
-		ch <- dummyReport{}
-		close(ch)
-	}(a.Sink())
-
-	// Drain downstream
-	go func(ch <-chan Report) {
-		<-ch
-	}(ch)
-
-	// This should wait for upstream to complete
-	a.Done()
-
-	_, ok := <-ch
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go
deleted file mode 100644
index c0da5e418a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/common_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-type dummySinker struct {
-	ch chan Report
-}
-
-func (d dummySinker) Sink() chan<- Report {
-	return d.ch
-}
-
-type dummyReport struct {
-	p float32
-	d string
-	e error
-}
-
-func (p dummyReport) Percentage() float32 {
-	return p.p
-}
-
-func (p dummyReport) Detail() string {
-	return p.d
-}
-
-func (p dummyReport) Error() error {
-	return p.e
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go
deleted file mode 100644
index 2438bfd799..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/prefix_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-import "testing"
-
-func TestPrefix(t *testing.T) {
-	var r Report
-
-	ch := make(chan Report, 1)
-	s := Prefix(dummySinker{ch}, "prefix").Sink()
-
-	// No detail
-	s <- dummyReport{d: ""}
-	r = <-ch
-	if r.Detail() != "prefix" {
-		t.Errorf("Expected detail to be prefixed")
-	}
-
-	// With detail
-	s <- dummyReport{d: "something"}
-	r = <-ch
-	if r.Detail() != "prefix: something" {
-		t.Errorf("Expected detail to be prefixed")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader.go
index a981cb4e15..9d67bc6525 100644
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader.go
+++ b/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader.go
@@ -18,6 +18,7 @@ package progress
 
 import (
 	"container/list"
+	"context"
 	"fmt"
 	"io"
 	"sync/atomic"
@@ -75,16 +76,16 @@ type reader struct {
 
 	pos  int64
 	size int64
+	bps  uint64
 
-	bps uint64
-
-	ch chan<- Report
+	ch  chan<- Report
+	ctx context.Context
 }
 
-func NewReader(s Sinker, r io.Reader, size int64) *reader {
+func NewReader(ctx context.Context, s Sinker, r io.Reader, size int64) *reader {
 	pr := reader{
-		r: r,
-
+		r:    r,
+		ctx:  ctx,
 		size: size,
 	}
 
@@ -99,11 +100,12 @@ func NewReader(s Sinker, r io.Reader, size int64) *reader {
 // underlying channel.
 func (r *reader) Read(b []byte) (int, error) {
 	n, err := r.r.Read(b)
-	if err != nil {
+	r.pos += int64(n)
+
+	if err != nil && err != io.EOF {
 		return n, err
 	}
 
-	r.pos += int64(n)
 	q := readerReport{
 		t:    time.Now(),
 		pos:  r.pos,
@@ -111,7 +113,10 @@ func (r *reader) Read(b []byte) (int, error) {
 		bps:  &r.bps,
 	}
 
-	r.ch <- q
+	select {
+	case r.ch <- q:
+	case <-r.ctx.Done():
+	}
 
 	return n, err
 }
@@ -127,8 +132,11 @@ func (r *reader) Done(err error) {
 		err:  err,
 	}
 
-	r.ch <- q
-	close(r.ch)
+	select {
+	case r.ch <- q:
+		close(r.ch)
+	case <-r.ctx.Done():
+	}
 }
 
 // newBpsLoop returns a sink that monitors and stores throughput.
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go
deleted file mode 100644
index 2d60582234..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/reader_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-import (
-	"io"
-	"strings"
-	"testing"
-)
-
-func TestReader(t *testing.T) {
-	s := "helloworld"
-	ch := make(chan Report, 1)
-	pr := NewReader(&dummySinker{ch}, strings.NewReader(s), int64(len(s)))
-
-	var buf [10]byte
-	var q Report
-	var n int
-	var err error
-
-	// Read first byte
-	n, err = pr.Read(buf[0:1])
-	if n != 1 {
-		t.Errorf("Expected n=1, but got: %d", n)
-	}
-
-	if err != nil {
-		t.Errorf("Error: %s", err)
-	}
-
-	q = <-ch
-	if q.Error() != nil {
-		t.Errorf("Error: %s", err)
-	}
-
-	if f := q.Percentage(); f != 10.0 {
-		t.Errorf("Expected percentage after 1 byte to be 10%%, but got: %.0f%%", f)
-	}
-
-	// Read remaining bytes
-	n, err = pr.Read(buf[:])
-	if n != 9 {
-		t.Errorf("Expected n=1, but got: %d", n)
-	}
-	if err != nil {
-		t.Errorf("Error: %s", err)
-	}
-
-	q = <-ch
-	if q.Error() != nil {
-		t.Errorf("Error: %s", err)
-	}
-
-	if f := q.Percentage(); f != 100.0 {
-		t.Errorf("Expected percentage after 10 bytes to be 100%%, but got: %.0f%%", f)
-	}
-
-	// Read EOF
-	_, err = pr.Read(buf[:])
-	if err != io.EOF {
-		t.Errorf("Expected io.EOF, but got: %s", err)
-	}
-
-	// Mark progress reader as done
-	pr.Done(io.EOF)
-	q = <-ch
-	if err != io.EOF {
-		t.Errorf("Expected io.EOF, but got: %s", err)
-	}
-
-	// Progress channel should be closed after progress reader is marked done
-	_, ok := <-ch
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go
deleted file mode 100644
index 8b722e9a95..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/scale_test.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-import "testing"
-
-func TestScaleMany(t *testing.T) {
-	ch := make(chan Report)
-	a := NewAggregator(dummySinker{ch})
-	defer a.Done()
-
-	s := Scale(a, 5)
-
-	go func() {
-		for i := 0; i < 5; i++ {
-			go func(ch chan<- Report) {
-				ch <- dummyReport{p: 0.0}
-				ch <- dummyReport{p: 50.0}
-				close(ch)
-			}(s.Sink())
-		}
-	}()
-
-	// Expect percentages to be scaled across sinks
-	for p := float32(0.0); p < 100.0; p += 10.0 {
-		r := <-ch
-		if r.Percentage() != p {
-			t.Errorf("Expected percentage to be: %.0f%%", p)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go
deleted file mode 100644
index 350f6f1cb9..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/progress/tee_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package progress
-
-import "testing"
-
-func TestTee(t *testing.T) {
-	var ok bool
-
-	ch1 := make(chan Report)
-	ch2 := make(chan Report)
-
-	s := Tee(&dummySinker{ch: ch1}, &dummySinker{ch: ch2})
-
-	in := s.Sink()
-	in <- dummyReport{}
-	close(in)
-
-	// Receive dummy on both sinks
-	<-ch1
-	<-ch2
-
-	_, ok = <-ch1
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-
-	_, ok = <-ch2
-	if ok {
-		t.Errorf("Expected channel to be closed")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/retry_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/retry_test.go
deleted file mode 100644
index e6e1c498db..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/retry_test.go
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vim25
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-type tempError struct{}
-
-func (tempError) Error() string   { return "tempError" }
-func (tempError) Timeout() bool   { return true }
-func (tempError) Temporary() bool { return true }
-
-type nonTempError struct{}
-
-func (nonTempError) Error() string   { return "nonTempError" }
-func (nonTempError) Timeout() bool   { return false }
-func (nonTempError) Temporary() bool { return false }
-
-type fakeRoundTripper struct {
-	errs []error
-}
-
-func (f *fakeRoundTripper) RoundTrip(ctx context.Context, req, res soap.HasFault) error {
-	err := f.errs[0]
-	f.errs = f.errs[1:]
-	return err
-}
-
-func TestRetry(t *testing.T) {
-	var tcs = []struct {
-		errs     []error
-		expected error
-	}{
-		{
-			errs:     []error{nil},
-			expected: nil,
-		},
-		{
-			errs:     []error{tempError{}, nil},
-			expected: nil,
-		},
-		{
-			errs:     []error{tempError{}, tempError{}},
-			expected: tempError{},
-		},
-		{
-			errs:     []error{nonTempError{}},
-			expected: nonTempError{},
-		},
-		{
-			errs:     []error{tempError{}, nonTempError{}},
-			expected: nonTempError{},
-		},
-	}
-
-	for _, tc := range tcs {
-		var rt soap.RoundTripper
-
-		rt = &fakeRoundTripper{errs: tc.errs}
-		rt = Retry(rt, TemporaryNetworkError(2))
-
-		err := rt.RoundTrip(nil, nil, nil)
-		if err != tc.expected {
-			t.Errorf("Expected: %s, got: %s", tc.expected, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/soap/client.go b/installer/vendor/github.com/vmware/govmomi/vim25/soap/client.go
index 4c05a6c629..76592493cc 100644
--- a/installer/vendor/github.com/vmware/govmomi/vim25/soap/client.go
+++ b/installer/vendor/github.com/vmware/govmomi/vim25/soap/client.go
@@ -1,5 +1,5 @@
 /*
-Copyright (c) 2014-2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2014-2018 VMware, Inc. All Rights Reserved.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -56,6 +56,7 @@ const (
 	DefaultVimNamespace  = "urn:vim25"
 	DefaultVimVersion    = "6.5"
 	DefaultMinVimVersion = "5.5"
+	SessionCookieName    = "vmware_soap_session"
 )
 
 type header struct {
@@ -168,7 +169,7 @@ func (c *Client) NewServiceClient(path string, namespace string) *Client {
 
 	// Set SOAP Header cookie
 	for _, cookie := range client.Jar.Cookies(u) {
-		if cookie.Name == "vmware_soap_session" {
+		if cookie.Name == SessionCookieName {
 			client.cookie = cookie.Value
 			break
 		}
@@ -458,6 +459,8 @@ func (c *Client) RoundTrip(ctx context.Context, reqBody, resBody HasFault) error
 		panic(err)
 	}
 
+	req = req.WithContext(ctx)
+
 	req.Header.Set(`Content-Type`, `text/xml; charset="utf-8"`)
 	soapAction := fmt.Sprintf("%s/%s", c.Namespace, c.Version)
 	req.Header.Set(`SOAPAction`, soapAction)
@@ -548,11 +551,11 @@ var DefaultUpload = Upload{
 }
 
 // Upload PUTs the local file to the given URL
-func (c *Client) Upload(f io.Reader, u *url.URL, param *Upload) error {
+func (c *Client) Upload(ctx context.Context, f io.Reader, u *url.URL, param *Upload) error {
 	var err error
 
 	if param.Progress != nil {
-		pr := progress.NewReader(param.Progress, f, param.ContentLength)
+		pr := progress.NewReader(ctx, param.Progress, f, param.ContentLength)
 		f = pr
 
 		// Mark progress reader as done when returning from this function.
@@ -566,6 +569,8 @@ func (c *Client) Upload(f io.Reader, u *url.URL, param *Upload) error {
 		return err
 	}
 
+	req = req.WithContext(ctx)
+
 	req.ContentLength = param.ContentLength
 	req.Header.Set("Content-Type", param.Type)
 
@@ -593,7 +598,7 @@ func (c *Client) Upload(f io.Reader, u *url.URL, param *Upload) error {
 }
 
 // UploadFile PUTs the local file to the given URL
-func (c *Client) UploadFile(file string, u *url.URL, param *Upload) error {
+func (c *Client) UploadFile(ctx context.Context, file string, u *url.URL, param *Upload) error {
 	if param == nil {
 		p := DefaultUpload // Copy since we set ContentLength
 		param = &p
@@ -612,7 +617,7 @@ func (c *Client) UploadFile(file string, u *url.URL, param *Upload) error {
 
 	param.ContentLength = s.Size()
 
-	return c.Upload(f, u, param)
+	return c.Upload(ctx, f, u, param)
 }
 
 type Download struct {
@@ -628,12 +633,14 @@ var DefaultDownload = Download{
 }
 
 // DownloadRequest wraps http.Client.Do, returning the http.Response without checking its StatusCode
-func (c *Client) DownloadRequest(u *url.URL, param *Download) (*http.Response, error) {
+func (c *Client) DownloadRequest(ctx context.Context, u *url.URL, param *Download) (*http.Response, error) {
 	req, err := http.NewRequest(param.Method, u.String(), nil)
 	if err != nil {
 		return nil, err
 	}
 
+	req = req.WithContext(ctx)
+
 	for k, v := range param.Headers {
 		req.Header.Add(k, v)
 	}
@@ -646,8 +653,8 @@ func (c *Client) DownloadRequest(u *url.URL, param *Download) (*http.Response, e
 }
 
 // Download GETs the remote file from the given URL
-func (c *Client) Download(u *url.URL, param *Download) (io.ReadCloser, int64, error) {
-	res, err := c.DownloadRequest(u, param)
+func (c *Client) Download(ctx context.Context, u *url.URL, param *Download) (io.ReadCloser, int64, error) {
+	res, err := c.DownloadRequest(ctx, u, param)
 	if err != nil {
 		return nil, 0, err
 	}
@@ -667,7 +674,7 @@ func (c *Client) Download(u *url.URL, param *Download) (io.ReadCloser, int64, er
 	return r, res.ContentLength, nil
 }
 
-func (c *Client) WriteFile(file string, src io.Reader, size int64, s progress.Sinker, w io.Writer) error {
+func (c *Client) WriteFile(ctx context.Context, file string, src io.Reader, size int64, s progress.Sinker, w io.Writer) error {
 	var err error
 
 	r := src
@@ -678,7 +685,7 @@ func (c *Client) WriteFile(file string, src io.Reader, size int64, s progress.Si
 	}
 
 	if s != nil {
-		pr := progress.NewReader(s, src, size)
+		pr := progress.NewReader(ctx, s, src, size)
 		src = pr
 
 		// Mark progress reader as done when returning from this function.
@@ -705,16 +712,16 @@ func (c *Client) WriteFile(file string, src io.Reader, size int64, s progress.Si
 }
 
 // DownloadFile GETs the given URL to a local file
-func (c *Client) DownloadFile(file string, u *url.URL, param *Download) error {
+func (c *Client) DownloadFile(ctx context.Context, file string, u *url.URL, param *Download) error {
 	var err error
 	if param == nil {
 		param = &DefaultDownload
 	}
 
-	rc, contentLength, err := c.Download(u, param)
+	rc, contentLength, err := c.Download(ctx, u, param)
 	if err != nil {
 		return err
 	}
 
-	return c.WriteFile(file, rc, contentLength, param.Progress, param.Writer)
+	return c.WriteFile(ctx, file, rc, contentLength, param.Progress, param.Writer)
 }
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go
deleted file mode 100644
index 0cf4729dd8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/soap/client_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package soap
-
-import "testing"
-
-func TestSplitHostPort(t *testing.T) {
-	tests := []struct {
-		url  string
-		host string
-		port string
-	}{
-		{"127.0.0.1", "127.0.0.1", ""},
-		{"*:1234", "*", "1234"},
-		{"127.0.0.1:80", "127.0.0.1", "80"},
-		{"[::1]:6767", "[::1]", "6767"},
-		{"[::1]", "[::1]", ""},
-	}
-
-	for _, test := range tests {
-		host, port := splitHostPort(test.url)
-		if host != test.host {
-			t.Errorf("(%s) %s != %s", test.url, host, test.host)
-		}
-		if port != test.port {
-			t.Errorf("(%s) %s != %s", test.url, port, test.port)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go
deleted file mode 100644
index 44fa657bd8..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/soap/soap_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package soap
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-func TestEmptyEnvelope(t *testing.T) {
-	env := Envelope{}
-
-	b, err := xml.Marshal(env)
-	if err != nil {
-		t.Errorf("error: %s", err)
-		return
-	}
-
-	expected := `<Envelope xmlns="http://schemas.xmlsoap.org/soap/envelope/"></Envelope>`
-	actual := string(b)
-	if expected != actual {
-		t.Fatalf("expected: %s, actual: %s", expected, actual)
-	}
-}
-
-func TestNonEmptyHeader(t *testing.T) {
-	env := Envelope{
-		Header: struct {
-			Foo string
-		}{"bar"},
-	}
-
-	b, err := xml.Marshal(env)
-	if err != nil {
-		t.Errorf("error: %s", err)
-		return
-	}
-
-	env = Envelope{}
-	err = xml.Unmarshal(b, &env)
-	if err != nil {
-		t.Errorf("error: %s", err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/types/base_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/types/base_test.go
deleted file mode 100644
index ab8b1de734..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/types/base_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-func TestAnyType(t *testing.T) {
-	x := func(s string) []byte {
-		s = `<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">` + s
-		s += `</root>`
-		return []byte(s)
-	}
-
-	tests := []struct {
-		Input []byte
-		Value interface{}
-	}{
-		{
-			Input: x(`<name xsi:type="xsd:string">test</name>`),
-			Value: "test",
-		},
-		{
-			Input: x(`<name xsi:type="ArrayOfString"><string>AA</string><string>BB</string></name>`),
-			Value: ArrayOfString{String: []string{"AA", "BB"}},
-		},
-	}
-
-	for _, test := range tests {
-		var r struct {
-			A interface{} `xml:"name,typeattr"`
-		}
-
-		dec := xml.NewDecoder(bytes.NewReader(test.Input))
-		dec.TypeFunc = TypeFunc()
-
-		err := dec.Decode(&r)
-		if err != nil {
-			t.Fatalf("Decode: %s", err)
-		}
-
-		if !reflect.DeepEqual(r.A, test.Value) {
-			t.Errorf("Expected: %#v, actual: %#v", r.A, test.Value)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/types/helpers.go b/installer/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
index dd5f049fa8..7ccfd29b63 100644
--- a/installer/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
+++ b/installer/vendor/github.com/vmware/govmomi/vim25/types/helpers.go
@@ -17,6 +17,7 @@ limitations under the License.
 package types
 
 import (
+	"reflect"
 	"strings"
 	"time"
 )
@@ -86,3 +87,9 @@ func DefaultResourceConfigSpec() ResourceConfigSpec {
 		MemoryAllocation: defaultResourceAllocationInfo(),
 	}
 }
+
+func init() {
+	// Known 6.5 issue where this event type is sent even though it is internal.
+	// This workaround allows us to unmarshal and avoid NPEs.
+	t["HostSubSpecificationUpdateEvent"] = reflect.TypeOf((*HostEvent)(nil)).Elem()
+}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go
deleted file mode 100644
index 1ea675c5c4..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/types/registry_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"reflect"
-	"testing"
-)
-
-func TestTypeFunc(t *testing.T) {
-	var ok bool
-
-	fn := TypeFunc()
-
-	_, ok = fn("unknown")
-	if ok {
-		t.Errorf("Expected ok==false")
-	}
-
-	actual, ok := fn("UserProfile")
-	if !ok {
-		t.Errorf("Expected ok==true")
-	}
-
-	expected := reflect.TypeOf(UserProfile{})
-	if !reflect.DeepEqual(expected, actual) {
-		t.Errorf("Expected: %#v, actual: %#v", expected, actual)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/types/types.go b/installer/vendor/github.com/vmware/govmomi/vim25/types/types.go
index 50cad1b605..564fd18ea9 100644
--- a/installer/vendor/github.com/vmware/govmomi/vim25/types/types.go
+++ b/installer/vendor/github.com/vmware/govmomi/vim25/types/types.go
@@ -48188,7 +48188,7 @@ func init() {
 type VirtualMachineAffinityInfo struct {
 	DynamicData
 
-	AffinitySet []int32 `xml:"affinitySet,omitempty"`
+	AffinitySet []int32 `xml:"affinitySet"`
 }
 
 func init() {
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/types/types_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/types/types_test.go
deleted file mode 100644
index c89f141653..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/types/types_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-/*
-Copyright (c) 2014-2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package types
-
-import (
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/xml"
-)
-
-func TestVirtualMachineConfigSpec(t *testing.T) {
-	spec := VirtualMachineConfigSpec{
-		Name:     "vm-001",
-		GuestId:  "otherGuest",
-		Files:    &VirtualMachineFileInfo{VmPathName: "[datastore1]"},
-		NumCPUs:  1,
-		MemoryMB: 128,
-		DeviceChange: []BaseVirtualDeviceConfigSpec{
-			&VirtualDeviceConfigSpec{
-				Operation: VirtualDeviceConfigSpecOperationAdd,
-				Device: &VirtualLsiLogicController{VirtualSCSIController{
-					SharedBus: VirtualSCSISharingNoSharing,
-					VirtualController: VirtualController{
-						BusNumber: 0,
-						VirtualDevice: VirtualDevice{
-							Key: 1000,
-						},
-					},
-				}},
-			},
-			&VirtualDeviceConfigSpec{
-				Operation:     VirtualDeviceConfigSpecOperationAdd,
-				FileOperation: VirtualDeviceConfigSpecFileOperationCreate,
-				Device: &VirtualDisk{
-					VirtualDevice: VirtualDevice{
-						Key:           0,
-						ControllerKey: 1000,
-						UnitNumber:    new(int32), // zero default value
-						Backing: &VirtualDiskFlatVer2BackingInfo{
-							DiskMode:        string(VirtualDiskModePersistent),
-							ThinProvisioned: NewBool(true),
-							VirtualDeviceFileBackingInfo: VirtualDeviceFileBackingInfo{
-								FileName: "[datastore1]",
-							},
-						},
-					},
-					CapacityInKB: 4000000,
-				},
-			},
-			&VirtualDeviceConfigSpec{
-				Operation: VirtualDeviceConfigSpecOperationAdd,
-				Device: &VirtualE1000{VirtualEthernetCard{
-					VirtualDevice: VirtualDevice{
-						Key: 0,
-						DeviceInfo: &Description{
-							Label:   "Network Adapter 1",
-							Summary: "VM Network",
-						},
-						Backing: &VirtualEthernetCardNetworkBackingInfo{
-							VirtualDeviceDeviceBackingInfo: VirtualDeviceDeviceBackingInfo{
-								DeviceName: "VM Network",
-							},
-						},
-					},
-					AddressType: string(VirtualEthernetCardMacTypeGenerated),
-				}},
-			},
-		},
-		ExtraConfig: []BaseOptionValue{
-			&OptionValue{Key: "bios.bootOrder", Value: "ethernet0"},
-		},
-	}
-
-	_, err := xml.MarshalIndent(spec, "", " ")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go
deleted file mode 100644
index a71284312a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/atom_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import "time"
-
-var atomValue = &Feed{
-	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
-	Title:   "Example Feed",
-	Link:    []Link{{Href: "http://example.org/"}},
-	Updated: ParseTime("2003-12-13T18:30:02Z"),
-	Author:  Person{Name: "John Doe"},
-	Id:      "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6",
-
-	Entry: []Entry{
-		{
-			Title:   "Atom-Powered Robots Run Amok",
-			Link:    []Link{{Href: "http://example.org/2003/12/13/atom03"}},
-			Id:      "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a",
-			Updated: ParseTime("2003-12-13T18:30:02Z"),
-			Summary: NewText("Some text."),
-		},
-	},
-}
-
-var atomXml = `` +
-	`<feed xmlns="http://www.w3.org/2005/Atom" updated="2003-12-13T18:30:02Z">` +
-	`<title>Example Feed</title>` +
-	`<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>` +
-	`<link href="http://example.org/"></link>` +
-	`<author><name>John Doe</name><uri></uri><email></email></author>` +
-	`<entry>` +
-	`<title>Atom-Powered Robots Run Amok</title>` +
-	`<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>` +
-	`<link href="http://example.org/2003/12/13/atom03"></link>` +
-	`<updated>2003-12-13T18:30:02Z</updated>` +
-	`<author><name></name><uri></uri><email></email></author>` +
-	`<summary>Some text.</summary>` +
-	`</entry>` +
-	`</feed>`
-
-func ParseTime(str string) time.Time {
-	t, err := time.Parse(time.RFC3339, str)
-	if err != nil {
-		panic(err)
-	}
-	return t
-}
-
-func NewText(text string) Text {
-	return Text{
-		Body: text,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go
deleted file mode 100644
index becedd5839..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/example_test.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml_test
-
-import (
-	"encoding/xml"
-	"fmt"
-	"os"
-)
-
-func ExampleMarshalIndent() {
-	type Address struct {
-		City, State string
-	}
-	type Person struct {
-		XMLName   xml.Name `xml:"person"`
-		Id        int      `xml:"id,attr"`
-		FirstName string   `xml:"name>first"`
-		LastName  string   `xml:"name>last"`
-		Age       int      `xml:"age"`
-		Height    float32  `xml:"height,omitempty"`
-		Married   bool
-		Address
-		Comment string `xml:",comment"`
-	}
-
-	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
-	v.Comment = " Need more details. "
-	v.Address = Address{"Hanga Roa", "Easter Island"}
-
-	output, err := xml.MarshalIndent(v, "  ", "    ")
-	if err != nil {
-		fmt.Printf("error: %v\n", err)
-	}
-
-	os.Stdout.Write(output)
-	// Output:
-	//   <person id="13">
-	//       <name>
-	//           <first>John</first>
-	//           <last>Doe</last>
-	//       </name>
-	//       <age>42</age>
-	//       <Married>false</Married>
-	//       <City>Hanga Roa</City>
-	//       <State>Easter Island</State>
-	//       <!-- Need more details. -->
-	//   </person>
-}
-
-func ExampleEncoder() {
-	type Address struct {
-		City, State string
-	}
-	type Person struct {
-		XMLName   xml.Name `xml:"person"`
-		Id        int      `xml:"id,attr"`
-		FirstName string   `xml:"name>first"`
-		LastName  string   `xml:"name>last"`
-		Age       int      `xml:"age"`
-		Height    float32  `xml:"height,omitempty"`
-		Married   bool
-		Address
-		Comment string `xml:",comment"`
-	}
-
-	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
-	v.Comment = " Need more details. "
-	v.Address = Address{"Hanga Roa", "Easter Island"}
-
-	enc := xml.NewEncoder(os.Stdout)
-	enc.Indent("  ", "    ")
-	if err := enc.Encode(v); err != nil {
-		fmt.Printf("error: %v\n", err)
-	}
-
-	// Output:
-	//   <person id="13">
-	//       <name>
-	//           <first>John</first>
-	//           <last>Doe</last>
-	//       </name>
-	//       <age>42</age>
-	//       <Married>false</Married>
-	//       <City>Hanga Roa</City>
-	//       <State>Easter Island</State>
-	//       <!-- Need more details. -->
-	//   </person>
-}
-
-// This example demonstrates unmarshaling an XML excerpt into a value with
-// some preset fields. Note that the Phone field isn't modified and that
-// the XML <Company> element is ignored. Also, the Groups field is assigned
-// considering the element path provided in its tag.
-func ExampleUnmarshal() {
-	type Email struct {
-		Where string `xml:"where,attr"`
-		Addr  string
-	}
-	type Address struct {
-		City, State string
-	}
-	type Result struct {
-		XMLName xml.Name `xml:"Person"`
-		Name    string   `xml:"FullName"`
-		Phone   string
-		Email   []Email
-		Groups  []string `xml:"Group>Value"`
-		Address
-	}
-	v := Result{Name: "none", Phone: "none"}
-
-	data := `
-		<Person>
-			<FullName>Grace R. Emlin</FullName>
-			<Company>Example Inc.</Company>
-			<Email where="home">
-				<Addr>gre@example.com</Addr>
-			</Email>
-			<Email where='work'>
-				<Addr>gre@work.com</Addr>
-			</Email>
-			<Group>
-				<Value>Friends</Value>
-				<Value>Squash</Value>
-			</Group>
-			<City>Hanga Roa</City>
-			<State>Easter Island</State>
-		</Person>
-	`
-	err := xml.Unmarshal([]byte(data), &v)
-	if err != nil {
-		fmt.Printf("error: %v", err)
-		return
-	}
-	fmt.Printf("XMLName: %#v\n", v.XMLName)
-	fmt.Printf("Name: %q\n", v.Name)
-	fmt.Printf("Phone: %q\n", v.Phone)
-	fmt.Printf("Email: %v\n", v.Email)
-	fmt.Printf("Groups: %v\n", v.Groups)
-	fmt.Printf("Address: %v\n", v.Address)
-	// Output:
-	// XMLName: xml.Name{Space:"", Local:"Person"}
-	// Name: "Grace R. Emlin"
-	// Phone: "none"
-	// Email: [{home gre@example.com} {work gre@work.com}]
-	// Groups: [Friends Squash]
-	// Address: {Hanga Roa Easter Island}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go
deleted file mode 100644
index 8e200578a5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/extras_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-/*
-Copyright (c) 2014 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package xml
-
-import (
-	"bytes"
-	"reflect"
-	"testing"
-	"time"
-)
-
-type MyType struct {
-	Value string
-}
-
-var myTypes = map[string]reflect.Type{
-	"MyType":      reflect.TypeOf(MyType{}),
-	"ValueType":   reflect.TypeOf(ValueType{}),
-	"PointerType": reflect.TypeOf(PointerType{}),
-}
-
-func MyTypes(name string) (reflect.Type, bool) {
-	t, ok := myTypes[name]
-	return t, ok
-}
-
-func TestMarshalWithEmptyInterface(t *testing.T) {
-	var r1, r2 struct {
-		XMLName Name          `xml:"root"`
-		Values  []interface{} `xml:"value,typeattr"`
-	}
-
-	var tests = []struct {
-		Value interface{}
-	}{
-		{Value: bool(true)},
-		{Value: int8(-8)},
-		{Value: int16(-16)},
-		{Value: int32(-32)},
-		{Value: int64(-64)},
-		{Value: uint8(8)},
-		{Value: uint16(16)},
-		{Value: uint32(32)},
-		{Value: uint64(64)},
-		{Value: float32(32.0)},
-		{Value: float64(64.0)},
-		{Value: string("string")},
-		{Value: time.Now()},
-		{Value: ParseTime("2009-10-04T01:35:58+00:00")},
-		{Value: []byte("bytes")},
-		{Value: MyType{Value: "v"}},
-	}
-
-	for _, test := range tests {
-		r1.XMLName.Local = "root"
-		r1.Values = []interface{}{test.Value}
-		r2.XMLName = Name{}
-		r2.Values = nil
-
-		b, err := Marshal(r1)
-		if err != nil {
-			t.Fatalf("Marshal: %s", err)
-		}
-
-		dec := NewDecoder(bytes.NewReader(b))
-		dec.TypeFunc = MyTypes
-		err = dec.Decode(&r2)
-		if err != nil {
-			t.Fatalf("Unmarshal: %s", err)
-		}
-
-		switch r1.Values[0].(type) {
-		case time.Time:
-			if !r1.Values[0].(time.Time).Equal(r2.Values[0].(time.Time)) {
-				t.Errorf("Expected: %#v, actual: %#v", r1, r2)
-			}
-		default:
-			if !reflect.DeepEqual(r1, r2) {
-				t.Errorf("Expected: %#v, actual: %#v", r1, r2)
-			}
-		}
-	}
-}
-
-type VIntf interface {
-	V() string
-}
-
-type ValueType struct {
-	Value string `xml:",chardata"`
-}
-
-type PointerType struct {
-	Value string `xml:",chardata"`
-}
-
-func (t ValueType) V() string {
-	return t.Value
-}
-
-func (t *PointerType) V() string {
-	return t.Value
-}
-
-func TestMarshalWithInterface(t *testing.T) {
-	var r1, r2 struct {
-		XMLName Name    `xml:"root"`
-		Values  []VIntf `xml:"value,typeattr"`
-	}
-
-	r1.XMLName.Local = "root"
-	r1.Values = []VIntf{
-		ValueType{"v1"},
-		&PointerType{"v2"},
-	}
-
-	b, err := Marshal(r1)
-	if err != nil {
-		t.Fatalf("Marshal: %s", err)
-	}
-
-	dec := NewDecoder(bytes.NewReader(b))
-	dec.TypeFunc = MyTypes
-	err = dec.Decode(&r2)
-	if err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-
-	if !reflect.DeepEqual(r1, r2) {
-		t.Errorf("expected: %#v, actual: %#v", r1, r2)
-	}
-}
-
-type test3iface interface {
-	Value() string
-}
-
-type test3a struct {
-	V string `xml:",chardata"`
-}
-
-func (t test3a) Value() string { return t.V }
-
-type test3b struct {
-	V string `xml:",chardata"`
-}
-
-func (t test3b) Value() string { return t.V }
-
-func TestUnmarshalInterfaceWithoutTypeAttr(t *testing.T) {
-	var r struct {
-		XMLName Name         `xml:"root"`
-		Values  []test3iface `xml:"value,typeattr"`
-	}
-
-	b := `
-	<root xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<value xsi:type="test3a">A</value>
-	<value>B</value>
-	</root>
-	`
-
-	fn := func(name string) (reflect.Type, bool) {
-		switch name {
-		case "test3a":
-			return reflect.TypeOf(test3a{}), true
-		case "test3iface":
-			return reflect.TypeOf(test3b{}), true
-		default:
-			return nil, false
-		}
-	}
-
-	dec := NewDecoder(bytes.NewReader([]byte(b)))
-	dec.TypeFunc = fn
-	err := dec.Decode(&r)
-	if err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-
-	if len(r.Values) != 2 {
-		t.Errorf("Expected 2 values")
-	}
-
-	exps := []struct {
-		Typ reflect.Type
-		Val string
-	}{
-		{
-			Typ: reflect.TypeOf(test3a{}),
-			Val: "A",
-		},
-		{
-			Typ: reflect.TypeOf(test3b{}),
-			Val: "B",
-		},
-	}
-
-	for i, e := range exps {
-		if val := r.Values[i].Value(); val != e.Val {
-			t.Errorf("Expected: %s, got: %s", e.Val, val)
-		}
-
-		if typ := reflect.TypeOf(r.Values[i]); typ.Name() != e.Typ.Name() {
-			t.Errorf("Expected: %s, got: %s", e.Typ.Name(), typ.Name())
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go
deleted file mode 100644
index 14f73a75d5..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/marshal_test.go
+++ /dev/null
@@ -1,1266 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-)
-
-type DriveType int
-
-const (
-	HyperDrive DriveType = iota
-	ImprobabilityDrive
-)
-
-type Passenger struct {
-	Name   []string `xml:"name"`
-	Weight float32  `xml:"weight"`
-}
-
-type Ship struct {
-	XMLName struct{} `xml:"spaceship"`
-
-	Name      string       `xml:"name,attr"`
-	Pilot     string       `xml:"pilot,attr"`
-	Drive     DriveType    `xml:"drive"`
-	Age       uint         `xml:"age"`
-	Passenger []*Passenger `xml:"passenger"`
-	secret    string
-}
-
-type NamedType string
-
-type Port struct {
-	XMLName struct{} `xml:"port"`
-	Type    string   `xml:"type,attr,omitempty"`
-	Comment string   `xml:",comment"`
-	Number  string   `xml:",chardata"`
-}
-
-type Domain struct {
-	XMLName struct{} `xml:"domain"`
-	Country string   `xml:",attr,omitempty"`
-	Name    []byte   `xml:",chardata"`
-	Comment []byte   `xml:",comment"`
-}
-
-type Book struct {
-	XMLName struct{} `xml:"book"`
-	Title   string   `xml:",chardata"`
-}
-
-type Event struct {
-	XMLName struct{} `xml:"event"`
-	Year    int      `xml:",chardata"`
-}
-
-type Movie struct {
-	XMLName struct{} `xml:"movie"`
-	Length  uint     `xml:",chardata"`
-}
-
-type Pi struct {
-	XMLName       struct{} `xml:"pi"`
-	Approximation float32  `xml:",chardata"`
-}
-
-type Universe struct {
-	XMLName struct{} `xml:"universe"`
-	Visible float64  `xml:",chardata"`
-}
-
-type Particle struct {
-	XMLName struct{} `xml:"particle"`
-	HasMass bool     `xml:",chardata"`
-}
-
-type Departure struct {
-	XMLName struct{}  `xml:"departure"`
-	When    time.Time `xml:",chardata"`
-}
-
-type SecretAgent struct {
-	XMLName   struct{} `xml:"agent"`
-	Handle    string   `xml:"handle,attr"`
-	Identity  string
-	Obfuscate string `xml:",innerxml"`
-}
-
-type NestedItems struct {
-	XMLName struct{} `xml:"result"`
-	Items   []string `xml:">item"`
-	Item1   []string `xml:"Items>item1"`
-}
-
-type NestedOrder struct {
-	XMLName struct{} `xml:"result"`
-	Field1  string   `xml:"parent>c"`
-	Field2  string   `xml:"parent>b"`
-	Field3  string   `xml:"parent>a"`
-}
-
-type MixedNested struct {
-	XMLName struct{} `xml:"result"`
-	A       string   `xml:"parent1>a"`
-	B       string   `xml:"b"`
-	C       string   `xml:"parent1>parent2>c"`
-	D       string   `xml:"parent1>d"`
-}
-
-type NilTest struct {
-	A interface{} `xml:"parent1>parent2>a"`
-	B interface{} `xml:"parent1>b"`
-	C interface{} `xml:"parent1>parent2>c"`
-}
-
-type Service struct {
-	XMLName struct{} `xml:"service"`
-	Domain  *Domain  `xml:"host>domain"`
-	Port    *Port    `xml:"host>port"`
-	Extra1  interface{}
-	Extra2  interface{} `xml:"host>extra2"`
-}
-
-var nilStruct *Ship
-
-type EmbedA struct {
-	EmbedC
-	EmbedB EmbedB
-	FieldA string
-}
-
-type EmbedB struct {
-	FieldB string
-	*EmbedC
-}
-
-type EmbedC struct {
-	FieldA1 string `xml:"FieldA>A1"`
-	FieldA2 string `xml:"FieldA>A2"`
-	FieldB  string
-	FieldC  string
-}
-
-type NameCasing struct {
-	XMLName struct{} `xml:"casing"`
-	Xy      string
-	XY      string
-	XyA     string `xml:"Xy,attr"`
-	XYA     string `xml:"XY,attr"`
-}
-
-type NamePrecedence struct {
-	XMLName     Name              `xml:"Parent"`
-	FromTag     XMLNameWithoutTag `xml:"InTag"`
-	FromNameVal XMLNameWithoutTag
-	FromNameTag XMLNameWithTag
-	InFieldName string
-}
-
-type XMLNameWithTag struct {
-	XMLName Name   `xml:"InXMLNameTag"`
-	Value   string `xml:",chardata"`
-}
-
-type XMLNameWithoutTag struct {
-	XMLName Name
-	Value   string `xml:",chardata"`
-}
-
-type NameInField struct {
-	Foo Name `xml:"ns foo"`
-}
-
-type AttrTest struct {
-	Int   int     `xml:",attr"`
-	Named int     `xml:"int,attr"`
-	Float float64 `xml:",attr"`
-	Uint8 uint8   `xml:",attr"`
-	Bool  bool    `xml:",attr"`
-	Str   string  `xml:",attr"`
-	Bytes []byte  `xml:",attr"`
-}
-
-type OmitAttrTest struct {
-	Int   int     `xml:",attr,omitempty"`
-	Named int     `xml:"int,attr,omitempty"`
-	Float float64 `xml:",attr,omitempty"`
-	Uint8 uint8   `xml:",attr,omitempty"`
-	Bool  bool    `xml:",attr,omitempty"`
-	Str   string  `xml:",attr,omitempty"`
-	Bytes []byte  `xml:",attr,omitempty"`
-}
-
-type OmitFieldTest struct {
-	Int   int           `xml:",omitempty"`
-	Named int           `xml:"int,omitempty"`
-	Float float64       `xml:",omitempty"`
-	Uint8 uint8         `xml:",omitempty"`
-	Bool  bool          `xml:",omitempty"`
-	Str   string        `xml:",omitempty"`
-	Bytes []byte        `xml:",omitempty"`
-	Ptr   *PresenceTest `xml:",omitempty"`
-}
-
-type AnyTest struct {
-	XMLName  struct{}  `xml:"a"`
-	Nested   string    `xml:"nested>value"`
-	AnyField AnyHolder `xml:",any"`
-}
-
-type AnyOmitTest struct {
-	XMLName  struct{}   `xml:"a"`
-	Nested   string     `xml:"nested>value"`
-	AnyField *AnyHolder `xml:",any,omitempty"`
-}
-
-type AnySliceTest struct {
-	XMLName  struct{}    `xml:"a"`
-	Nested   string      `xml:"nested>value"`
-	AnyField []AnyHolder `xml:",any"`
-}
-
-type AnyHolder struct {
-	XMLName Name
-	XML     string `xml:",innerxml"`
-}
-
-type RecurseA struct {
-	A string
-	B *RecurseB
-}
-
-type RecurseB struct {
-	A *RecurseA
-	B string
-}
-
-type PresenceTest struct {
-	Exists *struct{}
-}
-
-type IgnoreTest struct {
-	PublicSecret string `xml:"-"`
-}
-
-type MyBytes []byte
-
-type Data struct {
-	Bytes  []byte
-	Attr   []byte `xml:",attr"`
-	Custom MyBytes
-}
-
-type Plain struct {
-	V interface{}
-}
-
-type MyInt int
-
-type EmbedInt struct {
-	MyInt
-}
-
-type Strings struct {
-	X []string `xml:"A>B,omitempty"`
-}
-
-type PointerFieldsTest struct {
-	XMLName  Name    `xml:"dummy"`
-	Name     *string `xml:"name,attr"`
-	Age      *uint   `xml:"age,attr"`
-	Empty    *string `xml:"empty,attr"`
-	Contents *string `xml:",chardata"`
-}
-
-type ChardataEmptyTest struct {
-	XMLName  Name    `xml:"test"`
-	Contents *string `xml:",chardata"`
-}
-
-type MyMarshalerTest struct {
-}
-
-var _ Marshaler = (*MyMarshalerTest)(nil)
-
-func (m *MyMarshalerTest) MarshalXML(e *Encoder, start StartElement) error {
-	e.EncodeToken(start)
-	e.EncodeToken(CharData([]byte("hello world")))
-	e.EncodeToken(EndElement{start.Name})
-	return nil
-}
-
-type MyMarshalerAttrTest struct {
-}
-
-var _ MarshalerAttr = (*MyMarshalerAttrTest)(nil)
-
-func (m *MyMarshalerAttrTest) MarshalXMLAttr(name Name) (Attr, error) {
-	return Attr{name, "hello world"}, nil
-}
-
-type MarshalerStruct struct {
-	Foo MyMarshalerAttrTest `xml:",attr"`
-}
-
-type InnerStruct struct {
-	XMLName Name `xml:"testns outer"`
-}
-
-type OuterStruct struct {
-	InnerStruct
-	IntAttr int `xml:"int,attr"`
-}
-
-type OuterNamedStruct struct {
-	InnerStruct
-	XMLName Name `xml:"outerns test"`
-	IntAttr int  `xml:"int,attr"`
-}
-
-type OuterNamedOrderedStruct struct {
-	XMLName Name `xml:"outerns test"`
-	InnerStruct
-	IntAttr int `xml:"int,attr"`
-}
-
-type OuterOuterStruct struct {
-	OuterStruct
-}
-
-func ifaceptr(x interface{}) interface{} {
-	return &x
-}
-
-var (
-	nameAttr     = "Sarah"
-	ageAttr      = uint(12)
-	contentsAttr = "lorem ipsum"
-)
-
-// Unless explicitly stated as such (or *Plain), all of the
-// tests below are two-way tests. When introducing new tests,
-// please try to make them two-way as well to ensure that
-// marshalling and unmarshalling are as symmetrical as feasible.
-var marshalTests = []struct {
-	Value         interface{}
-	ExpectXML     string
-	MarshalOnly   bool
-	UnmarshalOnly bool
-}{
-	// Test nil marshals to nothing
-	{Value: nil, ExpectXML: ``, MarshalOnly: true},
-	{Value: nilStruct, ExpectXML: ``, MarshalOnly: true},
-
-	// Test value types
-	{Value: &Plain{true}, ExpectXML: `<Plain><V>true</V></Plain>`},
-	{Value: &Plain{false}, ExpectXML: `<Plain><V>false</V></Plain>`},
-	{Value: &Plain{int(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{float32(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
-	{Value: &Plain{float64(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
-	{Value: &Plain{uintptr(0xFFDD)}, ExpectXML: `<Plain><V>65501</V></Plain>`},
-	{Value: &Plain{"gopher"}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
-	{Value: &Plain{[]byte("gopher")}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
-	{Value: &Plain{"</>"}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{[]byte("</>")}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{[3]byte{'<', '/', '>'}}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{NamedType("potato")}, ExpectXML: `<Plain><V>potato</V></Plain>`},
-	{Value: &Plain{[]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
-	{Value: &Plain{[3]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
-	{Value: ifaceptr(true), MarshalOnly: true, ExpectXML: `<bool>true</bool>`},
-
-	// Test time.
-	{
-		Value:     &Plain{time.Unix(1e9, 123456789).UTC()},
-		ExpectXML: `<Plain><V>2001-09-09T01:46:40.123456789Z</V></Plain>`,
-	},
-
-	// A pointer to struct{} may be used to test for an element's presence.
-	{
-		Value:     &PresenceTest{new(struct{})},
-		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
-	},
-	{
-		Value:     &PresenceTest{},
-		ExpectXML: `<PresenceTest></PresenceTest>`,
-	},
-
-	// A pointer to struct{} may be used to test for an element's presence.
-	{
-		Value:     &PresenceTest{new(struct{})},
-		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
-	},
-	{
-		Value:     &PresenceTest{},
-		ExpectXML: `<PresenceTest></PresenceTest>`,
-	},
-
-	// A []byte field is only nil if the element was not found.
-	{
-		Value:         &Data{},
-		ExpectXML:     `<Data></Data>`,
-		UnmarshalOnly: true,
-	},
-	{
-		Value:         &Data{Bytes: []byte{}, Custom: MyBytes{}, Attr: []byte{}},
-		ExpectXML:     `<Data Attr=""><Bytes></Bytes><Custom></Custom></Data>`,
-		UnmarshalOnly: true,
-	},
-
-	// Check that []byte works, including named []byte types.
-	{
-		Value:     &Data{Bytes: []byte("ab"), Custom: MyBytes("cd"), Attr: []byte{'v'}},
-		ExpectXML: `<Data Attr="v"><Bytes>ab</Bytes><Custom>cd</Custom></Data>`,
-	},
-
-	// Test innerxml
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<redacted/>",
-		},
-		ExpectXML:   `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<Identity>James Bond</Identity><redacted/>",
-		},
-		ExpectXML:     `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
-		UnmarshalOnly: true,
-	},
-
-	// Test structs
-	{Value: &Port{Type: "ssl", Number: "443"}, ExpectXML: `<port type="ssl">443</port>`},
-	{Value: &Port{Number: "443"}, ExpectXML: `<port>443</port>`},
-	{Value: &Port{Type: "<unix>"}, ExpectXML: `<port type="&lt;unix&gt;"></port>`},
-	{Value: &Port{Number: "443", Comment: "https"}, ExpectXML: `<port><!--https-->443</port>`},
-	{Value: &Port{Number: "443", Comment: "add space-"}, ExpectXML: `<port><!--add space- -->443</port>`, MarshalOnly: true},
-	{Value: &Domain{Name: []byte("google.com&friends")}, ExpectXML: `<domain>google.com&amp;friends</domain>`},
-	{Value: &Domain{Name: []byte("google.com"), Comment: []byte(" &friends ")}, ExpectXML: `<domain>google.com<!-- &friends --></domain>`},
-	{Value: &Book{Title: "Pride & Prejudice"}, ExpectXML: `<book>Pride &amp; Prejudice</book>`},
-	{Value: &Event{Year: -3114}, ExpectXML: `<event>-3114</event>`},
-	{Value: &Movie{Length: 13440}, ExpectXML: `<movie>13440</movie>`},
-	{Value: &Pi{Approximation: 3.14159265}, ExpectXML: `<pi>3.1415927</pi>`},
-	{Value: &Universe{Visible: 9.3e13}, ExpectXML: `<universe>9.3e+13</universe>`},
-	{Value: &Particle{HasMass: true}, ExpectXML: `<particle>true</particle>`},
-	{Value: &Departure{When: ParseTime("2013-01-09T00:15:00-09:00")}, ExpectXML: `<departure>2013-01-09T00:15:00-09:00</departure>`},
-	{Value: atomValue, ExpectXML: atomXml},
-	{
-		Value: &Ship{
-			Name:  "Heart of Gold",
-			Pilot: "Computer",
-			Age:   1,
-			Drive: ImprobabilityDrive,
-			Passenger: []*Passenger{
-				{
-					Name:   []string{"Zaphod", "Beeblebrox"},
-					Weight: 7.25,
-				},
-				{
-					Name:   []string{"Trisha", "McMillen"},
-					Weight: 5.5,
-				},
-				{
-					Name:   []string{"Ford", "Prefect"},
-					Weight: 7,
-				},
-				{
-					Name:   []string{"Arthur", "Dent"},
-					Weight: 6.75,
-				},
-			},
-		},
-		ExpectXML: `<spaceship name="Heart of Gold" pilot="Computer">` +
-			`<drive>` + strconv.Itoa(int(ImprobabilityDrive)) + `</drive>` +
-			`<age>1</age>` +
-			`<passenger>` +
-			`<name>Zaphod</name>` +
-			`<name>Beeblebrox</name>` +
-			`<weight>7.25</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Trisha</name>` +
-			`<name>McMillen</name>` +
-			`<weight>5.5</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Ford</name>` +
-			`<name>Prefect</name>` +
-			`<weight>7</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Arthur</name>` +
-			`<name>Dent</name>` +
-			`<weight>6.75</weight>` +
-			`</passenger>` +
-			`</spaceship>`,
-	},
-
-	// Test a>b
-	{
-		Value: &NestedItems{Items: nil, Item1: nil},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{}, Item1: []string{}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`</Items>` +
-			`</result>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &NestedItems{Items: nil, Item1: []string{"A"}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item1>A</item1>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{"A", "B"}, Item1: nil},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item>A</item>` +
-			`<item>B</item>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{"A", "B"}, Item1: []string{"C"}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item>A</item>` +
-			`<item>B</item>` +
-			`<item1>C</item1>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedOrder{Field1: "C", Field2: "B", Field3: "A"},
-		ExpectXML: `<result>` +
-			`<parent>` +
-			`<c>C</c>` +
-			`<b>B</b>` +
-			`<a>A</a>` +
-			`</parent>` +
-			`</result>`,
-	},
-	{
-		Value: &NilTest{A: "A", B: nil, C: "C"},
-		ExpectXML: `<NilTest>` +
-			`<parent1>` +
-			`<parent2><a>A</a></parent2>` +
-			`<parent2><c>C</c></parent2>` +
-			`</parent1>` +
-			`</NilTest>`,
-		MarshalOnly: true, // Uses interface{}
-	},
-	{
-		Value: &MixedNested{A: "A", B: "B", C: "C", D: "D"},
-		ExpectXML: `<result>` +
-			`<parent1><a>A</a></parent1>` +
-			`<b>B</b>` +
-			`<parent1>` +
-			`<parent2><c>C</c></parent2>` +
-			`<d>D</d>` +
-			`</parent1>` +
-			`</result>`,
-	},
-	{
-		Value:     &Service{Port: &Port{Number: "80"}},
-		ExpectXML: `<service><host><port>80</port></host></service>`,
-	},
-	{
-		Value:     &Service{},
-		ExpectXML: `<service></service>`,
-	},
-	{
-		Value: &Service{Port: &Port{Number: "80"}, Extra1: "A", Extra2: "B"},
-		ExpectXML: `<service>` +
-			`<host><port>80</port></host>` +
-			`<Extra1>A</Extra1>` +
-			`<host><extra2>B</extra2></host>` +
-			`</service>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &Service{Port: &Port{Number: "80"}, Extra2: "example"},
-		ExpectXML: `<service>` +
-			`<host><port>80</port></host>` +
-			`<host><extra2>example</extra2></host>` +
-			`</service>`,
-		MarshalOnly: true,
-	},
-
-	// Test struct embedding
-	{
-		Value: &EmbedA{
-			EmbedC: EmbedC{
-				FieldA1: "", // Shadowed by A.A
-				FieldA2: "", // Shadowed by A.A
-				FieldB:  "A.C.B",
-				FieldC:  "A.C.C",
-			},
-			EmbedB: EmbedB{
-				FieldB: "A.B.B",
-				EmbedC: &EmbedC{
-					FieldA1: "A.B.C.A1",
-					FieldA2: "A.B.C.A2",
-					FieldB:  "", // Shadowed by A.B.B
-					FieldC:  "A.B.C.C",
-				},
-			},
-			FieldA: "A.A",
-		},
-		ExpectXML: `<EmbedA>` +
-			`<FieldB>A.C.B</FieldB>` +
-			`<FieldC>A.C.C</FieldC>` +
-			`<EmbedB>` +
-			`<FieldB>A.B.B</FieldB>` +
-			`<FieldA>` +
-			`<A1>A.B.C.A1</A1>` +
-			`<A2>A.B.C.A2</A2>` +
-			`</FieldA>` +
-			`<FieldC>A.B.C.C</FieldC>` +
-			`</EmbedB>` +
-			`<FieldA>A.A</FieldA>` +
-			`</EmbedA>`,
-	},
-
-	// Test that name casing matters
-	{
-		Value:     &NameCasing{Xy: "mixed", XY: "upper", XyA: "mixedA", XYA: "upperA"},
-		ExpectXML: `<casing Xy="mixedA" XY="upperA"><Xy>mixed</Xy><XY>upper</XY></casing>`,
-	},
-
-	// Test the order in which the XML element name is chosen
-	{
-		Value: &NamePrecedence{
-			FromTag:     XMLNameWithoutTag{Value: "A"},
-			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "InXMLName"}, Value: "B"},
-			FromNameTag: XMLNameWithTag{Value: "C"},
-			InFieldName: "D",
-		},
-		ExpectXML: `<Parent>` +
-			`<InTag>A</InTag>` +
-			`<InXMLName>B</InXMLName>` +
-			`<InXMLNameTag>C</InXMLNameTag>` +
-			`<InFieldName>D</InFieldName>` +
-			`</Parent>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &NamePrecedence{
-			XMLName:     Name{Local: "Parent"},
-			FromTag:     XMLNameWithoutTag{XMLName: Name{Local: "InTag"}, Value: "A"},
-			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "FromNameVal"}, Value: "B"},
-			FromNameTag: XMLNameWithTag{XMLName: Name{Local: "InXMLNameTag"}, Value: "C"},
-			InFieldName: "D",
-		},
-		ExpectXML: `<Parent>` +
-			`<InTag>A</InTag>` +
-			`<FromNameVal>B</FromNameVal>` +
-			`<InXMLNameTag>C</InXMLNameTag>` +
-			`<InFieldName>D</InFieldName>` +
-			`</Parent>`,
-		UnmarshalOnly: true,
-	},
-
-	// xml.Name works in a plain field as well.
-	{
-		Value:     &NameInField{Name{Space: "ns", Local: "foo"}},
-		ExpectXML: `<NameInField><foo xmlns="ns"></foo></NameInField>`,
-	},
-	{
-		Value:         &NameInField{Name{Space: "ns", Local: "foo"}},
-		ExpectXML:     `<NameInField><foo xmlns="ns"><ignore></ignore></foo></NameInField>`,
-		UnmarshalOnly: true,
-	},
-
-	// Marshaling zero xml.Name uses the tag or field name.
-	{
-		Value:       &NameInField{},
-		ExpectXML:   `<NameInField><foo xmlns="ns"></foo></NameInField>`,
-		MarshalOnly: true,
-	},
-
-	// Test attributes
-	{
-		Value: &AttrTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-		},
-		ExpectXML: `<AttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
-			` Bool="true" Str="str" Bytes="byt"></AttrTest>`,
-	},
-	{
-		Value: &AttrTest{Bytes: []byte{}},
-		ExpectXML: `<AttrTest Int="0" int="0" Float="0" Uint8="0"` +
-			` Bool="false" Str="" Bytes=""></AttrTest>`,
-	},
-	{
-		Value: &OmitAttrTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-		},
-		ExpectXML: `<OmitAttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
-			` Bool="true" Str="str" Bytes="byt"></OmitAttrTest>`,
-	},
-	{
-		Value:     &OmitAttrTest{},
-		ExpectXML: `<OmitAttrTest></OmitAttrTest>`,
-	},
-
-	// pointer fields
-	{
-		Value:       &PointerFieldsTest{Name: &nameAttr, Age: &ageAttr, Contents: &contentsAttr},
-		ExpectXML:   `<dummy name="Sarah" age="12">lorem ipsum</dummy>`,
-		MarshalOnly: true,
-	},
-
-	// empty chardata pointer field
-	{
-		Value:       &ChardataEmptyTest{},
-		ExpectXML:   `<test></test>`,
-		MarshalOnly: true,
-	},
-
-	// omitempty on fields
-	{
-		Value: &OmitFieldTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-			Ptr:   &PresenceTest{},
-		},
-		ExpectXML: `<OmitFieldTest>` +
-			`<Int>8</Int>` +
-			`<int>9</int>` +
-			`<Float>23.5</Float>` +
-			`<Uint8>255</Uint8>` +
-			`<Bool>true</Bool>` +
-			`<Str>str</Str>` +
-			`<Bytes>byt</Bytes>` +
-			`<Ptr></Ptr>` +
-			`</OmitFieldTest>`,
-	},
-	{
-		Value:     &OmitFieldTest{},
-		ExpectXML: `<OmitFieldTest></OmitFieldTest>`,
-	},
-
-	// Test ",any"
-	{
-		ExpectXML: `<a><nested><value>known</value></nested><other><sub>unknown</sub></other></a>`,
-		Value: &AnyTest{
-			Nested: "known",
-			AnyField: AnyHolder{
-				XMLName: Name{Local: "other"},
-				XML:     "<sub>unknown</sub>",
-			},
-		},
-	},
-	{
-		Value: &AnyTest{Nested: "known",
-			AnyField: AnyHolder{
-				XML:     "<unknown/>",
-				XMLName: Name{Local: "AnyField"},
-			},
-		},
-		ExpectXML: `<a><nested><value>known</value></nested><AnyField><unknown/></AnyField></a>`,
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested></a>`,
-		Value: &AnyOmitTest{
-			Nested: "b",
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested><c><d>e</d></c><g xmlns="f"><h>i</h></g></a>`,
-		Value: &AnySliceTest{
-			Nested: "b",
-			AnyField: []AnyHolder{
-				{
-					XMLName: Name{Local: "c"},
-					XML:     "<d>e</d>",
-				},
-				{
-					XMLName: Name{Space: "f", Local: "g"},
-					XML:     "<h>i</h>",
-				},
-			},
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested></a>`,
-		Value: &AnySliceTest{
-			Nested: "b",
-		},
-	},
-
-	// Test recursive types.
-	{
-		Value: &RecurseA{
-			A: "a1",
-			B: &RecurseB{
-				A: &RecurseA{"a2", nil},
-				B: "b1",
-			},
-		},
-		ExpectXML: `<RecurseA><A>a1</A><B><A><A>a2</A></A><B>b1</B></B></RecurseA>`,
-	},
-
-	// Test ignoring fields via "-" tag
-	{
-		ExpectXML: `<IgnoreTest></IgnoreTest>`,
-		Value:     &IgnoreTest{},
-	},
-	{
-		ExpectXML:   `<IgnoreTest></IgnoreTest>`,
-		Value:       &IgnoreTest{PublicSecret: "can't tell"},
-		MarshalOnly: true,
-	},
-	{
-		ExpectXML:     `<IgnoreTest><PublicSecret>ignore me</PublicSecret></IgnoreTest>`,
-		Value:         &IgnoreTest{},
-		UnmarshalOnly: true,
-	},
-
-	// Test escaping.
-	{
-		ExpectXML: `<a><nested><value>dquote: &#34;; squote: &#39;; ampersand: &amp;; less: &lt;; greater: &gt;;</value></nested><empty></empty></a>`,
-		Value: &AnyTest{
-			Nested:   `dquote: "; squote: '; ampersand: &; less: <; greater: >;`,
-			AnyField: AnyHolder{XMLName: Name{Local: "empty"}},
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>newline: &#xA;; cr: &#xD;; tab: &#x9;;</value></nested><AnyField></AnyField></a>`,
-		Value: &AnyTest{
-			Nested:   "newline: \n; cr: \r; tab: \t;",
-			AnyField: AnyHolder{XMLName: Name{Local: "AnyField"}},
-		},
-	},
-	{
-		ExpectXML: "<a><nested><value>1\r2\r\n3\n\r4\n5</value></nested></a>",
-		Value: &AnyTest{
-			Nested: "1\n2\n3\n\n4\n5",
-		},
-		UnmarshalOnly: true,
-	},
-	{
-		ExpectXML: `<EmbedInt><MyInt>42</MyInt></EmbedInt>`,
-		Value: &EmbedInt{
-			MyInt: 42,
-		},
-	},
-	// Test omitempty with parent chain; see golang.org/issue/4168.
-	{
-		ExpectXML: `<Strings><A></A></Strings>`,
-		Value:     &Strings{},
-	},
-	// Custom marshalers.
-	{
-		ExpectXML: `<MyMarshalerTest>hello world</MyMarshalerTest>`,
-		Value:     &MyMarshalerTest{},
-	},
-	{
-		ExpectXML: `<MarshalerStruct Foo="hello world"></MarshalerStruct>`,
-		Value:     &MarshalerStruct{},
-	},
-	{
-		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
-		Value:     &OuterStruct{IntAttr: 10},
-	},
-	{
-		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
-		Value:     &OuterNamedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
-	},
-	{
-		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
-		Value:     &OuterNamedOrderedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
-	},
-	{
-		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
-		Value:     &OuterOuterStruct{OuterStruct{IntAttr: 10}},
-	},
-}
-
-func TestMarshal(t *testing.T) {
-	for idx, test := range marshalTests {
-		if test.UnmarshalOnly {
-			continue
-		}
-		data, err := Marshal(test.Value)
-		if err != nil {
-			t.Errorf("#%d: Error: %s", idx, err)
-			continue
-		}
-		if got, want := string(data), test.ExpectXML; got != want {
-			if strings.Contains(want, "\n") {
-				t.Errorf("#%d: marshal(%#v):\nHAVE:\n%s\nWANT:\n%s", idx, test.Value, got, want)
-			} else {
-				t.Errorf("#%d: marshal(%#v):\nhave %#q\nwant %#q", idx, test.Value, got, want)
-			}
-		}
-	}
-}
-
-type AttrParent struct {
-	X string `xml:"X>Y,attr"`
-}
-
-type BadAttr struct {
-	Name []string `xml:"name,attr"`
-}
-
-var marshalErrorTests = []struct {
-	Value interface{}
-	Err   string
-	Kind  reflect.Kind
-}{
-	{
-		Value: make(chan bool),
-		Err:   "xml: unsupported type: chan bool",
-		Kind:  reflect.Chan,
-	},
-	{
-		Value: map[string]string{
-			"question": "What do you get when you multiply six by nine?",
-			"answer":   "42",
-		},
-		Err:  "xml: unsupported type: map[string]string",
-		Kind: reflect.Map,
-	},
-	{
-		Value: map[*Ship]bool{nil: false},
-		Err:   "xml: unsupported type: map[*xml.Ship]bool",
-		Kind:  reflect.Map,
-	},
-	{
-		Value: &Domain{Comment: []byte("f--bar")},
-		Err:   `xml: comments must not contain "--"`,
-	},
-	// Reject parent chain with attr, never worked; see golang.org/issue/5033.
-	{
-		Value: &AttrParent{},
-		Err:   `xml: X>Y chain not valid with attr flag`,
-	},
-	{
-		Value: BadAttr{[]string{"X", "Y"}},
-		Err:   `xml: unsupported type: []string`,
-	},
-}
-
-var marshalIndentTests = []struct {
-	Value     interface{}
-	Prefix    string
-	Indent    string
-	ExpectXML string
-}{
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<redacted/>",
-		},
-		Prefix:    "",
-		Indent:    "\t",
-		ExpectXML: fmt.Sprintf("<agent handle=\"007\">\n\t<Identity>James Bond</Identity><redacted/>\n</agent>"),
-	},
-}
-
-func TestMarshalErrors(t *testing.T) {
-	for idx, test := range marshalErrorTests {
-		data, err := Marshal(test.Value)
-		if err == nil {
-			t.Errorf("#%d: marshal(%#v) = [success] %q, want error %v", idx, test.Value, data, test.Err)
-			continue
-		}
-		if err.Error() != test.Err {
-			t.Errorf("#%d: marshal(%#v) = [error] %v, want %v", idx, test.Value, err, test.Err)
-		}
-		if test.Kind != reflect.Invalid {
-			if kind := err.(*UnsupportedTypeError).Type.Kind(); kind != test.Kind {
-				t.Errorf("#%d: marshal(%#v) = [error kind] %s, want %s", idx, test.Value, kind, test.Kind)
-			}
-		}
-	}
-}
-
-// Do invertibility testing on the various structures that we test
-func TestUnmarshal(t *testing.T) {
-	for i, test := range marshalTests {
-		if test.MarshalOnly {
-			continue
-		}
-		if _, ok := test.Value.(*Plain); ok {
-			continue
-		}
-
-		vt := reflect.TypeOf(test.Value)
-		dest := reflect.New(vt.Elem()).Interface()
-		err := Unmarshal([]byte(test.ExpectXML), dest)
-
-		switch fix := dest.(type) {
-		case *Feed:
-			fix.Author.InnerXML = ""
-			for i := range fix.Entry {
-				fix.Entry[i].Author.InnerXML = ""
-			}
-		}
-
-		if err != nil {
-			t.Errorf("#%d: unexpected error: %#v", i, err)
-		} else if got, want := dest, test.Value; !reflect.DeepEqual(got, want) {
-			t.Errorf("#%d: unmarshal(%q):\nhave %#v\nwant %#v", i, test.ExpectXML, got, want)
-		}
-	}
-}
-
-func TestMarshalIndent(t *testing.T) {
-	for i, test := range marshalIndentTests {
-		data, err := MarshalIndent(test.Value, test.Prefix, test.Indent)
-		if err != nil {
-			t.Errorf("#%d: Error: %s", i, err)
-			continue
-		}
-		if got, want := string(data), test.ExpectXML; got != want {
-			t.Errorf("#%d: MarshalIndent:\nGot:%s\nWant:\n%s", i, got, want)
-		}
-	}
-}
-
-type limitedBytesWriter struct {
-	w      io.Writer
-	remain int // until writes fail
-}
-
-func (lw *limitedBytesWriter) Write(p []byte) (n int, err error) {
-	if lw.remain <= 0 {
-		println("error")
-		return 0, errors.New("write limit hit")
-	}
-	if len(p) > lw.remain {
-		p = p[:lw.remain]
-		n, _ = lw.w.Write(p)
-		lw.remain = 0
-		return n, errors.New("write limit hit")
-	}
-	n, err = lw.w.Write(p)
-	lw.remain -= n
-	return n, err
-}
-
-func TestMarshalWriteErrors(t *testing.T) {
-	var buf bytes.Buffer
-	const writeCap = 1024
-	w := &limitedBytesWriter{&buf, writeCap}
-	enc := NewEncoder(w)
-	var err error
-	var i int
-	const n = 4000
-	for i = 1; i <= n; i++ {
-		err = enc.Encode(&Passenger{
-			Name:   []string{"Alice", "Bob"},
-			Weight: 5,
-		})
-		if err != nil {
-			break
-		}
-	}
-	if err == nil {
-		t.Error("expected an error")
-	}
-	if i == n {
-		t.Errorf("expected to fail before the end")
-	}
-	if buf.Len() != writeCap {
-		t.Errorf("buf.Len() = %d; want %d", buf.Len(), writeCap)
-	}
-}
-
-func TestMarshalWriteIOErrors(t *testing.T) {
-	enc := NewEncoder(errWriter{})
-
-	expectErr := "unwritable"
-	err := enc.Encode(&Passenger{})
-	if err == nil || err.Error() != expectErr {
-		t.Errorf("EscapeTest = [error] %v, want %v", err, expectErr)
-	}
-}
-
-func TestMarshalFlush(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	if err := enc.EncodeToken(CharData("hello world")); err != nil {
-		t.Fatalf("enc.EncodeToken: %v", err)
-	}
-	if buf.Len() > 0 {
-		t.Fatalf("enc.EncodeToken caused actual write: %q", buf.Bytes())
-	}
-	if err := enc.Flush(); err != nil {
-		t.Fatalf("enc.Flush: %v", err)
-	}
-	if buf.String() != "hello world" {
-		t.Fatalf("after enc.Flush, buf.String() = %q, want %q", buf.String(), "hello world")
-	}
-}
-
-func BenchmarkMarshal(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Marshal(atomValue)
-	}
-}
-
-func BenchmarkUnmarshal(b *testing.B) {
-	xml := []byte(atomXml)
-	for i := 0; i < b.N; i++ {
-		Unmarshal(xml, &Feed{})
-	}
-}
-
-// golang.org/issue/6556
-func TestStructPointerMarshal(t *testing.T) {
-	type A struct {
-		XMLName string `xml:"a"`
-		B       []interface{}
-	}
-	type C struct {
-		XMLName Name
-		Value   string `xml:"value"`
-	}
-
-	a := new(A)
-	a.B = append(a.B, &C{
-		XMLName: Name{Local: "c"},
-		Value:   "x",
-	})
-
-	b, err := Marshal(a)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if x := string(b); x != "<a><c><value>x</value></c></a>" {
-		t.Fatal(x)
-	}
-	var v A
-	err = Unmarshal(b, &v)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-var encodeTokenTests = []struct {
-	tok  Token
-	want string
-	ok   bool
-}{
-	{StartElement{Name{"space", "local"}, nil}, "<local xmlns=\"space\">", true},
-	{StartElement{Name{"space", ""}, nil}, "", false},
-	{EndElement{Name{"space", ""}}, "", false},
-	{CharData("foo"), "foo", true},
-	{Comment("foo"), "<!--foo-->", true},
-	{Comment("foo-->"), "", false},
-	{ProcInst{"Target", []byte("Instruction")}, "<?Target Instruction?>", true},
-	{ProcInst{"", []byte("Instruction")}, "", false},
-	{ProcInst{"Target", []byte("Instruction?>")}, "", false},
-	{Directive("foo"), "<!foo>", true},
-	{Directive("foo>"), "", false},
-}
-
-func TestEncodeToken(t *testing.T) {
-	for _, tt := range encodeTokenTests {
-		var buf bytes.Buffer
-		enc := NewEncoder(&buf)
-		err := enc.EncodeToken(tt.tok)
-		switch {
-		case !tt.ok && err == nil:
-			t.Errorf("enc.EncodeToken(%#v): expected error; got none", tt.tok)
-		case tt.ok && err != nil:
-			t.Fatalf("enc.EncodeToken: %v", err)
-		case !tt.ok && err != nil:
-			// expected error, got one
-		}
-		if err := enc.Flush(); err != nil {
-			t.Fatalf("enc.EncodeToken: %v", err)
-		}
-		if got := buf.String(); got != tt.want {
-			t.Errorf("enc.EncodeToken = %s; want: %s", got, tt.want)
-		}
-	}
-}
-
-func TestProcInstEncodeToken(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-
-	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err != nil {
-		t.Fatalf("enc.EncodeToken: expected to be able to encode xml target ProcInst as first token, %s", err)
-	}
-
-	if err := enc.EncodeToken(ProcInst{"Target", []byte("Instruction")}); err != nil {
-		t.Fatalf("enc.EncodeToken: expected to be able to add non-xml target ProcInst")
-	}
-
-	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err == nil {
-		t.Fatalf("enc.EncodeToken: expected to not be allowed to encode xml target ProcInst when not first token")
-	}
-}
-
-func TestDecodeEncode(t *testing.T) {
-	var in, out bytes.Buffer
-	in.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
-<?Target Instruction?>
-<root>
-</root>	
-`)
-	dec := NewDecoder(&in)
-	enc := NewEncoder(&out)
-	for tok, err := dec.Token(); err == nil; tok, err = dec.Token() {
-		err = enc.EncodeToken(tok)
-		if err != nil {
-			t.Fatalf("enc.EncodeToken: Unable to encode token (%#v), %v", tok, err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go
deleted file mode 100644
index 77f43023ec..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/read_test.go
+++ /dev/null
@@ -1,762 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-// Stripped down Atom feed data structures.
-
-func TestUnmarshalFeed(t *testing.T) {
-	var f Feed
-	if err := Unmarshal([]byte(atomFeedString), &f); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if !reflect.DeepEqual(f, atomFeed) {
-		t.Fatalf("have %#v\nwant %#v", f, atomFeed)
-	}
-}
-
-// hget http://codereview.appspot.com/rss/mine/rsc
-const atomFeedString = `
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us" updated="2009-10-04T01:35:58+00:00"><title>Code Review - My issues</title><link href="http://codereview.appspot.com/" rel="alternate"></link><link href="http://codereview.appspot.com/rss/mine/rsc" rel="self"></link><id>http://codereview.appspot.com/</id><author><name>rietveld&lt;&gt;</name></author><entry><title>rietveld: an attempt at pubsubhubbub
-</title><link href="http://codereview.appspot.com/126085" rel="alternate"></link><updated>2009-10-04T01:35:58+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:134d9179c41f806be79b3a5f7877d19a</id><summary type="html">
-  An attempt at adding pubsubhubbub support to Rietveld.
-http://code.google.com/p/pubsubhubbub
-http://code.google.com/p/rietveld/issues/detail?id=155
-
-The server side of the protocol is trivial:
-  1. add a &amp;lt;link rel=&amp;quot;hub&amp;quot; href=&amp;quot;hub-server&amp;quot;&amp;gt; tag to all
-     feeds that will be pubsubhubbubbed.
-  2. every time one of those feeds changes, tell the hub
-     with a simple POST request.
-
-I have tested this by adding debug prints to a local hub
-server and checking that the server got the right publish
-requests.
-
-I can&amp;#39;t quite get the server to work, but I think the bug
-is not in my code.  I think that the server expects to be
-able to grab the feed and see the feed&amp;#39;s actual URL in
-the link rel=&amp;quot;self&amp;quot;, but the default value for that drops
-the :port from the URL, and I cannot for the life of me
-figure out how to get the Atom generator deep inside
-django not to do that, or even where it is doing that,
-or even what code is running to generate the Atom feed.
-(I thought I knew but I added some assert False statements
-and it kept running!)
-
-Ignoring that particular problem, I would appreciate
-feedback on the right way to get the two values at
-the top of feeds.py marked NOTE(rsc).
-
-
-</summary></entry><entry><title>rietveld: correct tab handling
-</title><link href="http://codereview.appspot.com/124106" rel="alternate"></link><updated>2009-10-03T23:02:17+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:0a2a4f19bb815101f0ba2904aed7c35a</id><summary type="html">
-  This fixes the buggy tab rendering that can be seen at
-http://codereview.appspot.com/116075/diff/1/2
-
-The fundamental problem was that the tab code was
-not being told what column the text began in, so it
-didn&amp;#39;t know where to put the tab stops.  Another problem
-was that some of the code assumed that string byte
-offsets were the same as column offsets, which is only
-true if there are no tabs.
-
-In the process of fixing this, I cleaned up the arguments
-to Fold and ExpandTabs and renamed them Break and
-_ExpandTabs so that I could be sure that I found all the
-call sites.  I also wanted to verify that ExpandTabs was
-not being used from outside intra_region_diff.py.
-
-
-</summary></entry></feed> 	   `
-
-type Feed struct {
-	XMLName Name      `xml:"http://www.w3.org/2005/Atom feed"`
-	Title   string    `xml:"title"`
-	Id      string    `xml:"id"`
-	Link    []Link    `xml:"link"`
-	Updated time.Time `xml:"updated,attr"`
-	Author  Person    `xml:"author"`
-	Entry   []Entry   `xml:"entry"`
-}
-
-type Entry struct {
-	Title   string    `xml:"title"`
-	Id      string    `xml:"id"`
-	Link    []Link    `xml:"link"`
-	Updated time.Time `xml:"updated"`
-	Author  Person    `xml:"author"`
-	Summary Text      `xml:"summary"`
-}
-
-type Link struct {
-	Rel  string `xml:"rel,attr,omitempty"`
-	Href string `xml:"href,attr"`
-}
-
-type Person struct {
-	Name     string `xml:"name"`
-	URI      string `xml:"uri"`
-	Email    string `xml:"email"`
-	InnerXML string `xml:",innerxml"`
-}
-
-type Text struct {
-	Type string `xml:"type,attr,omitempty"`
-	Body string `xml:",chardata"`
-}
-
-var atomFeed = Feed{
-	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
-	Title:   "Code Review - My issues",
-	Link: []Link{
-		{Rel: "alternate", Href: "http://codereview.appspot.com/"},
-		{Rel: "self", Href: "http://codereview.appspot.com/rss/mine/rsc"},
-	},
-	Id:      "http://codereview.appspot.com/",
-	Updated: ParseTime("2009-10-04T01:35:58+00:00"),
-	Author: Person{
-		Name:     "rietveld<>",
-		InnerXML: "<name>rietveld&lt;&gt;</name>",
-	},
-	Entry: []Entry{
-		{
-			Title: "rietveld: an attempt at pubsubhubbub\n",
-			Link: []Link{
-				{Rel: "alternate", Href: "http://codereview.appspot.com/126085"},
-			},
-			Updated: ParseTime("2009-10-04T01:35:58+00:00"),
-			Author: Person{
-				Name:     "email-address-removed",
-				InnerXML: "<name>email-address-removed</name>",
-			},
-			Id: "urn:md5:134d9179c41f806be79b3a5f7877d19a",
-			Summary: Text{
-				Type: "html",
-				Body: `
-  An attempt at adding pubsubhubbub support to Rietveld.
-http://code.google.com/p/pubsubhubbub
-http://code.google.com/p/rietveld/issues/detail?id=155
-
-The server side of the protocol is trivial:
-  1. add a &lt;link rel=&quot;hub&quot; href=&quot;hub-server&quot;&gt; tag to all
-     feeds that will be pubsubhubbubbed.
-  2. every time one of those feeds changes, tell the hub
-     with a simple POST request.
-
-I have tested this by adding debug prints to a local hub
-server and checking that the server got the right publish
-requests.
-
-I can&#39;t quite get the server to work, but I think the bug
-is not in my code.  I think that the server expects to be
-able to grab the feed and see the feed&#39;s actual URL in
-the link rel=&quot;self&quot;, but the default value for that drops
-the :port from the URL, and I cannot for the life of me
-figure out how to get the Atom generator deep inside
-django not to do that, or even where it is doing that,
-or even what code is running to generate the Atom feed.
-(I thought I knew but I added some assert False statements
-and it kept running!)
-
-Ignoring that particular problem, I would appreciate
-feedback on the right way to get the two values at
-the top of feeds.py marked NOTE(rsc).
-
-
-`,
-			},
-		},
-		{
-			Title: "rietveld: correct tab handling\n",
-			Link: []Link{
-				{Rel: "alternate", Href: "http://codereview.appspot.com/124106"},
-			},
-			Updated: ParseTime("2009-10-03T23:02:17+00:00"),
-			Author: Person{
-				Name:     "email-address-removed",
-				InnerXML: "<name>email-address-removed</name>",
-			},
-			Id: "urn:md5:0a2a4f19bb815101f0ba2904aed7c35a",
-			Summary: Text{
-				Type: "html",
-				Body: `
-  This fixes the buggy tab rendering that can be seen at
-http://codereview.appspot.com/116075/diff/1/2
-
-The fundamental problem was that the tab code was
-not being told what column the text began in, so it
-didn&#39;t know where to put the tab stops.  Another problem
-was that some of the code assumed that string byte
-offsets were the same as column offsets, which is only
-true if there are no tabs.
-
-In the process of fixing this, I cleaned up the arguments
-to Fold and ExpandTabs and renamed them Break and
-_ExpandTabs so that I could be sure that I found all the
-call sites.  I also wanted to verify that ExpandTabs was
-not being used from outside intra_region_diff.py.
-
-
-`,
-			},
-		},
-	},
-}
-
-const pathTestString = `
-<Result>
-    <Before>1</Before>
-    <Items>
-        <Item1>
-            <Value>A</Value>
-        </Item1>
-        <Item2>
-            <Value>B</Value>
-        </Item2>
-        <Item1>
-            <Value>C</Value>
-            <Value>D</Value>
-        </Item1>
-        <_>
-            <Value>E</Value>
-        </_>
-    </Items>
-    <After>2</After>
-</Result>
-`
-
-type PathTestItem struct {
-	Value string
-}
-
-type PathTestA struct {
-	Items         []PathTestItem `xml:">Item1"`
-	Before, After string
-}
-
-type PathTestB struct {
-	Other         []PathTestItem `xml:"Items>Item1"`
-	Before, After string
-}
-
-type PathTestC struct {
-	Values1       []string `xml:"Items>Item1>Value"`
-	Values2       []string `xml:"Items>Item2>Value"`
-	Before, After string
-}
-
-type PathTestSet struct {
-	Item1 []PathTestItem
-}
-
-type PathTestD struct {
-	Other         PathTestSet `xml:"Items"`
-	Before, After string
-}
-
-type PathTestE struct {
-	Underline     string `xml:"Items>_>Value"`
-	Before, After string
-}
-
-var pathTests = []interface{}{
-	&PathTestA{Items: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
-	&PathTestB{Other: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
-	&PathTestC{Values1: []string{"A", "C", "D"}, Values2: []string{"B"}, Before: "1", After: "2"},
-	&PathTestD{Other: PathTestSet{Item1: []PathTestItem{{"A"}, {"D"}}}, Before: "1", After: "2"},
-	&PathTestE{Underline: "E", Before: "1", After: "2"},
-}
-
-func TestUnmarshalPaths(t *testing.T) {
-	for _, pt := range pathTests {
-		v := reflect.New(reflect.TypeOf(pt).Elem()).Interface()
-		if err := Unmarshal([]byte(pathTestString), v); err != nil {
-			t.Fatalf("Unmarshal: %s", err)
-		}
-		if !reflect.DeepEqual(v, pt) {
-			t.Fatalf("have %#v\nwant %#v", v, pt)
-		}
-	}
-}
-
-type BadPathTestA struct {
-	First  string `xml:"items>item1"`
-	Other  string `xml:"items>item2"`
-	Second string `xml:"items"`
-}
-
-type BadPathTestB struct {
-	Other  string `xml:"items>item2>value"`
-	First  string `xml:"items>item1"`
-	Second string `xml:"items>item1>value"`
-}
-
-type BadPathTestC struct {
-	First  string
-	Second string `xml:"First"`
-}
-
-type BadPathTestD struct {
-	BadPathEmbeddedA
-	BadPathEmbeddedB
-}
-
-type BadPathEmbeddedA struct {
-	First string
-}
-
-type BadPathEmbeddedB struct {
-	Second string `xml:"First"`
-}
-
-var badPathTests = []struct {
-	v, e interface{}
-}{
-	{&BadPathTestA{}, &TagPathError{reflect.TypeOf(BadPathTestA{}), "First", "items>item1", "Second", "items"}},
-	{&BadPathTestB{}, &TagPathError{reflect.TypeOf(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
-	{&BadPathTestC{}, &TagPathError{reflect.TypeOf(BadPathTestC{}), "First", "", "Second", "First"}},
-	{&BadPathTestD{}, &TagPathError{reflect.TypeOf(BadPathTestD{}), "First", "", "Second", "First"}},
-}
-
-func TestUnmarshalBadPaths(t *testing.T) {
-	for _, tt := range badPathTests {
-		err := Unmarshal([]byte(pathTestString), tt.v)
-		if !reflect.DeepEqual(err, tt.e) {
-			t.Fatalf("Unmarshal with %#v didn't fail properly:\nhave %#v,\nwant %#v", tt.v, err, tt.e)
-		}
-	}
-}
-
-const OK = "OK"
-const withoutNameTypeData = `
-<?xml version="1.0" charset="utf-8"?>
-<Test3 Attr="OK" />`
-
-type TestThree struct {
-	XMLName Name   `xml:"Test3"`
-	Attr    string `xml:",attr"`
-}
-
-func TestUnmarshalWithoutNameType(t *testing.T) {
-	var x TestThree
-	if err := Unmarshal([]byte(withoutNameTypeData), &x); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if x.Attr != OK {
-		t.Fatalf("have %v\nwant %v", x.Attr, OK)
-	}
-}
-
-func TestUnmarshalAttr(t *testing.T) {
-	type ParamVal struct {
-		Int int `xml:"int,attr"`
-	}
-
-	type ParamPtr struct {
-		Int *int `xml:"int,attr"`
-	}
-
-	type ParamStringPtr struct {
-		Int *string `xml:"int,attr"`
-	}
-
-	x := []byte(`<Param int="1" />`)
-
-	p1 := &ParamPtr{}
-	if err := Unmarshal(x, p1); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p1.Int == nil {
-		t.Fatalf("Unmarshal failed in to *int field")
-	} else if *p1.Int != 1 {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p1.Int, 1)
-	}
-
-	p2 := &ParamVal{}
-	if err := Unmarshal(x, p2); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p2.Int != 1 {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p2.Int, 1)
-	}
-
-	p3 := &ParamStringPtr{}
-	if err := Unmarshal(x, p3); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p3.Int == nil {
-		t.Fatalf("Unmarshal failed in to *string field")
-	} else if *p3.Int != "1" {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p3.Int, 1)
-	}
-}
-
-type Tables struct {
-	HTable string `xml:"http://www.w3.org/TR/html4/ table"`
-	FTable string `xml:"http://www.w3schools.com/furniture table"`
-}
-
-var tables = []struct {
-	xml string
-	tab Tables
-	ns  string
-}{
-	{
-		xml: `<Tables>` +
-			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
-			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables>` +
-			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
-			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/">` +
-			`<f:table>world</f:table>` +
-			`<h:table>hello</h:table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables>` +
-			`<table>bogus</table>` +
-			`</Tables>`,
-		tab: Tables{},
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{HTable: "only"},
-		ns:  "http://www.w3.org/TR/html4/",
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{FTable: "only"},
-		ns:  "http://www.w3schools.com/furniture",
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{},
-		ns:  "something else entirely",
-	},
-}
-
-func TestUnmarshalNS(t *testing.T) {
-	for i, tt := range tables {
-		var dst Tables
-		var err error
-		if tt.ns != "" {
-			d := NewDecoder(strings.NewReader(tt.xml))
-			d.DefaultSpace = tt.ns
-			err = d.Decode(&dst)
-		} else {
-			err = Unmarshal([]byte(tt.xml), &dst)
-		}
-		if err != nil {
-			t.Errorf("#%d: Unmarshal: %v", i, err)
-			continue
-		}
-		want := tt.tab
-		if dst != want {
-			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
-		}
-	}
-}
-
-func TestMarshalNS(t *testing.T) {
-	dst := Tables{"hello", "world"}
-	data, err := Marshal(&dst)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	want := `<Tables><table xmlns="http://www.w3.org/TR/html4/">hello</table><table xmlns="http://www.w3schools.com/furniture">world</table></Tables>`
-	str := string(data)
-	if str != want {
-		t.Errorf("have: %q\nwant: %q\n", str, want)
-	}
-}
-
-type TableAttrs struct {
-	TAttr TAttr
-}
-
-type TAttr struct {
-	HTable string `xml:"http://www.w3.org/TR/html4/ table,attr"`
-	FTable string `xml:"http://www.w3schools.com/furniture table,attr"`
-	Lang   string `xml:"http://www.w3.org/XML/1998/namespace lang,attr,omitempty"`
-	Other1 string `xml:"http://golang.org/xml/ other,attr,omitempty"`
-	Other2 string `xml:"http://golang.org/xmlfoo/ other,attr,omitempty"`
-	Other3 string `xml:"http://golang.org/json/ other,attr,omitempty"`
-	Other4 string `xml:"http://golang.org/2/json/ other,attr,omitempty"`
-}
-
-var tableAttrs = []struct {
-	xml string
-	tab TableAttrs
-	ns  string
-}{
-	{
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
-			`h:table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`h:table="hello" f:table="world" xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr xmlns="http://www.w3.org/TR/html4/" ` +
-			`table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`table="bogus" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
-		ns:  "http://www.w3schools.com/furniture",
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr ` +
-			`table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
-		ns:  "http://www.w3.org/TR/html4/",
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`table="bogus" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{},
-		ns:  "something else entirely",
-	},
-}
-
-func TestUnmarshalNSAttr(t *testing.T) {
-	for i, tt := range tableAttrs {
-		var dst TableAttrs
-		var err error
-		if tt.ns != "" {
-			d := NewDecoder(strings.NewReader(tt.xml))
-			d.DefaultSpace = tt.ns
-			err = d.Decode(&dst)
-		} else {
-			err = Unmarshal([]byte(tt.xml), &dst)
-		}
-		if err != nil {
-			t.Errorf("#%d: Unmarshal: %v", i, err)
-			continue
-		}
-		want := tt.tab
-		if dst != want {
-			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
-		}
-	}
-}
-
-func TestMarshalNSAttr(t *testing.T) {
-	src := TableAttrs{TAttr{"hello", "world", "en_US", "other1", "other2", "other3", "other4"}}
-	data, err := Marshal(&src)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	want := `<TableAttrs><TAttr xmlns:html4="http://www.w3.org/TR/html4/" html4:table="hello" xmlns:furniture="http://www.w3schools.com/furniture" furniture:table="world" xml:lang="en_US" xmlns:_xml="http://golang.org/xml/" _xml:other="other1" xmlns:_xmlfoo="http://golang.org/xmlfoo/" _xmlfoo:other="other2" xmlns:json="http://golang.org/json/" json:other="other3" xmlns:json_1="http://golang.org/2/json/" json_1:other="other4"></TAttr></TableAttrs>`
-	str := string(data)
-	if str != want {
-		t.Errorf("Marshal:\nhave: %#q\nwant: %#q\n", str, want)
-	}
-
-	var dst TableAttrs
-	if err := Unmarshal(data, &dst); err != nil {
-		t.Errorf("Unmarshal: %v", err)
-	}
-
-	if dst != src {
-		t.Errorf("Unmarshal = %q, want %q", dst, src)
-	}
-}
-
-type MyCharData struct {
-	body string
-}
-
-func (m *MyCharData) UnmarshalXML(d *Decoder, start StartElement) error {
-	for {
-		t, err := d.Token()
-		if err == io.EOF { // found end of element
-			break
-		}
-		if err != nil {
-			return err
-		}
-		if char, ok := t.(CharData); ok {
-			m.body += string(char)
-		}
-	}
-	return nil
-}
-
-var _ Unmarshaler = (*MyCharData)(nil)
-
-func (m *MyCharData) UnmarshalXMLAttr(attr Attr) error {
-	panic("must not call")
-}
-
-type MyAttr struct {
-	attr string
-}
-
-func (m *MyAttr) UnmarshalXMLAttr(attr Attr) error {
-	m.attr = attr.Value
-	return nil
-}
-
-var _ UnmarshalerAttr = (*MyAttr)(nil)
-
-type MyStruct struct {
-	Data *MyCharData
-	Attr *MyAttr `xml:",attr"`
-
-	Data2 MyCharData
-	Attr2 MyAttr `xml:",attr"`
-}
-
-func TestUnmarshaler(t *testing.T) {
-	xml := `<?xml version="1.0" encoding="utf-8"?>
-		<MyStruct Attr="attr1" Attr2="attr2">
-		<Data>hello <!-- comment -->world</Data>
-		<Data2>howdy <!-- comment -->world</Data2>
-		</MyStruct>
-	`
-
-	var m MyStruct
-	if err := Unmarshal([]byte(xml), &m); err != nil {
-		t.Fatal(err)
-	}
-
-	if m.Data == nil || m.Attr == nil || m.Data.body != "hello world" || m.Attr.attr != "attr1" || m.Data2.body != "howdy world" || m.Attr2.attr != "attr2" {
-		t.Errorf("m=%#+v\n", m)
-	}
-}
-
-type Pea struct {
-	Cotelydon string
-}
-
-type Pod struct {
-	Pea interface{} `xml:"Pea"`
-}
-
-// https://code.google.com/p/go/issues/detail?id=6836
-func TestUnmarshalIntoInterface(t *testing.T) {
-	pod := new(Pod)
-	pod.Pea = new(Pea)
-	xml := `<Pod><Pea><Cotelydon>Green stuff</Cotelydon></Pea></Pod>`
-	err := Unmarshal([]byte(xml), pod)
-	if err != nil {
-		t.Fatalf("failed to unmarshal %q: %v", xml, err)
-	}
-	pea, ok := pod.Pea.(*Pea)
-	if !ok {
-		t.Fatalf("unmarshalled into wrong type: have %T want *Pea", pod.Pea)
-	}
-	have, want := pea.Cotelydon, "Green stuff"
-	if have != want {
-		t.Errorf("failed to unmarshal into interface, have %q want %q", have, want)
-	}
-}
-
-// https://github.com/vmware/govmomi/issues/246
-func TestNegativeValuesUnsignedFields(t *testing.T) {
-	type T struct {
-		I   string
-		O   interface{}
-		U8  uint8  `xml:"u8"`
-		U16 uint16 `xml:"u16"`
-		U32 uint32 `xml:"u32"`
-		U64 uint64 `xml:"u64"`
-	}
-
-	var tests = []T{
-		{I: "<T><u8>-128</u8></T>", O: uint8(0x80)},
-		{I: "<T><u8>-1</u8></T>", O: uint8(0xff)},
-		{I: "<T><u16>-32768</u16></T>", O: uint16(0x8000)},
-		{I: "<T><u16>-1</u16></T>", O: uint16(0xffff)},
-		{I: "<T><u32>-2147483648</u32></T>", O: uint32(0x80000000)},
-		{I: "<T><u32>-1</u32></T>", O: uint32(0xffffffff)},
-		{I: "<T><u64>-9223372036854775808</u64></T>", O: uint64(0x8000000000000000)},
-		{I: "<T><u64>-1</u64></T>", O: uint64(0xffffffffffffffff)},
-	}
-
-	for _, test := range tests {
-		err := Unmarshal([]byte(test.I), &test)
-		if err != nil {
-			t.Errorf("Unmarshal error: %v", err)
-			continue
-		}
-
-		var expected = test.O
-		var actual interface{}
-		switch reflect.ValueOf(test.O).Type().Kind() {
-		case reflect.Uint8:
-			actual = test.U8
-		case reflect.Uint16:
-			actual = test.U16
-		case reflect.Uint32:
-			actual = test.U32
-		case reflect.Uint64:
-			actual = test.U64
-		}
-
-		if !reflect.DeepEqual(actual, expected) {
-			t.Errorf("Actual: %v, expected: %v", actual, expected)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go b/installer/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go
deleted file mode 100644
index 7723ab1c9f..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vim25/xml/xml_test.go
+++ /dev/null
@@ -1,726 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"unicode/utf8"
-)
-
-const testInput = `
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<body xmlns:foo="ns1" xmlns="ns2" xmlns:tag="ns3" ` +
-	"\r\n\t" + `  >
-  <hello lang="en">World &lt;&gt;&apos;&quot; &#x767d;&#40300;翔</hello>
-  <query>&何; &is-it;</query>
-  <goodbye />
-  <outer foo:attr="value" xmlns:tag="ns4">
-    <inner/>
-  </outer>
-  <tag:name>
-    <![CDATA[Some text here.]]>
-  </tag:name>
-</body><!-- missing final newline -->`
-
-var testEntity = map[string]string{"何": "What", "is-it": "is it?"}
-
-var rawTokens = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
-	CharData("\n"),
-	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
-	CharData("\n"),
-	StartElement{Name{"", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
-	CharData("\n  "),
-	StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
-	CharData("World <>'\" 白鵬翔"),
-	EndElement{Name{"", "hello"}},
-	CharData("\n  "),
-	StartElement{Name{"", "query"}, []Attr{}},
-	CharData("What is it?"),
-	EndElement{Name{"", "query"}},
-	CharData("\n  "),
-	StartElement{Name{"", "goodbye"}, []Attr{}},
-	EndElement{Name{"", "goodbye"}},
-	CharData("\n  "),
-	StartElement{Name{"", "outer"}, []Attr{{Name{"foo", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
-	CharData("\n    "),
-	StartElement{Name{"", "inner"}, []Attr{}},
-	EndElement{Name{"", "inner"}},
-	CharData("\n  "),
-	EndElement{Name{"", "outer"}},
-	CharData("\n  "),
-	StartElement{Name{"tag", "name"}, []Attr{}},
-	CharData("\n    "),
-	CharData("Some text here."),
-	CharData("\n  "),
-	EndElement{Name{"tag", "name"}},
-	CharData("\n"),
-	EndElement{Name{"", "body"}},
-	Comment(" missing final newline "),
-}
-
-var cookedTokens = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
-	CharData("\n"),
-	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
-	CharData("\n"),
-	StartElement{Name{"ns2", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
-	CharData("World <>'\" 白鵬翔"),
-	EndElement{Name{"ns2", "hello"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "query"}, []Attr{}},
-	CharData("What is it?"),
-	EndElement{Name{"ns2", "query"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "goodbye"}, []Attr{}},
-	EndElement{Name{"ns2", "goodbye"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "outer"}, []Attr{{Name{"ns1", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
-	CharData("\n    "),
-	StartElement{Name{"ns2", "inner"}, []Attr{}},
-	EndElement{Name{"ns2", "inner"}},
-	CharData("\n  "),
-	EndElement{Name{"ns2", "outer"}},
-	CharData("\n  "),
-	StartElement{Name{"ns3", "name"}, []Attr{}},
-	CharData("\n    "),
-	CharData("Some text here."),
-	CharData("\n  "),
-	EndElement{Name{"ns3", "name"}},
-	CharData("\n"),
-	EndElement{Name{"ns2", "body"}},
-	Comment(" missing final newline "),
-}
-
-const testInputAltEncoding = `
-<?xml version="1.0" encoding="x-testing-uppercase"?>
-<TAG>VALUE</TAG>`
-
-var rawTokensAltEncoding = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="x-testing-uppercase"`)},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("value"),
-	EndElement{Name{"", "tag"}},
-}
-
-var xmlInput = []string{
-	// unexpected EOF cases
-	"<",
-	"<t",
-	"<t ",
-	"<t/",
-	"<!",
-	"<!-",
-	"<!--",
-	"<!--c-",
-	"<!--c--",
-	"<!d",
-	"<t></",
-	"<t></t",
-	"<?",
-	"<?p",
-	"<t a",
-	"<t a=",
-	"<t a='",
-	"<t a=''",
-	"<t/><![",
-	"<t/><![C",
-	"<t/><![CDATA[d",
-	"<t/><![CDATA[d]",
-	"<t/><![CDATA[d]]",
-
-	// other Syntax errors
-	"<>",
-	"<t/a",
-	"<0 />",
-	"<?0 >",
-	//	"<!0 >",	// let the Token() caller handle
-	"</0>",
-	"<t 0=''>",
-	"<t a='&'>",
-	"<t a='<'>",
-	"<t>&nbspc;</t>",
-	"<t a>",
-	"<t a=>",
-	"<t a=v>",
-	//	"<![CDATA[d]]>",	// let the Token() caller handle
-	"<t></e>",
-	"<t></>",
-	"<t></t!",
-	"<t>cdata]]></t>",
-}
-
-func TestRawToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInput))
-	d.Entity = testEntity
-	testRawToken(t, d, rawTokens)
-}
-
-const nonStrictInput = `
-<tag>non&entity</tag>
-<tag>&unknown;entity</tag>
-<tag>&#123</tag>
-<tag>&#zzz;</tag>
-<tag>&なまえ3;</tag>
-<tag>&lt-gt;</tag>
-<tag>&;</tag>
-<tag>&0a;</tag>
-`
-
-var nonStringEntity = map[string]string{"": "oops!", "0a": "oops!"}
-
-var nonStrictTokens = []Token{
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("non&entity"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&unknown;entity"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&#123"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&#zzz;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&なまえ3;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&lt-gt;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&0a;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-}
-
-func TestNonStrictRawToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(nonStrictInput))
-	d.Strict = false
-	testRawToken(t, d, nonStrictTokens)
-}
-
-type downCaser struct {
-	t *testing.T
-	r io.ByteReader
-}
-
-func (d *downCaser) ReadByte() (c byte, err error) {
-	c, err = d.r.ReadByte()
-	if c >= 'A' && c <= 'Z' {
-		c += 'a' - 'A'
-	}
-	return
-}
-
-func (d *downCaser) Read(p []byte) (int, error) {
-	d.t.Fatalf("unexpected Read call on downCaser reader")
-	panic("unreachable")
-}
-
-func TestRawTokenAltEncoding(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInputAltEncoding))
-	d.CharsetReader = func(charset string, input io.Reader) (io.Reader, error) {
-		if charset != "x-testing-uppercase" {
-			t.Fatalf("unexpected charset %q", charset)
-		}
-		return &downCaser{t, input.(io.ByteReader)}, nil
-	}
-	testRawToken(t, d, rawTokensAltEncoding)
-}
-
-func TestRawTokenAltEncodingNoConverter(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInputAltEncoding))
-	token, err := d.RawToken()
-	if token == nil {
-		t.Fatalf("expected a token on first RawToken call")
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	token, err = d.RawToken()
-	if token != nil {
-		t.Errorf("expected a nil token; got %#v", token)
-	}
-	if err == nil {
-		t.Fatalf("expected an error on second RawToken call")
-	}
-	const encoding = "x-testing-uppercase"
-	if !strings.Contains(err.Error(), encoding) {
-		t.Errorf("expected error to contain %q; got error: %v",
-			encoding, err)
-	}
-}
-
-func testRawToken(t *testing.T, d *Decoder, rawTokens []Token) {
-	for i, want := range rawTokens {
-		have, err := d.RawToken()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			var shave, swant string
-			if _, ok := have.(CharData); ok {
-				shave = fmt.Sprintf("CharData(%q)", have)
-			} else {
-				shave = fmt.Sprintf("%#v", have)
-			}
-			if _, ok := want.(CharData); ok {
-				swant = fmt.Sprintf("CharData(%q)", want)
-			} else {
-				swant = fmt.Sprintf("%#v", want)
-			}
-			t.Errorf("token %d = %s, want %s", i, shave, swant)
-		}
-	}
-}
-
-// Ensure that directives (specifically !DOCTYPE) include the complete
-// text of any nested directives, noting that < and > do not change
-// nesting depth if they are in single or double quotes.
-
-var nestedDirectivesInput = `
-<!DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
-<!DOCTYPE [<!ENTITY xlt ">">]>
-<!DOCTYPE [<!ENTITY xlt "<">]>
-<!DOCTYPE [<!ENTITY xlt '>'>]>
-<!DOCTYPE [<!ENTITY xlt '<'>]>
-<!DOCTYPE [<!ENTITY xlt '">'>]>
-<!DOCTYPE [<!ENTITY xlt "'<">]>
-`
-
-var nestedDirectivesTokens = []Token{
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt ">">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt "<">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '>'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '<'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '">'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt "'<">]`),
-	CharData("\n"),
-}
-
-func TestNestedDirectives(t *testing.T) {
-	d := NewDecoder(strings.NewReader(nestedDirectivesInput))
-
-	for i, want := range nestedDirectivesTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-func TestToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInput))
-	d.Entity = testEntity
-
-	for i, want := range cookedTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-func TestSyntax(t *testing.T) {
-	for i := range xmlInput {
-		d := NewDecoder(strings.NewReader(xmlInput[i]))
-		var err error
-		for _, err = d.Token(); err == nil; _, err = d.Token() {
-		}
-		if _, ok := err.(*SyntaxError); !ok {
-			t.Fatalf(`xmlInput "%s": expected SyntaxError not received`, xmlInput[i])
-		}
-	}
-}
-
-type allScalars struct {
-	True1     bool
-	True2     bool
-	False1    bool
-	False2    bool
-	Int       int
-	Int8      int8
-	Int16     int16
-	Int32     int32
-	Int64     int64
-	Uint      int
-	Uint8     uint8
-	Uint16    uint16
-	Uint32    uint32
-	Uint64    uint64
-	Uintptr   uintptr
-	Float32   float32
-	Float64   float64
-	String    string
-	PtrString *string
-}
-
-var all = allScalars{
-	True1:     true,
-	True2:     true,
-	False1:    false,
-	False2:    false,
-	Int:       1,
-	Int8:      -2,
-	Int16:     3,
-	Int32:     -4,
-	Int64:     5,
-	Uint:      6,
-	Uint8:     7,
-	Uint16:    8,
-	Uint32:    9,
-	Uint64:    10,
-	Uintptr:   11,
-	Float32:   13.0,
-	Float64:   14.0,
-	String:    "15",
-	PtrString: &sixteen,
-}
-
-var sixteen = "16"
-
-const testScalarsInput = `<allscalars>
-	<True1>true</True1>
-	<True2>1</True2>
-	<False1>false</False1>
-	<False2>0</False2>
-	<Int>1</Int>
-	<Int8>-2</Int8>
-	<Int16>3</Int16>
-	<Int32>-4</Int32>
-	<Int64>5</Int64>
-	<Uint>6</Uint>
-	<Uint8>7</Uint8>
-	<Uint16>8</Uint16>
-	<Uint32>9</Uint32>
-	<Uint64>10</Uint64>
-	<Uintptr>11</Uintptr>
-	<Float>12.0</Float>
-	<Float32>13.0</Float32>
-	<Float64>14.0</Float64>
-	<String>15</String>
-	<PtrString>16</PtrString>
-</allscalars>`
-
-func TestAllScalars(t *testing.T) {
-	var a allScalars
-	err := Unmarshal([]byte(testScalarsInput), &a)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(a, all) {
-		t.Errorf("have %+v want %+v", a, all)
-	}
-}
-
-type item struct {
-	Field_a string
-}
-
-func TestIssue569(t *testing.T) {
-	data := `<item><Field_a>abcd</Field_a></item>`
-	var i item
-	err := Unmarshal([]byte(data), &i)
-
-	if err != nil || i.Field_a != "abcd" {
-		t.Fatal("Expecting abcd")
-	}
-}
-
-func TestUnquotedAttrs(t *testing.T) {
-	data := "<tag attr=azAZ09:-_\t>"
-	d := NewDecoder(strings.NewReader(data))
-	d.Strict = false
-	token, err := d.Token()
-	if _, ok := err.(*SyntaxError); ok {
-		t.Errorf("Unexpected error: %v", err)
-	}
-	if token.(StartElement).Name.Local != "tag" {
-		t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
-	}
-	attr := token.(StartElement).Attr[0]
-	if attr.Value != "azAZ09:-_" {
-		t.Errorf("Unexpected attribute value: %v", attr.Value)
-	}
-	if attr.Name.Local != "attr" {
-		t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
-	}
-}
-
-func TestValuelessAttrs(t *testing.T) {
-	tests := [][3]string{
-		{"<p nowrap>", "p", "nowrap"},
-		{"<p nowrap >", "p", "nowrap"},
-		{"<input checked/>", "input", "checked"},
-		{"<input checked />", "input", "checked"},
-	}
-	for _, test := range tests {
-		d := NewDecoder(strings.NewReader(test[0]))
-		d.Strict = false
-		token, err := d.Token()
-		if _, ok := err.(*SyntaxError); ok {
-			t.Errorf("Unexpected error: %v", err)
-		}
-		if token.(StartElement).Name.Local != test[1] {
-			t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
-		}
-		attr := token.(StartElement).Attr[0]
-		if attr.Value != test[2] {
-			t.Errorf("Unexpected attribute value: %v", attr.Value)
-		}
-		if attr.Name.Local != test[2] {
-			t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
-		}
-	}
-}
-
-func TestCopyTokenCharData(t *testing.T) {
-	data := []byte("same data")
-	var tok1 Token = CharData(data)
-	tok2 := CopyToken(tok1)
-	if !reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) != CharData")
-	}
-	data[1] = 'o'
-	if reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) uses same buffer.")
-	}
-}
-
-func TestCopyTokenStartElement(t *testing.T) {
-	elt := StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}}
-	var tok1 Token = elt
-	tok2 := CopyToken(tok1)
-	if tok1.(StartElement).Attr[0].Value != "en" {
-		t.Error("CopyToken overwrote Attr[0]")
-	}
-	if !reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(StartElement) != StartElement")
-	}
-	tok1.(StartElement).Attr[0] = Attr{Name{"", "lang"}, "de"}
-	if reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) uses same buffer.")
-	}
-}
-
-func TestSyntaxErrorLineNum(t *testing.T) {
-	testInput := "<P>Foo<P>\n\n<P>Bar</>\n"
-	d := NewDecoder(strings.NewReader(testInput))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	synerr, ok := err.(*SyntaxError)
-	if !ok {
-		t.Error("Expected SyntaxError.")
-	}
-	if synerr.Line != 3 {
-		t.Error("SyntaxError didn't have correct line number.")
-	}
-}
-
-func TestTrailingRawToken(t *testing.T) {
-	input := `<FOO></FOO>  `
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.RawToken(); err == nil; _, err = d.RawToken() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.RawToken() = _, %v, want _, io.EOF", err)
-	}
-}
-
-func TestTrailingToken(t *testing.T) {
-	input := `<FOO></FOO>  `
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
-	}
-}
-
-func TestEntityInsideCDATA(t *testing.T) {
-	input := `<test><![CDATA[ &val=foo ]]></test>`
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
-	}
-}
-
-var characterTests = []struct {
-	in  string
-	err string
-}{
-	{"\x12<doc/>", "illegal character code U+0012"},
-	{"<?xml version=\"1.0\"?>\x0b<doc/>", "illegal character code U+000B"},
-	{"\xef\xbf\xbe<doc/>", "illegal character code U+FFFE"},
-	{"<?xml version=\"1.0\"?><doc>\r\n<hiya/>\x07<toots/></doc>", "illegal character code U+0007"},
-	{"<?xml version=\"1.0\"?><doc \x12='value'>what's up</doc>", "expected attribute name in element"},
-	{"<doc>&abc\x01;</doc>", "invalid character entity &abc (no semicolon)"},
-	{"<doc>&\x01;</doc>", "invalid character entity & (no semicolon)"},
-	{"<doc>&\xef\xbf\xbe;</doc>", "invalid character entity &\uFFFE;"},
-	{"<doc>&hello;</doc>", "invalid character entity &hello;"},
-}
-
-func TestDisallowedCharacters(t *testing.T) {
-
-	for i, tt := range characterTests {
-		d := NewDecoder(strings.NewReader(tt.in))
-		var err error
-
-		for err == nil {
-			_, err = d.Token()
-		}
-		synerr, ok := err.(*SyntaxError)
-		if !ok {
-			t.Fatalf("input %d d.Token() = _, %v, want _, *SyntaxError", i, err)
-		}
-		if synerr.Msg != tt.err {
-			t.Fatalf("input %d synerr.Msg wrong: want %q, got %q", i, tt.err, synerr.Msg)
-		}
-	}
-}
-
-type procInstEncodingTest struct {
-	expect, got string
-}
-
-var procInstTests = []struct {
-	input, expect string
-}{
-	{`version="1.0" encoding="utf-8"`, "utf-8"},
-	{`version="1.0" encoding='utf-8'`, "utf-8"},
-	{`version="1.0" encoding='utf-8' `, "utf-8"},
-	{`version="1.0" encoding=utf-8`, ""},
-	{`encoding="FOO" `, "FOO"},
-}
-
-func TestProcInstEncoding(t *testing.T) {
-	for _, test := range procInstTests {
-		got := procInstEncoding(test.input)
-		if got != test.expect {
-			t.Errorf("procInstEncoding(%q) = %q; want %q", test.input, got, test.expect)
-		}
-	}
-}
-
-// Ensure that directives with comments include the complete
-// text of any nested directives.
-
-var directivesWithCommentsInput = `
-<!DOCTYPE [<!-- a comment --><!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
-<!DOCTYPE [<!ENTITY go "Golang"><!-- a comment-->]>
-<!DOCTYPE <!-> <!> <!----> <!-->--> <!--->--> [<!ENTITY go "Golang"><!-- a comment-->]>
-`
-
-var directivesWithCommentsTokens = []Token{
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY go "Golang">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE <!-> <!>    [<!ENTITY go "Golang">]`),
-	CharData("\n"),
-}
-
-func TestDirectivesWithComments(t *testing.T) {
-	d := NewDecoder(strings.NewReader(directivesWithCommentsInput))
-
-	for i, want := range directivesWithCommentsTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-// Writer whose Write method always returns an error.
-type errWriter struct{}
-
-func (errWriter) Write(p []byte) (n int, err error) { return 0, fmt.Errorf("unwritable") }
-
-func TestEscapeTextIOErrors(t *testing.T) {
-	expectErr := "unwritable"
-	err := EscapeText(errWriter{}, []byte{'A'})
-
-	if err == nil || err.Error() != expectErr {
-		t.Errorf("have %v, want %v", err, expectErr)
-	}
-}
-
-func TestEscapeTextInvalidChar(t *testing.T) {
-	input := []byte("A \x00 terminated string.")
-	expected := "A \uFFFD terminated string."
-
-	buff := new(bytes.Buffer)
-	if err := EscapeText(buff, input); err != nil {
-		t.Fatalf("have %v, want nil", err)
-	}
-	text := buff.String()
-
-	if text != expected {
-		t.Errorf("have %v, want %v", text, expected)
-	}
-}
-
-func TestIssue5880(t *testing.T) {
-	type T []byte
-	data, err := Marshal(T{192, 168, 0, 1})
-	if err != nil {
-		t.Errorf("Marshal error: %v", err)
-	}
-	if !utf8.Valid(data) {
-		t.Errorf("Marshal generated invalid UTF-8: %x", data)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vmdk/import.go b/installer/vendor/github.com/vmware/govmomi/vmdk/import.go
deleted file mode 100644
index 64301f0d1a..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vmdk/import.go
+++ /dev/null
@@ -1,335 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-nSee the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vmdk
-
-import (
-	"bytes"
-	"context"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"text/template"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/ovf"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/progress"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-var (
-	ErrInvalidFormat = errors.New("vmdk: invalid format (must be streamOptimized)")
-)
-
-// info is used to inspect a vmdk and generate an ovf template
-type info struct {
-	Header struct {
-		MagicNumber uint32
-		Version     uint32
-		Flags       uint32
-		Capacity    uint64
-	}
-
-	Capacity   uint64
-	Size       int64
-	Name       string
-	ImportName string
-}
-
-// stat looks at the vmdk header to make sure the format is streamOptimized and
-// extracts the disk capacity required to properly generate the ovf descriptor.
-func stat(name string) (*info, error) {
-	f, err := os.Open(name)
-	if err != nil {
-		return nil, err
-	}
-
-	var di info
-
-	var buf bytes.Buffer
-
-	_, err = io.CopyN(&buf, f, int64(binary.Size(di.Header)))
-
-	fi, _ := f.Stat()
-
-	_ = f.Close()
-
-	if err != nil {
-		return nil, err
-	}
-
-	err = binary.Read(&buf, binary.LittleEndian, &di.Header)
-	if err != nil {
-		return nil, err
-	}
-
-	if di.Header.MagicNumber != 0x564d444b { // SPARSE_MAGICNUMBER
-		return nil, ErrInvalidFormat
-	}
-
-	if di.Header.Flags&(1<<16) == 0 { // SPARSEFLAG_COMPRESSED
-		// Needs to be converted, for example:
-		//   vmware-vdiskmanager -r src.vmdk -t 5 dst.vmdk
-		//   qemu-img convert -O vmdk -o subformat=streamOptimized src.vmdk dst.vmdk
-		return nil, ErrInvalidFormat
-	}
-
-	di.Capacity = di.Header.Capacity * 512 // VMDK_SECTOR_SIZE
-	di.Size = fi.Size()
-	di.Name = filepath.Base(name)
-	di.ImportName = strings.TrimSuffix(di.Name, ".vmdk")
-
-	return &di, nil
-}
-
-// ovfenv is the minimal descriptor template required to import a vmdk
-var ovfenv = `<?xml version="1.0" encoding="UTF-8"?>
-<Envelope xmlns="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:ovf="http://schemas.dmtf.org/ovf/envelope/1"
-          xmlns:cim="http://schemas.dmtf.org/wbem/wscim/1/common"
-          xmlns:rasd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData"
-          xmlns:vmw="http://www.vmware.com/schema/ovf"
-          xmlns:vssd="http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData"
-          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-  <References>
-    <File ovf:href="{{ .Name }}" ovf:id="file1" ovf:size="{{ .Size }}"/>
-  </References>
-  <DiskSection>
-    <Info>Virtual disk information</Info>
-    <Disk ovf:capacity="{{ .Capacity }}" ovf:capacityAllocationUnits="byte" ovf:diskId="vmdisk1" ovf:fileRef="file1" ovf:format="http://www.vmware.com/interfaces/specifications/vmdk.html#streamOptimized" ovf:populatedSize="0"/>
-  </DiskSection>
-  <VirtualSystem ovf:id="{{ .ImportName }}">
-    <Info>A virtual machine</Info>
-    <Name>{{ .ImportName }}</Name>
-    <OperatingSystemSection ovf:id="100" vmw:osType="other26xLinux64Guest">
-      <Info>The kind of installed guest operating system</Info>
-    </OperatingSystemSection>
-    <VirtualHardwareSection>
-      <Info>Virtual hardware requirements</Info>
-      <System>
-        <vssd:ElementName>Virtual Hardware Family</vssd:ElementName>
-        <vssd:InstanceID>0</vssd:InstanceID>
-        <vssd:VirtualSystemIdentifier>{{ .ImportName }}</vssd:VirtualSystemIdentifier>
-        <vssd:VirtualSystemType>vmx-07</vssd:VirtualSystemType>
-      </System>
-      <Item>
-        <rasd:AllocationUnits>hertz * 10^6</rasd:AllocationUnits>
-        <rasd:Description>Number of Virtual CPUs</rasd:Description>
-        <rasd:ElementName>1 virtual CPU(s)</rasd:ElementName>
-        <rasd:InstanceID>1</rasd:InstanceID>
-        <rasd:ResourceType>3</rasd:ResourceType>
-        <rasd:VirtualQuantity>1</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:AllocationUnits>byte * 2^20</rasd:AllocationUnits>
-        <rasd:Description>Memory Size</rasd:Description>
-        <rasd:ElementName>1024MB of memory</rasd:ElementName>
-        <rasd:InstanceID>2</rasd:InstanceID>
-        <rasd:ResourceType>4</rasd:ResourceType>
-        <rasd:VirtualQuantity>1024</rasd:VirtualQuantity>
-      </Item>
-      <Item>
-        <rasd:Address>0</rasd:Address>
-        <rasd:Description>SCSI Controller</rasd:Description>
-        <rasd:ElementName>SCSI Controller 0</rasd:ElementName>
-        <rasd:InstanceID>3</rasd:InstanceID>
-        <rasd:ResourceSubType>VirtualSCSI</rasd:ResourceSubType>
-        <rasd:ResourceType>6</rasd:ResourceType>
-      </Item>
-      <Item>
-        <rasd:AddressOnParent>0</rasd:AddressOnParent>
-        <rasd:ElementName>Hard Disk 1</rasd:ElementName>
-        <rasd:HostResource>ovf:/disk/vmdisk1</rasd:HostResource>
-        <rasd:InstanceID>9</rasd:InstanceID>
-        <rasd:Parent>3</rasd:Parent>
-        <rasd:ResourceType>17</rasd:ResourceType>
-        <vmw:Config ovf:required="false" vmw:key="backing.writeThrough" vmw:value="false"/>
-      </Item>
-    </VirtualHardwareSection>
-  </VirtualSystem>
-</Envelope>`
-
-// ovf returns an expanded descriptor template
-func (di *info) ovf() (string, error) {
-	var buf bytes.Buffer
-
-	tmpl, err := template.New("ovf").Parse(ovfenv)
-	if err != nil {
-		return "", err
-	}
-
-	err = tmpl.Execute(&buf, di)
-	if err != nil {
-		return "", err
-	}
-
-	return buf.String(), nil
-}
-
-// ImportParams contains the set of optional params to the Import function.
-// Note that "optional" may depend on environment, such as ESX or vCenter.
-type ImportParams struct {
-	Path       string
-	Logger     progress.Sinker
-	Type       types.VirtualDiskType
-	Force      bool
-	Datacenter *object.Datacenter
-	Pool       *object.ResourcePool
-	Folder     *object.Folder
-	Host       *object.HostSystem
-}
-
-// Import uploads a local vmdk file specified by name to the given datastore.
-func Import(ctx context.Context, c *vim25.Client, name string, datastore *object.Datastore, p ImportParams) error {
-	m := ovf.NewManager(c)
-	fm := datastore.NewFileManager(p.Datacenter, p.Force)
-
-	disk, err := stat(name)
-	if err != nil {
-		return err
-	}
-
-	var rename string
-
-	p.Path = strings.TrimSuffix(p.Path, "/")
-	if p.Path != "" {
-		disk.ImportName = p.Path
-		rename = path.Join(disk.ImportName, disk.Name)
-	}
-
-	// "target" is the path that will be created by ImportVApp()
-	// ImportVApp uses the same name for the VM and the disk.
-	target := fmt.Sprintf("%s/%s.vmdk", disk.ImportName, disk.ImportName)
-
-	if _, err = datastore.Stat(ctx, target); err == nil {
-		if p.Force {
-			// If we don't delete, the nfc upload adds a file name suffix
-			if err = fm.Delete(ctx, target); err != nil {
-				return err
-			}
-		} else {
-			return fmt.Errorf("%s: %s", os.ErrExist, datastore.Path(target))
-		}
-	}
-
-	// If we need to rename at the end, check if the file exists early unless Force.
-	if !p.Force && rename != "" {
-		if _, err = datastore.Stat(ctx, rename); err == nil {
-			return fmt.Errorf("%s: %s", os.ErrExist, datastore.Path(rename))
-		}
-	}
-
-	// Expand the ovf template
-	descriptor, err := disk.ovf()
-	if err != nil {
-		return err
-	}
-
-	pool := p.Pool     // TODO: use datastore to derive a default
-	folder := p.Folder // TODO: use datacenter to derive a default
-
-	kind := p.Type
-	if kind == "" {
-		kind = types.VirtualDiskTypeThin
-	}
-
-	params := types.OvfCreateImportSpecParams{
-		DiskProvisioning: string(kind),
-		EntityName:       disk.ImportName,
-	}
-
-	spec, err := m.CreateImportSpec(ctx, descriptor, pool, datastore, params)
-	if err != nil {
-		return err
-	}
-	if spec.Error != nil {
-		return errors.New(spec.Error[0].LocalizedMessage)
-	}
-
-	lease, err := pool.ImportVApp(ctx, spec.ImportSpec, folder, p.Host)
-	if err != nil {
-		return err
-	}
-
-	info, err := lease.Wait(ctx, spec.FileItem)
-	if err != nil {
-		return err
-	}
-
-	f, err := os.Open(name)
-	if err != nil {
-		return err
-	}
-
-	opts := soap.Upload{
-		ContentLength: disk.Size,
-		Progress:      p.Logger,
-	}
-
-	u := lease.StartUpdater(ctx, info)
-	defer u.Done()
-
-	item := info.Items[0] // we only have 1 disk to upload
-
-	err = lease.Upload(ctx, item, f, opts)
-
-	_ = f.Close()
-
-	if err != nil {
-		return err
-	}
-
-	if err = lease.Complete(ctx); err != nil {
-		return err
-	}
-
-	// ImportVApp created a VM, here we detach the vmdk, then delete the VM.
-	vm := object.NewVirtualMachine(c, info.Entity)
-
-	device, err := vm.Device(ctx)
-	if err != nil {
-		return err
-	}
-
-	device = device.SelectByType((*types.VirtualDisk)(nil))
-
-	err = vm.RemoveDevice(ctx, true, device...)
-	if err != nil {
-		return err
-	}
-
-	task, err := vm.Destroy(ctx)
-	if err != nil {
-		return err
-	}
-
-	if err = task.Wait(ctx); err != nil {
-		return err
-	}
-
-	if rename == "" {
-		return nil
-	}
-
-	return fm.Move(ctx, target, rename)
-}
diff --git a/installer/vendor/github.com/vmware/govmomi/vmdk/import_test.go b/installer/vendor/github.com/vmware/govmomi/vmdk/import_test.go
deleted file mode 100644
index a8f50a6241..0000000000
--- a/installer/vendor/github.com/vmware/govmomi/vmdk/import_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-nSee the License for the specific language governing permissions and
-limitations under the License.
-*/
-
-package vmdk
-
-import (
-	"os"
-	"testing"
-)
-
-func TestDiskInfo(t *testing.T) {
-	di, err := stat("../govc/test/images/ttylinux-pc_i486-16.1-disk1.vmdk")
-	if err != nil {
-		if os.IsNotExist(err) {
-			t.SkipNow()
-		}
-		t.Fatal(err)
-	}
-
-	_, err = di.ovf()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDiskInvalid(t *testing.T) {
-	_, err := stat("import_test.go")
-	if err != ErrInvalidFormat {
-		t.Errorf("expected ErrInvalidFormat: %s", err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/.dockerignore b/installer/vendor/github.com/vmware/vic/.dockerignore
deleted file mode 100644
index bf9e0bc972..0000000000
--- a/installer/vendor/github.com/vmware/vic/.dockerignore
+++ /dev/null
@@ -1,2 +0,0 @@
-.vagrant
-bin/**
diff --git a/installer/vendor/github.com/vmware/vic/.drone.local.yml b/installer/vendor/github.com/vmware/vic/.drone.local.yml
deleted file mode 100644
index 28028b70e1..0000000000
--- a/installer/vendor/github.com/vmware/vic/.drone.local.yml
+++ /dev/null
@@ -1,44 +0,0 @@
----
-workspace:
-  base: /go
-  path: src/github.com/vmware/vic
-
-pipeline:
-  clone:
-    image: plugins/git
-    tags: true
-    # dont clone submodules
-    recursive: false
-
-  vic-integration-test-on-pr:
-    image: ${TEST_BUILD_IMAGE=gcr.io/eminent-nation-87317/vic-integration-test:1.36}
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-      VIC_ESX_TEST_URL: ${VIC_ESX_TEST_URL}
-      LOG_TEMP_DIR: install-logs
-      DRONE_SERVER:  ${DRONE_SERVER}
-      GITHUB_AUTOMATION_API_KEY:  ${GITHUB_AUTOMATION_API_KEY}
-      DRONE_TOKEN:  ${DRONE_TOKEN}
-      TEST_URL_ARRAY:  ${TEST_URL_ARRAY}
-      TEST_USERNAME:  ${TEST_USERNAME}
-      TEST_PASSWORD:  ${TEST_PASSWORD}
-      TEST_DATASTORE: ${TEST_DATASTORE}
-      TEST_TIMEOUT: ${TEST_TIMEOUT}
-      GOVC_INSECURE: true
-      GOVC_USERNAME:  ${TEST_USERNAME}
-      GOVC_PASSWORD:  ${TEST_PASSWORD}
-      GOVC_DATASTORE: ${TEST_DATASTORE}
-      GS_PROJECT_ID: ${GS_PROJECT_ID}
-      GS_CLIENT_EMAIL: ${GS_CLIENT_EMAIL}
-      GS_PRIVATE_KEY: ${GS_PRIVATE_KEY}
-      DEBUG_VCH:  ${DEBUG_VCH}
-      DOMAIN: ${DOMAIN}
-    commands:
-      - tests/integration-test.sh
-      # - pybot tests/test-cases/Group1-Docker-Commands
-      # - pybot tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.robot
-    volumes:
-      - /tmp
diff --git a/installer/vendor/github.com/vmware/vic/.drone.nightly.yml b/installer/vendor/github.com/vmware/vic/.drone.nightly.yml
deleted file mode 100644
index cd09a7c25b..0000000000
--- a/installer/vendor/github.com/vmware/vic/.drone.nightly.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-clone:
-  path: github.com/vmware/vic
-  tags: true
-
-build:
-  integration-test:
-    image: gcr.io/eminent-nation-87317/vic-integration-test:1.36
-    pull: true
-    environment:
-      BIN: vic
-      GOPATH: /drone
-      SHELL: /bin/bash
-      VIC_ESX_TEST_URL: $$VIC_ESX_TEST_URL
-      LOG_TEMP_DIR: install-logs
-      DRONE_SERVER:  $$DRONE_SERVER
-      GITHUB_AUTOMATION_API_KEY:  $$GITHUB_AUTOMATION_API_KEY
-      DRONE_TOKEN:  $$DRONE_TOKEN
-      TEST_URL_ARRAY:  $$TEST_URL_ARRAY
-      TEST_USERNAME:  $$TEST_USERNAME
-      TEST_PASSWORD:  $$TEST_PASSWORD
-      TEST_DATASTORE: $$TEST_DATASTORE
-      TEST_TIMEOUT: $$TEST_TIMEOUT
-      GOVC_INSECURE: true
-      GOVC_USERNAME:  $$TEST_USERNAME
-      GOVC_PASSWORD:  $$TEST_PASSWORD
-      GOVC_RESOURCE_POOL:  $$TEST_RESOURCE
-      GOVC_DATASTORE: $$TEST_DATASTORE
-      GS_PROJECT_ID: $$GS_PROJECT_ID
-      GS_CLIENT_EMAIL: $$GS_CLIENT_EMAIL
-      GS_PRIVATE_KEY: $$GS_PRIVATE_KEY
-      NIMBUS_USER: $$NIMBUS_USER
-      NIMBUS_PASSWORD: $$NIMBUS_PASSWORD
-      NIMBUS_GW: $$NIMBUS_GW
-      DOMAIN: $$NIMBUS_DOMAIN
-      SLACK_URL: $$SLACK_URL
-      GS_PROJECT_ID: $$GS_PROJECT_ID
-      GS_CLIENT_EMAIL: $$GS_CLIENT_EMAIL
-      GS_PRIVATE_KEY: $$GS_PRIVATE_KEY
-      VC_LICENSE: $$VC_LICENSE
-    commands:
-        - $$test
diff --git a/installer/vendor/github.com/vmware/vic/.drone.yml b/installer/vendor/github.com/vmware/vic/.drone.yml
deleted file mode 100644
index 98a6f5d667..0000000000
--- a/installer/vendor/github.com/vmware/vic/.drone.yml
+++ /dev/null
@@ -1,251 +0,0 @@
-# After any change to this file you MUST re-sign and checkin the .drone.yml.sig
-# When you are ready to submit a pull request, you must regenerate .drone.yml.sig for the vmware/vic repo:
-# $ export DRONE_SERVER=https://ci.vcna.io
-# $ export DRONE_TOKEN=<token>
-# $ drone sign vmware/vic
-# The secrets file is in our local git repo.  Ask mhagen for access.
-
----
-workspace:
-  base: /go
-  path: src/github.com/vmware/vic
-
-pipeline:
-  clone:
-    image: plugins/git
-    tags: true
-    # dont clone submodules
-    recursive: false
-
-  wait-for-build:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.36
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-      TEST_URL_ARRAY: ${TEST_URL_ARRAY}
-      DRONE_SERVER: ${DRONE_SERVER}
-      DRONE_TOKEN: ${DRONE_TOKEN}
-    commands:
-      - tests/wait_until_previous_builds_complete.sh
-
-  vic-engine:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.36
-    pull: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-      TEST_URL_ARRAY:  ${TEST_URL_ARRAY}
-      TEST_USERNAME:  ${TEST_USERNAME}
-      TEST_PASSWORD:  ${TEST_PASSWORD}
-      REGISTRY_PASSWORD:  ${REGISTRY_PASSWORD}
-      BUILD_NUMBER: ${DRONE_BUILD_NUMBER}
-      COMMIT: ${DRONE_COMMIT}
-    commands:
-      - make mark
-      - make all
-      - make sincemark
-      - make mark
-      - echo `ls vendor/github.com/vmware/govmomi/vim25/methods`
-      - echo `ls vendor/github.com/vmware/govmomi/vim25/types`
-      - echo `ls vendor/github.com/docker/docker/vendor/github.com/opencontainers/runc/libcontainer/system`
-      - export VIC_ESX_URL_ARRAY="`tests/get_test_url.sh`"
-      - make test
-      - make sincemark
-    when:
-      status:  success
-
-  vic-integration-test-on-pr:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.36
-    pull: true
-    privileged: true
-    environment:
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-      LOG_TEMP_DIR: install-logs
-      GITHUB_AUTOMATION_API_KEY:  ${GITHUB_AUTOMATION_API_KEY}
-      DRONE_SERVER:  ${DRONE_SERVER}
-      DRONE_TOKEN:  ${DRONE_TOKEN}
-      DRONE_MACHINE:  ${DRONE_MACHINE}
-      TEST_URL_ARRAY:  ${TEST_URL_ARRAY}
-      TEST_USERNAME:  ${TEST_USERNAME}
-      TEST_PASSWORD:  ${TEST_PASSWORD}
-      REGISTRY_PASSWORD:  ${REGISTRY_PASSWORD}
-      TEST_DATASTORE: ${TEST_DATASTORE}
-      TEST_TIMEOUT: ${TEST_TIMEOUT}
-      REPORTING_SERVER_URL: ${REPORTING_SERVER_URL}
-      GOVC_INSECURE: true
-      GOVC_USERNAME:  ${TEST_USERNAME}
-      GOVC_PASSWORD:  ${TEST_PASSWORD}
-      GOVC_DATASTORE: ${TEST_DATASTORE}
-      GS_PROJECT_ID: ${GS_PROJECT_ID}
-      GS_CLIENT_EMAIL: ${GS_CLIENT_EMAIL}
-      GS_PRIVATE_KEY: ${GS_PRIVATE_KEY}
-      DOMAIN: ${CI_DOMAIN}
-      SYSLOG_SERVER: ${SYSLOG_SERVER}
-      SYSLOG_USER: ${SYSLOG_USER}
-      SYSLOG_PASSWD: ${SYSLOG_PASSWD}
-    commands:
-      - . ./tests/ci-env.sh # set CI env variable values
-      - make mark
-      - tests/integration-test.sh
-      - make sincemark
-    volumes:
-      - /tmp
-      - /home/vic:/ci
-    when:
-      status:  success
-
-  vic-ui:
-    image: harbor.ci.drone.local/library/vic-integration-test:1.36
-    pull: true
-    environment:
-      BUILD_NUMBER: ${DRONE_BUILD_NUMBER}
-      BIN: bin
-      GS_PROJECT_ID: ${GS_PROJECT_ID}
-      GS_CLIENT_EMAIL: ${GS_CLIENT_EMAIL}
-      GS_PRIVATE_KEY: ${GS_PRIVATE_KEY}
-    commands:
-      - mkdir -p $BIN/ui
-      - export LATEST_VIC_UI_BUILD="$(gsutil ls -l 'gs://vic-ui-builds' | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap ' ' PIPE; head -1))"
-      - export VIC_UI_URL=$(echo $LATEST_VIC_UI_BUILD | xargs | cut -d " " -f 3 | sed "s/gs:\/\//https:\/\/storage.googleapis.com\//")
-      - wget -nv $VIC_UI_URL -P $BIN
-      - tar -xvzf $BIN/vic_ui_*.tar.gz
-      - ls -la ./$BIN && ./$BIN/ui/sync-vic-ui-version.sh -p bin/ 2>&1
-      - rm $BIN/vic_ui_*.tar.gz
-    when:
-      status:  success
-
-  bundle:
-    image: harbor.ci.drone.local/library/golang:1.8
-    pull: true
-    environment:
-      BIN: bin
-      BIN_TEMP_DIR: bin/vic
-      GOPATH: /go
-      SHELL: /bin/bash
-    commands:
-      - make mark
-      - rm -rf $BIN_TEMP_DIR
-      - mkdir -p $BIN_TEMP_DIR
-      - mv $BIN/ui $BIN_TEMP_DIR
-      - cp LICENSE $BIN_TEMP_DIR
-      - cp doc/bundle/README $BIN_TEMP_DIR
-      - cp $BIN/vic-machine* $BIN_TEMP_DIR
-      - cp $BIN/vic-ui* $BIN_TEMP_DIR
-      - cp $BIN/appliance.iso $BIN_TEMP_DIR
-      - cp $BIN/bootstrap.iso $BIN_TEMP_DIR
-      - tar czvf $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz -C $BIN vic
-      - shasum -a 256 $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
-      - shasum -a 1 $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
-      - md5sum $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
-      - du -ks $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz | awk '{print $1 / 1024}' | { read x; echo $x MB; }
-      - mkdir bundle
-      - mkdir bundle-release
-      - cp $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz bundle
-      - cp $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz bundle-release/vic_`git describe --tags $(git rev-list --tags --max-count=1)`.tar.gz
-      - make sincemark
-    when:
-      repo: vmware/vic
-      event: [ push, tag ]
-      branch: [ master, releases/*, refs/tags/* ]
-
-  notify-slack-on-fail:
-    image: plugins/slack
-    webhook: ${SLACK_URL}
-    username: drone
-    template: >
-      build https://ci.vcna.io/vmware/vic/{{ build.number }} finished with a {{ build.status }} status, find the logs here: https://console.cloud.google.com/m/cloudstorage/b/vic-ci-logs/o/integration_logs_{{ build.number }}_{{ build.commit }}.zip?authuser=1
-    when:
-      repo: vmware/vic
-      branch: [ master, releases/*, refs/tags/* ]
-      status: failure
-
-  notify-slack-on-pass:
-    image: plugins/slack
-    webhook: ${SLACK_URL}
-    username: drone
-    template: >
-      build https://ci.vcna.io/vmware/vic/{{ build.number }} finished with a {{ build.status }} status, find the build here: https://storage.googleapis.com/vic-engine-builds/vic_{{ build.number }}.tar.gz
-    when:
-      repo: vmware/vic
-      branch: [ master, releases/* ]
-      status: success
-
-  notify-slack-on-successful-tag:
-    image: plugins/slack
-    webhook: ${SLACK_URL}
-    username: drone
-    template: >
-      The latest version of VIC engine has been released, find the build here: https://console.cloud.google.com/storage/browser/vic-engine-releases
-    when:
-      repo: vmware/vic
-      branch: [ refs/tags/* ]
-      status: success
-
-  publish-gcs-builds-on-pass:
-    image: maplain/drone-gcs:latest
-    pull: true
-    source: bundle
-    target: vic-engine-builds
-    acl:
-      - allUsers:READER
-    cache_control: public,max-age=3600
-    when:
-      repo: vmware/vic
-      event: [ push ]
-      branch: [ master, releases/* ]
-      status: success
-
-  publish-gcs-builds-on-fail:
-    image: maplain/drone-gcs:latest
-    pull: true
-    source: bundle
-    target: vic-engine-failed-builds
-    acl:
-      - allUsers:READER
-    cache_control: public,max-age=3600
-    when:
-      repo: vmware/vic
-      event: [ push ]
-      branch: [ master, releases/* ]
-      status: failure
-
-  publish-gcs-releases:
-    image: maplain/drone-gcs:latest
-    pull: true
-    source: bundle-release
-    target: vic-engine-releases
-    acl:
-      - allUsers:READER
-    cache_control: public,max-age=3600
-    when:
-      repo: vmware/vic
-      event: [ push, tag ]
-      branch: [ refs/tags/* ]
-      status: success
-
-  trigger-downstream:
-      image: plugins/downstream
-      server: https://ci.vcna.io
-      token: ${DRONE_TOKEN}
-      fork: true
-      repositories:
-        - vmware/vic-product
-      when:
-        repo: vmware/vic
-        event: [ push, tag ]
-        branch: [ master, releases/*, refs/tags/* ]
-        status: success
-
-  report-coverage:
-    image: plugins/coverage
-    server: https://coverage.vmware.run
-    pattern: .cover/cover.out
-    when:
-      branch: [ master, releases/*, refs/tags/* ]
-      repo: vmware/vic
-      status: success
diff --git a/installer/vendor/github.com/vmware/vic/.drone.yml.sig b/installer/vendor/github.com/vmware/vic/.drone.yml.sig
deleted file mode 100644
index 3e9db36022..0000000000
--- a/installer/vendor/github.com/vmware/vic/.drone.yml.sig
+++ /dev/null
@@ -1 +0,0 @@
-eyJhbGciOiJIUzI1NiJ9.# After any change to this file you MUST re-sign and checkin the .drone.yml.sig
# When you are ready to submit a pull request, you must regenerate .drone.yml.sig for the vmware/vic repo:
# $ export DRONE_SERVER=https://ci.vcna.io
# $ export DRONE_TOKEN=<token>
# $ drone sign vmware/vic
# The secrets file is in our local git repo.  Ask mhagen for access.

---
workspace:
  base: /go
  path: src/github.com/vmware/vic

pipeline:
  clone:
    image: plugins/git
    tags: true
    # dont clone submodules
    recursive: false

  wait-for-build:
    image: harbor.ci.drone.local/library/vic-integration-test:1.36
    pull: true
    environment:
      BIN: bin
      GOPATH: /go
      SHELL: /bin/bash
      TEST_URL_ARRAY: ${TEST_URL_ARRAY}
      DRONE_SERVER: ${DRONE_SERVER}
      DRONE_TOKEN: ${DRONE_TOKEN}
    commands:
      - tests/wait_until_previous_builds_complete.sh

  vic-engine:
    image: harbor.ci.drone.local/library/vic-integration-test:1.36
    pull: true
    environment:
      BIN: bin
      GOPATH: /go
      SHELL: /bin/bash
      TEST_URL_ARRAY:  ${TEST_URL_ARRAY}
      TEST_USERNAME:  ${TEST_USERNAME}
      TEST_PASSWORD:  ${TEST_PASSWORD}
      REGISTRY_PASSWORD:  ${REGISTRY_PASSWORD}
      BUILD_NUMBER: ${DRONE_BUILD_NUMBER}
      COMMIT: ${DRONE_COMMIT}
    commands:
      - make mark
      - make all
      - make sincemark
      - make mark
      - echo `ls vendor/github.com/vmware/govmomi/vim25/methods`
      - echo `ls vendor/github.com/vmware/govmomi/vim25/types`
      - echo `ls vendor/github.com/docker/docker/vendor/github.com/opencontainers/runc/libcontainer/system`
      - export VIC_ESX_URL_ARRAY="`tests/get_test_url.sh`"
      - make test
      - make sincemark
    when:
      status:  success

  vic-integration-test-on-pr:
    image: harbor.ci.drone.local/library/vic-integration-test:1.36
    pull: true
    privileged: true
    environment:
      BIN: bin
      GOPATH: /go
      SHELL: /bin/bash
      LOG_TEMP_DIR: install-logs
      GITHUB_AUTOMATION_API_KEY:  ${GITHUB_AUTOMATION_API_KEY}
      DRONE_SERVER:  ${DRONE_SERVER}
      DRONE_TOKEN:  ${DRONE_TOKEN}
      DRONE_MACHINE:  ${DRONE_MACHINE}
      TEST_URL_ARRAY:  ${TEST_URL_ARRAY}
      TEST_USERNAME:  ${TEST_USERNAME}
      TEST_PASSWORD:  ${TEST_PASSWORD}
      REGISTRY_PASSWORD:  ${REGISTRY_PASSWORD}
      TEST_DATASTORE: ${TEST_DATASTORE}
      TEST_TIMEOUT: ${TEST_TIMEOUT}
      REPORTING_SERVER_URL: ${REPORTING_SERVER_URL}
      GOVC_INSECURE: true
      GOVC_USERNAME:  ${TEST_USERNAME}
      GOVC_PASSWORD:  ${TEST_PASSWORD}
      GOVC_DATASTORE: ${TEST_DATASTORE}
      GS_PROJECT_ID: ${GS_PROJECT_ID}
      GS_CLIENT_EMAIL: ${GS_CLIENT_EMAIL}
      GS_PRIVATE_KEY: ${GS_PRIVATE_KEY}
      DOMAIN: ${CI_DOMAIN}
      SYSLOG_SERVER: ${SYSLOG_SERVER}
      SYSLOG_USER: ${SYSLOG_USER}
      SYSLOG_PASSWD: ${SYSLOG_PASSWD}
    commands:
      - . ./tests/ci-env.sh # set CI env variable values
      - make mark
      - tests/integration-test.sh
      - make sincemark
    volumes:
      - /tmp
      - /home/vic:/ci
    when:
      status:  success

  vic-ui:
    image: harbor.ci.drone.local/library/vic-integration-test:1.36
    pull: true
    environment:
      BUILD_NUMBER: ${DRONE_BUILD_NUMBER}
      BIN: bin
      GS_PROJECT_ID: ${GS_PROJECT_ID}
      GS_CLIENT_EMAIL: ${GS_CLIENT_EMAIL}
      GS_PRIVATE_KEY: ${GS_PRIVATE_KEY}
    commands:
      - mkdir -p $BIN/ui
      - export LATEST_VIC_UI_BUILD="$(gsutil ls -l 'gs://vic-ui-builds' | grep -v TOTAL | grep vic_ | sort -k2 -r | (trap ' ' PIPE; head -1))"
      - export VIC_UI_URL=$(echo $LATEST_VIC_UI_BUILD | xargs | cut -d " " -f 3 | sed "s/gs:\/\//https:\/\/storage.googleapis.com\//")
      - wget -nv $VIC_UI_URL -P $BIN
      - tar -xvzf $BIN/vic_ui_*.tar.gz
      - ls -la ./$BIN && ./$BIN/ui/sync-vic-ui-version.sh -p bin/ 2>&1
      - rm $BIN/vic_ui_*.tar.gz
    when:
      status:  success

  bundle:
    image: harbor.ci.drone.local/library/golang:1.8
    pull: true
    environment:
      BIN: bin
      BIN_TEMP_DIR: bin/vic
      GOPATH: /go
      SHELL: /bin/bash
    commands:
      - make mark
      - rm -rf $BIN_TEMP_DIR
      - mkdir -p $BIN_TEMP_DIR
      - mv $BIN/ui $BIN_TEMP_DIR
      - cp LICENSE $BIN_TEMP_DIR
      - cp doc/bundle/README $BIN_TEMP_DIR
      - cp $BIN/vic-machine* $BIN_TEMP_DIR
      - cp $BIN/vic-ui* $BIN_TEMP_DIR
      - cp $BIN/appliance.iso $BIN_TEMP_DIR
      - cp $BIN/bootstrap.iso $BIN_TEMP_DIR
      - tar czvf $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz -C $BIN vic
      - shasum -a 256 $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
      - shasum -a 1 $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
      - md5sum $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz
      - du -ks $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz | awk '{print $1 / 1024}' | { read x; echo $x MB; }
      - mkdir bundle
      - mkdir bundle-release
      - cp $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz bundle
      - cp $BIN/vic_${DRONE_BUILD_NUMBER}.tar.gz bundle-release/vic_`git describe --tags $(git rev-list --tags --max-count=1)`.tar.gz
      - make sincemark
    when:
      repo: vmware/vic
      event: [ push, tag ]
      branch: [ master, releases/*, refs/tags/* ]

  notify-slack-on-fail:
    image: plugins/slack
    webhook: ${SLACK_URL}
    username: drone
    template: >
      build https://ci.vcna.io/vmware/vic/{{ build.number }} finished with a {{ build.status }} status, find the logs here: https://console.cloud.google.com/m/cloudstorage/b/vic-ci-logs/o/integration_logs_{{ build.number }}_{{ build.commit }}.zip?authuser=1
    when:
      repo: vmware/vic
      branch: [ master, releases/*, refs/tags/* ]
      status: failure

  notify-slack-on-pass:
    image: plugins/slack
    webhook: ${SLACK_URL}
    username: drone
    template: >
      build https://ci.vcna.io/vmware/vic/{{ build.number }} finished with a {{ build.status }} status, find the build here: https://storage.googleapis.com/vic-engine-builds/vic_{{ build.number }}.tar.gz
    when:
      repo: vmware/vic
      branch: [ master, releases/* ]
      status: success

  notify-slack-on-successful-tag:
    image: plugins/slack
    webhook: ${SLACK_URL}
    username: drone
    template: >
      The latest version of VIC engine has been released, find the build here: https://console.cloud.google.com/storage/browser/vic-engine-releases
    when:
      repo: vmware/vic
      branch: [ refs/tags/* ]
      status: success

  publish-gcs-builds-on-pass:
    image: maplain/drone-gcs:latest
    pull: true
    source: bundle
    target: vic-engine-builds
    acl:
      - allUsers:READER
    cache_control: public,max-age=3600
    when:
      repo: vmware/vic
      event: [ push ]
      branch: [ master, releases/* ]
      status: success

  publish-gcs-builds-on-fail:
    image: maplain/drone-gcs:latest
    pull: true
    source: bundle
    target: vic-engine-failed-builds
    acl:
      - allUsers:READER
    cache_control: public,max-age=3600
    when:
      repo: vmware/vic
      event: [ push ]
      branch: [ master, releases/* ]
      status: failure

  publish-gcs-releases:
    image: maplain/drone-gcs:latest
    pull: true
    source: bundle-release
    target: vic-engine-releases
    acl:
      - allUsers:READER
    cache_control: public,max-age=3600
    when:
      repo: vmware/vic
      event: [ push, tag ]
      branch: [ refs/tags/* ]
      status: success

  trigger-downstream:
      image: plugins/downstream
      server: https://ci.vcna.io
      token: ${DRONE_TOKEN}
      fork: true
      repositories:
        - vmware/vic-product
      when:
        repo: vmware/vic
        event: [ push, tag ]
        branch: [ master, releases/*, refs/tags/* ]
        status: success

  report-coverage:
    image: plugins/coverage
    server: https://coverage.vmware.run
    pattern: .cover/cover.out
    when:
      branch: [ master, releases/*, refs/tags/* ]
      repo: vmware/vic
      status: success
.oOlt13ypYA6XqFJDGw-ujhndtvP9Bb1TZhPQjliWfKY
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/.github/ISSUE_TEMPLATE.md b/installer/vendor/github.com/vmware/vic/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index af8ba34435..0000000000
--- a/installer/vendor/github.com/vmware/vic/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--
-Issues in this repository are for VIC Engine only
-
-Issues related to other components should be submitted to their respective projects:
-VIC Appliance (OVA): https://github.com/vmware/vic-product/issues
-Container Management Portal (Admiral): https://github.com/vmware/admiral/issues
-Container Registry (Harbor): https://github.com/vmware/harbor/issues
-
-If you are unsure which component your issue relates to, submit it to https://github.com/vmware/vic-product/issues and we will triage it
-
-Thank you for contributing to VIC Engine! Please review this checklist before submitting your issue.
-
-[ ] Search for duplicates before logging new issues
-    https://github.com/vmware/vic/issues?q=is%3Aopen+is%3Aissue
-[ ] Questions are best asked and answered on Slack
-    https://vmwarecode.slack.com/messages/vic-engine (see https://github.com/vmware/vic/blob/master/CONTRIBUTING.md#community for details)
--->
-
-#For stories, please include the information below:
-
-**User Statement:**
-
-A brief statement describe who, what and why of the story for example - As a job seeker, I want to search for a job, so I can advance my career.
-
-**Details:**
-Any details of what you want that might clarify for the developer how to approach the implementation.
-
-**Acceptance Criteria:**
-Specific deliverable and actionable items that the story needs to deliver in order to be considered complete, the more detail here the more accurate the implementation will be.
-
-
-#For bug reports, please include the information below:
-
-**VIC version:**
-
-x.y.z / master / commit ID
-
-**Deployment details:**
-
-What was the vic-machine create command used to deploy the VCH?
-
-**Steps to reproduce:**
-
-**Actual behavior:**
-
-**Expected behavior:**
-
-**Logs:**
-
-* If you can access the VCH Admin portal, please download and attach the log bundle(s). See https://vmware.github.io/vic/assets/files/html/vic_admin/log_bundles.html for details.
-* If the VCH Admin portal is inaccessible, you can enable SSH to the VCH endpoint VM to obtain logs manually. See https://vmware.github.io/vic/assets/files/html/vic_admin/vch_ssh_access.html for details. The VCH logs will be under /var/log/vic/ on the VM.
-
-**Additional details as necessary:**
diff --git a/installer/vendor/github.com/vmware/vic/.github/PULL_REQUEST_TEMPLATE.md b/installer/vendor/github.com/vmware/vic/.github/PULL_REQUEST_TEMPLATE.md
deleted file mode 100644
index d102d37a8e..0000000000
--- a/installer/vendor/github.com/vmware/vic/.github/PULL_REQUEST_TEMPLATE.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-Thank you for submitting a pull request!
-
-Here's a checklist you might find useful.
-[  ] There is an associated issue that is labelled
-[  ] Code is up-to-date with the `master` branch
-[  ] You've successfully run `make test` locally
-[  ] There are new or updated unit tests validating the change
-
-Refer to CONTRIBUTING.MD for more details.
-  https://github.com/vmware/vic/blob/master/.github/CONTRIBUTING.md
--->
-
-Fixes #
-
-<!--
-To trigger a custom build with this PR, include one of these in the PR's title or commit messages:
-- To skip running tests (e.g. for a work-in-progress PR), add `[ci skip]` or `[skip ci]`
-to the commit message or the PR title.
-- To run the full test suite, use `[full ci]`.
-- To run _one_ integration test or group, use `[specific ci=$test]`. Examples:
-  - To run the `1-01-Docker-Info` suite: `[specific ci=1-01-Docker-Info]`
-  - To run all suites under the `Group1-Docker-Commands` group: `[specific ci=Group1-Docker-Commands]`
--->
diff --git a/installer/vendor/github.com/vmware/vic/.gitignore b/installer/vendor/github.com/vmware/vic/.gitignore
deleted file mode 100644
index 2dcc738b5e..0000000000
--- a/installer/vendor/github.com/vmware/vic/.gitignore
+++ /dev/null
@@ -1,47 +0,0 @@
-.vagrant/
-.vscode/
-.cover/
-bin/
-binary/
-vic_binaries*.tar.gz
-secrets.yml
-test_secrets.yml
-nightly_ui_tests_secrets.yml
-secrets-e2e.yml
-vic-ci-logs.key
-install-*.tar.gz
-*.log
-log.html
-report.html
-*.xml
-*.gas
-*.pyc
-package.list
-*container-logs.zip
-*certs.zip
-integration_logs*
-vmware-ovftool
-
-# generally a bad idea to check certificates into repos - whitelist if needed
-**/*.pem
-
-lib/apiservers/portlayer/client/
-lib/apiservers/portlayer/cmd
-lib/apiservers/portlayer/models
-lib/apiservers/portlayer/restapi/*.go
-lib/apiservers/portlayer/restapi/operations
-!lib/apiservers/portlayer/restapi/configure_port_layer.go
-lib/config/dynamic/admiral/client
-lib/config/dynamic/admiral/models
-lib/config/dynamic/admiral/operations
-
-tests/.project
-# go test binaries
-*.test
-
-# Intellij files
-*.iml
-
-# Eclipse files
-.project
-
diff --git a/installer/vendor/github.com/vmware/vic/.pullapprove.yml b/installer/vendor/github.com/vmware/vic/.pullapprove.yml
deleted file mode 100644
index b5f6440842..0000000000
--- a/installer/vendor/github.com/vmware/vic/.pullapprove.yml
+++ /dev/null
@@ -1,243 +0,0 @@
-version: 2
-group_defaults:
-  required: 1
-  author_approval:
-    auto: true
-  approve_by_comment:
-    enabled: true
-    approve_regex: 'Approved|:shipit:|:sheep::it:|:\+1:|LGTM|lgtm|yolo|YOLO'
-  reset_on_push:
-    enabled: false
-
-groups:
-  contributors:
-    required: 3
-    teams:
-      - vic-maintainers
-
-  tether:
-    users:
-      - caglar10ur
-      - hickeng
-    conditions:
-      files:
-        include:
-          - "cmd/tether/*"
-          - "lib/tether/*"
-
-  build-ci-infra:
-    users:
-      - mhagen-vmware
-      - rajanashok
-      - rogeliosanchez
-      - mdharamadas1
-    conditions:
-      files:
-        include:
-          - "demos/*"
-          - "infra/*"
-          - "tests/*"
-
-  design-docs:
-    users:
-      - hickeng
-    conditions:
-      files:
-        include:
-          - "doc/design/*"
-
-  docs:
-    users:
-      - stuclem
-      - mdubya66
-      - alextopuzov
-    conditions:
-      files:
-        include:
-          - "doc/*"
-        exclude:
-          - "doc/design/*"
-          - "doc/bundle/*"
-
-  nightlies:
-    users:
-      - rajanashok
-      - mhagen-vmware
-      - rogeliosanchez
-    conditions:
-      files:
-        include:
-          - "tests/nightly/*"
-
-  log:
-    users:
-      - hmahmood
-    conditions:
-      files:
-        include:
-          - "pkg/log/*"
-
-  docker-persona:
-    users:
-      - sflxn
-      - cgtexmex
-      - jzt
-    conditions:
-      files:
-        include:
-          - "lib/apiservers/engine/*"
-          - "cmd/docker/*"
-        exclude:
-          - "lib/apiservers/portlayer/*"
-
-  install:
-    users:
-      - emlin
-      - andrewtchin
-    conditions:
-      files:
-        include:
-          - "cmd/vic-machine/*"
-          - "lib/install/*"
-  upgrade:
-    users:
-      - emlin
-    conditions:
-      files:
-        include:
-          - "lib/migration/*"
-
-  config:
-    users:
-      - emlin
-      - hickeng
-    conditions:
-      files:
-        include:
-          - "lib/config/*"
-          - "lib/metadata/*"
-
-  vicadmin:
-    users:
-      - jzt
-      - gigawhitlocks
-      - sgairo
-    conditions:
-      files:
-        include:
-          - "cmd/vicadmin/*"
-          - "lib/vicadmin/*"
-          - "isos/vicadmin/*"
-
-  port-layer-exec-interaction:
-    users:
-      - caglar10ur
-      - hickeng
-    conditions:
-      files:
-        include:
-          - "lib/portlayer/attach/*"
-          - "lib/portlayer/exec/*"
-          - "lib/portlayer/exec2/*"
-
-  port-layer-storage:
-    users:
-      - jzt
-      - matthewavery
-    conditions:
-      files:
-        include:
-          - "lib/portlayer/storage/*"
-
-  port-layer-store:
-    users:
-      - cgtexmex
-    conditions:
-      files:
-        include:
-          - "lib/portlayer/store/*"
-
-
-  package-kv-store:
-    users:
-      - jzt
-      - matthewavery
-    conditions:
-      files:
-        include:
-          - "pkg/kvstore/*"
-
-  port-layer-network:
-    users:
-      - hmahmood
-      - andrewtchin
-      - caglar10ur
-    conditions:
-      files:
-        include:
-          - "cmd/vic-dns/*"
-          - "lib/dns/*"
-          - "lib/dhcp/*"
-          - "lib/portlayer/network/*"
-
-  events:
-    users:
-      - cgtexmex
-    conditions:
-      files:
-        include:
-          - "lib/portlayer/event/*"
-
-  imagec:
-    users:
-      - jzt
-    conditions:
-      files:
-        include:
-          - "lib/imagec/*"
-
-  vendor:
-    users:
-      - mdubya66
-      - dougm
-    conditions:
-      files:
-        include:
-          - "vendor/*"
-  ui:
-    users:
-      - jooskim
-      - cristianfalcone
-      - jak-atx
-    conditions:
-      files:
-        include:
-          - "ui/*"
-
-  ui-cmd:
-    users:
-      - andrewtchin
-    conditions:
-      files:
-        include:
-          - "cmd/vic-ui/*"
-
-  pullapprove:
-    users:
-      - gigawhitlocks
-      - anchal-agrawal
-    conditions:
-      files:
-        include:
-          - ".pullapprove.yml"
-
-  drone:
-    users:
-      - jakedsouza
-      - rajanashok
-      - mhagen-vmware
-    conditions:
-      files:
-        include:
-          - ".drone.yml"
-          - ".drone.sec"
diff --git a/installer/vendor/github.com/vmware/vic/CONTRIBUTING.md b/installer/vendor/github.com/vmware/vic/CONTRIBUTING.md
deleted file mode 100644
index c18af4f0aa..0000000000
--- a/installer/vendor/github.com/vmware/vic/CONTRIBUTING.md
+++ /dev/null
@@ -1,269 +0,0 @@
-# Contributing to VIC Engine
-
-## Community
-
-Contributors and users are encouraged to collaborate using the following resources in addition to the GitHub issue
-tracker:
-
-- [Slack](https://vmwarecode.slack.com/messages/vic-engine): This is the primary community channel. If you don't have an @vmware.com or @emc.com email, please sign up at https://code.vmware.com/slack to get a Slack invite.
-
-- [Gitter](https://gitter.im/vmware/vic): Gitter is monitored but go to Slack if you need a response quickly.
-
-## Getting started
-
-First, fork the repository on GitHub to your personal account.
-
-Note that _GOPATH_ can be any directory, the example below uses _$HOME/vic_.
-Change _$USER_ below to your GitHub username.
-
-``` shell
-export GOPATH=$HOME/vic
-mkdir -p $GOPATH/src/github.com/vmware
-go get github.com/vmware/vic
-cd $GOPATH/src/github.com/vmware/vic
-git config push.default nothing # anything to avoid pushing to vmware/vic by default
-git remote rename origin vmware
-git remote add $USER git@github.com:$USER/vic.git
-git fetch $USER
-```
-
-See the [README](README.md#building) for build instructions.
-
-## Contribution flow
-
-This is a rough outline of what a contributor's workflow looks like:
-
-- Create a topic branch from where you want to base your work.
-- Make commits of logical units.
-- Make sure your commit messages are in the proper format (see below).
-- Push your changes to a topic branch in your fork of the repository.
-- Test your changes as detailed in the [Automated Testing](#automated-testing) section.
-- Submit a pull request to vmware/vic.
-- Your PR must receive approvals from component owners and at least two approvals overall from maintainers before merging.
-
-Example:
-
-``` shell
-git checkout -b my-new-feature vmware/master
-git commit -a
-git push $USER my-new-feature
-```
-
-### Stay in sync with upstream
-
-When your branch gets out of sync with the vmware/master branch, use the following to update:
-
-``` shell
-git checkout my-new-feature
-git fetch -a
-git rebase vmware/master
-git push --force-with-lease $USER my-new-feature
-```
-
-### Updating pull requests
-
-If your PR fails to pass CI or needs changes based on code review, you'll most likely want to squash these changes into
-existing commits.
-
-If your pull request contains a single commit or your changes are related to the most recent commit, you can simply
-amend the commit.
-
-``` shell
-git add .
-git commit --amend
-git push --force-with-lease $USER my-new-feature
-```
-
-If you need to squash changes into an earlier commit, you can use:
-
-``` shell
-git add .
-git commit --fixup <commit>
-git rebase -i --autosquash vmware/master
-git push --force-with-lease $USER my-new-feature
-```
-
-Be sure to add a comment to the PR indicating your new changes are ready to review, as GitHub does not generate a
-notification when you git push.
-
-### Code style
-
-The coding style suggested by the Golang community is used in VIC. See the
-[style doc](https://github.com/golang/go/wiki/CodeReviewComments) for details.
-
-Try to limit column width to 120 characters for both code and markdown documents such as this one.
-
-### Format of the Commit Message
-
-We follow the conventions on [How to Write a Git Commit Message](http://chris.beams.io/posts/git-commit/).
-
-Be sure to include any related GitHub issue references in the commit message. See
-[GFM syntax](https://guides.github.com/features/mastering-markdown/#GitHub-flavored-markdown) for referencing issues
-and commits.
-
-To help write conforming commit messages, it is recommended to set up the [git-good-commit][commithook] commit hook. Run this command in the VIC repo's root directory:
-
-```shell
-curl https://cdn.rawgit.com/tommarshall/git-good-commit/v0.6.1/hook.sh > .git/hooks/commit-msg && chmod +x .git/hooks/commit-msg
-```
-
-[dronevic]:https://ci.vcna.io/vmware/vic
-[dronesrc]:https://github.com/drone/drone
-[dronecli]:http://readme.drone.io/0.5/install/cli/
-[commithook]:https://github.com/tommarshall/git-good-commit
-
-## Automated Testing
-
-Automated testing uses [Drone][dronesrc].
-
-PRs must pass unit tests and integration tests before being merged into `master`.
-
-There are three keywords to trigger custom CI builds:
-- To skip running tests (e.g. for a work-in-progress PR), add `[ci skip]` or `[skip ci]`
-to the commit message or the PR title.
-- To run the full test suite, use `[full ci]`.
-- To run _one_ integration test or group, use `[specific ci=$test]`. Examples:
-  - To run the `1-01-Docker-Info` suite: `[specific ci=1-01-Docker-Info]`
-  - To run all suites under the `Group1-Docker-Commands` group: `[specific ci=Group1-Docker-Commands]`
-
-You can run the tests locally before making a PR or view the Drone build results for [unit tests and integration tests][dronevic]
-
-If you don't have a running ESX required for tests, you can leverage the automated Drone servers for
-running tests. Add `WIP` (work in progress) to the PR title to alert reviewers that the PR is not ready to be merged.
-
-If your Drone build needs to be restarted, fork the build:
-```shell
-export DRONE_TOKEN=<Drone Token>
-export DRONE_SERVER=https://ci.vcna.io
-
-drone build start --fork vmware/vic <Build Number>
-```
-
-### Testing locally
-
-Developers need to install [Drone CLI][dronecli].
-
-#### Unit tests
-
-``` shell
-drone exec --repo.trusted --secret VIC_ESX_TEST_URL="<USER>:<PASS>@<ESX IP>" .drone.yml
-```
-
-If you don't have a running ESX, tests requiring an ESX can be skipped with the following:
-
-``` shell
-drone exec --repo.trusted
-```
-
-#### Integration tests
-
-Integration tests require a running ESX on which to deploy VIC Engine. See [VIC Integration & Functional Test Suite](tests/README.md).
-
-
-## Reporting Bugs and Creating Issues
-
-When opening a new issue, try to roughly follow the commit message format conventions above.
-
-We use [Zenhub](https://www.zenhub.io/) for project management on top of GitHub issues.  Once you have the Zenhub
-browser plugin installed, click on the [Boards](https://github.com/vmware/vic/issues#boards) tab to open the Zenhub task
-board.
-
-Our task board practices are as follows:
-
-### New Issues
-
-The New Issues are triaged by the team at least once a week.  We try to keep issues from staying in this pipeline for
-too long.  After triaging and issue, it will likely be moved to the backlog or stay under New Issues for deferred
-discussion.
-
-For VIC engineers, you should set the priority based on the below guidelines.  Everyone else, do not set the priority of a new issue.
-
-#### Priorities
-Label: priority/high - critical customer issues, critical bugs that are blocking CI or development.  Research spikes are also considered high priority as they will block future feature development. Be careful with this label, as it will block sprint planning. We want to limit the number of priority/high issues as much as possible.
-
-Label: priority/medium - features that we have committed to deliver in the current release cycle, bugs/tech debt that are important to fix but are not critically blocking anything.
-
-Label: priotiy/low - everything else that is not blocking anything or critical, anything that has a fairly easy workaround, we will work on this as time permits but do not expect anything in this category to be fixed soon.
-
-### Backlog
-
-Issues in Backlog are not a current focus. For example, they may be feature requests or ideas for a future version of
-your project.
-
-When moving issues to the Backlog, add more information (like requirements and outlines) into each issue. It’s useful to
-get ideas out of your head, even if you will not be touching them for a while.
-
-Prioritize issues by dragging and dropping their placement in the pipeline. Issues higher in the pipeline are higher
-priority; accordingly, they should contain all the information necessary to get started when the time
-comes.  Low-priority issues should still contain at least a short description.
-
-### To Do
-
-This is the team’s current focus and issues should be well-defined.  This pipeline should contain the high-priority
-items for the current milestone.  These issues must have an assignee, milestone, estimate and tags.  Items are moved
-from this pipeline to In Progress when work has been started.
-
-### In Progress
-
-This is the answer to, "What are you working on right now? Ideally, this pipeline will not contain more issues than
-members of the team; each team member should be working on one thing at a time.
-
-This pipeline is a good candidate for WIP (work-in-progress) limits. WIP limits help ensure your work flows smoothly,
-and help bring to light any blockers or bottlenecks. Adjust WIP limits according to the size of your team.
-
-To move an issue into the In Progress swim lane several steps must be taken.
-
-1. Assign yourself as the owner.
-2. Ensure the milestone is set (if there is one) and also review the labels to ensure they accurately reflect the issue.
-3. Assign an estimated level of effort. See the below table for guidance for effort mapping.
-
-After an issue is In Progress it is the best practice to update the issue with current progress and any discussions that may occur via the various collaboration tools used. An issue that is in progress should not go more than 2 days without updates.
-
-Story Points | Story Size
------------- | -------------------------------------------------------
-1            | Less than 1 day of effort
-2            | 2 - 3 days of effort
-3            | 3 - 5 days of effort
-5            | 5 - 10 days of effort, consider splitting this if it's 7 - 10 days
-8            | > 10 days, anything of this size should be split before moving into In Progress
-
-Note: Epics should never be In Progress
-
-### Verify
-
-A "Verify" issue normally means the feature or fix is in code review and/or awaiting further testing.  These issues require one final QE sign off or at the end of a sprint another dev that didn't work on the issue can verify the issue.
-
-In most cases, an issue should be in Verify _before_ the corresponding PR is merged. The developer can then close the issue while merging the PR.
-
-### Closed
-
-This pipeline includes all closed issues, it can be filtered like the rest of the Board – by Label, Assignee or
-Milestone.
-
-This pipeline is also interactive: dragging issues into this pipeline will close them, while dragging them out will
-re-open them.
-
-## High level project planning
-
-We use the following structure for higher level project management
-* Epic (zenhub) - implements a functional change - for example 'attach, stdout only', may span milestones and releases. Expected to be broken down from larger Epics into smaller epics prior to commencement.
-* Milestones - essentially higher level user stories
-* Labels - either by functional area (`component/...`) or feature (`feature/...`)
-
-
-## Repository structure
-
-The layout in the repo is as follows - this is a recent reorganisation so there is still some mixing between directories:
-* cmd - the main packages for compiled components
-* doc - all project documentation other than the standard files in the root
-* infra - supporting scripts, utilities, et al
-* isos - ISO mastering scripts and uncompiled content
-* lib - common library packages that are tightly coupled to vmware/vic
-* pkg - packages that are not tightly coupled to vmware/vic and could be usefully consumed in other projects. There is still some sanitization to do here.
-* tests - integration and system test code that doesn't use go test
-* vendor - standard Go vendor model
-
-## Troubleshooting
-
-* If you're building the project in a VM, ensure that it has at least 4GB memory to avoid issues while running the build.
-
diff --git a/installer/vendor/github.com/vmware/vic/LICENSE b/installer/vendor/github.com/vmware/vic/LICENSE
index ad30e2f9b2..042004fda0 100644
--- a/installer/vendor/github.com/vmware/vic/LICENSE
+++ b/installer/vendor/github.com/vmware/vic/LICENSE
@@ -2,11 +2,10 @@ LICENSE
 
 vSphere Integrated Containers Engine
 
-Copyright (c) 2016-2017 VMware, Inc.  All rights reserved.
+Copyright (c) 2016-2018 VMware, Inc.  All rights reserved.
 
-This product is licensed to you under the Apache License version 2.0
-(the License). You may not use this product except in compliance with the
-License.
+This product is licensed to you under the Apache License version 2.0 (the “License”).
+You may not use this product except in compliance with the License.
 
                            Apache License
                      Version 2.0, January 2004
@@ -209,8121 +208,3 @@ distributed under the License is distributed on an "AS IS" BASIS,
 WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
-
-======================================================================
-
-vSphere Integrated Containers Engine v1.2.0 GA includes a number of
-components with separate copyright notices and license terms.  This
-product does not necessarily use all the open source components referred
-to below. Your use of the source code for these components is subject to
-the terms and conditions of the following licenses.
-
-===========================================================================
-
-The following copyright statements and licenses apply to various open
-source software packages (or portions thereof) that are distributed with
-this VMware Product.
-
-The VMware Product may also include other VMware components, which may
-contain additional open source software packages. One or more such
-open_source_licenses.txt files may therefore accompany this VMware
-Product.
-
-The VMware Product that includes this file does not necessarily use all
-the open source software packages referred to below and may also only
-use portions of a given package.
-
-======================== TABLE OF CONTENTS =============================
-
-The following is a listing of the open source components detailed in
-this document. This list is provided for your convenience; please read
-further if you wish to review the copyright notice(s) and the full text
-of the license associated with each component.
-
-
-SECTION 1: BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES
-   >>> agl_ed25519-master
-   >>> airbrake_gobrake_v2-c9d51adc624b5cc4c1bf8de730a09af4878ffe2d
-   >>> api_compute_v1-dfa61ae24628a06502b9c2805d983b57e89399b5
-   >>> api_gensupport-dfa61ae24628a06502b9c2805d983b57e89399b5
-   >>> api_googleapi-dfa61ae24628a06502b9c2805d983b57e89399b5
-   >>> armon_go-metrics-f303b03b91d770a11a39677f1d3b55da4002bbcb
-   >>> armon_go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2
-   >>> asaskevich_govalidator-9699ab6b38bee2e02cd3fe8b99ecf67665395c96
-   >>> azure_go-ansiterm-70b2c90b260171e829f1ebd7c17f600c11858dbe
-   >>> boltdb_bolt-b514920f8f2e0a68f857e5a12c774f385a59aef9
-   >>> cenkalti_backoff-b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-   >>> client9_misspell-9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f
-   >>> codegangsta_cli-master
-   >>> cpuguy83_go-md2man_md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
-   >>> d2g_dhcp4-f0e4d29ff0231dce36e250b2ed9ff08412584bca
-   >>> deckarep_golang-set-1f0f4ff8d3fbef9328522993ce71c35890f67554
-   >>> dustin_go-humanize-259d2a102b871d17f30e3cd9881a642961a1e486
-   >>> gemnasium_logrus-airbrake-hook_v2-31e6fd4bd5a98d8ee7673d24bc54ec73c31810dd
-   >>> gizak_termui-798ffb9cbbe4073ef1f88e6069ca4a2c6aa6676b
-   >>> go-check_check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec
-   >>> godbus_dbus-230e4b23db2fd81c53eaa0073f76659d4849ce51
-   >>> gogo_protobuf_gogoproto-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-   >>> gogo_protobuf_proto-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-   >>> gogo_protobuf_protoc-gen-gogo_descriptor-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-   >>> gogo_protobuf_sortkeys-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-   >>> gogo_protobuf_types-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-   >>> golang_lint-cb00e5669539f047b2f4c53a421a01b0c8e172c6
-   >>> google_go-github_github-7a51fb928f52a196d5f31daefb8a489453ef54ff
-   >>> google_go-querystring_query-53e6ce116135b80d037921a7fdd5138cf32d7a8a
-   >>> google_uuid-f3f4b54b2fabcf1f11dcc939025bb0c109b00ed8
-   >>> googleapis_gax-go-da06d194a00e19ce00d9011a13931c3f6f6887c7
-   >>> gorilla_context-1c83b3eabd45b6d76072b66b746c20815fb2872d
-   >>> gorilla_mux-acf3be1b335c8ce30b2c8d51300984666f0ceefa
-   >>> gorilla_securecookie-fa5329f913702981df43dcb2a380bac429c810b5
-   >>> gorilla_sessions-ca9ada44574153444b00d3fd9c8559e4cc95f896
-   >>> gorilla_websocket-a91eba7f97777409bc2c443f5534d41dd20c5720
-   >>> graylog2_go-gelf_gelf-master
-   >>> grpc-b1a2821ca5a4fd6b6e48ddfbb7d6d7584d839d21
-   >>> hpcloud_tail-a30252cb686a21eb2d0b98132633053ec2f7f1e5
-   >>> jessevdk_go-flags-97448c91aac742cbca3d020b3e769013a420a06f
-   >>> kr_pty-f7ee69f31298ecbe5d2b349c711e2547a617d398
-   >>> mailru_easyjson-99e922cf9de1bc0ab38310c277cff32c2147e747
-   >>> matryer_resync-d39c09a11215c84aab0b65e323fc47dd6e276af1
-   >>> mattn_go-runewidth-14207d285c6c197daabb5c9793d63e7af9ab2d50
-   >>> microsoft_go-winio-24a3e3d3fc7451805e09d11e11e95d9a0a4f205e
-   >>> microsoft_hcsshim-d327ca738085de7d617aa1df16d98fe7a64c2455
-   >>> miekg_dns-ca336a1f95a6b89be9c250df26c7a41742eb4a6f
-   >>> mitchellh_go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8
-   >>> mitchellh_mapstructure-5a0325d7fafaac12dda6e7fb8bd222ec1b69875e
-   >>> mreiferson_go-httpclient-31f0106b4474f14bc441575c19d3a5fa21aa1f6c
-   >>> naoina_denco-9af2ba0e24214bac003821f4a501b131b2e04c75
-   >>> nlopes_slack-f243c7602fdf906248fc1f165284daa4e4d2d09e
-   >>> nsf_termbox-go-91bae1bb5fa9ee504905ecbe7043fa30e92feaa3
-   >>> opennota_urlesc-5fa9ff0392746aeae1c4b37fcc42c65afa7a9587
-   >>> pkg_profile-8a808a6967b79da66deacfe508b26d398a69518f
-   >>> puerkitobio_purell-d69616f51cdfcd7514d6a380847a152dfc2a749d
-   >>> racksec_srslog-a974ba6f7fb527d2ddc73ee9c05d3e2ccc0af0dc
-   >>> ryanuber_go-glob-256dc444b735e061061cf46c809487313d5b0065
-   >>> sirupsen_logrus-d26492970760ca5d33129d2d799e34be5c4782eb
-   >>> smartystreets_assertions-287b4346dc4e71a038c346375a9d572453bc469b
-   >>> smartystreets_assertions_internal_oglematchers-287b4346dc4e71a038c346375a9d572453bc469b
-   >>> smartystreets_assertions_internal_oglemock-287b4346dc4e71a038c346375a9d572453bc469b
-   >>> smartystreets_assertions_internal_ogletest-287b4346dc4e71a038c346375a9d572453bc469b
-   >>> smartystreets_assertions_internal_reqtrace-287b4346dc4e71a038c346375a9d572453bc469b
-   >>> stretchr_objx-1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-   >>> tomb_v1-dd632973f1e7218eb1089048e0798ec9ae7dceb8
-   >>> tylerb_graceful-d7d7a205e779a4738d38eda0671fff8bfc965f14
-   >>> ugorji_go_codec-708a42d246822952f38190a8d8c4e6b16a0e600c
-   >>> urfave_cli_v1-0bdeddeeb0f650497d603c4ad7b20cfe685682f6
-   >>> x_crypto_acme-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_curve25519-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_ed25519-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_nacl_secretbox-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_poly1305-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_salsa20_salsa-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_crypto_ssh-728b753d0135da6801d45a38e6f43ff55779c5c2
-   >>> x_net_context-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_http2-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_idna-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_internal_timeseries-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_lex_httplex-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_proxy-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_trace-a6577fac2d73be281a500b310739095313165611
-   >>> x_net_websocket-a6577fac2d73be281a500b310739095313165611
-   >>> x_oauth2-1611bb46e67abc64a71ecc5c3ae67f1cbbc2b921
-   >>> x_sync_singleflight-5a06fca2c336a4b2b2fcb45702e8c47621b2aa2c
-   >>> x_sys_unix-99f16d856c9836c42d24e7ab64ea72916925fa97
-   >>> x_sys_windows-99f16d856c9836c42d24e7ab64ea72916925fa97
-   >>> x_text_internal-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-   >>> x_text_language-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-   >>> x_text_message-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-   >>> x_tools_go_ast_astutil-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-   >>> x_tools_go_buildutil-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-   >>> x_tools_go_gcexportdata-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-   >>> x_tools_go_gcimporter15-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-   >>> x_tools_go_loader-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-   >>> x_tools_imports-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-SECTION 2: Apache License, V2.0
-   >>> appengine-ca59ef35f409df61fa4a5f8290ff289b37eccfb8
-   >>> aws_aws-sdk-go_aws-master
-   >>> coreos_etcd_client-781196fa8746d6c34ace2a62898051af6dc46002
-   >>> coreos_etcd_version-781196fa8746d6c34ace2a62898051af6dc46002
-   >>> coreos_go-semver_semver-5e3acbb5668c4c3deb4842615c4098eb61fb6b1e
-   >>> docker_distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc
-   >>> docker_go-events-aa2e3b613fbbfdddbe055a7b9e3ce271cfd83eca
-   >>> docker_libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd
-   >>> docker_libtrust-9cbd2a1374f46905c68a4eb3694a130610adc62a
-   >>> go-openapi_analysis-d5a75b7d751ca3f11ad5d93cfe97405f2c3f6a47
-   >>> go-openapi_errors-fc3f73a224499b047eda7191e5d22e1e9631e86f
-   >>> go-openapi_jsonpointer-779f45308c19820f1a69e9a4cd965f496e0da10f
-   >>> go-openapi_jsonreference-36d33bfe519efae5632669801b180bf1a245da3b
-   >>> go-openapi_loads-6bb6486231e079ea125c0f39994ed3d0c53399ed
-   >>> go-openapi_runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854
-   >>> go-openapi_spec-e072eb2390d3a03736a6eb617d30f48369160447
-   >>> go-openapi_strfmt-0cb3db44c13bad3b3f567b762a66751972a310cc
-   >>> go-openapi_swag-96d7b9ebd181a1735a1c9ac87914f2b32fbf56c9
-   >>> go-openapi_validate-035dcd74f1f61e83debe1c22950dc53556e7e4b2
-   >>> go_compute_metadata-cd0da878c66091060d2e7403abd62192b3e387e0
-   >>> go_internal-cd0da878c66091060d2e7403abd62192b3e387e0
-   >>> golang_glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998
-   >>> golang_groupcache_lru-72d04f9fcdec7d3821820cc4a6f150eae553639a
-   >>> govmomi-0.15.0
-   >>> maruel_panicparse_stack-25bcac0d793cf4109483505a0d66e066a3a90a80
-   >>> syncutil_singleflight-7ce08ca145dbe0e66a127c447b80ee7914f3e4f9
-   >>> vdemeester_shakers-24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
-   >>> vishvananda_netlink-482f7a52b758233521878cb6c5904b6bd63f3457
-   >>> vishvananda_netns-604eaf189ee867d8c147fafc28def2394e878d25
-   >>> yaml_v2-4c78c975fe7c825c6d1466c42be594d1d6f3aba6
-
-SECTION 3: Mozilla Public License, V2.0
-   >>> d2g_dhcp4client-master
-   >>> hashicorp_go-cleanhttp-875fb671b3ddc66f8e2f0acc33829c8cb989a38d
-   >>> hashicorp_memberlist-cef12ad58224d55cf26caa9e3d239c2fcb3432a2
-
-APPENDIX. Standard License Files
-
-   >>> Apache License, V2.0
-
-   >>> Mozilla Public License, V2.0
-
-   >>> Creative Commons Attribution 4.0 International
-
-   >>> Creative Commons Attribution License, V3.0
-
-   >>> Creative Commons Attribution-ShareAlike, V4.0
-
-   >>> GNU Lesser General Public License, V3.0
-
---------------- SECTION 1:  BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES ----------
-
-BSD-STYLE, MIT-STYLE, OR SIMILAR STYLE LICENSES are applicable to the following component(s).
-
->>> agl_ed25519-master
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> airbrake_gobrake_v2-c9d51adc624b5cc4c1bf8de730a09af4878ffe2d
-
-Copyright (c) 2014 The Gobrake Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> api_compute_v1-dfa61ae24628a06502b9c2805d983b57e89399b5
-
-Copyright (c) 2011 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
->>> api_gensupport-dfa61ae24628a06502b9c2805d983b57e89399b5
-
-Copyright (c) 2011 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Apache 2.0
-
-google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar.gz\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5\examples\pubsub.go
-
-Copyright 2017 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-> BSD
-
-google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar.gz\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5\examples\mapsengine.go
-
-Copyright 2014 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-> MIT
-
-google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar.gz\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5\googleapi\internal\uritemplates\LICENSE
-
-Copyright (c) 2013 Joshua Tacoma
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> api_googleapi-dfa61ae24628a06502b9c2805d983b57e89399b5
-
-Copyright (c) 2011 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar.gz\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5(1).tar\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5\googleapi\internal\uritemplates\LICENSE
-
-Copyright (c) 2013 Joshua Tacoma
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-> Apache 2.0
-
-google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5.tar.gz\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5(1).tar\google-api-go-client-dfa61ae24628a06502b9c2805d983b57e89399b5\examples\compute.go
-
-Copyright 2017 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
->>> armon_go-metrics-f303b03b91d770a11a39677f1d3b55da4002bbcb
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Armon Dadgar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> armon_go-radix-4239b77079c7b5d1243b7b4736304ce8ddb6f0f2
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Armon Dadgar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> asaskevich_govalidator-9699ab6b38bee2e02cd3fe8b99ecf67665395c96
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Alex Saskevich
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> azure_go-ansiterm-70b2c90b260171e829f1ebd7c17f600c11858dbe
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> boltdb_bolt-b514920f8f2e0a68f857e5a12c774f385a59aef9
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Ben Johnson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> cenkalti_backoff-b02f2bbce11d7ea6b97f282ef1771b0fe2f65ef3
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Cenk Alti
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> client9_misspell-9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f
-
-The MIT License (MIT)
-
-Copyright (c) 2015-2016 Nick Galbreath
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-3 Clause
-
-misspell-9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f.tar.gz\misspell-9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f.tar\misspell-9a1fc2456ac9e8c9b4cbe9d005b6e7adac0d357f\stringreplacer\LICENSE
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> codegangsta_cli-master
-
-MIT License
-
-Copyright (c) 2016 Jeremy Saenz & Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> cpuguy83_go-md2man_md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Brian Goff
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2
-
-go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar.gz\go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa.tar\go-md2man-a65d4d2de4d5f7c74868dfa9b202a3c8be315aaa\vendor\github.com\russross\blackfriday\LICENSE.txt
-
-Copyright © 2011 Russ Ross
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1.  Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-
-2.  Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following
-disclaimer in the documentation and/or other materials provided with
-the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGE.
-
-
->>> d2g_dhcp4-f0e4d29ff0231dce36e250b2ed9ff08412584bca
-
-Copyright (c) 2013 Skagerrak Software Limited. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Skagerrak Software Limited nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> deckarep_golang-set-1f0f4ff8d3fbef9328522993ce71c35890f67554
-
-Open Source Initiative OSI - The MIT License (MIT):Licensing
-
-The MIT License (MIT)
-Copyright (c) 2013 Ralph Caraveo (deckarep@gmail.com)
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> dustin_go-humanize-259d2a102b871d17f30e3cd9881a642961a1e486
-
-Copyright (c) 2005-2008  Dustin Sallings <dustin@spy.net>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-<http://www.opensource.org/licenses/mit-license.php>
-
-
->>> gemnasium_logrus-airbrake-hook_v2-31e6fd4bd5a98d8ee7673d24bc54ec73c31810dd
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Gemnasium
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> gizak_termui-798ffb9cbbe4073ef1f88e6069ca4a2c6aa6676b
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Zack Guo
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> go-check_check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec
-
-Gocheck - A rich testing framework for Go
-
-Copyright (c) 2010-2013 Gustavo Niemeyer <gustavo@niemeyer.net>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-   list of conditions and the following disclaimer.
-2. Redistributions in binary form must reproduce the above copyright notice,
-   this list of conditions and the following disclaimer in the documentation
-   and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD 3
-
-check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar.gz\check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec.tar\check-20d25e2804050c1cd24a7eea1e7a6447dd0e74ec\benchmark.go
-
- Copyright (c) 2012 The Go Authors. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-    * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-    * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> godbus_dbus-230e4b23db2fd81c53eaa0073f76659d4849ce51
-
-Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gogo_protobuf_gogoproto-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https:github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD 2
-
-protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar.gz\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7\vanity\test\proto3.proto
-
- Protocol Buffers for Go with Gadgets
-
- Copyright (c) 2015, The GoGo Authors. All rights reserved.
- http:github.com/gogo/protobuf
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-     * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-     * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gogo_protobuf_proto-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2
-
-protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar.gz\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7\plugin\compare\compare.go
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gogo_protobuf_protoc-gen-gogo_descriptor-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https:github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2 clause
-
-protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar.gz\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7\codec\codec.go
-
-Copyright (c) 2015, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gogo_protobuf_sortkeys-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-ADDITIONAL LICNSE INFORMATION :
-
-> BSD-2
-
-protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar.gz\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7\codec\codec.go
-
-Copyright (c) 2015, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gogo_protobuf_types-6a92c871a8f5333cf106b2cdf937567208dbb2b7
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2
-
-protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar.gz\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7.tar\protobuf-6a92c871a8f5333cf106b2cdf937567208dbb2b7\plugin\compare\compare.go
-
-Protocol Buffers for Go with Gadgets
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http:github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> golang_lint-cb00e5669539f047b2f4c53a421a01b0c8e172c6
-
-Copyright (c) 2013 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> google_go-github_github-7a51fb928f52a196d5f31daefb8a489453ef54ff
-
-Copyright (c) 2013 The go-github AUTHORS. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-----------
-
-Some documentation is taken from the GitHub Developer site
-<https://developer.github.com/>, which is available under the following Creative
-Commons Attribution 3.0 License. This applies only to the go-github source
-code and would not apply to any compiled binaries.
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN AS
-AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE MAY
-BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
- a. "Adaptation" means a work based upon the Work, or upon the Work and
-    other pre-existing works, such as a translation, adaptation,
-    derivative work, arrangement of music or other alterations of a
-    literary or artistic work, or phonogram or performance and includes
-    cinematographic adaptations or any other form in which the Work may be
-    recast, transformed, or adapted including in any form recognizably
-    derived from the original, except that a work that constitutes a
-    Collection will not be considered an Adaptation for the purpose of
-    this License. For the avoidance of doubt, where the Work is a musical
-    work, performance or phonogram, the synchronization of the Work in
-    timed-relation with a moving image ("synching") will be considered an
-    Adaptation for the purpose of this License.
- b. "Collection" means a collection of literary or artistic works, such as
-    encyclopedias and anthologies, or performances, phonograms or
-    broadcasts, or other works or subject matter other than works listed
-    in Section 1(f) below, which, by reason of the selection and
-    arrangement of their contents, constitute intellectual creations, in
-    which the Work is included in its entirety in unmodified form along
-    with one or more other contributions, each constituting separate and
-    independent works in themselves, which together are assembled into a
-    collective whole. A work that constitutes a Collection will not be
-    considered an Adaptation (as defined above) for the purposes of this
-    License.
- c. "Distribute" means to make available to the public the original and
-    copies of the Work or Adaptation, as appropriate, through sale or
-    other transfer of ownership.
- d. "Licensor" means the individual, individuals, entity or entities that
-    offer(s) the Work under the terms of this License.
- e. "Original Author" means, in the case of a literary or artistic work,
-    the individual, individuals, entity or entities who created the Work
-    or if no individual or entity can be identified, the publisher; and in
-    addition (i) in the case of a performance the actors, singers,
-    musicians, dancers, and other persons who act, sing, deliver, declaim,
-    play in, interpret or otherwise perform literary or artistic works or
-    expressions of folklore; (ii) in the case of a phonogram the producer
-    being the person or legal entity who first fixes the sounds of a
-    performance or other sounds; and, (iii) in the case of broadcasts, the
-    organization that transmits the broadcast.
- f. "Work" means the literary and/or artistic work offered under the terms
-    of this License including without limitation any production in the
-    literary, scientific and artistic domain, whatever may be the mode or
-    form of its expression including digital form, such as a book,
-    pamphlet and other writing; a lecture, address, sermon or other work
-    of the same nature; a dramatic or dramatico-musical work; a
-    choreographic work or entertainment in dumb show; a musical
-    composition with or without words; a cinematographic work to which are
-    assimilated works expressed by a process analogous to cinematography;
-    a work of drawing, painting, architecture, sculpture, engraving or
-    lithography; a photographic work to which are assimilated works
-    expressed by a process analogous to photography; a work of applied
-    art; an illustration, map, plan, sketch or three-dimensional work
-    relative to geography, topography, architecture or science; a
-    performance; a broadcast; a phonogram; a compilation of data to the
-    extent it is protected as a copyrightable work; or a work performed by
-    a variety or circus performer to the extent it is not otherwise
-    considered a literary or artistic work.
- g. "You" means an individual or entity exercising rights under this
-    License who has not previously violated the terms of this License with
-    respect to the Work, or who has received express permission from the
-    Licensor to exercise rights under this License despite a previous
-    violation.
- h. "Publicly Perform" means to perform public recitations of the Work and
-    to communicate to the public those public recitations, by any means or
-    process, including by wire or wireless means or public digital
-    performances; to make available to the public Works in such a way that
-    members of the public may access these Works from a place and at a
-    place individually chosen by them; to perform the Work to the public
-    by any means or process and the communication to the public of the
-    performances of the Work, including by public digital performance; to
-    broadcast and rebroadcast the Work by any means including signs,
-    sounds or images.
- i. "Reproduce" means to make copies of the Work by any means including
-    without limitation by sound or visual recordings and the right of
-    fixation and reproducing fixations of the Work, including storage of a
-    protected performance or phonogram in digital form or other electronic
-    medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
- a. to Reproduce the Work, to incorporate the Work into one or more
-    Collections, and to Reproduce the Work as incorporated in the
-    Collections;
- b. to create and Reproduce Adaptations provided that any such Adaptation,
-    including any translation in any medium, takes reasonable steps to
-    clearly label, demarcate or otherwise identify that changes were made
-    to the original Work. For example, a translation could be marked "The
-    original work was translated from English to Spanish," or a
-    modification could indicate "The original work has been modified.";
- c. to Distribute and Publicly Perform the Work including as incorporated
-    in Collections; and,
- d. to Distribute and Publicly Perform Adaptations.
- e. For the avoidance of doubt:
-
-     i. Non-waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme cannot be waived, the Licensor
-        reserves the exclusive right to collect such royalties for any
-        exercise by You of the rights granted under this License;
-    ii. Waivable Compulsory License Schemes. In those jurisdictions in
-        which the right to collect royalties through any statutory or
-        compulsory licensing scheme can be waived, the Licensor waives the
-        exclusive right to collect such royalties for any exercise by You
-        of the rights granted under this License; and,
-   iii. Voluntary License Schemes. The Licensor waives the right to
-        collect royalties, whether individually or, in the event that the
-        Licensor is a member of a collecting society that administers
-        voluntary licensing schemes, via that society, from any exercise
-        by You of the rights granted under this License.
-
-The above rights may be exercised in all media and formats whether now
-known or hereafter devised. The above rights include the right to make
-such modifications as are technically necessary to exercise the rights in
-other media and formats. Subject to Section 8(f), all rights not expressly
-granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly made
-subject to and limited by the following restrictions:
-
- a. You may Distribute or Publicly Perform the Work only under the terms
-    of this License. You must include a copy of, or the Uniform Resource
-    Identifier (URI) for, this License with every copy of the Work You
-    Distribute or Publicly Perform. You may not offer or impose any terms
-    on the Work that restrict the terms of this License or the ability of
-    the recipient of the Work to exercise the rights granted to that
-    recipient under the terms of the License. You may not sublicense the
-    Work. You must keep intact all notices that refer to this License and
-    to the disclaimer of warranties with every copy of the Work You
-    Distribute or Publicly Perform. When You Distribute or Publicly
-    Perform the Work, You may not impose any effective technological
-    measures on the Work that restrict the ability of a recipient of the
-    Work from You to exercise the rights granted to that recipient under
-    the terms of the License. This Section 4(a) applies to the Work as
-    incorporated in a Collection, but this does not require the Collection
-    apart from the Work itself to be made subject to the terms of this
-    License. If You create a Collection, upon notice from any Licensor You
-    must, to the extent practicable, remove from the Collection any credit
-    as required by Section 4(b), as requested. If You create an
-    Adaptation, upon notice from any Licensor You must, to the extent
-    practicable, remove from the Adaptation any credit as required by
-    Section 4(b), as requested.
- b. If You Distribute, or Publicly Perform the Work or any Adaptations or
-    Collections, You must, unless a request has been made pursuant to
-    Section 4(a), keep intact all copyright notices for the Work and
-    provide, reasonable to the medium or means You are utilizing: (i) the
-    name of the Original Author (or pseudonym, if applicable) if supplied,
-    and/or if the Original Author and/or Licensor designate another party
-    or parties (e.g., a sponsor institute, publishing entity, journal) for
-    attribution ("Attribution Parties") in Licensor's copyright notice,
-    terms of service or by other reasonable means, the name of such party
-    or parties; (ii) the title of the Work if supplied; (iii) to the
-    extent reasonably practicable, the URI, if any, that Licensor
-    specifies to be associated with the Work, unless such URI does not
-    refer to the copyright notice or licensing information for the Work;
-    and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-    a credit identifying the use of the Work in the Adaptation (e.g.,
-    "French translation of the Work by Original Author," or "Screenplay
-    based on original Work by Original Author"). The credit required by
-    this Section 4 (b) may be implemented in any reasonable manner;
-    provided, however, that in the case of a Adaptation or Collection, at
-    a minimum such credit will appear, if a credit for all contributing
-    authors of the Adaptation or Collection appears, then as part of these
-    credits and in a manner at least as prominent as the credits for the
-    other contributing authors. For the avoidance of doubt, You may only
-    use the credit required by this Section for the purpose of attribution
-    in the manner set out above and, by exercising Your rights under this
-    License, You may not implicitly or explicitly assert or imply any
-    connection with, sponsorship or endorsement by the Original Author,
-    Licensor and/or Attribution Parties, as appropriate, of You or Your
-    use of the Work, without the separate, express prior written
-    permission of the Original Author, Licensor and/or Attribution
-    Parties.
- c. Except as otherwise agreed in writing by the Licensor or as may be
-    otherwise permitted by applicable law, if You Reproduce, Distribute or
-    Publicly Perform the Work either by itself or as part of any
-    Adaptations or Collections, You must not distort, mutilate, modify or
-    take other derogatory action in relation to the Work which would be
-    prejudicial to the Original Author's honor or reputation. Licensor
-    agrees that in those jurisdictions (e.g. Japan), in which any exercise
-    of the right granted in Section 3(b) of this License (the right to
-    make Adaptations) would be deemed to be a distortion, mutilation,
-    modification or other derogatory action prejudicial to the Original
-    Author's honor and reputation, the Licensor will waive or not assert,
-    as appropriate, this Section, to the fullest extent permitted by the
-    applicable national law, to enable You to reasonably exercise Your
-    right under Section 3(b) of this License (right to make Adaptations)
-    but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability. EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE
-LAW, IN NO EVENT WILL LICENSOR BE LIABLE TO YOU ON ANY LEGAL THEORY FOR
-ANY SPECIAL, INCIDENTAL, CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES
-ARISING OUT OF THIS LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS
-BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
- a. This License and the rights granted hereunder will terminate
-    automatically upon any breach by You of the terms of this License.
-    Individuals or entities who have received Adaptations or Collections
-    from You under this License, however, will not have their licenses
-    terminated provided such individuals or entities remain in full
-    compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8 will
-    survive any termination of this License.
- b. Subject to the above terms and conditions, the license granted here is
-    perpetual (for the duration of the applicable copyright in the Work).
-    Notwithstanding the above, Licensor reserves the right to release the
-    Work under different license terms or to stop distributing the Work at
-    any time; provided, however that any such election will not serve to
-    withdraw this License (or any other license that has been, or is
-    required to be, granted under the terms of this License), and this
-    License will continue in full force and effect unless terminated as
-    stated above.
-
-8. Miscellaneous
-
- a. Each time You Distribute or Publicly Perform the Work or a Collection,
-    the Licensor offers to the recipient a license to the Work on the same
-    terms and conditions as the license granted to You under this License.
- b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-    offers to the recipient a license to the original Work on the same
-    terms and conditions as the license granted to You under this License.
- c. If any provision of this License is invalid or unenforceable under
-    applicable law, it shall not affect the validity or enforceability of
-    the remainder of the terms of this License, and without further action
-    by the parties to this agreement, such provision shall be reformed to
-    the minimum extent necessary to make such provision valid and
-    enforceable.
- d. No term or provision of this License shall be deemed waived and no
-    breach consented to unless such waiver or consent shall be in writing
-    and signed by the party to be charged with such waiver or consent.
- e. This License constitutes the entire agreement between the parties with
-    respect to the Work licensed here. There are no understandings,
-    agreements or representations with respect to the Work not specified
-    here. Licensor shall not be bound by any additional provisions that
-    may appear in any communication from You. This License may not be
-    modified without the mutual written agreement of the Licensor and You.
- f. The rights granted under, and the subject matter referenced, in this
-    License were drafted utilizing the terminology of the Berne Convention
-    for the Protection of Literary and Artistic Works (as amended on
-    September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-    Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996
-    and the Universal Copyright Convention (as revised on July 24, 1971).
-    These rights and subject matter take effect in the relevant
-    jurisdiction in which the License terms are sought to be enforced
-    according to the corresponding provisions of the implementation of
-    those treaty provisions in the applicable national law. If the
-    standard suite of rights granted under applicable copyright law
-    includes additional rights not granted under this License, such
-    additional rights are deemed to be included in the License; this
-    License is not intended to restrict the license of any rights under
-    applicable law.
-
-
-Creative Commons Notice
-
-    Creative Commons is not a party to this License, and makes no warranty
-    whatsoever in connection with the Work. Creative Commons will not be
-    liable to You or any party on any legal theory for any damages
-    whatsoever, including without limitation any general, special,
-    incidental or consequential damages arising in connection to this
-    license. Notwithstanding the foregoing two (2) sentences, if Creative
-    Commons has expressly identified itself as the Licensor hereunder, it
-    shall have all rights and obligations of Licensor.
-
-    Except for the limited purpose of indicating to the public that the
-    Work is licensed under the CCPL, Creative Commons does not authorize
-    the use by either party of the trademark "Creative Commons" or any
-    related trademark or logo of Creative Commons without the prior
-    written consent of Creative Commons. Any permitted use will be in
-    compliance with Creative Commons' then-current trademark usage
-    guidelines, as may be published on its website or otherwise made
-    available upon request from time to time. For the avoidance of doubt,
-    this trademark restriction does not form part of this License.
-
-    Creative Commons may be contacted at http://creativecommons.org/.
-
-
->>> google_go-querystring_query-53e6ce116135b80d037921a7fdd5138cf32d7a8a
-
-Copyright (c) 2013 Google. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> google_uuid-f3f4b54b2fabcf1f11dcc939025bb0c109b00ed8
-
-Copyright (c) 2009,2014 Google Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD Style
-
-uuid-f3f4b54b2fabcf1f11dcc939025bb0c109b00ed8.tar.gz\uuid-f3f4b54b2fabcf1f11dcc939025bb0c109b00ed8.tar\uuid-f3f4b54b2fabcf1f11dcc939025bb0c109b00ed8\dce.go
-
-Copyright 2016 Google Inc.  All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
->>> googleapis_gax-go-da06d194a00e19ce00d9011a13931c3f6f6887c7
-
-Copyright 2016, Google Inc.
-All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gorilla_context-1c83b3eabd45b6d76072b66b746c20815fb2872d
-
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gorilla_mux-acf3be1b335c8ce30b2c8d51300984666f0ceefa
-
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gorilla_securecookie-fa5329f913702981df43dcb2a380bac429c810b5
-
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> gorilla_sessions-ca9ada44574153444b00d3fd9c8559e4cc95f896
-
-Copyright (c) 2012 Rodrigo Moraes. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-	 * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-	 * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-	 * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> BSD Style
-
-sessions-ca9ada44574153444b00d3fd9c8559e4cc95f896.tar.gz\sessions-ca9ada44574153444b00d3fd9c8559e4cc95f896.tar\sessions-ca9ada44574153444b00d3fd9c8559e4cc95f896\sessions.go
-
-
-Copyright 2012 The Gorilla Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
->>> gorilla_websocket-a91eba7f97777409bc2c443f5534d41dd20c5720
-
-Copyright (c) 2013 The Gorilla WebSocket Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> graylog2_go-gelf_gelf-master
-
-Copyright 2012 SocialCode
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> grpc-b1a2821ca5a4fd6b6e48ddfbb7d6d7584d839d21
-
-Copyright 2014, Google Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the gRPC project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of gRPC, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of gRPC.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of gRPC or any code incorporated within this
-implementation of gRPC constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of gRPC
-shall terminate as of the date such litigation is filed.
-
-
->>> hpcloud_tail-a30252cb686a21eb2d0b98132633053ec2f7f1e5
-
-The MIT License (MIT)
-
-© Copyright 2015 Hewlett Packard Enterprise Development LP
-Copyright (c) 2014 ActiveState
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-3 clause
-
-tail-a30252cb686a21eb2d0b98132633053ec2f7f1e5.tar.gz\tail-a30252cb686a21eb2d0b98132633053ec2f7f1e5.tar\tail-a30252cb686a21eb2d0b98132633053ec2f7f1e5\vendor\gopkg.in\fsnotify.v1\LICENSE
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-Copyright (c) 2012 fsnotify Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> jessevdk_go-flags-97448c91aac742cbca3d020b3e769013a420a06f
-
-Copyright (c) 2012 Jesse van den Kieboom. All rights reserved.
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-     notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-     copyright notice, this list of conditions and the following disclaimer
-     in the documentation and/or other materials provided with the
-     distribution.
-   * Neither the name of Google Inc. nor the names of its
-     contributors may be used to endorse or promote products derived from
-     this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> kr_pty-f7ee69f31298ecbe5d2b349c711e2547a617d398
-
-Copyright (c) 2011 Keith Rarick
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated
-documentation files (the "Software"), to deal in the
-Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute,
-sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall
-be included in all copies or substantial portions of the
-Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
-KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
-WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
-PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS
-OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
-OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
-OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> mailru_easyjson-99e922cf9de1bc0ab38310c277cff32c2147e747
-
-Copyright (c) 2016 Mail.Ru Group
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
->>> matryer_resync-d39c09a11215c84aab0b65e323fc47dd6e276af1
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Mat Ryer
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> mattn_go-runewidth-14207d285c6c197daabb5c9793d63e7af9ab2d50
-
-The MIT License (MIT)
-
-Copyright (c) 2016 Yasuhiro Matsumoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> microsoft_go-winio-24a3e3d3fc7451805e09d11e11e95d9a0a4f205e
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-Style
-
-go-winio-24a3e3d3fc7451805e09d11e11e95d9a0a4f205e.tar.gz\go-winio-24a3e3d3fc7451805e09d11e11e95d9a0a4f205e.tar\go-winio-24a3e3d3fc7451805e09d11e11e95d9a0a4f205e\archive\tar\LICENSE
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> microsoft_hcsshim-d327ca738085de7d617aa1df16d98fe7a64c2455
-
-The MIT License (MIT)
-
-Copyright (c) 2015 Microsoft
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> miekg_dns-ca336a1f95a6b89be9c250df26c7a41742eb4a6f
-
-Extensions of the original work are copyright (c) 2011 Miek Gieben
-
-As this is fork of the official Go code the same license applies:
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> mitchellh_go-wordwrap-ad45545899c7b13c020ea92b2072220eefad42b8
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> mitchellh_mapstructure-5a0325d7fafaac12dda6e7fb8bd222ec1b69875e
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Mitchell Hashimoto
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> mreiferson_go-httpclient-31f0106b4474f14bc441575c19d3a5fa21aa1f6c
-
-The MIT License (MIT)
-
-Copyright (c) 2012 Matt Reiferson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> naoina_denco-9af2ba0e24214bac003821f4a501b131b2e04c75
-
-Copyright (c) 2014 Naoya Inada <naoina@kuune.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> nlopes_slack-f243c7602fdf906248fc1f165284daa4e4d2d09e
-
-Copyright (c) 2015, Norberto Lopes
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this
-list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> nsf_termbox-go-91bae1bb5fa9ee504905ecbe7043fa30e92feaa3
-
-Copyright (C) 2012 termbox-go authors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
->>> opennota_urlesc-5fa9ff0392746aeae1c4b37fcc42c65afa7a9587
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> pkg_profile-8a808a6967b79da66deacfe508b26d398a69518f
-
-Copyright (c) 2013 Dave Cheney. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
->>> puerkitobio_purell-d69616f51cdfcd7514d6a380847a152dfc2a749d
-
-Copyright (c) 2012, Martin Angers
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> racksec_srslog-a974ba6f7fb527d2ddc73ee9c05d3e2ccc0af0dc
-
-Copyright (c) 2015 Rackspace. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> ryanuber_go-glob-256dc444b735e061061cf46c809487313d5b0065
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Ryan Uber
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> sirupsen_logrus-d26492970760ca5d33129d2d799e34be5c4782eb
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Simon Eskildsen
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-ADDITIONAL LICENSE INFORMATION:
-
->BSD – Style
-
-logrus-master.zip\logrus-master\terminal_notwindows.go
-
-Copyright 2011 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
->>> smartystreets_assertions-287b4346dc4e71a038c346375a9d572453bc469b
-
-Copyright (c) 2015 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Apache 2.0
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\reqtrace\reqtrace.go
-
- Copyright 2015 Google Inc. All Rights Reserved.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-     http:www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
-> BSD 3
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\go-render\LICENSE
-
- Copyright (c) 2015 The Chromium Authors. All rights reserved.
-
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
-
-    * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above
- copyright notice, this list of conditions and the following disclaimer
- in the documentation and/or other materials provided with the
- distribution.
-    * Neither the name of Google Inc. nor the names of its
- contributors may be used to endorse or promote products derived from
- this software without specific prior written permission.
-
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> smartystreets_assertions_internal_oglematchers-287b4346dc4e71a038c346375a9d572453bc469b
-
-Copyright (c) 2015 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Apache 2.0
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\reqtrace\reqtrace.go
-
-Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-> BSD-3
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\go-render\LICENSE
-
-Copyright (c) 2015 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> smartystreets_assertions_internal_oglemock-287b4346dc4e71a038c346375a9d572453bc469b
-
-Copyright (c) 2015 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-3 Clause
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\go-render\LICENSE
-
-
-Copyright (c) 2015 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> Apache 2.0
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\oglematchers\all_of.go
-
-Copyright 2011 Aaron Jacobs. All Rights Reserved.
-Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
->>> smartystreets_assertions_internal_ogletest-287b4346dc4e71a038c346375a9d572453bc469b
-
-Copyright (c) 2015 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Apache 2.0
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\reqtrace\reqtrace.go
-
-Copyright 2015 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-> BSD-3
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\go-render\LICENSE
-
-Copyright (c) 2015 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> smartystreets_assertions_internal_reqtrace-287b4346dc4e71a038c346375a9d572453bc469b
-
-Copyright (c) 2015 SmartyStreets, LLC
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-NOTE: Various optional and subordinate components carry their own licensing
-requirements and restrictions.  Use of those components is subject to the terms
-and conditions outlined the respective license of each component.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-3
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\go-render\LICENSE
-
-Copyright (c) 2015 The Chromium Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-> Apache 2.0
-
-assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar.gz\assertions-287b4346dc4e71a038c346375a9d572453bc469b.tar\assertions-287b4346dc4e71a038c346375a9d572453bc469b\internal\oglematchers\transform_description.go
-
-Copyright 2011 Aaron Jacobs. All Rights Reserved.
-Author: aaronjjacobs@gmail.com (Aaron Jacobs)
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
->>> stretchr_objx-1a9d0bb9f541897e62256577b352fdbc1fb4fd94
-
-objx - by Mat Ryer and Tyler Bunnell
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Stretchr, Inc.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> tomb_v1-dd632973f1e7218eb1089048e0798ec9ae7dceb8
-
-tomb - support for clean goroutine termination in Go.
-
-Copyright (c) 2010-2011 - Gustavo Niemeyer <gustavo@niemeyer.net>
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-    * Redistributions of source code must retain the above copyright notice,
-      this list of conditions and the following disclaimer.
-    * Redistributions in binary form must reproduce the above copyright notice,
-      this list of conditions and the following disclaimer in the documentation
-      and/or other materials provided with the distribution.
-    * Neither the name of the copyright holder nor the names of its
-      contributors may be used to endorse or promote products derived from
-      this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> tylerb_graceful-d7d7a205e779a4738d38eda0671fff8bfc965f14
-
-The MIT License (MIT)
-
-Copyright (c) 2014 Tyler Bunnell
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-
-> Apache 2.0
-
-
-graceful-d7d7a205e779a4738d38eda0671fff8bfc965f14.tar.gz\graceful-d7d7a205e779a4738d38eda0671fff8bfc965f14.tar\graceful-d7d7a205e779a4738d38eda0671fff8bfc965f14\limit_listen.go
-
-
-Copyright 2013 The etcd Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
->>> ugorji_go_codec-708a42d246822952f38190a8d8c4e6b16a0e600c
-
-The MIT License (MIT)
-
-Copyright (c) 2012-2015 Ugorji Nwoke.
-All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> urfave_cli_v1-0bdeddeeb0f650497d603c4ad7b20cfe685682f6
-
-MIT License
-
-Copyright (c) 2016 Jeremy Saenz & Contributors
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
->>> x_crypto_acme-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-This code is licensed under the MIT license.
-
-
->>> x_crypto_curve25519-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Public Domain
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\curve25519\square_amd64.s
-
-This code was translated into a form compatible with 6a from the public
-domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-https://www.ietf.org/rfc/rfc2268.txt
-http://people.csail.mit.edu/rivest/pubs/KRRR98.pdf
-
-This code is licensed under the MIT license.
-
-
->>> x_crypto_ed25519-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-This code is licensed under the MIT license.
-
-
->>> x_crypto_nacl_secretbox-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-This code is licensed under the MIT license.
-
-
->>> x_crypto_poly1305-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Public Domain
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\curve25519\square_amd64.s
-
-This code was translated into a form compatible with 6a from the public
-domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-https://www.ietf.org/rfc/rfc2268.txt
-http://people.csail.mit.edu/rivest/pubs/KRRR98.pdf
-
-This code is licensed under the MIT license.
-
-
->>> x_crypto_salsa20_salsa-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> BSD Style
-
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\acme\acme.go
-
-
-Copyright 2015 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
-> Public Domain
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\ed25519\internal\edwards25519\const.go
-
-
-These values are from the public domain
-
-
->>> x_crypto_ssh-728b753d0135da6801d45a38e6f43ff55779c5c2
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> Public Domain
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\curve25519\square_amd64.s
-
-This code was translated into a form compatible with 6a from the public
-domain sources in SUPERCOP: http://bench.cr.yp.to/supercop.html
-
-
-> MIT
-
-crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar.gz\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2.tar\crypto-728b753d0135da6801d45a38e6f43ff55779c5c2\pkcs12\internal\rc2\rc2.go
-
-https://www.ietf.org/rfc/rfc2268.txt
-http://people.csail.mit.edu/rivest/pubs/KRRR98.pdf
-
-This code is licensed under the MIT license.
-
-
->>> x_net_context-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> BSD Style
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\CONTRIBUTING.md
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
-
-
-> BSD 2 Clause
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
-WebKit is licensed under a BSD style license.
-http://webkit.org/coding/bsd-license.html says:
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_net_http2-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD2
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_net_idna-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> W3C 3-clause BSD License
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\charset\testdata\README
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE W3C 3-clause BSD License. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-These test cases come from
-http://www.w3.org/International/tests/repository/html5/the-input-byte-stream/results-basics
-
-Distributed under both the W3C Test Suite License
-(http://www.w3.org/Consortium/Legal/2008/04-testsuite-license)
-and the W3C 3-clause BSD License
-(http://www.w3.org/Consortium/Legal/2008/03-bsd-license).
-To contribute to a W3C Test Suite, see the policies and contribution
-forms (http://www.w3.org/2004/10/27-testcases).
-
-> BSD-2 clause
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
-WebKit is licensed under a BSD style license.
-http://webkit.org/coding/bsd-license.html says:
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_net_internal_timeseries-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
-WebKit is licensed under a BSD style license.
-http://webkit.org/coding/bsd-license.html says:
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_net_lex_httplex-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_net_proxy-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
-WebKit is licensed under a BSD style license.
-http://webkit.org/coding/bsd-license.html says:
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_net_trace-a6577fac2d73be281a500b310739095313165611
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_net_websocket-a6577fac2d73be281a500b310739095313165611
-
-License: BSD-3 clause with Google Patents
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-2 clause
-
-net-a6577fac2d73be281a500b310739095313165611.tar.gz\net-a6577fac2d73be281a500b310739095313165611.tar\net-a6577fac2d73be281a500b310739095313165611\html\testdata\webkit\README
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_oauth2-1611bb46e67abc64a71ecc5c3ae67f1cbbc2b921
-
-Copyright (c) 2009 The oauth2 Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> x_sync_singleflight-5a06fca2c336a4b2b2fcb45702e8c47621b2aa2c
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_sys_unix-99f16d856c9836c42d24e7ab64ea72916925fa97
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_sys_windows-99f16d856c9836c42d24e7ab64ea72916925fa97
-
-License: BSD-3 clause with Google Patents
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_text_internal-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_text_language-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_text_message-f28f36722d5ef2f9655ad3de1f248e3e52ad5ebd
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
->>> x_tools_go_ast_astutil-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\goyacc\yacc.go
-
-	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
-	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Portions Copyright © 2004,2006 Bruce Ellis
-	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
-	Portions Copyright © 2009 The Go Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\godoc\static\jquery.treeview.js
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-Copyright (c) 2007 Jörn Zaefferer
-
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-
-> Apache 2.0
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\typescript\typescript.js
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-
-
->>> x_tools_go_buildutil-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-License: BSD-3 clause with Google Patents
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\moduleloader\
-
-Copyright (c) 2013-2016 Guy Bedford, Luke Hoban, Addy Osmani
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-> Apache 2.0
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\typescript\typescript.js
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-
-
->>> x_tools_go_gcexportdata-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\goyacc\yacc.go
-
-	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
-	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Portions Copyright © 2004,2006 Bruce Ellis
-	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
-	Portions Copyright © 2009 The Go Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\godoc\static\jquery.treeview.js
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-Copyright (c) 2007 Jörn Zaefferer
-
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-
-> Apache 2.0
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\typescript\typescript.js
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-
-
->>> x_tools_go_gcimporter15-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-> BSD Style
-
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\benchmark\parse\parse.go
-
-Copyright 2014 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
-> MIT
-
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\goyacc\yacc.go
-
-
-Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
-Portions Copyright © 1997-1999 Vita Nuova Limited
-Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
-Portions Copyright © 2004,2006 Bruce Ellis
-Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
-Portions Copyright © 2009 The Go Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-> CC Attribution 3.0
-
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\present\templates\dir.tmpl
-
-
-Except as <a href="https:developers.google.com/site-policies#restrictions">noted</a>,
-the content of this page is licensed under the
-Creative Commons Attribution 3.0 License,
-and code is licensed under a <a href="http:golang.org/LICENSE">BSD license</a>.<br>
-<a href="http:golang.org/doc/tos.html">Terms of Service</a> |
-<a href="http:www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-</div>
-
-
-> BSD
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\present\templates\dir.tmpl
-
-code is licensed under a <a href="http:golang.org/LICENSE">BSD license</a>.<br>
-<a href="http:golang.org/doc/tos.html">Terms of Service</a> |
-<a href="http:www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-</div>
-
-
-> Apache 2.0
-
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\godoc\short\short.go
-
-
-Copyright 2015 The Go Authors. All rights reserved.
-Use of this source code is governed by the Apache 2.0
-license that can be found in the LICENSE file.
-
-+build appengine
-
-Package short implements a simple URL shortener, serving an administrative
-interface at /s and shortened urls from /s/key.
-It is designed to run only on the instance of godoc that serves golang.org.
-package short
-
-
-> MIT
-
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\godoc\static\jquery.treeview.js
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE. THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-
-Copyright (c) 2007 Jörn Zaefferer
-
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-
->>> x_tools_go_loader-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\cmd\goyacc\yacc.go
-
-	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
-	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Portions Copyright © 2004,2006 Bruce Ellis
-	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
-	Portions Copyright © 2009 The Go Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\godoc\static\jquery.treeview.js
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT LICENSE.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-Copyright (c) 2007 Jörn Zaefferer
-
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-
-> Apache 2.0
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\typescript\typescript.js
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-
-
->>> x_tools_imports-381149a2d6e5d8f319ccf04bfefc71e03a78b868
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> Apache 2.0
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\typescript\typescript.js
-
-Copyright (c) Microsoft Corporation. All rights reserved.
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0
-
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE,
-MERCHANTABLITY OR NON-INFRINGEMENT.
-
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-
-> MIT
-
-tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar.gz\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868.tar\tools-381149a2d6e5d8f319ccf04bfefc71e03a78b868\third_party\moduleloader\LICENSE
-
-Copyright (c) 2013-2016 Guy Bedford, Luke Hoban, Addy Osmani
-
-Permission is hereby granted, free of charge, to any person
-obtaining a copy of this software and associated documentation
-files (the "Software"), to deal in the Software without
-restriction, including without limitation the rights to use,
-copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following
-conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-OTHER DEALINGS IN THE SOFTWARE.
-
-
---------------- SECTION 2: Apache License, V2.0 ----------
-
-Apache License, V2.0 is applicable to the following component(s).
-
-
->>> appengine-ca59ef35f409df61fa4a5f8290ff289b37eccfb8
-
-Copyright 2015 Google Inc. All rights reserved.
-Use of this source code is governed by the Apache 2.0
-license that can be found in the LICENSE file.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-Style
-
-appengine-ca59ef35f409df61fa4a5f8290ff289b37eccfb8.tar.gz\appengine-ca59ef35f409df61fa4a5f8290ff289b37eccfb8.tar\appengine-ca59ef35f409df61fa4a5f8290ff289b37eccfb8\cmd\aefix\typecheck.go
-
-Copyright 2011 The Go Authors.  All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
->>> aws_aws-sdk-go_aws-master
-
-AWS SDK for Go
-Copyright 2015 Amazon.com, Inc. or its affiliates. All Rights Reserved.
-Copyright 2014-2015 Stripe, Inc.
-Copyright 2015 James Saryerwinnie
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
->BSD-2
-
-aws-sdk-go-master.tar.gz\aws-sdk-go-master.tar\aws-sdk-go-master\awsmigrate\awsmigrate-renamer\vendor\golang.org\x\tools\LICENSE
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
->MIT
-
-aws-sdk-go-master.tar.gz\aws-sdk-go-master.tar\aws-sdk-go-master\doc-src\aws-godoc\templates\jquery.js
-
-jQuery v1.8.2 jquery.com | jquery.org/license
-
->MIT
-
-[PLEASE NOTE:  VMWARE, INC. ELECTS TO USE AND DISTRIBUTE THIS COMPONENT UNDER THE TERMS OF THE MIT.  THE ORIGINAL LICENSE TERMS ARE REPRODUCED BELOW ONLY AS A REFERENCE.]
-
-aws-sdk-go-master.tar.gz\aws-sdk-go-master.tar\aws-sdk-go-master\doc-src\aws-godoc\templates\jquery.treeview.js
-
-http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
-http://docs.jquery.com/Plugins/Treeview
-
-Copyright (c) 2007 Jörn Zaefferer
-
-Dual licensed under the MIT and GPL licenses:
-http://www.opensource.org/licenses/mit-license.php
-http://www.gnu.org/licenses/gpl.html
-
-
->>> coreos_etcd_client-781196fa8746d6c34ace2a62898051af6dc46002
-
-CoreOS Project
-Copyright 2014 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
-
-Copyright 2016 The etcd Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\client\cancelreq.go
-
-Copyright 2015 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-> MIT
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\beorn7\perks\LICENSE
-
-Copyright (C) 2013 Blake Mizerany
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-> MIT-Style
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\davecgh\go-spew\spew\dump.go
-
-Copyright (c) 2013 Dave Collins <dave@davec.name>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
-> BSD-3 Style
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\gogo\protobuf\proto\text_parser.go
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> BSD-2 Clause
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\gogo\protobuf\proto\text_gogo.go
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\prometheus\client_golang\NOTICE
-
-Prometheus instrumentation library for Go applications
-Copyright 2012-2015 The Prometheus Authors
-
-This product includes software developed at
-SoundCloud Ltd. (http://soundcloud.com/).
-
-
-The following components are included in this product:
-
-perks - a fork of https://github.com/bmizerany/perks
-https://github.com/beorn7/perks
-Copyright 2013-2015 Blake Mizerany, Björn Rabenstein
-See https://github.com/beorn7/perks/blob/master/README.md for license details.
-
-Go support for Protocol Buffers - Google's data interchange format
-http://github.com/golang/protobuf/
-Copyright 2010 The Go Authors
-See source code for license details.
-
-Support for streaming Protocol Buffer messages for the Go language (golang).
-https://github.com/matttproud/golang_protobuf_extensions
-Copyright 2013 Matt T. Proud
-Licensed under the Apache License, Version 2.0
-
-> BSD-3 (WITH GOOGLE PATENT)
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\golang.org\x\crypto\LICENSE
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
->LGPL 3.0 (WITH LINKING EXCEPTION)
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\gopkg.in\yaml.v2\LICENSE
-
-Copyright (c) 2011-2014 - Canonical Inc.
-
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
->>>coreos_etcd_version-781196fa8746d6c34ace2a62898051af6dc46002
-
-CoreOS Project
-Copyright 2014 CoreOS, Inc
-
-This product includes software developed at CoreOS, Inc.
-(http://www.coreos.com/).
-
-Copyright 2016 The etcd Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
->BSD
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\client\cancelreq.go
-
-Copyright 2015 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
->MIT
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\beorn7\perks\LICENSE
-
-Copyright (C) 2013 Blake Mizerany
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
->MIT-Style
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\davecgh\go-spew\spew\dump.go
-
-Copyright (c) 2013 Dave Collins <dave@davec.name>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
-WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
-ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
-WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
-OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
->BSD-3 Style
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\gogo\protobuf\proto\text_parser.go
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Go support for Protocol Buffers - Google's data interchange format
-
-Copyright 2010 The Go Authors.  All rights reserved.
-https://github.com/golang/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> BSD-2 Clause
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\gogo\protobuf\proto\text_gogo.go
-
-Copyright (c) 2013, The GoGo Authors. All rights reserved.
-http://github.com/gogo/protobuf
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\github.com\prometheus\client_golang\NOTICE
-
-Prometheus instrumentation library for Go applications
-Copyright 2012-2015 The Prometheus Authors
-
-This product includes software developed at
-SoundCloud Ltd. (http://soundcloud.com/).
-
-The following components are included in this product:
-
-perks - a fork of https://github.com/bmizerany/perks
-https://github.com/beorn7/perks
-Copyright 2013-2015 Blake Mizerany, Björn Rabenstein
-See https://github.com/beorn7/perks/blob/master/README.md for license details.
-
-Go support for Protocol Buffers - Google's data interchange format
-http://github.com/golang/protobuf/
-Copyright 2010 The Go Authors
-See source code for license details.
-
-Support for streaming Protocol Buffer messages for the Go language (golang).
-https://github.com/matttproud/golang_protobuf_extensions
-Copyright 2013 Matt T. Proud
-Licensed under the Apache License, Version 2.0
-
-> BSD-3 (WITH GOOGLE PATENT)
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\golang.org\x\crypto\LICENSE
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-> LGPL 3.0 (WITH LINKING EXCEPTION)
-
-etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar.gz\etcd-781196fa8746d6c34ace2a62898051af6dc46002.tar\etcd-781196fa8746d6c34ace2a62898051af6dc46002\cmd\vendor\gopkg.in\yaml.v2\LICENSE
-
-Copyright (c) 2011-2014 - Canonical Inc.
-
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
->>> coreos_go-semver_semver-5e3acbb5668c4c3deb4842615c4098eb61fb6b1e
-
-Copyright 2013-2015 CoreOS, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> docker_distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc
-
-Copyright 2012 Gary Burd
-
-Licensed under the Apache License, Version 2.0 (the "License"): you may
-not use this file except in compliance with the License. You may obtain
-a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-License for the specific language governing permissions and limitations
-under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\registry\storage\driver\s3-aws\s3_v2_signer.go
-
-Copyright (c) 2013 Damien Le Berrigaud and Nick Wade
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
->MIT-Style
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\vendor\github.com\bugsnag\osext\LICENSE
-
-Copyright (c) 2012 Daniel Theophanes
-
-This software is provided 'as-is', without any express or implied
-warranty. In no event will the authors be held liable for any damages
-arising from the use of this software.
-
-Permission is granted to anyone to use this software for any purpose,
-including commercial applications, and to alter it and redistribute it
-freely, subject to the following restrictions:
-
-   1. The origin of this software must not be misrepresented; you must not
-   claim that you wrote the original software. If you use this software
-   in a product, an acknowledgment in the product documentation would be
-   appreciated but is not required.
-
-   2. Altered source versions must be plainly marked as such, and must not be
-   misrepresented as being the original software.
-
-   3. This notice may not be removed or altered from any source
-   distribution.
-
-
->LGPL 3.0 (With linking exception)
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\vendor\github.com\docker\goamz\LICENSE
-
-This software is licensed under the LGPLv3, included below.
-
-As a special exception to the GNU Lesser General Public License version 3
-("LGPL3"), the copyright holders of this Library give you permission to
-convey to a third party a Combined Work that links statically or dynamically
-to this Library without providing any Minimal Corresponding Source or
-Minimal Application Code as set out in 4d or providing the installation
-information set out in section 4e, provided that you comply with the other
-provisions of LGPL3 and provided that you meet, for the Application the
-terms and conditions of the license(s) which apply to the Application.
-
-Except as stated in this special exception, the provisions of LGPL3 will
-continue to comply in full to this Library. If you modify this Library, you
-may apply this exception to your version of this Library, but you are not
-obliged to do so. If you do not wish to do so, delete this exception
-statement from your version. This exception does not (and cannot) modify any
-license terms which apply to the Application, with which you must still
-comply.
-
->BSD-3 Clause
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\vendor\golang.org\x\crypto\LICENSE
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
-> BSD-2 Clause
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc.tar.gz\distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc.tar\distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\vendor\github.com\gorilla\handlers\LICENSE
-
-Copyright (c) 2013 The Gorilla Handlers Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-  Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-> BSD Style
-
-distribution-28602af35aceda2f8d571bad7ca37a54cf0250bc\vendor\gopkg.in\check.v1\benchmark.go
-
-Copyright 2009 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
->>>docker_go-events-aa2e3b613fbbfdddbe055a7b9e3ce271cfd83eca
-
-License: Apache 2.0
-
-
->>> docker_libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd
-
-Copyright 2015 CoreOS, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.orglicensesLICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
->BSD-3 Clause
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\client\mflag\LICENSE
-
-Copyright (c) 2014-2016 The Docker & Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-* Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-* Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation andor other materials provided with the
-distribution.
-* Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
->MIT
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\armon\go-metrics\LICENSE
-
-The MIT License (MIT)
-
-Copyright (c) 2013 Armon Dadgar
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, andor sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
->WTFPL(MIT Stle)
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\BurntSushi\toml\COPYING
-
-DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-Version 2, December 2004
-
-Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
-
-Everyone is permitted to copy and distribute verbatim or modified
-copies of this license document, and changing it is allowed as long
-as the name is changed.
-
-DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-0.	You just DO WHAT THE FUCK YOU WANT TO.
-
->BSD-Style
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar.gz\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\BurntSushi\toml\type_fields.go
-
-Copyright 2010 The Go Authors.  All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the Go distribution.
-
->CC-Attribution share alike 4.0
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar.gz\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\docker\go-units\README.md
-
-Copyright and license
-
-Copyright © 2015 Docker, Inc. All rights reserved, except as follows. Code
-is released under the Apache 2.0 license. The README.md file, and files in the
-"docs" folder are licensed under the Creative Commons Attribution 4.0
-International License under the terms and conditions set forth in the file
-"LICENSE.docs". You may obtain a duplicate copy of the same license, titled
-CC-BY-SA-4.0, at http:creativecommons.orglicensesby4.0.
-
->BSD-2 Clause
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar.gz\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd.tar\libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\godbus\dbus\LICENSE
-
-Copyright (c) 2013, Georg Reinke (<guelfey at gmail dot com>), Google
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions
-are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation andor other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
->MPL2.0
-
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\github.com\hashicorp\consul\LICENSE
-
-License: MPL2.0
-
->CC-Attribution 4.0
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\README.md
-
-Copyright and license
-Code and documentation copyright 2015 Docker, inc. Code released under the Apache 2.0 license. Docs released under Creative commons.
-
-
->BSD-3 with IP Rights Grant
-
-
-libnetwork-fd27f22aaa35e3d57f88688f919d05b744f431fd\Godeps\_workspace\src\golang.org\x\net\LICENSE
-
-
-Copyright (c) 2009 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-   * Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-   * Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-   * Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Additional IP Rights Grant (Patents)
-
-"This implementation" means the copyrightable works distributed by
-Google as part of the Go project.
-
-Google hereby grants to You a perpetual, worldwide, non-exclusive,
-no-charge, royalty-free, irrevocable (except as stated in this section)
-patent license to make, have made, use, offer to sell, sell, import,
-transfer and otherwise run, modify and propagate the contents of this
-implementation of Go, where such license applies only to those patent
-claims, both currently owned or controlled by Google and acquired in
-the future, licensable by Google that are necessarily infringed by this
-implementation of Go.  This grant does not include claims that would be
-infringed only as a consequence of further modification of this
-implementation.  If you or your agent or exclusive licensee institute or
-order or agree to the institution of patent litigation against any
-entity (including a cross-claim or counterclaim in a lawsuit) alleging
-that this implementation of Go or any code incorporated within this
-implementation of Go constitutes direct or contributory patent
-infringement, or inducement of patent infringement, then any patent
-rights granted to you under this License for this implementation of Go
-shall terminate as of the date such litigation is filed.
-
->>> docker_libtrust-9cbd2a1374f46905c68a4eb3694a130610adc62a
-
-License: Apache 2.0
-
->>> go-openapi_analysis-d5a75b7d751ca3f11ad5d93cfe97405f2c3f6a47
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go-openapi_errors-fc3f73a224499b047eda7191e5d22e1e9631e86f
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go-openapi_jsonpointer-779f45308c19820f1a69e9a4cd965f496e0da10f
-
-Copyright 2013 sigu-399 ( https:github.com/sigu-399 )
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go-openapi_jsonreference-36d33bfe519efae5632669801b180bf1a245da3b
-
-Copyright 2013 sigu-399 ( https://github.com/sigu-399 )
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>>go-openapi_loads-6bb6486231e079ea125c0f39994ed3d0c53399ed
-
-Copyright 2015 go-swagger maintainers
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http:www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
->>> go-openapi_runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
->MIT
-
-runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854\middleware\denco\LICENSE
-
-Copyright (c) 2014 Naoya Inada <naoina@kuune.org>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
->CC-Attribution 4.0
-
-runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854.tar.gz\runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854.tar\runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854\internal\testing\data.go
-
-License name: Creative Commons 4.0 International,
-url: http://creativecommons.org/licenses/by/4.0/
-
->BSD-3 Clause
-
-runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854.tar.gz\runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854.tar\runtime-3b13ebb46790d871d74a6c2450fa4b1280f90854\middleware\negotiate_test.go
-
-Copyright 2013 The Go Authors. All rights reserved.
-
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file or at
-https://developers.google.com/open-source/licenses/bsd.
-
->>> go-openapi_spec-e072eb2390d3a03736a6eb617d30f48369160447
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-   http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-ADDITIONAL LICENSE INFORMATION:
-
->CC-Attribution 4.0
-
-spec-e072eb2390d3a03736a6eb617d30f48369160447.tar.gz\spec-e072eb2390d3a03736a6eb617d30f48369160447.tar\spec-e072eb2390d3a03736a6eb617d30f48369160447\fixtures\expansion\invalid-refs.json
-
-license:
-Creative Commons 4.0 International
-http://creativecommons.org/licenses/by/4.0/
-
->MIT
-
-spec-e072eb2390d3a03736a6eb617d30f48369160447.tar.gz\spec-e072eb2390d3a03736a6eb617d30f48369160447.tar\spec-e072eb2390d3a03736a6eb617d30f48369160447\fixtures\expansion\all-the-things.json
-
-License: MIT
-
->>> go-openapi_strfmt-0cb3db44c13bad3b3f567b762a66751972a310cc
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go-openapi_swag-96d7b9ebd181a1735a1c9ac87914f2b32fbf56c9
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go-openapi_validate-035dcd74f1f61e83debe1c22950dc53556e7e4b2
-
-Copyright 2015 go-swagger maintainers
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> go_compute_metadata-cd0da878c66091060d2e7403abd62192b3e387e0
-
-Copyright 2015 go-swagger maintainers
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
-    http:www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-
->>> go_internal-cd0da878c66091060d2e7403abd62192b3e387e0
-
-Copyright 2016 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> golang_glog-23def4e6c14b4da8ac2ed8007337bc5eb5007998
-
-Go support for leveled logs, analogous to https:code.google.compgoogle-glog
-
-Copyright 2013 Google Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http:www.apache.orglicensesLICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>> golang_groupcache_lru-72d04f9fcdec7d3821820cc4a6f150eae553639a
-
-Copyright 2013 Google Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->>>govmomi-0.15.0
-
-Copyright (c) 2015 VMware, Inc. All Rights Reserved.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
->MIT
-
-govmomi-0.15.0\vendor\github.com\ davecgh\go-spew\spew\LICENSE
-
-Copyright (c) 2012-2013 Dave Collins <dave@davec.name>
-
-Permission to use, copy, modify, and distribute this software for any
-purpose with or without fee is hereby granted, provided that the above
-copyright notice and this permission notice appear in all copies.
-
-THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
-ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-
->BSD-3
-
-govmomi-0.15.0\vim25\xml\LICENSE
-
-Copyright (c) 2012 The Go Authors. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-    Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-    Redistributions in binary form must reproduce the above
-copyright notice, this list of conditions and the following disclaimer
-in the documentation and/or other materials provided with the
-distribution.
-    Neither the name of Google Inc. nor the names of its
-contributors may be used to endorse or promote products derived from
-this software without specific prior written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
->>> maruel_panicparse_stack-25bcac0d793cf4109483505a0d66e066a3a90a80
-
-Copyright 2015 Marc-Antoine Ruel. All rights reserved.
-Use of this source code is governed under the Apache License, Version 2.0
-that can be found in the LICENSE file.
-
-ADDITIONAL LICENSE INFORMATION:
-
-> MIT
-
-panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80.tar.gz\panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80.tar\panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80\vendor\github.com\kr\pretty\License
-
-The MIT License (MIT)
-
-Copyright 2012 Keith Rarick
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-
-> BSD-3 Clause
-
-panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80.tar.gz\panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80.tar\panicparse-25bcac0d793cf4109483505a0d66e066a3a90a80\vendor\github.com\pmezard\go-difflib\LICENSE
-
-Copyright (c) 2013, Patrick Mezard
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
-Redistributions of source code must retain the above copyright
-notice, this list of conditions and the following disclaimer.
-Redistributions in binary form must reproduce the above copyright
-notice, this list of conditions and the following disclaimer in the
-documentation and/or other materials provided with the distribution.
-The names of its contributors may not be used to endorse or promote
-products derived from this software without specific prior written
-permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
-TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
-PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED
-TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-
->>> syncutil_singleflight-7ce08ca145dbe0e66a127c447b80ee7914f3e4f9
-
-Copyright 2014 The Camlistore Authors
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-> BSD-Style
-
-go4-7ce08ca145dbe0e66a127c447b80ee7914f3e4f9.tar.gz\go4-7ce08ca145dbe0e66a127c447b80ee7914f3e4f9.tar\go4-7ce08ca145dbe0e66a127c447b80ee7914f3e4f9\reflectutil\swapper_unsafe_15.go
-
-Copyright 2016 The Go Authors. All rights reserved.
-Use of this source code is governed by a BSD-style
-license that can be found in the LICENSE file.
-
-
->>> vdemeester_shakers-24d7f1d6a71aa5d9cbe7390e4afb66b7eef9e1b3
-
-License : Apache 2.0
-
-
->>> vishvananda_netlink-482f7a52b758233521878cb6c5904b6bd63f3457
-
-License: Apache 2.0
-
-
->>> vishvananda_netns-604eaf189ee867d8c147fafc28def2394e878d25
-
-Copyright 2014 Vishvananda Ishaya.
-Copyright 2014 Docker, Inc.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
->>> yaml_v2-4c78c975fe7c825c6d1466c42be594d1d6f3aba6
-
-Copyright 2011-2016 Canonical Ltd.
-
-Licensed under the Apache License, Version 2.0 (the "License");
-you may not use this file except in compliance with the License.
-You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-Unless required by applicable law or agreed to in writing, software
-distributed under the License is distributed on an "AS IS" BASIS,
-WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-See the License for the specific language governing permissions and
-limitations under the License.
-
-
-ADDITIONAL LICENSE INFORMATION:
-
-
-> MIT
-
-yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar.gz\yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6.tar\yaml-4c78c975fe7c825c6d1466c42be594d1d6f3aba6\LICENSE.libyaml
-
-The following files were ported to Go from C files of libyaml, and thus
-are still covered by their original copyright and license:
-
-    apic.go
-    emitterc.go
-    parserc.go
-    readerc.go
-    scannerc.go
-    writerc.go
-    yamlh.go
-    yamlprivateh.go
-
-Copyright (c) 2006 Kirill Simonov
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
-
---------------- SECTION 3: Mozilla Public License, V2.0 ----------
-
-Mozilla Public License, V2.0 is applicable to the following component(s).
-
-
->>> d2g_dhcp4client-master
-
-LICENSE: MPL 2.0
-
-
->>> hashicorp_go-cleanhttp-875fb671b3ddc66f8e2f0acc33829c8cb989a38d
-
-LICENSE: MPL 2.0
-
-
->>> hashicorp_memberlist-cef12ad58224d55cf26caa9e3d239c2fcb3432a2
-
-License: MPL 2.0
-
-
-=============== APPENDIX. Standard License Files ==============
-
-
-
---------------- SECTION 1: Apache License, V2.0 -----------
-
-Apache License
-
-Version 2.0, January 2004
-http://www.apache.org/licenses/
-
-TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-1. Definitions.
-
-"License" shall mean the terms and conditions for use, reproduction,
-and distribution as defined by Sections 1 through 9 of this document.
-
-"Licensor" shall mean the copyright owner or entity authorized by the
-copyright owner that is granting the License.
-
-"Legal Entity" shall mean the union of the acting entity and all other
-entities that control, are controlled by, or are under common control
-with that entity. For the purposes of this definition, "control" means
-(i) the power, direct or indirect, to cause the direction or management
-of such entity, whether by contract or otherwise, or (ii) ownership
-of fifty percent (50%) or more of the outstanding shares, or (iii)
-beneficial ownership of such entity.
-
-"You" (or "Your") shall mean an individual or Legal Entity exercising
-permissions granted by this License.
-
-"Source" form shall mean the preferred form for making modifications,
-including but not limited to software source code, documentation source,
-and configuration files.
-
-"Object" form shall mean any form resulting from mechanical transformation
-or translation of a Source form, including but not limited to compiled
-object code, generated documentation, and conversions to other media
-types.
-
-"Work" shall mean the work of authorship, whether in Source or
-Object form, made available under the License, as indicated by a copyright
-notice that is included in or attached to the work (an example is provided
-in the Appendix below).
-
-"Derivative Works" shall mean any work, whether in Source or Object form,
-that is based on (or derived from) the Work and for which the editorial
-revisions, annotations, elaborations, or other modifications represent,
-as a whole, an original work of authorship. For the purposes of this
-License, Derivative Works shall not include works that remain separable
-from, or merely link (or bind by name) to the interfaces of, the Work
-and Derivative Works thereof.
-
-"Contribution" shall mean any work of authorship, including the
-original version of the Work and any modifications or additions to
-that Work or Derivative Works thereof, that is intentionally submitted
-to Licensor for inclusion in the Work by the copyright owner or by an
-individual or Legal Entity authorized to submit on behalf of the copyright
-owner. For the purposes of this definition, "submitted" means any form of
-electronic, verbal, or written communication sent to the Licensor or its
-representatives, including but not limited to communication on electronic
-mailing lists, source code control systems, and issue tracking systems
-that are managed by, or on behalf of, the Licensor for the purpose of
-discussing and improving the Work, but excluding communication that is
-conspicuously marked or otherwise designated in writing by the copyright
-owner as "Not a Contribution."
-
-"Contributor" shall mean Licensor and any individual or Legal Entity
-on behalf of whom a Contribution has been received by Licensor and
-subsequently incorporated within the Work.
-
-2. Grant of Copyright License.
-Subject to the terms and conditions of this License, each Contributor
-hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-royalty-free, irrevocable copyright license to reproduce, prepare
-Derivative Works of, publicly display, publicly perform, sublicense, and
-distribute the Work and such Derivative Works in Source or Object form.
-
-3. Grant of Patent License.
-Subject to the terms and conditions of this License, each Contributor
-hereby grants to You a perpetual, worldwide, non-exclusive, no-charge,
-royalty- free, irrevocable (except as stated in this section) patent
-license to make, have made, use, offer to sell, sell, import, and
-otherwise transfer the Work, where such license applies only to those
-patent claims licensable by such Contributor that are necessarily
-infringed by their Contribution(s) alone or by combination of
-their Contribution(s) with the Work to which such Contribution(s)
-was submitted. If You institute patent litigation against any entity
-(including a cross-claim or counterclaim in a lawsuit) alleging that the
-Work or a Contribution incorporated within the Work constitutes direct
-or contributory patent infringement, then any patent licenses granted
-to You under this License for that Work shall terminate as of the date
-such litigation is filed.
-
-4. Redistribution.
-You may reproduce and distribute copies of the Work or Derivative Works
-thereof in any medium, with or without modifications, and in Source or
-Object form, provided that You meet the following conditions:
-
-  a. You must give any other recipients of the Work or Derivative Works
-     a copy of this License; and
-
-  b. You must cause any modified files to carry prominent notices stating
-     that You changed the files; and
-
-  c. You must retain, in the Source form of any Derivative Works that
-     You distribute, all copyright, patent, trademark, and attribution
-     notices from the Source form of the Work, excluding those notices
-     that do not pertain to any part of the Derivative Works; and
-
-  d. If the Work includes a "NOTICE" text file as part of its
-     distribution, then any Derivative Works that You distribute must
-     include a readable copy of the attribution notices contained
-     within such NOTICE file, excluding those notices that do not
-     pertain to any part of the Derivative Works, in at least one of
-     the following places: within a NOTICE text file distributed as part
-     of the Derivative Works; within the Source form or documentation,
-     if provided along with the Derivative Works; or, within a display
-     generated by the Derivative Works, if and wherever such third-party
-     notices normally appear. The contents of the NOTICE file are for
-     informational purposes only and do not modify the License. You
-     may add Your own attribution notices within Derivative Works that
-     You distribute, alongside or as an addendum to the NOTICE text
-     from the Work, provided that such additional attribution notices
-     cannot be construed as modifying the License.  You may add Your own
-     copyright statement to Your modifications and may provide additional
-     or different license terms and conditions for use, reproduction, or
-     distribution of Your modifications, or for any such Derivative Works
-     as a whole, provided Your use, reproduction, and distribution of the
-     Work otherwise complies with the conditions stated in this License.
-
-5. Submission of Contributions.
-Unless You explicitly state otherwise, any Contribution intentionally
-submitted for inclusion in the Work by You to the Licensor shall be
-under the terms and conditions of this License, without any additional
-terms or conditions.  Notwithstanding the above, nothing herein shall
-supersede or modify the terms of any separate license agreement you may
-have executed with Licensor regarding such Contributions.
-
-6. Trademarks.
-This License does not grant permission to use the trade names, trademarks,
-service marks, or product names of the Licensor, except as required for
-reasonable and customary use in describing the origin of the Work and
-reproducing the content of the NOTICE file.
-
-7. Disclaimer of Warranty.
-Unless required by applicable law or agreed to in writing, Licensor
-provides the Work (and each Contributor provides its Contributions) on
-an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
-express or implied, including, without limitation, any warranties or
-conditions of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR
-A PARTICULAR PURPOSE. You are solely responsible for determining the
-appropriateness of using or redistributing the Work and assume any risks
-associated with Your exercise of permissions under this License.
-
-8. Limitation of Liability.
-In no event and under no legal theory, whether in tort (including
-negligence), contract, or otherwise, unless required by applicable law
-(such as deliberate and grossly negligent acts) or agreed to in writing,
-shall any Contributor be liable to You for damages, including any direct,
-indirect, special, incidental, or consequential damages of any character
-arising as a result of this License or out of the use or inability to
-use the Work (including but not limited to damages for loss of goodwill,
-work stoppage, computer failure or malfunction, or any and all other
-commercial damages or losses), even if such Contributor has been advised
-of the possibility of such damages.
-
-9. Accepting Warranty or Additional Liability.
-While redistributing the Work or Derivative Works thereof, You may
-choose to offer, and charge a fee for, acceptance of support, warranty,
-indemnity, or other liability obligations and/or rights consistent with
-this License. However, in accepting such obligations, You may act only
-on Your own behalf and on Your sole responsibility, not on behalf of
-any other Contributor, and only if You agree to indemnify, defend, and
-hold each Contributor harmless for any liability incurred by, or claims
-asserted against, such Contributor by reason of your accepting any such
-warranty or additional liability.
-
-END OF TERMS AND CONDITIONS
-
-
-
---------------- SECTION 2: Mozilla Public License, V2.0 -----------
-
-Mozilla Public License
-Version 2.0
-
-1. Definitions
-
-1.1. “Contributor”
-means each individual or legal entity that creates, contributes to the creation of, or owns Covered Software.
-
-1.2. “Contributor Version”
-means the combination of the Contributions of others (if any) used by a Contributor and that particular Contributor’s Contribution.
-
-1.3. “Contribution”
-means Covered Software of a particular Contributor.
-
-1.4. “Covered Software”
-means Source Code Form to which the initial Contributor has attached the notice in Exhibit A, the Executable Form of such Source Code Form, and Modifications of such Source Code Form, in each case including portions thereof.
-
-1.5. “Incompatible With Secondary Licenses”
-means
-
-that the initial Contributor has attached the notice described in Exhibit B to the Covered Software; or
-
-that the Covered Software was made available under the terms of version 1.1 or earlier of the License, but not also under the terms of a Secondary License.
-
-1.6. “Executable Form”
-means any form of the work other than Source Code Form.
-
-1.7. “Larger Work”
-means a work that combines Covered Software with other material, in a separate file or files, that is not Covered Software.
-
-1.8. “License”
-means this document.
-
-1.9. “Licensable”
-means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently, any and all of the rights conveyed by this License.
-
-1.10. “Modifications”
-means any of the following:
-
-any file in Source Code Form that results from an addition to, deletion from, or modification of the contents of Covered Software; or
-
-any new file in Source Code Form that contains any Covered Software.
-
-1.11. “Patent Claims” of a Contributor
-means any patent claim(s), including without limitation, method, process, and apparatus claims, in any patent Licensable by such Contributor that would be infringed, but for the grant of the License, by the making, using, selling, offering for sale, having made, import, or transfer of either its Contributions or its Contributor Version.
-
-1.12. “Secondary License”
-means either the GNU General Public License, Version 2.0, the GNU Lesser General Public License, Version 2.1, the GNU Affero General Public License, Version 3.0, or any later versions of those licenses.
-
-1.13. “Source Code Form”
-means the form of the work preferred for making modifications.
-
-1.14. “You” (or “Your”)
-means an individual or a legal entity exercising rights under this License. For legal entities, “You” includes any entity that controls, is controlled by, or is under common control with You. For purposes of this definition, “control” means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2. License Grants and Conditions
-
-2.1. Grants
-
-Each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license:
-
-under intellectual property rights (other than patent or trademark) Licensable by such Contributor to use, reproduce, make available, modify, display, perform, distribute, and otherwise exploit its Contributions, either on an unmodified basis, with Modifications, or as part of a Larger Work; and
-
-under Patent Claims of such Contributor to make, use, sell, offer for sale, have made, import, and otherwise transfer either its Contributions or its Contributor Version.
-
-2.2. Effective Date
-
-The licenses granted in Section 2.1 with respect to any Contribution become effective for each Contribution on the date the Contributor first distributes such Contribution.
-
-2.3. Limitations on Grant Scope
-
-The licenses granted in this Section 2 are the only rights granted under this License. No additional rights or licenses will be implied from the distribution or licensing of Covered Software under this License. Notwithstanding Section 2.1(b) above, no patent license is granted by a Contributor:
-
-for any code that a Contributor has removed from Covered Software; or
-
-for infringements caused by: (i) Your and any other third party’s modifications of Covered Software, or (ii) the combination of its Contributions with other software (except as part of its Contributor Version); or
-
-under Patent Claims infringed by Covered Software in the absence of its Contributions.
-
-This License does not grant any rights in the trademarks, service marks, or logos of any Contributor (except as may be necessary to comply with the notice requirements in Section 3.4).
-
-2.4. Subsequent Licenses
-
-No Contributor makes additional grants as a result of Your choice to distribute the Covered Software under a subsequent version of this License (see Section 10.2) or under the terms of a Secondary License (if permitted under the terms of Section 3.3).
-
-2.5. Representation
-
-Each Contributor represents that the Contributor believes its Contributions are its original creation(s) or it has sufficient rights to grant the rights to its Contributions conveyed by this License.
-
-2.6. Fair Use
-
-This License is not intended to limit any rights You have under applicable copyright doctrines of fair use, fair dealing, or other equivalents.
-
-2.7. Conditions
-
-Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted in Section 2.1.
-
-3. Responsibilities
-
-3.1. Distribution of Source Form
-
-All distribution of Covered Software in Source Code Form, including any Modifications that You create or to which You contribute, must be under the terms of this License. You must inform recipients that the Source Code Form of the Covered Software is governed by the terms of this License, and how they can obtain a copy of this License. You may not attempt to alter or restrict the recipients’ rights in the Source Code Form.
-
-3.2. Distribution of Executable Form
-
-If You distribute Covered Software in Executable Form then:
-
-such Covered Software must also be made available in Source Code Form, as described in Section 3.1, and You must inform recipients of the Executable Form how they can obtain a copy of such Source Code Form by reasonable means in a timely manner, at a charge no more than the cost of distribution to the recipient; and
-
-You may distribute such Executable Form under the terms of this License, or sublicense it under different terms, provided that the license for the Executable Form does not attempt to limit or alter the recipients’ rights in the Source Code Form under this License.
-
-3.3. Distribution of a Larger Work
-
-You may create and distribute a Larger Work under terms of Your choice, provided that You also comply with the requirements of this License for the Covered Software. If the Larger Work is a combination of Covered Software with a work governed by one or more Secondary Licenses, and the Covered Software is not Incompatible With Secondary Licenses, this License permits You to additionally distribute such Covered Software under the terms of such Secondary License(s), so that the recipient of the Larger Work may, at their option, further distribute the Covered Software under the terms of either this License or such Secondary License(s).
-
-3.4. Notices
-
-You may not remove or alter the substance of any license notices (including copyright notices, patent notices, disclaimers of warranty, or limitations of liability) contained within the Source Code Form of the Covered Software, except that You may alter any license notices to the extent required to remedy known factual inaccuracies.
-
-3.5. Application of Additional Terms
-
-You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Software. However, You may do so only on Your own behalf, and not on behalf of any Contributor. You must make it absolutely clear that any such warranty, support, indemnity, or liability obligation is offered by You alone, and You hereby agree to indemnify every Contributor for any liability incurred by such Contributor as a result of warranty, support, indemnity or liability terms You offer. You may include additional disclaimers of warranty and limitations of liability specific to any jurisdiction.
-
-4. Inability to Comply Due to Statute or Regulation
-
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Software due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be placed in a text file included with all distributions of the Covered Software under this License. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-
-5. Termination
-
-5.1. The rights granted under this License will terminate automatically if You fail to comply with any of its terms. However, if You become compliant, then the rights granted under this License from a particular Contributor are reinstated (a) provisionally, unless and until such Contributor explicitly and finally terminates Your grants, and (b) on an ongoing basis, if such Contributor fails to notify You of the non-compliance by some reasonable means prior to 60 days after You have come back into compliance. Moreover, Your grants from a particular Contributor are reinstated on an ongoing basis if such Contributor notifies You of the non-compliance by some reasonable means, this is the first time You have received notice of non-compliance with this License from such Contributor, and You become compliant prior to 30 days after Your receipt of the notice.
-
-5.2. If You initiate litigation against any entity by asserting a patent infringement claim (excluding declaratory judgment actions, counter-claims, and cross-claims) alleging that a Contributor Version directly or indirectly infringes any patent, then the rights granted to You by any and all Contributors for the Covered Software under Section 2.1 of this License shall terminate.
-
-5.3. In the event of termination under Sections 5.1 or 5.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or Your distributors under this License prior to termination shall survive termination.
-
-6. Disclaimer of Warranty
-
-Covered Software is provided under this License on an “as is” basis, without warranty of any kind, either expressed, implied, or statutory, including, without limitation, warranties that the Covered Software is free of defects, merchantable, fit for a particular purpose or non-infringing. The entire risk as to the quality and performance of the Covered Software is with You. Should any Covered Software prove defective in any respect, You (not any Contributor) assume the cost of any necessary servicing, repair, or correction. This disclaimer of warranty constitutes an essential part of this License. No use of any Covered Software is authorized under this License except under this disclaimer.
-
-7. Limitation of Liability
-
-Under no circumstances and under no legal theory, whether tort (including negligence), contract, or otherwise, shall any Contributor, or anyone who distributes Covered Software as permitted above, be liable to You for any direct, indirect, special, incidental, or consequential damages of any character including, without limitation, damages for lost profits, loss of goodwill, work stoppage, computer failure or malfunction, or any and all other commercial damages or losses, even if such party shall have been informed of the possibility of such damages. This limitation of liability shall not apply to liability for death or personal injury resulting from such party’s negligence to the extent applicable law prohibits such limitation. Some jurisdictions do not allow the exclusion or limitation of incidental or consequential damages, so this exclusion and limitation may not apply to You.
-
-8. Litigation
-
-Any litigation relating to this License may be brought only in the courts of a jurisdiction where the defendant maintains its principal place of business and such litigation shall be governed by laws of that jurisdiction, without reference to its conflict-of-law provisions. Nothing in this Section shall prevent a party’s ability to bring cross-claims or counter-claims.
-
-9. Miscellaneous
-
-This License represents the complete agreement concerning the subject matter hereof. If any provision of this License is held to be unenforceable, such provision shall be reformed only to the extent necessary to make it enforceable. Any law or regulation which provides that the language of a contract shall be construed against the drafter shall not be used to construe this License against a Contributor.
-
-10. Versions of the License
-
-10.1. New Versions
-
-Mozilla Foundation is the license steward. Except as provided in Section 10.3, no one other than the license steward has the right to modify or publish new versions of this License. Each version will be given a distinguishing version number.
-
-10.2. Effect of New Versions
-
-You may distribute the Covered Software under the terms of the version of the License under which You originally received the Covered Software, or under the terms of any subsequent version published by the license steward.
-
-10.3. Modified Versions
-
-If you create software not governed by this License, and you want to create a new license for such software, you may create and use a modified version of this License if you rename the license and remove any references to the name of the license steward (except to note that such modified license differs from this License).
-
-10.4. Distributing Source Code Form that is Incompatible With Secondary Licenses
-
-If You choose to distribute Source Code Form that is Incompatible With Secondary Licenses under the terms of this version of the License, the notice described in Exhibit B of this License must be attached.
-
-Exhibit A - Source Code Form License Notice
-
-This Source Code Form is subject to the terms of the Mozilla Public License, v. 2.0. If a copy of the MPL was not distributed with this file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-If it is not possible or desirable to put the notice in a particular file, then You may include the notice in a location (such as a LICENSE file in a relevant directory) where a recipient would be likely to look for such a notice.
-
-You may add additional accurate notices of copyright ownership.
-
-Exhibit B - “Incompatible With Secondary Licenses” Notice
-
-This Source Code Form is “Incompatible With Secondary Licenses”, as defined by the Mozilla Public License, v. 2.0.
-
-
---------------- SECTION 3: Creative Commons Attribution 4.0 International -----------
-
-Creative Commons Corporation (Creative Commons) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an as-is basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
-Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
-
-Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensors permission is not necessary for any reason for example, because of any applicable exception or limitation to copyright then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
-
-Creative Commons Attribution 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1  Definitions.
-
-Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-
-Section 2  Scope.
-
-License grant.
-Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-reproduce and Share the Licensed Material, in whole or in part; and
-produce, reproduce, and Share Adapted Material.
-Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-Term. The term of this Public License is specified in Section 6(a).
-Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-Downstream recipients.
-Offer from the Licensor Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
-Other rights.
-Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-Patent and trademark rights are not licensed under this Public License.
-To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-
-Section 3  License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-Attribution.
-
-If You Share the Licensed Material (including in modified form), You must:
-retain the following if it is supplied by the Licensor with the Licensed Material:
-identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-a copyright notice;
-a notice that refers to this Public License;
-a notice that refers to the disclaimer of warranties;
-a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-If You Share Adapted Material You produce, the Adapter's License You apply must not prevent recipients of the Adapted Material from complying with this Public License.
-
-Section 4  Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material; and
-You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5  Disclaimer of Warranties and Limitation of Liability.
-
-Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-
-The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-Section 6  Term and Termination.
-
-This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
-Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-upon express reinstatement by the Licensor.
-For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7  Other Terms and Conditions.
-
-The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-Section 8  Interpretation.
-
-For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the Licensor. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark Creative Commons or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-
-
---------------- SECTION 4: Creative Commons Attribution License, V3.0 -----------
-
-Creative Commons Attribution 3.0 Unported
-
-CREATIVE COMMONS CORPORATION IS NOT A LAW FIRM AND DOES NOT PROVIDE LEGAL
-SERVICES. DISTRIBUTION OF THIS LICENSE DOES NOT CREATE AN ATTORNEY-CLIENT
-RELATIONSHIP. CREATIVE COMMONS PROVIDES THIS INFORMATION ON AN "AS-IS"
-BASIS. CREATIVE COMMONS MAKES NO WARRANTIES REGARDING THE INFORMATION
-PROVIDED, AND DISCLAIMS LIABILITY FOR DAMAGES RESULTING FROM ITS USE.
-
-License
-
-THE WORK (AS DEFINED BELOW) IS PROVIDED UNDER THE TERMS OF THIS CREATIVE
-COMMONS PUBLIC LICENSE ("CCPL" OR "LICENSE"). THE WORK IS PROTECTED BY
-COPYRIGHT AND/OR OTHER APPLICABLE LAW. ANY USE OF THE WORK OTHER THAN
-AS AUTHORIZED UNDER THIS LICENSE OR COPYRIGHT LAW IS PROHIBITED.
-
-BY EXERCISING ANY RIGHTS TO THE WORK PROVIDED HERE, YOU ACCEPT AND AGREE
-TO BE BOUND BY THE TERMS OF THIS LICENSE. TO THE EXTENT THIS LICENSE
-MAY BE CONSIDERED TO BE A CONTRACT, THE LICENSOR GRANTS YOU THE RIGHTS
-CONTAINED HERE IN CONSIDERATION OF YOUR ACCEPTANCE OF SUCH TERMS AND
-CONDITIONS.
-
-1. Definitions
-
-   a. "Adaptation" means a work based upon the Work, or upon the Work
-   and other pre-existing works, such as a translation, adaptation,
-   derivative work, arrangement of music or other alterations of a
-   literary or artistic work, or phonogram or performance and includes
-   cinematographic adaptations or any other form in which the Work may
-   be recast, transformed, or adapted including in any form recognizably
-   derived from the original, except that a work that constitutes a
-   Collection will not be considered an Adaptation for the purpose of
-   this License. For the avoidance of doubt, where the Work is a musical
-   work, performance or phonogram, the synchronization of the Work in
-   timed-relation with a moving image ("synching") will be considered
-   an Adaptation for the purpose of this License.
-
-   b. "Collection" means a collection of literary or artistic works,
-   such as encyclopedias and anthologies, or performances, phonograms or
-   broadcasts, or other works or subject matter other than works listed in
-   Section 1(f) below, which, by reason of the selection and arrangement
-   of their contents, constitute intellectual creations, in which the
-   Work is included in its entirety in unmodified form along with one or
-   more other contributions, each constituting separate and independent
-   works in themselves, which together are assembled into a collective
-   whole. A work that constitutes a Collection will not be considered
-   an Adaptation (as defined above) for the purposes of this License.
-
-   c. "Distribute" means to make available to the public the original
-   and copies of the Work or Adaptation, as appropriate, through sale
-   or other transfer of ownership.
-
-   d. "Licensor" means the individual, individuals, entity or entities
-   that offer(s) the Work under the terms of this License.
-
-   e. "Original Author" means, in the case of a literary or artistic
-   work, the individual, individuals, entity or entities who created the
-   Work or if no individual or entity can be identified, the publisher;
-   and in addition (i) in the case of a performance the actors, singers,
-   musicians, dancers, and other persons who act, sing, deliver, declaim,
-   play in, interpret or otherwise perform literary or artistic works or
-   expressions of folklore; (ii) in the case of a phonogram the producer
-   being the person or legal entity who first fixes the sounds of a
-   performance or other sounds; and, (iii) in the case of broadcasts,
-   the organization that transmits the broadcast.
-
-   f. "Work" means the literary and/or artistic work offered under the
-   terms of this License including without limitation any production
-   in the literary, scientific and artistic domain, whatever may be
-   the mode or form of its expression including digital form, such
-   as a book, pamphlet and other writing; a lecture, address, sermon
-   or other work of the same nature; a dramatic or dramatico-musical
-   work; a choreographic work or entertainment in dumb show; a musical
-   composition with or without words; a cinematographic work to which are
-   assimilated works expressed by a process analogous to cinematography;
-   a work of drawing, painting, architecture, sculpture, engraving
-   or lithography; a photographic work to which are assimilated works
-   expressed by a process analogous to photography; a work of applied art;
-   an illustration, map, plan, sketch or three-dimensional work relative
-   to geography, topography, architecture or science; a performance;
-   a broadcast; a phonogram; a compilation of data to the extent it is
-   protected as a copyrightable work; or a work performed by a variety
-   or circus performer to the extent it is not otherwise considered a
-   literary or artistic work.
-
-   g. "You" means an individual or entity exercising rights under this
-   License who has not previously violated the terms of this License
-   with respect to the Work, or who has received express permission
-   from the Licensor to exercise rights under this License despite a
-   previous violation.
-
-   h. "Publicly Perform" means to perform public recitations of the
-   Work and to communicate to the public those public recitations, by
-   any means or process, including by wire or wireless means or public
-   digital performances; to make available to the public Works in such
-   a way that members of the public may access these Works from a place
-   and at a place individually chosen by them; to perform the Work to the
-   public by any means or process and the communication to the public of
-   the performances of the Work, including by public digital performance;
-   to broadcast and rebroadcast the Work by any means including signs,
-   sounds or images.
-
-   i. "Reproduce" means to make copies of the Work by any means including
-   without limitation by sound or visual recordings and the right of
-   fixation and reproducing fixations of the Work, including storage
-   of a protected performance or phonogram in digital form or other
-   electronic medium.
-
-2. Fair Dealing Rights. Nothing in this License is intended to reduce,
-limit, or restrict any uses free from copyright or rights arising from
-limitations or exceptions that are provided for in connection with the
-copyright protection under copyright law or other applicable laws.
-
-3. License Grant. Subject to the terms and conditions of this License,
-Licensor hereby grants You a worldwide, royalty-free, non-exclusive,
-perpetual (for the duration of the applicable copyright) license to
-exercise the rights in the Work as stated below:
-
-   a. to Reproduce the Work, to incorporate the Work into one or
-   more Collections, and to Reproduce the Work as incorporated in the
-   Collections;
-
-   b. to create and Reproduce Adaptations provided that any such
-   Adaptation, including any translation in any medium, takes reasonable
-   steps to clearly label, demarcate or otherwise identify that changes
-   were made to the original Work. For example, a translation could be
-   marked "The original work was translated from English to Spanish," or
-   a modification could indicate "The original work has been modified.";
-
-   c. to Distribute and Publicly Perform the Work including as
-   incorporated in Collections; and,
-
-   d. to Distribute and Publicly Perform Adaptations.
-
-   e. For the avoidance of doubt:
-
-      i. Non-waivable Compulsory License Schemes. In those jurisdictions
-      in which the right to collect royalties through any statutory or
-      compulsory licensing scheme cannot be waived, the Licensor reserves
-      the exclusive right to collect such royalties for any exercise by
-      You of the rights granted under this License;
-
-      ii. Waivable Compulsory License Schemes. In those jurisdictions
-      in which the right to collect royalties through any statutory or
-      compulsory licensing scheme can be waived, the Licensor waives the
-      exclusive right to collect such royalties for any exercise by You
-      of the rights granted under this License; and,
-
-      iii. Voluntary License Schemes. The Licensor waives the right
-      to collect royalties, whether individually or, in the event that
-      the Licensor is a member of a collecting society that administers
-      voluntary licensing schemes, via that society, from any exercise
-      by You of the rights granted under this License.  The above rights
-      may be exercised in all media and formats whether now known or
-      hereafter devised. The above rights include the right to make such
-      modifications as are technically necessary to exercise the rights
-      in other media and formats. Subject to Section 8(f), all rights
-      not expressly granted by Licensor are hereby reserved.
-
-4. Restrictions. The license granted in Section 3 above is expressly
-made subject to and limited by the following restrictions:
-
-   a. You may Distribute or Publicly Perform the Work only under the
-   terms of this License.  You must include a copy of, or the Uniform
-   Resource Identifier (URI) for, this License with every copy of the
-   Work You Distribute or Publicly Perform. You may not offer or impose
-   any terms on the Work that restrict the terms of this License or the
-   ability of the recipient of the Work to exercise the rights granted to
-   that recipient under the terms of the License. You may not sublicense
-   the Work. You must keep intact all notices that refer to this License
-   and to the disclaimer of warranties with every copy of the Work You
-   Distribute or Publicly Perform. When You Distribute or Publicly Perform
-   the Work, You may not impose any effective technological measures on
-   the Work that restrict the ability of a recipient of the Work from
-   You to exercise the rights granted to that recipient under the terms
-   of the License. This Section 4(a) applies to the Work as incorporated
-   in a Collection, but this does not require the Collection apart from
-   the Work itself to be made subject to the terms of this License. If
-   You create a Collection, upon notice from any Licensor You must,
-   to the extent practicable, remove from the Collection any credit as
-   required by Section 4(b), as requested. If You create an Adaptation,
-   upon notice from any Licensor You must, to the extent practicable,
-   remove from the Adaptation any credit as required by Section 4(b),
-   as requested.
-
-   b. If You Distribute, or Publicly Perform the Work or any Adaptations
-   or Collections, You must, unless a request has been made pursuant
-   to Section 4(a), keep intact all copyright notices for the Work and
-   provide, reasonable to the medium or means You are utilizing: (i) the
-   name of the Original Author (or pseudonym, if applicable) if supplied,
-   and/or if the Original Author and/or Licensor designate another party
-   or parties (e.g., a sponsor institute, publishing entity, journal)
-   for attribution ("Attribution Parties") in Licensor's copyright
-   notice, terms of service or by other reasonable means, the name of
-   such party or parties; (ii) the title of the Work if supplied; (iii)
-   to the extent reasonably practicable, the URI, if any, that Licensor
-   specifies to be associated with the Work, unless such URI does not
-   refer to the copyright notice or licensing information for the Work;
-   and (iv) , consistent with Section 3(b), in the case of an Adaptation,
-   a credit identifying the use of the Work in the Adaptation (e.g.,
-   "French translation of the Work by Original Author," or "Screenplay
-   based on original Work by Original Author"). The credit required
-   by this Section 4 (b) may be implemented in any reasonable manner;
-   provided, however, that in the case of a Adaptation or Collection, at
-   a minimum such credit will appear, if a credit for all contributing
-   authors of the Adaptation or Collection appears, then as part of
-   these credits and in a manner at least as prominent as the credits
-   for the other contributing authors. For the avoidance of doubt, You
-   may only use the credit required by this Section for the purpose of
-   attribution in the manner set out above and, by exercising Your rights
-   under this License, You may not implicitly or explicitly assert or
-   imply any connection with, sponsorship or endorsement by the Original
-   Author, Licensor and/or Attribution Parties, as appropriate, of You
-   or Your use of the Work, without the separate, express prior written
-   permission of the Original Author, Licensor and/or Attribution Parties.
-
-   c. Except as otherwise agreed in writing by the Licensor or as may be
-   otherwise permitted by applicable law, if You Reproduce, Distribute
-   or Publicly Perform the Work either by itself or as part of any
-   Adaptations or Collections, You must not distort, mutilate, modify
-   or take other derogatory action in relation to the Work which would
-   be prejudicial to the Original Author's honor or reputation. Licensor
-   agrees that in those jurisdictions (e.g. Japan), in which any exercise
-   of the right granted in Section 3(b) of this License (the right to
-   make Adaptations) would be deemed to be a distortion, mutilation,
-   modification or other derogatory action prejudicial to the Original
-   Author's honor and reputation, the Licensor will waive or not assert,
-   as appropriate, this Section, to the fullest extent permitted by the
-   applicable national law, to enable You to reasonably exercise Your
-   right under Section 3(b) of this License (right to make Adaptations)
-   but not otherwise.
-
-5. Representations, Warranties and Disclaimer
-UNLESS OTHERWISE MUTUALLY AGREED TO BY THE PARTIES IN WRITING, LICENSOR
-OFFERS THE WORK AS-IS AND MAKES NO REPRESENTATIONS OR WARRANTIES OF ANY
-KIND CONCERNING THE WORK, EXPRESS, IMPLIED, STATUTORY OR OTHERWISE,
-INCLUDING, WITHOUT LIMITATION, WARRANTIES OF TITLE, MERCHANTIBILITY,
-FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT, OR THE ABSENCE OF
-LATENT OR OTHER DEFECTS, ACCURACY, OR THE PRESENCE OF ABSENCE OF ERRORS,
-WHETHER OR NOT DISCOVERABLE. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION
-OF IMPLIED WARRANTIES, SO SUCH EXCLUSION MAY NOT APPLY TO YOU.
-
-6. Limitation on Liability.
-EXCEPT TO THE EXTENT REQUIRED BY APPLICABLE LAW, IN NO EVENT WILL LICENSOR
-BE LIABLE TO YOU ON ANY LEGAL THEORY FOR ANY SPECIAL, INCIDENTAL,
-CONSEQUENTIAL, PUNITIVE OR EXEMPLARY DAMAGES ARISING OUT OF THIS
-LICENSE OR THE USE OF THE WORK, EVEN IF LICENSOR HAS BEEN ADVISED OF
-THE POSSIBILITY OF SUCH DAMAGES.
-
-7. Termination
-
-   a. This License and the rights granted hereunder will terminate
-   automatically upon any breach by You of the terms of this
-   License. Individuals or entities who have received Adaptations or
-   Collections from You under this License, however, will not have their
-   licenses terminated provided such individuals or entities remain in
-   full compliance with those licenses. Sections 1, 2, 5, 6, 7, and 8
-   will survive any termination of this License.
-
-   b. Subject to the above terms and conditions, the license granted
-   here is perpetual (for the duration of the applicable copyright in
-   the Work). Notwithstanding the above, Licensor reserves the right to
-   release the Work under different license terms or to stop distributing
-   the Work at any time; provided, however that any such election will not
-   serve to withdraw this License (or any other license that has been,
-   or is required to be, granted under the terms of this License), and
-   this License will continue in full force and effect unless terminated
-   as stated above.
-
-8. Miscellaneous
-
-   a. Each time You Distribute or Publicly Perform the Work or a
-   Collection, the Licensor offers to the recipient a license to the
-   Work on the same terms and conditions as the license granted to You
-   under this License.
-
-   b. Each time You Distribute or Publicly Perform an Adaptation, Licensor
-   offers to the recipient a license to the original Work on the same
-   terms and conditions as the license granted to You under this License.
-
-   c. If any provision of this License is invalid or unenforceable under
-   applicable law, it shall not affect the validity or enforceability
-   of the remainder of the terms of this License, and without further
-   action by the parties to this agreement, such provision shall be
-   reformed to the minimum extent necessary to make such provision valid
-   and enforceable.
-
-   d. No term or provision of this License shall be deemed waived and no
-   breach consented to unless such waiver or consent shall be in writing
-   and signed by the party to be charged with such waiver or consent.
-
-   e. This License constitutes the entire agreement between the parties
-   with respect to the Work licensed here. There are no understandings,
-   agreements or representations with respect to the Work not specified
-   here. Licensor shall not be bound by any additional provisions that
-   may appear in any communication from You. This License may not be
-   modified without the mutual written agreement of the Licensor and You.
-
-   f. The rights granted under, and the subject matter referenced, in this
-   License were drafted utilizing the terminology of the Berne Convention
-   for the Protection of Literary and Artistic Works (as amended on
-   September 28, 1979), the Rome Convention of 1961, the WIPO Copyright
-   Treaty of 1996, the WIPO Performances and Phonograms Treaty of 1996 and
-   the Universal Copyright Convention (as revised on July 24, 1971). These
-   rights and subject matter take effect in the relevant jurisdiction
-   in which the License terms are sought to be enforced according to
-   the corresponding provisions of the implementation of those treaty
-   provisions in the applicable national law. If the standard suite of
-   rights granted under applicable copyright law includes additional
-   rights not granted under this License, such additional rights are
-   deemed to be included in the License; this License is not intended
-   to restrict the license of any rights under applicable law.
-
-
---------------- SECTION 5:  Creative Commons Attribution-ShareAlike, V4.0 ----------
-
-Creative Commons Attribution-ShareAlike 4.0 International Public License
-
-Creative Commons Corporation (“Creative Commons”) is not a law firm and does not provide legal services or legal advice. Distribution of Creative Commons public licenses does not create a lawyer-client or other relationship. Creative Commons makes its licenses and related information available on an “as-is” basis. Creative Commons gives no warranties regarding its licenses, any material licensed under their terms and conditions, or any related information. Creative Commons disclaims all liability for damages resulting from their use to the fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and conditions that creators and other rights holders may use to share original works of authorship and other material subject to copyright and certain other rights specified in the public license below. The following considerations are for informational purposes only, are not exhaustive, and do not form part of our licenses.
-
-    Considerations for licensors: Our public licenses are intended for use by those authorized to give the public permission to use material in ways otherwise restricted by copyright and certain other rights. Our licenses are irrevocable. Licensors should read and understand the terms and conditions of the license they choose before applying it. Licensors should also secure all rights necessary before applying our licenses so that the public can reuse the material as expected. Licensors should clearly mark any material not subject to the license. This includes other CC-licensed material, or material used under an exception or limitation to copyright. More considerations for licensors.
-
-    Considerations for the public: By using one of our public licenses, a licensor grants the public permission to use the licensed material under specified terms and conditions. If the licensor’s permission is not necessary for any reason–for example, because of any applicable exception or limitation to copyright–then that use is not regulated by the license. Our licenses grant only permissions under copyright and certain other rights that a licensor has authority to grant. Use of the licensed material may still be restricted for other reasons, including because others have copyright or other rights in the material. A licensor may make special requests, such as asking that all changes be marked or described. Although not required by our licenses, you are encouraged to respect those requests where reasonable. More considerations for the public.
-
-Creative Commons Attribution-ShareAlike 4.0 International Public License
-
-By exercising the Licensed Rights (defined below), You accept and agree to be bound by the terms and conditions of this Creative Commons Attribution-ShareAlike 4.0 International Public License ("Public License"). To the extent this Public License may be interpreted as a contract, You are granted the Licensed Rights in consideration of Your acceptance of these terms and conditions, and the Licensor grants You such rights in consideration of benefits the Licensor receives from making the Licensed Material available under these terms and conditions.
-
-Section 1 – Definitions.
-
-    Adapted Material means material subject to Copyright and Similar Rights that is derived from or based upon the Licensed Material and in which the Licensed Material is translated, altered, arranged, transformed, or otherwise modified in a manner requiring permission under the Copyright and Similar Rights held by the Licensor. For purposes of this Public License, where the Licensed Material is a musical work, performance, or sound recording, Adapted Material is always produced where the Licensed Material is synched in timed relation with a moving image.
-    Adapter's License means the license You apply to Your Copyright and Similar Rights in Your contributions to Adapted Material in accordance with the terms and conditions of this Public License.
-    BY-SA Compatible License means a license listed at creativecommons.org/compatiblelicenses, approved by Creative Commons as essentially the equivalent of this Public License.
-    Copyright and Similar Rights means copyright and/or similar rights closely related to copyright including, without limitation, performance, broadcast, sound recording, and Sui Generis Database Rights, without regard to how the rights are labeled or categorized. For purposes of this Public License, the rights specified in Section 2(b)(1)-(2) are not Copyright and Similar Rights.
-    Effective Technological Measures means those measures that, in the absence of proper authority, may not be circumvented under laws fulfilling obligations under Article 11 of the WIPO Copyright Treaty adopted on December 20, 1996, and/or similar international agreements.
-    Exceptions and Limitations means fair use, fair dealing, and/or any other exception or limitation to Copyright and Similar Rights that applies to Your use of the Licensed Material.
-    License Elements means the license attributes listed in the name of a Creative Commons Public License. The License Elements of this Public License are Attribution and ShareAlike.
-    Licensed Material means the artistic or literary work, database, or other material to which the Licensor applied this Public License.
-    Licensed Rights means the rights granted to You subject to the terms and conditions of this Public License, which are limited to all Copyright and Similar Rights that apply to Your use of the Licensed Material and that the Licensor has authority to license.
-    Licensor means the individual(s) or entity(ies) granting rights under this Public License.
-    Share means to provide material to the public by any means or process that requires permission under the Licensed Rights, such as reproduction, public display, public performance, distribution, dissemination, communication, or importation, and to make material available to the public including in ways that members of the public may access the material from a place and at a time individually chosen by them.
-    Sui Generis Database Rights means rights other than copyright resulting from Directive 96/9/EC of the European Parliament and of the Council of 11 March 1996 on the legal protection of databases, as amended and/or succeeded, as well as other essentially equivalent rights anywhere in the world.
-    You means the individual or entity exercising the Licensed Rights under this Public License. Your has a corresponding meaning.
-
-Section 2 – Scope.
-
-    License grant.
-        Subject to the terms and conditions of this Public License, the Licensor hereby grants You a worldwide, royalty-free, non-sublicensable, non-exclusive, irrevocable license to exercise the Licensed Rights in the Licensed Material to:
-            reproduce and Share the Licensed Material, in whole or in part; and
-            produce, reproduce, and Share Adapted Material.
-        Exceptions and Limitations. For the avoidance of doubt, where Exceptions and Limitations apply to Your use, this Public License does not apply, and You do not need to comply with its terms and conditions.
-        Term. The term of this Public License is specified in Section 6(a).
-        Media and formats; technical modifications allowed. The Licensor authorizes You to exercise the Licensed Rights in all media and formats whether now known or hereafter created, and to make technical modifications necessary to do so. The Licensor waives and/or agrees not to assert any right or authority to forbid You from making technical modifications necessary to exercise the Licensed Rights, including technical modifications necessary to circumvent Effective Technological Measures. For purposes of this Public License, simply making modifications authorized by this Section 2(a)(4) never produces Adapted Material.
-        Downstream recipients.
-            Offer from the Licensor – Licensed Material. Every recipient of the Licensed Material automatically receives an offer from the Licensor to exercise the Licensed Rights under the terms and conditions of this Public License.
-            Additional offer from the Licensor – Adapted Material. Every recipient of Adapted Material from You automatically receives an offer from the Licensor to exercise the Licensed Rights in the Adapted Material under the conditions of the Adapter’s License You apply.
-            No downstream restrictions. You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, the Licensed Material if doing so restricts exercise of the Licensed Rights by any recipient of the Licensed Material.
-        No endorsement. Nothing in this Public License constitutes or may be construed as permission to assert or imply that You are, or that Your use of the Licensed Material is, connected with, or sponsored, endorsed, or granted official status by, the Licensor or others designated to receive attribution as provided in Section 3(a)(1)(A)(i).
-
-    Other rights.
-        Moral rights, such as the right of integrity, are not licensed under this Public License, nor are publicity, privacy, and/or other similar personality rights; however, to the extent possible, the Licensor waives and/or agrees not to assert any such rights held by the Licensor to the limited extent necessary to allow You to exercise the Licensed Rights, but not otherwise.
-        Patent and trademark rights are not licensed under this Public License.
-        To the extent possible, the Licensor waives any right to collect royalties from You for the exercise of the Licensed Rights, whether directly or through a collecting society under any voluntary or waivable statutory or compulsory licensing scheme. In all other cases the Licensor expressly reserves any right to collect such royalties.
-
-Section 3 – License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the following conditions.
-
-    Attribution.
-
-        If You Share the Licensed Material (including in modified form), You must:
-            retain the following if it is supplied by the Licensor with the Licensed Material:
-                identification of the creator(s) of the Licensed Material and any others designated to receive attribution, in any reasonable manner requested by the Licensor (including by pseudonym if designated);
-                a copyright notice;
-                a notice that refers to this Public License;
-                a notice that refers to the disclaimer of warranties;
-                a URI or hyperlink to the Licensed Material to the extent reasonably practicable;
-            indicate if You modified the Licensed Material and retain an indication of any previous modifications; and
-            indicate the Licensed Material is licensed under this Public License, and include the text of, or the URI or hyperlink to, this Public License.
-        You may satisfy the conditions in Section 3(a)(1) in any reasonable manner based on the medium, means, and context in which You Share the Licensed Material. For example, it may be reasonable to satisfy the conditions by providing a URI or hyperlink to a resource that includes the required information.
-        If requested by the Licensor, You must remove any of the information required by Section 3(a)(1)(A) to the extent reasonably practicable.
-    ShareAlike.
-
-    In addition to the conditions in Section 3(a), if You Share Adapted Material You produce, the following conditions also apply.
-        The Adapter’s License You apply must be a Creative Commons license with the same License Elements, this version or later, or a BY-SA Compatible License.
-        You must include the text of, or the URI or hyperlink to, the Adapter's License You apply. You may satisfy this condition in any reasonable manner based on the medium, means, and context in which You Share Adapted Material.
-        You may not offer or impose any additional or different terms or conditions on, or apply any Effective Technological Measures to, Adapted Material that restrict exercise of the rights granted under the Adapter's License You apply.
-
-Section 4 – Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that apply to Your use of the Licensed Material:
-
-    for the avoidance of doubt, Section 2(a)(1) grants You the right to extract, reuse, reproduce, and Share all or a substantial portion of the contents of the database;
-    if You include all or a substantial portion of the database contents in a database in which You have Sui Generis Database Rights, then the database in which You have Sui Generis Database Rights (but not its individual contents) is Adapted Material, including for purposes of Section 3(b); and
-    You must comply with the conditions in Section 3(a) if You Share all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not replace Your obligations under this Public License where the Licensed Rights include other Copyright and Similar Rights.
-
-Section 5 – Disclaimer of Warranties and Limitation of Liability.
-
-    Unless otherwise separately undertaken by the Licensor, to the extent possible, the Licensor offers the Licensed Material as-is and as-available, and makes no representations or warranties of any kind concerning the Licensed Material, whether express, implied, statutory, or other. This includes, without limitation, warranties of title, merchantability, fitness for a particular purpose, non-infringement, absence of latent or other defects, accuracy, or the presence or absence of errors, whether or not known or discoverable. Where disclaimers of warranties are not allowed in full or in part, this disclaimer may not apply to You.
-    To the extent possible, in no event will the Licensor be liable to You on any legal theory (including, without limitation, negligence) or otherwise for any direct, special, indirect, incidental, consequential, punitive, exemplary, or other losses, costs, expenses, or damages arising out of this Public License or use of the Licensed Material, even if the Licensor has been advised of the possibility of such losses, costs, expenses, or damages. Where a limitation of liability is not allowed in full or in part, this limitation may not apply to You.
-
-    The disclaimer of warranties and limitation of liability provided above shall be interpreted in a manner that, to the extent possible, most closely approximates an absolute disclaimer and waiver of all liability.
-
-Section 6 – Term and Termination.
-
-    This Public License applies for the term of the Copyright and Similar Rights licensed here. However, if You fail to comply with this Public License, then Your rights under this Public License terminate automatically.
-
-    Where Your right to use the Licensed Material has terminated under Section 6(a), it reinstates:
-        automatically as of the date the violation is cured, provided it is cured within 30 days of Your discovery of the violation; or
-        upon express reinstatement by the Licensor.
-    For the avoidance of doubt, this Section 6(b) does not affect any right the Licensor may have to seek remedies for Your violations of this Public License.
-    For the avoidance of doubt, the Licensor may also offer the Licensed Material under separate terms or conditions or stop distributing the Licensed Material at any time; however, doing so will not terminate this Public License.
-    Sections 1, 5, 6, 7, and 8 survive termination of this Public License.
-
-Section 7 – Other Terms and Conditions.
-
-    The Licensor shall not be bound by any additional or different terms or conditions communicated by You unless expressly agreed.
-    Any arrangements, understandings, or agreements regarding the Licensed Material not stated herein are separate from and independent of the terms and conditions of this Public License.
-
-Section 8 – Interpretation.
-
-    For the avoidance of doubt, this Public License does not, and shall not be interpreted to, reduce, limit, restrict, or impose conditions on any use of the Licensed Material that could lawfully be made without permission under this Public License.
-    To the extent possible, if any provision of this Public License is deemed unenforceable, it shall be automatically reformed to the minimum extent necessary to make it enforceable. If the provision cannot be reformed, it shall be severed from this Public License without affecting the enforceability of the remaining terms and conditions.
-    No term or condition of this Public License will be waived and no failure to comply consented to unless expressly agreed to by the Licensor.
-    Nothing in this Public License constitutes or may be interpreted as a limitation upon, or waiver of, any privileges and immunities that apply to the Licensor or You, including from the legal processes of any jurisdiction or authority.
-
-Creative Commons is not a party to its public licenses. Notwithstanding, Creative Commons may elect to apply one of its public licenses to material it publishes and in those instances will be considered the “Licensor.” The text of the Creative Commons public licenses is dedicated to the public domain under the CC0 Public Domain Dedication. Except for the limited purpose of indicating that material is shared under a Creative Commons public license or as otherwise permitted by the Creative Commons policies published at creativecommons.org/policies, Creative Commons does not authorize the use of the trademark “Creative Commons” or any other trademark or logo of Creative Commons without its prior written consent including, without limitation, in connection with any unauthorized modifications to any of its public licenses or any other arrangements, understandings, or agreements concerning use of licensed material. For the avoidance of doubt, this paragraph does not form part of the public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
-
-
---------------- SECTION 6:  GNU Lesser General Public License, V3.0 ----------
-
-
-		   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-
-  This version of the GNU Lesser General Public License incorporates
-the terms and conditions of version 3 of the GNU General Public
-License, supplemented by the additional permissions listed below.
-
-  0. Additional Definitions.
-
-  As used herein, "this License" refers to version 3 of the GNU Lesser
-General Public License, and the "GNU GPL" refers to version 3 of the GNU
-General Public License.
-
-  "The Library" refers to a covered work governed by this License,
-other than an Application or a Combined Work as defined below.
-
-  An "Application" is any work that makes use of an interface provided
-by the Library, but which is not otherwise based on the Library.
-Defining a subclass of a class defined by the Library is deemed a mode
-of using an interface provided by the Library.
-
-  A "Combined Work" is a work produced by combining or linking an
-Application with the Library.  The particular version of the Library
-with which the Combined Work was made is also called the "Linked
-Version".
-
-  The "Minimal Corresponding Source" for a Combined Work means the
-Corresponding Source for the Combined Work, excluding any source code
-for portions of the Combined Work that, considered in isolation, are
-based on the Application, and not on the Linked Version.
-
-  The "Corresponding Application Code" for a Combined Work means the
-object code and/or source code for the Application, including any data
-and utility programs needed for reproducing the Combined Work from the
-Application, but excluding the System Libraries of the Combined Work.
-
-  1. Exception to Section 3 of the GNU GPL.
-
-  You may convey a covered work under sections 3 and 4 of this License
-without being bound by section 3 of the GNU GPL.
-
-  2. Conveying Modified Versions.
-
-  If you modify a copy of the Library, and, in your modifications, a
-facility refers to a function or data to be supplied by an Application
-that uses the facility (other than as an argument passed when the
-facility is invoked), then you may convey a copy of the modified
-version:
-
-   a) under this License, provided that you make a good faith effort to
-   ensure that, in the event an Application does not supply the
-   function or data, the facility still operates, and performs
-   whatever part of its purpose remains meaningful, or
-
-   b) under the GNU GPL, with none of the additional permissions of
-   this License applicable to that copy.
-
-  3. Object Code Incorporating Material from Library Header Files.
-
-  The object code form of an Application may incorporate material from
-a header file that is part of the Library.  You may convey such object
-code under terms of your choice, provided that, if the incorporated
-material is not limited to numerical parameters, data structure
-layouts and accessors, or small macros, inline functions and templates
-(ten or fewer lines in length), you do both of the following:
-
-   a) Give prominent notice with each copy of the object code that the
-   Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the object code with a copy of the GNU GPL and this license
-   document.
-
-  4. Combined Works.
-
-  You may convey a Combined Work under terms of your choice that,
-taken together, effectively do not restrict modification of the
-portions of the Library contained in the Combined Work and reverse
-engineering for debugging such modifications, if you also do each of
-the following:
-
-   a) Give prominent notice with each copy of the Combined Work that
-   the Library is used in it and that the Library and its use are
-   covered by this License.
-
-   b) Accompany the Combined Work with a copy of the GNU GPL and this license
-   document.
-
-   c) For a Combined Work that displays copyright notices during
-   execution, include the copyright notice for the Library among
-   these notices, as well as a reference directing the user to the
-   copies of the GNU GPL and this license document.
-
-   d) Do one of the following:
-
-       0) Convey the Minimal Corresponding Source under the terms of this
-       License, and the Corresponding Application Code in a form
-       suitable for, and under terms that permit, the user to
-       recombine or relink the Application with a modified version of
-       the Linked Version to produce a modified Combined Work, in the
-       manner specified by section 6 of the GNU GPL for conveying
-       Corresponding Source.
-
-       1) Use a suitable shared library mechanism for linking with the
-       Library.  A suitable mechanism is one that (a) uses at run time
-       a copy of the Library already present on the user's computer
-       system, and (b) will operate properly with a modified version
-       of the Library that is interface-compatible with the Linked
-       Version.
-
-   e) Provide Installation Information, but only if you would otherwise
-   be required to provide such information under section 6 of the
-   GNU GPL, and only to the extent that such information is
-   necessary to install and execute a modified version of the
-   Combined Work produced by recombining or relinking the
-   Application with a modified version of the Linked Version. (If
-   you use option 4d0, the Installation Information must accompany
-   the Minimal Corresponding Source and Corresponding Application
-   Code. If you use option 4d1, you must provide the Installation
-   Information in the manner specified by section 6 of the GNU GPL
-   for conveying Corresponding Source.)
-
-  5. Combined Libraries.
-
-  You may place library facilities that are a work based on the
-Library side by side in a single library together with other library
-facilities that are not Applications and are not covered by this
-License, and convey such a combined library under terms of your
-choice, if you do both of the following:
-
-   a) Accompany the combined library with a copy of the same work based
-   on the Library, uncombined with any other library facilities,
-   conveyed under the terms of this License.
-
-   b) Give prominent notice with the combined library that part of it
-   is a work based on the Library, and explaining where to find the
-   accompanying uncombined form of the same work.
-
-  6. Revised Versions of the GNU Lesser General Public License.
-
-  The Free Software Foundation may publish revised and/or new versions
-of the GNU Lesser General Public License from time to time. Such new
-versions will be similar in spirit to the present version, but may
-differ in detail to address new problems or concerns.
-
-  Each version is given a distinguishing version number. If the
-Library as you received it specifies that a certain numbered version
-of the GNU Lesser General Public License "or any later version"
-applies to it, you have the option of following the terms and
-conditions either of that published version or of any later version
-published by the Free Software Foundation. If the Library as you
-received it does not specify a version number of the GNU Lesser
-General Public License, you may choose any version of the GNU Lesser
-General Public License ever published by the Free Software Foundation.
-
-  If the Library as you received it specifies that a proxy can decide
-whether future versions of the GNU Lesser General Public License shall
-apply, that proxy's public statement of acceptance of any version is
-permanent authorization for you to choose that version for the
-Library.
-
-===========================================================================
-
-To the extent any open source components are licensed under the GPL
-and/or LGPL, or other similar licenses that require the source code
-and/or modifications to source code to be made available (as would be
-noted above), you may obtain a copy of the source code corresponding to
-the binaries for such open source components and modifications thereto,
-if any, (the "Source Files"), by downloading the Source Files from
-VMware's github site, or by sending a request, with your name and address to:
-VMware, Inc., 3401 Hillview Avenue, Palo Alto, CA 94304, United States of America.
-All such requests should clearly specify: OPEN SOURCE FILES REQUEST, Attention General Counsel.
-VMware shall mail a copy of the Source Files to you on a CD or equivalent physical medium.
-This offer to obtain a copy of the Source Files is valid for three years from the date you acquired this Software product.
-
-[VIC120GACH090617]
diff --git a/installer/vendor/github.com/vmware/vic/Makefile b/installer/vendor/github.com/vmware/vic/Makefile
deleted file mode 100644
index 8bf4ff23ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/Makefile
+++ /dev/null
@@ -1,459 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-SHELL=/bin/bash
-
-GO ?= go
-GOVERSION ?= go1.8
-OS := $(shell uname | tr '[:upper:]' '[:lower:]')
-ifeq (vagrant, $(filter vagrant,$(USER) $(SUDO_USER)))
-	# assuming we are in a shared directory where host arch is different from the guest
-	BIN_ARCH := -$(OS)
-endif
-REV :=$(shell git rev-parse --short=8 HEAD)
-TAG :=$(shell git for-each-ref --format="%(refname:short)" --sort=-authordate --count=1 refs/tags) # e.g. `v0.9.0`
-TAG_NUM :=$(shell git for-each-ref --format="%(refname:short)" --sort=-authordate --count=1 refs/tags | cut -c 2-) # e.g. `0.9.0`
-
-BASE_DIR := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
-BASE_PKG := github.com/vmware/vic/
-
-BIN ?= bin
-IGNORE := $(shell mkdir -p $(BIN))
-
-export GOPATH ?= $(shell echo $(CURDIR) | sed -e 's,/src/.*,,')
-SWAGGER ?= $(GOPATH)/bin/swagger$(BIN_ARCH)
-GOIMPORTS ?= $(GOPATH)/bin/goimports$(BIN_ARCH)
-GOLINT ?= $(GOPATH)/bin/golint$(BIN_ARCH)
-GVT ?= $(GOPATH)/bin/gvt$(BIN_ARCH)
-GOVC ?= $(GOPATH)/bin/govc$(BIN_ARCH)
-GAS ?= $(GOPATH)/bin/gas$(BIN_ARCH)
-MISSPELL ?= $(GOPATH)/bin/misspell$(BIN_ARCH)
-
-.PHONY: all tools clean test check distro \
-	goversion goimports gopath govet gofmt misspell gas golint \
-	isos tethers apiservers copyright
-
-.DEFAULT_GOAL := all
-
-# allow deferred godeps calls
-.SECONDEXPANSION:
-
-include infra/util/gsml/gmsl
-
-ifeq ($(ENABLE_RACE_DETECTOR),true)
-	RACE := -race
-else
-	RACE :=
-endif
-
-# Generate Go package dependency set, skipping if the only targets specified are clean and/or distclean
-# Caches dependencies to speed repeated calls
-define godeps
-	$(call assert,$(call gmsl_compatible,1 1 7), Wrong GMSL version) \
-	$(if $(filter-out focused-test test check clean distclean mrrobot mark sincemark .DEFAULT,$(MAKECMDGOALS)), \
-		$(if $(call defined,dep_cache,$(dir $1)),,$(info Generating dependency set for $(dir $1))) \
-		$(or \
-			$(if $(call defined,dep_cache,$(dir $1)), $(debug Using cached Go dependencies) $(wildcard $1) $(call get,dep_cache,$(dir $1))),
-			$(call set,dep_cache,$(dir $1),$(shell $(BASE_DIR)/infra/scripts/go-deps.sh $(dir $1) $(MAKEFLAGS))),
-			$(debug Cached Go dependency for $(dir $1): $(call get,dep_cache,$(dir $1))),
-			$(wildcard $1) $(call get,dep_cache,$(dir $1))
-		) \
-	)
-endef
-
-ifeq ($(DISABLE_DEPENDENCY_TRACKING), true)
-define godeps
-endef
-endif
-
-LDFLAGS := $(shell BUILD_NUMBER=${BUILD_NUMBER} $(BASE_DIR)/infra/scripts/version-linker-flags.sh)
-
-# target aliases - environment variable definition
-docker-engine-api := $(BIN)/docker-engine-server
-docker-engine-api-test := $(BIN)/docker-engine-server-test
-admiralapi-client := lib/config/dynamic/admiral/client/admiral_client.go
-portlayerapi := $(BIN)/port-layer-server
-portlayerapi-test := $(BIN)/port-layer-server-test
-portlayerapi-client := lib/apiservers/portlayer/client/port_layer_client.go
-portlayerapi-server := lib/apiservers/portlayer/restapi/server.go
-
-imagec := $(BIN)/imagec
-vicadmin := $(BIN)/vicadmin
-rpctool := $(BIN)/rpctool
-vic-machine-linux := $(BIN)/vic-machine-linux
-vic-machine-windows := $(BIN)/vic-machine-windows.exe
-vic-machine-darwin := $(BIN)/vic-machine-darwin
-vic-ui-linux := $(BIN)/vic-ui-linux
-vic-ui-windows := $(BIN)/vic-ui-windows.exe
-vic-ui-darwin := $(BIN)/vic-ui-darwin
-vic-init := $(BIN)/vic-init
-vic-init-test := $(BIN)/vic-init-test
-# NOT BUILT WITH make all TARGET
-# vic-dns variants to create standalone DNS service.
-vic-dns-linux := $(BIN)/vic-dns-linux
-vic-dns-windows := $(BIN)/vic-dns-windows.exe
-vic-dns-darwin := $(BIN)/vic-dns-darwin
-gandalf := $(BIN)/gandalf
-
-tether-linux := $(BIN)/tether-linux
-
-appliance := $(BIN)/appliance.iso
-appliance-staging := $(BIN)/.appliance-staging.tgz
-bootstrap := $(BIN)/bootstrap.iso
-bootstrap-staging := $(BIN)/.bootstrap-staging.tgz
-bootstrap-staging-debug := $(BIN)/.bootstrap-staging-debug.tgz
-bootstrap-debug := $(BIN)/bootstrap-debug.iso
-iso-base := $(BIN)/.iso-base.tgz
-
-# target aliases - target mapping
-docker-engine-api: $(docker-engine-api)
-docker-engine-api-test: $(docker-engine-api-test)
-portlayerapi: $(portlayerapi)
-portlayerapi-test: $(portlayerapi-test)
-portlayerapi-client: $(portlayerapi-client)
-portlayerapi-server: $(portlayerapi-server)
-admiralapi-client: $(admiralapi-client)
-
-imagec: $(imagec)
-vicadmin: $(vicadmin)
-rpctool: $(rpctool)
-vic-init: $(vic-init)
-vic-init-test: $(vic-init-test)
-
-tether-linux: $(tether-linux)
-
-appliance: $(appliance)
-appliance-staging: $(appliance-staging)
-bootstrap: $(bootstrap)
-bootstrap-staging: $(bootstrap-staging)
-bootstrap-debug: $(bootstrap-debug)
-bootstrap-staging-debug: $(bootstrap-staging-debug)
-iso-base: $(iso-base)
-vic-machine: $(vic-machine-linux) $(vic-machine-windows) $(vic-machine-darwin)
-vic-ui: $(vic-ui-linux) $(vic-ui-windows) $(vic-ui-darwin)
-# NOT BUILT WITH make all TARGET
-# vic-dns variants to create standalone DNS service.
-vic-dns: $(vic-dns-linux) $(vic-dns-windows) $(vic-dns-darwin)
-gandalf: $(gandalf)
-
-swagger: $(SWAGGER)
-goimports: $(GOIMPORTS)
-gas: $(GAS)
-misspell: $(MISSPELL)
-
-# convenience targets
-all: components tethers isos vic-machine imagec vic-ui
-tools: $(GOIMPORTS) $(GVT) $(GOLINT) $(SWAGGER) $(GAS) $(MISSPELL) goversion
-check: goversion goimports gofmt misspell govet golint copyright whitespace gas
-apiservers: $(portlayerapi) $(docker-engine-api)
-components: check apiservers $(vicadmin) $(rpctool)
-isos: $(appliance) $(bootstrap)
-tethers: $(tether-linux)
-
-most: $(portlayerapi) $(docker-engine-api) $(vicadmin) $(tether-linux) $(appliance) $(bootstrap) $(vic-machine-linux)
-
-# utility targets
-goversion:
-	@echo checking go version...
-	@( $(GO) version | grep -q $(GOVERSION) ) || ( echo "Please install $(GOVERSION) (found: $$($(GO) version))" && exit 1 )
-
-$(GOIMPORTS): vendor/manifest
-	@echo building $(GOIMPORTS)...
-	@$(GO) build $(RACE) -o $(GOIMPORTS) ./vendor/golang.org/x/tools/cmd/goimports
-
-$(GVT): vendor/manifest
-	@echo building $(GVT)...
-	@$(GO) build $(RACE) -o $(GVT) ./vendor/github.com/FiloSottile/gvt
-
-$(GOLINT): vendor/manifest
-	@echo building $(GOLINT)...
-	@$(GO) build $(RACE) -o $(GOLINT) ./vendor/github.com/golang/lint/golint
-
-$(SWAGGER): vendor/manifest
-	@echo building $(SWAGGER)...
-	@$(GO) build $(RACE) -o $(SWAGGER) ./vendor/github.com/go-swagger/go-swagger/cmd/swagger
-
-$(GOVC): vendor/manifest
-	@echo building $(GOVC)...
-	@$(GO) build $(RACE) -o $(GOVC) ./vendor/github.com/vmware/govmomi/govc
-
-$(GAS): vendor/manifest
-	@echo building $(GAS)...
-	@$(GO) build $(RACE) -o $(GAS) ./vendor/github.com/GoASTScanner/gas
-
-$(MISSPELL): vendor/manifest
-	@echo building $(MISSPELL)...
-	@$(GO) build $(RACE) -o $(MISSPELL) ./vendor/github.com/client9/misspell/cmd/misspell
-
-copyright:
-	@echo "checking copyright in header..."
-	@infra/scripts/header-check.sh
-
-whitespace:
-	@echo "checking whitespace..."
-	@infra/scripts/whitespace-check.sh
-
-# exit 1 if golint complains about anything other than comments
-golintf = $(GOLINT) $(1) | sh -c "! grep -v 'lib/apiservers/portlayer/restapi/operations'" | sh -c "! grep -v 'lib/config/dynamic/admiral/client'" | sh -c "! grep -v 'should have comment'" | sh -c "! grep -v 'comment on exported'" | sh -c "! grep -v 'by other packages, and that stutters'" | sh -c "! grep -v 'error strings should not be capitalized'"
-
-golint: $(GOLINT)
-	@echo checking go lint...
-	@$(call golintf,github.com/vmware/vic/cmd/...)
-	@$(call golintf,github.com/vmware/vic/pkg/...)
-	@$(call golintf,github.com/vmware/vic/lib/...)
-
-# For use by external tools such as emacs or for example:
-# GOPATH=$(make gopath) go get ...
-gopath:
-	@echo -n $(GOPATH)
-
-goimports: $(GOIMPORTS)
-	@echo checking go imports...
-	@! if test -e swagger-gen.log; then $(GOIMPORTS) -local github.com/vmware -d $$(\
-		 comm -23 <(find . -type f -name '*.go' -not -path "./vendor/*" | sort) \
-		          <(grep creating swagger-gen.log | awk '{print $$6 $$4};' | sed -e "s-\"\(.*\)\"-\./\1-g" | sed "s-\"\"-/-g" | sort)) \
-		 | egrep -v '^$$'; else $(GOIMPORTS) -local github.com/vmware -d $$(find . -type f -name '*.go' -not -path "./vendor/*") | egrep -v "^$$"; fi
-
-gofmt:
-	@echo checking gofmt...
-	@! gofmt -d -e -s $$(find . -mindepth 1 -maxdepth 1 -type d -not -name vendor) 2>&1 | egrep -v '^$$'
-
-misspell: $(MISSPELL)
-	@echo checking misspell...
-	@infra/scripts/misspell.sh
-
-govet:
-	@echo checking go vet...
-	@$(GO) tool vet -all -lostcancel -tests $$(find . -mindepth 1 -maxdepth 1 -type d -not -name vendor)
-# 	one day we will enable shadow check
-# 	@$(GO) tool vet -all -shadow -lostcancel -tests $$(find . -mindepth 1 -maxdepth 1 -type d -not -name vendor)
-
-gas: $(GAS)
-	@echo checking security problems
-	@$(GAS) -skip=*_responses.go -quiet lib/... cmd/... pkg/... 2> /dev/null
-
-vendor: $(GVT)
-	@echo restoring vendor
-	$(GVT) restore
-
-TEST_DIRS=github.com/vmware/vic/cmd
-TEST_DIRS+=github.com/vmware/vic/lib
-TEST_DIRS+=github.com/vmware/vic/pkg
-
-TEST_JOBS := $(addprefix test-job-,$(TEST_DIRS))
-
-# since drone cannot tell us how log it took
-mark:
-	@echo touching /started to mark beginning of the time
-	@touch /started
-sincemark:
-	@echo seconds passed since we start
-	@stat -c %Y /started | echo `expr $$(date +%s) - $$(cat)`
-
-install-govmomi:
-# manually install govmomi so the huge types package doesn't break cover
-	$(GO) install ./vendor/github.com/vmware/govmomi
-
-test: install-govmomi portlayerapi $(TEST_JOBS)
-
-
-focused-test:
-# test only those packages that have changes
-	infra/scripts/focused-test.sh $(REMOTE)
-
-$(TEST_JOBS): test-job-%:
-	@echo Running unit tests
-	# test everything but vendor
-ifdef DRONE
-	@echo Generating coverage data
-	@$(TIME) infra/scripts/coverage.sh $*
-else
-	@echo Generating local html coverage report
-	@$(TIME) infra/scripts/coverage.sh --html $*
-endif
-
-$(vic-init): $$(call godeps,cmd/vic-init/*.go)
-	@echo building vic-init
-	@CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -tags netgo -installsuffix netgo -o ./$@ ./$(dir $<)
-
-$(vic-init-test): $$(call godeps,cmd/vic-init/*.go)
-	@echo building vic-init-test
-	@CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(GO) test -c -coverpkg github.com/vmware/vic/lib/...,github.com/vmware/vic/pkg/... -outputdir /tmp -coverprofile init.cov -o ./$@ ./$(dir $<)
-
-$(tether-linux): $$(call godeps,cmd/tether/*.go)
-	@echo building tether-linux
-	@CGO_ENABLED=1 GOOS=linux GOARCH=amd64 $(TIME) $(GO) build $(RACE) -tags netgo -installsuffix netgo -ldflags '$(LDFLAGS) -extldflags "-static"' -o ./$@ ./$(dir $<)
-
-$(rpctool): $$(call godeps,cmd/rpctool/*.go)
-ifeq ($(OS),linux)
-	@echo building rpctool
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-else
-	@echo skipping rpctool, cannot cross compile cgo
-endif
-
-$(vicadmin): $$(call godeps,cmd/vicadmin/*.go)
-	@echo building vicadmin
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(imagec): $(call godeps,cmd/imagec/*.go) $(portlayerapi-client)
-	@echo building imagec...
-	@$(TIME) $(GO) build $(RACE)  $(ldflags) -o ./$@ ./$(dir $<)
-
-$(docker-engine-api): $(portlayerapi-client) $(admiralapi-client) $$(call godeps,cmd/docker/*.go)
-ifeq ($(OS),linux)
-	@echo Building docker-engine-api server...
-	@$(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o $@ ./cmd/docker
-else
-	@echo skipping docker-engine-api server, cannot build on non-linux
-endif
-
-$(docker-engine-api-test): $$(call godeps,cmd/docker/*.go) $(portlayerapi-client)
-ifeq ($(OS),linux)
-	@echo Building docker-engine-api server for test...
-	@$(TIME) $(GO) test -c -coverpkg github.com/vmware/vic/lib/...,github.com/vmware/vic/pkg/... -outputdir /tmp -coverprofile docker-engine-api.cov -o $@ ./cmd/docker
-else
-	@echo skipping docker-engine-api server for test, cannot build on non-linux
-endif
-
-# Common portlayer dependencies between client and server
-PORTLAYER_DEPS ?= lib/apiservers/portlayer/swagger.json \
-				  lib/apiservers/portlayer/restapi/configure_port_layer.go \
-				  lib/apiservers/portlayer/restapi/options/*.go
-
-$(admiralapi-client): lib/config/dynamic/admiral/swagger.json $(SWAGGER)
-	@echo regenerating swagger models and operations for Admiral API client...
-	@$(SWAGGER) generate client -A Admiral --target lib/config/dynamic/admiral -f lib/config/dynamic/admiral/swagger.json --tags /projects --tags /resources/compute --tags /config/registries 2>>swagger-gen.log
-	@echo done regenerating swagger models and operations for Admiral API client...
-
-$(portlayerapi-client): $(PORTLAYER_DEPS) $(SWAGGER)
-	@echo regenerating swagger models and operations for Portlayer API client...
-	@$(SWAGGER) generate client -A PortLayer --target lib/apiservers/portlayer -f lib/apiservers/portlayer/swagger.json 2>>swagger-gen.log
-	@echo done regenerating swagger models and operations for Portlayer API client...
-
-$(portlayerapi-server): $(PORTLAYER_DEPS) $(SWAGGER)
-	@echo regenerating swagger models and operations for Portlayer API server...
-	@$(SWAGGER) generate server --exclude-main -A PortLayer --target lib/apiservers/portlayer -f lib/apiservers/portlayer/swagger.json 2>>swagger-gen.log
-	@echo done regenerating swagger models and operations for Portlayer API server...
-
-$(portlayerapi): $(portlayerapi-server) $(portlayerapi-client) $$(call godeps,cmd/port-layer-server/*.go)
-	@echo building Portlayer API server...
-	@$(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o $@ ./cmd/port-layer-server
-
-$(portlayerapi-test): $$(call godeps,cmd/port-layer-server/*.go) $(portlayerapi-server) $(portlayerapi-client)
-	@echo building Portlayer API server for test...
-	@$(TIME) $(GO) test -c -coverpkg github.com/vmware/vic/lib/...,github.com/vmware/vic/pkg/... -coverprofile port-layer-server.cov -outputdir /tmp -o $@ ./cmd/port-layer-server
-
-$(iso-base): isos/base.sh isos/base/*.repo isos/base/isolinux/** isos/base/xorriso-options.cfg
-	@echo building iso-base docker image
-	@$(TIME) $< -c $(BIN)/.yum-cache.tgz -p $@
-
-# appliance staging - allows for caching of package install
-$(appliance-staging): isos/appliance-staging.sh $(iso-base)
-	@echo staging for VCH appliance
-	@$(TIME) $< -c $(BIN)/.yum-cache.tgz -p $(iso-base) -o $@
-
-# main appliance target - depends on all top level component targets
-$(appliance): isos/appliance.sh isos/appliance/* isos/vicadmin/** $(vicadmin) $(vic-init) $(portlayerapi) $(docker-engine-api) $(appliance-staging)
-	@echo building VCH appliance ISO
-	@$(TIME) $< -p $(appliance-staging) -b $(BIN)
-
-# main bootstrap target
-$(bootstrap): isos/bootstrap.sh $(tether-linux) $(bootstrap-staging) isos/bootstrap/*
-	@echo "Making bootstrap iso"
-	@$(TIME) $< -p $(bootstrap-staging) -b $(BIN)
-
-$(bootstrap-debug): isos/bootstrap.sh $(tether-linux) $(rpctool) $(bootstrap-staging-debug) isos/bootstrap/*
-	@echo "Making bootstrap-debug iso"
-	@$(TIME) $< -p $(bootstrap-staging-debug) -b $(BIN) -d true
-
-$(bootstrap-staging): isos/bootstrap-staging.sh $(iso-base)
-	@echo staging for bootstrap
-	@$(TIME) $< -c $(BIN)/.yum-cache.tgz -p $(iso-base) -o $@
-
-$(bootstrap-staging-debug): isos/bootstrap-staging.sh $(iso-base)
-	@echo staging debug for bootstrap
-	@$(TIME) $< -c $(BIN)/.yum-cache.tgz -p $(iso-base) -o $@ -d true
-
-$(vic-machine-linux): $$(call godeps,cmd/vic-machine/*.go)
-	@echo building vic-machine linux...
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(vic-machine-windows): $$(call godeps,cmd/vic-machine/*.go)
-	@echo building vic-machine windows...
-	@GOARCH=amd64 GOOS=windows $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(vic-machine-darwin): $$(call godeps,cmd/vic-machine/*.go)
-	@echo building vic-machine darwin...
-	@GOARCH=amd64 GOOS=darwin $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(vic-ui-linux): $$(call godeps,cmd/vic-ui/*.go)
-	@echo building vic-ui linux...
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)
-
-$(vic-ui-windows): $$(call godeps,cmd/vic-ui/*.go)
-	@echo building vic-ui windows...
-	@GOARCH=amd64 GOOS=windows $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)
-
-$(vic-ui-darwin): $$(call godeps,cmd/vic-ui/*.go)
-	@echo building vic-ui darwin...
-	@GOARCH=amd64 GOOS=darwin $(TIME) $(GO) build $(RACE) -ldflags "-X main.BuildID=${BUILD_NUMBER} -X main.CommitID=${COMMIT}" -o ./$@ ./$(dir $<)
-
-$(vic-dns-linux): $$(call godeps,cmd/vic-dns/*.go)
-	@echo building vic-dns linux...
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(vic-dns-windows): $$(call godeps,cmd/vic-dns/*.go)
-	@echo building vic-dns windows...
-	@GOARCH=amd64 GOOS=windows $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(vic-dns-darwin): $$(call godeps,cmd/vic-dns/*.go)
-	@echo building vic-dns darwin...
-	@GOARCH=amd64 GOOS=darwin $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-$(gandalf):  $$(call godeps,cmd/gandalf/*.go)
-	@echo building gandalf...
-	@GOARCH=amd64 GOOS=linux $(TIME) $(GO) build $(RACE) -ldflags "$(LDFLAGS)" -o ./$@ ./$(dir $<)
-
-distro: all
-	@tar czvf $(REV).tar.gz bin/*.iso bin/vic-machine-*
-
-mrrobot:
-	@rm -rf *.xml *.html *.log *.zip VCH-0-*
-
-clean:
-	@echo removing binaries
-	@rm -rf $(BIN)/*
-	@echo removing Go object files
-	@$(GO) clean
-
-	@echo removing swagger generated files...
-	@rm -f ./lib/apiservers/portlayer/restapi/doc.go
-	@rm -f ./lib/apiservers/portlayer/restapi/embedded_spec.go
-	@rm -f ./lib/apiservers/portlayer/restapi/server.go
-	@rm -rf ./lib/apiservers/portlayer/client/
-	@rm -rf ./lib/apiservers/portlayer/cmd/
-	@rm -rf ./lib/apiservers/portlayer/models/
-	@rm -rf ./lib/apiservers/portlayer/restapi/operations/
-	@rm -rf ./lib/config/dynamic/admiral/client
-	@rm -rf ./lib/config/dynamic/admiral/models
-	@rm -rf ./lib/config/dynamic/admiral/operations
-
-	@rm -f *.log
-	@rm -f *.pem
-
-# removes the yum cache as well as the generated binaries
-distclean: clean
-	@echo removing binaries
-	@rm -rf $(BIN)
diff --git a/installer/vendor/github.com/vmware/vic/README.md b/installer/vendor/github.com/vmware/vic/README.md
deleted file mode 100644
index 96a51dc8d6..0000000000
--- a/installer/vendor/github.com/vmware/vic/README.md
+++ /dev/null
@@ -1,183 +0,0 @@
-[![Build Status](https://ci.vcna.io/api/badges/vmware/vic/status.svg)](https://ci.vcna.io/vmware/vic) [![Coverage Status](https://coverage.vmware.run/badges/vmware/vic/coverage.svg)](https://coverage.vmware.run/vmware/vic) [![Download](https://img.shields.io/badge/download-latest-blue.svg)](https://github.com/vmware/vic/releases/latest) [![Go Report Card](https://goreportcard.com/badge/github.com/vmware/vic)](https://goreportcard.com/report/github.com/vmware/vic)
-
-# vSphere Integrated Containers Engine
-
-vSphere Integrated Containers Engine (VIC Engine) is a container runtime for vSphere, allowing developers familiar with Docker to develop in containers and deploy them alongside traditional VM-based workloads on vSphere clusters, and allowing for these workloads to be managed through the vSphere UI in a way familiar to existing vSphere admins.
-
-See [VIC Engine Architecture](doc/design/arch/arch.md) for a high level overview.
-
-
-## Project Status
-
-VIC Engine now provides:
-* basic function for most of the core lifecycle operations: pull, create, start, attach, run, kill, stop, wait, rm, logs.
-* early vCenter support, leveraging DRS for initial placement.
-* volume support [--volume-store](doc/user/usage.md#configuring-volumes-in-a-virtual-container-host) - SIOC is not integrated but can be set as normal.
-* direct mapping of vSphere networks [--container-network](doc/user/usage.md#exposing-vsphere-networks-within-a-virtual-container-host) - NIOC is not integrated but can be set as normal.
-* dual-mode management - IP addresses are reported as normal via vSphere UI, guest shutdown via the UI will trigger delivery of container STOPSIGNAL, restart will relaunch container process.
-* logs command - follow is available however timestamps and corresponding filtering are not
-* client authentication - basic authentication via client certificates known as _tlsverify_
-
-We are working hard to add functionality while building out our [foundation](doc/design/arch/arch.md#port-layer-abstractions) so continue to watch the repo for new features. Initial focus is on the production end of the CI pipeline, building backwards towards developer laptop scenarios.
-
-This limited set of current capabilities may come as a surprise to people who are familiar with [Project Bonneville](http://blogs.vmware.com/cloudnative/introducing-project-bonneville/) that was [reasonably fully featured](https://www.youtube.com/watch?v=XkFQw8ueT1w) when demonstrated at VMworld in 2015.
-Project Bonneville was research aimed at determining best approaches to enabling container workflows in a vSphere environment and therefore enabled a broad set of features, but not in a manner that made it a viable product for large scale consumption. Building on top of research code is a great shortcut for fast time-to-market, but does not provide a good foundation for an enterprise quality product. vSphere Integrated Containers Engine is a full re-architecture and re-write, building off the knowledge gained during Project Bonneville while keeping almost zero code.
-
-
-## Installing
-
-Once built, pick up the correct binary based on your OS, and then the result can be installed with the following command.
-
-```
-bin/vic-machine-linux create --target <target-host>[/datacenter] --image-store <datastore name> --name <vch-name> --user <username> --password <password> --thumbprint <certificate thumbprint> --compute-resource <cluster or resource pool name> --tls-cname <FQDN, *.wildcard.domain, or static IP>
-```
-
-See `vic-machine-XXX create --help` for usage information.
-
-A more indepth example can be found [here](doc/user/usage.md)
-
-Container output is found in a log file on the datastore ([datastore]/containerid/containerid.log).
-
-
-## Deleting
-
-The installed Virtual Container Host can be deleted through vic-machine-XXX delete.
-
-See `vic-machine-XXX delete --help` for usage information.
-
-A more indepth example can be found [here](doc/user/usage.md)
-
-
-## Contributing
-
-See [CONTRIBUTING](CONTRIBUTING.md) for details on submitting changes and the contribution workflow.
-
-
-## Building
-
-Building the project is done with a combination of make and containers, with golang:1.8 being the common container base. This is done so that it's possible to build directly, without a functional docker, if using a Debian based system with the Go 1.8 toolchain and Drone.io installed.
-
-To build as closely as possible to the formal build:
-```
-drone exec --repo.trusted
-```
-
-To build without modifying the local system:
-```
-docker run -v $(pwd):/go/src/github.com/vmware/vic -w /go/src/github.com/vmware/vic golang:1.8 make all
-```
-
-To build directly:
-```
-make all
-```
-
-There are three primary components generated by a full build, found in `$BIN` (the ./bin directory by default). The make targets used are the following:
- 1. vic-machine - `make vic-machine`
- 2. appliance.iso - `make appliance`
- 3. bootstrap.iso - `make bootstrap`
-
-
-## Building binaries for development
-
-Some of the project binaries can only be built on Linux.  If you are developing on a Mac or Windows OS, then the easiest way to facilitate a build is by utilizing the project's Vagrantfile.  The Vagrantfile will share the directory where the file is executed and set the GOPATH based on that share.
-
-To build the component binaries, ensure `GOPATH` is set, then issue the following command in the root directory:
-```
-$ make components
-```
-This will install required tools and build the component binaries `tether-linux`, `rpctool` and server binaries `docker-engine-server`, `port-layer-server`.  The binaries will be created in the `$BIN` directory, ./bin by default.
-
-To run tests after a successful build, issue the following:
-```
-$ make test
-```
-
-## Managing vendor/ directory
-
-To build the VIC Engine dependencies, ensure `GOPATH` is set, then issue the following.
-``
-$ make gvt vendor
-``
-
-This will install the [gvt](https://github.com/FiloSottile/gvt) utility and retrieve the build dependencies via `gvt restore`
-
-
-## Building the ISOs
-
-The component binaries above are packaged into ISO files, appliance.iso and bootstrap.iso, that are used by the installer. The generation of the ISOs is split into the following targets:
-iso-base, appliance-staging, bootstrap-staging, appliance, and bootstrap. Generation of the ISOs involves authoring a new root filesystem, meaning running a package manager (currently yum) and packing/unpacking archives. To install packages and preserve file permissions while unpacking these steps should be run as root, whether directly or in a container. To generate the ISOs:
-
-```
-$ make isos
-```
-
-The appliance and bootstrap ISOs are bootable CD images used to start the VMs that make up VIC Engine. To build the image using [docker](https://www.docker.com/), ensure `GOPATH` is set and `docker` is installed, then issue the following.
-
-```
-docker run -v $(pwd):/go/src/github.com/vmware/vic -w /go/src/github.com/vmware/vic golang:1.8 make isos
-```
-
-Alternatively, the iso image can be built locally.  Again, ensure `GOPATH` is set, but also ensure the following packages are installed. This will attempt to install the following packages if not present using apt-get:
-
-```
-apt-get install \
-	curl \
-	cpio \
-	tar \
-	xorriso \
-	rpm \
-	ca-certificates \
-	yum
-```
-
-Package names may vary depending on the distribution being used.  Once installed, issue the following (the targets listed here are those executed when using the `iso` target.
-
-```
-make iso-base appliance-staging appliance bootstrap-staging bootstrap
-```
-
-The iso image will be created in `$BIN`
-
-
-## Building with CI
-
-[dronevic]:https://ci.vcna.io/vmware/vic
-[dronesrc]:https://github.com/drone/drone
-[dronecli]:http://readme.drone.io/0.5/install/cli/
-
-PRs to this repository will trigger builds on our [Drone CI][dronevic].
-
-To build locally with Drone:
-
-Ensure that you have Docker 1.6 or higher installed.
-Install the [Drone command line tools][dronecli].
-From the root directory of the `vic` repository run `drone exec --repo.trusted`
-
-## Common Build Problems
-1. Builds may fail when building either the appliance.iso or bootstrap.iso with the error: `cap_set_file failed - Operation not supported`
-
-   *Cause:* Some Ubuntu and Debian based systems ship with a defective `aufs` driver, which Docker uses as its default backing store.  This driver does not support extended file capabilities such as `cap_set_file`
-
-   *Solution:* Edit the `/etc/default/docker` file, add the option `--storage-driver=overlay` to the `DOCKER_OPTS` settings, and restart Docker.
-
-2. `go vet` fails when doing a `make all`
-
-    *Cause:* Apparently some caching takes place in `$GOPATH/pkg/linux_amd64/github.com/vmware/vic` and can cause `go vet` to fail when evaluating outdated files in this cache.
-
-    *Solution:* Delete everything under `$GOPATH/pkg/linux_amd64/github.com/vmware/vic` and re-run `make all`.
-
-3.  `vic-machine upgrade` integration tests fail due to `BUILD_NUMBER` being set incorrectly when building locally
-
-    *Cause:* `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly. Upon running `vic-machine upgrade`, it may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.`
-
-    *Solution:* Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`. Then, re-build binaries - `sudo make distclean && sudo make clean && sudo make all` and run `vic-machine upgrade` with the new binary.
-
-## Integration Tests
-
-[VIC Engine Integration Test Suite](tests/README.md) includes instructions to run locally.
-
-
-## License
-
-VIC Engine is available under the [Apache 2 license](LICENSE).
diff --git a/installer/vendor/github.com/vmware/vic/Vagrantfile b/installer/vendor/github.com/vmware/vic/Vagrantfile
deleted file mode 100644
index f101e212d2..0000000000
--- a/installer/vendor/github.com/vmware/vic/Vagrantfile
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- mode: ruby -*-
-
-Vagrant.configure(2) do |config|
-  dirs = ENV['GOPATH'] || Dir.home
-  gdir = nil
-  config.ssh.forward_agent = true
-  config.vm.define "vic_dev" do | vic_dev |
-    vic_dev.vm.box = 'bento/ubuntu-16.04'
-    vic_dev.vm.network 'forwarded_port', guest: 2375, host: 12375, auto_correct: true
-    vic_dev.vm.host_name = 'devbox'
-    vic_dev.vm.synced_folder '.', '/vagrant', disabled: true
-    vic_dev.ssh.username = 'vagrant'
-
-    dirs.split(File::PATH_SEPARATOR).each do |dir|
-      gdir = dir.sub("C\:", "/C")
-      vic_dev.vm.synced_folder dir, gdir
-    end
-
-    vic_dev.vm.provider :virtualbox do |v, _override|
-      v.memory = 4096
-      v.cpus = 2
-    end
-
-    [:vmware_fusion, :vmware_workstation].each do |visor|
-      vic_dev.vm.provider visor do |v, _override|
-        v.memory = 4096
-        v.cpus = 2
-
-        v.vmx["ethernet0.pcislotnumber"] = "32"
-      end
-    end
-
-    Dir['infra/machines/devbox/provision.sh', 'infra/machines/devbox/provision-drone.sh'].each do |path|
-      vic_dev.vm.provision 'shell', path: path, args: [gdir, vic_dev.ssh.username]
-    end
-  end
-end
diff --git a/installer/vendor/github.com/vmware/vic/cmd/docker/main.go b/installer/vendor/github.com/vmware/vic/cmd/docker/main.go
deleted file mode 100644
index e05466d26f..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/docker/main.go
+++ /dev/null
@@ -1,315 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"crypto/tls"
-	"crypto/x509"
-	"flag"
-	"fmt"
-	"os"
-
-	log "github.com/Sirupsen/logrus"
-	apiserver "github.com/docker/docker/api/server"
-	"github.com/docker/docker/api/server/middleware"
-	"github.com/docker/docker/api/server/router"
-	"github.com/docker/docker/api/server/router/checkpoint"
-	"github.com/docker/docker/api/server/router/container"
-	"github.com/docker/docker/api/server/router/image"
-	"github.com/docker/docker/api/server/router/network"
-	"github.com/docker/docker/api/server/router/plugin"
-	"github.com/docker/docker/api/server/router/swarm"
-	"github.com/docker/docker/api/server/router/system"
-	"github.com/docker/docker/api/server/router/volume"
-	"github.com/docker/docker/daemon/cluster"
-	"github.com/docker/docker/pkg/listeners"
-	"github.com/docker/docker/pkg/signal"
-	"github.com/docker/docker/runconfig"
-	"github.com/docker/go-connections/tlsconfig"
-
-	vicbackends "github.com/vmware/vic/lib/apiservers/engine/backends"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/executor"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/lib/pprof"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/log/syslog"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/tags"
-)
-
-type CliOptions struct {
-	serverPort    *uint
-	portLayerAddr *string
-	portLayerPort *uint
-	debug         *bool
-
-	proto string
-}
-
-const (
-	productName = "vSphere Integrated Containers"
-)
-
-var (
-	vchConfig config.VirtualContainerHostConfigSpec
-	cli       CliOptions
-)
-
-func init() {
-	// #nosec: Errors unhandled.
-	pprof.StartPprof("docker personality", pprof.DockerPort)
-
-	flag.Usage = Usage
-
-	_ = flag.String("serveraddr", "127.0.0.1", "Server address to listen") // ignored
-	cli.serverPort = flag.Uint("port", 9000, "Port to listen")
-	cli.portLayerAddr = flag.String("port-layer-addr", "127.0.0.1", "Port layer server address")
-	cli.portLayerPort = flag.Uint("port-layer-port", 9001, "Port Layer server port")
-
-	cli.debug = flag.Bool("debug", false, "Enable debuglevel logging")
-}
-
-func Usage() {
-	// #nosec: Errors unhandled.
-	fmt.Fprintf(os.Stderr, "\nvSphere Integrated Container Daemon Usage:\n")
-	flag.PrintDefaults()
-	// #nosec: Errors unhandled.
-	fmt.Fprintf(os.Stderr, "\n")
-}
-
-func main() {
-	// Get flags
-	ok := handleFlags()
-
-	if !ok {
-		os.Exit(1)
-	}
-
-	if err := initLogging(); err != nil {
-		log.Fatalf("failed to initialize logging: %s", err)
-	}
-
-	if err := vicbackends.Init(*cli.portLayerAddr, productName, *cli.serverPort, &vchConfig); err != nil {
-		log.Fatalf("failed to initialize backend: %s", err)
-	}
-
-	plEventMonitor := vicbackends.NewPortlayerEventMonitor(vicbackends.PlEventProxy{}, vicbackends.DockerEventPublisher{})
-	// #nosec: Errors unhandled.
-	plEventMonitor.Start()
-	// Start API server wit options from command line args
-	api := startServer()
-
-	setAPIRoutes(api)
-
-	serveAPIWait := make(chan error)
-	go api.Wait(serveAPIWait)
-
-	signal.Trap(func() {
-		api.Close()
-	})
-
-	<-serveAPIWait
-	plEventMonitor.Stop()
-}
-
-func handleFlags() bool {
-	flag.Parse()
-
-	// load the vch config
-	src, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		log.Fatalf("Unable to load configuration from guestinfo: %s", err)
-	}
-	extraconfig.Decode(src, &vchConfig)
-
-	if vchConfig.Diagnostics.DebugLevel > 2 {
-		// use debug port layer mode
-		*cli.portLayerPort = constants.DebugPortLayerPort
-		clientIP, err := util.ClientIP()
-		if err != nil {
-			log.Fatalf("Unable to look up %s for portlayer API: %s", constants.ClientHostName, err)
-		}
-		*cli.portLayerAddr = clientIP.String()
-	}
-	*cli.portLayerAddr = fmt.Sprintf("%s:%d", *cli.portLayerAddr, *cli.portLayerPort)
-	cli.proto = "tcp"
-
-	return true
-}
-
-func initLogging() error {
-	logcfg := viclog.NewLoggingConfig()
-	if *cli.debug || vchConfig.Diagnostics.DebugLevel > 0 {
-		logcfg.Level = log.DebugLevel
-		trace.Logger.Level = log.DebugLevel
-		syslog.Logger.Level = log.DebugLevel
-	}
-
-	if vchConfig.Diagnostics.SysLogConfig != nil {
-		logcfg.Syslog = &viclog.SyslogConfig{
-			Network:  vchConfig.Diagnostics.SysLogConfig.Network,
-			RAddr:    vchConfig.Diagnostics.SysLogConfig.RAddr,
-			Priority: syslog.Info | syslog.Daemon,
-		}
-	}
-
-	tags.Logger = log.StandardLogger()
-
-	return viclog.Init(logcfg)
-}
-
-func loadCAPool() *x509.CertPool {
-	// If we should verify the server, we need to load a trusted ca
-	pool := x509.NewCertPool()
-
-	pem := vchConfig.CertificateAuthorities
-	if len(pem) == 0 {
-		return nil
-	}
-
-	if !pool.AppendCertsFromPEM(vchConfig.CertificateAuthorities) {
-		log.Fatalf("Unable to load CAs in config")
-	}
-
-	log.Debugf("Loaded %d CAs from config", len(pool.Subjects()))
-	return pool
-}
-
-func startServer() *apiserver.Server {
-	serverConfig := &apiserver.Config{
-		Logging: true,
-		Version: "1.22", //dockerversion.Version,
-	}
-
-	// FIXME: assignment copies lock value to tlsConfig: crypto/tls.Config contains sync.Once contains sync.Mutex
-	// #nosec: TLS InsecureSkipVerify may be true
-	tlsConfig := func(c *tls.Config) *tls.Config {
-		return &tls.Config{
-			Certificates:             c.Certificates,
-			NameToCertificate:        c.NameToCertificate,
-			GetCertificate:           c.GetCertificate,
-			RootCAs:                  c.RootCAs,
-			NextProtos:               c.NextProtos,
-			ServerName:               c.ServerName,
-			ClientAuth:               c.ClientAuth,
-			ClientCAs:                c.ClientCAs,
-			InsecureSkipVerify:       c.InsecureSkipVerify,
-			CipherSuites:             c.CipherSuites,
-			PreferServerCipherSuites: c.PreferServerCipherSuites,
-			SessionTicketsDisabled:   c.SessionTicketsDisabled,
-			SessionTicketKey:         c.SessionTicketKey,
-			ClientSessionCache:       c.ClientSessionCache,
-			MinVersion:               tls.VersionTLS12,
-			MaxVersion:               c.MaxVersion,
-			CurvePreferences:         c.CurvePreferences,
-		}
-	}(tlsconfig.ServerDefault())
-
-	if !vchConfig.HostCertificate.IsNil() {
-		log.Info("TLS enabled")
-
-		cert, err := vchConfig.HostCertificate.Certificate()
-		if err != nil {
-			// This is only viable because we've verified those certificates
-			log.Fatalf("Could not load certificate from config and refusing to run without TLS with a host certificate specified: %s", err)
-		}
-
-		tlsConfig.Certificates = []tls.Certificate{*cert}
-		serverConfig.TLSConfig = tlsConfig
-
-		// Set options for TLS
-		if len(vchConfig.CertificateAuthorities) > 0 {
-			log.Info("Client verification enabled")
-			// server requires and verifies client's certificate
-			tlsConfig.ClientAuth = tls.RequireAndVerifyClientCert
-			tlsConfig.ClientCAs = loadCAPool()
-			tlsConfig.InsecureSkipVerify = false
-		}
-	}
-
-	addr := "0.0.0.0"
-	// exposing this on all interfaces
-	if vchConfig.Diagnostics.DebugLevel <= 2 {
-
-		// determine the address to listen on
-		clientIP, err := util.ClientIP()
-		if err != nil {
-			// TODO: don't want to directly enter this into vchConfig.Sessions[].Started but no
-			// structure currently to report back contents otherwise
-			log.Fatalf("Unable to look up %s to serve docker API: %s", constants.ClientHostName, err)
-		}
-
-		addr = clientIP.String()
-	}
-
-	api := apiserver.New(serverConfig)
-	mw := middleware.NewVersionMiddleware(version.DockerAPIVersion,
-		version.DockerDefaultVersion,
-		version.DockerMinimumVersion)
-	api.UseMiddleware(mw)
-	fullserver := fmt.Sprintf("%s:%d", addr, *cli.serverPort)
-	l, err := listeners.Init(cli.proto, fullserver, "", serverConfig.TLSConfig)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	log.Printf("Listener created for HTTP on %s//%s", addr, cli.proto)
-	api.Accept(fullserver, l...)
-
-	return api
-}
-
-func setAPIRoutes(api *apiserver.Server) {
-	decoder := runconfig.ContainerDecoder{}
-
-	swarmBackend := executor.SwarmBackend{}
-
-	c, err := cluster.New(cluster.Config{
-		Root:                   "",
-		Name:                   "",
-		Backend:                swarmBackend,
-		NetworkSubnetsProvider: nil,
-		DefaultAdvertiseAddr:   "",
-		RuntimeRoot:            "",
-	})
-	if err != nil {
-		log.Fatalf("Error creating cluster component: %v", err)
-	}
-
-	routers := []router.Router{
-		image.NewRouter(vicbackends.NewImageBackend(), decoder),
-		container.NewRouter(vicbackends.NewContainerBackend(), decoder),
-		volume.NewRouter(vicbackends.NewVolumeBackend()),
-		network.NewRouter(vicbackends.NewNetworkBackend(), c),
-		system.NewRouter(vicbackends.NewSystemBackend(), c),
-		swarm.NewRouter(vicbackends.NewSwarmBackend()),
-		checkpoint.NewRouter(vicbackends.NewCheckpointBackend(), decoder),
-		plugin.NewRouter(vicbackends.NewPluginBackend()),
-	}
-
-	for _, r := range routers {
-		for _, route := range r.Routes() {
-			if experimental, ok := route.(router.ExperimentalRoute); ok {
-				experimental.Enable()
-			}
-		}
-	}
-
-	api.InitRouter(false, routers...)
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/docker/main_test.go b/installer/vendor/github.com/vmware/vic/cmd/docker/main_test.go
deleted file mode 100644
index 0d1268d815..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/docker/main_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"testing"
-)
-
-var systemTest *bool
-
-func init() {
-	systemTest = flag.Bool("systemTest", false, "Run system test")
-}
-
-func TestSystem(t *testing.T) {
-	if *systemTest {
-		main()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/gandalf/main.go b/installer/vendor/github.com/vmware/vic/cmd/gandalf/main.go
deleted file mode 100644
index e9641c4cd1..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/gandalf/main.go
+++ /dev/null
@@ -1,366 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2"
-
-	"github.com/google/go-github/github"
-	"github.com/nlopes/slack"
-)
-
-const (
-	GandalfContext     = "gandalf/thebot"
-	PullApproveContext = "code-review/pullapprove"
-	// ExistingContext is what we replace context with (we go from "gandalf/thebot", "code-review/pullapprove" to this)
-	ExistingContext = `["code-review/pullapprove"]`
-
-	GitHubStatusAPIURL   = "https://status.github.com/api/last-message.json"
-	GitHubContextsAPIURL = "https://api.github.com/repos/%s/%s/branches/%s/protection/required_status_checks/contexts"
-
-	DefaultUser   = "vmware"
-	DefaultRepo   = "vic"
-	DefaultBranch = "master"
-
-	DefaultFellows = "caglar10ur,mhagen,mwilliamson,fabio"
-
-	// 4 disabling merges to master automagically
-	DroneFailureMessage = "finished with a failure status, find the logs"
-)
-
-var (
-	config = GandalfConfig{}
-)
-
-type ActionType func(msg *slack.MessageEvent) string
-
-type MultipleVar []string
-
-func (i *MultipleVar) String() string {
-	return fmt.Sprint(*i)
-}
-
-func (i *MultipleVar) Set(value string) error {
-	*i = append(*i, value)
-	return nil
-}
-
-type GandalfConfig struct {
-	GithubToken string
-	SlackToken  string
-
-	User   string
-	Repo   string
-	Branch string
-
-	Fellows MultipleVar
-}
-
-type Gandalf struct {
-	GandalfConfig
-
-	slack  *slack.Client
-	github *github.Client
-	rtm    *slack.RTM
-
-	// gandalf's prefix
-	prefix string
-
-	// name->id cache
-	u2i map[string]string
-
-	// text->fn
-	actions map[string]ActionType
-}
-
-func init() {
-	rand.Seed(time.Now().UTC().UnixNano())
-
-	config.SlackToken = os.Getenv("SLACK_TOKEN")
-	if config.SlackToken == "" {
-		panic("missing slack token")
-	}
-	config.GithubToken = os.Getenv("GITHUB_TOKEN")
-	if config.GithubToken == "" {
-		panic("missing github token")
-	}
-
-	flag.StringVar(&config.User, "user", DefaultUser, "Name of the user")
-	flag.StringVar(&config.Repo, "repo", DefaultRepo, "Name of the repo")
-	flag.StringVar(&config.Branch, "branch", DefaultBranch, "Name of the branch")
-
-	flag.Var(&config.Fellows, "fellow", "Fellow name")
-
-	flag.Parse()
-
-	// use the default if no fellow given
-	if len(config.Fellows) == 0 {
-		config.Fellows = strings.Split(DefaultFellows, ",")
-	}
-}
-
-func (g *Gandalf) Setup() {
-	ctx := context.Background()
-
-	ts := oauth2.StaticTokenSource(
-		&oauth2.Token{AccessToken: g.GithubToken},
-	)
-	tc := oauth2.NewClient(ctx, ts)
-
-	g.github = github.NewClient(tc)
-	g.slack = slack.New(g.SlackToken)
-
-	g.rtm = g.slack.NewRTM()
-
-	g.actions = map[string]ActionType{
-		"status?": func(msg *slack.MessageEvent) string {
-			ok, err := g.closed()
-			if err != nil {
-				return fmt.Sprintf("Something bad happened: %s", err)
-			}
-			if ok {
-				return "Merges to master are closed..."
-			}
-			return "Merges to master are open..."
-		},
-		"disable merges to master": func(msg *slack.MessageEvent) string {
-			if !g.fellow(msg.User) {
-				return "You are not a fellow. You can't hold the ring."
-			}
-			if err := g.disable(); err != nil {
-				return fmt.Sprintf("Something bad happened: %s", err)
-			}
-			return "One moment, I'll call the Github CEO to do that"
-		},
-		"enable merges to master": func(msg *slack.MessageEvent) string {
-			if !g.fellow(msg.User) {
-				return "You are not a fellow. You can't hold the ring."
-			}
-			if err := g.enable(); err != nil {
-				return fmt.Sprintf("Something bad happened: %s", err)
-			}
-			return "Sure but it will cost you"
-		},
-		"who are you?": func(msg *slack.MessageEvent) string {
-			return "I am Gandalf the Bot. You shall not merge..."
-		},
-		"what is your story?": func(msg *slack.MessageEvent) string {
-			return "I used my last measure of strength to revert some commits. My spirit then left my body, having sacrificed myself to save the project. My spirit did not depart Github forever at this time. As the only one of the five Istari to stay true to his errand, I was sent back to mortal lands by Eru, and I became Gandalf the Bot"
-		},
-		"where are you?": func(msg *slack.MessageEvent) string {
-			return "Hmmm, somewhere over the rainbow. I'm meeting with VCs to raise some capital for my new blockchain startup. Chains are the new rings."
-		},
-		"how are you doing?": func(msg *slack.MessageEvent) string {
-			return "Ash nazg durbatulûk, ash nazg gimbatul,\nAsh nazg thrakatulûk agh burzum-ishi krimpatul."
-		},
-		"what do you think about scrum?": func(msg *slack.MessageEvent) string {
-			return "One sprint to rule them all, one sprint to find them,\nOne sprint to bring them all and in the darkness bind them."
-		},
-		"how is github doing?": func(msg *slack.MessageEvent) string { return g.status() },
-		"show me open prs":     func(msg *slack.MessageEvent) string { return g.pr() },
-		"show me the fellows":  func(msg *slack.MessageEvent) string { return g.Fellows.String() },
-	}
-
-	// manage the connections
-	go g.rtm.ManageConnection()
-
-	// populate the cache
-	users, err := g.slack.GetUsers()
-	if err != nil {
-		panic(fmt.Sprintf("failed to fetch users: %s", err))
-	}
-
-	for _, user := range users {
-		g.u2i[user.Name] = user.ID
-	}
-
-	g.prefix = fmt.Sprintf("<@%s> ", g.u2i["gandalf"])
-}
-
-func main() {
-	gandalf := Gandalf{
-		GandalfConfig: config,
-		u2i:           make(map[string]string),
-		actions:       make(map[string]ActionType),
-	}
-
-	gandalf.Setup()
-
-	// wait 4 events
-	for msg := range gandalf.rtm.IncomingEvents {
-		switch ev := msg.Data.(type) {
-		case *slack.MessageEvent:
-			gandalf.handle(ev)
-		case *slack.RTMError:
-			fmt.Printf("Error: %s\n", ev.Error())
-
-		case *slack.InvalidAuthEvent:
-			fmt.Printf("Invalid credentials")
-			return
-
-		default:
-		}
-	}
-}
-
-func (g *Gandalf) status() string {
-	var status struct {
-		Status  string    `json:"status"`
-		Message string    `json:"body"`
-		Created time.Time `json:"created_on"`
-	}
-
-	resp, err := http.Get(GitHubStatusAPIURL)
-	if err != nil {
-		return fmt.Sprintf("Err: %s", err)
-	}
-	defer resp.Body.Close()
-
-	// #nosec: Errors unhandled.
-	body, _ := ioutil.ReadAll(resp.Body)
-	err = json.Unmarshal(body, &status)
-	if err != nil {
-		return fmt.Sprintf("Err: %s", err)
-	}
-	return fmt.Sprintf("Current Github Status : %s. Message : %s Reported at %s", status.Status, status.Message, status.Created)
-}
-
-func (g *Gandalf) fellow(id string) bool {
-	// linear search bla bla
-	for i := range g.Fellows {
-		if id == g.u2i[g.Fellows[i]] {
-			return true
-		}
-	}
-	return false
-}
-
-func (g *Gandalf) pr() string {
-	ctx := context.Background()
-
-	opt := &github.PullRequestListOptions{Sort: "created", Direction: "desc"}
-
-	prs, _, err := g.github.PullRequests.List(ctx, g.User, g.Repo, opt)
-	if err != nil {
-		return fmt.Sprintf("Err: %s", err)
-	}
-
-	response := ""
-	for i := range prs {
-		response = fmt.Sprintf("%s %d - %s (%s)\n", response, *prs[i].Number, *prs[i].Title, *prs[i].HTMLURL)
-	}
-	return response
-}
-
-func (g *Gandalf) closed() (bool, error) {
-	ctx := context.Background()
-
-	protection, _, err := g.github.Repositories.GetBranchProtection(ctx, g.User, g.Repo, g.Branch)
-	if err != nil {
-		return false, err
-	}
-
-	for i := range protection.RequiredStatusChecks.Contexts {
-		if protection.RequiredStatusChecks.Contexts[i] == GandalfContext {
-			return true, nil
-		}
-	}
-	return false, nil
-}
-
-func (g *Gandalf) disable() error {
-	ctx := context.Background()
-
-	preq := &github.ProtectionRequest{
-		RequiredStatusChecks: &github.RequiredStatusChecks{
-			IncludeAdmins: false,
-			Strict:        true,
-			Contexts:      []string{GandalfContext, PullApproveContext},
-		},
-	}
-	_, _, err := g.github.Repositories.UpdateBranchProtection(ctx, g.User, g.Repo, g.Branch, preq)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (g *Gandalf) enable() error {
-	// https://developer.github.com/v3/repos/branches/#replace-required-status-checks-contexts-of-protected-branch is not supported by the Go github API yet so we improvise
-	url := fmt.Sprintf(GitHubContextsAPIURL, g.User, g.Repo, g.Branch)
-
-	// #nosec: Errors unhandled.
-	req, _ := http.NewRequest("PUT", url, bytes.NewBuffer([]byte(ExistingContext)))
-	req.Header.Set("Authorization", fmt.Sprintf("token %s", g.GithubToken))
-	req.Header.Set("Accept", "application/vnd.github.loki-preview+json")
-
-	client := &http.Client{}
-	resp, err := client.Do(req)
-	if err != nil {
-		return err
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		return fmt.Errorf("%#v", resp)
-	}
-	return nil
-}
-
-func (g *Gandalf) handle(msg *slack.MessageEvent) {
-	// is it drone failure?
-	if strings.Contains(msg.Text, DroneFailureMessage) {
-		if err := g.disable(); err != nil {
-			g.rtm.SendMessage(g.rtm.NewOutgoingMessage(fmt.Sprintf("Something bad happened: %s", err), msg.Channel))
-		}
-		g.rtm.SendMessage(g.rtm.NewOutgoingMessage("They shall not merge! Closing master to merges...", msg.Channel))
-		return
-	}
-
-	// @gandalf TEXT
-	if strings.HasPrefix(msg.Text, g.prefix) {
-		text := msg.Text
-		text = strings.TrimPrefix(text, g.prefix)
-		text = strings.TrimSpace(text)
-		text = strings.ToLower(text)
-
-		if response, ok := g.actions[text]; ok {
-			g.rtm.SendMessage(g.rtm.NewOutgoingMessage(response(msg), msg.Channel))
-			return
-		}
-
-		cmds := make([]string, 0, len(g.actions))
-		for key := range g.actions {
-			cmds = append(cmds, key)
-		}
-		g.rtm.SendMessage(g.rtm.NewOutgoingMessage(
-			fmt.Sprintf("Sorry, I can't help with that yet. I can understand following;\n```%s```\n", strings.Join(cmds, "\n")),
-			msg.Channel,
-		))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/imagec/hook.go b/installer/vendor/github.com/vmware/vic/cmd/imagec/hook.go
deleted file mode 100644
index baac2d9974..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/imagec/hook.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/Sirupsen/logrus"
-)
-
-// ErrorHook is a simple logrus hook to duplicate Fatalf leveled error messages to stderr
-type ErrorHook struct {
-	w io.Writer
-}
-
-// NewErrorHook returns an empty ErrorHook struct
-func NewErrorHook(w io.Writer) *ErrorHook {
-	return &ErrorHook{w: w}
-}
-
-// Fire dumps the entry.Message to Stderr
-func (hook *ErrorHook) Fire(entry *logrus.Entry) error {
-	err := fmt.Errorf("%s", entry.Message)
-	fmt.Fprintf(hook.w, string(sf.FormatError(err)))
-
-	return nil
-}
-
-// Levels returns the logging level that we want to subscribe
-func (hook *ErrorHook) Levels() []logrus.Level {
-	return []logrus.Level{
-		logrus.FatalLevel,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/imagec/main.go b/installer/vendor/github.com/vmware/vic/cmd/imagec/main.go
deleted file mode 100644
index 6852b5b416..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/imagec/main.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"runtime/debug"
-	"runtime/trace"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/reference"
-	"github.com/go-openapi/runtime"
-	rc "github.com/go-openapi/runtime/client"
-	"github.com/pkg/profile"
-
-	"github.com/vmware/vic/lib/apiservers/engine/proxy"
-	apiclient "github.com/vmware/vic/lib/apiservers/portlayer/client"
-	vicarchive "github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/imagec"
-	optrace "github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-)
-
-var (
-	imageCOptions = ImageCOptions{}
-
-	// https://raw.githubusercontent.com/docker/docker/master/distribution/pull_v2.go
-	sf = streamformatter.NewJSONStreamFormatter()
-)
-
-const (
-	PullImage  = "pull"
-	PushImage  = "push"
-	ListLayers = "listlayers"
-	Save       = "save"
-)
-
-// ImageCOptions wraps the cli arguments
-type ImageCOptions struct {
-	imageName string
-
-	options imagec.Options
-
-	logfile string
-
-	stdout bool
-	debug  bool
-
-	profiling string
-	tracing   bool
-
-	operation string
-}
-
-func init() {
-
-	flag.StringVar(&imageCOptions.imageName, "reference", "", "Name of the reference")
-
-	flag.StringVar(&imageCOptions.options.Destination, "destination", imagec.DefaultDestination, "Destination directory")
-
-	flag.StringVar(&imageCOptions.options.Host, "host", imagec.DefaultPortLayerHost, "Host that runs portlayer API (FQDN:port format)")
-
-	flag.StringVar(&imageCOptions.logfile, "logfile", imagec.DefaultLogfile, "Path of the imagec log file")
-
-	flag.StringVar(&imageCOptions.options.Username, "username", "", "Username")
-	flag.StringVar(&imageCOptions.options.Password, "password", "", "Password")
-
-	flag.DurationVar(&imageCOptions.options.Timeout, "timeout", imagec.DefaultHTTPTimeout, "HTTP timeout")
-
-	flag.BoolVar(&imageCOptions.stdout, "stdout", false, "Enable writing to stdout")
-	flag.BoolVar(&imageCOptions.debug, "debug", false, "Show debug logging")
-	flag.BoolVar(&imageCOptions.options.InsecureSkipVerify, "insecure-skip-verify", false, "Don't verify certificates when fetching images")
-	flag.BoolVar(&imageCOptions.options.InsecureAllowHTTP, "insecure-allow-http", false, "Uses unencrypted connections when fetching images")
-	flag.BoolVar(&imageCOptions.options.Standalone, "standalone", false, "Disable port-layer integration")
-
-	flag.StringVar(&imageCOptions.profiling, "profile.mode", "", "Enable profiling mode, one of [cpu, mem, block]")
-	flag.BoolVar(&imageCOptions.tracing, "tracing", false, "Enable runtime tracing")
-
-	flag.StringVar(&imageCOptions.operation, "operation", "pull", "Pull image/push image/listlayers/save image")
-
-	flag.StringVar(&imageCOptions.options.Registry, "registry", imagec.DefaultDockerURL, "Registry to pull/push images (default: registry-1.docker.io)")
-
-	flag.StringVar(&imageCOptions.options.ImageStore, "image-store", imagec.DefaultDockerURL, "portlayer image store name or url used to query image data")
-
-	flag.Parse()
-
-	var err error
-	if imageCOptions.options.Reference, err = reference.ParseNamed(imageCOptions.imageName); err != nil {
-		panic(err)
-	}
-}
-
-func main() {
-	defer func() {
-		if r := recover(); r != nil {
-			_, err := fmt.Fprintf(os.Stderr, string(sf.FormatError(fmt.Errorf("%s : %s", r, debug.Stack()))))
-			if err != nil {
-				//do this to pass security check
-			}
-		}
-	}()
-
-	if version.Show() {
-		_, err := fmt.Fprintf(os.Stdout, "%s\n", version.String())
-		if err != nil {
-			panic(err)
-		}
-		return
-	}
-
-	// Enable profiling if mode is set
-	switch imageCOptions.profiling {
-	case "cpu":
-		defer profile.Start(profile.CPUProfile, profile.ProfilePath("."), profile.Quiet).Stop()
-	case "mem":
-		defer profile.Start(profile.MemProfile, profile.ProfilePath("."), profile.Quiet).Stop()
-	case "block":
-		defer profile.Start(profile.BlockProfile, profile.ProfilePath("."), profile.Quiet).Stop()
-	default:
-		// do nothing
-	}
-
-	// Register our custom Error hook
-	log.AddHook(NewErrorHook(os.Stderr))
-
-	// Enable runtime tracing if tracing is true
-	if imageCOptions.tracing {
-		tracing, err := os.Create(time.Now().Format("2006-01-02T150405.pprof"))
-		if err != nil {
-			log.Fatalf("Failed to create tracing logfile: %s", err)
-		}
-		defer tracing.Close()
-
-		if err := trace.Start(tracing); err != nil {
-			log.Fatalf("Failed to start tracing: %s", err)
-		}
-		defer trace.Stop()
-	}
-
-	// Open the log file
-	// #nosec: Expect file permissions to be 0600 or less
-	f, err := os.OpenFile(imageCOptions.logfile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-	if err != nil {
-		log.Fatalf("Failed to open the logfile %s: %s", imageCOptions.logfile, err)
-	}
-	defer f.Close()
-
-	// Initiliaze logger with default TextFormatter
-	log.SetFormatter(&log.TextFormatter{DisableColors: true, FullTimestamp: true})
-
-	// Set the log level
-	if imageCOptions.debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	// SetOutput to log file and/or stdout
-	log.SetOutput(f)
-	if imageCOptions.stdout {
-		log.SetOutput(io.MultiWriter(os.Stdout, f))
-	}
-
-	switch imageCOptions.operation {
-	case PullImage:
-		options := imageCOptions.options
-
-		options.Outstream = os.Stdout
-
-		ic := imagec.NewImageC(options, streamformatter.NewJSONStreamFormatter())
-		if err := ic.PullImage(); err != nil {
-			log.Fatalf("Pulling image failed due to %s\n", err)
-		}
-	case PushImage:
-		log.Errorf("The operation '%s' is not implemented\n", PushImage)
-	case ListLayers:
-		options := imageCOptions.options
-
-		options.Outstream = os.Stdout
-
-		ic := imagec.NewImageC(options, streamformatter.NewJSONStreamFormatter())
-		if err := ic.ListLayers(); err != nil {
-			log.Fatalf("Listing layers for image failed due to %s\n", err)
-		}
-	case Save:
-		options := imageCOptions.options
-
-		options.Outstream = os.Stdout
-
-		ap := archiveProxy(options.Host)
-		ic := imagec.NewImageC(options, streamformatter.NewJSONStreamFormatter())
-		if err := saveImage(ap, ic); err != nil {
-			log.Fatalf("Saving image %s failed due to %s\n", options.Reference.String(), err)
-		}
-	default:
-		log.Errorf("The operation '%s' is not valid\n", imageCOptions.operation)
-	}
-}
-
-func saveImage(ap proxy.VicArchiveProxy, ic *imagec.ImageC) error {
-	log.Debugf("Save image %s", ic.Options.Reference)
-	err := ic.ListLayers()
-	if err != nil {
-		return err
-	}
-	layers, err := ic.LayersToDownload()
-	if err != nil {
-		return err
-	}
-
-	dest := imagec.DestinationDirectory(ic.Options)
-	var wg sync.WaitGroup
-	errChan := make(chan error, len(layers))
-
-	for i := len(layers) - 1; i >= 0; i-- {
-		if layers[i].ID == imagec.ScratchLayerID {
-			continue
-		}
-		wg.Add(1)
-		go func(pid, cid string) {
-			defer wg.Done()
-			var err error
-			log.Debugf("parent id: %s, layer id: %s", pid, cid)
-
-			defer func() {
-				errChan <- err
-			}()
-
-			fileDir := path.Join(dest, cid)
-			err = os.MkdirAll(fileDir, 0755) /* #nosec */
-			if err != nil {
-				return
-			}
-			filePath := path.Join(fileDir, cid+".tar")
-			log.Debugf("save layer %s to file %s", cid, filePath)
-			err = writeArchiveFile(ap, ic.ImageStore, ic.ImageStore, cid, pid, filePath)
-		}(layers[i].Parent, layers[i].ID)
-	}
-	wg.Wait()
-	close(errChan)
-
-	var errs []string
-	for e := range errChan {
-		if e == nil {
-			continue
-		}
-		errs = append(errs, e.Error())
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("save image layers failed: %s", strings.Join(errs, ","))
-	}
-	return nil
-}
-
-func portlayerClient(portLayerAddr string) *apiclient.PortLayer {
-	t := rc.New(portLayerAddr, "/", []string{"http"})
-	t.Consumers["application/x-tar"] = runtime.ByteStreamConsumer()
-	t.Consumers["application/octet-stream"] = runtime.ByteStreamConsumer()
-	t.Producers["application/x-tar"] = runtime.ByteStreamProducer()
-	t.Producers["application/octet-stream"] = runtime.ByteStreamProducer()
-
-	client := apiclient.New(t, nil)
-	return client
-}
-
-func archiveProxy(portLayerAddr string) proxy.VicArchiveProxy {
-	plClient := portlayerClient(portLayerAddr)
-	archiveProxy := proxy.NewArchiveProxy(plClient)
-
-	return archiveProxy
-}
-
-func writeArchiveFile(archiveProxy proxy.VicArchiveProxy, store, ancestorStore, layerID, ancestorID, archivePath string) error {
-	var filterSpec vicarchive.FilterSpec
-
-	op := optrace.NewOperation(context.Background(), "export layer %s:%s", layerID, ancestorID)
-	//Initialize an archive stream from the portlayer for the layer
-	ar, err := archiveProxy.ArchiveExportReader(op, store, ancestorStore, layerID, ancestorID, true, filterSpec)
-	if err != nil || ar == nil {
-		return fmt.Errorf("Failed to get reader for layer %s", layerID)
-	}
-
-	log.Infof("Obtain archive reader for layer %s, parent %s", layerID, ancestorID)
-
-	// #nosec - there's nothing secret/sensitive about these image layer files
-	tarFile, err := os.OpenFile(archivePath, os.O_RDWR|os.O_CREATE, 0644)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to create tmp file: %s", err.Error())
-		log.Info(msg)
-		return fmt.Errorf(msg)
-	}
-	defer tarFile.Close()
-
-	_, err = io.Copy(tarFile, ar)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to read from acrhive stream: %s", err.Error())
-		log.Info(msg)
-		return fmt.Errorf(msg)
-	}
-
-	ar.Close()
-
-	if err = tarFile.Sync(); err != nil {
-		msg := fmt.Sprintf("Failed to flush tar file: %s", err.Error())
-		log.Info(msg)
-		return fmt.Errorf(msg)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main.go b/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main.go
deleted file mode 100644
index 5c864e1b91..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main.go
+++ /dev/null
@@ -1,164 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/loads"
-	"github.com/jessevdk/go-flags"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/dns"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/lib/pprof"
-	"github.com/vmware/vic/lib/vspc"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/log/syslog"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var (
-	options   = dns.ServerOptions{}
-	parser    *flags.Parser
-	server    *restapi.Server
-	vchConfig config.VirtualContainerHostConfigSpec
-)
-
-func init() {
-	pprof.StartPprof("portlayer server", pprof.PortlayerPort)
-
-	swaggerSpec, err := loads.Analyzed(restapi.SwaggerJSON, "")
-	if err != nil {
-		log.Fatalln(err)
-	}
-
-	api := operations.NewPortLayerAPI(swaggerSpec)
-	server = restapi.NewServer(api)
-
-	parser = flags.NewParser(server, flags.Default)
-	parser.ShortDescription = `Port Layer API`
-	parser.LongDescription = `Port Layer API`
-
-	server.ConfigureFlags()
-
-	for _, optsGroup := range api.CommandLineOptionsGroups {
-		_, err := parser.AddGroup(optsGroup.ShortDescription, optsGroup.LongDescription, optsGroup.Options)
-		if err != nil {
-			log.Fatalln(err)
-		}
-	}
-}
-
-func main() {
-
-	if _, err := parser.Parse(); err != nil {
-		if err := err.(*flags.Error); err != nil && err.Type == flags.ErrHelp {
-			os.Exit(0)
-		}
-
-		os.Exit(1)
-	}
-
-	// load the vch config
-	src, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		log.Fatalf("Unable to load configuration from guestinfo: %s", err)
-	}
-	extraconfig.Decode(src, &vchConfig)
-
-	logcfg := viclog.NewLoggingConfig()
-	if vchConfig.Diagnostics.DebugLevel > 0 {
-		logcfg.Level = log.DebugLevel
-		trace.Logger.Level = log.DebugLevel
-		syslog.Logger.Level = log.DebugLevel
-	}
-
-	if vchConfig.Diagnostics.DebugLevel > 3 {
-		// extraconfig is very, very verbose
-		extraconfig.SetLogLevel(log.DebugLevel)
-	}
-
-	if vchConfig.Diagnostics.SysLogConfig != nil {
-		logcfg.Syslog = &viclog.SyslogConfig{
-			Network:  vchConfig.Diagnostics.SysLogConfig.Network,
-			RAddr:    vchConfig.Diagnostics.SysLogConfig.RAddr,
-			Priority: syslog.Info | syslog.Daemon,
-		}
-	}
-
-	if vchConfig.Diagnostics.DebugLevel > 2 {
-		// expose portlayer service on client interface
-		server.Port = constants.DebugPortLayerPort
-		clientIP, err := util.ClientIP()
-		if err != nil {
-			log.Fatalf("Unable to look up %s to serve portlayer API: %s", constants.ClientHostName, err)
-		}
-		server.Host = clientIP.String()
-	}
-
-	log.Infof("%+v", *logcfg)
-	// #nosec: Errors unhandled.
-	viclog.Init(logcfg)
-
-	server.ConfigureAPI()
-
-	// BEGIN
-	// Set the Interface name to instruct listeners to bind on this interface
-	options.Interface = "bridge"
-
-	// Start the DNS Server
-	dnsserver := dns.NewServer(options)
-	if dnsserver != nil {
-		dnsserver.Start()
-	}
-
-	// handle the signals and gracefully shutdown the server
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
-
-	defer server.Shutdown()
-
-	vspc := vspc.NewVspc()
-
-	if vspc == nil {
-		log.Fatalln("cannot initialize virtual serial port concentrator")
-	}
-	vspc.Start()
-
-	go func() {
-		<-sig
-
-		vspc.Stop()
-		dnsserver.Stop()
-		restapi.StopAPIServers()
-	}()
-
-	go func() {
-		dnsserver.Wait()
-	}()
-	// END
-
-	if err := server.Serve(); err != nil {
-		log.Fatalln(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main_test.go b/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main_test.go
deleted file mode 100644
index 18cbd24873..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/port-layer-server/main_test.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"testing"
-
-	flags "github.com/jessevdk/go-flags"
-)
-
-var systemTest *bool
-var flagArgs []string
-
-// testOptions is the list of options used by the standard testing package in a format
-// that the go-flags package can understand. All the flags are listed as of type
-// string, since we only need to parse them and pass them on to the standard
-// go flag package. The drawback of this is the boolean flags need to be
-// specified with a value, e.g. --test.v=true, instead of just --test.v.
-// This is also needed since the go-flags package does not accept a value
-// for boolean arguments (i.e. --test.v=true is illegal), while the
-// standard go flag package does, making calls by go test (which uses values
-// for boolean arguments) illegal when passed through go-flags.
-type testOptions struct {
-	// Report as tests are run; default is silent for success.
-	Short            string `long:"test.short" default:"false" description:"run smaller test suite to save time"`
-	OutputDir        string `long:"test.outputdir" default:"" description:"directory in which to write profiles"`
-	Chatty           string `long:"test.v" default:"false" description:"verbose: print additional output"`
-	Count            string `long:"test.count" default:"1" description:"run tests and benchmarks n times"`
-	CoverProfile     string `long:"test.coverprofile" default:"" description:"write a coverage profile to the named file after execution"`
-	Match            string `long:"test.run" default:"" description:"regular expression to select tests and examples to run"`
-	MemProfile       string `long:"test.memprofile" default:"" description:"write a memory profile to the named file after execution"`
-	MemProfileRate   string `long:"test.memprofilerate" default:"0" description:"if >=0, sets runtime.MemProfileRate"`
-	CPUProfile       string `long:"test.cpuprofile" default:"" description:"write a cpu profile to the named file during execution"`
-	BlockProfile     string `long:"test.blockprofile" default:"" description:"write a goroutine blocking profile to the named file after execution"`
-	BlockProfileRate string `long:"test.blockprofilerate" default:"1" description:"if >= 0, calls runtime.SetBlockProfileRate()"`
-	TraceFile        string `long:"test.trace" default:"" description:"write an execution trace to the named file after execution"`
-	Timeout          string `long:"test.timeout" default:"0" description:"if positive, sets an aggregate time limit for all tests"`
-	CPUListStr       string `long:"test.cpu" default:"" description:"comma-separated list of number of CPUs to use for each test"`
-	Parallel         string `long:"test.parallel" description:"maximum test parallelism"`
-
-	MatchBenchmarks string `long:"test.bench" default:"" description:"regular expression per path component to select benchmarks to run"`
-	BenchTime       string `long:"test.benchtime" description:"approximate run time for each benchmark"`
-	BenchmarkMemory string `long:"test.benchmem" default:"false" description:"print memory allocations for benchmarks"`
-
-	SystemTest string `long:"systemTest" default:"false" description:"run system test"`
-}
-
-var testOpts testOptions
-var testGroup *flags.Group
-
-func init() {
-	systemTest = flag.Bool("systemTest", false, "Run system test")
-}
-
-// addDash adds an extra dash to long options
-// specified with a single dash, e.g. addDash("-test.v")
-// returns "--test.v". Other strings are
-// returned unchanged.
-func addDash(s string) string {
-	if len(s) > 2 && s[0] == '-' && s[1] != '-' {
-		return "-" + s
-	}
-
-	return s
-}
-
-func TestMain(m *testing.M) {
-	// make sure all single dash arguments
-	// are converted to using double dashes
-	// to make them parseable by the go-flags
-	// package
-	for i := range os.Args {
-		if i == 0 {
-			continue
-		}
-
-		if os.Args[i] == "--" {
-			break
-		}
-
-		os.Args[i] = addDash(os.Args[i])
-	}
-
-	// create a new parser to parse just the test options
-	testParser := flags.NewParser(nil, flags.IgnoreUnknown|flags.Default)
-	testGroup, _ = testParser.AddGroup("go test Options", "go test Options", &testOpts)
-	_, err := testParser.Parse()
-	if err != nil {
-		if err := err.(*flags.Error); err != nil && err.Type == flags.ErrHelp {
-			// do not exit if --systemTest == "true", so that we
-			// can output the help for the port-layer-server test
-			// binary
-			o := testGroup.FindOptionByLongName("systemTest")
-			if !o.IsSet() || o.Value().(string) != "true" {
-				os.Exit(0)
-			}
-		} else {
-			os.Exit(1)
-		}
-	}
-
-	// build up arguments to pass to the standard
-	// go flag package
-	for _, o := range testGroup.Options() {
-		if !o.IsSet() {
-			continue
-		}
-
-		flagArgs = append(flagArgs, fmt.Sprintf("-%s=%s", o.LongName, o.Value()))
-	}
-
-	flag.CommandLine.Parse(flagArgs)
-
-	// execute tests
-	os.Exit(m.Run())
-}
-
-func TestSystem(t *testing.T) {
-	if *systemTest {
-		// add the test options to the default parser
-		parser.AddGroup("go test Options", "go test Options", &testOpts)
-
-		main()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/rpctool/main.go b/installer/vendor/github.com/vmware/vic/cmd/rpctool/main.go
deleted file mode 100644
index e0cdbbb08c..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/rpctool/main.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vmw-guestinfo/rpcout"
-	"github.com/vmware/vmw-guestinfo/rpcvmx"
-	"github.com/vmware/vmw-guestinfo/vmcheck"
-)
-
-var (
-	set  bool
-	get  bool
-	fork bool
-)
-
-func init() {
-	trace.Logger.Level = log.DebugLevel
-
-	flag.BoolVar(&set, "set", false, "Sets the guestinfo.KEY with the string VALUE")
-	flag.BoolVar(&get, "get", false, "Returns the config string in the guestinfo.* namespace")
-	flag.BoolVar(&fork, "fork", false, "VMFork")
-
-	flag.Parse()
-}
-
-func main() {
-	if version.Show() {
-		// #nosec: Errors unhandled.
-		fmt.Fprintf(os.Stdout, "%s\n", version.String())
-		return
-	}
-
-	isVM, err := vmcheck.IsVirtualWorld()
-	if err != nil {
-		log.Fatalf("Error: %s", err)
-	}
-
-	if !isVM {
-		log.Fatalf("ERROR: not in a virtual world.")
-	}
-
-	if !set && !get && !fork {
-		flag.Usage()
-	}
-
-	config := rpcvmx.NewConfig()
-	if set {
-		if flag.NArg() != 2 {
-			log.Fatalf("ERROR: Please provide guestinfo key / value pair (eg; -set foo bar")
-		}
-		if err := config.SetString(flag.Arg(0), flag.Arg(1)); err != nil {
-			log.Fatalf("ERROR: SetString failed with %s", err)
-		}
-	}
-
-	if get {
-		if flag.NArg() != 1 {
-			log.Fatalf("ERROR: Please provide guestinfo key (eg; -get foo)")
-		}
-		if out, err := config.String(flag.Arg(0), ""); err != nil {
-			log.Fatalf("ERROR: String failed with %s", err)
-		} else {
-			fmt.Printf("%s\n", out)
-		}
-	}
-
-	if fork {
-		out, ok, err := rpcout.SendOne("vmfork-begin -1 -1")
-		if err != nil {
-			log.Fatalf("ERROR: %s | %s | %t", err, out, ok)
-		} else if !ok {
-			log.Fatalf("FAILED: %s", out)
-		} else {
-			fmt.Printf("%s\n", out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/attach.go b/installer/vendor/github.com/vmware/vic/cmd/tether/attach.go
deleted file mode 100644
index 4e380ba38e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/attach.go
+++ /dev/null
@@ -1,723 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"net"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/serial"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	attachChannelType = "attach"
-)
-
-// server is the singleton attachServer for the tether - there can be only one
-// as the backchannel line protocol may not provide multiplexing of connections
-var server AttachServer
-var once sync.Once
-
-type AttachServer interface {
-	tether.Extension
-
-	start() error
-	stop() error
-}
-
-// config is a struct that holds Sessions and Execs
-type config struct {
-	Key []byte
-
-	Sessions map[string]*tether.SessionConfig
-	Execs    map[string]*tether.SessionConfig
-}
-
-type attachServerSSH struct {
-	// serializes data access for exported functions
-	m sync.Mutex
-
-	// conn is the underlying net.Conn which carries SSH
-	// held directly as it is how we stop the attach server
-	conn struct {
-		sync.Mutex
-		conn net.Conn
-	}
-
-	// we pass serverConn to the channelMux goroutine so we need to lock it
-	serverConn struct {
-		sync.Mutex
-		*ssh.ServerConn
-	}
-
-	// extension local copy of the bits of config important to attach
-	config    config
-	sshConfig *ssh.ServerConfig
-
-	enabled int32
-
-	// Cancelable context and its cancel func. Used for resolving the deadlock
-	// between run() and stop()
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	// INTERNAL: must set by testAttachServer only
-	testing bool
-}
-
-// NewAttachServerSSH either creates a new instance or returns the initialized one
-func NewAttachServerSSH() AttachServer {
-	once.Do(func() {
-		// create a cancelable context and assign it to the CancelFunc
-		// it isused for resolving the deadlock between run() and stop()
-		// it has a Background parent as we don't want timeouts here,
-		// otherwise we may start leaking goroutines in the handshake code
-		ctx, cancel := context.WithCancel(context.Background())
-		server = &attachServerSSH{
-			ctx:    ctx,
-			cancel: cancel,
-		}
-	})
-	return server
-}
-
-// Reload - tether.Extension implementation
-func (t *attachServerSSH) Reload(tconfig *tether.ExecutorConfig) error {
-	defer trace.End(trace.Begin("attach reload"))
-
-	t.m.Lock()
-	defer t.m.Unlock()
-
-	// We copy this stuff so that we're not referencing the direct config
-	// structure if/while it's being updated.
-	// The subelements generally have locks or updated in single assignment
-	t.config.Key = tconfig.Key
-	t.config.Sessions = make(map[string]*tether.SessionConfig)
-	for k, v := range tconfig.Sessions {
-		t.config.Sessions[k] = v
-	}
-
-	t.config.Execs = make(map[string]*tether.SessionConfig)
-	for k, v := range tconfig.Execs {
-		t.config.Execs[k] = v
-	}
-
-	err := server.start()
-	if err != nil {
-		detail := fmt.Sprintf("unable to start attach server: %s", err)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-	return nil
-}
-
-// Enable sets the enabled to true
-func (t *attachServerSSH) Enable() {
-	atomic.StoreInt32(&t.enabled, 1)
-}
-
-// Disable sets the enabled to false
-func (t *attachServerSSH) Disable() {
-	atomic.StoreInt32(&t.enabled, 0)
-}
-
-// Enabled returns whether the enabled is true
-func (t *attachServerSSH) Enabled() bool {
-	return atomic.LoadInt32(&t.enabled) == 1
-}
-
-func (t *attachServerSSH) Start() error {
-	defer trace.End(trace.Begin(""))
-
-	return nil
-}
-
-// Stop needed for tether.Extensions interface
-func (t *attachServerSSH) Stop() error {
-	defer trace.End(trace.Begin("stop attach server"))
-
-	t.m.Lock()
-	defer t.m.Unlock()
-
-	// calling server.start not t.start so that test impl gets invoked
-	return server.stop()
-}
-
-func (t *attachServerSSH) reload() error {
-	t.serverConn.Lock()
-	defer t.serverConn.Unlock()
-
-	// push the exec'ed session ids to the portlayer
-	if t.serverConn.ServerConn != nil {
-		msg := msgs.ContainersMsg{
-			IDs: t.sessions(false),
-		}
-		payload := msg.Marshal()
-
-		ok, _, err := t.serverConn.SendRequest(msgs.ContainersReq, true, payload)
-		if !ok || err != nil {
-			return fmt.Errorf("failed to send container ids: %s, %t", err, ok)
-		}
-	}
-	return nil
-}
-
-func (t *attachServerSSH) start() error {
-	defer trace.End(trace.Begin("start attach server"))
-
-	// if we come here while enabled, reload
-	if t.Enabled() {
-		log.Debugf("Start called while enabled, reloading")
-		if err := t.reload(); err != nil {
-			log.Warn(err)
-		}
-		return nil
-	}
-
-	// don't assume that the key hasn't changed
-	pkey, err := ssh.ParsePrivateKey([]byte(t.config.Key))
-	if err != nil {
-		detail := fmt.Sprintf("failed to load key for attach: %s", err)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	// An SSH server is represented by a ServerConfig, which holds
-	// certificate details and handles authentication of ServerConns.
-	// TODO: update this with generated credentials for the appliance
-	t.sshConfig = &ssh.ServerConfig{
-		PublicKeyCallback: func(c ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
-			if c.User() == "daemon" {
-				return &ssh.Permissions{}, nil
-			}
-			return nil, fmt.Errorf("expected daemon user")
-		},
-		PasswordCallback: func(c ssh.ConnMetadata, pass []byte) (*ssh.Permissions, error) {
-			if c.User() == "daemon" {
-				return &ssh.Permissions{}, nil
-			}
-			return nil, fmt.Errorf("expected daemon user")
-		},
-		NoClientAuth: true,
-	}
-	t.sshConfig.AddHostKey(pkey)
-
-	// enable the server and start it
-	t.Enable()
-	go t.run()
-
-	return nil
-}
-
-// stop is not thread safe with start
-func (t *attachServerSSH) stop() error {
-	defer trace.End(trace.Begin("stop attach server"))
-
-	if t == nil {
-		err := fmt.Errorf("attach server is not configured")
-		log.Error(err)
-		return err
-	}
-
-	if !t.Enabled() {
-		err := fmt.Errorf("attach server is not enabled")
-		log.Error(err)
-		return err
-	}
-
-	// disable the server
-	t.Disable()
-
-	// This context is used by backchannel only. We need to cancel it before
-	// trying to obtain the following lock so that backchannel interrupts the
-	// underlying Read call by calling Close on it.
-	// The lock is held by backchannel's caller and not released until it returns
-	log.Debugf("Canceling AttachServer's context")
-	t.cancel()
-
-	t.conn.Lock()
-	if t.conn.conn != nil {
-		log.Debugf("Close called again on rawconn - squashing")
-		// #nosec: Errors unhandled.
-		t.conn.conn.Close()
-		t.conn.conn = nil
-	}
-	t.conn.Unlock()
-
-	return nil
-}
-
-func backchannel(ctx context.Context, conn net.Conn) error {
-	defer trace.End(trace.Begin("establish tether backchannel"))
-
-	// used for shutting down the goroutine cleanly otherwise we leak a goroutine for every successful return from this function
-	done := make(chan struct{})
-
-	// HACK: currently RawConn dosn't implement timeout so throttle the spinning
-	// it does implement the Timeout methods so the intermediary code can be written
-	// to support it, but they are stub implementation in rawconn impl.
-
-	// This needs to tick *faster* than the ticker in connection.go on the
-	// portlayer side.  The PL sends the first syn and if this isn't waiting,
-	// alignment will take a few rounds (or it may never happen).
-	ticker := time.NewTicker(10 * time.Millisecond)
-	defer ticker.Stop()
-
-	// We run this in a separate goroutine because HandshakeServer
-	// calls a Read on rawconn which is a blocking call which causes
-	// the caller to block as well so this is the only way to cancel.
-	// Calling Close() will unblock us and on the next tick we will
-	// return ctx.Err()
-	go func() {
-		select {
-		case <-ctx.Done():
-			conn.Close()
-		case <-done:
-			return
-		}
-	}()
-
-	for {
-		select {
-		case <-ticker.C:
-			if ctx.Err() != nil {
-				return ctx.Err()
-			}
-			deadline, ok := ctx.Deadline()
-			if ok {
-				conn.SetReadDeadline(deadline)
-			}
-
-			err := serial.HandshakeServer(conn)
-			if err == nil {
-				conn.SetReadDeadline(time.Time{})
-				close(done)
-				return nil
-			}
-
-			switch et := err.(type) {
-			case *serial.HandshakeError:
-				log.Debugf("HandshakeServer: %v", et)
-			default:
-				log.Errorf("HandshakeServer: %v", err)
-			}
-		}
-	}
-}
-
-func (t *attachServerSSH) establish() error {
-	var err error
-
-	// we hold the t.conn.Lock during the scope of this function
-	t.conn.Lock()
-	defer t.conn.Unlock()
-
-	// tests are passing their own connections so do not create connections when testing is set
-	if !t.testing {
-		// close the connection if required
-		if t.conn.conn != nil {
-			// #nosec: Errors unhandled.
-			t.conn.conn.Close()
-			t.conn.conn = nil
-		}
-		t.conn.conn, err = rawConnectionFromSerial()
-		if err != nil {
-			detail := fmt.Errorf("failed to create raw connection: %s", err)
-			log.Error(detail)
-			return detail
-		}
-	} else {
-		// A series of unfortunate events can lead calling backchannel with nil when we run unit tests.
-		// https://github.com/vmware/vic/pull/5327#issuecomment-305619860
-		// This check is here to handle that
-		if t.conn.conn == nil {
-			return fmt.Errorf("nil connection")
-		}
-	}
-
-	// wait for backchannel to establish
-	err = backchannel(t.ctx, t.conn.conn)
-	if err != nil {
-		detail := fmt.Errorf("failed to establish backchannel: %s", err)
-		log.Error(detail)
-		return detail
-	}
-
-	return nil
-}
-
-func (t *attachServerSSH) cleanup() {
-	t.serverConn.Lock()
-	defer t.serverConn.Unlock()
-
-	log.Debugf("cleanup on connection")
-
-	if t.serverConn.ServerConn != nil {
-		log.Debugf("closing underlying connection")
-		t.serverConn.Close()
-		t.serverConn.ServerConn = nil
-	}
-}
-
-// run should not be called directly, but via start
-// run will establish an ssh server listening on the backchannel
-func (t *attachServerSSH) run() error {
-	defer trace.End(trace.Begin("main attach server loop"))
-
-	var established bool
-
-	var chans <-chan ssh.NewChannel
-	var reqs <-chan *ssh.Request
-	var err error
-
-	// main run loop
-	for t.Enabled() {
-		t.serverConn.Lock()
-		established = t.serverConn.ServerConn != nil
-		t.serverConn.Unlock()
-
-		// keep waiting for the connection to establish
-		for !established && t.Enabled() {
-			log.Infof("Trying to establish a connection")
-
-			if err := t.establish(); err != nil {
-				log.Error(err)
-				continue
-			}
-
-			// create the SSH server using underlying t.conn
-			t.serverConn.Lock()
-
-			t.serverConn.ServerConn, chans, reqs, err = ssh.NewServerConn(t.conn.conn, t.sshConfig)
-			if err != nil {
-				detail := fmt.Errorf("failed to establish ssh handshake: %s", err)
-				log.Error(detail)
-			}
-			established = t.serverConn.ServerConn != nil
-
-			t.serverConn.Unlock()
-		}
-
-		// Global requests
-		go t.globalMux(reqs, t.cleanup)
-
-		log.Infof("Ready to service attach requests")
-		// Service the incoming channels
-		for attachchan := range chans {
-			// The only channel type we'll support is attach
-			if attachchan.ChannelType() != attachChannelType {
-				detail := fmt.Sprintf("unknown channel type %s", attachchan.ChannelType())
-				attachchan.Reject(ssh.UnknownChannelType, detail)
-				log.Error(detail)
-				continue
-			}
-
-			// check we have a Session matching the requested ID
-			bytes := attachchan.ExtraData()
-			if bytes == nil {
-				detail := "attach channel requires ID in ExtraData"
-				attachchan.Reject(ssh.Prohibited, detail)
-				log.Error(detail)
-				continue
-			}
-
-			sessionid := string(bytes)
-
-			s, oks := t.config.Sessions[sessionid]
-			e, oke := t.config.Execs[sessionid]
-			if !oks && !oke {
-				detail := fmt.Sprintf("session %s is invalid", sessionid)
-				attachchan.Reject(ssh.Prohibited, detail)
-				log.Error(detail)
-				continue
-			}
-
-			// we have sessionid
-			session := s
-			if oke {
-				session = e
-			}
-
-			// session is potentially blocked in launch until we've got the unblock message, so we cannot lock it.
-			// check that session is valid
-			// The detail remains concise as it'll eventually make its way to the user
-			if session.Started != "" && session.Started != "true" {
-				detail := fmt.Sprintf("launch failed with: %s", session.Started)
-				attachchan.Reject(ssh.Prohibited, detail)
-				log.Error(detail)
-				continue
-			}
-
-			if session.StopTime != 0 {
-				detail := fmt.Sprintf("process finished with exit code: %d", session.ExitStatus)
-				attachchan.Reject(ssh.Prohibited, detail)
-				log.Error(detail)
-				continue
-			}
-
-			channel, requests, err := attachchan.Accept()
-			if err != nil {
-				detail := fmt.Sprintf("could not accept channel: %s", err)
-				log.Errorf(detail)
-				continue
-			}
-
-			// bind the channel to the Session
-			log.Debugf("binding reader/writers for channel for %s", sessionid)
-
-			log.Debugf("Adding [%p] to Outwriter", channel)
-			session.Outwriter.Add(channel)
-			log.Debugf("Adding [%p] to Reader", channel)
-			session.Reader.Add(channel)
-
-			// cleanup on detach from the session
-			cleanup := func() {
-				log.Debugf("Cleanup on detach from the session")
-
-				log.Debugf("Removing [%p] from Outwriter", channel)
-				session.Outwriter.Remove(channel)
-
-				log.Debugf("Removing [%p] from Reader", channel)
-				session.Reader.Remove(channel)
-
-				channel.Close()
-			}
-
-			detach := cleanup
-			// tty's merge stdout and stderr so we don't bind an additional reader in that case but we need to do so for non-tty
-			if !session.Tty {
-				// persist the value as we end up with different values each time we access it
-				stderr := channel.Stderr()
-
-				log.Debugf("Adding [%p] to Errwriter", stderr)
-				session.Errwriter.Add(stderr)
-
-				detach = func() {
-					log.Debugf("Cleanup on detach from the session (non-tty)")
-
-					log.Debugf("Removing [%p] from Errwriter", stderr)
-					session.Errwriter.Remove(stderr)
-
-					cleanup()
-				}
-			}
-			log.Debugf("reader/writers bound for channel for %s", sessionid)
-
-			go t.channelMux(requests, session, detach)
-		}
-		log.Info("Incoming attach channel closed")
-	}
-	return nil
-}
-
-func (t *attachServerSSH) sessions(all bool) []string {
-	defer trace.End(trace.Begin(""))
-
-	var keys []string
-
-	// this iterates the local copies of the sessions maps
-	// so we don't need to care whether they're initialized or not
-	// as extension reload comes after that point
-
-	// whether include sessions or not
-	if all {
-		for k, v := range t.config.Sessions {
-			if v.Active && v.StopTime == 0 {
-				keys = append(keys, k)
-			}
-		}
-	}
-
-	for k, v := range t.config.Execs {
-		// skip those that have had launch errors
-		if v.Active && v.StopTime == 0 && (v.Started == "" || v.Started == "true") {
-			keys = append(keys, k)
-		}
-	}
-
-	log.Debugf("Returning %d keys", len(keys))
-	return keys
-}
-
-func (t *attachServerSSH) globalMux(in <-chan *ssh.Request, cleanup func()) {
-	defer trace.End(trace.Begin("attach server global request handler"))
-
-	// cleanup function passed by the caller
-	defer cleanup()
-
-	// for the actions after we process the request
-	var pendingFn func()
-	for req := range in {
-		var payload []byte
-		ok := true
-
-		log.Infof("received global request type %v", req.Type)
-
-		switch req.Type {
-		case msgs.ContainersReq:
-			msg := msgs.ContainersMsg{
-				IDs: t.sessions(true),
-			}
-			payload = msg.Marshal()
-		case msgs.VersionReq:
-			msg := msgs.VersionMsg{
-				Version: feature.MaxPluginVersion - 1,
-			}
-			payload = msg.Marshal()
-		default:
-			ok = false
-			payload = []byte("unknown global request type: " + req.Type)
-		}
-
-		log.Debugf("Returning payload: %s", string(payload))
-
-		// make sure that errors get send back if we failed
-		if req.WantReply {
-			log.Debugf("Sending global request reply %t back with %#v", ok, payload)
-			if err := req.Reply(ok, payload); err != nil {
-				log.Warnf("Failed to reply a global request back")
-			}
-		}
-
-		// run any pending work now that a reply has been sent
-		if pendingFn != nil {
-			log.Debug("Invoking pending work for global mux")
-			go pendingFn()
-			pendingFn = nil
-		}
-	}
-}
-
-func (t *attachServerSSH) channelMux(in <-chan *ssh.Request, session *tether.SessionConfig, cleanup func()) {
-	defer trace.End(trace.Begin("attach server channel request handler"))
-
-	// cleanup function passed by the caller
-	defer cleanup()
-
-	// to make sure we close the channel once
-	var once sync.Once
-
-	// for the actions after we process the request
-	var pendingFn func()
-	for req := range in {
-		ok := true
-		abort := false
-
-		log.Infof("received channel mux type %v", req.Type)
-
-		switch req.Type {
-		case msgs.PingReq:
-			log.Infof("Received PingReq for %s", session.ID)
-
-			if string(req.Payload) != msgs.PingMsg {
-				log.Infof("Received corrupted PingReq for %s", session.ID)
-				ok = false
-			}
-		case msgs.UnblockReq:
-			log.Infof("Received UnblockReq for %s", session.ID)
-
-			if string(req.Payload) != msgs.UnblockMsg {
-				log.Infof("Received corrupted UnblockReq for %s", session.ID)
-				ok = false
-				break
-			}
-
-			// if the process has exited, or couldn't launch
-			if session.Started != "" && session.Started != "true" {
-				// we need to force the session closed so that error handling occurs on the callers
-				// side
-				ok = false
-				abort = true
-			} else {
-				// unblock ^ (above)
-				pendingFn = func() {
-					once.Do(func() {
-						launchChan := session.ClearToLaunch
-						if session.RunBlock && launchChan != nil && session.Started == "" {
-							log.Infof("Unblocking the launch of %s", session.Common.ID)
-							// make sure that portlayer received the container id back
-							launchChan <- struct{}{}
-							log.Infof("Unblocked the launch of %s", session.Common.ID)
-						}
-					})
-				}
-			}
-
-		case msgs.WindowChangeReq:
-			session.Lock()
-			pty := session.Pty
-			session.Unlock()
-
-			msg := msgs.WindowChangeMsg{}
-			if pty == nil {
-				ok = false
-				log.Errorf("illegal window-change request for non-tty")
-			} else if err := msg.Unmarshal(req.Payload); err != nil {
-				ok = false
-				log.Errorf(err.Error())
-			} else if err := resizePty(pty.Fd(), &msg); err != nil {
-				ok = false
-				log.Errorf(err.Error())
-			}
-		case msgs.CloseStdinReq:
-			log.Infof("Received CloseStdinReq for %s", session.ID)
-
-			log.Debugf("Configuring reader to propagate EOF for %s", session.ID)
-			session.Reader.PropagateEOF(true)
-		default:
-			ok = false
-			log.Error(fmt.Sprintf("ssh request type %s is not supported", req.Type))
-		}
-
-		// payload is ignored on channel specific replies.  The ok is passed, however.
-		if req.WantReply {
-			log.Debugf("Sending channel request reply %t back", ok)
-			if err := req.Reply(ok, nil); err != nil {
-				log.Warnf("Failed replying to a channel request: %s", err)
-			}
-		}
-
-		// run any pending work now that a reply has been sent
-		if pendingFn != nil {
-			log.Debug("Invoking pending work for channel mux")
-			go pendingFn()
-			pendingFn = nil
-		}
-
-		if abort {
-			break
-		}
-	}
-}
-
-// The syscall struct
-type winsize struct {
-	wsRow    uint16
-	wsCol    uint16
-	wsXpixel uint16
-	wsYpixel uint16
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/attach_linux.go b/installer/vendor/github.com/vmware/vic/cmd/tether/attach_linux.go
deleted file mode 100644
index 78c2f00a5e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/attach_linux.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/crypto/ssh/terminal"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/pkg/serial"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-var backchannelMode = os.ModePerm
-
-func setTerminalSpeed(fd uintptr) error {
-	var current struct {
-		termios syscall.Termios
-	}
-
-	// get the current state
-	// #nosec: Use of unsafe calls should be audited
-	if _, _, errno := syscall.Syscall6(syscall.SYS_IOCTL,
-		uintptr(fd),
-		syscall.TCGETS,
-		uintptr(unsafe.Pointer(&current.termios)),
-		0,
-		0,
-		0,
-	); errno != 0 {
-		return errno
-	}
-
-	// copy it as the future
-	future := current.termios
-
-	// unset 9600 bps
-	future.Cflag &^= syscall.B9600
-	// set them to 115200 bps
-	future.Cflag |= syscall.B115200
-	future.Ispeed = syscall.B115200
-	future.Ospeed = syscall.B115200
-
-	// set the future values
-	// #nosec: Use of unsafe calls should be audited
-	if _, _, errno := syscall.Syscall6(
-		syscall.SYS_IOCTL,
-		uintptr(fd),
-		syscall.TCSETS,
-		uintptr(unsafe.Pointer(&future)),
-		0,
-		0,
-		0,
-	); errno != 0 {
-		return errno
-	}
-	return nil
-}
-
-func rawConnectionFromSerial() (net.Conn, error) {
-	log.Info("opening ttyS0 for backchannel")
-	f, err := os.OpenFile(path.Join(pathPrefix, "ttyS0"), os.O_RDWR|os.O_SYNC|syscall.O_NOCTTY, backchannelMode)
-	if err != nil {
-		detail := fmt.Errorf("failed to open serial port for backchannel: %s", err)
-		log.Error(detail)
-		return nil, detail
-	}
-
-	// set the provided FDs to raw if it's a termial
-	// 0 is the uninitialized value for Fd
-	if f.Fd() != 0 && terminal.IsTerminal(int(f.Fd())) {
-		log.Info("setting terminal to raw mode")
-		_, err := terminal.MakeRaw(int(f.Fd()))
-		if err != nil {
-			return nil, err
-		}
-	}
-	if err := setTerminalSpeed(f.Fd()); err != nil {
-		log.Errorf("Setting terminal speed failed with %s", err)
-	}
-
-	log.Infof("creating raw connection from ttyS0 (fd=%d)", f.Fd())
-	return serial.NewFileConn(f)
-}
-
-func resizePty(pty uintptr, winSize *msgs.WindowChangeMsg) error {
-	defer trace.End(trace.Begin(""))
-
-	ws := &winsize{uint16(winSize.Rows), uint16(winSize.Columns), uint16(winSize.WidthPx), uint16(winSize.HeightPx)}
-	// #nosec: Use of unsafe calls should be audited
-	_, _, errno := syscall.Syscall(
-		syscall.SYS_IOCTL,
-		pty,
-		syscall.TIOCSWINSZ,
-		uintptr(unsafe.Pointer(ws)),
-	)
-	if errno != 0 {
-		return syscall.Errno(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/attach_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/attach_test.go
deleted file mode 100644
index 3c45703a8f..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/attach_test.go
+++ /dev/null
@@ -1,1096 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"path"
-	"sync"
-	"syscall"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/vic/lib/config/executor"
-
-	"github.com/vmware/vic/lib/portlayer/attach/communication"
-
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/serial"
-)
-
-type testAttachServer struct {
-	attachServerSSH
-	enabled bool
-	updated chan bool
-}
-
-func (t *testAttachServer) start() error {
-	t.testing = true
-	err := t.attachServerSSH.start()
-	if err == nil {
-		t.updated <- true
-		t.enabled = true
-	}
-
-	log.Info("Started test attach server")
-	return err
-}
-
-func (t *testAttachServer) stop() error {
-	if t.enabled {
-		err := t.attachServerSSH.stop()
-		if err == nil {
-			log.Info("Stopped test attach server")
-			t.updated <- true
-			t.enabled = false
-		}
-		return err
-	}
-	return nil
-}
-
-func (t *testAttachServer) Reload(config *tether.ExecutorConfig) error {
-	log.Info("Parsing config in test attach server")
-	return t.attachServerSSH.Reload(config)
-}
-
-func (t *testAttachServer) Start() error {
-	log.Info("opening ttyS0 pipe pair for backchannel (server)")
-	c, err := os.OpenFile(path.Join(pathPrefix, "ttyS0c"), os.O_WRONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open cpipe for backchannel: %s", err)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	s, err := os.OpenFile(path.Join(pathPrefix, "ttyS0s"), os.O_RDONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open spipe for backchannel: %s", err)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	log.Infof("creating raw connection from ttyS0 pipe pair for server (c=%d, s=%d) %s\n", c.Fd(), s.Fd(), pathPrefix)
-	conn, err := serial.NewHalfDuplexFileConn(s, c, path.Join(pathPrefix, "ttyS0"), "file")
-	if err != nil {
-		detail := fmt.Sprintf("failed to create raw connection from ttyS0 pipe pair: %s", err)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	t.conn.Lock()
-	defer t.conn.Unlock()
-
-	t.conn.conn = conn
-	return nil
-}
-
-func (t *testAttachServer) Stop() error {
-	return t.attachServerSSH.Stop()
-}
-
-// create client on the mock pipe
-func mockBackChannel(ctx context.Context) (net.Conn, error) {
-	log.Info("opening ttyS0 pipe pair for backchannel (client)")
-	c, err := os.OpenFile(path.Join(pathPrefix, "ttyS0c"), os.O_RDONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open cpipe for backchannel: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	s, err := os.OpenFile(path.Join(pathPrefix, "ttyS0s"), os.O_WRONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open spipe for backchannel: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	log.Infof("creating raw connection from ttyS0 pipe pair for backchannel (c=%d, s=%d) %s\n", c.Fd(), s.Fd(), pathPrefix)
-	conn, err := serial.NewHalfDuplexFileConn(c, s, path.Join(pathPrefix, "ttyS0"), "file")
-
-	if err != nil {
-		detail := fmt.Sprintf("failed to create raw connection from ttyS0 pipe pair: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	// HACK: currently RawConn dosn't implement timeout so throttle the spinning
-	ticker := time.NewTicker(1000 * time.Millisecond)
-	for {
-		select {
-		case <-ticker.C:
-			err := serial.HandshakeClient(conn)
-			if err != nil {
-				if err == io.EOF {
-					// with unix pipes the open will block until both ends are open, therefore
-					// EOF means the other end has been intentionally closed
-					return nil, err
-				}
-				log.Error(err)
-			} else {
-				return conn, nil
-			}
-		case <-ctx.Done():
-			conn.Close()
-			ticker.Stop()
-			return nil, ctx.Err()
-		}
-	}
-}
-
-// create client on the mock pipe and dial the given host:port
-func mockNetworkToSerialConnection(host string) (*sync.WaitGroup, error) {
-	log.Info("opening ttyS0 pipe pair for backchannel")
-	c, err := os.OpenFile(path.Join(pathPrefix, "ttyS0c"), os.O_RDONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open cpipe for backchannel: %s", err)
-	}
-
-	s, err := os.OpenFile(path.Join(pathPrefix, "ttyS0s"), os.O_WRONLY|syscall.O_NOCTTY, 0777)
-	if err != nil {
-		return nil, fmt.Errorf("failed to open spipe for backchannel: %s", err)
-	}
-
-	log.Infof("creating raw connection from ttyS0 pipe pair (c=%d, s=%d)\n", c.Fd(), s.Fd())
-	conn, err := serial.NewHalfDuplexFileConn(c, s, path.Join(pathPrefix, "/ttyS0"), "file")
-	if err != nil {
-		return nil, fmt.Errorf("failed to create raw connection from ttyS0 pipe pair: %s", err)
-	}
-
-	// Dial the attach server.  This is a TCP client
-	networkClientCon, err := net.Dial("tcp", host)
-	if err != nil {
-		return nil, err
-	}
-	log.Debugf("dialed %s", host)
-
-	wg := sync.WaitGroup{}
-	wg.Add(2)
-
-	go func() {
-		io.Copy(networkClientCon, conn)
-		wg.Done()
-	}()
-
-	go func() {
-		io.Copy(conn, networkClientCon)
-		wg.Done()
-	}()
-
-	return &wg, nil
-}
-
-func genKey() []byte {
-	// generate a host key for the tether
-	privateKey, err := rsa.GenerateKey(rand.Reader, 512)
-	if err != nil {
-		panic("unable to generate private key during test")
-	}
-
-	privateKeyDer := x509.MarshalPKCS1PrivateKey(privateKey)
-	privateKeyBlock := pem.Block{
-		Type:    "RSA PRIVATE KEY",
-		Headers: nil,
-		Bytes:   privateKeyDer,
-	}
-
-	return pem.EncodeToMemory(&privateKeyBlock)
-}
-
-func attachCase(t *testing.T, runblock bool) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 1,
-		},
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "attach",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"attach": {
-				Common: executor.Common{
-					ID:   "attach",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				RunBlock:  runblock,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	containerConfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client from the mocked connection
-	sshConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", containerConfig)
-	assert.NoError(t, err)
-	defer sshConn.Close()
-
-	ssh.NewClient(sshConn, chans, reqs)
-	_, err = communication.ContainerIDs(sshConn)
-	version, err := communication.ContainerVersion(sshConn)
-	assert.NoError(t, err)
-	sshSession, err := communication.NewSSHInteraction(sshConn, cfg.ID, version)
-	if runblock {
-		sshSession.Unblock()
-	}
-	assert.NoError(t, err)
-
-	stdout := sshSession.Stdout()
-
-	// FIXME: the pipe pair are line buffered - how do I disable that so we
-	// don't have odd hangs to diagnose when the trailing \n is missed
-
-	testBytes := []byte("\x1b[32mhello world\x1b[39m!\n")
-	// read from session into buffer
-	buf := &bytes.Buffer{}
-	done := make(chan bool)
-	go func() { io.Copy(buf, stdout); done <- true }()
-
-	// write something to echo
-	log.Debug("sending test data")
-	sshSession.Stdin().Write(testBytes)
-	log.Debug("sent test data")
-
-	// wait for the close to propagate
-	sshSession.CloseStdin()
-	<-done
-	// sshSession.Close()
-}
-
-func TestAttach(t *testing.T) {
-	attachCase(t, false)
-}
-
-func TestAttachBlock(t *testing.T) {
-	attachCase(t, true)
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestAttachTTYConfig sets up the config for attach testing
-//
-func TestAttachTTY(t *testing.T) {
-	t.Skip("TTY test skipped - not sure how to test this correctly")
-
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "attach",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"attach": {
-				Common: executor.Common{
-					ID:   "attach",
-					Name: "tether_test_session",
-				},
-				Tty:    true,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	cconfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client
-	sConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", cconfig)
-	assert.NoError(t, err)
-
-	defer sConn.Close()
-	client := ssh.NewClient(sConn, chans, reqs)
-
-	session, err := communication.NewSSHInteraction(client, cfg.ID, feature.MaxPluginVersion-1)
-	assert.NoError(t, err)
-
-	stdout := session.Stdout()
-
-	// FIXME: this is line buffered - how do I disable that so we don't have odd hangs to diagnose
-	// when the trailing \n is missed
-	testBytes := []byte("\x1b[32mhello world\x1b[39m!\n")
-	// after tty translation the above string should result in the following
-	refBytes := []byte("\x5e[[32mhello world\x5e[[39m!\n")
-
-	// read from session into buffer
-	buf := &bytes.Buffer{}
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		io.CopyN(buf, stdout, int64(len(refBytes)))
-		wg.Done()
-	}()
-
-	// write something to echo
-	log.Debug("sending test data")
-	session.Stdin().Write(testBytes)
-	log.Debug("sent test data")
-
-	// wait for the close to propagate
-	wg.Wait()
-	session.CloseStdin()
-
-	assert.Equal(t, refBytes, buf.Bytes())
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestAttachTTYStdinClose sets up the config for attach testing
-//
-func TestAttachTTYStdinClose(t *testing.T) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "sort",
-			Name: "tether_test_executor",
-		},
-
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 1,
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"sort": {
-				Common: executor.Common{
-					ID:   "sort",
-					Name: "tether_test_session",
-				},
-				Tty:    true,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				RunBlock:  true,
-
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/sort",
-					// reading from stdin
-					Args: []string{"/usr/bin/sort"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	containerConfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client from the mocked connection
-	sshConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", containerConfig)
-	assert.NoError(t, err)
-	defer sshConn.Close()
-
-	ssh.NewClient(sshConn, chans, reqs)
-	_, err = communication.ContainerIDs(sshConn)
-	assert.NoError(t, err)
-	sshSession, err := communication.NewSSHInteraction(sshConn, cfg.ID, feature.MaxPluginVersion-1)
-	assert.NoError(t, err)
-
-	// unblock before grabbing stdout - this should buffer in ssh
-	sshSession.Unblock()
-	stdout := sshSession.Stdout()
-
-	// FIXME: the pipe pair are line buffered - how do I disable that so we
-	// don't have odd hangs to diagnose when the trailing \n is missed
-
-	testBytes := []byte("one\ntwo\nthree\n")
-	// after tty translation by sort the above string should result in the following
-	// - we have echo turned on so we get a repeat of the initial string
-	// - all \n bytes are translated to \r\n
-	refBytes := []byte("one\r\ntwo\r\nthree\r\none\r\nthree\r\ntwo\r\n")
-
-	// read from session into buffer
-	buf := &bytes.Buffer{}
-	done := make(chan bool)
-	go func() {
-		io.Copy(buf, stdout)
-		log.Debug("stdout copy complete")
-		done <- true
-	}()
-
-	// write something to echo
-	log.Debug("sending test data")
-	sshSession.Stdin().Write(testBytes)
-	log.Debug("sent test data")
-
-	// wait for the close to propagate
-	sshSession.CloseStdin()
-	<-done
-
-	assert.Equal(t, refBytes, buf.Bytes())
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestEcho ensures we get back data without a tty and without any stdin interaction
-//
-func TestEcho(t *testing.T) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "echo",
-			Name: "tether_test_executor",
-		},
-
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 1,
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"echo": {
-				Common: executor.Common{
-					ID:   "echo",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				RunBlock:  true,
-
-				Cmd: executor.Cmd{
-					Path: "/bin/echo",
-					// reading from stdin
-					Args: []string{"/bin/echo", "hello"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	containerConfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client from the mocked connection
-	sshConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", containerConfig)
-	assert.NoError(t, err)
-	defer sshConn.Close()
-
-	ssh.NewClient(sshConn, chans, reqs)
-	_, err = communication.ContainerIDs(sshConn)
-	assert.NoError(t, err)
-	version, err := communication.ContainerVersion(sshConn)
-	assert.NoError(t, err)
-
-	sshSession, err := communication.NewSSHInteraction(sshConn, cfg.ID, version)
-	assert.NoError(t, err)
-
-	// unblock before grabbing stdout - this should buffer in ssh
-	sshSession.Unblock()
-	stdout := sshSession.Stdout()
-	stderr := sshSession.Stderr()
-
-	doneStdout := make(chan bool)
-	doneStderr := make(chan bool)
-
-	// read from session into buffer
-	bufout := &bytes.Buffer{}
-	go func() {
-		io.Copy(bufout, stdout)
-		log.Debug("stdout copy complete")
-		doneStdout <- true
-	}()
-
-	// read from session into buffer
-	buferr := &bytes.Buffer{}
-	go func() {
-		io.Copy(buferr, stderr)
-		log.Debug("stderr copy complete")
-		doneStderr <- true
-	}()
-
-	// wait for the close to propagate
-	<-doneStdout
-	assert.Equal(t, "hello\n", string(bufout.Bytes()))
-
-	<-doneStderr
-	assert.Equal(t, "", string(buferr.Bytes()))
-}
-
-func TestEchoRepeat(t *testing.T) {
-	log.SetLevel(log.WarnLevel)
-
-	for i := 0; i < 10 && !t.Failed(); i++ {
-		TestEcho(t)
-	}
-
-	defer log.SetLevel(log.DebugLevel)
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestAttachMultiple sets up the config for attach testing - tests launching and
-// attaching to multiple processes simultaneously
-//
-func TestAttachMultiple(t *testing.T) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "tee1",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"tee1": {
-				Common: executor.Common{
-					ID:   "tee1",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee1.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-			"tee2": {
-				Common: executor.Common{
-					ID:   "tee2",
-					Name: "tether_test_session2",
-				},
-				Tty:    false,
-				Attach: true,
-				Active: true,
-
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee2.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-			"tee3": {
-				Common: executor.Common{
-					ID:   "tee3",
-					Name: "tether_test_session2",
-				},
-				Tty:    false,
-				Attach: false,
-				Active: true,
-
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee3.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 1,
-		},
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-mocker.Started
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	cconfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client
-	sConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", cconfig)
-	assert.NoError(t, err)
-
-	defer sConn.Close()
-	client := ssh.NewClient(sConn, chans, reqs)
-
-	ids, err := communication.ContainerIDs(client)
-	assert.NoError(t, err)
-	version, err := communication.ContainerVersion(client)
-	assert.NoError(t, err)
-
-	// there's no ordering guarantee in the returned ids
-	if len(ids) != len(cfg.Sessions) {
-		t.Errorf("ID list - expected %d, got %d", len(cfg.Sessions), len(ids))
-	}
-
-	// check the ids we got correspond to those in the config
-	for _, id := range ids {
-		if _, ok := cfg.Sessions[id]; !ok {
-			t.Errorf("Expected sessions to have an entry for %s", id)
-		}
-	}
-
-	sessionA, err := communication.NewSSHInteraction(client, "tee1", version)
-	assert.NoError(t, err)
-
-	sessionB, err := communication.NewSSHInteraction(client, "tee2", version)
-	assert.NoError(t, err)
-
-	stdoutA := sessionA.Stdout()
-	stdoutB := sessionB.Stdout()
-
-	// FIXME: this is line buffered - how do I disable that so we don't have odd hangs to diagnose
-	// when the trailing \n is missed
-	testBytesA := []byte("hello world!\n")
-	testBytesB := []byte("goodbye world!\n")
-	// read from session into buffer
-	bufA := &bytes.Buffer{}
-	bufB := &bytes.Buffer{}
-
-	var wg sync.WaitGroup
-	// wg.Add cannot go inside the go routines as the Add may not have happened by the time we call Wait
-	wg.Add(2)
-	go func() {
-		io.CopyN(bufA, stdoutA, int64(len(testBytesA)))
-		wg.Done()
-	}()
-	go func() {
-		io.CopyN(bufB, stdoutB, int64(len(testBytesB)))
-		wg.Done()
-	}()
-
-	// write something to echo
-	log.Debug("sending test data")
-	sessionA.Stdin().Write(testBytesA)
-	sessionB.Stdin().Write(testBytesB)
-	log.Debug("sent test data")
-
-	// wait for the close to propagate
-	wg.Wait()
-
-	sessionA.CloseStdin()
-	sessionB.CloseStdin()
-
-	<-mocker.Cleaned
-
-	assert.Equal(t, bufA.Bytes(), testBytesA)
-	assert.Equal(t, bufB.Bytes(), testBytesB)
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestAttachInvalid sets up the config for attach testing - launches a process but
-// tries to attach to an invalid session id
-//
-func TestAttachInvalid(t *testing.T) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "attachinvalid",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"valid": {
-				Common: executor.Common{
-					ID:   "valid",
-					Name: "tether_test_session",
-				},
-				Tty:       false,
-				Attach:    true,
-				Active:    true,
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	tthr, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	cconfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client
-	sConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", cconfig)
-	assert.NoError(t, err)
-	defer sConn.Close()
-
-	client := ssh.NewClient(sConn, chans, reqs)
-
-	version, err := communication.ContainerVersion(client)
-	assert.NoError(t, err)
-
-	_, err = communication.NewSSHInteraction(client, "invalid", version)
-	tthr.Stop()
-	if err == nil {
-		t.Errorf("Expected to fail on attempt to attach to invalid session")
-	}
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-// Start the tether, start a mock esx serial to tcp connection, start the
-// attach server, try to Get() the tether's attached session.
-/*
-func TestMockAttachTetherToPL(t *testing.T) {
-	testSetup(t)
-	defer testTeardown(t)
-
-	// Start the PL attach server
-	testServer := communication.NewAttachServer("", 8080)
-	assert.NoError(t, testServer.Start())
-	defer testServer.Stop()
-
-	cfg := executor.ExecutorConfig{
-		Common: executor.Common{
-			ID:   "attach",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"attach": executor.SessionConfig{
-				Common: executor.Common{
-					ID:   "attach",
-					Name: "tether_test_session",
-				},
-				Tty:    true,
-				Attach: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	StartTether(t, &cfg)
-
-	// create a conn on the mock pipe.  Reads from pipe, echos to network.
-	_, err := mockNetworkToSerialConnection(testServer.Addr())
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	var pty communication.SessionInteractor
-	pty, err = testServer.Get(context.Background(), "attach", 600*time.Second)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = pty.Resize(1, 2, 3, 4)
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, Mocked.WindowCol, uint32(1)) || !assert.Equal(t, Mocked.WindowRow, uint32(2)) {
-		return
-	}
-
-	if err = pty.Signal("HUP"); !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, Mocked.Signal, ssh.Signal("HUP")) {
-		return
-	}
-}
-*/
-
-func TestReattach(t *testing.T) {
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	testServer, _ := server.(*testAttachServer)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "attach",
-			Name: "tether_test_executor",
-		},
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 1,
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"attach": {
-				Common: executor.Common{
-					ID:   "attach",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Attach: true,
-				Active: true,
-
-				RunBlock:  true,
-				OpenStdin: true,
-				Cmd: executor.Cmd{
-					Path: "/usr/bin/tee",
-					// grep, matching everything, reading from stdin
-					Args: []string{"/usr/bin/tee", pathPrefix + "/tee.out"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-		Key: genKey(),
-	}
-
-	_, _, conn := StartAttachTether(t, &cfg, mocker)
-	defer conn.Close()
-
-	// wait for updates to occur
-	<-testServer.updated
-
-	if !testServer.enabled {
-		t.Errorf("attach server was not enabled")
-	}
-
-	containerConfig := &ssh.ClientConfig{
-		User: "daemon",
-		HostKeyCallback: func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-			return nil
-		},
-	}
-
-	// create the SSH client from the mocked connection
-	sshConn, chans, reqs, err := ssh.NewClientConn(conn, "notappliable", containerConfig)
-	assert.NoError(t, err)
-	defer sshConn.Close()
-
-	var sshSession communication.SessionInteractor
-	done := make(chan bool)
-	buf := &bytes.Buffer{}
-	testBytes := []byte("\x1b[32mhello world\x1b[39m!\n")
-
-	attachFunc := func() {
-		attachClient := ssh.NewClient(sshConn, chans, reqs)
-		if attachClient == nil {
-			t.Errorf("Failed to get ssh.NewClient")
-		}
-
-		_, err = communication.ContainerIDs(sshConn)
-		assert.NoError(t, err)
-
-		version, err := communication.ContainerVersion(sshConn)
-		assert.NoError(t, err)
-
-		sshSession, err = communication.NewSSHInteraction(sshConn, cfg.ID, version)
-		assert.NoError(t, err)
-
-		sshSession.Unblock()
-
-		stdout := sshSession.Stdout()
-
-		// read from session into buffer
-		go func() {
-			io.CopyN(buf, stdout, int64(len(testBytes)))
-			done <- true
-		}()
-
-		// write something to echo
-		log.Debug("sending test data")
-		sshSession.Stdin().Write(testBytes)
-		log.Debug("sent test data")
-	}
-
-	limit := 10
-	for i := 0; i <= limit; i++ {
-		if i > 0 {
-			// truncate the buffer for the retach
-			buf.Reset()
-			testBytes = []byte(fmt.Sprintf("\x1b[32mhello world - again %dth time \x1b[39m!\n", i))
-		}
-
-		// attach
-		attachFunc()
-
-		// wait for the close to propagate
-		<-done
-
-		// send close-stdin if this is the last iteration
-		if i == limit {
-			// exit
-			sshSession.CloseStdin()
-		} else {
-			// detach
-			sshSession.Stdin().Close()
-		}
-		assert.Equal(t, buf.Bytes(), testBytes)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/haveged_linux.go b/installer/vendor/github.com/vmware/vic/cmd/tether/haveged_linux.go
deleted file mode 100644
index 2f3ae5f80f..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/haveged_linux.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"os/exec"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/tether"
-)
-
-// Haveged is a tether extension that wraps command
-type Haveged struct {
-	p    *os.Process
-	exec func() (*os.Process, error)
-}
-
-// NewHaveged returns a tether.Extension that wraps haveged
-func NewHaveged() *Haveged {
-	return &Haveged{
-		exec: func() (*os.Process, error) {
-			args := []string{"/.tether/lib/ld-linux-x86-64.so.2", "--library-path", "/.tether/lib", "/.tether/haveged", "-w", "1024", "-v", "1", "-F"}
-			// #nosec: Subprocess launching with variable
-			cmd := exec.Command(args[0], args[1:]...)
-
-			log.Infof("Starting haveged with args: %q", args)
-			if err := cmd.Start(); err != nil {
-				log.Errorf("Starting haveged failed with %q", err.Error())
-				return nil, err
-			}
-			return cmd.Process, nil
-		},
-	}
-}
-
-// Start implementation of the tether.Extension interface
-func (h *Haveged) Start() error {
-	log.Infof("Starting haveged")
-
-	var err error
-	h.p, err = h.exec()
-	return err
-}
-
-// Stop implementation of the tether.Extension interface
-func (h *Haveged) Stop() error {
-	log.Infof("Stopping haveged")
-
-	if h.p != nil {
-		return h.p.Kill()
-	}
-	return fmt.Errorf("haveged process is missing")
-}
-
-// Reload implementation of the tether.Extension interface
-func (h *Haveged) Reload(config *tether.ExecutorConfig) error {
-	// haveged doesn't support reloading
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/main_linux.go b/installer/vendor/github.com/vmware/vic/cmd/tether/main_linux.go
deleted file mode 100644
index 22a7d44bcf..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/main_linux.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"os"
-	"os/signal"
-	"path"
-	"runtime/debug"
-	"strings"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/tether"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var tthr tether.Tether
-
-func init() {
-	// Initiliaze logger with default TextFormatter
-	log.SetFormatter(viclog.NewTextFormatter())
-
-	// use the same logger for trace and other logging
-	trace.Logger.Level = log.DebugLevel
-	log.SetLevel(log.DebugLevel)
-
-	// init and start the HUP handler
-	startSignalHandler()
-
-	pathPrefix = "/dev"
-}
-
-func main() {
-	if strings.HasSuffix(os.Args[0], "-debug") {
-		// very, very verbose
-		extraconfig.SetLogLevel(log.DebugLevel)
-	}
-
-	defer func() {
-		if r := recover(); r != nil {
-			log.Errorf("run time panic: %s : %s", r, debug.Stack())
-		}
-		halt()
-	}()
-
-	logFile, err := os.OpenFile(path.Join(pathPrefix, "ttyS1"), os.O_WRONLY|os.O_SYNC, 0)
-	if err != nil {
-		log.Errorf("Could not open serial port for debugging info. Some debug info may be lost! Error reported was %s", err)
-	}
-
-	if err = syscall.Dup3(int(logFile.Fd()), int(os.Stderr.Fd()), 0); err != nil {
-		log.Errorf("Could not pipe logfile to standard error due to error %s", err)
-	}
-
-	if _, err = os.Stderr.WriteString("all stderr redirected to debug log"); err != nil {
-		log.Errorf("Could not write to Stderr due to error %s", err)
-	}
-
-	// where to look for the various devices and files related to tether
-
-	// TODO: hard code executor initialization status reporting via guestinfo here
-	sshserver := NewAttachServerSSH()
-	src, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	sink, err := extraconfig.GuestInfoSink()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	// create the tether
-	tthr = tether.New(src, sink, &operations{})
-
-	// register the attach extension
-	tthr.Register("Attach", sshserver)
-
-	// register the toolbox extension
-	tthr.Register("Toolbox", tether.NewToolbox().InContainer())
-
-	// register the executor extension
-	tthr.Register("Haveged", NewHaveged())
-
-	err = tthr.Start()
-	if err != nil {
-		log.Error(err)
-		return
-	}
-
-	log.Info("Clean exit from tether")
-}
-
-// exit cleanly shuts down the system
-func halt() {
-	log.Infof("Powering off the system")
-	if strings.HasSuffix(os.Args[0], "-debug") {
-		log.Info("Squashing power off for debug tether")
-		return
-	}
-
-	syscall.Sync()
-	syscall.Reboot(syscall.LINUX_REBOOT_CMD_POWER_OFF)
-}
-
-func startSignalHandler() {
-	sigs := make(chan os.Signal, 1)
-	signal.Notify(sigs, syscall.SIGHUP)
-
-	go func() {
-		for s := range sigs {
-			switch s {
-			case syscall.SIGHUP:
-				log.Infof("Reloading tether configuration")
-				tthr.Reload()
-			default:
-				log.Infof("%s signal not defined", s.String())
-			}
-		}
-	}()
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/main_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/main_test.go
deleted file mode 100644
index 0255ecd122..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/main_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"syscall"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func init() {
-	trace.Logger.Level = log.DebugLevel
-}
-
-// createFakeDevices creates regular files or pipes in place of the char devices used
-// in a full VM
-func createFakeDevices() error {
-	var err error
-
-	// create control channel
-	path := fmt.Sprintf("%s/ttyS0", pathPrefix)
-	err = syscall.Mkfifo(path+"s", uint32(backchannelMode))
-	if err != nil {
-		detail := fmt.Sprintf("failed to create fifo pipe %ss for com0: %s", path, err)
-		return errors.New(detail)
-	}
-	err = syscall.Mkfifo(path+"c", uint32(backchannelMode))
-	if err != nil {
-		detail := fmt.Sprintf("failed to create fifo pipe %sc for com0: %s", path, err)
-		return errors.New(detail)
-	}
-	log.Debugf("created %s/ttyS0{c,s} as raw conn pipes", pathPrefix)
-
-	// others are non-interactive
-	for i := 1; i < 3; i++ {
-		path = fmt.Sprintf("%s/ttyS%d", pathPrefix, i)
-		_, err = os.Create(path)
-		if err != nil {
-			detail := fmt.Sprintf("failed to create %s for com%d: %s", path, i+1, err)
-			return errors.New(detail)
-		}
-		log.Debugf("created %s as persistent log destinations", path)
-	}
-
-	// make an access to urandom
-	path = fmt.Sprintf("%s/urandom", pathPrefix)
-	err = os.Symlink("/dev/urandom", path)
-	if err != nil {
-		detail := fmt.Sprintf("failed to create urandom access: %s", err)
-		return errors.New(detail)
-	}
-
-	return nil
-}
-
-func testSetup(t *testing.T) *Mocker {
-	var err error
-
-	pathPrefix, err = ioutil.TempDir("", path.Base(t.Name()))
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-
-	mocker := tetherTestSetup(t)
-
-	err = os.MkdirAll(pathPrefix, 0777)
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-	log.Infof("Using %s as test prefix", pathPrefix)
-
-	backchannelMode = os.ModeNamedPipe | os.ModePerm
-	err = createFakeDevices()
-	if err != nil {
-		fmt.Println(err)
-		t.Error(err)
-	}
-
-	ctx, cancel := context.WithCancel(context.Background())
-	// supply custom attach server so we can inspect its state
-	testServer := &testAttachServer{
-		updated: make(chan bool, 10),
-		attachServerSSH: attachServerSSH{
-			ctx:    ctx,
-			cancel: cancel,
-		},
-	}
-	server = testServer
-
-	return mocker
-}
-
-func testTeardown(t *testing.T, mocker *Mocker) {
-	tetherTestTeardown(t, mocker)
-}
-
-type mockery struct {
-	reloaded chan bool
-}
-
-func (m *mockery) Reload() {
-	m.reloaded <- true
-}
-
-func (m *mockery) Start() error {
-	return nil
-}
-
-func (m *mockery) Stop() error {
-	return nil
-}
-
-func (m *mockery) Register(name string, config tether.Extension) {
-}
-
-func (m *mockery) LaunchUtility(fn tether.UtilityFn) (<-chan int, error) {
-	return nil, nil
-}
-
-// Test reloading via signal helper
-func TestReload(t *testing.T) {
-	m := &mockery{make(chan bool)}
-	tthr = m
-
-	startSignalHandler()
-
-	if !assert.NoError(t, tether.ReloadConfig()) {
-		return
-	}
-
-	// check the started channel is closed (which gets closed on reconfig)
-	if !assert.True(t, <-m.reloaded) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages.go b/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages.go
deleted file mode 100644
index d0f11822d8..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package msgs
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// All of the messages passed over the ssh channel/global mux are (or will be)
-// defined here.
-
-type Message interface {
-	// Returns the message name
-	RequestType() string
-
-	// Marshalled version of the message
-	Marshal() []byte
-
-	// Unmarshal unpacks the message
-	Unmarshal([]byte) error
-}
-
-// WindowChangeMsg the RFC4254 struct
-const WindowChangeReq = "window-change"
-
-type WindowChangeMsg struct {
-	Columns  uint32
-	Rows     uint32
-	WidthPx  uint32
-	HeightPx uint32
-}
-
-func (wc *WindowChangeMsg) RequestType() string {
-	return WindowChangeReq
-}
-
-func (wc *WindowChangeMsg) Marshal() []byte {
-	return ssh.Marshal(*wc)
-}
-
-func (wc *WindowChangeMsg) Unmarshal(payload []byte) error {
-	return ssh.Unmarshal(payload, wc)
-}
-
-var (
-	Signals = map[ssh.Signal]int{
-		ssh.SIGABRT: 6,
-		ssh.SIGALRM: 14,
-		ssh.SIGFPE:  8,
-		ssh.SIGHUP:  1,
-		ssh.SIGILL:  4,
-		ssh.SIGINT:  2,
-		ssh.SIGKILL: 9,
-		ssh.SIGPIPE: 13,
-		ssh.SIGQUIT: 3,
-		ssh.SIGSEGV: 11,
-		ssh.SIGTERM: 15,
-		ssh.SIGUSR1: 10,
-		ssh.SIGUSR2: 12,
-	}
-)
-
-// PingMsg
-const PingReq = "ping"
-const PingMsg = "Ping"
-
-const UnblockReq = "unblock"
-const UnblockMsg = "Unblock"
-
-// VersionMsg
-const VersionReq = "version"
-
-type VersionMsg struct {
-	Version uint32
-}
-
-func (s *VersionMsg) RequestType() string {
-	return VersionReq
-}
-
-func (s *VersionMsg) Marshal() []byte {
-	return ssh.Marshal(*s)
-}
-
-func (s *VersionMsg) Unmarshal(payload []byte) error {
-	return ssh.Unmarshal(payload, s)
-}
-
-// SignalMsg
-const SignalReq = "signal"
-
-type SignalMsg struct {
-	Signal ssh.Signal
-}
-
-func (s *SignalMsg) RequestType() string {
-	return SignalReq
-}
-
-func (s *SignalMsg) Marshal() []byte {
-	return ssh.Marshal(*s)
-}
-
-func (s *SignalMsg) Unmarshal(payload []byte) error {
-	return ssh.Unmarshal(payload, s)
-}
-
-func (s *SignalMsg) Signum() int {
-	return Signals[s.Signal]
-}
-
-func (s *SignalMsg) FromString(name string) error {
-	num, err := strconv.Atoi(name)
-	if err == nil {
-		for sig, val := range Signals {
-			if num == val {
-				s.Signal = sig
-				return nil
-			}
-		}
-	}
-
-	name = strings.TrimPrefix(strings.ToUpper(name), "SIG")
-
-	s.Signal = ssh.Signal(name)
-	_, ok := Signals[s.Signal]
-	if !ok {
-		return fmt.Errorf("unsupported signal name: %q", name)
-	}
-
-	return nil
-}
-
-// CloseStdinMsg
-const CloseStdinReq = "close-stdin"
-
-// ContainersMsg
-const ContainersReq = "container-ids"
-
-type ContainersMsg struct {
-	IDs []string
-}
-
-func (s *ContainersMsg) RequestType() string {
-	return ContainersReq
-}
-
-func (s *ContainersMsg) Marshal() []byte {
-	return ssh.Marshal(*s)
-}
-
-func (s *ContainersMsg) Unmarshal(payload []byte) error {
-	return ssh.Unmarshal(payload, s)
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages_test.go
deleted file mode 100644
index dd16ebaf23..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/msgs/messages_test.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package msgs
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/migration/feature"
-)
-
-func TestWindowChange(t *testing.T) {
-	s := &WindowChangeMsg{1, 2, 3, 4}
-
-	assert.Equal(t, s.RequestType(), WindowChangeReq)
-
-	tmp := s.Marshal()
-	out := &WindowChangeMsg{}
-	out.Unmarshal(tmp)
-
-	assert.Equal(t, s, out)
-}
-
-func TestSignal(t *testing.T) {
-	s := &SignalMsg{"HUP"}
-
-	assert.Equal(t, s.RequestType(), SignalReq)
-
-	tmp := s.Marshal()
-	out := &SignalMsg{}
-	out.Unmarshal(tmp)
-
-	assert.Equal(t, s, out)
-
-	for _, name := range []string{"SIGQUIT", "QUIT", "quit", "3"} {
-		err := out.FromString(name)
-		if err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	for _, name := range []string{"SIGNOPE", "nope", "0", "-1"} {
-		err := out.FromString(name)
-		if err == nil {
-			t.Errorf("expected error parsing %q", name)
-		}
-	}
-}
-
-func TestContainers(t *testing.T) {
-	s := &ContainersMsg{IDs: []string{"foo", "bar", "baz"}}
-
-	assert.Equal(t, s.RequestType(), ContainersReq)
-
-	tmp := s.Marshal()
-	out := &ContainersMsg{}
-	out.Unmarshal(tmp)
-
-	assert.Equal(t, s, out)
-}
-
-func TestVersion(t *testing.T) {
-	s := &VersionMsg{Version: feature.MaxPluginVersion - 1}
-
-	assert.Equal(t, s.RequestType(), VersionReq)
-
-	tmp := s.Marshal()
-	out := &VersionMsg{}
-	out.Unmarshal(tmp)
-
-	assert.Equal(t, s, out)
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/net_linux_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/net_linux_test.go
deleted file mode 100644
index 1cf4356aa4..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/net_linux_test.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package main
-
-import (
-	"fmt"
-	"strconv"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-// addInterface utility method to add an interface to Mocked
-// This assigns the interface name and returns the "slot" as a string
-func addInterface(name string, mocker *Mocker) string {
-	mocker.maxSlot++
-
-	mocker.Interfaces[name] = &Interface{
-		LinkAttrs: netlink.LinkAttrs{
-			Name:  name,
-			Index: mocker.maxSlot,
-		},
-		Up: true,
-	}
-
-	return strconv.Itoa(mocker.maxSlot)
-}
-
-func TestOutboundRuleAndCmd(t *testing.T) {
-	t.Skip("https://github.com/vmware/vic/issues/5965")
-
-	mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	bridge := addInterface("eth1", mocker)
-
-	ip, _ := netlink.ParseIPNet("172.16.0.2/24")
-	gwIP, _ := netlink.ParseIPNet("172.16.0.1/24")
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "outboundrule",
-			Name: "tether_test_executor",
-		},
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 3,
-		},
-		Networks: map[string]*executor.NetworkEndpoint{
-			"bridge": {
-				Common: executor.Common{
-					ID: bridge,
-					// interface rename
-					Name: "bridge",
-				},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "bridge",
-					},
-					Default: true,
-					Gateway: *gwIP,
-				},
-				Static: true,
-				IP:     ip,
-			},
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"outboundrule": {
-				Common: executor.Common{
-					ID:   "outboundrule",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "./date",
-					Args: []string{"./date", "--reference=/"},
-					Env:  []string{"PATH="},
-					Dir:  "/bin",
-				},
-			},
-		},
-	}
-
-	_, src, _ := StartTether(t, &cfg, mocker)
-
-	fmt.Println("Waiting for tether start")
-	<-mocker.Started
-
-	// wait for tether to exit
-	fmt.Println("Waiting for tether exit")
-	<-mocker.Cleaned
-
-	result := tether.ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	// confirm outbound rules configured
-	// this should modify state depending on prior rule state
-
-	// confirm command ran - necessary to detect early exit due to net config error
-	// TODO: this should be modifed to fail if the last rule to be configured hasn't completed with expected output
-	// when this is run. Pending mocked iptables interface
-	assert.Equal(t, "true", result.Sessions["outboundrule"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["outboundrule"].ExitStatus, "Expected command to have exited cleanly")
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/ops.go b/installer/vendor/github.com/vmware/vic/cmd/tether/ops.go
deleted file mode 100644
index 5b03c4c8dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/ops.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import "github.com/vmware/vic/lib/tether"
-
-// pathPrefix is present to allow the various files referenced by tether to be placed
-// in specific directories, primarily for testing.
-var pathPrefix string
-
-func (t *operations) Cleanup() error {
-	return t.BaseOperations.Cleanup()
-}
-
-func (t *operations) Apply(endpoint *tether.NetworkEndpoint) error {
-	return t.BaseOperations.Apply(endpoint)
-}
-
-// HandleSessionExit controls the behaviour on session exit - for the tether if the session exiting
-// is the primary session (i.e. SessionID matches ExecutorID) then we exit everything.
-func (t *operations) HandleSessionExit(config *tether.ExecutorConfig, session *tether.SessionConfig) func() {
-	// if the session that's exiting is the primary session, stop the tether
-	return func() {
-		if session.ID == config.ID {
-			tthr.Stop()
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux.go b/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux.go
deleted file mode 100644
index 82ee3f491f..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux.go
+++ /dev/null
@@ -1,490 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"math"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/crypto/ssh/terminal"
-	"golang.org/x/sys/unix"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/iolog"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/lib/tether/netfilter"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	runMountPoint = "/run"
-
-	// default values to set for ulimit fields
-	defaultNOFILE = 1024 * 1024
-	defaultULimit = math.MaxUint64
-)
-
-type operations struct {
-	tether.BaseOperations
-
-	logging bool
-}
-
-func (t *operations) Log() (io.Writer, error) {
-	defer trace.End(trace.Begin("operations.Log"))
-
-	// redirect logging to the serial log
-	log.Infof("opening %s/ttyS1 for debug log", pathPrefix)
-	f, err := os.OpenFile(path.Join(pathPrefix, "ttyS1"), os.O_RDWR|os.O_SYNC|syscall.O_NOCTTY, 0)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open serial port for debug log: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	if err := setTerminalSpeed(f.Fd()); err != nil {
-		log.Errorf("Setting terminal speed failed with %s", err)
-	}
-
-	// enable raw mode
-	_, err = terminal.MakeRaw(int(f.Fd()))
-	if err != nil {
-		detail := fmt.Sprintf("Making ttyS1 raw failed with %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	return io.MultiWriter(f, os.Stdout), nil
-}
-
-// sessionLogWriter returns a writer that will persist the session output
-func (t *operations) SessionLog(session *tether.SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error) {
-	defer trace.End(trace.Begin("configure session log writer"))
-
-	if t.logging {
-		detail := "unable to log more than one session concurrently to persistent logging"
-		log.Warn(detail)
-		// use multi-writer so it's still viable for attach
-		return dio.MultiWriter(), dio.MultiWriter(), nil
-	}
-
-	t.logging = true
-
-	// open SttyS2 for session logging
-	log.Info("opening ttyS2 for session logging")
-	f, err := os.OpenFile(path.Join(pathPrefix, "ttyS2"), os.O_RDWR|os.O_SYNC|syscall.O_NOCTTY, 0)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open serial port for session log: %s", err)
-		log.Error(detail)
-		return nil, nil, errors.New(detail)
-	}
-
-	if err := setTerminalSpeed(f.Fd()); err != nil {
-		log.Errorf("Setting terminal speed failed with %s", err)
-	}
-
-	// enable raw mode
-	_, err = terminal.MakeRaw(int(f.Fd()))
-	if err != nil {
-		detail := fmt.Sprintf("Making ttyS2 raw failed with %s", err)
-		log.Error(detail)
-		return nil, nil, errors.New(detail)
-	}
-
-	// wrap output in a LogWriter to serialize it into our persisted
-	// containerVM output format, using iolog.LogClock for timestamps
-	lw := iolog.NewLogWriter(f, iolog.LogClock{})
-
-	// use multi-writer so it goes to both screen and session log
-	return dio.MultiWriter(lw, os.Stdout), dio.MultiWriter(lw, os.Stderr), nil
-}
-
-func (t *operations) Setup(sink tether.Config) error {
-	if err := t.BaseOperations.Setup(sink); err != nil {
-		return err
-	}
-
-	// unmount /run - https://github.com/vmware/vic/issues/1643
-	if err := tether.Sys.Syscall.Unmount(runMountPoint, syscall.MNT_DETACH); err != nil {
-		if errno, ok := err.(syscall.Errno); !ok || errno != syscall.EINVAL {
-			return err
-		}
-	}
-
-	// NOTE: ulimit default values should change when we support ulimit configuration
-	ApplyDefaultULimit()
-
-	return nil
-}
-
-// ApplyDefaultULimit sets ulimit fields to their defined default value
-func ApplyDefaultULimit() {
-	var rLimit syscall.Rlimit
-
-	// NOFILE does not support defaultULimit as a value due to kernel restriction on number of open files
-	rLimit.Max = defaultNOFILE
-	rLimit.Cur = rLimit.Max
-	if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &rLimit); err != nil {
-		log.Errorf("Cannot set ulimit for nofile: %s", err.Error())
-	}
-
-	rLimit.Max = defaultULimit
-	rLimit.Cur = rLimit.Max
-	if err := syscall.Setrlimit(syscall.RLIMIT_STACK, &rLimit); err != nil {
-		log.Errorf("Cannot set ulimit for stack: %s ", err.Error())
-	}
-
-	if err := syscall.Setrlimit(syscall.RLIMIT_CORE, &rLimit); err != nil {
-		log.Errorf("Cannot set ulimit for core blocks: %s", err.Error())
-	}
-
-	if err := syscall.Setrlimit(unix.RLIMIT_MEMLOCK, &rLimit); err != nil {
-		log.Errorf("Cannot set ulimit for memlock: %s", err.Error())
-	}
-
-	if err := syscall.Setrlimit(unix.RLIMIT_NPROC, &rLimit); err != nil {
-		log.Errorf("Cannot set ulimit for nproc: %s", err.Error())
-	}
-}
-
-// invoke will invoke the closure returned from the tether netfilter prep and
-// block until complete. It handles both potential preparation errors and invocation
-// errors.
-// the 'task' specified is used to construct error messages with the specific operation
-// embedded
-func invoke(t *tether.BaseOperations, fn tether.UtilityFn, task string) error {
-	exitChan, err := t.LaunchUtility(fn)
-	if err != nil {
-		return fmt.Errorf("%s failed: %s", task, err)
-	}
-
-	exitCode := <-exitChan
-	if exitCode != 0 {
-		return fmt.Errorf("%s returned non-zero: %d", task, exitCode)
-	}
-
-	return nil
-}
-
-// SetupFirewall sets up firewall rules on the external scope only.  Any
-// portmaps are honored as are port exposes.
-func (t *operations) SetupFirewall(ctx context.Context, config *tether.ExecutorConfig) error {
-	return setupFirewall(ctx, &t.BaseOperations, config)
-}
-
-// setupFirewall is broken out from SetupFirewall so that it can be referenced from the test code
-func setupFirewall(ctx context.Context, t *tether.BaseOperations, config *tether.ExecutorConfig) error {
-	fn := netfilter.Flush(ctx, "VIC")
-	if err := invoke(t, fn, "flush"); err != nil {
-		return err
-	}
-
-	for _, endpoint := range config.Networks {
-		switch endpoint.Network.Type {
-		case constants.ExternalScopeType:
-			id, err := strconv.Atoi(endpoint.ID)
-			if err != nil {
-				log.Errorf("can't apply port rules: %s", err.Error())
-				continue
-			}
-
-			iface, err := t.LinkBySlot(int32(id))
-			if err != nil {
-				log.Errorf("can't apply rules: %s", err.Error())
-				continue
-			}
-
-			ifaceName := iface.Attrs().Name
-			log.Debugf("slot %d -> %s", endpoint.ID, ifaceName)
-
-			// ensure that we can pass DHCP traffic if it's necessary
-			if endpoint.Network.TrustLevel != executor.Open && endpoint.IsDynamic() {
-				allowDHCPTraffic(ctx, t, ifaceName)
-			}
-
-			switch endpoint.Network.TrustLevel {
-			case executor.Open:
-				// Configure port redirect in Open deployment
-				if err := setupPorts(ctx, t, endpoint, ifaceName, true); err != nil {
-					return err
-				}
-
-				// Accept all incoming and outgoing traffic
-				for _, chain := range []netfilter.Chain{netfilter.Input, netfilter.Output, netfilter.Forward} {
-					fn := (&netfilter.Rule{
-						Chain:     chain,
-						Target:    netfilter.Accept,
-						Interface: ifaceName,
-					}).Commit(ctx)
-					if err := invoke(t, fn, "accept all"); err != nil {
-						return err
-					}
-				}
-
-			case executor.Closed:
-				// Reject all incoming and outgoing traffic
-				// Since our default policy is to drop traffic, nothing is needed here.
-
-			case executor.Outbound:
-				// Reject all incoming traffic, but allow outgoing
-				if err := setupOutboundFirewall(ctx, t, ifaceName); err != nil {
-					return err
-				}
-
-			case executor.Peers:
-				// Outbound + all ports open to source addresses in --container-network-ip-range
-				if err := setupOutboundFirewall(ctx, t, ifaceName); err != nil {
-					return err
-				}
-
-				// Configure port redirect in Peer deployment
-				if err := setupPorts(ctx, t, endpoint, ifaceName, true); err != nil {
-					return err
-				}
-
-				sourceAddresses := make([]string, len(endpoint.Network.Pools))
-				for i, v := range endpoint.Network.Pools {
-					sourceAddresses[i] = v.String()
-				}
-				fn := (&netfilter.Rule{
-					Chain:           netfilter.Input,
-					Target:          netfilter.Accept,
-					SourceAddresses: sourceAddresses,
-					Interface:       ifaceName,
-				}).Commit(ctx)
-				if err := invoke(t, fn, "allow outbound and peers"); err != nil {
-					return err
-				}
-
-				if err := allowPingTraffic(ctx, t, ifaceName, sourceAddresses); err != nil {
-					return err
-				}
-
-			default:
-				// covers executor.Published and executor.Unspecified as well as invalid values
-				log.Infof("Applying published rules for configuration %v", endpoint.Network.TrustLevel)
-
-				if err := setupOutboundFirewall(ctx, t, ifaceName); err != nil {
-					return err
-				}
-
-				if err := allowPingTraffic(ctx, t, ifaceName, nil); err != nil {
-					return err
-				}
-
-				if err := setupPorts(ctx, t, endpoint, ifaceName, false); err != nil {
-					return err
-				}
-			}
-		case constants.BridgeScopeType:
-			id, err := strconv.Atoi(endpoint.ID)
-			if err != nil {
-				log.Errorf("can't apply port rules: %s", err.Error())
-				continue
-			}
-
-			iface, err := t.LinkBySlot(int32(id))
-			if err != nil {
-				log.Errorf("can't apply rules: %s", err.Error())
-				continue
-			}
-
-			ifaceName := iface.Attrs().Name
-			log.Debugf("slot %d -> %s", endpoint.ID, ifaceName)
-
-			// Traffic over container bridge network should be peers+outbound.
-			if err := setupOutboundFirewall(ctx, t, ifaceName); err != nil {
-				return err
-			}
-			sourceAddresses := make([]string, len(endpoint.Network.Pools))
-
-			for i, v := range endpoint.Network.Pools {
-				sourceAddresses[i] = v.String()
-			}
-			fn := (&netfilter.Rule{
-				Chain:           netfilter.Input,
-				Target:          netfilter.Accept,
-				SourceAddresses: sourceAddresses,
-				Interface:       ifaceName,
-			}).Commit(ctx)
-			if err := invoke(t, fn, "configure for bridge scope"); err != nil {
-				return err
-			}
-		}
-	}
-
-	return invoke(t, netfilter.Return(ctx, "VIC"), "return from VIC chain")
-}
-
-func setupOutboundFirewall(ctx context.Context, t *tether.BaseOperations, ifaceName string) error {
-	// All already established inputs are accepted
-	fn := (&netfilter.Rule{
-		Chain:     netfilter.Input,
-		States:    []netfilter.State{netfilter.Established, netfilter.Related},
-		Target:    netfilter.Accept,
-		Interface: ifaceName,
-	}).Commit(ctx)
-	if err := invoke(t, fn, "permit established inbound"); err != nil {
-		return err
-	}
-
-	// All output is accepted
-	fn = (&netfilter.Rule{
-		Chain:     netfilter.Output,
-		Target:    netfilter.Accept,
-		Interface: ifaceName,
-	}).Commit(ctx)
-	return invoke(t, fn, "permit all outbound")
-}
-
-func setupPorts(ctx context.Context, t *tether.BaseOperations, endpoint *tether.NetworkEndpoint, ifaceName string, redirectOnly bool) error {
-	// handle the ports
-	for _, p := range endpoint.Ports {
-		// parse the port maps
-		rules, err := portToRule(p, redirectOnly)
-		if err != nil {
-			log.Errorf("can't apply port rule (%s): %s", p, err.Error())
-			continue
-		}
-
-		log.Infof("Applying %d rules for port %s", len(rules), p)
-		for _, r := range rules {
-			r.Interface = ifaceName
-			fn := r.Commit(ctx)
-			if err := invoke(t, fn, "allow incoming on published port"); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func allowPingTraffic(ctx context.Context, t *tether.BaseOperations, ifaceName string, sourceAddresses []string) error {
-	fn := (&netfilter.Rule{
-		Chain:           netfilter.Input,
-		Target:          netfilter.Accept,
-		Interface:       ifaceName,
-		Protocol:        netfilter.ICMP,
-		ICMPType:        netfilter.EchoRequest,
-		SourceAddresses: sourceAddresses,
-	}).Commit(ctx)
-	if err := invoke(t, fn, "allow ping inbound"); err != nil {
-		return err
-	}
-
-	fn = (&netfilter.Rule{
-		Chain:           netfilter.Output,
-		Target:          netfilter.Accept,
-		Interface:       ifaceName,
-		Protocol:        netfilter.ICMP,
-		ICMPType:        netfilter.EchoReply,
-		SourceAddresses: sourceAddresses,
-	}).Commit(ctx)
-	return invoke(t, fn, "allow ping outbound")
-}
-
-func allowDHCPTraffic(ctx context.Context, t *tether.BaseOperations, ifaceName string) error {
-	fn := (&netfilter.Rule{
-		Chain:     netfilter.Input,
-		Target:    netfilter.Accept,
-		Interface: ifaceName,
-		Protocol:  netfilter.UDP,
-		FromPort:  "67:68",
-		SrcPort:   "67:68",
-	}).Commit(ctx)
-	if err := invoke(t, fn, "allow dhcp inbound"); err != nil {
-		return err
-	}
-
-	fn = (&netfilter.Rule{
-		Chain:     netfilter.Output,
-		Target:    netfilter.Accept,
-		Interface: ifaceName,
-		Protocol:  netfilter.UDP,
-		FromPort:  "67:68",
-		SrcPort:   "67:68",
-	}).Commit(ctx)
-	return invoke(t, fn, "allow dhcp outbound")
-}
-
-func portToRule(p string, redirectOnly bool) ([]*netfilter.Rule, error) {
-	// 9999/tcp
-	s := strings.Split(p, "/")
-	if len(s) != 2 {
-		return nil, errors.New("can't parse port spec: " + p)
-	}
-
-	proto := netfilter.Protocol(s[1])
-	switch proto {
-	case netfilter.UDP:
-	case netfilter.TCP:
-	default:
-		return nil, errors.New("unknown protocol")
-	}
-
-	mapping := strings.Split(s[0], ":")
-	directPort := mapping[len(mapping)-1]
-
-	// publish the actual port directly
-	var rules []*netfilter.Rule
-	expose := &netfilter.Rule{
-		Chain:     netfilter.Input,
-		Interface: "external",
-		Target:    netfilter.Accept,
-		Protocol:  proto,
-		// ranges are specified using a hyphen in docker
-		FromPort: strings.Replace(directPort, "-", ":", -1),
-	}
-
-	if !redirectOnly {
-		rules = append(rules, expose)
-	}
-
-	// if there's no redirection we're done
-	if len(mapping) == 1 || mapping[0] == mapping[1] {
-		return rules, nil
-	}
-
-	// redirect port
-	// https://wiki.debian.org/Firewalls-local-port-redirection contains a useful reference
-
-	if strings.Contains(s[0], "-") {
-		return nil, errors.New("cannot port forward a range")
-	}
-
-	rules = append(rules, &netfilter.Rule{
-		Table:     netfilter.Nat,
-		Chain:     netfilter.Prerouting,
-		Interface: "external",
-		Target:    netfilter.Redirect,
-		Protocol:  proto,
-		FromPort:  mapping[0],
-		ToPort:    mapping[1],
-	})
-
-	return rules, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux_test.go
deleted file mode 100644
index cc7eea3830..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/ops_linux_test.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"syscall"
-
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// This has been copied from lib/tether/ but should be split into a common base package that is
-// dedicated to mocking these operations. We cannot reference lib/tether/*_test elements from
-// outside that package.
-type Interface struct {
-	netlink.LinkAttrs
-	Up    bool
-	Addrs []netlink.Addr
-}
-
-func (t *Interface) Attrs() *netlink.LinkAttrs {
-	return &t.LinkAttrs
-}
-
-func (t *Interface) Type() string {
-	return "mocked"
-}
-
-func (t *Mocker) LinkByName(name string) (netlink.Link, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("Getting link by name %s", name)))
-
-	return t.Interfaces[name], nil
-}
-
-func (t *Mocker) LinkSetName(link netlink.Link, name string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Renaming %s to %s", link.Attrs().Name, name)))
-
-	iface := link.(*Interface)
-	_, ok := t.Interfaces[name]
-	if ok {
-		return fmt.Errorf("Interface with name %s already exists", name)
-	}
-
-	oldName := iface.Name
-	iface.Name = name
-	// make sure there's no period where the interface isn't "present"
-	t.Interfaces[name] = iface
-	delete(t.Interfaces, oldName)
-
-	return nil
-}
-
-func (t *Mocker) LinkSetDown(link netlink.Link) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Bringing %s down", link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Up = false
-	// TODO: should this drop addresses?
-	return nil
-}
-
-func (t *Mocker) LinkSetUp(link netlink.Link) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Bringing %s up", link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Up = true
-	return nil
-}
-
-func (t *Mocker) LinkSetAlias(link netlink.Link, alias string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Adding alias %s to %s", alias, link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Alias = alias
-	return nil
-}
-
-func (t *Mocker) AddrList(link netlink.Link, family int) ([]netlink.Addr, error) {
-	defer trace.End(trace.Begin(""))
-
-	iface := link.(*Interface)
-	return iface.Addrs, nil
-}
-
-func (t *Mocker) AddrAdd(link netlink.Link, addr *netlink.Addr) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Adding %s to %s", addr.String(), link.Attrs().Name)))
-
-	iface := link.(*Interface)
-
-	for _, adr := range iface.Addrs {
-		if addr.IP.String() == adr.IP.String() {
-			return syscall.EEXIST
-		}
-	}
-
-	iface.Addrs = append(iface.Addrs, *addr)
-	return nil
-}
-
-func (t *Mocker) AddrDel(link netlink.Link, addr *netlink.Addr) error {
-	iface := link.(*Interface)
-
-	for i, adr := range iface.Addrs {
-		if addr.IP.String() == adr.IP.String() {
-			iface.Addrs = append(iface.Addrs[:i], iface.Addrs[i+1:]...)
-			return nil
-		}
-	}
-
-	return syscall.EADDRNOTAVAIL
-}
-
-func (t *Mocker) RouteAdd(route *netlink.Route) error {
-	defer trace.End(trace.Begin("no implemented"))
-
-	// currently ignored
-	return nil
-}
-
-func (t *Mocker) RouteDel(route *netlink.Route) error {
-	defer trace.End(trace.Begin("no implemented"))
-
-	// currently ignored
-	return nil
-}
-
-func (t *Mocker) RuleList(int) ([]netlink.Rule, error) {
-	defer trace.End(trace.Begin("not implemented"))
-
-	return nil, nil
-}
-
-func (t *Mocker) LinkBySlot(slot int32) (netlink.Link, error) {
-	defer trace.End(trace.Begin(""))
-
-	id := int(slot)
-	for _, intf := range t.Interfaces {
-		if intf.Attrs().Index == id {
-			return intf, nil
-		}
-	}
-
-	return nil, errors.New("no such interface")
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/tether/tether_test.go b/installer/vendor/github.com/vmware/vic/cmd/tether/tether_test.go
deleted file mode 100644
index 73d2b7ddbd..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/tether/tether_test.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/url"
-	"os"
-	"path"
-	"sync"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/vishvananda/netlink"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/system"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-// Copied from lib/tether
-// because there's no easy way to use test code from other packages and a separate
-// package causes cyclic dependencies.
-// Some modifications to deal with the change of package and attach usage
-
-var Mocked Mocker
-
-type Mocker struct {
-	Base tether.BaseOperations
-
-	// allow tests to tell when the tether has finished setup
-	Started chan bool
-	// allow tests to tell when the tether has finished
-	Cleaned chan bool
-
-	// debug output gets logged here
-	LogBuffer bytes.Buffer
-
-	// session output gets logged here
-	SessionLogBuffer bytes.Buffer
-
-	// track the number of interfaces for a run
-	maxSlot int
-	// the interfaces in the system indexed by name
-	Interfaces map[string]netlink.Link
-
-	// the hostname of the system
-	Hostname string
-	// the ip configuration for name index networks
-	IPs map[string]net.IP
-	// filesystem mounts, indexed by disk label
-	Mounts map[string]string
-
-	WindowCol uint32
-	WindowRow uint32
-	Signal    ssh.Signal
-
-	once sync.Once
-}
-
-// Start implements the extension method
-func (t *Mocker) Start() error {
-	return nil
-}
-
-// Stop implements the extension method
-func (t *Mocker) Stop() error {
-	return nil
-}
-
-// Reload implements the extension method
-func (t *Mocker) Reload(config *tether.ExecutorConfig) error {
-	t.once.Do(func() {
-		// the tether has definitely finished it's startup by the time we hit this
-		close(t.Started)
-	})
-	return nil
-}
-
-func (t *Mocker) Setup(config tether.Config) error {
-	return t.Base.Setup(config)
-}
-
-func (t *Mocker) Cleanup() error {
-	err := t.Base.Cleanup()
-	close(t.Cleaned)
-
-	return err
-}
-
-func (t *Mocker) Log() (io.Writer, error) {
-	return os.Stdout, nil
-}
-
-func (t *Mocker) SessionLog(session *tether.SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error) {
-	return dio.MultiWriter(&t.SessionLogBuffer), dio.MultiWriter(&t.SessionLogBuffer), nil
-}
-
-func (t *Mocker) HandleSessionExit(config *tether.ExecutorConfig, session *tether.SessionConfig) func() {
-	// check for executor behaviour
-	return func() {
-		if session.ID == config.ID {
-			tthr.Stop()
-		}
-	}
-}
-
-func (t *Mocker) ProcessEnv(env []string) []string {
-	return t.Base.ProcessEnv(env)
-}
-
-// SetHostname sets both the kernel hostname and /etc/hostname to the specified string
-func (t *Mocker) SetHostname(hostname string, aliases ...string) error {
-	defer trace.End(trace.Begin("mocking hostname to " + hostname))
-
-	// TODO: we could mock at a much finer granularity, only extracting the syscall
-	// that would exercise the file modification paths, however it's much less generalizable
-	t.Hostname = hostname
-	return nil
-}
-
-func (t *Mocker) SetupFirewall(ctx context.Context, config *tether.ExecutorConfig) error {
-	err := setupFirewall(ctx, &t.Base, config)
-	// NOTE: we squash errors from here for now because it's almost certain to fail
-	// in absence of a mock for the iptables update
-	if err != nil {
-		log.Error(err)
-	}
-
-	return nil
-}
-
-// Apply takes the network endpoint configuration and applies it to the system
-func (t *Mocker) Apply(endpoint *tether.NetworkEndpoint) error {
-	return tether.ApplyEndpoint(t, &t.Base, endpoint)
-}
-
-// MountLabel performs a mount with the source treated as a disk label
-// This assumes that /dev/disk/by-label is being populated, probably by udev
-func (t *Mocker) MountLabel(ctx context.Context, label, target string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", label, target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[label] = target
-	return nil
-}
-
-// MountTarget performs a mount with the source treated as an nfs target
-func (t *Mocker) MountTarget(ctx context.Context, source url.URL, target string, mountOptions string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", source.String(), target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[source.String()] = target
-	return nil
-}
-
-// CopyExistingContent copies the underlying files shadowed by a mount on a directory
-// to the volume mounted on the directory
-func (t *Mocker) CopyExistingContent(source string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking copyExistingContent from %s", source)))
-	return nil
-}
-
-// Fork triggers vmfork and handles the necessary pre/post OS level operations
-func (t *Mocker) Fork() error {
-	return errors.New("Fork test not implemented")
-}
-
-// LaunchUtility uses the underlying implementation for launching and tracking utility processes
-func (t *Mocker) LaunchUtility(fn tether.UtilityFn) (<-chan int, error) {
-	return t.Base.LaunchUtility(fn)
-}
-
-func (t *Mocker) HandleUtilityExit(pid, exitCode int) bool {
-	return t.Base.HandleUtilityExit(pid, exitCode)
-}
-
-// TestMain simply so we have control of debugging level and somewhere to call package wide test setup
-func TestMain(m *testing.M) {
-	log.SetLevel(log.DebugLevel)
-
-	retCode := m.Run()
-
-	// call with result of m.Run()
-	os.Exit(retCode)
-}
-
-func StartTether(t *testing.T, cfg *executor.ExecutorConfig, mocker *Mocker) (tether.Tether, extraconfig.DataSource, extraconfig.DataSink) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	tthr = tether.New(src, sink, mocker)
-	tthr.Register("mocker", mocker)
-
-	// run the tether to service the attach
-	go func() {
-		erR := tthr.Start()
-		if erR != nil {
-			t.Error(erR)
-		}
-	}()
-
-	return tthr, src, sink
-}
-
-func StartAttachTether(t *testing.T, cfg *executor.ExecutorConfig, mocker *Mocker) (tether.Tether, extraconfig.DataSource, net.Conn) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	tthr = tether.New(src, sink, mocker)
-	tthr.Register("mocker", mocker)
-	tthr.Register("Attach", server)
-
-	// run the tether to service the attach
-	go func() {
-		erR := tthr.Start()
-		if erR != nil {
-			t.Error(erR)
-		}
-	}()
-
-	// create client on the mock pipe
-	conn, err := mockBackChannel(context.Background())
-	if err != nil && (err != io.EOF || server.(*testAttachServer).enabled) {
-		// we accept the case where the error is end-of-file and the attach server is disabled because that's
-		// expected when the tether is shut down.
-		t.Error(err)
-	}
-
-	return tthr, src, conn
-}
-
-func tetherTestSetup(t *testing.T) *Mocker {
-	log.Infof("Started test setup for %s", t.Name())
-
-	// use the mock ops - fresh one each time as tests might apply different mocked calls
-	mocker := Mocker{
-		Started:    make(chan bool),
-		Cleaned:    make(chan bool),
-		Interfaces: make(map[string]netlink.Link, 0),
-	}
-
-	// replace the Sys variable with a mock
-	tether.Sys = system.NewWithRoot(pathPrefix)
-	tether.Sys.Syscall = &tether.MockSyscall{}
-
-	tether.BindSys = system.NewWithRoot(path.Join(pathPrefix, "/.tether"))
-	tether.BindSys.Syscall = &tether.MockSyscall{}
-
-	// ensure that the sys and bindsys root exists
-	// #nosec
-	os.MkdirAll(tether.Sys.Root, 0700)
-	// #nosec
-	os.MkdirAll(tether.BindSys.Root, 0700)
-
-	return &mocker
-}
-
-func tetherTestTeardown(t *testing.T, mocker *Mocker) {
-	<-mocker.Cleaned
-
-	// cleanup
-	os.RemoveAll(pathPrefix)
-	log.SetOutput(os.Stdout)
-
-	log.Infof("Finished test teardown for %s", t.Name())
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-dns/main.go b/installer/vendor/github.com/vmware/vic/cmd/vic-dns/main.go
deleted file mode 100644
index 99f8c3620b..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-dns/main.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"os/signal"
-	"runtime/debug"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/dns"
-	vlog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/version"
-)
-
-var (
-	options = dns.ServerOptions{}
-)
-
-func init() {
-	flag.StringVar(&options.IP, "ip", dns.DefaultIP, "IP to use")
-	flag.IntVar(&options.Port, "port", dns.DefaultPort, "Port to bind")
-	flag.StringVar(&options.Interface, "interface", "", "Interface to bind")
-
-	flag.Var(&options.Nameservers, "nameservers", "Nameservers to use")
-
-	flag.DurationVar(&options.Timeout, "timeout", dns.DefaultTimeout, "Timeout for external DNS queries")
-
-	flag.DurationVar(&options.TTL, "ttl", dns.DefaultTTL, "TTL")
-	flag.IntVar(&options.CacheSize, "cachesize", dns.DefaultCacheSize, "Cache size to use")
-
-	flag.BoolVar(&options.Debug, "debug", false, "Enable debugging")
-
-	flag.Parse()
-}
-
-func main() {
-	defer func() {
-		if r := recover(); r != nil {
-			fmt.Fprintf(os.Stderr, fmt.Sprintf("%s : %s", r, debug.Stack()))
-		}
-	}()
-
-	if version.Show() {
-		// #nosec: Errors unhandled.
-		fmt.Fprintf(os.Stdout, "%s\n", version.String())
-		return
-	}
-
-	// Initiliaze logger with default TextFormatter
-	log.SetFormatter(vlog.NewTextFormatter())
-
-	// Set the log level
-	if options.Debug {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	server := dns.NewServer(options)
-	if server != nil {
-		server.Start()
-	}
-
-	// handle the signals and gracefully shutdown the server
-	sig := make(chan os.Signal, 1)
-	signal.Notify(sig, syscall.SIGINT, syscall.SIGTERM)
-
-	go func() {
-		log.Warnf("signal %s received", <-sig)
-		server.Stop()
-	}()
-
-	server.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/config.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/config.go
deleted file mode 100644
index 7dd08b7958..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/config.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import "github.com/vmware/vic/lib/config/executor"
-
-type ExecutorConfig struct {
-	// Diagnostics holds basic diagnostics data
-	Diagnostics Diagnostics `vic:"0.1" scope:"read-only" key:"diagnostics"`
-}
-
-type Diagnostics struct {
-	// Should debugging be enabled on whatever component this is and at what level
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"debug"`
-	// SyslogConfig holds configuration for connecting to a syslog
-	// server
-	SysLogConfig *executor.SysLogConfig `vic:"0.1" scope:"read-only" key:"syslog"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_linux.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_linux.go
deleted file mode 100644
index 3c92470306..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_linux.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"os"
-	"runtime/debug"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/govmomi/toolbox"
-	"github.com/vmware/vic/lib/tether"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/log/syslog"
-	"github.com/vmware/vic/pkg/logmgr"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var (
-	tthr       tether.Tether
-	config     ExecutorConfig
-	debugLevel int
-)
-
-func main() {
-	defer func() {
-		if r := recover(); r != nil {
-			log.Errorf("run time panic: %s : %s", r, debug.Stack())
-		}
-
-		reboot()
-	}()
-
-	// ensure that panics and error output are persisted
-	logFile, err := os.OpenFile("/dev/ttyS0", os.O_WRONLY|os.O_SYNC, 0)
-	if err != nil {
-		log.Errorf("Could not redirect outputs to serial for debugging info, some debug info may be lost! Error reported was %s", err)
-	}
-
-	err = syscall.Dup3(int(logFile.Fd()), int(os.Stderr.Fd()), 0)
-	if err != nil {
-		log.Errorf("Could not pipe standard error to logfile: %s", err)
-	}
-	_, err = os.Stderr.WriteString("all stderr redirected to debug log")
-	if err != nil {
-		log.Errorf("Could not write to Stderr due to error %s", err)
-	}
-
-	err = syscall.Dup3(int(logFile.Fd()), int(os.Stdout.Fd()), 0)
-	if err != nil {
-		log.Errorf("Could not pipe standard out to logfile: %s", err)
-	}
-	_, err = os.Stderr.WriteString("all stdout redirected to debug log")
-	if err != nil {
-		log.Errorf("Could not write to stdout due to error %s", err)
-	}
-
-	src, err := extraconfig.GuestInfoSourceWithPrefix("init")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	extraconfig.Decode(src, &config)
-	debugLevel = config.Diagnostics.DebugLevel
-
-	logcfg := viclog.NewLoggingConfig()
-	if debugLevel > 0 {
-		logcfg.Level = log.DebugLevel
-		trace.Logger.Level = log.DebugLevel
-		syslog.Logger.Level = log.DebugLevel
-	}
-
-	if config.Diagnostics.SysLogConfig != nil {
-		logcfg.Syslog = &viclog.SyslogConfig{
-			Network:  config.Diagnostics.SysLogConfig.Network,
-			RAddr:    config.Diagnostics.SysLogConfig.RAddr,
-			Priority: syslog.Info | syslog.Daemon,
-		}
-	}
-
-	viclog.Init(logcfg)
-
-	if debugLevel > 2 {
-		enableShell()
-	}
-
-	sink, err := extraconfig.GuestInfoSinkWithPrefix("init")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// create the tether
-	tthr = tether.New(src, sink, &operations{})
-
-	// register the toolbox extension and configure for appliance
-	toolbox := configureToolbox(tether.NewToolbox())
-	toolbox.PrimaryIP = externalIP
-	tthr.Register("Toolbox", toolbox)
-
-	// Check logs every 5 minutes and rotate them if their size exceeds 20MB.
-	// The history size we keep is 2 previous files in a compressed form.
-	// TODO: Check available memory to tune log size and history length for log files.
-	logrotate, err := logmgr.NewLogManager(time.Second * 300)
-	const maxLogSizeBytes = 20 * 1024 * 1024
-	if err == nil {
-		logrotate.AddLogRotate("/var/log/vic/port-layer.log", logmgr.Daily, maxLogSizeBytes, 2, true)
-		logrotate.AddLogRotate("/var/log/vic/init.log", logmgr.Daily, maxLogSizeBytes, 2, true)
-		logrotate.AddLogRotate("/var/log/vic/docker-personality.log", logmgr.Daily, maxLogSizeBytes, 2, true)
-		logrotate.AddLogRotate("/var/log/vic/vicadmin.log", logmgr.Daily, maxLogSizeBytes, 2, true)
-		tthr.Register("logrotate", logrotate)
-	} else {
-		log.Error(err)
-	}
-
-	err = tthr.Start()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	log.Info("Clean exit from init")
-}
-
-// exit cleanly shuts down the system
-func halt() {
-	log.Infof("Powering off the system")
-	if debugLevel > 0 {
-		log.Info("Squashing power off for debug init")
-		return
-	}
-
-	syscall.Sync()
-	syscall.Reboot(syscall.LINUX_REBOOT_CMD_POWER_OFF)
-}
-
-func reboot() {
-	log.Infof("Rebooting the system")
-	if debugLevel > 0 {
-		log.Info("Squashing reboot for debug init")
-		return
-	}
-
-	syscall.Sync()
-	syscall.Reboot(syscall.LINUX_REBOOT_CMD_RESTART)
-}
-
-func configureToolbox(t *tether.Toolbox) *tether.Toolbox {
-	cmd := t.Service.Command
-	cmd.ProcessStartCommand = startCommand
-
-	return t
-}
-
-// externalIP attempts to find an external IP to be reported as the guest IP
-func externalIP() string {
-	l, err := netlink.LinkByName("client")
-	if err != nil {
-		log.Debugf("error looking up client interface by name: %s", err)
-		l, err = netlink.LinkByAlias("client")
-		if err != nil {
-			log.Errorf("error looking up client interface by alias: %s", err)
-			return ""
-		}
-	}
-
-	addrs, err := netlink.AddrList(l, netlink.FAMILY_V4)
-	if err != nil {
-		log.Errorf("error getting address list for client interface: %s", err)
-		return ""
-	}
-
-	if len(addrs) == 0 {
-		log.Warnf("no addresses set on client interface")
-		return ""
-	}
-
-	return addrs[0].IP.String()
-}
-
-// defaultIP tries externalIP, falling back to toolbox.DefaultIP()
-func defaultIP() string {
-	ip := externalIP()
-	if ip != "" {
-		return ip
-	}
-
-	return toolbox.DefaultIP()
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_test.go
deleted file mode 100644
index 0d1268d815..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/main_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"flag"
-	"testing"
-)
-
-var systemTest *bool
-
-func init() {
-	systemTest = flag.Bool("systemTest", false, "Run system test")
-}
-
-func TestSystem(t *testing.T) {
-	if *systemTest {
-		main()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops.go
deleted file mode 100644
index 8d57f4b85c..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/pprof"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// pathPrefix is present to allow the various files referenced by tether to be placed
-// in specific directories, primarily for testing.
-var pathPrefix string
-
-const (
-	logDir  = "var/log/vic"
-	initLog = "init.log"
-)
-
-type operations struct {
-	tether.BaseOperations
-}
-
-func (t *operations) Setup(sink tether.Config) error {
-	if err := t.BaseOperations.Setup(sink); err != nil {
-		return err
-	}
-
-	return pprof.StartPprof("vch-init", pprof.VCHInitPort)
-}
-
-func (t *operations) Cleanup() error {
-	return t.BaseOperations.Cleanup()
-}
-
-// HandleSessionExit controls the behaviour on session exit - for the tether if the session exiting
-// is the primary session (i.e. SessionID matches ExecutorID) then we exit everything.
-func (t *operations) HandleSessionExit(config *tether.ExecutorConfig, session *tether.SessionConfig) func() {
-	defer trace.End(trace.Begin(""))
-
-	// trigger a reload to force relaunch
-	return func() {
-		// If executor debug is greater than 1 then suppress the relaunch but leave the executor up
-		// for diagnostics
-		if config.DebugLevel > 2 {
-			log.Warnf("Debug is set to %d so squashing relaunch of exited process", config.DebugLevel)
-			return
-		}
-
-		// incredibly basic throttle
-		time.Sleep(3 * time.Second)
-
-		tthr.Reload()
-		log.Info("Triggered reload")
-	}
-}
-
-func (t *operations) SetHostname(name string, aliases ...string) error {
-	// switch the names around so we get the pretty name and not the ID
-	return t.BaseOperations.SetHostname(aliases[0])
-}
-
-func (t *operations) Apply(endpoint *tether.NetworkEndpoint) error {
-	return t.BaseOperations.Apply(endpoint)
-}
-
-// Log will redirect logging to both a file on disk and to stdout for the process
-func (t *operations) Log() (io.Writer, error) {
-	defer trace.End(trace.Begin("operations.Log"))
-
-	// make the logging directory
-	// #nosec: Expect directory permissions to be 0700 or less
-	os.MkdirAll(path.Join(pathPrefix, logDir), 0755)
-
-	logPath := path.Join(pathPrefix, logDir, initLog)
-
-	log.Infof("opening %s for debug log", logPath)
-	// #nosec: Expect file permissions to be 0600 or less
-	out, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND|os.O_SYNC|syscall.O_NOCTTY, 0644)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open file port for debug log: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	return io.MultiWriter(out, os.Stdout), nil
-}
-
-// sessionLogWriter returns a writer that will persist the session output
-func (t *operations) SessionLog(session *tether.SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error) {
-	defer trace.End(trace.Begin("configure session log writer"))
-
-	name := session.ID
-	if name == "" {
-		name = session.Name
-	}
-
-	logPath := path.Join(pathPrefix, logDir, name+".log")
-
-	// open SttyS2 for session logging
-	log.Infof("opening %s for session logging", logPath)
-	// #nosec: Expect file permissions to be 0600 or less
-	f, err := os.OpenFile(logPath, os.O_RDWR|os.O_CREATE|os.O_APPEND|os.O_SYNC|syscall.O_NOCTTY, 0644)
-	if err != nil {
-		detail := fmt.Sprintf("failed to open file for session log: %s", err)
-		log.Error(detail)
-		return nil, nil, errors.New(detail)
-	}
-
-	// use multi-writer so it goes to both screen and session log
-	if debugLevel > 0 {
-		return dio.MultiWriter(f, os.Stdout), dio.MultiWriter(f, os.Stderr), nil
-	}
-
-	// only duplicate stderr
-	return dio.MultiWriter(f), dio.MultiWriter(f), nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops_linux.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops_linux.go
deleted file mode 100644
index eadb867223..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/ops_linux.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/libnetwork/iptables"
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/vic/lib/tether"
-)
-
-const (
-	publicIfaceName = "public"
-)
-
-func (t *operations) SetupFirewall(ctx context.Context, config *tether.ExecutorConfig) error {
-	// get the public interface name
-	l, err := netlink.LinkByName(publicIfaceName)
-	if l == nil {
-		l, err = netlink.LinkByAlias(publicIfaceName)
-		if l == nil {
-			return fmt.Errorf("could not find interface: %s", publicIfaceName)
-		}
-	}
-
-	if _, err = iptables.Raw(string(iptables.Append), "FORWARD", "-i", "bridge", "-o", l.Attrs().Name, "-j", "ACCEPT"); err != nil {
-		return err
-	}
-
-	if config.AsymmetricRouting {
-		// set rp_filter to "loose" mode; see https://en.wikipedia.org/wiki/Reverse_path_forwarding#Loose_mode
-		//
-		// this is so the kernel will not drop packets sent to the public interface from an
-		// address that is reachable by other interfaces on the VCH. specifically, when
-		// packets from the bridge network are directed to another network (say, management),
-		// the incoming reply to the VCH can be dropped if rp_filter is set to the default 1
-		if err = ioutil.WriteFile(fmt.Sprintf("/proc/sys/net/ipv4/conf/%s/rp_filter", l.Attrs().Name), []byte("2"), 0644); err != nil {
-			// not a fatal error, so just log it here
-			log.Warnf("error while setting rp_filter for interface %s: %s", l.Attrs().Name, err)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/restart_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/restart_test.go
deleted file mode 100644
index 58f9bff8c8..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/restart_test.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"os/exec"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestPathLookup constructs the spec for a Session where the binary path must be
-// resolved from the PATH environment variable - this is a variation from normal
-// Cmd handling where that is done during creation of Cmd
-//
-
-func TestRestart(t *testing.T) {
-	testSetup(t)
-	defer testTeardown(t)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "pathlookup",
-			Name: "tether_test_executor",
-		},
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 2,
-		},
-		Sessions: map[string]*executor.SessionConfig{
-			"pathlookup": {
-				Common: executor.Common{
-					ID:   "pathlookup",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "date",
-					Args: []string{"date", "--reference=/"},
-					Env:  []string{"PATH=/bin"},
-					Dir:  "/bin",
-				},
-				Restart: true,
-			},
-		},
-	}
-
-	tthr, src := StartTether(t, &cfg)
-
-	// wait for initialization
-	<-Mocked.Started
-
-	result := &tether.ExecutorConfig{}
-	extraconfig.Decode(src, result)
-
-	// Started returns when we reload but that doesn't mean that the process is started
-	// Try multiple times before giving up
-	for i := 0; i < 10; i++ {
-		if result.Sessions["pathlookup"].Started != "" {
-			break
-		}
-		time.Sleep(time.Duration(i) * time.Millisecond)
-	}
-
-	assert.Equal(t, 0, result.Sessions["pathlookup"].ExitStatus, "Expected command to have exited cleanly")
-	assert.True(t, result.Sessions["pathlookup"].Restart, "Expected command to be configured for restart")
-
-	// wait for the resurrection count to max out the channel
-	for result.Sessions["pathlookup"].Diagnostics.ResurrectionCount < 10 {
-		result = &tether.ExecutorConfig{}
-		extraconfig.Decode(src, &result)
-		assert.Equal(t, 0, result.Sessions["pathlookup"].ExitStatus, "Expected command to have exited cleanly")
-		// proceed to the next reincarnation
-		<-Mocked.SessionExit
-		tthr.Reload()
-	}
-
-	// read the output from the session
-	log := Mocked.SessionLogBuffer.Bytes()
-
-	// the tether has to be stopped before comparison on the reaper may swaller exec.Wait
-	tthr.Stop()
-	<-Mocked.Cleaned
-
-	// run the command directly
-	out, err := exec.Command("/bin/date", "--reference=/").Output()
-	if err != nil {
-		fmt.Printf("Failed to run date for comparison data: %s", err)
-		t.Error(err)
-		return
-	}
-
-	assert.True(t, strings.HasPrefix(string(log), string(out)), "Expected the data to be constant - first invocation doesn't match")
-	assert.True(t, strings.HasSuffix(string(log), string(out)), "Expected the data to be constant - last invocation doesn't match")
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/tether_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/tether_test.go
deleted file mode 100644
index 9b1afcb979..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/tether_test.go
+++ /dev/null
@@ -1,283 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"net/url"
-	"os"
-	"runtime"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/system"
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var Mocked Mocker
-
-type Mocker struct {
-	Base tether.BaseOperations
-
-	// allow tests to tell when the tether has finished setup
-	Started chan bool
-	// allow tests to tell when the tether has finished
-	Cleaned chan bool
-	// Session exit
-	SessionExit chan bool
-
-	// debug output gets logged here
-	LogBuffer bytes.Buffer
-
-	// session output gets logged here
-	SessionLogBuffer bytes.Buffer
-
-	// the hostname of the system
-	Hostname string
-	// the ip configuration for name index networks
-	IPs map[string]net.IP
-	// filesystem mounts, indexed by disk label
-	Mounts map[string]string
-
-	WindowCol uint32
-	WindowRow uint32
-	Signal    ssh.Signal
-}
-
-// Start implements the extension method
-func (t *Mocker) Start() error {
-	return nil
-}
-
-// Stop implements the extension method
-func (t *Mocker) Stop() error {
-	close(t.Cleaned)
-	return nil
-}
-
-// Reload implements the extension method
-func (t *Mocker) Reload(config *tether.ExecutorConfig) error {
-	// the tether has definitely finished it's startup by the time we hit this
-	defer func() {
-		// deal with repeated reloads
-		recover()
-	}()
-
-	close(t.Started)
-
-	return nil
-}
-
-func (t *Mocker) Setup(tether.Config) error {
-	return nil
-}
-
-func (t *Mocker) Cleanup() error {
-	return nil
-}
-
-func (t *Mocker) Log() (io.Writer, error) {
-	return &t.LogBuffer, nil
-}
-
-func (t *Mocker) SessionLog(session *tether.SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error) {
-	return dio.MultiWriter(&t.SessionLogBuffer), dio.MultiWriter(&t.SessionLogBuffer), nil
-}
-
-func (t *Mocker) HandleSessionExit(config *tether.ExecutorConfig, session *tether.SessionConfig) func() {
-	return func() {
-		t.SessionExit <- true
-	}
-}
-
-func (t *Mocker) ProcessEnv(env []string) []string {
-	return t.Base.ProcessEnv(env)
-}
-
-// SetHostname sets both the kernel hostname and /etc/hostname to the specified string
-func (t *Mocker) SetHostname(hostname string, aliases ...string) error {
-	defer trace.End(trace.Begin("mocking hostname to " + hostname))
-
-	// TODO: we could mock at a much finer granularity, only extracting the syscall
-	// that would exercise the file modification paths, however it's much less generalizable
-	t.Hostname = hostname
-	return nil
-}
-
-func (t *Mocker) SetupFirewall(cxt context.Context, conf *tether.ExecutorConfig) error {
-	return nil
-}
-
-// Apply takes the network endpoint configuration and applies it to the system
-func (t *Mocker) Apply(endpoint *tether.NetworkEndpoint) error {
-	defer trace.End(trace.Begin("mocking endpoint configuration for " + endpoint.Network.Name))
-	t.IPs[endpoint.Network.Name] = endpoint.Assigned.IP
-
-	return nil
-}
-
-// MountLabel performs a mount with the source treated as a disk label
-// This assumes that /dev/disk/by-label is being populated, probably by udev
-func (t *Mocker) MountLabel(ctx context.Context, label, target string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", label, target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[label] = target
-	return nil
-}
-
-// MountTarget performs a mount with the source treated as an nfs target
-func (t *Mocker) MountTarget(ctx context.Context, source url.URL, target string, mountOptions string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", source.String(), target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[source.String()] = target
-	return nil
-}
-
-// CopyExistingContent copies the underlying files shadowed by a mount on a directory
-// to the volume mounted on the directory
-func (t *Mocker) CopyExistingContent(source string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking copyExistingContent from %s", source)))
-	return nil
-}
-
-// Fork triggers vmfork and handles the necessary pre/post OS level operations
-func (t *Mocker) Fork() error {
-	defer trace.End(trace.Begin("mocking fork"))
-	return errors.New("Fork test not implemented")
-}
-
-// LaunchUtility uses the underlying implementation for launching and tracking utility processes
-func (t *Mocker) LaunchUtility(fn tether.UtilityFn) (<-chan int, error) {
-	return t.Base.LaunchUtility(fn)
-}
-
-func (t *Mocker) HandleUtilityExit(pid, exitCode int) bool {
-	return t.Base.HandleUtilityExit(pid, exitCode)
-}
-
-// TestMain simply so we have control of debugging level and somewhere to call package wide test setup
-func TestMain(m *testing.M) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger = log.StandardLogger()
-
-	// replace the Sys variable with a mock
-	tether.Sys = system.System{
-		Hosts:      &tether.MockHosts{},
-		ResolvConf: &tether.MockResolvConf{},
-		Syscall:    &tether.MockSyscall{},
-		Root:       os.TempDir(),
-	}
-
-	retCode := m.Run()
-
-	// call with result of m.Run()
-	os.Exit(retCode)
-}
-
-func StartTether(t *testing.T, cfg *executor.ExecutorConfig) (tether.Tether, extraconfig.DataSource) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	tthr = tether.New(src, sink, &Mocked)
-	tthr.Register("mocker", &Mocked)
-
-	// run the tether to service the attach
-	go func() {
-		err := tthr.Start()
-		if err != nil {
-			t.Error(err)
-		}
-	}()
-
-	return tthr, src
-}
-
-func RunTether(t *testing.T, cfg *executor.ExecutorConfig) (tether.Tether, extraconfig.DataSource, error) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	tthr = tether.New(src, sink, &Mocked)
-	tthr.Register("Mocker", &Mocked)
-
-	// run the tether to service the attach
-	erR := tthr.Start()
-
-	return tthr, src, erR
-}
-
-func OptionValueArrayToString(options []types.BaseOptionValue) string {
-	// create the key/value store from the extraconfig slice for lookups
-	kv := make(map[string]string)
-	for i := range options {
-		k := options[i].GetOptionValue().Key
-		v := options[i].GetOptionValue().Value.(string)
-		kv[k] = v
-	}
-
-	return fmt.Sprintf("%#v", kv)
-}
-
-func testSetup(t *testing.T) {
-	pc, _, _, _ := runtime.Caller(1)
-	name := runtime.FuncForPC(pc).Name()
-
-	log.Infof("Started test setup for %s", name)
-
-	// use the mock ops - fresh one each time as tests might apply different mocked calls
-	Mocked = Mocker{
-		Started:     make(chan bool),
-		Cleaned:     make(chan bool),
-		SessionExit: make(chan bool),
-	}
-}
-
-func testTeardown(t *testing.T) {
-	// cleanup
-	<-Mocked.Cleaned
-
-	os.RemoveAll(pathPrefix)
-	log.SetOutput(os.Stdout)
-
-	pc, _, _, _ := runtime.Caller(1)
-	name := runtime.FuncForPC(pc).Name()
-
-	log.Infof("Finished test teardown for %s", name)
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-init/toolbox.go b/installer/vendor/github.com/vmware/vic/cmd/vic-init/toolbox.go
deleted file mode 100644
index 3b70c75049..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-init/toolbox.go
+++ /dev/null
@@ -1,260 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !windows,!darwin
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/toolbox"
-	"github.com/vmware/govmomi/toolbox/vix"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/diag"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// startCommand is the switch for the synthetic commands that are permitted within the appliance.
-// This is not intended to allow arbitrary commands to be executed.
-// returns:
-//  pid: toolbox ProcessManager Process id
-//  error
-func startCommand(m *toolbox.ProcessManager, r *vix.StartProgramRequest) (int64, error) {
-	defer trace.End(trace.Begin(r.ProgramPath))
-	var p *toolbox.Process
-
-	switch r.ProgramPath {
-	case "enable-ssh":
-		p = toolbox.NewProcessFunc(func(ctx context.Context, args string) error {
-			err := enableSSH(args)
-			// #nosec: Errors unhandled.
-			_ = enableShell()
-			return err
-		})
-	case "passwd":
-		p = toolbox.NewProcessFunc(func(ctx context.Context, args string) error {
-			err := passwd(args)
-			// #nosec: Errors unhandled.
-			_ = enableShell()
-			return err
-		})
-	case "test-vc-api":
-		p = toolbox.NewProcessFunc(func(ctx context.Context, args string) error {
-			rc := diag.CheckAPIAvailability(args)
-			if rc == diag.VCStatusOK {
-				return nil
-			}
-
-			return &toolbox.ProcessError{
-				Err:      errors.New(diag.UserReadableVCAPITestDescription(rc)),
-				ExitCode: int32(rc),
-			}
-		})
-	default:
-		return -1, os.ErrNotExist
-	}
-
-	return m.Start(r, p)
-
-}
-
-// enableShell changes the root shell from /bin/false to /bin/bash
-// We try to ensure the password is not expired via chage, as chsh
-// requires an unexpired password to succeed.
-func enableShell() error {
-	defer trace.End(trace.Begin(""))
-
-	// if reset fails, try the rest anyway
-	// #nosec: Errors unhandled.
-	resetPasswdExpiry()
-
-	// #nosec: Subprocess launching should be audited
-	chsh := exec.Command("/bin/chsh", "-s", "/bin/bash", "root")
-	err := chsh.Start()
-	if err != nil {
-		err := fmt.Errorf("Failed to launch chsh: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	// ignore the error - it's likely raced with child reaper, we just want to make sure
-	// that it's exited by the time we pass this point
-	// #nosec: Errors unhandled.
-	chsh.Wait()
-
-	// confirm the change
-	file, err := os.Open("/etc/passwd")
-	if err != nil {
-		err := fmt.Errorf("Failed to open file to confirm change: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	reader := bufio.NewReader(file)
-	line, err := reader.ReadString('\n')
-	if err != nil {
-		err := fmt.Errorf("Failed to read line from file to confirm change: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	// assert that first line is root
-	if !strings.HasPrefix(line, "root") {
-		err := fmt.Errorf("Expected line to start with root: %s", line)
-		log.Error(err)
-		return err
-	}
-
-	// assert that first line is root
-	if !strings.HasSuffix(line, "/bin/bash\n") {
-		err := fmt.Errorf("Expected line to end with /bin/bash: %s", line)
-		log.Error(err)
-		return err
-	}
-
-	log.Info("Attempted to enable the shell for root")
-
-	return nil
-}
-
-// passwd sets the password for the root user to that provided as an argument
-func passwd(pass string) error {
-	defer trace.End(trace.Begin(""))
-
-	// #nosec: Subprocess launching should be audited
-	setPasswd := exec.Command("/sbin/chpasswd")
-	stdin, err := setPasswd.StdinPipe()
-	if err != nil {
-		err := fmt.Errorf("Failed to create stdin pipe for chpasswd: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	err = setPasswd.Start()
-	if err != nil {
-		err := fmt.Errorf("Failed to launch chpasswd: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	_, err = stdin.Write([]byte("root:" + pass))
-
-	// so that we're actively waiting when the process exits, or we'll race (and lose) to child reaper
-	go func() {
-		// #nosec: Errors unhandled.
-		setPasswd.Wait()
-	}()
-
-	err = stdin.Close()
-	if err != nil {
-		err := fmt.Errorf("Failed to close input to chpasswd: %s", err)
-		log.Error(err)
-
-		// fire and forget as we're already on error path
-		// #nosec: Errors unhandled.
-		setPasswd.Process.Kill()
-
-		return err
-	}
-
-	log.Info("Attempted to set the password for root")
-
-	return nil
-}
-
-// enableSSH receives a key as an argument
-func enableSSH(key string) error {
-	defer trace.End(trace.Begin(""))
-
-	// basic sanity check for args - we don't bother validating it's a key
-	if len(key) != 0 {
-		err := os.MkdirAll("/root/.ssh", 0700)
-		if err != nil {
-			err := fmt.Errorf("unable to create path for keys: %s", err)
-			log.Error(err)
-			return err
-		}
-
-		err = ioutil.WriteFile("/root/.ssh/authorized_keys", []byte(key), 0600)
-		if err != nil {
-			err := fmt.Errorf("unable to create authorized_keys: %s", err)
-			log.Error(err)
-			return err
-		}
-	}
-
-	return startSSH()
-}
-
-// startSSH launches the sshd server
-func startSSH() error {
-	// #nosec: Subprocess launching should be audited
-	c := exec.Command("/usr/bin/systemctl", "start", "sshd")
-
-	var b bytes.Buffer
-	c.Stdout = &b
-	c.Stderr = &b
-
-	if err := c.Start(); err != nil {
-		return err
-	}
-
-	go func() {
-		// because init is explicitly reaping child processes we cannot use simple
-		// exec commands to gather status
-		// #nosec: Errors unhandled.
-		_ = c.Wait()
-		log.Info("Attempted to start ssh service:\n %s", b)
-	}()
-
-	return nil
-}
-
-func resetPasswdExpiry() error {
-	defer trace.End(trace.Begin(""))
-
-	// add just enough time for the password not to be expired
-	// if the user wants more time they can actually change the password
-	// This will expire in at most 1 day, perhaps sooner depending on local time
-	// NB: Format is example based - that's the reference time format
-	expireDate := time.Now().AddDate(0, 0, -1).Format("2006-01-02")
-
-	// #nosec: Subprocess launching should be audited
-	chage := exec.Command("/bin/chage", "-M", "1", "-d", expireDate, "root")
-	err := chage.Start()
-	if err != nil {
-		err := fmt.Errorf("Failed to launch chage: %s", err)
-		log.Error(err)
-		return err
-	}
-
-	// ignore the error - it's likely raced with child reaper, we just want to make sure
-	// that it's exited by the time we pass this point
-	// #nosec: Errors unhandled.
-	chage.Wait()
-
-	log.Infof("Attempted reset of password expiry: /bin/chage -M 1 -d %s root", expireDate)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate.go
index e7817ca9fb..4436351db3 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate.go
@@ -24,7 +24,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/certificate"
@@ -55,6 +54,7 @@ type CertFactory struct {
 	NoTLSverify  bool
 	KeyPEM       []byte
 	CertPEM      []byte
+	NoSaveToDisk bool
 }
 
 func (c *CertFactory) CertFlags() []cli.Flag {
@@ -110,7 +110,7 @@ func (c *CertFactory) CertFlags() []cli.Flag {
 	}
 }
 
-func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug int) error {
+func (c *CertFactory) ProcessCertificates(op trace.Operation, displayName string, force bool, debug int) error {
 	// set up the locations for the certificates and env file
 	if c.CertPath == "" {
 		c.CertPath = displayName
@@ -119,7 +119,7 @@ func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug
 
 	// check for insecure case
 	if c.NoTLS {
-		log.Warn("Configuring without TLS - all communications will be insecure")
+		op.Warn("Configuring without TLS - all communications will be insecure")
 		return nil
 	}
 
@@ -134,13 +134,13 @@ func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug
 	if c.Cname == "" {
 		if c.ClientNetworkIP != "" {
 			c.Cname = c.ClientNetworkIP
-			log.Infof("Using client-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
+			op.Infof("Using client-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
 		} else if c.PublicNetworkIP != "" && (c.PublicNetworkName == c.ClientNetworkName || c.ClientNetworkName == "") {
 			c.Cname = c.PublicNetworkIP
-			log.Infof("Using public-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
+			op.Infof("Using public-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
 		} else if c.ManagementNetworkIP != "" && (c.ManagementNetworkName == c.ClientNetworkName || (c.ClientNetworkName == "" && c.ManagementNetworkName == c.PublicNetworkName)) {
 			c.Cname = c.ManagementNetworkIP
-			log.Infof("Using management-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
+			op.Infof("Using management-network-ip as cname where needed - use --tls-cname to override: %s", c.Cname)
 		}
 
 		if c.Cname != "" {
@@ -153,23 +153,23 @@ func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug
 	}
 
 	// load what certificates we can
-	cas, keypair, err := c.loadCertificates(debug)
+	cas, keypair, err := c.loadCertificates(op, debug)
 	if err != nil {
-		log.Errorf("Unable to load certificates: %s", err)
+		op.Errorf("Unable to load certificates: %s", err)
 		if !force {
 			return err
 		}
 
-		log.Warnf("Ignoring error loading certificates due to --force")
+		op.Warnf("Ignoring error loading certificates due to --force")
 		cas = nil
 		keypair = nil
 		err = nil
 	}
 
 	// we need to generate some part of the certificate configuration
-	gcas, gkeypair, err := c.generateCertificates(keypair == nil, !c.NoTLSverify && len(cas) == 0)
+	gcas, gkeypair, err := c.generateCertificates(op, keypair == nil, !c.NoTLSverify && len(cas) == 0)
 	if err != nil {
-		log.Error("cannot continue: unable to generate certificates")
+		op.Error("cannot continue: unable to generate certificates")
 		return err
 	}
 
@@ -195,7 +195,7 @@ func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug
 
 	// do we have key, cert, and --no-tlsverify
 	if c.NoTLSverify || len(cas) == 0 {
-		log.Warnf("Configuring without TLS verify - certificate-based authentication disabled")
+		op.Warnf("Configuring without TLS verify - certificate-based authentication disabled")
 		return nil
 	}
 
@@ -204,8 +204,8 @@ func (c *CertFactory) ProcessCertificates(displayName string, force bool, debug
 }
 
 // loadCertificates returns the client CA pool and the keypair for server certificates on success
-func (c *CertFactory) loadCertificates(debug int) ([]byte, *certificate.KeyPair, error) {
-	defer trace.End(trace.Begin(""))
+func (c *CertFactory) loadCertificates(op trace.Operation, debug int) ([]byte, *certificate.KeyPair, error) {
+	defer trace.End(trace.Begin("", op))
 
 	// reads each of the files specified, assuming that they are PEM encoded certs,
 	// and constructs a byte array suitable for passing to CertPool.AppendCertsFromPEM
@@ -218,7 +218,7 @@ func (c *CertFactory) loadCertificates(debug int) ([]byte, *certificate.KeyPair,
 		}
 
 		certs = append(certs, b...)
-		log.Infof("Loaded CA from %s", f)
+		op.Infof("Loaded CA from %s", f)
 	}
 
 	var keypair *certificate.KeyPair
@@ -242,36 +242,36 @@ func (c *CertFactory) loadCertificates(debug int) ([]byte, *certificate.KeyPair,
 	if err := keypair.LoadCertificate(); err != nil {
 		if explicit || !os.IsNotExist(err) {
 			// if these files were explicit paths, or anything other than not found, fail
-			log.Errorf("Failed to load certificate: %s", err)
+			op.Errorf("Failed to load certificate: %s", err)
 			return certs, nil, err
 		}
 
-		log.Debugf("Unable to locate existing server certificate in cert path")
+		op.Debugf("Unable to locate existing server certificate in cert path")
 		return nil, nil, nil
 	}
 
 	// check that any supplied cname matches the server cert CN
 	cert, err := keypair.Certificate()
 	if err != nil {
-		log.Errorf("Failed to parse certificate: %s", err)
+		op.Errorf("Failed to parse certificate: %s", err)
 		return certs, nil, err
 	}
 
 	if cert.Leaf == nil {
-		log.Warnf("Failed to load x509 leaf: Unable to confirm server certificate cname matches provided cname %q. Continuing...", c.Cname)
+		op.Warnf("Failed to load x509 leaf: Unable to confirm server certificate cname matches provided cname %q. Continuing...", c.Cname)
 	} else {
 		// We just do a direct equality check here - trying to be clever is liable to lead to hard
 		// to diagnose errors
 		if cert.Leaf.Subject.CommonName != c.Cname {
-			log.Errorf("Provided cname does not match that in existing server certificate: %s", cert.Leaf.Subject.CommonName)
+			op.Errorf("Provided cname does not match that in existing server certificate: %s", cert.Leaf.Subject.CommonName)
 			if debug > 2 {
-				log.Debugf("Certificate does not match provided cname: %#+v", cert.Leaf)
+				op.Debugf("Certificate does not match provided cname: %#+v", cert.Leaf)
 			}
 			return certs, nil, fmt.Errorf("cname option doesn't match existing server certificate in certificate path %s", c.CertPath)
 		}
 	}
 
-	log.Infof("Loaded server certificate %s", scert)
+	op.Infof("Loaded server certificate %s", scert)
 	c.Skey = skey
 	c.Scert = scert
 
@@ -280,33 +280,33 @@ func (c *CertFactory) loadCertificates(debug int) ([]byte, *certificate.KeyPair,
 		b, err := ioutil.ReadFile(ca)
 		if err != nil {
 			if os.IsNotExist(err) {
-				log.Debugf("Unable to locate existing CA in cert path")
+				op.Debugf("Unable to locate existing CA in cert path")
 				return certs, keypair, nil
 			}
 
 			// if the CA exists but cannot be loaded then it's an error
-			log.Errorf("Failed to load authority from certificate path %s: %s", c.CertPath, err)
+			op.Errorf("Failed to load authority from certificate path %s: %s", c.CertPath, err)
 			return certs, keypair, errors.New("failed to load certificate authority")
 		}
 
 		c.Cacert = ca
 
-		log.Infof("Loaded CA with default name from certificate path %s", c.CertPath)
+		op.Infof("Loaded CA with default name from certificate path %s", c.CertPath)
 		certs = b
 
 		// load client certs - we ensure the client certs validate with the provided CA or ignore any we find
 		cpair := certificate.NewKeyPair(ccert, ckey, nil, nil)
 		if err := cpair.LoadCertificate(); err != nil {
-			log.Warnf("Unable to load client certificate - validation of API endpoint will be best effort only: %s", err)
+			op.Warnf("Unable to load client certificate - validation of API endpoint will be best effort only: %s", err)
 		}
 
 		clientCert, err := certificate.VerifyClientCert(certs, cpair)
 		if err != nil {
 			switch err.(type) {
 			case certificate.CertParseError, certificate.CreateCAPoolError:
-				log.Debugf(err.Error())
+				op.Debug(err)
 			case certificate.CertVerifyError:
-				log.Warnf("%s - continuing without client certificate", err.Error())
+				op.Warnf("%s - continuing without client certificate", err)
 			}
 
 			return certs, keypair, nil
@@ -316,17 +316,17 @@ func (c *CertFactory) loadCertificates(debug int) ([]byte, *certificate.KeyPair,
 		c.Ccert = ccert
 		c.ClientCert = clientCert
 
-		log.Infof("Loaded client certificate with default name from certificate path %s", c.CertPath)
+		op.Infof("Loaded client certificate with default name from certificate path %s", c.CertPath)
 	}
 
 	return certs, keypair, nil
 }
 
-func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *certificate.KeyPair, error) {
-	defer trace.End(trace.Begin(""))
+func (c *CertFactory) generateCertificates(op trace.Operation, server bool, client bool) ([]byte, *certificate.KeyPair, error) {
+	defer trace.End(trace.Begin("", op))
 
 	if !server && !client {
-		log.Debugf("Not generating server or client certs, nothing for generateCertificates to do")
+		op.Debug("Not generating server or client certs, nothing for generateCertificates to do")
 		return nil, nil, nil
 	}
 
@@ -337,10 +337,12 @@ func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *c
 		return nil, nil, fmt.Errorf("Specified directory to store certificates is not empty. Specify a new path in which to store generated certificates using --tls-cert-path or remove the contents of \"%s\" and run vic-machine again.", c.CertPath)
 	}
 
-	err = os.MkdirAll(c.CertPath, 0700)
-	if err != nil {
-		log.Errorf("Unable to make directory \"%s\" to hold certificates (set via --tls-cert-path)", c.CertPath)
-		return nil, nil, err
+	if !c.NoSaveToDisk {
+		err = os.MkdirAll(c.CertPath, 0700)
+		if err != nil {
+			op.Errorf("Unable to make directory \"%s\" to hold certificates (set via --tls-cert-path)", c.CertPath)
+			return nil, nil, err
+		}
 	}
 
 	c.Skey = filepath.Join(c.CertPath, certificate.ServerKey)
@@ -353,16 +355,18 @@ func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *c
 	c.Cacert = filepath.Join(c.CertPath, certificate.CACert)
 
 	if server && !client {
-		log.Infof("Generating self-signed certificate/key pair - private key in %s", c.Skey)
+		op.Infof("Generating self-signed certificate/key pair - private key in %s", c.Skey)
 		keypair := certificate.NewKeyPair(c.Scert, c.Skey, nil, nil)
 		err := keypair.CreateSelfSigned(c.Cname, nil, c.KeySize)
 		if err != nil {
-			log.Errorf("Failed to generate self-signed certificate: %s", err)
+			op.Errorf("Failed to generate self-signed certificate: %s", err)
 			return nil, nil, err
 		}
-		if err = keypair.SaveCertificate(); err != nil {
-			log.Errorf("Failed to save server certificates: %s", err)
-			return nil, nil, err
+		if !c.NoSaveToDisk {
+			if err = keypair.SaveCertificate(); err != nil {
+				op.Errorf("Failed to save server certificates: %s", err)
+				return nil, nil, err
+			}
 		}
 
 		return certs, keypair, nil
@@ -370,12 +374,12 @@ func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *c
 
 	// client auth path
 	if c.Cname == "" {
-		log.Error("Common Name must be provided when generating certificates for client authentication:")
-		log.Info("  --tls-cname=<FQDN or static IP> # for the appliance VM")
-		log.Info("  --tls-cname=<*.yourdomain.com>  # if DNS has entries in that form for DHCP addresses (less secure)")
-		log.Info("  --no-tlsverify                  # disables client authentication (anyone can connect to the VCH)")
-		log.Info("  --no-tls                        # disables TLS entirely")
-		log.Info("")
+		op.Error("Common Name must be provided when generating certificates for client authentication:")
+		op.Info("  --tls-cname=<FQDN or static IP> # for the appliance VM")
+		op.Info("  --tls-cname=<*.yourdomain.com>  # if DNS has entries in that form for DHCP addresses (less secure)")
+		op.Info("  --no-tlsverify                  # disables client authentication (anyone can connect to the VCH)")
+		op.Info("  --no-tls                        # disables TLS entirely")
+		op.Info("")
 
 		return certs, nil, errors.New("provide Common Name for server certificate")
 	}
@@ -390,51 +394,57 @@ func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *c
 	}
 
 	// Certificate authority
-	log.Infof("Generating CA certificate/key pair - private key in %s", cakey)
+	op.Infof("Generating CA certificate/key pair - private key in %s", cakey)
 	cakp := certificate.NewKeyPair(c.Cacert, cakey, nil, nil)
 	err = cakp.CreateRootCA(c.Cname, c.Org, c.KeySize)
 	if err != nil {
-		log.Errorf("Failed to generate CA: %s", err)
+		op.Errorf("Failed to generate CA: %s", err)
 		return nil, nil, err
 	}
-	if err = cakp.SaveCertificate(); err != nil {
-		log.Errorf("Failed to save CA certificates: %s", err)
-		return nil, nil, err
+	if !c.NoSaveToDisk {
+		if err = cakp.SaveCertificate(); err != nil {
+			op.Errorf("Failed to save CA certificates: %s", err)
+			return nil, nil, err
+		}
 	}
 
 	// Server certificates
 	var skp *certificate.KeyPair
 	if server {
-		log.Infof("Generating server certificate/key pair - private key in %s", c.Skey)
+		op.Infof("Generating server certificate/key pair - private key in %s", c.Skey)
 		skp = certificate.NewKeyPair(c.Scert, c.Skey, nil, nil)
 		err = skp.CreateServerCertificate(c.Cname, c.Org, c.KeySize, cakp)
 		if err != nil {
-			log.Errorf("Failed to generate server certificates: %s", err)
+			op.Errorf("Failed to generate server certificates: %s", err)
 			return nil, nil, err
 		}
-		if err = skp.SaveCertificate(); err != nil {
-			log.Errorf("Failed to save server certificates: %s", err)
-			return nil, nil, err
+		if !c.NoSaveToDisk {
+			if err = skp.SaveCertificate(); err != nil {
+				op.Errorf("Failed to save server certificates: %s", err)
+				return nil, nil, err
+			}
 		}
 	}
 
 	// Client certificates
 	if client {
-		log.Infof("Generating client certificate/key pair - private key in %s", c.Ckey)
+		op.Infof("Generating client certificate/key pair - private key in %s", c.Ckey)
 		ckp := certificate.NewKeyPair(c.Ccert, c.Ckey, nil, nil)
 		err = ckp.CreateClientCertificate(c.Cname, c.Org, c.KeySize, cakp)
 		if err != nil {
-			log.Errorf("Failed to generate client certificates: %s", err)
+			op.Errorf("Failed to generate client certificates: %s", err)
 			return nil, nil, err
 		}
-		if err = ckp.SaveCertificate(); err != nil {
-			log.Errorf("Failed to save client certificates: %s", err)
-			return nil, nil, err
+		if !c.NoSaveToDisk {
+			if err = ckp.SaveCertificate(); err != nil {
+				op.Errorf("Failed to save client certificates: %s", err)
+				return nil, nil, err
+			}
 		}
 
 		c.ClientCert, err = ckp.Certificate()
 		if err != nil {
-			log.Warnf("Failed to stash client certificate for later application level validation: %s", err)
+			op.Warnf("Failed to stash client certificate for later application level validation: %s", err)
 		}
 
 		// If openssl is present, try to generate a browser friendly pfx file (a bundle of the public certificate AND the private key)
@@ -445,10 +455,10 @@ func (c *CertFactory) generateCertificates(server bool, client bool) ([]byte, *c
 		pfx := exec.Command("openssl", args...)
 		out, err := pfx.CombinedOutput()
 		if err != nil {
-			log.Debug(out)
-			log.Warnf("Failed to generate browser friendly PFX client certificate: %s", err)
+			op.Debug(out)
+			op.Warnf("Failed to generate browser friendly PFX client certificate: %s", err)
 		} else {
-			log.Infof("Generated browser friendly PFX client certificate - certificate in %s/cert.pfx", certPath)
+			op.Infof("Generated browser friendly PFX client certificate - certificate in %s/cert.pfx", certPath)
 		}
 	}
 
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate_test.go
deleted file mode 100644
index 2665967eb1..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/certificate_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-var (
-	cs = &CertFactory{}
-)
-
-func TestGenKey(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	os.Args = []string{"cmd", "create"}
-	flag.Parse()
-	cs.NoTLS = false
-	cs.CertPath = "install-test"
-	cs.Cname = "common name"
-	cs.KeySize = 1024
-
-	ca, kp, err := cs.generateCertificates(true, true)
-	defer os.RemoveAll(fmt.Sprintf("./%s", cs.CertPath))
-
-	assert.NoError(t, err, "Expected to cleanly generate certificates")
-	assert.NotEmpty(t, ca, "Expected CA to contain data")
-	assert.NotNil(t, kp, "Expected keypair to contain data")
-	assert.NotEmpty(t, kp.CertPEM, "Expected certificate to contain data")
-	assert.NotEmpty(t, kp.CertPEM, "Expected key to contain data")
-
-	ca, kp, err = cs.loadCertificates(2)
-	assert.NoError(t, err, "Expected to cleanly load certificates")
-	assert.NotEmpty(t, ca, "Expected CA to contain data")
-	assert.NotNil(t, kp, "Expected keypair to contain data")
-	assert.NotEmpty(t, kp.CertPEM, "Expected certificate to contain data")
-	assert.NotEmpty(t, kp.CertPEM, "Expected key to contain data")
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks.go
index 3cbcd7ff51..21d75089af 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks.go
@@ -20,11 +20,11 @@ import (
 	"net"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/lib/config/executor"
 	"github.com/vmware/vic/pkg/ip"
+	"github.com/vmware/vic/pkg/trace"
 )
 
 // CNetworks holds user input from container network flags
@@ -220,7 +220,7 @@ func (m *ipNetUnmarshaler) UnmarshalText(text []byte) error {
 
 // ProcessContainerNetworks parses container network settings and returns a
 // struct containing all processed container network fields on success.
-func (c *CNetworks) ProcessContainerNetworks() (ContainerNetworks, error) {
+func (c *CNetworks) ProcessContainerNetworks(op trace.Operation) (ContainerNetworks, error) {
 	cNetworks := ContainerNetworks{
 		MappedNetworks:          make(map[string]string),
 		MappedNetworksGateways:  make(map[string]net.IPNet),
@@ -281,31 +281,31 @@ func (c *CNetworks) ProcessContainerNetworks() (ContainerNetworks, error) {
 	var hasError bool
 	fmtMsg := "The following container network %s is set, but CONTAINER-NETWORK cannot be found. Please check the --container-network and %s settings"
 	if len(gws) > 0 {
-		log.Error(fmt.Sprintf(fmtMsg, "gateway", "--container-network-gateway"))
+		op.Errorf(fmtMsg, "gateway", "--container-network-gateway")
 		for key, value := range gws {
 			mask, _ := value.Mask.Size()
-			log.Errorf("\t%s:%s/%d, %q should be a vSphere network name", key, value.IP, mask, key)
+			op.Errorf("\t%s:%s/%d, %q should be a vSphere network name", key, value.IP, mask, key)
 		}
 		hasError = true
 	}
 	if len(pools) > 0 {
-		log.Error(fmt.Sprintf(fmtMsg, "ip range", "--container-network-ip-range"))
+		op.Errorf(fmtMsg, "ip range", "--container-network-ip-range")
 		for key, value := range pools {
-			log.Errorf("\t%s:%s, %q should be a vSphere network name", key, value, key)
+			op.Errorf("\t%s:%s, %q should be a vSphere network name", key, value, key)
 		}
 		hasError = true
 	}
 	if len(dns) > 0 {
-		log.Errorf(fmt.Sprintf(fmtMsg, "dns", "--container-network-dns"))
+		op.Errorf(fmtMsg, "dns", "--container-network-dns")
 		for key, value := range dns {
-			log.Errorf("\t%s:%s, %q should be a vSphere network name", key, value, key)
+			op.Errorf("\t%s:%s, %q should be a vSphere network name", key, value, key)
 		}
 		hasError = true
 	}
 	if len(firewalls) > 0 {
-		log.Error(fmt.Sprintf(fmtMsg, "firewall", "--container-network-firewall"))
+		op.Errorf(fmtMsg, "firewall", "--container-network-firewall")
 		for key := range firewalls {
-			log.Errorf("\t%q should be a vSphere network name", key)
+			op.Errorf("\t%q should be a vSphere network name", key)
 		}
 		hasError = true
 	}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks_test.go
deleted file mode 100644
index ef3d938866..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/cnetworks_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"testing"
-
-	"github.com/vmware/vic/pkg/ip"
-)
-
-func TestParseContainerNetworkGateways(t *testing.T) {
-	var tests = []struct {
-		cgs []string
-		gws map[string]net.IPNet
-		err error
-	}{
-		{[]string{""}, nil, fmt.Errorf("")},
-		{[]string{"foo:"}, nil, fmt.Errorf("")},
-		{[]string{":"}, nil, fmt.Errorf("")},
-		{[]string{":10.10.10.10/24"}, nil, fmt.Errorf("")},
-		{[]string{":foo"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10.10.10.10/24", "foo:10.10.10.2/24"}, nil, fmt.Errorf("")},
-		{
-			[]string{"foo:10.10.10.10/24", "bar:10.10.9.1/16"},
-			map[string]net.IPNet{
-				"foo": {IP: net.ParseIP("10.10.10.10"), Mask: net.CIDRMask(24, 32)},
-				"bar": {IP: net.ParseIP("10.10.9.1"), Mask: net.CIDRMask(16, 32)},
-			},
-			nil,
-		},
-	}
-
-	for _, te := range tests {
-		gws, err := parseContainerNetworkGateways(te.cgs)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("parseContainerNetworkGateways(%s) => (%v, nil) want (nil, err)", te.cgs, gws)
-			}
-
-			continue
-		}
-
-		if err != te.err ||
-			gws == nil ||
-			len(gws) != len(te.gws) {
-			t.Fatalf("parseContainerNetworkGateways(%s) => (%v, %s) want (%v, nil)", te.cgs, gws, err, te.gws)
-		}
-
-		for v, g := range gws {
-			if g2, ok := te.gws[v]; !ok {
-				t.Fatalf("parseContainerNetworkGateways(%s) => (%v, %s) want (%v, nil)", te.cgs, gws, err, te.gws)
-			} else if !g2.IP.Equal(g.IP) || bytes.Compare(g2.Mask, g.Mask) != 0 {
-				t.Fatalf("parseContainerNetworkGateways(%s) => (%v, %s) want (%v, nil)", te.cgs, gws, err, te.gws)
-			}
-		}
-	}
-}
-
-func TestParseContainerNetworkIPRanges(t *testing.T) {
-	var tests = []struct {
-		cps  []string
-		iprs map[string][]*ip.Range
-		err  error
-	}{
-		{[]string{""}, nil, fmt.Errorf("")},
-		{[]string{"foo:"}, nil, fmt.Errorf("")},
-		{[]string{":"}, nil, fmt.Errorf("")},
-		{[]string{":10.10.10.10-24"}, nil, fmt.Errorf("")},
-		{[]string{":foo"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10.10.10.10-9"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10.10.10.10-10.10.10.9"}, nil, fmt.Errorf("")},
-		{
-			[]string{"foo:10.10.10.10-24"},
-			map[string][]*ip.Range{"foo": {ip.NewRange(net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24"))}}, nil},
-		{
-			[]string{"foo:10.10.10.10-10.10.10.24"},
-			map[string][]*ip.Range{"foo": {ip.NewRange(net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24"))}},
-			nil,
-		},
-		{
-			[]string{"foo:10.10.10.10-10.10.10.24", "foo:10.10.10.100-10.10.10.105"},
-			map[string][]*ip.Range{
-				"foo": {
-					ip.NewRange(net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")),
-					ip.NewRange(net.ParseIP("10.10.10.100"), net.ParseIP("10.10.10.105")),
-				},
-			},
-			nil,
-		},
-		{
-			[]string{"foo:10.10.10.10-10.10.10.24", "bar:10.10.9.1-10.10.9.10"},
-			map[string][]*ip.Range{
-				"foo": {ip.NewRange(net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24"))},
-				"bar": {ip.NewRange(net.ParseIP("10.10.9.1"), net.ParseIP("10.10.9.10"))},
-			},
-			nil,
-		},
-	}
-
-	for _, te := range tests {
-		iprs, err := parseContainerNetworkIPRanges(te.cps)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("parseContainerNetworkIPRanges(%s) => (%v, nil) want (nil, err)", te.cps, iprs)
-			}
-
-			continue
-		}
-
-		if err != te.err ||
-			len(iprs) != len(te.iprs) {
-			t.Fatalf("parseContainerNetworkIPRanges(%s) => (%v, %s) want (%v, %s)", te.cps, iprs, err, te.iprs, te.err)
-		}
-
-		for v, ipr := range iprs {
-			if ipr2, ok := te.iprs[v]; !ok {
-				t.Fatalf("parseContainerNetworkIPRanges(%s) => (%v, %s) want (%v, %s)", te.cps, iprs, err, te.iprs, te.err)
-			} else {
-				for _, i := range ipr {
-					found := false
-					for _, i2 := range ipr2 {
-						if i.Equal(i2) {
-							found = true
-							break
-						}
-					}
-
-					if !found {
-						t.Fatalf("parseContainerNetworkIPRanges(%s) => (%v, %s) want (%v, %s)", te.cps, iprs, err, te.iprs, te.err)
-					}
-				}
-			}
-		}
-	}
-}
-
-func TestParseContainerNetworkDNS(t *testing.T) {
-	var tests = []struct {
-		cds []string
-		dns map[string][]net.IP
-		err error
-	}{
-		{[]string{""}, nil, fmt.Errorf("")},
-		{[]string{"foo:"}, nil, fmt.Errorf("")},
-		{[]string{":"}, nil, fmt.Errorf("")},
-		{[]string{":10.10.10.10"}, nil, fmt.Errorf("")},
-		{[]string{":foo"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10"}, nil, fmt.Errorf("")},
-		{[]string{"foo:10.10.10.109"}, map[string][]net.IP{"foo": {net.ParseIP("10.10.10.109")}}, nil},
-		{[]string{"foo:10.10.10.109", "foo:10.10.10.110", "bar:10.10.9.109", "bar:10.10.9.110"},
-			map[string][]net.IP{
-				"foo": {net.ParseIP("10.10.10.109"), net.ParseIP("10.10.10.110")},
-				"bar": {net.ParseIP("10.10.9.109"), net.ParseIP("10.10.9.110")},
-			},
-			nil,
-		},
-	}
-
-	for _, te := range tests {
-		dns, err := parseContainerNetworkDNS(te.cds)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("parseContainerNetworkDNS(%s) => (%v, nil) want (nil, err)", te.cds, dns)
-			}
-
-			continue
-		}
-
-		if err != te.err ||
-			len(dns) != len(te.dns) {
-			t.Fatalf("parseContainerNetworkDNS(%s) => (%v, %s) want (%v, %s)", te.cds, dns, err, te.dns, te.err)
-		}
-
-		for v, d := range dns {
-			if d2, ok := te.dns[v]; !ok {
-				t.Fatalf("parseContainerNetworkDNS(%s) => (%v, %s) want (%v, %s)", te.cds, dns, err, te.dns, te.err)
-			} else {
-				for _, i := range d {
-					found := false
-					for _, i2 := range d2 {
-						if i.Equal(i2) {
-							found = true
-							break
-						}
-					}
-
-					if !found {
-						t.Fatalf("parseContainerNetworkDNS(%s) => (%v, %s) want (%v, %s)", te.cds, dns, err, te.dns, te.err)
-					}
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/compute.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/compute.go
index 4180713827..88cd6cb19f 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/compute.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/compute.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ import "gopkg.in/urfave/cli.v1"
 type Compute struct {
 	ComputeResourcePath string `cmd:"compute-resource"`
 	DisplayName         string `cmd:"name"`
+	UseVMGroup          bool   `cmd:"affinity-vm-group"`
 }
 
 func (c *Compute) ComputeFlags() []cli.Flag {
@@ -42,5 +43,11 @@ func (c *Compute) ComputeFlagsNoName() []cli.Flag {
 			Usage:       "Compute resource path, e.g. myCluster",
 			Destination: &c.ComputeResourcePath,
 		},
+		cli.BoolFlag{
+			Name:        "affinity-vm-group",
+			Usage:       "Use a DRS VM Group to allow VM-Host affinity rules to be defined for the VCH",
+			Destination: &c.UseVMGroup,
+			Hidden:      true,
+		},
 	}
 }
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/dns.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/dns.go
index a113b90676..5eb3e1ca4f 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/dns.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/dns.go
@@ -17,15 +17,15 @@ package common
 import (
 	"net"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
 )
 
 // general dns
 type DNS struct {
-	dns   cli.StringSlice `arg:"dns-server"`
+	DNS   cli.StringSlice `arg:"dns-server"`
 	IsSet bool
 }
 
@@ -33,7 +33,7 @@ func (d *DNS) DNSFlags(hidden bool) []cli.Flag {
 	return []cli.Flag{
 		cli.StringSliceFlag{
 			Name:   "dns-server",
-			Value:  &d.dns,
+			Value:  &d.DNS,
 			Usage:  "DNS server for the client, public, and management networks. Defaults to 8.8.8.8 and 8.8.4.4 when VCH uses static IP",
 			Hidden: hidden,
 		},
@@ -41,13 +41,13 @@ func (d *DNS) DNSFlags(hidden bool) []cli.Flag {
 }
 
 // processDNSServers parses DNS servers used for client, public, mgmt networks
-func (d *DNS) ProcessDNSServers() ([]net.IP, error) {
+func (d *DNS) ProcessDNSServers(op trace.Operation) ([]net.IP, error) {
 	var parsedDNS []net.IP
-	if len(d.dns) > 0 {
+	if len(d.DNS) > 0 {
 		d.IsSet = true
 	}
 
-	for _, n := range d.dns {
+	for _, n := range d.DNS {
 		if n != "" {
 			s := net.ParseIP(n)
 			if s == nil {
@@ -58,9 +58,9 @@ func (d *DNS) ProcessDNSServers() ([]net.IP, error) {
 	}
 
 	if len(parsedDNS) > 3 {
-		log.Warn("Maximum of 3 DNS servers allowed. Additional servers specified will be ignored.")
+		op.Warn("Maximum of 3 DNS servers allowed. Additional servers specified will be ignored.")
 	}
 
-	log.Debugf("VCH DNS servers: %s", parsedDNS)
+	op.Debugf("VCH DNS servers: %s", parsedDNS)
 	return parsedDNS, nil
 }
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images.go
index 0fd9351e78..54eeb9bb4f 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images.go
@@ -20,7 +20,6 @@ import (
 	"path/filepath"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/errors"
@@ -72,8 +71,8 @@ func (i *Images) ImageFlags(hidden bool) []cli.Flag {
 	}
 }
 
-func (i *Images) CheckImagesFiles(force bool) (map[string]string, error) {
-	defer trace.End(trace.Begin(""))
+func (i *Images) CheckImagesFiles(op trace.Operation, force bool) (map[string]string, error) {
+	defer trace.End(trace.Begin("", op))
 
 	i.OSType = "linux"
 	// detect images files
@@ -106,13 +105,13 @@ func (i *Images) CheckImagesFiles(force bool) (map[string]string, error) {
 		}
 
 		if os.IsNotExist(err) {
-			log.Warnf("\t\tUnable to locate %s in the current or installer directory.", img)
+			op.Warnf("\t\tUnable to locate %s in the current or installer directory.", img)
 			return nil, err
 		}
 
-		version, err := i.checkImageVersion(img, force)
+		version, err := i.checkImageVersion(op, img, force)
 		if err != nil {
-			log.Error(err)
+			op.Error(err)
 			return nil, err
 		}
 		versionedName := fmt.Sprintf("%s-%s", version, name)
@@ -128,8 +127,8 @@ func (i *Images) CheckImagesFiles(force bool) (map[string]string, error) {
 }
 
 // GetImageVersion will read iso file version from Primary Volume Descriptor, field "Publisher Identifier"
-func (i *Images) GetImageVersion(img string) (string, error) {
-	defer trace.End(trace.Begin(""))
+func (i *Images) GetImageVersion(op trace.Operation, img string) (string, error) {
+	defer trace.End(trace.Begin("", op))
 
 	f, err := os.Open(img)
 	if err != nil {
@@ -160,20 +159,20 @@ func (i *Images) GetImageVersion(img string) (string, error) {
 	return "version-unknown", nil
 }
 
-func (i *Images) checkImageVersion(img string, force bool) (string, error) {
-	defer trace.End(trace.Begin(""))
+func (i *Images) checkImageVersion(op trace.Operation, img string, force bool) (string, error) {
+	defer trace.End(trace.Begin("", op))
 
-	ver, err := i.GetImageVersion(img)
+	ver, err := i.GetImageVersion(op, img)
 	if err != nil {
 		return "", err
 	}
-	sv := i.getNoCommitHashVersion(ver)
+	sv := i.getNoCommitHashVersion(op, ver)
 	if sv == "" {
-		log.Debugf("Version is not set in %q", img)
+		op.Debugf("Version is not set in %q", img)
 		ver = ""
 	}
 
-	installerSV := i.getNoCommitHashVersion(version.GetBuild().ShortVersion())
+	installerSV := i.getNoCommitHashVersion(op, version.GetBuild().ShortVersion())
 
 	// here compare version without last commit hash, to make developer life easier
 	if !strings.EqualFold(installerSV, sv) {
@@ -181,13 +180,13 @@ func (i *Images) checkImageVersion(img string, force bool) (string, error) {
 		if !force {
 			return "", errors.Errorf("%s. Specify --force to force create. ", message)
 		}
-		log.Warn(message)
+		op.Warn(message)
 	}
 	return ver, nil
 }
 
-func (i *Images) getNoCommitHashVersion(version string) string {
-	defer trace.End(trace.Begin(""))
+func (i *Images) getNoCommitHashVersion(op trace.Operation, version string) string {
+	defer trace.End(trace.Begin("", op))
 
 	j := strings.LastIndex(version, "-")
 	if j == -1 {
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images_test.go
deleted file mode 100644
index db61516a4e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/images_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-)
-
-var (
-	image = &Images{}
-)
-
-func TestImageNotFound(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	tmpfile, err := ioutil.TempFile("", "appIso")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer os.Remove(tmpfile.Name()) // clean up
-
-	image.ApplianceISO = tmpfile.Name()
-	image.OSType = "linux"
-	if _, err = image.CheckImagesFiles(false); err == nil {
-		t.Errorf("Error is expected for boot iso file is not found.")
-	}
-}
-
-func writeImageVersion(fileName string, version string) error {
-	f, err := os.OpenFile(fileName, os.O_APPEND|os.O_WRONLY, os.ModeAppend)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	if err := f.Truncate(int64(0x10*2048) + 318); err != nil {
-		return err
-	}
-	if _, err := f.WriteAt([]byte(version), int64(0x10*2048)+318); err != nil {
-		return err
-	}
-	return nil
-}
-
-func TestImageChecks(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	tmpfile, err := ioutil.TempFile("", "bootIso")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	defer os.Remove(tmpfile.Name()) // clean up
-
-	_, err = os.Create("appliance.iso")
-	if err != nil {
-		t.Errorf("Failed to create default appliance iso file")
-	}
-	defer os.Remove("appliance.iso")
-
-	image.ApplianceISO = ""
-	image.BootstrapISO = tmpfile.Name()
-	image.OSType = "linux"
-	var imageFiles map[string]string
-	if _, err = image.CheckImagesFiles(false); err == nil {
-		t.Errorf("Error is expected")
-	}
-
-	if err = writeImageVersion("appliance.iso", "Inc. 0.1-000-abcd"); err != nil {
-		t.Error(err)
-	}
-	if err = writeImageVersion(tmpfile.Name(), "Inc. 0.1-000-abcd"); err != nil {
-		t.Error(err)
-	}
-
-	cliContext := &cli.Context{
-		App: &cli.App{
-			Version: "Inconsistent",
-		},
-	}
-	if _, err = image.CheckImagesFiles(false); err == nil {
-		t.Errorf("Error is expected")
-	}
-
-	cliContext.App.Version = "0.1-000-abcd"
-	if imageFiles, err = image.CheckImagesFiles(true); err != nil {
-		t.Errorf("Error is returned: %s", err)
-	}
-	found := false
-	for _, file := range imageFiles {
-		if file == tmpfile.Name() {
-			found = true
-			break
-		}
-	}
-	if !found {
-		t.Errorf("Image file list does not contain input, %s", imageFiles)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/limits.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/limits.go
index 52c1cfc5bf..186564f6da 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/limits.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/limits.go
@@ -71,7 +71,7 @@ func (r *ResourceLimits) VCHCPULimitFlags(hidden bool) []cli.Flag {
 		cli.GenericFlag{
 			Name:   "cpu-shares, cpus",
 			Value:  flags.NewSharesFlag(&r.VCHCPUShares),
-			Usage:  "VCH VCH resource pool vCPUs shares, in level or share number, e.g. high, normal, low, or 4000",
+			Usage:  "VCH resource pool vCPUs shares, in level or share number, e.g. high, normal, low, or 4000",
 			Hidden: hidden,
 		},
 	}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/operation.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/operation.go
new file mode 100644
index 0000000000..516d7406d0
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/operation.go
@@ -0,0 +1,38 @@
+// Copyright 2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package common
+
+import (
+	"context"
+
+	"github.com/Sirupsen/logrus"
+	"gopkg.in/urfave/cli.v1"
+
+	"github.com/vmware/vic/pkg/trace"
+)
+
+func NewOperation(clic *cli.Context, debug *int) trace.Operation {
+	op := trace.NewOperation(context.Background(), clic.App.Name)
+	op.Logger = logrus.New()
+	op.Logger.Out = clic.App.Writer
+
+	if debug != nil && *debug > 0 {
+		logrus.SetLevel(logrus.DebugLevel)
+		trace.Logger.Level = logrus.DebugLevel
+		op.Logger.Level = logrus.DebugLevel
+	}
+
+	return op
+}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials.go
index d1a4ae33f2..b7bb26711d 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials.go
@@ -1,4 +1,4 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,18 +18,19 @@ import (
 	"fmt"
 	"os"
 
-	log "github.com/Sirupsen/logrus"
 	"golang.org/x/crypto/ssh/terminal"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/errors"
 	"github.com/vmware/vic/pkg/flags"
+	"github.com/vmware/vic/pkg/trace"
 )
 
 // OpsCredentials holds credentials for the VCH operations user
 type OpsCredentials struct {
 	OpsUser     *string `cmd:"ops-user"`
 	OpsPassword *string
+	GrantPerms  *bool
 	IsSet       bool
 }
 
@@ -47,6 +48,12 @@ func (o *OpsCredentials) Flags(hidden bool) []cli.Flag {
 			Usage:  "Password or token for the operations user. Defaults to the credential supplied with target",
 			Hidden: hidden,
 		},
+		cli.GenericFlag{
+			Name:   "ops-grant-perms",
+			Value:  flags.NewOptionalBool(&o.GrantPerms),
+			Usage:  "Create roles and grant required permissions to the specified ops-user",
+			Hidden: hidden,
+		},
 	}
 }
 
@@ -54,19 +61,27 @@ func (o *OpsCredentials) Flags(hidden bool) []cli.Flag {
 // during a VCH create operation, adminUser and adminPassword must be supplied to
 // be used as ops credentials if they are not specified by the user. For a configure
 // operation, adminUser and adminPassword are not needed.
-func (o *OpsCredentials) ProcessOpsCredentials(isCreateOp bool, adminUser string, adminPassword *string) error {
+func (o *OpsCredentials) ProcessOpsCredentials(op trace.Operation, isCreateOp bool, adminUser string, adminPassword *string) error {
 	if o.OpsUser == nil && o.OpsPassword != nil {
-		return errors.New("Password for operations user specified without user having been specified")
+		return errors.New("Password for operations user specified without operations username")
 	}
 
 	if isCreateOp {
 		if o.OpsUser == nil {
-			log.Warn("Using administrative user for VCH operation - use --ops-user to improve security (see -x for advanced help)")
+			// Check if there was a request to setup ops-user Roles and Permissions
+			if o.GrantPerms != nil {
+				// If true return error
+				if *o.GrantPerms {
+					return errors.Errorf("Invalid use of flag: --ops-grant-perms. Cannot setup Roles and Permissions for administrative user.")
+				}
+				// If false ignore
+				o.GrantPerms = nil
+			}
+			op.Warn("Using administrative user for VCH operation - use --ops-user to improve security (see -x for advanced help)")
 			o.OpsUser = &adminUser
 			if adminPassword == nil {
 				return errors.New("Unable to use nil password from administrative user for operations user")
 			}
-
 			o.OpsPassword = adminPassword
 			return nil
 		}
@@ -83,7 +98,7 @@ func (o *OpsCredentials) ProcessOpsCredentials(isCreateOp bool, adminUser string
 	// Prompt for the ops password only during a create operation or a configure
 	// operation where the ops user is specified.
 	if isCreateOp || o.IsSet {
-		log.Printf("vSphere password for %s: ", *o.OpsUser)
+		op.Infof("vSphere password for %s: ", *o.OpsUser)
 		b, err := terminal.ReadPassword(int(os.Stdin.Fd()))
 		if err != nil {
 			message := fmt.Sprintf("Failed to read password from stdin: %s", err)
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials_test.go
deleted file mode 100644
index e041554687..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/ops_credentials_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestProcessOpsCredentials(t *testing.T) {
-	createOps := &OpsCredentials{}
-	isCreateOp := true
-	adminUser := "admin"
-	adminPassword := ""
-
-	// There should be an error if the admin password is not specified for a create operation.
-	err := createOps.ProcessOpsCredentials(isCreateOp, adminUser, nil)
-	assert.NotNil(t, err)
-
-	err = createOps.ProcessOpsCredentials(isCreateOp, adminUser, &adminPassword)
-	assert.NoError(t, err)
-	assert.Equal(t, *createOps.OpsUser, adminUser)
-	assert.Equal(t, *createOps.OpsPassword, adminPassword)
-
-	opsUser := "op"
-	opsPassword := "opPass"
-	createOps.OpsUser = &opsUser
-	createOps.OpsPassword = &opsPassword
-	err = createOps.ProcessOpsCredentials(isCreateOp, adminUser, &adminPassword)
-	assert.NoError(t, err)
-	assert.Equal(t, *createOps.OpsUser, opsUser)
-	assert.Equal(t, *createOps.OpsPassword, opsPassword)
-
-	// Ensure that fields are set correctly for a configure operation.
-	configureOps := &OpsCredentials{
-		OpsUser:     &opsUser,
-		OpsPassword: &opsPassword,
-	}
-	isCreateOp = false
-	err = configureOps.ProcessOpsCredentials(isCreateOp, "", nil)
-	assert.NoError(t, err)
-	assert.True(t, configureOps.IsSet)
-	assert.Equal(t, *createOps.OpsUser, opsUser)
-	assert.Equal(t, *createOps.OpsPassword, opsPassword)
-
-	// There should be an error if the ops-password is specified without ops-user.
-	configureOps.OpsUser = nil
-	err = configureOps.ProcessOpsCredentials(isCreateOp, "", nil)
-	assert.NotNil(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/registries.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/registries.go
index 364892fe81..8c56d7d162 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/registries.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/registries.go
@@ -17,7 +17,6 @@ package common
 import (
 	"io/ioutil"
 
-	log "github.com/Sirupsen/logrus"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/errors"
@@ -48,8 +47,8 @@ func (r *Registries) Flags() []cli.Flag {
 }
 
 // LoadRegistryCAs loads additional CA certs for docker registry usage
-func (r *Registries) loadRegistryCAs() ([]byte, error) {
-	defer trace.End(trace.Begin(""))
+func (r *Registries) loadRegistryCAs(op trace.Operation) ([]byte, error) {
+	defer trace.End(trace.Begin("", op))
 
 	var registryCerts []byte
 	for _, f := range r.RegistryCAsArg {
@@ -60,16 +59,16 @@ func (r *Registries) loadRegistryCAs() ([]byte, error) {
 		}
 
 		registryCerts = append(registryCerts, b...)
-		log.Infof("Loaded registry CA from %s", f)
+		op.Infof("Loaded registry CA from %s", f)
 	}
 
 	return registryCerts, nil
 }
 
-func (r *Registries) ProcessRegistries() error {
+func (r *Registries) ProcessRegistries(op trace.Operation) error {
 	// load additional certificate authorities for use with registries
 	if len(r.RegistryCAsArg) > 0 {
-		registryCAs, err := r.loadRegistryCAs()
+		registryCAs, err := r.loadRegistryCAs(op)
 		if err != nil {
 			return errors.Errorf("Unable to load CA certificates for registry logins: %s", err)
 		}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target.go
index 24dc9bbc2d..e96e5e5fe5 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target.go
@@ -19,20 +19,20 @@ import (
 	"net/url"
 	"os"
 
-	log "github.com/Sirupsen/logrus"
+	"golang.org/x/crypto/ssh/terminal"
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/flags"
-
-	"golang.org/x/crypto/ssh/terminal"
+	"github.com/vmware/vic/pkg/trace"
 )
 
 type Target struct {
 	URL *url.URL `cmd:"target"`
 
-	User       string
-	Password   *string
-	Thumbprint string `cmd:"thumbprint"`
+	User        string
+	Password    *string
+	CloneTicket string
+	Thumbprint  string `cmd:"thumbprint"`
 }
 
 func NewTarget() *Target {
@@ -71,11 +71,17 @@ func (t *Target) TargetFlags() []cli.Flag {
 }
 
 // HasCredentials check that the credentials have been supplied by any of the permitted mechanisms
-func (t *Target) HasCredentials() error {
+func (t *Target) HasCredentials(op trace.Operation) error {
 	if t.URL == nil {
 		return cli.NewExitError("--target argument must be specified", 1)
 	}
 
+	// assume if a vsphere session key exists, we want to use that instead of user/pass
+	if t.CloneTicket != "" {
+		t.URL.User = nil // necessary?
+		return nil
+	}
+
 	var urlUser string
 	var urlPassword *string
 
@@ -93,7 +99,7 @@ func (t *Target) HasCredentials() error {
 
 	//prompt for passwd if not specified
 	if t.Password == nil && urlPassword == nil {
-		log.Printf("vSphere password for %s: ", t.User)
+		op.Infof("vSphere password for %s: ", t.User)
 		b, err := terminal.ReadPassword(int(os.Stdin.Fd()))
 		if err != nil {
 			message := fmt.Sprintf("Failed to read password from stdin: %s", err)
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target_test.go
deleted file mode 100644
index 997bbb1a94..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/target_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"net/url"
-	"testing"
-
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/govmomi/vim25/soap"
-)
-
-func TestFlags(t *testing.T) {
-	target := NewTarget()
-	flags := target.TargetFlags()
-
-	if len(flags) != 4 {
-		t.Errorf("Wrong flag numbers")
-	}
-}
-
-func TestProcess(t *testing.T) {
-	passwd := "pass"
-	url1, _ := soap.ParseURL("127.0.0.1")
-	url2, _ := soap.ParseURL("root:@127.0.0.1")
-	url3, _ := soap.ParseURL("line:password@127.0.0.1")
-	url4, _ := soap.ParseURL("root:pass@127.0.0.1")
-	result, _ := url.Parse("https://root:pass@127.0.0.1/sdk")
-	passEmpty := ""
-	result1, _ := url.Parse("https://root:@127.0.0.1/sdk")
-	tests := []struct {
-		URL      *url.URL
-		User     string
-		Password *string
-
-		err    error
-		result *url.URL
-	}{
-		{nil, "", nil, cli.NewExitError("--target argument must be specified", 1), nil},
-		{nil, "root", nil, cli.NewExitError("--target argument must be specified", 1), nil},
-		{nil, "root", &passwd, cli.NewExitError("--target argument must be specified", 1), nil},
-		{url1, "root", &passwd, nil, result},
-		{url4, "", nil, nil, result},
-		{url3, "root", &passwd, nil, result},
-		{url2, "", &passwd, nil, result},
-		{url1, "root", &passEmpty, nil, result1},
-	}
-
-	for _, test := range tests {
-		target := NewTarget()
-		target.URL = test.URL
-		target.User = test.User
-		target.Password = test.Password
-		if target.URL != nil {
-			t.Logf("Before processing, url: %s", target.URL.String())
-		}
-		e := target.HasCredentials()
-		if test.err != nil {
-			if e == nil {
-				t.Errorf("Empty error")
-			}
-			if e.Error() != test.err.Error() {
-				t.Errorf("Unexpected error message: %s", e.Error())
-			}
-		} else if e != nil {
-			t.Errorf("Unexpected error %s", e.Error())
-		} else {
-			if target.URL != test.URL {
-				t.Errorf("unexpected result url: %s", target.URL.String())
-			} else {
-				t.Logf("result url: %s", target.URL.String())
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils.go
index 0889233500..e6144555dc 100644
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils.go
+++ b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils.go
@@ -18,11 +18,10 @@ import (
 	"fmt"
 	"regexp"
 
-	log "github.com/Sirupsen/logrus"
-
 	"gopkg.in/urfave/cli.v1"
 
 	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
 )
 
 const (
@@ -46,13 +45,13 @@ const unsuppCharsDatastoreRegex = `%|&|\*|\$|#|@|!|\\|\?|"|<|>|;|'|\|`
 var reUnsupp = regexp.MustCompile(unsuppCharsRegex)
 var reUnsuppDatastore = regexp.MustCompile(unsuppCharsDatastoreRegex)
 
-func LogErrorIfAny(clic *cli.Context, err error) error {
+func LogErrorIfAny(op trace.Operation, clic *cli.Context, err error) error {
 	if err == nil {
 		return nil
 	}
 
-	log.Errorf("--------------------")
-	log.Errorf("%s %s failed: %s\n", clic.App.Name, clic.Command.Name, errors.ErrorStack(err))
+	op.Errorf("--------------------")
+	op.Errorf("%s %s failed: %s\n", clic.App.Name, clic.Command.Name, errors.ErrorStack(err))
 	return cli.NewExitError("", 1)
 }
 
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils_test.go
deleted file mode 100644
index a64c2d61cb..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/utils_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"testing"
-)
-
-func TestCheckUnsupportedchars(t *testing.T) {
-	tests := []struct {
-		S     string
-		valid bool
-	}{
-		{"anjunabeats", true},
-		{"tony-1", true},
-		{"paavo_1", true},
-		{"jono(1)", true},
-		{"oceanlab (1)", true},
-		{"test%", false},
-		{"test&", false},
-		{"test*", false},
-		{"test$", false},
-		{"test#", false},
-		{"test@", false},
-		{"test!", false},
-		{`test\`, false},
-		{"test/", false},      // U+002F
-		{"test\u002f", false}, // U+002F
-		{`testЯ`, true},       // U+042F
-		{"test\u042f", true},  // U+042F
-		{`testį`, true},       // U+012F
-		{"test\u012f", true},  // U+012F
-		{"test:", false},
-		{"test?", false},
-		{`test"`, false},
-		{"test<", false},
-		{"test>", false},
-		{"test;", false},
-		{"test'", false},
-		{"test|", false},
-		{"test|", false},
-	}
-
-	for _, test := range tests {
-		err := CheckUnsupportedChars(test.S)
-		if err != nil {
-			if test.valid {
-				t.Errorf("got %q, expected pass for %q", err, test.S)
-			}
-			t.Logf("test case %q passed", test.S)
-			continue
-		}
-		if test.valid {
-			t.Logf("test case %q passed", test.S)
-			continue
-		}
-		t.Errorf("got %q, expected error for %q", err, test.S)
-	}
-}
-
-func TestCheckUnsupportedCharsDatastore(t *testing.T) {
-	tests := []struct {
-		S     string
-		valid bool
-	}{
-		{"anjunabeats", true},
-		{"tony-1", true},
-		{"paavo_1", true},
-		{"jono(1)", true},
-		{"oceanlab (1)", true},
-		{"waawn/", true},
-		{"tristate:", true},
-		{"test%", false},
-		{"test&", false},
-		{"test*", false},
-		{"test$", false},
-		{"test#", false},
-		{"test@", false},
-		{"test!", false},      // U+0021
-		{"test\u0021", false}, // U+0021
-		{`testġ`, true},       // U+0121
-		{"test\u0121", true},  // U+0121
-		{`test\`, false},
-		{"test?", false},
-		{`test"`, false},
-		{"test<", false},
-		{"test>", false},
-		{"test;", false},
-		{"test'", false},
-		{"test|", false},
-	}
-
-	for _, test := range tests {
-		err := CheckUnsupportedCharsDatastore(test.S)
-
-		if err != nil {
-			if test.valid {
-				t.Errorf("got %q, expected pass for %q", err, test.S)
-			}
-			t.Logf("test case %q passed", test.S)
-			continue
-		}
-		if test.valid {
-			t.Logf("test case %q passed", test.S)
-			continue
-		}
-		t.Errorf("got %q, expected error for %q", err, test.S)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/volume_stores_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/volume_stores_test.go
deleted file mode 100644
index 3fa9ac648a..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/common/volume_stores_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package common
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestProcessVolumeStoreParam(t *testing.T) {
-	positiveTestCases := []string{
-		"nfs://Shared.Volumes.Org/path/to/store:nfs-volumes",
-		"ds://vsphere.target.here/:root-path",
-		"no.scheme.target:/with/path:ds-store",
-		"looooooooooooooooooooooooooooooong.hoooooooooooooooooooooooooooooooost/short/path:long-check",
-		"nfs://0.0.0.0/ip/check:simple-target",
-		"nfs://prod.shared.storage/vch_prod/volumes:test-label",
-		"ds://0.0.0.0/ip/check?myArg=simple&complex=anotherArg:simple-target:test-label",
-	}
-
-	negativeTestCases := []string{
-		"ds://vsphere.rocks.com/no/label/here",
-		"junk-text-%^()!@#:with-label",
-		"junk-text-%^()!@#-no-label",
-		":no-text",
-		"no-label:",
-		"no-label/with/path",
-	}
-
-	for _, v := range positiveTestCases {
-		target, rawString, label, err := processVolumeStoreParam(v)
-
-		assert.NotNil(t, target, v)
-		assert.NotEqual(t, "", rawString, v)
-		assert.NotEqual(t, "", label, v)
-		assert.Nil(t, err, v)
-	}
-
-	for _, v := range negativeTestCases {
-		target, _, _, err := processVolumeStoreParam(v)
-
-		// here "" is possible for rawString and label so we check for err and nil target.
-		assert.Nil(t, target, v)
-		assert.NotNil(t, err, v)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/configure/configure.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/configure/configure.go
deleted file mode 100644
index 594dfcbbc5..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/configure/configure.go
+++ /dev/null
@@ -1,470 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package configure
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"os"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// Configure has all input parameters for vic-machine configure command
-type Configure struct {
-	*data.Data
-
-	proxies    common.Proxies
-	cNetworks  common.CNetworks
-	dns        common.DNS
-	volStores  common.VolumeStores
-	registries common.Registries
-
-	certificates common.CertFactory
-
-	upgrade  bool
-	executor *management.Dispatcher
-
-	Force bool
-}
-
-func NewConfigure() *Configure {
-	configure := &Configure{}
-	configure.Data = data.NewData()
-
-	return configure
-}
-
-// Flags return all cli flags for configure
-func (c *Configure) Flags() []cli.Flag {
-	util := []cli.Flag{
-		cli.BoolFlag{
-			Name:        "force, f",
-			Usage:       "Force the configure operation",
-			Destination: &c.Force,
-		},
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for configure",
-			Destination: &c.Timeout,
-		},
-		cli.BoolFlag{
-			Name:        "reset-progress",
-			Usage:       "Reset the UpdateInProgress flag. Warning: Do not reset this flag if another upgrade/configure process is running",
-			Destination: &c.ResetInProgressFlag,
-		},
-		cli.BoolFlag{
-			Name:        "rollback",
-			Usage:       "Roll back VCH configuration to before the current upgrade/configure",
-			Destination: &c.Rollback,
-			Hidden:      true,
-		},
-		cli.BoolFlag{
-			Name:        "upgrade",
-			Usage:       "Upgrade VCH to latest version together with configure",
-			Destination: &c.upgrade,
-			Hidden:      true,
-		},
-	}
-
-	dns := c.dns.DNSFlags(false)
-	target := c.TargetFlags()
-	ops := c.OpsCredentials.Flags(false)
-	id := c.IDFlags()
-	volume := c.volStores.Flags()
-	compute := c.ComputeFlags()
-	container := c.ContainerFlags()
-	debug := c.DebugFlags(false)
-	cNetwork := c.cNetworks.CNetworkFlags(false)
-	proxies := c.proxies.ProxyFlags(false)
-	memory := c.VCHMemoryLimitFlags(false)
-	cpu := c.VCHCPULimitFlags(false)
-	certificates := c.certificates.CertFlags()
-	registries := c.registries.Flags()
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, ops, id, compute, container, volume, dns, cNetwork, memory, cpu, certificates, registries, proxies, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (c *Configure) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := c.HasCredentials(); err != nil {
-		return err
-	}
-
-	var err error
-	if c.DNS, err = c.dns.ProcessDNSServers(); err != nil {
-		return err
-	}
-
-	hproxy, sproxy, err := c.proxies.ProcessProxies()
-	if err != nil {
-		return err
-	}
-	c.HTTPProxy = hproxy
-	c.HTTPSProxy = sproxy
-	c.ProxyIsSet = c.proxies.IsSet
-
-	c.ContainerNetworks, err = c.cNetworks.ProcessContainerNetworks()
-	if err != nil {
-		return err
-	}
-
-	// Pass empty admin credentials because they are needed only for a create
-	// operation for use as ops credentials if ops credentials are not supplied.
-	if err := c.OpsCredentials.ProcessOpsCredentials(false, "", nil); err != nil {
-		return err
-	}
-
-	c.VolumeLocations, err = c.volStores.ProcessVolumeStores()
-	if err != nil {
-		return err
-	}
-
-	if err := c.registries.ProcessRegistries(); err != nil {
-		return err
-	}
-	c.Data.RegistryCAs = c.registries.RegistryCAs
-
-	return nil
-}
-
-// copyChangedConf takes the mostly-empty new config and copies it to the old one. NOTE: o gets installed on the VCH, not n
-// Currently we cannot automatically override old configuration with any difference in the new configuration, because some options are set during the VCH
-// Creation process, for example, image store path, volume store path, network slot id, etc. So we'll copy changes based on user input
-func (c *Configure) copyChangedConf(o *config.VirtualContainerHostConfigSpec, n *config.VirtualContainerHostConfigSpec) {
-	//TODO: copy changed data
-	personaSession := o.ExecutorConfig.Sessions[config.PersonaService]
-	vicAdminSession := o.ExecutorConfig.Sessions[config.VicAdminService]
-	if c.proxies.IsSet {
-		hProxy := ""
-		if c.HTTPProxy != nil {
-			hProxy = c.HTTPProxy.String()
-		}
-		sProxy := ""
-		if c.HTTPSProxy != nil {
-			sProxy = c.HTTPSProxy.String()
-		}
-		updateSessionEnv(personaSession, config.GeneralHTTPProxy, hProxy)
-		updateSessionEnv(personaSession, config.GeneralHTTPSProxy, sProxy)
-		updateSessionEnv(vicAdminSession, config.VICAdminHTTPProxy, hProxy)
-		updateSessionEnv(vicAdminSession, config.VICAdminHTTPSProxy, sProxy)
-	}
-
-	if c.Debug.Debug != nil {
-		o.SetDebug(n.Diagnostics.DebugLevel)
-	}
-
-	if c.cNetworks.IsSet {
-		o.ContainerNetworks = n.ContainerNetworks
-	}
-
-	if c.Data.ContainerNameConvention != "" {
-		o.ContainerNameConvention = c.Data.ContainerNameConvention
-	}
-
-	// Copy the new volume store configuration directly since it has the merged
-	// volume store configuration and its datastore URL fields have been populated
-	// correctly by the storage validator. The old configuration has raw fields.
-	o.VolumeLocations = n.VolumeLocations
-
-	if c.OpsCredentials.IsSet {
-		o.Username = n.Username
-		o.Token = n.Token
-	}
-
-	// Copy the thumbprint directly since it has already been validated.
-	o.TargetThumbprint = n.TargetThumbprint
-
-	if c.dns.IsSet {
-		for k, v := range o.ExecutorConfig.Networks {
-			v.Network.Nameservers = n.ExecutorConfig.Networks[k].Network.Nameservers
-			var gw net.IPNet
-			v.Network.Assigned.Gateway = gw
-			v.Network.Assigned.Nameservers = nil
-		}
-	}
-
-	if n.HostCertificate != nil {
-		o.HostCertificate = n.HostCertificate
-	}
-
-	if n.CertificateAuthorities != nil {
-		o.CertificateAuthorities = n.CertificateAuthorities
-	}
-
-	if n.UserCertificates != nil {
-		o.UserCertificates = n.UserCertificates
-	}
-
-	if n.RegistryCertificateAuthorities != nil {
-		o.RegistryCertificateAuthorities = n.RegistryCertificateAuthorities
-	}
-}
-
-func updateSessionEnv(sess *executor.SessionConfig, envName, envValue string) {
-	envs := sess.Cmd.Env
-	var newEnvs []string
-	for _, env := range envs {
-		if strings.HasPrefix(env, envName+"=") {
-			continue
-		}
-		newEnvs = append(newEnvs, env)
-	}
-	if envValue != "" {
-		newEnvs = append(newEnvs, fmt.Sprintf("%s=%s", envName, envValue))
-	}
-	sess.Cmd.Env = newEnvs
-}
-
-func (c *Configure) processCertificates(client, public, management data.NetworkConfig) error {
-
-	if !c.certificates.NoTLSverify && (c.certificates.Skey == "" || c.certificates.Scert == "") {
-		log.Infof("No certificate regeneration requested. No new certificates provided. Certificates left unchanged.")
-		return nil
-	}
-
-	if c.certificates.CertPath == "" {
-		c.certificates.CertPath = c.DisplayName
-	}
-
-	_, err := os.Lstat(c.certificates.CertPath)
-	if err == nil || os.IsExist(err) {
-		return fmt.Errorf("Specified or default certificate output location \"%s\" already exists. Specify a location that does not yet exist with --tls-cert-path to continue or do not specify --tls-noverify if, instead, you want to load certificates from %s", c.certificates.CertPath, c.certificates.CertPath)
-	}
-
-	var debug int
-	if c.Debug.Debug == nil {
-		debug = 0
-	} else {
-		debug = *c.Debug.Debug
-	}
-
-	c.certificates.Networks = common.Networks{
-		ClientNetworkName:     client.Name,
-		ClientNetworkIP:       client.IP.String(),
-		PublicNetworkName:     public.Name,
-		PublicNetworkIP:       public.IP.String(),
-		ManagementNetworkName: management.Name,
-		ManagementNetworkIP:   management.IP.String(),
-	}
-
-	if err := c.certificates.ProcessCertificates(c.DisplayName, c.Force, debug); err != nil {
-		return err
-	}
-
-	c.KeyPEM = c.certificates.KeyPEM
-	c.CertPEM = c.certificates.CertPEM
-	c.ClientCAs = c.certificates.ClientCAs
-	return nil
-}
-
-func (c *Configure) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	// process input parameters, this should reuse same code with create command, to make sure same options are provided
-	if err = c.processParams(); err != nil {
-		return err
-	}
-
-	if c.Debug.Debug != nil && *c.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	// TODO: add additional parameter processing, reuse same code with create command as well
-
-	if c.upgrade {
-		// verify upgrade required parameters here
-	}
-
-	log.Infof("### Configuring VCH ####")
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	validator, err := validate.NewValidator(ctx, c.Data)
-	if err != nil {
-		log.Errorf("Configuring cannot continue - failed to create validator: %s", err)
-		return errors.New("configure failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	_, err = validator.ValidateTarget(ctx, c.Data)
-	if err != nil {
-		log.Errorf("Configuring cannot continue - target validation failed: %s", err)
-		return errors.New("configure failed")
-	}
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, c.Force)
-
-	var vch *vm.VirtualMachine
-	if c.Data.ID != "" {
-		vch, err = executor.NewVCHFromID(c.Data.ID)
-	} else {
-		vch, err = executor.NewVCHFromComputePath(c.Data.ComputeResourcePath, c.Data.DisplayName, validator)
-	}
-	if err != nil {
-		log.Errorf("Failed to get Virtual Container Host %s", c.DisplayName)
-		log.Error(err)
-		return errors.New("configure failed")
-	}
-
-	log.Infof("")
-	log.Infof("VCH ID: %s", vch.Reference().String())
-
-	if c.ResetInProgressFlag {
-		if err = vch.SetVCHUpdateStatus(ctx, false); err != nil {
-			log.Error("Failed to reset UpdateInProgress flag")
-			log.Error(err)
-			return errors.New("configure failed")
-		}
-		log.Infof("Reset UpdateInProgress flag successfully")
-		return nil
-	}
-
-	var vchConfig *config.VirtualContainerHostConfigSpec
-	if c.upgrade {
-		vchConfig, err = executor.FetchAndMigrateVCHConfig(vch)
-	} else {
-		vchConfig, err = executor.GetVCHConfig(vch)
-	}
-	if err != nil {
-		log.Error("Failed to get Virtual Container Host configuration")
-		log.Error(err)
-		return errors.New("configure failed")
-	}
-
-	installerVer := version.GetBuild().PluginVersion
-	if vchConfig.ExecutorConfig.Version == nil {
-		log.Error("Cannot configure VCH with version unavailable")
-		return errors.New("configure failed")
-	}
-	if vchConfig.ExecutorConfig.Version.PluginVersion < installerVer {
-		log.Error(fmt.Sprintf("Cannot configure VCH with version %s, please upgrade first", vchConfig.ExecutorConfig.Version.ShortVersion()))
-		return errors.New("configure failed")
-	}
-
-	// Convert guestinfo *VirtualContainerHost back to *Data, decrypt secret data
-	oldData, err := validate.NewDataFromConfig(ctx, validator.Session.Finder, vchConfig)
-	if err != nil {
-		log.Error("Configuring cannot continue: configuration conversion failed")
-		log.Error(err)
-		return err
-	}
-
-	if err = validate.SetDataFromVM(ctx, validator.Session.Finder, vch, oldData); err != nil {
-		log.Error("Configuring cannot continue: querying configuration from VM failed")
-		log.Error(err)
-		return err
-	}
-
-	// using new configuration override configuration query from guestinfo
-	if err = oldData.CopyNonEmpty(c.Data); err != nil {
-		log.Error("Configuring cannot continue: copying configuration failed")
-		return err
-	}
-	c.Data = oldData
-
-	// in Create we process certificates as part of processParams but we need the old conf
-	// to do this in the context of Configure so we need to call this method here instead
-	if err = c.processCertificates(c.Data.ClientNetwork, c.Data.PublicNetwork, c.Data.ManagementNetwork); err != nil {
-		return err
-	}
-
-	// evaluate merged configuration
-	newConfig, err := validator.Validate(ctx, c.Data)
-	if err != nil {
-		log.Error("Configuring cannot continue: configuration validation failed")
-		return err
-	}
-
-	// TODO: copy changed configuration here. https://github.com/vmware/vic/issues/2911
-	c.copyChangedConf(vchConfig, newConfig)
-
-	vConfig := validator.AddDeprecatedFields(ctx, vchConfig, c.Data)
-	vConfig.Timeout = c.Timeout
-	vConfig.VCHSizeIsSet = c.ResourceLimits.IsSet
-
-	updating, err := vch.VCHUpdateStatus(ctx)
-	if err != nil {
-		log.Error("Unable to determine if upgrade/configure is in progress")
-		log.Error(err)
-		return errors.New("configure failed")
-	}
-	if updating {
-		log.Error("Configure failed: another upgrade/configure operation is in progress")
-		log.Error("If no other upgrade/configure process is running, use --reset-progress to reset the VCH upgrade/configure status")
-		return errors.New("configure failed")
-	}
-
-	if err = vch.SetVCHUpdateStatus(ctx, true); err != nil {
-		log.Error("Failed to set UpdateInProgress flag to true")
-		log.Error(err)
-		return errors.New("configure failed")
-	}
-
-	defer func() {
-		if err = vch.SetVCHUpdateStatus(ctx, false); err != nil {
-			log.Error("Failed to reset UpdateInProgress")
-			log.Error(err)
-		}
-	}()
-
-	if !c.Data.Rollback {
-		err = executor.Configure(vch, vchConfig, vConfig, true)
-	} else {
-		err = executor.Rollback(vch, vchConfig, vConfig)
-	}
-
-	if err != nil {
-		// configure failed
-		executor.CollectDiagnosticLogs()
-		return errors.New("configure failed")
-	}
-
-	log.Infof("Completed successfully")
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter.go
deleted file mode 100644
index 7fb37b01b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter.go
+++ /dev/null
@@ -1,576 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package converter
-
-import (
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/ip"
-	viclog "github.com/vmware/vic/pkg/log"
-)
-
-const (
-	cmdTag         = "cmd"
-	labelTag       = "label"
-	parentTagValue = "parent"
-
-	optionSeparator = "-"
-
-	keyAfterValueLabel = "value-key"
-	valueAfterKeyLabel = "key-value"
-)
-
-var (
-	kindConverters = make(map[reflect.Kind]converter)
-	typeConverters = make(map[string]converter)
-	labelHandlers  = make(map[string]labelConverter)
-)
-
-var log = &logrus.Logger{
-	Out: os.Stderr,
-	// We're using our own text formatter to skip the \n and \t escaping logrus
-	// was doing on non TTY Out (we redirect to a file) descriptors.
-	Formatter: viclog.NewTextFormatter(),
-	Hooks:     make(logrus.LevelHooks),
-	Level:     logrus.InfoLevel,
-}
-
-type converter func(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error
-type labelConverter func(dest map[string][]string, key string) error
-
-func init() {
-	kindConverters[reflect.Struct] = convertStruct
-	kindConverters[reflect.Slice] = convertSlice
-	kindConverters[reflect.Map] = convertMap
-	kindConverters[reflect.String] = convertString
-	kindConverters[reflect.Ptr] = convertPtr
-	kindConverters[reflect.Int] = convertPrimitive
-	kindConverters[reflect.Int8] = convertPrimitive
-	kindConverters[reflect.Int16] = convertPrimitive
-	kindConverters[reflect.Int32] = convertPrimitive
-	kindConverters[reflect.Int64] = convertPrimitive
-	kindConverters[reflect.Bool] = convertPrimitive
-	kindConverters[reflect.Float32] = convertPrimitive
-	kindConverters[reflect.Float64] = convertPrimitive
-
-	typeConverters["url.URL"] = convertURL
-	typeConverters["net.IPNet"] = convertIPNet
-	typeConverters["net.IP"] = convertIP
-	typeConverters["ip.Range"] = convertIPRange
-	typeConverters["data.NetworkConfig"] = convertNetwork
-	typeConverters["common.ContainerNetworks"] = convertContainerNetworks
-	typeConverters["executor.TrustLevel"] = convertTrustLevel
-	typeConverters["types.SharesInfo"] = convertShares
-
-	labelHandlers[keyAfterValueLabel] = keyAfterValueLabelHandler
-	labelHandlers[valueAfterKeyLabel] = valueAfterKeyLabelHandler
-}
-
-func EnableLog() {
-	log.Level = logrus.DebugLevel
-}
-
-func DisableLog() {
-	log.Level = logrus.InfoLevel
-}
-
-// DataToOption convert data.Data structure to vic-machine create command options based on tags defined in data.Data structure
-// Note: need to make sure the tags are consistent with command line option name
-func DataToOption(data *data.Data) (map[string][]string, error) {
-	result := make(map[string][]string)
-
-	if data == nil {
-		return result, nil
-	}
-	err := convert(reflect.ValueOf(data), "", "", result)
-	return result, err
-}
-
-func convert(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	t := src.Type().String()
-	if converter, ok := typeConverters[t]; ok {
-		return converter(src, prefix, tags, dest)
-
-	}
-	if converter, ok := kindConverters[src.Kind()]; ok {
-		return converter(src, prefix, tags, dest)
-	}
-	log.Debugf("Skipping unsupported field, interface: %#v, kind %s", src, src.Kind())
-	return nil
-}
-
-func convertPtr(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	if src.IsNil() {
-		// no need to attempt anything
-		return nil
-	}
-	return convert(src.Elem(), prefix, tags, dest)
-}
-
-func convertStruct(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertStruct: prefix: %s, src: %s", prefix, src.String())
-
-	// iterate through every field in the struct
-	for i := 0; i < src.NumField(); i++ {
-		field := src.Field(i)
-		// get field key, and keep going even if the attribute key is empty, to make sure children attribute is not missing
-		tags := src.Type().Field(i).Tag
-		key := calculateKey(tags, prefix)
-		if err := convert(field, key, tags, dest); err != nil {
-			return err
-		}
-
-		if field.Kind() == reflect.Map {
-			// label handler is invoked in map converter
-			continue
-		}
-	}
-	return nil
-}
-
-func convertSlice(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertSlice: prefix: %s, src: %s", prefix, src)
-
-	length := src.Len()
-	if length == 0 {
-		log.Debug("Skipping empty slice")
-		return nil
-	}
-
-	for i := 0; i < length; i++ {
-		if err := convert(src.Index(i), prefix, tags, dest); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func convertMap(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertMap: prefix: %s, src: %s", prefix, src)
-
-	// iterate over keys and recurse
-	mkeys := src.MapKeys()
-	length := len(mkeys)
-	if length == 0 {
-		log.Debug("Skipping empty map")
-		return nil
-	}
-
-	handler, hasHandler := labelHandlers[tags.Get(labelTag)]
-	// use tempMap to avoid duplicate processing
-	for _, pkey := range src.MapKeys() {
-		tempMap := make(map[string][]string)
-		if pkey.Kind() != reflect.String {
-			log.Errorf("Unsupported map key type interface: %s, kind %s", src, src.Kind())
-			continue
-		}
-		if !hasHandler {
-			if err := convert(src.MapIndex(pkey), prefix, tags, dest); err != nil {
-				return err
-			}
-			continue
-		}
-		if err := convert(src.MapIndex(pkey), prefix, tags, tempMap); err != nil {
-			return err
-		}
-		if err := handler(tempMap, pkey.String()); err != nil {
-			return err
-		}
-		for k, v := range tempMap {
-			addValues(dest, k, v)
-		}
-	}
-	return nil
-}
-
-// keyAfterValueLabelHandler will add the map key as label after the value,
-// e.g. change from datastore/path to datastore/path:default
-func keyAfterValueLabelHandler(dest map[string][]string, pkey string) error {
-	log.Debugf("keyAfterValueLabelHandler: map key: %s, map: %#v", pkey, dest)
-
-	for _, values := range dest {
-		for i := range values {
-			values[i] = fmt.Sprintf("%s:%s", values[i], pkey)
-		}
-	}
-	return nil
-}
-
-// valueAfterKeyLabelHandler will add the map key as label before the value,
-// e.g. change from 10.10.10.0/24 to management:10.10.10.0/24
-func valueAfterKeyLabelHandler(dest map[string][]string, pkey string) error {
-	log.Debugf("valueAfterKeyLabelHandler: map key: %s, map: %#v", pkey, dest)
-
-	for _, values := range dest {
-		for i := range values {
-			values[i] = fmt.Sprintf("%s:%s", pkey, values[i])
-		}
-	}
-	return nil
-}
-
-// calculateKey generate key as prefix-tag. if any one is empty, return the other
-func calculateKey(tags reflect.StructTag, prefix string) string {
-	tag := tags.Get(cmdTag)
-	if tag == "" {
-		return prefix
-	}
-	if tag == parentTagValue && prefix == "" {
-		return ""
-	}
-	if tag == parentTagValue && prefix != "" {
-		// for this tag, use parent name only
-		return prefix
-	}
-	if prefix == "" {
-		return tag
-	}
-	return fmt.Sprintf("%s%s%s", prefix, optionSeparator, tag)
-}
-
-func convertURL(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertURL: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	u, ok := src.Interface().(url.URL)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not URL"))
-	}
-	v := u.String()
-	if u.Scheme == "" {
-		if u.Path == "" {
-			v = u.Host
-		} else if u.Host == "" {
-			v = u.Path
-		} else {
-			v = fmt.Sprintf("%s/%s", u.Host, u.Path)
-		}
-	}
-
-	log.Debugf("%s=%s", prefix, v)
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertIPNet(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertIPNet: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	ipNet, ok := src.Interface().(net.IPNet)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not IPNet"))
-	}
-	if ip.IsUnspecifiedSubnet(&ipNet) {
-		return nil
-	}
-	v := ipNet.String()
-
-	log.Debugf("%s=%s", prefix, v)
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertIP(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertIP: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	ipAddr, ok := src.Interface().(net.IP)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not IP"))
-	}
-	if ip.IsUnspecifiedIP(ipAddr) {
-		return nil
-	}
-	v := ipAddr.String()
-
-	log.Debugf("%s=%s", prefix, v)
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertTrustLevel(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertTrustLevel: prefix: %s, src: %s", prefix, src.String())
-	trustLevel, ok := src.Interface().(executor.TrustLevel)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not TrustLevel"))
-	}
-	if trustLevel == executor.Unspecified {
-		return nil
-	}
-	v := trustLevel.String()
-
-	log.Debugf("%s=%s", prefix, v)
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertIPRange(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertIPRange: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	ipRange, ok := src.Interface().(ip.Range)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not ip range"))
-	}
-	v := ipRange.String()
-	if v == "" {
-		return nil
-	}
-
-	log.Debugf("%s=%s", prefix, v)
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertString(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertString: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	v := src.String()
-	if v == "" {
-		return nil
-	}
-
-	log.Debugf("%s=%s", prefix, v)
-
-	addValue(dest, prefix, v)
-	return nil
-}
-
-func convertPrimitive(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertPrimitive: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	v := ""
-	switch src.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		if src.Int() == 0 {
-			return nil
-		}
-		v = strconv.FormatInt(src.Int(), 10)
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		if src.Uint() == 0 {
-			return nil
-		}
-		v = strconv.FormatUint(src.Uint(), 10)
-	case reflect.Bool:
-		if !src.Bool() {
-			return nil
-		}
-		v = strconv.FormatBool(src.Bool())
-	case reflect.Float32, reflect.Float64:
-		if src.Float() == 0 {
-			return nil
-		}
-		v = strconv.FormatFloat(src.Float(), 'E', -1, 64)
-	default:
-		panic(fmt.Sprintf("%s is not supported type", src.Kind()))
-	}
-	log.Debugf("%s=%s", prefix, v)
-
-	addValue(dest, prefix, v)
-	return nil
-}
-
-// convertNetwork will merge destination and gateway to one option with format: 192.168.3.0/16,192.168.128.0/16:192.168.2.1
-// after that, convertStruct is called for left conversion
-func convertNetwork(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertNetwork: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	network, ok := src.Interface().(data.NetworkConfig)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not NetworkConfig"))
-	}
-	if !network.IsSet() {
-		return nil
-	}
-
-	if len(network.Destinations) > 0 || !ip.Empty(network.Gateway) {
-		destination := ""
-		if len(network.Destinations) > 0 {
-			for _, d := range network.Destinations {
-				destination = fmt.Sprintf("%s,%s", destination, d.String())
-			}
-			destination = strings.TrimLeft(destination, ",")
-		}
-		gateway := network.Gateway.IP.String()
-		tag := "cmd:\"gateway\""
-		key := calculateKey(reflect.StructTag(tag), prefix)
-		if destination != "" {
-			addValue(dest, key, fmt.Sprintf("%s:%s", destination, gateway))
-		} else {
-			addValue(dest, key, gateway)
-		}
-	}
-	return convertStruct(reflect.ValueOf(network), prefix, tags, dest)
-}
-
-func convertShares(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertShares: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-	shares, ok := src.Interface().(types.SharesInfo)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not SharesInfo"))
-	}
-
-	v := ""
-	switch shares.Level {
-	case types.SharesLevelCustom:
-		v = fmt.Sprintf("%v", shares.Shares)
-	case types.SharesLevelNormal:
-		return nil
-	default:
-		v = string(shares.Level)
-	}
-
-	log.Debugf("%s=%s", prefix, v)
-
-	addValue(dest, prefix, v)
-	return nil
-}
-
-// convertContainerNetworks will switch the map keys in MappedNetworks using value, and replace all keys with the same value in other structure,
-// cause option is using vsphere network name as key label, but guestinfo is using alias as key for easy to use in portlayer
-// after that, convertStruct is called for left conversion
-func convertContainerNetworks(src reflect.Value, prefix string, tags reflect.StructTag, dest map[string][]string) error {
-	log.Debugf("convertContainerNetworks: prefix: %s, src: %s", prefix, src.String())
-
-	if prefix == "" {
-		return nil
-	}
-	if tags.Get(cmdTag) == "" {
-		return nil
-	}
-
-	networks, ok := src.Interface().(common.ContainerNetworks)
-	if !ok {
-		panic(fmt.Sprintf(src.Type().String() + " is not ContainerNetworks"))
-	}
-	if !networks.IsSet() {
-		return nil
-	}
-
-	newMappedNetworks := make(map[string]string, len(networks.MappedNetworks))
-	for k, v := range networks.MappedNetworks {
-		if k == v {
-			newMappedNetworks[v] = k
-			continue
-		}
-		if dns, ok := networks.MappedNetworksDNS[k]; ok {
-			networks.MappedNetworksDNS[v] = dns
-			delete(networks.MappedNetworksDNS, k)
-		}
-		if gateways, ok := networks.MappedNetworksGateways[k]; ok {
-			networks.MappedNetworksGateways[v] = gateways
-			delete(networks.MappedNetworksGateways, k)
-		}
-		if ipRange, ok := networks.MappedNetworksIPRanges[k]; ok {
-			networks.MappedNetworksIPRanges[v] = ipRange
-			delete(networks.MappedNetworksIPRanges, k)
-		}
-		if firewall, ok := networks.MappedNetworksFirewalls[k]; ok {
-			networks.MappedNetworksFirewalls[v] = firewall
-			delete(networks.MappedNetworksFirewalls, k)
-		}
-		newMappedNetworks[v] = k
-	}
-	networks.MappedNetworks = newMappedNetworks
-	return convertStruct(reflect.ValueOf(networks), prefix, tags, dest)
-}
-
-// addValue will append value without duplicates
-func addValue(dest map[string][]string, key, value string) {
-	slice, _ := dest[key]
-	found := false
-	for _, o := range slice {
-		if o == value {
-			found = true
-			break
-		}
-	}
-	if !found {
-		slice = append(slice, value)
-	}
-	dest[key] = slice
-}
-
-// addValues append new value to existing slice if missing
-// as this method is called every time the value is appended, the existing slice will be no duplicates
-func addValues(dest map[string][]string, key string, values []string) {
-	for _, v := range values {
-		addValue(dest, key, v)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter_test.go
deleted file mode 100644
index 84441bcde6..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/converter/converter_test.go
+++ /dev/null
@@ -1,650 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package converter
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/url"
-	"reflect"
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-type testFinder struct {
-}
-
-func (f *testFinder) ObjectReference(ctx context.Context, ref types.ManagedObjectReference) (object.Reference, error) {
-	return testObject{
-		Common: object.NewCommon(nil, ref),
-	}, nil
-}
-
-type testObject struct {
-	object.Common
-}
-
-func (c testObject) Name() string {
-	switch c.Common.Reference().String() {
-	case "DistributedVirtualPortgroup:dvportgroup-357":
-		return "management"
-	case "DistributedVirtualPortgroup:dvportgroup-358":
-		return "vm-network"
-	case "DistributedVirtualPortgroup:dvportgroup-55":
-		return "bridge"
-	case "DistributedVirtualPortgroup:dvportgroup-56":
-		return "external"
-	default:
-		return "unknown"
-	}
-}
-
-func TestMain(t *testing.T) {
-	//	EnableLog()
-	//	trace.Logger.Level = log.DebugLevel
-
-	testInit(t)
-	testConvertImageStore(t)
-	testConvertVolumeStore(t)
-	testConvertVCHName(t)
-	testConvertTarget(t)
-	testConvertOps(t)
-	testConvertBaseImageSize(t)
-	testConvertPublicNetwork(t)
-	testConvertClientNetwork(t)
-	testConvertMgmtNetwork(t)
-	testGuestinfo(t)
-	testConvertSharesInfo(t)
-}
-
-func testInit(t *testing.T) {
-	var ok bool
-	_, ok = kindConverters[reflect.Struct]
-	assert.True(t, ok, fmt.Sprintf("Struct converter is not found"))
-	_, ok = kindConverters[reflect.Slice]
-	assert.True(t, ok, fmt.Sprintf("Slice converter is not found"))
-	_, ok = kindConverters[reflect.Map]
-	assert.True(t, ok, fmt.Sprintf("Map converter is not found"))
-	_, ok = kindConverters[reflect.String]
-	assert.True(t, ok, fmt.Sprintf("String converter is not found"))
-	_, ok = kindConverters[reflect.Ptr]
-	assert.True(t, ok, fmt.Sprintf("Pointer converter is not found"))
-	_, ok = kindConverters[reflect.Int]
-	assert.True(t, ok, fmt.Sprintf("Int converter is not found"))
-	_, ok = kindConverters[reflect.Int8]
-	assert.True(t, ok, fmt.Sprintf("Int8 converter is not found"))
-	_, ok = kindConverters[reflect.Int16]
-	assert.True(t, ok, fmt.Sprintf("Int16 converter is not found"))
-	_, ok = kindConverters[reflect.Int32]
-	assert.True(t, ok, fmt.Sprintf("Int32 converter is not found"))
-	_, ok = kindConverters[reflect.Int64]
-	assert.True(t, ok, fmt.Sprintf("Int64 converter is not found"))
-	_, ok = kindConverters[reflect.Bool]
-	assert.True(t, ok, fmt.Sprintf("Bool converter is not found"))
-	_, ok = kindConverters[reflect.Float32]
-	assert.True(t, ok, fmt.Sprintf("Float32 converter is not found"))
-	_, ok = kindConverters[reflect.Float64]
-	assert.True(t, ok, fmt.Sprintf("Float64 converter is not found"))
-
-	_, ok = typeConverters["url.URL"]
-	assert.True(t, ok, fmt.Sprintf("url.URL converter is not found"))
-	_, ok = typeConverters["net.IPNet"]
-	assert.True(t, ok, fmt.Sprintf("net.IPNet converter is not found"))
-	_, ok = typeConverters["net.IP"]
-	assert.True(t, ok, fmt.Sprintf("net.IP converter is not found"))
-	_, ok = typeConverters["ip.Range"]
-	assert.True(t, ok, fmt.Sprintf("ip.Range converter is not found"))
-	_, ok = typeConverters["data.NetworkConfig"]
-	assert.True(t, ok, fmt.Sprintf("data.NetworkConfig converter is not found"))
-	_, ok = typeConverters["common.ContainerNetworks"]
-	assert.True(t, ok, fmt.Sprintf("common.ContainerNetworks converter is not found"))
-
-	_, ok = labelHandlers[keyAfterValueLabel]
-	assert.True(t, ok, fmt.Sprintf("value-key handler is not found"))
-	_, ok = labelHandlers[valueAfterKeyLabel]
-	assert.True(t, ok, fmt.Sprintf("key-value handler is not found"))
-}
-
-func testConvertImageStore(t *testing.T) {
-	data := data.NewData()
-	data.ImageDatastorePath = "ds://vsan/path"
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 1, len(options), "should not have other option generated")
-	assert.Equal(t, "ds://vsan/path", options["image-store"][0], "not expected image-store option")
-}
-
-func testConvertVolumeStore(t *testing.T) {
-	tests := []struct {
-		in  map[string]*url.URL
-		out []string
-	}{
-		{
-			in: map[string]*url.URL{
-				"default": {
-					Scheme: "ds",
-					Host:   "vsan",
-					Path:   "path/volume",
-				},
-
-				"noSchema": {
-					Host: "vsan",
-					Path: "path1",
-				},
-			},
-			out: []string{
-				"ds://vsan/path/volume:default",
-				"vsan/path1:noSchema",
-			},
-		},
-	}
-	for _, test := range tests {
-		data := data.NewData()
-		data.VolumeLocations = test.in
-		options, err := DataToOption(data)
-		assert.Empty(t, err)
-
-		assert.Equal(t, 1, len(options), "should not have other option generated")
-		vols := options["volume-store"]
-		assert.Equal(t, len(test.out), len(vols), "not expected length")
-		for _, store := range test.out {
-			found := false
-			for _, actual := range vols {
-				if actual == store {
-					found = true
-					break
-				}
-			}
-			assert.True(t, found, fmt.Sprintf("%s is not created", store))
-		}
-	}
-}
-
-func testConvertVCHName(t *testing.T) {
-	data := data.NewData()
-	data.DisplayName = "vch1"
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 1, len(options), "should not have other option generated")
-	assert.Equal(t, "vch1", options["name"][0], "not expected name option")
-}
-
-func testConvertTarget(t *testing.T) {
-	data := data.NewData()
-	data.Target.URL, _ = url.Parse("1.1.1.1")
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 1, len(options), "should not have other option generated")
-	assert.Equal(t, "1.1.1.1", options["target"][0], "not expected target option")
-}
-
-func testConvertOps(t *testing.T) {
-	data := data.NewData()
-	adminUser := "admin"
-	data.OpsCredentials.OpsUser = &adminUser
-	pass := "password"
-	data.OpsCredentials.OpsPassword = &pass
-	data.Thumbprint = "uuidstring"
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-
-	assert.Equal(t, 2, len(options), "should not have other option generated")
-	assert.Equal(t, *data.OpsCredentials.OpsUser, options["ops-user"][0], "not expected ops-user option")
-	assert.Equal(t, data.Thumbprint, options["thumbprint"][0], "not expected thumbprint option")
-}
-
-func testConvertBaseImageSize(t *testing.T) {
-	data := data.NewData()
-	data.ScratchSize = "8GB"
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 1, len(options), "should not have other option generated")
-	assert.Equal(t, data.ScratchSize, options["base-image-size"][0], "not expected base-image-size option")
-}
-
-func testConvertBridgeNetwork(t *testing.T) {
-	_, ipnet, _ := net.ParseCIDR("172.16.0.0/12")
-
-	data := data.NewData()
-	data.BridgeIPRange = ipnet
-	data.BridgeNetworkName = "portgroup1"
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 2, len(options), "should not have other option generated")
-	assert.Equal(t, "172.16.0.0/12", options["bridge-network-range"][0], "not expected bridge-network-range option")
-	assert.Equal(t, data.BridgeNetworkName, options["bridge-network"][0], "not expected bridge-network option")
-}
-
-func testConvertPublicNetwork(t *testing.T) {
-	gwIP := net.ParseIP("172.16.0.1")
-	_, destination, _ := net.ParseCIDR("172.16.0.0/12")
-	ip, ipNet, _ := net.ParseCIDR("172.16.0.2/12")
-
-	data := data.NewData()
-	data.PublicNetwork.Name = "public"
-	data.PublicNetwork.Gateway.IP = gwIP
-	data.PublicNetwork.Gateway.Mask = ipNet.Mask
-	data.PublicNetwork.IP.IP = ip
-	data.PublicNetwork.IP.Mask = ipNet.Mask
-	data.PublicNetwork.Destinations = append(data.PublicNetwork.Destinations, *destination)
-
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 3, len(options), "should not have other option generated")
-	assert.Equal(t, "172.16.0.0/12:172.16.0.1", options["public-network-gateway"][0], "not expected public-network-gateway option")
-	assert.Equal(t, "172.16.0.2/12", options["public-network-ip"][0], "not expected public-network-ip option")
-}
-
-func testConvertClientNetwork(t *testing.T) {
-	gwIP := net.ParseIP("172.16.0.1")
-	_, destination, _ := net.ParseCIDR("172.16.0.0/12")
-	ip, ipNet, _ := net.ParseCIDR("172.16.0.2/12")
-
-	data := data.NewData()
-	data.ClientNetwork.Name = "public"
-	data.ClientNetwork.Gateway.IP = gwIP
-	data.ClientNetwork.Gateway.Mask = ipNet.Mask
-	data.ClientNetwork.IP.IP = ip
-	data.ClientNetwork.IP.Mask = ipNet.Mask
-	data.ClientNetwork.Destinations = append(data.ClientNetwork.Destinations, *destination)
-
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 3, len(options), "should not have other option generated")
-	assert.Equal(t, "172.16.0.0/12:172.16.0.1", options["client-network-gateway"][0], "not expected client-network-gateway option")
-	assert.Equal(t, "172.16.0.2/12", options["client-network-ip"][0], "not expected client-network-ip option")
-}
-
-func testConvertMgmtNetwork(t *testing.T) {
-	gwIP := net.ParseIP("172.16.0.1")
-	_, destination, _ := net.ParseCIDR("172.16.0.0/12")
-	ip, ipNet, _ := net.ParseCIDR("172.16.0.2/12")
-
-	data := data.NewData()
-	data.ManagementNetwork.Name = "public"
-	data.ManagementNetwork.Gateway.IP = gwIP
-	data.ManagementNetwork.Gateway.Mask = ipNet.Mask
-	data.ManagementNetwork.IP.IP = ip
-	data.ManagementNetwork.IP.Mask = ipNet.Mask
-	data.ManagementNetwork.Destinations = append(data.ManagementNetwork.Destinations, *destination)
-
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 3, len(options), "should not have other option generated")
-	assert.Equal(t, "172.16.0.0/12:172.16.0.1", options["management-network-gateway"][0], "not expected management-network-gateway option")
-	assert.Equal(t, "172.16.0.2/12", options["management-network-ip"][0], "not expected management-network-ip option")
-}
-
-func testConvertContainerNetworks(t *testing.T) {
-	gwIP := net.ParseIP("172.16.0.1")
-	_, destination, _ := net.ParseCIDR("172.16.0.0/12")
-	ip, ipNet, _ := net.ParseCIDR("172.16.0.2/12")
-
-	data := data.NewData()
-	data.ManagementNetwork.Name = "public"
-	data.ManagementNetwork.Gateway.IP = gwIP
-	data.ManagementNetwork.Gateway.Mask = ipNet.Mask
-	data.ManagementNetwork.IP.IP = ip
-	data.ManagementNetwork.IP.Mask = ipNet.Mask
-	data.ManagementNetwork.Destinations = append(data.ManagementNetwork.Destinations, *destination)
-
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 3, len(options), "should not have other option generated")
-	assert.Equal(t, "172.16.0.0/12:172.16.0.1", options["management-network-gateway"][0], "not expected management-network-gateway option")
-	assert.Equal(t, "172.16.0.2/12", options["management-network-ip"][0], "not expected management-network-ip option")
-}
-
-func testConvertSharesInfo(t *testing.T) {
-	data := data.NewData()
-	cLimit, cReserve := 29300, 1024
-	data.NumCPUs = 2
-	data.VCHCPULimitsMHz = &cLimit
-	data.VCHCPUReservationsMHz = &cReserve
-	data.VCHCPUShares = &types.SharesInfo{
-		Shares: 6000,
-		Level:  types.SharesLevelCustom,
-	}
-	mLimit, mReserve := 13144, 1024
-	data.MemoryMB = 4096
-	data.VCHMemoryLimitsMB = &mLimit
-	data.VCHMemoryReservationsMB = &mReserve
-	data.VCHMemoryShares = &types.SharesInfo{
-		Shares: 163840,
-		Level:  types.SharesLevelNormal,
-	}
-
-	options, err := DataToOption(data)
-	assert.Empty(t, err)
-	assert.Equal(t, 7, len(options), "should not have other option generated")
-	assert.Equal(t, "2", options["endpoint-cpu"][0], "not expected endpoint-cpu option")
-	assert.Equal(t, "4096", options["endpoint-memory"][0], "not expected endpoint-memory option")
-	assert.Equal(t, "13144", options["memory"][0], "not expected memory option")
-	assert.Equal(t, "1024", options["memory-reservation"][0], "not expected memory-reservation option")
-	assert.Equal(t, "29300", options["cpu"][0], "not expected cpu option")
-	assert.Equal(t, "1024", options["cpu-reservation"][0], "not expected cpu-reservation option")
-	assert.Equal(t, "6000", options["cpu-shares"][0], "not expected cpu-shares option")
-}
-
-func testGuestinfo(t *testing.T) {
-	kv := map[string]string{
-		"guestinfo.vice..init.sessions|docker-personality.detail.createtime":           "0",
-		"guestinfo.vice./init/sessions|docker-personality/Group":                       "",
-		"init/networks|client/Common/notes":                                            "",
-		"guestinfo.vice./network/container_networks|vnet/gateway/IP":                   "AAAAAAAAAAAAAP//CgoKAQ==",
-		"guestinfo.vice./init/sessions|port-layer/tty":                                 "false",
-		"guestinfo.vice..init.networks|bridge.network.type":                            "bridge",
-		"vmotion.checkpointSVGAPrimarySize":                                            "4194304",
-		"guestinfo.vice./storage/image_stores|0/Host":                                  "vsanDatastore",
-		"guestinfo.vice./init/sessions|vicadmin/stopSignal":                            "",
-		"guestinfo.vice./network/container_networks|vnet/Common/id":                    "DistributedVirtualPortgroup:dvportgroup-357",
-		"guestinfo.vice..init.networks|client.network.assigned.dns|1":                  "CqYBAQ==",
-		"guestinfo.vice..init.sessions|vicadmin.status":                                "0",
-		"guestinfo.vice./init/networks|bridge/Common/id":                               "224",
-		"guestinfo.vice./init/networks|bridge/network/Common/id":                       "DistributedVirtualPortgroup:dvportgroup-55",
-		"guestinfo.vice./init/diagnostics/debug":                                       "3",
-		"guestinfo.vice./storage/VolumeLocations|default/ForceQuery":                   "false",
-		"guestinfo.vice./init/sessions|docker-personality/active":                      "true",
-		"guestinfo.vice./container/ComputeResources":                                   "0",
-		"guestinfo.vice..init.networks|client.network.assigned.gateway.Mask":           "///gAA==",
-		"guestinfo.vice./storage/VolumeLocations|vol1/Opaque":                          "",
-		"guestinfo.vice..init.networks|management.assigned.IP":                         "CsCoOQ==",
-		"guestinfo.vice./init/sessions|port-layer/common/ExecutionEnvironment":         "",
-		"guestinfo.vice./init/sessions|docker-personality/stopSignal":                  "",
-		"init/networks|management/Common/notes":                                        "",
-		"guestinfo.vice./storage/VolumeLocations|vol1/RawPath":                         "",
-		"network/container_networks|bridge/Common/notes":                               "",
-		"guestinfo.vice..network.container_networks|vmnet.type":                        "external",
-		"guestinfo.vice..init.sessions|docker-personality.detail.stoptime":             "0",
-		"guestinfo.vice./init/sessions|vicadmin/cmd/Dir":                               "/home/vicadmin",
-		"guestinfo.vice./connect/keepalive":                                            "0",
-		"guestinfo.vice..init.networks|management.network.type":                        "",
-		"guestinfo.vice./init/sessions|port-layer/common/name":                         "port-layer",
-		"guestinfo.vice..init.networks|public.network.assigned.dns|1":                  "CqYBAQ==",
-		"guestinfo.vice./init/sessions|docker-personality/common/ExecutionEnvironment": "",
-		"guestinfo.vice./init/sessions|vicadmin/openstdin":                             "false",
-		"guestinfo.vice./connect/target_thumbprint":                                    "9F:F0:DF:BA:7F:E2:89:F0:98:E4:A6:D1:58:24:68:74:8A:9B:25:6F",
-		"guestinfo.vice..init.networks|public.network.type":                            "",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Path":                    "/sbin/docker-engine-server",
-		"guestinfo.vice..init.createtime":                                              "0",
-		"guestinfo.vice./init/sessions|port-layer/active":                              "true",
-		"guestinfo.vice./network/container_networks|vnet/pools|0/last":                 "CgoK/w==",
-		"init/sessions|docker-personality/common/notes":                                "",
-		"guestinfo.vice..init.diagnostics.resurrections":                               "0",
-		"guestinfo.vice..init.networks|public.network.assigned.gateway.Mask":           "///gAA==",
-		"guestinfo.vice./init/sessions|port-layer/cmd/Dir":                             "",
-		"guestinfo.vice./network/container_networks|vnet/pools":                        "0",
-		"guestinfo.vice./init/sessions|vicadmin/tty":                                   "false",
-		"guestinfo.vice./storage/image_stores|0/RawPath":                               "",
-		"guestinfo.vice./init/sessions|port-layer/attach":                              "false",
-		"guestinfo.vice./container/ComputeResources|0/Type":                            "VirtualApp",
-		"guestinfo.vice./storage/image_stores|0/Scheme":                                "ds",
-		"guestinfo.vice..init.networks|public.assigned.Mask":                           "///gAA==",
-		"guestinfo.vice./init/networks|bridge/Common/ExecutionEnvironment":             "",
-		"guestinfo.vice./storage/image_stores|0/Path":                                  "91512359-242e-5a30-ba4a-0200360a2e79",
-		"numa.autosize.vcpu.maxPerVirtualNode":                                         "1",
-		"guestinfo.vice./init/version/BuildDate":                                       "2017/05/06@14:16:54",
-		"guestinfo.vice./init/sessions|docker-personality/User":                        "",
-		"guestinfo.vice..init.networks|client.assigned.Mask":                           "///gAA==",
-		"guestinfo.vice./init/networks|management/network/Common/id":                   "DistributedVirtualPortgroup:dvportgroup-56",
-		"guestinfo.vice./connect/target":                                               "https://10.192.171.116",
-		"guestinfo.vice./storage/image_stores|0/RawQuery":                              "",
-		"guestinfo.vice./init/sessions|docker-personality/runblock":                    "false",
-		"guestinfo.vice..init.networks|management.network.assigned.gateway.IP":         "CsC//Q==",
-		"init/networks|management/network/Common/notes":                                "",
-		"guestinfo.vice./init/version/GitCommit":                                       "65a1889",
-		"guestinfo.vice./init/networks|public/Common/name":                             "public",
-		"guestinfo.vice./init/version/Version":                                         "v1.1.0-rc3",
-		"guestinfo.vice./storage/VolumeLocations|vol1/Scheme":                          "ds",
-		"answer.msg.serial.file.open":                                                  "Append",
-		"guestinfo.vice./storage/VolumeLocations|default/Path":                         "[vsanDatastore] volumes/default",
-		"guestinfo.vice..init.networks|management.network.assigned.dns":                "1",
-		"guestinfo.vice./init/networks|public/network/Common/id":                       "DistributedVirtualPortgroup:dvportgroup-56",
-		"guestinfo.vice./storage/image_stores|0/ForceQuery":                            "false",
-		"guestinfo.vice./init/imageid":                                                 "",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Env":                     "3",
-		"guestinfo.vice./init/sessions|docker-personality/common/id":                   "docker-personality",
-		"guestinfo.vice./storage/VolumeLocations|vol1/Fragment":                        "",
-		"guestinfo.vice./init/sessions|vicadmin/cmd/Env":                               "3",
-		"guestinfo.vice./init/sessions|vicadmin/common/ExecutionEnvironment":           "",
-		"guestinfo.vice./init/sessions|vicadmin/User":                                  "vicadmin",
-		"guestinfo.vice..init.networks|public.network.assigned.dns":                    "1",
-		"network/container_networks|vnet/Common/notes":                                 "",
-		"guestinfo.vice./init/sessions|vicadmin/common/id":                             "vicadmin",
-		"guestinfo.vice..init.sessions|docker-personality.diagnostics.resurrections":   "0",
-		"guestinfo.vice./init/sessions|vicadmin/cmd/Args~":                             "/sbin/vicadmin|--dc=vcqaDC|--pool=|--cluster=/vcqaDC/host/cls",
-		"guestinfo.vice./init/networks|public/static":                                  "false",
-		"guestinfo.vice./init/networks|client/network/default":                         "false",
-		"init/networks|public/network/Common/notes":                                    "",
-		"guestinfo.vice./init/sessions|docker-personality/restart":                     "true",
-		"guestinfo.vice./storage/VolumeLocations|vol1/Host":                            "vsanDatastore",
-		"guestinfo.vice./init/networks|bridge/network/Common/name":                     "bridge",
-		"guestinfo.vice..init.sessions|vicadmin.detail.stoptime":                       "0",
-		"guestinfo.vice./container/ComputeResources|0/Value":                           "resgroup-v364",
-		"guestinfo.vice./network/container_networks|vmnet/Common/name":                 "vmnet",
-		"guestinfo.vice./network/container_networks":                                   "bridge|vmnet|vnet",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Args":                    "2",
-		"guestinfo.vice./init/networks|bridge/ip/IP":                                   "AAAAAAAAAAAAAP//AAAAAA==",
-		"guestinfo.vice./init/networks|bridge/network/Common/ExecutionEnvironment":     "",
-		"guestinfo.vice./storage/VolumeLocations|default/RawQuery":                     "",
-		"guestinfo.vice..init.networks|public.assigned.IP":                             "CsCoOQ==",
-		"guestinfo.vice./init/networks|bridge/Common/name":                             "bridge",
-		"guestinfo.vice./init/sessions|port-layer/openstdin":                           "false",
-		"guestinfo.vice./create_bridge_network":                                        "false",
-		"guestinfo.vice./init/networks|management/Common/id":                           "192",
-		"guestinfo.vice..init.networks|management.network.assigned.dns|0":              "CqLMAQ==",
-		"guestinfo.vice..init.networks|public.network.assigned.dns|0":                  "CqLMAQ==",
-		"guestinfo.vice..init.sessions|docker-personality.started":                     "true",
-		"init/networks|public/Common/notes":                                            "",
-		"guestinfo.vice..init.networks|management.network.assigned.dns|1":              "CqYBAQ==",
-		"guestinfo.vice./init/sessions|vicadmin/active":                                "true",
-		"guestinfo.vice./init/networks":                                                "bridge|client|management|public",
-		"guestinfo.vice./init/networks|client/Common/id":                               "192",
-		"guestinfo.vice./network/container_networks|vnet/Common/ExecutionEnvironment":  "",
-		"init/networks|client/network/Common/notes":                                    "",
-		"guestinfo.vice..init.sessions|port-layer.detail.stoptime":                     "0",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Args~":                   "/sbin/docker-engine-server|-port=2376|-port-layer-port=2377",
-		"guestinfo.vice..init.sessions|vicadmin.runblock":                              "false",
-		"guestinfo.vice./init/sessions|port-layer/Group":                               "",
-		"guestinfo.vice./init/version/PluginVersion":                                   "6",
-		"guestinfo.vice./storage/scratch_size":                                         "8000000",
-		"guestinfo.vice./init/networks|client/Common/ExecutionEnvironment":             "",
-		"init/networks|bridge/network/Common/notes":                                    "",
-		"guestinfo.vice./storage/VolumeLocations|default/Scheme":                       "ds",
-		"guestinfo.vice..init.sessions|vicadmin.diagnostics.resurrections":             "0",
-		"guestinfo.vice./storage/VolumeLocations|vol1/ForceQuery":                      "false",
-		"guestinfo.vice./network/container_networks|vmnet/default":                     "false",
-		"guestinfo.vice..init.sessions|vicadmin.detail.createtime":                     "0",
-		"guestinfo.vice./storage/VolumeLocations":                                      "default|vol1",
-		"guestinfo.vice./storage/VolumeLocations|vol1/Path":                            "[vsanDatastore] volumes/vol1",
-		"guestinfo.vice./init/sessions|vicadmin/cmd/Args":                              "3",
-		"guestinfo.vice..init.sessions|docker-personality.runblock":                    "false",
-		"guestinfo.vice./init/version/BuildNumber":                                     "10373",
-		"guestinfo.vice./network/container_networks|vmnet/Common/id":                   "DistributedVirtualPortgroup:dvportgroup-358",
-		"guestinfo.vice./init/networks|client/network/Common/id":                       "DistributedVirtualPortgroup:dvportgroup-56",
-		"guestinfo.vice..init.sessions|docker-personality.status":                      "0",
-		"guestinfo.vice..init.sessions|port-layer.started":                             "true",
-		"guestinfo.vice./init/sessions|port-layer/runblock":                            "false",
-		"guestinfo.vice./init/sessions|port-layer/diagnostics/debug":                   "0",
-		"init/common/name":                                                             "test1",
-		"guestinfo.vice..init.sessions|docker-personality.detail.starttime":            "0",
-		"guestinfo.vice./storage/VolumeLocations|vol1/RawQuery":                        "",
-		"init/common/notes":                                                            "",
-		"guestinfo.vice./network/container_networks|bridge/Common/ExecutionEnvironment": "",
-		"guestinfo.vice..init.networks|client.network.assigned.gateway.IP":              "CsC//Q==",
-		"guestinfo.vice..init.sessions|vicadmin.detail.starttime":                       "0",
-		"guestinfo.vice./init/networks|client/Common/name":                              "client",
-		"guestinfo.vice./init/networks|bridge/static":                                   "true",
-		"network/container_networks|vmnet/Common/notes":                                 "",
-		"guestinfo.vice./init/repo":                                                     "",
-		"guestinfo.vice./storage/image_stores":                                          "0",
-		"guestinfo.vice./init/sessions|vicadmin/runblock":                               "false",
-		"guestinfo.vice./network/container_networks|vnet/gateway/Mask":                  "////AA==",
-		"guestinfo.vice..init.networks|client.network.assigned.dns|0":                   "CqLMAQ==",
-		"guestinfo.vice./init/networks|public/Common/id":                                "192",
-		"guestinfo.vice./init/networks|public/Common/ExecutionEnvironment":              "",
-		"guestinfo.vice./init/networks|public/network/default":                          "true",
-		"guestinfo.vice./storage/VolumeLocations|default/Fragment":                      "",
-		"guestinfo.vice./init/asymrouting":                                              "false",
-		"guestinfo.vice..init.sessions|vicadmin.started":                                "true",
-		"guestinfo.vice./init/sessions|port-layer/User":                                 "",
-		"guestinfo.vice./init/networks|management/Common/name":                          "",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Dir":                      "",
-		"guestinfo.vice./network/container_networks|vnet/Common/name":                   "vnet",
-		"guestinfo.vice./network/container_networks|bridge/Common/id":                   "DistributedVirtualPortgroup:dvportgroup-55",
-		"init/sessions|port-layer/common/notes":                                         "",
-		"guestinfo.vice./network/bridge-ip-range/IP":                                    "rBAAAA==",
-		"guestinfo.vice..init.networks|management.network.assigned.gateway.Mask":        "///gAA==",
-		"guestinfo.vice./init/sessions|vicadmin/common/name":                            "vicadmin",
-		"guestinfo.vice./init/networks|management/network/Common/ExecutionEnvironment":  "",
-		"guestinfo.vice./init/networks|management/static":                               "false",
-		"guestinfo.vice./init/common/id":                                                "VirtualMachine:vm-365",
-		"guestinfo.vice./network/bridge-ip-range/Mask":                                  "//AAAA==",
-		"guestinfo.vice./vic_machine_create_options":                                    "13",
-		"guestinfo.vice..init.sessions|port-layer.status":                               "0",
-		"guestinfo.vice./storage/VolumeLocations|default/Opaque":                        "",
-		"guestinfo.vice./init/networks|client/static":                                   "false",
-		"guestinfo.vice./init/networks|management/network/Common/name":                  "management",
-		"guestinfo.vice./init/sessions|docker-personality/openstdin":                    "false",
-		"guestinfo.vice./init/sessions|port-layer/cmd/Args":                             "2",
-		"guestinfo.vice..init.networks|client.assigned.IP":                              "CsCoOQ==",
-		"guestinfo.vice./init/networks|public/network/Common/ExecutionEnvironment":      "",
-		"guestinfo.vice./init/version/State":                                            "",
-		"guestinfo.vice./network/container_networks|vmnet/Common/ExecutionEnvironment":  "",
-		"guestinfo.vice./init/sessions|docker-personality/attach":                       "false",
-		"guestinfo.vice./storage/image_stores|0/Opaque":                                 "",
-		"guestinfo.vice..init.networks|client.network.assigned.dns":                     "1",
-		"guestinfo.vice./init/sessions|port-layer/cmd/Env~":                             "VC_URL=https://10.192.171.116|DC_PATH=vcqaDC|CS_PATH=/vcqaDC/host/cls|POOL_PATH=|DS_PATH=vsanDatastore",
-		"guestinfo.vice./network/container_networks|bridge/Common/name":                 "bridge",
-		"guestinfo.vice./storage/VolumeLocations|default/Host":                          "vsanDatastore",
-		"guestinfo.vice./init/sessions|port-layer/cmd/Env":                              "4",
-		"guestinfo.vice..init.sessions|port-layer.detail.starttime":                     "0",
-		"guestinfo.vice./init/networks|management/Common/ExecutionEnvironment":          "",
-		"guestinfo.vice./init/sessions":                                                 "docker-personality|port-layer|vicadmin",
-		"guestinfo.vice..init.sessions|port-layer.detail.createtime":                    "0",
-		"guestinfo.vice./storage/image_stores|0/Fragment":                               "",
-		"guestinfo.vice..init.networks|management.assigned.Mask":                        "///gAA==",
-		"guestinfo.vice./network/container_networks|bridge/default":                     "false",
-		"guestinfo.vice./container/ContainerNameConvention":                             "",
-		"guestinfo.vice..init.networks|client.network.type":                             "",
-		"guestinfo.vice./init/sessions|vicadmin/restart":                                "true",
-		"guestinfo.vice./init/networks|public/network/Common/name":                      "public",
-		"guestinfo.vice..init.sessions|port-layer.runblock":                             "false",
-		"guestinfo.vice./init/sessions|port-layer/common/id":                            "port-layer",
-		"guestinfo.vice./init/networks|client/network/Common/name":                      "client",
-		"guestinfo.vice./network/container_networks|vnet/pools|0/first":                 "CgoKAA==",
-		"guestinfo.vice..init.networks|public.network.assigned.gateway.IP":              "CsC//Q==",
-		"guestinfo.vice./init/layerid":                                                  "",
-		"guestinfo.vice./init/sessions|docker-personality/common/name":                  "docker-personality",
-		"guestinfo.vice./init/sessions|docker-personality/diagnostics/debug":            "0",
-		"guestinfo.vice./container/bootstrap_image_path":                                "[vsanDatastore] 91512359-242e-5a30-ba4a-0200360a2e79/V1.1.0-RC3-10373-65A1889-bootstrap.iso",
-		"guestinfo.vice..network.container_networks|bridge.type":                        "bridge",
-		"guestinfo.vice..network.container_networks|vnet.type":                          "external", "migrate.hostLogState": "none",
-		"init/sessions|vicadmin/common/notes":                                "",
-		"guestinfo.vice./init/sessions|vicadmin/diagnostics/debug":           "0",
-		"guestinfo.vice./init/sessions|vicadmin/attach":                      "false",
-		"guestinfo.vice./init/sessions|vicadmin/Group":                       "vicadmin",
-		"guestinfo.vice./storage/VolumeLocations|default/RawPath":            "",
-		"guestinfo.vice./init/networks|bridge/network/default":               "false",
-		"guestinfo.vice./init/sessions|port-layer/stopSignal":                "",
-		"guestinfo.vice./connect/username":                                   "administrator@vsphere.local",
-		"guestinfo.vice..init.sessions|port-layer.diagnostics.resurrections": "0",
-		"guestinfo.vice./init/common/ExecutionEnvironment":                   "",
-		"guestinfo.vice./network/bridge_network":                             "bridge",
-		"guestinfo.vice./registry/whitelist_registries":                      "1",
-		"guestinfo.vice./registry/whitelist_registries~":                     "harbor.com:2345|insecure:2345",
-		"guestinfo.vice./registry/insecure_registries~":                      "insecure:2345",
-		"guestinfo.vice./registry/insecure_registries":                       "0",
-		"guestinfo.vice./init/sessions|vicadmin/cmd/Env~":                    "PATH=/sbin:/bin|GOTRACEBACK=all|HTTP_PROXY=http://proxy.vmware.com:2318|HTTPS_PROXY=https://proxy.vmware.com:2318",
-		"guestinfo.vice./init/sessions|docker-personality/cmd/Env~":          "PATH=/sbin|GOTRACEBACK=all|HTTP_PROXY=http://proxy.vmware.com:2318|HTTPS_PROXY=https://proxy.vmware.com:2318",
-	}
-
-	commands := map[string][]string{
-		"target":      {"https://10.192.171.116"},
-		"thumbprint":  {"9F:F0:DF:BA:7F:E2:89:F0:98:E4:A6:D1:58:24:68:74:8A:9B:25:6F"},
-		"image-store": {"vsanDatastore"},
-		"volume-store": {
-			"vsanDatastore/volumes/default:default",
-			"vsanDatastore/volumes/vol1:vol1",
-		},
-		"bridge-network": {"bridge"},
-		"public-network": {"external"},
-		"container-network": {"management:vnet",
-			"vm-network:vmnet",
-		},
-		"container-network-gateway":  {"management:10.10.10.1/24"},
-		"container-network-ip-range": {"management:10.10.10.0/24"},
-
-		"debug":              {"3"},
-		"insecure-registry":  {"insecure:2345"},
-		"whitelist-registry": {"harbor.com:2345", "insecure:2345"},
-		"http-proxy":         {"http://proxy.vmware.com:2318"},
-		"https-proxy":        {"https://proxy.vmware.com:2318"},
-	}
-	conf := &config.VirtualContainerHostConfigSpec{}
-	extraconfig.DecodeWithPrefix(extraconfig.MapSource(kv), conf, "")
-
-	ctx := context.Background()
-	d, err := validate.NewDataFromConfig(ctx, &testFinder{}, conf)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	dest, err := DataToOption(d)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	for k, v := range dest {
-		if strings.Contains(k, "store") {
-			for i := range v {
-				v[i] = strings.TrimLeft(v[i], "ds://")
-			}
-		}
-		c := commands[k]
-		testArrays(t, c, v, k)
-	}
-	for k, v := range commands {
-		if strings.Contains(k, "store") {
-			for i := range v {
-				v[i] = strings.TrimLeft(v[i], "ds://")
-			}
-		}
-		c := dest[k]
-		testArrays(t, v, c, k)
-	}
-
-}
-
-func testArrays(t *testing.T, l, r []string, key string) {
-	for i := range l {
-		found := false
-		for j := range r {
-			if l[i] == r[j] {
-				found = true
-				break
-			}
-		}
-		assert.True(t, found, fmt.Sprintf("option value %s mismatch: value %s in array %s is not found in array %s", key, l[i], l, r))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/cert.pfx b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/cert.pfx
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create.go
deleted file mode 100644
index 4ab8a74843..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create.go
+++ /dev/null
@@ -1,781 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package create
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/url"
-	"path"
-	"reflect"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	// Max permitted length of Virtual Machine name
-	MaxVirtualMachineNameLen = 80
-	// Max permitted length of Virtual Switch name
-	MaxDisplayNameLen = 31
-)
-
-var EntireOptionHelpTemplate = `NAME:
-   {{.HelpName}} - {{.Usage}}
-
-USAGE:
-   {{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{if .Category}}
-
-CATEGORY:
-   {{.Category}}{{end}}{{if .Description}}
-
-DESCRIPTION:
-   {{.Description}}{{end}}{{if .VisibleFlags}}
-
-OPTIONS:
-   {{range .Flags}}{{.}}
-   {{end}}{{end}}
-`
-
-// Create has all input parameters for vic-machine create command
-type Create struct {
-	common.Networks
-	*data.Data
-	certs             common.CertFactory
-	containerNetworks common.CNetworks
-	registries        common.Registries
-
-	volumeStores common.VolumeStores
-
-	dns common.DNS
-
-	memoryReservLimits string
-	cpuReservLimits    string
-
-	advancedOptions bool
-	BridgeIPRange   string
-
-	proxies common.Proxies
-
-	syslogAddr string
-
-	executor *management.Dispatcher
-}
-
-func NewCreate() *Create {
-	create := &Create{}
-	create.Data = data.NewData()
-
-	return create
-}
-
-// SetFields iterates through the fields in the Create struct, searching for fields
-// tagged with the `arg` key. If the value of that tag matches the supplied `flag`
-// string, a nil check is performed. If the field is not nil, then the user supplied
-// this flag on the command line and we need to persist it.
-// This is a workaround for cli.Context.IsSet() returning false when
-// the short option for a cli.StringSlice is supplied instead of the long option.
-// See https://github.com/urfave/cli/issues/314
-func (c *Create) SetFields() map[string]struct{} {
-	result := make(map[string]struct{})
-	create := reflect.ValueOf(c).Elem()
-	for i := 0; i < create.NumField(); i++ {
-		t := create.Type().Field(i)
-		if tag := t.Tag.Get("arg"); tag != "" {
-			ss := create.Field(i)
-			if !ss.IsNil() {
-				result[tag] = struct{}{}
-			}
-		}
-	}
-	return result
-}
-
-// Flags return all cli flags for create
-func (c *Create) Flags() []cli.Flag {
-	create := []cli.Flag{
-		// images
-		cli.StringFlag{
-			Name:        "image-store, i",
-			Value:       "",
-			Usage:       "Image datastore path in format \"datastore/path\"",
-			Destination: &c.ImageDatastorePath,
-		},
-		cli.StringFlag{
-			Name:        "base-image-size",
-			Value:       "8GB",
-			Usage:       "Specify the size of the base image from which all other images are created e.g. 8GB/8000MB",
-			Destination: &c.ScratchSize,
-			Hidden:      true,
-		},
-
-		// container disk
-		cli.StringFlag{
-			Name:        "container-store, cs",
-			Value:       "",
-			Usage:       "Container datastore path - not supported yet, defaults to image datastore",
-			Destination: &c.ContainerDatastoreName,
-			Hidden:      true,
-		},
-	}
-
-	networks := []cli.Flag{
-		// bridge
-		cli.StringFlag{
-			Name:        "bridge-network, b",
-			Value:       "",
-			Usage:       "The bridge network port group name (private port group for containers). Defaults to the Virtual Container Host name",
-			Destination: &c.BridgeNetworkName,
-		},
-		cli.StringFlag{
-			Name:        "bridge-network-range, bnr",
-			Value:       "172.16.0.0/12",
-			Usage:       "The IP range from which bridge networks are allocated",
-			Destination: &c.BridgeIPRange,
-			Hidden:      true,
-		},
-
-		// client
-		cli.StringFlag{
-			Name:        "client-network, cln",
-			Value:       "",
-			Usage:       "The client network port group name (restricts DOCKER_API access to this network). Defaults to DCHP - see advanced help (-x)",
-			Destination: &c.ClientNetworkName,
-		},
-		cli.StringFlag{
-			Name:        "client-network-gateway",
-			Value:       "",
-			Usage:       "Gateway for the VCH on the client network, including one or more routing destinations in a comma separated list, e.g. 10.1.0.0/16,10.2.0.0/16:10.0.0.1",
-			Destination: &c.ClientNetworkGateway,
-			Hidden:      true,
-		},
-		cli.StringFlag{
-			Name:        "client-network-ip",
-			Value:       "",
-			Usage:       "IP address with a network mask for the VCH on the client network, e.g. 10.0.0.2/24",
-			Destination: &c.ClientNetworkIP,
-			Hidden:      true,
-		},
-
-		// public
-		cli.StringFlag{
-			Name:        "public-network, pn",
-			Value:       "VM Network",
-			Usage:       "The public network port group name (port forwarding and default route). Defaults to 'VM Network' and DHCP -- see advanced help (-x)",
-			Destination: &c.PublicNetworkName,
-		},
-		cli.StringFlag{
-			Name:        "public-network-gateway",
-			Value:       "",
-			Usage:       "Gateway for the VCH on the public network, e.g. 10.0.0.1",
-			Destination: &c.PublicNetworkGateway,
-			Hidden:      true,
-		},
-		cli.StringFlag{
-			Name:        "public-network-ip",
-			Value:       "",
-			Usage:       "IP address with a network mask for the VCH on the public network, e.g. 10.0.1.2/24",
-			Destination: &c.PublicNetworkIP,
-			Hidden:      true,
-		},
-
-		// management
-		cli.StringFlag{
-			Name:        "management-network, mn",
-			Value:       "",
-			Usage:       "The management network port group name (provides route to target hosting vSphere). Defaults to DCHP - see advanced help (-x)",
-			Destination: &c.ManagementNetworkName,
-		},
-		cli.StringFlag{
-			Name:        "management-network-gateway",
-			Value:       "",
-			Usage:       "Gateway for the VCH on the management network, including one or more routing destinations in a comma separated list, e.g. 10.1.0.0/16,10.2.0.0/16:10.0.0.1",
-			Destination: &c.ManagementNetworkGateway,
-			Hidden:      true,
-		},
-		cli.StringFlag{
-			Name:        "management-network-ip",
-			Value:       "",
-			Usage:       "IP address with a network mask for the VCH on the management network, e.g. 10.0.2.2/24",
-			Destination: &c.ManagementNetworkIP,
-			Hidden:      true,
-		},
-	}
-	var memory, cpu []cli.Flag
-	memory = append(memory, c.VCHMemoryLimitFlags(true)...)
-	memory = append(memory,
-		cli.IntFlag{
-			Name:        "endpoint-memory",
-			Value:       2048,
-			Usage:       "Memory for the VCH endpoint VM, in MB. Does not impact resources allocated per container.",
-			Hidden:      true,
-			Destination: &c.MemoryMB,
-		})
-	cpu = append(cpu, c.VCHCPULimitFlags(true)...)
-	cpu = append(cpu,
-		cli.IntFlag{
-			Name:        "endpoint-cpu",
-			Value:       1,
-			Usage:       "vCPUs for the VCH endpoint VM. Does not impact resources allocated per container.",
-			Hidden:      true,
-			Destination: &c.NumCPUs,
-		})
-
-	tls := c.certs.CertFlags()
-
-	tls = append(tls, cli.BoolFlag{
-		Name:        "no-tls, k",
-		Usage:       "Disable TLS support completely",
-		Destination: &c.certs.NoTLS,
-		Hidden:      true,
-	})
-
-	registries := c.registries.Flags()
-	registries = append(registries,
-		cli.StringSliceFlag{
-			Name:  "insecure-registry, dir",
-			Value: &c.registries.InsecureRegistriesArg,
-			Usage: "Specify a list of permitted insecure registry server addresses",
-		})
-	registries = append(registries,
-		cli.StringSliceFlag{
-			Name:  "whitelist-registry, wr",
-			Value: &c.registries.WhitelistRegistriesArg,
-			Usage: "Specify a list of permitted whitelist registry server addresses (insecure addresses still require the --insecure-registry option in addition)",
-		})
-
-	syslog := []cli.Flag{
-		cli.StringFlag{
-			Name:        "syslog-address",
-			Value:       "",
-			Usage:       "Address of the syslog server to send Virtual Container Host logs to. Must be in the format transport://host[:port], where transport is udp or tcp. port defaults to 514 if not specified",
-			Destination: &c.syslogAddr,
-			Hidden:      true,
-		},
-	}
-
-	util := []cli.Flag{
-		// miscellaneous
-		cli.BoolFlag{
-			Name:        "use-rp",
-			Usage:       "Use resource pool for vch parent in VC instead of a vApp",
-			Destination: &c.UseRP,
-			Hidden:      true,
-		},
-
-		cli.BoolFlag{
-			Name:        "force, f",
-			Usage:       "Ignore error messages and proceed",
-			Destination: &c.Force,
-		},
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for create",
-			Destination: &c.Timeout,
-		},
-		cli.BoolFlag{
-			Name:        "asymmetric-routes, ar",
-			Usage:       "Set up the Virtual Container Host for asymmetric routing",
-			Destination: &c.AsymmetricRouting,
-			Hidden:      true,
-		},
-	}
-
-	help := []cli.Flag{
-		// help options
-		cli.BoolFlag{
-			Name:        "extended-help, x",
-			Usage:       "Show all options - this must be specified instead of --help",
-			Destination: &c.advancedOptions,
-		},
-	}
-
-	target := c.TargetFlags()
-	ops := c.OpsCredentials.Flags(true)
-	compute := c.ComputeFlags()
-	container := c.ContainerFlags()
-	volume := c.volumeStores.Flags()
-	iso := c.ImageFlags(true)
-	cNetwork := c.containerNetworks.CNetworkFlags(true)
-	dns := c.dns.DNSFlags(true)
-	proxies := c.proxies.ProxyFlags(true)
-	debug := c.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, compute, ops, create, container, volume, dns, networks, cNetwork, memory, cpu, tls, registries, proxies, syslog, iso, util, debug, help} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (c *Create) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := c.HasCredentials(); err != nil {
-		return err
-	}
-
-	// prevent usage of special characters for certain user provided values
-	if err := common.CheckUnsupportedChars(c.DisplayName); err != nil {
-		return cli.NewExitError(fmt.Sprintf("--name contains unsupported characters: %s Allowed characters are alphanumeric, space and symbols - _ ( )", err), 1)
-	}
-
-	if len(c.DisplayName) > MaxDisplayNameLen {
-		return cli.NewExitError(fmt.Sprintf("Display name %s exceeds the permitted 31 characters limit. Please use a shorter -name parameter", c.DisplayName), 1)
-	}
-
-	if c.BridgeNetworkName == "" {
-		c.BridgeNetworkName = c.DisplayName
-	}
-
-	// Pass admin credentials for use as ops credentials if ops credentials are not supplied.
-	if err := c.OpsCredentials.ProcessOpsCredentials(true, c.Target.User, c.Target.Password); err != nil {
-		return err
-	}
-
-	var err error
-	c.ContainerNetworks, err = c.containerNetworks.ProcessContainerNetworks()
-	if err != nil {
-		return err
-	}
-
-	if err := c.processBridgeNetwork(); err != nil {
-		return err
-	}
-
-	if err := c.processNetwork(&c.Data.ClientNetwork, "client", c.ClientNetworkName,
-		c.ClientNetworkIP, c.ClientNetworkGateway); err != nil {
-		return err
-	}
-
-	if err := c.processNetwork(&c.Data.PublicNetwork, "public", c.PublicNetworkName,
-		c.PublicNetworkIP, c.PublicNetworkGateway); err != nil {
-		return err
-	}
-
-	if err := c.processNetwork(&c.Data.ManagementNetwork, "management", c.ManagementNetworkName,
-		c.ManagementNetworkIP, c.ManagementNetworkGateway); err != nil {
-		return err
-	}
-
-	if c.DNS, err = c.dns.ProcessDNSServers(); err != nil {
-		return err
-	}
-
-	// must come after client network processing as it checks for static IP on that interface
-	if err := c.processCertificates(); err != nil {
-		return err
-	}
-
-	if err := common.CheckUnsupportedCharsDatastore(c.ImageDatastorePath); err != nil {
-		return cli.NewExitError(fmt.Sprintf("--image-store contains unsupported characters: %s Allowed characters are alphanumeric, space and symbols - _ ( ) / :", err), 1)
-	}
-
-	c.VolumeLocations, err = c.volumeStores.ProcessVolumeStores()
-	if err != nil {
-		return err
-	}
-
-	if err := c.registries.ProcessRegistries(); err != nil {
-		return err
-	}
-
-	c.InsecureRegistries = c.registries.InsecureRegistries
-	c.WhitelistRegistries = c.registries.WhitelistRegistries
-	c.RegistryCAs = c.registries.RegistryCAs
-
-	hproxy, sproxy, err := c.proxies.ProcessProxies()
-	if err != nil {
-		return err
-	}
-	c.HTTPProxy = hproxy
-	c.HTTPSProxy = sproxy
-
-	if err := c.processSyslog(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Create) processCertificates() error {
-
-	// debuglevel is a pointer now so we have to do this song and dance
-	var debug int
-	if c.Debug.Debug == nil {
-		debug = 0
-	} else {
-		debug = *c.Debug.Debug
-	}
-
-	c.certs.Networks = c.Networks
-
-	if err := c.certs.ProcessCertificates(c.DisplayName, c.Force, debug); err != nil {
-		return err
-	}
-
-	// copy a few things out of seed because ProcessCertificates has side effects
-	c.KeyPEM = c.certs.KeyPEM
-	c.CertPEM = c.certs.CertPEM
-	c.ClientCAs = c.certs.ClientCAs
-
-	return nil
-}
-
-func (c *Create) processBridgeNetwork() error {
-	// bridge network params
-	var err error
-
-	_, c.Data.BridgeIPRange, err = net.ParseCIDR(c.BridgeIPRange)
-	if err != nil {
-		return cli.NewExitError(fmt.Sprintf("Error parsing bridge network ip range: %s. Range must be in CIDR format, e.g., 172.16.0.0/12", err), 1)
-	}
-	return nil
-}
-
-func parseGatewaySpec(gw string) (cidrs []net.IPNet, gwIP net.IPNet, err error) {
-	ss := strings.Split(gw, ":")
-	if len(ss) > 2 {
-		err = fmt.Errorf("gateway %s specified incorrectly", gw)
-		return
-	}
-
-	gwStr := ss[0]
-	cidrsStr := ""
-	if len(ss) > 1 {
-		gwStr = ss[1]
-		cidrsStr = ss[0]
-	}
-
-	if gwIP.IP = net.ParseIP(gwStr); gwIP.IP == nil {
-		err = fmt.Errorf("Provided gateway IP address is not valid: %s", gwStr)
-	}
-
-	if err != nil {
-		return
-	}
-
-	if cidrsStr != "" {
-		for _, c := range strings.Split(cidrsStr, ",") {
-			var ipnet *net.IPNet
-			_, ipnet, err = net.ParseCIDR(c)
-			if err != nil {
-				err = fmt.Errorf("invalid CIDR in gateway specification: %s", err)
-				return
-			}
-			cidrs = append(cidrs, *ipnet)
-		}
-	}
-
-	return
-}
-
-// processNetwork parses network args if present
-func (c *Create) processNetwork(network *data.NetworkConfig, netName, pgName, staticIP, gateway string) error {
-	var err error
-
-	network.Name = pgName
-
-	if gateway != "" && staticIP == "" {
-		return fmt.Errorf("Gateway provided without static IP for %s network", netName)
-	}
-
-	defer func(net *data.NetworkConfig) {
-		if err == nil {
-			log.Debugf("%s network: IP %s gateway %s dest: %s", netName, net.IP, net.Gateway.IP, net.Destinations)
-		}
-	}(network)
-
-	var ipNet *net.IPNet
-	if staticIP != "" {
-		var ipAddr net.IP
-		ipAddr, ipNet, err = net.ParseCIDR(staticIP)
-		if err != nil {
-			return fmt.Errorf("Failed to parse the provided %s network IP address %s: %s", netName, staticIP, err)
-		}
-
-		network.IP.IP = ipAddr
-		network.IP.Mask = ipNet.Mask
-	}
-
-	if gateway != "" {
-		network.Destinations, network.Gateway, err = parseGatewaySpec(gateway)
-		if err != nil {
-			return fmt.Errorf("Invalid %s network gateway: %s", netName, err)
-		}
-
-		if !network.IP.Contains(network.Gateway.IP) {
-			return fmt.Errorf("%s gateway with IP %s is not reachable from %s", netName, network.Gateway.IP, ipNet.String())
-		}
-
-		// TODO(vburenin): this seems ugly, and it actually is. The reason is that a gateway required to specify
-		// a network mask for it, which is just not how network configuration should be done. Network mask has to
-		// be provided separately or with the IP address. It is hard to change all dependencies to keep mask
-		// with IP address, so it will be stored with network gateway as it was previously.
-		network.Gateway.Mask = network.IP.Mask
-	}
-
-	return nil
-}
-
-func (c *Create) processSyslog() error {
-	if len(c.syslogAddr) == 0 {
-		return nil
-	}
-
-	u, err := url.Parse(c.syslogAddr)
-	if err != nil {
-		return err
-	}
-
-	c.SyslogConfig.Addr = u
-	return nil
-}
-
-func (c *Create) logArguments(cliContext *cli.Context) []string {
-	args := []string{}
-	sf := c.SetFields() // StringSlice options set by the user
-	for _, f := range cliContext.FlagNames() {
-		_, ok := sf[f]
-		if !cliContext.IsSet(f) && !ok {
-			continue
-		}
-
-		// avoid logging sensitive data
-		if f == "user" || f == "password" || f == "ops-password" {
-			log.Debugf("--%s=<censored>", f)
-			continue
-		}
-
-		if f == "tls-server-cert" || f == "tls-cert-path" || f == "tls-server-key" || f == "registry-ca" || f == "tls-ca" {
-			continue
-		}
-
-		if f == "target" {
-			url, err := url.Parse(cliContext.String(f))
-			if err != nil {
-				log.Debugf("Unable to re-parse target url for logging")
-				continue
-			}
-			url.User = nil
-			flag := fmt.Sprintf("--target=%s", url.String())
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-
-		i := cliContext.Int(f)
-		if i != 0 {
-			flag := fmt.Sprintf("--%s=%d", f, i)
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-		d := cliContext.Duration(f)
-		if d != 0 {
-			flag := fmt.Sprintf("--%s=%s", f, d.String())
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-		x := cliContext.Float64(f)
-		if x != 0 {
-			flag := fmt.Sprintf("--%s=%f", f, x)
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-
-		// check for StringSlice before String as the cli String checker
-		// will mistake a StringSlice for a String and jackaroo the formatting
-		match := func() (result bool) {
-			result = false
-			defer func() { recover() }()
-			ss := cliContext.StringSlice(f)
-			if ss != nil {
-				for _, o := range ss {
-					flag := fmt.Sprintf("--%s=%s", f, o)
-					log.Debug(flag)
-					args = append(args, flag)
-				}
-			}
-			return ss != nil
-		}()
-		if match {
-			continue
-		}
-
-		s := cliContext.String(f)
-		if s != "" {
-			flag := fmt.Sprintf("--%s=%s", f, s)
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-
-		b := cliContext.Bool(f)
-		bT := cliContext.BoolT(f)
-		if b && !bT {
-			flag := fmt.Sprintf("--%s=%t", f, true)
-			log.Debug(flag)
-			args = append(args, flag)
-			continue
-		}
-
-		match = func() (result bool) {
-			result = false
-			defer func() { recover() }()
-			is := cliContext.IntSlice(f)
-			if is != nil {
-				flag := fmt.Sprintf("--%s=%#v", f, is)
-				log.Debug(flag)
-				args = append(args, flag)
-			}
-			return is != nil
-		}()
-		if match {
-			continue
-		}
-
-		// generic last because it matches everything
-		g := cliContext.Generic(f)
-		if g != nil {
-			flag := fmt.Sprintf("--%s=%#v", f, g)
-			log.Debug(flag)
-			args = append(args, flag)
-		}
-	}
-
-	return args
-}
-
-func (c *Create) Run(clic *cli.Context) (err error) {
-
-	if c.advancedOptions {
-		cli.HelpPrinter(clic.App.Writer, EntireOptionHelpTemplate, clic.Command)
-		return nil
-	}
-
-	log.Infof("### Installing VCH ####")
-
-	if c.Debug.Debug != nil && *c.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = c.processParams(); err != nil {
-		return err
-	}
-
-	args := c.logArguments(clic)
-
-	var images map[string]string
-	if images, err = c.CheckImagesFiles(c.Force); err != nil {
-		return err
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	// all these operations will be executed without timeout
-	ctx := context.Background()
-	validator, err := validate.NewValidator(ctx, c.Data)
-	if err != nil {
-		log.Error("Create cannot continue: failed to create validator")
-		return err
-	}
-	defer validator.Session.Logout(ctx)
-
-	vchConfig, err := validator.Validate(ctx, c.Data)
-	if err != nil {
-		log.Error("Create cannot continue: configuration validation failed")
-		return err
-	}
-
-	// persist cli args used to create the VCH
-	vchConfig.VicMachineCreateOptions = args
-
-	vConfig := validator.AddDeprecatedFields(ctx, vchConfig, c.Data)
-	vConfig.ImageFiles = images
-	vConfig.ApplianceISO = path.Base(c.ApplianceISO)
-	vConfig.BootstrapISO = path.Base(c.BootstrapISO)
-
-	vConfig.HTTPProxy = c.HTTPProxy
-	vConfig.HTTPSProxy = c.HTTPSProxy
-
-	vConfig.Timeout = c.Data.Timeout
-
-	// separate initial validation from dispatch of creation task
-	log.Info("")
-
-	executor := management.NewDispatcher(ctx, validator.Session, vchConfig, c.Force)
-	if err = executor.CreateVCH(vchConfig, vConfig); err != nil {
-		executor.CollectDiagnosticLogs()
-		log.Error(err)
-		return err
-	}
-
-	// timeoout start to work from here, to make sure user does not wait forever
-	ctx, cancel := context.WithTimeout(context.Background(), c.Timeout)
-	defer cancel()
-	defer func() {
-		if ctx.Err() == context.DeadlineExceeded {
-			//context deadline exceeded, replace returned error message
-			err = errors.Errorf("Creating VCH exceeded time limit of %s. Please increase the timeout using --timeout to accommodate for a busy vSphere target", c.Timeout)
-		}
-	}()
-
-	if err = executor.CheckServiceReady(ctx, vchConfig, c.certs.ClientCert); err != nil {
-		executor.CollectDiagnosticLogs()
-		cmd, _ := executor.GetDockerAPICommand(vchConfig, c.certs.Ckey, c.certs.Ccert, c.certs.Cacert, c.certs.CertPath)
-		log.Info("\tAPI may be slow to start - try to connect to API after a few minutes:")
-		if cmd != "" {
-			log.Infof("\t\tRun command: %s", cmd)
-		} else {
-			log.Infof("\t\tRun %s inspect to find API connection command and run the command if ip address is ready", clic.App.Name)
-		}
-		log.Info("\t\tIf command succeeds, VCH is started. If command fails, VCH failed to install - see documentation for troubleshooting.")
-		return err
-	}
-
-	log.Infof("Initialization of appliance successful")
-
-	// We must check for the volume stores that are present after the portlayer presents.
-
-	executor.ShowVCH(vchConfig, c.certs.Ckey, c.certs.Ccert, c.certs.Cacert, c.certs.EnvFile, c.certs.CertPath)
-	log.Infof("Installer completed successfully")
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create_test.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create_test.go
deleted file mode 100644
index 102e818710..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/create/create_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package create
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestParseGatewaySpec(t *testing.T) {
-	var tests = []struct {
-		in   string
-		dest []string
-		gw   string
-		err  error
-	}{
-		{
-			in: "10.10.10.10",
-			gw: "10.10.10.10",
-		},
-		{
-			in:   "10.12.0.0/16:10.10.10.10",
-			dest: []string{"10.12.0.0/16"},
-			gw:   "10.10.10.10",
-		},
-		{
-			in:   "10.13.0.0/16,10.12.0.0/16:10.10.10.10",
-			dest: []string{"10.13.0.0/16", "10.12.0.0/16"},
-			gw:   "10.10.10.10",
-		},
-	}
-
-	for _, te := range tests {
-		dest, gw, err := parseGatewaySpec(te.in)
-		if te.err != nil {
-			assert.EqualError(t, err, te.err.Error())
-		} else {
-			assert.NoError(t, err)
-		}
-
-		assert.NotNil(t, gw)
-		assert.Equal(t, te.gw, gw.IP.String())
-
-		assert.Equal(t, len(te.dest), len(dest))
-		for _, d := range te.dest {
-			found := false
-			for _, d2 := range dest {
-				if d2.String() == d {
-					found = true
-					break
-				}
-			}
-
-			assert.True(t, found)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/debug/debug.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/debug/debug.go
deleted file mode 100644
index ef643b6f29..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/debug/debug.go
+++ /dev/null
@@ -1,206 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package debug
-
-import (
-	"io/ioutil"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	"context"
-)
-
-// Debug has all input parameters for vic-machine Debug command
-type Debug struct {
-	*data.Data
-
-	executor *management.Dispatcher
-
-	enableSSH     bool
-	password      string
-	authorizedKey string
-}
-
-func NewDebug() *Debug {
-	d := &Debug{}
-	d.Data = data.NewData()
-	return d
-}
-
-// Flags return all cli flags for Debug
-func (d *Debug) Flags() []cli.Flag {
-	preFlags := append(d.TargetFlags(), d.IDFlags()...)
-	preFlags = append(preFlags, d.ComputeFlags()...)
-
-	ssh := []cli.Flag{
-		cli.BoolFlag{
-			Name:        "enable-ssh, ssh",
-			Usage:       "Enable SSH server within appliance VM",
-			Destination: &d.enableSSH,
-		},
-		cli.StringFlag{
-			Name:        "authorized-key, key",
-			Value:       "",
-			Usage:       "File with public key to place as /root/.ssh/authorized_keys",
-			Destination: &d.authorizedKey,
-		},
-		cli.StringFlag{
-			Name:        "rootpw, pw",
-			Value:       "",
-			Usage:       "Password to set for root user (non-persistent over reboots)",
-			Destination: &d.password,
-		},
-	}
-
-	util := []cli.Flag{
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for operation to complete",
-			Destination: &d.Timeout,
-		},
-	}
-
-	target := d.TargetFlags()
-	id := d.IDFlags()
-	compute := d.ComputeFlags()
-	debug := d.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, id, compute, ssh, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (d *Debug) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := d.HasCredentials(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *Debug) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = d.processParams(); err != nil {
-		return err
-	}
-
-	if d.Debug.Debug != nil && *d.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Configuring VCH for debug ####")
-
-	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout)
-	defer cancel()
-
-	validator, err := validate.NewValidator(ctx, d.Data)
-
-	if err != nil {
-		log.Errorf("Debug cannot continue - failed to create validator: %s", err)
-		return errors.New("debug failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	_, err = validator.ValidateTarget(ctx, d.Data)
-	if err != nil {
-		log.Errorf("Debug cannot continue - target validation failed: %s", err)
-		return errors.New("debug failed")
-	}
-
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, d.Force)
-
-	var vch *vm.VirtualMachine
-	if d.Data.ID != "" {
-		vch, err = executor.NewVCHFromID(d.Data.ID)
-	} else {
-		vch, err = executor.NewVCHFromComputePath(d.Data.ComputeResourcePath, d.Data.DisplayName, validator)
-	}
-	if err != nil {
-		log.Errorf("Failed to get Virtual Container Host %s", d.DisplayName)
-		log.Error(err)
-		return errors.New("debug failed")
-	}
-
-	log.Infof("")
-	log.Infof("VCH ID: %s", vch.Reference().String())
-
-	vchConfig, err := executor.GetVCHConfig(vch)
-	if err != nil {
-		log.Error("Failed to get Virtual Container Host configuration")
-		log.Error(err)
-		return errors.New("debug failed")
-	}
-
-	installerVer := version.GetBuild()
-
-	log.Info("")
-	log.Infof("Installer version: %s", installerVer.ShortVersion())
-	log.Infof("VCH version: %s", vchConfig.Version.ShortVersion())
-
-	// load the key file if set
-	var key []byte
-	if d.authorizedKey != "" {
-		key, err = ioutil.ReadFile(d.authorizedKey)
-		if err != nil {
-			log.Errorf("Unable to read public key from %s: %s", d.authorizedKey, err)
-			return errors.New("unable to load public key")
-		}
-	}
-
-	if err = executor.DebugVCH(vch, vchConfig, d.password, string(key)); err != nil {
-		executor.CollectDiagnosticLogs()
-		log.Errorf("%s", err)
-		return errors.New("debug failed")
-	}
-
-	// display the VCH endpoints again for convenience
-	if err = executor.InspectVCH(vch, vchConfig, ""); err != nil {
-		executor.CollectDiagnosticLogs()
-		log.Errorf("%s", err)
-		return errors.New("debug failed")
-	}
-
-	log.Infof("Completed successfully")
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/delete/delete.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/delete/delete.go
deleted file mode 100644
index f51cf2ba5e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/delete/delete.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package delete
-
-import (
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	"context"
-)
-
-// Delete has all input parameters for vic-machine delete command
-type Uninstall struct {
-	*data.Data
-
-	executor *management.Dispatcher
-}
-
-func NewUninstall() *Uninstall {
-	d := &Uninstall{}
-	d.Data = data.NewData()
-	return d
-}
-
-// Flags return all cli flags for delete
-func (d *Uninstall) Flags() []cli.Flag {
-	util := []cli.Flag{
-		cli.BoolFlag{
-			Name:        "force, f",
-			Usage:       "Force the deletion",
-			Destination: &d.Force,
-		},
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for delete",
-			Destination: &d.Timeout,
-		},
-	}
-
-	target := d.TargetFlags()
-	id := d.IDFlags()
-	compute := d.ComputeFlags()
-	debug := d.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, id, compute, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (d *Uninstall) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := d.HasCredentials(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (d *Uninstall) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = d.processParams(); err != nil {
-		return err
-	}
-
-	if d.Debug.Debug != nil && *d.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Removing VCH ####")
-
-	ctx, cancel := context.WithTimeout(context.Background(), d.Timeout)
-	defer cancel()
-	defer func() {
-		if ctx.Err() != nil && ctx.Err() == context.DeadlineExceeded {
-			//context deadline exceeded, replace returned error message
-			err = errors.Errorf("Delete timed out: use --timeout to add more time")
-		}
-	}()
-
-	validator, err := validate.NewValidator(ctx, d.Data)
-	if err != nil {
-		log.Errorf("Delete cannot continue - failed to create validator: %s", err)
-		return errors.New("delete failed")
-	}
-	defer validator.Session.Logout(ctx)
-	_, err = validator.ValidateTarget(ctx, d.Data)
-	if err != nil {
-		log.Errorf("Delete cannot continue - target validation failed: %s", err)
-		return errors.New("delete failed")
-	}
-
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, d.Force)
-
-	var vch *vm.VirtualMachine
-	if d.Data.ID != "" {
-		vch, err = executor.NewVCHFromID(d.Data.ID)
-	} else {
-		vch, err = executor.NewVCHFromComputePath(d.Data.ComputeResourcePath, d.Data.DisplayName, validator)
-	}
-	if err != nil {
-		log.Errorf("Failed to get Virtual Container Host %s", d.DisplayName)
-		log.Error(err)
-		return errors.New("delete failed")
-	}
-
-	log.Infof("")
-	log.Infof("VCH ID: %s", vch.Reference().String())
-
-	vchConfig, err := executor.GetNoSecretVCHConfig(vch)
-	if err != nil {
-		log.Error("Failed to get Virtual Container Host configuration")
-		log.Error(err)
-		return errors.New("delete failed")
-	}
-
-	// compare vch version and vic-machine version
-	installerBuild := version.GetBuild()
-	if vchConfig.Version == nil || !installerBuild.Equal(vchConfig.Version) {
-		if !d.Data.Force {
-			log.Errorf("VCH version %q is different than installer version %s. Upgrade VCH before deleting or specify --force to force delete", vchConfig.Version.ShortVersion(), installerBuild.ShortVersion())
-			return errors.New("delete failed")
-		}
-
-		log.Warnf("VCH version %q is different than installer version %s. Force delete will attempt to remove everything related to the installed VCH", vchConfig.Version.ShortVersion(), installerBuild.ShortVersion())
-	}
-
-	if err = executor.DeleteVCH(vchConfig); err != nil {
-		executor.CollectDiagnosticLogs()
-		log.Errorf("%s", err)
-		return errors.New("delete failed")
-	}
-
-	log.Info("----------")
-	log.Info("If firewall changes were made for VIC during install, they were not reverted during delete")
-	log.Info("To modify firewall rules see vic-machine update firewall --help")
-	log.Info("----------")
-	log.Info("Completed successfully")
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/inspect/inspect.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/inspect/inspect.go
deleted file mode 100644
index 8b3cbf46bc..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/inspect/inspect.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package inspect
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"strconv"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/cmd/vic-machine/converter"
-	"github.com/vmware/vic/cmd/vic-machine/create"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// Inspect has all input parameters for vic-machine inspect command
-type Inspect struct {
-	*data.Data
-
-	CertPath string
-
-	executor *management.Dispatcher
-
-	Format string
-}
-
-type state struct {
-	i         *Inspect
-	ctx       context.Context
-	validator *validate.Validator
-	vchConfig *config.VirtualContainerHostConfigSpec
-	vch       *vm.VirtualMachine
-	executor  *management.Dispatcher
-}
-
-type command func(state) error
-
-func NewInspect() *Inspect {
-	d := &Inspect{}
-	d.Data = data.NewData()
-	return d
-}
-
-// Flags returns all cli flags for inspect
-func (i *Inspect) Flags() []cli.Flag {
-	util := []cli.Flag{
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for inspect",
-			Destination: &i.Timeout,
-		},
-		cli.StringFlag{
-			Name:        "tls-cert-path",
-			Value:       "",
-			Usage:       "The path to check for existing certificates. Defaults to './<vch name>/'",
-			Destination: &i.CertPath,
-		},
-	}
-
-	target := i.TargetFlags()
-	id := i.IDFlags()
-	compute := i.ComputeFlags()
-	debug := i.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, id, compute, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (i *Inspect) ConfigFlags() []cli.Flag {
-	config := cli.StringFlag{
-		Name:        "format",
-		Value:       "verbose",
-		Usage:       "Determine the format of configuration output. Supported formats: raw, verbose",
-		Destination: &i.Format,
-	}
-	flags := []cli.Flag{config}
-	flags = append(flags, i.Flags()...)
-	return flags
-}
-
-func (i *Inspect) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := i.HasCredentials(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (i *Inspect) run(clic *cli.Context, cmd command) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if i.Debug.Debug != nil && *i.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-	if err = i.processParams(); err != nil {
-		return err
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Inspecting VCH ####")
-
-	ctx, cancel := context.WithTimeout(context.Background(), i.Timeout)
-	defer cancel()
-
-	validator, err := validate.NewValidator(ctx, i.Data)
-
-	if err != nil {
-		log.Errorf("Inspect cannot continue - failed to create validator: %s", err)
-		return errors.New("inspect failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	_, err = validator.ValidateTarget(ctx, i.Data)
-	if err != nil {
-		log.Errorf("Inspect cannot continue - target validation failed: %s", err)
-		return errors.New("inspect failed")
-	}
-
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, i.Force)
-
-	var vch *vm.VirtualMachine
-	if i.Data.ID != "" {
-		vch, err = executor.NewVCHFromID(i.Data.ID)
-	} else {
-		vch, err = executor.NewVCHFromComputePath(i.Data.ComputeResourcePath, i.Data.DisplayName, validator)
-	}
-	if err != nil {
-		log.Errorf("Failed to get Virtual Container Host %s", i.DisplayName)
-		log.Error(err)
-		return errors.New("inspect failed")
-	}
-
-	vchConfig, err := executor.GetNoSecretVCHConfig(vch)
-	if err != nil {
-		log.Error("Failed to get Virtual Container Host configuration")
-		log.Error(err)
-		return errors.New("inspect failed")
-	}
-
-	return cmd(state{i, ctx, validator, vchConfig, vch, executor})
-}
-
-func (i *Inspect) RunConfig(clic *cli.Context) (err error) {
-	if i.Format == "raw" {
-		log.SetLevel(log.ErrorLevel)
-		log.SetOutput(os.Stderr)
-	} else if i.Format != "verbose" {
-		log.Warnf("Invalid configuration output format '%s'. Valid options are raw, verbose.", i.Format)
-		log.Warn("Using verbose configuration format")
-		i.Format = "verbose"
-	}
-
-	return i.run(clic, func(s state) error {
-		err = i.showConfiguration(s.ctx, s.validator.Session.Finder, s.vchConfig, s.vch)
-		if err != nil {
-			log.Error("Failed to print Virtual Container Host configuration")
-			log.Error(err)
-			return errors.New("inspect failed")
-		}
-		return nil
-	})
-}
-
-func (i *Inspect) Run(clic *cli.Context) (err error) {
-	return i.run(clic, func(s state) error {
-		log.Infof("")
-		log.Infof("VCH ID: %s", s.vch.Reference().String())
-
-		installerVer := version.GetBuild()
-
-		log.Info("")
-		log.Infof("Installer version: %s", installerVer.ShortVersion())
-		log.Infof("VCH version: %s", s.vchConfig.Version.ShortVersion())
-		log.Info("")
-		log.Info("VCH upgrade status:")
-		i.upgradeStatusMessage(s.ctx, s.vch, installerVer, s.vchConfig.Version)
-
-		if err = s.executor.InspectVCH(s.vch, s.vchConfig, i.CertPath); err != nil {
-			s.executor.CollectDiagnosticLogs()
-			log.Errorf("%s", err)
-			return errors.New("inspect failed")
-		}
-
-		log.Infof("Completed successfully")
-
-		return nil
-	})
-}
-
-func retrieveMapOptions(ctx context.Context, finder validate.Finder,
-	conf *config.VirtualContainerHostConfigSpec, vm *vm.VirtualMachine) (map[string][]string, error) {
-	data, err := validate.NewDataFromConfig(ctx, finder, conf)
-	if err != nil {
-		return nil, err
-	}
-	if err = validate.SetDataFromVM(ctx, finder, vm, data); err != nil {
-		return nil, err
-	}
-	return converter.DataToOption(data)
-}
-
-func (i Inspect) showConfiguration(ctx context.Context, finder validate.Finder, conf *config.VirtualContainerHostConfigSpec, vm *vm.VirtualMachine) error {
-	mapOptions, err := retrieveMapOptions(ctx, finder, conf, vm)
-	if err != nil {
-		return err
-	}
-	options := i.sortedOutput(mapOptions)
-	if i.Format == "raw" {
-		strOptions := strings.Join(options, " ")
-		fmt.Println(strOptions)
-	} else if i.Format == "verbose" {
-		strOptions := strings.Join(options, "\n\t")
-		log.Info("")
-		log.Infof("Target VCH created with the following options: \n\n\t%s\n", strOptions)
-	}
-
-	return nil
-}
-
-func (i *Inspect) sortedOutput(mapOptions map[string][]string) (output []string) {
-	create := create.NewCreate()
-	cFlags := create.Flags()
-	for _, f := range cFlags {
-		key := f.GetName()
-		// change multiple option name to long name: e.g. from target,t => target
-		s := strings.Split(key, ",")
-		if len(s) > 1 {
-			key = s[0]
-		}
-
-		values, ok := mapOptions[key]
-		if !ok {
-			continue
-		}
-
-		defaultValue := ""
-		switch t := f.(type) {
-		case cli.StringFlag:
-			defaultValue = t.Value
-		case cli.IntFlag:
-			defaultValue = strconv.Itoa(t.Value)
-		}
-		for _, val := range values {
-			if val == defaultValue {
-				// do not print command option if it's same to default
-				continue
-			}
-			output = append(output, fmt.Sprintf("--%s=%s", key, val))
-		}
-	}
-	return
-}
-
-// upgradeStatusMessage generates a user facing status string about upgrade progress and status
-func (i *Inspect) upgradeStatusMessage(ctx context.Context, vch *vm.VirtualMachine, installerVer *version.Build, vchVer *version.Build) {
-	if sameVer := installerVer.Equal(vchVer); sameVer {
-		log.Info("Installer has same version as VCH")
-		log.Info("No upgrade available with this installer version")
-		return
-	}
-
-	upgrading, err := vch.VCHUpdateStatus(ctx)
-	if err != nil {
-		log.Errorf("Unable to determine if upgrade/configure is in progress: %s", err)
-		return
-	}
-	if upgrading {
-		log.Info("Upgrade/configure in progress")
-		return
-	}
-
-	canUpgrade, err := installerVer.IsNewer(vchVer)
-	if err != nil {
-		log.Errorf("Unable to determine if upgrade is available: %s", err)
-		return
-	}
-	if canUpgrade {
-		log.Info("Upgrade available")
-		return
-	}
-
-	oldInstaller, err := installerVer.IsOlder(vchVer)
-	if err != nil {
-		log.Errorf("Unable to determine if upgrade is available: %s", err)
-		return
-	}
-	if oldInstaller {
-		log.Info("Installer has older version than VCH")
-		log.Info("No upgrade available with this installer version")
-		return
-	}
-
-	// can't get here
-	log.Warn("Invalid upgrade status")
-	return
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/list/list.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/list/list.go
deleted file mode 100644
index 6bbe081594..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/list/list.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package list
-
-import (
-	"context"
-	"fmt"
-	"path"
-	"text/tabwriter"
-	"text/template"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-type items struct {
-	ID            string
-	Path          string
-	Name          string
-	Version       string
-	UpgradeStatus string
-}
-
-// templ is parsed by text/template package
-const templ = `{{range .}}
-{{.ID}}	{{.Path}}	{{.Name}}	{{.Version}}	{{.UpgradeStatus}}{{end}}
-`
-
-// List has all input parameters for vic-machine ls command
-type List struct {
-	*data.Data
-
-	executor *management.Dispatcher
-}
-
-func NewList() *List {
-	d := &List{}
-	d.Data = data.NewData()
-	return d
-}
-
-// Flags return all cli flags for ls
-func (l *List) Flags() []cli.Flag {
-	util := []cli.Flag{
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for list",
-			Destination: &l.Timeout,
-		},
-	}
-
-	target := l.TargetFlags()
-	// TODO: why not allow name as a filter, like most list operations
-	compute := l.ComputeFlagsNoName()
-	debug := l.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, compute, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (l *List) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := l.HasCredentials(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (l *List) prettyPrint(ctx context.Context, cli *cli.Context, vchs []*vm.VirtualMachine, executor *management.Dispatcher) {
-	data := []items{
-		{"ID", "PATH", "NAME", "VERSION", "UPGRADE STATUS"},
-	}
-	installerVer := version.GetBuild()
-	for _, vch := range vchs {
-
-		vchConfig, err := executor.GetNoSecretVCHConfig(vch)
-		var version string
-		if err != nil {
-			log.Error("Failed to get Virtual Container Host configuration")
-			log.Error(err)
-			version = "unknown"
-		} else {
-			version = vchConfig.Version.ShortVersion()
-		}
-
-		parentPath := path.Dir(path.Dir(vch.InventoryPath))
-		name := path.Base(vch.InventoryPath)
-		upgradeStatus := l.upgradeStatusMessage(ctx, vch, installerVer, vchConfig.Version)
-		data = append(data,
-			items{vch.Reference().Value, parentPath, name, version, upgradeStatus})
-	}
-	t := template.New("vic-machine ls")
-	// #nosec: Errors unhandled.
-	t, _ = t.Parse(templ)
-	w := tabwriter.NewWriter(cli.App.Writer, 8, 8, 8, ' ', 0)
-	if err := t.Execute(w, data); err != nil {
-		log.Fatal(err)
-	}
-	// #nosec: Errors unhandled.
-	w.Flush()
-}
-
-func (l *List) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = l.processParams(); err != nil {
-		return err
-	}
-
-	if l.Debug.Debug != nil && *l.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Listing VCHs ####")
-
-	ctx, cancel := context.WithTimeout(context.Background(), l.Timeout)
-	defer cancel()
-	defer func() {
-		if ctx.Err() != nil && ctx.Err() == context.DeadlineExceeded {
-			//context deadline exceeded, replace returned error message
-			err = errors.Errorf("List timed out: use --timeout to add more time")
-		}
-	}()
-
-	var validator *validate.Validator
-	if validator, err = validate.NewValidator(ctx, l.Data); err != nil {
-		log.Errorf("List cannot continue - failed to create validator: %s", err)
-		return errors.New("list failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	// If dc is not set, and multiple datacenter is available, vic-machine ls will list VCHs under all datacenters.
-	validator.AllowEmptyDC()
-
-	_, err = validator.ValidateTarget(ctx, l.Data)
-	if err != nil {
-		log.Errorf("List cannot continue - target validation failed: %s", err)
-		return errors.New("list failed")
-	}
-	_, err = validator.ValidateCompute(ctx, l.Data, false)
-	if err != nil {
-		log.Errorf("List cannot continue - compute resource validation failed: %s", err)
-		return errors.New("list failed")
-	}
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, false)
-	vchs, err := executor.SearchVCHs(validator.ClusterPath)
-	if err != nil {
-		log.Errorf("List cannot continue - failed to search VCHs in %s: %s", validator.ResourcePoolPath, err)
-	}
-	l.prettyPrint(ctx, clic, vchs, executor)
-	return nil
-}
-
-// upgradeStatusMessage generates a user facing status string about upgrade progress and status
-func (l *List) upgradeStatusMessage(ctx context.Context, vch *vm.VirtualMachine, installerVer *version.Build, vchVer *version.Build) string {
-	if sameVer := installerVer.Equal(vchVer); sameVer {
-		return "Up to date"
-	}
-
-	upgrading, err := vch.VCHUpdateStatus(ctx)
-	if err != nil {
-		return fmt.Sprintf("Unknown: %s", err)
-	}
-	if upgrading {
-		return "Upgrade in progress"
-	}
-
-	canUpgrade, err := installerVer.IsNewer(vchVer)
-	if err != nil {
-		return fmt.Sprintf("Unknown: %s", err)
-	}
-	if canUpgrade {
-		return fmt.Sprintf("Upgradeable to %s", installerVer.ShortVersion())
-	}
-
-	oldInstaller, err := installerVer.IsOlder(vchVer)
-	if err != nil {
-		return fmt.Sprintf("Unknown: %s", err)
-	}
-	if oldInstaller {
-		return fmt.Sprintf("VCH has newer version")
-	}
-
-	// can't get here
-	return "Invalid upgrade status"
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/main.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/main.go
deleted file mode 100644
index f03b1ed462..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/main.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	runtime "runtime/debug"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/configure"
-	"github.com/vmware/vic/cmd/vic-machine/create"
-	"github.com/vmware/vic/cmd/vic-machine/debug"
-	uninstall "github.com/vmware/vic/cmd/vic-machine/delete"
-	"github.com/vmware/vic/cmd/vic-machine/inspect"
-	"github.com/vmware/vic/cmd/vic-machine/list"
-	"github.com/vmware/vic/cmd/vic-machine/update"
-	"github.com/vmware/vic/cmd/vic-machine/upgrade"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/version"
-)
-
-const (
-	LogFile = "vic-machine.log"
-)
-
-func main() {
-	app := cli.NewApp()
-
-	app.Name = filepath.Base(os.Args[0])
-	app.Usage = "Create and manage Virtual Container Hosts"
-	app.EnableBashCompletion = true
-
-	create := create.NewCreate()
-	uninstall := uninstall.NewUninstall()
-	inspect := inspect.NewInspect()
-	list := list.NewList()
-	upgrade := upgrade.NewUpgrade()
-	debug := debug.NewDebug()
-	updateFw := update.NewUpdateFw()
-	configure := configure.NewConfigure()
-	app.Commands = []cli.Command{
-		{
-			Name:   "create",
-			Usage:  "Deploy VCH",
-			Action: create.Run,
-			Flags:  create.Flags(),
-		},
-		{
-			Name:   "configure",
-			Usage:  "Update VCH configuration",
-			Action: configure.Run,
-			Flags:  configure.Flags(),
-		},
-		{
-			Name:   "delete",
-			Usage:  "Delete VCH and associated resources",
-			Action: uninstall.Run,
-			Flags:  uninstall.Flags(),
-		},
-		{
-			Name:   "ls",
-			Usage:  "List VCHs",
-			Action: list.Run,
-			Flags:  list.Flags(),
-		},
-		{
-			Name:   "inspect",
-			Usage:  "Inspect VCH",
-			Action: inspect.Run,
-			Flags:  inspect.Flags(),
-			Subcommands: []cli.Command{
-				{
-					Name:   "config",
-					Usage:  "Show VCH configuration options",
-					Action: inspect.RunConfig,
-					Flags:  inspect.ConfigFlags(),
-				},
-			},
-		},
-		{
-			Name:   "upgrade",
-			Usage:  "Upgrade VCH to latest version",
-			Action: upgrade.Run,
-			Flags:  upgrade.Flags(),
-		},
-		{
-			Name:   "version",
-			Usage:  "Show VIC version information",
-			Action: showVersion,
-		},
-		{
-			Name:   "debug",
-			Usage:  "Debug VCH",
-			Action: debug.Run,
-			Flags:  debug.Flags(),
-		},
-		{
-			Name:  "update",
-			Usage: "Modify configuration",
-			Subcommands: []cli.Command{
-				{
-					Name:   "firewall",
-					Usage:  "Modify host firewall",
-					Action: updateFw.Run,
-					Flags:  updateFw.Flags(),
-				},
-			},
-		},
-	}
-
-	app.Version = version.GetBuild().ShortVersion()
-
-	logs := []io.Writer{app.Writer}
-	// Open log file
-	// #nosec: Expect file permissions to be 0600 or less
-	f, err := os.OpenFile(LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-	if err != nil {
-		// #nosec: Errors unhandled.
-		fmt.Fprintf(os.Stderr, "Error opening logfile %s: %v\n", LogFile, err)
-	} else {
-		defer f.Close()
-		logs = append(logs, f)
-	}
-
-	// Initiliaze logger with default TextFormatter
-	log.SetFormatter(viclog.NewTextFormatter())
-	// SetOutput to io.MultiWriter so that we can log to stdout and a file
-	log.SetOutput(io.MultiWriter(logs...))
-	defer func() {
-		if r := recover(); r != nil {
-			log.Errorf("--------------------")
-			log.Errorf("%s failed, please check log file %s for details", app.Name, LogFile)
-			// #nosec: Errors unhandled.
-			fmt.Fprintf(f, "%s", runtime.Stack())
-		}
-	}()
-
-	// #nosec: Errors unhandled.
-	app.Run(os.Args)
-}
-
-func showVersion(cli *cli.Context) error {
-	// #nosec: Errors unhandled.
-	fmt.Fprintf(cli.App.Writer, "%v version %v\n", cli.App.Name, cli.App.Version)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/update/firewall.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/update/firewall.go
deleted file mode 100644
index 5134deac48..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/update/firewall.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package update
-
-import (
-	"context"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// UpdateFw has all input parameters for vic-machine update firewall command
-type UpdateFw struct {
-	*data.Data
-
-	executor *management.Dispatcher
-
-	enableFw  bool
-	disableFw bool
-}
-
-func NewUpdateFw() *UpdateFw {
-	i := &UpdateFw{}
-	i.Data = data.NewData()
-	return i
-}
-
-// Flags return all cli flags for update firewall
-func (i *UpdateFw) Flags() []cli.Flag {
-	update := []cli.Flag{
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for update firewall",
-			Destination: &i.Timeout,
-		},
-		cli.BoolFlag{
-			Name:        "allow",
-			Usage:       "Enable a firewall rule on target host(s) to allow VIC communication",
-			Destination: &i.enableFw,
-		},
-		cli.BoolFlag{
-			Name:        "deny",
-			Usage:       "Disable the firewall rule on target host(s) that allows VIC communication",
-			Destination: &i.disableFw,
-		},
-	}
-
-	target := i.TargetFlags()
-	compute := i.ComputeFlagsNoName()
-	debug := i.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, compute, update, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (i *UpdateFw) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := i.HasCredentials(); err != nil {
-		return err
-	}
-
-	if i.enableFw && i.disableFw {
-		return errors.New("Only one of --allow and --deny can be set")
-	}
-
-	if !i.enableFw && !i.disableFw {
-		return errors.New("No command selected")
-	}
-
-	return nil
-}
-
-func (i *UpdateFw) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = i.processParams(); err != nil {
-		return err
-	}
-
-	if i.Debug.Debug != nil && *i.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Updating Firewall ####")
-
-	ctx, cancel := context.WithTimeout(context.Background(), i.Timeout)
-	defer cancel()
-	defer func() {
-		if ctx.Err() != nil && ctx.Err() == context.DeadlineExceeded {
-			//context deadline exceeded, replace returned error message
-			err = errors.Errorf("Update timed out: use --timeout to add more time")
-		}
-	}()
-
-	var validator *validate.Validator
-	if validator, err = validate.NewValidator(ctx, i.Data); err != nil {
-		log.Errorf("Update cannot continue - failed to create validator: %s", err)
-		return errors.New("update firewall failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	_, err = validator.ValidateTarget(ctx, i.Data)
-	if err != nil {
-		log.Errorf("Update cannot continue - target validation failed: %s", err)
-		return errors.New("update firewall failed")
-	}
-	_, err = validator.ValidateCompute(ctx, i.Data, true)
-	if err != nil {
-		log.Errorf("Update cannot continue - compute resource validation failed: %s", err)
-		return errors.New("update firewall failed")
-	}
-
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, false)
-
-	if i.enableFw {
-		log.Info("")
-		log.Warn("### WARNING ###")
-		log.Warn("\tThis command modifies the host firewall on the target machine or cluster")
-		log.Warnf("\tThe ruleset %q will be enabled", management.RulesetID)
-		log.Warn("\tThis allows all outbound TCP traffic from the target")
-		log.Warn("\tTo undo this modification use --deny")
-		log.Info("")
-
-		err := executor.EnableFirewallRuleset()
-		if err != nil {
-			log.Errorf("Failed to enable VIC firewall rule: %s", err)
-			return errors.New("failed to enable firewall rule")
-		}
-	}
-
-	if i.disableFw {
-		log.Info("")
-		log.Warn("### WARNING ###")
-		log.Warn("\tThis command modifies the host firewall on the target machine or cluster")
-		log.Warnf("\tThe ruleset %q will be disabled", management.RulesetID)
-		log.Warn("\tThis disables the ruleset that allows all outbound TCP traffic from the target")
-		log.Warn("\tVIC Engine will not function unless 2377/tcp outbound is allowed")
-		log.Warn("\tTo undo this modification use --allow")
-		log.Info("")
-
-		err := executor.DisableFirewallRuleset()
-		if err != nil {
-			log.Errorf("Failed to disable VIC firewall rule: %s", err)
-			return errors.New("failed to disable firewall rule")
-		}
-	}
-	log.Info("")
-
-	if i.enableFw || i.disableFw {
-		log.Infof("Firewall changes complete")
-	}
-
-	log.Infof("Command completed successfully")
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/upgrade/upgrade.go b/installer/vendor/github.com/vmware/vic/cmd/vic-machine/upgrade/upgrade.go
deleted file mode 100644
index 684f143f3e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-machine/upgrade/upgrade.go
+++ /dev/null
@@ -1,235 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package upgrade
-
-import (
-	"context"
-	"path"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/management"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// Upgrade has all input parameters for vic-machine upgrade command
-type Upgrade struct {
-	*data.Data
-
-	executor *management.Dispatcher
-}
-
-func NewUpgrade() *Upgrade {
-	upgrade := &Upgrade{}
-	upgrade.Data = data.NewData()
-
-	return upgrade
-}
-
-// Flags return all cli flags for upgrade
-func (u *Upgrade) Flags() []cli.Flag {
-	util := []cli.Flag{
-		cli.BoolFlag{
-			Name:        "force, f",
-			Usage:       "Force the upgrade (ignores version checks)",
-			Destination: &u.Force,
-		},
-		cli.DurationFlag{
-			Name:        "timeout",
-			Value:       3 * time.Minute,
-			Usage:       "Time to wait for upgrade",
-			Destination: &u.Timeout,
-		},
-		cli.BoolFlag{
-			Name:        "rollback",
-			Usage:       "Roll back VCH version to before the current upgrade",
-			Destination: &u.Rollback,
-		},
-		cli.BoolFlag{
-			Name:        "reset-progress",
-			Usage:       "Reset the UpdateInProgress flag. Warning: Do not reset this flag if another upgrade/configure process is running",
-			Destination: &u.ResetInProgressFlag,
-		},
-	}
-
-	target := u.TargetFlags()
-	id := u.IDFlags()
-	compute := u.ComputeFlags()
-	iso := u.ImageFlags(false)
-	debug := u.DebugFlags(true)
-
-	// flag arrays are declared, now combined
-	var flags []cli.Flag
-	for _, f := range [][]cli.Flag{target, id, compute, iso, util, debug} {
-		flags = append(flags, f...)
-	}
-
-	return flags
-}
-
-func (u *Upgrade) processParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := u.HasCredentials(); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (u *Upgrade) Run(clic *cli.Context) (err error) {
-	// urfave/cli will print out exit in error handling, so no more information in main method can be printed out.
-	defer func() {
-		err = common.LogErrorIfAny(clic, err)
-	}()
-
-	if err = u.processParams(); err != nil {
-		return err
-	}
-
-	if u.Debug.Debug != nil && *u.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(clic.Args()) > 0 {
-		log.Errorf("Unknown argument: %s", clic.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	var images map[string]string
-	if images, err = u.CheckImagesFiles(u.Force); err != nil {
-		return err
-	}
-
-	log.Infof("### Upgrading VCH ####")
-
-	ctx, cancel := context.WithCancel(context.Background())
-	defer cancel()
-
-	validator, err := validate.NewValidator(ctx, u.Data)
-	if err != nil {
-		log.Errorf("Upgrade cannot continue - failed to create validator: %s", err)
-		return errors.New("upgrade failed")
-	}
-	defer validator.Session.Logout(ctx)
-
-	_, err = validator.ValidateTarget(ctx, u.Data)
-	if err != nil {
-		log.Errorf("Upgrade cannot continue - target validation failed: %s", err)
-		return errors.New("upgrade failed")
-	}
-	executor := management.NewDispatcher(validator.Context, validator.Session, nil, u.Force)
-
-	var vch *vm.VirtualMachine
-	if u.Data.ID != "" {
-		vch, err = executor.NewVCHFromID(u.Data.ID)
-	} else {
-		vch, err = executor.NewVCHFromComputePath(u.Data.ComputeResourcePath, u.Data.DisplayName, validator)
-	}
-	if err != nil {
-		log.Errorf("Failed to get Virtual Container Host %s", u.DisplayName)
-		log.Error(err)
-		return errors.New("upgrade failed")
-	}
-
-	log.Infof("")
-	log.Infof("VCH ID: %s", vch.Reference().String())
-
-	if u.ResetInProgressFlag {
-		if err = vch.SetVCHUpdateStatus(ctx, false); err != nil {
-			log.Error("Failed to reset UpdateInProgress flag")
-			log.Error(err)
-			return errors.New("upgrade failed")
-		}
-		log.Infof("Reset UpdateInProgress flag successfully")
-		return nil
-	}
-
-	upgrading, err := vch.VCHUpdateStatus(ctx)
-	if err != nil {
-		log.Error("Unable to determine if upgrade/configure is in progress")
-		log.Error(err)
-		return errors.New("upgrade failed")
-	}
-	if upgrading {
-		log.Error("Upgrade failed: another upgrade/configure operation is in progress")
-		log.Error("If no other upgrade/configure process is running, use --reset-progress to reset the VCH upgrade/configure status")
-		return errors.New("upgrade failed")
-	}
-
-	if err = vch.SetVCHUpdateStatus(ctx, true); err != nil {
-		log.Error("Failed to set UpdateInProgress flag to true")
-		log.Error(err)
-		return errors.New("upgrade failed")
-	}
-
-	defer func() {
-		if err = vch.SetVCHUpdateStatus(ctx, false); err != nil {
-			log.Error("Failed to reset UpdateInProgress")
-			log.Error(err)
-		}
-	}()
-
-	vchConfig, err := executor.FetchAndMigrateVCHConfig(vch)
-	if err != nil {
-		log.Error("Failed to get Virtual Container Host configuration")
-		log.Error(err)
-		return errors.New("upgrade failed")
-	}
-
-	vConfig := validator.AddDeprecatedFields(ctx, vchConfig, u.Data)
-	vConfig.ImageFiles = images
-	vConfig.ApplianceISO = path.Base(u.ApplianceISO)
-	vConfig.BootstrapISO = path.Base(u.BootstrapISO)
-	vConfig.Timeout = u.Timeout
-
-	// only care about versions if we're not doing a manual rollback
-	if !u.Data.Rollback {
-		if err := validator.AssertVersion(vchConfig); err != nil {
-			log.Error(err)
-			return errors.New("upgrade failed")
-		}
-	}
-
-	if vchConfig, err = validator.ValidateMigratedConfig(ctx, vchConfig); err != nil {
-		log.Errorf("Failed to migrate Virtual Container Host configuration %s", u.DisplayName)
-		log.Error(err)
-		return errors.New("upgrade failed")
-	}
-
-	if !u.Data.Rollback {
-		err = executor.Configure(vch, vchConfig, vConfig, false)
-	} else {
-		err = executor.Rollback(vch, vchConfig, vConfig)
-	}
-
-	if err != nil {
-		// upgrade failed
-		executor.CollectDiagnosticLogs()
-		return errors.New("upgrade failed")
-	}
-
-	log.Infof("Completed successfully")
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-ui/main.go b/installer/vendor/github.com/vmware/vic/cmd/vic-ui/main.go
deleted file mode 100644
index 3e65c7359e..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-ui/main.go
+++ /dev/null
@@ -1,108 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"github.com/vmware/vic/cmd/vic-ui/ui"
-	"github.com/vmware/vic/pkg/errors"
-	viclog "github.com/vmware/vic/pkg/log"
-)
-
-var (
-	Version  string
-	BuildID  string
-	CommitID string
-)
-
-const (
-	LogFile = "vic-ui.log"
-)
-
-func main() {
-	app := cli.NewApp()
-
-	app.Name = filepath.Base(os.Args[0])
-	app.Usage = "Install/remove VIC UI plugin"
-	app.EnableBashCompletion = true
-
-	ui := ui.NewUI()
-	app.Commands = []cli.Command{
-		{
-			Name:   "install",
-			Usage:  "Install UI plugin",
-			Action: ui.Install,
-			Flags:  ui.Flags(),
-		},
-		{
-			Name:   "remove",
-			Usage:  "Remove UI plugin",
-			Action: ui.Remove,
-			Flags:  ui.Flags(),
-		},
-		{
-			Name:   "info",
-			Usage:  "Show UI plugin information",
-			Action: ui.Info,
-			Flags:  ui.InfoFlags(),
-		},
-		{
-			Name:   "version",
-			Usage:  "Show VIC version information",
-			Action: showVersion,
-		},
-	}
-	if Version != "" {
-		app.Version = fmt.Sprintf("%s-%s-%s", Version, BuildID, CommitID)
-	} else {
-		app.Version = fmt.Sprintf("%s-%s", BuildID, CommitID)
-	}
-
-	logs := []io.Writer{app.Writer}
-	// Open log file
-	// #nosec: Expect file permissions to be 0600 or less
-	f, err := os.OpenFile(LogFile, os.O_RDWR|os.O_CREATE|os.O_APPEND, 0644)
-	if err != nil {
-		// #nosec: Errors unhandled.
-		fmt.Fprintf(os.Stderr, "Error opening logfile %s: %v\n", LogFile, err)
-	} else {
-		defer f.Close()
-		logs = append(logs, f)
-	}
-
-	// Initiliaze logger with default TextFormatter
-	log.SetFormatter(viclog.NewTextFormatter())
-	// SetOutput to io.MultiWriter so that we can log to stdout and a file
-	log.SetOutput(io.MultiWriter(logs...))
-
-	if err := app.Run(os.Args); err != nil {
-		log.Errorf("--------------------")
-		log.Errorf("%s failed: %s\n", app.Name, errors.ErrorStack(err))
-		os.Exit(1)
-	}
-}
-
-func showVersion(cli *cli.Context) error {
-	// #nosec: Errors unhandled.
-	fmt.Fprintf(cli.App.Writer, "%v version %v\n", cli.App.Name, cli.App.Version)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vic-ui/ui/ui.go b/installer/vendor/github.com/vmware/vic/cmd/vic-ui/ui/ui.go
deleted file mode 100644
index 1e82bcb593..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vic-ui/ui/ui.go
+++ /dev/null
@@ -1,375 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ui
-
-import (
-	"fmt"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-	"gopkg.in/urfave/cli.v1"
-
-	"context"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/install/plugin"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Plugin has all input parameters for vic-ui ui command
-type Plugin struct {
-	*common.Target
-	common.Debug
-
-	Force    bool
-	Insecure bool
-
-	Company               string
-	HideInSolutionManager bool
-	Key                   string
-	Name                  string
-	ServerThumbprint      string
-	Summary               string
-	Type                  string
-	URL                   string
-	Version               string
-}
-
-func NewUI() *Plugin {
-	p := &Plugin{Target: common.NewTarget()}
-	return p
-}
-
-// Flags return all cli flags for ui
-func (p *Plugin) Flags() []cli.Flag {
-	flags := []cli.Flag{
-		cli.BoolFlag{
-			Name:        "force, f",
-			Usage:       "Force install",
-			Destination: &p.Force,
-		},
-		cli.StringFlag{
-			Name:        "company",
-			Value:       "",
-			Usage:       "Plugin company name (required)",
-			Destination: &p.Company,
-		},
-		cli.StringFlag{
-			Name:        "key",
-			Value:       "",
-			Usage:       "Plugin key (required)",
-			Destination: &p.Key,
-		},
-		cli.StringFlag{
-			Name:        "name",
-			Value:       "",
-			Usage:       "Plugin name (required)",
-			Destination: &p.Name,
-		},
-		cli.BoolFlag{
-			Name:        "no-show",
-			Usage:       "Hide plugin in UI",
-			Destination: &p.HideInSolutionManager,
-		},
-		cli.StringFlag{
-			Name:        "server-thumbprint",
-			Value:       "",
-			Usage:       "Plugin server thumbprint (required for HTTPS plugin URL)",
-			Destination: &p.ServerThumbprint,
-		},
-		cli.StringFlag{
-			Name:        "summary",
-			Value:       "",
-			Usage:       "Plugin summary (required)",
-			Destination: &p.Summary,
-		},
-		cli.StringFlag{
-			Name:        "url",
-			Value:       "",
-			Usage:       "Plugin URL (required)",
-			Destination: &p.URL,
-		},
-		cli.StringFlag{
-			Name:        "version",
-			Value:       "",
-			Usage:       "Plugin version (required)",
-			Destination: &p.Version,
-		},
-	}
-	flags = append(p.TargetFlags(), flags...)
-	flags = append(flags, p.DebugFlags(true)...)
-
-	return flags
-}
-
-// InfoFlags return info command
-func (p *Plugin) InfoFlags() []cli.Flag {
-	flags := []cli.Flag{
-		cli.StringFlag{
-			Name:        "key",
-			Value:       "",
-			Usage:       "Plugin key (required)",
-			Destination: &p.Key,
-		},
-	}
-	flags = append(p.TargetFlags(), flags...)
-	flags = append(flags, p.DebugFlags(true)...)
-
-	return flags
-}
-
-func (p *Plugin) processInstallParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := p.HasCredentials(); err != nil {
-		return err
-	}
-
-	if p.Company == "" {
-		return cli.NewExitError("--company must be specified", 1)
-	}
-
-	if p.Key == "" {
-		return cli.NewExitError("--key must be specified", 1)
-	}
-
-	if p.Name == "" {
-		return cli.NewExitError("--name must be specified", 1)
-	}
-
-	if p.Summary == "" {
-		return cli.NewExitError("--summary must be specified", 1)
-	}
-
-	if p.URL == "" {
-		return cli.NewExitError("--url must be specified", 1)
-	}
-
-	if p.Version == "" {
-		return cli.NewExitError("--version must be specified", 1)
-	}
-
-	if strings.HasPrefix(strings.ToLower(p.URL), "https://") && p.ServerThumbprint == "" {
-		return cli.NewExitError("--server-thumbprint must be specified when using HTTPS plugin URL", 1)
-	}
-
-	p.Insecure = true
-	return nil
-}
-
-func (p *Plugin) processRemoveParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := p.HasCredentials(); err != nil {
-		return err
-	}
-
-	if p.Key == "" {
-		return cli.NewExitError("--key must be specified", 1)
-	}
-
-	p.Insecure = true
-	return nil
-}
-
-func (p *Plugin) processInfoParams() error {
-	defer trace.End(trace.Begin(""))
-
-	if err := p.HasCredentials(); err != nil {
-		return err
-	}
-
-	if p.Key == "" {
-		return cli.NewExitError("--key must be specified", 1)
-	}
-	return nil
-}
-
-func (p *Plugin) Install(cli *cli.Context) error {
-	var err error
-	if err = p.processInstallParams(); err != nil {
-		return err
-	}
-
-	if p.Debug.Debug != nil && *p.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(cli.Args()) > 0 {
-		log.Error("Install cannot continue: invalid CLI arguments")
-		log.Errorf("Unknown argument: %s", cli.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	log.Infof("### Installing UI Plugin ####")
-
-	pInfo := &plugin.Info{
-		Company:               p.Company,
-		Key:                   p.Key,
-		Name:                  p.Name,
-		ServerThumbprint:      p.ServerThumbprint,
-		ShowInSolutionManager: !p.HideInSolutionManager,
-		Summary:               p.Summary,
-		Type:                  "vsphere-client-serenity",
-		URL:                   p.URL,
-		Version:               p.Version,
-	}
-
-	pl, err := plugin.NewPluginator(context.TODO(), p.Target.URL, p.Target.Thumbprint, pInfo)
-	if err != nil {
-		return err
-	}
-
-	reg, err := pl.IsRegistered(pInfo.Key)
-	if err != nil {
-		return err
-	}
-	if reg {
-		if p.Force {
-			log.Info("Removing existing plugin to force install")
-			err = pl.Unregister(pInfo.Key)
-			if err != nil {
-				return err
-			}
-			log.Info("Removed existing plugin")
-		} else {
-			msg := fmt.Sprintf("plugin (%s) is already registered", pInfo.Key)
-			log.Errorf("Install failed: %s", msg)
-			return errors.New(msg)
-		}
-	}
-
-	log.Info("Installing plugin")
-	err = pl.Register()
-	if err != nil {
-		return err
-	}
-
-	reg, err = pl.IsRegistered(pInfo.Key)
-	if err != nil {
-		return err
-	}
-	if !reg {
-		msg := fmt.Sprintf("post-install check failed to find %s registered", pInfo.Key)
-		log.Errorf("Install failed: %s", msg)
-		return errors.New(msg)
-	}
-
-	log.Info("Installed UI plugin")
-	return nil
-}
-
-func (p *Plugin) Remove(cli *cli.Context) error {
-	var err error
-	if err = p.processRemoveParams(); err != nil {
-		return err
-	}
-	if p.Debug.Debug != nil && *p.Debug.Debug > 0 {
-		log.SetLevel(log.DebugLevel)
-		trace.Logger.Level = log.DebugLevel
-	}
-
-	if len(cli.Args()) > 0 {
-		log.Error("Remove cannot continue: invalid CLI arguments")
-		log.Errorf("Unknown argument: %s", cli.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	if p.Force {
-		log.Info("Ignoring --force")
-	}
-
-	log.Infof("### Removing UI Plugin ####")
-
-	pInfo := &plugin.Info{
-		Key: p.Key,
-	}
-
-	pl, err := plugin.NewPluginator(context.TODO(), p.Target.URL, p.Target.Thumbprint, pInfo)
-	if err != nil {
-		return err
-	}
-	reg, err := pl.IsRegistered(pInfo.Key)
-	if err != nil {
-		return err
-	}
-	if reg {
-		log.Infof("Found target plugin: %s", pInfo.Key)
-	} else {
-		msg := fmt.Sprintf("failed to find target plugin (%s)", pInfo.Key)
-		log.Errorf("Remove failed: %s", msg)
-		return errors.New(msg)
-	}
-
-	log.Info("Removing plugin")
-	err = pl.Unregister(pInfo.Key)
-	if err != nil {
-		return err
-	}
-
-	reg, err = pl.IsRegistered(pInfo.Key)
-	if err != nil {
-		return err
-	}
-	if reg {
-		msg := fmt.Sprintf("post-remove check found %s still registered", pInfo.Key)
-		log.Errorf("Remove failed: %s", msg)
-		return errors.New(msg)
-	}
-
-	log.Info("Removed UI plugin")
-	return nil
-}
-
-func (p *Plugin) Info(cli *cli.Context) error {
-	var err error
-	if err = p.processInfoParams(); err != nil {
-		return err
-	}
-
-	if len(cli.Args()) > 0 {
-		log.Error("Info cannot continue: invalid CLI arguments")
-		log.Errorf("Unknown argument: %s", cli.Args()[0])
-		return errors.New("invalid CLI arguments")
-	}
-
-	pInfo := &plugin.Info{
-		Key: p.Key,
-	}
-
-	pl, err := plugin.NewPluginator(context.TODO(), p.Target.URL, p.Target.Thumbprint, pInfo)
-	if err != nil {
-		return err
-	}
-
-	reg, err := pl.GetPlugin(p.Key)
-	if err != nil {
-		return err
-	}
-	if reg == nil {
-		return errors.Errorf("%s is not registered", p.Key)
-	}
-
-	log.Infof("%s is registered", p.Key)
-	log.Info("")
-	log.Infof("Key: %s", reg.Key)
-	log.Infof("Name: %s", reg.Description.GetDescription().Label)
-	log.Infof("Summary: %s", reg.Description.GetDescription().Summary)
-	log.Infof("Company: %s", reg.Company)
-	log.Infof("Version: %s", reg.Version)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/logs.go b/installer/vendor/github.com/vmware/vic/cmd/vicadmin/logs.go
deleted file mode 100644
index 887722ae8d..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/logs.go
+++ /dev/null
@@ -1,530 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"archive/tar"
-	"archive/zip"
-	"bytes"
-	"compress/gzip"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math"
-	"net/http"
-	"os"
-	"path"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/hpcloud/tail"
-
-	"path/filepath"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/pprof"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const (
-	nBytes    = 1024
-	tailLines = 8
-	uint32max = (1 << 32) - 1
-
-	// how many lines of log data to collect
-	logLines = 5000
-	// how many lines to request per call
-	lines = 500
-)
-
-type dlogReader struct {
-	c    *session.Session
-	name string
-	host *object.HostSystem
-}
-
-func (r dlogReader) open() (entry, error) {
-	defer trace.End(trace.Begin(r.name))
-
-	name := r.name
-	if r.host != nil {
-		name = fmt.Sprintf("%s-%s", path.Base(r.host.InventoryPath), r.name)
-	}
-
-	m := object.NewDiagnosticManager(r.c.Vim25())
-	ctx := context.Background()
-
-	// Currently we collect the tail of diagnostic log files to avoid
-	// reading the entire file into memory or writing local disk.
-
-	// get LineEnd without any LineText
-	h, err := m.BrowseLog(ctx, r.host, r.name, math.MaxInt32, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	end := h.LineEnd
-	start := end - logLines
-
-	var buf bytes.Buffer
-	for start < end {
-		h, err = m.BrowseLog(ctx, r.host, r.name, start, lines)
-		if err != nil {
-			return nil, err
-		}
-
-		for _, line := range h.LineText {
-			buf.WriteString(line)
-			buf.WriteByte('\n')
-		}
-
-		start += lines
-	}
-
-	return newBytesEntry(name+".log", buf.Bytes()), nil
-}
-
-// logFiles has a potential race condition since logrotation can rotate files this moment of time.
-// however, the likely hood of this race is so low that it doesn't worth investing the time to do
-// cross process synchronization.
-func logFiles() []string {
-	defer trace.End(trace.Begin(""))
-	files, err := ioutil.ReadDir(logFileDir)
-	if err != nil {
-		log.Errorf("Failed to get a list of log files: %s", err)
-		return nil
-	}
-
-	names := []string{}
-	for _, fileInfo := range files {
-		if fileInfo.IsDir() {
-			continue
-		}
-		fname := fileInfo.Name()
-		log.Debugf("Found potential file for export: %s", fname)
-
-		for _, f := range logFileListPrefixes {
-			if strings.HasPrefix(fname, f) {
-				fp := filepath.Join(logFileDir, fname)
-				log.Debugf("Adding file for export: %s", fp)
-				names = append(names, fp)
-				break
-			}
-		}
-	}
-
-	return names
-}
-
-// logFile writes the contents of file f and any of it's rotated files to the http writer.
-// includeF is used for tailing, in which case we want to write rotated files but not f itself
-func writeLogFiles(w http.ResponseWriter, r *http.Request, f string, includeF bool) {
-	defer trace.End(trace.Begin(""))
-	files, err := ioutil.ReadDir(logFileDir)
-	if err != nil {
-		log.Errorf("Failed to get a list of log files: %s", err)
-		return
-	}
-
-	// find all rotated files, but not f itself
-	names := []string{}
-	for _, fileInfo := range files {
-		fname := fileInfo.Name()
-		if fileInfo.IsDir() || (fname == f) {
-			continue
-		}
-		log.Debugf("Found potential file for export: %s", fname)
-
-		if strings.HasPrefix(fname, f) {
-			fp := filepath.Join(logFileDir, fname)
-			names = append(names, fp)
-		}
-	}
-	// sort file names to preserve time rotation order
-	sort.Strings(names)
-
-	// find f last and append it to names
-	for _, fileInfo := range files {
-		fname := fileInfo.Name()
-		if fileInfo.IsDir() {
-			continue
-		}
-		if fname == f {
-			log.Debugf("Found potential file for export: %s", fname)
-			fp := filepath.Join(logFileDir, fname)
-			names = append(names, fp)
-		}
-	}
-
-	if len(names) == 0 {
-		http.NotFound(w, r)
-	}
-
-	// write file contents to w
-	for _, fileName := range names {
-		file, err := os.Open(fileName)
-		log.Debugf("Writing contents of: %s", fileName)
-		if err != nil {
-			log.Errorf("error opening file %s: %s", fileName, err.Error())
-			continue
-		}
-		// using interface type here so we can reassign r as a gzip reader for rotated logs
-		var r io.ReadCloser = file
-		if strings.HasSuffix(fileName, "gz") {
-			r, err = gzip.NewReader(file)
-			if err != nil {
-				log.Errorf("error opening gzipped file %s: %s", fileName, err.Error())
-				continue
-			}
-		}
-		_, err = io.Copy(w, r)
-		if err != nil {
-			log.Errorf("error writing contents of %s: %s", fileName, err.Error())
-			continue
-		}
-		r.Close()
-		file.Close()
-	}
-
-}
-
-func configureReaders() map[string]entryReader {
-	defer trace.End(trace.Begin(""))
-
-	pprofPaths := map[string]string{
-		// verbose
-		"verbose": "/debug/pprof/goroutine?debug=2",
-		// concise
-		"concise": "/debug/pprof/goroutine?debug=1",
-		"block":   "/debug/pprof/block?debug=1",
-		"heap":    "/debug/pprof/heap?debug=1",
-		"profile": "/debug/pprof/profile",
-	}
-
-	pprofSources := map[string]string{
-		"docker":    pprof.GetPprofEndpoint(pprof.DockerPort).String(),
-		"portlayer": pprof.GetPprofEndpoint(pprof.PortlayerPort).String(),
-		"vicadm":    pprof.GetPprofEndpoint(pprof.VicadminPort).String(),
-		"vic-init":  pprof.GetPprofEndpoint(pprof.VCHInitPort).String(),
-	}
-
-	readers := map[string]entryReader{
-		"proc-mounts": fileReader("/proc/mounts"),
-		"uptime":      commandReader("uptime"),
-		"df":          commandReader("df"),
-		"free":        commandReader("free"),
-		"netstat":     commandReader("netstat -ant"),
-		"iptables":    commandReader("sudo iptables --list"),
-		"ip-link":     commandReader("ip link"),
-		"ip-addr":     commandReader("ip addr"),
-		"ip-route":    commandReader("ip route"),
-		"lsmod":       commandReader("lsmod"),
-		// TODO: ls without shelling out
-		"disk-by-path":  commandReader("ls -l /dev/disk/by-path"),
-		"disk-by-label": commandReader("ls -l /dev/disk/by-label"),
-		"disk-by-uuid":  commandReader("ls -l /dev/disk/by-uuid"),
-		"lsblk":         commandReader("lsblk -S"),
-		// To check we are not leaking any fds
-		"proc-self-fd": commandReader("ls -l /proc/self/fd"),
-		"ps":           commandReader("ps -ef"),
-		"meminfo":      fileReader("/proc/meminfo"),
-		"journalctl":   commandReader("/bin/journalctl --no-pager"),
-		"dmesg":        commandReader("/bin/journalctl --dmesg --no-pager"),
-		"sys-block":    commandReader("ls -l /sys/block/"),
-		// To check version
-		"VERSION": versionReader("version"),
-	}
-
-	// add the pprof collection
-	for sname, source := range pprofSources {
-		for pname, paths := range pprofPaths {
-			rname := fmt.Sprintf("%s/%s", sname, pname)
-			readers[rname] = urlReader(source + paths)
-		}
-	}
-
-	for _, path := range logFiles() {
-		// Strip off leading '/'
-		readers[path[1:]] = fileReader(path)
-	}
-
-	return readers
-}
-
-func findDiagnosticLogs(c *session.Session) (map[string]entryReader, error) {
-	defer trace.End(trace.Begin(""))
-
-	// When connected to VC, we collect vpxd.log and hostd.log for all cluster hosts attached to the datastore.
-	// When connected to ESX, we just collect hostd.log.
-	const (
-		vpxdKey  = "vpxd:vpxd.log"
-		hostdKey = "hostd"
-	)
-
-	logs := map[string]entryReader{}
-	var err error
-
-	if c.IsVC() {
-		logs[vpxdKey] = dlogReader{c, vpxdKey, nil}
-
-		var hosts []*object.HostSystem
-		if c.Cluster == nil && c.Host != nil {
-			hosts = []*object.HostSystem{c.Host}
-		} else {
-			hosts, err = c.Datastore.AttachedClusterHosts(context.TODO(), c.Cluster)
-			if err != nil {
-				return nil, err
-			}
-		}
-
-		for _, host := range hosts {
-			lname := fmt.Sprintf("%s/%s", hostdKey, host)
-			logs[lname] = dlogReader{c, hostdKey, host}
-		}
-	} else {
-		logs[hostdKey] = dlogReader{c, hostdKey, nil}
-	}
-
-	return logs, nil
-}
-
-func tarEntries(readers map[string]entryReader, out io.Writer) error {
-	defer trace.End(trace.Begin(""))
-
-	r, w := io.Pipe()
-	t := tar.NewWriter(w)
-
-	wg := new(sync.WaitGroup)
-	wg.Add(1)
-
-	// stream tar to out
-	go func() {
-		_, err := io.Copy(out, r)
-		if err != nil {
-			log.Errorf("error copying tar: %s", err)
-		}
-		wg.Done()
-	}()
-
-	for name, r := range readers {
-		log.Infof("Collecting log with reader %s(%#v)", name, r)
-
-		e, err := r.open()
-		if err != nil {
-			log.Warningf("error reading %s(%s): %s\n", name, r, err)
-			continue
-		}
-		var sz int64
-		if e != nil {
-			sz = e.Size()
-		}
-
-		header := tar.Header{
-			Name:    name,
-			Size:    sz,
-			Mode:    0640,
-			ModTime: time.Now(),
-		}
-
-		err = t.WriteHeader(&header)
-		if err != nil {
-			log.Errorf("Failed to write header for %s: %s", header.Name, err)
-			continue
-		}
-
-		log.Infof("%s has size %d", header.Name, header.Size)
-
-		// be explicit about the number of bytes to copy as the log files will likely
-		// be written to during this exercise
-		if e != nil {
-			_, err = io.CopyN(t, e, sz)
-			// #nosec: Errors unhandled.
-			_ = e.Close()
-		}
-		if err != nil {
-			log.Errorf("Failed to write content for %s: %s", header.Name, err)
-			continue
-		}
-	}
-
-	// #nosec: Errors unhandled.
-	_ = t.Flush()
-	// #nosec: Errors unhandled.
-	_ = w.Close()
-	wg.Wait()
-	// #nosec: Errors unhandled.
-	_ = r.Close()
-
-	return nil
-}
-
-func zipEntries(readers map[string]entryReader, out *zip.Writer) error {
-	defer trace.End(trace.Begin(""))
-	defer out.Close()
-	defer out.Flush()
-
-	for name, r := range readers {
-		log.Infof("Collecting log with reader %s(%#v)", name, r)
-
-		e, err := r.open()
-		if err != nil {
-			log.Warningf("error reading %s(%s): %s\n", name, r, err)
-		}
-		var sz int64
-		if e != nil {
-			sz = e.Size()
-		}
-		header := &zip.FileHeader{
-			Name:   name,
-			Method: zip.Deflate,
-		}
-
-		header.SetModTime(time.Now())
-		header.SetMode(0644)
-		if sz > uint32max {
-			header.UncompressedSize = uint32max
-		} else {
-			header.UncompressedSize = uint32(sz)
-		}
-
-		w, err := out.CreateHeader(header)
-
-		if err != nil {
-			log.Errorf("Failed to create Zip writer for %s: %s", header.Name, err)
-			continue
-		}
-
-		log.Infof("%s has size %d", header.Name, sz)
-
-		// be explicit about the number of bytes to copy as the log files will likely
-		// be written to during this exercise
-		if e != nil {
-			_, err = io.CopyN(w, e, sz)
-			// #nosec: Errors unhandled.
-			_ = e.Close()
-		}
-		if err != nil {
-			log.Errorf("Failed to write content for %s: %s", header.Name, err)
-			continue
-		}
-		log.Infof("Wrote %d bytes to %s", sz, header.Name)
-	}
-	return nil
-}
-func tailFile(wr io.Writer, file string, done *chan bool) error {
-	defer trace.End(trace.Begin(file))
-
-	// By default, seek to EOF (if file doesn't exist)
-	spos := tail.SeekInfo{
-		Offset: 0,
-		Whence: 2,
-	}
-
-	// If the file exists, we want to go back tailLines lines
-	// and pass that new offset into the TailFile() constructor
-	// Per @fdawg4l, use bytes.LastIndex() and a 1k buffer to reduce
-	// seeks/reads
-	f, err := os.Open(file)
-	if err == nil {
-		spos = tail.SeekInfo{
-			Offset: findSeekPos(f),
-			Whence: 0,
-		}
-	}
-
-	tcfg := tail.Config{
-		Location:  &spos,
-		ReOpen:    true,
-		MustExist: false,
-		Follow:    true,
-	}
-
-	t, err := tail.TailFile(file, tcfg)
-	if err != nil {
-		return err
-	}
-
-	// We KNOW there's a data race here.
-	// But it doesn't break anything, so we just trap it.
-	defer func() {
-		t.Stop()
-		_ = recover()
-	}()
-	for true {
-		select {
-		case l := <-t.Lines:
-			if l.Err != nil {
-				return l.Err
-			}
-			fmt.Fprint(wr, l.Text, "\n")
-		case _ = <-*done:
-			return nil
-		}
-	}
-	return nil
-}
-
-// Find the offset we want to start tailing from.
-// This should either be beginning-of-file or tailLines
-// newlines from the EOF.
-func findSeekPos(f *os.File) int64 {
-	defer trace.End(trace.Begin(""))
-	nlines := tailLines
-	readPos, err := f.Seek(0, 2)
-	// If for some reason we can't seek, we will just start tailing from beginning-of-file
-	if err != nil {
-		return int64(0)
-	}
-
-	// Buffer so we can seek nBytes (default: 1k) at a time
-	buf := make([]byte, nBytes)
-
-	for readPos > 0 {
-		// Go back nBytes from the last readPos we've seen (stopping at beginning-of-file)
-		// and read the next nBytes
-		readPos -= int64(len(buf))
-		if readPos < 0 {
-			// We don't want to overlap our read with previous reads...
-			buf = buf[:(int(readPos) + nBytes)]
-			readPos = 0
-		}
-		bufend, err := f.ReadAt(buf, readPos)
-
-		// It's OK to get io.EOF here.  Anything else is bad.
-		if err != nil && err != io.EOF {
-			log.Errorf("Error reading from file %s: %s", f.Name(), err)
-			return 0
-		}
-
-		// Start from the end of the buffer and start looking for newlines
-		for bufend > 0 {
-			bufend = bytes.LastIndexByte(buf[:bufend], '\n')
-			if bufend < 0 {
-				break
-			}
-			nlines--
-			if nlines < 0 {
-				return readPos + int64(bufend) + 1
-			}
-		}
-	}
-	return 0
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/server.go b/installer/vendor/github.com/vmware/vic/cmd/vicadmin/server.go
deleted file mode 100644
index e313b6561d..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/server.go
+++ /dev/null
@@ -1,575 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"archive/zip"
-	"compress/gzip"
-	"crypto/tls"
-	"crypto/x509"
-	"html/template"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/go-connections/tlsconfig"
-	"github.com/google/uuid"
-	gorillacontext "github.com/gorilla/context"
-
-	"github.com/vmware/vic/lib/vicadmin"
-	"github.com/vmware/vic/pkg/filelock"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-type server struct {
-	l    net.Listener
-	addr string
-	mux  *http.ServeMux
-	uss  *UserSessionStore
-}
-
-// LoginPageData contains items needed to render the login page template
-type LoginPageData struct {
-	Hostname     string
-	SystemTime   string
-	InvalidLogin string
-}
-
-type format int
-
-const (
-	formatTGZ format = iota
-	formatZip
-)
-
-var beginningOfTime = time.Unix(0, 0).Format(time.RFC3339)
-
-const (
-	sessionExpiration      = time.Hour * 24
-	sessionCookieKey       = "session-data"
-	sessionCreationTimeKey = "created"
-	sessionKey             = "session-id"
-	ipAddressKey           = "ip"
-	loginPagePath          = "/authentication"
-	authFailure            = loginPagePath + "?unauthorized"
-	genericErrorMessage    = "Internal Server Error; see /var/log/vic/vicadmin.log for details" // for http errors that shouldn't be displayed in the browser to the user
-)
-
-func (s *server) listen() error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	var certificate *tls.Certificate
-	s.uss = NewUserSessionStore()
-	if vchConfig.HostCertificate != nil {
-		certificate, err = vchConfig.HostCertificate.Certificate()
-	} else {
-		var c tls.Certificate
-		if c, err = tls.X509KeyPair(
-			rootConfig.serverCert.Cert.Bytes(),
-			rootConfig.serverCert.Key.Bytes()); err != nil {
-			log.Errorf("Could not generate self-signed certificate for vicadmin running with due to error %s", err.Error())
-			return err
-		}
-		certificate = &c
-	}
-	if err != nil {
-		log.Errorf("Could not load certificate from config - running without TLS: %s", err)
-
-		s.l, err = net.Listen("tcp", s.addr)
-		return err
-	}
-
-	// FIXME: assignment copies lock value to tlsConfig: crypto/tls.Config contains sync.Once contains sync.Mutex
-	tlsconfig := func(c *tls.Config) *tls.Config {
-		// if there are CAs, then TLS is enabled
-		if len(vchConfig.CertificateAuthorities) != 0 {
-			if c.ClientCAs == nil {
-				c.ClientCAs = x509.NewCertPool()
-			}
-			if !c.ClientCAs.AppendCertsFromPEM(vchConfig.CertificateAuthorities) {
-				log.Errorf("Unable to load CAs from config; client auth via certificate will not function")
-			}
-			c.ClientAuth = tls.VerifyClientCertIfGiven
-		} else {
-			log.Warnf("No certificate authorities found for certificate-based authentication. This may be intentional, however, certificate-based authentication is disabled")
-		}
-
-		// #nosec: TLS InsecureSkipVerify may be true
-		return &tls.Config{
-			Certificates:             c.Certificates,
-			NameToCertificate:        c.NameToCertificate,
-			GetCertificate:           c.GetCertificate,
-			RootCAs:                  c.RootCAs,
-			NextProtos:               c.NextProtos,
-			ServerName:               c.ServerName,
-			ClientAuth:               c.ClientAuth,
-			ClientCAs:                c.ClientCAs,
-			InsecureSkipVerify:       c.InsecureSkipVerify,
-			CipherSuites:             c.CipherSuites,
-			PreferServerCipherSuites: c.PreferServerCipherSuites,
-			SessionTicketsDisabled:   c.SessionTicketsDisabled,
-			SessionTicketKey:         c.SessionTicketKey,
-			ClientSessionCache:       c.ClientSessionCache,
-			MinVersion:               tls.VersionTLS12,
-			MaxVersion:               c.MaxVersion,
-			CurvePreferences:         c.CurvePreferences,
-		}
-	}(tlsconfig.ServerDefault())
-
-	tlsconfig.Certificates = []tls.Certificate{*certificate}
-
-	innerListener, err := net.Listen("tcp", s.addr)
-	if err != nil {
-		log.Fatal(err)
-		return err
-	}
-
-	s.l = tls.NewListener(innerListener, tlsconfig)
-	return nil
-}
-
-func (s *server) listenPort() int {
-	return s.l.Addr().(*net.TCPAddr).Port
-}
-
-// Enforces authentication on route `link` and runs `handler` on successful auth
-func (s *server) AuthenticatedHandle(link string, h http.Handler) {
-	s.Authenticated(link, h.ServeHTTP)
-}
-
-func (s *server) Handle(link string, h http.Handler) {
-	log.Debugf("%s --- %s", time.Now().String(), link)
-	s.mux.Handle(link, gorillacontext.ClearHandler(h))
-}
-
-// Enforces authentication on route `link` and runs `handler` on successful auth
-func (s *server) Authenticated(link string, handler func(http.ResponseWriter, *http.Request)) {
-	defer trace.End(trace.Begin(""))
-
-	authHandler := func(w http.ResponseWriter, r *http.Request) {
-		// #nosec: Errors unhandled because it is okay if the cookie doesn't exist.
-		websession, _ := s.uss.cookies.Get(r, sessionCookieKey)
-
-		if len(r.TLS.PeerCertificates) > 0 {
-			// the user is authenticated by certificate at connection time
-			log.Infof("Authenticated connection via client certificate with serial %s from %s", r.TLS.PeerCertificates[0].SerialNumber, r.RemoteAddr)
-			key := uuid.New().String()
-
-			vs, err := vSphereSessionGet(&rootConfig.Config)
-			if err != nil {
-				log.Errorf("Unable to get vSphere session with default config for cert-auth'd user")
-				http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-				return
-			}
-			usersess := s.uss.Add(key, &rootConfig.Config, vs)
-
-			timeNow, err := usersess.created.MarshalText()
-			if err != nil {
-				// it's probably safe to ignore this error since we just created usersess.created when we called Add() above
-				// but just in case..
-				log.Errorf("Failed to unmarshal time object %+v into text due to error: %s", usersess.created, err)
-				http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-				return
-			}
-
-			websession.Values[sessionCreationTimeKey] = string(timeNow)
-			websession.Values[sessionKey] = key
-
-			remoteAddr := strings.SplitN(r.RemoteAddr, ":", 2)
-			if len(remoteAddr) != 2 { // TODO: ctrl+f RemoteAddr and move this routine to helper
-				log.Errorf("Format of IP address %s (should be IP:PORT) not recognized", r.RemoteAddr)
-				http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-				return
-			}
-			websession.Values[ipAddressKey] = remoteAddr[0]
-			err = websession.Save(r, w)
-			if err != nil {
-				log.Errorf("Could not create session for user authenticated via client certificate due to error \"%s\"", err.Error())
-				http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-				return
-			}
-
-			// user was authenticated via cert
-			handler(w, r)
-			return
-		}
-
-		c := websession.Values[sessionCreationTimeKey]
-		if c == nil { // no cookie, so redirect to login
-			log.Infof("No authentication token: %+v", websession.Values)
-			http.Redirect(w, r, loginPagePath, http.StatusSeeOther)
-			return
-		}
-
-		// here we have a cookie, but we need to make sure it's not expired:
-		// parse the cookie creation time
-		created, err := time.Parse(time.RFC3339, c.(string))
-		if err != nil {
-			// we pulled this value out of a cookie, so if it doesn't parse, it might've been tampered with
-			// though the cookie's encrypted so that would destroy the whole cookie..
-			// Handling the error in any case:
-			log.Errorf("Couldn't parse time out of retrieved cookie due to error %s", err.Error())
-			http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-
-		// cookie exists but is expired
-		if time.Since(created) > sessionExpiration {
-			http.Redirect(w, r, loginPagePath, http.StatusTemporaryRedirect)
-			return
-		}
-
-		// verify that the auth token is being used by the same IP it was created for
-		c = websession.Values[ipAddressKey]
-		if c == nil {
-			log.Errorf("Couldn't get IP address out of cookie for user connecting from %s at %s", r.RemoteAddr, time.Now())
-			http.Redirect(w, r, loginPagePath, http.StatusTemporaryRedirect)
-			return
-		}
-
-		connectingAddr := strings.SplitN(r.RemoteAddr, ":", 2)
-		if len(connectingAddr) != 2 { // TODO: ctrl+f r.RemoteAddr and move this routine to helper
-			log.Errorf("Format of IP address %s (should be IP:PORT) not recognized", r.RemoteAddr)
-			http.Error(w, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-		if c.(string) != connectingAddr[0] {
-			log.Warnf("User with a valid auth cookie from %s has reappeared at %s. Their token will be expired.", c.(string), connectingAddr[0])
-			s.logoutHandler(w, r)
-			return
-		}
-
-		// if the date & remote IP on the cookie were valid, then the user is authenticated
-		log.Infof("User with a valid auth cookie at %s is authenticated.", connectingAddr[0])
-		handler(w, r)
-	}
-	s.Handle(link, http.HandlerFunc(authHandler))
-}
-
-// renders the page for login and handles authorization requests
-func (s *server) loginPage(res http.ResponseWriter, req *http.Request) {
-	defer trace.End(trace.Begin(""))
-	var invalidLoginMessage = ""
-
-	if req.Method == "POST" {
-		// take the form data and use it to try to authenticate with vsphere
-
-		// create a userconfig
-		userconfig := session.Config{
-			Insecure:       false,
-			Thumbprint:     rootConfig.Thumbprint,
-			Keepalive:      rootConfig.Keepalive,
-			ClusterPath:    rootConfig.ClusterPath,
-			DatacenterPath: rootConfig.DatacenterPath,
-			DatastorePath:  rootConfig.DatastorePath,
-			HostPath:       rootConfig.Config.HostPath,
-			PoolPath:       rootConfig.PoolPath,
-			User:           url.UserPassword(req.FormValue("username"), req.FormValue("password")),
-			Service:        rootConfig.Service,
-		}
-
-		// check login
-		vs, err := vSphereSessionGet(&userconfig)
-		if err != nil || vs == nil {
-			// something went wrong or we could not authenticate
-			log.Warnf("%s failed to authenticate ", req.RemoteAddr)
-			invalidLoginMessage = "Authentication failed due to incorrect credential(s)"
-			hostName, err := os.Hostname()
-			if err != nil {
-				hostName = "VCH"
-			}
-			loginPageData := &LoginPageData{
-				Hostname:     hostName,
-				SystemTime:   time.Now().Format(time.UnixDate),
-				InvalidLogin: invalidLoginMessage,
-			}
-
-			tmpl, err := template.ParseFiles("auth.html")
-			err = tmpl.ExecuteTemplate(res, "auth.html", loginPageData)
-			if err != nil {
-				log.Errorf("Error parsing template: %s", err)
-				http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-				return
-			}
-			return
-		}
-
-		// successful login above; user is authenticated, reported for audit purposes
-		log.Debugf("User %s from %s was successfully authenticated", userconfig.User.Username(), req.RemoteAddr)
-
-		// create a token to save as an encrypted & signed cookie
-		websession, err := s.uss.cookies.Get(req, sessionCookieKey)
-		if websession == nil {
-			log.Errorf("Web session object could not be created due to error %s", err)
-			http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-
-		key := uuid.New().String()
-		userconfig.User = nil
-		userconfig.Service = ""
-		us := s.uss.Add(key, &userconfig, vs)
-
-		timeNow, err := us.created.MarshalText()
-		if err != nil {
-			log.Errorf("Failed to unmarshal time object %+v into text due to error: %s", us.created, err)
-			http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-
-		websession.Values[sessionCreationTimeKey] = string(timeNow)
-		websession.Values[sessionKey] = key
-
-		remoteAddr := strings.SplitN(req.RemoteAddr, ":", 2)
-		if len(remoteAddr) != 2 { // TODO: ctrl+f RemoteAddr and move this routine to helper
-			log.Errorf("Format of IP address %s (should be IP:PORT) not recognized", req.RemoteAddr)
-			http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-		websession.Values[ipAddressKey] = remoteAddr[0]
-
-		if err := websession.Save(req, res); err != nil {
-			log.Errorf("\"%s\" occurred while trying to save session to browser", err.Error())
-			http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-			return
-		}
-
-		// redirect to dashboard
-		http.Redirect(res, req, "/", http.StatusSeeOther)
-		return
-	}
-
-	// Render login page (shows up on non-POST requests)
-	hostName, err := os.Hostname()
-	if err != nil {
-		hostName = "VCH"
-	}
-	loginPageData := &LoginPageData{
-		Hostname:     hostName,
-		SystemTime:   time.Now().Format(time.UnixDate),
-		InvalidLogin: invalidLoginMessage,
-	}
-
-	tmpl, err := template.ParseFiles("auth.html")
-	err = tmpl.ExecuteTemplate(res, "auth.html", loginPageData)
-	if err != nil {
-		log.Errorf("Error parsing template: %s", err)
-		http.Error(res, genericErrorMessage, http.StatusInternalServerError)
-		return
-	}
-}
-
-func (s *server) serve() error {
-	defer trace.End(trace.Begin(""))
-
-	s.mux = http.NewServeMux()
-
-	// unauthenticated routes
-	// these assets bypass authentication & are world-readable
-	s.Handle("/css/", http.StripPrefix("/css/", http.FileServer(http.Dir("css/"))))
-	s.Handle("/images/", http.StripPrefix("/images/", http.FileServer(http.Dir("images/"))))
-	s.Handle("/fonts/", http.StripPrefix("/fonts/", http.FileServer(http.Dir("fonts/"))))
-
-	s.Handle(loginPagePath, http.HandlerFunc(s.loginPage))
-
-	// authenticated routes
-	// tar of appliance system logs
-	s.Authenticated("/logs.tar.gz", s.tarDefaultLogs)
-	s.Authenticated("/logs.zip", s.zipDefaultLogs)
-
-	// tar of appliance system logs + container logs
-	s.Authenticated("/container-logs.tar.gz", s.tarContainerLogs)
-	s.Authenticated("/container-logs.zip", s.zipContainerLogs)
-
-	// get single log file (no tail)
-	s.Authenticated("/logs/", func(w http.ResponseWriter, r *http.Request) {
-		file := strings.TrimPrefix(r.URL.Path, "/logs/")
-		log.Debugf("writing contents for %s", file)
-		writeLogFiles(w, r, file, true)
-	})
-
-	// get single log file (with tail)
-	s.Authenticated("/logs/tail/", func(w http.ResponseWriter, r *http.Request) {
-		file := strings.TrimPrefix(r.URL.Path, "/logs/tail/")
-		log.Debugf("writing contents for %s", file)
-		writeLogFiles(w, r, file, false)
-		s.tailFiles(w, r, []string{filepath.Join(logFileDir, file)})
-	})
-
-	s.Authenticated("/logout", s.logoutHandler)
-	s.Authenticated("/", s.index)
-	server := &http.Server{
-		Handler: s.mux,
-	}
-
-	return server.Serve(s.l)
-}
-
-func (s *server) stop() error {
-	defer trace.End(trace.Begin(""))
-
-	if s.l != nil {
-		err := s.l.Close()
-		s.l = nil
-		return err
-	}
-
-	return nil
-}
-
-// logout handler expires the user's session cookie by setting its creation time to the beginning of time
-func (s *server) logoutHandler(res http.ResponseWriter, req *http.Request) {
-	// #nosec: Errors unhandled.
-	websession, _ := s.uss.cookies.Get(req, sessionCookieKey)
-	// ignore parsing/marshalling errors because we're parsing a hardcoded beginning-of-time string
-	websession.Values[sessionCreationTimeKey] = beginningOfTime
-	if err := websession.Save(req, res); err != nil {
-		http.Error(res, "Failed to expire user session", http.StatusInternalServerError)
-		return
-	}
-	s.uss.Delete(websession.Values[sessionKey].(string))
-	http.Redirect(res, req, "/authentication", http.StatusTemporaryRedirect)
-}
-
-func (s *server) bundleContainerLogs(res http.ResponseWriter, req *http.Request, f format) {
-	defer trace.End(trace.Begin(""))
-	logrotateLock := filelock.NewFileLock(filelock.LogRotateLockName)
-	if err := logrotateLock.Acquire(); err != nil {
-		log.Errorf("Failed to acquire logrotate lock: %s", err)
-	} else {
-		defer func() { logrotateLock.Release() }()
-	}
-
-	readers := configureReaders()
-	c, err := s.getSessionFromRequest(context.Background(), req)
-	if err != nil {
-		log.Errorf("Failed to get vSphere session while bundling container logs due to error: %s", err.Error())
-		http.Redirect(res, req, "/logout", http.StatusTemporaryRedirect)
-		return
-	}
-
-	logs, err := findDatastoreLogs(c)
-	if err != nil {
-		log.Warningf("error searching datastore: %s", err)
-	} else {
-		for key, rdr := range logs {
-			readers[key] = rdr
-		}
-	}
-
-	logs, err = findDiagnosticLogs(c)
-	if err != nil {
-		log.Warningf("error collecting diagnostic logs: %s", err)
-	} else {
-		for key, rdr := range logs {
-			readers[key] = rdr
-		}
-	}
-
-	s.bundleLogs(res, req, readers, f)
-}
-
-func (s *server) tarDefaultLogs(res http.ResponseWriter, req *http.Request) {
-	defer trace.End(trace.Begin(""))
-
-	s.bundleLogs(res, req, configureReaders(), formatTGZ)
-}
-
-func (s *server) zipDefaultLogs(res http.ResponseWriter, req *http.Request) {
-	defer trace.End(trace.Begin(""))
-
-	s.bundleLogs(res, req, configureReaders(), formatZip)
-}
-
-func (s *server) bundleLogs(res http.ResponseWriter, req *http.Request, readers map[string]entryReader, f format) {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	if f == formatTGZ {
-		res.Header().Set("Content-Type", "application/x-gzip")
-		z := gzip.NewWriter(res)
-		defer z.Close()
-		err = tarEntries(readers, z)
-	} else if f == formatZip {
-		res.Header().Set("Content-Type", "application/zip")
-		z := zip.NewWriter(res)
-		defer z.Close()
-		err = zipEntries(readers, z)
-	}
-
-	if err != nil {
-		log.Errorf("Error bundling logs: %s", err)
-	}
-}
-
-func (s *server) tarContainerLogs(res http.ResponseWriter, req *http.Request) {
-	s.bundleContainerLogs(res, req, formatTGZ)
-}
-
-func (s *server) zipContainerLogs(res http.ResponseWriter, req *http.Request) {
-	s.bundleContainerLogs(res, req, formatZip)
-}
-
-func (s *server) tailFiles(res http.ResponseWriter, req *http.Request, names []string) {
-	defer trace.End(trace.Begin(""))
-
-	cc := res.(http.CloseNotifier).CloseNotify()
-
-	fw := &flushWriter{
-		f: res.(http.Flusher),
-		w: res,
-	}
-
-	done := make(chan bool)
-	for _, file := range names {
-		go tailFile(fw, file, &done)
-	}
-
-	<-cc
-	for range names {
-		done <- true
-	}
-}
-
-func (s *server) index(res http.ResponseWriter, req *http.Request) {
-	defer trace.End(trace.Begin(""))
-	ctx := context.Background()
-	sess, err := s.getSessionFromRequest(ctx, req)
-	if err != nil {
-		log.Errorf("While loading index page got %s looking up a vSphere session", err.Error())
-		http.Redirect(res, req, "/logout", http.StatusTemporaryRedirect)
-		return
-	}
-	v := vicadmin.NewValidator(ctx, &vchConfig, sess)
-	if sess == nil {
-		// We're unable to connect to vSphere, so display an error message
-		v.VCHIssues = template.HTML("<span class=\"error-message\">We're having some trouble communicating with vSphere. <a href=\"/logout\">Logging in again</a> may resolve the issue.</span>\n")
-	}
-
-	tmpl, err := template.ParseFiles("dashboard.html")
-	err = tmpl.ExecuteTemplate(res, "dashboard.html", v)
-	if err != nil {
-		log.Errorf("Error parsing template: %s", err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/usersession.go b/installer/vendor/github.com/vmware/vic/cmd/vicadmin/usersession.go
deleted file mode 100644
index 8b0d2124ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/usersession.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/gorilla/securecookie"
-	"github.com/gorilla/sessions"
-
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// UserSession holds a user's session metadata
-type UserSession struct {
-	id      string
-	created time.Time
-	config  *session.Config
-	vsphere *session.Session
-}
-
-// UserSessionStore holds and manages user sessions
-type UserSessionStore struct {
-	mutex    sync.RWMutex
-	sessions map[string]*UserSession
-	ticker   *time.Ticker
-	cookies  *sessions.CookieStore
-}
-
-type UserSessionStorer interface {
-	Add(id string, config *session.Config, vs *session.Session) *UserSession
-	Delete(id string)
-	VSphere(id string) (vSphereSession *session.Session, err error)
-	UserSession(id string) *UserSession
-}
-
-// Add a session. VS may be nil if host is plain ESX
-func (u *UserSessionStore) Add(id string, config *session.Config, vs *session.Session) *UserSession {
-	u.mutex.Lock()
-	defer u.mutex.Unlock()
-	sess := &UserSession{
-		id:      id,
-		created: time.Now(),
-		// TODO strip out config cause it's not needed anymore, but shows up in a number of places
-		config:  config,
-		vsphere: vs,
-	}
-	u.sessions[id] = sess
-	return sess
-}
-
-func (u *UserSessionStore) Delete(id string) {
-	u.mutex.Lock()
-	defer u.mutex.Unlock()
-	delete(u.sessions, id)
-}
-
-// Grabs the UserSession metadata object and doesn't establish a connection to vSphere
-func (u *UserSessionStore) UserSession(id string) *UserSession {
-	u.mutex.RLock()
-	defer u.mutex.RUnlock()
-	return u.sessions[id]
-}
-
-// Returns a vSphere session object. Caller responsible for error handling/logout
-func (u *UserSessionStore) VSphere(ctx context.Context, id string) (*session.Session, error) {
-	us := u.UserSession(id)
-	if us == nil {
-		return nil, fmt.Errorf("User session with unique ID %s does not exist", id)
-	}
-	if us.vsphere == nil {
-		return nil, fmt.Errorf("No vSphere session found for user: %s", id)
-	}
-
-	vsphus, err := us.vsphere.SessionManager.UserSession(ctx)
-	if err != nil || vsphus == nil {
-		if err != nil {
-			log.Warnf("Failed to validate user %s session: %v", id, err)
-			return nil, err
-		}
-		return nil, fmt.Errorf("User %s session has expired", id)
-	}
-	log.Infof("Found vSphere session for vicadmin usersession %s", id)
-	return us.vsphere, nil
-}
-
-// reaper takes abandoned sessions to a farm upstate so they don't build up forever
-func (u *UserSessionStore) reaper() {
-	for range u.ticker.C {
-		for id, session := range u.sessions {
-			if time.Since(session.created) > sessionExpiration {
-				u.Delete(id)
-			}
-		}
-	}
-}
-
-// NewUserSessionStore creates & initializes a UserSessionStore and starts a session reaper in the background
-func NewUserSessionStore() *UserSessionStore {
-	u := &UserSessionStore{
-		sessions: make(map[string]*UserSession),
-		ticker:   time.NewTicker(time.Minute * 10),
-		mutex:    sync.RWMutex{},
-		cookies: sessions.NewCookieStore(
-			[]byte(securecookie.GenerateRandomKey(64)),
-			[]byte(securecookie.GenerateRandomKey(32))),
-	}
-	u.cookies.Options = &sessions.Options{
-		Path:     "/",
-		MaxAge:   int(sessionExpiration.Seconds()),
-		Secure:   true,
-		HttpOnly: true,
-	}
-	go u.reaper()
-	return u
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm.go b/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm.go
deleted file mode 100644
index ab9fad2e03..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm.go
+++ /dev/null
@@ -1,631 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
-	"os/signal"
-	"strings"
-	"syscall"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-
-	vchconfig "github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/pprof"
-	"github.com/vmware/vic/pkg/certificate"
-	viclog "github.com/vmware/vic/pkg/log"
-	"github.com/vmware/vic/pkg/log/syslog"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/compute"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	timeout = time.Duration(2 * time.Second)
-)
-
-type serverCertificate struct {
-	Key  bytes.Buffer
-	Cert bytes.Buffer
-}
-
-type vicAdminConfig struct {
-	session.Config
-	addr       string
-	tls        bool
-	serverCert *serverCertificate
-}
-
-var (
-	logFileDir          = "/var/log/vic"
-	logFileListPrefixes = []string{
-		"docker-personality.log",
-		"port-layer.log",
-		"vicadmin.log",
-		"init.log",
-	}
-
-	// VMFiles is the set of files to collect per VM associated with the VCH
-	vmFiles = []string{
-		"output.log",
-		"vmware.log",
-		"tether.debug",
-	}
-
-	// this struct holds root credentials or vSphere extension private key instead if available
-	// if you are exposing log information to a user, create a new session for that user, do not use this one
-	// also, 'root' is a pun -- this is both the "root" config, e.g., the base config, and the one w/ root creds
-	rootConfig vicAdminConfig
-
-	resources vchconfig.Resources
-
-	vchConfig vchconfig.VirtualContainerHostConfigSpec
-
-	datastore types.ManagedObjectReference
-)
-
-type logfile struct {
-	URL    url.URL
-	VMName string
-	Host   *object.HostSystem
-}
-
-func Init() {
-	// #nosec: Errors unhandled.
-	_ = pprof.StartPprof("vicadmin", pprof.VicadminPort)
-
-	defer trace.End(trace.Begin(""))
-
-	// load the vch config
-	src, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		log.Errorf("Unable to load configuration from guestinfo")
-		return
-	}
-
-	extraconfig.Decode(src, &vchConfig)
-
-	logcfg := viclog.NewLoggingConfig()
-	if vchConfig.Diagnostics.DebugLevel > 0 {
-		logcfg.Level = log.DebugLevel
-		trace.Logger.Level = log.DebugLevel
-		syslog.Logger.Level = log.DebugLevel
-	}
-
-	if vchConfig.Diagnostics.SysLogConfig != nil {
-		logcfg.Syslog = &viclog.SyslogConfig{
-			Network:  vchConfig.Diagnostics.SysLogConfig.Network,
-			RAddr:    vchConfig.Diagnostics.SysLogConfig.RAddr,
-			Priority: syslog.Info | syslog.Daemon,
-		}
-	}
-
-	viclog.Init(logcfg)
-
-	// We don't want to run this as root.
-	ud := syscall.Getuid()
-	gd := syscall.Getgid()
-	log.Info(fmt.Sprintf("Current UID/GID = %d/%d", ud, gd))
-	// TODO: Enable this after we figure out to NOT break the test suite with it.
-	// if ud == 0 {
-	// log.Errorf("Error: vicadmin must not run as root.")
-	// time.Sleep(60 * time.Second)
-	// os.Exit(1)
-	// }
-
-	flag.StringVar(&rootConfig.addr, "l", "client.localhost:2378", "Listen address")
-
-	// TODO: This should all be pulled from the config
-	flag.StringVar(&rootConfig.DatacenterPath, "dc", "", "Path of the datacenter")
-	flag.StringVar(&rootConfig.ClusterPath, "cluster", "", "Path of the cluster")
-	flag.StringVar(&rootConfig.PoolPath, "pool", "", "Path of the resource pool")
-
-	if vchConfig.HostCertificate == nil {
-		log.Infoln("--no-tls is enabled on the personality")
-		rootConfig.serverCert = &serverCertificate{}
-		rootConfig.serverCert.Cert, rootConfig.serverCert.Key, err = certificate.CreateSelfSigned(rootConfig.addr, []string{"VMware, Inc."}, 2048)
-		if err != nil {
-			log.Errorf("--no-tls was specified but we couldn't generate a self-signed cert for vic admin due to error %s so vicadmin will not run", err.Error())
-			return
-		}
-	}
-
-	// FIXME: pull the rest from flags
-	flag.Parse()
-}
-
-type entryReader interface {
-	open() (entry, error)
-}
-
-type entry interface {
-	io.ReadCloser
-	Name() string
-	Size() int64
-}
-
-type bytesEntry struct {
-	io.ReadCloser
-	name string
-	size int64
-}
-
-func (e *bytesEntry) Name() string {
-	return e.name
-}
-
-func (e *bytesEntry) Size() int64 {
-	return e.size
-}
-
-func newBytesEntry(name string, b []byte) entry {
-	r := bytes.NewReader(b)
-
-	return &bytesEntry{
-		ReadCloser: ioutil.NopCloser(r),
-		size:       int64(r.Len()),
-		name:       name,
-	}
-}
-
-type versionReader string
-
-func (path versionReader) open() (entry, error) {
-	defer trace.End(trace.Begin(string(path)))
-	return newBytesEntry(string(path), []byte(version.Version)), nil
-}
-
-type commandReader string
-
-func (path commandReader) open() (entry, error) {
-	defer trace.End(trace.Begin(string(path)))
-
-	args := strings.Split(string(path), " ")
-	// #nosec: Subprocess launching with variable
-	cmd := exec.Command(args[0], args[1:]...)
-
-	output, err := cmd.CombinedOutput()
-	if err != nil {
-		return nil, fmt.Errorf("%s: %s", err, string(output))
-	}
-
-	return newBytesEntry(string(path), output), nil
-}
-
-type fileReader string
-
-type fileEntry struct {
-	io.ReadCloser
-	os.FileInfo
-}
-
-func (path fileReader) open() (entry, error) {
-	defer trace.End(trace.Begin(string(path)))
-
-	f, err := os.Open(string(path))
-	if err != nil {
-		return nil, err
-	}
-
-	s, err := os.Stat(string(path))
-	if err != nil {
-		return nil, err
-	}
-
-	// Files in /proc always have struct stat.st_size==0, so just read it into memory.
-	if s.Size() == 0 && strings.HasPrefix(f.Name(), "/proc/") {
-		b, err := ioutil.ReadAll(f)
-		// #nosec: Errors unhandled.
-		_ = f.Close()
-		if err != nil {
-			return nil, err
-		}
-
-		return newBytesEntry(f.Name(), b), nil
-	}
-
-	return &fileEntry{
-		ReadCloser: f,
-		FileInfo:   s,
-	}, nil
-}
-
-type urlReader string
-
-func httpEntry(name string, res *http.Response) (entry, error) {
-	defer trace.End(trace.Begin(name))
-
-	if res.StatusCode != http.StatusOK {
-		return nil, errors.New(res.Status)
-	}
-
-	if res.ContentLength > 0 {
-		return &bytesEntry{
-			ReadCloser: res.Body,
-			size:       res.ContentLength,
-			name:       name,
-		}, nil
-	}
-
-	// If we don't have Content-Length, read into memory for the tar.Header.Size
-	body, err := ioutil.ReadAll(res.Body)
-	// #nosec: Errors unhandled.
-	_ = res.Body.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	return newBytesEntry(name, body), nil
-}
-
-func (path urlReader) open() (entry, error) {
-	defer trace.End(trace.Begin(string(path)))
-	client := http.Client{
-		Timeout: timeout,
-	}
-	res, err := client.Get(string(path))
-	if err != nil {
-		return nil, err
-	}
-
-	return httpEntry(string(path), res)
-}
-
-type datastoreReader struct {
-	ds   *object.Datastore
-	path string
-	ctx  context.Context
-}
-
-// listVMPaths returns an array of datastore paths for VMs associated with the
-// VCH - this includes containerVMs and the appliance
-func listVMPaths(ctx context.Context, s *session.Session) ([]logfile, error) {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	var children []*vm.VirtualMachine
-
-	if len(vchConfig.ComputeResources) == 0 {
-		return nil, errors.New("compute resources is empty")
-	}
-
-	ref := vchConfig.ComputeResources[0]
-	rp := compute.NewResourcePool(ctx, s, ref)
-	if children, err = rp.GetChildrenVMs(ctx, s); err != nil {
-		return nil, err
-	}
-
-	self, err := guest.GetSelf(ctx, s)
-	if err != nil {
-		log.Errorf("Unable to get handle to self for log filtering")
-	}
-
-	log.Infof("Found %d candidate VMs in resource pool %s for log collection", len(children), ref.String())
-
-	logfiles := []logfile{}
-	for _, child := range children {
-		path, err := child.VMPathNameAsURL(ctx)
-
-		if err != nil {
-			log.Errorf("Unable to get datastore path for child VM %s: %s", child.Reference(), err)
-			// we need to get as many logs as possible
-			continue
-		}
-
-		logname, err := child.Name(ctx)
-		if err != nil {
-			log.Errorf("Unable to get the vm name for %s: %s", child.Reference(), err)
-			continue
-		}
-
-		if self != nil && child.Reference().String() == self.Reference().String() {
-			// FIXME: until #2630 is addressed, and we confirm this filters secrets from appliance vmware.log as well,
-			// we're skipping direct collection of those logs.
-			log.Info("Skipping collection for appliance VM (moref match)")
-			continue
-		}
-
-		// backup check if we were unable to initialize self for some reason
-		if self == nil && logname == vchConfig.Name {
-			log.Info("Skipping collection for appliance VM (string match)")
-			continue
-		}
-
-		log.Debugf("Adding VM for log collection: %s", path.String())
-		h, err := child.HostSystem(ctx)
-		if err != nil {
-			log.Warnf("Unable to get host system for VM %s - will use default host for log collection: %s", logname, err)
-		}
-
-		log := logfile{
-			URL:    path,
-			VMName: logname,
-			Host:   h,
-		}
-
-		logfiles = append(logfiles, log)
-	}
-
-	log.Infof("Collecting logs from %d VMs", len(logfiles))
-	log.Infof("Found VM paths are : %#v", logfiles)
-	return logfiles, nil
-}
-
-// addApplianceLogs whitelists the logs to include for the appliance.
-// TODO: once we've started encrypting all potentially sensitive data and filtering out guestinfo.ovfEnv
-// we can resume collection of vmware.log and drop the appliance specific handling
-func addApplianceLogs(ctx context.Context, s *session.Session, readers map[string]entryReader) error {
-	self, err := guest.GetSelf(ctx, s)
-	if err != nil || self == nil {
-		return fmt.Errorf("Unable to collect appliance logs due to unknown self-reference: %s", err)
-	}
-
-	self2 := vm.NewVirtualMachineFromVM(ctx, s, self)
-	path, err := self2.VMPathNameAsURL(ctx)
-	if err != nil {
-		return err
-	}
-
-	ds, err := s.Finder.Datastore(ctx, path.Host)
-	if err != nil {
-		return err
-	}
-
-	h, err := self2.HostSystem(ctx)
-	if err != nil {
-		log.Warnf("Unable to get host system for appliance - will use default host for log collection: %s", err)
-	} else {
-		ctx = ds.HostContext(ctx, h)
-	}
-
-	wpath := fmt.Sprintf("appliance/tether.debug")
-	rpath := fmt.Sprintf("%s/%s", path.Path, "tether.debug")
-	log.Infof("Processed File read Path : %s", rpath)
-	log.Infof("Processed File write Path : %s", wpath)
-	readers[wpath] = datastoreReader{
-		ds:   ds,
-		path: rpath,
-		ctx:  ctx,
-	}
-
-	return nil
-}
-
-// find datastore logs for the appliance itself and all containers
-func findDatastoreLogs(c *session.Session) (map[string]entryReader, error) {
-	defer trace.End(trace.Begin(""))
-
-	// Create an empty reader as opposed to a nil reader...
-	readers := map[string]entryReader{}
-	ctx := context.Background()
-
-	logfiles, err := listVMPaths(ctx, c)
-	if err != nil {
-		detail := fmt.Sprintf("unable to perform datastore log collection due to failure looking up paths: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	err = addApplianceLogs(ctx, c, readers)
-	if err != nil {
-		log.Errorf("Issue collecting appliance logs: %s", err)
-	}
-
-	for _, logfile := range logfiles {
-		log.Debugf("Assembling datastore readers for %s", logfile.URL.String())
-		// obtain datastore object
-		ds, err := c.Finder.Datastore(ctx, logfile.URL.Host)
-		if err != nil {
-			log.Errorf("Failed to acquire reference to datastore %s: %s", logfile.URL.Host, err)
-			continue
-		}
-
-		hCtx := ctx
-		if logfile.Host != nil {
-			hCtx = ds.HostContext(ctx, logfile.Host)
-		}
-
-		// generate the full paths to collect
-		for _, file := range vmFiles {
-			wpath := fmt.Sprintf("%s/%s", logfile.VMName, file)
-			rpath := fmt.Sprintf("%s/%s", logfile.URL.Path, file)
-			log.Infof("Processed File read Path : %s", rpath)
-			log.Infof("Processed File write Path : %s", wpath)
-			readers[wpath] = datastoreReader{
-				ds:   ds,
-				path: rpath,
-				ctx:  hCtx,
-			}
-
-			log.Debugf("Added log file for collection: %s", logfile.URL.String())
-		}
-	}
-
-	return readers, nil
-}
-
-func (r datastoreReader) open() (entry, error) {
-	defer trace.End(trace.Begin(r.path))
-
-	u, ticket, err := r.ds.ServiceTicket(r.ctx, r.path, "GET")
-	if err != nil {
-		return nil, err
-	}
-
-	req, err := http.NewRequest("GET", u.String(), nil)
-	if ticket != nil {
-		req.AddCookie(ticket)
-	}
-
-	res, err := r.ds.Client().Do(req)
-	if err != nil {
-		return nil, err
-	}
-
-	return httpEntry(r.path, res)
-}
-
-// stripCredentials removes user credentials from "in"
-func stripCredentials(in *session.Session) error {
-	serviceURL, err := soap.ParseURL(rootConfig.Service)
-	if err != nil {
-		log.Errorf("Error parsing service URL from config: %s", err)
-		return err
-	}
-	serviceURL.User = nil
-	newclient, err := govmomi.NewClient(context.Background(), serviceURL, true)
-	if err != nil {
-		log.Errorf("Error creating new govmomi client without credentials but with auth cookie: %s", err.Error())
-		return err
-	}
-	newclient.Jar = in.Client.Jar
-	in.Client = newclient
-	return nil
-}
-
-func vSphereSessionGet(sessconfig *session.Config) (*session.Session, error) {
-	s := session.NewSession(sessconfig)
-	s.UserAgent = version.UserAgent("vic-admin")
-
-	ctx := context.Background()
-	_, err := s.Connect(ctx)
-	if err != nil {
-		log.Warnf("Unable to connect: %s", err)
-		return nil, err
-	}
-
-	_, err = s.Populate(ctx)
-	if err != nil {
-		// not a critical error for vicadmin
-		log.Warnf("Unable to populate session: %s", err)
-	}
-	usersession, err := s.SessionManager.UserSession(ctx)
-	if err != nil {
-		log.Errorf("Got %s while creating user session", err)
-		return nil, err
-	}
-	if usersession == nil {
-		return nil, fmt.Errorf("vSphere session is no longer valid")
-	}
-
-	log.Infof("Got session from vSphere with key: %s username: %s", usersession.Key, usersession.UserName)
-
-	err = stripCredentials(s)
-	if err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-func (s *server) getSessionFromRequest(ctx context.Context, r *http.Request) (*session.Session, error) {
-	sessionData, err := s.uss.cookies.Get(r, sessionCookieKey)
-	if err != nil {
-		return nil, err
-	}
-	var d interface{}
-	var ok bool
-	if d, ok = sessionData.Values[sessionKey]; !ok {
-		return nil, fmt.Errorf("User-provided cookie did not contain a session ID -- it is corrupt or tampered")
-	}
-	c, err := s.uss.VSphere(ctx, d.(string))
-	return c, err
-}
-
-type flushWriter struct {
-	f http.Flusher
-	w io.Writer
-}
-
-func (fw *flushWriter) Write(p []byte) (int, error) {
-	n, err := fw.w.Write(p)
-
-	fw.f.Flush()
-
-	return n, err
-}
-
-func main() {
-	Init()
-
-	if version.Show() {
-		fmt.Fprintf(os.Stdout, "%s\n", version.String())
-		return
-	}
-
-	// FIXME: these should just be consumed directly inside Session
-	rootConfig.Service = vchConfig.Target
-	rootConfig.User = url.UserPassword(vchConfig.Username, vchConfig.Token)
-	rootConfig.Thumbprint = vchConfig.TargetThumbprint
-	rootConfig.DatastorePath = vchConfig.Storage.ImageStores[0].Host
-
-	if vchConfig.Diagnostics.DebugLevel > 0 {
-		log.SetLevel(log.DebugLevel)
-		log.Info("Setting debug logging")
-	}
-
-	if vchConfig.Diagnostics.DebugLevel > 2 {
-		rootConfig.addr = "0.0.0.0:2378"
-		log.Warn("Listening on all networks because of debug level")
-	}
-	s := &server{
-		addr: rootConfig.addr,
-	}
-
-	err := s.listen()
-
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	log.Infof("listening on %s", s.addr)
-	signals := []syscall.Signal{
-		syscall.SIGTERM,
-		syscall.SIGINT,
-	}
-
-	sigchan := make(chan os.Signal, 1)
-	for _, signum := range signals {
-		signal.Notify(sigchan, signum)
-	}
-
-	go func() {
-		signal := <-sigchan
-		log.Infof("received %s", signal)
-		s.stop()
-	}()
-
-	s.serve()
-}
diff --git a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm_test.go b/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm_test.go
deleted file mode 100644
index 14836966fe..0000000000
--- a/installer/vendor/github.com/vmware/vic/cmd/vicadmin/vicadm_test.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	_ "net/http/pprof"
-	"net/url"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	vchconfig "github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-)
-
-// use an http client which we modify in init()
-// to be permissive with certificates so we can
-// use a self-signed cert hardcoded into these tests
-var insecureClient *http.Client
-
-func init() {
-	// init needs to be updated to include client certificates
-	// so that the disabled tests can be re-enabled
-	sdk := env.URL(nil)
-	if sdk != "" {
-		flag.Set("sdk", sdk)
-		flag.Set("vm-path", "docker-appliance")
-		flag.Set("cluster", os.Getenv("GOVC_CLUSTER"))
-	}
-
-	// fake up a docker-host for pprof collection
-	u := url.URL{Scheme: "http", Host: "127.0.0.1:6060"}
-
-	go func() {
-		log.Println(http.ListenAndServe(u.Host, nil))
-	}()
-
-	transport := &http.Transport{
-		TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-	}
-	insecureClient = &http.Client{Transport: transport}
-	flag.Set("docker-host", u.Host)
-
-	hostCertFile := "fixtures/vicadmin_test_cert.pem"
-	hostKeyFile := "fixtures/vicadmin_test_pkey.pem"
-
-	cert, cerr := ioutil.ReadFile(hostCertFile)
-	key, kerr := ioutil.ReadFile(hostKeyFile)
-	if kerr != nil || cerr != nil {
-		panic("unable to load test certificate")
-	}
-	vchConfig.HostCertificate = &vchconfig.RawCertificate{
-		Cert: cert,
-		Key:  key,
-	}
-}
-
-func testLogTar(t *testing.T, plainHTTP bool) {
-	t.SkipNow() // TODO FIXME auth is in place now
-
-	if runtime.GOOS != "linux" {
-		t.SkipNow()
-	}
-
-	logFileDir = "."
-
-	s := &server{
-		addr: "127.0.0.1:0",
-	}
-
-	err := s.listen()
-	assert.NoError(t, err)
-
-	port := s.listenPort()
-
-	go s.serve()
-	defer s.stop()
-
-	var res *http.Response
-	res, err = insecureClient.Get(fmt.Sprintf("https://root:thisisinsecure@localhost:%d/container-logs.tar.gz", port))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	z, err := gzip.NewReader(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tz := tar.NewReader(z)
-
-	for {
-		h, err := tz.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		name, err := url.QueryUnescape(h.Name)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if testing.Verbose() {
-			fmt.Printf("\n%s...\n", name)
-			io.CopyN(os.Stdout, tz, 150)
-			fmt.Printf("...\n")
-		}
-	}
-}
-
-func TestLogTar(t *testing.T) {
-	t.SkipNow() // TODO FIXME auth is in place now
-	testLogTar(t, false)
-	testLogTar(t, true)
-}
-
-func TestLogTail(t *testing.T) {
-	t.SkipNow() // TODO FIXME auth is in place now
-	if runtime.GOOS != "linux" {
-		t.SkipNow()
-	}
-
-	f, err := os.OpenFile("./vicadmin.log", os.O_RDWR|os.O_CREATE, 0666)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer os.Remove(f.Name())
-
-	f.WriteString("# not much here yet\n")
-
-	logFileDir = "."
-	name := filepath.Base(f.Name())
-
-	s := &server{
-		addr: "127.0.0.1:0",
-		// auth: &credentials{"root", "thisisinsecure"},
-	}
-
-	err = s.listen()
-	assert.NoError(t, err)
-
-	port := s.listenPort()
-
-	go s.serve()
-	defer s.stop()
-
-	out := ioutil.Discard
-	if testing.Verbose() {
-		out = os.Stdout
-	}
-
-	paths := []string{
-		"/logs/tail/" + name,
-	}
-
-	u := url.URL{
-		// User:   url.UserPassword("root", "thisisinsecure"),
-		Scheme: "https",
-		Host:   fmt.Sprintf("localhost:%d", port),
-	}
-
-	str := "The quick brown fox jumps over the lazy dog.\n"
-
-	// Pre-populate the log file
-	for i := 0; i < tailLines; i++ {
-		f.WriteString(str)
-	}
-
-	log.Printf("Testing TestLogTail\n")
-	for _, path := range paths {
-		u.Path = path
-		log.Printf("GET %s:\n", u.String())
-		res, err := insecureClient.Get(u.String())
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer res.Body.Close()
-
-		// Each line written to the log file has enough bytes to ensure
-		// that 8 lines make up at least 256 bytes. This is in case this
-		// goroutine finishes writing all lines before tail kicks in.
-		go func() {
-			for j := 1; j < 512; j++ {
-				f.WriteString(str)
-			}
-			f.Sync()
-		}()
-
-		size := int64(256)
-		n, err := io.CopyN(out, res.Body, size)
-		assert.NoError(t, err)
-		out.Write([]byte("...\n"))
-
-		assert.Equal(t, size, n)
-	}
-}
-
-type seekTest struct {
-	input  string
-	output int
-}
-
-func testSeek(t *testing.T, st seekTest, td string) {
-	f, err := ioutil.TempFile(td, "FindSeekPos")
-	defer f.Close()
-	if err != nil {
-		log.Printf("Unable to create temporary file: %s", err)
-		t.Fatal(err)
-	}
-	n, err := f.WriteString(st.input)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != len(st.input) {
-		t.Fatal(fmt.Errorf("Incorrect byte count on write: %d/%d", n, len(st.input)))
-	}
-
-	if ret := findSeekPos(f); ret != int64(st.output) {
-		t.Fatal(fmt.Errorf("Incorrect seek position: %d/%d", ret, st.output))
-	}
-	log.Printf("Successfully seeked to position %d", st.output)
-	os.Remove(f.Name())
-}
-func TestFindSeekPos(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.SkipNow()
-	}
-
-	seekTests := []seekTest{
-		{"abcd\nabcd\n", 0},
-		{"abcd\nabcd\nabcd\nabcd\nabcd\nabcd\nabcd\nabcd\nabcd\nabcd\n", 10},
-	}
-
-	str := "0123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789"
-	str = fmt.Sprintf("%s%s", str, str)
-	str2 := fmt.Sprintf("%s\n%s\n%s\n", str, str, str)
-	str2 = fmt.Sprintf("%s%s", str2, str2)
-	// Verify we don't have overlapping reads at beginning of file
-	// 6 lines, 1206 characters. Should come back with seek position 0
-	seekTests = append(seekTests, seekTest{str2, 0})
-
-	for seg := 0; seg < 3; seg++ {
-		str = str + str
-	}
-	str2 = str + "\n"
-	fmt.Printf("str length is %d\n", len(str))
-	// str is 1,601 chars long now
-	for line := 0; line < 2; line++ {
-		str2 = str2 + str2
-	}
-
-	// str2 is 4 lines long.  Should seek to beginning of file
-	seekTests = append(seekTests, seekTest{str2, 0})
-
-	// str2 is now 12 lines long.  Should seek to position 6,404
-	str2 = fmt.Sprintf("%s%s%s", str2, str2, str2)
-	seekTests = append(seekTests, seekTest{str2, 6404})
-
-	td := os.TempDir()
-	for i, st := range seekTests {
-		log.Printf("Test case #%d: ", i)
-		testSeek(t, st, td)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/docker-compose.yml b/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/docker-compose.yml
deleted file mode 100644
index 1237c522a5..0000000000
--- a/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/docker-compose.yml
+++ /dev/null
@@ -1,37 +0,0 @@
-version: "3"
-
-services:
-  vote:
-    image: victest/vote
-    container_name: vote
-    command: python app.py
-    ports:
-      - "5000:80"
-
-  redis:
-    image: redis:alpine
-    container_name: redis
-    ports: ["6379"]
-
-  worker:
-    container_name: worker
-    image: victest/vote-worker
-
-# Postgres container will create an anonymous volume.  VIC will use a
-# vmdk for the volume.  Since it is a new volume, it will have a lost+found
-# folder, and the Postgres init scripts do not like a non-empty folder (the
-# lost+found folder).  We work around this by directing the init scripts to
-# use another arbitrary folder.  We do this by setting the PGDATA env var.
-  db:
-    container_name: db
-    image: postgres:9.4
-    environment:
-      - PGDATA=/var/lib/postgresql/data/data
-
-  result:
-    image: victest/vote-result
-    container_name: result
-    command: nodemon --debug server.js
-    ports:
-      - "5001:80"
-      - "5858:5858"
diff --git a/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/votingapp.dab b/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/votingapp.dab
deleted file mode 100644
index 57065325dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/demos/compose/voting-app/votingapp.dab
+++ /dev/null
@@ -1,69 +0,0 @@
-{
-  "Services": {
-    "db": {
-      "Env": [
-        "PGDATA=/var/lib/postgresql/data/data"
-      ], 
-      "Image": "postgres@sha256:9db811348585075eddb7b6938fa65c0236fe8e4f7feaf3c2890a3c4b7f4c9bfc", 
-      "Networks": [
-        "default"
-      ]
-    }, 
-    "redis": {
-      "Image": "redis@sha256:f1ed3708f538b537eb9c2a7dd50dc90a706f7debd7e1196c9264edeea521a86d", 
-      "Networks": [
-        "default"
-      ], 
-      "Ports": [
-        {
-          "Port": 6379, 
-          "Protocol": "tcp"
-        }
-      ]
-    }, 
-    "result": {
-      "Args": [
-        "nodemon", 
-        "--debug", 
-        "server.js"
-      ], 
-      "Image": "victest/vote-result@sha256:413fcc5d11e4426d9e5ec512056aeeb7fa83acc61eec2ed6346e8d30d56b7ae7", 
-      "Networks": [
-        "default"
-      ], 
-      "Ports": [
-        {
-          "Port": 80, 
-          "Protocol": "tcp"
-        }, 
-        {
-          "Port": 5858, 
-          "Protocol": "tcp"
-        }
-      ]
-    }, 
-    "vote": {
-      "Args": [
-        "python", 
-        "app.py"
-      ], 
-      "Image": "victest/vote@sha256:13037f3373a3b10dfeac4f323b38a215d9665d88d72b1bb5fe7baef83c3b34ad", 
-      "Networks": [
-        "default"
-      ], 
-      "Ports": [
-        {
-          "Port": 80, 
-          "Protocol": "tcp"
-        }
-      ]
-    }, 
-    "worker": {
-      "Image": "victest/vote-worker@sha256:70cc69d1e91b8c23bbfd7515572c804c8b954c227da0e55e1131c367929f79dd", 
-      "Networks": [
-        "default"
-      ]
-    }
-  }, 
-  "Version": "0.1"
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/demos/compose/webserving-app/docker-compose.yml b/installer/vendor/github.com/vmware/vic/demos/compose/webserving-app/docker-compose.yml
deleted file mode 100644
index ae285f1e14..0000000000
--- a/installer/vendor/github.com/vmware/vic/demos/compose/webserving-app/docker-compose.yml
+++ /dev/null
@@ -1,30 +0,0 @@
-version: '3'
-
-networks:
-  my_net:
-    driver: bridge
-
-services:
-  web_server:
-    image: victest/web_elgg
-    container_name: web_server
-    networks:
-      - my_net
-    ports:
-      - "8080:8080"
-
-  mysql_server:
-    image: victest/web_db
-    container_name: mysql_server
-    command: [bash, -c, "/execute.sh"]
-    networks:
-       - my_net
-    environment:
-       - web_host=192.168.60.130 
-       - root_password=root  
-       
-  memcache_server:
-    image: cloudsuite/web-serving:memcached_server
-    container_name: memcache_server
-    networks:
-       - my_net    
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/README.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/README.md
deleted file mode 100644
index bc4bed5ff5..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/README.md
+++ /dev/null
@@ -1,57 +0,0 @@
-# Container Workflow
-
-The following are guideline suggestions for those who want to use VIC to develop and deploy a containerized application.  These guidelines pertain to VIC 0.7.0.  While VIC continues to progress towards VIC 1.0, the current feature set requires some care in creating a containerized application and deploying it.  We present these guidelines from a developer and a devops perspective.
-
-An example workflow is presented here, in the form of a modified voting app, based on [Docker's voting app](https://github.com/docker/example-voting-app).
-
-## Container Workflow Feature Set
-
-General feature set (e.g. Docker run, ps, inspect, etc) used at the CLI will not be discussed.  Only feature set important for containerizing apps and deploying them are discussed.  These include volume and network support.  It is also worth mentioning that basic Docker Compose support is available for application deployment.
-
-#### Currently Available Features
-
-1. Docker Compose (basic)
-2. Registry pull from docker hub and private registry
-3. Named Data Volumes
-4. Anonymous Data Volumes
-5. Bridged Networks
-6. External Networks
-7. Port Mapping
-8. Network Links/Alias
-
-#### Future Features
-
-Be aware the following feature are not yet available and must be taken into account when containerizing an app and deploying it.
-
-1. Docker build
-2. Registry pushing
-3. Concurrent data volume sharing between containers
-4. Local host folder mapping to a container volume
-5. Local host file mapping to a container
-6. Docker copy files into a container, both running and stopped
-7. Docker container inspect does not return all container network for a container
-
-## Workflow Guidelines
-
-Anything that can be performed with Docker Compose can be performed manually via the Docker CLI and via scripting using the CLI.  This makes Compose a good baseline reference and our guidelines will use it for demonstration purposes.  Our guideline uses Docker Compose 1.8.1.  The list above in the Future Features section puts constraints on what types of containerized application can be deployed on VIC 0.7.0.
-
-Please note, these guidelines and recommendations exist for the current feature set in VIC 0.7.0.  As VIC approaches 1.0, many of these constraints will go away.
-
-#### Guidelines for Building Container Images
-The current lack of docker build and registry pushing means users will need to use regular Docker to build a container and to push it to the global hub or your corporate private registry.  The example workflow using Docker's voting app will illustrate how to get around this constraint.
-
-#### Guidelines for Sharing Config
-VIC 0.7.0 current lack of data volume sharing and docker copy will put constraints on how configuration are provided to a containerized application.  An example of configuration is your web server config files.  Our recommendation for getting around the current limitation is to pass in configuration via command line arguments or environment variables.  Add a script to the container image that ingest the command line argument/environment variable and pass these configuration to the contained application.  A benefit of using environment variables to transfer configuration is the containerized app will more closely follow the popular 12-factor app model.
-
-With no direct support for sharing volumes between containers processes that must share files have the following options:
-
-1. build them into the same image and run in the same container
-2. add a script to the container that mounts an NFS share (containers must be on the same network)
-   a. Run container with NFS server sharing a data volume
-   b. Mount NFS share in whichever containers need to share
-
-TODO: Provide example of both
-
-## Example Applications
-
-We have taken Docker's voting app example and used the above guidelines to modify it for use on VIC 0.7.0.  Please follow to this [page](voting_app.md) for more information.
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/README.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/README.md
deleted file mode 100644
index a30664e0f1..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# Using vSphere Integrated Container Engine with VMware's Harbor
-
-In this example, we will install VMware's Harbor registry and show how to get vSphere Integrated Container Engine (VIC Engine) 0.8.0 working with Harbor.  With 0.8.0, the engine does not have an install-time mechanism to set up a self-signed certificate so we will show the manual steps for post-install setup as a workaround.  We will not show how to setup Harbor with LDAP.  For that, the reader may visit the [Harbor documentation](https://github.com/vmware/harbor/tree/master/docs) site for more information.  Since there is a lot of documentation on the Harbor site for various setup, we will focus on setting up Harbor with a self-signed certificate and setting up VIC Engine to work with this Harbor instance.
-
-## Prerequisite
-
-The following example requires a vCenter installation.
-
-Note: Certificate verification requires all machines using certificates are time/date accurate.  This can be achieved using several options, suchas, vSphere web client, vSphere thick client for Windows or govc. In the following, we deploy this example on a vCenter where all ESXi hosts in the cluster have been set up with NTP and were sync'd prior to installing VIC Engine or Harbor.
-
-## Workflows
-
-1. [Deploy a VCH to use with Harbor](deploy_vch_with_harbor.md)
-2. [Post-Install Usage](post_install_usage.md)
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/deploy_vch_with_harbor.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/deploy_vch_with_harbor.md
deleted file mode 100644
index 00bf43c306..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/deploy_vch_with_harbor.md
+++ /dev/null
@@ -1,76 +0,0 @@
-# Deploying vSphere Integrated Container Engine with Harbor
-
-## Prerequisite
-
-Harbor requires 60GB or more free space on your datastore.
-
-## Workflow
-
-We will use VIC Engine 0.8.0 and Harbor 0.5.0 for this example.  We will use Ubuntu as OS on our user machine.
-
-If no server certificate and private key are provided during installation, Harbor will self generate these.  It will also provide a self-generated CA (certificate authority) certificate if no server certificate and private key are provided during installation.  The OVA installation guide for Harbor can be found in the [Harbor docs](https://github.com/vmware/harbor/blob/master/docs/installation_guide_ova.md).  Harbor requires both an IP address and FQDN (fully qualified domain name) for the the server.  There is also a DHCP install method available for debugging purposes, but it is not a recommended production deployment model.
-
-We will assume a Harbor instance has been installed without server certificate and private key.  We will also assume we have downloaded the CA cert using the Harbor instuctions.  The last steps left to get Harbor working with vSphere Integrated Container Engine is to update standard docker with the Harbor CA cert and deploy a new VCH with the CA cert.  The instructions are provided below.
-<br><br>
-
-## Update the user working machine with the CA.crt for standard docker
-
-We must update the standard docker on our laptop so it knows of our CA certificate.  Docker can look for additional CA certificates outside of the OS's CA bundle folder if we put new CA certificates in the right location, documented [here](https://docs.docker.com/engine/security/certificates/).
-
-We create the necessary folder, copy our CA cert file there, and restart docker.  This should be all that is necessary.  We take the additional steps to verify that we can log onto our Harbor server.
-
-```
-loc@Devbox:~/mycerts$ sudo su
-[sudo] password for loc: 
-root@Devbox:/home/loc/mycerts# mkdir -p /etc/docker/certs.d/<Harbor FQDN>
-root@Devbox:/home/loc/mycerts# mkdir -p /etc/docker/certs.d/<Harbor IP>
-root@Devbox:/home/loc/mycerts# cp ca.crt /etc/docker/certs.d/<Harbor FQDN>/
-root@Devbox:/home/loc/mycerts# cp ca.crt /etc/docker/certs.d/<Harbor IP>/
-root@Devbox:/home/loc/mycerts# exit
-exit
-loc@Devbox:~/mycerts$ sudo systemctl daemon-reload
-loc@Devbox:~/mycerts$ sudo systemctl restart docker
-
-loc@Devbox:~$ docker logout <Harbor FQDN>
-Remove login credentials for <Harbor FQDN>
-
-loc@Devbox:~$ docker logout <Harbor IP>
-Remove login credentials for <Harbor IP>
-
-loc@Devbox:~$ docker login <Harbor FQDN>
-Username: loc
-Password: 
-Login Succeeded
-
-loc@Devbox:~$ docker login <Harbor IP>
-Username: loc
-Password: 
-Login Succeeded
-
-loc@Devbox:~$ docker logout <Harbor FQDN>
-Remove login credentials for <Harbor FQDN>
-
-loc@Devbox:~$ docker logout <Harbor IP>
-Remove login credentials for <Harbor IP>
-```
-Notice we create folders for both FQDN and IP in the docker cert folder and copy the CA cert to both.  This will allow us to log into the Harbor from Docker using both FQDN and IP address.
-<br><br>
-
-## Install a VCH with the new CA certificate
-
-In this step, we deploy a VCH and specify our CA cert via a --registry-ca parameter in vic-machine.  This parameter is a list, meaning we can easily add multiple CA certs by specifying multiple --registry-ca parameters.
-
-For simplicity, we will install a VCH with the --no-tls flag.  This indicates we will not need TLS from a docker CLI to the VCH.  This does NOT imply that access to Harbor will be performed without TLS.
-
-```
-root@Devbox:/home/loc/go/src/github.com/vmware/vic/bin# ./vic-machine-linux create --target=<vCenter_IP> --image-store="vsanDatastore" --name=vic-docker --user=root -password=<vCenter_password> --compute-resource="/dc1/host/cluster1/Resources" --bridge-network DPortGroup --force --no-tls --registry-ca=ca.crt
-
-WARN[2016-11-11T11:46:37-08:00] Configuring without TLS - all communications will be insecure
-
-...
-
-INFO[2016-11-11T11:47:57-08:00] Installer completed successfully             
-```
-<br>
-
-Proceed to [Post-Install Usage](post_install_usage.md) for examples of how to use this deployed VCH with Harbor.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/post_install_usage.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/post_install_usage.md
deleted file mode 100644
index f520cce6bd..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/harbor_registry/post_install_usage.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Using vSphere Integrated Container Engine with Harbor
-
-Here we show an example of using a deployed VCH with Harbor as a private registry.  We assume that one has been setup using either static IP or FQDN.  We also assume standard docker has been updated with the certificate authority cert that can verify the deployed Harbor's server cert.
-<br><br>
-
-## Workflow
-
-1. Develop or obtain a docker container image on a computer (or terminal) using standard docker.  Tag the image for Harbor and push the image to the server.
-2. Pull down the image from Harbor to a deployed VCH and use it.
-<br><br>
-
-## Push a container image to Harbor using standard docker
-
-In this step, we pull the busybox container image from the docker hub down to our laptop, which had the CA certificate updated for docker use earlier.  Then we tag the image for uploading to our Harbor registry and push the image up to it.  Please note, we log onto the Harbor server before pushing the image up to it.
-
-```
-loc@Devbox:~/mycerts$ docker pull busybox
-Using default tag: latest
-latest: Pulling from library/busybox
-
-56bec22e3559: Pull complete 
-Digest: sha256:29f5d56d12684887bdfa50dcd29fc31eea4aaf4ad3bec43daf19026a7ce69912
-Status: Downloaded newer image for busybox:latest
-loc@Devbox:~/mycerts$ 
-loc@Devbox:~/mycerts$ docker tag busybox <Harbor FQDN or static IP>/test/busybox
-
-loc@Devbox:~/mycerts$ docker login <Harbor FQDN or static IP>
-Username: loc
-Password: 
-Login Succeeded
-
-loc@Devbox:~/mycerts$ docker push <Harbor FQDN or static IP>/test/busybox
-The push refers to a repository [<Harbor FQDN or static IP>/test/busybox]
-e88b3f82283b: Pushed 
-latest: digest: sha256:29f5d56d12684887bdfa50dcd29fc31eea4aaf4ad3bec43daf19026a7ce69912 size: 527
-```
-
-## Pull the container image down to the VCH
-
-Now, in another terminal, we can pull the image from Harbor to our VCH.
-
-```
-loc@Devbox:~$ export DOCKER_HOST=tcp://<Deployed VCH IP>:2375
-loc@Devbox:~$ export DOCKER_API_VERSION=1.23
-loc@Devbox:~$ docker images
-REPOSITORY          TAG                 IMAGE ID            CREATED             SIZE
-
-loc@Devbox:~$ docker pull <Harbor FQDN or static IP>/test/busybox
-Using default tag: latest
-Pulling from test/busybox
-Error: image test/busybox not found
-
-loc@Devbox:~$ docker login <Harbor FQDN or static IP>
-Username: loc
-Password: 
-Login Succeeded
-
-loc@Devbox:~$ docker pull <Harbor FQDN or static IP>/test/busybox
-Using default tag: latest
-Pulling from test/busybox
-56bec22e3559: Pull complete 
-a3ed95caeb02: Pull complete 
-Digest: sha256:97af7f861fb557c1eaafb721946af5c7aefaedd51f78d38fa1828d7ccaae4141
-Status: Downloaded newer image for test/busybox:latest
-
-loc@Devbox:~$ docker images
-REPOSITORY                                           TAG                 IMAGE ID            CREATED             SIZE
-<Harbor FQDN or static IP>/test/busybox   latest              e292aa76ad3b        5 weeks ago         1.093 MB
-loc@Devbox:~$ 
-```
-
-Note above, on our first attempt to pull the image down, it failed, with a 'not found' error message.  Once we log into the Harbor server, our attempt to pull down the image succeeds.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/images/elgg.png b/installer/vendor/github.com/vmware/vic/doc/application_workflow/images/elgg.png
deleted file mode 100644
index 3c83878cb0..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/application_workflow/images/elgg.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/private_registry.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/private_registry.md
deleted file mode 100644
index 8b608f128a..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/private_registry.md
+++ /dev/null
@@ -1,102 +0,0 @@
-# Running a private registry with VIC
-
-In this example, we will run a private Docker registry on VIC and push and pull images using VIC.  VMware also offers an enterprise ready registry named [Harbor](https://github.com/vmware/harbor) that can be used in place of the base Docker registry.
-
-## Prerequisite
-
-Before going through this example, we need to re-emphasize some concepts around Docker and VIC.  The following examples are shown using Linux.  For Windows and Mac users, these examples should not differ much.
-
-Installing VIC will also require installing Docker locally.  When Docker is installed, we will get both a client (CLI or command line interface) and a daemon that handles all local container operations.  Local containers are those that run on the user local machine instead of a VMWare vSphere/ESXi environment.  The CLI is important as it will be most user's touchpoint for working with containers on VIC and on their local system.  The distinction between using the CLI against the two environment is very important in this example.  By default, the CLI will use the local Docker daemon.  After setting some environment variables, the CLI can be instructed to send all operations to VIC instead of the local Docker daemon.  The two environment variable are DOCKER_HOST and DOCKER_API_VERSION.
-
-In this example, we are deploying an insecure registry with no authentication for simplicity.  We will also be targeting an ESXi environment.
-
-## Workflow
-
-In terminal #1: (local Docker)
-
-1. Open a terminal and make sure that it will use the local Docker daemon.  At a command prompt, issue  
-    ```
-        $> unset DOCKER_HOST
-    ```  
-2. Install a VCH for a private registry using vic-machine
-3. Run [Docker's registry](https://docs.docker.com/registry/) on the first VCH
-4. Install a second VCH for running applications, making sure to specify --insecure-registry to ensure this second VIC can pull images from the insecure registry in the first VCH.
-5. At a terminal command prompt, using regular Docker, tag the images to be destined for the registry.
-6. Modify the docker systemd config file to allow pushing to an insecure registry
-7. Restart the docker daemon
-8. Push the image using the full tagged name (including host IP and port)
-
-In terminal #2: (VIC VCH)
-
-1. Open a terminal and make sure it is using the second VCH.  At a command prompt, issue  
-    ```
-        $> export DOCKER_HOST=tcp://<VCH_IP>:<VCH_PORT>
-        $> export DOCKER_API_VERSION=1.23
-    ```
-2. Pull the image from the registry VCH
-
-### Example run
-
-terminal 1:
-```
-$> unset DOCKER_HOST
-$> ./vic-machine-linux create --target=192.168.218.207 --image-store=datastore1 --name=vic-registry --user=root --password=vagrant --compute-resource="/ha-datacenter/host/esxbox.localdomain/Resources" --bridge-network=vic-network --no-tls --volume-store=datastore1/registry:default --force
-
-...
-INFO[2016-10-08T17:31:06-07:00] Initialization of appliance successful       
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] vic-admin portal:                            
-INFO[2016-10-08T17:31:06-07:00] http://192.168.218.138:2378                  
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] Docker environment variables:                
-INFO[2016-10-08T17:31:06-07:00]   DOCKER_HOST=192.168.218.138:2375           
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] Connect to docker:                           
-INFO[2016-10-08T17:31:06-07:00] docker -H 192.168.218.138:2375 info          
-INFO[2016-10-08T17:31:06-07:00] Installer completed successfully             
-
-$> DOCKER_HOST=tcp://192.168.218.138:2375 DOCKER_API_VERSION=1.23 docker run -d -p 5000:5000 --name registry registry:2
-
-$> ./vic-machine-linux create --target=192.168.218.207 --image-store=datastore1 --name=vic-app --user=root --password=vagrant --compute-resource="/ha-datacenter/host/esxbox.localdomain/Resources" --bridge-network=vic-network --no-tls --volume-store=datastore1/vic-app:default --force --insecure-registry 192.168.218.138
-
-...
-INFO[2016-10-08T17:31:06-07:00] Initialization of appliance successful       
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] vic-admin portal:                            
-INFO[2016-10-08T17:31:06-07:00] http://192.168.218.131:2378                  
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] Docker environment variables:                
-INFO[2016-10-08T17:31:06-07:00]   DOCKER_HOST=192.168.218.131:2375           
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00]                                              
-INFO[2016-10-08T17:31:06-07:00] Connect to docker:                           
-INFO[2016-10-08T17:31:06-07:00] docker -H 192.168.218.131:2375 info          
-INFO[2016-10-08T17:31:06-07:00] Installer completed successfully             
-
-$> sudo vi /lib/systemd/system/docker.service
-$> sudo systemctl daemon-reload
-$> sudo systemctl restart docker
-$> docker tag busybox 192.168.218.138:5000/test/busybox
-$> docker push 192.168.218.138:5000/test/busybox
-```
-
-terminal 2:
-```
-$> export DOCKER_HOST=tcp://192.168.218.131:2375
-$> export DOCKER_API_VERSION=1.23
-$> docker pull 192.168.218.138:5000/test/busybox
-```
-
-Note, in this example, we disabled TLS for simplicity.  Also, we did not show what was modified in /lib/systemd/system/docker.service.  That is shown below for the example above.
-
-```
-[Service]
-Type=notify
-# the default is not to use systemd for cgroups because the delegate issues still
-# exists and systemd currently does not support the cgroup feature set required
-# for containers run by docker
-ExecStart=/usr/bin/dockerd --tls=false -H fd:// --insecure-registry 192.168.218.138:5000
-```
-
-In the second step, we specify the necessary environment variables before the docker run command.  On our Linux machine, this sets the variables for the duration of the operation, and once the docker run finishes, those variables are reverted to their previous values.  We use the registry:2 image.  It is important not to specify registry:2.0 in this example.  Registry 2.0 has issues that prevents the example above from working.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/voting_app.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/voting_app.md
deleted file mode 100644
index b17d546892..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/voting_app.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Voting App on VIC
-
-The [voting app](https://github.com/docker/example-voting-app) is one of Docker's example multi-tiered app.  We will neither discuss the design of the app nor explain how it works.  Instead, we will focus on it's Docker Compose yml file and use the [guidelines](README.md) to modify that yml file to make it work on VIC 0.7.0.  You can find the modified compose yml file in the folder [vic/demos/compose/voting-app/](../../demos/compose/voting-app).  We have only included the modified yml file as the below workflow will use the original source from github.
-
-## Workflow
-
-### Original Compose File
-
-```
-version: "2"
-
-services:
-  vote:
-    build: ./vote
-    command: python app.py
-    volumes:
-     - ./vote:/app
-    ports:
-      - "5000:80"
-
-  redis:
-    image: redis:alpine
-    ports: ["6379"]
-
-  worker:
-    build: ./worker
-
-  db:
-    image: postgres:9.4
-
-  result:
-    build: ./result
-    command: nodemon --debug server.js
-    volumes:
-      - ./result:/app
-    ports:
-      - "5001:80"
-      - "5858:5858"
-```
-
-We see the above compose file are using two features that are not yet supported in VIC 0.7.0.  The first is docker build.  The second is local folder mapping to container volume.  Let's walk through modifying this app and deploy it onto a vSphere environment.
-
-### Getting the App Prepared
-
-First, clone the repository from github.  Note, we have included the modified compose file in our /demos folder, but in this exercise, we are going to modify this app from the sources from github.
-
-Second, to get around the docker build directive, we follow the previously mentioned guidelines and use regular docker to build each component that requires a build.  Then we tag the the images to upload to our private registry (or private account on Docker Hub).  In this example, we are going to use VMWare's victest account on Docker Hub.  You will not be able to use this account, but you can create your own and use that in place of the victest keywords below.  Please note, the steps shown below are performed in a terminal using regular docker (as opposed to VIC's docker personality daemon).  Note, it is possible to build and tag an image in one step.  Below, the steps are broken into separate steps.
-
-**build the images:**  
-$> cd example-voting-app  
-$> docker build -t vote ./vote  
-$> docker build -t vote-worker ./worker  
-$> docker build -t vote-result ./result  
-
-**tag the images for a registry:**  
-$> docker tag vote victest/vote  
-$> docker tag vote-worker victest/vote-worker  
-$> docker tag vote-result victest/vote-result  
-
-**push the images to the registry:**  
-$> docker login (... and provide credentials)  
-$> docker push victest/vote  
-$> docker push victest/vote-worker  
-$> docker push victest/vote-result  
-
-Second, we analyze the application.  There doesn't appear to be a real need to map the local folder to the container volume so we remove the local folder mapping.  We also remove all the build directives from the yml file.
-
-### Updated Compose File for VIC 0.7.0
-
-```
-version: "2"
-
-services:
-  vote:
-    image: victest/vote
-    command: python app.py
-    ports:
-      - "5000:80"
-
-  redis:
-    image: redis:alpine
-    ports: ["6379"]
-
-  worker:
-    image: victest/vote-worker
-
-  db:
-    image: postgres:9.4
-
-  result:
-    image: victest/vote-result
-    command: nodemon --debug server.js
-    ports:
-      - "5001:80"
-      - "5858:5858"
-```
-
-### Deploy to Your VCH
-
-We assume a VCH has already been deployed with vic-machine and VCH_IP is the IP address of the deployed VCH.  This IP should have been presented after the VCH was successfully installed.  We also assume we are still in the example-voting-app folder, with the modified compose yml file.
-
-$> docker-compose -H VCH_IP up -d
-
-Now, use your web browser to navigate to "http://VCH_IP:5000" and "http://VCH_IP:5001" to verify the voting app is running.
-
-That's really all there is to deploying **this** app.  It is a contrived app and more complex containerized apps may have more steps to perform before it will on VIC 0.7.0.
diff --git a/installer/vendor/github.com/vmware/vic/doc/application_workflow/webserving.md b/installer/vendor/github.com/vmware/vic/doc/application_workflow/webserving.md
deleted file mode 100644
index 048615c436..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/application_workflow/webserving.md
+++ /dev/null
@@ -1,136 +0,0 @@
-# Web-serving on vSphere Integrated Containers Engine
-
-We take the Web-serving benchmark from CloudSuite (http://cloudsuite.ch/webserving/) as an example, to demonstrate how customers who are interested in the LEMP implementation of a web-serving application could deploy it on vSphere Integrated Containers Engine 0.7.0 using Docker Compose. This demo has three tiers deployed on three containerVMs: an Nginx Web server, a Memcached server, and a MySQL database server. The Web server runs Elgg (a social networking engine) and connects the Memcached server and the database server through the network.
-
-## Workflow
-
-### Build docker image for the Web server (on regular docker)
-
-Note, in the original web-server docker image from Cloudesuite, the email verification for new user is not enabled.  This demo is here for illustration only. **You can also skip this section and proceed to "[Compose File for vSphere Integrated Containers Engine](#compose-file-for-vsphere-integrated-containers-engine)" if you do not want to build your own image**.
-
-Step I: 
-Download the original installation files from https://github.com/ParsaLab/cloudsuite/tree/master/benchmarks/web-serving/web_server
-
-Step II:
-In the Dockerfile, add “Run apt-get install –y sendmail” and “EXPOSE 25”
-
-Step III:
-Replace “bootstrap.sh” with the following:
-
-```
-#!/bin/bash
-hname=$(hostname)
-line=$(cat /etc/hosts | grep '127.0.0.1')
-line2=" web_server web_server.localdomain"
-sed -i "/\b\(127.0.0.1\)\b/d" /etc/hosts
-echo "$line $line2  $hname" >> /etc/hosts
-cat /etc/hosts
-service sendmail stop
-service sendmail start
-service php5-fpm restart
-service nginx restart
-```
-Step IV: (In this example, we will deploy the image to the docker hub.)
--	Build the image: 
-```
-$> docker build  -t repo/directory:tag . 
-```
--	Login to your registry: (we use the default docker hub in this example) 
-```
-$> docker login (input your credentials when needed)
-```
--	upload your image: 
-```
-$> docker push repo/directory:tag
-```
-
-### Build docker image for the MySQL server (on regular docker)
-
-This example application uses the database to store the address of the Web server. The original Dockerfile from Cloudsuite populates this with "http://web_server:8080", which is not usable in production. Using the suggestions we provided earlier, we modify the execute.sh script to replace the "web_server" text with the actual IP of our VCH.  This script is executed when this database container is executed. In the Docker Compose file, we specify the IP address of our target VCH. You will see that in the modified compose yml file below. 
-
-This example illustrates passing config in via environment variables and having the script use those values to modify internal config in the running container. Another option is to use a script and command line arguments to pass config to a containerized app. Below, we will modify the Dockerfile and script. **You can also skip this section and proceed to "[Compose File for vSphere Integrated Containers Engine](#compose-file-for-vsphere-integrated-containers-engine)" if you do not want to build your own image**.
-
-Step I: 
-Download the original installation files from https://github.com/ParsaLab/cloudsuite/tree/master/benchmarks/web-serving/db_server
-
-Step II:
-In the Dockerfile, comment out the following lines:
-```
-ENV web_host web_server
-RUN sed -i -e"s/HOST_IP/${web_host}:8080/" /elgg_db.dump
-CMD bash -c "/execute.sh ${root_password}"
-```
-
-Step III:
-Replace “files/execute.sh” with the following:
-
-```
-#!/bin/bash
-set -x
-service mysql restart
-# Wait for mysql to come up
-while :; do mysql -uroot -p${root_password} -e "status" && break; sleep 1; done
-
-mysql -uroot -p$root_password -e "create database ELGG_DB;"
-bash -c 'sed -i -e"s/HOST_IP/${web_host}:8080/" /elgg_db.dump'
-cat /elgg_db.dump | grep 8080
-
-# Need bash -c for redirection
-bash -c "mysql -uroot -p$root_password ELGG_DB < /elgg_db.dump"
-
-mysql -uroot -p$root_password -e "GRANT ALL PRIVILEGES ON *.* TO 'root'@'%' IDENTIFIED BY '$root_password' WITH GRANT OPTION; FLUSH PRIVILEGES;"
-
-service mysql stop 
-/usr/sbin/mysqld
-```
-
-Step IV: Same as Step IV when creating the docker image for the Web server.
-
-### Compose File for vSphere Integrated Containers Engine
-```
-version: '2'
-
-networks:
-  my_net:
-    driver: bridge
-
-services:
-  web_server:
-    image: victest/web_elgg
-    container_name: web_server
-    networks:
-      - my_net
-    ports:
-      - "8080:8080"
-
-  mysql_server:
-    image: victest/web_db
-    container_name: mysql_server
-    command: [bash, -c, "/execute.sh"]
-    networks:
-      - my_net
-    environment:
-      - web_host=192.168.60.130 # This is the VCH_IP
-      - root_password=root  # Password for the root user
-       
-  memcache_server:
-    image: cloudsuite/web-serving:memcached_server
-    container_name: memcache_server
-    networks:
-      - my_net    
-```
-
-### Deploy to Your VCH
-
-Once you already have a VCH deployed by vic-machine, go to the folder where you have the above “docker-compose.yml” file and execute the following command to start the Web-serving application:
-```
-$> docker-compose -H VCH_IP:VCH_PORT up –d
-```
-Here VCH_IP and VCH_PORT can be found from the standard output when you use “vic-machine create” to launch the VCH. Now we are ready to view the website. Open a browser and navigate to http://VCH_IP:8080. We make sure to use the IP address of the VCH we deployed on as the IP of our Web server here. You should be able to see the following page:
-![Web serving demo](images/elgg.png)
-
-You can login in as the admin user (username: admin; password: admin1234), or register as a new user with a valid email address (Gmail does not work). You can also create your own content, invite friends, or chat with others. Enjoy! 
-
-
-
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/bundle/NOTICE b/installer/vendor/github.com/vmware/vic/doc/bundle/NOTICE
index ab3e54e5de..c909ab88e7 100644
--- a/installer/vendor/github.com/vmware/vic/doc/bundle/NOTICE
+++ b/installer/vendor/github.com/vmware/vic/doc/bundle/NOTICE
@@ -1,14 +1,14 @@
 NOTICE
 
-vSphere Integrated Containers Engine version 1.2.0
+vSphere Integrated Containers Engine
 
-Copyright (c) 2017 VMware, Inc. All Rights Reserved.
+Copyright (c) 2016-2018 VMware, Inc. All Rights Reserved.
 
 This product is licensed to you under the Apache License, Version 2.0 (the
 "License").  You may not use this product except in compliance with the
 License.
 
-This product may include a number of components with separate copyright
-notices and license terms. Your use of the source code for these components is
-subject to the terms and conditions of the component's license, as noted in
-the LICENSE file.
+This product may include a number of components with separate copyright notices
+and license terms. Your use of the source code for these components is subject
+to the terms and conditions of the component's license, as noted in the LICENSE
+file.
diff --git a/installer/vendor/github.com/vmware/vic/doc/bundle/OVA-spec.md b/installer/vendor/github.com/vmware/vic/doc/bundle/OVA-spec.md
deleted file mode 100644
index 88f817e5c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/bundle/OVA-spec.md
+++ /dev/null
@@ -1,124 +0,0 @@
-# VIC Unified Management OVA specification
-
-<!-- TOC -->
-
-- [VIC Unified Management OVA specification](#vic-unified-management-ova-specification)
-  - [Appliance Specification](#appliance-specification)
-  - [Filesystem layout](#filesystem-layout)
-  - [Network layout](#network-layout)
-  - [Components logging](#components-logging)
-  - [Components startup / shutdown](#components-startup--shutdown)
-  - [OVF Properties list](#ovf-properties-list)
-    - [Appliance level properties](#appliance-level-properties)
-    - [Harbor](#harbor)
-    - [Admiral](#admiral)
-  - [Upgrade Strategy](#upgrade-strategy)
-    - [Upgrade from previous Harbor-only OVA](#upgrade-from-previous-harbor-only-ova)
-    - [Future version upgrade](#future-version-upgrade)
-
-<!-- /TOC -->
-
-**User Statement**: As a customer of vSphere Integrated Containers, I want an easy way to install all the product components on my vSphere infrastructure, with a single download, and using a familiar workflow that leverages my competencies on vSphere. When an upgrade or a patch is released, I want to follow a simple guide to perform the upgrade of one or more components of vSphere Integrated Containers.
-
-**Details**: to accomplish these goals, we need to create a single OVA that installs all the VIC components and performs their configuration using OVF properties, resulting in a running service that can be accessed by the vSphere admin for further configuration.
-
-**Acceptance Criteria**:
-
-1. The vSphere administrator downloads the VIC Management OVA from a known location
-2. The vSphere administrator deploys the VIC Management OVA from the vSphere client, provides values for Harbor and Admiral configuration options
-3. The deployment should also tie the Harbor and Admiral instances together
-4. Once deployed the vSphere administrator should be able to
-    - Access the Admiral / Harbor integrated UI
-    - SSH into the machine to run vic-machine commands
-5. The vSphere administrator should also be able to download the VIC Engine tarball from the OVA.
-
-## Appliance Specification
-
-The Appliance is based on Photon OS, version 1.0 (build 62c543d), it's built using [packer](https://packer.io) and produces two main artifacts, one for local development (packaged as a Vagrant box) and a releasable OVA artifact.
-
-The OVA appliance build process is codified in a JSON document that contains the packer specification for the build, the build will be conducted as part of the existing CI system in use by the VIC Engine project, it will also be possible to build locally on the developer workstation to aid with the development.
-
-All the components integrated in the appliance (Harbor, Admiral, Lightwave) will be run as Docker containers, using Docker runtime version 1.12.6, Docker Compose will also be available to orchestrate discrete services inside the components if needed.
-
-Use of non-contained processes inside the appliance is severely discouraged.
-
-## Filesystem layout
-
-The appliance will ship with two disks, internally named `system` and `data`, `system` only contains the operating system and the docker containers of the services, `data` will hold all the user-generated data and data that has to be persisted by the components.
-
-The data disk will be initialized on first boot using a fixed size, the filesystem will be automatically expanded by a startup script if the underlying disk size has changed (e.g. the operator shuts down the VM and increase the size of the data disk from vSphere), this will allow the operator to extend the size of the components data store up to the limit of a single VMDK.
-
-## Network layout
-
-The appliance will have a single IP, which will be configured using OVF properties upon deployment, network changes will be automatically picked up by the appliance startup script if the operator changes OVF properties post-deployment.
-
-In order to ease deployment and lower install complexity, all the services will be run on different ports, there will be no effort to tie them together using a reverse proxy.
-
-## Components logging
-
-All the docker containers will log locally to syslog, using the docker syslog driver, this will give a familiar environment for VMware admins to troubleshoot issues with the appliance.
-
-## Components startup / shutdown
-
-Startup and shutdown of the components will be performed with systemd units, each component will use a single systemd unit, components that require service orchestration must use docker-compose to specify relations and startup/shutdown order.
-
-## OVF Properties list
-
-The OVF properties list includes all the fields that the user has to input upon deployment for initial configuration, all the parameters (except when noted) are changeable post deployment by accessing the VM properties on vCenter, startup scripts will reconfigure the appliance with the new parameters.
-
-### Appliance level properties
-
-- Root Password - `appliance.root_pwd`: The initial password of the root user. Subsequent changes of password should be performed in operating system. (8-128 characters)
-- Permit Root Login - `appliance.permit_root_login`: Specifies whether root user can log in using SSH. (disabled by default)
-- Network IP Address - `network.ip0`: The IP address of this interface. Leave blank if DHCP is desired.
-- Network Netmask - `network.netmask0`: The netmask or prefix for this interface. Leave blank if DHCP is desired.
-- Default Gateway - `network.gateway`: The default gateway address for this VM. Leave blank if DHCP is desired.
-- Domain Name Servers - `network.DNS`: The domain name server IP Address for this VM(comma separated). Leave blank if DHCP is desired.
-- Domain Search Path - `network.searchpath`: The domain search path(comma or space separated domain names) for this VM. Leave blank if DHCP is desired.
-- Domain Name - `network.domain`: The domain name of this VM. Run command man resolv.conf for more explanation. Leave blank if DHCP is desired or the domain name is not needed for static IP.
-- Email Server - `appliance.email_server`: The mail server to send out emails.
-- Email Server Port - `appliance.email_server_port`: The port of mail server.
-- Email Username - `appliance.email_username`: The user from whom the password reset email is sent. Usually this is a system email address.
-- Email Password - `appliance.email_password`: The password of the user from whom the password reset email is sent.
-- Email From - `appliance.email_from`: The name of the email sender.
-- Email SSL `appliance.email_ssl`: Whether to enable secure mail transmission.
-
-### Harbor
-
-- Deploy - `harbor.deploy`: Specifies whether Harbor is enabled on the appliance.
-- Port - `harbor.port`: The port on which Harbor will bind the NGINX frontend, defaults to 443
-- Harbor Admin Password - `harbor.admin_password`: The initial password of Harbor admin. It only works for the first time when Harbor starts. It has no effect after the first launch of Harbor. Change the admin password from UI after launching Harbor. (8-20 characters)
-- Database Password - `harbor.db_password`: The initial password of the root user of MySQL database. Subsequent changes of password should be performed in operating system. (8-128 characters)
-- Garbage Collection - `harbor.gc_enabled`: When setting this to true, Harbor performs garbage collection everytime it boots up.
-- SSL Cert - `harbor.ssl_cert`: Paste in the content of a certificate file. Leave blank for a generated self-signed certificate.
-- SSL Cert Key - `harbor.ssl_cert_key`: Paste in the content of a certificate key file. Leave blank for a generated key.
-
-### Admiral
-
-- Deploy - `admiral.deploy`: Specifies whether Admiral is enabled on the appliance.
-- Port - `admiral.port`: The (secure) port on which Admiral will bind the HTTP service, defaults to 8443
-- SSL Cert - `admiral.ssl_cert`: Paste in the content of a certificate file. Leave blank for a generated self-signed certificate.
-- SSL Cert Key - `admiral.ssl_cert_key`: Paste in the content of a certificate key file. Leave blank for a generated key.
-
-## Upgrade Strategy
-
-### Upgrade from previous Harbor-only OVA
-
-Upgrade from previous Harbor-only OVA will consist in attaching both the system and data disk from the old Harbor-only OVA as additional disks of the newly deployed VIC OVA.
-
-The procedure will roughly look like this:
-
-1. Shutdown of the old Harbor-only Appliance.
-2. Deploy of the new VIC Appliance.
-    - New VIC Appliance deployed with all the old credentials (DB Password, Admin Password, etc...)
-3. User will attach both disks from the Harbor-only Appliance to the newly deployed VIC Appliance as SCSI 0:2 and SCSI 0:3 (order is not important).
-4. During bootup, a systemd unit will recognize the external data and, if there is no new data existing in the VIC appliance, will proceed with the migration procedure.
-5. The migration procedure will copy the data over to the new data disk.
-6. A Migration script provided by the Harbor team will perform some data transformation on the migrated data and will proceed with the customization of the configuration (which is stored in the system disk of the old Harbor-only appliance).
-7. The VI Admin will follow a progress bar on the console of the VM that will show progress of the procedure.
-8. Once the procedure is done, a message will appear, asking the user to shutdown and detach the old Harbor-only disks from the new OVA.
-9. The user will then start the new VIC Appliance again and the procedure will be complete.
-
-### Future version upgrade
-
-Upgrade strategy (to subsequent version of the VIC Appliance) will include moving the data disk to a newly deployed OVA, the startup scripts will recognize existing data on the data disk and new versions of the components will start up with the previous data attached and available, it will be up to the individual components to do perform any application-level upgrade procedure (i.e. database schema updates) going forward.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/bundle/README b/installer/vendor/github.com/vmware/vic/doc/bundle/README
deleted file mode 100644
index d1d2f59172..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/bundle/README
+++ /dev/null
@@ -1 +0,0 @@
-Go to https://github.com/vmware/vic for more information
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/README.md b/installer/vendor/github.com/vmware/vic/doc/design/README.md
deleted file mode 100644
index 5938d47479..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/README.md
+++ /dev/null
@@ -1,14 +0,0 @@
-# vSphere Integrated Containers - Architecture and Design
-
-The bulk of the design notes currently relate to [components and their role in the system](components.md) - high level descriptions primarily.
-
-Networking is broken out into a subfolder on the expectation that it will become a significantly larger area once NSX integration is addressed - [the 1.0 MVP network design](networking/README.md) does not encompass NSX.
-
-
-Documentation about component interactions is ongoing with the initial docs being:
-* [configuration](configuration.md)
-* [communication between VCH appliance and containerVMs](communications.md)
-* portlayer component communication
-* security
-* [installation and self-provisioning - usage examples](../user/usage.md)
-* [installation and self-provisioning - technical](vic-machine.md)
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/application-topologies.md b/installer/vendor/github.com/vmware/vic/doc/design/application-topologies.md
deleted file mode 100644
index 9715bbff46..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/application-topologies.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Application topologies
-
-This describes the core application topologies that will be used to validate function and determine relative priority of feature implementation. This is by no means a complete list and the ordering may change over time as we gain additional feedback from users.
-
-## Prime topology - platform 2.5 tiered application
-
-### Description
-This is the topology currently being used as the primary touchstone for feature support and priority. It's based off [the docker voting app](https://github.com/docker/example-voting-app) as a great example of a mapping from a traditional tiered application to a containerized environment. This is not assumed to be a pure [twelve factor app](http://12factor.net/) because while that significantly simplifies the infrastructure requirements it's not a viable assumption for all workloads.
-
-There are two scenarios described in the breakdown:
-1. unmodified voting app
-2. voting app using non-containerized database with direct exposure to an external network on the front-end
-
-[Application workflow](https://github.com/vmware/vic/doc/application_workflow) has examples on building these applications.  The [voting app](https://github.com/vmware/vic/doc/application_workflow/voting_app.md) illustrates scenario 1, discussed above.  In this example, the entire voting app and all tiers are created as a self-enclosed set of containers.  Docker-compose is used to orchestrate the deployment.
-
-The second scenario is assumed to be a better reflection of probable deployment scenarios as people are moving to containerized workloads, hence the description of this as a 2.5 platform application.
-
-TODO: Add an example to the application workflow docs illustrating scenario 2.
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/arch/arch.md b/installer/vendor/github.com/vmware/vic/doc/design/arch/arch.md
deleted file mode 100644
index 240b04b38d..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/arch/arch.md
+++ /dev/null
@@ -1,21 +0,0 @@
-### vSphere Integrated Containers Architecture
-
-#### Overview
-
-VIC is a product designed to tightly integrate container workflow, lifecycle and provisioning with the vSphere SDDC. In VIC, a container is a hardware-virtualized first-class citizen on the hypervisor provisioned into a _Virtual Container Host_ (VCH) and able to directly integrate with vSphere infrastructure capabilities, such as networking and storage features.
-
-[Learn more about the differences between the VIC model and a traditional software-virtualized container](vic-container-abstraction.md)
-
-The architecture of VIC is designed to allow for significant modularity and flexibility and includes the following key components:
-
-##### Port Layer Abstractions
-
-vSphere currently lacks the notion of container primitives and abstractions through which they can be manipulated. It has a rich API with bindings for various languages (Eg. [govmomi](https://github.com/vmware/govmomi)) but these are all necessarily oriented around the notion of a VM.
-
-While it would be possible to write a rudimentary VIC-like container engine by driving the vSphere APIs directly from within a daemon of some kind, the tight coupling between the low-level vSphere calls and the high-level daemon API would result in very little re-usable code and monolith that's potentially difficult to maintain. An API layer that encapsulates low-level container primitives that is both container engine and operating system agnostic would be preferable.
-
-A secondary benefit of such an API is that it could easily be extended for compatibility with emerging standards which operate at a similar layer, such as [runc](https://github.com/opencontainers/runc).
-
-The Port Layer is designed in such a way that the libraries can be built into static binaries or remotable services. They can be combined together into a single service endpoint or distributed for greater flexibility.
-
-[Learn more about the Port Layer](vic-port-layer-overview.md)
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/arch/component_architecture.md b/installer/vendor/github.com/vmware/vic/doc/design/arch/component_architecture.md
deleted file mode 100644
index 59b2c51b47..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/arch/component_architecture.md
+++ /dev/null
@@ -1,4 +0,0 @@
-# self-provisioning proxy
-
-# vmomi proxy agent
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-container-abstraction.md b/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-container-abstraction.md
deleted file mode 100644
index 37f01c5b68..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-container-abstraction.md
+++ /dev/null
@@ -1,58 +0,0 @@
-### The VIC Container Abstraction
-
-VIC provisions containers _as_ VMs, rather than _in_ VMs. In understanding the VIC container abstraction, it is helpful to compare and contrast against the virtualization of a traditional container host.
-
-#### Traditional Container Host
-
-Let's take a Linux VM running Docker as an example. The container host is a VM running a Linux OS with the necessary libraries, kernel version and daemon installed. The container host will have a fixed amount of memory and vCPU resource that can be used by the containers provisioned into it.
-
-The container host operating system along with the Docker daemon have to provide the following:
-* **The control plane** - an endpoint through which control operations are performed, executing in the same OS as its controlling
-* **A container abstraction** - library extensions to the guest OS need to provide a private namespace and resource constraints
-* **Network virtualization** - simple bridge networking or overlay networking
-* **Layered filesystem** - not an absolute requirement for a container, but typically conflated in most implementations
-* **OS Kernel** - a dependency for the container executable to execute on, typically shared between containers
-
-The hypervisor in this mode provides hardware virtualization of the entire container host VM, one or more VMDKs providing local disk for the OS, one or more vNICs to provide network connectivity for the OS and possibly paravirtualization capabilities allowing the containers to directly access hypervisor infrastructure.
-
-#### The VIC model
-
-VIC containers operate quite differently. In the above model, it would be reasonable to describe a container as being run _in_ a VM. In the VIC model, a container is run _as_ a VM. For the purposes of this project, we will refer to this as a _containerVM_.
-
-So what does this mean in practice? Well, firstly a container host isn't a VM, it's a resource pool - this is why we call it a _Virtual_ Container Host. It's an abstract dynamically-configurable resource boundary into which containers can be provisioned. As for the other functions highlighted above:
-* **The control plane** - functionally the same endpoint as above, but controlling vSphere and running in its own OS
-* **A container abstraction** - is a VM. A VM provides resource constraints and a private namespace, like a container
-* **Network virtualization** - provided entirely by vSphere. NSX, distributed port-groups. Each container gets a vNIC
-* **Layered filesystem** - provided entirely by vSphere. VMDK snapshots in the initial release
-* **OS Kernel** - provided as a minimal ISO from which the containerVM is either booted or forked
-
-In this mode, there is necessarily a 1:1 coupling between a container and a VM. A container image is attached to the VM as a disk, the VM is either booted or forked from the kernel ISO, then the containerVM chroots into the container filesystem effectively becoming the container.
-
-#### Differences
-
-This model leads to some very distinct differences between a VIC container and a traditional container, none of which impact the portability of the container abstraction between these systems, but which are important to understand.
-
-##### Container
-
-1. There is no default shared filesystem between the container and its host
-  * Volumes are attached to the container as disks and are completely isolated from each other
-  * A shared filesystem could be provided by something like an NFS volume driver
-2. The way that you do low-level management and monitoring of a container is different. There is no VCH shell.
-  * Any API-level control plane query, such as `docker ps`, works as expected
-  * Low-level management and monitoring uses exactly the same tools and processes as for a VM
-3. The kernel running in the container is not shared with any other container
-  * This means that there is no such thing as an optional _privileged_ mode. Every container is privileged and fully isolated.
-  * When a containerVM kernel is forked rather than booted, much of its immutable memory is shared with a parent _template_
-4. There is no such thing as unspecified memory or CPU limits
-  * A Linux container will have access to all of the CPU and memory resource available in its host if not specified
-  * A containerVM must have memory and CPU limits defined, either derived from a default or specified explicitly
-
-##### Virtual Container Host
-
-A container host in VIC is a _Virtual_ Container Host (VCH). A VCH is not in itself a VM - it is an abstract dynamic resource boundary that is defined and controlled by vSphere into which containerVMs can be provisioned. As such, a VCH can be a subset of a physical host or a subset of a cluster of hosts.
-
-However a container host also represents an API endpoint with an isolated namespace for accessing the control plane, so a functionally equivalent service must be provisioned to the vSphere infrastructure that provides the same endpoint for each VCH. There are various ways in which such an service could be deployed, but the simplest representation is to run it in a VM.
-
-Given that a VCH in many cases will represent a subset of resource from a cluster of physical hosts, it is actually closer in concept to something like Docker Swarm than a traditional container host.
-
-There are also necessarily implementation differences, transparent to the user, which are required to support this abstraction. For example, given that a container is entirely isolated from other containers and its host is just an esoteric resource boundary, any control operations performed within the container - launching processes, streaming stout/stderr, setting environment variables, network specialization - must be done either by modifying the container image disk before it is attached; or through a special control channel embedded in the container (see [Tether](vic-port-layer-overview.md#the-tether-process)).
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-port-layer-overview.md b/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-port-layer-overview.md
deleted file mode 100644
index 346ad68dcc..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/arch/vic-port-layer-overview.md
+++ /dev/null
@@ -1,43 +0,0 @@
-#### Port Layer Abstractions
-
-The Port Layer abstractions in VIC are designed to augment the vSphere APIs with low-level container primitives from which a simple container engine could be implemented. The design criteria of the Port Layer is as follows:
-
-* The Port Layer should be primarily oriented around the notion of _isolation domains_. It should provide the means to easily express rich and flexible criteria for isolating containers and their resources, without being explicit about the mechanism through which this should be achieved.
-
-* The Port Layer is designed to be invoked by higher-level software abstraction. It is not designed to be exposed directly to users.
-
-* The Port Layer should be developed as Open Source Software to allow for 3rd party integration
-
-* The Port Layer should be container engine and operating system agnostic
-
-* The Port Layer should be designed in such a way as to optimize control plane performance
-
-* The Port Layer should ensure a single source of truth for all state. Eg. VM power-off == container stop
-
-From an architectural perspective, the Port Layer should be considered functionally equivalent to a project like https://github.com/docker/libcontainer in as much as it provides low-level platform-specific primitives. It is easy to see how such an abstraction could be container engine agnostic since it provides capabilities at a much lower layer. Our goal however is that it should also be operating system agnostic, which is a more challenging goal at such a low layer.
-
-##### Operating System Independence
-
-VMs are already completely operating system agnostic, since they virtualize at the hardware layer and all control plane operations through the vSphere APIs are therefore also necessarily OS agnostic. Guest differences are encapsulated in different builds of "VMware Tools" which is an optional in-guest agent that mediates between the guest and the hypervisor.
-
-The Port Layer in VIC will function in exactly the same way. Control plane operations will be expressed through an OS agnostic API and distinct differences between operating system implementations will be encapuslated in the _Tether_ process that runs in each containerVM.
-
-##### The Tether Process
-
-A traditional container runtime, such as Linux/LXC, allows the control plane and the containers to share a kernel within a common address space. Each container gets its own private namespace, but the shared kernel allows the control plane to have visibility into the containers and also allows for processes to be started and stopped inside them.
-
-A containerVM by contrast uses completely separate isolated kernels for the control plane and containers. The control plane can either run in the hypervisor kernel or in a distinct guest OS kernel in a separate VM, possibly even on a separate physical host. This isolation is by design: the job of a containerVM is to run only the container process in its own kernel with as minimal a guest OS stack as feasibly possible while ensuring the same strong degree of isolation as any other VM. Even the hypervisor doesn't have visibility inside the guest without an in-guest agent installed.
-
-As such, in order for the container control plane to provide a shell into a container, to start and stop processes or to provide monitoring statistics, there must be some kind of guest agent in the containerVM. We call this guest agent a _Tether_ process. This is not the same agent as VMware Tools, but a minimal agent designed specifically for VIC.
-
-The Tether API and Tether codebase is where all OS differences will be encapsulated. As such, the Tether API should be considered private to the Port Layer - it exists exclusively for the benefit of the internal control plane operations, not to be invoked directly by anything that implements the Port Layer.
-
-##### Interoperability
-
-So what kind of container primitives should the Port Layer provide and how are those intended to interoperate with established container standards?
-
-It stands to reason that Networking, Storage and Execution are obvious areas for low-layer primitives. These primitives already exist in the vSphere APIs and the VIC Port Layer is designed to provide a framework which builds on those APIs by providing both plumbing code and opinionated mappings between container concepts and vSphere concepts.
-
-For example, what is a container storage Volume and how should one be configured? The Port Layer API should be responsible for deciding what vSphere construct most appropriately represents a Volume and also that it is configured appropriately. It should do this based on the parameters passed in, the vSphere features currently installed in the system and the resources that the tenant has the authorization to access. It can pass back a handle to that Volume that can then be used in the creation of a container. By doing this, the Port Layer made a choice about the most appropriate underlying representation and it also made sure it was appropriately configured and indexed.
-
-To some extent there is an inevitable overlap with the goals of other projects in this sphere, such as https://github.com/opencontainers/runc. While this is hardly surprising given that the Port Layer is attempting to make opinionated choices in exactly the same problem domain, it would be wrong to infer that this makes it an intentional fragmentation or competing API. It is our explicit intention that the two should be entirely complimentary and that the Port Layer should be the lowest level of abstraction that a VIC implementation of runc would end up calling. If the abstractions are correct, it should be just as possible to build an implementation of https://github.com/coreos/rkt/blob/master/Documentation/app-container.md using the same APIs.
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/communications.md b/installer/vendor/github.com/vmware/vic/doc/design/communications.md
deleted file mode 100644
index 3066e927ce..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/communications.md
+++ /dev/null
@@ -1,94 +0,0 @@
-# Communications
-
-This document discusses possible communication channels between components, but not what flows over them. This is essentially Layer2/3 with Layer7 discussed in the documents relating to specific components.
-
-
-## ContainerVM to Appliance
-There are two types of communication that occur between a containerVM and the [VCH appliance](components.md#appliance):
-
-1. application level network traffic
-2. VIC control channel, which includes user interaction with the container console
-
-This section addresses the VIC control channel
-
-
-### Async - guestinfo
-The containerVM guestinfo is used as a persistent, asynch publishing mechanism for specific data related to container state, primarily:
-
-1. assigned DHCP address
-2. error reporting for [containerVM components](components.md#container)
-3. exit status of the container process
-
-Appliance to containerVM communication also uses guestinfo as a channel and is addressed in a little more depth under [configuration](configuration.md#appliance)
-
-
-### Synchronous
-The following are different approaches to handling the interactive communication path between containerVM and appliance, each with pros and cons.
-
-#### Network serial port
-The network serial port is a mechanism provided by vSphere that allows serial traffic to be forwarded over a TCP connection; it can operate in either client or server mode.
-
-Pros:
-* native to vSphere
-* serial support can be assumed in most OSes
-
-Cons:
-* requires Enterprise license
-* requires route from host to appliance VM
-  * implies firewall config
-  * generally means the appliance needs to be on the management network
-* serial does not appear to be efficient for large volumes of data
-* inhibits vMotion if not targeted at a Virtual Serial Port Concentrator (vSPC)
-* serial port access and access semantics differ significantly between OSes
-
-
-#### vSPC relay
-A vSPC is explicitly to enable vMotion for VMs that have network serial connections. When connecting to a vSPC the connection is an extended TELNET protocol rather than raw TCP. In the case of a regular vSPC appliance, the vSPC has to bridge between the management network (network serial originates from the ESX host, not the VM) and a network the VIC appliance is attached to.
-The vSPC relay is an agent on ESX that does dumb forwarding of the incoming Telnet connection via vSocket into the VCH appliance, which provides a very basic vSPC implementation. In this case the containerVM would be configured with a network serial port with a vSPC target that is the ESX host running the applianceVM.
-
-Pros:
-* appliance does not require connectivity with the management network (when combined with [vmomi agent](#components.md#vmomi-authenticating-agent) )
-* containerVM vMotion
-
-Cons:
-* requires Enterprise license
-* require knowledge of applianceVM host and reconfiguration if applianceVM vMotion occurs
-
-
-### Pipe backed serial port with relay agent
-The pipe backed serial port is a mechanism provided by vSphere that maps serial port IO to a named pipe on the ESX host. This allows an agent on the host to act as a relay for that data.
-
-Pros:
-* does not require Enterprise license
-* serial support can be assumed in most OSes
-* does not inhibit vMotion
-
-Cons:
-* requires agent on all hosts in the cluster that will run containerVMs
-* requires route from host to appliance VM
-* serial port access and access semantics differ significantly between OSes
-
-
-#### vSocket relay
-[vSocket relay](components.md#vsocket-relay-agent) makes use of the paravirtual vSocket mechanism for VM to Host communication. This model requires a agent running on all ESX hosts in the cluster that can receive incoming vSocket communications and forward them to the appliance.
-
-Pros:
-* does not require Enterprise license
-* common access and usage semantics across OSes
-* does not inhibit vMotion
-* improved efficiency over serial (uses PIO ports)
-
-Cons:
-* requires driver in the OS (easily supplied in the bootstrap image if driver exists)
-* requires agent on all hosts in the cluster that will run containerVMs
-* requires route from host to appliance VM
-
-#### vSocket peer-to-peer relay
-An extension of this approach has the vSocket relay agent forwarding to another vSocket relay agent on the host running the applianceVM, with that connection then relayed via vSocket into the appliance. The pros and cons below are in addition to those without the peer-to-peer relay.
-
-Pros:
-* appliance does not require connectivity with the management network (when combined with [vmomi agent](#components.md#vmomi-authenticating-agent) )
-
-Cons:
-* require knowledge of applianceVM host and reconfiguration if applianceVM vMotion occurs
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/components.md b/installer/vendor/github.com/vmware/vic/doc/design/components.md
deleted file mode 100644
index f27e7be715..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/components.md
+++ /dev/null
@@ -1,252 +0,0 @@
-# vSphere Integrated Containers - Architecture and Design
-
-## Approach
-
-The development approach taken for VIC is iterative refinement, both for the high level product and recursively throughout the lower level components that go into it. This, as with most Agile processes, is driven by a need to have a useful product in short timeframes, and to manage risk - whether risk related to larger delivery deadlines (VIC may be OSS but it's still a VMware product), changing technical landscapes, or the unknown. The day-by-day development process we follow is [documented in the contributor docs](../../CONTRIBUTING.md).
-
-The upshot of this approach is that many of these components are outline sketches at best as we start out, with specific areas being filled out over time. Avoiding any comment on business priorities, the _technical_ priorities for the project are:
-
-1. build an appliance foundation to permit secure orchestration of Virtual Infrastructure by regular users
-2. build primitives that support container style semantics, implemented with VMs
-2. present a Docker API endpoint though which users can orchestrate vSphere resources, within the scope of the Virtual Container Host
-
-The primary _goal_ of the project is to be useful to users - very simple to say, but much more involved to achieve. Our expectation is that most users will consume VIC via the Docker API, therefore if you have specific requirements around docker function support please raise them as issues if they are not already documented in #445 - if they are, add a +1. We will be focusing on function required on the production end of the CI pipeline initially, but knowing what _you_ require for our initial releases to be useful in that scope is invaluable.
-
-
-## Components
-
-- [Component Architecture](#component-architecture)
-- [Container](#container)
-  - [Container Base](#container-base)
-  - [Tether](#tether)
-  - [Container Logging](#container-logging)
-- [Appliance](#appliance)
-  - [Appliance Base](#appliance-base)
-  - [vicadmin](#vicadmin)
-  - [Docker API server](#docker-api-server)
-  - [imagec](#imagec)
-  - [Port Layer](#port-layer)
-    - [Port Layer - Execution](#port-layer---execution)
-    - [Port Layer - Interaction](#port-layer---interaction)
-    - [Port Layer - Networking](#port-layer---networking)
-    - [Port Layer - Storage](#port-layer---storage)
-- [Install and management](#install-and-management)
-  - [vic-machine](#vic-machine)
-  - [Validating Proxy](#validating-proxy)
-- [ESX Agents](#esx-agents)
-  - [VMOMI Authenticating Agent](#vmomi-authenticating-agent)
-  - [vSocket Relay Agent](#vsocket-relay-agent)
-  - [NSX Authenticating Agent](#nsx-authenticating-agent)
-
-
-## Component Architecture
-
-This is a component architecture for the system, encompassing some of the main control flows. It is intended to be used as a visual map for which components interact and how those interaction occur; it does not indicate what those interaction are. Components are marked as _new code_ are entirely new for vSphere Integrated Containers, where as others are either part of vSphere or we have a functioning reference implementation from Project Bonneville.
-
-![system component architecture](images/component_architecture.png)
-
-
-## Container
-### Container Base
-
-ContainerVMs are bootstrapped from a PhotonOS based liveCD, containing just enough to boot Linux and set up the container filesystem, before performing a switch_root into the container root filesystem. The end result is a VM:
-* running the PhotonOS kernel, with appropriate kernel modules for demand loading
-* the specified container filesystem mounted as `/`
-* [a custom init binary](#tether) that provides the command & control channel for container interaction
-
-The container process runs as root with full privileges, however there's no way to make persistent changes to anything except the container filesystem - the core operating files are read-only on the ISO and refresh each time the container is started.
-
-[Issues relating to this component](https://github.com/vmware/vic/labels/component%2Fcontainer-base)
-
-
-### Tether
-
-The tether is an init replacement used in containerVMs that provides the command & control channel necessary to perform any operation inside the container. This includes launching of the container process, setting of environment variables, configuration of networking, etc. The tether is currently based on a modified SSH server tailored specifically for this purpose.
-
-[Additional detail](tether.md)
-[Issues relating to tether](https://github.com/vmware/vic/labels/component%2Ftether)
-
-
-### Container Logging
-
-Container logging, as distinct from other logging mechanisms, is the capture mechanism for container output. This fills the same niche as [Docker log drivers](https://docs.docker.com/engine/admin/logging/overview/) and has the potential to be a direct consumer of docker log drivers.
-
-As of the v0.1 release logs are being persisted on the datastore along with the VM.
-
-[Issues relating to container logging](https://github.com/vmware/vic/labels/component%2Fcontainer-logging)
-
-
-## Appliance
-### Appliance Base
-
-The appliance VM is bootstrapped from a PhotonOS based liveCD that embeds elements of VIC relevant to Virtual Container Host functions. The appliance is diskless _in essence_, but may well use a non-persistent disk to cache transient data such as docker images in-flight from [Docker Hub](https://hub.docker.com/) but not yet persisted to a datastore.
-
-The ISO used to bootstrap the appliance is generated from the following make targets - only the first must be specified as the others are pre-requisites:
-```
-make appliance appliance-staging iso-base
-```
-
-The intent behind having the appliance be diskless and bootstrap off an ISO each time is:
-* improved security - coupled with [the configuration mechanism](configuration.md#Configuration-persistence-mechanism) there's no way to make persistent changes without vSphere API access
-* robustness - a reboot will return the appliance to a known good state, assuming an administrator has not altered the configuration in the meantime
-* simplicity of update - using [vic-machine](#vic-machine) to update a VCH should be as simple as pointing the appliance VM at a new ISO version and rebooting, so long as there's no metadata migration needed; in that case the migration should be viable as a background task prior to VCH update.
-
-[Issues relating to appliance base](https://github.com/vmware/vic/labels/component%2Fappliance-base)
-
-
-### vicadmin
-
-This is more speculative than any of the other components at this point. We fully expect there to be a need for user level inspection/administration of a deployed Virtual Container Host, however we've not yet identified the functions this should provide.
-
-Current list of functions:
-* log collection
-
-Speculative list of functions (via docker-machine as a client?):
-* docker API user management
-* reconfigure operations (e.g. add --insecure-registry)
-
-[Issues relating to vicadmin](https://github.com/vmware/vic/labels/component%2Fvicadmin)
-
-
-### Docker API server
-
-This is the portion of a Virtual Container Host that provides a Docker API endpoint for users to interact with; it is also referred to as a 'personality'. The longer term design has multiple personalities running within a single VCH, such that the same endpoint can serve mixed API versions, and the same VCH can serve multiple API flavours.
-
-As of the v0.1 release this makes use of the [docker engine-api](https://github.com/docker/engine-api) project to ensure API compatibility with docker.
-
-The following is commentary about why the docker API server is not actual Docker. It's not usual design doc content, but is a question that comes up enough that it becomes core to understanding the design.
-
-[Issues relating to docker API](https://github.com/vmware/vic/labels/component%2Fdocker-api-server)
-
-#### Commentary
-
-There are frequently questions asked about why we're not using Docker directly and supplying exec, graph and libnetwork drivers, which is the approach we took with [Project Bonneville](http://blogs.vmware.com/cloudnative/introducing-project-bonneville/). People who are intimately familiar with the container space may also ask why we're not using the OCI components such as runc.
-
-Being very open here, the answer comes back to the reasoning behind the [approach](#approach) - it was a choice made when starting VIC in January 2016 to manage technical and project risks, and it's a trade against business risk (community perception, customer concerns about compatibility, and others).
-
-Some of the major technical assumptions in the Docker code base do not hold true for VIC (as of decision nexus date):
-
-1. container filesystems exist on the same host the daemon is running on
-2. namespaces can be created independently of containers (e.g. libnetwork sets up interfaces prior to graphdriver.Create)
-3. operations on namespaces are _relatively_ cheap in terms of performance
-4. container lifecycles are tied to that of the docker daemon
-5. no orthogonal second management plane
-
-As Docker continues with decomposition of the monolithic docker daemon into components, our ability to consume those components directly increases, and there are very good reasons to do so - not least is the fact it reduces the development and maintenance burden on the VIC team. In line with the stated approach, as docker components become available that can be consumed, we will.
-
-A good example of the planned approach regarding docker is our use of the engine-api project -- VIC was initially using a Docker API server generated from a swagger specification. Once the engine-api project became somewhat stable we contributed the swagger spec to that project and are now consumers of the engine-api directly.
-
-This leads to another question regarding why we don't simply invest our project resources in helping Docker decompose the daemon. Again the answer comes back to risk management - Docker's priorities are not VMware's and, without a formal partnership, assuming the decomposition stays on a schedule that's viable for VIC deadlines is, well, risky. This is a fine line to walk as we _want_ to be good community members and, from a more selfish perspective, don't want to invest in quickly deprecated code. Our intent is to, as with the engine-api project, move to the docker and OCI components as they become semi-stable and invest resource in them at that point - how early in the life of a given component we can do that is a function of deadlines, resources and politics.
-
-
-### imagec
-
-The component follows the naming pattern introduced by OCI with 'runc' and is a docker registry client library, purely concerned with the pull/push aspects of the registry with login becoming a transitive dependency.
-
-[Current open issues relating to imagec](https://github.com/vmware/vic/labels/component%2Fimagec)
-
-
-### Port Layer
-
-The port layer presents container primitive operations, with APIs that express intent rather than the intricacies of how.
-
-#### Port Layer - Execution
-
-This component handles management of containers such as create, start, stop, kill, etc, and is broken distinct from interaction primarily because the uptime requirements may be different, [see Interaction](#portlayer---interaction).
-
-[Issues relating to portlayer execution](https://github.com/vmware/vic/labels/component%2Fportlayer%2Fexecution)
-
-
-#### Port Layer - Interaction
-
-This component deals handles interaction with a running container and is broken distinct from execution primarily because the uptime requirements may be different.
-
-If the execution portion of the port layer is unavailable then only container management operations around creating, starting, stopping, et al are impacted, and then only for as long as the VCH is unavailable.
-
-If the interaction portions are unavailable it impacts ongoing use of interactive sessions and potentially loses chunks of the container output (unless serialized to vSphere infrastructure as an intermediate step - [container logging](#container-logging), [container base](#container-base), and [tether](#tether)) are the other components that factor into the log persistence discussion).
-
-[Issues relating to portlayer interaction](https://github.com/vmware/vic/labels/component%2Fportlayer%2Finteraction)
-
-
-#### Port Layer - Networking
-
-A Virtual Container Host presents a cluster of resources as a single endpoint, so while we must also supply transparent cross host networking, it must be there without requiring any user configuration.
-In conjunction with [the provisioning workflows](#vic-machine) it should also allow mapping of specific vSphere/NSX networks into the docker network namespace, and mapping of existing network entities (e.g. database servers) into the docker container namespace with defined aliases.
-
-Initial design and implementation details for MVP are [here](networking/README.md).
-
-[Issues relating to portlayer networking](https://github.com/vmware/vic/labels/component%2Fportlayer%2Fnetwork)
-
-
-#### Port Layer - Storage
-
-This provides the storage manipulation portions of the port layer, including container image storage, layering along with volume creation and manipulation. [imagec](#imagec) uses this component to translate registry images into a layered format the can be used directly by vSphere, namely VMDK disk chains.
-
-[Issues relating to portlayer storage](https://github.com/vmware/vic/labels/component%2Fportlayer%2Fstorage)
-
-
-#### VMOMI gateway
-
-This is the GuestOS side of the [VMOMI authenticating proxy](#vmomi-authenticating-proxy) that provides a 'paravirtual' vmomi interface to the underlying vSphere infrastructure. This is structured as a library for direct consumption by other components, for example [vic-machine](#vic-machine), and may be wrapped in a service presenting a URI endpoint for shared consumption between components such as portlayer and vicadmin. This latter approach is less secure by virtue of exposing that mechanism generally within the Appliance, but has the benefit of simplicity regarding managing multiple connections over a single channel.
-
-[Issues relating to portlayer storage](https://github.com/vmware/vic/labels/component%2Fvmomi%2Fgateway)
-
-
-
-## Install and management
-
-### vic-machine
-
-The _docker-machine_ mechanism is something of a de-facto standard for provisioning docker hosts.
-There is a significant amount of vSphere specific behaviour that needs to be exposed that may well go beyond what docker-machine provides - hence supplying a vic-machine binary.
-
-Ideally we'll provide vic-machine in a form that makes it viable as a docker-machine plugin, allowing some reuse of existing knowledge, with VIC specific options and behaviours presented to the user via plugin options.
-It is possible that the value provided by keeping the _docker-machine_ naming is overshadowed by the flexibility that changing the name provides (perhaps _vic-machine_) - lacking concrete knowledge one way or another, this component is currently named vic-machine so as to avoid confusion with the docker binary.
-
-While deployment of a Virtual Container Host is relatively simple if performed by someone with vSphere administrative credentials, conversations with customers have shown that the self-provisioning facet of docker is a significant portion of it's value. This component, in conjunction with [the validating proxy](#validating-proxy), provides self-provisioning capabilities and the requisite delegation of authority and specification of restrictions.
-
-[Issues relating to vic-machine](https://github.com/vmware/vic/labels/component%2Fvic-machine)
-
-
-### Validating Proxy
-
-The self-provisioning workflow for vSphere Integrated Containers is an authority delegation and resource restriction model. That requires that there be an active endpoint accessible to both the user and the viadmin that is capable of generating delegation tokens to be passed to the user, and validating those that are received from a user. The validating proxy fills this niche; the described proxy is very, very simple and does not include elements such as directory services integration.
-
-[Issues relating to validating proxy](https://github.com/vmware/vic/labels/component%2Fvalidating-proxy)
-
-
-
-## ESX Agents
-
-### VMOMI Authenticating Agent
-
-As with [access to NSX management](#nsx-authenticating-agent), vSphere orchestration requires credentials and therefore credential management. The authenticating agent is intended to move the credential management problem out of the VCH and into the vSphere infrastructure. Authorizing the VCH to perform specific operations by virtue of being a specific VM (and potentially cryptographically verified), rather than generating and embedding credentials into the guest, means:
-* a VCH can be safely considered untrusted
-* IDS style inspection and validation can be performed on each infrastructure operation performed by a VCH
-* no access to management networks is required for infrastructure orchestration
-
-
-[Issues relating to vmomi agent](https://github.com/vmware/vic/labels/component%2Fvmomi-authenticating-agent)
-
-
-# vSocket Relay Agent
-
-Network serial ports as a communication channel have several drawbacks:
-* serial is not intended for high bandwidth, high frequency data
-* inhibits forking & vMotion without vSPC, and a vSPC requires an appliance in FT/HA configuration
-* requires a VCH have a presence on the management networks
-* requires opening a port on the ESX firewall
-
-The alternative we're looking at is vSocket (uses PIO based VMCI communication), however that it Host<->VM only so we need a mechanism to relay that communication to the VCH. Initially it's expected that the Host->VCH communication still be a TCP connection for a staged delivery approach, with the longer term being an agent<->agent relay between the two hosts.
-
-[Issues relating to vsocket relay agent](https://github.com/vmware/vic/labels/component%2Fvsocket-relay-agent)
-
-
-### NSX Authenticating Agent
-
-As with [access to vSphere](#vmomi-authenticating-agent), NSX management interaction requires credentials and therefore credential management. The authenticating agent is indended to move the credential management problem out of the VCH and into the vSphere infrastructure. Authorizing the VCH to perform specific operations by virtue of being a specific VM (and potentially cryptographically verified), rather than generating and embedding credentials into the guest, means:
-* a VCH can be safely considered untrusted
-* IDS style inspection and validation can be performed on each infrastructure operation performed by a VCH
-* no access to management networks is required for infrastructure orchestration
-
-[Issues relating to nsx agent](https://github.com/vmware/vic/labels/component%2Fnsx-authenticating-agent)
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/configuration.md b/installer/vendor/github.com/vmware/vic/doc/design/configuration.md
deleted file mode 100644
index 5d5ca8247c..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/configuration.md
+++ /dev/null
@@ -1,83 +0,0 @@
-# Configuration
-
-Three primary elements make up a functioning VCH - these are referred to as components in the rest of this document, along with their subcomponents:
-
-1. [vic-machine](vic-machine.md) - the mechanism by which the VCH is deployed, configured, and inspected
-2. appliance - a VM that runs the VCH logic ([docker personality](components.md#docker-api-server), [log server](components.md#vicadmin), [port-layer](arch/vic-port-layer-overview.md), et al)
-3. containerVMs - VMs that _are_ containers ([tether](tether.md), and container process)
-
-This document discusses how configuration between components is done, and why it's done in that manner.
-
-## Component interactions
-
-For both the VCH and containerVMs the configuration is used for two way communication, with a component updating its own configuration as an asynch publishing mechanism for low-frequency, persistent information. The fields listed below are examples rather than comprehensive lists.
-
-### vic-machine configuration of appliance
-
-
-Configures VCH on initial deploy:
-* _vSphere target and credentials_ (hidden)
-* networks (external, client, management, bridge, mapped vsphere networks)
-* vsphere compute path (e.g. resource pool)
-* image store URI
-* container store URI
-* permissible URIs for volumes
-* white/black list of registries
-* _etc_
-
-vic-machine also:
-* updates VCH config as part of management operations
-* inspects (read-only) containerVM configuration for diagnostics
-
-### appliance
-
-Configuration of containers and environment:
-* Configures containerVMs with (example config elements below)
-    * _appliance_ (hidden)
-    * ID
-    * command (executable, args, environment, working directory)
-    * networks (MAC, CIDR, gateway, name, nameservers)
-* configures logical networks (whether IPAM segregation or SDN logical networks)
-* configures VMDKs (volumes, images, container read/write layers)
-
-Publishes the following:
-* DHCP supplied network configuration
-* system & subcomponent status
-
-
-### ContainerVM
-
-Publishes the following:
-* DHCP supplied network configuration
-* container start status
-* container process exit code
-
-
-## Configuration persistence mechanism
-
-VIC uses the vSphere `extraConfig` and `guestinfo` mechanisms for storing configuration, the former used for config associated with either appliance or contianerVM that should **not** be visible to the GuestOS, and the latter for config that should. In reality the mechanisms are the same, with guestinfo being a subset of extraConfig.
-
-Access to guestinfo data within the GuestOS is done via the vmware-rpctool, or library providing the same capability e.g. [vmware/vmw-guestinfo](https://github.com/vmware/vmw-guestinfo/). The various subcomponents in the appliance and the tether in containerVMs will access this configuration directly via library calls - there is no intermediate step that presents this data via arguments or environment variables.
-
-The reasons for taking this approach:
-
-1. it keeps the appliance VM completely stateless - a reboot will return it to a known good state
-2. no cross component dependency - containerVMs do not require an VCH for ongoing operations, including vSphere High Availability restart
-3. the configuration is protected from tampering, even if superuser priviledges are obtained
-4. configuration is visible both from within the VM and remotely via vSphere APIs
-
-ExtraConfig data is used for data that should not be visible to the GuestOS - the best example of this are the vSphere target and credentials (ideally an SSO token), which are hidden from the appliance and only visible to the [vmomi agent](components.md#vmomi-authenticating-agent) that supplies the authenticated vSphere API connection. This means that even if superuser priviledges are obtained on the appliance, the risk is limited to a controlled connection rather than leaking any form of access token or even the URI of the vSphere endpoint.
-
-
-## Accessing configuration - implementation
-
-The defacto model for holding configuration in Go is a struct with Fields that contain the specifics. The idiomatic way of populating a struct from a serialized form is with a Decoder from the [Go encoding](https://golang.org/pkg/encoding/) package.
-
-It is expected that use of the configuration be performed via two endcoder/decoder pairs - one that operates directly on guestinfo via the vmx-guestinfo library, the other that takes a [VirtualMachineConfigSpec](pubs.vmware.com/vsphere-60/topic/com.vmware.wssdk.apiref.doc/vim.vm.ConfigSpec.html) and operates on the ExtraConfig field of the spec.
-
-The implementation will understand the following set of annotations and map the fields to appropriate extraConfig keys - in the case where the key describes a boolean state, omitting the annotation implies the opposite:
-* `hidden` - hidden from GuestOS
-* `read-only` - value can only be modified via vSphere APIs
-* `non-persistent` - value will be lost on VM reboot
-* `volatile` - field is not exported directly, but via a function that freshens the value each time)
-* `atomic:<group>` - speculative to allow atomic updates to multiple fields
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/container_logging.md b/installer/vendor/github.com/vmware/vic/doc/design/container_logging.md
deleted file mode 100644
index 314f6f20b1..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/container_logging.md
+++ /dev/null
@@ -1,26 +0,0 @@
-# Container VM output logging in VIC
-
-When a container VM process produces output, that output is sent down through a serial connection into the vSphere backend where it is written to a logfile. When a user wants to see this output, they use the `docker logs` command, which reads from this logfile and displays the log entries on the command line in order from oldest to newest.
-
-However, in order for users to be able to use the `--since` option with `docker logs`, we must also couple timestamps to these log entries so that the user can selectively filter log messages to be displayed based on when those entries occurred.
-
-### Requirements
-
-The container VM logging mechanism must:  
-  1. Create a header for each log entry containing both the size of that entry, the time at which that entry occurred, and the stream from which that entry originated (stdout, stderr).  
-  2. Allow these entries to be read and at a later time, starting with the first entry occurring at or beyond the timestamp supplied by the user with the `--since` option to `docker logs`, or starting with the first entry in the logfile if `--since` was not used. 
-
-### Implementation
-
-A package for containerVM logging in VIC is added as `github.com/vmware/vic/lib/iolog`. In this package are two files, `log_writer.go` and `log_reader.go`. These files contain an implementation of Go's `io.Writer` and `io.ReadCloser` interfaces, respectively.
-
-The responsibilities of the `LogWriter` are:  
-  1. To create a header for the entry, containing the timestamp at which the entry occurred, the size of the entry, and the stream that produced the entry.
-  2. To write these bytes to the serial port associated with the containerVM logfile on the backend.
-  3. To flush the remaining bytes in the supplied buffer upon `Close()`
-
-The responsibilities of the `LogReader` are:  
-  1. To read in a header and decode it into the timestamp, size and stream of the entry.
-  2. To then read the following `size` bytes that contain the actual message.
-  3. To copy the message bytes into the underlying `Read` stream's `[]byte` slice. 
-  4. To preserve unwritten bytes in a call to `Read` in memory so that they may be written during the next call, in the case where the supplied `[]byte` slice was smaller than the log message we are trying to write. 
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/containerd/images/vic-layers.png b/installer/vendor/github.com/vmware/vic/doc/design/containerd/images/vic-layers.png
deleted file mode 100644
index 08149ce5d7..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/containerd/images/vic-layers.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/containerd/port-layer-integration.md b/installer/vendor/github.com/vmware/vic/doc/design/containerd/port-layer-integration.md
deleted file mode 100644
index 908cc3dd71..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/containerd/port-layer-integration.md
+++ /dev/null
@@ -1,276 +0,0 @@
-**Containerd Integration Draft**
-
-**Summary**
-
-Docker’s Containerd project aims to present an API surface representing all of the core functions of a container runtime on a single host. This includes image resolution, image pull, container and image lifecycle management, events, metrics, execution of processes and interactive sessions.
-
-Network and volume management are out of scope for containerd which will expect to reference already-existing networks and storage.
-
-http://containerd.io/
-
-https://github.com/docker/containerd
-
-**Relevance to VIC**
-
-The scope of the Docker personality in VICe (VIC engine) is currently as an enterprise container _runtime_, very much the same scope as containerd. The main difference between the two is that in VIC, clustering, HA and other enterprise features are integrated transparently below the user API boundary. With regular containerd, it is assumed that these features will exist above the API in the application layer and that containerd manages containers on a single literal host (guest OS on physical harware or VM). The VIC integration will see containerd managing container workloads in a "virtual host" (vSphere resource pool), but the goal is for this to be completely transparent to the containerd consumer.
-
-The goals of integrating VICe with containerd are the following:
-
-* Be API complete with an industry-standard API that better encapsulates the scope of VIC.
-
-* Reach some degree of compatibility with the OCI image format. This is a requirement of containerd.
-
-* Reuse more common Docker code. It is anticipated that containerd will be part of a larger refactoring effort that will enable us to integrate better with Docker code.
-
-* Extend compatibility beyond Docker, assuming containerd succeeds as a runtime compatibility layer.
-
-* Work with the community to ensure that containerd has flexible enough integration points to support VIC
-
-**Scope**
-
-The scope of this document covers integration between containerd and the container primitives layer in VIC, called the Port Layer. It does not cover how the Docker engine integrates with containerd.
-
-**Design Considerations**
-
-*OCI compatibility?*
-
-The question of image format and subsequent implications on low-level runtime can be separated from containerd to some extent. The design explicitly allows for differences in container image format, providing that a /rootfs is the output of image post-processing. It also potentially allows for differences in container runtime via the use of the executor interface that both runc and containerd-shim implement. That said, containerd is designed to be OCI-compatible and that is the way the industry is likely to converge.
-
-As such, OCI compatibility is a goal for the VIC containerd integration.
-
-*Runc / Runv*
-
-Runc as it stands expects many things to exist before it creates a container. It expects an unpacked /rootfs with a config.json containing runtime configuration for that specific container. It expects networking and storage to already exist. When a container is created, the config.json is parsed and a dummy process is created in /proc and the created container gets a PID. Hooks can also be run at this point. When the container is started, the process in the created container is executed and runc will block until the process has completed. While the process is running, runc is its parent. 
-
-Writing an equivalent runc for vSphere presents some architectural challenges. For a start, the control plane which creates the rootfs for a container cannot see it once it’s created. It can only be seen by the container guest. That immediately presents a problem for config.json, because a runc equivalent won’t be able to see it to configure the container. There is no /proc filesystem - the closest equivalent is a moRef for a VM. There is no "parent" process model - raw calls to vSphere are async and the Port Layer calls are also async. Runc expects to write local state to /var/run, for which VIC has no equivalent.
-
-The biggest difference though is that runc and containerd-shim is a per-container model. VICe's closest equivalent to Runc is infact the in-guest Tether init process - there is one per container and it's the glue between the VM lifecycle and the lifecycle of the process(es) running in the VM. However, Tether processes are only visible by proxy via the Port Layer which itself is a daemon model, so integrating Tether with a runc shim is a non-starter.
-
-As such, closely aping runc’s behavior is not a useful goal for VICe. It is a plumbing detail and the whole purpose of containerd is to abstract the plumbing layer and make it easier to consume. The most obvious integration point for VICe is the Executor interface, which is also implemented by runc, so even if aping runc’s behavior is not the goal, we should end up with something that operates in a very similar manner.
-
-**Integration Points**
-
-![VICe layers](images/vic-layers.png)
-
-![Containerd architecture](https://github.com/docker/containerd/blob/0a5544d8c4dab44dfc682f5ad07f1cd011c0a115/design/architecture.png)
-
-Since the goal is to integrate with containerd, the most important consideration is what the integration points should be. At this point the following have been identified:
-
-1. Snapshots
-
-2. Executor
-
-3. Content store
-
-4. Metadata store
-
-5. Events
-
-Containerd has components which are designed to take an image from being pulled down through to a container being invoked (see above) which map pretty consistently to our integration points. The data flow envisaged looks something like this:
-
-![Data flow](https://github.com/docker/containerd/blob/0a5544d8c4dab44dfc682f5ad07f1cd011c0a115/design/data-flow.png)
-
-In order to understand the process an image goes through, it’s also helpful to understand the OCI image format: [https://github.com/opencontainers/image-spec](https://github.com/opencontainers/image-spec)
-
-A remote registry, the content blobstore and the snapshot store in containerd can be thought of as a three layered cache. Some amount of processing is done when data moves between the caches. When an image is pulled from a remote registry, it is broken up into metadata and blobs and cached in the metadata and content stores respectively. It is then post-processed onto snapshots (we should assume are also cached) which when combined using a layered filesystem present as a filesystem bundle to the Runtime Controller.
-
-As such, it should be assumed that the caches will be searched in reverse order when a container create call is made on containerd: Do the snapshots already exist? If not, is the data already in the content store to create them? If not, does the image URI resolve to a remote registry they can be pulled from?
-
-If this is how it expects to work, then the content blobstore is potentially optional. If every snapshot was created from a blob and the snapshots are not garbage collected, then a cache hit will return a snapshot and a cache miss will always result in a pull. The unpacking of the blob into a snapshot then becomes a one-off event in tempfs.
-
-*Snapshots*
-
-So the snapshot integration should look very like it does today. Snapshots map to VMDKs and the snapshot manager will use the storage part of the Port Layer to manage snapshot lifecycle as well as listing available images. In the case where containerd shuts down and starts up again, it will need to query the Port Layer to rebuild its own local cache (if any)*
-
-*(Note that the VIC appliance local filesystem is intentionally ephemeral, so no data persisted on the local filesystem is permanent. We must assume that operations like upgrade or other control plane outages should have no impact on the running containers or image cache and as such, there must be a means for containerd to learn about existing state when it starts up).
-
-*Executor*
-
-The executor interface is responsible both for all aspects of container lifecycle, including interaction with the container - (stdout, stderr, stdin and tty).
-
-As it stands, the interface expect a single out-of-process instance of an executor per container and that the executor will keep interaction channels open if containerd is restarted. This is something of a mismatch with our existing Port Layer which is a single service offering async API calls for running and interacting with containers.
-
-This presents two options: Fake up shim processes that represent each container or add an ID field to the Executor interface. The latter approach is our preference for the main reason that shim lifecycle management becomes a pain in the event that the VICe endpoint VM is restarted.
-
-*Content store*
-
-In the containerd design, the content store is a content-addressable blobstore. This seems to be something that intentionally exists outside of the scope of containerd itself as a way to optimize the local caching of image data. It doesn't seem necessary or desirable to implement this in the VIC appliance as sizing ramfs to cope with a blob store would be challenging. That said, if the three-level cache discussed above is the nature of the design, a content store implementation may well be optional.
-
-*Metadata store*
-
-Metadata is what ties everything together. It will need to link image URIs to digests and links to blobs and snapshots. Given that VIC does not have a persistent filesystem layer, metadata must be persisted into vSphere in some way. 
-
-The question of how this should be done remains open. The KV store on the Port Layer is likely not rich enough to represent the data relationships, so an alternative needs to be sought.
-
-*Events*
-
-At present, the events interface is one of the least clearly defined. However, it’s not hard to imagine how events from vSphere could propagate through containerd via the Port Layer.
-
-**State Management**
-
-One theme that has to be very carefully considered is the question of where state is persisted with containerd integration. Given that there is no persistent filesystem in the VIC appliance and vSphere is the single source of truth for runtime state, it’s important to consider the lifespan of runtime state and where it should be persisted. This does not include caches.
-
-<table>
-  <tr>
-    <td>State</td>
-    <td>Standard containerd/runc</td>
-    <td>VIC containerd</td>
-  </tr>
-  <tr>
-    <td>OCI image metadata</td>
-    <td>Local filesystem</td>
-    <td>Port Layer KV store -> vSphere</td>
-  </tr>
-  <tr>
-    <td>OCI image blob data</td>
-    <td>Local filesystem</td>
-    <td>Local ramfs (not persisted)*</td>
-  </tr>
-  <tr>
-    <td>OCI flat bundle data</td>
-    <td>Local filesystem</td>
-    <td>Single VMDK (support?)</td>
-  </tr>
-  <tr>
-    <td>OCI config data</td>
-    <td>Local filesystem</td>
-    <td>cVM guestInfo</td>
-  </tr>
-  <tr>
-    <td>Image / RW snapshots</td>
-    <td>Btrfs / DeviceMapper</td>
-    <td>VMDK snapshots</td>
-  </tr>
-  <tr>
-    <td>Ctr create/start/stop</td>
-    <td>/proc PID</td>
-    <td>VM exists / powered on / off</td>
-  </tr>
-  <tr>
-    <td>Running container state</td>
-    <td>Local filesystem (via runc)</td>
-    <td>Tether via Port Layer</td>
-  </tr>
-  <tr>
-    <td>Container metrics</td>
-    <td>Host pprof (+ agent?)</td>
-    <td>vSphere via Port Layer</td>
-  </tr>
-  <tr>
-    <td>Container logs</td>
-    <td>Local filesystem</td>
-    <td>File-back serial port</td>
-  </tr>
-  <tr>
-    <td>Stdout/err/in streams</td>
-    <td>Fifo on local filesystem</td>
-    <td>Interaction Port Layer</td>
-  </tr>
-  <tr>
-    <td>Exec’d process state</td>
-    <td>/proc PID ?</td>
-    <td>Tether via Port Layer</td>
-  </tr>
-</table>
-
-
-* There’s a question of whether VIC should support the notion of creating a flat bundle without snapshots. OCI supports this idea by extracting layers on top of each other on the local filesystem. There are potential performance advantages, but these would be significantly offset by the lack of layer reuse.
-
-**Workflows**
-
-The most common and most simple workflows to consider are image pull, container create, container start and delete. Interesting to note that there is no "stop" on the executor interface, implying no restart. Here is the executor interface that we propose to integrate with:
-
-```
-type Executor interface {
-
-	Create(ctx context.Context, id string, o CreateOpts) (*Container, error)
-
-	Pause(context.Context, *Container) error
-
-	Resume(context.Context, *Container) error
-
-	List(context.Context) ([]*Container, error)
-
-	Load(ctx context.Context, id string) (*Container, error)
-
-	Delete(context.Context, *Container) error
-
-	Start(context.Context, *Container) error
-
-	StartProcess(context.Context, *Container, StartProcessOpts) (Process, error)
-
-	SignalProcess(ctx context.Context, c *Container, id string, sig os.Signal) error
-
-	DeleteProcess(ctx context.Context, c *Container, id string) error
-
-}
-
-```
-*Image Pull*
-
-Image pull will be handled by the "Distribution" subsystem, which it is to be assumed operates similarly to VIC imagec component. Given a URI, it should be able to pull down any images that don’t already exist in a local cache. 
-
-The question of whether snapshots are created as output of image pull or whether these are created as output of container create is one that gets to the heart of whether the output of image pull needs to be cached at all. At present this isn’t clear, but it would be preferable for it to be the latter.
-
-Image metadata will need to persist beyond the lifespan of the VIC appliance and as such will need to be written into vSphere.
-
-*Container Create*
-
-Assuming the image snapshots are already created, an additional RW layer needs to be created, assuming the config doesn’t have readonly=true. 
-
-There is then a configuration pre-processing that needs to happen where the config.json is generated for the container. This will encapsulate a mixture of the image spec, containerd command-line arguments, constants set for the installation and possibly environmental factors.
-
-There will then need to be a validation step of the generated config to make sure that it makes sense. For example, referenced networks and storage need to exist. If the config passes validation, create() is called on the executor interface, which would propagate to the Port Layer. A VMConfigSpec will then be generated and a VM will be created. This is the equivalent of runc create (where a dummy process is created and gets a PID).
-
-*Container Run*
-
-Container run should operate in a very similar manner to the way it does today in that the VM is powered on and a handshake established with the Tether.
-
-The question is how we handle TTY/attach and streaming of stdout and stderr. In the current version of containerd, the containerd-shim maintains a Fifo on the filesystem that can be reconnected to if containerd shuts down and restarts.
-
-<TBD>
-
-**Questions**
-
-There are a number of questions that still need to be worked out. Here’s are the most obvious:
-
-*Do we need to create a process per container in the VIC appliance to fit with the executor model?*
-
-Both runc and the containerd shim are a process-per-container model. Our Port Layer is a long-running service. We will need some kind of shim layer on the Port Layer to mate with the executor interface anyway. Does having entries in /proc for each container help in any way?
-
-*What do we do with the config.json in a bundle?*
-
-When a bundle is extracted to a local filesystem, config.json is used as input to runc in terms of how to run the container. Config.json in the normal case will be a composite of image config and runtime config generated by containerd. For us to integrate seamlessly, we should expect the output of containerd to still be a config.json, but this will then need to be parsed by the Port Layer in creation of the VMConfigSpec. The config.json does not then need to end up in the bundle filesystem mounted to the container since runtime configuration goes into VM guestInfo.
-
-From discussions with the containerd team, it doesn't seem necessary to cache the config.json anywhere or make it available to the container. In fact, containerd is not responsible for modifying config.json at all.
-
-*What parts of config.json can/should we ignore?*
-
-VIC is not the only hypervisor OCI implementation out there and it should be noted that there are a bunch of areas in the OCI config spec that simply can’t apply to VIC. There is no distinction in the spec between the OS that supports the container infrastructure and the OS that the container runs on - one implies the other. In the case of VIC, the two are completely distinct. 
-
-Other hypervisor implementations list a bunch of areas that they either [don’t support or ignore](https://github.com/01org/cc-oci-runtime/issues?utf8=%E2%9C%93&q=is%3Aissue%20is%3Aopen%20label%3Adomain%3AOCI). The spec itself lists a bunch of parts that are "optional". We should put a proposal together in another document.
-
-*Role of the Supervisor component*
-
-The Supervisor is a multiplexer for shims, so it's very similar in scope and function to our Port Layer.
-
-*Are snapshots created during image pull or container create?*
-
-In the current model, snapshots are created on pull. Containerd seems to be designed to have snapshots created as part of container create. This needs to be clarified as it will have significant performance implications on create as well as caching implications for the image data.
-
-*What to do with pause and resume on the executor interface?*
-
-This could map to VM suspend and resume, but to date this is not something we’ve tried or even seen a need for. According to the containerd team, this is for the purpose of committing images. 
-
-*How to handle TTY/attach and streaming of stdout and stderr* 
-
-The containerd-shim uses Fifo on the filesystem to keep these streams open even if containerd shuts down. There isn’t a clear integration point to handle this, so we need to work out how to map this to our current implementation and whether an extension point needs to be created.
-
-*How to handle container **logs*
-
-In VICe, the portlayer handles retrieving logs, and the logs are streamed to the personality server using the attach mechanism.  The personality server performs some validation but is mostly hands off.
-
-*How to handle docker info and stats*
-
-VICe returns vSphere specific information for docker info. VIC will need hooks to provide this info. Also, how to stream VCH and container stats up to the Docker’s prometheus telemetry hooks?
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/dinv-dev-tool.md b/installer/vendor/github.com/vmware/vic/doc/design/dinv-dev-tool.md
deleted file mode 100644
index 90bbd2782c..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/dinv-dev-tool.md
+++ /dev/null
@@ -1,106 +0,0 @@
-# Goal
-
-The goal for this investigation, is to find a suitable tool to enable "easy-button" provisioning of Docker hosts on top of VIC, also referred to as DinV, or Docker-in-VIC.
-
-The short term goal is to provide a tool for the user to provision a prebuilt docker image containing a full fledged docker host and make it available to the user, automating the provisioning and security part (deployment, creation of certificates, registry cache persistency) as much as possible, giving the developers a tool to self-provision docker hosts with an easy button.
-
-# Options
-
-We're currently evaluating two options: use Docker Machine, or build our own tool.
-
-# Investigation: Why docker machine isn't a good choice.
-
-Docker machine is an open source tool published by docker, helps users in getting started with creating docker hosts, it works on various platforms, including desktops (Virtualbox, HyperV, Fusion), mega clouds (aws, azure, google cloud) and private clouds (vsphere, openstack).
-
-Docker machine has a modular plugin architecture for the infrastructure part, but lacks a modular provisioning system, which means we cannot provision anything outside the OS/binaries that are built into its core.
-
-VMware has contributed drivers for its platforms (Fusion, vSphere and vCloud Air), the people at Docker started to modularize these drivers with a component called libmachine.
-
-Libmachine, despite the name, is not entirely modular, its external interface only includes the infrastructure portion (which also requires ssh)[1]  and doesn't have an interface for OS provisioning we can plug into, the only way to have a new OS or provisioning system supported, is to have a PR accepted into docker machine core.
-
-There is no other way around this, even crafting an infrastructure plugin to do both infra provisioning and the certificate automation part won't work, docker machine expects to rely on libmachine for all the day2 operations it handles (upgrade, regenerate-certificates and even create), this renders Docker machine unsuitable for our needs.
-
-Same goes for the security aspect, certificate creation is performed on the local machine and copied over SSH and there are no hooks whatsoever in this process.
-
-# Investigation: How we should build our tool.
-
-Developers and Ops people are accustomed to the modus operandi of docker machine, our tool has a very similar purpose, but with a specific target which is the docker api exposed by VIC (or others in the future), modeling our own tool on the same flow that docker machine has will ensure an easy adoption curve with our users.
-
-Building our own tool means also making ourselves future proof with regards to new personalities and use cases with VIC, two examples that come to mind: Kubernetes and Docker Datacenter.
-
-Our tool will initially focus heavily on the DinV use case, meaning we'll be a consumer of the docker API that the VCH provides, plus helpers that will automate the provisioning part of the process (some of these parts can be borrowed from docker/machine packages, like for certificate creation).
-
-The tool will be dependent on the VCH implementing the `docker cp` operation (https://github.com/vmware/vic/issues/769).
-
-We will provide an official "DinV" image, based on photon, which we will support, as well as the source for the container that customers can use to "roll their own" DinV image, with their own customization (including things like running `sshd` inside the container). For customization purposes, it would be ideal to support LinuxKit, but that will require VIC to support running container processes as PID 1.
-
-# Conclusions
-
-Building our own tool is the most sensible option right now, modeling it after docker machine will ensure an easy migration path for people accustomed to the tool, and will make it future proof for new type of deployments to come.
-
-[1]
-```go
-// Driver defines how a host is created and controlled. Different types of
-// driver represent different ways hosts can be created (e.g. different
-// hypervisors, different cloud providers)
-type Driver interface {
-	// Create a host using the driver's config
-	Create() error
-
-	// DriverName returns the name of the driver
-	DriverName() string
-
-	// GetCreateFlags returns the mcnflag.Flag slice representing the flags
-	// that can be set, their descriptions and defaults.
-	GetCreateFlags() []mcnflag.Flag
-
-	// GetIP returns an IP or hostname that this host is available at
-	// e.g. 1.2.3.4 or docker-host-d60b70a14d3a.cloudapp.net
-	GetIP() (string, error)
-
-	// GetMachineName returns the name of the machine
-	GetMachineName() string
-
-	// GetSSHHostname returns hostname for use with ssh
-	GetSSHHostname() (string, error)
-
-	// GetSSHKeyPath returns key path for use with ssh
-	GetSSHKeyPath() string
-
-	// GetSSHPort returns port for use with ssh
-	GetSSHPort() (int, error)
-
-	// GetSSHUsername returns username for use with ssh
-	GetSSHUsername() string
-
-	// GetURL returns a Docker compatible host URL for connecting to this host
-	// e.g. tcp://1.2.3.4:2376
-	GetURL() (string, error)
-
-	// GetState returns the state that the host is in (running, stopped, etc)
-	GetState() (state.State, error)
-
-	// Kill stops a host forcefully
-	Kill() error
-
-	// PreCreateCheck allows for pre-create operations to make sure a driver is ready for creation
-	PreCreateCheck() error
-
-	// Remove a host
-	Remove() error
-
-	// Restart a host. This may just call Stop(); Start() if the provider does not
-	// have any special restart behaviour.
-	Restart() error
-
-	// SetConfigFromFlags configures the driver with the object that was returned
-	// by RegisterCreateFlags
-	SetConfigFromFlags(opts DriverOptions) error
-
-	// Start a host
-	Start() error
-
-	// Stop a host gracefully
-	Stop() error
-}
-```
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/docker-api-filtering.md b/installer/vendor/github.com/vmware/vic/doc/design/docker-api-filtering.md
deleted file mode 100644
index 0ef7c87be4..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/docker-api-filtering.md
+++ /dev/null
@@ -1,78 +0,0 @@
-### Docker API Filtering
-
-The [docker api server](components.md#docker-api-server) is the endpoint for the docker client.  In many of the docker
-client commands a user is able to specify filter criteria.  That criteria will be evaluated in
-the docker persona and will limit the results of the docker command.
-
-#### Docker Filters
-
-The docker client provides filter options across a variety of commands.  A good example of
-docker filter options is the `docker images` command.  The following options are available
-as of Docker 1.13:
-
-```
--f, --filter value    Filter output based on conditions provided (default [])
-                        - dangling=true
-                        - label=<key> or label=<key>=<value>
-                        - before=(<image-name>[:tag]|<image-id>|<image@digest>)
-                        - since=(<image-name>[:tag]|<image-id>|<image@digest>)
-                        - reference=(<image-name>[:tag])
-```
-
-Here's an example using the images filter: `docker images -f label=prod`.  That command will
-return only the images with a label key of `prod`.
-
-#### Filter Design
-
-The vic filtering logic is provided in the filter package of the vic docker personality.  That
-package should hold all of the vic implemented logic for docker personality filtering. The
-filtering logic is a combination of new vic code and the reuse of docker validation code.
-
-The package contains the common filtering and validation logic that can be used across the
-vic docker personality.  Additionally the package contains object specific filtering logic
-isolated in object specific files.  For example all vic specific container filtering will
-be provided in the following file: `/lib/apiservers/engine/backends/filter/container.go`.
-The vic container filtering will take advantage of the common functionality as well as
-implement vic specific container filtering logic.
-
-##### Common Filtering
-
-There are a few filter options that span multiple docker client commands.  That filtering
-logic is contained in the `/lib/apiservers/engine/backends/filter/filter.go` file.  The
-following common filtering is provided:
-	- ID
-	- Name
-	- Label
-	- Before
-	- Since
-If a docker command provides any of these filtering options then the vic implementation
-should take advantage of this common filtering mechanism.
-
-##### Object Specific Filtering
-
-As mentioned above object specific filtering should be isolated in a file identifying the
-object.  For example all vic specific container filtering will be provided in the
-following file: `/lib/apiservers/engine/backends/filter/container.go`.
-
-Object specific filtering should take advantage of the aforementioned common filtering
-as well as vendored docker validation code.  Then any additional custom vic filtering
-should be provided in the file.
-
-##### Docker filter support
-
-While all docker filtering options are valid not all filtering options are supported
-by vic.  In order to segregate validity from support each command that provides filtering
-must provide maps indicating valid vs. supported.  If all docker filtering options are
-supported by vic then only one map will be needed.  The container object and specifically
-the `docker ps` command provides a good example of the [maps](https://github.com/vmware/vic/blob/master/lib/apiservers/engine/backends/container.go#L60).
-
-There are two maps for the container object since not all of the filter criteria is
-currently supported by vic.  Those two maps are provided to the common filter validation
-code to check for validity and supportability.
-
-If a command is not currently supported by vic the validation logic will provide the
-following error message:
-```
-	Error response from daemon: filter dangling is not currently supported by vic
-```
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/docker-cp.md b/installer/vendor/github.com/vmware/vic/doc/design/docker-cp.md
deleted file mode 100644
index 75bcc4d582..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/docker-cp.md
+++ /dev/null
@@ -1,303 +0,0 @@
-## DOCKER CP DESIGN DOC
-
-### Initial Rundown of docker cp
-
-Docker cp has many possible scenarios that we will have to account for and they will be described in this section.
-
-We will be supporting docker cp in it's entirety. This means we will need to copy files to and from a container regardless of whether it is on or off. This will lead to 4 scenarios. 
-
-1. The container is *on*, and we want to copy data *from* it.
-
-2. The container is *on*, and we want to copy data *to* it.
-
-3. The container is *off*, and we want to copy data *from* it.(will constitute multiple calls from the personality)
-
-4. The container is *off*, an we want to copy data *to* it.(will constitute multiple calls from the personality)
-
-According to the docker remote api the target for a copy must be in `identity (no compression), gzip, bzip2, xz`. As the docker cli handles packaging a *to* request we can expect on of these formats. We must package our *from* response in one of these formats as well. 
-
- _NOTE_: docker has discussed copying between containers in the past. This will be yet another set of 4 possibilities and endpoints. Something that we can add to this plan later if it is needed in the future. 
-
-Here is a more complex look at the call operation/state flow.
-
-|Operation| state| volumes | scenario |
-|---|---|---|---|
-|  Export | ContainerRunning | No | Single call from personality to portlayer. Guest Tools will be used on the target rather than `Read` |
-| Export | ContainerRunning | Yes |  Single call from personality to portlayer. Guest Tools will be used on the target rather than `Read` |
-| Export | ContainerStopped | No | Single call from personality to portlayer. `Read` is called based on the supplied filespec. |
-| Export | ContainerStopped | Yes | Multiple calls from personality to portlayer. One for the r/w layer, and n more calls where n is the number of volumes. `Read` is invoked n+1 times based on each call. Powerstatus likely won't matter here because we mount non-persistent disks|
-| Import |  ContainerRunning | No | Single call from personality to portlayer. Guest tools will be used on the target rather than a `Write` |
-|  Import | ContainerRunning | Yes |  Single call from personality to portlayer. Guest tools will be used on the target rather than a `Write` |
-| Import | ContainerStopped |  No | Single call from personality to portlayer. `Write` will be used to mount the r/w layer and then write the contents based on the supplied filespec  |
-| Import | ContainerStopped | Yes |  Multiple calls from personality to portlayer. One for the r/w layer, and n more calls where n is the number of volumes. `Write` is invoked n+1 times based on each call from the personality. If the container is started during this time we cannot mount the volumes or the r/w layer and we will report a failure requesting the user to try again. Alternatively, we block start events until operation completion. |
-
-
-### Personality to Portlayer Communication
-
-Since all 4 of these must be supported we will require both distinctions for when the container is off and which endpoint to call to distinguish between *to* and *from* operations. 
-
-The proposed solution is to have two endpoints designed for the portlayer api swagger server. Both endpoints will exist along the same request path as two different verbs. The request path should be as such : 
-
-The portlayer functional target for `ExportArchive` and `ImportArchive` will need to be called multiple times from the personality for each device that constitutes the full filesystem of the container. A `PathSpec` struct will be used to mark inclusion and exclusion paths. We will also need to know when to strip the paths provided to the portlayer since the view of a volume would be `/` while in a running container the target path could be `/path/to/volume/` where the path before the final `/` exists on the container r/w layer(or another volume, but we are not worrying about that now.) Because there will be multiple calls for the potential Import of the archive(write calls) we will need to have a way to pass or reference the stream of information to the portlayer multiple times. This may constitute another input for the function header in order to identify the stream that we care about. 
-
-the portlayer functional targets will look as such: 
-
-__ExportArchive__
-
-```
-// ID : container/vm target ID mainly for power state checking in the portlayer to determine Exports logical behavior.
-// deviceID : target deviceID for copying
-// fileSpec : just a map[string]string of keyed paths to exclusion and strip operations determined by the desired behavior of the read
-// 
-func Read(ID, deviceID, filespec map[string]string) (io.reader, error)
-
-// no need for the data bool since we know that this operation involves data. we can set that as always true on the portlayer side of things.
-```
-
-
-__ImportArchive__
-```
-// StoreID : ID of the store where the target device resides be it image store, volume store, or something else in the future.
-// ID : target container/vm for the portlayer to check powerstate to determine the logical approach of the ImportArchive function
-// deviceID : device id found in the targeted store that is to receive the archive
-// fileSpec : just a map[string]string of keyed paths to exclusion and strip operations determined by the desired behavior of the write
-// tarStream : the actual tar stream to be imported to the target
-func Write(ID, deviceID string, fileSpec map[string]string, tarStream io.Writer) error
-```
-
-Note: this call will involve multiple docker endpoints, Stat is needed with we plan to support the `-L` functionality. We will also need the interaction piece for streaming tar archive's to the portlayer with the same tar stream from docker being streamed to multiple calls(hopefully we might have a way to not stream the same data several times over the network).
-
-## Personality design
-
-
-### Copy Operation
-
-The personality has Three endpoints that are called depending on the to/from situation above(5 if you count the two deprecated calls that were made previously.). The portlayer will divide the behavior of to/from as two separate endpoints. These endpoints will behave in an `Export/Import` behavior. Aside from the Import/Export behavior the docker cli also calls `ContainerStatPath` when determining whether to follow symlinks via the `-L` option. We will need this endpoint implemented all the way through to the portlayer if we want to support following symlinks.
-
-Error codes expected by docker : 
-
-```
-200 
-
-400
-
-403 - in the event of a readonly filesystem
-
-404
-
-409
-
-500
-
-```
-
-Docker does not do much in the way of string checking as far as the path is concerned. This is likely not a big concern for the personality as the actual copy command will fail if a bad path string is provided. 
-
-For the multiple calls to the portlayer we will need to assemble Pathspecs which detail inclusion, exclusion, rebase,and strip configurations for the tar stream on both reads and writes. Below will be some scenarios and what the path spec should look like for those scenarios.
-
-Exclude the tether path. Exclude any paths that docker does not allow for a copy. the filespec map with a serialized struct or keys for `exclusion`, `strip`.
-
-examples of a pathspec(please note that these are simple scenarios for the time being):
-```
-For a CopyTo to path "/volumes" :
-container has one volume mounted at /volumes/data
-
-this will invoke two write calls. 
-
-first pathspec: 
-
-// this pathspec would be empty since you would be writing against the r/w of the containerFS and the starting path would be '/' of the containerFS. No stripping of the write headers necessary.
-spec.rebase="volumes"
-spec.strip = ""
-spec.includes = map[string]string {"": struct{}{}}
-spec.excludes = map[string]string {"volumes/data": struct{}{}}
-
-Second Pathspec:
-spec.Strip = "volumes/data/"  // stripped since the volume will be mounted and the starting path will be "/"
-spec.Rebase = ""
-spec.includes = map[string]string {"": struct{}{}}
-}
-```
-
-```
-For a Copy from path "/volumes/" :
-container has one volume mounted at /volumes/data
-
-this will invoke two read calls
-
-// this pathspec would be empty since you would be writing against the r/w of the containerFS and the starting path would be '/' of the containerFS. No rebase necessary for the headers.
-spec.Rebase = "volumes"
-spec.Strip = "volumes"
-// in this case strip and rebase are the same since this is a 1st level directory e.g for a target of /volumes/data rebase would be "data" and strip would be "volumes/data" 
-spec.include = map[string]string {"volumes":struct{}{}}
-spec.Exclude = map[string]string {"": struct{}{}}
-
-// this pathspec will be for the volume filesystem
-spec.Rebase = "volumes"
-spec.Strip = ""
-spec.include = map[string]string {"":struct{}{}}
-
-```
-
-
-NOTE: use TarAppender in docker/pkg/archive to possibly merge the different tar streams during an ExportArchive. 
-
-### Stat Operation
-
-
-
-## Portlayer Design
-
-
-
- There will be two situations to be concerned with in the portlayer. When the container is *on* and when the container is *off*.
- 
- in the event of the *off* scenario we will convey the requested operations to the `Read`/`Write` calls in the storage portion of the portlayer. The results of those calls should be returned to the user.
- 
- Regardless of whether the container is on or off. Some investigation has shown that it works in the scenario of both containers being on, off, and one on and one off. We will need to architect a way for this to work for us. If the target is a volume that is attached to a container we will need to understand what is needed in the case of a vmdk volume target. This behavior should not be an issue for the nfs volume store targets.
- 
- The portlayer should behave at a basic level as such: 
- 
- ```
- 1. look up appropriate storage object
-2. check object usage
-3. mount object or initiate copy based on (2)
-3b. check for error in initialization of copy due to power state change, repeat (2) if found
-4. mounted disk prevents incompatible operations, or, tether copy in progress squashes in guest shutdown
- ```
- 
- some additiona notes surrounding the portlayer and swagger endpoint design:
- 
-
-use query string to pass FilterSpec so that it's not needed to be packaged in a custom format in body along with the tar
-this assumes that callers have some knowledge of mount topology and correctly populate the FilterSpec to avoid recursing into mounts that will be directly addressed by a later call.
-because it's possible for the various storage elements of a container to be in different states (e.g. container is not running so r/w and volumeA are not in use, but volumeB from the container is now used by container X) we require that separate calls be made to Import/Export for each of the distinct storage elements. This allows those calls to be routed appropriately based on current owners and usage of the element in question.
- 
- 
-### Stat Operation
-
-We will need a `stat` endpoint which will be used to target devices with a filesystem that can return fileinfo back to the caller. This will need to be tolerant of the power status of the target, if the target container/vm is on then we can use guest tools. Otherwise, mounting the appropriate device for the stat is necessary. Like the Read/Write calls we should expect a store ID and a device ID in addition to the target of the stat operation. if the compute is not active then we should mount the target device specified for the stat. 
-
-```
-underlying filesystem stat :
-// storename : this is the store that the target device resides on 
-// deviceID : this is the target device for the stat operation
-// target : is the filesys
-//
-// stat will mount the target and stat the filesystem target in order to obtain the requested filesystem info.
-func Stat(storename string, deviceID string, spec archive.FilterSpec) (FileInfo, error)
-
-// it is the responsibility of the caller to determine the status of this device. If it is already mounted or in use the caller must determine the action to be taken. 
-```
-
- 
-### Portlayer Import/Export Behavior for writing and reading to storage devices.
-The following are the core interfaces that allow hiding of the current usage state of a given storage element such as a volume:
-
-```
-When a container is online and a copy is attempted guest tools will be utilized to move the files onto the container. Below are the defined interfaces that will be used for reading and writing to the devices. Note that there can be multiple datasources and datasinks for the same device backing. This is due to online and offline behavior. 
-
-A docker stop should be blocked until the copy.(currently this is not the case) 
-
-// DataSource defines the methods for exporting data from a specific storage element as a tar stream
-type DataSource interface {
-	// Close releases all resources associated with this source. Shared resources should be reference counted.
-	io.Closer
-
-	// Export performs an export of the specified files, returning the data as a tar stream. This is single use; once
-	// the export has completed it should not be assumed that the source remains functional.
-	//
-	// spec: specifies which files will be included/excluded in the export and allows for path rebasing/stripping
-	// data: if true the actual file data is included, if false only the file headers are present
-	Export(op trace.Operation, spec *archive.FilterSpec, data bool) (io.ReadCloser, error)
-
-	// Source returns the mechanism by which the data source is accessed
-	// Examples:
-	//     vmdk mounted locally: *os.File
-	//     nfs volume:  		 XDR-client
-	//     via guesttools:  	 toolbox client
-	Source() interface{}
-}
-
-// DataSink defines the methods for importing data to a specific storage element from a tar stream
-type DataSink interface {
-	// Close releases all resources associated with this sink. Shared resources should be reference counted.
-	io.Closer
-
-	// Import performs an import of the tar stream to the source held by this DataSink.  This is single use; once
-	// the export has completed it should not be assumed that the sink remains functional.
-	//
-	// spec: specifies which files will be included/excluded in the import and allows for path rebasing/stripping
-	// tarStream: the tar stream to from which to import data
-	Import(op trace.Operation, spec *archive.FilterSpec, tarStream io.ReadCloser) error
-
-	// Sink returns the mechanism by which the data sink is accessed
-	// Examples:
-	//     vmdk mounted locally: *os.File
-	//     nfs volume:  		 XDR-client
-	//     via guesttools:  	 toolbox client
-	Sink() interface{}
-}
-
-// Importer defines the methods needed to write data into a storage element. This should be implemented by the various
-// store types.
-type Importer interface {
-	// Import allows direct construction and invocation of a data sink for the specified ID.
-	Import(op trace.Operation, id string, spec *archive.FilterSpec, tarStream io.ReadCloser) error
-
-	// NewDataSink constructs a data sink for the specified ID within the context of the Importer. This is a single
-	// use sink which may hold resources until Closed.
-	NewDataSink(op trace.Operation, id string) (DataSink, error)
-}
-
-// Exporter defines the methods needed to read data from a storage element, optionally diff with an ancestor. This
-// shoiuld be implemented by the various store types.
-type Exporter interface {
-	// Export allows direct construction and invocation of a data source for the specified ID.
-	Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error)
-
-	// NewDataSource constructs a data source for the specified ID within the context of the Exporter. This is a single
-	// use source which may hold resources until Closed.
-	NewDataSource(op trace.Operation, id string) (DataSource, error)
-}
-```
-
-This provides a pair of helper functions per store, supporting generalized implementation of the above Import/Export logic:
-
-```
-// Resolver defines methods for mapping ids to URLS, and urls to owners of that device
-type Resolver interface {
-	// URL returns a url to the data source representing `id`
-	// For historic reasons this is not the same URL that other parts of the storage component use, but an actual
-	// URL suited for locating the storage element without having additional precursor knowledge.
-        // Of the form `ds://[datastore]/path/on/datastore/element.vmdk`
-	URL(op trace.Operation, id string) (*url.URL, error)
-
-	// Owners returns a list of VMs that are using the resource specified by `url`
-	Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error)
-}
-```
-
-Example usage:
-
-```
-func (h *handler) ImportArchive(store, id string, spec *archive.FilterSpec, tar io.ReadCloser) middleware.Responder {
-	op := trace.NewOperation(context.Background(), "ImportArchive: %s:%s", store, id)
-
-	s, ok := storage.GetImporter(store)
-	if !ok {
-		op.Errorf("Failed to locate import capable store %s", store)
-		op.Debugf("Available importers are: %+q", storage.GetImporters())
-
-		return storage.NewImportArchiveNotFound()
-	}
-
-	err := s.Import(op, id, spec, tar)
-	if err != nil {
-                // This should be usefully typed errors
-		return storage.NewExportArchiveInternalServerError()
-	}
-
-	return storage.NewImportArchiveOK()
-}
-```
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/docker-rename.md b/installer/vendor/github.com/vmware/vic/doc/design/docker-rename.md
deleted file mode 100644
index d96f9dcd97..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/docker-rename.md
+++ /dev/null
@@ -1,44 +0,0 @@
-This is the design document for implementing “docker rename” on vSphere Integrated Containers Engine (VIC Engine).
-
-## Design
-
-### The problem:
-
-Rename involves the containerVM’s display name and the name of the datastore folder (and the files in the folder) of the containerVM on the vsphere UI, the container cache of the VIC Engine and the container network configuration (e.g., network alias). Currently both the containerVM's display name and the folder name are created during VM creation using containerName-containerID, which is done for matching the container information obtained from `docker ps` to the VM displayed on the vSphere UI. Renaming the VM display name on the UI can be achieved by using govc, which however does not update the datastore folder name. In this case, the vi admin would observe inconsistent VM display name and datastore folder name, and it becomes difficult the admin to reference the datastore folder based on the new VM display name.
-
-### Solution:
-
-- We use `containerName-containerShortID` to assemble the VM display name. We do not use containerName-containerID in order to avoid the scenario wherein the containerName gets truncated to satisfy the maximum length of a VM display name in vSphere. In addition, we use the `containerID` to set the name of the datastore folder, thus there is no need to worry about the VM display name and datastore folder name being inconsistent. 
-
-- VM configuration during creation: 
-
-  - vSAN: Since vSAN requires the VM display name to be the same as the datastore folder name during VM creation, we set both the VM display name and the datastore folder name to `containerName-containerShortID` during VM creation.
-  - Non-vSAN: We set the VM display name to `containerName-containerShortID` and set the datastore folder name to `containeriD`.
-  - VM guestinfo: We replace `guestinfo.vice./common/name` with `common/name` in the `ExtraConfig` of a containerVM and set the scope of `common/name` to `hidden`. Then when `docker rename` is called after the VM is created, we can update the `common/name` with the new name. By doing this, we can persist the new name for a running containerVM.  
-
-- Docker support for rename: When a customer calls `docker rename`, we update the VM display name to the new name in both the docker persona and the portlayer. 
-  
-  - Network: 
-
-    - Network alias should be updated.
-    - If `--link` is used when creating the container, HostConfig of relevant containers should be automatically updated based on the backend data.
-    - `/etc/hosts`: it will not have the containerName, since `guestinfo.vice/common/name` does not exist.      
-          
-  - Storage: Nothing needs to be updated if we set the datastore folder name to containerID.
-  - Backward compatibility for containers created by a VCH of an older version that does not support `docker rename`: During VCH upgrade, if an existing containerVM has `guestinfo.vice./common/name` instead of `common/name`, a data migration plugin will add `common/name` to the `ExtraConfig` of this containerVM and update the value accordingly, so that the docker operations that are supported by the old VCH still work. However, since we won't be able to update the binaries of the existing containerVMs, we disable `docker rename` on these containerVMs.
-
-## Testing and Acceptance Criteria
-
-Robot scripts will be written to test the following:
-
-1. VM configuration:
-  - After a containerVM is created, use govc to check the display name (containerName-containerShortID) and datastore folder name (containerID if on a non-vSAN setup).
-
-2. Docker support for rename:
-  - The basic functionality of `docker rename`
-  - Check validity of network alias and HostConfig 
-  - `docker-compose up` when there are existing containers for the same service but the configuration or image has been changed
-  - `docker-compose up –force-recreate` when there are existing containers for the same service even if the configuration or image has not been changed
-  
-3. Backward compatibility
-  - Add a test case in the upgrade test. Create a container using a VCH that does not support `docker rename`. After upgrading the VCH, the basic docker operations that are supported by the old VCH should work.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/image-management.md b/installer/vendor/github.com/vmware/vic/doc/design/image-management.md
deleted file mode 100644
index c4d5428e7d..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/image-management.md
+++ /dev/null
@@ -1,27 +0,0 @@
-### How VIC manages filesystem images
-
-A big part of a container runtime is how it uses and manages filesystem images. There are various approaches to managing container images, but the net result needs to be enough binaries to run the main container process. Those binaries may infact be a single statically-linked executable, or it could be operating system dependencies, third party libraries etc.
-
-Given that each containerVM in VIC does not share a filesystem with anything else, for a container VM to be functional, it requires the following:
-* OS binaries from which to boot. These are contained in the ISO attached to the containerVM
-* A disk, representing the container filesystem, mounted at "/". The disk may contain OS libraries, but must contain the binaries corresponding to the entry point of the container. The disk will typically be R/W and the underlying implementation may capture all reads into a layer which can be committed into a snapshot
-* 0 or more R/W disks which persist beyond the lifespan of the container
-
-#### Port Layer Storage
-
-#### Imagec
-
-Image resolution and the transfer of image data between an external repository and a local image store is something that should be able to happen out-of-band. This also means that it does not need to be a service that is tightly-coupled to any one VCH. A VCH should be able to make asynchronous requests to an image service which maintains a local image store. There is no reason the image store could not be shared between a number of VCHs. When an image is added to the store, the VCH should then be able to query the image store via the PortLayer for metadata about the image.
-
-Given the out-of-band nature of this transaction, plus the potential for the exchange of image data to be be automated or even managed by a different control plane, it makes sense to provide a binary to allow for this. This binary is [imagec](../../../master/cmd/imagec/README.md) described [here](components.md#imagec)
-
-#### Image metadata
-
-Image metadata arguably consists of two distinct types: Immutable metadata that is added to the image on creation/push and contextual data that can be added by the user of an image to facilitate publishing/referencing. Given that a single image can be deployed by multiple users, there is also a scoping aspect to this distinction: Immutable image metadata is coupled to the image and is consumed by all users of the image; whereras user metadata exists within the context of a particular use of the image. As such, user metadata is scoped to a VCH and image metatdata is scoped to an image store. Both need to be persisted.
-
-#### High-level control flow
-
-This diagram gives a high-level overview of the control flow between the various components.
-
-![system component architecture](images/docker-pull-workflow.png)
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.png b/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.png
deleted file mode 100644
index 45af93b5c9..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.svg b/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.svg
deleted file mode 100644
index b7bfbdeabf..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/images/component_architecture.svg
+++ /dev/null
@@ -1,5722 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by Microsoft Visio, SVG Export component_architecture.svg Top Process -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"
-		xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="19.2018in" height="11.5209in"
-		viewBox="0 0 1382.53 829.507" xml:space="preserve" color-interpolation-filters="sRGB" class="st51">
-	<title>vSphere Integrated Containers component architecture</title>
-	<desc>This is the initial formal draft of the component and coarse control flow architecture.</desc>
-	<v:documentProperties v:langID="1033" v:metric="true" v:viewMarkup="false">
-		<v:userDefs>
-			<v:ud v:nameU="msvNoAutoConnect" v:val="VT0(0):26"/>
-		</v:userDefs>
-	</v:documentProperties>
-
-	<style type="text/css">
-	<![CDATA[
-		.st1 {fill:#ffff66;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st2 {fill:#000000;font-family:Calibri;font-size:1.00001em}
-		.st3 {fill:#dff4fb;stroke:#000000;stroke-linecap:butt;stroke-width:0.48}
-		.st4 {fill:#127697;font-family:Calibri;font-size:0.833336em}
-		.st5 {fill:#ffffcc;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st6 {font-size:1em}
-		.st7 {fill:#f2f2f2;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st8 {fill:#e9f5d9;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st9 {fill:#ecf5fb;stroke:#ff0000;stroke-linecap:butt;stroke-width:0.48}
-		.st10 {marker-end:url(#mrkr13-32);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st11 {fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.16}
-		.st12 {fill:#ffffff;stroke:none;stroke-linecap:butt;stroke-width:7.2}
-		.st13 {fill:#0b485c;font-family:Calibri;font-size:0.666664em}
-		.st14 {fill:#ecf5fb;stroke:#000000;stroke-linecap:butt;stroke-width:0.48}
-		.st15 {fill:#e9f5d9;stroke:#000000;stroke-linecap:butt;stroke-width:0.48}
-		.st16 {fill:#f2f2f2;stroke:#000000;stroke-linecap:butt;stroke-width:0.48}
-		.st17 {marker-end:url(#mrkr4-120);marker-start:url(#mrkr4-118);stroke:#c00000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st18 {fill:#c00000;fill-opacity:1;stroke:#c00000;stroke-opacity:1;stroke-width:0.16}
-		.st19 {marker-end:url(#mrkr13-130);stroke:#72a528;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st20 {fill:#72a528;fill-opacity:1;stroke:#72a528;stroke-opacity:1;stroke-width:0.16}
-		.st21 {fill:none;stroke:#000000;stroke-dasharray:3.84,1.92;stroke-linecap:butt;stroke-width:0.48}
-		.st22 {fill:none;stroke:none;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st23 {fill:#23b8e9;font-family:Calibri;font-size:1.00001em}
-		.st24 {fill:#000000;font-family:Calibri;font-size:0.666664em}
-		.st25 {marker-end:url(#mrkr13-221);marker-start:url(#mrkr13-219);stroke:#c00000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st26 {marker-end:url(#mrkr4-239);marker-start:url(#mrkr4-237);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st27 {marker-end:url(#mrkr13-32);marker-start:url(#mrkr13-252);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st28 {fill:none;stroke:#ff0000;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st29 {fill:#cef0e2;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st30 {fill:#ecf5fb;stroke:none;stroke-linecap:butt;stroke-width:0.48}
-		.st31 {fill:#000000;font-family:Calibri;font-size:0.833336em}
-		.st32 {fill:#bfeaf8;stroke:none;stroke-linecap:butt;stroke-width:0.48}
-		.st33 {fill:#ffccff;fill-opacity:0.35;stroke:#ffffff;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.6;stroke-width:1}
-		.st34 {marker-end:url(#mrkr4-283);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st35 {fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.28409090909091}
-		.st36 {marker-end:url(#mrkr4-292);stroke:#c00000;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st37 {fill:#c00000;fill-opacity:1;stroke:#c00000;stroke-opacity:1;stroke-width:0.28409090909091}
-		.st38 {marker-end:url(#mrkr4-304);marker-start:url(#mrkr4-302);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.5}
-		.st39 {fill:#000000;fill-opacity:1;stroke:#000000;stroke-opacity:1;stroke-width:0.16556291390728}
-		.st40 {marker-end:url(#mrkr4-321);stroke:#72a528;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st41 {fill:#72a528;fill-opacity:1;stroke:#72a528;stroke-opacity:1;stroke-width:0.28409090909091}
-		.st42 {marker-end:url(#mrkr4-304);stroke:#000000;stroke-dasharray:3.5,2.5;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.5}
-		.st43 {marker-end:url(#mrkr4-338);stroke:#72a528;stroke-dasharray:3.5,2.5;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.5}
-		.st44 {fill:#72a528;fill-opacity:1;stroke:#72a528;stroke-opacity:1;stroke-width:0.16556291390728}
-		.st45 {marker-end:url(#mrkr4-321);stroke:#72a528;stroke-dasharray:7,5;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st46 {fill:#127697;font-family:Calibri;font-size:0.499992em}
-		.st47 {marker-end:url(#mrkr4-338);stroke:#72a528;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.5}
-		.st48 {marker-end:url(#mrkr5-386);marker-start:url(#mrkr4-237);stroke:#000000;stroke-dasharray:3.36,2.4;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st49 {marker-end:url(#mrkr4-304);stroke:#000000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.5}
-		.st50 {marker-end:url(#mrkr13-221);stroke:#c00000;stroke-linecap:round;stroke-linejoin:round;stroke-width:0.48}
-		.st51 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
-	]]>
-	</style>
-
-	<defs id="Patterns_And_Gradients">
-		<linearGradient id="grad0-29" x1="0" y1="0" x2="1" y2="0" gradientTransform="rotate(90 0.5 0.5)">
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-			<stop offset="0" stop-color="#ffffff" stop-opacity="1"/>
-		</linearGradient>
-	</defs>
-	<defs id="Markers">
-		<g id="lend13">
-			<path d="M 3 1 L 0 0 L 3 -1 L 3 1 " style="stroke:none"/>
-		</g>
-		<marker id="mrkr13-32" class="st11" v:arrowType="13" v:arrowSize="2" v:setback="18.75" refX="-18.75" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend13" transform="scale(-6.25,-6.25) "/>
-		</marker>
-		<g id="lend4">
-			<path d="M 2 1 L 0 0 L 2 -1 L 2 1 " style="stroke:none"/>
-		</g>
-		<marker id="mrkr4-118" class="st18" v:arrowType="4" v:arrowSize="2" v:setback="11.75" refX="11.75" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(6.25) "/>
-		</marker>
-		<marker id="mrkr4-120" class="st18" v:arrowType="4" v:arrowSize="2" v:setback="12.5" refX="-12.5" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-6.25,-6.25) "/>
-		</marker>
-		<marker id="mrkr13-130" class="st20" v:arrowType="13" v:arrowSize="2" v:setback="18.75" refX="-18.75" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend13" transform="scale(-6.25,-6.25) "/>
-		</marker>
-		<marker id="mrkr13-219" class="st18" v:arrowType="13" v:arrowSize="2" v:setback="18" refX="18" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend13" transform="scale(6.25) "/>
-		</marker>
-		<marker id="mrkr13-221" class="st18" v:arrowType="13" v:arrowSize="2" v:setback="18.75" refX="-18.75" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend13" transform="scale(-6.25,-6.25) "/>
-		</marker>
-		<marker id="mrkr4-237" class="st11" v:arrowType="4" v:arrowSize="2" v:setback="11.75" refX="11.75" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(6.25) "/>
-		</marker>
-		<marker id="mrkr4-239" class="st11" v:arrowType="4" v:arrowSize="2" v:setback="12.5" refX="-12.5" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-6.25,-6.25) "/>
-		</marker>
-		<marker id="mrkr13-252" class="st11" v:arrowType="13" v:arrowSize="2" v:setback="18" refX="18" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend13" transform="scale(6.25) "/>
-		</marker>
-		<marker id="mrkr4-283" class="st35" v:arrowType="4" v:arrowSize="2" v:setback="7.04" refX="-7.04" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-3.52,-3.52) "/>
-		</marker>
-		<marker id="mrkr4-292" class="st37" v:arrowType="4" v:arrowSize="2" v:setback="7.04" refX="-7.04" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-3.52,-3.52) "/>
-		</marker>
-		<marker id="mrkr4-302" class="st39" v:arrowType="4" v:arrowSize="2" v:setback="11.36" refX="11.36" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(6.04) "/>
-		</marker>
-		<marker id="mrkr4-304" class="st39" v:arrowType="4" v:arrowSize="2" v:setback="12.08" refX="-12.08" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-6.04,-6.04) "/>
-		</marker>
-		<marker id="mrkr4-321" class="st41" v:arrowType="4" v:arrowSize="2" v:setback="7.04" refX="-7.04" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-3.52,-3.52) "/>
-		</marker>
-		<marker id="mrkr4-338" class="st44" v:arrowType="4" v:arrowSize="2" v:setback="12.08" refX="-12.08" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-6.04,-6.04) "/>
-		</marker>
-		<g id="lend5">
-			<path d="M 2 1 L 0 0 L 1.98117 -0.993387 C 1.67173 -0.364515 1.67301 0.372641 1.98465 1.00043 " style="stroke:none"/>
-		</g>
-		<marker id="mrkr5-386" class="st11" v:arrowType="5" v:arrowSize="2" v:setback="10.9375" refX="-10.9375" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend5" transform="scale(-6.25,-6.25) "/>
-		</marker>
-	</defs>
-	<g v:mID="0" v:index="1" v:groupContext="foregroundPage">
-		<v:userDefs>
-			<v:ud v:nameU="msvThemeOrder" v:val="VT0(0):26"/>
-		</v:userDefs>
-		<title>Top Process</title>
-		<v:pageProperties v:drawingScale="0.0393701" v:pageScale="0.0393701" v:drawingUnits="24" v:shadowOffsetX="8.50394"
-				v:shadowOffsetY="-8.50394" v:shadowType="1"/>
-		<v:layer v:name="Connector" v:index="0"/>
-		<g id="shape75-1" v:mID="75" v:groupContext="shape" transform="translate(877.435,-18.5)">
-			<title>Sheet.75</title>
-			<desc>dynamic logical network</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="2"/>
-			<v:textRect cx="158.516" cy="667.858" width="317.04" height="323.299"/>
-			<rect x="0" y="506.209" width="317.033" height="323.299" class="st1"/>
-			<text x="99.25" y="821.91" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>dynamic logical network</text>		</g>
-		<g id="shape74-4" v:mID="74" v:groupContext="shape" transform="translate(921.148,-61.0197)">
-			<title>Process.74</title>
-			<desc>Container</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="2"/>
-			<v:textRect cx="114.803" cy="718.779" width="229.61" height="221.457"/>
-			<rect x="0" y="608.051" width="229.606" height="221.457" rx="9" ry="9" class="st3"/>
-			<text x="94.8" y="822.51" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Container</text>		</g>
-		<g id="shape60-7" v:mID="60" v:groupContext="shape" transform="translate(761.438,-80.8622)">
-			<title>Sheet.60</title>
-			<desc>Container Network (bridge)</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
-			<v:textRect cx="169.855" cy="667.858" width="339.71" height="323.299"/>
-			<rect x="0" y="506.209" width="339.71" height="323.299" class="st5"/>
-			<text x="124.71" y="521.01" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Container Network<v:newlineChar/><tspan
-						x="150.63" dy="1.2em" class="st6">(</tspan>bridge)</text>		</g>
-		<g id="shape53-11" v:mID="53" v:groupContext="shape" transform="translate(19.2395,-263.921)">
-			<title>Sheet.53</title>
-			<desc>Client Network</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
-			<v:textRect cx="235.276" cy="726.326" width="470.56" height="206.362"/>
-			<rect x="0" y="623.145" width="470.551" height="206.362" class="st7"/>
-			<text x="393.36" y="637.95" class="st2" v:langID="1033"><v:paragraph v:horizAlign="2"/><v:tabList/>Client Network</text>		</g>
-		<g id="shape49-14" v:mID="49" v:groupContext="shape" transform="translate(18.5,-479.354)">
-			<title>Sheet.49</title>
-			<rect x="0" y="497.854" width="1109.76" height="331.654" class="st8"/>
-		</g>
-		<g id="shape1-16" v:mID="1" v:groupContext="shape" transform="translate(252.134,-451.877)">
-			<title>Process</title>
-			<desc>Validating proxy (stateless other than encryption key)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="54.5669" cy="712.127" width="109.14" height="234.761"/>
-			<rect x="0" y="594.747" width="109.134" height="234.761" rx="9" ry="9" class="st9"/>
-			<text x="21.65" y="703.13" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Validating proxy<v:newlineChar/><tspan
-						x="12.56" dy="1.2em" class="st6">(</tspan>stateless other than <tspan x="22.95" dy="1.2em" class="st6">encryption key</tspan>)</text>		</g>
-		<g id="shape2-21" v:mID="2" v:groupContext="shape" transform="translate(44.6457,-408.73)">
-			<title>Process.2</title>
-			<desc>docker-machine (user)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="54.5669" cy="805.73" width="109.14" height="47.5551"/>
-			<rect x="0" y="781.952" width="109.134" height="47.5551" rx="9" ry="9" class="st9"/>
-			<text x="21.76" y="802.73" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker-machine<v:newlineChar/><tspan
-						x="42.72" dy="1.2em" class="st6">(</tspan>user)</text>		</g>
-		<g id="shape3-25" v:mID="3" v:groupContext="shape" transform="translate(153.78,-437.356)">
-			<title>Data Flow</title>
-			<desc>Token blob</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="117.21" cy="829.507" width="46.02" height="17.6036"/>
-			<path d="M0 829.51 L152.92 829.51 L152.92 823.99" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="99.1062" y="824.708" width="36.2068" height="9.59985" class="st12"/>
-			<text x="99.11" y="831.91" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Token blob</text>		</g>
-		<g id="shape4-35" v:mID="4" v:groupContext="shape" transform="translate(46.1686,-702.582)">
-			<title>Process.4</title>
-			<desc>docker-machine (viadmin)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="54.5669" cy="778.13" width="109.14" height="102.756"/>
-			<rect x="0" y="726.752" width="109.134" height="102.756" rx="9" ry="9" class="st14"/>
-			<text x="21.76" y="775.13" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker-machine<v:newlineChar/><tspan
-						x="35.34" dy="1.2em" class="st6">(</tspan>viadmin)</text>		</g>
-		<g id="shape5-39" v:mID="5" v:groupContext="shape" transform="translate(479.273,-583.881)">
-			<title>Interface</title>
-			<desc>VMOMI SDK (vCenter)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="207.936" cy="718.779" width="415.88" height="221.457"/>
-			<rect x="0" y="608.051" width="415.872" height="221.457" class="st15"/>
-			<text x="182.88" y="715.78" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>VMOMI SDK<v:newlineChar/><tspan
-						x="188.96" dy="1.2em" class="st6">(</tspan>vCenter)</text>		</g>
-		<g id="shape6-43" v:mID="6" v:groupContext="shape" transform="translate(155.302,-786.913)">
-			<title>Data Flow.6</title>
-			<desc>Admin credentials – direct VCH creation</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="161.985" cy="836.594" width="139.54" height="17.6036"/>
-			<path d="M0 836.59 L314.97 836.59" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="97.1248" y="831.794" width="129.721" height="9.59985" class="st12"/>
-			<text x="97.12" y="838.99" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Admin credentials – direct VCH creation</text>		</g>
-		<g id="shape7-51" v:mID="7" v:groupContext="shape" transform="translate(360.85,-541.417)">
-			<title>Data Flow.7</title>
-			<desc>Token credentials creation request</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="60.9449" cy="796.445" width="67.41" height="27.2035"/>
-			<path d="M0 829.51 L60.94 829.51 L60.94 763.74 L109.77 763.74" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="32.1465" y="786.846" width="57.5969" height="19.1997" class="st12"/>
-			<text x="32.15" y="794.05" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Token credentials<v:newlineChar/><tspan
-						x="34.1" dy="1.2em" class="st6">creation request</tspan></text>		</g>
-		<g id="shape13-60" v:mID="13" v:groupContext="shape" transform="translate(155.302,-722.537)">
-			<title>Data Flow.13</title>
-			<desc>Admin credentials</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="87.2146" cy="829.507" width="68.74" height="17.6036"/>
-			<path d="M0 829.51 L150.27 829.51 L150.27 856.41" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="57.7543" y="824.708" width="58.9208" height="9.59985" class="st12"/>
-			<text x="57.75" y="831.91" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Admin credentials</text>		</g>
-		<g id="shape14-68" v:mID="14" v:groupContext="shape" transform="translate(333.985,-686.637)">
-			<title>Data Flow.14</title>
-			<desc>Create restricted token</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="61.427" cy="795.846" width="85.13" height="17.6036"/>
-			<path d="M0 829.51 L0 795.85 L133.2 795.85" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="23.7713" y="791.046" width="75.3116" height="9.59985" class="st12"/>
-			<text x="23.77" y="798.25" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Create restricted token</text>		</g>
-		<g id="shape15-76" v:mID="15" v:groupContext="shape" transform="translate(92.8875,-702.582)">
-			<title>Data Flow.15</title>
-			<desc>Pass token for self-provisioning</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="7.08661" cy="952.656" width="111.32" height="17.6036"/>
-			<path d="M7.09 829.51 L7.09 1066.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-43.6649" y="947.856" width="101.503" height="9.59985" class="st12"/>
-			<text x="-43.66" y="955.06" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Pass token for self-provisioning</text>		</g>
-		<g id="shape16-84" v:mID="16" v:groupContext="shape" transform="translate(469.575,-115.102)">
-			<title>Interface.16</title>
-			<desc>Virtual Container Host</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="2"/>
-			<v:textRect cx="158.516" cy="663.681" width="317.04" height="331.654"/>
-			<rect x="0" y="497.854" width="317.033" height="331.654" class="st3"/>
-			<text x="4" y="822.51" class="st4" v:langID="1033"><v:paragraph/><v:tabList/>Virtual Container Host</text>		</g>
-		<g id="shape17-87" v:mID="17" v:groupContext="shape" transform="translate(488.976,-147.402)">
-			<title>Process.17</title>
-			<desc>Docker API</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="35.4331" cy="738.879" width="70.87" height="181.257"/>
-			<rect x="0" y="648.251" width="70.8661" height="181.257" rx="9" ry="9" class="st9"/>
-			<text x="13.24" y="741.88" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Docker API</text>		</g>
-		<g id="shape19-90" v:mID="19" v:groupContext="shape" transform="translate(488.976,-331.299)">
-			<title>Process.19</title>
-			<desc>vicadmin</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="35.4331" cy="778.13" width="70.87" height="102.756"/>
-			<rect x="0" y="726.752" width="70.8661" height="102.756" rx="9" ry="9" class="st14"/>
-			<text x="17.12" y="781.13" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vicadmin</text>		</g>
-		<g id="shape20-93" v:mID="20" v:groupContext="shape" transform="translate(46.1686,-271.007)">
-			<title>Process.20</title>
-			<desc>Docker Client</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="54.5669" cy="767.854" width="109.14" height="123.307"/>
-			<rect x="0" y="706.2" width="109.134" height="123.307" rx="9" ry="9" class="st16"/>
-			<text x="27.35" y="770.85" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Docker Client</text>		</g>
-		<g id="shape21-96" v:mID="21" v:groupContext="shape" transform="translate(155.302,-292.746)">
-			<title>Data Flow.21</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 822.42 L324.67 822.42" class="st10"/>
-		</g>
-		<g id="shape22-102" v:mID="22" v:groupContext="shape" transform="translate(566.326,-499.728)">
-			<title>Interface.22</title>
-			<desc>ESX</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
-			<v:textRect cx="250.583" cy="794.074" width="501.17" height="70.8661"/>
-			<rect x="0" y="758.641" width="501.165" height="70.8661" class="st15"/>
-			<text x="243.25" y="771.64" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>ESX</text>		</g>
-		<g id="shape23-105" v:mID="23" v:groupContext="shape" transform="translate(620.254,-413.56)">
-			<title>Interface.23</title>
-			<desc>vmomi gateway</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="63.0709" cy="815.334" width="126.15" height="28.3465"/>
-			<rect x="0" y="801.161" width="126.142" height="28.3465" class="st9"/>
-			<text x="30.77" y="818.33" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vmomi gateway</text>		</g>
-		<g id="shape24-108" v:mID="24" v:groupContext="shape" transform="translate(618.837,-507.7)">
-			<title>Process.24</title>
-			<desc>vmomi authenticating proxy</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="63.0709" cy="811.791" width="126.15" height="35.4331"/>
-			<rect x="0" y="794.074" width="126.142" height="35.4331" rx="9" ry="9" class="st9"/>
-			<text x="5.77" y="814.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vmomi authenticating proxy</text>		</g>
-		<g id="shape26-111" v:mID="26" v:groupContext="shape" transform="translate(677.272,-507.7)">
-			<title>Data Flow.26</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 835.15 L7.09 835.51 L7.09 889.3" class="st17"/>
-		</g>
-		<g id="shape28-121" v:mID="28" v:groupContext="shape" transform="translate(681.057,-548.094)">
-			<title>Interface.28</title>
-			<desc>hostd</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="29.9055" cy="820.295" width="59.82" height="18.4252"/>
-			<rect x="0" y="811.082" width="59.811" height="18.4252" class="st15"/>
-			<text x="18.38" y="823.29" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>hostd</text>		</g>
-		<g id="shape33-124" v:mID="33" v:groupContext="shape" transform="translate(750.01,-525.417)">
-			<title>Data Flow.33</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M-5.03 829.51 L14.81 829.51 L14.81 797.62 L-0.14 797.62" class="st19"/>
-		</g>
-		<g id="shape76-131" v:mID="76" v:groupContext="shape" transform="translate(851.699,-87.5945)">
-			<title>Process.76</title>
-			<desc>Container</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="2"/>
-			<v:textRect cx="114.803" cy="718.779" width="229.61" height="221.457"/>
-			<rect x="0" y="608.051" width="229.606" height="221.457" rx="9" ry="9" class="st3"/>
-			<text x="94.8" y="822.51" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Container</text>		</g>
-		<g id="shape39-134" v:mID="39" v:groupContext="shape" transform="translate(589.606,-255.118)">
-			<title>Interface.39</title>
-			<desc>Port Layer</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
-			<v:textRect cx="90.7087" cy="760.916" width="181.42" height="137.182"/>
-			<path d="M0 829.51 L181.42 829.51 L181.42 692.33 L0 692.33 L0 829.51 Z" class="st21"/>
-			<text x="69.95" y="705.33" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Port Layer</text>		</g>
-		<g id="shape41-137" v:mID="41" v:groupContext="shape" transform="translate(575.872,-141.732)">
-			<title>Process.41</title>
-			<desc>imagec</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="58.0754" cy="800.47" width="116.16" height="58.0754"/>
-			<rect x="0" y="771.432" width="116.151" height="58.0754" rx="9" ry="9" class="st9"/>
-			<text x="43.58" y="803.47" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>imagec</text>		</g>
-		<g id="shape42-140" v:mID="42" v:groupContext="shape" transform="translate(559.843,-166.518)">
-			<title>Data Flow.42</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 822.42 L7.03 822.42" class="st19"/>
-		</g>
-		<g id="shape43-146" v:mID="43" v:groupContext="shape" transform="translate(651.896,-199.808)">
-			<title>Data Flow.43</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 829.51 L7.09 722.03" class="st19"/>
-		</g>
-		<g id="shape44-152" v:mID="44" v:groupContext="shape" transform="translate(676.238,-392.3)">
-			<title>Data Flow.44</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 829.51 L7.09 817.25" class="st19"/>
-		</g>
-		<g id="shape45-158" v:mID="45" v:groupContext="shape" transform="translate(644.882,-543.133)">
-			<title>Data Flow.45</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 829.51 L7.09 797.76" class="st10"/>
-		</g>
-		<g id="shape46-164" v:mID="46" v:groupContext="shape" transform="translate(913.57,-507.7)">
-			<title>Process.46</title>
-			<desc>NSX authenticating proxy</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="58.0754" cy="811.791" width="116.16" height="35.4331"/>
-			<rect x="0" y="794.074" width="116.151" height="35.4331" rx="9" ry="9" class="st9"/>
-			<text x="6.69" y="814.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>NSX authenticating proxy</text>		</g>
-		<g id="shape51-167" v:mID="51" v:groupContext="shape" transform="translate(559.843,-416.721)">
-			<title>Data Flow.51</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 822.42 L51.41 822.42" class="st19"/>
-		</g>
-		<g id="shape52-173" v:mID="52" v:groupContext="shape" transform="translate(963.176,-769.905)">
-			<title>Sheet.52</title>
-			<desc>Management Network</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="76.8189" cy="811.791" width="153.64" height="35.4331"/>
-			<rect x="0" y="794.074" width="153.638" height="35.4331" class="st22"/>
-			<text x="21.54" y="815.39" class="st23" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Management Network</text>		</g>
-		<g id="shape54-176" v:mID="54" v:groupContext="shape" transform="translate(153.78,-428.74)">
-			<title>Data Flow.54</title>
-			<desc>validate install/collect logs</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="214.828" cy="837.025" width="97.76" height="17.6036"/>
-			<path d="M0 835.06 L326.2 838.04" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="170.857" y="832.225" width="87.9436" height="9.59985" class="st12"/>
-			<text x="172.67" y="839.43" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>validate install/collect logs</text>		</g>
-		<g id="shape55-184" v:mID="55" v:groupContext="shape" transform="translate(230.063,-25.8106)">
-			<title>Sheet.55</title>
-			<rect v:rectContext="foreign" x="0" y="677.497" width="152.011" height="152.011" class="st22"/>
-			<image x="0" y="677.497" width="152.011" height="152.011" preserveAspectRatio="none" xlink:href="data:image/png;base64,
-						iVBORw0KGgoAAAANSUhEUgAAAwAAAAMACAYAAACTgQCOAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7D
-						AcdvqGQAAP+lSURBVHhe7P0HdF1HmucJbnV3tZ/p6Z7Z7T5tdqZnu2d7+8xsz5manZmdsz2dNZkpkFJmVmVmKU1VZlYqpaQEQD6V8gSe
-						RMqTovfee0/QgQ4AAYIACJAAYQmAoAO9p0TZ/Pb7fxFxb9z74j4DQ5FSfOf8zwNAEgTeu+/e3y/ii7j/F1++fPny5cuXL1++fPny5cuX
-						L1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny
-						5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++
-						fPny5cuXL1++fPny5cuXL1++fPny5cuXL1++fPny5cuXr7tQ3/p16u8+VPjyP36g6LV/9VBh6r8tKE79TwVPpP6XgsLUd+yMLCr5/ojC
-						kodN+POfIrGvfT/+7+R78ffE91b/x8v/GP+n/u99+fLly5cvX758+fKVTz38cOpvf++J1/5FwVOj/8OIJ0sKRhamRo0oLvn9yMLSt0YU
-						p6aOKCpdwh9vGVGUquSPj44sLj3JH1/l3OTP6asNfobUVfUzlR5VP2NqM3+8BD97QVFqrPpd+Hfi3w2/43efTP1z/M761/fly5cvX758
-						+fLl6+tRI5966u/IiHzh6P9YUJj6y5FFqRdGFJfOYkDeOKIwdYAhuZM/vh7C9DcrBUWl1/j378BzwR9vwHOD5wjPFZ4zPHd4DvXT6cuX
-						L1++fPny5cvXV1t/MmrUH3/38df/bUFRagTnyZFFpTMwUs8w28SAeyEOvD4DzgU8p/LcFqamFxSWFOvn/N/gNdAvhy9fvnz58uXLly9f
-						gy+0qjz45Oj/YURR6kcjClPPM4xO4+zk9HA+57iA1efu5XN+Xbo5O/hjfm1KnhtRXPLDB55I/fe+zciXL1++fPny5ctXYo186pX/qyx4
-						LSp5RrXplJYz9PdboOlzX0ZeQ34tSydhHQJeY7zW+mX35cuXL1++fPny9U0o7GLDoP+nMlpcmFrMkHiM80UUHH2+vkl9MbKotKWgqHTR
-						yOLUsyOeTH3rz59N/Rf68PDly5cvX758+fJ1P9e3i1/5Lxnyf8CwXyoLTYtKT6QDoY8PkurlrB9ZmCrBMYNjRx9Gvnz58uXLly9fvu7F
-						kn794tH/64ji1NMMcksZ6o6nQ56PT+4ZWZTqwrE0srDkKdwPwa8r8OXLly9fvnz5+grrwaLUP5MbWRWVTiooStUyqH0SBzgfn6GNHGMH
-						WQwmFhSnfvLtZ179p/pw9OXLly9fvnz58jXU9cCTr/9rBq9fMYTNZQjrjIKZj89XlnYW0NkFxSW/fLD4tf9aH66+fPny5cuXL1++8i3c
-						CGpEUcnjup3ndAy6fHzuyei7Ii/BrkOQVn04+/Lly5cvX758+YpXwaOpfzKyKPUXDPwzGaCwz74TsHx87rMcx03iCp4s+TF2oNKHuy9f
-						vnz58uXL1zevRj711N8Z+UTq/xxRnHqbob+OQenLGDj5+HzNkvpiRHHpoZGFpW9h+1G8B/TbwZcvX758+fLl6+tZWLg7oqjkUYahdZxb
-						UTjy8fmmJXVzZGFqbUFhySN+QbEvX758+fLl6+tSf/Tgk6n/GfvwM/DUM/D8IR2CfHx8OF+q2YFUyQOFo/8E7x31FvLly5cvX758+brH
-						C3uljywsGTmisHQOQ825GOT4DEMKnhzDGUsPPPMuPfS7cfRnL0+hh0fPoJ+Uzg5Tgsc5kodL5tBPR8+WPPz6LPrJazMlD788jX7y8tQg
-						P3phMn3/2XH8f7xN33l8LH33t2+oPFai8mgJPTCqlL+mgo8fGIWvcR7nj3UKnuBHHXxcUOj+PXwiOYvdhUY8WVLg7z/gy5cvX758+brn
-						6uHnnvt7I4pLfjhCduxJXXfAjE+GAOBHPPce/cXrM+hX7y6mwinr6Xdzyuj1xeX0zspKmrShhmaX1dHS8iZaV9FC22rbqbyhk/Y3Hqfq
-						oz3U0H6SjnSepPbefuroOcM5K+nsHVzU98H3O0Pt3WeosbWXGlq6qfpwO+0/1ELl1UeobH8DrdleTYs37qOZK3bShAWbaez01fTq+CX0
-						zJi5NOq1afSzZz6g748aQ3/6V6/Tf/r5q2H+8lX61l8hr9G3fvE6/ekvX6P/81ev0Z/+6nX69l9zHhlN3/4NUsLiUOJ87r4JKSgqvTai
-						MLW4oLjkz/Be0287X758+fLly5evu1sjn0r95yOKSn7OgLKGof92HFp8OMVv0APPvEc/Gj2LHhm/ip6fs43eXVVJs7bV07I9R2nrQQbp
-						IwD4U9R+4hx1nOinToThu4thPjH8d+6N8M+JyM/rjpIJJRFt3aeovvm4yMOWPXW0bFMFzVi2ncZMXcWyMId+8fyHNPLRN+j/+PkraflP
-						f/UKjfgGS4AVrJ1ZhZvgfaso9Q/129GXL1++fPny5Wt4Skb6C0seLigq3cDQ/42/825B8ZtU8Pw4+vnYBfT0jE00ZsU+mrb5IC3b3URl
-						te1U09xLxzCKzrBsj6wHYXgergRwPsi4vveQJf586BmHls4+qqpvpS1762nJxn00edFWKp20nArHzqOfvDmPRjz/gciV6zX5huUOFhHz
-						e/FH3/p16u/qt6kvX758+fLly9fg6uGHH/6b6EMeUZxayMBxIwYg34g88NTb9OPS2fTU1A30zqoKmre9gTZXt1J1ywlqY3DtcMFsHHat
-						dPUh/enBnw04+Pd3I67/O7e4nosg8ecvyJlIOk5fpuaz16mi6yKtO3ySZu05Rm+tqaEifm3+7NUZ8lq5XsOvf1LXRxan5hcUpr6D96x+
-						+/ry5cuXL1++fOVeIwtT/xtD/+SRRanzbuD4+uWhZ9+hX7+7iH4/ewtNWFtJK/c20f7GLmrpZvCMQKlu1ckxcYg+zrCvck7SfTIa9fX0
-						f5cWIw5fVVw/U9a45SBI5Hm2oyWAv0f7uZuO3JA0n7lOe9vP0/Ka4zR+cx39fu42+qux82nk098kMUj18/t2YsETqf9Fv519+fLly5cv
-						X77c9b0nXvsXIwpLXmF46HKDxdckxSkqeOZ9+tWYBfTanC00c+MB2lLVTI3tfdQuoOkC0OTE+94jSQNglYgARCTgPPUgp9Qj/izt38YS
-						//N7L3gewjhnAOLh5y4aaxbg7LUY/LvTxkJgcujEFdpwuI+m7DhCLy4sp5+PWUgPPPOOHAvOY+Rrk1THyMKSl777ZOqf67e5L1++fPny
-						5eubXnJH3qLUXzAslDEsfJEOEPd5GPAefG48jXpvGY1ZsIMWbKmmXdXN1Nxx0oLL7HHCPeIE3uyBAAj4c3oQhn+V89SLsACYnDh1Qb6m
-						ZgfUv80lzlH74Yzj90wPnrPc4hQD5PRl6jh/S9IuYeA3cYiAHVsKGk9do61Hz9DsPa2UWllJj45fSSOefe9rKgV4b6e2cn7ktxX15cuX
-						L1++vqFV8NTo/8BgMImB4HI6LNy/wcLcX5TModdnb6b5m6tpd20rtR4/7YR6V4YK8uOj9PF0n0TUqL+A/ykTDf6nw5w4fYFOnLmowh9D
-						EszsQTCDkGPsfzdcccpBUhjo887pi9TJ4G/HCEGHLQN2HDJgx0hB8+nrtL35LM3c3UwvL9xFD5fOVtu0Oo61+zepiwWFpRMefHL0/6BP
-						B758+fLly5evr2s98MIL/6CgOPXYyKJUgxsM7sM8/Q499vZiem/xDtqwp4EajvWovesZ3F1xQX8QBnNXXICfMS7QtQJINu0+JtLyI7nA
-						AqDDsI+IADD0QgD6rODvxOE7/+DnGd64noMgrucvlsjoP16nU5ciwO+KC/JN2jKl384NauUc7L1Mq2p7aOzaA/Sr95ZRwdPvuo/F+zKp
-						upHFqd98f1Tq7+vThC9fvnz58uXr61APPJn6d3yxnyQ3FHJCwP2SFBU8+Q4VvbuEPly8nbbsbaCj7ScY7N3Anwb4dgQsBwH6LpjVcYN2
-						NDIibwtAIAEW/J9ROSFhATjL4M85GeSSPEIQzGzC0MbMVGTP8aTI8xGN6zlzPsdJOXOZOi/cUmEJCGcB8pcBE6cMmGgZMGnou0rr6vvo
-						3Q219NuJq2nE8+87jtX7LamrmBUYUfj6/1OfNnz58uXLly9f91v9yahRf4w9+/nCvpfzB/dF/94OAwk9UPg2PTZmAY1ftJ227mPg7+ij
-						dtyZ1oq5W21aGPRzFgI71oizE0DziAuAkW6EAdnAtt0GlOsMQJ8IQBgRASMXwxCXyOQW93PgzlmJs/VHp/PsVepg+FdhyDdxwL8dF/hn
-						imkLajXRMwLxNJ5iIWg4SW+tr6VffbCcHnjqHefxfH8E54rU7oInS378rVTqb+nTiS9fvnz58uXrXq4Hi1L/jC/gKU6/+wJ/DwfA//gb
-						9MvXZtDbszbSup0HqamtNzfYRxje8wZ+AKWApRvgs8UNsUkJoVigWuA/nAEIF/4y8CMG/s9c0MCvEs4AcPov0alYhm9GIMeY3y8W+/d3
-						x/Wc2YEc9FMnw3wwAxAJg36OMmDiAv/0KBEI4pAAO4dOXKblB7sptXI//XzMPFmX4jze7/2cHVFUUvrtZ179p/r04suXL1++fPm6l+qB
-						wtF/MqIwtXhEcemnjgv5PZuCx0vpe0++Ry9NWEFLNlZQ7ZGuCPAnQj/D+92E/XQYdcUFtSpxGA5H/FXrT3ThbxT+AwHQEpBRAM5dotPn
-						LsvH+F5ROA9bjtyx/+5dSux5SX/uos9xF4uRG/5dgSi4wT9T3BKgEhcBE5cImFR0XaB5+1rpuTll9ODvxjvfB/d2Up8UFJUuKihO/U/q
-						bOPLly9fvnz5+srq4eee+3sjC1Oj+ALd6L5w33thkGDof4N+8epMenfuJmnraek8SW09pxn27UQloJ0BHomDf1IM7Kuk9/vHE8A+IDNj
-						sMuNSjqs6jDY5pJuFoDuRAFAb79q+wlbfy5J20+k9acfsG+F4R8CcPr8FQkEoQczAvz9BxSnKNjh3yFT+PnIF/IzpevsVYb6246kC0C4
-						UNiOG/oR5+5BEnWTschMAIN9UuICcMxKk7QL9dGYtTX00zEL78cdhg7jnPOtX6f+rj4N+fLly5cvX77uRsluPkWpF0cWl550XKDvuRQ8
-						nqIHHn+THn9zDs1YsYP2HzomwD+U0D/0sD80oJ8OxSE8m0W/kYW/iIZ+s/DXLP4V+GegRwD2Khb065w5j1yJBLJgZhsGE6ckBOHfzxXn
-						8xALP5/JkqAFgJ+zLgb7LgZ+JFcRiGfgUsASYMlAvkJgi8Cx/ut07Ox12nmsnz7c2kC/Gb+KRjz9lvP9c28m1TeyKPWC3z3Ily9fvnz5
-						Gub6dvEr/yV6cvkCfCn9gnzvZCSnYBQ/Pv4WPfv2Alq4bh/VNR93AH8M+hnkhxr4hwT2GVAzJQqzDMJJiQFzz2mEBUCDv93yE4z6B/CP
-						lp8Q/MO2n3QBwL/H98PvZn5+/Gz4/FjXKVlInUvautVdkV0ikDnhgmY7OcuAK/g9zl2j4wz5iJEAV/KRASRdCJBsQhAVgYgQMOBnSlQG
-						WAS0DFQdv0gzd7dQ4ZR1NPLZt53vrXsvqYsFRSWjCx5N/RN9mvLly5cvX758DUXJNp73eH+/7NjzW/541Fv0u/cW09JNFdRwrJsh8nQs
-						ZyQR8Oe4+/xNGPSzRQtB+q4xDPgJsVtLksPgqRMZpXZBaoaEd/o10W0/1ug/IBk3LcPzVnv0OFUf7qD9h1qpvLqZtlc00eY99bR+Zy2t
-						2lZNy7dU0RJ+jhes20vz1+6luWt206yV5TRrxS6azY9zVnFW7+av7+E/3yN/b+H6fbSIM23pdho7fS2NmbbGmTenrk7LWzPW0buz19O4
-						eZtowoItNHXJdpq5YifN5++P13pVWTVtKD9EZfsP8897lCr45z5wuF3Er6XrpHoe+PdNF6P058qV46cv0vGLt4J0mTDA55oA+F1xSoC5
-						0zDHsR7ATjAT4IiZAQhznVoZ+O1AAOzUdF+iOfva6KmZW2nkfbHNaOoTOUf5bUR9+fLly5evwdUDT6T+e7moFqU+c190v9oA+r/7GH/8
-						2zH08gdLBAIb23pjwB9CfxtDfa7AnxX6Ge7zAX433MczONCPA74J/v8j7X1U09RJu2uaaROD/NodB2np5kqax3AOIP+QofrdWRvovdkb
-						6f05G2nc3E00ft5m+nA+h/9s4sKtNGnRVpq8eBtNWbKNpvK/mbZsB01bvoOmL99JMxjGZ67cRbMC8N9N8wT+94bwv2G/BIut8fk4/v4Q
-						gWwZM53FIClGHKa6Y0vE+3M20ORFZfzzlYu8rNleI1KD5+QgPzfNHX3yOjgF4fzNiAAkJV8xcEqBJQDxBDMADgkwcUmASTYRcMlAXe9l
-						WlzVTs/O3EQPPXuPbzGqBikWjHw89e/1acyXL1++fPnylUs9UJT63xn6t3Luvf37NfQ/8Oib9MzYeQKTja09MeAfGPQ7Qd+E4X5ogX8g
-						sK+g1IZ7BF9r7jxJNY2dtLPqCK3dWSuADUh/f+5GehOj6jpjBKgZrGeso7dmrqO3Z67X4L9BwP8DBn+A+Yfzt8hIO8BfwX+Zhv/tCv6X
-						MvizAMxg+J+5gsGf4X824J8zj+EfI/Nm5B+j/osZ/BG8XhixX8bysXxzFc3kf/8O/wxv88+TS96asTY5ljREBMJIgmS1xBYD5I0pqyQi
-						CvxcQIrQOoatYHcdaqea3qvU0g8JuO2IWwZMcpECIwIRIXAIQJhYS5BDBExcImASiECOMnCw5xLN3t1CRZPX0INPjXW/R++NfMkysOnB
-						4tH/qz6t+fLly5cvX75cNbKo5Pt84ayOXUi/8mCk/zu/LaVvP1JKj4+eSfNW76ZDR7piwJ8v9A90lH+IgD8N7k3C0ec46Hf29lNdc7e0
-						uKzZUUPzGa4nLS4TmHdBvoB+LGilQQD+78xCNtC7DLzvafgfP38zZ4uM+k8A/Av4l0VG/acvB/jv0OAP6N+t4N+M/GvwD0f+WQA2Mvwz
-						+Afwv6WKVmzllB2QP8P/q36e3PO2CIwjWhYi4oDf3crYtJkEJQZjWACQUA7WUOmGo1S6tZ1KOG9u66QP9/TQnOqTtPrwWdrVfpEO9V0V
-						KM9HDJKkIC4CkjT4t+NYI+CQABOXBJgEIpCDDLRwKjov0LSdR+g341bQiKfu4d2EClMHCgpT39GnOV++fPny5csXCiP+I4tSu5wXz68w
-						3x3F4P+bUvr58x/S5EVbqbK+LYB9A/hIHPqRwUB/FPjd0O+GfDu5AL8b9vH74H4EOw8codXba2gugzUA2YZ8G/RdgO8KoN/Oe3MU+GOW
-						4IN5quUHo/4TFuhRfwb/aMvPdjXqz+Bv2n1mrw57/QH+kJIF6/YFLT+A+8UM/Us2VUrL0TIG/+VbDzD8H6CVZdWyngC/I4LviZ8nCMQk
-						h7zLMuCKiAJER8cpBtYMAqTAjswYLCqnN8o6KGWldKsKhCBMB71ffpzFoI/F4AztbLtAB09cFSDPRQpcQuASAZNsIhDIAOIQAcQlARJb
-						BLLIAEQA2XXsLL23vpp+WjqDRhannO/nrzoFRaltfkbAly9fvnx94+ueHPHHaP+jJfTQqLcZytbQzqom2Tmm7biKDfkqLAMQgiDRP+/o
-						Yei3w5Bvx4zyR5P/Tj4G+IMw4Cfv1KOCrx9u7ZERfYAw2mkwGo9RZ0kM9G3YdwE+YgO+PVqONp9IAM8C/5sU/DP4m1F/REb9Gf6x2Bbt
-						MGbkP2j3wcg/wJ9jev2l35/Bf+EGhv8A/Cs0+Fcy+DP8y8j/AVmvYeAfvfhYk7BuZy0LQ4XIDmYj7KA9KVOUzDhiRIF/ZyRNEowcBLMH
-						a4Pg+RyzuUVG/d/c1hEEQmAiQmBJgS0Go7eovLOzi2ZVnaCVDSwGrReo/uQ1BnyWAdk1KAr9SUmWgZsSJ/jHI9Bvpd8OwN+0BMVag6zY
-						swB2Ws4g1+jo6au0uekkvbZ4N33/hQ/c7/GvOoV+RsCXL1++fH0DS3r8i0v3OC+OX0HUYt4S+u5vUvTb16bRgrW7qR7bdmroN+Avo/gB
-						2Jto8Ndfd0J/DPxzhn4H6JsMBPjxs1UfbqdNu+ukVSYT7Gcb1XeBfhzw7dgj6waaAdZhv3/Y6y8j/9aoPxb6hr3+5dLuM3vV7mDkX0b9
-						17vbfWz4V6P+DP8Afw7Afw2DP+B/LcM/BAA7+UAKMPOAn80d/NzufIDZjFhsUUDs2QNbDpB3Zq0Ls2w/jd3RqbK9k8boKCEwiYpBIASB
-						GLRL4lLw9o4umnOgjzYe7afqnisM57cGKQRKBLLKAIN/OANgJSYCA5YBlgCIAHLg+AWavusI/eaD5fTgvdkitNPPCPjy5cuXr699FRSO
-						/o8Y/XJcCL+SPPA4+vpL6AeFb9Nb09dQefWRCPSbVh8F7tgTniOAb4X/LBfwzwb9eY/yM9BnAn58reFYj8xgoOcdUI1e82zAnwn2s4G+
-						C/KRyGg6IFlnnOzwszUC/2j3ibT8mFF/Dkb9Af8Y9Z+72m75sXb5wcj/RjXyj99b4H9LlYD/Sob+VdtUu4+A/86DtG5XLa3fdUjAH9lY
-						XieChOD/gpwkRa1XSI9LDOL5AM+LFfv5Eingx3e2M6jv7KK3TFgEJCwBEAKTdDFgGdAJ2oYkSgYCIdAygODjCXu7aWndadrReoEaTqp7
-						Drjg35VQBkIRiMtARAi0BLhlIJSAXGQgXQKQUASaT1+jLUdOU8ny/fRnL090ngu+4pQ/+GTqf1ZnSV++fPny5etrUg8Wpf5HXORiF72v
-						LN/9LcP/b96g4tJZDIeVsotPa9cpamXoxz70CPrgOxngESMAwQyAfBzCvREAJQE65u/H/q7d6+9KIAIZZCDe549AVrBn/prtB2X0WgB/
-						mGDfBfqJkB8bPbdBOQD/hWWyPSZG/acw+NuLfe0dfmYz+GPUX7X86L391zH4W/3+apcfvch3S6zXn+HfbvdBBP45GzX0Y1vOLXsbJFv3
-						NYhQmLakpKB1KS38+8Vj/+5IRAr4ebPz/qpKendXlwrDvwmEIJCCHToM/9mkIC4ESgpYBmwp0DLwug7aiSbt66EVDWdo//FLDOou4I8l
-						oS0oCAO+SboEMOxbaUXi8H9W5ViQGPyfDcE/nmZO/YkrtLiqg56YhF2E7rlZgfKCp0b/B33a9OXLly9fvu7PGvlU6l8WFKVm84Xt89iF
-						7q6n4Ak12v/QY2Pp9QnLBO5wgyYn+NugzhF4ZzjvOKH+zAZ6JAD/YYJ+1+LedhaTAw3tArC4IRWA/g29a4yB/mzAH4f9CPDHYN8eoc4G
-						+jbkRkbNLUAGOGOHH9PyE4z66+097V5/2eFnVWyh73rV74+WH9PvD/BHy4/p8w/gn6PgX7f7aAEIR/7rRAAA/5sD+D8sN/XaVtEo/w4/
-						n/ysCYHIuDJhIX7XMPZzIJHnSAsCnjuEhej9nWpRL/LerjCBFHDQ24+IFLAIIElSIDJgkiAF8RkCWwZe39wmf2d6RS+ta+qnA7ptyCkD
-						wfoAJH8ZcIoA4hCBUAbSRSBJBiACWCuw6XAfvb5kF/3wxXHOc8ZXk9RnI4tKZ3z3ydQ/16dRX758+fLl6/6o749K/f0RxanX+WL2sfsi
-						d/fywCgG/1+Ppoef/kAWltY0dljQb4E/B6P9XTasu6Cdv5YO9sMP/V2cuqPHBVSTgD8O/dmAP6+RfQfsO0Hfglt7lDwOxgacI7v8LA9H
-						/U2/P8A/bdTfgL/u9wf4L0M260W+Wxj8tyrwj8O/gL818m/afWTkfw+DP8N/mYH//Y20nQVgR6W6CzF+JixKxs+cFMhMWhbh9w1jPw9p
-						goDncP1BGrf7OH1gh0UAMVKQJAaBFMSFICYF6ULgaBvSImCvHUgTgspe2nikn+r6rqbPDkREAEmQAS0BURmISkBEBjKKQB6zAqdVe1BV
-						5wX6YONB+mnJPbWD0EcFxalXH37uub+nT6u+fPny5cvXvVnfSqX+VkFRyTMM/pcdF7S7Foz2f+c3JdLmg337l27aL20+2M3nGEO/iZEA
-						7OQTAnu/jPYLqOuvdfTy1wzMy+eOoFUoaBdKj/ne8UREwEQk4Bwd7egT+ATwAtQB/PmM8ucK/PnAfgD6Fuwngb49Qj5J4FgBsg3Mpuff
-						SIAZ/ZddfjDqD/jHqH8w8h9u8akW+lrbe+qRf3t7z6DlR8M/oN/u9ZdRf932g1khwP82PfK/nZ97PP87qo7Ilqj4HDsNyR2IOfh5XbF/
-						JxP1++J3V0kShIlLdtCHDPzY63/8nu4gEAKTuBTYYvCuyIAWAhYBJFEKLBkIhcBaVByTgbgQ2DKA4PstOHhS1hAcPXMjTQKStg1tt8OA
-						H4QBH3GtCUBsETiGxODfbBEaxIJ/zAIA/ptPXw1yqPcSzdnXRo9NWE3ff/Yt57nlK8glnFMffvjhv6lPs758+fLly9e9UyMKSx7mi1V7
-						7OJ1dyNbeJbS9x9/W26qtKv6iIJ+C/zDkX+1yFeBuYJzA+BmlB43vpJEvmagHlJg/jwK+yb5Qj/+zf5DxwRqAd2pKQr4A+jPc5Q/X+DP
-						Dvs26KPtRSUd8kPAV5APKFbBCHokSwHSKgaskel61x8s9l2wdl9sb/9wX/+lm6vS9/bfruF/B8M/Fvoy+MtiX73Qd8PuQ7Rpj2n5Yfhn
-						8N+6n+Ffg/+2SsB/I4N/k4A/suvAUT6eVPD/4ucLYv3cJi4xCOMSBC0Gm+pp4t6eIBNYBBAIgUooBbYYuKTgPZ1ACrIIgd0uNAYiYMsA
-						S4DZZSjj7ICWgdc2tfL/0UlLDp2iqu7LAv2DlQGXBCD5iwBiiYDIQCgCR05dpS1HTtLrS/fQj1/68J6YFSgoSrUVFJY8pE+3vnz58uXL
-						11dbDxan/rsRRamNrovW3Yrs5vPrEvpR0bsMrpuo4lCr9PebHItEiQB69s1NtgI4t4Be/oyBXLUE4esa6O1ACCRhC1D6n6k4b+zF0A8J
-						2XOwRRavAtIzQX++o/wDBn4G/YHAfiLoJ0H+MsCzFRuqObjhl7rpVznNWbOHBSBc5Cs7/JiWHwb/YF9/vb2navfRLT8M/2rUP9byY0b9
-						GfwV/B9W4C+j/gz/VQD/I3KfhN01zUH28uuF72talZAZK/DzcvBz60AM7Ni/OxKXgqkrymnKvh5ZeGsy0cSWAg5EwE4mKQhahpBghiA3
-						IYAIBDKAMPwjcRkwQhDKgBIB5FWWgbd3dNCi2pO0t/MiYaefqADcYuDnBO0/6QnagBjwXeCvcp3sm4RF4F+gX6U5iCUAOlgbYGdHy1ka
-						u7qKHn510r3SHrSOZeDfqLOvL1++fPnydZfr+6NS/1VBYWo6Fq05LlJ3ISm9m08p/fJ3ExkSd0qPfDL4c/Sov4LvcwGI2yPzx+VRgzqD
-						P6L+3AZ4G+7Vn7mgH7H/jYH+5s6TAptY5Aq4HxLozzTKP0Dgj8O+a1TfBfo25CYBvoH7APJjQf9/JKtUsBAYswDhqH+1bvnB9p4Hpdd/
-						zY5ata9/fItPwL8Gfxn1l17/xmDkH/3+0vaDlh8N/xjxNwKw56CC/721x2jfoWO0cU9d8HMF4dcUMb9HIAYOQYhLwtSyJppa0SuZsj/M
-						ZJ2IGFgygO07kSQpSBQCloAkIUieHdAigJkBLQNGBNwyEIrAa1oGSvhrMyt7adux8wznN9JlwCEAJvZ6gEQZsAQgTQSQiAikSwASF4HK
-						zgs0YWsd/erN2fS9p950nI/uYopLPx1RnJr8UOHL/1ifjn358uXLl6/hrYcfTv1thu8U57bz4jTsSdEDDP4jHnuTCktmyIjv0fYTWcD/
-						pLT8YITeLKg1AoBFtqrnXsG/EgAd/TX1MQM8omHeCIP5s2zQ39DSLaPSaKVJTV41KOi3R/kN9Gca5VfAr2F/AMCfC+znAvqJgB+DaNzk
-						yw4WAceDRcGYDQD8h4t8Gfw5aqFvCP0G/M2o/xYGfwP/0vJT0RQDf9XqI+BfzeAv8M/gz9nH8I82LWy5WlHXKvIAKbF/NnWjsjBGCuJy
-						gARisGYfTa84QdMrT9A0jhGBeCJSsC9JCoZACGwZiAiBEoFgdkC3CMVnBdJloC2QAYjAa5tbRQbQKjSRf9aNR85S46lrlgjoliCHBJhk
-						FoH02YAkEVAykIMInLpK9Scu08L9rfT4+GX0g2fHOs5Pdy8FRaXXsD4Aa6/06dmXL1++fPka+hpZmPrf+MJzOH4hulv5zmMl9MAjKXry
-						jdkMfAr8MZreYuUYYsE/dvzBDj8A8QDwAfZWlABACJQUqM91+HMF+xbQ66+ZyOeR1h/19cbWXoFQQLSBfgP+Av0a/JN6+vOCfgv406B/
-						sMCfA+y7QD8J8rGfv8QB9+j5j4ThOp55a/dGsnhTpfT8rxXwNwt9Nfjvrg9H/aXlJ9zhR436M/gD/itD+Dfgr0b9FfjvrQ1H/vcz+FfU
-						t1JlfRtVNrTJGoH56/ZFf075XcK4xMBEpGBXC82sOkEzGP5NIANGCEwySgELgS0FuQjBOMQIAUuAWVDsmh2IyoC6KVkgAywBRgbi6wWM
-						DJRsbZPR/+isgBIBIwOTtAw0nYYMMOgH6wFs8OcEdw5GbPAP4d8lACZKAq6pGODXuwIddeQICwDWBpg09F2mRZXtVDhhxVcuAiOKSw+N
-						KBr9/9GnaV++fPny5Wto6oEnUv+3kcWp+SOKUn9wXoCGOQD/EY++GYJ/R18a+Av8x8AfQa+/DfvdJ/kRd8pl4FdfUx9DAMzXbAFQMwAx
-						MdCAb2RAfa7AHz8XQBPgDOgvtUb7BwP9ubX2uEf5hwT4AforVALQB7jqZAR9DcAC+DYkI2vDxMEeu/7Eg8XArizcsF9agtYB/jHqz9Av
-						o/78Wsje/rLQ1x71t9p9zEJfBn9Eev0Z+gH/exj8Af37DrUq8NcB/Fcx/ONeDAcOt4swLFq/X3YJMsHuRXbC3zt8PiQbqmjWgT6VqjAQ
-						ApO4FNhiEBECLQPIJJGB3IQgkAFEi4CRASMERgaCNQMiA52BDBghyEkGWAJCGWiVGBl4ZaOSgan7umlrC7+nztxwi0BEApQIpM0CJMwE
-						2DEiYEtAbiJwhQ73XWER6KAiFoE/f+4r3TnoS9xzBa2Z+rTty5cvX758Daz+ZNSoP8YUM6aaHRecYQ/A/0EG/9+9M582M9Q1J4C/3fZj
-						wF9G/XsZ+Bnquxn4Af7qkSE/EID0z40AxOUgEAI8GvDXX2vh/w/Qj5tYAfgF+jn5tvgk9fQnQb+rtSfTKH/OwK9H9ZOAPw77WUEf8KuT
-						BPhpUL8+PYD8eLAewA52CMJ6AIz8B+Bv2n04asT/SDjiX3WUyg80UzlG/NNG/Rn8peUnhH8D/ioK/qsPd8j9JSAK2J0o8nPL7xYmIgj8
-						3CBz97bTnOq+ILNZBExcYjADQuCQgjQhYAkwQhBfQ5AkBEGbELJbyYARAlerUCgDSgRcMwPSIqRlIC4CpVuUDKgWoVAEXpNZgWMsA8fo
-						Vc5kloEyyMDZ3GXANSvgEgAVPRtgRCCvGYEr1HjyCq2p7aanp6yhHz7/tvN8dldSXHqloLCk2LcF+fLly5evAVVBYeo7fEE5nnaBuQv5
-						7mOl9OBvx9AzY+bQuh01asSf04J0WrHAP4xa6GvgPoB+DfOS4HMD+hr2T6ivGbCXGNg3LUD6axjtr6prk60px0xfR2/o9h7T6pPraP+w
-						QT+Dfhz68wH+TKP7ucC+C/QzAX42qHdmU3KwSBizATLqb/f5A/5l1P+o7vXX8F+jR/wN+Os+/xD+23TLT7sG/w4G/xD+DzZ1Ui0HYoCd
-						ieyfH8eISfz3nr+5mubXnJTMDdJHc1kEkGxSMDODEBgpiM8OTN7fI3EJQXx2QK0ZGIQMGBHIJANaBJQEhCLwum4LMiKAQBbm8/NTdfyS
-						Av94GP6j4K8i24NKYuAvawBUG5CdQAIQBv64CIgA6DSxBKjoGYGqDiqasvYrFYGRRamuEcUl39anc1++fPny5StzfWfUS/9I7e5T+mX8
-						ojK8Ubv6PDjqTXpu7NwI+KfBP4N+EvyjDz8E//M6CvgDGdCfA/YxQxCfATASIB/LSD9mAJB+OtJ2gjbsqqVxDOJvYnQfI/sC+xjtD6E/
-						abQ/lxYfgX4N/kntPTb0u1p7XKP8uYzwZ4P9CPDHYN85om/BbhLkZwJ7jKjHo/b/dwdbg9rBImHMzgQ39NJ9/qrXX4/4a/g3i3yl3Yej
-						2n0A/u165N+Gf4B/p4B/DefgkS6qPdpFh44ep2oWAmxNGvw++B2t2L/7wsouWnDwlGS+hGWAM49FABEhqDYJxUDkgCUAichBBimYVqFi
-						hMC0CrmEwJ4dCGSAJQBxyUB8i9FABLQMmLsQGxEwMhC2CLUHIlASyECrkgERgWMiAkYGXt7QQu/s6KC1jWcYvK85RCBdAkzUvQIGLwJH
-						bBGwJECJwGVacqCDnpq8+isUgdQX2C1o5FOp/1yf3n358uXLl6/0KihO/YQvGv3ui8nwBeD/EIP/k6lZusf/RBT8Dfwz5LvBX+3yA2Dv
-						OXWOegLwDwXADoA/bA3SAoBoAeg28K+/BqkAIGIx59sz1wVQP3aaGtl/kx/xuRnpH8hovxv6o1t15gX9GOXXwB9AvwP449CfOLqfy8i+
-						Bn0bcBdtqAhigDgC89bH8nkWoMfIvivo/88UbAm6HfAvu/s0UzmDv2r5Afwfk1F/1fJj4L8tgP8qzoGGDgF/gX8G/GoN/wL+OodYAOqa
-						j0sgB7g3gdypWH43/N5h5LnYXkeLDp2mRbWnJAt1wo9Pyt75eMTngSjUmKiZAyQQBi0Lc3RmH0DUjIG9ngA7DikZiArBYGXA3HwslIH0
-						WYFgRkDLQHRWQIkAEooAJ5gROBbIgBEBPE7jn3lX23kB/2EVAS0BRgTiEhARgZNKBBZWtlHhh8vpR1+dCJzh/Eif5n358uXLly9VDxW9
-						/v8qKCqtcF88hi8PjOLHx1JUVDpTRvyPtJ+IwL+EwR9x9f0bGWjrPqVhXsF+j3wcTQj95/ljDmDf+rNQAMLPG471MMQdoPcZzN8OQF49
-						jkWmhx+/BTGQr7nBP+NoP0N/tMVHgz9DvwH/pPaegUB/plH+5NH9fRID+7gpl0kc9oORbwv2DQhLGORNbLhfvoVh3QpG0aOpTvsaRvgz
-						ZlsY7BSElqDdBxn80e5j7+wTH/XnAPxlxJ/h34z4y6i/Df8M/Rj1xz0oJAz/9S3dsu0r/hz/ZyAqIjQqIgXVPbSUBWBJnZ0zkqX8sYn5
-						s8WHTkWjZUGEgcVAhWWBs0DPJBg5wEyCkYL4ugIIQT4yYO49YMuA3SYUnxVQMqBEQGTAEgG7PcieFTASoBYMZxGBDUoEEPz5woMnqO7E
-						FRYAyIBKBPzlTsEmCvwj24MiWgQyzQDY24OG4B9No14f0HDiMi2ubKfHxy2mP/vKdg1K7X/gydS/06d9X758+fL1Ta1UKvU3sGCMLwx3
-						dU//gidKaeRv36THXplKyzZVUFNrjwb/dPhPA38N/2bkv73njEB9j4nMAITgH84AhDMCEIDwz1UU9J+X/n7c8AlbM77DwG7g/R2APNp3
-						+HMJA79p51FRnxvoR5JG+23wzzTaPxTQn+8of7BINQH484J9Dfk26CcDPuA+TBzksbA31wC6MwXbg6L1R+3uo7f1RNDjj1afAPxVj78E
-						8G+3+xw5rkf9jysBaO4W8Ffw30OHWR4bORCENTsO6t8Rv7e6c/GK3Y20ov6MZDkeG1TkY+vry/lry/B1+bPTOiwIJkYSIBKcxTqLak0g
-						CCwEnLT2IjNLUB3KwMzKPt0upNcNZJABJQIcLQIuGQhEQGSgS0QgmBXQIhDsHmTJgBKBdkkoAuHOQUYE7PagVzAboEUAjxP3dNG2Y+f0
-						rADD/1CIgJaAUATC+wREZwBiIsASgBzquURzdh+hx96ZQz94Zozz/DjM+aigKPXiww8//Df1ZcCXL1++fH2T6ruPv/5vGfwrHReI4QuD
-						/wOPpeivnh9P05dto0MMUCH4W/CfA/ibfv+eU+epl4NHFSMA/DGiv27gXz6Wzy0B4M/RQoTRYYD1e7M3qjCoC7yLCCiIlzYeDfQG7vE1
-						e7TfBv+00X4L/OOj/UktPoB+A/5BT/8goN8AfzC6b0F/rsCfD+yHkI+4Id8F8ia4w68duduvI+ZGYCYA76Ss3Vkri4Lj8C+LfA/rPn9p
-						9elQ0C8x7T4W9HPMowF/CUst7gPR1NYrf3fdzkPqd+HfFTcuW113klY1nqVVh1VWm1hfM19f1RD9GrJScoZWGnGIScIyLQYmIgZmtoCz
-						AJGWIpYBjmkdstcSzBAZ6M0oAxN1jAgYGYi3CEVnBboCGXCJgD0rELYHhSJQau4nsNkhAhsV/BsReGl9M729vZ3WNZ5hSL+uJCBRBMJW
-						oHQJQNIlQIlAugQ4RUBLAFLRcZ7Gb6qlX6amfjV3Fi4uPTTy8dS/15cDX758+fL1dS+M/IwsSr3A8P+x88IwTPkug/9fPPUeTVm0lQGq
-						U8A/Df5zAn/T739OwN8kFACOgP4FHftrKoEA8CN2bkFP9gfzAOmbAlA3I/UG4I0QGJhHAPn2aH9G8I+1+QxotH+ooZ9BPxn6cwP+XGA/
-						G+hngvs41APcXQFgZw//vV38aAV3Bd6Pdh+Avx71N/AvLT8a/s1ofwD/RzX4M/QD/NEuhhxm6G9k6Dfwf7RNHdv4exvL6+RnWFvZQuua
-						+iVrj5yldZy1+nP5mvVosobFAFnbpGI+hzCINOgoMTjLUoBADvSsAUuAkYJwtoBlAIEUmPUFkAE9O2BkQBYVy0LiUASSZCDbrEBEBMqj
-						ImBkIFEEZMGwEYG2NBEwMiCLhR0i8MqGZppd2UMHui8NQgSsNQEREbAkIKMIhBKA7O84R++vraS/en0CPfjkG85z5/Al9cmIwpJX/Jah
-						vnz58vU1L9wtkk/6ze6LwXAEO/uU0J8XvkVvTllF+2pbHODPyaHP34z6tx4/LSP8Av6ndQTsL1gyYOBffS2QAB1p86lpFjAeL1Busjkc
-						pbcCMRCA158D7NPafCzwN4Igf19/3wj4x3r7M472Wy0+0wH9GvyTevqToN/V2pNplD9/4DewXyOJQD6DPBIBfRmhVxGIdwB+HODXM7DH
-						gzv+Dja4ZwAWeQetPtLj3yWtPgjaeGoZ+g/pBb4A/zpp9zHg3yvgL/Av4H+CjrT3cU7ysX6Sj3F1HOPPN+9roI1NZ2jD0XMqR/QjZ2OQ
-						ftp4hMOPkb/HWa9jZGE9/z3ECMMayIEVmS1gGVBRMwbSWoRZAo4RArOuQIQgQQbUQmKzZiAqAkYGTHtQsFaABcA1K2BEQMlAKALBHYe1
-						CETag1gCRAbsXYMyicDGuAg0iwi8uK6Z3tvZQZuPnhXItyUgFIEECUBynQ2wRCAqARxLAhr7rlDZkVP06oLt9LOXx9HI4pTjXDp8GVlU
-						2uLvJOzLly9fX8PCqH9BUcnoEcWln7ouAMMR9Pn/gMH/ab2XvyzwjUcEQLf9mAQyEBUCCAD29wfA957WYC8CgI817FtCYMeAP/799opG
-						msEw/aHdfsORdhwN6tji0/7YwDuAHq1AmcDfSELObT4M+4Ma7c9zpN8F/c5R/jjwM+QjBvRXlKmkAX8G2Lfhfi0DPWKPxq/fVRckDdR3
-						61hf28jg7gqAPt/g3+HeAGp3Hw3+0udv2n10y4/p8zcj/hr+G1tPWODfx8c2H78C/qeo5fgpOsbiCnltOt5PW1su0OaW87SFs7n5nGQL
-						HlsQfM0V9fc26YSyoLKBJcDOesiBSIKeMeBgpgBRbUS6fYhlAFlmrSeACCyKy4AWASMDwayAJQLOWQEjAgmzAhCBcFZAiYDIACRAi4A9
-						K+AWgTZJKUuAEgElAchraSLQHBGBMWVttObwadnNRwmAuntwBP6DFqAwzUEM+DvWBNhh6D/CsA/wN7FnAg5zGvrUQuHiCSvox797x3le
-						Hb6kPhlZVPKaXxvgy5cvX1+T0r3+Ne6T/jCEwf+hx9+kR16aRPPWlDMgdafDvwv8EQf4G/hv7z4joC/ALwHs25+br1nwr78GCNvE8Dh5
-						MdpsttCEBQhDuTyaVhwVBez4mvpz8zW0AA0n+Md7+wX6k0b7GfoN+AP656zOB/rTW3vSRvkxuj9A4E+HfQX6Nuwngr6BfE4E6PekB3f5
-						jWRP7PMBZltlk0gAoF+N+IetPlHwV+0+AfwH4M/HLIJjV2atFPi38fHb1nNWFqM2nr5OZa3naeux8/JYduxCJNta8Yivh9nKYiDBx/pz
-						CISJEYVNOlE5MDMHLASctSwBQQuRyEBUCDLJALYfNQuIzVoByIBLBOxZgXAr0aEXgXD7ULcIhOsDQhGABLzMEqBE4Ci9xl9fUtvHEH41
-						kIBsIhBKQFwEQgmIiIBIQFQE4hKA1HZfpCllDfSbsbPoh8+95T7PDlcKUwdGPvX6/0NfPnz58uXL131Yf6R2+Cn9KO0kPyxJUcGoUvrp
-						0+8z4G6R3noX+CeN+gc3+YqBP9LRe1bDvMoJ8/GZ8Gvq6+cl5nNA2sqyAwL+kxYxfCMC4Vv0o4Zy/voEEQN+1NBv/gwwb+8GlAv4m1mF
-						pP7+rG0+sdF+d4uPgn5Xi08uI/1x4E+C/oECfxz2XaCfBPkuMLeDvn07W3NIGe4InEPU322U9QCywFe3+tQb8Af0H1OtPogZ7Q9afQT8
-						T1ngr+Afu1V1nL5MnedvUeeFW9R46jptZ9DfgbSlB3+2XT6+KJHPrWzToiCywAnEQEekQEdmDVgEEAiBkYFI61AgA2cCGUCrkJEBV4tQ
-						uJNQKALx9iBkcg7tQWaNgN0eZIuAtAU5RUBJQFwEIAFKBKKzAVERCCXAiMCL64/SzIpuqsY6gZgI5DQbkCACmWYDbAkIRKDvCu1v76f3
-						1lbSL1+fSA/d1fUBqdsFhakncA1RlxJfvnz58nVf1N0e9Ue7z4+feodeHb+Edh1ooiNtDEZ2GP6PaPhXMdCk4F+FASoG/kjXibMC/BIG
-						fvOxmQEIPw+/hkXG2Gt9CoM/4H/y4q0Kvhn0lQyoTJSEf4bP5euAf5YAjPq/MyDwZ5lIAP9Imw+Df7zNJ5/R/jj0G/BPhH4N/InQ7xrl
-						Hyzwx2A/F9DPBPeA80gqkrOtoikWfC334H4AZoFvvNVH2n2CY5iPXT5WBfx1q4+AP6BfcpY6Tpxj+L9JnRdv03Hk0m2qP3mNdrVflJTr
-						mI/N10126gSfsxwgIgwsACZGEFyzB3bLkbQRcdT6gswyYLYnTZMBvZNQXASQ+FaitghMjouANSswWBEI7iOQIAKviwgYCUgXAZEALQKT
-						9nTRvs4LwSxAptkAsybgKBIIgIpZB6DC0G+HYV8kgIE/zGW5gZjJhoYT9MLszfTzu78+oLqgKPVv9GXFly9fvnzdw/VHBUUlz/CJ+66M
-						+hdwvl84lka9NpWWbNzPcNSTDv7WyL8N/3Hwd8J/Xz9D/8UQ/i0BiAfgD1BbWVbFYL2NARuwrQQAj1Pkc0C4gXH+s0X8NQ3mk0QU+JFh
-						HTAP8A/gfwDgr6RiqMDfMdrPsJ+txSfo6Y+BfxL0u0b5hwr4M4F+IuAzhGcCemzj6UzVkexx/TtHcJ8A2dOfj2cBf5FZPob5WJV2HwF/
-						Pl4D8EerjwL/doB/bz91nuinrrNXGPxvCfx3X/ooSH3fddrTeUnnMu3u4EfEfK3jomR3kEuS8lgCWWhT2alnDuzZA5kt0G1GwSyBkQGI
-						gJEBWTugZGC1JQNxEQh2EtIiIIuGIzMC2DlIiYAtA9lEYHxEBKzWIC0BySIQnQ2QHYMsEYAEBCLAEmDPBkRFQEnA7yECa4/S5L1dVNl1
-						MV0C0kQgVwmIiUCCBNgiUNd7iWaUN9Oo9xfRD+/uHYVvjCxMjdLXF1++fPnyda9VwaOpf8In63Wxk/ew5cGiN+jnz42j8XM30MGmDoaj
-						niAR+LejJSDY9lMnbP8J24Bw116Bf0sA0PITQL/5nIO7rq7YWsVAvV0FArAUoI1HHQgAf22KfAwQV/CvxABwvk1mAAD6LvAP4N/Z45/f
-						iH+8vx/Qb4N/vM0n3tufabR/uKA/F+DPB/aTQD8R8GMAv8MRLOIdcPDvE7KnpkXkEvCvBFbJqt3q06pH/KXVp9cCf5ZYufO0jPwr6O/h
-						9F4Og5mA/V2XJfusx/jHEpYCZK9OKA9hjCzYswqYPYi3EqGNKC8ZYBGQew9wjAhga1GIgKwTkNYgdfdhucHYAb2NKBYLJ4oAZ4AiENxH
-						QIsAJMAWgcjNxGIiYNqC4iIACUgTAZaA3689QpP2dFJF58UQ/gMJ0K0/CMO+vSgYi4vDKPgPdwPS4B9JFPztYJHw3vZ+enPFPvrrkkn0
-						vafv6v0DVn1n1Ev/SF9ufPny5cvXvVAjC0tG8gn6QuyEPTwpTNGPn36XXnpvIcNRUwT8se+5E/wRB/inw/9JOgb4Z2DqM/AvUaCvEkrB
-						waYuWsawO52hesZyFXysRteNDITgraTAfC0M4B8Lf+PgHxn1v0vgn63Nxz3a74Z+A/6JPf2J0J8+yp9phD8b7EeAPxPoM2y7AD8O67tc
-						qW5OTHlNftlVje8XzZ7aY9IC1Azo70Srj9qS1oz4C/j3nKXOAPzPyb0qJOeuhuDPOcHQL7nysaSPc6jvGlV2X1Y5jscrYY4jl6lCvq4e
-						kf1I1yXJPitGDiQdWghiMqCEQLUQhTIQrh8w6wbUNqTRFiGzcNheJxARgVo1G4DWICMCsw6c0PcSCGUAEjAliwjIQuFABI6HIrBLiYBs
-						HeoQAUhAXATSFwpHJUCJQPpsQCgCR+gFzvs72qm87XxMBNLvDxCZAQgSlwAOg39UBJQEuEQAElB/QrUFPT99Pf385Q/uWlvQyKLU+RFP
-						lhToy44vX758+fqqClu2jShKpThfuE7YQ50fPDmWHnl5Ms1dvYsOt3RTU2sO8J/HqD/gv0fDvxEA9fEFyYmzAP+LMuKPxb2zBKQV+M+U
-						R/4cIqC/FsoAPmbwxsf8dSMD0xjMAemAfAP+ae0+Gvwj7T5DAP4C/RHw35MX+Kve/txG+4cC+jO19CSO7ucA+0mgnwT3cVjfXdPiDPb1
-						H4rs5v8Dj3s50g7ExzxuRNd2nMHfLO6VEX+Gfwb/zj4L/uVmcxcC8O+NQP9HdPLqx3SSPz7Fjyf4c0hAde8VOtBzlao5B3r4YxYAebTD
-						ElDFX0ciooBoOTCCEM4cXBYh2C0zBLqNyBKCqAyotQMQAZEBlgAzKxBfK2BEAO1B9n0FzB2HMRuAewkYCUBb0HCJACTAJQKQACUCejZg
-						azgbEIrAsfS2ILNtaGw2ABKATNzdyYJ1IU0CkkQgIgFIRgkIRSAuAUYEao5foIlbD9Fjb826m21BnxcUp15NpVJ/Q1+GfPny5cvX3Sws
-						zuKTcX3s5DwseejJN+nnz4+jN6aspP2HWqTXP4j0RuuefzvtvZYI9AURAWDgN5FWCsD/cYb/U+eDkX4F/Xq0X3+MXVdWMtjOEoDeGTzO
-						ZLCORssAgFukQEWBuAJyfI4FwAL+rj5/Bv+0Pn8N/pE+fw3+Bv6HBPwZ+G3wj7b5KOi3wT9ttD+hxQfQb8A/qb1nUNAfA/5cYD8b5GeE
-						+tpjadk7xNl3qJWP+VaBfzzur2uVHYGwLa1APwc3llPQ36/uMK3vMi33pjh/Q4/2q2C03wZ/k9PX7ogY1LEEHOy9qnJCpUZ/jkek2v6Y
-						hQAJZIETyAELgIkIQUwGpGUoLgNaBBCIABLMCrAAmFmBQASwRkCLgKwRgAiwBKjFwhCB07SgNtoWNIslYCAiAAkIRSCUAJcIiAQ4REDu
-						KOwQgbAtyBaBuATYIqAk4HdrjtD4XR20DyJgwN+KPQtwlEEfCdcBaAk4qdIoCeH/MGKg/4RKQyyYDdjWfIpeWbiDflUy8e61BRWXHhrp
-						twv15cuXr7tbI4pLfsgn4CvOE/MQ50fPvktPvjGT1myvjoI/wqCfBv8M/i74j4O/C/77zl5UkVF/9TEEANsrrmNYnc3QPEdnNsP07FUA
-						ajtGCnR7DaDbwLeIgfoa4Bx3/o2Dv6vdx4C/PeqfDfwD+LfAP73VJ1fwz9zmk89of77QbwO/gf5Mo/zbKxn0Oa4RfYF9A/hWAsBnoE8D
-						fQbwJLgHmMcjgJ4pdW2ZE/v72AUIqaxvo6r6dqpsaJfHA/yIXYG6BP7PCfwD+mXEn9NzWi1K7z1zSYO/avMR8Lci4M85c+1jOssCcPY6
-						JEDNBKhc1TGfX6PaEyZXJUYSJL1XWApYCEyMGHCqTHsRWog4qn1IJVg/oGVAFhPHZgXs9iBZK2CJAGJEwNx1eHmDkgAEEoAZAawPMG1B
-						RgJsEbDXCAQiwAKQqwhAApwioCXgre22CEQlwIjA6NhswGubVEuQEYG4BBgReGFNkywWPtB9KU0CIiLAwO+UACSbBGgRcEkAFgkv3N9K
-						heMW0cO/f9d5Lh+GXBpZVPJ9fVny5cuXL1/DVSOfeurv8El3WuwkPCz5/lNj6BcvTmCw3UqHjnalgX8S/Ifgnwz/BvzNDirdp86F8G8F
-						f7Z+Vy1Dsu6N1/A/dzU/WoEIQAhm4VHkQH0NsG1EQIlBOcO5bvnJ0O7j7vM324WG8G+Df2TUPyP4K/jPCfwH0eaTPtoftvgA+gPwt3r6
-						k0b6BfoN8HNkhL9SxYb+bMAfgX2BfAZ7nRDuW4NE4N6GdPOxlQqGdFcqAe4DCUO+AP9hBv7DHXSgsUNuEHaAg8eapi46zMd8l4F+GfG3
-						t6Zleb14k/quqlaf6Gi/gv4zGvrt9N+4Iy1DDSevyeLg+pPXg9Tpr+ExCMSA4R8xUmCLgT1TELYQWUIAEbBmByKzAloGzKyASwTCG431
-						BzcZMyKwAiIQbwuydguaXR1KQKIIxGYD4iJgS4AtAonrAywJGMMSkNtsQFQCzJ2EX2IJeHFdKAG/YwnIJAJxCYiLgFsCtAhkkQAlApeo
-						ouMcjV21jx4pnULff3qM89w+tEn9YWRRauKfjBr1x/oy5cuXL1++hrJGPp769wVFqbb0E/DQBgvKfvL8+/TUG7Npw66DhDv5NppoAZDe
-						fwlLABIIgFoDEKwD0P3/R1kAENP/H4pAn8CTAv5LOhellQILjBes20vzAMosAPMYnOciayAA+FiJgC0DkRkCOyIE5QzuZXm3+6gbhiWA
-						vzXqb4N/pN0H//8Qg79AvwX+8TafeG9/ptH+OPQHrT0M+gb6TUuPDf2uUf5cgT8O+y7QN6PvkjjUazgPIN2ZjgFHgP+wBn2B/U5ZcH7w
-						SBfVSo5LcLdgbA2KResY9Rfol5Y1Pp77r4Tgz7Afgv8dNeJvgB+PDP39Nz6RnNPBzcIOn7oeBDcOsz9vOHVNBx9zbFGwZgzUrEEoBYEQ
-						aClQ7UJWmxAHIiAtQiwAiBGBTDMC4Q3GztG6JnWXYbU+gEVAFgqbbUNPR24kJluG6rUBLhGABLhEABKQjwiktQUFIhBKgBIBazYg1hJk
-						i4BLAmwRwMcLqnvpMMN8AP6n8bFKcEMwG/6DWOsBYvcGQO9/EAv8Jb2XZCYAWVTVQUUTl9PPX7pbi4RTjb4lyJcvX76GuDDNyifYq+4T
-						79AFo/6/enGibO1Z29QRgr8T/jkG/HFTpAzwHwd/A/8YMT1pwT9GTivrW2kxg/CCtXsYknUYmudDArQMYEZAHiEA+nMlBQzZ+mMjAghm
-						BsYz3BvwTxr1T2/30aP+Gvxd7T4G/NP6/DX4m3afTIt7BwX+DPw2+MfbfDKN9seh34B/0kh/NujPF/gzwX4S4Cs4Tw6gfTAB7GN0X8F+
-						CPq1HDwewt2Bg/TIXYKPtJ+UkX/VtqYk9uTl2xr870h/vxn1t0f6VULoP8+5cJMfddrP32JQvEFNZ66rnLbDX+c0SlgQOIEgsAQoIbhG
-						9SwAEAITe6YA6wqMCBgZsNcMBCKgZSCYEdAyEBEBtAVBBAIJwELhUATMPQSWsgiotQHWTcRq1Hah2UQAEuASgQG3BWkJiIuALQElaSIQ
-						nQ1QLUHu2YDnVzfx3ztKaw+f0gKQWQKiIpAsARERyCABuJPwmyv30W/emEY/eGas85w/xLlUUJQaoS9bvnz58uVroPWtVOpvjSwqfQ/T
-						rI6T7ZBFjfq/R8+9PY+27WtwjvrnAv9B608G+Dc7/mDkH/B/UgMT7t67fEsVLVi/lxau2yuj/wvW7WER4EdbBiQsAPpjSIHAtYgAPtaP
-						EAJ+xELg9+dsSmz3SRr1z9Tuk9TnL+AfGfUPwd8e9U9b3DtM4B8f7Vfg74b+yGj/IKE/Z+CPwX420HfDehgZpU8KA3221B7Fo4J9BfxR
-						0MfHeEQacGdg6+7AuDEYZgBwPJ86fzUAfsC/tProdh9AvxnxF+i3gP/8zU9ZABCIwKfytdZzt6j57A06ekYHH3OO8McIvmY+bpIoWRAp
-						YBkwMwdhS5FuI+oL24bMAmMjA8GaAYcImAXDkAAEEoCo2QB9l2HdFiQtQZAAjswG6PsHQAKWyNoAs1PQKZEAzAbERcC5UNiSAJcIRGYD
-						WAJcswHutiB7NkBJAOKSgNcgASICyS1BaAcyIlC6uYU2HTmTJgEuEXBKgCUCuUiALQKra4/Ts5NX3q0tQ78cUVg6BjvU6cuYL1++fPnK
-						p777ZOqfFxSVVjhOsEOaHzwzhn754gR6f/Y6gXBs7ylh+Jc7oJow9AcioLf9NDH9/6EI6F1/GPxNIAEtSAD/lyT4M/T5L9rAUIysR5QE
-						SPjjQAZ0RAL4a4EQ8McQApkhsKQA237aI/4DGfXP1u6T1OevZETBfxz8A/gfMvCP9vfb4K9afBoSwT/e4pPU058E/a5R/nyBPxPoJwJ+
-						GryH4G5HRu0dcf5dM7LPx3+9hv6GFg36HIC+AD8f7436rsCNbX382MfHPQT3pMwAnLnykQJ/Bn4EbT4SBn97tN9Afwj+n9LFW2EucfB3
-						W/tvUks8Z2+KGMRjRCGQApkpiLYQuWTAtAgFMhCIQLi1qBIBtU7AFgFzg7EyDlqCRARYAlRbkNotCBKA2QBIgNoy9ExEAhawBJiWICMB
-						LhEI1gckzAYkiUBuswGWCCS2BFkiEEhAtCUoIgKWBDy3upE+2NlO+zsuiAjY24FGwP+kSvpaAMC/Sgj9FvjrGPA3OdR7kfa3n6PU8j30
-						m9SUuzMbUFy659vPvPpP9eXMly9fvnzlUgVFJX8qN11xnViHKBgJ+vmL46goNYvWbD/AoHM8K/zHwT8K/0oA4uAfh3/095/svyTbJ25j
-						+Fy8cb8EAhCEJWARJEDLgMgBRCCQgTCAf/NoiwHg/d2BjPrzv0sa9Zd7CbhG/TO1+2jwj4z6W+Bvw/9QgX/Y26+g3wb/gYz25wv9AwX+
-						TKAfAfV4GNrjCdt0cks4sq9H92VkH48M+QiAn2EfoG+A/4gc3ycl2KmqGTcI6z0n/f7BiH8A/hwGfsS0+hjot8Ef0I9cvh0GswVt527J
-						bABk4Bin9VwYfG4CMVByoATBni2QGQLTOgQZkFah2KwAJzIrEJsRCNcIaBFgAQjbgi7SNt0WFJkN4CgJMPcOUBIgswEsAYv1zcPQEjS/
-						Wi0Qds0GxEUgMhsQEwFbAgIRyDgb0Cki4JKA6GxATAJMSxAneYFwKAHPswT8jjN9XxeD+eVkCYiIQGYJiIz+Z5AAZMG+Vioet5D+6pVx
-						d2E2INVfUDj6P+rLmi9fvnz5ylB/xCdN3NhrWFt+fvDsWPrlSxNozNSVVFXfytCv4V/APzf4V+0/meHfBn+k88RZ6ZNGn/+yzYDf/bSE
-						4T8IwzH6/xeLCESlALMDSgTCLEBEAMJHQPeEhVsiI//DMeqf3u6jRv2z9fkD/OOj/gb8A/jPsLg3CfzDFp+Bgb8L+gPwT2jvyQb9eQN/
-						DPaTIN8F7lGAz5beSHBzrxD41Ui/AX4D+8ExzcexSQsDf0sXRx5P0zHkzDXp3Qf8m9F+gX4dG/zjo/2XLOi/gnz0WfB4+uod6uDvi+9t
-						0sbwDzEwEUGQpEuBEoKbgRDYawjUrIBeM5CDCJh7CsRnA9RC4VAC0Ba0mUXA3jJU3UAMdxMOJcAsEMZdhOMSkKktaJoRAYb/nGcDLAlI
-						nw2ISkBUBNwSEJ8NSJKA32sJUCLQKLMBL/HXlh/iYwzwb0mAezYgSQLs2YDMElCnJWDXsTP06sKd9JvU5LswG5D6YmRhyUv6+ubLly9f
-						vuL1rV+n/i6fMBekn0CHLhjx+dmLH1Bhaiat3FqpR/1t+LfA3yQJ/i3wzwn+e88wbHXTmu01tHRTRRABf3y8UWUJRschAfx1JQMGnkMh
-						WGh9TWRAgzZafwD5cfB3wX9eo/4M/kmj/tnafYKfPZd2Hw3+9qh/Lj3+2cAf0G+Df6Y2n8yj/QOD/kzAnwn2XZCfGeTdEaDPEBnZ16P7
-						WNCrRvYRC/YZ9M3jMeQ4Hhn4j5+mVqT7NLX1XRAoB5x3XbwtI/8G/AX+LeB3gz8DP6D/I0C/FgDOVR3cSwC7A9np0LHFQMmBEgGJQwYi
-						MwNaBsIFxCwBDhEIdw66rO4nYIkA7jBc3nFRtQWhJYhj7xQkC4TTJEDNBgTrArQELKxV9wuY55gNiItAXAJcIpA0G/C+YzbAtAS5ZwNC
-						CXBuF+qSgPV2S5DaJtSWgGdXHqaSjc1U1nw2bwkwIjAQCajtuUjz9rZQ0fvz6WcvvT/8swHFpbMefjj1t/XlzpcvX758ob73xGv/AndW
-						dJ44hyi4Q+SvXplAr324lPbVtljwzxkE/Ce1/IgAaPgHxG2rOMywW0nLNwOAK2QGwBYBEwiAetQSYMIQLa1CCD7WUYCt4P99Bv6Mo/4J
-						8J846q/hP+dRf4b+NPi3wD+x3YfBP97uY8DfHvUfCvCPt/mk9fZnGO2P9PTnAf2uEf78YN8N+VGId4SPzWxRrTyqjQcLedHG04xRfYb7
-						EPYt0Oe0AfYlZ6it5wy1I71nqePcDQ3ktxnOb9NxlgCM/l+4FcK/afFR4P+ZQL+M+GvgN7AvH3+sP+fHa/rj3ssfiVykRf+fnQz/mCkw
-						CYXAahuKyIC1ZiAmAjIboEUAEoCYxcLBvQS0BKAtSM0GKAnYxQIQbQkyEtBPG8y6AJYALA6OSIC+cRjuHhyVgKgIDPVsACQgIgIJEmCL
-						QGlsNiCyLoChXkQgowSodQHPreKwCEzZ00E1PZcySkBkUXCOEpAuAkoCkLKmk/T72Zvo13fjLsKFqQMPFqX+mb7s+fLly9c3u0YUl3x7
-						RFHqsvOEOUT58fPv0KOvT6PpS7dR3dEugf8gQdtPmMbW+O4/DP+coO1HAviPprnDBK0SfSIRAH7JlipO+AgZWMpfX8ZQvIyBPxAClgMR
-						AB35Gj4WkEYgAmaWQH2OPf4B/wD/TC0/EfB3wf+Qjvq7t/XM2O6jwT/e7mPAf/0wg398tN8Gf3u03+7pV8DfKQmhXwO/QL/du8+wjwTQ
-						b8N+8mi+E/LjEB+L6c3PFgF+3coTGdE/znDPgK+AX30soN9zNnjsAPRL+qnz9CUZkTcwjkAAAOyAf4zyS/TH0RH/6Ei/Af9riIb/6zpo
-						CcLdgrG4GG1EEAf8+Y07nwfB5/j+mHXAegT8TCImDhkQEeDkIgLBbIAWgWBtAAcSoGYDdEsQi4CRALNAeCvuGcCxJQCzAZgJWKm3CpWb
-						hmkJMDcNG67ZAJGAjLMB2VuC4hIQFQEtATIb4JaAYDaAJQCzAb9f00iLD/JxD9i3BeAUwz4SA387RgBcIlCnJeBQD4O/FcwEVHedp3c3
-						1NJv35pJP/7dO85ryBDmEta46cufL1++fH0zC72RfEL8PHaCHLI8+OQb9Fcvj6enx8yhzbsPUUOzBf7DAv8K/JFt+w/TWzPWCqiv2FpF
-						Kxj8TZbz55AA+RgSEAvEQMLgrz4PJUDEQMBafYw7/Oa/0LcsAP8k+B+qUX8D/q5R/5z7/B3gb+DfBn8kF/CP9/dnbfOpb5co6A9H+XOG
-						fgv4k6A/F9hPAnzTphNGQX080q9vRdp4DPB3K+hv1bDfJqCvYkAfa1g6TzDs68cuk75zdJwBG8DffQng/xF1I5eQ2wLsAH812g+I148M
-						72nQz49x6EduffI5ffL5l/TFl3+ggRT+Lb4nxAGiYtqEjAy4RECtEYjuHGTuJWAkwL02wEhAeCdhe5cgrAvY2Ix1Af20XiTgrJIAuXvw
-						aZI1AZAAsyYgTQIGNxsACXDNBrgk4B0tAW+JCCSvCyhlCXDPBqRLQCACCRLw7MoGSm1qpp3H+odBAqICYCQAWVbdSUUfLqVfvDp+uFuC
-						PvfrAnz58vWNLOyRPKK4dLzjxDhk+bNnx9KvX5vEEL6Gag63K/i3BSAn+O+JgX92+K9p7BDQfuWDJbKTz8qyA7SSgX+lgC8LAH8eCIGI
-						gJYCIwN6diAuBSICAGqOmR2Yvlxt85lp1D8T/Nvgnwj/Fvgn7fCT66i/gH/CqL+z3ccC//iovwF/e9Q/U49/LiP+6W0+Cvqj4B+O9gP6
-						A/Bn6Dfgb4/029BvA7+B/jTgj8G+G/QzQL1ZjGuHAd8VwL4Af48F/ID9nn41qq/TdeKcAn4GfYH9k+EjtrTtPntFYL+HYb/n8kcy6t/L
-						n8ujzsmrd5wj/jbwmxjov3lHQf8AmT+x8P1uslBgdiCTCNhrBCAC9o5B5g7DEAHnTkEsAWgJsiVgBwvAtmO4Z8CFiATITEAjSwC2CWUJ
-						WC7bhOobhmkJiItAkgQkzQYYCUAmJs0GWBIQFQFbAqItQZCAYDYgBwl4GRJgzwZkkIBnVjTQhPIOOthzOS8JkHsE5CkBRgT2tp2l0Yt2
-						0aOpKXINcV1bhiyFqfdTqdTf0JdFX758+fp617eKUv9wRFFqs/OEOET56Yvv06iSGbRkw16qb+4KY4/+t3QHCSWgR2ILQNoMQGThrw7D
-						P9YHoG//lXFL6GWGf9yld9W2alrFwI9ABAD/Sgj05xABK6o9CFGtQkYE5GORAPUICQCwZ4P/9JYfN/wL+C9X4J+p5ScAfxf8D9GovwH/
-						pHafTOBvj/oPB/hnGu3PBfqdo/wJwB+H/UTIdwC9iWndSUp0hF8Dv4zqK8CXMOAfP3k+SDdySj32nLpAPacvMOyrVp8TyBXkY/6Yw499
-						/LkKbgx2JwB/G/7tkf7rDP2A88+++FLj+vDWpywYWKzsFIG0XYOiswG2BNT0Ru8bYCTAzAbsar9EuHtwRAKwTahIgL5pmC0BZncgaQey
-						tgl1tAQlzQbYEhAXgUQJ4Mi6AMdsQHxdgLMlKIMEJK4LSJQAJQIv8NdW1vUx7EcXAh9Og38G/rSbg3F6Ed0CJGHg1xJgRv8l3RckNZyZ
-						u5roiXdmywJh1zVmqFJQVLrhgRde+Af68ujLly9fX896oOi1fzWiMHXEdSIcinzvqTfpV69NoOfemU/b9zcMLfyn7foTwn9F3TF6Z9Y6
-						evG9RfTS+4sZsMtkt5/VgFyG3lXbFPDbMhCIgMB/+Dk+FgmICAFAWj+yAADaA/DPBf41+CfCv2PUP1PLjwH/TPCfS69/CP4K/tdr+I+C
-						fzr8G/B3tfsY8DfwPxDwB/RnBP/4aL/V4pPU3pMN+pOAPw76SYBvYD4IQ32mdDDoI9LS06dH9wX2FfAL5Ov06PQy7AP68dh7+iL1nrlI
-						J85fF7gH+BvQNzl5Vcf6GLBtevuvf/y5CkP/9TuA/8/oDgP5V1EQAdy92F4jEC4UZhGABGgRUGsDWAIYFOuOX6BD/Hiw+yKD40U60H1Z
-						SQBH3TxMzQTYErCdoyQgXBys7hVwViRgjV4YvAISUIcbhikBsCUgl9mAfFqCIAG5tAQZCcjUEhSXgNEsAWmzAVkk4HksDLZmA55e0UDv
-						bj9GlV0XhlYCIiKgBAA5yFlzqJuenLCC/nr0BHroyTec15yhSaoRG2Hoy6QvX758fb1qxJOpbw3nYt8fPvcWPTJ6Cr07cy0dbGzPAP+h
-						ACTBvxIAF/wrATDwjz/H/vsvMvQb+H9v9nqBfztmJmA1HoNZAfUYyICOzBIINEMC+FHAX3/OH09dut056p9Lv78B/2zwn/NCXwv8E1t+
-						chj1N+A/kFH/TH3+BvwN/Gfq8c8V/OO9/TLaH4N+NdLPwM+wb99AS6JH+BX0a9gX4MeuOxr0HcDvBH0D872qZcdE9emnR0b2Jf10HC08
-						HGnh4fTIiL6JHtlHGPIV8F+gEwB+5CxyifrOXma4R3uPgnu01JjHeADXuDsw9vPH4l0F/+HiXYz6D7S/fygLPwfWMsRFIHIPgVPXqLHj
-						FJ9D8LrzMXAUOzvh+MCOTx1UzccPFojjmNpf30b7+PjaU9dBu+s7qZyzq76LdtQdp2313bS1oYe21PfQproe2lB/gtY19NHa+pNyn4CV
-						wc3CWAL0zcLiIpAkAZlmA9IkIBCB7BIgIpCHBCgRSFgcnEECfrfGLQHP8eOiGn5/xSUgIgJDJwF72s7Sq4v30KNvTKU/f/Yt57VnaJK6
-						/GBx6v/Ql0tfvnz5+nrUiMKSvx5RXPqp+8Q3+GCa9rHSGTSbYfYQX4TrjiJdDGfIcZaAMBCA4I6/JiwBqv/frAFQ8J+2/SfDnIThf/+h
-						Y/T2jLX0wnsLA/gfO32NAP/aHQc5DP+IlgDAfzwiAwhDP4RgpZ4pWImPGaDNjICZFQDID0W/v2n5yQb/+S70Bfgnwr8F/gb+1e4+rlF/
-						9yLfXNp9AP7xUX8D/vaofz6tPrUx8JctOzX0G/A37T0G/OUmWgb8GfYN+CdBv9liMwB+6cuPt+mEsO8Gew5G8mOxW3jCNp4Lkp7TDPwB
-						7APy8bEe3dfpA+zz40l+lPSrnLp4g+GeoZ7B/pQAvgX6HLT8RHI9fLx869MA/m9/8sWQ9/kPpj7/4g8ya+GcDThznY50nubX9gS/1mrg
-						QCSAzy2HtARgHVD1YT6msGNUHY43Pu5q+ViswXHJx+kBPmar+BiuOMzHNB/b+/hY31NHm8oP0YZd/L7YifcJv184K/k9s3z7IVq2o44W
-						b+fsYADe2UgLdzXRgvKjtGB3C83b00rz9rbR3H2dNLeim+ZU9mRtCYIE5NQSZElA8rqApMXBrdnXBcQk4EXcOTiLBDy1vJ7eLmuJzAYo
-						CUgAfx2zE5CJSEAPogTgkIZ/gL9JzfELVN11jsZtqaffvj3cLUGpTwqKS36pL5u+fPnydX/XyKKS1/jENix39sUuP798bTw9/fY8Kttb
-						zxdgA/+c4YB/Bn9s7Tl/3R76PUO/Df+jJy4XYAf8rxMBMLFEgGFfCQELgESJQSACJgLOKpgRyAX+DfjnCv8G/HOB/3xafgz4Z2750eCf
-						AP+5jvob8A/hn6E/S7uPAX971D8K/nphL/brzxn8AYPJo/35QH824A+g3o4N9lZkJN+RoIWHE0D+GYzoA/Y16APyNfCf6r+sci7M6fNX
-						A9BPg32APgd3AzaPJv3XP1GPN9R6AMD/H+4h+DeFn6mff05sHdp2XksAw38Lv15o+8PrCwmQuydbElAr93qAPGoJaNAScOiYSMBuloDy
-						akhAk0jA9go+tnGM76sXCdjIErCeJQDnDZwfcD5YKbOA2AkM9/7Yx9krGwws5PPQgrXIbpq3plxldTnNXbWL5nBmr9wpmcnv7Zmr99CM
-						Nftoxtr9NH19FU3fUE1TN9ZwDtLUzXU0eUsDTdraSBO3NdOEHcdowq52Gr+7K5AA97qAZAkIRSA/CRARyFECnllRTwur+X3YN3AJEBHI
-						QQJqjp+n1bXHqfjDpfSr1z+Ua4/rmjQE+XJEccnv9eXTly9fvu6/+lYq9bdw90PHCW5Iglu4P1IymV5n8N5f26xG/u3Rf049otuAoi1A
-						iIJ/uw3I3PwrbAPSrUBaBPbyBfyt6WvohXcXCvxDAgD/WPiL7T7XM9yu36kEAKN4CC7kKgzAAv/RiARABvhCjzUDSgjUhV9EgKF6MsN8
-						zot9+e/mCv/59Pvb4J8N/m3wj8O/a9Q/Cf4j4J8A/xHwd4z6Z+rzB/ib0f6Bgn9am09stF+gX4N/0NaTEfqzAD+DvQ37EbhnsDcxbTuu
-						KNDXgM+gb38sI/sa9k8b2D93RXLm/GUOHjmXb0XAPhKGe4C+5IYJoP8TOmfl4s1P6ct7kf6tws8pEnD2urRg4cZouLlfXAJwwzYMMgQz
-						AXLX51ACKiwJ2HPQSACO5UYtAQ20dS+/B3bze4IFYP0udf7AYMGqMrVT2LLN2AIYAhCVACUCu/k9q0UgLgErdtAszszl22jGMpXpS8to
-						2pIyPj9spamLt9CURVto8qLNNGnhZpq4YBNNmI9s4PMLn2f43PLhom00bskOzk76YE11VgnIti7AJQGRHYIySMAzlgQ8yRlb1kL7O85n
-						aQFi2LcSjv6HiS8GPsjgr3JeBKCas+3oSXp+1ib6Telk+v7TY5zXpiFJcWoydsvTl1Nfvnz5uj8KuxqMLCzd4jyxDUFws5ZHS6fxxauM
-						avkiO+zwzx9j9A2j/XH4f+mDxQzSu2TqHiN3kAAF//rRyICZDQD4WzMDEAAlAmp2QAkBREBJwNSl7p7/bP3+ucL/QPr9Dfhng/98Wn6G
-						atRfgb971N+Af1XCiL8N/zb42z3+eYF/wmh/LtCfFfgZ5BXoR0fygxF9BnqT+OcK9C9LghF9QD6DPaDffGxg/+yFq9Fcuiaj4wbqTRTY
-						39GJwv55k5thPr1LO/0Mtvqv3pbXBzdAw/0SkiQA5xLMBKi7PCsJqG7EsdZOB6yZAAwkqJmAI0oCKvk4161AW/bWhTMBegABgwKyWYDs
-						CrY/IgGLWQLC2YDMEoDMXLE9EIHsErBRh0Vg7noazxk3Zx2N48f3d3RklICx27IvDo5LgBKBgUnAc6vqaUVd312RgMqOfnpn3QF6bMz0
-						Yb5xWGr9w8899/f0ZdWXL1++7u0a+VTqX44sKm1xn9AGF9yc5S9fGUfFb89jgDzIsNaZDP+IA/6j4J8d/rHDj/T6v7NAwD8O/x8yjONi
-						vaFcC4AVSIA9KyAtQXJRV4EAmEcjBvKoJQDwL+CfJ/w7F/tmgf8A/HOEfwP+2eA/Av5IFvg34J8M/2Zbz5YE+I+BP6dS4D8d/F2j/gH4
-						W6P+GVt9cgH/2Gi/3d6TBP2ZgD8J9EPAV3AfQH4sZkRfjepryD8fg3zk4lXq55y9yMAf5Cqdu/ZRCPWAeX6Uz/njcxbgX3B8jEcsAsYe
-						//dL/eEPf6CTZy+KAEQkoItfc7z+2BAgmAkwEoBjypIAyGe9mgnYJ8dpdD0AZgGwJkCtB8BMgDqnyCwAnx+wk9iKrequ4hiMQAIRyEEC
-						5qxS7UA5SQALACQgKgIxCVhbk9gO9BbLwUAkIJwNyEcC6kUClAjUydqAqq4L+UlARAS0AKRJwPmIBODuwQsrWmnUu/PlmjSMNw6r//Yz
-						r/5TfXn15cuXr3uzCp4a/R9GFKXOOE5igw62YfvV6xPoOYbunZWNMvKvRv85DP+q/18JgERG/601ADERkFmAyEyALQK9DHm9DOLV9DL/
-						f3H4x64/gP8x09Yw1B7UAqAjoKsEALMCMjMACGa4D2YF+NEWASUB+hHgbMM/g/9A4B/gnzf8M/TnA/+59PsPuOWHwT8T/OfS62+Df9Ko
-						f6Z2n6TFvfmAP6A/Cv7haH+kvScO/Qkj/DboY5TewHo/5xwD+vlLKhevXOfcoItXb9Clazcll6/doivXVa7dvE3Xb34suXFLP+qP5XP9
-						eO3mR3Tt1kf85zr4M71n/7WP1TaeeFThr30U3un38u1P5Q7AF4N8IrnEX7/HO3/S6rPPPufXSs0CqB2Z8DrjdTczATg++DjhcwjOLaoV
-						iI+rI9gZCMccZgEgAa1UwcdopBWoWknADrQC7VetQLIomCVABhJkphDvMX7fySxABS3LUwKUCCgJkHagHCTAiEAgAfMsCeBzT9LCYCUC
-						wy0BWA/gloAXVh+mjU2nGPyvBPCv1gBciu0CZMcGfxVs7arWASjwlzD4A/6RA13naH19LxVNXDnMW4Wmeh94MvXv9GXWly9fvu6tGlk4
-						+j/xieqq+wQ2uKDf/9GSyfTGjLVyATXwLwIQwL8lAA74j98HIBP81/IFeyJf+AD+v0esth8D/6+NXybT8tKzC7Bl+LdFwMwKKCHQUiAC
-						ACjWjwkzAzNW7IyM+g8E/gX884R/A/4K/nO4q68N/jnCvwH/bPCf3vLjhn8b/AP4B/gPZNSfoT+p3Qfgb8P/YMEfvfjYShMj9BiBx+j6
-						+UsM7QzsAPWrNxjQGbxv3r5Dtz/+hD6+8ynd+fQz+pRB9PPPv6AvvvzyruTLtPwhDFN8PsE2n59zvuCP78e6xq9JJ7+WeE0hAHitca8G
-						3L/hKFqBIAFaGEMJULMAwXoA7AzE5zBpBcIxbO0MhFag7fI+UK1A6tyizhNrMSuIdUFoBdqapwRYIpBZAlgAtARMlnYgMxuwyS0BW5qc
-						C4PTtgnNSwLsdQEuCWjMSQKeXFZHk3e3M9BfGnYJKD92ml6cW0aPpibLtcp1DRt0ikuvFBSO/o/6cuvLly9f90YVFKVG8Enqo7ST1hAE
-						PZaPvTGNL2K7+UIagv9QwL/Z+UdaftDrz6C3laH09Q+XKtgX4Od8sEig/+VxS2TB76vjljIs79GjdGE2yrS9gn9bCADBZo0A4N/MEARC
-						oGcF8DibAX1I4J/BfyDwL6P++cK/Bv9c4T+3fv908M8E/xHwT4D//Eb93e0+Bvxt+Af4Y1S488Q5Gb1Hjz1G5c9fvi4wj1F0gPxHDPGf
-						fsoA/8WXki9yCUP3QJIO7kMRN9jnm/u18KNjO1QlAWoWIJCADtzQjY8RtALxuQSLgo0EmFYgbA+K9QCVuhXIrAeABGA9wE4W3u3WegCz
-						FgADCWqWEBKA7YGxK1DuEjCfz51KAuyZAL0wGBLAAuCSgClGBCISsCGUgOV7Em4YNhwSYG8RmrsEvMR/r6z5TM4SEBeAXCXgQOc5+mBD
-						9XCvC7j1QHHJd/Vl15cvX76+2hpRnPrZcOzxj57Kn7/8AT0xdo7sk3+wqZ2hH9ECoPv/g9gSoEVAyYASAsD/YQY8jPbL/t0cBf+q1x8z
-						ALhoviywv0hafwD8L49n6B+/lF79cBm9xnn9w+V8gdwmF2jIwhZM13PwuCkQAsA/oBfwqyRAREDWCYQyYM8MIPPX7U3r9x8o/AP8BwT/
-						DP4DgX+Af77wD/DPFf4N+NvwL+B/SO/w4wD/TPCf66g/wL+ZAa+9t19actB2c+HyDbp6/TZD/cf00cefaKj/IhYF+a44QT8eBu5ckwjr
-						Q5LY94zB/EByPxfaojCL09GjJAACYFqBMBNg1gPg/CLrAfgYO8TnIEiA3B+AI1uDsgTsl+MXx3Mz7datQDvM/QHwHtGtQGoQAbOEam0Q
-						zodYEJxJAhauV7sDBSIwIAnYmlkC5m2kcTs7cr9h2IAk4OigJQCPi6r5tQgEILodqBn9N1uBQgAU9IdRW4Gq7UARA/+4R0A1wz8EAJlV
-						fpR++9ZsuXYNz7qA1Ccji1J/oS+/vnz58vXVFJ+IXuAT0pDv8Y8T5y9f+5CK31vEkF2XP/xz6lvMAmB9118GvKDNpw0j/j1qf//2Xqpu
-						aKcP5mwQ+H+Vgf81Bn7Jh5wJDP0Tlss+/yUTV8jfw8171N7dKtK3Kzt4KBHAIj4ZvcOsAF+84yKAtiDzsZGAhXzhlt1+8oL/bUMO/wD/
-						gcC/Af984D8A/xzh3wb/bPBfbYF/JvgH+AP4MYqP1hz01qMdByP3APw7n3xGn33OQJ+UoQR/huxckwbmdyMxkMfiWJP4nyUFf/d+Lvz8
-						uHlaJwuhLAruDhcFSyuQWQ8gIonjS80CpO8KxMerfX+Ag0f5WMdx3xTsCoStQVUrEAYU1CCBWhDM70G9K9CQScDyAUrAupr87ho8BBLw
-						+xwlALsDGQkoWnpIFggfOH5xiCWABcCSgCrOippOenzcErmGDZME/GFEYep5fRn25cuXr7tbBcWpd90np8Hle0+9Sb8ePZFemryK9vNF
-						MYR/LQAZ4N+M9puWn6DVx+rvx/S8ubHXUb5Qry47QKMZ8gX8Afwyym+gfwWVTFpBpZNXUGryShozdbUA/XYG1u0Vh2k7X6QxWmdG7Mxd
-						PUUERAJsEcCjaQuKCsGyLVUDaPsZHvgH+A8U/pXM5An/Gvxzg/8o+OcC/wb86/kYQKsGFtli95sLV27Iolb01gPwMyU79CNu6EecsG9H
-						Q322fCXQb2JBvAH5pMT/rp37G/9VYS0A1nCYmYB4K9ARjn1/gDo+F9Wh5YzPV+ZOwWm7AmFBcA1LgLUrkFoQrFqBZFegXfw+QysQ7g2g
-						W4FykgBE3zBscBJgFgazBOidgSbw+Wj87vS7BoftQIOVALMweBASgFkALQHYLnT94ZPDLgFbm/ro6anr5FqGa5rrWjfY4BqsL8e+fPny
-						NfyVSqX+xsii0hmuE9Jg84NnxtAjpZOpdPo6qqw7ljP82z3/Av7HzHafGPXHPv467WrEX43QdfMFsFyg//UJS1kCOBOXUQlG+g30T1lF
-						b0xdRW/y45v8uGxzpfTp4gK9k8FVbuIDgOWLNYQgvLW/EgEjA0YE1DoBSwgY/jGaB+D/ZsJ/CP4Z4d/u9Y+P+lvwD+hvau+TRZoYyb9w
-						+bpA/p1PGPI/c8N9tmSHfzf0I07Yj0fDfVIGBf0OAM8rGb6PC/zjcf27r0PhdzOvMRZlY5E2dlbCFqmyRuDEWTraeVJaC3EOsmcBpBWI
-						z2XVfLzadwmWtQCyK9AR2sXnGJkF4POJnEPwPtKDB9IKJNsEswCUVVkSwAJgJGBjKAGyHmBAElAWSgALQEYJ2NpE4/cMpQQco9EsALYE
-						YD1ARglYHZOAFekSUMwCAAnA48z9XQz7+UtATR4SUN5ymn43d5vcNAzXNtc1bwgyDddkfXn25cuXr+EpdXff1ELHSWjQ+eHzb9Njb06h
-						SUu3UU1jGx1szAz/svDX9Pdr8G/Q4C8j/pxwca8Cf4z4Y7cOXHTfn7WORjP8K+hfRqWTltMbk1fSGwb6p62mMZI1cvff2QzVmKKXMKjK
-						SJ0OLtayg4dM3SsZkDYhuYADfOv1SB6A2KwTqJOFfbiPAODfbv0ZCPwbAfjK4J+hf6Dwr8A/Hf4x6u+CfwA/WnfQttN96oK07GBUFu06
-						ADIE2zaGccN9pqSBPzKU8K8BPykDAv8YbA9tKPJ5HPYzxf53X5dKf83D40KOIT7ubn50R7ZixU5P7b1nZBayliXAbgWSBcFybGM7Wxz3
-						9r0B1HlEBhFwzpAZQ37P7VT3CpFZgAFLAAuAlgAIwIAkYIGWgBV76UMWgGwSAAHILAGtWSUAAhBIAAtA7hKgZgEA/4VLayWjNxyhvR3n
-						BiABUQGISACDvy0BFR1n6a01lfSbN6bSD597y3ntG3xSc/1dg3358jVs9SejRv0xn2zWpJ98Bp+fvPgePTpmJoPqboF/IwASwL8Vs++/
-						jPwf1SP/utVH7eyj2n2OtJpWnxD+mztOMKA3yIh+6cTlDP1o7VnB0L9Sj/Ir6B/LwP/WDGQtvTNzLUP5JhmVwwgdduyQrftYBLBoDxdr
-						CUbt9MgdZgW24ZFBFxJgZgW2YFZAiwBafyYx0McX/X4V8D+Ynv/hhn/cuRej+tgrH6CPRZif6O0wkzLk8G/BXZg4AKo4Yd+OBvyk5A3+
-						McC244LxfBJ+L8B/NK6/ny34Xl+XwmsZfe2jx0d4PPExaOWjO5/Q5Ws36VT/JepgKcAMgVoQrNYCqB2B8H5o4nMJv1d0W6EMHpi1AJgF
-						kB2BdCtQVgnQOwNpARiMBEAA0iQAawLKO3OWAAjAYCVAzQIMUgKW1NJzK/m5bTrN4M8SEIN/gL/JQS0BIfxfoGoJg78IgJoBAPibVHX2
-						UyXS0U/jN9fRY2NmyLXOdQ0cfFLLMUCnL9e+fPnyNTSF25HzSWZ7+klncDE7/Yx6e55cwEL41wLAwG8EQMBfj/yrXv9uakAA/61mS0/V
-						6hNCv0ozwz9mAXAxTDH0vwHon8zQP3UlA/8qGmtBP+76+86sdZz19O7s9fT+nA0yBY+LM+7eiV5dxOzfDRFQN/NRI3ciAjIr0ETbMYon
-						LUJqNkAtHFZtQdMZ4AcD//HWn4HAvz36nwv8A/yHsu0nDv8Vde38Gp4IYB9bZ7oAP1O+HvDPsJwtGqjtuKB78FHbXyL83wYJv+76N8n5
-						uhRez+jrHztG+NhRx5QC/yDW8WmOWQjt1Ru36PS5yyIFGNDYx0KAHYFkLYA+Z2D2UAkA3oNqLYBIQFn+EgABsCVgri0BLADZJMAIwOSF
-						m5QErD9IE/b25CUBIgB5SEC2ewQMVAIKlxyiuZVoCUqfAchXAmwBiEvA/H3H6LG35w7jDkGlZd/6derv6su2L1++fA2uNPzvjJ1oBh2z
-						089THyzli1tdAP/x0f8A/JFmwD9afhT4I2YvfyzuBeQfRUy7T4ca9ceiuwnzNynon4LFvID+VRr4NfTPXEvvzlxH7zH0vzd7A73H4P/B
-						3I188dwvo3NhWmifLEpVPbvBjIDMCjTLQj4zK6Dag5QIbOMLuezswVmwfh+NB/QvAPhvyR3+E/r+84b/AezzH4d/e/Q/O/zj94/Cf0V9
-						G4tbr+y8A9i/9dEdBqEozOcbG66GB/7j0BcmDfbjsUA/nrxG/Rmi7w74m9iwr8I/hiT6dde/Tc/XpfBaRY8Bx/HCx5A6tvh4zCAAyCcI
-						H/92IAUnzl7gc1kf7a87xufJBn6f6cXAWgAGJAHYGciaBchVAqYlSAAEALOZE/d25ygBsVYgjhGAwUqAuVuwkoDDGSUA6wGMBDyx+CCl
-						NvF5qfN8RADcEsDwn6MEoA1IBEBLwOra4zTqg8X0i1fHD5cEbMc1W1++ffny5Wtg9a2i1D8sKCqtcJxkBhXcMh23Tn/2wxUMhg1UfbhN
-						UmMi8I/e/046hOh+/6DXX+/wE7mRF2LDP1p+OHsYyN9luAf4jwX4T19Nb3EM8L87S0H/+wz9H8w12Ujj5m2k6Uu3y0gc7tyJ3Tokh9CP
-						zhLAX5dZARYBFRYBLQRmrYARgWBGgINFvxM06AdZsDUR/jO1/uQD/6EAVAwY/tNG/3OE//KaFtlyE7CPu91i0SRGPePAYwNRvrHBKg72
-						uWTY4J9BMVPuXfBH4pCfa1zfK8zXofDaBsfA54j7uIrAvyUAwbEbew+EwfvjM7n7851PP5WF7Lc/viMLjbHrEO4qvHVffSAAUQmozFsC
-						gkXBRgJW2hKwLYsEqFmASWVNgQAMRgLsRcEDkwAWAI6ZBchJAhYrCXhhdT1tbzkrElDLEhCAv/T/42ZgYQIJ6GIB6MINwUwU+Fd1IP0S
-						wL/J+vpuenziSvrV6xPkWui6Rg4uqf24duvLuC9fvnzlVz/4zYv/GZ9MqtJPLoPL955+k35dOolem7mR9tc2J8C/afsB/KPX3+zpb2/t
-						2c3Qz2HoN73+QctPR59kFV8MMdqPNp+3GfplpJ8D6H8f0D9nfQD94xj60euvRuOxy8UWaeep0tv1VbEEyLZ9lgzs50AE9mNvei0DIgEc
-						mQ2ABJh1Avy9sPsPgB5wL5CvM3ERgz8eDfwjWfr+c4L/tNH/irzh3/T85wP/e/k5wY20ek9fpKs3bgcwE00UeGyYzzch/LsALHvuN/h3
-						QXX2uEDdlXz/PmL/P9nzdSi8vgr8ET5GOK5jy4b/tGMXx73jvaGgX+cTRAkAtqyNB7sP9Zw6L7Oh2EFozQ68fwcuAfYsgEsCpBUokAB7
-						PQALwKq9NJEFIG0WYJASoAQgFwnI7UZhgQSwALgkADMCiw/25CUB1YkSoAQgLgHbjvTR09M3qG1C+ZroulYOJhi48xLgy5evvOv7o1J/
-						f0Rx6R7XiWUwwVZovy6ZRG/O2yrbfMbhH6P+YdtPuLd/HPxlhx9zIy8dtPqo4Hb8vXJBQ28/RvsB/jLSr/MBwH8OQ/88hn7Oh/M20YcL
-						GPxlFH4LA/hW2WUDo2zYrg83CpN9u/lzEQJ9J097VgB39ZT9vBNEAKP/MxjccedeFYZ7PcIvQmBLwQDhP3PrT0XO8G8EIBf4B/BjK07s
-						gY799VUrTzrUROPhPyf4Z1hOioFp+dz6vrn830Hsn9V8HHztD0E+tz5Wn/PvL1F/ZhL8Hf6ZEPvntPN1qLTjhhM/tj6VuI/bTz/7TODf
-						FoAo9NtJF4CPJJ9E8/EndJvff5glaD1+StoV17IQLIcAaAmAAOQsAXEByCQBaAViEZhU3uGWAIb/D7QADFYCwkXBbgnIeI8AxyyASwIe
-						X3SQPtzZyoDP8G8kQAQgKgHRWYB8JOAs7W45TS/O30aP8DXx+08P/TahI4tSu3At15d1X758+cpcGDUYUZg64DqhDCZ/9uxY+k1qMr0z
-						fysD9DEG6lYGax098i87/TD8my0/g20+RQDUFp8y6t+qWn7CUX/V8tPCAoAZg2lLyqS//x1k5lrZ8lNG+znj5Bb2DPzzFfRPZOjHaD+g
-						f5JMa5fxRRC7EXXQwcZOidzCHzLAP6O5i6ctAqZFCDMCwWwAx6wTwPqABev2CsQjU5cC6jlGBIJHFgIkV/jPue+/IiP8u0b/k+AfbT01
-						TZ3U0XtW2nkAI4CWKOBnyj0O/+YxLVH4H6wAmOD/w++C5waw97EGPQAdWqUQSNWtj9Qjtpa8dRufh8HfAfwJHOLfCzCGz3fwfNm/ayzy
-						nMjfUX/vU/4dPkE+D3Pnsy/p4yBf0EfIpyq3JZ/rR84nX9CtIJ/TLfwZf4w/+5S/1/1ckBh75D/yHFoJBCBNArCLlQP+I9BvJxQAF/Tb
-						MccM2oUkfHz0X7gi66HQDrlqa1WCBNiLgjO3AgUC4JCAyesO0KR9PVklwF4UPDgJiAkAwgIwmJ2BnrAk4M1NR2RdgPT+B7MAeiGwhn+1
-						BiAK/1WIXgOA2KP/2Bq0ol1l97HT9MqiXfpeAWPTrpuDDl/L/UyAL1++spbA/zC0/fz5s2/Ro29MoQlLdwn42/CvFv7qnn8N/qbnH3f0
-						FfDXo/8G/s2ov4F/jPq3cDDihVaet6evCUb8Af7j5m6g8RxA/wSGfmTSIgX9kzkKtjkM5TOWqb5//CwShl3cuEfCIqBkQAkBZEDag1gG
-						KvVNfUIRwIyAmg1YwYCNXX+mLzcgj0cF9hL+f6cx6E/l/1tBv3m04D+f1p8c4D9p9D8O/xjpx4Ld1u7TcmMtBSMMJQZadAzIZE4U/l2R
-						togILOUWkYABigAShzlJFgkA6Nsfy+f87/B7AMIBYtjJ6Pqtj+U+BVeu36ZL127Sxas35U7EFy5z+BF7xV/ir+HPLl+7JW0dV/nvon3q
-						2s2PJLihGb4PtkHF90yCf7w29nMtz03w+4TiYWYZAhHRPzvyGX9sEhcBIwHqUUnAxwz1RgIiQgD4N4+QACv380SAzIKY59SKHEvmOOTE
-						j1EVBf+R90UE9sMYmZMw7H+sX+t4QuiPgr+dQBhvf0xnzl2W8+euA00yO5C7BGzPOgswmT+fvPd43hLwtpaAsduHQAIGuDNQfFEwBGAU
-						53crsS7gTA4SgEXAbgmwBSAuAfvazlDJ8n30m9QUGShzXUMHmaoHXnjhH+jLvC9fvnxFS+/2Ux47cQw6uMHXo2/OoFkMpFUN2Ncd0RKg
-						R/7Vgl/V+iO7/RzVC371bj+q7QfwH27zKaP+HXqnn84+2ra/Xi3qnbmW3putevzR229afCYC+mWkny9Ui3HRKmPI5ujR+GkM3zMYzLHF
-						nty18wii7tyJHERYBhBzJ0+TYFZA1gio1iCRABYJ9MXPBLSbMLzPXI479gLmOYB6TiAHWgjyaf3JCP959v0D+surm6mprU+2JQRUmBFI
-						F6QkhsEmdzkYOhEwCWcHFADnmzTAYwHA90XrxU2GKMA5oB2zINjF6Mz5K3Sq/7Lc9OkUP29ohzrNXztz4Sqd5eDvIOf4759nkcoK/5YA
-						uOFfAR8A0AX/wfMQ/Pwh+KtWnLB/34iAkZnPv2DA5cQlACP3RgJM4hIQF4AkCbjD3+d+rfixERw3EfiPCoDs8hMHfwSvmfW+iUA/gtdW
-						kgT8JhbkJ4WPWxMcw8iNWx/JPQkwwLKj4rDMDEAAsknAjEwSsKkuEIDBSEBcAKISkP0eAfGdgQayKNhIQBFLwaq6E1TDAhC0/ejYuwAZ
-						+D/QqSLwbwLwb0cU+O+3wxLw4eZaloBhu2FYud8dyJcvX2mFEwP6BR0njUHlR4D/sbNpMQNmVb2Bf93+g55/veD3kA3/wW4/3TLyr8A/
-						bPk50qbafRT4q9H/lVsq1RaeMuKPBb0K/LH1pwH/KTLSrzJ16Ta+cPEFjKEf4D0D09sM44s27CO5sZiOun2/uoW/xMhAk5IBMytgRKCK
-						fye0BUEEMBuAewPMXb2HZgPWTaR1BxDPESnQIsAB5IezAzvzh39bAPLY7nPL3sNUy79nz6kLApkhdFiJgwknZylg0LFlIP65O1EhkFhA
-						NZBkEwL8HcAUgBswfp4hHQAPqO85fUHuOoznCIubJWcu0glO39lLdBIZKPxnGP3PB/4R89zJ78u/U2b4zyQBjlkAfJwgARJLAGwJSJoF
-						wEj6/VZYbxE/biQa/EMBCI87Bf84hu3jWwevmbx21nsr9t6z230C4OfjwDnCn5QY+Eeijy/IwPWbt/mYvsDnuk7aUH5Q1gQYAUiWgK2h
-						BCxiAeBz1mQWgMRZgEFIQOmWtjwWBSfvDGQvCoYAiARkWA8ACRi1sEbuFxCXgKAFCAKQJgF6BiCbBLSdpX2tZ2hSWb3cNRjXTtc1dZDZ
-						6e8T4MuXr6BwQsCJIXaiGHT+4oV36fF35tLKHQcj8F99WI/8p436mxt82fCvt/eMwb+Af2ef3OwLU9eysHf2ehrH8C/gjztTavCfvAgj
-						U7hAhdCPkf6ZCEP3LFzUVu2iuRyM3OP/lrB44IY8CERAIjJwPJgVQHuQiIBpDRIZULMBmAlYsqlCAF0FwI6L6W5LBnaJEMisgJYBPM7A
-						DIHMDOxywv9g+/7X7aqVhbvtPWcEPtWCwmjiEJIWG1ZseNHJKgcMP9klANHwb8WGq3wC+McjgAjtOAByAHsvw31n3zlq7z1LHb391HkC
-						OSfbliLHT56XRAQgT/jPa/Q/Af5zGv03vytDqYH/dAGIzgA4BUD+rYJb6WVnqP3Eyh1JbBYAMQKAr2WRAPwZfob7pfA8mec2Lfi6FXPM
-						IeGxq14jddzza6a395TY7y2d8P1o4J9hP1N7D6KPEyfox2KgPzF8/F28cl0GWXCH80V8rnUJgEsCpmw/mlUC4gIQSAALQGYJyNwKFJWA
-						LDsDZVkPEJWAGvrtwmr6YDtfxwD/aRKgZwGMBFizAIEEdBgJCFuA4hIwc2cTPfLmTPrx795xXlsHme0jn3rq7+jLvy9fvr6plUql/sbI
-						wtRax0liUPnJ79+jx9+eR6t21FBVHYM/BICj+v7R9qNG/2tZAtToPwRAw78RALT9oOefwT/Y378DUaP+WBuAi9H7s7Grj+7xnwfw36TA
-						X9p8FPgr6OeLlly8GPg19APIAebIhvJD/P/18v+L9NBhlo4GfpRABJoRiIASAlsETGsQYmYD1u2spXkC51a0CIgQaICfzT9DKASYHVCZ
-						uaI8UQAGAv/YphM/OyDVwGMQM8IYgY4wcTBJCwNMXvDvigajEPzt2BClE4OsePBzAKAB2wByjOAD7o8dP00tHDy2dp+hNqTnrMQlAPnA
-						/4BG/4eg9Uc95/q50r8/oNQlAFEJCOE/owAwzON7quc+fF3Ma/exBM85h/+OaxZAHvXHtgRgPcH9Unjd+s5elNf8LL/G5y9dk9fw2o2P
-						5DUJjj9+DkzCYzY8xgP4NwLAr6MtAJH3n3mPavCPwL4Jjg0dF+hHoo+nTPAvx10ktyXXbtyi7r5+2cFtVVllxlmAqav20uT9vXlLgJoF
-						UBLw1qDWAzSHswAsAS+wACAiAQNYFGxmASAAyJubj1IlQ74tAQcQM/rPiawBCOA/FAAAvx2sBZCwBMwqP0KPjJkh11LXNXaQWYVrv8YA
-						X758fdMKJ4ARhanFjpPDoPKTF9+jUW/Pp9UY+bfgH20/NYhu/THwH2n74QQLftsU/AeLfQX81eh/Df/7KYu20AcM/2j3EfDXe/djUe9U
-						vhBhtB8LejHSjx0sMNI/hyEaPa0quxmedzM876HFG/YL5GN9AQIRkLsLI5CBQAR6ZEYAf9fMCmCtQCgCSIfc9Au7/qgAzPlRIH2vADtk
-						AP+vmR0AzM9hsMfswCyJlgDMDOjHXOHftP4sZvDH3XePtPcxdKqbb7kSAoaVQAiQEEYC4M8lGkzt5CQGGpIioBn7PMznDDV3GKJvCWwD
-						ygHwzZ2nqIl/b/zuRzpO0lH+HF9DWrrcApAz/A+29SebADjgP5sAmOdOnpO4AGgJANzbEhCP+fMA/nVsAYhLgPl/zc8hx4v8bJ/Sbf4a
-						jpnbdz5j6FdJagX6+NN7XwIAz4B/vO5okenl46Fbjg8+ThiK1XFzVkQT60Ewco7XEM+NUwCC9wMHz5+O/X4LIs9pwoi/Throx5MF+hEX
-						9NvBQnY7Zy9c4XPhcdq8+5AMxkQkYPFmmlLeliYA+UpAbusBkiTA1QpkrwdoFAHIdz0ABOCxBdX04uoGKm89G5kFONA1cAkIBEBLwNw9
-						LfTI2JnDIwHFqYWMAX+kaMCXL1/fqBpZVDrFeWIYRH764vv0+LvzaX35IQX/WgBC+DcLfhn+pfWHE+/5b0X0Pv8M/kfQ8qPbflo42MoO
-						bT7j5qxn8N9IE6XP32r1wZT0MuxZreB/Nkb80cPK0D8P0L9GQf+CdRzsfsHZzd8Tt9tHexHajCT8cRM/NrKAYDZAZgUsGZD2IAgAgtYg
-						LQLYEWjppgqGcIC4DsB8vRIBSIDp1zezAjIzsBoiYGRAtQnZMmDDP/6eSwCWbamSrUcBtWhxARgYaLitwTHXBDIQjwtQOAZgnGHIccUA
-						ZMZY4ASAAUwDwtq6z9Jhfn3qj/Xy64HX6EQQ3IRMCQDDvyUAucF/FgHIAv8DGf3Pp/c/HwGIzwLYIhCP/XeSBMAezVYCgP9fC4B5nUUC
-						sAMSHxf8M5rjTv3s+vfA5/zntz5mKWBBuHVHScC92g0EscFCWbzeffzao2Ws9/R5PiaUAOBYwXGDrXHRVofjCvvw494YzZ0n+Rg7zbJw
-						ThaJX+RjALCtXjcV8/wF7yf9+obvxwTwd4G+lRtIAP5IEuwjmWE/zC3JVRM5bm/x8XxDfufd1U3SKgQJmLr+QF6zAAORAJcA5LsoOL4e
-						4Mkc1gMYCShaXEMbDp+MzQKEEiACYEtAIABZJIAFYO+xM7Skso0efWuODKy5rrmDzCSNA758+fqm1IiiVMpxMhhUcIIqfG8RbdpTR5WH
-						WqiyTuUAWn/q0fffLiP3tY3mLr8M/7rvP7jLr2n7EQHopaNIMPLfR2X7GgT80e6DBb64/TxG/NWoP3pRt0mrzyyAP0b80dsP8NfQL1vd
-						aejHgt/FnHU7DkpLEb4/HvH/iQjoQAIkAEu0CFkyYNYIoD0IswEQgDXbD9Lijfs5aMFB+GNLBiACIgP8MwDajRCYmQHIwBwdAL9qEVIi
-						oAQgCv/YvQf3IuhmGMFFPg0SMkTgTANaphggyRgbYDgBFCZF4NFEAawJvgYQBkRjlBUgVd/SQ7VHuyWH5PnuoTrMyMQEoLGtLyP8D2r0
-						H/CXRQBc8J9z+w//zkMlAGkSgNiQ74r+e+bfhXewzV0ADMBCAOT40eCPj20JkN+Jo2D1DsPqHfm3uHnYvVT4XdTuTgz/MgOAYwHHBB8b
-						OEb4WOkyMwCBAKhj7JgWgKN8XmmScwnaC3G84vzRSy38Z1387/C9MWMAyDfvJ/PeU7EEIPK8xYJjRR8zceAX6DeJgD+CY04nAP1o4sBv
-						gmP3yvWbdIWPZTuYFdl7sJkWVPcNuhUo43qABAlwtQJlXRScYyuQvR4AEoDFwUtruoN1ABHw51R2IiH4V0gA/yro/99nwf9eBALA2XPs
-						tEjAbyABwzATMLKo5DWNBb58+fq618ii1AuuE8FgghPTE+8z/O+td8A/ev/1dp8G/ps6I/BvbvKlev7DG3yZO/sCzldvq6IP5q4LdveZ
-						tHCz7OyD7Tyl3Qfgv0KN+GNB7zwGZ4A/RvoB/tjr2kA/oBwLdJdxsLsPLsQILtb4v3DBVjKAWQE1M6Au4OoibkQAC4VlfQBAlAVgW2Uj
-						LduMnnsOeu/5++MR/1eaDFizAtIeZCRgzd6gNUgtHDYioEb/8XWsL4BsADydICCAEMKCga5cE8wYaNhMioEVSaxdyI4BRPtjOwBewHMH
-						wxC2H61p6qLqxk6q5kd8fBCzK1hzkQH+Mepv4H/go/8Yyc1/9D/n9h8N/zm1/yAa5LIJgJEAA+YZJcAkBv0mAfzLvzXfJxQAzMTI/yHS
-						of9/67WU15x/tsixEoB/VABUwmMWI9Y4XvH/3wuF5968vqEAqBkAEYBTOE74eJFjR88AYPTfCIAce+o4xGCCHKN87jCthNhU4CBaB3Gs
-						87kR2wlDDiAQJ/n/uszHiHof8nMWea5iCYDfTgz+7ePKjPJnBH4N/Rbs20kC/8t2rt6gyzc+os4Lt6m8/SLNrekbcCuQWQ8gAsB5gyUg
-						bAXKXQLMeoBgFmC1agUa6HoACMCjHDzOreTXUWYB4qP/Lglg+NcSEBcAkQAtAEYClla102NvD48EjChMPa/xwJcvX1/XYtv/7Yii1B+c
-						J4EBBickNfJ/iCoA/1oA1KLfY1STCP961F/Dv9zkS8P/EcA/XzDVqPwJhur9NG4uWn420EQZ9d8iU8xY4ItFaFjcO3vlDhnxB/jjZjYL
-						9Ig/wB/QL3e/3LSf4ZzBf0slLefsqGqi1q5TMnWN0bpjXSwCCP+/eLSFQPrJ+WdSswJmnQBG9Hr4d+iRXXWWb6nSOSCPy7DrjpYBLMZd
-						whKALGIRUDMC+/jnU737C0QG9IwAJy4DaKsCOJy7dE1f4MM4oSAtNnQZoMwcJQJaBuJQl5B0KUBCGcD/DUAGXAPYDxzupEq5kRq2UQUE
-						AYaywH8WAcgE/wMZ/c+1/cfAf2YBYPAX+L8lCQRAQ1feAoBoAbBnAVwSYJII/Trm39kxo//SjoX/Z0ACoGIfhyrqGLVbVvB9vqrZANzQ
-						DfCN11XBP4dfb7T/KAHAsYEZAD5WzAyAHEd6BkCOM90ChOOQzx+qnRCzVGotUZ0WAIg87qxdI8c+vw/q24J7iGAEfV8tbkrYJTc6hHRA
-						Hu33tXq+orAvwI/Yx5LOwEf6GfBNNOynAT/CzxvAHy1BEv7apduf0qVbKt2XbtPezks0r+YkTQgEQElAtlagiATILEAoAXEByEsCrPUA
-						aa1AOa4HeHTBAfrN/AM0fgdf9xyzAPlKQHwWQGYCWAIeZQl4+Pfvpl2HB5cUM0HJoxoTfPny9XUrhv/v8xv9M/cJYGCRrT4/WChwmgz/
-						WPQL8A/hX/r+BfxjI/9Y7GtG/gHeDNvoJx03bz1NmL9RjfoL+G9V7T7L9Kj/yp3S6oOb1wD+Bfw3MPgz9C9l2F7K4L+MwR/Qv2JrFa3k
-						rN1xUEb9MdqGtAIMIQKBDPAFnP9cZgb44mtEADMCIgEcIwG4mK/dWSt3/LUjEmBiZgb458CMQCAD2LFHzwiEAqAesU9/FUMBRh6Di3js
-						Qm+AKS0aqGxYUHEBmEpuswUK6HKRAoAgfpYz568KHNW39FJFHQAHwVapAH8H/N/l0f9c239OnMEosIpAYYIAGPjPJgCR/n+BL4YwC9ZE
-						APRrFnn+9XMbSIAG8fgsgC0BJnHYN4n/vTC4c60F/1oAgv51DmDdFoDgGDDHCD/ax1D8uBOQRYLjV//uHPxf2KnobhV2Pjp38TqdwWuK
-						0X95nfXrjmNA+v/VDIAcJwz/mAEQ+EcwA2AEAMefdc5Q64lUCxDaBs1OYjU43vl9ju2DjQDgbuQQgN01zVRec5R2Hjgimwts33+Y9ta2
-						yAAK/k8cW+ZcEBw3kcR6+2PwH4z0x6BfjfDrMMTH44L+CPibYLbrxscC/xcj+YTazt2k7a3naUbViTQJSBKAdAnIvB4A9wcQAeC4W4Fs
-						CUheD5DcChSTgHkH6N2yZoH+oW4FQhZXtNIjY2fLtdd1TR5wiks/HVlYMlLjgi9fvr4uxeD//+M3+Z20N/0gghNQ4QeLaXNlczr8iwDY
-						O/6g55/B39rxx4b/IwH8q35/LPbFOoB5DPXj522gCQs0/C9i+F9apkb9rT5/3KxmvgZ/afHhCPRzcKv7APzLDtCqbSq44OJi3a4FIIgW
-						ARW+kEMEMJJnRAAXdI7MCAh49spMwupt1fx9rZRVhzLAArBiywERAbs9CAKA1iAzI4CZANyYCxCA3UQE9p0XdR0BpQwSgATg70oUxLIL
-						gIY6DXTm4wD4OAACANJRfr4A8nsOHqM9tQwztYAa3CE5BwFIgH8RAMB/vqP/Obb/2PAfCIAAX1QAbPjPJAAG/odCAOT1Ma+Bfq5t8HZK
-						gCUCLhmIx/67+LefInL32jj8c6z/U0b9EVn4GxMAHCv8MX528zuY38cch87j1gJavAfw/TEyPxwFwcD3xp168Tvi/5TX1AiAlr6g/Qcz
-						AAL/evQfxw/gH6P/nPC8oY9FEVM+RgH/CEb/LQHA7mHSAqQFAPcjUQLQIhsUlFezAPA5BgKwjQWgjLN1XwNt3dtAW/bW0y6WA7QyQggw
-						QxgcPxIN/THwjwpAFgng97Qb+hEF/k74R65cp4t8jNvgb3IBualyrP8mbW05T9MrewfcCpQsAe5ZgN/bAjBErUCYBXiEJSC1oVEAf6hb
-						gRC0A+EGm0N/n4DUxyOKR/9/NTb48uXrfq8Hi1L/I7+5b6S/2QcenHgKxy2lTQ0naH8tCwByqJkFQO38c0AW/arWH+z4U3sEAqB2/An7
-						/u0FvxAAtfi2hQUAgoA9ptVNvczIP0b9y2gmw38w6r8K4F+u+vx1qw9G/IPRfg5G+1cx+K9m6F+9vYbWcrZXNlIHX6hxwZSRO/7YRGYD
-						YjJgLubxdQKQAEzbr9lxUKeG1vD3NzKwkmFeYmYE+GdRswKVLCdGBPhn5L+DUT8AhVy0Bew/1uELNX8tAobxBCIwGBmwY0OaAU93ALOA
-						ZYxqAvB3VTdLymsALy2hAPCf7TuUGf6ztv8kwn8WAYjDv0sABOZio/8Ce5kFwMD/UApA8Frr18xIgHrOAdOhACAuCcgkAhlj/xv9PeLw
-						H/x/nEiblw3/IgDhz4ufPX5c4ZjE8WaOz+A4vqk/1s+FBM8NB38PvyNalwYzLyDQ/yXubBxta5Lflx/x2qn2nxD+7dF/tACF/f9W+w8f
-						W0YA7P5/NVhwQloG62MzALh/yAF+D+Au4tEZAEsAZAagkbZXNEYkYIuWgM176mjT7jraWH5IRAHfEz8PhMA56q8h3wn82Xr7EYb7JOjH
-						gua03LijoF8Dfzzndc7d+IQaT12nNY1nZUYAApCPBJRsaXPOAuQjARCAZwe4K5AtAa+sbaA9bf0C/iYC/5wKJAB/O1oCGPhlJyCAv0TB
-						/+4W5BQtrmyTmYBhuFnYjRGFqf+3xgdfvnzdr/WdUan/O7+hz8be4IMKTjij3l9EG46cof1Nxy34b0mDf7Xlp4Z/e9HvMb3XvwX/6PlH
-						7z1mCqYtKVNbfC7U/f5o+dFbe2K/abvXf+F61e6DHn8s6sWIP0b7V3EU9FczlFfT2p0HaR1n/c5aEQ1ctINoEejo1SLAF3FELuZaCJQI
-						YI0AQyUkgAUAawFw0cWiXLQUmWAnIMgGYmYEMPugZgTUbACgf19tq/zfWABqgCc9/Ge4cPPHETjMJSIEWaQACcDfTjqwAeIAD4CgRoZv
-						jOrvqGIwqQKgHM0K/9kEIBH+swpADP6zCUDa6H+yABj4zyYAgP8kARD4z1EAjASo109JYFQAFFQbyM4mAQK2DLX5JPh3ePyUv5f1NRv+
-						kVAAOBAAwD7/XIgSAD52zKMcR+GxZR+D6ndVx6w5fgPwN4/Wc6QWTd+Sf4v/Ez8bZjEgBgB7BGsI5EZnCL72xZfS7gTRiUsNYgQAwc47
-						wdafZvQfMQIA+Dej/xAAPqaC84UWAJwnzECBrAEw7T8yA6C2Dj7I5zvVAgQBsGYA+H2zpxbvI34/MfxDADBwERcANQuQLgHIhl21tJ6z
-						reIw/x8d/POdpnMXr0agPxv8hyP9CvojsI/2HitqgbsF/XLsc/jfZoL+8wz9CODfzsmrH1PF8cuyXiAiABwlAB0iALlKQNgKxDECsNYI
-						gJaATOsBMs4ChLsCmVYgSMDvV9XJvQLiEqAEQElAVAA4MgsQlwAWgDQJaKVfj5k1HDMBZx4oeu1faYzw5cvX/VYPFb78j0cUl7a63+AD
-						yw+ff1vgf33TGTkxVzDsG/iX0X/Af2S/fxf8Ixr8ZcGvHvln+Ee7EIAfbT9qse9mfVOvMsLt581C3/lrGPzXhuCPdp/lm/WIfxnDP4P/
-						GobutQD/HTUK/PlCuKG8ln/OVrlwS/jiHUaJgMgAANGaEZBZAQCkubDri3s5w+6GXYf4e5vUKhng/w8zASIC2zAjUEMr9YzANr6AY2Hg
-						5asMLxp0DKwb+DGgH0RDj4EgiUzrR/9e8L3smO8rCYErW4wI4PsCggDVFQzuuLnYtgrACMA/Hf7TBaA16+h/JgFIgv+c23/4NYsIAEBN
-						BMDq/dfwn0kA3P3/aBNh+D+v4D8fATDwrwTAAlt5bfVrJ68fvx4WNOcjAXERsBOH/XjCf28Swr/5/2QdgoZ/87OIAEjCn1V+dvPIv4vM
-						akSON/V72setOabNcR88P/xcKVA1j+HzqKIFiwEV0IqfNw766VG/nxKeMBf5e0QX/xr416P/WgDswQM5R8h5AoMESgBkBzGGf+n/l+PY
-						tACp9h8sAoYASAsQn58wA4A+fyUA/N6CAKAFiJMsAckCoM5LGJxQM5TYThkzBFi/gOcoAvx2cJxKNPDH44B+Af4g1xj+b6UDv4kD+k36
-						b9xRua7Sfv6WtAhN3NfjlAAlAEoCsCuQEYBs6wGiswBNjlmAfCQgfRbgkblV9MyyWtrRcsaSAHsWwCUBmWcBlASckszf20K/fnOmXJtd
-						1+yBZmRRacufP5v6LzRO+PLl636pPxk16o/5Tbwz/qYeTH743Fv02DvzaFX9KdrP8C/B6D/DP2Ju+KVG/9tCAcCiX77Qqbv8qtF/6ftv
-						VQJg+v4PNLQJ8H84fyPD/2b5WBb76pafOSt3ypoA0+uP3X0M/NutPjLazwmgn4OL4abdh+RiCcCX3TtO9ssF0I66oNszAirpInCKofQ4
-						bdQX2w1WMMOgJCCcFcDXa/lCjxHjtJ7+GzbEa7DX0HMt+DMLgII/i8X+d8H3i/1f8TB4qRmCcJYAX8edTLGAEYC+dX+jpGx/k0oWAXDB
-						fy7tP3H4VwKQ2+h/zu0/Gv6TBMDAfyYBMPDvEgDAf84tQACrDAJgXrsAktMkQIF2XAKSRCAEegO90bj+rsCzfK9wxyHzf6gbfSHhz2B+
-						JiMA9sg/9vkPBMD8TjrmWLR/b3U8KwEIAujnx3C0Ogr+Bv7xHJvtVq/cuBX7XfEc2DFf039uyQJ+X6wBCHv/LQGQY0adL8JzhJoBUAuA
-						tQDIcamPVTl2+RgG/MsMgBGADjUDoEf/K+T9wu+fg3oGwKwByCIAmSQgEACRgGrVpojz5Y5qlo1mOQfjzr5R+E8HfgX91ig/EoF+Df7I
-						tds5g3+/JAr9yNlYTl+7Q3V9V2l5/Wl6d2eXQwLULIAtASIAm3QrUGwWILdWoIY0AZBWIBYAJQGZW4EemVtJT7EwlB09LeAvEfA/R/sl
-						IfzvQ/QMwF5EC8Behv/dAH/JKSpn+C9vVplVfoT++o1p9OfPvuW8dg8iZd9Kpf6WxgpfvnzdB/VHuM2348084PzgmbH0mzGzaMWhvgD+
-						MQOAreoU/LcE8F/N8F+je//RzgMBwI4VAv+67z8O/5AHjPgb+FeLfbcGW3zOWRXCv9nW0+zss2JrpbqQYcRfRvtr+IIH6K6ViyOmvgH0
-						/RevMrh8Iq0AJtjxA6Og2EcbsICRvuPBjEB4cTczAiIBDJNYD4CR/M176mmTjpKBOiUBu3DhPSRT+gAHQLmMwGu4CRfmMegw5IQSoL9u
-						Q4/Enq6P/5lKAP925HuGCf//aPC7A16qGMg37z3Mv0+DBB9v2ceQYQQgAf6zCYAb/jMLgA3/g2//AZhFR/8zCQDg3xYA6f8eZgHINAsg
-						oKxHzl0SgGQUARMG3YyJ/f1wpyEz0q/APwz/n/r/Vj+P/pnw8+HnFPhXM0k3bkEC9O8B6Mf7wRYAjhyneC/I+0E/F/bzYqAfjxb0G/BX
-						UeCPmJkX3DE3HfxNQuB3Bd/7BCRQ4B/HBQSAjxUcM3zsKPhX5wcD/9L/j3SoHYBM+w9mPmULUMA/x/T/owUIawDUDAC/T/i8Ki1AB/F+
-						4vdVfAZgALMAEAB7FsCWAMyaruTzKAZSNvC5s6LumJzrAPMG+sPRfiSE/zj4n7+kw/BvA78L+s85gD8J/E3OsACY9F35iA50X6aFB0/S
-						mO3pswBpEqBnAeISEG8FChcEZ2sFUhIQbwWyBcC0AkECChfX0JamU24JyEEAZOQ/QQKm7WikX5ZM4Wv1mLTr96BSWDpHc4UvX77u9eI3
-						7BjnG3mA+d7Tb9Kv35hOy2t7I/CPVDYdp0rAvxn9t+C/NgH+0fcfwD8Ho08T5m2M7PGPkX/Av4z8M/yb7T1l1J/hX3b30aP+q/kCJq0+
-						fFED+KPfFaNvAIGBbB8IIcBFLj7Cp0RASQBG6XDRRe8tJECJgLrwQgywM1D6bhw24NiQHn6sQAe32gfsmM9V7FFPRP7cxPp7doL/w47+
-						OQClGBlHu8HG3fUsLpAY/B7p8J9NAJzwn2P7D+DfCADgvybL6H9WAdDwDwDLJACA/6gAaPg/GcJ/vgLgagGKtAEJPKkRalsAjAREXjv9
-						OuG4EQFIlAAN3ZYExEXAKQMJMdBvIt8LCdp8NPhz5P+U/1v9HAL8+Fj/fIgBfpM49EfeGw75Vcd77PgPnjcb/FUE/CX8nBtA5Uc8By74
-						V/KDR5WoAPDf4X+HtQCR9h+Bf9w0zgiAGv3HuQHvKbNrmPT/4/jk8wHaf3C/ELlxIKRW1rcoAcCxj80Eqvi9gXPLftk1S43+767G+4uT
-						RxtQvrMARgBW8jkVEoB1VLj3yir+OlqQcK4+e/6KAL97xN8EI/98vF/n80tsxD8fAUiDfhMN/pgFOH3t40ha+2/Suqaz9O7OzogEjJZd
-						geKzAC0iALlIQKZZgHxbgf6aJeCxBQdoXcOJiADkIwFpAmBJwNSyBpaASXLNdl3LB5qCopLRGi98+fJ1r1ZBYeoJ1xt4oHnoyTdkVGF+
-						1XHa38Xwr1PBqeRU8UlLbf3Zyhcwhn9OZNtPaf0J23+CRb9aAHZXH5F+f4H/hZvUyH8m+NcLfU3LDxb5AvzX7TgoInGKAe3LL4dmz3As
-						JsSCOTUTEIoALua46JYBjoM08EW8QwDBCTYMMvFRfxt0DJyrzxnuZcRfjwoHsQAoiP6z4N9GY76vCdoZACKA9nW79LqF8jqJWwAywX+C
-						ACTCf7IAxOE/9/afBAGw4D+TAKjXlUHuLgqAPQsQFwCXBJjjKIDoLBIQFwEkLgPO4O/pxP+963sG/x9+BvwsRgCsn838rOpnV79DUq8/
-						Yv/uEnlO9LGO5yh4vvi5c4C/iRr5V1B6Hs8/yzi+R9qMh0C/JQB3GPoR/poJ/hzvHRn91zNEZvS/U46jUADsHcOwDa4Z/Ufs/f/R/y/w
-						j3sA6P5/3O8DLUBqBoDfNwch0i3S/pMoABWH854FgABkmwUwAoBZVrmB4gaVzbsPsbCo81wI/Qr8ZdQfz/f1jwPoTwd+q80nBv5x6D+r
-						YT+aKPSfvvoxnYql9/Jt2t1xkabs687SCqQkICoA4b0Bnl+dmwSYVqAnOPFZAFcrkJGAtSwBBv6VAOg2oDYF/wL+gQCcVWsArBmAckQL
-						wC6G/13NJyXjNtXSX70+Ua7drmv6QIObiGrM8OXL171WI4pLvj2UN/oaWZziE8kEmrGHL0gO+K/sZgHovkIHjvbQAb5wof0H8G96/wH/
-						9VbvfxN2/bHhny9o4+dq+E8b+d+u2n7W7KKFGv6X8oUIFyaMUmFkChcvgP++2hYG9Wsa24e+AC7mgo8LPS7IZvQNi4Ax4ofZhhByQriJ
-						QA5DhBKAEMgRG3YUzBsBCKFQgb6GIANEVmw5CL4PB6CExYrVDBmbGerX7KiVYH2CLQAu+M8uAFH431XNsJJRADK1/6jWn7TR/6wCoOBf
-						BMBu/4mN/icLgIL/IREAqw3ICICRgEAArFkAA65xCYgAMCcXCUgSASQO7rkm/n3wvbEzjv01+/9X0e0+AfRr4JfE3g/m49jvq45d9VxI
-						9DEv0B88Vzb4mxj4V893EJEw9VrgZ4sKAIflB+BvZkAw4m/A3w7kWS381dECgN2kFPyr9p/I6L/MAPBxyscr7gAsx7AZ/Rf45zR2yOCB
-						tP80YA0ABMBsAar6/20ByHUWADOSRgDymQWAACRJwGI+Dy9ar+6wvmbbAapqaKXuvv4Q/hnqM432y4g/w30S9Nuj/CZpo/0M+S7wR7Br
-						kOTKR5KGk1dpSe1Jws3CQgE4FgiAuxXIlgAWAI5TACwJyKUVyMwC/JoF4FdzIAFVtLbelgCGfy0B++ISYAlARAJa3BLwxqoK+stXPpRr
-						uOvaPrCkPisoKvlTjRu+fPm6V+rB4tR/N6K49Ir7jZt/cOL4+SvjacL2ZtrXdSmS/ZyK45dYABj+e65Qdc9lqsbFTO7426bhX43+o/0n
-						suc/wz8EYNeBRvpgznoRAHfbD27upeB/MV9wZORfwz9G/XHh2soXOixWvRsFIEDfL27dD/jFiJ0Z7U+GfgX76mMFOnHov2ZgH58L+ERH
-						PAUKNQBhe74oBNl/FgZQBCjBKOIaBv1VsiUp7lEQhX8lALmP/mcWgBj8ZxUADf9ofeAkCoCG/6z9/wz+mQQA8G8EQPq1vwIBQLLNAshr
-						iuPAOkbkOLGOq7gE2CIQSoCJDfADSez76f/Dhn4s7pUFvvwzGfgPoP+mDr8/QuDXkY9jv2vsPRB9bvj5MjHwLwJgj/rfCKDfjPwL/GsB
-						wOeY7TCw70wM/E3ws6u2QD5eBP7ttUGQTD7WcNwx/AcCoGcAwu0/+ViWna2UAJj2H9yUML4FqC0A2WYBbAHIdRbACECaBOQgAEYCMDOL
-						+7Cs5vNHFV8Tui7ejsK+CYN9fuD/sSQb+CvYD4M1AZFcVuk4f5M2N/fTezs7cpsFyLMVKDoLUCsCkNwKpGYBIAGPzq+iVXW90dYfvQOQ
-						gf89Bv45uxEjABr8Bf45O4+eDLLjSB+9umQP/ezlcUMtAZcLilL/RmOHL1++vur6zqiX/tFQb/f505fepzHra7PCP1LTy+HHg3xxUwt/
-						9ei/44ZfgP89NUdpHMP/uDkM//Nxk69Nap//pQz/y83IP27uFcK/jPzrfn9csLBjEHp072YBfHBxB2AY6FcjnAw2SQIAeNMJAMf+WBLC
-						u/2xEQAbgKIJ/wxAib53QPiq7TV8IdfZVpMoAHH4NwKQ2+h/FgGw4D9JAKT334b/DAJg4D8qAH3UGB/9vwsCYEuAEQC7DQgCkLENSEuA
-						GbmOS4AZ+Q6OEx0BZuv4yiQCSATcI3GBPuL6u+H3Q/D/haCv4d/8HDrR9wMEQH1sgD/yftAJjnkr6vkIj3UD/WZHGgX+NwOhMu0oasTf
-						irwO5nW5wt/7thv8TRzwj69jZgADDqYlULX+mNF/jhxzSgBwHGL039z997Act6r1R7b/ZPiXGQA5/vXov+n/1+0/EIA9WAPgmAXIuQ3I
-						mgUwApDrLIASgMyzABCABWW1tODgSZrPwX79y+oYVjsuUeu5m9nB3wL+COwnAH8A/UgA/mq0Pw7/Jxj8TXolt6n30m06yNeruQdOiAio
-						WYDsrUD2LADuEPwUJz4LkKkVSAlANT0CCdCzALYEYCYgSQKUACgJiAhAmgSEAoBsZwl4bvZW+smL7zuv8YPI0R/85sX/TOOHL1++vqrC
-						Fl0jClM7HG/SAecvXniXXl+2n/bG4B+pQCwBEPDvvUq1vdfo0Al+bD8Vwr9Z/Cs3/OoW+C+vPkIfzFknAoAbfQH+pyzeInf4TYd/1faD
-						CxB2+gH8Y4cfXIC/qsICYQEdQI0T/A3gZBAAhhuM+mM7w7gAhNCvwQfAE8C+AaAwGI0EOADwl2/BnYaraYXcfdgN/5kEwIb/7AKQf/uP
-						LQDB4l/H6H+2/v+MAsDwbwuAjMrG239yFAAjAdkEINs6ACMBmWYBEPUaq+QtAUiCCJi44N4V17+1/x+M7Af/n/U1NeJvvxc09CN61D/4
-						PfCof8dgW0/83tZzgNjHOmKP+MuoP2KJFZ5fjPgD+k3w/OP1kNdGbth2RX5PtbWp2eFIr4OIQX9cDPDvsPi3AwKA40jEUh9nON5w7AWj
-						/zhGw9F/2f2nBce1tf0n4B/9/3r0Hwvy5S7AegbA3gY0FAC8/zLPAtgCkPdi4BxnASAAC3c00KLaU7SQs+DgqUAC5lYjfbS84YxcN7CH
-						v3ukXyXe5hOHfpPEkX4AP5IG/Rr8NfwjPTpNp6/RivpTlNrcKvcGSJ8FOBKdBYhLgC0Ay4wAHHLMAmRuBfrl7Ar+ehWtqVczAUoAlARE
-						ZwEcEmC1ACG2ACBljSfoyanr5JruutYPPKmtDz/88N/UGOLLl6+vokYWlU5xv0EHFtxM5MX5O2QRFQTAxAjAfob/Cob/Knv0nwXgIMM/
-						BAD7M9f3XqJ6BjRIAG761ajv+Lur6jC9P3uttP58OJfhf4GCf9zka8YydYdfbPWpFvzuCXv+9WLfLXwxAwR/1XXzI8AOw5cFOiHsANIM
-						9AN6ADpqZD8AHgP7JgI7DID8cQg/lgAg8jlGPm8ymJ6X7ToB80s3V0mWAf5zEIAI/GcQgIG2/+TW/x/2/ie1/yQKgPRSqyQJgNoB6PSw
-						CMBg2oCMBCTNAiA2/OYqAYgB8QDMY3FBfaa4vkcA+Qj+T/l/+f/XXwt+Lj7u1ba26r1w1cC/9bvguDfiK8c9PraOe9XqEwqAAD9G/fXI
-						f/AcauhX4K9H/63nXY36q5F/gX8OXiu1K5Da2chsb2onDf4RLQb4fmixCxf+quMsHP0H/OvR/zaM/vdIpP2nGcc3h493af8B/IsAtIXt
-						P3oLUKcAZJgFSGwDcswCRAQg6yxAVACMBCzefZQWHTodE4BTSgBEAvpojs7sA320rP6M7CDXzfAdhf8Q/M2ov7PVB8kmAEiaBETB3wQ/
-						R/fF29R27gatazxDb5a1JrYCRWcBDuc4C6AkAALwW8csgN0KFEhAXa+G/37aawTAgn8RgGNn1AJgJBj9V/3/OxEG/x3IEdUKtLmhh56Y
-						sHzIbxRWUFg6QWOIL1++7naNKE497XpjDjTY6/+Z6ZtoZ9uFCPwbAVDtP1j8qwSgWgSA4Z8D+D/E8F938ho1cA6fukaNvRepiS+IjQz/
-						O6sa6b1Za1kA1tG4uRtownzs+KPu8mvgf665yZeBf77oyMg/wz/uXInWg3uhPvv88wh8hdAP0MGjSghtRgCMBGjw56TtZw4I1NBj9zrj
-						/gQHj3TS+p2HaPGmClq8sZKWbKoMBMAF/8PR/hMVgOTR/2QBsOA/gwAI/GcQAIF/hwAI/OcrAFoCIgJgtQGFAhDOAqQJAMBSANMIAOBT
-						gyhDKZI4C8CvL4LX2RaATBKAuEQAicgA4oD5XBIBfiT2/5j/Wx3/6nMz0h9/D8hsF2Id/3Ls4zHyO4fHvHlO5GP9XMlov97a8zzgX0O/
-						avsJwb8fz728BnrknyOv0Tm8Xpz+S/yz39bwny4BH38cgn9EClgAsO0pWoAE/rv13cHlxl983OnjUI3+Y6YKxyzHbP0JAcBxzvAf2ftf
-						ZgB0+49DAJJmAeICMBxtQGkSgOxvoyWAf4cABLMAlgRAAGZxZlYhJ2hdU79cM/oY5oPRfwv40+BfoD8B/NOAP0zPJcQB/wz+YW5JsE5g
-						S3M/vb29jQXgqGMWwNEKtFxLgGsWYHGGWQCrFcgIwC9n76dH5lVmkIBQAAIJiAmASEBMAJB1h7ro0XcXD/09AopSRRpHfPnydbcKq/H5
-						Dfh5+htyYMG+wU98uJxPgOdoT6cb/u3RfwX/qv0nGP0/eZXqbQE4dZ2OnL7BJ6p++mBlBb0/d5OC/3mbaPJCwP8Wmr5Mtf7M1dt9Ylp5
-						8Ya9ss+/gv8q2sEXOVyg76W6wYAQQhEASAGPgR55BLhJFOggwccCdwqCDPjEBQDA2MSQi21Gl25RoL9kswJ/k3xG/5UAJC/+NfCfSQBs
-						+M8kAMn9/9HR/4wCIMCkBYDhP7sAhPDvEgAjAQMRACUBl+iEbgFytgFZAmAkIABSAdTBSUA2ETBAbidNBnJMJug3Cf7/IOl37RXgl3Y3
-						67g3vxt/LjNb+J317x4Av4l5fvSj6fGX8MfmOUXMc3026Pfn10GLmYJ/LQDyul3iP7ssux2F259q2Mej+dhKcDdklgD83+au4Gj9UTv/
-						QAD06L8sUIcA9Ej7Tz0LQJ0c12rrz4Ny3Ou7/zL8V+jR/7gAOGcB4gKQQxuQEYDEWQBXG5BrFoA/XlrVSUvqTksWJ0lAggDMEgHooxks
-						ATMqT/CfnaSylgt09MyNKPBr6A9H/O0w7Jsw5GeDfxnpj0D/LTpupetCNJ0sAjtbz9EHu9ojEhAIwKoMswAJrUAyC8BJXwvgkAD+3EjA
-						XiRhFiBJAlyzAFgPsKK6nf76zTn0vaeG8h4Bqc9GFo7+TxpLfPnyNdz1wJOv/2usxne/IfPPg0++Qb9+az6tbeSTC8O/yV7OPp3I6L/u
-						/6/uUaP/tXr0v77vmhIAhn8RgNPXRR4+3N1N4zgf7ummidtbaPL6Gpq6cne46Hel3u7Thn++0KzaWkXb9jfc9cW+udSdz76g6x9/Rtdv
-						f6KAKIAgA0BqtD+AIMCPjoL+mwxCGvauqs8BQ2hxwKjiHgbqVQzxgHvEFgDn6H8OAmBG/9MEgOHfNfqfKAAH7NH/zAKg4J/hhuHfJQCA
-						/0wCAPjPJACA/6Z2swOQhrCEGQCXANhtQEYA7DagHgZ/xBYAIwGuWYBoG5B7FsBIQNDGYiBXQ6+BYFsCELcEWCAeA/Q4vA808e8b+f+t
-						Y9zsZmV+TjPCH8iuHO/h7yW/J457+X3Nwl5A/026wF+Tth+B/rDNR2I9j3hu7ZF/PN8iYOZ10PAvo/565B/wj9cPryP+74gA2BHw56/r
-						BAKgv477gqjjC8ecGvnHvv8QANP7L1t/QgCC0f+w979G3gcdqvXHIQBDtQ4gpzYgFoDMbUCcrXwuOthDSxn8EZEAhn+RAIcAqFmAPqcE
-						GAGYzpnGmVrRy3/vJG1vvUBt527G4D99pN8F/Ar6rVH+NPC/zcBvogXAAf8mmBGo7r5Esyp7pBVI3RcgQyuQCEBdxlkAVytQKADIfvrF
-						rP302LxK2tDQF64BQAD/AfjrtJzW4G/BvxYAkQA9AwAB2NbEr8WeZvrZ6KlDujPQyKLU+ZFPpf6lxhNfvnwNV4186qm/U1CUqnW9EQcS
-						nAj+smQqLTl4gnZ3ROHfCMB+Dhb+VhzX8M+RGQAWgNqg/Yfhn2Pg/zDDP4QB4D+uvJvG7+mhSft6aQqf6KdXqlGgOQdO0Ly97bRgZxMt
-						2l5Hi7dUC9DiogP431h+UPqM78X6/Isv6fqdz1VYBK7dviPwIwIgQKRH+zX8KACyo2DIABDgBK0BG3fXCfgD4lcw0APql+PCCwlwCIBz
-						9D9RANLhfwPafxIEwN3/fzQmAAr+MwmAgf8kARD4dwqAgv+7KQDBLECwBiAmANYsQFwAkmYBXBJgYHagEuAWgWQZsOOCfMT1d02i/1c0
-						5vi2I5KLmJ9dfhd9vOtjXqLXP0B85ffXz4N5TtDmEwiAPHfhegoD/Qr8rVH/WL+/vDZ4jXROyuunWrrwOmJHI3Xvg/AOxyIEFvyb2K1B
-						mI2Qvn8Z/VcCAPg3234GN/7C6D/DPxb/Bjf+wrGvR/+dApBpHQALQKY2oHzWAeTcBrTtIK2o7aPl9WdoWb0lAJy4ALgkIJMA2BIwZX8v
-						Td7fI99P1gswrMdH+l0C0INY7T6ZwD8C/CbnQ/gH+NtpZyGpO3GF5lf3yoxAfBYA24IaARiqWYBfzNpHv51fRZsZ2iMCEBn9RzADkCwB
-						cQHY1nSCJm2tp4dfHu/kgQGnMHXg4YdTf1tjii9fvoajCopK5znfgAPMT14eR1P3tEfgP00ArNF/wH/S6D9af5QAXJe/N35PN71ffpzG
-						7+6hCXt7aDILwFQ+0c/gCwAuBrg44EKx6NApvqCckR0jVh4+S6sbz9L6o/104danGrfvvfrDH0jNAAD+TT76lK4ClgTQNAwZcJNHMwKq
-						oYcBB1sJ4kK/lgF9NV9kFfwrkFfwHxOATUju7T/ZBMDAf+79/24BAPwPqQDIiOnQCYC9DsAIQKQNKEEAjARkawMyEmDaTeISYEDVwOtg
-						JECOp0QRQNzA7gJ7V1z/1pUI8OufC3Avx7jcs0J/zfpd7KgFvep9EAC/Ttjqc4PO8cfyfMnzZkG/jhEAPOfm+TftPqbnX16jsyoy+s/w
-						34ucvsD/9koA/k4BMJ9zPpavm9mBT/nY6dfw32e1/vAxyseqLPzVW3/Kvv9o/zHwr7f+dAlApnUAIgCxWYCc1wHsDgUgpzYgFgCRgF31
-						tKLuFK3g83OSAGSbBYgIgEMCjABMFQHopUn7MGDUQ9MqTtDGo+eo6fT1CPD3CuyHyTzar9KVEf7VGgAJAz+gv/3cDQkWCUv6b4gIzDug
-						ZgScrUAZZgGMAODeALnMAvzVzH30+MIDtLXppHMWwJaAZAFwS0Dpiv3049+952SCgSc1U2OKL1++hrrYsp93v/EGFuwK8O7mRoH/QY/+
-						W60/Vd1q5P+9Xcdl9P9DPfqPEzxO+jP5AoDeTywWwwVjMV9EcGEx8L+uqV/2kL7XKy4AVz+CBPDj7U8UGAHUAugHDCnwwSgkABd35l23
-						k8F8B0O6wHqNxMwAGPgXAdgcFQAD/9kEwMC/UwAco/+ZBEDgP4MACPzbAuBo/0kUAAb/uyoAZhaAAc4IgJEAlwBkawOS0WWMNGsJCFpQ
-						tAAMVgIQA9R2bBFwy8DQxoZ+G/wR2bVHH+Pq58Wj2rnK/D6y45GGfjPqL+HfXRb1StRzop4j1eJz7qIe8dcCEBnxl+dbPech/KtRf/P6
-						GGELF3Mr+O89fV5u6IffRcE/7nYchX5ntADgd4AAqD3/OTg29ci/ufEXWn9M778a/VetPy4BcK0DyGchsLsNCGt8QgHI1AZkBCCQgD2N
-						fF7mc3PD2YgALLMEwDULEBUA9ywAFgO7BEBJgBIAZOJeDCB1y/fGQBRg3tnqg0SAXycO/AL9GO23oJ+joD+MDf4mrTqHT15VIrC6MW0W
-						QAlAZgmICMA8NQvw1ywA0VkAJQFPsASUHTk1iFkAJQG2AJQ19tLv5u+QjT9cbDDQFBSlntS44suXr6EqLLTBghvXm24gwW4A2Os/Cf7z
-						Gv3XC38hAAd61cj/O7u6oqP/fFLHiR6tP7MPqAsDLhS4cGA0CReXVSwAaxn+93VdlhH2e71u3PlcgN8WAJMryI2PBILQ/gDgwYJBXMw3
-						8AV4PYM44D8uAIB/MwsAoF/BF+JlWxj2EwTAhv9MAmDg3whApvafNAGIjf5nFACG/+ESALkHQBYBCCQgIgBKAkIB6FexBcC1DiAmAa42
-						ICMBpr0kbRZgEBKQjwggcRkYCiFwfU/7/1TQr2P9jAL4Jhjpl6+p2NCPR4F9CX+M50M/LwL7GvjDm3mp59HMrkhs6Jc+/xD8Jea1ktdO
-						vY4IFngD/rv5tcbXsce/EQDs9GNg38wKRMTAmgXALB5G/4O+fxynOGbR+qP3/Zfe/yMK/gcjAMEsQEQAOCwAyesAlADEZwGCNiBLAGwJ
-						WL3vqJyTEQzOGAFImgXATG5EACISoAWA4xKAuATYswBGALCGDNeWafxnW1vOM4jfTBv5N/AfEQDESMC569TJr3fnqYsRAYjDf3zk34C/
-						5OwNOnb2ugQzArMru+n5VYcdEmAE4FCaADy2wN0KBAn4pUhAKAA/n7GPihZV07ajmSUg31mALYd7qGjyWtkAxMUIA0vqkweKUv+7xhZf
-						vnwNtkY8kfpvRhSXXnG/4fLPQ0++QU9N30w7Wi+kCYAtAhCAfXr03178i9H/cOtP3fvPAgAxwAn67Z1davSf4R+j/xP5hG1G/3HyV6P/
-						6mKBi4g9+r/h6Dm6yWB9P9TNT7QAxMA/EICPPqVz1z6SnWq2MUhv5AsxdtwxAmAkAAJg2nXiAiAzADLSz+AvOwAlC4CB/2z9/wL/Wfr/
-						MwkA4D+TAAD+kwQA8J+/AOjRf0sAjARkE4DoOgC1DWggAVoA7FkAVxtQjyUA+cwCBBKgQTWTBGQSgWD0XMO1iQ3irrjgfSBxfW/EDf4m
-						4c+P3+Wi/D78u/HnZqRffmcTCIAe7e+/yB+bEX/9fMnOPnp3HzPaLyP++rlWzzuefy0ABvqR2Kg/wL8bAfxzjp/k150DCbkNCWD4xyPu
-						jmzDf0QCAgH4RH5X2fNfjkt1nKq+f30co/cf237q0f9EAdAS4BKAtDaguABkXAjsbgOyBSA+C7Cmql3Ox7YA2BIQnwWwBSBpFiAuAImz
-						ABysBcCssRGAuATIphKc5fxzYCAqDfwN8Jsw5AP8O3pOq/B73T3qb5IO/scQgX8lAC3IGZXanss0Y38XPbOSJcCaBTAC4JoFwLagrlkA
-						JQDRWYCfz9hLTy+toR3Np2l361kL/DlyMzAtAJydLAGAf9kFSKLAf7uAv0pZU6/MAqw7dJx+9c4i2QjExQoDCRYFf++J1/6FxhdfvnwN
-						tLDol+H/kOuNNpBg0e8j7y2hjUf7E+HfFgAsxIrv/IO9/+O9/5ABjNq8taMzOvrPJ3Dn6D9fJHDRwIXEHv1vOXvvt/6YggAA9uMCcOX2
-						Z9R7+WPZHnVn20Xa1nKOthw4JgKwYTcAXMO/FgAF6VEBkBF90wLEkG92AVoKCZDHXPr/zfd2CABEJIMACPxnEAAF/+kCsHfIBaA3ZwGI
-						tAFFBOAMHZNFwGcDCTACkKkNyEiAEYBsswDDIgECzipJIoC4AH04E///Q/CPjfDrmN8rhP1Y8Fzo5yQK/Hi+DPhbPf4mGvjjo/54TeT1
-						Yeg3AqBaftTrKfCP1xevs7zmKtgCFeCv7oqMxyQBsMKfd5w4K/Avu/5AWvn4ReSmX7Lzz9AJgLQBWQLgWgdgC4CrDSgiAPFZgOoOWtPY
-						HxEAIwGhAHAY/M0sAM7lEQlwCkC6BGQSgLgERAQA4WvMBzr4t5gVONZ/k8HfEgD095++TJ29ZzT8n1LBe98SAAP+mFVIg34L/AX6dZoZ
-						/FWuUfNplUO9l2lOVTc9s6I+p1mAQAAyzQLMUrMAkICXVh0S6He1ANltQCIAlgSIAEQk4EQgAYsqjtHPRk8f0p2BRhSlavyiYF++Blls
-						0+Pcb7CB5aevT5UFXQb+k0b/RQASRv/R+68EQI3+4+Zf0/lEPmZ7ZzD6/4Hu/c86+s8XFFxY1jD8bz12nj774j7o/dF1404I/sjl25/S
-						8UsfiSDtbL/EuUg7WAB2tF2g7a0XaWtDr54BqHMIQK2G9oMC8YB/IwAA/XAb0BD+swmA+b4RAYjt/pNRABj+MwtAS1QAAP/5CgDgP0EA
-						6iAAWgJsAbDbgIwApK0DYPAP24CUABgJyNQGpEAwx1kAhwQYGLUlwIxWBxIggJtdApC4BMRF4G7KQPz/saE/Av5IHPw55vcLf2/1u5vP
-						zfNigF+gHzv6cBTw6xF/nWBxL4AfW3tii08N/WbE/4T1mgn463s8iODJ68yvt37tAYX4vtkEAG1CphXIfA2tfnJ8mr5/WfSrY7b+jAvA
-						4cELQLwNKCIAGdYBGAGIzgIcpLW13TIQYwTAloBAADhKAM7IOdyWAFsAZBZAC4AtAZkEIC4B2DgiLgAuCcCAE647uOas5Z/5MF+TOs9c
-						5tcU4M/A332K2oOc5Jy2RvszwL8D/DHib8D/KEO/nSPIqatU0XmBJpS3iwQUsgQEArDY2hI0h1kAJQDhLMDPp++lNzcezjwLIAKQPAtg
-						JMAIADJtx2H64e+HdmegkYWlb2mM8eXLV77FFv0jzh9cb66B5Ie/e49mVxyncgZTk90d0exBOi+yAFyUG39VsgAA/hEz+o+R7do+JQCA
-						f5zk39zWQWNZAN7hk7CM/vOJOPfR/3656HRcuK3R+v4oA/4Xb30qF5DK7ssiVOUC/5dohxaA7SwA21gAylovyI4OG/c2KgFgKF+rBUDB
-						v4J3gLzMAHACAQD8o/3HEgAD/24BCOE/FIA65/afTgGw4H8gAgD4zy4AXaEAaAkIBUDD/0AFILIOgOHfmgWw24BkK1CrDciMBDtnAVwS
-						wMCpJCCEUQP/g5EAxF4QG4gAYoF2Nhmw44J6V1z/1iQX6EcygX8k/FxIb7/E6u0H7MvzpoGfH4MWH3vUX+/qYxK0+iBmxN9q95ER/5Pn
-						JAr+w9e/vfcsw+JZWfsQEQCRAL0+gL8useAfgQxgYXnQ+pNBABT85y4ARgKiAsDvwzwFAG1AtgDYswBr8Xioh9YdUediCEB8FiBNACwJ
-						SGoDsiUgnAU4qQSAYwQgaRYgLgC2BLgE4F1k81F6d8FWWrBmF1U3tFrgf4rajiMnVaTH34C/gv8o9IfgH472qxyVWNAv4K/gv8nK3vbz
-						NG5nGxXZswAsAb9dqCQgMgsAAUiTgPRZgJ9N20Pjth0N4H+XgH8Ygf8A/E/SdsC/FgDTAoQZgG2NajFwWWMPbT3cQ2+vPUDff+5tJzsM
-						LKk/PFCc+p7GGV++fOVa33389X/Lb6Ib6W+qgeWhp96k97c20S4L/uMCYOAf2dcFAXC3/xgBqGMBwMk/VdYho/9v7eiSE7AZ/Tc7/4gA
-						BKP/J2W3CPw7CAAuKqv5QrO55Rx99sWXGq3v/friyz9Q//U7dJQvEvtZkvZ2XpbZEyMAeJ7V6D8LAIP/No4IwLELcrfljZUtDOQAcwC6
-						GrEPdwBSQI8FwIB8IwDxGQB79D+TAAD+MwmAgf+BCsDuGr0F6JAIANomlAAEEmALgJaAqAAoCRABYPBHcm0DEgHQEpDrLIBIgIBmOAsw
-						GAnITQRUbMiOwDcnLgMmLpDPJXHYN4n/v/bP5AJ/JAL9nOgovw6eI72HvxrxD58/eU4N9Fs38xLolz391Wth5ExiXjO8fnrEPxj1F/jn
-						11u//sHOUHxs9J65wOCPViBIgAb+2+rjyNdiAgB5CgUgbP+5FwUg0gbEH6+v76P1R84FAmDPAsQFwDUL4BIAIwEuAUjaDQiJCEC2WYDd
-						oQC8v+0YvbdoB70zfSW9PW0lvTV1BY2dupxmLt1Ce6qbqLXrpE6fCgN8BPzT4D+UgAj829DPaWLwVwnBv/GkyRU6zClvO0dvlx1LEwCn
-						BCTMAvylFgDMAvxs2m6aVt4ajP5nFgAtAboNKBAAtAHpGQAIABYFvzh/+1DfKfjqQ4Wp/1ZjjS9fvrLVyKdS/zm/eTrT30wDC3r7Xlq0
-						Jw3+kwRgHxJr/zFbf4a7/1yjVXxxKNnaIaP/EIB3dqoTMRb/mtH/qRV8cucTPEb/cadHTA3jQoGLhhr9V73/TadvaLS+Pwoj/3h+9ndd
-						pr0cgX9LAHbyc4ug/QfwjwD+RQCQlvO0oaYzMgMQ6f/n2AuAlQBk6f/PIACA/9wFIL39J0kAZPTfIQBJLUBKAhj+HQKA0f98BcC5DsAS
-						gHgbEHYCircBDWgWQI8y2xIAAcgmAZlEwMCxDc52IiIQh28byK24hCCnJMG+ifl/dXIFfyQO/uZ5sVt7glF+fjTPp4ka6efnW557NeIv
-						o/7WiD9295EdfjiREX8d1fJzVoKR/7aeM9TGxwaCO3Hjd791+2O6yeCP3IoJgEiAJQAiAXdwd+D+gQsAw3/uLUCZBcCWgDQBsNuAsCbp
-						8CnawPBvBCA6CxAVAFsCQgE4ExGA+CyASwBsCUgSgEACsgjAuF2d9MGKffTerLX07oxVaQIwdsoyGjN5GU2av4G27aujY51aAE5dFgHA
-						ugED/xnB3yQmAKEEJAhA3xVq0Nl85DS9sq4pwyzAAZkF+Os5VWpL0AQJwCzAz2fsofmVHYOaBTACYGYBNtd306gJq4b4TsGlLQ+88MI/
-						0Hjjy5evTDWiODXV9UYaaH774UoqY+CEANgpZ+A3sSVA+v8Zaiu6WAAYcmUGoPsqVTP81+jR/03N5+j1re1UKgKgRv+l/YdPyGj/mcgn
-						bJy8ZfS/Khz9x0UB+/7bo//r+GKDxbP3U3VeuC0CsO/4ZXmujACUswDsMv3/CPr/sRAYMwAQgBbA/wXazK8HsrH+BK3dVa9nAJL7/9Uu
-						QMkzAAb+V+JmYgkCAPi/FwVASYBq/zECEGkD0gIQSIAWgHAWQLUA2bMASW1ARgCyzwKcpy4GfyRtFmAYJSBfEXDKgP21oYr9vXVs6M8H
-						/HOBfxv2TdSovzXar59/jPYL9Eurj3598JrpyCJfvKYSfo35tZaRfz3qLy1hOC7kGMGxclqOB9wh2AiASEBcAGISgFkA3AlcrQEIBQDw
-						HwoAjn0F/4MWAMdWoNs4mQRgEwN/MAvA7/2NgP+j5wIBsGcBsC4LArBaC0B8FkAEgGMLgKsNyBYA1yxAXABsCTCzAC4B+HAPX2vWHaQP
-						5m2k92eupvc4cQGIS8Cbk5bSu9NX0eqyCmrsPifwj40nouB/g5ot+A/BPwr/9sh/o4kGf4z6B7EEoB45cZlW1ffR8ysbAgHAlqAiAJFZ
-						AC0BCQLw02m76Rf8+YqD3Qr6BfxNTin4t+4BIPCvUybwr7IVMwAsAFsaWAA4K6s76KepmU6WGGgKCksnaLzx5ctXUo0oKvm56w000Dw8
-						egafwM+kwX+iADDE7u3C/v9X1AyAFoBqFgDT/gOoLS3roJItHbr9p0st/i0/Th9gezar/cfc+Auj/7gY4OKA0f9g8S8LAOD4fqvaE9ek
-						9Qfwn97+Y/f/A/4tAZDRfxaA5vMsUSwAmAloOkNrdh8O+v9NX78IgN7/H7HhP0kA8D3iAoC1BpHR/wQBAPznIwCA/7slAM51AMEMQLoA
-						GAkwLUBGApQAKAlInwU4JwkEQEuAPQsQAKZAZ0wCMDKdkwQAfLUADEIEkLgMiBAMU+LAnwv0IxnBPwP8Y0GvvZ1nONKvgF9G/Pm1UKP+
-						4esTgD/HHvHH6DyC1xqj/gb+5XjAsSHwz8eMPnawNkHBvxIBpwAglgCYWYC8BKDBJQCcYRCAYBYA7/3GU3KXXSMA9ixALgKw3BKAqATE
-						BOCgEoCkNiARgJgETEsQgGAtwLZmGr94O30wey29P4sTE4CkWQAIwBsTl1Jq4mJ6a8ke/j1Oyy52zQL9nDMqNvQfCaLB3wX/AfibhOCv
-						oF+ljuFf5RIdOH6Rpu3poCcWH1QSkDQLIAJQoRYDOyTgkTn7aV19rxKAQAK0AMQkIJMAbNUCgMwuP0IPvTDOyRQDTnHJDzXm+PLlK14P
-						PPn6vx5RlLrufPMMIA89/x7NqeqR0ehM8G8EwIz+xwVA3f1Xjf4DeFNlnfTa5jZp/3ljW6cIANp/IACu9h+c5OfxCR8XBCUA6gKCCwou
-						NIdPXddYfX8UbvoVb/8JBEBmAAD/lwT+sfuPgX/EtP9g9F8EAOsBjrIE8IV39b5mBnkF9Gr0n2FfQ39uAhDCvxEAGf0fFgFQ8J+zADD4
-						I2kCELQBhQJgtwGJAFizALkIgD0LEBcAexZARn4hAYB/Ey0AmSTAngUYrARERMACZJcIIDZwu5IuBOnQ7oJ7xPV343H9n/bPZ8cF/kgc
-						/AcC/6rNR8Us8JXXiGHfbOtpA7+Kgn4F/uY40KP+cozgeNEzR50nqa37tGwLmq8AYBEx7v6rBICPaQ3/RgCqrfafuAAA/vMSAE6+ArBp
-						L7/nGf7N+SerAFgS4BKA9FkAPs9bAmBLQJIAxGcBXAIgElDeQRNW7KHxc9fTuDnr0gTANQsQFwAlAUvojblbZQALLayL+Ges6b0SHfHX
-						sQXAgL8b+lUio/06Ifjr9F6mQ72XJHva+umdrS0sAekCkMsswE+m7qbHF1RSGYO+cxZAJCA6C1DWlHkWAHl7XTWNfGro7hRcUFR67cHi
-						1/5rjTu+fPky9fDDD/9Nhv9K1xtnIBn5ZIre2dwoo/UYicZ+9CYiAFbM6P/uYAEwBOAyQy4WAV/WAoD1AJdlpP+VTW00eku7iADaf8ZC
-						AGTxb9j+g5M2TuTS/nPAav/hCwQuGNL+c1i1/5y8+rFG6/ujsFtRMPqPAP455ZxdLABqByAlAJHR/1j7zyaOugCfV9PvfCFefaCTgR6z
-						ALr9x8D/Jkf/fwYBiLT/5CIAGv5zEgCr/ccpAFoCsgoAJ10AlAQYAXCvA4gKQLY2oLgEGPDLWQIYLEMJMLMADKKISwK0CMQlIJMIuGYD
-						kCQRQFwwnikuoHfF9W/txH+OeLKCfw6j/nH4l+c3D/g3ApAr/BsBMMcMBOAoH0f4mQIBiElAkgDI3YH5/44LgMB/TAAA/7kIgIH/QQuA
-						hn97ACKzAIQSMBABcM0C2AIQnwVwCYBIwJ7jNGlNJX04fwN9yPA/fu66qADMWpPYBmQEIG0WYPoaEQCklK9npVvb+Wfto4MnrljQf92C
-						fitO8DfR4B8Z8QfwW+m5RLWcgybdF2lT0yl6eW1D1lmAv9Rbgv5s+p5AAh5mCfjd8oMM+9j+8zTtAPxzZAEwiwESjP6LAAD6TXppy2HE
-						EoD6bslzs8toxFDeH6C4dE8qlfobGnt8+fKFKigufcP5hhlgnpu30w3/iC0ABv61AJj+f9kBiFPF0F/NAlDFAvDBnm56aWMrvbo5KgBv
-						sRSo9h8lAGj/wUkbJ3Kc3HGyVwKgdosw7T/S/88XG4yo3y/16edfSksUBCmt/ceM/kMA+Hk2AmB2/4EAbNYCgIsv1lFs5EdcgNfJhZfT
-						xBJQ00PLt9UE7T/m7r+u/v8BCQDD/0AFAKP/+QmAav8xEpBJAOJtQC4BUBIQCkB8FuCIJQC5zAIErUAMiYEEMPi7WoGUBCgByFUCcpkN
-						yFcEhkIGckm/K47/G7GhPw7++F2SwD+nUX8TIwAu+NcCYMN/KAB6sa+G/0AAGP6l7UfDvz36bwQAwYi+agVKkAAtAIEEcPBvAP8iAEcs
-						AWD4zyYAAv/IUAqAloAth/siM5A4B4kAaAkwAoCBmVwEAEkXgNMiAPYsQKQNSAtAdBagzykAUyEAWxpo0uIymsjwP2FeVADGzU6fBchl
-						HYBqA1pCqa1tSgCwno2vaaO38Of8tYX889YywJt2H0A/7i0QhkHfhGHfHvGvi4O/CYN/LaLhPyoAl6iGJaCas4TP/08trU0XAE5SGxBm
-						AR6eUk6vrakLR//TJMBqAToSEwCRALUTkJIAJQAb647Tr95b6mSMgWZkUclrGnt8+fL1QHHJd/mN8WX8jTLQ/OKdxdJjnjT6b2LPAhgZ
-						kDUADLUA3EoOBABbgKKP/4UNrfSyFgDV/99JY7D4VwsAbs8+YW+0/x8nd0z74gKwiC8MuFBAAEz7z3q+2GBLzfulei9/JKP/gQB0mcW/
-						/JzK6L9q/8HzHu39Py+j/7j4YuQ/0v5jCcBaFgBkdd1JloBaLQAM//egALgWAdttQEYAAgmwBMBIQCYBSF4HoATANQtgBMA5C8Cwh+Q6
-						C/BVSUAmEUCyyYCJC+pzzaChH7F+BwP+zlH/HOFfBCAn+FeJw3989F/1/CeP/iNH2vtEOowAiARo+A8lIF0AMAuAhcWAf7cA8PvAbv+J
-						CwDDf04CoHcCykUAttT36lnIqAAE6wA4tgDILIAIQLgdKARgZSYB0BKwqFZJQJIAGAmwBQCzAEYARALK22nKynKatHAjTVzAiQlA2ixA
-						TAByWQeQYmC2ZwFKWABGb2ml1ze38udttLiWRaD3ihIALQEh+ONO+CZxAVASYI/61/Yo+A+gXwfgbwIBqD5+gSo6z9PUPe2yODgiAY5Z
-						gJ+yBBgB+Ispu+jD7Uc1+KtsYwHYhhkAafvRrT/2DMDhE3oGoJc2YycgDf+bJMdpaVUb/eClSU7WGGC+HFFc8m2NP758fXPr+6NS/9WI
-						otQZx5tkQPne78bR8kMnaQeDJyA0ZwFggDUCsM8IgMwAXJEp3d+tP0YvsgC8sgknRz5ZMvy/sT0UgGD7TxYAtP/ghi4z+KSOuz7ipI+b
-						f7kEAD/T/VKffvGlzIQkjf5Hb/5ljf7rGYBg8S9ffGXkX0bfVPsPRv7XQgC0BGB2ZPXh07RsR31GAQD8o2VowAKg+/8zCYCRgPwEwNwH
-						IF0A7FkAIwAZ1wG0mFgCkDALIAKQNgugRv+NBOQ0C4BokBwyCWDQNclVBPKVARMXsA8mZy+4kv7z2D+rDf0K/BEL+q0Y8B8y+Mfov8wA
-						ROE/bfSfo46NEP6NAAD+JR19dOX6LacEONuAtADgvgAK/lXC9h+HADD8uwWA31cDEICt+6ICsKW2K5iFdAmAkYBkAehPEwC7DQjndWzu
-						YATASIBTALQEpAtAn1oHsL+bpq2voimLttDkhZvTBCA+C+ASgGzrACAAWAfw5qLyUAC2GgFoEwF4DeHrXenWNlrC11SIABYMG/hXAuAC
-						/yvpo/6cgywAEfiXUf9QAKqPX6QDDP8HusJsbzlDr69rTJsFCAXASEA4C4DM3tcWSEAgABj9T5QAWwA4gQAoCZi6rYEKhnA9wMji0pMP
-						Fb78jzUG+fL1zSyG/82uN8iAUvwGjdveouE/8+i/SwD2MMRKCxCDren/38wXiN+tO0YvBAKAE6QSgDcjN/+KLgCGAGDWQASALwAQgCV8
-						UcC+0RAAXGiOnLlB529+ovH63i9s/YnWKNP7L/DPz5W0/gSj/2bhr9X6g9F/EQC+8MrIvxr1j466nac1DP5r+GNMva/CBVcuunxh3dmQ
-						QQBw34CYAFjwn48AGAlwCgD6/y0BsNuAjABE2oC0ANhtQAb+0wQgl3UAlgAYCTBbgSa1AR3pCAUgkAAAn5YAJQC2BCgBGJAEaPhPlACH
-						CNgAHJcAk0QRQFwAznEJQcY44T49rv9LEvu50qFfxf597SSCP4LnEs9pAP8qucE/v5ZZ4D8QADlOlADYo//mRnP4fzIKQHwWgAXgYw7u
-						KRDAvyUAgH+nAHDC9p90AQD8xwVgB8M/kiQAW6uPURmfg9S5KD8BMBIQEQA+JyUJQLQNKBSABZYAGAlwCsCuZpq2fAdNXbyFBWCzFoBN
-						gQC42oBsAci2DgACEJGAGeujAsCwDwEIJIAF4NVNx+iVjcfk8/k1fVTDIF/PEmBG/+vS4J9joD8G/jWIDf0c7AYkscC/ykpl53ladrCH
-						ihbXaAHIPgvwl9N305q6niGbBdjI+f2CnW7uGGBGFqbWagzy5eubVwWFqSdcb4yB5tmF+2k7n+i3tyIXJCIDWgh2mrRfYAG4kCAACnAr
-						OJCElza20XNaAF6yBCC1TQnA2/bdf7FNGwvAFEsAcJKHAEj/PwSALxb4/icuf0Rnrt+hczfuDwG4cedzmRHB6L+C/8u0uwNR237aW3+q
-						1p+L4ci/bv8xW39u0AKw3lr8a0b/IQFysdUX3ZWH8fFZWra76f4RAAYYCIA9C5AkADm3AWkBiM8CGAFImwWwBMA1CxBKgIJ/IwBpEiBA
-						OTAJcIqAloDBiIBTBkxcgO5IXAJcf8cZ1//JsaE/f/A3CZ+vOPgPBP6NAETgXwtAHP6VAKSP/osAtJ2Q4O7IyTsCpQuAmgW4GRn9zyQA
-						gP+4AAD+By4AHLyPW86xAITwbzJcAmAkIC8BqOihGRsO0LSlW2kaw79TABxtQNGFwNFZAJcAONcBbDoaCIBrFuBVlgAIAPLS+hYq2XyM
-						f+9TskYgAH6B/isyS2BG/EMBCEf9Af/VEtPuE478VyEA/q7zAv0IWoGQ/Z3nqLz1LL2z9ajMBAQCMFPNAvyUJeAnU/fQw1OVACC/nVdB
-						Wxj2bQEw8L/Vhn9OAP8NvbSpoYej4H9jnclxWn+oi37x7tCuBygoTj2mcciXr29OjXgi9d/wG+BG/A0x0PzsrSUyWm/DfyYBKLcFwLT/
-						WAKAnYBS2zrombUt9DwLwO8hACwDr21up9FblQDg7r8QgPcsAcBWbVMqeml6VboA4OLSdu4mnbr6MZ2+9rEIQP+NOxqx79368g9/oLo+
-						7PvPzwsHAmBu+qUW/mYb/VcjbtHRf4Z/fjS9/2b0fzVfcNXFVoG/EgD+Gj8u39ecVQDkhmJaABJbgLQE5CIARgIiAmC1AQUCoCUgWQA6
-						JLYAZGwDYvBHktqAkmYBAgnQApAsAWdEAPKSAICmAGe6BAx2NiBXEUDiMpBRCOy4gN4V17+NJbKjj17ca/+M9u8SjwF/G/4D8HfAfxr4
-						6+QG/0oAbPiPtv5w5NhQSYN/LQCNfIxhUXHGLUFtARAJ+ERmAfB9zQyA3f4jAmD3/xv4zyIAgP+4ACS1AG1rYvDjc5FLANSARAj/RgCw
-						LgsSkNgClKsAcGwBmJ8kALtaaMaKnTR9aVmiACStA1ALgdcOYiHwYnpjyV7nLMDrm3G9iwqAkYAX1zdT6ZZjtBIiwNAfh38z6m9G/BX0
-						qxywR/0t8Fej/UgI/oEAdJyT7Gvn60VDHz234pAWAI4WgPgswI8n7aQXlh9MnAFwCgAnIgCBBBynDZxlVa30vRcnOhlkYEld91uD+vpG
-						ld7ys8b9hsg/Dz0/XnoUBzP6j5FsswAYAvDuri4qXtVMz7IAoAXo9+tb6eVNfELEQik+UWL//7EQgJ1aAHADsJgAzDqgTvQLDp6W79t7
-						+SPZ8hMCcAoCcO2O5F5fAyytPyJFVutPx2V+7iz454Tbfl7U8B+fblej/1j4u/7I+QD+1/LFVgRAooBfBEAutloAdFbsbR4iAWiICoCW
-						gJxmAGICEF8HoARASUB0HUAoAPYsQHobkFoDYATAloB6CEAOswAuCYi2Ap3JSQIMTA5WAgYqAogN1q64hMCOC+BzSRrkxxL/OeI/dzz5
-						gv9g4d8IQDb4NwLgav0x8I8cbu2li1duiABkmgWwBQCzAPg3tgAY+A8EgME/3v4T7f9PFwCB/7gAcGwBKDvYLteBzAKA81FuAoB7ASgB
-						SN8JKLsAnBIBMBIgAnCgl2ZtrqEZy7ZJAgFYsjU/AUhYB2AEINM6ABGAGetiAqB2A7IFID4LAAFAfr/uKL23o4Ovvecs8L8sbUIC/xwb
-						/u2WnyoTDf4VEhv6Ffjv0+CP7JX00+7Wfpq46xj9anZF4izAjyfvoh+xBIzddFgJQHwWICIAOc4CcCZurafvPvmWk0UGmGowkcYjX76+
-						3jWiMPW8400wsBS/Qe9sOargP5sAMPir0X8L/pGYAMyq7qPClc309JoWLQCtlgB0RARAdgDa1S07AIkA7I8KACAWd1hEy0/fFc7VUAJO
-						awH47IsvNWrfe4UWpaDvn58faf0RATB9/9aWn/wcl2H031xs9ci/WfSrdvxRMaP/WPAL6F9tHvlCC+g3F9q4AEASVu5rYQEwOwCFArAq
-						VwGQFqCBCYDdBpQkAPYsgIH/TAIQaQM6clxiBMA1C2AEwEhA5lkAJQFJswBGAgIBADAKOA6XBAB6VVwiMFgZsOOSgTDpQJ8U1/c2if98
-						8bigX8Xq98fzomO2+TTP4ZDBvxYAd+uPNfpvC4Bu/THwj+B7Jt8XIN4GpAQAswD43pkEwNX+k68AAP6NACDbW84J/CcKAM5N2QRAS4AR
-						ADMLsKJBSQDWc+UqAPYswJw9bTR79W6auVzBfyYBiK8DCAXAvQ7AFoCkdQDhQmAtARuaYgLQrgXAngVQEvDyhqgA/H6typS9x2lvxwWB
-						fxv6DxxXd/21wb8SkXYfTgz+Ffir7EMs8N/bpoKbhyEbG/voxdV1wSxAKADlIgCYBfjx5J00rbwlNgvA4D+AWQAIAPLMnG3MH0N3f4CR
-						RakXNB758vX/Z+8/gPQ8rjVNMHq2u2didmM21sTsxnZsTMRGbOzMdPf1fb3R1ZUIkhJlKFGiDCXKUQRAihSt6IACSdCTILz33nvvvffe
-						e5Cgt5Ku6c497zl5Mk/ml99vAFDu1hfxRhUK5VD14/uf55yTmb+7V5e7n/j967v3/MfSf4IrSfdhS9yiAvzXCUCl+p8JANq7d07ZGwTg
-						p14AHppzyP2MboaP1wjAyyv9FqAsALL9J6D5xJsfc+U/CMDbP3dnKdwFeOcXLAEf/vKfPW7/Zl04n2DdCT3wK8I/j/5w5T/CP37eGPvR
-						0R8s+g1PsNxmt/Av1X+Z+dcn2Tj7zwJAT7AsAPrk6wMBwBPzlJV7rkgAWAKuUADydQAQgDAGRLCiUQFYjQ6AkYDmY0DHOUEATBcAAlDb
-						BTAC0KwL8ElJQAqpVy4Cul0oBwBtksN1Ccg/0eBr+uTfi42F/jrwZ/jHz8EnHPBFqQN/JId/3uu/FfintAT/lLrqvxxCd8pdfuu9pgLA
-						EmAEAAeslcZ/RADwf8TDvxGAOP4jAlCa/88FQOF/0eZDfE9qRwAE/tsRgItBALC5Q0kAsBUoNoCIXYAzbsSi7W7YlKVu6OTFn4AATA8C
-						ULcOQAUg6QKMW1kRgNgFOFQQgFQCHiABuH/6Hn59xIaTbu0xzPh7AcgkQCv/6+h9UgG47NZ4AVDwj/AvWUkSoPCPLsCKgxd5bcCwNYfd
-						7SPWua/pGFDWBfgavT5x07FkDKgqACIB9QIQJWDG5mPulifHFJnkCvPP13d74r94TOq8Oq/fveuP77jj35Hp7ig8+K8oNz8+1M3YdZFu
-						7q+zBCwiAcDNPpEAAn+NjAG9IYeBIUECBGqxhuCuafvdjyfv4fEfEYADQQAenXfYPb6gKgAvJAJwiuEVVf8Tb37EAnDSS8ApEoDTKgHa
-						BaC8+eE/euT+zbk++MU/85afUvkH+MuCX535Txb9IniSpciTrDzR6hOsjv3Ik6xU/3XBb3hypSj8T8YTrH+itdV/RATAS8CyHVEAsAC4
-						JQGodgCQXABUAhoJQOwCRPi3AsAjQC12AeIYkAiA7QLkY0CxC3CaEwTAS4DtAjQdBfISUBkFKkiAiAAJABJE4HVOVQRSCbgqEWhBBjRF
-						cL/a4PP6lL4m0hj6kWsP/vGgrwj/MvPfBP69AFj4t9V/JIf/KAAneX//0loAuw6ABYAlQAQA2UWfYz0e8xyt/mcCoOM/lAj/UQBK8/9J
-						B2CNSMDiveeDAAD+VQAWGPhPCxRlAVAJ4PsP7kf+vnRFArDhlBsxZ50bTvA/bPKSIAAqASUBsGNAQQAoEIB8HYAVgNI6ACsA+RhQx4Ap
-						rteCQ0EA8i4AC4AfA4IApF2AfV4A9rr7SAJ+On23e2TWXjdp6xkCfQH/WPWP4L8WycA/wv/rCfgz/BfAf9kB5AJnwZ5z7vGZ2ytdAAjA
-						l19d6m4fusrN3n7KLfRjQAz9JgB/zo5Tbg4JgETAH/P/mllbKVuOuREr9rouP32xyCZXmL233NLx7z0udV6d1+/WdS1P+73hnmfckDXH
-						6cb+Oqc1AfDbgWpCB4CAlv784OyD7o5Je9ydk/d6ATggAjArFYCeJAA4AdgKAEaAcPAXKuZHL3/ojl3+yB1/IwrASQiA7wScJgFIOgHv
-						/tz982/QQoB3UPk38I/KP/+MPPwvpZ/Z0kNvSuWfwpV/fYKlJE+uofL/mpuJ0BMsovP+EABAviz6FQGYhCdYfqKVt5UEgD/PzgtuyuKt
-						RQFQCbACIBKQCkDSBfACYLsAKgAqAZV1AAQnEAArASIAfhFwKwJA4I/UdQGsAFS7ACIA1S7AWU4+ChQkgCAQ+WQlALk6EUCayYCmBOaf
-						RHLY19gxJo6B/isFf6QZ/B8Op/xeK/iPApDCvwjAdnr8vf4mugA/TwSAJaAiAFECcJ6Cwr8VgMr4T60A0P+3JvP/LAD0/3bJQXQl08JE
-						LgC4P1kB0JOAcwEI959GAsBjQGUBwBjQqFUH3cgZK93wqUt/zQJQXgfQs88412vKRhaAZAzIdwGsAIQugJcAFoCZIgDoArAETNvt7p26
-						yz0xd7+bvuOcAf83BPx91gD+Ffopq5AE+iUrPPgv5wj8L2f4FwFYiuyXjFp71N0+fDUvBhYB8BLQZ4m7d8JGt2B3cwFAByAVgCgBKgBI
-						x9R17rpuTxYZ5UpyQ9eOHh6XOq/O63fnQnuLHuD/nD/gryjdO9zjM7Yx+OfwXycAleo/YgTgqSVH3fcn7A4CcNe0fe4eIwDYASgXgN70
-						Mc8uPe5eWH6Cnwj2XnjfHX79QxYAlgASAJYAysk3KW99JBLguwCIjAL93L3789+MMaB3PpaxH93qU+FfK/+Af1T98QSru/2E9jr9HlD9
-						lyfWy37HHxn5wROrjv1wCOL1iRW7/UAAuPpPr0sHQP7cUAAo07ecuuYCsIAgopEAJGNANQKgEtDyGJAKgJcA2wVQAYhdAL8daNYFEAkQ
-						AVAJSLsAIgFhFIhgsJkEKFS2KwGlboAVgZIEaNqSAUq+bqAuJZgvpfQ1JA1gX5N8v/XQb8Gfwz8f+zMrgX8N/FNahn9z4m8C/0iAfzx2
-						ogDk8I9gu9BmXYBcABA8ZkvjP/YAMIV/O/7TTAB0/h8CsGjTQYb/ayUAsUuZC0BcA9BIAEYv3eVGTlvuRkxblgnAkjYFgOIFwI4B5QLQ
-						eCvQkgCMZwHoGDK7ug7AdwGCAJguwMOJAOzzAhC7ABCAeyj3TtnlXlx62C09+Jqp+EtWH0Gq8L8ywD+BfwL/lzz0e/An4F9is++8W0yZ
-						teM07wCUdwG+1Gexe2rODhYArAOwAjB/lxeApAtAArA9FQCRABGAmVuOuh/2m+O6XLv1AP98Xdcn/thjU+fVef32X5/q6Pi39MDemT3Q
-						rzi3vTSdbtyv8c0c20yyCJAA4EZv4d8KQCoCFIV/yvANZ9x3x+/KBGC/CAB2AJptBIBuiBAAjABBAHDwF7YMPfjah+4QBQJwRCWAwF8l
-						gAXAjAPZLgDGgTAK9OvuAkBEUPXHWohk3t/DP4M/RXf7YfinMPz7J1UE4I8n1hL8S+Vfqv9a+ccTKmb9dfQH8F8SADwRswD4z6eZtvZg
-						KgBmDCgIgJcAKwCVdQAE/4gVgHwMKBWA/SwAKgEM/5sJ/pFWuwBGAGwXgM8EKHQBtoQuQFkCWAC8BNguQJAAAj/kk5CAVrsBVgSQkgQg
-						VgRKMqBRQC8COaUiAwHoG6f0uZIUvhfEQn8O/vbfDejX2J+Tgj/DfxCAwsjPFcC/CkAJ/pEA/5Rq9R+PN3rs7TvBufjGO83HgDIBOHvp
-						TS8A9P/AjP+wABD4J+M/RgAA/4kAFOb/gwBsOxbgPxEAPF9QrAAw/KsAUPReVRWAi0UB0J2AEgEg8GcB2HzWjV64xY2cvpwEYFmLAkC5
-						agGI6wBUAJ5RAcjWAVgB4C7A7N1FAZADwUoCsD8IgO0CiADsZgG4hwTgJ1N2uvum7XajNp6K8H9Uof91An6NqfhTFPpT8L/oliL7EQH/
-						xfsF/JFFezXnXL9l+92tA1dwF0AF4MuvLnEjVh9KOgAB/ClzbQfALAAO1X+C/5kIBGDzUd4a9KZHBxdZ5crSsQ3M5PGp8+q8frsvekB3
-						lB/o7eemh/vRDfZcgH8rAHXV/5IAaPUfN/TvEfhDAH6QC8CMegFAB2AM3eB3nX/P7b/0QUUARAKiAOh6gFNGAIIE+C7AGx/+eg4F+5f/
-						9t/cERKWuMUnQb+H/zDv78Gf4Z9+fsluP/qEqk+qPPLj4d+P/ehuPwB4u9c/1ksE6OfXBf7bEYBZu+lJecnWxgJQ6QDELkAQAIrtAORd
-						gOo6gP1BApIOgBcA2wVoJgCI7QKoAFS6AF4AVALKo0BXKgEXJG1IQKNuwLUSAU0uBI2kgFOC9itJ6XP75LAvwJ/G/hs5Hvqr4B/hXxdZ
-						K/g3qvpzCPiRRvDfqPJfhX9JDv8qAFsp+BzcBWgkACwBUQDwNhwMpgKg4z8qAMn4DwtAWv1vNv/P2XGiIgByrxL4b00AcM+6dMUCMH7T
-						aTd67gY3avqKqgBQWhEAlYCiAFCKAmDGgHIBqCwE7lcVgI7RS4oCoBIQBQAHY0YBCF0AvxiYBYCA/x5IAAkAS8Dkne4uSo+5+9ycPecz
-						+Jeq/wqEBeA1t9wLwDID/wD/JYiC/z6EYD8D/4V7iBE4Z92ULSdc93EbRAAI/r/4ymJ364BlbuqW40EC5hkJUAHIJYAFwEtAFACRgAGL
-						drjr7nq2yCxXlO4dj3t86rw6r9/eq0v3J/4jCcAviw/ydtO9l+s9fy/fwJPqf5sCsAwh+MfHYdb/O+N2udshABOjAHSfWhWAR7wAPLvk
-						GH/s3ovv82JfCMCBSx+6g5RDBP6QABYBjAFBArAegAQA0U4AJODUWyIAVgIwgvOrvLDYd8vpd33VP27vKfP+Mutv4d9W/RP45yfTOO+v
-						AiBPpPJkKjP/r0nln8KVf8okejLF3D+/NBKQCIB+fCYAeMLG15ux6RgLgB0DUgFgCWgiACoBjQTAdgHiOoAoAHVdgHwMKJEAAv9SF4AF
-						wHYBjAAUuwAlCSCgYwkg8EfqJUAEIJeAa90NaFUEkByi85RkQFMC9WuR0p79VwL9ZfCXBPA38N+o6t8K+F8p/Nvqf4R/PPZEALbuPe4u
-						Xn6HBcB2AhqOAf3yH3mbUzn8q776bwUgrf6nAlCZ/8cCYII4O/6TCwDuV3rPKp8ETKF7TS4AgP/KCBCBPyICcEHGfzaecGPmrHWjZ6xI
-						BEDhvyQAQ66BAJR2Anp20NSWBEDXAfTEn+fuZwkIAuAloE4AbBdABQBjQEEATBcAAnDXpB3u7sk7XN+VRxnutfpfBH+Gf40VAJEAFYBU
-						AlIBmL/7LAH+Gffc/N3uq/2WcRcAEvCj4avdXOz8kwmASEALAmC6ADM2H3H3Dl+Mk33L7NJ+fnF918f/fx6jOq/O67fvwq4/13ft2FN4
-						cF9RfjBwId+otZWLBAGgGzyySEM3/cUE+ppcAjAChEr+bWN3sQB8LwiAbAFqBeABIwAD1p5ym0+943aff9/tufA+z/1HCUAn4APuBCAQ
-						AHQBkk4AjwOpAOii4LgzEPLezz95Cfinf/FVf4z6EOyHHX4o2N4TP5/iyA8/kWLeH/Aft/oU8Bf4R9Ufu/3wyA9CT6JaxceJvoB6gXzA
-						vkD/RA//VgB0YTBLAMN/vQDga09bvrMiAKELYAQgXwcQBIDgPwqASEBRAAj8kboxINsFKI4BofrZbhdABaDQBSiNArEEeAHIJUDhTzsA
-						EIBrIQHXQgSuRAZsSkKQgPtVpvQ1Q/C9Zt+7TfpvTn8eKfgL/KfgL/Aff/aUawj/KgAW/lUALPwHASD4R6QL0EQAWAJiFwDvu34n/i+k
-						AlCp/hsBiNV/SoPxH94ClKAtEQC6V4X7Ft2vSgIg95A2BAApCcD6427M7DUM/7kAjJha0wEg+C8JQP+iAMy5BgIwqVYAerwy1vUcvbQs
-						AOY8gJ+RBDycdQGCAMyIAmC7AD+h3O0FoPuk7a7bxO3uwRm73cQtp90KLwDLkYNIFIClBP888uPBf3EA/wuh6r8whKAfAfh7+FcBQMZt
-						OOZ+OHI1C8AXXlnkOmZur44AUeZsRwD/J91sXgNw3M1m8E/hfway+ZibTgIwcd0h96WeI4vsckXp3nNr5wFhnddv7XV99x4PFh/YV5Av
-						Pz6IbrjnY/XfxwpAgH+kRgAU/getO03wv5MF4LsQAMoPJu4JAiBrAPYHAQD84+a/49y7PPaDJAJwkQQAYQGQhPUACLoBXgJkJMhsDxok
-						IJ4TgAO4Pok1Afic+Ho43EsP9LKjPhb+5Uk0g39AP/2854XFvrHyz+M+iH8SFfj3+/szzOMJVOCeYZ9+npN20OvbqwLA1X/+mKoA6OdH
-						IBoqHzM2H28qAGkXQAQgjAF5AcgXAhfHgIwA1HYBSACKXQAvALYLYAWg2AUg8G8kAbYLoBJgBaAqAXFHoKuTAKSmG9CCCCApGF87GfhE
-						g++lkPz7Tf9t6b87gf4A/vi55eAvqQP/BP6DAFwb+FcBSODfC8AWn0u6FsBLQDMBQBfgCMkMCwDBvxWAvPpvBUCq/yIAgP9EAOj/ayoA
-						8hxgixZJxxLJBADwHwSgsAZABQCxAgD4ZwFYf8yNnb3ajZm5sg0BWPyrEQBKnQDYMSAIwBN96PU5+1wPAv9kHQDFCkDeBcgFIOkCVAQg
-						SkDXCdvc0wsPuHl7LhDwv5ZU/isVf8oigD8nhf8FiK/8M/Qz+Av8z915xs3hnHazdpxyPWduc1/ss8R94eWFbsiKA3wGQEMBSCTACwDF
-						CgAycMkud929LxQZ5kpyQ/eOez1OdV6d12/Pdd1dHf/rtRr96XLXU+6FJYf4Zm3hv1YAMvhXAdD5f1R3sOBXq/8qAN+fUBWA+0gAsNXn
-						mmNvue1n32UB2HnuPc5uSIB2Agj+IQG8HsBHx4HComAdB4IEZIuCVQLwctOpd/iJCmsULr73C4/uV3d99I//wl8f/464sPcNX/F/g8Hf
-						VvwB//mTJ8M/fV921t/u9IMnTlTnZ/CTp4F/LwAy8uMr/wT6Ewn+Af4TvQCoBAQB0I/FE7AXALsD0EycKWAEAE/i05ZuDwLAEpCNAOUC
-						kKwDIPBPuwCFMaBcACh8IFjWBcjHgJp1AVQAki4ATgaukwCCsaIEANg+YQlo1A1IRMDAv42KQOOuANJYBjRFQL+anCulOexr8n+H/Tci
-						JehvCfwL8J+AfyYATeHfC0D78I/HoMD/5j3H6GuUugAiAEECMgF45326F3kBaFb9TwQgq/7n4z+cbUeLAiDnk4gEyD3stUQAdBcgKwC8
-						7gj3n6wDIGNARgA2HHPj5qxxY2etak0AprQnAP1KAjCyPQEIC4GbCcDLY1zPkYubCEDsAlQFIO0C3INM2Z0IgO0CdJ2w3d1JEoDX+608
-						SsCvVf9L/LpU/SkB/C+4hQT/Afz3CPjPZ/A/R+CPCPzP9fAvAnDazUZIAJBhqw65bw5a7m7tv9RN33oi6QKIADTvAqgAqARM3XjYPTBq
-						mbuue68iy7Sfjp9/rmvH/8djVefVef1WXP/m+q49V5cf0O2n+4gVDO3zCTY5dPPmTgCBf4zc6DV2LQCipwJDBu6dsT+p/t/OArCbBeBH
-						k/a4bkYABq077TadfMdtOfOu20aBBKgAoAuQjAJdEAHAKBDCnQAvAbomQCUA3YATb3ycdALwMXjSwpMRwBqwvZc+55sf/aP7mAD+v/63
-						9joCqPZfIoHYSt/3siPY9lQr/bIFqoC/B34fqfibJ03Eg7+2zbFoToG7Cv8y8pOf7CsLfCVc6Sfon0AvJwD+jQDoQuBGAhAlQL62CgB+
-						ZjM3HBYB0C5AQwGIXQAIgEpAwzEgIwAqAXoicN0YUOgCEPgjKgBNJYAEIEhAMgpE8I8QlKkEhFEgFgCRgHwUSA8IuyIJaNgNiPCfSwBS
-						kgCkTgQQgf4UpHMhQHL4LqUI+Y3iob/0ufJUv8fqvwVJoP9KwN9Hwb8I//z7ot+bB/+m8E9pBv8sABQL/yoAgH8OPUZfe+PdxgJAsQLw
-						i1/+k9tH309x608P/6H6H07/1ep//fjPgtUkAOYUYH0+iAJgFwEL/FsBiMWFS5kA0H2I7l0VAaBghGXc3LVuHMG/FQDAf6sCMHjiQs7V
-						CgBLQDsCkO0EpALwxCvjXM85e1kCUgE4xAJgx4AemiUSgDGgXAB+Om1PRQBsF8AKwJ3jt7k7xm11j8za42bsOMuVf4D/Ig2Dv4Sr/abq
-						X4F/CuB/DkLwL+Av1f+ZBPacbSfdxI3HXNdRa93dY9dx5Z8DQaC/n83gT6H3m7XtRHn+nzJ9y1GCf8qmI27apsNuwtqD7panxxZZ5orS
-						tWOJ56rOq/P6zb+6dO/4YfGBfAW5uedIgsXzbi4BnoX/VADkBq83e3QBSvCPoJr/bYb/ne47QQB2u9vH7+YRIAgAOgDY+38G3fQ3nXrb
-						bTn1bhQAloD3OCwB2gkgAZBOgIwDIdwJ0N2BsCYgSEA6DsSV+eNv8RMOqufYhxpPSPPo33v+3V/wOJDmzY9+6d77+T+7D0kIPv6nf3G/
-						+Kf/yvk5vY4q/3u/+Gf31sf/xO+LnYcs6KO6ry9ttR/QLxV/iv9ZIjrqk1b95clS5vwFwhX+ueJP/4ZQ9aeEij9FR3y06j8eEqACQJHq
-						fxQAKwEy/oMYAaDHBARAJQACMGf3Ran+ZwLQaB3A3JUE/0grY0BeAOq6AJUxoLwLoALgJcCOAuUCoBJguwCbwoLgKAHcBWBQq5MA0wEo
-						SMAVdQMI/DVXKwJIIxlABPhz2E5lIE8O61ea9PPm3wN9f0jle85282kA/Tn441AvTUvgX4B//h02Af9W4V93/bHwHwSAHp/IXt8FUAFg
-						CcgEwC4E/gXlrXc+YAGw1f8gAbb6TwKQjv/sqVT/rQAsoP+rVgD0fqYCEIsZKLR4+EfoniL3tHgOgBQzJFYAAP/aARi/cLMbN1vgPxEA
-						CsN/JgCA/5YFgHLVApBvBWoEgCUgFwDkpdGux/D5ZQEwXYB6AfDnAagATBUByMeAWAAod0ICSAB+7CWg6/itbtDqowT9AP+LAv57EYX+
-						8wT9iEL/OTcX0M/gf5bAHwH4W/iXWAGYQZm+5YTrNWube37+riAAIgGtCgCq/yoA0gUYvHSXu+4anhLcpXuP2zxedV6d12/udd2dHf/z
-						9d17vl16ELednzzt+q88ykA8j27UNvOR/QgJgIaANYwD+ScAREVgxMaz7ttjdjYUgB9P2ut6LjjC4Lzh5NssABjJ2XL6Hbf1zDskAZSz
-						IgElAUAXYJ8XAF0UnGwRSvBvJQAdBcAsnljQZsYTzkwCXAA2DuSy8I9cev8XFHr5Hr30wZgQciELhGUJ/Tukuo+fQXxdfjYy5qPyFJ8k
-						M+j3YfBn8NYnSoHxAP/0JGlHfibvEPjXHX60yg/o5wVzLQoAPqfCf1MBoExftScRgGZjQNwBMAJQHgOKHYDaLkA2BpR2AaIAqASsZQEo
-						dAEI/JFKF4AlQASgIgEEaiUJ2MEScObaSICHf5tcAq6lCDQWgkbJof3ahEG/Lvx9xf37Gf7x78lyBIt7/QJf+zPhNAX/mBz8K/BPuSbw
-						jxThn+Lhf9PuoxycDqzrAKwABAkg+FcJgACgC4CvV4L/pPqvAhDGf0QA8uq/CsD81Tjo6Rzf4/T+hvFFKwBh/p+i8G8FgIsxRgB48wJO
-						Wv2ftGofwf/qT0wA+rXcAZh5zQXgiZfHuh7Tt8kYkBEA7QIEAfBjQBAAKwEqAPdCAnIBmKwCsCMKgOkC/GjsFs7js/e4mTuxsBdVfwqP
-						+wj8z+Mo/PsE+D/L8B+hP4L/jG2n3HSA/9aTbhpCAjCVgrUAEzccdXMI/rH7j8I/DgGDAMwkAeDxny3HHY/++AD+p21CCP43HWYBwILg
-						R8evctd1u2ajQG/ddEfH/91jVufVef1mXl269RxZfgC3n7tHrnAzCIrn0g26dQHwXQAG3CgAuMn/kABf4T8KAME/MgECsNv1W32K5+QB
-						3xsQLwDY+WcLwf9WiAALwLtuB0ICUBkH0u1BKTwOxIuC03MCIAX4viZslyoSRl+mQAAo2gnA+wr0E/y/B+j/JYM+/qzQz+D/ro95HWcM
-						cIXf/wzwRKjrI3QuNjw5UgT601EfhX8ZsYnQr1Eon2bGfRBukWNxL/2bcvAfvw3BdnkiAAr/+HsrAHYMSARA4J8FwH99hf9cAGZtPt7W
-						OgArAEh5DMgLgOkCLFlvdgMyElDpAhgByLsAKgCVLkBFAqIAVCSABKAsAQT/mmskASURKHUD6kQAsdBbkgCbVoUAKctA8xSBvlEKXxtp
-						CPw+9t/OKUB/S+BfV/XXEPhzB6Ap/IsAtA3/XgAU/jfuOsrfQzoGlHUBjADoGBC2Eb2m1X8vAPM37Jf7nN7jPPxbAZD7RVr9twIg9zcv
-						ALi30b0pEYBNJ934uWsSAQD8VwRgmsQKAOA/F4B0DcCCigD0NQIA+G8uANPaEoCOXACQAdPdE9j+OhcA3wVoLAB73U95HYAIgEqACIB0
-						AVQAZAxIugB3jI8C8MMxm11XEoIha465+SQAUvWP8B/AP6n8C/yzAOysVv5FAChGAEQCjvNagKV76XMUBYBSEoAtUQCCBGw47Mav2e++
-						dg1Hgbp07RjkMavz6rx+8y56gH6m9MC9knylYziP/symmzEqNRX4R6wA1FT/kcX0Noz0fGtMWv23AtB16j6C1gt8qi/GcdadeMut9+FO
-						wMl33CaC/9gJkJGgHb4TgEAAEKwHsBIQtgjFOQEE/vh8WDg2dst53jd6IsEwqkl4YpFOAP2b6d/EsI9w1R+wr+CfCQBC0H+eXmJkCNlF
-						3wee+LSyb0el5tPrXA2j1xX45+2TXX0UovlJkUNA7YEbQfVdQJyeFBHs6w9Yp+9ZqvZ4cjTgT3Cvs/6A/3H0b0UgAKH679+3vgMgkpEL
-						gJUAkRT//dNjRsaAGguASIARgLoxIB4B2pN0AawANO0CeAFo1gVYy12AOAakAiAScPzXKAFI692ARiJw2ObUaybNZQApCQFSAvJPMiXY
-						R+T7TKG/OuKjuTbgn8B/AH9NM/jHY+NK4V8EAPCPbNh5xL3x9vv1AuAlwAoAXm6kz9F+9d/Hw7+t/nNWUQjE9J7H9z2911HCvY7ucWGs
-						EfcTvq9cSqr/VgC4uIF71NYzbsL89R7+UwEYPeM3VwB6tyoAWAdAAvA4JGDi2oIASBcgFQCRgAe8BDQVgMkqAKYLwGNAVgBEAn4werN7
-						ZOYuN237GYH/3ecJ+hERgAj+klk7zriZgH5f/Z9hwH8aQT2HYH8qQvA/haB+yubjbjJl+f5zbssJemyUJKBGAEpdgEnrD7nB13RXoI7/
-						1qVbj7/3uNV5dV6/Odenbu/4H27o1nGs/MBtL9j156Vlh7karjdoSICGJcDDfxAAjq9s++iuQP3WnHLfJPjPBQDwj2CPf3weHITFAnDs
-						LbcWMQKwkQRg4ymSAD8OZBcF88JghDsBIgHcCfCBACDYKQhPPqM3n+OM2XKOj4wHDEMIAMA4GRfbZW6mr8Hgb0A/wL7GV/sV+s8h70gw
-						wqQ/Hw2+trz0W3jS6wr8enrvbHo9PBnSS4X+CP5+1IeeHLni70Gdq/YAeIpU+/FvkpcW/sduTQWAJcB/TBQAPMlmAuC/to4cNeoC4N81
-						g8eAUgGorAMwHYCGY0AEGioB2gUIAmC6ACwAlS6AdgCadQEoXgCCBBD45xJgR4FUAuwokEjAKY6VgCACTSSARYDgH2m3GxCA1UtAyyKA
-						JDKgIN1aSkJQlxLM2yQz+zb4OllK3wuHID9P/u+10N8I/JN5fw/+DP9+l5/4u6Fk8N8M/Gvhn8C/BP9bDPyrAFj4Rw7Q95WMAeUSkAiA
-						SMDpC2+0XP1PBID+bxar/4B/yryV2928dXvdfAJDKwB87wv3vVQAAP8qACwBdP8JAkD3ZYX/iQs3ufFzYvW/mQAA/nMBGDKZ4D8XAIL/
-						qxGAF4ZO57QlAH0bC8Djr050T8w9wBKQCMDcg7wVqAqAdgFSAdjLAhDGgKZCAHZ5AdjpuhP8J2NAKgBmDEgF4HujN7lu47e4YWuPubm7
-						AP0aA/4cwH8UgBksAKel6g8B2HqSwJ/iR39wUjDAf/KmY5xJlG0nLrsdp97gHYFk/h/wf8LNIAEQ6Nd4+KdMZfg/4qYQ/HM2HHbj1hxw
-						D4xafi13BTpwyy0d/95jV+fVef1mXDd06/FY+QHbfu4avsxNoxstZv/5Bm3gHymO/3CqAoCqzW3jdgYByMd/nlt2nBfGLj/yhltBWXnk
-						TbeKJGA1BACdAAokYP2Jd0gERAB4HAidgNPv8g47WBPA40CQgPOpBKgIbCSJGL3lvBu+8awbsemsG7npnBsFCdhKEsBHyHsJICAGAGMB
-						bxH+PfRb8M8FAONF+iQXg5+dfeKTl0mlH0+CFIZ+Dp4ECbzxJMjgH0/xRRTWMesPeNeqv0C/hEd9DPwj8rayAKgEWAFgCbACgGQCYDsA
-						EAAZA4oCUOwCeAFoNAY0HwKAdQBeAEQCzELgUhdAJYA7AAdblADpADSSgNAFIAjTBcG5BOi2oA0loFYEWpEABNVnQOiFkIoEIF4CGolA
-						KzLQrhDkKYlAffD+ktLnKsZDfiPgR6rQr6kHf4b/HPwpye+jUvW38C8CUAv+PrbqXwf/LAAN4F/z5jsfBAEQCSiPAakA4O04FTiH/0r1
-						n9Jq9R/wP9dnzoptbs7q3W4uwdlcAsO5e+l5JdwH9f4XBUDhXwWACx64D+284CavOegmzFvnJsxdawRgdTb/v5LhPxcAwL8IwNJrIACz
-						Gf4/MQFAvAA89uIo9/iopS0KgG4Huq81AQhjQDsSAbDrANAFgAB8nwTge6M2cjrmYKegM242CcBsEgAL/nh7gH6faVz5PyXgTwH0czYL
-						/E/ahBD8bzzGOwNNpbftP/+223fuLbdo95lMAI4bAaAEARAJsAIwaf1BN3Y1RoHGFFnnitK9x4MeuzqvzuvXf93Y/bH/hR6YH1ceqFeQ
-						Lz42yE3Ydo534NHqjIX/2vl/gv+SANwzYz/Dfy4A3xu/2w3bcJYr5YB/DQSAOwFH3+JRIEgAOgFYE7CeApDfeOptkoC3SQLe5bAE+G5A
-						WBNwzksABd/n4PWnKWfcUPqaKgEQgNFbzhEUn3fjPBhDAlClsuM+edU/Bf+fE/hT/CnCyNrjbwsMmye3GIVlfcKrhp/4fPTJT54Atdrv
-						wZ/C0K4Qz0BP/44A/lLtH0sZ4+Ff/538PhQVAIV/EQD5Ohz9+l4AbBcA32siAPqkvu9y3A3IJxcA7QDYLkA+BsQSYAQgdgH2BgnIuwDp
-						KNCBigSsggDko0BmHYCVADsK9KuRAIL/ggSkIuC7ADZtiEDbMoBUhIAguwTin2TwNRskGfHxyYE/hX7JgQT8I/RXwR8pg3+56m9zjeDf
-						7/qTwn8qAOt3HObvvRUB0DEgBKNQ+egPb/2ZwX871f8A/5TZy7e62csksygz6f/7zDX73CwCtlkEhLN2EEBm1X88B03fcY5gkCBx1V43
-						aeFGN3HeWoH/uWsqAhDn/6UDwPDfTAAI/kUA/DkAHv5zAQD8X3sBmCjbgDbpAEAAHntpjHt85m73WC4Ala1AWxCAKVEAtAuQCoBfCOwl
-						gAVgjArAJnc7CcDtIzdyNyhkgOYAAP/0SURBVGD4umOm4l+Afw/+07Z6+N8S4X+yr/wD/gH9E5ANyFE3nrKQwP/wxXfcQRKBFfvPhTUA
-						EICkC+AFYFouAKYL0G/hdvfZnzxXZJ4ryIefv/Ox/+Dxq/PqvH691/Xde84tPEjbT/cn3bOLDnD1H7P/pep/qwIA+H9++XH3zdER/r9N
-						AfzfNXUfjxeh8o9AAmxUBDAOhE6ALAr2EsDjQFgTQOE1ASIAiGwRqhLwvttw6h2GfIwgDVh32g1ad8YN2XCGxOMMS8DIzZCAszwKhPUA
-						Og6E8Z9S1T8Ff4mF/zMUnCkAGGY49sGTmgV8jVTT6UmO/l7gOkJ/qPQThMeFb5fCjj6IQD9BPBb2KvhTAP0Afan6n+fORxAAwL+mKAB+
-						ATB9bYSr/4iH/1wAECsAIgGX3Vx6LExfsbN2DEjXANSNAakEBAG4oi6ACIBKgHYBVAAaSUDSBfASYEeBcgnYfK0loEE3oB0RaLUrgOQy
-						0FwI8Ho1KbhfaVqDfJtWgB9h6Lfhn00d9PsQ8IeRHwv+Hv4V/FP4r47+1MO/CEBD+KdU4T8KAOCfQ6+//d6HFQFgCfiFSEA+BvT+hz8n
-						AdgfBYDgXwUA8F+u/ktK1f9EAJZHAZi1bAtn5tLNbsYSZBNn+uJNdK/Y6KbT27CBwFT685SFG9zkBevd5Pnr3aR56xj+rQDg4K+mApDM
-						/y9j+M8FAPCfCwDgvxUBeGkEwX8mAID/ay0Aj74wyj0+eE5BAPKtQI0AUCAAKgG6DkAEIO0CBAGY0LoAfHfEBk7H3D0E+wr/Zwj6UfGX
-						qv9UBv9TbgpC8C/QL5mk8J8IwFERgPVH3bj19Jg+Qv+PL7xDoef9Y5cctgKtjgEdSwSgrgtw99BFrku3jjL7tJ/pHr86r87r13dd373j
-						xsKD84pye9+5DP9c/SewywUgWQScCEC1+o+Ftd8i2LcCAPh/dJ7M+/PJwAT7JQFYQVl59A23itcEiADIOJB0ASABskWoLgyOEqCdAHyN
-						vgT+r64+xQLQf+0pN5AkQLoAJAEbSQIwCkSCwJ2AzQTJXgIA8bbqX4X+GK36qwDg6yvYywhPhHupbBnwZ7CO0K9VfgV+vJ5U+gH8eMnQ
-						LiM+vJ0nRcFeoF8j8I/wn8375QIQJUAEQCXACoAdAwoig06GCoCXgLleAGauP9RwDMgKQF0XAAJQNwbUvAtwoGkXIIwCkQCkEiAC0JoE
-						eAFoVwIAhByRgJII6MLgRt2AKxIBhGG4LANIq0IQ/o4g/FcR+/2kKf877Hw/j/oE6JdY6K8Df4Z//Mwt+PvUVf0t/Ofgj6Twj8dKK/Av
-						AlAH/+soa7cfop/TxbIAeAnIBeAX//hP/P02rf4j9P9RBaBR9T8RgFD9B/ynAgD4ZwFYtNFNXSgJ8J8JAOC/kQCMbkUACP7jCFDrAgD4
-						vxoBAPw3E4Cer4yrFYBHXxjpHpu8mSUgEYA5KgAH3IMkAQ+QBDQVANMF6D5pJ48BWQGIY0BbKwKAESBIwHdHbHTfIQG4bfh6d9eELW7M
-						hhNuGo/7GAGgMPwHAaAw/J8g8EcA/8cZ/lH15xD8jyf4H7fuMG8LuufMm+4gCQCy/RQ9t2w/SQKQjgGpAFS6ACQAkynj1xxwo1btdZ9/
-						dHCRfa4od/Xo4jGs8+q8fvXXH99xx78joz1UfHC2mRvvf9mN2Ej/aQk2ufpfIwAM/0gDAcD7dZ2y131j9I4gALdRXlh+XHYF8rEHYi31
-						UQnQLgDWA6zKJGCdFwDuBCRrArBG4G03bssF9+LKk+5lyiurTrIIcBdg7ekgAegEDFcJ2HSORQCgjNGcWPX/eRn8/UJfhOH/bYJ/Crb+
-						xGI3hflkhMe+7gO4FsiOM/dyEq9U+3k3H3pdK/28Yw/FQj/WL0Tol0o/x4M/V/8zAVAJkHUCcR0AC4DCfy4AiBGA0AHwAqASwGsAeEej
-						y272jjNBAJIuQIMxoGZdABWAhl0A7QCYLoDsCJRJQKELECSAwL91CfBjQEYCVASaSUBJBHYS+CO2G9CyCCQAWxaBigwQJOc5WIDpMnRL
-						rAj8KpJ/b2lS4Gfoz//NlFroRyrgL2kX/JtX/Q38U0rwD/CP8E+PvQr8iwAo/CN4+3sffFyRABUA7gJkAvDam+8G+C9W/40AtFP9VwGI
-						1f8tHv6jAKD6HwVgQyIAgP9UANYkApDM/7MArEgEYEQ4AyAKAMO/EQDAfxAAisB/VQAA/60IAOD/kxCAR/tPLwjAwdYEwBwIJgKA5AKw
-						3QtA7AJEAdjsBUC6AFYAbhu+jt6+wfVdfojhH+AfKv9bPfhTJm3x8L9ZKv8TEMC/F4BxiK/+j113xI0hCcBOQCoAyK7Tb7h5O04lAsBb
-						gZbGgLwATFonXYBnZ250n+3+VJGB2k/Hvk91dPxbj2OdV+f1q72u79rjkfIDs81073CPTd/usMgKozl6KIvOrfM6AB/APYcEQHe10ehW
-						oE8uOupuHbUjCMBt43a5IetPE/y/nm4PisOxKOgGcEdARQACgE4AScAKXhPwlqwJYBF4m2fsuRMQ1gTI4mBIAyr+zy0/4V5YcSJIQJ/V
-						J30n4DRLwCBeD3Ca1wMM26hrAkQC8Lli5V8FQMZ8NIB+O/aj8I/Fv3arOgv2DPv8dg/XHHk/AX4JqvsM4v7lBK30U+we/hjxGUvwz/Hw
-						L8B/wY2il6M2S1gA6O9UAGwXoFUBUAnQEaDp9NiIAvB6OBBMBcBKwPSl26pdACsAdV2ATABUAnIBKHYBCPxzCdAtQZNRIC8AqQQc4VQk
-						wAhAlAARgGYS0E43YCcEQJOJQJCAqxCBpjKAEERXhKAmJThvnEYfg7+rhmUkT+F7kbQG/M2gvyXwt/Hgb+G/5ao/g7+mWvW38B/Hfyz8
-						Y2TNCMA2yYlzrzcWgCABIgAIRKIE/0EAwsFftvpPaVT9N+M/Uv1XAUjHfwT+vQAsSAVgYiYADP9GAMbMTAVg1PRUAAD/jToACv+1AjCm
-						PQFopwPA8N+KALwywT02Y6cZAzIC4MeAHqQ8QBJw/4z9LAB2HcA9ug5gym4RAN8FYAHAGFArAmDGgL470grAevetYes4PWbvItgX+J+M
-						0OuTGP4pDP9S/Qf8M/gz/B9j+B9L8D+W4H8Mwf9ogv/Raw+7UWsOu1UHzrsD59/m7D//ltt79k23ePdpgn5f/adMRTACtDEfATrEGbf2
-						gBuzep/7/qsziXuuzShQl2497vc41nl1Xr+661ou/P36M+MJPi+wAGAhloX/egGI21paAcAIDaAf8I/cMWkvV68hBnZEKBEBnyVIkIHL
-						vhMgi4IxDoSsOW7PCRAJQDdgEn2Np5ccc72XHnPPLjvunvcSoF0ASEBflQC/HmDwBj8O5EUAAnDizY8Z+mXmXwRA5/wD9BPsa9Vf4P9j
-						DjoVckKlB3qC6Pi6B3z/Z4btkAsM4ALjEcoF+gnY6SVX7gniQ7Xfgz2ilX6Gfno5UuE/FwAvAQ0FgGIFwHYBqgJA8E9R+NcEAdh/2c1Y
-						sy/pAtgOQMMugBcARCTArwNoowugEmAPBotdgHguQEkC7CgQSwDBv5UAFYD2JIDgH6mVADMKpPESEETASkCNCFxTGUAIrEspA3g1rYJ+
-						ntLnKqX4PVNKe/fbtAf9Nhb8NVXwT+CfoD9u89kA/inN4V8EoBH8r6HgYz/46Oc1Y0CZAFB+SQJw6jzdewn6i6M//uTftPofBaC2+k8C
-						gIW/ddX/VAA21AqAjv8EAUjGf1YJ/FsB0PEfLwAM/1YACP5TAVjI8J8IAMF/LgCA/1wAAP+5AAD+UwGYzPDfqgAA/oMA9JngHp+5i88C
-						QKoCIF2AVgUgjgHtaiAA20QAxkYBiOsANlUE4DYvAN8cus51Hb/JjVx3TKr+myUTEQb/EwT9Hv4Z/CP8j/Hwj8o/w//aQ5yx9Oedpy+7
-						/efe8nnT7SMJgBioBIgAUKwAUCZvEAGYuP4gC8CQpbtdlwdfLbJQ++n44LN3dfy/PJZ1Xp3Xr+a6vnvHmPIDsr3ceM8zbuDq43wIF2/9
-						SYA3GzHwbxPHgQj6s+DtP5q0J1T/fzrjAM+6sxx4QdCUZIBFwAuAjgWhE7D88JvSCUDMwmCIAOSg39pTrtfCo+6pxcdYAp5Zepy3F4UE
-						vMgScIIl4NVVp1gCdD3AoPUkAX4cCBKABbt2sS+AXwWAR30A/xorAG99zOsGUM3HbL6M7AhM6+sywiNjPAr3vIDXhKHcw7lGoF3WJozZ
-						gvEeD/z0ErDP4O+hHwIjL70A+L+3AsAiwZ9bzgbg78V/nxUB8BIQR4C8BHgBUAmYVRIAgn8kbAfqJUAFoHEXIMI/wgLQqgR4AVAJ0C5A
-						RQK4C5AKwKqtIgCtSICOAbUsAQR8fEZAUQJOc3IRKHYDCEDD4mAbAtb2RABpLAO1QoAAvBukBOpXk+L3YJJ+3wT4jcA/h34b/rnVg3+o
-						/puxHwX/uqp/Dv8K/mX4L4/9pPBPj8EK/FMM/COrtx50Zy6+4QWAkgiAXQcgAoAOAMRg5ab9SfU/jP60A/+2+u8FIK3+Z+M/EAAeARL4
-						VwGYNF/Hf1QA1iQCMDYXAIJ/KwCA/0QAJqcCkM7/lwUA8J8LAOC/LAAzrlAAxtUKwON9p7ges/e5x+cfbiwAs40AzIwCgEQB2OMFwHcB
-						rAD4MaAfjxcJUAHAQuAoAHEMiAVgpBEA3wWAAHxj6Br33eHr3KvLDgr4UwD+HIb/4x78j3nwp3DVn7L2CEE/Kv+H3EifEasPumlbjhP0
-						v8VbgwL+NesOX+CdgAD/UzYiR9xkgL+Hf2QiBABjQGv2u9Gr9rkek9a467pdm7MBunTrGOaxrPPqvD7564Y7n/hDeuD91/yBeCW5a9RK
-						hn8EsM4CQGB3JQLwDMH31wn+IQA/o5sTPh7vV+kUVGTgdbcIsSLgs+Sw7wSQBCwn2OdugJcAyANg/4kFR1zPBUddr8UkAfQ9PL3kuHuG
-						BAAS8IKXgJe8BEAA+q45TRKgnQC/JmD9WR4jEuCPAnCO5/w1VQHA6M8pEgAsQMapwhO2y05CAtcC8QnU+7elkTl+qfBHWNdZfq70e5jX
-						0Z5RW2TxssI/RphkjMkLgH9/FQCVABUAlQCt/ucCoBKQrgGIAoDIQmARAIQFgH7fuh0oBGDOrvNu6mLs7OHHgJak6wDKXYCdFQlQAVAJ
-						yAVAJCDCvwpALgFWAKoScDhIQDIKVJQAFYBWJOAkpyIBFO0C5BKQiAAgM6QdETgfYkWgFRloWwg0gPVWU/r4Jil9T0no35InLpCugX6K
-						hf4rAn8P/9vrwN+nDvwj/NPjpxn8o/pPaQb/CD5fGAPKBEC7AFYA0AU4cPxcw+r/grDvv8B/3ehPWv0XAYjwvzmt/nv4r1T/SQDy6j9v
-						/2kEQMZ/ogCMygQgHf+RHYCsAAwKZwB4ASD4zwXgVbsGoEYAAP+5ADxTEADAf6sC8ET/aa7HnP3uCYJ/EYDDvJEGUhWAg/UCQAkCwAuB
-						425AuQBoFyARAEoQAN8FiAKQjgGpAHxjMGXIGtdrzm43HlV/DoE/wf/YjQB/yRjOUYF/CsM/Kv8G/ocjqw64lQfo/nXuTR4B4pxB3nAb
-						j1wkCTjWWADWH3QT1h5gARi9aq+75amxRSZqPx3/ct2dHf/J41nn1Xl9ote/oQfcpvIDsb188dFBbiyBpK3+tyIAMgYUwR/BSArAHwLQ
-						a9FReV///jj8ikUA72slwMhAGBHyEmBFQNcHLDuCkSAsDn6DAPWCvxkeoZvjEdeDJKCDvi5LwGKMAh13z1KehwTwegBIwEnXZ5XsDBQk
-						AAuDKVgPAJA/D+jHyI+p+kt+kUD/6bckpziy9SefJ8AAj4q9AD1DtwdvruTjpX873i+G/kw/Q7yulX4L8Ti5GMDPsM8vAfwC/sN96gRA
-						JaAiAKEbkQqA7QLYNQDJVqBGAEIXgH6/Cv+2CzBt2faiANR2AXgMyHQAVvkOQNMuwL6GEhC7AAT/pgvQjgToegCVgCgCNRJAkBdTFoFc
-						AkrdgFQEzFgQAWoUAQJ/jRGB9mUAaU0IbErArim9/xWHvr9GSXZE8smBvx3obwr+Ptsz8Lfw37zqb8C/JfjHY7Ix/K/COhfKhdffbnkd
-						AATg3Q8+cks8/LMAGPhXAUir/1EAaqv/lfEfEYCm1f86ASDwtwKQjP9Q6sd//BagOADMCADgPxEAnv9vLAAvFQTg+SHpCJAIAKUNAeCt
-						QLEGYOB012PuAdeDwL8VAXjQdwCwEJgFYCYEII4BVQVgd1UA/InA6ALcQRJQFgDpAmAr0FwAvk0RAVjL8H8rScCtg1e7n07a6sZsEPgf
-						B/jfcMyNJvAfzeB/1I3y4D8SWXPYjWDw9/C/6qAbhqw8wH/efvL1RAD2kAAgW47RcxNLAEaAvATwImAVAN8FWC1dgD7zt7p/uOvZIhu1
-						n45Vns86r87rk7vogXZz+QHYZrr3ck/M2mWq/xfdzN2XOLOQPRLsCCS7Avnsu1SBeqTrlH3uG6N3cpXdioO+r6a4dgBRAdCxIA0EAPGd
-						gKWUvqtP0s2ObnpzDrmf0Q3xMUgAugALRQKetKNAyHISgRXHWQBeXnmKvkeVgFOuP+c0V7eTxb4E+VYAUPVn8K8IwMfu4GsfEGTLoWIA
-						bQZuQDy/9AHYa+jPAcx99M8IKvwM8fxSYF+AP4L+cIL/YfRy2MYoALybEZIJgH59FQ8WAB47qhcAOwIkAiDbgIadgIIAZF0A+h2rAKgE
-						zFi7X7oAVgBquwBRAFQCIABBAgj8S12AhaYLoBKgW4JekQSYUSArAborUFkCWhEBgv9m3QACf6TUDWhbBDIZsCJQkoF2hEBThPR2gs/R
-						Vjzo2+D7NikDfxX6ZQ//UlLobwn8m1T9K3v818E/C0A9+HNahP9VWw7w91PpAjQQAGTrvuOJANTBvwpA0+o/CUAO/0n13whArP6vZ/i3
-						AgD4VwHg8R8rAH77TxWAEU0FYHEiADr+EwTAzv+TADD85wKABcDNBIDgvxUBAPyrAPQcNNP1nHeQ4b8tAWAJSAVAdwKKArAnFYDJVgAo
-						PAKUCgDWAXx/tEgAC8BoIwC8DkAkoCwAa9zXBq123x+53g1edZjg/zgLwBgjASwAFBWAKAFRAIau3O+GrtjPo0B7CP45JAC7TyNvcLae
-						eJ0PC5u8gQQAC4AJ/hHA/wSCf2T82gNu1Mq9nB/2nXPNzga4rnvH5z2mdV6d17W/sO0nPdAO5w+8K8k3n5/MC1a1+q/w31AAGP6rAoAq
-						+7fH7OKddcLH7UVM94A/RlJaRBxHgqIABBlAJ+AQdpV53fUiyL9v1gF3Pyods0kA5tINETfG+SQB9HeQgF6LjkUJoDxLAgAJQCfgpRUn
-						WQSCBHgR2HjyneJi3zSy2PcUQuCvWXX0LQZ0Hc2BCOjZAnZkh9/OfxffFkE/wj4APw+2K5XQ6wT9AP+h/qVKASKfA59bUicAegZASQCw
-						SDkVAAJ/H9sBCBLg4b9OAGZtPhEEoHkXQARAJWBuTRegIgFeAPJRICsBPArkBSBIAEFSUQII/q9KArwAVCXAC0BJBEInoF0RuDYy0J4Q
-						aMpSUB/5uFwC0s/Zekqgr7FrIULoZ5LHgn+r0F+c9ac0An+BfxGAHPzbhX8WgBbgf+VmyeW33ksEQCWgtBAYQdcgr/7z6I8KgIF/FYCG
-						1f+sAyDwn47/YOvPWP2PAjDB7v+fV/+T+f+VMv5jBSAb/7ECEOb/GwhA30QA5jD8tyoAzw1Oq/+tCkDPwbNdB8F/z4UE/wsE/nMBAPy3
-						JAC8FahIAI8BGQEA/EcB2FkQgO1eAGQh8PfHlARgY0UAvhUEIErA10kAbhm0yn1zyGr30uL9HvyPEfQD/ilrj7gRBP8jCPyHI6sP8dgP
-						V/4Z/g9whpAADF6xz606SPcrX/lX+NegQzBn24laAUCwGBgCMGzZbnf9NVoQfEO3nvtvueWW/4PHtc6r87q21w3dO+4tPfDazk96u1dX
-						HovV/11Z9b+hAMSqPuAfH//DiXvcSILTmfQ+SPy4mjEixMoARc8VCB0BIwWQAEgKgP8n0/e7n848wBLwwCzc/A67R/imSDfIBdIJ6FgY
-						R4F4Z6BlZmeg5Sfj9qDYHYiCRcQAeZn3N1V/A/866x/ypiz8RbBlJ+A8ALjCOF56qFewt38/gkBdx3jkz/KSQd+DPYP+hrME+yb4M78t
-						7QDEr5WOAYkAyJqCsAsQ1iIYCbDrAPTwMSsAKgEqAHkXwApAlADZCnTurgskAFs4zbsAO4pdAKThKBCBf0sSQOD/yUuACEBJAkQE/ChQ
-						LgEE/eni4FwEzoS0KwLNZKAdIUBKMJ4E76OpkYBmKX3dmAz264A/r/hTLPAXoV/TAPxz+C+Cf1L1j2lW9W8J/n1agf8Vm/fTv/tMVQBY
-						AlQA0i4AXsfnKMJ/Mvqj8B+r/xb+7fiPCkCs/m9Kq/8UW/0Pi38LAhCq/yQAozMBiNt/igDk1X8rADz/bwVgXFUAePzHCMArBP5WAAD/
-						uQAA/psJAOA/EQCMAA2d43otOETPYShmNRIA3wHwEpCPAOEsgPv8OoC2BWDCjqIA/IAFYIsXgM1yGrAKgN8NiAVgWL0A3DJwlfsapdfc
-						3Qz+IxGCfyTCvwjAMMrQlQL/g1cgBP/L97lBlJEkBztPCfDjXACbnacuux0kAXO3n6gVgHFr94cuwMNjVlyzBcHXd+vo5nGt8+q8rt31
-						D90f+b/Rg+ud8oOuvXQfvpyr/9wB2CnjP1gArBKgEJ8IwF4RAFTypZovIz3Yk3gMQaeccivRzyGfB3AY1xQEIeDPYUQgO1cAAsCvkwAA
-						mAH+3aftc3dP2+/umQEJOOjuJwGAFDw8VyTgMdwoSQB6LDjqemI9AOUpEgFsDcprAiABy06wCKATwFuEUrB7T1joS6BvD/aysQKg8L/n
-						wvsE4RbG49kCDPEUhXp+u4d7vC/+rADPf6a/i5Avfw/QH0Ivh+CliRUA/RxWAKTDoAKAcSQRAJ3/L3UBuANAPwskFYDYBQgCQL9X2wVQ
-						AUBEAC5zIADz9l92U5duDwJQKwGmC3BFo0BGAuwoUJAAEoBUAg5yEgkg8EeqEiAC0FQCzBiQSgCyaTfBP1InAQ1FQASgHRHQswNCALom
-						OfyXUhICpAzkaRji8bImpY9pnALw5ynAPpIDf0Po90mgv2Xw1zQB/wbwn4P/tYB/BK+/895Hhd2AZAwoFwDk6OlLYfRnYQb/1dEfSs3o
-						T6vwrwKg1X8IAMO/F4B8/Ier/yoAPP4TBUDGf8oCMGRSKgADkwXACxj+mwmAzP9HAXihBQF4GmcAUKwAdLwaBaDXyEUE/4cZ/hMBoAD+
-						cwFg+C8KwIF6AZi2NwqAXwSMswBEAHYGAUAXIAgA5YckASwAlCAA/iyA20bELkC9AGAMSATgqwNWuq9Q7p+8hYAf4H+EwX8Ygb+EwB9V
-						f8oQrvofcIOQ5fsly/a5gZSZ20546L8cQ/APAdh5EhLwmpu/44Sf//fwv1aCMSCsAxhJAjByxV53y5NjiqzUfjre+MwdD/+fPbZ1Xp3X
-						tbmu79rxQvkB115uevhVN3rz2SAA03YB/lsVAAF3FQAsTJ24/TwfHoZTbzXp5yI45GSfU0XAJ3YEpLOAhcV4iR18uk3Z57pNldxFEgAZ
-						uHeGdgEO8VqAh+mGiC4ASwAWBeMmyusB/M5AJABYE/Ds0hPuOZIA7A70kt8dCNuJ1o392MW+JwH+Pjgv4AS9XHzwDd5BKEJ5+jpeCujH
-						t/Gf9X0I9PVjBvu3MeT7zzmYXg7agO1K5e+R+PlVHHIB0HEkCMAFjnYA6gRAty1VCbBbgVoBCBLg4b8sAAL/LAB+IfD01XsrXYDKKJAK
-						gJcAhf9GXQCWABUALwGLNbkEeAHIJcCuByhJADoAkiMVEQgSgLAIiATkIsBdgEwCiiLgJaAqAgT/LYrAJyEDmpIQ2Ip7Gd5LSYG+1div
-						1SrsIznwXw30C/jHRPCP8F8C/wD/lKup+tfD/4Ei/K/YJDl88mKtAIQugBGADz76uVu0lgSb4D8IgMI/JYF/LwCtj/54ASid/OvhPwhA
-						Uv1PBUCq/yIAgP9EAAj+rQDE6v+SdPyHBCCO/4gAxAPARAAY/psIgMB/FAC7BkAF4KmsA6AC8OSYZe5JdK4pzQTgsSAAXgIwBpQLgI4B
-						oVhGEnAvSUBVAGIXgAWAEgRgggqAngVQEgA9C6AqAN+EBLAArHW3kgTkAsAS0H8FrwsYtBK7/Aj8D10F+JcMobcP9tV/gD+gHxmwdK/r
-						77Pm0AUBfpMdiBeAHSdec4t3nyoKALYEZQGgvDR3i/vM3U8XmanddOnW8bTHts6r87r6Sw796vhl6cHWVrp3uEembnOTCNqRyTs8vHuA
-						DxV8A+sptEdwB/jOABgSLGI8ByKB6OfD33G8CFRHi17jJBKAePDHxzxON74fT9nLC4xVALpT7iYBuGf6AXfvTKwFkC4AJOAR3Bj5Bimj
-						QJAAdAF6LT7mtwc95novkU4ATgvWcwKOvvFRGPtRCYhV/xit+iMsAG98zKA9aB1BOgCdcyacL8Cw7t+OswbkbTh3wL+vBXv/fuHj+XPS
-						6+v08/m/x+cE/FO0+m8FQCVABYAlQMd/fKwAqATYESA9DTjdCciPAWkHgKICYCUgngWQSsDMjUcI/jc37gIQ+NsugN0StJEEQACsBHAH
-						oCABVgCWbhQBaC4BcVegOglIuwHHihIQRoFUAgrdgFQEToXUiYBdG7CdoF9TJwJIMxkoCkHNyFCeFM4/uZQA36byb+RUfxYcAv1k1Id+
-						ljZ10K+Hecm+/h78Kc3AXyv/XP3PwL8V+FfwX0OPTaRV+F++cR+9/0GC+nwdQCYAZh0AsmP/CYZ/3vbTwL8KQAr/Tar/RgBi9X9jbfXf
-						jv/E6v8aGf8h+EeK4z9GAIZPSQVAqv81AsDjP1EAZP7fCoDM/4cRIDv/HwQgzv+zABD8NxOAJ8cs5041TtBXAQD85wIg8J8JAMF/LgAP
-						+NQKwDQjAGYrUBEACguAjAHlAoB8z48BsQCMMgJA+TZJQHMBiF2Am/utcN8assq9smS/G7oa0C8ZDPj3lf+BgH/KgGWICEA/ZAnBO0aB
-						CPYZ/E++zsEaAA7B/zbOJbdkzykP/pJxaw64catFAEas2MO5/eVpZW5qOx0f/cM9j/4/PL51Xp3X1V30oBpffZC1n5s7RrkJ2wT+EcC7
-						wH97AoADuXBAF68h2CknCE+lz4NEEbgkMZ83fH5K8rnpc2ogAvi4hwnqAf93VgRgP48B/YRubPfMOJCNAslNUToBujMQbqgiAbwwePHx
-						MA6EYFSHwd9X/AX+ZbEvL/h9y4/8+Kq/wv9xyraz7/JZAgMJ0hHAur4+0IO8vg2v27fHvxd50I/T98f2pAP0bUEOUgGQbkIUANsFYAHQ
-						LoAXAJUA2wWQQ8jsQuBLNQJAIeivF4DyCJAKwOztp4MAtNoFyAVAJaA4CmQkIKwDaCgBB66tBAD+NTUSkIiA6QLkIhAkoBURoLQiAi3J
-						AAKAzhIg364fsNG/v5bB122S0vfK8f+W/N/LMcAfwN/Dfgn6m4O/wH9T8EcC+GsagD+nOfyLADSHf2QZ5fSFNzIB8BJgBMB2AS698Q7D
-						vwqAhf/q6M+2FP7z6n8uAFz9FwEoVf/z3X+k+h8FQBb/igDE6v+KZPynJACDJ8YFwDz+YwQgjP94AUjGf0gAAP9WAF4c1lwAeg+QlATg
-						qTHLBP59SgKA5AKAg8ByAYgHgZUFAPAvKQnArkQAfoytQCkiANvcD0kCfjBGJOB7vguQCoBIQFkA1rqv+52AWADMGBAE4Mv9lruv0+vP
-						L9xD4A/4P0Tgf9DDvwgA4L8/4iv/gP++S/a4vov3uHk7Tpmqf0kAvATsPhUFYK0IAMaAVAD6L9zuPnPPi0V2ajc3dOs52ONb59V5XfnV
-						5e4nfp8eUFd/6Ff3Xq73ggMB/pFY/Y8CIGM7KaAzpCMkAKuOvul2nnuP4V/XEIgEkABoN8B2BPznrReACP8ITsfFCcI/nizwXycA6ALI
-						KNBBdx8JABYEP4gbIXcCZE0AFgVjPYBdE8AS4NcEYCQI5w/owV5h9p9gH1HwZ/jXvPkRwb8Es+39cJ7AmjOu/1pEzhXQQ8YA8Bz6O/4z
-						vWS4D5G34WP5fTjy8f39x6sABAnwAoB1AVYAEF1IbBcBIwr/uQDgELJ4ErERAIoVAJUAuw1oKgEE/hovAPk6AIyQiQDUdAGMAIgE7OA0
-						6gLICcEiAA0lgE8JLo0CZRKgAuAlgBcFtyoBBP65BOjC4LpuQLsiELYM9RLQUAQQgv5WZQBJREBTAmyfogxwqrDeKKXP3U5K/5YQ/Fs5
-						Bvg19DNqF/pT8Mfv5krAH4+FFPxT+Cfw1wO+msK/CEAr8I/g+2hnO1D8eSV9vvn8f64x/KsA1MK/F4BWq/8qAJXqfyIAK4MAAP6jAMj4
-						jwpAOv5jdgCqG/8xAtBnlBEAvwOQFQCe/4cADNXxn+YC8CTgf/Ri9zRGVGsEQOE/FYB4ErAIwCHeBUh2AooCcD+649gsgwWAnidrBUAk
-						oE4A5DCwVAB0DEgEYBMLgHYBEgHAbkDNBKC/CMCXXl1GMrDM9Zy5g0eCogAQ/FP6L9sn8fCPvErw/+ri3a4/icCmY5cI+i8z+G9DTlCO
-						E/j7bD1+yW2l91m653QUgDUH+EwAFQDkrqELrtW2oP983V0d/6vHuM6r87qy64auHTMKD662852Xp/O8vgbwHgSAQ3Cu8ZBuZQACsPrY
-						m7znPWb1JxE0TlIJYBEQAUhEwH/e9OtgPOgif16NygC2zgTg3zFpb40A7Hd3QQAI/DU/8aNA94VOAN0M+eZIN8v5R+jGecSvCfCdAGwR
-						uiSOBO2+8F7xZF8VAJYAX/WXsR+Cf8qxyx/xCA+2EO27+rR7lYLDxSAEesgYdhfCn1kSAPUkCv0Q/jsTfrt5P8QIgO0CMPznAkDh6j8L
-						AA4KS3cB4oXARgBUAuIIUBQAlQAVAJYA+h1qF6AqAK9zbAcAyQUAXYApS7YFAUi6AEYAcgngg8HqJEAFIJMAOwrEEsACYCVABaAsASoC
-						uitQqxKQisAxTkUCCPo1jSQASUQAsMnQ2VwEKjJAANxIBtoSAk0BxBulBP42lY/hryOz+s1S+t4j+OPfZ6DfJ/58DPgr8IcQ8CMG+Mvg
-						H+G/JfDXeAGoVP0N/NeBf4R/epy2AP9LN+wNef2t96IAsATUCwBy6MSFIAAJ/CejP1n1Px/98fA/bZEXgLrqf+HwL4b/ZPxH9v5XARgV
-						xn9M9R/7/xeq/1YAAP9lAZifjf8gcgaACkAc/xEBYPg3AgD4twLwdD4CNHS2673oSCIAPK7KY0BVAcAuQFjfpvCP8BhQOwLgR4AgAFgH
-						oALQ3XcAsA6gmQDwVqC5AJh1ACIA6xsIwGovAKtSAei7zH2RJOCLfZa6n03d6gb66r9W/vst3cfpi8r/Yg//i3a7Vzi73IT1RwT6KTgL
-						YOtxBOAv2UICsIUEAFlGEjAW8M8CINuBjlhOArB8txu6bLe78eEBRYZqO107xnmM67w6r/av67s/8RfFB1a7+ckzrs+KY4kAANJTMC8I
-						gIHzdcffYvjfcPJtN5HgkeMlQEVAZOCiRGWAPrd2A0QIJLYjgM/fn2AZ4P8jyh0E/yUBgBxAAO7yHQAVAB4FwqJglQC+KWon4AjdNEkE
-						uBtAN1a6wXYsPsYjQa+sPhnA3wqASkBY7OuDsR+Gf8rGU+/wWQI4WbjPqtOS1afcqyQEesiYvB7lQF/y6/4lv5+RBwgBBCB2CapjQFYA
-						VAJEAPy2olkHwAoAoicTqwSEEaCaLkAYAaLkXYAZXgJwFkB+HoBKAAsAZdqK3W7KotgFCBJAAlCSANsFKEuA6QJQdFvQ5hKwP5UAAn+k
-						JAEtiQCBP9JUAmpF4AQnFwBEJYBFAODpk4gAy8DpkIYygBAUX4kQaKwI2G1H81SgXoO/aznl76GUEuhrKj8DhCDfxu7ogzSH/pgS+Fv4
-						z8G/Cv+lqr9PBv8B/FH5p1TBX+Bfq/4W/pHdh043EACRACsA73/4c/r/RQKQbPmJNId/O/oTBCCB/6z67+E/Vv+jACj8qwDE6v/KavXf
-						CMBQs/uPwH8UALv/fxz/8QIQxn9EAAD/VgBk/McIAMG/FYBnBk3hqAAw/HsBeHrObob/qgAc8QKA56vWBQDwnwsA7wLkx4AaCwCFBWCX
-						CMBEEYA7eCcgFYBt7gdj6wRgkx8B2thYAAaLAGgXIBWA5SIAry51X3hlqes+dr2M/DD873d9l2LkRwL474MA/hfuCllx4JwXgAj+qPwD
-						/jcT+Nss23s6dADGYAyIBWCPG04S8LOx12pb0I7/1qV7xx95nOu8Oq/2ri7deq4tP7Day4+HLEngf9KO81yht/DfSAC48n/pA7f34gcM
-						91hHMIE+D8Kfjz+nSoAeJBVT7gzEr4uFuD+auIfPE7ACoBIgArBfBIDg3woAFgNDALArUNgZiBdEYU3AYe4EhC1C0Q1YeJQDEcD3E6D/
-						LUlY9Euwn1T+Af+IF4Dpu15zL686yduIYjtRPWFYpYBfkmBESaAQ4Pch2IcovEJhYeBEMWgkACwBpgOAyA5DZg2AF4BkDUDWAUgFQODf
-						CoDtAtgRICsBsQNgugBWAAoSMH3tASMAIgEyCpQKwMxl2yUNRoHmGAGoSACBf5AALwBRAnQ9wCcnAWu3iwAkIlCQACsCKgG5CMQThJGS
-						DNSLwJXIQJ0QICXorqYsA62l9PnSlL4vSRPYRzLgbxf6q+BvRn7odxigX1MD/gr/IgAC/mnVXxOr/3XwH6r/Cfzj0Lsy/C9Zv4dfvvP+
-						R4kENBIAdARweBkEwMK/CkCEf58G8K8CEEd/NjSB/7UR/mur/yIASfUf4z9+ByAIQF79rxMAwL8VAIF/ZE4b4z9GAEwHIFT/h891vdGB
-						9gKAWAHQXYAs/OcCAPjPBcAuAm5JALwEQAC68U5Au8JWoD+esMMLgKwDKAvA5igAfjtQFoDhRgAoJQH4CncAVokA9PcC0HeZ+0IfEYDP
-						v7LY/XjUWvfqkn0+AP+9Hvz3uFcoLxP0v4QsQHa6Qcv2Euy/5raQAPBLrfz76v/moxfdJpMl6ASQAHAXYEXsAkACbu4YWWSpdtOlW8ci
-						j3OdV+fV+tWlW4+/Lz2g2s3n7n/RDdtwOhEAQHlTASDwR7BF5gGCf2TJoTfc+K3nJSQBCGRgIrLddwR8tCPAMkCZqvECMI2+DmDy6cXH
-						3A8mCPyrACj8NxMArAFQAWAJoJueHBImawKwM9BDc1IJ4LGgBSICm0+9QwLgF/xmAhAW+74Rcwy5/JE7/PpHXPHHgWIv4mRhyosrTvEJ
-						wxqWAhKElyAGFP4zwf7LXg5EEKIAhC4AC8AZTiIAXgKCAHgJUAEIXQBf/ecOgBEAlQAeAfLwP27bRRYAlQAWAC8BtQuBKbYLEBcCp10A
-						3Q2IBWD/Zc6MjUdZAKpdABGAigQ0GgXyAtBUAgj8UwkQAfikJCB0ASABRgR0YXBVBI5zrlwEzCLhPAT8bckAQjBdShm6Y0qw3jD4mEJK
-						n7sY+l7zpP+WKuwL8FfTFPqRAP1IDv6SAP4UORCuEfjHyn8V/CP8r/bwr+B/tfCPLF63R7YENQKQjwFZ+EcuvP62m1uAfxUAC/91oz92
-						/CdW/1UASqM/V1L9jwIQx39EAAbz3v9a/U8FoD8O/6LY8Z8oALIFaP34TyoAYfzHC4CM/xgBGDE/EYC8AxAFQCRADwGTdQBp9T8KAIpe
-						IgBIEACCfx4DMgLwk6l+K9ArEYCxgH8vAJR6AVjfQABWZwJAsQJAgQB8/uXF7vvDVrs+BP99GP73uldIABj+F+12LzP473IvEvy/OF+C
-						swEC/B9DfNX/6KUE/jcdueg2UhbvOsUCMHqldgFEAJ6ZscF9pvtTRaZqN9d16/hLj3WdV+fV2kUPnI35A+lK8pNxaxn6NajWcxW+BQFA
-						5X//pfc5O86+68YR+I/bck5e+qgESDdAJCCMBvmXUQbiomFICObzAf8tCwCBP9JIAO7zAoBRILtFKBZMQQIepZvoo/R1sQaAZ/0Lu/1w
-						3vyIBEDm/TWo/B+7/KFbd/xt3kJUgzMFnmcJkLygr688ESUBYkDQDwFQCYgCQAkdgDOcigDwrkEiAGEnoBoBCCNAXgCQ0mnALABeAqpj
-						QHIWQLULQPBf3A6U4L9BF4C3At1ywk1eaAWAsoQkwHQBVAJsF6BdCbCjQFciASoAzSVABCAVgXoJsCIQJIBFIJWAxiIQ4d/GisCVyECt
-						ECAE3I1SBPQrjlTxk9D3UEr1eyXIN7GQb5MDfy302xjobw7+PgXwt/Cv4F+s+gf4J9GsAf8rhX8En0cXAycCQFEBUPjn0NuW0eepwP/y
-						5vAfRn/84t8pJAAp/NdX/5PFv42q/0YA8ur/UK3++8O/VAAA/1YA8uq/FYB8/OelZPyHQvCfjv+kAvBU/ygAT/ab5J6evy8VAIb/KAA9
-						/ciqFQDAPwsApVYAvARYAcAaABEAihcAwH8uAFgEnAvAj3xKAoAkAkDwj+QCgEPBRADWuFt0HUBRAJYHAbjplSUsAJ97aZH7ztBV7sWF
-						BP4E/y8T/L+0cDfnRcA/Qf8LyLyd7vl5O7gTsP7wRYL+13zi2M8mkoCNBP8hRy64jYcvkASc5DGgkVgI7MeAkG89N7HIVO2nY5XHus6r
-						82p+3dC1xw3lB1J7uenhfnzolxUAVOSbCoCv/O+/SPDvg1Gg0QT/Y5GtMeMo4xGSAN5VxqfSEdCQBODvHyAw/76H/yAAk/aEBcBWAOQg
-						sAYCgNANj6v/M2VXIBUAfB0rAT/DzZNEYMSms1L9hwQA/t9MBSDs9gPop5eAf5wXcJQEAJD87LIT7pmlJ/glzhR41giBnjEAEWAZAPx7
-						AUBsB4AlgNcL6BqAVAAA/1YAbBdA1gAI/IezAEwXQMeAuPrPAuC7AAz/EhWA0AWgx0cuALELEM8CKHUBVABCFyCMAIkAzNp2mgUglYAo
-						AK2OAs1eEQWgsQSIADSUAL8oOEpAKgAlCUhF4HAiAhAAKwEsAh7+WxEB3inIS8CViADSrgzUCQFShWwTAvZKzOFkaQoff42SA75NCfYR
-						u54ih/8gAPg5m9RBP+cKwb8E/wH8Ufn3qa36+yj4C/xryvC/aN1ujm4JWhIATiYAB46fr8B/EIAA/0YA8tEfD/8qABH+1yfwb6v/QQCS
-						6r8RAK3+ZwJgq/8QAIZ/Pf2Xq/8iAGH8p1D9x/y/rAGojv+IAOj4jwjAcy0LwET31MgF7mm7CNjDfxCA0AHAJhaNBCA7CZjyAD0PNhQA
-						yt1eAu6asqeBAOxoQQA2mw5ALgBRAuoFYKUIQD8vAFgDkAnAjZSv9V/mnpu/iwXg5QYC8Nyc7W7cukOJAGw6dlHiq/6aDSQAG0gAkEUk
-						AXYxMATgpTmb3afv6l1kq3Zzw50dn/Z413l1Xo2vLt06tpQeRO0Gq+m5Om+CHXumIjtxCrCcBGwX5yIrjr7h9hH0a7DwF/A/pk0BwNdL
-						RIC+Lt4fs/rfI+hvTQAI/q9AAFQCAP9YFCzjQFgXABE47JYdfiPM/jP4kwDool8Z+fEV/wD+H7kjlEOvf+heIJjHycLYSpS3E+UzBbwM
-						eCGQzkAmAF4CSgIQFgF7CUg6AHpmgJeAMALEpwgL/JcEQCUgjgBFAVAJYAHQLgBBP6ICUO4CFATASwALQN4FYAmQ3YBm7zznJi3cFARA
-						JEAEIHQBWALMYuCiBOxsLgEqAC1KQCoC6c5ARRFQAShIQEkEGklAEAGCR14X0EQErqkMIAT6pZSEQFMCcY09rVjTrgSUYL5R4o5IBPhZ
-						Eti3yaCfwd/DfoB+VPs1OfjT7yos8jXQL+CvqQd/TQ7+Fv5XcuWf4sG/Efy3Cv443RfZtOtoMgYUBcBLgIF/5N33PyIB2N4E/rGzV2P4
-						n1Kp/osABPhnAYjwrwKAk39VALT6DwFg+PcCkFT/EYL/IAA11X/e/ccKwOgoAJXxn0wAZPynRgAI/hMB6BcFoBcfALasIgA6/qMCoPP/
-						jQRAzgDAc51IANYAQAKsANwbzgLYFwQA8J8LwJ0sADsTAQD8RwHY6s8BEAkoC8CGRADiCFAqAEgUgBW8DiAIQB8vABQIwA0vLmAJeGbu
-						TvfSgt3uBYTA/3kG/53uubkE/5RnSQCenbvdrdh31m0++hqP+8SKv89h5IJbzznv1h8679ZR5m07LtX/ZbvdMM4u992XpxbZqu107djg
-						8a7z6rzqr+vv6tGl+ABqM1/qMYxh3cI/OgAK/3UCsOLIG27vBQJ/H7wOaRi1+Sx3ExCIgIaFgOByLEaCWALMWBDiBQDB+99NN6Hbx+8O
-						AqASAPj/UUEAePzHC4BKgD0HQEeAZP6fwN8IAJ8NUBAAHBR2mEDe7vij1f+w4NcKAIE/JAACsP7E2+6pJcc5T1NUAFQCVACeA/wXBMCu
-						AVAJUAEIEqACoF0AIwDJVqANBCAfA9I1ANUxoLQLoB2AvAvAAuBHgKwEWAHIuwBxHYAXgN30Ob0ABAkwXQBEBaAiAWYUSE4J9gJAkR2B
-						cgnYnUnAXk4iAWZRcNsSQOBvJcDCf50EtCQCXgISEWAZOBFSJwLtykC7QoCUZKA2APlWUvrYItw3TxH0NfgZhJhKfwb+CfRT4rkNKfTn
-						4B+hn36nHvpbAf/6qn8K/wr+jSv/Cv8iAHXwv3DNLs4bb79f6QIkAuDhX7OBhCaBfy8ACfx7AbDwHwSAwB/J4T+M/hgBqMA/Rar/XgAI
-						+oMAJNX/VAAw/sMjQIB/IwBa/YcApOM/6QFgyfgPQvCfCIA/AAwC8Kzu/+8FQE4AjgIA+FcB6Hh1vOs1emlDAejh4T8RAHoOayYAfAhY
-						IgD0XEnw31gAdrk7vQSwAFCsAOA04FwAsBA4XwOA5AKA04BFAEQCwjaglFQAZB2ACMASIwAL3fUvLHA3913snp69gwRgl3ueBOA5BJV/
-						gv9nCP6fmb2N/n6bG7x8L4/8BAFg+L8gVX9f+WcBIPBff+gcCYBk1pYjiQD0XbDVffae54uM1W6wrtNjXufVeZWv67t1rCs9eNpK9w73
-						+IwdCfwjPINvIiLgx4Eoyw+94fZceM/nfc7Ko2+6kZvOcqIEnOOMQVQCuCMQ1wbkawRkj/997rsE/60LwL6wBWidALAEsAAcjALgJcAK
-						gEoABKAvQXe+5WdJAFQCVADwEj+vpxbjHAESAO0AmC4ACwDleQ//KgAqAYkA0PchAhC3Ba0TAJWAZCtQFQAzAmQlwK4BkC5A3Ako6QJ4
-						+LcjQCoAYTcggn+NlYCwDsBKAEF/6AB4AeDsfY0FIEiAFQAzCtRUAkgAmkvA7uYSQJBkJUDhv10JEBE4zEkkYJskFYGjnFQANLkIHOe0
-						IgK5DJQEIE/LQqAhMC8Hfycpw7xNBPtGsZ8zCYF8s6SgnyYAv0kO/HHMx6QG+huCv6YR+Hv4bwT+jar+qQBY+KfHdRP4X0DZc/hMdQyo
-						gQCcufhmC/C/uSH82+p/ZfTHw39l9KcC/2b8J8D/cg//ywT+cfhXgH8//kPJq/8qAH1x+BdX/3X/f1v9TzsAgH8rAFz99wIg4z9RAGT8
-						JwoATgBWAejZZ5zrNX5lIgCA/2YCoIeAVQUAz3teAAj6EwEodAC6Yw0AJRGACYgKwI5aAbh9FEICMMoIgD8LgAXArwMQAVjbQAAoEIB+
-						XgBerReALi/Md1/us9g9OXu7e3beTonCP6U3BGDWVvfUzK1uwa5TftQnjvtI1V+Cqv/ag+dMzro1B866qRsPsQAMXbqL88NXZ5Q5q+10
-						rPCY13l1XtXrhm4d15UfOO3lq0+N4VGbXAAs/KsA6HqApQcvuz3nCfwRLwC7zr3HUD9841membcioAlCQBKAOXPuBlCsAOBjutIN5zvj
-						drEAfC8XAD/+owKgEnBnIgAiAXflAsA3t6oA8Px/JgA4GwACMIsgtSgABP5x9x+z8Bfw7wUA4N6uANgugF0EDAEIuwBZAaDYEaDaLgCB
-						P6ICYLsAYQSIfheSC6kA5F0ALwCpBGSnAhsJ0IXA1TEgEQCVgKQLsPeym7RABIAlwAuAlYAgAJkExFGgHZyGErCaJMB3AT4RCSD4R6rd
-						AJGARAQyCRAREAmwIhAlIBcBkYBGItBMBq5GCDRFIbApwXo7KX3OYppDPlICfY38TMrQH+DfAD9Dv4Z+Pzn014I/0gj8KUXwt1V/HwX/
-						Evzn4N8q/CPoEnzwkV8MnAiAl4As+Ht8XIB/LwAW/lUAEvg3oz+5AEyYK0ng3wjAGCMAo8Lsf7r7D+BfBYDh3wtArP4vluq/F4ABdvxH
-						q/9eAMrV/9lx/McLwAth/EcEAPAfBMCP/wQB4PGfKACAfw4JQI9XSALGrZQ1ABb+vQBgBEjhPxGAuTL/XxSAWY0EYF8qAEkHgMICsFME
-						gBIEYJwKgEhAnQB8axgEYEMiAF8vCoBIgBUAnAVwEwsAdgJKBQBjQF0gAc/Nd1/qs8h1zNzmngH8U3qTEKDy/5SH/16UV3hBMME+wT+H
-						oV/AX6Pwv4YjArBq3xk3ef1BPhQMAjBg4XZ33U9fKrJW27mr41Me9zqvziu9yBA3FR80baRL917uqQX7K/CPGfw6AVi4/3WG/d0E/xyC
-						fwRvB/xrEgnQ+G4AdwRYAtLg47CQF/D/nXG7EwEI6wCKArBPBCDAf1UAWAIyAVAJkAXAXgC8BKgAbD/7bkUAePGvEYDKGBBl+9n33JOA
-						fy8AYQ2AEQCVAOwKZAVAR4BCF4DAX9YAyBagKgAqAf0N/CMK/7wI2IwBhQ6Al4DQAfASUBKAvAuAtRvVLoDAP7YD1S1BYwfAC4DtAmj1
-						v7QOwCcIQJCA2AVQCQiLgeskgLsAzSRABCCVgD2cK5GAoggYCVixOXYCWAQI/JFqNyBKQHMRiBKQi0BLMkCQq9m052SSEvzXpSQDNmVI
-						jyl9THE8p9XgezIpAb6NlaAkGfA3hH6fRtBv0y74yw4/ZfC38J+Dfwn+I/hr6uEfh3shJ89d9gJQWAdQCA4SC3P/lFbhv1T9T+DfCwDD
-						PyVW/1fH6j8EgKv/6d7/DP9+/CdU/7PDvxj+w9afFF/9hwAw/BsBSPf+TwVADgDzAsDjP1EA8up/GAGy4z8qAAT/KgBPvDLW9Ry/OhMA
-						cwjYvMIIUEEAeP7fCAAvAA4CIGNAsgA4F4DdUQB4BKgqAD8YK+sArABgFyDkNowBsQBsZAFAcgFARADW+IPAdA1ALgAULwDoAoQOAIUF
-						4Pn57rrn5rkvvLLQ9Zix1fWes4PgfzvBPwRgm3sSAjBjC2faJvq/CvC3Afj7rDlA4E9ZzTnLgQCs2HfajV9zIHQBug2aV+StttO152qP
-						e51X5xUvmGHxAdNmbu09gav/Yb9+n7ATD4G/BgIwb9/rbgfBPwSAQwKAbD3zrhtB8D50wxk3zGf4RglEQMNCsFmiIqAygI8FzAv8iwDw
-						+I8VAMC/EYA4BhQFQCVAzwFgAfAScI8RANsFUAFQCeDxH0qPhUcZ+iEAKgEtCcDljxwWtFoBCGsAvAA84+GfFwET9KsEhG1AMwEQCYgC
-						gMgIkAiASkC+ExCPARkByMeAZAQo7QIA/jVWAGQNQJSA2AXwAuAlwHYBwnkAtgvAAuAPBKuRAKwDmKgCwBIgAhAlIHYBcgkIo0B+DEgl
-						QHcFSiVAxoAaS0BJBPZxWu4GeAEIEmBEQCUgEQGCfg1LwHZJSQREBlIJ0NSKAJLLAMFuIxloVwhsWgZ7vO8VpvR1K6BP/648KfBXYZ+B
-						3y7o9fP9Vwr9yFqs8eAA+m3qwT9s8enBv77qn8/7C/g3hP8m4M+n+67aQd/74fqFwIW8+c4HDeFfBaAZ/KsAWPhXAQjbfiIW/r0AFKv/
-						JAD11f8oAFL9FwHQ038Z/sfY6v/cavXfCADgXwXgOZ8gAKb6D/i3AsDjP0YAehL8qwCwBEzdzGNAKgC6CFgFAPBvBQDwnwvA/VkHAPAf
-						BGD6Pr8NKAnAVAiArgFoJAC6C9A2932GfysAshVoIgCVEaB1vgPQSABWigD0bV0APvvsXHfTywvc49O2uCcB/rOk8g/w7zldgjUBaw4S
-						7B9GtZ+APwng30O/zf6zbsXe027ZnlNuzKq9oQvQ5b5XiszVbm6464m/8tjXeXVecsEMSw+WdoLq/9MLDlTgf4IKgIF/ZM7eS1wN30ng
-						n2fmnktuCAEnMhSBBBD8IxCDEJUACroB2hEYvP40gfwed9vYXRzAf9sCMKUVASD4LwkAboY+VgCGEDyffefKBAAAzgKwRJIIACVdBBy7
-						AHo+QCIAoQvgBYAS1wBECdAOgAiAbAM6yMN/pQugAkA/f0k6BmQFgCXAC0CQAAJ/RM4CuFTpAuhC4KQLoB0AlgARgMqZACROCAQKAjBx
-						wcbQAUglwK8FaCgBKgAiAXZr0HoJEAFIJMDvDNSWBHgBSEWgIAEtiEDoBHgJuFoRYBkgqE3TWAbqhAApg/fVpQT4paQfR0DfAvAjFeg3
-						Seb5Q6rAX4R+m4bgT79DA/4K/Q3BX9MQ/Mvwr+Cvu/0g7cC/CgACqC+uA6jJso17G8D/piL8qwBM9ElHf2L1X0/9ldGfTABmVA/+CtV/
-						FQBs/anVf3/4FwSAq/8qAKb6H8Z/vABI9b8gAMNTAQD8qwA8i91/jADg9N9Q/eftP+34TyoACv9PvDzGPTFwRvEMgMeNAAD+gwDMEfgv
-						CoBfBxDhPwrAXQUBYPhnAdiVCkDYBpQEIHQAtrrbR4sAyCLgKxWAVZkAyDqAz7MAiASwAFAgALwO4PkFQQD+4Zm57vMvLXBPeAlgAZi5
-						xXWwAGymbHJj1x2qFYBQ9ffgr0EHYDlJwBJsD7pijxu6ZKfreq26AN16LvfY13l1Xjz689eFB0nbufW5SY7n7rNMJLjLBQCHfW07804R
-						/rHt5xAC+CAABP8a2wngsaBMAkYC/tedZqj/9pid9QLgJcAKgErAj40AqARYAWAJoJtZWABsJCCsAaCboUpAFIDDbsGByywAZzMByNcA
-						5AKw7+IH7kmCfo0VAJGAeCZALgBJF2AVBOBkIgAqASwAHv6rAuDhv5EAUEoCUOkCmA5A3gXg6j8LQNoF4Op/SQK0A+AFQCVAuwDaAVAB
-						mEDwDwHgTkAmAbIrUI0EhFGg7YkExK1BvQR4AUglYHdTCVjYhgRYEYAAWAkodQOKIsCAmIvAUU57InCc064M1AkBkspACtYpnNcF79fq
-						+zZP/j00Shn0JSXYR+zOS7Xw3yL0V8FfUwP+lMbgH+G/VPVX8A/Vfw/+Av8iAM3gf+7K7bwYuB0BOHjifC38BwFoAP9J9d8f+hVGfzL4
-						z7f+FPi31X+F/ygAofpPAiDVfxGAtPpvBKBS/Y/z/7H6P8uP/0QBiNX/aXH8h/7ce+hs1xsn/o5e5HqPWuSeHrNEMna5e4ry5NhlnF5j
-						lrmO0UtdT3pbzwlrXM+5+7wAxPEfWQAsScZ/jADo/P+DXgAY/psIQHcIABIEwEsABGCiFwDAfyIA2xoIwCYvABuzXYCMAPh1AF/FacAk
-						AUEAKKkAUIIALK4KwPNRAD7de477IiSAgL8D1X9Kj2mbKZs4HfT2ZfvOuDUY+dHKP1f/RQBs5X/V/jN+BOiMW77nFGfRzhNuxPJdbuDi
-						Ha7L/X2K7NV2uj/xFx7/Oq9/7dcNXXvOLz5I2giq/70XHuDxnzyTCOzCCBAFc/+bTr3N1X/MtWt2IiQAeN9BBPGDCf6RXARkJOgsZzhB
-						vx0JGujh/1sE/xCAb48VCQD8f7cgADz/nwgAwT/i4b+xAPgtQHMBmCXJBeAhEoA9599vLAD0siQASw+/6XotPsaxHYDYBRABsBKg8J8I
-						QNYBsF2AsAZABYBiBWCgFwB7GnBJAEQC4lagSReAwB/J1wGIBNQvBC5JgIwCVbsAiHYAki4AvZwwfyMnCoBIQNwWdMtVSgClmQQQGOUS
-						wAJQkIAgAg0k4EpEQBcHV0VAJKCRCFRlQCSgdRlAqkKAlISgtKi4LgLtKgBpSu/fbkpgX4qMRDWBfRsD/QH+G0B/CfxtIvin8F8Cf84m
-						EYAy+Guq4J/CvwiAgD8WvrcC/yIAEIUPP/pFXAfQRADe//DnbiYW/wL+/ZafzeA/CIAf/4mjPyn8BwGogX8VAB39gQAI/FNq4J+3/gwC
-						oNV/v/sPtv7U6n+dAHD1XwQAh38lAkBvf2HSavfCnJ3u+WVH5WT4Zcfdc7wu7BjnmaU+/LxBzx9+/3/ZAjQeAMa7AGXjPyoAj87NBADz
-						/1YACPyjAEQJwBoAhX8WAL8LUHeEOwB7/AgQCQDBfyoA2gHY3kAANosAUIIADDcCQPk6SUDLAtBXBWAJ53OJACw0AjDPfYYkAAKAfPkV
-						jAMR+E8XAXiC4P+JqZvc41M2umEr9jL8r+acI+D38RX/lfuQM5wVexEZAeLsPunmbTt2bdcCdOuY5fGv8/rXfH2u2+P/Gz0g/mv1AdJe
-						vtZ7PG/HmcM/OgAAehWAqQR12Mte4D8VgB0UnAAMiEcgASwCGu4KSIIMhG7AGX5fAP03R+8UASD4LwkAS8CETAC8BFgBUAmQBcAiACwB
-						dDOzAqASEHYBMgIglRFZCIzxnXOA/0wAwhhQAwHAaFMuALELIKcCYw2AFYDkNGAkFwAvAToCFHYCKggAS4B2ALwE2C6AjgDJGJDAvxWA
-						0AXIBcBLwDh7IJiRAIV/FQBdByACUD0TAMnXAQQJ2E2fd94GkYCkC5CfDVAjAV4AWpUAEQEvAFYCCI5KEtBIBCAAiQRQrABYCbAiECTA
-						iEByeBhgkWMkIBOBqgwcS1InA+s1FSHIwb9FKcDrNclB/aqCz2dSD/iNUwR9pAD7yDqIVQPgZ+ivzPfH6F7++baeSCPwr8K/HfeRLGlY
-						9Y/J4b8O/CP87+DDvZBT5y+3LADIum2HBP4pKfyLADSC/1L1Px39ifCvAmDhPwqAHPyVV/8HWwHwJ/8G+Kco/Feq/xSBf10AXKj+Y/tP
-						D/8vjFvqXiTAf3HFCY7CvwrAcxb+Kb0zAcD2n8kWoAT/VgDCFqAICYAd/wkCQFEB0BEgFQBdBByq/2YXoDoBAPxXBIBiBQDwzwIwOgrA
-						t20HwAvArZxUAAD/uQB8iRcBr/ACsNzdBAHAVqAQgJdVAChBAOYbAUBmu08/PYskYKF7bOpmEoFN9HKjZPJGloAle0671QdIABT+KSv3
-						E/QjHv5ZACgY/wH8L0VIAJBZm4+4/gu3uc/e+3KRwdpLx7989seP/389BnZe/1qv67t2jCs/QFoPz/7PL1f/sQ2nCsAUyppjb7ltZ95N
-						42VgBwUSMWDtKc5AxEuAdASiAHBXwHQE8HcY3/kG4D8RABkBAvznAhB2AAoCELcALQlA6AIYAbBdABYAD/+pAIgEYHFsEABKRQB8cgHA
-						AWCo8gP+7RoAFQCF/0YCgNODRQBkG9B0HUB6FoBKQCIA9PMOI0BeAMJCYBUALwEsAF4CKgLgJSCsA2ABuCgCQNCvsV2AXAJEAAT+SxKQ
-						rAPwEgABmLnzgggA4gUgSoARgKuRABWATALaEYGG3YBMBBIJIJBDUhE4xLESEE4QNiIgMpAtEtZ4CWARIEi1qRcBSZCAGhmoCgH+bGP/
-						rpqSDLSXKtyXUvm+8H1zqlV+TSPYRwT401Shn+A+Tw30C/jHqn8z6Ffwj2M/NeCvycDfwv9CVP4padU/FYAc/FH5R2av2MZZS0BfPBCs
-						JhCGMvxvLMO/F4Aw+5/Afzb6k+/7r6M/heq/7PwjAhCr/0vS6r+O/gD+G1X/mwgAV/9VAIbR2wnwX/Lw/yLu914ABP5rBCCp/gP+UwGo
-						jP9kAqDjPyoA4TlOBYDhX8I7ADH8RwG4OxOAbogKwCSt/qcC8IO8A8DwnwoARoAA/yIAG3wHoCoAfBIwC8Bqd/MAXQPQjgDMrxWAv39q
-						lvtKn0UC/lM2uUcJ/B+dvME9Qum/eHcAf67686w/ItAvkdn/ZSQLEIAlBP6cXZIp6w9csy5Al249R3oM7Lz+NV43dn/sfyET/KfSg6Od
-						fL33BDmMq5AJBHh6Eu+KI2+6raffleQSQFl2+A3Xf82pJAMIQgf6qAiwDBCU8ngQwT+EAFt93jpqRxQAgn8kFwCVACsAcQzICICXgIoA
-						+PGfuwn8kVwArATI+I/AP7KU/n1FAXhLBEAlwAoAsu7E267DV/9LAtAbEmAEQCUgFwAZAToVJEC7AFYAkLgQ+Ew8D4B+1gMLEqACMHRj
-						2gVQAQgSoCNANV2AkgBUugAE/3Ex8GsVCYhjQKkEcPWfMmMHCakRgFQC/FqANiRgRkUCRADalQAVgKIEsAjs47TUDfASYEVAJYBFgKA/
-						6QRwogS0KgLNZKAkBBUZqBECpALcGvydhgC+cfzHtBv7NRrGgz7/20oxsK+hn1MC/Kj05yHIt7HA3xj6Je2Df6z8K/gn8B8q/2anHw/+
-						Fv618i/gnwpAHfyj8s8CsFzCi4G9ADTuAvwjdwvwMVcE/5XRnzUJ/Id9/wP8rxT4p0T4Tw/+GpJU/70A+Op/OPjLC0Ba/Zcw/I9S+J/D
-						8K8CkFT//fjPC2MWRfgPAnCc7vtRAJ7N4N8KQKz+H208/oPMEwHACJDCf8sCwB0AHf8RAZBFwBCAvSwAgP96AdjBAgD4rxcACgQgdAB0
-						G9D1DP/5CBDgPxeAL1YEYCnBv54FsLjaAXgOAjDPfZrXAZAAUCAAf/fkTHdrv8UE/Rvdzwj8fzbJZ+J6N3f7CQZ/hn/Kcq72S8U/hOB/
-						KeeUW7zrRJqdJ9yYlXtcl/uuSRfgn67r9tj/2+Ng5/Wv7bq+e8+Xyw+MNtK9w/Was7cI/ziQCwuAAf+LDl52W06/E3PmHZIARGSAt/3c
-						dJZPye1rJcB3A0JHgDKIZQAwKpV/nPAL+K8TgO/kAsDwXxUAjP/cQeCPqACkB4E1FoB7ccPLBEDXACCHXvuwJQHQhcAqAOieWAGIEiDw
-						z2sAvAAgYStQIwFa/bcCoBJQFACWACMAlDoBGELwHwSAIluBVrsAQQC8BOQCYCVABSBIgIf/dB2A6QAgRgBKEjB92xkWAJYAPwYURoGa
-						SQCBP2IlgAUgkYD8fABEBCBIgAqAlwC7KLhWBLgTkEnAepGAIAIEcEgqAgc5zUWAwF9TIwIsA9ttjAhQcvjPk8tArRAgBNeNUgXxNmJB
-						v5DKuE6j8L8hJkB+TfJ1FBIAf54C9GdpBP0refTLgL8RgDL443FzdeCvqYK/wH8E/xT+WQA8/M9atk0WA7coAMjWvcfp/2kJ/kUAauGf
-						0g78qwAMN9t+qgDw6I8XgDr41w4AV/+9APQdYwXAV/8zAeDqvxeAF4wAYPzn+VELkuq/CsBzDQTg6SVHEwGQ6j8E4Kg5AbgsAI/aQ8CM
-						AMgaAJn/b10A6LmU4N8KgO4CpALwI8QKwLg4/49tQCEA3xmFpAIA+E8FYL37WrYIuF4AVogAvAoJIAHgDoAsBLYC8NnnogDIQmCC/6e9
-						ADw10/1trxnu2wOXevDf4B4m+H9owjr38oKdDP4aFYBlHK38C/yLAJysCMDCHcfdfcPp+yjxWPt51uNg5/Wv6fpc15/9X8gAPyg8INrK
-						LU+NCYdu5QKAESAcAjZ732tuM0E/kkiAyRISBJxKywLg08+KAEVEIO0GYCeer3v4R3T+n0Pg30wA4hjQ3loBCBJANy4RAIF/FQCG/0wA
-						cA6AnAUg8A9IP//uzysCwBJQIwAqAdi1R+f/bRcgWQRcEACWAHpyUAHIJcCOAKkEhBGgNWdEADz8qwBYCYgnAiPxPICwEDjrAkAA8jEg
-						GQGSWAnIBUAlIKwD0KgEEPjbdQB6MJgdBZq+5ZQbN3d9FAAjAcnZANdUAgj+rQQQ+FsJ0J2BSiIQJMCPAqkILKKwABgJYBHIJYBFQCQA
-						iQuE2xOBXAZyEbDrA1qRAaQkBEguA8maAgL4dlIUAErpfYuAr+Hvq/T9lkE/rfBnCZCfpjTi0xb0e/DX5PC/3MB/Bfx9GoE/w78XgAD+
-						Bv7j2I8d+ZHUgX8O/wg+7sOPsRi4NQG4+MY7ofqfwv+GBP6TuX+Gfzv6kwqAHf1R+NfxHysAOfyrACSjP9j6swD/KgBa/YcAMPx7AZDD
-						vzz869afFK7+ewF4buh099LSo0n1v04AQvWfBCAf/wH8Swj+F8bxn5IAyAiQCADg3woA4N8KgM7/qwCE+f+SAPAuQF4AKCoAgP+yAMg6
-						AAjAbUYAsAZA4N8HI0AFAcAI0M0DJCIAsg7gCwUBuBEC8LIXAJwFgA4AC8B8IwBzjADMYgH4m17T3fcHL3cPTSL4JwF4kAQAmb3tuIA/
-						BbsDCfDHqj+yZLeM/ywiAVjooT/mmJu95Yi76aFXi0zWXjreu+Hujv/JY2Hn9a/l6tKt46HyA6KNdO9wPWfvLsI/ggXA03dddBtPve02
-						EeQjJfjfcvpdnuPvQ6D7KqXv6piqBJwWCSD4B2h/beSOigB8syAAQQLC+E/aBfiRFwCVAAgA7wCUCcBdYRegTADohtdIALDLTa0AUAL8
-						ZwKw+/z7ridu1BUBOM55muAfAqASwOM/RgJUAPIuwMtGAErrAFQAEBWAvAtgTwS2ApB0ATz8V7sAZh2AF4CwGJigP5EAHgNKuwAqAdoB
-						gADkEqACoBIwZcMxFoBxtgtgFwRfoQQEEWhRAlIR2M1pLAHZWQFeAhqLgJEALwKxE9BYBKoycCTEioDIQDYWlKUE/2sJnpP4t1cB2yaV
-						AUnp/QDtTeAe73MFsWDfLCXI16ypRMA/B/4y9Guq0J+Dv0C/ZFkD8A+V/0bgTymBfwr/EgX/RvAfwN/D/8xlW0NOXXjDrAMowz/kgEPv
-						M3/VjiuA/7UF+Dcn/gL+gwDI4t8c/pPRn0r1PwqAzP6LANTBfxCAUP2P239CACrwjwye5l6cvimp/mP8R0eAnqXnBCSp/qsA0HNKKgAy
-						AgQBUPgPAoDxHysAc6IAAP6tAAD+rQAA/q0A8Py/CoBZAyACoCNAmQAQ/CMiAFECEgEg+I8CsDEKwLAoALdYAaAw/KMDMCAVAIb/IABL
-						jQAgXgAon4EAPJcKwKcI/hEVgL/rmOF+OGw5gf9698D4de7+8Wvdc3O3ueV7z3Llf+leAX8sEObsRgj+d0n1f9Eugn8IgJGABXSvXLD9
-						mHthxlp34129ymzWRrp063GPx8LO61/DdcstHf+efvEX8wdCu7m554hw6m5JADC6su74W7zlp2az5vTbBP4SjAe9suoEC0AIwf+rLAG+
-						G6DxIoAqBODfCsA3EgHYxQLAOwA1FQAC/xoBUAloJAD3QAKsAFBEAA6JANANc/Wxt7wA/CIIQL4VaEkAlhx+w3XgJm0kgAVgcRQAlQAV
-						gCABBQFQCQgCYLoA6MDkAmBHgFQAVALiQuBzFQEIEkDQX5WAeB6AFQA5FCzrAvjqf34omO0CWAlIugC7Bf45e0kA1h12Y70A5BIAAWgs
-						ASIAKgEqAIkEeAGoFQEjAC1LAAkAkkqAHwfKJcCIgG4VGkSAINCuC8hHgmwqIpB0A7wIIG3KQK0QIATYxbdTSpD/Kwm+dhID+BoC+LpU
-						QT+mBPtIDvycAP0G/luA/gD+PiXobwX8E/hvAP4W/iP4N4F/ioL/jKUSnAxcHgOSqn8iAJTdh063Df/jmsB/FACz7ac99GsK4D8KQIB/
-						hOE/PfgrGf1JBCDf+39OBf5t9T/AP+XZQVPdc6MWJtX/dP4f8J8KgFb/qx0AGf/pCQHIOwA6/mMEAIdaJuM/RgBaGf+xAtB1ciMBoBD8
-						xw6ACMDto60AUMw5AA0FYBDSogC8GgXgBmwF+mK9APzDM14AvASIAFB6TqeX09ydI1Yy/N83TjJzyzGBfxUArvjHLCYB4Oo/CcAChv40
-						8+l+NIfuwXc+P7rIZu2l48ynOjr+rcfDzut3/erSteOb5QdCe3l46rba8Z/xW8+5lUfedBtPvs0dAO4C2BD4QwIQnPT78soTlJPuFUof
-						xIuASIBGJAA3KID/LQUB+MZokoBMAFQCAP8qAFEC/PhPJgB3agj+VQC6080LI0AVAcg7AAUBOP7mRw0EQMZ/SiNAqJajA2AFoBfg3wuA
-						7QLoCFAiAHhy8AJguwDFnYC8ALAErI1rAHIJwNoLHAaGBAGgJALgx4BUAqIAePg3AqASIAKQSQDB/wQCf3seQNIFsFuCFgRAJQA7AU1a
-						vZ8FQCUgWQ/QVAII/o0EWAGolwARgDoJ0DUBVgKKIuAlIBUBIwF2XUAjESAgbF8EDodYCWABsMlkoFUhQErQ32qK4F4JQXuWZCznKlKC
-						+zwl0EfCycwF4LcJ1X4TC/05+FvoF/DXNAB/TR34GwFQ8G9e9Zfk4G/hfxaBP6LwP2PpFpaBd97/KBOACP+5ALz93of0fzSHfxGAOvhH
-						2oF/u/NPPPRrmVT/Lfx7ARhoqv8K/2HnH0qs/s8zJ//OcS/zzj8iAC9i5x8vAJXqvxcAHPz1wpwdleo/CwAFAgD4722r/0YA7PhPmP/3
-						AgD4twIA+LcCYKv/lfl/An97CNhP8vl/wL8RgDshAH4MCALwI0QFwO8CxAIQtgHd6r5LsQKg24BaAeBtQFkA1tULQBgBWmkEYBkHh4Hd
-						+AoEYIm73p8F0OX5hUEA/sGPAFkBwCLgv33SC0DHdPfXPae6v+s13XUfudL9dOwad8+YNe752VuTyv9iQL8Hf57733nSLaKg8r9gpwf/
-						7VL5R+b7vDhjrfvuE1d/ONgN3Tq+6vGw8/pdv8j4NpUeBO3kC4/051N466r/iw6+zif6WgGoSABl4YHLPMP4EgsAhV7n0OuvIJCAkFNc
-						sVD4byYAugOQFYB0G9AoANgBqKkA4ByAJgKAiAAckpAA4N93/t1fcOwIULPTgDH/D5DPBeDJggBIpUckQHcBEgGI8G8F4CUrAJQgAHoe
-						gBeAvAswUAXAS4DtAkAAggRkAqASMIoEAFEBKHcBKAT/sQsgApAfCjaZwB+xEgABEAkQ+NeTgZGJK/a4sXPWFSTAjwI1kgAVAC8BU3MJ
-						8AKQSsCOhhKgOwOVRKCuG6ACUBEBLwGJCHgJKItAukC4VgQIQBErAiIDZixIU5AATS4DmpIQICXYL+84lAL5NQ2+jywlwEeS3ZIqIci3
-						CeCPeOjPUgX+PI2hX8Z8TJqBP6Uh+FMWNBn3KQlAXdVfwR+J1f8tnOlLtrgDx8/XCoCFf83yTfsy+F/fEP7t+E+EfzP64wWgKfx7AQjw
-						78d/IAB29EdO/V0g1f+CAITqvx78pQJA8K8C8NyQKAA4+VcF4JnhcyrVf0SfE4IAWPhPBMDvAMQCcCQRgMr4j8YLgFb/IQDY/z+cAUDg
-						HzsAXgC8BMTqvx8BYgGgcAdgt3QAKAL/RgAA/ywA22oFQLcB/cYwkQAVAOwCpAIA+EewCFgEYJX7EkkABACLgG/iNQANBOAFEQCsAUgF
-						YI4RgJlGAKa5v+wx1X3m6RnuJ2NWswDcM2aVm7b5qJORn1QAUPnP4X/+diSC/zy6F83bdtRN30gyNmCSu+XB54qc1no61ng87Lx+l6/r
-						unX8ZfkB0F5+On5DbfV/1p5LbsOJt916gn9IgIZlQEPwj2AhL25eL65ASAQ0XgggAAi6Ac8Q7AL2vzpiu7sFMQKg8C8CsCsIgEpAIwH4
-						ASQgEwAeAVIBoBtWrQAQ/KcdgKoATNpxMREAlYB8DUAQAHoJAdh29j26KR8NAqASAAF40sN/0gEwAvCsEQArAXoasAqA3QlITwQOY0CF
-						LgAEQEaAYhdA1gGYLgBBvxWAvAsQRoBMFyBdDJwJQEECtAOgEqCnAicSQNBvBWDC0p0iAHNEAKIEbGwqASwCRgKm5hJA4N+KBDQUgWI3
-						YA9HJSAXACsBUQT2c1QE7HahqQjEBcJWBCoy4CWgJAK5DLAQEPSWc9RH/lwSAqQkBBr++x1ZsvdpJTnsy9vLcG+TLoCm4N8RUlPp1xRA
-						H0nHezQHK9C/HNCvqYH+ZM7fQv9Vg79Ewb8Z/Efwr4f/OPoTwV+DU4fTdQD18I8cPnkhwD/A/8rgf1UK/zr6Y+BfBcDCPxJm/ykV+M+r
-						/3brz7z67wVAqv8iAHHnn1QAGP4pvQdOcc/N3FIUgN5hAXBVAFBM65WM/0QByKv/iQAQ/CcCQNCvHQAd/1EBkP3/owDcTc+jVgC6IUYA
-						fjwxFwC7Dej2xgJA+dbwTdIB8F0ACMDX/TkALACUr5IE6C5AjQRATgOGACyNAvDCIiMAC0QAnoUAzHV/31sFYFZRAP7iiSnuhmdnu7tH
-						r6asdE/T74zHfSiLEvDXQABkBGgeCQBnG8E/RwQAeXbKCvfAK6Pc53/yZJHVWk2XOzv+1GNi5/W7etEvemr+i283N97/shu87hTP/48m
-						4FcRQCbvuMCn+WLvegSn/iIQgiQkAQv2v843LURmGDHL6Lc18yIgo0HydkD9VxT+WxEALwEsAOPiCJAVAMA/7wJkBYBiBeDOggCoBKgA
-						qASoALAEEPwjmP+/0EQAVAKsAMynn48KQKULYAWAYgUAkQ7ASY4VAJwIrAJQ7QII/OcCUOkCsABkW4F6CQhdgDoB2CKxEhAEwEuAdgEg
-						ALYLgJTGgLQLUCcBKgDjFm1zY2Z7ATASoF2AViUgF4GyBGznJCJQkYBsHKgkAtwJEAmoFYF1klQERAJYBHwXgDsBIVEEamWAodOIAKUk
-						ACu2xlypDGhyGbABpJfe3igW+punAPz4npKUId8mrfCn4L+yBvhXAPhtAvj7ER+fZQz+Bv4bQH8Af5866Le5avCvwD8OyCtX/UvwP23x
-						Zs5UyuW33vcC0Bj+kfc//DmvA4jwLwLQCP5VAErwrwIQ4V+Swr8IQAr/UQAC/BsBYPj3ApDCf331HwIg8C8CwNV/LwCAf87QWQT9xwL8
-						6wJgFYCn6TkjbP9pBKBa/Y8CYKv/2P7TCsDDhfGfIAAE/qEDwPCvEQGI4z8iADICFAUA8M8C4BcB/2BcKgC3WwEYDfiXXYAaCcDXBkMA
-						RALqBOCLfa0ALGcB+ByFBeDl5gKAhcAsAFgDAAHAGFDHDCMAIgFffmkeCcAqd/eoldwFCPCPmX8P/wt2CPjP99V/QP9cZKvNUc741fvc
-						g/3Gu7ufG+pu6N5RZLbW0jHBY2Ln9bt4ff7Ox/4D/ZKv+uCvO4ctL8I/Tv1defRNt1YF4LhIQEUECP4R7ORjKxY4wfAFBDLAHYHjJAHI
-						Cff98XvczcO2swCUOgA8AmQEgOE/FwAvAVEAzDagdQJANywRAIJ/LwDI3UYAbBcAAhDWARD8Yw3A4dc/LAqASoAVAJUACMCwjWdFAEIX
-						gOAfqREAKwE6AqQCoBIgI0BRAhT+X1l1mgVAJQACYCVggMYLwEAjAFEC4mLgXAKwI5B2AFQAVALCOoBEAKpbgiZjQAT++VoAhX+7I5CV
-						gDEE+BCAMdoF8BKgawFqJcDDfyMJmLrYS0AiApkEEPinErAzpLYbQAIQDg3LJCARAS8BrYsAgb+mTgQIQG2aygDBbkwqAs2FoHFSsMef
-						s+B9NMn72vj3LX1MC6mCfX0Y9OtSAn4NQz+SzvdH8Ke0Af3XFPwL8K/gH+CfouBfgv8c/OvgH9lx4GQYA2oY3ylYSUIU4X9dc/inNIT/
-						sOjXh+A/zv1LwuLfAP+Lq9V/Stj5J6v+vzIyCkAd/EcBKFf/nx4geWbyukQAku0/6TmjUv2vE4BC9T/s/68CYBcAe/iPC4AF/osCwCNA
-						Ov7jBWAK4N8LAAXwz2cAGAH4fiYAgH8rAN9uKADriwJwMxIEYBULgN0GVAUAC4FFAGQr0OsgAJQoAPMI/lUA5kQB4A4ACUDHNPdXXgD+
-						/PHJ7s8fm+y+0Xeh6z5ipes9c4tbSAKwEPDvBUDgXwL4ZwHYrgIg0B+yRdIxbpF7uO8Yd3uPq9katOOXN3br+H96XOy8fteu67t3PFP+
-						xbeRnzzr+q0+QQJwtpLFB193a469JQIA+Nd4CbAisODA63yTsgKAxG6A5EUKbhKA/5uHkwBQKgJAiQKAXYBqOgCZAHwvEwCVgLQDQDco
-						KwBeAlQAymNAfitQgn8c4HXhvV9EAWhxK1DM/2Ov/x4NBEAlID0PAIu/7DoA6QK8YARAJSCOAJ2WGAFIuwCns4XAZ4MAJBLAB4KlAiAS
-						cD7dEtR3AcIYkJUAA/+tSEDoAuxMTwZW+A8SQIIwevZaDgTASsC4uRs4VycBW9uSAGSWpqEE7ObkElAvAvtCogS0LwJLNkYRiDJwKKSp
-						DLAQHElSEgKkBPztpgTszVL6PMmsfrGaL0l3RipAvqYl2E9jZ/s1FejPwD+H/iW8FsRDv+ZqwF/TCPxR9feV/wj+9fCv4F+Cf5zui52D
-						Pv75L8vQr/Hwjxw7fakt+Nfqf4R/EYAA/xQL/4it/hfhP1T/owAA/oMAVOB/rq/+iwCkoz92/KcM/709/D81YLJ7auA099ziQwH+4+4/
-						UQCS6v8ign/Ew39FACgK//EAMIH/IAD0PJcKwP4gAIB/KwBxC1Az/sMCQM+zJACAfysAtgMAAfgeC8D2IACAfysA3xqhArCJBeDWoUYA
-						eARoHcO/FYAv8zkAXgD6lQWAdwHKBOCzvgPAuwB5AZARICsAlCAA09xfkASwAFD+4onJ7vaBS0gCVripG48I+PvMI/CfF8Z+ZOQHFf85
-						BPyzNVuOJBm5bJd74NWx7qE+o69uPUDXnk95XOy8fpeum+7o+B+7dOv5bvGX3kZu7zu3CP+z91xyq4+9yeMuEACbdSeqGbTulHuGbkx6
-						o0K0hYlOgIoAbipfHratLQHg04CtABD45wKAcAeA4L9OAFgCWAD2swDYLoAIgEgABCAeBnYwCgAFJ+ReNALQ6lkAm0+/654g8A8CsPCY
-						CADdyBuOAdHPTtcB2C4ACwBBP2K7ALkA8BqAQhcAB4LJoWBnRQAoKgAqAXIgWC4B51kAhhP4p+sAJEECjACMzQRA4V92BDJbglJyAaiT
-						gKnbz9GTPgRgHedqJUAXBgcJ8F2AKAEiAEECCP4RKwLcBcgkIBEB3wVQCUCsAHCMBNSJgF0g3JIIsAwcDGEBsCHgr5eBw5xmMqApCYEm
-						QDlez1J5n5ZC8N4C3DdKCv4UM8ZTlxLka5bTz1PSAvBnKUG/TQD/AvxfMfgb+Ffwbwz/dpvPatVfY8FfM2XhJnfmwhsC+E3gH8EBYpMX
-						bGwI/wz+Hv6RFP7ltF8VgBz+h06OAmDhXwWA4Z8i8C8CYOFfBQAn/qoAKPwnO/+E6n+6+8+zgyUM/0YAGP4pT/af7HqPW1Gt/lOeYgHA
-						+jESAK3+e/hXAZDxnygAtvqf7gBE8G8EQMd/VAB+agQgrgEQAbhr2t5EAAD/VgB0/EcFQMZ/IAA7RAAw/gMBGOOr/7wGQAVgs/smSUAQ
-						gGEbGP7LArAmCADg3wqA7AKUCsD1RgC6vLDICIAsBP60rgGgiABQSAD+GmsACgLwZ49Ncn/dY4r70dCl7plZW9x8Av/5OyTztpMAEPzP
-						5fjKP2XOFoC/JsL/LLrfIg8Pm+0eJAG476WRV7EeoOOtT93e8T94bOy8flcu+sXeXv6Ft54u3Z90vRcdqsD/5B3n3aqjBP+ct3gNQC4B
-						NosPXg43pyAA/nVsXabdANx8vjxsaxsCIPAvpwFHAUCqAiDVfxUAOwYEAWAJwI0JNyiCfpUACACvAWD4rxeAn3oBmH/gcmsC4E8DVgGY
-						SUKlAiASUBUAhf8gAAz/UQBUApKFwAUBYAnw1X/uAHgBqHQBmglAoQvA8O8FoCQBuQCIBFxMJGB8JgFJF8BKgIH/XAKmbDrhBeBKJEAE
-						wEqAbg8aJIAEwEqAiAAJgBWBTALCKFBBBEQCdnHCOBA6AT5WADQiAXs5KgLpOFBVAooykHQCRAaW+iQigHgJSIVAJKBWBjQE8KVYCWgv
-						BUC/2tD3WU17kK+JB7Ap9EuS8R5NK8BfgP5G4z4L10bwt9Avibv71IK/Tx34h7GfDPzrqv6aUPk34I9MXrjRbdh5pCwAGfxrVm3Z7+Ff
-						BKAR/Ifqf4vwrwIQ4b9a/e8/XgXAjP6Y6j/DPw79stV/PvV3tq/+R/jP9/4X+Pez/wjBvwoA4J/Tb7J7Zv6+ogBo9Z93/zHV/54E/YiF
-						/yAABP0qAIB/KwBS/RcBAPxbAdDqv8K/FYB0/IeeY/0agFD9ZwGQNQA/GC8SwAKALkBRALYkAsDjP0YAvha2ARUB+ArvANRIAFa4z7MA
-						LE/XAPjTgFUA5ByATAB0DQACAeg13f1VT0oQgCkiAI9Ocn9K+fST03ikesbmowT/JzgC/sfdnG0UrvxLGPZtNmtIADYddq/O2+QeeGU0
-						Lwju2nvQFa8H6NK9x20eGzuv35Xr+q4dG0q/7Hby9WcmuFGbzkoI/BHM/i87/AYLQJAA3wnQYCwohARgyPrTfEPihUn+BsUygEACKL3o
-						xgTI/9LQbSIABP4VAaCkawBaEwDke+OjAKgE6BqA0AXAzYmDnYAaCwCPAM04KAJAN0XtAOw6/35DAcBWoHYNgAoATjuGAIgEHAsCYCUg
-						OREY4Q6ALALOuwDPA/69ACAqAHomAAQgjAAZCeiXCYBKAAQgSICOABW6AHIgWJMuAEG/FYBcApLFwBQ9GKwkAbYDYCVg0rojbtSsNV4A
-						cgnw6wEqEuBFwEvAlYhAvQTsCKmIgJeAWRUJ8ONAuQRUREAkwIpAVQaqEoCIBBwIKUkARwUgSY0MEDTnKQoBQiCfriXw8X/fEPbx9w1T
-						APdrEQ/4FcgvpAj7lBz2QwjyG4355NAv4K9R6I8pQX+yraeB/pbA38C/rfxH8NeUwT+M/hTgH8HfffDRL5qCvwZjQIB/C/518M8C0Aj+
-						9cAvA/8qAAL/SwL8Y+Evwz8LQAb/lDD6A/gvVf+HRwGog38VAIZ/LwBPm+r/k/0mcZ4evSTAP4JRUkThPwiAr/7Xzf8/5jsAefU/CMBs
-						wL8kGf+BAMyoVv+DAGQdABEA2QL0jom7WQB+6AUAOwEB/lMB2OoFYGsQAIwBJQJA8I98fegGFoBbEKwB8AJwsxEAjAAB/lkA+okAoAPA
-						8/9WALgDsNh1IQlgAaD8w7MqAPOMAMyuCoBfCJwLwH95ZIK76blZ7tnZWwn6LfwT9FNmM/gjRxn6ZxLwz6R7qmYG3XM10+m+fF//Ke7+
-						l0dyvvXoy0WOa5Yu3Xqu9djYef0uXF26d/xR6RfdVsgmH5u5qyIAmOXHwl9N7AQgJADoCBgBwDqBJxcf4ZuRLkrS4KASvWF9iyD+i0O3
-						BgH48nCRABUAlQArALeOKgtAsgaAJWBPFADTBUgEACNAHv5zAWAJsAJAsQKAQAAeohsmoJ8FgFK3BiAXgKOXP6IbM8E/bsi++s9pIABP
-						EfzLCFAmAF4CIAAqAbEDcCoKQKELYEeAJPVjQGEdQJAAHQGK6wByAcglwAoAoh0A3RJUJUAEwEiAdgC8ACRjQD4TVh1wI2euIQlQAbAS
-						sL6xBJAANJUALwBRArJOgBeAOhFQCUhEgARAwxLAIhDHgVgEsnUBFREg8EeiCEQJqBUBkgDEioDIQBwLYiEg6LdhAbBhASiEYDwEguCT
-						iMAVpQDnlEYSUHr/EPpeSymBvU0J8G34HAaSqjStg/9ihv4I/hH4JRXoR8VfUwP+OfzXg3+16h/AnzLTw38E/60V8Lfwr6M/Cv4W/jHO
-						gxw+ebEl+Ec++vgXbtJ8+n/cCvz76n+E/xUp/GPLzxL8ewGw8B8EIIz+RAFIFv56AYjwP4fhXwRgZhAAO/pjq/+9VQDC/L+t/k9yvfpN
-						pExyveftDQKAAput/vci+EcU/oMAmOp/ZfvPrPpvBSCv/lsB0Oo/7/+fCUAY/9EOAO8AZATAnwMg8O/jOwCAfysA3yb4TwVAJODrlCgA
-						cg6ACgDDv4/AfzMBWELw31wA/jYRgBksAH/JAjDN/fkTXgAem+z+y6MTWQD+yyPj3bf6LnQzCPS56k9h8LcxAjBjE8BfEwUAeW7aGoL/
-						USwA9700wn3p3t5lnmuSG+584g89PnZev+3X9d17Di39ktvJTY8McsM3nEngf8bui27F0TdCVABi3uLYbsCwjWf4xqO7ECC5CADGvzhk
-						axAAloCCAHzNCMDXCf5zAWAJMAIQuwAiALoIGALww4IAaPW/IgBJBwA3uLIA4PwCwL8VAJaAd+JpwLkAIFgs/bhWZFQACPxVAFQCIABB
-						AlgATnCsBKgAJF2AIAEiAGE3IIL+vAvQ18A/7wbEAmAkwAtAMgZE0Q5ALgEQgEQCeAzIjwIZ+NdtQVUA8nMBFP4nEvQjKgBFCdj9mhu7
-						bBcLwMiZaysSIDsDNZIAEQCVgIklCTACIBKwNZGAqWZhMAtAsi5AJKDSDTCdACQsDs5FoLBAOEoAxUuAiMC+ECsCFRnwElASgVZkgIWA
-						YDlPSQjk7akM2L8vwz69D0F6kvD+bQTv32IC4OfJAL8UewqzCEAG/D457Gsi9EuaQX8Z/AX+LfQH8PdpDP4+teAvaQX8E/j3lf8c/JFJ
-						Cza4ZRv3tiwAyJptBwn868d+AvxTGsL/lBz+l4YDv3L4HxDgfyGBvwhAgH8jADn8qwCUq/9RAGT0xwsA4J93/5nsnjLwrwLQ0XeCe8p3
-						AbTDbqv/Cv9J9Z+gP63+QwAOu0eMAOTV/9AByKr/PP9vBYDAXwWgu24DSs+t6AAo/KsA/CgTAIwAfZ/C8G92AWL4twIw0s//GwHgEaCG
-						AhAlQAXgJj8CpAIA+M8FgHcBen6hEYD5RgDmuL+FBPg1ANgJSAWAdwHKBeDRCe5PfjbB/Rm9/tzsrQT/JxIBmMXgH1MUgI0SdAAmrtnn
-						7n55HMM/0u2ZwVc6CjTQ42Pn9dt8fapbx/+JfpnvZ7/ctnPv2HVuJMG/ZvzW8275YQL/PEEGjBAck2BU6Em6+eCmo0eQ4yASvjF5+McN
-						4ybAPwvANs6XeAQoCoBKAAsAw39VAFgCCPxVAGwXAPP/gP9cAKwEyGFgAv8qAIgVAEQqHBCAgxweAfKZsvNiSwKgEqACgB1rrADwGgAv
-						AIjuBGS7ABj/eToTANsBqArAKU5+FkBpDEgkoHoewACC/uJuQOY8ACsBOgoUBMBX/8OZAAT8iQTYHYESAbjEsR2AdEcgIwFYAEwZs2i7
-						GzFDBCCVAC8ADSVA1gOoBLAAtCABiQiQAFgJ0N2BmoqASgAljAMFCSiJgJEAil0gXCcCuQwkIkCpCMDGNLkMtCMECKC99HZEob5pCOaL
-						b2871Yp+nlahH6mt8DPs29TDPicD/jrot4nQL5mfj/qYtAT+vvJfB/4zCfqRtsDfJ4d/gD8ycb7krXc/KMJ+KSfPvc4C0Bz+RQBq4Z9i
-						4V+r/wPN3H8F/r0AhNGffNvP2ur/rAL8pwIg1X8RANn60wtAgP9JDP+c/vT3Hv7xvKodACm6pfAv4z+pAAD+JQT/deM/LAAHggBo9T8I
-						AEUFQMZ/jABQKgLgR4Bk/AcCsEvWABgBuN1sA5oKwBbeBegbfgGwCsDXshEgWQOwtgUBWOEFYJm7AQJAYQF4qSwAf293AfIC8Dd+K1AR
-						gOlGAKawAPwpQf+fPCIC8Mc/G+9u6D2DuwCzAP5bCfgpMzd76PeZTtAfQtA/LeSgm7ZB8sSYxe6nL44I+e4TfYpM1yjYMAYbx3iM7Lx+
-						W6/ru/X4cekX3Fbued71X3MywD+q/4sOXK7CP5IJgO0KjNl6zvWkG40uOsLuNiwBfFM6ytUGVP2/0EAAbBdABUAkgODfC0DoAngBSMeA
-						ZAHw7ZkA8CJgFQCC/1wAEO4AEPxrrACoBFgBQCW/TgB0DMgKgErAgHWnowAsqBEALwFBAFgCRABUAnghsId/jQrACyuiAJQkQOFfBOAM
-						RwUgSEAmAFEC4qnAmngomJEAgv+RBP72TIAgAAT/iJWAOAYkApCcDpxJwJRMAkbN3cQCMMJ3AVQCRs3yY0CNJEC7AGE9QC4BmzlNuwFe
-						Aooi4CXAioBKgBUBlQAWAb84uCoCe6IIEPgn3QBdH1AjAyIB+0Nal4GDISwBBPw2IgGHfApCQG/Px4eaB0BegvhGyWAe30fbKQF+46Sw
-						n6YO+PMszNMq9JvUQf/clZIq9Fvw15TBHylV/qctFgFQ8E/gX8d+sqq/hf8J89a7PYfPFGG/lI8+/iV93Prm8I9TfhP4FwEow78IAMO/
-						XfhL8K8CwPBPqYN/JMA/pQ7+8+o/tv6M8C/jP7z1J8G/CgDgXwWg16AZ7qmZOwL8qwDo86wU30z1H/DvBcBW/60AKPwjofrvBUDGf7D9
-						tcC/CoA8N0YBEPgXAQD8WwH4Me8CtMcLgJcALwBhBMgLwHdHS0QAtjL81wkA1gAw/FsBGJgKAC8CDgJAIfjHAmDsAnQjhQXgZUoQgEXu
-						syQBIgAiARCATyElAejwAoA1ABUBmEjwLwLwRw+No9/bZjcLEsCJAjBdw5V+iYV+znrJsCXb3V0vjHD3vDA85Ob7nimzXYPc0L3j+x4j
-						O6/f1uv6bh27Sr/cdvK9fvOS6v+sPZe4+l/KiiMxK4+QAPisoOBGpBUHBDcgiABuRrgBfYUg//ODt0QBGFIvADz/j4zULoAXANMFqBUA
-						xAhAOA24QQegJQEw8I9gL38rAGEdgBGAfAwIh4BhxOex+UdIArAOQATASgCPAKkA4CbPlR4RgEoXwMD/8yUBMF0AlYCwDoAF4AxHOwB5
-						FwACkErAOREAgv7kUDCKlYDYBbgQJEB3BNIOgApAUQIM/JckAAeDSUQCRhDwj5ixmgUglYB1QQJqRcBLgBWBsEVoixIw2a8LiCIQx4FK
-						IsASQOCv24VKqt2AVkSAZSARAS8BmQgEGSAJkHMEogi0JAMsBEYCNATNZSEoJ4pADt4mBPPJGM4Vwnz16xOw5ykAfZ4S2OdZjOq+pgL9
-						Ms9vU6n4twz9Ng2g34B/Ff4F+lPw394Q/HP4F/CX1IF/GP0pgL/CPzJ/9c4i7NdlzdaD9eDv4R9J4V9O+q2Df577bwr/OvrjA/gvbPv5
-						Ulj4GwUgwL8RAD31N8L/VIH/QvW/18Bp7qlJ69wz9DxbV/3XzjsLgH8ezgUgwv9hGf/JBADbfzL8GwGQAzAj/AcB8PDPHYBMAMIJwF4A
-						7sgEQKv/LAA8/gMB2M7w/51MAL7lzwFQAbiVBWCjCMBQgX8WgMEiAF+GAPh1ALwDECUIQN+yAGARsBWAf8BBYHwYGEaAygLw1x0QgBlB
-						ANAF+LMGAnDdU9Pd5A2H3UzA/xZf+d+Eyr9U/6dtRNKq/1TOAcl6yf0kgfe8MCwEo0A33tWryHe16d5zq8fIzuu38brxro4/Kf5i20n3
-						Xq73woNuxMaznAnbz7ulBPoY58lj384yYDKJPu5xuqHoIiMEFW7pBBxxt5Ptf47gXwVAJIAEAAuAgwCIBKgA3AL4rxOAMY06AFEAECsA
-						KgF3EPxDAFQCunoBsBJg1wCoAGgHAJX5S+//0l2yAqAdAIrCfy4A286+5x4l+IcAAP7jTkAFAUCsAJguwDNeAiAAKgEQgCgBp9wLRgDy
-						LkAUAJGAXABkMXCUgNAB8AKQSwAEIEgAgX+6DqCmC+AlQE4GTiUAAlCSAO0ATDYCMJkee8OnE/xDAHwXQCVgVCsSQALQUAL8KFAqAVs4
-						VgBSCdgWUpGAIAJRAkQEdiYSUBaBKAAiAS2KQCIDUQJKIrAwE4FF9ISDlIQgEQENgXYl/u+qQG5Cf98Y3lsJAXubcJ8n3SKVUoD9PPXg
-						r6kCP0N/Cfg1Hvir0E8h2LejPnXQr+AfR36uDPwt/DcEf1v117EfSqnqn+f1N98twn4ppy+80RT+8+p/Bf6DAAj824W/Fv5VAAT+F1Th
-						P9/20wuAwP/sdPQnCIDu/GNn/wH/UQAU/p8k2Os9bZN7FptoYPtPvwWorf7L7D+Bf5AAee4N8E/h5+WCADw8l8Af8fAfBADw78MdAIL+
-						MP4TimMR/lUAtPqvAhCq/5QfMfx7AZhgdwDawfDPAsBrAEgACP6tAMj8v0TgPxWAr1YEQMZ/VABuYviPAsAjQA0E4DPPQQLiGgAIwN+1
-						IwCPTQoC8EcPiwD84YNj3VPTN0u130M/MhUh6OdsOOSmrD8YMpnuvZPXafZznp+xzt393DDK0JDvPP5KmfEapMvdT/y+x8nO67ftol/g
-						wPwX2m6+1GsUgf8Zhn8sAF544LJbeohgvybLEAJ+lQDN88uOOWwrhgpDlAC6AVEwGwj4R24KAkDwbwQgSoAfAYIEZALAawCsAFCsANw2
-						dnciACoBKgAsAXwjEgFQCVABCCcCawfASwALwAyJCsAIAl0rACwBXgCQOgFYQD9fEQCp/qsE2C6AXQgsAmC3Ak0FoNoF0A6ArAOwC4Fz
-						AVAJ6EsCgAQJMPBf6gKoAKgE2C6ASgAEoCgBBP12LUDeAeCYLkAyBuQTJUCq/xM3nWIBEAkg+DcSwAJw1RKgApCLQFkCkKmQACMC5W7A
-						jhArAM1FIBeAqgg0lAEvAZqSAORRCQipyMBBTiICbSbZhtS/LU0BzilXKgBLMKdfmdVvnjLgpynBPlIa8QnAb1IBfgP9Af5JCBPwN/Cf
-						Qn9a+a8FfyMARfDXGPAX+PcCkFf9Gfwlpaq/Rk/33b7/RBH2S/no57/k3YAawb8VgCL8swAU4D/M/ZvqfwH+VQDybT9T+PfjP0NnJvCv
-						AhAW/4bq/1Sp/iNDZrlnpm9xz9Jz6zN+FziFfxUArf7nAsCFt4IA2A4A4F86AGn1Pxn/8fAvAoCNMKwA7EsEQEeAGP6n7OEk1X8IgFkD
-						IALg5/+9AHx3TCoA39b5fxYASiYAXwP8GwH4yiAKCwAC+G8sADfwGgAKBOBlgn8sAsYuQEYAAP9WAHQXIBaAXjONAMhCYAgA4L8iAA+K
-						AHz1pblu1Kp9btrGIz6AfxGAKXQP5TQRgAl0H+/64thEAJAvtzkK1KVrzz4eJzuv36brhrvv/u9xqlvpl9pOHpi02QvAGd71Z8nBy/U5
-						BDmgHL5MAqB5w03fdZHbiI/OpRsL4m8wOGr8odmHGPitAIgERAHACFC9AOgaAL8NqBeAb2QCIBJgBMBLQBgB8hIQBMB0ARoLgFT/w1kA
-						vguwkH4e7QoA5v+xIw4E4HESAMR2AfhEYAL/0AWAAPAYkBEAih0BKgmASkBYCOwFAGEBWC2plQCCftsBUAlgAfBrADQK/0ECsjEglQDt
-						AEAAyhKQwr8dBUokgMBfxoBe40AAxq896oZNXyUSoF0Asx7gaiVAdwdKRSCVgEkqAV4EuAtgUxIBPw4UJICSSACBP9KeCKQSkIsAy0Do
-						BIgIpGsECPjzlISAoD+PSoAkygHg3a4hiKG/ZxAvwT4SIZ+Dz8Wf72pCEJ9Hwb4uBcBH0hOYCfBtctg3KQF/oyp/Dv02Fv7nNAD/WQB/
-						A/9F8Kc0BH+G/xz8KQ3An9Og6q/wP27OOjdr2dYi7Of52GfdjkNtwr8IgIJ/LfxTBP4XBfhHqvAvu/7Yhb88+uMFQOCfQvAfBMDAf7Lv
-						f4D/Ke7poQT+Uze6Z5ceJfg/zif/IiwAHv6fzuA/CAA9h6gA9CDoR0L1vyAAvAA4q/7L7j959T8KAOBfBaAy/qPVfw//VgBkByCt/mcC
-						MDYKwHcyAfhWJgC3DksFgBcBD14fBOBmXgMQBQDwzyNAXgA+79cAfI7Ci4BfVgGQXYA+ywKwyH3meRWAtAPAAqAdAC8Af4FdgBIBwC5A
-						OAcAAjAx6QDg5Qtztrpxaw4Q9B/x8H/YTSEBmEz3zskK/R78J4Xsd5PWava5J8Yudnc9OyTJHU8NaGtXoBu6dbz+x3fc8e88VnZevy3X
-						9d07bi39QtvJDfe/7AatO83wP37rOT7BtxSF/yAASd5wL6887h72NxPcVPR0QdxkAPA3DhL4RzACFATALAKuCEAYAfKnAbcgAN+BABD4
-						h9OAvQAk6wBwI8oFgGIFQCVABcAeBqYSsOPcew0FoLQVKAQAkP4ogT86ALoGQCWABcBLQAeBP9Jr8XEWACsBEIBkHQBFBOAkp7gbECWs
-						A2ABkC1Bk8XApgsQDwXzAqBnApAAWAlIFgMT+CO6ELiZBIQxoK1yKBhLAEF/SQJYAAj8kVwCxq7Y74ZOW8USMCyTgLAWoJEEeAHQ6O5A
-						iQhUJEAEIIgAgb+VAB0FSkTAS0AUARUAiS4OrhMBkYFdIfUyUJUAjUjA3pC8G2DXCBTHgxAIQB4C81KsCFRCQJ6k9D4mQQAaJgJ9Q6hv
-						kBTsm6cE+Zp4PkMV+PPMJ4FL0xj4I/THWOhPwN/Df1PobwD+mgD+Bv4V/BP4J+jX1IG/wj8ydvZad+mN+jEgBX/N6QuX24J/W/Uvw78I
-						gOz3n8I/n/RrBADwX9zzX+Gf5/4B/yIAsvDXw7+p/uuhX0+TADwzapF7bu5O9/zy43QfJ+g38B86AID/JUdZALgDUAv/IgBJ9d8IQKz+
-						Y/5f1gBY+C9V/60A5NV/KwDJ/v/0fGsF4IdGALD9pxUAqf6LAITxHy8ADP9GAL4eBEB2AfoqogKguwBBALADEOC/n0QF4HO8DagXAArg
-						3wrAZ543AoBFwLwNKARgbhCAv+6FZALgDwOrE4A/eBAZ674zYKEbtGS3m7QeVX+Cf8rkDYfozwcN8CP7ORM1BP+SfW7okh3ux88Oc90J
-						/LEGQPPNR14q8l59Om72WNl5/bZcXbp1LCr/MlvPDwYuYvgfuemMm7//NYL91wsh8M9D4K8yMG//62F+EDcSbCemN5cfTNjtbiD4rwqA
-						HwEC/FcEYFsiALdkAhC2AvUCECVgNwvAd8alApAsBKabUC4ACAsA3bw0aRcgCoBKAE4CxiLfigBQGgnAodc+lOqLHwGCAFQWAnsBQKQD
-						cDxIQBwDSiWAdwNiCRABeM4IgEqAjgIVBcBLAHcBdAzIS4AIwNnkUDArARAAKwF2O1BNHANKJSCuBbjoxqgAFCQAW4NqB6AkAaMW72QB
-						EAlYHSSgLREwAmC3CA0SQAJgJUBEwEgA1gV4CWhPBLYbEYidAE4+FlQQASsBLYsASQBiRUBkIIoAy4ARgQX05INYCQjdgLoQkIfo6JBP
-						CfDzVM8oqMJ609D30W5SuG8M+JoI+oXQz7qaEvDjrAcCfc2qFqEf1X5NDv0e/EuV/wr4+9SB/1QCfiQFf00Z/EtjPxXwn7NWQgKwde/x
-						CviX4B/BoWDj59D/7xL4+0jVv1X4XxxO+xX496M/BP1WAAT+y3v+h9EfCADD/6y4+FfhnxJGfwaRFExc6V5YtJ/BX/Mc4N8LAOCfBUCr
-						/yQAYf7fw78KAG+8QZHFvzICFOCfws8/FfgXAQi7/2QCIAuARQBs9b+y/SdBvwrAnThnp9AByAXge4gKAIWr/xAAXQCcC8CIKAAM/0YA
-						ePzHCADgXwRgtcB/v9gBgADc+EoqAF38OQCfpYgAyCJgFQDpANQJgIwA/Tm2An18ahCAP/nZpIoA/P4DY9yf/Wyc67twpxu2fK+bzJV/
-						CQRg4jrkgI8A/wTOPskaZC/nngHTXbfeBP4mXXsPcl+456ki85XTMcdjZef123B9/s7H/gP90v6l/MtsLV3uetI9s/iwjP7suugWHXi9
-						JpfdYoTAP5EBLwBD1p92D805wNGbCW4suDHcMGBzEAAE8G8F4AuZAKgEqACIBBD8ewEIXQAvAOk6gN08ApQIAKWyE5AVAC8BuQDoacDd
-						Cf6DAJguABblvgb498kFAHJQEoBVx95yj9ANGAuAHyPoR2wXIAiAlwCFf9sFUAFQCYhdAA//WQegJAAvr4oHgvEIkJEAhf+0C1A+FMxu
-						CZqsBcgEYIRKAG8LGiUgjgFlAlCSAHMysBUAZOT8rfRkv/KaSUCyRWiQgI2cXARyCbAioBJgRSBIQEEESusC8gXCuQjkAjB75e6QhjJA
-						EFonAiUZECEQCbCxImBjRaD6d5CA9H3yqAAkKbxf+0mr9xyCfBt7ZkIQAAL5RhHYJ7APFf401fGeAvD7zGXoL4331IP/LAb/6qhPDv1X
-						A/4W/iP4b4rgb+Bfwd/Cfw7+OfzjdN9pizYx3DeDf8kv3arN+2vhv1r5FwEI8O93/FH457n/BP4Xtgb/Wv238O+r/8+H6v+MCP/Y+Qcj
-						QZPXuheXHHYv8ugmEuE/F4AI/2bxL0F/pfoP+LcCQNDPu/8o/HsBkNGfqgAo/COh+u/hXwVAq/8lAZDxn6oAhPEfFYDxEIBdIgBjEYwA
-						iQDclu0A9E0jADL/bwRgSCoADP9BANa4L2YCwOM/RQFYygJw3UuZADxrBWCe+1uMAPEi4Nnur0kC/qojXQMAAfizx2IH4E8emeT+KCwC
-						Hu/+0AvA798/xt09coUbsHiXG716v1T+Gf4V/E2CAHgJMALw7LR17sdPD3J3Zvlej75F7iun45+uu7Pjf/Z42Xn9pl/Xd+94vPyLbD1f
-						fXocw//YLecK0G9zWULQr1EZWHTwdb6Z8A3DVw94B4FZB92XCeyvbyAALAFGAFQCsFUoBOArLAA7WhYAwL8VAJUAFQCWABYAcxowRUeA
-						eB2AF4BuKgFeAO7KBGDIhjMNBaDUAUBwcNgj847QTVh2AVIBqHQBcEPHGFAmAbYDEAQgdAFOBgmAAOQSwAJA8C+LgU+XJYC7ALkECPzr
-						mQBVCSgsBibgtxKQLgaGAKQSwAJgx4CMBKgAiAR4AaBYARg2a70IQK0EiADUSoAXgJIEBBGoSEDsBCQioBLg1wU0FAEjACwBS7wEtCEC
-						desD6kSgJAMlAZhHQGtzxUKAt2nyv7Px71OG9nbiod6nCvOthKDehv79EfQ94DdIcjhbiID/PIb+FPwj8MfMqYF+mwj9Pgb6c/Cfocmg
-						vwr+Ef4r4E+5IvBvVPUP8L/Wn+67xp177a0m4K/5pTt25lIt/CMp/C9N4Z9i4R9h+PcC0HdMOvpj4T8XAN3zn+HfV/8F/gn0/aFfLADD
-						57gXpm9wLy476l5accK9SHmB4B+pVP8pOfyLAKQn/1r4VwGQ6r8IgHYARABkPDeF/0OV8R8kbv8p8H9vVv1P9v8n6A8CwPAvAgD4VwFg
-						+GcB2M0C8D0jAID/sgBs9QIgEhAWABsB0HMAYvXfjwB5AfhCv3oB0EXAUQAoEABeAyAC8Pe5AHAHYLb7Gy8Af5kIwLSKAMRdgEgAHhIB
-						+D0SgM88OZUFYOCS3W4Cgf6EdQd96HUL/QT840P2uvGrY8auIq55djRB/8BKvvrAc0X2K6VLt46HPF52Xr/h17+hX9jR/BfYbu6ftIkF
-						YO7eS24hgX5dcvi3AjCG5OE+3Ci8AGiwIw/g//qBIgAqASoAn4cAYBtQFQAvAUEACP4rAuAl4FbAvyYRAArBPwTAdgEgACwBBP8qACoB
-						KgA/JvivE4DuBP5WAJA5e19zrxP4qwQo/KcCIPBvBeDVNacqAoBoByB0AeimrhKQCwBLgBcAJN0NqNwFeNHHSsArXgBUAuI6gFQC5EyA
-						VAIqXQCCfisAFQkg8LcSIALQmgRYARhfOhyMXgL4h2QCkErAmsYSQOCvYQkoiICOAqkEiAhsiiKQrwvIJMCKgEoAi0AmAJp6EdgZYrsB
-						9SJQkoE9Ie3JwL6QVATSMaFSEhG44pRgXVKC/0YCsIDAnsNQ3yytQn5MBP1q5hahn6A+TwH60/n+FqFf0xD6Y9oD/yr8K/gH+KfUV/0J
-						/GcT+CM43Xfmardx55EC7JfyS/fhx7+gj6H/6wX4D9X/FuE/zP1TBP7jwt8A/6H6HwWAF/5m1f8E/jECNH65e2n+HvfySroPE/Qr/LMA
-						ULQDYKv/dvTHwn8QAC8BFv6RCP9RAEL1nwRAR3RzAXhgdgr/QQDoOa8kAIB/KwCA/1QA6PmV4B97/8fqP8G/FQCsAfACEOb/WQC2Mfxb
-						AQD8qwB8Lcz/iwB8dTAEYH0QAMB/SQD4BGCfG/t4AeAFwFEAPvuCCgDWAKgAzE8E4G8yAfiLHqkA/BcWgMlGAChWACj/+b7RrseU9a4/
-						ScDQZSQBawn+Oa0KwB7OQyMW8OLfPD/s1d99ruWzAToOeL7svH6Trxu7d/xt+RfYRn76guu3+qSbtP2CW7D/dQnBfjWXSQIux/fxWYjQ
-						32MhEg4HwTHhIgIH+WbQBfDvBUAlIArA1uYC4CUAAhAWARsB4A6AEYBvjakKgI4AhS6AF4AfTEwFgCXAC4BKQBAAhMA/LAT2ErD51DsM
-						/yUBCGcBKPz7lzgADNDPAkAv9SyAigDQDR3RnYBUAp70sQKARWEsANoFMAJQkQA88egokAqAlQAvAHkXIJ4JIAKAqABYCYAA5BKgHQAI
-						QFUCatYC5BJg4J8FgKICgEzYes4NnrKCBYAlwAiASoDsDpRKQCICfhRIJaCyOxAyN90hKJcAFgGSgFwE7C5BVyUCFRkwIkDQn4pAeaGw
-						FYHZmQiUZKBeCKIIlIQgTyoDVhgkJdivvB8+j0kJ6kupfB4F/wYCMB+Ab1MAfJt5qOznYdC3Ici3IcDP0wz4A/iTCEo89NsUoN+mDvyr
-						23pWwT8RAAZ/SSPwt5X/HPwt/I/28D+KMmXhRvfxz39ZAH4N/i5m8brdRfhnAWgI/3a7TwP/PPcP+BcBSOCfUoF/v/CXBcDA//N429R1
-						7uUlB+lee7IJ/J8g8Efi6A+i236yAAT4jwLQK6v+I3H8B7vNHTY7/2BjDj//n8G/dABSAbDjP8n2nwT9YfyHnyv3chT+VQC0+l8SABn/
-						EQHQ6j8E4DZEBWDUVvctFQAKwz9HBUAk4BaSAAjAzYNjBwDnAOgI0Bf6rxb4R/qu9PCfCkCXigDgJOAoAJ/yAiC7AM0pCsCfqwD4RcB/
-						8kgqAH8YBGBsEICvvTzX9Vu0k7LDjVpFUL9mv2T1fjcuZJ8bt0qzlzOWs4ey2/WZu9l978mB7kdPDqjkGz97scyAhdzQtePPPWZ2Xr+p
-						F5nakNIvr53c3ncun/g7f99rlNclBPWl5PCvAjB990WuCNyL0wE5crMA1F/XvyoAn/PJBaCyEDh0AXZIB8BLgB0DsgKAfNsIgEpAWQD2
-						1gqA7QJAAHghsBcAdACsAADmUwEwEqAC8G4qANvOvOt+NlcE4BErALhJWwkIHQC7HagXAN8BUAmQfaGNBOBJJBMAlQAIgEpA2A3ISIDC
-						f1ECsnUAtgsgi4EREQCVgHgmQKkLcIFjOwC5BNgxIJGAKABWAsZtOOkGT17BElAnAsOmeQlo1A2okwArAokExE6AFQGVACsCQQJyESDw
-						RxqKAIE/EkUgSkAjERAZiCJQkQF64rDJZeBqhQApyYBNgHK8nqX6/oDz8vvGVGG+3bQC/HlS0C+kUu0XASgDv00O/DEJ9FMaQf/0JTFX
-						A/6Ihf+G4I80gP9Q9c/gnzNjlTt78U0P+43hHzlwnO45UzLw96M/Efwloepf2u5T4Z8i8L8gwL8KwMtm9KcE/5xRC9xLs7a6PiuP0/0V
-						91mCf0oJ/oMAMPxjlDMKwDP+0C+G/4IA8OLfAvyrAAD+owAY+C8IgCwATqv/ld1/ggDsD/CvAtDNCEBS/Z+0m8MCQOCfCADvAEQCMA7w
-						rx0AEYBvj6oXgK8P2xQE4JZcAMIWoCIAgH8RANkByArADXoOgBcAHv8xHYB/4HMAIAALWAD+DouAe0cBkAXAVgCmE/zrNqBT3J88Otn9
-						cTgHQATgDx4cmwgAugEvzt3GAtCfRADA35YArNzjxqygn/FLE9yPevWvBF2Am37S8oLgvh4zO6/fxAv7tZIAvFH4xbWcLt06XI85e3nv
-						fhEAn/2l1EtBn5Un+EbwE18ZQL49dqf7LMF/F59aASD4hwDwacC5AIQOwA5OQwHwEhAEwHQB7HkAug7ACgDCAkA3KqQ6BoQRIIkVAIzv
-						vP7BLzm5ALAEZAKgEoDdkiAALAFeAFQC7DoAPRRMBUAlQAWgKgFmNyB6IpEzAaIEcAeAwB8pbgnqBcCOAYkAEPxn24IWJcDDf3ktgEQl
-						IBeA5IRgIwFj0QVoUQJGrzosAtBAAiAAbUkAJawJqJEAEYFUAsYRFKUisJlTLwIiAKkIbOMkIuAlQESAwF8TJKAwHuQloF4GCPybdAQ4
-						BP2aKAJ7Q4pCgBCQV4O3S6qAb4O/15Te1mLo+6imDPF1mUf/3nyEJ0895MeUYB9JgV8SZ/rrgX8mbxtroD8Dfwv9Afw9/Fvor4B/Dfzb
-						sR8Ff4F/EYA68NfUVv0pAfw9/CNrtx8iuG8M/pr3PviYdwKqwL+v/NfCfz72g7n/BP5j9R8R+BcBeMls+cnwP3yWe2nSSvfKgt3uVbqv
-						9uF7q8YLAD1nKvzn1X/pAKTwjzyt8fBvx39k8e8RTg7/KgCAfxUAHf2x8/8R/mXtHu/9Xwf/FIH/KACh+k8pVv8B/0YAePzHCMDtRgAA
-						/1YAvmUE4Bs8/7+5KACAfx4B8gIgh4CtDQJwEw4B8wLw+VwA/BkAIgBLeQEwLwL2AvBp3gXICADvAkQC8BQEYJb7S5KAOAJUJwDYBUgF
-						IO0A/Of7Rrk7hi5lAei7cIcbsmxXAv5jNRb6KWMA/j6jSQAeH7eMYb+U2x5r+YTgix0dHf+dx83O6zftuqFbj5sKv7S28vlHBrtRm8+6
-						eQT9SYoCUM7cva/x2A8fBe5vDFj5f92AzVEACiNAnxsk1f+iAFASAeCFwFEAWAIwAuQFIHYBdrEA2HUASHogGN1wjACoBBQFgCVAzgLo
-						Bvg3AoD0XX2qIABS/W8kAABfFgDfASh2AQj8RQAi/CO9fFQAkLgYODsTIBOAcDIwS4A5GEwlwG8JGhYDNxSAVALsdqA2KgA4E6AsAQL/
-						VgAqEkDgX14L4CXAdwBGLdvrBk1enkqAF4CWJYDgH8lFIJEALwC5COQCkEgAi0AqAVUR2JqIgJWARiKQyEAiAakI1MrAyphcBpqJQBSC
-						KAI2RSHQEJgnKb0PpTWYz5PBeyuhf0fjeMgnQaqPAX2G/VII7m3o9xDjgd9kZg302+QCUAv9PlMN/FegX9MQ/DUK/jgjowr+Fv5t5T8H
-						/wT+PfiP9IFUYJvPZvDPo0KU+asInnL4pzSEf0oK/wsz+E8X/gr8z/Xw77f8hAxMWe1eXXLAvUr3Uk4G/zL+Q9CfCUAO/ywAdE+31f/Q
-						ASjB/yKCf4qt/iv8684/xeq/CgBBvwoA4F8FAOO8UQD86A/g31f/EVv9twKg1X/s/y+n/3oBoOfg4vgPBdt/qgDoCJAKQKj+kwDcmgnA
-						LUYAAP8iAOs8/IsAYAcgFoC+RgB4/CcKwPUUKwCfUQF4XgSA5/+NAPxNJgB/0RPbgIoEQAD+lLcBLQjAw1EA/vP9EABklPubxye6Vxfs
-						oGznjFwByAf07yPA32tioJ/u06MI/EctR3a5wYu2uds6BrsfdPQr5ss/7V3kwTzXde/xWY+bnddv2nV9t44JpV9aO7lr5Co3c/clN5eg
-						36YiBDVBt2DYhjP0n38vb/+FSgBuDAD4z/TfxAKAEaBEACiNBEAlQAUgbgUqAhC6AF4AVAJUALAGIAgAJe8A1AkAjwHVCABLgBEAlYCp
-						Oy+5ywUBaNYBwEFdKgAqAQr/SRfAC4CVABkDKggASwAJAIE/UpKAIAArTrEAKPwHCTBnAkQJkFOB+3r41+ihYKkEnOPUCYBKgJ4OHCSg
-						IACIjAFRtiE1EkDgj0AAhi/czgKQSACBfyMJKIpAjQREEUgFYMycDZyKCHgJQOwuQS2LAMWOBE0h8NdEGchEwHcC6roBNqkMpCJQkoF2
-						hACpCkHsHJRAv7XgY68g+Jptpjq+k4YBv0kS0M9DcF+KAL9NFfiL0I9qv6YW+mNaAf8y9Av4K/y3DP6UMc2q/l4AFP71cK+T514vQz/i
-						wV+z69CpCvxr9T/CvwhAU/jnuX9J3PHHw79W/8csdH1mb3V9Vx53/dZ48PeJ1X+F/6oAxJ1/yvCfj/9Y+A9bf2bwHwSAwL+lrT89/FsB
-						wAgQBECr/xCAUP2HAHgJsPCPxMO/BP5VAH7EaS4A3zECIOM/RgCwANgLAODfCoAcAAYBwALgVAAA/0EA+q1i+NcOwA2Y//drAFgACP4T
-						AXheBWAhrwH4u2fmkQBgDYAIALYAhQD8VRAA3wF4QgTgvzyqAoA1AJkAPKgCIB2A/3jvSPfIhDVBAPov3OnGrCLgp4xGCP4lqPZrUgFA
-						7uo/w32/Z99ivvtEn9ZOCO7ac7jHzc7rN+m67oEH/o/0C/qw8gtrI13uesr1X32Cd7HJg6p+MQT8eXouOCz/8dEGpHx33C73mX6bWACQ
-						RgLAEmAEwHYBIABfZgHQ04CzdQAE/rYLIGNAJAAE/XIWQCoALAF0w1EBSMaAKFYAkCAAUzIB8BIAAVhz7K1aAcgXAetC4BNvfsz7/+cC
-						YDsAKgFPEPgjJQFQCQgjQEtOsAAgCv8qACoBcR0ACQDFdgB4S1AWgFQCIAAsAQT9KgG8GNhKgI4AFSQgPx04FwCsB+BRIAL+SheAEiUg
-						ng+QiwA6AMjQ2RvdwEkiAEECfBdAM3QqCQDSrBuQSUDaDVjfVAJyEUg6AUYCEhGwEkCBAGjqRWB7iBWBqgyUJUADAbARCdidJIgAwW+j
-						9QIcAuhSrATURWHfnk8QUnj/ujQTgEZwL4Cfpwz5trpfBH3EVPht8vEeGfHx0J9V+3PgF+jXCPhPY/CP8J9Dvx33SaC/Av4R/kvgX4H/
-						uZoI/hb+BfwlteBPUfC38D982kq3euuBluAfefOdD+j//rIA/mX4zw76MvCvi35T+M8q/wT/r0xaQZC2m6G/35rT/BJd4QD/SAX+Mf6D
-						ndiq8K8CEEd/qrP/OHcmCACBP+/848MCUIB/Hv+hCPyLAKADEOAfB3dW4D92ABT+VQAC/FPuzqr/COb/7zQCIOM/XgB0EbCFfw7g3wsA
-						hav/EIDR22X8xwjArRAACsM/RwVgg/sKtgD1AvBlRAVAFwAbAfjcqxKB/1QAPov5fyMAn64RAIwA/fWTswn+VQCQ6bIAWAXgsSnujx8l
-						+DcC8Ac6AsQCgEQB+MqLs12f+dsp2zjYFWgUAX8SAn+JgP9IyggCf86yXe7Jyavd7U/0dbf3eLWYm+97psiFaTreueWWjn/vsbPz+k25
-						unTvcVv5F9Z6vt57vJu555KbTWCfpyQFHAJ+DeB/yo4Lrhv9J+ctv2D+k2XXHxYAymeNAKgEqACwBJgOQHEdgBUA0wX4mof/dAxoVxAA
-						lQAVgNAFoJvO9zitCcCdgH8VAIqcBiwCgBx+/cPGAkDJBWD72ffcw3QTRlQAkEQA+AZOAuAlQLsAgP8OuvkjtguQS4AdA1IJ4C6AFwCV
-						ALsOQM4EUAEQCWAByCRAOwC5BKSLgY0EEPg3WguQLAgm4LcSEMeA0h2BggSEUSDJoGlr3IBJy1gCogh4CTDjQK1KgIpARQJmS1IREAHI
-						RSBIAEUloFYECPo1IgFbOddSBBrKAAEqkoiAxohAEAKC4lKKQoAQdFdi/r4E8Z9cCPJrBKAW+A3ol9IY/M08f5YE9k1mMPSn4B+B3yRA
-						v2RqBfwj9CNJ1Z9gvwr+kkbgH8Z+AviXt/e04K97+zeDfwv+khX8uWQMiCC/BvxtZi7dksC/FYAK+GsI+uvh3+/4Qy/7TF3j+i09QPe/
-						0xyB/9MM/yoADP+4jxbhXwSAF/6W4J/yDEICkIz+eAGoVv8B/3EBsBUAXfwbq/+Hw/x/gH8Kxn8s/KsAxK0/4/q+XAB4608D/0EACPhV
-						AKT6LwKgOwDlAnA7CcB3OBAACsE/IvCfdgC+7jsALAChAyACcDNvASoCIOM/RgB4C1AIwCqG/xu1A0ACcH0mAAz/QQAW8QJgKwB/CwF4
-						OgrAX3akAvCniBeAPykIwO9nAvCffjqK8/v3j3IvzNkSBKCvHwWKEeCX7PLxArBspxuxdKcbtmSH+9aTQ0kCCPgL+c7jr7TWBejWcbPH
-						zs7rN+W6oWvP+eVfVuvpNWu7m72HgL+dkARYScAuBnzC35Q9BMp7GNT/gcAfCQJA4I9YAbhhYBQAhf9GAoBYAeDzAIwAiASIAPAYkBeA
-						72hqBEAlQAVAJeDHPrUCQLlv9iGG/1wA7DoAFQCVAAjAooNvuIfmpAJQ3Q4UHQAvAQT+oQvQRAK0A1ARAArGjiAAKgG2C8AS4AUglwA9
-						FKxWAowAWAnQDoAKQCoB/lwAgn4VACsBoQvgBWC0F4BEAgj4ESsAAwj6IQCpBKxIJCCMAtVIAIuAEQDECkAQgUwCRASMBBD8I1cvAiIB
-						QQQI/OP6AE0UASQXAMkOTlMZ8BJgEyTgCoUAsaB/5YlwXoZ6xAO9if241kNQT0l2SyoBfpYS4NsUx3sqwB9TB/x5GPptaqCfwX+hpgD9
-						qPhrrjH418F/BH9NCv/DfE6dv9wS/CPb951oAv8iAAH+k+0+49y/wv8r9PqrMza4fiuOuAEe/FP4x72yOfznAqDw/zwBvwoAw38QABR2
-						jABk8I+EE+M9/LMAEPSH6j+Bv8z/A/5FAOLOPwT/Pg9m8B+3/ozwL3v/e/jH2G9BAHj8xwtAXAAM+I8CEA//ktw+juIFgOHfC8C3R+v4
-						jwjAN4wAfG0Y4gUAu/9kAoAI/NstQFe7z+cCwNV/EYAuL1kBoPhdgFQAPuW3AVUB+BvtADypAiAjQNIBmEbwrwIgI0B/BAGgqAD8Hq8B
-						iALwH3860v3v945wXYctTboAgxYT5NcJwDJf+acMJwEYTgIwnO71Pxk4m8d96vKV+58tsmGWqR47O6/fhKvLDzr+r2Rl/1T4RbWcm+5/
-						wU3Ydo7n/2fZ7ClndiF4+0/pJoD/2D8mCbid/hP/Q99N7tMUKwCfHSASUCcAug2oCgBiBeDLBP62A8ASYAQgdgGqAsAdACMAOBAM8K+B
-						AAD+OTUCwBJgBEAlALP0lz/4x7YFYPy2C0EAVAJ4O1ArASwAdjcgkYAgAF4CZAs4kQDuAuDJoiABQQCMBIS1ADoKROCfSwCvA2D4jxKg
-						8B8kwAtAZUegggSoAAzdKAJQJwFWAEQCogBYCRhH0I8A/sdsou9hIsE/YiXAdwGiBIgANBSBvAvgk0iA6QSk3YAGEjA3SkCrIhBHgrwI
-						kATYhcIiAwT+Gu4GxJQkoGUZ8EJgOwJJV0BDcFwSAk1FCPA2nxLoV97ff0wV0q80AvdJ6N+QVvOr8G8PWCunEejHlEA/pEXgtxX/uqq/
-						hf4U/Dcn0F8Gf4F/C/0V8DfwP9anEfjn8K/gb+F/eAb/iO7rv3bboSLsl3L5rfeawP+iFP4rO/4I/PcZt9j1nbvdDVhzgsG/CP+4N9bB
-						vxeAHP4RC/8qABb+EVnfFeE/F4B48m8UgDr4VwEA/IsAGPjHCJCB/ygAsrW3wr8KAMO/H/vVESCt/sv8f6z+R/jH8y1m/3cVBQAjQEEA
-						fPUfAiDwHwXg1uFbogAQ/KsAfCXvAITxnzUE/whJgBcAwL8VgOuNAPD8vxGAf6CwADznBaB3KgB/FQRglvuLjhm8BeifP4E1ACIAf4Jz
-						AIwA/KHpAIgAjEkE4H+7Z4T7dMdkBv9XkHlb6fWtbjgBv42O+yAK/sM4Ozi9p651334M1f4+WV7hfPvRl92NdzU7HKzjlzfc3fE/efzs
-						vH7d1/Vde3y3/ItqPfcMW0Dwf7GaPaVUhQAZsfFs+E+N/+CfG7zZ/X3fjakAIFYAKFYAbjQnAWu+aATgS8O2pwLgJaAoAKNkEbAKABIE
-						ACH4LwnADyABBP4qAIgKAE4GvpPAHwKQdwHGbDlfEQA7BsQCQOBv1wFAAPDk8BDdhBGVABUAlQAIAA4FCwJAydcBhA6AFwCWABYAkQAI
-						gEoABCBZDBwEwEuAGQOKEuDXAdCTW3owmBEAAn9EFwKHxcAasytQFIDzEsC/piABI/V0YN8FsAKQrAXwEjB67THXf8LSqgSQAFgJEBFY
-						mYhARQJIAJqdHKwSEEVgPaeRCLAAaOpEwAgAS8CCLZwoAhQvAVEEtnEaiUB1NCiVgSgEO0MSEfDJZSARAgLlNGUh0FgRaBiC9uLbiynB
-						e/uZBeC3saBPEF9KFfRLqQK/TQX+kQLwM/QnwI/D5Aj0NSXoR7Vfk0N/Av5YtN4A+jVtgL+F/1rw13jwHzZVIod6Lafva30R9uuC92f4
-						H98+/PcZSx8zf6cbuPaUG8j3OIJ/xMC/npSOU90Rhf8+Fv69ACAW/sPoj4F/O/rD1X+6pyMV+KdU4Z+eIwD/CyL8qwAE+DcCEEZ/FP7N
-						CJDCvwpAXfWf4Z+CDkAF/ikoDIINVAB49McLAMZ/dASIq/9eAPLqfyoAW4MAfM0IAO8A5AXgZp7/l0AAvmgFgOBfOwAK/1YAuvD4jxcA
-						wL8VAMz/swBQSAD+NhOAv+QRIEQE4M94EbAKwBSHg8CsAPw+BOChKAD/iRcBkwTcJx0ApGPqetdnAToAIgADFu3IJADgLxlG92uOH/8Z
-						ShmyaLv7Zq/hvPVnXVrpAtzQrcfXPX52Xr/uq0u3nrNLv6RW88V7n3Z9lh64agHotfBIEIBvjN7h/v7VjYkAMPw3EACWgDoBYPhPBSBI
-						AMG/3QpUsjMRAJUACECQAN0FaHwUAMQKgEqAwn+dACA4FblVATjnBeDM2z+nG/HRIADIz0oCwBIgAqASwOsArABQZDEwwb85GEwFIHQB
-						VALoyUZPB47rACj0xJTsCOQlID8ZWCWAdwQyEoAOQH8jAIgVgKoERAHgDkBJAgj+IQC16wGMAKgEjFh+gAVAE0UAY0EiAWk3oEYCWARW
-						c3IJKIqAlwARgVQCRmdrA8YS+CPtioBKQCMREBkQEWAZIOi3UQmoWyeQyACBqhWBdoUASToEeQjUy8HfxVwLqK9+/QzmWw0BfVPgz1MH
-						/SZF4Ke0AvwC/Sn4xwW9Bej34J/Afw79Jo3AX+E/Bf8I/0XwN/Cv4J/Avx37Ufgn8EeGTFnGufD620XYL2XDzsMM/0gV/AX+FfwV/l/F
-						/WPhLjeIIB/gL/DvBQDwT/dAC/99sfA3gX8RgBz+X8rgXwSA4J8C+A8CoPDvUxn98fCvAmDhXwXAwn8uAHb0xwrAA14AUviPAmCr/+Hk
-						Xw//IgDYMKMsAMoJAv9eAChJ9R87AFGwA1BcAIzxHxIAhOF/q7s1EYB8/h8CIBLwZb8D0BcpUv1HRAA+hwXAFJn/l6gAXBe2AK0KwKdU
-						AJ4RAfibp6wAUPxBYCoAPP9PSQVgUugA/MHDsgbg9x6UDsDv+a1AsRAYua0vPS4XYAxIRoFepQxdSsDfTADoHj6U7vFDF2/nMSBU+jXf
-						yvPIS027AF26dUzx+Nl5/TovtGLQkin9klrN93qPcJN3XODTe2e0lEskB2mm7brIrT39D41Rn1wA8hEgJBEAHgFKTwNWAfjiUJUAEYBk
-						ITCBPzoAzQQg2QnICwA6AM0EIJwI7AUAW4JaAVAJ2HrmXYZ/FQA7BlRZBOwFYO+FD+hmG+EfgQAkEsACcJQFoNIFIOivSkBJAKIEqACI
-						BIgAJBKAyhSBf1gMzBJwOnQArATYLkBcC3CWBcBKwMBMAvR04CABBPwqAFYCtAMAARhB0F/ZFUglgKA/l4Chi3a5fvTkjbQrAeVuQCYB
-						eTeA4D9ZIFwSARIATcsiYCSgVgSsBBRkwIpAWQaiCNTKAIGrTatCgJSEQFMF8sL7ANw1+HPLSaE9OevAvE+6/SkF33OSKtw3Smug3x7s
-						I1ORIvCnCdDvUwf9CfzXgP94VPw1NeBfgX8Gf0kJ/AP8UxqD/0qZ9zfgb+EfO/ts2n20CPulnLv0Vqj+N4J/LPjtO4HuE4v20D1LoN9m
-						AN3nwuhPAP8I/2H0h+HfjP8o/OMeW4F/EYDnvAA0hn90ejP4pyj8Jzv/QACQDP6RdOtPEYBQ/WcBkNN/I/xTZhyQrT8V/r0A2Op/d3qO
-						VAFQ+Eds9T/M/mPxrxGAUP0H/PstQNEBwO4/sgNQVQB4/McLAFf/WQA2eviPAvClBgJwIwsAdgCqCsBnX4wCAPhPBOAZIwBPz3V/7dcA
-						qABgDcCf95hRFYBHJ7s/ygTg9x4cF3YC+j3dCeh+LAQeyfnzR8Yx+Ie1APO2un4LtxPwE/wz9GsU/AX+kSEE/zgP4Lnpa93XfvYKg35d
-						WtgR6GPsPOkxtPP6dV3Xd+1xS+GX03JwAMRj41fyyb+tZsauSxICf01/uul9n/8j73ZfGbHNferVDYkAIFYAVAJEAKT6rwKgEqACIAuB
-						jQBQ0p2AtgcBiBIgAsDbgXoBsOcByDoAuskQ/EMAVAJ0BOgHqE54AeB1ACoAdFOzAqASgBGgk2997N74MHYAWhGAFUffcg/OOcwB/CO8
-						DkAFgOA/CICRABYAutEjJQFgCSD4zyXAdgCeWXaSowLQWAIKAkBRAWAJMAKQS0B1LcCVSMAFjhUAlYDStqCD5251fceLAFQkwAuASoAK
-						QC4CiQT4cSAVgbodgtJdgqoSUCcCKgFFESDwT0UgSkCQAYL+uFAYIfg3awRYBK5aBgj+CzJQJwSIFYE8OegjdrFx9e/xttaSw38R9EvB
-						95WlvpLfKNhtKQtDf8w0wH6eEvSblIDfzvXzmA9Dv00N9JtY6M/Bvw76FfzD2E8b4G8r/wH8DfzrQl/Ewr8KAOAfmbRgQxH2S/mIMnrm
-						KhaAFP7jPv+vjl/iBizY5QavO+0GA/41Cfxjw4N87j/CvxWAcNqvhX+/538K/xIIgIV/FQCFfxz6JWu9IvwnAkDQjwj8Y+2Y7wBk8B92
-						/gkCEE/+tfAfTv718K8CYOE/r/539/BfEgCt/uvWnyoAxeo/1gAYAfjWqCgAofqvAuB3ALpl6CaGf+QrHv6tAHxhQBQAwL8IwCoWgBv6
-						RAHg8Z8aAcD8vwgAhQQAuwBZAbAdAAjAnxkB+BMjAOgA/KFZAwAB4J2AHsJpwCQAD8gYEMI7At070j02cY3rgy6AGQUasoRAH+C/tF4A
-						MAI0iARg0EL62T01wn2TQB/5xs9erObhF5vvCNS14wseQzuvX9d1fdeek4u/nBbzvR593avLDrqpOy9yptkQ7CNVCbhUCW4k30dFnf7z
-						frrfxkQAVAKCAHgJ0BGg6wdEAbjRdAGqArC9IgAsAV4AbBfgVoL/W3kr0LIA3EbfpwqASoB2AL5PN6eqAOzj6IFgfCaAkYCfzjzI8K8C
-						YMeAGi0CxsFhD9QIAEuAF4BHVQC8BOQCgKgAdCzyAmC6AIkE+Op/SQDCYmB6kkol4HSlC8ALgq0E4MmwIAHcBfAC0NKC4EwAZAyI4L90
-						QrB2AAoSMGDGehaAogQYAWAJmJQKgJWAKAKpBIQdghqKAMG/plYENnBUBJCKCBgJiCKwOaROBEQGvAhQ7PahVyIDIgQE/HkIeJuJgI2V
-						gNoQjCcpvY9JEebz4P2uIBb+ZV2EB/oWUoT8PAT2pdRV+HPgZ+j3Iz4y5mPA38B/FfptGkB/Bv4J9GcjPyXwD9BvwL8C/yXw53n/rPrv
-						wX8QDvXyufTGu0XgtwH8I8s27JXqvwd/hf++4xe7gQz+Zxj8EVT/bQegAv8+Rfin6Im/FfjXQ78y+EcA/7kABPj3AoAOgIV/pCfi4V/H
-						f7BznApAXv3nnX+MADw0WwSA4d8LAC/+zeD/Xk6EfxWAAP8Unf+38J/v/KMCoIVDFgB6To7V/ygA3x4dBUCq/1EAvm52ALrFCMBXjADw
-						9p/aAcgEgHf/qRGA6zIBCNV/LAB+PhOAp60AzJE1AP4gMAhA2AIUAmAOAoMA/AELwAQWgP9M4I8OAE4E/r0HxrjfwygQOgH3jaKMdLe+
-						MlcWAnNEALAtKOB/KAE/h4RAIuDP8/+LtzP8D1ywxf1k0ByG/Eb5cpMuQJduPcd6DO28fh3XTXd0/I/0i/g4/8W0GlT/73xxtJu4/XwQ
-						gCQE+yoBIfT2PBO2nWf4x3/cLxGo/x3BfxAA0wWAAMhpwFEARALKAoDwLkD0OSEAvB2oEQCWAIJ/FgDTBcgFQCVABYAlwAsA7wbkBSB0
-						AbwAqATIQuAoACoBVgCwMOvNXAAI/K0AqARYAUAbGQKgEqCLgIME4EbtBSBIAME/jwF5AUCSxcAkAB1GAHIJiCcDiwA8ayVAOwCZBNgx
-						oDoJ6IsnwiAAIgH9KSoAKgEqAIPWewHwHYBcAhT+JSIAFQnwApBLAASg/+SV9KS+JEhAIgITl3GsAJQkwIoABCCVgObnBVREwEuAFQFZ
-						GyASUCcCLAM6ElQZC/IiYCRAUxQBAv/QDQhJRaAkA4kQLI0pCgHSogzksVD/ySeCfQh93zZ2V6QYgntfxa9LFfJLsbAvwJ9nyqI8VeCv
-						BX/KxAz8U+inEOzzwt468Nc0AP/RDP4C/6NmxjQC/zD248Hfwn8AfwP/AH9NgH8c7EXZuvd4EfoRBX/NoRPnQ+WfwZ9kYMD87QT+pwj6
-						z/pcPfxr9f9luneqACTw7zsAFv6fo/ty2PnHw39vC/8U3vef7vMW/rn67wUgzv57AeAOcjb77+HfnvwLAQjjP7N89Z9iq/8C/wcqs/8l
-						AeiKXfMM/CP5wV8qAN8jfogCYKr/RgC+RQLwTSMAofpPke0/RQC+OiQKQKj+ewGQBcAQgLWh+l8SgDj+s8x9luf/JQL/KgCL3KeeJQF4
-						NgrAX2cC8Bf+HIA/IwmAAAD+VQD0IDAVACwCVgFA9f8PIAEPVgXgTx8ay/Avo0A+87AtKIF+EwFABi7Y6p6fsd599eGX3K0Pv1Cbrz/0
-						QpMuQMd7N9x993/vcbTz+lVfN3Tt+FL5F9NasO/rQ6OX8+Fdmqk2O0upigL2/kfl/zb6zwrgFwFAFyAKALYDRawAXBe6AFvc9ZkAqASo
-						AIgERAEIXYCCAHxtJMG/FwCVAMC/piQAtgsAAah2AUQA7vBjQLYLgBGgIfREEQXAjwHVCIDdBQgt2wfoxhu6AFYC6EatApB3AcJiYC8A
-						PbwEsAAsRtIuAMLbx6GalEkABCBIgBWAIAEqAFECkgXBiO8CQACsBEAAbBcgOSGYBCA5ITiTgDAK5CVABSCRAAJ+TRSBi5y+OJVzHARA
-						YyVABKAkAbXdgKmShiJgBKBWBIwEIGGBcNsiYCXAiwBBv0YlYIJfI5DIgJeAVAYI/DWZDJSFIBUBm6IQIATPjVISghKAR4AvBX+fpvQ5
-						Wg8BfR76NzaE/VIY+EmiGPTLqcK+ZLJNEfhjBPjT1EG/pgj8Gnr/8SSOEwgiJizb5cYv3eUmrtjjJiynrNjrJqzcxxlPr1ezx42l90fG
-						EJCMXrgtZCQ9fkfOWU//L9a0DP469qPgj2Bbz2mLN7UE/8h7H3zsBkxczPDff/o6N3j1cTdERxIZ/nFviuDP8E9R8LcCEOb+M/AP8M8C
-						oNX/E5wA/5kACPxLB8DCvxUAPvWXYgUA8C/jPwT+iId/FgB63lABsPAfqv8G/lUAcvhnASDoVwGIi38j/GPbT9n60+z+wwIgEqDVf+kA
-						RPjH+I/AvwgA4B8J8E+5jeHfCADBvwjAVob/kgBw9d8LwJex+08QgHV+BEgE4PNGAG7g+f+SAFC8AGABMAQA8K8C8Hd8ENj8IACAfysA
-						f04C8OcqALoLkBcAnv83AvCfIQD+ILDYARjjfh8SQALweyQAv/fTke7BcasSAXiVBKDfgu0M/0PoPjsEwM/QXxAA+r83gJ4TvtZzKEN+
-						o3zp3t5FdtR06drjcx5HO69f9UUGNqL0S2kl2PnnjqcGuJcW73eTd5znRcCIlYEpLQoAbgb4j3oTQfvf9dlQFIBPQwJsB4CiAtDFCwDg
-						X1MnAIgVgJszARAJqArAN40EcBfAw78GAvA9jR0D8hIAAfgRwb8KgO0CQACm777UUACSMSAvAEcvf+TuB/x7AUByAeBt2sxagLougAoA
-						SwALgFkM7CXAjgHxjkAsAEYCvADkEhDGgLwAICwAKgH0JCgCEA8GSySA4L+6FoDgPxOAigTwCcH1EpCsBwgSIPCPLsCwZftYAMoSsCyR
-						gJa6AQUJsCLAEjBdkkrAWk4iApkEjJplJKBOBIwEiAhsSpLIgBEBkYEtIc1kQISAoL8lIdiepCQDmqIQaAi0i8nerwzoLQQfW0kV5EtJ
-						10AgGdibxC1WCejzWNDnENznyWE/Swn47Vy/jPlgoThBvk0G/IhW/LXqj5cT6ecyZe0hN23TCTeDnhdm7nmdM8Nk+u7XkkzT7HrNTd11
-						KWSKyeSdMZN2XAyZ6DNh2wU3btNpN3btUTdq+V43YsFWN4z+nwwxIz85/Oue/pKl7s13PmgI/jYzcCrw4j1uKEF/gH8jABb+kf7rCPoR
-						hX8G/ygAofpv4F8EII7+VOCfckXwb8Z/LPyrADSC/0dL8O+Tw3+o/hv4T6r/XgCK8G8EQKv/Cv8qALL7T1UAdO9/hv8xsg0oOgDfhAAg
-						GP8ZudXdSmH4N1uAfhXjPxSBfx3/We++RPmiEYCbdPyH8jlsAaoCQAH8swBQGP45gH/ZAejTFIb/56IA/K3fBlQEAMEagCgAPP9vBOCP
-						Mf6DRcAkAH/AAjAx6QDwQWAPjCYJAPyPcX/AL+nPCInAzS/Mcq/O3+4juwEh6ALkAhAkwAsAFgL3n7/Fdes/y33twecb5qsPPNesCzDE
-						42jn9au8Ojo6/jv6BVyu/kJaC/Z7/dGzo9zYLeeCACTw36IAjKaPx3/Yb9J/0E95+K8IAMUKgEoABEC2A60XgJsgAV4AvoAOgBEAlgAr
-						AF4Cvk4CgKgAIFYA+FCwggDk6wAQFQCWAMC/xgsAAgFYc/ytqgBQGgnAxlPvRAFA9cULQHoomBcALwG5ACCAf4kIgEpAWAzsUxGAbDFw
-						2BHIC4BIQPV04KQLgGQCoBLAAkBPnoiVABEBgf9cAFQCVABUAuw4kMJ/MgrkJcAKwBiCin5T1xYkwIuA7wREEUjXBBRFgCSgJAJJN8BL
-						QCoCIgF1IgAB0NSKAEG/jYjAJk6tCDSQgVwEJC3IAJILQUEGNCUZsMkhX5JDd+l9Ssk/ro3Q95onAn17SU9lLqcE+ElKsI9kwK/QH6r9
-						Cv1Ztd8CvwbgP4G+l2kbj/HBjzP3CvDn0M/gv4eAH7HQT5naMvhrIvgz/CP+8D7NOPr/O47+/47ZcNINX7zTDZ5SrfojAzTjF7udB061
-						BP/ItiMXUvj34M/VfwP+iO73b+HfCkBD+Ke85AWgEfznc/+9l6bwrwLA8O8X/+bwj+Twz7P/QQAOsQDkoz9IHP2Js/+h+u8lIIX//e5u
-						IwDJ6I+PwL8IQFL9NwKA0WEEAqDV/1wAvm0FQOf/IQC+A2AFAPP/Xxmq1X/ZAcgKwBeMAHD13wvAja9aAVjB8F8SAB4BSgRgQRCAvyEB
-						+KunCP4REoC/4EPAZgUBYPhXAXgsFYDff8iOAI1z/wnnAGDsh+F/rPtDEoA/ICHg3D/K/enDY9xLc7fylqCvLtjm+iIkAP3o5WCFfxYA
-						gX4RAcC/BOsAnpy82n35gRfcLQ8+1zA3/eSpIkNKOi4Rjv4bodLO61d2dbmz40/Lv5Dm+cI9T7kf9erv7huxiG7G5ykXONoFsKlIAd2s
-						bXBj+jb9J71x0GZT/Y8CoBKgAqAScJ3GCADWAVgBQKIAbKsVgOoYEAnAqMYCgBGg24wAIFYAVAJYAPRUYO0AeAFQCYAAHLj0Qa0AqAQw
-						/BsBmL//MgtAIwnAqcDhZGAWgPKWoCoAKgE6CmQlgNcBePhPBcBLgAqAkQAVAIwBRQHAk1s6CgQB6GMEANEOQOlwsEYSMISiY0C6M5Bd
-						EMwSQMBflQASUoJ/lgAWgItu5Nrjrs/YJXyIT0UESABSCVgeUt8NEAFQCdBdglIRqD8zIIiAkQArAu3KgJWAXARSGSD4L4wI1UmAJpeB
-						pkJA8GtTEgJNSQbsYmOkCOqfVPD1slTgnmC5lQTIX0wgj5QAPw/BfZ46+LfAH8Bfgd+kBPya8fQxUzced7MI7mcR+CMQgBlIAH8P/Qb+
-						VQAE/KMABPAn2NdMsiH4n8hJBcCC/3j6P4uoACBj0d1bfZjAnyRgosB/AH/EH+w1a9nWIuyX8tpbHzD8swAo+Gcz/63BvwiAnfm38K/V
-						fznwSyQggX8WgNKuPwT9iBGAAP9m9x8L/yoAFv6RAP+UvPqPhJ1//KFfEIAE/r0AxNGf2AHgrT9VAAj6VQDu9AJwJz1vWvhXAdDqv8K/
-						CgDv/mPgXwSAnru1+o/df4wACPyLANwyNArAzYNTAfjiQCMAqP57AfhcAwG47uUoALL/vwjA3z+/WODfC8DfPkNJBEB3ASL4TwSA8ngU
-						gD96RLYBxQgQBOD3MgH4j/eNdv/7Twn4HxQB+EOCfw6JwR8+MMrdP2YlL/5l+PcC0Hf+VjcQwN9EANAF6Ddvs/vK44P44K9GabYl6A13
-						PvGHHks7r1/VdUPXnr1Lv4xWgq2fftDRzz03f6+btJ0EYDsJQDshEdDgP/6tBN1c/W8iANgdyI4BWQHokgkA8nkIwJD/P3v/HW1ndebr
-						gqN7jO57uu9fHf64fbv7jnFH31PhVJXLLicymKBANNiAccBgm6BARkSFrYhyzjmDAsoSEkJCEknknHMy2OVsl12n6p7z9ft7w5zvnN/8
-						1lpbW2BcaI/xDDAWQlraa33PM6OeBOQCIERAaSPwwhgAPgIQACECMAPAEVAPgEtcAISNwBoAP6EPtBAAGgH9OACeY8lvGQAk/vkMwHJ6
-						sF2vAWARgADgCLBlQJtdABAIALkZOEZAEgA2A6ABkCwF0gAYqQGQRwBmAPwsADD5N2oRgCVACgLAIiC/HExmAbII4IcuBUC2FAgBEPcC
-						lC8I88eCxgj4UNAIsBCYtfkgB0A9AiQAjBmIABcCFgFpCJD8uwgAeQTM1QBIQ8BHAEHSb4QIyDcJl0LARYCFgF8WFGIgCwGJAY0AFwOI
-						AKNVCHQ7CAAJcxNpDOB/p+Qh0B4R9FzqW/3YQ8GP4DcRpN9TEn5HTfQdJdkHZeFvLf1gGbGSXoe7n/owSL/Hj/pzAKj0h5F/En5Z7pPi
-						5T+M+qv4Gz4AMOqfjPwH+Vfxd2Bz/1x6TyAAEvEPt/rew//fr3/3h6Lwl8BMRE3+XQB48Wf51wAw+Z/G8k+fe1kAePkHE/IAMPFX+edN
-						v07+SwHAp/5k8i+XfkX5j6f+RPnPN/5yAGTyH07+0QDAqT/h5B/l2pr8x5t/Tf5BGP3PAsDkH/xYAyCV//rpPyb/IQB0AzACAPJfCgBe
-						/tMQAGc3BMDp0wgNgD68/r8cAKfUAkA2ACMAjg8BALD+PwaAHQFqAYAjQL9MIAC+ZAFwswYAyX8eAJgF+KdBxE0UAvRXCYHF1bfGbeDR
-						f78ECCAGZu94gpcDzSbpZ+jzGNLPx4CC7bIM6LIpa4vSn3PmVSOKLikMHaZaeuTr0/rq3X/Y0+U/jNbgD/JHw6ZVPxo5t1r00Dt8AtAq
-						kvoSRfl3LHr4Xd6cE0b/WwUA0AAAPgB6zaIIaAiAM+dKBFgA8EbghgCQCJAAuMAFQDgJqBAAPgJ+iAhwAcB3AlgAAA0APwuAGYDb6IP2
-						F3/4r9U/E3kAhGVAhQDAwwMBYBGQzAK4AChFgA8AmQWQ0f/8TgCLAAsAiYA0AJoj4K1qXBYAIG4Ipoedyn8xAkj8gUUAAiBEAD1046lA
-						9QiQo0HfZ+ym4Pp+gDQE4lKgGAG8HOiR96qpK3fXImCqRYALgTwCarMBdwo+BNKjQgmSfiOGwD6OgFYhEE4KahUCWQBwBGx6iElCgITf
-						0zIGshAA9RjoPAhAMQgMmy1ooBQErSiJOij92Ebw361RFnyjJPKtSC9q61z0wcqtRkn4PST8OSr9xspdT1R3k9g3Sz+W+2Ctf1zvnyz5
-						AYn4G01Lfkz8BRP/+rKfsvgb83c+I6P/Jv4ExB/Yrb4vvv5+UfZr/Mu/Vvtf/TnJfzzuMz/v38s/8OIv8q/ir5Qu+wIm//7Mfy//d9Tk
-						XwPAyT+f+e/lPwSAREC68TfKvwXArfQssdH/PAB49D8LgGT0XwMglX8JgAEuAGqj/0S+9t8CgI/+tAAI8o9luRoAJP1x9D9uAL7IBcCF
-						LgDO5+U/EgDn8fIfCYBziW/y6L8GwAw5AhQBcMZ0YAEgl4AhAHpTAED+LQBOxeZfDQDZAIwAAFj/HwPgOGwCdgFwNMEBgA3AeQDcFgMA
-						6/+/4ALg729clgTAf7luMQn/0urLFAAcAhQA4Gi9FEyWAT2uMwDCrB0QfxcB9LnrA2AWfXbjNKAhy++rzr5+LI/ytwJ7Rks+CXr37zqo
-						Wnrk69P46jVw8P9a+oPoBOzsxtn/V83Zwsd3tmJVExwN7/MaxQsXPR5H/0MARPkPAaAzABYBIQBmSADYEqBkGRAioCEAOAJcAMRZgCck
-						AjQAgA8AjgAOgKcZCwDIP98KTNJvEYAAkAjQJUC8DCiNAAQARnt8AEgEaADoDADkPwQAgQCAqF+/QQLA5D9EQCEALAL8LIDtA0AAcATQ
-						z1mKgOF4iHAAvMFYAIQI0ACwCLClQAgAHwFhL4CLAB8AFgG8DEgDII0A3QvgAsBHgA+AOVkAtIqAdCmQREAIAGLuzmdDAIQQoADIIyAs
-						B8pCIJkNyCOAqEWAzgTEENgXaAqBZCagVQhsFEoRcMgxQNLvlwZFWu8XKFEKAlCMAQ9Jd6cUJd6DH1OkLPM5d5YoSL2xuhX0WnlW0eta
-						xwk/iT5DP/au+56p1ux5llm984mC8Iv0h9F+xQt/YNOBagW9Bon8Z+JfDwCJgCD+LgCC+JPs+5F/L/6p/H9Iz426+K8oiD+W/UT5f79a
-						evD9avGDb5P0SwCY+Hv5x3Ge9xx4uiz8ORQAb3z0m1T+Vfx59B+fVYyO/pP4h9F/lX8fAG3lX0f+47r/eNuvD4B44y+I8p/f+Ctr/4V2
-						8m8BkK/9N/kPAUDccPeLteU/OPM/X/6DAODRf0DCXwqAK/T0n+TcfyUe/SkBAPnPAyDK/xMq/xIA31noA0AiAAEgm39jAED+LQBY/jUA
-						eAOwBgDLvwYATgBKA+DeqpcGwCkhAHZWJyUBsL06HgEwxgJAlgBZAHzdjgAdur4WAF/KA2AQlgCt4AD4u+slAP5OAwBHgH7l5uUcAV++
-						iWKAQuDLFAE3Ld+ry4DSAJi+HaKPi7+AnP/P4s+Q/NPnNP7ZNPr8P+um6Xzmf0uuG91iM3DXfz9tYNf/rHp65OuT/qLiGlj+g2gN/gBx
-						9OclQ6dWwzfQw+TR95T365Dol6LAg6Uvyeh/uwBwy4AQAKdB/l0A1PYBuAA4a24MgDALoAGQLgOKAWARYAHAEYAPlSwAgAWARUAMgGc5
-						AH7sAsAigAOAWE6vRR4ANvqPAEg2AZP4IwDe+sW/iPxrAPgZAAsAmQWQAAA2A2B7AYAFwGAEwHbBAsBHQAwAiYCRPgJI+n0AWASM4wBI
-						I6AUALwXwAcAHpBZBFgAJDcEt42AegAU9wPoqUB5BNgyIAmBD6ppd93fGAE+BGoRUAuB+5jWIaDLgVqFAIk/8CFgEVALgSQGYgTkIZDE
-						gI+ANjHQyaZhTz0GjO5FgVEMghIksIeOinwO//dTSr/GotxnrMJIfg4Lfo4Tfi/9xGr6Na1/+LVq83M/q7a88PNqM3he2PjMT+n/e71a
-						vevJVPw3C6nwi/QbK+jPZ/1TH7Yf+TdI/pORf5L9ZOQ/E3+Wf+DkXwIgrvdPRv5J9GvyT+9TwwfAEgoAMHvd/ij+K0j8CYi/MX/NbpL7
-						P5Wl3yD5x4/5Hf39wofxmePEXxH5lwCor/vP5V8CwK/5r8m/X/fv5Z+wM/9T+ceerU7kPwZAkH8NAJP/21j+JQDipV+y9CeRfx79lwDw
-						8s8B4G7+ldF/DYA1qfxzANDz0QLgcpZ/CQCTf17+YwFA0m8BcLELAD/6/11GZgC+g9F/4kKKgAtZ/h8V+WdcABAs/7OBLf/Zz5xFEXAm
-						j/5bAMQ7AHojAAgLAD76kwNgF8s/8EuAEACYATiOTwCSADiGjwCNAfA1FwByC/CaEAB2ApAFAI4B5QDgGQBCA+C/XLuIR/+/QgHwFQqA
-						ryAABi2pLpy0iYQ/PQlo6pZHGZ4FIGZtl6M/Wf7ps3jmNmEWfR5gGdAPxq7k4z7bcebVLZcB/Vj19MjXJ/1FL/iu+h9Ae7CWCwFw8dAZ
-						1ax9b1bLSf6F9+uQ1CICPF7+sfwHo//fIOFP5b8cAHYUaNgHwBEQA6B3YRbAAuBMFwDJMqAsAAAHgB0HqgGAI0GTAMCHiwaARUCrAOAI
-						sADIZgEQAPe89LMQANgH8DMNAMwC8PIfHwDKk+/9prqO5B8gAvw+gBvpAxogAHwE3IIIIOk3eBYgRMBr1WDIv5FHQDILgIeLi4BCAGBT
-						sMwApBFgAcARwPKvewFcBMR7AfIIkNuBp0P+DRcBfDcAiX+yHyCPAJsBSCJAAsDvCQgzAYRFwML9r1WTl6YBMGX5TiaPgGIIaATMKEZA
-						FgIk/qBtCGA2QENAYmB/oDEGNALyEFi8sRACJP3phmFA8q/7BPIYSEIAkKx2EgSgHASgHAWgLNp16jFQl3aj9O83gl9DDZL5Q6S19BtR
-						/POlPWv3v0ji/7GIv0r/5ud/lrCJwgDc/eR71Z33v1Atp5+H5Z+FP2XpRlzYhZH/x0X+VfRbib+X/lz8w0ZfXe9v4h/kXylJfxR/wZb8
-						5AEQxZ/eu3j/YvQf0Ht93j1PB/FP5N/d6vvOBz8viz9g+QcSCdtf+Fmz/Gfiz8d96pGfJv+ldf9F+dcAkOM+M/l3AWAj/zL6n8q/BYDJ
-						/zD63Ade/i0AvPzL6D+eIxoABfnnpT/E9RQAncu/BEB/UJD/UgDY5t9Lgcp/XP5DuPX/YfRfZwAkAB4n7/ABoKP/xLfcDMC5OgOAADhn
-						to7+zzxQneUC4HQXALwBWAOgF88AxDsAIP8cAONF/i0AIP+1ABglAXD0cOACYAiQAPhyEgCrq3/MAuDvbigFAGYBllRfvXkZsbT6KiKA
-						OPa25XwJ2DSVf9kM/Cgzg/4eERACgDD5Fw7yaUA3LrynOosEH8t8mjj7GtDyNKANqqdHvj7JL73990/1P4D2fP+2SRwAl02+i4//XEby
-						b8QYaMbPEIza+SoLen30v5MAeCgNAGwEzmYB8HMzvA9AA8DPAsynCCAsACQCZPTfBwDwAXBRQwDwMiANAFAKAL8MCNgMwOPv/roYACBs
-						AvYB8Os/Vfe98s/VtfiwtVkAjQALgEFMdwKAsBkADYBkKZAGAG8ILkQAAiCNANsHECMgPxJ0QhYASQTQA7N8N4AEgD8S1CJAAqBFBJDw
-						WwCEpUCMBoCLAB8AFgFYCjRz00GKgB1MdyKgFgIUAT4E4ilBMQQsAmIIkPwDHwIUAEYMgRgBjSHgZgNiDDyYkMSACwGJAY0Aj0ZAcVaA
-						qceAUQoCUA4CoxwFnqK0twL/Tk7px4HSj2VM5h30ezwUouA3g2U8K+m/cfdjb1dbgvSnAbDJiT/YmLH2kTer1fc9S3+OCD+SfmUZ/dyr
-						973E4t90vCfIpZ/FHwT5j0d83mlk0s+0En+D5V8CIIg/URd/geVfA2DhA29lo/5R/KcuFQ488VIL8Qck/8rT7/4yBEAc9QdvcwB4+Qde
-						/KP8KyT+IJd/CwA7699mABL5Z/H38i8B4Nf9gyD/Cm/8dfIPsCfN5N8CIMj/phc5AHL5B9f7AHDyDzgAnPznAeBH/4P8h+U/2EeXjf5r
-						AMTNv5B/CQBcKGoBIKP/CIAnqotI/kMAkPxbAMjofwwAHAGKAJDRfwTAAyz/FgBnTvcBgNF/2wDsAyBuABb5dwGgJwCx/GMJENb/awDg
-						FCAOAELW/yMACAoAHAFqAfBPCIDbXADgFKBBK2UGwAcA7wOQALBZAI4ADYCv3rSkunnF/Sz+U0n640wARQBmAUj+Z0L8Wf4tAA5WM7cK
-						M+gzasqmh6re145jwW/HGQOHF92SAuB3R24F/hS++gzoOr38B9AaFNzFgyczN62kB8MjJP6IgG6wnD6EbYYAR39B6rsdAIQPAI4ADQA/
-						C2DybwEALAA4Akj+zy0EwLddAACbAQgRoAGAzcA+AkoBIBFAAbBKCAGgEWAbgd/+5b/UAqB0DKgPgLX0AM0DIERAFgBJBOgSIB8AOBbU
-						IiAEgEaAD4DS7cAhALIIKF0MVooAuxMgBACgB6bdDVCMAJJ+iwAfAmEpUBYAPgRsFiCGwAccAGEWQCMg3Q+AAJAIWPzwu9VkEvtaBLgQ
-						8AGQh0BTBNSPCyXuohDAkqAkBDQCWobA/kBTCHAMhAiIIcB7BPIYcCHQURBkIVAPApJ+t4G4RCkGjESsGykFQenHpbQS+k4o/ZyJ0LeE
-						hD7HJD/wUI3Vu56oNj3zYUH8IxspAJhM/Dd4ngUfV+sef5+DYO2jb4n0Ny71+UjIxJ/l3436Axv19/IfRv6zJT92rn+7APCj/jby78Vf
-						5D8LAGImvY+C/BMm/mDK0m3Vyi0HGuQ/ir/xi9/+kc/9r63516U/Xv6TpT8q/xwA9DkI4tKfKP4s/xj5D6P/+GzV0X8S/7D0pyb/svyn
-						fuqPk//tr1RDMADExNH/MAOg8u+X/iAAbPmPl38e/SdE/tMAsNF/BEAq/xIA6dKfKP8cABoBXv5l+U86+m8BwPJPyLn/Uf4tAFj+NQBs
-						A7DIv5sB4NF/CQDIP8PyHwOAl/9oAPQNJwDtEfl3JwCd6gLgG3oCEALgxBYBAPlvCoAv3w4kAL6I9f8uAP7BlgBxAMR9AD4A/p7+/ms3
-						LyeW8V0ACIHvTdnMewB4BiAgAQDpn0HyzzQEADi/awGf918CS38CrU4DGjD0FNXUI1+f1FefAcMmFV/8NmDzLy7/+j4xcdfLfDLKUpJ6
-						oyT8KST+GgBY/oN1+Yn8dxAAFgEWAKdOpwDAKUB8FGg6C3A6IkAD4Iw5LgBsFkADII2AcgDUlwHJfQBhBkADwEfAJRoBFgC2ETjdDPxs
-						NYA+FH/5h39L9gD4ALAIyAMA508jAEAeAMCOA81PBAqbgTUAJALiaUB5BIRlQBoAgAPAIgDTzhYAIQJI/jUAGiNAA2DCHrkZOAkAzALQ
-						gzNeEJZGAO8FIOGvRYAGQPF+AN4UrMeCughg+dcAsAhYZJA8cAiQWEgEfMjM3fVsNYnkH3AIZBEQjwptEQK2HMiFgEVADAFdEtTNEJhv
-						aAQ0x8ABJg2B9NSgEAMk/UYaA2kIhBgg4feUg+CRMvRAaaIUBJ6igH8S4L+VsZJ/fd1A5b4u+c0s34IbnCN37n2O1/qb6G9qpC7/IQBY
-						/CN+jT/LvwaAX+YD1rZb45+QSj+Lv5P/5JQfBICLAC//MvKvAaDiH+TfCPKv4k8sIvE3Zm97QsTfjfpD/MHkJfLXX/zqdyT4zeIfoEC4
-						k36tEgBO/gkb/Tfx90t/GuVfb/v18h8CgLhDAyCRf3wG1+Q/DQDIvw+AcOOvC4BE/onixl8EAMEzAE7+gS39kUu/JACC/BPJsZ9KvvQH
-						AZDIvwaALf3hAID849ZfvvnXj/5LAMSLv5z8E7z2n5f/xNH/84sB8HD1zTlx9J/vANAAOJOX/2gAhOU/e6s+FAC9JyMAAOQ/BoCM/msA
-						jI0BAPmPAbCV5D8GwFHD9QSgLpL/oXfLBmANgH9yAfCPCAC9BwAB8Pd8BGgeAHEfwN9es5A3AvsAOHHwSpF+2whMoj+NRB8RMJ3+N0b/
-						LQBm0D9nIP8MBQAxcNYmlvtOaNwMPKBrjGrqka9P6qtP/64Xii9+CzBtg+U/3yN+MHoRj4IufiRliedgiRgLd+x6jSW+HAAF+Qc+AEIE
-						1APAIiAPANkInM4CYAlQKQB8BFxAhFkAFwA+AhAA+TIgCwCOAA2APAIQALfSB+0v/yUNgOQUoIYAGE0PAQuA63wEaADcuDEGAOAAIPEH
-						FgESAK8yeQCUI0ACIMwCAA2ANALizcCGyX+IABcAFgHhhmBdBlQKAOwHCBuCXQT4pUAcAHkE8LGgQm0/gMp/6wj4MJwMBMmYeuf9MQJI
-						/JMIWNZZBCQhwDMBQhoCGgEhBPYySQi4AAghgE3CDTHgQ2CBRkAaA25ZkAf7BDQC0hh4KJDHAAcByX7rIHgkUAwCg6S5FfUgyITbYSJf
-						/3c85X+3W5C0d8LyrST0OZnsR+SknjUHXi5Lfyb5nlz2jbsT6qP+Qfz1ZB+RfxcAKv05d4InDZX+BvlfGWiWfhb/bNQ/kX+iSfwXPvIe
-						b9qdt/dVkX/CxN/kn1m8tXrqxbdI8NvIv7LvtX9uIf8SALn4N8o/0Vr+3+hQ/m3JZi7/r0T55+U/Qk3+ibr8SwBA/i0ATP7Tjb/x5J88
-						ALz8WwDEYz+fYfjkHyf/P6Fn6I95MK0eALn8WwCE9f8q/yEAsPZfT/+B/AORfwHybwFwjgsAWf4jASDHf0oAiPwLEgAyA4AAgPxbAHwD
-						y380AHj5jwYATgCC/FsAHMMBsJkD4OtZAHxlcAwAXv9PcADwDABG/zsLAJwI9PVblhMSAl+nEOi664DcCQD5x+h/AJJPIUD/fDqJP8D/
-						nrGF/jkxHdBn89i1B6peV4+uyT7cMaf5NKBhT6qmHvn6JL5O79/1P+HIpcIL3xKc4/q9WycyV8+/RwIgY4lHQyCNhPfonxEUABgFOCGX
-						/1YBoPJvSADIDMCptgTIRYAFwOlhGdCj1ZkaARwAGgEWABYB36IAAKUA4AjQALhoSQyAEAEk//UIkAC4lD7E8giwpUD4gEcAYBagOwGA
-						ZT4+AEIENASA3QzsI0COBJUAuM0FQC0CXABA/g2bBchvBx69SwLAR0C6IZjgB14aATYLkF4Oli4Dqp0KVAuA9xg7EShEgAuAPATCfgAX
-						ACECeCQRUADoJWFgwb7XqolLJADKIYDbg7sfAhYBIQTuFNIQkAjwIcAxkAWA0RQCIQZI/PMQAD4EQgz4TcO1GIgh0N0gAD4EcopBYJBo
-						d8pKR+n/b0vpv8+UR+w7pb30Azum86Fq3SNvqPDr+v6MkvyDfMTfi396g28m/qAm/xIAzef6WwBkI/8k+UYq/gQJv436p+JPwu8piH/Y
-						7FsTf5V/DYAF9N7Hkb0l8Tc27n60KPs5vyde/+mvQwCY+DP0+QVqo/4q/yb+Iv8SAE3yL0t/ovxbAAT51wBI5Z8+szH6H9b+x9t+Wf41
-						AGQZaJR/kMu/BUCT/OcBUD/2U278Dbf+svzLRZgSAFH+/dIfCwAv/xYAfumPrf3nk38QAICkP4z+6wlACIALXAB8ez4CQCLgPB39x/If
-						kX+CjwCVADhzxoHqjOz4z75T7xf5x/p/DYDTePmPBMApE1wA8PIfCYAT7hA4AMaQ/I9yATBcZgAQAF8bRiAAhkoA/JMLgH9MAmBl9fcd
-						BIBFAEb+j6IA+DoFAP562aztOvKvuKVA0y0AKAYE/DOR/2kcAY9U0zdTNN02qzqdBL8TSp5J/LdTBtz6/1BdPfJ1uL/69u+6uPCit+Wi
-						mydUF90iDN3wJC/hyUmCoCb/QAIAfw8RrwUAyX93A4AjQAMgXwYUTgIi8fcB4GcBEAB+FuBbQGcALAIQAGEWIAuAZCmQDwCNAL4ZGBGg
-						AeCXAlkAzH/o3SQA4m3A5QAAL338++oaEn5QmwVwAeAjIASARkApAPwsgEWABYBEQBoAHAG8DyCPgDfDLEBjBNADzx8LyrMAWQQAPhEI
-						OPk3LALCMiCdAUAAhFkAHwFELQBI/ON+gHoE2H4ACQGSf3dT8IyNBykCtjN5BEgIpBFQCwESf9A2BDQCehoCrWLAIqDjGPAh0EEQlELA
-						UwoCUIoBT8fy3bHIg8K/34LlTdQEvnOwGbcEft71j79Dkm+j/W1G/Euw8GdLfIyS+BNrDZX+IP6Kl34W/xbSD2zUnwNApd8v91kOVPxr
-						J/0Qycg/Cb+xKJP/GAASAQsoAOYTMzY8XE0uyP+kxVuYGSt2VL/9/R+L0g8g/sZv/4AlmfRZ5OWfkNF/CYBk5J/w8g/G02eiQAHgxV/l
-						H9iG3xAAXv5dALD80+c1YPnnAIi3/Qb51wAAXv7twi8v/2AQPVdY/l0A1OSfuGad4OU/X/4D+Y8BEOU/Xvyl8u8DwMl/vvQHAQD5DwGA
-						GQAv/4Sd/oMAON8HAEeABMC5ugFY5D8GwFkk/xYAp08zIP8xAGT0XwLg1CQAMPovASDn/9+j8q8zAAQCAPJvAfB1FwBfHbpeA2AdB8CX
-						7AQgBMDNpQDQk4BaBMAXrlvEF4Eddcvy6mgKgDNGrQnyjzsAZMRfR/0tAtoEwJVT1/LofieUPBP07T/0QtXVI1+H+6tPv67lpRe9FdjE
-						wQFAfOe2KdWM+9/gG4AXPWzUY2BRTf4jE+kDDsJfCoB26/9BWAI0LQZA2AisAQAsAE6fHQMgzALoEiA+DlQDAFgA+M3APgAudAHgZwG+
-						DzQAQDwS1AdAOgvAAXDns9Wapz7UJUCdB8CDb/6qunp9PQA4AjQAbtAASCLAAoCwZUC3btEAIBAA6eVgrwb5twDo8hGAPQAuACwCbBlQ
-						uwhAAKR3A6T7AWwmYMr97wg6C+AjAMhMQD0EEAGl/QASAHEZkI+AeDyohIDJfykC8L0+afkuiQCSf1CfDZAIaAwBjQALgWSTcAiB9MjQ
-						xhBwEZCHQB4DSQg0xEAeAUYeA2kQkPxnewZ8EJTkv4lSEBjpEqJmarJe+DGdkP88npr4A/r1d0pJ9I2l9LoJD9DPe7C6+8n3M/nvIABI
-						+OOIvxN/EvoSufxzAKj0B/nPhJ/JpD/IP8il39b561p/E/848t9a/Fn+6f1o4h9G/rMAMPmX97UGAL3/5+x6QQIgiL+xpZq4SHjt7Z+2
-						lX/jbvocT8/6V/l34h8DgKQfqPzLiT8xAMLov4p/cuQni39B/omS/Mvof5R/PvUnk//bMRDk5B/ETb/CTSz/GFiKAZDLvw+AovxrAKTy
-						jyVAsvG3KP8Er/2n56nJvwXAxX70P8h/DAA/+o8jxy0ARP4fJfkHEgA8+q8B8M3ZcQaAR/8RADMh//slAHgGIAYAj/4jAPj8/xgAkP8Q
-						AHz+/06W/xPviAEA+T9uNIEAGKUbgDUAePRfA+ArvASIAmCwBADk3wJAbgF2AUDEACAKAfC31yzgZUBHawAce+uyaixFcRR/xEC6FCig
-						4j+NxH8q2AwergYv312dflWrs/47oWuh6uqRr8P89X+gF/ij+gveGpz9/52bxzMXj11ZLSD5X5jwbp08CBw4HQDy35MAkAiQADjFLgRz
-						swB9EAAk/6AUAGfNezRcCBYjwGYA4iwAXwjmI6BNAFgEcABwBMitwMACIMwCIAIoAO59+echAHgfgAUAkQeARcCW53/GAQAsAEIEYGRG
-						A8AiYJBGAALAIoAvdtEAuNVmATQCfAAMwYYxFwEIAB8BvBE4iQALgBgBvCHYR4AGQPGGYBL/ZFMwR0AaAHkEWAA07QeYpQGQRkB6NKgF
-						QB4BvBSoFgGELgWac88z1cTFMgtQi4Cl9dkAHwKl2QAQIgAgBFwExBDYwyQhQNLv4QgobRR2IQAkAkj+DRcDufwHNkTqMUDCn+NCQGJA
-						KIl/O0pBkJMLfOnHNJH/u60hiS9Bv8666NdZCsnPweuSsWzrI9XdT0T532hQACSy70nE3yDJL8h/XfgL0q/iX1/qUz7X3+R/FQjyr0d8
-						qvj7kf/GJT8k+8X1/vZeNPkviP9C937GyD+D2b8H3qH35/ZE/k38wYRFm6t7H3q24wB45NWPEvG3kf/ktB8969+P/McjP4WW8k+I/GdL
-						f1T+OQDayL9f+sPy7wLA5J9H/10EQP5BkH/iBhL9XP7BNeuj/F9Nwg8g/yEAnPz75T/JyT9e/u30HwoAL/8xAJ6sB4Bb/x9H/30APFZ9
-						WwMgHf0vB4Cc/iMBcPp0IAEgy38kAHq5ADgVAUCw/OMEoAkq/4wFAOQ/BsCxo7ZoAGyujqIIiAGA5T8SAF+mAPgSlv8gAMAtMQD+YVD3
-						A+BLNyypjrl1OYEAWF5du+jeIP/Y8OtH/5sCgCOAAmAaBQCOAz3rhklFj+yUvgOGvau+euTrcH71HjDk70oveCswVXPBTeP4BCBw7ZI9
-						1fwH36kWAJL/BST7nWJhgJH2wxYAQAPAzwIgAPrMlghAAAALAI6AhgA4DxGgAQBKASDLgCQAgCwBUjQA4jKgZ6ofYg+A4iPAAgB3ANgS
-						oHYB8OFvJABw+6UFwDU+Akj+EQDxNCCJAA4AEn67HRhYAHAEuACoRQAFgEVA2AzcMgLSewFsFiCJAJV/I1kKRA/KegTQw1oDoBQBIv8S
-						AIADwEeACwBj7oMSAHkIxKVARlwOlAaAQn8/ZdXesBTIIgBwALgIKIaAjwANgbAcyEMRYKQxICEQYkBPDPIhECKgsGE4iYE8BDQGFqw/
-						EEgiALgQKMVAYxAAEtt4mlDPosCoCT1OJGpH/u/klP4dpi703cELfitWbH+s2vD0hyL+JPat8Gv6c9YHWsu/rfX3S3yMZMSf4DX+TCr9
-						nmTk30m/iX881z+lUf7pPWfIZv2C/NN72Ajir/LPAUBMXbOvKP7GonV7OpJ/8O7Hv0rFH8t+knX/qfzzmv9E/A0Sfw2Amvxj9B+zrBoA
-						7eVfAgCbfk3+OQC8/BMi/3Hpjw8Ak/+w9Afyv+EFpjb6D/m3k3/WSgDko/8IgET+NQAu1wDwo/8s/4Qs/5EAMPmX5T9R/kMA0POZ5Z+4
-						KJF/4QKSfwsAln8NAJF/bP6F/EsAnO0C4MyGAOhty38AlgBpAJyiMwAcANgDoAFwYpgB0ADA6L8GwNG2AZgC4GtdCABwN8l/DACs/2f5
-						1wD4Apb/EMUAKFwG5gPg7+ivx9y2nC8DQwBcOGFDCACc/pOO/NPfq/hPNfln8ZfR/2n0OYkIuHjM0pZLfDrhtCsG/2fV1iNfh+urT/+h
-						15Ve7Fbg4gYEwAWDhK7Nz1XzSP4RAfMpAFohgRDBbMH0fW+x7B+OADjZzQCc6mYBOACABkDfhgA4uxYBEgC8F0AjgC8F8xGAEYVCAHzP
-						BQBAAFy8nOQf6AxADACJAAQA9gK8/s9/6GgGgCOAAgCbgGfuf7vDAJAICMuA6EPeIkBmASQAbsFDIAuAEAEaANgPYAEQIkADII0ACQAf
-						AWEZkAuAsS4AgA8AiwALAIsAmwVojoDyJWH5/QCzSf7nZAHgI4BDgCTCAqAUARwCJCNg/v2vVhMWbyM0AjQEJpH8g7YhQOKfh8CcTQ+n
-						IaBLgjoKAYsADYFkWVC7GKAICPcJZDHgQ6CTGGgKAlAMAqIUBKAk+z2hpxJf+jkZ/FoPgSWbHhA2pqzc9WS18ZmPirKfj/KnI/0l8SdI
-						8JtH/FPWAJL78qi/CwA94cfwwh/EHzweAyBZ8gOC9Hs+COLP8q/SDzjC6f0IavIP6D1sS35s2U+Q/wff5WOUZ2x70om/k/+FwvgFm6qf
-						/vxXLcXfM//BeNQny78GQGnNPwLA5H88fSaCuO5fLvry8m/r/kdpANTk30jkXyif+oPP/JcFln88DzL5D0t/4sVfsvGX5D8LADn5RwOA
-						5T8u/2H51wBIl/5A/uXiLwSAyT9I5F8DwMu/BUBd/p8M5/8jABL5p+c6AuDbPgBI/i0Avsmn/6QBcNbMB1j+gci/BEDfqTEAZPRfAuA0
-						FwAnuwCQ0X8JgLj8RwLgWJwApAFwlA8A3gMgAfDlPABujQHwDzf5ALB9AO0CgLh6QbgNGAFw0uAVfAGYRUDcDKwzAST+tu5/2lYZ/RcQ
-						ABIDV83exDf/lnyyU3r3GzpAtfXI1+H66tuva33pxW4FTv85f9BY5tu3TSPxfIs+5N52kOx3yAICl4gU5R8UAoDlv00A8H0A2SyABYBE
-						wKPVGUqIAN4HUA8AngUIAfB4WAbEEUDyD+JmYF0GhAgg+fcRILMAGgC6DCifBbB9AJB9ngHgCEgDwPYBWADYDAAeBFdhnWUhAiwAfAT4
-						fQC1AAD0MJB7AWIE2AwAAsDfEBwigB42tVOBNABsFqAYAQgAPOxI+n0EpHcDIADw4HQRwCNr9QiY5iJg2n6Rf09cCpRGAAJgTh4AhkaA
-						DwDDHw3qI2D6hkc4AJIIIGoRUAoBnQnwITBr7f5qyf7XSPT3xBCwCEhCIEZAyxDINwr7EKjFQBoCbWPAAiAnhMADCd0JAlAKgpT05KFW
-						FKW9Cfz4AuVfQ3dR4ffwHorIqj3Pi+w3nOqDALgbqOjnlJb6GH6kP474O54y6tLP4h+O9hTCiH8m/vUAkAhg6fc48ffSXxR/xa/3D+KP
-						92yT+DPvhgCYvY9EPMg/oeJv8g8eeea1ouyX2PLYGzX55wDA55mXfxN/J/9h5B/yTwT5V/G30X+eZTUK8g+8/INc/kGQf6z952eBBIDJ
-						Py/9Ieryj+eLBEAu/9e4c/9x429t7b8GgJd/CwB/6o8FQJB/FwBe/jkACMi/BYCX/1IAyOj/Y8no/3kuAM5xAXAWj/5LAJyBDcAaAH15
-						9H8fb/7tZQEweU91mgYAyz+O/+T1/zgBSAKA5V9PAMoD4JiRMQC+PjwGwFeHWgCslw3ALgD+8ZbV1Rdu6SAAssvAfAD8/XULJQCI44jB
-						q/alm4ApAFj+OQxsE7AEQAwCCQFsBh5Bz5lv3zyh6JOd07VatfXI12H6wvr/n9Vf6GYwjfPtG8fyHgBwyaR11dwH3q7mAZJ/4Z0iTQHw
-						g+VPtgmA1qP/eQCc7ALAzwJwAIRlQDIDUAoAHwHfnBcDwCIgnAakAXChCwCLAAQA7wXQAPgB0ADgCHD7ACwAfsw8y7L+K5X/EABEHgDA
-						LwGCwCMALAIQABYBsg9A7wTwEWABQODfB3wxmM4CxNuBdRYgiYDXmOReAA4APHh8BJD8awA0RoAGQDEC6EGZR0CYCaAACEeDagikswDv
-						MtPzCNAAKM8EUAiQ8PsQ8BGAW4L5pmCV/+IsgMnIw+9WE5burMbrTEAMgR1M2xCgCMhDYPHel6oVj9CvnWLAIqAeAvcFQgjcKaQxsDeh
-						fQzsC6QxkIZAEgQk/a03EKch0CoIjFIQJJBMd0IaArmMHwZI2LuDF/0Sdx54hQT/53E9fwOp9JdP9clH+43iiD/TfsTfL/Ex0rX+Kv0O
-						P+rPI/8k+2HkP5P+IP+A3l8+AFj8jSbxL8o/9v6I/IM5xGR6P5XEf5yyftfBouyXePwlfC458TdcACRr/lX8w7p/JSz9yeRfRv5F/NMT
-						f/SyL+DEfyh9doPapl8v/7r8BwHg5R8Msgu/AD2reOOvBkBL+dcACGv/Tf6J9NZfyP+zsvQnWf6T3voLLqVnai7/4PsaAH70X879x7Gf
-						2ei/BsC3wtr/gyz/QEb/fQA8xAFwZkMAhNN/EAB6ARgCgDf/WgCMjwHAS380AI4fEwOAR/81AI4CIQA2NAfArUAC4B9azgDYPoDmAPjb
-						q+fzSUDH3b6iOp4CAMeBztj+eDVj2+MxAuz8f0DyD+wUIEHkX3i4unDoHD7vv+SVndH1gXrrka/D8XVG/8F/W36hm8G1zSb/4LrlB6o5
-						JP+IgLkk/8I7dR6gCCgw58DbVS+S9MMTACT/PgCyWQC/D6CPbQT2EYCNwNksAAcAiT8ozgJgD4AGgJ8F8AEALADCLAACIIsACYBnqhE7
-						X2sMAI4AmwFwAfDOr/7I4j+QT1pIZwFwKpAFgEXADRoBCACLABwJKhGQXgzmIyC9HVgCIBwLqhEgtwP7CHiDHkoxAEC8HEwjwAWARYAF
-						wDgNgDQCdD8AiX8xAkj+gQ8AHwEm/xESf3cykEWAnwmYqzMApQjgECAJSY8HBR9WM7c/zQHgI0BCQCKgdQjsZCwEwIy77ieR+qha+dj7
-						1ay7H+SZgcYQyGNAIyAPgTwGfAgkMeBmA+oxsD8hiQF3ilBzEJD4GyT5TZSCwCjGQAmS825R+jmUovgbJO1B7vHra4G/dbnOA9VdD75e
-						YXOvBIBGAAl+0xIfsP6ZuLwnpyj/Sr7G38jFn+U/E/5E/A0SfS//raSfxd9t9C3KP+D3V/mMf+BP+CkFgIi/ovLPMwD0eTB140EVf5F/
-						E38wdv7GasrSrdXv/vDHovDn/OwXv6km3/tqIv88iIHPMhV/P/o/Tk/8ieJvlOU/LP1R+ecA8PJP5PIfRv81AEoXfiUBoPLPF34RXv5l
-						9B/PGA2AgvxbAAy0ACDptwAoy78QLv0i+c8D4FKs/9cA8PJvAWDyH9f+p5t/g/zrBuA8AM6dKwFwDlD5P3uWzAAgAFj+NQB49F8DgNf/
-						awCcpiAATnYBAPm3ADihIQCO4SNAJQC+PjwGwFf5BCAKgKEk/7wBOAaA3QEQAiDcBNwiADgC6gHwxRsWV8dTAJxAnH3H2hAAtdt/8fdb
-						EQGYEbCbgBEDJP48IyBcNmk1rx4peWWn9L1q8P9P9fXIV0+/+g4Y2q/0Irfim9eO5j9EcO71d1TDt70QAyAgwp9TCoAx9MFl8l8LAJL/
-						Qw0AvwzIIiAEwKyDIQDCLACJvw8AiwAEAC8D0gCozQIUAgBYAFgEcAD4CLAA0AjgWQCNAFwckwZA+TIwCwDsAXj+p7+rBmgA8AyAjwCS
-						/2vvJvkHGgEWAD4COAA4AtIAqEUAPUAkAkj+gYsAWwqURwACYERpFsBFgA8A4APAIsACwG4JtlmAWgRgFqBNBKQhkB4NygFANAVAEgF+
-						NsAFwCKSf4ClQJNX763GLZIIsBCYuJjkH2QRkISABoAPAWwSXrDzWZKsj0iuPqrmbX8iOS0oxkBnIZDHgA+BYgyECKjHAO8X4CAoxIA7
-						RagpCEAtBjqIApDHQIko7vj7DsG/l/y7Hvfjcuzfa0NZ+BV6LRZveqha++g7TvxjALRe6mMBIBFQEn6Qjvg74Se5Ly710eU9fn1/Tf5V
-						+D35Gn8Wf4PFPz3ecynIpV9pEv+w5IflPwaA3/Bro/4cAHiPMzLyP4c+CxAAM3e/rPK/ORH/wLyN1ZvvfVwU/hIL7nk6BIDMYBKZ+Ask
-						/4TJv2z6xSwpSAMgkX+/7j+Xfw2AovwTRfknZPkPBYCX/2zk35b/yHHTMQAg/3kAiPwTa0Am/xoAkH8LAJZ/olH+dfmPHflpYPmPnPoj
-						8g9E/iUALnQBwPJPyMk/EgDnuQBg+dcAgPyDMykAzphRD4A+dvwnAmBKDIBTsf7fZgB4+Y8EQFz+c091PC//kQA41pb/UAAcnQQAlv9s
-						5AD4Sh4At8UA+MLNCACiowCwWYB6AADMACAAThy8opq06WA1ExEQAkCYSf97JoUASGcDJADkfz9S3bhwW3XRLROLXtk5Q3+s+nrkq6df
-						ffoNu7P8IpfB8p9zWfyVW2dU0+9/k0fxS8x1IBJK4IPgEw0AjQBeBoQIcAEQjgMFbgYgzgKQ/LsAKM4C6EZgCwCLAB8AICwDwu3A9MGF
-						AMhnARAAWAq0kh58v/pjPQBsH4At//EB8MCbv+IAACEALAJ8AGgE+GVAFgEyC/CKoEuA8gi4DWgA3G4B4CNAA6AWAfSgQgAUI0ADwO8F
-						AHI3QBoBJv+MBUAWAXZBmEWA3wvAIeACIEaABEB+MlCr40ElAiAZMQA4AggfAIse/bCad/9rFADbmyOgVQhkEQCmrbyPv08QAAiBRfe9
-						WE11ERBDYHchBOox4APA0xwD9zP1GKgfJ5rHAAdBFgNGKQhAMQgMkuh2lGKgE7yo55R+fKQg8x2w8G4csRpZsuXhat2T77Pse1j8DZP9
-						ElkAhIu7MvFfE2gj/0C/52rSXxB/GfH/UHDiXw4A3eCbyX8IAHpPGX6pTy7/vEeH35d4f7YTf7y/Vf519N+YQO+zkvgb9z/6QlH2S2x/
-						8Dk38q/r/jPxt7P+vfwDkX/C5D8Tf5Z/DQA58ScGAMs/6IH8Q/xN/n0AhLX/NsOsAXBtQf5l6Y/J//M8+p/IvwuAJvm3AAjyb+f+uwCA
-						/McAyM/9x3NaA8DLf9j8+2h1HgKA4NF/DgAiGf2vBwBO/umjAdDbBcBpk4EEAJ/+owHwDRcAMvpfD4BjRgEKgFEk/yNcAAyLAYDlP19C
-						APAdAJD/u5oDgCOgewHwN1fNr75281KWf3Dz8j0s/Fj+w7MBHAIq/QykX7AIMPkHY9bsqy4aPK1Hy4B69x+2TPX1yFdPv/r07/pp6UVu
-						4syrRlTnXjeaZwHA9yesrWYfeKvInJwH6symMPg2CXWrAOjuCUA+ANLNwA+HAOiNACD8caAIAJP/OAsQZwAsAvhOAI0AngXgAHiSCQFA
-						4F6APAAkAiwA9D4AFwG2F2DbCx8XZwBKAWCnAO148efVgLUxAOIswAthBsBHAO8FcAEAwl4ADQDeC5BFgAWARMBrcRbAIsAFgEWABUBj
-						BNDDTSJANgSnm4JjBMRlQDEA8lOBQgTscxFAJBGQBYBEwHsBREDtjgCSBpCHAB8PSsIhpwPFAIj7AmwW4MNq6vqHOAAMvySobQhkAYBN
-						wnO3PxkCACzd92o1fdV91dQVPgQkADwxArIQWF2OACOPATlJSEKgHgTZjICnEASgFASgFARGMQgYnUmAVHeTstDn1OU9QP/d7pBLv7GE
-						Hp7rn/qg5Si/R4S/zRIfJ/11+RfuogBgnPTHYz1t9L+zAFjxeLrcJwi/w5/w46W/JP62t4ZH/rMAiEf0ivxbACTiD+j9bKP+NvI/2yDx
-						n/XAO8yUDQeL4n/HvA3M8k37i7Jf4rlXKCjueTGu+dd1/7n8hwCgz0Nb+iPyLwHAS38y+Qdxw68EgB/5ZwryPziTfwuAsOynYdMv8PIv
-						ARDlH+Ty7wMA8m8BkG/8LS394ZN/VP7l2E+Vf+KHLP8SACb/vPZfAwDyL+f+20y9jP5bAIj847LPGADnzkMAHNQA0NF/RgLgDCz/0SVA
-						fPqPBoDIPzHl/qqXBgDLv20AnhADwJ/+c/wdMQCOGx0D4OgkAOwOgI3VVygAIP8hAHQGAAHwBT4BKA8AdxRoiwAIEeAC4AvXLaxwCtBJ
-						Q1ZWP5y+VWcAjBgAYQZAlwIhBvIAmLHlkep7w+f1dBnQ26qvR7568tW7f9f/VnhxW4Lbf3GUkzFwyb5qFsl9iSQI9mf/W5l2/5ss8J94
-						ABAcADP1SFALAB8BuhE4jYA0AADPAPgIoAA4vxQA9AEELADkXgCSf8BLgOoRYAHw0Ju/rAcAiX84CcgCgOSfA4DANDwHAGHLgDgCKAAa
-						I8DJ/41KiAANAB8Btyo+AngfgAsAuxgsRoAsAcojINkUzPIvAVCLAHpAIgLSEHibQQBYBPgQCEuBXAD4CPDHgoYAOBADwCLAzwTMNnnQ
-						ALAIsPsB8ggIIUCyYhGAey8mLLknjYBFcU9Ad0NgyvJd1bKH30kiYMVB+r2s2c8RYCACjBACSQTEGEAEGKUI8FgEGHkMSBDE5UHFIHCb
-						iEuUgsAoBYEnREAnkLgzpf+vW5RlvokFDSy758nq7mc+iiP+JdlnSPZ1U29J/POR/pLwe7z0e+z7K6Uu/CCe6mMBkEWAjvYbS1n8DSf+
-						SpR+QWbXJADCkh8n/UH+VfprAZBt+I3y/w4z84Cyjz53FmypiT8YM3cDhcGm6le/+X1R+HN+9ds/VOPWPBDln7DRfxN/P/of5H+XYGv+
-						ZelPKv9h6Y8GQFj6Y+v+tzdf9pVv+gVe/gFu+vXyH9b91+Rfl/6Q9IOa/BMm//1J+v3SHx79z+TfB4At/eFTf0z+sfmX5B94+ZcAiPIv
-						m381AMLm3zj6/y0XACz/BOTfAkDkH5t/H6zOnFkPgL7TywFw6iQd/SdE/ndX36AAOGmcLv/BDADLfxoAx7gA4OU/7gSgr7oA+CcXAF/M
-						AoAj4DAEwN9cNY9PAUIAnDFyTTVzh8g/QsAv/eG/3y4xYLMBPgBmagBcMenO6nu39mwZ0KmXd/0vqrFHvg71q2//rotLL24TWP5z9jWj
-						+A4AY8jm56oZ+96KkOgbOBq0HUPow8fL/ycRABYBCIDTZkoEIACABQBHgAZAGgHxKFAfACECKAC+RR8mFgAWAQgA3gycBcD3lj4tEcAb
-						gWMAWAQgAC6lD70XP/p9LQCwEZjl3wWARQACAA+z/i4AQgS4AKhFgJsFsADwdwMUI4AeGrYXwJYChQhwy4BiBKSXg0kAYAQrjQCTfyNc
-						EEYPSIsAuyW4bQRoAJQuCfNLgvIQSAJA8QHgZwBCBBAhAiAeHAFAQyAIi4TAzG1PV2MXbq1FQNsQIPkHeQzM2nSwWkkyhggwsDQIm4Pl
-						1KByCHAMUAQYrUIAlAIgkIVAUxDkMWDUY8DofhSAUgw0kcp7a0r/fgL+291iX5Hlu54mycfJPa3Evx4AXvyD/AMS+3IAlJf55CP9Mtqf
-						8QR9rzGZ/BNR+iNhxF+lPxn1B1kA2DG6TPIeIuj9lSz5UeFn6W9a8gPpV5qW/PDIP4k/sAiYtP7BmviD0XPuZp5/9d2i8JfAka7JOf8A
-						yxyd+Ccj//S56Ef+R+16jcnFP8g/0cUBQJ+7Xv6JMPrv5N8u+/LyH478VPmX8/7xXIjyD/jUn5r8awBoBNTk307+4TP/6xt/EQCp/EsA
-						ePnnS79M/rMA8PJvAWDyH2YAIP+LHuMAiPJP8Pp/BMCj1Tdx+g8CgOQfiPzXA0DkXwKg91RD5J8DYPIeGf1HAOgMAAcANv/WAuAeHf2X
-						ADiaAoBP/wEUAF9zAfBlXf7DAXB7DIAvdBIARGcBsCAEwFcHLeYA+AYxdsPDMgsQlgGB+lIgFv8tQMR/Jv/vR6ob52+rLhk6tWenAQ3o
-						+o5q7JGvQ/3q23/YnOKL28Dp9AeGGYDAoEnVlL1vHHIA4MfjjX/YA4BkvxgAQAOg10wXABoBCADeB1AIgHPmxwgIdwJkAVCbBaAA8BHg
-						AyBcCuZmAcClgD703v3VHzkAOAJY/mMA+BkAHwB4eCAAwEAfARoAthnYIsAHAPABwPsBNABqEUAPDYkAPRbUR4AGQBoBr0sEWAAQ/nIw
-						i4BRu9IASPYD0IMSSABoBGRLgSwCLAAkAkj+DQsBFwC1CCAJkONBYwAkEaB3BNSOByXx8LMBeQCkG4M/qCat2sMR4EPAIqBlCGgE+BDA
-						HoElB97gCLAQMEmbv+MpjYA0BPIY8CEgMRCXBXUcAxQBnnYxYBSDoBYCnnIUGKUgKCHC3jmln6NELvmlHxPZl7G/Wrnv5Y7Ef90znoL0
-						K1H2VfgzEuHPSIRfyU/18eLP8g9Y+nW030Oi7+U/Sr+QjPqr+Ccj/yr+Jv9+qY/f7JuKv5N/Ev4w6p+Iv+FG/4kZ9PkwY9/b1fgVu2vi
-						b+zY91RR9hP+INz30HPV2C3PJAGAW369/Ic1/yr+Bl/0VZB/v/Sn+/IvAeDlnwPA5F8DQJ4LUf559J8w+ZdNv2kAyIVfUf7t3H+78IsD
-						wMs/4Y/9FPl/Jln6YwEQ5F/BEqCa/OvGX5N/DgCTfyKc+8/yLwFwHsl/CIA5EgCYARD5f6g60wXA6WH0f7+O/gsm/7z2XwPg5IkxACD/
-						FgAnjJU9ACz/GP3n9f8UADz6Xw+Ar3YRGgCQfwuAL/IdAD4AdBnQoQbANWkA/P0186tvDF1VnTx0ZTVoGT0PMAugMwE+AMImYA0ASL8H
-						ATCGPt9/MHRaT5cBTVONPfJ1qF/0Ij6ZvagtQbFhD4Bx4eiVvITHwGZg4a06JPvAx8L0fW/yG+/TCABgASARIAHglwH1nXMwBIBFwNkU
-						AKAUABwBvAQoLgNKIiAJAHwwSQBwBJD8+1kAwDMABJYAYdTfB4BEQH0JkA+AW7a+XPXjURYNAIsAFwDxRCB8eEsA1GcB3LGgWQTY5WAS
-						Aa8ydiwoR4ALgBgBEgDDSPwRARYCIQLoQWcB4COAlwFZAGgE+GVA8VSgQgRoAEwi8a9FQBYAIDkZiEQA+ACIewLer0cAyUd6PChofUTo
-						3D2vVHcskADoVgjokiAfAgiAGesOkHxJAEgEfEyyJiy89/lqSkME5CHgY2DGKpJ/0O0YSEMgj4FSBHhKQWCUg8AoB0FOcjTpoVCT+ENF
-						pN//HlYdeLVR+Fn6QSL+PyPJByr8JPklWP718q6WI/6O1YClP1vjT5js5/hlPiz/KvyeZZn050t+atKfrfW3UX8Z+XfHe5LoNy75UfEP
-						8l8IALkhXOWfPhNY/vmzgT4j9r5RjVu5pyb/YM6du8rS79EAeOWtD6tRy/dE+bcAUPG30X9/4o8t+4kXfVEAFOQfJGv+nfiz/GsApPJP
-						n+MIAKIo/4SM/hNO/sF1OPOfnivxyM8YALz2P5N/IKf+KCT8IMg/bv2tyX8aADz6X5B/CwCTf177rwFg8m9n/7P8Y/mPyb8GwHkaAN+0
-						5T/Y/OsC4MwQALr0h5DRfwTA/iQAbPPvKYTIfxoAJyYBsDMEwLEuAI7S5T8AG4AtAL4ydEMMgMExAP7x1kMJAKKDAPibgfOqEwav4AC4
-						dMaWIP6yBAjy7wOARD9Z/iPiz/BegIerH4yYV110y6FfCta7f9dB1dgjX4fyddblXf9XeiH/PX9hW5EHwJULSBh6EACT97xZnUwi3yj/
-						oBAALP+gRQDk8h8CICwDogAgQgAADYB0FiAGgEUAAiBEAAJA9wEkewGABgDIA+B7fhmQRoBtBB5AH5i/+eO/Vb8magFgy4CyAMAlYJB9
-						BEB/IokA+lC+SuXf4NuB+UM8RkDcCxADII8AuxxMIkBmAPzdAMAHALAZAASARUBYDkSMwMONR7d0Q7BGgAWARQBOBJK9AHpJmAZAvjE4
-						LAUi4bcASCKAHuiYBUiWAuUnA0EIFAsAmwHw2CyAjwAfAPNdAOQRMGXdgxwBFgLjFlIAgHYhYBGQLQtatPdltxTo4wTcHDyV5B57BkoR
-						gNOD5AShNAZCBHQYAyBEgJHFgFGS/1aUgsDwEh3AP/eQvHcP/Dsk6fT3zeD/7z7Jr9Ox4v6XRPYzyW9FHgAs+yUoAO5iGoSfZd/jxJ/k
-						3o/yB9xIf5D+TPz9Uh/GSb+X/3TEX6W/IP9xxF8CgJf7kOQX5Z/es7bZt3HZD4t/PQAg/sLbgUn3vFBNWPtAdceyXdUYet+OnrOhGjl7
-						ffXRz39dFn+g8g9++/t/qcbM30zS/7rOZEb5D8t+IP5KXPOfBkAy+q/yn2/6Tdb8uwAw8Q9LfyD/Wxrkn7iRng3AxD+57Vfl3weA3/jr
-						5Z83/Rp3SgDY6D/LP6jJP07GkwCA/OcBYPL/g0z+wUWEl39wgZKs/Tf55+U/JP8aAOdoAJw92wdAPP+/rwYA5N8CoJff/FsIAGz+Zfkn
-						TP4B5N8C4JhR5QD4qgXAsA3VP7kA+CKW/2gAhD0AugzocAYAlgGdQgFw9pg1vAQo7gEwZB9AWAako/6C7gFQ+k26s7p06DReVl5yzfZ0
-						/Wvfq676H1Rnj3x196tvvyEnll/YMviDQgBgGZBx87qnq6n3v8FMS4hRENhHYZCBD6gTJrcY/QdNo/+gmwHg9wGchn0AGgAhAigATq/N
-						AlAAzBMsAiwAOAIsAPQ0IJsFsAAIswAhAtIA8BHwQ0SDacyBAAD/9ElEQVQAfeDdTMKdBIBGQKsAeOVnf6AP1ucZC4AQAbwMKA0Avh2Y
-						Psx9BMixoC8zCIB0FkAiwO8FQADYMiAfAbggzAfA0O0aAC4CfABgTwACQGYBXAQQthk4iYDdEgDABwCYiADIIsACgNFlQLYUSCIgHg2a
-						LAeCEFgEkETkswBgjo8AIs4ClAOAI4BAACx48J1q3OIdMQKIEAEtQ2AHk4fAlFV7ePkFZgL8fgCbDVh+kH5va/ZxBBilCMhjIJ4cpBHQ
-						EAO1IKAQAEkMFKJg9l33MyXpb0cpBnJY/rsB/zsFOa+R/Xud4o9LLcEREAS/YU1/EyXxJ+4CrQIgSH8aAH6pT03+Cb/Ux1hmOOnnNf5M
-						Kv0eP+qfn+3P8p+IfxoAifQ77AjfJvE3fADMAJn4T9snTAX3g7eYycrT7/+2+sN//d+b+dfI6ic+FPEvrfk3+XfiH8/6F4L8O/Gvbfql
-						z+BSANxekP9bSf5vdvIPIP4s/zzyD1L5v96t+0/lXwKg9Y2/EgCQfxDkf3UMgJr8r2wh/9j8awGg8s+j/xYAKv8y+g/5x/NaA4Ce5xYA
-						51oAhNN/HmH5B2H03x3/iQDoMw2Q/BMi//dXp7kAOHlSDACs/bcAOGEcAkAiII7+xwDgzb9hA3AMgK/oBmAOgMFAAuAfeQNwUwAQpQC4
-						IQ8AiYAkAHgjsATA310znwPg1GErq4kbSeg1AGYhAjw6ExDkf1sMAIuBQfSs+3HXdD5JsuSbndB34JBjVWePfHX3q2+/oTeXXtQmEACe
-						3lePoQ+s13gPAJhqcBC8GZiyNzI1A2sADzkAnPzHACD57yQAOAIkAJJZAN4HkEbAWXMeq87SALAIyAPAHweazALoMiBgASB7ASQAbDOw
-						RQACAGCEB/JfDABbAkT4AHj0nV9XV1oA5BGAZUDrXkwiwG4H9hHAx4JukABoigDeC8AB8Cpjy4BCBGgA+AhAAIRlQBoBySwAHmp4uO2y
-						pUACAiDMBBC2FIgDQCNANgNH/A3BIQKIUgDECJAAwNGgIJkJIPKZAIsAyD9D4u/3BEgIfMAgAAwfADYTMGPb0yT/WxSJgKYQSGLAhYCP
-						gXk7nyUx+yiQhgD9MxKzWRseriYvixHQSQyEk4MOJQg0BNoFgYWApyT93SGPgcNDXdp7DH6tBv3vlftfrQVALvrJ8p6MKPvCnQki/XXh
-						j8j3C0k+8MKfQwGwnNGRf8XLfwiAbOQ/FX5hEb03hDjiH5f7pMhMG0l/IQCi+BP0vvXiz/JPROkHKv5ESfyD/GsA8D0jkP+9wtbnf1YW
-						f8MFwL7XfxHlXwMgLPlR+Q9r/p34J/KvAVAT/yD/pfP+LQC8/Bc2/Xr5Z2zTb5R/cK0GgMn/NSz/OHhCAqBR/gmT/yu8/Nvyn0z+fwT5
-						J5KlP17+dfOvv/EXyOh/lH8A+Q8B4OTfAkDk/2B1DgXA2bMlAM5yASAn/8j6fwsAyD/D8i8BcCoFwCmQ/ywATkoCIC7/EfnfUR0zGvJv
-						p/9sFfknvuYC4MsuAHAC0KcVAH8zcC4fB3rasFXVLcvps3yHCP+s0kwApN8IswC6FIgCYCQ9Fy4dPqP6zs3ji77ZCb37D71BdfbIV3e/
-						+vTv2lB6UZuA9Pv/ffbg+dXkPW8EpgCNAS/9njwA+Pz/TzkA7D4AvhQsjwAEgEaALQWyALAIkGVALgJsHwACwEWA3wxsAeDvBbAASE4E
-						0gjAyFJ3A+C+V3/BAQAsADgC6ANZbgd+MYkACwAfARYAFgG2FKgWAfQQsQi41UcAPXTsVKB8JgAB4CPA7wWwAChfEFaKgDgDYPsBkgig
-						BzLwAeAjwAeAoAHgIsAHAMPSQPKfRADJhcp/PQI0ANxMgOEDAH8/fvnuYgS0DQGKgDwEJi+/t1pBcrXCR0AhBObteIojwEhiIN8roBHg
-						lwa1jYFaEOxh8hhoDAKiFARGSfYPlZqMtwI//hDxNym35/5q1YNvkOy75T0KBL8lKv0i/vWR/sZTfQj/PeLF32On+hgIgFz4WfqTdf5C
-						GPF30h/kH9D7wQdAPFHLS38kEX96P4JE/kEWACz/gN7XYckPi79b8lMSf0LEXzD5x+VemF0oij9w8v974tWf/SEJgLDmX8U/LPshgvx7
-						8Q8BkMq/BcAQfO7y568Tf6Uu/2kA2NKfRP6JMPqv8s+j/4SXf5DIPwl/Uf715B/IPweAyT8B+QdR/gU+9tPJf3LsJ2D5p+eryn/c/Bvl
-						X279xbOaWGAB4OQf6/9Z/mMAQP4lADD6b5t/hT7TIf8aAFj/rwFwahIAJv92+s+9Iv8aAJB/C4BjRrsAIPm3APiaBsBXuiD/GgBDSP6x
-						AZgC4B9vQwAQ3QgAOQq0+wFw1M1LqtO6Vlc/mbWtmrXjcZb/EADKLAoAj4+BcBzo5keqHwyfXf1wyJTEK7vFgK61qrNHvrr71d0LwHK+
-						N3lDjwIAPw7S/ucIgFNJ/i0ALAJwKzCwALAI4ACYm84C5AEgm4E1ADQCEAAXWAAQtgzoIr0dGAFQjAAKgIUPv9s+AH6XBsDm5z6urrhL
-						AsDPAgCZAYizAMAHALguBIBGgAWAi4CbChHAAeAiwOQ/RgAFANgRIwBHgjIWASr//oIwCwC5HyCPgLeqOzQAmkJAIiCdBUhmApIQeJce
-						7i4CiGQpEMmC7AloOB4UklELAMJmAbIQCDMBJDwLD37IG4LHzN/CWAR0FgIxAnwIzN76BAdAEgFO7Ez2Fu5+MYmAJAYoAowkBggfAqUY
-						aB0EEgKtggCUggCUYsCTy32JTjcjp+SC3j38JugEnvkosYf+PYqAh99KRvsbR/yZj8LlXTXxJ+Km3jq21Kcm+8DJvpd+5jHIfz0A0mM9
-						If4GyX42+s/i70hG/VX8/ai/l34W/wb59xd7mfgbXvz9Zl8fAF78MeoPRPwNkX+73ff9X/+ppfgbv/njv1cT9tDnGH22sfzvMgpr/kn0
-						jSj/rzJdTvyNIYA/dzUATPxx1r+e9x/FX2D5J8K6/4L8cwA4+Qe5/GPpj1/zjwDI5d/O/fen/gT5D8t/Uvm3S7+8/NulXyz/GgDf1QBI
-						5F8DAPIPZLmuBEA49rMQAGfz8h8JgDj6/2B1ugZA3+kuAMLm3xgAp0yKASDyv7s6iQLgxHEIAOA2/7oAOFqP/0QAfN0FAK/9twAYGgPg
-						i7e3CYCb8wDQCGgbAEQhAP7xugVVLwqA88auiwGAv+6QpUDMtjwCDgbiMqCD1WXjl1eXDZ/By8lLjtmervdUZ498deer71Vd/5/yC9o5
-						A5YcqCaR9Bs+BpIoMEIcCF3bX6mOh/z/OQPAzwLMcgGgEXAGyf+ZLgAAHwnqI8AFgEXA+bwMiCKAxN8iwDYDhwDIIsAHwJ1PflgLgF8U
-						AsD2ASAAVj/xIQcACAGgEYBNxXkE8CyACwA+FchHAIl/mAXQCKjtB+BZgDQCbBlQRAMAMwEUAXJLsM4CGPSgG+4CgCOA8BEALAAYLAVy
-						AWARMB6ECIgBEEIAD3AmRoDcDUARoOQRwCFA0jBDAyA5IpRFI42AEAIkK7IxuB4CFgESAh9Wk9Y8ECJAQkAioH0IbK+HwNKd1dJH3o0R
-						QILniTHwcbXkwOsk+btJ/O1yMRcDWQh0EgMdB0EhBoxSEIBSEHjyGPD7DDxFEW8CP75ASfKbKP68AD8X/b5aMWft/dXqg+8Upd+IS3zK
-						4m+k0q/r+x25/DcFgMl/vs4/iL8R5F/X+Hty8SfR90t+vPSL+Ddv9OUbulX6BRX/gvwn4l+Uf+wJcqP/Kv5B/gF9jvgAgPwDLMPMxb8U
-						AGA5vQZx5B/LHYGIf1zzH0/7SUf/dc2/E39e+gP5J2wJph356eUfRPFXnPj78/5N/EX+JQBq6/5V/Js2/ebyD6L8SwAk8u9v/FX5Bz9E
-						ADj5B0H+dfkPAsDLvwWAyX8c/afnNS79IpLRfw2As+nZjwCI8v8Qy78FAOQf9HYB0EsD4FTiFB79B3L+v8i/DwDMAED+d7L8Axn91wAY
-						GQOAR/81AL7sAoBH/zUAvtjTAOCjQNsEAEfAXGIOLwHqTREwZQvJvcp/ugQIIRDlv74USGYBrpm1obpsxMzq3B4cB9r78tv+X6q1R746
-						/eozYOi5pRezYwZ0Vbdvfr5HAXA1fUC0DQCS/08qAIAFAEeALgHyy4DkYjCKAASAmwWwAOAI4AB4grEION8igD6IQgCECHiqusgCAGgA
-						AAuAbS/8rDkAiDwAwEJ6QFoAXOkjQAPA7wUAYS+ACwCJAAsAtyFYQQDI3QASAHwqkI8ADYA0AtILwmQmIIsAngV4I4mAeDdAjADcFOwD
-						gPcDuAAAPgD4kjC3IZixhzijEUDYhuA8AiwEZCbgvUCIABIOIwiIDwGSl2IEkPjbbACWAc1/4O1qDEn96PmbmXYhEGLAzQb4GJix8WC1
-						XAPAUzsliMRxxaPvVdPX7ncR4GKAIsBoFQJGt4MgWSYEuhcFoBQDRUi4O4Z/3kgeAJ2Df7cAfs4C8t+7L2E2ZgJcBMhov4h/XOrjIiAR
-						/Tr+8q6a8DvR9yz36/s9RfGPG3uD/JPk55j0e/nPz/Vn8VdKa/15vT8g2feY+LP803s3X+4DpoNE/A0SfpX/ZMmPQZ8jNvLPAbDnTWbj
-						sx91JP9gz6u/EPnXAACJ+Cu5/Ms5/4V1/5B/+rwNS39U/m/P5F/O+vfyLwHAm35Lo/4Gng25/BNe/v2Z/5B/kMu/LP0x+ZcASOTfBYDJ
-						/yUIgLDuX+Q/jP6T/FsAXETPWC//gE/9UfnnAKDntQWArf0P8k+cw/J/sDoLR39mAXC6Ekb/wdT9Iv+EjP5bAMTz/0X+d1cnjic0AI7n
-						0X8JgGPHSAAcHZb/4Pz/GABfxfp/DgBiaAyAL/IG4FIAaAR8AgHw1wPmVMfftrzqM3x1NXT1vjj6n88CtAmAWcTt9Iy5bOTM6qKbD/04
-						0D79us5WrT3y1elX7wHDhhdfzE65fkI1YffrPQoAvGkPVwCI/LcOAJZ/kAeARcCsR8I+gBgBeiSoBQBhARAiYMFjIQAsAvIAABwAi58K
-						ARBmAVwE/AARQB922CTmAwDkASARIKP/CIAp+96qBQBHAH0YSwRkG4IbIyDeC1CMAHpo5BeEhQgg8a9HgARA4wVhugyoGAH0UEz3A8hy
-						IB8AeQTwUiCVfwuAJALoAR4vCRMQADwTQA9/wwdA3BNA8g80AvIA4FkAhuRfNwfH5UCCl/88AqZvebIaNU8CwEdAuxiIEZCGwKIH3qwH
-						gBICwCDJm7350WrS0p1MLQZcCPgYKEWAp+MgqIWApxwFoBQEOcUYaCRK/5+HVP5n0u8fzF67r1pNoWbyfydIxN8gya+N9gscfviz5++B
-						uvzLkZ45rTf3svzzSH/c3MsbfAvSL6P9JPvZsZ6ePABY+j1O/Fn++f1Wl34WfyMLgBlKHgDhpnC37CcRf6Ik/mACgUvE2om/8fLHvw8B
-						wMt+SvJPxFF/guVfz/rXACjKf1j378TfoM/uEAAs//RZrgFg8u8v+vIBcC09KzqTfwmA5MIvlX9wuQsAO/Pfyz9I5V8CwMs/B4DJP/Fd
-						ln88Y6P8WwDU5d8f+1kPgLMw+k8BcOasGABB/mc8yPIvy3+w9l8C4LQpEgCnTI4BYJt/g/xzAMj6fwTAcS4AWP41AI7SAPjaiK0i/7z+
-						PwYANgAnAcCbgA8lAIhDCICv3Lio6ksBcPXCndXsHU8QhWVAWQDI/9alQBoAE+4+UF06fDYfB1r0zA7o3X/oENXaI1+dfvXp37Wl9GJ2
-						yrdGLq8m3UcBcB/Jv4dEv10UGKfPfqSjAOj2JWDdCICwDAhoACSbgWfHALAIsH0AIQIKAeCXAaWzABIA39EAyJcCIQCwFOjJ937TEAD/
-						VgyAj+iveIhcTh+2FgAhAugDWSJAAsAiAAFgS4HSCHipupYCoDECdBZgkAsAw18OFiMgBoBFwFAfAST+jRGgAZBGgO4HIPE38hBAAIzT
-						APARkOwJwMOcH+r1jcG1CCB5kKVAGgDETEABwDMBGgAWAXxCkM4AJBFAhGNCswBgKA7GLr2XIwDkAWAUQyCZDRCmrXuQpO2jZCbAAmDl
-						Ex9XK0n8gQ+BuTueriaR8FsIdBQDREn+S3QUBKvuC5SDwChHgVGKgSL4sUQq4ofOTIh7E/Tr7j67mdnrDlSrH/+AJT+Hpd9jwu/gJWDh
-						z1+kPz/Rxwhr/CH9mfgno/3ALfMJI/5GFgCy76Ug/Y64yTdKvyfMtCn5pV4m/3Z6l530M8PLvxP/afSeB4n8E+mof9zwO5E+X4Qo/+MV
-						7AMoCX8O9gFgA3C65j/KP/Dibwxj4uh/Lv5R/gsbfoETf5N/cOOmKP+lALiO5Z+eERYAJP4gHvfp5Z+eNyEA0pF/Hv3XALhslQRALv9y
-						4ZeXf8yOk/wTRfnH8h9+vqaj/3zqjwaAl38LAF777+Vf1/4jAM7k0X8JgDM0ACD/IQB0828vFwCnsvwDyL8EwDeSAMASIMj/ruo4DQDI
-						fwgAPv5TAuDrJP8WAF+xABi2ieRfTgBi+f8UAuBvOQBsH4AEwN9dPY8D4OKpm1T8003AOAXIhwAHAIt/lH/8PWYCfnzHouqKkbNqh8x0
-						g7tVa498dfpFAfBB4YXsmB/NvKdHATB+9+sk/g+I/H+aAcDynwZAiAAKgN61WQAJAB8BZ2cRgADwy4CAbQS2AACyGZjkH5D0N84C0Ifd
-						az//QwgAi4BSANjyHwQARuARAMACgCPABYCPgKsQAfSBHvYDAI4ACQBgS4EsAiwAJALqAcCbgjkCJAQ4ALamAQA4AFwEmPz7CLAAMCwA
-						/G3BNhNgESAXhVkEvJ1EAIeAC4AYAbopmB7+dkSo7AmI+AAwfADkIcB3BKj85yEwD2gE8JKgLARm73mlGjVXAoBnAzoMAY4BigDDImDB
-						/a9wABhJBLAYpgEAFu9/rZq8YrdeMOZiAGGQxwDQCPCU5L9EKQhAUxC0jwKjHAVC+mNn0j87XOQ/d+dgFqQA38gcmb1eIqBplN/D0u//
-						vBNcAKj0p+IvePH31APgwyj9Dr/OP558lYk/vReMeLoPiNIfRv2d+CcB4CKgLP/0/lXhD+IP6L0u8p+Kf1j2o+KfrPd3AeDlHzf7Yh9A
-						Sfjr/DtF0Xv0WUbynwVAsuxHxV+W/pD8q/jz6H8u//S5K2v+If9pALD8Ezbyb+Ifz/uP4p8v/7mOngsIgFz+efSfMPkf6OWfl//ITb81
-						+SdE/p+tfpLLvwaAl38e/W8l/7r23weAnfyDADD5t4u/zuP9e2kAyMk/FABzIf/1AOg7A5D86+k/CIBeGgAs/yEA9oYAgPyDMPo//t4K
-						Z/9bABw7RgLgmDE7VP63V0e5APiqLv/hACD5twD40pBDCICbDl8AgNOGrqzOGbMmCYAo/R438u/RGBg49a7qylGzq3OvO9T7ALreUq09
-						8tXJ1+n9u/6n8gvZOVeveLiaSAHQjAZBFgcWALdsfrE6/rMWALwPIJ0F6IsAyCKAA0AjgGcBdB9AshcAEWABEGYBEAEaALoMKI8A3gtA
-						H3g//e2/JgHApwBpBCAAsBE4OQaUuIo+mC+7UwLgCh8B+EB2AQBwOZgEQIwADgCOgJeqa3QGwO8HAD4AbtwkAZBEQFgKlEUABQDPBGgA
-						hKVAGgEyqpVFAGFLgWwmwAfAKAsAFwHxpuAYAj4AxmcBIKQBkEQAIEmw2QDbEBxmAvIAYN6nCBDyAAgRAMFhSPwNFwKT1j1EEbCJQQAY
-						pQgwmkJg8uq9JHJpAAQgiA4fAcsfod/znfvCTcOGRUBjDNgpQocYBKAUBEYSBqApDvD37UgEvKeosDeRiXxHrLy3yJy7H6hWPfFhUfgD
-						9OfbifAn4v+YIKf6RBLZd8STfSD/GgAk+H7En8WfvqdTUulPxB/gPcKk8u83+9rGe8Et91FM/Fn+VfhzvPTXxN+d8Z8s+1Fw3wjknwOA
-						Pm+Mjc9+XJB9z78Hdr38zyz/+Rn/9TX/qfzHZT9x1D+u+fcBQJ/BufxzAKTyb2v/i+LPs8K67p+eGSb+Qf4BPWNE/lX8GZF/UJN/Hf2X
-						tf+Z/BMY/ffyD3L59wGAC798AJj8Y/mPbfrlYz9V/vMAiPIvy39CABAy+i8BwPIPePRfAuC0KT4AIP979ex/CYCTJiAAgJ7+kwUA5N8C
-						4CgNgK+P2CZr/wmWfw2AfxqG5T8WABoB3QiAf2gXABwBnQXA8bcuq04fuboav+GhKPuIAS/+iu0ByOV/5rZHqhvnbar6jZ5dXXhTD+4D
-						+HHX/1319shXu6++/Yb2Lb2IHTNgeDVky4sF6fe0DgBs/PksBQBHAJ8GlEdAPQB4GZCPAOwDCKcBxQDgpUAuAiwAOAIQAG4vgEXA9wnc
-						BPwrJ/9pAMgeAAsAOwr0g1//iT5Yn5MAIBAAIQLog1n2AsQA4GVAiAAOAImAMAuwXgLAlgH5CLgBDwoXAIPyCNAA8BHAS4G2tYgAerBJ
-						BDTdDyAREJcCxQDwR4MCXgqUBYAcDZrOAqQzAe/Qg53IZgHyCLDlQDECSCxI+OsRQPKvERBuC1b5twCQ/QCyKbi0OXjeA29Xo+dvq0Zq
-						BPCMANFJDPgQsBiYt/ulahkEj0TQkweAREBkxWMfVNPXPVhNWHIP0y4GYhDsSuhpEBilIPDU4qCBYgwcCj2Uf/n14JK1zpmmzN10sFpN
-						f4Ze/OXPkES/1Yk+QKU/iL9SOtUnjPaT4HsS8T9oZOKfyX9Y6uZG/k38g/wDln+8V5z4l+SfRD8Z9VfhZ+l3y31qp/yQ7Ifz/Un2DRF/
-						lX8NAC/9UfwFL/642RfMpJ+/nfgbL370+yD/IzHg4cSf5V8DIBn1N/nfrpd80WesiX9Y+gNY/iUAgvi78/69/IMbNABM/mXTr8o/4Y/6
-						NPkPo/8q/7zp18hG/03+eekPETb+5vJPXJLJv9z4S9KfBUCQf0Lkn56xTv556Q8HQLz1V+Q/BkA49tMFwFkaAGfMigHQZ6aN/scAOI1H
-						//eL/GsAnDxJAuAbFACQfwkAHf2nAID8g2PvgPzL6D9vANYA+DqP/ksAfGW40rWZT/9BAHxpSHcDgPgEAuCrNyyqzhh5Z3Xrij1hFgB7
-						AWaT/AOI/2yldBzoLJJ//LWLPsv6j57To/sA+l7ZdbLq7ZGvdl+9B3TdVnoRO6X39ROr8fe+VpB+T+sAwBszBICK/587AORmYAmAuBTo
-						0WQZEAibgQF9kAALAIsAHwAWARdwBDwpEWABkEUAAgAfql7+8wCwo0B9AOBiGci/BYBFQAyAFxgfAGEvgEZA2AuAAHDLgJIIIG6gh4ZF
-						AAIgiQB64OQRYAHQGAEaAMVLwujBWI+ANxkLgLAnAAEA6CEsEeA2BbsQsL0AMQLeYRAAPgJCCNADXWYBdD9ApyGgswAWAbUQINnPI2Ae
-						yZHNAkzb9jQHgGER0FEIkPgDi4AJy3dLAATqMwLlEMBswEfVnO1P8dGiFgKlGCgFQR4ChkVATkn6O6EUAyXyEOgOpQCYDolvR+HnijQI
-						/opdHTFv6+NB/jkA8OfIZMKfEb8PSPBzTPhznPTHEX/FSX8i/4C+l2MAqPgbXvoVk/4g/yr9Qf6d9Jv4s/wDlv+40ddLvxf/IP8aAOnI
-						fwyARP55yY/AJ4zh84Q+Z7z828VeH/wm3wdQl3+AgR4c/2kB4OUf+M2+Bp/zrwGQyz+LvyLyT5/DmfyHpT8q/jL6LwHg5Z83/Zr86+g/
-						bvmtyT9h8h9G/+nZw+v+de2/l3/wEz35B7f9+gBg+cfyn5r8ywxA7dSfmvxLAPDJPyEAovwDkX8JgG/Ok1t/o/zHABD5f1hG/yH/gE//
-						keM/e02VAAjyjw3ALP97q2+4ADhR1//L2f8SAMfd4QJAj/+U0X8JAKz9DwHQFQPgS0M/yQCwZUBtAmCgBMDfXz2XA2DA3HtE/AMUAIwF
-						AMWABsDs7QcFEn+AAJi04UB12eh51eUjZxZ9syP6dV2venvkq90XvWDrai9gNzhvxNJq4u6S9HtaBwBu4v3MBkAyCyABYKcB8SyARoDN
-						ACAAzqEA8BFgAeAjwAKAI4DE388CAFsGhBGbPACwByAPANkELAHw1Pu/pQ9VCYBaBFAA5BHAAUAf5nJDcCECEABNEYCHhUYAHwvqI4Ae
-						OHkEcABkEZBsCnYBUIsADQCJAB8CEgE+AAAHgM4C4KIw4AMAm4PDhuAkBCgCNABqewJY/iUA/BGh07MI8PLPkKzInoAYAv50oDkPfcA0
-						BQAYt2JPNWLOxloAlEIgjQEJAM/sHc9wBEgIZDMBDhZIyCQTNwkvfeDNavLK+6oJi2MEMCT+oCkISgFQIo8BoyT83aUUA51Qlnah9OO7
-						h8p+jhP8qR0w/56nnfgLLPr051zC5L90eZdhwp+P9rP4k9SXCMLvqAk/4Uf8w6g/ib5f7lOTflvjr+v8TfqD/Kv0s/jTe7W45Ifey0H6
-						lSkgEX8hWfLjxD+M/AOVf2Diz9z7RmEfQDkAAI5v5s+2LAD4mM8sAGTkH2v+41GfNfmnz1wTf6NJ/u223zDyr+Ivo/9O/l0A1OTfnfcv
-						6/4Fln8ijP6r/POZ/4TIvwRAIv8cALn8pwFgN/56+f8OPV+Bl//zIf+EyX8c/X9M5J+IS39iAJxJz3+Wf1v+w6P/EgC9XQCcOjXKvwXA
-						NzQATpoQA+CEcRIAxxOQf3AMzv7XADhaA4DlP5z+EwOAT//pSgPgS3/mAPjr/rP5KNDvT95Yzb6HxF+ZQxEAOAJI/ufwXy0GEAD0V8SA
-						RsDsbY9Ul9+xuBpwx9zqzKtGFJ2zA1ao3h75avdFL9ar2YvXLX44fWuPAmD0zldZ/j+LARCWAYUIeLTqiwjIAiBEAAKAlwFJAMSlQBQB
-						GgAWATILIAEAQgBoBNgyIEwDdzcA9r/xSw6ATiPAZgDqESABcDWP/tQjwO8HuCHMAsQQ8AFgEYD7AfII4ABwEeADwLD7ARABQAJAI0Bn
-						AmwzsGH7AeRUoHhbsA8AuyPAIiAuBSJI/IGdDORnAnwAhAhwASDHhKYhYJuCLQTyWQAEwFzFh4AFwKy9r5H8b+YIAKUIMOohQOJvUACM
-						W7KzWnLwfY2Aj6plJIo+Aow8APy+gBWPflBNX/+QRICHZD+nFgN8mlBZ/psoBYFREv3DQVnWI1NJ0ttS+Hk7oy74xpTlOxtZeN+LKv5G
-						XfiD+AOWfwmA0kh/Lv5hUy9JvVEc8SfB97D0k+DX1/mT7Gen+4QRf6DiH473VPH3o/5+uY+N+DfJv232zQPASz9DnwFyYzgJv5P/xmU/
-						JPzABwAu96rvAyjLP9jx0s/5c82LfzjnX4lr/k3+YwB48TfCaT8q/yb+LP8aAF7+fQDYLb/+uE8g8i8BYPLPl30RdfmXAAhr/73886k/
-						MQBs6U+Q/xVPcQCk8o/9cRIAJv8gyL8GAGYAvPwDPvVH5d8CQE79IfnXAIjyf1DW/9Ozn+Ufm395/b8EgMj/A1UvrP/PAgCn/8jo/97q
-						JB793+NG/3ez/FsA8Og/X/4VA4CX/mgAfHV4DIAvY/SfAoCX/3wmAkCXAVEAfGPI8uqbY9aQ7JP0Q/5dAED8jRgAj1ZzAgcZRMBV0+6s
-						BlIAnHeIF4L17T/sedXbI1+tvk66pOs/9enf9b+XXsROGbDsgR4FwM2bZAPwZzUA/F4AvhxMAyDcCeAC4CwXAD4CagFAhADQCJDbgWME
-						2DKgcfRatQ0AwgfAPfQQ+bEFQB4B/GEsAWAR0L8QAcmpQPQgCEeCugiIAfAygwBIIiBbCiQRIMeCpkeDChYBsh8gDQC/FMhmAnwAxI3B
-						aQjEU4EoAAhbCsQhQA/wUgQkIUDin88EyJ6AdxkfADgdKJ4QZBGgx4QWQoDXLZP4GxYCFgG1fQEUAZM3Pl4NJ/kHPBswZxNTigDgQ2B0
-						FgIzNj8u8q+UAoAFkuRf9gfEo0JDDDz1cbVg9wsk+Tur8Yt3pCGQzQp4fAh4SuLfjlIQeMpy/VmgLvYBEvkmcuGPG67vYabQ3y/e91pj
-						ANjMT8AFQC0CnPiL/JcDIBntp+9TQaXfk4i/URf/4si/k34T/3imfz0AatLvkP08OvJPsh9G/ek9byRLfjQAiuLP8p+O/N9hUADg15MG
-						QHMEPPvBb0X+d8h6/5L4m/znAeDX+8vIfzzxJ6z79+Kv8h+W/Xj5J7z8p+f9C178yzf9ivxfgYEnN/IP8U9v+zX5lwCwIz9Z/vXG31T+
-						JQBk06/If9z0K8jyH3rOOvnnpT+El38LAJZ/Qi79SgPARv/7ugDorQHQa5oEgF/+I0d/SgCcNFEC4EQe/Zf1/8drABw31gUAj/7j+E8/
-						+l8OgH/SDcBtA+C2TzcAjrl5SXX26DXVhI0Pk/w/wcylCABz7hH5n4sIwEwAQ+K/Iw0AcNP8zdVVY+f14EKwrn/78uWX/59Uc498NX2d
-						3r/ri+UXsDN69++qbt3wHF8ClpNGwRt1SP4RAVfQB8FfRABwBMTNwBYBFgAcAST/4Jx5EgAWAQgAHwHxXoB6AFgEfFcjYNq+t7odAOue
-						/ikHAOAA8BGAD2R3IhBAAPi9AGEWQC8I41OBChHAswAuAPhoUB8B9MCp7wd4tbpFA6AYAToLgADwEcBLgSwACFsKxEeEqvznG4M5AjQA
-						xmgA5CFgEWAhwAFAD/+4J0BHAS0CsgDwEcAhQALiI6DphCAQTy2JIZDMCLAcpREAxizd7SJgU4iAViEALAKMMQu3V4sefpdEL0ZAHgNB
-						Ikn2QR4BFgJLHyKJWr2XI8CTLA9qEwR5DBgl6e+UUhA0UZb0iL/5uC2Fn79jSOCbiLKfQ/JPr6ExhX69Sx96pzziD1T6lyZE8a9Lv4Mk
-						vzjiD1T+8829XvxZ/un7u3a6j4p+Iv0G3i9e/JVc/iW6SfoLARA28QOV/tqSH36/Nyz5cdLv4UMGXACY/IebfYkPO9wHgNlcC4Bwxj8g
-						6Q9r/ulz0gdAWPaj4p/IfxB/oyD/mfjnI/8l+Y9n/Uf5B3HNvyDyj8EnC4CC/BMi/8+4C79U/rH8J5d/Xff/3aVR/n0AmPzLjb9R/sF5
-						GgAm/3zqjwYAr/1P5P9gdYZu/mX5B3z6jwSAyP8D1Wk4/UcD4BQNgJNdAJyIoz9Z/mMAsPwTkP9j+fQfyH8MAJH/bdVXefmPBICM/ncS
-						AOv+LAHwpevncwAMWXV/nAHgABD5D+KvMwEQfywD8rMAmAEYRp+fCICebATudWXX36vmHvlq+urTf+hFpRevU3pdPba6Y+erPQoAHNP1
-						WQ+AGAExACwCfACcOfdRmQFAALgIOLcxAp6UCNAA8BHAAUDMe+jdzgOAQABgacePVz+bzgJYBGgA+AjwpwJZBCAA7IbgcCpQFgFhL4AL
-						gCQC6MGTR4AFQGME0AMujwDbB2CXhAE+FYhDQC4K8wFgETDaRcDoLAAYBIBBD3jgA8CQZQAKyYNEQAwAjoAsBHwAMJn8A7s5WCSnsCSI
-						RMluDPYBMGvP6yz+w2dvCBGQh0DLGJgXI2Dq3Y+I/GUBEEKAkAigAHCUImAlieOMjY9U4xbtYPIY6DQIJpL0g1IMGCXZP1RqAp6RX3TW
-						itK/3wllqe8Qes08k5Rpa/ZVyx79gP4cU+n32Ch/aakPy3840cej4k+Sb8RRfxJ/+h4VUvmX9f0RuwwvjPrT+6CTAAhn+msA2HI7wHtx
-						vPjTezVe6gV0yY+XfmWSbvStib8e75kHQNjsC1wAePFn6PPosXd/Q4LfWv4N/Nr4tB+g4h9G/oHJv4q/H/n34h/X/Iv838RE8ZeRfznv
-						38s/4A2/TvwT+ce6fxcAJv88+u8C4MqC/INuyb8u/8nl/3uQf8Lk3wLAy78FgMk/j/4TXv5l9J+e29naf5H/RzgATrcA4NF/CYBe0yUA
-						TsPoPwXAqVP2i/wTLP8Elv+ciNF/PvtfOIEC4LixEgDH6uk/CICjNQBs86/IfwwA3vjL8v/ZDYC/HTinOocC4NqFu8LIf5wBwDIgILMA
-						TBD/NAAmrj9Q9Ru7oLpsRE82Ag89XzX3yFfTV99+w0YXX7wOOev2eXwCELMbvB4oBoFH46DPLNwA/NkPAIkACYA+eicA8MuALADyCEAA
-						2F4AiwC+HGyhBMD5LgAsAmwZ0LJH3+92AMx+4B0NAJywkEUAfTBfrgFgERBvCM4j4EWJAA2AuClYIuC6EAFpALSKAA6ALAIsADgC6AE3
-						mHF7AjATkIUAzwIw8abgegTEm4IRAPksQG1PAJEfDwrSmQCSBRIJI4kAFwDxdKB4WVj5dCBDAiAPgXhMqGARMAlLgRAAgRgCeQw0RYCF
-						wIIDb1EAIAKEWgTobECcEdAQyCLAWLTvtWrSit0hBLodBIAENg+CTsIAlCS/e2SC3QTE3Sj+PDmFn6MV9HvPpb47TFyyo5q15TH6M/xQ
-						cCP8Hi/8LP0eEv58tD/gpd+jAeBH/JsCQL7PSfYBvQ8S6VfkPg1QHvUX6ffoUh96f5bW+ttmXxF/PeKTyE/3EfmXALCLvbz4s/yz+At8
-						6EAu/wRO9tnA+wDKwp+z9qmfkvRD/iUAEvkHKv/Jmv+t7pIvFX8fACL/9FnsxR9HffrjPlX+7bjPawDkn6Qf2IZfHwBe/n0AQP5BLv+4
-						6dfLvy39aZR/oi7/EgB86o8LgCD/2PjL8u+O/FS8/FsAnI3nNuRfAwDybwEA+ecA4M2/kP+Hqt6Qf0LkH2v/YwCcrAEgm381AHT0/wQX
-						ACz/gC//kgA4apQu/yFE/tMA+KfPeAD8Vf9Z1ekjVlc/nrGFpF+WAMkMQJR/G/k34j6Ag9Uckv852x7hjcBXjF3EswAl7+yMri7V3CNf
-						TV+9+w/bWH7xOuM749f2KADu2PVakP+/hADohQAA9OFgEZBsBqYPkrMKEWCbgcOG4BABT0oEkPT7WQBgm4HXPPlh+wAg8fcBgPOqf7RK
-						AqAWAfhQJun3EdAP0Id5PQIkAAZmARAjgB4WGgDAB0CyKZgeQBYBuB+gZQRgFgAPOBcAckmYWwpEhKVAGgAWAT4E+KIwPIAtAghEQAgB
-						DYCwHIiJdwT4ELAImMgjhSBGQAgBko88AKbtf4/hADBIZkIIkODICUH1Y0KxJCiOkkoA2L4A/P2YpbuqrlkbGIuAPATaxgBFwOS1D1ZL
-						eDQ4RoCEgMYASb8RlgSBwr4A4DcIj1u0XUljYFwhBoxiEBgQW5L8EqUYKJGLeX5caRNFST9c0O+riSD0OST4baEft4CCrCT+YAkI4q9r
-						+z0l8Sfqy30cGgBxjX8k+X4mOADo+7884h/lP5f+MOpP77F81B9M3V+QfiWO+sfjPXnUvzbyjwEBEAOgKP5B/unzJRN/gFt9sRm5JPs5
-						vyMeePNXLP9yQ7oTf6LxtB8KgFvpMxbU5J+ojfqb/BNe/A2Wf6Dy74/7BPktvwZv+FX5T0/8kaU/CAAv/wAn/oj8EyT8vOnXyT8HQCL/
-						8dSfMPrv5B+3/fLaf3rOevkPS3+c/J/D8o/ntgZAIv8SAH1nSgD0cQFw2nQZ/T+VN/9KALD8Eyb/J02C/EsAiPzfx8t/jg2j/xIAxxBH
-						8dKfHSz/eQDY0Z9/CQFwypAV1fnj11Xzdj5RzQWFAAgzAFj/X9gDMJcYOGVldc34+dVZV48sumdbBnStVc098tX01bd/12vFF69DfjRn
-						Z48C4NbNL/1lBoCbBfD3AlgAJCcCaQB8UwMAWACECMiWAYHvIAKWPlVteu7jxgD45R8kAnwAYB8AHj6XUgAUI4BHZSQALAL8LIBFgAUA
-						RwAJfz4LABAA125ABEgAXK9YANROBtJZgGQ/AJEsBdIAKF8SlkaAhMAbVZcGQCkCOATo9fD3BFgEcAiQ9PsQQACMI/EHxdkAFwD1fQEE
-						yQiIAaARYLMADj8TMJOEH+QBYDMBYTbAnRI058Db1Yh5W2MEzJIA8DSFQBID8zZXc+9/nYRQI0AJS0dcCCSzAbo52GMBgM3BvEF4z8vV
-						xOX3agR4Ygh4SkEAijHgIdFtR02gO6AUAkwhLMpEgT8USr8mBnJPr0snTF51X7X04Pu15T0i/Z5m4TeapD8f7W8a8Wfpd8KfiD+9Dzw8
-						2u+W+uTyX1rnL5D0FwIgij9B72UT/yD/GgC20Vc2+wKVfyf9eQAE8VfpZ/Hf9bpAAYCz/TE4U5J+A/IP3vrFv4QAiKP+etGXbvZN5V+X
-						/mTib/j1/oOc+LP868i/iT9/phNh6Y/Kf+myr/5ZAPDIP2Gn/VzB4i8XffG6f+DEP5z4Y6f+LJcA8CP/TE3+0wCA/IMg/4CescDLvwRA
-						Kv9Antky+o8AiPL/SNVXA4Dln5DRf5J/QuQ/DYBv6Oj/SS4ATtAAkM2/GgC8+XcXy78FwNc1AL42MgZAPPrzLyMAjrtlaXXuHWuqKZtJ
-						5F0ACCT9oBAA+HssCYL8gxtmr6cAWHDIJwH1GTDsRdXcI1+lr/Ovu+7/0tMTgK5a8XA1zgKAIfn3kOg3BcEECoABa579iwuAsAxII4Dv
-						BbAIcAFgEcABAOjDyCKAAwBYBJT2AgD6oNv18s/bB4AtASL5B3h4IADAj/MIsABwEeD3AlgE+AAYoMuAakuBCASAbAjOIsAFQIwACYCb
-						NACKEeACwCLAAgB3BMg9AT4C0gDwITAShAiIAeBDwGYCDB8ARjgdCBFA8iAREAOAI4AIEUDUZgJYWNxyIAPyz1AA6I3BYTaAZKm+OVgC
-						wC4Om7H7FRL9TdUwCgDAEWA0hEASAxQA2Aw8Y/szPAtgJDFgAYDlQIZFgIcjIJsNoAjA3oCZmx6rxtJ/B9RjQCFZLVEKAqMYAzkkzN2h
-						KNyfBPlofXeg37sxYfH2tuDeBwuAVPoJt7a/FgAk9yb9Uf7Tzb3JGn9A36ep+OupPm6ZTyL+hi7x8eQBEDb4uo2+Ufyzdf4Qf3qvJpt8
-						DcR8W/EXwpKfmvjrZl9AnzFGEP8sAJ754LdF8TcsAH77p3/nf8eLf5B/IhV/wY769PKfH/Vpo/9B/I1M/m3t/9XrU/EP8o/nQxYAtu7/
-						Cjvuk543QORfL/sCmfzzef+A5T9e+BXkf9mTHACp/LtLv1T+ceFXkP8w+i8BYPJ/nt326+RfRv+JsPYf6/5N/tMAkJN/JABOnZYGwCkU
-						ACz/hMg/NgDHADD5P24cRv8lAI7RAMDa/69rAED+LQC+gqU/vPn3LycAvnrjQg6AUWsOkOxbADyW7AGIswB+BgDYMqCD1W2LtlXXTljQ
-						o5OAzj+/6/+sunvkK//qfdWQfyy/cJ3BJwBteq5HAYDrvCH+xl9KANhpQDIL4CLAPkw0ACwCOAB0FgCEZUB2QRh9gFkApBuCn6z2vf6L
-						YgBwBGQBYBGA8/YvWSkBwLMAPgIoAMIsgEYAzwLQh3mIAHywcwTEALC9AD4CEAC8FIgCoBYBbhmQj4Cb9H6AxgjIAoAjgMgjwAfAMMwC
-						uKVAhg+A0j0B2Bxc3BPg5B/wLIChswD+eFALgLgcqBACJC/xhCAXAST/cUkQib9hEVALgTQAwJStz1TDZkoAgDAb0CIGRi3YVk1c+1A1
-						mwKC5Y9E3wdAEgEUANgkbBuF8whIQ6C+P4BnBIglD7xVTV37QAgBTzEIAAluE6UgyCkGQRMk5UVKP7Yl+O+2Ab+2Q6Ys+ePp9Soxjh6m
-						E5btrBY/8l5N/hcBXudfX+tvy3zy0X7I/3yg4p/IP8jEvykAovy/K3jhd4TlPiT8+fGeIG7wNXS5D71Pc/n3G/pN/A1e7uPEP1nyAzLx
-						T076oc+Y0ST7IA8AyD+OLMYZ/63E37OI/qxks6+IvxHknz43ZdMvPj9jABTln7Bz/hEAifwTQf5J+g2WfyLIv4m/IvIvAWDyz2f9A3rO
-						+NH/nzAy+o8A8PKf3vYrAeAv++ILv2ryLwEgm34fZ5KlP7z2X/DyD75JePnnADD5x6VfifzHAGD5182/p0H+XQBA/i0ATrIA0OM/T6AA
-						ON5O/rEAuONekX9CTv6RAPjayHoAfPkvLAC+cPW86ryxa6tbl9+nMwBuFoACIIz+60xAMgOwQ0b/wcjVu6vrJiysLh586CcB9b2i67+o
-						7h75yr+wS7r0onVKr6vvqEbvfKVHAYA3JMTf+EsKgHgkaIwABIAsA0oD4BxEAAJAIyBsBkYAAAoAuRysHgEH3/51twMAG3QRAAABkEcA
-						nwbkIoD3AtCHeT0CdD+ABkAeARYAfFMwB4CLAAoA4AMAcADoLIBFgN0SzCGgswC3uQAoRYBcFqYhwPsB6hHAy4GyAEgigB7mtXsCQBYC
-						thTIlgPJfgC5JCwJAZKPegTEDcI2E2DkASARgKUPMQLyJUGzSf7t1uA0Ap5m8R828+4QAcnSIGLEvM3VxDUPVjN3vVgtYMmDAP40sJgo
-						RoALgOS0IBL+fFnQchcAHh8CC/e9Vk1etbe6gyIElIIAFIPAIBFuRSkGmihKvL/PoGOcpJek3/A/Lpf4VtDvuxMg/CVmb3+6HgBB/mMA
-						hCM9ibr8AwmARPodttQnD4BktF/xm3vDiD+9N/xyHz5Ni947XvrDqD+9x0oBMBk0ij9B72UT/zDqzwGQbvZl8TdK4k+MBhoAufgbOLBg
-						Eb1m7cTf2PHiz+kzT9f8E8myH/qsTOSfhN/Ixd/L/w30+Zwc96nyzwGg4m9Lf3L5B7n8e/H3F32Z/AORfwLyz8t/CvJPiPw/zfIvAaDy
-						rwGQyD89F3nT7+Io/xwAJv8aAPHCL5F/jP7zkZ9O/u3YT5Z/4oxE/iUAeN0/5J84bVoaAKdMkQA4efI+kX/A8i8bgC0ARP4JHv2XADha
-						R/+PKgSAjP7/5QXAXxMIgIHz76nm7XyymkcBMM8CgBH5xz+bp7MAYJ5BMQAmbXigumbCouonw2cU/bMjBgw9V3X3yFf+RQFwa/FF65Cz
-						bptTjd31KvFaNQ5QANTYbaQxYJw6/aG//ADwEaDLgM50AQAQAOfQB5FFgG0GPs8CgJcBlY8FxbRxHgAWAb8oBADWmeJyLwuASwsRYHsB
-						LAKuAPSBXo8ACYD+6+KJQD4EfAAAOxbUR4A/EQgMogCwvQB+OVCIgLAU6LUkAvxNwRYCdmOwHQ1qEWAhYAEgERADIISACwCDA8BFAPAB
-						MJ7kQSKA5N9wAWDkAWAbhNMlQUIeAIbNAiSzAcQcUAiBmXtfr8as2BtDYOaGatTCe6qJax+uZux8gS8SW0CiZ4j0kfwDDQBPGgMfMT4E
-						OAZqAaCzACr+PgAC2B9Af12w9+Vq0uoYAp5SEIBiDHhIqjulFAPdoSj+LUllPycX/vT3Vpb6VoxduDVh0qo9+mdeJ13iU2c+fX9FnPCH
-						0f4U/h4lwa+N+NP3dVzjL4TRfnovePEP8g9cAITlPoDeY0Z8z2kA0PvUCJv4DSf+Iv/1jb4cAPyZEG/19eLvA4APHCiI/wj6XAIIAPy4
-						3/ypvfwDfO77M/79mn9b9sMBoOJ/8+aXGi/5uiHIfwyAIP563Gci/3bij4p/WPbj5L9/g/zbpt+w9MfEf9XTQkn+NQBK8s9Lf8Kov8k/
-						lsiS/BMm/+HUHwXyLwEQ5T8e+RnlH5ypAZAu/RFs4y/kPw8Akf8DevKPBsAkCYATAcv/fdVxFgB6/OcxFAAs/7z2XwLga7z8RwIgjv4f
-						agBA/v88AfBX/WZVZ4++q7p02maZAWBE/ln6EQE6C+ADgNf/898fZHAa0ICJS6v+o+cU/bMjBgwdpLp75Cv/6t1/2KLii9YhF4y9s0cB
-						MHrnq4n8/yUGAOAA0AgIl4OR9PsIOBsRQB9GFgG2GRgBwBHAm4HTCLAAeOVnv28MADsJCAGAjcB2ChBk3wdAEgEaAD4COAB0FsAiwAKA
-						I4AeCHI5WBoBvBSIA0BnAZQQAjoLYCcDSQRIAPgIiEuBEAD0YMsiIISABkBtY7AGQB4CtiFYIuDNegToTIAPgHwWAJSPCH2HsQgIswC1
-						mYA0AMKSICNIji4LIiEKMUDC5I8JNSQADJJ/D8cASRj9nLhcaf4jHwa8/IOFzE8ZPxPgY2AJcBGAS8MCFgEOmwXw1AIA8CbhnzEL975S
-						TV69rxpTCAFPKQg8qTC3ggLgEKhHQF3ai9B/sx3lX6ehUr+wc7z437EgMu/AWyT89WU+TeIvx3kKfpTfy38tAOx71KTfo9Iv4m/EAIjL
-						fex9AfEXEvF3ARDFn95zrUb9szX/QfobxV8IS36c9LP486i/yj99zmDdPpAbyhX6PLIAwNn+r//8XzoKAAzmDKbPwET8DSf+Iv8SAEH+
-						VfxlzX89ABL51wDw8l8/65/kH9LP6KZfln9d9mMj/xoAdfmXALClPyb+Bp/4w+JfkH8d/U/lH8t/UvkHQf6x8ZflXwLA5B+cbQGg8i+j
-						/3bmfxoAfcLafwmA03j5jwTAKVMlAE6eYpt/KQAg/wTLP8Ebfy0AWP5lA7AFwFEaAF8fFQPANv+K/P9lBkDf4auq70y8m08CElT+8Vf+
-						e8wAWAAYNgtwMHDt9Dt5I3DJPzuja67q7pGv/IsCYH/5ReuMS2bu6FEA3LL5xUT+/1IDIMwCAPog4VmAORIAFgEIAF4KVIsACYDzLABc
-						BOCGYATAO7/8Y7cC4P1f/6n64cpnGB8AIQJcAFgEXI4I0L0AFgE+APrxMqB6BFyFCKAHiUSAzAIkEUAPHlsKFCPgldYREB50uidAQ8AC
-						wCLAAoAvC2uIAH9HgIRAFgG2FCiJgHQ/QFMESAhIBIQQcBEQ9wS8y+QBkEdA7ZQgEiObEYgRAOJyoBgBgo8Auy/A8CFgMSABoKj4F0PA
-						BUCYCXAR4ANAIPEHPgIctRhQFh14s5q69kEKge0cA55SEBilGChRlut25CFQ+jGtICHvCQW5B2NJ5pvwwp+ypZq+9SmRfgVLwXLp5/X9
-						Ri79hN1JkUi/fg8y9j1q0q/w9y++n730OxLpV0z6g/zTeyoZ9XfCn8g/yKWfqI36k+wbfp1/lH8JgJL4B/nXAAij/lkA4FZfyD/Y9/ov
-						i8JfAjMXJv8WAH6zr8k/jvm8yQLAiX9Y+gPo89iO+wzi7wIgir+Ryr8/8tPO+pdbftMAKMu/W/efyX/txB8NgCD/FgCJ/Mvafy//Nvpf
-						OvXH5J9H/0FN/vXkHxcAIv8P0/NeAoDlXwPgVMg/IfK/v/oGH/0pAXCiBgCW/iAAjgM6+i/Hf0L+d4n8E5B/C4CvjtDR/8MVALf+eQLg
-						5MHLq/PHraPPGhJ6LAPSCJivWADM5xkBiwELgMigOXdXN0xaVPUd0FV00LYMGLZHdffIV/5FL9CHtResG1y5eH91BwUAzvJHBIwl4fek
-						MfB6jf5r0hOAwF9qAIQIoA8TgACwCPAB4CNALgd7QiKAxN/PAgAEAPjZ7/61bQBwBGgAvPHP/1JdvEICAPgA4AigD2e7IdhAAFyOD3QX
-						AcksQNgLkEYAAoD3A3AESAAkEUAPnusZtxxoowRAKQIsBDAT4AMA2FKgegRIAAAfABIB9PClB3MSAXhQWwiQ+OenA+XHg9ZCgMQB5CFg
-						AWBwADASAMD2AjQFQCkC4ihpDAAjbgzOYFHLAsBgwdMIUJIQIEoB4PEhsISEvxwB9ZmAJARI+IszA8TSR0gItzxRjVu6sxozf2stBjyl
-						IMgpxUAryiLfTQrSnjO2HSTtnVAS/SLzt1ST1z2YyH5KKv7FDb5ELv5e/nPpN5ITfZzw5/h1/rbcpyb92OBrZOLP8p9Jf325D0Hv5dqo
-						fxYAd+DzgFH5L4k/MdIt+/HyP/ye11j+Ad/qS6x+4sOi7Je466mfRvmH+BsuAET+06M+E/EneL2/yv91ufwTctSnl398xkfxr8k/Ybf8
-						mvjHNf8i/j4A5KZfXfqTyT+f+JMFQNj0a9TkPw0AW/sf5N8FgJf/cOOvyj8Q+ccePpF/EOVfAqDX9BgAkH9w8lQZ/f+GCwCR//tF/sPy
-						HwmAY8PoP9b+SwB8fXQ9ACD/f1kBQPKfBcBxtyypLhi/rhqz7oDKf5wFkAAw4kxAKQBuX7ytunHy4kO/C6B/1zuqu0e+/FevG2/8H+nF
-						+e/lF60zrr/rCQ0AmQXobgDgjX98KQCyCPiLCgBAHyo2C2AR4APAIoADYL4EwLkaAHkE4DIwiH6nAYBp4xd++jsOAIuAS/II4GVAzyUR
-						YLcE+wiIewFiAOQRYAEgERADIEQARp3wAGL8noAYAcAHwE0aAP5oUBDvCJAQiEuBcFyezgIoPgC68CDWCPAhwBFAD3eLgBgCFADAhYAP
-						gLEkD3kAcAQQPgCAzASQ/GsEhOVAeQiQ+PgAKC0H8jHgTwmyEMgDwF8aloQAiZ7HIoDJQgDYUqAAB0AGyb4tBzI4Ap5IqQUByX5TBADe
-						MLz31WoqSSuOKuUY8JDct6IUA61IQyCT8U4hAe+EurT3nDEk+I3M28yMX75bZV/g7wN8XzAF8afvp5Lwg9r6foO/R0X6O9rg6470NOkP
-						I/4gyL87098I0u+J4m/IhV4Kyz9m9Jz4uwCA+Bs+AHLxD2v+iZr4Kxj1N/kH+LWVZL/Eg2/+Ksh/HgB22k+4Y0UDwIu/jPyna/59AKRr
-						/lN4w68T/0T+sfTHBYDJvz/rn+WfxR/PH73sywWAyT+P/rsAgPzzpl9jiQRAKv962y9h8o8Lv1j8E/mXAEjk3877J+TCL8g/ofIvR36a
-						/D9c9cLyHw0A2fiL0X+Sf0Lkn+DRfwmAEybI6P/xFgDj7quO1QCwk3+OogBg+XcB8FVe+9+NAID8uwD44mcoAL5248LqwvHrqyGr7ifh
-						fyKj8wAYvnIXB8C5h3oXQP9h/+2kS7r+k2rvkS/76tOv6wuFF6tjeg8YUQ3e/GJ1x04KAENnA4w0Cl6vgVI//j9QAIQIwIeJ7gVIZgFc
-						AIBvcgSQ/AOSfpsF8BGAzVEQ/VIE5AFgm4CfeO83IQAAAiCJgLAXIEaABQAvB6IP9zQEXmAsAHwE+AC4an0aAAyWASkWArwUSPcCGIN8
-						BJD8yyyAHA3qQ0BOB8oj4HXGB4BFgN0WjAiwuwL8TAD2BvgAENIA4Agg6hFQDwDZG5CGQLovoFUI1AOAIZHKQyAPAI4AxQIA2OZggyOA
-						hM+IIdCwLEjhjaI4MSaPAaIWA0QSAVkM5BuGLQJykhh4imLhsQ+refe+UE26U/YK1GIgBz+mQ0ox0H3KUg5y8R/TipK8d5PR8zenkPgb
-						eG34pl76cy8FQD7aX9zg+1CD+Bv0PSqxqtLvSEb7CwHg5d8HgG3urcl/Iv5pANRG/Q0NgJr4O/kX8Rf4lJ8QAOkpP178R5DwAxZ/w8m/
-						3Oz7WvXT3/5rUfhzcCFYIv6EiT8v/fHyrwHgxd+4TgNAzvmP4s/ynwVAWPZDePkHsuYfzwaTf3pWOPkvXfYl8q8BAPl34p+u/Yf8SwD4
-						pT+y/CfK/wWKnfkP8bfbfr38n8vy/1hd/jUAIP8gkX878jPIfwwAln9e+3+A+YYFwOQYACfw0p+9Iv+EyL8EANb98+h/IQB47T9O/uko
-						ADD6/2kEAMl/JwEA+c8C4EvXzasunLC+umHxvdW8XbYEiNATgRLxD3+fnQZEjF1zf3XjlCXVBYPGFT20E3oN7Pob1d4jX/aF45FKL1an
-						9L52QjXmnld6FAB96A13/H+wAOAI4A8VCQCLAN4M7OTfAoD3AugsAAIgWQpEYEOVBUAeAXkA2ElAD731q+oHy2MA1CJAA+BHqyQAkgig
-						D3SLAP6Q5wiQAODNwC4CwEA8MPDgsFkAigDgAyAeDxpnAvIIQACECNAAuJnEHyQRoAEgEeBDQCLABwBHABEj4I16BNAD3V8UZgGAWYDR
-						WQAYMQTSewIYkg+LgFoIcAAYcVnQ1DwCFB8BeQDwpWEk+yAPAIYlDRHwQaAUADECdG8AiX66QdjBAVCOgOKsQMs9AoIPAb9HoGUMEMsO
-						0u9t53PV5Lv2kzRvI8mF9ApJBLSjJODdgX6OXPabKP77OfzrPzRq0k/ghudRc3Hjc8rcB97RP3eFvzdE+MP6fpBIf2R24UjPZJ8Kf4/W
-						A2BGiwDIxZ/lP4i/QsLf6lx/gM2+EyD/DQFge3n4PaxLfQzeAxTEX6VfycW/tuSHPmPCqL+Kv2HiLzf7vsaDNCXhT/iTXAjWdQ8+/9JR
-						f4i/YQEQlv048bejPsMFX8CLP+FH/RP5X5vKv5z4Y88FIhP/IP+EyX8c/ZcAgPwDL//g+yr/32Oc+LvLvrz8WwB8e2GUfw4Ak38NAD59
-						z8m/BYCN/PPov5d/HPmZyL8EwKlY9w/51wCQ0X8C8k/w6D+W/lAAHK8BcNz4GADH2MZfDYCvj44BICf/7Ki+8qkFAOT/kw2Av79qTvWd
-						ieurAfN21AJA1v1H5pP8M5n8g+mbH6qun7Ks+u6tE4se2gm9BnSdqdp75Mu++vbvurH0YnXKWYPnpfJ/CAEAuT/+P2AA+NuBwywAIoA+
-						jHwE+LsB/GZgHwE4aSEJANAmAPa8+gsOAB8BP/QR4ALAR4APABA+6CkArtBZgDwCBnQQAfGSMIsAXQpEDy7DAoChCPABYBFwq4uAeFlY
-						GgG2HMgHAMMRkN4TYAFQjoA3OQCMWghoABh5BMSjQhWLACJGgIQAzwS4APAR0BwCcmuwRQDIA0AiQI8KdRHAIUDSV4wAEn0LAI8FgPBT
-						Jg+AUgTkpwUVZwZACAENgCZI/i0I7O+X039n7r0vVlPWPVSNXbyTxDfGQBMhAA4FFvVPgrrUe/wofg6LfomC/IPZe19X6fekwl8Uf/7+
-						Ksu/LU9LSYXfI6f6GFH4c0T8DZL8HP8+U7z4s/yr9Aec9MsmX0ECIG72zZf62I2++cg/TvgRUvHnkX8n/sbW539Wln4PyT+Y9+C76Xp/
-						+rz0mPh7+Tfxt6U/Iv4t5F/F3+Tfj/7Hs/7dMwHr/ln+3bIfkKz5TwPgkhUi/2H0X+WfR/4Jkf+n6vKP0f9M/gHLP2Hyb6f+sPwTMvpP
-						z1on/yBu+iWC/EsA9NEAiPL/sC79eVDlX9f+IwAmSwCcRED+wfEaACz/GgDHYOkPNv5qAPjR/6/p6P9XDksAkPx3MwD+vl0AXHtoAfA3
-						9FcEwI+mb+YACMt/NABsMzD/vQUAZgEAiT9iwLhmyvIeXQbWZ0DX1aq9R77si16UmcUXq0POH7OapP/QZwCGbXulOi6Tf+FTDgDwCQRA
-						XwsAjQAEAC8Fog8kiwAZnfCXg9Uj4Gr6IK4FAGgRANtf/Hn1fQ0AiwAEgHEJPqBdAFgE8CyACwA5GQhgU7BEAO8HcBGAAJD9ACAuB/IR
-						YHsBYgRQALiLwmQmwEUABYBEQAyAEAG6FCiNAAmAuDE4jQAOAXo4223BtRCgB3waAjECfAhYBHAIcACkEQB8AKQRUF8S5EMAAWBYBIQQ
-						cAEQqQdAbTkQhI3kP7k4DJDseWIIfMiUIsDPAlgA+I3CPCtAIp7jZwFaBgCgAJAQcHsElGIMeFwQLH743Wr2Pc9Vk9c8wPsGRs3bEijF
-						QDs6FfQSpZ+vBon6oTBqbrPgNzFyzkZmxq6XWPr5e8C+L+j7pSb99r2UEEf544k+GfQ9WhN+lX5PEgD0PgjCnxE31Efpr43603sv8lZY
-						5mMkm31z8XfSD+obfZuW/ET576LPmUT8lUT+6fMKzKEwKkq/RwMAsRBG/l0A+A2/N2wk8QeZ+BsWALbsx4/621n/Jv6y6bcu/xwAtuFX
-						1/3zaT+5/GsARPG3Tb9l+Qff0wAoyn+29AfIiT+p/IMg/xoAct6/jvzruv8zLABI+v2lXyz/RO9E/h/iU39O0QA4eapt/nXyH0b/JQCO
-						G18PgKM1ACD/FgAs/7z2/88UAIM+uQD4q34zeRPw9ybdLaP+uxQLgSwAFuwkLAQg/vdEbpx5V3XJ0KlFD+2E3v2GTVHtPfJlX336d20p
-						vVid8sPpW3sUAIM2vHDIASAR0DoAYgT8+QIgRADPAri7ATQCJAA0ArJ7ASwA8GHtAyCPgNIm4A3PfsQB4CPABwCfDEQf0jITECOANwRn
-						AZAeDxpnASwCLABsU7CPAA4BmwVIQiANAJBcEqYRcNPmVxkfAHZJmCHLgdIAyDcHcwRoADRGQDYbYEeEenwAjCGhyGcBwDiQzQIIJP/Z
-						MaGtQsAvCZpKMlWPgPdJqgiKAJ4NIDEzQgiQwPkIMPIIiCPAFADAlgMptRhoigCV/jrxtKDSZmEjjYByCJQoBoH9HPRzzt/7WjVj8+PV
-						hJV7SLi3JkHQitE9oPTzFWGJP1RU6kuo6DcxbecL9GdPsl8Y9fcj/ocSAPkyH4M3urPspxTP86f3hWHyX5J+xkl/GPEPo/7ZCT8GS39B
-						/FX+o/gLfMqPBQB9lhgs/oDlPw0Au6mcA0DFH+Byr64dr/LndyvxNx5/9zdR/gkT/yj/aQB48Tf4nhYNgLjen8TfH/UZ5F9G/8Nm35L8
-						EyL/8bhPwPKPZ4sFgMo/X/RFAZCLPy/9IRAAJv/fzeU/C4Bw4o8FgMq/jf7L0lp6rtplX07+efQfqPzb6D+WI7P8Y/mPl39e+y8BIPJP
-						8Nn/B1j+LQAg/+A4Hv2PAYCNv0drABw1ph4AX/2kAgDy/wkFwN9wAJD8twmAc+9YU32XAmD61kerBbueFHaCJ+jvHxcoAgQXACT9+Hvj
-						tvkbe3QbcN9+XetVe4982RcFwFOlF6tTLl+wt0cB0P+uZ//sARAi4BMMAIsABEAeAX4W4BxeBlSPgBvpAz0PAB8BFgB2DwACYO1TPyX5
-						fzqJgIt9BGBUhiPA9gPoLADQCLAQkAiwAIgbgsNyIMICYADJP7jKQATwwyePgJdlFsAFAO8J8CGgswC1CCDpNzgAOAL0orAsACwChroI
-						GJoFAGMB4EIgnwUA5WNC32byADB8ADAkMnkEhNFNjoC4SThGAKERUAsBFq5yCIBSAJSWBAkxAMJsgMNOCRJ+yiwsXCAG8gjwR4Z6SiGw
-						lMTd6E4ICDEiEBTy70eWHaTf530vV1M3PlqNX7HnMEj4n4ei9BMjSO5HzG7PtB3Psfwnsl+CvofCuv4cFn63tt9Q4Y/r+wUJgGyNv5JL
-						Pwhr/LMR/yD+ROM6/z1R/H0AhFF/vI+ZNABGgUT8jbr4h5F/t+wnjPoTQ7aT8AOVfkNmLV+pXv3ZH1qKv4F7XWTkP270TZb9aADwyL+T
-						foCRf7mk8UUWf0HEn+VfA8DEX+RfAuBKCwCSfZDLf+ms/yD+Kv9A5D+/7MvJf9OGX08m/3zePwJAxd/Lv236tQDw8h8u/FL5ByL/j4j8
-						awAE+dcAOJmcQ+RfAgDr/4P8awAcPyENAFn7LwFwFI/+xwAI8o+jPz+VACD57ygAIP+HJwDOHnUnzwCMv/vBGAAMAkBBDFAALNz1WLUQ
-						EaAh4Bm2dHt1xchZRQ/tjK7HVHuPfNlXnwHDfll+sTrj6pUP8yZghkJgDAUAQ9Jv+BhIooDAVOAhBQD4FAOgHgH1AKhFAAdAOgtwhkUA
-						fSBZBMS9ABIA8XKwGAH40C8FALAAAD4AVj/xIX2wIgBiBCAAQgRoAPAlYS4CLAAsAmwm4DIKAETA5RQBdjSoRQACgGcCXACE40EBHjz8
-						APIRIAGAW4Lzm4JDBGCkK48AQMIPLAI4AJh4W3A9AvBAtgiQWYBkJoCkP5kJIOyeAH9MqAWARUDcDyARAPIAAFgWFAJAZwHy5UAcAlkA
-						5KcEhVHTPARIxAxeFmRoBIRlQXkIaASkIfChQLLvQ8BiII8ABEBCIQYkCDQAcnL595CwG0HqlZrY59C/3wlYnjT//jeq6VuerCau3leN
-						nr+tKNytGNkd5pCo9xCW/CZU8IfP3tCSqdueTUf76fuj6UQfk/042p9t7CWxzwnS72TfU1zqo8Lv8ev8jbDB18m/iT/Lfy7+JPz5kh8f
-						AMlG3ywA4sBAXf7DKT+EiT/Lv4l/FgBxzxI+r16p7n/9Fy3F34MZAzwLbvSbfR2Ny34IW+9v8g9Y/JVU/O3uFw2ATP5N/Bl6bnj5D8t+
-						VPxt6U+QfxcAXv59AMhlX5n8E/6iL7nsS8789/IPgvxrAJxFz9ya/Lvz/m30vzc928Pov5d/4hSW/xgAvPmXCPI/SeTfB4Cc/CMBcNQd
-						aQAko/89DgDI/58pAAa2DoAzRqyuvk8BMPzOfTXxxzKgdBYAsk9/9fKvQTBi5a6q/+g5RQ/thL79uz5W7T3yhS+5A6D8YnXKoHVP9ygA
-						8Gb+ywwAfFB0LwCSCKAPJYsAOxrUAqAUAbdteaUo/wYHwB80AAgEwIrHPqAPVQsAiQCbBeAIcAHgI8AHAPABwBGgS4F8BNgsgERADIAQ
-						AbwMKI0ACYGXZSaAhB/4AOAI4ACIEQA4AFwEgLAUyAWA4QNgCEbk8HDWELAI4BCgB7wFQAwBkn9AkmD4ABhNEgFCBGgI8ExAIQDG73mH
-						aRkCJEF2VKgPACaPAA2BPACSU4I0AsKSIEceA+lMAOHEP48A7BGQfQIyC+BpFQGLHv2oWgxIuhuDgCjGgIcEv4j+/0XRL0H/rdr/99hP
-						q3n3v17N2PZUNfHOAxwEZQlPKcq+Bz+mG+Q/vzGcJL+Rgugzs+pM2fp0Uf5Lo/xR/IWmJT5htD98j2bSr+JvRPmPF3oF4XfEEf/60Z4m
-						/8kGX0i/E/+a/BOQfy/+ftnPSHr/G0H+NQC89DOJ+Bfkn0jknz6rAAJg9ZMfFmW/xLyH3uXRfwRAKv4CH/OpAWDib+v9o/y7ZT8Qf7fs
-						J5V/+my/i8SfsGU/IJF/4if8zIjyLwGQyT89fy5mYgDk8m8B4G/6TeQf5/3X5B/Px1T+/Xn/4GyWf+y/y+RfA8DW/ov8SwBA/vnIT5N/
-						cggfACb/GP0X+d9XHa+j/xYAx47T0X/iaJb/GAAs/4TI/ycXACz/PQmAcAeADwCs/+8kAGYyfbpWVj+YvKG6bfkeEv0nq4UBCwEfAI9X
-						Cy0EFMwIgDvW7K2uGjuv6KGd0fXfTzpyF0D86tNv8F+XX6jO6D1wRDVky4s9CgAcw/XZCgCJgCQANAIORwAAPwsA+GhQjoA0AHwEDKEH
-						RUn8PXkALH30A/pAfbr63jIBEWB7ATgCwiyABIBFgL8bII0ACYDLNACKEUAB0H+tBICPgIG2FyALAVsK1BgB2VKgJAJ0OZDNBEgEvFbd
-						StIflgNlETBYA8DuCuCTgVwI5AEwnOSfI6DVTABEgsQ/mQ0gEABGGgIUAS4AfAiEmQASokkk/CAJARKqsBwoCNZ7QkMEMCxyhQAAJH/F
-						jcJ5DBBJALgIiDGQBQEJf3MIyIxAiVIQGImo9xT8fOHnTk8u8uCEo7l7XuUZgvGYIViwvSjmnzQtBR8UJD+na9bdgclbnop//vz9UAgA
-						+v7x4t8qAMKIPwjfn6n8TwGJ+GOZT1zqE0b83Wh/WOpD759c+plE/NMAKEm/xzb6GrzUh977Iv4q/UrT8Z4s/oDlPw2AZNmPir/IPz6v
-						XqmmUMyUZN+DY0DB5uc+Tkf9SfqBnaxm8m8BkMi/BoCt+/cn/VgAmPiL/GPpD0m/BkA859/JP8AzQ8Uft/zaTb9e/n0A2NIfL/7GRTr6
-						n6z7d/Iflv2o/FsAePlPL/ySADhTA8Dk3wKAR/7pWQ4sAMJ5/17+4RAaAHLuvy790QA4fmIaAMfy0p89Iv9j0wCwoz+/WgwAEv/DHgCQ
-						/0IAQP6TACD5J3j9/2EMgNOGreAAuH7RLhH/ew0JAIRA5PFqEUdAFH9j0t0HqqvGLSi6aKf07t/1v6n+Hvnq3a/r1NKL1Cm9rhtfjbrn
-						5Wo0yT9DATDaAqDELpBGwan0xvq8BYDfCyCzABYBj4cIsACwCMDUb0n6PQgAfwrQokfe5wD4rgYA+AFHgISARYAPACAnA6URICcDxQCw
-						WQAfAfzgoACQ24IpAPIQsABwEeA3BBvJfgANAL4jwAVAvCdAIsCWAt2CAMgiwEJgMKCHtERAvDAsRgBG9mQ5UB4AIywAFIsADgGSCsFt
-						DtYI4A3CJC15BHAIlCIAhBCgANCbgw0EgCeGgASAJw8AkC8HYkIACDIiHEOgvkdACBHgiMuCHCTPtlnYk8QASbbRaQiUKEl+vt8gLDfC
-						jw//bkH6Dfr1Gf6fL3jwnWrWrheqKRseq8au3FONnLeZBB2S7uBlOIcLEviMLhZ6I4p9O4bNFCZuejL9XvDij++XIPs5JPxEGO036feE
-						708d9bcAgPTT97cRNvdm0p+IP6D3jA+AsNQHZPIvJ3OR8FsA0PsUBOk36L3sR/15uQ/W+XvxD8t9yuIfRv6BBkBxvb8TfwMBgH+GGdyS
-						+AOTf/DYu7+OAUCfm0BG/gkVf5b/XPwJf+JPsuGX8CP/fsOvBUAu/yz+AM+JkvwTJv4+AMK6/0z8bd3/dwAFQG3kn7B1/17+sfwnl38L
-						ANn4a6P/9Kx18t9Xqcs/Nv7GpT9B/gHL/wMcACdNPsDyD0T+YwDwun/iGAoAln8XAF/npT+7ZPT/kwyA2z87AXDy4GXVxVM2VgPnba8W
-						kPgDmwEwFuGvOvrfNAMwa+vD1cDxC4su2il9r+w6WfX3yFfvfkMvLb1InXLmLbOj/B9CAIze+Vp1/KQHDn8AAHrDpgGgEZCJ/58rAOxE
-						IIAAkAh4XCIgCwAwkh48Jen35AGA6WILAIsA7AnwEfAD3hD8LGMBkF4SFkPgJ6ufZywADAsBCYAYARwAPgJI/MMsgEYALwWih5cdD8oz
-						AT4CSP4Fd1uwCwDDLglDAHAEOPk3OAAAzwS8zthSIFkOlEaAhMCbAokCIqApBGQmIL0vwALAgJQkEUBSE08JqkfARA2AWgiQVOUh4GcB
-						jLA3gIjiFvcEJDFA0m/UIqAg/wafGhTuEGgdBOEIUUAy3S4EPMkG4p5gEaD/W0IjSn0N+jW1w37tCx+m1+/el6vJGx6t7lh+Lwk6Sfus
-						w0Mq+jmp1HfMjPUxAOj7QmgY7cf3UIITf/7+K5OP9Jv8hw3vLP5GKv1G2EDvAoCl36PvL08Y9af3psl/EH9Asu/l30744QCgzwGPXCIY
-						A6Am/soQ+nyxU37Ccp9M/iH9hl3s9fLHvy/KP/ABgI3AFgBh2Y8X/7tfYPkHftTfRv4H0ucy8CP/Qf4T8RdKa/5N/nnZT0H+AW/4VfFn
-						+VfxZ/lf9mQSAIn8E0H+TfyVbyfi/3hY9//N+VH8QRB/RS77ykb+If86+p/K/8P0vJcASOQfTIX8P1CdhHX/GgAnTEoDwDb+HkMcPTYG
-						gMj/vRwAX+soAET+PzsBsKhlAPx1CIDZaQBcObM66bal1Q+nbqwun7kljP4vCoj85wGAmQA/+g8QAwMnLC26aOd0XaL6e+Srd/+hQ8ov
-						UmecN2IZzwAIryivUgwQJPyeGAIUAMqQrS9Xx2kA1COgHgC1COAASCPgUw+ALAK6EwDhWNAQATILcFZhFmAMPZRK0u/JTwKaTQ9nDgAX
-						Abwp2EcABcDFJP/digDdB5BHwJWEBIBEgBwP6iKApN8iIIaA7gdwEcAbg10IyEzAK0kEcABkIRAiQEMAMwF5BMTlQBIAfiaAoQd9HgLD
-						Acm+kUdA3BdA8q83B4cIgIg4RE7cLAAgufEh4O8KyCOAKcwETCH590eFFkMAIse8H6jNBgCNACFGQH2jsAYAyO8QyNEIqIUAQ/JMJCHg
-						IRFvhZ8xaCKJAEX+P/z7KfJzEvTfLom+3IJM0K8d1H8/wnx6/WbueqmauP6RaswSCoK2Il9nWDtKYg9I7lsxVJm48Qn+M8+FP4G+dyD9
-						Pij9KL9hs1EMfY+CXP55gzt9X9cDgORfAyCemBWR/TNGlH5PEH6FL/MC9N6MI/8k/W69v53sY0d7hvP96f0fN/nWA8BLP4/4G/h8IeEP
-						o/4uALz430qfV7dC/gkc7YlLG1uJvwfLinCTeir+Rn29f5B/DQA+stmJP8v/mvycf4HlvxAAxTX/RFj245f+BPEX+f8ecOIPsPQnl38Q
-						5B9Lfwryfy7k3wVAOPHH5B/r/l0A8Lr/gvyHIz8h/3zjbyb/0x6svjEF8v8AuYcEAOTfB0DY+Av596P/hMj/vdXXPrUAwB0AnQTAynIA
-						8AbgNgEQ7gBoHQAn3LqkuoQC4NJpG2UPgEYAY+IP4Tfof4cNwYqFwTXTVhZdtGMGdA1W/T3yRTU0t/gidchFE9b1KAD4DoDGANDbgFX8
-						Ow2AEAH0pm0KgFIE5AFQiwCV/pT2ASAR0BwAQNYnSgBwBFAA5EuBxu9+oyj9njwAptPD9qIlGgBuKVASAfRBLbcEFyKAxD/sCfARQAFQ
-						igAEAC8F0gCwCAghoLMAaQToRWEk/kZcz+ojQALAiHcExAiwW4MlAHQ/QBYCvCeAHtRyVKjcD2ARwCFAD3oLAIMDgGcDYggkEUBiIXsD
-						NAAUXgpEYmJ3BcQAkAjAsqBEbCA6KjwxAIQ8ACY7LAIsADxJDJDMSQTEAAghAPIQIGxfQNgfQLKf01EAAJJiPyPgEWmWEGBItGuzAzkq
-						661IQkA3H2MTcvHnA/bvZv/cz1iEm5DDrzsl/L7o92zg9z/vARLl7c9UY1ftq7rmbCZRh8C3oiD2Hif0TZjoe4ZMXxcYv/Fx+nNPhT/O
-						Fin0vePlPyz3oe+5egDoUh8n/Sz+9D1conHEn94PHrw/cuEHvMkXOPH3AZAIP2Gj/Yas9U/lfzjg930aALVRf/oMMXhQgeW/HgDY6Aui
-						+Ass/xoAqx7/oK34G7MfeIc+F6P8WwDIMZ8aAE78DT6hDZ/F9BltG35Z/I2a/GPZZyb/Jv4Gy78EQCL/eK6Q8Bthw68FgBN/ln8Tf5Z/
-						CQAb/bdNvxYAUf7TAID884k/Xv5dAJj8pyf+iPzzkZ8aALz2P/EGLP2RADhRA+CESWkAHGcbfykAeOmPCwAb/f/apxEAg5sD4AsWADd/
-						ugFwvAYAmLWdZD4PAKz757/K38cZgAj2BYBBs9cVXbRT+vYfNkP198gXBcCG0ovUKT+csf0QAiBGwED60OEAaFgG9IkEQMMswJ8zAGIE
-						SACcyceCphEwkR5yJen35AEw+f43OQAusgAoRQAHAHi2HgEaAIADIIsAOxHI4KVA9FAJm4LzCEAA1CJAAgAXhfFlYST+MgvgIsCWAyEC
-						NASKewKIEAEcAEaMAB8At2MWwCLAhYBfDiTk+wKwTjhbEqQBYHAAGCQqRhIA7qSgJASIOPrZEAJZBAC7NTgA6c8hoZNNwuUA8MQQ+EBA
-						AORoBCSzApDdAhYBrUJgAck/KMWAJxf0IgWRP1Tif5skX+W//OtX6PeaB0ACvU4zdr5Yjb/rwUIMiOAPbUVB7Fthwj94Wsq4uw8m8g9s
-						aU8r/Jr+HJZ+Ffya8Dds7g3ge19J1viHEX890lMJa/y9+PNovxN/En2/3Cec6c/yX9romxL2CBXE30b+JQDcmn+V/iD/ifgbIv9gwp43
-						O5J/sOm5j1vK/zWZ+Mvt7BoAQf6d+CtXqvib/HMAOPE3vPyDS7CPjJ4hify7oz4B3/BrAYClP5n8hwDQc/5tzX+Qfw2AVP51+Q9h8m+j
-						/0H+NQC8/POJPxYAKv8y+g8PiGv/If5B/nnpjwTACTz6HwNA5P/+6lgKgGPG7RX51wCwjb8i/4cSACb/BMu/BsCwUgDc3WEArO4wACD/
-						nQQAyX+LADjulsUs/5gBmLLp4SD/+RIgATEgAWDSH6B/dtv8TUUX7ZgBXWtVf498UQA8XHyROuSy+XuqUTtI/hkLgBgCnjQKZP3/T1Y+
-						/R87AECHASBLgUj+AQXAWVkETLv/raL0e/IAGH/fG9V3ljxVfWfpU0kE2IZgjgBM0XIAyCyARcAlgITfIiDMAtgRofRwkDsCYghYAPiL
-						wpII4AeRRkAIgTQAQNwPoBGA9a55BBC8HKgQAXxXAIm/Px7UQgDHhPoAKEVAWA6Eh74LABwTakeFhnPBXQjIfoAYAYADQJcD+ZkAf1Ro
-						vkE4hAAJUYiALAQmYlS1EAHxpKA0BvIQQAB4/HGhjRFAwg/CbECBGAJyj4C/VTinKM4JJNwdxEAC/ZhmeU8p/pj8v0dYlJR/jSkcOPR7
-						E7AvogAiyYHXa+r256rRy3aXZd/hR++7SxT/tYE71jyUrOv3a/sZN8IfUdmn78H6UZ5ClP76ef4s+hn+PH8T/yQAWP4lAIL4Gyz8Kbn8
-						j/Lib4T3cV36442+Iv9+uY8Xf5b/RPxF/kG+5MfE/2b6jBJE/m/aJH/F53ZJ+HOwEdjE3wi3++rovxd/Wfrj1/s/lwSALftBAJj4+02/
-						Jv75sh8e/Wf5xz4ylX8Sf+BP+5GRf4KeQ7z0R5f/ePm3AMhv+TX5t5t+TfxF/iUA+MQflX+Qy/8ZGgAm/zz6D+hZH+RfHeAUyD8HgJd/
-						OIYEwAnsJfXR/2OJY3j0PwaAyP/u6uvdDQC3AfgrYfQ/BoCM/scA4EvADlcA3NBBAJD8twqAv0IA6B0ACIBjbl5M8r+p+hFxx7oHNAAg
-						+xQAjIm/RkAQ/scSFtOPGbJ4W9FFO6frgOrvkS96Qd6sv0Cd03/Zgy0CII2AUgBgFOBIAMQACBHAy4DSCJix/+2i9HskAOQoUGwCHksP
-						wO8slgCwCADfMxACWAbEyIlAfjmQLQXyEVC+KVgiwDYDSwTEW4ItAjgE6GGEkagYAS/JLIALAMBHhFoEcADECLAQuBHQg9TwAWARYKcD
-						WQTwPQE2G6ABYBHAIUAP+zwCgA8AI0QAsJkADoF0JsDvCTD8pWEWAT4ELAAEOTaUI8AgybL7AuzOACPuC2iOAVnKQfIPNALCbIALAMPP
-						AvglQZ4QAiS0wodMiACPRkAyKk6UpDoKeFnQm0mX5gS88BM4pYihf6eZ0q8rxWY34u9HhD8uj1JU/HMQAtN2vVSNXLyrGoJR+5yS1HeK
-						k37j9qlrq9GrD+j3QsPIP3//5KQBwMKfo/If1vZD/AvyH2e6RPZLxFkzoAHgR/1Z+HNI+gGJvpEHwAjM6uXi7+Q/We7jAiCXfhb/IP+y
-						5CeRfw2AKP7CTZB/YhAFAHjho98XhT/ng9/8KRN/208lAZDIP0l/kH8NgGTUv7DsJ8o/iT9h4s+Y+Bss/xoAXv41AMLSH5b/p6L8O/E3
-						LgAs/9lNv5B/d9a/iD9Bz0fe9Asw8k/Cn172pfJPz2ETf1n7T+KPs/5r8g9E/kGUfwmAE9lJSP7d5t/jCJH/NACOsqU/SQCQ+PsAGOUC
-						gOS/dQDY6H8eABslAHT9f3MAQP47CQBsAO4kACD/nQTAjOqYmxax/P94+qZqxJ37qkW7bfTfIOlPZgJktB/Cn3Dv41XXsh1FF+2crldU
-						f4980Qvy+/oL1DnX3vl4jwIAU3ptAyCLgE80AMCnFQCgEABnWABkEYB1nyXp9/gAAKN2vi4BkEUAzwIYJP8SAXo/gEYALwWyAEgi4DmJ
-						AARAywh4IY0AFwJyW3CMAASA4QMgiQDCBwDgANDlQDYT4APgpi35EaEuBCgAwr6ALALy04HAsB0k/VkEhOVAAELBYlEIARJ+i4A0BFwE
-						FEIgD4DklCCgswHFECBR86cFRXmjCCDZCzMBFgGKXxZUD4IPmLYRQCKbR0C4WRjy7yFRbooBT0m4hc7k3PAhUPr/PbXlSvh1ZL8uj/+9
-						1KTfUNHPmfPw+wKfvvR+NWnz09XQWRtJ3tfXZb4Jt7THA9FvYsTS++jPPcp/2NwL6PsFpPKP76fCiL9HR/+D+NP3cAlb2+9lP470R1j8
-						6f0iRPH3m3ybAqAm/fZ+pfdyKQCG3RPX+ecBwOf6Z+Jv3AbwucKk8s8j/yr9Hr7gUOUfJ/vsfuWfi8JfYjD9d1L5p89R+kwNy35U/L38
-						2/n+LP8m/kYi/gYJvwUAyX4u/3yJJJ4V9PzI5d/E//v0zAEi/xIAufzb2v/zg/xLACTyrwGQyj+ejRIAJv8WAKn841kc5R/00gCA/IPg
-						Air/cuSn+QV8wwKA5N8d/XksIfIfA0Dk/z6V//L6/04DIIz+19b/9ywA/uFTDoAfT9/MATBk5V6S/aeC/C9WEACLDSf8niXEiJW7iy7a
-						Kb37D/u16u/n+6vHtwAP6KpuWv9sNYLkf2SNV6qRFAAjSfoNHwPG2fRGbRUAbY8CxRuT36CtAyBGQHMAgHYBUI+AegDUIoADoP0sgA+A
-						M7APIIuAeQ++W5T+HB8AOK3iAgsAXQoEwlIgFwF2S3ASAST+PgJkP4AEwI8sAFwEgMv9cqC7JADyCJD9AJGr1pH8AxcBFgBMiIA0AOI9
-						AWkEDMoCwEgigB7YIOwL8CFAwl+fCXiDI8BuDM4jgEMAgkHi72cDQgiQvFgI+ABgLAA8GgExBGIABDQAPMneAJI1HwKJyLHkxRBIYoCk
-						388KhOVBQCOAQ0AphgBLbXMEJNTkOaUk2x4v7Z0QRupB4edjGn5c6dcXoN+L0Cz6IH1tQCr/xoy99H21YHtR6tthgn/b1DUtGTp3K/2Z
-						058/fU+UZN8jl9Flsu8Ix3nS96ZEaib8gL6f4xr/LABy6ffQ+6Um/ir/PgBG4f3G7zsn/vTejMt98F5NpT+c7gP5zwIgLvepX+oFwkZf
-						oPIP4jp/wYt/GPknIP7G8kc/KMp+idkH3gkBkIi/XvBl4m/LfoL80+cy5B+Y/OOkn1z+5ahPDQASfS//cnu8ovLPa/4h/27UP5d/WfP/
-						RBIAJv888u8C4Nte/JUw+q/yf44GgJd/EORfAyCXfx79J0z+w+g/OYIt/UEARPkHcfT/+In7eeQfHDPeBQBG/8fK6P/XPxMBAPnvJAAg
-						/+0DQNb/twmAsP4/BsCxNy+ufjyDAmDGpuqWZfeRzJv001934+/dDID/ez/6r4y5a0/ZR7tB36uu+h9Ugz+/X70GDv5fSy9Op/QeOKoa
-						vPmFHgUANuH0KADApxUAoBYA2Ej0CQSARoDdEIwAmP9Q+wAIMwC/lwDAAwsBcKEFQNgPkEUA7wV4ph4B9AHvI8COBkUEXEriHzYEuxDA
-						jcFxU/AL9QjQAIgbgwEeYjEAOAKIPALsVCAfAvGeAL0sDGgEDMoCwLBZAIkAuTMgRICGgF8OJCHwhkABYLcG+xjgCOAAiBFgIcBSAjkh
-						iTHyAEiWBCnjAAmS8A6TB0ApAuzo0BACEDcInAMBIMiMAIghQOhG4eYQEMLSoDZBADoJAaMo2BmJsDfQbfFvQenXAMKvO/xeyuI/F69B
-						gXDkKr2eRth7QX9GI5fuTkbtOyFI/pQ20I+dRvJelH8W/hwVfvo+iyP9Ef7+awgADtlE/AW/yTcX/7BnRgPAhN+Dy7xM/IVc/N3pPgaL
-						f5T/XPr9Wn85NpiEXwPApJ/Fn6U/4jf6yoEEJv4i/UH+N5H0AxcAY3e/UZT9Epue/bh+xCfkP7vhF/IfAoDlH6e1yeg/i7+RiL9gy35s
-						vT8I4r9CT/2hAPDyHwKAnjEm/yDIvwaAib/Jvw8ArAxAAHjxZ5z4G2fNTeU/rvkXwtIfJ/+AT/yxZz6e/+QH+cbfKP8Eyf/xkwDkXwLg
-						2Al+9P9+ln/w9Y4DQOVfA+Ar3QoAyD/B6/9jAHyxFADhCNBPPwD+MwUANgH/ZMYWYnN14+JdJP1PKVkAEHEWQGYCltDfe8av21/16t9V
-						dNJO6dX/9v+vavDn96tvv66jSi9Op/S+Zlw1fNtLzIjtL0coAEYgAEpwFACJArzJPpsBAP78ARBmAYi5D3a6BOi/MogATD+frwFwoQUA
-						gQBIIsA2BecRAOjD3kIgRMBKCYBSBCAALsPDhSNAAiAJgSwAJAJsP0BcDhSOB01mAeSm4DwCrncRwAHAUAA0RACOCQ0RsFUCICwH4gCI
-						EZDuC5AAMMLmYOBCwAeARYCcEhRJlgSR6OcRADgAAEuSBMB4pXUESABgNsDgCPCQ4HEIMDECLARiBET8siAOAhLUnCQEDJbcFJPfJAA8
-						TqxL0t2OdtKeU/+xcclOq9H8JjCyn/wz93tOqct/EgAETuYZuXQPy3pHFET/1sl3NTJh23O1AODvj/x7hqiN9iffdwp/b+qIvxKWsyXi
-						b9TF3/Cj/EH4PfTe8uv8jfw2Xz/iz/JP72ds7vXiz/KvARA2+Bok+37UP5F+gM8UJpd/3ejL0u+JAcC3+iIC6H/js7sk/DkH3/51YbNv
-						HP1PxF/hY5o1AOyCLx8AUfwNkn4NgHTZj574w6P/Twfx96P/Jv7+nH8LABv5T8RfMfm30X8v/8DE3zb8WgBA/I0g/3bkJz2nvfzHE38U
-						coN45r/Kf3AMPfmH5f8AuYoEAOTfB8DRYfT/zx0AJP8dBQDkXwJAlv80BQDJfycBwMt/ygGAY0Avm7mluowC4NoFO4L8hxkA/P3uLACy
-						5T/GpA0HqlP69SwATh/Y9RXV4M/vV59+XWeXXpxOOX3Q9B4FwIgdr0b5/9QCQCNAhf+wBUAWAYczACwC5nS8ByAGAB485y96kmcBLiDx
-						RwRYCFzkQ0AD4HvLnmEsBDgAdCYAhKVACACNACwF8hFwGdAIkBuDswgg4c9nAfrrZWHxeNB0JoBDQJcBWQSEG4MBPVCNGxUOAI0ALAWq
-						LQcCFgBuY3AIgfDwjyHgZwGKEQA4AuT24CQANAIsBILAuBDIAwCky4EkAnwI8NIgki4PJMwfF9oYAip6foNwvkcgzAqECDA0BEhQQR4C
-						BgS2KQJASYpbxUAnJCJP/34j+Y9lVPw7kH9bwtP0zwP6+6r//um1aSP/DGKLXvNhi3YW5d5TEvycWzKGL7svSr/B3ys62u/gvSb8/aWQ
-						1Ocj/UH86Xu2vtyHvo9J7Iuj/ST7OU0BwBt83SbfZMkP5J+oSb+nIP9DDHrfM/Q54M/2j5t86wHgl/vgZl8Tf5Z//jzKieLvb/V94ae/
-						Kwp/zju//KNb9hMDIJ7vn8k/oM9j2eybyr8t+4niL0D+TfxZ/k38DZZ/CYCw7AfyrwGQyn964k8u//G0H1n374/6tAAoyj9h4m9Lf1j8
-						7dQffkYDEf8g/4B8wMu/uEJB/slFEADHaQAcOyENAJZ/3vjbeQCUTwA6zAHAy3/aBEBY/98iAK6tB4DcAtxZAJx421K+BRgMmLOtWkIB
-						sMRG/wn5ey//zQEwbTM53pXDi07aMQO6TlcN/vx+9enfdUnxxemQc4Yu6H4AAA2AwVtfPowBkEYAB0AWAXkAlCIgD4BaBDjxj7QPAImA
-						1gEQI6AeAABrPkvS70EAAN4DwAHwEgfA+YskAHwEcAAARAB/aMcAsAjw+wFkFiCLAN0LYFgIxAh4nvEBYJuDbUNwmAXILgqrzQbcXQ8A
-						wAHgZgJiBMi+AJ4FcBGQhAAe3IwGgA8BEoAYAUBnAxACJPo+AMJyIKCzABYBFgI+AAyJAJJ/PSko7g1IYwAB4KmFgM0GJDHwLoVAOQA8
-						UfreY3wITAN5CBClCMjF3xNElmTXqMuw4EMgp2UY5P9fCywA6v9fBzJPJP88+zWWfk/N6OvhXyOi9hry60yv9763q6Fzt0TZz8jFvh03
-						T7pToL+fsPMVkv7yxt4o/HqiD8m9P8ffj/R76Rfxf4tJj/L04q9n+nvhzwnvFZX+BvlP1vhno/4m/uFuDw2AcLqPyT+99z1xaWBd/sMm
-						X1vzvznK/02OXP5vpM8qG/k38Qc46ODeDjcC/+aP/84/hwVAcb2/wzb6+gAw8eelP5n8g1z8vfxfjKU/LP9PJ/IP7KSfVP7dZV9O/JlE
-						/ktn/bs1/0H+JQD8UZ81+dfR/6L847x/8gFb+mOewC7BbuHkHy6iAXAsj/7HABD531sdFQKAxP+QA4DE/5ACAPJfDwBZ/+8DgOS/owCA
-						/HcSACT/HQTASbcvra6YtbW6ggLgillbqiX3UQAADgGLgeYA8EuApm2iP5t+o4tO2jH9ur6vGvz5/erTf+h1xRenQ84bsbxHATBo44u1
-						AChFQB4AtQgoBECIAPfGTgKgYRbgEwkAcBgCoNNjQH0A4KKZb/OH7FO1CAizAAAf2oQPAMBLgSwAXASEjcH0kLBTgXwEhKVAGgH5noBw
-						OpCLAA4AjQALAbsojKEAkM3BaQDwciALAMXvCfAbg2uzAfQQlwh4jQkzARoB8b6AGAHJhWEk/HkEDCsEAEcAkQdAXBIUI6BVCPgYSGYE
-						SPzLm4QlAozGGMgiwMdAUwREYgTkBIFVguS6ELC7BVqdLARy0c6py3wzthchQj9Hg9Az/v/3hB8TN+6GUX3D/74z8teniEWWRtfU+16v
-						bpuxIUi/F/8g9N1hIlhdDZ63reKz+iH9JPv52n7Ax3hmp/ok8g+c9CfyDwoBEM7yz4Q/Sr+TfxV+j9/cmwQASb6X/3ipn8i/bOxX8af3
-						dnnUX+SfN/i6ZT8m/iz/YdRf8PLPp/xoAIj0R+RY43oALHv0/aLwl5i4581qIH924jOU5L8QALbePwaALPcJ4q/y7wPA1vvn8g9Y/BWR
-						/zQA7Jx/E/+LWPwFv+bfxD/IvwbAefPTALBTf/wlXww9K3npD2Hyz2f9e/nXAPDyL0t/Uvm30X/xCARAJv+A5d8CIB39P6oYACr/hMj/
-						pxgAt/sAgPwXAoCX//gAIPknePTfAiCs//cBgOU/LgAGNgXAzBAApwxeVl2JAGC2VPN3ksyHALAZAOVe+t9O+BmKA2PKxgeqk68eV3TS
-						Tunbb+hVqsGf368+/bu6Si9Op1w49q4eBMAr1TXrnk8DQCPgcxUAoBYAGgFZAEzb9zbLfUn8PT4AbtUA+LbOAmA/gEVA2A9gcARkswBA
-						I8BCgM98JvnnCKCHhT8a1CLANgTLpuD0xmAfAGFzMIdAGgAcAYREgIaABoCRR0C8MdgiQG8NziIAhFkADoHXGFsOxCHAD/5SCOiSII0A
-						kASARkCXk38fAWFZEElNDIG3BA0AD0cAYFlyIUDENdQECT8iwJAIIPEHeQiUYqAQABYBjMp/OQbeF0hUbcNwUxAEASY5bgqBToLASES9
-						Fe3E3wl9q5/b/7eFKPu135P//WZ4wfeEWRWAuOLX1gfXe9XEHS9Wt6j4F6W+U0j8jZsmrK6GLb2Pvhcwyl+XfzvHvyb8HpZ/fD866Xfy
-						H0f97fsZkPzTewCY+Jv8cxzTe8U29rLwezLxF0j4gYp/GPnH+9QhF/+l8i9r/U38VfqD/OuNvl76lXyjbxB/QJ9FANLPn0uKl39/o+94
-						ej1Ksl9ixWMfhBlUk38LABP/IP/E5fS5bKf92Hp/CwAv/iL/JPzAyT+W/LD4G07++XZfk38LAJJ+cKFi5/xzADj5B+cF+Y8BEOR/nlz0
-						lcq/XPh1BmG3/J6u4h/kn+hNz20v/6dB/vms/yj/QLwBHuEv/DIPOVAdx/IPnPwTIv+HOwBE/v+jBEDvYSuSAJi9/bFqqQsA+XsJgSUI
-						AP77KP1LHZPuPlCddu2kopN2Su/+Q4eoBn9+v/r275paenE65bsT7+5RAPS/69nPZgCATyQA2s8C5AHgI2Dq/W91HAC2BwC3UX4Lpypw
-						ABAUABYBNgsQQoD3AzzNEWAhwAGQRYBc+tIiAgheCqQB8BMNAB8Bl+MBVYuAF+khVg+AJALoARnvCUgj4Fp6qFoExAetBABHACER4GYD
-						khCQWQCbCWBcBMQQiAFgxKNC0xhABBghBDQA6iEQTwjKIwDECAASAOG0IA4Awd8bYDRGgGERwLzHNEWAJ42B9wUS1xABHpLdPAY4CEri
-						TGJdoi7fny7h16KbnEtinxNE3zHjwfeEsJRK8BuuGXpdS+D1HrPu0bLUZ9w0sQES/hKD5+2oJpKE1jb2Qv4tAOj7zWQ/h78X6Xu0NNrP
-						4m/fy4yM/EP+09H+1gFgd26Y9MuMm6EBQO/FeKGXEN6nLP/1ALCTfQwb8Q/yn4m/l3+5f+RlCYBNjuTzCOjSH8LE39/qi43Av/7jvxWF
-						3/Mb4t6X/1nkX8Wf5b8k/vQ5LPL/XDryr9gRnzbqL8QAsM2+qfzLpl8T/yb5l5F/lX+QiT+P/kP+XQDYyD+LvxJG/+n5KPIvAXD6nCj/
-						IIg/PZtF/vHsFvE35LKv6ARwBfEGkn9CzvuPDsJr/zHyTxzD8r+P5b8UACz/SQCY/B9KAJj8ZwHgbgFOAqCjW4B9AKwsBwAv//EB4O4A
-						sAAI6//nJXcAJAFwpQTAGcNXVf1mb+MIuJICYMaWgyz9nhAAipd+sOw+YcL6/VXvG6cWnbRjBgybpBr8+f3qM6BrafHF6ZAfTN8aAmD4
-						duNl5RWKAYKEvwbJP8AlIx0HQKt9AB0GQIyA5gAIEdAiAEoRkAdALQIOJQCyWYApezsLABwDGgJg2yvVeRQA31r4JH3QIgAMCQHbD8AR
-						oBuCixFAAWAREGYBVkgAcAQQcjyohADfFEwPHYmA55MI4BCgB1UxAtZQBJDwgzwCOAToAXk1IxEQlgQBergacSaA5F8jIO4JiNhdAbIk
-						6DWJAB8CWQAIGgBZCMgpQQpGHAsh4CPAQiBsEN71FkcAhwCRBwAvCSKBAn4WIAESFiLA8EuCIHItYiCLAE8pAEBTBFgIFGPAKMix0S4G
-						2lES+AQ7oUhlvvhjHOHn1h/fUvLp9+ZH89P/v3vyn76+Ar/29OcxbPG9ZbkvMIjkPrKqJbfP2VqNu/c1Ckf6flH8KL+RzEAB+h4sSj+g
-						718jLnF7U8jE3wdAfH848S/Ifz7iXxL/2iZfwp/sw5Dw+82+clJYg/wH8VdI+G3Drx1GICP/+YZfkn7gxB9co7z5z/9SlH4A8Tee/fB3
-						btRfzvYHJv625h8BwPuyNAAS+cdRn4n4xwCwjb6J/Kv488Zfel6Y+BulZT9B/hc9zgHgxd+wALB1/0H8DXoupvKPZyZJP1D5t5F/2fRr
-						8k+o+PPSH+JkACdQTxB/gE/EpT8i/oac/MPyTxytAXBUtwKAxL8pAEj+QwC45T/xFmCC5T+/BdgHQKtLwHwAtLgFOAkAyH8nATC3bQCc
-						M+rOqt+cbRwB/WZvraZserhact/TyT6ApSz9QikA7P8bs+b+6vSbZxadtFN69x+2SDX48/tFFbS59OJ0yqWzdrYIAMwGZOKfBcCl9OFy
-						rJd/4MQ/0j4AJAIOdwBIBCQBAJz4f5oBMGnPm90OANwDgAAACACeCXARcIGPABcAPgJ8AHAEELIngORfIyBsDC5GwPOMDwCLgCsUHwA+
-						AmohkM0CGBwAbiYAxD0BcRYgDwF+aNOD3CIAcAAYJPwgj4DbKQKADwFbDhRCgCOgHgI+ANIQIPnPIsAIAQBIpoTCBWIkYXF/QBoBHAIU
-						AB4Z2c1iIESAR2cFQEMIABFUjYBCCHiSECD8MphUmFNah4H//xvAzxGgf6cN/uKzSPnXxujvIf/9CXXxN0oBkIj//vpFXVPuf7u6bdYm
-						knYv960Qwb9xfHtumrSmGrXhCY1H/T7C95SjLv/4PszEH9D3bR4AErYF6af3AojiT+8Plf0cv7nXiBt8hbC516D3r6zzT4/19PIf1/pj
-						fxDJPnDS7xHxFxLxJ1Lpd0t+SP6vBSr+Xv5xo+/Db/2qrfyDj3/3ryr/EgBh1F/FP8g/IPmviX/hmE+DR/4JW+/PAWDir/IPgvyT+IPv
-						ACf/tuYf8n8+yOSfxZ841x35+c1c/udKAJj4Y9lPWPrj5B8E+Qd4XtPz3Ms/Rv8RACb/6Xn/JP8aANFL5OSfYyZIABzNAaCj/z4AePlP
-						d44A7U4A2Oh/HgCQf0KX/3R6C3BjANzQQQCQ/LcNgHAJmATAeXesqfpTAAhbq4kbHqyW7nmaiDMAy5gnmaVAhd+w/2/k6j3VmbfNLTpp
-						N7hbNfjz+0UVtL/wwnTMZfP3FALAR0Am/lkAfJ8+NA5LAIDPQgC0WgZE8t+4D4A+0OoRUA+A8fe9wQHQLgL8EqBhO2IA8CwABYCPAASA
-						jwAfABYBfDoQffjXI+BZiQAXAGkE0EOGHjqyHKg+C2Cbg+sRIMuBeEmQC4AQArofII8A3BUQIoCIewJeEegBXQqBPAJsSVCIAJ0JSGcD
-						JADCzcEIAIOkgzEZcQHAEcAhQPJCYuMDQIgR4APAiCOnoOECMZKxPASEdFmQBUG6zIMigIQfpMuCIhYBOT4EppL8g3YRkGOinMQAKIl2
-						gfbCX/732tLpr0f//1T6jVTuPYnoA3o9BZF+TxIA9Ocx/p6Xq5smrqluJMFvSUHybxy3sjXjV1ZDlu6txu9+o6X814Q/I/2+zeSfvu/j
-						Mh+TfxJ8N8ovvE7x7FDhz7GNvR4/4h9P9nHiT6SbfCH+hsp/Lv0Ov+THSz+TiL+Qyz+A+Bsbn/24owAAmJm4EvIPMvE3fnKnG/X34q+k
-						4i9c7OWfhB/Yen9Z8w/5J1T87cQfBICJf5R/bPqVAMA5/7n883n/hNzwW5Z/G/mP8q+bflX85ax/J/+AnuVy2VeUf8A+wI4gZ/6bR7D8
-						E8cHJ9GTf1j+96v8uwAIo/+fTACI/PsAIPE/DAGQXgLmAwDr/zsJAMh/OQD+KgmAGRwA35mw3gXAtmr8+gc4AJZRAIj41wPA/t5Yrgxb
-						sbv65pD5RSftnK69qsGf3y96IZ6tvzCdc+XiA1XXthcdLykvV10UAMBCwPCzAvhw+MQDANQCQCNAhb9dAJSWAXn5F9oEAOhhAIyjh3C3
-						AoDoooefBcB5FAB5BFzgIsBC4DtLYgBwBBAIAB8BfDqQRUAWAAYC4EcYaeIIkFmAZDmQ7QdwEcDHg3IAxAgASQRwAEgE+BCwy8LswjC7
-						LOw6kn+QB4BFgN0cXIoADgHbD+BC4NYsAIohACAkJPxNx4X6EPARMIJkvykC0iND9SZhwofAHZCyDIiavzsgCQEiDQHBIsCDCGBIQI0k
-						BAwSWQsBT0n8WwF5TuS7REnGldK+g3aEf4d+bsP/9/w/zyn9HiD904xc9nPotQNe9IPwA3rtPfizGLXu0brce0py77ihgevHrmAGTVlX
-						jdzwVFjeky/xCQFA35Ol0X6W/myk36ht7FXSABDp57X9hgq/H+0Px3qS6PubfHmpj9EQALLUJ8L3hDBx5D8VfxJ+AyP+JPv+Ui8v/yb+
-						DAYqVPqvoc8xwwfA7AfeaSn9HhwOYWv+EQBe/C/DUZ+Qf0Cfx5B/0Er8bY8XB4CKP7CRfz7jH7D8SwDwsh/IvxN/HPWZHvepS38y8Q/y
-						zyP/bukPxN+t+y/KvwaAyX94HtOzmzf+2vPcyT8v/QEq/3bmv7gF+QZ5iASAHfspAXB0ywAQ+e9eAKj8awD8R7wF2ALgh1M3VgPmbiO2
-						8z0AY9YeIMl/SmYB8FcSe5F+iYAw6p9D//9tS3ZV53YtLDpp53Q9pRr8+f2iF+Gd8ovTGQOWP+zkvxsBoBGAyz4ONQBqEcAB0H4WIAmA
-						hgj41AMAqPzHANAIIPG3CBh7b/cDYDg9DM9dkAbAt0j+AUcAIRGgIaAB4CMg3BbsIsAC4AfLn2UQAbWZAAIBIEgE/ARYBJD4+wiwEOBZ
-						AA6AGAK1zcH0kByoAWD4G4ONWgQQxQigB7oQlwKFECAZACECNAQwC8AzAST6PgDCkiBAUiLLgdJ7A3wAhBCA6PgQING35UClJUHC24wP
-						AY4Bkv1SBIzVY0PzALAI8MQQSJcHtQoBI0RAjgsBv1SoLM2dUZLwGl7qO6X08xClX0M4BamBougTEkkOfZ0kplT4c+g1zwMADF6wKwj/
-						DZ6C2Ddhwg+uu6POrXN3VHfsfLUu//S9GIVf1/VjhL+0xCfgjvLMsHX+tqk3kX8V/+LmXhcANfE3nPz7EX+G3u8G5D/e5msB8HKCrfEX
-						0gCwU35M+iO63Ic+w3Lxt4u9hm5/tSj7Nf7479Xap36aLP3x4s/yH0b+47IfL/6Xqvgn8r+cpB+o+OfyLyP/T5H0gyj//px/ICP/WH4q
-						F32Foz69/EP8ec2/QQHg5Z+Ip/14JABqI/8m/xoAXvxF/kn89bKvVP4fFN9gF3HyT8jo/+ELgPIG4MMRACT/HQUA5F8CQEb/mwKA5L8H
-						AQD5B7gFeCDJvzHqrn06A0Cw9AvL9xAIASf8OTctuqe6YMTSopN2gzdVgz+/XxQAvyi8MB1zzerHqmFbXwzEAHAhwDHwSgLHAAUA3uC1
-						AAC1ANCNwO6NCv4yA+DQ9wGMuff1bgfAiJ2vVd+kD1tEwLkL0gAoRgB9oNssQC0CdE+ARAA2hLkI0KVApQjg5UAUAHI8qEaACwEfABwB
-						d7lNwRoBCAAjRsBLAZ4J8BEA6MErF4fhIRxDwJYE5RHgjwr1m4M5BEgObEmADwGLgMYQICmRCCD5L90gnAWA4CJAKYYAyZacGFSOAFse
-						1BQBODbUHx2aBwBDASDLhGIEeEw+SxGQi2saAhEfAjlF2e4mJYnPaf7xLdboG/R7KC7jUcLv1f/+W9Ak//y6OuEHMcjoz+m+16ubpqyr
-						ib+X+k64DtyxvJEbJ91Vda17jJf2BFj8U/lvCgDb0FuTfvreN+J7gSDZz5f7pNIfqW3wzUG4431L7+Mm+Q8j/orJvuGX++QBEMRf8eJ/
-						bYBkHxTE3y71uoo+8372u38tSz/4Y+TAG7908h/F35/2Uzrf3wdAFH9b9kPSDzL5Z/EPS39E/k38/eh/WPbD4i+Y/PMtv07+ecOvBQA9
-						50ryz6f9JPJPz1GM/Ls1/xwAXv7x/OZnun/u1+UfYJBRXOOAO++fxN/oOABI/LMAEPnvJABI/A8pACD/hQDg5T8+AEj+8wAIy39aBEDh
-						ErBaAPDyn+YAwMj/VWCe/HX46r0s88spAMCyhqVAJa6bv626cMzKopN2g5+pBn9+vygA/lh4YTrm+jVP9igAUPCf2QAALQKgcR8AiX5j
-						BLD8H3oAjNrZ/QAYpQFgEXAeIsAFAJCbgi0AntT9ABIAhg+AYgTofgDbE2AhYAFgEWB7AnwE8IbgJALksjCLABDPutYQQAAwMQKA3Rjs
-						Q8BuD5YAeJkezCANAQsAIR4RGkKABMFHQBICbjagGAIsJkAjQOHlQCQ4cmdAHgNvClkIWAzkETCKhB80RYBhEeAvEPMUQ6BNBCQnCJmo
-						OlKRNcEVghwrUZzLQWB4YT9UbG8Cg58zIYp9K7k38t9HhMIH0O+9uJzHo1JfgiXfv9YJ8az+MZuera4n+W8U+05Q0b92TIllgUHTN1Yj
-						Nj9P32fN8p8e42ny7wKAvte9+CfyT+8PgYQ/x0l/pCD8RLzJl2D5x/vWiT+/n3Wdv+KX+TBO+oP4K/54T5Z+HnBQWPgjYaMvINE3IP0e
-						XOz13Ie/ayn+xus//wOLf5B/Ff8g/8SP6HNYSAPgElCT/xgAEH+Wfy/+ipz0k4l/Jv8Ax1ALUf7DZl+FA4DlX2769eLPy36c+Iv845lK
-						z1wLAHpWAxN/k3/g5R+wJzh3gFtIAJD8u/P+g/zz6T/dDQAd/T+kABD5P+QA6OQOgE/xFuD/MnBWdfX8HdXV83ZwAFxNDFu1J8h/dwJg
-						0a7Hq2vnba2+O3ZV0Um7we9Vgz+fX11dXf9HCoD/XnhhOuaGdc90GABpBFgA4HrubgVAFgF5ADTuA6A3fz0CmgMgRAA+RJgsADQCPqkA
-						iBGQBsBIknkLgHYRYAEwZtfr9AErAQAQAHkE2CwAk0WAhcBFiAAXAAABICAAsGYUpBHgA+DSVc8xSQToLIBtDPYBgP0A/sKwGAGEzQIg
-						AAySf78noB4CcjpQjACgEUD4ALAISEKARMGWA8UQiBGQLAsyEAIkJwABYCQhQLLjkQjQY0NJlkoRAEIEhBiQmYBkRoCkP4+AEAP3aQR4
-						SPhtRiCZGdAIwM3C+e3CSQiYrCrNIQDSGJhCwgxMnkuinYdAiZLsG4n0g9q/X/pvFqBfr6zTz6D/LxH/bsh/UwCE19NeYyW+9rpUS/+s
-						Bi/ZUxZ7jxvR95Sk/xqSfWFpnTtWVLct2cuDE/lIfy7/tQCg7/PaaL/C7wHMkJHs84i/Sr+HR/zp/RVR6af3oWHiHy/zMumPN/nyxV6E
-						LfNJ1/rHAPDSn4r/y1W+ydcHgEl/kP/1Ufz9qP8AA59v9Hm36+WfdxQA+LwfsFaO9zTpN3jUH7gACOKv2BGfnu9D/jUAIP95AED+gYm/
-						DwATfxv9Z/kn6Wf5V/H38i/r/iH+Rib/LgAg/kYu/zbyb8/tU+wZr+IP0hN/vPzDM2TZDwIgyr8PABL/NgHA8p8EgMn/oQSAyX93AyDf
-						AFwIAF7+4wOA5J/g0f/DfAnYl66ZW10z/x6JgPnb6e93VENW3pcGQCL/aQDwsiBlzvaDHADfG3dX0Um7wX9TFf58fvW68cb/sfCidM6A
-						4dVNdz9bDd36AvEiM2zrSxEKAFAKAAMbcxAAh7oPIAkA8FkIgFbLgOgDrHEfQAcBMPyeQwiAezUAQgTILAD2A/CeAA0AwyJAAiBGAAIg
-						jwA+HYhDQDcGZxEAeClQFgD1y8LSCAA+AAzeHExIAAgDSPyBRcBVACFAD956BOjFYfTATiMASATwbAA9+H0AhBDAUiCDJMLwARBDAOLh
-						QoBkRe4LiBEQQoBEJywLMvlh9BIxEqbiTIDBshVDQDYJuxgoyL/wDkcAk4eAksQASSbwIZAHQRBUL64ZNfklcW6KAU9zFHiizPv9Bjn+
-						xwnpzxNFvgD9+lpT+j1GfBQx9Jo0EV43/9oSifgDlX+Am2QHTVlfFPycsugXGE2y34Jrx6+qbltxgEMgrvFPxT9+75L465KfVvI/jN4b
-						JemPl3gJyYg/ve9E/N3JPk7+JQBU+nW036/xzwPANvjWl/u8LJ8bG4x6APAm3yD9Bok/kS/58fI/AJ9xxLJHP+goAH7zx3+jZ8Orifzb
-						kp80AFL55zP+gRN/u+QL8m/i7wMgrveH/KcBYOv9TfxZ/umZkyz7ycTfOFsD4CySfRDE33Dyb89TDCB6+QdB/vEc52e8jPyHDb+QfyIM
-						KAb5h3vEdf+tA0Dlv1sBQOLvA6BbR4ASLP+H4w4AHwCf8CVgGgDHDFpYXbPgHo4AyD+4ffl9sv6fxR4B4CIgmw1Y7pi66aHqmrlbqx9M
-						WFP20m5w0iVd/0l1+PP3ddblXf/P0ovSKb0Gjqxu2fBcEgBDCwEwrEUA4I35qQQAqAWARoCTfk8eAKVlQHkA9GoXAKApAEAtADQC6IMR
-						DNv+arcCAGDj8Dkk/0BCAHsBCPpwtgjwAcARQB/sWA6URwDPBNieABcAfFkYIoDkP0ZADIE8AiwAShEQQ4CkP4sAzAJYBHAI0APTR4CF
-						gI8AkAfANZgJ0OVAeQjEfQHpLABD4g9CBIQQSI8K9REQQoBFRQLAU4oADgGiFAH5jIAFgL9NGHAEeEj4bTagNCNgEeApBgHJZlMEGJ2G
-						QC67Isgk+02QfDdRk3SD/r0Ekv0I/nc30J+j+GsLONnH7ykj/z0b8prg1KWUicAkvwmSfhDvfHi7GrnxGZL6FYngNyGC34oo+lePWtKS
-						a8aurG5dvIdneEOgKn6ZjxGkH9/vCi+No/eEBUC6zMeN9CeQ8AMVf7/B1+NP9Qny7wIgir/Ify79yag/UPE3+HhPJd/gawFwFZEs9wEQ
-						fwXyj883nPrWXv7Bv1XzH3qXA6Am/oA+f23JDwji7+Q/3O4L+df1/on8q/iz/BcCwJb9fBtYAKj8lzb8mvjzyL8il3xlI//E6fTcLMo/
-						UVvzT4TnuD7nvfwD9gf2ifS8/2Mh/6UAaLv8h+DlP5/0EaCHegfAn/cSsFMG02eIC4BriVuX7a6W75XR/xU6C+BH+r30+38+Yf0BDoBL
-						Jq2tevXvKrppp5zR75b/m+rw5+/r1Mu7/pfSi9Ipva8aXd2+6flq6BYfAKVZAJJ/joB6AODK7cMfAA0RgA8CJQmAhgj4ZAOgIQJU/msB
-						oBEweNsr3Q6AcffFALAIOBcRQB/QjRFAH+ylOwJ4P4AGQBoBzwg6C5BHQLgsjB5Gl5D05xHAm4M5AnwIvFBdDgoREEIAD0uwTvYEJBGg
-						y4EsAuJMgASARUAxBDC9TwHAEUDkERA2BgckAIw8AAIsKhoCLgY4Akh68gAQNAAIvy/Ak0ZA4cQgY7fgQyCJgT2RVhGQ7BdQ6S9hswL5
-						vQI5JSEWSoJ9aCQRkFH68UZ35b/VqH7t906vTXE036Ny77GR/nAzrxP/AP0Z3rrwXpJ7CH4LMtm/ehQk3yhL/lVtGDhyMf11aXXDzC3V
-						4DWPlaWfvre99Iv4vy6Q5HuSS7x0k28pAPwov5Gs9af3anKyj8LH/zr55/1ATAyAVPxJ9g2Sfhnxd+JvI/+FAGD5twCgzy7A0u/hz7fn
-						+ecsC3/Ov1VbnvtYT/lx4k9c6k78wcVedrmXkYz602e5EAMgP98/oAEQ1vsrHAAk/Kn86yVfhB/1t1N/eLMvPevkkq80AE6nZyUCwJ6f
-						ccMvib8GgMl/fH7rqT/87C/IPyCn4Nt+1TnEQ0T+P50AUPnvVgCQ+B9SAED+YwD0/A6A7l0CduaI1dW1FACCBMAtS3dXKygAIP/FAMhY
-						oYy6cy8HwI+nrK9O69ezADjzytv/36rDn7+vXgO7/qb0onRKr6vHVkM2v1ANoQAQXmT8bIDwMsUAQRGQA7FvCoDGfQD2BlY+0QAALQLg
-						k9wHUAqAQZteSgKgVQTg/0MATNjzZhIAgAMgiwA+HchCgD7YJQLy+wEIEv8kAogQARQAPgIsBPiECQoAiYDn6hFAAZBGgIQAZgEQAIYP
-						gBAC/NCUADBsOZDtCQC2HOjqbBbAEyKAHvqCzgT4ECCBABYBMQRI/vMQIPIAAGE2wIVAsiyIZCiPAMZHgIuBuLQijYA8BOTEoJR2ISAx
-						4DYNZyEgy4PeDXQSAp6aFDtKEh0pCbjxbluSJTgZyc+ltx/bTchlyr/+ltDr0Ur+w56LRPjt9QZR9JvA7N/1E++qSb6Ryn4E8l4S+5yB
-						IwuMWBwYMGIRcxWFxg2ztlW3rX6EnwUy4q+yn4Hbs+Novxzp2XSyj9/c20r+ea8OvUdbyT/fBaIk8q8BkEg/4Zf6sPy75T4m/xYAcmeJ
-						wPJPn1kl+e+31m70fT6c6//ur/5YEH7PvzGPvfPrRPzDOf9EPOIzFX8jin8MgO+6m31r8k9cSM+JmvzrGf8m/+DcQF38sdY/bvhNA4DF
-						X7GR/yj/MQDCyH94drsjP/n5L05gjpDLPzAHKY7+dxQAIv+dBsAndwSoDwDIPxHW/zcFAOS/uwEA+S8HQOkSsAvGra2uW2gBIBFw85J7
-						wwyASH5nATBk+b3V1XO2VJdNu7s65crhRTftlNOuGPyfVYc/f1+9B3T9U+lF6ZTe108g4X++RwEQptwg/TlO/P8cAQBaBgBQ6f8kAiBG
-						QAwATB93NwBwSUweAOeQ/IelQGE5EDZrpRGAAPARACQCYgiEOwLcLIDfEwDsiDmJgOeYfD9AckJQiIAXOAIu0wAAeQBcyQ9OjQAXAk3H
-						hCIAmEIAcAQQPgDs8jCLAA4BEgkjhsBrEgEuACwCkhCAuDCyLMhigNcz82inCwEiDwBQmxFQfAjwjcIaAYZFQCkEBA2AHMhkho+AUgh4
-						aiFgkAg3UZRmRz0I6nQq/DUKP1crwq+Lfk85td+zQ14XFf0S9Jp2Iv/jCvCfE/3Zda193Al/RCS/iRaCn1MQfk//4XWuGruqun76lmrQ
-						kvur29c9JSP9Jv+EbejNYfF30h8h4XcBkIi/Qe9RCXUn/7zMx8t/esLPDZuyYz1J9g1Z42/UA6Am/jwwQdKfLfcBLP7GXZB/CQAc7XmQ
-						xL4s/oYEwDu//GMq/jbqz0t+jFT8eeQ/k39Z60/iT9iSHx8AvOyHng/AxJ+B/IdjPuPoP+Q/3+xbk/8sAIL4G3iO8rM14sXfyOUfz30v
-						/ye6W35t5B8E+e9xAJD4ZwEg8t9JAJD49zgASP4tAHj0vykAIP8SAPUTgMoBIMt/2gRAWP6TBsAlUzdW1y/aSRFAUACAm5fsCjMAvAwI
-						f79XJN8Lf86ghTs4AK6csbE6uYcB0PuqIf+oOvz5++o7cMixpRelY26Y2qMAGLzlpfimc2/GQFMAtFoGhDd7BwEQI6DTAACZ/DcEQK+O
-						lwF1GgAaARQAeCh0NwDmPvhuYwBgQ3BjBHAAxAiwELgQEcABIBFgswDfXfoM4wPARwDPBOBhxDxHD6YYARwCOgtgESAhoPsBSPwNngkg
-						8gCwy8IMviuAHrzAIoADgIkRUJwJAGEm4JUQAUZyShBJhYEAYFwA+AjgECCJEV5nfAjECDAkAiQEyhFQiwGSf5kVeCswMo8Bkn1QDwDw
-						tpweBPIQICCVeQyMJRmNEZBTCAKiJMQBkukmfAQcDprEv/Rjc5Jfm/v1H275x83NcealIPpN6J/XjTM21cS/KPNNOMlvoiT6Rr+uhQUW
-						CMOI4Yurqyeura6bta26cdHe6pbVj1a3b6Rnikm/UZR/el+R/DMq/iz/9H7M8ct8RP5J+N0mX3BDgOSf8NJv4s/yD3hJIUjF3xDp95Dw
-						awD0J9kHQfx15B8BcAUjAbD5uY8z4c+RAAD919JnqYo/CJ+3+Owl2a+t9y/IP7gok38LAFnzj5F/yL8GAEl/kH8NgLDsh541su8sBoCJ
-						v8m/D4Az6LkIvPzjqE+75Mvoxc9ffT4zDzE2sMfPeH32e/kH7BLOM5LR/2IAdH4EKMs/B4CO/h9SAIj8dx4AkP96AMjyHx8AJP95ABzi
-						EaDdvQMAF39dT/KPCOC/LryH3uc7q5V7n2Eg/ysdsiwoFX/8c1wQdg3JPwJg4OzN1Uk9DIC+/bqOUh3+/H317TfkxNKL0iln3Dy9GryZ
-						AiBZBhRDYAgJ/hAKAMAhsA28HLh184vxTadvwnYBcPhPAtIIUOFvFwClZUCHNQCAyn8tAAiM5nQ3AJYcfL86O5F/wQLAR4DcFqwhgFkA
-						fMi7AAAIAF4OFCIADwyEgATAd5elAWDwfoDwUNLlQD4ENADyEJAAMCQCeHOwDwENACNEANAIAJgFkJkAkn+NANsPkOwJABQAQj0AGBYI
-						jYAQAq/JTACJvuFDIMQASYvMBkgEWAjEJUF5CGA5hIsBEn1PLQQ0AoaT+AMOgBySfVCeEUgjIF8mZGIZMOGkEJAYaBUEIIaApyTKCbl0
-						Z5QkvS3083qK/90afrlO6f9vAL/H8PtNJZ9F3yDR90T5dwFQ+nNQ0mijCNzyfHXV6GUNcu8py70xoIHWot8AxF+5cmjkiqHzA1fSzzlg
-						3F3V1dO3VNfPv6+6aeXD1c3rn65u2/JKnFFT+S8Jfxjtp/eqbfAN0q8kS31U/mUvEAm/jvrHpT5CuGnc5F+FPxn1d9IfRv4JE3/GpB9L
-						fgyVf9zmCxY+/J6T/Zwo/wCHRNioP4/8A/rsFVL55+ObM/GXIz5J+PPRfxN/A88FekZ4+QfngZr8xwDIL/gK8k+cQc8+L/8s/ir/4ZZf
-						euaK/ONZrM9nlf+w4Vc5aQrkH4j48+i/eoT3jM4DgMTfBUD3TgA6lAAw+e9mAHRyBwCP/vsAkA3ASQCE0f96AHTnDoC/GzirumHRLmKn
-						AwFwD8s/C39CKv2e+fc8xvIPrqIAOLGHAdCnf9dxqsOfv6++V3adXH5ROuP0m2e0CQCiRQDcsumTDIBuLgOiD5LGfQCHIQBqEaAfcsUI
-						aBEAF9EHdB4AoFUArHr8w+YAcBEAzjOSCEgD4AIlbAzmAKhHAJYD+QDAZWEWAReHAIgRwCHgAiCGwPMV7guIESD3BNhMAEMRYLMAHg4A
-						eginswEuBGw5UCEE8ggAeQDYvQFpCEgEGMUQ4FFLyIvcGcD4ECDh98QQKOwRIOHPY6AUAbUZAaAzAhYBnlYRYCFQjAGQhUC6TKhMHgMM
-						SXNx6VAJkvlOyIW/c+kHXvzLFEfzAf8ey793EF6nmvB7muXf/jz4zyf82dkFXW9VN827hyQ+F36jLPYl/Mh+t6WfuDITfs/lQ+eVGZxD
-						gTB8cdVv7OpqwOS7q2tm76iuXbC3un75Q9WNa5+ubiaJD8t8AL9H6yP+QfrpPR43+Jbl324UByz/9PkhZOIPnPSz+NNnUxj1J8n3BPEn
-						rriTPtuYGABj7n1DZb9Z/I2ZB95m8Wcw6s8j//R5y0gAxLtbCPrcjuIv5OIPgvgTMuovmPjzyL8GAMTfsAA4Z96jTC7/gJ9v9NwDp2sA
-						BPl3o/9e/nn0f0YU/5r845nP8g8nEPEP8g+cZ7QNgMbRfxcAHa//1wDo1hGgJv+f0hGgh/kOgKNuXFDduBgBsIv+upNH/gEiYOX9FADE
-						isIsAFiVMX3zQyEAwAlXjii6accM7DpJdfjz99W3f1ev4ovSIWfcMjMGQMezADEAbtr4Ar/ZehoAtQg4lABomAUIU4wtAuDT3AeAC1Vy
-						+QetAmD90x8VA8AvAzJ4FsBABNCHvZwM9FQSAgiACzQAgARAjICLbD9AIQJ4OVAtAjQE3FKgiASAnQ4UI8CFAAWAbBBOAyBZDqQgAATd
-						IHw3QiDGQBIBLP8xAPzNwUa8PCzGQLg92IVAEgAuAm71EaAh4JcFNUXAEB8BWQyEGYEWERBiwCLAoxHgLxbLA8Aw8TSClGJGwOFDIKck
-						xEarMOg4DjL8v98O+XecyDuZzyn9+lN07X6GhJLKfUb+OubC7wl/LlkAYFZnOH0uDxi5pCj1nlzwm+gHCoJvsOiXINH3o/xGkP0hGSr9
-						lw2emzGn+sntdX5822zmsq5F1RVjVlb9Jt1dDZi2pRo4d1d1zaL91XUrD1Y3rHuWxB9LfEryLwFQEv94m6/Iv436SwDI8Z6Mk/5E/rNR
-						fxv5lyU/9QC4jMDeglbSb/yaWPvUT8OGX8ADLiz/+OxV6V9Wvt33InyOM7Lcx+TfRv7T9f4i/yb+gDf60nPFY+v9S/Jva/7xfIP0g74k
-						/MAHQG96zkbxF1j+iVz+k2c++0BB/oHzjCQAcvkHbZf/dCcAenIEqI3+WwCk6/8P9xGgPb4DwB0BOmjxvRwBgwISAZD/VYgAnQnA36+6
-						30k//t4xYf3+JABO7GkADBh6iurw5++rb7+hfYsvSoececusHgXAoA1tAgDoG9fzaQZAiICmAABNAdBqGRBGOboVABIBZ9KH6S//0FkA
-						AATAluc/7jgAShHwLfrAt5kAiwALAINnAvDw4AAgSPwxC2AzARYCFgDCs/UIWAXSPQEAswA8E6ARACQAYgRczgEgEeBDgCOAxN82BnME
-						cAjoBmF6mMcIcCFA8JIgEgK5OEwiwIdA3CCshBDwERBDwPYIlCLAQASEy8OyGGiKgGRGQOGjFTUCjKYIGEHSD2ohYLgQKAVBSUYDNYnN
-						7hogMW6iLNGRYhw4eJlRJvTdg/4bHYg/KP360iU8bQSfXquc4uvZQJP8W8yN2P5KNWDUUpJ3SL5RlnvAgt+KVpKvXJHjhX+IJ5X+uuwL
-						P7ndqAt/Ez+6dRZzKT2vEvDPhyyofjJyWXX52LuqK6dsqvrN3FH1n7e3umrpg9U1q5+orlv/fJB+EX+SfSOXfiKM+gfp95DwAxN/k36P
-						yj/E38ClXh/+5k9F6fcgAPa//suw4Rfy/4MVfr2/E38jEX/B5D+u93fiH+Qfe8V01N+W/LgA8Kf9nA35zwIgyj+Jv276lXP+nfjzc1QC
-						wJ61YTYeI/9u2Q+Iz3p5/p/Ig4VR/kEu/yDI/yEHgMh/9wJA5V8D4HCcAPSZOQK0fxoA3xx9ZzVoyb0cAZD/m1wEYNRfpN9TF39j+Kr7
-						sgAYWXTTjhk4tLfq8Ofvq9eArjOLL0qHnEkfrhIA3dkH0BQAEgH5m7MxALIIyAOge/sAOg0A4MTfcOIfaRMAoCkAAH04lgIAfPy7f+1W
-						AOA6eQRAu30APgDyPQEIgCQCCB8AgE8HImIEPF2PACJGwLOM7QcIIUARUN8cLAHwY3pAgjAbgAcmPTgZnQWwmYAkBDQAjLgprykCJATC
-						caEcAa8wtRDII0BDwPYFxAiwU0hcCJD8SwTEADBKAQBsn0BTBPgYCGes49jFJATSTcJ5BHhiCJD4Gy4EfBCUxDRAkuuPFS3FgFGKAU9R
-						toukm4/b4aXfLjwr/7yR0q+Pwe8j/J7877kAvT7N8v+WQBIPTOxz0j0cQpjJoT+/66aT4JZEvhXZqH6T9NdEP+PymvBHSqIPouynlCS/
-						REn8L7llpjIjcrPjphnVD2+aHrj4pmnVD2+dU106dHH141Erq5+MX1f9ZMqW6spZu6p+C/ZX/Zc/Wg1c80wUfzfyn8o/lieK9Hu8/PtR
-						fxN/4+n3f1uUfg8C4KWPf6/yT8Jv8k+fw5B/EMSf+C4+q2uQ9AMV//yYTyDyjwGiKP8+AEz+7XIvHwAm/ib/gGfC6XnoR/9N/vlZqs/Z
-						KP94Lkfx5+d6eM57+Y83/BrdD4DONwD37ASgngcAy38IAMg/UTwByAcA5L+7AQD5LwdA6QjQi6dsrG5aem91E0XATUsoAICGAJb+rN73
-						LMk9KMv/avrnxs2L7kkC4IR+PQyAAV2nqw5//r56Dxh6TvFF6ZCzbp9T3U7yjwgYTAHgiQFAbAUxBIZsfZm54e56ANQiIHsDC20CAHQr
-						ADQCnPS3CoDSMqBDD4CGCKAPyKYAwLnQeQA0RQACYN/rv6AP4HIANC0DyiMAH/h8OpALgTwCwp4AuzGYAyBGgIUARwAHQIwAvizMhYDc
-						GJyGgA8AQ24M9hFAD9NCCPQDJPz/f/b+A8iOI1uwBK2717p3x3Z2d2bWpm16x3Zn/v/1dQmqoiY0EglJaA1CA5kJrTUeNKEBQmutJUEF
-						ShAkQWhJWWQVyWKxqkiWrl9fTk/73uvu1+OGx414EU9kJoB8ZsdeJgmR+R5BnON+PYKHgNkJAPm3EUA3DOMhELlxGAi/HwFjQfj5IeEg
-						BORLhpoIYCFgdwOkCBBHghw/dsRFABLsBhBBBHCSIiAAZD8hAghahQ4FAAekN20M+Iiy7SGJehpCvw7+XkVivmb+PQrA65Ek/wsRkPg4
-						yXfA+2P4iWO+ZdK2N/KKfRLDZxskuSe05MeBsh+a4Tc42fdxso8r/BxZ9hESfk4g/Awu/BYu/Vr8Jz6j+k5c7egzfpXHSk1vSx/8cdM2
-						qqdyO1X/BQfUgKXH1KDVL6ghG15XQ7e/o4bvvQL/H5IDYCge+LWHfgfvD4s/MgjARRxJ+hEUf+JX8P97nP/XAeDkPxj70eJPYz/w/2ou
-						/3SZz27srr5c/t3dfbX8RwMgcplPFgB65R/+DuPir1f9Cfj7UMs//N0ZlX/7dy/9XQw0tQFA8k83+nJ//2v5zx8A5Bz5AwDEP08AaPnX
-						AWBX/ws6AJw1AFD+hQDQq/9xAYDyD4hXAOIBAPJvA8CM/+QJAO8AMAUA3gF4MgaAjQD8GO8BoC8D+jpKvr/6D880AgTs1xFgrgqEB385
-						jarmi26alsrqWe2sDt99j1bVuU7Si5KW9vA/aAwAEwHhAJgRCQAeASYAxh19r8wBkD8CQgEQEwFpAqA2zwF88u2fUgcA/vN3P/ttpgCI
-						RAD+D58CgEUABoA7EwB/gQQRYALAXSLUCwEMAHcmgAUAEY0ACgGQfi8C+E6ADgH4S3aYJogARAeAHQmiEKBxILpzMD8TwENAR8BxJAiB
-						UACwCPCvFuTuHWB3A4hwCAA0EuTFAD8XEDok7LAR8KIBdwTiImA2yD9BZwT8S4dy5AAgPtc7AnpXgIm/TzCOkhAFIMHFBAEnJPCJ4Oy9
-						8M/x18hD5PcUMP+Ofy9h9Pfqvw4WN8qTUv5phT/ASD/dGXr6wYsg/dtB5ONW9NORV/IJb4U/LPwBvvQPwnEePdITR37hx7EeIhB+H1n4
-						OVr6J4DoI4L4I73GrQgYu0L1HLvcsswwBhht6DFqqeoBz70mrlG9p29WfXK7VN+FB9VTy06o/s+cVgM2vKkGb7ugBoO8h+Qf/t+H1/bf
-						femrRPHnjD/+gT7sq2f+tfybAHDi7wUAib8Z+QHp9wKAi79eCIK/E7j4d6RLfOJVfiLyz+/y693dNyT/8Pch/J2J0N+fLexNvrj8m7+T
-						7d/f9Pe5J//aCUoYAG71XweAlf9MAQDinzoAjPyX9QpAtXgJ0O+O3ADC/6qasutVI/4EyL8LgDdB+AmQf7PaH4g/rf5veuFCNACqiwuA
-						VjWzOlodvvserapmdRVflJS0g/+JTz8ZEwDPsgBwERAOAJyvLFUARCKghAGABBFQ9+cA3v/FHyPyj8QFwNUvf58QAPnHgKS7BSORm4W5
-						ADARoEMgEgEmBOhMQJ/dNzU8ADQQAHQugEfAQIgAPQ4Esu9HgA6BgwY/ABA8H+AiAAhGgj7UEVBDASCEQBABQQi4S4ayEKAICEIgCABO
-						ZCzoOSIaAi4CYkMgGgFEUgTQgWEXARwbAfzGYlIIUATgGQGOFAOIFASIE2CSY4+oRIclXEb6eQDIfwjpxwgEX4vwe70WsEgDP1YgOqcf
-						RyD+eeUfce9JIP7IzKPXVNXcHaLQ+/gr+pxEwRcYMhMkH/Gkn3CyLyHI/8Cp+YU/JP6e9D+lR3v88R4GSv+E1Q4n/14A9AbZJ1D8exIk
-						/yj9BIk/0H3UEtWNGGnoOmIx8LSjy4hFmq4j4Z+PXq66T1yruk/brHrkdquFB86q3/3pn4F/Ub/7x38VxZ9Y8uqP4f+pIP02AMKX+DS4
-						q/w48bdjP0z+gyv90A4wyv/l4AZfIPxEByv/YfE38t92o7mzLxd/AgOgFfwdifCVfy3/iP27l/9drFf+Efj7Xcs/+3vf+UCc/CPML0IB
-						gC4Skn8g7/gPkHn+nwUAyL8LgIKvAAQkHABOewnQ0l0BKAiAx6Zs1/I/BSKAB8CUnS9r8AZgKP44BrT/DELyTyFgOAA/ZsXxtyMB0Lhm
-						geimaamsznWxOnz3PVrV5HpIL0pa2s/coqadeE9NwwggQP4JjAAHRADe+Evz3EeaMRAA+IcsiAAhABD2h5goVQAEEZA2AEwEpAmAcp0D
-						QKH35R+JC4D3IBh0AMREgA6APGNAFABEbAQAPAC62wAgKAL0mQAIAHPTMCEC7C6AOxzsQoDOBQQhwANAo7fVkWgA4P0C+D0DggPCH5oQ
-						APGnw8E8BoJzAdEA4CHADwcHyBGgrxbEQmASiwDChQAQCgEbA8FoUDgC/BAgdASEQiB8+dDQrgAihEBSEJj7CkSDAJGCAJEFOICHQDFo
-						kQf5zoqWd+/XCkE/Jg9J8h9+Tazgw+uJhFf3A6KvfyD++P7MOvm+qp6/WxT6JIbqy3EyBMFHnOTHwOf2OaL0E072fWTZR9xKPyMQ/oCQ
-						8Fv0iA8Tf0n+e49baRHEHxmD4k+A9I/G1X4SfwPJv5F+Iiz/nWsWGqoXqk5VxALNsOlr1W9//w9R/vAnwx//Efgn9bt/+Ce17ZUbqseK
-						l1TPdWdUr22XQgGgr+9vr/HPxd8A4g+Q+Ifl317tR4t/IP+08s/Fv70Wf4OWf4Cu78/Rq/4I/T0Jf2c68ber/xgA9Hcw/R1t/t4O5B8J
-						uYBdIPSdwZd/xMm/DYCQ/CN5A4Dm/ws/ACwFQPzqPwVAeP6/tFcA4gEgXAEowyVA28zdZwKAwN0AHQAmAnZBAGjxxwjg0q+jIAADYO7+
-						1/XNvziN4c+N5KZpqaye1d3q8N33wG9eelHS0gH+EogGQBAB2QMAif4hjQ0ALwL8AKiP5wAiEYD/I9QIERATADjS48s/IQUAjgwlBUCW
-						MSA/ArqwCKAQCEUASD/uAtBOANEbI2A3ghFwU9PX4kdAOATsmQB7MJjwAwChuwZTCJgrBAURgNBlQqsPmwAgKALiQ0COADws7CKAxQDu
-						BOjdACECiLgIIOgGYpH7BwAUARoQfYTHAA+C4GZi8RHAoQjg+DFgYDIKAsvJEgSEJMocSbJLBYq69M8lnNgnsICAr9sn/LrgaxUWfQn3
-						OuNrrgHxZ+9FDq/48/Q+WehTIkm9xOAZAiHh54SFfyCO8hBM+AeESJZ9jbDa3y8EE36OIP8010/i30sTjPuEV/wNON5D4t8dYfKvV/QJ
-						LwC61CzSkPwH4h/Iv2Gh+ubXv5cjwOPEK++qdoNzqu3g2artIGDIHNWuapHqMHa1enLSBtVx+g7Vee4B1eXpk6rLitOq67qzqjvIvV71
-						tyv/oZEffrUf+PtCH/Rl8u9W/kH4CXdzLxr78cSf5F//nQh/R7YE4Uec+OPfs/bvXfz715d/En9a/eceYOS/FAFQ3AFgKQDKdQC4+CsA
-						hS8BKh4AjlwClM3/x1wBqM/yY2rqrtcsrwKvBEAE4A4Arv6j4CNc+MPcVJO2vRQJgCZFBkBFTa6b1eG774HbH9KLkpb20zdBANyCACBM
-						DEw7+b4m2A34QE2HAJhOAWCJC4BIBHh/kA3mDzr/gx8KACQuABAr/5EAiImANAFQW+cAznzy64j4E1IA4KHh5ADINgaUPwJwKxlDINgF
-						oAjgIRBEAGJ2ASgCdAiwAOAhMIBFAIWAdJlQMw5k7hxMIeAigIUA3kDMRYANAT0SJIUAyL85G+BdKpQFgLlkqCEIARMA40H0CT8ANBAB
-						SFwE6B0BGwFBDAhBAIIvRQDh7ipsx4NmvRREQGwQoFgCUhAgFAE6BAgWAT5cfCUxTkIKAh9J1pOQxF3E/vrmawnGcRIBWZeQ5J5wku9B
-						B7XptSbpd+8FRN2o5UdFqQ+N8iSQV/A9wpIvgCv7XPYZYdkPk0/2OU9N9qV/DUg+Sr8g/p78uxEfK/9G+gOc8Ft6oPQ78V8G0o8E8u/G
-						fGLkn8Qf6YQr/oQn/h2Hz1dPDjPc/PhzUfh9Ltz42Ml/m4HELNV6wExNZX9ihqbVU9NVq37TVCX8uMrhC1XrEctUm7FrVbspW1X7WXtV
-						+/lHVfslL6gnn3lDdQS55+IfGvuBf+cu86nl3wYA/P1GASDLP/5dCQFgxZ/P/YfFH8G/0wPxJ7gHpA0Aco38AQDinycAovP/Wa4ABOJf
-						ZABo+XcBgPIP1OkVgEwA4AHgabtNAODzNB0BJgSmAXgZUCP8GAHBToAfAHgAuGbdyQhNihwBqhgxq7PV4bvvgQcgpBclLW3hf+xJATAt
-						EgBsFwDAMwClDACE/0/htjgHgMQFABIJgIvq9IffRsSfkALg6z/+SxAAMRGQfgwoJgIwACwYACYCrhvsWQA/Anoh3k4AjQO5ENgTjYCn
-						MAAoAlgIUARQCJiDwSYACLpzsB8CdBdhvhNAEcBDgEfASJB/RF8liMeAFwFBCID4CyEQFwHu3gF+ANgICC4hShHgxcALBikAEDca5CLA
-						hICOgbggAMFMigBOKAQQJrFSEBCFBIEPD4E4Qj9eEn2O/TnBzwOBzwOt5kvij0jST2jR169heuh1H7P2eVHqOUP0CI9MQYJPsLl9Tn7R
-						x9V9HxD7PMLPCQs/h0m/xZ/tR6LSjyv94dV+J/6Akf5A/v0Zfz8AutTgij+xSHWu5vLPV/uN+BMdhs3TvPzWVVH4id9o/qi+/MW3qg2T
-						fxL/sPzPNOJvqYAAQFr0nRrQZ7KjeW9Ds96TVHP4cS2HLFAtq5aqijFrVatJW1SrGXtU5bxjqvXiF1WbVW/qu/ry1X8Sf5J/pOU69ncl
-						/L2K0CKb/jvXl3/9d7f5O53/Pe87QMkCgK/+6wAo5ABwlgCw8/+pA8DO/3sBYFb/eQCA/LsA8Of/4wIA5N8GgFn9zxMA3vw/XgHoe6PB
-						D/e8Dhj5nw7P03e/qiMAmQ7gjcBI/gOiAbD++fNiADQu8hAwXgnT6vDd92hVlWsvvShpaQf/Y08MACBpFwCvAuQCAEkIACkCShUASLYA
-						QNIFQDkuB4o39vLFn+NHAF4KFAU+eRcgGgCRCEgIgODyoOEIMIeD80eAPhiszwMEZwJ0CNhxID8A6K7BPAL8m4bh+QAXASwExLMBAEWA
-						OSAcDgACrxYkRYC7ZwDCIsCPAQwBFwEESH9kJEgHQBABPAZcBCSGQDgCgrMC4SDgERBgIsCFACEEARf+eILV6kgIcECWkyh0t6BUmN8f
-						v44okvhLYo+Ev+9gbt8f40nCnNH4sYMu8Tph+xlR6pMoSPR9uOxPDRORfRzlIXzpn0wkyz4RXen3YcLPwdX+cQFa+N14DwNE3435oPSP
-						AdlHrPh3Y/P9kvx30fP9gfh3rka4/IPwWzoOJ3DFf56G5L/90Hlqx9FXE8TfyD/RfeTTIPy46h+s/FMAtHrKrPqT9CMtQfgRI/5TIuKv
-						5b/XJNW010RNkx4TLOMdjbsD3cYZek5SjZ+apZoMXqCaVa9QzcauV80mb1fNZx1Uzec/q1ouexX+vnxHX+YzdKlPkn8A/052f0fbv7e1
-						/KcKgLAr+PKPhAKApJ+Td/wHyDz/zwIA5F+a/w8OAANa/m0AxB0AznIFIL36HxcAdv6/RFcAajJjF0j/644ZEAAIRgAyA9jHxP/g2XAA
-						4OfE4sNvygFQ5GVA8V5YVofvvgfeBEF6UdLSFv4HPvXETeCWRp8HsGcCHCD/hg8cJgYgAI6ZAEASAwDx/kAjOgC8COD/Y9D/o8gUADYC
-						7P+AfNKMAaUJgEgEpAwAigC83bsk/oQUAN1BxJMDoLgxIB4B5hKhFvh9KQLoYLAfAf79AugSoToCQP4ROhcgRYC7czDCQwDk34wD2QBg
-						IaBHglgEBCFg7xtwxGDuFxCNAL0b4AUAJ3Q+IBQCwbkAfjYAoQhwMRATAToEgFAI2BgIjwbFR4AfA1IEEJEQIFgI8FEhOQKQzzTB6Iol
-						IsUCINRJUBykQZJ7B17WlOGucgRfQwj9e4ZxXw9+valIL/7uNcTXVxOV/0l7zoHEyyv4+RClPoGBelXf4gk/Iso+JyT7YSTRR0j2fSTx
-						72Pn+Tm9UfqTxJ/kfwwHxX+ZhuS/mxN/C5N+Lf444kPiDxjpD+Sfr/p3xNV+veJvMOM+gfyj+GuGzFWLNhyOkf9A/Imx8zZ74o/Sb6jo
-						F8h/Sy7/WvwNvviT/DfpafHF38p/o65jNY8zHusy2tB5lHqsk+GRjiM1j3WboB7rM009PnCeenzoEvXEqLWq0cRtqunyMyYA7N/X9He3
-						L/8I//s/7eo/4uS/4ACg+f9yHwCOXgFIj//oAEh7AJgHQMwB4BJfAajr4sNqxt43QPpJ/oMIQGbuedXM/1vxDwLAfs6YtvNlVb32ZIRG
-						Rd4IrLJqVqXV4bvvgbdBll6UtLSB/4mHAwBJHwB4IzD6wxYEABL9wyoFwJ10DiB2DEgIgO3nvxTFn5ACYABIswuADLsAoQBAUuwChCMA
-						AgDZgRHArg5kQ4DOA2AE9LQBEFwi1ALi798vwA8AQkcAQiGAN9exEcBDYCgCwk/wnQCKgOF6JyAgFAA2AkwIyBEwikdAKASilwxF3D0D
-						eAxAAJgQkCOA30iM4IeF6X4CU0H24yKAwEuKRkMgiAHaFUjaGeAhwAmHABIfAxxZnD24fCcgxUAg+AF4jwMD/DxLJAAY/MeFRp4Y4e8z
-						QfAFaOwqeD0D6Scm77+oBs/cIsp9PhLlPoEBCFvZ93GiL6FFH1f2fbLLPmKEP4wTfgYf8SHCK/4r3IgPiT+ipZ/Q0k8Eq/18xr8zrvYT
-						IP6dtPhb+beHfEn+acaf5J+v+qP4G+aoUXM2evIfFX9i8cbDTvwJI/5G/rX4k/yD8CNG/AP5x3EfJ/89J1n5n2Dg4g80svL/hMWI/5iI
-						/D9qxR95uOMI9fCTNeqhDoz21erBdlXqoc5j1OOTdoTkX1r9R/jf/2kDgBYa4wOgPh4ApgAIz/+nPQCcNwD06j8PgKQDwJvY/D8PgOAK
-						QMPXPadmYgDsBfFHIABmwvNMLf8mAEj8tfzjsyf+BN71VwqAxkUGQMuaWS2sDt99j4qqXHPpRUlLa/gfsgkAEwHZAuADNeF4fABEIsD7
-						A20wf+D5/wD8/zmYAMi/C5AmAMIRkP4cQKGXA5UiAANgzdnPRfHn8ADAz0ceeb+gAIhEQIYAcONAXgTwEOC7ABQBiL5MKIXAHkMkAvZE
-						I4BGglwIQAAgZjfARACFgI4AuxNASBFgRoLCIcADYMTRjzQjASkCpMuG0n0D8AZi/k3EIiFgI2AiyD4SFwH8nICOAEcQAflCwN1g7EWD
-						HwP8nIBPmhDgBJJrYkAMAgLkuqA4QCgCpH9XBKGvR/qaLfz742IfrObHE33dAumnqzhNPXJVDZ69VZR7xBd8QpJ6jhb8JEj0p0gEsi+L
-						fkC/SUQ62eeEhZ9jhR8P9HJQ+scGkPgH0m+gER895iOKf/TqPl1qDCT+nfQBX4YVf+RJHPMhQPw7OFD8QfgRK//t8Co+AI71SLIvsfvY
-						a078zbiPoaUmKv9G/A1a/C0o/kb+rfgDEfH35N+IvwXFH0DxJ7T4W7j4Ez+EAEAeaDtcPdwvpxotOm3/3jZ/n/O/3/nf/ZqSBwCIPwuA
-						8s3/pwkAPv4TBACf/09/AJhfAcif/xcCQI//pL8C0N/UrNPz/7P2vaEjQIs/MIuAAEAOvXULuKkO2QjwxR//+ZaXLonyjzQaPld007RU
-						Ds81tTp89z0qqmc1kV6UtLSZ9IyacvymAeQfod2AqRACmpPvB4D4ExgCWQNAigA/ABD+P4i0ARBEQNoAiImAogIg3S7Aolc+jQi/jx8A
-						k5/9KEUApBgDQoQAkCKAAqALyD9ClwilCKAQwLsG+wFAOwEuBHQAEBQCt3QE6N0AkH0/AvhY0CA7EsRDQEcAjQN5I0F+AHCCEPiARYAJ
-						AYyAUAiA7PMICEIAxJ+wEUBE7iRMuwEARQCPASkCKASCGAD5ZyFAY0FEvhAw+CHAYTEAokpEBTY/qaMgD4WsxEui71Mq8Ze+d46OKQwr
-						Bwi/hV73qcdugfxvFwVfYuA0gyj0MfTXq/kevvCHRnhiRB9xsh9GkvskosJv6BUn/b74h1b6SfoJPt8f0BXRq/0ECL8e9zHiT/KvxZ/k
-						v4pYGIz5WPHvgDD5d+IPtNPiT8xRbfVlPXPqy59/Kwq/43eG02evaPEnjPhb+UfxR3DVH4QfMeJvVv2b6nEfkv+JGi3+PSxc/IEnuiJj
-						1eMg/IgRf7vqj/LvVv5HaLT4P2nln4n/gxYUf84PO4xUj43baq78kyoAwo5A7sB9IhQA1j9CARC7+s8CgI//iAEA4p86AOz8f+oA8Ob/
-						KQD06n9cANj5/wxXAEqc/2cB4F8B6ImpO7T8z97/hn7WoPjT897X1GyAVv9R9vluAIEBsPToWVW19oTIE8PmiG6altY1uSesDt99D/zm
-						pRclLa0nrg4C4HhMAIQiIBwAE1kAIEEECAGAsD/UhA4ALwL4/yD0/zAyBYCNABD9QseAogFQ2suBTn/uo4jw+/gBMO/0p+EAiI0AkP4S
-						jgHFRgALAYoAvRvgRYALATsOFESACQHaCcAIiA0BOw7EDwcTdCbAnQsA9JWCdAh8oJEiAMEA0Bz1Q+BDFwI6BrwACLABQLsBMTsCmmch
-						BlgI+DHgdgSs/PsRYLARQCFg8WOAgiAuAjg4MhQOAU44BrLsDsThx0F+6OckI8UAR/o5cbiRHQ/97/F78L4nH3qdJPnnr+/0Zz9UQ+bu
-						dFKfhkSpT0IQfYl+JPoSWvRxZd9HlnyCr/ITgez7MOFnhOf6jfx351j57zYqLP5a+gmQfif8DJR+IrTqD+LfcTiKP5f/BUb8LW7GP7Ti
-						b2g7OBD/NoOAgbPV5ZufyOKPWPlHrr3/Y1WBK/8k/31R/I38t+hj0eKP0m9o2gsh+TfijzjxB6LiP86Jv5Z/Lf4GLf44798pkH8t/oQn
-						/pL8a9oM0zzcZ5Z6YuHp0N/v/O99cgHfEXz5R5z82wDgHqJJPf5zGx0ATrwCkB3/yXIAmALAm//HKwB1XXwE5P+MDgD3rOU/CIDcvtdA
-						8G9ZAuEP8RbO/58W5X/4mhOq0bAidwBGzHzU6vDd92hdM/NB6UVJzbjlCQHAIiAmAKbA5/wPnb8L4P+hlQKg0HMAUgSkGQPSAYBkHAPS
-						AVCiMaDRR9+PCL8ED4CVZz4rOAAiEQDyL+0C6ABAEgKgC4h/KAJsCOCNw+hgcI+d4QBwIUBnAkIhYEeC7MHg2BDwI8CGQHDPgCAE6FKh
-						ww6aABgGso9IEYD3D8AAMHwYupNwKATsjoAUAbgbQOcCOBQBLgYgAqQQICgCkmPg0wAWAUlB4GIgTwgQXFIjgNjyGOBIMpwVX8ZLCv76
-						CUjS78B/D0jft0iC/ONrPOO5j9XQhXtDK/X5EMUe4Sv5SYDgP5WAlnygL47v+Ijij+SXfSK8ym/RB3kJJvzeXL+R/gASfzPaw4nKfxdP
-						/Lnwa+wBXxL/jnq1PwCln9DSj2M+NOOv5/yRYNzHiL9Bi7+Vf7yW/4tnLuWVf+Srr39t5N+J/7RA/AGa80eM+Fv5Z+LfpIdBiz+u+tuV
-						fyf+uOpPK/8g/IgR/6j8PwzCj/CVfy7+fOwnLgA08GMfG7FONV7xlhgA9XX+3wQArf6bAEg3/18fDgCbAHAHgCkAIvP/JgBw/n/k5pdU
-						DsQfIfk3AfA6PAPwPGf/6yD5OAJkAoBLP4FXA6pZf1IMgKGrj6vGw4vcARiRu9/q8N33aD1i5nelFyUtLccsUZNB/g23NDoEbAxMAflH
-						ggBgIWBjgP/B8wMgEgHeH2yD+YMf+h8BEA2A/LsAaQLARQDbBUgTAKUcAxqw90ZE9iV4AGx590vVTggAKQJ0AJRrFwCEnyLA3w3Qdw/e
-						SSEAEQCEIgDEn0cAhQCdCcAI4CEQOh8A8m8iwNw5mIeAjgB292DaDXARgIDo406AOBKE0FiQEAEae8UgGg2KiwBCBwCHQgACAJECAKHL
-						iPoxEA6CTzUUAXEhQFAEaED+iXwh4BMKAYYowAwu+KVAlHtLnLj7hMQ/wo8D4PsjSOTjcK8JvlYe/HXE171q6eGw4Osr78iIMi/wFM7r
-						x+HLPh/fkYSfI4r/GlHyERJ9ibDwG3qyWX5OD8QXf1zlp5n+GPnXK/0cLf1EjPzjaj+Kv+VJLf6B/HfAER8Sf0RLP2HEn+S/zSDCyr++
-						pv8szY4jr8ZKv0+XqnlW/AkQfz3vT1f3YfIfGvcJ5N+JPxARf0/+jfgbtPgDD+PMP0i/ln+a9wd88U8l/22GOh7qOVU9Me+58N/7JQ8A
-						EP88ARAd/8lyA7A0AQDiHxn/Ceb/a/UAcMorAP3tiPVO/sNgBLyun3PwPP/QmSAAeATQ58CmFy/qlX6JgSuPqqbDc6KbpqVyWO5vrQ7f
-						fY/KkTP+XHpR0tJy1EI1+dgNOQJYAEyJBICNAAgA/AOZJQCkCChVAAQRkC0A0o0BRQMgEgEpA6Dr9isR2ZfgAXDg6s+jAWAjwA+Ach0G
-						9ncBOBgBeKlSDABDEAGhELAREA6BcAAQOgB4CHgRQCEwmLARQCEQjATZCGAjQTwGzF2EgwigG4lJEYDg5UPdGQEbAzoAvAgQQwCxEUA3
-						EouLgInu8HAQBOHzAiYENCD6+UIAoUuL8hAwhEOAw+XVh4eAhBQEnKh8p0f69ZLI//Px62Xg1+99PxLukHXotcErMglAhFUvPy6KPkEr
-						+6LIp6CfXs1nMNn3EYWf0JKPq/oSKWSfr/Sz1X4j/Bwr+wLBXL8d8YmR/2Cu39B5BCNG/oP5fiP/TxJW/jsMM+JPBOM+RvzDM/6+/IP0
-						W4Lr+c9SizcdjYh+HMOnr3Hyr8XfguJP0CFfJ/5W/ht3x1l/s/L/RDdDRPyt/D8Gwo8Y8Ter/lr8Sf5B+BEt/lb+ufhnDYD7Cfg5j4xY
-						q54ANwgCIOwG5AzcI0IBYL0jFABxq/+pAoDkP00AgPgXGQCh+f9yHQBOvAJQ9ABw4+m7VO7AmwYQ/zkHAHxG8QfwGVl46E0t+YeZ8NPn
-						BF7/X5J/pP/yw6p5VXE7AK2G5/43q8N336PFiNx/EV+UlFSMnK/GH7kuB4COABsACbsAjVYGAYAEEWD+kPI/uBr2h5vQAeBFQCgAkEwB
-						YCMARL+gcwCIEAGlGgNqs/GivrSnL/wSFAHPvfe1DgBpFyAaAKU9DBxEQBAAiRFgdwJMBFx3EUAhQGcCwiFwU9852I8Aum+ACwEdAe9p
-						eAjoAGAjQSYCDBQC5pCwHAJxEaCvGORFQHATMS8EjsVHgBsLItxYkIkAPwakCCBcBGhA/hEbARQCeXcFCBBSvUMAckohwJGCgAgLL4PJ
-						cRJRAQ+TNG7kCI3aeEg/XoRJfwbxR/LJf3js6lM1ct1pFRrfEcgr9GkRhJ9Dot8HR3d8POHvPZ6TR/Q5MdLfIwQTfmGuX5L/rvoqPhxc
-						6TcE8i9IP5vvN+K/KBB/wEg/AeI/1EDi38474Evib+SfVvzNqn9rvIuvvpPvLEV37x2/YKso+xIzV+wG4cdV/6mqmT7kG8h/IP54hR+6
-						xKed90fx7zYhEP9u3riP5bHOgJV/I/4GSf61+AM/zCL/iLD67wKg9RDNQz2nqcfnvwAukH/1H3HybwOA+4cm7/gPkHr+3wZA3Py/DgA7
-						/z+X5D9fAHjz/zYAzOp/XADY+f8MB4BdAGQ8ANx3xQmQ/jcZZ9RcjAAdAkb+5wKLj7xlRP9tiyf/yMStL4ryj/RZclC1qMqJbpqWZqOn
-						/Werw3ff48kxuf+X9KKkpmauGnvoWkIABBEQFwB4a2/+h8/fBfD/8EoBkP4cwJ0zBvTlb/9JFH4fCoA3Pvm1HACIEADlPgwsBYCLABoH
-						2nHdRQAPARcBoRAwAeCuEOQFgAsBOhOwz0QAjwH/XABCEeB2BOxVgngIUAzokSAvACgC3D0EhAgIYuBjHQGaPCGgY4Ai4KS5kZgUA3ER
-						gJibjGEQ2AigEGA7Apw0IcDxYyBfEBBhGfZg8pwXkHMNyHwW/BCQfoz4+8HX54/rxOG+3xc4IPkWN3LFGLXxVRB6FPx4RJEnJmWBib43
-						uqNX9gXp742iH5H9gF5Jsm9FXyIs+wHd2Sx/kvgjocO8esxnKcg+weUfpJ/Qwk9Y8dcz/gFa+vVsPxP/oUgg/1r6CS39BEg/HvClQ75A
-						64FIIP8k/kgF0GfcMlH2JdbuPgXSH8h/MOrDxX+Sd8g3QIs/4Yu/lf9g1h/F38o/ij8Cwu9Gfkj+S7X6zwJAA58/PGy5emL5myE3SFz9
-						FwOgdub/XQCIB4BJ/qPz/6EASJj/jxwA1vIP1MIB4Cm7XlNzD54F3gTxR0wAOED+58Hz0mNvB/L/9nsh8T8C/2zvG9dF8Sd6LT6gWhYZ
-						AO0HTvrvrQ7ffY+uXXP/UXpRUlOTU6MOXC0qAJqtTg6ASASwP9wB0QCIREDKAAgiIFsA1PYY0Ie//AdR+CUwAC5+8TuQ/0tFBUAkAkD+
-						i9kFiAsADYsAukKQCwEQf8RFgAuBm2YnwEYAhYAfAU/tuxlEAAsBHgGhA8IuBOz5ABcB0RigCDBEA8ABISBFgDssbCOAiI0BCAC6ahC/
-						qzAPArcrwOSfoAjgdxzmIcAPDEtEQgABWQ3zY0fWGPCRZNpHlPO8hAWf3wk5DPweHPb7Sl9vIk78kWT5H7PljOqXtJovSnw8ffUKvoAg
-						+0SfCWsCyY/BSH4csuBzeuIBXkZY9n1k2Ue6sfEexBzmtTjxXxoWfkunGsCJ/9OqI0o/I5jv9+Rfi7+Bj/ug+LdF8Wfy38aTfyP+hkpc
-						8ber/q0sKP8IfvzNr38nCr/P0RffCcRfkP/G+oAvHfK12JV/J/5s1d+JP/Convk38m/EH3gykH932JeLfylX/xEeAJYfdhmvHpt93LlB
-						4QEA4p86AKz8A+nHf7LM/1MAhMd/6uMB4AcnbFVzD51V8zQg/zYC5sEzSr/j4Bm1/Pg7IPrvMYz4I0fh89Unz4niT3RftA88NBf10gx0
-						7dr1P1gdvjsf8AL+V+mFScuIfZfV5GMg/4QXA5OPv2ewITDlxPv6TIDhA9VyzbnQH8A0ASBFQJoAqNUxIBD+co4BodBLsi+BAfABBAMF
-						gDQGJEWADoA62gWgS4R2w10AigAeAruuu3MBPAQwADQ8AgA/ABCzG2AjwIaAHgmyAUDoANBAACAg/YgUAqH7B9gIQKQA4IeFpQjQ2EPC
-						LgSEGBjDImAciD/ixwBFAAcDAJEiwGHPCrgQ4IDsS0GQtCvAY4BTaBD4cCFPAwVAROzzwX4N6etIBL7ftOKPjN3xNsi/vLovSnxG+ky0
-						gOAnoQV/Aoh8HFz2x/kkiz4nVvpHc5jss9GekPSPNDjxB0Kz/ST9KPweEemnMR+SfzfmY9HSj6M+bNxnyLxA/AEj/RY36kPSP9ti5L8V
-						QvL/1IwQ73/yhSj8PmcvvhfIPwsAc2UfgxN/gEZ+dADQyA8QEX8r/4+A9CNG/I38u0t84qo/CL+e9y8kAITV/1AACPJ/X+VgDX788NBl
-						6rFlb4bdAQgFgPUN7h+31/w/DwA7/lPHB4A7LTqk5X++BSMA5X8+PM/HZ80ZzSoQfBL/oz7vvKdm7n4ZRP94LF3n7xWdNDU1s//VavDd
-						+4AA+KP44qSkas8FcxA4EgFeAAC0GxBEwAeqlRcASBAB5g+r/4c47S5AKAAQIQCkCLgdxoBe/9GvRNmXwADAkaHYAECEACj1LkCmAEBY
-						BCAuAhAIAATvG0AhYGIA5B8B6ScoAkIhoAPARIAfAhQBRHg3wEYA7gbYCCAoBNydhCECDCYCcDcgtCPgRUA4BsIRwHEHhnkQgPwHIWAi
-						gBMKAiEGkNgQgAgggkuKgvBL2BCgGHA7BCCyMnIQcESJLisg5BLw9XJZl39uFLfrAd9LmEDy5dfmUzVu7wX11JQNidLvBL5QmODHkU32
-						DT216MfLPom+RFj2A7r5wm/pyoSf03kkiD5B4l+DGPEnOuqVfgKFn7Dij4DoEyj97fWVfUj654PwI0b8kZDwa+knSPxJ+g1a+i2+9Lfs
-						R0xXr797QxR+4teWj3/ys5D805V9IuKPB33psC+7ys9jXQL5J/F/RM/7Ayj/TvxHgvQjRv7poG/B8o8UsPpPAWAYpB7oPE49OvNIyB2c
-						/NsA8N2j7PP/dXIDMB4AIP8UAKnn//kBYDb+IxwAHrX5JSf/YWwEuBA4o545dU6v9BuM9BMYBSPWnxTFn+gyb7fopGmpqJ79O6vBd+8D
-						Xohv/BcmC8N2vqsmH00KgCACpABou+585A9hml2AwgMg/y5AoQFQyjEgaRdABwACAfDsra9F2Y/jV3/6Vy31SbsA0QDIchi4vLsAtBPg
-						7wYEdxDmOwI2AthugB8COga8CCAGYgQIIUARQHcR5lcK8kNAR8BhwkQAUs1CAImLAIMNACEC6BKiUgiYsaAfOcQYAOHn8BCgA8RpQoAj
-						BgHAQ0ADYktEpVeOgDicXKdAknNR9DnwNXHpz0Lo+8IIysiEA1dUv6kbM4t+74kg82kRZD86tx9PIPlxyIJPRFb52Uq/kX0fEHs90uMB
-						ss9X+vVqPxd/Lf0B4REfw5OIE39geHD9fi7+XP7bOfE3BPP9/oq/wZ/xb6XFnwDxt6M+Wvyd9Bta9JumOfDcm6L4IyT/yK9++wfVou9U
-						M+uP4h+Sfi7+/KZe44z4A492EcQfAdknjPgb+aeDviT/tbn6j3D5J+6Fzx8asFA9uuQN5xLxAVCu+X8WACD/aef/dQCU/QZgcgDw8Z+0
-						B4C/N3KjmnfoLbXgMHI2eLYRgM8LIAA0EADrnr8Asv9+SPyJzS/h5T9l8Sc6zdkhOml6cr+wGnz3PuCF+DT6wqRn0NazahIEwKRjxE3G
-						LTUJAoDAMSDD+44OGy6YP3jsD2JhAVCOy4HaCADRr5sxoPhdgH2XvxJFP5Y//ZvqtfNafAAgQgDU1o3BJJIiwIUARkAkBG7qCKAzAQSN
-						BLkQ2GvwAwDBMwI6AGLGgjACNDwCpBAQIqDK4kIAZB+JiwB+R+G4EPAvJRqcEQhCgMcA3w2QcFcRcnyimeSFQFwMEGIQICC4UhDEhwEh
-						h0AS4cuV5gF+j2IJfb1W5g2fhJgaB7xuE49AoE7fkl3offTKvgCT/DiiMi/TY6xECtEX8IW/6yhOWPq74Fw/n+1H3Gy/FX8r/52qca6f
-						CMRfSz+hpd+O+Fjx70Aw+dfST2jpn2eR5Z/P9+tVfwuJf0V/Jv4IyD7Rot90xjTVvO80tWrHybzyT/Qa/bS7pCdixN+C4m/lH8Wf5F+L
-						v5X/kPjbkR9a+Sf5f7ADk/+Srv4HAZB19V/TKuCBTmPVIyDM6QIAxD9PAETHf2pp/j/LDcAoAPTqPw8AM/5jAsCO/5TgAHC7efvVwiNv
-						q4Ug/mGM/OMzXvqT2PDCxUD6cReABcDc/a+rYc8cT6TDrG2ik6Yn97HV4Lv3AS/CJfnFSceAja+piaEA4BEQDoBJLgCCCOi8+aL+Q8f/
-						IOoAQOICAIkLgALGgHQAIHEBUAtjQJEIyBMAm879VBb9OCAAhuy/aQPAREC6AKifuwAOCoBICJidAIwAHgL8SkE6BGgkiO4V4EWAdN8A
-						EwHvazAAEHdAmGMjYBgEABKMBH3gIsDFAMg+Iu8IBBGAo0F6PMgGgB8BjhMQBDwEYmIgKQKQ8M6AiQCHEAOEFANEJAZ8YqKACAl2MYTk
-						3IC/t/hjUxD6Ou2vZQgL/pQ49GsDr+ux91Q/kH9R3IugF0g9H9GJIyL4EmOjdB+Dop9e9n3Csh/Gyb4PO9BL+PP8JP4dNTEr/k788WAv
-						O9wLBLP9gfi3xfl+J/5R+W+NIz52vh+p1ATyb6SfwBV/i17tn64h8W/eFzHy36zPVDV1yY6UAfAHNXbuRrfyH4i/XfXXh3xl+RfFHwjm
-						/Un8ZfmvD6v/PADubTVQ3Vs5UD04YIF6dPFrgvwDsav/9W/+v3w3AOMB4M3/UwDEzP+P2PSiWngUAgAj4IiR/0UWLf9eAGw+fSkk/ccs
-						GAMj1j8rSj+n7fTNopNm4LzV4Lv3UVmde0V4YVLTb91LJgDEXQCQ/jy7AN23XooEAOLvAqQJgNtnDMjuAljxjwuApDGg5W/8RBb9OCAA
-						xh77IBQA0hhQMbsAsQGA5AmAYiPA7QSwEHAjQTYCKAR0BCAUAiwCxBCwNxCjGNARoEPARMAgkH2EIoCHgLmbcBABdEdhuouwwYbAEQNF
-						QDgGPnJQBPAYiIsAEwIfhUPACwLaFdBBYMXfh4eAIRoDhBQEhBQERGIUICGpjkcS+zikn18wka/ZrOYTJPhJTDj+gXpq1nYj66UmJPky
-						ouxbuuuV/HzIcs/xV/n5Sn8XvbLvA2KP8JV+vtrPR3us9HcknPgjTPgZHRAn/kb+pfl+Lf2EJ/1a/GnMx8q/kf6A0Iw/iv9ThJH/lnrW
-						38q/lv5A/lH8Nb2nqgETV+QVf+LpDYeCsZ/QId9A/vnIzyOdLb74M/l/yIl/fADkk38kbQAUtPrPAkDLP+N++JofmbI/4hzpx3/q2fz/
-						9LTz/ywAEsZ/IgHgVv/5DcB4AKxV3xu1UYv/IggADX4MEeAHwCLNm2oRBMC2ly+rY+fed+JPbHnpkij8Pm2nrRedNAMvWQ2+ex+tanKH
-						hRcmNb1XnVITjlxXExGIAMNNNdFFAHAcoQh4z/K+mgQB0Gv7ZRsApRgDigZAJAJqewwIiQuAIsaA5rz0iSz6Ccx8/mPVbmNCACCFBgBS
-						h7sA4fsFEPZw8G6DGAGIjYB+IP8IhUAoBlgEIC4C9oP8IyD5/m4A4SLA7Qh8EBMCgI0AGg8Kx0AQASNA/AkXAhYpBDAC9BkBixQEPAQ4
-						+UKAEwoBHxDcOKQg4PBdg9hIYDLODyMnwX9OFkK/Dvze4a8tu/jj9zjp5Eeq/5xdsrwDPQtFEH3Crd6j3OfDSX4cyZLPCa/ue8Kv5/mJ
-						sPTzsZ6w+C8JpN/yZBUKPyFIPwHS317P9TPxx/l+PtuvxR9En9DCTwQz/lHph78n7Xy/JiT+s4z0W1D6CRT/Zn1Q/Jn84118e09R7QbN
-						ZrLvE8g/sv3wadXIST8B0o+HfOmgL8p/57GB/Pvib0HxJ5Lkv16u/vtUDFA/7DNLPQLybpyDxn/SBACt/icFwGkbACT/AMh/+eb/eQCw
-						8R92A7C08/8uAPLM//MAaDNnP4j/O5EAeNqy6AiIP/A0PtsI2Pnq1Yj8H3vnfTX/wBtq6OrjeamYuEZ00vTk9lsNvnsfrWpmb5JfnHT0
-						WHZMCAAgZQD03Xml4ACIHQOy4i8GAHIHjAGNO/6BKPlJrHjjMxYAxe8CZAoAhAVAEAGl3QXw6YUR4IUAQiNBfCzInAswEcBDgO4gzDG7
-						AQYXATgSxMaCpNEgFwGHghuIBWNBFAEGd0YgFANyBBDu0DCDx8AYBGTfx0UAoa8mJEdBmhDQgPQjYgxwUH5j8EMgDl/CE/EFPgV0l2QH
-						/DrRy6NGpT4W+L4J/RrAaz1w/n5Z4BPogRIfx1gj9/kQZZ/jBD+g22iUfEKWfISLfhRf9sOE5vgZnRAr/YQWfhrr0Sv9nKj8t0fpD4l/
-						dLafX9EnuJQnF/+5bLafST+b79eA9BNG+nG136z4u/l+En8n/QRIv6Vpr4Avf/GtFf6EAPjtH9QLb1xUTzjxHx+IP4DST/CRn5D044q/
-						XfWPyr8cAPnkH0kbAKVe/XdAACD3tRuuHh6/Myz/OgCs/AsBEB3/qT/z/5EAiMz/8wCw4z+FzP97B4Dx6j8YAE9r3raA/BM6BM7qu//i
-						M7Ln9et2ByDMqA2nROH3aTl+leikaamoyq23Gnz3PiqrZy+WXpy0dF10UI0H+UcmHEVuhKDdgInHblkoAAwD9lzVf/BMBAQBIEVAKABs
-						BPgBcEeNASFCACAD9twQJT+JHRd+lj8AkJQBkDkCxABIuQuAFBQBwd2DHW5HwAsBioA9QQQQOgLYbkA4AtgZAYoALwQQioDgkHBwA7FI
-						DLgI4LAYOALCHxMBiL8roOER4F89yCMaAoQXA5a0MZA6ChAQ5XyIch1DWNbzQ5Lv4HdKdsi/VyLwvTnxR+D1GbT4qCzxWRmLyKLvI8o+
-						0A1X8Akn+TKy2PuED+8Sgejjyr4Pk30fFP7QaA+T/5D4I1b67XiPE3+g3VCUfoLkH4TfXsNfi/9gvJynFX8r/60H4sHe4HCvk36CCb8T
-						f3vAF8W/hT7cG8i/HvMB2SeCFX+z6t9U38zL0KTnZH1Vn+sf/JhJvyz/yOWbP7Lij6v+ZuX/UT3uY+W/kx33QfFn8u/EPzEAovJfttV/
-						JG0ApFj9D+ivebDfXPUwCHz86j+gV/+F8R83/w/iX6fz/4dA/DPM/5foBmD3jt1s5P+YCYDFxygATAQshufF+Azyv9hGAD7vO3PDBAAD
-						x3+GrD6WiuZjV4hOmpqa3EKrwXfvo6ImN018cVLSad4ekP9rJgB0BAgB4EUAD4Ah+66lDoA7bQxI2gWQAyAaAU+CqEuSn8TJW1+rthgA
-						Be4C6AAocBcgVQSA5JdjF4AiAA8G8xAwdw9mIQDyj+gA4ID8R0aCImNBQQSYS4baCPBiwO0I2AgYCuKPiDEA0o9EQ4Bi4CMdAnpXAATf
-						hyIgEgMQAEEMgPD7sBBwI0KREOCEYyCIAiv/PiC9UhBwQiEgASKdFlHCBcSfi9IfAf95GPFrjMH/XgcvOQ5CTvJeDILkjwGp9wgJfhxa
-						7vORX/IJvrIvSX+nEGHhD432cPGvMvjS32E4Cj8RzPa3G8aIE3+AH+5F6W+t5/pJ+g202u9W/dl8vxF+gsSfpN8QzPeT/E/VkPg37Y1Y
-						+QeM+BsaQwC88va1RPEnPv/Z107+nfgjIP6EFn9LRPxj5V8OgHzyj6QNgILkP8PqP8k/ck9LeG47TD04ZlNMAND4T5r5/9MmAOIu/6kD
-						wI7/pA4Ab/ynqPl/fgA4Zvwnww3Auiw+AtJ/DkD5f0ct0c8o/YYlDoyBt/QzcvDsTS39xxm5va+Ksi/RbNQS0UnTUlGdm2Q1+O59tKrO
-						VUsvTlqenL0tTwBEdwF4ANQcvKGru2EMKCYCQP6lXQAcA8Kbe0miH8fZT3+TLgAQIQDqchcAKVUE8BDQdxBmIdB7D8QAREBfEH+EhwBF
-						wFMg/wiFAF0tCCOA4JcN9WOAIiC4o7AcARobArQjIO0K6AiwIUBgACB+BDhYBBjYnYYFeAhwpCAYr4kGwfiTn2jSRgHhC7Mk1SKC0Cci
-						/RoOfpO0gIlpeNYQ3iUxDF5+UnVHUS8GK/b56DZ6peqKYp+PRNGPl31f8iU6j/RlP6CjHeURsbLvE57lD2g/DMERH0Mg/1z6DdHDvSD+
-						uNJP4o+z/YgWfwLEf0D4Bl4VCJP/0Hy/ln6C5D8Qf8RIfyD/TXqB8CNa+olJmgOn3oyVfh+8EdijXSAA9A29AvF/hMn/Q9KqP2HlPxwA
-						Ufm/XVf/Uf4DnlIP9JiqHgYxlwMAxN8b/yn1/H94/CcmADLO/+sbgGWe/093A7Cpu15XS46f0+If5W21lLARsNRy5J33tPSfeNeAN/8a
-						vuaEKPsSTUc8LTppWiqrckOtBt+9j1bVs3pKL05a2k5d5wLAcCMA5B+ZAAEwAQJgAsg/QTEw+vBNs+2Wdxfg7WgAIEIAlHIMKIiAbAEg
-						jQFJEaADoMBdgJtf/UEU/Thu/vwPOgDS7gJEAyD9LoCJgHAAFBsBaQMgLgJ0ALAIIHQEEC4CbrgI4CHwFMIigEJAR4AmiACEIsCPAXdH
-						YRsBQ0D2kbgIcIeGbQSEYwAjwGLPCfgxIEYAAvIfxICJAB8pCBA/BohoDEhRYGKAkzUM4vCDIQL8uj5phR+JCL4EyH2S+CNDVr+guo1Z
-						VTgg9GmJij6IvE9E9MN0GYnIYs9ByZcIi74ESD3CV/mTVvqt+Ld3ws+xsi/QVh/qJYz4R2b7Sfq5/A9A6Q/EH9HSz+Sfz/dHxR8xl/Mk
-						8Ko+BIp/Exzz0Rj5b4yQ/Nu7+CJrd50SZV+ia/V8J//mCj9W/jta8SdSy78cAPnkH0kbAAXJfxGr/zwAELyB2IM160D4wwEQnf8n+Q8H
-						QMnn/1OM/xQ1/28DgI//pJn/f3jSNpD/d9VSCADDO8EzBIBGfxxEwLJjb6nl8PFxkH4TAB9o1px6Vw1edSw1jarmiU6aloqaXDerwXfv
-						o6Iq11x6cVIzbjnIPgZAfAToANAREA2ACcfeA/FPEwAxEZAyACIRUI4xIKQEY0CRCIgJgDc/+bUo+nH87Hf/nD4AECEAamsXoNyjQJzQ
-						bgBhIyC4i3AQAy4CYkMA5J+FQHA+IIyLALcjYCIgdkfARoB/TiCIAR4BHBsClnwhMArknkgVBCcCpCBA5CAg4qOAEOOgBAQREJZ2jiTv
-						xTJ0zYuy1At0HQMCT0REPh8g7wl0QbF3cp9EfsHn8JX9WOmvJjzhB+Jm+jsMN2jpJ6z0h1b5SfaHeljxb2PHe0Kz/Qwj/XbEx4k/v6pP
-						IP8t7Ww/0aIfn/PnK/5m1d8d8CXxd9Jv0NJP9JjEmKgadTfkVu0VZV+iavoz7PKeRvxTyT+SUv5v19X/cAAY+de0MNzffbJ6EIQ8/fhP
-						UgCA+Bc0/pMmAMLjP6Wb/2cBIIz/9FlxXAv/shPvAvhsQkB/rGPAgB9rQPwxAFafPOfEn5i282VR9CUGrDiiGg+fIztpWkbkGlsNvnsf
-						rUfM/K744qSk5aiFatyhtAEQRAAFAB4KfmKFOYF/p40BSbsA0QDIchg4HAHHb/xSFP1Y/vRvIOBXYiMgXQDIuwCRCCjnLgBSpghwMWBH
-						gvogNgIio0EUASwGaCyof0wE+DEw2OIi4CBEAALCTyEQigEvAjgmBIKDwogUA+4qQglBYM4KBCFAZImBfFGAyEHAyR8HiCT3YWQRl+CX
-						Pc1HIT932PpXwlKfBif0HpFxHYMT+3wwye+s5V4iv+DHEhL9KE70BUj2fVD62+FMvz/Xj+i5fgNJfxsUfif9BIg+weXfm+9vpaWfgL/z
-						UPxpxAfFH2jhpJ/LPzvgCzTrwy/rOc0d6iX5b+yw4o+jPlb8G3VHAvl/vNsEVTNrnSj7EjOW7Qzm/K38hwJAEn/Eyn9sAFjxL1j+ESEA
-						8sk/krT6nyUApNV/kn/kBy36qXvg5z5YtUo9jMKfNwBo/IcFQN7xn3wB4I3/1JP5/7+G5zkHzxr5P4kBEETAcguJ/3LN2461p94Nyf+h
-						t26pIauPi7Iv0XvJQdW8Cv5MCk6alsphub+1Gnz3PpqNnvafpRcnNTVz1Ij9V9S4w9cAkH/EhQCPgZsQAwwbAkiz1W/HjgHpAHARIAQA
-						IgRAvRwDQoQAKPQw8LZ3v5RFPw4IgEH7btaPXQCEBUAQAaXbBcg6CuRHQORKQaEQCF8tiCJAXy0IsRGgAeGXIoCgCBh80OAiABiKsBBw
-						QSAEQIC9u3BCDPC7DEfwQ+AYyD8Cgi+RJQY4UhAgybsFPiDVKfFlPa2wiwi/fhqqNr9hhT4FgtjnQxb4bHQaQQhC7wOCn4SRfFzRl7Ci
-						r8d5PJjsE076iaE+VvxJ+BmtQfoDrPhr+Y8e7g1Lfw5kP5B+Qks/EVrxt5f1BIz0B/Lv5vtF8QfsfD9ipD+Qf7qLL8o/0mPk06LsS6zc
-						djxe/uMCwIp/rPzHBYAg/0ha+a9Pq/8UAMR9nceqB2ceDeQfKO34TyHz/zHjP0Vf/z///H/L2XvV8pPntfwvJyACUPxXwPMKFgIrTkAA
-						IDYENrxwQZ3A8R/LsqNvqUErj6am64K9so9moFnN1P/JavDd++jatet/aFWd+6/SC5SWYbvOKwoAHQFxAeBFAAVA5ZpzsQHgIoDtAhQa
-						AJEIKHQMKEMEFBoA8REQBMDy17PfDXj8iQ/DAeBFQLoAQFJEQJl2AZDiIkAOgKQIoBuI8RjQNxBD2E3EEBcBmiACkkKAbixGERBcNQiE
-						34eHACBHAGLvMCzEAAVBEAKcIASIUAhwQPQlssYAR4oCn6RIoH8XEL50aRaSpF/68fF8rKq2nlVdQOy7gKgnwlbl0yKJPNLJx8l9PvLL
-						Pccf7wmLvqGDPrRLeMIPcNn3ia70G9oOQeEPRntI/ltzSPz1Kn9wsJfkv3KAISr9AS319fsNgfwHYz4IH/Uh8W/aG8U/kP8miJV/HQDs
-						gG8jXO0nQPyf0OIflv/Huhqa954iyr7EnuOvZZN/xMp/bABI8o+klX9ECIB88o+UdfWfBQCXfwf82B8OWaYeXPBKePU/bwCA+OcNAG/1
-						P8P8//fqYP5/9NbTagUEAEYAyj9+vEI/G/lfcRKw8q8DgO0CbH7pknI7ABAAI9efEkU/jo5zdooump7cv4H+/jtjwXf5A16Qb6IvUHoG
-						wV9sOAYk7wLkD4D26897ASDsAtTiGJAUAaUcA5IiQAdAxl2A6c99LIt+AvNOf+ICoP7uAuSPAB0ASIoIiAYAAsJfQAT4IcDvJCzdTdhF
-						AAsBGgvyY8DdXfgAYSIgdPlQIQTceJAlLgLoLsP+mJCOAYsYBCwEwmNCIPsSIPwccWRIEP80SDEQRzQE0iIJvGFsJszXMQYYvv2c6jJm
-						leoMgi+iJT4bEbnPRw1KfT7yy30SUdEP095b1Y8QOshrIOkP5vjDhFb6OU76CVzhZ1jxRyr0TD9DSz9B8m+ln9DSzzEr/Wa139BEY8Uf
-						AdEPLueJ0k8Y8X+iB0m/gVb8nfx3GW8Zpz7/6mtR+H1On72cLQCs+MfK/124+u9o3ldzX8cx6ocg35nGf3QA2PGfNAHgzf+L4z91NP9/
-						79gtasWz59VKAJ9R/lc+a+VfQ/IfBIADQmDbK1fUSZB/ZNvpy6LkJ9Fh1jbRRTPwc6u/DQ+ooVvCC5SafutfSREANgJYANAYUOdNF2wA
-						3A5jQDYCQPSlCNABgJRgDCgSASD/fBeg5tB7ouQnse6tL6IB4EWAFABliwAm/3EBUNQoECIGAALCL0RAJAAQLwJ4DOgIQGwEEBQBBhYB
-						gH+1IIqBaAQg5i7DwTkBLwZA+qUQIJJCgMNDIDYIjhl4CHDEICBA/P0gCIWBIPyFwCMgLe7GZx7u8qcZ4V9P9e6LqsvYZ0DCUdot4qp7
-						WkDUsyCIfkcRWeoJf0VfIpB8CRD6JEj4h7IVfpJ+Sxst/BxpxMcC0l85kAjEv5U35kPS3xKlPyL+7HAvSH9zlH5P/GnEhzDSz+SfVvxJ
-						/J30G7T0E1r6CSv/eCMvJ/7jzSU9gSu3PhGF3wd/XPGr/3nkH0kr/4gQAPnkH6nT1X/EBsD3m/dRP2g1IBIA4dV/EwDS+I90+U8dAPnG
-						fygAtPwDmeb/U4z/pJz/77nsuFp16gJIPwEB4OTfBMBKwkaA+Rye4eNdr11Vz57/QIPX/pckP4k20zeJLpqWiurZ163+NjzgBXnVf4Gy
-						0Hv1c6EAyDoG1HPbRXPzjQxjQNIuQJoAiEQAyL+0C6ADAIkLgCJ3AaIBkH0XoCeIryT5Sey/8vNQALgIKGgXwB4IBskvJACyRIAUAEiq
-						CADZj4uA1OcBkJgICIUAGwtC+lkoAjQ8AoQYcCEgRIDeFRBiYIi9n4AUAAEg+ilCAJFigOAhYGKAkKMAEYOA8GLAp2RxQL8WI07as/OR
-						ZjTn+Eeqes9l1XXcmhJI/zLVEWQ+E6Lkh3kycUZfxl/VT5Z+wpN9QBrpCcR/oWqDws+x0t96MAp/VPorBzGc+M81ws/RIz4GJ/1O/oNR
-						n+CKPjMD8QeasREfkv+mFif+vbxRHxB9zhN6tZ8A2Ufx5/Lf1Yg/8agWf8MjncdqXnrzsij8Pl989XWR8i8HQD75R9LKf9lW/5HE1X8W
-						AClX/4MAGJgnAAoZ/6EAsKv/OgAyXv6T5v/F8Z88AZBi/v+v4Xn+4bdYAJidAMO7OgSQVfCxxoYAPhveUfvPXAf5/1Adfec9NXT1cVHy
-						k6icvFZ00dRU5U5b/W14VNbM3ie+SCnptvSoGgsBoIEIQHgMjDt8Q43jOwH6/gAUAbdU/11XhAAQdgEKHQMq+S5AkQGACAGQdReg9YaL
-						6tt/+FdR9ON46YNv5QBAkiIAZP92HwWSI8AGQJoIAPnPFwE6BCgCLBQBBhsCIP1iCCAsBPgNxfwI4PAQMDHwvhAAxIdqOJEiBDiRIIAY
-						0GcJMsQARwwCDki6FAUcSezjyPrjk8E7KUeln6jZd9XIvyDzaRHF3vIkrspLaKlPQ36xT4Zm9+Npx0Z4JFD0JUj6g3EeD5B8got/q0Eo
-						/LjKz8FVfosVfyP/IPkcK/4t+iFM/nGVH6WfwNl+B5N/Lf0EzvczQPqDMR/D490RJv9a+onx6jFLIP7jnPwjONsvCb9E054T8weAFf80
-						8n+3r/4j98DXnzj+UyuX/2Tz/5NtAMSM/5gAsOM/NP8vjP/km/+vnLNfy/8qkH/9fOq8BgNAf0ziD6y2kPzj5T/xGa/68+yFD9WKE2+r
-						gSD0WWk5fpXooqmpyu22+tvwaFWdWyG+SCnpNH8PyP/VggNg6L5rLADkXYBSjgFFIiBzAGSPgHQBkP2SoJ9++ydR9OM4//nvIgHgIqCY
-						XQAvAqQAMBEQDgAXAUz+4wKgFBEQDQBEDoBiIoBfLUhHAGEjQLMPYgCEn8aCpBig8wEYAob4CHDYEMAIINKEAJEmBDh+DBBZY4AjxoAE
-						iHha/HAoDCv9eRhx4IbqOmGduOqeD1Hq8wFC36EqLZLMc6IHdOMwgp+EFX2JoQF8rCc0x48M8iHxB9n3AeGv0DP9BJd/M9vvDvbqq/lY
-						tPQTRvrdiA9If1OCy39ve1UfS+OeHCP+jfScf3C410g/k3835mMwh3wD+TfSTwTyj9fzX7XtuCj7Ep2r5ha/+m/FP438I2nl/3Zc/Ufu
-						hdcmGgAk/wDIvwuAur78JxCs/gPi/L83/hMz/z919+tq1XNG/lfD82p8thGAzxqIAZL/gHPqGfuMNwA7ef4DNWL9s6Lg56PZqKWii6al
-						sjq3zOpvw6OietZ46UVKS9vpGyMBEIkAEP9wBFAA3FQjD93Qt90uzxhQisPAIP+1PgaECAGQdRfg4he/E0U/jo+/+ZMYAEhd7QJkiQAp
-						AJBUAYCIAYCA8JcpAggXAZogAkwI3AqFAI+BgYQXAhQDYgQgEAJ0gJjHQDQK5BCQgkAKAAk/BhA6RyAJf1bEGIgDxL1wjNCbG6Qx9Ncg
-						M+LgTdV14gaQchyxSUcHFPhCEAWfKFzsEWlFn/BFv20EJvoWaZwnxGA+3mOx0m9W+OeGIOmvGGgJiT/gCb+Wfjvf78QfaN4XhZ8g6Tc4
-						8Ud6m4O9oav62BV/Ev9GJP0ErvbrK/ow8efz/QBd2YegGX8kKQDw+v6S7EsMn766OPlvWP0PyT9yX6exKcZ/ogEQL/95AiDj5T+/m3X8
-						hwLArf5HA+DRqTtA+i9aLqhnCBsB+PwMCwH8+JlT72rxR/Buv8ipCx+qTS9eFOU+DU1GLBRdNC2VNbkxVn8bHnhLZOlFSs2EVWrMwasB
-						EANj3EjQ9YAjQQgYbjoeRfEvdgwIiQuAko8B2QgA0ZciQAcAUo4AQOwuwMsffSuKfhxf//FfVFsQ/IICABEDIOXNwZCYCCh2FAhJFQEg
-						+6WNgGgAIHERgAQ7AiD/hI2A4K7C0RhwEeB2BUwEJO4KsAjgRIMgfwhwssSABsQfkYLAIIt+MYgxkEgg8XRn5BD2101ixKFbquvkTSD1
-						ZlU+iQ44dlMoEblPQpb4tOSX/YA2Q4XZfR8QfQkU/kqc5ffn+Wm1X8/zG5z0E2y0x0Cr/IH0E831TL/Fin8zB5N/Nt7jrurTiwjk30g/
-						gfP9Fiv+Wv7dwV7DYyj+hJZ+GvVJJ/8I3uFXkn2fXwEzlu0oIAAKk38krfyHAkAQf6Q+rv7rAID3td6M/1AAaPkHMsz/px3/wQAYvvEF
-						9czzF0H6CQwAer6g1liM+J+Hjy34MYg/3gAM7wGAATBp24v6jr5Z6b/8sGpcBf8fkFw0NblOVn8bHpVVuYfkFykdFaMWqtEHrqQMAB4B
-						NgCO3lKN8W7AuAuQMAYkRUCaACh6DAiJC4BidgFA+IvZBcAAOHj156Lox/Knf1N9d19XbTz5Lz4C0gdAfRgFqg8RYGARYEeD9IHhmCCI
-						jAZpIAIQEH4KgUgQgPRLIUBEY+CD1DGA0MFiUf4lQPo58WFg4qAcgYCMYEj/Pgs1h99TXSZvBuH2V+IN7UHGi2J4VtIJfVqM3OcDZF5a
-						3Uc82Sec9DP5bzWQ48l/ZKXfSH9LhxV/K/98vIfEvxkSEn+gDx3qxREfI/7mQG8YfvMuEv8neiCe/IPoE4+FMOL/KJvvzyr/SM9Ri0Th
-						56D8I3gzMFH8EVH+UwSAIP6IKP9IkvwjaeW/TKv/mQKgWR91f8/pXgCQ/APlHv8p0+U/YwMA5P/7Y/DSnyD4z18CQPptCODHa/DZyv/a
-						5ykEjPyvJWwEbD19Se0/c0MNFOQ+DT2fPlD0XYBbVc98wOpvw6Pt8On/H/lFSklNTg3fezESADoC9DhQEADhXYBgB6DlM2/X7RgQIgSA
-						iwAWAEEEpAgApIy7AOve+lwW/TjwZmDHPyxDACDpI6B2RoEKiwAdAEIERAIAKVEEOHgExMQARUD4ykE2Ahh+DOggANlPCgGCh4DDXk40
-						H6ErDQFiAMQBwp8UB0nwKxOlx8RFodRYquH16jZtGwi2ke92KNoeotQLhH7esEKQBV5CWsX3iUj+EAkm+pbQHD8Tfif+g+arVij7HCb+
-						FQME2be0JDzx56M9YfGfZaSfy3+fGQwr/r2nB1fysTTGER9HIP5G+pn8sxV/lP5gtd/wKK70o/QTqeQ/PgAq+08XpZ9DAbD3xGullX+k
-						IPm/M1b/dQD0zbkAqN27/wJZ5v+zjP8kXP6z76qTWv7XvoABQFwE4edgANhnjAFHEAI7X72i5h94XZT7NHSetwcv4ym7aEqajZ72n63+
-						Njy6mrsB/5v0QqVl0La3QP6juwBhrqsxOgZuGCACxoL8I23XnYsJgHAEFDoGVNZ7AtTSLoAUALNfyH4zsMWv/lgHQDkioL6OAsVFgBQA
-						SO1HAAsBkH4xBBAWAv0tPAQGgPgjiUEAgk9I8h/F3G+AhwBHigDCjwGOGABpAeHPGwjw4+KI7jKkx/99qg+/r7rP3BkW92IQpT5MWxFZ
-						4FMx1BzG9ZFl39BaS74n+gIo+hIk/W6MRws/J0b6LS1wdd8RiH9zxEo/YaTfjvcw8W/aGzHiT/LfGA/0Elb8G7n5fib/3VH6CSP+wYy/
-						wUg/YcU/Iv9IttX/h4FH4Z998+vfieKPkPwjL565VFgAWPFPI/+IKP9IHa/+hwPAyn8Rq//IAwMXstX/Eo3/ZLj7b3kv/7kpNP7z96M2
-						qmUnQeBB/te9cFk/r8UYANbpf3ZRrQPxN1xwYAi4z0H+kc0vXlSDVx0T5T4N7Yu/Cdg/g/Y23AWYPyprZv9UeKFS03f9KzYAbASIAQDQ
-						boAXAJ03X7ABkH0XoNAAiEQAyH/aXYCSBQCSMgCkCBh28KYo+UnsvPAz1WZDngBA8gRAnY4CFRABkQBABPk32ADIHAFyCBQTARw/CCgC
-						+u8PoAiICwGCh0C6nYEPNO4GZBgFXgxwsgYBR5T+IpFCIA2RX4cHAHzeY/Ye1RbEvShEoU9LssRnBVf5A7lPwgo+ruZLcNlnK/t6dZ+k
-						P4X84+p+Cx8r/s01Vvq5/Pfl8/1W/HGuXws/J1jx5+LfyEk/k/8eeKiXS/9kEH7Eir+Vf3eYNwKIvhgA2eWf+PTzr/LKP3Lh2ofZ5b9h
-						9T8q/zwABi9lAUDyDxQ9/hMEQMnHfwq8/GePZce1+DteJPFnAUCA7K+H5/Uh+Q8CYHKBs/9EsTcBa1WV+7HV3oYHPeCFORd5oTLQc+Up
-						NerAFX0WYPSBq2o0RIADYmA0yL8G5B8ZAwHA6b0dbwZWWABIY0BSBOgAKNcuAIh+MbsA0QBId2Owjlsui5KfxIsffOMC4HYfBSr6PAAi
-						BgBiA6CuIiAhBPwY6E+wEOi//z1NvhBwB4lB8ikEOGljAEeG9NiQEAOcQqOA40t5qeBXPCKkH0f0mHswEPCsDC0GWd45kdGdFHDBrxyc
-						BBN9IDTGg3jCTySJf8v+KPtG+Dkk/c0RJ/1M/vuZuX5+qFeLf5+Zqimu8hNW+pto6Q+P+mjh56D090DpD8Tf3LWXpD+Q/8dQ+pn415b8
-						I5dv/ShVAHz8ky/LKv9IQfKPpJX/erT6rwOgalXtjP9QABQy/kMBoOUfEOf/vfEfCgA7/vO3IzaoxcfPgfSj+Bv5Xw/P6/WzCQD9MUo/
-						gRHAAsB8fl7fBKzbwv36IG+hVExaIzpoaqpmn7Ha2/CgR0V17qD4YqWk88ID4QCIRIANgENyAAzajTcD8wPgzfgxIBcBxY0BRSIgZhdA
-						BwASFwB1uAvw+W/+SRT9OK58+XsTAKl3AbJGQMoAQGIiIMsoUNERALJfWxGAxEUAkjUCOC4C2HgQRUAQA/J5AY0NAX6YWAoCJG8MIDYI
-						Cg0DQgqANEjCLgl+QcCv33PRMdUGRD41IO7FI4t7PrjYxyGL/gIQehR8AkQ+H4L4IyT9bozHCT8hCD8HhT802hOIv5npD4PS36QPiD7i
-						pN/QWB/mNQTSb0d8nPjb2X4GSv9j3VD6mfh78h8NACv+qeU/bQCMVq++cy2v/CO//PY3BQdAwfKPCAGQT/4RMQDyyT9SqtV/JGH1H/nh
-						iPV3xvhPnst/dlhwSK1/6YoFxf+y2gDPG/DZRsB6jAAWABs0uBNgwI+RIauP6UO8ktinpcXYFaKDpqbhJmDRB7woS8QXKyXtZm2FALhs
-						A0DaBaAAkHcBag5cVw+5ACjNLkA0ALIcBi7vLkC6AEi3C5D1XgA/+90/g/xfTBcBtbALkGUUKC4CpABAuiEuAG63CIiGgCT+PpHxII25
-						ihAPASIpBty5AYYUBEiWGPCRgoAjhUGpEUWfwH/P6Pn0SdV6KIh1EnpOvhTIwl4oyYIfB0h8Prjss5V9vbpP0m9pAcIfJhB/Lf/+Sj8T
-						/2Z9ESv9hLfa78QfaNzLx8q/N9ePRA72auk34z2B+Hvy7wVAOvlHiln9H605/MLZvPJPNOs1sWH1v0Sr/99v1lv9cMyWMo//xAdAUXf/
-						tQGQZvznryFyFhx5R8v/BgfJP8aACQAMAQ3J/4sWGwIbMQSeP6/uG/mMemqZLPZpaVKzSHTQtFRU5+Zb7W140KNV9axh0ouVlsoJq9TI
-						/ZfVSJB/3AnQHESuakwIgPxrIABwJ4DQQXBDPZIYAMIuQFIAIEIA1Jc7A5dyF+C5974WRT+WP/0riPGVvAGAFBMBOgBSRkBho0B3QAQg
-						VvzTRkCaEODjQeFDwzYELDwEOH4IxMUAIQXBYBB/RAwCRAgBCSkIJCSpLxh+TwQL3icB6b38OVU5dKGqBDnXDC4HUVEvNbLoSzDJB0Ij
-						PIQn/Fr6+8+1ch9P86cE2bc062fRws8B2cd5foKJP9IYV/gJLv49jfQTWvg5Vvz5eE/J5D8SAMXLP7LlwIup5B/pPHxO7ck/UoD8IwXJ
-						P1KLq/86ACbuvgPGf5IDoP2CQ2rD6ath+bcBsJHtAiAbX6IQMPK/kbARMGrDKfV3w1bqACiUfssOqcZVc0QHTUtF1awBVnsbHvRoVTOr
-						mfRipaXliAVqxL5L4QBgEZAmAJqtfEsIgPS7ACULAEQIgOQICAJAigAdAEiJdgF4BGx796ey6McBAVBz6L30uwBIngDIMgpU2ggIAiB9
-						BJgAqO8RgBQTAYgfAQFeCBBCDCA8BPLFAFFQFCBCBCQhxUA+4iSfINk3wM+x9F11GqRfFmpZ5LMg/ZoS4fn7rEiSX6FHdHxA5BNoaSU/
-						Dif5uKKvV/UlQPZB8gkn/QQIf1Mt/ISVfqAJrvTrmX5DWPxR9n1Q+gNI/B+3oz1h6o/8JwXA0k1HUgfAoEnLSh4AovgjZVr9F8UfEVb/
-						Rfkv0eq/DgAQ8Xo1/qMDoMDxH+Hyn38Dz08fOwcBYOR/IzxvxGeNCYAADAD7jDEAbNJc1GAA3DviGXXfyDWi2Kel28J9qkWR9wCoqJr5
-						uNXehgc9WtdM//9JL1ZqanJqyM5zehdACgATARQAgBAArde+ox5a/IYQAekCQBoDShsBcgDcHrsAC1/+VBb9OCAA5rz4o0gA1OtRIIQF
-						QH2MgKQQKE0ElCcEiFAIcPwgOGBIGwI+cVFAYZAYB0XARZ6IBgW/IVqYPmteVa2GLARhlqS8EGRBLwRJ6n1kyY+ixT4NnuhHhJ/Tzycq
-						/k37gexzmPg36YNY6SdI/vlYjxvvmQaSz2Hij6v8KP1Eavn3AsCKf1T+vQBIJf/xARAn/w93HK1mLNuZSv6R8fM21s7qf4HyjxS0+i/I
-						f7lX/5EHQNQD+QfqdPwHyDD/n2b1/8lFh9Wm01dB/JEr9uMgAjbpf3ZZbQLxDwPiD2x2XFSjNp5S/3v/xerxCRtFsU9Lh9xO2T8zUDF0
-						2v9itbfhQY9cLvfv4cX5Z//FysJTG19XIyAAED0OtP+K3hEwQAQgIP8OOhRs6bTx3ZgAqD+HgZMjIEUAIAXsAiRFwOij78uiHwcEwIa3
-						v7ABkHUXIHsElGsUKGsE6ABA6igCTAjIEYAkhUBsBJQhBCgGYoMA8WIgiIL3ROlPS1IccCgUCoMfYE5Hv/VnVKuhi0CkcXSmUGQxLwdh
-						oU9LWPBb4Ky+hCf8mqcMkRV+T/zNyv6sEFz6m/QFtOxzSPjtIV4Qfg4KfyMOE/8nehjhd+M9XPzrUP6jAZBd/pGamWtE2ZeY/8ze8ss/
-						ki8ABPFHbqfVf70DADIfv/ofBEBU/mtx/KfAu//+9YgNauHRd9Sml69p8Xe8jM8kJk9LqgAA//RJREFU/1fUZsflAIgALf6nTQBsggD4
-						4ei1OgBaTNuqx3gKpc30zaJ7pif3J9DdhnsASI9WNbM/kF+0dPRa/ZwXADwC4gIgiIBe2y7qAKi1w8B3yC5Azx1XZdFP4NiNX6rWLgBs
-						BIDkF7sLkDgKVIsRIAUA0o3wIiASAAjIfnkioG53A5C0IcBjIFUUeDHAkYQ/K9FAiEcS+UJ4atPbqnLo0yDTKNZZCK+s1zZc7ltooU8C
-						BD4OT/IlSPib4ew+YVf2A6zw67EegxZ+Dgo/G+vhV+5BQjP9ABf/J/Tqvk955T8aAFb8yyn/LAB6jVokyr7Emp0nbtvRn/q2+o88MI+N
-						//DV/ztg/KfDwsNa/jc7rnoY8d8Cz1tYBGyxmBi4pD+esPVFLf9I+9wuUezTUjF5neieGbhpdbfh4T8qq2Y/J7xgqemy6JALgOguwFUT
-						AXocKAgAvgsweM8VEwCJY0DCLkBSACBCAJR6FyBTACB5dgGyREAl8Ivf/7Mo+nG8/ZPfRAMgYRcAqZVRICRjBAQBcDdGAFKOEECSQ4AT
-						GwR5oqBUYcCRYiANkvz3335etRq+RLUEoY8HJLueIMu9hx7bIUDg08Ak3yck/ZamfX3C4q/l31/pD4m/N9Pvyb9e3ddz/Ix6K/9IMfLv
-						BYCVf6T1gOmi7EvsPf4aE//C5R8R5R8pQP6RfAEgyj8iBIAo/4Wu/ocCIJD/H8DvE139L2b8J2b1vwzjPy4A9Op/9O6/fztyo1p8/F2Q
-						/GtqyyvIVQ2Kv/4YnzUYAPYZYwDYqv9ZEAJbIAIeGrveBQBeAlQS+7Q0H7dSdM/05I5b3W14+I+Kqtkr5RctHR1mbZUDIOUuwAj4PD4A
-						0u8CpAuAMl8StJZ3AW589QdR9OP45Ns/6QDIEgHFjgLV6nmA2zwCkIJ3A4oJASRPCOSLAY4YBBwhCHwkyS8VfgTwuyMjA/fdVE9O3e7G
-						YuorYalPgxF7cV6fIwm/HuXJqab9QOx9mPQ36YOSL4g+ozGhhZ9jpF8a67kj5T8xAGT5f6jjKPg1x6hvf/N7Ufh9nn/9Qi3J/x2++t8U
-						AgC+7mgA0Op/EADx8p8yAOpg/KfbsuNqy6sk/5yraquFIsB8bsQf2WafNRAAk7a9BOK/RMv/dwYtFaU+C01HPi26Z2qqckus7jY8/EdF
-						1awa8UVLSeWEFUIAhHcBpADguwCNlr+ZYhcgOQBqYxdABwBSaAAgSREAwp8lAl756FtR9OP41Z/+FWT8cmwAlGcUKNt5gNsnAq5njwAk
-						RQjkiwAkNgRA5ksbAkjhMcBJjAIC5L/UgeBfzUiE3w8B2fe+6jLnoGoxEMQZZTsPkqCXAv/3aa4FPisg8QLNUOw5VvLjQNkPj+5IJAg/
-						YYW/kR7nCY/0FCb/gfjXifxHAqB88k989uUvReH3efvSe+ULgALlHxEDIJ/8I0IAiPJf4tV/DIB721UHAcDHf/jqf2IAcPmvB+M/NgC+
-						O3qzeub5S2rrq9ddBGyF5634rLmqtrEQQPnHz7fhsw0AAncA7rez/8gPalaLUp+W3ksOqiZFXgIUL3dvdbfh4T8qq3Mt5RctHS1r5qrh
-						ey7oy4FqXAxcUSMgAEaA/CM0DmS4pkbqGLiuafXMW2IAPAIBYMAACEeADgAvAtIFwO24CyBfFnTvpa9E0Y8FAmDw/puZdwGQkpwHAMlP
-						EwGJo0AICwAxAkDwaysC3G4AyL1EoRGAZNsNQIoLAaSQGEAk4c9C3l0DAuQ/C7GCn5Iey15SzQfOB2E2Mu0LeW0RFvo5IOz5AGlPC8o9
-						W8X3CUl/BvlH2W+Eos9x0h8j/5nEH7ld5N8LACv+aeXfD4CbH/1EFH6fWx9/Vh75R/IFgCD+iCj/9Xz1XwcAvAf5xn+i8h8XAHHjP3b1
-						XwcAyH8tjP/0W31KbXvthtoGAYARgODH2yACNBAB293HJga2O66EGL3xOfW/DzCr/8jDY9ervksPFUynebtVy+riLgFaOTzX1Opuw8N/
-						VI7M/a/Si5aF/lveFAIgHAFyAJgI6LjxnJF/GwB4czDkURsAtXFJ0EgEJAUAUkAAIKXcBVj2+k9k0Y8DAmD2Cz9yAZAlAmptFAjJFwFM
-						/utVBGTZDShRBCBlDwEkQwwgkuQXQygQ0iDFQ0YoAnqtO6taDl0UkfByI4t9PE3tKn1qBNnnpBH/xr2DFX1OfvG/s+U/GgBp5D8+ALj8
-						451937nyvij8Pj/7xbd1I/+IIP9IQfKPpJX/Mqz+I/fBe1y28Z/pJgCM/Nfe+M/3x21V614EeYcAQLa9ZuR/u8PIfxgQf4JFAK7+3zPi
-						GRD/IACaT90akfostJmxVXTOLLQcnvufre42PKRHq+rc76UXLi09V78QBEDaXQAbAHiDsN5bL2j55+JvQPHnARCOgPAuQInHgJB6vgsw
-						+eSHsujHAQGw6dxP8wZAUaNAiBgASMoIAPm/KyIAqechgKSLAUSOAUIS+1IjxkAG+oP4S/TZCn/+qleI4l1KmmqJLwSQ9rQIss9B0Y+M
-						7SBa9n3yiD+ST/zvUvmPBkA6+UdePntZFH6JRt3GljYASiL/cgCI4o/kXf3PIP9IxtV/HQDw313i+I+TfykAuPwXOf4D8l+q8Z/qTS85
-						+Q+w8o/PmmtqBzzvwGceAWwXYAd8PnzNydDqP9Iutysi9VmomLxedM4M/MpqbsMj7gEv0nnvRcsEXgmoZt9F4JKBB4BHaBfAngUYuPsy
-						iH80AB5bZp6LvSRo2gjIFABIngAoOAJA9tPsAvTbfV0W/Rh+DQHwwvvfhAIgLgKkAEDqw3kApNwRkBQCcgAgIPsJEYAUEwFIXYYAkj4G
-						EDkEfCSRLyfZfv9bjn67r6rW49eDqAtjNAXSVJT5tICwpyBu9V6iUPEvWP498S+9/AfiX5z8ewFQh/KPHHvpbVH2o/xedRg8o16s/ueT
-						/1Kv/ovij0ir/5L8+wEA/92X9dr//vgPW/0Pxn+iq/9/z1f/M4z/PDxlpx732f76TS3+O14PQPHXH2vxt4D48wBA6Sc2vnhR/f3wVZEA
-						wLv49llysGCajy3uCkAV1bPPWs1teMQ9WlXntkovXlrazdqqavayANhHAcCuCEQcxNV/iw6A6xAD19Wjdgfg0aUGlH85AIRdgKQAQFIG
-						QOYIYAEQFwEFBQAiBgASRECr9dkuBYoBcPOrP6jW68MBkCUCyjUKdOdEQPLhYESMACRlCLgIQEDw40gMgRLEAJItCIiohNc90tfpgd8f
-						vG7tpu4EsZaEPB1N9Cp7MYCsZ0EQfZ/yi39++Y+I/50k/14ApJH/pADYdfQVQfZ98EpBv1d9xyyqc/lHxADIJP8lWP2X5D/F6v/3mvZS
-						9z01L7z6rwPArv6LAeCt/tO1/3UAxK3+Fzj+o+U/2/jP1L1nQPJvOunf+QaAz/bzkPy/dk3thOedejfAgB/vfO2q2gkB0GfpIfVnWv6D
-						APjLwctEqc9CsVcAqqyevcFqbsMj7lFRPWu89OKlpWLcShsAJgJoDEhfDUhfCSggfEWg6zoARh+6oZqvPAuy/4Z6DOUfeBzkHwkCoPS7
-						ADoASrgLEERACXYBkDwBgFz56e9F2Y/jmz/+i2oPAp8mANKNApU/Ago/FFzeCKjLkSAkTQQgtRECSCQGCEmmY5HkvFRIv18MwvfBv9eO
-						84+Kci8hS3xWQNSzIoi+T3rxRwqVfyv8WeQ/Iv5IgvyHxB+pDflHSij/XgDEyT+ybveznuz7GPlHqqatLEMAlED+0wRAXvmXA0CUf0QK
-						AEn+hQC4f+DTVv7zjP/Y1f9ixn/c4V9h/Cfz4V9h/Kdy7kEQ/puMQP4pAMzHKP2GXfAxYsT/mtplWX78bfWdQcsiq//3jnhGlPq09Fp8
-						oOgrAFVWzRppNbfhEfdoVZNrLb14aakYMU8N3XVBVUMEVO8N7wK4lX8dANFLgtKlQDusewfEPwiAx0D4XQDU5Y3BkDrcBcgXASdv/lIU
-						/ThwF0BfCaiIXQCk1s4DIHdoBCBiBCB1EQIljAFCEmmNJN11gfS1WaTvh9N15cuq2YD5ZZB9AiS9EATR9xHFHymp+Avy74l/OvlPEP+7
-						UP6RxRsOMdmXCAJg4oKNdbr6X7D8I0IA5JP/cqz+6wAYtjzD+A/Jvx8AecZ/hNX/bOM/IP82AOJW//8WnhefOC8GwC4vBHY5ggDQgPjv
-						1h9fU+3m7FZ/NmBpJAAen7BRX8azUDrNLf4KQBVVueZWcxsecY9Ww3P/m/TiZaHfxjdCATBCB4CVfxYAyOhDSHAzMKTHlgvqsSUYAG+4
-						1f8nluOuAA8Ae0nQAncBogFQ3C5AcgSUcxcgOBC85uznoujHgQGQe/FHJgBqIwJA9os+D4DcxRFQ/hBAWASUKQY4knCLSNKeFunXE5C+
-						vrT0XP+Waj5kMYi3JPCFAIJeCILkS4jSj6QUfySd/IPc55H/iPjfEfLvBYAV/6j8ewGQQf6RGct2MNn3CeQfmbtqd53JP1JwAAjyHxsA
-						+eQfkQJAkv+YAHig+pkgAPjq/1y2+l/Ow78lGv/ps+pZEP5bWvx3nQHwWYMBYJ9J/PU/o8+va+knUP4XHnpT/fmgpWb8xwuAVjO2i2Kf
-						ltbTt4iumYUWI3L/xWpuwyPh8e9aVef+KL2Aaem24llVteeiqtKjQJcNdA6AjQBJuwD6IPCuS+pxPfoTjP887gKgjm8MhpRrFwBhESAF
-						QNIuwJRnPxJFPw4MgC3nfqoqMwRA4igQcsdHAJIQAYgo/xyQ/SJDIE0EIGlDAEkVAgjIbrliQEIS9UKQfu1S02fbRdWyeiWIuCT0aQA5
-						LxRB8iVE6UdKLv4Fyn9E/JG7XP4TAmDsnPVW9pPlH1m++XAq+UdE+UdqW/6RtPJfC6v/OgBGbUq5+l/M4V82/lOKa/974z/3T9ihtrwC
-						8n7mlma3fg4iYLfjhsgezXUNBsATkzaLq/9I5/l7VK/FOMpTGC0nrhFdMzU1s39j/bbhke8BL1hRVwLqMHePCQAgdAj4ABEfALgTgJcJ
-						1QEAPLEcV/8NeBA4HADyjcGkCEgXAOl3AUwEhAMgVQSA5JdjFwAjoO+ua6Lox6GvBPTBNzoAskSAFABIyc4DpIkAkP/aigCkkAgo224A
-						UqshgLAA4ID01nYQ1Df816DPjquq1dj1IOWS4PuAlBeDIPgSovATovgj5RX/dPIfFv/bXf6jAVCc/D/UYYQaPGk5yH1++Uc27XsuVQCI
-						4o+UevU/k/zXj9X/7zXtqR4Yt50FAK3+pxn/sav/FABu9d8EgJF/efznuwnjP1r+/fGfPKv/k3a9rna/+Z4W/zAg/cCeECD7+OzE/4ba
-						C/9sLz4DE7e9pP5sIK7+RwPgL+CfS1KfhSajl4qumZ7cW1ZvGx75Hq1qcmvlFzEdlZPXsABg9wIA+R+lwQPAxFU1GkH5B8Ycuq7GHL6u
-						WqwC6V92RjVajrypCQLg7tkFSB8BF1SrdYVdCSgUACWNgNKdB6jPERAbAiD6Zd0NQAoNAQTEPh/FxAAiCfPtTuT7lF6L3bfUk7lDIOn+
-						WQAQ8lIgSL6EKPyEKP1ISvFHCpT/iPinkP+I+GeWfyb+9Vj+IwEgiT8C8o/0qJkPcp8uAPadfK3+yH+aAMgi/7W0+o8BcD+IePzqP2BX
-						/8s3/hO/+p9m/KfVvINa/vc4jPzvCXETJN9AEWA+t/Jv2fLyZfXd6mdsAETHf75fvUqU+vQcUI2r5omumZbK6twqq7cNj3yPVtWzBkkv
-						YloqRi1QQ3efV8MpABx4EJgIdgG0/LtzAMh11W49SDYGANB4xVkNHgiOD4BwBOgA8CIgXQDUwi5AvghIEQBxEXDpi9+Jsi+BAfD1H/9F
-						S3umXYC7PQKQWo4ARAwAxEZAOUMAkWMAEQSYEIRZkur6iPS1a6Tv0xF+bToveU41fWqOLPFZEQQ/DlH4EVH4ifKLvyj/EfFH8sh/JvG/
-						A+UfsQHQtv80kPv88o+cevXd20f+kbwBYMU/jfwjaeU/YfVfB8D0QwWs/qcc/0l9+LeA8R+Q/78bvVmtOHVRi/9eBkaA+RifOUEI7MOP
-						9edG/vfBP+u99HDs6j/y8Nj1WuILBceHWlQVdwC4VdWsp6zeNjzyPSpqcveKL2IG+m1+MwiA/RzaAcDRn2D8h0cA7gL03HpeNV4O8r/8
-						TdVkBWIC4CEXAFIE3P67AEgxo0AnbqS/EhAGADJk/00XAKkjACS/nOcBaiMCwiFQxghAQPRrazcgSwggpY0BRBJjhiTVFknEy430dTik
-						rz+E9P0b6LXqvu6saj5kkSz1SQhin4Qo/IQo/ERU/JGyi78o/2Hxv+Pl3wuArPKPNOo2DuQ+v/wjb5y7Xu8CQBR/JK/8ywEgij+Sd/U/
-						n/yzAJh9AqSfBQBf/S/Z4d8Cxn9SrP4PXPeC2nsWRJ9jI2AffIyQ/O9zGPnfb581IP8rTryjvjN4eWIAtJy2VRT7tLSZsVV0zExU5b5n
-						9bbhke/RtWvuP7aqmf2v4guZku6rTkEAXNABEKz6m5V/Pv6DEWCkn3H4mhqy57IOgCYUACvP6sPADy1+IyEAyrsLEImAcu4CICwCpACQ
-						ImDNm+mvBEQBMOfFT6IBkDICpABAwgFwm0WADQFJ/oloBCC1EwGIGABELYYAIQlwgCTOApKA1xbS1yMifX8G6XUhem2lw8Eg60kIYp+E
-						KPscUfgRWfqR9OKPgNwXIv8R8UfyiH+D/BuY/D9o+eW3vxWF3+fSjY9F8UdE8UfKKP/pAiC9/Jd69V+Sf/z4AS3+0vgPyX/Ww795rv2v
-						5R8o8vDvw1N26QO/+86+D+KPBNJP7KePrfzvP2uBjw/oZxsCEABNpm4F+V8WjP+wm38R5gCwLPdpqJi0TnTMDPxz41zu/2L1tuGR5gHF
-						dEN4IVPTccE+NWw3BMDei2qkHwEo/wcRGwCEvSQoRgDuCDRZAQEA8t8UWWkOAocDoJ7vAiB5AqDYUSA/ACae+ECUfQkKgG3vfhkKABcB
-						TP6LjwATAHERIAdA/JWB6nsE3M4hgBQTA4gkyGEkua5PSF9zGOn7TqLXziuqctyGooSfEGWfEIWfkKUfqRXxL1T+I+KPlFL+QfBLIf9e
-						ABQk/0kBIMg/8uMvfi4Kv8+Hn35xm8l/igDIIP+lWP3/Hvx64Ut/Jo3/WPmPvfOvCQAj/1nGf8zq/9/z1X86/OsHgF79N+M/8468o/a/
-						9QHwPki+AT/e/5YR/ygo/e9p8dfyzwJg8vbTTP7l1f/vDFqqej59oCiaj1kuOmYGrlqtbXikfVRUz94mvJCpaTNlbSgARh1A7CFgkP/R
-						Gib/wBjEBsDYw9dVm7Vv6QjAAGi28qw+CIwBUFu7AKkioBZ3AdJEQM8dV0XZjwMD4PSHwZWA8kVAJAAKiIBIACCC/BNxERAJAKQMEVCX
-						I0HlCYHajQFEEuhkJCkvNdLvKyN9T6nwXj98PTvMOQwSPzsi9fkQZZ8jCj+RQfqJtOKPpJH/FOKfTv7D4n97yL8XAEXKvx8ANz/8iSj8
-						Pj/96pv08o/URQBkkf80AZBX/pFoAIjyD/wAvsZ8q/9lPfxLATA+27X/uy07YeWfMPJ/wD7rCAAOcJj80+o/Pm9/5Yr6bvXq8Oq/EAD3
-						jVwjSn0WGlXNFx0zLRXVuc1WaxseaR9422TpxUzNyPlqyK7zOgBG7b+kRiMg/w4vAgLxN/KPdNsMgrzSyD+CuwHxAXB77AJkjoAUAcAj
-						oAL46nfZrgT03i/+CMJ/QQ4AhAWAGAEg+UWfB0AE+SduvwhAyrAbUEwIIJEYiAp/Er7QitKbAUm26xLpa8yM9xpJr2PnZS+ppv3niqJP
-						iJLvI8o+px6If0r5j4h/CvkvTvzvDPl/sEONOn/tQ1H4I/zm9+qRJ0ekC4C6kH8kbwBkkH9ECoA88p8YAPDapFv99wMgbvwnzeo/UMT4
-						zz0Ttqutr95Q+9/+QB3gYAC8bSLAIASAFwIH37qlui48oP5sEMp/8vhPo4mbRKlPS8e5u4s+AFxRNavGam3DI+2jVXXuMenFzELvDa+z
-						ACD5B+kHxhxC6Q/E3wWAjgATAE/tvKQDAGkOAYDPFADl2AUoWwQw+c8SAEghuwAXPv+tKPsSGADf/sO/ghhfjgRA/YoAGwC1GgEsBEDu
-						6zYCEJD8FBGAiPLPiYRACWIAkYS4BEiynhXp1y0JwusgvV4+3deeVc0GL6o16UdE4UdE6UdA6iVKKP6i/EfEH7mz5D8SAJL4E1b8JflH
-						zpy/IQu/QIteE25j+c8YAJL8xwVACvlH7ukwUpB/KQBKsfofP/4TOvxL4z8xq/9T974ZEv+DDCkADlr8z1H+Fxx6U/2FPvibPP6DtJ65
-						QxT7tFSW4A7ALatzj1itbXikfXQdO/b/BhHwb9ILmpYuS4/bAADxB8ZAAIw5CPJPxEWA3QWo3n9FNdPjPyYAcBfgocWvJwRAOXYB7IFg
-						kPxCAqDYCChkFOjYjV+Isi+BAfArCICxx94H4Y/uArgIYPKfFAFSACB3RATYEJDkn3NbhQASiQFZWPMhibAozLc7wvcpvR75gfdo6yXV
-						csRKWfQ5ouhzZOEnROlHROlHQOolBPFHCpX/iPiL8h8W/wb5D8s/cvrNS6LsS3QcMjOD/NdiAJRa/pG08p8lAOA9L/nqf1kO/5oA6PD0
-						UXXwnQ8tIP2Ik38TAAc5IPqH7DNx6G0AnvHqPw+O3RBd/RcC4M8GLFbdFu4TxT4tLSasFt0yPbl/qRw58j9ZrW14ZHnAC3g1+oKmp0Nu
-						u6rac8HN/wcjQGYXwM39W8ZCDOgdAB0B19XYI9dVxaqzIP8YAG+qFvAxD4BidwEiEQCyX1ujQFIAlGoUaOUbPxFlX4ICYM2bn6lWOgDS
-						R0AQABkiwAVAQgSA7NdWBCCFREC5dwPqOgSKjQFCkmWNJNb1DenrBqTvMz3mdQ291juvqtYTNhcg/Ygs/Igo/IQo/QgIvYQg/Uih4l+o
-						/EfFH7m75R85+fI7ouxL9B2zUBZ/oi7kH8kSABnkv5Sr/8i93SabACjZ6r88/vPdhNV/EwB89V8IAJD/+ybu1KM/oQAA6T8Ez4dsBASf
-						v+847D428o+fH4bnwc+cUH8+aLkNALP6Hzf+83fDVqoei/YXRZORi0W3TE3N7ItWZxseWR/wAq6LvKAZqBi3ggUAPwNgx4AOgPCj+BOH
-						EbsDcOSaGgcB0HnDOyYAVr2pWq4CmdfiX0e7AF4ESAFgIiAcAC4CWADERYAUAEiWXYDxx7NdCQgD4NR7X+sAKDwCbADcYRGAFBoBSFIE
-						pAkBWfx9QPJThgAiyr+PJ6kkrrLUZkOS6giSkJca6ff1kL7+7AjSj/DXG967djP3lXe1HxGlHwGhlxCkHym/+CP55N8T/6LlPxD/+i3/
-						XgC0r1YHT70hyr7E8GkrZfFHbgf5TxMAWeQ/NgCi8o/c23t6zOp/iS/9merOv0DC4d8Z+886+T/ksMLvcVhj5F8/08eWlSfPqb8cssIE
-						QIrxn4fHrhOlPi1dF+xTTarmiG6ZgdVWZxseWR+V1bl+wguamoqaOWrQ9rf1GQAKAD0GpLkC0g/oVX/DOBB/zvgjN1S/7RdUi5Vn9ep/
-						y9Vn1aNLwgGQZRcgVQSA7NfWLkCWCMgyCtRpy2Ut9pLw+1AAfPCLP6pW60wAmAiICQCEBYAYASD56SPABEApI0AMgbQRgDD5j0YACwGQ
-						+9QRgMSEgBgABAh+nYYA4olrKWPAR5LwciN9HcWTQvoFOi97UR8OziL8iCj7hCj8BAi9hCD9iCj+SEnlPyz+qeQf5L5w8UduX/lHdh45
-						Lcq+xJg5a0su/0hpAqAE8o/kDYB88h8fAPf1nZNu9T/PpT9/kLD6H4z/8NX/LOM/W1TnJSfUoXMfASD9wGF8ZhGAnxvpl3hfHWHg4d9H
-						Jmxmq//J4z9Iy+nbRLFPS5uZO/AKPqJbpqWiKtfL6mzDI+ujTfWMv5Fe1Cz0WvOSCwDEnAPgZwGCAMDRn3Ga65rx9hxAS736bwLgMQyA
-						pzEApF0AKQIyBgAiBkDt3RysFKNAH339D6Lw+2AAIN9ABHTeetlFQOIuAMIC4LaJAKTUEZAyBOQIQMocAmWOAaScQXD7UJjwc+i96Lr+
-						bdV8yGJR9Dmi7HNE4SdA6CUE6UdE6UdKKv5IPvFH7h75jwZAVP6RjXtPibIf4Te/V1Oe3pxH/rMHQGnkP1sAiOKP5JV/JBoAaeQfuX/g
-						IkH+7ep/ZPwnWP0v/NKfCYd/Y1b/H5qyW+1+8z2Q/I88TAggRxxG+vHZAZ8fheejNgAGrjqu5T/t6j+CNwDrDiJfKC0nbxCdMgsQEH9h
-						dbbhUcDj37Wqmf0b6YVNS+eF+80lQO1VgHDlX+PJ/zgN3wEwATD+yHVV+cxZfRagAgLg8WXRACj5LgAiBECxuwBZIkAKACRtBLzw/jei
-						8PtQAOCVgHB0SAdAmghg8t8QAekiACnFbkC9CAFCkN4gCO7UKAi+P+n7F1+nGKT3AOm+/bKqGL22xNKPgNBLCNKPiNKPpBR/JJ38h8Vf
-						ln9P/Bvk37F6+zFZ+Dkg/0hu5c48AVD/5T9NAGSR/ywB8MCQpUIAJK3+S+M/aVb/gQJW//92zBa18Nh5deTdjwJA/oPPjfgfheej+Gwj
-						gD7W4g8cs6x+9l31l0NX2gDgq//xAfC3Q1eIUp+FpkXeAKyyOve19diGR6EPeBFfkV7ctLSeuiYcAAcv29Eff/zHMB5HfzQmACZAAHTZ
-						eE7Lf8Xqt1TjFWdMANTRLsDtMgq05uxnovBLUACsOft5EAAljABJ/hEdAMhtFgGIGAIg9mkiAKntEKiVGEAkIQa4NMtSXV8Jvm7p+9JI
-						r0MC0mstsuOGajtzvyz6HFH0OSDzcQjSj4jSj4jijxQq/kg+8UeSxb/s8g+CXxL5TwoAK/155d8LgB8CizcckKWfYwNg8foD5Zf/zAFQ
-						WvlPFQAFyD9yf9XqyOp/nV760wuAwetfBMn/WMv+UUb4cyv7+EzA58fg+Rg+W/nHKwA9PH6T+vPBdvY/xbX/kYfGrBOlPi149aBGVfNE
-						p0xP7nmrsQ2PQh8VNbPnyC9uOipGzFMj9l5QY0LjPwE6BnQQmF0ALf9HCBMA/XdeVK0gAFpBAOAlQR98+rWUuwBvlmEXIP1lQetyFGjc
-						sewHgZ/Dg8BeAMSdB0CSR4GKi4BIACAg+6WOgPq3G4DUrxAgJJlNhSTNFi7YAZKIl4vo7y99nQ7p+0uB9HrGwt4ffL86LnleNe6Xu+PF
-						v1D5j4o/AoJ/O8k/YsU/q/wjuZW7ZOknrPwjq7YdzSb/iCD/SGwAZJL/EgVAFvkvJgBGro9Z/fcDIM/qvw4AkH8/AFKu/kvjP41n7VeH
-						3gHBP/8xSD2Az+fxcyP+x+D5GIsA87kVf+A4+/jYux+ooWuedfKfZfyn+dStWuILpe1snP+XnTItldWzpluNbXgU+mhVk2stvbhZGLj5
-						tVAAjA1xxY7/oPwTZvSHqNl/RY8BIXgg2AWAHwFZdwGQPAFwu44CPQkyjWIvCb8PBcD7dBA4ZQSkPg9wB0cAUkwEIPl2A0ofAkgdxQBH
-						EuwEJFlPi/TrJSJ9vRmRXrdY2PtA7w1/v7quw5uGLQR5l0SfAyIfhyD8hCj9iCj9SFT8kdLKvyf+qeQf5D5R/JEk+Wfif5vIPzL16S2y
-						+CNM/pENe54V5D8hAATxR+qV/CN5A6B4+UfuH7u1xKv/wfjPdxNW//Nd+vO747ardaevgdT/yIr/x/AxYeT/uH3mn2us/B8/b4GPV5w8
-						p74zZGX86n9CADw5d7co9mlpOWWD6JJZqKjKNbca2/Ao9FE5Mvf/aFWd+6/SC5yW3suOqrEQAIbLIPso/YSRf40d/5lgR38MN/Tnbda8
-						pQMAdwEwALLsAtTZgWAkJgJqYxTow1+mPwiMAYAHgTtusQeBvQgo+lBwrUXA5TqOgMJCwEUAUqshgIQFVCNJagKSAJcMSdALRfr1S4T0
-						uiTivea+9Pt023JRtRyxGmQ+g/QjgvATovQjovQjtSH+SLL4Fyb/SeJfH+XfCwAr/r78I2PnrEsl/wheMahsoz/1Vv6RfAEgC7/P/RN2
-						lWj1v7SX/hy/6w2Q+h+p4xd+pJ9J/o9fAPAZOGGfDR/B55wgAPCqPz8ct8nI/+Do6r8Z/5Hl/2+GLhelPgvNxq4QXTI1NbP/td3Q3H9n
-						NbbhUcwDXtDLkRc4A51nb9bi77Cr/+P06v8VNR5X/zUmAMKYXYDum8+p1hAAyMMg/oXtAoQjILwLEBMBIPvF7gLU5igQj4Dn3/ta/eZP
-						svRzeACM4weBSx0BIPj1NgKQPBGAJIVAvgiotRBAQBjrKgYISZLvFKTvNxXea5tP+n26w38XrafulEWfI8g+IQo/IUo/Uqz4IwWIvyD/
-						UfFHQPDvUvnHu/ritf3TyD+C9wwoRv6R+hoAhct/+gC4b+qBIlf/gcTDv9kv/dlp6Ql1DMQf5T8MSD88n9DPNgLsxxgDUgDgxz2XHLby
-						T+M/fPU/efwH5//xGv7F0KR6vuiSGThn9bXhUewDamq58AKnpv34p9XofRdDETDu0GUQfpR/wkYAib87B3BN7wQM2gUiueYtzWNLTACE
-						I6D2dwHq+kAwkrQLgHf3zRIAeBB4NfycCikAkHwRwOS/PkSAGwkCuc8SAXW9G4DIEYDUVgggRlB9aRXFNgOSUNdXpK8/E95rR6+p/HrH
-						w99HfF87LDipGvWZmVr6EVH4CVH6kQzij6QQ/9TyD2KfX/5B7u9y+UcGjF+cSv6Rk6ffzi//iCD+SH2V/1QBUKT8I/eD1Be2+p/xxl9s
-						/Cd0+Ndb/X90+l514B2Qdyv9Jy5atPhzmPzrALDif8FiP8/tf0P9BY3+xI3/xBz+RfD6/5LUp6Xd7B2qZZHX/wcWWX1teBT7qKzKPSm8
-						wKlpN2qeGrb1DTX24CULRAAEAEKjQMEuAEbAVTVBg/JvAmDUwWsg/2d1ADRe9oZ6cBEFgDAKlGEXoNgIkEaBpADIsguQJQKSRoHGHn3f
-						BECeCOABgHcExgAQIwDk/06KAKTWI6AehAAiSWYy5YkBH0nCy4n0NRSF8BqVSvp9Oq1+XTUZMF+UfUKUfY4o/Ugdin+h8h8Rf6SU8m+l
-						v47kPxIAVv6RXiPnpw6A02cuRuQ/EgCC+CO3tfyXJAB6qftB+OvL6j/O/a96/goI/yeWH6mT8HxSP4P0uxAIxP+kxXz+kf0cnz9Su9+4
-						ob4/ch2IfzD774//JK3+/9mAxarTvD2qy4K9BVOK+X88u2r1teFR7KNN1ZT/AV7U/zPyIqek7ci5asCq4ywALqlxOAIUuwtwVU0E8Z8I
-						4u84ekN1XPe2arv2LdV85RkIgFdrfReg2FGgYg8EZ40AdxA4TwTgj0EwAN77xR9dACRHQDQAkHJHgBgCIPqpIiDLbkCKCEBqYzcAKVkI
-						IEwsJfFMR0wQIJIY36kI33+hwk/w90d8/xhdN19QzatXZBN/UfiJ8og/kkr+Qezziz8Ccp8o//nEH7kz5B/pVj0nlfwjb56/EQmAUsl/
-						vQiAssl/T/V9+D1LsfofvfQnyr8fAMLqv3fpzzE7Xtfif/KShcm/DgC7+m8+D+T/WfyYfw7g6n/FrN35V/8TAuB7VatEqc9C87ErRY/M
-						wP/RuDr3f7f62vAoxaOyevZ7wgudisqanOo5f5vCQ8DjtPwjwUFglH+34m8xAWAj4Oh1NQkCoO+286odBADeE0AHQNIugBgBtbcLkCUC
-						yjUKhHzwyz8GARATAXoHwAYA3RH4tosARJR/AmQ/awQgKUIgWwTUoxBAmGxKMpqehCBAJHm+3ZC+L6BY4Uf4+yC+Tx6h93v7VVU5eYcs
-						+xxR+IlSiD9SoPinln+Q+6LlP4v413/5RzoNmZVK/pEL1z4sUv7jA0AUf6S25D9zAMiiH8cP4HvJtvpvAiDd6j+QevV/u3pyyQkr/59G
-						AuBZFgH0ecDHEU4B1RueM/LPrvyTZfUfeWz8BlHq09J5/l7VuKro+f+rVlsbHqV6tKrJPSO80KnpPmW5Grn3vBn/iTkEbCLAwgPARkDV
-						viuqPQQA7gKYAJB2AYIICAJAigAhAJCkCADZL3YXIHEUCGEBUIoIwJGeUADERIALgD/+q5p26qNQAMRFQNZDwXdyBCAF7waUNASQsCBK
-						AinCJFSS1GwEYixJcwhJtusK6euz8O/JIH3f6eGvt/h+CPjvLX/f28w6oBr1nF609COi9COi9CPlFn8E5D5R/JE6lH9J+Dkg+eWQf6TD
-						oBmi7Etc/+DTTPKP3Jnynz0A7mkzrAyr/9L4T/Lq/2Mz9qkD73zk5P9ZeH5WPwMQAeZjkH0EpP8UfH4Knwn458HnH6sVJ/Fuv6sjq/9Z
-						Dv8ilTO3a4kvlDaztpXg+v+5ZVZbGx6lelTU5LpJL3Zauk58Wg3b/Gow/gOMhwCg8Z8JfgAAk45es1xXk46Zy4J2APlHHl0M4l/QLkCe
-						CChwF6C+jgI9QweBMwTA9ne/zB8ASD2OgFQhAHIvUc4IQMoSAgiTQUNYFiWhjMUTVElgCyMs0ZJop0KSd470c1Lif43y95Ed/zUVX3cB
-						/300eO+1/W+g44pXVZP+c0HiJeEnZOlHROlHROlH0oo/Uqj8g9jnlf+w+N9N8o+07jdZlH2Jj3/8ZVT+EwKgKPlH6iQASi//yD3wftXV
-						6j8d/v0eBMGGl6+D3KP0E+EIOHUZwOcIRv6fYxw4+566d8wGLf9BANjV/wyHf/8Cfowk9VloMXG96I9ZqKiZ1cFqa8OjVI9mNVP/J3hx
-						Cz4H0GncQjVg+WE9/jNeyz/O/9szAIeRq2oicoThAsBEwORj8Bf0lndVh3V0EDj/LkBdHwiu6wgYdYQdBE6IAAwAfSnQP/6LOveT36qK
-						teEAKGUEBAFQDyKgXuwGeCEAIlfOEEAk0YzFE1dJbkuHJOAGSdbTIP1aYaSvo3j8100jvb4xRN834b1l7zv9t9B5I/zZr1oGQl+k9COi
-						9CNR8UdKK/4IyH2i+CP5xB+5DeTfC4C08o/X9G/Ze6Io+xKf/+yXBY7+yPKfGAB1Iv9IeQLgXvhvo7ZW/00A8NV/EwDzjryrnr38KUh+
-						QPhzEH3gOQvJv/4cn634P3/ZrP5XzMa5/1VW/gsf/7lv5BpR6rPQdNRS0R/Tk/u39gMn/fdWWxsepXzAi3tJftHz02HMfNV7ziY17tAl
-						jZH/y2qCnv83TMTZfzb/78Rfc0NNPn5DDd51EQLgbdV8hT0IzHYBXATUwi7A7TIK1H7TRS33+SKAB8BXv/tn1Q6kvP5HAHIbRAACki9R
-						uyGARMVSks9EBLGVBPhuQ3pdxNcvAen9ibyH7D2W/hvQbLuiWk3eJgo/IQo/IUo/UqT4IyD2+eUfxL4k8u+Jf5HyHxL/2pJ/RBB/RN/Q
-						C2jaY5wo+xK//PY3Bch/fACI4o/cYfKP3Av/XWdZ/f9BSVb/ASv/A9a9BHL/Yy36z135MUg9PFvxp48Nn4DgfwoEIYAfB/xIvQCM2vyi
-						+ouhKP8UAMH4T5bDv0jTKVtEqU9Lx7m7VZOquaI/ZuBtq6sNj1I/KqtmLxBe8FTglYD6TF+hRuw5F4i/g8Z+QPid+BsmH8OVf+KGGgM/
-						FgMAbwj24KJXIhFQ17sAJYsAJv/FRsCNr/4gBwBiA4AuBYoBgIw88r4JgLs8AhAxApCsIQCCH0epQwDhohiRSE1UNiUpzYsgvpIg30lI
-						37NGen3yIL0P4vvF3k/p/ZZoO++YeqLX9NtI/BEQ+7zyHxb/VPIPcl+o+Ndn+UcadR0jyn4cP2w7LFH+kfLLf5kDoMTyj9zbc1qdrf63
-						ffq4nvnX4h/CSP/z8OwIfW6k/wV4fgGfLYuOvK2+Mwzn/otf/cfLfz4JAi+JfVoqpm0BVyzu+v+VVblZVlcbHqV+VA7PNZVe9DTglYD6
-						TFuuhm06DcKPAcBX/0H+jxgmOWwM6CBguwAQAV03vqMj4KGFPACAhFGgUABEIkAIAKTACKgPo0AIRcCBK1/J8k+wADDnAP5FrT37uWoZ
-						EwBiBID811YEIJkiABHlnwOynxACYgAgKSMAqRchgEhyKUioJKupkeQYkGS6viN9Hxrp+06B9FobhPeFvW/Se5sE/bfy5KrXVeP+c2Th
-						R0ThJ7KIP1Ju8UfyiT9yZ8s/wgPg0Y4jRNGP4+EO1aL0E0XJP5IqAMoo/+UKgL65Eqz+2wDIsPr/iD30+/zVsPw/7zCy/4KT/uBzgxV/
-						+/G+N2+pH4zaULLV/+9WrQSJ31MUTcetFt0xC5UjZj5qdbXhUepH1665/wgv8j/4L3paek5ZqgYs3RcEwOHLaqIe/UGC2f9oBFAAXFdT
-						IAD677ygOq4HAdcHgaVdgNtkFAiJiYAso0BxEUDnAXIvfgyiHzMGhAgB8OrH30IAnK+VCAiHQPERcFvsBiAg+HGUIwQQLpSicGokOZVl
-						NhOSRAtIEl4upN8/gvS9ZER6PQ3C6++9T9L7mIT774P9N9Np43nVrGpZnYs/Urj8h8Vfln9P/O8C+Ufw50uiH8fjnUaI4o+kkf/EALhD
-						5R+5r//8Wlr9pwDYoX4wcbfa/NpNLf8vXP2JftaA+L+g/5kF5d59bsT/RXh+EZ+1+JvPcf6/xcxdIP+rbQCA/FMACKv/+Q7/Io+O3yBK
-						fRaajlgkemN6cr/t2rXrf7C62vAoxwNe6JeiL3w68EpAfXNr9UHgiRAAGhcAgBAAk3EMyI4CTdHcUCMPgGRteFs1W/GGejDDLsBtOQqE
-						sACIiwApABAMgF47roLoYwDER0DoXgAQAJ/9+h9B8jEAboMIQG6jCEBKEgKIlT1JBPMREk1JRDWStBok0S0KSb5rC+nrKQLp9QoQXmfv
-						/ZDerySc9CP+fyP03w78t1Y5bReI/BQgvfQjsvQjtSH+SD7xR5LFv+zyD4JfF/JPfPvr34myL9G466hs8u8FgCj+SDnkH8kSAGWSf+S+
-						wYtTrf4b+S9+9f+7wIrnr4DQ/8TDiP6L8PGL+lniU/USPL+kn4MY6L/qBJP/6Op/1kt/Iq1n7hClPi1tZ21XLaqKG/+BADhpNbXhUa5H
-						ZU1ujPzi56fjuIXqqZkrVc32190uQDgCeADg6I+Bxn9Q/hEcA+qy8R19DuCHGAChCCjxLgBSYASUaxSokAj45Js/gejHR4AfAMjgfTds
-						ANRhBNgQkOSfKH0EICD7tRkCIGhJhCMA8SSPCaAkiPnwBVSUVI0ktAGSDN9u9MiI9GuEuSYDrzMn8h6kIPQ+wn8HHP+/Gfpvqe3Ck+qJ
-						3tNB7Ess/ghIfTnFv1D5j4o/YqX/DpB/5Bff/EaUfYkWPcflkX8vAIqQ/6IDIIv8lzkA7h22slZX/8ftOqNeuPYZANKPoPDDcwQr/S9d
-						s2jx9+QfmHvwrJn7l1b//Ut/plz9/+shy1WneXuKosXEdaIzZqGiKjfcamrDo1yPipqZfye9+GnAg8AYAENWHQXZD8R/Egfkf7IGxJ92
-						ANghYAyAqcdvqKe2n9e7AFr+/V2ApAPBi8uzC5BlFKgUERAJgDwR8Jy+IVi2AFjy6o9ZANxuEYAkRAACol+23QDkNgwBJCKaIKvxyCHA
-						kaW4dpHEPZad8Yi7BxFA6OOA14wjv6bJdPWB9yjMVQiAgOh/M1fVk6vfUE0GzlNP9JisSSf9iCD9CEh9OvFHQOxLJv+e+KeSfyv8pRB/
-						BAS/ruX/gTbD1Je/+FaUfYlWfSaUVv6RmAC4U+Qfua9mbcLqP5d/afU/25V/Bq4/reX/RYeR/Zcs/udR+TcBcNo+P/PcRfXXVWuZ/Eur
-						/9kO/yI/HL1WlPosFH/5z9mqcuSMP7ea2vAo4+PfwYv9M//FTwMeBMYA6D9vs1n9twEwOQTI/1EC5f+aHf2xgPxjAIzYf0V12QjiveRV
-						YRcASBgFCgKgtBEQDQAEhD/lLkBcBGQZBYqLgGWv/RhEnwJAjgA/AI7f+KUXAOdNANxVEYCA7BcaAqEIqMUQKFEMINmCAJFDQEKS9UIQ
-						Rd4H5DwNKPE9xPsFSER/fgjva5C+9rSEXrvtEvDaWzACuuSh86aLqsWI1SwC4hGlHwGhrxvxR5LFv97JPwh+ueQfwev7S7Iv0fapyQkB
-						0CD/cdw3emOtrP5XLjymnr38Y/Xi9c/USwREAIr+afj49HUu/uEAOC1w4C282dfGyOq/HwB/lvHwL9Jy+jZR6tPSPrdLNaueIzpjenKf
-						WT9teJT7UVGVWy+/CfnpNXWZ6j9rlRq9+227C2CYdARX/4kgAKYgEAFTQf4dEAC4I9Bt0znVfOUbOgB0BJTzQDBSYARkGQUyERAOgFJE
-						wKC9N0DyeQBEI4DfC+Br4MOv/yESAPUhAlKFgBABsSEAkl/WCEBCISDLP6fwEEBYBHghUGwMIFw0HWII+MCf2SJBEfal2iEIOF+Z7yEK
-						fFqiv3YE4WvyJT4roe8/j/Qj0vsVAf6bMCNCwNZrqnLqbtUIIwBEP8wkDd8dcID8I+nkH6Q+lfgjBYi/IP9R8Ues9N+B8o98+vnPRNmX
-						6DBwWib5TwyArPJ/OwfAuG1lX/1/dOYBdejdj534G+EPw8UfY+A0PmtA+K+H5R8P/TaethPk/xn1nRKv/n9n0FJ9+U+8hn+htJiySXTF
-						LFRW51ZZPW14lPvRqibXWnoT0tBlwtNqwKzVqnr9c2oSir/jih39MWjxB6YSduWfmAb033FetV+L5wBezrwLUK4DwaWIgHKcB2ix5ry+
-						wVdSBPAAoAjouePq7RsBSNoIQED0b9cQQPKGAAICWMoYQHwJdYgRkAQIrUWSYQ2Idhw9RHFPC/78MD13JYD/XkD6dbIS+d4ir0PyKJH0
-						HoXPBkRpv+iUatxnhr5PAO0IOED4HSD9HBcCHrHij6QQ/9TyD2KfX/6t8N/B8o939v3RT74UZV+i89CZyfLvBYAo/kiM/CcGwG0q/8g9
-						k/YkrP5b+S9i9R+v+LPl9Vvq9I3PDYL8a+F3z4aXGRgA9DGO/nRZfNjIfxlW/x8YtVaU+iw0HbNCdMUstKyZ1cLqacOj3I92Q3P/Xavq
-						3D9Jb0Q+2o+erwbOXq0GLdltZv4tk49cAeFH8SfMyj+O/eCq/7TjiBF/YsT+y6rbxnfUQ4vMDkA0AkwAhCMgZhegvowCIRkjIAiA5Ah4
-						40e/YuIfjQC6FKgLgD/8i5r1wsdiALjzAEIERAIAKUkEsBAAuc8eAUjtRAAiBgBiI6CgEEBA7pOIhgAiiB+IYaljgBCDgGCyKsmsRpqf
-						ByRhzoIo80ngz4lB+vULJb/0I/AaePDXUoS97tL7xP976Lj2bdV0yMLkAPCgAAgzASJAAKOgVOIvyH9U/BEr/DHif2fIvwmATz5LvwPQ
-						vSpnpb9U8h8OgDtR/pF7px0s2+r/34/fqZaeuszkPwiAl28A+EyfO4zovwIfv2I/Np8bRmx60cq/tPpvA6DA1X+k+dStotSnBXcPGlfN
-						F10xA/9QOXLkf7J62vCojQdeckl4I/KC5wAGzIIAyD2jxu07b1b/j1zWAWCgHYDwLsA0iAETAUEMYBx03/SOarLsdbcLoCOA7wLUo1Gg
-						UpwHyB8BNgCECNjw9uee+HOi9wLAANh36SvVQgwAxAaAEAFiCNSzCKgvuwHlCgGkPsQAx7/yjQZE1UeS5DSIEh8H/vg89BL+WSmIfO0g
-						+DLwWnhIrxeRVvyjwH8XQMe1Z1WjnpMNPWTpR8SxIA0EAALC7wDxR/xxocf0bkAB8g9iXwr5zyz+CAh+vPwz8a9l+UeyjAD1GjHXir8Q
-						AGnkHymH/CP1OADumQXin2L1/3uR1X8r/wmr/zMPnXPy/3IIEH33bMT/FXh2hD434v8qPC88+rb6y6o1wup/dPznzwpY/f8L+LEd5hiJ
-						L5SWU0ty99+jVksbHrX1qKyeNUR6M9KAdwTGABix6SU1GQJgMgXAUdwFCHYC9OiPnv+/ZgMAYRFw4oYasOO8avPMmzYA7qxRIBMBMQGA
-						sAAQIwCkn0fAqCPvCeIfgAGA8s8D4MbP/qADoLYiAMkUATYEJPnn1GUEIGIAELUQAkjqGEBACosNAi6hDi6pFn+lWxbhAEmos4BST0j/
-						3qcXxEIpSB8g1yL0SIGOAHiNEfG19zDvE/w3wIH/Jpr0nq4a95iswQjgPMEQxZ/j7wyA9BvGOzACTAgExIp/avm3wl9K+bfCL4t/3cu/
-						3gHIEAB9R8+vM/lPDIB6LP/fg68pefWfj/5kW/2fuOesevnmF1b0Da94Hwd8BoL/ORCIP34c8BO1/sXL6q+r15V19f++kWtEqc9Cs7Gr
-						REfMQkXVrAFWSxsetfWoHJn7X6Hc/pv0huSj28TFavCcNWro8n3BGFBk9Z9xDGJAhwAeAA6gMaCuG99WP1wQBIDZBYiOAqXaBSh7BNgA
-						SBkBibsACAuAfBFQCQKOYi/JPxIJAOCXEAF4I7H6EgFIXATU990ARAwAooAQQGo7BuKCICKZnuhLsp9EZJU8JbJUB0hynsyNgujpszOJ
-						6NcpfW8i+FppbASk4iq8Zwx4/4nmgxeqJj1NAJgIkDEhMDFCRPwddkeA8RgIv090VyCt+CNW+GPE/06V//uBH3/xc1H2JQaMW1Rm+Y8P
-						AFH8kfos/8AP4HUJyX+JVv8Hb3pFy/8rDiP6r+IzYT93oOjrj/HZiP9r8IwcPfehun/cZvWd4eVb/UeaTtmidwCKoXHNAtER05P7bxVD
-						p/0vVksbHrX5gDfgcvQNyU+7UfPUEAiAIfPWqQkHL5jLf/IAsBHgDgDTLgCt/NszANNPmAPBvbacU42WvBaKgGz3Bqgfo0AFRQCT/zQR
-						cPGL34nyj/j3AqAAmPfSJ/oQcZ1EAMLkv35HAAKifxuFACLHAAKyHwcIfiQAQCwLFX5RbBOQhJmQJd4nKuxJ9M6D9HN6gdjHA1+DgPT9
-						iMBrxpFeUxl6b64aQP59Wo16RjXpNUU1xgiIwd8ZcHTHESEIgRBR8dfyHxoHsoDw+zwKAcCR5R/kPo/8R8T/DpL/rAEwZOKSWPlPDIAY
-						+Y8GQInkv54EwPfxex+7XRj9Sbv6z+U/WP3vv/5lJ/+vhkC55x9/DnIfhxH/1+Hj5y5/ohpN3cnkP9vqf5obfyF49R+8fKck9WlpOW2L
-						qihy/Ad+/gWrow2P2n60qp41W3pT0oAjQEPmrlUjt74c3AMAIkDLP8DFX2PHf6YjJxATANNP3FSDd11QrVefie4C+BFQ5lGgUkRAJACQ
-						EkbAzgtfivKPxAXAiZu/NAFQ6ghAShIBLARA7vNFAJIUAmIAECD5mXYD6iAEkNLHAK4Og+hzeACAVCL8Sj5xV/SRhD4OUX4BWeoJEOw8
-						SBKfBunXcoiiT8DXFYP0/cUCrx/Bx6KSuabhOwCR3RpGmynbTQBEAPknek4KA/KPYAAETHRgBBByAJhRoBAYACD8HB0AHvnEX5R/X/Ql
-						QPBLJv+C8HNE6SdSyD/y2U9/Icq+RNW05UXKfzgAipJ/JC4A6oH8/6ByiLp34i5v9McGgJZ/gOQ/w+p/h6XPqpeug9zfAsnX/JR9/IV6
-						LQSIPj1b8X8dPtbgx5Yey46pv0T5L/PqP179R5L6LDQdv1p0wyxUVuVmWR1teNT2o031jL+R3pQ04P0AMACGrzoIwn8ZQPmnMwAEhoCF
-						dgHwikDsqkAYAWMOXlHdNuEY0OnbaBSokPMA6SMgCIBwBEw79ZEo/4QfAHgO4ONv/kG1pAC4HSLgNtsNQMQA4IRCoHZiAOGjIZrtHBRG
-						kPwkQEAjV7hh5JN9WfAJEOsYJHlPi/TrIb13W/DjvFyPRf5eEsDXwSK9RrL0I2Hpzwft2rSfd1gHQMDkCCYCBHQITIygI6BbGBMC40OE
-						5N9DjwSB8AeMgQAIUxL5B7kvRv5D4o8Iws8RpZ9IKf9ZA2DEjBViAIjijxQp/4kBUJ/lv+0wdQ9IvHzwN3n1/7sJq/8tFxxTz135CQj9
-						Tx1G+vHjQPxft5jPUfjxc3z+XL0BH79BEQCM2nIa5H+tsPoPlHD1H8Gr/+AOQDE0qV4oumEmqmb8ldXRhkddPCqqcx+Kb0weOo1bqIbO
-						W6uGzt+gJhy66CLACb9FH/7leLsAM07c1M99tr6rGi19lQWAiYD6MgokR4ANgEwREBMAiJX/pAh4cvMlfaUfSf6R0FWAbAD8AsAbibkA
-						aIgAA0h+XYVA0bsCCAi9RGjlH0SfI60Yc/zV/ji0oKK8MiKHZB03Imghz4Mv8D5O6CXw36dGFn1ClPp8wOuRJP3JeAeEQeo5ceJPdFx+
-						WjXtPRWYIoLnA2TYjgCD7wQQJgImhNAR0HVcCCf+ESAAEJB+RydzNiA4I1C/5/0RUfqJDPKP1/TPcidgFwBp5B/JKv9eAIjijxQh/+UO
-						gHvg/S7ssp/S6j+Iv139bzrvqL7L72vvgewTNgJeh481VvzfeA+eEfa5xsr/Gf3552ryrtfUX1atLWL1P/3h378avEwU+ixUTN+qWgpe
-						mI3c+1ZDGx519WhVk1sovznJ4OVAMQCGz1+nRm9/TU1F+T8Cwq+ln3ONYeX/OIg/YgMAGbb7omqLVwOSdgH8CCh0FKjICIgGACIHQFwE
-						FH0oGLj0Rfw5AB4AOgJsAKw681k4AMoUAalCwIq/jxgCIPf5IgApdjeg7kMgWwwgFAJdkATpD436eBjpT8aIp5V+iyyueBg2ihujAdnO
-						QuFCH8d11Wd3fnoXAvzahURD8NpFrxzUE153ibgQILpuhP9PCOLftFcckzUYABw3FhQBI2BCGJD/J7qGeQwDwMOJP4fvCoD4mxAY7Y0F
-						3dnyX1AAlFT+vQAoRv5TBkBZ5R/+G7oHJL+0N/3aox6agXf5/RFI/5da/J3wW94IgXLPP/5CCz8H/9nTx86pv6pG+a+d1f8Hx6wTpT4L
-						zSYUP/5TUZ2bbzW04VFXj8rhM++R3pw0PDVzpQ6A6lWH1NSjV0D+ET8ArqrpIP8GWvm/buX/hpp58qZmwmH4S23zO+pBHQClGgUSIqDQ
-						USBEDAAEhD/NLgBSggjY/u6Xet5fCgC6EpAfAC9/9K1q7gdA3gjIeMdgJG0EIFb880ZAiXYD0oSALP4+IPmlCgEkEgOy8HNCOwEAD4DI
-						fL+Hv2LsQ4LJEQVVkP/w3Hx+ZFFPTx+IgwBZ6H36wo9Fwj+3APD3Z0hfXxK9dl3T9OSIrzNDeG988DKizfvNUM36TDGA/HN88ffhuwIU
-						Af5okI4AwgYA5wmAXy7UXDJ0bIiI/AOhkSAQfw3IPwYA506Tf+SLDAFQjWcA6lL+kbgAqGP5v7fHFHUvin9I/tOu/kcv+0mr//dP3a92
-						nf1Qvf7+lwaIAC3971vg4zP0Mfv8DD5rogGw5oVL6m9qNujVfy3/ZV79R1pO3yZKfRYal2D8p/WImd+1GtrwqMtHq6rcj6U3KB9dJjwN
-						AbBeVS3aqCYdumgjAIXf4zjIvwPl3zBTB8ANNUtHwA311PZ3VZNleDUgHgAmAko7ClRgBIDs14cIwPsBoOhLESAFAB4E/uI3/6Sl+06P
-						AKTg3QAEBL8+hIAUA770h8d+giv8+Id99XgPiGEc0ipyaARFY8d8GHzMJR/+CnkaJHn3IZlPQpT3QgBpL0b4A8z3F9oNEF4zDr3m0feF
-						ge8bvn/wflcMexpkf6pANAgILv5h/J0BGwIg/gTtBPDDwhgBhnGa0HhQFxwPghBghOSfB4CNAI6LgTtE/pGffvW1KPsSFACi9BMx8h8N
-						gDtH/u/rMwvk/wTIPxAZ/ZFX/6MHf6Or//dN2ac2v/YeiP2XEc44jPhr6Sec/CNh+d/22nX19yM32tEfafWfy39pVv//ZuhyUeizUFGC
-						q/8AH1n9bHjU9aNVdW6F8Ablpc2IOToAqhdsUGO2vaKmHbsCwo+Q+BtmgPjPQPG3aPEHZhHP3tTU7Luknlx71gZAOUaBeAQIAYAUEQGp
-						zwMg+SKAyb8fASjjv/j9P4sRQAHgzgHYAPg5/PgxR9/XAVBIBLiRIBD82ogARAwBEPtMEYDUoxBARPn3YSHQ2REv/T6hFX+BtMIviX8S
-						KLNc4vMhST1HEnqOKOop6LsnBfjjPKRfKx3m+wmNDMHrlY+4EHDgOJbFjGfh+3lVtRmzRjXvM81DDoDwOBAnKv8akH8fNwpkMREA8s/B
-						EAD5JzACKAQe7TImREj+fSgEQP4RjAAdAoAR/hjxL1L+ReHnFCH/yJc//0aUfYmqqctl6SeKlP/EAMgq/7UUAPcNWKDunW3lP3b0J/tN
-						v+6dsl9teT2Q/0D4DW9+AOCz/tyKPwuAN+EZMZ9/oT/e/9b76p5xm0H+19Xq6v/DY4sf/2laipt/1eSetvrZ8KjrR2VV7iHpTUpD/5mr
-						VPXCDap65X4z/hPZAUD5v6ZmInrVP1j5N5gRoJkQAFOOwV/4286phxeB9FMApBgFCkeAtAvAIyDPLgCSIgKkACjsUHBhEXDmk1+7AOAR
-						EAkAgAJg0ztfuAColQhA8kQAkjkCSrgbkBgCIPcFh0CKGBDF39KJsy0gGPVJln4fPwBotTigcOFPQ2he3kMW5vSI8p4V/HU8pN8rG8L3
-						i69FCqTX0I8BwrwXZkSI3s/203eqFn2nWaZqMAA4fGfAF38RkH/El38+GkREgwADgEER0HWsxu0EdB6jebTzaEfaCAiPBXkBAHJfqPgj
-						ovBzipR/JFsALJPFHwnJfzgAYuXfCwBR/JE4+U8KgDLLP/669w2FIJp90q7+B/Kf9+BvZPXfyr9d/b9/2gG1/cz76swHP3O8qbHiL8i/
-						+TwQ/7MW+vzQOx+o+8ZvcfJfW6v/fzZgsaqcuV21A4kvmNk7VZPqeaILZgEC4F6rnw2Pun7kcrl/D2/Kz/03KQ1dJz6tA6BGjwGdd+I/
-						g7A7AOEA4BFgAoB2AQbvBKFc+bp6ILILYCIgfhQo33kAkP8CzwMUFAEg+ekjIBoASFIErD7zk1AAUATgs38lIAwA3DF497Pfgvi/W7YI
-						QOIioC5HgpBS7AaUKwSQiPRvDYgb+0H4JT3zSX941T96VR++mhzCSqYopQIR6bXIkpyMKOvFgL+mpR+D//PCwR2LYPfCAa8JRxJ+RHot
-						I1jp98Xfp+OCo6olyD8nfwj4OwNh8fehHYGw/E+IghHQLczjOBLEwRDoMkZDESDGAIk/g48DGUboACBuB/lHfvaLb0XZlxg+ZWmdyn8k
-						AOpK/uH3u7/mGSb/NPqTdvU/fvTn3qn71abX3lOB9HPC8u8HwVl4PvsBiL8m+Pz5K5+qJ6btUn9ZbeW/Flf/v1e1Spb6DLSYsqkE4z+5
-						L0A7/52xz4ZHvXhUVueWyW9WMjgGhAEwAgJgzJYXzUHgY1ciAUBEIgDAMaDZEAOzn72hxh66onpsels9MJ8CgEdAAaNAfgTkGQWKi4BI
-						ACBiACAg/GWOgIF7r0cCgIgLgK9+988gmpfyRwAiyj8Bsp91N6DICECKDQE5ApC6DQGUfyJW/BluF4Bd6cdc7YfuBisJvyz9SWjpz4OW
-						V5DcYmVflPUM9CPg18oHl3b38wrmuqavD7wGEmljwIe/5kniT3Rd9bKq6DctRIs+Ms37TBFpBvLvEx8CEx2+/PuEdgIA2gVw2BCIBEEn
-						iIBOoxxO/ENAACAg/poONeohRn2V//sqB6uvv/2NKPsSQycvKUL+vQBII/9IyeS/NAHwffia7h21yci/sPqf/uBvdPX/3in71MbXbqk3
-						PwTZRyLyT8+GQPJl3gJeufGZapnbZ+W/dlf/kUYTN+kV/GJoPGa56IGZqMkttNrZ8KgvD9ySEd+sFPSftUqNfHqTGrFir+JnAEIRcAIC
-						AJipua5mnUTwALBBBwCAuwIDdpxXTZa+ynYBhAjIOwrEIsAFQLoIyDIKVKoIiBsFQsRDwc+cU5//+h8zBQCOAU179kMbAPUzApC62Q1A
-						yhcCfgxw6efz/nGHfoPRnyj8Bl/ddgTgLDgXf0nyObTSn4S/Io1y6h+OTYLLd1okiY8gynlabmbA/JxIhMDXkB8WAmnQr60hCIBrsZD8
-						4xmO7pvPO/H3dwICpmpa9PHoDQHQe3KEZkBoJMgFwcQQOgR6BJD4N+o+Pop3LoCPBbkY6DzagRFgQgBHgUY5nPhzbAAQfCSo9PIfiH8h
-						8o8/RxL9OIZMWpwnAOpY/hMDQBb6LHwfv7dx2z35p9X//Ad/k1b/7596QG078z6I/1dO/s/CsyPyOQg+PKPkI+Zzi/1neOff1vMOqL+q
-						Xp9y9X9lSVf/vzNoqWorCH0WWs/coZpVzxUdMAsNV/+pp4/K6twn0huWj87jF+kAQCbuP6cjwKz8I7TyH6z+o/yT8DuevalyFjwM3Hn9
-						W+qB+S+FR4FYBBQ+CsQjgAKgPBGQ+jwAkhABOgAQLwJOvfd1pgD4Cth36SvV/BkKgDqIAKTICEDKFwJBBJQ+BC4b+SeY/HPx59Cojyj9
-						FrPqz7kmXuEnMvOfQvqjwi9d1SaKtMqfhCzMAWFhj0MS9nQ8JXLDIf5++HVlQPq+RfD1s5jX81oq+A4AXi60YmBOtew33SCIf4Q+UxwY
-						AURzCwZAGJD/Xh5eDCChHQGAxF8iEgN8NwADgIERYMAIGOlwq/8WNw4E4k+ERoLqWP6RRzpUiaIfx5CJXgDUufwjtSP/P2g9WN07eW8g
-						/yU8+HvPlP1q/Ss3tfyfdXjCj7Lv8bbDiD99jODoT59VzzL5p9V/Lv/PMPkv/er//aPWiFKfhaaTNoj+l4ma2R9Y3Wx41LdHRfWsmeKb
-						lge8KRheCQgDYMym53QAhHYA6CCwG/2BCLAhoHkWrwR0wwXA5KPX9C7AI4tejhkFiomApF2AUASA/Gc+D5AcAVIAIOWMgHkv/ShTAOAO
-						wIe//COIPYh/xghICoGkCEDiIqDcI0FpQsBFAFLGEHiS2EJgAIDkczzp9+HyL0p/7OhPgH+1n5A0Fij8osTGIMk9IUq2QxZ3jizxabmh
-						+u81PBUH/Jgs8K9f+n7jCF4vsxPgjwP5mPcquiPQpmaJqgD5R0wIgPz7eOLPaeFBIRDeFZhkAPlHouNBE0KYsaDxDikCNF3HQgCEeQzH
-						gQgXAsFIkA6BjiNC8LMALgJA+gkpBEThJ0LiXxr5Rxp1GSmKfhyhAIiR/2gAyPKfGABx8h8JgFqSf3gP7gOBv3f2s0EAePJf6MHfe6Ya
-						+Sfxf+sjgEUAfe6k/yMu/tHP34HPcfV/wDPPqb+qWV/C1X8Q/wyr/0jLaVv1DkAxNB65VPS/bOSmWN1seNS3R+XIGX8Ob9B/k9+4ZPpO
-						X6FGLd6sRi7bAcKPZwCCXYCZmmsg/YiVf2C23gmwuwE6AIIIGLr7omq/5k1vF4BHQCHnAaRdgCwRYAIgWwTYAChDBHTddjlvACA8APAc
-						wNADN00AlDACynU4GKm73QAkQwggIPkUAk76ESf+l8PjPzYEOqP4czzpd/IPsh8QHPaVZJ8Ir/yb1WENSj+uHDOM9PsUJvyS3CJcjMPI
-						Yo/I0h6l/958BKJfStkn5O8rBnwtGOb1CZ8ZSBoXcmcu4D3iZwSIDhPWq1ZPYQCEzwJwIrsAgC/+AZND8BBwQUAh0Guihp8NaALy36TH
-						+BBiDIDs+4TGgoDHuoD8ExABGoyAjiMdD0MAEP4OgMOGAJI3AMok/0iLnmNE0Y9j8ISna1X+IwFQB/J/T/sadd/0w4L8C6M/LgCSR39o
-						9R/lf93LN43kW95mH9PnASj45plA4efg6v+ANSj/G+p09f9vh64QhT4LraZvU82r54jul57cf2s+NPf/tbrZ8KiPD3ijLkffuPy0Hz1f
-						jV6yWTNhz5mw+BNM/hEj/IxTIP/AHGD84Suq//Z39Z2Bk0aBdASU8TxAXAREAgARAwCxAVCGCPjgF38UI8APAIQCYP1bn6tmFAChCEBK
-						EAExISBGAFLOCKiDEOiA2AjoECv9Bn7o1+0AAF0YkvRr8QeJ95Gk3wk/geLPCIljRP4BJpuSiMbJvii9msIkXxZ6n7DgJ0o+AV9Tocjf
-						XwL4ujDMaxWV/jhCrzu8N0TkPQM6ztytKvvP0BEQAsQficSAha4WFBCVfw0IP0cHAO0IWHQI9JzgMBFAeDEA8s9B8fd3AZDHu44J4QLA
-						RoAOAb0bMNLx8JM1DikEHgTxJ8QQKKP831c5SFX2nSCKfhyDMAAKkX8vAETxR4qU/1IHwL2dxqj7Zh5V9+aY/Bc1+oOY1f97ph5Qa16+
-						ARL/c4sv+wYU/nh+ps7B8zn9bOR/4NrnmfwDJP9u9d/If7lX/x8bv0GU+iw0Hf+M6H0ZOWc1s+FRXx+tanKjhDcuFcPmrYMA2KLGrjuq
-						Zh4D+Uf06I9B7wCcRCAA7Op/OALoHMAtfSZg6G6QwlVvmADIMgpUzHkAIQJSnwdAxABA5AAoNgL2XvpZbAB8+0cTAaEAAM5//lsdAER9
-						iYDa2A0oZwho8SdsAKS52g8R3PAruN6/mfMH4bdI0k9Iq/6S9IeEH4jcgEqQSQ1IZ1II8Kvg0NVxJAmWRJqQBD4OUebjEH6vOKTfixB/
-						7Rjc9yxKfzbxDwHvBYeHAI+Brk8f1wGgAfH3yRcCLftNdegIIGhHwJN/HzMaNNHBQyASA90hArqPc+gAYBj5HxPh8S6jHTwEQmNBT45w
-						SCHAx4CkEPhhJABKK/9Ih4FTRNGPY+C4hVb8yyD/SFb59wKgpPLfbaK6H4Vfy3/60Z8f0OiPDQDpjr/3Tz+otp55HwTfyv/HFpB5Lf3w
-						scaK/rmPA/zP37VgDAxa94KR/9DoT9rV/0D+/dV/I//pA+AvBi7R1/5vM2tHUTSuWSA6XxYqa2ZVWc1seNTXR4sRuf/Sqjr3X6U3MB/d
-						Ji1WY5ZuUaOXbVPTDl/UOwCzEJJ/YDYCEUDjP7lneQSY1X9k7qlbatT+S6r/9nPCLgCPgBJcGjTteQAkXwSA7JckAkD+00TA5JMf5A2A
-						r20EUAD87Hf/rHpsv1J4BCCi/BMg+wkRgJQzApB8ISBJv0SaEIis+qP426v9cMJX+4kT/4DgoG8w6hMCxF6SfgfIfjDrzw72kuhzmDhK
-						+JIpiilKLQgvh4s/RxLmgsFfjyGJeyEMEHcY0uF/TcH3zuMomdBri695Hvz3qMczr4D8g+zHENkZAEwETI2gQ6BvAB8Nat4HhB/hAdBr
-						UgQeAy4IeozXmAAwmJEgiACLiYCxDi3/IPw+kbGgTiM1fCzID4GHOjD598EQAPnHACAS5V8Qfk6c/CNdhswQRT+OIADqSv6R8sv/fX1m
-						q/tQ+kX5Z6M/mVb/zejP47mj6vCFT7Xgk/g74becCxEWfi79XP774oFfLf/S6I932U9v9f/PXQBY+S9y9f++kWtEoc9C88l47X/Z+TLw
-						f7QcnvufrWY2POrzo6I696LwBuYFDwPjQeCxS7eqiTtOmwDw5R9n/xEKgJN8B8BEAI0CTTt2XQ3ZBUKJNwbTuwB5RoFCEZBnFMiPgMgo
-						UEwEuACoHxHQdsMFLft+AOhzAHYEiAKArgSEAbDo5U9DAVD6CEBA9rNGAFKiEIiNgBKFQHsNBAAIP+FLP8JX/jUg+hQB8dIPhEZ/AigA
-						ugM9OAnST+LvAEHkFCz8DH+lG/FFuFgkUZdAec+KJPIFERpdkr+PJCgWku4nwPHfqz67rml6bb2gWvefEcLtCAhBUNl/GkRAlAoQfh8d
-						AWxXIIgAkH1CiABCRwAEAOFCAEeBXARQCIx16AiAAEBI/PkugN4JQGg3wEaAHwLhnYBqOQTsTgBGgAmBYY6Q+Bcp//e1GqR6VudE0Y+j
-						/5j5kQAoq/xHAqAW5H/AQnVf7hRAAWDlP/XoD+DLvw2Ax+ccVUdA/s/96Bead35khR+eHfD5u/CM+J9rQPjPw/P5H+EzBAHI/9D1L6i/
-						GrExdvXfjP5QAHD5T7v6L4t+HM2nbtWX7yyGJmNWiL6XjdxJq5cNj/r+aFWT6yG/ifnpN2OlGrdsqxq7+oBe/TfSH5DToPhb+SdsAMzB
-						XQC2E1Cz96Lqu+1cEAD5IqCk5wFujwh49ye/yRwAL33wTSQAXAQgXgTEhgCIfn0eCUJKHQLtEZT/zQEdQPR9IuIP8Lv96lV/kH4kGPcJ
-						yz6HX/Wnu8Mf+QHZJ/JIPycSACiWnmjWlvBLQk9I4p4VUdrzMGCfB/4zj+DHy197Ev6OhvTacug94CNYIfA9BNoMmeOJv0Q4Ahwg/wiN
-						CgUjQxgAU0KY0aDJjlAI+DHQc2KE8GiQCQETA8FOgKbbGIeOAEsoAkD8CRcCiAuBuJEgEwIPtQ/GgAwQAAiIP/IAoxTyj/QbPV8U/Th6
-						j5iTIP9eANSJ/BcTAL3U/YOXevLvr/5Loz8UAOHRH//gb7MFJ9SpK59p8Q9jRP9d+Dgk+gwj/AEX3MdfqaEbXmTyn2L1X8s/QPJf4tX/
-						vxu2UhT6LLSasV01LcG1/yEAOlm9bHjU90fj/rn/K7xhv5XfyGTajZqnA2Dcsm1qyoFzanaKCJijxd/Kvxb/W2rOc4bJR66qYbsvqGbL
-						X2URQAFgI6Dk5wF4BIQDIBoBJgDqMgJWn/lMDACU/0gAgPwjeBOxtiDE9SECEDECkNoIARD6NCHAdwHM6j+Ivzf6o8d/QO792f+I+NPq
-						Px32BZn37+obL/2Au9HX1WDkRyOIPwFCmEb6A5Kv6qNHeYpAEmFEkussxEp7MdhfeyAj+L3k7yMfvvSnIRglMoQDDYD3kcD3tP3I5ar1
-						gBkRouLPeIrDQuCpqRp/PKgCIwCkn8NjADERALJPWPFvJtC053iHiwEt/2MZEAAMPhbEA8APgUdtABAUAi4GbAAQTv4tP0RA/BEdARAA
-						ehRIEH8kjfwjeFUfSfTj6Dp0etnkPxIAKeQ/GgCS2OcHf4/7atbkkf/CR39aLz6lTt/8aUj83/0E0NJvcZ9b6YfPQ9L/iRH/QP5/roZv
-						fEn9NZf/TJf9lFb/ufwXtvqPh38lqc9C4wnrRM/LRu7brl1z/9HqZcPjdni0qsk9I7+Z+Rkyd60av3ybmrDppA0ADsj/ScQGwLPXgwA4
-						heD8fwDuClTtuaj6bo3bBeAREHMewEWAsAsQGwE2ADJEQCQAEFH+DToAShABfXZezRwAX/72n9S0Ux+JAYCUPgIQkP3aiADESr9POALS
-						hYATfwSk3wRA9OAvv9SnwVv996Uf2SYAgs9X/tOIPz/kGyYcBHzuX68Sa9FPL/yFEpJdS7Bing1R0AUGFgr8HhIUAQPgay+UUATA6xJH
-						kvQbzDkBB7x/BMUAvr9PTtqg2gycycAAmC4SFv+A6FiQCYFW/aZoMAA4YgxAABChEADCARCMBenRIAyBHuM07oAw0AhHgRy4GzBaQxEg
-						hYDbASD8EOhQo8EIMCEw3OHknwPij4TOBMTKPxN/T/6RqqnLRNGX+Z16cuDkTPKfGACFyL8XACWRf/i97x+9ycp/6Ud/nlz+gnr1vS9B
-						8H9pJN+iBd/if45cCBEEAMl/1abTRv4TRn8Ku+xn4av/fwE/Dw//FkvjmkWi42Whsjq3zGplw+N2ebSqnvmA9GamodO4hToAxq3coaYf
-						vRjZBUDxn0PwAABQ+uc9F2b8oStqOERAyxWvxUQAyH++CEgaBSogAnQAIPUkAt73LgfK7wXAA4AuBYoBcPjaz0X5J6IRgCREACKKPwdk
-						v97tBsgh4K/6c/HnmEO/DH3Zz4BOWxGU/+A6/5L48/n/bgRIfzeQfSKd9IfhN4cKrfhrQPYZpZD+Usi+JPQcUdwFBu1PAP99DNKvVSih
-						rx2/tzxIEWC4HsIXfx+MgC65vaotiD8HIyDEAEPr/hACDNwNiMo/0A/ln2NCQAwCjACQfk54NIhCYIImFAA9xjtcBFiCkaDgTIDBhACP
-						ARJ/HxcCyJM1GoqAR3QEVGl0AFic/NtdAI0XAlnlH6/nP3LmKkH0JX6nadN3PJP+O0D+4eu/b/z2BPmn1f/CRn96rjmt7+6L8n/eQYL/
-						S437/FOL/nccK//2Y5T/oRtw5X9TePVfyz9A8p+4+p/vsp+Frf7/cPRaUeiz0HTyJtWyOic6XhYqRs78vtXKhsft9Kionn1dekPTULVg
-						vZqwYruatOMVvfKfQ/TK/zUm/kb+554y4k/Me+5WCDwYjLsA/bedUz+c/2L6CMhyHiAUASD/fgQUc2UgRJB/ohQRsOti+HKgPAAQPwDw
-						HMAHv/yjlvmmTPp9kiIAiYuAuh4JQooJgbYIRgBIPxIn/hH5BzoCnVD8rfzzkR+8uZePKP4Iyr9e+TcHfvWhX5D48EFfmbD0+7AIAEn0
-						V/2lmfMQIKOlkv2QHDMkkeaIQi+BPzYB6dculsj3g99nSqTXKLRrgMDrbgIBRD8OGwHdl5xQbQeB+HMwBAaEoQjQIUA7AjYCgtEgSf4l
-						IARA/gmMAB0C3k6A3g3QQAAgNgKa9xyvCQdAAEVAEzwYrMeBDFII+DsBkRBguwAaHQLVOgCIhzACAIqAB9sx+fdC4IHIDoCV/gT5R8bP
-						XeuJvoSRf6R599FM/AuUfySV/CPlk/8fwPd/36Td6r45vvyzAChi9GfgptfU2x+j3Afyf+FTi5V/93ms/AdchH+PVwDqs+qU+uuRVv5L
-						vvpv5D/rTb+QP4ef03L6NlHqs9B41DLR7bKRu2R1suFxuz0qqmeNlt/U/HSd+LQOgAlr96tZJ66oORAAc04iGAAAyP9cDcg/MA8iYB7K
-						v2U+iD+x4PlbauzBy6p670VVsQKvCMQjgALARkCK8wCxESDuAtweETDi8K1QACCRAPgDD4B/0rsAVQdv6QBIigCk9BGAgOzXsxDAcxEa
-						twMQve5/nPhr+Wcr/51x3h/R4h9FXPm30h8Rf7by7wC552ST/gA3Px4huiMQXZVGGQVJ9RFENiLGgCTQhCj0CP671NyCX8tH/v0KRfq+
-						JLlPQ/B6MeH3xF/eHQhDIdBn7euq3eBZDn83wOFFAA+B1v2nOfiZADEImPhz5PEgjICJDikCdAgAPACadh/nwAggQjEA4k9II0Ek/5xH
-						O4L8ExgBAI0D8ZEgDACCB4DeAQDxJ+5vPViTT/6RGUu2MNGXCOQfady5pp7Jf2EB8IO2w9X90w5G5Z+v/pP8FzD6M2LnWb3qHwh+EiD4
-						Vv5R8uN464MvVeclxwX5p9V/Lv/Jl/1MXv3PPvqD3FOzWhT6LLScvlU1rSr+8G/Dtf9v4wdetxUK7t+kNzYNeEnQiSt3qGn737Yr/wFa
-						/k9dB9lHbAA8h5ixH5R+zsyTN3QADN55Xj3IdwAQFwA8AvKdB7AR4O0C3K4RgJL+UxD6rAGw+Z2fqqarTQCkigAkbQQgovhzQPRLEgHJ
-						IeAiAAHBjw2AjQFm/AfE3xK+3Ge8+LsDvyD+BN8FCC75yQDhJ+gyn6L0e/A7/PYC0Q8jS78s+/GEVpaBQDTj79Arya00V4/I4p6fqNgT
-						+O8CpJ9bDP6vXwhiNOwTzg3A60xkCQBE79Jsv6Tag/i3H2Ro5xHsCsyI0Kb/9BA8BMQgEAIgNA7kmKzBAHBgBPQK0ONAhI0AHQJM/jk8
-						BEI7AUII6BiAAECCAKhxYAA8QlAItK9ySCFA4z8OEH9ChwDuBsTIP7Jo7R4r+hJh+UceaT+sPPIfCYDyyf897WvUfSDxgfzz1X8r/y4A
-						so3+fH/qATXt0Hl1Xov91+rijy0R6TfgP+dc0vxCg9JPn595/6eqzfzDVv690Z+iD/6GV/+N/GcPgGZTtohSn4VGY9eITpeN3L9UDMr9
-						j1YnGx634wPeyCPRNzYdPScvVZMgACZtOanmnLDiT/JPq/9W/ufrVf+ABXbln1j4wntq9IFLqmYf/IX2zBkQ/7hRoBQRkLQLAAQBEBcB
-						4QBwEeACoNAIANkvIgJO3fo6NgC+BqQAuPjFb00AFBwBSP4IqK+7AST+GpB+xD/46673j6v/BEg/7QIkib8fAF2AroQWf0Ow8m8u6+mT
-						KP6h1X924Bfk3b9zryT4PvHCbxBXpz0iIgtIIlwMkpxLDN5fHMXvQhik72EgSD+hA4Bgr5v0+vIY8HEjWrsNTw5f4AIgCIGZjtB4EIIB
-						MGB6BD8IXBQ8NdWBEaBDwBIn/yFsAHBCh4R5BPQY54gLAf9SoaEQ6DxKPcEwIRANgEgEdKjSSCHww7ZDNUEADAnACAD5xwCgCPDlH1m1
-						9TCIfTr5Rx5oPajO5D8aALLgJ3FvpzHqPpB6Lf9ZRn9I/iOr/4H83wtBsPLFG4H0O4zca+HHj+3nWvjhY40W/ejnl+HjV258rprPOWDk
-						v4DRH3PZT2H0p0SX/UT+fvhKUeiz0qh6oeh0maiafcBqZMPjdn20qpnVTHxzU4A3Bhu1eLOatGqXmnn0EgSAGQHSEXDK7ACY+X8MgGgE
-						6BBgETDt+HUIgIv6PMAjC/HuwIWeB6jjCADZL0cEzHz+41AA+FcCkgIAdw367roaRIANAUn+iaQIiA0BkPyyRgCSMQTaIJ74+wSX+ySC
-						CNCr/1r+g6v8xIk/yb/DrvzzeX9+hZ+AaAQkSj9b9dcr/wx9eUhB+JEk6RcF1IMLKyELbzYkkeZIwl5y8PcpAOnrNdwQGYivmUV6PQnp
-						9Q+dw8BRLUansStVh8GzI+IfZkYIfzdAioI2IP8cHQCM0GiQPhzsy/+kAIgAHQJAaCzI7gYQfDeAxwDfASAiIcAiwITASAdGAOJGgAi7
-						A+DwQuChdsFOgAkBJv86ACw6AAa5cSA/ALbsOwVin07+v/nVb29v+e86Ud2Pwj/nuXTyz1b/843+PDbnuDrw7idM+pn8e587ybeg5Puf
-						EycufqIenrobxH+zvPqv5R9IdfBXWv3n8l/YwV/k8Qkb9bX7i6HxxA2qogSHfyurZjayGtnwuJ0fldWz35Pe4DTgLsDk1TvVtJ2n7eq/
-						xY3/mBEgFwCRnYAgAuYDI/dfUiMgArpueEs9MA8DIOE8QGIE5DkPEBsBNgBSRYAJgNqKgNbrz2vZTwoAuhQoD4C1Zz8D8T+XKQKQzBGA
-						gOjXxm5AUgjwXQBa/ffFP7jqjx8Al0D8ERB/vNkXAVLv3+E3Iv4g/MH4T3juP+5Sn0gPB8g/CH9w0FcW/4j0x0EBoKWfrRyj+FuZlGQT
-						8aVUkvcsyKIMIi0JeQEMOXDLMTiJ/cUxKBb4fiTc94qvYTr46x56XzDW8L1zmKsFdZ26WXUYMsuMAvkI8i8hhgBIPyc6HoQhMMXhrhTk
-						y79HeCxogiMuBJqC7BNSCCCNu47WuAjoghEwUqMDwPIY7gZQCIDwc/wQeBh3ACAAgggYqsEI0CHgnwcA8Sf8ENh3/BWQ+/zyj3z1y29r
-						T/69AChW/u/rNV3dN9uXfx4AVv5nn0gY/THy/wOSf7v632LRs+rU1c890Q+45HE5BIo+PRuu/MQQkf8CVv/THfwtbvX/rwYvE4U+K01G
-						LRVdLiM3rT42PG73B9TgCOENTgXuAoxeskVNXrNP5U5cCY0Audl/i4kAy3PA8xABAAXAwhduqalHr+kIwJ2AJ55+2UYA2wUo5aHgUASA
-						/NfnCEAgAt785NcpA8BcChQD4NIXv7MBEI2A23IkCImJgOgIELvqD0Diz+XfRYAW/0v6Kj8Ou/rvANGn1f804h+Rf0YPBMQ/LP1s1R8k
-						Xrqplyj7BF/13x2MiSB81V8DUhkXAjS3Lsl8ElzuOZK0p4GLfT7BD/04kPJSIEWAQf56Nfj9Wuj7l14rGXztGfheMEwEXA/Rfd4+CIDZ
-						OgIcIP8IBoCPFAAakH8itBNAgPS73YD+U0O4EOg3WYMRQEgRUNFnooaPBfkx4AIAx4EIkP1QCHQbE8KEAMg/BoDF7QIQbCTIjwCELg+q
-						gQh4uP0wiACDjgDcCWgDEWChw8AOPwIqBqjjL74Jcp9f/pHPf/bLouQ/EgC1JP/3D1hoxT+f/NPqvyD/LgDC8t951Uvq9Q++Upd+8k0g
-						+T9hoNzDs0P4/Ao8B/xSXYXnQ+c+UvdP3Kn+ehTKP63+c/mn1X8u/8Uc/C189f/hsetUxfRtRdF86mbVoqoEq/8Nh3/vnEebqin/A7yp
-						/+i/yWnpMXmJmvrMLjVj3xk1DwJg3rMIBIAXAVr6NWHxJ/nHcwC4CzB6/2UdAQO2nzMB4EeACwAeASkPBUciwNsFqOcRsPz1H8cGAL8Z
-						GAUA8sVv/gkE8BqLABYCIPdlGQlCRPH3AdkvQQi01kTFn6NX/oH2iCf+hHTo1z8D4K7+A8JP+NKfJP4En/XvRaD8s4O+/Co/fOWfk0n6
-						GbSiTEQO9oKQ5kOSWHElHBBlGbECH0dI7AmQ8FIjiz5H+NoR+J4l6c9K6HWE1z/MDU0oBiy9l5+KBoAXApxIFDDxD0UAw0XAAAgAhMWA
-						DgKQf8JFgCU0FmTF38cPAX6FoNgQ6GYIAmC0AyMAeQIDgNAhYEaBCD8EaARI7wBoTAAQD7U1YAQgD7QZrIlEAIIh0Gqgug94+c2LIPf5
-						5R/55LMvbzP576XuH7I0LP9Z5v5jR3+M/I/e/ba6oIX/G5B5A4k/fU6iT4Lvf06g9BObXrmhvjt2m/qbkPzHjP5UW/nPPPoTPvhbyGU/
-						ke8MWqov/SlJfRYajV4hOlw2cn9qPnTy/9PqY8PjTni0qpm9SX6z0zFm6RY1dcMRCICroQiYfwoB6WcBsEBzUy2ECFiI8m9ZBAGATDl6
-						VY2CAMBDwa1Wvi6MApU4AlwA2AiInAeIRoAOAKToCMh2daDu2y6HAiDuZmB+AKx763PVJBQA2SIAqcuRIEQMAKASwZ2ADRABgCT+JP/u
-						4K/FF//wnX4NdM3/zg6Q/q0GuuMvv8qPJPscmvXnAcBX/3sTIP594gDZDw7+hi/lqUd8BPIKfx5CgmqRRNYXYo2WZUmqZRkvlKEQB2kQ
-						oyIC7kDEAN8PJxIFDOk1IkKvJ77GEYz4SwFA9NvwhnoSAkAiMQpA/hEMAI4v/wHTHUEITFVtngoTHgsKQkDvBtizAAYpBIJdAB4CPAb4
-						TgBFQFM/ACyNcDfAQjsBGAFSCPgBEIQARADSDiIAdwJYBLhxICkEbAAgb124AXKfLgDe//izMsg/kkb+MwYA/Fr3V69m8s9X/xPkf1aw
-						+v8Db/SH5v5/MP2QmnH4Ykj8fa6EALH/DJ41Vvjh2QGfX7Mfb3j5upX/LYH8FzD6UxsHf5EHRq0VhT4LLadtVc1rSnDpz+rZG6w2Njzu
-						lAfezU16s9PSbeJiNe2Z3WrWwXes/Bt0ADwXYOTfBEBcBOCOwBgbAHhp0IcXgPAnRgDIf74IAPkPRYA3CnQ7RcCNr/4QCQAkKQAu/9SM
-						AcVGgA0BSfw5Be0GgOSXajcACYk/oseAUP75DoDZBZDkXweAXf1/Eg/7sgO/nGDlnwWAE38j/6GRH28HwN8FiEi/Ff/o+I8JgD4+TPqN
-						+LOV/z3ROX8pBCSxTyIkqIAksbLwl1b0JYlPiyz3Plbs4wCRLwQxCHzg9ULipD9O/B27rqqOQ2dHEINgMEi/D4WAJboTEIi/A+Sf0BFg
-						0SNBEAHuqkF8RwACwI0FCSGA8s8RQwDknx8ONiEwRgcAQfLvwADoMtIhhUDSToCmPY0DmRB4yI4CSRGgQwDl3zFQXb31Mcg9jQAlh8D1
-						9z+5LeT/+/B73j9ms7pflH8eAFb+E+f+w6M/9808op55+RaI/LfqssYKvxN8Awp/PCj83zC+VtfheeHx8+rvx2418l/I6M/wdKM/pTr4
-						+xcDl6gWIO+4A1AMjcauFt0tM1W571ltbHjcSQ+8q5v4hqdkxKKNatrWZ9V8FH+N2QFYgFjxX4jSz2Hyjzz94nsaPAsw5sBlfYOwbhvP
-						slEgHgHeLoAfASW/MlD9iICt535qAgCIuxcABsDPWAB88Zt/VIP2XtcBQMRFQL4QKGYkKNNuQEIIROTfm/+nK/+000TFX4/+0BV/aPXf
-						Eh77sfJvxT+Qf3OVH3OlH3a1HyEE6Co/kvj70i+yKzj8y+f99d1gtfiHocOhBhwTka/lj2QV/nLJviTuafFlXvoxYW5mRoyCNIDgiyEg
-						vI6RqwZ5iPJv6Txioeo0LBciFARDZmmeHBzFD4JgPGiGph0Iv4OJfygCLKGzASD/rfsFUAj4McDHf/wIIHQIQAAgGAEmBMY6dAQAofMA
-						Vv450QjAMwE1GoqAxzpiBFRpSP4JfTAYR4H0uYCh0RDAAGg9SEPyj3z06Rcg9zwA4iPg0vUPa0X+owEgi77E91s+pe4ftyOD/NPqvyD/
-						3ur/I3OOq73nPnHyj88GQfo/D39+DT7n0n8dPtfAx7gjMHr76+pvRhv5Txz9yXvN/9o5+IvcN3KNKPSZgIBoXD1f9LYsVFTnLlhdbHjc
-						aQ8ouz7Sm56WjmMXqOlr9qjc0QsuABboVf/rIPsIBMDzCIq/YRFI/6IXCJB/BAIAdwHGHrikAwBpsvQVFgFsFyDhUHA0AkwA3O4RUHXw
-						ZqYAwIPAGADr7RiQHAEsBEDuC9sNSB8BmUKAib8b/QHpN7P/TPwtwZV/AjAEJPH3ocO/kvi7AADhNwd+Sf4Z9pr/obv88pt+gdBH7uor
-						AYLPxV+e9w/DxZ8f6PUx0milH8QzaabfDwANCDtSiOzLQh4lu9SHGXbwPQCfU4A/3kP6NbMyGAIghBQCBAg+4YeAFAP+7kDX8asiAaAB
-						+ee4ELDwswEBM0LoEAD5JzACCDcKxAH517sBGAAECwEeA630geAAMQRA/gmKgBY9MQLGanQAEDYEdAx0Ha3xI4BCwMg/HwWq1mAAuAiA
-						AEB4AMRGgD4UPNjxQOuBGgyAn371Nch9ugA4c+6qLP1EHcv/D3CsafIedf/c5/PIPwsAGv3R8m8CQJL/VkueVy9c/4JJ/7cg+QA+a1Dy
-						v9WQ/GvpZzjpZ+Ddf3uteo7JP63+px398Q7+avmPX/0v1cHfP4ef13xq8av/jSesB0cr/vBvq5pcD6uLDY877VE5cuR/qqzOfS2+8SkZ
-						MnetmrHzJbYLcM3sAAAuAnQImAB4+gXklsXIP4FnAcaB/I87eEVV7bmgfoir/1IEuACIRoAZBbq9IsAdDmbyzyOgyap31Cff/CkUAF97
-						AaAPAnsBcPXL34PghwMgNgJsCEjizynvbgAShIAv//7Vf5z4e/Cr/rhr/TPpR/zV/9BhX0H8I2jxv+LGffTIjyYcANLqf1HiD7IfrPyD
-						4MfAV4tDV5khoWQY6YwKvy/++fAlPh+SRHOM1BP4eTzDJeDXkJACoFD416u/L3wdIgQ7A7E7BB76PYH3jvADoOeMraozCL9maFT8idCu
-						AEAhEARBeDdARwAEAOEiwBLZBbDy7+PHAA8AIjYEWAC07DVegwFAhHYCKAK6jXZIIeDvBNAuAEXA4xgBTxp0AOjDwFFcCLQdosEIMCEw
-						SIMB8CA8f/Pr34Lc55d/5PnXzsnij9S1/Lcequ6fesCTfx4ACfLPVv/9uX+85GfNzrf0YV8t/AwSfhkU/G8Z36gb8IyQ/L9683PVct5h
-						I/+jufynHP2JrP5z+afVfz76U5qDv8gPalbr1ftiaTRisehrGfl51665/2h1seFxJz6g8GYIb3xq2o6aq6at2aPmHr8UiL8n/4v0yj+g
-						5Z8FwItmBGixZf5zt2wAmAjosv6sut8FQNYIoAC4MyJg14UvIwGAJAXA57/+RzUERMIPgHwRULaRIGStQZZ/wgYARYAn/zoAQPSRiPzT
-						6A+N/2w2mMO/cWM/5mo/hBv5QQTx9+/2a8QfZ/4DempMAPDVfxcBVvq5+KeV/jic/CNWFBEuj4HwM1A4GZKQ+ojjLyTBHkaQo2M2kshz
-						RKn3gV/bIfx76dctOfj9geiHge/RI3UAQIQFY0Jh6H3sveBgEAA2AjidAF/+DbNChIKAAsDfDbBER4OmOqQIQEwATHZQCERiAOQfCe8E
-						GPnnNMedAIuOAJB/xO0ECCFA8h9gzgKY8wAQAR2RIAKCcaDhYgjQLkAQAYM1FAGNOteA2HP550QD4Mhzr9dL+b+nwwh1P8h7XvnXAWDl
-						P8Xc/70zj6g5J66oKyDtRvh/ZTGSf/0LeEbY5xr8GLgBH2vwYwvJ/8lLn6rHZuyz8p919IdW/1OO/pT44C+u/jedskUU+iw0mrhBtRRc
-						LSuVVbMmW01seNypj3ZDc//vVtW5f5L+A0jLUzNXqtl7XgH5v2bk30UAyD/wNK78a4z4L9aA9CMsABA8CzD+0GXgihoHNF7ycsYISL4y
-						0O0aAUP339ABQJcC1QFgdwDcpUBDAfBPOgA2v/OFarIqGgBEoRGAlGM3oIJYh+DcPwg/wcSfVv+JkPiT/BMsAvR1/2PEPzT2QwFACOLP
-						V//pJl9G/A29dnKs+ONNvjgo/yD5RFbx56v+0bEfFgEg+mH5D6SSC6fDk1JZ+MNIko+I0myRpN0RI/U+qX6tIuBfrwa+Lhn4Xj2k14OH
-						gAR/b+Lot/I51WX4HAeFQHgciBOVf8eQmQ6MABMCM1V7DAAO2xHwR4OkGAjtAiSFQJ+JDgqBCh0BIP0IiH8LATcSZCPAD4EmuPrfJYDk
-						n9AR0MlgIgDPA1RpYiPAXhmIDgY/1A4jYLBGR0Drwap1n/Eg9pL8E+EA2HX4xfon/x3HqAdA5FH+Szn3/+jck2rnWx+D4JP0G67D5wYj
-						//Qx4aSfQwFgP99x5j1178SdnvxnveqPN/pTSwd/kXtKtfo/conoadnI/QkvF281seFxJz9a1eR2yv8RpANvDjZh1W41/9krJgJC8/8Y
-						AIC/+s9Y/CJiAgDvFzABxJ8YHhkFiosAkP/bIQIQUf4JEH4hBBqvekf96Jt/EAPA7QAAfgBc+envTQCkioDsIZAvArKEQFj+z5vVf40J
-						AD3zL8g/v/JPRP6B0B1/t5gAoJl/X/5p9T+EXf2nA7+S+LuVf5B9ggdAaOzHyn9o5IcA2Sekq/oUIv2GFLP+AAWAJKY+ktxKYhxapfcB
-						oU6iSvhn5Sa98CPppD8WfB0t9Lr68cUx7xO8vxvfVF2r5mg6YwB4BCEwOwAiICAs/i4AGKHRIL0LAOJPsBDwYyCyAyCBIdB3kqaS0arP
-						BA0GAOFCANDyb0eBCCkE3CVCIQJMCIx0uAiAAEAoAugsgEEIgfaB/BtsANgIoADoWTXbin4SQQBs2HW8Xsn/vV0nqvtnP5tS/lkA0OgP
-						yb8e/Qnkv92Kl9TLt77U8h8Iv8wNRyD4SSw+eVF9d9z2QP5Tj/4ApRz9KWL1v8nkzfrqP8XQeNLGktz4q6I6txndsOFxFzwqamb+HRTf
-						f5P+Q0hL5/GLVG7fa2qh3QVYBBGAq/+LQP4RKQLMToAJgCWa9zTTj11TEw5DAGhAsDa+pe6f90JJIyD+RmH1NwK2vfvTSADgOYAgAKI7
-						AJ8BKBeNKQJiQqCYCEAK3g1AeABE5N9grv4Dwo8I4u8A0ed3/Q3JP67+4/gPn/3figd/L8eKv5F/dtlPDAAWAaGxHyv+QQB4Yz8WurZ/
-						XwcI/+6A0M29QPL9S3wmiX8h0o/4oslFXwOyGl3xvxVBlmRAEmtAEvBiqDr0XiaGSxxMIvz7FSv9EpHX3jJ4P45rGQbugf8uq+dCAMxV
-						XSACfDoPz0UwETBLBHcCuPw7Bs/Q8HMBcTGgdwJA+onEEMAAYBFgQmCiQ0cAEBoJ0rsB4zR+BPAQoF2A4D4BGAEjNToCOkMEWPnXAdC5
-						RhNcHUiIABsABMo/YQ4FDzFABAyfvISJvkR4B2DFpgP6TsBFyb8XAIXK/309p6v7c88Z+Q+N/qSUf7b6z+V/9J539PX9neD/1OB/Hog/
-						YQT/Jnx8kwn/Tfix+DmO/VRvfVX97ZhtmvDqf22O/hS3+v/96lWi0Gel0ailop9l5P9sMWzGd4wdNjzuigcEwGvCfwiZqFq8RS18FncA
-						aBfA7gSExoAsev6fVv9B/l8C+bfg5UEngvwTGAEtV7yaEAEUAHd2BAzad93dCyApABAeAFvO/VQHQL4IQMQQALEvPAKQ5BBoiWAE2LGf
-						qPjj1X8s+uZfOO8P8g/44u8HQET8GXoHwAaAiQAbAp74h+Tfir+Wf4sb+0mQfx0AIPt0sy8n/yHxJ4IAeIqDAQCSj4QCoJakvxjZ98U5
-						C5K4lxQQ+3jMLoQEfm3S9ypiXxtJ+NNAAaCB9xnpPvppHQABZkcA6VKVC9F52OwQcRFAkPhLiDEwcJqG7wSIMcDl3wEBgLAQaGXBCNDY
-						USCDiQA/BPydABMCNgAICAAEIwAh+eeEQgDk/7Enh2swAh7tgAEwVEPyT5gIGKwmL1hnRT+OcADMW7ld3QsBcA8EAFJa+U8fAPf1ma3u
-						n2PEPyL//tw/l//ZUfmn0Z/74Z+tPH3LSv6vA9HX+J8DVvy14CNa/NnnllsAXumn28pTMfJf7tGf8Oq/kf/CAuDPBixWjSdt1lf/KYbG
-						kzapFqW48k/17BdACRsed9Ojsir3pPAfQibajZqnZu97wwWA2QUwOwF6BwDF3+4CLEb0qn+w8m8C4H0N7gJMOnLFgXcKfmjBi14EsF2A
-						uyAC8DDwB7/8YxAAAAUA4gcAHgTGALj25e+1oFMEuBCw0u8jRkAZdgO0+CNuByB8+U9Z/vHOv3YHAAOAIkCQf37X34j4A505GAHbDF0A
-						c+hXFn8XAHz139ILD/16B3+5+DtA9PnNvUKz/8BTHL7yb+Gr/iYAwuJPJEl/SYRfkF1f4PMhSnmdgV9POqTvJQS8Phx8vfzXNAK8D774
-						x9F76jrVrXpuBB4CXYfnNF08QqNBiI2ATkMMkdEgIQQQPgZkMCEQiQEQfwIjwISAFX9GJaIjwKBDwAYAIYUAyX8QAaMdGAE6BOw4kIsA
-						PgYkRYALAIqAYToACL4DYDDjQAvX7LKin0QQAFMXblD3gvgjFAG1K/+91P2DlzrxD8s/X/238q8DIJD/uLn/JxacUgfOf2pF/9cg7gGS
-						/PuS74PST7z14Veq9cKjIP7bw/Jfq1f9oQAofPQHwSv/SEKflSdGrRC9LCsV1blWoIQNj7vpkcvl/j28+T/y/2PISt85G9TCU1fVoudB
-						/AEj/oH8a/EHjPgHLAX515xG3tf3CZgM4j/5yFUNXiK039Z3dAC4Q8F+BLgAsBGgA4BFQOyNwuo+ApJCgEcA3hQsbQB8bgPgJ7/6RzXq
-						yHuhAHARgFjxL0sEIEIIhFb+Sf4ZwXX/A/kPxN9gbvoVvfIPF38fUf4RtwtAq/+G7tvDl/r0xT8IAHvJTwoAwB/5kcSfEwoAffDX0J/B
-						xT+4k2wMIPw6AkAW467wU6zwi+Ibw/+fvb+Ojuvq+jXR0wfu7e7TfbvvuXD69rl/3HG+98OXwsyJLTuxww44aDsmyWzLJAvMFku2wMzM
-						zMzMTDEldpw4pjicd975m2utvdfetapUkkqJ8321x/iNEqtUKtnPM9dcc7mBO76kWnG9Pxz746PnYMy4oL/K4Oe0Yv/8zsczEPwOgr8T
-						F/ibvN93HL2VxtAfDoO/HSMBtghEtAcZAQiJQDQZCK8CyEpANBH4uJcXXwR6sAT48eDfzvvpXvy9AZEiUO/dzl6UAHTyIhLwloo/HQij
-						QZUARJWA11MlkAAlAmoVABKAhFuBvL0AnPLxcyzQryrXqWNmsawAGAm4p94Hkl8F/vlrPNC2NA74t6v/Bv45pvUnBP+vla6gtUc/Y3AP
-						gr8N/+p1G/C/8gBfXr+go992iF9GMOnnyaxpHvz7AqDgP+GtPyEBSGTrD6r/T3cf4QT66uS5niPpef7bdzFZ9ZKzVyNh8vq3dvEv/2P3
-						k6J66TJ2BQ1etJehHwJgJMDAPwM/YgvAMgjAQSpgAZCwBBSwBGTN20c9WQIA/yp7qfHQtUEJiGsy0N0gAUjNJcCsBjSfvC9CAPzDwHwB
-						OB8SgBl7PosQgKokAEmYCFgSYFYAzCbgAPib6r8Jgz8SHf7tMPhDADhh8Pcn/4QkwAZ/HTP5Rx3y5acq8PcEwFT+Af8mZrOvhv14wN8T
-						gAD0x4oP/4Gqvx0GRwnDJeIe2WlJAMDVig20seKC8tokdWYoeFsVSatmXF8jWuIB/vhzgB9bBf/R9gi4BOCj3NlB8E9l4HcFEmDFXgl4
-						s02wNcjZHmTJQHgFwCUCSEACmvXy0vjjnl4gAciLVjz4/8DfDxBNBHwBMG1AkAAf/iVvqxgJMK1AIgAmYRHQ8O9LQFuJkQB/FUC1BZmW
-						IJMpc1c4QD9arlPLboOVAKANqD5WAD6QSBtQXcI/C8aD7SsD8F/zTb9aADJnU48ZO2jPpwbwrVzQ0a8f5JcleJlziF9G1NsB+3jdB//D
-						/PrQZXvpL93G0790DsO/af2x4P9XaP2pzcx/BL3/LqCvbhJV/W+YmvMmo2Dy+rd43d+q1X9iCTjnemJUJ427FdLA+Xs0+O+nXJ08VP4l
-						SgIA/Sqq+m/A3wRTgXrq6j/Sa85eWQ3AKcG/BwnwRCDBEnDg0s2oh4GFBQD7ACAAmCDUmMHZJQFIXUoAYkSgnggApwxB9X+7xAn/FSr2
-						6M/o8I+Tf1Vw8NerVlzwLwIQgn8P/MdExkz7MRN/VMtPdPD3q/8K/D0BsBIP+Ht9/o6EBcAf8en3iUsYFu3Yh1SF59c7K9MMqbHi2kjr
-						gvhYiQfqXdBeZfjrJjrh++X6eVwJQ384ZkNxONFEoNmwFfR2Wn96O7WfF6cAhGK3BqlVgexAnDLQMlMSXglwigDDv4m/EuBLgBGBRjrh
-						lQBZDbAFwCEC4VUAtR/ArAR0UiKg4d+TALQCMfwjESIACRABSPOiBKCt5Ok3UulpvP6aFf2+p1gOkCdZDpDFq7Y4QN8V1QL0QfscH/5N
-						GP4Rbz9AguH/r/z9Huw2jqGf/x+tDfxbrT/PDl5MM3acdkO/jgf9Ogb63VHQj+w+c4Vaj1zJ4D8uBvyb1h8X/Ceo9SdBM/8RTP5JRO//
-						s/w1nuO/fReLVTMn0AkCFkxe/0avlNSsro4nRrXTbOgChv59lLuE4Z+TJ9ECsPQA5S9Fxd+OEoBCyWEqXHGYijg5C/ZTLw3/Jp2m7XLs
-						B4hfAtR+gCokQATg7pSAEZvORR0FGk0ATn/5DfVdetwJ/yZ1vRpQz4QFwLT+qLAAMPCruf8h+MfoTz39pxFDvokb/P0VALMKID3/JiHw
-						D4/+dMF/RPuP1QLk9f3rTb+xwN+OXfkP9PojcYC/HXvqTwD+GRCD0O/HBkrECf0xEp6M49w86wBgJAzPdpwAb2fm4QgY/1USuh+u+15V
-						1M+vVg3a2LGlgGHfFZEARz4Zs4XeYQGwoyTATkgAGP7DiSUDwZUAJQFRZaBFhsQWAJXeEpEAncaQAI6RgLhFQK8ABFuC7E3BfjtQvXdY
-						BPQqQGBPgJaAgAjoVQBIgOTNNHqWI7dN9C2/3+wfwPskTfhtnGdYGCQsCZt3HqCvvr6pcyMYBn/EloAmLXsTThC+v8HHdH+KXgnAXgBP
-						At6XJAr+72nQnB7oMSkI//1qB//NRq2nLSevMNRf04kT+C/q6NcP88te+PUjfLvm0AV6afAcC/7dff8xW38Y/n0BUPD/D79h6w9yX7uh
-						TqCvbp7oUOxksOqmYVpWW42Byevf6tW4Vc7/3CA156rrCVKtdBpCvWbsoDyWAAX/SgDyBf5VPPA30ZV/EQAtAdgQLALA6c3wb9Js7Fa9
-						CvBvTwLeZ+CsiQCsOfElPV2izhRwCQBSVxJgtwJFbP4Nj/4Mgb/Av67+S7QEINHhX+U1iS8BfttPCP4Z9u2Ewd+Df44Bf4nAv8p7HNXr
-						v8+ZaG0/Jt4GXzsO6Edc4C/wz0DvShj8w1XmWAlAKifY9sJgGwX4XSAchulAXPD9W8R133RcP1PsOPYTRDyGwcfXxFtlcfxORAL49/1u
-						+4H0brv+ElkNCCVCBBwCYMcTgdYsABznakBIBkQCWABMjAi82kKBvx3ZEwABMNGrAXZLUFQRYOC30+D9rl4gASIC76oYCbDbgWwJsEXA
-						jAg1eY7z/Fvt6QV+3wtvd+CP5fDLCF6v9466feGdjuoWb9d5nj/34LEzGv7jyQ1q/FE3erRxC3r4pRb0EIvAAw2asQiwDKAtCO1ALygB
-						EAmoLfw3/IQe6DklBP9VTPwRAdDwH9r0e3/2XBn7rWCfwf+ijpaAQ/yyhF9XgH9Not4eAn4OgN/OjK0n6NGMKfRHA//xtP4Y+I/Z+hOE
-						/1+79ecPzVX1//meo2qVBFb/P2vYvv3/9d8lr+TVsG1OluMJUu28MnCGjAXNk/YflQKAv4mp/kvrj4klABysAvRbeMCTgIy5e728Xr7+
-						X4UExBIBlwAgey5cjyoAOAcAAmBGgRoBOHX1G4HUqiQASaQI2HsAvP5/LQFm9n8DpAJB5V+f+uuCfyuNGfwR2fjrBH8/fusPgz/HgL8L
-						/s1Jv+a0Xyf46zTVkco/w3/kxJ+qwb/KKT8G+k2qAf2Byr8BxyoSBtEIYA0DLcfePGviAmiJC7rrOO1mRQneF4rr8yWun8UZ/Oz+4yCP
-						ketxdCT82NutVr4QcPj3ibyfXswSMEDyDktAIGl+a1DUFqEoAmBLQEwZgAQw9JsoCciQQABMDPzbUQLA8I9oCXCJQGAlICQBtgikNGUJ
-						0DES8AJagax9AWEJeAG3Avb8MgN9vXdV6vPnpHDq8+fgZT8d+et3ogbv8fv5Fh+Twh9jUp+/xrlLl+nadRfsu3JDvubjr7Skxxq3ZBHQ
-						h4qxCDzUsBnLAETgQ7pfROADugd7AWoI//c2bksP9JkTA/7t6r8L/k31X8F/vbwlNHf3pz7063jQr2Og35Ujlzi4lXxFR/l1BC8PnreD
-						/tJtAv2xS1XwH2vkp6P1x/T9ewLw67b+IPe3H+YE+urmyUT1/rfN6vHvklfywpXSIue/NEjNueV6olQn9Tvm0scj1lgrAPspf6mRAAb/
-						QBuQWgXwWoAsAYAY9GHgR+Uf40HxMgIJaFi8JsESoASgTiUAqYYEuESgfMNZfw8Aw78RAGwEDgsANgIbARi2/qyME61TCbBEIBr8iwAA
-						/jkNEC0AEa0/DPr25l8Bf9P6Y03+MdN/YsO/iqn+m55/SQj8Dfx71X8L+iPA3xXA/0Q/H3qpPvjbaWHFubmXUxPoD0NmGETDwB+Oq/rt
-						hOhaxgnxcaY9f74rLgkIx3Vf/DDwc1LDkcel6rjA3xm0X+modqwD9GHWSE8AvDD8IxCAcKIJQZO2Pvi7EiEDDP8m9mpAUAa0CHBegQRw
-						PAHQewG8PQFRROAlvQIQWAn4ICQB76k0eI9FAC1BTdEOZLUCOUQAwI/2IAX6neW2AX9Og/c473eR24bvdeF0pRc58jK/veH7/HbOix90
-						oRf5dbxPwt/zRf6clz7oKi0+EIB4JOCLL7+mZ7C/QPYQtJY8js3EjT9hEcCqgBKBB1M+ogdkRQDnBLzPQF9N+H+tEz2YPS9O+LcEIAL+
-						OQz/ZqNvdYEfEeg34dcN9JvsOn2FPihbyuA/XsN/PH3/pvrvgv9g608Q/n/dA7+QP/DXwam/zzHA1yZPp4+g59vWvvqfkpp9vWH7nP8b
-						o1/ySl7qapCWM9T1ZKl2+k6lrlO3Uj7gXwuAtP8YCdACUIgw6BdJFPjbGbBofwD++8zbJ8Hm4KeGrKihBMQ+IyAgAZ4I3B0S8N643Z4A
-						mFGgAQHgQAAA/0YATrMA7Dp/XaDeSEBdioCsAFQB//YKgOn/f1EEAJN//Ok/JlHh3xIAWwIi4V9FHfq1yxMAM+8/DP+m3z+i75/jBH+O
-						X/03h33ZArBX+vyl1z9O8A9u9A1O+EEgAAHoDycE+yZ3I/C7wD2c9rHCXyNaAPLtZx2udsIyYCfiZ8DjEIoL+u24Hl+TaOBv0mzwVGra
-						wW8DihUjASYiAHb1HxJg4pAASWsIQJYXXwQgAAz+Jt5qADYJKwkQEWD499qBQhJgi4BZBTASoEQg3YtIAKLh35YArx2Igd4WAQhAPbyN
-						X04R2AfoA/IZ3hncAe9Iow8Z6Plrv8Tfp9GH3agx35o0+ohf/9i83Q9eR5qmZtHXDP52RAYY9sOBAJw9d4meb5JGz2E/gWw0bkNPvdaa
-						nnillQQi8OhLLAIvNqeHtQjcpycFYT+ADfnRcv9b6fQAQ30i4P+JAQtp7MYTDPpf+8B/6WsVB+BHAD8nDPx2lu8/R8/3n+WA/7AAxNH3
-						H0/rj8D/r9f6g6D67wL66uapTgmb/FOgqC95JS99vZia8380SM351vWEqVY6DaFXi5dS//m7PQkItAGxBAj8L2PwRwD/Jgz+xSuPSIqW
-						H6HMeXspk+HfCwtA1vx91HnaTnqYgT9+CWD4/7UkQESgbiRgy5lrWgDUCsBnDgEwo0CNAJzioD1BBKDOJGALPW8EQFYAQgeAheDf7v9/
-						kfOSB/92dlgbgCPh/9VQwpN/IsFfx2v9USf+vq1jb/aNgH+GfDsu+Dcn/X5ox6v8+/l4Mmb7m1QP/JGo7T5RYjbyIh5YxgH9iQZ+F9gj
-						Tqi3w5/rgvS6j/r+EfcZP0uMRMqAK5FSkIrfh475/bimBbUoXkBN2w9wxiUBJkoA+gYSUwZaZzvzZutML5AAEQHOaywBXowIhFqCoomA
-						WgnoIfFFABKQLhEJCLcDWSsAtgQYEVAv430M/ajkC+wD8jn8MvrwG3/EkM/fB4D/8se47c73pzu9wrev8u2rzXrQq3yfXsEtB2+X4GM4
-						+Jy2vfLp6xsM/nZsEQjlwJGTlPJOB6r3Vjt6gfPcm6n0HIvAM28oEXjyFZaBl1vSY40+oUdeYgnAikCDj+kBEQFsEH6PRSD6KsD9Tfvo
-						032rC/+WAGj4f7lkBa04dFHg34N+zpFAAPnB149+9jXDvck1OsavH9Mvq9dVJmw4Qg/2nuLBf+L7/k31X8P/r3zgF/L3LRJU/e8+nOrx
-						37CTuaqX241b5fw//13ySl7hK2GrADkTqGn5KtUCFBaAZQd09d9aAVhhoiSgRHKEBi8+6IG/wL8WgOz5+6nVhG3qH7mYErC8mhLA+VUl
-						AIlfAgYsO6FXAYItQGYfQPgwsFNaAKbtvuQLQB2IwPPIUAQtQAz/iJGAGPAfqP6baAFoNFxF4J8BPyb8j1TTfyQQAAZ9JDr8q9iTf0zf
-						v/T+Iw7wt2N6/2OCvxXvcC8G/3CqAv+o7T7RwpDvzfUPxUCmK2FQDcOsC+xdiYBmTrg6H4gTwBOfDlGD+xAjrvscJSIBMRJ+jO24fieI
-						PTq05ch19F6HgU4BsOMSADvRZQACwLBv0tokKxBPAjgQABMlAKoVyI5LBLw2IDueCHT34okAS4ASga5ebAkwIoD9AWjfQZUflf1G+HzA
-						PkC/WboC+uYAeg33zXvS6y168f3UacGv8+0b/LY3zC3f99f12/F+9TE9KTNvJEP/rchcv8XAHxlMDGqIPQXYd8AigEAGnpcVgbb0zGtt
-						6enX2shqwOMvf6JagyACL35MDzb4iEUAqwHv0z0OCXig+RD1/2Et4f9+vu09exftO/9VFOiPjEC/Cb8u0G8SeP2abA7uPW0z/Un6/QH/
-						nCrhv5p9/xGtPy74r9vWH+SRTuUiALXNUx0K3axV/eQL7CWv5BW+Ulr1/v8kYhUghf+DalSwmFqNWU8FIgAcBn8D/0UM/6r1R6UYlX8r
-						JStNjlBfBv6seXsV/HOyORgVijQbs1n9YxchAdYqwO9dAhAtAmibAexDALAPICwAZhJQWACOXr4tcF0XEiArAAL/W1T/vyUBpvofnvwT
-						bv2xg/vZiAXAa/3RU39sAbAlIAD/HHsFwBMAC/pt8Ffwb8cXAHO6bzTwj2j74cQEf0cC1f8pKsHNvv6G39pAv19RjkytpvhwwhVwxAXG
-						EobtmsYN7jXNIYkT9msR12MRTvjxU49zaDXASlgGWk/aKQIQTiz4d8WIACISwPBvAgkwCcqALQBWW5AWAbstyCUBiBGBiBUABvFAIAJY
-						CfiQJUBagsxqQDe/HSgkAVgZgCA0QqS6D+hHtb6HVPYB/chrDO6vMdQD+pE3PulNb7bsTU1a8W2rDP75+vDrfMsvvyXpQ0306/gY9XEq
-						JaOmuwWA4xKA5eu2qdYj7Ct4v5OSgXdYBt5uT/WasAhgBClE4HWcMaDagh5/uQWLQAt6hCXgIS0C99XHlCCzGtCUHmhZ4IT/6s76f6lo
-						BS3cdz4m4EcAP8cH/Fi5RisOnKMGg+bSH7ta8F8Hff/u1h8G/6itP0H4T0Trz7+0KooA+Zrk6fRKqpea42StaiZZ/U9esa+GqdmVjidO
-						tdMwazw1LlxK6VO3UuFSBn9EBOAAFdkSsOKQqvh70H+YShn8TXBgWLZU/f3kzFcCgDSpXK/+0RMJ0AJQIwkIiUAtJSCufQEOCahqNWDB
-						gcsBAUACAqD3ANgCcPKLbyhz0bFIATCpoQgY+FcCYOBfRWb/QwCMBIgAxIZ/RKr/6P3nvBwQAIz+DI7/NHP/A+Cv86YJQ75JsOofzDs6
-						fs+/FgArYfg34O+a+qN6/t0JgL+Ovdm3BYM/ogRAxQn9CAO+C/xdsI/YwB8N+u2EgTVc0XZBrgvgq4ob1GsbBfp1AfvVDh4XPD6Bx1NN
-						D7InCEWL3Z71Qdc8er/jwEBqIgESSAALgIkvAhCA7EBsGbAF4E0Gf8S0BNkiEJYBfyWgl0RJQE9JhABoCUBsAQhIgBYBv4c/nV7+CK06
-						Pb1Kv1TrAfufIL3pDYZ9AL5APsP+Wzpvt0EyJe+0zfLDb3+3Lb8Nb5f3qeDjJ85eRtcZ9qMFKwF2Zi9ZSy9/3I3vI1qQulIjiEBTRIlA
-						PRaBF97CHgG0BWE1ABuFW7IItBQRePSlZrIa8FDDj+j++h/IGQJyum8t4f+BvvMpa+4e2n9BtfQc/ey6joH84OtBsP+ajn/OwW3o7d77
-						OUWL99B9PSYr+O/qgn8lAB78J6rvP+7WHwb/BLX+II93rYyA+Zrkqfb5TsaqQUo15iWv5OW+ErYK0H4gvZS/kF4pXkZ95+324F/1/x+k
-						YlT+rZRABDwB4KxiAdAZuOgAQz/AX8F/Xwb/vgsRfju/3HjoWvWP390gAZ4IxCkBSDUkoMOsg7IPoLoCsOLoF/SUC/5NqikBpvffwL8d
-						Bf86ZgUAJ//q03/V1J9I8DfwH5z8o6LgX0Vt/N3lxfT+R8D/aPf4z7cs8HfDfyi6+v++jgf+Fvzb4B9O3OBvKv9W7JYfL9P82P3hqk2k
-						avB3gb5JAPYRhtZEAb8b0uNPx9nRciiQDtHCIF7TOKE+VvC4WPEfr4PO2DJgS4EH/vgd6nycUU4fdBwkeV9WAAYEYotAVBlg8HflndQc
-						L5AAkyYQABNbBDT8hxMWAREABn/ESMCrDOWvNGdQ5xgJeFkmAlkCwHG2A2kRwP6Al/jt2LCLnnzVr9+TXmO58Kr7UrVn4Ecln/NW60wJ
-						AF7AniH/3VSVpvxyU/7/6720HJV2OdQ0jV/n2/f49v12eB9eV8EpwNdvMuxHCyTAyviZi/m+YX9BOksKZIVl4EOIgJoq1LBpR7VH4G3s
-						EUhlEWAJeL21JwJoC3q8cXN6BCLQmF/vNlYOyXwI/9/VEP5fLFpO8/ecsyDfnWNeNNR/fl0nEv7lbTp7P71KLUeuoj91mxgB/17rT3U2
-						/XoCEKvv3whAjNYfA/910Przl7YlMve/tnmyW0Wiqv93nu/Y+79qzEteySv6xU+W8tCTp0ZJyRhNjQqX0Ntlqyh/yT4qkuq/WgEoXh6U
-						AKwClCJGALACoAUAbUFoBeq7wMRIwAEJ9gXUK1ilBaAmEqBEwCkBenNwLAl4JKoEKBFIpAQ8w7B+/MrtuATAjAKFAJz44jbD7W6RgNqK
-						gAgAwgIQhn81AUhLQJkK+v8F/jlmBcAf/xkd/m0JeEXHTP3xpv8w6Nubf13w70/+iaz+xwR/xDr0yz/4C/DP4M/5UCcW+LtO+q0R+FtR
-						1X+V1tgoqmP3i9tVY7+aXAX0M6QmAvhdAB8rbrA3UWDfiV82cX+cDr5eLeO6j7ESG/pN3PAfjjdmNPB7U4EANO8/3hMAIwF2YgpBDPh/
-						N61vICIBOoG2IJGALJXWuiXIgn87RgLsVQBfBHp5ERHQAmCC9h07YQnAy42xGZeh3+7ll759Dtp60L6Dir5U+KVqD9DPZvBn0AfIG5hn
-						2H+fIf99vv2gXV/6oD3ftufbDv3ow479+Lav3H7Itx/hbQi/f8vOA27wt8Pgb0SgfPxsevMT3M8e9DpWJ2SzMUSgKzX+oAs14qAtqGFT
-						7A9oxyKQRs83SZX9ARCBp6QtqCU98VoqPZ0xhZ4cspweG7SMHmUJeHjAEhYB/v8vDP+eAGj4FwFQ8N9p6nba/emXCvAZ5k3CrwP8feC3
-						48O/Df3ICc6qg+epweC5Av9/Evg3rT/xbPqtbd//0Ej4D1X/3fBfOwH4O/4aT6UPdwJ9dfN0uzwnW1U7admFGu+SV/KKfTVok/P/a5Ca
-						86PziVSdtBtAL+UuFAloNnKdwL8Cfz9S+eeUIhb8D2XwNxnGGbyEYd+TAC0AHBwahmBj8PP5dSsBSgR+DQlAokvAiE2fBs4CsAXgnLUH
-						wAgAAgEYteWcJwA1lQC7DUhGf5qE4L8egz+i4F+lYbk/+tNIwIsM/ogL/k31318FYOi38tooldc5b0jQ+69m/ptTfyPg38QIAEO+mfgT
-						D/jbMRJg9/wH+v4Z7sPgbyr/EgZ9u+8/bvDnBCr/dhgQJYDFGLGh0gCnSRhcVVU7EvJNXEAcGVVJtyv14VQJ9sgcK673/9rhn80WBv9x
-						MY+bn/Dj6if0O8DvJErw+2pZMJs+6MTwb2LJgFMIGPxNIAB23CKAvQEsADpGApQI2C1BWgIsEbBl4A2GbxN/JYDh38SIQHOWAB1IAOKv
-						AAQlwIgA3udV/Bn60dqDvCm9+RkM/BkM+wr+35HqfjYDP6r5DPkM9+8D8hniAfkC85yPO/ZX6aRvzcudB3hphvDbELz/6MlPGfJvV50b
-						yC0qqJxMb/N9fAurEi1ZUtCW1KK7WhUwrUEsAS/J/oCO1KBpe7UawCKA1QBMC3oGI077z6Hn8lfS00NW0FODl9HjngQslpWAquD/hfxl
-						NGvn2SDkh+IG/ug5YQUCkLtwF93TY7ID/k3rTxXwn5C+fyMAcY78TED1/960UifMVzdPdq2geizcTraqXr5r1Cbjv2m8S17Jq+qrYWr2
-						MMcTqfrpNZwa5S+hRgVLqMPEzVQMCTArACsQLQAe/Osw9IfT3wH+SP9FB2gAB+cEPJPrnxEQnwRoEbAkQESgJhKQa0uAFoGwBIgIVE8C
-						wiLwHgOqEYCLLADYCBwWAAQCcNISgP2Xbko7ji0B1RGBMPx78/85pu/fhn/V+qOi4N+O3f6jD/9iyI8F/54AoPLPeV1HwT9nNATAlwCz
-						AhAV/scGp/54qQL+TfuPmfOvYgmASICe969n/scCf4F/hvpwwtAfF/hz7HYROzb0Sxg2TQJVf8CqFRfMxhNXG44Tok3iAHt7FaCmcX3d
-						uMNwH44tONHieny8xxiP+YzIRBOA1uXL6MPOgyUBEQjLgAjAgEB8GYAA9AvEJQKIiADDP2K3BUUTAZcAvMFQjrzeUsUWAFsEwi1BLhHA
-						+1HtlzYf/jreJl6G/rcM9KOtR7fzqBYeVPUB/Qr4P+rIEYhnsO8EsB9IzRnum3fhW04LO10H0SfdBlELzif8couuA+kTfjty+Yuv6AYD
-						flUxEtC/cAw1bZvJ6UPv8P1Vm4qxYmFWBdAa1FVWBBq931mLAFYDtAi8351SBs2neoWrpOD1XN4KloDlWgKW0qMDltDD/SEBdutPEP67
-						Td9Be899pUH/RtzQ78O9fv2y/zbkJL+O7P30C/q4cqUC/6jwb1p/QvCvW3+C8K8FwMB/rNYfA//x9P0Hqv+JgX8c+oUDu57unoC0y3Uz
-						VXWTrP4nr+pe2C3OT56bEU+maiYlLYcaDprjSUDP6dv96r+sABzU1f9ICQisAqw+Sjg5uB/gn9N/IcLwrzNg8UEJTgt+iv9B/O0koOYT
-						gpB4JWDzmWuRAsAJC4C0AGkBQOtQ36XHIwQgHgl4VqLgP0IAdPtPPSMBIfiXU391jAB48I/TfzmyAsCgbyQgFvwbAUA8+Jfqvx97+o8R
-						ANP7/44N/na0AHjVf4Z816ZfH/r9fGQyiSVAVgB8AQjAPyde8LfjtfvUFvqt2K0/4ap0uJ3FBbB2XNDrgmWJC6x1XMAeTmeWhHjTqbZx
-						fP+I+y0/a+yYxyTisePHNvzYS7QEKBFQMb+3tuO2egIQjpKAgX5YAkze79A/EEiAybsQAJOAAARbgqoUgdAqgBIBBf92Xv9EJSAAdjuQ
-						JQFGBHBrt/oA+lW1X23ilQ266ONn4EfFH3377wP6dZX/I13RRxW/OYBfAB9QP1iBPQC/22BqqdMqfQgHt5zuQ6i1vM63/DJu22UUOGE/
-						algAeg4opw+k1QhykknvtsFKBX6GXiwCPflnYglokU6vyR6BrtT4wy4iAg3f60gvtsymRkXLqWHJGkopWk31WQJeKFjJIrCSnsldZknA
-						YiUBWAVg6DcC8ELeMpq+4yzD+w0J4P/4ZSvydjf0ewH0m/DrBvpNFuw+Q0/3nRUJ/zE2/foC8Cv0/dfhyE/k4U7lbpivZp7sNMzJU9VP
-						ztevdsr53zXWJa/kFf/FT54c95OqeknpWsoCsFgk4NWiZTRwwR4F/1oAIiRglVoBQOvPsNUmRyWDFwP4lQDgtGBU/k0GsgAg3WftpkcH
-						LrtrJaD6LUGREjBo+Un/LADTAqQFwOwDcAnAmuNf0lNFkQJg4pQADlYBni1VccG/TP9h+EfM9J8w/HsS4MG/CsZ+ei1AiJYAJND2E4J/
-						tP6oMPTrqP5/wL/KWyYM/koA1Im/UeFfx3XKL2JDPxIGf7v33xz41dya9W/6/nGarxcG/HjA3wuDvetE39pAf50AvwuWOS6oNnFBfDhd
-						5hwJpHMiMzsynbxE3l/Xz+eK6/FCIh53Hft3Y+KvBLBcdhkShH8G/3ACIiAyMCAQkQCdplgR0FESENwPEI4tA2+1YQGQTcHBlYAmrSEA
-						fbwI/LcMRiRAVgMwX1/FJQJqalBPebvp70fF36v2M/ijn19afNr1ZfBH735/Bv/+qtLfKQz9gxjyh1igz+meS616MOD3yKU2PfKobU+V
-						Ngi/rS2/LdV7Wy5l5o+Uyv6NW3FES0CnzEL6WFqOsNcg2xeBtvhZevsi8EkPeq25EgGsBrzaIZdeKV1DLw9bS41K19KLxWuoAUtACksA
-						9r+plYBl9OTgpSwBS5QE9FvEEqBWANpN2krbz1wNAr8dDf8n+GUvYeDXkG/nlA5afgoW7aF7ek5h8J9UA/g3rT8W/NdR339djPxEMPbT
-						BfPVTvoIejZtoJOlqpuGqVkZGueSV/Kq3gVzbJCWfc31xKpecujF/jPUKgDnraEr5YAwgX4rQ1H1N2EJCMN/2ZpjhLMBBgD+OZgOFAjD
-						/yCdbjPjlQBOVRIgIhCPBARFIEICErQvAAFc4+AvIwBmH0A0ATipBeAYp9WU/dWSAGw8lhUAEQCzAuBvALbh35z+m8Ixvf9h+DcCgCj4
-						V2ks0RLACcz9jwH/JkYCzMFfbyEB+FcC8I6VqOBvosFfTfwJJrLq7wL/kAB41X99yBenpUmc4G9Dv51oPf6pUj1WsYEyAjwBpFESBtcI
-						2I8C/C5oRlxgj4ThPuGAb8eCfDuxgD/eRDwWrseLE35czeNt/57Cm4Tb8e+0ecYw+ojB/6NOfiIlYGAgtgwE2oIsEQi3Brng387bbbO9
-						+CKQ6YclQESgJWbrqwQEQMffFxCUAAmDv3o7Wn0wzQfjOxX8y+QeBn9s4FVtPujrV9V+gL/07HcZoNp4ug6mlgiDv6rk52rYZ7jXYI+T
-						fVN751NaRgGl9S6gdlbS+H1yq99fOHKaAnsX8DuCDcGt0gexgJg9BH3pw/bZfH+VCLybiqlElgi07EFvtOhBb6WX0pvl6+mNivX06rB1
-						9PJQSMAaloDVIgH1C1bSC/krRQKegQQMYgkYuJglYBE1LllFs3addUM/JwD8nJM64ddVGPav3PDDr5/m2/VHL9FrhYvpT+kAfw3/nDD8
-						J2bTbwL7/hPY+vPfm6mxn06gr2ae6FjqYKga5cuXm3f/XzXOJa/kVf0rJTWrq+OJVe2kdMqjl/IXea1ATctXy34ATwBWQgAO0TCG/2GA
-						f04Zw7+XNUepXHKM8pYeYuC3BGBxEP4HLzkk6Tl7j0xI+NUkwLEaUBsJQGJJwLz9n0cVgDNIFAGYvPOiEoAYEoAE4N+0AJk9AOHDvyz4
-						N9V/WQGwEoZ/M/0HUfDv5+XhDP4mDPyIEYAw+Nvw7x3+5QkAQz/C8G/GfYbHfnoSEAv+rajTfuOp+rvA34839Udm/furANLrb6fK2f6x
-						od/u75cefys25MeKE/pDkOsCYRvu7dYaJ5BXI13mVjP4HEeCXzd4f+OJ/bOGH4+4IhIQjOvxD0tAy/7j6GMWADtKBAZ5iRAAO2EZYPBH
-						7LagWCJgrwAgQRHI8uJJQCsVWwIM/EdIgC0CaPfh1xF1EJee2d+W4R/VcxnHqcAf1X5U+u1qPyr9aOsxVX5Af5vuDPo98gX4UxnqBfQZ
-						6FUKqX2fImqfWUQd+hRycKtj3papMmbqIhaAb+jmrdi5IblNV65eEwFo2Q33i6VERACbj3PoI70i8F4apMYXgaaZI+jd4RvpbU6Tig30
-						Rtk6em3YWnqFJaDxUCMBq6h+ISRgBT2Xu5yeGbyMb5dR8cojdPRzBfLxQL8XhnqJft2GfgC/ybHPvqbsWdvonh5TIuA/ou8/HviPtek3
-						UfP+66j15560UifMVzvpw+n51H5Ohqp20nI6aIxLXsmrZtczH+f8jw1Scy44n2DVTEr2BK8VCBKAyUClKw4K+JsI+HsxAsDgj2gJwOuD
-						AP0M/7g1GbwE8K8yhAVgCItCbAkIiUCtJCBGS1BAArQIhCVARCCGBCAhCeg0+5BDAL6tUgAOf35LKu5PGgmIIgJBAdDwzzFnAEAARAKG
-						bQnAvy0AJmbyjwv+w6sA0vdvYlYAdNTUn6rhP9z/Hwn/wXgn/Zow5EeFf4499Uc2/jLsI74AxAv+Ki11ght+FfgL/IcSvc/fDf41g/4g
-						mDoBNhQb8msK+06Ajzf4/LiC1YbaJeJnxc8fiusxih6WLGyWlsdeh39fSLgtqHXBTGrWZYiXjzsPCiQoAoOC8G+nY6gtSItANBlwS0C2
-						l6giYFYCTDsQA394FSAgAhCA5mj3wYFdffhzsblXxa/69+X7ho29Bv51i49U+xm0pX9fQ38PtPGgyp8v0I+0611I7Rjo2wvUF1HHrGJJ
-						p+wS6sS3nbNKqDO/7IfflqNv+f1zlqxzAn+0nDn/GX9/CAjfJxaBVulhEcCKAFqY0M6URR8NmEjvj95E743aRE1HbKJ3hm+gtypZAsrX
-						0essAi+zADT2VgJWykpAPZaAtIlbaeupLxjib+ookPeAH6/rtwWAX8cG/jD0S75QVf/XixbTn9MnVw3/dbnpt00s+DcCEAv+ay8Af2ie
-						J2M/nUBf3XQocrJT9ZNztkmTnP+LxrjklbxqfjVMzWrpfpJVLyntB9CLGAtqSUC7CZtomKn8c3z456w+zOB/hKEfUfBfsfaYpGjFYQX9
-						EoZ+qfxr8DdhAUB6zNoTagdakkAJ4MQjAVVMCKpJSxAgHTCPjcBhAUALUFgAsA8AAnD08i3KXXmKBWCTSIBLBLz2H4Z/6f8PCcDzOoB/
-						v/df9f+H4R+RA8AgABzp/WfQD8O/CABDvycA5uAvjtf6g1N/XSf/GvB3wL9q/fFXAd41EfBH5d+f+BPe+GsSFfzt6r8Jg79M/mHItyf+
-						eOCPxAT/6AlU/gH/Jgb6rcgmUg2MLsB3pbrQH4ZgF9BHixPg4wk+l9OVX3Yl+PEM6wlK53Dw8/JjECvxyYAC/0D4d2FvIA63a7WtWEbN
-						ujL8m3QZHIhIgBW7NUig35UYIhBtJeDdtKAASBj+kbfbqPgrAQrkkbAIBCRAV/wRfMxbrTK9E3jVRB8F/9Lnr8H/Y9PfL739gz3oV337
-						CvhR6UfrTnup8qvqfsdMH/q75JRSl74cvu3adyh1zRlK3fi2W79SDm518DbOmo07pbJ/8zYDfrRYArD/yEnVPtQLIjKE799gloHIFYGP
-						WARaQPDGbqWPxmyhD0ZtpvdFAjbSuywBb7MEvF62VlYCIAGNSlbTi0Wr6LWha2nsppMM6Lfo9NVbdOqLmwzwHH5dvWwAX73dB379cfKy
-						Anwb+M/w56qo14etOEAPZEzz4V8EIB74VwIQhv9qb/rlJKTvP0HV/wc7lLlhvpp5qlsFvZDa18lO1U1K26xmGt+SV/Kq3XV/q1b/CUbp
-						eqJVN/UzRtNLIgC+BKRP20ZlLAE2+Bv4r2D4rwD461SuRZQE5Eq1/wDDPgL4N/ElIJcFAOk1Zy89Pmg5+ScGV0MCPBGIIQE13RxcjZag
-						x00sCRi5+VxMATgdRQC2nLkmgK8kQImALQE2/NvnAATgX1qAED39h5Mis//V/P8w/AdWADjR4F/C0I8E4d8SAJ3A1J844N+O1/ePCPyr
-						vO8luArgnfYbgv8I8A9HC4BIQI3B34+78h8pARCAMDi6UtfAHwTyKMHHWXGBvR18juvtiUzEfUT0/Qu3AkWLLQDBWLAfBfpjJW3CFmrO
-						4G8SkAHOx5AAHU8EGP7DrUFOEUAsEXiPQdvEF4GcyGA1QMO/HW8VABIQUwR88MfraPdRm3xVrz8O61KHdKkNvujzx/jOZvyzycZeTO9B
-						dd20+TD4p/Vi6Oco6EcbjwL+jrq6L9DPoA/gV7A/lNL7D6P0fmXUvX+ZvNx9QBn1QAbqW509B48ruHeBvyMbt+9j6cB9weoD7lsuy8kQ
-						vp8sLLIigJ9hELUeuoBaTthGLcZtFQn4mCXgw9GbtAQoAXirYr1eCWAJKF1Nmfz/2/7z1+gMg78JJEBkwMtNBngD+37k7V5s4A9mx+kr
-						9H75Cvpz98kC/3+uAfz7AuCA/6h9/7HhP/6+fyMAiYP/f25V6IT5muTJBB361TA15+QzOTn/UeNb8kpetb/4SfWm68lW7fA/4BgLGpYA
-						jAeFBJSzAEhEAA5rAdASwPA/nMFfsu6YtAXJCoAlAZCC3KWID/95yw5Lchbsp2dyEykBYRGIJgFBEYhLAkQEIiUAedyEBeD1kTsE/m0B
-						MKNAowkAcoQlAKDhC4AvAk9z0PoThn+zATga/MsKgIwA9SXABf92C1As+JfqP0M/Ymb++7Gq/2YFoBrw7/X9GwnQKwDvI1oAfPD34V8E
-						gGHfpCr496f+WPEkwN/w64J+JD7wVzFTYsL94n7sFQH/0CoB/ygJg6tr02w4NsjHSizodr3PlW4JjOvrR4vr5zHx5SdSCEwgAOFAAlyw
-						78yMA9QiPY9adMt1CoCd6K1BMUTAuRJgi0BfLwD/cAD+b7fN8mIkwCUCsrFXBxIgm3wx3rNNH/46qt0HVX+Bf4zzNH3+XVD11+CPPn/A
-						v97Qi6o/WnzaZ/j9+2jrUZX+oarKLxV9hn1APsO+B/cDy6nnIKSCenHMbW9kcCXfqnx64XMRgFsM97FiBGDpmi0sHbgfRdRRViCwuRgr
-						E1oEsBdhxApqO2k7teG0Ygn4hCWg+dgt1MyTgI0iAdIOVLGO2k7YSmuOfE7nvrxNZxEN/2e/5OiXzzD84/b0VQ35EdDvBn4TVP0LFu+l
-						+3tPY/ifEhv+Ez7xxwiAgv+7qe8fJ/4+kaiNv53LqH7bhBz6RQ3a5ryssS15Ja/EXSmp2RucT7hqJiW9VDYE2xLQmCWgz6wdAv8VqPx7
-						1f8juurvx5YAtAKZyr/AvwiADf8q+SwACA4Nw9zkREiAiEA8EuBaDQhIgBYBpwS4RcCWgEWHLnujQGUFwBOAO74AcLwVAC0Ac/d/HiEA
-						T0m0ABRHwn+g919vAPbgXycFgQCYyT8h+LcFQEkAA7+JBf9GAMwKgL8K4M//F/jnmBN/5dTfsX6qgn+v9ccWAE4Q/v18NElt/vWq/wz3
-						Lvg34B8B/xwP/HVc4N86TvD3R0O6gN/E3QpkA6VdfY6o+jPUx4pd7UdcUOxX0YNtNS64NgkDujPzEhjX13ckfD/9ny0YF/h7EZkKyhUS
-						sSrgkALz+/ukTxk1hwCEIuCvW4HCqUoGbPgPBhLQTxIQgTSWAB0P/vnfeBNbApwiAAlopWIkAG/DJl8Z7wn4R188ZvnLHH91aJc5nEv6
-						/HXVHxt7vU29DP8++KPar9t6EIH+MkrXsA/o78W3AvkA/MF8O6SSMjh9codTnyEjOLgdTpn8OpKdP5K+vn5TC8CdOPINzVy4irr1hYBw
-						sllGIALYUMwi0CGrlDqNW08dpu6ktMk7KBUSMHEbtWYJaDl+K7UYBwnYrCRg5Ab6kDNm40mp8gP+z32l8inC8G8HImByhiVAEoL8s/y2
-						s7i1X+eoqv9KBf4SVf0P9P074D/+Tb9R4L/Gh30ZAajbvn/kvnZDnTBfkzybOsjJStVNw9SclRrXklfySuzVsE3mvfwk+yX8pKtJUvpO
-						iZCAV4qWUv95uxn+Y0vA8HWIEgAkHxV/r/J/UKYESULwX7BcpVoSMCCaBPgiUOPNwbXcF4A8zunEMGCfBRBLALAR2AgA9g+8yRAdhP9N
-						9HSxCcO/joF/XwD0CNAQ/PsCYNp/MP0HB39Zh3+F4N+e/2/3/4fh35MAD/5VvN5/69RfCcN+eAXAVfUPJ9z37/X/C/zvZfBXMRt+bQmw
-						RaAq8Bf4DycgALrXn+HeTnzgX1voj54wzLo2yMYL+mG4DsQF6YmM63vGGdfPooKfVSXwGFiPTfjxM3E91gERMMHvj3+vrQeMoxbpIQFg
-						+A+0BjkkwMQXAX8lILAaoME/HCMCIgPtVEQArFYgWwTCEiAi0DpTYlYBlAioQ7288Z56tKeBf1T+m3VBu89Aainwryr+GOOp+vwV+LfX
-						4N+RAVtt3lXwr6r9ZaqlB1X+gQb4GfY5APwMAH8eAz8nk5OVN1JgPzt/lA6/XDCSikZMUf3/RgC+sRIB/yrjpi9k2cB9KGURQOuREoEu
-						Ayqo28TN1Hn6buo0fZdIQDuWgDRPArbSJywAzWUlYDP1XbCPdp39ki5c+0Zy/is/5yS+EEAOPBnwROAmv+xDvop6uwk+duKm4/RYzuwq
-						4L+G4z4Dff/DlQDEA/+eADjgP6L6H4T/RLb+/OMnBU6Qr0me7FjsZKTqJ+fnlPaZf9W4lrySV+KvBm2zp7mffNVL/Y651DB3YYQEvMoS
-						MGjB3oAEVEIAOMOl+q9XABj8R+hgc3CegL9KvkC/HwP+JoUrjhD2B7xYsroGEqBFIGESUPuWIED7vos3ogrAqbAAXFb7ACAApevOBATA
-						h3+zEVitADynY6r/Bv7V+M8o8K/jC8A2hn7EDf92G5BM/DEJwb8RAJEAD/71zH+JEgAZ/4kA/hn4kWiVfxO779+Df1T+OR/rqJafyJix
-						n6bfX3r+TRjuA1V/VzT8uyb9mASq/wz6dmoL/i4ANbFB1YZZSRh2OS44DkO0xAXm1Uy64211lcifywf+iPBjY2I/XvZjWVXs3w9asuzf
-						Y2rRbBEAtAGZhAXATiwBMPFFABLAwG9iBKC9H39FwGoHMhIQTQTaBOOLgG75Yfhvyh+LQ73sA72wyRcz/WWTr676C/j3yJMef9PuI5t6
-						OYD+zrKZV23gTWf4V+CPdh608FQI9Gegsp+rgT9/hAf42QUM+5wcTt/C0dSvaAwHtyrjZyyKLgCu8MeUjZnJ3xviMUyLwFDqnjuWes7Y
-						Semz9sjZNV1YAjpP20UdWQLaT4EEbBMJaDV+K3WfuYtWHv6MLvK/7xcZ/C9+rWIkwBMCed2SAA4EQFYKjAx8qSDfXx1QryP7z39JqWPX
-						0V96TI0N/xwF/5waw7+p/seAf04Q/iM3/Ubv+2fwT3DfP/Jo5wonzFc3T3ZL3NjPlNTsCRrTklfyqpurUZuM/8am+Y3rCVjdpPTBhmAI
-						QEgCipfRkEX7PPBX8G9ylKEfUfA/Ell/nIpXHNYCoKFfwsDPKQT0WyliAUAgA9hIFa8E1GhCUI32BWgRcEqAWwTyV53if/h9AZBRoCEB
-						MKNAbQHYc/669OwHBcDAv9kHoKYAmc2/Yfi39wAYAfDgv5zB34Th30T1/rvhPzD205IAF/ybBE795byNeNV/fegXAgFg0A9M/gmBfxj+
-						jQCIBJjWn1DM3P8WU1Rs8LdP+XVW/6sL/o544M9gaOISgLqC/jAYJwr244X79PnqYxMR19ePK9bPGob+eGI/3oi32dr6nai9Ger32K5y
-						OX3CAmAnHhmIJgKA7KAMDPBFwCEARgIgACYRIqAlQESABQAJSgAEQM32Vy0/arMv4N+e7e+N99S9/qbqj8O52ut2HzPGE+AvG3tNxV+q
-						/X6LT8ZgBf2ZHFT4swD9hQr4+zLc9y0E7Kv0Lx5LA0r8DCwZJ1mwfAPDPyYA3aHbCEO+K7YE5JZNoD7SWgQJKaeMksnUe/Zu6j1nL/Wc
-						vZe6swSkswR0nbGLOk/fRZ0gAZO3sxDspJk7PxWov3T9Dl36WsUIgJEAkQJLAi7wx+NzvLAAmCghMDKgwB8Zw/+3PpEzOy74j9j0Gwv+
-						45r4w4kD/n/LTb/IX9qWOGG+JnmqfYGTjWqQm8937P1fNaYlr+RVd1dKWnZfxxOw+uF/5BsMxIbgKBKwcC8NB/xzRgD8TfgfKQF/gX8l
-						AHi5YDngX60A4OVCiQZ/FgQVBf/FyMqjkuZjt8QpAZywBHgiYEtArNUALQGu1YAqJCBWSxB67nHyLyTAF4BvAqcBmxUAMwkIAnCI03/Z
-						CSUAEdV/A/8qz5UiW1kCGP51778N/xKGfiMAgH9PAAKrAGYFQM39jwb/XgD/Om8gDvi3IwLgwb9u/dECYNp/JEYEGPSrA//hePCv48O/
-						ij/xJzj1xz/t15/3X23w19N+ApV/Kz74+9AfK8EJP1Z+JeAPR8A+DrjvPu9ojZNeZdT3iLh/rp9ZJ/z42HHBPxJ4vBH+fQQT3DTcYcIW
-						apme56UqGQiDv59BEgiAiScCHVkEOrII6BgRMNV/O1FFgP+tNzESgMk+gH8TeRu/H20/0vKDzb4sHs0A/3x/vAO9ZMIPNvqqCT9mky/6
-						/GWDb99gu4/a0MvAbVX7Af5eW4+u8PcF8BfbwD+OBpWOp0FD+ZYzeOh4KxNo/da9/gZgDfuxghOD+0Ey+Ptm5Q2n7IqZlDN/P2Vy+szb
-						JxLQa/YeGVndfdZu6sYC0JUzeesZ2cD7GYP/59e/5dyRlz9jAcDtpevfqLAEmBgJULe3VUIyoFYGtATw11916AK9WrREwL9G8B/Y9BsH
-						/Lv6/gX+jQAo+L+bNv0if98iP2Ez/5/oUk71WYydbFTNNEzNytB4lrySV91eLzfv/r82TM254noiVjf1ewyjl/JMK1BQAl5jCchdtI+h
-						3xIAqf6zAAj4+xm14bhMClKVfwv8dbBZ2A/g/wiVSI5KsOnqof5LPQmo1qnB1ZaAumkJmrrrogiAdxpwnAKw+fQ1eo4BX/YAMPQjbvj3
-						9wCIAOiYyj/g3xMAhn4kDP8iABUM/4jAv8rLnPChXwb+zV4AIwBm429V8G8EwMz9b4q5/7YAcMzBXxGtP3GAf7D1B/Af3PTbUkeBfyge
-						/CsBsGf7SxjuTcLQj8QCfwP9HvibMES6YleYA8AJCGXYNwlvcg2DbQQgVyM2zIfjgnZXesyPne5xhb9flLjum+tnCcuAnfBjZh7LCPh3
-						haHfloAOsw5Qy54F1LI7CwDikIEW3YZI3CsACvwjgtUAhn8EAmAiAhBqCYolAk0Z/k18CciSQACMBEjlvy3afqwRnwz+puXnk64M/nKg
-						1xBvrr8c4pXhV/5N1T8A/qj6M/j3Rm8/4N/r6ffBX6r8GvgF+hnwkcHDJtAQTm7ZRC95JuWTZKY/Jvvc4ijI/zZGGNavfEn9pX1oFPUf
-						s5D6LTzIOUA5Cw5QNkRg7j7KmLuXRQASsJv/zzpCe89fo8s3vpUY+JeXOSIBXr6RKAHA6oBaFUAuMfxftGJLAIK5/4MX7KH7+8xIEPwr
-						Aagd/GsBiAv+jQC44V+q/wna9Is80qncCfM1yTPtBjuZqPrJuVS/W7f/rPEseSWvur8apGa1dj8Zq5cUpO/UmBKQt3gfjZSqv59RgH4v
-						x2k0C8DoDSeodCWA/xAVSXzoR4uQqvpHRiRg1VF1anDgwDBbAkIiEFUCwiKQCAnQIlDFagCqz7YAYB9ANAHAJuAjDP8iAZ/dpG4MGIFz
-						ABj6EcD/8wz/Egb/QLuPqfQjGPVpbfKVW3mdoR99/wL+FvxzpPqvJcBM/8Hc/2jwr6b/+OM//c2/bvg3AqA2/7rgXwnA+zpmBeADhn5T
-						/XeBPxIN/sO9/37l30RV/722H2/Sj5UZSLD6768C6Bn/tQT/mNBvxZ7kE4bXMNxGxAHHLohGXEBv4oL5xORI7PD9Mumu47rv4bh+bi/8
-						uAQeRzyu1mOsEvl7cAUS0Cazglr1yJd4IsAJrgQoCfBlYLCXaAJg4okA2oHMKoCRgKgioDbuYgMvEikBvghAANTrasMvvhYq/x8z/Dfv
-						OtBr+VFTfhj+5QRfXfnXp/cK/KPqr8d5YnMvqv4G/E2rD8A/B9V+gL9X7VeVflT1Af0e8Jcz6FdMonxOQcVkP5Uqn174zOv/FwG4w6Dv
-						ipaAk2cv0MDSsTRk0goavOQwDVxykAYsggQcpL4sARhRnTlvHw1afJDWHbtMV258R1dufquiJcAOJECk4AZWBlQ8IdAtQiIE13wJsFcD
-						kEX7PqXGBYvp/owZdE+vaQr+e9Qe/gMCEA/81/Sk34jqvwP+79LWnyc6YONvYqr/yUO/ktevfuXk5Px7fvJtCz8Za5KUDoPpxSELokrA
-						6yVqJWAUwH8dAz+i4X80suEYjWEBGLPxuKwEFAP+vWq/QwI4dvUfKWUBQDAh6Nm8lZYE1GRMaCwJCIvAGksCEEsEYkqAEoHwasDmM9ci
-						BMBMAoIAILYAYAUAErD8yBcy/99IAMaAPqur/vWGbfFafFLKt1IDTqC9h+H/pYodDPUqpqXHwL0fvE29/WUD/3jZa//x8+pIfwqQC/4D
-						LUCctzhmw2/88G9GfvpjP70VAI4c+BUF/uMBfzt264/f86/SFvHA/0AU8Ffwb4O/JwAM/H6vf+wDveIBfxtGA7DKCQB+OA7gdQFynUL+
-						glrE9fV0jABUFdfPG/G4hB43JQGRm4bt30m0pA0aT617FEQIQORqwBCJUwRirAb4LUEDvEQVAQv+7bwn03wgAdkSIwFS+edbbPpFz/+H
-						Hfqqth9U/vl7y2x/vs/o98eIT2+zL2bo65n+stFXz/M3032wyTcDozsxsjMP7T7YzDta4F/A37T46Go/Kv1DdGU/nyE/XyB/iqRw+BQq
-						Gj5VUjxCZ+Q0+uprfwQoBOAbhn1XjAjsO3yC8qeuobzlRyh3GUZXH6ZBSw7RQJaA/gsPiAws2HdBAP6Lm9/5ufUt36oA/I0UBGWABUBH
-						WoN0IAByK+1ASgLwtsMXr1GP6Vvp0exZ9FDmTHogYzrdCwHo6YB/EYDawH8txn161f9I+I/e98/gXwd9/39onpew1p+n0yupXlpiTvxl
-						iVjPOPY/KCpLXsnrV7zqt828n5+ECRkLWr/ncCUAUSTAbAwetd6v/gP8PfgXATghwUnBsgIQFoCVhxn2ESUApasQH/6Hrj4mwcjQRqVr
-						49wXEO/m4FirAWuqsRrA4B+1JWgDZS46pgSAE1gB+CIoAGgBsgXg4Gc3KY0hFCM/Af0vIEM1+Ou2HtW+46cRx6vgS1QFH2M8pZLPEP+K
-						Dir6fnuPfr+E3w74t2I+F3mNEwv+PQEITf55B4kC//YmYAX/fgLwz/nYDgM/Yqr/1YZ/Bn2/7ccSAKv6n4q+fxMP/M2En2CqA/4mAQGw
-						QDJR0B+G34TBvgvYaxPX90hAYopAxON32BlMELL3BjhlAL8/TrviOd4KgElABEQGcr0YERAZ6OoHElBjEejQzw9LgC8C6OdX8SUguBLg
-						jfmUnv9+Av/Y8CuHe/F9lFN9pfLvj/jElB+Z7S/wP4y6yWjPcgX/ssm3UlX9ZaKP3+OPij/gf2Cpgn8D/rllCvxR2Rfg15BfPEKldNR0
-						zgwaOnoGlY6eTiMnz/f7/0UA3PBvZ9vRC1S08qjsQStgCcDBlEOWHpJM3/GpzPP/8vZ3dPVWMF+YaAkwMSsDZnXAkwC9GhC5IqD2A0ze
-						fIL/X11CT/WbIyM+H2EBeLDPDLqv9zT6a0+0/9QF/GsBYPAXAYgF/5wg/FsTf0QA4tn0m9i+fySRrT9PJ+jEX85P9dvk/EnjWPJKXr/+
-						1SAtZ7zjiVn9wIgHzIwtAUVLaeCCParqzxmDiAD4KwBGAoYy3BevOKSr/ioe+JtY8K8E4CgNYwFA0BL0wahNcUoAJywBnggkZl9AvKsB
-						6OVHm49LAEQCdAuQEQDAv2kDmr33c4F+9PcD/BuUqchBXgz6aO3xYX87wzr69hnaNcwD1g2we5GJPbu86T3mbbi1q/uY9CNfQ38tEzP9
-						x0z+cVX/bQEwEgABkL5/x8Zfr/rPwK9O/A3Dvxr36YfB31T/dbwDvxIG/1b/P8eAv8C/iRP8dcvP7NiJBv6BA7wYSqP195uEgT+c8AZa
-						V5+9C5wlLlCvQXra4a/rivP71yKunzMsPm4pcAtAOBFCoAWgw8iVEQLQioHZJEIEuql80o0lQMeTgGgtQVYCIsDwj6BnH/ElAL38KmEJ
-						sNuBcPs+vy0A/5xP+Pug+i9tPz3NmM8C6tCnUI/49Gf7m35/Ge+p4R+Vf8A/qv42+A8Q8FetPnbFXyr9HIB/CYN/iQX8w8bM9DJq0jxa
-						tHITHTlxln766Wf6+Zdf6G9/+1sgv/Dbfv75Z/rxx5/o++9/oDvffk/ffPcjrTl2mf+POUbFLAFF/H8PRGAag//JKzcZ/L+38h19eYtv
-						dQIy4K0MuCXgMguAhKHfBAIAGdhx5gtKm7CRXhiygJ4bOJ+e7j9Xpv08mjVLBACn/N7Tcwr9hQUgKvxX65TfxIz7jGviTx0e9oX8sXWx
-						G+RrkCe7lFFKolp/UnNGagxLXsnrt7lSWuT8lwapOV+5nqDVTb1O+dQwd35MCXi5UB0WJvAfkoCxLAFjWQLGsgBgTwD2A5QI+Kso6Pcz
-						FNCvwd+G/7I1Jsepy/Rd9AgDf+0kICwCtgSERYDhP6oIOCTAsRowYtOnngBgI7AtAJADRARAS4ARAawCYB8BNvSitx/tPejZR0zbjgF+
-						gLqEAd3A+ZujsUFXx4Z0hna06BhYl7frj3lDXlavQwTwdUQkDPzreAKA7yGJDv8iAKj+m8k/JiwA0eBfWn8Y9pEIATAHf1nw71X/dczE
-						H5Oagj8SbPvxwV/afXRwEBTizfM3iQB/lSD0+wlO9gknMdDvAmYb2ONNAOzt8NcLpxe/3cT5OXHGed+jJAz8foJtQiYiAK7wYx8QAv49
-						RWsN6jRlp7QAqQThPxARACtaBJC49waYQAJYABAjAUoEsIFXS4AlAqb6bwetQLj9wG77kQ2/g6gV35fW6XrDL072zShQlX9p+ymmLjk4
-						SEv1+/cYoMZ7qrYf3e9vKv9mjKeu+KuNvarin2fAf/gUVenX4A/oRzCzv2zsLBo1eQFt2LaXLn7+Bf3CgF+T6+df/kb7LlyjirUoTB2l
-						qdvP0tHPb9C1b76nawz9X/GtBC9bMVIQlIBv9cu+BEAKVGvQHZYBFSMD2OhbvuoQvVq8lBrw/6X1WQCeHzyfnmUBeKrfbHosZyY9zALw
-						QMY0uq/nVF8A4oF/EYDqwL+p/scJ/7Em/vxKm37/wF83ca0/w+m51AFO9ql+cq6+1Lbn/11jWPJKXr/d1TAtp5P7SVr9pGSOoxfz9H6A
-						KBLQmCUge/YuDf+6/UdnHMO/yQh+vwJ/Bf9YFbAzTKDfjw/+KuVrj0sGLDpAzwX2BWgJQOpkX0Ds1YCgBGgRsCTgDQZo2QPwpS8ARgJs
-						AThmJEBE4KZIwOSdF1VvP1p8KtHio1tzLOj3gDwA4Spm/n7gdQA5510N5m+PVR8j4bd5csAf28RIBL8ulX98LxMtAEYC8LHq+0SHfy+A
-						fx30/fu9/5Hwb8eGf7/v30TDv7UCIKsAU/TMfwZ9WwCqgv8w+IfhPyAADPvh2CLggb+uFEsscIwN/ipOOOWEq9jhaTkRm2kB0nEmAsIZ
-						rF1QH07E53FcH1edhL9exP3V4O9O8DGwob+qyOMM8fIS/L0EVgP499q2dzG16ZkvgQSYGPAPxxeB0EqAFacIMPiH44uA2rxrJEBEwLQD
-						oc2HYwsAVgQgB7LhtxMEYKDu+x+i+/7z/Oo/pv1kFnljPnGwlw//+iRfwL/V74+2H8C/3e4jk3zKJ+mK/1QqHMHwP0q1+Awdo6r9AP9y
-						Bv9x0xbR/sMn6Ycff9QYX/vr+59+Fmi//u0P9PU3CAuAIzb8+8HKgJIAc6uEgG/DKwN6VWD5gfPUavR6eo3hv1HhYmqYt4hSchfSC4Pm
-						03MD5kkb0OM5s+iRzBn0YO/pdF+vqfTXHmgBig7/NT/oy2r9MfAvAqDgv3oTf1T13wn/CW79eTiBrT9PdSh0Mk/NkpOq8St5Ja/f9nom
-						J+c/8hPysPuJWr2ktBtADQfNrVoCCpZQ+rRtIgFS+Uc2QgC0BGxSKV+Ddp/DNBQJCICq+pdJGPh15b88lAoWAAQbhd8oXx+fBCRkX0BY
-						AhBLBFwSYInA0sNXvFGgtgDIPgAWgGNXWAA46lCw24FVgPfG7dKtPujD91t11AhOBm8OoF1tvAXM72Lo3sWgzRmn+u7tYPzme3KLSnyw
-						Jx9tOgB2JQZaHMyt/h74nt4KAEcEgWMm/wREgz/XBf/m+5kVgA9MdNtPdPjXrT8M/Gbzry8AmPlvR8G/V/3X8ar/DP1q4k8Q/F3wHw38
-						o8G/iV/5j9brr2JXle0EwdNPGFLtSrY9LUfiBOJgbLC3EwvEXe+Lld4Lj9U4Nvh7cdxfO2HotxOWJCT8mKbjcbbi+j0gYRlo138UtWVQ
-						RkQEGP6RgAwY+O+eG4y9P4Dh2ykCtgQERECN6jQSYEQg2A5kS4AtAH1FEvA5zToZ+B9Mrfl+yCFfqPz3zlcbfvWcf7PhN93b7KsO9upj
-						4B8n+Baqyj82+5rKP6r+eeGqv2n1Ga3gX4H/bBoxcS7t3HtEWnjq6sJCwp0ffvYkwCUC4dWAr1gAEMC/iZEACIB6WQnA3nNfUtbsHfTO
-						sJXUZOhymaT3MgtAI/4/tEHuAqo/eD49z//HPsMC8GTfmfRoFgtAxjS6nwXgHhaAv2AFoLrwX62DvkLV/3jg39X6Y+BfBCDx8J/QqT8J
-						nPmfkpq9r0mTJv9B41fySl6//dUgLet515O1JqnXrYRe5H+oqpKARiwBaeM3iQQo8D9O4xn6wxlmgf+w1XZQ9T/KoI9o6F9roqr/gP/K
-						dX46TN1JDw+MpyXIIQGeCCgJiG81gMG/BqsB7Wcc8FqAzD6AU2gDumo2At/SKwGYCBTcEzBi86eqBx/gb2CbQRx5W0eBtooA/ngVtNV4
-						bTYIvy6tNngfPoY/VkZu4n0WkCMiC3z7Dt8aIXhHAz6+twF/+/6IJBgJ8ETEkgBIRgj+zQqAPff/Izsx4D8gABb8u2f+O1p/cNiXfeAX
-						w7498jMM/lVV/U2qAv+wANgJ9PjbYSh1Vf5rCv3huCDbBfJ2XLBeF+mFLIiV4P0KikA4eHwiIyLAj52dwONfZZQEdCiczvBfSG17sgRY
-						MSKA2O1AERIQTQQY/k0gAb4IMPwjWgBMwnsCXPsCIAGIVP87qIO+/Fn/ubrvP1+N+8xQE39k1Ge2HvWpp/1gxr8H/3Kw1ygF/8Wj/X7/
-						UgX/ZpMvqv7S52+q/larT8X42TRt3kr68tp1jel1f/30y9/oxrc/BkTAJQQQAHWrJcC6tWXg7NVbVMn/rzUbsZY+qFhN75atoCaly+mN
-						kqVyyBcEoGHuQqo/hAVg4Dx6tv8ceipnNj2WPYMe7jOdHmABuFcEYOKvCP9Vj/t09v0L/Jvqf+Lh/x8+KaCn090wX+3w13kmbaCTdaqf
-						nL+ltM18UmNX8kped8+VsA3BnPrZEyheCWg+cp2MCB2/MQj+E5DNJ2nMBkjAYRGBMv4HUkVV/+1qP1LB8O9HCYAtAcPXnaCBiw/SCwWr
-						4pAATlQJ8EWgti1BrtWAx1kCtp655gkARoGeYviHAJyUaUCqHUg2BOuWICMBey7cEKhXvfaqzca09ijgV0ANgPfaaRAGZxNAtNlQ+9HE
-						PVZUtf1DlgKpvGsZQATO+W0G1HEfIAXeygAHbT9O+Jf7p8TERK1AxIZ/bwVAJ7Dxl+OEfwZ+O17rTwD+9zP4q0TAf0gCzNSfNAZ/xIZ/
-						xAX8JnUN/naFOgyrkaAbPdWBfReQ1yYZVlzvjwgDfmT4fkUJ7rPr5zNxPR4SPIahx9R+vJHA78WL3hug07liCaX2ZgGABJhAAKK1BVUl
-						Agz/CCbxIL4IQAIGSmwJsFcA1CqAEQH3noAP2ufQR/w6Plad8qsn/vTQE3/4PrfXh3x1Evgv8U73ldYfXf03bT+y4RcjPuVQL1T+xwbg
-						31T+zSZfVP2Hoeo/diaVj5vN8D+HVqzfTj/+VHdV/2gXVgNuf/8TXb/DEuAFEuBeHTAScE3fIuj5n7v7LLWfuIlajF4nAvBh5WpqWr6S
-						3hm2nCVgGb3GAvBK4WL5fzSFBeCFQXPpOQhA31n0OAvAo5nT6MHeU+l+LQB/6lYL+BcBiIT/iL7/mo77dG76dYN8TfLfm+XSo50T1/rz
-						pMz8d3NOtZOWPULjVvJKXnfX9Xxar/8HP0m/iHjS1iBoBWowaDbFKwHvla+mitWHLfA3OUkTt5ykEeuOUZkWgHIBfxWcHlwRAf5+7Oo/
-						4H/4ehVsEG46cpMnAfHvC9AiUM2WoJqsBmQtPEJnGf6VBNwWAfBbgVQ7kJEA7AcwEoCUrDvDYL3Tqqrvkuq99NEzQBtgRsX8Y0RXywOb
-						ZifvZWjW4dcB0M3wdsSANr8skoCvxcAtX5dfxy1AHd8LIK9WBZSESK+/JQCq/YfvJ1qAdBT8q3irE1XAv5IVdT8Qb9Mvx676R4N/TwAY
-						+hFT+Zc5/3b0HgAP/Gfoth/X6b4M+a6pPx00+NvwXyvwB2zq2ABqwyniBFlHXCAcBn3ECeAxYsN8rLg+N/7gfsUf189lR35+PCZWXI9Z
-						+LFG/N+Fvyk4nC4TNokAmLTtrdqBAm1BIRlwioC1CmAkICgCg7x4EqDbgYISoPr6w/sCTDvQh5yP+e2Y+NPCHPal+/5T+b6n4aAvPe5T
-						Vf6x6XcopWsBwEFfUv3PrWT4H0E5etSnfbCX6vn3x3sa+DeTfdDnj6r/8AlzaPueQzLB57e87mgJCEeJgCUDWA3QKwLIlpNXKGv2Lkod
-						v5Faj11PLVkAmo9cIwLwPguArAKULKM3ipeKADTi/0MbsgDUHzSPnhswh55mAXhSC8BDvafQfT0n0z3dJ9KfsQKQKPiPa9Z/nOM+63ji
-						D3JvWqkT5GuSRLb+cD57oVWP/03jVvJKXnfflZKW84njiVuj1Os2lAVgftwS8GbpCipedoAmMvgHwgKAVKzRAsC3CvxDMdAvYejXlX8B
-						fxOG/xFWus3cQ48NMqcHx5CAmC1BYRGwJSAoAvGuBjzGebZ4Ix24dMMTALUKYFqB/P0AZmOw2ROAlqAd574WWG7K0G1afNDGYyr3AGXA
-						u4A9wnAcqJJrWPb64/l11SqjXlYfg8/TQqAFopkGb8gBRACbdFX1XrUaSUuPrvDLZmIX/KP6r4PPaSoCoFcA0I4kiQ3/XvsPJ/AzmcjP
-						5aj8W/Bvt/6Y+PCv4sO/jgH/UMzUH4knAHq2P0M9UhX817Ta74JVV6oCfjdsu+OCejuuz6kqrq9jxwX3NQ5+XutnDz82rscvnLAEdIsi
-						AV1n83Opd1FQAEyqEIHWkACGfyQgABIIwGAvRgT8diAtAZ4I+PAfIQEdGPxlFQAjP9X7IBGQiZbpOO1Xtf4Y+JdNv1kl1IUFQOC//zC1
-						6XdguYz69Db9FoykvkWA/zHe4V6Af2/EpzXXX1X+FfxXjp9DlQz/W3cd1Aj+2193fviJbnz7A90IS4Dke7quJQA5/vl1Klt1iDpP3kId
-						Jm6mdhM2UpuxG7QArKWPR6ymDypWUdOy5fTOUAjAEnqVBaBx/kJ6UQRgLj0/cA49228WPZU9kx5jAXg4YyrdzwJwb/dJ9GesAPyK8F+T
-						cZ910frzTy0LE9f6w3kmbbCTbWqSlLSsDzRmJa/kdfde/GRdFX7y1jQpmROpOhLwatEyOStgIir/OpMY/hGsDEACyrUEeCsAGvw9ARDo
-						9zNiPeJD/0hkw0kvxSuPUuNha73VgOgSwIlbAsIiEP9qAOD/iYL19FThBipcdVKvAtwRATCBAEgrEOD/i1uB1QAlAbeobMNZlgCA/x76
-						iKEZkcq+Bn6AMGDe9L/b8YCY0xoBGOuXcas+RkmBiYFrEQktAQbMDbTLqgDaevh+YVVASYAb/o0AeNN/+Gt4exI4SmZ8oYkG/658Mtn6
-						Wc3PWwX8+5uAGdgY9s2mX3vGP9I+lA4SDf6cjjjwixNo+zFh0I8QAQb98Gx/G/wN/NcW+m3YR1wQHk4QwONLxiIdvFyD9OHPtWO/z/X9
-						qk4Q+sPw74r9uJmoxxSPvYq3YVj/TowIiAyEJKBd3wpPAOxElQGGf7VROM+LLwIM/uFYAhC5L8BIgNkUrAUAoK9jRADz/g38Y+SnbPzt
-						PoSlJJfvL0Z+6sO+GP7R/tO1b6lU/nvovv9egyuo95BK6mNafwpGSevPgJKxIfjHtB9V+VfwP4OGcfzK/1xatWHHb175D1/ffP+jJwEm
-						vgx8LzP9Z+44Q71n7qD0aVupy5St1GnSZmqPVaBx66kVC0CLUWuoGQvAhywA75etFAFoUrKUXi9aTC/z/5n4/zRl8Dx6gQXguf6zWQBm
-						0OOZ0+mRPlPoARaA+7pPpL/ICkAdwD8nNvwrAfDgP9a4zwTDP077faJrpRPka5InOhY5maZmyVmo8Sp5Ja+7+3optc8/N0jL/sH9RK5e
-						UjoMoIb8D1V1JKBxwVLqOX27gn8TLQEYFQoJsCv/quLvxwN/Ewv+RQA2qIxi+JdsVLfYIPyI3iDsSQASUwK0CIQkoKarAYD/x/PX0ZMs
-						AE+zADSu2CotPVgFMPH2A8heAP/WrAaYg8KwFwCAD/BvNmmPaoXhCPQzvAPgBeoZbm3oBeDKrWS/jv921RevImKAWy0F+LpmxUBgGyDO
-						cI6VAbQJAdY/mKggXq0KqM2+wRGgDvhH9V9HyYSfD/XeBCQe+LdHf3oSoMWmNTb+cjzoRyzwD8O/hAFf9f4HJUCBP8cDfz/+mE896tMF
-						/uZkXyuB6r+ODZbhGf4mAfAHrOqEIVY2z1pxA3PVsaHclTDE1ySeSNQ0fD9c992OC/5d6bmAod+OJQIiA/jdWPFEAGEB6Jg3ieHZXwUI
-						JyABPfO9BEUgVxIhAs52IL8lKGJfQCdM9mERsAQAQRvQRxCDziwAXQf68C/V/zxd/fd7/zHvX7X9DFPwL1N/KvyDvuSEXz3us2QcDWYB
-						8Ed9MvwPn6J6/kcB/v22H1T+Zy5a/Zv0/Fd1wUdufack4CZEQAdV/3VHP6NBC/dSn9k7qNeM7dR9+jbqNmULdWYB6DBxI6WN20Btxqyj
-						lqPXUnMWgI8qIQAr6N1hy+it0iX0BgvAKwULqRH/H9pg8FyqJwIwi57KmUlPZLEAZEylh3qzAKSzAHQbT3/qMu43gn8jAL8e/CMPdihz
-						gnxN8lTXCqqXsNafnG9TUnP+oPEqeSWvu/9qkJbTx/1krn5SuhTJsqUnAZyqJKARS0DrsRsY+I+JAExm+DcZtY5BH+Av8K8EYLiAv4oP
-						/iojJQ7w1/A/euMpLzjmPaV49a/WEmSvBjzKeTx/rYb/9fRs0QZ6vngjjd16ztsLINGrAEoC1H6ASAlQY0IrN55l6N3rVedbMZy3ZkgH
-						sAPgTSuL6WeXoKItOSCxW1zS+GPT+G2piMCwBmMRBC0FgGn+Pna7kMC3VOeDqwKYKGQkILwB2AhATPjnmK/3Eb62t8IRbGsyccG/3/8f
-						pfLPqQ78GwEQCdDwbxIEf44T/HXLj5cg8Jt40O88vMoC/lDC/ez2dJyIzbMOKA4nDPcmLmg3yaxGXJ9fo+A+WcF9dP08VSUI/qHoxzQs
-						AOGY352RgC7D5lE7BmdIgIkvAAWBeCsBIgFq3j767xEjASIC6Sq2AKjYqwGWBOj9ABItAYhf/VcHfkn1v5tq/TGn/WLqT2Djb1aJPuk3
-						NPVHw7+Z99+vSPf9W9V/2fA7XPX8Y9qPzPe34H/0lPl0/cYtjdx334XpQIB/E4z1xP62/vP3UM7cXZQ5eyf1nrmderIApE/dSl0mb6aO
-						EzZRu/EsAGPXUatRa6nFyDX0MQvAB+UrqOmw5fR26VIRgNcKF7EAzKeGg+dRihaAp/vOoCczp9NjfabSw72wAjCB/soC8GesANQl/Mcx
-						618EwMC/CEDdwH8iR36ihejZhE394aRlpWusSl7J6/dxPfNxzv/YMDXnpPMJXYPIAWHVkQAtAu+WrZJeyclbTqlsPSUrASMY/IfbEfA3
-						MdDvZ5SAv5/RAv5+xmw65QVikDZlhzcuNLoEcOKQABGBiJagoAg8ynk8j+E/fx3D/zqG//UC/y+UbKQPx+0U8D/7FccIgGwKVhuCAf/+
-						dCAIwC06zrdYCdh9/joDrF/lBpyjop/KAcwbyDfA2n6WBa82wEr/Or+doVfej1v+PAFggWEtBiIDtghowNYtQgLiqNKjWs9CgBUBSADg
-						HiJg4F8JgOr7l95/hwAI/KP9x2sBUvsasHlZbWAOgn80+A/P+7dXQyQG/s2mX0TDf7zgbzb8qk2/WgIY7l3gb8N/uFUE8cHfHQWZscG/
-						NtAfL+i7YN7L4jqO43u67mP4Z7ET+bOrVqFedizojxUb/r3WII4nAWPWUPs+xSIBJmkM/0hYAEzaMnRLtAQYEbDbgSSeCPj7AWwJwBQf
-						zPFHIAG+CERuCMb7IAyfSN+/bv3ByE9OB4z8zCySqT+o/kv7D3r/B5ZJ64/q+wf8j5RNvzL1p1hN/Bk8bDzllk9U4z716b4lI/Woz7Ez
-						PfgfPnEu7Tl4TKP23Xt99+PPdOSz6zLUInfxPhq8cC8NmL9bBCBrzk7qM2sH9WIB6D5tC3Wdspk6TVQCkDoWbUAQgNXUbDgLQMUKek8L
-						QJPiJfRawUJqjFX0IUoAnh8wi56BAGRPo8exAtBrEt3fcyLdIwIw7i6Bf1P9rxv4x8jPhJ32y3mqY0Kn/hy5v1Wr/6SxKnklr9/P1bBt
-						ziMNUnN+dj6xq5mUtH6U0n9mjSQA+wKwdDqF4d8EEuALgA//I5H1x2gUoN/EQL+EgZ8zBtBvZSyDfzCnZTXgpdI1jpagsAjUbjUArUCP
-						5q6hJ/LX0tMFDP+FgP8NDP8bKGXoJmo4bBPNP/A5fQoJMKsAHAiAWQkwLUG+BHAuq5WAkZvPqSo2R21c9aG/owmDf8fZKp0QhlaJ9Kgz
-						rJrXAbMSfI6CWwW8GoL111YioMBZxmkKaKv2ICUC+6VNBxIAgP9ASwBgPxr8u/r/A/DPMVOKIBkSWwKwIqFXJqoH/6FxnyI8+FmDqQr+
-						o4G/HU8AGPSRAPxrWIwO/ZGxIdSuXAf63TXYRksYjF0g7QJuJ5jXRVzfO464fg47GfKzOx6T0ONnP66I/Zi7Yv9+PBmYsUcEAP3zSLsM
-						P0YE0GITVQSkHcheCbBFYIhKukqECLAAuCUgtCeAg7dDGvB1sMpgqv9y2i8LQGdp/VHVfznxl+FfVf8rZOa/6vv3T/r1qv+B1p+pVMIC
-						YOb8l4+bxfA/m0ZMmktT5y2nn3/5RWP23Xvh1ODKNUeocOkByl+yn4Ys2it72/rN20XZsyEA26n3TAjAVurGAtB50ibqOIEFYNx6as0C
-						0HIk9gGsog8hAGXL6F1LAF7Jm68EYNBseqH/LHqWBeCp7On0eJ+p9EjvyfRAjwl0L1qApP8/NvyLAFQB/7U76Mtv/akL+P87/pqPJ7Dv
-						/8ku5ZSSuNafn1Pa5DykcSp5Ja/f38VP4iL3k7sG6ZxPDfkfrrAEvBhVArQI6JagrlO2yirAVBaAadtOycFhWAkYse6oAn8N/1LxD1X9
-						R29UGSPR4L/JxK/+GwEYt1kFItBp2i49KSiWBHDiloCgCKD6/wSq/wVr6ZnCdQz/6+kFFoCU0o0M/xupUdkm6jRzvxIArALoA8LUSgAk
-						QI8IhQDIqoDfCoTVgD0XrjO4+5CKSj6g3wCpQCmnCzJHBdXncDXaf1l9rNq4qr8GQJe/B0QA30OgmG+9VQHdHmR67Y0IANZFAhjeZbQn
-						QH+cagtywb8RACUBQfg3AuDBvyUB+F72VCMF/ypO+Of7HAv+wzHV/8CkH3lM4oP/MPgH4J8B38B/OHY12QZLr+oPINUJg2oE2HoJVr7D
-						vfMuWHaCeRXJWnw8YcmsSXC/oyT8Mxv5cT5eeCyt2I+5xIL/cOyzBDr2q9AS4IuAkoFCCQTAxBOAXn78fQGRLUEBCdBtQOGE9wSERQAx
-						Yz+l95+/roL/Amn/wdhP0/vvPPFXH/il4D+48Re9/2rkpzrlN9z6M3zCHBGAY6c+1Yh99187znxBRcuMAOyjQQv3UP95uylnzk7KnL2D
-						es/YRj1YANKnbKEuIgAbKW3serUPYNQaaj5cCcD7ZctFAN4qWUJvFC5iAVhAjXLnUYNBc6geC8BzLABPZ0+jJzJZAHpNpgdlBWCctAD9
-						EQJQx/Cvqv8h+P8Vxn0i97cf5gT5GiV9OL2QyNaftjl5GqOSV/L6fV7PpOb8L/xk/jTiyV3D1O89WuYYR5WAPCMBodUALQE4NAwnB0MA
-						pm07LZuCR2oBGBWq/I/m96mqfwj8w2EJsKv/Cv5PB4JThd8evrGaLUFViYCC/8dzV9OT+WvoGVT/i9Yx/K+n+qUbqMFQhv9hm+jl8i30
-						auUWWnv8Kn3K8A8BsFcCIAAQARkRqgXArAScQDsQi8C4recZ+g8IpPuw70O9gc10DmAEt5hd7sX0nOuPQw86bn05UBJhVggAv6adCCsC
-						RgQA12aikMC4VOcVuH80EVC/z18NMP3/VcC/SUz453jwb7f/4L7oeJubqwH/fuuPHvepf3ZbAPCYeFN+QjG/Axv+ze+i+uCvoD8W+DsB
-						VlI96HcBvSsuWK9NnCBfq7jvd/jnNbFXQqIJgf14278HiQZ/TwAkSgC6FEyhDgzRYQFwiYBLAFRi7AuQdiBfAowIoJ/fJJYESO8/v68V
-						fxwEAN8jrbfu/c/Eib9++0/EzH/rxF8jAANLx6nWn3D1nwVgqBn5KdV/1fozefZS+uV3UP0317c//kzDVh2iwqX7KW/xXhrMAjBg3i7q
-						O3cnZbEAZMzcRr2mb6XuLABdZR/ABmo3bj21HbOWWo1cQy1GrKKPWAA+KFtGTYcupbeLF4sAvJo/nxoNmUcNWQDq95/tCcCTmVPo0d4s
-						AD0m0n3p4+gvXcbQH9H+868U/v/cttgN8jXMU+0LnMxSw5yp363bf1YUlbyS1+/4qp+a8xg/oX8JPcFrlrQcatB3ehUS4FoN8CXgjdIV
-						srQ6fftpkQCAPwRgNN+q+PCPU4QV/EdKwFgBfz+m6m8yfsvpQCZsOUM5Cw/Qs/krfQlAatgS9AjnsSGr6Im8NfR0wVp6tnAtw/86qofq
-						P8P/i8M2UuOyTfRqxRZ6vXIr5Sw6IgKgJCDYDqRWAlTsliCRAM7+izcE3rvMPkhdGdQNZHpAyTHVSABJTw2VwdvDqlrJL5vPEVkw882N
-						CPAtZECq3wLFgGS0BiloRluQiAADuGwU5hgJMKNDzchQOzb8hwVAjTdV039kAlBV8M8xKwASIwBYqZCo9iVIi2qbqhn8iwAw6NsJw7+R
-						KA/8HRt9vd8TP/bVBX8XpKpEh/4w+LogORwXsFeV7ChxfWztg/uo4rr/rpUAO+HHRB4rPG5Wwo+xLQNIEP7t3yH/vocvZoguFgkwCQpA
-						uCXI2h/A4B9OhAiwANgSYFf/bQmIJgItugyglhCA9MHUxhaAPgXUgeEfAtClb4lq/cHoT139zxg8XKr/svm3YCT1Kxqtq//j1MZfFoAC
-						9P6b035HTaeh+qRfqf4z/I+cPI927jui0fr3c604eJEKl+2n/MX7aAgLwMD5u6nfXLQB7aA+RgCmbqZukzdRp4kbqT0LQOqYddR6NAvA
-						8FX0MQSgfDkLwBJ6u2QxvckC8Fr+Amo8ZC69KAKAFYCZ9IwIwFQWgEn0EASgOwtA5zH0p06jflP4r6u+/3/8pCCh8/6f6jyM+SRxrT8N
-						0jIf1fiUvJLX7/9KSc0Z6X6yVz8pnXJljJlbAuKbEIRRoenTtstKAFqCIAFB+I+UgLGAfhMAvxcGfs54QL+EgZ8zQaDfz8StZyRoFWo5
-						YRs9PJBhv380CeAEJCAoAg9zHmX4R/X/qbzV9EzhGnq+CPC/nlJKN1DDoRuk+v9KxWZ6rXILvTliK709chvtOHeNPr0GCdDtQJYEGBHw
-						BCC0GjBxx3mG9EMiAj0Y2iUMHhhh2IvTGwG4ABrDWei/T0AGEeDUAAM4hQjwrVSyAbcAXQAwgFgDMoBZJukAsKXdBgCu4BygLvsCRARU
-						j//7E/xDwNAeFA3+IwSAv5ZJlfDPgYxI9V9iVgC0BOgVDDux4L8q8I/V+hOA/1CMcPmiZoG/jg2bNogGkxjod0N2ZKoC/OwldZVjkixH
-						XIAfT8KPkf34SbQISGRTNT/e+vehxEz9vUGo7eBvqDvaQFgATDwRiGgJskVAC4BLBNASxOBvYkQg2p6AqBKA6j/nk64DBf5V+88Q/h55
-						1I6/JwRAqv85qP6XUDoEQKr/avJPxpBKdeiXt/l3NA1kAZCxn8OCYz+9A78Y/u3e/1GT7+7JP9Gus1dvURELQMESFoBFvgDkzNECMGMr
-						9Zi6RQSgMwtABxaAtLFrqfWoNfTJiFXUrHKltwLwTvFiauIJAFYAZlPKgFn0fN8ZSgD6TKHHek9mAZggKwD3dMUKAAQgDvgXAfh9wD/6
-						/h/rUuEE+RolvZKeT+3vZJWapGFqdqXGpuSVvP51XFjOatA257TrCV+TpPQop4aD5/sSYItAVRIgIrBU8tGItdIShPGg4RUAAX9rBWAc
-						EgZ/D/pP0QRki4kN/gr+J9nZdobK1hynJpUbarQa8MhgVP9X0hMM/0/nr1HVfxaAlJL1Av8vDdtIL5dtpNcqttAbDP9NRrIAjNpGw9ae
-						EgE4x/APCZDVgIAEqBODvdUALQDIwUs3GEoAHIcFOnrr4G19GAwlDDGR0e9jqMFtBr/ub46EPFgiAJBhOAWwYkVAVgUAwHLwFQMywzLA
-						WVXRTVuQAnCAuS8CgHotAeN3W6sAWgB0pPc/Bvyj7z9w6m888M8JVP9NjADg/msBwOqGn/jhPxb4h+NV/3Vs8PcEQEOmgL8r/LvzoN9K
-						eDSmC3pNbGgPx7TUuN7nhnM/OQmO63sE5QM/S/S4fnbE/bcRjP3Y+pOV1O/A/H7M30uEDMzj5052aRD+tQCYKAnAYVuqHcjeG6AEQIfh
-						344RAOeegGgSAAHogso/VgAgAKr635rhv23PXP6eLAAZBXwfi2T6j9n8CwHAwV+9WABw6m9m7nCG/xFy6Jc/958FwJr8Yw79KhmlN/9K
-						9X+W9P6PnDSPZixYpZH693X9/MvfqGL1ISpkAchlARi0YLe0AUEAMmdto97Tt1LPaZspnQWgy8QN1HG8EoA2o1ZTy5EsALICsIzeG7qE
-						3ilhASha6K0AvDR4ji8AWaoF6LHek+hhFoAHWAD+Ki1AWgCqC/9t7k74Rx7qmLh5/5IEnvbLOdW4Vc7/rLEpeSWvfz1XSmpOgwapOX9z
-						POmrnRQke2ItJUCJwGvFy2VK0PiNgP5gxvLbxkr1XyUoACcd8B8Gf5VJCEO/ncnbztLk7WdpwOKDVK9wddyrAQ9zHmUBeGLIKnoqfzU9
-						U4Dq/1qqV7yOGrAAvDRsAzVm+H+1YhO9UbmFmozYItX/d0dvp48n7KTDn93QAqDbgRj81ebg4IqAkgC9QVi3BE3ZeYFhhKGfwR0B0Gcy
-						0Gdxshl+oscAFEMSg45A0WL1uRAEfC0IAeBGoBSgKsAKCcAhVgp4IQEAZG+jsCcBZjUAkA4JUC1Bal+AagdS7T9+zAoADhkzqQr+ZSSp
-						FXy/uODfRO6ziuxxCAmASAD2QlipKfyHwd8F/6bdxxYAOzb427FB1QbYAPTy7ztWqgP7LlD3c6IacX1+9WLLQDjq54hPCrzHDY+hjv+4
-						Kkn2Jgnhd2HF/h3ZMtB5yBgWgJKgANhhAUDCEtBOrwaICIQkwLQCBdqBYoqAgv9g1Ox/af/R1X/V/88CwPcHc/+NAGDuvwgA2n9Q/Zfe
-						/xHUt1Cd+hse/Qn4l9GfI6fqzb9aACbMpuGTWAAmz6MDR05ppP79XXN3nREBwD6AIZYAZGES0PQt1HPqZuo+hQVgkhKAdhCA0SwAsgKA
-						PQBLRQDeLcUKwEJ6PX8+vZI7j17SKwAveAIwmR5nAXik53i6vxtWAEaLAPxz+wTAvwjAbw//CZ33z3lSRn4mrPXnbw1Tc+prXEpeyetf
-						35XSNrvY/eSvQdr3p4YDZsqhJk4J4ESXAC0CWgKQNmM3UvnqwzQW4K8jVX+TTSdoPKBfwF9FwN+q/E8E+JsY8Lcq/5MF/P1MYQFAsELQ
-						eTqmBS23JCAsAmo14JFBK+jxISvpydxV9DQLwHOFa+iF4rWq+l+qBOAVFoDXKzdr+N9K747aRk1ZAD4cu4MqN5ym89IGhJUA1Q7ktQRx
-						/NUAJQDeagDn0Gc3KQdAw1CioF8Fb+vLcOTM0uCtAiktBgxAWRABflmJgA84qrqJQ6kUyBoJMJODzLkCgGrTbuNJwFRbAvbKab8uATDT
-						fzBJSKr/VrCSUBX8y4hSC/7R+hMX/OO+YwXAxMC/FoDg5B+T6oG/Df+JAP+6gP74Qd8F8376LrWjn2vxhL92dRK+X+H7H/75/FhCwI+T
-						J8Ec8ziGoT9abAnwfo/4nc7n3//Q2dRJVgFKdBwSYIsAwz8CATBRqwEM/7oVyBaAmBLA8I9AAGwJUJN/lADI5l/+nDT+utL+wwLQCbP/
-						RQBKqVu/UhYAnPxbJqM/ZfY/C4BU/1kABmDzb8k42QDsH/ylq/8sANj8C/hH+w9af5av20bnLn5OP/549536G++1/fQVKly6j/IX7aXB
-						IgA7qZ8IwDbKMCsALABdjQCM0QKAFQAWgI/Kl9P7w1gAShbTW0UsAHkQgLnUCALQf6YIwLPSAgQBmCgrAPd3GysC8KeOI0UAEg7/v/Ip
-						v8g/tSxMbN9/l3KqnzD45ySn/iSvf+2XtAKlZp+IePLXMCmdC1kA5noS4N4XoCWgiglByMvFy6jb1G1KADYqARiPhOB/gs5EgX4TA/x+
-						IoDfRIP/VDs7ztLYzaep7eQd9IjZHxCSAFX9X0FP5K6kp/NW0bMFq+n5wrVUnwWgQek6enHoelX9L99Eb7IAvM0CoOB/G8P/dvpo3A5q
-						OXEXHbh4Q0uAaQXS7UCQAAZ/byUA8K9fNucGzN57yYL+Y9RvqUp/BqoByDKV/vp2wLIT/LIOA1o//hjEgyr+OrIywFFAxKDDMSsCABxs
-						WpWpNhp+7YlBZjUAkB3eF2Cq+Wjz+SgE/0EBULLQXKI+5xMc/MUR+A8JQDT4NyJiJMATgSrg37T+mPjVfxNd/eefHfElIBgzdSka+Nvw
-						bwO/SaLBPwzCYWAOA7VKAgE/wXHfXz/hn88k/DgEHjuO/bgiLvA38fdiBH93IssT1osAdMoukUTbE6CiJMAWAb8diOHfkoCYIsBQj5hV
-						ACMBAH7AvxGAVt1V/78RAHy/jvy9RQD4vnaV6T9YARhGvQaVU+8hSgCy8jD7X1X/RQAw/Sd88u+IKar9Z8x0mjJ3Ge0+cIy++voG3bz9
-						jeTnn38/03/C16nLN6hICwBWAAZqAcietZ0yZigB6D5lowhAp/HrrBWAldRCBGAZvY8VgJJF9FbhQnpDVgCUADQYAAGYTs9mTaOnsAeg
-						FwQAKwBj6d4uLACdRtI/tfsV4F8EoO7g/w/N8+jJbok77At9/88lsO8fB3416dz5f9KYlLyS17/eq2GbzHv5Cf+D8w+hBknpWakEIC4J
-						cK0GBCXg+cEL6d3y1TR8zREN/n4M+KvgQLFQDPjreMAfAv8I+NeZtuNTSZkeGxpeDYAAPM4CYKr/zxeupnpFayilhOG/dD01GraBXi7f
-						SK9XbKQmw1X1v+morfTBmG0C/80n7KBPJu6kkRvPiACcv/YNnUN0O1BgRcBIgI4ZF3rs8i3KWwmYP8bAjxynQQz3g5brrLBe1hksbzsp
-						Lw/kDOBAECANRgYUQGkRkPYgBUIAHQAr9gegqt0NbUEMuxhFCkiOlADVlw9ob8FpziKAk30B+VXDP0dLQ8QKgA5OJ0bC8B+e/OMJAO6X
-						jtr4WwP453itP5ww+MtjouNV//nxCkz70W0iNjSa+FAZCf42mAbAFSDrSBh2bRAOA7MC/ODbXOD9e0n4Z0H81iBErwKEEnhcOfZjHhYA
-						E7MSYFYD5PfIv/8u/coZqEslnggw+JvYewKMCATagWKIQEACGOQxyx8JSoC1CuBFbQBu010d/mUEAPDfCdN/ckqoW6j/HysAmbm2AGD6
-						jy8AMv6zQgkA4H/+svUy5//GrdsC/bdu3/Hyt7/9TeP07++6cuNOUADmGwHYRn0gAFM3KQGQPQAQgDXUlgWg1UgIwHL6sIwFQFYAIAAL
-						RABe9QRgBtVjAXgueyo9mQEBmCAC8GD6WLoHAtBxBP2ztP9Y8O+a9lNN+P+7XxH+/3uzXHq0c7kb5Gua9nlOFqlhvktJy/yjxqPklbz+
-						9V8padl9HX8INUpDjAbNmeJLgL0vICAB8e8LeLL/PHq833zKnrOLJgD8Jbrqb7JFrQAo8A/B/zaVIPyb+BIwbUc4SgCm7VTJX36EXitb
-						LyKAqUGPDmIBGLKCns5bSc/mr6LnGf5R/W/IAvDS0PX0MgvAqywAb1Ruorek+r+V3hu9jT4Yu52ajVfw33ryLkqbuocOXcIqwDd0HuCv
-						Nwb7m4N1SxADf2BFgINVgGVHrjDMM/hzBjPMD2HAzzVhOUCGSE7y+07y29UtPg5vU0KgZUCvDnggxRIgqwKAIb7FioCqdiqAlZYght6u
-						c49IVdysBgCoAde+BOCUXlTxGealrQfgv4c+dMC/JwAB+FdRJ/+aKAmQjb/89SVaAuKBf08AcH9DiYT/SPB3wr9OZNtPKPL4+SsAsgqA
-						xxUw6Yg9ncYGUnuST7TYE3NsAXBJgA3QtUk/WV2qWYIrDNHi/r4S/ByhmJ/PTBOy45IAkwgBQDwhixQBxIgAfqfdS6ZLO42RABGBLBYB
-						tAQFJMBfATAS4N4cHJIABn47RgJQ4Zcw6AckoCtu1dsgAPgatgB0zi6mrmb6D8Z/6v5/IwAy/cesALAAYPznYDn8awINnziH1m/dQ5e/
-						+NICf1X1F/j/5g7d5vyer9vf/UhFS1gA9B4AWQGYu52yZ0IAtlAvrABMNgKwltqzAKRCAEaspOYVy+nj8qV6BWAhvV0EAZinBGDgLGrQ
-						fwbV7zuNns2CAJgWoHH0AASg8ygRgH9pX/m7hX/k/kQe9sV5stNQJ4fUNA1TszI0FiWv5PVv48rJyfn3KanZG1x/EDVK+4HUkP9Bc0qA
-						LQIxJSC4GvBQ9hy6J2MWvVaygspXH/HAfxLC8G+q/qba71f9TSz4tzKVJSBY9bfAnzOdwd/OjJ3nqGTVMWo6YjM9zgLwZC4EYBU9V6Cr
-						/8Vr6MXSddR42Hp6pWyDqv6zALzDAtB0tKn+b5fqf0sWgDZaAMZsPqtXAVREAGRFwL03wBYBbAou33BagB6rAUg+sgo5GQwDf96qU/wx
-						fKuTy/FEgMXAXhWQFiHAE6rHgCIBIQOmauQoNgjLagCDL+DYrARAAtTGYLUvAKCOar3aGKw2+gL6vVUAhn7Erv7j44wABOFfBVIhLUCQ
-						AAP/nNrAPxLo+08w/JsxnyaB6r+JPL4ASh84Peg3AaBGiRP6+Xdowz4SActhmI4SF7iH47WaxUi/GiYgA2hLCiX8c0ZLVTLgPab6sbdj
-						/248+Lciv9MJa1kAhlIXBn8kLALSEuSJQFACoouALwCpPfMkYQHAdB/EkwBrPwAEACsESgAw/jOfvxcEoFgEoBvaf/oOpR79h1HPAWr+
-						vzr8SwuAjP9Up//mVUykBSs20KlPLyjolzD0I1oAVBT8f/PNtxqlf5/Xtz/8xAKwl/IX7aFcrwUIArDVE4B0LQBoARIBwBSgEStkBeDj
-						MgjAYhGAtwrnKwEYMkcEoCFWAHIgAFOUAEgLEAtAtzEiAH+GALSr/N3Cf6IP+3q6WwXVS+3rZpAaJWctWEhjUfJKXv92rpfa5vx3/gO4
-						5f7DqH5SuhTI6YZVSgDHJQHhlqAX+fb+zNkiAY/1nUe9Zu5QAsDwPxngrzNlqwlDf0AAlAQo4PczLVT5nw7ot8B/hpdzkpm7VGbvPk+F
-						K47QW5Ub5TAxtP/UZwFoWLKWXhq6Tlf/N9Cb/P63WRaajtxK77MAfDh2GzUbv50+mbiDWk/aSW2n7KZ2LABdZu2jo5dvWhKg4F9kgAP4
-						NysCRgiMCEAC1p+8KtBfwNBfuPokFVkpXH3KS9Ea/+UChGUAyVvJYUFQInBSRACrAlgRQCACACYBI4YfTAwy1U6sBABszSFigGRUzXFS
-						sYwK1eCdymAuEsBBKw/6+7HZ124DMisAzRj67ep/1fAfjOn/R9Ksk3/t3n8X+CMu+I829cfu/a8u+NvwXy3wjxIbXO1pOGHorS7wu+Ae
-						cQG9HfPccb2vxnHcDyRiZSD8c3LCj0M4SpQsIdDP9fBGYSSaCNgCgPSaz8+X/uVKArQICPybdiBrX0A0EfAkgOEfgQCEJQCjPA38ByRA
-						WoGCEoCXW7MYQBiMAHTMNAJQIgIg1X8WALT/eBOA8nwBwAm/qzbsoEuXr9KNm7dVDPjr2FV/P79vAfjuRyMAuyl34a6gAEzXAjDJEoAx
-						a6jtqFXUCgKAFYCwAORpARg0U1YA6uVMFQF4KmOS2gPQfawIwL1dRtKfO6AFqCJB8F/4q8J/wjf9pg+n59MGOtmjZsn5umH7nP+vxqHk
-						lbz+7V38R5Dq/uOoWer3qmQJ0JuCq5CAeDYHp+QupntZAO7JmCki0KhwGZWuOOSAf18CpjL4qzDwc6YJ9PuZLtDvxwd+FQP8JrME/s/R
-						HBaAuXvO07y9F6l41TF6d+QmXf1fS41ZAF4pW0+vswA0Gb6J37eF3hu1hT4Ys5U+HrudWozfQa0m7aA2k3dK9b/DtD3UacZemrTtU7rA
-						sI/4IqAEwAhBtGlBEIGxW84J8BcjazhrT1GJ5LS+5aw5ze875UUJwWlPBPIhAyICaCViGZC9Aie1BKC6CqjUoAkAAugIxCrIxahQaQny
-						JEDtCRAB0ECOfn2sBIgEMOAHWoBEAvQUIAgAg74a/xkd/sMCYMO/vwLgrwKIAHDkQDM7ccC/Df42/MumaC0AIgF4LGLAfzTwR+oC/AMw
-						bMG9K2G4RlwwXhXgm/cnOsH7pleprLh+Jkn4ceB4qyMm1uMnk7GshGXAlgBE/d5CKwH8u+1RMk1GaqIVyMRbBQiLgFMCCiVmc3CkCORJ
-						nBLg7QcwEjCIWvNtmx5KAPD57VgiOkgLkBYAjP+U9h97AlCl9P5PnLWE9h06Qdeu39TQrxKt6v+vTQBuffeDtwIwZMFOFoAdQQHAHgBZ
-						AVhPHcetpXZjVlPqaBaA4UoAPhq2hN4vXSQC0KTAEoCBEIDpVC97Kj2XOZmehAD0nKAFYDTd23kk/anDcPrnNAhAdeHfEoAA/GsBqGP4
-						T/imX85Tie3752S10BiUvJLXv92rYVr2FPcfSPUj5wNkTqAGkIBBRgI4DP/ufQFGAoKrAfa+gBeGLFQC0FtJwL19ZtFHI9bJpCCRAE8E
-						/BWAaSYB+FcV/xnhRAjApwL9Xhj+ZzP4z917geH/Ai3Yd5EW7r9IizmjNp6iNhO308vD1tOrZRvojYqN9BYLQNORm6X6/xGq/+O20ycT
-						tlObSQz/U3ZT+2m7qdP0PdRl5l7qMWc/Hf38Jl34WkmALwPfRAiBvz/AXw3Yc/5rKmXIR4aus3Oahung5VIWAjvFLAUQAbM6gJUBEQHd
-						HiQrAloCzOQgjA4FcAKEzEqA7AsA/AKGAcgYl8kgjbn6AQmQlYADMsEHcA/Y9+BfC0Bg/KeJLQHVhn+VwAqAhO+fjvT963jwrwUgkfDv
-						9fzrhMHf7vW3QT8cF/jXBPptoEYV3dVy4wJ8JAznEcHzJp4siyfu+xBOWAhMwj+3/VghQfgPR0sAx/4dKPhX52fYyeDfK4K/i57j1ogA
-						mIQlIKoIWPBvSwAO7DLwHyEBDPV2K5AvAVoAOK3TB/HHDKFUHADG8N+eZcIIQBe+D137llL3/koAAP5jpi6g7XsO0dWvrtP1m7ckftU/
-						KAAC/aHYAvDNnW9//5uA9QqACMBcFoDZ27QAbKZeUyAAG6jrBCUAWAFIHbVSBKB5xTL6qEwLQPECEYDX8+b6AtCPBQArACIAE+nRHuNZ
-						AMbQA11H0z2dR9Cf2kMAyukfUy34F/CPp/IfDf7zNfzXjQDgpN9HOyfwpF+kcyLn/UsmafxJXsnr3/aV0iLnv/Af1wXHH0nN0r4/pfSf
-						oSUgympA3JuDlQg8M3A+/ZUFAIEEIE8PWED95u8R+J8aqPwD/IPwH1n1N/Gh304A/jmq8n+e5jP8QwAWHWABOHiJlhz8jJYd+oxGbjhJ
-						bSftoCaVG+mdEZtU9Z8F4GMWgObjt1OriTuo7eSd1G7qbuo4jeF/xl7qNmsvdZ+9j6bsOOcLAG5NLAGIEAEWBLMiMGv3RSpj6C9bf1pS
-						vv6Mjv+yet8ZTwqCMqBEQNqDtAiYPQKeBMjeANVnDSgCCJmqJwBX9gQAjAWcUU0/qNqBOIBw7AlozRLgtQIx3KPnPyb8c/wVAFX9lxUA
-						hn41Aagm8G+F7xsEQG3+DZ74K/AfipyMrOE/YeAfgn87NnT64O9PtLGr2DbUhqHXj902UzXwB6DeThjkQxlY46hN6eE474OV8P32fib+
-						mSOEAI+PFftxc0uAiv/4B38v6oRtFW8lAL9nFuNuAysDEuASAZEAaxUAAmBLgL8foCAoAQzxiHs/wBAJBMBIgGr/GUJp/LHtWBogAPK9
-						Mgv5fhSLAAwcOp4WrtxEZ859Rl/fYOjXAfTbAmCq/n7l3wJ/D/6/pdsM/oB/5Jdffr9jQE9fuUGFi/dQ/kIWgM4a7vsAAP/0SURBVPkQ
-						gO0hAdhI6ZM2UJfx66jjWAjAamo7ciW1rFxOLUQAFtP7JYvonaL51KRwHr2eO5deGTybGg1QAvACBKDPJC0A4+jh9LF0X5dRdE8nCECl
-						EoC2vw/4Rx7ulNiJP08ket5/as65Vzvl/O8af5JX8kpeDVIzH+Q/jB/dfzDVT0qnXBaA2bElICQCkRIQXA14vN9cSwJ8EXirbBVVrDni
-						V/050wH9VmbsQHTFnzMT0G9llkC/H0C/yZw956TyP3/fBan8S/WfBWAJC8BSDgRgxeHPaSUHm4oz5u6jD8dspY84zcZtk+p/a5aD1Ck7
-						qcO03dR5+h7qOnMvpTP895y7nzLnH6Bjl2/Sxa+/5dyRBIRAw7+5VRuFv6HPrn9H1+78QNfv/Eif3/hObm9+p3Ll5ndycvC2s9do1p5L
-						VLnhDFXoGCGwZQCtQmZFICABuiXIgJiBKJEADkBVKp4AYS0BgGUZESqArVcCZgLSFbibVQCzH8DE2/wbIQB6/CfgX6cNwrBvj/9Eagb/
-						KjL5Rx/6BYlR8WVACQB+RhWv71+n2vDPj50L/JF4wN+GVzfwI7UEfv7dJw7wTdygX9OEfw4Te5VDJboMiADY0eBvVgFM5HeB34v1O5Lf
-						Gf9ebQlAepbPpa79ggIQEAGGf7TfIJAAWwTCAuCJQKgVyC0BSgA8EZAVADUBCALQnj9PnQBcSD0HltPEWUvlpF60+HzNMRX/6wD+G+6q
-						v1MATNXfAv9v7nxH33z7Hf30088ap39/19aTn2sB2EWDAwKwRQSgJwtAt0nrtQCsoXajV1ObkSuo1fDl1Lx8KX00bDG9V7KA3i5kASiY
-						R6/lzqFX+P/GRgNmUEq/afRC9hQRgCd6jafHWAAeSh9D93WGAAxXAoDqPwQgbvgP9/z/evB/X7uhToivcdKH0wuJnff/w4vtch7Q2JO8
-						klfyMlfD1Jx+zj+aGialexkLwJxqSUCsliDcPpQ1mwVghpIAazXgvsw59PFI1RY0fftpmgHoN9HwP1PAX2WWxAJ+CQO/zhyAv868Pedp
-						/t7ztEALAKr/Sw4Y+L9Ey1kAVh75nFZxVh+9TGuPXRYpKFl1XKr+rSZul9WBNBaAjtN3U5cZeyh9Ftp/9lFvFoA+8w7Q9F3n6eJ1Bf8q
-						3wZXA0z4Y64z9P9YzYN1vvn+Jzpw6QZ/nwsiA0YIsEowjIVgqEiAimkLwgQhXwJOyFkDA5YreFIVUw1ADLMiARqIUSUXeBYJOCTAjf77
-						VIbyNpCAqfuoFYN9i8mY/OMLQGACkAf/oeq/gX9kmpoA5E0B4q+PKAFQ7UeA/wgBYPg3AhCAfy0APvyrCPyj8s+B4Ej455QVAB054CsU
-						D/x1MhYw8CNxVP3rCvxtQK4S9pe54D3euGE9EcG0qog4fh77Z0XCQhB+zOzHNbwxOBz8bgICYGKJQO8Z25UAmAD+GfxNIAC2BHTMKlLJ
-						VAlIgN4L4NoPkNYLc/0hAUoAPAnobkePAGUB6JRdJC0+u/Yfpa++vq7A/8Ytv+ov1X4tACYRbT9+/HafYNXfCMAdFoAffvhR/0v0+7sW
-						7DpNBXoD8OD5O2jAnG3Ub9ZWyp6xhXpP3UQ9Jm+gbhPXU+fxa5UAjFpFbUasoJbDl1HzsqX04dBF1LR4Ab1TOI/ezJ9Lrw2BAMyilyAA
-						faeKADzTZyI92Xs8PdpjLD3YFQIwkv7acTj9sV0F/ZO0/9z98P+nNgme+MN5tv0QJ1vUNCmpWZkad5JX8kpe9oVxWA1Sc1a7/nBqmpSM
-						0dRgoEsCOAz/1W0JejFvET3QZ5YnAXZLEPJ4/wXUe9ZOJQEC/n588NfR8G8yZ7eJD/9zjQAw/C8A/Ovqv8A/R+D/sAX/nHXHr9CGE1/Q
-						Rs4qfr1y/UnqOnMPtZ+6izqxAHSdoar/vRj+Mxj+s+YfpP6LD9PxyzfpEkP+xetYCfBXA8yKwNcM/j//UrteWnw2zhGYsvM8VW5kEdh4
-						lspZBEx7EPYLYNNwEQuAkQDsCxAJ0GcH4OAxHCCGPQGokioJYNhl6EUbDDYFyyoAB1CNlQBZBQCgo3VHYJ7BngPYlzMAIAO2ADD4q/5/
-						tWJQFfyLAGAFwATVf/6eZvSnJwIJgX8VBf7BYCVEgr0RWgCUBECSNPxzIE12PPC3Y8BfxwZUu3rth6FWxwZd7OEwiQRlBfombph3xQ3n
-						dmSqVC3j+roD+X6bRP480WOLkEQ/PrIaEIr9WNvQ70qkCPhtQd3zxlI3exXAEgATbxUgu1gSVQQCEpAviSkBAQEYQv2Lx9KilZvo/KUr
-						Av0mX9+46bX7SMsPYrX8ILGq/qbyj3GfEoA/Qz8C+Ee+++579Q/Q7+zCv7dlK/Z7/f+D5ikB6DtzK2XO2CwCgP7/bhPXiQB0GLOa0kat
-						VAJQuYyalS2mD0oX6RUAFoC8OSwAs6nxoJn0Uv/pIgDPZ05WKwAsAI90hwBgA/AI+kuHShGAf2wzTATgH9pY8N8yFvwb8P/14P+fWyV2
-						4o+kQ6GTKWqahqk5K5MjP5NX8opxNWqT8d/4j+XL8B9PjYNDwrIneRJQu30BSgQa5C6iezMA/7YEWCLQZza9WLCUipYfpJkAf0kI/jmq
-						6m+F4R+xJWCutP8oAfBafzgG/qX1R1f/1wj8X6b1LAAbT35BmzibT31BW05d5durNG3nORqw+BClY/Pv7L3Ue+4B6jP/AGUvOEj9Fh3i
-						73WBLjH8q9yRQAY+v/Etff9TYntof+L/2HacvUYjNp2lyg1n1WoARMCTAH+DsCcBK0/Q4OXHBbzMKcI4MEy1Q6j2FhkPqqvishKg4RrQ
-						rc4HAKybVQDsB1B7ASAAWBEw8eDfEgBPAuKBf50A/HsCoCb/BKb/JBz+/RN/vRUAfnxcMeDoSYAGfzuu6r+JDf5e1d9KuBLuBn4LsOOI
-						C9bDwUby6iT8+QNNAuIRCv88rhjoD//sJv2wp8UOP5cl8nj6sR/n8ApAMDg5WyWwCjB6GaX3GyYSYIsATt61E5AAaQXyBSAoAQVeAhKA
-						PQE9WQLQDqQFAMkYXElT5y6noyc/pWtf31CxKv52r39AAHTF34z5vKWr/p4EaOj3Eq7668q/ybecX2pZvPgtrgtf3aKiJar9R/r/522n
-						/rO3UY60/2yS/n+sAHRlAeg0bg21H20EYDm1rFhKzYZBABbKCsDbBXPpDRaAVwfPosYDZ9KLEICcKTIB6OmMCfREz3EsANgArPr/RQDS
-						yrQAlOrq/90H/3/fIl9GdDohvqbpXMr8kLi+f4b/K8937P1fNeYkr+SVvKJd/If3Oudvrj+kmqR++wFqU7BIQGJaglKGLFQS0AsS4F4N
-						gAi8VrqCylYdUcBvsssB/5yI6r+Gf7T+IKrvX1f/D11i+L8UrP4f09V/LQAG/ree+ZK2c3ac/ZJ2fvoVrTl2hcZsOi3gn8UCkLPwkKwA
-						DFl6RCYCGQH4jG+v3v6efqnDCRrYOzB5+3kajtUA3RYkEiAjRPUGYZaAAm8lAPDHcMUiAAEAJAkQafDJAPzOPyxADGA2EhBYBZgOiFdA
-						jxYfgX6WAImGfyUAapUAMfAfFgDE2/yr4d8IQAT8I2hJggBgBUDHBf9mAlBt4L/64B8Z04Zig6iJB6r4Peh4IMuxgdeuhLuAPlbCYG7i
-						gvhw1OnTwbg+zhVsQK8qLimwf1YTEdYosR8zxHtcOa7HPSAC/Lw3MQKQueiIpM9CzrwDlD6gPCQBpV4CImAkwNsPYEuAEoCwBGAzr0iA
-						3hSMDb65ZRNp8cpNdOrTiwz8NwPgbyr+EQKgW35M289NqfrbLT+64m/3+puKv1f1VxH4DwkAvsblL77S/+r8fq6VB85R4eLdlLdgp7T/
-						DJyD/v+tqv9/2kYWgA3UfdJ66joB7T+rqd3olZQ6cgW1HrGMWpT7AvAuNgDnz6XXc2fTK4NnUqMB0+nFftOoXjYLQNYkerr3BHqcBeDh
-						bhCAkSIAf25foQVgKP2DtP/EC/8M/r8S/P+Bv0+ix30+2aWcXkjsYV9/a9A252WNN8kreSWvqq6GbbMHuv+YapaUjnmUMmBWQiWg3uAF
-						dE/v6Q4JCK4G3Jc1h1qM3kA4RMyTAM4cQL8Jwz/afbwA/jkLWAAWMvwv4qDyv5QFQFX/Gf69yv/nAv/rkeOXver/ltNXOV/SNi0Auxj+
-						d316jfac45y/Jm+fses8Fa48SgMXH6LBy47Q9F3n6LMb3wr8X/vmB2nZqesLqwsLDnzuSQD2BaAlSFYCWASUBJxkCcCJw4A41Qo0UODp
-						GIOSgiHATwZDDyagAIbV+QCopKsqO6rv7WcyrLMEoGpvJAAtP+YkYEiA9P+bCPyrKPg38QUgOAEoVvXfAf+o/nMgKV4A/5YAiARo+HdP
-						/vHhv+ZV/8SDvw3ALrCPlnhh3wX3JoGPk9WjUPTHRYv9+dHiEgLElwH/Z7IfCwTy6or9OLpFgH8n/PtBsvF70/HhX4f/Dkx6Dp1O6f19
-						AQiLgNkLEN4ToETAF4CABDD428EpvbMXr6Vjpz71QD9ajAAEKv9o+TFVf08A/Ir/TQ3//pQfzh1Ew78JBMBIAIM/oH/j9n1ylsD0+St/
-						V9OAfvjpZypbvo8KFu2i3Pk7adDc7Vb//2bqM3UT9Zy8ntInrqMu49coAUD1f+RyalWJ/v8l9PFQFoCSBUoA8ubQ60NmsQDMoEb9p1OD
-						vlOpPgQgcxI91Xs8PY4NwN1G0/1dWAA6DBcB+JfUYVoASunvY/T8//eoJ/zWJfzn0WNdEjzuM72Snk/kpl9JVrbGmuSVvJJXPNczOTn/
-						kc15o/sPqmap320YC8BsJQEJ2RewiJ7FeNBetgQoEbA3CBsReChnHrWbuFnGhs7ZpQVAt/zM1QH0m8yHAEjrzwWZ+b9UWn8u0nKp/F/S
-						lX9fAKTyf+KKav3hbGUB2MYCsP2sqv7vYgEA/O9l+N93/mvaf4Fz8ToduHSd1vLnTtp6lopYBg7w267e+p5+zdHZP/zMErD/MxrhSYDa
-						E4DzBXwJOEUFDG+5ODBs+XHZFKygCUB0lMEVYMuACwgGEKNazvAMAegiY0EPiAQAzgHrMhWIod6sAogAMPTLHgDAv14FwIbhIPz7wdew
-						4d9bAWDgt/cA2PBvBCAa/HtTfwz8m+jWJgn/fEYCTNU/PPWnJuAfC/5jgX9tqv01gX3v7WGwt2M+fuWp6sd8rhX7/iDB+61WpiT4may4
-						2oPsxyssASZBGVCia+BfBEDirwDIKgD/jlV8AegziSGRBSAgAX1VzD6ASAnAAV1KAHwJ4EAAMlQGloyjeUvX04kz5xXYWwlDv/3+66bn
-						nyE/UPXXLT9e2w9afaTdx7T8fOuHYT+aAOBjDx8/Q/OWraMRk+Zy5tGoKfNpzLQFdOb8Jf0vzt1/7Tx9mYoW79btPztk+k//2Vup78wt
-						lDV9E/WW9p/11G3CWuoybg11GLOKUketoDbDl1PLyqXUggXgI/T/6w3ATfLR/z+LXh44g17qP03af+plTaLn+kygp3qNp0e7j6GH01kA
-						Oo+gv3aopD+1K6N/bgsBKKV/aAUBCMG/VP1jwb8b3BOR/94slx7tnNhxn7KHIG2wkx1qnLTsNU2aNPkPGmuSV/JKXvFe9drl/J/onXP+
-						YdUwKb2xKTgoAbVdDXgS40GNBFTREoQ83HcedZqyVc4LMOCv4sO/CMDec6r6DwEA/HNQ+V9xGBt/P1PV/2MK/tH7v+HEZdp0wrT+KAEw
-						rT+Af2T3OZYACADD/wHOwYscFoDDn92gI5z9/Pr2M1/VerNvTS6sBMzaczEgARgXKhKw5qTeGKxagXIFtLAf4JjAUl8NRYAgfxUA7TIM
-						0VoAANsdAeQzMKJTQbucEDxVAb8RALwsMQLA8I94G4C1DAD+jQCY0Z9Iu5km1gqAFgBvBYDvS43hX0eN/jQJTf5hCFQjP60w8NuTfzBG
-						FYkb/BE81haY2iBbHfA34Gz67IMwHQnbUQHfBe+/SiLvI+ISAJEAK/bjZD9+YQEwsfcFyAqAiMBRL9n8nEeyFh2R2PAvwd9C7mjq3r9M
-						WoHsdqCgCMSQAC0AaO9ZuGIjnUZ7jwX1zjDkq+Bl/3UD/4B+k8iKv2r7CVT8nRLgw/+Vq1/R+q17aDTDftm4mVQxfhZVTpwjEjBqMgvA
-						1AU0Z8ma38UqAKr/w1ceoMJFu6T9RwRAqv9bVPXfa/9ZR13Hr6XO41T7T9sRy6n18GXUsnwpNZcNwAupadE86f9vkjebXh2E/v/p9GJf
-						JQAvZE6iZzPGe/3/D3UdRfd1YgGQ6n8Z/VPbUvrH1hCAEhGAuwH+kQc6DHNDfG2S4E2/DVJzLtVvk/P/1jiTvJJX8qru1bBtziOYnev+
-						A6t+GmJTcNbEkAS4VgNiSUDkasBjOXPoLyIBjpaggAgoCUAe67eAukzdJhOC7Kq/yYJ95xX8c6T6f+girZCpP4D/z2g1C8BaFgCz8XfD
-						iStS+Vfw/4VX/d+pBWA3B9V/BNX/Awz7hwD/l254AnDs8xt067vfbmTe7e9+ognbzkk7UMUGHCR2WvYEKAmwW4HUKoBsCgYoaSgCCKEF
-						AnsBei84zJB8iAFatQGJAKANCO05EABAPAfVfQC/Xf239wHY/f/2SgA+16v+mwQE4ICGfxNrBYDvi1kBEBHQ8G8LQI3h31n919N/DPzr
-						mBYSA/9ms294028Y/CUMrYgnAIBbR2z49TbWCizHAH5XnCAeX3LjjOtzI8QjHOs+mvtv/2zRRAAJykAI/ANRKwCRKwFuEZB9AAsPe8kY
-						tVgEwC0BpRIIQFgCIAdDR8+gpWu20Nnz6oAuD+pjQr8F+zryOnr9+dYDf13xD1b9/X7/qgQAH3P4+GmatWgNlYycRqWjpvP9nU5lY2co
-						AZgwm4aLBPirAAePndb/2ty914ajF6X6X7AQ7T87pP0H1f+cmZul+t9nKgvA5PXUfeJaFoA11HHMKmqH6v+IZdSqcil9Ur6Ymg1bpNt/
-						WADy59Cb6P8fhPafafRivymUkj2Znu8zkZ7uPY4FYAw9mj6aHuw6ku7tWEl/bqfbfxj+/7F1iQjAH1reHfB/b1qpG+BrkWc7l1KKgxdq
-						npzvcbaRxpjklbySV02vBqlZnd1/ZDVMu34y/kxJgBYBpwRwGP6rbAnKUxLwcNYs+ktPSwLiWA1AnhigRWD7GVqwF33/pvf/PC0+APi/
-						oFp/WABWsgAI/OvWn3XS96/gf+NJFoBA9f+qt/FXtf98Rfss+D94SQsAg/9RBn8Evf+/9YWxo6NYAIbLpmAlAcPWnRIJgABgFSCfJWDI
-						iuMMVcdokICTASMNQFgFmH9YtQFhFYAlQFYBGMTRCoQVgHa6go+KPkD/E+n/17HgP5oAqFUAJQBGAuTr6kA0fPjH91UJw3+EADD0eysA
-						DPomiYR/D/xR+Zdgc6kfV/Xfh9HgdB8bYk0CbS9WX7zdK28DP2KDtMQJ45FxgbwzOFyuqjDQx5PwfQ3/LCYBEUAY+iNkQD9OA/h5bKIk
-						4JiAvxd+fiNKAo5KAgKgn/uRqwAsAXP3Uo+BFdRjgJKA7mgJMgIQkoB+haNp8pzltH3PIfriy68joN5PbOCXMOSr4GUL/DX8S7XfwL9D
-						ACIlQMH/+UuXadXGHVQ+bhblVUykgsrJVDRiipaAaSwAM/l9WAUwAjCXRk6eR6OnzqeJM5fIfbhbr8vXv6GSJXu96v9ghn+7+p85fSNl
-						TNlAPSap9p/OaP8ZvZLSpP1nKbWsWELNyxbRR6UL6f1iFoDCefQWCwD6/18eAAGYSg37TqH60v4zkZ7qNZYe7z6GHunGAtBlBN0j7T/l
-						9C9o/wH8c/5eev+L6A+unv9mvx78/6VtiRPga5NnupYx/Cdu4o9KTqrGl+SVvJJXba8GaTkz3X9oNUtK+4GUgo1QAywJqGVL0IssAg9l
-						zrQkwLEaYG8QtlYD7u0zR1qD2o7fJHsEIACy8Xc/wz9afw5eohXY+Guq/54AfE4bsPGXJWATS4DAP2dbqP3H9P7v5wj8m+r/Z9el8g/4
-						P375RrUP+Kqra9uZr2jkJi0BaAXCZCCWAGkF4tirABCAgQJIDEUCQgp8sArQS9qADlH6nEPUDbANAMdeAFToGdIxEUjagCAAUv33JQCb
-						gM3m33jgP9AGJKsMDP5YAdAR+HdW//10xWoFJwz/ERJgwb/p/a8K/iOq/nHCfzTwd8F/dcE/ANIM6bHihHpOngvkowQfGy25OHguHAf8
-						I66VAPvnihbnHgGOevx8AfBFAC1uCvzDMRKA53wOP+eRbIZ/xBcBvQqw4DD1HjpdBEBJwDBPAjKGVNKYqQtpzaZdUuU38B6GezfgW5HX
-						/b5+xAC/F7PRl+O1+2gBEAkQAQhKgBGAS59/Qas2bBfoHzR0HA0eNp6GlE2gvPKJlF85iQqHT6HikVNjrwLoVqCFKzbclWNBv/vxZxq/
-						7jAVMfwXLNxJefN3iADYvf99pm4IVP87jV1N7UetpFSv/WeJVP8/LF1A7xXNo3ek/WcWvTZ4JjUeMJ1e6of2n8n0QuZEeq73eHqyJwRg
-						ND3cdaTu/y+nP6aW0T9j828rVP+LlQAw/CO/Ffz/uW3iD/p6ulsF1U9L5MQfTlrOeI0tySt5Ja9EXCktcv4L/3F9GvHHVpt0zqf6A2ZS
-						SoQEuFYDlARUtRoACXhQJGBajVYDlAjMp46Tt8qKwBJU/40AYPMvwz8EQG38VSsAqP4D/k37jw3/aP+Rvn9PAHTrz8XrIgAG/tH6c/nG
-						b1/9NxdEBIeFqf0Ap1kC0Ap0SsaDFssqwAnKZwHIY6BSZwMYUEIbBMMPw28fqw2oO6B6zkHqOlsJQEfTBoQVgGkAfQb+KdgDsEcLgLUB
-						2Ao+NiwAdvtPQAAY+qUFSMO/EYAA/JtEwH9ksJKBuODf7vv3+//9qn+4+h8L/mtS9XeBf22h3wX71YV6V/Idkffx148nLiFA3FKA56c7
-						SgCwisXPXxNbAPj5bBIWAUB/OBESwOCPGAnog6qxFgAcyjVFV/mvXL0WCfac6NDvV/QRG/Crgn47ngBYEhBeBcAqw679R2jCzCXUr2g0
-						ZxQNKBlDA0vH0qDScTRk2ATKhQQ4VgGGjZnh7wVgCQhvCN587O7aEIxxy/N38r9vi3dTIeB/wQ4aMg/V/626+s/wP20j9Z6ynnpMWkfp
-						svl3NXUcvYrajVxObQD/FUuoRdli+njoAvqgZD41LZqr239m0au6/aehtP9Mouf7TKBnRQBG06Ppo+ihLiPovk7D6S9e9R+9/8VKAD4p
-						kvzdJ78N/P+xdR3Af/pweiEtwRN/2uacfqFVj/9NY0vySl7JK1FXSvvMvzZIzfnG+YdXw9TvWirjQX0J0CIQT0tQhAgoCWiYu5Ae6DMj
-						JAGO1YAoIgAJuD9rLj3WfwG1m7iFpmw9zQKA/n+1ArCGBWCtrv5j9Kea/KMEAL3/21kAdrAAqN7/L/3JPxdYAPTG38MC/0oAjl1W1f8f
-						EnzYV22vU1dv+6sALAEQALQCqQ3BJ6gAArDyOOWuwF4ABUreKgADUB9UPXUbkOwF0ALQhQWgE/rzZ+xncGegR5VfYB9Vf8C/CoQAb4ME
-						qElA6mPRMiT9/wgLhAv+jQDY1X+7/99eBTASgH0K3eYclvj9/y7418HmTqxyQHTihH8RAAZ/2fRrwz/DvrvnX4F/uN/fjicBDvC32188
-						AWCIjpaqgD8M8yYuqK9uXF/XGb5frngywD8jYiTHk5+QAJhgBcsEAmAygKVWYiSAn9t4fpvneDBHVPh5n6OTvRBREoD3jdjI/46s30kn
-						Tp+PhHo7FtyrxF/VF7DXMI+o/v7Ij0Fu3o6UAAgAXj5y4izNWLBKgL9PbiVl5g2nnIKR1LdwNMvLaJGAeFYBho2d4bUCYUPw8ImqFWjM
-						jKU0duMJWRG9Gy5MXFux/1OBf6n+Y+Mvw/+gOduo/+wt1Nfr/fer/93Gr6HOY1dL+w+q/20ql0r1v/kwtP8soPeL59G7har6//qQGfTK
-						gOnS/tNA2n8m0nMZE+jpXmPpCWn/GSntP/d2rKA/tytjAfCr///QUsG/av/59eH/X1oVJf6UX4b/ZxM98Sc1+3b9Njl/0riSvJJX8kr0
-						1aBtVhOWgIQdEibpOVxLwKwEtASp1YAGQxbQfRlGAqq/GoCzAx7OmUeP9ptPTw5cSK3GbqJxm07SalT/OetYANYfV+0/qvqv2n9Q/d9x
-						5qoH/2bjr+r9V+0/hy4ZAbhBR7UAnP/q7uuJxX+Ks/ZcoJHeKoASAOwFkFWAVWYVQAnAwKVHGZQYkHQVFNNPMlgCes0/xAJwkAXggBIA
-						vQrQYeZ+ascCkIqqPoN+67AAcJQAqCgB2K+CFQBOmgiAlgAtAtL/z9AfrP4H4d8IQGAFgME/YgOwjsA/Wn84fv9/NPhX41Dt2PDvV/91
-						liDVh/8w+Afgn4HXhv5Y4O8DP4NzqAUnDN8ucEcKMCLWBK/HiOvzqxP//uD+qalUdowIKAHAXhUVWQ1wrgiozeyILQIRqwAM/ia+CGjw
-						N+HnvYRfHs7Av/jg5zLq98vb39ONb3+kG7e/VVBvAT8gvkrAt15X4zr92MDvSjQJkIO+LAE4d/FzWrRyIw1msO85sIx6Dy7nVFDGkAoR
-						gKz8ESwBo6q/CiASMMuTAJkKNHctjdlwnMZydn96Vf+L89tcqPyvOnAuAP+587fT4LnbaMDsrdRvpl39R+//WkqfsIa6jFtFHceslM2/
-						bYcvo1ZS/V9EzUoX0gcl86gpw/87+bOpSe4sem3QDGo8YBq91G+qtP/Uy5xIz/YeR0/2GEuPp6P9ZwQ90KmS7u1QQX9MHUr/LKM/WQAY
-						/pE/tCiU/F2LXxf+/6llYeJP+eU80yHfzQI1DjNJWtZrGlOSV/JKXnV1paRmZbr/CGuaHErJGONJQHwtQaHVAJEAWwQWUgpLwL29jABU
-						bzUAAvBQzlwWgAUiAM8MWkTPD1lCzUZtoBHrjrIEAP4/p41aALacuuL1/tsCsMcWgIvXvN7/IxyBf937f+2b7/V/R3fXdeKLWzRq0xka
-						oQXAOyV4jRKAglXHKX/FMRoCAVgGATjGAnBUKqBZiw5TnwWHqDcLQE/TBiQCcIA6z9pPHWfsY1hneGcBaMuBALQS+N/D8K/iwb+9AiBt
-						QOpzvBUAHX8DMAsGx7T+uODfEwDT/6/hP0IApPpv9/778C8CoPv/ZQ+ADk5FNqka/o8F4N9r+2EARcIn1xrwV/Cv4vW0M+AiQfCPjIHk
-						qqDfBeAuqJfYElBHcd0fJFICTgQSEAEL+MORlqBleC6r2AKgYkkAP88RwD5eR7vckkOfs+Tf8IE/nDs/BCA/JvQHYB0wr6Hdez2+mCk/
-						4a+JXPnyGq3etFOgvWvfEkrvW0rd+5VSjwHDPAnoM6SSMnMrKSsPAlDFKkDFJCpkCSgegVWAabIKMHQM9gOoViCRgAlzaOSS7TRq/TEa
-						g7AEbDj2+W8y+hjjPtH2U2Lgf6GCf9P603/WFurL8G82/vacvE71/o9bTZ3GrqQOo1dQGqr/0vu/2K/+F6H6P4feZgF4c8hMr/3nxb6T
-						ZfPv8xnj6emeEIDR9Fi3UfRwlxF0f8dK+ouu/v9TG1T+TfVfwf8fWhTQ3/2K037+4ZOCuoH/TkUOBqhdUtJyems8SV7JK3nV8fU/8B/d
-						jPAfYW2C8aApmeMdElC71YBICbBFwLUaoETgvszZ9FA2BGC+TAmCALyQu5jq5y2hhgXLqWnlWspfdlAOBNusBWAb2n9k8s9VXf1H+4+Z
-						/GNv/v2a4f+6wL8RgO9//Fn/l3R3XT/9/DeauO1TGrnxNA2XiUDYB3CSSlafpGK0AclmYL8NCKsA/bUAoP1BNj+yAMgqwNyDeh/AAWkD
-						6sjw316vALSdqlYAbAEIVP85bfhjVAsQPt4WACv8NQMSgBUAnU4sAhKWkM4iInFU/xn+jQAA/o0AGPg303/MBCCzETgC/jkR8K8j4K+D
-						mfMSLQHR4D8a+NvwXyX4W7FbacJw/VuAvpfQ9w7ft3wWFleCQsASwI+LSTQZAPiH44uAWt2SMOzjeW6Af9+F63Q1GvC7cvuOA/iDkB4B
-						8qZSH357nLG//pfXrtPW3QelEt85W50yjPMGuuRg7GgJde8/lHpwaroKIBKgW4FKWAJKR0+TViA1GUhJwIjVh2jE2qM0at1RGr3+KEvA
-						MVqw51P67sef9L88dX9dvXmHJm44QiVL7Mq/6vsfNHsrDQD8z9wkrT8ZuvWnB8N/urT+rKKOo1H9X05thy+l1rr6L73/xfPpPa/6P1Oq
-						/y8PmEaN+k2lBrr6/1zvcfRUzzH0RPpoerTrSOn/v7d9ubT//DG1lP7Ra/0p1CmgPzSHAPy+4f+pTiWJn/jTNnsamEShSfJKXsmrzq9n
-						UnP+F/7jOxDxx1iLpGA8aNZESwKq1xIUbTWgPr//HkhAj6kOCbBXA3wRuF8EYA492neeCMDTgxbS80MWUUreUnqxcBk1KlpOr5aspLcq
-						1lDOvL0yOnQ7C4Cq/l/V8P8l7dUCcIAFQOD/opr8YwQA8H/qi1v6v6S789p06qqsAqClQdqA1rIErIEEnKAiWQFgARCI0gKwRPdAL1IC
-						kAEBmKcEoLu0Ae1nAdhPnWayAOh9ABAAtAG1YvD/ZNJuDkuAUwBUIAAQhzS0AZl4AoCvqyYNIR0RbyVASQCmERkBQO+/9P/PVWcWVAX/
-						vgDEhn+799/0/ZsY8LcT3vhrz6RHPPjX8eBfxwN/R6qCfrvqH678O8HckcLVp6sZfE70RH4PN+w7w9BvAgGwo+D/uAo/b815FjFFYOkx
-						luCz0tKzj/+Gv7gVG/hvhvOdDl6+80MEnNuvS6zWnIi4Pr6KYJzoxu37qJLhu1NWIaX1yqN2vfOoQ0YBCwAnq0gkQFYB+pWKBPQcMIx6
-						DYIAxFgFKB7DAjCWBg8dzxIwnnLLg61AxWgH8lYClARUTllIlasPU+WaIywBR2gkS4CIAOfYZ1/TbX6c6nIt4MeffqHtpz6n8uV7/co/
-						wz8m/vjwj6k/mymb4T+T4R8bf3t6rT/Y+LuSOoxaQWkjl+nef8z9XyjV/w+K5lHTgrn0Vt4sqf6/NnA6Ne6P9p/J8v+b2vw7lp7sPoYe
-						6zbSq/7f076M/pQ6lP5F2n9U3z/AX2JX/x3AnsjUFfw/3XkYKvXO//trmoapObubdO78P2ksSV7JK3n9Wle91n3+nv8Ib4b/KGuTlPb9
-						qX7fqQz/My0RCEuAEoGIlqAYqwFuCbBFgOHfWg24r88sXwD6z6enBy4QAVArAMuocfFyeq10Jb0xdBW9VbaG3q1cS91n7KBJW07JSgAq
-						/8je81+p6v8Fu/ffF4ATLAAXv/5G/9d0d15yLkCgDeikWgVYowSgYOUxytNtQIPQBqR7oz0BkDagg9RTC0A6VgAY/jvN2Megvo/aTd/L
-						MM9QL6DP4M/wLwJgVgJ0Wlvw7wuAFRYJnC2AeC1AngD4EQGIWAHABmAjAL4IdEdYAnpgM7MkNvx7ApBI+GfYD/b8h6v/kf3+ngww6Icr
-						/9HAvzrQ7wZ6zhpX+ONN5HNrFgiAhAHfjlMArNjwH1wJ0BIgIqCev8hgBv6iVSdo0o7ztOroFTpw6QZdufmdD/BW4oJ+V27fCQC9P35T
-						JQD8rlhwHy2Xv/iK1m7ZLdCNKn8aA7+kV66kXe98ap+RTx36FIgUxLMK0Cc3chVArQSMk70DaAWCBJhWIJEAWQmYSqVaAipmraHyVYep
-						AhLAGS4icJjGbThGl/jfws+vf0NXb31L3/6Q2NUATDbbf+4qjV1zkIYu3ePBf74H/9to0BxV+e/H8J/D8J81bQNlCPxj6s8a6jp+NXVG
-						6w/Df7sRqvrfqmIxtRi2iJrJ5J959B7Dv6n+vz5oOr0i1f8puvo/gZ7LGEdPS/V/FD3SZSQ91Hk43dexgv6aNoz+6LX/mOo/4D+f/sD5
-						O+n9d0N7ooLv9WS3xMP/E13K6YXUfs7/82uenBspqTl/0DiSvJJX8vq1r4apWY35D/Fn9x9ozZLSfjDV7zc9UgJquRpQb9A8hnwtAaHV
-						gMApwpz7+sykh7JYAHLmsgDMUwIwmAUgFwKwlBoVLaPXSlbSm8NW0dvlq+ndirX0wYh11Gz0Bmo3aStVrDkqY0K99h+OLQCm/efE5Zv0
-						xc27Z/yn68ImuUnbz0kbUKUWgGFrTlLp6hPSBlRo7QMYLPsAjlC/xYcphwUAE1CMAPSYe4CBWglAV6wAMPx3gAAw/KeJAOyhNlN2M/Qj
-						QQGAGCBYJVASwAnBvxEArCogHTgdWTQ8CeCYNiAlAJw5KmYFwMSsAngCwME0o14QgFB6sxBk4NwDThj+wwJgt/244D8A/rWAf1fbjwv8
-						44X+2KDP79cp4terF3xOjPD3NlEioA6is+MUAoZ9V4IyoFrXMMp29OaztOjg57Tz02t07todBfQucI8X8Dk40TuYn/yX73wvYzb9VFMC
-						HMCPfHb5Kq3euEOm8HTKKhLAR6XfxBaA4CpAoXx8l5xiOZAsvAqAKAFQE4Gy87EKMEpWAdR+ANUKJCsBZeMD+wGKhk+hopFYCVASULZg
-						Gw1beZAl4BBVsAgoCTgsLUCfaQHAYVxXbtyhL1m8vvn+xxrvD8AgA3ytzccv0cjVBxj891Ip4H+JGvVpZv2riT8M/5j4M8PA/0YZ3dqL
-						4d/0/XdB6w82/jL8pw1H9X8JfVK2iJrr6v/7RXPp3YI5Uv1/Y/AMem3gNHq5/1Tp/U/Jnkgv9Bkv1f+nvN7/4fRgp0q6D+0/svm3RLf/
-						6NYfDf9/aA4ByKtTAcD3eKJrpRPga5OnulXUAfxn/9SwbVZDjSHJK3klr9/qapiW08nxB1qrpHTOp5R+M0ISUPvVgOcHsgT01AIQdTVg
-						Ot2XAQGYrQSg3zx6asB8LQCLqWH+EhGAV0tW0BtDV9LbZaupaeUaFoC1skm45diN1GbCZhGBIYsPyInC+85FCsBxhn8IwN26Adi+0PKw
-						78LXtPrYFZq5+4LsByhdwwKw6gQVrVQCkBsQALQBHabshYe8jcC9sAKgBQAtQJ1n7ZONwO2n7xUJSJ3KgC/wz5lkRGA3C8BuH/4tAcCq
-						gQkkwK/+K/h3CwA2IOP7M/gjLAFd0QbECQqA2rQsMQLAsC8rAHYY/kUAOF7rDydTJv/gZFidxTggzcC/n+rCf02q/jWt9ocr8OG4gT5a
-						NNBHC75elcH42WBcAoB9KSZBAeDnKQcnW8/afZE2nvySjl+5RV9980PVQO94v4H58Ot+APx+bgde5/cHBCBSApzgb0dD/4XPrtCK9dul
-						0t6ZIV5aejio7EMAYklAjVYBhtitQFgJUK1AA7UEYGOwvSm4oHKSJwHFLCalyxnEVxwUCSjzROAQbTt1WVYAfAm4IxLwxY1v6erNb+na
-						7e/4cftBDuv66edfpDBhXz/98gtdZ7G6dO02HTh3VcZ6jlt/mMqW76Nhyxj8lyjwlzn/i3ZS/oIdDP/Y8IvKPyb+2JV/hn+0/ui+/27j
-						Gf7R+jNmBXUYtZxSBf6XUqtyVP8XUjO0/hRj8s8ceid/FjUZoqr/rw6YSo36TqGGOZOovvT+j6Wne6H6P5Ie6TJCqv/3dyyne9D737aU
-						/ql1MQtAEf2DwH+Bhv88SV0KAL7+43UA/0+nV9Lz7QY6/4+vTVLaZqVp/EheySt5/dZXg9ScItcfam2S0qWQ6veHAJgkZjVAJIDh/89G
-						AhwigBGiD2WyAGTPYQGYKwLw3KCFLACLlAAUsgAULxcBeKtsFb1bYQRgvRKA8ZspbdIW6jhlK3WdvoMyZu+iURuOywjRI5997QnAySs3
-						6ca3P+j/wu7eCwCEVqAL1+7Q+Wvf0Pmv7tDhz27QhpNXad6+SzIqNHf5URaAIzRwyRHqj5GIi30ByJh/kHrNO0g9pAVoP3VlMO88UwkA
-						WoDSpu1RAjAVwI82ICUBgH8RAH5bG0iAfMyeKALgB5uLlQAE4d8XAI5eBcBoUmxORguQtAHpKAFQ8K8EACsAVhj6PQGQFYAg/NuRTcCc
-						HAiATl8RgGOy6TcC/nUwijJ6z38wHvizBCDBjbAqHvRHiQv0Tdxgb4L3qxTXQaKJQCEDv52wCOD8iuksrGjlwWbdzxkmvQp+VdDvSFWQ
-						b+f29wr6w/E+5g4DbQwBiCUBgP7l67ZRwfDJDOzo3y+SCn4nVPI5RgCMBEQXgDxqzxKAjzOrAN5egNBEIG8/QG6l1Qo0UlqBjATIZCCs
-						BGAy0LCgBBTyfS0eP59Klh2gkuX7ORCBAzSMAwE488UNgXcRAA4E4DILgEjAzTsiAV/e+pa+uvUdfcUyACH4+pvv6MyVG1Sxkr/Giv2S
-						8hX7qJyhv4yhPwj+u7xJP4D/3HkM/3NV24+Z9Z8zfSNlCvyv133/aP1R8K9af5Z7ff+ty1X1H/D/IVp/UP1n+H8rdya9OWQGvcbw37j/
-						FHqR4b9Blq7+9xpLT/YYRY+zADzcpZIe7FRB93Uop7+g/Ueq/0X0jxj9+QngHxt/FfzXpQDgaz/WpcIN8LUJw/8L7QY5/2+vTRqmZudq
-						7EheySt53Q1XTk7Ov2cJmO/6g61N6nUpphSnBLg2CMe/GvCCXgn4c48pvgRYInBv7xn0YOYsFoDZ9HhfFoD+81gAFlC9IYuoQd5iFoCl
-						SgBKV9Bbw1YGBWAMBGATpU1kAZgMAdhOPWbupN6zdlHm3N00aNF+mrT1tBwedpIlAGBxt1/f/vCzCMBFFoALfHteROAOnfvqGzrHQvAp
-						35758huZeb7yyGWavOOcrBBAADIXHPQEoKcnAPuoiwjAXmovAG8LADYB75IY+BcB0BKAViHEh/+gAAD+PQGwg30HiCUAgH9fAFRwYJlX
-						/efgEDO0/6gWIDsK/o0A9NHJXITY8K+SLasAODGWY60AmL5/Exv+o7X+RMyyN9V/Hb/6HwT/aIlW9bfBPhwXqCMlLATu4H3xJ/B1GfZd
-						MSKAk6pnMOgv5+fe7vNfy3MRozjDAF9VbLgPv65iATwnAPR4HdAfjv64CAHA1wsIQHQJwOSebXsO0dS5ywWyu+aUSLsOAvj3BEBLQCJX
-						AWQlwBoLilWADGwK1q1ArpUATAdSG4ONBHBYAoqnraTCpfupaNl+KuaUcEo5M7adpAtf3eZ/X26zBNirAKoVCIEAYG/AlxAALQEQgK0n
-						PhPoR6W/bLmCfvT4S58/w7833x8tP1L1V/CPOf8D52xRoz5nbqKcGabyv556TV5HPTHxx/T9j1mp+v4Z/tsK/C8W+G8xdCF9xPCPjb9o
-						/Xk7D9V/hv9B06X1p1G/yQL/9Rn+Ve//aHqi+yh6tMtweqhzJd3fsYzuaTeM/tR2KP1zawX//yjtP4B/v/pfVwJQV20/OOjr+TqA/+TE
-						n+SVvO7SC5OBUlKz9zn/cGuRlPShoZUAWwSMBFRzNYBTj98vEtB9SsRqwL29p9ODfWbSw1kQgDksAHPpuYEQgIUsAIuoUcFSeqVomS8A
-						5avog+FKAD4Zs4HajIMAbFYCMI0FYMYOTwD6zt9LAxbuo8FLDlDlWmx8u6Mx++69sIHu0vVv1SqAXgkwqwEQAFsEziIMYGe/vE0HWAjW
-						Hr9Cs+VAsdM0ZNkR6jGHBWDWfk8AOpgVgCm7GfAZ+jEFaKISAK8FSAd7BAT+sQKgk8ZBCxFWEhAF/yEBkFYgJQBYATCrABhJqoJ9AAr+
-						bQEA/CsBwCjTsAAcZvjHHgcEJx8z+EMAJAz/OgL/WgCC8K9XAJb66a+j4F+vACxXkRn1MqnGBn8VM9bSzL33wT96vE21nCqhH2/nBKCc
-						Ew3wcVhcvClBrM8NJ/w9R276lGbvvUhrjn8hVX2I6PUoVX2A9k1J8O0mtQL88OuxEvo6Kvz97nzLkO+WgM+uXKWN2/fS2GkLqc+Q4dSt
-						X6kKgzkEwEiAEQCXBMSzChBzIpBeBZD9ALIKwBIgKwF+K1B2aCWgv14JsCUAI0IhAYVztlLBkn2SwqX7qIhTsmwfrT96ic5/dUsEQCTg
-						69uyCuBJwHW0AulVALMScFu1Bc3beZqGLtsjvf0mqPibTb6FC/VGX1T99QFfg+cw/M/Wc/4B/5j2Iz3/66m3hv/uDP9o/bHhP3X4UmpT
-						sZhaCvwv8Ft/GP5l4y/Dv7T+DAT8o/o/mVIyJwSq/491G0GPCPyX073th9Ff0kql+v9PqPwz/Ev/v+77t+E/0QKA71FX8P9suyHO/8tr
-						mW3JiT/JK3ndxVe9djn/J/+hXgz94dY6Kd3LRQLcLUE1Xw2oj43BRgIsEcDEoAf6zGABmEWP5cymp/pBAFgaBrMA5EIAlogAvFaynJoM
-						XaEFYA01G7lOBKD1uI2UOoEFYBIEYBulT99OvWbupMw5uyln/h4lAIv3U/7Sg7JJ+G6/0G9rBCC4EvCNkoCv7ngiIBLAAvDpV7dFAlCN
-						RU5fvS05fuUmbTvzFS0+8BmN23qWQfW4rAxAANpyWqH6P3GnRNqAOLYAyCqAtAGpVQNPAHREADhoL/LCsiHVfy0AsgIQEAAVfwXAj5GA
-						6PCPA89s+PeTJeNQlQAI/Evs9h8/Hvx71X91Ii2C02kD4G/Fg38dD/5NXPCvEwB/R8LwHYZzF9C7IpCPOL6GK0PXnqaxW8/RnL2XaPWx
-						L2Rz7okrt2TefiTIByE/ErTN+9XHuN5vx1TqDbQ7gb46CX29QL79wQN/nAdw5MQZWrhio0zPQf+9qcCn91MxAmAkILwK4ElAFasAIgCW
-						BJhVgPZ9sBJgbQg2KwG6FajHQL0SgE3BkAC0AuUNFwHwVgJkc7CWgBJLAsonUe6i3ZS3aC/lcwoWqxSxDJy4zCLHAnBBJECJACQAKwEQ
-						gPB+ANUKpFK5cr/X26+q/Tb464q/3uirwH+L1++PQ76y0fYzVU37QeW/x8Q1UvnvNn6Vgv/Ry6n9KA3/lUuoVfkiaq7h/0OG//cL0foz
-						W1p/3mD4f43h/+X+U+gl3fpTj+H/+YyxevLPSHqkKzb+ovUH1f+h9OfUUvoX9P4D/j9B9OSfOhQAfI+6mPaDPNs+1/l/eG3SMC37/Iup
-						Of+HxozklbyS1916NUjNfLBBas43rj/k2qRez0qHBNgiEO9qAIfh34hA/YHz6J6eWgBEAqYoAciYTg9nzvQE4NkB8+mFwQsoJXchvZS/
-						mF4uXMoCsEwE4J0yFoDK1fTxyLX0yej1LAAbqO2ETdR+0mbqPHWrJQC7KGeeLwB5LAA4POxuv7Df7jMWAKxWeBLAuWAEAO1AlgB8CgFg
-						+LcF4AwEgF+HBJwy+eKW5CTn4KUbtIZhb9qu8zRs7UkasOQIdZu9XzYGt568S24lpg3IloBpe7xVAGwqjhAAjsC/CIA6hwDnEaj48O8U
-						gLlqBcAEZxpgU7OKqv4jLvg3AuDD/1EGfxU3/KP6rxKEf3ci4d/a9GoBfyT4q9j99NHA3wZzF9wjYcB3fYwrozafpZl7LtKyI1doK0vh
-						4c9v8vPqW1XRB9A7+vQjILqWiQB1G94TFfO1OfaKA8aLbtl7hCbOWkJ9GaB7MVwDsBEAtxEAIwF1vQqAj1HioFuBOPhe6fw90/X9MPdP
-						JgMZCchXKwFmOpCSAGtzMDYGj5hFgxfspiGc3IV7WAb2UB7fjttwlD69epPOfXmLznOUBKAVSO8HsFYB/P0Ad0QC0P8P4C+U6DYf6fFX
-						031Mqw82+eJkXzPis99MgD9nmoJ/9Pv3mrSWejD4p49fTV3HGfhXlf+0EQr+0frTYpgP/x8UzaWmBbPpbcC/TP2ZSq8w/DfuN5kaZqvW
-						H8D/M73G0FPdR9FjXUdI7/8DHStU9Z/h/09tiumf0PtvwX9dCkBdwv9THfKd/3fXLjm3GrbJvFfjRfJKXsnrbr8apOW8yH+8P0X+Mdcm
-						OZTSe2QVElDFasAgSwKstiBfAiaLBGBV4H4tAI9mzaIn+82hZwbMo+cHzaeUIUYAltBrxSwApRCAlfRexWr6cMQaajFqHbUaywIwfiO1
-						n6gEoBsLQM+ZOyhz9i7KnruH+i/YK3sBcpcckNOEfw+XCAD/J2wLAM4wUK1Auh0oJABKAnRLEAP/GQgBRMAKRODkF5AB3LIMXLkl1V55
-						md927PIt2vHpNVrJkDgTrUSbzsjUIewraD/drAL4AuBJwAyVCAHgiABIGP51umF/gg6mFRn4jy4AOOXYrACoZOL0Yy9uCUgk/NvgHwv+
-						w+AfhP9I8AfEey8zqBuwd8UF9shQTuWGMzRh2zmavfcSLTt8mTae+lL2ieA5guk73gx9DfeuuKC9OrFB/Jb1crR8E4rrY2oU/lmu3/mB
-						jnx2g5Yd+owq1p2gnAX7KWvccmmpkXGbAGtLAOKRgESsAqT2VCKADcFmFcBrBcJKAH8vfE/cB3O/eg4040GxKRjtQFgNUBJg7wvAaoCs
-						BIxfTIPm76ZBC3axCCAsApyVB8/Tp1+wALAEQAACEqBXAdSmYLUfwAgAVgI2HLlA+RjlqYFfVfsx2QcbfLfTIPT542Cv2arXvx9GfFpV
-						/8wpatIPDvlC5R8tP92w4ZfhvyPDf/uRyzX8L5bK/ydlC2Xev4H/9woZ/r2+/2n0av+pAv8v9Z2kWn8yxtFzvRn+e4xS1f/OlfQQqv/t
-						y+ivaUPpz22Lpff/n1oWsgAUxBQAwH9tBaAu4f/pTkXyf7T7/+6aJufHhqk59TVWJK/klbx+L1eD1Kx3+Q/4b+4/7JqGJaCXLwExVwMi
-						RCDKaoAWgRSWg/ukHWiyTAm6r9c0ejBjhhKAvrPpmf5ztQAsoBdlH8ASerV4Kb1ZuozeHraSmlasYgFYTc0hAGPWawHYRJ0mb6FuU7dR
-						zxmYBrSTBWA39Z8PAdjHArCfZu44qxH77r0wcA8C8BkLQHAVAAKAVQDdDsRgZ/YCoAUIIuASALMaYGQA8C+56q8IIN7b5X1BccDXwtv2
-						XrhO645/IdOIJm8/x9B5mgoZgnEYGUDeWwWQNqB9hPGjSIQAzFYjSnFYmQoE4CBDvx9sZEb86r8vAGH4NwKQzcnBWFSZjIRD0oLpx0LQ
-						X0ckQGcgi0D4RFoP/kUAqpAAHX8sppYAHbv6722sZaC3JcAVA/hl60/TuK3naNaei7Tk0GVaf/Iq7Tz3tVTxsSKETbge4IcTgvxwXCBf
-						nTgBPErCwO+K6/PiCX72E1du0qojl2nc5tM0YPFBhv4DkmyGf8m8vZSRN1IJgJaAWKsAditQzFUAFoB4VwGMAMhKQAZWAvDxuhUovBLA
-						31/dH1sCsCegwpMAEYGwBExdSwPm7qSB83bRwPnIThGBwxe/kglAZhVAVgIgAPzvh1oF8CXgipEA2Q9whyZvOqLbe1SLj7T5CPhvVRV/
-						6fPfLBN+VLuP2ugrVX8Gf/T7Y8yn6ffvMsZq+0HlX9p+FutNvwul9ecjC/5l5Gcu+v4Z/gdMpZcB/9L6M0G1/vQaS89g4y/D/6Ndhwv8
-						P9CxjO5NG8bwX0L/0qaI/rlV4a8iAPg+dXLCL+eZOoH/7F8apma9rXEieSWv5PV7uxq0zerl+MOuVVL4H5r6vUcx/M+oQgKirwZEioCW
-						AH75AQb/v3afwgIwVQvATHqi7yx6ut8cem7APKrPEtAwdyELwGJ6tWgJvVECAVhBTctXShtQs5FrqeWYddRm3AZKmwAB2KwEYPp2ypi1
-						g7Lm7Ka+8/bQwIV7acji/XIq5t1+/e1vf4siAMENwSZqJeB2YE8A2oEkgHcN8LYAKLC/RacF/IPw70G/Hfl6lmBYUQKiAklA1XnL6a9k
-						SsxcFgUcbDZ8wxklCgzoOKwM7UBoOYoQACsC/1YLUAbHXf0/zPB/WODfCEB14T8sAJHwj4OsosN/dcEflf7hG8/SeIb6aTsv8OP0GS07
-						fIXWHr9KW89eE9E6wnCPx/fKTR/uXbnbgD8M8WHAjyf250cLfhY8h9cfv0KTtp2lIUsPU/9FB6kfp+9CBn8TIwHzWQA4WSPmJXQVINwG
-						ZK8CuATASICIQO9cvVqgW4G0BHRFsBJgHRTWYwDupxoPaiQgM3e4BDKQXWDOCxhN/WZto35zd1B/yU6RgcpVB+j0lRsiAGe/uKkkQK8E
-						yCqAJQGfI9IK9I0IwOXrt6XVZzBDv2rxMVGbew34S8V/xkZd9bc2+krVH5N+UPVfRV3GrqROozHnH20/S1Xlv2IJtUTlfxjDf+l8+lgm
-						/syh9woU/L+VN4PeROsP4N/r+59A9TMZ/nuPpWd7jqEnu4+U1p9HpPWnjO7XrT9/bFMsUO4SAAX/kQLgAvt48i+tiuoM/uum8s9Jy0rX
-						GJG8klfy+r1eDdJyhjr/wGuTtBxKyRhN9fv5ElC91QAlAq7VAJGAjKl0b8+pfDuNHsmcQY9nz6Kn+s5mAZgrAtBgyAJqlLeIXilcQq8X
-						L6Umpcvp3TIIwCpqNoIFYPQ6aj12PaWO30gdJm2mLlO2Ug9PAHZRztzdNGDBXhq8aB/lL9lPX92+uw8D++kXJQBoAYIABCQAAsC3kQKg
-						buVlQDmAnf9DVyKAfQE+zBvAlzjA30Q+J5Do4G9/fxMzvtREJhpZwfcA5GK6zPazX9HGU1dp1bEvaPGhz0Ucpu+6QBO3nZPedRwoVcLw
-						jJNk8zkDAPEcwD5OQEayF+JANBWIBlYlTAD/RgAGLPVTXfhHVX7YutMM72dozJZPpSo/ded56a1H6w1OuEX7zcqjX8i5DcgOBvr9F2/I
-						QVh4nD6/+R19feeHQK7f+ZHQiy+3HBfo26kK+u3edxfEx4oLtmPFBfA1jevr28HzavOpL2jajk+pYPkRGrD4kJWDWgAOSEQCBP73S4wA
-						ZM/cRr0ZnqNJQFgAaroKUFUbUNseQ+Rl9X7/fABIgCcC/L2MBOB+KAlQewJEBPhnCJ4aPIL6lk6k7NnbKGf2duqLzNlO/TgLd5+hU5ev
-						WxJgVgKUBFzUm4IvcZQE+K1Ae89eEeDvL1V+A/3BsZ6o+GdO20B9EAZ/e6Mvqv6A/65jV8mMf7T8dBi5nNqNwIbfJd60Hznp14J/9Pz7
-						8D+dXh84Tfr+G/WdRA0x8pPh/4UMBf9o/Xm82wh6FDP/O5YL/MvG3zYlAfivSwH4Y+tiejrdAe6JSKcSKcg5/4+uRRqm5pRofEheySt5
-						/Z6vJk2a/Af+o54T/iOvbRqyBNTvPVZLQDQR8FcDqrVJmPNo1gx6oPdUejhjOj2WPVPagJ7tP0fOEEAbkAhAwWJ6TQRgGb0zbAW9X7GK
-						Ph6xhj4ZvVYJwLgN0gbUecoWSp+2jXrN3E6ZXhvQHhq0cC/lsQDsP/+VRu278/r+p198AXBJAMdsCPYkQIsAooDcCIABdgZ4A/W4lZdv
-						8e0tH/jDCcC//bX46yP6+3mR+xKEfkRWLXCfraifA5OO8HNGRlZAbtj5jj4P5TLCMG1ivh/uH/YzIBCMw5+p4GU7RyW3ZN+D2Tzt/Yz8
-						85jgvly59b300Ztci5Iw2EeLAX0vDPEu0DepHvAnHvptOA9D+zc/ON5Wi5jvg58Lz8NtZ76k2XvOU8kqlrMlhySDOAM5gH47EACRAIZ/
-						CICSACUAngTM20dZZTN8AdASUOUqgFTk41sFiKcNCAKQ2pMjqwL8fv5Y2Q+gRQJfD2cEKAkwImBJgBEBjicBuSwBlbMoiyUne9Y2yuLk
-						cCAC+89dpZOXvxYJOPPFdS0AN/QqwE1ZBVArAZAA1QqkNgR/Q/N3nKR+gH0BfrT4oNq/mbIB/mjzAfTr6T5qk6/f7oONvqj6Y7NvpzEr
-						GP51y8+IpZSKOf8Vi1TPv97wC/j/EJX/wjn6sC8L/uW030n0YvZEatBHwf/z6PvvPoqelNafSnq4UwXDv5r5/5e2JQzlqvUntgAo+K+N
-						AGCPgRPcE5BnOhXXDfy3zZmNc4U0PiSv5JW8fu8XzgjgP+5d4T/22iYlrS+l9NESUMvVgLAIvJQ7nx5n8H8oYxo9lsUCkDOLnuk3W04S
-						Thk8n17MXUCNIQBFS6hJyVJ6e+hyeq98JX1UuZqaj1xLrcasUwIwYSN1ljagrdIG1GfWDsqes4v6zd8tbUC5i/fR7J1nNGrfnReACqeo
-						ogVIRIBhOWJDMMM2JMBrB9IQLjLAt7InALcGZj2I51sP8CEAUeBfxwNiHSUXDvjn2NCPhMHfhn4X+Av0W8FjEIZ+Ozb8I5jyYucLhvZw
-						rtq5/b30zkeLDfyxoB9xQb4dF/DbqRL6GYZ/beCPGUC/iev91Qy+J54vO89+RQv2X6RRG09R3vIjlLvssATtPchgDuA/QgAY+lUOsACo
-						GAkQ+JfqP4M/4J8DaIUAxLsKEG4DirUKEE8bkGkBggS0ZQloK+1AWgJkT4BaDcDXNBOC/NUAdb9wP3uyDBiJMSsCmWOWUJ8ZW6nPTM6M
-						LSwDW2n4qgN04vOv6SQiqwCQALMKoCWAYwQAm4JNKxAkAHP+Bfalr1/39usI+OM038nrdMVfT/hBr/84v+oP+Mfpvqbfv60e89mybKG0
-						/TQrnS8HfX3I4I+2H4H/ITMZ/qdJ3z/afhr3nUwv5kykhpnjqZ5s+h3twf9jXYfTI50r6IEOZXSvhv8/tymWlhxbAAD/iRYAfC8XuCci
-						T3UuZfh3/59cm7BQbK/frdt/1tiQvJJX8vrXcjVs1uv/xX/gR11/+LVKWj+qH5CAmq4GKBEwEvDSkPn0ct4Cepah/5HM6fQEy8AzaAPq
-						P0fOD2goqwAL6dXCxfSmCMAyalq2XNqAmo9YQy1Hr6U2Y9dTu/EbqNOkTdR1yhbqMW0bZczaTlmzd1LfeWgD2kNDFuFQnAP03Y8/a9y+
-						+y5ML/n8BuBfCYDsBQitBFzQG4JtAZBYMoB4wK7h35wXoITAFwBPAvT7/GjwN7G+tgTfz4sF/joBaeHEhH5d7VfgHykAUvG3EgZ+Bf0m
-						DvhnqLcTAfy3g8Afjgv8Jfz7QiKh36T20B8v8NsjMAPRkB0tLii3c8cG/nAcH19V8DPh+bb19Jc0b+9Fqlx/kvJXHKF8hn4kb5kF/yZL
-						D7EAqIgELGYJ0K0/SgIOeFECsJ/6MvwjEICgBOylzOKJca0CALijrQLUVADsVYA2PQZz9EoAv7+9Piego5EAIwJZEAEjAZz+4UlBekWA
-						Ibz39C2UgbAA9Jm2mZbu+5SOf/Y1neBAAqQViHP2ipIACEBgPwDagCABnFOXv/aAv48B/il+tb/3JD3WU3r8dcUf4z0B/mM0+EvVX035
-						Uf3+/qQfc8jXR8Vz6X2G/6b5s+mdvJkM/zPozUGo/GPc52QP/htkjef/g8ZJ5f/pHoD/EfR4t+H0aOdKerBTGd3Xfhj9NbVU4B/V/+oI
-						AOC/ugJwb9r/n72/DvfsyM578T9+sW/iONe5jhPfONdxbI/jOGaPxx4PqqUmMbS4mZmZmZmZmZmZGaRWC2dG0mhGw2OIA4Zx/da7qmrv
-						9X3POk3qllrj/j7P+5zu0+ecPt+9q9b6vLVW1Z7qgvsdUbdpoU77u9H2M/jqQ436/jtBBTzp9/7Tfu+/7r9+Cl55MqseatHvl+u2G/Km
-						FwA+kjoMTXsC1rhGwK8GWCOQTIAagVgNeFRMwONiAJ6asE3//sVBa8NXhq4XA7Ah1BopXyMG4VH59ycnbA/PoAowdVd4aboYgFn7QtM5
-						B0KL+YdCa60CHAmdlh4L3VaeCL1Wnwp9154OA9efDUM2nU9tQBe1CnDh3Xv3eQAAWMBvCcfRDGQDkE0A9gPgYzYDBYRnOBdgL0yAwHys
-						CpRwDwNQbBJOYvgvDESSBX+v5ceu+N/Sqj/eb5JnAArwF8j3VvuzKoCfxMBv5cG/C/tGDPyV0C8SiL8R8Gfdzir/dUHf/tmRB+VWAP7r
-						6VaNAO7Nq9/6y7D/9e+ElWffDVP2vxkm7Xs9TIT2vq79/Bn+1QCIKuBfDYBIwH900iiB/pFJ1gAM3xZX/7UCkAxANAGXkwG4FLV0X5Uq
-						ACD6ZqsAt70PwDUAxgSIOvSNzwnAz4jVgAnyc0sTEDcIx5OC8u+oJmDM3NB71fHQR9R31YnQV+B/0NpT4dX3fxDe+NaPoglIVYBiP4Co
-						PBr0r8M3RdoGJIIBOPjqewL6EfrxESf6YKW/z3K7uTee7NN98QHd4NtNwX+fnu2vvf7zdunDvbDqX/T7p5YfXfnHQ7605399eCnB/3NF
-						z/8KPfGngP+Bi0PN/gvDA72x+i/w3x3wPyv8WZfU9y9Ajr7/DP+eAQD8f1QDgK/5s84zfHC/A3pAe/6d/PvR9cZDLTr/MvOC0f3X/df9
-						16fg5U1eCD19qjrN+3xGJvy3KQB8dHUYEmrhdCA1AckIVFsNsEZADIDTFoQqwGNjt4QnBfKfmbg9PD52a/jKkHVaEagpX4NjQx8dszU8
-						MX5beHrSjtgGNHV3qD9zT2gye39oPu9gaLXgUGgrBqDj0qOh6/LjocfKk6HPGpTCz4TBG86FYTgST6sAl8KCw6/rA7futdff/cNPBHRL
-						AI5wnAwAVwIEuOOm4Aj/agIEzvOKfIb1wgAkVUA+wJ8+V6z2JwNhlX92ll3tv+UVfyu8V/O+K8Bf4LH6Np8sH/qrW+3PuhXo94Dfilf5
-						PdC3uiPAbyWgfT1VAXOCdg/0ryfPAOD/wf27+q2/Ckff+l7YcvmDMPfoO2Hy/jdEr5cS8J8k4A+pASATMG7Pa6qxqfUn6qoagGwCYACy
-						CbDwn1VpAC6rAVATkCoAgzZdDAMmLLztNqDb2QegBiCZADYArXuN1nYg7AuAAVAlAwHFygI2CceWIPzfsSKB3ylWBXpPXBp6rTwWeq2I
-						6r3yeJh/8NVw7YMfigEQfRsm4EepCvBjrQJ8/buoBPylmABUAv6q0gSIAVh44JUE+4dD76K3Px/nmcEfJ/ukVh+B/s7z94aO8+MmX233
-						SRt9W6PlR4RVf2z21ZafSVj5x0O+1ocXx60PL2Dlf/Tq8PSIuOH38WHLw6No+8FxnwL/D/VdGGr0WSCQPC98SVf+I/z/aafp4Y87TA1/
-						0A7wX3X1nw0A4N8zAAD7GxkAfO1fdJ1ZBdrvlL7SFT3/Tt79yBryXs1Wvf+zZQQjjyWg+6/7r/uve+TlTVDIm9DQ/08m/O/XbT/4R35A
-						+AjSjcHzQu2hxgTcSluQMQIPix4bs1nbgJ6ZsC08O2l7eFqMACoAD4lqo1VozJZUJdgenp28Mzw/dZe2ATWatS80m3cgtJx/MLRZeDh0
-						EBPQednx0H3FidB79UmtAgxafzYM3XQuDN9yIYzedjGM23E5vP7tHyfsvnde577xg7DkxDth86X3w5E3vxNe+eaPBayxEdVUAdLHArQV
-						xDOMl3BeAe8K9rECALCPrT3eqj++JpkG+/1GxWp/lvwO5Wp/+h2zBO6vZwBK4HfAP8E/Q38Wt/pUgX9RFeBX6L958PdA36qizceBfNb1
-						V/orgf+G0J+Am2WhvkIE7B7U34zy9+P9Y/ycf/dHYe+1D8Pqc++GWUfeDtMOvKmaeuANFTbvQpP3ZSUDkFb/owG4FgUDsDtq3G4xAaKx
-						AH+rbAIS/KuSAYgm4IoKLUDDsgEQ8IeGbLmkzwIoqgALtt9WGxAMwI3agDwDYKsAxR6AZAJgANQEyJ91c7AIm4Px9fi+XBGIewOiusn/
-						mc0AqgI9Z6wP3ZcfVfUQ9RQdvPp+eO2bPwiviwl4HSZAKwE/0kpAbgVSE4D9ACIYgGJTsHxE609PrPJDS6AE/SJAfwZ/PdkH4J9O90Gr
-						D1b8Y69/PuVna2z5EfBvPCWCP874R7//C6bt5+kRK8MTw+JpP48MXirwvyTU0rYfnPgzXyAZ8D83fKFbhP/PGfjH035v1gBE+K9qADzo
-						z8LX4//1wP1OqIbC/1057ee7DzTp/t/ABEYeM0AeY0D3X/df918f48ubhJA3aSE7uQs91KzvX0gQ+B8cFD6y0J9YYQKsEbhRNSAZgbQ/
-						4NHRm8ITY7eEp8ZvDfUE/l+YvCM8N2lHqCXmoNaIjaEu9gpoG9C28MxEVAF2hpem7w4NZ+5NVYADodXCQ6HdotQGtPx46OlWAS6Esdsv
-						hfmHr4V//Mm9Uwb4yT/9U1h26mthzuE3w6xDb4QZB18P0/ZDb4RFx98JGy68Fw4IaF1494cB5/dHE/C3xgBEVTUAeEZAhn/5M1b3098V
-						+EkW9qH887IK8E/wXxiRpKJSIYBfrQGoBvwV/gXub7ziH3Uj4LeK8F8J/lke/EPVA3+SAP31VvwrevohA/4R/qtCP+QCPyQgf1OwDxlY
-						hzyYvxnh//lQ7tlr3/6rcPzt7+km3SUnvx6mH3yLJOCfJeAPTZWxC5UmoIT/rMIECPxHvSYGICobgMIEFBWAuPpftAEJ+EcTEOG/MAFp
-						9T9XAAaLASjgf9PFMGjD2dBvzJxbawPSVfcbG4BsAm7VALTuOUpNgEqNgHwt2oL0+1ENiD8XewS05Uj+Tz06FGZg3q7QdemR0A1adiQM
-						XnsyvPL+D8JVMQCoArAByJWAaADKk4FyFeD8174joH8wwj429KLFR4T2HqgzlM/zn787dNDTfXanFf+d5Qk/Av951R+n/DTWVf/Y7/8S
-						Vv3Hrg3PjVkT6o1aHZ5OPf+PDVlWwD/afrDyjwd9FSv/AuF/jpX/jtPDn3SYFv6wvYX/qgYA8O8bgAj/N2MA8H1f6j67CrTfKd2t037q
-						thvyNzVb9Pq8sMC/SHI5QeQxBeQxCHT/df91/3WHX95Eg7yJCXkTGcqTXVWrZd8nJBD8vR8gPoKKSsDqW6gGWCMQqwGPjNqoVYAnx23R
-						KsBzYgBeFMh/cepObRGqg70C8u9aBRCD8Cz+HW1AM/aExqgCzI1VgLZiAnQz8LJjoQeqAKuwGQ57Ac6EIRvPheFiAmIV4FI4+7XvJfz+
-						5F8/EKCde+StMPvQm2HmQQEogf+p+66FSXtfE0AqYSjDz8S918L8Y2+HjWIMDr3xnXDlmz9SYFcTAHDPAJ8+QrmtJ5uBwgCoISi/Dso/
-						owT/BP8O9Cv4sxj6kyrB/3+Vq/0J/m8E/VkF+AvYX6/VJ674+/B/I+Bn3ajN53aBP+sjAT8kwH67sI/vx3XFhvBL7/84HHj9O2Ht+ffD
-						3KNvh1mH31LNPFRqhoxTCODPslWADP9TZDxDk7MJEOiPuqZjGcoGIJuAcbsj/KsBSPCfDUCcBwL+UDYAAv1QaQAuqwoDIOAfKwAC/zAA
-						0OwNH6kN6G4YAKhNL5F8HspVAT0uNG0ShvJG4ahJofOig6Hz4sOhyxLR0kNhyeHXwivvfV/3ALz2/g/DtW+K0A6UWoHifoDUCiTCpmBt
-						BUqVgLUnXw9dFx0Q4QjPqM4L9inw64k+2uaDzb2A/tTjn1f88yZfPNUXvf5T0PKTVv0nxH7/F8auK1p+6gn4Y+Vfz/lX+F8W6gj41+6/
-						KNTsl9t+5ocvC/x/QSAc/fcZ/rXvv+3kitV/yOv/v10DgJ9x1x7wJXqg812C//aD/+6hln0fYx4w8tgB8lgD8tgEuv+6/7r/us2XN6Eg
-						bwJ6kxXyJjf0M1k12/R7XoLCP1QJEh9VMAF955Qm4DbagtAK9JhA/hNjN4enx28Nz07cFp6fvD28hFafabvCE2IM8l6Bp8ZvC/V0LwCq
-						ALtCo5l7Q9M5+0MLVAEWoApwOHRaelSrAL2wGU6rAKfD4A2xFQiPxx+z7VKYvPuV8FcCdp/0C/sR3vnuX4edr3wQZgn8x9X/a2EKDEAC
-						onG6ChrhP/c769nmmy+HAQI1/TZeCv1F4+VrFx5DG9E3w/G3vhte+9ZfVhiCKFQCEvyLLPhDlSv+lav+HvxDNwJ/hX+I4d+B/qzvQdWB
-						f1IV4Lcq4L8UQ/+NwL9c8b+Jlf4qwM/ywR/ygD+rCugneSB/I+EaoXXnyjd/rCv6O1/9dlhz7j09enPOkbf1RB6rWYdLA6AyJkCNgAA/
-						VNUEpCpAqgSoCRDwhyYXJgAGN6o0AbYCUBqAaAJeLYQWIBgANQFqAK6oYAC0/UcNQDQBQ7dc0vafsgUI8H8hau3Jm24D8gyANQHZANg2
-						oOsZgGwCPAPQqsfI0Ap/FiMAxapArAjg+zvoU4RjaxDUadjM0GHhwdBRTECnRYfUDBx9/YNw5b3vhVfe/364KkIrEEwA2oHe/JYYgHwq
-						kIhbgbAfYPi64xH4E/R3TEKLjz7EC20+Av6A/tYQTvfBaj+e5jt9a2g2bUs63hMbfc0pP+PXhRcF/rHRt54Iq/5PCfg/MWy5wP/y8Mig
-						pQr/tdI5/5VtPzjrP7b9KPy3mxqP/CQDAPj3DADg3zMA1+v/12M+79YDvkQPdJl0t3r+/75Oy/71LAMYeawAeWwBeSziMQt0/3X/df91
-						g5c3cbxJBnkTEvImMORNeOhna7fo++xdqQRAvWYkE2CrAdYIXL8a8MioDeHxMWIABPbrTdganp8kBmDKjlAfkD9jT3hWoB9VAOwVeFoM
-						glYJxCA00CrA3tBs7v7QKlUBOqIKsBRVgGgCchUAJgBVgFHaCnQxrDzx1ifeCvTD//G/w7Vv/6XC+qozXxdwwmppWv1XIBIAwsonoAcP
-						O9JNjvlYw0thwKZoAPqsvxh6rb8Qeqw9H7qvPRe6rj4bOq+Sj2vOB/RCYwPm4uPRHBx+M1YNsBFYoT+rAvyjPOC3iuBfqgr4V0B/ksC9
-						u+KfVQA/Qb8ALEM/VAH+Vg7wW1UP/EkJ8qtTxYq/6FagH/KAP6sK9DtAz8LX4H2jooOTd05+7fth99UPw7rz74eFx7+mm3IB+jej2QL8
-						WZ4JyFWAKibgQFTZCvS6SqsAjgnI8I+xzhWA0gS8KnOg0gCMrjAAZQtQBv+iAiDgH03ARTEA5er/QDEAqmmrqrQBeQaA9wHcbQPQ0ih+
-						Pp4WlDcLRzMgP1fUafTC0G7+gdBuwYHQfuGBMGzDqXDpG98LV94VA6BVADEBYgDUBHzwA20HilUAbAr+UdwU/N0fayvQu6KLX/9O6KCt
-						PXtCez3CE8C/O7SdDeCPaq1tPljtF03fruf5A/6bTkutPqKGqd0nn+0fj/hck474xGZftPwI/A8F/GOz75JQZ0CE/wf7Lgg1cNqPwHfe
-						8PvnXWYI/M+oAv+eAcjwzwbgZvv/8XecLORB+51Sjc7j/Vz6kTXk/9Ru3vtx5HwjjwkgjyEgjzkgj1Egj2nuv+6/7r/Sy5sg3kSCvIkH
-						eRMV8iY2ZAOA6qGWvV+UIHHnKwGiOj2mGhNgjcCNqgHrwsMjN4THRm8MT6YqwHOTtoUXp2wPL0/dGRqKCWgya094adrO8LgYBN0rIAbh
-						Bfm3l6bBIKAKsC80n7c/tFlwMLQvqgDHQs+Vx0Of1SdD/3WnwiAxAcM2ng0jNp+LrUDbL4UDr32QUPzjf+HJv298+FdqAK5+68fh4ns/
-						FOB6I0xOrT+A/3ECP4AewA4gJ29uxOr/QIH//gIzfTZcCL0F/nuuSwZgzbnQRQxAp5VnQocVZ0K75adD22WnQxtRq6WnQ/Mlp0KzRSdD
-						S/kI04Ae63lH3tK9BrGl6MdqDLxV/2K1P0uhvwR/XemvDvxFDP1ZDP+3ZQBusOLPwF8d9N9Om09V+IduHvghD/qt8B5wD9767t+ES+//
-						KJx45/th37Xv6Hn6K8+8G+Yfi5A/7zrCv6O1p0KOAbDyjMBMtKsZAxD1hsB/Kd8EXBP4r1z5zwYgmwCM+zj2swEQKfy/UihXALIJiO0/
-						l1WlAbgUhiUDAPgfvPmCatBGAf+s5YduuA/gkzIALbqPEA3XP7fqkU2ACC1C8vWxKjAmtJ+wOrSety+0EbWTGLjmxBtqAC6LAYDwJGA1
-						AaJrYgJQBcDJQG+K3hYj8A5MQKoE4FSg1cevReCHbHuPQH9WbPOJK/76FN/0JF8c69lw8qbQECv+E/BE33UqtPyg1x8tP0+NWKmr/try
-						A/jH033R74+WH8B/vwXhgd7zC/jHxtsM/4BynL8P+Ler/9UZAMC/bwCqb//B3z/f5e6d9IOKQo2OY90cegf0Dw+16POC5Pr/K6kKA4g8
-						VoA8toA8FoE8doE81rn/uv/6Z/fyJoI3YSBvgkHehPQmL+RNdigHA1XN1n2bSqD4CQWOO6I6PSaH2kPIBNyEEag7cn14VKsAm8JT4zZr
-						FeC5VAVoIODfaMbu0FRMAD7CADyNvQL4d/m3BtN3xyqAmIBW8w+oCei4+EjoIiagO47EW3WyaAUatCGagNgKdCGM33EpnHnnuwnJP74X
-						Nv5+/ft/oycSYfX/6gc/Dq9+8KNw7K3vqAGYsPtVhX+AD1Y70eIwLMEN2hl09X/jxdBvgxgAgfheAv8910X47ybqvCoagPZiANqKAQD8
-						txb4byHQ31zgv9miE2oCmi8+GVosPqWCIYBgEtqIuq05L//PFYGya2GOQN+qM98I2658EA6/+d1w7l0BiO/8tQJpdSv+DP+eAbDAX0J/
-						Cf8e8FsV8J/0o1to9WH4Z+DP8oC/eujPEqjPEpj3lEEfX4/3WsC9GDCs3u+79qEep7lK4T6u3keAL+VBvkq+vor03952VQn9b7kqjMCh
-						XAlgE4AWNjIBCf4LE6Cr/9YERLOryiZA24CiAdA5YCoAowX+ocIAmPafbAIU/JOK1X8xylHZAJwPAzdE9Z+05LoGIJsAawB4H8DdMgDN
-						uw1X4c9qBHqiIpCqAvI9MAKtp20OLefsDa3m7g1dFh8MZ97+MFz4+nfCxW98tzQAyQTEViBrAlIVwLQCDV59NLTGKr/29AP440p/ixmQ
-						QD96+6dhtT89yEvAvxHAP2/wxYq/SI/2TJt89Wz/URH+cbY/jvjUlp8M/3rSzwJd+dd+f4X/ubryDxjXtp+O6PmfEv6wXYR/awBut/8f
-						sG8NAD6H/9MF9zuhnnNCzU5j3Nz50TXkH2s27/0y53sjjw0gjyUgjz08RoE8poE8Brr/uv/6qX15A96bGJA3kSBv4nkTFPImNOQFAOhf
-						QjVb9m0pQeOumIC63SeICVhZ1QhUaQuqNAKPjFovBmCjGIBN4ZnxW8JzE7eGFyZvC/Wn7giNUAWYuTs0ny2gL3p20rZ4YhDahFAFmLkn
-						NJXPN58bTUC7RYdCpyWHQ9dlR0PPFXhAzonQTx+TH/cDDNt0LowSEzB220U1AWe/9vGagG/9+G/DNcC/GgDA/4/DK9/8Ubj8/g/Djivf
-						LMBHWx0UcDL8xw2NAwVm+gnI9BP4773+fOi19nzosVbgf/W50EXgv/PKs6GjGABd/V9+SoAecA/YF+gX8G8qBgAqTUCsCGQDALOQBfOA
-						CkLb5fh5MBVnVR1EHUV9Nl7SBzJNEeBbmE4t2vHKt8J+AVj0mp8Xs/DqB38Z3ha4RVWhWO0XVQJ/hH4F/+vAfwX03+KqP0P/X/6vKA/8
-						IV7xrwr6rLhSDzOEjdavf/jXck9/HE5//QdqnPa89mHYKlCPtpzlp7+hYB977cve+0oYj/KBX+Ddhfx39Oeyqnyvka0IVPzfAvys2Yff
-						VM0S+IcqTEAG/wOvF2IDUFYBXita3UpdFQOQKgBqAsgAyHzIsgZgpMwPzJHheeU/G4DNF8MQrP4L+GfBAAwQ8M8auGhXYQBsG9DdNACA
-						/5s1AM26RjXvhoqAGIFkBvCxVc/RocUsxMXdocWcPWHm7kvh3Ne+E87DAIgufV1MwDfQChT3A+im4GQA4slAPwxvfbt8PgC+R9t6LPCj
-						rz8Dv6gJevuTcJZ/Qz3SM/f4p2M9x60tHuqVT/gB/D8u8P/Y0GXpfP+y5Uc3+/ZGv38E/y90mxM+33Vm+PPOgP8Z4bNpw6+Ff88AXK//
-						H/B/vf5/fC02GleB9julnrNDzQ6j/Jz50fWTWs37tMj53chjAMhjBshjDMhjEo9dII91II+N7r/uvz71L29gQ94k8CYM5E0wbyJC3sSF
-						vInOASHrX9Vq1beXE0juiGp3nRBqDV4hJmCVMQHVGYFoAOqOWB8eHb0hPDF2Y3h6fKwCPC+g/9KU7QL5O0NjMQFNJdm1mLNPherAc2IQ
-						cFpQA/m3xmICUAVoOXd/aLvgYOiAVqAlR7QVqNfKE7EVSEzAoPWnw9CNZ8PwYlNwNAGHrn0r/NNdfkoYfvqHf/k/w+vo+0/wn1f/rwj8
-						wwBceu+HYcnxt8OYAv7jymY+zhDw33/jxdA3w/+6CP/d15wNXVefCV0E/ov2H7T+CPy3EvhvCfhfDOg/XmEAKk1ANAKt5XuqMwDRBODn
-						JxOgZuOcqtMqVB/QgnRe9x9YdVt7IXQX9ZTfe8BmeV87BPb2XlNwXCCAukKAeM3Zd8PGi+/rXoVdr3477L76bW1LAjyffOf74dTXfhAu
-						yPW5LGYJpuKN7/x1eOu7fy2wHU86KvTDKLvBGXrne38T3k7Cn6GvfT8KBuXyNwWC3v+RAvvxd74XjoqB2f/6dxTcd776LV2R33jxm2Ht
-						+ffCijPvhqWnvh4WoL9eYHm2QPzUdApOPhbTHpc5I/XPQ2U7zfXhP0N5JbCXIO+BfvV621Xlz5b/78hbqooKgDEAbAK0EpBW/20FoKoJ
-						uKanW6kBkPsOsQGYAAMgshWAWAmLrT8VBkDmRlkBQPvPJTEAse0n6mJhAIYUq/8C/KLSAJwL/defDf3Hz78nDIBuAK7GAEQTMCwpVQb6
-						Tg5NZ+4W7QotZu8JB6++F86+/aEe43lBpCYgVQJeEb0qRiC2An1fTMAPwhsitAK99e0faiVg5dGrAvzbQ1Pt5yfonyLAj95+PL138kZd
-						7S8392K1f314Xlf80+k+AH99qFd8om9xtr8otvwsVvB/qO+C8ECveQLI88KXesZjPvUhXzjtp9P08NmO07Tthw3Anez/x8+5m5t9Af8P
-						3jX4H/JPNVv27YGcbuTlfMhjBI8lII89II9VPKaBPAbyWAm6/7r/+tS8vAEMeQPemxiQN5G8CQd5E9SbzJA38SEbIFS1W/ZpJ0Hk7rQD
-						dRodag9aFk1AhREQ+HfaguqgCjByQ3h8dKwC1JuwOTw3cUt4cTL2AuwIDcUENJmxOzSftUcgf29oM2+/JL496cSgnaGh/Bv2CjRHORxV
-						AD0Z41BsBbL7AdZkE3AmjCgqAbEdaP2Zd3RD5d14YcPxBz/6H+GND/8ytf6U8J9X/6GL7/4gnP369/U0IKxsZqjR1p9NsfWn/4YLoY/A
-						f2+B/14K/+fSxt8zCv+dVpwO7ZefEnAXkBeohwFoobAv0L+gNADRBJyoYgBiJSAKZqBqFYANQFQnVB/UAOD3gQT+kxnotiYagB7Yq6C6
-						KGYgqpeo94aoPhsuaVWh78bLod+my6F/0gBIjMNA0aAtUYO3vBIGb40akjRUN0q/GoZj0/SOKJgNaOTOq2FU0mgBzNF40uzuqLEqPI22
-						fDLteH1Y1eth4r6oSXigFc61N8rHXeLUm9z3HuG/VN40Wwn/UWirqQL+SZVw7kE/IJ4/V2rB8Sjv3woTID87y/5/VYxAgn6vAlDVBLyu
-						is+ziFITIPAfTcBr2urmVQFiBSCCPxsAmOLRO66oogG4LAYgr/6LARDohwD/wwT81QAI+EOFARDoB/hnwQAMmLf1U2EAmnUdFpp2GSoa
-						FpqJmg+eExpPx+LIzjB8/alw+q1vhTNvfzucfUdMwDtiAMQERAPw3bQpWEwA9gOIAYitQGIC0AokBgCVgH4rDofGaOvR1h4A/xYFfm3v
-						EdUXaW9/sbEXK/4R/J8V8K83yqz4pz7/xwX8seL/iOSCuoMWa7tPrQFx1f/B3vMV/tHy88Wi33+mwH95zn+Gf88AlPBf1QAA/n0DUPb/
-						QzAaLrTfKfWYFWq1H14lP94h/aRmi95tJZf/HOd2I48FII8dII81PCaBPIbxWAfy2MhjKOj+6/7rnnx5g9Ub2N4EgLwJ400syJuI3oSF
-						vAkOeQEBwaLQg836NJFAcnc2BncYEWoNXBpqZRNwg/0BdUes070AT6S9AM+KAXh+0tbw0pRtof60ylagVnP2hbbz94dWc2M1QE8Mkn9r
-						Iv/WQj7XRkxA+4WpFUhMQA9UAlYdD31XnwgD1p4Kg8UEDDMmAHsCxm2/GGYfuBqufetHCdvvzOt/ian4+vf/OsE/Tv0RA5Dg/1WB/yvf
-						TKv/70YDcP4bPwgHr30YRgnoAGawiomjCwdsvCDwfz70XX9O4P9cXP1H37/AfxeB/84rT4eOgHPd+IvWH8D/ibj6D9hfKPAPAwAtFAMg
-						aibCv7VYLF+nBiCKDUBpAk4bExCNQPUGIEkNwHkxAKhWYLNyMgBJMADZBJQG4JIagCw1AXr06eUwUOAfGnQjA5BUGABRYQDUBAj8iyL8
-						R43DE2mNCcAeiInF2fXlKTb5CbcK/0nRABD8Jyn8Z10H/rN49b8AdoL+DPkq/P0WVPkzRfh/8P8l+Lfi1f9oAt5QzcyCAZBrEFuBMvxf
-						U2kFQBRbgEr4x3G3aP3JygagMAEC/pUVgGwALkcDIPA/Iq3+DxeTDAMA8I+r/wL/0KbzYbDAfzYAagIA/lj9F/VbczL0HTPnpg0A4P+j
-						GgDd0OsYAG3vcQ2AQH8yAE06Q0NCkxFLQ0OJi9CG02+GU29+K5wWAwATcO6db4fzX/uwohXoiqisAkQDAKEKcE5MA4C/ga7wbxLol48T
-						NyfgT9CP3v7xG8IL43GiDzb2rgvPaptP6vEfGaH/Se3zX6Hg/6g+1GupPtRL2336C/jjlJ9egP+40feL3WZryw/AHy0/WPkH/FsDcKP2
-						H88AZPj3DAA+B8Oh1QeG9jul7jME/oe5ufEO6B8eat6rMedzIy/3e4wAeUwBeQzisQrksY3HQJDHTB5b3X/df33iL29gQt4g9ga7NzG8
-						CQR5E86bmJA3kSFv4nsBAvrXUM1mPRvdtSNCOwwLtfstNCbAMQKpLUirACPWh8dHbwhPjsVeAFQBtoYXJ28LL0/dromuyYxdoRlagWbv
-						Ca0F9NuJCYARwGlBaAWCCWgm/4ZWoDYLDugZ2Z3RCrRMTMAKtAPBBJwsTcCGbALOhdFbowkYL1px4s3wje/9dUL423v9wz/+JHz3r/9n
-						eFPAH/D/hsD/64B/Xf3Hyv8PK1p/AP8XROe+8X2tAmy99H6Ef2xcFAMQ4f986CPw33vt2dBj9ZnQfc2Z0BXwr6v/pwXIAeinQluB/9YK
-						/1jhj/DfZOGx0HjBMTEAIpgBUTYAagJEMAtQK5gH/IwqVYDSAGTBCGDPAUwANiDjFKIKE2AMQGECdONyFE4jgnqLCVADIFIDgCpAkm8A
-						rgj8R2UDMEQMgJqA7a8YA1CqsgoQDUCuAsRKQGUVQB9ShSpAUn6SbYZ/WwGIVQDHABzKFQCB5gr4Z10H/PXPCfrvmN4ulOFfDcDRt1RV
-						TcCblZUAvJ9sAgT+o14XAxArANEERAOQTQAMQEUFQKAfKg3Aq6rxFav/V1QK/9uhyyo1AAL+I2j1PxqAuPIflQyAWfkvDMC6M6Hf2jOh
-						/6wNH9kAAP49A6Dw7xiAAv7JAAD+PQMQV/+jAWjcaUhoKCBeX2Jjl0UHw/E3PggnYADeEgMgOqsm4MNwQUzAJTEBl1EJEKESgE3B2QTk
-						TcHLDr8aXp64SYS2HgF+PK1XwF+Bv1jpj+Cvq/3Y2Iuz/EcI+I9YFZ4YHqFf+/yHLBfwT33+Cv5o94kn/DzYF+AfH+yVT/n5fBfb8lPC
-						f3UG4KO2/+Br8XCvuwn/NbpNC7XbDfVz4kfWkL9/qGmPBjl/G3k5HvKYwGMHyGMNyGMTj2Egj3k8NvIYymMt6P7r/utjfXmD0Buw3sD2
-						JgDkTRZvYkHeJPQmLORNcC8QQBw0VA826fYczhD2A85HVPuhoU7fuaHW4JU3NAIPj1gbHh25PjxRtALFDcEwAfWnbQ+Npu8MTWbCBAjk
-						z9mrR+DhDGw8BKe5gH9DMQiN1QTsDa3k39rCBKAVaMnh0G05NgVnE3AiDFgTTcBQNQFnw0gcEboV1YDzagQm7LgUlh59PVwQIMcmz5t5
-						odXn2z/+W+31f1ugX+FfwP+Nb/9YN/5e09V/rPz/sDAACv/vAf6/H87L/wUDcOZr3wunRQuOvKlHFqJnuV+C/16A/zVnQzcxAID/LgL+
-						nVacCh0F/GPrz8m4+o9V/cWAfIF/gf7G84+KjumfswGIJuC4GIDjyQBEE4C2oazWS1BNiC1F0QBEeQYAVYBYCYgmIBsBnE4EeQYgm4Bo
-						AKJgAKIJiOqP9icom4DUCjQ4qTAARRXgZgwAHrImqjAAr4kBeK2EfzUAqQqQ4D8agHS0pSrDfxSv/mf4zwYgn6hj++oV/pMK+M9KJsCH
-						+Hd08/X19XZYKN/PsgagqhGIJqAwAgL8UGEC5L1ERQOQTQAeZgcp/LMBcFuAkgEQ6Ify6v/4Xa8Uq/9qAnTlP4L/6G1RI7dF+K8wAAL+
-						gP/SAOTV/7Tyv0HAH1oXFQ3A6dB3lcSEUbOqGADAv2cAMvyzAQD8uwZA4P9WDEDu82cDkOG/cZdhof6UreHlyVvD7L2XwrHXPwjHX/9m
-						OPnmB4UJOJdNgOjSN8p2oFfe+65WAl4r9gN8P/RbflBgf6OAfgT+5xPw6yo/+vpFz4yC8ACv2N+Pjb3o8Y+r/cvDI3qyz9LwiIB/3YFL
-						Ivjnc/3TQ72+InAM+P9i99nxfH+s+neeXsC/NQB3o/0HP/9B+V1q9J539wxAl7v0dN+o/12jcbd6krN/PsnN5yIv90MeK3hMAXkM4rEK
-						5LGNx0CQx0weW3kMdv91/3XXXt6A8wYm5A1ib7B7E8ObQJA34byJCXkT2ZvwkBcgcgAphFWFu1UJeLj9kFCnz+xoAtgIFCZgdagzbG14
-						ZOS68Pio9eHJMRvDM2ICsBfghbQhuMG0HaHxjJ1p49tuPf4OFYAOCw+EzosP6d6AfGwoNgu3lr/n/QCdYQKWHVET0FtMQD9tBzoZBq07
-						FYboEaGpGiBGAC1BujcgGYFJOy+HBYevhZ2X39WjQ69+8ENdxYcuC7yfevs7YdP5r4fZ+6+GaXteCfuvflCs/KPnHyrhP67+Q5cF/i/J
-						91808H/264D/74ZT8v/gaNDxAkD9BPz7CLBg5b/nmjOhu4B/V4HuDP8dlp8M7QX8sfLfdsmJ0FrAv6VCPSA/Qn8jNQBHowEolEyAfF3R
-						CpRUxQCoCYiVAGwwbq8mIFYdogGI8gxArATABJxPJuC8gH8pNgDZBFRvAC6LAcDGaGsCokoDEIUnKKtgANAGlIQ2oDFQrgSIxorGiQkY
-						v9sYAJEaACM1AGoCyjYghX9UAJIKAyBS+AcwA54Voi38RwG0bxb+LeAvMrKfv67kZ1ZrBJIBUBOA3yn9btkIZBOQwd8agNgGBANQgj+b
-						gCkC/pMF/KG8+p9X/vPqfzQAVwT+o8aklf9RAv5ZhQFI8F8agPNhqIA/4D8agHPRAKRV/wEC/VlY/e8LA7DmVOg/fc0dMQCAf88AAP5d
-						AyDw7xmAEv6rGoAmPSeEl8UANJVYeOCVd8UAfFMNwIk3Pogm4E3sB/hWiPsBUAmIewJiFUBMQNoUDBNwTr4O4P+cQP9zY9dH4B+NVX4B
-						/tEC++jr1xYfQD829uYTfdDfD/BfFh7GkZ4D45N8a6PHv++i8JBIwT+d6//lngD/uOpvH+5l4d8zADdq/wH836j9Bx//ouvMCvi/GwYg
-						Pt33bsH/kP/zQJOuL0qu/jecu428XO8xAeQxhMcakMcmHsNAHvN4bOQxlMdakMdm91/3X3fk5Q0ubxB6A9Yb2JA3CbzJ4k0sbwJC3oT1
-						JjbkBQIvYEAIKKoHGnV74a5VAqCe00PtwgT4RuDh4WvCoyPWhSdGbwhPjd0Y6qEVaIKYgMlbtRUomwC0ArWcg1agvdoK1HHRAT0LG20/
-						MADRBKBKICYAzwcwJgB7AnqviJWA/tkEpM3Bw7UacDbo3oCtqAbACFzSjcIToZ3Q5TB5V9SU3fJx9xX5eEU/Tt6FP78SzgnIK/wL+GNf
-						AeA/t/688v4Pw5UE/5fQ+iPgDwMA+D+rq//fDSff/m44IcbiwLVvaVtDLwF/wH+PVadDN1EXAf9OAv5Y+e8g4N9O1Ebgv9WSCP/NBfyb
-						Ljgamgr0N5p3RAzAkcIAVJgA+bpcBShbgUQC/7ofQISKAqQGY9mp0gCIsOcAwv4DqJO2JOVWoChsUmYDUGkCchUgCk837gsTIMLzDvqL
-						CVADkEzA7RsAPFgtqjQApfDgqWgAcCpNFgxAPLs+qzQA+ZQbrHjHE3Cy4qZYs/qfDMCtwH8E/hLOLbhboLcmwNfbFdKqAGR+HsDfqjQB
-						b6rmiooKABuAg6+ryhaga6UJ2PdaIaz+VzEABv4nyLwB/FsDMGbHZTEAqe1H4f+SKrb/XEwG4EK5+i/QHw3AuTBEwH/wBjEAomgAzuiq
-						f9TpuPqfDEDfpYdcA6Dwf4sGIMM/GwDAv2cAAP/VG4DK/n+tAAyYGV6atCVM2X4uHL32TVVhAES6HyCZgPNvf1tbgSDsCShMAPYDiObu
-						vRCewQo/oN+s8gP4n8QTe3F+v0A/lMEfq/2A/jqDBPoHxLP8odjjv1DAHw/0mifgPy98uQc2+c7WXn9AeNzoO0PFBiDDf3UG4Hbaf3LL
-						D+D/bq3+P9BrTnio0zg/590Z/e8aDbs8Y3O1kZfTIY8BPFaAPLbwGATymMVjG4+BPFaCPLbyGMxjtfuv+6/benmDyRt03uD0BrE34L2J
-						4U0gyJts3sT0JjDkTXgvMEBeIIH+7y+91K6uBJy/pgB059R1fKg9aEVFNaA0AqgCrAmPjFgbHh+5PjwpJuCZcRvDs+M3hecnbgkv6bMB
-						toeGRStQNAF4Emb7BftDJ4H/LksOha4C+tggjFYhVAnaiEFoX5gA+felyQSsPKbl//5rToaBui/glLYE6SlBYgK0LSgZAVQEYAbQHpRb
-						hCaIGcBHmIL8EeYAn59z8DUFfoX/ZAC09Qfwr60/ceU/bvz9vhgGMQAC/2fS6j8MwPG3vhOOvflh2HH5/dB3Hfr+DfyvEPhfhpX/EwL/
-						x0NbAf/Wi4+FlgLzLQD1AH1d9Rf4n3skNIQJEDWeJyZAPg9jkA2ANQGoGuQqQLEnAJWAbALQCiRCu1FWNADRBOAkIjyLAMJzCaCuUNEG
-						FIXjS9kAZBNgDYCagFwJSEYAT0JWE2A0WAzBEDECeFoynpoMeQYgm4DbNQB5I7A1AEX7TwX8lwYgn5oTDYCVWV1XExAFA2DBvwL+BegZ
-						+hefuI7w76QKM1D87LdUCxL4WxUmQH/nN1S2/SebgGgArqmmF6v+rxWasu+qGICoyQL/k/bE1h+A/wSBfmi8GOiK1f9sABL4lwagEv7t
-						6r8aAIX/s6pBIjUACfyz8HwQhX8RTgnrM2mZbwAE/j0DcKc3AF+v/z9u/o0GoNGwhaHJ9O1h/5VvCPy/rwYgVwGiAYg689a30n6Ab2sl
-						4KLuCfhQDMB3witiAl5977uh1azt5eq+Aj96+leFx0WPKfCvCI+m1X5APzb11tWNvUtDLYX+eKQnWn0gfZKvALae7oMV/+5Y8Z+pwoO9
-						sgHI8H+n238A/9kA4Gdm8M/wf6cNwAM9Z4dad++M/1C37eAffenFNg8gNxt5uRvycj3ksYHHEJDHHB6beAwDeczjsZHHUB5reUzmsdv9
-						1/3XTb144HgDzBuIkDdovcHtTQJvsngTy5uAkDdZvYkNeUHACxiQDSyqLzzf+isSeH7gBqQ7oEc645hQSSDZBCQjkKsBD4sJeBQmYNS6
-						8BRagcZuCs9N2BxemLQlvCwmoIGYgEbTd6gJaJ5MQFsxAR3EBHRedDB0XXwodF92OLSTv0eTkE3AATEB2BgcTUB3fVjYsdBHTABaggam
-						agCMwJANOCkIzwyIFQEYgWwGotAmdFGVTUEh+dwYAZSN574WV/4F/HPrD+D/iq78A/6/r6v/Cv9fr4R/rP4fe+tDNQBH3vh2WH36ndBN
-						oL+LqDPgX9t+IvwD/KFWAvLNFx4V+D+iq/+NBfgbCvw3mHNYPormHY4mAJWApGwEYBiaLzpGBiAKpwlhU3GsAuR2oFO64RjSSoAagKho
-						As7o6USQGoDUCtRNhKNLcYJRT1QBsrQV6HwyABcE/KFKE8AGwJoAawCytBKQlI3ASKgwAa9GE5AEAxBNAE6jKY2AHlMp8F9pBNDPXlYA
-						ohGIsiZAW2PIBNhKABuAXAGoAv9p1d7Ce4b8Jbegxfi+JDYBCzwDIOAPZQOQTUA0AHHlPwur/1EwAK+JAYgr/4UBSPAfDcCrYZLAvxqA
-						BP+FAdgh8C/gDwH+SwNwUcE/qzQAJfgP3XROpa0/gP/1Z1QDRWoA1gr8iwD/2QAA/vHU8D6L9hXwzwYA8F+dAQD8ewZA4d8xAAX8Owbg
-						Ru0/UMNRK8O4zafD4avvhSNqAN4Px0SxCvDNwgDo0aAi7Ac4LyZAqwDFxuDvhD0X31HQh7DC/9iwlQL7AvwC/trTn/TwEBzjiRafJQL+
-						SwT4Af14gu+iUEN7/CP4o88/PskX4I8V/7jqb+GfDcDNrv5XNQDVt/9A+H9qyu/2EBmAOwn/NXrMCnU63rVjPgX+B33n8/Wa/rnk5F9I
-						qpKrRV5OhzwGgDxe8NjCYxDIYxaPbTwG8ljJYyqPvSCP1ZjnoPuv+6+KlzdIvMHkDTpvgHoD2Rvw3sSAvEnkTTZvYnoTGPImuxcYIC+Q
-						5CCj+twzTT4nAehbbmC6A3oEgbP/IoF/Uw1IRqDO0NXhETEBj41YF54cvT48PWZDqDduU3h+wpbw4qSt4eUp0QQ0FhPQdOZONQGt1ATs
-						DR0F8rMJ6LHsSOi8+KAaBDUB2g4UTUAn+feuSw+LCcC+gKPFvoD+a6IRGKhG4LS2BmF/AIxA3Cx8VvcJQNg0XCGBkVHycZSYA7QQ4WSh
-						o69/S1f+oSvv/0D3DCj8C/hj4+8FgX+0C+GJxKcF/E8l+D+e4f/1D8Oh178dDl77Vph78FrovPxE6CTg30HAv92SY6EN4F/AvSXgXaC/
-						OeAf7T4C/I1EDaA5h8QAQNEAxErAETEAUdoqBBOgBkJ+jghtRNhEbA1AaQJQCTgZ2mk7UK4E5FYgEfYCwARoO1BUNAHYvHxWH1wWDUCl
-						CcDRpr3XJQOQVRiA+BC0AZuiogm4JPAfFQ1A1NCtUKUByCbgkzQAGf5zJQBtNVEZ/qOqwH9SAf5pJd+C/dLryH5dZXUgGQH8bP0/ogHw
-						TIBWAQT856ICIPAPA6AmIMH/TBmbkFYA9kcDoCZA4f+qqgL+dfX/FZXC/84rqvGiSgNwqVj9t/A/UubaCNFwXf0vwR8r/3n1PxsAwP9A
-						gX88DTzCf1r9F/CHogE4EXqJ+oxfWK0BuN0NwNfr/7/V9p9GnQbr+fy7Ln4tGoDXyACYKkAVAyCyBmD0+uMK+48OWSGQH6FfYT+39xQr
-						/UvSav8igf7Y5vNAXwB/Vm73mRPP9E+bfKP81f/qDADgv7r2H8B/de0/gH8I/4aWH4b/O20AavSYEep0uFsn/QwOddoOevePH3vhDzkv
-						G3k53Mv1kMcGHkNAHnN4bOIxjMc6kMdGHkN5rOUxmcduHuPdf/0zf3mDwhs83iDzBqM3aL3B7U0Cb8J4E8ubgJA3Wb2J7QUAyAsYXmCB
-						/i302Uee+30xAV/zAtQdEU4I6jM31NKWoEojoCZg+Jrw+Mi14clR68MzYzeGZ8UEvCAm4CUxAfXFBDScBhOwMzSbuSu0nL07tBbIbze/
-						rAR0WwITcDj0FMhHNUBPDpobTw7CxuFOMAHyNd20Jeho6GWqAbEtKBkB7BHYgBODohlAZUCrAyJsHFaJIUDLED6OECAZLh+HyefHCcCc
-						E7h/ReBfV/5z6w/6/gX8Ff6//l3dXHxaV/+/E04I+B8XHX3jw3BYDASeVIy9ANhcjJ/XfkkJ/60WHQ0tFx4R+D8Sms0/HJoK5DfBSn8C
-						/5dnHwz1RQ1hAtQIwAQcFgMgX5cNQFEJOComQEwETAAMgFErMQOtxQy0WXqiigHIJqCDqKwCRKESEKsBpQHohlOMRFoJUBMQFQ1AVJ/1
-						OPbUGAARDICaAJEaAFE2AGoCNicDoCYABgBPUi41Qp8eCwPwihiAV9QARBMQNRZHTyYDEE0Ank6bDUApnGATDUA83rKqAXidDABWywWY
-						Af8wAiI1AGoC0uq/SOE/9eBDPvxHMfhbyK9e+L6o/HOyKk3Am6q8+l9WAGL7z5xDr6tmm9V/NQGp/WdGgv/pAv9qAAT6oSl7X1WVq/9i
-						AAz8RwNwWQyAwL+u/F9KBuBi5eq/gH80AOcV/odh5T+Bf4UByKv/pvUnr/z3Q+uPwr9Av4C/GoCVx0PveTsq4b8aA6Dwf4v9/3ei/adx
-						t1Fh1MaT4dCr74VDagDeC0dhAkTHX3+/MADQ6aIN6FtqAHIVAAbgwjsf6kk/WPGP4L881B1UCf61C/CPq/0Af4X/Pgt0cy/A38K/nutv
-						Nvpa+PfafzL8swG43dV//ByAf5a3+n8nDECNrpMld921k34E/ge+/gc1nvjtnIeNvFwNebndYwDIYwaPLTwGgTxm8djGYyCPlTym8tjL
-						YzSP5Tzmu//6Z/byBoE3WLxB5Q0+b5B6g9kb9N7k8CaRN9m8ielNYMib7F5g8AIIxMEG+n/+sE69363TdtBbXqC6E8IJQbV7zYwmwBiB
-						2kNWhrpDV2kr0BMj14WnRosJGLMxPDceJmBzeFlMQAMxAY3EBDSZsSOagFm7Q5u5e0N7MQEddU/AATUB3ZdGE9B50YHQSisBeJAY9g3E
-						agD2DXTTagBMwNHQOxmBvgIF/dbgyNDSCGh7kFYGzujpQbpnQE8RiqYAwh6CofJxCCQgMnXPFV31z6v/aPu58A3A/3d15V9X/9/5jp4m
-						dOKtCP/H3vi2tv4cFvDH6v/+1z4I+65+M+x55Zth6KYLoY2Af+tFR0JLAf/mCw5H+AfUzz0UGs05GBok8IcByCZAKwGpGoAKAVSaAFQC
-						xESgilBRCYiCAcDRorkSgNOGYASw+Rhqv/xkhQHIJqA0APHYUghHmMZKQGwFKqsB0QSoERADULYCRfUTlQYgqtIAXKowAGoCRIUBEKkB
-						SFITsMMYADUBqQogUgOwOxkAIzUAe5MByIIBSFIDgCqAKJ+OowYgwX+lAUir6wBtNQClYl9+aQAKYHfhvnLV35M1ABUmQP4faBH+v+L/
-						ZwNQrv5HZQNwrZAagLT6P23fVZWu/mcDIOAP+I8GIK7+ZwOAlf+4+p8NQAn/agAU/gX8RXHlHyY7G4BzpQGQ+Vb0/uvq/2mz8p/gH8qr
-						/7ryf1zhH+q5QkzAmHn3ZPsPVv+b95satp9/Jxx89V0xAe+mKgBMwHtaBYgGwFYBPogGgNqAVh+9WsC/GoDBMAAJ/nVjb5Q+wEvgP7f7
-						FPAvQP1VAf+v6gk/6aFe3Wcr/HsGIMP/7bT/AP49A5DhH3/H/12rnw//d2r1Hw8ve7DzBMlbdxH+2wx64/dqPv07yL1GXm72cjjk5XyP
-						DTyGgDzm8NjEYxiPdTwm8tjJY6zMX1Yes3ls5zHg/ddP+cu76d7g8AaRN9h4QHoD1xvg3kTwJow3sSBvEnqT1ZvYXgCAvGDhBRYbeFS/
-						85Vav1W7zYCTXsC6U6rTbZIYgGUVRiDuB1gdHhuxJjwxal14WkxAvbE4sk5MAJ5UOWlLNAFTowloPnOnVgLaCORnEwDoL03AYa0ItJmH
-						SgCOEI3VgI5iFKIREBMgX4dqQE88PRhHhq6KG4VxYhCMgJqBtFeg1GmBjSiYA7QODdbVx9NiHCKALDn6emr9+Z7CP1b/Af555R/wfxLw
-						j9afN9D3/61wxKz+HzAGYPuld0OPVScF/g+HFgL+zeYdCk1EjRP8N5x9INSfdSC8NPNAeFk+Qvg7TIE1AagSoBIANZ3HJuCoGICjpQFA
-						FSBXApYc1xOH2i7FHgRjApaJCVgWn0kAdRITgCcUswkoDUBuB4pSA6AmAE87zpUAgf8kGIDcCpTbgaqYgC1RuRVomMgagGgCohGIBiA+
-						aTYrmoD4IKpoAMoHVVUagHSqjba4xEpAPu4yGoAobIwtDUD8mKsBuQ3IGoAs7cdPBiCvzmdgZ5DPgL/s5PW1VL9Wvgc/Iyn/TIX/JK0A
-						JPAvDIC2/8SVf1sBAPSXeq1Y/Vf4T+A/de+rqmwAAP9qAHaVbT955V8l4K8GwMC/GgCz8m/hf5iAvxpugf5sAOLKfzn/+puVf8A/hNX/
-						vPLfa+Ux3Q+kxwTP3nTL7T+A/+rafwD/d6r9Z8yiLeHAK98IB1/JBuDdCgNw3JgANQCpCoDjPm0bUM/Fe8vVfxzjWaz8Z/hPT+/Vh3iZ
-						030Ephn+dfVfADwbAAv/bABudvXfa//J8G8NAL4egG/h/66s/mOzb8fRbu66U6rdZuCF3/yLBz4jOfcXOQcbeTnby+0eA0AeM3hs4TGI
-						xyqQxzYeA3ms5DEVc5fHZh7DeaznMeH910/Zy7vJ3mDwBg0PLB58kDdIvcHsDXpvcniTyJtw3sT0JjDkTXYvMHgBBPKCDQKR6ud/+Zf/
-						Q61W/ZZ7getO6WFsDh64ONTMJkBUZ+jKZALWRhMwZkN4duzG8Pz4TeHFCdgUnCoBMAHTUQnYGVrBBKRKQIcF+9QEoNWn+9JDagJ6LT+i
-						bULYN9BmLh4YZjYILz4khgHVgLg/ILcGVVQF0CKU2oQKiSnAE4Yh/Dl/ToFDhD/vEHC/IOCvrT/Fyn+E/1Nvf6ir/4D/o1j9F/hH+w9W
-						/w8I+KP9Z8+r3wy7X3k/7Lzyflh7+p3QdvHRCP8C9LrqPyeC/suz9iv8vzQTH/fr360JaAjJ1zfKlYBkAtA6BBPQDBIjgD0FUGkCUAnA
-						huNoANQEiNqpERDpqUSoBKRqQDIBagREeG5BV1E3mIBkBFwDYExAbAWKUgNQVAIuFJWAQSoxAKklyFYCYADQCpRlW4FgALJGC/xDuRUI
-						BqCyFajSAGRNVhNQaQAqW4FKA2BlqwCFAYCyAUgCkFv4ZwPA8L/cUYR/qgLg5yTl1f+yAgAD8IZqfpIagAr4L1f9Cwn4qwHIq//GAET4
-						j+Cf4T8agMthvEA/lOE/GwBd/Vf4j+BfYQAA/gb+46r/mSg139EADBCD3h/zT+ch5mO58t9b5jNUGAA1/kd171DPUbPvePvPjVb/q2v/
-						0dYfUVP53NbjV8J+MQA4/z9XAY5cTQaAqgCnRNEAfKAGAIIBgEl4ctiq4hz/3PNfwH//xSoYgNzzjzP9Ff4VotH2M1fF8P9xrf5D+LkA
-						/9qiu7n6/0CPmaFO++FuzrpTqtWy36Zf+rVf+4825xp5udnL4ZCX8z028BgC8pjDYxOPYTzW8ZjIYyePsTwWY17zmM5jP48R778+5S/v
-						pno33xskPJC8weYNSm/weoPcmwzepPEmlzcJvcnqTWwvAEBesPACixeAoH8n+qWHmvce6wWwO6YOw0KdvvPUBEC1B68IdYesDI/gWLps
-						ArQSkE1A2Q7UGO1A07erCdBKwNw9qRIgJmBhaQJQBYAJwGo/jII+UAxPFZ4fHyqm1QDdH3A4tQbF9iAFBJgBgYU+Ag0wBKVOaJWgkPxd
-						VxghwMZKPHjsVDgiQJ9bf85o28+HuvJf0foD+Jevw+r/wde+qav/ewX+9wj8777yXth5+X0xE++FhUdeFwNwMDSefSA0VMAX0Af0z9gf
-						XpixL7woyiYgGoFoAlAhqDQBUagi5EpANgHNYQJyNUCEk4ZgBKIJiMePFgYgVQRiJSA+o6CTmoBSnVeeikbAmIAeq8UAJPUUI9ALEhPQ
-						Gw9AWw9VNQHZAFSaAFQDLiYDcEkMQJSagKIacNlUAa6EUVCqBORqQH4CrZoArQTgqEpbCYhn2NtKAKoAhQFIwln4uQpQ9MoXBiD20+eT
-						dW5sAN4qDUBSXtFfdgMDAC3Tr+MKwFuqsgXoTTEAcfU/wz/AP+r1qgYgrfqrBPwrDIBZ9c+KBuBKmAT431kJ/9EA5JX/svUHG+lLA3A+
-						7q8R8I8GAO12edU/w3+swKEqN3CtGAAY8gT+eeUf8zMbAIV/mdMw+lndJTb0mr6+Av6ra/8B/LvtP3dh8++IyQvD/otv6/GfWgV49RtF
-						FSBXAqIBeD+cNCYABuBsrgK8/e0wd/e5Ev7Tyn9s/YngD+mG39Tzr0/z7S0GACv/BfzPUfj/JFb/8XkAPcCf4f9Or/4/2G3qXe33hx5q
-						0WcqcmvKsVleDoa8nO3ldo8BII8ZPLbwGMRjFY9pPPbxGMljKY+5PDZjfvMYz2NBjxnvvz6FL76J3s32BgUPHG9weYPQG6zeoPYGvzdJ
-						vMnkTTpvcnqT2JvsXmDwAgjkBRsbkLJ+6cEm3ftI4PoJB7I7JX1ycM/pWgHQasDgleFh7AcYtjo8PnJNeFIrAevDs2M3GBOwJTSYnEzA
-						jO1lO5CYgHbz9oYOYgRgArpoS9DBuDl4edwbgGcIxA3CsS2o/fy4SRgPF8NmYlQFSjMQqwJQNATRFEC5UoAThbCiiL/3lI89VhwX4eMx
-						3TCMFX/A/2nAfzIAEf5j20+E/w/CIQH/A2IA9if43yPwv0uEFiBo68V39eFjjQD2AHyF/r3hhWl7wgvT5c+il2ACxBCwCWhgTEDjuZA1
-						AXFPAYRThaqYgEVQPHoUaitmoB0qAakagONJO4hwVCmEB5YVBkCUKwGxGiBCJSCphz7wLBmBohJwrjQAWRvOh/5iBAaIERgoGrQpSQwA
-						mwBrANgEsAGwJsAaADYBbAA8E5ANQIUJIAMQTUCEbNtyA2ElHivy0QREA1DCuygBvZqAk28XsL+CtFz/rTQA0QQI/MvPhOLq/5thkf5/
-						HvyLBPrnHroW5gj4A/7ZAMzYf1XBPysagFcE/KMmY+VfwD8rPi/DwH+x8n+xaP1R+BfoB/gr/GPlf3OCfwH/su2nXPnP8B8rcUkK/7Fy
-						V8C/zFGdp5ijmJsZ/mV+42GBeoDA8Bn3zOp/M/n3bXuPhX2XvyYG4OsqmIAKA3A1VgFOiAlQAyDKVQA1AKLzYgJaTd8aHsGZ/oPjmf51
-						BsWWn7zqX/T9C0wz/KP1B/CfDcDHvfqPn5nB3zMAd2r1H/3+NTqPl3x0V+H/JzWadO+HnGrk5VwvN3s5HPJyvscGHkN4rOExiccuHuN4
-						LOQxk8dWzF+Qx2rMcx7zeWzI/Hj/9Sl58Y3zbq43CHigeIPJG3Te4PQGMQ90b0J4E8ebYN5E9CasN7EhLwh4wcILLF4AgmyQ+qUHGnZp
-						L8Hx752gdsek+wIGLouVgLQp+LHhq8MTI2AC1hoTsDG8OHGzPh2zweStodGUbWoCYiVgV2iNI0LFCKAS0GnhfjUBXRcfDN2XRiOAagCq
-						A2gJyg8WQ0Wgfa4ILMRDxOLRodYM4PQghYVCR/UjqgUKFPKxu3zsJuoqf8azB7qIpuy6HDf9ppX/2PrzrXDU9P0f0pX/CP97XwX8p9V/
-						wL+AP7T14jfC5vNfF4C6FF6aHsH/+Wl7w3NT5SP+LnpR9JKYAjUBIlQIYBZQLbAmAC1EEExAU0iMgDUBOGUIwolDUCs1AtEA4DQiVAKy
-						2mlV4LgaATysLBqAUtEEnBIDcCoagFWlAVATICorAWfVAJTVAJiBc4UBQCUgVgPECIgBgFAJGCwmYIioqAKoEYgaLiZghJiAkUlqAkSj
-						d0SNERNQVAGSERgvwtNqcW49pAYgCU+1nSJGYKqYAJx6UwgmQISTcWaKCSiqAElqApIRUBMg0I/NttYAqAnIBiDJmgCF/yRAPoB/5Skj
-						+buagPQ1SwX8IV75B/yrAZD/Xw3A4dd11V8l8F9hAAT4Z5lV/7jyD/B/VaXwL9APlQYggb8I4B/hPz5hG1L4F+gfs+2CCvAPRfCPp2vl
-						lf/SAMSN+Bn8Ff5F2LCfV/4t/KsBWBXbfgr4l7mpbT9J0QAc1jneY8qqe2b1f/K8VWH/8QthLxmAg9kEpFYgGIC4DwAm4P1oAFAFEBMA
-						A7Dx5LVK+B+4RFV7QAT/CP8LI/z3gQD/ue8/rvx/Eqv/+DvAvE7/hWJURA78V7f6z3B/Q/WcHR68y/3+ddsP/ruvNujSVnLpv+fcmuTl
-						YMjL2V5u9xjAYwXIYwuPQTxW8ZjGYx/mI4+hPNZiHoM8dmO+8xjQY0Xmyfuve/TFNwrim+nddB4YEA8eb5B5g9EbtDywvcHvTRJvMnmT
-						zpuc3iT2JrwXGLwAAnnBxgtMCFiqL77U5vm67Qb9rRvg7pQ6jdZytDUBjyYT8BQeXT9mXWkCJmwqTcDUbaHp9FQJmLUrtBIjABNQtgTt
-						FxMQqwEwAtgbAKElqAWOFJWP+DM2DLdTMxCrArlFqFOqDKjEPHQWYMAm4lKA/fgR/9Zp8ZHQST8eDh1FK469kVp/vh2Ov/ntAv519V/A
-						H60/+69+M+wT+N9btP5g9f8bYZuA/9YLEf43iTac/Zquhj4v4P/slN1iACCYgT1iCrIJyNWAfWIC9qkJaIB2oNwSNOdAhQlokk0AqgGi
-						5mIEWmDTcTIB0QDgJKIoNQFFNaA0AGU14EQ0AiI8yAxPM4bUBKRKQPfVUdEARPWCYALWCvzDBKAakIRKQH9IzMAAMQOoBKhSNWDwZkiM
-						wBYYgYuFAYgmQLTtUjQC26MJyAYgqrISAAOg0kpAMgMVBiAJve9aDYABiBti9WjMJJyVXxgAUW6pgRHgSoC24mQTAEAXUI8GoFJLxQio
-						AVAT4FcAsknI8I+V/8X68zL8v1HAf4UBcFb+owG4KuAfNUNX/SP8Txf4n7aX4F+gH5okxrdc+U/wbx6glw2ArvxvPR9GbkbLTz5aF+Af
-						H8yn8C/gj6N5ocq2H8B/2oMDZfAXoVUvwn+s1GUD0GM5qnpoCRT4V2MPAyBGf9H+0G3o1E989b+1/IxdB0+G/Scvh72Xvhb2XU4G4Aob
-						gHfTZuD31ABA1gCcfeuD0GfJvmgABP7rOvBfS+C6Zl8YAAHoDP8KxVGfxOo/vhewz/DPBoBX/29r5b/HrFD7Lvf712076G+++ELrZ2wu
-						NfJyrpebvRwOeTnfYwOPITzW8JjEYxePcTwWYl7ymMpjL4/RmOM81vOYkLnRY8v7r3vk5d0cvoEQ32RvMPCA8QaVN/i8QcoD2Rvs3qTw
-						Jo83ybzJ6E1ab3J7QcALFl5g8QIQ5AWr//C5JxvVrNN20IduoLtDqtN+aKjZe3aoNXh5qCMm4GFsYBMT8Hg2AaNhAtarCXgBJmDi5lB/
-						8pbQEJWAaWICZuwILcQItNYTgsQECNTDCHQSIxCrAQdCd0n4PZceCr2WH9a2n5az9oQW+hThuKEYm4V1w7B8H/YKYNNwe2MIoA7pY8dF
-						h5LinzuI2kMLD8r3ifBvYgJ2Cswff+PbcfVf4P/ItQ8U/LXv/9UM/+8p/O8S+N8hX789wf8WAX8YgA3n3gnrzr6jm4JxhOGzU3aF5yAx
-						AKUJ2GMqAckIqAnYJyZgv5gA0ez9odFsMQCixjABoiZzDyYTEKsBMAFZagRErRYdIQMQhecUwAi0FyOAh5Z1FBPQKVcDkglQI1BUAqK6
-						wwioGRADIFIDkKoBvcUI9FkXFQ3AOTEAIq0GwAScFwMQNUiMwGCYAFQDRFoNEGklQDQcSkYgVwNG4YmzMAIV1YArRSVgvD6ptjQAuSKg
-						JkCUTUA2ALkioCagqAREzVIjAKAuTQBO2cktN3nzbQTyZACykhHIZiCv6mfIzy0/WctOyL+Zr1uSwN/CP5TBX+Fffp8M/6UBeC3CfwL/
-						0gCU8F+A/+4rhSrg36z6A/6h2PZzQZ+unR+qp60/Gf511T8+dwPKK/8l/OfTuE5FA6DwX4J/1HHdt1PCf1r5Xybwrzqse4Iy/HdZDIN/
-						MHSfuPwTX/2ftWRD2Hv4dNh35mo0ANkEiGAAoAoDkKsA2gr0fmEADr3y9fDEsOUF/OPAhdj6E8Gf4V9bfzJEfwKr//g8/u+6YlCgW1n9
-						vx34/0rnu3u+v6rtoK//cd3n/gK508jLrV4Ohryc7eV2jwE8VvCYwmMPj1E8lvGYx2Mj5iePsTwW85iNuc4yXxbzoceQHmvef32CL74Z
-						3k3jG+vdfB4gEA8ib7B5g5IHrje4vUngTRZvUnmTz5ukPJG9CQ95wcELIl6w8QKTDVyq3/qTr/xO7dYDzrgB7w7q4e6TQx2cWIEnV6oJ
-						WKMmAO1AagLGwARsKE2AVgO26L6AZjO2iwnYEVrhWQEC9VoNwJOD1QjktqBkBBQGDobW8jV4vkDzWXjGwB59hgA2DGt1YJ4Ygnn7xRDs
-						V0OAB43hSFE1B2IK9M9Z8w+EtvKxDSR/bi1f03reAV2BPHj1mxH+X/8gHL4m4C9/hwD/+wT+94gA/zsvvxt2CPxj9X/L+a/F1f9zXwsb
-						BP7XnxEDcOrtsOrkW6Hj0iOhXmECdofnRS9Mg6wJiIqVgGgC1AioCTigajzngBiAA7EdSKQmQFQagMNqANQEpIpANAJR0QB4JiAKTzSO
-						QjXgZOi6ggxAqgj0EOVKQO+1UDQC2Qz0FUUjkAyAkZqAZASyAYgmIGo4pAbgkhiAqGgCknZcTgbgihiAqGgCXhH4j4oGIApHXJYmICq3
-						A+GhWNggCyOgBsBKqwEC2QrcaeU9GYFsBgDn1ZkAgDygvjACpCrgL98P5VV/2/YT4f9aITx9Orf9zD5wVeE/GwC0/Sj8m1X/aAAs/F8O
-						kwT8J+68pMoGgFf9rQEo4F/AP4pX/kUJ/LMGrY3H81r47yfQr0f4ikr4Pyom37T9yFwv4H9JWvk3BqDT/N0C/1MK+K9u9V/h3xiAm139
-						L+E/GgCG/07yf+05dEoNwN6z18Iegf9YBYgm4MCVaAJgAKwJgAE4fu291AYkJuDNb4bxG49H+B+0JNQB+Fv47wf4F4gWAaAr2mcM/Hur
-						/xH+/dV/wH91q/+A/+pW//H9AP6HB/rwX93qP35vBvsb6YFec0KtTuPcnHMnVatVvwO/+pnf+03Jmb+cVCWXiryc6+VmL4d7ud5jAoj5
-						wWMMj0U8ZvHYxmMgj5WYpzzm8tiM+c1jPI8FmRc9pmTuvP/6mF98AyC+SXwjIb7Z3qDggQPx4PIGIQ9UbzB7g96bHN4k4onmTUietJA3
-						ub1A4AUML7B4AQjyglUOZL/8i7/yK79aq2Xf9V7gu6PqPFqTV2kCYiUAJuCpZAKeGwsTsFFNwMuTNqsJ0GoAWoJm7AgttRqQWoLmoS1I
-						jIAAPIxA50WxNQhGoMfSQ9ou1FS+HkZAzcDM3WIIdocWab9AK/kZMAR4wnBrMQWQmgQxB1o1SJ9rPXd/aCWfaymfazlnX2ghH1vIx+EC
-						M0cE/A+/9kE4lOB//6vv6cq/rv4L/O8C/F96N7X+YOVfDMC5r4eNCf7XnXkrrDn1VlgtBmDliTdDm4WHQr3JO2M1YGo0AjABL4oJeGm6
-						UYUJ2KeVgEbGBKgRUBNwUOC/VGECRHgWQTQAqAREZROQKwHtIbQEwQSIOi2LsgYgmoCTodtKMQFZYgh6iBGAeooR6LXmdOitRqDSAJQm
-						ANWAc2oEKqsB56MJUCNwoTAC2QzACIyAERCpCUA1IAlGYAwkZqDSCFwJE2AERPpAK2xyrTAC2AQrJiCZgfxgrFgNiBtni+Mz1QTE9prC
-						BGSpGYhgHqsBEdjjqn00A3k1PxsBTxn6M/hn+F9wBD83/vz5+n9a+H9N4D+t+lPLD8A/wv8rCv9F2w/AX64NVMJ/NAAK/wn8SwOQ4f98
-						GC3gP2pzhP9oAPCk7bjqjydw27YfNQDr4sP5FPwT/A8Q+I9tPxn+cWIXNubblf/Y8qPwL+AP4XQwbPwF/OvG/0UHAh4kCHUft8Rt/alu
-						9R/wX93qP+C/utV/wD8bgKXrdoQ9Av+qc2+GPRffqTABaAU6eAUGIEoNgChWAWIr0Cm0A8mfnx+zKrb9KPwvUviv3U8MAEBaxPBf3eo/
-						4L+61X/A/+2s/mf4x+cB8wB/C/83s/p/O6v+OOKz1t1u+RE91Lz34n/1i7/4/9mcaeTlVi8HQ17O9nI753/IYwWPKTz2YD7xGMZjHY+J
-						PHZivvIYjDnNYzmP+ZgLPXZkvvQY9P7rY3jxRecbA/HN4xsM8SDwBgsPKG/Q8cCEePB6g9ybDN6k4YnlTT5vknqT2Zv0XnDwgogXbLzA
-						5AWw/xf6uZ/7uV95sHmv6V4AvJOq02FYqNV3bqgzOJuAVWICVhcm4Jm0OfiFcRvDi+NhBDbFasCUraHJtG2hWWoJajVrV2EEcFJQNAJx
-						f4CeFqRG4KBuGMaJQk2m71Q1FSOQpWZA/q3FLDEEs6NaiJrj4xzsJ4gfW87eG5rLR3y+mfy5qXx901nx4+SdF+OJPwr/se0HK/+7BfwB
-						/7uK1p/Y9rP53NfCxnPvhA0J/tcm+IdWnXwzLD32emguhuPZyakSkJSrAS8aE/AyTICovqiBGIHSBJTSasCcg9EIQPNRCYhqIVITkCoB
-						rUV4SnEWnlXQbsnRZAKOpUpAKVsNgAnopibgpBgAqDQB2QCUJiCqj0gNQFL/9RBMQNRAEQyAmoCNVU2ArQbcigmAAajOBEzOJkBUPgjL
-						mAAANExAYQSiUA1QEyDKrTdsAqIReL1YtS/NwBsVkB+Fz5VahK9N37MAPyf/TPl/IAv+Cv/yO5UtP6+qMvgX8C/QD+Fp1xn+c8tPsfIv
-						4F/C/4VCCv9bI/yP2hKhvyr84ynbUWoABPyHpHaf2PJTrvxXwj8e4CcS8FcDgJX/DP9o+Ungn+G/q8xzXfVX+M8GAE8TF83ZKfA/SeG/
-						2tV/gf9qV/8F/m9n9b/38Ona+48KwJ7DZ8KuC2+H3TAAor2X3okGQHRQTADaeyBUAaIBeDcaABEMwMJ9Fwr4VwOg8L9QwV/hP62g397q
-						//Vbf6pb/Qf8WwOAnwXgz/Bf3eo/4N8aAPzOtwP/NbpMCXU7DHVzzJ3TkH96qEmPcZIfcca/5kkjL5d6OdfLzV4O93K9ZYEsjx08xvBY
-						hHnFYxqPfTxGYo7yWMtjMuY2j+2Y/zxGZI70WJN59P7rLr34QkN8M/iGQXxT+cZDPDh4AEE8yLzByAMW4kHtDX5vkvBE8iabNym9yetN
-						ci8YeEHDCy5eEPKCFQc06D9+uX7HLnXaDbqrJwRBtbpPDrUGLQ0PD11ZmIAnRmJfQDQB9cauD8+NEyMAEzBhU3h50iatBuCUIN0grG1B
-						sRqgbUFz8pGhlUYgmwGtBszYGRpO265qJGagcVIT+XzTmbsrzAH+3mSGCB+t5HONIflzI/nYcMauMFtg6gDafl6N8L/nyrth5+Vv6D4B
-						bf0R+N8CAyDwv6kC/t8uVv/RArTqxJuqxUeuhSaz94kJ2CnwH6UGIOlFrQjsLioB2QCoCRA1mpVUGICopnMPRBOQqwHzYAJySxCqAYeT
-						CYhqqxITIEag/eJYDeggQiWgNAGoBsSKQFkJKAUj0EONwKloBES91QiI1p5OJuBMhQHwTMBg0ZBNWTABUcNE2g4EE6BG4GIYKUZglBoB
-						nEkfpSZANBbHVu7A02txok2pickI4EFXkytMQJZnAgSuswmQv+N0HW23yRWBZAaKioAoGwFrCLIpqF4R+CP0C/CLSuDPsuB/tWj5YfCf
-						IWO1Kvxf1hX/vOpfwv9Fgf/Y6z9OgD9r7LbzcdU/wf+oDP8J/DP8qwHYcFrgv1z1j/B/sqLtJ8L/cYX/flj5F+iP8H+0bPsR8Ifsyn9c
-						9Y/wHw3AAT0uOMM/5jz2C3UZs8CFf2/1/05s/MVDv9Zu3acGYDcMwJGzYef5t8QAvF0YAAgGQNuAkglAFaAwAEUV4L3QZsYWMQAO/JsV
-						dA/+vdX/O73xF18DsLfgXx38ZwOQf+/bafnBKT81Oo5xc8odVdvBf/ellzq0Q0408nKml1u9HOzlai+ne7nfYwSPJTzm8NiE+cVjHI+F
-						mJc8pvLYi/nMYzjmPI8FmRc9pmTu9Nj0/usOvvji8g2A+CbxjYT4ZvOAgHjQ8MCCePB5g5QHsjfYvUnBE8ebXN4k9CarN6l54nsBwgsk
-						XsDxAhPkBTEb5P7jnz3V5Kk6bQd9xw2Md1KdRmkvK1qCHh22MjxWmIC14enR60K9fFRorgaIEaiPtqApW0PjqdtCs2QEcFIQjECsCJg9
-						Agv26mZhmIEsHC1aX0wE1GBqNAMNp+8IjaYZiSkoNA0fd8nXieTvUAP5mvry9/pTd8pHfP3usPL4G2HvlQj/uwT+sekXBmC7gP/WC18L
-						WwD/Z98JG8+8Hfv+T8fV/zUn3xQDAPCPLUAwAPg47+DVUF8A/9lJYgCSEXh+6i4xALsKA6AmILUGvTxjT6g/E0Zgb2iYDYBKTIAYgSZz
-						9oemYgLUAFSYgIOxEiBqtSAKJiALRiAagKQlR5MJiEagk6gzTIAaATEBoq4rThgDENVjFeSYAFGfNakaIMpGYIBVYQTOqRHIZmBokpoA
-						0Qh90iwEE3BRDEBUYQLUCOC8+vjkWpxhD/iHGciGAEdd5ifeRjOAvvhKM4CjMvOZ+dpLr6BdmgC03EQjgDYcUxWQjxncIbTtqAzYu9Kv
-						tdAfYd8K4K/wL7/LLIF+aKYFf1Fs+bmi0D91dxSOtS3h/5KqgH8B/2rhfwuU4f9sCf8Z/HXVP8N/bPcB9GcNXHtCwV/hX6BfwX9VBH+F
-						fwH/CP9HVBn+seKfW34KAwDwL+B/X+gIybzH80O0Mjhz603D/51o/Zk4Z2XYsf9EYQB2H7ugBgBVgD1iAvY6VYCDqQpwJJmAbAA2nLhq
-						4D/2++eefw/+vdX/u9H6g4/42Y/I7wYx/Fe3+p9/79tZ9f9q9xmhdoe73/Ijue+HyIGSC3+Fc2OSl0O9XAt5udnL4V6uZx5gXoA8tvAY
-						xGMV5hmPeTw2Yn7yGIs5zGM15jmP+ZgLPXZkvvQYlDn1/usjvviCQnzR+cZAfPP4BkM8CHigeIOJBxzEg5IHLsSD25sEPFEgnkzepPMm
-						pzeJeaJ7wcALGl5w8YKQF7C8wIaAp/rPf/i5363Vqv9xL0DeST3cYUio03tG3BcwVEzA8FXpWQFiBEbjqNCyGlAcFwojMHFzaDR1a2g6
-						LVYEsEm45azUGjRHjMCc3aHdXBwDmqoCqn26V6CDGIPGAv0vTdoaXp68LUpNwXaBehE+il7Wvwvs54/yby9P2aGff0n0AiTf+8Lk7aHJ
-						zD0K97vTyv/2i1+P8H/+a2GrwP/mc4D/dwT+31bwXycGAKv/pQHI8P9GWAEdfzPMFGB7WSD/2ck7VGoCpiQTgEqA6CU1AagG7I4mQKsB
-						YgKyZu0tqgGlCaiUmoB5pQlorZWAUrka0G7xEWME0BIU1UkUDUBUF5GaAFUyAFkwAaJeq0+F3jACoj5qAlANOJ1MwBkxAWfIBJwVE3C2
-						MAG5GpBNQFkNiMomIMtWBKwJyCpNwOVkAkpFE1AKD8lSE5ClgB177LPyhtu4ATcKPfkZ2AuYzypW8qFKuHclP2+uGI05ST74v2JW/K+o
-						MvwD/CP8XwqTM/jvyAL4x1afCvgX8B+z9ZyCfwH/Av0jN50pwL8C/gX80fKT+/0L+M/gj5afauH/iCrCf9nuUxiAxbG9L8J/NPcZ/CP8
-						x7ZALAS0m7sndB4+p9q+/+pafwD/1bf++Kf+4P/AQ79gAHYeSCbgxOWwAwYAVQA1AckAXIoG4MCVshVIqwCvvhuOwQRcezf0W7JX4H9R
-						6vsH/JcQ/Um0/kD4GQD9RwdVhf9sAKpb/cfvWgXsb6g54YHOE+/+KT+i2q36nfqNz/7F79tcaOTlTC+3ejnYy9VeTvdyP/MB8wPksYbH
-						JMwtHtt4DMSc5LEU85bHZB67Md8x/0HMiMyRHmsyj3rMev91Gy++iHyhIb4ZfMMgvql803lgQDx4vEHGA9EbrDygIR703uTgCeRNMm8y
-						epOWJ7Y3+b0g4QUTL+h4wckLYl6w+0//9t/+v//lwea9V3qB8k7qYQT27pNCncGxJeiRYXhoWDQCsRqwNtTLzwwYt7HCCOhJQTACYgJ0
-						f4DuERAzMFvMQGoPAgBAumk4bRxGa0DzmQLTYgJemLhFFD++KB9fnCx/xucnbQsviuKf8XnAfvn35yZuC89O2Bqele+pJ9+LPQJbBPR3
-						CPxvu/A1Ff4e4f/tsEEE8IcB0NV/kcK/GoA3VGoAjkctP/Z6mCUQV1/g/tlJYgAqWoJ2JiOwqzQBomgC9ogJ2FOYgLIasC9WA0RN5+53
-						TMBBMQEHQysxAq1hBFTVmADdG4BqQBQqAtkIdMlK1QCo+8oTyQBE9RRFExDVZ01WMgGi/mIEBqwT+M8SIzBQNGiDmADREDEDUGECRMM2
-						44mzZUVgJJRNQBKeVItqwNj0BFtVqgjEqkDURDEE+em3eBouVJiAJGygzSYgGgH020cTECsDniEAtMcVexfureRrrSzwR+iP4D9TxgkE
-						4M8C+Gf4j+B/WaXgL8CfFeH/orb7xJafDP3nC1n4H7X5rCqu+mfwP63KLT8l/J9UVcL/cW350bafouXnqArwD2XwrwL/WPkn+LctPwX8
-						Y19Qmu+oCHaYuqEK/N/pvv/GnYeEJWt3hO37josBOF4YgF0nXw07zr1VUQWA9hVtQKkKIDosJuComAAYgL3yNY8NWRrhPwF0hn9rAD6u
-						1h/8Hf/nY4OXFPDvrf4X8G8MAH7f2235ebDDXX6wV1LNFr3X/sIv/+ffQO4z8nKjl0O9XOvlZC93ezneYwHmBY8pPPbwGIU5xmMd5iGP
-						mTy2Yv7yGI05zmM95kHmRY8pmTs9NmV+vf+6hRdfPO8C803gm8Q3EuKbzYOBBwzEg4oHHsSD0xvEPNC9ycATBuJJ5U0+b5LyRPYmuxcU
-						vODhBRkvGHlBywtuNvipvtqwU18JkP/AAfNO65HOo0Ld/gtC3SErxASUewOeHLk6VQPQFlSNEZiUjAA2CsMMaHtQrAqg7QdGIO4VSBIo
-						UMmfG0zdFuqN2yQwvzk8O35zeG78lvBc+vOzE7aonhPAryefqyf/ho/4XD3596fl78+Mk4+ip8ZuFiA5WMD/1vPvqAFA68+GM2+F9QL/
-						6069KeL2nwT/Av2QNQDLRNMF3l6etiuZgKjntRoQTUBsC4IR2BVeFrOA1iGogRiBhjOyCYhqPNuYgDliAlAREDWHCVAjcCC0EBOAakBp
-						AqLaiBFoK2q36HBoL2agvZiBbAAqTcCxZABSNSAJFYHuoh7GDORqQDYDuRrQV6sBp7UaMMBq/ZlkAs6KCThrTECpaAKiRuBYSjUBpUoT
-						gHPsjRHAZlfPCIgB0KoAjIBoCoxAVhUzEGVbb7LyZtxsBtQQkDLgVwf6KvlZkAf9Efzjar+C/+6ktOKf23ysYrvPBQV/hn+A/1iB/jFp
-						xT+Dfwn/JfhH+D+V4F/AP0H/oLUnVAX8C/T3X3VM4D+v+kf451X/CP8R+rOwnwcnfSn8p7a+TnnlX0x9hP8I/u0A/zrvY3tgx6GzIvyb
-						1f871fcPAzByyiJd/Ye27ztWGIAdZ66F7WffjAagqALESgBMwAFtA4pCFQAGAG1AQ1YeKCAa8O+t/n9crT/4eYD9DP/e6n91rT+3t+o/
-						N9ToNj3U+RhO+RH9w1fqd+ovue7/S6qSA0VervRyqpd7vRzt5XIv53tswPxg2SLLYxHmFY9pPPZhPvIYijnLYzHmNY/pmPuYCz12ZL5k
-						/vQYlTn2/usmXnzR+KLyhYf45vDN4xsM8SDgQcIDCeLBxgMS4kHLAxviwe9NEp5I3mTzJiVPXG9ye0HACxZeUOHA4wUoL5B5AS8HQ9Xn
-						nmj4TJ22A3/oBM87q/ZDQ+0eU0OdQcvDw2oEYjUARuCptD+gNAJla5BuFp64OTRMFYEm03JVIFYG1AwIBECoDMQ9A7tVeMBYczEKqAA8
-						PXZTeAYSgwE9PRbaFIW/K+xvEtiHNoYnxojkz/j4+Bj5OHpjGLD6eAH/m9H3fzbBv67+v1lojWj1yQj/0Irjr4cVAvz4mOF/2dHXw5Ij
-						18K03ZfDS1N3hmcnVpqAF4y0GiCCCVAjkKoBDZMRaAQjIGo8a59uMoaaztknBgBGYH9pAkRlNeBgKEzAQuiwGoFqTYCo09KjobMYgS5q
-						BKIZ8E2AqKgGRNlqQF8IJkDUf10pGIGBYgQGQWgLYjMgGoZqQFERgBFI1YCkUXpuvUj3CGQzgJNuohkoHnglKisCAtCAaG2dgREw0lX2
-						0ghUmAHIGIHCEDhiyLegXx3wQzCJUAn+EfghtPlUQL+8p0kC/Rn8M/wr+AvwZwH6bbtPhP/Y7hNbfuyqfwb/uOqfob8C/rHqv+pYBfz3
-						EeCHSviP4I8H+5XwfzDgqd8A/64C/l1Sy08B/wL+aPGrgH/sBTLw33r2ztB+8rpbhv/q+v4B/3b1v41878adh8LWvUcLA6BVgIOnBP7f
-						UO0492YyAKUJ0CqA6GAyAbEN6Othn/zb41j9TxBdHfxX1/oD+L8TrT/4HsD94wL+kF39t/CfDYCFf/yuxe92K5Lf/4GOY0MdLz/cYUlO
-						+z5ym+S4X+Wcl+TlRi+HermW87GXs73c7jGAxwrME5kzrDw2YX7xGIc5yGMl5imPuZjLPHZjvmP+8xiROZI502NR5lXm2fuval58oSC+
-						mHyx+YZAfNP4pvKNh3hw8ODhAQbxIOSBCvFg5gEP8aTgiQPx5PImIU9UiCezN+m94OAFEQ40XjDygpYX3LwgiOD4q7/1+Rp/Xrt1/6te
-						IL2Terj9kPBIlzFxRQkmYOiK8OjwuD8gVgQqjQD2CNiqAE4MajgFJwbBDOCJwnGfQDw9KJqB5jN36ilCWiHQh4XtVmPQUL7+qTHrw5Oj
-						N6ieGL0+PK7Cn0s9PkYkHx8btSE8Omp9eAQaiY8b5OOGMHbLmbDp7Nth05m3wgYB/3L1P8G/gD+0GvCvK/8R/GEAAP/Lj10T+L8Wlibh
-						ZKCpuy+pCag3cXt4blLU82IEKk3AzmgCtBqwq6gEZDWcuScagVl7xQBAYgJEhQlIRqAFKgGilvMPVJqAJDyvoKwGHBb4hxHIQjWATcCx
-						0gSIuq84HnrACCQz0FPUC0ZA1Dupj5iBj2ICohEoKwKoBhQVgWQCrBHIJiAbgfjE2yQYgSRsks2n5WDzbD47X5UMgbbcKIyjBaeqKSiM
-						wW2qEvgvqypafExv/6SdF6ME+KuAP7X5aKtPWvEfvSW2+ozaFBXhP0K/Cqv+63O7z8m46p/hX4B/0JrjqoGiDP8A/35Fu0+G/8OqXmnV
-						P8J/hH60+8SWH8A/TvZK8K/P/ijBX+EfbX6iCviX+Z3VataO0H7IjAr49/r+Af/V9f0D/rn1p1HHwWHOso1hy+4jYeseGACRGIDtMACH
-						z4RtxgDsNCZADcDFaAD2XxYTAAMgQhvQyDWHKlb/LfxX1/qT4T8bgKrwX7n6b+GfV//xefy/MCGqW4R//I5VwP4m9MDHtNEXqtV6wKX/
-						+rmvfi7nNyPOf5CXK72c6uVezs9eDvdyvccEzA0eW1j2yGJO8ViGecdjIuYmj62YvzxGY45jzvNYkHmRedJjTuZS5laPbe+/zMu7QHwR
-						+SLzTeAbBfHN5JvNAwLiQcODigcexIOTBzDEg5wnAsSThScUxJPOm5w8gb1J7gUDL2hwYPGCjxekvGDmBT0OjL/6f//7f/+ZB5v2WOQF
-						1DutRzoMDY/0nq5PEC6MAE4LSkbgCbQGjVqjewSqmIHxG+IzBCajKrBVNwxHMxCNQJatEGDvAExBU/nz8xM2hcdGrhOtDY/Kx0cB9yPW
-						Cdzjz/JxBIA/fnxYPl9nxFrRulB7+NpQe5j8ffi6MG3nhbARBkDbf/LKP8C/NACrTryuggEA+K8Q8F9+1BgAAX9UABYffk01Q4CvgYB9
-						Pew/SCYgVgNgBHaEF2ECRJUmYLfAfylUBIpqQDIBuRoANYfmigFIailGoNU8MQFqBKJgAKIJOFSaAFQDjLQaIOosZqA0AaW6iQlANSBX
-						BHwTcDKaAFG/tVH9YQZEA8QIDBQjoCYgSU2A0VB9EFUyAqLhohFiBkaqEYjC02vVBCTh4VZ4ym1+4BVOwilERiA/KKusDJQCiENFG47c
-						u9IYVAptO4Xwd5IFfQv7FSv98ntE6E/Az+CfoN8H/3MqBf/U4x/h/4yCfwH/Av1RpwT+K9t9YstPJfhDDP4F/C8X+F8ewT/Cf171L8E/
-						t/wo/Cv471PlXv8O8/eEDlj1r4D/XaENVv0J/lvK/G4zcfVtw7/X9w/47z96Vti867AagC17sglAFeB42HHkQth65vWw7QxMwJvRBJx/
-						M+xOJgB9/vsuva0G4EAyAVj9f2rYsirwnw3Aner7r671Bz+zAH8H/r3WH8A/hN/39lb954YHu0yI+8GcXHBnNeSfajTtMetf/sIvoN//
-						PydVyXWinAetvNzp5VgvF3O+9nK6l/s9RmCO8FjDsgjkMQtzjcc+zEceQzFneSzGvMY85zEfcyFzo8eWzJ/Mp8yvHuPef8mLLwpfOIgv
-						Ll98vjl8AyG+yTwIeKBAPJh4sPGAhHjQ8sCGePDzBIF4EvFEg3gy8oSFeFJ7k98LEhxIvGDjBSUveHlBzguGOVCqvly/Q6+67Qb9Hz/A
-						3jlpQugyRpKLJBkxAtoW5BmB4vhQYwbGxBYhVARwfGh9PFUYZmBKNASNxBBA2RioYAqm7xBzsEOfQPzEKAH84WtC3WEi+VhnmIC+qLYK
-						f4+fqzV0TagJDVkdHlStCY+O2hAWHXpVKwDF6r9Z+V8N+Bfwh7QCgJV/gX6Af179x8clRyL8Q4sOXQ3TBfpgAp6FCRBFE7BdTABUVgRQ
-						DXgZEiOAY0urmoCoxqgGqGI1IFYEYAJQDYjSaoCo9fwsMQGoBIjUBIiiCahUxyVHxAQcqTQBWTABFRWB42oCrHqtOlEagaR+1gwUFQEx
-						A+tPJxNQqSFiAmAE1AxsOqsmYPjmqBECvJCaATEG0QxE6YOukhmwhiCbgsIIZKkhiNUBXYEnZVCH0JNfITUJ+Fi9yu/Hz4qwXz30X1Bl
-						6Nf+foH9CP7nVOjtz8rgH+H/jIK/wn9u9RHgz8rgP3Rdhv+y1SfD/4DVsdWnEv4j9GdF+D+k4F+2/EToz0LLT4T/CP666r8ggX8F/O8O
-						7bC3x4N/HAowc3toIWa/+fRtod3AqS78c9//zcA/zMS6bfvDpp2HwubdYgLEAKgJ2HtUDcD2Y5fVAKgJ4CqAaI+YADUAuhcgtgKNWnv4
-						5uE/wTPD/+30/eN7AfpPOPBf3eq/VmlFWPm/3V7/B7rPDDU7jHDj/53XoP/1pRfadpMc9muc05K83OflSC+XejnXy82cv70c77EA84LH
-						FMwdmUesmF88xmEO8liJecpjLuYy5jaP7Zj/mA89hmTOZA5lTvVYlnn3n/WLL4Z3wfii8kXnm+LdOL65fPN5cPAAgniQ8SDkgQrxYOYB
-						D/Gk4IkD8eTiCQjxJOWJDPFk94ICBw6Ig4sXhLxg5QU1DnxegETgVP3ug48/WLvNgLf9QHtnhWpA3V7TQp2BSysqAo/gQWJkBnTTsJgB
-						bBxWQyCKzxLYFF6ciIeKbdbTg7Kwb0A/whiI9OPU7YU5eHHi5vCIwH/NwasE8FeFh0QAffz5QfncQyJ8hGpAg6IeHLw6PCP/5zIBeGsA
-						FPxF+aMagGPX0ur/a4UJWCrfB8EALDl8tTAAC0Uz9lwWiIcJwClEyQRoS1DUC5N3iAGIQtuQVgNgBMQ4wDxADafHh5lVmoC9YgCimokR
-						iNWAaAaKaoC2BWUTkLTwYKoGHAodVGIAkiHouDiZAFQDRF3EDHSFlonUBER1X3EsmYBKWROQjYA1AbkqECsC0QSoESAzUFYEotQIaEWg
-						FEyANQI4816lRiAqPw0XypUBnJkPob0mKpqC3HdfgnpVVRgF/L0aVYF8Bf2sBPyiYpVfFaFfwR+r/Ab6I/hH6Ffw59X+otWnBP9h608K
-						+Kd2HwH+DP8DVx8vlOG/36qjUYD/tOLfR6AfQq+/wn9q94Es/AP6szoL/HcS6I9H+Vr4363gn+G/zZydAv8l+LeetUPgf3uEf7T/Td+q
-						ajVuxS3AfzQAVeBfhD/PW745bNhxUPv/N+06LCbAVAH2HQtbT7watp4WAyDaJiYArUBqANQEvKkGAFUAbQMS4c/PDFum8G8NAMO/1/oD
-						gPdbf67f94/vAdwD/Bn+b6b1B7/f7a36z/kYV/0Hhzqt+7/1u199tIbNYUZeruN8yPkS8nKrl4M5T3u53Mv5zAUeOzBfeAzCnOKxDPOO
-						x0SWmSCPrZi/mM88hmPOYw5kTvRYknmTeZR51WNa5t5/li++CN6F4ovJF5tvBt8svqEQ33QeFDxoeGBBPPh4cPIAhniQ80SAeLLwhPIm
-						HU9Mb/LyBIc4CHjBggOKF3S84OQFMQ50XjD0guZ/+U//9Xf/sFaLPge9gHs39HCXUbraVKswAmmzcDYDYgSyGVBDkJ4pAD0zel2xT+CF
-						CWIIJkahVehltAuJMYA5qD9pi1YL6k/eGj+KIXhZ/vz0mPViAlaGGgNXhAcGysdBK+XjivBV1fLw1QErVQ/I5/Fv0RSsDs9P3BJWCNCv
-						09X/18Ma3fRrVv8T/JcGIIJ/hH+AfylUFBaK5h98VU0AnkisR5GKnpsEI7Ct0gRoW5CYAFGsBuxUE5DVQExAQ5gAUWMxAk1mRTVNRqDS
-						BOwTE7BfTMD+0ApGwFQE2iQz0HZBrgaUiiYgVgPKisCRSiOwTEyAqLsYATUBWdkErIQJiOojUhOQjUBSf9EAMQPQQDEEg8QMDMYTaFXR
-						EAxRI4Bz6nFePZ5Ym6Sn2ogJSNIn24pGiRmID73KZuCCKpoBrKanzbPGGOTTdPKxmlBpDADrAvOqBO8e2Fvlr1OVoG9hPwK/gD4Bf3XQ
-						P8ZAfwT/06oC/NHmI8CfZcG/WPVPq/0W/CP8R+jP4A9htd+2+0T4L8G/e2r3sfDfZVFe9Sf4nydK4I8Vf131B/wn6M9S+E+r/gD/ZtOg
-						LaHp1C2hzYDJHwn+sfo/YvLCsGH7QTIAsRUoGoDjYfOp18KW09dKAyDaoSbgjQoDgLYfGIAJG45eF/6r6/u/HfjH59C28+TQZVXhPxmA
-						68H/R1r17zEz1PrYVv0Hh5ot++z95d/4bzjf/78YeTnNy32cH70c6uVaLydz3vZyO+d/jxE8lmDeYB6BmFuYazz2YT7yGIo5iznMYzXm
-						OeY95kGPGZkrmTuZS5lbPbZl/v1n9eI3710gvoh8kfkm8E3ybiTfbB4MPFi8AcWDjgclD1oe2BAPfp4gEE8inmQ8ESGerN6k5onvBQcO
-						IBAHGS8YeUGLA5sX/LwgaYMo9OsPNOw8oW67If/oBd87LqwY9ZwWHhqwJNSEERi0rKgKlGZANGyVGgI9TlQVnzSMpww/hxOEdONw3C8Q
-						lY4VFTOAo0VRLXhJDAEqACr53Avy8dERa8MDA5aHL/dbFr7cX9RvefiK/B366gAxAyIYhGgExAQMWRVeEiMB0F+TV/6PX0utPxb+Kw0A
-						Vv3jyr/oEOA/GQCB//kHYAJeCbP3Xgmt5u4N9dLzCLQaIHoe1QARHlL24pSoChOQ2oK0NQjVgBm7ChPQWAwAZCsCzaG0P6CFqKWYgaom
-						QKQm4KCYgKj2MAMiVAU6LobEBBQVgWgCsmAEukGpGhArAscqqwHQquPRCKyOihWBUv2hZATUDOAhVIURiBoigDskm4GN0QzEqkB6om1S
-						NgJqBgSeobJFKCpvnrXHZ0ZFY5ANgZoCUmEM8GcSfy0Uf04l6DPwu9AvsJ+hf7Rt8UnQX/T3G+ivBP+42l8V/I+pBqyy4H9EpRt8E/jn
-						dp8shX8F/wj9JfzvK9p9SvhP0J+kK/5zI/i3nY2WH8C/AX+BfqjFDIB/gn+BfgjwD7UYvawA/9uB/26DJ4e1W/eF9dsPqGAAsgnIewG2
-						HTgdNokB2HzqWqUJSAYAlQDdDJxMAFqC6g1ffsvwnw1AVfgvDYCFf/wd/wfA/3bgP6/6M9TflNDr3/njW/Wv23bQP36lYafRkqPQ7//r
-						JmdZeTnOy4WcL72c6uVezs9eDvdyPfOAxwzMFR57MJ8wv3iMwxzksRLzFPMW85jHbMx1zH3MhR47Ml8yfzKfMr96jMsc/M/ixW/auzB8
-						8fji8sXnm8M3j28wxIOABwkPIh5oEA9GHqzegOZBz5OCJw7Ek4snH09QiCcxT3SIg4EXNDiweMHHC1IcyLxg5wVFL3giqKr+qPbzT9Vu
-						PfB9NxDfBdXpOEqS4zwxAotFS9UM1B4UKwN1Bi9XQ6CmQMxAfMBYlLYMDYttQs+OLfcLQNhAjH0Dz4kZgDl4LlUM9O/4KH9/bvwm/bqH
-						xVB8SUzAF2EERF/pDwNgTYDIVAMaTt2uJqA0ANf07xCgfxkk4A9lAxDBP676WwOw4MArYgJeCXP3vxLm7LsS2s7bH+qNzyYADymrrAio
-						ERBFEyCatkPgH0YgmoHYEpRMgBqBKDzhWCsCs/eEZloRiEYAJqCFmICWqAiIWolay++gJkDUdkEUm4DSCBwWE3A4mYBSXUVqApK6Lz8a
-						eogh6AkjkNRrJRTNQJWKQJKaAFWuCERVVgXEBKgZsFWBKDzcyhoBNQNqCKLisZjxiEwID8mCSjNghL9n2c+LGOJvRhb0XdjPKqD/TCX0
-						C+xDEfoF9KEbQH8l+Efot+Af4f9IRZ9/FfBfKuAv0N9jyQFVAf6L9qu6CviXvf57Qyes+hvwzy0/7Sz4Z/ifCcUVfyjC/9bQHKv+Bfhv
-						VjWevDk0mrwptOwz8dZ6/hP8t+w+MixdtyOs3bY/rNsWDYCtAqgBgA6fC5tOJgOQBBNgDQCqAHkz8ISNx1z4t60/GaJvB/7xZ6zaY4Mx
-						ZOG/wgAQ/FsDgN/vttp9RDjhp9bHc66/qnbrAd/4g9r1Hrc5ysjLZV7O83Ij508vx3q5mPO1l9M573tswPzgMQZzCHMKcwzEvMM85DET
-						cxVzl8dmzG/Md8x/HiMyRzJnMocypzLHeqzLPPxT/eI3C/EF4YvGF5UvOt8UvmnejeWbz4ODBw8PLh6AEA9SHsQ80CGeDDxZeEJBPOl4
-						UvLEhXhycwCAOEhwIIE42HhBiQMXxMHNC4JesPSC6m/8h1//7T+o2bzXVi8g3w093H5oqNNjaniw36LwYH8YgSVqBtAiVEvMQG2tDiwv
-						JYbACoYA7UFPp/0CcSPxem0XqqfmQP48ZkNhEFQ4aQhGQPSMGIFag1eKEViqZuDLhQmIegBGoDABK/Wo0VUC/GoAFP5fCytEagCOXE0G
-						4GpYmlf/Ffwj9C88+EoB/9C8/VfCPDUBV9QEdFp0ID6oTBQfXhafVhxNQFSuCLwkUiMwVQxAUoPpO5MJ2CUmICmbAFFTMQLNZokJEKEi
-						0GIOFKsBUWgNEiOQqwGFEbAVgYOhg6gjjICok5gBqLMYgi5iCCCYAGsEYALYCEQTEI1A71XH1QREI3BCDECp0gicFCNw0hiBU2IASkUj
-						EAUjkM1AfMqtMQPy59wnnx+IlU/MGQ1DwMbAKJuDfOKOCp//CGLYvx7wZ+gvwN8Af4b+quAv0L86qhL8I/QX4K+tPrG/v8qq/9KDKsB/
-						9wL8I/Rb8O+ycK/Afwn+Ef53V4B/hP8S/CG0+uR2H4B/i7TqX8K/gP+UzaGJKMN/o0kbQ7MRi29pwy+Ev89YtC6s3rI3rNm6Tw1ANAGx
-						FajYDCwGYNORS2Hjiaths5iACgOANiA1ALENCCv/aAt6WqD8o8I/t/4A/vERPxPAj//jZuHfrv6jVQi/C0P9zeiBXnPCQx9jrz/0YPNe
-						G/+fX/3N30NOMvJylpfbvBzIedLLpV7O5bzs5W7O7x4DMCd4LMG8wTziMQtzDXOPx0bMT8xXHoMxpzHHMecxB3qsyDzJvMk8yrzKPMu8
-						6zHxT+2L3yhfDL5YfDH5YvPN4Jvl3VC+6TwoeNDwoPIGHg9OHrw8uHkCQDxJeBLxRIN4MvJk5QkN8aTnwABx8OAAA3EQ8oIVBzQv6HnB
-						0QuiNshCv/nnzzRvV6ftoL/ygvPd0MOdRoTafWaLEVisRiAKZmBJqJlahWoOlAQrqiWmQCWGIAsVAuwXQIvQEyPiswby8waeHrUuPD0m
-						qzQCRbVAjEDeHwAjoNUAgf/YEgQTIBq4ImDvwINiBHCWuZoAwL+AP7TcgH/Uq2GJgP8SrPoD/hP0LxATkFf/1QAI+M8Vzdl3Oczeezl0
-						XXzQMQFRz0+CxARMYhNQqv60HaHBtFgNgKIRgAmIajorqpmYgeaz9xQmwBqBViJUA7QiIGqbjEC7haXUCCQTUBoBVARKlRWBrGwEjoae
-						Sb1gBpJ6ixnoo2bgeOgrqjACagaiBogZGKhmID6pdrA+vCqZgiQYgqFqBkrZ6oAVnogLZWNQHqFZmoNoECpVmgP82RG+phplyGfYvy7w
-						60beCPse9EfwPx4Gr4li8M/9/f1XRkXwP1wJ/sugvOIv0J9bfQT8Y7tPCf4F/Av0A/whtPsU4C/QH3v9S/BX+M+tPgn8I/wb8Ff4jy0/
-						gP6oTQL/AH/RxI2h4cQNovWhRe/xFfAP8K8O/qFRUxeHVZv3hNWbowFYu9WvAmAz8Prjr4YNYgA2nnhNKwHZAOQ2IJgAbAaGARi8fP8d
-						h38IPyOD/83CP7f+4HdiqL9ZPdR9aqjbYZgbs++G6rQb9Jeff7pZG+QgI85PXg7zcp2XEzlvermV86+XozmPe7meecBjBuYK5g6PTZhf
-						mG88BmJOYo5izvJYjHmNeY55j3nQY0bmSuZO5lLmVuZa5l7m4p/KF79Jvgh8kfgi8kXmm8A3CeIbyTebBwMPFh5M3oDjQcmDlgc1D3qe
-						GBBPHp5cPAEhnqQ8iXmiQxwMOGBAHFQ48EAcnDiAQRzkvGDoBU0OrDbo/ubvfKlOzdqt+r/mBeq7pTpdJ4SH+i6sYgSyYoUgVgkqlMwB
-						WoZ0E3HaL1CaAFQGxABAYgSeEeCHShMQ9xDg32EEYktQKTUCxgRgNXSlgD+0/ChW/qMU/BP8Y/V/8aFXwiKBfiiD//wDAv4K/5fVAMwR
-						8IcJgAGYtfeSQNqxUE/g/5nxm8UIbHaNwAtiBF6cvC28NFlMAIxAbg0qTMBOVcPpO8uKwMxYEYhVARgBMQGiFkU1YK8YgCiYgGgE9pUm
-						IKkdzIAIJqCsCBwMnagiUFkVOGyMwBExAkfUCGT1XFGagd4rRXINCjMg8N9XQBbqJyqNgEgMQKwMiBkQELZSI5Ckx15C2QwkFSflJOWn
-						5FZWCioBXUXQfjvKkJ+VYd+u8DPwV4H+tMpfCf4l8KvkWpbgH/v7K8BfYD8rt/tE8I/QXwn++1QZ/KFOCwT6E/gr/Cv471Lwt/CfV/wL
-						+BfoB/iX8L+lAH+0/AD6M/hH+N8o8A/w3xDqT4DWhybDF9w0/PcZMT2s3LRbtEdMgBiALfvEBMAAiMgAbNp7IhqA4zAAV1Mr0GuVBiC1
-						AsEkPCywfSP4twbAwn9l608Ef3wv4P6Z4ctvC/4z+N92u0/P2aFW57FujL5bqt2q3yu//YUHH5Tc8xnORUmcr7yc5uU+zo9eDuU86+Vi
-						ztdeTue877EB8wPzhccgzCnMMZlvrJiHmJeYp5i3PCZjbmOuY+5jLmRu9NiS+ZP5lPmV+Zb5l/n4p+rFb47fPF8cvnh8cfniQ3yD+Cby
-						TeZBwIOEBxEPMh6IEA9WHsw82L0JwZOGJxVPOp6YEE9entwcACAOEhxIIA42HJAgDloc2CAOfl6Q5EAKcbBFEP7Mz//8v/udGk26LcTD
-						V7ygfVfUYWio2WNabAuCEXDMwEOFGSAjIKo1aLmeKJRPE3pyhDUBWaUJiC1BEDYVY+/ARv187SErK02AKFYDlmtLUF+Bp7j6f1W1DCv/
-						WPUXAwDw1/YftP0I9GsFQKAfmg/4TwZgrggGAJot8D97z6Uwc89FBT2cDFRhAqzECFgTUBiBqVH1YQREDcQMNBQj0AjVAEhNQFSuCDRL
-						0opAURXIhkBMgKiNGoF9uleh7fz9hQmIRuCAmIADagKiERAtPliYgGwEuiZ1S1WB7kkVRkCkJiBLzEAfVAZEqApkqRFIlQE1Ak5lICtW
-						BQDMUaUZKFUYguoEKDeysH67yqv63MrDisAfYT+rEvqPldC/qlRu8cnQr+AvYxbqs7yE/gL8U5tP7vEvwV+gX4AfKvv8PfDfVUjBX1f8
-						d6gK8BfYz4rgv1XlgX8TC/4J/hsk8H95/DpVfVGznuMK8K8O/jv0GxeWrd8ZVmzcrYIJWK0GAG1A0QToZuAdcTPwxgNnw7pjr6oJKAxA
-						UQW4VnEaUJe52+8Q/M/SnwPIrzdiuQv/1gBY+LetP3gGAf5/hvqb0QNQl0mhdruhfmy+KxryT19t3HXuz/6bf/Pfct4x4rzk5S4vx3Ee
-						9HIl51Mv53Je9nI353ePAZgTmCM81mAeYV5hnsmcY8VcxNzEXOWxF/MZ8xvzHfMf8yHzI/Olx6DMqcyxzLnMwczJPxUvflP8pvmiQHzh
-						+MLyheebwzePby7ffB4cPHh4cHkDkAcpD2Ie5DwJeKJAPJl4svFk5AkL8aTmSc+BAeLgwQEG4iDEgQriYMYBD+Kg6AVPDrAcgKHf+rMn
-						G7Wo03bg9/0AfndUp/OYUKvPvGQEbt0MoE3o0WHRBOS2oKfNfgEIDx1TE6DVgGgEclsQKgL4N+wR+Er/parCBIgeHLQiDBbosqv/sfVH
-						4F/AH1oE+FcTEOEfmrc/gn8J/wL+WTAAuy+qRm08FV4Q0H9m3KZQbxxMwGaBf6g0Ac+rEYiKZmBbFSMQTcAOMQEwAjvFCIhSVaCJSoyA
-						mIEKE2CMQKwIRMWKgBgBMQFRVBUQlRWBqM5aEYjqIlITkLXssDECpaIROComIEmNQFTfVaVgBPqJIegvGgAzYAzBwCRrBqxgClxjoDBe
-						qgB1Avbryvk6D+5ZAP0sH/iPqYq2HrkGpRLwJ+hX8F8BldBfCf6xt78q+Av05xX/BP7o7y97/PeoOs7braoA/zk7QztRbPeJ4N9m5nbd
-						4FsJ/wL+00rwb5Y2+AL6sxpPjuAf230A/+tL+B8X9dK4taHR0AUF+DP8N+wwSE8Lmr9ysxiAXRUGIFcB0AaEDcHxRKBYBVh3+FJYe+yV
-						og0IBiBvCIYBQBUABmDJ/ouhVr+Ft9X2k+Efwvdn8L9d+MfpPvj/GepvVjW6Tw+1O450Y/HdUp02A7/3p0/Ub4YcY+TlIM5TXi7jfOfl
-						RM6bXm7l/OvlaM7jXq5nHmBe8JiCuYO5hLnFY5tfJDEfMT8xX3kMxpzGHMecxxzInMgcyZzJHMqcyhzrsS7zMPPyp/7Fb4jfMF8Qvmh8
-						Ufmi803hm8Y3lW86DwoeNDyoIB54PDh58PLg5sHvTRCeRDzJeBJ6E5UnM092DgYcMCAOKhx4IA5OHMC8IMeB0AuWHFAhDro2KP/Wv/+1
-						z/xxjabd13iB/G5JN551nRhq9ltgjEAyA4URuL4ZwObhx8QIZBPwFExArgiIogmIpwmpCUhHjMa2oA3hhWQE6gxZFb7ab5nqgQFRteRz
-						YzedDssA/wL+Cv9JcfX/SoL/y2G+AH+FATDgP2vPRRHgPxqAGaLpuy6GsZvPhPpTtpUmANUAUTQC0QzgOQVQFROQVB8SM9AAZkDEJiAb
-						gaYzd0UTkFQYgaSWYgZaiVARyFWB0gjkysB+NQHRCKAqcKAwAqgKxMpAMgNLYAaiui0VI5DUQ0xBITUDUdYQ9MEZ9TADVqvw8KpkCLRC
-						IKZgTVRpBqrXYJgCUTYEhTEgeeB+PfH3R1WF/ArQN8A/yAB/Cf1HC1VAfwL+DP1Q7wL6DxbK0B/Bf79Cv4K/6e3Pqg78LfzHVp8S/NtW
-						B/5Y8RfwL+E/bvDVTb4G/BX+CfwV/g34vzRuTXhxrGjM6tC4++gI/gT/TbsODbOXbghL1+3UCsDyZAKyAdDNwMkEFHsBdh4Oa45eKQ0A
-						tQHhSND4TIA3QrPJG2675x9/xmo9AL/eiBW3Df8ftc+/Rs/Zoe7H3O4DIZf80q995k8kt/xXzjVJnI+8nOXlNs5/Xo7kPMp51svFnK+9
-						nM55n7mAucFjC+YP5hPmF49xLANBzEnMUcxZzGEeqzHPMe8xDzIvMk8ybzKPMq8yzzLvMg8zL3+qX/xm+M3yxeCLxReTLzbfDL5ZfDP5
-						ZvNg4MEC8YDiQceDkgctD2oe9N7E4MnDk4snH09OnsAQT3IOAl6g4GDCwYYDEsRBi4MaBz6Ig6MXRDnQesEYQVr1hWdb9arbdtDfeEH9
-						bqkO2oK6TwsP9rUmIBmBmzQD2Qg8KUagiglANQAnB1WYgPJZAzABePgYTMGjw1eHGqgCaDUAm5FXigk4FZYejgZg0cEruvqv8C+wH9t+
-						xAAkEzAPPf8C/XME+HX1Xz5GAxBX/qEZuy6E6TvPh2k7L4RJ286FZjN2hqfHihERIwA9O35ThQnIRgAVgxfFCLwETd4qBgBmYFthArIR
-						aKgVgSg1A6Im8n/EikBpBKqagKhoBPaGNklt1QyUaidmoL2YgQ5JHcUMdFpYVgVsZSBWBZIRWGKMgNUyMQFJvVAdEKkRSKpiBkT9VkVh
-						TwU0AIZANFANQVQ+GrNCAuKlKbh55Y24nqqAvVVa1Qfo3wj2K4FfJMBvoT8/qbc66I/gf0DVI0F/Bv8K6E/9/S74V+nx98G/9cwS/HOr
-						TwuB/gz+zRT8yxV/hX/T51/Av1nxj/AP6F8TXkh6fvSqUH/wvAL8M/w37jwkTF2wJixeu12P/YQJWJ7agFaKVqENKO8FEOU2oPX7TosB
-						eEWV24BsFSA/E2Da1pMF/AP8bxb+8WdAe4T+rFuHf2zy/Sjgjyf5PtD54273EUnu+It6LXranGLk5R7OT14O4zzn5ULOl5xPvZzLeZnz
-						tpfbOf8zH3gMwZzBHMKcwhzDnAP9Iol5iXmKeYt5jHnNYzrmPuZC5kbmSuZO5lLmVuZa5l7mYubmT+2L3wi/Ub4QfKH4QvKF5hvBN4pv
-						JN9oHgg8UHgw8WDjwciDlQczD3ZvQvCk4UnFk44nJU9antgQT34ODhxAIA4yHIQ4UEEczDjYcUCEOGhyYIU4+HpB+rd/5ff+6As1m/c+
-						7Ab4u6lOo8JDvWaFGmIEoFs1AzXFCNQdvEKrAU+NXB2ezm1BMAK5LUhUT/TsmGwC1osJWC8mIBmBpMfle2sMhAlYGmrKzxyz8aSA/5Ww
-						SMAfJsCu/scNv5dUCv/JAMwW6IdmKfhfUPCP8J8NwPkwdUcUjl+ECchGoJ4agVQVSGbg+YmbxQRsERMARSPwMioCSagmwAw0ECPQcFqU
-						NQHWCGhFICmagVItkxlolVSYAGMEYAJ8I2CqAmoEorqISiNwSExAVKURiIpGIKq3ADBUmgFWVUNgjUE0B1H5qbjVqYpZSMobcKtX7NPP
-						vfosD/SzGPZvFvhL6I/An6E/g7/d0FsV/CP0F+AvoG+hvwT/2OOfwT/Cf7m5t+jzF+hX+Ee7TwL/DP+6yVfA38I/wL/B+BL+84r/S7ri
-						D/BfreAPPTdqVXh25MrQqNtoBX8IlYDxs5aHRau3hcVrRMkEwAAs35CqABu9KsD+sObQxbD6iBiAI1fC2mQC9DQg0wYEPSf/563APz6P
-						Vp1nR65QWfgH+N8s/KPPH+f5VwH6W9CD3aeF2u0/vtN9sh5q3vsQcgdyiJGXYzgPebmK85mX8zgvct70civnX87PXg7nPM8c4LEC8wTz
-						BvMI8wrzDPMO9Isk5ibmKuYu5jLmNuY65j7mQuZG5krmTuZS5lbmWuZe5mLm5k/li98Ev0m+CHyR+CLyReabwDeJbyLfZB4EPEh4EPEg
-						40HIg5QHMQ9ybyLwZOHJxJONJyNPVm9C86TnoMBBgwMLxMGHgxMHMIiDHAdBDpQQB1MOuBAHZRu0f/tnf/Znf+fLL7UfV6fdoL/3gv3d
-						EtqC6nQdH2r2leSbjMCtmAEIRuDhIctjNSAbAbNHIFYExAiMwVOH45OHSxNgJUZghBiBAcvEBCzXSgDgHyZgofb8Y9X/kirDf1z9v6ia
-						DfAX4FclAzB913mFf2jqjnPJAJwLU7af06ManxmbTcBGMQFRqAhoVUDMwPMwAipUBJIRQDUgqf4UKLYGqREQNZq2IzQ2aiKmIBqBnWIE
-						diYTEFVhAsgI5KpAYQZE7bLEFFSagf1BzUBS50VZYghE0RBEWUNgjUFPNQOlqpqCSlljEJ96K1plzUECbsA3wLyAcx/cqxN/b6WqgXxI
-						fp/qYD+f2hOVgd+D/gNVoD+u9O9TMfR3RX8/g/+8CP62xUeFHn+zudeCv7b4FCpX/CP4xxX/DP/xZJ/Y6lOC//rQ0AP/sVAEf7T7KPwL
-						9AP8nxu1MtQTEIdeGjg3NOgwUOF/9PQlYcGqLWGhGAA1AckAaBuQGIDlG8xmYJgAVAKwIXjnkbDy8GUxAFdU2QDEzcClARi0bF9Fy8/1
-						4B+ft+B/s/Cfwb+Af/kZaBkq/q/bUI0es9LpPh/fmf6qtoP/7ksvth8jOeO/S+7AZt+KXJLE+cbLSZy3vNzG+Y/zo5dDOc9yHvZyNedz
-						zvfMAx4zMFdk3shiLmFuYa7x2OcXScxPzFfMX8xnzG/Md8x/zIfMj8yXzJ/Mp8yvzLfMv8zHzM+fuhe/Afvm+M3zxeGLxxeXLz7fHL55
-						fHP55vPg4MHDg4sHHw9OHrwQD3CeADxJeBLxJONJyJPUm8g82TkYcLDgYMIBB+KgxEGLAxvEwY+DIwdQiIMsB2KIgzWCuOozf/6V2rVa
-						9D3rBv67qEc6DA0P95gcHuq7oMII3IoZwAPHHh2yoqoJSMomAE8chtQIiF7QtqCoFyegIrBBTxp6ZNiqME5MwMIDl1Vx9T/C/7y9Fwv4
-						L1f+E/yLZgjwz0jwP81Av34UTZY/T9p2Ngxdc0zAflN4eswGfZAZDEE9UWkCorIReEGrApvL1iCtCmQzsC3Un7rNGIHtYgBKZSPQNEmN
-						gKgFjEBSy1liBiAxBWoC1AigKrBHDADMQFS7LDUCpRmAEfDNQGkEshmAEfDNwCExAFnZDET1FnBWKTiLESDFh2AJaFtTUCH8m8C4BXUL
-						7N7nr6fUq8+yoF/CPm/crQr8Cv0C+lCG/tzaU0C/gH4+xQfAz9DfWaHf6+3fqdBfFfzzar8F/60R/FOPP4O/7e8vwX+9qgL8x2foj+Af
-						4V/Af3QEf+jZDP4joBKkG3QdHUZNWxzmr9gc5q8UA7Bqa2EAlmQTgFYgrQLsilWA3AokBmD1/nNh5aHLYdXhqgYgPhPgaliy/4I+kbdi
-						1R8y8A/wR3sO4B2VAqg6+M/gfz34x4O88P9ZmL8V6bGeXcZ/rA/zyqrZss+Zz3z2K7VtzjDivOLlHs5PXg7jPMd50MuVnE8533o5mfM2
-						53XO+8wFHjswXzB/MJ8wvzDfMP8wH3kMxZzFHMacxhzHnMccyJzIHMmcyRzKnMocy5zLHGwZmfn5U/XiX96+MYjfOF8YvnB8YfnC843h
-						G8c3lm88DwweODyweODxwOSBy4ObBz9PDp48PLl48vHk9CYwT3IOAhwkOIh4gYaDEQcrDmYc8CAOihw0ObBCHHw5QEMcxH9H9N+/8Gyr
-						wXXbDvqfXhK4m8L+gNrdp+j+ADYCVc2AbwhiRUCMwAgYAdEoyJgA0bNsBFARgBEQvTh+oxqBlyCB88nbzmj/f179jyv/cdU/rvxfUPif
-						JeAPKfzrqv+5MA3Cyr8AP6AfJmCygP/k7WfVAEzYeiaMEZPRZPp2NQHZCKgJQDUg6Tn5nZ43FYFoAraIASilJiBLzECDKdEIZDMQDcGO
-						WBWYkczAzKjmokojINLKgDECIjUCqAokFUZgnpgAmAFRB1FHmAFRJzUDUZ1hBgpDcCB0EeFhaVC3pO4wBEYwA2oIsrIhUAlAwxQklS00
-						larOJJSKkJ7NgSuFeiiCfQH48vPjqTyVqoR8H/ShDPsZ+PPJPRb4u1cc3RmBvwL6Bfg7z9+t0M/gn4E/Q38F+CfoL8E/Qn+5ubdc8Yfi
-						5l4D/Qr+G0LjiRuqgn+x2l8J/i8K+L+Adp8E/gr/BqLtKvqQhdvDnGWbwjxjABau3lq0AS1Zi70A0QSsSK1A2QCs3n4oLD94KaxQA2BM
-						QDYAx6+qCWgivze3/GT4x0ecxoPf6Xn5PS38l79z/L1vBP8A/4+64o/f56EuE8PDEiO92Hk3VafdoL9FTkBuSDkii/OHl2M4D3m5ivMZ
-						5zsvJ3Le5LzKedfLzZy/Ob9z/mc+8BiCOYM5hDmFOYY5hzmIOYk5ijmLOYw5jTmOOY85kDmROZI5kzmUOZU5ljmXOZg5mTn6U/PiX5zf
-						mH3TfFH4ovFF5YvON4VvGt9Uvuk8KHjQ8KDiQceDkgctD2oe9DwpeNLwpOJJx5MS4onLk5snPwcHDh4cXDgAQRykOIhxkONACHGw5GDK
-						ARfioMyBG7KB/Xd+689qPFqzRd9LXkK46+o0KtTsOTPU6LPQNQLQjcwAnjqsRkArAqUZqDABSc+JrAnIVYGXJmwIDSZtDtME2HEyUDQA
-						AP8LKsC/GgBd+c+r/ueiBPynCfDDAEyR74cA/jAUMAETBf5hACZsORPGbz6tmzSfHr0+asz6siJQtAZlI4CKwKbwAoyA6EUxAy9NFBOQ
-						VBgBbQ/aKkZgm5iAbYUJyJUBmI4oWxWAGYiVgVwdyFWBVjADSbkqkNV2XlQ2BO3nQ8kQLBBDIPBqVZiCRfvVCEQzUKluWiWw5iAqmwJr
-						DPJDrzyxIfBUwntcpfekvfks/HwH7D15sG9P7cmwXwJ/CftVoX+3D/0C+lAl+O9QVfb2lyf6ZOiP4B+h3674x/7+jQb+I/RXgP+EeI5/
-						Cf4R+lVo90ngH1t9Yp9/dRD9rPwZT+OduuVkmLNye5i7fJMaAG0DUhMQW4FyFSC3A8EE5BOBVuw9E5apAbikbUDZAJSbga+GEasPuf3+
-						+Dt68wH6FvxvB/4V/Psv/GjgL3qw27RQu8NwP1beZdVs2ffcb37ugbqSEwD/bAAgL5dwvvFyEuctzmte7uP8yPmT86uXgzlPcx7nPM8c
-						wJzAHOGxBvMI8wrzDPMO8xDzEvMU8xbzGPMa8xzzHvMg8yLzJPMm8yjzKvMs865lYeZk5uhPxYt/aX5T9g1DfEH4gvEF5QvON4RvGN9Q
-						e7N5MPBg4cHEg40HIw9WHsw82Hky8GSBeELxhOMJyZOWJzVPeg4KHDQ4qHiBh4MTBy8Obl4A5CDJQZSDLAdiiIM1B3RIg/3P/uzP/t4X
-						X2w7qm7bQf/LSw53W3U6jw01e8+NRkDNQDWGoDozIIIReHQojMCqwgg8M2qNmICoChMwdp3AP4xA2Rr0Ih5YNGmTgPzZsPrY1bDs0BU1
-						AsXK/+7zCv9qALTlJ8F/koI/Vv0V/M+ESQL9gP+JW06LYABOh3GbT6nQ743VfzYC9Yy0IqBVgWgEbGvQS0kvoyIgqj8ZggmIaihmoBEq
-						AkmVRmCHmICoaARKtZi1M1YFRK1mQ8kIzIlqM7dUWzEE7dQM7AntYQaSIeiQ1BGGwKiTwG5nrRDADER1zbKGgJQNQTQFpfDkW5V8vhfM
-						QSH5O5mDrKor9lk+zLNyr77KQH5W5cp+EsG+B/xdFfj3pNYeB/rR3nMD6C9P89mmKsBfoX+LqoB+UTMBfqgS/AX4sdpvVvwB/Rb8I/yX
-						0B/BP27u1Q2+Mv+qA+gM0fjc4BUHwuTNJ8QAnAgzNx5WA4AqwAI1AVtVcUOwqQLYDcE7j4al+y+GZQcumipAaQBQBVgq/4bVfQv/uc0H
-						RgW6Pvz7J/1Y+P+orT5QjR4zQ+2Oo93YeLeFVf8vPt9qmOSB38v5wMjLGZxXvNzD+YnzF+c3LwdynuQ8ynnWy8Wcrzmfc75nHmBeYJ5g
-						3mAeYV7xmIa5h7mIuYm5irmLuYy5jbmOuc8yIfMi8yTzJvMo8yrzLPMu8zDzMvP0Pf/iX5jfEL9hviD2YvHF5IvNN4NvFt9Me6MhHgg8
-						UHgg8UDjgcgDlQcyD3SeCDxReDLxZOPJyJOVJzNPdg4GHCw4mHgBh4MSBy0Oahz0ODBCHDw5uHoBmIM0B3EO9NDv/vpnv/CJ7A1QtR8S
-						anUZFx60RuB6ZkBUaQaiIajZHxWB5YURgAnIihWBtWIC1qoJqDQC68OLYgRenrhRYP1UWHX0qmr54VfCwv0wAgL/O8+J0up/Av+pAv7Q
-						FIH+KWIAAP4q+fvEracV/MfLz1P43xRNADYej1h3PDQWWH9q1DoxASIxAdEI4EnHVY0AHnKm0qrAJq0IZMXWoKhKI7BVDADMQFRjUROY
-						gWQImiY1EzPQvJAYAZgBkRqBLBiBpDbGDMAIVDEDWhlwzADahkSdYAhEnReIIRB1gSkQFYbAiA2BmgKSgrdRD5iFQvHf8xn6N1Yl1FvZ
-						E3kqVbbx3AzsXw/4O83bpcDvQ/+O0L4K9G9TWfC30J/BH6f5xNX+CP0Z/Bn6IWzuVfAX6HfBX+E/rvYrRCv4+z3zDND4PqzKT9x4PEze
-						dDxMURNwMsxZtT3MW765aAXKBqCoAsAEZAOweV9YvO+8PtTLGoC8F0ANgKi5vD8ANjb/YkMufjeYFQ/+vd/dmpYM/wD/O9LqI3qgx6zw
-						YMcxEv8+/j5/qGaL3qf/8+9/viZiv5GXGzh/cH6BOAdxnuI85uU6zoecLzmfcr71cjLnbc7rnPeZC5gbmCuYO5hLmFuYa5h7mIuYm5ir
-						mLuYy5jbmOuY+5gLmRuZK5k7mUuZWy3TMu8yDzMvM0/f8y/+he2b4TfLF8NeKIgvJF9ovhF8o/hG8o22g4AHCQ8iHmQ8CHmQ8iDmQc6T
-						gCcJTyKeZDwJeZLyJOZJzkGAgwQHEYgDDQcjDlYczDjYeQGRgyYHVQ66XmDm4M3B3QZ/1Z8+9nKHOm0GfOgljbsubHrrNiE81IeMQGEI
-						fDPA1YGH+i8OdQdJ0h6RjUCuCMTWoGwGognIikbg5Qkbw/hNJ8PKI6+GFWIAVsjHaAQuayUArUKoFOhHhf/Klf9JAv5Y+Z8gsA8zMV7h
-						H+B/UuEfH3EE6cj1x0Ob2bvCk2ICnoIJUIkJECOAJx1nPTsORiA/6CyaANcIiF6eFFVfTEEDMQTWDKimRlNQbhoujYBWBYy0KqBGYKeY
-						gCStDOwSI7ArGgGjtkntxBC0VzNQqjADJBgBrRAYddZqwb6iUlBRLQBgy8dqJUDOqjQMDO/XUwJ7Iz2KUwG/VBXIz2LYvyXgF9g3wF9C
-						P9p7DPSnlf5W2uJTCf1li0+52q/gPyn19dNqf+zvz+Afob8S/FdXgv8t9MwDnuvLzxi55lAYv+GoGoBJYgCKKsCmI2HO8o3RAKzYoio2
-						BKcqALRs496weO9ZMQAXVDABagBEMABqAo5cCePWH1VIB7Djd4Yy/OP3vpXfPf/+dwr8a/ScFep0GRdjnRcD77Jqtxn4bcR4ifVY9Yeq
-						5AAR5wnOI16u4XzE+YrzmZfzOC9y3uS8ynmX87KXuzm/c/5nPmB+YL5g/mA+YX5hvmH+YT5ifmK+Yv5iPmN+Y76z7MdcyNzIXMncyVzK
-						3Mpcy9zLXGyZmXn6nn7xL2vfCMRvlC8EXyi+kHyh7U3gm8Q3kW+yHQAQDxAeQDzAeADyAOUBzAOcJwBPEJ5APMF4AvIE5QnME5wDAAcI
-						DiAcZDgIcZDiIMZBzguEHCw5mHKw5WDMARvioM5BPyeE3/sPv/abX3igcdf1kjB+wgnk4xA2wdXqNinUkGT7QJ8F1ZgByDEDImsE6gxa
-						Gp4cvjI8Q21BsTVoTdEWpGYgGQLsCxglgA74hwmAAYDQGrToQKwIwARM3Y6Vf4F/gX6A/yRt+YkC+GeNA/wL9I/ZeELhf/QG6IT8Hye0
-						lQSg/+SotWIE8GyDXBXAE49LQ/Ds2GgC1AikqkB+xsGLE2EGorCpOZuAao2AKFcFYmVgW2gqhkCVqgIVZkDUYmZUS5gCEQwBjICnNnOi
-						oiGIag9jIOoAQ5A1v1KV5iCqM0xBUhcYA6PK4zEToGfh79cRf+/1RXBPin37e6qs7FcH+zcD/BH6t1dCv8B+hP6t1UB/3MxbCf4bFfoh
-						C/6A/kYC/SX4ry3Bv+jxF3gWxVN9bh78M0DnlplWUzeF0WsPK5jDAEzYeCwZgONhihgAKO8FyCYA7UAwATAAuiF4/a6wcOfpsHDv+bCo
-						MAAXtNWH24Cw8deCv4X//Ltf7/e38I/qwUc9xx/CyT41u0z4xMBf9JMHGnVZg9huY70R5wPOF15O4bzDeYnzFuc1L/dxfuT8yfmV8y/n
-						Z87fnN85/zMfMD8wXzB/MJ8wvzDfMP8wHzE/MV8xfzGfMb8x3zH/MR8yPzJfWvZkLmVuZa5l7mUuZm5mrr5nX/yL8hvhN8oXgi+UvYh8
-						ke0NgPgG8Q3kG8wDgAeIHTw8uHjw8eDkwcuDmwc/Tw6ePDy5ePLx5OTJy5ObJz8HBw4eHFw4+HBw4uDFwc0LgBwkOYhykOUgzEGaAznE
-						wZ6Twe9Dv//AE/Vrt+r/ppNMPh7hicJdJ+mqG4xAlm8IfDMAwQwURkCrAatDPZgBUTQBuTUoVQVEL4oGrzpcwr/AxVIxANCSg5fD4gOX
-						w9w9F8L07WfDZAF+GACs+Kuw+l+A/wnVGAH+rFEbjiv8w2SMWHcsDFl9JDSesiU8OXKNCkeUPp3bg0TZCKgZGIuqwPrSDIzHPoZkBFAV
-						SHpJ9PJEGIGoBtkMiBpC8v9BjbQqsFWMwFY1AtEMiKZDlWYgtwpZM5CrA54RgKwZ8A3B7lJkCKIpwBn3UZ1gDJKwodqq2DxrPwc495S+
-						9nZk4d6qBP3Yt+/BfgR+H/Yt8FeF/gj8FdAvwA+50D95o6oJr/YD/BP0R/BfW4K/jP0I/hH6bxX8LTxn8H962PLQde52hf8x646oAYAm
-						bDgWJmYTsEkMwOYTYfrGw2HOslgFsK1A2BC8eP2eMF/gf/7uc2HBnvOlCUgGAKcA4dQfPPV3wNK9VVb9vd+/8j1UbVfCswDuFPg/2PkT
-						Bf9Qq2W/13/3q4+8lOO6Ecd9zgte7uD8wvmH8xPnL85vXg7kPMl5lPMs52HO05zHOc8zBzAnMEcwZzCHMKcwxzDnMAcxJzFHMWcxhzGn
-						WYZjvmP+Yz5kfmS+ZP5kPrXsylzL3MtczNzMXH3PvvgX5TfCb9ReBL5I9gJCfIH5BvAN4htoby7ffB4cduBAPLB44PHA5IHLA5sHvp0U
-						PGl4UvGk40nJk5YnNU96DgocNDiocNDhoMRBi4MaxIGPgyMHTw6uHHw5OHsBnIM8J4GKJPEzP/dzf/zF51uP/ySODM2q0x4VgcnxRA9j
-						BKo3A5BvBrBP4LGhkuxHrhIDACMQ9exoMQKjxQAURmCtGoG+S/eH5YdeCUsPRvBfKsLHJWIAYAIW7b8U5u+9qHsE1AQI9I/fLNKWnyis
-						/I9W6K8U4B8avla05piA7W4B/rVkBMxTj7UqsK5sDxIz8BwqA6Lnx5VG4AU86yBJzUBRGdhUGoJkBrIhaISqgEiNAKoCIjUCSc1gBoya
-						J7UQQ9BSzcCO0CqpNQyBI7Q8QW3VEES1gykQtVdTENUhfyyqBcYkJGVTUMgYhaz8dNxbEr5PVQn1VvlEnuogP4K+gX0X+EvYv1XgvxH0
-						QwX0o8VHYL8E/3K1v36x2l9Cv4L/dcD5euCf4R+tN/i+fov3hFFrDoVRyQCMTSYgVwEKE5AqAXNW7TRVgGgCFq7bHeYK/M/ddVYNwPw9
-						59QAoP0Hp/8A/PMDv2ZsO1UF/m9l1R+/+8MDF+m+AQ/mb0UZ/Ou0+/iP9Myq03bg337h+dZjfuZnfuaPJJb/QVJFfBdx/Of84OUQzjOc
-						hzhPcR7jPMd50MuVnE8533I+5nzN+ZzzPfMA8wLzBPMG8wjzCvOMZR3mIOYk5ijmLOYw5jTmOOY85kDLiMyPzJfMn8ynzK/Mt5Z9mYuZ
-						m5mr79kX/6L8RuybtBcA4gvEF5AvMN8Ae3P45tkbC/GN54HBA4cHFg88Oyh50PKg5kFvJwTEE4YnFE84npA8YXlC84TngMABgwMKBxwO
-						SBywOKBx0OOgyEGTgyoHXQ7KXuDm4M7Bn5NDThp/8F/+4C/qPtis5wEv0XxcghF4qOskMQKSYCVJsxm4FUPwUL9F4eHBS3WfQKUJiFIj
-						IIIJ6L5wjwI/4H9xWv1ftD/CP7Rw36WwQEwAjMCc3efD9B1nwwQxAeXqf4b+Y2HUOvlowV80bO1R1dA1R0PfZQd0Q/LjI1anJx+LERhZ
-						nRGIikYgquoTkMvqAKoCsTIgRgDVARGOQLVmQA2BVgaiYAhidWCrMQOsZApmRLWYub0wBWoMZkVVNQRJAstZagxgEkTt1CBEsUGIEvCu
-						RgWkVwC7VQL3m5H8Xj7gW1W/sl8d7Efg31oB/AX0J+C/XejP4A/gz9Cv4K/Qv0bF0G+h+XbBH6fjtJi8IQxdcSAMX31I+/5HrTlcVAFy
-						JcC2AkGoAszYeESrADABejTouj1h9vZTYc7OMyIxAAL/yw5cCmuOmAd+JQOA3n+0/lRnXq4H//lEn4/a36/qMTvU6DT+EwV/6MEmPfb+
-						6u/+SR2J3X9o43gSx3nOA5wnvFzC+YbzEecrzmec7zgfcr7kfMr5lvMx52vO55zvmQeYF5gnmDeYR5hXmGeYd5iHmJeYpyxrMYcxpzHH
-						MecxBzInMkdaxmT+ZD5lfmW+Zf61bMzczFx9z774F+U3Yt8kXwC+QHwB+QLbi29vDMQ3jm8s33geGHbQ8KDiQWcHJMQDlgc0D3ieEDxh
-						7GTiycaTkScrT2ae7BwMOFhwMOFgw8GIgxUHMw52HAw5WHIw5WDLwdgL2BzUOehzUuCkgUTyh39Uu16rWq37fd1LOh+XtCLQdXJ4sA8q
-						AjACvhmAbmQIKtqDtCoQ9wdEE1Cqg8Ddwn0Xw2IBfginA0VdDAvk8xAMANqCoDm7L4QZYgQmbTmlBmA04F80MsH/CAH/EQL9wxX8j4Rh
-						Av9DVx8JQ1Yf1tYjPMjpKfldYASegBkoqgJ44JkxA6JyY/P1jEBU8QA0EYxANAObxAgkTYYhiGqY1AiGQIQ2pSZaITBmgJXNQFILGAJR
-						NAPbQ6uk1moIKtXGKpsDfbBVpSqNAR6GZRWBHOCu/3ZTYpivTuWKflXILzfq+qBfdXW/gP1qgL+E/gj8VaG/EvjL1f6q0F9/XIT+AvzN
-						SrkH/oDlWwF/qN7wFaHr3B1h6MoDYdiqg2E4tPpgpQlYaysBqAIcLyoBqALMXrUjzF22KcxZuyfM3HYqzN4R+/4B/oD81QL/+Ym/UH7g
-						F/7fWzEweA93amMvhBV/PMSrrsQmL2Z9XKrVqt/bf1jz6WY5XhtxPOd4z/mA84WXUzjvcF7ivMV5jfMe50XOm5xXOe9yXua8zXmd8z5z
-						AXMDcwVzB3OJZRbmGeYd5iHmJeYp5i3mMeY1y3LMecyBzInMkcyZlkGZT5lfmW+Zfy0bMzczV9+zL/5F7ZuwbxDiC8AXiC+gvbj2wkN8
-						Y/jG8Y3lG28HhR0wEA8oHnA8IHnA8oC2g50nA08WO5Egnmg8EXmi8kTmic6BwAYJDiIcZDgIcZDiIMZBjoMgB0kOohxkIQ7EHKg5mHOw
-						52TAyaIimfzMz/zMn3z+qaYD6rQZ+CMvCX1cegRPzOw6IdTsPSc80DsbgdswBJCYgZr9F4dHhywr2oOeHR2lVQExAYCxWTvPigG4qGYg
-						wz/Af/7eC6p5hQE4r5q965x8zzndLDxu44loAAD+Av3DE/Sr5O+A/yEC/zAAg1YeDn2XHlA4f3z4KpUaATUDq6sYgWwG1BBoVSCqwhCM
-						ExOQhCoDhA3PL6MqIML/pWZADUFpBG5sBqKasVKFoLlRaQiiWsmfs1qjfahQfJgVlE1BFZMgKp56WyE2DVW/Jj8115f5WvwfrioBvyro
-						3xzsW+DPK/zNE+x7wK/Qb4A/Qv86B/rX3BT080p5deAPYM7gD+i3K/5PippOWh/6L92rD/gasmK/mgA1AEkjV8dWIJgAGICxeT+AwH+s
-						BBzTViDdC7Bur676K/inDb4VZ/2nCkA2APj53nvx4B+//51q84Ee7Dkr1O0y9hPt8YckFv8QMVni8x+L0PIDVcRtEcd1jvucFzhvcF7h
-						vOPlJs5fnN84/3F+5PzJ+ZXzL+dnzt82t3PeZy5gbmCuYO5gLmFuYa5h7rFMxLzEPMW8xTzGvMY8Z1mPOZA5kTmSOZM51DIq8yvzLfMv
-						87FlZ+bqe/bFv6h9E/wG+QLwBeILaC8uX3i+MXzj+Mbam24HBMQDhgcUDzgekHaw8mC2Ax3iicAThScSTzQ7CXmS8iTmSc5BwAYIiAMI
-						BxgOQBygOIBxgOMAyAGSAygHWA7CHKQ5iHOQ5yTASYKTSE4uf/Tvf/XXv/LVBp1X1W076B+9pPRx6WFJvnU6jwkP9ZoZjUDWbRqCB/su
-						DHUGLdGqQDYCuTWooQDXlK2nBE6iCViQwH++QH+E//OqCP/nFf6zZoh5mCmasu20mgEYAAA/NgED+gevPCSSjysOiQE4FAasOKgCbD41
-						Yk1VIyCKT0EWMwCpKYgqKgNj1l7XCKi0MhBVVgc2loYgVweSGoo5UBWmIAqmIBqDqKYwB0bZGDSfbpWNQamWMAhJuWJQqXj8pTUJhVm4
-						CdlVepXzNVD8mfh/SAr3+QjO8lSeCsi/Aex7q/u3A/wN0wk+GfpfttCfgN+CvwXl66+SQ9cHf+iFUatCl7nbw4Cl+8LAZfvCoOX7ZPwm
-						E7DiQBi2MhoAnP8/Ku0HsCYgtwKhBWjWjtO6yRen+6DHHxt8sfK//GA0ACvxxN9kAFAFgND3j/d1I/C/k6v90EM9poc6n9ADvKzqtBv0
-						91+u33ExYrGNzUYcvzm+c/zn/MD5g/ML5x/OT5y/OL9x/uP8yPmT8yvnX87PnL85v3P+Zz5gfmC+sOzBXMLcwlzD3MNcxNxkmYp5i3mM
-						eY15jnnPsiBzInMkcyZzqGVU5lfmW+Zf5mPLzszV9+yLf1H7JvgN8gXgC8QX0F5cvvB8Y/jG8Y21N50HBA8YHlA84OxgtAMV4oHMA50n
-						Ak8UO4l4ktkJCPEE5QnME5wDAAcIDiA2uHDw4eDEwYuDGwc/Do4cPDm4cvDl4MzBm4M7B39ODpw8IE4wf/y7X3msUc2Wfa95CerjFIxA
-						bTECD/aYIQZgXlIyAzdtCCpNQe3+i8NjQ5aFenjKqYAGTABOCBq74ZjCvxoAhX8B/7Tqnz/G1f+zqhk7zmhLkGr7mTBdNA0PDNtyStuD
-						hmrrD8A/Qr9q+cHQf5lo+YHQc/G+UF8A/bFhK8PjSU+MWCUmICoagWQGPCMg4icix+cgxOcfWBXVARGeiwDVV0OwMTQgNVRDIJocVZqB
-						qCZJTdUQVKqZUXMYgyxjEFrAHCS1FNi2KgH8xrqd74Hig7WyEtR7qgbyS9CvHvYj8EfYvx7wK/QL8N8q9Gfw96DfW+332nwY/PHvbaZv
-						Dn0W7wn9luzR1f8BYgDUBIi4EgADYE3AGBHgf+rWk7ranzf3LhLpOf/JBFR52JcxAPiahnINqntP+B0fHbRYnwDsQfztqIaA/yf15F5W
-						zRZ9r/73rzxcHzHYiOOzF8M5znMe4DzBeYTzDOchzlOcxzjPcR7kPMl5lPMs52Gbozl/c37n/M98wPzAfMH8wXxi2YW5hrmHuYi5ibnK
-						MhfzGPMa8xzznmVB5kTmSOZM5lDLqMyvzLfMv8zHlp2Zq+/ZF/+i9k3wG+QLwBeIL6C9uHzh+cbwjbM31d5wiAcEDxgeUHaw2YEI8UDl
-						gcwDnSeCnSR2AkE8wXgC8gTlCcwT3E5+Dg4cPGxggTjwcGDiwMWBjQMfB0YOnBxYbdDloMxBm4M6xIGfEwMnDk4uNvH8yeeeaDygdusB
-						3/WS1cetOp1Gh5qSrL+KR/UXZuB6hgCqzhSkqsDAJeHJYSvCc6NWh+fFCAwSMJ8vwKIGIIO/QD80e1cEf2hmhn6YgAz/20+LATgtAHRK
-						KwrQhE0ndIPwEDECA5YdCP2WivBR/7xfTyTCXgQcY/qY/B5RYgZQFUjKVYHSEETpE5Hld47PPyifipyfjMwPRPtIZsCoESoEIjYEvinY
-						TKaAJKCd/9xCjEIVqWGoXi2xQm+Fz1VRAnqj/GCtUtUBfpSFfAb9G8F+Yz2f/yaAv4D+SuBn6Oe2GB/6ocrV/gz+ub8/gz+O9mw+ZWPo
-						uWBX6L1wV+izaLcaADUBS8QEqBEoW4GGrDhQVAJgAMauP6L9/jPS5t7idJ/dcZNvccRnPudfTIA1AFoFOHxFP7aetql4X/m94b1gtf9O
-						HOFZak54qPvUUKfjSDfWfNySGPvhnz7eoJ/E3M8i7poYnMVxmuM4x3nOA16u4HzC+cbmIs5TnMc4z3Ee5DzJeZTzLOdhztOcxznPWwZg
-						PmB+YL5g/mA+YX6xbMPcw1zE3MRcxdxlmYx5jXmOeY950LIicyRzJnOoZVTmV+Zb5l/mY8vOzNX37It/UfsmIPsG+QLwBeILaC8uX3i+
-						MXzj7E3lG84DggcMDyg72Hgg8kDlgcwD3U4CO0EgnkA8wXgC8gS1k5cnt534EAcGDhwcWDjw2KDEQYuDGgc9DoocNDmo2oALcUDmgM0B
-						nYM+JwVOGpxUOOkgEf3Jz/yrf/Vnn3+6+Yg6bQb+2EteH7ce7TQi1O4+OdToKYk8mYFKQ2BMwU0agof6LQyPDl6qewW6ztupwD9XIAaa
-						I0AzW6AfUvgXyImr/wB/gf4M/qIM/pO3QCf14yT5OFE0fuPxMHLtkTBk5SExAID/faHPkn2ht6jnor0Clpu1CvDY0GwEBHyGwwysFCOw
-						0lQG4tOQq5iBpLI6ADNQWR0oqgRJL8IQqCmIgimAUJmAGog5yKqPj4UxKNUIpkCNQanGMAhJ1iBYZYOQ1cxRhVmAgTCqCvG+Kr+3eqi3
-						YsCPkE9tPC7s0+r+HQT+m4X+m1nth56Vr28+eYOe699j/s7QU+A/m4DeMAEVlYC9WgmACUAFAKv+aPOZtvVkmCngP1PmANp9ZuvpPmfE
-						PJ9VxXP+cyUgmgAYgNgGBBNwKRmAy6HbvB0V7w+/c90Bi/SoYB/ib101es6W2DEpPNxxuBtbPm5hz9Xnn242UmLsn+d4a8TxmOM1x3OO
-						95wPOF9wPuF8w/mI8xXnM853nA85X3I+tbmW8zDnac7jnOeZA5gTLEMwXzB/MJ8wvzDfWPZhLmJuYq5i7rJMxrzGPMe8xzxoWZE5kjmT
-						OdQyKvMr8y3zr2Vj5mbm6nv2xb8ovxH7JvkC8AXiC2gvLl94vjF84+xNhewN5wHBA4YHlB1sPBB5oPJA5oFuJwFPEJ5APMF4AtrJaScu
-						xBObJz4HBg4cNqhw0LEBCeKAxQGNAx4HRA6YHFBtsOVgzMGagzkHe04GnCw4mXCy4WT02V/6T79W48v1Oyyp23bw33nJ7OMWni6MDcMP
-						SVIvkjxgweh2qgS1BywWcN2gcJ/BP8P/LIH+mdvzqn8E/2wACvgXAfonbY6aCG06odWACRtPhHFiBKCRa7FfAGbggBqAnov2hM5zd2o7
-						Ep6I8tumAABq40lEQVRrUEqMAMwAWoSyGRguRgBmQPT0CDEBSfmhaKUZyBUCbHq2D0crVZqBpMIMRL08ISqbAqsGArxZpSEwqjAFlWpy
-						AzUFiFcjmKWsphXyv96XhfqqKo7grAb28+k814N9qBL2feC/U9Cfwd9CvwV/bO7Fz245dZOCPwTw7i5SEyAGAEag96Jdoc/iWAnQjcAr
-						DujJP2jxwcbeqVtOKPxD6NlXA4D5UpiAs1XO+c8GID/tF5uB84ZgVBXwHvF+7tSTeq1q9JgVancZH2OGE0s+dkkMRSxFTEVsNeK4y3GZ
-						4zbHdY77nBc4b3Be4bxjcxLnK85nnO84H3K+5HzK+Zbzsc3VnMc5zzMHMCcwR1jGYP5gPmF+Yb6x7MNcxNzEXMXcZZmMeY15jnnPsiBz
-						InMkcyZzqGVU5lfmW+Zfy8bMzczV9+yLf1F+I/ZNQvYC8AXiC2gvLmQvPN8YvnF8Y+1N5wHBA4YHlB1sPBB5oPJA5oFuJwFPEJ5APMHs
-						5LMTE+KJyxObJz4HBhs0bECBOOBwQOKAxQHNBjsOhhwsOZjaQAtxIOZAzYGcAz0nAk4UnEg40XAiKpLUZz5X4/kHm3Y/VLfdkH9yk9vH
-						Ld0wPFbbgx7oNYeSf3WG4EamYL5WBIatPqRwPxPgnzRDgf9UmA74V50q236w4p/BX4B/4mZRgv/xUIJ/aOyG42HMhmPxONFkBvov269G
-						AJtY641cHR4dsjw8aoxANgOlEYh6akTU02oIolDNUCVTkJ+LkB+QVjwkzagwA1apSvBS0sswBSLPENQXKG4gH7OwwTqrkZUAtlXjyZ7Y
-						NHhfcyMleL8Vye9XAn6WgXwD+xb0q67sR3mwD1UH/Hca+vNqP37/djM2h46ztoZOs7eFznO2i7bphl+YgG7zxQQsiJWAvov3aLsPoH/c
-						+iOVT/oVAzBZxvVUMbkwANOTCUALkFYBZI7Ec/5TO1AyANEEnK/YC4BKAJ4jcOdbfOZqLMDG3pqdxnziJ/qUGvJPNZr22P+Zz371OYml
-						f2rjahLHXY7LHLc5rnPc57zAeYPzCucdzkuctzivcd6zOZHzJedTzrecjzlf21zOeZ45gDmBOYI5wzII8wnzC/ONZR/mIuYm5irmLstk
-						zGvMc8x7lgWZE5kjmTMtgzKfMr8y31r2ZS5mbmauvqdf9hflN8Jv1F4EyF4gvoB8ge3Fh+yN4RvHN9bedB4QPGB4QNnBBtmByAOVBzIP
-						dDsJeILwBOIJZicfT0yeuDyxeeLboGADBsQBhQMOByQOWDaY2UAHcSDkQMmBlAMtB2IbpDmIc5DnJMBJgpMIJxlOQpykkLj+FEkMyeye
-						MQKi2B40KTxoqwJVdPOmoGb/hQJGO8M4AaBJWPkUyAf4K/wr8J9MK//4iJafE/J10Mm44q86ruA/XoAfP2esAH/+OGb90TB63dEwSjQS
-						WnskjBANW3U4DFh+ILSbtS08LRCPo0ytbIUgVgfEFKBCIIqGoKwQQJ4ZqDQEUfY5CdALWiFYK0YgKVcJRC8lZUMQTUGpXDnwzEID+XyW
-						NQmuWSA11tV5qIT1m5OAvJX831B8mq5VCfkW8C3o3y7sf1Tgv5WVfkA/fl+s9redvjm0FfhvN3NLaC+CCegoYysagW0C/rt0tR8tPoD+
-						/JAvHOsJA1A86RcGQE3ACT3lBxt+YyVADIBWApIJMAYArUC5DUhNwL64KRh/xubhO7mhF8Lcr9Xt3mnziRLwb9L9wK9/9ksZ/K04vnL8
-						5fjM8ZvjO8d/zg+cP2xu4bzDeYnzFuc1znucF23O5HzK+ZbzMedrzuc21zMHMCcwRzBnWAZhPmF+Yb6x7MNcxNzEXGWZC7I8xrzGPMe8
-						Z1mQOZE50jIm8yfzKfOrZVvmXuZi5mbL1Pf8y/6ykH0j/Eb5QtiLBNkLyBeYb4C9OXzj+Mbamw7ZAcEDhgeUHWyQHYg8UHkg80C3k4An
-						CE8gnmB28vHE5InLE5snvg0KHDA4oHDA4YBkg5UNZBAHOg6EHCg5kNogy0HYBmiIAzgHeE4AnCA4gXCCscmHkxMnr8/9ty/UbfJQs97n
-						/MT3yQil/oe7jg21e3pVAU+VpoCNQVOBzdECRFmA9wkC9XjQEQQgQs9/hH+s+h/Xf4fGCfjjhCEIwI+jEseskz8L8OPvo/Az1wr8rzmi
-						GrHmcBi++rBWH4atOhSGrDwYuooJASzj1CIAvmcEKs3AiirVgbJKEFWYgqTSFFQek2pVGANUC5IKc6AGISqbg9IkVC9rGuoLdEMNxDR4
-						qgrrVvJ9VvKzqxdBfZY+YCurEu4LyK+mhSfLg30L/Bn2rw/8UFXgrw76n5KPAP4X5b7hFJ3mkzeEFlM2CPxvDK2mbdLNtW2mRyMAA9BZ
-						wB/tPv2WoL1nfzrVJz7gKz7kK5oAbPCFASgf8lU+6bcwAakdaDqqAKLYClRpALIJwOdgEvC1+Pl3atUfc7xmj2nh4Xvg/H4WwP+3/uyr
-						LyFWGnEc5ThrYzDHZ47fHN85/nN+4PzB+YXzj81NnLc4r3He47zIedPmVM63nI85X3M+t7meOYA5gTmCOcMyCPMJ8wvzjWUf5iLmJuYq
-						y1zMY8xrzHOW9ZgDmROZIy1jMn8yn1p2Za5l7mUutszMPH3Pv/gXtm8Gsm+ULwRfKHsRIXuB+QbYmwPZG8c3lm+8HRSQHTA8oHjA2cEI
-						2YHKA5kHup0EkJ0gPIF4gtnJB9mJyROXJzZPfBsUOGBwQOGAwwHJBisOZBzoOBByoLRB1AZYiAMwB2gO4BzgbfDn5MDJg5OLTTwQJyZO
-						XEVS+8O6z3et1bLvO14S/CT1cMeRoWa3KaHGTRkBq0pD8LhA1sDl+3TVEpA0XAB9uAD6SAF2rRBsiuCf4R/AFA1AueKP1X7AfjQSccUf
-						368r//Ixwn8EfxiAockAQDihqNv8XQFHTzaZtFGAdZ0A+JrwjMA8jjVlPQ5DIHpi2HI96Qh6arhIQDGrNANZN2MI8Oeo5wV4s/C7ZL1o
-						ZQ2C6CU1CFEvwxzcUOlrBWwrpN9/G5LfoVIG7D0lsK8O8qsD/epg/2aBXyWgDz1tPyf3ELD/vPxMAH8DMSqAfrT4NJm4Th/g1UwMQHMx
-						ADABMAAdZm3Vfn9s7q1ytj+e8psf8lU85Tcf7Rmf8gsjMN6YAIxxfdIvTAAZAFsFwEd8DiZhsswP3T8gXwtD8cigxc6cuzXp03q7Tgq1
-						O46omPP3gmq26PPmH9V8povExj+zcTKJ4yjHWY7DHKc5jnOctzmA8wPnD84vnH84P9ncxXmN8x7nRc6bNqdyvuV8zPma87nN9cwBzAnM
-						EZYxmD+YT5hfLNsw9zAXMTdZpmLeYh5jXrMsx5zHHMicaBmS+ZL507IpcytzLXOvZWLmZebpT8XL/sL8huybheyF4AvFF9JeZMjeAL5B
-						9uZB9sbyjeeBYQcNZAcUDzgekHaw8kDmgc4TwU4SnkA8wXgC2snJE5cnNk98GxQ4YHBA4YDDAckGKw5kHOg4ENogaQMoxAGWAzAHaA7g
-						NrjbwA9xYuDEwYmFEw8nJpu0OKn92c/8zM98/k+faDC4duv+H3pJ8RNV+6Ghdudx4UHdK+ADxY1Uu/9CbZcYIYAEDRNoAkBB2MiIYxFH
-						rxNDkGAJim0UMABY+YcBOCJwlcA/QT9+lgV/fBwK8F9xUDdgDpaPMABQ/6X7Qqc52+MmVgE9fITQ1gLAfW7UKgHGSlPwuDEDVQyBEb4P
-						gqlQWUOQ9Kz8/Cwcn8p6HsbAqDQGlSYBelHAuxD+LnpJYdyTGIFC3r9fTwLuNxBgmsE+ywI+Qz6D/q3AvrfCn1f5458j8NcTZejHg7rw
-						u8KIwLiUBmCtGID1oaWMBZznj/Ye9PTjWE/09GO1Hxt6YQDiiT7xVB8YATUBq8QEiAGAEVATIAYgtwJB8SFf8Sm/cU9AqgIkAzBtS9wL
-						gD/j8/i6/GAwu38AZuKxwUvc+XUzwtzF2f21Ot97q/1QrVb9v/XZR18eKPEQJ/sA/rM4XtpYynGW4zDHaY7jHOc5D9gcwfmD8wvnH85P
-						nL9sbuO8x3mR86bNqZxvOR9zvuZ8bnM9cwBzAnOEZQzmD+YT5hfLNsw9zEXMTZapmLeYxyyrMccx5zEHWkZkfmS+tOzJXMrcylxrmZd5
-						mHnZsvSn5mV/aci+IX7D9mJA9kLxheQLbW8CZG8Q30B7cyF743lg8MCxgwqyA44HpB2skB3IPNB5IthJAtkJxBOMJ6CdnJCduDyxeeLb
-						oADZgMEBhQMOByQbrDiQcaDjQGiDJAdQDrAcgDlA2+BtAzvEgZ8TAycOTiw26XBSsgkL4oRWJDsYgT+u82z3mi37vuUlyU9cHYaFWl0m
-						6GP/Pci4nnAsYQuBLICSNQAAqUECVKgS9NdV1nxkYoKoBFOAqlhFKFf8UUkYujIZCv2ZURH+Af7xZ0N4OBPUd/FeNQLNJuPUGjEC8tGq
-						GQyCfB4tL4DtegL0TwpQVjEFSfg3VmkMSmVzgJ9XqBqDwKreKAhUA67VJFTVi1YK6qzrA/vNisE+iwGfIb960Ieqwr4H/NzWgz5+tPZE
-						E4DvX6H/L36fF0T1Bf6x2o/2nvZo65mzLXSfv1Olm3nFqPZK5/qrAVATkM/2N0/5lTFVmgCMaTGy8rE0AXHMohKQjW02ALkVCLA/Rowv
-						vkdNcBrr2kKU9g/ga/G5x4fcHvzX6DEz1Ow8PtQWI+/O6U9YtVr2fQMx71/8i3/xFxIDGf4hjpccTzne2ljMcZrjOMd5zgOcJ2wO4fzC
-						+YfzE+cvm9s473Fe5LxpcyrnW87HnK9tLuc8zxzAnGAZgvmC+YP5xLILcw1zD3ORZSbmKeYty2LMacxxzHmWAZkPmR8tWzJ3Mpcyt1qm
-						Zd5lHraszBz9qXnxL27fFMRv2l4Qe7Egvpj2QvONsDcJsjeQb7C9+ZAdGDxweGDZQQfZAckD1g5myA50ngg8UewkguwE4wnIE9ROXshO
-						bJ74HBhs0OCAwgGHA5INVhzIONBxILRBkgMoB1gOwBygbfDmwM6BnxMDJw6bVGzCgTghccLihMYJ78//xb/6V1/40ycaDKnVst97XtL8
-						xIUnDXcaHR7qNi18Fc8VcMCjOgHKcD56FQOggL5XV1wBXHH1dY/+G6Aeq/1x9T/2W2PVNYL/gTBEfg4qCfiIn5fhf+CyrAj/WMkFyPUT
-						E9B70Z7QYdY2AX6cT78+mYFKwQxAeOAT/h398lgZf1ZA8hkByycENNHiBOHPkG8ISpWGoFQV+BVgzcL/VUUK0qVQvagUPgfoBZxHVf0a
-						IzEgUZWwfitisM+q8t6qqAT9m4F9Bn5P+DcYgBdGC/CPi8DfatrG0G5G2shbnOazXU/z6YrTfHCkZzIAPeUjTABaf/rKOOlrjvYsTUA0
-						AGgHQisQDADGI4wpxidgvgR6VLNEAvX4HPYN6IPB0hzITwjW9iEyAPj6J4YudedSdXqg5xyZm1NCrQ6jZL7ee6v9UK1W/b7x2UfrDxLw
-						/wJinhHHQ46XHE853nI8trGa4zjHec4DnCdsDuH8wvmH8xPnL5vbOO9xXuS8aXMq51vOx5yvbS7nPM8cYBmB+YH5gvnDsglzC3MNc49l
-						IuYl5inLWsxhzGnMcZbxmP+YDy07Mlcyd1omZV5lnrWsyxzMnMwc/al68S9v3xi/cXtRIHvB+ILaiw3ZG8E3yt5EiG+yHQB2cEA8eOzA
-						4oFnByVkBywPaDvYIZ4MdqLwRLKTDLITkCcoT2A7uXnic2CwQQOyAYUDDgckG6wgG8g40HEgtEESsgGUAywHYA7QNnhzYOfAz4nBJg2b
-						UCBOOJyQOGFxQrPJzibCP0dyRFm8Vqu+X/eS6D2hDmgRGhtwdODNtgjV7LdAWy0APwCo6gwAAAzCEYuAs94LAWJ4uuq+uOqqK/4J/kVY
-						lcXPGiTQn1f8I/hH+O8n6ivfj5/dB2Anws8HCGLjJ1pBVNkQkFA1gJontZiCfQUbtI8cxuCF0asFelcKfK4QCEWFIJkCVApIT8EYJOHr
-						sywAQz40G8n/V62KaoPzfR+bKgGfIR+6EehXB/sR9Jep0UAFA609aOlBL3+rqXkT72ZVPMlnq676o7c/m4BsALrO267n+neftzOd7Z9N
-						gKkGyNiJJiC2BJV7AiLIaztQgnmtBMCoyt8xLjEOs4nIBiLvJbAGAK1wMAEwAPj8Tff8ixF/UAx5TZmLddrdm6v9EPY7/cnDL/ZL4P/5
-						pIq4J7IxkeMlx1OOtxyPOV7bWM5xnvMA5wmbQzi/cP7h/GRzF+c1znucF23O5HzK+Zbzsc3VnMc5zzMHWEZgfmC+sOzBXMLcYpmGeYd5
-						iHnJshRzFnOYZTTmN+Y7y37MhcyNzJWWOZlHmVctyzLnMgdbRmZ+/tS9+A3YNwfZN84Xxl40iC+qveD2ZkB8s+yN5BttBwFkBwgPIDu4
-						IDvweGDaQQvZAc0DnieEnSyQnUg80ewkhOwE5QlsJzfEk98GBg4cNqhANuBwQOKAZYMZZAMdB0IOlDaIcoDlAMwB2gZvDuwc+Dkx2KTB
-						CYUTDickTlg2mdlEB3Ei1AQZjUD9Qfe0EYA6DAs1u4wPD3a/sRl4oPdc7cNG648aAPnIBgAPVbIGAG0aOHc9r9gCzvB1ACprANRMJFBT
-						8E/Qb38mKgBQLzEVPaEFu7Q1CMc/Nhagx/GXUDQD63UVuUK2UpCESoEVvg7mAMdeog0Hq+2AYmxOzeaA9STAN8mahGgUskpgZpiGPOiu
-						Xh60W3nf48v7XSD7+0IW8hn0LexnwMfvgRYe9O9jzOD+4Hqjpaw5rjtLPt8ineRTnuYjJmBGPM4TBgDqNFuMwKxsBLapCdAHfOFsfzUB
-						sR0I46U0ARHiS5CP7UBqApIRxbjD1xbGFd+fqggYi2wAYGbZAODfHh64yJ07WbGvf0ao1XlcqHOPtvhkAfw/+/CL6PG34H8zBgCyMZPj
-						Kcdbjsccr20s5zjPeYDzhM0hnF84/3B+srmL8xrnPZsTOV9yPuV8a3Mx52nO4zbHc/5nPmB+sGzB3MFcYpmFeYZ5h3nIshJzFHOWZTDm
-						M+Y3y3bMfcyFlhmZJ5k3LYsypzLHMudaBmY+Zn7+VL74Tdg3aN88xBfHXji+sPaiQ/aG8A2zNxOyN5oHgh0kEA8iO8Ds4IN4cNqBawc1
-						xIPeTgieMHYyQXai8US0kxSyE5gnOAcAGxwgGzg4sNigA9mAxAGLA5oNdpANhBwobRCFbIDlAMwB2gZvyAZ2DvycGGzSgGxC4YTDCYkT
-						lk1mnOg4EXKi/MIf1H62x0PNe1/xkuw9pY4jQq2uE8NDPWdc1wzUGbBQASwbgAjs1RsACAYAK7f4PlQSOgrIAd4Bb4C2PvK9aNXQdh9I
-						/q4/T8F/t0I/wA4/Fyu9+B4AnxoM+RkAQZz/HgE+bhRVUyDCiTH51JjqVBiCapTBFV+Ln4XNqPlJtwBdAG8GZwvDLAbpLAvb1xOD+vXk
-						fb8n7/fxfm98Ld4n2oewjwDvHe06cVNuBHxUZSBcryy+llC+3lC+/vE0H3uc5+byXH8xAh1mwgTEliAYARgA2w6kewJEvdASlEwAZE2A
-						BX18j47HOWIk5OfAqOrPSJUEawAwzjHeKw1A3D8AA4Cvq9N/oTtfFPrFYNfsMiHUbn8vndnvS2LVpT986OluiF0i9PlDHNc47nFctDGT
-						4ynHW47HNlZzHOc4z3nA5gjOH5xfOP/Y3MR5i/OazXmcDzlfcj61uZbzMOdpm8M5v3P+Zz6w7MBcwdxhmYR5hXnGsg5zEHOSZSjmK+Yv
-						y2bMbcx1zH2WCZkXmSctazKHMqdahmW+Zf61bMzc/Kl+2Tdi3yTEF8FeIHvxIL649sLbmwLxTbM31N5siAeDHSg8kOwgg+wA5AFqBy9k
-						BzYPfDspIDtheELZyQbxZLQT1U5iiCe5DQAcIGzwgGxg4cBjgxJkAxYHNA54NhhCNlByILVBFrIBmAM0B3Ab3CEb+DkxcOKwSQWyCYcT
-						Eicsm8w40XEi5ESZE+hf/Pev1G1do0mPE/fSA8WqVcfhoXbXCWoGPKjBBmGssueVVTYAACg2AIAsawCwottehFaPNgJ5WOmNMLZDgR8t
-						PzAABfxn8Bcp+AuwKfznlpD08wGLOBaycTIC1gzcrCGAMqB6AJtlQTfDL5TBFv8P/n8YhnjefjQNeSNu1b77uDKf4Zwh/FaVf0656h//
-						n7wPIG8KziftZKDPUI/3gPdp31uWfe9QviasfB3zNfGk11nuGb5ez/WXn9c6tQS1xrn++nCvzWoAYATyU35hANQEiAoTAAMgwpjB2IEp
-						wL/je9rK2MBYw5iLbUUwoqWRsAYA45gNgN1EnA0AfvZDfedXmSM4hQvVtbrth/lz7N7ST2o06X70v32hTkuJVRb8sziucdzjuGhjJsdT
-						jrc2FnOc5jjOcd7mAM4PnD84v9jcw3mJ85bNaZzvOB9yvrS5lPMs52Gbozl/c363uZ+5gLnBMgXzBvMI84plGeYc5iDLSMxPzFeWvZjL
-						mNss0zHvMQ9aVmSOZM60DMp8yvxq2Za5l7nYMvOn/mXfDMRv1l4Ie5Egvoj2AtuLD/HNsTfO3lSIb7odEHawQDyY7ECzgxDiQWoHsB3c
-						EA9+OzHspIF4UtkJxxPSTlbITmSe6DYIQDZAcACxwQXi4GMDkw1aEAc1G/A4INpgCdlAyoHWBmHIBmgO4BzgbfCHbGLgxMGJxSYdTkic
-						sGwyg2yi40TIiZIT6Rd+40++WP+rjbrsqtNu0N87ifieE540WltApqZTGcBmR0BTBKWqBiCbgAoDIMDlGQCs+GL11wIm4E83ggrsAfAA
-						c/FnAv4BdrGyoJKfjQc/4ZQYwCFAEX3l2COQoTbrdgwBZGGWQdeK4Riy8HyrwvuAvJ9rlb/Oyvt5Nyv++d57tbLXx7t+Vvm6q+Q+NEuf
-						bzZ5vfxf0XSoAcjVgATu2hKk1YBoAjCmIIyFeN+36DjC79tM94HE+5F/XjYAGHs3MgC5esAGAIIBwM9DaxzmAh7ShX01tQD9HT4V0B/q
-						tB309w806rLjN/7o8/URm4w4bnFc47hnYyLHS46nHG9tLOY4zXHcxniO/5wfOH/Y3MJ5h/OSzVmczzjf2VzIeZLzqM2xnH85P3P+trmd
-						8z5zgWUG5gnmDcsizCnMMZZxmH+Yjyw7MVcxd1kmY15jnrOsxxzInGgZkvmS+dOyKXMrc61lXuZh5uWfihe/KfuG7cWA+GLZC2kvMsQ3
-						wd4ge/Mgvrn2xttBAfGgsQPKDjaIB6MdqHYQQzzI7QSwkwPiyWMnlp10EE9KO2HtZIZ4sttAYIMExEHEBhgOQDY4QTZwcWCzQQ+yAZED
-						pg2mkA20HIhtkIY4iNsAzwnAJgfIJg5OLDbpQDYhccLihGaTHWQTISdKTqRFkv2F//Artf/86aZTarce8B0vOd+LeqTD0PAINi12nxJq
-						9pqt4FOjz7zQWCDOqwBkA6D7AK5jAAB3ngHIIIlqA/4P/L2V/Bu+Ft+v0C8/L0L/djUKEP4NkJhhEV+PFWbAZj5LvjpTYMHUAuv1lKE3
-						y4NjTxmsr6d8PT6KvJ/L8n4/T/xevevBstfUmq/y2pcVBwj/D34n/O4wMdEE5ErAFlG8t/h8C/lafG+usuCJx/oz08/D71j8LDIA2UTc
-						yADo/gEyAPj/avacHWp3mxzqdhqjT+X25sy9KMQcxB7EIIlFX7RxKYnjFsc1G/M4HnK85HhqYy3HYY7TNoZzfOf4b3MD5w3OK5x3bE7i
-						fMX5zOY6zoOcJ20O5fzK+dfmZs7bnNdtzmceYF6wLMGcwRxiGYX5hfnGsg9zEXOTZSrmLeYxy2rMccx5lgGZD5kfLVsydzKXWmZlnmXe
-						tSzMnPxT9bJvzL5piC+KvWD2YkJ8se2NsDcJ4ptob7C9+RAPDjtw7KCCeNDZAWkHK8SD2Q50OwkgniR2AtnJBfHksxPTTlqIJ7Wd8DYY
-						QBwsbCCxQQbiIGQDlA1eEAc3G/hsUIQ4aNqAaoMtxMHYBmoO5DbIQzYBcIKwyQOyiYUTj01KECctm9A44dlkCNlEyYmUE+0X/+XP//wD
-						f/po/RH37LMEqtHD7YeEOp1GCQBNEhCaGR4bvFjhPhsAuw8gGwCA1vUMAIDOQmuEzNIAAOwAXthYCtjDg63yJlNAIwAvbhzFz40/O/98
-						9JO3kX8HUOLn4nvws6ozBJCFVQuxGVRvVhmWrSxU3wvyfkfIez/Xk71O9vp517e4/qJ4jePPQDVAfy8xbXkc4N8bjFur7UrPjYztUnp0
-						6uhyTwJarKwBwLjB91YYABkHbAC0gmAMQN5DUGEAlmHz8L4wcPHO8PzAOaFux5E6B7y5ca8KT+397GMvD/+X//LnayD2GHFc4rhlYxrH
-						O46HNlZyHOU4y3HYxmiO3xzfbeznvMB5w+YUzjecj2yu4jzGec7mQM6PnD9tbuW8y3nZ5mzO55zvLQswJzBHWMZg/mA+sezCXMPcY5mI
-						eYl5yrIWcxhzmmU45jvmP8uGzI3MlZY5mUeZVy3LMucyB1tG/ql72TcH8Zu3F8ZeNIgvqr3g9mZAfLPsjbQ3GeJBYAeIHTwQDy478Oyg
-						hHjQ2gFtBzvEk8FOFDuJIJ5kdgLayQnx5LUT2056iIOCDRg2mEAcbGwgskEK4iBmA5wNfhAHRxs4bVCFOOjagGyDNcTB3AZ6mwQgThI2
-						gdjkAnHysYmJE5dNapBNeJwQbbKEbCLlRGuT8Bd/50t12tdo1O2IJOufcPK+1/VIx+GhbtfxodnYZaF3gqibMQBYyb1lAyDKBiD31Ff2
-						1ccz9QGE+HqAJYAS1YP889FnjlaTDKqA0AykCqUGVK0y0GZZ4IUYiG9XGcDvpLz/53bE79leD++aQfbaWsHAQfgzHnamcD8cR6/GDdWP
-						DFoSHhVziQdrPTl0adzbIP8OA4B7XcUAyM/C/1caALn3qaUoGwCMN60OWQMgY5MNACpaA5fsDoOX7AhDF28JPacsCU90HuGO/3tWbQf9
-						4wONux7+nS/VbScx5ktJFXFHxHHJxiyOZxzvbCzkOMlx1MZYjr8cn23s5rjOcd/mBM4XnE9sruE8xHnK5jDOb5z/bG7kvMl51eZczsec
-						r20u5zzPHGAZgfmB+cKyB3MJc4tlGuYd5iHLSsxRzFmWwZjPmN8s2zH3MRdaZmSeZN60LMqcyhxrGZf5l/n4p/LFb5Ivgr1AfPH44toL
-						zzfF3jB7MyG+2XYg2EEC8SCyA8wOPogHpx24dlBDPOjthLCTBeLJZCeanYQQT1I7ge3khnjy28BggwbEQcUGHBuMIA5WNpDZIAdxELQB
-						0gZPiIOrDbw2KEMctG1At8Ee4mRgE4VNIhAnGZuAbHKCOHnZxGaTHsRJ0SZMm0whTrY2EWuC/k+//cfPfqV+x4112g78Wzep3+N6uuvI
-						0Hni4tBv7sbQe95WAatKA6C92mwARGwAAG7XMwB2U202AFgVridgqCfhiACMAEfsV4DweYAjvv5l+V6sKivI4v8AwAJME5B6slDLsiCc
-						xbAMeVB9L8j7XSF+T957t/KuGwQ4jyv4ePbCMoH6pXp0Zu1+C8KDfebrZtqaolryd5yqU3fAIj1XPxsA3L8qBkDuNxsA/F+3YwBgVHss
-						2BH6LtgWBszfFAbPXRuGzlkdBs9eFZoNnuqO9XtVtdsM/B9ffrnDhv/023/0XI4rRjbmcDzieGVjGcc5joM2RnL85PhqYy/HZY7bNqZz
-						vOd8YHMF5xHOMzYHcX7i/GVzG+c9zos2Z3I+5XxrczHnac7jNsdz/mc+sOzAXMHcYZmEeYV5xrIOcxBzkmUo5ivmL8tmzG3MdZb5mAeZ
-						Fy1LMmdaBmU+ZX61bMvcy1z8U/3iN2svhL1IEF9Ee4HtxYf45tgbxzeVb7odEDxYeDDZgcaDkAepHcA8uO3At5MC4kljJ5SdbBBPRjtR
-						7SSGeJLbAGCDA8TBwwYWG3QgDko2YNlgBnGws4HQBkmIg6gNsDb4QhycbeC2QR3ioG8Tgk0WECcTm2hsEoI4SdkEZpMbZBMfJ0abNCGb
-						UDnh2mQMFYn6X/+7f1fzc483GFOzRe/XvSR/r+vlvhNCz8liBKYtD31mrgk9Zq0PXWdtFuiKFQA1AWQAAGnXMwAQG4AXx1zfAECAR0Dk
-						Y4OXKFRCgE8ca5ph81H5HL4GX69GYUQ0Cvg/MlheTxaCrycGaisPwO+kvP/Tyvt9PXnvH8I9wX3AaUO4jo/L9cZ1BtTj9Ci7idwK/5ZN
-						wI0MAMQGAGPAGgD8jhgz1gBAGGOVBmBr6Dp7c+gpYxNjtN+M5aH/9OVh4MwVYfCslaGXjN9nuuEJvf4Yv9f0UPPe1z77WP1R//oXfrGW
-						xJAv23iSxPGG45GNVRzHOM7ZGMjx0cZOyMZVjrs2JnO85nhuYz3nAc4TNodwfuH8Y3MT5y3OazbncT7kfGlzKedZzsM2R3P+5vxucz9z
-						AXODZQrmDeYRyyrMMcw5loGYjyw7MVcxd1kmY15jnrOsxxzInGgZkvmS+dOyKXMrc61lXubhfxYvftP2gvDF4otpLzTfBL5J9gbyzeWb
-						bwcGDxo7oOxgg3gw2oFqBzHEg9xOAJ4cPHnsxOJJx5PSTliezDzZbSDgIMFBxAYYDj42MNmgBXFQswHPBkOIg6UNpDbIQhyEbYC2wRvi
-						4G4Dv00KECcNm1BssoE4GdlExUmMk5xNgJwcOXnaxMpJ1yZkTthI4l/+td//s5e/+FK7FbXbDPgrL/Hfq3qs47DQcuj00HvqktB7yhIF
-						KrRS9BRT0H3GmtBlxobQYeb1DQBWp9kAAPSqGIDRpQEAIFY1AEurGABAJmAT0IknHgNAAaLY3JxPeMmAWrNvBFN8H8AWbSq5ooAn296M
-						Ucjv4V6W93vjveEa473iPeO9Z7ivLdcE1+aBXv//9s40VvPzPsv9YClRK6IopUkVupClDVmaLolTu/E6a1LHSxwnseMtjvfE+xq7nijN
-						HjvxljhJs7UJKaUFWvYWPkAFhW8gkNpCgQ9QAQJBQa1UEKDm5b2P53HvuXy9Z5vFZ2aeR7oUVGzPOf/n97uv+3/mnJnVBX8j+gUg99Av
-						ACH31i8A47n3C8D4mZB8vPk8MjOZnX4BuPnJv7a49clfWdz15C8t7nnim2svqCGz+cCT31i+rH5z7QUg//veA48fF9/nv+/GA//zzZfe
-						/Ivf99o3vGfkRcE86axhDnVGMb+Yb519zEXmZmcq85Z53FnNHGfOtwPoB/qj3ULv0EvtLPqMvmsX0pP0aDuW/m0309v0ejuffYB9obsE
-						ewZ7SHcU9hf2m+4+7EXsTd2p2LfYx7qrscd1xwvd/9gPuzuyV7J3didlX2Wf7a7LHnxSHX7y/WD40PhQ+4HzMvqi+hIDL7kHgMPB4enB
-						4tBxKHtgOcwc9l4ELgmXqBeMy8fl7MXlUvfCdxgEhkUHSYdMYAh1QDG8GG4dfAxFhmYHKsOWYdxBzRDvgO/wD5RDi6OlEiidFlLLKlBm
-						LbqWYKAkW6At10D5tpgp7WeE/oIXvXj/qedf9cjuaz/4O1YGdir5tqD3f/yLay8A9zz69TXu/uzXFnd95quLu5b/e/ujv7C45bFfXNz8
-						+C8vbjxY1vgCMF4CDnkBWLLVF4B8RXm9F4DAF4CtkCKbQpxvbcl/P7/O07+70H9b7tN/Ln++Haa/jSXkdzdYwLdDntHaz0oc/O/mJWXt
-						d0mWv+b4ewfyseR77fOx5WPMx5rnkY89n0M+F/scjzR8AchLBV8A8jH2C0DuOffdLwD5fDMf4wXg2kd/ZXHDo7+0uPmzf3FxyyNfX9z+
-						8JeXfGVx5yNfXZu/zOF4AfjgE0+/ANz6qZ9bXHTHx3WOdxK7r73/t994wRUPf9eLXpQ/zeeszomDMEc6Y5g/zKfOLuYac68zkXnJPO2s
-						ZQ4zpzvDme/M/3YDvdFOoW/oo3YVPUbPtQPpR/qz3Urv0svtbPqcvu8uwJ7QHYL9gv2juwl7C3tNdx72Ifal7lLsWexh3dHY39jvuvux
-						F7I3dqdk3+wuyp7KHtsdl/33pDx8CP2A+PD4cPvB81L6wniZvOweBA4Jh6gHjMPH4ezB5VBz6HshuCxcpl40LmEvaC9v4HL34jMUGBod
-						KAwbhlEHFUOMIdcByHBkeHawMnQ7kDusA8O8g54SoCRaIJQL5dNiorQotRYeZUhZtkgp2RZwyzlQ3i32yP6sP/9jp1195qXv/8v7b3zo
-						f1hB2Im8895PrRWsfgFIGUspSznL/9+tn17y8FcXNz/884sbPvOtxXWfffr79McLwCi3q14A8pVhvgDk5wD4AhDGC8DaV7HxArDet6wc
-						a/LV9RTk9Ticr8A/1+RlK8+8XwDy7Vl5IekXgPGDwP0CkHvPDFz+8F9aXPXpby2u+eQvLK775NcWN37i5xY3f/wLay+eH/jkl9Zm67ZP
-						/+kLwF2f+draDI4XgMxf5tPmdqew78aH/uCMd9/8Sy97/ZuuGjlQdEYwP5gvnT3Mpc4s5hnzrrOQOckc7Yxl/jKfO7uZ68z9dgJ9QZ+0
-						a+ihdhT9Rb+1++hFerOdSt/Sx+1qepye7w7AfsD+0N2CvaM7CfsK+0x3HfYg9qTuUOxX7F/dzdjb2Ou687EPsi92l2TP7A7Kfsr+2t2W
-						vfekPnwY/aD4EPmQ+wJ4OX1xvFReeg8Eh4XD1IPGIeSQ9gBzuDn8vRhcGi5VLxyXsReVS8wl7wBgODA8OlgYOgylDiyGGcOug5AhyRDt
-						gGX4djAztBnqHfiUAWXRIqFkKKEWFOVFubX4KEVKs4VK2baIKWlKvAX/jPhPef7zd71+78UPnvveu34rf+qHFYedRL6t4rIPPrJWxFLC
-						nvUCsOSWZWF7/ye+uFbebvrYF5ZF7ouL6z/xlcW1n/r5xTWf/ubivcuyd/kGLwApiXwByPeSr/cCkB9C3YkvACc623kBePfHvrG49KNf
-						W1zxkS8vrvrwU4v3ffjJxbVLrvvZzy2u/8jnFzd89PNrs9MvAIEvAPl/X/HgZ3fyt/v8v3Ouvusfv373xQ9m15c7f3bv/0E6G5gbzJXO
-						HOZRZxVzjDnXGch8ZH52tjJ3mcud2cxz5n27gJ6gR9ox9E+7id6i19p59CF92S6lZ+nhdjT9Tb+3+9kL2Bu6U7BvdBdhT2GP6Y7D/sN+
-						1N2JvYq9qzsZ+xr7XHc99kD2xO6Q7JfdPdlL2Vu707LvzrM8fCj9wPgw+bD7InhJfYGhL5eX34MRemg4VD1wHEYOaw8yh5xL0AvC5eFy
-						9eJxKXthQy8zl72DIHRIMEQ6YBg+DKcOLoYaQ68DkWHJMO2gZQh3QIcOb4Z7B39oKVAaLRTKhjJqUVFilFwLkHKkPFuslG4LObSsKfMW
-						fegScPaLf/CH337axdd+Yc/1D/w7KRI7ivNu+dnF1QceWytkdzzy7BeAlLbxAnDTx55aK3QpdvmZglH0rvnIFxdXfvTLi8s/9rXFez7+
-						jcVln3j6e8O39AKwLJp8AchX1OcLwLHjkBeAJWs/CHzwBeC8A19bXPDQlxfvOPClxSUHnlpc9uDji8uXhf3yBz6zuPJnHl1c9dBja3P0
-						3g89vvan9Rz6AvDU2u8CHPoC8OW1ecvvBuS/k7/gzubzuWbPdR/8tz950fue+u7vf8VF2e2id555wLzoLGHOMIc6o5hfzLfOPuYic7Mz
-						lXnLPO6sZo53xjP/6Yd2B71C77ST6Cv6rF1HD9KT7VD6lf5tN9Pb7XT6nn2guwJ7BHtGdxD2E/aX7jbsPexF3ZnYp9i3uouxp3WHY79j
-						/+tuyN7IXtmdk32UfbW7LHvuPHX4cPrB8aHyofeF8LJ4mX3RHAIOSQ8Qh6sHL/RQcmh7oEMPO5ehF4VLxCXrBeRycnl7sbn0DIUODIZJ
-						B03oEGJIdYCFDjeGXwcjQ5Oh2oHLMGZYd5Az5CmBFgTl0WIJLR1KqYUVWmaUXYswtCQp0RZsaPlSzi1uSp3S70LwTFH43le+7l2nX/y+
-						n9t7/QP/wQrGTiE/KJwCl0IWNvsCEK750BNrxS//forgVQ89urhy+b+XH3hycemyLL7zQ19avOPDX11cvCz+Kf/rvQCs/RwAXgC2+3MA
-						k63ypcWe+7+02Hff5xdvueeJxdvueXRx4T0PLy6++5NrfwrPO5b/m2/Pedd9n15cdv8ja7+DlBeAfOU+d94vAJkLvgDkd5PGC0DmKf+N
-						nVj891x7/79500VXfy67u9zhc3qfD9K7zhxgTnSGMF86e5hLzK3ONOYd87CzkjnKnO0MZj4zvzvbmfv0QjuDPqFv2kX0FD3WjqP/2o30
-						Jr3azqWP6et2OT3PHtAdgf2B/aK7B3sJe0t3Gvad7kLsSexR3bHYv9jPurux17H3dSdkX2Sf7K7JHtodNXSHZb+dRw4fUj/A0A+XD78v
-						JvSl8VL7wkMPA4elB4lDxiHsAeXwcrh78LkUvTChl4nL1osYekm5xL3goZef4dDBETpUGDodSAwrhlkHHUOwAzJ0eDJcO3hDhzJDuwM9
-						dNhTBi2K0BKhZFpAoeVEebXYQkuPUmxhhpYpZdsipqRb4KHlTvl3MQhdGs794dP3fuDM99zya/kTQ6x47ATOv+2ja3/yyihq4wUgBY4v
-						APkqL18Ann4JeHStFOYru/ljSNfK4pJ33/fw4l0f/MzikgceW7zjwScWFz341OKCh764uODAlxc/feDpbzmZLwBHn3OXRX/XPU8t9tz9
-						xNrfIr3/jk+v/Y3Sb/nAR9a+Bee8ZSl/220fWVxw+0cXF97xsbUfHucLwKX3P7zxC8DB3wUYLwAh/8xO/CM98zM8Z1z2gV/94Z/cnb+s
-						K6V/0DvM/eb+dzYwN5grnTnMo84q5hhzrjOQ+cj87Gxl7jKXO7OZ58z7dgE9QY+0Y+gf+qndRa/Re+1E+pI+bdfSw+1o+pt+b/ezF7A3
-						dKdg32Af6a7CHsOe0x2I/Yj9qbsVexd7WXc29rnueuyB7IndIdkv2T+7m7K3stfOs8Hph8WH2Q+al8BL6gvk5fLyezA4ND1QoYeNw9iD
-						GnqIOeS9AKGXg8vTixV66biUvbChl5nL3kHAkGCIdMAwfDqYQocWQ60DL3QYMiw7SEOHLEO4Azp0eDPcO/hDS4HSaKGElg1l1KIKLTFK
-						rgUYWo6UZ4s1tHRbyIHCbpm36AOLQJeELhDhnFOe//zdP3LO+fefdeXtv7H/pof+yArJc00K4FXLUpfy3y8AN370qWe9AKTwrfsCsCyK
-						z7wALMtjSuQl93xqrVCmDL49LEvm2+/65OL8ux9evPWuzy723/PYYt/dTy723Pv5xe77vrDYtSytVmYnzyYFf/e9X1jsvudzi913Pr7Y
-						c8dnFvtuW5b8Wz++eOstT5d8u/PwzAvArZt4AVjeae73kBeA5csjXwDyf3vXvZ/ecV/t33/TgT88+4rbfv11Z7/t3lNOOSXf17+q+Ife
-						ae4786CzgjnCnOkMYj4xvzrbmHvMxc5M5inztrOYOc0c74xn/tMP7Q56hd5pJ9FX9Fm7jh6kJ9uh9Cv9226mt+n1dj77QHcF9gj2jO4g
-						7CfsL91t2HvYi7ozsU+xb3UXY09jj+uOx/7Hftjdkb2SvXP00cC+2l12ni2cfnB8qP3AQ18GL6svMvQlcwh6QEIPD4erBy/0UHJoe6BD
-						DzuXoRcl9BJxyXoBQy8nl7cXO/TSdyCEDguGSQdN6BBiSHWAhQ43hl8HY+jQZKh24IYOY4Z1B3nokKcEWhCh5UG5tHhCS4nSaqGFlh1l
-						2KIMLVFKtgUcWs6Ud4s9UPxdCrowBBaKtaKxfBnY85pzzrvnrPfc+jd34p8klCKYIp/yf8gLwBK+AKTojReAfF84XwBSGle9AOSPfEzZ
-						TOnMy0d+3fOWhTGlMaV0jRTI2z6+2H/7J9e+ar3vzmWxvevRxd67n1ik7O5Zlt68KJwjpfh459z7v7TYde8XF3vue+rpz/Xux9c+9zyD
-						/bc/vNh/26cOFvzDK9n9ApDfDeILQO6NLwC559z5eAEIufP8Ozut9O+76aH/fuZlt/yN15x13j3ZveUOnjt28SDcU+5x7zj3n/nA/Ohs
-						Ye4wlzqzOssC866zkDnJHO2MZf4ynzu7mevM/XYCfUGftGvoIXqqHUa/0X/tRnqTXm3n0sf0dbucnu8OwH7A/tDdgr2DvaQ7C/sM+053
-						IfYk9qjuWOxf7Gfd3djr2Pu6E7Ivsk921+wOGthTu8POs43TDzD0w+XD74sJfWm81L7w0MPAYelBCj1kHMIe0NDDy+HuwQ+9FFyaXqjQ
-						y8Zl7EUNvcRc8g6A0OHQwREYLB06HUiBgdVh1kEXGIQdkh2ggQHb4dvBHBjcHeod+IFCaFm0SAJF0xJqQQUKrOXW4gsUY0uzhRoo3JZx
-						izpQ5BR9l4AuCIEFostFF49zTjnllN2vPmP/7Wde9oG/uu/Gh/6rFZjnivOWRS5fwR8/3LnZF4B8iwhfAPLV4PVeAFI8+QJgH9Mqnn5Z
-						+MjiLbd+dMnHF/uWLwz7bv/UYu+yKO+987NLHl3sXpbnPXc9vtidl4clu5aletfdn1+W7C+s/Y7D7mXZzsvErhTvg6SEWzlv1op6s/bV
-						+C8+/bsYeUHJr5GvzB/8dfMx7LnzsbWPae0r9cuPMR/rvts+ufax719+Dht91f5IwheAC27/2NrdHPICsLy/zMJ4Acj/5v+Wfyb/zrH6
-						WDfL3ht+5r+ccen7/8qrfmrfbQe/0p/Sz+Ifeje5t9zr3nnmAfOCedJZwxxiTnWGMd+Yf52NzE3mamcu85h53VnOnKcH2hH0B/3S7qGX
-						6K12Gn1HH7Yr6VF6th1MP9Pf7XZ6n72gOwP7BPtGdxH2FPaY7jjsP+xH3Z3Yq9i7upOxr7HPdddjD2RP7A7Jfsn+2d2UvXWewzh8mP2g
-						Q18CL6kvMPTl8vJ7MEIPDYeqBy70MHJYe5BDDzmXoBck9PJwuXrxQi8ll7YXOvSyMww6KEKHCEOmAyh0ODG8OthChx5DsQMzdJgybDuI
-						Q4c0Q7wDPlAALYcWR6BYWjotpEBhtcxadIEibEm2QAMFSwG3nCluir2l34UgsDCwUHTZYBFJOdn1Q28656bT33X9N/Zc98Hfe8v7P/xt
-						KzfHmpS7FL0U/dUvAI9t+QUgX2XmC0DYzgvA0SIfRz6e9dhp5XerjM/xT18Anv5dgLwE5I4O+Z2a5T+zMz/fD39797X3/+vTL7n+G688
-						9eybs0sHd+pIF//QGcB8YH50tjB3mEvMrc405h3zsLOSOcqc7QxmPjO/O9uZ+/QCvdFOoW/oo3YVPUbPtQPpR/qz3Urv0svtbPqcvu8u
-						wJ7AHtEdg/2D/aS7C3sNe093Ival0aMG3bXYw9jTusOx37H/dTdkb2Sv7M7JPsq+Os8ROnyw/dD7QgIvrC+zLzpwEHpIeoACB6yHrwcz
-						9NByqHvgAxeil6UXKXDRegl7QQMXuJe7Fz8wGDo0OlACA6fDqIMqMMg65DoAAwOyw7ODNTB4O5Q7sAMDvcOeMmhRBIqkJdMCChRUy6vF
-						Fig+irGlSaFSuC3jFnWgyCn6LgEsCCwQLBhdPkIXk2dKy/e87FWXvOH8yz9zztV3/tb+mz70v734HFvy1eGU+/wQ8NoPAuMFYO3nAPAC
-						sPZzAOu+AHxsx74ATHYwNx/4X8vd+EdvOO89j3zPD7zykuXOsPSH3i3uHfeSe8u97p1nHjAvmCedNcwh5lRnGPON+cd87OxkrjJ3O5OZ
-						18xz5n27gJ6gR9ox9A/91O6i1+i9diJ9SZ+2a+lherodTr/T/90N2BvYK7pzsI+wr3SXYc9hD2JP6g7FftXdi72Mva07Hfse+2B3RfZI
-						9szuoOyn8xyFw4fcFxD6cnh5fbGhL51D0QMTepg4bD2IoYe0BzhwwHv4uRy9OKGXikvXCxl6WbnMveihQ4Ah0QESGDAdPh1MgcHVodaB
-						FxiIHZYdpIFB2yHcAR0Y4Az4Dn+KgeJoqbRwAoVEYbXMKDqKkKJsiVKwFHDLObS4KXaKv0tB6MLAQsHCwULSZSU8U2Se913fte+155x3
-						/5nv+cBf33vDg/9ZC9ExJCU9ZT6l314AxreJrHoBWHsJ4AvAwZ8DmC8Ak1UsZ/8/nnHZ+3/t1Wf/9L3Lndi/3I2NSn/gnnEPuae9w9xv
-						7j/zobODucLcYS51ZjHPmHfMw85K5ihzljncGc38Zr539tML9Aa90s6hj+irdhk9Rw+2I+lP+rXdSy/T2/R6O599gH2huwR7BntIdxT2
-						F/ab7j7sRexN3anYt9jHuquxx7HndQdkP2R/7G7J3sleOs9RPv2weRl9UYEX2ZfcAxA4ID08PViBg9dD2QMbONA97L0IgYvSS9QLFriA
-						vZy9uIGL3UvfgRAYGAyUDpsOosCg6hDrgAsMwA7HDs7AYGXwdigzsBnoHfYtgkBRUCQtGQqIgqLAWm4UH8VIcbZUKVwKmcJumYcWPYsA
-						i0KXiMCSwRLSBYUFhgVn15979Y9feer5Vz5x7nvv+if7b/7QH1tZOlbkW0PyQ74p/+u9AOSf4QtAvr2ELwDnzReAyUH233Tgj/M7YKde
-						cMXj3/eaH70is19wL7g3vVPcN+4j95X7zH3vLGBOMEeYM8yhzijmF/ON+dfZyNxkrjJ3O5OZ18xz5n27gJ6gR9ox9A/9RH+12+g9erGd
-						SZ/St+1iepoep+e7A7AfsD90t2DvYC/pzsI+w77TXYg9iT2qOxb7F/tZdzf2Ova+7oTsi+yT7JvdRec5hqcffODF9KXxUvvCQw8Dh6UH
-						KfSQcQh7QAMHuIe7Bz9wMXppeqECF66XsRc1cJF7yTsAAgOCAdLh0sETGEwdWh1ogYHHQOywZJAyaDuEO6ADA5wB3+FPMVAcFEtLh0Ki
-						sCi0lh1FSFFSpC3Z0AKmoClwCr7lH1gOujiwWLB4sJh0aQksNSw9u0553vP2vfrN++588ztv+MU9193/r5YvBP/XytSxIEU+JX98C1Dg
-						C8B4CegXgLXvL58vAJObP/R/dl97/+/+1Ltu/NarTt9zx3K292bGC84/94P7w/3i/nE/e3e519x75gJzg7nSmcM8Yl4xz5h3nYXMSeYo
-						c7YzmPnM/Ga+d/bTC/QGvdLOoY/oq3YZPUcP0pPtUPqV/m0309v0Or3fnYB9gX2iuwZ7CHtKdxj2G/af7kbsTexV7F3dydjX2Oe667EH
-						sid2h2S/ZP+c5zk6vIi+pL7AwAvuy+/BCBycHqoeuMCB5MD2MPegBy5CL0kvUOCC9fL1YgYuLhe7l56BwMDoMOmgCQwiBlWHGAOOAdjh
-						2MEZGKwM3g5lBjYDnYHfMqAoKBKKpiVEQVFgFFzLL7QYKU6KleJtKQdKm1Jv4bMQsDB0mQgsGywjLCssMyw7LENrJek7X/CCt77mjLfe
-						ffo7r//mrvfd+y+fixeCfBtPvr0n3/az9gJw8I8CPeQFYMl6LwDzJeAkYFn4M6P54d2/cMZb7nred77grWOOC84594B7wj3innEPuafc
-						Y+55ZwDzgfnBfGH+MJ+YX51tzD3mInOTudqZyzxmXjPPO+vpAXqCHmnH0D/0E/3VbqP36MV2Jn1K39LH7Wp6nJ7vDsB+wP7AftHdg72E
-						vaU7DfsO+1B3JfYo9iz2sO5o7G/sd9392AvZG7tTsm/Os0NOX0pfWOCF9mX3IAQOSg9RD1jgAHJAe3h7sAMHv5eiFyZwoXrZehEDF5WL
-						3EveARAYEAyQDhcGD4OpQ6sDLTDwGIgdlgxSBi2DuEOaAc6ApwBaDqHFQbFQPC2lQGm10Cg8CrFlGShTyrZFTFFT5BR9l4DAksASwZLB
-						EsKSwhLDksMSxJIUnnkhSLlKyVp7ITjGP1CcIp+Cn9I/XwBObjJ7u66551+cfsl138jvWm2y8AfOO/eB+8J94r5xH7mv3GfuO/OAecE8
-						6axhDjGnmGPMOeZgZyTzk/nK/GU+d3Yz15n79AK90U6hb+gj+qpdRs/Rg/RkO5R+pX/bzfQ2vU7vdydgX2CfYN/oLsKewh7THYf9h/2o
-						uxN7FXsXe1l3NvY59r3uguyJ7JHdMefZgacvKPAC+3L74gMHg4PTQ8WB40D2sPYgBw56L0EvSOACccF6+biYXFwudi89A4GB0WHSQRMY
-						RAyqDjEGHAOQAdnhyWBl8DKYO7RDBzoDn0KgMFomoUVDEVFUFFlLLlCCLUgKlIKlgFvOgfKm3Cl/lgOWB5YLlg+WE5YXlpvAAsSCxAL1
-						TME65ZRT9rzsx0+/9o3nX/7YWVfc9vf23vDg7x+rP3I0pT4lP4U/5T8880dM1gvA/EHgE4EPf3vvdQ/8/lmX3/obbzzvikdf9mOnXZfZ
-						61ksOK+cZ8677QT3hnvFveNecm+519x75gJzg7nC3GEuMbc605h3zEPmJfOUedtZzJxmjjPn6YF2BP1Bv9A/9FO7i16j9+jFdiZ9St/S
-						x+1qepye7w7AfsD+wH7R3YO9hL2FvaY7D/sQ+1J3KfYs9rDuaOxv7Hfsf90N2RvZK+fZ4YcX1pfZFx04CByUHqIesMAB7OHswQ0cbA5+
-						LwUXhgvFhetl5KJykXvJOwACA4IB0uHC4GEwMbg61EIHHgORgdlhGjpoGcQMagZ5h3xoAVAQFAgF0/IJlBPl1WKj+CjGlmagVCldSpnS
-						ptQpfZYClgaWCpYOlhKWlsBiw+LDchRYoFiwDilgL3zp91/0unPPfzDfe73rmnv++bH6G4rHC8Ea8wXguGbfjQ/9wXJ2/tlPXXL9tzJL
-						L3zx91+0nK3dnLWDcB45r4EzzbnnXtjucL+4f9xP7i/3m/vPfGB+MF+YP8wn5hfzjfnX2cjcZK4yd5nLzG3memc+fUBf0Cf0TbuInqLH
-						6Ll2IP1If9Kv9G+7md6m1+n97gTsC+wT3TXYQ9hT2GO647D/sB+xP3W3Yu9iL+vOxj7Hvsc+2F2RPXKe4+zwAvtyefEcjB6aHqjAgeNA
-						9rBykDnoXIReEi4QF4wL2MvJxeVi99KHDgQGBgOlwyZ0EDGoGGQMug5BBiQDlAHb4RsYzh3cDHYGf0shUBqUSguHQqKwKLSWXaAMKUvK
-						lLKljClrypyyZxlgWWCZYNlgGQksLCw0LD2BxYjFKbBcsYCFQ0ran/mzLzn/Vafvvf3UC6966uwrbv/7e65/4N/vv/lDR/V3ClL6G/tn
-						Js8tmYHMQmYis5EZyawsZ2azZT9wHm1mOdc2+9wP7o/tGPeQe8o95p4zB5gTzBHmDHOIOcUcY84xB5mTzFHmbGcw85n5zXxn/tMP7Q56
-						hd6hl+gteq2dRx/Sl/Rpu5Yepqfp8XY8/c9+wP7Q3YK9g72EvaU7DfsO+xD7Uncp9iz2MPa07nDsd+x/3Q3ZG+c5zk9fZl904CBwUHqI
-						OGAcQA5oDy8Hm4PPxeil4UJx4biQvaxcZC46g6BDggHCgGEAdTiFDi4GG4OvQzEwNDtQGbgMZAZ2h3lg2FMGLQqKhKJpCQVKihKj5ChB
-						SpISpWQpYUqaEqfkWQJYElgiAosGiwiLCstMYOGxUsTiZOWKBSxYUTukzOUvXMpXd0+7+Nqv5Fs78revPtd/DOnk6JE/hjN/stSZl9/6
-						66e9/ZqvvO7stz3woh94Wf7SrcMp+8FmknNrs835tx3hHnHPuIe2q9xn7jvzgHnBPGHeMI+YV8wz5h3zkHnJPGXeMo+Z153lzHl6gJ6g
-						R+gZeqgdRX/Rb/Qf/djupFfpXXqZ3m6n0/fsA+wL3SXYM9hD2FO6w7DfsP+wH3V3Yq9i72Iv687GPse+xz7YXXGeE+z05fLiORgcnB4q
-						DhwHkgPbw8xB5yJwUXqJuGBcQC5oLy8Xm4vPYOjQCB0oDBwGEgOrwyx00DEIGZQM0g7ZwBBmSHeAM+ApAAqi5REoF8qHcqK8KDfKj3Kk
-						PClXypdyprwpd8qf5SCwQLBgsIQEFhUWGSs7LESBpYnFKlgBs6Jmhe5Zxe+lP/Tay/IXlb3p7e/90lnvueXv7H7f/b+Tv6nVSuVk55GX
-						uN3X3vfbZy7v7k0XXf2F15513v0veflrL1ve7aqiH2w2bIZs1mwmObc227YD3BPuke0a95H7ajvNvWcuMDeYK8wd5hJzi7nG3GMuMjeZ
-						q8xd5jJzm7nO3KcX2hn0CX1DH9FX9Bl91y6kJ+lRepYebkfT3/Q7/c9+0N2BvYK9g72kOwv7DPsO+1B3JfYo9iz2sO5o7G/sd+x/3Q3n
-						OcFPXzYHgYPCQeoh4wByQDnAPdwcfC4GF6eXKvTCcSG5sL3MoRedQcCgYJB0yASGUAcUA4wB1+EXGI4Mzw5WBi+DmcHdoR4Y+pQCpUGp
-						UDqUEqVFqVF6lCKlSalSupQypU2pB4qfxYDFgeUisIBYSWGRYdEJLENWmlisghUwK2rBSp2Vv3BISXzhS1564cvfcOZNP7r34o/kK8hn
-						Xn7L3873iT/9txkfmx88noQPfzvPPM8+d5C7yJ0s7+bmF774pfle/UPurbA7DjYTNjvBZs1m0maX8207wD2xXeK+2U5yb7nX3HvLBuYH
-						84X5w3xifjHfmH/MR+Yn85X5y3xmfjPfmf/0A/1Bv9A/7SZ6i16j9+hFerOdSt/Sx/Q1fU7fdxdgT2CPYM/oDsJ+wv7CfsP+092IvYm9
-						ir2rOxn7Gvsc+153wXlOstOXz8Hg4HCweug4kBxYDnQPe+hF4KJwkbhovYShF5QLzAXv5Q8Mhw4OBguDh8HUoRUYagy9DkQGJgO1wzYw
-						jBnWDHOGPWVAWVAmlA1lRFlRZpQdZUhZUqaULWVMWQcKncJnKWBpCCwWVj5YUKzEsOgEliEWpmDFygpYsLJmpS5YCQxWGMMh5fJFP/jy
-						d7zijWfd+CO7Lzpw6oVXf/7Nl970y2dfecc/zFei99740H9bFtc/eXaRnazgT/LMdl1z32+ffeXt/yDP8k0XXPW5Hzn3ogN5Afvu73v5
-						xXz+hd1VsLsNNgvBZsdmLNhM2uxyvm0HbFe4T7Zz3EvbXe4395/5YBnCnGEOMaeYY8w55iBzkjnKnGUOM6eZ48x5eoCeoEfoGXqInqLH
-						2nH0H/1If9Kv9C/93O6m1+l99gL2hu4U7BvsI+wr7DPdddiD2JPYo9izuoOxn7G/sd9195vnJD89DKEHhYPEQeshDD2gHGAOOBeglyP0
-						4nCxuHhczF7a0AvNhWcgMDA6TALDhmHUQcUgY9AxCDskA0OUIcsQZkgzxBnylAAlQYlQMpQQJUWJUXKUICVJiVKygSKmqClyyj6wELAw
-						WKlg8QgsJywwwYqOFSKWpmDlykqYlbVg5S5YEQxWHAdWNgfPFNP8DccvecWr3/3KU8+++XW7L3zwJ376sodPu+S6r59x6ft/9Zwr7/jN
-						/J0G+WMm99/00B9JIT4h2H/TgT/M55jPNS9H+dxPu/h9X/+Jt176SH4WI88mz0j+xtyBPeOB3c3A7jTYDASbmWAzZrNoM2uzbTtgu8J9
-						sp2z3eT+cr8tA5gTzBHmjGUR84p5xrxjHjIvmafMW+Yx85p5zrynD+gL+oS+oY/oK/qMvqMP6ct2KT1LD9PT9Dg9zx7QHYH9gf2C/YP9
-						pLsLew17D3sRe1N3KvYt9jH2te5y7HnzzHPI4YD08HCwOHgczB7a0APNgedCcGF6mQKXrReRi8pF7iUPDAGGBEOkA4YBxIDq8AoMN4Yf
-						w5HhyXBl+DKcGd4Md4Y/5UB5UC6UD+VEeVFulB/lSHkGCpYCpqQp8UDRWxlgYWChCCwdVk5YYIIVHStEVpysYFkRC1baghW8YIUwWIEc
-						WOkkVlqNtbKbP4kmP4vwsh9783X5k2lev+vCn/nxt1z6iTdeeNWTp7/j2q+defktf+usy2/9u+dcdedvnnP13f803w6z+9r7fnfPdR/8
-						vb3XP/if8i0yy8L9R03+plor5oew/Gf47+W/lf9m/tv5NfJr5dfMr52PIR9LPqZTz7/yiXyM+VjzMedjf8krXnvpwT9VZytlvrFnSexO
-						BnaXwe4+2KwEm61gs2gza7NtO2C7YjvFvbPd5P7ajjMHLCuYJ8wb5pFlFnONucdcZG4yV5m7zGXmNnOduU8v0Bv0Cr1DL9Fb9Bq9Ry/S
-						m/QqvdtOpq/pc/qefYB9gX2iuwZ7CHsKewx7DntQdyT2J/Yr9i/2s+5u7HXzzLPu4cD0MAUOWw8iB5WD3EMeuAS9IFwgLhgXsJczcHm5
-						3L34DAYGB4OlQycwlBhaDDWGHkORoclQZeh2IDOwGeiBoU8pUBqUCqVDKVFalBqlRykGipNipXwDBU2Bm+RZBKwssFAElg4Wk2AFxoqO
-						FSIrTlawgpWxYMUtWNELVgwHViYHVkCJFdj1sFJ8PGKf23rYsyN2BwO7u4HdebAZCTZTwWYw2MzabNsO2K7YTnHvbDdth7nnlgXMC+aJ
-						ZQ5zibll2cb8Yz4yP5mvzF/mM/Ob+c78N0fQI+0Y+od+or/oN/qPfqQ/6Vf6l36mv+n3dj97AXsDewV7B3sJe0t3GvYd9iH2Jfap7lrs
-						Yexp7HHzzLOlwwHigHEAezgDh7cHm4PPxeilCVwqLl0vJBeWC82F7zAIDAuGCcOGYcSwYpgx7DoIGZQMUgYtg7hDOjDEA4OeMqAsKBPK
-						hjKirCizQOFRiBQmpRooXpMzBU7BWwlgUQgsE1Y6WEyCFRgrOlaIrDgFK1nBCpmVt4EVvmAFsbFi2VgpJVZqN4MV5p2EfcybwZ4RsWfd
-						2F01dtfBZmNgM2WzF2xWg8227YDtiu2U7R7303bYdp15wLywTGHuWDYxv5hvzD/LSOYoc5Y5zJxmjjPn6QFzBX1C39BH9BV91q6jB+lJ
-						epSepYfpaXqcnmcPYE9gj+iOwf7BfsL+wn7D/tPdiL2JvYq9i72MvW2eeQ77cKh64DiQHFgOdA974DJwWXqRuGhcxF7SwCXmkjMEGBIM
-						EYZMBxADigHGgGMAdjgGhifDleHLcA4McAY8JUBJUCKUDCVESQWKjKKjDAOFSaGadClmkzcFzwIQrCiwTLBwBCsmVmCs6AQrRVaeghUt
-						K2XBStzASt/AymJjJbOxkroKK7zbwcr1kcR+ze1gz2AV9mwbu5vG7nZgMzGwWQo2ezajwWbaZj/YrthO2e5xP22HbdeZB5YZzBXLHuYT
-						88syjjnInLQsZd4yj5nXzHPmPX1AX5hT6B16id6i1+g9epHepFfbufQxfU2f0/fsA+wL7BPsG+wj3VXYY9hz2IPYk9ij2LO6g7GfzTPP
-						UTkctB7CwCHlEPeAcwG4IFygXq7A5eNycnm53Fx+hkMHB4OFwdOhFBhaDDWGHkORoclQZegGBjODm+HO8KccKA/KJVBAFBQFRskFipCi
-						pEwDhWtSprhN7iwAwYoCywQLR7BiYgUmWNmxUhSsRFnZClbOBlbmgpW/xopjY6WTWHHdCCvDxyP2uW2EPUNid9HYXTY2C8FmZ2AzF2xG
-						bZaDzb7tSLCdst3jftoO265bJjA3LFuYP5ZRzDHmnGUh85J5yry1TGZuM9eZ+/QCvUGvmHvoJ/qLfqP/6Ef6k36lf+nndje9Tu+zF7A3
-						sFewd7CXsLew17D3dCdiX2KfYt9iH5tnnmN2OHw9mBxcDnYPfeBScGm4VFw6LiWXtheaC89AYGB0mASGDcOIYcUwY9gxDBmWDNPAwGUg
-						M7QZ6gx9SoHSCBQLxUM5UV6BgjMJUpQUqcmWQg6UNsUerABYUbBCwdIRrJxYibGyE6wcWYkKVrqCFbSBlbqBlcHGSiSxImpYod0sVph3
-						AvaxbhZ7RoY9c2J319jdD2xmBjZrwWYz2CzbzAfbEdsl2znbTdth23XLBOaGZYtlEHOKOWZZxzy0zGSuMneZy5bdzHfmP/1Af9Av9I85
-						ih6j5+hBepIepWfpYXqaHqfn2QO6I7A/sF+wf7CfsL+w37D/sB+xP3W3Yu+aZ57n9HAge1gDh5nDzmXgsnCZetG4iFxULnIveWAIMCQY
-						IgwZhhBDiiHGkGMIMiQDg5RByzBmWDPMGfaBQqAwKBRKJ1BMFJfJjQI0SVKkFG2gjE3aFHuwAmBFwQqFFQ8rKFZkgpUeK0fBylSw4jWw
-						shas3DVWDBsrlYaV01VY2T1SWOHeDPbfOlLYM1iFPVvD7qqxu25sVoLN1sBmMtgMB5t5241gu2Q7Z7tpO2y7bplg2cF8sQxiTlmWMe8s
-						E5mbzFXLXuYz85v5bg6gJ+gReoYeoqfMZfQdfUhf0qf0LX1MX9Pn9D37APsC+wT7RncR9hT2GPYc9iD2JPYo9qx55tlxh0PKIeaQ9wJw
-						QbhAXLBevsDl5PJyubn8DAeGB8OF4cNwYngx3AIDkAHJAGXIMoQZ0gzxwKCnCCgLyiRQOBQSpRUoNpMfBWkSpWgDZUxhBxO7FQArClYo
-						rHhYQQlWZqz0BCtJwQpVsAI2sNI2sLLXWEkkVjQNK6ybwQrx8YR9TpvBnqFhd0LsbhubjYHN1MBmMdjsBpv1YLthOxRs52w3bYdt1y0T
-						LDuYL5ZBllXMM8s85qJlJ/OV+WsZzRxnztMD5gr6hL6hj+gr+oy+MyfSm/QqvUsv09v0Or3PXsDewF7B3sFewt7CXtOdh32IfYl9ap55
-						jovDweVgc/B7KQKXhkvFpeNScmm51Fx6hgJDg6HC0GEoMbQCg43Bx3BkeDJcGb4M58AAZ8BTAoGioEhMNhQShRUoNYovUI4UaDDRUsYU
-						djCxWwGwomCFwopHsJJiZSZY+QlWlIIVq4GVsYEVuIEVv8ZKo2HlcxVWZreDledjiX1M28Ge0Srs2Rt2l43NwsBmaGCzN7CZDTbjwXYi
-						2A7ZrgXbTdth23XLBMsO5otlkGUV88wyj7lo2cl8tQxmTjPHLevpA/rCnELv0Ev0Fr1G79GL5k76lf6ln+lv+p3+Zz9gf2C/YP9gP2F/
-						Yb9h/2E/Yn+aZ57j9nCYOexcBi4Ll4nLxmXksnKZuewMA4YFw4RhwzAKDCwGGkOPocjQZKgGBi+DmcHNcA8UAAVBiQSKxmREYZnUKD6T
-						IwUaTLSUMYUdTOxWAKwoBCsVVj6spAQrNcEKULDCFKxgDayUDazMNVYEiRVJwwrpRljZPRGxz30j7BkbdmfE7r6x2RnYzA1sVoPNdrBd
-						CLY7wXbNdtJ2N9iuWyZYdjBfLIMsqyzTmHuWjcxPy1jmsGU185x5b06gN+gVesfcRH/Rb/Qf/Uh/mmPpYXqaHqfn2QPYE9gj2DPYQ9hT
-						2GPYc9iD2JPmmeeEOxxyLgGXhEvEJeMSckm5xFxyhgBDgiESGDQMIgYVw4xhxzBkWAYGKgOXoczQDgx2C38KggIxyVBEJisKLVB6FGMw
-						gZpoKWMKO5jYg5UAKwtWKqyABCsrwYpNsCIUrDgNrGwNrKANrNg1VgoNK5ersLK6WawQHw/Y57JZ7Bmuwu7GsLtubFYGNmMDm82BzXSw
-						HQi2M8F2LNhO2u7ajlsWBMsO5otlkGWVZRpzz7LRMpQ5a1nMvGaeW+bTC+YO+oX+oZ/MYfQcPUhP0qP0LD0c6Gr6nL5nH2BfYJ9g32Af
-						YV9hn2HfYR+aZ56T5nD4uRxcHi4Xl4/LyeXlcnP5GQ6BAcKAYQAxpBhiDLnAIGRQMkgZtoGBzMC2UGfwmxwoEAomUEIUVaDMTHoUYzCB
-						mmhNyJR2MLlbCbDCEKxcWAkJVliCFZxghShYgRpY6RpYWWus6BErioYVzvWwInu4WJE+GtivfbjYM1oPuwPD7pTYbDQ2WwObyYHNcrDZ
-						D7YrwXYr2C7azgbbccsCywzLFssgyyrLNMs+5qNlKHPWsph5bZnO3Dc30B/0izmInqLH6DlzIX1Jn9K39DF9bU6n99kL2BvYK9g72EvY
-						W9hr2HvmmeekP1wKLg2XikvHpeTScqm59IHBwOBguDB8GE4Mr8CAYwAyJBmigUHLIGZYBwa6hT7FYPKgYExCFFWgzCi8YGI0gZpoTcgm
-						bhO8FYFgpcHKRbAyEqy4BCs6wYrRwMrUwArYwIpbY6XPsPK4Ciujm8HK7omEfc6bwZ7xKuzuDJuFxmZpYDM4sNkd2MwH25FgOxVsB4Pt
-						rO12sCywzLBssQyyrLJMs+xjPlqGWtYyjy2zmeuW/fSDOYSeoYfMVfQZfUcfmjPpVXqXXqa36XVzP/sB+wP7BfsH+wn7C/vNPPPMs+Jw
-						WbhMXDYuI5eVyxy48AwEhgZDhaETGEwMLgYbwy8wIBmgFrIMYga1hTkD36RAcZhcKKBASZnMKLxgYjSBmmhNyCZuE3ywMmClIVjJCFZI
-						ghWYYIUnWEEaWKkaWBlrrMgRK4KGFcr1sKK6VawY70TsY98q9gzXw+7IsDsnNjuNzd7AZnZgsx5sN4LtUrDdC7arwXbbMiBYZli2WAZZ
-						VlmmWfZZRjJHLWstk5nblu3Mf3MEPULPmIvoK/rMnEcv0pv0qrmXfqa/6Xf63zoCewR7BnsIewp7zDzzzLPFwyXiknEJAxeVi8xFZxgw
-						LBgmgYHDQGJoMdQCg4/ByPAMDFgLYQY1gzww7CmEQGlQLMEERElRZMGEZ2I0gZpoTcjB5G2StzIQrDwEKxrBikmwIhOs+AysLA2sYA2s
-						mBErdsTKoWFFczNYkT1aWMleD/tvHC3s2WwGuwvD7pbYjBCbtYHN6MBme2A7EWyHgu1csB0NttPBMsCywjIlWAZZVlmmWfZZRjJHLWst
-						k5nblu3Mf3MEPWKuoY/MWfQavWdupD/pV/rXHE2P0/PsAewJ7BHWNdhH2FfmmWeeI3S4XIELyAXlEnPJGQIMicAgYdAwjAIDi4Fmocdg
-						ZHBauDKALaQZ5Bb2FIJJg2IJJiBKiiILJjwTownURBtMyiZvE32wUhCsQFjZGFhBCVZoghWggZWmxgrXwIoasaJnWGlchZXQrWBl90TA
-						PtetYM96FXaHhs0Esdka2Ew2NtMD24VguxNs1wa2o7bLwXY/WFZYplj2BMsqyzTLPstI5qhlrWWyZTfz3RxAT5hL6BtzEr1Fr5n76Ef6
-						0xxLD9PT5nL6nn2AfYF9gn3DOsk888xzDA4Xj8vJ5eVyBwYAA4IBwpAJDCIGFcMsMPAYiAzNwGC18GVAW4gz6ANlQGEEE4sJyERFmZnw
-						TIzBJGqyNSmbwIPJPlgxsBIRrHQMrKQEKzYDK0MDK1ADK17Eyhux8mdYkdwIK6mHgxXk5xL7GA8He4YbYXdl2N0TmyFisziwGR7Y7A9s
-						Z4Lt2MB2M9gu284Hy4hgmWLZYxllWRYs+5iPlqGWtZbJlt3Md3OAuYI+MefQS+Yu+o3+M0fSo/SsuZi+ps/pe+sE7A3sFewd88wzz3N8
-						uJRc2sDF5uIzHBgegQHDAGJIBQaZhR0DkYEZGKoM3sBwZoAHC3rKgMIIJhYTkInKhEbpBZOjSdSEG0zOJvFgwrdyEKxMBCseAysrwQrO
-						wEpRY4WqsTLWWJEzrBSuwkrmZrEiezJhz2Sz2F2swu7YsJlpbOYam9nGZn5guxJstwa2k8F2ONjOWzYEyxLLnGAZZVlmmWfZaBlqWWuZ
-						bNnNfDcHmCvoE3MOvWTuot/MgfSkuZS+pY/N2fQ6vc9eYN2B/WKeeebZwYcLy4Xm0gcGA4PDwoUBxICyEGPQWRgyMC1UGbwWzgzwwJA3
-						GVAYwcRiAjJRmdBMfCZIE2kw6Zqcg8ncpB+sJAQrFAMrIcFKy8DKzsAKUmPlqrFyRqzgGVYUN8JK6Fax0ns8Yp/bVrFnvBF2l4bNBrEZ
-						a2xGG5vxge3GwHYq2A4ObHeD7XqwbLAMCZY5lk3Bsswyz7LRMtSy1jLZstsynh4wV5hT6B1zE/1ljqMHzZX0KX1rTqa36XVzP/sB+8M8
-						88xznB4uc+DCMxAYGoHBYuHDgGKAWcgxCC0sGaiBoctgDhbgDHmKIJgwTCwmIBOVCc3EZ4IMJlOTbjBJm8yDyT9YUQhWLAZWRoIVmIGV
-						nsYKU2Nlq7GyZljpW4WVyM1gJfVIYsX5aGC/9pHEnt1msLtahc2AYTPV2Ew2NtON7cTAdinY7g1sZ4PteLBMCJYhljXBsskyLFjmWTZa
-						hlrWWiZbdlvG0wPmCnMKvWNuMofRc+ZC+pI+NefSy+Zu+p3+t44wzzzznIDHlp2BwMCwUGHwWDgxwBhwgSHIoAwMUwtdBnOwAGfIUwTB
-						hGFiMQGZqExoweRnkjSZBpOvSTqY1IMVgGCFIVjBGFgpGViZGVgBaqw8NVa+iBU4w4rgeljB3ApWZk8G7FlsBbuL9bC7Nmx2iM1gYzPc
-						2A4MbHcGtnMD29Vgux0sC4JlR7CssUwKlmGWdZaJwTLUstYy2bLbMp4eMFeYU8w99JM5jJ4zF9KX5lR619xMf9Pv1gHmmWeek/AwCBgW
-						gYFiocNgsvBiwFkIMigDw5SBGyyYLcAZ8hRBMGGYWExAJqpgUjP5mSiDSdXkG0zWwcQerAgEKw4DKxvBysnASk1jhaixMtVYGTOs1K3C
-						SuJGWAE9HKwA72Tsczgc7BlvhN3lKmxGDJu5xma2sZlvbGcGtmvBdnNgOx0sA4JlRrCMCZZJll3Bss4y0bIzWNZaJlt2W8bTA+YKc4q5
-						h34yh5nr6ENzJr1q7qWfzeH0/DzzzDPPsw6DwsKEgWOhxOAKDDcGYGBIWpgycIMFswW4BT1lEEwaJheTkMnKpGYCDCZLk2owCQcTdjDB
-						BysEwQrEwErHwMrKwApOY+WosXJFrKAZVvTWwwrkZrGieqywYm3Yv3ussGe2Weyu1sNmwbDZIjajjc14YzsysN0a2E4ObJeD7X6wrAiW
-						LcGyKFh2WcYFy0TLTstYy2LLbMt2c4C5wpxi7jFH0WPmOvrQnGlupX/N0fT4PPPMM8+WD4MkMGwYSIGhZeHGAAwMSQZpsMC1YLYAt6A3
-						IZg4TDAmIhNWMLmZBE2WweQaTMTBxB1M9MGKwcDKRLDy0VhxGVjhaawsEStcxErbKqwEroeVy+1gpfZExD737WB3sR5216uwGSI2i8Rm
-						urGdGNguNbaLwXZ3YDsfLCOCZUqwDAqWWcEyzrLQMjNYxloWW2ZbtpsDzBXmFHOPOYoeM9eZE+lNcyv9a46eZ5555jnix8KGgRQYWgy2
-						YAHIkGSQBgtcC2YLcAt6E4KJwwRjIgomLZNbMBmaNIMJNpiQgwk8mPCDFYSBlYqBlZGBFZjGClBj5YlYATOszK2HFcTNYCX0SGBleCdg
-						H+uRwJ7tZrC7XA+bFcNmj9gMN7YDje3QwHZvYDs7sF0Plg3BsiRY9gTLqmDZZhkYLDMtW4NlsWW2Zbs5wFxhTjH3mKPoMXOdOZHeNLea
-						g+eZZ555npPDMLLQYrAFC0CGJIM0WOBaMFuAW9CbEEwcJphgMjJpBZOcyTCYPIOJNpiYg4k8mPgHVhYGVjAGVkwGVmgaK0PEChWxUrYK
-						K3nrYeVxK1hZnfiz2gp2V+ths7AKmzFis0ps5hvbmYHt2sB2dGC7PbBMCJYhwTInWEYFy7RgGWhZGSxbLYODZbZluznAXGFOMfeYo+gx
-						c5050dxJv84zzzzz7NjDwAoWbBaADEkGabDAtWC2ALegNyEEk4dJxmQUTF4muWBSDCbQYMINJuhgQg9WAAZWGgZWNgZWUhorOI2VI2IF
-						y7Cytgorf5vBCuZ2sXJ7ImCf63axO9gMduersFkybDaJzXhjO9LYjg1sNwe20wPLgmDZESxrgmVTsCwLln3BstIyNVgGW1ZbpgdzgLnC
-						nGLuMUfRY+Y6c6K5c5555pnnuD4WbBaADEkGabDAtWC2AA8W9iYFk4eJJpiUTF7BZBdMjMFEGky8wUQdTOwDKwMDKxADKx4DKyyNlR1i
-						hYlY6VqFlbj1sHK4WayEHi2sKB8N7Nc+Wtgz3Sx2l+ths7IKm0Fis0xsJxrbqYHt4sB2eGC7P7DMCJYxwTIpWIYFy7xgGRksUy17g2W1
-						ZbplvzkimFPMPeYoesxcZ06cZ5555jkpjgWgBSXDNFjoWjhbiFvYmxhMIMFkY1IKJrFgwjM5BpPpwAQcTNjBBD+wUjCwMtFYERlYgSFW
-						gBorUIaVsVVYudsIK4/bwUrryYg9m+1gd7URNhOrsFkzbHYbm31iOzSw3Wtsdwe28wPLimDZEiyLBpZhwTLPsjFYlgbLXsvoYJlu2W+O
-						MJeYc8xN5jBz3TzzzDPPPHUsKC1QLXgtoC3ILfCDycEkYrIJJqdgIjPpBZNkMKEOTMLBxD0w2Q+sIAysWAyskDRWaIgVImLFyrCCth5W
-						/DaLFcwjgZXd4wH7XI4E9uw3i935ethMGTajxGad2M40tnMD29WB7fjAsmFgmRIsgwaWXcGyLlg2WoYGy9xgGW1ZbpkfzBHmEnOOuckc
-						Ns8888wzzzaOBaoFrwW0BXmw0Dc5mEiCSSeYoExmweQXTJQDk2swGQcT+MCkP7Cy0FjRGFhBIVZwiJUkYmVrFVbeNsKK4VawIjrZGHuW
-						W8HuciNsZlZhs0hspontBrEdG9huNrbbA8uEgWVJsOwJllUDy7hgmRgsQy1rg2VzsCy3zDc3BHOJOcfcNM8888wzz1E8FrzBQtrC3EI/
-						mCRMJsHEY5IKJrVgAgwmzIFJNpiYBybzgRWAgRWHxkpHY6WlscJDrDgZVsLWw4rdZrDyuF2svJ4M2LPYLnZHm8FmYj1s5gybYWK70Ngu
-						NbaLje3ywDJgYNkxsMwJllEDy7ZgWRgsO4NlrWVysAy3rA/mBnOIuSbMM88888yzQ46FtAV6sPA3SQSTisknmKyCiS2YCIOJc2CyDSbo
-						gUl9YGWgsSLRWAlprMQQK0LEytQqrJyth5W+rWAl80hjBXgnYB/rkcae+VawO18Pm6lV2KwSm3liu9PY7jW2u43t/sAyY2BZEyybBpZp
-						wTIwWGYGy9hgmWzZHSzrzQnBHDLPPPPMM89xeizULfyDycKkEkxCwYQVTHDBhDgwiQaT7sBkPTDBD6wYNFYqGisljZUaYsXIsJK1Hlbc
-						NsKK4XawQjp5NvbstoPd5UbYzKyHzaRhM05sVxrbtcZ2tbFdH1hGDCxbBpZJwTJsYNkXLCuDZWuwLA6W3ZbxwZwwzzzzzDPPSXJMAiaL
-						YHIJJqJg4gomumBiHJhMgwl4YNIemOwbKwqNlYzGSgqxokOsLK3Cytd6WKnbLFYgDxcrsicS9jkfLnY3m8VmYj1s5lZhs0xsJ4jtVmO7
-						2dhuN5YNA8uUgWVRsOwaWOYFy8hgmRosg4NldrCMn2eeeeaZZx49Jo1gggkmpGACCya8gUkymFQHJuOBCXxg4m+sNDRWOhorLcSKj2El
-						aj2smG2EFb+tYEXzWGDl+Ghgv/axwJ71VrC73gibqfWwmTVsB4jtUmO72NguN5YFA8uQgWXPwDIrWMYNLBuDZWmw7A2W1WGeeeaZZ555
-						jtgx0QQTUzCRBRPfwGQZTLADk3JjQh9YEWisRDRWQogVGWJlaBVWrtbDSttmsHK4XaycTvxZbRe7w81gM7MeNpOrsFkntjPEdq+x3W1s
-						9weWGY1lzsCyKli2DSwTg2VosMwN88wzzzzzzPOcHxNUMKENTILBpDkw2Q5M0AMTe2PFoLFS0VgpMazcECtJ62HFaz2s1G0FK5FHEiu3
-						xxP2OR1J7E62gs3EetjMrYfNNLHdMGzXGtvVxna9sawYWMYMLJsGlmnBMnBg2RnmmWeeeeaZ57g9JraByXBgEg0m3caEPTDRN1YSGisZ
-						xIoKsbKzCitQq7BCthms+G0HK5yTrWPPdjvYXW8Gm61V2MyuwnaB2E4R283GdruxbBhYpjSWScEybGDZN5hnnnnmmWeek/KYFAcm04FJ
-						eGDibkz8jZUGYsWDWHkxrAgZVqo2wkrbZrFyeLhYUT2ZsGdyuNjdbRabmY2w2TRs1g3bHWI7SGyXG8uCxrJkYBk0sOwazDPPPPPMM888
-						2zwm1oEJeWAib6wENFYiiBURw0qNYQVpFVa6NoOVuq1gRfJoYYV3J2Ef89HC7mIr2CxsBpu9VdhMG7Yjhu0csd1tbPcby46BZc5gnnnm
-						mWeeeeZ5Do/JuTGxN1YKiBULYuXEsKJjWHFaDytkm8WK33ax8jnZGHuW28XueLPYbK2Hza5hu2DYbhHbUWK73lhWNPPMM88888wzzwlw
-						TPKNlQRiRcOw0mJYAVqFlaqNsMK2FawgHimsuJ6I2Od+pLA72wo2Mxths7kKm3nDdsiwnSS2280888wzzzzzzDOPHisOxMqHYUXGsGK0
-						Hla4NoOVuu1ghfJYY6X4SGK/5rHGnv12sFnYDDZ762GzbdiuGLZ7ZJ555plnnnnmmeeYHyslhhWcVVhp2ggrZJvFyt/hYCV08mzs2R0O
-						drebxWZqI2x2V2E7YcwzzzzzzDPPPPOckMeKz3pYodoIK2xbxYri0cDK7PGIfW5HA7urrWIzsxE2m+sxzzzzzDPPPPPMM88ROla2NosV
-						u+1ixXJy+Niz3i42A5tlnnnmmWeeeeaZZ54T+FgBPBJYKT2ZsWd0JJhnnnnmmWeeeeaZZ57j+ljJ3UnMM88888yzo893fMf/Bwrzze6F
-						J/OQAAAAAElFTkSuQmCC"/>
-			<rect v:rectContext="foreign" x="0" y="677.497" width="152.011" height="152.011" class="st22"/>
-		</g>
-		<g id="shape57-188" v:mID="57" v:groupContext="shape" transform="translate(617.953,-141.732)">
-			<title>Data Flow.57</title>
-			<desc>registry interaction</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="-61.0516" cy="880.531" width="71.86" height="17.6036"/>
-			<path d="M0 829.51 L0 880.53 L-212.1 880.53" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-92.0706" y="875.731" width="62.0381" height="9.59985" class="st12"/>
-			<text x="-92.07" y="882.93" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>registry interaction</text>		</g>
-		<g id="shape58-196" v:mID="58" v:groupContext="shape" transform="translate(708.058,-123.009)">
-			<title>Process.58</title>
-			<desc>NAT Port forward</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="35.4331" cy="811.791" width="70.87" height="35.4331"/>
-			<rect x="0" y="794.074" width="70.8661" height="35.4331" rx="9" ry="9" class="st14"/>
-			<text x="26.88" y="808.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>NAT<v:newlineChar/><tspan
-						x="9.42" dy="1.2em" class="st6">Port forward</tspan></text>		</g>
-		<g id="shape63-200" v:mID="63" v:groupContext="shape" transform="translate(831.17,-133.639)">
-			<title>Data Flow.63</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 822.42 L-43.25 822.42" class="st10"/>
-		</g>
-		<g id="shape65-206" v:mID="65" v:groupContext="shape" transform="translate(807.271,-507.7)">
-			<title>Process.65</title>
-			<desc>vSocket relay</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="48.189" cy="811.791" width="96.38" height="35.4331"/>
-			<rect x="0" y="794.074" width="96.378" height="35.4331" rx="9" ry="9" class="st9"/>
-			<text x="21.28" y="814.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vSocket relay</text>		</g>
-		<g id="shape38-209" v:mID="38" v:groupContext="shape" transform="translate(831.17,-108.854)">
-			<title>Process.38</title>
-			<desc>Container</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197" v:verticalAlign="0"/>
-			<v:textRect cx="114.803" cy="718.779" width="229.61" height="221.457"/>
-			<rect x="0" y="608.051" width="229.606" height="221.457" rx="9" ry="9" class="st3"/>
-			<text x="94.8" y="621.05" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Container</text>		</g>
-		<g id="shape68-212" v:mID="68" v:groupContext="shape" transform="translate(852.812,-309.051)">
-			<title>Data Flow.68</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 820.87 L7.09 820.51 L7.09 639.86" class="st25"/>
-		</g>
-		<g id="shape69-222" v:mID="69" v:groupContext="shape" transform="translate(807.271,-529.832)">
-			<title>Data Flow.69</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M-8.64 829.51 L-9 829.51 L-13.57 829.51 L-13.57 1001.28 L-68.23 1001.28 L-68.23 1001.34" class="st25"/>
-		</g>
-		<g id="shape70-230" v:mID="70" v:groupContext="shape" transform="translate(743.491,-123.009)">
-			<title>Data Flow.70</title>
-			<desc>standard docker network model</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="-85.9942" cy="884.186" width="114.18" height="17.6036"/>
-			<path d="M0 835.15 L0 835.51 L0 884.19 L-341.24 884.19" class="st26"/>
-			<rect v:rectContext="textBkgnd" x="-138.175" y="879.387" width="104.362" height="9.59985" class="st12"/>
-			<text x="-138.18" y="886.59" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>standard docker network model</text>		</g>
-		<g id="shape71-242" v:mID="71" v:groupContext="shape" transform="translate(998.61,-673.527)">
-			<title>Interface.71</title>
-			<desc>NSX management</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="48.189" cy="781.318" width="96.38" height="96.378"/>
-			<rect x="0" y="733.13" width="96.378" height="96.378" class="st15"/>
-			<text x="11.9" y="784.32" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>NSX management</text>		</g>
-		<g id="shape72-245" v:mID="72" v:groupContext="shape" transform="translate(1007.08,-673.527)">
-			<title>Data Flow.72</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M7.09 838.15 L7.09 838.51 L7.09 950.9" class="st27"/>
-		</g>
-		<g id="shape73-254" v:mID="73" v:groupContext="shape" transform="translate(1094.99,-721.716)">
-			<title>Data Flow.73</title>
-			<desc>creates networks</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="109.134" cy="1118.29" width="65.75" height="17.6036"/>
-			<path d="M0 829.51 L109.13 829.51 L109.13 1371.07 L108.48 1371.07" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="81.1655" y="1113.49" width="55.9369" height="9.59985" class="st12"/>
-			<text x="81.17" y="1120.69" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>creates networks</text>		</g>
-		<g id="shape1001-262" v:mID="1001" v:groupContext="shape" transform="translate(1264.25,-729.862)">
-			<title>Sheet.1001</title>
-			<desc>New code</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="49.8898" cy="804.421" width="99.78" height="50.1732"/>
-			<rect x="0" y="779.334" width="99.7795" height="50.1732" class="st28"/>
-			<text x="25.55" y="808.02" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>New code</text>		</g>
-		<g id="shape1002-265" v:mID="1002" v:groupContext="shape" transform="translate(1264.25,-663.248)">
-			<title>Sheet.1002</title>
-			<desc>Not MVP0</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="49.1811" cy="803.996" width="98.37" height="51.0236"/>
-			<rect x="0" y="778.484" width="98.3622" height="51.0236" class="st29"/>
-			<text x="24.1" y="807.6" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Not MVP0</text>		</g>
-		<g id="shape1003-268" v:mID="1003" v:groupContext="shape" transform="translate(1264.25,-593.519)">
-			<title>Interface.1007</title>
-			<desc>MVP0</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="49.1811" cy="803.996" width="98.37" height="51.0236"/>
-			<rect x="0" y="778.484" width="98.3622" height="51.0236" class="st30"/>
-			<text x="36.95" y="807" class="st31" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>MVP0</text>		</g>
-		<g id="shape1004-271" v:mID="1004" v:groupContext="shape" transform="translate(1264.25,-523.791)">
-			<title>Interface.1008</title>
-			<desc>Shift to PhotonOS</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(99):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents external sources or consumers of data.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="49.1811" cy="803.996" width="98.37" height="51.0236"/>
-			<rect x="0" y="778.484" width="98.3622" height="51.0236" class="st32"/>
-			<text x="12.94" y="807" class="st31" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Shift to PhotonOS</text>		</g>
-		<g id="shape1005-274" v:mID="1005" v:groupContext="shape" transform="translate(1266.24,-470.492)">
-			<title>Sheet.1005</title>
-			<desc>NSBU</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="47.4803" cy="811.082" width="94.97" height="36.8504"/>
-			<rect x="0" y="792.657" width="94.9606" height="36.8504" class="st33"/>
-			<text x="33.74" y="814.68" class="st2" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>NSBU</text>		</g>
-		<g id="shape1006-277" v:mID="1006" v:groupContext="shape" v:layerMember="0" transform="translate(1278.99,-433.641)">
-			<title>Dynamic connector.1011</title>
-			<desc>TCP/IP</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="34.0157" cy="822.421" width="40" height="17.6036"/>
-			<path d="M0 822.42 L60.99 822.42" class="st34"/>
-			<rect v:rectContext="textBkgnd" x="23.2481" y="817.621" width="21.5354" height="9.59985" class="st12"/>
-			<text x="23.25" y="824.82" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>TCP/IP</text>		</g>
-		<g id="shape1007-286" v:mID="1007" v:groupContext="shape" v:layerMember="0" transform="translate(1281.68,-401.043)">
-			<title>Dynamic connector.1012</title>
-			<desc>vSocket</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="34.0157" cy="822.421" width="40" height="17.6036"/>
-			<path d="M0 822.42 L60.99 822.42" class="st36"/>
-			<rect v:rectContext="textBkgnd" x="21.4222" y="817.621" width="25.1873" height="9.59985" class="st12"/>
-			<text x="21.42" y="824.82" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vSocket</text>		</g>
-		<g id="shape1008-295" v:mID="1008" v:groupContext="shape" v:layerMember="0" transform="translate(869.102,-109.276)">
-			<title>Dynamic connector.1008</title>
-			<desc>-net=external</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="-212.333" cy="891.869" width="53.88" height="17.6036"/>
-			<path d="M0 835.19 L0 835.55 L0 891.87 L-480.99 891.87" class="st38"/>
-			<rect v:rectContext="textBkgnd" x="-234.364" y="887.07" width="44.0618" height="9.59985" class="st12"/>
-			<text x="-234.36" y="894.27" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>-net=external</text>		</g>
-		<g id="shape1009-307" v:mID="1009" v:groupContext="shape" v:layerMember="0" transform="translate(1027.56,-329.669)">
-			<title>Dynamic connector.1009</title>
-			<path d="M0 823.83 L0 823.47 L0 815.37 L63.78 815.37 L63.78 877.41 L58.2 877.41" class="st38"/>
-		</g>
-		<g id="shape1010-315" v:mID="1010" v:groupContext="shape" v:layerMember="0" transform="translate(1282.55,-370.369)">
-			<title>Dynamic connector.1010</title>
-			<desc>RPC over X</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="34.0157" cy="822.421" width="44.93" height="17.6036"/>
-			<path d="M0 822.42 L60.99 822.42" class="st40"/>
-			<rect v:rectContext="textBkgnd" x="16.4592" y="817.621" width="35.1134" height="9.59985" class="st12"/>
-			<text x="16.46" y="824.82" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>RPC over X</text>		</g>
-		<g id="shape18-324" v:mID="18" v:groupContext="shape" v:layerMember="0" transform="translate(581.973,-583.881)">
-			<title>Dynamic connector</title>
-			<desc>Create VCH</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="-7.32459" cy="937.736" width="46.94" height="17.6036"/>
-			<path d="M-6.59 829.51 L-7.54 960.59" class="st42"/>
-			<rect v:rectContext="textBkgnd" x="-25.8868" y="932.936" width="37.1247" height="9.59985" class="st12"/>
-			<text x="-25.89" y="940.14" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Create VCH</text>		</g>
-		<g id="shape1011-332" v:mID="1011" v:groupContext="shape" v:layerMember="0" transform="translate(479.622,-607.181)">
-			<title>Dynamic connector.1011</title>
-			<path d="M0 829.51 L95.81 829.51 L95.81 846.14" class="st43"/>
-		</g>
-		<g id="shape1012-339" v:mID="1012" v:groupContext="shape" v:layerMember="0" transform="translate(479.622,-780.094)">
-			<title>Dynamic connector.1012</title>
-			<path d="M0 829.51 L95.81 829.51 L95.81 1019.06" class="st43"/>
-		</g>
-		<g id="shape1013-345" v:mID="1013" v:groupContext="shape" v:layerMember="0" transform="translate(306.85,-453.543)">
-			<title>Dynamic connector.1013</title>
-			<path d="M0 829.51 L0 741.63 L47.96 741.63" class="st43"/>
-		</g>
-		<g id="shape1014-351" v:mID="1014" v:groupContext="shape" v:layerMember="0" transform="translate(306.142,-678.898)">
-			<title>Dynamic connector.1014</title>
-			<path d="M0 822.42 L0 831.49 L28.35 831.49 L28.35 828.46" class="st43"/>
-		</g>
-		<g id="shape1015-357" v:mID="1015" v:groupContext="shape" v:layerMember="0" transform="translate(1283.55,-344.012)">
-			<title>Dynamic connector.1015</title>
-			<desc>Complex control/logic path</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="34.5628" cy="833.362" width="98.17" height="17.6036"/>
-			<path d="M0 822.42 L60.99 822.42" class="st45"/>
-			<rect v:rectContext="textBkgnd" x="-9.61231" y="828.562" width="88.3504" height="9.59985" class="st12"/>
-			<text x="-9.61" y="835.76" class="st24" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Complex control/logic path</text>		</g>
-		<g id="shape1016-365" v:mID="1016" v:groupContext="shape" transform="translate(749.327,-170.079)">
-			<title>Process.1016</title>
-			<desc>Name resolution</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="17.0079" cy="800.47" width="34.02" height="58.0754"/>
-			<rect x="0" y="771.432" width="34.0157" height="58.0754" rx="9" ry="9" class="st14"/>
-			<text x="9.75" y="798.67" class="st46" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Name <tspan x="4.6"
-						dy="1.2em" class="st6">resolution</tspan></text>		</g>
-		<g id="shape1017-369" v:mID="1017" v:groupContext="shape" v:layerMember="0" transform="translate(695.98,-317.326)">
-			<title>Dynamic connector.1017</title>
-			<path d="M0 829.51 L0 928.35 L47.31 928.35" class="st47"/>
-		</g>
-		<g id="shape64-375" v:mID="64" v:groupContext="shape" transform="translate(844.613,-273.618)">
-			<title>Process.64</title>
-			<desc>Tether</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="35.4331" cy="811.791" width="70.87" height="35.4331"/>
-			<rect x="0" y="794.074" width="70.8661" height="35.4331" rx="9" ry="9" class="st14"/>
-			<text x="21.98" y="814.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Tether</text>		</g>
-		<g id="shape66-378" v:mID="66" v:groupContext="shape" transform="translate(760.304,-319.962)">
-			<title>Data Flow.66</title>
-			<desc>serial</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="20.5131" cy="829.507" width="40" height="17.6036"/>
-			<path d="M5.64 829.51 L6 829.51 L47.57 829.51 L47.57 852.06 L79.06 852.06" class="st48"/>
-			<rect v:rectContext="textBkgnd" x="11.812" y="824.708" width="17.4021" height="9.59985" class="st12"/>
-			<text x="11.81" y="831.91" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>serial</text>		</g>
-		<g id="shape1018-389" v:mID="1018" v:groupContext="shape" v:layerMember="0" transform="translate(831.17,-192.03)">
-			<title>Dynamic connector.1018</title>
-			<desc>dns</desc>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="-23.9136" cy="822.421" width="40" height="17.6036"/>
-			<path d="M0 822.42 L-41.79 822.42" class="st49"/>
-			<rect v:rectContext="textBkgnd" x="-29.6811" y="817.621" width="11.5351" height="9.59985" class="st12"/>
-			<text x="-29.68" y="824.82" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>dns</text>		</g>
-		<g id="shape1019-397" v:mID="1019" v:groupContext="shape" transform="translate(634.961,-316.287)">
-			<title>Process.1019</title>
-			<desc>Storage</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="17.0079" cy="800.47" width="34.02" height="58.0754"/>
-			<rect x="0" y="771.432" width="34.0157" height="58.0754" rx="9" ry="9" class="st14"/>
-			<text x="7.65" y="802.27" class="st46" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Storage</text>		</g>
-		<g id="shape1020-400" v:mID="1020" v:groupContext="shape" transform="translate(595.276,-316.287)">
-			<title>Process.1020</title>
-			<desc>Execution</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="17.0079" cy="800.47" width="34.02" height="58.0754"/>
-			<rect x="0" y="771.432" width="34.0157" height="58.0754" rx="9" ry="9" class="st14"/>
-			<text x="5.06" y="802.27" class="st46" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Execution</text>		</g>
-		<g id="shape1021-403" v:mID="1021" v:groupContext="shape" transform="translate(717.785,-290.924)">
-			<title>Process.1021</title>
-			<desc>Interaction</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="21.2598" cy="800.47" width="42.52" height="58.0754"/>
-			<rect x="0" y="771.432" width="42.5197" height="58.0754" rx="9" ry="9" class="st14"/>
-			<text x="7.83" y="802.27" class="st46" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Interaction</text>		</g>
-		<g id="shape1022-406" v:mID="1022" v:groupContext="shape" transform="translate(674.646,-316.287)">
-			<title>Process.1022</title>
-			<desc>Network</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="17.0079" cy="800.47" width="34.02" height="58.0754"/>
-			<rect x="0" y="771.432" width="34.0157" height="58.0754" rx="9" ry="9" class="st14"/>
-			<text x="6.44" y="802.27" class="st46" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Network</text>		</g>
-		<g id="shape1023-409" v:mID="1023" v:groupContext="shape" transform="translate(559.843,-291.958)">
-			<title>Data Flow.1023</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 829.51 L52.44 829.51 L52.44 814.18" class="st19"/>
-		</g>
-		<g id="shape1024-415" v:mID="1024" v:groupContext="shape" transform="translate(559.843,-287.924)">
-			<title>Data Flow.1024</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 829.51 L83.51 829.51 L83.51 810.12" class="st19"/>
-		</g>
-		<g id="shape48-421" v:mID="48" v:groupContext="shape" transform="translate(708.661,-368.504)">
-			<title>Data Flow.48</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 829.51 L82.04 829.51 A3 3 0 0 1 88.04 829.51 L148.24 829.51 A3 3 0 1 1 154.24 829.51 L277.99 829.51 L277.99
-						 699.31" class="st50"/>
-		</g>
-		<g id="shape1025-427" v:mID="1025" v:groupContext="shape" transform="translate(559.843,-283.89)">
-			<title>Data Flow.1025</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 829.51 L96.14 829.51 A3 3 0 1 1 102.14 829.51 L124.95 829.51 L124.95 806.11" class="st19"/>
-		</g>
-		<g id="shape1026-433" v:mID="1026" v:groupContext="shape" transform="translate(559.843,-277.968)">
-			<title>Data Flow.1026</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 828.29 L96.14 828.29 A3 3 0 1 1 102.14 828.29 L127.92 828.29 A5.61086 5.61086 0 1 1 139.14 828.29 L166.72
-						 828.29 L166.72 825.55" class="st19"/>
-		</g>
-		<g id="shape1027-439" v:mID="1027" v:groupContext="shape" transform="translate(575.872,-210.392)">
-			<title>Process.1027</title>
-			<desc>logging</desc>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(100):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents activity that transforms data from one form to another.)"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)" v:tabSpace="42.5197"/>
-			<v:textRect cx="35.4331" cy="811.791" width="70.87" height="35.4331"/>
-			<rect x="0" y="794.074" width="70.8661" height="35.4331" rx="9" ry="9" class="st9"/>
-			<text x="20.81" y="814.79" class="st4" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>logging</text>		</g>
-		<g id="shape1028-442" v:mID="1028" v:groupContext="shape" transform="translate(559.843,-221.022)">
-			<title>Data Flow.1028</title>
-			<v:userDefs>
-				<v:ud v:nameU="UMLShapeType" v:val="VT0(97):26"/>
-				<v:ud v:nameU="UMLObjectGUID"/>
-				<v:ud v:nameU="UMLPresOptions"/>
-				<v:ud v:nameU="UMLError" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:val="VT0(15):26"/>
-				<v:ud v:nameU="visDescription" v:val="VT4(Represents a packet of data that is being sent to or from a process.)"/>
-			</v:userDefs>
-			<path d="M0 822.42 L7.03 822.42" class="st19"/>
-		</g>
-		<g id="shape1029-448" v:mID="1029" v:groupContext="shape" v:layerMember="0" transform="translate(690.758,-316.287)">
-			<title>Dynamic connector.1029</title>
-			<path d="M0 829.51 L0 936.99 L8.3 936.99 L8.3 1005.07 L11.26 1005.07" class="st47"/>
-		</g>
-		<g id="shape1030-454" v:mID="1030" v:groupContext="shape" v:layerMember="0" transform="translate(739.044,-290.924)">
-			<title>Dynamic connector.1030</title>
-			<path d="M0 829.51 L0 891.42 L-40.06 891.42 A5.61086 5.61086 -180 0 0 -51.29 891.42 L-77.06 891.42 A3 3 -180 0 0 -83.06
-						 891.42 L-86.27 891.42" class="st47"/>
-		</g>
-	</g>
-</svg>
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/docker-pull-workflow.png b/installer/vendor/github.com/vmware/vic/doc/design/images/docker-pull-workflow.png
deleted file mode 100644
index 222e7d3cc2..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/images/docker-pull-workflow.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/docker-push-logic-flow.png b/installer/vendor/github.com/vmware/vic/doc/design/images/docker-push-logic-flow.png
deleted file mode 100644
index a2aa28ef2d..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/images/docker-push-logic-flow.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/docker_create_sequence.svg b/installer/vendor/github.com/vmware/vic/doc/design/images/docker_create_sequence.svg
deleted file mode 100644
index b92534397b..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/images/docker_create_sequence.svg
+++ /dev/null
@@ -1,297 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by Microsoft Visio, SVG Export docker_create_sequence.svg Docker Create -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"
-		xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="8.51389in" height="10.0835in"
-		viewBox="0 0 613 726.014" xml:space="preserve" color-interpolation-filters="sRGB" class="st17">
-	<v:documentProperties v:langID="1033" v:viewMarkup="false">
-		<v:userDefs>
-			<v:ud v:nameU="msvNoAutoConnect" v:prompt="" v:val="VT0(1):26"/>
-		</v:userDefs>
-	</v:documentProperties>
-
-	<style type="text/css">
-	<![CDATA[
-		.st1 {fill:#ffffff;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:2}
-		.st2 {stroke:#1e5054;stroke-dasharray:7,5;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st3 {fill:#102c2f;font-family:Calibri;font-size:1.00001em;font-weight:bold}
-		.st4 {font-size:1em}
-		.st5 {marker-end:url(#mrkr4-61);stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st6 {fill:#af1513;fill-opacity:1;stroke:#af1513;stroke-opacity:1;stroke-width:0.23584905660377}
-		.st7 {fill:#ffffff;stroke:none;stroke-linecap:butt;stroke-width:7.2}
-		.st8 {fill:#610c0b;font-family:Calibri;font-size:0.666664em}
-		.st9 {marker-end:url(#mrkr4-69);stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.3;stroke-width:1}
-		.st10 {fill:#af1513;fill-opacity:0.3;stroke:#af1513;stroke-opacity:0.3;stroke-width:0.23584905660377}
-		.st11 {fill:#1e5054;fill-opacity:0;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st12 {fill:#ffffff;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st13 {fill:#1e5155;font-family:Calibri;font-size:0.666664em;font-weight:bold}
-		.st14 {fill:#1e5054;font-family:Calibri;font-size:0.666664em}
-		.st15 {marker-end:url(#mrkr3-99);stroke:#af1513;stroke-dasharray:7,5;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st16 {fill:#ffffff;stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st17 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
-	]]>
-	</style>
-
-	<defs id="Markers">
-		<g id="lend4">
-			<path d="M 2 1 L 0 0 L 2 -1 L 2 1 " style="stroke:none"/>
-		</g>
-		<marker id="mrkr4-61" class="st6" v:arrowType="4" v:arrowSize="3" v:setback="8.48" refX="-8.48" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-4.24,-4.24) "/>
-		</marker>
-		<marker id="mrkr4-69" class="st10" v:arrowType="4" v:arrowSize="3" v:setback="8.48" refX="-8.48" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-4.24,-4.24) "/>
-		</marker>
-		<g id="lend3">
-			<path d="M 2 1 L 0 0 L 2 -1 " style="stroke-linecap:round;stroke-linejoin:round;fill:none"/>
-		</g>
-		<marker id="mrkr3-99" class="st6" v:arrowType="3" v:arrowSize="3" orient="auto" markerUnits="strokeWidth"
-				overflow="visible">
-			<use xlink:href="#lend3" transform="scale(-4.24,-4.24) "/>
-		</marker>
-	</defs>
-	<g v:mID="0" v:index="1" v:groupContext="foregroundPage">
-		<v:userDefs>
-			<v:ud v:nameU="msvThemeOrder" v:val="VT0(0):26"/>
-		</v:userDefs>
-		<title>Docker Create</title>
-		<v:pageProperties v:drawingScale="1" v:pageScale="1" v:drawingUnits="0" v:shadowOffsetX="9" v:shadowOffsetY="-9"/>
-		<v:layer v:name="Connector" v:index="0"/>
-		<g id="group1-1" transform="translate(19,-633.214)" v:mID="1" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Actor lifeline</title>
-			<desc>docker client</desc>
-			<g id="shape2-2" v:mID="2" v:groupContext="shape" transform="translate(0,-4.5)">
-				<title>Sheet.2</title>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-			</g>
-			<g id="shape3-4" v:mID="3" v:groupContext="shape" transform="translate(18,-37.8)">
-				<title>Sheet.3</title>
-				<path d="M3.6 726.01 L3.6 708.01 L3.6 715.21 L0 715.21 L0 700.81 L1.8 699.01 L16.2 699.01 L18 700.81 L18 715.21 L14.4
-							 715.21 L14.4 708.01 L14.4 726.01 L9 726.01 L9 711.61 L9 726.01 L3.6 726.01 ZM12.6 693.61 A3.6 3.6 -180
-							 1 0 5.4 693.61 A3.6 3.6 -180 1 0 12.6 693.61 Z" class="st1"/>
-			</g>
-			<g id="shape4-6" v:mID="4" v:groupContext="shape" transform="translate(18,615.214)">
-				<title>Sheet.4</title>
-			</g>
-			<g id="shape5-8" v:mID="5" v:groupContext="shape" transform="translate(753.014,726.014) rotate(90)">
-				<title>Sheet.5</title>
-				<path d="M0 726.01 L594 726.01" class="st2"/>
-			</g>
-			<g id="shape1-11" v:mID="1" v:groupContext="groupContent">
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="27" cy="708.914" width="54" height="34.2"/>
-				<rect x="0" y="691.814" width="54" height="34.2" class="st1"/>
-				<text x="10.01" y="705.31" class="st3" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker <tspan
-							x="13.22" dy="1.2em" class="st4">client</tspan></text>			</g>
-		</g>
-		<g id="group6-15" transform="translate(145,-633.214)" v:mID="6" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline</title>
-			<desc>docker API</desc>
-			<g id="shape7-16" v:mID="7" v:groupContext="shape" transform="translate(0,-3.6)">
-				<title>Sheet.7</title>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-			</g>
-			<g id="shape8-18" v:mID="8" v:groupContext="shape" transform="translate(18,-36)">
-				<title>Sheet.8</title>
-				<path d="M9 726.01 a0 0 0 1 1 0 0 a0 0 0 1 1 0 0 Z" class="st1"/>
-			</g>
-			<g id="shape9-20" v:mID="9" v:groupContext="shape" transform="translate(18,605.571)">
-				<title>Sheet.9</title>
-			</g>
-			<g id="shape10-22" v:mID="10" v:groupContext="shape" transform="translate(753.014,726.014) rotate(90)">
-				<title>Sheet.10</title>
-				<path d="M0 726.01 L585 726.01" class="st2"/>
-			</g>
-			<g id="shape6-25" v:mID="6" v:groupContext="groupContent">
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="27" cy="709.814" width="54" height="32.4"/>
-				<rect x="0" y="693.614" width="54" height="32.4" class="st1"/>
-				<text x="10.01" y="706.21" class="st3" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker <tspan
-							x="18.57" dy="1.2em" class="st4">API</tspan></text>			</g>
-		</g>
-		<g id="group21-29" transform="translate(306,-640.414)" v:mID="21" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.21</title>
-			<desc>Port Layer</desc>
-			<g id="shape22-30" v:mID="22" v:groupContext="shape">
-				<title>Sheet.22</title>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-			</g>
-			<g id="shape23-32" v:mID="23" v:groupContext="shape" transform="translate(18,-28.8)">
-				<title>Sheet.23</title>
-				<path d="M9 726.01 a0 0 0 1 1 0 0 a0 0 0 1 1 0 0 Z" class="st1"/>
-			</g>
-			<g id="shape24-34" v:mID="24" v:groupContext="shape" transform="translate(18,621)">
-				<title>Sheet.24</title>
-			</g>
-			<g id="shape25-36" v:mID="25" v:groupContext="shape" transform="translate(753.014,726.014) rotate(90)">
-				<title>Sheet.25</title>
-				<path d="M0 726.01 L603 726.01" class="st2"/>
-			</g>
-			<g id="shape21-39" v:mID="21" v:groupContext="groupContent">
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="27" cy="713.414" width="54" height="25.2"/>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-				<text x="16.37" y="709.81" class="st3" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Port <tspan
-							x="13.51" dy="1.2em" class="st4">Layer</tspan></text>			</g>
-		</g>
-		<g id="group26-43" transform="translate(540,-640.414)" v:mID="26" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.26</title>
-			<desc>vCenter</desc>
-			<g id="shape27-44" v:mID="27" v:groupContext="shape">
-				<title>Sheet.27</title>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-			</g>
-			<g id="shape28-46" v:mID="28" v:groupContext="shape" transform="translate(18,-28.8)">
-				<title>Sheet.28</title>
-				<path d="M9 726.01 a0 0 0 1 1 0 0 a0 0 0 1 1 0 0 Z" class="st1"/>
-			</g>
-			<g id="shape29-48" v:mID="29" v:groupContext="shape" transform="translate(18,621)">
-				<title>Sheet.29</title>
-			</g>
-			<g id="shape30-50" v:mID="30" v:groupContext="shape" transform="translate(753.014,726.014) rotate(90)">
-				<title>Sheet.30</title>
-				<path d="M0 726.01 L603 726.01" class="st2"/>
-			</g>
-			<g id="shape26-53" v:mID="26" v:groupContext="groupContent">
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="27" cy="713.414" width="54" height="25.2"/>
-				<rect x="0" y="700.814" width="54" height="25.2" class="st1"/>
-				<text x="7.51" y="717.01" class="st3" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vCenter</text>			</g>
-		</g>
-		<g id="shape31-56" v:mID="31" v:groupContext="shape" v:layerMember="0" transform="translate(46,-606.214)">
-			<title>Message.22</title>
-			<desc>TLS (HTTP connection)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="63" cy="717.014" width="82.45" height="17.6036"/>
-			<path d="M0 717.01 L117.52 717.01" class="st5"/>
-			<rect v:rectContext="textBkgnd" x="26.686" y="712.215" width="72.6281" height="9.59985" class="st7"/>
-			<text x="26.69" y="719.41" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>TLS (HTTP connection)</text>		</g>
-		<g id="shape83-64" v:mID="83" v:groupContext="shape" v:layerMember="0" transform="translate(172,-606.214)">
-			<title>Message.22.83</title>
-			<desc>possible audit log mapping for all operations over this conne...</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="197.5" cy="717.014" width="222.44" height="17.6036"/>
-			<path d="M0 717.01 L386.52 717.01" class="st9"/>
-			<rect v:rectContext="textBkgnd" x="91.1908" y="712.215" width="212.619" height="9.59985" class="st7"/>
-			<text x="91.19" y="719.41" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>possible audit log mapping for all operations over this connection</text>		</g>
-		<g id="group87-72" transform="translate(46,-511.714)" v:mID="87" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<title>Optional fragment</title>
-			<g id="shape87-73" v:mID="87" v:groupContext="groupContent">
-				<rect x="0" y="667.514" width="125" height="58.5" class="st11"/>
-			</g>
-			<g id="shape88-75" v:mID="88" v:groupContext="shape" transform="translate(0,-40.8964)">
-				<title>Sheet.88</title>
-				<desc>opt</desc>
-				<v:userDefs>
-					<v:ud v:nameU="FoldSize" v:prompt="" v:val="VT0(0.1):0"/>
-					<v:ud v:nameU="BackFillColor" v:prompt="" v:val="VT5(#96afcf)"/>
-					<v:ud v:nameU="BackLineColor" v:prompt="" v:val="VT5(#1f477d)"/>
-					<v:ud v:nameU="BackCharColor" v:prompt="" v:val="VT5(#000000)"/>
-					<v:ud v:nameU="DarkerColor" v:prompt="" v:val="VT5(#000000)"/>
-					<v:ud v:nameU="BackFillColor" v:prompt="" v:val="VT5(#1e5155)"/>
-					<v:ud v:nameU="BackLineColor" v:prompt="" v:val="VT5(#1e5155)"/>
-					<v:ud v:nameU="BackCharColor" v:prompt="" v:val="VT5(#ffffff)"/>
-					<v:ud v:nameU="DarkerColor" v:prompt="" v:val="VT5(#1e5155)"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="32" cy="717.213" width="64" height="17.6036"/>
-				<path d="M0 726.01 L56.8 726.01 L64 718.81 L64 708.41 L0 708.41 L0 726.01 Z" class="st12"/>
-				<text x="4" y="719.61" class="st13" v:langID="1033"><v:paragraph/><v:tabList/>opt</text>			</g>
-			<g id="shape89-78" v:mID="89" v:groupContext="shape" transform="translate(0,-23.2929)">
-				<title>Sheet.89</title>
-				<desc>image does not exist</desc>
-				<v:userDefs>
-					<v:ud v:nameU="msvQuickStyleVariationRestore" v:prompt="" v:val="VT0(2):26"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="38.3821" cy="717.213" width="76.77" height="17.6036"/>
-				<text x="4" y="719.61" class="st14" v:langID="1033"><v:paragraph/><v:tabList/>image does not exist</text>			</g>
-		</g>
-		<g id="shape90-80" v:mID="90" v:groupContext="shape" v:layerMember="0" transform="translate(46,-570.214)">
-			<title>Message.22.90</title>
-			<desc>create</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="60.75" cy="717.014" width="40" height="17.6036"/>
-			<path d="M0 717.01 L113.02 717.01" class="st5"/>
-			<rect v:rectContext="textBkgnd" x="50.4279" y="712.215" width="20.6441" height="9.59985" class="st7"/>
-			<text x="50.43" y="719.41" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>create</text>		</g>
-		<g id="shape91-87" v:mID="91" v:groupContext="shape" v:layerMember="0" transform="translate(46,-516.214)">
-			<title>Message.22.91</title>
-			<desc>pull</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="60.75" cy="717.014" width="40" height="17.6036"/>
-			<path d="M0 717.01 L113.02 717.01" class="st5"/>
-			<rect v:rectContext="textBkgnd" x="54.7112" y="712.215" width="12.0778" height="9.59985" class="st7"/>
-			<text x="54.71" y="719.41" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>pull</text>		</g>
-		<g id="shape93-94" v:mID="93" v:groupContext="shape" v:layerMember="0" transform="translate(171,-525.214)">
-			<title>Return Message.26</title>
-			<desc>404</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="-63" cy="717.014" width="40" height="17.6036"/>
-			<path d="M0 717.01 L-126 717.01" class="st15"/>
-			<rect v:rectContext="textBkgnd" x="-69.0822" y="712.215" width="12.1643" height="9.59985" class="st7"/>
-			<text x="-69.08" y="719.41" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>404</text>		</g>
-		<g id="shape94-102" v:mID="94" v:groupContext="shape" transform="translate(-549.514,470.8) rotate(-90)">
-			<title>Activation</title>
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<rect x="0" y="717.014" width="324" height="9" class="st16"/>
-		</g>
-	</g>
-</svg>
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/docker_pull_sequence.svg b/installer/vendor/github.com/vmware/vic/doc/design/images/docker_pull_sequence.svg
deleted file mode 100644
index 55bb60a477..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/images/docker_pull_sequence.svg
+++ /dev/null
@@ -1,727 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by Microsoft Visio, SVG Export docker_pull_sequence.svg Page-1 -->
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:ev="http://www.w3.org/2001/xml-events"
-		xmlns:v="http://schemas.microsoft.com/visio/2003/SVGExtensions/" width="10.5278in" height="10.1639in"
-		viewBox="0 0 758.002 731.801" xml:space="preserve" color-interpolation-filters="sRGB" class="st19">
-	<v:documentProperties v:langID="1033">
-		<v:userDefs>
-			<v:ud v:nameU="msvNoAutoConnect" v:prompt="" v:val="VT0(1):26"/>
-		</v:userDefs>
-	</v:documentProperties>
-
-	<style type="text/css">
-	<![CDATA[
-		.st1 {fill:#1e5054;fill-opacity:0;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st2 {fill:#ffffff;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st3 {fill:#1e5155;font-family:Calibri;font-size:0.666664em;font-weight:bold}
-		.st4 {fill:#1e5054;font-family:Calibri;font-size:0.666664em}
-		.st5 {fill:#ffffff;stroke:#1e5054;stroke-linecap:round;stroke-linejoin:round;stroke-width:2}
-		.st6 {fill:none}
-		.st7 {stroke:#1e5054;stroke-dasharray:7.00001,5.00001;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st8 {fill:#102c2f;font-family:Calibri;font-size:1.00001em;font-weight:bold}
-		.st9 {font-size:1em}
-		.st10 {marker-end:url(#mrkr4-78);stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st11 {fill:#af1513;fill-opacity:1;stroke:#af1513;stroke-opacity:1;stroke-width:0.23584925362398}
-		.st12 {fill:#ffffff;stroke:none;stroke-linecap:butt}
-		.st13 {fill:#610c0b;font-family:Calibri;font-size:0.666664em}
-		.st14 {fill:#ffffff;stroke:none;stroke-linecap:butt;stroke-width:7.2}
-		.st15 {fill:#ffffff;stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st16 {marker-end:url(#mrkr3-130);stroke:#af1513;stroke-dasharray:7.00001,5.00001;stroke-linecap:round;stroke-linejoin:round;stroke-width:1}
-		.st17 {marker-end:url(#mrkr4-281);stroke:#af1513;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:0.3;stroke-width:1}
-		.st18 {fill:#af1513;fill-opacity:0.3;stroke:#af1513;stroke-opacity:0.3;stroke-width:0.23584925362398}
-		.st19 {fill:none;fill-rule:evenodd;font-size:12px;overflow:visible;stroke-linecap:square;stroke-miterlimit:3}
-	]]>
-	</style>
-
-	<defs id="Markers">
-		<g id="lend4">
-			<path d="M 2 1 L 0 0 L 2 -1 L 2 1 " style="stroke:none"/>
-		</g>
-		<marker id="mrkr4-78" class="st11" v:arrowType="4" v:arrowSize="3" v:setback="8.47999" refX="-8.479992916105" orient="auto"
-				markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-4.2399964580525,-4.2399964580525) "/>
-		</marker>
-		<g id="lend3">
-			<path d="M 2 1 L 0 0 L 2 -1 " style="stroke-linecap:round;stroke-linejoin:round;fill:none"/>
-		</g>
-		<marker id="mrkr3-130" class="st11" v:arrowType="3" v:arrowSize="3" orient="auto" markerUnits="strokeWidth"
-				overflow="visible">
-			<use xlink:href="#lend3" transform="scale(-4.2399964580525,-4.2399964580525) "/>
-		</marker>
-		<marker id="mrkr4-281" class="st18" v:arrowType="4" v:arrowSize="3" v:setback="8.47999" refX="-8.479992916105"
-				orient="auto" markerUnits="strokeWidth" overflow="visible">
-			<use xlink:href="#lend4" transform="scale(-4.2399964580525,-4.2399964580525) "/>
-		</marker>
-	</defs>
-	<g v:mID="0" v:index="1" v:groupContext="foregroundPage">
-		<v:userDefs>
-			<v:ud v:nameU="msvThemeOrder" v:val="VT0(0):26"/>
-		</v:userDefs>
-		<title>Docker Pull</title>
-		<v:pageProperties v:drawingScale="1" v:pageScale="1" v:drawingUnits="0" v:shadowOffsetX="9.00001"
-				v:shadowOffsetY="-9.00001"/>
-		<v:layer v:name="Connector" v:index="0"/>
-		<g id="group1-1" transform="translate(298,-99.0001)" v:mID="1" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<title>Loop fragment</title>
-			<g id="shape2-2" v:mID="2" v:groupContext="shape" transform="translate(0.000385679,0)">
-				<title>shape47-2</title>
-				<rect x="0" y="308.8" width="216" height="423" class="st1"/>
-			</g>
-			<g id="shape3-4" v:mID="3" v:groupContext="shape" transform="translate(0.000385679,-405.396)">
-				<title>Sheet.3</title>
-				<desc>loop</desc>
-				<v:userDefs>
-					<v:ud v:nameU="FoldSize" v:prompt="" v:val="VT0(0.1):0"/>
-					<v:ud v:nameU="BackFillColor" v:prompt="" v:val="VT5(#96afcf)"/>
-					<v:ud v:nameU="BackLineColor" v:prompt="" v:val="VT5(#1f477d)"/>
-					<v:ud v:nameU="BackCharColor" v:prompt="" v:val="VT5(#000000)"/>
-					<v:ud v:nameU="DarkerColor" v:prompt="" v:val="VT5(#000000)"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="31.9996" cy="722.999" width="64.01" height="17.6036"/>
-				<path d="M0 731.8 L56.8 731.8 L64 724.6 L64 714.2 L0 714.2 L0 731.8 Z" class="st2"/>
-				<text x="4" y="725.4" class="st3" v:langID="1033"><v:paragraph/><v:tabList/>loop</text>			</g>
-			<g id="shape4-7" v:mID="4" v:groupContext="shape" transform="translate(1.07914E-12,-387.794)">
-				<title>Sheet.4</title>
-				<desc>fsLayers</desc>
-				<v:userDefs>
-					<v:ud v:nameU="msvQuickStyleVariationRestore" v:prompt="" v:val="VT0(2):26"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="32" cy="722.999" width="64.01" height="17.6036"/>
-				<text x="4" y="725.4" class="st4" v:langID="1033"><v:paragraph/><v:tabList/>fsLayers</text>			</g>
-		</g>
-		<g id="group5-9" transform="translate(253.001,-45)" v:mID="5" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.11</title>
-			<desc>imagec</desc>
-			<g id="shape6-10" v:mID="6" v:groupContext="shape" transform="translate(-2.39808E-14,-594.001)">
-				<title>Sheet.6</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape7-12" v:mID="7" v:groupContext="shape" transform="translate(18,-622.801)">
-				<title>Sheet.7</title>
-			</g>
-			<g id="shape9-13" v:mID="9" v:groupContext="shape" transform="translate(758.801,137.8) rotate(90)">
-				<title>Sheet.9</title>
-				<path d="M0 731.8 L594 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L594 731.8" class="st7"/>
-			</g>
-			<g id="shape10-16" v:mID="10" v:groupContext="shape" transform="translate(-2.39808E-14,-594.001)">
-				<title>shape11-19</title>
-				<desc>imagec</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="719.201" width="54.01" height="25.2"/>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-				<text x="9.31" y="722.8" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>imagec</text>			</g>
-		</g>
-		<g id="group11-19" transform="translate(19.0004,-45)" v:mID="11" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Actor lifeline</title>
-			<desc>docker client</desc>
-			<g id="shape12-20" v:mID="12" v:groupContext="shape" transform="translate(-7.99361E-15,-598.501)">
-				<title>Sheet.12</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape13-22" v:mID="13" v:groupContext="shape" transform="translate(18,-631.801)">
-				<title>Sheet.13</title>
-				<path d="M3.6 731.8 L3.6 713.8 L3.6 721 L0 721 L0 706.6 L1.8 704.8 L16.2 704.8 L18 706.6 L18 721 L14.4 721 L14.4
-							 713.8 L14.4 731.8 L9 731.8 L9 717.4 L9 731.8 L3.6 731.8 ZM12.6 699.4 A3.6 3.6 -180 1 0 5.4 699.4 A3.6
-							 3.6 -180 1 0 12.6 699.4 Z" class="st5"/>
-			</g>
-			<g id="shape15-24" v:mID="15" v:groupContext="shape" transform="translate(758.801,137.8) rotate(90)">
-				<title>Sheet.15</title>
-				<path d="M0 731.8 L594 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L594 731.8" class="st7"/>
-			</g>
-			<g id="shape16-27" v:mID="16" v:groupContext="shape" transform="translate(-7.99361E-15,-594.001)">
-				<title>shape1-32</title>
-				<desc>docker client</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="714.701" width="54.01" height="34.2"/>
-				<rect x="0" y="697.601" width="54.0001" height="34.2" class="st5"/>
-				<text x="10.01" y="711.1" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker <tspan
-							x="13.22" dy="1.2em" class="st9">client</tspan></text>			</g>
-		</g>
-		<g id="group17-31" transform="translate(145.001,-54.0001)" v:mID="17" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline</title>
-			<desc>docker API</desc>
-			<g id="shape18-32" v:mID="18" v:groupContext="shape" transform="translate(0,-588.601)">
-				<title>Sheet.18</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape19-34" v:mID="19" v:groupContext="shape" transform="translate(18,-621.001)">
-				<title>Sheet.19</title>
-			</g>
-			<g id="shape21-35" v:mID="21" v:groupContext="shape" transform="translate(758.801,146.8) rotate(90)">
-				<title>Sheet.21</title>
-				<path d="M0 731.8 L585 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L585 731.8" class="st7"/>
-			</g>
-			<g id="shape22-38" v:mID="22" v:groupContext="shape" transform="translate(0,-585.001)">
-				<title>shape6-46</title>
-				<desc>docker API</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="715.601" width="54.01" height="32.4"/>
-				<rect x="0" y="699.401" width="54.0001" height="32.4" class="st5"/>
-				<text x="10.01" y="712" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>docker <tspan
-							x="18.57" dy="1.2em" class="st9">API</tspan></text>			</g>
-		</g>
-		<g id="group23-42" transform="translate(361.001,-351)" v:mID="23" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.16</title>
-			<desc>registry</desc>
-			<g id="shape24-43" v:mID="24" v:groupContext="shape" transform="translate(0,-288)">
-				<title>Sheet.24</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape25-45" v:mID="25" v:groupContext="shape" transform="translate(18,-316.8)">
-				<title>Sheet.25</title>
-			</g>
-			<g id="shape27-46" v:mID="27" v:groupContext="shape" transform="translate(758.801,443.8) rotate(90)">
-				<title>Sheet.27</title>
-				<path d="M0 731.8 L288 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L288 731.8" class="st7"/>
-			</g>
-			<g id="shape28-49" v:mID="28" v:groupContext="shape" transform="translate(0,-288)">
-				<title>shape16-60</title>
-				<desc>registry</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="719.201" width="54.01" height="25.2"/>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-				<text x="8.08" y="722.8" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>registry</text>			</g>
-		</g>
-		<g id="group29-52" transform="translate(505.001,-36)" v:mID="29" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.21</title>
-			<desc>Port Layer</desc>
-			<g id="shape30-53" v:mID="30" v:groupContext="shape" transform="translate(0,-603.001)">
-				<title>Sheet.30</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape31-55" v:mID="31" v:groupContext="shape" transform="translate(18,-631.801)">
-				<title>Sheet.31</title>
-			</g>
-			<g id="shape33-56" v:mID="33" v:groupContext="shape" transform="translate(758.801,128.8) rotate(90)">
-				<title>Sheet.33</title>
-				<path d="M0 731.8 L603 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L603 731.8" class="st7"/>
-			</g>
-			<g id="shape34-59" v:mID="34" v:groupContext="shape" transform="translate(0,-603.001)">
-				<title>shape21-73</title>
-				<desc>Port Layer</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="719.201" width="54.01" height="25.2"/>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-				<text x="16.37" y="715.6" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>Port <tspan
-							x="13.51" dy="1.2em" class="st9">Layer</tspan></text>			</g>
-		</g>
-		<g id="group35-63" transform="translate(685.001,-36)" v:mID="35" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-				<v:ud v:nameU="ShowActor" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="ShowDestruction" v:prompt="" v:val="VT0(0):5"/>
-			</v:userDefs>
-			<title>Object lifeline.26</title>
-			<desc>vCenter</desc>
-			<g id="shape36-64" v:mID="36" v:groupContext="shape" transform="translate(2.79776E-14,-603.001)">
-				<title>Sheet.36</title>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-			</g>
-			<g id="shape37-66" v:mID="37" v:groupContext="shape" transform="translate(18,-631.801)">
-				<title>Sheet.37</title>
-			</g>
-			<g id="shape39-67" v:mID="39" v:groupContext="shape" transform="translate(758.801,128.8) rotate(90)">
-				<title>Sheet.39</title>
-				<path d="M0 731.8 L603 731.8 L0 731.8 Z" class="st6"/>
-				<path d="M0 731.8 L603 731.8" class="st7"/>
-			</g>
-			<g id="shape40-70" v:mID="40" v:groupContext="shape" transform="translate(2.79776E-14,-603.001)">
-				<title>shape26-87</title>
-				<desc>vCenter</desc>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="26.9996" cy="719.201" width="54.01" height="25.2"/>
-				<rect x="0" y="706.601" width="54.0001" height="25.2" class="st5"/>
-				<text x="7.51" y="722.8" class="st8" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>vCenter</text>			</g>
-		</g>
-		<g id="shape41-73" v:mID="41" v:groupContext="shape" v:layerMember="0" transform="translate(46.0004,-621.001)">
-			<title>Message.22</title>
-			<desc>TLS (HTTP connection)</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="62.9997" cy="731.801" width="82.46" height="17.6036"/>
-			<path d="M0 731.8 L117.52 731.8 L117.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="26.6855" y="727.001" width="72.6281" height="9.59985" class="st12"/>
-			<text x="26.69" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>TLS (HTTP connection)</text>		</g>
-		<g id="shape42-81" v:mID="42" v:groupContext="shape" v:layerMember="0" transform="translate(46.0004,-585.001)">
-			<title>Message.22.32</title>
-			<desc>login</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="62.9997" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M0 731.8 L117.52 731.8 L117.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="55.0703" y="727.001" width="15.859" height="9.59985" class="st14"/>
-			<text x="55.07" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>login</text>		</g>
-		<g id="shape43-88" v:mID="43" v:groupContext="shape" v:layerMember="0" transform="translate(46.0004,-549.001)">
-			<title>Message.22.33</title>
-			<desc>pull</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="62.9997" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M0 731.8 L117.52 731.8 L117.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="56.9608" y="727.001" width="12.0778" height="9.59985" class="st14"/>
-			<text x="56.96" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>pull</text>		</g>
-		<g id="shape44-95" v:mID="44" v:groupContext="shape" v:layerMember="0" transform="translate(172.001,-585.001)">
-			<title>Message.22.34</title>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<path d="M0 731.8 L99.52 731.8 L99.52 731.8" class="st10"/>
-		</g>
-		<g id="shape45-100" v:mID="45" v:groupContext="shape" v:layerMember="0" transform="translate(280.001,-585.001)">
-			<title>Message.22.35</title>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<path d="M0 731.8 L99.52 731.8 L99.52 731.8" class="st10"/>
-		</g>
-		<g id="shape46-105" v:mID="46" v:groupContext="shape" transform="translate(-555.3,632.801) rotate(-90)">
-			<title>Activation</title>
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<rect x="0" y="722.801" width="450" height="9.00001" class="st15"/>
-		</g>
-		<g id="group47-107" transform="translate(46.0004,-570.601)" v:mID="47" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<title>Optional fragment</title>
-			<g id="shape48-108" v:mID="48" v:groupContext="shape">
-				<title>shape37-125</title>
-				<rect x="0" y="697.601" width="342" height="34.2" class="st1"/>
-			</g>
-			<g id="shape49-110" v:mID="49" v:groupContext="shape" transform="translate(-9.19265E-14,-16.5964)">
-				<title>Sheet.49</title>
-				<desc>opt</desc>
-				<v:userDefs>
-					<v:ud v:nameU="FoldSize" v:prompt="" v:val="VT0(0.1):0"/>
-					<v:ud v:nameU="BackFillColor" v:prompt="" v:val="VT5(#96afcf)"/>
-					<v:ud v:nameU="BackLineColor" v:prompt="" v:val="VT5(#1f477d)"/>
-					<v:ud v:nameU="BackCharColor" v:prompt="" v:val="VT5(#000000)"/>
-					<v:ud v:nameU="DarkerColor" v:prompt="" v:val="VT5(#000000)"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="31.9996" cy="722.999" width="64.01" height="17.6036"/>
-				<path d="M0 731.8 L56.8 731.8 L64 724.6 L64 714.2 L0 714.2 L0 731.8 Z" class="st2"/>
-				<text x="4" y="725.4" class="st3" v:langID="1033"><v:paragraph/><v:tabList/>opt</text>			</g>
-		</g>
-		<g id="shape50-113" v:mID="50" v:groupContext="shape" v:layerMember="0" transform="translate(176.501,-549.001)">
-			<title>Message.22.44</title>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<path d="M0 731.8 L95.02 731.8 L95.02 731.8" class="st10"/>
-		</g>
-		<g id="shape51-118" v:mID="51" v:groupContext="shape" v:layerMember="0" transform="translate(280.001,-549.001)">
-			<title>Message.22.45</title>
-			<desc>resolve</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="53.9997" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M0 731.8 L99.52 731.8 L99.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="42.2265" y="727.001" width="23.5467" height="9.59985" class="st14"/>
-			<text x="42.23" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>resolve</text>		</g>
-		<g id="shape52-125" v:mID="52" v:groupContext="shape" v:layerMember="0" transform="translate(280.001,-540.001)">
-			<title>Return Message.26</title>
-			<desc>manifest</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="53.9997" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M108 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="39.754" y="727.001" width="28.4917" height="9.59985" class="st14"/>
-			<text x="39.75" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>manifest</text>		</g>
-		<g id="shape53-133" v:mID="53" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-477.001)">
-			<title>Message.22.53</title>
-			<desc>getLayer</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="123.75" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M0 731.8 L239.02 731.8 L239.02 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="109.744" y="727.001" width="28.0113" height="9.59985" class="st14"/>
-			<text x="109.74" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>getLayer</text>		</g>
-		<g id="shape54-140" v:mID="54" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-423)">
-			<title>Return Message.26.54</title>
-			<desc>handle</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="123.75" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M247.5 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="112.621" y="727.001" width="22.2575" height="9.59985" class="st14"/>
-			<text x="112.62" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>handle</text>		</g>
-		<g id="shape55-147" v:mID="55" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-306)">
-			<title>Message.22.59</title>
-			<desc>createLayer</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="123.75" cy="731.801" width="48.06" height="17.6036"/>
-			<path d="M0 731.8 L239.02 731.8 L239.02 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="104.635" y="727.001" width="38.2299" height="9.59985" class="st14"/>
-			<text x="104.63" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>createLayer</text>		</g>
-		<g id="shape56-154" v:mID="56" v:groupContext="shape" v:layerMember="0" transform="translate(532.001,-306)">
-			<title>Message.22.60</title>
-			<desc>create VMDK</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="89.9997" cy="731.801" width="52.74" height="17.6036"/>
-			<path d="M0 731.8 L171.52 731.8 L171.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="68.545" y="727.001" width="42.9096" height="9.59985" class="st14"/>
-			<text x="68.55" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>create VMDK</text>		</g>
-		<g id="shape57-161" v:mID="57" v:groupContext="shape" v:layerMember="0" transform="translate(532.001,-477.001)">
-			<title>Message.22.61</title>
-			<desc>exists?</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="89.9997" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M0 731.8 L171.52 731.8 L171.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="79.037" y="727.001" width="21.9254" height="9.59985" class="st14"/>
-			<text x="79.04" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>exists?</text>		</g>
-		<g id="shape58-168" v:mID="58" v:groupContext="shape" v:layerMember="0" transform="translate(532.001,-423)">
-			<title>Self Message.24.63</title>
-			<desc>map result to handle</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="-0.000385679" cy="713.801" width="77.45" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-33.8123" y="709.001" width="67.6241" height="9.59985" class="st14"/>
-			<text x="-33.81" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>map result to handle</text>		</g>
-		<g id="shape59-175" v:mID="59" v:groupContext="shape" v:layerMember="0" transform="translate(532.001,-468.001)">
-			<title>Return Message.26.64</title>
-			<desc>true/false/blob?</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="89.9997" cy="731.801" width="63.05" height="17.6036"/>
-			<path d="M180 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="63.3906" y="727.001" width="53.2183" height="9.59985" class="st14"/>
-			<text x="63.39" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>true/false/blob?</text>		</g>
-		<g id="shape60-182" v:mID="60" v:groupContext="shape" v:layerMember="0" transform="translate(532.001,-288)">
-			<title>Message.22.65</title>
-			<desc>attach VMDK</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="89.9997" cy="731.801" width="52.7" height="17.6036"/>
-			<path d="M0 731.8 L171.52 731.8 L171.52 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="68.5626" y="727.001" width="42.8744" height="9.59985" class="st14"/>
-			<text x="68.56" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>attach VMDK</text>		</g>
-		<g id="shape61-189" v:mID="61" v:groupContext="shape" transform="translate(-195.3,641.801) rotate(-90)">
-			<title>Activation.69</title>
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<rect x="0" y="722.801" width="216" height="9.00001" class="st15"/>
-		</g>
-		<g id="shape62-191" v:mID="62" v:groupContext="shape" v:layerMember="0" transform="translate(536.501,-198)">
-			<title>Self Message.24.70</title>
-			<desc>extract data</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="-0.000385679" cy="713.801" width="48.99" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-19.582" y="709.001" width="39.1635" height="9.59985" class="st14"/>
-			<text x="-19.58" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>extract data</text>		</g>
-		<g id="shape63-198" v:mID="63" v:groupContext="shape" v:layerMember="0" transform="translate(536.501,-234)">
-			<title>Self Message.24.71</title>
-			<desc>mount VMDK</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="-0.000385679" cy="713.801" width="53.79" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-21.9806" y="709.001" width="43.9604" height="9.59985" class="st14"/>
-			<text x="-21.98" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>mount VMDK</text>		</g>
-		<g id="shape64-205" v:mID="64" v:groupContext="shape" v:layerMember="0" transform="translate(536.501,-162)">
-			<title>Self Message.24.73</title>
-			<desc>unmount VMDK</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="-0.000385679" cy="713.801" width="62.19" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="-26.1837" y="709.001" width="52.3666" height="9.59985" class="st14"/>
-			<text x="-26.18" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>unmount VMDK</text>		</g>
-		<g id="shape65-212" v:mID="65" v:groupContext="shape" v:layerMember="0" transform="translate(536.501,-144)">
-			<title>Message.22.74</title>
-			<desc>detach VMDK</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="87.7497" cy="731.801" width="54.37" height="17.6036"/>
-			<path d="M0 731.8 L167.02 731.8 L167.02 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="65.4767" y="727.001" width="44.5463" height="9.59985" class="st14"/>
-			<text x="65.48" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>detach VMDK</text>		</g>
-		<g id="group66-219" transform="translate(298,-180)" v:mID="66" v:groupContext="group">
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<title>Optional fragment.75</title>
-			<g id="shape67-220" v:mID="67" v:groupContext="shape" transform="translate(0.00118568,0)">
-				<title>shape75-237</title>
-				<rect x="0" y="493.301" width="189" height="238.5" class="st1"/>
-			</g>
-			<g id="shape68-222" v:mID="68" v:groupContext="shape" transform="translate(0,-203.293)">
-				<title>Sheet.68</title>
-				<desc>layer does not exist</desc>
-				<v:userDefs>
-					<v:ud v:nameU="msvQuickStyleVariationRestore" v:prompt="" v:val="VT0(2):26"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="36.51" cy="722.999" width="73.03" height="17.6036"/>
-				<text x="4" y="725.4" class="st4" v:langID="1033"><v:paragraph/><v:tabList/>layer does not exist</text>			</g>
-			<g id="shape69-224" v:mID="69" v:groupContext="shape" transform="translate(0.00118568,-220.896)">
-				<title>Sheet.69</title>
-				<desc>opt</desc>
-				<v:userDefs>
-					<v:ud v:nameU="FoldSize" v:prompt="" v:val="VT0(0.1):0"/>
-					<v:ud v:nameU="BackFillColor" v:prompt="" v:val="VT5(#96afcf)"/>
-					<v:ud v:nameU="BackLineColor" v:prompt="" v:val="VT5(#1f477d)"/>
-					<v:ud v:nameU="BackCharColor" v:prompt="" v:val="VT5(#000000)"/>
-					<v:ud v:nameU="DarkerColor" v:prompt="" v:val="VT5(#000000)"/>
-				</v:userDefs>
-				<v:textBlock v:margins="rect(4,4,4,4)"/>
-				<v:textRect cx="31.9996" cy="722.999" width="64.01" height="17.6036"/>
-				<path d="M0 731.8 L56.8 731.8 L64 724.6 L64 714.2 L0 714.2 L0 731.8 Z" class="st2"/>
-				<text x="4" y="725.4" class="st3" v:langID="1033"><v:paragraph/><v:tabList/>opt</text>			</g>
-		</g>
-		<g id="shape70-227" v:mID="70" v:groupContext="shape" transform="translate(-447.3,632.801) rotate(-90)">
-			<title>Activation.72</title>
-			<v:userDefs>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<rect x="0" y="722.801" width="450" height="9.00001" class="st15"/>
-		</g>
-		<g id="shape71-229" v:mID="71" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-315)">
-			<title>Self Message.24</title>
-			<desc>cache and/or stream</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="58.4997" cy="713.801" width="77.36" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="24.7325" y="709.001" width="67.5346" height="9.59985" class="st14"/>
-			<text x="24.73" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>cache and/or stream</text>		</g>
-		<g id="shape72-236" v:mID="72" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-369)">
-			<title>Return Message.26.51</title>
-			<desc>blob data</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="51.7497" cy="731.801" width="40.64" height="17.6036"/>
-			<path d="M103.5 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="36.3417" y="727.001" width="30.8161" height="9.59985" class="st14"/>
-			<text x="36.34" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>blob data</text>		</g>
-		<g id="shape73-243" v:mID="73" v:groupContext="shape" v:layerMember="0" transform="translate(284.501,-378)">
-			<title>Message.22.78</title>
-			<desc>get fsLayer</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="51.7497" cy="731.801" width="45.22" height="17.6036"/>
-			<path d="M0 731.8 L95.02 731.8 L95.02 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="34.0547" y="727.001" width="35.3903" height="9.59985" class="st14"/>
-			<text x="34.05" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>get fsLayer</text>		</g>
-		<g id="shape74-250" v:mID="74" v:groupContext="shape" v:layerMember="0" transform="translate(275.501,-108)">
-			<title>Return Message.26.79</title>
-			<desc>handle</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="126" cy="731.801" width="40.01" height="17.6036"/>
-			<path d="M252 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="114.871" y="727.001" width="22.2575" height="9.59985" class="st14"/>
-			<text x="114.87" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>handle</text>		</g>
-		<g id="shape75-257" v:mID="75" v:groupContext="shape" v:layerMember="0" transform="translate(536.501,-108)">
-			<title>Self Message.24.80</title>
-			<desc>store layer metadata</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="40.4997" cy="713.801" width="77.73" height="17.6036"/>
-			<path d="M0 695.8 L18 695.8 L18 731.8 L8.48 731.8 L8.48 731.8" class="st10"/>
-			<rect v:rectContext="textBkgnd" x="6.54886" y="709.001" width="67.9016" height="9.59985" class="st14"/>
-			<text x="6.55" y="716.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>store layer metadata</text>		</g>
-		<g id="shape76-264" v:mID="76" v:groupContext="shape" v:layerMember="0" transform="translate(172.001,-99.0001)">
-			<title>Return Message.26.81</title>
-			<desc>ongoing status update</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="51.7497" cy="731.801" width="82.41" height="17.6036"/>
-			<path d="M103.5 731.8 L0 731.8" class="st16"/>
-			<rect v:rectContext="textBkgnd" x="15.4591" y="727.001" width="72.5812" height="9.59985" class="st14"/>
-			<text x="15.46" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>ongoing status update</text>		</g>
-		<g id="shape77-271" v:mID="77" v:groupContext="shape" v:layerMember="0" transform="translate(46.0004,-99.0001)">
-			<title>Return Message.26.82</title>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(1):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<path d="M121.5 731.8 L0 731.8" class="st16"/>
-		</g>
-		<g id="shape78-276" v:mID="78" v:groupContext="shape" v:layerMember="0" transform="translate(172.001,-621.001)">
-			<title>Message.22.83</title>
-			<desc>possible audit log mapping for all operations over this conne...</desc>
-			<v:userDefs>
-				<v:ud v:nameU="IsReturn" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="IsAsync" v:prompt="" v:val="VT0(0):26"/>
-				<v:ud v:nameU="IsSelfMessage" v:prompt="" v:val="VT0(0):5"/>
-				<v:ud v:nameU="visVersion" v:prompt="" v:val="VT0(15):26"/>
-			</v:userDefs>
-			<v:textBlock v:margins="rect(4,4,4,4)"/>
-			<v:textRect cx="270" cy="731.801" width="222.45" height="17.6036"/>
-			<path d="M0 731.8 L531.52 731.8 L531.52 731.8" class="st17"/>
-			<rect v:rectContext="textBkgnd" x="163.691" y="727.001" width="212.619" height="9.59985" class="st14"/>
-			<text x="163.69" y="734.2" class="st13" v:langID="1033"><v:paragraph v:horizAlign="1"/><v:tabList/>possible audit log mapping for all operations over this connection</text>		</g>
-	</g>
-</svg>
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.png b/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.png
deleted file mode 100644
index 3b4179415d..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.vsdx b/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.vsdx
deleted file mode 100644
index a40335b717..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/images/vic-machine-high-level.vsdx and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/README.md b/installer/vendor/github.com/vmware/vic/doc/design/networking/README.md
deleted file mode 100644
index e5e50b68a2..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/networking/README.md
+++ /dev/null
@@ -1,333 +0,0 @@
-# Networking in vIC
-This document provides a high level overview of how the networking will
-work in vIC for MVP. After reading this document you should have a good
-idea of how different components in vIC are connected to each other,
-and how they use those networks.
-
-<!-- START doctoc generated TOC please keep comment here to allow auto update -->
-<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
-
-
-- [High level overview of networks for MVP](#high-level-overview-of-networks-for-mvp)
-  - [vSphere Management Network](#vsphere-management-network)
-  - [Docker Management Endpoint Network](#docker-management-endpoint-network)
-  - [External Network (ie. route to Internet)](#external-network-ie-route-to-internet)
-  - [Container Bridge Network(s)](#container-bridge-networks)
-- [Docker Networking and the Port Layer](#docker-networking-and-the-port-layer)
-- [Use Cases](#use-cases)
-  - [Container with published port](#container-with-published-port)
-    - [Description](#description)
-    - [User Workflow](#user-workflow)
-    - [Expected Outcome](#expected-outcome)
-  - [Simple bridge network](#simple-bridge-network)
-    - [Description](#description-1)
-    - [User Workflow](#user-workflow-1)
-    - [Expected Outcome](#expected-outcome-1)
-  - [Bridged containers with exposed port](#bridged-containers-with-exposed-port)
-    - [Description](#description-2)
-    - [User Workflow](#user-workflow-2)
-    - [Expected Outcome](#expected-outcome-2)
-  - [Container using external network](#container-using-external-network)
-    - [Description](#description-3)
-    - [User Workflow](#user-workflow-3)
-    - [Expected Outcome](#expected-outcome-3)
-
-<!-- END doctoc generated TOC please keep comment here to allow auto update -->
-
-##  High level overview of networks for MVP
-
-There are four network types connected to a VCH. At VCH creation there
-will be at least one of each network. Additional network configurations
-are explained later in this document.
-
-![Networks connected to VCH](pics/vch-net.png)
-
-### vSphere Management Network  
-
-The VCH will use the vSphere Management Network to communicate with
-vCenter and the hosts as needed. In addition, the tether within the
-containers are expected to use the management network to connect with
-the VCH (using either serial-over-LAN or vSocket, etc).
-
-![VCH to Management Network](pics/vch-management-net.png)
-
-### Docker Management Endpoint Network  
-
-We need to allow customers to isolate the docker endpoint from the
-more public external network. This will basically allow for a
-"management" network for Docker without requiring the Docker clients
-to have access to the vSphere Management network.
-
-![VCH to Docker Management Endpoint Network](pics/vch-docker-net.png)
-
-vIC will support published ports on the default bridged network using
-`run -p` or `run -P` however that solution makes the VCH a single
-point of failure for the external networking of containers. We are introducing the concept of an external network to remove this single
-point and to allow for greater scalability and flexibility in
-*published* services offered by containers.
-
-### External Network (ie. route to Internet)
-
-Typically the interface on the Docker Host is shared by both the
-Docker endpoint and the containers that are publishing ports. In vIC
-we are promoting a more scalable solution where the containers that
-want to publish network services should be configured on a *external*
-network and not use NAT through the VCH.
-
-For the VCH, an external network is connected to the VCH and used
-by the VCH as the default interface for *published* ports of containers
-when those containers are using the *default* bridge network.
-
-In addition, once the external network is defined, containers can
-be deployed directly on the external interface and do not need
-to go through the VCH.
-
-![VCH to External Network](pics/vch-external-net.png)
-
-### Container Bridge Network(s)
-
-The bridge networks allow the containers to talk to each other. In
-addition the bridge network is used when the container is
-configured to expose a port via the VCH. The user can map ports
-on the external network of the VCH to a port on a specific
-container. Therefore the VCH is also on all bridge networks.
-
-![VCH Bridge Network](pics/vch-bridge-net.png)
-
-> Note that vSphere Integrated containers does not support the host
-networking driver for docker. Since each container is running in a
-VM the networking stacks cannot be shared as with host mode networking.
-
-## Docker Networking and the Port Layer
-
-The Port Layer implements network scopes that generally map into the
-networks that show during a `docker network ls`. For MVP, networks
-that are tied into the infrastructure will be configured within vSphere.
-Which of those pre-configured networks are available to a VCH is
-determined by the networks that are part of the VCH provisioning, or
-added via a VCH reconfigure.
-
-##  Use Cases
-
-For our MVP we will start with a few sample use cases that should be
-working and tested. Each use case should work independently as well as
-concurrently.
-
-### Container with published port
-
-#### Description
-Launch a container and expose a port via the VCH using `run -p`.
-Test by connecting to the container via the external mapped
-port on the external interface of the VCH.
-
->**NOTE:** This is used for compatibility with the way that most
-docker containers publish ports. vIC promotes the use of the external
-networks for published ports as a more resilient and scalable solution.
-
-#### User Workflow
-
-    $ docker run -p 8080:80 --name test1 my_container my_app
-
-#### Expected Outcome
-
-Port layer will:
- * connect *test1* to the default bridge network
- * expose port 80 on container *test1*
- * setup NAT mapping port 8080 on the external interface of the VCH
- to port 8080 on the internal bridge interface of *test1*
-
-User expects port 80 on *test1* to be accessible via the
-external network interface on the VCH at port 8080.
-
-### Simple bridge network
-
-#### Description
-Create a new non-default bridge network and setup two containers on the
-network. Ensure those containers can locate and communicate with
-each other.
-
-#### User Workflow
-
-    $ docker network create -d bridge my-bridge-network
-    $ docker network ls
-    ...
-    NETWORK ID          NAME                DRIVER
-    615d565d498c        my-bridge-network   bridge
-    ...
-    $ docker run -d --net=my-bridge-network \
-                    --name=server my_server_image server_app
-    $ docker run -it --name=client --net=my-bridge-network busybox
-    / # ping server
-    PING server (172.18.0.2): 56 data bytes
-    64 bytes from 172.18.0.2: seq=0 ttl=64 time=0.073 ms
-    64 bytes from 172.18.0.2: seq=1 ttl=64 time=0.092 ms
-    64 bytes from 172.18.0.2: seq=2 ttl=64 time=0.088 ms
-
-#### Expected Outcome
-Port layer will:
- * Allocate(\*) a new bridge network for `network create` command
- * Provide IP and name services to the containers created/attached
- to that network
-
-User expects server and client can ping each other by name.
-
-(\*) *Note that for MVP the bridge networks may all reside on a single
-port group and only be separated by IP space. This will be addressed
-post MVP with NSX integration.*
-
-
-### Bridged containers with exposed port
-
-#### Description
-
-Combine the two examples above. Connect two containers on a
-bridge network and setup one of the containers to publish
-a port via the VCH.
-
-#### User Workflow
-
-We're going to assume server_app binds to port 5000.
-
-    $ docker network create -d bridge my-bridge-network
-    $ docker network ls
-    ...
-    NETWORK ID          NAME                DRIVER
-    615d565d498c        my-bridge-network   bridge
-    ...
-    $ docker run -d -p 5000:5000 --net=my-bridge-network \
-                    --name=server my_server_image server_app
-    $ docker run -it --name=client --net=my-bridge-network busybox
-    / # ping -c 3 server
-    PING server (172.18.0.2): 56 data bytes
-    64 bytes from 172.18.0.2: seq=0 ttl=64 time=0.073 ms
-    64 bytes from 172.18.0.2: seq=1 ttl=64 time=0.092 ms
-    64 bytes from 172.18.0.2: seq=2 ttl=64 time=0.088 ms
-    / # telnet server 5000
-    GET /
-
-    Hello world!Connection closed by foreign host
-    $ telnet vch_external_interface 5000
-    Trying 192.168.218.137...
-    Connected to 192.168.218.137.
-    Escape character is '^]'.
-    GET /
-
-    Hello world!Connection closed by foreign host.
-
-#### Expected Outcome
-Port layer will:
- * Allocate(\*) a new bridge network for `network create` command
- * Provide IP and name services to the containers created/attached
- to that network
- * setup NAT mapping port 5000 on the external interface of the VCH
- to port 5000 on the *my-bridge-network* interface of *server*
-
-User expects:
- * *server* and *client* can ping each other by name.
- * can connect to *server* on port 5000 from *client* container
-  and by connecting to port 5000 on the VCH external interface.
-
-
-### Container using external network
-
-> **NOTE:** For MVP all the "external" networks will be configured
-on the vSphere side and associated with a VCH at VCH creation time
-or during a VCH reconfigure. Port Layer/Docker endpoint self service
-for external networks is a post-MVP feature.
-
-#### Description
-In this use case we assume a couple external networks have been setup
-on the vSphere side.
-
-`default-external` is `10.2.0.0/16` and has a gateway @ `10.2.0.1`  
-`vic-production` is `208.91.3.0/24` and has a gateway @ `208.91.3.1`  
-
-The VCH is attached to the *default-external* network at 208.91.3.2.
-
-Therefore `docker network ls` shows the following:
-
-    $ docker network ls
-    NETWORK ID          NAME                DRIVER
-    e2113b821ead        none                null
-    37470ed9992f        default-external    bridge
-    ea96a6b919de        vic-production      bridge
-    b7e91524f3e2        bridge              bridge  
-
-The user has a container providing a web service that they want to
-expose outside of the vIC environment.
-
-#### User Workflow
-For MVP, the networks have been setup and added to the VCH during
-VCH creation or reconfigure.
-
-The output of `docker network inspect default-external` is:
-
-    [
-        {
-            "Name": "default-external",
-            "Id": "37470ed9992f6ab922e155d8e902ca03710574d96ffbfde1b3faf541de2a701f",
-            "Scope": "external",
-            "Driver": "bridge",
-            "IPAM": {
-                "Driver": "default",
-                "Options": {},
-                "Config": [
-                    {
-                        "Subnet": "10.2.0.0/16",
-                        "Gateway": "10.2.0.1"
-                    }
-                ]
-            },
-            "Containers": {},
-            "Options": {}
-        }
-    ]
-
-And the output of `docker network inspect vic-production` is:
-
-    [
-        {
-            "Name": "vic-production",
-            "Id": "ea96a6b919de4ca2bd627bfdf0683ca04e5a2c3360968d3c6445cb18fab6d210",
-            "Scope": "external",
-            "Driver": "bridge",
-            "IPAM": {
-                "Driver": "default",
-                "Options": {},
-                "Config": [
-                    {
-                        "Subnet": "208.91.3.0/24",
-                        "Gateway": "208.91.3.1"
-                    }
-                ]
-            },
-            "Containers": {},
-            "Options": {}
-        }
-    ]
-
-The user would do the following to setup a server on the
-vic-production network.
-
-    $ docker run -d --expose=80 --net=vic-production --name server my_webapp
-    $ docker inspect --format='{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' server
-    208.91.3.2
-    $ telnet 208.91.3.2 80
-    Trying 208.91.3.2...
-    Connected to 208.91.3.2.
-    Escape character is '^]'.
-    GET /
-
-    Hello world!Connection closed by foreign host.
-
->**NOTE:** The user could also just use -p 80 or -p 80:80 instead of
---expose=80. Trying to map to different ports with -p will result in a
-configuration error.
-
-#### Expected Outcome
-
-The Port Layer will add the container *server* to the
-*vic-production* network.  
-
-The user expects the *server* container to have it's port exposed on
-the external network *vic-production*.
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-bridge-net.png b/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-bridge-net.png
deleted file mode 100644
index ba0e199f3b..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-bridge-net.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-docker-net.png b/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-docker-net.png
deleted file mode 100644
index 6d0f18d6c8..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-docker-net.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-external-net.png b/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-external-net.png
deleted file mode 100644
index 59bddba376..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-external-net.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-management-net.png b/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-management-net.png
deleted file mode 100644
index 8e454cf50b..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-management-net.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-net.png b/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-net.png
deleted file mode 100644
index 3d13381dd4..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/doc/design/networking/pics/vch-net.png and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/registries/whitelist-registry.md b/installer/vendor/github.com/vmware/vic/doc/design/registries/whitelist-registry.md
deleted file mode 100644
index 1e5f1b12fa..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/registries/whitelist-registry.md
+++ /dev/null
@@ -1,159 +0,0 @@
-# Whitelist Registries
-
-vSphere Integrated Containers 1.2 (VIC) added the ability to whitelist registry access in an installed VCH.  When one or more registries are whitelisted for the VCH at install time the VCH goes into 'whitelist mode'.  From this point on, the VCH will only allow access to registries in its list of whitelisted registries.  In this mode, users will not be able to access any non-whitelisted registries, public or private.
-
-## Specifying Whitelist Registries at Installation
-
-Whitelisted registries can be declared during a VCH installation with *vic-machine* parameter, `--whitelist-registry`.  Two other vic-machine parameters affect whitelist registries, `--registry-ca` and `--insecure-registry`.  When whitelisted registries are declared during installation, the latter two parameters acts as modifiers to the whitelisted registries.
-
-Registry-ca declares additional certificates to verify access to registry servers secured with TLS.  If a registry is declared as a whitelist registry and not an insecure registry (discussed below), the VCH must have access to the server certificate to verify access.  The Photon-based VM that VIC uses has a base set of well-known certificates from public CAs.  If a whitelist registry uses a certificate that is not in that set of well-known certificates, the certificate must be uploaded to the VCH via vic-machine's `--registry-ca` parameter.
-
-Insecure-registry declares a registry server that can be used without requiring TLS certificate verification.  This modifies the whitelist label and takes precedence.  For instance, if a registry is declared with `--whitelist-registry` and with `--insecure-registry`, the VCH will assume the registry is an insecure whitelisted registry.  If the registry is listed with only `--whitelist-registry`, then the VCH will attempt to verify access using certificates.
-
-If a registry is declared with `--insecure-registry` but not with `--whitelist-registry`, vic-machine will add the insecure registries to the list of whitelist registries *IF* at least one whitelist registry was declared.
-
-A note about certificates.  During installation, vic-machine will attempt to verify the registry server is actually a valid registry server.  It will also attempt to validate that the certificates declared in `--registry-ca` are valid for the secure whitelisted registries.  Vic-machine only performs best effort validation of registry servers.  It will not remove the server's access from the VCH if it cannot validate the server.
-
-Acceptable values for whitelist registry values are numbered IP, FQDN, CIDR formatted range, and wildcard domains.  If a CIDR format is used, e.g. 192.168.1.1/24, then the VCH will whitelist any IP address within that subnet.  Vic-machine will not try to validate CIDR defined ranges.  If a wildcard domain is provided, e.g. *.company.com, the VCH will whitelist any IP address or FQDN address that it can validate against the domain provided during installation.  A numeric IP address will cause the VCH to perform a reverse DNS lookup to validate against that wild card domain.  As with CIDR values, vic-machine will not attempt to validate wildcard domains during installation.  Examples are provided below.
-
-The parameter `--whitelist-registry` creates a list of registries.  If multiple whitelist registries need to be declared, repeat `--whitelist-registry` multiple times during installation for each registry.
-
-### Example: vch installation with vic-machine
-
-This example installs 2 whitelist registries and 1 insecure registry.
-
-```
-./vic-machine-linux create --target=10.2.2.5 --image-store=datastore1 --name=vic-docker --user=root --password=xxxxx --compute-resource="/ha-datacenter/host/office2-sfo2-dhcp121.mycompany.com/Resources" --bridge-network=vic-network --debug=0 --volume-store=datastore1/test:default --tls-cname=*.mycompany.com --whitelist-registry="10.2.40.40:443" --whitelist-registry=10.2.2.1/24 --whitelist-registry=*.mycompany.com --insecure-registry=192.168.100.207  --registry-ca=/home/admin/mycerts/ca.crt
-```
-
-### Example: vic-machine's output during installation
-
-Below is a snippet from the vic-machine output for the above command.
-
-```
-May 15 2017 16:36:12.453-07:00 WARN  Unable to confirm insecure registry 192.168.100.207 is a valid registry at this time.
-May 15 2017 16:36:12.505-07:00 INFO  Insecure registries = 192.168.100.207
-May 15 2017 16:36:12.505-07:00 INFO  Whitelist registries = 10.2.40.40:443, 10.2.2.1/24, *.mycompany.com, 192.168.100.207
-```
-
-Had the above command also included --debug=1 (or higher), the following would be the output
-
-```
-May 15 2017 16:36:12.453-07:00 WARN  Unable to confirm insecure registry 192.168.100.207 is a valid registry at this time.
-May 15 2017 16:36:12.505-07:00 DEBUG  Secure registry 10.2.40.40:443 confirmed.
-May 15 2017 16:36:12.505-07:00 DEBUG  Skipping registry validation for 10.2.2.1/24
-May 15 2017 16:36:12.505-07:00 DEBUG Skipping registry validation for *.eng.vmware.com
-May 15 2017 16:36:12.505-07:00 INFO  Insecure registries = 192.168.100.207
-May 15 2017 16:36:12.505-07:00 INFO  Whitelist registries = 10.2.40.40:443, 10.2.2.1/24, *.mycompany.com, 192.168.100.207
-```
-
-There are a few things to note from this snippet.
-
-1. The confirmation of the insecure registry was not attempted.
-2. The whitelist registry that is secured was confirmed.
-3. Both CIDR and wildcard domain declared as whitelist were skipped during validation.
-4. The final whitelist registry list contains all registries declared with both --whitelist-registry and --insecure-registry.
-5. While not stated yet, the IP address above that contained :443 will not prevent users to use just the server address during docker commands.  This will be discussed below.
-
-## Using Docker Commands Against a VCH in 'Whitelist mode'
-
-VIC currently supports Docker commands that are most applicable for production deployment of containers.  The commands that are affected by whitelist mode are docker info, docker login, and docker pull.  Below are examples of docker commands issued for the VCH installed with the command above.  Let's assume vic-machine properly installs a VCH with the above command and it reports the VCH has an FQDN of myvch.mycompany.com.
-
-### Example: docker -H myvch.mycompany.com info
-
-```
-devbox:~/$ docker -H myvch.mycompany.com:2376 --tlsverify --tlscacert="vic-docker/ca.pem" --tlscert="vic-docker/cert.pem" --tlskey="vic-docker/key.pem" info
-
-Containers: 0
- Running: 0
- Paused: 0
- Stopped: 0
-Images: 0
-Server Version: v1.1.0-rc3-0-c913391
-Storage Driver: vSphere Integrated Containers v1.1.0-rc3-0-c913391 Backend Engine
-VolumeStores: default
-vSphere Integrated Containers v1.1.0-rc3-0-c913391 Backend Engine: RUNNING
- VCH CPU limit: 10414 MHz
- VCH memory limit: 58.61 GiB
- VCH CPU usage: 3103 MHz
- VCH memory usage: 56.03 GiB
- VMware Product: VMware ESXi
- VMware OS: vmnix-x86
- VMware OS version: 6.0.0
- Insecure Registries: 192.168.100.207
- Registry Whitelist Mode: enabled
- Whitelisted Registries: 10.2.40.40:443, 10.2.2.1/24, *.mycompany.com, 192.168.100.207
-Plugins: 
- Volume: vsphere
- Network: bridge
-Swarm: inactive
-Operating System: vmnix-x86
-OSType: vmnix-x86
-Architecture: x86_64
-CPUs: 10414
-Total Memory: 58.61 GiB
-ID: vSphere Integrated Containers
-Docker Root Dir: 
-Debug Mode (client): false
-Debug Mode (server): false
-Registry: registry-1.docker.io
-Experimental: false
-Live Restore Enabled: false
-```
-
-There are a few things to note in the output of this docker info call.
-
-1. Insecure Registry and whitelist registry lists are shown.
-2. There is a message, 'Registry Whitelist Mode: enabled'.  If no whitelist registries are declared during installation, this message will not be shown.
-3. 'Registry: registry-1.docker.io' is displayed even though that address was not whitelisted.  This is the address for docker hub.  It does not mean docker hub is accessible (shown in example below).  It is simply the default registry that is attempted when attempting to login or pull without a registry address.
-
-### Example: docker -H myvch.mycompany.com login 10.2.40.40
-
-```
-devbox:~/$ docker -H myvch.mycompany.com:2376 --tlsverify --tlscacert="vic-docker/ca.pem" --tlscert="vic-docker/cert.pem" --tlskey="vic-docker/key.pem" login 10.2.40.40
-
-Username: 
-Password: 
-Login Succeeded
-```
-
-In this example, a command was issued to log onto a registry that was declared during installation.  Note, :443 was included during installation but left off during docker login.  The VCH will accept either form of the address.
-
-### Example: docker -H myvch.mycompany.com login
-
-```
-devbox:~/$ docker -H myvch.mycompany.com:2376 --tlsverify --tlscacert="vic-docker/ca.pem" --tlscert="vic-docker/cert.pem" --tlskey="vic-docker/key.pem" login
-
-Login with your Docker ID to push and pull images from Docker Hub. If you don't have a Docker ID, head over to https://hub.docker.com to create one.
-Username: user
-Password: 
-Error response from daemon: Access denied to unauthorized registry (registry-1.docker.io) while VCH is in whitelist mode
-```
-
-Notice when the registry address is left off, it attempts to access docker hub (which was indicated in the docker info output above), but the VCH denies access.
-
-### Example: docker -H myvch.mycompany.com pull 10.2.40.40/test/busybox
-
-```
-devbox:~/$ docker -H myvch.mycompany.com:2376 --tlsverify --tlscacert="vic-docker/ca.pem" --tlscert="vic-docker/cert.pem" --tlskey="vic-docker/key.pem" pull 10.2.40.40/test/busybox
-
-Using default tag: latest
-Pulling from test/busybox
-c05511d7505a: Pull complete 
-a3ed95caeb02: Pull complete 
-Digest: sha256:85f3a6aadbb0f25e148d9cfbcf23fbb206f7e6159ea168c33ac51e76fdff4b8e
-Status: Downloaded newer image for test/busybox:latest
-```
-
-This succeeds as it should.
-
-### Example: docker pull busybox
-
-```
-devbox:~/$ docker -H myvch.mycompany.com:2376 --tlsverify --tlscacert="vic-docker/ca.pem" --tlscert="vic-docker/cert.pem" --tlskey="vic-docker/key.pem" pull busybox
-
-Using default tag: latest
-Access denied to unauthorized registry (docker.io) while VCH is in whitelist mode
-```
-
-An attempt to pull from docker hub fails with a message that access was denied while the VCH is in whitelist mode.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/serial_communication_comparing_solutions.md b/installer/vendor/github.com/vmware/vic/doc/design/serial_communication_comparing_solutions.md
deleted file mode 100644
index 426f41bb4a..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/serial_communication_comparing_solutions.md
+++ /dev/null
@@ -1,54 +0,0 @@
-# Comparison between vSPC and CAF for serial communication
-This document provides a comparison between two options that were considered to handle vMotion during an active connection between a user and a containerVM's serial port. The two options investigated are:
-- Virtual Serial Port Concentrator
-- Common Agent Framework
-
-In the first section, a very brief description of both solutions is provided. In the second section, a comparison between the capabilities of the two solutions is discussed. Finally, a solution is proposed with detailed action items.
-
-# First: Introduction
-### Virtual Serial Port Concentrator (vSPC)
-vSPC is a telnet server proxy that aggregates and multiplexes serial port communication from multiple VMs to a remote system. vSPC allows vMotion to continue even if there exists an active connection between a remote system and the serial port of a VM.
-
-For vSPC to work, the telnet server proxy must support the following:
-
-1. VMware's telnet exetension commands
-2. Handle extension commands for vMotion notification
-3. forward connections to a remote system
-
-A more in-depth description of this solution is very well documented in https://www.vmware.com/support/developer/vc-sdk/visdk41pubs/vsp41_usingproxy_virtual_serial_ports.pdf
-
-### Common Agent Framework (CAF)
-Multiple VMware's management solutions (e.d Loginsight) require the installation of guest agents. Even though multiple agents have common functionalities, this commonality is not efficiently utilized.  
-
-CAF attempts to solve many of these problems by providing a common framework that simplifies standard deployment/upgrade mechanism, common scalable communication layers, common in-guest authorization, common provider frameworks, common data representation(s), etc.
-
-CAF provides a secure, scalable, high-bandwidth message bus that is currently implemented via a message broker proxy that talks to a rabbitmq node (or cluster)
-
-Serial communication from containerVMs to the VIC appliance can leverage the CAF to provide a high-bandwidth and secure communication channel.
-
-# Second: Comparison
-Comparison Metric | vSPC | CAF
-------------------|------|------
-Ease of implementation/integration|relatively easy|more challenging<sup>1</sup>
-Communication Bandwidth|relatively small|relatively large
-Connection Persistence during vMotion|Supported|Supported
-No ESX host agent| Not required | Not required<sup>2</sup>
-No Network stack required for containerVMs|None required|None required<sup>3</sup>
-
-<sup>1</sup>CAF will require a lot of across-team communication and a major code refactoring
-
-<sup>2</sup>Even though, AFAIK, there is no ESX host agent requirement, there is an extra overhead associated with refactoring the code to utilize the CAF API. Furthermore, the `rabbitmqproxy` in the ESX host should be configured to be able to communicate with the broker
-
-<sup>3</sup>The Rabbitmq node (or cluster) has to be connected to the management network
-
-# Third: Proposal
-Based on the priority criteria put forward in issue #3937, vSPC seems to be the right way to go because of its ease of implememntation/integration with VIC's code base. The only significant difference between using CAF and vSPC is the high-bandwidth communication we are projected to get should we use CAF. Until performance becomes an issue, vSPC seems to be a very good candidate.
-Adopting the vSPC solution will require the following:
-
-1. Implementing an extensible telnet server
-2. Implementing a vSPC
-3. integrating the vSPC with VIC
-
-Step 1 is required because, AFAIK, the current go telnet implementations do not support extending the telnet commands which is a requirement on our end. The output of this step will be a stand-alone library
-
-Step 2 is required because, AFAIK, the only vSPC implementation I have seen is written in python. The output of this step will be a stand-alone binary
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/telemetry/README.md b/installer/vendor/github.com/vmware/vic/doc/design/telemetry/README.md
deleted file mode 100644
index 13ed556508..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/telemetry/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-# Telemetry Support
-
-This is the design proposal for vSphere Integrated Containers Engine's initial integration with Vmware Analytics Cloud  (VAC for short).  This data provides Vmware with usage metrics.  Currently, vSphere Integrated Containers Engine will piggyback on one of the data field that vSphere 6 and 6.5 are already collecting, specifically the OS full name used in the VM.  By providing a custom OS name for both the VCH and container VM, Vmware can determine the install base of VIC, the distribution of version installed, and the number of container VM used in a VCH.
-
-## Design
-
-vSphere Integrated Containers Engine will update the name of the guest full name during VM creation time.  The vSphere SDK allows providing a custom text for the guest OS name if guest id is either otherGuest or otherGuest64 and alternate guest name has a value.  Vmware Analytics Cloud collects customer opted-in metrics (via CEIP) and will use the custom guest name to differentiate between regular VMs and vSphere Integrated Containers Engine's VMs.
-
-For these values to get updated, vic-machine will populate the two fields described above in the VM config spec during creation of the VCH.  During container create, the portlayer will get the default linux VM spec from vic/lib/guest/linux.go with those two fields populated.  Future OS or variants of container VM's linux OS can add default VM spec go files (e.g. vic/lib/guest/redhat.go).  The following is the proposed VCH's and container VM's OS names:
-
-| VM Type | OS Full Name |
-| --- | --- |
-| VCH | Photon - VCH v.v.v, b, c |
-| container VM | Photon - Container v.v.v, b, c |
-| container VM | Redhat - Container v.v.v, b, c |
-| container VM | Windows - Container v.v.v, b, c |
-
-In the above, v.v.v represents the actual version of vSphere Integrated Containers Engine, b represents build number, and c is the first 7 digit of the git commit sha for the source code.  Note, VIC currently supports a custom Photon OS kernel as the OS for both the VCH and container VM.  The proposed naming scheme above will allow the engine to accommodate other OSes as well as other Linux variants.
-
-## Initial Metrics
-
-Here are all the metrics that will be collected specifically for VIC Product (includes VIC Engine, Harbor, and Admiral):
-
-| Metric | Available with Guest OS Name? | Note |
-| --- | --- | --- |
-| 1. Number of ESX hosts in the cluster | Y | |
-| 2. Version number of ESX hosts | Y | |
-| 3. Version number of VC hosts | Y | |
-| 4. Presence of Harbor or Admiral with version number | N | Harbor and Admiral projects will handle this |
-| 5. Total number of VMs | Y | |
-| 6. Total number of VCHs | Y | |
-| 7. Total number of container VMs | Y | |
-| 8. Number of VCHs per host | Y | |
-| 9. Number of container VMs per VCH | Y | |
-| 10. Average lifetime of the Container VMS | Y | Will require a join of the VM and VC events tables |
-
-## Testing and Acceptance Criteria
-
-For metrics 1-9 (minus #4):
-
-1. Robot scripts will be written to use govc to query the VCH's and a created container's guest name.
-2. A sanity check will also be performed by checking whether the VCH and container VM can be differentiated on the Vmware Analytics Cloud query page.  This will be manual test only as the query cannot be performed outside of Vmware's firewall.
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/test/kubernetes.md b/installer/vendor/github.com/vmware/vic/doc/design/test/kubernetes.md
deleted file mode 100644
index 016a428c4c..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/test/kubernetes.md
+++ /dev/null
@@ -1,56 +0,0 @@
-# Kubernetes initial testing notes
-## Required HW setup:
- - Ubuntu 16.04
- - 4 CPU
- - 16GB memory
- - 80GB disk 
- - (might need 8CPU/32GB of memory, as the above recommended was quite slow still)
-
-## Initial install:
-  - `sudo apt-get update`
-  - `sudo apt-add-repository ppa:juju/stable`
-  - `sudo apt-add-repository ppa:conjure-up/next`
-  - `sudo apt update`
-  - `sudo apt install conjure-up`
-
-## Configure container hypervisor:
-  - `newgrp lxd`
-  - `sudo lxd init`
-
-Walkthrough the config (just hit enter) - select NO when asked to setup IPv6
-
-## Point juju at the new hypervisor:
-  - `juju bootstrap localhost lxd-test`
-
-## Start the k8s cluster:
-  - `conjure-up canonical-kubernetes`
-
-Just hit enter a few times until you get to the summary and hit Q
-
-  - `watch -c juju status --color`
-
-Wait for quite a while until the cluster is completely up/active/idle.  Can take upwards of an hour!
-
-## Finalize setup:
-  - `mkdir -p ~/.kube`
-  - `juju scp kubernetes-master/0:config ~/.kube/config`
-  - `juju scp kubernetes-master/0:kubectl ~/bin/kubectl`
-
-## Verify it is working and the cluster is up:
-  - `kubectl cluster-info`
-
-## Example commands:
-  - `kubectl run -i -t busybox --image=busybox --restart=Never`
-  - `kubectl run nginx --image=nginx`
-
-### Show the running pods:
-  - `kubectl get pods`
-
-### To scale up the cluster:
-  - `juju add-unit kubernetes-worker`
-
-### To show the controller:
-  - `juju switch`
-
-### To destroy the cluster:
-  - `juju destroy-controller lxd-test --destroy-all-models`
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/test/nsx.md b/installer/vendor/github.com/vmware/vic/doc/design/test/nsx.md
deleted file mode 100644
index 3759ff6a6f..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/test/nsx.md
+++ /dev/null
@@ -1,47 +0,0 @@
-## NSX Initial testing notes
-
-##Required HW setup:
-- vSphere 6.0/6.5 Cluster setup (6.5 wan't supported for a while, but the latest releases supports it)
-- An ESX host in the cluster with a minimum of 4 CPU to host the NSX Manager Appliance
-
-##Initial install:
-
-###Deploy a Nimbus Cluster using 5-2-Cluster test.
-
-###Add a beefy ESXi to the cluster to host the NSX appliance.
-
-- `nimbus-esxdeploy --disk=40000000 --nics=2 --memory=90000 --cpus=4 nsx-esx 3620759`
-
-###Update host password for the ESXi:
-
-- `export GOVC_URL=root:@10.x.x.x` 
-
-- `govc host.account.update -id root -password xxxxxx` 
-
-###Add host to the VC Cluster:
-
-- `export GOVC_URL="Administrator@vSphere.local":password@10.x.x.x`
-
-- `govc cluster.add -hostname=10.x.x.x -username=root -dc=ha-datacenter -password=xxxx -noverify=true`
-
-###Install the NSX manager using OVFTool.
-
-- `ovftool nsx-manager-1.1.0.0.0.4788147.ova nsx-manager-1.1.0.0.0.4788147.ovf`
-
-- `ovftool --datastore=${datastore} --name=${name} --net:"Network 1"="${network}" --diskMode=thin --powerOn --X:waitForIp --X:injectOvfEnv --X:enableHiddenProperties --prop:vami.domain.NSX=mgmt.local --prop:vami.searchpath.NSX=mgmt.local --prop:vami.DNS.NSX=8.8.8.8 --prop:vm.vmname=NSX nsx-manager-1.1.0.0.0.4788147.ovf 'vi://${user}:${password}@${host}`
-
-###Add ESX nodes into the NSX Manager using the NSX REST API. 
-
-- `FABRIC->Nodes using ESXi credentials: root/password`
-
-###Create the Transport Zone using the NSX REST api
-
-###Create a logical Switch with the VLAN based Transport Zone
-
-###Add the Logical Switch as a Transport node to the ESXi host
-
-###Check if the switch is visible from running govc command (Upgrade to the latest govc 0.12.0 to get this working)
-- `govc ls network`
-
-###Install VIC Appliance and Run Regression tests
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/tether.md b/installer/vendor/github.com/vmware/vic/doc/design/tether.md
deleted file mode 100644
index c1b7ec2569..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/tether.md
+++ /dev/null
@@ -1,64 +0,0 @@
-# Tether
-
-The tether provides two distinct sets of function:
-
-1. the channel necessary to present the process input/output as if it were bound directly to the users local console.
-2. configuration of the operating system - where regular docker can manipulate elements such as network interfaces directly, or use bind mounting of files to inject data and configuration into a container, this approach is not available when the container is running as an isolated VM; the tether has to take on all responsibility for correct configuration of the underlying OS before launching the container process.
-
-## Operating System configuration
-
-### Hostname
-
-### Name resolution
-
-### Filesystem mounts
-
-### Network interfaces
-
-
-## Management behaviours
-This is a somewhat arbitrary divide, but these are essentially ongoing concerns rather than one-offs on initial start of the containerVM
-
-### Hotplug
-It's not yet determined whether the containerVM bootstrap images will include udevd, systemd, or if tether will take on that responsibility directly; this could be use of libudev or direct handling of netlink messages given the very limited scope of hotplug devices we need support for (CPU, memory, scsi disks, NICs).
-
-### Signal handling
-
-### Process reaping
-Tether runs as pid1 when in a containerVM and has to discharge the associated responsibilities. This primarily means reaping orphaned children so that the process list does not get cluttered with zombies. On a more prosaic note, it's been observed that a connection to a bash container will not exit fully after typing `exit` if reaping isn't performed.
-
-### Secrets
-
-### Forking
-This relates specifically to VMfork, aka _Instant Clone_ - the ability to freeze a VM and spin off arbitrary numbers of children that inherit that parent VMs memory state and configuration. This requires cooperation between ESX, GuestOS, and the application processes, to handle changes to configuration such as time, MAC and IP addresses, ARP caches, open network connections, etc.
-More directly, VMfork requires that the fork be triggered from within the GuestOS as a means of ensuring it is in a suitable state, meaning the tether has to handle triggering of forking and recovery post-fork
-
-
-## External communication
-The vast bulk of container operations can be performed without a synchronous connection to containerVM, however `attach` is a core element of the docker command set and the one that is probably most heavily used outside of production deployment. This requires that we be able to present the user with a console for the container process.
-
-The initial communication will be via plain network serial port, configured in client mode:
-
-Overall flow:
-
-1. ContainerVM powered on
-2. ContainerVM configured so com1 is a client network serial port targeting the appliance VM
-2. ESX initiates a serial-over-TCP connection to the applianceVM - this link is treated as a reliable bytestream
-3. ApplianceVM accepts the connection
-4. ApplianceVM acts as an SSH client over the new socket - authentication is negligible for now
-5. ApplianceVM uses a custom global request type to retrieve list of containers running in containerVM (exec presents as a separate container); containerVM replies with list
-6. ApplianceVM opens a channel, requesting a specific container; containerVM acknowledges and copies I/O between process and channel
-
-
-From the Personality to the Portlayer:
-* request for container X from Personality to Interaction component - X is a container handle
-* Interaction configures containerVM network serial port to point at it's IP and connects the serial port
-* Interaction blocks waiting for SSH session with X, record request in connection map
-* Interaction starts stream copying from HTTP websocket to SSH channel
-
-Incoming TCP connection to Interaction component:
-* request set of IDs on the executor - (5) in overall flow
-* create entries for each of the IDs in connection map
-* if there is a recorded request for channel to a container X
-  * establish attach channel
-  * notify waiters for X
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/configure.md b/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/configure.md
deleted file mode 100644
index c31dbe9a22..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/configure.md
+++ /dev/null
@@ -1,193 +0,0 @@
-# VCH Configure (P0)
-This document defines the VCH configure command line, and the related changes in vic-machine, to make VCH configure process more reasonable.
-
-Here are the key points considerred in this Definition:
-- Batch Operation
-
-  We'd like to change VCH configurations more than one item at one time to make the command easy to use
-- Reuse all options used in vic-machine create
-
-  In vic-machine create, we already have 57 options to define VCH configurations, though not all of them can be updated, many of them should be able to be changed, and this number will grow over time, so we definitely do not want to introduce 3X that number of options to configure (configure means add/modify/remove)
-
-## Options
-First option is to configure all in one command
-
-### Implicit Add/Modify and Explicit Delete
-All existing vic-machine create options are supported in vic-machine configure command. The meaning of those options are as following:
-- anything not specified means no change
-- any option specified in configure command means replacement.
-  - if the old value is not specified during creation, this new value will be added
-  - if there is old value specified, no matter it's a list value or not, we'll replace the old value with the new one specified in configure command.
-
-    here are the possibilities to change list option ```--registry-ca```, if the create command option is ```--registry-ca ca1 --registry-ca ca2```
-	* ```--registry-ca ca2 --registry-ca ca3```, means new configuration will be [ca2, ca3], ca1 is deleted, and ca3 is added
-	* ```--registry-ca ca2```, means new configuration will be [ca2], ca1 is deleted
-	* ```--registry-ca ""```, means ca1 and ca2 are all deleted // Here the empty string value is required, and the representation in different os platform is different.
-	* nothing specified for registry-ca, then existing [ca1, ca2] is not changed
-
-The benefit of this option is it can update all things in one command, and no new option introduced. User can use exactly same command option in both vic-machine create and vic-machine configure.
-
-### Separate Configure to Sub Commands
-The idea of this option is to update a few configuration each time, which is one delta update option. For example, to update volume-store, we can use following command
-```
-vic-machine configure volume-store --rm ds://datastore/volume:default
-vic-machine configure volume-store --add nfs://host:port/container:nfs
-```
-
-The command format is like ```vic-machine configure <configure object> --<configure keyword> --<configure option> <configuration value>```
-
-Pros:
-- The whole configuration options are split to many sub commands. Then in each sub command, only a small number of options are available, and that does not increase over time. Only the sub command number will increase.
-- Consistent with existing update firewall command format (though the command name might be different)
-
-Cons:
-- We'll need to reinvent option names
-
-  For example, to update client network, user need to specify all options if they want to use static ip. Then in one update command, we'll need all those options. Here is the command looks like ```vic-machine configure bridge-network --port-group value --gateway value --ip value```
-  The existing option name in vic-machine create is ```--client-network value   --client-network-gateway value  --client-network-ip value```, we'll need to remove the prefix cause that is already shown as sub-command name.
-
-Decision: We'll go with the first option
-
-## Show Existing VCH configuration
-Right now, there is no user friendly way to view all configurations of existing VCH. To support update operation, we need to make it easier, otherwise, update only makes things weird.
-
-vic-machine inspect command is available now, just it shows only the execution endpoint of VCH, instead of the configuration. We can extend that command, to support configuration inspection as well.
-
-- vic-machine inspect <--configuration, --conf>
-  show VCH configuration only
-- vic-machine inspect <--execution, -e>
-  show VCH execution endpoint (default behavior)
-
-### Configuration Inspection
-For configuration inspection, two output format should be supported
-
-- yml format
-
-  This should print out all VCH configuration with predefined categories, e.g. general information, storage, network, etc. in user friendly format. Secret information will be hidden or skipped.
-
-Following is sample format:
-
-```
-General:
-	Target: "vc.domain.com"
-	Thumbprint: "98:97:D1:7B:DF:..."
-	OpsUser: "Operator"
-	Name: "VCH-1"
-	Proxies: 
-		- "https://host:port"
-		- "http://host:port"
-Compute:
-	Path: " myCluster/Resources/myRP"
-	CpuLimit: 0 MHz
-	MemoryLimit: 0 MHZ
-Storage:
-	ImageStore: "datastore"
-	VolumeStore:
-		- "ds://datastore/volumes/default": "default"
-		- "nfs://userid@host:port/volumes/": "nfs"
-Networks:
-	BridgeNetwork:
-		PortGroup: "bridge"
-		IpRange: "172.16.0.0/12"
-	ClientNetwork:
-		PortGroup: "client"
-		Gateway: "10.1.0.0/16,10.2.0.0/16:10.0.0.1"
-		...
-	DNSServer:
-		- "8.8.8.8"
-		- "8.8.4.4"
-Certificate:
-	...
-Registries:
-	InsecureRegistries:
-		- "..."
-	RegistryCA:
-		- "ca file"
-Endpoint:
-	Cpu: 1
-	Memory: 2048 MHZ
-	Debug: 3
-```
-
-- Command Option Format
-
-  The yml format output is more readable for VIC admin, but if users want to recreate their vic-machine create or configure command, it's hard to do based on that format, because there is no one on one mapping between the configuration and command options. 
-
-  Here we'd support another option as "vic-machine inspect --conf", this will print out the vic-machine create command options minus secret information. 
-
-  The sample output:
-```
---target                vc.domain.com
---name                  VCH-1
---compute-resource      /vcqaDC/host/cls/Resources
---ops-user              operator
---image-store           datastore1
---volume-store          ds://datastore/volumes/default:default
---volume-store          nfs://userid@host:port/volumes/:nfs
---bridge-network        bridge
---bridge-network-range  172.16.0.0/12
-...
-```
-
-Based on this output, it's easy to modify existing configuration to configure command options
-
-Note: Special character might be escaped based on current OS platform. But even with this, the command options cannot be copied to other platform.
-
-- Subcommand Inspect (corresponding to configure subcommand option)
-  The configure subcommand option might change command option based on each different sub command requirement, to get current configuration, we'll need to have command inspect for each subcommand. So the option is to extend vic-machine inspect command to include sub command as well.
-  For example, ```vic-machine inspect bridge-network``` will print out current configuration in the command format, to make sure user can easily generate their configure command based on that.
-
-Note: this is not needed atm, because we're not doing sub configure command
-
-## Update In Progress Status
-Same to vic-machine upgrade, concurrent configure requests for same VCH is not allowed. vic-machine should be able to detect if one VCH is running configure/upgrade. If true, return useful error message. And also should not leave that configure flag in there after configure is stopped, or even interrupted.
-
-Issue https://github.com/vmware/vic/issues/4069 is tracking this problem.
-
-## Backward Compatibility
-It's possible that after vic engine released new version, user is trying to configure older version's VCH with newer vic-machine.
-
-There are few options:
-- Run configure using same version's vic-machine (this option should technically always work)
-
-  For any customer that does not want to change vic-machine version, they need to run configure using same version's vic-machine.
-
-- Combine upgrade process into configure
-
-  Upgrade is actually one special kind of configure, technically it's easy to have upgrade run together with configure. User might want to configure VCH, and also want to upgrade it after or before configure. In that case, a combined configure and upgrade command can provide a better user experience.
-
- Here is the combined command ```vic-machine configure --upgrade <all configure and upgrade options supported here>```
-
-- Support backward compatibility in vic-machine
-
-  This will need to add backward compatible code in vic-machine. Even initially there is only few changes, that will expand massively over time, which is not consistent with our data migration design, so this is not our option.
-
-# VCH configure Rollback (P0.5)
-Similar to VCH upgrade workflow, before configure VCH, snapshot should be took to keep existing status. If the configure failed eventually, VCH should be reverted to old status automatically.
-
-The Configure Rollback is talking about after a successful configure, vic-machine is still able to rollback VCH's old configuration. The command is like vic-machine configure --rollback
-
-This feature is nice to have, but as vic-machine upgrade already have this capability, mark it as P0.5.
-
-- Set Env
-`vic-machine inspect` should set user env like what `vic-machine create` did, to make sure user can run docker command correctly.
-
-# Manifest File
-vic-machine create already has more than 50 options, and the number will increase over time. With this configure feature added, most of those options need to be updated as well. To improve user experience, in my opinion, we need Manifest file to simplify vic-machine command generation.
-
-[vic-machine design](vic-machine.md#vch-manifest) mentioned manifest idea, here we'll start from a simple implementation. The manifest file format will be same to the yml file format, mentioned in [configuration inspection](#configuration-inspection)
-
-- vic-machine inspect --manifest filename will dump all configurations in yml file format to the manifest file.
-
-Here is how to manage VCH using manifest files.
-- vic-machine create --manifest will load the manifest file and create VCH based on it.
-- vic-machine configure --manifest will load the manifest file and update VCH configuration based on it.
-
-In addition, all the command options can be used together with manifest file, and the command option will override the value in manifest file
-
-TODO: Manifest management command line is not well defined yet. Here is one possible solution for it.
-- vic-machine update manifest
-
-All command options in `vic-machine create` can be used for this command.
-
-This manifest file approach will simplify vic-machine create/configure workflow, and leverage user readable configuration format. But it will be an additional work for existing vic-machine create.
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/upgrade.md b/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/upgrade.md
deleted file mode 100644
index 6ce9b79cee..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/upgrade.md
+++ /dev/null
@@ -1,335 +0,0 @@
-# Upgrade
-
-After installing a VCH, a VIC engine admin will need to manage the lifecycle of the VCH. One aspect of this lifecycle management is upgrading and patching. For our purposes, patching and upgrading will be treated the same. 
-
-The VIC engine product will release a new, complete, software download bundle for both patches and upgrades, versus, having a sparse patch or a separate upgrade model.
-
-## Requirements
-
-### Scope
-
-vic-machine can upgrade VCH endpointVM no matter it's running or not, so vic-machine upgrade cannot rely on services running in VCH endpointVM.
-
-For the VCH endpointVM, vic-machine upgrade will detect the version difference between the old VCH and itself, this includes detecting the guestinfo changes between the two versions. Then vic-machine upgrade will migrate the guestinfo metadata, and upload updated iso files. If anything incorrect happens during this process, vic-machine upgrade will revert back to old version and status. The endpoint API will have downtime during upgrade, but the running containers will not. 
-
-The containers managed by this VCH will be left running existing version. If the container is running, it will work well if it's not coupled with endpointVM through port-forwarding. After VCH is upgraded, the container management will be resumed even there is container configuration change. Portlayer will be backward compatible to make sure old version's container still work well.
-
-But if there is security patch for container VM kernel or tether, user still need to recreate new container and then replace the old containers at once or gradually based on business requirement. vic-machine upgrade does not take care of container update, which is the same behavior with vanilla docker.
-
-The exception is that in near future we might replace serial port with VMCI, to solve the VM vMotion issue. If after that change, portlayer lose backward compatibility, which means portlayer cannot talk with old container through tether, after endpointVM upgrade, part of container VM management function will loss, which means container list, inspect, network, volume, start/stop/remove still work, but container interaction, including attach, exec, log will not work.
-
-Summary of upgrade requirement:
-- Only upgrade VCH endpointVM
-- Portlayer support backward compatibility
-- If container functionality is impact, user is responsible to replace old container with new container after VCH endpointVM upgrade
-- If there is vSphere credential changes, upgrade will replace old credentials with new one
-
-### Version Difference
-
-VIC version includes three parts, "release tag"-"build id"-"github commit hash". vic-machine upgrade will rely on build id to detect one version is newer or older than another one.
-
-User need to provide newer binary with bigger build id, to upgrade existing VCH. This also requires our build system to keep increase build id number no matter any kind of system change. 
-
-Note: after introduced data migration between builds, we introduced one more internal used data migration version. That version is related to data migration plugin only, so will not be shown in vic-machine version. This will be described in data migration section.
-
-### Impact
-
-The VCH endpointVM (control plane) will have downtime during upgrade. Container lifecyles are not coupled with that of the endpointVM and, when using mapped vsphere networks (vic-machine --container-network argument) instead of port forwarding, the network data paths are not dependent on the endpointVM either. 
-
-There will be impact on container interaction while the endpointVM is down:
-
-- no direct access to container logs
-- no attach ability
-- network outage for NAT based port forwarding
-
-All of those facets should resume normal operation after upgrade is complete. 
-
-Note: Exception might happen if there is container communication changes. Additional operations are required to fix the problem.
-
-### VCH status
-
-vic-machine ls and inspect will show the VCH versions and upgrade status.
-
-### One Step Roll Back
-
-If anything wrong happens during upgrade, vic-machine will rollback VCH to original version and status.
-
-And a little bit further, even vic-machine upgrade succeeds, user is still able to run vic-machine upgrade --rollback to do one step roll back, which means the endpointVM will be rollback to wherever version it was before this time's upgrade.
-
-The benefit is that if the docker endpoint API does not actually work after upgrade (due to vic-machine upgrade mis judgement) or user appliacation still prefer old version's API for whatever reason, they still could get back to old working version easily.
-
-Limitation:
-- If there is new version container created after upgrade, rollback will fail. In that case, user should delete new container through docker CLI or portlayer API.
-- Only one step roll-back is supported. As long as new upgrade is executed, no matter it's succeeds or not, the old version's rollback persisence will be removed.
-
-### Resume Interrupted Upgrade
-
-If upgrade failed, it will rollback to old version dynamically to make sure user application is not stopped due to upgrade failure. But there is one scenario still might break everything, that is user input Ctrl+C during upgrade, cause vic-machine upgrade is interrupte, it is not able to roll back everything it did, and then it is useful to resume this kind of operation from vic-machine. 
-
-Open Issue: if this is high priority user requirement?
-
-### Downgrade
-
-Verified docker-engine upgrade/downgrade, which works well between 1.11.2 and 1.12. The running container will be stopped after upgrade/downgrade, but is good to start again in new version. And all images and containers information is not lost. But think of the complexity to support version downgrade, we'll not go with this at this moment, only with a limited one step roll back.
-
-### Internet connection
-Internet connection is not required to upgrade/downgrade VCH, but newer version's binary should be available for vic-machine.
-
-## Design/Implementation - Phase1
-
-This section described the first simple implementation of upgrade. After this phase, user could upgrade VCH endpointVM from build to build, as long as there is no metadata changes, which means no changes in guestinfo, key value store and image metadata.
-
-This code is already merged, and works for security patch update.
-
-### Versioning
-
-#### Freeze following attributes definition in VCH configuration and container VM configuration
-- VCH configuration: ID, Name, Version
-- Container VM serial port configuration
-- Container VM log/debug file location
-
-#### Configuration Version
-
-Both VCH and container configuration will have version and the value is same with what vic-machine version command shown. After upgrade, VCH configuration version should be updated to new version, but container VM configuration version will still be old one.
-
-New version's VCH will work with both old and new versions containers.
-
-#### Embed iso file version
-
-vic-machine need to identify the iso file version before and after upgrade. Two options here:
-- Add version into iso file Primary Volume Descriptor, and read back from vic-machine
-- Leverage iso file name including version, e.g. appliance-0.5.0.iso
-
-vic-machine should check iso file version during deployment, and after upload to datastore, version should be appended to iso file name, to make sure mutilple iso files could co-exist in the same VCH, and used for different version's container.
-
-Image file name should not be changed in datastore, cause the file path is used to create container VM. And then vic-machine will leverage file name for version checking during upgrade, to avoid download iso file from datastore back to where vic-machine is running.
-
-Note: No feasible golang library found for this function, so will write our own library to read iso metadata.
-
-#### Refactor current VCH configuration and container VM configuration structure
-To make data migration easier, we'll need to refactor current VCH and container VM configuration structure.
-
-VirtualContainerHostConfigSpec is too big, which includes everything in one structure. We're not be able to update part of configuration structure, it will help to update part of data with separated structures based on functionality, e.g. network, storage, and common attributes.
-
-For ContainerVM configuration, there are a few attributes not used for container VM setup, e.g. in ExecutorConfig, Key, LayerID, RepoName, are all not container VM configuration related. Move out irrelated attributes can help the structure stability in the future. 
-
-### Transactional Operation/Roll Back
-VM snapshot is used to keep current status for upgrade roll back. Before upgrade, vic-machine will create one snapshot of VCH endpointVM. If anything wrong happens, vic-machine can switch back to the pre-upgrade snapshot.
-The one step roll-back will roll back the snapshot as well.
-
-Note: VM snapshot does not persist data in serial port, as we will use datastore files through serial port for vch logs, after roll back, log files will have all error message during upgrade if VCH endpointVM is ever started with new configuration.
-
-### Upgrade Workflow
-
-Here is the upgrade workflow
-- Find existing endpointVM
-- Query VCH configuration
-- Verify new version and existing VCH's version
-- Cleanup snapshot and images created from last time's upgrade, if there is any. This step is to make sure the rollback after upgrade is not confused.
-- Read back old VCH configuration, and migrate to new version. (data migration will be in phase 2 impl)
-- Upload iso files
-- Prepare combined endpointVM configuration, both hardware spec (ISO path) and the extraconfig portion (VCH version)
-
---- everything until this portion can be done without interrupting ongoing operation ---
-- Snapshot endpointVM
-- Poweroff endpointVM if it's not
-- Update VCH configuration together with the migrated configuration data
-- Reconfigure VCH endpointVM
-- Power on endpointVM, and wait VCH service initialization
-- Anything wrong in the above steps, roll back to upgrade snapshot
-- Ensure endpointVM is powered on and initialized correctly after rollback to snapshot
-- Cleanup env after failed upgrade (remove upgrade snapshot, remove uploaded iso files)
-- Leave snapshot and old image files for one step roll-back
-
-This ensures that a failure to upload ISOs for whatever reason is detected before we take down the existing version. It limits the failure modes after shutting down the endpointVM to:
-
-1. failed to update endpointVM configuration
-2. failed to power on the endpointVM (e.g. system resource constraints)
-3. failed to boot endpointVM
-4. failed to acquire network addresses (this has been seen in real world examples - we may wish to attempt to preserve/reuse the IPs the endpointVM had prior to update, which should still be present in the extraconfig)
-5. failed to rebuild system state from vsphere infrastructure
-
-## Design/Implementation - Phase2
-
-Although we did lots of code refactor for VCH endpointVM configuration, it's still unavoidable to continue changing that structure. To make sure we don't break upgrade after GA, we need a solution for the data migration anyway.
-
-- EndpointVM guestinfo, which is used to persist VCH endpointVM configuration
-- Container guestinfo, which is used to persist container configuration
-- KeyValue Store and image metadata, following information is persisted
- - parentMap
- - per-image metadata
- - image layer cache
- - network portlayer data
-- EndpointVM log files
-- vSphere Object Management Logic
-
-### Data Migration Framework
-
-Guestinfo is versioned by auto generated build number, git commit hash, build timestamp etc, which are all not controllable during development. So we'll add another sequential version for data migration version control only. For each version, there will have one data migration plugin registered into data migration framework.
-
-Each time to migrate data, either for container or endpointVM, the framework will compare latest version with the existing version to generate data migration path, e.g. r2->r3->f4->latest or r4->latest. And then corresponding plugins will be executed sequentially to migrate data.
-
-Container data and endpointVM data will be migrated separately, because they have different lifecycle. All the metadata in endpointVM, including guestinfo, keyvalue store, image metadata, log files are all part of endpointVM scope, which will be considered as one set and migrated at the same time.
-
-As old container binary will not be updated by vic-machine upgrade, we'll not be able to write container data back to container VM guestinfo. In that case, we need to try to avoid container data change even there is version difference between VCH endpointVM and container. And the framework should explicitly provide methods to detect if there is data version difference.
-
-Based on the design above, we had following migration framework interface:
-
-```
-// MigrateApplianceConfigure migrate VCH appliance configuration, including guestinfo, keyvaluestore, or any other kinds of change
-// InIt accept VCH appliance guestinfo map, and return all configurations need to be made in guestinfo, keyvaluestore, and can have
-// more kinds of change in the future. Each kind is one map key/value pair.
-// If there is error returned, returned map might have half-migrated value, this is why we don't persist any data in plugin.
-func MigrateApplianceConfigure(ctx context.Context, s *session.Session, conf map[string]string) (map[string]string, bool, error)
-
-// MigrateContainerConfigure migrate container configuration
-// Migrated data will be returned in map, and input object is not changed.
-// If there is error returned, returned map might have half-migrated value.
-func MigrateContainerConfigure(conf map[string]string) (map[string]string, bool, error)
-
-func IsContainerDataOlder(conf map[string]string) (bool, error)
-func IsApplianceDataOlder(conf map[string]string) (bool, error)
-```
-
-Here is the interface for plugin and plugin manager:
-
-```
-type DataMigration interface {
-	// Register plugin to data migration system
-	Register(version int, target string, plugin Plugin) error
-	// Migrate data with current version ID, return true if has any plugin executed
-	Migrate(ctx context.Context, s *session.Session, target string, currentVersion int, data interface{}) (int, error)
-	// GetLatestVersion return the latest plugin id for specified target
-	GetLatestVersion(target string) int
-}
-type Plugin interface {
-	Migrate(ctx context.Context, s *session.Session, data interface{}) error
-}
-```
-
-Notes:
-- Developers who change guestinfo, keyvalue store, image metadata, etc, will be the owner to develop migration plugin, and be responsible to increase data migration version. 
-- Each migration version should have one and only one corresponding plugin.
-- If endpointVM configuration and container configuration are changed at the same time, two different plugins should be added, and registered to different plugin category.
-- If both endpointVM configuration and keyvalue store are changed, two plugins are recommended as well.
-
-Reminder: extraconfig package should always be backward compatible. If it breaks this assumption, upgrade is broken.
-
-### EndpointVM Migration Process
-
-vic-machine upgrade will upgrade endpointVM and data migration framework will be called to migrate data, which is described in phase1 workflow. There is no new command parameters added for data migration.
-
-#### Guestinfo migration
-
-The plugin should migrate data in memory and return changed value directly. No need to persist any data.
-
-The difficulty is how to migrate secret data in guestinfo. The encryption key is persisted through raw guestinfo.ovfEnv variable, which is readable from in guest, but not through vSphere API, no matter it's VC or ESXi. Decrypt and re-encrypt secret data is necessary because otherwise if old vc login credential is changed, upgrade will always fail.
-
-To solve this issue, we'll need to download endpointVM vmx file and read back guestinfo.ovfEnv value to decrypt encrypted data. In another word, this will be another variable dependent by upgrade framework, which cannot be changed in the future, otherwise, upgrade is broken.
-
-#### KeyValue Store and Image metadata Migration
-
-Different to guestinfo object, VIC engine will not change configuration from guestinfo to anywhere else anytime soon. But from start, keyvalue store persistent position is in argument. Right now, vic engine has a few datastore files for keyvalue store and image metadata, but those information is not configurable, which means hardcoded in portlayer.
-
-Based on this idea, data migration framework will not assume where to load these data, and what version is that, instead, it assume all data for endpointVM is sharing the same version written in VM guestinfo. After compare the version difference, it will invoke plugins sequentially to migrate data including all endpointVM data. The plugin, for this kind of data, should read from datastore, change data and then commit back to datastore, or to anywhere defined in new version. So the input of keyvalue store plugin will be the endpointVM configuration data.
-
-The problem of this solution is that each single plugin will persist its own change, not like the guestinfo update, which is migrated in memory and persisted by migration framework. So the rollback for guestinfo is easy, but not possible for keyvalue store, unless we have data roll back plugin mechanism.
-
-The solution for this issue is to have one model to write key/value store and image metadata migration plugin. Every time we need something new and have to be migrated in new version, we should create new datastore files with a suffix matching the version number, e.g. metadata.v3, and then in the migration plugin, copy all existing data into new versioned files, and modify over there. The old versioned datastore files is not changed by the plugin, so even if eventually we dropped the upgrade, the old binary could still work with the old files without any problem.
-
-#### EndpointVM log files
-
-EndpointVM log files can be handled similar to KeyValue store.
-
-#### vSphere Object Management Logic
-
-There will have new vSphere API come up, so the logic to manage vsphere objects will be enhanced, for example, as Caglar said the vmdk can be managed directly in vSphere 6.5, instead of through vm operations in vSphere 6.0. We'll switch to these new interfaces for image and volume management sometime later.
-
-vic-machine is not supposed to migrate old image data or volume data to new vmdk files, so portlayer will need to be backward compatible.
-
-### Container Data Migration Process
-
-vic-machine upgrade will leave container in old version, and do not update it even container is restarted. So portlayer will be responsible for container's backward compatibility. Here is how portlayer talk to old containers.
-
-- Load container configuration
-- Check if data migration is required. If yes, migrate data, and conver to new version's data structure in memory
-- Read/write from/to new version's data for whatever container operations
-- While need to write container configuration back to container VM guestinfo, check if data migration is done. If yes, skip writing.
-
-Risks:
-- As the new data is not written back, there will have few container information inconsistence
-
-  Currently, portlayer will write container status into guestinfo before start/stop, and tether will write some. If portlayer does not write this information because of data version mismatch, the container status will have problem if we still rely on portlayer to write it.
-  In the future, if portlayer add more functions to modify container, and those information is persisted in guestinfo, those change will not work for old container, for example, container rename.
-- If portlayer and container communication channel is changed, from serial port to VMCI, and no backward compatibility support, container attach/exec/log etc., interaction related command will not work, but container image/volume/network/start/stop/remove should still work well.
-
-In the above cases, user should think about replace old container with new created one. And if that happens, during endpointVM upgrade, vic-machine should have clear information to mention the container functional limitation after upgrade, and the suggested solution for it.
-
-### One Step Roll Back
-To support one step roll back, we'll have one new option in vic-machine upgrade command as following
-```
-vic-machine upgrade --rollback --<same other upgrade options>
-```
-Following is the workflow
-- Find existing VCH endpointVM
-- Check if upgrade snapshot available, and consistent with previous iso file version, if not, stop rollback
-- Check if there is any newer version's container created already, if yes, print warning message and stop rollback
-- Check if old iso files with same snapshot version still exist, if not, cannot rollback
-
-- Snapshot current endpointVM with version in name
-- Switch to old version's snapshot
-- Power on endpointVM, and wait VCH service initialization
-- Anything wrong in the above steps, roll back to new version's snapshot
-- Ensure endpointVM is powered on and initialized after rollback to newer version
-- Remove new version's upgrade snapshot if rollback failed
-- Remove new version's upgrade snapshot and new version's iso files if rollback succeeds (after rollback, user is still able to reupgrade through the above operation, do not leave anything to avoid confusing)
-
-### Resume Interrupted Upgrade
-For user interrupted upgrade through Ctrl+C during upgrade is running, the VCH endpointVM is left in partial migrated status, which is hard to handle manually. Another option in vic-machine upgrade will help on this.
-
-```
-vic-machine upgrade --resume --<same other upgrade options>
-```
-
-Following is the workflow
-- Check if there is one upgrade in progress, we'll rely on upgrade snapshot to see if the VCH is in upgrade. If anything is interrupted before upgrade snapshot is created, VCH endpointVM is not actually changed, user should use general upgrade command to continue.
-- Check if docker API is available, if yes, last time's upgrade is already done, no need to resume (if vic-machine upgrade succeeds, but something else still does not work correctly, user should use one step rollback, instead of resume here)
-- Check if there is any newer version's container created already, if yes, stop resume. Which means new VCH endpoint API already works, but occasionally break by something else, resume cannot help on that.
-
-- Check if old iso files with same snapshot version still exist, if not, cannot resume
-- Upload new iso files no matter they exist or not, to solve any potential iso file broken issue
-
-- Switch to old version's snapshot
-- Query endpointVM guestinfo, and migrate to new version. 
-- Power off endpointVM if it's not
-- Update VCH configuration together with the migrated configuration data
-- Reconfigure VCH endpointVM
-- Power on endpointVM, and wait VCH service initialization
-- Anything wrong in the above steps, roll back to upgrade snapshot
-- Ensure endpointVM is powered on and initialized correctly after rollback to snapshot
-- Cleanup env after failed upgrade (remove upgrade snapshot, remove uploaded iso files)
-- Leave snapshot and old image files for one step roll-back
-
-## Restrictions
-User cannot run two upgrades for same VCH at the same time. 
-
-vic-machine will check if there is already another upgrade snapshot is created before it starts to create snapshot. But as create vsphere snapshot will take some time, e.g. one minute, if at this time, another upgrade process is started, it will start upgrade again cause the snapshot of previous task is not finished yet.
-
-## Integration Test
-### Upgrade test w/o data migration
-CI test already have test to upgrade from previous release to latest version, and run regression test after upgrade. With data migration framework added, no new integration test is required. But for any data migration added in the future, upgrade test should cover the new features regression.
-
-### One Step Roll Back
-After upgrade, run one step roll back and check the old version's VCH. Following scenarios should be covered.
-- Roll back works without new container created, and sample function works (do not run regression test for that might have new features not suppored in old VCH)
-- Roll back failed for new container created
-- Roll back works after removed new version's container, and sample function works
-- After roll back, VCH old version is recovered, and new feature is not supported
-
-### Upgrade Resume
-During upgrade, break the upgrade process, and check if vic-machine can resume the upgrade. Following scenarios should be covered.
-- Before snapshot is created, stop upgrade, resume does not work for no upgrade is found
-- Upgrade succeeds, resume should not start for docker endpoint API is ready
-- After snapshot is created, stop upgrade, and remove the old version iso files, resume should fail
-- After snapshot is created, stop upgrade, and do not touch everything else, resume should work, regression passed
-- After resume, one step roll back should still work
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/vic-machine.md b/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/vic-machine.md
deleted file mode 100644
index adb8959437..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/vic-machine/vic-machine.md
+++ /dev/null
@@ -1,367 +0,0 @@
-# On the care and feeding of VCHs - vic-machine
-
-vic-machine is both the management client for Virtual Container Hosts and the mechanism by which they are initially deployed.
-
-## Roles, responsibilities, and multi-tenacy models
-This document notes three separate roles in the course of deploying and managing a VCH:
-* vSphere Administrator (_viadmin_)
-* VCH Administrator (_admin_)
-* VCH User (_user_)
-
-This workflow is the bridge between the infrastructure administration portion of an organisation and the users. The specific intent here is to allow each of the roles to operate at a level of detail appropriate to that role, with minimal impact or dependency on the others. The:
-* _viadmin_ - identified by having administrative access to vSphere
-  - operates at a business decision level, mapping relative priority of projects and teams to accessible resources and permissible resource limits. Delegates usage authority of those resources to the _admin_ within specific limits enforced by vSphere.
-* _admin_ - identified by delegated authority in the form of access to a signed VCH manifest file
-  - controls sub-division, if any, of assigned resources among finer-grained projects and teams
-  - deploys a VCH to manage a set of assigned resources. Delegates consumption decisions about those resources to _user_
-* _user_ - identified by granted API access to a specific VCH
-  - controls the specifics of _what_ is done with the available resources, by way of an API client such as the Docker client
-
-This model provides for a form of multi-tenancy, with the _viadmin_ able to specify a service account that will be configured with appropriate RBAC rules. It's unclear at this time if it's viable to create sub-users with further restricted RBAC rulesets, so the working assumption is that all sub-division performed by _admin_ operate with the same service account, and the sub-division is enforced by configuration of vSphere constructs such as resource pools, but without the authority isolation provided by different vSphere users. How a VCH prevents manipulation of those sub-division limits is covered in [the security architecture](security.md).
-It is not intended that there be RBAC within a VCH at this time.
-
-How this multi-tenacy model is used is left up to the business, but there are two primary models that we consider during development:
-* team based - the VCH is assigned to a team for their use, potentially running a mix of independent workloads
-* application based - a VCH is used as the management construct for a given appliancation, with all containers being portions of that app
-
-
-## VCH manifest
-
-Certain information is required to deploy a VCH, with the _viadmin_ and _admin_ each contributing portions of that data. The VCH manifest is the mechanism by which that cooperation happens, and is the token via which authority delegation from _viadmin_ to _admin_ occurs. Creation of a manifest is conceptually a compositing process with the following inputs and an immutable result:
-
-1. input manifest (if omitted, this creates a new manifest from scratch)
-2. a restriction set of some kind ( e.g. compute resource path, datastore prefix, registry whitelist)
-  - as a note, user credentials are also considered a restriction as they control permissible operations
-
-
-The _viadmin_ uses vic-machine to create a _base manifest_ containing the following restrictions:
-* target vSphere environment
-* vSphere user and credential for created VCHs:
-  - must already exist, or
-  - must be created by vic-machine during manifest creation, or
-  - demand created during VCH deployment, requiring stored admin credentials:
-* stored _viadmin_ credentials if necessary:
-    - encrypted credentials and [validating proxy](components.md#validating-proxy) URI, or
-    - unencrypted credentials (_viadmin_ and _admin_ roles are held by the same entity and manifests are stored securely)
-
-The _base manifest_ is the minimum set of information necessary from the _viadmin_ role. There is additional information that will almost always be required for full function of a VCH:
-* vSphere network to use for container network
-  - must already exist
-* vSphere switch to use for container network:
-  - must already exist
-  - if switch, port group or network is demand created during VCH deployment, requiring stored admin credentials
-    - in an enterprise environment, creation of a portgroup without VXLAN or VLAN is unlikely to suffice, so pre-existing portgroup is highly recommended
-
-To create a VCH, disambiguation of which resource to use from the available set is necessary. If there is no ambiguity, i.e only one of each, then this can be omitted:
-* _client_ network - necessary for any access to the VCH
-* default container network:
-  - _private_ port group or dedicated vSwitch, or
-  - IPAM config for _client_ network (defaults to DHCP)
-* datastore paths for (may all be the same path):
-  - images
-  - containers
-  - volumes
-
-
-## Usage Examples
-
-These are various examples intended to illustrate how vic-machine is intended to be used. These are illustrations rather than the finalized naming so if something doesn't make sense ask about it. 
-
-### Fully specified command line
-
-```
-vic-machine create
--target=https://root@****:vcenter.fqdn/path/to/datacenter
--compute=mycluster/edw-pool/web/edw-web
--path=/folder/path/orthogonal/to/compute
--image-store=ds://datastore/containers/edw
--container-store=ds://datastore/edw/edw/web
--client-network="VM Network"
--management-network="management-net"
--volume-store=ds://edw-san/reports:reports
--volume-store=ds://edw-san/data:data
--container-network=private-vlan12d7f2:bridge
--container-network-ipam=private-vlan12d7f2:172.17.0.128-192/24,172.17.0.1
--container-network=edw-corp-net:backend
--alias=oracledb.edw.corp.net:db.backend
-```
-
-The first block of these options control the core configuration of the VCH:
-* target - the destination ESX or VC datacenter
-* compute - resource pool, host, cluster, or other compute boundary into which the VCH should be deployed.
-* path - the folder path into which the VCH VMs will be placed - this is VC only
-* image-store - the datastore location where images will be placed, whether pulled via `docker pull` or created via `docker commit`.
-* container-store - the datastore location where containerVMs will be created. This does not have to be on the same datastore as the images, but both must be visible to all hosts on which containerVMs are to be created.
-* client-network - the network on which users will connect to the VCH to issue DOCKER_API commands.
-* management-network - the network providing access to a VMOMI SDK, in deployments where access to the management network is required.
-
-The second block of options control how exisiting vSphere resources are presented to users of the VCH. These are specified as a `source:destination` mapping with vSphere identifier as the source; it is the viadmin role that is providing this data and mapping mydomain:targetdomain aligns with how people tend to think.
-* -volume-store - datastore prefixes under which volumes can be created. These prefixes are mapped to labels that can be reference via the --opts mechanism when calling `docker volume create`
-* -container-network - vSphere networks that should be exposed via `docker network` commands. As with the datastores this is a mapping from vSphere name to docker name. Ideally the docker name should express something about the purpose of presenting the network such as `internet`, `intranet`, or `databases`
-* -container-network-ipam - this is an optional argument furnishing additional information for controlling IP address management on the network, in the form `ipaddress-range/mask,gateway`. If not specified DHCP is used. 
-* -alias - this allows containers to address a specific FQDN as if it were itself a container managed by the VCH, specified in the form of `FQDN:alias.network`.  
-
-
-### Manifest file - create
-Note that the various resource paths end in a `/` - this signifies that it's acceptable for additional refinement to be provided when using this manifest file:
-
-```
-vic-machine manifest
--manifest=file::///home/joe/vch/edw.manifest
--target=https://root@****:vcenter.fqdn/path/to/datacenter
--compute=mycluster/edw-pool/
--image-store=ds://vsan-datastore/containers/edw
--container-store=ds://vsan-datastore/edw/edw/
--client-network="VM Network"
--management-network="management-net"
--volume-store=ds://edw-san/reports/:reports
--volume-store=ds://edw-san/data/:data
--container-network=private-vlan12d7f2:bridge
--container-network=edw-corp-net:backend
--container-network-ipam=edw-corp-net:10.118.78.128-192/24,10.118.78.1
--container-network=internet-corp-net:frontend
--alias=oracledb.edw.corp.net:db.backend
-```
-
-### Manifest file - use
-When using a manifest file it's necessary to fully qualify resources that are left open (i.e. trailing `/` in the manifest). In the case of mappings where it is `source/:destination`, the destination label is used as the resource reference; this avoids a requirement to know the manifest path, although there is no intent at this time to obfuscate specifications beyond encrypting credentials and target URI.
-
-```
-vic-machine create
--manifest=file::///home/joe/vch/edw.manifest
--compute=webteam
--container-store=web
--volume-store=reports/web:report
--container-network=bridge
--name=web-team-private
-```
-
-The exact consumption mechanic of manifests is still quite uncertain. The example above is working on the premise that all mappings in the manifest are optional and are bound only if referenced, whether simply by label or as part of a refinement. The example above does not reference the _frontend_ network, so no containers can be attached to it.
-
-### List existing VCHs
-List the existing VCHs under the specified compute resource. The example below will list all VCHs in the target vCenter.
-```
-vic-machine ls
--FROM=https://root@****:vcenter/
-
-ID        Path                                Notes
-vm-239    mycluster/edw-pool/web/edw-web      Notes from the VCH config that get truncated after...
-vm-2372   mycluster/random/someother          Another VCH in the random pool
-vm-15     mycluster/xyz                       VCH in the root of the cluster
-```
-The following example lists VCHs under a specific compute resource
-```
-vic-machine ls
--target=https://root@****:vcenter/example-datacenter
--compute=/mycluster/edw-pool/
-```
-The following example lists VCHs under a specific folder
-```
-vic-machine ls
--target=https://root@****:vcenter/example-datacenter
--path=/a/folder/path
-```
-The following example lists VCHs under a specific resource, described by manifest. Using the example above, this would list all VCHs under /example-datacenter/host/mycluster/Resources/edw-pool/
-```
-vic-machine ls
--manifest=file::///home/joe/vch/edw.manifest
-```
-
-
-## Inspect existing VCH
-
-Inspect the configuration of an existing VCH by compute path:
-```
-vic-machine inspect
--target=https://root@****:vcenter/example-datacenter
--compute=host/mycluster/Resources/edw-pool/web-team-vch
-```
-
-Inspect the configuration of an existing VCH by folder path:
-```
-vic-machine inspect
--target=https://root@****:vcenter/example-datacenter
--path=/a/folder/path/web-team-vch
-```
-
-Inspect the configuration of an existing VCH by moref - I feel leaking vCenter abstractions is unavoidable if allowing any specifier other than full paths. In this case the identifier is part of target because it is sufficient to be unambiguous without datacenter/path pair:
-```
-vic-machine inspect
--target=https://root@****:vcenter/moref=vm-10324
-```
-
-## Updating an existing VCH configuration
-
-
-## Implementation approach
-
-Recommended initial approach is to have several components that get rolled into both vic-machine. Initial implementation should focus on:
-* CLI parsing into config structs
-* validation of config struct values
-* creation of VCH from config struct
-
-![vic-machine high level logic](images/vic-machine-high-level.png)
-
-Components:
-* command line argument parsing
-  - maps command line arguments to internal config data structures
-  - _package: main, path: cmd/vic-machine_
-* validation of config structure values
-  - given an internal config data structure it's necessary to check the specifics against the target vSphere to ensure they are valid - past validity is no indicator of current validity
-  - this may also translate from symbolic names to morefs, resulting in a manifest that is resilient to name changes, but fragile across vSphere instances with identical naming schemes. This should be a user selectable behaviour, I prefer it on by default.
-  - _package: spec, path: lib/spec_
-* creation of VCH from configuration
-  - when a manifest has been validated against a vSphere, this component creates the corresponding vSphere objects - this is primarily the VCH applianceVM, but may also include port groups and other objects.
-  - _package: management, path: install/management_
-* [vmomi gateway](components.md#vmomi_gateway)
-* manifest creation and consistency
-  - logic to validate that layered restrictions don't violate prior restrictions, e.g. refining [datastore1]/a/path to [datastore1]/a/path/to/vch is acceptable, but not to [datastore1]/a/second/path
-  - this should operate on the internal config data structures - probably a sliding window of two layers of the composite manifest each loaded into a config struct
-  - signing and signature validation
-  - _package: manifest, path: install/manifest_
-* load/save manifest to/from internal config data structures
-  - this is the mapping from the config held in the composite manifest to the current end configuration, held in a serializable config structure
-  - signing and signature validation of manifest layers
-  - _package: manifest, path: install/manifest_
-
-The reason for this breakdown is because some of these elements need to be duplicated in the:
-* [validating proxy](components.md#validating-proxy):
-  - load/save manifest
-  - manifest consistency
-  - validation
-  - reification
-  - vmomi gateway
-* applianceVM
-  - validation
-  - vmomi gateway
-
-
-## =================================================
-below this point is working notes.
-
-## Installing - per vSphere target
-
-### Inputs
-
-1. vSphere SDK endpoint
-2. vSphere administrative credentials
-
-### Actions
-
-1. deploy ESX agents
-2. upload ISOs to common location
-3. create custom tasks, alerts, and icons
-4. create VCH tag (enable filtering of VCHs)
-5. install UI plugin
-
-
-## Installing - per VCH
-
-### Inputs
-
-* VCH user (existing or new) **
-* resource lists:
- - pool **
- - imagestore datastore paths **
- - container datastore paths **
- - volume datastore paths (restriction)
- - network mappings:
-  - one network minimum for VCH comms**
-  - other network mappings
-* resource allotments:
- - cpu
- - memory
- - network IO
- - disk IO
- - datastore quotas (per datastore path)
-* certificates
- - users - for access to VCH
- - hosts - for container access to external hosts
- - network - for VCH/container access to networks (gating proxies)
-* registry lists
- - whitelist
- - blacklist
-* default container resource reservations and limits *
-* containerVM naming convention (displayName for vSphere) *
-
-### Actions
-
-Some of the elevated privilege operations could be delegated during self-provisioning to avoid manifestations of un-utilized authority, e.g. resource pool, user, and rbac entries for a potential but uncreated VCH. This delegation of higher authority requires additional care in the self-provisoning path.
-
-### Requiring elevated privileges
-1. create vSphere user for VCH
-2. create RBAC entries for VCH resources - resource pool, datastores, networks, et al
-3. obtain credentials for VCH user (e.g. SSO token)
-  * should be revokable
-  * should only have expiration date if no concern about clean VCH retirement
-4. create and size VCH resource pool/vApp
-  * if vApp then should also configure the start/stop behaviours
-  * this may encompass disabling certain operations via the UI
-5. place credentials in VCH applianceVM extraConfig
-
-## Requiring VCH user privileges
-1. validate supplied configuration
-2. construct extraConfig/guestinfo configuration for applianceVM
-3. create VCH applianceVM
-  * this may encompass disabling certain operations via the UI
-4. upload ISOs if not shared
-5. initialize applianceVM
-
-At this point install transitions to managing - reporting VCH status from initial install is the same as reporting that information for any VCH regardless of age.
-
-
-## Deleting - per vSphere target
-
-### Inputs
-
-1. vSphere SDK endpoint
-2. vSphere administrative credentials
-3. VCH identification
- - VCH resource pool path in govc format, e.g. /ha-datacenter/vm
- - VCH name
- - VCH ID, which is the value returned by vic-machine ls
-
-The VCH name and VCH resource pool path are identical to the value used in vic-machine create command. Which can uniquely identify one VCH instance.
-The VCH ID is the value returned by vic-machine ls, which probably be the VM mob-id, query from VC or ESX.
-
-Either VCH ID or the VCH resource pool path and VCH name should be specified.
-
-### Actions
-
-1. Get VCH VM
-2. Read back VCH configuration from VM guestinfo
-3. Delete following resources based on VCH configuration.
- - Container VMs managed by the VCH
-   - Container datastore paths and resource pool path configured during installation will be used here, to detect if the VM belongs to this VCH. If yes, these VMs will be removed.
-    - Container VMs will be removed if they are in stopped status.
-     - If container VMs are in powered on state, delete will return failure if -force is not specified.
-      - If container VMs are in powered on state, and -force is specified, vic-machine delete will power off and remove them those VMs.
-
- - volumes managed by the VCH
-   - -force option is required to delete volumes together with VCH uninstallation.
-    - Volume datastore path (sample: ds://datastore1/volume/vch1) configured during installation will be used here, to detect if the volumes are created by this VCH.
-     - If volume directory is empty, vic-machine delete will delete this directory as well, otherwise warning it.
- - images managed by the VCH
-   - Images are shared by VCHs. Currently no reference or metadata to specify which image is referenced by which VCH, so for TP3, vic-machine delete will not touch images.
- - vSphere networks created
-   - vic-machine create or VCH port-layer-server will create network, so vic-machine delete should delete any new networks. (Still need to confirm for how to get created networks)
- - VCH specific metadata from vsphere objects if any
-   - Cause image will not be removed at this time, image metadata will not touched as well. But for container metadata, if any, will be deleted. (Need to finalize where it is)
- - the resource pool and appliance VM
-
-### Samples
-```
-vic-machine delete 
---target root:password@192.168.1.1/dc1
---vch-path cluster/pool
---name vch1
---force
-```
-This command will delete VCH /dc1/host/cluster/pool/vch1 appliance, all containers VMs, networks and volumes created by this VCH.
-
-## Managing a VCH
-
-* report VCH status and information (API endpoint, log server, et al)
-* update VCH configuration - implies possible restart of component
-* shutdown/reboot VCH
-* upgrade VCH - should have an entirely separate doc for this
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/volumes.md b/installer/vendor/github.com/vmware/vic/doc/design/volumes.md
deleted file mode 100644
index 2fe73c811f..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/volumes.md
+++ /dev/null
@@ -1,53 +0,0 @@
-# Volume support
-
-Volumes are mutable disk devices, backed by `.vmdk`, whos lifetime is decoupled from that of the container VM.
-
-### Requirements
-- To create a `volume` by `ID` in PL on the specified datastore + path via `volumestore` name and return a URI pointing it.
-- To create "anonymous" `volumes and identify them with a generated `ID`.
-- To (statefully) remove a `volume` via the PL by its URI.
-- To reference an existing `volume` in the `spec` for a new container by its vmkd path
-- Store (immutable) metadata in `"key"/[]byte{"value"}` form.
-
-
-### Filesystem requirements
-Mirrors what exists in the storage layer for images.  Currently there is an implementation for `ext4`, but the underlying `disk` implementation is opaque to this.  In short, we'll use `ext4` for now, but using any other filesystem shouldn't be a huge change.
-
-
-### Datastore destination
-The VI admin will specify datastore + paths which volumes should be created on, giving each of them a `volumestore` to identify them.  For instance `[datastore1] /path/to/volumes` can be identified by volumestore name `datastoreWithVolumes`.  The the docker user can supply this volumestore name to as a driver arg when creating the volume.  The result will be a `.vmdk` created in the `[datastore1] /path/to/volumes/VIC/<vch uuid>/volumes/<volume name>/<volume name>.vmdk`
-
-### Definitions
-```
-// Unique identifier for the volume.  Enumeration of volumes is done via these tags.
-type Tag string
-
-type Volume struct {
-	// Identifies the volume
-	Tag 	Tag
-
-	// The datastore the volume lives on
-	Datastore *object.Datastore
-
-	// Metadata the volume is included with.  Is persisted along side the volume vmdk.
-	Info    map[string][]byte
-
-	// Namespace in the storage layer to look up this volume.
-	SelfLink url.URL
-}
-
-// VolumeStorer is an interface to create, remove, enumerate, and get Volumes.
-type VolumeStorer interface {
-	// Creates a volume on the given volume store, of the given size, with the given metadata.
-	VolumeCreate(ctx context.Context, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*Volume, error)
-
-	// Get an existing volume via it's ID.
-	VolumeGet(ctx context.Context, ID string) (*Volume, error)
-
-	// Destroys a volume
-	VolumeDestroy(ctx context.Context, ID string) error
-
-	// Lists all volumes
-	VolumesList(ctx context.Context) ([]*Volume, error)
-}
-```
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/volumes/ContainerCreateWithVolumes.md b/installer/vendor/github.com/vmware/vic/doc/design/volumes/ContainerCreateWithVolumes.md
deleted file mode 100644
index 1a3c8f90da..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/volumes/ContainerCreateWithVolumes.md
+++ /dev/null
@@ -1,69 +0,0 @@
-
-### Docker Personality
-
-The docker personality needed no changes to support nfs volumes. This was due to our Volume Store architecture. Adding a new type of Volume Store still appears as a volumestore to the docker personality. In the future we are planning to distinguish between volume types by customizing our `driver` field. e.g. `vsphere-vmdk` and `vsphere-nfs`. 
-
-This will change the way the personality operates, changes will need to be made on how we identify the volume store in order to know which kind of driver we need to return on ls. Driver can also be specified at volume creation time and it is very possible that we will require users to know which volume store is of which driver type. In order to facilitate this we should modify the output of `docker info` to list not only the available volume stores, but also the drivers associated with each store. Alternatively/additionally we can coax which type of driver belongs to a store programatically, this will require some work in the portlayer and docker around fetching a store by name and determining it's type. 
-
-In the future some mount options like `squashfs`, `sync`, and `retries` may be desired as configuration options at volume creation time. If this is the case work will need to be done on the personality to parse the additional `driver arguments`. Naturally, the portlayer will also need some additional argument parsing logic to facilitate communicating these options to the tether at mount/run time. 
-
-This will also require us to keep a basic set of options for anonymous volumes. At create time users can actually specify several options after the ending `:` character, some investigation will be needed as to how we can use this. The basic options can be used when nothing is specified at the end of the `-v` option on create. We also have a hard coded default capacity for anonymous volumes as this cannot be specified from the docker cli. In the future we should make this configurable at vic-machine create time, [Ticket Reference](https://github.com/vmware/vic/issues/5172). 
-
-examples:
-
-```
-
-docker create -v "/mnt/pnt:<some basic opts>"
-
-and 
-
-docker create -v "<name>:/mnt/pnt:<some basic opts>"
-
-```
-
-Note: Most importantly from a vic-machine standpoint, A `default` store __must__ be tagged at vic-machine create time for anonymous volumes to be supported in a deployment. Without one any anonymous volume creation requests will be rejected and an error will be returned to the user.
-    
-#### Inputs
-
-+ **mount path** is the destination of where the vdmk will be mounted inside the container. _This is required_ if it is the only value set the user is specifying an anonymous volume and we  generate a UUID as the name for the volume and this UUID is propagated to the volume metadata. 
-
-
-+ **name** is the value that will be listed a as the name of the volume and the md5 sum of this name will be used as the label for the block device and the target of the mount(portlayer join operation). If this is specified it must be validated. The name is also used to namespace volumes within their respective volumestores. Because of this there is currently and issue out for having a VCH which ends up with two volumes having the same name, [Ticket with information](https://github.com/vmware/vic/issues/5173)
-
-+ **general args** are as follows [rw|ro], [z|Z], [[r]shared|[r]slave|[r]private], and [nocopy]. These should be parsed and placed into the DriverArgs that are specified to the portlayer. right now we only support rw/ro. __TODO__ we do want to research the [nocopy] option. Theses could possibly change in the future for our support depending on how we want to manage other types of volumes beside block based. 
-
-
-__NOTE:__ : in MountPoint for the volume metadata(docker perspective) we need to include something that says "Mountpoint is a block device" or something along those lines.
-
-
-### Join call for attaching a volume to a vm
-
-This call, which will be implemented in the volume portion of the storage layer within the portlayer srever, will involve a config spec change. The three things needed for this call are the handle to the container, a filled volume struct, and the driver options for the device addition(such as rw/ro). We will add a value to the extraconfig->executorConfig which will append a new Mountspec for the device to be mounted. The Op type will be an "Add"
-
-```
-[]DeviceChange{
-    op:Add,
-    state(?):exists,
-    VirtualDevice{
-    file:<vmdkPath->(should come from volume struct)>
-    }
-}
-
-[]Extraconfig.append{
-    executorConfig:
-        label:<generated on creation, should be md5 sum>
-        MountPoint:<where to mount the vmdk in the container>
-}
-
-```
-
-The function signature should look as such
-
-```
-func (v *VolumeStore) Join(container_handle *Handle, volume *Volume, diskOpts map[string]string)
-```
-
-this will be added to a new file called vm.go as part of the vsphere package under the storage layer code in the Portlayer.
-
-__NOTE__ : there are now two implementations for volume join: an [NFS implementation](https://github.com/vmware/vic/blob/master/lib/portlayer/storage/nfs/vm.go#L42-L57) and a [VMDK implementation](https://github.com/vmware/vic/blob/master/lib/portlayer/storage/vsphere/vm.go#L28-L48)
-
diff --git a/installer/vendor/github.com/vmware/vic/doc/design/volumes/nfsvolumestores.md b/installer/vendor/github.com/vmware/vic/doc/design/volumes/nfsvolumestores.md
deleted file mode 100644
index d557df1c98..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/design/volumes/nfsvolumestores.md
+++ /dev/null
@@ -1,164 +0,0 @@
-# Specification to support containers with NFS based shared volumes in VIC
-
-Container users want to be able to access shared storage between their containers programatically.  Docker solves this by way of host specific bind mounts adding [NFS volumes](https://docs.docker.com/engine/reference/commandline/volume_create/#/driver-specific-options).  VIC can streamline this functionality for the user by abstracting this away from the container user and allowing the VI admin to configure the VCH with NFS based volumes access by way of our `VolumeStore`.  This way, the VI admin can add an NFS based VolumeStore to the VCH, and the container user need only create volumes on it without needing to know the details of the NFS target.
-
-### Requirements
-
-Allow the VI admin to
- 1. add an NFSv3 based `VolumeStore`
-
-Allow the container user to
- 1. specify one or many NFS based `VolumeStore`s to create the container volumes on
- 1. verify network connectivity from created containers to the NFS targets
- 1. create volumes on the NFS based `VolumeStore`
- 1. create 1 or greater containers with NFS based volumes at the given location in the container filesystem namespace
- 1. validate the volume is no longer in use and delete it
-
-### Non Requirements
-
- 1. Instantiation or provisioning of shared storage
- 2. Exposing shared storage configuration via VIC (e.g. IOPS per client, storage policy, etc.)
- 3. Management of shared storage via VIC (e.g. container quiesce for storage maintenance, quota manipulation of the target, etc.)
-
-### Networking
-
-Containers will need to be on an appropriate network for the NFS volume store to be accessible.
-
-There are ways this could be done:
- - allow association of volume-store with container-network to allow direct coupling
- - note in the volume store list what network is required
-
-In our current networking model, this can potentially result in the container using the endpoint vm to NAT NFS traffic to/from the NFS target.  This is a potential bottleneck and single point of failure.  The other mode we support is adding an NFS container network, and then adding containers requiring the target to the same network.  This removes the point of failure but has other issues (*).
-
-_(*) Note: Without microsegmentation support, the services run in the container can potentially be exposed to the network the NFS target is on.  This means containers connecting to a specific NFS target all have direct connectivity to eachothers ports._
-
-Ultimately, (once we have microsegmentation support), we'd like to add the container to the appropriate container network in order for the container to have connectivity to the NFS target.
-
-### Implementation
-
-Adding shared storage to our model fits with the `VolumeStore` interface.  At install, a VI admin can specify an NFS target as a `VolumeStore` (potentially) using a `nfs://host/<path>` URI with a volume store name.  And provided the VCH has access to the network the target is on, the container user only needs to pass the volume store name as one of the `volume create` driver opts to create a volume which will be backed by this shared storage target.  Then many containers can be created with the specified volume attached.
-
-#### Runtime network connectivity validation
-We need to inform the user when a container is being created without the appropriate network required to get connectivity to the NFS target. The container will attempt to mount the `Target` on `start` and fail early if the volume cannot be mounted.  It will be up to the user to communicate with the VI admin and create the container on the appropriate network (*).  If the container _is_ on the appropriate network _OR_ the `Target` can be reached via the NAT, the container should mount the volume successfully and move on with `start`.
-
-(*) Note:  This requires a doc change.
-
-We want to fail early in the case of issues mounting the volume.  Possible errors are
- * network connectivity releated
- * `Target` permission related
- 
-The expectation is the error will be actionable by the user such that if it is a configuration issue related to networking or access, the user can either try the operation again with the right container network configuration, or contact the admin with the action item to allow access to the storage device.
-
-#### VolumeStore
-The `VolumeStore` interface is used by the storage layer to implement the volume storage layer on different backend implementations.  The current implementation used by VIC is to manipulate vsphere `.vmdk` backed block devices on the Datastore.  We have create a similar implementation for `NFS` based volume stores.
-
-The advantage to using the interface is the storage layer maintains consistency of the volumes regardless of the storage backend used.  For instance it checks all containers during `volume destroy` to see if the named volume is still referenced by another container (whether the container is powered `on` or `off`).
-
-[For reference](https://github.com/vmware/vic/blob/master/lib/portlayer/storage/volume.go#L36)
-```
- 35 // VolumeStorer is an interface to create, remove, enumerate, and get Volumes.
- 36 type VolumeStorer interface {
- 37 »···// Creates a volume on the given volume store, of the given size, with the given metadata.
- 38 »···VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*Volume, error)
- 39
- 40 »···// Destroys a volume
- 41 »···VolumeDestroy(op trace.Operation, vol *Volume) error
- 42
- 43 »···// Lists all volumes
- 44 »···VolumesList(op trace.Operation) ([]*Volume, error)
-  ...
- 48 }
-```
-
-When we create the NFS `VolumeStore`, we'll store the NFS target parameters (`host` + `path`) in the implementation's struct.  This is the only information we'll need to mount the NFS target on the container. NFS based volume stores will work for the default volume store as well.
-
-```
-
-// VolumeStore stores nfs-related volume store information
-type VolumeStore struct {
-	// volume store name
-	Name string
-
-	// Service is the interface to the nfs target.
-	Service MountServer
-
-	// SelfLink to volume store.
-	SelfLink *url.URL
-}
-
-
-```
-
-
-On creation the volume store target path is mounted to the VCH and the volumes directory and metadata direectories are made under that target path. The client used is one that sits in the user space of the portlayer, this is from the vendored go-nfs client in our vendor directory [For Reference](github.com/fdawg4l/go-nfs-client/nfs). This avoids the issue of The `linux` VFS implementation throwing `sync` errors when mounts are unavailable.
-
-In a container, the volume will be mounted during tether boot time, using the man (2) version of the nfs mount call found in the golang syscall package. Currently, the mount options are not configurable, there are plans to address this going forward as an improvement to the nfs volume implementation. These will be configurable by the VI admin at volume store creation time. They will be configured as query parameters for the url supplied as an nfs target. 
-
-Currently a decision must still be made on how we respond to failed mounts due to a target being unreachable at mount time. This is possible when the target endpoint goes down, or the network topology falls out from under the container. Currently, we have no bidirectional communication between the tether and the portlayer. The current option is to fail the launch of the container, though this is not optimal without returning an appropriate error message to the user(we want the user to be able to rectify the issue, or as above to be able to submit an actionable ticket to their vi admin).
-
-#### VolumeCreate
-In the vsphere model, a volume is a `.vmdk` backed block device.  Creation of a volume entails attaching a new disk to the VCH, preparing it with a filesystem, and detaching it.  The resulting `.vmdk` lives in its own folder in the volume store directory (specified during install w/ `vic-machine`).  We're going to follow the same model except there is nothing to prepare.  Each volume will be a directory (which the container client will mount directly) and live at the top of the volume store directory (which we will prepare during install).  We will create the directory for the volume content as well as a directory that sits next to the `volumes` directory. Under the `volumes` directory a directory named after the volume name will be made, that will be the mount target at tether mount time (this path will look like `<vs path>/volumes/<volume id>/<volume contents>`). Likewise, the metadata will be housed under a path denoted under a metadata directory and fetched along with the volume(this path will look like `<vs path>/metadata/<volume id>/dockerMetadata`, the file name is determined by the personality that makes the create request).
-
-Some pseudocode: 
-```
-func VolumeCreate() {
-// volPath := vicVolumePath(nameOfVolume)
-// mkdir volPath
-// metadataPath := vicVolumeMetaDataPath(nameOfVolume, infomap)
-.. mkdir metadataPath
-// return volPath
-}
-```
-#### VolumeDestroy
-Likewise destroying the volume is simply removing the volume's top level directory as well as removing the metadata file. 
-```
-func VolumeDestroy() {
-// volPath := vicVolumePath(nameOfVolume)
-// rm -rf volPath
-// metadataPath := vicVolumeMetaDataPath(nameOfVolume, infomap)
-// rm -rf metadataPath
-// return $?
-}
-```
-
-#### VolumeList
-Listing the volumes is just listing the diretories at the top of the volume store location
-```
-func VolumesList() {
-// volums :=  ls -l vicVolumePath(.)
-// volumeMetadatas := ls -l vicVolumeMetaDataDir(.)
-// volSlice := MatchVolumesAndMetada(volumes, volumeMetadatas)
-// return volMap
-}
-```
-
-### Testing
-
-#### Functional
-
- 1. Create a VCH with an NFS backed `VolumeStore`, create a volume on the `VolumeStore`, create 2 containers with the volume attached, touch a file from the first container, verify it exists on the 2nd.  Destroy the 2nd container, attempt to destroy the volume and expect a failure.  Poweroff the first container, reattempt destroy of the volume, it should fail.  Then destroy the container and destroy the volume. 
- 2. Create a VCH with a nonreachable NFS backed `VolumeStore`.  Check that vic-machine warns about the lack of creation of that volume store. Possibly check for the appropriate logging in the portlayer logs. 
- 3. Create a VCH with an NFS backed `VolumeStore`, create a volume on said store. Attach this volume to two different cotainers. Touch a file in the volume with container 1. Confirm that this file shows up in container 2. Remove the VCH and confirm that the volume store is removed as well. 
- 4. Create a VCH with an NFS volume store. create a volume and attach it to a container. Touch a file inside the volume attached to that container. Tear down the VCH. Create a new VCh with the same NFS volume store target. Check that the created volume is still there. Attach it to a container. Check that the touched file appears inside the volume. 
- 5. Create a volume store with multiple NFS Volume Stores. Create volumes on each store. Mount each of those volumes to the same container. Touch files to them. attach all volumes to a second container. Make sure that all touched files are present (multiple volume version of test 3)
- 6. Create a VCH with an nfs volume store. Create a volume attach it to a running container. Attempt to remove the volume. Expect to get a `Volume in Use` error. 
- 7. Create a VCH with an nfs store tagged as the `default store`. Test all the functionalities of the anonymous volume functionality (this will likely be multiple tests there are already several tests to mirror from our vmdk based volume store).
- 
- Note: there are more tests, and these tests should also be added to the integration tests ticket.
- 
- 
-#### Unit
-
-Whether the `VolumeStore` implementation uses the local VCH to mount the NFS or uses a client library to manipulate the target, the Storer implementation should sit in front of an interface which can be mocked.  The mock should write to the local filesystem so the storer interface can be tested end to end without requiring an NFS server.
-
-The NFS volume store implementation has unit tests. These unit tests can be run with or without an NFS server. To test it against an active NFS server you must run `go test` with the environment var `NFS_TEST_URL` set to the nfs target e.g. `NFS_TEST_URL=nfs://my.nfs.com/my/share/point`.
-
-### Possible questions
- 1. Is there any mechanism by which we can indicate available space in the volumestore? Is this necessary data for functional usage.
-    * Answer: See Non-requirement 3
- 1. Should we allow for read-only volume store? - e.g. publishing datasets for consumption
-    * Answer: Needs investigation.  What is RO here (the target or the directory) and what would the container user want to see or expect when such a target was used? This could involve us passing in more arguments at volume creation time. 
- 1. Failure handling;  what do we do if a mount is unavailable, does the container go down?
-    * Answer:  Needs investigation.  We're relying on the kernel nfs client in the container to handle failures to the target.  There is little we can do during run-time, but we can check availability during container create at a minimum. This has been detailed further above. Currently, the result of an unavailable mount is a silent failure. This is actually detrimental to customers, if they do not check the status of their mounts manually (very unlikely) then it is very possible they will run a container believing that data is being persisted. [Tracking Ticket Reference](https://github.com/vmware/vic/issues/4850)
- 1. NFS target mount options-  How do you pass a `uid`/`gid` or `nosquash` mapping?  How do you map `uid`/`gid` to the container at all?
-    * Answer:  Requirement and usage needs to be thought through at a higher level.  Mapping of users into containers and mapping of credentials into containers need to be solved in the system as a whole.  However things like `sync` and `retries` will be specified as a driver option invoked with `vic-machine`, and passed out of band to the container.  The container users will not be able to specify mount options specific to the target. Currently, `uid` and `gid` are supported via passing them in as query arguments when specifying the NFS volume store target. These are the only configurable options for now, more discussion will be needed surrounding how we want to handle allowing configuration at target creation time and volume creation time. It is likely that customer feedback( and seeing how customers want to use this) will help drive part of the architecture for mount options. 
diff --git a/installer/vendor/github.com/vmware/vic/doc/processes/BRANCHING.md b/installer/vendor/github.com/vmware/vic/doc/processes/BRANCHING.md
deleted file mode 100644
index 35eec032e4..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/processes/BRANCHING.md
+++ /dev/null
@@ -1,52 +0,0 @@
-# VIC Branching
-
-This document is used to define a strategy to enable development and testing of
-release candidate, patch found issues, while allowing development of future
-releases by way of branching and tagging.
-
-## Requirements
-
-_(Not in priority order)_
-* To insulate development of future releases from RC / GA testing and development.
-  * Allow development of future releases.
-  * Avoid breaking RC releases while in testing.
-
-_Non requirements_
-* Define how to enable development of new features on MASTER or otherwise.
-* Define how to test RC / GA releases.
-* Define criteria for backporting or forward porting of found bugfixes, features, etc.
-* Define release trains for patching GA released builds.
-* Define release criteria for RC
-
-## Proposal
-
-We can keep changes isolated from RC / GA testing by way of `git` branches.
-
-###Branching###
-* Use [master](http://github.com/vmware/vic) for future release work.
-* Use RC branch (`releases/MAJOR.MINOR.MACRO`) for RC release work.
-  * `TAG` branch for each RC
-  * `TAG` with `MACRO++` for each patch.
-
-###Accounting###
-* Targeting
-  * Bugs found in RC branch need an issue before merging fix to branch targeted to RC, e.g. `targeted/<RC branch name>`
-  * Ideally patch should be merged to `MASTER` first if it exists there too.
-  * Only if issue is targeted for RC, a different PR with the same issue number for the RC branch.
-  * Only close issue after each relevant and targeted release has had a fixed merged to it.  We can use targeting to verify this.
-* Bugs found in `MASTER` or any RC branch need to be tagged, e.g.`exists/<branches>`
-* The release branch will live as long as our support contract exists on that branch, once support sunsets we can remove the branch
-* The CI system will build all branches within the `releases/*` naming convention on push or tag event and publish the binary to our public binary location
-
-```
-
-MASTER -------------------------------------------------->
-           \                                 \
-           0.7----------------                \
-               \              \                \
-               TAG 0.7.1   TAG 0.7.2            \
-                                                 \
-                                                 0.8---->
-
-
-```
diff --git a/installer/vendor/github.com/vmware/vic/doc/processes/RELEASE-PROCESS.md b/installer/vendor/github.com/vmware/vic/doc/processes/RELEASE-PROCESS.md
deleted file mode 100644
index e8e09d8090..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/processes/RELEASE-PROCESS.md
+++ /dev/null
@@ -1,65 +0,0 @@
-# VIC Engine Release Process
-
-## Release cycle
-
-VIC Engine is developed using a feature driven model. Requirements are broken
-down into features and then sized to ensure they will fit into our monthly
-releases.  Any features that do not are then reworked until they will fit. Any
-features under active development that do not make the monthly release will be
-pushed into the next months version.  
-
-See [CONTRIBUTING.md](../../CONTRIBUTING.md#reporting-bugs-and-creating-issues)
-for details on how issues are prioritized and tracked.
-
-## Release Versioning
-
-The VIC Engine project follows Semantic Versioning 2.0.0. This is described in
-detail at http://semver.org/
-
-## Example VIC Engine Versions Major revisions:
-
-    v1.0.0-beta1 v1.0.0-beta2 v1.0.0-beta v1.0.0 v2.0.0-alpha v2.0.0-beta
-v2.0.0
-
-Minor revisions:
-
-    v1.1.0-beta v1.1.0 v2.2.0
-
-Update or patch revisions:
-
-    v1.12.1 v1.12.20
-
-## Release details
-
-VIC Engine is released in both source and binary form. The source is tagged
-using github tagging methods. This is manual for now.
-
-The binary releases are posted at https://console.cloud.google.com/storage/browser/vic-engine-releases/
-
-### Update README.md and documentation
-
-The main repo README contains a project status relating to the latest tagged
-release along with guidance on how to build, deploy, et al. The latter should
-be updated by any commits changing those workflows, but the status and what's
-new needs to be addressed as part of the release process.
-
-* Create a PR, "Release x.y", with the corresponding doc updates once tagging
-  is imminent merge that PR as the last thing that occurs prior to tagging tag
-  the release as described in the next section.
-
-###NOTE: Make sure that the last commit before tag does NOT have [skip ci] in the title
-
-### Tag The Release
-
-* Follow the above Release Versioning for choosing the new version.  Gather the
-  Release Notes file.  Go to https://github.com/vmware/vic/releases and click
-  on Draft a new release.  Add the tag version that meets the requirements for
-  this release.
-* Title the release "vSphere Integrated Containers Engine Version X.Y.Z" where 
-  X.Y.Z meets the versioning requirements.
-* Paste the release note file contents into the Write field and preview.
-* If this is release is non-production ready select the "This is a pre-release"
-  box.
-* After a successful build on tag event, you can find the release here:
-    https://console.cloud.google.com/storage/browser/vic-engine-releases/
-* Update the github releases page with the link to the final release tarball
diff --git a/installer/vendor/github.com/vmware/vic/doc/user/usage.md b/installer/vendor/github.com/vmware/vic/doc/user/usage.md
deleted file mode 100644
index b08c3cf389..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/user/usage.md
+++ /dev/null
@@ -1,325 +0,0 @@
-## Installing Virtual Integrated Containers Engine
-
-The intent is that vSphere Integrated Containers Engine (VIC Engine) should not _require_ an installation step - deploying a [Virtual Container Host](../design/arch/vic-container-abstraction.md#virtual-container-host) (VCH) directly without any prior steps should always be possible. At the current time this is the only approach available.
-
-## Deploying a Virtual Container Host
-
-### Requirements
-
-- ESXi/vCenter - the target virtualization environment.
-   - ESXi - Enterprise license
-   - vCenter - Enterprise plus license, only very simple configurations have been tested.
-- Bridge network - when installed in a vCenter environment vic-machine does not automatically create a bridge network. An existing vSwitch or Distributed Portgroup should be specified via the -bridge-network flag, should not be the same as the external network, and should not have DHCP.
-
-### Privileges and credentials
-
-There is an operations user mechanism provided to allow a VCH to operate with less privileged credentials than are required for deploying a new VCH. These options are:
-* `--ops-user`
-* `--ops-password`
-If neither option is specified then the user supplied via `--target` or `--user` will be used and a warning will be output. If only the `--ops-user` option is provided there will be an interactive prompt for the password.
-At this time vic-machine _does not create_ the operations user, nor does it configure it with minimum set of RBAC permissions necessary for operation - this is actively being worked on (#1689)
-
-Deploying a VCH requires credentials able to:
-* create and configure a resource pool (vApp on vCenter)
-* create a vSwitch (ESX only)
-* create and configure the endpointVM within that pool
-* upload files to datastores
-* inspect much of the vSphere inventory
-
-However operation of a VCH requires only a subset of those privileges:
-* create and configure containerVMs within the VCH resource pool/vApp
-* create/delete/attach/detach disks on the endpointVM
-* attach containerVMs to supplied networks
-* upload to/download from datastore
-
-### Example
-Replace the `<fields>` in the following example with values specific to your environment - this will install VCH to the specified resource pool of ESXi or vCenter, and the container VMs will be created under that resource pool. This example will use DHCP for the API endpoint and will not configure client authentication.
-
-- --target is the URL of the destination vSphere environment in the form `https://user:password@ip-or-fqdn/datacenter-name`. Protocol, user, and password are OPTIONAL. Datacenter is OPTIONAL if targeting ESXi or only one datacenter is configured.
-- --compute-resource is the compute resource where VCH will be deployed to. This should be the name of a cluster or resource pool, e.g. `myCluster` (vCenter), or `myPool` .
-- --thumbprint is the thumbprint of the server's certificate, required if the certificate cannot be validated with a trusted certificate authority (`--force` will accept whatever certificate is presented)
-- Note: environment variables can be set instead of these options:
-    - --target => VIC\_MACHINE\_TARGET
-    - --user => VIC\_MACHINE\_USER
-    - --password => VIC\_MACHINE\_PASSWORD
-    - --thumbprint => VIC\_MACHINE_THUMBPRINT
-
-```
-vic-machine-linux create --target <target-host>[/datacenter] --user <root> --password <password> --thumbprint <certificate thumbprint> --compute-resource <cluster or resource pool name> --image-store <datastore name> --name <vch-name> --no-tlsverify
-```
-
-This will, if successful, produce output similar to the following when deploying VIC Engine onto an ESXi (output was generated with --client-network-ip specified instead of `--no-tlsverify` denoted above):
-```
-INFO[2016-11-07T22:01:22Z] Using client-network-ip as cname for server certificates - use --tls-cname to override: x.x.x.x
-WARN[2016-11-07T22:01:22Z] Using administrative user for VCH operation - use --ops-user to improve security (see -x for advanced help)
-INFO[2016-11-07T22:01:22Z] Generating CA certificate/key pair - private key in ./XXX/ca-key.pem
-INFO[2016-11-07T22:01:22Z] Generating server certificate/key pair - private key in ./XXX/server-key.pem
-INFO[2016-11-07T22:01:22Z] Generating client certificate/key pair - private key in ./XXX/key.pem
-INFO[2016-11-07T22:01:22Z] Generated browser friendly PFX client certificate - certificate in ./XXX/cert.pfx
-INFO[2016-11-07T22:01:22Z] ### Installing VCH ####
-INFO[2016-11-07T22:01:22Z] Validating supplied configuration
-INFO[2016-11-07T22:01:22Z] Configuring static IP for additional networks using port group "VM Network"
-INFO[2016-11-07T22:01:23Z] Firewall status: DISABLED on "/ha-datacenter/host/esx.localdomain/esx.localdomain"
-WARN[2016-11-07T22:01:23Z] Firewall configuration will be incorrect if firewall is reenabled on hosts:
-WARN[2016-11-07T22:01:23Z]   "/ha-datacenter/host/esx.localdomain/esx.localdomain"
-WARN[2016-11-07T22:01:23Z] Firewall must permit 2377/tcp outbound if firewall is reenabled
-INFO[2016-11-07T22:01:23Z] License check OK
-INFO[2016-11-07T22:01:23Z] DRS check SKIPPED - target is standalone host
-INFO[2016-11-07T22:01:23Z]
-INFO[2016-11-07T22:01:23Z] Creating Resource Pool "XXX"
-INFO[2016-11-07T22:01:23Z] Creating directory [datastore1] volumes
-INFO[2016-11-07T22:01:23Z] Datastore path is [datastore1] volumes
-INFO[2016-11-07T22:01:23Z] Creating appliance on target
-INFO[2016-11-07T22:01:23Z] Network role "management" is sharing NIC with "client"
-INFO[2016-11-07T22:01:23Z] Network role "external" is sharing NIC with "client"
-INFO[2016-11-07T22:01:23Z] Uploading images for container
-INFO[2016-11-07T22:01:23Z]      "bootstrap.iso"
-INFO[2016-11-07T22:01:23Z]      "appliance.iso"
-INFO[2016-11-07T22:01:30Z] Waiting for IP information
-INFO[2016-11-07T22:01:44Z] Waiting for major appliance components to launch
-INFO[2016-11-07T22:01:54Z] Initialization of appliance successful
-INFO[2016-11-07T22:01:54Z]
-INFO[2016-11-07T22:01:54Z] vic-admin portal:
-INFO[2016-11-07T22:01:54Z] https://x.x.x.x:2378
-INFO[2016-11-07T22:01:54Z]
-INFO[2016-11-07T22:01:54Z] Published ports can be reached at:
-INFO[2016-11-07T22:01:54Z] x.x.x.x
-INFO[2016-11-07T22:01:54Z]
-INFO[2016-11-07T22:01:54Z] Docker environment variables:
-INFO[2016-11-07T22:01:54Z] DOCKER_TLS_VERIFY=1 DOCKER_CERT_PATH=/home/vagrant/vicsmb/src/github.com/vmware/vic/bin/XXX DOCKER_HOST=x.x.x.x:2376
-INFO[2016-11-07T22:01:54Z]
-INFO[2016-11-07T22:01:54Z] Environment saved in XXX/XXX.env
-INFO[2016-11-07T22:01:54Z]
-INFO[2016-11-07T22:01:54Z] Connect to docker:
-INFO[2016-11-07T22:01:54Z] docker -H x.x.x.x:2376 --tlsverify --tlscacert="./XXX/ca.pem" --tlscert="./XXX/cert.pem" --tlskey="./XXX/key.pem" info
-INFO[2016-11-07T22:01:54Z] Installer completed successfully
-```
-
-## Deleting a Virtual Container Host
-
-Specify the same resource pool and VCH name used to create a VCH, then the VCH will removed, together with the created containers, images, and volumes, if --force is provided. Here is an example command and output - replace the `<fields>` in the example with values specific to your environment.
-
-```
-vic-machine-linux delete --target <target-host>[/datacenter] --user <root> --password <password> --compute-resource <cluster or resource pool name> --name <vch-name>
-INFO[2016-06-27T00:09:25Z] ### Removing VCH ####
-INFO[2016-06-27T00:09:26Z] Removing VMs
-INFO[2016-06-27T00:09:26Z] Removing images
-INFO[2016-06-27T00:09:26Z] Removing volumes
-INFO[2016-06-27T00:09:26Z] Removing appliance VM network devices
-INFO[2016-06-27T00:09:27Z] Removing Portgroup XXX
-INFO[2016-06-27T00:09:27Z] Removing VirtualSwitch XXX
-INFO[2016-06-27T00:09:27Z] Removing Resource Pool XXX
-INFO[2016-06-27T00:09:27Z] Completed successfully
-```
-
-
-## Inspecting a Virtual Container Host
-
-Specify the same resource pool and VCH name used to create a VCH, vic-machine inspect can show the VCH information.
-
-```
-vic-machine-linux inspect --target <target-host>[/datacenter] --user <root> --password <password> --compute-resource <cluster or resource pool name> --name <vch-name>
-INFO[2016-10-08T23:40:28Z] ### Inspecting VCH ####
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] VCH ID: VirtualMachine:286
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] Installer version: v0.6.0-0-0fac2c0
-INFO[2016-10-08T23:40:29Z] VCH version: v0.6.0-0-0fac2c0
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] VCH upgrade status:
-INFO[2016-10-08T23:40:29Z] Installer has same version as VCH
-INFO[2016-10-08T23:40:29Z] No upgrade available with this installer version
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] vic-admin portal:
-INFO[2016-10-08T23:40:29Z] https://x.x.x.x:2378
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] Docker environment variables:
-INFO[2016-10-08T23:40:29Z]   DOCKER_HOST=x.x.x.x:2376
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z]
-INFO[2016-10-08T23:40:29Z] Connect to docker:
-INFO[2016-10-08T23:40:29Z] docker -H x.x.x.x:2376 --tls info
-INFO[2016-10-08T23:40:29Z] Completed successfully
-```
-
-
-## Enabling SSH to Virtual Container Host appliance
-Specify the same resource pool and VCH name used to create a VCH, vic-machine debug will enable SSH on the appliance VM and then display the VCH information, now with SSH entry.
-
-```
-vic-machine-linux debug --target <target-host>[/datacenter] --user <root> --password <password> --compute-resource <cluster or resource pool name> --name <vch-name> --enable-ssh --rootpw <other password> --authorized-key <keyfile>
-INFO[2016-10-08T23:41:16Z] ### Configuring VCH for debug ####
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] VCH ID: VirtualMachine:286
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] Installer version: v0.6.0-0-0fac2c0
-INFO[2016-10-08T23:41:16Z] VCH version: v0.6.0-0-0fac2c0
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] SSH to appliance
-INFO[2016-10-08T23:41:16Z] ssh root@x.x.x.x
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] vic-admin portal:
-INFO[2016-10-08T23:41:16Z] https://x.x.x.x:2378
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] Docker environment variables:
-INFO[2016-10-08T23:41:16Z]   DOCKER_HOST=x.x.x.x:2376
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z]
-INFO[2016-10-08T23:41:16Z] Connect to docker:
-INFO[2016-10-08T23:41:16Z] docker -H x.x.x.x:2376 --tls info
-INFO[2016-10-08T23:41:16Z] Completed successfully
-```
-
-## List Virtual Container Hosts
-
-vic-machine ls can list all VCHs in your VC/ESXi, or list all VCHs under the provided resource pool by compute-resource parameter.
-```
-vic-machine-linux ls --target <target-host> --user <root> --password <password>
-INFO[2016-08-08T16:21:57-05:00] ### Listing VCHs ####
-
-ID                           PATH                                                   NAME
-VirtualMachine:vm-189        /dc1/host/cluster1/Resources/test1/test1-2        test1-2-1
-VirtualMachine:vm-189        /dc2/host/cluster2/Resources/test2/test2-2        test2-2-1
-```
-
-```
-vic-machine-linux ls --target <target-host>/dc1 --user <root> --password <password> --compute-resource test1
-INFO[2016-08-08T16:25:50-02:00] ### Listing VCHs ####
-
-ID                           PATH                                                   NAME
-VirtualMachine:vm-189        /dc1/host/cluster1/Resources/test1/test1-2        test1-2-1
-```
-
-
-## Configuring Volumes in a Virtual Container Host
-
-Volumes are implemented as VMDKs and mounted as block devices on a containerVM. This means that they cannot be used concurrently by multiple running, containers. Attempting to start a container that has a volume attached that is in use by a running container will result in an error.
-
-The location in which volumes are created can be specified at creation time via the `--volume-store` argument. This can be supplied multiple times to configure multiple datastores or paths:
-```
-vic-machine-linux create --volume-store=datastore1/some/path:default --volume-store=ssdDatastore/other/path:fast ...
-```
-
-The volume store to use is specified via driver optons when creating volumes (capacity is in MB):
-```
-docker volume create --name=reports --opts VolumeStore=fast --opt Capacity=1024
-```
-
-Providing a volume store named `default` allows the driver options to be omitted in the example above and enables anoymous volumes including those defined in Dockerfiles, e.g.:
-```
-docker run -v /var/lib/data -it busybox
-```
-
-
-## Exposing vSphere networks within a Virtual Container Host
-
-vSphere networks can be directly mapped into the VCH for use by containers. This allows a container to expose services to the wider world without using port-forwarding:
-
-```
-vic-machine-linux create --container-network=vpshere-network:descriptive-name
-```
-
-A container can then be attached directly to this network and a bridge network via:
-```
-docker create --net=descriptive-name haproxy
-docker network connect bridge <container-id>
-```
-
-Currently the container does **not** have a firewall configured in this circumstance ([#692](https://github.com/vmware/vic/issues/692)).
-
-
-## TLS configuration
-
-There are three TLS configurations available for the API endpoint - the default configuration is _mutual authentication_.
-If there is insufficient information via the create options to use that configuration you will see the following help output:
-```
-ERRO[2016-11-07T19:53:44Z] Common Name must be provided when generating certificates for client authentication:
-INFO[2016-11-07T19:53:44Z]   --tls-cname=<FQDN or static IP> # for the appliance VM
-INFO[2016-11-07T19:53:44Z]   --tls-cname=<*.yourdomain.com>  # if DNS has entries in that form for DHCP addresses (less secure)
-INFO[2016-11-07T19:53:44Z]   --no-tlsverify                  # disables client authentication (anyone can connect to the VCH)
-INFO[2016-11-07T19:53:44Z]   --no-tls                        # disables TLS entirely
-INFO[2016-11-07T19:53:44Z]
-ERRO[2016-11-07T19:53:44Z] Create cannot continue: unable to generate certificates
-ERRO[2016-11-07T19:53:44Z] --------------------
-ERRO[2016-11-07T19:53:44Z] vic-machine-linux failed: provide Common Name for server certificate
-```
-
-The [`--tls-cert-path`](#certificate-names-and---tls-cert-path) option applies to all of the TLS configurations other than --no-tls.
-
-
-#### Disabled, `--no-tls`
-Disabling TLS completely is strongly discouraged as it allows trivial snooping of API traffic by entities on the same network. When using this option the API will be served over HTTP, not HTTPS.
-
-
-#### Server authentication, `--no-tlsverify`
-In this configuration the API endpoint has a certificate that clients will use to validate the identity of the server. This allows the client to trust the server, but the server does not require
-authentication or authorization of the client. If no certificate is provided then a self-signed certificate will be generated.
-
-If using a pre-created certificate, the following options are used:
-- `--tls-server-key` - path to key file in PEM format
-- `--tls-server-cert` - path to certificate file in PEM format
-
-
-#### Mutual authentication (tlsverify)
-
-Mutual authentication, also referred to as _tlsverify_, means that the client must authenticate by presenting a certificate to the server in addition to the server authentication with the client.
-In this configuration the vicadmin server also requires authentication, which can be via client certificate.
-
-If using pre-created certificates the following option must be provided in addition to the server authentication options above.
-- `--tls-ca` - path to certificate authority to vet client certificates against in PEM format. May be specified multiple times.
-
-As a convenience, vic-machine will generate authority, server, and client certificates if a Common Name is provided.
-- `--tls-cname` - FQDN or static IP of the API endpoint. This can be an FQDN wildcard to allow use with DHCP if DNS has entries for the DHCP allocated addresses.
-
-These are self-signed certificates and therefore clients will need to be explicit about the certificate authority in order to perform validation.
-See [the docker documentation](https://docs.docker.com/engine/security/https/) about TLSVERIFY for details of docker client
-configuration (note that the _DOCKER_TLS_VERIFY_ environment variable must be removed from the environment completely to prevent it taking effect)
-
-The following can be used for minimal customization of the generated certificates:
-- `--organisation` - shown to clients to help distinguish certificates
-- `--certificate-key-size`
-
-If using a static IP for the API endpoint via the following option, a server certificate will be generated using that IP address as the Common Name unless certificates are provided
-or `--no-tlsverify` is specified.
-- `--client-network-ip` - IP or FQDN to use for the API endpoint
-
-
-#### Certificate names and `--tls-cert-path`
-
-If using the `--tls-server-key` and `--tls-server-cert` options, any filename and path can be provided for the server certificate and key. However when generating certificates the following standard names are used:
-* server-cert.pem
-* server-key.pem
-* cert.pem
-* key.pem
-* ca.pem
-
-The default value of `--tls-cert-path` is that of the `--name` parameter, in the current working directory, and is used as:
-1. the location to check for existing certificates, by the default names detailed above.
-2. the location to save generated certificates, which will occur only if existing certificates are not found
-
-The certificate authority (CA) in the certificate path will only be loaded if no CA is specified via the `--tls-ca` option.
-
-If a warning in the form below is received during creation it means that client authentication was enabled (a certificate authority was provided), but neither that authority nor the ones configured
-on the system were able to verify the provided server certificate. This can be a valid configuration, but should be checked:
-```
-Unable to verify server certificate with configured CAs: <additional detail>
-```
-
-_NOTE: while it is possible to mix generated and pre-created client and server certificates additional care must be taken to ensure a working setup_
-
-Sample `vic-machine` output when loading existing certificates for a tlsverify configuration:
-```
-INFO[2016-11-11T23:58:02Z] Using client-network-ip as cname where needed - use --tls-cname to override: 192.168.78.127
-INFO[2016-11-11T23:58:02Z] Loaded server certificate ./xxx/server-cert.pem
-INFO[2016-11-11T23:58:02Z] Loaded CA with default name from certificate path xxx
-INFO[2016-11-11T23:58:02Z] Loaded client certificate with default name from certificate path xxx
-```
-
-#### Using client certificates with wget or curl
-
-To use client certificates with wget and curl requires adding the following options:
-```
-wget --certificate=/path/to/cert --private-key=/path/to/key
-curl --cert=/path/to/cert --key=/path/to/key
-```
-[Issues relating to Virtual Container Host deployment](https://github.com/vmware/vic/labels/component%2Fvic-machine)
diff --git a/installer/vendor/github.com/vmware/vic/doc/user_doc/README.md b/installer/vendor/github.com/vmware/vic/doc/user_doc/README.md
deleted file mode 100644
index a7239d58b3..0000000000
--- a/installer/vendor/github.com/vmware/vic/doc/user_doc/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# vSphere Integrated Containers Engine Documentation #
-
-The Markdown source files for vSphere Integrated Containers Engine have migrated to https://github.com/vmware/vic-product/. 
-
-To access the documentation in navigable and searchable HTML and PDF formats, go to https://vmware.github.io/vic-product/#getting-started.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/Dockerfile b/installer/vendor/github.com/vmware/vic/infra/integration-image/Dockerfile
deleted file mode 100644
index ff3c2200f2..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/Dockerfile
+++ /dev/null
@@ -1,118 +0,0 @@
-# Building:
-# cp -R /usr/lib/vmware-ovftool/ .
-# docker build --no-cache -t vic-test -f Dockerfile .
-# docker tag vic-test gcr.io/eminent-nation-87317/vic-integration-test:1.x
-# gcloud auth login
-# gcloud docker -- push gcr.io/eminent-nation-87317/vic-integration-test:1.x
-# open vpn to CI cluster then run:
-# docker tag vic-test 192.168.31.15/library/vic-integration-test:1.x
-# docker push 192.168.31.15/library/vic-integration-test:1.x
-
-FROM golang:1.8
-
-RUN wget -q -O - https://dl-ssl.google.com/linux/linux_signing_key.pub | apt-key add -
-RUN sh -c 'echo "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" >> /etc/apt/sources.list.d/google.list'
-
-RUN curl -sL https://deb.nodesource.com/setup_7.x | bash - && \
-    apt-get update && apt-get install -y --no-install-recommends \
-    jq \
-    time \
-    gcc \
-    python-dev \
-    libffi-dev \
-    libssl-dev \
-    sshpass \
-    ant \
-	ant-optional \
-    openjdk-7-jdk \
-    rpcbind \
-    nfs-common \
-    unzip \
-    zip \
-    bzip2 \
-	nodejs \
-	parted \
-    # Add docker in docker support
-    btrfs-tools \
-    e2fsprogs \
-    iptables \
-    xfsprogs \
-    dnsutils \
-    netcat \
-    # Add headless chrome support
-    google-chrome-stable \
-    # Speed up ISO builds with already installed reqs
-    yum \
-    yum-utils \
-    cpio \
-    rpm \
-    ca-certificates \
-    xz-utils \
-    xorriso && \
-	# Cleanup
-    apt-get autoremove -y && \
-    rm -rf /var/lib/apt/lists/*
-
-
-RUN wget https://bootstrap.pypa.io/get-pip.py && \
-    python ./get-pip.py  && \
-    pip install pyasn1 google-apitools==0.5.15 gsutil robotframework robotframework-sshlibrary robotframework-httplibrary requests dbbot robotframework-selenium2library --upgrade
-
-# Install docker, docker clients 1.11,1.12 and 1.13
-# Also install docker compose 1.13
-RUN curl -sSL https://get.docker.com/ | sh && \
-    curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.11.2.tgz && \
-    tar --strip-components=1 -xvzf docker-1.11.2.tgz -C /usr/bin &&  \
-    mv /usr/bin/docker /usr/bin/docker1.11 && \
-    curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.12.6.tgz && \
-    tar --strip-components=1 -xvzf docker-1.12.6.tgz -C /usr/bin  && \
-    mv /usr/bin/docker /usr/bin/docker1.12 && \
-    curl -fsSLO https://get.docker.com/builds/Linux/x86_64/docker-1.13.0.tgz && \
-    tar --strip-components=1 -xvzf docker-1.13.0.tgz -C /usr/bin && \
-    mv /usr/bin/docker /usr/bin/docker1.13 && \
-    ln -s /usr/bin/docker1.13 /usr/bin/docker && \
-    curl -L https://github.com/docker/compose/releases/download/1.11.2/docker-compose-`uname -s`-`uname -m` > /usr/local/bin/docker-compose && \
-    chmod +x /usr/local/bin/docker-compose
-
-COPY vmware-ovftool /usr/lib/vmware-ovftool
-RUN ln -s /usr/lib/vmware-ovftool/ovftool /usr/local/bin/ovftool
-
-RUN curl -fsSLO https://releases.hashicorp.com/packer/0.12.2/packer_0.12.2_linux_amd64.zip && \
-    unzip packer_0.12.2_linux_amd64.zip -d /usr/bin && \
-	rm packer_0.12.2_linux_amd64.zip
-
-RUN curl http://downloads.drone.io/release/linux/amd64/drone.tar.gz | tar zx && \
-    install -t /usr/local/bin drone
-
-RUN curl -sSL https://github.com/vmware/govmomi/releases/download/v0.15.0/govc_linux_amd64.gz | gzip -d > /usr/local/bin/govc && \
-    chmod +x /usr/local/bin/govc
-
-RUN  wget http://mirrors.kernel.org/ubuntu/pool/main/w/wget/wget_1.18-2ubuntu1_amd64.deb && \
-     dpkg -i wget_1.18-2ubuntu1_amd64.deb
-
-# Add docker in docker support
-# version: docker:1.13-dind
-# reference: https://github.com/docker-library/docker/blob/b202ec7e529f5426e2ad7e8c0a8b82cacd406573/1.13/dind/Dockerfile
-#
-# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#runtime-dependencies
-
-# set up subuid/subgid so that "--userns-remap=default" works out-of-the-box
-RUN set -x \
-        && groupadd --system dockremap \
-        && adduser --system --ingroup dockremap dockremap \
-        && echo 'dockremap:165536:65536' >> /etc/subuid \
-        && echo 'dockremap:165536:65536' >> /etc/subgid
-
-ENV DIND_COMMIT 3b5fac462d21ca164b3778647420016315289034
-
-RUN wget "https://raw.githubusercontent.com/docker/docker/${DIND_COMMIT}/hack/dind" -O /usr/local/bin/dind \
-        && chmod +x /usr/local/bin/dind
-
-# This container needs to be run in privileged mode(run with --privileged option) to make it work
-COPY dockerd-entrypoint.sh /usr/local/bin/dockerd-entrypoint.sh
-RUN chmod +x /usr/local/bin/dockerd-entrypoint.sh
-
-COPY scripts /opt/vmware/scripts
-ENV PATH="${PATH}:/opt/vmware/scripts"
-
-VOLUME /var/lib/docker
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/LocalRepo b/installer/vendor/github.com/vmware/vic/infra/integration-image/LocalRepo
deleted file mode 100644
index b97e2fb01c..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/LocalRepo
+++ /dev/null
@@ -1,34 +0,0 @@
-# Building:
-# docker build --no-cache -t local-repo -f LocalRepo .
-# docker tag local-repo gcr.io/eminent-nation-87317/local-repo:x
-# gcloud auth login
-# gcloud docker -- push gcr.io/eminent-nation-87317/local-repo:x
-# open vpn to CI cluster then run:
-# docker tag local-repo 192.168.31.15/library/local-repo:x
-# docker push 192.168.31.15/library/local-repo:x
-
-# Running:
-# docker run -d -p 80:80 local-repo
-FROM fedora:21
-
-RUN yum install yum-plugin-ovl -y && yum install wget createrepo nginx -y
-
-RUN mkdir /usr/share/nginx/html/photon && mkdir /usr/share/nginx/html/photon-updates
-
-ENV EXCLUDE_LIST "index.html*,openjdk*,openjre*,perl*,postgresql*,python-*,\
-python3*,ruby*,subversion*,gnome*,NetworkManager*,cloud*,docker*,grub*,ktap*,\
-kubernetes*,linux-docs*,linux-sound*,linux-tools*,docbook*,httpd*,go-*,jna*,\
-linux-debuginfo*,linux-dev*,linux-docs*,linux-drivers*,linux-oprofile*,linux-sound*,\
-linux-tools*,linux-esx-debuginfo*,linux-esx-devel*,linux-esx-docs*,nginx*,sysdig*"
-
-RUN wget -e robots=off -r -nH -nd -np -R $EXCLUDE_LIST https://vmware.bintray.com/photon_release_1.0_x86_64/x86_64/ -P /usr/share/nginx/html/photon
-RUN wget -e robots=off -r -nH -nd -np -R $EXCLUDE_LIST https://dl.bintray.com/vmware/photon_updates_1.0_x86_64/x86_64/ -P /usr/share/nginx/html/photon-updates
-
-RUN createrepo /usr/share/nginx/html/photon
-RUN createrepo /usr/share/nginx/html/photon-updates
-
-RUN echo "daemon off;" >> /etc/nginx/nginx.conf
-
-EXPOSE 80
-
-CMD [ "/usr/sbin/nginx" ]
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/dockerd-entrypoint.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/dockerd-entrypoint.sh
deleted file mode 100755
index 96b214a15c..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/dockerd-entrypoint.sh
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -e
-
-# Only give socker support by default, use bash arguments to add dockerd parameters
-# Use unix:///var/run/docker-local.sock to avoid collison with /var/run/docker.sock
-
-# no arguments passed
-# or first arg is `-f` or `--some-option`
-if [ "$#" -eq 0 -o "${1#-}" != "$1" ]; then
-	# add our default arguments
-	set -- dockerd \
-		--host=unix:///var/run/docker-local.sock \
-		--storage-driver=vfs \
-                --pidfile=/var/run/docker-local.pid \
-		"$@"
-fi
-
-if [ "$1" = 'dockerd' ]; then
-	# if we're running Docker, let's pipe through dind
-	# (and we'll run dind explicitly with "sh" since its shebang is /bin/bash)
-	set -- sh "$(which dind)" "$@"
-fi
-
-exec "$@"
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/README.md b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/README.md
deleted file mode 100644
index 4940eb0b95..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/README.md
+++ /dev/null
@@ -1,29 +0,0 @@
-# scripts
-
-
-Integration image MUST be rebuilt after updates to scripts in this directory to be included in CI 
-
-
-### ca-test.sh
-
-Generate a root CA and a server certificate
-
-### intermediate-ca-test.sh
-
-Generate a root CA, intermediate CA, and a server certificate
-
-### ubuntu-install-ca.sh
-
-Installs the generated root CA into the system root store
-
-### ubuntu-install-intermediate-ca.sh
-
-Installs the generated intermediate CA into the system root store
-
-### ubuntu-remove-ca.sh
-
-Removes the generated root CA from the system root store
-
-### ubuntu-remove-intermediate-ca.sh
-
-Removes the generated intermediate CA from the system root store
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/bundle-certs.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/bundle-certs.sh
deleted file mode 100755
index 1bc8421f1c..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/bundle-certs.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate a CA and server certificate bundle
-
-set -euf -o pipefail
-
-CA_DIR="/root/ca"
-CA_NAME="STARK_ENTERPRISES_ROOT_CA"
-OUT_DIR="/root/ca/bundle"
-OUT_FILE="/root/ca/cert-bundle.tgz"
-SERVER_CERT_CN="starkenterprises.io"
-
-while getopts ":c:d:f:n:o:" opt; do
-  case $opt in
-    c) CA_NAME="$OPTARG"
-    ;;
-    d) CA_DIR="$OPTARG"
-    ;;
-    f) OUT_FILE="$OPTARG"
-    ;;
-    n) SERVER_CERT_CN="$OPTARG"
-    ;;
-    o) OUT_DIR="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-mkdir -p $OUT_DIR
-cd $CA_DIR
-cp certs/$CA_NAME.crt $OUT_DIR
-cp private/${SERVER_CERT_CN}.key.pem $OUT_DIR
-cp certs/${SERVER_CERT_CN}.cert.pem $OUT_DIR
-dir=$(dirname $OUT_DIR)
-bundle_dir=$(basename $OUT_DIR)
-tar cvf $OUT_FILE -C $dir $bundle_dir
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ca-test.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ca-test.sh
deleted file mode 100755
index 6a9673e559..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ca-test.sh
+++ /dev/null
@@ -1,100 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate a root CA and a server certificate
-
-##### Default configuration options
-SERVER_CERT_CN="starkenterprises.io"
-#####
-
-while getopts ":s:" opt; do
-  case $opt in
-    s) SERVER_CERT_CN="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-
-### Create root CA
-mkdir -p /root/ca
-cp openssl.cnf /root/ca
-cd /root/ca
-mkdir certs crl csr newcerts private
-chmod 700 private
-touch index.txt
-echo 1000 > serial
-
-# Generate root CA key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out private/ca.key.pem 4096
-chmod 400 private/ca.key.pem
-
-# Generate root CA CSR
-openssl req -config openssl.cnf \
-    -new -sha256 \
-    -key private/ca.key.pem \
-    -out csr/ca.csr.pem \
-    -extensions v3_ca \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA"
-
-# Self sign for root CA certificate
-openssl x509 -req -extfile openssl.cnf \
-    -extensions v3_ca \
-    -days 7300 -in csr/ca.csr.pem -signkey private/ca.key.pem -out certs/ca.cert.pem
-
-chmod 444 certs/ca.cert.pem
-openssl x509 -noout -text -in certs/ca.cert.pem
-
-# Output CRT format
-openssl x509 -in certs/ca.cert.pem -inform PEM -out certs/ca.cert.crt
-
-
-### Create server certificate
-cd /root/ca
-# Generate server key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out private/${SERVER_CERT_CN}.key.pem 4096
-chmod 400 private/${SERVER_CERT_CN}.key.pem
-
-# Generate server CSR
-openssl req -config openssl.cnf \
-    -new -sha256 \
-    -key private/${SERVER_CERT_CN}.key.pem \
-    -out csr/${SERVER_CERT_CN}.csr.pem \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Web Services/CN=${SERVER_CERT_CN}"
-
-# Sign CSR with CA key, output server certificate
-openssl ca -config openssl.cnf \
-    -batch \
-    -extensions server_cert \
-    -days 365 -notext -md sha256 \
-    -in csr/${SERVER_CERT_CN}.csr.pem \
-    -out certs/${SERVER_CERT_CN}.cert.pem
-
-chmod 444 certs/${SERVER_CERT_CN}.cert.pem
-openssl x509 -noout -text -in certs/${SERVER_CERT_CN}.cert.pem
-
-# Test certificate
-openssl verify -CAfile certs/ca.cert.pem certs/${SERVER_CERT_CN}.cert.pem
-
-
-### Bundle output
-mkdir bundle
-cp certs/ca.cert.crt bundle
-cp private/${SERVER_CERT_CN}.key.pem bundle
-cp certs/${SERVER_CERT_CN}.cert.pem bundle
-tar cvf cert-bundle.tgz bundle
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-ca.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-ca.sh
deleted file mode 100755
index ab6e676728..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-ca.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate a CA
-
-set -euf -o pipefail
-
-OUTDIR="/root/ca"
-CA_NAME="STARK_ENTERPRISES_ROOT_CA"
-
-while getopts ":c:d:" opt; do
-  case $opt in
-    c) CA_NAME="$OPTARG"
-    ;;
-    d) OUTDIR="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-CONF_DIR=`dirname $0`
-### Create root CA
-mkdir -p $OUTDIR
-cp $CONF_DIR/openssl.cnf $OUTDIR
-cd $OUTDIR
-mkdir certs crl csr newcerts private
-chmod 700 private
-touch index.txt
-echo 1000 > serial
-
-# Generate root CA key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out private/ca.key.pem 4096
-chmod 400 private/ca.key.pem
-
-# Generate root CA CSR
-openssl req -config $CONF_DIR/openssl.cnf \
-    -new -sha256 \
-    -key private/ca.key.pem \
-    -out csr/ca.csr.pem \
-    -extensions v3_ca \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA"
-
-# Self sign for root CA certificate
-openssl x509 -req -extfile $CONF_DIR/openssl.cnf \
-    -extensions v3_ca \
-    -days 7300 -in csr/ca.csr.pem -signkey private/ca.key.pem -out certs/ca.cert.pem
-
-chmod 444 certs/ca.cert.pem
-openssl x509 -noout -text -in certs/ca.cert.pem
-
-# Output CRT format
-openssl x509 -in certs/ca.cert.pem -inform PEM -out certs/$CA_NAME.crt
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-server-key-csr.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-server-key-csr.sh
deleted file mode 100755
index d056be0677..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/generate-server-key-csr.sh
+++ /dev/null
@@ -1,46 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate a server key and CSR for specified CN
-
-set -euf -o pipefail
-
-OUTDIR="/root/ca"
-SERVER_CERT_CN="starkenterprises.io"
-
-while getopts ":d:n:" opt; do
-  case $opt in
-    d) OUTDIR="$OPTARG"
-    ;;
-    n) SERVER_CERT_CN="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-
-cd $OUTDIR
-# Generate server key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out private/${SERVER_CERT_CN}.key.pem 4096
-chmod 400 private/${SERVER_CERT_CN}.key.pem
-
-# Generate server CSR
-openssl req -config openssl.cnf \
-    -new -sha256 \
-    -key private/${SERVER_CERT_CN}.key.pem \
-    -out csr/${SERVER_CERT_CN}.csr.pem \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Web Services/CN=${SERVER_CERT_CN}"
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/intermediate-ca-test.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/intermediate-ca-test.sh
deleted file mode 100755
index dcc0d36f93..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/intermediate-ca-test.sh
+++ /dev/null
@@ -1,146 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Generate a root CA, intermediate CA, and a server certificate
-
-##### Configuration options
-SERVER_CERT_CN="starkenterprises.io"
-#####
-
-while getopts ":s:" opt; do
-  case $opt in
-    s) SERVER_CERT_CN="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-
-### Create root CA
-mkdir -p /root/ca
-cp openssl.cnf /root/ca
-cd /root/ca
-mkdir certs crl csr newcerts private
-chmod 700 private
-touch index.txt
-echo 1000 > serial
-
-# Generate root CA key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out private/ca.key.pem 4096
-chmod 400 private/ca.key.pem
-
-# Generate root CA CSR
-openssl req -config openssl.cnf \
-    -new -sha256 \
-    -key private/ca.key.pem \
-    -out csr/ca.csr.pem \
-    -extensions v3_ca \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA"
-
-# Self sign for root CA certificate
-openssl x509 -req -extfile openssl.cnf \
-    -extensions v3_ca \
-    -days 7300 -in csr/ca.csr.pem -signkey private/ca.key.pem -out certs/ca.cert.pem
-
-chmod 444 certs/ca.cert.pem
-openssl x509 -noout -text -in certs/ca.cert.pem
-
-# Output CRT format
-openssl x509 -in certs/ca.cert.pem -inform PEM -out certs/ca.cert.crt
-
-
-### Create intermediate CA
-cd -
-mkdir -p /root/ca/intermediate
-cp openssl-intermediate.cnf /root/ca/intermediate
-cd /root/ca/intermediate
-mkdir certs crl csr newcerts private
-chmod 700 private
-touch index.txt
-echo 1000 > serial
-echo 1000 > crlnumber
-
-# Generate intermediate CA key
-cd /root/ca
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out intermediate/private/intermediate.key.pem 4096
-chmod 400 intermediate/private/intermediate.key.pem
-
-# Generate intermediate CA CSR
-openssl req -config intermediate/openssl-intermediate.cnf\
-    -new -sha256 \
-    -key intermediate/private/intermediate.key.pem \
-    -out intermediate/csr/intermediate.csr.pem \
-    -extensions v3_intermediate_ca \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Intermediate CA"
-
-# Sign CSR with root CA key
-openssl ca -config openssl.cnf \
-    -batch \
-    -extensions v3_intermediate_ca \
-    -days 3650 -notext -md sha256 \
-    -in intermediate/csr/intermediate.csr.pem \
-    -out intermediate/certs/intermediate.cert.pem
-
-chmod 444 intermediate/certs/intermediate.cert.pem
-openssl x509 -noout -text -in intermediate/certs/intermediate.cert.pem
-
-# Create certificate chain
-cat intermediate/certs/intermediate.cert.pem \
-    certs/ca.cert.pem > intermediate/certs/ca-chain.cert.pem
-chmod 444 intermediate/certs/ca-chain.cert.pem
-
-# Output CRT format
-openssl x509 -in intermediate/certs/intermediate.cert.pem -inform PEM -out intermediate/certs/intermediate.cert.crt
-
-### Create server certificate
-cd /root/ca
-# Generate server key
-# Private key is not encrypted - use -aes256 to specify a password
-openssl genrsa -out intermediate/private/${SERVER_CERT_CN}.key.pem 4096
-chmod 400 intermediate/private/${SERVER_CERT_CN}.key.pem
-
-# Generate server CSR
-openssl req -config intermediate/openssl-intermediate.cnf \
-    -new -sha256 \
-    -key intermediate/private/${SERVER_CERT_CN}.key.pem \
-    -out intermediate/csr/${SERVER_CERT_CN}.csr.pem \
-    -subj "/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Web Services/CN=${SERVER_CERT_CN}"
-
-# Sign CSR with intermediate CA key, output server certificate
-openssl ca -config intermediate/openssl-intermediate.cnf \
-    -batch \
-    -extensions server_cert \
-    -days 365 -notext -md sha256 \
-    -in intermediate/csr/${SERVER_CERT_CN}.csr.pem \
-    -out intermediate/certs/${SERVER_CERT_CN}.cert.pem
-
-chmod 444 intermediate/certs/${SERVER_CERT_CN}.cert.pem
-openssl x509 -noout -text -in intermediate/certs/${SERVER_CERT_CN}.cert.pem
-
-# Test certificate
-openssl verify -CAfile intermediate/certs/ca-chain.cert.pem intermediate/certs/${SERVER_CERT_CN}.cert.pem
-
-
-### Bundle output
-mkdir bundle
-cp certs/ca.cert.crt bundle
-cp intermediate/certs/intermediate.cert.crt bundle
-cp intermediate/certs/ca-chain.cert.pem bundle
-cp intermediate/private/${SERVER_CERT_CN}.key.pem bundle
-cp intermediate/certs/${SERVER_CERT_CN}.cert.pem bundle
-tar cvf cert-bundle.tgz bundle
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl-intermediate.cnf b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl-intermediate.cnf
deleted file mode 100644
index 9bbe8156db..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl-intermediate.cnf
+++ /dev/null
@@ -1,132 +0,0 @@
-# OpenSSL intermediate CA configuration file.
-# Copy to `/root/ca/intermediate/openssl.cnf`.
-
-[ ca ]
-# `man ca`
-default_ca = CA_default
-
-[ CA_default ]
-# Directory and file locations.
-dir               = /root/ca/intermediate
-certs             = $dir/certs
-crl_dir           = $dir/crl
-new_certs_dir     = $dir/newcerts
-database          = $dir/index.txt
-serial            = $dir/serial
-RANDFILE          = $dir/private/.rand
-
-# The root key and root certificate.
-private_key       = $dir/private/intermediate.key.pem
-certificate       = $dir/certs/intermediate.cert.pem
-
-# For certificate revocation lists.
-crlnumber         = $dir/crlnumber
-crl               = $dir/crl/intermediate.crl.pem
-crl_extensions    = crl_ext
-default_crl_days  = 30
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md        = sha256
-
-name_opt          = ca_default
-cert_opt          = ca_default
-default_days      = 375
-preserve          = no
-policy            = policy_loose
-
-[ policy_strict ]
-# The root CA should only sign intermediate certificates that match.
-# See the POLICY FORMAT section of `man ca`.
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ policy_loose ]
-# Allow the intermediate CA to sign a more diverse range of certificates.
-# See the POLICY FORMAT section of the `ca` man page.
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ req ]
-# Options for the `req` tool (`man req`).
-default_bits        = 2048
-distinguished_name  = req_distinguished_name
-string_mask         = utf8only
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md          = sha256
-
-# Extension to add when the -x509 option is used.
-x509_extensions     = v3_ca
-
-[ req_distinguished_name ]
-# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
-countryName                     = Country Name (2 letter code)
-stateOrProvinceName             = State or Province Name
-localityName                    = Locality Name
-0.organizationName              = Organization Name
-organizationalUnitName          = Organizational Unit Name
-commonName                      = Common Name
-emailAddress                    = Email Address
-
-# Optionally, specify some defaults.
-countryName_default             = US
-stateOrProvinceName_default     =
-localityName_default            =
-0.organizationName_default      =
-organizationalUnitName_default  =
-emailAddress_default            =
-
-[ v3_ca ]
-# Extensions for a typical CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ v3_intermediate_ca ]
-# Extensions for a typical intermediate CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ usr_cert ]
-# Extensions for client certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = client, email
-nsComment = "OpenSSL Generated Client Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = clientAuth, emailProtection
-
-[ server_cert ]
-# Extensions for server certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = server
-nsComment = "OpenSSL Generated Server Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer:always
-keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage = serverAuth
-
-[ crl_ext ]
-# Extension for CRLs (`man x509v3_config`).
-authorityKeyIdentifier=keyid:always
-
-[ ocsp ]
-# Extension for OCSP signing certificates (`man ocsp`).
-basicConstraints = CA:FALSE
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, digitalSignature
-extendedKeyUsage = critical, OCSPSigning
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl.cnf b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl.cnf
deleted file mode 100644
index 1473dcb343..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/openssl.cnf
+++ /dev/null
@@ -1,132 +0,0 @@
-# OpenSSL root CA configuration file.
-# Copy to `/root/ca/openssl.cnf`.
-
-[ ca ]
-# `man ca`
-default_ca = CA_default
-
-[ CA_default ]
-# Directory and file locations.
-dir               = /root/ca
-certs             = $dir/certs
-crl_dir           = $dir/crl
-new_certs_dir     = $dir/newcerts
-database          = $dir/index.txt
-serial            = $dir/serial
-RANDFILE          = $dir/private/.rand
-
-# The root key and root certificate.
-private_key       = $dir/private/ca.key.pem
-certificate       = $dir/certs/ca.cert.pem
-
-# For certificate revocation lists.
-crlnumber         = $dir/crlnumber
-crl               = $dir/crl/ca.crl.pem
-crl_extensions    = crl_ext
-default_crl_days  = 30
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md        = sha256
-
-name_opt          = ca_default
-cert_opt          = ca_default
-default_days      = 375
-preserve          = no
-policy            = policy_strict
-
-[ policy_strict ]
-# The root CA should only sign intermediate certificates that match.
-# See the POLICY FORMAT section of `man ca`.
-countryName             = match
-stateOrProvinceName     = match
-organizationName        = match
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ policy_loose ]
-# Allow the intermediate CA to sign a more diverse range of certificates.
-# See the POLICY FORMAT section of the `ca` man page.
-countryName             = optional
-stateOrProvinceName     = optional
-localityName            = optional
-organizationName        = optional
-organizationalUnitName  = optional
-commonName              = supplied
-emailAddress            = optional
-
-[ req ]
-# Options for the `req` tool (`man req`).
-default_bits        = 2048
-distinguished_name  = req_distinguished_name
-string_mask         = utf8only
-
-# SHA-1 is deprecated, so use SHA-2 instead.
-default_md          = sha256
-
-# Extension to add when the -x509 option is used.
-x509_extensions     = v3_ca
-
-[ req_distinguished_name ]
-# See <https://en.wikipedia.org/wiki/Certificate_signing_request>.
-countryName                     = Country Name (2 letter code)
-stateOrProvinceName             = State or Province Name
-localityName                    = Locality Name
-0.organizationName              = Organization Name
-organizationalUnitName          = Organizational Unit Name
-commonName                      = Common Name
-emailAddress                    = Email Address
-
-# Optionally, specify some defaults.
-countryName_default             = US
-stateOrProvinceName_default     =
-localityName_default            =
-0.organizationName_default      =
-organizationalUnitName_default  =
-emailAddress_default            =
-
-[ v3_ca ]
-# Extensions for a typical CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ v3_intermediate_ca ]
-# Extensions for a typical intermediate CA (`man x509v3_config`).
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid:always,issuer
-basicConstraints = critical, CA:true, pathlen:0
-keyUsage = critical, digitalSignature, cRLSign, keyCertSign
-
-[ usr_cert ]
-# Extensions for client certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = client, email
-nsComment = "OpenSSL Generated Client Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, nonRepudiation, digitalSignature, keyEncipherment
-extendedKeyUsage = clientAuth, emailProtection
-
-[ server_cert ]
-# Extensions for server certificates (`man x509v3_config`).
-basicConstraints = CA:FALSE
-nsCertType = server
-nsComment = "OpenSSL Generated Server Certificate"
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer:always
-keyUsage = critical, digitalSignature, keyEncipherment
-extendedKeyUsage = serverAuth
-
-[ crl_ext ]
-# Extension for CRLs (`man x509v3_config`).
-authorityKeyIdentifier=keyid:always
-
-[ ocsp ]
-# Extension for OCSP signing certificates (`man ocsp`).
-basicConstraints = CA:FALSE
-subjectKeyIdentifier = hash
-authorityKeyIdentifier = keyid,issuer
-keyUsage = critical, digitalSignature
-extendedKeyUsage = critical, OCSPSigning
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/sign-csr.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/sign-csr.sh
deleted file mode 100755
index 7e5dd95502..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/sign-csr.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Sign a CSR with specified CA
-
-set -euf -o pipefail
-
-CA_NAME="STARK_ENTERPRISES_ROOT_CA" # used to verify cert signature
-OUTDIR="/root/ca"
-SERVER_CERT_CN="starkenterprises.io"
-
-while getopts ":c:d:n:" opt; do
-  case $opt in
-    c) CA_NAME="$OPTARG"
-    ;;
-    d) OUTDIR="$OPTARG"
-    ;;
-    n) SERVER_CERT_CN="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-
-CONF_DIR=`dirname $0`
-cd $OUTDIR
-openssl ca -config $CONF_DIR/openssl.cnf \
-    -batch \
-    -extensions server_cert \
-    -days 365 -notext -md sha256 \
-    -in csr/${SERVER_CERT_CN}.csr.pem \
-    -out certs/${SERVER_CERT_CN}.cert.pem
-
-chmod 444 certs/${SERVER_CERT_CN}.cert.pem
-openssl x509 -noout -text -in certs/${SERVER_CERT_CN}.cert.pem
-
-# Test certificate
-openssl verify -CAfile certs/$CA_NAME.crt certs/${SERVER_CERT_CN}.cert.pem
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-ca.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-ca.sh
deleted file mode 100755
index 8763a0f3a4..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-ca.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Install CA into root store
-
-CERT_FILE="/root/ca/certs/STARK_ENTERPRISES_ROOT_CA.crt"
-
-while getopts ":f:" opt; do
-  case $opt in
-    f) CERT_FILE="$OPTARG"
-    ;;
-    \?) echo "Invalid option -$OPTARG" >&2
-    ;;
-  esac
-done
-
-cp $CERT_FILE /usr/local/share/ca-certificates
-
-dpkg-reconfigure --frontend=noninteractive ca-certificates
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-intermediate-ca.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-intermediate-ca.sh
deleted file mode 100755
index e2d56ca1bf..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-install-intermediate-ca.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-cp /root/ca/intermediate/certs/intermediate.cert.crt /usr/local/share/ca-certificates
-
-dpkg-reconfigure --frontend=noninteractive ca-certificates
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-reload-cas.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-reload-cas.sh
deleted file mode 100755
index 8cd95eef43..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-reload-cas.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Reload default CAs to remove ALL user installed root certificates
-
-update-ca-certificates --fresh
diff --git a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-remove-intermediate-ca.sh b/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-remove-intermediate-ca.sh
deleted file mode 100755
index c93991a437..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/integration-image/scripts/ubuntu-remove-intermediate-ca.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-rm /usr/local/share/ca-certificates/intermediate.cert.crt
-
-dpkg-reconfigure --frontend=noninteractive ca-certificates
diff --git a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/.gitignore b/installer/vendor/github.com/vmware/vic/infra/machines/devbox/.gitignore
deleted file mode 100644
index a45beaeb8b..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-*.vmdk
diff --git a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/README.md b/installer/vendor/github.com/vmware/vic/infra/machines/devbox/README.md
deleted file mode 100644
index 97eef41a44..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/README.md
+++ /dev/null
@@ -1,143 +0,0 @@
-# Vagrant Dev Box
-
-## Overview
-
-This box is an Ubuntu 16.04 VM with the following setup by default:
-
-* Docker daemon with port forwarded to the Fusion/Workstation host at localhost:12375
-
-* Go toolchain
-
-* Additional tools (lsof, strace, etc)
-
-## Requirements
-
-* Vagrant (https://www.vagrantup.com/downloads.html)
-
-* VMware Fusion or Workstation
-
-* Vagrant Fusion or Workstation license (https://www.vagrantup.com/vmware)
-
-## Provisioning
-
-All files matching _provision*.sh_ in this directory will be applied by the Vagrantfile, you can symlink custom scripts
-if needed.  The scripts are not Vagrant specific and can be applied to a VM running on ESX for example.
-
-## Fusion/Workstation host usage
-
-The following commands can be used from your Fusion or Workstation host.
-
-### Shared Folders
-
-By default your *GOPATH* is shared with the same path as the host.  This is useful if your editor runs
-on the host, then errors on the guest with filename:line info have the same path.  For example, when running the
-following command within the top-level project directory:
-
-``` shell
-vagrant ssh -- make -C $PWD all
-```
-
-### Create the VM
-
-``` shell
-vagrant up
-```
-
-### SSH Access
-
-``` shell
-vagrant ssh
-```
-
-### Docker Access
-
-``` shell
-DOCKER_HOST=localhost:12375 docker ps
-```
-
-### Stop the VM
-
-``` shell
-vagrant halt
-```
-
-### Restart the VM
-
-``` shell
-vagrant reload
-```
-
-### Provision
-
-After you've done a `vagrant up`, the provisioning can be applied without reloading via:
-
-``` shell
-vagrant provision
-```
-
-### Delete the VM
-
-``` shell
-vagrant destroy
-```
-
-## VM guest usage
-
-To open a bash term in the VM, use `vagrant ssh`.
-
-The following commands can be used from devbox VM guest.
-
-``` shell
-cd $GOPATH/src/github.com/vmware/vic
-```
-
-### Local Drone CI test
-
-``` shell
-drone exec -trusted -cache
-```
-
-## Devbox on ESX
-
-The devbox can be deployed to ESX, the same provisioning scripts are applied:
-
-``` shell
-./deploy-esx.sh
-```
-
-### SSH access
-
-``` shell
-ssh-add ~/.vagrant.d/insecure_private_key
-vmip=$(govc vm.ip $USER-ubuntu-1604)
-ssh vagrant@$vmip
-```
-
-### Shared folders
-
-You can share your folder by first exporting via NFS:
-
-```
-echo "$HOME/vic $(govc vm.ip $USER-ubuntu-1604) -alldirs -mapall=$(id -u):$(id -g)" | sudo tee -a /etc/exports
-sudo nfsd restart
-```
-
-Then mount within the ubuntu VM:
-
-``` shell
-ssh vagrant@$vmip sudo mkdir -p $HOME/vic
-ssh vagrant@$vmip sudo mount $(ipconfig getifaddr en1):$HOME/vic $HOME/vic
-```
-Note that you may need to use enN depending on the type of connection you have - use ifconfig to verify.
-Note also that nfs-common is not installed in the box by default.
-
-You can also mount your folder within ESX:
-
-``` shell
-govc datastore.create -type nfs -name nfsDatastore -remote-host $(ipconfig getifaddr en1) -remote-path $HOME/vic
-esxip=$(govc host.info -json | jq -r '.HostSystems[].Config.Network.Vnic[] | select(.Device == "vmk0") | .Spec.Ip.IpAddress')
-ssh root@$esxip mkdir -p $HOME
-ssh root@$esxip /vmfs/volumes/nfsDatastore $HOME/vic
-```
-
-Add `$esxip` to /etc/exports and restart nfsd again.
diff --git a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/deploy-esx.sh b/installer/vendor/github.com/vmware/vic/infra/machines/devbox/deploy-esx.sh
deleted file mode 100755
index 1b955da320..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/deploy-esx.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash -e
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# Deploy Vagrant box to esx
-set -e
-
-if [ "$(uname -s)" = "Darwin" ]; then
-  PATH="/Applications/VMware Fusion.app/Contents/Library:$PATH"
-fi
-
-export GOVC_URL=${GOVC_URL-"root:vagrant@localhost:18443"}
-export GOVC_DATASTORE=${GOVC_DATASTORE-"datastore1"}
-export GOVC_NETWORK=${GOVC_NETWORK-"VM Network"}
-export GOVC_INSECURE=1
-
-echo "deploying to $(awk -F@ '{print $2}' <<<"$GOVC_URL"):"
-govc about
-
-config="$(git rev-parse --show-toplevel)/Vagrantfile"
-box=$(grep vic_dev.vm.box "$config" | awk -F\' '{print $2}')
-provider=$(dirname "$box")
-name=$(basename "$box")
-disk="${name}.vmdk"
-
-pushd "$(dirname "$0")" >/dev/null
-
-if ! govc datastore.ls "${name}/${disk}" 1>/dev/null 2>&1 ; then
-    if [ ! -e "$disk" ] ; then
-        src=$(echo ~/.vagrant.d/boxes/"${provider}"-*-"${name}"/*.*.*/vmware_desktop/disk.vmdk)
-
-        if [ ! -e "$src" ] ; then
-            echo "box not found, install via: vagrant box add --provider vmware_desktop $box"
-            exit 1
-        fi
-
-        echo "converting vagrant box for ESX..."
-        vmware-vdiskmanager -r "$src" -t 0 "$disk"
-    fi
-
-    echo "importing vmdk to datastore ${GOVC_DATASTORE}..."
-    govc import.vmdk "$disk" "$name"
-fi
-
-vm_name=${VM_NAME-"${USER}-${name}"}
-vm_memory=${VM_MEMORY-$(grep memory "$config" | awk -F\= 'FNR == 1 {gsub(/ /, "", $2); print $2}')}
-
-if [ -z "$(govc ls "vm/$vm_name")" ] ; then
-    echo "creating VM ${vm_name}..."
-
-    govc vm.create -m "$vm_memory" -c 2 -g ubuntu64Guest -disk.controller=pvscsi -on=false "$vm_name"
-
-    govc vm.disk.attach -vm "$vm_name" -link=true -disk "$name/$disk"
-
-    govc device.cdrom.add -vm "$vm_name"
-
-    govc vm.power -on "$vm_name"
-fi
-
-# An ipv6 is reported by tools when the machine is first booted.
-# Wait until we get an ipv4 address from tools.
-while true
-do
-    ip=$(govc vm.ip "$vm_name")
-    ipv4="${ip//[^.]}"
-    if [ "${#ipv4}" -eq 3 ]
-    then
-        break
-    fi
-    sleep 1
-done
-
-echo "VM ip=$ip"
-
-for script in provision.sh provision-drone.sh; do
-    echo "Applying $script..."
-    ssh -i ~/.vagrant.d/insecure_private_key "vagrant@$ip" sudo bash -s - < "$script"
-done
diff --git a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision-drone.sh b/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision-drone.sh
deleted file mode 100755
index db8ce96244..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision-drone.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# This depends on docker being on the box and running
-
-docker pull drone/drone
-
-curl http://downloads.drone.io/0.5.0/release/linux/amd64/drone.tar.gz | tar zx
-sudo install -t /usr/local/bin drone
diff --git a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision.sh b/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision.sh
deleted file mode 100755
index 7111186c70..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/machines/devbox/provision.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/bin/bash -e
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# add key for docker repo
-apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 58118E89F3A912897C070ADBF76221572C52609D
-# add docker apt sources
-echo "deb https://apt.dockerproject.org/repo ubuntu-xenial main" > /etc/apt/sources.list.d/docker.list
-
-# https://github.com/mitchellh/vagrant/issues/289
-apt-get update && sudo DEBIAN_FRONTEND=noninteractive apt-get -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" dist-upgrade
-
-# set GOPATH based on shared folder of vagrant
-pro="/home/${BASH_ARGV[0]}/.profile"
-echo "export GOPATH=${BASH_ARGV[1]}" >> "$pro"
-
-# add GOPATH/bin to the PATH
-echo "export PATH=$PATH:${BASH_ARGV[1]}/bin" >> "$pro"
-
-apt-get -y install curl lsof strace git shellcheck tree mc silversearcher-ag jq htpdate apt-transport-https ca-certificates nfs-common sshpass
-
-function update_go {
-    (cd /usr/local &&
-            (curl --silent -L $go_file | tar -zxf -) &&
-            ln -fs /usr/local/go/bin/* /usr/local/bin/)
-}
-
-# install / upgrade go
-go_file="https://storage.googleapis.com/golang/go1.8.3.linux-amd64.tar.gz"
-go_version=$(basename $go_file | cut -d. -f1-3)
-
-if [[ ! -d "/usr/local/go" || $(go version | awk '{print $(3)}') != "$go_version" ]] ; then
-    update_go
-fi
-
-# Install docker
-apt-get -y install linux-image-extra-$(uname -r)
-apt-get -y --allow-downgrades install docker-engine=1.13.1-0~ubuntu-xenial
-apt-mark hold docker-engine
-usermod -aG docker vagrant
-systemctl start docker
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/README.md b/installer/vendor/github.com/vmware/vic/infra/scripts/README.md
deleted file mode 100644
index 70b7b36b65..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-##  header-check
-
-Simple header check for CI jobs, currently checks ".go" files only.
-
-This will be called by the CI system (with no args) to perform checking and
-fail the job if headers are not correctly set. It can also be called with the
-'fix' argument to automatically add headers to the missing files.
-
-Check if headers are fine:
-```
-  $ ./infra/scripts/header-check.sh
-```
-Check and fix headers:
-```
-  $ ./infra/scripts/header-check.sh fix
-```
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/VMware-copyright b/installer/vendor/github.com/vmware/vic/infra/scripts/VMware-copyright
deleted file mode 100644
index fb4db1ba72..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/VMware-copyright
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/bash-helpers.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/bash-helpers.sh
deleted file mode 100644
index c59dbcdfda..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/bash-helpers.sh
+++ /dev/null
@@ -1,149 +0,0 @@
-#!/bin/bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.!/bin/bash
-
-OS=$(uname | tr '[:upper:]' '[:lower:]')
-
-tls () {
-    unset TLS_OPTS
-}
-
-no-tls () {
-    export TLS_OPTS="--no-tls"
-}
-
-unset-vic () {
-    unset MAPPED_NETWORKS NETWORKS IMAGE_STORE DATASTORE COMPUTE VOLUME_STORES IPADDR GOVC_INSECURE TLS THUMBPRINT OPS_CREDS VIC_NAME
-}
-
-vic-path () {
-    echo "${GOPATH}/src/github.com/vmware/vic"
-}
-
-vic-create () {
-    base=$(pwd)
-    (
-        cd "$(vic-path)"/bin || return
-        "$(vic-path)"/bin/vic-machine-"$OS" create --target="$GOVC_URL" "${OPS_CREDS[@]}" --image-store="$IMAGE_STORE" --compute-resource="$COMPUTE" "${TLS[@]}" ${TLS_OPTS} --name="${VIC_NAME:-${USER}test}" "${MAPPED_NETWORKS[@]}" "${VOLUME_STORES[@]}" "${NETWORKS[@]}" ${IPADDR} ${TIMEOUT} --thumbprint="$THUMBPRINT" "$@"
-    )
-
-    unset DOCKER_CERT_PATH DOCKER_TLS_VERIFY
-    unalias docker 2>/dev/null
-
-    envfile=$(vic-path)/bin/${VIC_NAME:-${USER}test}/${VIC_NAME:-${USER}test}.env
-    if [ -f "$envfile" ]; then
-        set -a
-        source "$envfile"
-        set +a
-    fi
-
-    # Something of a hack, but works for --no-tls so long as that's enabled via TLS_OPTS
-    if [ -z "${DOCKER_TLS_VERIFY+x}" ] && [ -z "${TLS_OPTS+x}" ]; then
-        alias docker='docker --tls'
-    fi
-
-    cd "$base" || exit
-}
-
-vic-delete () {
-    "$(vic-path)"/bin/vic-machine-"$OS" delete --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --thumbprint="$THUMBPRINT" --force "$@"
-}
-
-vic-inspect () {
-    "$(vic-path)"/bin/vic-machine-"$OS" inspect --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --thumbprint="$THUMBPRINT" "$@"
-}
-
-vic-upgrade () {
-    "$(vic-path)"/bin/vic-machine-"$OS" upgrade --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --thumbprint="$THUMBPRINT" "$@"
-}
-
-vic-ls () {
-    "$(vic-path)"/bin/vic-machine-"$OS" ls --target="$GOVC_URL" --thumbprint="$THUMBPRINT" "$@"
-}
-
-vic-ssh () {
-    unset keyarg
-    if [ -e "$HOME"/.ssh/authorized_keys ]; then
-        keyarg="--authorized-key=$HOME/.ssh/authorized_keys"
-    fi
-
-    out=$("$(vic-path)"/bin/vic-machine-"$OS" debug --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --enable-ssh "$keyarg" --rootpw=password --thumbprint="$THUMBPRINT" "$@")
-    host=$(echo "$out" | grep DOCKER_HOST | awk -F"DOCKER_HOST=" '{print $2}' | cut -d ":" -f1 | cut -d "=" -f2)
-
-    echo "SSH to ${host}"
-    sshpass -ppassword ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@"${host}"
-}
-
-vic-admin () {
-    out=$("$(vic-path)"/bin/vic-machine-"$OS" debug --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --enable-ssh "$keyarg" --rootpw=password --thumbprint="$THUMBPRINT" "$@")
-    host=$(echo "$out" | grep DOCKER_HOST | sed -n 's/.*DOCKER_HOST=\([^:\s*\).*/\1/p')
-
-    open http://"${host}":2378
-}
-
-addr-from-dockerhost () {
-    echo "$DOCKER_HOST" | sed -e 's/:[0-9]*$//'
-}
-
-vic-tail-portlayer() {
-    unset keyarg
-    if [ -e "$HOME"/.ssh/authorized_keys ]; then
-        keyarg="--authorized-key=$HOME/.ssh/authorized_keys"
-    fi
-
-    out=$("$(vic-path)"/bin/vic-machine-"$OS" debug --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --enable-ssh "$keyarg" --rootpw=password --thumbprint="$THUMBPRINT" "$@")
-    host=$(echo "$out" | grep DOCKER_HOST | awk -F"DOCKER_HOST=" '{print $2}' | cut -d ":" -f1 | cut -d "=" -f2)
-
-    sshpass -ppassword ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@"${host}" tail -f /var/log/vic/port-layer.log
-}
-
-vic-tail-docker() {
-    unset keyarg
-    if [ -e "$HOME"/.ssh/authorized_keys ]; then
-        keyarg="--authorized-key=$HOME/.ssh/authorized_keys"
-    fi
-
-    out=$("$(vic-path)"/bin/vic-machine-"$OS" debug --target="$GOVC_URL" --compute-resource="$COMPUTE" --name="${VIC_NAME:-${USER}test}" --enable-ssh "$keyarg" --rootpw=password --thumbprint="$THUMBPRINT" "$@")
-    host=$(echo "$out" | grep DOCKER_HOST | awk -F"DOCKER_HOST=" '{print $2}' | cut -d ":" -f1 | cut -d "=" -f2)
-
-    sshpass -ppassword ssh -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no root@"${host}" tail -f /var/log/vic/docker-personality.log
-}
-
-# import the custom sites
-# example entry, actived by typing "example"
-# those variales that hold multiple arguments which may contain spaces are arrays to allow for proper quoting
-#example () {
-#    target='https://user:password@host.domain.com/datacenter'
-#    unset-vic
-#
-#    export GOVC_URL=$target
-#
-#    eval "export THUMBPRINT=$(govc about.cert -k -json | jq -r .ThumbprintSHA1)"
-#    export COMPUTE=cluster/pool
-#    export DATASTORE=datastore1
-#    export IMAGE_STORE=$DATASTORE/image/path
-#    export TIMEOUT="--timeout=10m"
-#    export IPADDR="--client-network-ip=vch-hostname.domain.com --client-network-gateway=x.x.x.x/22 --dns-server=y.y.y.y --dns-server=z.z.z.z"
-#    export VIC_NAME="MyVCH"
-#
-#    TLS=("--tls-cname=vch-hostname.domain.com" "--organization=MyCompany")
-#    OPS_CREDS=("--ops-user=<user>" "--ops-password=<password>")
-#    NETWORKS=("--bridge-network=private-dpg-vlan" "--public-network=extern-dpg")
-#    MAPPED_NETWORKS=("--container-network=VM Network:external" "--container-network=SomeOtherNet:elsewhere")
-#    VOLUME_STORES=("--volume-store=$DATASTORE:default")
-#
-#    export NETWORKS MAPPED_NETWORKS VOLUME_STORES OPS_CREDS TLS
-#}
-
-. ~/.vic
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/ci-logs.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/ci-logs.sh
deleted file mode 100755
index 93ac9022a2..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/ci-logs.sh
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/bin/bash -e
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Requirements
-# ############
-# - gcloud SDK: https://cloud.google.com/sdk/docs/
-# - drone cli 0.5: https://github.com/drone/drone#from-source
-#
-# Examples
-# ########
-# Grab the logs for your current branch:
-# $ ./ci-logs.sh
-#
-# If the build is running you can stream the logs using the '-s' option:
-# $ ./ci-logs.sh -s
-#
-# Grab logs for a specific build:
-# $ ./ci-logs.sh 4835
-#
-# Grab logs for recent failures on the master branch:
-# $ drone build list --format {{.Number}}-{{.Branch}}-{{.Status}} vmware/vic | grep master-failure | cut -d- -f1 | xargs -n1 ./ci-logs.sh
-#
-# Find container log zip files for failed tests:
-# $ grep FAIL ci.log | grep Test-Cases.Group | grep :: | awk '{print $1}' | xargs -n1 -I% bash -c "ls %*.zip"
-
-top=$(git rev-parse --show-toplevel)
-repo="vmware/$(basename "$top")"
-dir="$top/ci-logs"
-drone=${DRONE_CLI:-drone}
-
-while getopts s flag
-do
-    case $flag in
-        d)
-            dir="$OPTARG"
-            ;;
-        s)
-            stream=true
-            ;;
-        *)
-            echo "invalid option '$flag'"
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-build="$1"
-job="$2"
-
-export DRONE_SERVER=${DRONE_SERVER:-https://ci.vcna.io}
-
-if [ -z "$DRONE_TOKEN" ] ; then
-    echo "DRONE_TOKEN not set (available at $DRONE_SERVER/settings/profile)"
-fi
-
-if [ -z "$build" ] ; then
-    commit=$(git rev-parse HEAD)
-    builds=$($drone build list --format "{{.Number}}-{{.Commit}}" "$repo" | grep "$commit")
-    build=$(cut -d- -f1 <<<"$builds")
-fi
-
-if [ -z "$job" ] ; then
-    job=1
-fi
-
-state=$($drone build info "$repo" "$build" --format {{.Status}})
-
-
-echo "$state"
-
-case "$state" in
-    running)
-        if [ -z "$stream" ] ; then
-            exit
-        fi
-        ;;
-    success|failure|killed)
-        stream=""
-        ;;
-    pending|error)
-        exit
-        ;;
-esac
-
-if [ ! -d "$dir" ] ; then
-    mkdir "$dir"
-fi
-
-logs="$dir/$build"
-mkdir "$logs"
-
-if [ -n "$stream" ] ; then
-    echo "Streaming CI log..."
-
-    curl --silent "$DRONE_SERVER/api/stream/$repo/$build/$job?access_token=$DRONE_TOKEN" | \
-        grep data: | cut -d: -f2- | grep -v '^$' | tee "$logs/ci.log"
-else
-    echo "Downloading CI log..."
-    curl --silent "$DRONE_SERVER/api/repos/$repo/logs/$build/$job?access_token=$DRONE_TOKEN" > "$logs/ci.log"
-fi
-
-url=$(grep https://console.cloud.google.com/ "$logs/ci.log")
-if [ -z "$url" ] ; then
-    echo "No integration logs link found for build ${build}"
-    exit
-fi
-
-name=$(basename "$url" | cut -d? -f1)
-bucket=$(basename "$(dirname "$(dirname "$url")")")
-
-echo "Downloading integration logs ($name)..."
-
-gsutil cp "gs://$bucket/$name" "$logs/$name"
-
-unzip -d "$logs" "$logs/$name" >/dev/null
-
-if [ "$state" = "failure" ] ; then
-    echo "Container logs for failed tests:"
-    grep FAIL "$logs/ci.log" | grep Test-Cases.Group | grep :: | awk '{print $1}' | xargs -n1 -I% bash -c "ls $logs/%*.zip" 2>/dev/null
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/coverage.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/coverage.sh
deleted file mode 100755
index cf9ebc5074..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/coverage.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/bin/bash -e
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Works around the fact that `go test -coverprofile` does not work
-# with multiple packages, see https://code.google.com/p/go/issues/detail?id=6909
-#
-# Usage: script/coverage [--html]
-#
-#     --html        Create HTML report and open it in browser
-#
-
-workdir=`git rev-parse --show-toplevel`/.cover
-profile="$workdir/cover.out"
-dir=$(dirname $0)
-mode=count
-
-# list any files (or patterns) to explicitly exclude from coverage
-# you should have a pretty good reason before putting items here
-exclude_files=(
-
-)
-
-join() { local IFS="$1"; shift; echo "$*"; }
-
-excludes=$(join "|" ${exclude_files[@]} | sed -e 's/\./\\./g')
-
-generate_pkg_cover_data() {
-    echo "$@"
-    mkdir -p "$workdir"
-
-    for pkg in "$@"; do
-        f="$workdir/$(echo $pkg | tr / -).cover"
-        go test -i -covermode="$mode" -coverprofile="$f" "$pkg"
-        go test -covermode="$mode" -coverprofile="$f" "$pkg"
-    done
-
-    echo "mode: $mode" >"$profile"
-    if [ -n "$excludes" ]; then
-        grep -h -v "^mode:" "$workdir"/*.cover | egrep -v "$excludes" >>"$profile"
-    else
-        grep -h -v "^mode:" "$workdir"/*.cover >>"$profile"
-    fi
-}
-
-# translate dirs to packages and strip args
-dir_to_pkg() {
-    for dir in $@; do
-        if test "$dir" == "--html"; then
-            export html="true"
-        else
-            pkgs="$pkgs $(go list $dir/... | grep -v /vendor/)"
-        fi
-    done
-    echo $pkgs
-}
-
-show_cover_report() {
-    go tool cover -${1}="$profile"
-}
-
-generate_pkg_cover_data $(dir_to_pkg "$@")
-
-show_cover_report func
-if test "$html" == "true"; then
-    show_cover_report html
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/focused-test.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/focused-test.sh
deleted file mode 100644
index c80f35e9db..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/focused-test.sh
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/bin/bash
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Runs go test on any packages that differ from vmware/master that have
-# Go test files.
-#
-# Usage: infra/scripts/focused-test.sh
-#
-
-if [ -z "$1" ]; then
-    export REMOTE=$(git remote -v | grep "github.com/vmware/vic.git (fetch)" | awk '{print$1;exit}')/master
-    echo "Using ${REMOTE} as default remote"
-else
-    echo "Using ${REMOTE} as specified remote"
-    export REMOTE="$1"
-fi
-
-echo "Finding modified packages with test files"
-PKG=$(git diff --stat ${REMOTE} --name-only | xargs dirname | uniq | while read i; do
-    for f in ./$i/*_test.go; do
-        if [ -e $f ]; then
-            echo -n "./$i ";
-        fi;
-        break;
-    done;
-done)
-
-echo "Testing packages: $PKG"
-if [ -n "$PKG" ]; then
-    go test $PKG;
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/go-deps.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/go-deps.sh
deleted file mode 100755
index fa06f799cf..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/go-deps.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Lists the non-standard library Go packages the specified package depends
-# on.
-#
-# Usage: script/go-deps.sh pkg
-#
-#     pkg       This is github.com/vmware/vic/cmd/imagec for example
-#
-
-pkg=$1
-flags=$2
-
-if [ -d "$pkg" ]; then
-    if [[ "$flags" == *d* ]]
-    then
-        # Only output if make is given the '-d' flag
-        echo "Generating deps for $pkg" >&2
-    fi
-
-    go list -f '{{join .Deps "\n"}}' github.com/vmware/vic/"$pkg" 2>/dev/null | \
-        xargs go list -f '{{if not .Standard}}{{.ImportPath}}{{end}}' 2>/dev/null | \
-        sed -e 's:github.com/vmware/vic/\(.*\)$:\1/*:'
-else
-    if [[ "$flags" == *d* ]]
-    then
-        echo "$0: package '$pkg' does not exist" >&2
-    fi
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/header-check.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/header-check.sh
deleted file mode 100755
index 258d8920ad..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/header-check.sh
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/bin/bash
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Simple script that will check files of type .go, .sh, .bash, .robot, or Makefile
-# for the copyright header.
-#
-# This will be called by the CI system (with no args) to perform checking and
-# fail the job if headers are not correctly set. It can also be called with the
-# 'fix' argument to automatically add headers to the missing files.
-#
-# Check if headers are fine:
-#   $ ./scripts/header-check.sh
-# Check and fix headers:
-#   All changes must be committed for fix to work
-#   $ ./scripts/header-check.sh fix
-
-set -e -o pipefail
-
-# These header variables MUST match the first two lines of the
-# VMware-copyright file in the scripts directory.
-#
-# These will be evaluated as a regex against the target file
-HEADER[1]="^\/\/ Copyright [0-9]{4}(-[0-9]{4})? VMware, Inc\. All Rights Reserved\.$"
-HEADER[2]="^\/\/$"
-
-# Initialize vars
-ERR=false
-FAIL=false
-
-all-files() {
-    git ls-files |\
-        # Check .go files, Makefile, sh files, bash files, and robot files
-        grep -e "\.go$" -e "Makefile$" -e "\.sh$" -e "\.bash$" -e "\.robot$" |\
-            # Ignore vendor/
-        grep -v vendor/
-}
-
-for file in $(all-files); do
-  echo -n "Header check: $file... "
-  # get the file extension / type
-  ext=${file##*.}
-
-  # increment line count in certain cases
-  increment=false
-
-  # should we be incrementing the line count
-  if [[ $ext == "sh" ]]; then
-    increment=true
-  fi
-
-  for count in $(seq 1 ${#HEADER[@]}); do
-    if [[ $ext != "go" ]]; then
-        # if not go code assuming # will suffice
-        text="${HEADER[$count]/'\/\/'/#}"
-      else
-        text=${HEADER[$count]}
-    fi
-
-    if [[ "$increment" = true ]]; then
-      line=$((count + 1))
-    else
-      line=$count
-    fi
-    # do we have a header match?
-    if [[ ! $(sed ${line}q\;d ${file}) =~ ${text} ]]; then
-      ERR=true
-    fi
-  done
-
-  if [ $ERR == true ]; then
-    # is there is a fix argument and are all changes committed
-    if [[ $# -gt 0 && $1 =~ [[:upper:]fix] ]]; then
-      # based on file type fix the copyright
-      case "$ext" in
-        go)
-          cat $(dirname $0)/VMware-copyright ${file} > ${file}.new
-          ;;
-        sh)
-          head -1 ${file} > ${file}.new
-          cat $(dirname $0)/VMware-copyright | sed 's/\/\//\#/1' >> ${file}.new
-          grep -v '#!/bin/bash' ${file} >> ${file}.new
-          ;;
-        *)
-          cat $(dirname $0)/VMware-copyright | sed 's/\/\//\#/1' > ${file}.new
-          cat ${file} >> ${file}.new
-          ;;
-      esac
-
-      if [ "$(uname -s)" = "Darwin" ]; then
-        permissions=$(stat -f "%OLp" ${file})
-      else
-        permissions=$(stat --format '%a' ${file})
-      fi
-      mv ${file}.new ${file}
-      # make permissions the same
-      chmod $permissions ${file}
-      echo "$(tput -T xterm setaf 3)FIXING$(tput -T xterm sgr0)"
-      ERR=false
-    else
-      echo "$(tput -T xterm setaf 1)FAIL$(tput -T xterm sgr0)"
-      ERR=false
-      FAIL=true
-    fi
-  else
-    echo "$(tput -T xterm setaf 2)OK$(tput -T xterm sgr0)"
-  fi
-done
-
-# If we failed one check, return 1
-[ $FAIL == true ] && exit 1 || exit 0
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/misspell.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/misspell.sh
deleted file mode 100755
index e242591c95..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/misspell.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http:#www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-out=$(misspell -error $(find . -mindepth 1 -maxdepth 1 -type d -not -name vendor) | grep -v -e lib/config/dynamic/admiral/client | grep -v -e lib/config/dynamic/admiral/models | grep -v -e lib/config/dynamic/admiral/swagger.json)
-if [[ ! -z "${out// }" ]]; then
-    echo "$out"
-    exit 2
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/version-linker-flags.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/version-linker-flags.sh
deleted file mode 100755
index 6bd5b1edbc..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/version-linker-flags.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-echo "-s -w \
-    -X github.com/vmware/vic/pkg/version.Version=`git describe --abbrev=0 --tags` \
-    -X github.com/vmware/vic/pkg/version.BuildNumber=\"${BUILD_NUMBER}\" \
-    -X github.com/vmware/vic/pkg/version.BuildDate=`date -u +%Y/%m/%d@%H:%M:%S` \
-    -X github.com/vmware/vic/pkg/version.GitCommit=`git rev-parse --short HEAD` \
-    -X github.com/vmware/vic/pkg/version.State=` \
-      if [[ -n $(git ls-files --others --exclude-standard) || \
-            ! $(git diff-files --no-ext-diff --quiet) || \
-            ! $(git diff-index --no-ext-diff --quiet --cached HEAD) \
-     ]]; then echo 'dirty'; fi`"
-
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/vic-logs.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/vic-logs.sh
deleted file mode 100755
index ef3c92489a..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/vic-logs.sh
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash -e
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Create a VM and boot stateless ESXi via cdrom/iso
-
-set -o pipefail
-
-usage() {
-    cat <<'EOF'
-Usage: $0 [-f] <host> <port-layer.log | docker.log>
-
-GOVC_* environment variables also apply, see https://github.com/vmware/govmomi/tree/master/govc#usage
-If GOVC_USERNAME is set, it is used to create an account on the ESX vm.  Default is to use the existing root account.
-If GOVC_PASSWORD is set, the account password will be set to this value.  Default is to use the given ESX_URL password.
-EOF
-}
-
-if [ $# -lt 2 ] ; then
-    usage
-    exit 1
-fi
-
-while getopts "f" opt; do
-    case $opt in
-        f)
-            follow="tail/"
-            ;;
-        \?)
-            usage
-            exit 1
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-host="$1"
-file="$2"
-
-username=$GOVC_USERNAME
-password=$GOVC_PASSWORD
-unset GOVC_USERNAME GOVC_PASSWORD
-
-if [ -z "$password" ] ; then
-    # extract password from $GOVC_URL
-    password=$(govc env GOVC_PASSWORD)
-fi
-
-if [ -z "$username" ] ; then
-    username=$(govc env GOVC_USERNAME)
-fi
-
-jar=$(mktemp -t cookie-XXXX)
-trap 'rm $jar' EXIT
-
-curl -k -c "${jar}" --form username="${username}" --form password="${password}" https://"${host}":2378/authentication
-curl -k -b "${jar}" https://"${host}":2378/logs/"${follow}""${file}"
diff --git a/installer/vendor/github.com/vmware/vic/infra/scripts/whitespace-check.sh b/installer/vendor/github.com/vmware/vic/infra/scripts/whitespace-check.sh
deleted file mode 100755
index 5b4531e729..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/scripts/whitespace-check.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-red="\033[1;31m"
-color_end="\033[0m"
-GLOBIGNORE='vendor'
-
-# will check staged items for whitespace
-if [[ $# -gt 0 && $1 =~ [[:upper:]pre] ]]; then
-    if [[ $(git diff --cached --check) ]]; then
-        echo -e ${red}whitespace check failed${color_end}
-        git diff --cached --check
-        exit 1
-    fi
-else
-    # check staged and changed
-    if [[ $(git diff --cached --check) || $(git diff --check) ]]; then
-        echo -e ${red}whitespace check failed${color_end}
-        git diff --cached --check
-        git diff --check
-        exit 1
-    fi
-fi
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/gsml/__gmsl b/installer/vendor/github.com/vmware/vic/infra/util/gsml/__gmsl
deleted file mode 100644
index 3db20ad914..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/gsml/__gmsl
+++ /dev/null
@@ -1,940 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# GNU Make Standard Library (GMSL)
-#
-# A library of functions to be used with GNU Make's $(call) that
-# provides functionality not available in standard GNU Make.
-#
-# Copyright (c) 2005-2014 John Graham-Cumming
-#
-# This file is part of GMSL
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# Neither the name of the John Graham-Cumming nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------------------
-
-# This is the GNU Make Standard Library version number as a list with
-# three items: major, minor, revision
-
-gmsl_version := 1 1 7
-
-__gmsl_name := GNU Make Standard Library
-
-# Used to output warnings and error from the library, it's possible to
-# disable any warnings or errors by overriding these definitions
-# manually or by setting GMSL_NO_WARNINGS or GMSL_NO_ERRORS
-
-ifdef GMSL_NO_WARNINGS
-__gmsl_warning :=
-else
-__gmsl_warning = $(if $1,$(warning $(__gmsl_name): $1))
-endif
-
-ifdef GMSL_NO_ERRORS
-__gmsl_error :=
-else
- __gmsl_error = $(if $1,$(error $(__gmsl_name): $1))
-endif
-
-# If GMSL_TRACE is enabled then calls to the library functions are
-# traced to stdout using warning messages with their arguments
-
-ifdef GMSL_TRACE
-__gmsl_tr1 = $(warning $0('$1'))
-__gmsl_tr2 = $(warning $0('$1','$2'))
-__gmsl_tr3 = $(warning $0('$1','$2','$3'))
-else
-__gmsl_tr1 :=
-__gmsl_tr2 :=
-__gmsl_tr3 :=
-endif
-
-# See if spaces are valid in variable names (this was the case until
-# GNU Make 3.82)
-ifeq ($(MAKE_VERSION),3.82)
-__gmsl_spaced_vars := $(false)
-else
-__gmsl_spaced_vars := $(true)
-endif
-
-# Figure out whether we have $(eval) or not (GNU Make 3.80 and above)
-# if we do not then output a warning message, if we do then some
-# functions will be enabled.
-
-__gmsl_have_eval := $(false)
-__gmsl_ignore := $(eval __gmsl_have_eval := $(true))
-
-# If this is being run with Electric Cloud's emake then warn that
-# their $(eval) support is incomplete in 1.x, 2.x, 3.x, 4.x and 5.0,
-# 5.1, 5.2 and 5.3
-
-ifdef ECLOUD_BUILD_ID
-__gmsl_emake_major := $(word 1,$(subst ., ,$(EMAKE_VERSION)))
-__gmsl_emake_minor := $(word 2,$(subst ., ,$(EMAKE_VERSION)))
-ifneq ("$(findstring $(__gmsl_emake_major),1 2 3 4)$(findstring $(__gmsl_emake_major)$(__gmsl_emake_minor),50 51 52 53)","")
-$(warning You are using a version of Electric Cloud's emake which has incomplete $$(eval) support)
-__gmsl_have_eval := $(false)
-endif
-endif
-
-# See if we have $(lastword) (GNU Make 3.81 and above)
-
-__gmsl_have_lastword := $(lastword $(false) $(true))
-
-# See if we have native or and and (GNU Make 3.81 and above)
-
-__gmsl_have_or := $(if $(filter-out undefined,  \
-    $(origin or)),$(call or,$(true),$(false)))
-__gmsl_have_and := $(if $(filter-out undefined, \
-    $(origin and)),$(call and,$(true),$(true)))
-
-ifneq ($(__gmsl_have_eval),$(true))
-$(call __gmsl_warning,Your make version $(MAKE_VERSION) does not support $$$$(eval): some functions disabled)
-endif
-
-__gmsl_dollar := $$
-__gmsl_hash := \#
-
-# ----------------------------------------------------------------------------
-# ----------------------------------------------------------------------------
-# Function:  gmsl_compatible
-# Arguments: List containing the desired library version number (maj min rev)
-# Returns:   $(true) if this version of the library is compatible
-#            with the requested version number, otherwise $(false)
-# ----------------------------------------------------------------------------
-gmsl_compatible = $(strip                                                 \
-    $(if $(call gt,$(word 1,$1),$(word 1,$(gmsl_version))),               \
-        $(false),                                                         \
-        $(if $(call lt,$(word 1,$1),$(word 1,$(gmsl_version))),           \
-            $(true),                                                      \
-            $(if $(call gt,$(word 2,$1),$(word 2,$(gmsl_version))),       \
-                $(false),                                                 \
-                $(if $(call lt,$(word 2,$1),$(word 2,$(gmsl_version))),   \
-                    $(true),                                              \
-                    $(call lte,$(word 3,$1),$(word 3,$(gmsl_version))))))))
-
-# ###########################################################################
-# LOGICAL OPERATORS
-# ###########################################################################
-
-# not is defined in gmsl
-
-# ----------------------------------------------------------------------------
-# Function:  and
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if both of the booleans are true
-# ----------------------------------------------------------------------------
-ifneq ($(__gmsl_have_and),$(true))
-and = $(__gmsl_tr2)$(if $1,$(if $2,$(true),$(false)),$(false))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  or
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if either of the booleans is true
-# ----------------------------------------------------------------------------
-ifneq ($(__gmsl_have_or),$(true))
-or = $(__gmsl_tr2)$(if $1$2,$(true),$(false))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  xor
-# Arguments: Two boolean values
-# Returns:   Returns $(true) if exactly one of the booleans is true
-# ----------------------------------------------------------------------------
-xor = $(__gmsl_tr2)$(if $1,$(if $2,$(false),$(true)),$(if $2,$(true),$(false)))
-
-# ----------------------------------------------------------------------------
-# Function:  nand
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not and'
-# ----------------------------------------------------------------------------
-nand = $(__gmsl_tr2)$(if $1,$(if $2,$(false),$(true)),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  nor
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not or'
-# ----------------------------------------------------------------------------
-nor = $(__gmsl_tr2)$(if $1$2,$(false),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  xnor
-# Arguments: Two boolean values
-# Returns:   Returns value of 'not xor'
-# ----------------------------------------------------------------------------
-xnor =$(__gmsl_tr2)$(if $1,$(if $2,$(true),$(false)),$(if $2,$(false),$(true)))
-
-# ###########################################################################
-# LIST MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  first (same as LISP's car, or head)
-# Arguments: 1: A list
-# Returns:   Returns the first element of a list
-# ----------------------------------------------------------------------------
-first = $(__gmsl_tr1)$(firstword $1)
-
-# ----------------------------------------------------------------------------
-# Function:  last
-# Arguments: 1: A list
-# Returns:   Returns the last element of a list
-# ----------------------------------------------------------------------------
-ifeq ($(__gmsl_have_lastword),$(true))
-last = $(__gmsl_tr1)$(lastword $1)
-else
-last = $(__gmsl_tr1)$(if $1,$(word $(words $1),$1))
-endif
-
-# ----------------------------------------------------------------------------
-# Function:  rest (same as LISP's cdr, or tail)
-# Arguments: 1: A list
-# Returns:   Returns the list with the first element removed
-# ----------------------------------------------------------------------------
-rest = $(__gmsl_tr1)$(wordlist 2,$(words $1),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  chop
-# Arguments: 1: A list
-# Returns:   Returns the list with the last element removed
-# ----------------------------------------------------------------------------
-chop = $(__gmsl_tr1)$(wordlist 2,$(words $1),x $1)
-
-# ----------------------------------------------------------------------------
-# Function:  map
-# Arguments: 1: Name of function to $(call) for each element of list
-#            2: List to iterate over calling the function in 1
-# Returns:   The list after calling the function on each element
-# ----------------------------------------------------------------------------
-map = $(__gmsl_tr2)$(strip $(foreach a,$2,$(call $1,$a)))
-
-# ----------------------------------------------------------------------------
-# Function:  pairmap
-# Arguments: 1: Name of function to $(call) for each pair of elements
-#            2: List to iterate over calling the function in 1
-#            3: Second list to iterate over calling the function in 1
-# Returns:   The list after calling the function on each pair of elements
-# ----------------------------------------------------------------------------
-pairmap = $(strip $(__gmsl_tr3)\
-          $(if $2$3,$(call $1,$(call first,$2),$(call first,$3))     \
-                        $(call pairmap,$1,$(call rest,$2),$(call rest,$3))))
-
-# ----------------------------------------------------------------------------
-# Function:  leq
-# Arguments: 1: A list to compare against...
-#            2: ...this list
-# Returns:   Returns $(true) if the two lists are identical
-# ----------------------------------------------------------------------------
-leq = $(__gmsl_tr2)$(strip $(if $(call seq,$(words $1),$(words $2)),     \
-          $(call __gmsl_list_equal,$1,$2),$(false)))
-
-__gmsl_list_equal = $(if $(strip $1),                                       \
-                        $(if $(call seq,$(call first,$1),$(call first,$2)), \
-                            $(call __gmsl_list_equal,                       \
-                                $(call rest,$1),                            \
-                                $(call rest,$2)),                           \
-                            $(false)),                                      \
-                     $(true))
-
-# ----------------------------------------------------------------------------
-# Function:  lne
-# Arguments: 1: A list to compare against...
-#            2: ...this list
-# Returns:   Returns $(true) if the two lists are different
-# ----------------------------------------------------------------------------
-lne = $(__gmsl_tr2)$(call not,$(call leq,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  reverse
-# Arguments: 1: A list to reverse
-# Returns:   The list with its elements in reverse order
-# ----------------------------------------------------------------------------
-reverse =$(__gmsl_tr1)$(strip $(if $1,$(call reverse,$(call rest,$1)) \
-                        $(call first,$1)))
-
-# ----------------------------------------------------------------------------
-# Function:  uniq
-# Arguments: 1: A list from which to remove repeated elements
-# Returns:   The list with duplicate elements removed without reordering
-# ----------------------------------------------------------------------------
-uniq = $(strip $(__gmsl_tr1) $(if $1,$(firstword $1) \
-                               $(call uniq,$(filter-out $(firstword $1),$1))))
-
-# ----------------------------------------------------------------------------
-# Function:  length
-# Arguments: 1: A list
-# Returns:   The number of elements in the list
-# ----------------------------------------------------------------------------
-length = $(__gmsl_tr1)$(words $1)
-
-# ###########################################################################
-# STRING MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# Helper function that translates any GNU Make 'true' value (i.e. a
-# non-empty string) to our $(true)
-
-__gmsl_make_bool = $(if $(strip $1),$(true),$(false))
-
-# ----------------------------------------------------------------------------
-# Function:  seq
-# Arguments: 1: A string to compare against...
-#            2: ...this string
-# Returns:   Returns $(true) if the two strings are identical
-# ----------------------------------------------------------------------------
-seq = $(__gmsl_tr2)$(if $(subst x$1,,x$2)$(subst x$2,,x$1),$(false),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  sne
-# Arguments: 1: A string to compare against...
-#            2: ...this string
-# Returns:   Returns $(true) if the two strings are not the same
-# ----------------------------------------------------------------------------
-sne = $(__gmsl_tr2)$(call not,$(call seq,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  split
-# Arguments: 1: The character to split on
-#            2: A string to split
-# Returns:   Splits a string into a list separated by spaces at the split
-#            character in the first argument
-# ----------------------------------------------------------------------------
-split = $(__gmsl_tr2)$(strip $(subst $1, ,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  merge
-# Arguments: 1: The character to put between fields
-#            2: A list to merge into a string
-# Returns:   Merges a list into a single string, list elements are separated
-#            by the character in the first argument
-# ----------------------------------------------------------------------------
-merge = $(__gmsl_tr2)$(strip $(if $2,                                     \
-            $(if $(call seq,1,$(words $2)),                               \
-                $2,$(call first,$2)$1$(call merge,$1,$(call rest,$2)))))
-
-ifdef __gmsl_have_eval
-# ----------------------------------------------------------------------------
-# Function:  tr
-# Arguments: 1: The list of characters to translate from 
-#            2: The list of characters to translate to
-#            3: The text to translate
-# Returns:   Returns the text after translating characters
-# ----------------------------------------------------------------------------
-tr = $(strip $(__gmsl_tr3)$(call assert_no_dollar,$0,$1$2$3)              \
-     $(eval __gmsl_t := $3)                                               \
-     $(foreach c,                                                         \
-         $(join $(addsuffix :,$1),$2),                                    \
-         $(eval __gmsl_t :=                                               \
-             $(subst $(word 1,$(subst :, ,$c)),$(word 2,$(subst :, ,$c)), \
-                 $(__gmsl_t))))$(__gmsl_t))
-
-# Common character classes for use with the tr function.  Each of
-# these is actually a variable declaration and must be wrapped with
-# $() or ${} to be used.
-
-[A-Z] := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z #
-[a-z] := a b c d e f g h i j k l m n o p q r s t u v w x y z #
-[0-9] := 0 1 2 3 4 5 6 7 8 9 #
-[A-F] := A B C D E F #
-
-# ----------------------------------------------------------------------------
-# Function:  uc
-# Arguments: 1: Text to upper case
-# Returns:   Returns the text in upper case
-# ----------------------------------------------------------------------------
-uc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([a-z]),$([A-Z]),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  lc
-# Arguments: 1: Text to lower case
-# Returns:   Returns the text in lower case
-# ----------------------------------------------------------------------------
-lc = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(call tr,$([A-Z]),$([a-z]),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  strlen
-# Arguments: 1: A string
-# Returns:   Returns the length of the string
-# ----------------------------------------------------------------------------
-
-# This results in __gmsl_tab containing a tab
-
-__gmsl_tab :=	#
-
-__gmsl_characters := A B C D E F G H I J K L M N O P Q R S T U V W X Y Z
-__gmsl_characters += a b c d e f g h i j k l m n o p q r s t u v w x y z
-__gmsl_characters += 0 1 2 3 4 5 6 7 8 9
-__gmsl_characters += ` ~ ! @ \# $$ % ^ & * ( ) - _ = +
-__gmsl_characters += { } [ ] \ : ; ' " < > , . / ? |
-
-# This results in __gmsl_space containing just a space
-
-__gmsl_space := 
-__gmsl_space +=
-
-strlen = $(__gmsl_tr1)$(call assert_no_dollar,$0,$1)$(strip $(eval __temp := $(subst $(__gmsl_space),x,$1))$(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,x,$(__temp))))$(eval __temp := $(subst x,x ,$(__temp)))$(words $(__temp)))
-
-# This results in __gmsl_newline containing just a newline
-
-define __gmsl_newline
-
-
-endef
-
-# ----------------------------------------------------------------------------
-# Function:  substr
-# Arguments: 1: A string
-#            2: Start position (first character is 1)
-#            3: End position (inclusive)
-# Returns:   A substring.  
-# Note:      The string in $1 must not contain a �
-# ----------------------------------------------------------------------------
-
-substr = $(if $2,$(__gmsl_tr3)$(call assert_no_dollar,$0,$1$2$3)$(strip $(eval __temp := $$(subst $$(__gmsl_space),� ,$$1))$(foreach a,$(__gmsl_characters),$(eval __temp := $$(subst $$a,$$a$$(__gmsl_space),$(__temp))))$(eval __temp := $(wordlist $2,$3,$(__temp))))$(subst �,$(__gmsl_space),$(subst $(__gmsl_space),,$(__temp))))
-
-endif # __gmsl_have_eval
-
-# ###########################################################################
-# SET MANIPULATION FUNCTIONS
-# ###########################################################################
-
-# Sets are represented by sorted, deduplicated lists.  To create a set
-# from a list use set_create, or start with the empty_set and
-# set_insert individual elements
-
-# This is the empty set
-empty_set := 
-
-# ----------------------------------------------------------------------------
-# Function:  set_create
-# Arguments: 1: A list of set elements
-# Returns:   Returns the newly created set
-# ----------------------------------------------------------------------------
-set_create = $(__gmsl_tr1)$(sort $1)
-
-# ----------------------------------------------------------------------------
-# Function:  set_insert
-# Arguments: 1: A single element to add to a set
-#            2: A set
-# Returns:   Returns the set with the element added
-# ----------------------------------------------------------------------------
-set_insert = $(__gmsl_tr2)$(sort $1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_remove
-# Arguments: 1: A single element to remove from a set
-#            2: A set
-# Returns:   Returns the set with the element removed
-# ----------------------------------------------------------------------------
-set_remove = $(__gmsl_tr2)$(filter-out $1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_is_member, set_is_not_member
-# Arguments: 1: A single element 
-#            2: A set
-# Returns:   (set_is_member) Returns $(true) if the element is in the set
-#            (set_is_not_member) Returns $(false) if the element is in the set
-# ----------------------------------------------------------------------------
-set_is_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(true),$(false))
-set_is_not_member = $(__gmsl_tr2)$(if $(filter $1,$2),$(false),$(true))
-
-# ----------------------------------------------------------------------------
-# Function:  set_union
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns the union of the two sets
-# ----------------------------------------------------------------------------
-set_union = $(__gmsl_tr2)$(sort $1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_intersection
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns the intersection of the two sets
-# ----------------------------------------------------------------------------
-set_intersection = $(__gmsl_tr2)$(filter $1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  set_is_subset
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns $(true) if the first set is a subset of the second
-# ----------------------------------------------------------------------------
-set_is_subset = $(__gmsl_tr2)$(call set_equal,$(call set_intersection,$1,$2),$1)
-
-# ----------------------------------------------------------------------------
-# Function:  set_equal
-# Arguments: 1: A set
-#            2: Another set
-# Returns:   Returns $(true) if the two sets are identical
-# ----------------------------------------------------------------------------
-set_equal = $(__gmsl_tr2)$(call seq,$1,$2)
-
-# ###########################################################################
-# ARITHMETIC LIBRARY
-# ###########################################################################
-
-# Integers a represented by lists with the equivalent number of x's.
-# For example the number 4 is x x x x. 
-
-# ----------------------------------------------------------------------------
-# Function:  int_decode
-# Arguments: 1: A number of x's representation
-# Returns:   Returns the integer for human consumption that is represented
-#            by the string of x's
-# ----------------------------------------------------------------------------
-int_decode = $(__gmsl_tr1)$(words $1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_encode
-# Arguments: 1: A number in human-readable integer form
-# Returns:   Returns the integer encoded as a string of x's
-# ----------------------------------------------------------------------------
-__int_encode = $(if $1,$(if $(call seq,$(words $(wordlist 1,$1,$2)),$1),$(wordlist 1,$1,$2),$(call __int_encode,$1,$(if $2,$2 $2,x))))
-__strip_leading_zero = $(if $1,$(if $(call seq,$(patsubst 0%,%,$1),$1),$1,$(call __strip_leading_zero,$(patsubst 0%,%,$1))),0)
-int_encode = $(__gmsl_tr1)$(call __int_encode,$(call __strip_leading_zero,$1))
-
-# The arithmetic library functions come in two forms: one form of each
-# function takes integers as arguments and the other form takes the
-# encoded form (x's created by a call to int_encode).  For example,
-# there are two plus functions:
-#
-# plus        Called with integer arguments and returns an integer
-# int_plus    Called with encoded arguments and returns an encoded result
-#
-# plus will be slower than int_plus because its arguments and result
-# have to be translated between the x's format and integers.  If doing
-# a complex calculation use the int_* forms with a single encoding of
-# inputs and single decoding of the output.  For simple calculations
-# the direct forms can be used.
-
-# Helper function used to wrap an int_* function into a function that
-# takes a pair of integers, perhaps a function and returns an integer
-# result
-__gmsl_int_wrap = $(call int_decode,$(call $1,$(call int_encode,$2),$(call int_encode,$3)))
-__gmsl_int_wrap1 = $(call int_decode,$(call $1,$(call int_encode,$2)))
-__gmsl_int_wrap2 = $(call $1,$(call int_encode,$2),$(call int_encode,$3))
-
-# ----------------------------------------------------------------------------
-# Function:  int_plus
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the sum of the two numbers in x's representation
-# ----------------------------------------------------------------------------
-int_plus = $(strip $(__gmsl_tr2)$1 $2)
-
-# ----------------------------------------------------------------------------
-# Function:  plus (wrapped version of int_plus)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the sum of the two integers
-# ----------------------------------------------------------------------------
-plus = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_plus,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_subtract
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the difference of the two numbers in x's representation,
-#            or outputs an error on a numeric underflow
-# ----------------------------------------------------------------------------
-int_subtract = $(strip $(__gmsl_tr2)$(if $(call int_gte,$1,$2), \
-                $(filter-out xx,$(join $1,$2)),                 \
-                $(call __gmsl_warning,Subtraction underflow)))
-
-# ----------------------------------------------------------------------------
-# Function:  subtract (wrapped version of int_subtract)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the difference of the two integers,
-#            or outputs an error on a numeric underflow
-# ----------------------------------------------------------------------------
-subtract = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_subtract,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_multiply
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the product of the two numbers in x's representation
-# ----------------------------------------------------------------------------
-int_multiply = $(strip $(__gmsl_tr2)$(foreach a,$1,$2))
-
-# ----------------------------------------------------------------------------
-# Function:  multiply (wrapped version of int_multiply)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the product of the two integers
-# ----------------------------------------------------------------------------
-multiply = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_multiply,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_divide
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the result of integer division of argument 1 divided
-#            by argument 2 in x's representation
-# ----------------------------------------------------------------------------
-int_divide = $(__gmsl_tr2)$(strip $(if $1,$(if $2,                         \
-                 $(if $(call int_gte,$1,$2),                               \
-                     x $(call int_divide,$(call int_subtract,$1,$2),$2),), \
-                 $(call __gmsl_error,Division by zero))))
-
-# ----------------------------------------------------------------------------
-# Function:  divide (wrapped version of int_divide)
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the integer division of the first argument by the second
-# ----------------------------------------------------------------------------
-divide = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_divide,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function:  int_max, int_min
-# Arguments: 1: A number in x's representation
-#            2: Another number in x's represntation
-# Returns:   Returns the maximum or minimum of its arguments in x's
-#            representation
-# ----------------------------------------------------------------------------
-int_max = $(__gmsl_tr2)$(subst xx,x,$(join $1,$2))
-int_min = $(__gmsl_tr2)$(subst xx,x,$(filter xx,$(join $1,$2)))
-
-# ----------------------------------------------------------------------------
-# Function:  max, min
-# Arguments: 1: An integer
-#            2: Another integer
-# Returns:   Returns the maximum or minimum of its integer arguments
-# ----------------------------------------------------------------------------
-max = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_max,$1,$2)
-min = $(__gmsl_tr2)$(call __gmsl_int_wrap,int_min,$1,$2)
-
-# ----------------------------------------------------------------------------
-# Function: int_gt, int_gte, int_lt, int_lte, int_eq, int_ne
-# Arguments: Two x's representation numbers to be compared
-# Returns:   $(true) or $(false)
-#
-# int_gt    First argument greater than second argument
-# int_gte   First argument greater than or equal to second argument
-# int_lt    First argument less than second argument 
-# int_lte   First argument less than or equal to second argument
-# int_eq    First argument is numerically equal to the second argument
-# int_ne    First argument is not numerically equal to the second argument
-# ----------------------------------------------------------------------------
-int_gt = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $2), \
-                              $(words $(call int_max,$1,$2))))
-int_gte = $(__gmsl_tr2)$(call __gmsl_make_bool,     \
-                           $(call int_gt,$1,$2)$(call int_eq,$1,$2))
-int_lt = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $1), \
-                              $(words $(call int_max,$1,$2))))
-int_lte = $(__gmsl_tr2)$(call __gmsl_make_bool,     \
-                           $(call int_lt,$1,$2)$(call int_eq,$1,$2))
-int_eq = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter $(words $1),$(words $2)))
-int_ne = $(__gmsl_tr2)$(call __gmsl_make_bool,      \
-                          $(filter-out $(words $1),$(words $2)))
-
-# ----------------------------------------------------------------------------
-# Function: gt, gte, lt, lte, eq, ne
-# Arguments: Two integers to be compared
-# Returns:   $(true) or $(false)
-#
-# gt    First argument greater than second argument
-# gte   First argument greater than or equal to second argument
-# lt    First argument less than second argument 
-# lte   First argument less than or equal to second argument
-# eq    First argument is numerically equal to the second argument
-# ne    First argument is not numerically equal to the second argument
-# ----------------------------------------------------------------------------
-gt = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_gt,$1,$2)
-gte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_gte,$1,$2)
-lt = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lt,$1,$2)
-lte = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_lte,$1,$2)
-eq = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_eq,$1,$2)
-ne = $(__gmsl_tr2)$(call __gmsl_int_wrap2,int_ne,$1,$2)
-
-# increment adds 1 to its argument, decrement subtracts 1.  Note that
-# decrement does not range check and hence will not underflow, but
-# will incorrectly say that 0 - 1 = 0
-
-# ----------------------------------------------------------------------------
-# Function:  int_inc
-# Arguments: 1: A number in x's representation
-# Returns:   The number incremented by 1 in x's representation
-# ----------------------------------------------------------------------------
-int_inc = $(strip $(__gmsl_tr1)$1 x)
-
-# ----------------------------------------------------------------------------
-# Function:  inc
-# Arguments: 1: An integer
-# Returns:   The argument incremented by 1
-# ----------------------------------------------------------------------------
-inc = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_inc,$1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_dec
-# Arguments: 1: A number in x's representation
-# Returns:   The number decremented by 1 in x's representation
-# ----------------------------------------------------------------------------
-int_dec = $(__gmsl_tr1)$(strip                        \
-          $(if $(call sne,0,$(words $1)),             \
-          $(wordlist 2,$(words $1),$1)))
-
-# ----------------------------------------------------------------------------
-# Function:  dec
-# Arguments: 1: An integer
-# Returns:   The argument decremented by 1
-# ----------------------------------------------------------------------------
-dec = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_dec,$1)
-
-# double doubles its argument, and halve halves it
-
-# ----------------------------------------------------------------------------
-# Function:  int_double
-# Arguments: 1: A number in x's representation
-# Returns:   The number doubled (i.e. * 2) and returned in x's representation
-# ----------------------------------------------------------------------------
-int_double = $(strip $(__gmsl_tr1)$1 $1)
-
-# ----------------------------------------------------------------------------
-# Function:  double
-# Arguments: 1: An integer
-# Returns:   The integer times 2
-# ----------------------------------------------------------------------------
-double = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_double,$1)
-
-# ----------------------------------------------------------------------------
-# Function:  int_halve
-# Arguments: 1: A number in x's representation
-# Returns:   The number halved (i.e. / 2) and returned in x's representation
-# ----------------------------------------------------------------------------
-int_halve = $(__gmsl_tr1)$(strip $(subst xx,x,$(filter-out xy x y, \
-                             $(join $1,$(foreach a,$1,y x)))))
-
-# ----------------------------------------------------------------------------
-# Function:  halve
-# Arguments: 1: An integer
-# Returns:   The integer divided by 2
-# ----------------------------------------------------------------------------
-halve = $(__gmsl_tr1)$(call __gmsl_int_wrap1,int_halve,$1)
-
-# ----------------------------------------------------------------------------
-# Function:  sequence
-# Arguments: 1: An integer
-#            2: An integer
-# Returns:   The sequence [arg1, arg2] of integers if arg1 < arg2 or
-#            [arg2, arg1] if arg2 > arg1. If arg1 == arg1 return [arg1]
-# ----------------------------------------------------------------------------
-sequence = $(__gmsl_tr2)$(strip $(if $(call lte,$1,$2),          \
-         $(call __gmsl_sequence_up,$1,$2),                       \
-         $(call __gmsl_sequence_dn,$2,$1)))
-
-__gmsl_sequence_up = $(if $(call seq,$1,$2),$1,$1 $(call __gmsl_sequence_up,$(call inc,$1),$2))
-__gmsl_sequence_dn = $(if $(call seq,$1,$2),$1,$2 $(call __gmsl_sequence_dn,$1,$(call dec,$2)))
-
-# ----------------------------------------------------------------------------
-# Function:  dec2hex, dec2bin, dec2oct
-# Arguments: 1: An integer
-# Returns:   The decimal argument converted to hexadecimal, binary or
-#            octal
-# ----------------------------------------------------------------------------
-
-__gmsl_digit = $(subst 15,f,$(subst 14,e,$(subst 13,d,$(subst 12,c,$(subst 11,b,$(subst 10,a,$1))))))
-
-dec2hex = $(call __gmsl_dec2base,$(call int_encode,$1),$(call int_encode,16))
-dec2bin = $(call __gmsl_dec2base,$(call int_encode,$1),$(call int_encode,2))
-dec2oct = $(call __gmsl_dec2base,$(call int_encode,$1),$(call int_encode,8))
-
-__gmsl_base_divide = $(subst $2,X ,$1)
-__gmsl_q = $(strip $(filter X,$1))
-__gmsl_r = $(words $(filter x,$1))
-
-__gmsl_dec2base = $(eval __gmsl_temp := $(call __gmsl_base_divide,$1,$2))$(call __gmsl_dec2base_,$(call __gmsl_q,$(__gmsl_temp)),$(call __gmsl_r,$(__gmsl_temp)),$2)
-__gmsl_dec2base_ = $(if $1,$(call __gmsl_dec2base,$(subst X,x,$1),$3))$(call __gmsl_digit,$2)
-
-ifdef __gmsl_have_eval
-# ###########################################################################
-# ASSOCIATIVE ARRAYS
-# ###########################################################################
-
-# Magic string that is very unlikely to appear in a key or value
-
-__gmsl_aa_magic := faf192c8efbc25c27992c5bc5add390393d583c6
-
-# ----------------------------------------------------------------------------
-# Function:  set
-# Arguments: 1: Name of associative array
-#            2: The key value to associate
-#            3: The value associated with the key
-# Returns:   Nothing
-# ----------------------------------------------------------------------------
-set = $(__gmsl_tr3)$(call assert_no_space,$0,$1$2)$(call assert_no_dollar,$0,$1$2$3)$(eval __gmsl_aa_$1_$(__gmsl_aa_magic)_$2_gmsl_aa_$1 := $3)
-
-# Only used internally by memoize function
-
-__gmsl_set = $(call set,$1,$2,$3)$3
-
-# ----------------------------------------------------------------------------
-# Function:  get
-# Arguments: 1: Name of associative array
-#            2: The key to retrieve
-# Returns:   The value stored in the array for that key
-# ----------------------------------------------------------------------------
-get = $(strip $(__gmsl_tr2)$(call assert_no_space,$0,$1$2)$(call assert_no_dollar,$0,$1$2)$(__gmsl_aa_$1_$(__gmsl_aa_magic)_$2_gmsl_aa_$1))
-
-# ----------------------------------------------------------------------------
-# Function:  keys
-# Arguments: 1: Name of associative array
-# Returns:   Returns a list of all defined keys in the array
-# ----------------------------------------------------------------------------
-keys = $(__gmsl_tr1)$(call assert_no_space,$0,$1)$(call assert_no_dollar,$0,$1)$(sort $(patsubst __gmsl_aa_$1_$(__gmsl_aa_magic)_%_gmsl_aa_$1,%, \
-                  $(filter __gmsl_aa_$1_$(__gmsl_aa_magic)_%_gmsl_aa_$1,$(.VARIABLES))))
-
-# ----------------------------------------------------------------------------
-# Function:  defined
-# Arguments: 1: Name of associative array
-#            2: The key to test
-# Returns:   Returns true if the key is defined (i.e. not empty)
-# ----------------------------------------------------------------------------
-defined = $(__gmsl_tr2)$(call assert_no_space,$0,$1$2)$(call assert_no_dollar,$0,$1$2)$(call sne,$(call get,$1,$2),)
-
-endif # __gmsl_have_eval
-
-ifdef __gmsl_have_eval
-# ###########################################################################
-# NAMED STACKS
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  push
-# Arguments: 1: Name of stack
-#            2: Value to push onto the top of the stack (must not contain
-#               a space)
-# Returns:   None
-# ----------------------------------------------------------------------------
-push = $(__gmsl_tr2)$(call assert_no_space,$0,$1$2)$(call assert_no_dollar,$0,$1$2)$(eval __gmsl_stack_$1 := $2 $(if $(filter-out undefined,\
-    $(origin __gmsl_stack_$1)),$(__gmsl_stack_$1)))
-
-# ----------------------------------------------------------------------------
-# Function:  pop
-# Arguments: 1: Name of stack
-# Returns:   Top element from the stack after removing it
-# ----------------------------------------------------------------------------
-pop = $(__gmsl_tr1)$(call assert_no_space,$0,$1)$(call assert_no_dollar,$0,$1)$(strip $(if $(filter-out undefined,$(origin __gmsl_stack_$1)), \
-    $(call first,$(__gmsl_stack_$1))                                       \
-    $(eval __gmsl_stack_$1 := $(call rest,$(__gmsl_stack_$1)))))
-
-# ----------------------------------------------------------------------------
-# Function:  peek
-# Arguments: 1: Name of stack
-# Returns:   Top element from the stack without removing it
-# ----------------------------------------------------------------------------
-peek = $(__gmsl_tr1)$(call assert_no_space,$0,$1)$(call assert_no_dollar,$0,$1)$(call first,$(__gmsl_stack_$1))
-
-# ----------------------------------------------------------------------------
-# Function:  depth
-# Arguments: 1: Name of stack
-# Returns:   Number of items on the stack
-# ----------------------------------------------------------------------------
-depth = $(__gmsl_tr1)$(call assert_no_space,$0,$1)$(call assert_no_dollar,$0,$1)$(words $(__gmsl_stack_$1))
-
-endif # __gmsl_have_eval
-
-ifdef __gmsl_have_eval
-# ###########################################################################
-# STRING CACHE
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Function:  memoize
-# Arguments: 1. Name of the function to be called if the string
-#               has not been previously seen
-#            2. A string
-# Returns:   Returns the result of a memo function (which the user must
-#            define) on the passed in string and remembers the result.
-#
-# Example:   Set memo = $(shell echo "$1" | md5sum) to make a cache
-#            of MD5 hashes of strings. $(call memoize,memo,foo bar baz)
-# ----------------------------------------------------------------------------
-__gmsl_memoize = $(subst $(__gmsl_space),�,$1)cc2af1bb7c4482f2ba75e338b963d3e7$(subst $(__gmsl_space),�,$2)
-memoize = $(__gmsl_tr2)$(strip $(if $(call defined,__gmsl_m,$(__gmsl_memoize)),\
-                  $(call get,__gmsl_m,$(__gmsl_memoize)),                      \
-                  $(call __gmsl_set,__gmsl_m,$(__gmsl_memoize),$(call $1,$2))))
-
-endif # __gmsl_have_eval
-
-# ###########################################################################
-# DEBUGGING FACILITIES
-# ###########################################################################
-
-# ----------------------------------------------------------------------------
-# Target:    gmsl-print-%
-# Arguments: The % should be replaced by the name of a variable that you
-#            wish to print out.
-# Action:    Echos the name of the variable that matches the % and its value.
-#            For example, 'make gmsl-print-SHELL' will output the value of
-#            the SHELL variable
-# ----------------------------------------------------------------------------
-gmsl-print-%: ; @echo $* = $($*)
-
-# ----------------------------------------------------------------------------
-# Function:  assert
-# Arguments: 1: A boolean that must be true or the assertion will fail
-#            2: The message to print with the assertion
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert = $(if $2,$(if $1,,$(call __gmsl_error,Assertion failure: $2)))
-
-# ----------------------------------------------------------------------------
-# Function:  assert_exists
-# Arguments: 1: Name of file that must exist, if it is missing an assertion
-#               will be generated
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert_exists = $(if $0,$(call assert,$(wildcard $1),file '$1' missing))
-
-# ----------------------------------------------------------------------------
-# Function:  assert_no_dollar
-# Arguments: 1: Name of a function being executd
-#            2: Arguments to check
-# Returns:   None
-# ----------------------------------------------------------------------------
-assert_no_dollar = $(call __gmsl_tr2)$(call assert,$(call not,$(findstring $(__gmsl_dollar),$2)),$1 called with a dollar sign in argument)
-
-# ----------------------------------------------------------------------------
-# Function:  assert_no_space
-# Arguments: 1: Name of a function being executd
-#            2: Arguments to check
-# Returns:   None
-# ----------------------------------------------------------------------------
-ifeq ($(__gmsl_spaced_vars),$(false))
-assert_no_space = $(call assert,$(call not,$(findstring $(__gmsl_aa_magic),$(subst $(__gmsl_space),$(__gmsl_aa_magic),$2))),$1 called with a space in argument)
-else
-assert_no_space =
-endif
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/gsml/gmsl b/installer/vendor/github.com/vmware/vic/infra/util/gsml/gmsl
deleted file mode 100644
index 17891f1343..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/gsml/gmsl
+++ /dev/null
@@ -1,85 +0,0 @@
-# ----------------------------------------------------------------------------
-#
-# GNU Make Standard Library (GMSL)
-#
-# A library of functions to be used with GNU Make's $(call) that
-# provides functionality not available in standard GNU Make.
-#
-# Copyright (c) 2005-2014 John Graham-Cumming
-#
-# This file is part of GMSL
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-#
-# Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 
-# Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# Neither the name of the John Graham-Cumming nor the names of its
-# contributors may be used to endorse or promote products derived from
-# this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-# CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# ----------------------------------------------------------------------------
-
-# Determine if the library has already been included and if so don't
-# bother including it again
-
-ifndef __gmsl_included
-
-# Standard definitions for true and false.  true is any non-empty
-# string, false is an empty string. These are intended for use with
-# $(if).
-
-true  := T
-false :=
-
-# ----------------------------------------------------------------------------
-# Function:  not
-# Arguments: 1: A boolean value
-# Returns:   Returns the opposite of the arg. (true -> false, false -> true)
-# ----------------------------------------------------------------------------
-not = $(if $1,$(false),$(true))
-
-# Prevent reinclusion of the library
-
-__gmsl_included := $(true)
-
-# Try to determine where this file is located.  If the caller did
-# include /foo/gmsl then extract the /foo/ so that __gmsl gets
-# included transparently
-
-__gmsl_root :=
-
-ifneq ($(MAKEFILE_LIST),)
-__gmsl_root := $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))
-
-# If there are any spaces in the path in __gmsl_root then give up
-
-ifeq (1,$(words $(__gmsl_root)))
-__gmsl_root := $(patsubst %gmsl,%,$(__gmsl_root))
-endif
-
-endif
-
-include $(__gmsl_root)__gmsl
-
-endif # __gmsl_included
-
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/README.md b/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/README.md
deleted file mode 100644
index 85f7827ecb..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/README.md
+++ /dev/null
@@ -1,30 +0,0 @@
-### Dependency parsing tool
-
-This tool is here to simplify checking the vendor manifest for consistency and for which tags are being used
-
-It queries GitHub and takes into account any specific exceptions and produces a human-readable report on what our dependencies are
-
-#### Building
-
-There's no point building this tool all the time. It will be used sporadically for auditing purposes.
-Simply use go build <sourcefile> to create the binaries when needed
-
-#### Running
-
-The binaries are designed to be piped together to take each others output. This way, any intermediate json can be fed into a spreadsheet or likewise
-
-Example usage:
-
-```
-cat ../../manifest | gettags --uid "bcorrie@vmware.com" --pwd "foobedoo" > 1.json
-cat 1.json | groupbyrepo > 2.json
-cat 2.json | report --exceptionFile=../../exceptions
-
-cat ../../manifest | gettags --uid "bcorrie@vmware.com" --pwd "foobedoo" | groupbyrepo | report --exceptionFile=../../exceptions
-```
-
-#### Exceptions
-
-It would be good practice for us to document cases in which a specific revision must be used, either because of a critical patch or equivalent. See exceptions file co-located with the manifest for examples.
-
-Exceptions are outputted in the report and ensure that no-one attempts to modify a revision to a later tag without considering the exception
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/gettags.go b/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/gettags.go
deleted file mode 100644
index ead5412428..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/gettags.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-
-	"parser"
-)
-
-var client *http.Client
-
-var uid = flag.String("uid", "", "valid Github userid")
-var pwd = flag.String("pwd", "", "valid Github password")
-
-func init() {
-	flag.Usage = func() {
-		fmt.Println("Usage: Queries Github for tags for each dependency sha in manifest input. Takes input via stdin. Eg: cat manifest | gettags")
-		fmt.Println("       Uses basic auth, specified by --uid=<uid> and --pwd=<pwd>. Failure to specify will likely hit Github API limits")
-		flag.PrintDefaults()
-	}
-	flag.Parse()
-}
-
-func findTagForSha(data []parser.TagData, sha string) string {
-	for _, tag := range data {
-		if tag.Commit.Sha == sha {
-			return tag.Name
-		}
-	}
-	return ""
-}
-
-func queryGit(u *url.URL) ([]byte, error) {
-	getPath := "https://api.github.com/repos" + u.Path + "/tags"
-	req, _ := http.NewRequest("GET", getPath, nil)
-	if *uid != "" && *pwd != "" {
-		req.SetBasicAuth(*uid, *pwd)
-	}
-	resp, err := client.Do(req)
-	if err != nil {
-		return nil, fmt.Errorf("Unexpected error attempting HTTP GET to %v: %v", u, err)
-	}
-	return ioutil.ReadAll(resp.Body)
-}
-
-// Currently only works for Github URLs as this is the vast majority. Rest will have HasTags == false
-func findTag(entry *parser.ManifestEntry) (*parser.ManifestEntry, error) {
-	u, err := url.Parse(entry.Repository)
-	if err != nil {
-		return nil, fmt.Errorf("Malformed repository URL: %v", err)
-	}
-	if u.Host == "github.com" {
-		tagdata, err := queryGit(u)
-		if err != nil {
-			return nil, err
-		}
-		td := []parser.TagData{}
-		err = json.Unmarshal(tagdata, &td)
-		if err != nil {
-			return nil, fmt.Errorf("Unparsable output: %s: %v", string(tagdata), err)
-		}
-		entry.HasTags = (len(td) == 0)
-		if len(td) == 0 {
-			entry.HasTags = false
-		} else {
-			entry.HasTags = true
-			foundTag := findTagForSha(td, entry.Revision)
-			if foundTag != "" {
-				entry.RevisionTag = foundTag
-			} else {
-				entry.SuggestedTag = td[0].Name
-				entry.SuggestedRev = td[0].Commit.Sha
-			}
-		}
-	}
-	return entry, err
-}
-
-// Take the vendor manifest file and uses the Github APIs to retrieve the tag data for each Revision
-// Outputted data can be consumed by other parsers, or can be input to groupbyrepo
-func main() {
-
-	// Load the json from stdin (designed to support piping between binaries)
-	input, err := parser.ReadFromStdin()
-	if err != nil {
-		fmt.Fprint(os.Stderr, err)
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	client = &http.Client{}
-
-	// Parse the data into useful types
-	m, err := parser.ParseManifest(input)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to parse input json: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Find the tag for each repository. This is done serially.
-	var foundTag *parser.ManifestEntry
-	if err == nil {
-		for i, me := range m.Dependencies {
-			foundTag, err = findTag(&me)
-			if err != nil {
-				break
-			}
-			m.Dependencies[i] = *foundTag
-		}
-	}
-
-	// Output the original manifest data with new fields added (see ManifestEntry)
-	if err == nil {
-		output, _ := json.MarshalIndent(m, "", "   ")
-		fmt.Println(string(output))
-	} else {
-		fmt.Fprintf(os.Stderr, "%v\n", err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/groupbyrepo.go b/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/groupbyrepo.go
deleted file mode 100644
index 91b96501a4..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/groupbyrepo.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"net/url"
-	"os"
-
-	"parser"
-)
-
-func init() {
-	flag.Usage = func() {
-		fmt.Println("Usage: Groups the json output of gettags by repository. Takes input via stdin. Eg: gettags | groupbyrepo")
-	}
-	flag.Parse()
-}
-
-func groupByRepo(m parser.Manifest) []*parser.ManifestByRepo {
-	var repoMap = make(map[string]*parser.ManifestByRepo)
-
-	for _, me := range m.Dependencies {
-		u, _ := url.Parse(me.Repository)
-		repo := u.Path
-		mapEntry := repoMap[repo]
-		if mapEntry == nil {
-			mapEntry = &parser.ManifestByRepo{Repository: repo}
-		}
-		mapEntry.Dependencies = append(mapEntry.Dependencies, me)
-		repoMap[repo] = mapEntry
-	}
-
-	values := make([]*parser.ManifestByRepo, len(repoMap))
-	i := 0
-	for _, k := range repoMap {
-		values[i] = k
-		i++
-	}
-	return values
-}
-
-// Takes json output from gettags and groups it by repository. Output is in json format and can be further parsed by report
-func main() {
-
-	// Read json data from stdin (designed to support piping between binaries)
-	input, err := parser.ReadFromStdin()
-	if err != nil {
-		fmt.Fprint(os.Stderr, err)
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	// Parse the data into useful types
-	m, err := parser.ParseManifest(input)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error parsing input json: %v", err)
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	// Group the data into a slice of repo->dependencies
-	values := groupByRepo(m)
-
-	// Format the output to stdout
-	output, err := json.MarshalIndent(values, "", "   ")
-	fmt.Println(string(output))
-}
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/report.go b/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/report.go
deleted file mode 100644
index ba2f55cdb0..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/tool/report.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"sort"
-	"strings"
-
-	"parser"
-)
-
-var exceptionFile = flag.String("exceptionFile", "", "json file containing documented exceptions to using tagged releases")
-
-func init() {
-	flag.Usage = func() {
-		fmt.Println("Usage: Formats the json output of groupbyrepo and considers json exceptions. Takes input via stdin. Eg: gettags | groupbyrepo | report")
-		flag.PrintDefaults()
-	}
-	flag.Parse()
-}
-
-func printOutput(out io.Writer, repos parser.SortedManifestByRepo, exceptions map[string]string) {
-	for _, repo := range repos {
-		fmt.Fprintf(out, "\n%s\n", repo.Repository)
-		for _, dep := range repo.Dependencies {
-			fmt.Fprintf(out, "\t%s", dep.Importpath)
-			if exceptions[dep.Revision] == "" {
-				if dep.HasTags {
-					if dep.RevisionTag != "" {
-						fmt.Fprintf(out, " is tagged as "+dep.RevisionTag)
-					} else {
-						fmt.Fprintf(out, " "+dep.Revision+" is an untagged version. Most recent tag is %s for sha %s", dep.SuggestedTag, dep.SuggestedRev)
-					}
-				} else {
-					if strings.Index(dep.Repository, "github.com") == -1 {
-						fmt.Fprintf(out, " "+dep.Revision+" sha is from non-Github repo")
-					} else {
-						fmt.Fprintf(out, " "+dep.Revision+" sha is from a repo with no tags")
-					}
-				}
-			} else {
-				fmt.Fprintf(out, " "+dep.Revision+" MUST BE THIS REVISION because %s", exceptions[dep.Revision])
-			}
-			fmt.Fprintf(out, "\n")
-		}
-	}
-}
-
-func loadAndParseExceptions() (map[string]string, error) {
-	var exceptions map[string]string
-	var err error
-
-	if *exceptionFile != "" {
-		exceptions = make(map[string]string)
-		data, err := ioutil.ReadFile(*exceptionFile)
-		if err == nil {
-			e := []parser.UntaggedException{}
-			err := json.Unmarshal(data, &e)
-			if err == nil {
-				for _, v := range e {
-					exceptions[v.Revision] = v.Reason
-				}
-			}
-		}
-	}
-	return exceptions, err
-}
-
-// Takes the output from groupbyrepo, plus exception data from a file, and produces a human-parsable report
-func main() {
-
-	// Load the json from stdin (designed to support piping between binaries)
-	input, err := parser.ReadFromStdin()
-	if err != nil {
-		fmt.Fprint(os.Stderr, err)
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	// Parse the data into useful types
-	repos, err := parser.ParseManifestByRepo(input)
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Failed to parse input json: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Load the exception file into useful types
-	exceptions, err := loadAndParseExceptions()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "Error loading exceptions file: %v\n", err)
-		os.Exit(1)
-	}
-
-	// Write the report to stdout
-	sort.Sort(parser.SortedManifestByRepo(repos))
-	printOutput(os.Stdout, repos, exceptions)
-}
diff --git a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/types.go b/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/types.go
deleted file mode 100644
index c9dd903e3a..0000000000
--- a/installer/vendor/github.com/vmware/vic/infra/util/vendor-manifest-parser/types.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package parser
-
-import (
-	"bufio"
-	"encoding/json"
-	"fmt"
-	"io"
-	"os"
-)
-
-// Manifest is a golang representation of the manifest json
-type Manifest struct {
-	Version      int
-	Dependencies []ManifestEntry
-}
-
-func ParseManifest(input []byte) (Manifest, error) {
-	m := Manifest{}
-	err := json.Unmarshal(input, &m)
-	return m, err
-}
-
-// ManifestByRepo is like Manifest, except that only the Dependencies for a specific repo are included
-type ManifestByRepo struct {
-	Repository   string
-	Dependencies []ManifestEntry
-}
-
-func ParseManifestByRepo(input []byte) ([]ManifestByRepo, error) {
-	m := []ManifestByRepo{}
-	err := json.Unmarshal(input, &m)
-	return m, err
-}
-
-type SortedManifestByRepo []ManifestByRepo
-
-func (slice SortedManifestByRepo) Len() int {
-	return len(slice)
-}
-
-func (slice SortedManifestByRepo) Less(i, j int) bool {
-	return slice[i].Repository < slice[j].Repository
-}
-
-func (slice SortedManifestByRepo) Swap(i, j int) {
-	slice[i], slice[j] = slice[j], slice[i]
-}
-
-// ManifestEntry includes the fields from the original manifest plus some additional fields:
-//   HasTags - does the repository have tags
-//   RevisionTag - is there a tag corresponding to this revision
-//   SuggestedTag - if there is no tag, the most recent tag is listed
-//   SuggestedRev - if a tag is suggested, the revision is also suggested
-type ManifestEntry struct {
-	Importpath   string
-	Repository   string
-	Vcs          string
-	Revision     string
-	HasTags      bool
-	RevisionTag  string
-	SuggestedTag string
-	SuggestedRev string
-	Branch       string
-}
-
-// TagData is the golang representation of the json returned from Github
-type TagData struct {
-	Name   string
-	Commit TagDataCommit
-}
-
-// TagDataCommit is the golang representation of the json returned from Github
-type TagDataCommit struct {
-	Sha string
-	Url string
-}
-
-// UntaggedException is the golang representation of a documented exception to revision not being tagged
-type UntaggedException struct {
-	Revision string
-	Reason   string
-}
-
-func ReadFromStdin() ([]byte, error) {
-	bio := bufio.NewReader(os.Stdin)
-	input, err := bio.ReadBytes(127) // Read all input to EOF
-	if err != io.EOF {
-		return nil, fmt.Errorf("Failed to read input: %v\n", err)
-	}
-	return input, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance-staging.sh b/installer/vendor/github.com/vmware/vic/isos/appliance-staging.sh
deleted file mode 100755
index 3a6f68e5fc..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance-staging.sh
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build the appliance filesystem ontop of the base
-
-# exit on failure and configure debug, include util functions
-set -e && [ -n "$DEBUG" ] && set -x
-DIR=$(dirname $(readlink -f "$0"))
-. $DIR/base/utils.sh
-
-
-function usage() {
-echo "Usage: $0 -c yum-cache(tgz) -p base-package(tgz) -o output-package(tgz)" 1>&2
-exit 1
-}
-
-while getopts "c:p:o:" flag
-do
-    case $flag in
-
-        p)
-            # Required. Package name
-            PACKAGE="$OPTARG"
-            ;;
-
-        o)
-            # Required. Target for iso and source for components
-            OUT="$OPTARG"
-            ;;
-
-        c)
-            # Optional. Offline cache of yum packages
-            cache="$OPTARG"
-            ;;
-
-        *)
-            usage
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-# check there were no extra args and the required ones are set
-if [ ! -z "$*" -o -z "$PACKAGE" -o -z "${OUT}" ]; then
-    usage
-fi
-
-PKGDIR=$(mktemp -d)
-
-unpack $PACKAGE $PKGDIR
-
-#################################################################
-# Above: arg parsing and setup
-# Below: the image authoring
-#################################################################
-
-# Install VCH base packages
-#
-# List stable packages here
-#   e2fsprogs # for mkfs.ext4
-#   procps-ng # for ps
-#   iputils   # for ping
-#   iproute2  # for ip
-#   iptables  # for iptables
-#   net-tools # for netstat
-#   openssh   # for ssh server
-#   sudo      # for sudo
-#
-# Temporary packages list here
-#   systemd   # for convenience only at this time
-#   tndf      # so we can deploy other packages into the appliance live - MUST BE REMOVED FOR SHIPPING
-#   vim       # basic editing function
-#   lsof      # for debugging issues unmounting disks for the copy/diff paths
-yum_cached -c $cache -u -p $PKGDIR install \
-    haveged \
-    systemd \
-    openssh \
-    iptables \
-    e2fsprogs \
-    procps-ng \
-    iputils \
-    iproute2 \
-    iptables \
-    net-tools \
-    sudo \
-    tdnf \
-    vim \
-    gzip \
-    lsof \
-    logrotate \
-    photon-release \
-    -y --nogpgcheck
-
-# https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface/
-touch $(rootfs_dir $PKGDIR)/etc/initrd-release
-
-# Give a permission to vicadmin to run iptables.
-echo "vicadmin ALL=NOPASSWD: /sbin/iptables --list" >> $(rootfs_dir $PKGDIR)/etc/sudoers
-
-# ensure we're not including a cache in the staging bundle
-# but don't update the cache bundle we're using to install
-yum_cached -p $PKGDIR clean all
-
-# configure us for autologin of root
-#COPY override.conf $ROOTFS/etc/systemd/system/getty@.service.d/
-# HACK until the issues with override.conf above are dealt with
-pwhash=$(openssl passwd -1 -salt vic password)
-sed -i -e "s/^root:[^:]*:/root:${pwhash}:/" $(rootfs_dir $PKGDIR)/etc/shadow
-
-# Disable SSH by default - this can be enabled via guest operations
-rm $(rootfs_dir $PKGDIR)/usr/lib/systemd/system/sshd@.service
-rm $(rootfs_dir $PKGDIR)/etc/systemd/system/multi-user.target.wants/sshd.service
-
-# Allow root login via ssh
-sed -i -e "s/\#*PermitRootLogin\s.*/PermitRootLogin yes/" $(rootfs_dir $PKGDIR)/etc/ssh/sshd_config
-
-# Disable root login
-sed -i -e 's@:/bin/bash$@:/bin/false@' $(rootfs_dir $PKGDIR)/etc/passwd
-
-# Allow chpasswd to change expired password when launched from vic-init
-cp -f ${DIR}/appliance/chpasswd.pam $(rootfs_dir $PKGDIR)/etc/pam.d/chpasswd
-# Allow chage to be used with expired password when launched from vic-init
-cp -f ${DIR}/appliance/chage.pam $(rootfs_dir $PKGDIR)/etc/pam.d/chage
-
-# package up the result
-pack $PKGDIR $OUT
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance.sh b/installer/vendor/github.com/vmware/vic/isos/appliance.sh
deleted file mode 100755
index f11fdea44d..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build the appliance filesystem ontop of the base
-
-# exit on failure and configure debug, include util functions
-set -e && [ -n "$DEBUG" ] && set -x
-DIR=$(dirname $(readlink -f "$0"))
-. $DIR/base/utils.sh
-
-
-function usage() {
-echo "Usage: $0 -p staged-package(tgz) -b binary-dir" 1>&2
-exit 1
-}
-
-while getopts "p:b:" flag
-do
-    case $flag in
-
-        p)
-            # Required. Package name
-            PACKAGE="$OPTARG"
-            ;;
-
-        b)
-            # Required. Target for iso and source for components
-            BIN="$OPTARG"
-            ;;
-
-        *)
-            usage
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-# check there were no extra args and the required ones are set
-if [ ! -z "$*" -o -z "$PACKAGE" -o -z "${BIN}" ]; then
-    usage
-fi
-
-PKGDIR=$(mktemp -d)
-
-# unpackage base package
-unpack $PACKAGE $PKGDIR
-
-#################################################################
-# Above: arg parsing and setup
-# Below: the image authoring
-#################################################################
-
-# sysctl
-cp ${DIR}/appliance/sysctl.conf $(rootfs_dir $PKGDIR)/etc/
-
-## systemd configuration
-# create systemd vic target
-cp ${DIR}/appliance/vic.target $(rootfs_dir $PKGDIR)/etc/systemd/system/
-cp ${DIR}/appliance/*.service $(rootfs_dir $PKGDIR)/etc/systemd/system/
-cp ${DIR}/appliance/*-setup $(rootfs_dir $PKGDIR)/etc/systemd/scripts
-
-mkdir -p $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants
-ln -s /etc/systemd/system/vic-init.service $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants/
-ln -s /etc/systemd/system/nat.service $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants/
-ln -s /etc/systemd/system/permissions.service $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants/
-ln -s /lib/systemd/system/multi-user.target $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants/
-
-# disable networkd given we manage the link state directly
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
-
-# Disable time synching.  We'll use toolbox for this.
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/system/sysinit.target.wants/systemd-timesyncd.service
-
-# change the default systemd target to launch VIC
-ln -sf /etc/systemd/system/vic.target $(rootfs_dir $PKGDIR)/etc/systemd/system/default.target
-
-# do not use the systemd dhcp client
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/network/*
-cp ${DIR}/base/no-dhcp.network $(rootfs_dir $PKGDIR)/etc/systemd/network/
-
-# do not use the default iptables rules - nat-setup supplants this
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/network/*
-
-#
-# Set up component users
-#
-
-chroot $(rootfs_dir $PKGDIR) groupadd -g 1000 vicadmin
-chroot $(rootfs_dir $PKGDIR) useradd -u 1000 -g 1000 -G systemd-journal -m -d /home/vicadmin -s /bin/false vicadmin
-
-# Group vic should be used to run all VIC related services.
-chroot $(rootfs_dir $PKGDIR) groupadd -g 1001 vic
-chroot $(rootfs_dir $PKGDIR) usermod -a -G vic vicadmin
-
-cp -R ${DIR}/vicadmin/* $(rootfs_dir $PKGDIR)/home/vicadmin
-chown -R 1000:1000 $(rootfs_dir $PKGDIR)/home/vicadmin
-
-# so vicadmin can read the system journal via journalctl
-install -m 755 -d $(rootfs_dir $PKGDIR)/etc/tmpfiles.d
-echo "m  /var/log/journal/%m/system.journal 2755 root systemd-journal - -" > $(rootfs_dir $PKGDIR)/etc/tmpfiles.d/systemd.conf
-
-chroot $(rootfs_dir $PKGDIR) mkdir -p /var/run/lock
-chroot $(rootfs_dir $PKGDIR) chmod 1777 /var/run/lock
-chroot $(rootfs_dir $PKGDIR) touch /var/run/lock/logrotate_run.lock
-chroot $(rootfs_dir $PKGDIR) chown root:vic /var/run/lock/logrotate_run.lock
-chroot $(rootfs_dir $PKGDIR) chmod 0660 /var/run/lock/logrotate_run.lock
-
-## main VIC components
-# tether based init
-cp ${BIN}/vic-init $(rootfs_dir $PKGDIR)/sbin/vic-init
-
-cp ${BIN}/{docker-engine-server,port-layer-server,vicadmin} $(rootfs_dir $PKGDIR)/sbin/
-
-## Generate the ISO
-# Select systemd for our init process
-generate_iso $PKGDIR $BIN/appliance.iso /lib/systemd/systemd
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/chage.pam b/installer/vendor/github.com/vmware/vic/isos/appliance/chage.pam
deleted file mode 100644
index 3a9ab6fd63..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/chage.pam
+++ /dev/null
@@ -1,13 +0,0 @@
-#Begin /etc/pam.d/chage
-
-# always allow root
-auth      sufficient  pam_rootok.so
-account   sufficient  pam_rootok.so
-
-# include system defaults for session
-session   include     system-session
-
-# Always permit for authentication updates
-password  required    pam_permit.so
-
-# End /etc/pam.d/chage
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/chpasswd.pam b/installer/vendor/github.com/vmware/vic/isos/appliance/chpasswd.pam
deleted file mode 100644
index cef17377f7..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/chpasswd.pam
+++ /dev/null
@@ -1,11 +0,0 @@
-#Begin /etc/pam.d/chpasswd
-
-# always allow root
-auth      sufficient  pam_rootok.so
-account   sufficient  pam_rootok.so
-
-# include system defaults for session and password
-session   include     system-session
-password  include     system-password
-
-# End /etc/pam.d/chpasswd
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/nat-setup b/installer/vendor/github.com/vmware/vic/isos/appliance/nat-setup
deleted file mode 100755
index 8cc8122c33..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/nat-setup
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/bin/sh
-
-# Begin /etc/systemd/scripts/iptables
-
-# Insert connection-tracking modules
-# (not needed if built into the kernel)
-modprobe nf_conntrack
-modprobe xt_LOG
-
-# Enable IP forwarding
-echo 1 > /proc/sys/net/ipv4/ip_forward
-
-# Enable broadcast echo Protection
-echo 1 > /proc/sys/net/ipv4/icmp_echo_ignore_broadcasts
-
-# Disable Source Routed Packets
-echo 0 > /proc/sys/net/ipv4/conf/all/accept_source_route
-echo 0 > /proc/sys/net/ipv4/conf/default/accept_source_route
-
-# Enable TCP SYN Cookie Protection
-echo 1 > /proc/sys/net/ipv4/tcp_syncookies
-
-# Disable ICMP Redirect Acceptance
-echo 0 > /proc/sys/net/ipv4/conf/default/accept_redirects
-
-# Do not send Redirect Messages
-echo 0 > /proc/sys/net/ipv4/conf/all/send_redirects
-echo 0 > /proc/sys/net/ipv4/conf/default/send_redirects
-
-# Drop Spoofed Packets coming in on an interface, where responses
-# would result in the reply going out a different interface.
-echo 1 > /proc/sys/net/ipv4/conf/all/rp_filter
-echo 1 > /proc/sys/net/ipv4/conf/default/rp_filter
-
-# be verbose on dynamic ip-addresses  (not needed in case of static IP)
-echo 2 > /proc/sys/net/ipv4/ip_dynaddr
-
-# disable Explicit Congestion Notification
-# too many routers are still ignorant
-echo 0 > /proc/sys/net/ipv4/tcp_ecn
-
-# add a routing table for traffic from bridge that is not destined
-# for a local address
-echo 201 bridge.out >> /etc/iproute2/rt_tables
-ip rule add fwmark 1 table bridge.out
-
-# blow away any existing rules with iptables-restore
-iptables-restore <<RULES
-*mangle
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:FORWARD ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
--A PREROUTING -i bridge -m addrtype ! --dst-type LOCAL -j MARK --set-xmark 0x1/0xffffffff
-COMMIT
-*nat
-:PREROUTING ACCEPT [0:0]
-:INPUT ACCEPT [0:0]
-:OUTPUT ACCEPT [0:0]
-:POSTROUTING ACCEPT [0:0]
-:VIC - [0:0]
--A PREROUTING -m addrtype --dst-type LOCAL -j VIC
--A OUTPUT ! -d 127.0.0.0/8 -m addrtype --dst-type LOCAL -j VIC
--A POSTROUTING ! -o bridge -j MASQUERADE
-COMMIT
-*filter
-:INPUT DROP [0:0]
-:FORWARD DROP [0:0]
-:OUTPUT ACCEPT [0:0]
-:VIC - [0:0]
--A INPUT -i lo -j ACCEPT
--A INPUT -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
--A INPUT -m conntrack --ctstate INVALID -j DROP
--A INPUT -p tcp -m tcp --dport 22 -j ACCEPT
--A INPUT -p icmp -m icmp --icmp-type 8 -j ACCEPT
--A INPUT -p udp -m udp --dport 68 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 2375 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 2376 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 2377 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 2378 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 2380 -j ACCEPT
-
--A INPUT -p tcp -m tcp --dport 6062 -j ACCEPT
--A INPUT -p tcp -m tcp --dport 6063 -j ACCEPT
-
--A INPUT -i bridge -p udp -m udp --dport 53 -j ACCEPT
--A INPUT -i bridge -p tcp -m tcp --dport 53 -j ACCEPT
--A INPUT -p udp -j REJECT --reject-with icmp-port-unreachable
--A INPUT -p tcp -j REJECT --reject-with tcp-reset
--A INPUT -j REJECT --reject-with icmp-proto-unreachable
--A FORWARD -o bridge -j VIC
--A FORWARD -o bridge -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
-
--A VIC -i bridge -o bridge -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT
--A VIC -i bridge -o bridge -j REJECT --reject-with icmp-port-unreachable
-COMMIT
-RULES
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/nat.service b/installer/vendor/github.com/vmware/vic/isos/appliance/nat.service
deleted file mode 100644
index b2b62b686e..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/nat.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=NAT setup for bridge network
-After=iptables.service
-
-[Service]
-Type=oneshot
-ExecStart=/etc/systemd/scripts/nat-setup
-RemainAfterExit=yes
-
-[Install]
-WantedBy=vic.target
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/override.conf b/installer/vendor/github.com/vmware/vic/isos/appliance/override.conf
deleted file mode 100644
index a76e4bf773..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/override.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[Service]
-ExecStart=
-ExecStart=-/usr/bin/agetty --autologin root --noclear %I $TERM
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/permissions-setup b/installer/vendor/github.com/vmware/vic/isos/appliance/permissions-setup
deleted file mode 100755
index 1c529c8644..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/permissions-setup
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-# Allow access to VM uuid for self-reflection
-chmod 444 /sys/devices/virtual/dmi/id/product_serial
-chmod 444 /sys/class/dmi/id/product_serial
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/permissions.service b/installer/vendor/github.com/vmware/vic/isos/appliance/permissions.service
deleted file mode 100644
index 2914be4f85..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/permissions.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Modify file permissions for VIC target
-After=basic.target
-
-[Service]
-Type=oneshot
-ExecStart=/etc/systemd/scripts/permissions-setup
-RemainAfterExit=yes
-
-[Install]
-WantedBy=vic.target
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/sysctl.conf b/installer/vendor/github.com/vmware/vic/isos/appliance/sysctl.conf
deleted file mode 100644
index 1d079586cd..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/sysctl.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-# enable gratuitous ARP on address changes
-net.ipv4.conf.all.arp_notify = 1
-net.ipv4.conf.default.arp_notify = 1
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/vic-init.service b/installer/vendor/github.com/vmware/vic/isos/appliance/vic-init.service
deleted file mode 100644
index 8f159c164a..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/vic-init.service
+++ /dev/null
@@ -1,22 +0,0 @@
-[Unit]
-Description=Init process for VIC components
-After=permissions.service
-
-[Service]
-Type=idle
-
-LimitAS=infinity
-LimitRSS=infinity
-LimitCORE=infinity
-LimitNOFILE=65536
-
-# This is not configured for restart as currently vic-init isn't able to
-# reacquire knowledge about whether sessions are running.
-# Instead there is a top level trigger to restart the VM - reverting to
-# known good VM state
-ExecStart=/sbin/vic-init
-
-[Install]
-WantedBy=vic.target
-Wants=basic.target
-Wants=multi-user.target
diff --git a/installer/vendor/github.com/vmware/vic/isos/appliance/vic.target b/installer/vendor/github.com/vmware/vic/isos/appliance/vic.target
deleted file mode 100644
index d4835ed998..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/appliance/vic.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=vSphere Integrated Containers
-Requires=basic.target
-After=basic.target
-AllowIsolate=yes
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/base.sh b/installer/vendor/github.com/vmware/vic/isos/base.sh
deleted file mode 100755
index ed54d53dc0..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base.sh
+++ /dev/null
@@ -1,90 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build the base of a bootable ISO
-
-# exit on failure and configure debug, include util functions
-set -e && [ -n "$DEBUG" ] && set -x
-DIR=$(dirname $(readlink -f "$0"))
-. $DIR/base/utils.sh
-
-
-function usage() {
-echo "Usage: $0 -p package-name(tgz) [-c yum-cache]" 1>&2
-exit 1
-}
-
-while getopts "c:p:" flag
-do
-    case $flag in
-
-        p)
-            # Required. Package name
-            PACKAGE="$OPTARG"
-            ;;
-
-        c)
-            # Optional. Offline cache of yum packages
-            cache="$OPTARG"
-            ;;
-
-        *)
-            usage
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-# check there were no extra args and the required ones are set
-if [ ! -z "$*" -o -z "$PACKAGE" ]; then
-    usage
-fi
-
-# prep the build system
-ensure_apt_packages cpio rpm tar ca-certificates xz-utils
-
-PKGDIR=$(mktemp -d)
-
-# initialize the bundle
-initialize_bundle $PKGDIR
-
-# base filesystem setup
-mkdir -p $(rootfs_dir $PKGDIR)/{etc/yum,etc/yum.repos.d}
-ln -s /lib $(rootfs_dir $PKGDIR)/lib64
-if [[ $DRONE_BUILD_NUMBER && $DRONE_BUILD_NUMBER > 0 ]]; then
-    cp $DIR/base/*-local.repo $(rootfs_dir $PKGDIR)/etc/yum.repos.d/
-else
-    cp $DIR/base/*-remote.repo $(rootfs_dir $PKGDIR)/etc/yum.repos.d/
-fi
-cp $DIR/base/yum.conf $(rootfs_dir $PKGDIR)/etc/yum/
-
-# install the core packages
-yum_cached -c $cache -u -p $PKGDIR install filesystem coreutils linux-esx --nogpgcheck -y
-
-
-# Issue 3858: find all kernel modules and unpack them and run depmod against that directory
-find $(rootfs_dir $PKGDIR)/lib/modules -name "*.ko.xz" | xargs xz -d
-KERNEL_VERSION=$(basename $(rootfs_dir $PKGDIR)/lib/modules/*)
-chroot $(rootfs_dir $PKGDIR) depmod $KERNEL_VERSION
-
-# strip the cache from the resulting image
-yum_cached -c $cache -p $PKGDIR clean all
-
-# move kernel into bootfs /boot directory so that syslinux could load it
-mv $(rootfs_dir $PKGDIR)/boot/vmlinuz-* $(bootfs_dir $PKGDIR)/boot/vmlinuz64
-
-# package up the result
-pack $PKGDIR $PACKAGE
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/boot.msg b/installer/vendor/github.com/vmware/vic/isos/base/isolinux/boot.msg
deleted file mode 100644
index 3a8c535827..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/boot.msg
+++ /dev/null
@@ -1,7 +0,0 @@
-                                           __      _      
- __   ___ __ _____      ____ _ _ __ ___   / /_   _(_) ___ 
- \ \ / / '_ ` _ \ \ /\ / / _` | '__/ _ \ / /\ \ / / |/ __|
-  \ V /| | | | | \ V  V / (_| | | |  __// /  \ V /| | (__ 
-   \_/ |_| |_| |_|\_/\_/ \__,_|_|  \___/_/    \_/ |_|\___|
-                                    Virtual Container Host 
- 
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.bin b/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.bin
deleted file mode 100644
index 007404b5e9..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.bin and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.cfg b/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.cfg
deleted file mode 100644
index 53dae4132d..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/isolinux/isolinux.cfg
+++ /dev/null
@@ -1,8 +0,0 @@
-display boot.msg
-default microcore
-label microcore
-	kernel /boot/vmlinuz64
-	initrd /boot/core.gz
-# 	append rdinit=_INIT_BINARY_ loglevel=3 console=ttyS1,115200n8 console=tty0 rcupdate.rcu_expedited=1 systemd.show_status=0 quiet noreplace-smp cpu_init_udelay=0 vsyscall=emulate
-implicit 0
-F1 boot.msg
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/no-dhcp.network b/installer/vendor/github.com/vmware/vic/isos/base/no-dhcp.network
deleted file mode 100644
index 4cdd7dd294..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/no-dhcp.network
+++ /dev/null
@@ -1,5 +0,0 @@
-[Match]
-Name=*
-
-[Network]
-DHCP=no
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/photon-local.repo b/installer/vendor/github.com/vmware/vic/isos/base/photon-local.repo
deleted file mode 100644
index 2630a336eb..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/photon-local.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[photon]
-name=VMware Photon Linux 1.0(x86_64)
-baseurl=http://192.168.31.16/photon
-gpgcheck=0
-enabled=1
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/photon-remote.repo b/installer/vendor/github.com/vmware/vic/isos/base/photon-remote.repo
deleted file mode 100644
index cb8d1ffdc6..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/photon-remote.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[photon]
-name=VMware Photon Linux 1.0(x86_64)
-baseurl=https://vmware.bintray.com/photon_release_1.0_x86_64/
-gpgkey=file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY
-gpgcheck=0
-enabled=1
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-local.repo b/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-local.repo
deleted file mode 100644
index 1e8e8c091b..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-local.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[photon-updates]
-name=VMware Photon Linux 1.0(x86_64)
-baseurl=http://192.168.31.16/photon-updates
-gpgcheck=0
-enabled=1
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-remote.repo b/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-remote.repo
deleted file mode 100644
index 3ae679bbb9..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/photon-updates-remote.repo
+++ /dev/null
@@ -1,6 +0,0 @@
-[photon-updates]
-name=VMware Photon Linux 1.0(x86_64)
-baseurl=https://dl.bintray.com/vmware/photon_updates_1.0_x86_64
-gpgkey=file:///etc/pki/rpm-gpg/VMWARE-RPM-GPG-KEY
-gpgcheck=0
-enabled=1
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/utils.sh b/installer/vendor/github.com/vmware/vic/isos/base/utils.sh
deleted file mode 100755
index 1a37d2d3ed..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/utils.sh
+++ /dev/null
@@ -1,371 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-# utility functions for staged authoring of ISOs
-[ -n "$DEBUG" ] && set -x
-BASE_DIR=$(dirname $(readlink -f "$BASH_SOURCE"))
-
-if [ -z ${BUILD_NUMBER+x} ]; then
-  BUILD_NUMBER=0
-fi
-
-VERSION=`git describe --abbrev=0 --tags`-${BUILD_NUMBER}-`git rev-parse --short HEAD`
-
-# initialize a directory with the assumptions we make for authoring
-# 1: target directory
-initialize_bundle() {
-    mkdir -p $1
-
-    # we copy the xorriso config template during init as it's part of the base directory
-    # - variable replacement occurs during generation step however
-    cp $BASE_DIR/xorriso-options.cfg $1/xorriso-options.cfg
-
-    mkdir -p $1/rootfs/var/lib/rpm $1/bootfs/boot
-
-    rpm --root=$1/rootfs --initdb
-    cp -a $BASE_DIR/isolinux $1/bootfs/boot/isolinux
-}
-
-# unpackage working ISO filesystem bundle
-# args:
-# 1: package (tar archive) - created by pack()
-# 2: directory to unpack to
-unpack() {
-    mkdir -p $2 || {
-        echo "Unable to create target directory $2 for unpacking: $?" 1>&2
-        return 1
-    }
-
-    tar -C $2 -xf $1 || {
-        echo "Error extracting package archive $1: $?" 1>&2
-        return 2
-    }
-
-    # record the correct file ownerships and permissions if we cannot restore them
-    if [ "$(id -u)" != "0" ]; then
-        # for now we're just going to fail when this is run as non-root
-        echo "Unable to preserve ownership or permissions - run as root" 1>&2
-        return 3
-
-        # Leaving this in here for later reference - successfully restored permissions at
-        # boot time via a manifest and systemd unit but want to try to do so during build
-        # time if possible
-        echo "Storing correct file ownership and permissions restoration" 1>&2
-
-        # we need to chain these permission files, because when the archive is retarred
-        # we can no longer rely on tar tvf to supply the correct permissions.
-        # FILO because repeated non-superuser unpacks/pack cycles will trample attrs otherwise
-        if [ -e $2/tar-attr.cfg ]; then
-            mv $2/tar-attr.cfg $2/tar-attr.cfg~
-        fi
-        tar_attr_to_cmd $1 rootfs > $2/tar-attr.cfg || {
-            echo "Failed to preserve file owner and permissions - run as root to avoid this step: $?" 1>&2
-            return 4
-        }
-
-        # make those FI options, LO in the file
-        if [ -e $2/tar-attr.cfg~ ]; then
-            cat $2/tar-attr.cfg~ >> $2/tar-attr.cfg
-            rm -f $2/tar-attr.cfg~
-        fi
-    elif [ -e $2/tar-attr.cfg ]; then
-        # restore the recorded attributes
-        ( cd $2/rootfs && . ../tar-attr.cfg ) || {
-            echo "Failed to restore file permissions from manifest: $?" 1>&2
-            return 5
-        }
-    fi
-}
-
-# package up bundle
-# 1: bundle base directory
-# 2: target package (tgz)
-pack() {
-    #subshell so we don't end up with ./ leading all names
-    out=$(readlink -f $2)
-    (
-        cd $1
-        tar -zcf $out rootfs bootfs xorriso* || {
-            echo "Failed to package bundle directory: $?" 1>&2
-            return 1
-        }
-    )
-
-    if [ -z "$DEBUG" ]; then
-        rm -fr $1
-    fi
-}
-
-
-# turn the permissions and owner/group info into xorriso options
-# 1: the archive to process
-# 2: the subdir in the archive to restrict output to
-tar_attr_to_xorriso() {
-    tar --numeric-owner -tvf $1 "$2" | awk -v prefix="$2" '
-function convertId(id, type)
-{
-    idcmd="id -" type " "id
-
-    idcmd | getline nid
-    close(idcmd)
-
-    return nid
-}
-
-function txt2octal(txt)
-{
-    # this is used to convert between text perms and octal
-    v["r1"]=400; v["w2"]=200; v["x3"]=100; v["s3"]=4100; v["S3"]=4000
-    v["r4"]=40 ; v["w5"]=20 ; v["x6"]=10 ; v["s6"]=2010; v["S6"]=2000
-    v["r7"]=4  ; v["w8"]=2  ; v["x9"]=1  ; v["t9"]=1001; v["T9"]=1000
-
-    val=0
-    for (i=1; i<=9; i++)
-        val=val+v[substr(txt, i+1, 1)i]
-
-    return val
-}
-
-BEGIN {
-}
-/^[^l]/ {
-    # assemble the permissions mdoe
-    val=txt2octal($0)
-
-    # make our commands relative
-    sub(prefix, "." , $6)
-
-    # translate to numeric ids from textual
-    split($2, owner, "/")
-    uid=owner[1]
-    gid=owner[2]
-
-    # convert to numeric
-    # uid=convertId(uid,"u")
-    # gid=convertId(gid,"g")
-
-    chown[uid]=chown[uid]" "$6
-    chgrp[gid]=chgrp[gid]" "$6
-    chmod[val]=chmod[val]" "$6
-}
-END {
-    for (uid in chown)
-        print "chown", uid, chown[uid]
-
-    for (gid in chgrp)
-        print "chgrp", gid, chgrp[gid]
-
-    for (mode in chmod)
-        printf "chmod %4d %s\n", mode, chmod[mode]
-}'
-    return $?
-}
-
-# Helper to ensure, if possible, that the specified packages are installed
-# ...: space separted list of packages
-ensure_apt_packages() {
-    local install
-
-    # ensure we've got the utils we need
-    for pkg in "$@"; do
-        dpkg -s $pkg >/dev/null 2>&1 || install="$install $pkg"
-    done
-
-    if [ -n "$install" ]; then
-        if [ "$(id -u)" != "0" ]; then
-            echo "Need to install packages - rerun as root" 1>&2
-            echo "packages: $install" 1>&2
-            return 1
-        fi
-
-        # try without update first
-        echo "Installing necessary packages: $install"
-        apt-get -y install $install >/dev/null 2>&1 || {
-            (apt-get update && apt-get -y install $install) || {
-                echo "Failed to install $install packages: $?" 1>&2
-                return 1
-            }
-        }
-    fi
-}
-
-# build an ISO from the specified bundle directory.
-# 1: bundle base directory
-# 2: output file for ISO image - stdio:/dev/fd/1 can be used for stdout
-# 3: init binary to use
-generate_iso() {
-    [ -n "$3" ] || {
-        echo "Init binary must be specified to generate_iso" 1>&2
-        return 1
-    }
-
-    ensure_apt_packages cpio xorriso || {
-        echo "cpio and xorriso packages must be installed for ISO authoring: $?" 1>&2
-        return 1
-    }
-
-    out=$(readlink -f $2)
-    # subshell to avoid changing directory for invoker in failure cases
-    (
-        # operate relative to the package
-        cd $1
-
-        test -r bootfs/boot/isolinux/isolinux.bin -a -w bootfs/boot/isolinux/isolinux.cfg || {
-            echo "isolinux files must exist in $1/boot/isolinux: $?" 1>&2
-            return 2
-        }
-
-        # ensure the target init exists
-        test -x rootfs/$3 || {
-            echo "Specified init ($3) does not exist or is not executable: $?" 1>&2
-            return 3
-        }
-        # set the init binary in isolinux.cfg
-        sed -i -e "s|^#\(\s*append rdinit\)=_INIT_BINARY_|\1=$3|" bootfs/boot/isolinux/isolinux.cfg || {
-            echo "Unable to update rdinit entry in isolinux.cfg: $?" 1>&2
-            return 4
-        }
-
-        # create the initramfs archive - subshell to avoid changing directory
-        echo "Constructing initramfs archive"
-        ( cd rootfs && find | cpio -o -H newc | gzip --fast ) > bootfs/boot/core.gz || {
-            echo "Failed to package root filesystem from $1/rootfs: $?" 1>&2
-            return 5
-        }
-
-        echo "Embedding build version ${VERSION} (use BUILD_NUMBER environment variable to override)"
-        sed -i -e "s/\${VERSION}/${VERSION}/" xorriso-options.cfg
-
-        # deleting the file first seems to be necessary in some cases
-        rm -f "$out"
-
-        # generate the ISO and write it to $ISOOUT
-        xorriso -dev "$out" -options_from_file xorriso-options.cfg || {
-            echo "Failed to generate ISO file from package: $?" 1>&2
-            return 6
-        }
-    )
-
-    return
-}
-
-
-# Support use of yum cached packages with installroot
-# This has been written to use getopts to:
-# a. allow the cache to be optional
-# b. as a reference for other functions
-yum_cached() {
-    usage() { echo "Usage: yum_cached [-c yum-cache(tgz)] [-u (update cache if present)] -p package-dir <options>" 1>&2; }
-
-    # must ensure OPTIND is local, along with any set by processing
-    local OPTIND flag cache update INSTALLROOT cmds
-    while getopts "c:up:a:" flag; do
-        case $flag in
-            c)
-            # Optional. Cache name (tgz)
-            cache="$OPTARG"
-            ;;
-
-            u)
-            # Optional. Update cache after running command
-            update="true"
-            ;;
-
-            p)
-            # Required. Package directory
-            PKGDIR="$OPTARG"
-            INSTALLROOT=$(rootfs_dir $PKGDIR)
-            ;;
-
-            *)
-            usage
-            return 1
-            ;;
-        esac
-    done
-    shift $((OPTIND-1))
-
-    cmds="$*"
-
-    # check there were no extra args and the required ones are set to sane values
-    [ -e "$PKGDIR" ] || {
-        echo "Specified package directory must exist" 1>&2
-        return 1
-    }
-
-    # bundle specific - if we're cleaning the cache and we want it all gone
-    # $1 because of the shift after getopts
-    if [ "$1" == "clean" -a "$2" == "all" ]; then
-        rm -fr ${INSTALLROOT}/var/cache/yum/*
-    else
-        # do this before we bother unpacking the cache
-        ensure_apt_packages yum || {
-            echo "cpio and xorriso packages must be installed for ISO authoring: $?" 1>&2
-            return 2
-        }
-
-        # unpack cache
-        if [ -n "${cache}" -a -e "${cache}" ]; then
-            echo "Unpacking yum cache into ${INSTALLROOT}"
-
-            tar -C ${INSTALLROOT} -zxf $cache || {
-                echo "Unpacking yum cache $cache failed: $?" 1>&2
-                return 3
-            }
-        fi
-
-        /usr/bin/yum --installroot $INSTALLROOT $ACTION $cmds || {
-            echo "Error while running yum command \"$cmds\": $?" 1>&2
-            return 4
-        }
-    fi
-
-    # repack cache
-    if [ -n "$update" -a -n "${cache}" -a -d ${INSTALLROOT}/var/cache/yum ]; then
-        tar -C ${INSTALLROOT} -zcf $cache var/cache/yum
-    fi
-}
-
-# Runs a command in the rootfs of the specified bundle. This prevents callers from needing
-# to know about internal bundle structure
-# 1: bundle directory
-# ...: command and args
-rootfs_cmd() {
-    (
-        cd $1/rootfs || {
-            echo "Specified directory $1 doesn't contain expected rootfs directory" 1>&2
-            return 1
-        }
-
-        shift 1
-        cmd=$1
-        shift 1
-
-        $cmd "$@" || return $?
-    )
-}
-
-# Echos the full path of the root filesystem, given the bundle directory
-# 1: bundle directory
-rootfs_dir() {
-    echo $1/rootfs
-}
-
-# Echos the full path of the boot filesystem, given the bundle directory
-# 1: bundle directory
-bootfs_dir() {
-    echo $1/bootfs
-}
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/xorriso-options.cfg b/installer/vendor/github.com/vmware/vic/isos/base/xorriso-options.cfg
deleted file mode 100644
index b410a1e271..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/xorriso-options.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-publisher 'VMware Inc. ${VERSION}'
-map bootfs /
-boot_image isolinux dir=/boot/isolinux
diff --git a/installer/vendor/github.com/vmware/vic/isos/base/yum.conf b/installer/vendor/github.com/vmware/vic/isos/base/yum.conf
deleted file mode 100644
index 59665979dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/base/yum.conf
+++ /dev/null
@@ -1,12 +0,0 @@
-[main]
-cachedir=/var/cache/yum
-keepcache=1
-debuglevel=1
-logfile=/var/log/yum.log
-exactarch=1
-obsoletes=1
-
-
-# PUT YOUR REPOS HERE OR IN separate files named file.repo
-# in /etc/yum/repos.d
-
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap-staging.sh b/installer/vendor/github.com/vmware/vic/isos/bootstrap-staging.sh
deleted file mode 100755
index 883de7aab9..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap-staging.sh
+++ /dev/null
@@ -1,118 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build the bootstrap filesystem ontop of the base
-
-# exit on failure
-set -e
-
-if [ -n "$DEBUG" ]; then
-    set -x
-fi
-
-DIR=$(dirname $(readlink -f "$0"))
-. $DIR/base/utils.sh
-
-function usage() {
-echo "Usage: $0 -c yum-cache(tgz) -p base-package(tgz) -o output-package(tgz) -d <activates debug when set>" 1>&2
-exit 1
-}
-
-while getopts "c:p:o:d:" flag
-do
-    case $flag in
-
-        p)
-            # Required. Package name
-            package="$OPTARG"
-            ;;
-
-        o)
-            # Required. Target for iso and source for components
-            OUT="$OPTARG"
-            ;;
-
-        d)
-            # Optional. directs script to make a debug iso instead of a production iso.
-            debug='$OPTARG'
-            ;;
-
-        c)
-            # Optional. Offline cache of yum packages
-            cache="$OPTARG"
-            ;;
-
-        *)
-            usage
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-# check there were no extra args and the required ones are set
-if [ ! -z "$*" -o -z "$package" -o -z "${OUT}" ]; then
-    usage
-fi
-
-#################################################################
-# Above: arg parsing and setup
-# Below: the image authoring
-#################################################################
-
-PKGDIR=$(mktemp -d)
-
-unpack $package $PKGDIR
-
-if [ -v debug ]; then
-    # These are the packages we install to create an interactive bootstrapVM
-    # Install bootstrap base packages
-    #
-    # packages list here
-    #   tndf      # allows package install during debugging.
-    #   vim       # basic editing function for debugging.
-    yum_cached -c $cache -u -p $PKGDIR install \
-        bash \
-        shadow \
-        tdnf \
-        vim \
-        -y --nogpgcheck
-
-    # HACK until the issues with override.conf above are dealt with
-    pwhash=$(openssl passwd -1 -salt vic password)
-    sed -i -e "s/^root:[^:]*:/root:${pwhash}:/" $(rootfs_dir $PKGDIR)/etc/shadow
-fi
-
-# Install bootstrap base packages
-#
-# List stable packages here
-#   iproute2  # for ip
-#   libtirpc  # due to a previous package reliance on rpc
-#
-yum_cached -c $cache -u -p $PKGDIR install \
-    haveged \
-    systemd \
-    iptables \
-    -y --nogpgcheck
-
-# https://www.freedesktop.org/wiki/Software/systemd/InitrdInterface/
-touch $(rootfs_dir $PKGDIR)/etc/initrd-release
-
-# ensure we're not including a cache in the staging bundle
-# but don't update the cache bundle we're using to install
-yum_cached -p $PKGDIR clean all
-
-# package up the result
-pack $PKGDIR $OUT
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap.sh b/installer/vendor/github.com/vmware/vic/isos/bootstrap.sh
deleted file mode 100755
index 875e1547c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Build the bootstrap filesystem ontop of the base
-
-# exit on failure
-set -e
-
-if [ -n "$DEBUG" ]; then
-    set -x
-fi
-
-DIR=$(dirname $(readlink -f "$0"))
-. $DIR/base/utils.sh
-
-function usage() {
-echo "Usage: $0 -p staged-package(tgz) -b binary-dir -d <activates debug when set>" 1>&2
-exit 1
-}
-
-while getopts "p:b:d:" flag
-do
-    case $flag in
-
-        p)
-            # Required. Package name
-            package="$OPTARG"
-            ;;
-
-        b)
-            # Required. Target for iso and source for components
-            BIN="$OPTARG"
-            ;;
-        d)
-            # Optional. directs script to make a debug iso instead of a production iso.
-            debug="$OPTARG"
-            ;;
-        *)
-
-            usage
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-# check there were no extra args and the required ones are set
-if [ ! -z "$*" -o -z "$package" -o -z "${BIN}" ]; then
-    usage
-fi
-
-#################################################################
-# Above: arg parsing and setup
-# Below: the image authoring
-#################################################################
-
-PKGDIR=$(mktemp -d)
-
-unpack $package $PKGDIR
-
-#selecting the init script as our entry point.
-if [ -v debug ]; then
-    export ISONAME="bootstrap-debug.iso"
-    cp ${DIR}/bootstrap/bootstrap.debug $(rootfs_dir $PKGDIR)/bin/bootstrap
-    cp ${BIN}/rpctool $(rootfs_dir $PKGDIR)/sbin/
-else
-    export ISONAME="bootstrap.iso"
-    cp ${DIR}/bootstrap/bootstrap $(rootfs_dir $PKGDIR)/bin/bootstrap
-fi
-
-# copy in our components
-cp ${BIN}/tether-linux $(rootfs_dir $PKGDIR)/bin/tether
-
-# kick off our components at boot time
-mkdir -p $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants
-cp ${DIR}/bootstrap/tether.service $(rootfs_dir $PKGDIR)/etc/systemd/system/
-cp ${DIR}/appliance/vic.target $(rootfs_dir $PKGDIR)/etc/systemd/system/
-ln -s /etc/systemd/system/tether.service $(rootfs_dir $PKGDIR)/etc/systemd/system/vic.target.wants/
-ln -sf /etc/systemd/system/vic.target $(rootfs_dir $PKGDIR)/etc/systemd/system/default.target
-
-# disable networkd given we manage the link state directly
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/system/multi-user.target.wants/systemd-networkd.service
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/system/sockets.target.wants/systemd-networkd.socket
-
-# do not use the systemd dhcp client
-rm -f $(rootfs_dir $PKGDIR)/etc/systemd/network/*
-cp ${DIR}/base/no-dhcp.network $(rootfs_dir $PKGDIR)/etc/systemd/network/
-
-generate_iso $PKGDIR $BIN/$ISONAME /lib/systemd/systemd
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap b/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap
deleted file mode 100755
index c133136e8b..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/bash
-
-set -x
-
-echo 1 > /proc/sys/net/ipv4/conf/all/arp_notify
-echo 1 > /proc/sys/net/ipv4/conf/default/arp_notify
-
-echo "Loading drivers"
-drivers=("vmxnet3" \
-	"nfnetlink" \
-	"iptable_filter" \
-	"xt_conntrack" \
-    "nf_nat_redirect" \
-    "xt_REDIRECT" \
-    "nf_nat_ipv4" \
-    "iptable_nat" \
-	"nf_conntrack" \
-	"nf_conntrack_ipv4" \
-	"nf_defrag_ipv4" \
-	"ipt_REJECT"\
-	"nf_reject_ipv4"\
-	"nfsv3")
-
-for i in ${drivers[@]}; do
-    /usr/sbin/modprobe $i
-done
-
-MOUNTPOINT="/mnt/containerfs"
-
-mkdir -p /mnt/containerfs
-
-echo "Waiting for rootfs"
-while [ ! -e /dev/disk/by-label/containerfs ]; do sleep 0.1;done
-if mount -t ext4 /dev/disk/by-label/containerfs ${MOUNTPOINT}; then
-    # ensure mountpoint exists
-    mkdir -p ${MOUNTPOINT}/.tether
-
-    # ensure that no matter what we have access to required devices
-    # WARNING WARNING WARNING WARNING WARNING
-    # if the tmpfs is not large enough odd hangs can occur and the ESX event log will
-    # report the guest disabling the CPU
-    mount -t tmpfs -o size=64m tmpfs ${MOUNTPOINT}/.tether/
-
-    # enable full system functionality in the container
-    ln -s lib64 ${MOUNTPOINT}/.tether/lib
-    mkdir -p ${MOUNTPOINT}/.tether/{lib64,usr/lib/iptables,run}
-
-    echo "Publishing modules within container"
-    mkdir -p ${MOUNTPOINT}/lib/modules
-    mkdir -p ${MOUNTPOINT}/.tether/lib/modules
-    mount --bind ${MOUNTPOINT}/.tether/lib/modules ${MOUNTPOINT}/lib/modules
-    cp -pr /lib/modules/* ${MOUNTPOINT}/lib/modules/
-
-    # switch to the new root
-    echo "prepping for switch to container filesystem"
-
-    cp /bin/tether ${MOUNTPOINT}/.tether/tether
-
-    echo 'tether tmpfs size before copying libraries: '
-    df -k ${MOUNTPOINT}/.tether
-
-    # ldd of xtables-multi yields the following list of libraries we need to
-    # copy into our initrd.  We need these binaries in order to call iptables
-    #
-    # before the switch-root.  linux-vdso.so.1 (0x00007ffc94d0d000)
-    # libip4tc.so.0 => /baz/lib/libip4tc.so.0 (0x00007f97fc721000)
-    # libip6tc.so.0 => /baz/lib/libip6tc.so.0 (0x00007f97fc519000)
-    # libxtables.so.11 => /baz/lib/libxtables.so.11 (0x00007f97fc30c000)
-    # libm.so.6 => /lib64/libm.so.6 (0x00007f97fc00e000)
-    # libgcc_s.so.1 => /lib64/libgcc_s.so.1 (0x00007f97fbdf7000)
-    # libc.so.6 => /baz/lib/libc.so.6 (0x00007f97fba53000)
-    # libdl.so.2 => /baz/lib/libdl.so.2 (0x00007f97fb84f000)
-    # /lib64/ld-linux-x86-64.so.2 (0x00007f97fc929000)
-
-    cp -a /sbin/*tables* ${MOUNTPOINT}/.tether/
-    cp -a /lib/libm.* /lib/libm-* /lib/libgcc_s* /lib/libip*tc* /lib/libxtables* /lib/libdl* /lib/libc.so* /lib/libc-* ${MOUNTPOINT}/.tether/lib
-    cp -a /lib64/ld-* ${MOUNTPOINT}/.tether/lib64
-    cp -r /usr/lib/iptables ${MOUNTPOINT}/.tether/usr/lib/
-    cp /lib/libhavege.so.1  ${MOUNTPOINT}/.tether/lib
-    cp /usr/sbin/haveged ${MOUNTPOINT}/.tether/
-
-    # Create VIC chain
-    iptables -N VIC
-    # Set the default policy on all chains to drop traffic
-    iptables -P INPUT DROP
-    iptables -P OUTPUT DROP
-    iptables -P FORWARD DROP
-    # Direct any incoming/outgoing traffic immediately to VIC chain
-    iptables -A INPUT -j VIC
-    iptables -A OUTPUT -j VIC
-    # Always allow traffic on loopback interface
-    iptables -A INPUT -i lo -j ACCEPT
-    iptables -A OUTPUT -o lo -j ACCEPT
-    iptables -A FORWARD -i lo -o lo -j ACCEPT
-
-    echo 'tether tmpfs size after copying libraries: '
-    df -k ${MOUNTPOINT}/.tether
-
-    until [[ $(ls -1 /dev/disk/by-label | wc -l) -eq $(ls -1 /sys/block | wc -l) ]]; do sleep 0.1;done
-
-    echo "switching to the new mount"
-    systemctl switch-root ${MOUNTPOINT} /.tether/tether 2>&1
-    echo "switched to the new mount"
-else
-    # TODO: what do we do here? we really need to somehow report an error
-    # fail hard
-    echo "Unable to chroot into container filesystem"
-fi
-
-# Shut the system down
-systemctl poweroff
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap.debug b/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap.debug
deleted file mode 100755
index bbb3065409..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap/bootstrap.debug
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/bash
-
-MOUNTPOINT="/mnt/containerfs"
-
-mkdir -p /mnt/containerfs
-
-# see if we should bail to the bootstrap or pivot into the container
-# do this before the fork so we don't have a backdoor call in the hot path
-# NOTE: this is moved after the fork during debugging so we can chose on a per VM basis
-SHELL=`/sbin/rpctool -get bootstrap-shell 2>/dev/null`
-
-echo "Waiting for rootfs"
-while [ ! -e /dev/disk/by-label/containerfs ]; do :;done
-if mount -t ext4 /dev/disk/by-label/containerfs ${MOUNTPOINT}; then
-    # make the required directory structure, but presume that something in the daemon
-    # has done the *right* thing for /.tether* and created them where it won't show in a diff
-    # we do this to ensure that subsequent commands don't fail if the daemon hasn't prepped
-    # the structure
-    mkdir -p ${MOUNTPOINT}/.tether ${MOUNTPOINT}/.tether-init
-
-    # ensure that no matter what we have access to required devices
-    # WARNING WARNING WARNING WARNING WARNING
-    # if the tmpfs is not large enough odd hangs can occur and the ESX event log will
-    # report the guest disabling the CPU
-    mount -t tmpfs -o size=128m tmpfs ${MOUNTPOINT}/.tether/
-
-    # if we don't have a populated init layer, pull from guestinfo
-    if [ ! -f ${MOUNTPOINT}/.tether-init/docker-id ]; then
-        mount -t tmpfs -o size=1m tmpfs ${MOUNTPOINT}/.tether-init/
-        # create the assumed structure
-        # TODO: this cannot be in guest and still not show up in diffs
-        mkdir -p ${MOUNTPOINT}/dev ${MOUNTPOINT}/proc ${MOUNTPOINT}/sys ${MOUNTPOINT}/etc
-        # ln -sf /proc/mounts ${MOUNTPOINT}/etc/mtab
-
-        touch ${MOUNTPOINT}/etc/hostname
-        touch ${MOUNTPOINT}/etc/hosts
-        touch ${MOUNTPOINT}/etc/resolv.conf
-    fi
-
-    # this is so we're not exposing the raw container disk if we wouldn't be otherwise
-    #	rm -f /mnt/.tether/volumes/containerfs
-
-    # enable full system functionality in the container
-    echo "Publishing modules within container"
-    mkdir -p ${MOUNTPOINT}/lib/modules
-    mount --bind /lib/modules ${MOUNTPOINT}/lib/modules
-
-    # switch to the new root
-    echo "prepping for switch to container filesystem"
-
-    cp /bin/tether ${MOUNTPOINT}/.tether/tether-debug
-
-    echo "switching to the new mount"
-    if [ "$SHELL" != "true" ]; then
-        systemctl switch-root ${MOUNTPOINT} /.tether/tether-debug 2>&1
-    else
-        systemctl switch-root ${MOUNTPOINT} /bin/sh 2>&1
-        # fail back to shell in bootstrap image without switch_root
-        /bin/ash
-    fi
-else
-    # TODO: what do we do here? we really need to somehow report an error
-    # fail hard
-    echo "Unable to chroot into container filesystem"
-fi
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap/tether.service b/installer/vendor/github.com/vmware/vic/isos/bootstrap/tether.service
deleted file mode 100644
index 7ec645b900..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap/tether.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=Tether
-After=basic.target
-
-[Service]
-Type=idle
-ExecStart=/bin/sh -c '/bin/bootstrap >/dev/ttyS1 2>&1'
-
-[Install]
-WantedBy=vic.target
diff --git a/installer/vendor/github.com/vmware/vic/isos/bootstrap/vic.target b/installer/vendor/github.com/vmware/vic/isos/bootstrap/vic.target
deleted file mode 100644
index d4835ed998..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/bootstrap/vic.target
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=vSphere Integrated Containers
-Requires=basic.target
-After=basic.target
-AllowIsolate=yes
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/auth.html b/installer/vendor/github.com/vmware/vic/isos/vicadmin/auth.html
deleted file mode 100644
index df82906443..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/auth.html
+++ /dev/null
@@ -1,63 +0,0 @@
-<!DOCTYPE html>
-<html itemscope="" itemtype="http://schema.org/Organization" lang="en-US">
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>VCH Admin</title>
-        <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-        <meta content="yes" name="apple-mobile-web-app-capable">
-        <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-
-        <!-- Styles -->
-        <link rel="stylesheet" href="css/clarity-ui.min.css">
-        <link rel="stylesheet" href="css/fontello.css">
-        <link rel="stylesheet" href="css/style.css">
-
-    </head>
-
-    <body id="body" class="page-community layout-community">
-
-        <div class="main-nav">
-            <header class="header">
-                <div class="branding">
-                    <a href="http://www.vmware.com"><img src="images/vmw-logo.svg" class="logo"></a>
-                    <span class="title">vSphere Integrated Containers</span>
-                </div>
-                <a role="button" class="github btn btn-primary" href="http://www.github.com/vmware/vic">
-                    <i class="icon-github-circled" style="vertical-align: middle;"></i>
-                    View on Github
-                </a>
-            </header>
-        </div>
-
-        <div class="main-container">
-            <main class="content-area">
-
-                <section>
-                    <div class="row ">
-                        <div class="col-md-6 center">
-
-                            <div class="card card-block text-xs-center">
-                              <h2 class="card-title">{{.Hostname}} Login</h2>
-			      <h3 class="error-message"> {{.InvalidLogin}}</h3>
-
-                                <form method="post">
-                                    <label for="username">vSphere or ESXi Username:</label>
-                                    <input type="text" name="username"><br />
-                                    <label for="password">vSphere or ESXi Password:</label>
-                                    <input type="password" name="password"><br /><br/>
-                                    <input type="submit" value="Log in">
-                                </form>
-
-                            </div>
-                            <div class="card card-block text-xs-center">
-                              <p class="card-text">Appliance System Time: {{.SystemTime}}</p>
-                            </div>
-
-                        </div>
-                    </div>
-                </section>
-            </main>
-        </div>
-    </body>
-</html>
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/clarity-ui.min.css b/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/clarity-ui.min.css
deleted file mode 100644
index ac3c87c4dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/clarity-ui.min.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/*! normalize.css v3.0.3 | MIT License | github.com/necolas/normalize.css */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active{outline:0}a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:bold}dfn{font-style:italic}h1{font-size:2em;margin:0.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-0.5em}sub{bottom:-0.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace, monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type="button"],input[type="reset"],input[type="submit"]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type="checkbox"],input[type="radio"]{box-sizing:border-box;padding:0}input[type="number"]::-webkit-inner-spin-button,input[type="number"]::-webkit-outer-spin-button{height:auto}input[type="search"]{-webkit-appearance:textfield;box-sizing:content-box}input[type="search"]::-webkit-search-cancel-button,input[type="search"]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid #c0c0c0;margin:0 2px;padding:0.35em 0.625em 0.75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:bold}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}
-
-html{box-sizing:border-box}*,*::before,*::after{box-sizing:inherit}@-moz-viewport{width:device-width}@-ms-viewport{width:device-width}@-o-viewport{width:device-width}@-webkit-viewport{width:device-width}@viewport{width:device-width}html{font-size:16px;-webkit-tap-highlight-color:transparent}body{font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;font-size:1rem;line-height:1.5;color:#373a3c;background-color:#fff}[tabindex="-1"]:focus{outline:none !important}h1,h2,h3,h4,h5,h6{margin-top:0;margin-bottom:.5rem}p{margin-top:0;margin-bottom:1rem}abbr[title],abbr[data-original-title]{cursor:help;border-bottom:1px dotted #818a91}address{margin-bottom:1rem;font-style:normal;line-height:inherit}ol,ul,dl{margin-top:0;margin-bottom:1rem}ol ol,ul ul,ol ul,ul ol{margin-bottom:0}dt{font-weight:bold}dd{margin-bottom:.5rem;margin-left:0}blockquote{margin:0 0 1rem}a{color:#0275d8;text-decoration:none}a:focus,a:hover{color:#014c8c;text-decoration:underline}a:focus{outline:thin dotted;outline:5px auto -webkit-focus-ring-color;outline-offset:-2px}pre{margin-top:0;margin-bottom:1rem}figure{margin:0 0 1rem}img{vertical-align:middle}[role="button"]{cursor:pointer}a,area,button,[role="button"],input,label,select,summary,textarea{-ms-touch-action:manipulation;touch-action:manipulation}table{background-color:transparent}caption{padding-top:.75rem;padding-bottom:.75rem;color:#818a91;text-align:left;caption-side:bottom}th{text-align:left}label{display:inline-block;margin-bottom:.5rem}button:focus{outline:1px dotted;outline:5px auto -webkit-focus-ring-color}input,button,select,textarea{margin:0;line-height:inherit;border-radius:0}textarea{resize:vertical}fieldset{min-width:0;padding:0;margin:0;border:0}legend{display:block;width:100%;padding:0;margin-bottom:.5rem;font-size:1.5rem;line-height:inherit}input[type="search"]{box-sizing:inherit;-webkit-appearance:none}output{display:inline-block}[hidden]{display:none !important}body{font-family:inherit;color:inherit}label{margin:0}dl{margin-bottom:0;margin-top:24px}a:link{color:#007cbb;text-decoration:none}a:hover{color:#007cbb;text-decoration:underline}a:active{color:#9460b8;text-decoration:underline}a:visited{color:#9460b8;text-decoration:none}
-
-
-
-
-
-
-.clearfix::after{content:"";display:table;clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-xs-left{float:left !important}.pull-xs-right{float:right !important}.pull-xs-none{float:none !important}@media (min-width: 544px){.pull-sm-left{float:left !important}.pull-sm-right{float:right !important}.pull-sm-none{float:none !important}}@media (min-width: 768px){.pull-md-left{float:left !important}.pull-md-right{float:right !important}.pull-md-none{float:none !important}}@media (min-width: 992px){.pull-lg-left{float:left !important}.pull-lg-right{float:right !important}.pull-lg-none{float:none !important}}@media (min-width: 1200px){.pull-xl-left{float:left !important}.pull-xl-right{float:right !important}.pull-xl-none{float:none !important}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.invisible{visibility:hidden !important}.text-hide{font:"0/0" a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-justify{text-align:justify !important}.text-nowrap{white-space:nowrap !important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-xs-left{text-align:left !important}.text-xs-right{text-align:right !important}.text-xs-center{text-align:center !important}@media (min-width: 544px){.text-sm-left{text-align:left !important}.text-sm-right{text-align:right !important}.text-sm-center{text-align:center !important}}@media (min-width: 768px){.text-md-left{text-align:left !important}.text-md-right{text-align:right !important}.text-md-center{text-align:center !important}}@media (min-width: 992px){.text-lg-left{text-align:left !important}.text-lg-right{text-align:right !important}.text-lg-center{text-align:center !important}}@media (min-width: 1200px){.text-xl-left{text-align:left !important}.text-xl-right{text-align:right !important}.text-xl-center{text-align:center !important}}.text-lowercase{text-transform:lowercase !important}.text-uppercase{text-transform:uppercase !important}.text-capitalize{text-transform:capitalize !important}.font-weight-normal{font-weight:normal}.font-weight-bold{font-weight:bold}.font-italic{font-style:italic}.text-muted{color:#818a91}.text-primary{color:#0275d8 !important}a.text-primary:focus,a.text-primary:hover{color:#025aa5}.text-success{color:#5cb85c !important}a.text-success:focus,a.text-success:hover{color:#449d44}.text-info{color:#5bc0de !important}a.text-info:focus,a.text-info:hover{color:#31b0d5}.text-warning{color:#f0ad4e !important}a.text-warning:focus,a.text-warning:hover{color:#ec971f}.text-danger{color:#d9534f !important}a.text-danger:focus,a.text-danger:hover{color:#c9302c}.bg-inverse{color:#fafafa;background-color:#747474}.bg-faded{background-color:#fff}.bg-primary{color:#fff !important;background-color:#0275d8 !important}a.bg-primary:focus,a.bg-primary:hover{background-color:#025aa5}.bg-success{color:#fff !important;background-color:#5cb85c !important}a.bg-success:focus,a.bg-success:hover{background-color:#449d44}.bg-info{color:#fff !important;background-color:#5bc0de !important}a.bg-info:focus,a.bg-info:hover{background-color:#31b0d5}.bg-warning{color:#fff !important;background-color:#f0ad4e !important}a.bg-warning:focus,a.bg-warning:hover{background-color:#ec971f}.bg-danger{color:#fff !important;background-color:#d9534f !important}a.bg-danger:focus,a.bg-danger:hover{background-color:#c9302c}.hidden-xs-up{display:none !important}@media (max-width: 543px){.hidden-xs-down{display:none !important}}@media (min-width: 544px){.hidden-sm-up{display:none !important}}@media (max-width: 767px){.hidden-sm-down{display:none !important}}@media (min-width: 768px){.hidden-md-up{display:none !important}}@media (max-width: 991px){.hidden-md-down{display:none !important}}@media (min-width: 992px){.hidden-lg-up{display:none !important}}@media (max-width: 1199px){.hidden-lg-down{display:none !important}}@media (min-width: 1200px){.hidden-xl-up{display:none !important}}.hidden-xl-down{display:none !important}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}.m-x-auto{margin-right:auto !important;margin-left:auto !important}.m-a-0{margin:0 0 !important}.m-t-0{margin-top:0 !important}.m-r-0{margin-right:0 !important}.m-b-0{margin-bottom:0 !important}.m-l-0{margin-left:0 !important}.m-x-0{margin-right:0 !important;margin-left:0 !important}.m-y-0{margin-top:0 !important;margin-bottom:0 !important}.m-a-1{margin:1rem 1rem !important}.m-t-1{margin-top:1rem !important}.m-r-1{margin-right:1rem !important}.m-b-1{margin-bottom:1rem !important}.m-l-1{margin-left:1rem !important}.m-x-1{margin-right:1rem !important;margin-left:1rem !important}.m-y-1{margin-top:1rem !important;margin-bottom:1rem !important}.m-a-2{margin:1.5rem 1.5rem !important}.m-t-2{margin-top:1.5rem !important}.m-r-2{margin-right:1.5rem !important}.m-b-2{margin-bottom:1.5rem !important}.m-l-2{margin-left:1.5rem !important}.m-x-2{margin-right:1.5rem !important;margin-left:1.5rem !important}.m-y-2{margin-top:1.5rem !important;margin-bottom:1.5rem !important}.m-a-3{margin:3rem 3rem !important}.m-t-3{margin-top:3rem !important}.m-r-3{margin-right:3rem !important}.m-b-3{margin-bottom:3rem !important}.m-l-3{margin-left:3rem !important}.m-x-3{margin-right:3rem !important;margin-left:3rem !important}.m-y-3{margin-top:3rem !important;margin-bottom:3rem !important}.p-a-0{padding:0 0 !important}.p-t-0{padding-top:0 !important}.p-r-0{padding-right:0 !important}.p-b-0{padding-bottom:0 !important}.p-l-0{padding-left:0 !important}.p-x-0{padding-right:0 !important;padding-left:0 !important}.p-y-0{padding-top:0 !important;padding-bottom:0 !important}.p-a-1{padding:1rem 1rem !important}.p-t-1{padding-top:1rem !important}.p-r-1{padding-right:1rem !important}.p-b-1{padding-bottom:1rem !important}.p-l-1{padding-left:1rem !important}.p-x-1{padding-right:1rem !important;padding-left:1rem !important}.p-y-1{padding-top:1rem !important;padding-bottom:1rem !important}.p-a-2{padding:1.5rem 1.5rem !important}.p-t-2{padding-top:1.5rem !important}.p-r-2{padding-right:1.5rem !important}.p-b-2{padding-bottom:1.5rem !important}.p-l-2{padding-left:1.5rem !important}.p-x-2{padding-right:1.5rem !important;padding-left:1.5rem !important}.p-y-2{padding-top:1.5rem !important;padding-bottom:1.5rem !important}.p-a-3{padding:3rem 3rem !important}.p-t-3{padding-top:3rem !important}.p-r-3{padding-right:3rem !important}.p-b-3{padding-bottom:3rem !important}.p-l-3{padding-left:3rem !important}.p-x-3{padding-right:3rem !important;padding-left:3rem !important}.p-y-3{padding-top:3rem !important;padding-bottom:3rem !important}.pos-f-t{position:fixed;top:0;right:0;left:0;z-index:1030}
-
-
-.clearfix::after{content:"";display:table;clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-xs-left{float:left !important}.pull-xs-right{float:right !important}.pull-xs-none{float:none !important}@media (min-width: 544px){.pull-sm-left{float:left !important}.pull-sm-right{float:right !important}.pull-sm-none{float:none !important}}@media (min-width: 768px){.pull-md-left{float:left !important}.pull-md-right{float:right !important}.pull-md-none{float:none !important}}@media (min-width: 992px){.pull-lg-left{float:left !important}.pull-lg-right{float:right !important}.pull-lg-none{float:none !important}}@media (min-width: 1200px){.pull-xl-left{float:left !important}.pull-xl-right{float:right !important}.pull-xl-none{float:none !important}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.invisible{visibility:hidden !important}.text-hide{font:"0/0" a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-justify{text-align:justify !important}.text-nowrap{white-space:nowrap !important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-xs-left{text-align:left !important}.text-xs-right{text-align:right !important}.text-xs-center{text-align:center !important}@media (min-width: 544px){.text-sm-left{text-align:left !important}.text-sm-right{text-align:right !important}.text-sm-center{text-align:center !important}}@media (min-width: 768px){.text-md-left{text-align:left !important}.text-md-right{text-align:right !important}.text-md-center{text-align:center !important}}@media (min-width: 992px){.text-lg-left{text-align:left !important}.text-lg-right{text-align:right !important}.text-lg-center{text-align:center !important}}@media (min-width: 1200px){.text-xl-left{text-align:left !important}.text-xl-right{text-align:right !important}.text-xl-center{text-align:center !important}}.text-lowercase{text-transform:lowercase !important}.text-uppercase{text-transform:uppercase !important}.text-capitalize{text-transform:capitalize !important}.font-weight-normal{font-weight:normal}.font-weight-bold{font-weight:bold}.font-italic{font-style:italic}.text-muted{color:#818a91}.text-primary{color:#0275d8 !important}a.text-primary:focus,a.text-primary:hover{color:#025aa5}.text-success{color:#5cb85c !important}a.text-success:focus,a.text-success:hover{color:#449d44}.text-info{color:#5bc0de !important}a.text-info:focus,a.text-info:hover{color:#31b0d5}.text-warning{color:#f0ad4e !important}a.text-warning:focus,a.text-warning:hover{color:#ec971f}.text-danger{color:#d9534f !important}a.text-danger:focus,a.text-danger:hover{color:#c9302c}.bg-inverse{color:#fafafa;background-color:#747474}.bg-faded{background-color:#fff}.bg-primary{color:#fff !important;background-color:#0275d8 !important}a.bg-primary:focus,a.bg-primary:hover{background-color:#025aa5}.bg-success{color:#fff !important;background-color:#5cb85c !important}a.bg-success:focus,a.bg-success:hover{background-color:#449d44}.bg-info{color:#fff !important;background-color:#5bc0de !important}a.bg-info:focus,a.bg-info:hover{background-color:#31b0d5}.bg-warning{color:#fff !important;background-color:#f0ad4e !important}a.bg-warning:focus,a.bg-warning:hover{background-color:#ec971f}.bg-danger{color:#fff !important;background-color:#d9534f !important}a.bg-danger:focus,a.bg-danger:hover{background-color:#c9302c}.hidden-xs-up{display:none !important}@media (max-width: 543px){.hidden-xs-down{display:none !important}}@media (min-width: 544px){.hidden-sm-up{display:none !important}}@media (max-width: 767px){.hidden-sm-down{display:none !important}}@media (min-width: 768px){.hidden-md-up{display:none !important}}@media (max-width: 991px){.hidden-md-down{display:none !important}}@media (min-width: 992px){.hidden-lg-up{display:none !important}}@media (max-width: 1199px){.hidden-lg-down{display:none !important}}@media (min-width: 1200px){.hidden-xl-up{display:none !important}}.hidden-xl-down{display:none !important}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}.m-x-auto{margin-right:auto !important;margin-left:auto !important}.m-a-0{margin:0 0 !important}.m-t-0{margin-top:0 !important}.m-r-0{margin-right:0 !important}.m-b-0{margin-bottom:0 !important}.m-l-0{margin-left:0 !important}.m-x-0{margin-right:0 !important;margin-left:0 !important}.m-y-0{margin-top:0 !important;margin-bottom:0 !important}.m-a-1{margin:1rem 1rem !important}.m-t-1{margin-top:1rem !important}.m-r-1{margin-right:1rem !important}.m-b-1{margin-bottom:1rem !important}.m-l-1{margin-left:1rem !important}.m-x-1{margin-right:1rem !important;margin-left:1rem !important}.m-y-1{margin-top:1rem !important;margin-bottom:1rem !important}.m-a-2{margin:1.5rem 1.5rem !important}.m-t-2{margin-top:1.5rem !important}.m-r-2{margin-right:1.5rem !important}.m-b-2{margin-bottom:1.5rem !important}.m-l-2{margin-left:1.5rem !important}.m-x-2{margin-right:1.5rem !important;margin-left:1.5rem !important}.m-y-2{margin-top:1.5rem !important;margin-bottom:1.5rem !important}.m-a-3{margin:3rem 3rem !important}.m-t-3{margin-top:3rem !important}.m-r-3{margin-right:3rem !important}.m-b-3{margin-bottom:3rem !important}.m-l-3{margin-left:3rem !important}.m-x-3{margin-right:3rem !important;margin-left:3rem !important}.m-y-3{margin-top:3rem !important;margin-bottom:3rem !important}.p-a-0{padding:0 0 !important}.p-t-0{padding-top:0 !important}.p-r-0{padding-right:0 !important}.p-b-0{padding-bottom:0 !important}.p-l-0{padding-left:0 !important}.p-x-0{padding-right:0 !important;padding-left:0 !important}.p-y-0{padding-top:0 !important;padding-bottom:0 !important}.p-a-1{padding:1rem 1rem !important}.p-t-1{padding-top:1rem !important}.p-r-1{padding-right:1rem !important}.p-b-1{padding-bottom:1rem !important}.p-l-1{padding-left:1rem !important}.p-x-1{padding-right:1rem !important;padding-left:1rem !important}.p-y-1{padding-top:1rem !important;padding-bottom:1rem !important}.p-a-2{padding:1.5rem 1.5rem !important}.p-t-2{padding-top:1.5rem !important}.p-r-2{padding-right:1.5rem !important}.p-b-2{padding-bottom:1.5rem !important}.p-l-2{padding-left:1.5rem !important}.p-x-2{padding-right:1.5rem !important;padding-left:1.5rem !important}.p-y-2{padding-top:1.5rem !important;padding-bottom:1.5rem !important}.p-a-3{padding:3rem 3rem !important}.p-t-3{padding-top:3rem !important}.p-r-3{padding-right:3rem !important}.p-b-3{padding-bottom:3rem !important}.p-l-3{padding-left:3rem !important}.p-x-3{padding-right:3rem !important;padding-left:3rem !important}.p-y-3{padding-top:3rem !important;padding-bottom:3rem !important}.pos-f-t{position:fixed;top:0;right:0;left:0;z-index:1030}h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}@media screen and (min-width: 544px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 768px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 992px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 1200px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;margin-top:0 !important}@media screen and (min-width: 544px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}@media screen and (min-width: 544px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 768px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 992px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 1200px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}body .text-light{font-weight:200}body .text-thin{font-weight:100}html{color:#565656;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif,"Avenir Next","Helvetica Neue",Arial,sans-serif;font-size:16px}
-
-.alert{position:relative;box-sizing:border-box;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;width:auto;min-height:34px;padding:0 30px 9px 12px;font-size:13px;border-radius:3px;margin-top:6px}.alert.alert-info{background:#e1f1f6;color:#004a70;border:1px solid #49afd9}.alert.alert-success{background:#dff0d0;color:#266900;border:1px solid #60b515}.alert.alert-warning{background:#feecb5;color:#313131;border:1px solid #efd603}.alert.alert-danger{background:#f5dbd9;color:#a32100;border:1px solid #ebafa6}.alert .alert-item{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;line-height:16px;margin-top:9px}.alert .alert-item span{display:inline-block;max-width:98%}.alert .alert-item .alert-icon{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;margin-right:6px}.alert .close{position:absolute;right:12px;top:6px}.alert.alert-sm{min-height:22px;font-size:12px;padding:0 30px 3px 6px}.alert.alert-sm .alert-item{margin-top:3px}.alert.alert-sm .close{top:3px;font-size:18px}.alert.global{margin-left:-18px;margin-right:-30px;margin-top:6px;margin-bottom:0}.card .alert.global{margin-left:6px;margin-right:6px;margin-bottom:6px}.card .alert{margin-left:18px;margin-right:18px;margin-top:6px;margin-bottom:6px}.card-block .alert.global{margin-left:6px;margin-right:6px;margin-top:-12px;margin-bottom:6px}.modal-content .alert.global:first-child{margin-top:-18px}.modal-content .alert.global{margin-left:-18px;margin-right:-18px;margin-bottom:6px}
-
-.fade{opacity:0;-webkit-transition:opacity .2s ease-in-out;transition:opacity .2s ease-in-out;will-change:opacity}.fade.in{opacity:1}.fadeDown{opacity:0;-webkit-transform:translate(0, -25%);-ms-transform:translate(0, -25%);transform:translate(0, -25%);-webkit-transition:opacity .2s ease-in-out,-webkit-transform .2s ease-in-out;transition:opacity .2s ease-in-out,-webkit-transform .2s ease-in-out;transition:opacity .2s ease-in-out,transform .2s ease-in-out;transition:opacity .2s ease-in-out,transform .2s ease-in-out,-webkit-transform .2s ease-in-out;will-change:opacity, transform}.fadeDown.in{opacity:1;-webkit-transform:translate(0, 0);-ms-transform:translate(0, 0);transform:translate(0, 0)}
-
-
-.btn,.btn-secondary,.btn-info,.btn-outline,.btn-secondary-outline,.btn-primary-outline,.btn-info-outline{display:inline-block;font-weight:inherit;font-family:inherit;text-decoration:none;text-align:center;vertical-align:middle;text-transform:uppercase;cursor:pointer;border-radius:3px;border:none;margin:6px 12px 6px 0;min-width:84px}.btn,.btn-secondary,.btn-info,.btn-outline,.btn-secondary-outline,.btn-primary-outline,.btn-info-outline{line-height:36px;letter-spacing:1px;font-size:13px;font-weight:600;height:36px;padding:0 18px;border:1px solid #007cbb;background:transparent;color:#007cbb}.btn:visited,.btn-secondary:visited,.btn-info:visited,.btn-outline:visited,.btn-secondary-outline:visited,.btn-primary-outline:visited,.btn-info-outline:visited{color:#007cbb}.btn:focus,.btn-secondary:focus,.btn-info:focus,.btn-outline:focus,.btn-secondary-outline:focus,.btn-primary-outline:focus,.btn-info-outline:focus{color:#007cbb}.btn:hover,.btn:active,.btn-secondary:hover,.btn-secondary:active,.btn-info:hover,.btn-info:active,.btn-outline:hover,.btn-outline:active,.btn-secondary-outline:hover,.btn-secondary-outline:active,.btn-primary-outline:hover,.btn-primary-outline:active,.btn-info-outline:hover,.btn-info-outline:active{background-color:#e1f1f6;border:1px solid #007cbb;color:#004a70;text-decoration:none}.btn:active,.btn-secondary:active,.btn-info:active,.btn-outline:active,.btn-secondary-outline:active,.btn-primary-outline:active,.btn-info-outline:active{padding-top:1px;box-shadow:0 1px 0 0 #89cbdf inset}.btn.disabled,.btn:disabled,.btn-secondary.disabled,.btn-secondary:disabled,.btn-info.disabled,.btn-info:disabled,.btn-outline.disabled,.btn-outline:disabled,.btn-secondary-outline.disabled,.btn-secondary-outline:disabled,.btn-primary-outline.disabled,.btn-primary-outline:disabled,.btn-info-outline.disabled,.btn-info-outline:disabled{cursor:not-allowed;box-shadow:none;opacity:0.4;border:1px solid #747474;background-color:transparent;color:#565656}.btn:active,.btn-secondary:active,.btn-info:active,.btn-outline:active,.btn-secondary-outline:active,.btn-primary-outline:active,.btn-info-outline:active{cursor:pointer}.btn:focus,.btn-secondary:focus,.btn-info:focus,.btn-outline:focus,.btn-secondary-outline:focus,.btn-primary-outline:focus,.btn-info-outline:focus{outline:none}.btn-primary{background-color:#007cbb;border:1px solid #007cbb;color:#fafafa}.btn-primary:visited{color:#fafafa}.btn-primary:hover,.btn-primary:active{background-color:#004a70;border:1px solid #004a70}.btn-primary:hover,.btn-primary:active,.btn-primary:focus{color:#fafafa;text-decoration:none}.btn-primary:active{padding-top:1px;box-shadow:0 2px 0 0 #002538 inset}.btn-primary.disabled,.btn-primary:disabled{cursor:not-allowed;box-shadow:none;opacity:0.6;border:1px solid #ccc;background-color:#ccc;color:#565656}.btn-success{background-color:#62a420;border:1px solid #62a420;color:#fff}.btn-success:visited{color:#fff}.btn-success:hover,.btn-success:active{background-color:#266900;border:1px solid #266900}.btn-success:hover,.btn-success:active,.btn-success:focus{color:#fafafa;text-decoration:none}.btn-success:active{padding-top:1px;box-shadow:0 2px 0 0 #1d5100 inset}.btn-success.disabled,.btn-success:disabled{cursor:not-allowed;box-shadow:none;opacity:0.6;border:1px solid #ccc;background-color:#ccc;color:#565656}.btn-danger,.btn-warning{background-color:#e62700;border:1px solid #e62700;color:#fafafa}.btn-danger:visited,.btn-warning:visited{color:#fafafa}.btn-danger:hover,.btn-danger:active,.btn-warning:hover,.btn-warning:active{background-color:#c92100;border:1px solid #c92100}.btn-danger:hover,.btn-danger:active,.btn-danger:focus,.btn-warning:hover,.btn-warning:active,.btn-warning:focus{color:#fafafa;text-decoration:none}.btn-danger:active,.btn-warning:active{padding-top:1px;box-shadow:0 2px 0 0 #a32100 inset}.btn-danger.disabled,.btn-danger:disabled,.btn-warning.disabled,.btn-warning:disabled{cursor:not-allowed;box-shadow:none;opacity:0.6;border:1px solid #ccc;background-color:#ccc;color:#565656}.btn-success-outline{border:1px solid #318700;background:transparent;color:#318700}.btn-success-outline:visited{color:#318700}.btn-success-outline:focus{color:#318700}.btn-success-outline:hover,.btn-success-outline:active{background-color:#266900;border:1px solid #266900;color:#fff;text-decoration:none}.btn-success-outline:active{padding-top:1px;box-shadow:0 1px 0 0 #1d5100 inset}.btn-success-outline.disabled,.btn-success-outline:disabled{cursor:not-allowed;box-shadow:none;opacity:0.4;border:1px solid #747474;background-color:transparent;color:#565656}.btn-warning-outline,.btn-danger-outline{border:1px solid #e62700;background:transparent;color:#e62700}.btn-warning-outline:visited,.btn-danger-outline:visited{color:#e62700}.btn-warning-outline:focus,.btn-danger-outline:focus{color:#e62700}.btn-warning-outline:hover,.btn-warning-outline:active,.btn-danger-outline:hover,.btn-danger-outline:active{background-color:#c92100;border:1px solid #c92100;color:#fff;text-decoration:none}.btn-warning-outline:active,.btn-danger-outline:active{padding-top:1px;box-shadow:0 1px 0 0 #a32100 inset}.btn-warning-outline.disabled,.btn-warning-outline:disabled,.btn-danger-outline.disabled,.btn-danger-outline:disabled{cursor:not-allowed;box-shadow:none;opacity:0.4;border:1px solid #747474;background-color:transparent;color:#565656}.btn-sm{line-height:24px;letter-spacing:1px;font-size:11px;font-weight:600;height:24px;padding:0 12px;margin:12px 12px 12px 0}.btn-block{display:block;width:100%}.btn-link{border:1px solid transparent;background:transparent;color:#007cbb;box-shadow:none}.btn-link:hover,.btn-link:active{color:#004a70;background:#e1f1f6;border-color:#e1f1f6}.btn-link:active{box-shadow:none}.btn-link.disabled,.btn-link:disabled{cursor:not-allowed;box-shadow:none;border:1px solid transparent;background-color:transparent;color:#747474;opacity:0.40}
-
-.toggle-switch input[type="checkbox"]{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.toggle-switch input[type="checkbox"]{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.toggle-switch input[type="checkbox"]{display:none}.toggle-switch{display:inline-block;margin-right:24px}.toggle-switch label{position:relative;cursor:pointer;margin-right:48px}.toggle-switch label:empty{margin-bottom:17px;margin-left:-10.5px}.toggle-switch input[type="checkbox"]+label::before{position:absolute;display:inline-block;content:'';height:19.2px;width:35.2px;border:2px solid;border-radius:9.6px;border-color:#9a9a9a;background-color:#9a9a9a;top:2.13333px;right:-48px;-webkit-transition:.15s ease-in;transition:.15s ease-in;-webkit-transition-property:border-color, background-color;transition-property:border-color, background-color}.toggle-switch input[type="checkbox"]:checked+label::before{border-color:#62a420;background-color:#62a420;-webkit-transition:.15s ease-in;transition:.15s ease-in;-webkit-transition-property:border-color, background-color;transition-property:border-color, background-color}.toggle-switch input[type="checkbox"]+label::after{position:absolute;display:inline-block;content:'';height:14.93333px;width:14.93333px;border:1.06667px solid #fff;border-radius:50%;background-color:#fff;top:4.26667px;right:-29.86667px;-webkit-transition:right .15s ease-in;transition:right .15s ease-in}.toggle-switch input[type="checkbox"]:checked+label::after{right:-45.86667px;-webkit-transition:right .15s ease-in;transition:right .15s ease-in}.toggle-switch.disabled label{opacity:0.4;cursor:not-allowed}.toggle-switch.disabled input[type="checkbox"]:checked+label::before{border-color:#9a9a9a;background-color:#9a9a9a}.toggle-switch input[type="checkbox"]:disabled+label{opacity:0.4;cursor:not-allowed}.toggle-switch input[type="checkbox"]:checked:disabled+label::before{border-color:#9a9a9a;background-color:#9a9a9a}
-
-.card{position:relative;display:block;margin-bottom:.75rem;background-color:#fff;border:1px solid #e5e5e5;border-radius:.25rem}.card-block{padding:1.25rem}.card-title{margin-bottom:.75rem}.card-subtitle{margin-top:-.375rem;margin-bottom:0}.card-text:last-child{margin-bottom:0}.card-link:hover{text-decoration:none}.card-link+.card-link{margin-left:1.25rem}.card>.list-group:first-child .list-group-item:first-child{border-radius:.25rem .25rem 0 0}.card>.list-group:last-child .list-group-item:last-child{border-radius:0 0 .25rem .25rem}.card-header{padding:.75rem 1.25rem;background-color:#f5f5f5;border-bottom:1px solid #e5e5e5}.card-header:first-child{border-radius:.25rem .25rem 0 0}.card-footer{padding:.75rem 1.25rem;background-color:#f5f5f5;border-top:1px solid #e5e5e5}.card-footer:last-child{border-radius:0 0 .25rem .25rem}.card-primary{background-color:#0275d8;border-color:#0275d8}.card-success{background-color:#5cb85c;border-color:#5cb85c}.card-info{background-color:#5bc0de;border-color:#5bc0de}.card-warning{background-color:#f0ad4e;border-color:#f0ad4e}.card-danger{background-color:#d9534f;border-color:#d9534f}.card-primary-outline{background-color:transparent;border-color:#0275d8}.card-secondary-outline{background-color:transparent;border-color:#ccc}.card-info-outline{background-color:transparent;border-color:#5bc0de}.card-success-outline{background-color:transparent;border-color:#5cb85c}.card-warning-outline{background-color:transparent;border-color:#f0ad4e}.card-danger-outline{background-color:transparent;border-color:#d9534f}.card-inverse .card-header,.card-inverse .card-footer{border-bottom:1px solid rgba(255,255,255,0.2)}.card-inverse .card-header,.card-inverse .card-footer,.card-inverse .card-title,.card-inverse .card-blockquote{color:#fff}.card-inverse .card-link,.card-inverse .card-text,.card-inverse .card-blockquote>footer{color:rgba(255,255,255,0.65)}.card-inverse .card-link:focus,.card-inverse .card-link:hover{color:#fff}.card-blockquote{padding:0;margin-bottom:0;border-left:0}.card-img{border-radius:.25rem}.card-img-overlay{position:absolute;top:0;right:0;bottom:0;left:0;padding:1.25rem}.card-img-top{border-radius:.25rem .25rem 0 0}.card-img-bottom{border-radius:0 0 .25rem .25rem}@media (min-width: 544px){.card-deck{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;margin-right:-.625rem;margin-left:-.625rem}.card-deck .card{-webkit-box-flex:1;-webkit-flex:1 0 0;-ms-flex:1 0 0;flex:1 0 0;margin-right:.625rem;margin-left:.625rem}}@media (min-width: 544px){.card-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap}.card-group .card{-webkit-box-flex:1;-webkit-flex:1 0 0;-ms-flex:1 0 0;flex:1 0 0}.card-group .card+.card{margin-left:0;border-left:0}.card-group .card:first-child{border-bottom-right-radius:0;border-top-right-radius:0}.card-group .card:first-child .card-img-top{border-top-right-radius:0}.card-group .card:first-child .card-img-bottom{border-bottom-right-radius:0}.card-group .card:last-child{border-bottom-left-radius:0;border-top-left-radius:0}.card-group .card:last-child .card-img-top{border-top-left-radius:0}.card-group .card:last-child .card-img-bottom{border-bottom-left-radius:0}.card-group .card:not(:first-child):not(:last-child){border-radius:0}.card-group .card:not(:first-child):not(:last-child) .card-img-top,.card-group .card:not(:first-child):not(:last-child) .card-img-bottom{border-radius:0}}@media (min-width: 544px){.card-columns{-webkit-column-count:3;-moz-column-count:3;column-count:3;-webkit-column-gap:1.25rem;-moz-column-gap:1.25rem;column-gap:1.25rem}.card-columns .card{display:inline-block;width:100%}}.list-group{padding-left:0;margin-bottom:0}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:.25rem;border-top-left-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-flush .list-group-item{border-width:1px 0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}a.list-group-item,button.list-group-item{width:100%;color:#555;text-align:inherit}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#818a91;cursor:not-allowed;background-color:#eceeef}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#818a91}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#0275d8;border-color:#0275d8}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>small,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading>.small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#a8d6fe}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}.card .card-link{color:#0094d2;text-transform:uppercase;font-size:11px;letter-spacing:1px;font-weight:600;cursor:pointer}.card,.card .card-overflow-menu .menu{box-shadow:0 2px 3px 0 rgba(116,116,116,0.15);border-radius:3px;border:1px solid #eee}.card{box-sizing:border-box;margin:24px 12px 0 0;-webkit-transition:all 0.3s;transition:all 0.3s}.card:hover{border:1px solid #eee}.card.clickable:hover{box-shadow:0 6px 10px 2px rgba(116,116,116,0.2);-webkit-transform:translate3d(0, -4px, 0);transform:translate3d(0, -4px, 0);cursor:pointer}.card .card-title,.card .card-subtitle{font-size:18px;font-weight:600;margin:0 18px 12px 18px}.card .card-text{font-size:14px;margin:0 18px 12px 18px}.card .btn,.card .card-link{margin:0 0 0 18px}.card .list-group .list-group-item{font-size:14px;padding:12px 18px}.card .card-divider{display:block;width:100%;border-bottom:1px solid #eee;margin-bottom:12px}.card .card-header{padding:12px 18px;background:#eee}.card .group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin:0 18px 12px 18px}.card .group .icon{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;max-width:60px;max-height:60px}.card .group .description{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;font-size:14px;color:#747474;margin:6px 0 0 12px}.card .group .description .title{font-size:16px;color:#565656}.card .group.wrap{-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.card .group.wrap .description{margin-left:0}.card .card-overflow-menu{display:inline-block;position:relative}.card .card-overflow-menu>.card-link{position:relative;padding-right:15px;margin:0 0 0 18px}.card .card-overflow-menu>.card-link::after{position:absolute;font-family:"FontAwesome";content:"\f107";font-size:14px;right:2px;top:-6px}.card .card-overflow-menu .menu{display:none;z-index:2;position:absolute;background:#fff;padding:12px 0;min-width:144px;border-radius:3px;bottom:24px;left:-12px;overflow-y:auto}.card .card-overflow-menu .menu .menu-item{padding:0 24px;color:#565656;font-size:14px;text-decoration:none;display:inline-block;width:100%;cursor:pointer;white-space:nowrap}.card .card-overflow-menu .menu .menu-item:hover{background:rgba(154,154,154,0.15)}.card .card-overflow-menu.active .menu{display:block}.card .card-overflow-menu.active .card-link::after{-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.card-block{padding:18px 0}
-
-.close{float:right;font-size:1.5rem;font-weight:bold;line-height:1;color:#000;text-shadow:0 1px 0 #fff;opacity:.2}.close:focus,.close:hover{color:#000;text-decoration:none;cursor:pointer;opacity:.5}button.close{padding:0;cursor:pointer;background:transparent;border:0;-webkit-appearance:none}
-
-
-code,kbd,pre,samp{font-family:Menlo,Monaco,Consolas,"Courier New",monospace}code{padding:.2rem .4rem;font-size:90%;color:#bd4147;background-color:#f7f7f9;border-radius:.25rem}kbd{padding:.2rem .4rem;font-size:90%;color:#fff;background-color:#333;border-radius:.2rem}kbd kbd{padding:0;font-size:100%;font-weight:bold}pre{display:block;margin-top:0;margin-bottom:1rem;font-size:90%;line-height:1.5;color:#373a3c}pre code{padding:0;font-size:inherit;color:inherit;background-color:transparent;border-radius:0}.pre-scrollable{max-height:340px;overflow-y:scroll}pre,pre[class*="language-"]{margin:12px 0 12px 0}pre{white-space:normal;border:1px solid #ccc;max-height:360px;border-radius:3px;overflow:auto}pre code{white-space:pre}:not(pre)>code[class*="language-"],pre[class*="language-"],pre,code[class*="language-"]{line-height:24px;padding:0}code.clr-code{color:#c92100;padding:0;background:transparent}
-
-.c-input{position:relative;display:inline;padding-left:1.5rem;color:#555;cursor:pointer}.c-input>input{position:absolute;z-index:-1;opacity:0}.c-input>input:checked ~ .c-indicator{color:#fff;background-color:#0074d9}.c-input>input:focus ~ .c-indicator{box-shadow:0 0 0 .075rem #fff, 0 0 0 .2rem #0074d9}.c-input>input:active ~ .c-indicator{color:#fff;background-color:#84c6ff}.c-input+.c-input{margin-left:1rem}.c-indicator{position:absolute;top:0;left:0;display:block;width:1rem;height:1rem;font-size:65%;line-height:1rem;color:#eee;text-align:center;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#eee;background-repeat:no-repeat;background-position:center center;background-size:50% 50%}.c-checkbox .c-indicator{border-radius:.25rem}.c-checkbox input:checked ~ .c-indicator{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTYuNCwxTDUuNywxLjdMMi45LDQuNUwyLjEsMy43TDEuNCwzTDAsNC40bDAuNywwLjdsMS41LDEuNWwwLjcsMC43bDAuNy0wLjdsMy41LTMuNWwwLjctMC43TDYuNCwxTDYuNCwxeiINCgkvPg0KPC9zdmc+DQo=)}.c-checkbox input:indeterminate ~ .c-indicator{background-color:#0074d9;background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iOHB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDggOCIgZW5hYmxlLWJhY2tncm91bmQ9Im5ldyAwIDAgOCA4IiB4bWw6c3BhY2U9InByZXNlcnZlIj4NCjxwYXRoIGZpbGw9IiNGRkZGRkYiIGQ9Ik0wLDN2Mmg4VjNIMHoiLz4NCjwvc3ZnPg0K)}.c-radio .c-indicator{border-radius:50%}.c-radio input:checked ~ .c-indicator{background-image:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNy4xLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB2aWV3Qm94PSIwIDAgOCA4IiBlbmFibGUtYmFja2dyb3VuZD0ibmV3IDAgMCA4IDgiIHhtbDpzcGFjZT0icHJlc2VydmUiPg0KPHBhdGggZmlsbD0iI0ZGRkZGRiIgZD0iTTQsMUMyLjMsMSwxLDIuMywxLDRzMS4zLDMsMywzczMtMS4zLDMtM1M1LjcsMSw0LDF6Ii8+DQo8L3N2Zz4NCg==)}.c-inputs-stacked .c-input{display:inline}.c-inputs-stacked .c-input::after{display:block;margin-bottom:.25rem;content:""}.c-inputs-stacked .c-input+.c-input{margin-left:0}.c-select{display:inline-block;max-width:100%;padding:.375rem 1.75rem .375rem .75rem;padding-right:.75rem \9;color:#55595c;vertical-align:middle;background:#fff url(data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAUCAMAAACzvE1FAAAADFBMVEUzMzMzMzMzMzMzMzMKAG/3AAAAA3RSTlMAf4C/aSLHAAAAPElEQVR42q3NMQ4AIAgEQTn//2cLdRKppSGzBYwzVXvznNWs8C58CiussPJj8h6NwgorrKRdTvuV9v16Afn0AYFOB7aYAAAAAElFTkSuQmCC) no-repeat right 0.75rem center;background-image:none \9;background-size:8px 10px;border:1px solid #ccc;-moz-appearance:none;-webkit-appearance:none}.c-select:focus{border-color:#51a7e8;outline:none}.c-select::-ms-expand{opacity:0}.c-select-sm{padding-top:3px;padding-bottom:3px;font-size:12px}.c-select-sm:not([multiple]){height:26px;min-height:26px}.file{position:relative;display:inline-block;height:2.5rem;cursor:pointer}.file input{min-width:14rem;margin:0;filter:alpha(opacity=0);opacity:0}.file-custom{position:absolute;top:0;right:0;left:0;z-index:5;height:2.5rem;padding:.5rem 1rem;line-height:1.5;color:#555;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none;background-color:#fff;border:1px solid #ddd;border-radius:.25rem}.file-custom::after{content:"Choose file..."}.file-custom::before{position:absolute;top:-.075rem;right:-.075rem;bottom:-.075rem;z-index:6;display:block;height:2.5rem;padding:.5rem 1rem;line-height:1.5;color:#555;content:"Browse";background-color:#eee;border:1px solid #ddd;border-radius:0 .25rem .25rem 0}
-
-.dropdown .dropdown-menu .dropdown-header,.dropdown .dropdown-menu .dropdown-item{overflow:hidden;text-overflow:ellipsis;text-align:left}.dropdown .dropdown-toggle::after{content:'\f107';font-family:"FontAwesome"}.dropdown{position:relative;display:inline-block}.dropdown .dropdown-toggle{position:relative;margin:0;white-space:nowrap;cursor:pointer}.dropdown .dropdown-toggle>*{margin:0}.dropdown .dropdown-toggle.btn::after,.dropdown .dropdown-toggle.fa::after{margin-left:6px}.dropdown .dropdown-toggle.fa{display:inline}.dropdown a.dropdown-toggle::after{margin-left:6px}.dropdown a.dropdown-toggle:hover::after,.dropdown a.dropdown-toggle:active::after{display:inline-block;text-decoration:none}.dropdown .dropdown-toggle.alert-icon{position:relative;margin-right:18px}.dropdown .dropdown-toggle.alert-icon:after{position:absolute;top:50%;left:calc(100% + 6px);-webkit-transform:translateY(-50%);-ms-transform:translateY(-50%);transform:translateY(-50%)}.dropdown .dropdown-menu>*{display:block;white-space:nowrap}.dropdown .dropdown-menu{position:absolute;top:100%;left:0;margin-top:2px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;background:#fff;padding:18px 0;border:1px solid #ccc;box-shadow:0 1px 3px rgba(116,116,116,0.25);min-width:120px;max-width:360px;border-radius:3px;visibility:hidden;-webkit-transition:visibility 0.2s ease-in;transition:visibility 0.2s ease-in;z-index:1000}.dropdown .dropdown-menu .dropdown-header{padding:0 12px;font-size:12px;margin:0;font-weight:600;color:#313131}.dropdown .dropdown-menu .dropdown-item{display:block;border:0;background:transparent;outline:none;width:100%;padding:0 24px;margin:0;cursor:pointer;color:#565656;font-size:14px}.dropdown .dropdown-menu .dropdown-item:hover,.dropdown .dropdown-menu .dropdown-item:focus,.dropdown .dropdown-menu .dropdown-item:active,.dropdown .dropdown-menu .dropdown-item.active{text-decoration:none;background-color:#f0f0f0}.dropdown .dropdown-menu .dropdown-item.disabled{cursor:not-allowed;opacity:0.4;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.dropdown .dropdown-menu .dropdown-item.disabled:hover{background:none}.dropdown .dropdown-menu .dropdown-item.disabled:active,.dropdown .dropdown-menu .dropdown-item.disabled:focus{background:none;box-shadow:none}.dropdown .dropdown-menu .dropdown-divider{border-bottom:1px solid #eee;margin:18px 0}.dropdown.open .dropdown-menu{visibility:visible}.dropdown.bottom-left .dropdown-menu,.dropdown.bottom-right .dropdown-menu{top:100%;bottom:auto;margin:2px 0 0 0}.dropdown.bottom-left .dropdown-menu{left:0;right:auto}.dropdown.bottom-right .dropdown-menu{right:0;left:auto}.dropdown.top-left .dropdown-menu,.dropdown.top-right .dropdown-menu{top:auto;bottom:100%;margin:0 0 2px 0}.dropdown.top-left .dropdown-menu{left:0;right:auto}.dropdown.top-right .dropdown-menu{right:0;left:auto}.dropdown.left-top .dropdown-menu,.dropdown.left-bottom .dropdown-menu{right:100%;left:auto;margin:0 2px 0 0}.dropdown.left-bottom .dropdown-menu{top:0;bottom:auto}.dropdown.left-top .dropdown-menu{bottom:0;top:auto}.dropdown.right-top .dropdown-menu,.dropdown.right-bottom .dropdown-menu{left:100%;right:auto;margin:0 0 0 2px}.dropdown.right-bottom .dropdown-menu{top:0;bottom:auto}.dropdown.right-top .dropdown-menu{bottom:0;top:auto}
-
-input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}input[type=text],input[type=password],input[type=number],input[type=email],.select select{margin:0;padding:0;border:none;border-radius:0;box-shadow:none;background:none}input[type=text]:focus,input[type=password]:focus,input[type=number]:focus,input[type=email]:focus,.select select:focus{outline:none}input[type=text],input[type=password],input[type=number],input[type=email],.select select{display:inline-block;border-bottom:1px solid #9a9a9a;min-width:60px}.checkbox input[type="checkbox"]+label::before,.checkbox-inline input[type="checkbox"]+label::before,.radio input[type="radio"]+label::before,.radio-inline input[type="radio"]+label::before{box-sizing:border-box;background-color:#fff;border:1px solid #9a9a9a;content:'';display:inline-block;font-size:10px;height:16px;width:16px;overflow:hidden;text-align:center;margin:0 5px -2px 2px}form .form-group .select.disabled select,.form .form-group .select.disabled select,input[type=text]:disabled,input[type=password]:disabled,input[type=number]:disabled,input[type=email]:disabled,.select select:disabled,.checkbox.disabled label,.checkbox-inline.disabled label,.radio.disabled label,.radio-inline.disabled label{opacity:0.4;cursor:not-allowed}form,.form{padding-top:12px}form .form-block,.form .form-block{margin:12px 0 36px 0}form .form-block>label,.form .form-block>label{font-weight:bold;text-transform:uppercase;letter-spacing:1.5px;margin-bottom:24px}form .form-group,.form .form-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;position:relative;padding-left:228px;margin-bottom:12px}form .form-group>label:first-of-type,.form .form-group>label:first-of-type{position:absolute;width:204px;left:0;top:12px;margin:0}form .form-group>label:not(:first-child),form .form-group span,.form .form-group>label:not(:first-child),.form .form-group span{display:inline-block;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group input[type=text],form .form-group input[type=password],form .form-group input[type=number],form .form-group input[type=email],.form .form-group input[type=text],.form .form-group input[type=password],.form .form-group input[type=number],.form .form-group input[type=email]{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .validated-input,.form .form-group .validated-input{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .validated-input input,.form .form-group .validated-input input{margin:0}form .form-group textarea,.form .form-group textarea{margin:12px 12px 0 0}form .form-group .select,form .form-group .checkbox-inline,form .form-group .radio-inline,.form .form-group .select,.form .form-group .checkbox-inline,.form .form-group .radio-inline{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .checkbox,form .form-group .radio,.form .form-group .checkbox,.form .form-group .radio{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;margin:12px 12px 0 0}form .form-group .toggle-switch,.form .form-group .toggle-switch{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 24px 0 0}form .form-group button,form .form-group a,form .form-group input[type=button],form .form-group input[type=submit],form .form-group .btn,.form .form-group button,.form .form-group a,.form .form-group input[type=button],.form .form-group input[type=submit],.form .form-group .btn{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:6px 12px 6px 0}form .form-group .btn-sm,.form .form-group .btn-sm{margin:12px 12px 12px 0}@media screen and (max-width: 544px){form .form-block>label,.form .form-block>label{text-transform:uppercase;letter-spacing:1.5px}form .form-group,.form .form-group{padding-left:0;margin-bottom:24px}form .form-group>label:first-of-type,.form .form-group>label:first-of-type{position:relative;-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;text-transform:uppercase;margin:0 0 12px 0;font-size:10px;letter-spacing:1.5px}form .form-group>label:not(:first-child),form .form-group span,.form .form-group>label:not(:first-child),.form .form-group span{margin:12px 12px 0 0;width:80%}form .form-group input[type=text],form .form-group input[type=password],form .form-group input[type=number],form .form-group input[type=email],.form .form-group input[type=text],.form .form-group input[type=password],.form .form-group input[type=number],.form .form-group input[type=email]{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;padding:0 12px 0 12px}form .form-group .validated-input,.form .form-group .validated-input{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%}form .form-group .validated-input input,.form .form-group .validated-input input{margin:0;width:100%}form .form-group .select,form .form-group .toggle-switch,form .form-group .checkbox,form .form-group .radio,form .form-group .checkbox-inline,form .form-group .radio-inline,.form .form-group .select,.form .form-group .toggle-switch,.form .form-group .checkbox,.form .form-group .radio,.form .form-group .checkbox-inline,.form .form-group .radio-inline{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%}}input[type=text],input[type=password],input[type=number],input[type=email]{background:-webkit-linear-gradient(top, transparent 95%, #0094d2 95%);background:linear-gradient(to bottom, transparent 95%, #0094d2 95%);background-repeat:no-repeat;background-size:0% 100%;-webkit-transition:background-size 0.2s ease;transition:background-size 0.2s ease;padding:0 6px 0 6px}input[type=text]:focus,input[type=password]:focus,input[type=number]:focus,input[type=email]:focus{border-bottom:1px solid #0094d2;background-size:100% 100%}textarea{resize:vertical;width:100%;border:1px solid #ccc;border-radius:3px;outline:none;padding:12px 6px}.select{position:relative}.select select{position:relative;padding:0 18px 0 6px;cursor:pointer;width:100%;z-index:2}.select select:hover{border-color:rgba(221,221,221,0.5);background:rgba(221,221,221,0.5)}.select select::-ms-expand{display:none}.select::after{position:absolute;font-family:"FontAwesome";color:#9a9a9a;content:"\f107";bottom:1px;right:4px}.select:hover::after{color:#747474}.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{display:none}.checkbox label,.checkbox-inline label{cursor:pointer;margin-bottom:0}.checkbox input[type="checkbox"]+label::before,.checkbox-inline input[type="checkbox"]+label::before{border-radius:2px}.checkbox input[type="checkbox"]:checked+label::before,.checkbox-inline input[type="checkbox"]:checked+label::before{content:'\f00c';font-family:"FontAwesome";color:#fff;background-color:#0094d2;line-height:15px;font-size:8px;text-align:center;border-radius:2px;padding:1px 0 0 0;border:none}.checkbox.disabled input[type="checkbox"]:checked+label::before,.checkbox-inline.disabled input[type="checkbox"]:checked+label::before{background-color:#ccc;color:#747474}.radio input[type="radio"],.radio-inline input[type="radio"]{display:none}.radio label,.radio-inline label{cursor:pointer;margin-bottom:0}.radio input[type="radio"]+label::before,.radio-inline input[type="radio"]+label::before{border-radius:50%}.radio input[type="radio"]:checked+label::before,.radio-inline input[type="radio"]:checked+label::before{background-color:#fff;box-shadow:inset 0 0 0 6px #0094d2;border:none}.radio.disabled input[type="radio"]:checked+label::before,.radio-inline.disabled input[type="radio"]:checked+label::before{background-color:#fff;box-shadow:inset 0 0 0 6px #ccc}.toggle-switch label{margin-bottom:0}.validated-input{position:relative;display:inline-block}.validated-input>input{padding-right:28px}.validated-input.invalid>input{border-bottom:2px solid #c92100;background:none;-webkit-transition:none;transition:none}.validated-input.invalid:before{position:absolute;content:'';height:16px;width:16px;top:3px;right:6px;background:url(img/ic_error_red_16x.svg)}.validated-input.invalid>input:focus+.tooltip{visibility:visible;opacity:1}form.compact .form-block>label,.form.compact .form-block>label{margin-bottom:0}form.compact .form-group,.form.compact .form-group{margin-bottom:2px}form.compact .form-group input[type=text],form.compact .form-group input[type=password],form.compact .form-group input[type=number],form.compact .form-group input[type=email],.form.compact .form-group input[type=text],.form.compact .form-group input[type=password],.form.compact .form-group input[type=number],.form.compact .form-group input[type=email]{margin-bottom:10px}form.compact .form-group .validated-input,.form.compact .form-group .validated-input{margin-bottom:10px}form.compact .form-group .validated-input input,.form.compact .form-group .validated-input input{margin:0}form.compact .form-group textarea,form.compact .form-group .select,form.compact .form-group .checkbox-inline,form.compact .form-group .radio-inline,form.compact .form-group .checkbox,form.compact .form-group .radio,form.compact .form-group .toggle-switch,.form.compact .form-group textarea,.form.compact .form-group .select,.form.compact .form-group .checkbox-inline,.form.compact .form-group .radio-inline,.form.compact .form-group .checkbox,.form.compact .form-group .radio,.form.compact .form-group .toggle-switch{margin-bottom:10px}@media screen and (max-width: 544px){form.compact .form-group,.form.compact .form-group{margin-bottom:2px}}
-
-.container{margin-left:auto;margin-right:auto;padding-left:12px;padding-right:12px}@media (min-width: 544px){.container{max-width:576px}}@media (min-width: 768px){.container{max-width:720px}}@media (min-width: 992px){.container{max-width:940px}}@media (min-width: 1200px){.container{max-width:1140px}}.container-fluid{margin-left:auto;margin-right:auto;padding-left:12px;padding-right:12px}.row{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;margin-left:-12px;margin-right:-12px}.col-xs-1,.col-xs-2,.col-xs-3,.col-xs-4,.col-xs-5,.col-xs-6,.col-xs-7,.col-xs-8,.col-xs-9,.col-xs-10,.col-xs-11,.col-xs-12,.col-sm-1,.col-sm-2,.col-sm-3,.col-sm-4,.col-sm-5,.col-sm-6,.col-sm-7,.col-sm-8,.col-sm-9,.col-sm-10,.col-sm-11,.col-sm-12,.col-md-1,.col-md-2,.col-md-3,.col-md-4,.col-md-5,.col-md-6,.col-md-7,.col-md-8,.col-md-9,.col-md-10,.col-md-11,.col-md-12,.col-lg-1,.col-lg-2,.col-lg-3,.col-lg-4,.col-lg-5,.col-lg-6,.col-lg-7,.col-lg-8,.col-lg-9,.col-lg-10,.col-lg-11,.col-lg-12,.col-xl-1,.col-xl-2,.col-xl-3,.col-xl-4,.col-xl-5,.col-xl-6,.col-xl-7,.col-xl-8,.col-xl-9,.col-xl-10,.col-xl-11,.col-xl-12{position:relative;min-height:1px;padding-left:12px;padding-right:12px}.col-xs-1{-webkit-box-flex:0;-webkit-flex:0 0 8.33333%;-ms-flex:0 0 8.33333%;flex:0 0 8.33333%;max-width:8.33333%}.col-xs-2{-webkit-box-flex:0;-webkit-flex:0 0 16.66667%;-ms-flex:0 0 16.66667%;flex:0 0 16.66667%;max-width:16.66667%}.col-xs-3{-webkit-box-flex:0;-webkit-flex:0 0 25%;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xs-4{-webkit-box-flex:0;-webkit-flex:0 0 33.33333%;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;max-width:33.33333%}.col-xs-5{-webkit-box-flex:0;-webkit-flex:0 0 41.66667%;-ms-flex:0 0 41.66667%;flex:0 0 41.66667%;max-width:41.66667%}.col-xs-6{-webkit-box-flex:0;-webkit-flex:0 0 50%;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xs-7{-webkit-box-flex:0;-webkit-flex:0 0 58.33333%;-ms-flex:0 0 58.33333%;flex:0 0 58.33333%;max-width:58.33333%}.col-xs-8{-webkit-box-flex:0;-webkit-flex:0 0 66.66667%;-ms-flex:0 0 66.66667%;flex:0 0 66.66667%;max-width:66.66667%}.col-xs-9{-webkit-box-flex:0;-webkit-flex:0 0 75%;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xs-10{-webkit-box-flex:0;-webkit-flex:0 0 83.33333%;-ms-flex:0 0 83.33333%;flex:0 0 83.33333%;max-width:83.33333%}.col-xs-11{-webkit-box-flex:0;-webkit-flex:0 0 91.66667%;-ms-flex:0 0 91.66667%;flex:0 0 91.66667%;max-width:91.66667%}.col-xs-12{-webkit-box-flex:0;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.col-xs-pull-0{right:auto}.col-xs-pull-1{right:8.33333%}.col-xs-pull-2{right:16.66667%}.col-xs-pull-3{right:25%}.col-xs-pull-4{right:33.33333%}.col-xs-pull-5{right:41.66667%}.col-xs-pull-6{right:50%}.col-xs-pull-7{right:58.33333%}.col-xs-pull-8{right:66.66667%}.col-xs-pull-9{right:75%}.col-xs-pull-10{right:83.33333%}.col-xs-pull-11{right:91.66667%}.col-xs-pull-12{right:100%}.col-xs-push-0{left:auto}.col-xs-push-1{left:8.33333%}.col-xs-push-2{left:16.66667%}.col-xs-push-3{left:25%}.col-xs-push-4{left:33.33333%}.col-xs-push-5{left:41.66667%}.col-xs-push-6{left:50%}.col-xs-push-7{left:58.33333%}.col-xs-push-8{left:66.66667%}.col-xs-push-9{left:75%}.col-xs-push-10{left:83.33333%}.col-xs-push-11{left:91.66667%}.col-xs-push-12{left:100%}.col-xs-offset-0{margin-left:0%}.col-xs-offset-1{margin-left:8.33333%}.col-xs-offset-2{margin-left:16.66667%}.col-xs-offset-3{margin-left:25%}.col-xs-offset-4{margin-left:33.33333%}.col-xs-offset-5{margin-left:41.66667%}.col-xs-offset-6{margin-left:50%}.col-xs-offset-7{margin-left:58.33333%}.col-xs-offset-8{margin-left:66.66667%}.col-xs-offset-9{margin-left:75%}.col-xs-offset-10{margin-left:83.33333%}.col-xs-offset-11{margin-left:91.66667%}.col-xs-offset-12{margin-left:100%}@media (min-width: 544px){.col-sm-1{-webkit-box-flex:0;-webkit-flex:0 0 8.33333%;-ms-flex:0 0 8.33333%;flex:0 0 8.33333%;max-width:8.33333%}.col-sm-2{-webkit-box-flex:0;-webkit-flex:0 0 16.66667%;-ms-flex:0 0 16.66667%;flex:0 0 16.66667%;max-width:16.66667%}.col-sm-3{-webkit-box-flex:0;-webkit-flex:0 0 25%;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-sm-4{-webkit-box-flex:0;-webkit-flex:0 0 33.33333%;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;max-width:33.33333%}.col-sm-5{-webkit-box-flex:0;-webkit-flex:0 0 41.66667%;-ms-flex:0 0 41.66667%;flex:0 0 41.66667%;max-width:41.66667%}.col-sm-6{-webkit-box-flex:0;-webkit-flex:0 0 50%;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-sm-7{-webkit-box-flex:0;-webkit-flex:0 0 58.33333%;-ms-flex:0 0 58.33333%;flex:0 0 58.33333%;max-width:58.33333%}.col-sm-8{-webkit-box-flex:0;-webkit-flex:0 0 66.66667%;-ms-flex:0 0 66.66667%;flex:0 0 66.66667%;max-width:66.66667%}.col-sm-9{-webkit-box-flex:0;-webkit-flex:0 0 75%;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-sm-10{-webkit-box-flex:0;-webkit-flex:0 0 83.33333%;-ms-flex:0 0 83.33333%;flex:0 0 83.33333%;max-width:83.33333%}.col-sm-11{-webkit-box-flex:0;-webkit-flex:0 0 91.66667%;-ms-flex:0 0 91.66667%;flex:0 0 91.66667%;max-width:91.66667%}.col-sm-12{-webkit-box-flex:0;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.col-sm-pull-0{right:auto}.col-sm-pull-1{right:8.33333%}.col-sm-pull-2{right:16.66667%}.col-sm-pull-3{right:25%}.col-sm-pull-4{right:33.33333%}.col-sm-pull-5{right:41.66667%}.col-sm-pull-6{right:50%}.col-sm-pull-7{right:58.33333%}.col-sm-pull-8{right:66.66667%}.col-sm-pull-9{right:75%}.col-sm-pull-10{right:83.33333%}.col-sm-pull-11{right:91.66667%}.col-sm-pull-12{right:100%}.col-sm-push-0{left:auto}.col-sm-push-1{left:8.33333%}.col-sm-push-2{left:16.66667%}.col-sm-push-3{left:25%}.col-sm-push-4{left:33.33333%}.col-sm-push-5{left:41.66667%}.col-sm-push-6{left:50%}.col-sm-push-7{left:58.33333%}.col-sm-push-8{left:66.66667%}.col-sm-push-9{left:75%}.col-sm-push-10{left:83.33333%}.col-sm-push-11{left:91.66667%}.col-sm-push-12{left:100%}.col-sm-offset-0{margin-left:0%}.col-sm-offset-1{margin-left:8.33333%}.col-sm-offset-2{margin-left:16.66667%}.col-sm-offset-3{margin-left:25%}.col-sm-offset-4{margin-left:33.33333%}.col-sm-offset-5{margin-left:41.66667%}.col-sm-offset-6{margin-left:50%}.col-sm-offset-7{margin-left:58.33333%}.col-sm-offset-8{margin-left:66.66667%}.col-sm-offset-9{margin-left:75%}.col-sm-offset-10{margin-left:83.33333%}.col-sm-offset-11{margin-left:91.66667%}.col-sm-offset-12{margin-left:100%}}@media (min-width: 768px){.col-md-1{-webkit-box-flex:0;-webkit-flex:0 0 8.33333%;-ms-flex:0 0 8.33333%;flex:0 0 8.33333%;max-width:8.33333%}.col-md-2{-webkit-box-flex:0;-webkit-flex:0 0 16.66667%;-ms-flex:0 0 16.66667%;flex:0 0 16.66667%;max-width:16.66667%}.col-md-3{-webkit-box-flex:0;-webkit-flex:0 0 25%;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-md-4{-webkit-box-flex:0;-webkit-flex:0 0 33.33333%;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;max-width:33.33333%}.col-md-5{-webkit-box-flex:0;-webkit-flex:0 0 41.66667%;-ms-flex:0 0 41.66667%;flex:0 0 41.66667%;max-width:41.66667%}.col-md-6{-webkit-box-flex:0;-webkit-flex:0 0 50%;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-md-7{-webkit-box-flex:0;-webkit-flex:0 0 58.33333%;-ms-flex:0 0 58.33333%;flex:0 0 58.33333%;max-width:58.33333%}.col-md-8{-webkit-box-flex:0;-webkit-flex:0 0 66.66667%;-ms-flex:0 0 66.66667%;flex:0 0 66.66667%;max-width:66.66667%}.col-md-9{-webkit-box-flex:0;-webkit-flex:0 0 75%;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-md-10{-webkit-box-flex:0;-webkit-flex:0 0 83.33333%;-ms-flex:0 0 83.33333%;flex:0 0 83.33333%;max-width:83.33333%}.col-md-11{-webkit-box-flex:0;-webkit-flex:0 0 91.66667%;-ms-flex:0 0 91.66667%;flex:0 0 91.66667%;max-width:91.66667%}.col-md-12{-webkit-box-flex:0;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.col-md-pull-0{right:auto}.col-md-pull-1{right:8.33333%}.col-md-pull-2{right:16.66667%}.col-md-pull-3{right:25%}.col-md-pull-4{right:33.33333%}.col-md-pull-5{right:41.66667%}.col-md-pull-6{right:50%}.col-md-pull-7{right:58.33333%}.col-md-pull-8{right:66.66667%}.col-md-pull-9{right:75%}.col-md-pull-10{right:83.33333%}.col-md-pull-11{right:91.66667%}.col-md-pull-12{right:100%}.col-md-push-0{left:auto}.col-md-push-1{left:8.33333%}.col-md-push-2{left:16.66667%}.col-md-push-3{left:25%}.col-md-push-4{left:33.33333%}.col-md-push-5{left:41.66667%}.col-md-push-6{left:50%}.col-md-push-7{left:58.33333%}.col-md-push-8{left:66.66667%}.col-md-push-9{left:75%}.col-md-push-10{left:83.33333%}.col-md-push-11{left:91.66667%}.col-md-push-12{left:100%}.col-md-offset-0{margin-left:0%}.col-md-offset-1{margin-left:8.33333%}.col-md-offset-2{margin-left:16.66667%}.col-md-offset-3{margin-left:25%}.col-md-offset-4{margin-left:33.33333%}.col-md-offset-5{margin-left:41.66667%}.col-md-offset-6{margin-left:50%}.col-md-offset-7{margin-left:58.33333%}.col-md-offset-8{margin-left:66.66667%}.col-md-offset-9{margin-left:75%}.col-md-offset-10{margin-left:83.33333%}.col-md-offset-11{margin-left:91.66667%}.col-md-offset-12{margin-left:100%}}@media (min-width: 992px){.col-lg-1{-webkit-box-flex:0;-webkit-flex:0 0 8.33333%;-ms-flex:0 0 8.33333%;flex:0 0 8.33333%;max-width:8.33333%}.col-lg-2{-webkit-box-flex:0;-webkit-flex:0 0 16.66667%;-ms-flex:0 0 16.66667%;flex:0 0 16.66667%;max-width:16.66667%}.col-lg-3{-webkit-box-flex:0;-webkit-flex:0 0 25%;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-lg-4{-webkit-box-flex:0;-webkit-flex:0 0 33.33333%;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;max-width:33.33333%}.col-lg-5{-webkit-box-flex:0;-webkit-flex:0 0 41.66667%;-ms-flex:0 0 41.66667%;flex:0 0 41.66667%;max-width:41.66667%}.col-lg-6{-webkit-box-flex:0;-webkit-flex:0 0 50%;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-lg-7{-webkit-box-flex:0;-webkit-flex:0 0 58.33333%;-ms-flex:0 0 58.33333%;flex:0 0 58.33333%;max-width:58.33333%}.col-lg-8{-webkit-box-flex:0;-webkit-flex:0 0 66.66667%;-ms-flex:0 0 66.66667%;flex:0 0 66.66667%;max-width:66.66667%}.col-lg-9{-webkit-box-flex:0;-webkit-flex:0 0 75%;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-lg-10{-webkit-box-flex:0;-webkit-flex:0 0 83.33333%;-ms-flex:0 0 83.33333%;flex:0 0 83.33333%;max-width:83.33333%}.col-lg-11{-webkit-box-flex:0;-webkit-flex:0 0 91.66667%;-ms-flex:0 0 91.66667%;flex:0 0 91.66667%;max-width:91.66667%}.col-lg-12{-webkit-box-flex:0;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.col-lg-pull-0{right:auto}.col-lg-pull-1{right:8.33333%}.col-lg-pull-2{right:16.66667%}.col-lg-pull-3{right:25%}.col-lg-pull-4{right:33.33333%}.col-lg-pull-5{right:41.66667%}.col-lg-pull-6{right:50%}.col-lg-pull-7{right:58.33333%}.col-lg-pull-8{right:66.66667%}.col-lg-pull-9{right:75%}.col-lg-pull-10{right:83.33333%}.col-lg-pull-11{right:91.66667%}.col-lg-pull-12{right:100%}.col-lg-push-0{left:auto}.col-lg-push-1{left:8.33333%}.col-lg-push-2{left:16.66667%}.col-lg-push-3{left:25%}.col-lg-push-4{left:33.33333%}.col-lg-push-5{left:41.66667%}.col-lg-push-6{left:50%}.col-lg-push-7{left:58.33333%}.col-lg-push-8{left:66.66667%}.col-lg-push-9{left:75%}.col-lg-push-10{left:83.33333%}.col-lg-push-11{left:91.66667%}.col-lg-push-12{left:100%}.col-lg-offset-0{margin-left:0%}.col-lg-offset-1{margin-left:8.33333%}.col-lg-offset-2{margin-left:16.66667%}.col-lg-offset-3{margin-left:25%}.col-lg-offset-4{margin-left:33.33333%}.col-lg-offset-5{margin-left:41.66667%}.col-lg-offset-6{margin-left:50%}.col-lg-offset-7{margin-left:58.33333%}.col-lg-offset-8{margin-left:66.66667%}.col-lg-offset-9{margin-left:75%}.col-lg-offset-10{margin-left:83.33333%}.col-lg-offset-11{margin-left:91.66667%}.col-lg-offset-12{margin-left:100%}}@media (min-width: 1200px){.col-xl-1{-webkit-box-flex:0;-webkit-flex:0 0 8.33333%;-ms-flex:0 0 8.33333%;flex:0 0 8.33333%;max-width:8.33333%}.col-xl-2{-webkit-box-flex:0;-webkit-flex:0 0 16.66667%;-ms-flex:0 0 16.66667%;flex:0 0 16.66667%;max-width:16.66667%}.col-xl-3{-webkit-box-flex:0;-webkit-flex:0 0 25%;-ms-flex:0 0 25%;flex:0 0 25%;max-width:25%}.col-xl-4{-webkit-box-flex:0;-webkit-flex:0 0 33.33333%;-ms-flex:0 0 33.33333%;flex:0 0 33.33333%;max-width:33.33333%}.col-xl-5{-webkit-box-flex:0;-webkit-flex:0 0 41.66667%;-ms-flex:0 0 41.66667%;flex:0 0 41.66667%;max-width:41.66667%}.col-xl-6{-webkit-box-flex:0;-webkit-flex:0 0 50%;-ms-flex:0 0 50%;flex:0 0 50%;max-width:50%}.col-xl-7{-webkit-box-flex:0;-webkit-flex:0 0 58.33333%;-ms-flex:0 0 58.33333%;flex:0 0 58.33333%;max-width:58.33333%}.col-xl-8{-webkit-box-flex:0;-webkit-flex:0 0 66.66667%;-ms-flex:0 0 66.66667%;flex:0 0 66.66667%;max-width:66.66667%}.col-xl-9{-webkit-box-flex:0;-webkit-flex:0 0 75%;-ms-flex:0 0 75%;flex:0 0 75%;max-width:75%}.col-xl-10{-webkit-box-flex:0;-webkit-flex:0 0 83.33333%;-ms-flex:0 0 83.33333%;flex:0 0 83.33333%;max-width:83.33333%}.col-xl-11{-webkit-box-flex:0;-webkit-flex:0 0 91.66667%;-ms-flex:0 0 91.66667%;flex:0 0 91.66667%;max-width:91.66667%}.col-xl-12{-webkit-box-flex:0;-webkit-flex:0 0 100%;-ms-flex:0 0 100%;flex:0 0 100%;max-width:100%}.col-xl-pull-0{right:auto}.col-xl-pull-1{right:8.33333%}.col-xl-pull-2{right:16.66667%}.col-xl-pull-3{right:25%}.col-xl-pull-4{right:33.33333%}.col-xl-pull-5{right:41.66667%}.col-xl-pull-6{right:50%}.col-xl-pull-7{right:58.33333%}.col-xl-pull-8{right:66.66667%}.col-xl-pull-9{right:75%}.col-xl-pull-10{right:83.33333%}.col-xl-pull-11{right:91.66667%}.col-xl-pull-12{right:100%}.col-xl-push-0{left:auto}.col-xl-push-1{left:8.33333%}.col-xl-push-2{left:16.66667%}.col-xl-push-3{left:25%}.col-xl-push-4{left:33.33333%}.col-xl-push-5{left:41.66667%}.col-xl-push-6{left:50%}.col-xl-push-7{left:58.33333%}.col-xl-push-8{left:66.66667%}.col-xl-push-9{left:75%}.col-xl-push-10{left:83.33333%}.col-xl-push-11{left:91.66667%}.col-xl-push-12{left:100%}.col-xl-offset-0{margin-left:0%}.col-xl-offset-1{margin-left:8.33333%}.col-xl-offset-2{margin-left:16.66667%}.col-xl-offset-3{margin-left:25%}.col-xl-offset-4{margin-left:33.33333%}.col-xl-offset-5{margin-left:41.66667%}.col-xl-offset-6{margin-left:50%}.col-xl-offset-7{margin-left:58.33333%}.col-xl-offset-8{margin-left:66.66667%}.col-xl-offset-9{margin-left:75%}.col-xl-offset-10{margin-left:83.33333%}.col-xl-offset-11{margin-left:91.66667%}.col-xl-offset-12{margin-left:100%}}.col-xs-first{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.col-xs-last{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}@media (min-width: 544px){.col-sm-first{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.col-sm-last{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}}@media (min-width: 768px){.col-md-first{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.col-md-last{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}}@media (min-width: 992px){.col-lg-first{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.col-lg-last{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}}@media (min-width: 1200px){.col-xl-first{-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1}.col-xl-last{-webkit-box-ordinal-group:2;-webkit-order:1;-ms-flex-order:1;order:1}}.row-xs-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;-ms-grid-row-align:flex-start;align-items:flex-start}.row-xs-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.row-xs-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;-ms-grid-row-align:flex-end;align-items:flex-end}@media (min-width: 544px){.row-sm-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;-ms-grid-row-align:flex-start;align-items:flex-start}.row-sm-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.row-sm-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;-ms-grid-row-align:flex-end;align-items:flex-end}}@media (min-width: 768px){.row-md-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;-ms-grid-row-align:flex-start;align-items:flex-start}.row-md-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.row-md-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;-ms-grid-row-align:flex-end;align-items:flex-end}}@media (min-width: 992px){.row-lg-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;-ms-grid-row-align:flex-start;align-items:flex-start}.row-lg-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.row-lg-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;-ms-grid-row-align:flex-end;align-items:flex-end}}@media (min-width: 1200px){.row-xl-top{-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;-ms-grid-row-align:flex-start;align-items:flex-start}.row-xl-center{-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;-ms-grid-row-align:center;align-items:center}.row-xl-bottom{-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;-ms-grid-row-align:flex-end;align-items:flex-end}}.col-xs-top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.col-xs-center{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.col-xs-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}@media (min-width: 544px){.col-sm-top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.col-sm-center{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.col-sm-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}}@media (min-width: 768px){.col-md-top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.col-md-center{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.col-md-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}}@media (min-width: 992px){.col-lg-top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.col-lg-center{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.col-lg-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}}@media (min-width: 1200px){.col-xl-top{-webkit-align-self:flex-start;-ms-flex-item-align:start;align-self:flex-start}.col-xl-center{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.col-xl-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}}.row{width:100%}.row.force-fit{margin-left:0;margin-right:0}
-
-.img-fluid{display:block;max-width:100%;height:auto}.img-rounded{border-radius:.3rem}.img-thumbnail{padding:.25rem;line-height:1.5;background-color:#fff;border:1px solid #ddd;border-radius:.25rem;-webkit-transition:all .2s ease-in-out;transition:all .2s ease-in-out;display:inline-block;max-width:100%;height:auto}.img-circle{border-radius:50%}.figure{display:inline-block}.figure-img{margin-bottom:.5rem;line-height:1}.figure-caption{font-size:90%;color:#eee}.alert-icon{display:inline-block;height:16px;width:16px;padding:0}.alert-icon.icon-danger{background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%27Layer_1%27%20data-name%3D%27Layer%201%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2016%2016%27%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23c92100%3B%7D.cls-2%7Bfill%3A%23c72627%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Ctitle%3Eic_error_red_16x%3C%2Ftitle%3E%3Cpath%20class%3D%27cls-1%27%20d%3D%27M8%2C1.3A6.7%2C6.7%2C0%2C1%2C1%2C1.3%2C8%2C6.71%2C6.71%2C0%2C0%2C1%2C8%2C1.3M8%2C0a8%2C8%2C0%2C1%2C0%2C8%2C8A8%2C8%2C0%2C0%2C0%2C8%2C0H8Z%27%2F%3E%3Crect%20class%3D%27cls-2%27%20x%3D%277%27%20y%3D%2710%27%20width%3D%272%27%20height%3D%272%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%2710%27%20width%3D%272%27%20height%3D%272%27%2F%3E%3Crect%20class%3D%27cls-2%27%20x%3D%277%27%20y%3D%273%27%20width%3D%272%27%20height%3D%276%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%273%27%20width%3D%272%27%20height%3D%276%27%2F%3E%3C%2Fsvg%3E")}.alert-icon.icon-danger-white{background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%27Layer_1%27%20data-name%3D%27Layer%201%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2016%2016%27%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23fff%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Ctitle%3Eic_error_white_16x-04%3C%2Ftitle%3E%3Cpath%20class%3D%27cls-1%27%20d%3D%27M8%2C1.3A6.7%2C6.7%2C0%2C1%2C1%2C1.3%2C8%2C6.71%2C6.71%2C0%2C0%2C1%2C8%2C1.3M8%2C0a8%2C8%2C0%2C1%2C0%2C8%2C8A8%2C8%2C0%2C0%2C0%2C8%2C0H8Z%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%2710%27%20width%3D%272%27%20height%3D%272%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%273%27%20width%3D%272%27%20height%3D%276%27%2F%3E%3C%2Fsvg%3E")}.alert-icon.icon-warning{background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%27Layer_1%27%20data-name%3D%27Layer%201%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2016%2016%27%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23575757%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Ctitle%3Eic_warning_16x5%3C%2Ftitle%3E%3Cpath%20class%3D%27cls-1%27%20d%3D%27M8.79%2C1.2l6%2C11.1v1.24l-0.3.25H1.67L1.2%2C13.44V12.3l6-11.1H8.79M9.5%2C0h-3L0%2C12v2l1.26%2C1H14.94L16%2C14.1V12L9.5%2C0h0Z%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%275%27%20width%3D%272%27%20height%3D%274%27%2F%3E%3Crect%20class%3D%27cls-1%27%20x%3D%277%27%20y%3D%2710%27%20width%3D%272%27%20height%3D%272%27%2F%3E%3C%2Fsvg%3E")}.alert-icon.icon-success{background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%27Layer_1%27%20data-name%3D%27Layer%201%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2016%2016%27%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23318700%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Ctitle%3Eic_success_16x%3C%2Ftitle%3E%3Cpolygon%20class%3D%27cls-1%27%20points%3D%275.88%2014%200%208.32%201.36%206.92%205.83%2011.24%2014.6%202.16%2016%203.51%205.88%2014%27%2F%3E%3C%2Fsvg%3E")}.alert-icon.icon-info{background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%27Layer_1%27%20data-name%3D%27Layer%201%27%20xmlns%3D%27http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%27%20viewBox%3D%270%200%2016%2016%27%3E%3Cdefs%3E%3Cstyle%3E.cls-1%7Bfill%3A%23007cbb%3Bfill-rule%3Aevenodd%3B%7D%3C%2Fstyle%3E%3C%2Fdefs%3E%3Ctitle%3Eic_info_16x%3C%2Ftitle%3E%3Cpath%20class%3D%27cls-1%27%20d%3D%27M5%2C6s2.32-.37%2C3.7-0.48c0.44%2C0%2C1.73.48%2C1.43%2C1.13s-2.11%2C6.43-2.11%2C6.43a2.48%2C2.48%2C0%2C0%2C0-.17.72%2C0.38%2C0.38%2C0%2C0%2C0%2C.09.27%2C0.31%2C0.31%2C0%2C0%2C0%2C.24.09%2C1.52%2C1.52%2C0%2C0%2C0%2C.86-0.43%2C8.6%2C8.6%2C0%2C0%2C0%2C1.72-2l0.89%2C0.42q-2.24%2C3.4-4.92%2C3.4a2.12%2C2.12%2C0%2C0%2C1-1.43-.45%2C1.55%2C1.55%2C0%2C0%2C1-.53-1.24%2C3.27%2C3.27%2C0%2C0%2C1%2C.16-1S7%2C7.1%2C7%2C7a1.08%2C1.08%2C0%2C0%2C0-.58-0.48%2C7.79%2C7.79%2C0%2C0%2C0-1.73.2Z%27%2F%3E%3Cpath%20class%3D%27cls-1%27%20d%3D%27M9%2C0.57a1.83%2C1.83%2C0%2C0%2C1%2C1.34.56%2C1.83%2C1.83%2C0%2C0%2C1%2C.56%2C1.34%2C1.83%2C1.83%2C0%2C0%2C1-.56%2C1.34%2C1.9%2C1.9%2C0%2C0%2C1-2.69%2C0%2C1.83%2C1.83%2C0%2C0%2C1-.56-1.34%2C1.83%2C1.83%2C0%2C0%2C1%2C.56-1.34A1.83%2C1.83%2C0%2C0%2C1%2C9%2C.57%27%2F%3E%3C%2Fsvg%3E")}
-
-.label,a.label{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;font-size:11px;padding:0 12px;border-radius:12px;border:1px solid #747474;line-height:normal;height:21px;margin:0 6px 0 0;white-space:nowrap;color:#565656}.label:visited,a.label:visited{color:#565656}.label:focus,.label:hover,.label:active,a.label:focus,a.label:hover,a.label:active{text-decoration:none}.label.clickable:hover,.label.clickable:active,a.label.clickable:hover,a.label.clickable:active{background:#eee}.label.clickable:active,a.label.clickable:active{padding-top:1px;box-shadow:0 1px 0 0 #747474 inset}.label.clickable:active>.badge,a.label.clickable:active>.badge{padding-top:1px}.label.label-gray,.label.label-1,a.label.label-gray,a.label.label-1{border:1px solid #747474}.label.clickable.label-gray:hover,.label.clickable.label-gray:active,a.label.clickable.label-gray:hover,a.label.clickable.label-gray:active{text-decoration:none;background:#eee}.label.clickable.label-gray:active,a.label.clickable.label-gray:active{padding-top:1px;box-shadow:0 1px 0 0 #747474 inset}.label.clickable.label-gray:active>.badge,a.label.clickable.label-gray:active>.badge{padding-top:1px}.label.label-gray>.badge,a.label.label-gray>.badge{background:#747474;color:#fff}.label.label-purple,.label.label-2,a.label.label-purple,a.label.label-2{border:1px solid #9460b8}.label.clickable.label-purple:hover,.label.clickable.label-purple:active,a.label.clickable.label-purple:hover,a.label.clickable.label-purple:active{text-decoration:none;background:#eee}.label.clickable.label-purple:active,a.label.clickable.label-purple:active{padding-top:1px;box-shadow:0 1px 0 0 #9460b8 inset}.label.clickable.label-purple:active>.badge,a.label.clickable.label-purple:active>.badge{padding-top:1px}.label.label-purple>.badge,a.label.label-purple>.badge{background:#9460b8;color:#fff}.label.label-blue,.label.label-3,a.label.label-blue,a.label.label-3{border:1px solid #004a70}.label.clickable.label-blue:hover,.label.clickable.label-blue:active,a.label.clickable.label-blue:hover,a.label.clickable.label-blue:active{text-decoration:none;background:#eee}.label.clickable.label-blue:active,a.label.clickable.label-blue:active{padding-top:1px;box-shadow:0 1px 0 0 #004a70 inset}.label.clickable.label-blue:active>.badge,a.label.clickable.label-blue:active>.badge{padding-top:1px}.label.label-blue>.badge,a.label.label-blue>.badge{background:#004a70;color:#fff}.label.label-orange,.label.label-4,a.label.label-orange,a.label.label-4{border:1px solid #eb8d00}.label.clickable.label-orange:hover,.label.clickable.label-orange:active,a.label.clickable.label-orange:hover,a.label.clickable.label-orange:active{text-decoration:none;background:#eee}.label.clickable.label-orange:active,a.label.clickable.label-orange:active{padding-top:1px;box-shadow:0 1px 0 0 #eb8d00 inset}.label.clickable.label-orange:active>.badge,a.label.clickable.label-orange:active>.badge{padding-top:1px}.label.label-orange>.badge,a.label.label-orange>.badge{background:#eb8d00;color:#000}.label.label-light-blue,.label.label-5,a.label.label-light-blue,a.label.label-5{border:1px solid #89cbdf}.label.clickable.label-light-blue:hover,.label.clickable.label-light-blue:active,a.label.clickable.label-light-blue:hover,a.label.clickable.label-light-blue:active{text-decoration:none;background:#eee}.label.clickable.label-light-blue:active,a.label.clickable.label-light-blue:active{padding-top:1px;box-shadow:0 1px 0 0 #89cbdf inset}.label.clickable.label-light-blue:active>.badge,a.label.clickable.label-light-blue:active>.badge{padding-top:1px}.label.label-light-blue>.badge,a.label.label-light-blue>.badge{background:#89cbdf;color:#000}.label.label-info,a.label.label-info{background:#e1f1f6;color:#004a70;border:1px solid #49afd9}.label.label-success,a.label.label-success{background:#dff0d0;color:#266900;border:1px solid #60b515}.label.label-warning,a.label.label-warning{background:#feecb5;color:#313131;border:1px solid #efd603}.label.label-danger,a.label.label-danger{background:#f5dbd9;color:#a32100;border:1px solid #ebafa6}.label>.badge,a.label>.badge{margin:0 -9px 0 6px}.badge{display:-webkit-inline-box;display:-webkit-inline-flex;display:-ms-inline-flexbox;display:inline-flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;min-width:15px;background:#747474;height:15px;line-height:normal;border-radius:10px;font-size:10px;padding:0 4px;margin-right:6px;white-space:nowrap;text-align:center;color:#fff}.badge:visited{color:#fff}.badge.badge-gray,.badge.badge-1{background:#747474;color:#fff}.badge.badge-purple,.badge.badge-2{background:#9460b8;color:#fff}.badge.badge-blue,.badge.badge-3{background:#004a70;color:#fff}.badge.badge-orange,.badge.badge-4{background:#eb8d00;color:#000}.badge.badge-light-blue,.badge.badge-5{background:#89cbdf;color:#000}.badge.badge-info{background:#007cbb;color:#fff}.badge.badge-success{background:#62a420;color:#000}.badge.badge-danger{background:#c92100;color:#fff}.badge.badge-warning{background:#efd603;color:#000}
-
-.clearfix::after{content:"";display:table;clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-xs-left{float:left !important}.pull-xs-right{float:right !important}.pull-xs-none{float:none !important}@media (min-width: 544px){.pull-sm-left{float:left !important}.pull-sm-right{float:right !important}.pull-sm-none{float:none !important}}@media (min-width: 768px){.pull-md-left{float:left !important}.pull-md-right{float:right !important}.pull-md-none{float:none !important}}@media (min-width: 992px){.pull-lg-left{float:left !important}.pull-lg-right{float:right !important}.pull-lg-none{float:none !important}}@media (min-width: 1200px){.pull-xl-left{float:left !important}.pull-xl-right{float:right !important}.pull-xl-none{float:none !important}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.invisible{visibility:hidden !important}.text-hide{font:"0/0" a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-justify{text-align:justify !important}.text-nowrap{white-space:nowrap !important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-xs-left{text-align:left !important}.text-xs-right{text-align:right !important}.text-xs-center{text-align:center !important}@media (min-width: 544px){.text-sm-left{text-align:left !important}.text-sm-right{text-align:right !important}.text-sm-center{text-align:center !important}}@media (min-width: 768px){.text-md-left{text-align:left !important}.text-md-right{text-align:right !important}.text-md-center{text-align:center !important}}@media (min-width: 992px){.text-lg-left{text-align:left !important}.text-lg-right{text-align:right !important}.text-lg-center{text-align:center !important}}@media (min-width: 1200px){.text-xl-left{text-align:left !important}.text-xl-right{text-align:right !important}.text-xl-center{text-align:center !important}}.text-lowercase{text-transform:lowercase !important}.text-uppercase{text-transform:uppercase !important}.text-capitalize{text-transform:capitalize !important}.font-weight-normal{font-weight:normal}.font-weight-bold{font-weight:bold}.font-italic{font-style:italic}.text-muted{color:#818a91}.text-primary{color:#0275d8 !important}a.text-primary:focus,a.text-primary:hover{color:#025aa5}.text-success{color:#5cb85c !important}a.text-success:focus,a.text-success:hover{color:#449d44}.text-info{color:#5bc0de !important}a.text-info:focus,a.text-info:hover{color:#31b0d5}.text-warning{color:#f0ad4e !important}a.text-warning:focus,a.text-warning:hover{color:#ec971f}.text-danger{color:#d9534f !important}a.text-danger:focus,a.text-danger:hover{color:#c9302c}.bg-inverse{color:#fafafa;background-color:#747474}.bg-faded{background-color:#fff}.bg-primary{color:#fff !important;background-color:#0275d8 !important}a.bg-primary:focus,a.bg-primary:hover{background-color:#025aa5}.bg-success{color:#fff !important;background-color:#5cb85c !important}a.bg-success:focus,a.bg-success:hover{background-color:#449d44}.bg-info{color:#fff !important;background-color:#5bc0de !important}a.bg-info:focus,a.bg-info:hover{background-color:#31b0d5}.bg-warning{color:#fff !important;background-color:#f0ad4e !important}a.bg-warning:focus,a.bg-warning:hover{background-color:#ec971f}.bg-danger{color:#fff !important;background-color:#d9534f !important}a.bg-danger:focus,a.bg-danger:hover{background-color:#c9302c}.hidden-xs-up{display:none !important}@media (max-width: 543px){.hidden-xs-down{display:none !important}}@media (min-width: 544px){.hidden-sm-up{display:none !important}}@media (max-width: 767px){.hidden-sm-down{display:none !important}}@media (min-width: 768px){.hidden-md-up{display:none !important}}@media (max-width: 991px){.hidden-md-down{display:none !important}}@media (min-width: 992px){.hidden-lg-up{display:none !important}}@media (max-width: 1199px){.hidden-lg-down{display:none !important}}@media (min-width: 1200px){.hidden-xl-up{display:none !important}}.hidden-xl-down{display:none !important}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}.m-x-auto{margin-right:auto !important;margin-left:auto !important}.m-a-0{margin:0 0 !important}.m-t-0{margin-top:0 !important}.m-r-0{margin-right:0 !important}.m-b-0{margin-bottom:0 !important}.m-l-0{margin-left:0 !important}.m-x-0{margin-right:0 !important;margin-left:0 !important}.m-y-0{margin-top:0 !important;margin-bottom:0 !important}.m-a-1{margin:1rem 1rem !important}.m-t-1{margin-top:1rem !important}.m-r-1{margin-right:1rem !important}.m-b-1{margin-bottom:1rem !important}.m-l-1{margin-left:1rem !important}.m-x-1{margin-right:1rem !important;margin-left:1rem !important}.m-y-1{margin-top:1rem !important;margin-bottom:1rem !important}.m-a-2{margin:1.5rem 1.5rem !important}.m-t-2{margin-top:1.5rem !important}.m-r-2{margin-right:1.5rem !important}.m-b-2{margin-bottom:1.5rem !important}.m-l-2{margin-left:1.5rem !important}.m-x-2{margin-right:1.5rem !important;margin-left:1.5rem !important}.m-y-2{margin-top:1.5rem !important;margin-bottom:1.5rem !important}.m-a-3{margin:3rem 3rem !important}.m-t-3{margin-top:3rem !important}.m-r-3{margin-right:3rem !important}.m-b-3{margin-bottom:3rem !important}.m-l-3{margin-left:3rem !important}.m-x-3{margin-right:3rem !important;margin-left:3rem !important}.m-y-3{margin-top:3rem !important;margin-bottom:3rem !important}.p-a-0{padding:0 0 !important}.p-t-0{padding-top:0 !important}.p-r-0{padding-right:0 !important}.p-b-0{padding-bottom:0 !important}.p-l-0{padding-left:0 !important}.p-x-0{padding-right:0 !important;padding-left:0 !important}.p-y-0{padding-top:0 !important;padding-bottom:0 !important}.p-a-1{padding:1rem 1rem !important}.p-t-1{padding-top:1rem !important}.p-r-1{padding-right:1rem !important}.p-b-1{padding-bottom:1rem !important}.p-l-1{padding-left:1rem !important}.p-x-1{padding-right:1rem !important;padding-left:1rem !important}.p-y-1{padding-top:1rem !important;padding-bottom:1rem !important}.p-a-2{padding:1.5rem 1.5rem !important}.p-t-2{padding-top:1.5rem !important}.p-r-2{padding-right:1.5rem !important}.p-b-2{padding-bottom:1.5rem !important}.p-l-2{padding-left:1.5rem !important}.p-x-2{padding-right:1.5rem !important;padding-left:1.5rem !important}.p-y-2{padding-top:1.5rem !important;padding-bottom:1.5rem !important}.p-a-3{padding:3rem 3rem !important}.p-t-3{padding-top:3rem !important}.p-r-3{padding-right:3rem !important}.p-b-3{padding-bottom:3rem !important}.p-l-3{padding-left:3rem !important}.p-x-3{padding-right:3rem !important;padding-left:3rem !important}.p-y-3{padding-top:3rem !important;padding-bottom:3rem !important}.pos-f-t{position:fixed;top:0;right:0;left:0;z-index:1030}h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}@media screen and (min-width: 544px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 768px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 992px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 1200px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;margin-top:0 !important}@media screen and (min-width: 544px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}@media screen and (min-width: 544px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 768px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 992px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 1200px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}body .text-light{font-weight:200}body .text-thin{font-weight:100}html{color:#565656;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif,"Avenir Next","Helvetica Neue",Arial,sans-serif;font-size:16px}ul.list-unstyled{padding-left:0;margin-left:0;list-style:none}ul,ol{list-style-position:inside;margin-left:0;margin-top:0;margin-bottom:0;padding-left:0}ul.list,ol.list{list-style-position:outside;margin-left:1.1em}ul:not(.list-unstyled)>li>ul.list-unstyled,ol>li>ul.list-unstyled{margin-left:1.1em}li>ul{margin-top:0;margin-left:1.1em}ul.list-group{margin-top:0}ul.list-spacer,ol.list-spacer{margin-top:24px}
-
-.list-group{padding-left:0;margin-bottom:0}.list-group-item{position:relative;display:block;padding:.75rem 1.25rem;margin-bottom:-1px;background-color:#fff;border:1px solid #ddd}.list-group-item:first-child{border-top-right-radius:.25rem;border-top-left-radius:.25rem}.list-group-item:last-child{margin-bottom:0;border-bottom-right-radius:.25rem;border-bottom-left-radius:.25rem}.list-group-flush .list-group-item{border-width:1px 0;border-radius:0}.list-group-flush:first-child .list-group-item:first-child{border-top:0}.list-group-flush:last-child .list-group-item:last-child{border-bottom:0}a.list-group-item,button.list-group-item{width:100%;color:#555;text-align:inherit}a.list-group-item .list-group-item-heading,button.list-group-item .list-group-item-heading{color:#333}a.list-group-item:focus,a.list-group-item:hover,button.list-group-item:focus,button.list-group-item:hover{color:#555;text-decoration:none;background-color:#f5f5f5}.list-group-item.disabled,.list-group-item.disabled:focus,.list-group-item.disabled:hover{color:#818a91;cursor:not-allowed;background-color:#eceeef}.list-group-item.disabled .list-group-item-heading,.list-group-item.disabled:focus .list-group-item-heading,.list-group-item.disabled:hover .list-group-item-heading{color:inherit}.list-group-item.disabled .list-group-item-text,.list-group-item.disabled:focus .list-group-item-text,.list-group-item.disabled:hover .list-group-item-text{color:#818a91}.list-group-item.active,.list-group-item.active:focus,.list-group-item.active:hover{z-index:2;color:#fff;background-color:#0275d8;border-color:#0275d8}.list-group-item.active .list-group-item-heading,.list-group-item.active .list-group-item-heading>small,.list-group-item.active .list-group-item-heading>.small,.list-group-item.active:focus .list-group-item-heading,.list-group-item.active:focus .list-group-item-heading>small,.list-group-item.active:focus .list-group-item-heading>.small,.list-group-item.active:hover .list-group-item-heading,.list-group-item.active:hover .list-group-item-heading>small,.list-group-item.active:hover .list-group-item-heading>.small{color:inherit}.list-group-item.active .list-group-item-text,.list-group-item.active:focus .list-group-item-text,.list-group-item.active:hover .list-group-item-text{color:#a8d6fe}.list-group-item-success{color:#3c763d;background-color:#dff0d8}a.list-group-item-success,button.list-group-item-success{color:#3c763d}a.list-group-item-success .list-group-item-heading,button.list-group-item-success .list-group-item-heading{color:inherit}a.list-group-item-success:focus,a.list-group-item-success:hover,button.list-group-item-success:focus,button.list-group-item-success:hover{color:#3c763d;background-color:#d0e9c6}a.list-group-item-success.active,a.list-group-item-success.active:focus,a.list-group-item-success.active:hover,button.list-group-item-success.active,button.list-group-item-success.active:focus,button.list-group-item-success.active:hover{color:#fff;background-color:#3c763d;border-color:#3c763d}.list-group-item-info{color:#31708f;background-color:#d9edf7}a.list-group-item-info,button.list-group-item-info{color:#31708f}a.list-group-item-info .list-group-item-heading,button.list-group-item-info .list-group-item-heading{color:inherit}a.list-group-item-info:focus,a.list-group-item-info:hover,button.list-group-item-info:focus,button.list-group-item-info:hover{color:#31708f;background-color:#c4e3f3}a.list-group-item-info.active,a.list-group-item-info.active:focus,a.list-group-item-info.active:hover,button.list-group-item-info.active,button.list-group-item-info.active:focus,button.list-group-item-info.active:hover{color:#fff;background-color:#31708f;border-color:#31708f}.list-group-item-warning{color:#8a6d3b;background-color:#fcf8e3}a.list-group-item-warning,button.list-group-item-warning{color:#8a6d3b}a.list-group-item-warning .list-group-item-heading,button.list-group-item-warning .list-group-item-heading{color:inherit}a.list-group-item-warning:focus,a.list-group-item-warning:hover,button.list-group-item-warning:focus,button.list-group-item-warning:hover{color:#8a6d3b;background-color:#faf2cc}a.list-group-item-warning.active,a.list-group-item-warning.active:focus,a.list-group-item-warning.active:hover,button.list-group-item-warning.active,button.list-group-item-warning.active:focus,button.list-group-item-warning.active:hover{color:#fff;background-color:#8a6d3b;border-color:#8a6d3b}.list-group-item-danger{color:#a94442;background-color:#f2dede}a.list-group-item-danger,button.list-group-item-danger{color:#a94442}a.list-group-item-danger .list-group-item-heading,button.list-group-item-danger .list-group-item-heading{color:inherit}a.list-group-item-danger:focus,a.list-group-item-danger:hover,button.list-group-item-danger:focus,button.list-group-item-danger:hover{color:#a94442;background-color:#ebcccc}a.list-group-item-danger.active,a.list-group-item-danger.active:focus,a.list-group-item-danger.active:hover,button.list-group-item-danger.active,button.list-group-item-danger.active:focus,button.list-group-item-danger.active:hover{color:#fff;background-color:#a94442;border-color:#a94442}.list-group-item-heading{margin-top:0;margin-bottom:5px}.list-group-item-text{margin-bottom:0;line-height:1.3}
-
-.login{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;width:456px;height:auto;min-height:100vh;padding:24px 0 24px 72px;background:#313131;margin-left:11%}.login .title,.login .subtitle{margin:0 24px 0 0}.login .title{font-size:30px;color:#fff;line-height:36px}.login .trademark{font-size:26px}.login .subtitle{font-size:20px;color:#fff;line-height:36px}.login .login-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;padding:0;margin-right:72px}.login .login-group .username,.login .login-group .password{color:#fff;border-color:#fff;-webkit-transition:border-bottom-color 0.2s ease;transition:border-bottom-color 0.2s ease}.login .login-group .username:focus,.login .login-group .password:focus{border-bottom-color:#0094d2}.login .login-group .username{margin:72px 0 0 0}.login .login-group .password{margin:36px 0 0 0}.login .login-group .checkbox{color:rgba(255,255,255,0.4);margin-top:24px;color:#fff}.login .login-group .checkbox input[type="checkbox"]+label::before{background:transparent;border-color:#fff}.login .login-group .checkbox input[type="checkbox"]:checked+label::before{background-color:#0094d2}.login .login-group .error{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:start;-webkit-align-items:flex-start;-ms-flex-align:start;align-items:flex-start;margin:12px 0 0 0;font-size:14px;padding:9px 12px;background:#c92100;color:white;border-radius:3px;line-height:18px;visibility:hidden}.login .login-group .error .alert-icon{min-height:16px;min-width:16px;margin:0 6px 0 0}.login .login-group .error.active{visibility:visible}.login .login-group .btn{margin:36px 0 0 0}@media screen and (max-width: 768px){.login{width:100%;margin-left:0;padding-left:120px}.login .title,.login .subtitle{margin-right:96px}.login .login-group{margin-right:120px}}@media screen and (max-width: 544px){.login{width:100%;margin-left:0;padding-left:72px}.login .title,.login .subtitle{margin-right:24px}.login .login-group{margin-right:72px}}
-
-.main-container{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:100vh;padding-top:60px;background:#fafafa}.main-container.nav-top-padding{padding-top:96px}.main-container.nav-top-padding>.content-area{padding-top:0}.main-container .content-area{-webkit-box-flex:1;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;overflow-y:scroll;padding:12px 36px 24px 24px}.main-container .sidenav{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;-webkit-box-ordinal-group:0;-webkit-order:-1;-ms-flex-order:-1;order:-1;overflow:hidden}@media print{.main-container{height:auto}}body.no-scrolling .content-area{overflow:hidden}body.no-scrolling{overflow:hidden}
-
-.media{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;margin-bottom:1rem}.media-body{-webkit-box-flex:1;-webkit-flex:1;-ms-flex:1;flex:1}.media-middle{-webkit-align-self:center;-ms-flex-item-align:center;align-self:center}.media-bottom{-webkit-align-self:flex-end;-ms-flex-item-align:end;align-self:flex-end}.media-object{display:block}.media-object.img-thumbnail{max-width:none}.media-right{padding-left:10px}.media-left{padding-right:10px}.media-heading{margin-top:0;margin-bottom:5px}.media-list{padding-left:0;list-style:none}
-
-.modal-dialog .modal-content .modal-body>:first-child{margin-top:0}.modal-dialog .modal-content .modal-body>:last-child{margin-bottom:0}.modal-dialog .modal-content .modal-body>:first-child{margin-top:0}.modal-dialog .modal-content .modal-body>:last-child{margin-bottom:0}.modal{position:fixed;top:0;bottom:0;right:0;left:0;z-index:1050;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column;-webkit-box-pack:center;-webkit-justify-content:center;-ms-flex-pack:center;justify-content:center;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;padding:48px}@media screen and (max-width: 544px){.modal{padding:12px}}.modal-dialog{position:relative;z-index:1050;width:576px;max-width:100%}.modal-dialog.modal-sm{width:288px}.modal-dialog.modal-lg{width:864px}.modal-dialog .modal-content{padding:24px 24px 24px 24px;background-color:#fff;border-radius:3px;box-shadow:0 1px 2px 2px rgba(0,0,0,0.2)}.modal-dialog .modal-content .modal-header{border-bottom:none;padding:0 0 24px 0}.modal-dialog .modal-content .modal-header .modal-title{margin:0;padding:0;font-size:22px;font-weight:200}.modal-dialog .modal-content .modal-header .close{margin-top:0;font-size:28px}.modal-dialog .modal-content .modal-body{max-height:55vh;overflow-y:auto}.modal-dialog .modal-content .modal-footer{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end;padding:24px 0 0 0}.modal-dialog .modal-content .modal-footer .btn{margin:0 0 0 12px}@media screen and (max-width: 544px){.modal-dialog .modal-content{padding:12px 0 12px 24px}.modal-dialog .modal-content .modal-header{padding:0 24px 12px 0}.modal-dialog .modal-content .modal-footer{padding:12px 24px 0 0}}.modal-backdrop{position:fixed;top:0;bottom:0;right:0;left:0;background-color:#313131;opacity:.85;z-index:1040}.modal-backdrop.fade{opacity:0}.modal-backdrop.fade.in{opacity:.85}
-
-.main-nav header .header-nav .nav-link .nav-icon,.main-nav .header .header-nav .nav-link .nav-icon,.main-nav header .header-nav .nav-link .nav-text,.main-nav .header .header-nav .nav-link .nav-text,.main-nav header .search-box .nav-icon,.main-nav .header .search-box .nav-icon,.main-nav header .settings .nav-link,.main-nav .header .settings .nav-link,.main-nav header .settings .nav-icon,.main-nav .header .settings .nav-icon{color:#fafafa;opacity:0.85}.main-nav header .header-nav .nav-link .nav-icon:hover,.main-nav .header .header-nav .nav-link .nav-icon:hover,.main-nav header .header-nav .nav-link .nav-text:hover,.main-nav .header .header-nav .nav-link .nav-text:hover,.main-nav header .search-box .nav-icon:hover,.main-nav .header .search-box .nav-icon:hover,.main-nav header .settings .nav-link:hover,.main-nav .header .settings .nav-link:hover,.main-nav header .settings .nav-icon:hover,.main-nav .header .settings .nav-icon:hover{opacity:1}.main-nav header .settings,.main-nav .header .settings{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;height:100%}.main-nav{position:fixed;top:0;z-index:1030;width:100%;height:auto}.main-nav a{text-decoration:none;color:#fafafa}.main-nav header,.main-nav .header{background-color:#313131}.main-nav header.header-1,.main-nav .header.header-1{background-color:#313131}.main-nav header.header-2,.main-nav .header.header-2{background-color:#485969}.main-nav header.header-3,.main-nav .header.header-3{background-color:#281336}.main-nav header.header-4,.main-nav .header.header-4{background-color:#006a91}.main-nav header.header-5,.main-nav .header.header-5{background-color:#004a70}.main-nav header.header-6,.main-nav .header.header-6{background-color:#002538}.main-nav header,.main-nav .header{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;padding:0 36px 0 0;height:60px;color:#fafafa;white-space:nowrap}.main-nav header .branding,.main-nav .header .branding{max-width:312px;min-width:276px;height:100%;padding-left:36px;line-height:60px;width:20%}.main-nav header .branding .logo,.main-nav .header .branding .logo{margin-right:6px}.main-nav header .branding .title,.main-nav .header .branding .title{font-size:16px;vertical-align:middle}.main-nav header .divider,.main-nav .header .divider{width:1px;height:100%;background:#fafafa;opacity:0.15}.main-nav header .header-nav .nav-link,.main-nav .header .header-nav .nav-link{display:inline-block}.main-nav header .header-nav .nav-link .nav-icon,.main-nav .header .header-nav .nav-link .nav-icon{font-size:18px;height:60px;width:60px;text-align:center;line-height:60px}.main-nav header .header-nav .nav-link.active,.main-nav .header .header-nav .nav-link.active{background:rgba(255,255,255,0.15);opacity:1}.main-nav header .header-nav .nav-link:active,.main-nav header .header-nav .nav-link:focus,.main-nav header .header-nav .nav-link.active,.main-nav .header .header-nav .nav-link:active,.main-nav .header .header-nav .nav-link:focus,.main-nav .header .header-nav .nav-link.active{outline:none}.main-nav header .header-nav .nav-link.active .nav-icon,.main-nav header .header-nav .nav-link.active .nav-text,.main-nav .header .header-nav .nav-link.active .nav-icon,.main-nav .header .header-nav .nav-link.active .nav-text{opacity:1}.main-nav header .header-nav .nav-link .nav-text,.main-nav .header .header-nav .nav-link .nav-text{padding:0 36px;line-height:60px}.main-nav header .search-box,.main-nav .header .search-box{max-width:360px;margin-left:21px}.main-nav header .search-box input[type="text"],.main-nav .header .search-box input[type="text"]{border:none;width:312px;background:none;margin-left:6px;padding:0}.main-nav header .search-box input[type="text"]:focus,.main-nav header .search-box input[type="text"]:active,.main-nav .header .search-box input[type="text"]:focus,.main-nav .header .search-box input[type="text"]:active{background:none}.main-nav header .search-box .nav-icon,.main-nav .header .search-box .nav-icon{font-size:18px;line-height:60px}.main-nav header .settings,.main-nav .header .settings{-webkit-box-flex:1;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;-webkit-box-pack:end;-webkit-justify-content:flex-end;-ms-flex-pack:end;justify-content:flex-end}.main-nav header .settings .nav-link,.main-nav .header .settings .nav-link{margin-left:12px}.main-nav header .settings .nav-icon,.main-nav .header .settings .nav-icon{font-size:18px;line-height:60px}.sub-nav{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;box-shadow:0 -1px 0 #ccc inset;-webkit-box-pack:justify;-webkit-justify-content:space-between;-ms-flex-pack:justify;justify-content:space-between;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;background-color:#fff}.sub-nav .nav{-webkit-box-flex:1;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;padding-left:36px}.sub-nav aside{-webkit-box-flex:1;-webkit-flex:1 0 auto;-ms-flex:1 0 auto;flex:1 0 auto;padding-right:36px}.sub-nav aside .toggle-switch,.sub-nav aside .dropdown,.sub-nav aside .radio,.sub-nav aside .checkbox,.sub-nav aside .btn{margin-right:0;padding-right:0}ul.nav{list-style-type:none}.nav{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;height:36px;-webkit-box-align:center;-webkit-align-items:center;-ms-flex-align:center;align-items:center;box-shadow:0 -1px 0 #ccc inset;margin:0;width:100%;white-space:nowrap}.nav>*{display:inline-block}.nav .nav-item{display:table;margin-right:24px;height:100%}.nav .nav-item:active{outline:none}.nav .nav-link{display:table-cell;font-family:inherit;font-weight:inherit;color:#747474;font-weight:normal;height:100%;vertical-align:middle;padding:3px 2px;box-shadow:none;line-height:36px}.nav .nav-link:hover,.nav .nav-link.active{box-shadow:0 -3px 0 #0094d2 inset;-webkit-transition:box-shadow 0.2s ease-in;transition:box-shadow 0.2s ease-in;line-height:30px}.nav .nav-link:hover,.nav .nav-link:focus,.nav .nav-link:active,.nav .nav-link.active{text-decoration:none}.nav .nav-link.active{color:#000}
-
-.sidenav{max-width:312px;min-width:276px;width:19.5%;border-right:1px solid #ccc;line-height:24px;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-orient:vertical;-webkit-box-direction:normal;-webkit-flex-direction:column;-ms-flex-direction:column;flex-direction:column}.sidenav .sidenav-header{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;height:48px;padding-left:36px;width:100%;border-bottom:1px solid #ccc}.sidenav .sidenav-header .select{width:100%;font-weight:600;line-height:48px}.sidenav .sidenav-header .select select{padding:0;border:none}.sidenav .sidenav-header .select::after{position:absolute;bottom:.5px;right:24px}.sidenav .sidenav-header .select select:hover{background:none}.sidenav .sidenav-content{-webkit-box-flex:1;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;overflow:hidden;margin-top:12px}.sidenav .sidenav-content:hover{overflow-y:auto}.sidenav .nav-group{position:relative;margin-top:24px;width:100%;font-size:14px}.sidenav .nav-group .nav-list,.sidenav .nav-group label{padding:0 0 0 54px}.sidenav .nav-group .nav-list{list-style:none;margin-top:0}.sidenav .nav-group .nav-list .nav-link{display:inline-block;width:100%;color:inherit;text-decoration:none;cursor:pointer;line-height:16px;padding:4px 0 4px 12px;border-radius:3px 0 0 3px}.sidenav .nav-group .nav-list .nav-link:hover{background:#eee}.sidenav .nav-group label{font-weight:bold}.sidenav .nav-group input[type="checkbox"]{display:none}.sidenav .collapsible label{cursor:pointer;position:relative;display:inline-block;width:100%}.sidenav .collapsible label:after{position:absolute;font-size:16px;font-family:"FontAwesome";color:#9a9a9a;content:"\f107";bottom:1px;left:36px}.sidenav .collapsible input[type="checkbox"]:checked ~ ul{height:0;visibility:hidden}.sidenav .collapsible input[type="checkbox"]:checked ~ label:after{-webkit-transform:rotate(-90deg);-ms-transform:rotate(-90deg);transform:rotate(-90deg)}
-
-.navbar{position:relative;padding:.5rem 1rem}.navbar::after{content:"";display:table;clear:both}@media (min-width: 544px){.navbar{border-radius:.25rem}}.navbar-full{z-index:1000}@media (min-width: 544px){.navbar-full{border-radius:0}}.navbar-fixed-top,.navbar-fixed-bottom{position:fixed;right:0;left:0;z-index:1030}@media (min-width: 544px){.navbar-fixed-top,.navbar-fixed-bottom{border-radius:0}}.navbar-fixed-top{top:0}.navbar-fixed-bottom{bottom:0}.navbar-sticky-top{position:-webkit-sticky;position:sticky;top:0;z-index:1030;width:100%}@media (min-width: 544px){.navbar-sticky-top{border-radius:0}}.navbar-brand{float:left;padding-top:.25rem;padding-bottom:.25rem;margin-right:1rem;font-size:1.25rem}.navbar-brand:focus,.navbar-brand:hover{text-decoration:none}.navbar-brand>img{display:block}.navbar-divider{float:left;width:1px;padding-top:.425rem;padding-bottom:.425rem;margin-right:1rem;margin-left:1rem;overflow:hidden}.navbar-divider::before{content:"\00a0"}.navbar-toggler{padding:.5rem .75rem;font-size:1.25rem;line-height:1;background:none;border:1px solid transparent;border-radius:.25rem}.navbar-toggler:focus,.navbar-toggler:hover{text-decoration:none}@media (min-width: 544px){.navbar-toggleable-xs{display:block !important}}@media (min-width: 768px){.navbar-toggleable-sm{display:block !important}}@media (min-width: 992px){.navbar-toggleable-md{display:block !important}}.navbar-nav .nav-item{float:left}.navbar-nav .nav-link{display:block;padding-top:.425rem;padding-bottom:.425rem}.navbar-nav .nav-link+.nav-link{margin-left:1rem}.navbar-nav .nav-item+.nav-item{margin-left:1rem}.navbar-light .navbar-brand{color:rgba(0,0,0,0.8)}.navbar-light .navbar-brand:focus,.navbar-light .navbar-brand:hover{color:rgba(0,0,0,0.8)}.navbar-light .navbar-nav .nav-link{color:rgba(0,0,0,0.3)}.navbar-light .navbar-nav .nav-link:focus,.navbar-light .navbar-nav .nav-link:hover{color:rgba(0,0,0,0.6)}.navbar-light .navbar-nav .open>.nav-link,.navbar-light .navbar-nav .open>.nav-link:focus,.navbar-light .navbar-nav .open>.nav-link:hover,.navbar-light .navbar-nav .active>.nav-link,.navbar-light .navbar-nav .active>.nav-link:focus,.navbar-light .navbar-nav .active>.nav-link:hover,.navbar-light .navbar-nav .nav-link.open,.navbar-light .navbar-nav .nav-link.open:focus,.navbar-light .navbar-nav .nav-link.open:hover,.navbar-light .navbar-nav .nav-link.active,.navbar-light .navbar-nav .nav-link.active:focus,.navbar-light .navbar-nav .nav-link.active:hover{color:rgba(0,0,0,0.8)}.navbar-light .navbar-divider{background-color:rgba(0,0,0,0.075)}.navbar-dark .navbar-brand{color:#fff}.navbar-dark .navbar-brand:focus,.navbar-dark .navbar-brand:hover{color:#fff}.navbar-dark .navbar-nav .nav-link{color:rgba(255,255,255,0.5)}.navbar-dark .navbar-nav .nav-link:focus,.navbar-dark .navbar-nav .nav-link:hover{color:rgba(255,255,255,0.75)}.navbar-dark .navbar-nav .open>.nav-link,.navbar-dark .navbar-nav .open>.nav-link:focus,.navbar-dark .navbar-nav .open>.nav-link:hover,.navbar-dark .navbar-nav .active>.nav-link,.navbar-dark .navbar-nav .active>.nav-link:focus,.navbar-dark .navbar-nav .active>.nav-link:hover,.navbar-dark .navbar-nav .nav-link.open,.navbar-dark .navbar-nav .nav-link.open:focus,.navbar-dark .navbar-nav .nav-link.open:hover,.navbar-dark .navbar-nav .nav-link.active,.navbar-dark .navbar-nav .nav-link.active:focus,.navbar-dark .navbar-nav .nav-link.active:hover{color:#fff}.navbar-dark .navbar-divider{background-color:rgba(255,255,255,0.075)}
-
-@-webkit-keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}@keyframes progress-bar-stripes{from{background-position:1rem 0}to{background-position:0 0}}.progress{display:block;width:100%;height:1rem;margin-bottom:1rem}.progress[value]{color:#0074d9;border:0;-webkit-appearance:none;-moz-appearance:none;appearance:none}.progress[value]::-webkit-progress-bar{background-color:#eee;border-radius:.25rem}.progress[value]::-webkit-progress-value::before{content:attr(value)}.progress[value]::-webkit-progress-value{background-color:#0074d9;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.progress[value="100"]::-webkit-progress-value{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}@media screen and (min-width: 0\0){.progress{background-color:#eee;border-radius:.25rem}.progress-bar{display:inline-block;height:1rem;text-indent:-999rem;background-color:#0074d9;border-top-left-radius:.25rem;border-bottom-left-radius:.25rem}.progress[width^="0"]{min-width:2rem;color:#818a91;background-color:transparent;background-image:none}.progress[width="100%"]{border-top-right-radius:.25rem;border-bottom-right-radius:.25rem}}.progress-striped[value]::-webkit-progress-value{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:1rem 1rem}.progress-striped[value]::-moz-progress-bar{background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:1rem 1rem}@media screen and (min-width: 0\0){.progress-bar-striped{background-image:-webkit-linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-image:linear-gradient(45deg, rgba(255,255,255,0.15) 25%, transparent 25%, transparent 50%, rgba(255,255,255,0.15) 50%, rgba(255,255,255,0.15) 75%, transparent 75%, transparent);background-size:1rem 1rem}}.progress-animated[value]::-webkit-progress-value{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}.progress-animated[value]::-moz-progress-bar{animation:progress-bar-stripes 2s linear infinite}@media screen and (min-width: 0\0){.progress-animated .progress-bar-striped{-webkit-animation:progress-bar-stripes 2s linear infinite;animation:progress-bar-stripes 2s linear infinite}}.progress-success[value]::-webkit-progress-value{background-color:#5cb85c}.progress-success[value]::-moz-progress-bar{background-color:#5cb85c}@media screen and (min-width: 0\0){.progress-success .progress-bar{background-color:#5cb85c}}.progress-info[value]::-webkit-progress-value{background-color:#5bc0de}.progress-info[value]::-moz-progress-bar{background-color:#5bc0de}@media screen and (min-width: 0\0){.progress-info .progress-bar{background-color:#5bc0de}}.progress-warning[value]::-webkit-progress-value{background-color:#f0ad4e}.progress-warning[value]::-moz-progress-bar{background-color:#f0ad4e}@media screen and (min-width: 0\0){.progress-warning .progress-bar{background-color:#f0ad4e}}.progress-danger[value]::-webkit-progress-value{background-color:#d9534f}.progress-danger[value]::-moz-progress-bar{background-color:#d9534f}@media screen and (min-width: 0\0){.progress-danger .progress-bar{background-color:#d9534f}}.progress>progress,.progress>progress[value="0"]::-moz-progress-bar,.progress>progress::-webkit-progress-inner-element{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.progress>progress,.progress>progress[value="0"]::-moz-progress-bar,.progress>progress::-webkit-progress-inner-element{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.progress{background-color:transparent;border-radius:0;font-size:inherit;height:2em;margin:0;max-height:16px;min-height:4.8px;overflow:hidden}.progress>progress{background-color:#eee;border:none;color:#007cbb;height:100%;width:100%}.progress>progress::-moz-progress-bar{background-color:#007cbb}.progress>progress[value="0"]::-moz-progress-bar{color:#eee;min-width:2rem;background-color:transparent;background-image:none}.progress>progress::-webkit-progress-bar{background-color:#eee;border-radius:0}.progress>progress::-webkit-progress-value{background-color:#007cbb;-webkit-transition:width 0.23s ease-in;transition:width 0.23s ease-in;border-radius:0}.progress.success>progress{color:#60b515}.progress.success>progress::-webkit-progress-value{background-color:#60b515}.progress.success>progress::-moz-progress-bar{background-color:#60b515}.progress.warning>progress{color:#c92100}.progress.warning>progress::-webkit-progress-value{background-color:#c92100}.progress.warning>progress::-moz-progress-bar{background-color:#c92100}.progress.danger>progress{color:#c92100}.progress.danger>progress::-webkit-progress-value{background-color:#c92100}.progress.danger>progress::-moz-progress-bar{background-color:#c92100}.progress.purple>progress{color:#853fb3}.progress.purple>progress::-webkit-progress-value{background-color:#853fb3}.progress.purple>progress::-moz-progress-bar{background-color:#853fb3}.progress.labeled{position:relative;padding-right:3em}.progress.labeled>span{display:block;font-size:1em;position:absolute;top:50%;right:0;line-height:1em;margin-top:-0.5em;color:#565656}@-webkit-keyframes clr-progress-fade{from{opacity:1}to{opacity:0}}@keyframes clr-progress-fade{from{opacity:1}to{opacity:0}}.progress.progress-fade>progress[value="100"],.progress.progress-fade>progress[value="100"]+span{-webkit-animation:clr-progress-fade 0.3s linear 0.5s forwards;animation:clr-progress-fade 0.3s linear 0.5s forwards}.progress.flash>progress,.progress.flash-danger>progress{-webkit-transition:color .1s ease-out 1s;transition:color .1s ease-out 1s}.progress.flash>progress::-webkit-progress-value,.progress.flash-danger>progress::-webkit-progress-value{-webkit-transition:width 0.23s ease-in,background-color .1s ease-out 0.3s;transition:width 0.23s ease-in,background-color .1s ease-out 0.3s}.progress.flash>progress::-moz-progress-bar,.progress.flash-danger>progress::-moz-progress-bar{-webkit-transition:width 0.23s ease-in,background-color .1s ease-out 0.3s;transition:width 0.23s ease-in,background-color .1s ease-out 0.3s}.progress.flash>progress[value="100"]{color:#60b515}.progress.flash>progress[value="100"]::-webkit-progress-value{background-color:#60b515}.progress.flash>progress[value="100"]::-moz-progress-bar{background-color:#60b515}.progress.progress-fade.flash>progress[value="100"],.progress.progress-fade.flash>progress[value="100"]+span{-webkit-animation:clr-progress-fade 0.6s linear 1s forwards;animation:clr-progress-fade 0.6s linear 1s forwards}.progress.flash-danger>progress[value="100"]{color:#c92100}.progress.flash-danger>progress[value="100"]::-webkit-progress-value{background-color:#c92100}.progress.flash-danger>progress[value="100"]::-moz-progress-bar{background-color:#c92100}@-webkit-keyframes clr-progress-looper{from{left:-100%}to{left:100%}}@keyframes clr-progress-looper{from{left:-100%}to{left:100%}}.progress.loop{position:relative}.progress.loop>progress{overflow:hidden;color:transparent}.progress.loop>progress::-webkit-progress-value{background-color:transparent}.progress.loop>progress::-moz-progress-bar{background-color:transparent}.progress.loop::after{-webkit-animation:clr-progress-looper 2s ease-in-out infinite;animation:clr-progress-looper 2s ease-in-out infinite;content:' ';top:0;bottom:0;left:0;position:absolute;display:block;background-color:#007cbb;width:75%}.card-block .progress{margin:0;margin-top:-20px;height:4.26667px;position:absolute;left:0}.card-block .progress>progress{height:4.26667px;position:absolute}.card-block .progress.top{margin-top:0;top:0}.nav-item .progress{margin:0;height:3.2px;min-height:3.2px;max-height:3.2px;position:absolute;left:0}.nav-item .progress>progress{height:3.2px;min-height:3.2px;max-height:3.2px;position:absolute}
-
-.embed-responsive{position:relative;display:block;height:0;padding:0;overflow:hidden}.embed-responsive .embed-responsive-item,.embed-responsive iframe,.embed-responsive embed,.embed-responsive object,.embed-responsive video{position:absolute;top:0;bottom:0;left:0;width:100%;height:100%;border:0}.embed-responsive-21by9{padding-bottom:42.85714%}.embed-responsive-16by9{padding-bottom:56.25%}.embed-responsive-4by3{padding-bottom:75%}.embed-responsive-1by1{padding-bottom:100%}
-
-.spinner{position:relative;display:inline-block;min-height:72px;min-width:72px;height:72px;width:72px;-webkit-animation:spin 1s linear infinite;animation:spin 1s linear infinite;margin:0;padding:0;background:url("data:image/svg+xml;charset=utf8,%3Csvg%20id%3D%22Layer_2%22%20data-name%3D%22Layer%202%22%20xmlns%3D%22http%3A%2F%2Fwww.w3.org%2F2000%2Fsvg%22%20viewBox%3D%220%200%2072%2072%22%3E%0A%20%20%20%20%3Cdefs%3E%0A%20%20%20%20%20%20%20%20%3Cstyle%3E%0A%20%20%20%20%20%20%20%20%20%20%20%20.cls-1%2C%0A%20%20%20%20%20%20%20%20%20%20%20%20.cls-2%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20fill%3A%20none%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20stroke-miterlimit%3A%2010%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20stroke-width%3A%205px%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%20%20%20%20.cls-1%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20stroke%3A%20%23000%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20stroke-opacity%3A%200.15%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%20%20%20%20.cls-2%20%7B%0A%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20%20stroke%3A%20%23007cbb%3B%0A%20%20%20%20%20%20%20%20%20%20%20%20%7D%0A%20%20%20%20%20%20%20%20%3C%2Fstyle%3E%0A%20%20%20%20%3C%2Fdefs%3E%0A%20%20%20%20%3Ctitle%3EPreloader_72x2%3C%2Ftitle%3E%0A%20%20%20%20%3Ccircle%20class%3D%22cls-1%22%20cx%3D%2236%22%20cy%3D%2236%22%20r%3D%2233%22%2F%3E%0A%20%20%20%20%3Cpath%20class%3D%22cls-2%22%20d%3D%22M14.3%2C60.9A33%2C33%2C0%2C0%2C1%2C36%2C3%22%3E%0A%20%20%20%20%3C%2Fpath%3E%0A%3C%2Fsvg%3E%0A");text-indent:100%;overflow:hidden}.spinner.spinner-inline{min-height:18px;min-width:18px;height:18px;width:18px;margin:-3px 0}@-webkit-keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}@keyframes spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(360deg);transform:rotate(360deg)}}
-
-input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.stack-view .stack-block-content>:first-child{margin-top:0}.stack-view .stack-block-content>:last-child{margin-bottom:0}input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.stack-view .stack-block-content>:first-child{margin-top:0}.stack-view .stack-block-content>:last-child{margin-bottom:0}input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.stack-view .stack-block-content>:first-child{margin-top:0}.stack-view .stack-block-content>:last-child{margin-bottom:0}input[type=text],input[type=password],input[type=number],input[type=email],.select select{-webkit-appearance:none;-moz-appearance:none;-ms-appearance:none;-o-appearance:none;outline:none}.stack-view .stack-block-content>:first-child{margin-top:0}.stack-view .stack-block-content>:last-child{margin-bottom:0}input[type=text],input[type=password],input[type=number],input[type=email],.select select{margin:0;padding:0;border:none;border-radius:0;box-shadow:none;background:none}input[type=text]:focus,input[type=password]:focus,input[type=number]:focus,input[type=email]:focus,.select select:focus{outline:none}input[type=text],input[type=password],input[type=number],input[type=email],.select select{display:inline-block;border-bottom:1px solid #9a9a9a;min-width:60px}.checkbox input[type="checkbox"]+label::before,.checkbox-inline input[type="checkbox"]+label::before,.radio input[type="radio"]+label::before,.radio-inline input[type="radio"]+label::before{box-sizing:border-box;background-color:#fff;border:1px solid #9a9a9a;content:'';display:inline-block;font-size:10px;height:16px;width:16px;overflow:hidden;text-align:center;margin:0 5px -2px 2px}form .form-group .select.disabled select,.form .form-group .select.disabled select,input[type=text]:disabled,input[type=password]:disabled,input[type=number]:disabled,input[type=email]:disabled,.select select:disabled,.checkbox.disabled label,.checkbox-inline.disabled label,.radio.disabled label,.radio-inline.disabled label{opacity:0.4;cursor:not-allowed}form,.form{padding-top:12px}form .form-block,.form .form-block{margin:12px 0 36px 0}form .form-block>label,.form .form-block>label{font-weight:bold;text-transform:uppercase;letter-spacing:1.5px;margin-bottom:24px}form .form-group,.form .form-group{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-wrap:wrap;-ms-flex-wrap:wrap;flex-wrap:wrap;position:relative;padding-left:228px;margin-bottom:12px}form .form-group>label:first-of-type,.form .form-group>label:first-of-type{position:absolute;width:204px;left:0;top:12px;margin:0}form .form-group>label:not(:first-child),form .form-group span,.form .form-group>label:not(:first-child),.form .form-group span{display:inline-block;-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group input[type=text],form .form-group input[type=password],form .form-group input[type=number],form .form-group input[type=email],.form .form-group input[type=text],.form .form-group input[type=password],.form .form-group input[type=number],.form .form-group input[type=email]{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .validated-input,.form .form-group .validated-input{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .validated-input input,.form .form-group .validated-input input{margin:0}form .form-group textarea,.form .form-group textarea{margin:12px 12px 0 0}form .form-group .select,form .form-group .checkbox-inline,form .form-group .radio-inline,.form .form-group .select,.form .form-group .checkbox-inline,.form .form-group .radio-inline{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 12px 0 0}form .form-group .checkbox,form .form-group .radio,.form .form-group .checkbox,.form .form-group .radio{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;margin:12px 12px 0 0}form .form-group .toggle-switch,.form .form-group .toggle-switch{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:12px 24px 0 0}form .form-group button,form .form-group a,form .form-group input[type=button],form .form-group input[type=submit],form .form-group .btn,.form .form-group button,.form .form-group a,.form .form-group input[type=button],.form .form-group input[type=submit],.form .form-group .btn{-webkit-box-flex:0;-webkit-flex:0 1 auto;-ms-flex:0 1 auto;flex:0 1 auto;margin:6px 12px 6px 0}form .form-group .btn-sm,.form .form-group .btn-sm{margin:12px 12px 12px 0}@media screen and (max-width: 544px){form .form-block>label,.form .form-block>label{text-transform:uppercase;letter-spacing:1.5px}form .form-group,.form .form-group{padding-left:0;margin-bottom:24px}form .form-group>label:first-of-type,.form .form-group>label:first-of-type{position:relative;-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;text-transform:uppercase;margin:0 0 12px 0;font-size:10px;letter-spacing:1.5px}form .form-group>label:not(:first-child),form .form-group span,.form .form-group>label:not(:first-child),.form .form-group span{margin:12px 12px 0 0;width:80%}form .form-group input[type=text],form .form-group input[type=password],form .form-group input[type=number],form .form-group input[type=email],.form .form-group input[type=text],.form .form-group input[type=password],.form .form-group input[type=number],.form .form-group input[type=email]{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%;padding:0 12px 0 12px}form .form-group .validated-input,.form .form-group .validated-input{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%}form .form-group .validated-input input,.form .form-group .validated-input input{margin:0;width:100%}form .form-group .select,form .form-group .toggle-switch,form .form-group .checkbox,form .form-group .radio,form .form-group .checkbox-inline,form .form-group .radio-inline,.form .form-group .select,.form .form-group .toggle-switch,.form .form-group .checkbox,.form .form-group .radio,.form .form-group .checkbox-inline,.form .form-group .radio-inline{-webkit-box-flex:1;-webkit-flex:1 1 100%;-ms-flex:1 1 100%;flex:1 1 100%}}input[type=text],input[type=password],input[type=number],input[type=email]{background:-webkit-linear-gradient(top, transparent 95%, #0094d2 95%);background:linear-gradient(to bottom, transparent 95%, #0094d2 95%);background-repeat:no-repeat;background-size:0% 100%;-webkit-transition:background-size 0.2s ease;transition:background-size 0.2s ease;padding:0 6px 0 6px}input[type=text]:focus,input[type=password]:focus,input[type=number]:focus,input[type=email]:focus{border-bottom:1px solid #0094d2;background-size:100% 100%}textarea{resize:vertical;width:100%;border:1px solid #ccc;border-radius:3px;outline:none;padding:12px 6px}.select{position:relative}.select select{position:relative;padding:0 18px 0 6px;cursor:pointer;width:100%;z-index:2}.select select:hover{border-color:rgba(221,221,221,0.5);background:rgba(221,221,221,0.5)}.select select::-ms-expand{display:none}.select::after{position:absolute;font-family:"FontAwesome";color:#9a9a9a;content:"\f107";bottom:1px;right:4px}.select:hover::after{color:#747474}.checkbox input[type="checkbox"],.checkbox-inline input[type="checkbox"]{display:none}.checkbox label,.checkbox-inline label{cursor:pointer;margin-bottom:0}.checkbox input[type="checkbox"]+label::before,.checkbox-inline input[type="checkbox"]+label::before{border-radius:2px}.checkbox input[type="checkbox"]:checked+label::before,.checkbox-inline input[type="checkbox"]:checked+label::before{content:'\f00c';font-family:"FontAwesome";color:#fff;background-color:#0094d2;line-height:15px;font-size:8px;text-align:center;border-radius:2px;padding:1px 0 0 0;border:none}.checkbox.disabled input[type="checkbox"]:checked+label::before,.checkbox-inline.disabled input[type="checkbox"]:checked+label::before{background-color:#ccc;color:#747474}.radio input[type="radio"],.radio-inline input[type="radio"]{display:none}.radio label,.radio-inline label{cursor:pointer;margin-bottom:0}.radio input[type="radio"]+label::before,.radio-inline input[type="radio"]+label::before{border-radius:50%}.radio input[type="radio"]:checked+label::before,.radio-inline input[type="radio"]:checked+label::before{background-color:#fff;box-shadow:inset 0 0 0 6px #0094d2;border:none}.radio.disabled input[type="radio"]:checked+label::before,.radio-inline.disabled input[type="radio"]:checked+label::before{background-color:#fff;box-shadow:inset 0 0 0 6px #ccc}.toggle-switch label{margin-bottom:0}.validated-input{position:relative;display:inline-block}.validated-input>input{padding-right:28px}.validated-input.invalid>input{border-bottom:2px solid #c92100;background:none;-webkit-transition:none;transition:none}.validated-input.invalid:before{position:absolute;content:'';height:16px;width:16px;top:3px;right:6px;background:url(img/ic_error_red_16x.svg)}.validated-input.invalid>input:focus+.tooltip{visibility:visible;opacity:1}form.compact .form-block>label,.form.compact .form-block>label{margin-bottom:0}form.compact .form-group,.form.compact .form-group{margin-bottom:2px}form.compact .form-group input[type=text],form.compact .form-group input[type=password],form.compact .form-group input[type=number],form.compact .form-group input[type=email],.form.compact .form-group input[type=text],.form.compact .form-group input[type=password],.form.compact .form-group input[type=number],.form.compact .form-group input[type=email]{margin-bottom:10px}form.compact .form-group .validated-input,.form.compact .form-group .validated-input{margin-bottom:10px}form.compact .form-group .validated-input input,.form.compact .form-group .validated-input input{margin:0}form.compact .form-group textarea,form.compact .form-group .select,form.compact .form-group .checkbox-inline,form.compact .form-group .radio-inline,form.compact .form-group .checkbox,form.compact .form-group .radio,form.compact .form-group .toggle-switch,.form.compact .form-group textarea,.form.compact .form-group .select,.form.compact .form-group .checkbox-inline,.form.compact .form-group .radio-inline,.form.compact .form-group .checkbox,.form.compact .form-group .radio,.form.compact .form-group .toggle-switch{margin-bottom:10px}@media screen and (max-width: 544px){form.compact .form-group,.form.compact .form-group{margin-bottom:2px}}.stack-header{font-weight:400;color:#747474;display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-box-align:end;-webkit-align-items:flex-end;-ms-flex-align:end;align-items:flex-end}.stack-header .stack-title{display:block;-webkit-box-flex:1;-webkit-flex:1 1 auto;-ms-flex:1 1 auto;flex:1 1 auto;padding:6px 0}.stack-header .stack-actions{display:block;-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto}.stack-header .stack-actions .stack-action{margin:0 0 6px 12px}.stack-header .stack-actions .stack-action.btn{min-width:0;padding:0 12px;margin-right:-12px}.stack-view{margin-top:0;border:1px solid #ccc;border-radius:3px;overflow-y:auto;font-size:13px;background-color:#fafafa}.stack-view .stack-block{display:-webkit-box;display:-webkit-flex;display:-ms-flexbox;display:flex;-webkit-flex-flow:row wrap;-ms-flex-flow:row wrap;flex-flow:row wrap;border-bottom:1px solid #ddd}.stack-view>.stack-block:last-child,.stack-view>:last-child .stack-block:last-of-type{border-bottom:none;box-shadow:0 1px 0 #ddd}.stack-view .stack-block-label,.stack-view .stack-block-content{padding:6px 12px;background-color:#fafafa}.stack-view .stack-block-label{-webkit-box-flex:0;-webkit-flex:0 0 40%;-ms-flex:0 0 40%;flex:0 0 40%;font-weight:600}.stack-view .stack-block-label::before{content:"";float:left;font-family:"FontAwesome";font-size:1.4em;font-weight:normal;line-height:inherit;height:100%;width:12px;margin-right:6px;text-align:center;color:#9a9a9a;-webkit-transition:color 0.2s ease-in-out;transition:color 0.2s ease-in-out}.stack-view .stack-block-content{-webkit-box-flex:1;-webkit-flex:1 1 60%;-ms-flex:1 1 60%;flex:1 1 60%;margin-bottom:0;font-weight:400}.stack-view .stack-children{-webkit-box-flex:0;-webkit-flex:0 0 auto;-ms-flex:0 0 auto;flex:0 0 auto;width:100%}.stack-view .stack-children .stack-block{border-bottom-color:#eee}.stack-view .stack-children>.stack-block:last-child,.stack-view .stack-children>:last-child .stack-block:last-of-type{border-bottom:none;box-shadow:0 1px 0 #ddd}.stack-view .stack-children .stack-block-label,.stack-view .stack-children .stack-block-content{background-color:#fff}.stack-view .stack-children .stack-block-label{padding-left:24px}.stack-view .stack-block-expandable>.stack-block-label{cursor:pointer}.stack-view .stack-block-expandable>.stack-block-label::before{content:"\f105"}.stack-view .stack-block-expandable>.stack-block-label,.stack-view .stack-block-expandable>.stack-block-content{-webkit-transition:background-color 0.2s ease-in-out, color 0.2s ease-in-out;transition:background-color 0.2s ease-in-out, color 0.2s ease-in-out}.stack-view .stack-block-expandable:hover:not(.stack-block-expanded)>.stack-block-label,.stack-view .stack-block-expandable:hover:not(.stack-block-expanded)>.stack-block-content{background-color:#eee}.stack-view .stack-block-expanded>.stack-block-label::before{content:"\f107"}.stack-view .stack-block-expanded>.stack-block-label,.stack-view .stack-block-expanded>.stack-block-content{background-color:#ddd;color:#000}.stack-view input[type=text],.stack-view input[type=password],.stack-view input[type=number],.stack-view input[type=email],.stack-view .select{display:inline-block;vertical-align:top;margin-right:12px;margin-bottom:-1px}.stack-view input[type=text],.stack-view input[type=password],.stack-view input[type=number],.stack-view input[type=email],.stack-view .select select{height:24px}.stack-view .stack-block-expandable>.stack-block-content input[type=text],.stack-view .stack-block-expandable>.stack-block-content input[type=password],.stack-view .stack-block-expandable>.stack-block-content input[type=number],.stack-view .stack-block-expandable>.stack-block-content input[type=email]{-webkit-transition:background-size 0.2s ease, border-bottom-color 0.2s ease-in-out;transition:background-size 0.2s ease, border-bottom-color 0.2s ease-in-out}.stack-view .stack-block-expandable>.stack-block-content .select select{-webkit-transition:border-bottom-color 0.2s ease-in-out;transition:border-bottom-color 0.2s ease-in-out}.stack-view .stack-block-expandable>.stack-block-content .select::after{-webkit-transition:color 0.2s ease-in-out;transition:color 0.2s ease-in-out}.stack-view .stack-block-expanded>.stack-block-content input[type=text],.stack-view .stack-block-expanded>.stack-block-content input[type=password],.stack-view .stack-block-expanded>.stack-block-content input[type=number],.stack-view .stack-block-expanded>.stack-block-content input[type=email]{border-bottom-color:#747474;background:-webkit-linear-gradient(top, transparent 95%, #007cbb 95%);background:linear-gradient(to bottom, transparent 95%, #007cbb 95%);background-repeat:no-repeat;background-size:0% 100%;-webkit-transition:background-size 0.2s ease;transition:background-size 0.2s ease}.stack-view .stack-block-expanded>.stack-block-content input[type=text]:focus,.stack-view .stack-block-expanded>.stack-block-content input[type=password]:focus,.stack-view .stack-block-expanded>.stack-block-content input[type=number]:focus,.stack-view .stack-block-expanded>.stack-block-content input[type=email]:focus{border-bottom:1px solid #007cbb;background-size:100% 100%}.stack-view .stack-block-expanded>.stack-block-content .select select{border-bottom-color:#747474}.stack-view .stack-block-expanded>.stack-block-content .select::after{color:#747474}.modal .stack-view{height:55vh;margin-bottom:0}
-
-.clearfix::after{content:"";display:table;clear:both}.center-block{display:block;margin-left:auto;margin-right:auto}.pull-xs-left{float:left !important}.pull-xs-right{float:right !important}.pull-xs-none{float:none !important}@media (min-width: 544px){.pull-sm-left{float:left !important}.pull-sm-right{float:right !important}.pull-sm-none{float:none !important}}@media (min-width: 768px){.pull-md-left{float:left !important}.pull-md-right{float:right !important}.pull-md-none{float:none !important}}@media (min-width: 992px){.pull-lg-left{float:left !important}.pull-lg-right{float:right !important}.pull-lg-none{float:none !important}}@media (min-width: 1200px){.pull-xl-left{float:left !important}.pull-xl-right{float:right !important}.pull-xl-none{float:none !important}}.sr-only{position:absolute;width:1px;height:1px;padding:0;margin:-1px;overflow:hidden;clip:rect(0, 0, 0, 0);border:0}.sr-only-focusable:active,.sr-only-focusable:focus{position:static;width:auto;height:auto;margin:0;overflow:visible;clip:auto}.invisible{visibility:hidden !important}.text-hide{font:"0/0" a;color:transparent;text-shadow:none;background-color:transparent;border:0}.text-justify{text-align:justify !important}.text-nowrap{white-space:nowrap !important}.text-truncate{overflow:hidden;text-overflow:ellipsis;white-space:nowrap}.text-xs-left{text-align:left !important}.text-xs-right{text-align:right !important}.text-xs-center{text-align:center !important}@media (min-width: 544px){.text-sm-left{text-align:left !important}.text-sm-right{text-align:right !important}.text-sm-center{text-align:center !important}}@media (min-width: 768px){.text-md-left{text-align:left !important}.text-md-right{text-align:right !important}.text-md-center{text-align:center !important}}@media (min-width: 992px){.text-lg-left{text-align:left !important}.text-lg-right{text-align:right !important}.text-lg-center{text-align:center !important}}@media (min-width: 1200px){.text-xl-left{text-align:left !important}.text-xl-right{text-align:right !important}.text-xl-center{text-align:center !important}}.text-lowercase{text-transform:lowercase !important}.text-uppercase{text-transform:uppercase !important}.text-capitalize{text-transform:capitalize !important}.font-weight-normal{font-weight:normal}.font-weight-bold{font-weight:bold}.font-italic{font-style:italic}.text-muted{color:#818a91}.text-primary{color:#0275d8 !important}a.text-primary:focus,a.text-primary:hover{color:#025aa5}.text-success{color:#5cb85c !important}a.text-success:focus,a.text-success:hover{color:#449d44}.text-info{color:#5bc0de !important}a.text-info:focus,a.text-info:hover{color:#31b0d5}.text-warning{color:#f0ad4e !important}a.text-warning:focus,a.text-warning:hover{color:#ec971f}.text-danger{color:#d9534f !important}a.text-danger:focus,a.text-danger:hover{color:#c9302c}.bg-inverse{color:#fafafa;background-color:#747474}.bg-faded{background-color:#fff}.bg-primary{color:#fff !important;background-color:#0275d8 !important}a.bg-primary:focus,a.bg-primary:hover{background-color:#025aa5}.bg-success{color:#fff !important;background-color:#5cb85c !important}a.bg-success:focus,a.bg-success:hover{background-color:#449d44}.bg-info{color:#fff !important;background-color:#5bc0de !important}a.bg-info:focus,a.bg-info:hover{background-color:#31b0d5}.bg-warning{color:#fff !important;background-color:#f0ad4e !important}a.bg-warning:focus,a.bg-warning:hover{background-color:#ec971f}.bg-danger{color:#fff !important;background-color:#d9534f !important}a.bg-danger:focus,a.bg-danger:hover{background-color:#c9302c}.hidden-xs-up{display:none !important}@media (max-width: 543px){.hidden-xs-down{display:none !important}}@media (min-width: 544px){.hidden-sm-up{display:none !important}}@media (max-width: 767px){.hidden-sm-down{display:none !important}}@media (min-width: 768px){.hidden-md-up{display:none !important}}@media (max-width: 991px){.hidden-md-down{display:none !important}}@media (min-width: 992px){.hidden-lg-up{display:none !important}}@media (max-width: 1199px){.hidden-lg-down{display:none !important}}@media (min-width: 1200px){.hidden-xl-up{display:none !important}}.hidden-xl-down{display:none !important}.visible-print-block{display:none !important}@media print{.visible-print-block{display:block !important}}.visible-print-inline{display:none !important}@media print{.visible-print-inline{display:inline !important}}.visible-print-inline-block{display:none !important}@media print{.visible-print-inline-block{display:inline-block !important}}@media print{.hidden-print{display:none !important}}.m-x-auto{margin-right:auto !important;margin-left:auto !important}.m-a-0{margin:0 0 !important}.m-t-0{margin-top:0 !important}.m-r-0{margin-right:0 !important}.m-b-0{margin-bottom:0 !important}.m-l-0{margin-left:0 !important}.m-x-0{margin-right:0 !important;margin-left:0 !important}.m-y-0{margin-top:0 !important;margin-bottom:0 !important}.m-a-1{margin:1rem 1rem !important}.m-t-1{margin-top:1rem !important}.m-r-1{margin-right:1rem !important}.m-b-1{margin-bottom:1rem !important}.m-l-1{margin-left:1rem !important}.m-x-1{margin-right:1rem !important;margin-left:1rem !important}.m-y-1{margin-top:1rem !important;margin-bottom:1rem !important}.m-a-2{margin:1.5rem 1.5rem !important}.m-t-2{margin-top:1.5rem !important}.m-r-2{margin-right:1.5rem !important}.m-b-2{margin-bottom:1.5rem !important}.m-l-2{margin-left:1.5rem !important}.m-x-2{margin-right:1.5rem !important;margin-left:1.5rem !important}.m-y-2{margin-top:1.5rem !important;margin-bottom:1.5rem !important}.m-a-3{margin:3rem 3rem !important}.m-t-3{margin-top:3rem !important}.m-r-3{margin-right:3rem !important}.m-b-3{margin-bottom:3rem !important}.m-l-3{margin-left:3rem !important}.m-x-3{margin-right:3rem !important;margin-left:3rem !important}.m-y-3{margin-top:3rem !important;margin-bottom:3rem !important}.p-a-0{padding:0 0 !important}.p-t-0{padding-top:0 !important}.p-r-0{padding-right:0 !important}.p-b-0{padding-bottom:0 !important}.p-l-0{padding-left:0 !important}.p-x-0{padding-right:0 !important;padding-left:0 !important}.p-y-0{padding-top:0 !important;padding-bottom:0 !important}.p-a-1{padding:1rem 1rem !important}.p-t-1{padding-top:1rem !important}.p-r-1{padding-right:1rem !important}.p-b-1{padding-bottom:1rem !important}.p-l-1{padding-left:1rem !important}.p-x-1{padding-right:1rem !important;padding-left:1rem !important}.p-y-1{padding-top:1rem !important;padding-bottom:1rem !important}.p-a-2{padding:1.5rem 1.5rem !important}.p-t-2{padding-top:1.5rem !important}.p-r-2{padding-right:1.5rem !important}.p-b-2{padding-bottom:1.5rem !important}.p-l-2{padding-left:1.5rem !important}.p-x-2{padding-right:1.5rem !important;padding-left:1.5rem !important}.p-y-2{padding-top:1.5rem !important;padding-bottom:1.5rem !important}.p-a-3{padding:3rem 3rem !important}.p-t-3{padding-top:3rem !important}.p-r-3{padding-right:3rem !important}.p-b-3{padding-bottom:3rem !important}.p-l-3{padding-left:3rem !important}.p-x-3{padding-right:3rem !important;padding-left:3rem !important}.p-y-3{padding-top:3rem !important;padding-bottom:3rem !important}.pos-f-t{position:fixed;top:0;right:0;left:0;z-index:1030}h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h1{font-size:34px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h2{font-size:28px;line-height:48px;margin-top:24px;margin-bottom:0;font-weight:200;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h3{font-size:24px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:400;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h4{font-size:18px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}@media screen and (min-width: 544px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 768px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 992px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}@media screen and (min-width: 1200px){h5{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;letter-spacing:.08px;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif;text-transform:uppercase}}h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}@media screen and (min-width: 544px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 768px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 992px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}@media screen and (min-width: 1200px){h6{font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;font-weight:600;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif}}body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0;margin-top:0 !important}@media screen and (min-width: 544px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body p{font-weight:200;font-size:16px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p0,body p.p0{font-weight:200;font-size:20px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p2,body p.p2{font-weight:400;font-size:14px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}@media screen and (min-width: 544px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 768px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 992px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}@media screen and (min-width: 1200px){body .p3,body p.p3{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0}}body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}@media screen and (min-width: 544px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 768px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 992px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}@media screen and (min-width: 1200px){body .p4,body p.p4{font-weight:400;font-size:12px;line-height:24px;margin-top:24px;margin-bottom:0;text-transform:uppercase}}body .text-light{font-weight:200}body .text-thin{font-weight:100}html{color:#565656;font-family:"ProximaNova","Avenir Next","Helvetica Neue",Arial,sans-serif,"Avenir Next","Helvetica Neue",Arial,sans-serif;font-size:16px}.table{background-color:#fff;border-radius:2px;box-shadow:-1.2px 0 #ccc,0 -1.2px #ccc,1.2px 0 #ccc,0 1.2px #ccc;color:#565656;margin:24px 0 0 0;max-width:100%;width:100%}.table th,.table td{font-size:13px;line-height:16px;border-top:1px solid #eee;padding:9.5px 12px;text-align:center;vertical-align:top}.table th.left,.table td.left{text-align:left}.table th.left:first-child,.table td.left:first-child{padding-left:6px}.table th{font-weight:600;background-color:#fafafa;vertical-align:bottom;border-bottom:1px solid #ccc;border-top:0 none}.table tbody+tbody{border-top:1px solid #ccc}.table thead th:first-child{border-radius:3px 0 0 0}.table thead th:last-child{border-radius:0 3px 0 0}.table tbody:last-child tr:last-child td:first-child{border-radius:0 0 0 3px}.table tbody:last-child tr:last-child td:last-child{border-radius:0 0 3px 0}.table.table-vertical thead th{border:0 none;border-radius:0;display:none}.table.table-vertical th{border-bottom:0;border-top:1px solid #ccc;vertical-align:top}.table.table-vertical td,.table.table-vertical th{text-align:left;border-color:#ccc}.table.table-vertical td:first-child,.table.table-vertical th:first-child{border-right:1px solid #ccc;background-color:#fafafa;font-weight:bold}.table.table-vertical tbody:first-of-type tr:first-child th,.table.table-vertical tbody:first-of-type tr:first-child td{border-top:0 none}.table.table-vertical tbody:first-of-type tr:first-child th:first-child,.table.table-vertical tbody:first-of-type tr:first-child td:first-child{border-radius:3px 0 0 0}.table.table-vertical tbody:first-of-type tr:first-child th:last-child,.table.table-vertical tbody:first-of-type tr:first-child td:last-child{border-radius:0 3px 0 0}.table.table-vertical tbody:last-child tr:last-child td:first-child{border-radius:0 0 0 3px}.table.table-vertical tbody:last-child tr:last-child td:last-child{border-radius:0 0 3px 0}.table.table-noborder{border-radius:0;box-shadow:none;background-color:transparent;border:0}.table.table-noborder th{background-color:transparent;border-bottom-color:#ddd;border-top:0 none}.table.table-noborder th:first-child{border-right:0 none}.table.table-noborder td{border-top:0 none;padding-top:10px;padding-bottom:10px}.table.table-noborder td:first-child{border-right:0 none}.table.table-noborder thead th:first-child,.table.table-noborder thead th:last-child{border-radius:0}.table.table-noborder th,.table.table-noborder td{border-radius:0 !important}.table.table-noborder th:first-child,.table.table-noborder td:first-child{padding-left:0}.table.table-compact th,.table.table-compact td{padding-top:3.5px;padding-bottom:3.5px}.table.table-compact.table-no-border th,.table.table-compact.table-no-border td{padding-top:4px;padding-bottom:4px}@media all and (-ms-high-contrast: none), (-ms-high-contrast: active){.table{border-radius:0;border:1px solid #ccc}.table th,.table td{border-radius:0 !important}.table.table-no-border{border:0 none}}@supports (-ms-accelerator: true){.table{border:1px solid #ccc}.table.table-no-border{border:0 none}}
-
-section{display:block}section[aria-hidden='true']{display:none}
-
-.tooltip{position:absolute;display:block;line-height:16px;padding:12px;font-size:14px;width:120px}.tooltip:before{position:absolute;content:'';width:0;height:0}.tooltip{visibility:hidden;opacity:0;-webkit-transition:opacity 0.4s ease-in;transition:opacity 0.4s ease-in}.tooltip.tooltip-sm{width:120px}.tooltip.tooltip-md{width:240px}.tooltip.tooltip-lg{width:360px}.tooltip.active{visibility:visible;opacity:1}.tooltip.top-right{left:100%;bottom:100%;background:#c92100;color:#fff;margin-bottom:6px;margin-left:-14px;border-radius:3px}.tooltip.top-right:before{bottom:0;left:0;margin-bottom:-6px;margin-left:0;border-top:9px solid #c92100;border-left:12px solid #c92100;border-bottom:9px solid transparent;border-right:12px solid transparent}.tooltip.top-left{right:0;bottom:100%;background:#c92100;color:#fff;margin-bottom:6px;margin-right:14px;border-radius:3px}.tooltip.top-left:before{bottom:0;right:0;margin-bottom:-6px;margin-right:0;border-top:9px solid #c92100;border-right:12px solid #c92100;border-bottom:9px solid transparent;border-left:12px solid transparent}.tooltip.bottom-right{left:100%;top:100%;background:#c92100;color:#fff;margin-top:6px;margin-left:-14px;border-radius:3px}.tooltip.bottom-right:before{top:0;left:0;margin-top:-6px;margin-left:0;border-bottom:9px solid #c92100;border-left:12px solid #c92100;border-top:9px solid transparent;border-right:12px solid transparent}.tooltip.bottom-left{right:0;top:100%;background:#c92100;color:#fff;margin-top:6px;margin-right:14px;border-radius:3px}.tooltip.bottom-left:before{top:0;right:0;margin-top:-6px;margin-right:0;border-bottom:9px solid #c92100;border-right:12px solid #c92100;border-top:9px solid transparent;border-left:12px solid transparent}
-
-@font-face{font-family:'ProximaNova';src:url("proximanova-light-webfont.eot");src:url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAAAAAE5MABMAAAAAz5AAAE3dAAIAxQAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGjIbySwcjBQGYACDYgg6CYRlEQgKgqBQgoErATYCJAOHKguDWAAEIAWILAeFbgyBXz93ZWJmBhvEvDVsWwr1bgdQGaeXKor6TWrJMjNQQknLZ///9+OGyIQP0P2rKhDaYBJXj7oCQrXQ+95d98AE93PHytSuTMsWHq5q4gtNmzuVUiXmL9jbsNcvPPXOwaA+0GhBo79g3nWeU4aA52KDsUVGNKIWTWmBVT8i/RZ0anJtiJaZ+/prPT83NBH8Ua6PHxA/Wr7AtmEvGnX25OH5/qzOffhJlVtODyBmxKXNHqxmpRrg59a/AQMrsFBkVAoMesRYJLkgN1jDmo0xenQrglIlOKkyKOtSz7Owgpti5P3zO5X3r3sSkG+fKuTzCGFLZDJbKbOHzBZOuZXytD+Vtsj8k/eBojppohrBi0Qk5aHQY0Bf/Nmetv1/bb8yiFiQm//AM6gOH7cEtdOL1XDSVQ/b3VKLyqzqdi2apqt6RTpJ95J7HVe9neTSAQtApK0bYwFkAHSDAwCZDIBjqiFnEBJNcMiy3L7Wc45vpPVh2bMMyahhzOQC+B9U17+yJas0W+4NMIaDg7v+Wvs/dcuwzX/KMGfrWzr0X6babHFJGTtDA2toFgLBhdzonA2y8PWfD7JK0ZWSQEl2lTtCbWMhWKRCWHHdV5HC7u9HNrXdA8GMTpdw9QBYAdCC5f38OSArCDpto7M76p5axi4AsJCXQlD0b+i/dmeMMe6+HoWiVMWj7TL/S1VqZSw0NuucAK6NCkiLCqD+v38n//s6rZNkn2TVu62yZWXKTqrTnc7S+TSzFCXpmFN21pIz7c4x4cZ9BTiDBSYsZQWwsHQsCktgGe7Pq2qu76FIH5KbLtVOu6aUKcNKW0ot2yD8D4L8AEgKhdQBoKxQlE8i5QbSTZR9B7UcyXOu1S7KykXWpUhpfdjqMuSyTpct6x4oXaMO5J4m262AnvJxNyy8xFH39DZFOldupXQly0REROQQkdI9f3/GZn841mHPgBYexurf6a9ruGyoXy19uZpGiBDBF3ajr9dwWTmz1iNvFnIQl5Uwf4MQ8MaKHW8DAK9OXvED8N5bQ9/MOYj5AEhCCCfB/E6WQ8upXgD52TpgE3Iz/V7T2QEdsGuSGNiEJtXFtf+esrXRwqHQvW1p9legeTpEd4VpPWvbEZg2YhkzxrL5uN5zfqove9ROLcw9ob+Ty0h3jztHU8APIW4ERDSj0wRVco4FL1dup7omVMZlFjE1VDrm8uIzmllCBXv16U0drQZWCI1uY2Olxsm1Pqmev6SZz4lz+cvSk3stty4Tmm4EIzNMRYTTr8w4UEseF6hWlexL4jBI8SSealLKy3JN/ngLr1heVChX5a4ca2hi5U36nakfh09uE8NeyifZQTdoPgEGL+uJQIuxisLqw4ZZhQuJKf3gFXbpqed7GCouqyCm9Y2T5GSk9fgMhhVs8OrnL6crfdeTB9k6Z5WoBd+olyE9QN/YwQAzc5bczb8Au0iwPU3zFbpHeog0qoGbVloN5Q5VIrGQamUHA3yHTA/JaXMOPXzGo65kJB4XNk054PMa6PvpXdhWPQWfGeDQaafx05dgl0P4r9eUaYErMVCZVhF4HEWgUs1baPNQSuKK0dYSuqdeC/WnSTMKZoGe493AnILBk2JjmrS/bcvoDOw8sdGdTQwcghKXiruN4M79/IJRk1R5SBKinhKbQnzy1iBVTbFixrdktsc3pFGoeG2LxAmoBySFKenrLyyrRIJsFRjIvajfrOGhkjJDBsho8BPgVo2tUhBVgMsYECc73omiiwKfDpnhKg6oz5S/y5nFpXQ3gXKDkmhDR/GOl7aSTzfLjfFoTFUC72wGo0mR1yUtWLeMBVYU6oFzTTqSCaAAyKWRsCYyObUiagra99Frlo3URFzttK6HooAl41AWkfduqNpj/S1hMg8d8X8cI3uj97XT0hStAah/pe9ZVRMS7edspDRtqBeWNpAybt2W5JKAleXGyP+voHBvxDGnpFWpGHFgaKgyXCdKBJFSqNbL3/0pNqyCGzO5W1pa6/nFMybSdIonszpHVbWlf61y7geFU4mMBgvrHD7pcc30hwB1XOFSzrMlq84R6SnnF6xf/zyh4+KpdQ7rJ07V65lJEDiIgJOGqT8qjWbEHV+IIlBEpWft+fCKtVGrbGuFoGvaurrXeYQWI93rnuM5VVI9CFk+a7yqH399bq/3XdBmWvfEdoGwIiPrPOwQLV+JE4+LUVzyWvNTSsR0CocyK0Aej9oDadzRU9f1IYOyuls+sc8jrQMIbMSzn/HZtKPp8VrmYTWYxMlHbJw7GHp/kFDfhGXTphzUibXz0A98chXTVpQqYGFtYm0o11Lx2UrwQpq1RUFHv0agqKt0ch0Kw+WciXgWfSq9WR8HJtCVgHNK5hgjnxTDhhNBeRzwLY5QKxzdpccBpXWNOAss14b17WveWR+CNbfuKaPKVXRFqR0gOh6tE2XdD3XEjoX7Q0228GQqjlJntzDGvc735q2i81rpb2gYyQRiwVhrAg1EsSov45sFYR0DJaNdS9RaVLkRhNHSFQNwegZbZ3wLOBs8xonYQP9827D+cAu7Pa1pgN/53HHgP93Pbbz/BIAZgMvZTA7AeyAfVthWi3B6NsIAMHHbPNPe0mIfh1GSFdXbpvPA4NyHzQLAerwZwERut6DEm8V7f3h8en55/ejzzJ3gRZ3ZMwBnkeYK6kgQbBi9JQA4I80ycgBhXQQCRnGH8BFiYLhnEN5s4BQCsB7MvOfzPXKXCW/FyJbzj/MPTpBpJrfJh/7OZwDgvppw95Hig0ZQ2wGgPTPXjOX4Aklo5i+18tzR9MAHUgN2ACyaC3LQ9oJPwC3mva5xlCb77MSVlbfd4pOIADhZiW41E0EI6MgwMJwCzoQtgo5LUElFnzY8S4RCBoyHLU5kA8z5IIyHCVcYIkYu0B67LDBfLi0Nu0ae74TdaHHfsKrh01Yte3M8BZd38ReM6Q+ixW+CbYxbqFjAHOjmLaUbTNqufeQq5qu0G0rd9zNagyYYzdoRdRpGMmparFmXcC1ZJnbLQ1Ig9JpDxI8pfScKQpKVvQ5jsACDAxJ4DMDkYBlbDFgdrpDKAQc/6sQFlcuMhbUMs+LIQzyplIoy/0M0mvMkNsVCQY60aNsqibiLz8cryztzXNyKb8kgIZM4taXf078ZkpGZm/PzcL6ZvxWD4lGYpbicKfc92stn1l4bFwupi9FGNpYBSHD+VQjjprZjYh9P2HMT9/oEkZs9NyH28SCC2KeGJBP3+qTdm4KC5EaPdKqtyuhWyf5huMb7ZSdQSAaSkeyPJVuYyHnzhDVpCWMZAnZ3uzlJgWUDGeuAgESYpD3e3DOVRUSRC9wjtyEEJX3TDWjLbggbeiQwkA0eIRn+2pKJjvr0gMyxFbm1OzT5b0NbmMzMBOm4VNuaoEvqR+PitskC42/QeEeA2jYcI9cpMC3jEs3sywg3ejM2ospCEU3bOtBxnT07fq9O2DMTordihwEiETZET3CiNl/Z6JK/PsBEhgMCGe4YDEl3LwRUi929Rpdy7XXa1hPitW0s0CtaNvGS1uOGgoT1gCxAS68OLY1BXdrG2E8FIx8EUpwCJHVykDogOVDmquuaSAvMh4UdsFIvq1BAzLBN53dx0wAgqU1+MZNyDa2/NgEe/aPusgMPkMsBwMA/RXez/xegtVrCdAR0NYD8ZaUCdOhQaYhc+8MXtOfaU+l4BmAByh3djwEn+RlHpKSVdL+zBTIWBShGCOWoQye2IL9nhsr+/VN+Qtyyoy3CdgxAhpGHwo4dusDxbXz8w8H4ppcInNyzXH60+OjCo/PmTDunTz6Ph+TuOvhFcMqo0mgoUN4RyUZx7u8WpaCqNtb5pg1dP8R0enZ+0en2+oPhaDyZzuaL5Wp9eXV902zebG93d+3+7bv3Hz5mmF7eMB9fP394AAKJQmOwODyBGBgUHBIaRiJTqOERkVHRMTR6bByDCZxVXFpe39Ta1dnd29M3cGZwaFh99tzI2MT45PTU/NzCeacC8j25/AepHYcKnysFQMnlQBJgn2PQM+HAE4H+x3PZEgDgoJMesvLOPLG4dOvve/dv35np0ovAs2+fvHwFpH22BhRckF9ZVl1TW9V4HGi48nQLsPKyDAAcr6HnzkcWLUacRB0UpMcHLl2eLpmYuNhElLDQ4hEFOwsv1XQWmkXmBE/OGh4/syyoL49jakyPTbfs1uILW5m1eT57Gr9Y1vgcoSfmzRBZFTki9UkeOJg16uxvfY7SdDnLKFJX5q98bSXJuua/fGMlKY6uMTx8Zu8OSRU1Fa2T11dnJEY/hLx7xVHcr69LFjzKsfqhNNkddI7TGenoqPM5XuNWAv/obQocWTZG4KjycRaz27gDt4NbfbtUykoXk+apNCuhYqU0maaElRM1PpmSTuIXqOPYmnUDjNDwzikM9nfpKYmRrFQdT8FhxH1Nk4MjWQZxtjmYqrbRRMDBQUQlN1OUzOz5ljdNSXxzEKgUB8bAYqlapipzIFUTvklelmAmFqRizxpnzOFj5Ahu7DR2SmtTegl8TqsD9I107emtXQYy3CVNv5ZtK+jYztQGOO4OsmXH98nFMmZNt3ybuW6WfhJBBOGwN/EmTbCcaUlnyaBl5g3tggWF5Rg81elrBPMm5BEQiN0DRgIS6Fh1Z0896eCIGn+c5gzfVJ3GrwXI4+8M2f0KswDER4C4CDB+eQHM/C+bz+4A1vge0DLT3s/qsX2g5nSlXiaT6imNLUYy71onXOReFzRH3Dysi5xcnmroXrsiZo646SIrhNreLLF52PVrrLhdZLYGay7HT6eg9lmoVnB68SJehCv1vogZZ71B0r9m4W+pIIE4K9HKhZSI843WXCpf+oijLCXzrYDNbEgX+KPh3OcEIdLzjx2FLmOVkpL3EmmJFfdiTRoZzW6pT5RknCJacsO1Mio1MhJJK0OOXC5RG2jX3CupbRxuDjO8Q93Iz5CRt6WXIHQNKfVNmimsE5DimiEpvKF8RaXiGZECY4IEJKhaL7yX8T1IIWpAIE9TzYCSevBeon2FSEoRsgnSpN5onnsaHYCoYYlSmdnD0X4N4lPKkGYvNVK1qnCaGPJhSmuHpMfyTSQQAhIXV194Qa5dhICooZoTlTJhLER7TsywDbJzaHYq9eoKRinJ0a5kfN8cL/IDjmrNYStVKOa2UXIeqr8E4tqjTvMFSbUmi1PoCdJ9N3ZSYxt0sQ3dQraB3sJbwxUlUYHXiwO9DHpAsfu/h7Q83uvcUbfT0XhJkVjOnIj22F0f6do2wAiEc7prj1j7cmhM7r920LgaoQuPlmkAnOxaNKsEmFyb8VbhJ7fGBGa4NGZUQWdINRrNkKbYJ7Msz7fxkhtmOTjB5yLpBHx//tFZlx865nfxjZn4F1GjrbfNadI1+FvXGr5P03Pi3avBs0hLIblAJjnrw4KzSZbRJMQgIbUEIT/mb6oHdlLoqAaVtxRNCJBJzAkysirS6qUAoDqpO3WrohHUfKqP6p1BtzCHKkPqv1i2iq+JCR7HG5YSKS1Mwe30W0GaXTqhNvEeH6dZG3CKaiwhgQThyrTMquNZTMTT1cspj41H4NM8z5ludyHdcb5QM2OEf4mToL4lna4NWhVeHnS6BhrrxYV97Vr1FbjUxLTlXe7sIplDMp6Y9JwMjBQebAAhFXGTcsSlSH7lwCD3m8u+REOZO9mNZlSTdk4Una5zLJZUz5Fyon2ioweS7oN7yHYYqlXEcua6quj7y+jF/yDmxRy9GLOnxyV+9AXp6ughygG9S8CFzuZzEZXPGyD43sKxXSr954MX5jBYH1BpB3Wqg5E1n/1MGstZ9Dbs+dG+9/jXEHdBIHwG6tZwDq9k/CJw5AIbrfrVFerp9ZSSeklJKEeMN6zTNKCmuDWC0fSKOcTTyojLu49rxZLVsGBXm3D9BtjIArYi1or5oQZU29CpRHRVe6ciBYDFj5zmKaiRq16tPn2vAea0vXBcDhXFG/OoiRS8bMejaDY08Al1+nCLaqyKLYGla8o9SVK2T3oHa4ay8oIAQ7p2+5YCC9iB+9faUM2sYswbMHKl9l0zhm/DhfILO66BmzbikmVGu5Yu1l5AO4IYqZ72HOh7QEMnpHZsQkBotJHoGk3yWrYMlxAGsJkzNDbhbTY5yp/dE5LSS9s3oRMIMCyCTgCrDEHoK2CgYaq4/rgCjEeySiQ3MNmKPoL1Rj007l5/ZMKGE6R4GGuJZMmHANdU+jSVaIrvWeFp8snEGIQDDZTFsbTmEWT0k9kA5c9UGFpkjPXcZTRVHEO3dDfjtmONA+2o+4aVCJcDFv6lTbhoCQx3KL8cy0h2PVSw/thAFIWZKywyZCIl9v6ocWSkgqW9rn3vgDy+oUkNYO5PFNMGunKIMderiXYhVOPG9p0Cj5QnqJj2dSiUs51g0iSgKYYYIIHCh33W0X6OLirG+EAvYyzVUMOupc2oNYzNFi5qwvCijBoGeFL+y1QukeoH1ULabkrRcU/nwuMgqstTl9kTsVHs7lodp+QbWILIxEDoFMcRacSnM9C154tednvEqwSFMJs72mWTRg8u4KSIwFlU+KeOSSkzFffhoM2cl43JaPLZyZ92/vZX8KZjiw/p2nfYe54SfO/Kxg7VV4n6+waGHI1Po3lPI7Tk03IuOZvSIHBlBBPS0ciGVIlxwyYWJ6QuVU8AYV5apwl3Mu4c1bmqzFJhu+No39sULuv+ecTaJ7pn1xDw11Z38Mmb5n+UVN3dPHb5zpUV/UiA7djWYeIcsBqCqP1y3/ODEcsPnfwpsxiA+heflra58AE8e+GkXUIn3R8C/UaU7MngXtB0ulWQdlDFIiyGYicPqydMI6RV3gMEkMjrdIrmJPQqTQnlYo4IRsEgnOPR1H+Y8VTYLlKBmbyiD3fYyRGz6KePRpYG4Gr2rT3CHVd1HdTQGHX1G7bGby7/BhAxfXHB1KjHPQcNOZTHVFzlAoJyDOD+NySynxt7QVpiCWImfoSnjax0EH4R7ulM0E7e5Sq6DCMkAGJBEr6blNKoznTQcLx3ZepLajBzzJC5895wPGG2x2iz7igT9WE8YNuR34ACsIBO9Px8FTZAsF3ggsKjR3bs2NI0dohxuUd37twKGJJC7ZqeBr+vMtiLZxj3hRvDCL7TwvpAKym3bMnrTG6G1BJxr8SEd6TbibicsINNeEl1KpgxF0FJSOeC+dm25wN08I5OD4GHSQef2k8dP6MYo6DyiuclDyI7ynDUvoMoiTY9fGGQFSirML7EyyoZDkPih5EkImuc2vnem6FqDX/YbL2/qPne8CJlDpBLZP4K4CrBQEK1Tbu8/DxbzhTjBBoaVxM+ALZKMdQ9iURtSjQDgUKa4UCCxI+ECkJCl4TVqZ8ouNIkRG0HrIOdcZdrTwBpYy3K8kR4SylihrOqKpYW9YZSibZY+UpxCNnXSuVrSPuISJ8X4OJEqwZuwZPEgbzdKbkjXkmr0rGvJG3VxgAlth5hNVBqmV8HyUouE6lHZtLgeXjqUcYSuDIMBAYGlgyjKObQ3IkhIT8za9FNxdXgNhWoSUwjhW61dQxCPu49+R9jEz6FJCMMhjokP0nAYMNUe5iqik63es5muK4GbC0/6e7T2mv/EFEaZ/xXhezyZScO0+CqQRDscTfhI4CkGa0NUokEhIVC51yHAMkcbYROL4UtYcHJLvIwMBtQps4KMnTYdKVv9ZrSDWe9KwLkuLEFyzsHuw2AxykmdyEahkM2wlgdAo1VMEqmyQ/dTFbTzcB33z9sbs5Bd4wXLtDpY/627HkZiZkaJkeH46oLX0mUgOUylvoysUQq+sduVfj7pDG3hBS18IHDY4TAEcWcraL4Fc1tQNFfp0WY1Uv5NaQ77WL+cDlGuCY0EHDxzacZYkNhkttYAzAY0PL0ZoCdufoJjjyDo1kPWUYxNTCUMTyP1yCO4dNBNV4kUCmQ4xzuIU78csKhEGMGNTNnm3rOeDMQBVoCGv1ADtFTGBs1QWJmRjYTPjbNegZG/b7hnJwdMwxIz2tGXx0k/ZOREUfBuzyZ2RnP9pNe1o1qDpLeZGWwcjPeZ2cwrnsti/S2dnSjg3GBEH5y7PlOHwlSn2m+iHQXH6JAW94uj+jN0mc/723qD6Sk1qzu0wkiHIi1DLBGwngUG9DcXQ+x/Jix+AYoDTxBn2jQXZeBOzttjBBGodZEA7pGBe4pO0g2IIMz3eAhR0l2MIeoGL84K7T+z0NhH6odWSivHF2orR6brSgfmaVVJWTVM1mq+gTRsrCZ9b+FrlmhWwOV7jZObXKpHTt/cPx8bdX4wsGxBVolX1W3klUrEGY1rKgaOijRQceyo5lxKIS5ZLi0cE5dnHOqKA3rKM1g4+xpTklOnqGKfGE6lsCqdx9nWNE3yOlMTlddWyAiNrZnbv3c+mLyRMFwY9ZIdXd1nRe6qM0BQQ+EIYNNmbN1YlrDb0+j/W6ZBNmHsSKDItMz+S7Pw5T2XrOrRSN8IMj/9lVQILy/seW114QnvCMo+jbo4RyuwVRr9rS+Xm8t2auz+Pim8KbAArGau/ktcevbK7lmiD8FfwrNAu7Wb90gbt5YzbXyKqTWq2PUNdSauZg5SvJlIEBw7LGu+SPz2m+WHQwNI5FPaKCweZaGZZKPMUXiu0MLuXj0MeujlD7aUU7f/uR+rvFF4lRi6RBJwB8kJZY+t47xRS7pQKdTa2iRIL7RK0IwRE4sC5yBXExjR+zv8jhNkedjyGFlIcnR70NFRO7vdD9FWT6aRO4WipxfiwOdSG3yITuYAKhUxcTdV+byOFlMY8Zoi0QqK/AVWSZ5YFzFUX4CiFf6xTjPkGAchvlWXO2rPCyBkanOuUF+lrm+ScIivqS9ukDCCPqNj4ZfDUJ6U5Z5ma1TzUXll4u6BU4SJwH9OJSVEp4+X14qG6IEhuNwRNoTSWXqcmhqtxRmwW2KFkPxRyifuHbMIN/ckKEvd2+1vs+mYJLizZ+mnlZe5l9W6B/T9oQdWhuOrxCJxRe/1F2aL2+aH22cqc4PN/tFn992IHkAwwpv9kjlo3vj8zOv/RavcuQn9wtNVkImFAXngsVZZ6MCwlAUN3xpUAK/jRd91va63G6vc9hadRb9lKsyHtHDJ/u0JKaexfELVuWJV9w+ZRnhj0i9EkPIqS54chEsJM5W6tk+13tSciWbq4PU8FVhZgU6OaY3NSYplMKl+UqLd0K36GAXcUA4sTQr7KQNGZ5xSOZBCXFWoAOg4uhgodu7CvPFhcJO3WuXr+hdST6Tcq2uMqrFl5kR4u3BCfVnOQbuW7wUtH/pe8vcOfvYbi6RWDemLXwPGBy3h2GDcXeJdFNOlpaV14nx9UhTFa2uFpqsmun7ongYQXLDTuYubI+PVNtck/m7kNZqsmin3bDQmyywQNeU7MUz7vwLYaFxNlJOl3v9xOYoPMfclI1HOievtNPOvqGlWjfL8nMFeBUSPXb/wXFi1Dm/Kg6w3DQ5h+yxu5qaQzXwmuQ4JVaFtY6zuE+JQLpZ13Lr8OjNsUJ/ewGOEBEQ4Y3ztifaHtwyFgoloWLcbGPQcLIP2RvtZ0uF0quzcjN7aQGRO/MBvQqQBehfAR7mY2eh7YNb1tmn5qzUrbaT95f+KwqN44LQhz2DRxOYFYMjDQLSpeJidUg0o5huhDXIZ6f4u+90mbM16IZ7QknGZeF9Ndu2wsHaPemrV1J2VHYe37xT7rs2mmSymv1k0rq/17x6RpxSxk8YTPGiwB32w5N5MfzJ9Pjln9CYfKbWHMuKCoNv9Eff0HSBPtTIbgCoVKcz12fa0yv6GXuFu04tpw7+sTyxmjBReKImU3r8VNGEYFhVXiEWlVerhlnJO10Em6cnfvCqj116z/SDR90QpLZpNTTsOTvEkmgdb0u9IYBHMX2WPtpX/+BNT7jwvl3GmsGC4WnG9/JKxrfhSTC/2TfBL//vyMoW4u8p7bnaOkfVfh4kr5bJf/PvQ8FDwzd8RHQFi3ySd7gJN89M/Metcr3+OtwXG/6Ik61uifZqnWjL+J2BQGB0ElLXaPFb01qqpLYRWhRMYeV1gLKEWeKXAMelMz5SiQ5PrG8t7ThTfk157frrv8fWbHMWpKn9pxFVmnG10Tm3sXvNMc038OEJGDbU5x75xFULamLCyGzC3shlYgKd2V/pml9QwDVPuetSYyM6Wd+Grj0w911Yt+g40+lfaf20LNa9l3hg7vAJXYvQz+1fm/N2DW6yDv7Y+eVkzg4MfT7AyfNi+oio7+HLuTL3DlVhT4dOz1aoChDzblebOJtiYqsagrE19R3JjzjOVl1A+/NuKOHP+/VntPm2CW/l/8fX/54cufNHG7gUVpHlYu/apirs68rN6e0sUkXQPq3PTTz1b0kRu86ZSDKJcPR3j6PD0hyKzAot09zpOHcFUZTSey08w6LvQiClYvB7yUSF2MOdRHdNsy4yL7RK86GHumeFeRzhYXh8Qr+DoOOn4o86+Rr+R/6CRqnx6t+KV2L/+Gt99fJfr//EKvFau0x0tIaZuoO6X00jnRtG+jeK2uPcjLUU1Dz9rpF9OiN8/WcjvpB3kJKy5jcempu3bG4xq9fUMI2YQ9SBj5vN16zx7vIs6IsrrrdmSyuMP+7AKrGOXC40v9CDf40NTSpG8R0I+UDzgR25ZYwG3xLhAlRVzCeokrbfxC5li2QX5HKx6GcNUtmDLLvwfBTtBodWRVQdAOpJlZdFlJXUkcc90YSJ/DOz/LLgeIqcVo8KIHjhAsnjIaltq62np/iKnIpf4am2zBBvlQTPbyhJjW5GQeF3oAHTJzq1oVTaA/xjm38IRhll8lY+Ga5rPhms8Ce4bsGnv9lhx7msjknN9MzUm3bWON8ORxFurG2xupXaQYGH4uDskv6Bq2/F197193FKcXD/sA5qWuX9MoUGKnyz/slwOX6EAaMeEolulei0W/AEl7/y0SCxSzataeOMcuxwr+0IY/HsNnFPzso0zb3Swtpb1QnrNUdgej1/PO5fUhW7oZpaX9/ZZyrf9xsAt80mSSpQkeQSJFnsmBOnRVLRu6KqKzsyPaiGK864MBw5XBwfdYV+RcVXRQk31j8dln0btYluRDqUhcTIfLINCLlDvmQKLNSPcNxXWrfQ0tbiHjzBS1j5eKBC1ql188ri7fCPPWA8gdXGh+SZsMMLtcTjnGxp6pridxSlC5NixliOKA1mU/1AwA5jkx/InyYzQcjUNf4aYgXlQPINIAXSI2Ni+DFFpaU58GiTPRYHSQhW2PyGMS4V1+avHK0qvTU1ZO2cBseWG/es8Rsip+QMYS5fP9gWNyVl7bC/Ihh7shLUwbRGvhXeAavENpY9ShNPROk0lnvAGP90Ubp0MqqQbiJ7fbe0oqr0a2gT2T93y6oq2CXw+9ewhd4UsXSo0PlEaegcFqkYF6Y7RW5zm92CJtj81Y+HNP98NFzljTJhlEMKO5z1N6V96s3M9KSmgzXOtcOROBuaD4dWhONs96BmfmupM8aMX/5oKFvvGGxCbRpxHiZV77E5UL0wr9hrij8jMob/4RSc6xt8tD+UnVYhiXBH4kVWBZB8C5E7koNNXmjpeJhb44WfPYmOSyzkBjkjESLz/KP51iJvpDhQdb5z5P1fILmK3rlTtLNpHyVqX2csFDlsFervw2MwJLyLcd1mU/y24jShIuYcHYp8z1/j1wRg5+I4zc1NGOD7T8r9dXH7EXGpBqZrqcZa0DX5LhZmt8tjdssxft5yfdM17m5S0G5WEE9lWvg/6SMVtNGxUbX0x/mq0KO4UQv6exGiMxE4qfZ6s4cR7OSCdDmMCDxrK48wq7PE0W9QzbWtI+gOW6+GQd1JPhclJZXRqkiVZ3AMdrWcZpnNrljBhNA9VBGq6JJyySUfdzKh3wqofRHHJgxN7FQeIXTMSkUpn/JVbHCMJ5uerpWSi1YSVFhXss+lgvL7gaAtV+oFH8ixyfKkUKHu0EA7B7QpxZACQcNMg8N/27savllv5X6VdY4nOdzVAxpoa5/Xj2yM9h7+191LHpvkJ4ZBu+SYm7mCyBpQ528g6MYHonDj2lOjuf11MVVCcCPZh4iDx2U3bgpqADPycXCfwEaKEDwWMz23/ykk8Vpnx4uyA/DyQ+1PRGYmVOAybPlkdPMWuHn7/1/OZf2qgHJpXoboZj6jZO50IcxG/JbK3u9K1cJBY8MLAj2cvDz5dhw7Z3gitMo9lh3X6csyzI829KC0hNoxKrzrz7E9IYhx7bECFKKzM403NZnJa28Pt83IHRllqDpztJ7KSJiZyBK0toa3vT0272zWqNucuWFnekUSWeUIGeRxQwb6RImSVho2KH37turJ5N/UvR/2kvdqKbV2kXd92EX9K6nfqiiiCJxnfG6GabCeL+5YK0mgqBfTPZBEkU0LbWvZ+viyfIlBmlm2jJk429L9IrXWA+Hs3xxAFZfFk6FIpMisq7axvG+CxhZDY01ZSbElV5t7i4fC3EfMvirwhtQD64hammUsn2jxYxVvMjJTbZ4k+mkZOth3zvf6nk+yu+jJ41jk4IV5FGrufDVYMjsnAVdXVb6z82BJ9XnU/DzKY+HssI3t8Fm1zfCQzdDzbLEZUue94w4N8TYeq2a+fh+ZTMzXsEv8cLU3b3R3/HW7Bl/ir7guLxwf+fr/bPBTJqtYQiulRmYiOARsNpFxmSdtkZQmiOaoBEp0WUxJUjgDEUcJ9OLafSv4yrX1IjLIabD3mASFu2KkCsYfE8ijeGrOi4jqflQLdPKmxn/8N6ZclclWlWP//Rgf+/HDbbTlwQOPtknL6bX7Xo+TW8c/XIOHkxDYaIJpwUpQ9lLsMlBpojC3UphUnjtNeEkw1HZJZ5WUMVllZSxmaQmbWVISzIBHReXSov0DaDS4fzQN7/1j90W8p5FUPxozWkOqOR9znq3bScd+H3m5zg+TBAcTUr2PJmhOwCMwqfYUUYi/X252fpmci5sKQoGf/oVlZXoT4oQkAimDyA44F/KHf6wCQ0BJg8iFMVz3lzXImLTTSWxKYhxy02N/g18tgxzjT+cWc07iguVeFqpYC8jr8j5o+/4h6hwDinrP3+PjjHI69HETbcKs54AaRlSzYs74yG6QtOVss19/qY0CGtMgoP59/jhMIKsWm//5Wz/4GX+vmWAhcLQHzYPoaBtCdvmz1e9MkEvZKzsYAeeDSY6IgAkhCC3X1eUrYVD6bG7FUXDnWvXoxerakbbyVSOXaqvGLkX/eJDRKBBlNkglmfUiARqW3TDmMt8HSC5ly1fZv+wzueW6YyFuBVS6Wzd1712seGfmtnRi+r2oe1CCy1RNmdkpsWnhp7OK8n3lHrB2utd0uS6xBqGujjTYVCikNeHDhBFiReTDCSQXRXPcOsa2TfDgHei/oThK/y5WpFNNZwJ0agEXPnDREdvCuh7SW+pFQdLaUwpqOmf02HD44c77cWNcv15uTsazzU05eIpgEOHawn33jcm9L3/nYEKyj8ELN5pZOvsN/9/GsoXkqkXY2RfDL3Lz9/yawm6KsvmXZrd+1NGbycSnsJoibf8VObzP0gnGYmWSswZPPZ7bg8e/7VyD4WVyX5CFyOWhwVJ5SJhEVrVlMniRkEgU4g9fy1JD1+fUCv4//64J1gz/4TNDnH4P3jr9xSgmuf9kD+gCLrwxARuSut7xje9A/Fvn65Jto8jf8krSOx73o6j3cyWOrbxTeVtEETLcJuArEKogln62qCsrFmLnpRt6ke2x36/7+jO8B+1c3abygMHP+0Ml5noKrkVaiqQV1MBxU8kVi1C1U881q9paO1kXTM9Wyp2NU2dCwoX1358S9XveeG+vyfHUpB3+Z3Wac7UCcvBF8D8kiZIkDpyy6oH1eu7ILPCJZ9PAyrVdOGFlPPE0/JDUEYqiJCOpsxRlsz5JMbpdZANO3TuedSjtj6FffkeLipPc3dJ6z+XMzvqFs6U/qoGj+htEzmf8ZIQVXICTpcTmW55bFb30c81RVvB4nCyZnm2Rpq6LfR8Zail/noY7KX7gz+k6QpvKi6WB+TEqmNvXc20bf14DWrzz3AbsBUfLWmbsHlt4N8gqkXVn1/+edbWY/mFtbWiOt4UqzsJ5SD+v/5fNP3jZL4odmRdllXl2DbdXhcvO6ekuVOF69tQvLrYVX8wT+QTQ6DC6Z0AI1BkRIDDNMcy1EnghxIFetlxqWLUjrbArFEPwC/x5agUnqySJ5I7A861zjXMt+W4ILsbVIRztHuaBtn1rii4OIydUF0n3ZPUp3bo6116p49BG9i0Tq+id8tdvOzyxqVycPrfrZhIPvRCk/fGzn9hZ0VlBo/tbSWK7OfrokSpC5Ene9QnZw6TbUC298ivveAeW9bSseEl4Spm3UlbjhTvRrQMTHWS5IOmnXeIXcjPKrlQz+ui72qx34cKjlomUH8y1rTdK/ih0yzmW8ldViUSN19HKay8oqJqYyjB2DxjEMPM7Cm/ltrgc4EGZBEKiPTIwGxksts8dmUmYrU9gHUkIhkS+sofhEVH0HcJ0rc62S13ctWGmXDpwgRbdjDXezHz8lx2WqThLStihfYoXTcEToiPUi4p6vX0nQ29dnS75Gn/NXPcmSeW19J9naJHlodamN/a22lLHTM1B2DqWt3GCdY7uNX/hi3s/TK4uZ5xTLv1xyiTnMOqLENHG84lMwzGwDxhHAqZDi/HFDTLN3dKqm7qmiffEYTO9CrG0coROS8ShU73JUjFTFTZDn53IoqVTFzZUcO4Sv+bZCx6aESyVy873UdSm4EXSIYrCFCw0/qY0eIhfHae0OrWSx6K/dAW0USECk59953the43+uf9hYvzWGPJuXnk6YKOG9/RPK8J3RJEEKDRhRV5TQ7O60+NcMFHRKYV1iU96w5XP0yJx6bNhw+aKFyNJhZWe3CFGumxRRdBWHGp14xsd9rl7N+JDX8u+yNgE/aCfWgmpsup2HcOGMaQtyri19dMt4Vph250CNL/x9Re5wuCYdfunKUBmyaRkflp9s18EtR0HThFqDVl8DQq/ezR8liGh/kBbxyX7mTb/tJWhnB1fm7vU2+b9x677jW2bPvfVglih/uUg5NlG+GOoFvjlnTAGk9XoG+kVduUJ7vn98cBi7pK2tL4IKrKO8cVTrANvv7TAYiOofrm2BHOZ8wky0vkepbhn8du5xLD53mTJ3y+ZNO8S5+9B2pD7kYqRFLV6opF1++hCr0aSfMb426ZjPRI5+lcD9t2QrAPFLMBasG4+mURu0LSB4AnGOvpm77ErW1ekl6QFiuMbg/ety07N8XXXzdovnN4YmRTaoPl9N4IPge4xfYzda2HrhTKBvaOFx3f0544gBN8YudsUU6kuBh9S2PG70ZVd/nNnYHXBMWk2OGOO0BOa6FMbEWlpavMR1FvisI1XgASnogtmj7aLZvNr1EWSGWrpJHL/CP3dGWM2yHGhLm6kOLLU47XE4PPU7FNZtHzgOtNCHia5uYQOk1tcZy0eL61U5flVcthDk6Plauzq7qqq9KwEVSxG5GJy6IhFT0VT0i6XKVKAb2W0nB1/lTVV7Rlh9hASB3qS7oHNsrXWEyk9Rouq+WntyuX2C51O74yqqc79EIQC1cOa+t4gN4B8JwjW7pWhNYJuoF+flZZK3GzkyRK33xpRW38vBzf/P4OLIAjA9wRnlhG9/f9n1vHmjQkB0HDFQlCpSwLH4Mgff5mjtVi4cnJVo6x90wHZMx4A1cdk1BRJywaEjEmq7u6CrE0IJItTI7aEPK40KG9m3Si+BCEbcYUPthOaWclFKSpG0O8Hdcu9A9h8FIDZ7/cAxQRT27qj3lHcU3CmFpswy6n0j6sjx1In32XNogkBcPlig3QA3W8/v/5vbr9WmqdKkvBcvJbYfAebm63eb6GtJiQ5+WUk8MDDEM/Gy06WzPiDcMLuxLkAJd3zu5P0KO8frp7A3I6W/MIlE5Iet5A4bLDSDyR5zBpoTWwBhuK8c30jVsnM+sfYmbVJvABoA/NR0F3/cvyytVLq+9eX0w0mT/84zX5wKkj/DJrP//L+0l4YPHtxns+o9ZRKeujf/cg/MzxpZMwp531Qv9wec4vQPxW3B91klaysGqXq/5TwIy/X2x+deqO/u9veXK16e6NCdPbqafUxyaq038VEtJQ5XqIHAO10PoWLDhKmto2nKDvFzRYxDtEwETN7PFseBXCc9boG3HCcDENT1smSCR/g+BAwltIMM+7FLsIZgK9PpTC5PlDss7/V5DOy08li2V8jcHyIiW6fM1H0QyyScN0tWVrk9bxvOD5pfbCxlAeSGXeO7hJvAlBOPr9W20lHOVVv0Pn1ze7s7JdRWWsNvH+M6R60YWe++zAMtNVJG6iplBOgVX4vlysQVKuKlUpbA5tVr0EBJDxI2jGHi+x29knuEWLXTraGp8gEWc4qQCIFS5HDBkAPieCBWeKRQMEqq+dHNjuzaJVLYMx+RowJjJtHYkUXZbY5QoAwrLWRHqujrNao72R0F5PZMto/NoKuFSCslj+KA3V5J4ziJKdkVEh6h5G1OU+0j+hQhE7kj9SBgILasf0pDhjU0EgulqCyl+KZZAEynCoyMLez2mkTE4FuJNmf5ZGGICDTAj0ggAi0dRQAVIbOKhEADkIkaJiBkcLyETxxBzKLDSAwiGKnSGNhmAa6YN+IJSBnqxIgrta1tyMHoNzgFgiuHYLzr8PoLHMph3A1ZQCust5BLmpTFWfLtrMsusDQ3pQD5/IAoQKQhLlSLV6FZOgcYA81pKvHjHXCCq4s8jYCuF2JEUBnVUPR2xmanRdCaDZ+LW0I1nguBF8tL5PAADLLtNf1jY8JASkLY4FmGlmkxcDiY00be9gVWBUIqrHJ2+wkgKQW80GaaZ9hPngmpcVHcs41zvXabG2BO0sUI9fnSgF5eDY7CTXFBLNDlHVU7AB4OoSuSwFLjE34pVEfZMfOGp+Y+bVi7AyqDri6Oj/OpO4VSU7wfg3vicAy3wC8f7PuM9R6vNwelQKfruNHgW4cbD911vOE6plL25y86ebu9XEw4yHEOxxhxAI53pNRrCi/qkD3huO9m5KLzSrGqFM53cVkXGxrxRznIgpq8Q1HeBbgzFzu7TUlsnJno7RCbpTOPsrn3eNRwlQ7R/HSdtQWaIZdC4s0UUN1qNsJ63RwxD1D6/5NJNVZ4gQ8EDVMmbm+yWrUBt1O49W1oqtFhq/rdeqbq2ITZ4P6W+kt+ZOSnRoKSLLwRdHM+hVR+OUTufNFWOnvoMS6A88P3yXimXx09DHhBjjAAM2y3jr5haA2sc5Nltnj91H6o2//+z8Sm01+n0ta/OfVzfh7KvXfzWlTfuzR4nF3vK7h8G+N8n/+iLP5l/qJxVji/tr44AyDXf7+t1+19ewD6qWqyXqtahF5224S1AZevs+ZX/2hXf1m9fXmHYJQsJh6o+NOsgBwb5cFIXUeuxzPZuMiejFMS9h0Si2kZqeJ6E6nLDcBflUEKrWeygh7UkZbdGQk9xVRlWLUURsmKX8hywamDiIyKpIlshyY2vfA8NQHSxi72ml+AdUkJoaYobLUGRAneV6ShquIFOligLw6XRccLdICYyFPFNAcwtZzG+xywE/Mm3cgDmavbI5SqfYFampvVUpkJ109HcBMDB5lwhaHDWXVhaETcYzJRLObs4urIz+QuuXdAHY5IzYxFau1vYwlUienOLS7JthJFA02SyQohPmrQFBGrIvJ0MrCHv2hx9ashH+TpABt4o5r4YIQeS8ASM24BlTqZrUxP3sToMnK+IpWFtftLhxQIqurQkS8K9gsSxYVSkvSNBdbouRAAg6xlVbXQwx2TTq9qnDxmCTTDBmiINBcUnYVRpEqstS1Sj0WcrEGb3leIgHAAtNc7SRREdmMB/JBad/cOWFntJyw3F8UuPTOjIkSvCI4eGibwDJXuLBnhE1ojcj0eERFGJmR32IMN6QZK8Xp43PFVTGUMihA9fay6tEt0bpriTF84sr+AuRxKFeauJ+jeZfxgRpT7i8a4F3KAd3IA6QqRvtP0R4hyZRoBwLShNlNggHYhVPqVXf98wOY7lguSc3pw7tpjpy96BjGRn0qw+XqtCnjntsi7lv9sRqB6lfDver7/x2nT2fme8muepuhQQwLmoa3/RPZZbJtnrqlQirpcctcsxaMIQKQAxx1CHCCdbTekqYIDDePREsq+qGbBxt7KF6wtJZ4YOuJtBAwejQpt4bKENxEsGAWBeicbYxTRk2zFMtyKbdkWZvjjoMQq7csXOaSntHB3fUL7sGogiQ5v4UNsuf/zT//Wv5gRqXwFWthJye84fmfh/jY9Qu1r2Yqe0VYqxwrzsARlfUvr80+ocYqTnLmB0mi8309243v+dJPlhcFT+F8095sBz9l36FowQWuHN+heQzB3oJsKxkGk6FlarHIe3E7GQBtvyCIQCQXzTSf6HICaQ9CdcdA0pk0sJ/dECCchkotg2OdMdJec0SyV5glupgpiVaV01BWGVAKWBIuWHokNiLAUuMPplo14QoW04pSNJV676ndMtKVqFf2DlZHREBioQVd0inFwPpcs+i+F18ApDj2ukFqZ9XhqAFfty2RI8lppBYxofpkwWFBFqu/VWB7EZMBvZbFJiXsyxSYMWD0wta8TzIMAvLWPyI43jE2ti1EJtpe7GG5z1gs4BpDGy2KQHBgfMQU5Y/LAAHWx+RYmCFap8CzWgSBsJxCIVbgF/nJYPhkLTKsFZ4RBoHi8APA1YJPlBYQL1y4M7KLWojElnA7EbH4jtMVdiS2FUNxkb0SRXkbwoOPmxL5CCUlRGzsw6UEtE6WVwCafLg1osl6QOjoemDheK0sU0+0FEZMQyRQuocIo9gYzhgGoQtgOYJLxBp909GN6aY0mOXxbW9Q7J3pRhv1GRYYx9FRd6UsVzcD25PYelVe5F5w28PhBEyzWcHMXAh3sYwRPnVhhrnA5ASMqY4IiIgS0CxMHdL02ciy0pktHOI0ZljNBaBsTFA5U0fbaUsy7teU0JTHymjLMo4n08NLECHIA5huC0zlAPSW88giKIvOMKWnrhLcHtE8ZMp1/KEzATjuhGMy0EeBZNHMvQI2IqvpKWgwhcSTUICMq1FuenbuKFFwVV6W1Nd5G8FCuF4DdaDkEiwzfVV0MqGSzoSGzySRoFGM4rcmf5W8Re05R2E9ah2HktYAoZiXZ4oqS8wnJMIdC9Buq+xjzp0IIzi/RzKWTELZNXFkLRodasIJzhjtSDE1VQu6iQ6MMBPUCL6SNrAFFwuroKRkcNYu2u76N9WSQady6TmaSr5r50hD4d6NTRH7qKpU6pPp2mgYt02c1ECjEtCHcV7DQxSl/x5XT9pXbxi62VJEJOfk7hqGnnCU0o/10/kCTR6pJk8OAF2d8PwhxEIImDzrXoqhsMQkRCKOKQrg/MB+U0JQQRcu8OIjEM6GCQUQYw9PmaIkmoKlFxmSmOhzAEom6Ne3UCxJhhJsgv1OrzUaa/qgXUdo4EmdpF9GwbYo5uYAP6GmVV9nG9BMsvH0SIW7bhjCHzBsBVbATkevsyT8XA+oaYxAUUBuJXjGs9RY3qyWja1w5tfRPHr/kQEwxURwkrMslIlpkXFipTrGMGHq5G0Kygy3DtRmS1SGpcgJIGBSKQdKKhRnDwkQ0L1sCM0spmYBreJR1VDQu/GRmAp5eg3M4y0iRGRRiRbRcMHLGpJUqbdyJSpZK6FFFw3RweBoMsD8kRKIjnFBtVSyBUGTR4fzJyANEGW1YsP+Q6JL3WNj5mbJVPfCfdu7VRw/t3DtB6Syo5wJ3w9Ohg+XKNXn7iVYFhwhfIvcfb6e/rWEWcZKB3YAH18EqNwCq1NzpW9n7y/5yCSBy6elek/JKlJN57jddx+Qi7HNu9maiY1JD1Uv6Ghx/O476bXqcin2EyDgQdkyMXF5zZn50SfjV0QA6b5LkRAmjKfoIc8sn2hb2hKopQ6QYQkljhmBG8xynqJv7AwaNGKx9XD2WC9yISb0VSptJnq1krb4gE3Ih84gxUNQBnQQr+P9GvfwpYSYFsFTJAA2x1fgYGgRmgTa9Xl8mqb0qJ4EMy3OpqVJ+imUx5GVrmBqY4auMYn6qYNIMIsfUkQd0yOpFZ2JRpvfV2RKEXPdljvW1fdX9I45JiZ2zA8PM/mf9Qe/BgDg5HGofZ1v/Xvt0u6LFfVL0qf53hH/MYeFHcL7qMZUpuv1HB77nr6+NZ73KmG0fP7jU9DYnXiIEJ7Rc2Ogt2oJFb278KP6/O1vvGmPV+uP+ZfPx5vTrj5hMaT7iodg3NydwrEn30l1emWztqyzCEkXoCHOt8wxTWtbx+OMdl0VHTEblOx5PHM78Uh++wCrNEOdQUx8kXzwYfD85gXcNOVztPC6DjnF9KBX9e766v1HkyMrr/Yjc4v+4ipcv3vf1ImYvKwFBgs+AAMN92xmRVVnZdpgZUuP485Z2zZBTbIlFpKJWoRPWcFmR2+3apRkmQQ5qgENNNOETe5ZptiCub5Vx+AEcBbBbWBIvnsVJfNhS11dY9uOVtQG4FmvXdNqik+7wIabMslV5xS1rAN5OrTiUVKmwmOejyw6scbEbi6WtJBVrtdaZLjxxhhDiRLF+h0WLg8m6zNhxlsxtqer9U4SFuGADqhyAMDpMCdv50x4WUeoe7vrAn1ecRHKq5QGSMtsGKsxZtVs40nz7i3hxi+C5ApFIFF2dRgbavoXusAc9Ugaw7TV0UfbF1Xcm+xeoBQQ67ErEAGLCIUvM5ek6NtKJeVygsVNSAQ6G7XNwhTNHahUcMK9mNHmBfO2JlmNsWZe6ZrmwwahdOrTXV6PiLIl6/EV69tFLRnoW/a2DBigQTNU5rJCz8XSKiYMZjGPzCAeK5vuvI5plUBFNWA1Uh/b5iwxpAUqtxxDMUZgBX5cey6z5JYQviyK7AMD5lv0je/kKFDzHwuvDVO3lWCW6nlyvOc1MEi2RqDAVQdQRbFYthnPMx6aTG78UnuD7/MmI2IKaIJmJ6mc+m0FnW33w24RkryC+edN0uJi9SgLkFsQigxb7Fhx9cI1PSVKB8FECFDCXdFQm2sB4e4Zoji4z1wrmdBnxLIpK8RCTYAgEru3kayyELjOU7vjRQqTYoP6iuUzzdDabeu3zFYYvYa5x5wbWOPuux0GPVwfrI7liYefjPPwaK079bF2ZJ6jBRDW8cdiRe0XHwqRiwNfuafvNq8CdC2c1O/d9LwcyHdt4OjhYy34tn9rFRXNiaftxCv749vqhe2xFiRf7wN7+nrM1x1CIk+30+Xw2n4jsPJysM7LW+UC4JQuLWhVq9kEAhZDzSaPtpzCY2TFbgJ6XRuWTt5HWauhnuiR3a+WtjOMaim62EyWm7n10tnkzfWmqrEgqHsHfnu0ppfgwRW9nB8dLW79L5VtHrYwA//zEIQKol9NXbSEqSCOMUOdYSKm6zEDSK5jchs6v9XbSf4OoVEQcV2vDvHP8vTgtifrXHGDT8oK2iy+8UqPOsljvLgagyFJI5YYqmz336ecuzMZkufIQ9Zmo/ujlFopN8kyAlulXKvyrz69FEq9vYpxANItCBSI8hydnpsabuxujSAgYww/tvGAJYZjoGYolMJZyVnEkMiJnnwbjOyhjzOEdQ/sangk7D1vwoAPZB9X/JE31djrD+er3V1IlO2lMTXY+0tze7tr0UPldRbvlpwI6HZxEOygPTAhTFQYV3LwZql/P+jgcw3p5ty84JpCzG3lImS5YlMbISZOTVHhZrEZzQUmkuiIFAkygdxAsP6GQERqCpAEOUrkx5sNVcqZhVU1thC0fpbfWXc1z8bEOuqsuZ+0JDRPMUYEt2gkm/qVc8kC6IsAFWU6wK24vJjuZBExFvIeExUc9biIkcZFJkYseSvqARiToukIYPeaZ8Ugbo1yIlCzD3lXtU7LiOpyfhMHV4PnnidfNCWIL04SX5n4KibUNmewBDDj6K9DUIQJv4qoRcyp9dhUJp5w4QF7eYBi7LaECzy+d6UMOCXOn4fZqo7ERtGVvIv0lkdveS2kB3jARdo37f3EJ7J8PvODHPqz45v9mmxeY6L+zFlXZOLVY+kyy1Nk03CduxY64255DBNTBZqQIVJ66DiN7924EnjjbK7CPsTlH4tcNGkZTpKlSvOT8bVaDpRD2hHiSuARdyc/OCaeXzzdWTziCAE0n8HDahhuCqLUlQUQ4gFjObnY3HxWiN87fzdglpAP6pxuzm0LkXFLzrIxGRi4SYQysBhpIuxPJdOMTIrprrg61V8prLdbyfpesH3aMy2KFsOZkhekIn6YjN3Pe4ncPRD3FCLGSR+la7Dj0fuW0w51eXb0TAazUS4ovCCxyBQYRvhK1m/fSlWVQkOn77Nqdckm7u+cMkEzFM7xwP3FaHh0HI3zWQy43X1KeBZvsJd7+R5P2IMxClEQ4/01nExnx69mvVkqWjy4mz2dmH99zWb7mBVlHWDjpfo6uNuBL1vf3H7hjmpS21w/9n0gP1ZvLV+0GN47pM9tPutU9XD+ddiYQ/3x1fiqn8/D79XBa4jsxuxqG78B1H2u3zlk/3tEH5Dbn6wn5Jh5+FL7h96SngpHQ3ecZ5MqU0FOsc3p1ngex4vH4Brr8yKPMfvGlCbXg3jgcTeuGMnNl13cqu2G9dwlNd9GLxOt74QqrEfhPCZlPD9/0e6cCXZ7v5fXrwj+buPbrfL228y5LcH9CpoKZ00tjz8DJUXfGT6yv5w0r47wMln01Qw6zW8NDDk6OMK1IsxUX5RfWJWywxTY+W7VHyEmZGjHqgXZHjF4bpUJ76N6RUsuV4dNqcgaaqD6JqZ7SxwurrbvfmviBYW13mcyTANPnROxX0U+RCJs5SR3g1ymJTiLOSuozuz79iu4opvOO6Nps3lQhhNoYbsrv7hpzKT7dQpDx8JMm8sSuBCDGeUJ3Z3Om7zFXf+rpQ9ms9v2C7Sgm3OPhcHkF17+EvcLu/1TpKknwQ9u00EBPGNXlajs2M87VR7UReIXpHWR+mjjhkQ4LTe4WMpvaCIREtzNsZvd5woDOyElTZvzaDwjm5a4lETZcfBCy1kiw67+AE0Vuyk/k82Zb2Cpy3jGk0PUe+zafkF1nMORWNVAlIp25HGN33wgTVyqBDk8hq/QQ5JBcfC0xtvxc6CGZslUh3UBjcYkoYhXL7t/SXbFLMqrmAiep8h98jvrOYozzXnmXQzYyT0Ud2fi9byP710pA46J0+dhqkZvhFnRJc6SEd7y4C1Unt9frHvwQVqaFj/xkew+nvlB5P60vt7bzGVjOaqPnHVBxm+sx9Jmdo+RTcN17r7QGnfD6R9TBeqQPna8cOaLG1eCJrcyX6ri8uuwG5l8EpiHKIIYcN4sQfNLewyPFPOkgBBy761AT3gREJTh2B2SJKHM3JXGhaEKEHaY8YGo4fT8yWZKeJJMfaVfgt9Y4oF5Weld/ThL6AOLIWkMJsUsA/2aVljMOA00l6/x/ZZGlLSLaZ6YyrcfFa8GU8glmNWZ/1uKN3Szvy8kBnVvGWW6kZu2uZrM+8bT+WBBFVvjIl0sBqTajGN0ipVborm867wEEIgGEy+CW3nZkajmuTNNiHObQmjcgqsI8I04GzJMtUgdVyRfBdhJ1kIqZsPpIFZx89bmTBSQo3TY1FSl7nFIijLHordbBgYB0nJ41bbM/rLHJo3UiB99cbahX4k9ALqPCccAyPbQ9aKruLXB3jpeZuh1zst2oTJOIRsiRCBoC3/4nH/o0L1/vK6ZoRdY7upMdeESEtkunBR5gTPtsi/PQtkpL8J5oOhrNnc7yvt3DFBFDUSHmArYDhadNp+1/Nh6QEbmHdSeLI+UFKSh/0EGnOiY00YNHjxIzcSExYV4zr4AyUnBeyKxICU5tshNcFTf9sEUATNWy2ZzYFva4vJRVGyQbsi8a8KUJiyFgM0wy4csLQv2ZxdCpE/DAarn4LkRaYKZH5nm7pZcVkrDaUsh3ge1IaxXz/ROAQrt2EL1GwDHIJVx/S6DZayahnZYjrRQqI8F6ZRG8lEHnq3KozaD4o6MtlVV2UIEIxUQESdBY97THJpx8IvmUTeaCyD3vPW8zaTpsHLAx5Zm/6TmDzXY7+cAj0fr/T7UrA5rN3mMhdTtaRYLoetehuiLHUVaj4JGfImPJDYLZd/RVqllUUolQoL7ynR/bD+3XzNQt6vxOL0p142NLIZeHmeDGUbbgpHrVvKDQ2x2dLwJSBjvClvsBQn+wwrg/DmpKnTafgWJR1UCmGvHdzoP3JwQQLbjYxSzoS1474pg7zb5ZibsKecAuHTJdOvjd5ub6JgMC45gfrl3MEbLQeNsxCHt4/8xMCPAWnQWsZgk2Vf2PCypEKIraYwVd/lw7lMOjNYUie+cKIZ9pAQJRVFtIaA7QlOkSWO92rSDE7gXexqoZTKmxv3EYGEUWhWhggSGGQPfWjnvZMqmUEkGgjuf4dxx6s2ViNMpY9MgKwRvTAlTOkFcSBbs+C7R5Crzeclp3KQzWI2WjVWYCAhov/IJ+mlEl+LyuY8MWiiJ1Kv0XE66teAuSkrFW6/5ROyxvP50lXw/8AtVn6YZ7CvKmOV3YOpZnpTHq579Y/jUedKzxQfjOQKVz23mMiXj7JcCjXJ8JNWZwzOHj9wdOgXke0yFn2/bLq+CDzdlZzlY+JI9xmcsbGxOu955J3c1rmjXsN9v/pfOD7TweCe3RD8WpK6DE+CxHaO26ogh2IxfAgjJiz+emogdgv3dNmoDMxS7nHDSrvrT8/992omtXQDt/1ngPx+0VvvvB7RnjYSOVNjEv56/8m9JAwkg3QbAv8ZoQDyjKJVQlnZO5QxmvQRdj6BGFmX8jm5mmqZhxPxVOK2iTFw+GC1IcED5crlWMtfSS16iBBQS7IOfcDFTWXSsUWqkgqGgUh7lp8zGJ9g3CNhqz6i8NlDjKGuJgZJ3A6pd1UtoJXE5ki8xLOot2GQ3odv8uPWPULrWgF8Qfjc6rw9bM1R3yzYbLKsV8/LeFKxy40/EcFW7tmkWsix5IxxmAGV+iS4qPfmjAtghKiV2OsrhVY/DQ/XEhJIqj4SWLXBRTxMM3UrSeA/a3GQb8hkhCerAdiTfsaM+44PfFOoD8kx5/DAwbjVgh2dkssFpZz5rt5izjPEOk+7bWe1mrYMj77SnqAzYKbvzoRvhaVeplZT0EhCHCU2hvwffmHTkB/kNj3NPdaUBEA/54T58lRupG0wbP8MfugrM4NOzII638hjmgeUgjkPYI1BwpeVMHHxelxwQ84IakrHdsjzEBQNeI8JWPSlfSJCWPRNtSkBNP9+L1PIPwrybej0H8+LYft57caB5oPmitqE9i7J1nSicfyMBpCMA+WxAaxjOkLYDxAuAWNB09B0g9gXYA5AHHUhZcJv+Z4LHg6DcmR5L71Omp7VrTle4Ap6dlqarSF2etZ4Bm9uZ5seA/B5zIPW9qlcHYZYQYPgfHI4ZDwhxzSF/jHU4NUoPDgI8/DBdatCf9Dq/P9tC41gxH6+/mhz6/Y3ZwqG/ZbsI4T378oDfZ6mgNeD9D/nf/kFHJcf+YQdTT/8oW9JT/a/Yny73v8oxPeh/zY48eOHrtuWpf8VPMzA5W0GQkEolk4AnXhIIKyzWIAIxyAjmlUgSiEiIyaeoHQhnjtp35SB8OCE0QxyY8oXPITe+TPIUZXMQQibMFEecMfIgMJNnnyjJ6Ezd67wDei2S76Ok4EoyDEwSQmyqHuIS/DZDpEkNl8uRDpRtOsg9QXVotuct0oOZkA46a+FxNuZEyb3tEtxkn67DNh2jSaS8HNOiMufgtr3cic8igfcQYwhuP04nUWCnTKeGx6C59UlIGITFYB7D2XJCCVg47qc5GHjFwjl3uh7CdPB020SECY2l/OhwHExcPyGEU77oRoUNAi+0LJru29POvDhPo448yiN04pYP5IYKwhjpfEhGQR4Bh8j6RAoJZIFmhf/TyKOO1Oah/sBZgEiRo8iKqtHS1qNXn35/vbx+2G577L0QGN8v+UHJDSQ/IvEoh8iZJkyZMWeBptXFrLgtmvaSBv7yzqBcuHK7FthyPnz58QcXgD8PEgoaBhYOHgFR4GWoMGT9MCRkFFThIkSKumzM/xsaulhxGAF2vXwF5jV6pVClMqf06wpd57orT13oRdsFsdnZFj2ILa4y4LMuPU4bcsWqYUws1diu4bjsqt9c94tfvcZ1w+/+cBbPO/vdctNf4v3jjRJ8CQSF0CfWFiaSPqG+QtL48yqtS5EmVbpMGaa0U8m6RNMmNd6aoXbOrNvuxNboj4H4a/H/AsOxO/bE3tCPfbE/DsRBI0ZNmLRkzLhlRQbjkAXnwyAOK48jYRhHwyggDe+AVGm80/vDnI3ioARHWYN2a79jcpkPO4MMlV0FT+78WUmQG+RGuUlullvkVrlNbtddSf35hno4Y0MCd1+eQsZhM+Tx77Y0Dte3DOugjpRJcOgxEOChA0JQrTzLy809vImfHwVVINzTDtnmXIAu3PbcWteuieqwJajHzn/4PbqRhtrY7hABqDNkTXW2XUPdgqw5krOS7UfYbG2FQz1qhm7p84qXT2ytSKP9OXIn9mxpG4yC1L1OsY/03ivdm9FHSaP/S01uOXkEWPGB+0j/5bc4uH2AjkPbBg91iFSPrRGgrW75dwYAAA==) format("woff2"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGTkABMAAAAAz5QAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcaCcWFEdERUYAAAHEAAAALQAAADIDCwH4R1BPUwAAAfQAAAbhAAAkrLIw8DBHU1VCAAAI2AAAAgoAAAYUTOV1mE9TLzIAAArkAAAAWAAAAGB/UZX+Y21hcAAACzwAAAGIAAAB4hcHc2ZjdnQgAAAMxAAAADoAAAA6D0QJRmZwZ20AAA0AAAABsQAAAmVTtC+nZ2FzcAAADrQAAAAIAAAACAAAABBnbHlmAAAOvAAATT8AAJBUlwe0i2hlYWQAAFv8AAAAMgAAADYMe6W6aGhlYQAAXDAAAAAgAAAAJA7vBxxobXR4AABcUAAAAkEAAAOqig5Kt2xvY2EAAF6UAAABzQAAAdhXZnrwbWF4cAAAYGQAAAAgAAAAIAIIAX5uYW1lAABghAAAAcEAAAQsSw2alnBvc3QAAGJIAAAB8QAAAu6KLKjscHJlcAAAZDwAAACdAAAA37dxa993ZWJmAABk3AAAAAYAAAAG/MFWqAAAAAEAAAAAzD2izwAAAADJGsYEAAAAANLOrUB42mNgZGBg4ANiLQYQYGJgYWBkqAPieoZGIK+J4RmQ/ZzhFVgGJM8AAF/9BQQAAAB42s1aXWhcRRQ+G9LQxLY2/bGGWtMaY9o0sWnXRJs0Vmt/YhCNESQPJdZCfaimGGOpP5RQZYkYSinFUNdF4s9DyUMIGEKsIQ+uC0rxISy4rBCkDzUIxSdZZAl7/Gbu3N17b+7dvXd/Uucwe2fmzsyZ8zPnnJm75COiKnqYmsj31uvvnqO1VI4WYibxxvfmmXdEG2k1vCuTz7VUVvez6Lnz0K4EnaB2jGjlGMd5ivtRmkJ5iqq4gRd5gYc4xKN8ie9ygoP8F37jeI8eHKKCEnCF5VwTfBI5xmG0XUBOsB+YRvlDvovapGXUBForqOAk5jbV46BwSazBoX/cOsIzxokVLeeRYxqFHKUSJF62a+MU37FpTaZLywXhTIiZjHPwq+BsgmedVuS8Vtc47+jS4Zh6RqSWTmYZEYaWC7lGnKXuMFbi4FtCZzliaO9BPchnZdlmTnAhDojKsaNFkvAirVriKy77XeNZnhMr4yByshDd5jl3dPINjmp4wOVoPtqk679pT2BXcMLNDstPe/m2dRyPZ6gtbB+632d8GnTGeL4k2CZ4RJXGeNKq9dgHQfiYALDP4m0AcJoHjbvUIIug9FHTvODe1nLcYBFi0BHhb+ScmjUyjbHxZ8JCuEmpBKj7Gh5zI2+CXwvxNNrGpBXy8zB3cQX/Iu3gIs/Dc44AyrjfBt/furbzLRdUntZ6cS13g3PAyetkfRcobeUaWfaX2CbsMdVSjv2OwMtLivkgfMEC7MO0lMlSCdfWr8uUL+YxOm63W2RMcpdvW9/ZRwfwtEtK98J2FsbaO2OLTHMnMxiE9kKLhV1KZotndI+TN+9OGndfkeVyg3tU6SbKEe6z8PI8z6D9iCwJOC78iNRrP+LRGygdRR6Bjgf4LDdzOZ/iDtiHQb4uRjlgtfXyfDO7neUBWDBpBTggrHMhUS//47af2CHOa84L9/mMJXSKiJWG5RFRaPLROAldP2qNl6RHnoFnTsoc0uiC/EY1j8BdyL/Cho7Bi1+CVKPCPov18kz2KGylbuVY6QBiNC1+u+6dv8b+oCpit98w/5KKHWLajoYuBzW94SFF1bw42QCiwpJIrjmfPCJ50Tkr4l/dr3m1A1oMq8qTvN3Kbf5WyEx6bgHd3Cpba3Bmu5SWZ0C2zKZSqX/BdT9fkVR3edyfuehsxfo06zAoo42xvHdIPGePi+J8WiKbeL3k0fuc1f/wNvBrmGtLgi198uILRt+EmOUqdkOH9qZktAZMtQaBV19Niblc47LfPvCloUAvar3DKBcxdMrFqUGPM73GucW4aSlgppPqeRy2LcTdWftOaVGfWRNcY4quiPt60DanWbdVO28HvZy687QJy5Z4twE6NObGJlh1aFU4ki/O9+lyunyZmqkXMAwYyDmyF2fJXsc7sV760lmHbM5AYURBXUVgRF9OTg3pOoQzSFjzz459Q+rmtb9ocpqHDu1xdz9QLNsg7n942H0MpbU5n1iNvlmds88i1gll4hU+itNIN+KgRWAelFZjHC0jeWhxL/zwkHOsW4rkc62HXI+YfMAa1RdNV2KmG7ceDxKvt8aq2SJJFzNeFXeV+lkma8++7LeCWW7DLKcWPoxIfcIdb4t1H8gf4xS2UJr7vlWwfR7OvNCnpewRgDojDRUrApLn7GQOnJqnHdfuej1jWLalM+mKzhHvdBrvbG2/aoSVNRznKUDAyYt4sfT2XwxynQXd3A+UUNtmaNVTdr/uaaZT0n8OeB43Rf+HdPse4u67B3IP3hNKDwOvjyrod2pTLY+i9ByejyH7aT+Jrw3PmMY8K1v2AoypjMrlV/xKuk/Wa2gDbZSlCtqEvIW20ja0bqcd9DTV0i6JRU911ECNeDbR47QPNcLvAdku3jSg9iQ9RQepnTroEB2hTpSM4xtdUduOvN/S9oSlXr5iVIXMOohyjYJaWa8zQBNW0qRAT82KBg0IuV1BJ8qdkurcp7P9gDaAX/3uRvbRGvoT7fq/J+pl6YCUgMAp+NhGGYvSpqhtBmhpDfJOzFAp59efVaqm1UVeB2muhzzvh35U0yNy7AE1xx7JfwGblRy0L1QtgEaVm+gByP9BaMBe8K3FNN5Jdub/hGyVnLOmnSaoTK/bCJVpENq5XkG1WrsRGtOQ0asWU2sj1qFBjdTxSrRU55SdkLvQnTr1u0NKxkjnZgVl9JDSsirw3Aeub4BGbsQOWoMdtIXWYv9sB9Yd0JgqyHs3KGkET6uxb1ow3k+HweljdAIYnqcXsItfpJfQ42V6DTI4A+ig9wCH6ANAJ31En2A3fgo4RtcAx+kz+hyjv6CvMPobmqRX6Dv6HqN/oB/pDfqJInSOfqM/6O3/APohFk4AAAB42o2Uz0ocQRDGv+ru3RgJIlnnTyYqSwhBRJaQkw+gsIiCZIPudWMwCehG1BWRhETIwSfw7AOIT+AD5JhDyCHklEv+PIHkotU1s5OeyY7OYbtnil999XVP1YIADOMh2qCNzm4XQzAcweWl7AQFDbO+3VlDtPH6ZQcP3my/6GJqp7e1gwYTSij7i3mdZN3CKKbwGLN4hS3so8rx2/x0jHP8oCFq0DM6oBOJE53FGvRJ3j36ShcqUnOqq07UZ/VX1/WcXtcf9Zn+oi9MZGbNc3NkTs33uKr5Fu+VaqxTeSI+NMYQoZ44rPBK8GStyeqXosJCKihFuVpBIeWXolyt8VK+iql7paj7OSp2ejdhqum3r+E9PuCQv/wdpt6ihz3pBo/5QPLCXB5hnmnimhNSexDRyhBK3Nn3rApJ3s1kayA5jkfJqWYctu1Q/25+kTM0Z9QxLTmu+qI857NshRCTUpd4zuL4qqPpJfXsDUSSTeK9r7uao+zZJv87Wzv5Ev2aPrsknkEk0abTZV7BbTfTqRjk+WlGIeaLPLtss9BzM/XsX+M5KOE5KPC8klG43rPLlvEcZJSmc72jOGozQ+4FSntnsGa/c/I5Df7Z/+NhPpPt5z+ssIBl/JZ9Cb84Yxk/eV0SfkF6WDFf57WKEZ5IzZPp82zaPZRJPUyfFd9JILzCJt5JZB6tKycBSPsAAHjaY2BiLmLUYWBlYGGdxWrMwMAoD6GZLzKkMa1iYGBiYGVjBlEsCxiY3gcwPPjNAAW5OcXFQIr3Nwtb0L8gBgZ2JyZ3BQbG+SA55rusYUBKgYEFAL4GD1h42mNgYGBmgGAZBkYGELgD5DGC+SwMB4C0DoMCkMUDZPEy1DH8ZwxmrGA6xnRHgUtBREFKQU5BSUFNQV/BSiFeYY2ikuqf3yz//4PN4QXqW8AYBFXNoCCgIKEgA1VtCVfNCFTN+P/b/yf/D/8v/O/7j+Hv6wcnHhx+cODB/gd7Hux8sPHBigctDyzuH771ivUZ1IVEA0Y2BrgWRiaoP1EUMDCwsLKxc3BycfPw8vELCAoJi4iKiUtISknLyMrJKygqKauoqqlraGpp6+jq6RsYGhmbmJqZW1haWdvY2tk7ODo5u7i6uXt4enn7+Pr5BwQGBYeEhoVHREZFx8TGxSckJjG0d3T1TJk5f8nipcuXrVi1ZvXadRvWb9y0ZdvW7Tt37N2zbz9DcWpa1r3KRYU5T8uzGTpnM5QwMGRUgF2XW8uwcndTSj6InVd3P7m5bcbhI9eu375z4+YuhkNHGZ48fPT8BUPVrbsMrb0tfd0TJk7qnzadYerceXMYjh0vAmqqBmIARoqKjwAAA90FVgBqAFQAWwBcAGAAcQCiAHUAcAB1AHsAgwCkAH0AYgBmAGQAbQB3AEgARgBoAEwATwBEBREAAHjaXVG7TltBEN0NDwOBxNggOdoUs5mQxnuhBQnE1Y1iZDuF5QhpN3KRi3EBH0CBRA3arxmgoaRImwYhF0h8Qj4hEjNriKI0Ozuzc86ZM0vKkap36WvPU+ckkMLdBs02/U5ItbMA96Tr642MtIMHWmxm9Mp1+/4LBpvRlDtqAOU9bykPGU07gVq0p/7R/AqG+/wf8zsYtDTT9NQ6CekhBOabcUuD7xnNussP+oLV4WIwMKSYpuIuP6ZS/rc052rLsLWR0byDMxH5yTRAU2ttBJr+1CHV83EUS5DLprE2mJiy/iQTwYXJdFVTtcz42sFdsrPoYIMqzYEH2MNWeQweDg8mFNK3JMosDRH2YqvECBGTHAo55dzJ/qRA+UgSxrxJSjvjhrUGxpHXwKA2T7P/PJtNbW8dwvhZHMF3vxlLOvjIhtoYEWI7YimACURCRlX5hhrPvSwG5FL7z0CUgOXxj3+dCLTu2EQ8l7V1DjFWCHp+29zyy4q7VrnOi0J3b6pqqNIpzftezr7HA54eC8NBY8Gbz/v+SoH6PCyuNGgOBEN6N3r/orXqiKu8Fz6yJ9O/sVoAAAAAAQAB//8AD3jazb0JYFNltjh+v3uzNEmb5GZpurdputG0TZu0TUMXSilQyiJCqRWxYkHAQlnEioiIyAAiIILLKCKiuDCMg/emARE33LfxzXOcwZmfz/HNzJtxquigbxZFevmf8303aVqK4Jv3//3/SpubpMk953znO/s5H8dzzRzHz9fO4gROz5XJhPPVhfWa9C/8sk77H3VhgYdLThbwZS2+HNbrMs7UhQm+HhDdYr5bdDfzOUoeuV9ZpJ11+qfNmvc4+Epu89kvSa22nTNyZm46FzZwnFcWDP1hE895iWTxSdwJWWfpx58+s45L8EaSTFyJxttXYjaZvXKiuV+2Eq+cZBZt4QSDEAqFONkkiDYpKVReEaysDviTnQ5dboE9IHg2V+blB4OtAeeW9LaWvMoqT35VlTZwxoxwrBK6eZu2mzNwNs7PAUKcV0oMRBIMXILGK1n9RLIjLBGLhTNqvLID7mnhRJusM8Idyyvs7E6Ch8+vrGYXq4pzsou99V6S4G3AR607u7g4W5lE9qRHL+C+FRynWQH4p3PZ3KNcOA3wl5yBsB7uLyeYAoEIR9L0SV5ZzAgEZE7TL9tdfn9Eq6EvWrLgRa2mP6wzJPn9AGOOT9KfiCSYuAYAOsEqm4g3kkifyW7ilarTjtX9+8kkzuk1SnqrpDsOfyMZjguyzlBWJjWmyQl6QMmVGQpJJvGwMckqOrLyXCEp0Sbb7AzPYMDugZ+AQH/0HvrjseMPvlWR/qddf0n9fO3ctafWdq3/L9en95xM/WLdvA1frb963bov7/4rWdtGIm1krbIBf9qUKW3sir7OAXd1nQ1oanX5nJer4hpJMRcehRQpCMiC0C9V+8OjBKO3r3FUkcEbtuAa2QJyAN5x+cOWAL5jsRqAb8b6pMQTcklSv1RilYuIN6yxAH38kUJKi7CY0gjPpEKrXAvrmJPULzcx6nxZ/spmpI5GaiwzA33kNOu3UvlxjaSz9ml0jXbvsS9rX/kR/IWpT4tPNVK5tS+lPA3e+OLmV16gb6Ti074K/K3p8+NDGJ7k3JFzh0cHXBqSUkNh+DBccY1GTYq/UatLTSuvKIv9Rw7HvwLLQuSSROBoEpJzamF9nA5k8gAw+WGOJDqcObBE5RVjSLJLLNNVVVYHqwLOZJe+oFDM0jkdZkHv9FSVEbsjS3CJZkIahKrKMr6wa8qDfw6On1c/vjDtr32d/9g97aa3qqbMHTe+OD2tce59nZ33fT47xz9javWtT5KNs25pyvZdefXElzsOW/l6q7Mgr2ZMe2DPGwnPPec42L4reeCMJaWouH58Z7Bq/rzJlbojR/Qrhf3FzeXF6RZyUrftuz/rgpe2ldRd0TjKyWm5CWc/1a6DvWbiXMD3+ZwPOT8F1jmch9t/FDB0Kqwt3YSyU9MfKcvOE4Ddy+DSYqCXFk0/kcrpjmT8LSVaZRtwu44901nlDHhWwJ4VWGUvPHOznVABa24DgvYZhJR0oJ3sLQBSpmZle/LS4Cknl40CKrszQiHZacEtzoVCsR3u0HlyC4KO5IC/uqqywJOrs5OAgVRW5+BbOfgOfSNXN6Fv252Rw9u39XWu65p367r5Xeu6hGs7z9xLdh8mKUeOKH853HnrG+vWvXGrJnXXSy/tuuv55++69t57r+25997vbtK2nz5IqnYdP75rx0sv7ei+5+7FS+67D8Ql7I/2s59q3gfaFXCVXBPXzYVzYnQr1veHjUiyRi0QZxwVnYXGfmRzPaBcZeqXqqxyPUpLU7/cjC/Bdpe0IalejBjzissduNeTbFIJ0KCxWLQd4fRJmbnlQcpf9soGPlhQpVLBzOt1+mRXsqs66MILT0FhjDDBgsKCQrNgd7gaNIxG7eVzrm5e/sLt6/dWrG3tTNCMvqFn0vyarqtmzXt837S5T34mf77q6VvCO3fW3u6rnjY+7/nO+jFzyjzzp11+M5kzbf28CQVP37FJvv2mlhXXlPm1/IyNN0+598ioUzcvuKd57guvPbPxx0/cM/GR5uz66fP4e5bel5PXGLykdMbsW4BeBOU6MVK57mFSXRXpRDL6ZA4ZxswVA1OApBwixqPSe1Bqc/T7OpVF5JB2DfCunSNSItNPxn45iX3eSlw63umwufRcJxHH9CxZ0jNG+Sv5mpwkD5V+oqz55p/KTR+Xk4fod3ngu3rhuxLpdyX5JOGEbARhZGbfVW2rquQLCoOcaCWeniWhjpYxxK58odz/f8jt3/yUBL7YWarMVVxKsjKXwTZFqODnAq4iV8SFtYirRcXV5pMsJySNP2I2cem4Pfyynd0kWBh0FQb0QZfepS90eYL6Kb/+deFbximJ7+R/8EH+O4lTjG8Jv+9Z0rzhr3/d0LykZ9yGU6c24L1quXeF5zXbgQ6zOIkDtROQiaZf0vrDHEE5zBlBQhMOL4mAIhlIZTwh8f6IgepvACZsMOLbBj38pdGAl0bO4I1SssotguHgdIsesZbcM4fsVJbN4Te3E0mZ3q40k+dxbc9qyARuH+AbAHxxC5gM/RTZhBMRs4VLhnUFNGVzAhgHvCAy40ALPG8GhnY1kCDybJSldfpVFeMEiy7fV5lXUj9rzNvuJeV8RX5e5cS6mQ+UIs715EV+FO+GXZiLOMtE348/RNIwVhIsnAFuqY0i4KyHZX9x3jz87MazJ0ktwGoAaRdOAFgjgoFzgS6Ku0aeRH7Sgr2DP4wng9SgQBtmY1UrmC9VLZ4qMF2CQbrm3NkP+SbtOoApmUNAUCLyFlx1FQ4nCRDypyuVtFHaA6c7qM21CmTIIuCTFK4c7LqwHSmXLYAVgcLDKwBCFRSOVNCfqVY5H0iYCGzph8f8VBCIdh0S0psNl4mqbGwQAv4sAeSCxpNbJgRB1wT8VNEInlyzsCp36nWHFnc/dd3U3BT/jCU/7lh86Lpp7jWuUPvGthkb20IuV03bxpltG9trUviDC155dmtb29ZnX1kw87F9t19bO2vbc69c0/H4w9e3tFz/8OMdlz+29/qJE6/f+xjj+Sr49R7YTzrQI2ENykJCLUe9T9KckAXYmQkAtqCh+hOXhQSAo/RVpHRx70eaVFJ/+qDmSD/7rpUgYL8BuuRzE7gwh1TxAFWcSBUzUqXAJxlOyOkgUvOAedMp8yLHFgKhZQ9HbyGZxT6DaEunMjNQ1aBDZQsiUF/YQFQSafVu58qVP44sXzmmqPqKJaPXvDJ6estf72q4cfmsQNGYnsWPburifzH3yrUPrdi0tLdm4rJG99WXts5bllF/2YZpYzb03r585/JLuhHeprOfCp8AvBWwB8M+hFcD8GYivMkCqEqjLxNVJYLuR8NQLgHQ7TknRNkNdAkg1EYgDOzYEtgakkWUCkNSsi2cmuYOhahJkUWiek5fBZK9gTB5riJDqHWBOOE+arqk7o21Dz/79uOLHY7FnffPf/GO6w5Na536xztXv3FTYf30yQXlC+eN+eeJh79+d3z7oj2bt93OL+MrV1+2Znt7R2vn8hlPLK9bOL4yU6ctvWTD9J99tB74tAVs40TqGyRxHcw3CPMo1jiTgU8CEQIWMdh+OjB8zbg0UqJfTgAUBT+4Arg6CToQLYaE2EJZEGWTulC8SH0EexVwRMDpAa4AJ6WF79z71lu9A1/zZtK7SFh9Zku3spX0doPmINz9sG8qAJ4s1LuZ1FMBeichva1Ab4chMwno7UB6Z1MDVDT2h8VEvL1oMXgl0SrrgBlTgfg58CiCDQJ7HCivE/sEgyOTGh8GZteZEsXUqF0XW4NCKhAp7UHJmIkn5/6pW/5x96sv3ndsZ4fgGJhb89N5l+25aeIt/75O+fc3p77y4rYHIhvz+fe6B/qDLaHFBxb96OfXqvs/SPm8mlvAhd2ISUl0/ycBJq5Ktw4wcSEmQSoKbEBWm5WaThkAfg08VthEW8Soc7kL0GzIECUDQF9ZAnYVZ8tAU0JOcgGCBuOghACrtIyAQADgXTEsYHeU8a4sDbAXz9hrlefSG8JLb5HGTQhuvbb7kTklfOB3t3TuvbG54Tqpe+Nb1wXXaTNrL72pte32S0te2L3sHf7gkjef2TT9ipntky9ZJL23ssQxc2f1tU92tz10U+v17/w9p3bFdbOq6q9eEXrkwHrcN+DLCq9SmZHL9AaVGchLKDdQYHDg4QKXCCEmx4mHNAvrBo6u5+s1J7tnnD6jOYm22GqgYyrQMQf0z3jkiSykZF6UJ8bh902g5IP9JiXgxquECzd1SagcSbey/dgI140+2Q6knQhvNVYCDySlZOWVCZQnxuUhTyTY08tGq7ZYdbAMpGsDr4oUXo+bEWRvHrXAcJ+WCYVmDTX6o1bY6td3NPbMqZq67sG2sWtXtgcq5/Q03vma8u1bbyvfrPr5nbMfmheaMX9aZuYl82fUJFdNmtfkdo/raqk6unXbUdK+6cVCMTh9WdNlW2d600KX3jChadn0oFjw0qb9P3/nZzfeM2bt9NoFYyuSNYKrYuwC/prq2cESu05n99bMrl61dStH9U7v2X5NlbYHLLFK7houbOWYoKKmilwOfJddaNUmUV1EpCpKuDwUtlY5HYhiBOJUw2Mergy4UelixGrXZhdTCmUni8xHlcsLQaIZuYyQyna8ymagiAqDKM8a+HoCWweYjpnxwTINsmRvlLko8/15SzPw3pJHZ3urfnfLlQ/f2LzqhQeWvVOr8t3mGV7hqMpddy15C3jv6bZJl1wr//y6xrZdwWsPLAFGWxTlOoY71f/CSdD/dowvxFsASQTQt6Hl4kCcJaMftb9koQ+yc5gRIA43B4YaBcLS/OrqfHhC97mOTIB7iuBlNQ1aSGEn3jANb5iBppJk86vWErjRcuYPMJiEGCxDTadSBtObMQuq4dIHSjVbo5Ax+/Eo2I+PwR7kQAI7DcRZK6w/85mQzG+eQt6/RulRVlyDdKslx4TnhX007pTGrC4wM8Hg0qIHmOCTDTFri8APfsk6YT051tZG7mpv54bfK1hlIFV4L9eZfmH90WvIDnL3NYpvCl2j0rMnhR7Yz27Oyy3kwsW4RvlsjVDtyFnIlyU+yX5CyvVTJ6oQ1imJsacWLKRS9K3sQDsxrxg1aqEY4a1Z+aNQQKbbZGMK0jMrH0WkVnSzrVztpv6U1ulAnx32tFbVsfYYcUsfIul9vy5rvfzy1jJ3xoy2komzZk0s2Xnb2gPjvqlCBqjS3P3h4U2NS6aMq6ub6k2pdVZOmFN9ZVNDXeNlgc51nbPPcIMmI+rVsyu0p7Xp3FjuEqLnpAZfJKThMmH57aC1AvJ4IHCBX5rik9PhqtwX0dJ3iTSdWpdVzIUAVzIZ0G0Cr7LJippV9sClxypngyWcY+Iugb/Jscol8MxAPyFfymIsDUf/u5nFWLLLzFLLcY2cI35rltzHpRZrX1ZLtt3bNwl/h+F3XNQkK8QdzsrOcbdMUqMkfVnqNY2QWJpE2zNae3p5qGH8FKS3R5RqQ1K2TaoLSTminFiAtLeHQEzU1oGYmDIeRaoh2VpSpYpUW3VewK+xMWPGR0VEAROxya5gQNA5qWQFqcvneXI11MsDnQXuL0hdPp+JEjtVb6Rl8yek+KHnyah9r2++9GqeHx3p2v5U2xb5iqu35KTPX62p86bVNlXm7lL+9tNdyhdvrb6fWA+8G/G89YdnlBMHyM7V3dc+VdvkWjWn++i15G/7ScmH62XlV8/8x8DCiYnTu/vuXfzqlkuvmrRx4KUUS2V98ui2bZcdIEkP3vyO8tWd+5V/PNAbWH+QFDy3dNvqduJrWnTzG7jm2RynNYPO04M1VcKsW0kIUMUX0SVwBMSuDtnb5JMTqf4DESAZ0YYF/8EjuAW7m2Tzvp28b/PmgdLNh/iNygs0TDFdkWCLZqM+PAj22jK4h5lzgU6cp9rQYH8y/ZoDEj7FRW+VgrdyUwlvAQmf4pcsVuqqmcDlyECNiNspF60NC8CRAEvnwgtTSEoR4amUg3ELAE50M0mE6k/nyXczS8ldFb04yFc89d6dXT17f3lEqSFHNj1w/2allRxat337OmWGtv25R9YcdIhvrP7pG9271i7fu/jOpT07mcwAG0mbCboqA3RVOBXxsEc1lQmBz/RJBIAHKLOoUQm7/jDh9AnJLspONqsNDJwcZu9oVF7BWIk7t4ysWnJMuYv4Xp3X9KvV+5SB++4jwr7Vv2qa97rywV3KMd5KKonxmUVfN16x5D7li6d/pnxx/5IrGv626BlcR6Cx1go0TgTvrUalcFKUwpSsqZSsSUYqmZCmegAyDYFMSQIS6lWyaaj5TjRINDS8gKvdB0nkQaJ7uqvraeX0g8rLZMyPfrNj6gblO0l5Wdu+5NjpbXd+e3Rx9+yH3r/xEaJhMYyDqo1u4sap0Bii0IAzEtEy1tIiYCxYYgDA0PenoQGDCaxyXuf3q14/8/jZz0Gha8DOfzLg5r/QtncrusUDf+zmhtzTwNWze458P+MI99ODGc77Vc968G6xe6l3Wq3ywJ+0FcADbm4JF1t6KcuHrCCl+ORUvEtulBGQhZNVu07vDydT/zA5BRD0wKvJwL5hkzYL1UK6SDk6BXhG5tJBGJnAq+4j+gTL9/GOCFwt6tC/Jqt6nhvYQare65j0+1ujDHTz+80DZ/jVncrf9uwAJrKQamCihZ+N6VjAmOjkA13NZOK1iufaNchJUTp+Q9dujCoR9EwiSNpARDBSSgqDK2cCxHi/ZLKihQw0lfWxuFcAYzUietZAy16ha9WqM3u17QN7+a7TB/ktA6ti9yPZcD8BKDq4bmrUgvrq+KONfePBXpQw7LOZ4OumwmeTQDeHE6O+l55+Hpw/HV1o5uDpBaQrCQ06T/BdKNUzJ1738B37V30W+XhHx70/2ya8e6bq579R6bCO0qF8GB00gaHIU3SpbyALhlCIgYkBYA/RA7j83fcNHOPX3jfw3o8Bewd/cqB3oIrf8ITiieIvROA+2qgEpjgwGuiiNAgLlFMFLTCOfpC4Tvj2e7Xt3zkG94D2AJUD0ViFzhCIgzqJfl8iQJ3Iwr8YpDSjNECvk9egNkQ8wkKCKaRiYqCxEcBFPHiIvE9+Ia1SzKVKEtx1t2YBxkm+a8WfGO98Sfegen9JF3f3wa1nsMqCencTBmIMIIJ49HhBEEUpmaDenyAHwc1XCR29K888Bvddo9kI973vu+5o3Er7BOxHC5fJTVS5ICaV05BRs+hmtMJmtFplF9zPALIPDBLZZcVglRaxTrPjZkswcHGbDfS+ladby27lgGNsVVYObDB+1VU/PX33q6TisceUX7x69+mfZpDCvz/yzY+UE/+9/5+38U5STDQv9DynvKRcp7z0XM8L5AHltHJoDxF/ShLI9AeVr5i9hbSaQPnLjnb4oMQC4CPGRLrPjELU/qeslkj3GWY2dUnMB5DtmAPSqdKb6Tt3KgFFZ6V6jlv34lX/+bzSS9ZtevLJTcp6bfuyvp4Dfxl4m390P9HsZ/R7m9LPAZ7/ZVxY5JjKYPTLVSNcQD8n0M9JDTlKv0J4zHYC0bRmMRFNKwNGTkB+iTTNKuWKEcIlGixD6el08BhS1sWIipHmanEYXRdcedf0Xfv/UyWttOmDGR/cew5133xA+efc+ybduypK4c6Ppnz8MyIMEpnRuIPKh2SMFVGONDCOpMGwRDMlcyJI7gQ/kVwxJWn2o560qRZ8CuaGQE3KxgTkFXMi1ZhSsjjU3IA9wmjPjAyiHP78/zxCtm5X1isfwAL85MBmXIDfPBP+pW7gVb5q4F1+3+O3rX8M8wc09tLDVXBvxcXsXAhmhhqos5+Qs2EFsq3o28ijkmioDi3nL75+ZTdazmZQNVLScTk36Vsp/zg86TNbkuxeKdfa58nNB/s5D3+H4TrOfs4LheGvMOt4JMlsyfXk5UfTjcOeU3M6286CZAaxT+PK8OGqj7LJqWlIlAwNjVDZU9NGqREq5lZXVZbpwWCmqgs9GKcjS88c77zOKZN/s3n+PVM9NVetuX3zmqtqVv/8ZlLwk2l3frvlmehLmS2LDy5+9Cz3csdlywNtl5c3Xl3vyy+qab1hSs+Bjpfbn7pzaU1bdXHBqIYZ62bULFo0xXcDyiGMEdZSu3Y0F9bFx3IkwY8OIqoGLYhVrQ7FqlYweMM6LV7qMCI46D1ioqFF+G+laZXmZHf3dw4M8aCcg/X6AL5f5IJc2ELlrCqzJWOA5hqY2JYEtlwgcanRhWE8yUIjzqh9omrIyrlzuIOrTrz51olVyl+VM4qifMknCq1njr7/+We/FFrOHIFXPiZ59N5Rm12H+pLixvHUbB8MU3E6Kk/hLii9iSd7MzlFvto88P5OkJ6lmg9AfRKukON0b1Nd8TqTmuEEgykA2gK/LkIEjU6f54rpDGLulwiLVOrNVGcg770y6a9mWjfAWaXE42b4C4k/fqx+/5ev46taSSiTCZ8Ar5llo+1brWQ6fuyV9i9/Rz9iKAOZliAZ4T2tHd7TwAefYV8na7QJks4qaY9rsSIh4bjAhXmtEdmy0cAL8K7BaEqMpcaBNzkVV4ouKN7CDaSVTO8m00jrBmXNBuWocnQD4D5NE8YfVXsQkHiclqcyuECVDgkB6tWDrYM6nml2HvWRhkYs1XsY8Cb5fOHAN/eSY+SFuwdO8/k7lVwln3+e3z3wPN88sGigiV80cD9bL8orCWhH6Iesl4HG31ELGlGm6+mqwfLphywfsGD2dvIeeW/7wO9XgQUxl9935uuBo3wL0/kL4PvHUJ1bpup8PfCihudUM83oo4atrGcRbpAsUY1RRdwYIHE7Fwg1Z94Cw+dtYfwCzabu+d/dqNoTU5Q1RAK5pEd/h5nT2n4Mt2i1NM6Cnr+WZu7CWi66kzCPqO4g1ZSeQuYr/yBGZY3u68u/famDu7gcFah+zxzy5yu160530LzoGrI5CgtDD2ABludUWMgJzPMjLEQXzTBKXAwWNzWV3R6A4x8Azx7lA93Yy781U1gK+YPCBLqnRC6WKqJ7ieaGcLULyfx2cs085QPlA/4g/9RAG98xcAA+e/b02XbNlrOHAA8XJwkUHAYShqPoN+iBCjrNju9WzEA8OM1Kcky7G/6+CP8+QgycWeONo4BRpYBMcKW4EKPEOlI7W7tb+S3VayvA7t0o/AMsnmJuORdORq6i7qhb0x8WMZBn1PVHNEWpImg3DcbEvHQXZ5nAU2EOiS4P/CunqR9jMXIWcniSOYQ6rU9jpEkGTi5yYxpI5wJLkKaE6F/Q8ClIdld80ifZKXqqdHHR0yr0UnQrFu6+/Je33L/yynvH1U47snrfW923/dvYm+bVLb9v9RV7Kiv3XLH6PlKx8IGW7W8tXj1hSuusS/ftHWjpvbPk0lsnd98xoem34yaoMeInQN56YH2sgPEs1Vaihp5Dz8RuWEejl3pm7QGmVsCMF/3+mMlnjDP5dInU5HMAegaLEDV0aQoFLRRPbkGhs2owy6XTP9FdH1n4xt///kb3M8HSI/MePfrsI/OOlMJe/LR9nvKHz04qf1o4fe83kxZ+8eyxLxe3Mv7ugTV6CtbIhXloBwJrBmAFhNOAcKYwWxzgTMXFNoA+jug4vVVUI08czYzg7a1YPuGi0WnSQ0wnVu9var3mJwff/flPDixoHbv/pjs/voGc+piMap/RdMdflV1fbW2aedm2L5BuCMNJSrcMpJsR6WaO0k1Pq2kQnnQ9i11gSsdEUzpUHrmAQwwmGssA8Y02uRnplo5040w6NZZuQzjRRq9CCHmblTKAiAzQ8/fXF/XV9/QEn+l+42/XHdt3TaS09PD8feTLz0hW12V86umDe6cvJOnkceXOLxa0kv4p1zKYNZlANwdIzrlc2EZjGTqQaBRSYGun0aZJoiVAtLQNgDaCpnX6JSPj7AQA2Y3OtRHg1Fhs6FwniJIVQDeiEWexwgtOke4sxstZJJO4cb1p3I6zu2mCmu9Z8x+bdn3Yfea1hF/+5LVbg7v7f6t8dj3/C1LSduflbXfMqiCn7vxi687Pd2Y8+YctE/aRPJLctH75hPHLbqPrD7qF36ntBuk2mws7kfI0k5YIqBBARbIGQE8DsZnd6cQqCNlhwgh/2OFE+eWwgVXidOClE62SFGSTREIjcOgqGWgeKsAC74xTMomas3xsx9qay0oD1ZPaOt5+u1tY1zn7rv1Zha2BZYtmd55ZL6xDOivLhJNA52zwnaOZSw+yBYmyRbEeoPHJyToW4MaMlYkmqlKROwpU7sDwtlvNvqSKfYLFzlKWmbHkS7EHGSZtCMNUgfmDRmABS79Us+zLSNzju3Tl+sm3HZpV33j/8rtfqnnmWmAluv1gI+4jpz4jGV2X7TtTevm2KxvSx7TPmDLmoX17pi8iKchVn187mfx+cjddjyfAz34K9oIdvUSq642BONlh0cdcLbuJhjTstFJSNpqoq0WDeaA3OVrhSZOAUZmB0k9kgkJ8orv29Wt2P9R98/VzDleAgPh6wqLdjw208I9u7pk/YcABdN8CwJRq00FfJ2F0jO5JEzJEgg9rXGngggyWtybpSAIFAhU5ZhcwqJ4ErC0nCLT40kbXHyMZAsCzpcKdW16e63Z0aw42+cqay7/bLHx8xsPxZ0PKMnpfM5cC9jFdZrRwBOBBl49lmlJZyMTU35eqs5phi1lojFA26HApXbj5hUSqkyS9CLZEeYUQjA+lFHAxWN70jZk59arurevHziG5KkzKsbZxs+do5nz32OatHl0KBY+Lrc2fqB3mHxprobs+Fm0xDUZbNCNHW57o5lu2K5XknR1K77Pa9jMz+CqlaeD35MNDyofsPsR6/lgTUBd/BmNNT3QPxprgs9qDdL8sisawXRhbISoHYZIEBKlk90fFUjbjI3DZ0IF0wTMX894tqoRKyaYsJblwM0tWm5SI4nUIZk7KYJgXz0klwGWUyaKPT3QXPHv1kg3OkmfnEfPiN6btL17y5pRHyoSP7x19/eLprSuUDwaCfOQP88YP2OCB8p+6DwAPW2wfGOKwQCWlVjVTXQDwq+oA97pD1QR0H5jj9oEzBmDcNiBBtg0AngmLlBcHpvB7N6+gUKi6SZMPcCSBbgJITEhRm16V82n6wWi6KRZETTAyZYRhU9lEo1VpNhYkjcZtmDi30jwN76AuKKa90RrpWfnR9h0frVz50Y7tH5GZB5YuPzBjxoHlSw+Qq0juZ1u3fqb87uS2beSL/3xp9eoXVyx/YfVq1fZQNms8ACfaHjO5OLODxJkdYBP/YMtDsDCBqC5y1PJIJUMtD1Ceb/7tb28ujNSDwHvk2aOPguhTNmvbH7zkGuXPJz9X/jAPzBC+t7X7y2PPfrGwlcK8QNks/HEQ5kGVT+JUPgiUKMwiKFBxmNZHmI3iMK2vMw0T4h6Rym3V7KNyW7fgv99YcqSmu7v+8KLX/7YyKqsfPUpOnSRp11zy4OmDfGr7PJL1+bEvu0Hrty78Qt1ffKfwNfijFdG9idBqEdqEhP5Y8JIJAayGlBPiObA64Izy3s4XbJ7Wn+UKHx98qVeztGnAh98/HWyhMUCTQu7XXLiAY75M2IZfn4LmehFWQ8rpJqy/oLFRDxBhFPNz/9r+ShWLsSRiabycKXwr5RyHJ33GRIPd22fC31KmtS8rMweeZuPvMFzHRVqyQ2H4K7wyhrhn0H/NzMrOiVV3n/MKDbikW1jARQ9WuS2FltR4bLLDiQuSwgIuFofTExdwAb4p01KTgGUKMN6ipdnL6WP8B+ffdOf4pZs2Lh3/0qOfbKgteXDuis3jl26E58fDX22YPmbG8o7g5FHuwpoFLTc8tGty3cSF0/zNBdnFdcumrnsMaeg6+ymfrznJOdEyo5HCRHUngMNMzRm9f0h9Z7JPclDLBjiKJlwcseJOBy3GcqBl46KWjUhjIxIn0roCsGxEVoJFq4ddtMZAdO3vefvtQKDZO2rswqu7wK4hFuWrzoHpDZN8MxqWL+RfVmU1tb0/Zro+CXmJAquLAotBGkdU5mOQBnSKZPBTaxx1fRJ6XiKGonVqmUMsXhOMmboFT3Sv6Z0TruzuHvfCNQ/uIfn80YG5t/dcNZ7/6oxn56SrdzNYYPMJ7wIscfEacoF4jXkVuZbMX610rgbdvU+YC/ob/F/QP3vhexK5dUwKYawCv6qPCENDNcbBUI1xMFTTf/LkCKEaF3vVPCzcIvNaTKbz2oTEaIRF5hLV5O+QSItnJdGR5DnERXQrlRcXKJ8rny0EqJ8VJtIfjzDtTJjVNQMdwgD/0FgLubhYi4dsVnasI5WkYp2yg2xepzyrHCFnyO+Va8mPlWxFQyLKFKQ12LRIayvmg1QyI5UTUZ2IPgzoAqNheMWAjCbzrAyNIqPDUiBc4TEkSn9umjTaZ8+vqByfMY2txHetR81d1qpmabA2FN6Jj71EPRVBd3Gxl5X8pIFn+A8GJL6jQyjsbD/zYSf77kRlDflI28PlcJO5cALNM2r7pTSf7GIhGKJh2fJMWsLtYPXTZj/mx2GtsMjOji07RARGlkw2WWuhuFahuVZZXUucKBxEhx6sV0cyfQr7q7IgMVBzxxXr1oWmd3ZeWrNu3RV31JB3Z7TVk5eX7bj8yhYltK2oaLsyeuJVHduXkVfqZ6l5p7MfEp7GcjJjsRyBQqQ+qDYV+okHO6I1xyym83UURwstqQXkcmgQBXOpLhVHzQnYnZEMhqNdxTEFWUWbEaL2kz4kmW2ywc7Wk+IYpPh4SRW10GHzOinCOi/xrKu5tLNzeoiiF6AIKx9cNZG8sb2oaBt5s+XKy3csU8bUt82YVa80LNvOcAwK3cKbYDt6MMMu8jS3JedoEE7JE5DNCGqeD+uiwTRKYVZyjiibcBGodwSANWjAOtHSnD+tidaiwgompHhHXxYMTPPlZbkrPZd0ODoSXMWjO2oC08rysnLxFZuwavpt69orSye2t08s/fe3jDNuvW1WdcnE9lkTS37xOrNTNiubSa1wCvaXhZvCqYEGQz/sLCJZh3TMJdGOObPaMZeUCJa+xdwvi1jjhQ4yNsxxsiFR7ZeL73FJJwE7a5jLz6t0prVlCvfTlrnq6u8cwtdnzNSuCwhPaTaCl5HN9bA6cik5ICeBwZHhD9uTUOrbnQbVaBYCuDmlTH9YR0tidRpUG8x+TjXRSnMUyEKGP8rjsjYRLBQ33ckAbcTAGS3WaLUOdjllEdrmhDQm2OVUgNYJNjn1/NcLc3p+3NB69Y/v62pt+HHPnBf+67r927Y/Sk69S3Jcd+/QzZratN5wJqzb2DStXRd51kXcP9//aYowNu2P6M+fBYsK/Pl67jAXDgJWfZnBciBdcbSy0yH0y1VBa85xn1wg9Eul/ghHgklJXimD9uhJWeAYNNB+hxq/7ErqDxtd0fYGdAyw6Qz867C7Fl91Z4FeHINmI7h6UjAk1YoRDZ9XVY82gNvWl56RXUDd7KogrFigDNzsgmK4yqsJUcnmroVXHASrHq0is9mq3NgIlhcruEXTgHe5nW6avKpGu5lVo2AcD+uK0XIuzAd1XpVakpxm4s4+f8svKjuz9ly95QWv7zIbqVIUZ8e0ytGhxQv8Y69Lrblmf8P80JyaWQ+V3nmvm/e0m0KZNSV1TfmP/OWGhbUTFz+8qW7ZmGtc7aMDV20K2UpLK3PmXp2VnzWjqy48P9RMebiW26np1bzNpYP8Xs5JNp+cA8xR5JM1ehaDSD0hZwBXZFjlPHTJ1fBDBq2UcLqwvl7KE/t4nZV2LZlsfXpDkoXSKQcDWOZkoE6R+IzOkMRbXen0jzQ2maO5ZnvQhWZT0AUi0aFmKQv1hdjeFLQPcSXMpHbCY2uOPnPLoxMe6+p6bMK+tceOrNs34dG5XUkzDyy77sCll/5kxbIDMzUbmx9btOjR5sc2hPtufbR5b/eSfc2P/ujpvluV9xb8bOnSpxYu+Cn85uJyBMnc9cxaj+YIIlbRzCWhiyZbgYVMsAmc9AUwtxwaNLdo9MiM5Zo0cZngDyeZkYGSsKjF6A+b6YYzOwzYr0odUeyKZXkG5xCzAzjByTJeoJrwfzXroGSSDwe+4O0DX6waOMVbB06RX7MsxEBL+9dtikL4tq/b1Zx2TA/oQU6qGQJUT0wLSLrolRqUR30gUJ3Q0TGK3zywWnDjb/pd08/OFsbAfgtwE0keF06htZaAcoWPRbRbaPeS0y9XYlDKL1VSq10a45fL4IVRfnkSM3xOffbyv8Vsd+Nxucb+rVR3/NhfP35FpPbQeKs07ricJ34rFVCL3pRoBFs+z9qXn1cAFzXWvlBNHRj1o/E3/HVf8/hxYN3Di3HW/Wi07mGnhsLwKXyAP6K9nEmj68aDZZ+XX1ATGtdcFv8f+b43qflfGTP/D4P5n+WtQH4ts8lp6bRklDkAzrT0Mir+XMF4ByBYRs51A9SKuNwCWgKOYQVWEk6mjwnsW9x7L3MOti1fs/75x/98Uyiwp33pNuYgvDZ3/rtP3n6oJqdm8mU+p7Fzbk7p5LqSnb0JrY1tyzprpnrdReA1LNqYnr+ya8VDdzePHXdtW2B8fnZR3bJpkRl5vVdt2TOT78urKchKMWmEosVTChqKPHZTwVJc67OnNBv4Udp04BoL5+OwTcccwGAYVj3TmJiVhgKwAFrLMqpJFqqwgId4rIh16HLz1EdrSUNpaQPpLcUHjYS/1X+sV3L22X7tJ9plnMjlcqO5W9l+iySzWtcaX8TPrkp8kQJ2leWLaNRa11pq2dhYravNijVcER975rNiqCxa1VoHIKb5RNsz5mRNVkFRdQ2VQSV+0dZoMNjSPEXcqKrqqNLCCtNkdP+xjisPtBWWduXZWE2pmXcNWcbkqIzmZ79IJrx0F9E9v3z588rpu15Sjr0YepqUPC0R76FDyq+lDV8dWvSHb8LPXOcrvGPSrl+f2Nl6R1Hp9YfD3/BPHScTXlj+Anxoh3L6xeX4PU8rv376aeKlH1546NStx05vLK1q/NXjj/52bHXpZu4s29+d/FZ+jdYHuj2fu4kD7y6SwWjk8UUEdmXwRcwargKpVUCplcq2fiorO9RmgyK3MRmAJSSpaMSZEkEs27HdxZxMCZWBsWO7LYQFu2FO68AMFObO6V+qFolL7X6pHkw/FQzJPnVuufKOyxa03Dq1dNGeZVvb27fOuaPj6qmjF+bkLBw9pUvomrd89tpxU7pCK7p7lObJc3q7xrWXjtpYVDKL4VrPredPC3M4LVhUHO3n9Qj0dz1p6VWOwq+W6AX5mnQr94FjsoI9svpytUZdCxJMtdejXZDUxtGhWauKw7CGNrBruFh5F3Y6esRaYX2H0NqupJG7uH+t11DDtfA64SmQp4mgZfK4UhD/rPPVydbN6ItYo2spZQci+fRJ2JOPgHlcoD5y/FKpL5KiboUyurhJjPmTaKgrksee5fuxO2MUvJDBXoBPZrBGbD3bHj7s2EAXxQlOiTRK7DMK7mzaMGSTrbSRPd8DKl2fZMO4nlQqShnRZY9KMFjqHAyS5ejANWfmqctT6HGKLHbmJS1KZNVbKwcOR5TgJ6Tmk98pb/zuw3fHdszxbJq2/qo7c2tqcu8Ujh4eWPnWqoiiRPZ88smevR9/rCwiX7eNa5ny5uuvE646v6hazVVr9vKfavqpfwN0jxDK4epDXKZXBJLDH+6dPJnxUEDYwZtpT3sy18rojWo7bKHGOWoxV7RbvYR1q4usWx23R0q0G4zZ447zdp1Hg4WBO7rmbds6v+uO6Vfc1tk5tnGOZs28bdvmdd1xR9fYK+Y0NnV2MhuLE57X7AFcLNx81Wtl3ROSic6NAFcrrKHFMBozmOlaDU3s65FnrdTUAC3Oxm3EWRvCEGsDTVqNXxXQAdaFMdi4i90Y0ebdtjb+vpmkT5k6UxlLXkJadwud/EHdXi6VG0953KWhWX7qX6XRPcPEh5QCYNpi2yYdHQIXNxgvM5psTMBWjdCgyOvdzu7Tf1l+yeSbcoO+Bzom3tTeuH7bQnJU6Gzp+7x7xvQ63+j6prKl0xs3bLy+dRrt8Ram808BXF7uEk4aRY0Q9O8t8OCkTRHUQNXTxpkCBmGWH83TWD9lAeunlN25mIC0hV0pWcwyDw7rqIw29rHkEhayq92UnVWFt0ye27N2flOiufGqG1a0bbqy0rdrzk0PXzc+e2x90cO3X/Og8OtQZV3b5JlT+el8y+TxlyysqRnfO3/W1QY+3XdJ+aINrdyQGoQcxs/nq0EAlsZO4dp1yj74SCEtP8D4mrJZ0yR8DHb6TDajQRKBdXRYN8cCbIYAjYhnUD8uneUR0mmJMDXasZ0oIR3WKgVnikhOjLRpURykhaKxNjXUFgv+FWLIrVB8ovvr2eHK7kBFqtWQkfdESr0856kGDIcPzP22awL/1Zkv6ydoOvXy1PkrlVLmt58N8F/TOqcWdQcmwA5MEKKtoMDuNHJmPBFtQjdYI4SSQCI+LFXVwZ5kVS5qE77NWh1ATsb/c4O/2EVmT3tp6i5hPsn7t28/1n54epQwj9FpI9lDavlpnAHlNcvvMXtmpJZu+/AeLvIP2qCj9kZxylpyH+cC3TuOal5V3yZE5baavovYmYiltf1CMotDJIh9xGiyoyy1snimyBJ3lchmwYB+UJ64J15ZM7WtMmt047Sq7JK6Kas66nqUo02hCu90T87PtqW21k+83E1jN0InqdXt5HRcFqd2VqM2w1kaw5qrg7S52vPGjM4N2jffOfMe/9ydIIdmgy3xR7AlUDZO4MBuiG4lYVAuqmImKTbFIyoXbYNxivNM46genMYxO3LXrr6+XTsOz1m7uOeWW3oWCx/f9cord+149VXldz++b/mye8/V98Fo7BH+gb5Xjvbir62xq/VRVR+n8kHHYox2D60jMnJOWKmdrOJLsqtV0AmBiClZT8B/swRkE6Ar+sPJJtoSkGRgKxijIoalHQS773BJWXAvbKfxc7uI8XM7jZ9jr0SaSm+ZGEGyOMS+BEMSM6SSTSJmFSUiykIKkzV0MbCoKV/tcXZ6qvKBm3F5FguLOs/cxzvIsrVr1sxWfk4qNVvfhQU7tv07CTOhH7WA//e3KR99NIUcRVsa8f1QxbeQ28SyeDj1IV/TH8M43WHCIlsqIYuGISiytjDErsAfFnNoVzSiNGoISqIYSTCkpOdTnPJVnBzgFYmCKwUn3cgkHYOBumEouquwNStO9vOq7I/HdtWah28fwzRB2e6OyrkzKpgqGIp6S8e6jdfXUMVQ15Re3VkX1Qy47qBYdVu1XaAbfOBT1HMvcuESpERNIJyOVCgNYLkKU/tGTX+kvLbEAkxQGZDLNXSAUW05Yl7rN3gjmlH4HvNxG85RKDi1JgRcUeeP1LDXAv5wTQg/XVNtQLcUL0PlavQoBM5oX2mZv5ZSrrYcKFfBirn6QB/RYNK/pJAM5/ARVVFXLR1UUZvnDFdRxEdn3vBOspSy2XskwO8OVdbPimmtaQuCVGvNZVrr2g2TBx45l/94rlXpEbYIp2hv5mIunE+rVsBtzFbbcFjVSnJSv5TMlI8ZVFGhXzJbI7kWbOGUcn00gpSLDofWTiuFIqbU7DxsIJbMtnBi/ija71qMISYuMSOTudqsIbMwGG3SjLZxFZCYEG9VWzMzZ7SXTJzVPrFk1203Pzmu9SHlT32/IpOqUcJXdzQumTquvm6qN7XGWTn+yvjuzMkfHtGsBNmf76mupn4rrfvVnQIf2cSZz+3WSxzs1rP4sMoAVGqimryKdesFsEQ9vmPvCSwrVA7E9+3pTim//e4r1rs3eE/jSPdMGOGeI3QIFsLl8C7BHmpTxPcKnqLmxdB7it97T5uPzqsZ+Z72gN1TqB9+2zNvLHt3hvT0Off99NM4Gv+R3juPW3vee0vpPhp+cw86u/lgPp+IekB5zB9KYaq4AMO4eaItwhOzMZ3uRBVk2YFiy5QHfOcWZVt2iGYxXFRSxyGTTx0fAfdhALcdlqfpnMNxU964ZnZxY4HHl1Ve1zr/cm9jIVxW1Mfj+s2Nu70N9d55Xfg4xjt/HsguhvMKirONS8MekPNhbfNJqQHZbMBqOwI0wGkWVgttq8HKkBQwZTLg0WEFc5dgbi008uJww0I252Dyp9KGkpIG0ktDOfEIkNJh8RwVfr2Vwp8Mtsjy88Pv8EXSYjEds2o1ZdOFY0slpbAJYSJbOJzHkZECCwfIOMxDFi4rDRZONA1bKGGoAeKvriw4B7mXr7/0khXLp89Y2TR1yeTJS4Zgt3L69dfDOytvXzJ16pKpzIfM5Dh9AuhYC6zOHDXzywWGNlSarYmIo5n2OibGeh2xc/sE2BixdsfEoe2VDlpJpVWzUzQCPNhqKRC3mCl0CtsHnPzHAx7+8zN7B37xPkkk/4g1Xg62+WJfpLKR9sZWcZvjemMrMJgd65LM9UWK2AKURkNHRKpmHb+sVxInsmUz6geB+l4w7hqNJq09NS0jN7+8gtUl5wLE+RgW6Msu8JWzuIGUFqIlehE9F223tVeep91WG2fvFsYbwmXC+bpwX1Y+zoqaw1lRGznk3dh/4Gr+4O4ROnO/1LVRWzk3bSy1nd03mJYfUdSepEQdy9NNvlB3rPX7umMxYWfgqDE0rEsWOTKuU3ZAs47UzY4tG0r4wR60KCzj/lVYhsGApkE8DP+pSnwVCO3bVN7Hw2C7MAz274PBcQ4MhGmBeDCmvLkUNMChYXCo8p/BsoL25KXjFJzvgwaBSQvIFhCHyf6orzsyaOhFJmE4x0LrrDCjmWqhbvAwgIdLxnjIfaVxge3BxdQNkYj82d2wGduAnpiDiU6/0tIqxwQ6/QprQjCCrtfQ4ikAQED5Bb72AjQGpvcie5wOqoWPPLcKflX8oO9Dyxu/bxVd8cJeRuLYVwKMQG3yKXwn+g2j1K6YBPqdJtoSg1NdErH+TI8jR4g2RCtdBbaaGB5IfXPZO5fKh1b2Rpcv+u3C2bfhBjzVZ7iKjWyqStiAZjg4qTaWVzD7aQHQYE6BRiZg7UyxhVJnrETTC3hXm3odpHrpcO9kSnV1BU4XIgTqE6CbC/TSNFp7n8WtULvEROAkQe1LjXDEIoATkB6g1Q6ZfqqKLLRaCuvx0sAfslB/KBPHmop0jinHBkYlq02YObTWAwunnLTSwxCS0mxSslo+FdfO7xbtbn+ezYr9/Mhqrn8nh+Oa+if3ksaniXbDbdjVf5wsU3byq2fzG6LN/fzqga/2EIE0Ec1DA5/OHpQdX4KthDMUHzin2xcLVewarOWIJKkWUl58+68R5LyH6VwPxSfiYs9cg63BOGLOyFqD5WQP9p+khUKgyGn3ZVybsGxHZWz0hGjBhQg+jJRkk5NdQxuI7SMaUdG24uVxttO8qO3UEN9srH3/HOOJygzafwy8jP3HbozyjtCBnDtSB7JHLQrtS9Rm5VDF9kOakNGW/95G5A9wN19EN7JwP2qD/8/wQDXxvXiQQ1SMXAQm/AoWoRyKS955cMkfCZeCOFzcPxgXVd18Pzo5THRdND5UNcVw+iPFKcjdPQJOUplPLoQ9V+mLuNU9VxOPZBbssiDbZUGrXAzPvOyZd5AAIXgsDoq2w4n2NLe27BwSyIVlsNeygrDHKkU534+ei00u9oYuzLAj7r/vpdUfr7mcbcqKeIfmYii3eqS9qlFpuILSMJ8rxfqkc6kIjFESkN2gJYr8NM81SEGsifZY6ECjQmqd9sfTDrNahZi3AtppfzDz2Iap/u+ljBKf5L4Yghwa5jcRbgsJCcs02TS7aSBBA3EZiN5AtpAa5a0GUkWCdcpbpKZOeVt5l/SSYNzzt+vwb2I8CTZ/CpcLnvoCtc+J1trmA0lRpTO60uFtpfHzQzHAlwREK8Nu9lQc02QQncnGTA+L8WFpij0kZePA8WQuowSN/AQ2p4aZ9X5XMKCnWXMNlul4gqzMixTQjZhMCVtZUEipePjBUYtbV29EQj6/Z9Si1lXr18ydza9asxv3I3fzPiDrvCv4g/ciES9vWjlX+Y38JtDxiqaVV5FC+e6vZwh/agUiDkyYgiS992/TWa3Lp5oPQMaInJOrHakLPHmkLnCX2gUettgczKo5txMcRfuwbvB3qTAfoSVc+6eYLf//GjzUkh8KD3mCCeURINK8GM0TxcOUMjJMqSPBlDYIk/N8MEUt+2FgpbP4zvnhQmkqqHCtALhSQdfNORcyBCwnIDsNWLRI9d4gmFjG4LLQZh4c8ZZtiU1lQOBRG6ZjatuiOw/owzf6MBxOx8c+RkTku2F7mWf1Y0DnBC4RO6iGdpknxbrMzWqXuczTNpRz+8wFjNTFes0DpG6d8nB8x7mwPm5t1fklOFtjUlw3VTiZsNZznK4hsOkacaM1ZN7sjw3X0LPhGpycbI4NoQo42ew74okfptFLtr7wydwXb4kfZaL85Sc9fUuVN8lj+29d/4Ra96/p1XZzo7lbVIjSaFe0Vm2Ir8ZaCVrEI4829Uuj6SQ67KpDgAIIEFzqWXEh9kZjGU/JaAAtE0xKMazJqsYUbsAWNhVV4JVeDIt0LC4nV7uxYMGZmcVm/IrRkegCq7wy84O9jqxCKzqA0yk+8dq+218Zd9VV45qX3LZhSXPJZTuv3PR4S2P53mtuuaN58YYNi5t9E2dO9G1pu3anxnbPaz/qqe+sH31pwD8uL2tU7bKpoxfOrJgxZVrjpb0zg5OLc4uCCydWddSESsZ4Jsy8ffl3XwK/035x7W5q2ZVxvfEd4/lDOsZLBjvGfZRMuUCQXLVjvEjtGC/HgDlOCUoy08lVyeIR7BnPzmEWU0n+D28bp5Hpi2kdn0sD1tIFG8g1R5Tfnnl+sIs8ngbFQIPVF9U17ztv13z5sK55SgFvCRpMktMmlf5vtM+jH30RLfTvUVF8oUZ6/rdqfD2eDhUXSQf/eekQGJEOpT6VDmX/G3TAonOQ9RdBigYq/g9dHC3UmA+jx3ZKj2buuYugB0gQuRIexvoiZaqdPT6eQF6TN9LMLOvmoeSSgjknREzcYXxzQjzp5GAz2EAaY6q7qEysPf/4BbkSD/vwNgOxx4qyf0yIFoQGa34YRcURbfGLIPCIXvIFyf37c61xjUr3dEp3P0jsxy+G8sCIoYBcBmq5yh+V5CrVUZKXgy4uH0ryvhpncoJXrrSgXyTXWJhQH6R7ZTk4O5TuOHgBOFiupvL8X+ba4Wr+IqibHq/6L0RVITneDIjS8ySlZzXXwEkXQ09wFUezgHwDZWYakB8zhJnBTWQMK9VYkXaRCvasYpgkaBxC1rqaKDuLlWXfw84NoF3lCu8PFIwjpFkugry9QzMvFyTw9um9vfHZGCordC8L/wDPcTSdcBf2YtQrPyBX6PqlHD9N8EuuAFJZavJHajO9mMqv1QDNa7yxrP5E6lJilXqZVa4kdGBOJjyr9UuZlMRYMSW3wGMZwQF1SdTZ7tMYLV5k0Uyb7CiCl+rEsCs3n46OtEkenLhQIdqOEC7XU1SG42ulWlHSMVqHE5McNLNfHUdjfWG125/Fu86dgFFAi60K7JTm9YTSPN/Njm3gVyzaP++P2/ZueGNb7QNEU7d0/nhj1Us3b32n68w/E17ec2R18O4PtvwyWH5iyzJZ++jGHc/UPNX1o/38h/yelMop1zVPXT+97J1/u3/SlteW3Lir9YnUqqvGXLsBZ2gc+P2WCfs237b6rslEWLzp2Zvd41o2b6hcNG9K2fhl9GyRHmU97Vsv41ZxsTEqUqYv4mEMXOSLuFQG9sU6hROtGNKJpDGJi0q7IBEzSgbB7HC6MnO8JZQ3PZlg4+Vga0hfmruYUtlFY6oGEWeyOErOO5PFQs6TSirgzxnV0nBPjzu7tG7y0BxS6Wunhk1vmdamm83qrNJY3ZX7JpHkI//R2Sigu3E2iofrutB0lLzzTEfJV6ejRDQWW04uda3/J/NR0Gi70IyUDLTXzjsoRahm8br/n+EFdteF8Pon9Y3OixhvUR2lobgVXBi3wvPgVhSPm+d/jJtqS10IvW7VkPp+/MCC0qj4pVP8Cjkfd8/3Y4gIlgVkD6jwYr96WlccujgWIx90dT6LEJXCZekgEfCkCbeRjnyWR+HE9CRbugajksmlrHn8f0ST4Zr6QsSZHEvEobY+L4mmxOtn/uwOEGKttOY2Lo9G4vJopvPl5VZg9ra1G6d/fbedTnOh8zPgV+EP+r5oXo7V3ri7WUVv7CsBxo8Axo/gO1k9n5qXI3F5OdNgXk7mtcOzcvkst7pG/eZPPx38buHsi/Dd39AenyF5OXIReTnTReblmiixn+ueHt/7891ahEF9Ep07AvZ+GthJnax6Wc7W94etsXFYhfrYwDR1HAQGdRxGNivNkw4Go2DQiik2qjsKs9GucWCOUrYKWICQkGixRQsQQNkWFGpBHYBywNZCTsTIRi4XHNZQ2KO88/raG3+pfJzxT+0jDWu6Psk8Rras/GjHr5Rvr4ubVTKTfPoR8YRf33vbhB7Notmtk7rGzVAOKzfe+8VWkvcfS5+74YZjy5Y+u+qG59TZJXTm0XbOxpVwD55n2ovk8ckZsC9H+bAJinozpXHjX/rsNuwWLon1PKmzYPpyDMaEaK2GlO3DMk7UsRjPzcbzXnTJZhbLVefEyBmYwrOX0IYPOa0Q3UWbnJ0TGnmCjDCiizJkrkzOYHpg0qA3cs60Gc2aEZIBgsoHu+n8mRzMEY0wgcY90gSaXHUCTZ9Jk5nNwvwXP4QG9/T5BtFUUl15vmk0/NpBXfl/H26qE88D90+YLjwf4KR9iC6Mwu45D+x5I8GeHwd7zg+FParzzgN+mqrrvh9+0HVCTHYg/NWYgzsHftg7cgHspgBsCHU3BeMRygRrtJrtmWrWI1XMnhUPIovnKI2qBiljsqXlaErPQVcuAG0nZ1ZjKFKU8yow722TRxWHLsh8I+6p89Elb2Rn/7xk6hw558Zolk5plgdyqGckqsGiewNyjgGrc6n8GaQYDnzKtdAoJGZni+EyjlYobgpykTFsaZofyhjDW0fPRwntEIV/XgLcfU6vKZ6H+JFmB+21Ssf5r6mIsB3QTPLJesPgHI8MOuPC6peNFqwmUiuD6Pk1cb6uGHddK+wb+KQ8N6e8PIcOV/PhI7+5vV25B5/D60JzbpnPnVNRzg3uPfCfksFOK+KuYzMp2XFLudHRUHQ9MnAXjqIqQJ1ZVqDmNoox84HS3BGSCsRn9Bqr3WlIy2GHAdPTC3IdbBBghnjYkMg5U4vwPT2beaL698GAnlWlqGm7oIMm7czErp5RVYjLsPeGitltE6bAUjx+c9XsOZuv6yB/nr0GFOCW2ZtgWbrIqZ2fbe0Ys2Timyt3ntx2dcvqe/745I38mtbVLyh1bbAgP7tZnRsK+m832BsubsZ5JwGlnGcSEI45FFR0k8Q+0UnrCi8wFAidoqGDgYJgvl1x7nQgbSoKxf8NGHFaUZ8I/ixdCFFKvhCMmO0ZNrzIwWT4OVAKXzPhHQ9nGtYtngfO9PPAmaHCGRYdLlYX/H0AqhJ7KIwbmHV5PhijdRIMznRawefhbjoPpAhobkB2Gdhcjrx4sJ0mWp6HWepBDPrciUkJXjnTgjEH2W1hOikTT74UdVhxJMrZuRdEbLirMRTD7vgKv3Px1PiGChiezTuCNbGC9zXCxCOnD+XkxUw8wsTfSFOPKqirMGz2kWZNjCdwNp46l3fIbDz+f202nvjDZ+PpfjFw8nzD8QSVZukAcwrYT23DqYY7LTsgO4Ax0v3UkrKdANODdpBgYjrLwiypNOwY4a0I8oXJO1zRjETqT+KDv8MpfnSIL4l1FwkrtN3A4aO47ep0YawtpM5MDlwY6KjZaFVLodAfSbKm4Cl6SZiMLaaLkZFEB6mgh+Xw+P30WBCrP5xIT8ZMtNOGXriwGLwYBJYTMrBFhh5WZsWxgE4P43o8VA/Pgk/ICw0WZ2hcYnwxeWywAZAjLygW5IEHtOqqn/xz16MkZYowb8BBK8xPnnloivKXR19RfvnImtu+eUwiSWMblf+W/6n8FmszhOeX7L2bZEZLzzPvfeQ5MvbNnylf7XnxMPn54WNKX0zP6eeCnvNyo7nxGI2gZ8VnBuRyXFw/1XHYfheEp2P9kVrnKA2L0dJjGcHuKDHRA+Ixs+U00qisk0Vl7SZ2EGMA3Bt5lIZGF1jZYZ0tbEnLDNEpBlI6NiWWY7tQWrqHxWHlkgC8F2TdbDGjRHDRA3KHBCXoAY3A6oIjmiqm7qE2OpIYVOPkH13eUpgk1s/78eUYpXhT9/7BVzcEH/rztNuvnFxsthROumzDZLBf2p5c+sRrMw8sW/pkmzABoxez7rx85pb2Cma/lIy9bHJBedf8MbHQRfGY9mmjiiZd3liyjay97viN38orXly16sXGwZnGglpnsIJLoLtn5tBKAywQdwXkRAObgZqKLbWyGXaOOXbWDJ7AbqOmPKvy+J6R98O3zGBZwkdD66DjqhNeHCofaZ8zz9F4hpeeRy0EYq3OejakjA2cHzzcEw/0EFlEg6mbaChD/b5lfC/Y/6nc5Rygiy38aisutfTTogMv0tnAi0Qw79mEBFopkojKQqAiw4ACj0ulKVNZ74BHgQX64e4jGukjVsKN4NnGz4jghkyA4P619zTr6Xuuc+ZOxA2b0DTTj9C/1/Vc+O915erfLxLeJ3j2rJVrYD3aktmHw8twaB+dj8CO7UbWSaTHE+n01IjAoenAO0g+UdKoZ6Di2K9KdQxxwaJZY2ormgRHXjkeQqlpm3lfaUVut1/jb6mcqJ7pBveeQM9HrwLPBMWl9uLOC6eDUXGoGwk6zjkx3Bk99VLD5y72a9UTw+/3Rs+R+795RjnPrRHe53sofd14hiWlsCOAk6ZB1eGQuJRokZNK6ugoikwGi2co4SURqS1l2sIO7FWLLYRIF0LWOENxSxGdCF2QP/yFNTPGNPibBY3N4/MXeGuJZ+hzdbEWV+BiTaiPf0L7EgCnBXTdPNwVbOVQymvV7rS8OFqiBMLhPDkMm/yhlJXSRHRZcgAb1GkqpcOCOSc08voGR6R/bMX/XNEsaEWGw8yGYetfEX0GCCE3oC7X8AsoL+QhHpQbnCmBALIEtU3zh2ECoiTiZpgUDMMknWLiRkzyBvnU7A6NyDWIh/77GAkxSTBoGSozhvFVAJ4RoqLyAJO3e0k238y/Sudh4mQCwYBjFNQHdepBREtnK6gP58w+2LtGWgP/yKmONWs62tesoXpn49kvNceARnhObhZodTatXi8GqAUv84l+v3r0toEds83FAsgYrrRYaCQBexTTLKxrIv7w3Pz4q8DgDAY8Q5W8rD6+UpmXDxeBFnUmQ370kc4/VGc01HPrCZshgGea6OKnaeijh4nETxCKDg4a+ll39LMS749oYh+nM8/ZSIXgsMEEsXEEePbR2U+1Ldoe0HjruXARxw7xCieiYLPRrpOixPiZhJEEPX0BNHeChm2dEpo/SEvqD6fR2S9pWWALJoPllBadtiLp6WQTOQ3z+AYvLSbMhcv8glBItiUgz6nTRgM4Pc9TFajmYo149DgUp4NOHoydf8kVtszV6eYuD5Hlf1fb715VflPN7xmYodPxhwbmV5PC19TjMP+p3BUip9r8ldWVbZ+RdGy8++S5Nnjmb3v+D3goJsn4gsW/PcLdwmx6DpSDu1E9wcaQGAhEOJYzFvzRkUx4JnyCGVwTP7pNOEdDSxX3yCdEqZkJnEiJqt5Bj7rFiZqo6jE0ZXFgR0oiqwAFVYeTQogYSKdn6QkeQfSQ4LoQ4Ts2bOgI7bbu1rqrqpTryJ3w8ypyhlJPevGIeWUrsztgE/xe+D3shMK42dixSasWTq/xqg+qfq0Q3SJ+5Azt48bk8RSQlU6aX72feQxSToAdSWHS4cB/E3i3WQbmIMsWd4DNcxaZKGVDnPFghBGHUCBJ7FbaL+vB0wNyXGY8pJX5yC480VKHfTqeHOwdSKWCKQvdPFc6Zk10qfQ018HTLIYeZsENOeAg/7G7bp4RcBcG6MkW5JPYeQd4yMXOR7PakqNnXBBv/AEIlB+QDj5Kh1SsInCw2aT0oLUYKViEwDKIftrFoo8Lnwo+Atp6yVGkAVXC3EOX+D1IknNRO3MuSmfWR3voNPTsqm56vkgJVw2+zkes+l4uDgbYuqI2TAQccv195bpEWN0qdXX7rCkFNXkuimHY5iqiTF97MWeQIKeDLyil+uVi+LN8f7jYi+8VF8GfeYvx0oujwoqttHt3NPJCsAx4IaDWXXlxX+gMsOhlOK00MxuuRuME06py6klXgdtkzCnzY5RbV47CJTt0/mNO3BfFL0OOQiFr9u8cJPJi8p/APz5frtu5+NxDUi7ET3Rfaaepa1DOvRFdgVJYgbIoTw0uA+2HiBgTuHKNOtweFiIQGLoOFf/L64BiuhyY0j+E+qVR6gPNjaz2pUz8nxCbXJjEZy5M2hhf/z+r4aQjAHjaY2BkYGBgYjia5Z3yLJ7f5iuDPAcDCFw6t9YBRv+3/JfBUcguAORyANUCAQB1VQzgAAB42mNgZGBgd/q7k4GB4/V/y/+9HIUMQBEU8AoAnAMHHHjabVM9aFNRGD3v/ryUIiIdrEOrQwwVJIMUCSUEiRYJUtAidMgQRCSoGKFUfYjiEoq+qXSQioOlQ5/0USSDZHAooXSo4CDFRaRIdSiiUIuDIIR4vmujsfTB4dyf7+fec95V3zAMfiqG+1QP4DXwUIUIzBxOmEVctss4a/sw5j1A4L1FiUiqFxjRP5FlbKDKyJEnVR4w65zfwUnzHBOmiNPmIgocP2GdwBgMm2nc5fi2xEuu1PiLOtL+GRRsGkfMF8T2EgIbIjZVYozzGueziL1VxHoZ/abG9S7E/ij3Zsh97DG9ww3uzaPE3IK9z33W9LcwYI8hZbZZfx5lbw0jcmZyUt/AgKm2fnmveIfjGGedSP9AhVwxISrqMPOmOB5F5NURevXWkOl248g/j0jWd2Ijokz9Ir2IC2oQvbKn32O/bbDPO4Jj3cCE18Q+b4H3aXKtiUxbe9e3m/1eIitnlRhdY61Dre/+EIoaKOkMcszJivaML6hNepfHoNOxB9eJkrvLTfaeQcbp/Zj16+yVYw3m2y0k/VPER9Y7inOi0V5IVNEvXjgfOuCttp7Si4C8Sby2K+ht+7AbPFco7LzogPOCnplZ6ia674FEGuNOk/B/0IMp3kf4A7Hk9G/7sBsHqWV7vwPihXgm3PUVQeINY3gmJW/hFqAfAYkD/1gVqeEKkf4DfCJfI1/hHr1owywh5y+4d3FV/nP3TjZwjwjUZ2Idz2yenjBX0QuB1LWTKOg5erTBnmtICew2Ukj9BtR928IAAAB42mNgYNCBwwKGNYwmTGpMR5hjmFuYVzFfYuFg8WJpYlnAcoblGasPaxHrKTYrtia2Z+xp7F0cShwLOG5xanDacMZxFnE+43rALcRdwX2Eh4fHjaeK5xWvEq8Dbx7vIt4TfBx8Tnzz+B7xB/AvEfARqBHYJXBPMEFwkuAhwQ9CckJmQilCTUKzhPYImwj3CV8Q0RLpE7knGiY6S/SamIpYhFiZ2C1xOfEi8TMSahJhEj8kfSQnSW6TEpPykGqQWifNIq0gXSZ9TPqYDJdMmayG7BI5Djk9eRX5KPkfCnkKfQo7FK4plihOULylpKVUpnRH6Y9ykPIE5W3K/1TkVNJUOlQZVFvUHNS2qX1Q11LPUH+k4aSxSZNNc5bmAy0lrQytU1qftGW0vbT7tP/pNOk80/XR3aYXoXdPn0G/Tv+YgYBBjMERg3+GHoZXjMKMbhknmciZHDOtMDMz22GuYj7JgslimsU+ixeWYpZRlhes4qx2WUtYV9gI2UywuWYbYLvI9pudl90Bewb7KPs9Dl4OPxwDHCscT+GANxyfOX5x4nFScUpymuN0xdnOeZELh4uJSwcQLnM55XLKNcB1i+sVtwi3fe4NHloA9X+XogAAAAABAAAA6wBQAAUAAAAAAAIAAQACABYAAAEAASoAAAAAeNqtks8uA1EUxr+ZKdJqGkJEGpGJFcK0Kkq6E2EhJU0IiV0xrUb/YKbFO1h7BAsPYWVRPIGNB/AIVr575nY0pF3Jzcz93XPPOd+5514AY/iEBSMSBVDnF7CBaa4CNhHDnWYL+7jXHMF8GDuApDGueRAzhqN5CEdGQXOUPo+ah5E1njXHyV+aE2iZac0jmDQfNI8iZj5pbmPCbGt+Qdr80PyKhJXQ/Ia4NRXwu4WkNYsNNHCBW1yhgjLO4MPGLE4wx3kHRdrPSXvcrdGzDk/+C7RlkOZYgUNeR5XD7sriycrl7HJu8X9KzwK5gRvJVqTHLlctoTxj8mF0R/m3bo6evXNs0upzt4hj2qpUzHXV2V/b7lI/kJo9rpWmyuBIjuVfOToZFrtie6tUpCeKghpPqVILO9xAqW/HnT57StfnLeaQ4riW4YS5vT+ZTjjX/jnKYxc87jR5LtW3jn8KWxLvs+oi70S9iJT4e1xV6OWKhsvdsrwY1RVXIhxRq9GvV1d/+n7ImGP2MNCysSR3dijvzsY2fYObXJW9DOvPyD+NNf1GlpCVOynRt0lNdU5FV/y88BSq+5e0VGhX1Va/AU9RqOIAAAB42m3QR2xTQRDG8f8kLonTey/0Dn7PdgrdTvLovXcCSWxDSIKDgdARvQqExA1EuwCiV4GAAyB6E0XAgTNdHIArOHnLjbn89O1qZ0ZLFG31x0pX/ldfQKIkWixEY8GKDTsxxOIgjngSSCSJZFJIJY10Msgki2xyyCWPfAoopIhi2tGeDnSkE53pEpnUje70oCe96E0fnGjouHDjoYRSyiinL/3ozwAGMojBePFRQSVVGAxhKMMYzghGMorRjGEs4xjPBCYyiclMYSrTmM4MZjKL2cxhLtVi5Sgb2cQN9vORzexmBwc4zjGxsZ33bGCf2CWGXRLLVm7zQRwc5AS/+MlvjnCKB9zjNPOYzx5qeEQt93nIMx7zhKd8oo6XPOcFZ/Dzg7284RWvCUR+8BvbWECQhSyingYO0chimgjRTJglLGUZn1nOClpYyWpWcZXDrGUN61jPV75zjbOc4zpveSdxEi8JkihJkiwpkippki4ZkilZks15LnCZK9zhIpe4yxZOSg43uSW5ksdOyZcCKZQiKbb561uaApqJbg83BJ1OZ6Wp16lU2afufS6lR1neqh55qNSUutKldCs9yhJlqbJM+a+f11RTfTXNURf0h0O1NdXNAfNIN0w9hqUqHGpsCx6jolXDZ+4RUVe6lO6/PUKgwQAAAHja28H4v3UDYy+D9waOgIiNjIx9kRvd2LQjFDcIRHpvEAkCMhoiZTewacdEMGxgVnDdwKztsoFdwXUTcx2TNpjDBuSwh0M5rAquuxjYWLgZoHwWoCSrC5TDAdK2GMrhBHI4pCAcxg1cUJO5gaJct5m0NzK7lQG5PCDjuOr/M8BFeIEKeE7AuXxALm8cnMsP5PJJwriRG0S0Ab0+QEcAAAAAAVao/MAAAA==) format("woff"),url("proximanova-light-webfont.ttf") format("truetype");font-weight:200;font-style:normal}@font-face{font-family:'ProximaNova';src:url("proximanova-reg-webfont.eot");src:url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAAAAAE+UABMAAAAA0DwAAE8kAAIAxQAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGjIbySwcjBQGYACDYghCCYRlEQgKgqFYgoJDATYCJAOHKguDWAAEIAWIOgeFbgyBaj93ZWJmBht9vRXsmA9uB4gC9Ukw4A57HICeut9ZGWwcwJjPw2T/n5DckCG4H9Stqrez2EhTyQkHbZhnJiZq4ShkcFYmKafOgnB287VGfH9+htKh6MEvX1OyHyM5RXvrrUUVL0y0mtLYz2BjiS6NWuGluBSWxt+wb9yRvm+n/ix2oNket8Zy+NTkIRi5/r9zffclaTrtMGWA+oFgkVlYFm6P37OSQDIKRQO0zc5cha6sgSiiIOqspA1UFEVAVJBoUcJMzGJu5jZrDmNO19pb/6Yu3W8fq/S/989D33683pmdfQFCm1hAKCEpcgSy8scVNCkA0j0+dG9N35kFw4zXSYqI0irOtm8/OQ6UwGsV7OSGpyKho5UCn+Bwbv/gd/wAfz1/Scr4e/LXMpYuL11a4tLlpaXLi5eXlvjn/dv9WwD05ok1DwMLjN4Zpqv+IRAkEEhCXMZs5UTkFWX7u9oUI3bLnzKOAsaIziPKJuulwdYZLEJ6Zu9XYYH6frr0onUoNsLS6hvc3o/WKAkNIPEytwD+/XL6ua5fLitLbtfLS2uaCUEHSCoAYK8BGMICyAPw4L8yNWfp/C4I63kHEiQWdCPn80BZ8F9P41ilSHWZKpeCXD4ybn9avWjAGGwwEvacex/Kiv1/Qq67KNq8NGWKxk1lW5pZaOdAsCjdR4cYS1dmjLGIaNzt/y1NqeT0htvCNABdUUpDQehmdnbuvkZ7utJWe4qtK7blvpFb2TK7Wm27609ppeguTWmloADSUV4AC64A65ihzRJmAAMTHExCYP5PVav9f0BaA4UNWd7yYny9LNuXuntXVFd0V3JmAFAIJA0MSJmAZJuStTaD5SUpB1HyHkRJa0r2hqwNMVZK3hAd7nKVUndVCLG+rtny/v97VTMWRywWx/syh+1Bc2lAYzbW/Vm7pbHpDyoWS1jwuvSUuhtpjf4asWvZ9l9ERIIcUkIIIvX/x1rvfVTOYg1IimvpGBERGd/T3/em/bTvkdbMrGldJaAYpFQh3v7dHmOr/8deeuXPy1SMVUQBHWoA/fGSABAADzb0PAYA4O7cRVMAwLPPT9+rlV0ACwAwAjkMD3VEAV3HvaTji7cAWJE045tSqtEtVyqTgM2mHuySvvlauZ/ESSsRnrNhyz6DJwa1Hvw7QOAF3KzkrB4fvQP8+kKwRn/+0vbK+fsbP4RffROSYH+edRWI8jCSRkGHLlZlCXqVA2Jfb938zQ2oETdZ1DBwMMbp9ac38iQU/VXIbN7IWzAbjNwfDYVDkv55/fPxa0rs+k7mO5UPRdas8bkNtKsYzjIdsW0eT0wrtmFagwZVg7Ukhh4UJcl0ckY53q79a9dg8Ol1hceq0mXxurvLU9w+H/45PDcbDVNDfshm33X/54AQbT0K9lPssS7N0YRvHG4k2vp6D6Q7/eKHCA+5cdAM6l5MP5uIFvAetFWs3vvr6y+zRzNl0Jm7U11YbfiybocvBdldfwAwpRM3fqceA8ggLE9n+PBLGaUXt84GKntQasR0hImM1krKjgK4cb8TeyO3j+7dylx5mF0JbezORS18UfX5o/GZ7rSczLnkL5sL9vxtiOokBvzfy29F8DBcVEKum9xNJZYZKOCEk9k7Uw8lu4bMH166v9Qtk+UQT4K0i3p6pK9OpomxkNrHQ16zwBaSmqRsQgjQpRpIpHWJ5HkeQ+ckT1GShS1QZQdovvOqCHsdPHgH519PTdtQR2X2U9dYjcVu/sCQln7xsdsfRI7MnBzsnt5j54Lw1FsjOIBD4EfgPMf2mBwxwE0MwCbFOypeheC7g7Ncx4HoTP4/ZaO5nFYTZGpIFZuwL+MfOZbypfJikVQo9Ug+XwxWUSRnL3QK3f8Vo6TUI2arNZEROAhoKpMkapRtra0h9ESxe7I4qfGKSTldW1LWhS3Tqp1Q7ihUl6HvVYyz64heo5jYpX1bkDRHOYDoV+n7VNW+lc6zEkWijd0jVUxWcdu8X1PJgJfb1Wb/VFyNPZVw6KK6OkURkksjzHCXaBR0ISRcz//nljh9L8PZ4lUBg9ovPX97gqKd/TKl1F1Rryz9ZzXx6nCBqpLF4KQxWk7pqzrzESCKy27IVRa+d7Qd3LrxBfPQz2HN4ry+vGyaGBZ0ZKKDVkMBBr6cfmVFWBIrPpMmcAQHRzUfDPaT+5ltQliJ0zbWqcnd+/Um0bpXOLp6IR+Ytk/VY2Hy7ff4cp8ZF3/DHZSJFlzjsBM0fouBx/WoJrlV/JyyoW7bqn0DsOwkkWYubKUMXTeF0aDR0fYJHxC0ESBo0jz6Gc7OPwJpvu3xCpou0mPD2Jda7Y8qqs3ZvmJRp86o8qhZwSYv1Exj1cD/KLPzyKdgNKcFr6XQ/Scr+qowBlV54ZDzYi5l6FDpVOlqITompErQmJL2MfxBIRoGgnwx6BGHmQdl6jgCVNeqGAVmLcl1e/WN+ghUL+85g41mQwgu/lJ/tFG0qx+xxw4j8hGRrdvkHDdWo1tMcfrFDJ5pGNdaP9BIkhWiAtgFAgLiGMtzPCyw1Qdakp0gOIGYm4ANSXcMkPRg6Yx2csxmj/O4LruZvjObOHxGwLY8VRtMQI3Lg+uQnnOrlNdqCIAioEmDPCXQDzawBXBhoPEYQQIM9ujAKBfPU5V8pICgsKi4pF5pGQeUKueUWIBqterkIGONfTiGUuv7t2nXoVOXboN8dZqO2MIvrRPQwAZpBm/BmJRUCIAUZem2OwelmsUIKJdr/CcEkHInlB4lXECg2idmuQYNWkluyqDM1iWaz5xIxgolaww+drdiDtCqhcmtI4UaQbCmBlAaGLapks0WibF8aAcXJw+3PK8suCB8fgVgCdk/BVs1QT1kS37faiFBEWFVoupNuaZtcnktg4ASXqwEHYEJtjMAUnZC9vptwHaW7poqru/JWIKkREFmDJYVbuApXyhJuQySZDJG2S8yTOIK05ociAuHFzx8NIE9bOIfjCEpzVRQ5mSp4lWrnl+TPiEjCCDGIYKaLJydaRIAq7CHt717+Nh/eF/Hqfk5vwdO488zXrN2BEd1I+o1gmzctAQXzOKZtyDJmh8l0wGY8ub+mNJPogCE4cR1d7HYgMktQj4LsLxdzkkCYHerkhUA0o86yaQrc4NH0nmU1Wu3VrL0NygPvVWLi34KGzwioiIzuvo6Kd4yb45f2m9nMNbiZ5okNpOyK++mbKCGbbxW3EbaSvtZJuVRiaWu4XrqsKUWVEsv2HiEfgwO4AJilHf5GkKC2Vb+8CGNaYtMf9hgZ9rC4UMwIHzCJ06a/uiU4sRL2ZdIoW4kEvWI/B+GK+/AHaSSSgcnFhrLqZGIyVeHjNBFApIwOPkMxjw7NRKwwHSYTa2pz8gkFEfkrl6652rogr7/RHq4qlj6bizYxNrUIJ9jIlIuMyTf555jj2T5c+khMcNSomx6zdGIM+/UuOS5k0DdLQxJoHfbOHGPvcKCBANNhzn8LZ5uTHS5yKAXbCy2GzutoekNT0u4eLaxDRiYbRSHrXhZ102c5QcAEckFAYc9Sqb6ai16U6yafNfymt/pGY/kjSoX6jVdU72iW79UHWQ8HdUYk8JILkfp8Qs5ghUjiHAMjH0gh3XnM5vkbO0+gvyw7f6oY0D0x7oz0CI1Nv8KLwcBjDb4s3sR79L9/zDw/BT+jm26RaEAAuw4VYbXnI0EgL41oxcD9A4A4L/1BgAUAW9oGKY6HwBe0ivXTBBuA1Ct81Y7AE6H/e9fG+m5mA8XbwVNB5mALECWICjIAeQFSgANZyyt//0n+v8/moJyNSIPDqjJoIMgs+08434uzn238RPjV94odIHv//ny87nnV59f6WLTjdZfcR4/zj1+a/DSO2f4TBpg91bKMRqf/dcC0QvFUpm4ElULDyEvKpfVWr3RbLU73V5/MByNJ9PZ/OrV68X1zfL2blWu7x8en57jO+++9z4UP/8AFBqDxeEJgUHBIcTQsHBSRCQ5KpoSQ6XRYxlx8QlMViJQpq6oamrv7Os9cepk/+Dw0OkR7ZnRsYnJs+empy5dvHwF2HF5omcZPSmSX9PE5g+UvwEoAWsfwJdh06PAwEeFHBkAAJsf+5FddLptbn7twZOnDx+dN/sx8MtfP716DWT+vA6UvFBcU1lX31Db0go0v3W8A1j8VA4AOGCiK7VJkadEuTvaDUptl2Zal9of3aRK1RTKnHKUv2mGNUrDw4bte0aAGIHRPu1EElU7PpWmBWTTQa2EX+BL235+OTTQinYZrTxoryXE4sfaga/QMsS+SCoOQgNHd8MRNx4EaftJVPB6Hs1eKxD7lQFDwJnUddNbNFOdh6R+N/1AM4WAtRr8Au1oKq2zhiNbczXEBMZFuUYiTmZ11I61Sr2QYarFIer0za3y2/WPbUNM3QPydLDXGojFOUeAeXpSIC233gMBaQV0rxakCypWVSwDFfkepmAwzbSitXUkPlrS9Cy723Q32Fq3HbH43rnUOfA0HLQ6/BIqCESA4FkiEBXESdwf6yScTtF8LqhCESqemw+pUBW5YyUgB27U9sdobHgjre3nNpA+czlZ1XftIBhsClqruARoj4VBIC2i/WLgXRa6EctAa0cuCwFRQ8imYC3RLqg4myX3QCpyoIpx6wRrZxLjPG2v9bwI4jvhPXlcePmQqMjrIPMi5ijwvNGPOIOmijOXrOxeDqRC1y4mUX1Mr/Y+ZAAxjoAI2IrWCXnfA6yQ4R2bZlFRZjoVkgjSArLVdB4jFPQK/ZHUMYAMXY0eI1Bgea1ia6NcMzdKEKHtUSBarLvsAeD1QFPiz+UHAKDvAfQyILQWQOabj00yGHlOAxNjQuE06U1wM4VJ5rp0i5jpdEyXVJNTUEsGeyamnAs/+EHJS9gx2JsvcPdRmkSwapmYU6Ub9ore4jBNtXaQgnezSgaCxWtkjlDSj0lYZHRC6gpf7AiOiD3c5kzC/IolShkcUKwXcvrk6eCiyeEYF111mAByon/BUs15n047JhqnsFJd51H0SbsEsyl0x7kH0blOH8fKVycxG6oRJzNLp8iWq9Ws9bi6HeP43LCWnz2ugbdBp1nrbUxcg2DJOKknxvUV9sJ2xDhNAk+C7VW+0gkVSRNYJdGdpEymKbOlz91rRE5IAwdprOGt2k6pSGOCHlahc5OtQ1SQTsuI/HuAOAiPO+Rgp+hg+PxuMx/pTyv4ypHGpJ1u7252Oe8QhQWISWwHPaM1rnKeIdIy89BonGP6TrkzzzTZAc/OY8xy1ujmWGma7jSwsrRG4CMgN1lqgO7Jljl9YqrjJnNgCKu5Sbozy/q3bbN7CUELy++KieKEZAf3dwhqp0R0L6LyXPo/WfuXxSuhOYUMuRQ29n7M+SnAHJUAwvW6/W2eX+wbkzmHZqPRS3TH8SmUVDtn9RUIk/kz1Oi46SdrambMNicdxy3lQjPZ751/vjC/XJRL8QJOSSNySd34QK+h7Dk2NiZty9+d+9546ijzSWdxn8IcmPf2K1iouUW0hVjl82BOaBUrGbNQUogvP5akRIqRz14EFY98+bfb9wGi60WNSDACZ+EMLbTNBIyslEz+gq3553OSWI8lCWQnHfWenXh6gG5wRmWh8yqwh+iBXt/1+WKIMILRBoO27IcvngIj4vfsdSP/vA+b/BjWEjZBzQUG8shfFoVvGoMLiDjsg8abrWzLWnLESimqSeBaYOfaaHU35YBjSDtWroB9cCaddJwS/ZTC6YtIiHCWrb0DXvg0K2XBLX7d/2WHJQmpDXcZIlbVsKGzS+Ualnb1nKihwe7U//tphJJqqflLTNgUNTQzSLAPrunmNercz4Dl2iiBCnjXVlBh1Cor/sPLVMV1G1icnm8MGe+wM2heViq+7hHwL+v3WcjhzRXWytZy61jqbEOsX1guyYFK3hu+muEbZzRQ7U96Rlj31FRQPkBzxKVchQdvzXi12aUmGAma5QhKzlVYb/kW1cheC6dJS1Cx5rDdkybPqQBLmzQ3Daqu9SvY48EKTMtw0BdyRmFvQJ6uMgMpFz6ZZ33I3XzHnXSX8KwSYpeznxoqN6lVusByogwXxxebyhubw+mk5OqSnN5IbYGqIOxx+oyi3PSYxmUMBDfDpsktxDCNTHWjMEyKr300CtngliDPbdGyhpzGbaEqUTmlSObTlJXHNlbcZipkk3bi2NdKl+e7R3h4lIfupJEhDRqaAYWMulfyE9Sw1RFUsgioX7IW6QpGWSUd5eGCk8W2YLhxnRLlSEnN0zVk4QglOjgXvxtxxvJinAFcviT4VFnjzy2BQ+gnG1hjjWJLaCaVCXi5FJeFPW9h8cVYp3xrieLlPIc0LNa14LzNSc9z+hNqZEPJS9G9PgDiQAUq4nNQ4GyYsbroYAn6SgCD5PLiRRQaTHhWsNXNFtv/EE3GrtCv/mU5zLnk6iMvKN/q7uYVwzQoS3UZFxm+1yVNKyPI2EEMeGazat5gcdy56TwfM2bKJm0VK08YU9M5k6z85CDUP/C6MwobTS9Dei9hX6DUvxYsay2z5nwnW2y0LKGRffYYKCDBPpM7ZYyTkK/L7tyQCxw6tFOy1RqDXG/wijoNrnhyNEZMXKA+ZLljFePdVeyBO9LlEpx0GHYcl1B2oW2Rb+z80rQPXSshZY1z2OqmQgXyJLC9wvcwVGjnn54h/5KVSGNaqc/rEv8YI7Tj5CTy1tJo3e2gvR0CQqsEE2VoTIpsj3CEfKC5FhfgfeV85wjoSSB+Z+UsdyhDnL/MoNahHaOVbMqCkiIvoJn9M8ciVhZN1aICW5tgMYIq9KQuISsYcCPJWLMF5pfiySgh9dLVrayHdS6BfHF7Eg547/LabycY04oPRv8husvPwxPdtOOYrHworCSTlGXn101vWBxfWD+1dtV4BV1XfcdWj+3cqw2hOzrvQ0fa4LQj8S074bc9sK3R2OeRH0qI9w6Vx0bZmh8yFSeKCS7+gGbRulSUsQfCKZvbu0jwktWzc1M0ZBpbuR2nafVt8Xtthw+yap1smfLYMpmVmuagrcwrBe1/WTvKH4i4zX4jb+vHcZ2RpoyKE4n8pLzoA77a57BYsfi8nrVacYFC8U5e+dhd6wDhljIIuYK3ei6uF3/hzTjKAQMB4bLIf5i++8PmM+Oe6YbuN/8w5pzsRGEL37NTgYLmgcHMsUw3vDq3+1bTsyfbeC7e6OW+gwnXKBZF+ftDf3777ZcEWiWaZ/zru+++IgxgaNWyuUfWM5J0ZsdE63HWLzR3USx+fShw+/SG1f5GFKadiGLmEvE6JcWnCAzs2oDlnC2u07VInR7QuT4x0S5pgJEkmhYPQeO9BJXITobPxa/1BlmCHAY+JVVYG2M51wUinGzlD1Ew//hfwiip/CCZ0mAjKQBhAVIndY9JY1DVG3JFXQyucFjd8lwWUzToiQUpe53Q79dfj8wvjoOGqNMDRKsFIPRZJNZCro2fiJpkGKIosM3zQ902LurSJf8x5o9vWtd2G+swtfFonfxewkcAj7NEfTTEWk6FZZCS6lhe0iA2El59d6iGRntggNFriVNE+251HFLYSWHjUb0MKrctqiHn/DutdXCNfnfoujnOtApe+xvRBpi5mQALgSvmoOcQQt7olnLNRg4dr2wkHBon2q69ilxAewrwyQDwa4NAYHE0ho2XxOo1u4PKw5/sJu+9sTymjIhZYhXtBm3ZC10cLDLJGAtzRsksdWJ8GXTFl9gnxrQ4R5g1B/vg/3VgaDpJdbAtawZxBp51q7Yc5Yxcm/nHsfaQdXqEZpZAUgSrhMedmUXqcis84ut2WBTmaAjJ+feX2HL3901LQDoqiY0MFjW67fCnY3qj+qJV6zFvxPZyolalUybrAtbaZGvqkmVmBCvzGMerujS+7bgadMcp+YvZa/JlbLhab/3rjMXvNSJM7I+2HVuJaLXLsUi3HCCswkuzawe62LReLcWyqDvSn0iQTmLRdIL8bbKIkN2W8KlxreBO9gmwe68tX/efM8rmWDcH/gVOU/e5lvBhvX4a8LDYV+h2H/Ny8Vnxlk4zR7YYA1l32v2joqkGPuJ+nILD5eTOg1Duld4FXTz3kT8fOaKVHPH2nOvOPueIfX4Phx/Q52J4wLfe6LZMyaMb/rYdGgO14dnsMPlxh2CHkOjWAzO7JA+cO0wngu2YI0JuKX5S2roOEr7IVOalZIvlZCufmAufq1t/Pix+nSlvOuQ/g5fHxG7xi9LWF9joq+x8dPB5gXz7RjxhH8v6N5wnDGVCdT3+4faFrZdyrvy2v6OHm51ROHbwUljIAaYNxhbna4c3ifcIcihgJw8Fp2yezJmE7tZdAezCN9kdfrirJ2lThfKA4n7JjqzSKEfr4BBXstVoo97GgYbJq/UN01cb6qYvNdRPXsqsTZSX0GNVJYk8ZTGDLi/Wn89xa6Yku52gNLg0TM5YTs001E1dspy8lF6bqCieVBXn+nGVMGIVJT1B7FBkLp2ZgENbCsby1QsTDeXD1bnw/cTHN1/GuJgc8o5kJeGiYlmUfO/JEk/WT9Rsrqi3ZXWFQjt16sX5TwsnZjK7alJay8qqmv5kywm8BC9++SUaM6LyINY6xG3eHG8TRCMRwmXJSQxnDIT25ffmexVXYnHiVUHWl8+CHPH9WELFpeYVI8twyT1h7ucvwmzJSiyu8nLL/d//aFmtvGikz350V3RXiAify93yNn7b2/lcZHgz+64IGTGfvy2G+35z+a5e2aKKfmV/RfZIE8qJaOU8KEQcodgHFyLt/VD2riFRBDrjRJCLt89Q2fsyy0x7hoxAWoNi2NpaRPdnpMh+/oAAMkc6l6oejZRKIlBQuyDzt1kVaSq1fJQskTJgCGkaMjfCk1hdDO2pjD9PkEPVTxK9r925LlSY7tdCQEDQZDped/z36IQWIG4YVD15ZW240kjk/pPcENPlVJgQ1pEYiekXN5+dONOUzz3eNljGI9XIjxUJWCKpf4xr3P4YBDlKme0UnHYx1i8c77XMEfpGLLNSmwfUaVlnU49nOB1d/Hsrx5KTk0ayipKGI4jkOFFY/Ht563X92QG8m5IWzLL3SCSbkd1RwbZS/xH9J89O/JvLQtGqrRplb3lXW67SB+nPmn9cppbOCmRV4+8qRk/mlo50VZ4rys+2e4Ft0zzBDuBYFI1nhhh/infL6Ld73jL+qRTYLep4XuFUSPL7mp7oXE9MKZ6T0BIb24a8yIfsOUJaK8qM63LLEOL6RTR0d1rmZKBUNhaSVkCagNzQehtg7XJC5UXYaGKmS1CUDdu57kxLJedcskhv43Jbn8py48VFS+VlSyGt4MKFctsi68GeXBqpoiyy244a02OnjoyooKGcpDFhArcfymHnLxb0H7x+V/2UUjw4UCS+UFhcNF0odnaKCfKgwwONZ2eDjNVWwR5HYvZHOCDDUI5U6OdffgnYHQNlwHZ04A9k5OX3ZzANMSM0dFda1mSgJHmcSFn42RpFCuwmdSyviEL5u9peijI8m1ToG8P3rjjUTLIeD1wtSs9djMtaHmqo05JPOS1zpbuacF25wSHJSFxIppz12LAF0hXQd2YlkC5yUM7uJkojzu6Bi+yRfmil7GAw+oKc9TlZdgvD0DGYIK9UiUfBTIFjRBptp8oDvM6I1WKPgkqpWmridS7PEayKnGkFmd9KAujWaUJYL6Q15x5PqP3hQlxwFCrKE+cBJ8AOrTVmu4RjEn3duBFoJj7C243iHJEjVUo1FF/S9m/fCfwtOIRvPaXwZw9s849dgp05Dh1X+l7kKrJ80ZFspj7W1CNsMDGhZuhciyDySon6NImeoKZZ4A7lVint3I2cKXYmqiUkyaIo4j9/nF79rozF5bTt1b0tm3e0nlo6K8cu5f90znbglPWpWU5y7tWjIheil0mQmBHJ7k+OG/9lr2U05b6lijKbjuyn3IFFLOgZostoGMLU3r7SkVV5ir1PsvvYfOape9em51p70kpypJzisvSe1vbkrAwWMys7uZ3N3+Ui3XJhUpffgL+ysybcm7oslTd9qiz/r6tT7vOpqkmxJPGm1YUv7Qxo0OVfmHRBfev7dwMmBl1n6tl/T5w15HfAWm27v9Smf2hqSf3wubbP1iP7s3ltq1OLrYsPVtsIl0fKAvg7PJK2XDyrw6vH3P6/lIyKvstNr2rvrwivFymzMYMHVltzPyRK9+b01OvwLk7KxplBogVxcB9VWCj8b0h6OHh/cUx+UmljTtOxgqnB81J0v0pw1DXuGfzlornY2VUPtfDmfQOuWnPD8d57OauNNXXfTIr1Tfr0N8AQjrkxB2e2weHgn2ZGnKzgcMRYn9M8Go3nv6g7hXKbWlqU4X5UXf9JtriEbd5yPP2fX+taml/WZfxzvBMFv9a2/LzH/SNx68Vf358ZefV+PuvwJC+jtfZ12pvBQ+P46nIrS4cWX1iRyi2uOs67h2xmvRw3cy+VfeVudttLlEIq9eUPzy+cuXW3aXsy4lqsxe7DE4iF9c7oUC/K/JCoJ9LSmEI7PAEUaufhFhXnkm5bAimFpnvFEd3Sw05tuXfDceISN7ux94/sjnSmk1tQHDLduhRSAkv3i4t0y4v0AyUTBSkhw/bi4FV9q8tt29vGLg9e9urcgx30v7z8SJnuctl/EG1garNntxnMXceaMme20vHPOCt7W98H66xSLu7dUBj1KaqNmhR7VxSXDkZTppUxrLfr1OlDRhd+a7/TbNlgeedb695Lt8ZxEzgovGvpVKaYuwRuNEYPoh0Tqx31nYC2R7t+u9qQEcVA8iUnxXCW72KY4gUY9LcxsYz9lkZ3ppwMZmKgA7QhVcxQnrGXkdceg4jalNoDgAHsQkJVMBaS5J3HJqbDUPeVpWOsSlnSSH45QdTR+ymi1FpE9C6K6dek5JRfj2knCNqOceLV6eKoOr+h80PrnCixOkOiaXDutu/0iRymc+Y2zN9+/HZwnjsS5xnauB2G6qPSmoZWSENrTdQTDBg6OuFTQ+bbF+r6X4uHuHHx+cc6plfDph90HGXmc+OLh36tf6HOfO+c8OHdhtk8ezjWJ2In4htpGj1DT8dx5zcOdjaTBlca6H1UW9SMHbqPQWvA9vfUZL//saKy4VF10scWG/DmuqvzGko3ShPIbm39sm4C7oaUb4HKQhLzfCKIWd5EJjwlUdeIUtZHbG0bKCkID/bjFKBDSJx44rWya5R2Cj3h27tv+xfYg3SfyGbN1QTnZkpCpl/xIWLxWf+oSKLcm9DuJwmQgugYZ1VYtUfYaSZn4ZtR57uTg/caaL3xtmgtjChf48APjUL3Zi/s5USht895TWW2nCuJ7qJ9uk/YtHGSctMW/pTyBG6rayVab1/HXCe4Kz+GBVFi6L7tvg2tx6sD48F7SvflMQdiWlS2acfc2SvnzBbYF3q7TI/ck/RhwZr19trAc0lsSSlvfwQicFrGVVc2N99o72LRxYygJlrOanvXrXOB9fTj9wXFjJ4E9eP7BExqyrJThGJKxPuxKiEBpHrzvBKaKinfgJTvnldBMdusrtFnbbwWcdCggB80oOputomDB4Pb00u9g0b3UG0cd+Hr/k8fvpoucIfp3uRd5TD0iVhqw9AaaWilgVotgqHItE+fvu5f4GrjXYmNvER2eZOH6eyFr6bdTaT+tSj7RCwUfQWKyt30BjJhrOvyj+xnsY6fgOB7WaYXnTCFYUkhZyJYssw4oiMGJYYUmBfaiD0xouCMhd6hZ7W1eOGDDiyDnUbFIDCeInChaaGdyAeTHFZ4o3/631UdjJjduzS7BMsSntcRrBPOAyFH+6dKktJlZcx2y/PtldkpHHFMV/TtB5p1TaUvbjpO4E0A2OsnjXvhxgp4/6Hx9X6wTuN65y6I8W6McVFKjjVdRnPr7bshpj/9NXmHMv7hPh/bm74nfUylsv8ZgzWLbij8m1lsnCTN/6DrZ3+wItzBDYOoQDXDRWmgZ+Cytyqrn+xLkFuu8lzcwn37Mts1vJyUHI8wBkFbGQ9DTpUWH8bwuKXitbdlnPR1J5E7YYABSk495pZGuVJ4bXWcDQOICOznt7Vn9fm6hTvznN1Ivicz2tr4OWQ9hWwTaV+hXaE3JdbNyyXcDomFkE0jzbFvQaVgtXyHAXqP1FRhF+2BI1kd8YnxhEfDOGbRQdZWahvxobLNtJFN4wX2GAwdjbFH+vFaNFrH6qbOtwd5HZ67piV8uvbS7OKh5oz6KzszNdw4krRo1x/528hybnyaZnbnZMaFiwdfmnXeqKu4nm76Jv0oFUtSqFXSIyK1zD2Wn5Q9fU+UVfUwzUOijjDF1ibSMgdq0uB7g22w5p64ey5Jfz+z7T4qTXTBjJE9/cRHagLVHOYZP575GN3cOaojwje30Ku6m+H9aUxPmcGMO96dGzdyJiuuszOu3rIzIX94IK6k42hc7LH2/Pjh00XMtqPMCDkWWzh4Ji7HH9EweqtdIzsb6keva9pHb8hd7MC7A1Mi4CkJ8PfWv7eDnxJNKjthZcllm/TA/94PgjMgsu1PRXElRfFkZwxODC04XAgTe2CEQbySYq6JHJKexkxd6hz4mFOHjTXt8ItiZ9GCkRg/yXxns0KYyBsjCxu/EEkHM1MTqla7zpRPRjHHXCnBUaax+40Loq3I8TjLqWL04ZSMnMM89v82/soqtAwGTYPCfhTLTthAW6E227WFqR1oQ1cv4XAXr9QZyC5clBnU1cotLlwykNVdwV26hPOXMIZtbIYZgFx3ZLRDtfKPv8bOKUpB3DK/oNrbd7qP312pDioNUKEVpdNjRQYYJkedxFBHRqf4MgjYTFLckRCRtFvZKFVpVQRSTEVsuSKV6UsJwroybMcVvXEwVywlOM/nC0GoofFGCckaUDJYBQj3ekvVf6ZUOneFfuL0i6bOfv93Im1JLl9Km/j3+9mJ7989xjuePu04+mT9aMfjxx3Hnjy61/L1BiqWjAmMDYGULEbmz9MXgHJLlTVMZVne28h+xTbX3Ujh19XzBY2pKTgvxeb7U6i+/nSqvx/o88UFwrxFapFHYduX2i/KOeU5jiHe3KITFZs5mK1S3Hxxq7GTG8X4PrG2Fh/EDQkMyvA2DzFgr6JCG7O98DRuKDpYgWbhR3k/oJeLfPm4sBIa2z8oKfd8cU8qJyKJhd+G088R0ISniqqFnUGJCiS0iwYFOcRveOWvL6I6qXceaH53t0Ae+Lat2MPi7GGtO/EEO7bdNXEuRk/Bsbp9qyEJMAxiAAbnJ/uvwGA3hGR+Q6JRDBQKidCu76tlMDQU7xXnEmgPA3OtHV5grP2HGS5lhnDvkGC/oEw63T/JEquzqn36XOKc2VRWDTaAhFlMzja3Ts6A0i+1tdk7QiArZbFTSgX8lGI2S1ZM9Mkn8CVTfRwGdG6p4P/XG8uqNjXZujVT5G4nKDtu0hO2DeqmcdJupd/azz7Q0pTHl15i5u8uS+Xjka7KLpOxCZ0chtZVRbejiA0DJH4WhhWwl98WGGcqonywZ3wF4xRuZym7btKZhLwllZN6KyNc8yN/fZxJRpG/EYspGW7heJYrjBoQEOoZ6h7gASMiSNkSuexolA+JLTl2x+ybpdqoOBaJxtqnARKB7vxcDorTIVhmk9vnTgeoaq+Lbsdgus6CVFpyedrHv7NtljPQpiWoYOBh78Oso928+kOWoCXe9vdUt0lThGsMlZHFb4m3ayIU3PJ6G1uh5ymGGN2yCIemmftQGvDLKbtQDG0laj2oD8Uu/1iXo06q0k4qU6PIStVJyPIRHN7pCBZ/xDr1OatqnHKnK44y163IL7UufWf8cec5mE4jdywu/cjgD2i+aV5gztBhk3nYrwhvouo5W+QTCX8bijXyKwZql16y7bWsf5z5b+FXTeA0+TnMnCf8yXOBcK85QDtpUMIwb7/vGhtPW4YKmz2/jAO+Sbgd1BvjSApD3udOJFRpgLvW3Rm23rzvGq/6Dbi3Y3War81CG5d5lDMweHYtW701lIM71vTmZZ2XcGirq31u6rC2ACN2zoKqM3cb9zkDN8b3s07PofO/jq6svkoB2OXF1/T1FGy5T27Miy8YIiiEI5v6QgTyLZxZjBNXY8/Dt+RZ549VXhK3dQQfuxpvppo7lTKoTbqNyA3/t7+0MBPpiESGhGYJzkACCfSFlAkMA/yBZdwrX2qLHlFH5yoSckHDy2Uc//wxBgJTRitOSsg01fbnEu8Tgqx/LlGgKmhNpmc1mdBe8vVQEPmQGKTo0qV3uD53EwG8M1TT4ukFz7xkr8u0o+DJPh27FkyV3IvHzxRUdY3KrpqOdB3mNrIWf/3wCXXs3RsJn+NlttQolK31GbwQzX9H1+5qG+9VK5HgEHIAEgWjH7KEB3jyQdmm2bCPA363Sw7LXxyeVPdHhISGip52kliyNA7BMQDFt8q2yLbhewbwg1zgVLQ70R1te84ClRkUzinL4v/31XJMG7rcm6Cnuucb3oLsyxQLtHngZQf0paqIfrteqgYHyzkDm+6PK/hBx8MoRddbeOnmvh3ccKo6mPyiSg4ZBUmqvmzqhNNtwEYvJE9kiIXk81p6COyXeYVaVpM062r5gb9wXb16UVV24sQ9ge7MSVVexfUazocWm09b689cqY1o9JcE8QmBF8MEBxQfXESPC8uko4FJLcdunm+QZeQOdvEOmhxD0dK9oNQtljJsYpoPEf+R9vlm2qSMOwxu0StYE5NkCIoGRR5b9KY7Dg1FZM/v/WaR7idIb/6lfmwOisO5C6IWuxiab23lx6j53+vnupUHo+b8tP8eCZ/067PhCbV0U7TDZ3X9CcV6+7r1JhfY2k2H6q88Pkm3SSHp0dtG8f1eW/35VaW7vRqq7OSc7ijRVa5K3/c5IOHZw+/mC/O5Z7kTz09a5VtFfxHOyghL5NxsIj9snQUmnyFmY4rebLV99niXeeej9tEVx5H7msSg3hYer60RROSLSOutZAmPNJkslg7fWl9FWucElHlDBhW6LCIiezeaV8yGzakv9/MyY1dExO8Mf4uVwoiooZTh7M8dbsj+hpWmS4TIIsZ0AnF4dT22BBYNhalgn54Xg0z4VFf8mI1daeS3slhlTf3LOipPsrE/k+GCkbGyi+s6X9TghFfcQn2TeEcL8jujsEra56uFKBQ5UNJ6v43zWaDIj9S92Crox3desnmiCgQGon2h1LDvI3fqZ8kQKd4XVdclZ3jvBPD2dMDwWvt2R5aN8k7PTuMfGQD0D3Q+ob4Ah8m5lk0Vgfl/FrQ9mLrWeu3Bg7aC3wMLNlW1zDlMbdvSmf73q7q27j8HvDpnvbr+ONnzcq9r5eA/k8aYeg9mnFe07092uMDwaK90KFYa3M3hzfVX5jQxnQEXoiepaf1Ib3bl0P1iIgxgGAIp0iMLim/klx+zd3wdoV3v7dE+Row/cXbkVB6ykRdeRyHF6dgx/kb3cJPVw6DwrJFrnJ6MYfR7AX/vgS070MEGAPWGGuq70xk9ga4hPoeDJSQdJwP4UXtEgD/CLTgStYn8aDdRQmoygouQ9n4B9tvJQGyVL+RaxnDDPTa2J9AlxOfZLseuOsPv3eNHe7fASDyBHtsb5FIF1HWKBJCPwcTEU1741293SPJRe+AVSIQ/CnGH+gJdY6rmn2bUZwSTPtNe42Sxhk+xhQWTBQWx9ILcKyxMHbACogbyaCTiy2mJyl1DtCUDcxgg7VFkampBC86z0rrfgv9PgP1+EdP0CXt364fSxFKfX+VGv1tv/5GRLVfcu6XikjhHZGyJWOras212BJ06yj9TjL1fF+i6gl3dXfNqPGt0queohYQycX7qnKeqXbk73aZKB15wx+az5L9hm6a/iIWCKtUOM+97+OelT7lJufHE6rqI1jXrx3YMwEWUz/oyedhpX3a3OnuXOjpQxERZK9WOIeGzVZbLlikayv+ZeHqkot1NnYlTb38u/mc2BsHjlC+Wz+4PIR5L5yX3UL19z6g5+rWENP8/hlZVEEBdxJ5g1B7//57B+fEbUwKQ44qVIDPNAkts/FGeQHIbcXAV5e0OpNjd8lhSN3QeyMR4ANwhFg42ucSXDAgdC7n1bhU2lxDIKy6cuH3LiWSWWx5HEhHEXZnGHAor6Kq5GoqKUZOvVhSzQQCPH9dgw+jzsnQAu7sK/NMOBNRs98isZTpG1uas/QVouomtTYv0+unqEGY8cUl74dxudnTMXzSzFyx3yXagLbLCTsN4V3Lpy0gLFuzuW0UtyAOK3cC8VO42nuVOWOmOCIjX46apWfmjLJkuteFd+d6kfgloqlwb19WsDTdbtUyETUQY38PFZFvB4a5De9DBOF8iv/KST5JIAHDCgGAZm2HGrdK9BBcAQYhF4nq77XhJtvd5scnO++NJS/n5SwQOu7ygvIqRKB1DolLtSEcmum3Q8XhFAnn7Ell1tEIogFtgaIA85/hQZN7dvlQbC9lVz8mdu8WqWkW93GzZzY0s0FcvB7wBrR6OV4+s4B+uq8OWzNyJSB0lwDAz9YjSrlXfAurheGYjAU02EJT0whZJxXkcEQwARWMp4VYD7QxiCQEWLUDDYoEBkACqisCgOlEojjczyXIWljiPcroDYTHevaJ+E5jjAe2EK69WC1DDCMcJMASnYCj0nUYGuBBEGoINUbUCDLRMlx6YAQBHGA6Lp2zEaaqdxmGfwVhQQ3Pw5rGxzHgWMiMJS3xaaouIVJ21sqXJAAm2RTkwu0ltu80LfEsenU8rJoIk+SDYhs4BKGCKujoGABkdiJSDiiDSwAAFspIWKxzT1JMcxzyK3jtCUNVQAm5vpBrmvs9NV25pIKC7dfe6Y2lkcAJKN934Daq5/CEnODcETNMxZ4zUMTsNwG3kVdLEeLffI8qW7vt0EI7WKzvom1whXACaiChYNV9IgWEcRmKM09TV0njNVS9ES6GoHpRFrs4uRTOkuS7R6HWHfv+UhFCDBD9YPyChdD5ePkIAZAk04/BDLBDQqyeUkJ87Bku5rnIAXb9zWVZI8gG2ObZcBdnYuAz2FMRl2ffiZSAwSxl4woLbr00nQilJuw5wVRUEdwm415cn3b5qV54HuckLmE9RtgXnPQBaj/KqEIBqaKNMq+j5vfYgHq+B/a50bCwiIDwXGmRamOnJenEPnpv3E/fFh416D7Fujxbb7uvr2R7AhsbiSR2Ijwmx8VLun/JdrS4B+6EcnJeckQqA6JjHwQnMKi8wU4yqyP3t7uk17my/fZTn8kTviDgL/SqSZqYKIJp4ASYDLhVsd3n4Ju9tlJfkUD4mtgTkUv9DJULWDJMJhjBjG9M2NFp4s0EmZ06khs3RhIt6QUVmwR+lkAKiEhmYLXqYqhzl3uTVYj8tZP7dVeQ1KjJiXyqt73YlYMchxbSDD1JfUnTVPVvpu6FX7E+NLB6/qKiwuq//IDqz29Mws99uxrm3tN33SLrMu0jvkAPAabKHef6AF9+cwzcv//+XFaqLI+vez+zzvJu+fXlsmPUZU/vPcWWRvmzR+F+YvORgfSyi2hpSe/PVP3LtZc9/AaSdE3QCen3I7g+/9+JFNUt39c77H4pUVd+pz3+k3x/32gC/XSxbHBMsQ6Eiw41OnGQKCCOHBSMVGV3GKcYdjZjX02o23eYmqd0pGupyKtLo1ktioFKeqT1gT8tUI1YDyaEoqlK69NS2kxw9ydJGmkGEo7LoVA92bVtgfOQNVBu31snnJi7m2kJJUI5IxBc/pM8QiEMsRN5ZwwH7tWknti3hkXMfpyjoBmRJW5dcZIADaAq/PmewaDBpFb6aU8kGLsGuP2FWajTzFUY070pULDogoeu6YCZGO000B5F7yvsrBJKcF4BDZCzoPUQ22DoHj8AX5Xad7OKom7YgelE0WCKBMPDwItZoTqnuU4W346nRpqaVo7dpDvBsQr+wDAFUk3UoIONycKlaVCbc6AKQLyrQKjBNqpaL2Ep1dWloHW8J8R8xz3ElglC7C6tc6KyCZVKs6laGXNdQreT9CD/7OOIIBUX+grKqCInWOsccERggvhS5RIOaTCExAKbaeeIByhb1oHm+Z4KtExUXC44nLO9FRrhi0AEBjqlX3NggHA0EfTSstOcrBBGkVyY00mDpHODs1uOqG8dw/N8TI8kaSDAvkEOK6ilB1TkLEuMiKpFyIIxIJUYXFLjxAJJ6ghgLHB8rVXAKg4qI0PQh1iFxqghwwJh1D2rkuHLObnTtn/X/723eNGLcnI7+0ThfNCQ39dMiqW21Okz91WRpDcC0VdSq5odqBfhxyK3h5X9c43+vllqu58/uhK3lLFpKsIpTwpv2clnWKpN6E68w/U0wtVJXYA4JF0JI4lUkpY5rWwWmTREYaU7UStLbEZUikr+XeMnMn0pIT4Vvx0Ay7T0zoTQEC4RKeKICq1hEurzXEl5g3wR1WZ/XDYXC5MBATNIEOJvX/snm9689A4NlHxBlzb8X///1vyfjKkPvwJUb7f/Eyf/smph3Pz34dzyOvyM6Z85z1R4n4Pm+HqymZe7ntHRZNW3XD0DAXySlDJhjWa7tmUl2EcTqxN1cSq/N/aJWzEUUnQ7S7giAtv0EpOmUIEg6rJp9KJDdCtZzhibndxgCGgmf77sphuNhS9y2jIxnVwWJEaJR9AwZkwJluXQx8Z3k5xJ0GAjyI73QkygnjQ/BWLYhhYrRiuLAKfnaIzt04kvUI37oAdunAJoo4XI4DjrD9UCAsKz92LpY1jLGTpJ1mIaYjKW3ZUnsjSW1VtQdxiqhZPfBxFbtA6W7UII+SCo0wYF+2HL2JCMgIGtlJKNVPM9YVJby6Pg8qEkhizwSCM2mEeOpUNloXJQtimEBvIUDqaADUD7s4URtQi6UxEmrJhBKUI9iTBAoQB4ytyP1ud+pTjYRgkBBPg30dZfbNJQNG3fTjh2SMdoSdYIdy2y+Xz7zIIkm3U7DcYq8LEZ4WjF1orgfVExsIqGwckxxDIQrSBeAJV/UrhVa6wHG51vMTJ6dwMLxnk6BVzkhICAW4rOXzUrFZm8my6XQD7BbgWbihuNYc+xTPcROPXYHntReucFINQUllFYjYiTQbN7w2Gks1wJ2f4m9NC+s71ftktYXYAtLep2Xngo73BVZtChTSwwfFTAgxt4ARSFh8hWTazMHHE8O43p3yWTcLhYwnZQLb6kraWg3WpgVFOBk+svLeJ7ahjMQ4Y/k9bBsW2BbCKDw9NhBFSVBvUYMfPKyh+8VN9GqpOefBiHA8/ZwJgVdtLJkoWopksz6bzhdR8kOG2dmLSfTfvkEMgcl86s+q1ZG4lX39ylroKqFYMTHF3Jo8SOJnZ8z+KRtENLAcWMZz9wA9q2Ny+2CXQnajVxEFENPuGkBzrr0EJnkPeGm5XA2x+qJ0cYJUKYox2U3Wy0I8M4hM8UNCax0QsEKNC2iU8BTOkRnPeOu/Yv92+9fwptE8TlV+6KdGw3JCc20SOLvalWY6rPB0mqIaasouIGGaXCCDp9l+T8iG9k1fSFIZ5GQnpYbMxgyoVeX4VbDXB17I1JymHzZcuiyVHyISYUUcs+rtulyQk9USaB9QN4A11xoFNaQnFM4E5GNnOe7xAVJVFejn4PWqaBDoo0ArmXwj++VoK43gKhH6BE+071fH533N47WG0HZ8wtFsfm+7q3mzTJ7zLKu7+VbB0AwszntK20ByNFrzw8tKVrDPhP0mNOq8QRyWJ/jV1lqBfEqIKvfEIYCcieBOSm4WO1ZLcLiIe5hy0yVDc961wbeIzjLC9LGM0pk7JQi8HEQMNKuk3LN0lWhghaBndIUBDDwWBkzammQqqlS7VNIgILq4GNo3spskzRFBRpL2cLWWQ0soOAB3G+APTNvcc2H7H5Uy+8C4Dbj7Fz76r//f7f80TZrNiLfzzuN8yWo8mkxdOrPfz6Yx53VabgdVRaWRUStLiS4Oh1PK+fhlk+mUO4b+473UNpzWArl08ncXBVmUmRMZAVjHwmofYsuair7ckKty6Wny7rHjBDFQGHJtsjFv5qtHC4dgFCUCjHSv0ltKfyxAGQSnOBo6tChLD2g+sVh9x9KGkBAhFg4U40fJj5eyykq12fOdC1YsrjfMudyMfj2lqGNVlqLA/h4pFCOU7nKhfV0dn0eNyFMXDLZPb5CXKmm8dzm+Aa96Lg8u7PCeZdapUoPRFfVhCZ7duiOV61Xz6XxWDWQdc/3770MyDTHGPEhFkaAJz8SzvFJLU0MblUvZLQMUPJRJkUgAeV+Pjp1XW9zw7fbsuFygkRO1OtA0Wps9W6Fl7Uxmijx+Nm9cE5gVdvJrcowWd49OhOFeMEzhnvo4foZ2BhKKjprWS0CsZ5LTMwdOoHGrkZETMUn6hBkKI7GnDsYN2vWunnCRVYTOWak3yXNB0xfgdrQmcGG4yNq1BgJt0idhLaA1uiFcIgs9Pkk83b8beP1cxI4eL/p6dx12u231RXtHerNzLj+R/NMdYoILZ8s+el29gT3pz58fcd6/JtpVqe3v6OMFtYRnbXII7amGfBrtgPDS4SP4ts7n1rXn09nj09fXZ/y22Fn74hFre2Gm6C3WJ3AoT0/idVyaRn0DIE4CxFFztNybRgUesgWJQatqbXue+wq3n5l39/BEuugVHCY2Z1adIzHGAw0vm+ewKYly+E+IHt27r7nemd/OF6t6fJW8xGbsdJANEfC5G51RQeQjigIzLiimL2sGHhcKbOT8YWTCXunfcE2PRaKoGoRIUUZ/KXDr1YJ5qnJEzQQYIoRkRFfibjuDSxRyBUgabwABIb1q5cy4rObbchPhEj1LgUn5tVPrK74kgU2PZRJ75oHqBcd2fO9VE6Ou4u5zvwkt0jA2KlzZmTX/SCd7rZzBgSN38PB2vbZ0Frwgm4ap7BLR1K9z+AjcgdcTzHAtaZnIgbEdToNa687c6qpLHQNXEeKITyNQA+PBBIlq8PFcNOp4AOzzT1tNsIR66ll4ituVJZg0eag5LBgOctLsnMjfwEZHkmsFHyf85bAO9uv3bMUT3Tjmp2slMsrpwEbWCI1jXfnjm0xPRKyZwXCCmis7yuxvUf3H3k+q+BkADN+qjaXEJ4Rbzui32fk3zBiDlz5QbKtNSy0R8mLIaGUTmHdpAp/GoNVETxZMq0SpKgG7F0TcgKTA6owaYynqWtD2QIYs84yeSeJo0MMR44cmwNI320W6wF+3W7VpMscBwYYeMGgEp7QnHviPuRAlFCkjQyAtgZpDSeD/dxb2/2M1MUGRRiv5jm8bZpXxNhdNrmGOzUv7ghc6rA7gYwXeyHyjGdEb8ZE3DPBppbQYVbGh74UKy42+5lCutSKH/bFYvDRvjltzWq1jBASApSIdMTT6Z0YeJzK6x8AO56oUGJepZSMeyt3jCCBdqck82iRI8x5sl6nqstm1tWknW9shFNBRv6klIhVVK161lx3OqUiz3b+yNlzSkNLG9zH7QM7KQ8c9HzbNoOs5K0kwFS0Lh4qjv13x6vmKXQqpdZFcGl/eKXHZeCTeY/lfOKErrsnhio53KfTiDUmcwfQo/jtZekodvtSKP0sA7v7vM9+uQZa9O66nNbPy6c9UR9e5b4KIUkM05+fiE0gYOuoYTLNcRjJlXigWLBOUEVaiRTS44/qmSOAfkbBpo9hJVGlsst9f7qo2NqCsNsHYb8buuwRQCteJhh8MwtzJr/WhExPINhws+Y6J52YgWrmcjEkMAFzOkVgd3wtPXoiMBerK9LqObfKYZ9vT+bjFWUNNQBfBDUaK/5OxODq8akm9Gmsvm1a0WfVBeEoE1uqzJaohDlhEpaJl5aiCaGbkPGmNfJQZZZyKpwOO+4OPiM4SRtbKn0C2rRURFKhJ8p37wA7Mz/khDdwpX6sHA2p3pUHUm3zwmQf+EeY4JcDCkZ7msITW2GtbT2Y3e7ClywdEdsKlv1QBsJU3MwThJnpRUUw2O09+6ot6QNQMuIodCQWtr43+4GPdJtW/Mi6amq2OqPpqtwXengctub+rhu3EfkHBG59XU7V4cyCzxvlga/5klpkYOQgFjXbIjbKbGzYKGI1Be0MUsNtOcPyykl6ccA6wDEboEqeTBr4QfTacZvGTBTWjoOT5ICHUONxu5A+QajCbBE6QgclOrsMrqpEj0h0K+Ks1DK4TyOZFVaB1N24Ae9RiBNTYnppLy0M8hMqAF8oVBRAQ5Vk1kC2siV4nQFve1cudtGv8MrxEgR2s4FpcfMrZmsUu6Kc3XC43c7xgswZkW3TgTJIDfi078mTlgT15sud45BnI77JC9xDRL7zmENJnZsqtYR/rh6Ym4m3mPh6u3gPyTkIITTN37ylrHfsOX0MBrvt2WdLsKWVKpGSObCIxA3NXRuARqVc2dD118e+Ebk12Hl9+Q/D/JYXVF9j1JUYP/qZG3y/s3OhdbSTzG51GGJIHHK2cjlWLccrcmfdtDuBQ+8QDLU0g9SQAqLRbKkjLDGFtOfip2r+WWahF2pCpXq4b175kqlC6jBB0FCTy3Vov379njRDvC9/amB8vVE8Ps8UVYT3zfO99aY9sg26lMr9k1aoKd1KMlvKQF8myRHH2YJ9S1+ytfrAoUTj+oqkqvowzDRB8DY3riQWMtLsUlvcO0QEsaBonR6kxCBHY8UPZWoVUpKoUWyjegA51XBd3X3L8ezHdU89PcVBlzrKRefqSy+hyLg/I5F5jnuc8fX9667xc0ib8UdUhXMK6PLOMn+zzkJanmZkrXamdUd3YFgXJ7gM+bly+X/mRUjTF4Kou++gqtVk+PwxitKpGbmsKJFfxRi4v7L8B7fdHtdHQubrTj1ep2KmgsQfDdJnkIfxhLy5gf3BMJstSr9hx95Ogtapi+ulpxjeHySKG3ZZ/7Xr5nYjD+s+W/Mb19SUJaebey3M7EMt4HHSqb8NB/AHYj82qGL0+YPyRHb7ag0fASQMOFXhshB4u21YoCF2jEoVeZ7lvaT18THqRkxSv3X3bZ/7LaxXhc4h91TWEFibZuHzEGOilGerAeg3xwNijAc2H/orD8yLtLGAPtzWb+x+9+LmnjMOeWvg7IeJL0PKwy69YD902ZzXQwc7biLyPoOb+bQVO813GlZ84z39BMLstOqHVzfLcn1BDr3qQPriOGK7lzuYT7Ywexcr//KmoQkxOhPeiD87XZwr48Piem94qGvAklNgTbg5uxoRSk/PROVqjCD3dFNv5qSwPDKmqDtKuBtwtLPMmEeM03Oy+GIWy6XyTH8TY6CUy9sHlvmr20dU9IxE7F1pMiFDwEg9sYQbPcqQ09oQ0h2NRqDbnFctuQ/Rm0MXrdCUfq7Wu4Prm190ONukFnVrsvxqIf6FTPSqDuDkRG3mGxXTJKYE21ieyfEtQZQ8XrDjhzjKlJuogjY4TvVG3Pzls5xasiafRfLKhkzxmVM4fTiaULIrM44xLLO43JBVfE1cP5xhnMyML/5mNqy7wujoJJk9UsNu3JJoQfb35rVqudYBn2C3qkRl/5AXyR07WtF0Z5rp0RMOy9sns/mERnrCBvuNhfV7ktK6Rf/5HN028lOAWkIUWYRUBWz9KICRbKG2SKyoll5QW+l4tF3pDjqeBwbWNQvwtTF8m05DJYp0StxJvwGxyK7Z65/APPtYlN3aXf6QB08G2Hd3kRQVsSJGevuay+HObV4n6VyyOTtTyxvLiNkjrIn8IcavrDGkUGr0Up7iY8DG98C7yN6e8SiWUAeffYpinC4hZr11vBEFnbrb7t6fKKmMjZmuuPV28V7ZHLobZ9O8nH4buQaneDXnVraZQ7nyCcGlnLM8aVmq5QYDnQuPfn/sbbnWu+e3Vf/jMDznBXmJUSeie4+NaRhYh0LlApBiO+DUetTRJmpPXXZVy+7KunwgrFHU1TNZvD1PMeyuh5vUE3tJMtQlPoyRML5LYBpWCxyo3orLFk00rul1ji6qKDJmNPlFYm2jjxFU9mNl1EyaaENT3NmxSWk3Svkq+t14P4fGPE1jM2YSAbMhCaYqUpNNlUvJn6o+6WgqzIVdGnX1QPJHrNuRmMgsdxuSzy2ah56tN02/ixoXGqhkvYHGbrSTzNYVPLdjtDiQpaoKZwzah43XsNaVzwaamf0Wvyi1pgk2EG1IPIMU1oOXpNakYt53zmQiylZG1GX8xS70h0SEMUhkgIUlTlfTtHE7+YkyzPWYH8NDANNoZdraieK3VxeYQ47hAL0q/VEolAmKPDx28RpYoZhRvF0moDEvDEzDbESS8hUp8VNSj6wLqYgXpQu3+5rn4vfrXuXqvVHeyF0QaOc811Tci6IUkaKJzFv1cufXvGBtUlRE8JurUja9651UGaI4jUmimUDIgT8xlMBJZw4Yo/vM7kOjvwLoI8lXUMAqC9JxwzY0wFFn9GqSLLJSx04uuGlTzfMCbCcZoFQoIOcAgdNXDxJbysNdcUnH4T5dfHioPjaD1MPZYgpZcgS3I6QcQ8Be98hDJ+UgADwdzn4YdvB9Cma9lzzGcQ5gv+4qPu1ai7OzFF3SojNJoAqRsPsJVxe7vRL4YG0h1ursxuU+0FCynUsP3ZIbCQ/aTgqvSwHT7+2axNTSmrwhOz8n0o5biA8tGwKM8USMbuMyUFUyEY07z5hLqXxQgZQv5oBkg7VFKRfdNH0H6jK23FcUvsHy8IYiY826o9L0uFYuOLZ7DnLS6td6mBkqXtF2yRVqKlehOV8Dx0rcXVk+Zy0jhV0S5Hym7eJVjuctlAWCDm3rwxyCxs+lb+xmieNsAVitnU6vVtCm5bancwBcn/BpSIEp1+KsfQaJz0zH2zvIXM4Hbh79QA+9vRSL4UO8SSgqQH7p3MQC/hJjAFxXdLr3CPpugUpps8cYHj6uHYhhBq2PxyRkQ+QmO0LfFXsGK3mkbJddFBNDHVO8p0yNR8UJKYZk4mTkpNg0ol8ndzRUW9WWDQCezFvg125mvAX6ar0aYKNHXwbIW0Oyu3pZ90t0d7vJCEpcnuGypPU+DIjZSt10qpQRyYnKkryBQNQM4iudrLYoXCx5nZw4ol2ouHRck8jKhUsnRHM76+O6R/go4flQJzpm8Vt90tvp86SeDa+/mbPwYnnWDNgUlQrrXWBsXz+rT/P2zZP6XHPWi5L1tBfV47W8oEeznw1Rd0+0PM9zOZa542d/VhK/uC5TigZgH+et9Z7ha3p/GWmfZjixsaO6nPV69v90inAHR/FWeLpz0SbEhb+pcbX33jn/EeDjEJFc/n3dv/gP/f2Pg6MD2wPAxc0T6+qI/7uugAlGHQLY/peCxQj0rWeGALYfBqiK5n/V/wjf04AFAOwmDL8hbDLQD7LyMllNsa/LKP0R/w4yPlrJ4h90OR6SU/DtO2+9sip5fPWPOh4g/iPISfCaIC0l70qFLixdVucJykJfnSCqLY4uN+PmSflBY6wHjMD+Unv7ZrjaBQS9XVdVR8Bz+0Qbxmi8qWo3HajbfWDsDun95oB6m4W1NWauo1YrrGqhzbm94xq1W7K7i3Zd8NWIxPgi0l+mjh3SlGyq6Jw8twFileXVTtN+w4xOYVbBOyUGuFr3KxFN3JQnh8/FX2b1Zs2QCrUEZuOQ3ahOoWdvQ5uCTTrj/iXaO4Z9jUPtZ8bqJdtPRGnMjHd0sdFcGUJb2IXLWiulWubuJx8+7nYZPu3P/Zwkm98MYWYr4luboYut2L4JzFcAdoRDCPMmVkp79jjMZ92GrdxDvVwvgP5i3nxNN32JASY5KJmPMoTZDTq9POTTyaFRjXZOg5iCKCXgnoPMLFDmKzZK4huMWVMwn6wiJaZhCuOoH9NVizQhn47oKDNB8xSAhd+cSagwGdk49JEpaEJb9+saioJPAyOhGkY7glFjmP78BWkB7EkAfx6gz8Eq7FIAfQKglXJZfADQzQCsBEyDAVqX5TDwKmEyQVTdzcIWsqsh1zX2EllmLrtEnxG3+bLaS/xbN0h7ARBTZUAHChNHJsAPJAYA/G8Qk0JAaDmOiuL3HetSlQHYDKgVkooJBMblosDNpBGEWr8FTSzMBKkYboJufjDAGN5mUrBrjbt1DuyShoLL7vQRPCI5Jni58jfhjv35cPZdjuleuGdn2+Og+7a2w97A+WYSa26GyCTLICfEJ6AEUraCLWUSFjlxOd4MQlIySRSZFkFpVC8O36KWMkDiBllgipbCpZCKXGqm5UCaSs5YuiVgJTAZLLVUpuNL4GaqisQldWy6iHtx2lBGpJNWjiWRbMk4utRPG669QDGj+A0KwgtsgdXGU2qi8LI35XTE1oUGl8RP4FBKGujTvwUv8EGR/TjRKiXzUie22pNC2vVWWFFWkKGKDGoA9sl8JRVO2Kiu6mDUNF+JjEVyZTAHWlNBQoiNa38+Fwv/ygHuEm/XgCEdnT4pSUBNwr5sDK5EPFcqSMO04Z4cB8h4RiaTtfXPb9SpMcs0qL9W1AatUxLnYYughCy/DugYcOjzU6gIyX2tl/znJZf5P4Yy/jJ/ACjRxwA4QSPpbAwmO4d/wp7v4eXjv30xCMUQiSEWQyKOp0DFq2bl5BUUiZVvIwuqiNXE2O9bbtSkWYvWmxgTtlSPXn36oaDpRLBw8AgCBQkWgij01q2Q9FMSiSxKNIoYVDR0sRjixEvAxAoDuKFYiUtavFaqRqVjBvSFIZz3WJHG2IQluBRb4Kw5z8IOLhv0mw2/63HaNUs+aDg6bHU4buBadt0dN90SfWve4Lnvrh+cwfdZvTUrVgm880E5ESHxtXBqkq4wRfKraV5FmZxomrfSZcqQJUe2Kd3y5N7y04m999F5WqMueOhR2GMFo396zz57/uOOvWEUxrEv9seBOOimcZPOmTfhrAVlhuKQW66ESZi6GGZhHhZxOEAD/5aMZIFTfr4jm1S3CR25g1VdKEe9nUUfQdw57ko8zSN76Yg7xY/EneMucde4W9w97mHYiqGyTo5Y1Wkr70a+Ss7lsBSCp84j+HpXvD7uXrmMErWFgY9H+8BU/Ejc+fhcpuh/QKdayIiNdMEo6cxcODp6czjVWg8tRBuILL6OozRzrYRfQgW0DbRDy+HbtTpoxxgPTngDZZfui1qXdETRpVmirZMbD+pox1hBkxpBhZMcf1+M9n5T1ETHyXYlOk92RKLrZKc3uk92gdFzkttiGZo2AAfovPf+zAIAAAA=) format("woff2"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGXUABMAAAAA0DwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcaCcWLUdERUYAAAHEAAAALQAAADIDCwH4R1BPUwAAAfQAAAbdAAAkrLRw8M9HU1VCAAAI1AAAAgoAAAYUTOV1mE9TLzIAAArgAAAAWQAAAGB/w5ZLY21hcAAACzwAAAGIAAAB4hcHc2ZjdnQgAAAMxAAAAEIAAABCEl8L9GZwZ20AAA0IAAABsQAAAmVTtC+nZ2FzcAAADrwAAAAIAAAACP//AANnbHlmAAAOxAAATiYAAJDYEcNK9GhlYWQAAFzsAAAAMgAAADYMbqXHaGhlYQAAXSAAAAAgAAAAJA7iBvdobXR4AABdQAAAAkwAAAOqmVdD3mxvY2EAAF+MAAABywAAAdhAnmRGbWF4cAAAYVgAAAAgAAAAIAIIAXhuYW1lAABheAAAAcYAAAQ6TQScPXBvc3QAAGNAAAAB8QAAAu6KLKjscHJlcAAAZTQAAACYAAAA6hIo+kZ3ZWJmAABlzAAAAAYAAAAG/MNWqAAAAAEAAAAAzD2izwAAAADJGsYbAAAAANLOrUJ42mNgZGBg4ANiLQYQYGJgYWBkqAPieoZGIK+J4RmQ/ZzhFVgGJM8AAF/9BQQAAAB42s1ZfUidVRh/rqiobWs615Jlara2/GjqLUunraw5g2F1gzFk9CHbGBajZWEWYxRc1hL/ECnqFuNugYiESImYSWA2lvhH+Me6LLhIiI1A/GPI/riMPf3Ox72+9/W+9773y/U+nPue87znnOec5/ucSw4iyqOHqYoc77z1/hnKoUxgiJnEF8fbJ98TOFItfMuQ7xzKKP9d9CxtKrtNh6kRIxrYx34e507UxlEfpwKu5SWe5x728gCf5xVeZQ/f5H/Rzyd6sJeSekBrVs41zMdRfDwL3DmUVXaC0gB38wpao6ZRw8BuoaQfMXdY248dLos1WPT3m0fETXF4A6Yfxad2yAuUhocDkXB8hxcjYNdCtUBSNFfFTMY5+BQ4u8pjViuyXqttmotB6bBPv+eklo5GGTELLRdynbOWusVYSYN/ETrLcwZ8B9oePiHrEeYEF/wASJqv80CKJLxEm/bwBZv9+nmMJ8TK2IOyloxu84S9ffIVXlB0wOWFRLQpqP9hNgGr4FU7FpaY9vIN8zgeWt9tcnZo387g3QPQ5em0UBvmPl0b5FGz1sMOPIgxblAfw1c34DSfNVqpQRYeGaOmeN6+r2W/wSP4eFLGGzmn8kZhYyLEM+Eh7Dx3b2N33yNi7uJsxDUvTwH3rfRCTu7lNs7kP9B6BRF1GpGzD7CNOyPQuxXUdr5uY5enVS8u4XZwDjR5u2zvgTU0cIGsO9PsE8rs+XA+gCgvd8wHEQvm4R+mpEyW07i2zqBM+WICo/2RdiRzkhWtQwHrfCKktcta92YjeRgry4TXCZg9k6IgKEOLhV9ai5bPBCNOwrzrNlpfiuUyyR26dg31OT5q4mU/zwDvkjUBx0QckXrtRD46iVoLSh903M0fczMXwsZa4R8u8IgYZUE1YpTna9H9LHfBg0kvwG7hnZPJevmm3X7CQqzXnBDt/nVPaJURaw1LIKNQ8lGchK63mPMlGZFHEJnXZPGqfUF+AyoicBvKVfjQQUTx85DqgvDPYr08Ej0L26hbMVbahRxN5W8j8fPX2B+7+iGSvWH+ZZ07+JRmwRt7lN5wj97VtDjZABb4huaa9cljLqF9jon8NxjX4vUDKofV9VEuMnObRWxrk5FbQDs3SGwBzmznQ/J0S8wY59y9A647YZ3T6ktc9hlrnw1Yn/IOZ2W2MZiwhfhj9rgozqdp8okjac/eJ8zxh8vBr14uSQu10MmLzxljE3KWS7CGVvUlbXt1h7VqBd3gatLM5QKb/arBl9qkKF3ZcIdRKHPoDBtjbyWW56bipiWJmY7r9zH4Ni+3R+07rrK+cE2wTWlhQ97XAdyE8m6bdt72xHPqTtAnBEz5bi10aNCOTzDr0KZwJFGaH9D6CeAi7ScX4BNAd8yRLpwlXZZ3Yi76ylqHNmBcyA1GrCNgHM/rMTnVE9QhrH1WxWfLvl5989qZMjlNQ4fK7N0PpIhit7j/4V77OZTC2bljgczUOfsEvKt3PV/hFpxG2pEHLYHyWek1hoDpS0CLXYjDb/LMZtqSw7YeciVy8i5zVp8yXfGFnZdftB8NuNKcq0bLJG3MeEncVQbPMlF7Ho1+KxjlNsx0auEjyJCH7fE2VfeB/CVOYfPpue/bBN8Xx5lX3L9EzwD0GaknVRmQPGevxaCpIu2QuuuNm0Ig4j7XbO2zL/59Gu9sI/6rMau94RCPA9xWUSQeTx/5H4NYZ0E79wNp1LYZ2vQnelyPa6ZeGT+74h43Tv+H5+97SLvtHsjdc092Wg26Dsqmv6heYx5F7QW8H0NxUi2JfxueCxvzvMRUUmUYNoMyMQ9RLt0n20W0jeR/F8AWoBTSTtoF7G4qpmephMokleBTTnupAu8qegK5fDlq+6lO4sWXvWg9Tc9QAzXSAWqiFmpGzTi+wtZuG1HMJ/QnTe3MDaOyZQmCqBdpKJHtcgNUYSVVGkI81ntQQCiNGppRb5a7jn06qwXUA5z6dx+Kg7LoH+CzdZ89slYnJSBoCj7W01OhOer1bqsB6slCKcUMuXL+4DtPt1RblC2Q5lbI837oRz49IsfW6Tkel/wXsEPLQf1DVQOo0KWKHoD8H4QGVIJvNWHjrWSXHdbaKTlnfkrDIDe0biPkhkBo51YN+XrtRqgIwbpe1YRhK7AOBUVSx3OByY8pOyF3oTvl+rdYSsa4zx0aMughrWV54LkDXN8GjdwOC8qCBRVSDuxnN6gWQ2PyIO992EkFeJoPu6nBeCcdBKcP0WFQeImOwIrb6WX0eJXegAxOAg7Qh4Am+gjQTJ/SZ7DGzwGHaBDQSl/Q1xj9DV3G6O9olF6jH+knjP6ZfqVT9BtdpTP0Jy3Su/8BP2UXLwAAAHjajZTPShxBEMa/6u7dGAkiWedPJipLCEFElpCTD6CwiIJkg+51YzAJ6EbUFZGERMjBJ/DsA4hP4APkmEPIIeSUS/48geSi1TWzk57Jjs5hu2eKX331dU/VggAM4yHaoI3ObhdDMBzB5aXsBAUNs77dWUO08fplBw/ebL/oYmqnt7WDBhNKKPuLeZ1k3cIopvAYs3iFLeyjyvHb/HSMc/ygIWrQMzqgE4kTncUa9EnePfpKFypSc6qrTtRn9VfX9Zxe1x/1mf6iL0xkZs1zc2ROzfe4qvkW75VqrFN5Ij40xhChnjis8ErwZK3J6peiwkIqKEW5WkEh5ZeiXK3xUr6KqXulqPs5KnZ6N2Gq6bev4T0+4JC//B2m3qKHPekGj/lA8sJcHmGeaeKaE1J7ENHKEErc2fesCknezWRrIDmOR8mpZhy27VD/bn6RMzRn1DEtOa76ojzns2yFEJNSl3jO4viqo+kl9ewNRJJN4r2vu5qj7Nkm/ztbO/kS/Zo+uySeQSTRptNlXsFtN9OpGOT5aUYh5os8u2yz0HMz9exf4zko4Tko8LySUbjes8uW8RxklKZzvaM4ajND7gVKe2ewZr9z8jkN/tn/42E+k+3nP6ywgGX8ln0JvzhjGT95XRJ+QXpYMV/ntYoRnkjNk+nzbNo9lEk9TJ8V30kgvMIm3klkHq0rJwFI+wAAeNpjYGKuZ5zAwMrAwjqL1ZiBgVEeQjNfZEhjWsXAwMTAysYMolgWMDC9D2B48JsBCnJziosZHBh4f7OwBf0LYmBgd2IKVWBgnA+SY77LGgakFBhYAO+VEBcAAAB42mNgYGBmgGAZBkYGELgD5DGC+SwMB4C0DoMCkMUDZPEy1DH8ZwxmrGA6xnRHgUtBREFKQU5BSUFNQV/BSiFeYY2ikuqf3yz//4PN4QXqW8AYBFXNoCCgIKEgA1VtCVfNCFTN+P/b/yf/D/8v/O/7j+Hv6wcnHhx+cODB/gd7Hux8sPHBigctDyzuH771ivUZ1IVEA0Y2BrgWRiaoP1EUMDCwsLKxc3BycfPw8vELCAoJi4iKiUtISknLyMrJKygqKauoqqlraGpp6+jq6RsYGhmbmJqZW1haWdvY2tk7ODo5u7i6uXt4enn7+Pr5BwQGBYeEhoVHREZFx8TGxSckJjG0d3T1TJk5f8nipcuXrVi1ZvXadRvWb9y0ZdvW7Tt37N2zbz9DcWpa1r3KRYU5T8uzGTpnM5QwMGRUgF2XW8uwcndTSj6InVd3P7m5bcbhI9eu375z4+YuhkNHGZ48fPT8BUPVrbsMrb0tfd0TJk7qnzadYerceXMYjh0vAmqqBmIARoqKjwAAA90FVgCYAHEAfwCFAIkAzwCZAKoAmQCgAJUAsAC9AM8AtgCLAI0AcwCHAKcAmwA/AFEArACTAHcAZgBjAEQFEQAAeNpdUbtOW0EQ3Q0PA4HE2CA52hSzmZDGe6EFCcTVjWJkO4XlCGk3cpGLcQEfQIFEDdqvGaChpEibBiEXSHxCPiESM2uIojQ7O7NzzpkzS8qRqnfpa89T5ySQwt0GzTb9Tki1swD3pOvrjYy0gwdabGb0ynX7/gsGm9GUO2oA5T1vKQ8ZTTuBWrSn/tH8Cob7/B/zOxi0NNP01DoJ6SEE5ptxS4PvGc26yw/6gtXhYjAwpJim4i4/plL+tzTnasuwtZHRvIMzEfnJNEBTa20Emv7UIdXzcRRLkMumsTaYmLL+JBPBhcl0VVO1zPjawV2ys+hggyrNgQfYw1Z5DB4ODyYU0rckyiwNEfZiq8QIEZMcCjnl3Mn+pED5SBLGvElKO+OGtQbGkdfAoDZPs/88m01tbx3C+FkcwXe/GUs6+MiG2hgRYjtiKYAJREJGVfmGGs+9LAbkUvvPQJSA5fGPf50ItO7YRDyXtXUOMVYIen7b3PLLirtWuc6LQndvqmqo0inN+17OvscDnh4Lw0FjwZvP+/5Kgfo8LK40aA4EQ3o3ev+iteqIq7wXPrIn07+xWgAAAAAAAAH//wACeNrFvQl8VNX1OP7ue7NkJjOTWTKZ7MlkkkySSTIwk2QyCSGQhLAFZBdCRJbIvgqIiJEiIiKiAsoSN1RqNW7vTUZQvmpRpEpba61fodRaS1vrN6211vr1W4E8/ufc+95kAgHx2+//80Mn8+ZN8u4955579nMux3NNHMe3a6dyAqfnyiXC+YdE9JqcvwUknfa3QyICD5ecJOBtLd6O6HW554dECN4P2ty2ArfN3cTnyvlkn7xQO/Xss02adzl4JLfhwuekTTuNM3IWrpWLJHCcTxISeiKJPOcjYpJf5E5KWmsPvrrNWi7BF7WYOb/GJ1r8UTO96nZbEi0+yZTUI1mJTzJbbHaYT0I4HOakRMFmF83hQYNDFVWBFGeyzpNX6AgKng2NbQ2NZeWN1jfcG9vKGxvLyxqbtIXnizk6pxVCCz9Ju5gzcWncIA4exvlEazCamMAlwMCuABHT6bx0ST2iziqZYVQHjJ5BfNygwY6KqiAdKol4+IL4DyuqCr2hDIulJUSKQ97CqkyLuSWkNRVWh7zm3y9aTJ7M8oaqC9klnUcZx2l2AG4yuBzAfyQdcCM6gxE9zicxGNESwJXBHAxKGk2PlJQdCEQ5kq41+yRbJtzk4KbDFYDZ5volN5tbKOjwwCso0JfeQ18eB77wqzLPR1s/dp/ZsHHDmQ0dHR9l/37bH3P/C67+uGFjxxNntp4hq5eSfYvJWnk7vhbLC5fKO8hqfMF9xJ3ATbsQ1LTqCrgSLsgN4XZzkWKcdSHMUegRKwKRYo3R1z2suMjgizgYXqVU+GZwIOJIxW8cNgOse51fNJ+UfJYe0WeViogvorEOCgB8XrriEXtqBXwSvVYpBLh3W3qkofDuM8Nik7DkDtnsUooT1z9VY7MPM3DE7ExxDwoMyXcBKdSTbOKylesqK6pClUFniktf6LVl65zJFl7v9FTmO5KzeZfNQshQUllRznuntTf+x+qqUXOHNRdnfPFqxzePzL+lu7JlTlOzL2NQ+3M3dsinywrGTKhdsZ2su/PWwpYpQ97YNHaRmXydlFJYWNMwo/LR9xJf+7HryY7NaXJjUmpRydCR11ePvn3VWMOhQzYNVzJsUK6NPJGw9nyZZeuUQWOrCuyARy1Xf+EzbSfQYCLngvUvADp8goukAi4j+bhFijU9kTTAHyVOyanpiZbn5Auw9OVwmWSgl0maHiIORkqNmtieMVklO/FFdewTkG4mfCpknwqtkg8+ueknKQD4tJts9m6DkJoBaJN8hTb7S2nZOZ78dPjISeWpgORMdzgsOZPgSseFw3G0D9sslJwSDFRVVhR68nQOEjSQiqpc/CoXv1G/qD+8c9eRI7t2Ht6wunXmTWvbWle3CItWnt9Ddh8mea+8Iv/u8Po1h+D+zDUa16433th1/+uv3z/3zjvnzt+y5dxm7bSzXaRy15tvsttbtsydf+edSINjLnym+Qxw5wUaHM4t5yJuxFsB4s2n7YkYEWX1iJwGuo2LjD1ikVXSA8gVJiBSqzQE+Yi5R2rEW3qgKm1YHGKLGgt8g50AvWi2R9I8ZZTD1Pts9kOc3pztGVxFyctRMZQPFVYqmLBo9SmuFFdVyKWDC0+hN4aaUKG30GshjmTXUA1Dxhj/zNmNi36ya9vzruw6//RAYMjc5rZrh9w5d8b8gx8OvfbpM0e+fOrxVXvv2jGofdTsha9PCoxoKctuHXnNStI+buOcZk/3D+566d7bfONq67yVGemTV0ydu+lwzR87luytbH36J2/ect9dD4ZXL6i9m2+dfU9aYahypHf0xFVAawT5HSmm/M7DuJ3C6ohoVvkcfVkuZXB9PC2ekcEzW+WF5JR2A2fmHBwBZo3P0RuBTSnPsANGeGeyHXYf37pne9vSRYuWtm3fQ776hnxwtPmkfMc/vpRv/89Rr5MPOTpHDzzvifjnCSclY9/zquyVFbw3lGJ3JvN6z7LFi5e13bN37z2y+AHZ+OU/SMeHzT+WS7/5H7nkNXhWs5DFrwZ4bVwlF9EivEkJnB7htfvFpJOiNoBCJhm3SEByAA1YgMS7NXqzFUkf2ag35PIG9SGX3qX3ujwhffP775e9ZZxlOu5//33/cdMs41vC6SWLJ2z86183Tli8ZNKmv/51E4xby50Qjmnugz09lRM5v6gPSkTTA8NFOIK8jzMCVyQcXhIB2aDJLxpPinwgajBzeTAdTSBiMOLXBj38ptGAl0bO4EMRhPOqdNtA2DrdNo+tlty9htwt37SG71hMnpanL5ZbCIgHbq18nizk3gXYawF23BKJCT0U8ISTIgeAWzm7xqe8MeATYH8LNipOtbAXLEDkrqEkhJSskrlOvzbYoktw+kL1ZZUt14057l4a0NSUlzVMHdn6VCWuXx15ji/mg7A78xB2ieh68EVEjV/igO8IVs4AA2pVQJx15HPy3Nat+LdUR4A567liLqJXNQT1gogJfpHEtATJQB9RhQI/WZeHkr6hrbytEd7xWdyFU/ws7UaYRwqHgyN35K24+srYThIk5NP1ckax9umz06kcXgj8pAPoJQWkWjMXseHAmUJPRIeMpFCAGfgofbtAXrmsUi4gzQQyqRTec12APJsOkVeYCYpJogkYJeMSQjCQLSRbBE9euRACmRMYyoO8EfIswsL8iesiy5ZG1k3Mx6uly/DqxYLx9xy5Z3xBSsX49XvWj69I4bsWvvXytsmTt718/BfHX7l7ypS7j7y1YOlrT15//ZOvLZ3auXNxff3inZ0Isw+AcIEeoQM5EtEgLyRUu9L7Rc1JSYBdlABTFTRUfCL6SRAoSO8j0/Z0/Vb4hsw+26VZ+19sHy4DnSQNcJEXw4QFMEGlUA5iwuMXM05KCYCJpEAkIwEpNANEupQPyJUsNhjCHhZzbN1cQkYe45dDCSACWIFF0APpVg7VAxYIsEP9snHnd137+OZrmpYeEjfxj56ftuC+RxctGVblmtoxZt1r9Zrd81cFZj8yd9Ize156cP6+rRNX3zF3+fRZ00snrw20TcC51sK6aWCufm4OFynDuYISEsmkElMAMWksy0QxidMeBLvxpFQCkqDEKubknrRJdri2+6UcwM5gnLsR0AP7tASWT0yySfkF8O60R1LTcuiColahyjt9ZZ/o03sRPg3VLrLhTQO7pvaGoSduerDr0KPrk103be9+cfPy58fNuuZve39KtKHWuRXeKVMaSuRzv/th74nFk+ZuW7dhHf8Qv2rl8lsnTVly/epjzzSvHVtuELKqxy6vf+G3G4E+gbA1lVSHNnPTuYgBV5hHtsYlGngzsA1QBkHH0gUo4zScFE0BKQHAEwKRBMpDEnTATgx0sQzITpCpSokcpQeRt1EN2lEJVBF0eoAyQJlv4Ef/5ejRLtlNPiGtO4QV5zv3yE+R1j38O4D3rYD38TCfLG4FF8mk2xTwbka8WwHvyYZMM+A9GfGe7RdNJyWbsSdiM+HwtiSDT7RZJR0QZBqgPgfebaCHSIkE8K2zdQuG5EyqgBhAtQeGlmhKQ4mcbBNtdBVimNd7KSdUqUvjyd26aMdf7468uP3wHR1CU+/8yq450x66ZaT8+a/k48dWRn90252Pb/LxZ/bJBZXNNUufnv/uN+renwY0VACyYjEXyaVKhLr3TQBNSjBXB9CkIDRVlA0ANGJhAKEYBLPPAChQSx0EtN9t0qXk4nQzbJIhAZlCENSHbhuX4UAdy5QCgCYY+viDS487wQLTd8V2CY/8wpUN3yK/QBJbWDzjB6+s/Py+aTVb26/f2+bng6duue7xW5obbz68bEX3zRPzJZ1v/B1TWzaMKRK3t7/MP73qF9HNLU9ubBrZtv+1BR77xDtCi59ZPOOJDaNbbn/p50NG3LZ6ROXU9uD9e1fBWtaDQvVHyjvymLygvAPpCfkHMg4OrEGgFCHM+DbxkHrhYO/7r/Jezev71p7L0byOOtliwGMd4DEbNNkGbjYXyUBM5gnM0pOG4fMaKfpgx4k63IGD4SLHKhUA8lLhsg7vWQGbTXCjbjCoo4nOjDyfQKlhWB585nTWVF9I0cKqQuWgvw/lVbTpswndfeVE1UzLBa9FA9q+ENPAFr969x3PTrzrienXPrltUmD6oqF3/4f82S/v+nhL16t3bD4SGDNzdFbWmJljgy5/w4xhOTnDpzf4uzb+4BnSuunVksInb5uxfbLPN3n7jOHLrwnZi1/b9PTPrn32jiWbNy8JTg+XOgXBWRqezk/yXzPYa9Nqbd7B1/gX3HIL0Fj7hR7NJO0yoLEqbqHCVV2AGVRNpADQWF6xDc26PERSiCKpEGnMKmUBKhIBJdXwXgirIDmSYZtk2aI2lzavlGImz6XclgLFQGuJWVxOTE9FCeSkIsgbQvY1VKisAJ20D0mhcg3SXzuQ0tKV0Zsn5FNS++v902rumjdh8/Qh6Xzw5M23vX3rc9L29iNVmoyqsatGjN3QUiS8MOPxW4GcDv189ap3u+9oOQjENnTh9j0TCoDaZp3Yff/elTOr5s9v8VdNbef6/ADC5yDjk4Bf90n5RDRyk1DKW1HKiwkBFPLIwVDW2/rJer6fzG+Mk/zCHHxrhHHWXuDIQhgH9hw3uk8DijhxnHQcJxNVIYmzBy5ShsDwp/i+On1IUBwOeYVrA+N0JpuqGTWj56G16Zh7eUBXW1beOHVk2w8rNBuoD6KpicnYWu5l0BMPwp7jgOs6DcRZK9x1/pyg5dctJW9skrfJ2zcizmqJKBwTnqY+mXSmVYE6CQqVVkO1IkUVorsSXviQm4W7iLhkCdm+bNklY4UqDaQSx+LPy8JdL28ka8m6TXL9Uro+BRc+F1BndoMO1s6seqkgQZH82UiYJX4x+aSYF5AsYDl5YY0sVnSJSDpQhXyIt2Rg2II9O78YOaDXFrEVFKEwzQDmnobYzC4A+uR0dnefXkAtKGcy2uiwl5Vdqrcr61zQ8od7D39U2jx1anNpdnrHhNCkOZNCt61Z9tDQ9+jaazrnLn/prvrFYxtqwqOK0kLJlU1z6+Y3jhxybXDi8msnnhcUrRDhG3VhlfasNgN40zXcn8BiBHIQ84LdTneWxSe1AFrr/dEaDeeknifRGZSK4N6IANjXUS29TcQJVJmsYpZDlVVKBaAbzT1io1UqBw3XQL+QJhL4Mv3I0O5/lnBOn1F0l1vEUUe1Up7+W4voOSqOsnbnjnI7fN2j8WcEfubenXu3R2exgeKUG+a6cz2jRpfDP/JSrjtPuS4vF4elE6m80WY/DAjLGlxTV093v6UGiHVIHez+liLkkIZUe7lqp9qr8kEzsTOZUugnuPELGctMcYWCgs6JPAB5AufO01BrTQN2qwsIPZ8vQCM+5KDyiYza+gkpeeQ1UvzY0Pm3Nkxq1/LhZ6+/97nJd77Qev22nPR71mqqStKr6/w58lG5d6f85ds37yWWH719qOCdPxyWTz5Nnl519OHKWufSSfOemUW+foKU/nqTKJ/uXvPamqFzRpiumffynoVHt01sbd7Y+2GqIxhKqZ54x0SZNN9yQv7njifl/9m3unJTFyk81r5xyTiSUXPdqihbUzvHaQeD7NKDZlTKRTj0RAlBKsCiugSOAEvVIeUm+iUTlWOws0Uj4CYINoBHcAsON7HzBR/w3jfX905f38U3yZ9Qp4Nffp+8zX+Ccu0A6F6dMIaFc3G53Dw2CuqUTE7mAvdOddGhUnEoN+XeScC9UwNikpUaWImgLGeicNPCTsmDG5lgbooJsHouvEgMi6k2+Cjmoh8CJmdzMxaDAk3nKXAzhcddqV4c4GeL793TvuzRD16Rh5An1t255WZ5Ftm/8tZbV8oLtNOOPrzh6RTb8Vt+9NN9ty1rv2vvLXNmdzBeALqO1g9yKJOr4CJpCIdDlUKJOPksamclwSyzqYLoAIoinD4hxUUpym5Fisp1MKUFJkc14pCLd+flFy5c/ioRdpHmo/cNOXHjA1/effeXD6x+Z8jOd+Sju+TeV3krqSDGwwvlf0yYsfyeCwceu7BjWesE+R8LD+M6Ao5hXtPAbk7hqhUMm1QMU8XLRdFqArSarCgUKNNJxUmmgPIo6hS0UWInGsQZde4RQBb54Jdk+LPtL8nfPiyfIsWPf7V+3T8Oyqe0016Sf/rGznOHFu67/4sH9nxxP+AH1zqHzmOkMguDOgswLKJaRlJanJCJTsgAE0KbnZr0hkRQbfkAM94Vi51Z6+x1QNjY6+N/0lvDf6idtk8etVcu3sfWRR3XwA1j4w48pnGAMQWD4i0ABbr/gLHh2GC9O1Ua+FRbDzSQi7q7uvSw8pId3lz+GBUzQkASdgK602FQfSDiTMdBnS4YDukYPYORRG0Wcvl0G6NoO/AjLj1MaTopLCbaI0SfQC2oS8iHQ+qxAV3bdKCFAAmteI3wO0nje1sb3r8ZSIiUnVl1rFb28bfNk//2xE5Zfo23kGpiPLTgAjdl2nwgo6/k49NriWuv7Fh+24LDKi61drqG9QpH0DOOIGqDUcFIsSn0rSAoV7BmYqIVNV3AK/VhqWuHgQ20lAGZXUJ2V9f5P2in9Ub5lrNd/OreHbG1I2NgPAEkZ9/aKZ4HanvjSxt74oEu5DDsb10XPhPK4G+TwIKPWFQ7Sk//HrQhHV1sqgNJegHxSsJ9NhA8izJ21/QVuzse7Gq86eHrfrdl09ZHNwkvn29e9syiqj7aeo7iY9BF+NAE+yOBgk11fUmgNgpOFx27HqKHafNtH/a+zS/+oPfsNsBCHX+sd11vkJ//kFypjiMch3G0KiemsDBc6FRcRARKtYIWCEjfh2QnPH2Ddtq5hr79oD0NzzKhD4I+S2cIxs3aHM8N0K2rM1LnpaRHS5LXoLKBcESEhMSwAomB+jwAFtuBf5KnSdfXXbJ/hAzS49x5jeZsl6b93MP4io1vpPtRGV/UxY3etw0NVklQRk9EB4sBWBGPVqyoD6uYTFDGJ0hJMPgLgr3r4Pk/wbgfanwwbsO511UflDYK+9IM3Bm4TyJCDVsyosEtmt7HnS0WqnilwHgJjFFLKRa0nynU6bD9umHDcSrDphqAlcf95aD8WuGLedzCp0no7Z+Q0DPPyCd+8rZ8wrD+z3se/OyWW/6854/yF+QP5H7S8Mor8uvySvn1V17hjY+e37nz/KOPnb9ffodTeLZmFfVJ2EGniuNaMOmoIZHuMwNO20HRZQR0JQZEoxV9D1QQJiO12RNt/YWex51GQM4xMVfwkz//11vyFjJ//b5962WQwn978YW/9Z7hD93/X/cznL1BcWbn8tEvYlXtKoozakwVUJw5AGcOK8UV4qwQ3rMd6PE1WxNRV02wiSbkXVbAo8kCvCvP1k24xIR+SETHs0uP/n0Fk+gkrroYmXNbN6/b8tivFHzuXP3muqMdF6P0nb2yfP32+TsWMLQ2f9D+/v4/M8wyvG4EvJo5JzdVoT4Doz7q1DJZKGpNCF0KRa0ZUGsJiGYa+6GodWFwxwzAGKkPwmKi6obotPXXL2Az9MP261/84kGy6oR8UP6yD+Vn/uPF9829H/A5gPfoLsQ74caDrT+J+t0+5CLlqt8tBaeYoTjbHCelbMB6thVtFKnIQp1sqBd/rjkWRL3YAqJFNB2V3LZvxfyj8KHbnGQCrdiCP0W3tTvPnQ8fPfgzAtdxSrInHIHfwitzmDtsMluSQE/OL1f+kUvuUNUZFxy9XQZbtyYloxyXvcgupVLDJEODqjNxpKYVxSKIzP1Srq+sAJkF5gnYJaDw6Kk1nTu+veW3d167eaQ7NGv9nVvXzwoR48/IoJfmP/A/tz4Ct7beCbfc4258fol86I1NU5f7Ro0vqZ5aWZLvrR23fvyPPni94+D62YPH+Avzi+sn/2DS0FWLWsoRr+jnG0/12Rouoov3xYhCgLrBQSRogY1qdchGtSD8IzotXurQq9dnDWKAoEFjksd3aV7ft+9cA7pokK/Bup2F51u5kCJvdAqPBhIjok1l06JAxSH1PCBNJQjUDMaHo9RJyaXSx8q5c7kDXSfImhNd8p/kv8tfyn/k7ULT+Tde/81vXhfqz78un5N/TYoZT1d1dR3KSQobx1N1vc/NxOko/4RRkFsTj/0YeZe8+2bv6Q+AW7ZrHgaxSbgsjtN9RWXD81zERHW0RJAN+LBuImh0+a6YgCBJPSJhrkY9i24hAb7p/fs91DDjkP4s8Bsif/RIXfcXMt7VikK5RPgEuGeRjPZvtWLi0SNvjvl7Iv0TQzngJEE0wndaB3ynOSpwEV5rpGTHCxqtwZhoiiM7GJtp+gpMFCwQqFmvEj+p2UHCpOw1ecMr8gfyBy8DjDs0q/EFUmH8uQjACiq6NovK7kKFEyQEqeMXdBmU3Uxi8yhnNEYqZ9gYBhwkjU+Wje+RPWT3e7KJd7wrt8hj+Vf5zt6PeU/vwt4Gvrn3CFsXzZcwRgLqB/p+62KgPnOUbkaUcnq6OrBM+n7LBKRmfxsk6tNv934Guk3vFn7D+c97X+cb2LrPheePobK0XJHlepVDC0yppZqrpGfeaOAkqj5fSdzo2HA75wpcLyechlfSDs3gfTvOvafoCZPkDeQ94P90vzCVGYx2LuYfQXNdb+USNaiXR7U0xqbeEALqflE05kmkQz5LdPIG3Vervv1y1VXFkkCse9aTT9drN56dTmOYG8gBOp9GTgER5gPkzSnz0Z+EcaM6NgOdNUpY2I/48YMyMX3MreOmurHbA5M6C5PbLH+us6761sJg9/Jdwni6n2xcLNxD9xGN7yAFeEnrWjJ9o/xX+XO+i3+udwpf23sc/vbC2Qt1mm0XXgC4XJwo0OmxKaJriT4BIzU6zX3nVk1CHzGnWQ147oTfL8Lfj5IEzqLxxWFEjexJBFePCzPMHCD+tdpO+TTVF+aCrvuo8A3s3xJuKRdxIaVhwovk1vRErOicS9SBuVOUbkVzRxOLuWWbqBRBkabPDwSkFAMLvGUj1ZtRWLts3dpEK8ta0KbDXX0q3E200W9VP6hLiRlUUXexzVOpi3OCVtJ41Nwh7euHf7D2nuUvbBr1yN8nbl0ypPO2n17buejRbUum7PT5dk5Zso34J/xgXPHWyJyVdy85WDjujmt7p6+6e9T+G2atrx9yZEg9+no7gceGKY/NVOU3Y1PJesZqIzoENk3PNDqA0AoQ8bZAQLQyMA0mptZRdURnQgGVlgzKrCFJUJVZGvVAjcSTV+h12qgdbqWus879dc+3H/vvr9+64cWa4h/OeOC55x6Y/lQxbMuvJs+U//CXL+TPZo3fTUwNMz4kE05d18hoaTaszcuwNilckIs4aMwPJquh6Uf6PuvbpJjcBpDCUR2nt9pURzPBUAaOb01RHEjlZPaGP+z8dMv86x95+MiRhx+aM3/Lpzv/sIF8ueuv256btemkHPn1puuf2/Y3Shswvobrw5kRcWZRcaanWTA4l4w+nNmBKuxWxpdcQBUGA8OZEc1PwUKFOuKMS9Qp4Vg7Or1QB69ENxhvt9KVt+HKz/7vt+Y9X9fZWfPCDW/994Fnd7X+sMT3wxm7yBd/JVltk3jL2a7d42eRNLJHFj+c0UDeaLxOmbMHcOYES3qugjWzVsFaprYnmmJ0aDBupIl5hYww6RSqA+MyJxiYM8hlhHlqzA40ohNskpU6no2oveGlmGKj+4khOZtkEbfidQEkcw53uYD++9kdv9++6zcrzn9ieKNz2hM1o/f942P50yf4bcTb8oOJLbeOKyVf3vu37ff+fY935/GG2vZ9JI/k16ycVzdkzo24/m5YhCjoc07M0EtG7NPoVyKAQ9BPmhQE2dwj2gJU5UzGjAXJYUCtM+JIVpO6IskOvExGTcRF3Uco+wzUHEqgsaMg9Z4zQskiLNToPrh/y6YJ9eGGsRNPnNgvTNvasrdr7A2BG2a1bD3fJUxjfr7Z8gpBBly7QYYA78ihvmkdkAZRSaNU3yMm+aUULSDbT5GdB8jOUxzURQqFYLguD/mG3YF+aVu3kJSSQ/lGTopyVypFnwany4wnm0o0tQXcayyKwtdRXyqvsA9KRLrZXx+f92xdZ8W1G7a03HFo6rghnUuHLZ9ZEX6h/fjXQFQzDpbAftzdRb7+K3HNnPzg+WHX75ldnz5s8upR9e6mm8bvuGYOSf78qQ+ubyRi43W/ovuyE2zq92Ff2FV/lGoJMB5i0cfMK7uBujGULYGwJiu7AWQpWABqAE/hHblpxGNjvnZb5/7aHy8itZ2rl0593A+M4l8j5slv9Tbz22+d3zqstwzxvxEmM14bBhluRslG9yfGbTAEQRM0LNTM0ll78NVt1pEEGBymBMLdbKA5PGClYOwTOBhIFzuNomAWmQDz2VhX7Bs61Fect1/z1LS6umlDzu0RPj7v4fgLlfIKOq6FS+VGcXS5UesRtNRTZceR05ibxNDTna2zWsBEgjmkIwp0uKAu3EuCicokUW8D/WLQYCEUc59gRIeLzeVn1fXjR1+7f9+OUdeTVGVO8str66e3aurOHdv1GBgAdHqcujaUZyVygf5+FcoBYp4VQ59nRTOwZ6VzP59wTB5DXj4uP3xQO+38et4iD+v9I3n1cflTNg4JXt6/BNjFV59/qXN/n38J/lb7Md03CxXdy5qGfhSiUJBoCkpZsHOcsLHz6PPcjI7cVorENPiUxvytKKQ86Ah0U5IS02y4teEaDeesfpA5aWDHxcI7thidwYVCbwUvz1u61VV25Ia77tk/s230g0X7D4/aVSJ8fF94xYJJo1fuebC3kj8wZ2nr0F4ff+DdmfVAhGwvvAew9N8L5N/bC85L9kLNjxeQIZ03Lpn2eDlMCLbC0d4x/NZbF7OtoPD9IMwjEbTzMWwvSEmqtHThLNLpZgBpid4pB/VK0dxhyYH5lhqDkUW00fffTXR61VUzlORmE6uF5BY6aFiG+mnyLGT2TWdI4Zm1a8/IvzlTEtk3f++YMXt/vn8smU1y/3LPPX+Rf//5jh3k1gOfLH124YKupUufRR1E3qoJwxxRnk7m4tQPEqd+gJ78vTUQIYmxRWWRVQ0kjfTTQKqlG47/85/Hb3h+SPFT03c999wu0EDkrdppIEXlnr//Tf7TzCm9/+C3NbadIhM+VONzrfJW4V99c+4T/yRO/AND+d4agC7xIlbusV2iAbTCbKWqzs4hz887/s8nntnV+pTX+1TrLvLl34nr+nG7z3bxSVNmkkzyoCyeamskP25oU/cX3yF8BVxxsLo3Yximvi+WFmlmTIAm3Rguoj6nSnjDnpmT4Wk+mCd8fGDy3EdBGe1tomM0gW42HfDiRV9LIfW1gFi24xCpKO2KMKNRyjD3iBnMF+ox90jFzNT9W9mbHzJfi8kqGo7CXv9WzD0KH7qNJoPD152IP8Usa3d2Vi58zMGfEbiO87XkhCPwW3hlDHOH0bzNys7J7fO1XHyH+loykpivRW/r1thTC9HX4rFLybGM7Zc4kpTs9MT5WtCPplXUAypNncnZWppn3HRNpThnxYampbdvXtr0k2d/d//I8kfa5t3chGkXTT9/5fzmFUMmzWoZ1JCfXVSzZMz6g/cvrh4xo7G0Ji/TV7dq/O3PIA6TL3zGt2g+B/1mtpJ9YVJ2AxjSVLXRB/rlZca0HKAqGmxJjiVlJhv6azkmTHlLCoucjSYKgJZjY2lUyaoqXFhpSz7YeeJEcPCI/LLGm5auAC2HJMn/2NrbWTOiePWw9Sv4rQq/hrV+T/iY8Tgz0hOdrE6drDGo8jjg+eikAbkiGgKSSeFxZrS+bOh61il5C8xfQ+lcUX1zO/ffuOTax8s6O4ceWSgfJx7+SO/aW2+YVs+fOu/Z3jwL56EDXvspzCPOV0O+w1eje4qMISOflm94GmT3h4IP5DfzX7wNzzGBBkG5EPov8FHdRNDp4z01pj5PjanPU/Orv1UN4KkpZ3ctYDOL2qNaUW8VE44KnMRrgSC7eW2CSSFEmKVJCfg6gmgTO5j3Je2xr4hmM9F8dUB+a78M/zphzp8LyfTlETLOf8rmLrwLc+/veyFX6Xsht8idEeIg9ojcSToi8in5FDlPzshbyXo5R9aAKbEY8Qx6LeLZivEfBcWIYROKEZsffW9AYHqmRnM2iacDMYzr9HleqsnUExX3tom/GhpMK/BXNaU1sFU413pcsGy3ltXuofS1GGBqg/HifDE6RXIJuqvzxSzm3b2f8H/p/YgvW8d/snVtb9YWRrtGeQP5isYVgXsnUPNB0wOyUHIxlwxR7KCsk7ChoslKjU+AmkDJWQrdcjSXKQuUc4L5fmKiXdImUZgrUWWrqKolTmQOtmQ9qBbJKfQj7K+KQmNFqHN+R0f1Nddff011R8f8zmryxvwJdeTgLQ+tum6kPGF7cfE98oTm61btX0+eqpuoxJkunCJW6t/Jivl3BOYlYm+KXoV244GVar4w9fPwRhXWJITVAkDmUkeKmEpBprBqTsLujGYyWB0M1kzMwsXwUCqSjjaTOjDghmixSwYHW18Ka4jC5SOVVI2CTeykgOt8xANgzpqFYC7YHwoGQ/sXdMifX9dMxB1FRfcQceR1qzo3yG11E+ZPrJNb1+9nsIaE2cK7oEfmcy9wEStPY1pSDp2vmB9EAGi0hDspkgDWWUVtDAOFdC+KhcDW87nyE7BG+eUncHfWP/Svv7B9yOG+FPOtYt5RDXzoJhzv8B2pr/+mEr5PhC+6Pfl5IFngZ59k4boJn+ehQiTCLlB0gCVGg1lIAlaW8ukYqgHDVxsMOFwWrSePJazpQwkpviFtNRUT/PmZ2f7cO/NW6+yZvvDEwJDppcVZlQX54aJ0g7Bi4ubN14Z8I6ZMHuEj2yyNy9dMay6omXbDtJrw0rtaWV4a7Mk2kOFo28zgmKaRkMA0DUu/6jQTrU5LZKuZ6FdqbrrdiUawO8xJzMwxJYJWJ+gTeKrjJRhpfgdNV1SyxTJI0LGhqbWxoa3RnrPRLWwqa2oqK29sPFchnFLr02ZfCAova7ZwKUCXy5jEEpODyBbE9ICaSOswKEq8EJQS4ZuMQESXSGMBGhRh2Sxj3UQz1lELFdIDgaidVf9oE0FjyqFGOnDIaAJnsCSpSUN9NVO0qMXpqSxEQxcrpmZ/9tr6oxvmT7xj05T5Nx9b/9pnB7avX7+dfHmCZKU/uDPpoVnLrb0G0+rrH0o69B9pJOvn9/8sk+/JfIf5Ky98qrFqF3Nh4DyRIEDU7QyWWmh6PSvYsel7pMFBa+5Rv+QBcIqx2C1oNPvEdFrqJmaCkVKD1p5YEZCSk3oiumQ18iEms0KxHENPJCeEd3MyQT7XImtBO5APAjmFbJIbfSw59mhaepZnMF0gUMPsoh/UE1vEXVKBX3N2KScUDoPRA8qjDl2ITKoXejF1ilo2MQ1FcLmdHlhWPZqQqlOmnEc/I6rvXu/pcWnVHR9suOd0eFvm/TNu6XIU5dVYSMVZy8Ohisbu8NClaaNveHHogiEzg1MeGbr53hy+YPmMorYFy48suXnZpBHz7lvnGzuivNmx3F/8+HLHlGDOtjnZnuxJG2ufaKsdBnQS4jZrdmhOcRmgHd7I0Wx2wFyBX9LomWaYdlLKBArItFLWk2iimqGUmYaWh9OFdV8Y6uR11mS8TLR36w3mJOYQwUCyxZqcgl8U2LoNZvbrGns3x+tYZNQRcqHCFnLpEQcsNurVe7E4KuSIqw4LzXls4wsv3npg1mOzZz0y69FNzz1/x/45j7bNGhbZ3xmJdO6PaNbPemLWrAOzDmx67pk7H27rvH7Ow22Pbu568Tb5g12/+MWunT/7eSyGRGMVKdwaZiGosYqo1WbhzGgSSlYNBpqjyU56A9S7ZHTBB6gT03JStAdovDQhEDFbkFDMmLSjC0QsZvxksSIxBWhmH9aZsniHs5+q43ay/zyVbvafEv2Q/eRlGeYjc13sjRxi0ZDeaYt/u/Ts2aW/XUzj5jGZo+dAR2JRChSJTOLAXFTZY4jJHoHKn5Uri/mtvesFN/6kfKL5QqswHfZUkBtB8rlIKk3VBHAH+zEQQsRmWu3kDEgVYB64A1j5BhaCWBeQys24w6SRTNH6+9dvJsbsBONRqQrshJqjR/7+izedVP9qtIrDj0r5zm/FQmo9JJqMYDcAXy/IL3RgKmR3qKoGDIhq/Am/3d3QOBz4PdyMsySq0ZIAfhiOwF/hG/wSyoFh5uqaRrAi8gsKq0LDG8rj/5ErfUlNjYqYqfESmBrZPtzWYrldSs+gGafM2HCm04AvIDMUb2zQBPKLTQ4l6y6vEIP8LnRjsERy0jwu+PQNS+9ghsid81evf+eZL24bEXhkyrxbmTHy6sw5J1/cdnjOtVPb7IZpUzKLG6uLblugax869frJwWZvbnF48ej5WzLyb55904GdbUPqW8eU1+dlFQ9ZOb57ct666+95fCrfXTk206XlC64fkRcuyLUbczF5mr/wR81afow2SPPj/BzG5UAaCAlYgsP8b674cmUTRv+TmK9+0GAhrmQzVq2cV5gVLiqsri4sCpOnagq9NTXjw5oP6Y3qavqFF9BH631bL/RoP9Gu4Gwgiyq4zWzfRVNYpmzQHy1jV15/1M2uMv1RjZIwW0k1KgdLmHVYUeJES9inEquU1pczW4XOphLMbXVqMt2ewUHKg7xlNvswk8HuSMW6VC5/0GBVRmFCBi0FpIljYMrbNbn5diufn6uxW+NXNMaVW18nzT++n+heXbnyVfns/T+Wj7w+7HlSRNpI0fPPy7+WD8q/HvSvyOE1Qe9do+977/0do7cWVa55JcI/d5Q0v7byNfiT++Szr6+Ep5Bl+MvPx/6490ay5uzWwVX1v3z80Q+HVwW3Mhk+hd/Ob9P6uVSuAK0fD0jqqEDxQuu6wcSMZjKEGfxRi4KwQoqwNMYJ0pjc1uYwuY0swYt4Qr0x0QSiyoHVMpYUiqtMdGA77GEUZRKH1QBYP0N/T6nojIuApSgBsMJ+8a8p29rumnxd0y0Tg0seX/PA2ol3z7x73bVNlddlZsyqbLpWmN2+YtqqulGzWpYvXytPGDl9zZy6MSX5q/OLx1J467hNQrPQxmmBSjlaD+wR6M86MqpTfhl+uNUL8hVZLO+R7yOr2DvLU1dy3bXAzRR7Qa2apPqMDtVphTVGNAJ+oeFiaWRYGemx1Qp3rRJql8kJZDv379UkarhRvE54jtbMpoIF6OeeVCpnFco3+qNWdgVKszsY9bKlLfDixArSQIzkBUS/P5qurOwgurJmRvxmRvyF7JM3oNZmZ7Mb8JfZdO2jerY9BmPxO9ZnG60pgsfNNgcm0+vNDnQfin6bmK2us8q/+tVn2xQe4PJ4PU4bu+8jo+ToundW974UlcMfP/zQbz96+JHffvCz4W1tnjsnbWrdllddnbdNePml3tXvrIvKcvThj3/30MMf/UZeRL6a0jiq5e3jxwlXVVCk5Blymt38Z5pvqC0FuI4SDTcJ7Cj2FhdZtgGa4Rd3z5vH9olfWMd7lDr48QqOnbGNkaSgL1Wtck/uV+WOyElTKtmB4JHlX0W1un/ngoUPPLBwwc72a+vqZ86sr7tWs2rBrl0LFu7atbB+xoz6oTNmsLnVAgM8pukCmJKwJoJazKwCQ0wMYpAazLuIhibgaCygjmtp7wOt3sDyN0HdAGluZru5T+MQgDiMMY0D1VdNQCl0CbJKjr4iX6zoUAt9Fy/m9ymlvqPJYcR5uzCLP6J7FKTCWE40+aMGDdeOnNaPnKYd8QaCwXpS7QcAg1pp4pDVBBuHhXJNtH8GshJOZ03pV5ihY+WaRCnKaA8cmHnLs+/+gjzW+5x8av6o0bfk6bLqGzrWrv7DAze0vXRq1uiWIeWMFqYJE/jXYV5ebi4H+wPlwSS2Z9h6isn+aJoywyLMiojmsRlmBsQ8K1qe+MHmR201VpiZpxRm5uTCe7I9kuJSYnShiwoz4/lcLIs+r3BaQ0lH84z5a+Y0mywN7ywcv6V12Iojdzy5YmTzbU/vWHRA+HB8Re34hjGN/Hx+c11z+5iN69onzjVpF81YdMeYfjkQuYy+L5cDASSOFcb+A/JT8Cdemv6Avj15q2au8DHo6teyPg+iDUhIR4Oo1LlnCFKPfCYV5RkshpGh5GEZemhlUkIGrFYq5jaITkx2SIWP6dRX4lR9fYqrL+Z8pNVeXlvn/jNTDpR1BspdVlNF9ku51U/N3F+FPvnetZ/OGMaf6jWG6jVbDNK49nlyHfMXgA2qo3lWY5VdmcBYXALlvQlGoFttgDrwjCcVOS4arFFi5YwspcVAHXqYdoPblPUWQOmMhI3/5YXe20WWtx1q2yW0k/xffPux9u2zYWEe1oOTLaSNbwebHPg2izEyPccYb5ArGe99prVSFka+Lm9oKC9tbGR8SV5PDgJvSeOaONgOigxG3mJTeEs6GpXokcJpYo8XSXCxiKHBFiGJyUh3mBhKHVG2UFwBaiio7+Mw3pHXVYz2Fvhzmoa1Vbp9tS0bWutXyIfG15YXuQvzCp+/yzV26OiZHpxTljCLzNftpP5VEGxKoTYKNzTOL6rVDtFa7ayPl95yl1Y8c/5d/oF7kTdNAv3ic9AvDJyTa0EsRc1slzn8mHVEfdjkZNSobH0r9ekwRkBjPNZYPFZymNEe1OrUSBTCZMXgbBzPnHT4wb2HD+99cMjKOfNuvHHenJXCeJJ97E3592+SSQu3bl24YMsW7lI9IKT6ROF/0APklzvxx47Y1SZVBYhTBUD2ZmHckuY2GQG6VO4BlpkmOpQs7IRgNDFFT8yYmRBNZGDbApEU6v5IMSP7TYvDKHrKkwnW96Eumkf9jgMkLoAlSKOeiHuJGJHL2LoTDGamYKUk0mAnbDZJSGV8hy4M+pULlNJpsAkL3Da6VOuFRTee38NbyOyudetulnuIS7MWF2/3jnOnMED7bitv6pXb3323neyhejbmNdoVmD3cPaw+R9QHUeEA+GKAW3LTAHDUGKlczb8IzizmufPTcsZIlg0hywJ1hFbZ9kGWZYsmGBIV3TEljfGRXLChEm1CFgZmJIJ+OK2uP6QGohbt8f2FQzzMy6mgCN90V3ucqOgPPf96fcOta4es71g5qj0mOjTcNMDBq9q5IDd8XBUX5k5ykSLEQkWQ9sIRi4PRZKZWlIaK0mD5BwWjpWz5A4FIqBSBDZUbfNECDX4NbyhjoklG+knVJWquIHEwZaQSSKU6EK1g9/yBSEUlPrgiAKRSWYGXlaWKd6kyD3ZOcUl5iOIxVAp4LAtTgdWNAgtVs39DYhkuIa2YDBtmH0iGkRph0erzD/JWMqfrppvWI9XxneOCteMaxjQJC6hYG41ibQ6KtcV3jO19fABShD1cL68QtgtfAXcqQ72nAH2iPjA3c/xSGoY1yykbTrH0iClMQFnMPWJRAOsS8qw9Yp5f8mOmDTVJtDStCYvcLPaoKS2nwEdx5UMfFGfKzGJ2ecVQMMgLvSG1HpSZbe68QhKnw9WXNk+Z0lyalXrLhOLh48cPL+64ccXDde2Pyn86/BGpxnZf2OdrSl89qD00ck7ljOE11eFxpROWTZ247JcvaWaWjxgBwqEB9xzNSdZ9yemBV1kurSA09VUQJvmRf3ISMSmBtVgFYRCz6OOrCFc/RgatlT+OryXUfSmfPiezesK+MY0DjZkwwJgDVC2CaXVJ5eJaqnPE1y/C1BT9o/+4tiuOa/ej7THguAbiCDo8Xv3FQ8tfv/nAOwu7Dl46+OnTsbH/CGO7uXzujovHzlPHBjVfkcpith8ZO92vBVivjX2rUMNwU1YedTJpjZUcbpxmHjLrKEnkU/Nx0zntogfDoLA9xfywZMNeVgluoMRsm5SUGY6HiZpMAm7HIBIZ5tPpnEK/Fd2xaFbxsKL80ozSqraFs0qGFXngMlQfv8La9zfs9YZC3unT1fdz3+B6axTYtwHsDtDTYxWkfdAnx6AH9pMdxGJ1MS1A40cJJyVLEi33cdGqUZYwiPXpYjKGjeAJKaidZNqpPkiS4YuUi4FTu+K5SZ+mFAfcw8zfU1RtoTRU01ITHh+OEa5P8QmdewsWdEufY0iBS59G6cnB5aBH9jIUhfaIi61qVp+rIxcbgyhaF/rvQfJGrWxV3ZhnBLAcIrzZYncYKcNQqFHKAt0sYkq0hsP9dwSvAueN01ouptMTNz21du1T+c2DAyOagoER/ch16lM3r5sy+aYTgZEjA8HmZuSDFo7TF9D6PDvXpkSwuWD/olCL1YRwWmitpilWq+nABneglMTKNc1qiajE6wIBVv2k0dJ2OQhHX5kovATitlmEKcKxXh//dm+Y//D8pt5PjxALeTtWONpXoow1nfImWtdbxd0eV9cbQAd5rMIzzx8tYotQrnqe1F4TSp0neiBy2ApguwkfGNLDjIlaR1p6Zl7B4ADrClcE2M8pHESpzialDw6HaZlwVM+pVcKs7nyAKmFtvLLcT40uFy5TPfyW/MvsnNLacahKu1HBHlVYUJ7b5Luz55k5fFfnABXF3yZck0L17HSqeHs93vWmldFeLlazlgM8MBFW9JrvqvC1fleFL6bF0XQeU/iiSl+kyrhq3/Of0kx4delQGlw6n5H/F/O5aB6oQMTNo/enZNBjKCGUiWhPUPEQPw/7d8/D8V3zSL5kHorUiJ+K/80HTixCgdFvLqdPc2rNfQ7wTPQJubnVV56R6PSLOUFsISKmx/IYLz+9bpOBS6AOcjRQMdCTlcRSG+0GkBJJzvAlq9nfg66w0HhgTCoPJU+p/FNda9+lTnX+AuZ0LgR8YwxI7dilpVmdCbRjF9YgY9mcXkOTxdCLj3wO7Pr5jxH/mildSEJnQ0qiJ89tgh8Tvtfz0GrB522iOsO0Lob+2CNhjp/BDx08E+0RpSsbTevAbgpYFoS9+TDSYNQDRyC8NkzxJrCVRldE2rHdJ0AlmNClLq36dOHCMXh2MV3fJC4da96Rs9L+URjbSGWxDQcsZsbFcQ1srJBEbVkpBZYt85IQB47s6Atz1Kkr83FXdo23ENamJrYk3/bifNhHXBmeSwaZtpDy+2xugZKDaFW7n6UD1XHEIoDZkRGUOG2PmAUzzKFuPj6AjYswOG+lPj5rFtgKFmvMwWdlVfRYfJobK7JOcCqh5bjGBW6bo691AdJf8vH4/gVlXX0NDEir/BTf3sGvVfsY8O1yBWtlIHs6VP6iNYLeZQCL8oFLKpnFdH/UwURCLvUeOBWDsq+62QgiwcNEtIfWHEdd7JOrr/IZDUsjq3yWUjxYlJMejq9+lhxYk2P0hNHAlGzZYWyvKaW4+tdFD6yHqdXSIwfSwKria6gvVcBgN9CaaqBhrKnOxWzdAaqq3QNVVecpVdXdiZosViDwPQqr0SS4YnH1IygOrlhhLUyWT/8/mz9KjSsXh28mfpAjV4SAL6WypT8MnsvAkD8QDAVxMOR+Xxgwywb40BXB+CswqEVdT14FGKcVG4rB8kcKSxV37wCwiGX+aGEsNprbp2b1wYcemr4eQsX9QqIq7Kh/FVdhBzR7eq6m7BLopcIy2FNZVbCXgjYpf3D4O2lywO11RfQcgj1XT/dcqG1RbM9dGVsVl2xCaiswvG2jeCvigpjTdCnmCv3i4KCUC5y/FPhqxUUokzwgBDwUX5IfLv19yKpEZHmQUOzpmu+9WQcOj18RM2+CUAlXe6m4Z7HzK2PlXiZh4nUAwsEeEjZoimm01EBCBuIyEL0Bt5b8fgvxk8EtoOD7W+T34G0DGUz84+X3yODx8vvyey1ksPxejB5B78fORCWoJ9HaLdoGwaM0EmH4ze7rYZoKKE210kiy2sMUMxHRoPTaDus1VofTkIkhRtHEehR5kllPz2xb1OTkMkrwK71d0iltDBG3rlBQT8PxGkwA8oRYwhgpRPwqpQyFXorS1/b77pq2ZiNi9a1Hy7a2rtggjRvFz1pzN+7HVfsBxZPH8V3vAC6n1W+cLX/y3DuAzuuatswmmc/c9p9jhC0N8ju9JaMAtZtOj2EyDmvagb9YQXrXDlTV7hyoqj1FqWqPWGwOprlcUtmObPyi6vYP0LUzUIm79vdMj/7/ay5Uke8/F/IyVd0Gmo3mFVWvj83HNfB8UgeaT1rffJIvMx9Vob9oSh7mBbr8nFT9ns5rG631KOTmXzozjMnkB6Vk9DkCM/DGTxPNLlcSTWtEvpCXROv81MkX4bc21tE7C1PyxTxa9jPQAg+s1/eH6fzFqv2Ay59xsZbPs1w1wH0CZ8IKsf6V9eZYZb1FqayXeFpmc2ltPfX0xerr3YqPr6/KXtiq+vj6erKYOCdG7WLVYpi0itZSIqiwgrOvBVKK2kdH4s2BgNpaS886iHCS00xTlVmtSr/2LKwNWRfZoDZouWUv6xby9RcvvvC5/CE5dt/qNbvUmgbNAe1irob7SpkRq/rWKqy/ClMVa+lEagw9Yo2VsqQkM9Xzg6wgQNRbsb+w5DL3YOt2Wtry1Zv7WcpasVUsPCrZHN+KyUe77bZkh6/bgT/hi25vcSF8LMKfEfgqLhvNEY7AbbzyhrnDNrsjudBbVNxX13LxHZpsVloDCMlCn35Ek12FPpCgXTKB9BX1NindjQtY5ca0DFdWNhU9QVusTXysoEUpIlWS0NSeh05b5ylx9wd5VcMbqvKGL+zoWDj87UN3PdMyvvzAnBU3sxuljeMaSzdc036XID/0/r1rylsq/MW+mjxfjTuzuG7V+B88P2n8krqJN4wc1FCQU1SzcHTFjOrqkurs4WNuXXCex31Ha/C1nVwWraRdFV+FX9CvCr+0rwq/XzUtrcIvUqrw1WraiNmSHaZp7IewDj8n1/2/KcWnjvSrKcefhyawfOY7i/I1v5JPnz8Sq8zvD38JwL/2qroQ+C/bhWDQRV0IKPS+UtpaJgUDQf9eOwI00a+iJUEX5Qjf1ZiA/4xxif44GHyVOAhcFgfBAXFQ5ldwUP5v4kBR468CDVbmbbg6PKj6PMPFDsBFiGvCDK8+XNT2w0WDigt0nrJUL9BQlYxHIo6g+Kk29XRnV2ONQIgp9NUUWRF9ydAAQ1fUx9yrzcjLcOdYrOX0kIkGdGpziKQw7TlL8SR5y+EqOwSYq7BJBYHv3EEDhzKuZk91DBjhqP3OPSZ0X6zwn4/EdpxGwW8Q8FsM9tJw9EH0YbisH4YrYhgGYV8flNwg+msC6gkeJYjaEvTb5SdhB3dGhIMYVsUUK+sdHYLvQn6pLokd7BHKBwNKm5huLaugDKliICRfBUpVz1I8IkmfqXA5nN6tag7JcWjcqTihLsezzIoicf4HKhqF0apOoeLzc7p3g1w99+xV7F60Q0OMYuv80XKFYofF72gQuBjtRpKtsEo18GkQ+zToot0+HD7UVGBYANDqLiorDwTpiRlS0YD0WxeCu6W+QeHvteftAwVyroIDTOsf2/kuTiA0XBzvofxA97rwDciGGm4E181FfMrZRgEdKqKRJJq4G5SM8HF4IFqb6UsyU1YR1YTppZp1D7gdBLgdxJIJdAEpE8i0NoCFGHj0TDrgciS2jEfOaTLDBq+0dWuMSRgaFzPtkqMojOfRRFJyCmlrTbuU50E2kRnAdPY8T5EfW/yKtTbQbFl6nIn2D4n1YlGx7A5kE9fFjUOwCFRpAl5FUVxHEPEFSi+RuQuenPfnHzy44ejdox4nwpQdS+3Vhzfe/bMbem2J4n0THwiNGfXaQrlnTeVHW5dFVjy6e/1tzwYenXEzX8tPJ54RN7c0rx5VRPwL9o7aLM5ZDqj3zRs956b7vtjj3XV0WN3C0dd8sWTz6L3vHln5+PzU2gav2oSEcLPlDtqDxs/dzMVaz2DA0MOIt1gNIiq5tGqBfSGQa3pfmmyhCcnToLEkO11ZuaXMdeLB+sLcsFhsi6S7fVRXsUvO0jBmeGEjm+SyyzSysZAkcrmgVSF/cYeb2odWuNXEL3csHayx7PjX/dvejJ2un+aKC1IV5nk7HCSHySTaVwbks5NL4/K5JRd3lsnV9kTTWWeZ9FjJHu0sk047y2QonWUwMm7kaDxYzLC9pDE7XKn0IIUE+yUtZtKv2GKGJjhcoc3MvVQfO3KlZjOanfLp3iPqWsfDmAswLviu7jkFl+meU6h0z0Ho3Hn5rJNjxGrzhP8XLXRQ3frONjq/YMrWZZvp8ImKMdYfRi9m0VwZxqLLwFiswBhFGBUQ/3c9ghRd6jthrFI0qe8AkulQGgXOIIWzFPSoO68MKXaRrwxK+SDeB4F4r74IbAz9e0GMe61SGVwG4TLYh4wwpnuwkkqpzAuGltmRyTx+33exB/b6fSdu7DFvwA9VQX55NC0boJ6Gv7AdjOJWmkccF6sjcbE6w+Vif2sxbDB2P3ZUO7eDdshBm381/Gj4Xs9TY3+rkZh/OG4/y1KOPRLmeArm+A08s1/sj8TF/gzfEfsrpq71gzOVZ5+OPV24EIUBMmgtU7/YH7mK2J/h+8X+WtBNG4YV+PN+b78aJ2+4+txknI/6Maz2ddE+DHMqxHNgMENbytb3RGzoPxHyU23oNEFfBXNGZZhoww08CsppYm6nDE453UXMtR0W9Fqz3ZjqoNSZn43qkRPxJNnwWBt9gtnqULMlQOQUerXeUDkBAYPVlJwtmQNiDVFvFTsrabZ8/K2N88/IHxV8lbXSPKVj4e/yRNIh//fvfiN/eSBCBr04Zu/8fRHyya9J9qGXfrRp2mLHqISN466ZO2Wc/Krc0SOfJNm/2f/hf3bOPbjgQ+Yrov10wPaxw6697zIddURPrEgJxG+KIn7L+nfZEUtB944Vefmjpeyqr/0OPW4pmstkdDmW6ZbC1tWlWDyscgljhg4UxsU2Kd0bHrgzjzCgcdOvX0/dQtWIiQ9YXNLFR7NhgCCFoKx/J6XLLKzrp519HGpnH9p7LpsGJayw9EqjHGxWgScYWQlLDgYDGPv7mJMsFLQMx2Vb/KjejgHb/KRTkXroMs1+tIUgTTviGv5cNP+0uPn370yUPVBnohylMxGdeXpGFvXv28TM79GiiMrOgdsUfcgk5uWaFfFZql8ifv65XMuA83cPNP88Zf4v0flnfa/eSqpMHHjutYokvPLkT5+Ow/8OOv8gt2uA+YPoU5XZQf5olrKbKuJhwiS4INs/QabaepUasT54MdxVGMRjTwWDUZPiykoquQRmyVMCmyody94H2SR3efjKyzfg3roMUowDugouj6OCS3abRsFVkOIKTz69dSBsefxieVDKSsBCZXrMaT80SbkgGHIpjqRSuCztQxAebZpLcw4EgL8QzCgXtq0SS+2SgTZJv2qyvoyWMDBiXJfqBpdFysaLVQOBnh35kWY3XJkBK+VYzyXpE9TWKdjvzpbAmotZsFwcOyBg65+MWO1iXyO7eJlYKxzo/aCKjVWlvvMdixfLd7RUV7dUC0uLqqpwGjEapj0ts0FnXcw0uUgS9S6orbj6uCFTWVNMNAu8IK6/QArHIoYFtpf0STZNGstAcDtokxe0RgyJyVyqlwUSaX8ZxfLCMCLmwShRxFAyjSHCQiir4gXU7z5ws39F231rz+x+ekPlirlbDjSTo+OXz98/dtPUNbAU48iX9//lnim1a3f9+f7Pd1zX1LHzD/cu5kNDlz4rzx4B+N+zmPVoFbCWy86lcJMu22nJdZlOS5gzJiCIjrBotnXbkp2sjOJKTZeQ3/dvvFRPk0Au7r6k7VZjOf/+HLEbVLfNwVo4mFjJ2JXmiAGni5pD5dOEwUtmqbmnL+bUN8807J9ymXmmX2aeGf1wGQVcutKU2HPKd0xX4d39Z7ydpRVeZsaq35fNOQhzzuaKMA4y4KyxFK8wKKUkYO8EAhqQAkK3Q0BPZFrSRcB055vMcD8niRZK5IOKWoLKTlrsgNArEsiAwcj+wC1WFVo1FnkpmF9cmmoAa0T7TMEaYVx6gE5TTj/GoK+m0xQGIwfqNuWhUv7inlOaDiUOTfsRKv19+/Uj5P/P+hHavnc/Qt17vV9ftiGhoOAsSOfsxb64/bGGFF3AItS5AcoLbSfjw9KeJMV2tzHNMAtwasWJXwWSBxY7A+H9zCUy55I1+OQSK5SeNZKwULsYdqyX267Y65jn6OJYrojSv0vNzinAYyeSXBr12IkiKovTLYAEWo0h6d0BlgCZGIhYaV2d1Y7nEZjhNiIhGaWxhjZjTbKiKZRMO/EAT0pXTgjKC8elMLkq47LhK3V9WTtKt0Zu4Q/JoGN7SMJoYVNvMX+iNwTkv3G0/K89x+Rfmtb/177Hv62t/dcTf5b/RvNyhh/evulfSj7uN7fveIU3PnZuZ9cB8ubjP5J/qupu+ikg93xcJVikD3GRbI5Wm0mpikKCHZArYNGHBKJVzmxERBU6bYZTRJSaqPoxmJmCYlVAdLJ2RA5zj9QA74PB3pGKNXierE0yYCJkyB5JSqVBU4dNysikfRHBRpTK/fSXurmMTDSOxCq7VDqYxX+IQVXi0HXuok2x+ns3ynmvRcMCFWg3FubqtKrfDsTmtbvm1CYn+UZPW9+ELo4zhqOd1x4YMvqhL1r33FCfYiseNfnW5t1nSqKkVJLk/4wKQX47X6Q69KgiE541rdzTPKHWi+6OXW8NH9K+r2rm9EBh08SwF9SbJ3/3uyef+Oi37bG+0oKSA7GNSwC+k407Pz4LAo+kzgxKJthBLpZIazgpJSVRG1850wctf3r6VBLNm73SEQTCgPyzL3Hio0tTtONyKHou3iS03pvPoT4QHz3LWwjGSr71rFGcFY9QjzsgFc9WsTEfCHN/qM4PpT/CCn4T2AdpXBsnWmmtPloCKWpFsiIjsflHMmv+YQL13xyrSpZMKEgEykMMyAe5NOrtkvR4IqjA4ggwgQF1+Tidvc8yHsgQju+ZwfXriPFvfqfZRL9zXdKHI675hqaJ/gn9fd2y7/593SDl92cLDxM8j8bODWe16oBgyZigFitEzeyYT/bGOmXS7GQ9daNaWbG3YBM1ysGyLgvRB/roafZ1o1sCY3UkWeurGV5aNVYTan2yqi532WB+SFnpsMkMxrVCJ1lIz5yv5diRt9r/xbnrjkvPXQ+M0xkdeLpo1djrxgin3csGa2vLy4ZPHoUHr/+/Ou+d51YID/NPU5wXYJSCYj0liFUqniDiPqJPzwoEAmpPG4Z7MFyw+Qm2NsmNnbnqVdYjIuj06CHLBUNBSklX10bisFm7YKMCpG99Qv32+8W3VrSNbgm2aBKNOoq50WRk2xhcQyPcqBleXjVaE5r5ZGWde+lgQgCb9YDNg5W4pITE1pTHNeVFuqYe7NqAqypmBXFhacvs/P44xkxVsExFe0ABjhpFMWwzm9TpUfEuWXLDA6546DtooDfQojPafOFhQIrXjb6IIurZp9IG+PTDKoRBPs+LlD7yEAakEDzdFKsMsaOe57Iw5DAY8vvBkENhyOuDISc8IPWoMFyGnBCEBAeCAJ9G9yeuevxU24offqj0ltlNkvnx/Lu0byl2OhASsMeE8qZ0hYhqaeMJ5e2S3hC7Nx+6/fZDm8mXM2+/fWbr7Zup3N9w4XOtEXBjpNGLEexkdcmRHaReaMmcGgiwW7T5BDvEQWelYgnPe7NaqSMQ8zczrNQRBUOG+jQ2VQ55+l1uGF5W3tjUOpycGt7W1ARQk1N4ZDDcbMMC5tImVsisvpc1sj7QddwmPof2VcCzaHTxXUf06qEv8d2W1CZL/f/Wrf4tHoijif057U3P+k2ELmrWEGvRgGeFX/hM26pdBhJxE6vMp+d7m9RT3zhSZDL7UKhjv8bsQDRBT2+4glKChm2ZUhqTANUxkk575aRnG4BtBCKadLWhk6gP0NBPOvYqMPhoUmQeXBaA6SPZkRAtSWpLxsqKkKcyWMWp1YYaemyNM9kFbyka9WxSzls/Q6udsayOrP5GqTB8Qf6mml/Wu0Gn47f07q4ipheUs0r/Jd87hHy6ZJTdOn7Jn0kyLS48+sSS8kHlpUuePEaPLCXOHuQNHmG30ErP6krGiDUtTDOYgsEoxwS7EFDbV+kMvkiCxUaZoZP2GmEtUQY+xUvU0mTWuMrYJPhkYXoAklpSMrq2TCwxF8QgtlIhtmAGPd9Q8Ag2DwltDBN++ubN08Od1k6tu7JSvpHcC69jSBlyHVkrb8cX00tgI5wRzsBu8Mb1MI91w6WnHSlviuwdbHPb8E/O53D0VAJO2EnPDskBLvkIy0EXc4OxI0TENMzNyU5gdrWU5A72nSaSfzWniWDnONT+PHjIQ67L4pMyraw8xIWSQoc1Rp5cTJWih7klUsswBVstiGk2yZUB7zr7FY4g4fqdRuE++NDmOZXeYj89kITIdcW+ujpfsacTzybZ90ze2jT1bBIyIf60CqQJxMU6ios0bp2CiZRgxMVf6USV9KvFQQo7kYEqgykq5H3HrLiudMwKuQQyPvVSiM7HzibVICzaUxQW7MVRw/2OwSMVh4JsbXGf4/K6A6IfV7hCWeHuJFdBdb6LAhixpXgp3ddeLZAlIHxSwWqEX8sPRIpL8LtiL/xaSTFelqQYMLGXmlc1SA8h7CEbsNK8YKkkRg+lxXCVCRaWFAjBlb9CpYxuQ05pgLVMkxIGM9LIvvzpNAMjM0YwNOTY/wgb8tjBhzfPriwsHjR2wjvvdPLcUEpAJXUZl55ugx/jCWqDDwmq7twMSlF0b2lfVdbAz72qrkAprECZSlN9y8Bid4D9YLA/8gf9HyMfE7T9Bnqi40AoZyQpGUA1EMsAy9nh74vf70Tqd+OSkfL/B3FT1jEAAHjaY2BkYGBgYji6n9eNM57f5iuDPAcDCFw6t9YJRv83/ZfBkcEuCeRyANUCAQBPdAv8AAB42mNgZGBgd/q7moGB4/p/0/9dHBkMQBEU8AoAlzMG6njabZM/aBNRHMe/9967u+AgJQQl0gRD/AdSnSRICIGmlOIgWCRDUAkhlCMiGUyL4CAhFAeVDhlCM50UhzpICUGCQxYhOIQOLsGhSAlSii4iLorE73sam0oPPnzf3Xu/3737ft+JL5gDL/ES5hJTgDXAQ9FFWXUwo7rI2h+Qtk/jmtVA2fqJHImLDublLyS5dlksIWVq7gDqEzzxGhdVG/dUBUm1gln2eazewFNRpNULlDgu6vW6Vvf4RwtnnQwW7AyCdgC+7cGz1+GrZ2SJ923et+Bb+/BlHyfVNp+H4DsPOLdJjfIdrb+6w7ktXFdrmNU9dE93ChE7gbAtEFSvULC+YlHvmRqXFZxXtdEPa5vfkEBBraMpvyNPzasq8iKDmGpwXELT6uOR1R9dUdNm3HRW0FQeqXO+bjQnNljfwZzIIaTn5Gc49keE5ZBwLHsoiRCOWVvwqXHlIDH23rz3DPfzDgm9V71GdjEvZkZD5ypy0sFNWUNKBZDU3stvWBB7zO4GLhsfT6FIsuZbVvnuBhLG7w3230VEprCo650LiDgVRFwHWXmOGWvfj8Ct47jOwuQwgbU/ajKLKnWPvLXfIzTO4X+4r5pWk8UkOgtmpnr0Tft+BO40CsaT6mGYwRP6f586IG3j/0EOhznBszien0BnoTPTGhjAc1vI6z2JKP2sAvIp4IYPVNymhz1y6Q8YUu9Si5xjFmP436ScTfNf5PU5N2c9ijLRuix2ULdXmQlrxS3WEN3XXkNaPud53GV2QZ454mQRQ+w3uwTSRHjaY2Bg0IHDMoZdjCKMO5jCmN4xSzA7MKcxL2J+wqLAYseSwlLHco+VhTWK9RybGFsN2x92BfZ1HAYcKRzbOE5xvOFk4CzgiuLq4frEbcfdxL2P+wtPCs8cnl08b3gVeN1423gP8EnwRfEd4RfjP8T/ScBAIETglMAfQR3BKMEuwUWCNwS/CfEJGQgtEfonbCc8Q/ifiJ/IKVE+US/RGaJnRF+JBYhNEXsm7iA+S/yMRJ7EIUk2SS3JDsldkp+kFKSqpKZJfZCuAcJjMgYyt2SDZLfI3pI7J88jv0JBQcFBIUuhQ1FB0UaxS/GWkprSBKUNyhzKbso5ytuUb6ioqLipHFB1UmNTq1LbovZBXU99jYaERpfGPc0izV2a/7TctLZp3dPm0DbTbtJ+pZOlc0pXR3eSnp7eDr1b+jH6i/RfGZgZrDB4ZKhj+MmoyOiLcZWJlskl0yYzB7Mj5mbmKyxkLLZY3LFkszSxbLD8YdVg9cDawXqBjZnNAVsm2zLbE3YydmV27+z17DvsvznUOWo5djhucGLBAYWcFJz0nNyc4pwWON1xlnDucn7j4udS5XIBCN+5CgHhDNc/bjJui9w53E955AAAxh6QCgAAAQAAAOsAUAAFAAAAAAACAAEAAgAWAAABAAEkAAAAAHjarVJLSgNBFKyZ8UNUgiKIBJFZiUKcmIgjBDciZiEokogBcZPoGIP5aGYS9Q6ewGO48AwaNy71Ci48g9VvOiFGkpU0M13dr16919UNYBZfsGCMRADU+IXYwCJXITYRxYPGFo7wqPEIHHxrPIqYsaDxGJYMV+NxnBinGkfIedZ4Eq7xrvEUXHNM4yha5pbG05g3nzSeQdRsa/yCOfND41esmZ0e2ohaixq/YcKKh/jTQsxysYM6rnGPBsoo4RIBbCzjDCuc91Hg/hVRjtEqmTX48o9zL4U1jg2e1sY2Khx2j4ovK4+zx7nF/zmZh8R13IlagYwDrlqCsszLklVCk0qqbqd6f+002YN1drkbMFpAkXsVVk339Dq8vt3XwbH07pOt6ioVR3TW+3Q6Kqt9+YOrlcUfhcJez5lX7bpdx8VQ950hMeV9wBtNI8FxK8Ppavt/lM44V/85y6cTPiNNnkt51+EnkJH8gF0X6JF6HQnh+1yVyfKkhsdoSV6PcsWTDEeqVckb5Opv7/NcFeljWM9GUu4uL+/Qxh454Y1uSizFM6TknyQrfC9JuHIvF+Qq1YBaDf0WMl3dHG4YLTOi+q38AJOeq4EAAHjabdBHbFNBEMbx/yQuidN7L/QOfs92Ct1O8ui9dwJJbENIgoOB0BG9CoTEDUS7AKJXgYADIHoTRcCBM10cgCs4ecuNufz07WpnRksUbfXHSlf+V19AoiRaLERjwYoNOzHE4iCOeBJIJIlkUkgljXQyyCSLbHLIJY98CiikiGLa0Z4OdKQTnekSmdSN7vSgJ73oTR+caOi4cOOhhFLKKKcv/ejPAAYyiMF48VFBJVUYDGEowxjOCEYyitGMYSzjGM8EJjKJyUxhKtOYzgxmMovZzGEu1WLlKBvZxA3285HN7GYHBzjOMbGxnfdsYJ/YJYZdEstWbvNBHBzkBL/4yW+OcIoH3OM085jPHmp4RC33ecgzHvOEp3yijpc85wVn8PODvbzhFa8JRH7wG9tYQJCFLKKeBg7RyGKaCNFMmCUsZRmfWc4KWljJalZxlcOsZQ3rWM9XvnONs5zjOm95J3ESLwmSKEmSLCmSKmmSLhmSKVmSzXkucJkr3OEil7jLFk5KDje5JbmSx07JlwIplCIptvnrW5oCmoluDzcEnU5npanXqVTZp+59LqVHWd6qHnmo1JS60qV0Kz3KEmWpskz5r5/XVFN9Nc1RF/SHQ7U11c0B80g3TD2GpSocamwLHqOiVcNn7hFRV7qU7r89QqDBAAAAeNo9zK0OwjAcBPB1Zd33h5iFbNgaPMGxJWyGTLUJT4AmaAwSnuVfFG8HB5S6+11y92SvK7GbN1K0V4axuza9kKqlSo9UTwgXPSchD8oj3nTE5ZbCpnvwwZdfCCDcWASAWFnMgGBpEX029Q+MYvuUoI13vjS8P4MpmBwdMzA9OeZgNjkWYL52LMGidazAcvGnplq+AV1ZQksAAVao/MIAAA==) format("woff"),url("proximanova-reg-webfont.ttf") format("truetype");font-weight:400;font-style:normal}@font-face{font-family:'ProximaNova';src:url("proximanova-sbold-webfont.eot");src:url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAAAAAE+AABMAAAAA0YwAAE8QAAIAxQAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGjIbySwcjBQGYACDYghECYRlEQgKgqQAgoVcATYCJAOHKguDWAAEIAWIRAeFbgyCCj93ZWJmBhtCvzXTDQcvtwMkje+XYDQidjtqk8+20exAC84DSuHm/2lk//8JSccYDvQbgNZvHfQIehQVWehCmajsqsV93dVlS4HA3bGYXnzJX668/SOXA3Q5UF5I/jZ7yfTnPofx2rB8TJoI2YSIA5oGhWz2RtuGBjfxcqbovpx1DS6OJDjSBB3GJD2raqOrTdolyFkht5WO5jFNWSL5dwIVMw44b4Ftw1406uzJw//v97+fa+193sVMMs2zmYaEjw6RQYJQaObRJMGXRPpyB8htHaBmtqzMscJFThwMx0bACSggOBaguAFlSA7AiYpzNdVKG+/YaZq2HQ0rq09b+7O1Pp6vP2B/dve+TYPGI0gggmaCQN7kadJElPg3/SY/95XyK6RtCss0h/1rnjshBWXRqRNm/Grs59H8mGGPBd/jV0RlD/Us1v9cSw9C0qqaIoc1NWnBTmZWcQF/RwyCOJtkk7YOHoHX+njtQ7t9HxJpJUMJvge/a/77E0yt1b/d0z0NPAg7s3uzRG/f3R58xPgYE2MSZ0kYMi7lCXUSHAggAIjUibWmaiwQDVBwbxsFDiN2F4C+QJ5AQBBJWzz/Gz+ej8fl+ng8rpfL4Xo4HK6Hw3l3/97HwrlPAfzDf98y3x6lPL0hKqdZ6dvllBAyAODd6lrpHCMT9AEfR5w2VSvCohJJiwCVnMKGjDvQt7P8lMruy/ab2kX3WVDqtmUhhK54SfAYW/X2vsw316fdXBktRZaE+yz1ZjKZ7fzZ7AfM5qdEe7x3BUwysEn+bBaO9qcEcEiyyMIj2crq6uq+nKvsuROyssKfMKbz7eeqesiEQo93038zv0cS2/xPJTSyZ+pC+jfM7m+OWBptkERDpBIqodILhMbPq5qu738Q1Addeh+2K3IZlkw7//8oRCUJgJQJkDqTvMYiSwQlndrZEKU7k3fO+UoK07tL3dTc+5SsyTIkWx+mbEvGQK97Wa+4GP9eWwC3ERN1t5fPixmvP33MIkXKoyuuEwlBJATppLiud3efd4hn9aAMLhRfo2rP/b1qj3QNX/ewAwlrCSS795dBNrML9ZMyrQrFQhELRBS2ff9lIQA8n/fkVQDgyZBvHQjA25cnD66+B8AUAJISEAmsTSofWIHnQF54DRiYIc3SuzBkDbRvs4ADqJqC5lLcuz1zmwdWI5Ti41ZV4LGPgR8w6sXoK+DLBcBGuZ3HsqAx4GEkRHrZUpyxn374+5PMdlcvsZBHLjRD9IKeLQC2OEXMrnRwgjN53FL3ZJvxNZnFyUmstldJNn+p5sGw4nY0yi5QbG/ufxv6fKld8OkiedIHtG1+ls5IWzHGMZa5aSPRCpXl6DnlwIyKVZjKKJzu1kyv5oeLL0vR6QJoXPqy5JGtaEUKg8WhxfyaQcodCK9rpB5XiWfBymGIG288/cnBIQANgT0hIrxA05SmGI2gRk7HhZTHXmjHs4PJoX1J7Lni9fPElnACYPbZyFT3XsAy1qJ6rTlzH1TUZuvNZoBt6J2DZ5cS792KkONFfujHfFvOL6mY1RM6rY8Lw2OPyIbSr+G26MJVcQbuWjWa/3XPULCq7HF+UxIL2Xxzp8VMpFexQw4Fe3kAaqY1L00FA0U3WkPWSeJ5k/xLmKE1jQgC2Nlwta9AEFFojblkmC3JiwxYIWEb9IOXIjtK614/jtmIOmUkHCBlAZiv2m2WfdoqsvQ5zOSs9Sy9eOSoB8p4TC6BKqzF6gfZGfSlNeOOV4iUsMUx5iscYZ/JvhvyGhNo0NEaEplH51JmKLC/zntrPL3kLVTVOSwt8XzdwmySLjGikFx9ht6fFewhtusLS0H+eQ2aRp9JnKd2KDobE0T3pBdkjrouaJ/CeumIX0sM0SkntAXA/tXARL4KXabjOLXBlD/VPstt6Q91LQlszqfrJQQObX48OWUVVWIhdxQNaqch2HLK82+EAaTkkDMB7Ma9m//ClNYbU24JAafG1cuNethSHSm0PqTDcmWkmA8i7Lh4YxL30CIFYnOoJdn7Z152/44mfX2/Aem4nKKGNKReFeTPOHNcPMVrTbuS4bKNhS+/KQCjpaWVrx73m86klVbd20EKL6Zp5DvigPPv3JkU4JTVmuSY7sOu2egmWjfwbmgJH2xVG1DFaFw4GNmbzAg6qf8JhdX7OP4b2oreICPQu8ZsyNQdKd1yVxPs5s4o162WO1DK2/NCr7PC5sDZfdD4yNwQpO/+lwnjWTWo9201LCcVo/V0lYtJ3FVoSuST9w9Woo8C3dEi13sCTXHxl2rQkfsXgGmqPps0NFutRHD7ktrzPrVtTxjiGOTBwOvR36IJcTqmgjj4zJlZ7Ay0u1tQYve9h7vnKNA/0MjLrGUA7jWl4AQR1uQrcN2lFruN2G2ocUNISTuGH50IPv1T20BEwXb6TGO3r8tbKj44FAk45jxukD/eVje/fQKABwAuJzcVgA+BfLTBVpPHLM3DBAAu344pjNtaEpI4yYqqeetmDMisfpzWAGz3hxHM5BwCA55W3//949P9+eVj93vqIq/tXd0BOGGTK0RjJMShSQWAFKRbB0ewtmuEgKy5yx8aDJx5B+t1glsJwPZidv7pdDPmZcZLvCL0/3QiSBYLOYsP+C46AnB7h+atULybIFzWB6A/cWrkTbGCA3BrV0Y7Ow8GwAFtaQXAejIjDeDRwUdjrt333aZJnm2KYyqTbu3JQ0wAmGy4n1ABPrAHx8CZGswgbw/ssXbVVPgYcNaJsQrgHL4mYQag+QxCxhk3xqdEM5ocr66wOYWCBk6KXejHB7Hqw+FNJxZLvd4E+2N0+SD9zNfkqyDY9yTLn7RtsYAT4CBX4oPcZJ/UXYFSHsoPwqn/Y8Zr1MpXu0OCdDqFYtC4WKfNYjvnPI7bHuABAXRhKuxrSr+LChDAIJR2HGGwAN235EQGYPyeGc8BzD+EPD4A91UnM2JNSML6NlBnzo6TJDzihrJ2niaTHocqCB7UyI6DoYmIU+lDcWn9Tvav2/U9dRObnDyY1/pngRZsYZeicqrcnO9VtzpVZi2tJ+p9xuF6zw83KhTraRxAAAoNuqDZlTdAQHbNu+ysXjOia9rd1/LQdE2rek3wQPX6OTGa7ut0pAezNHeMhtQDlEZbSvZluBffDCKXkAgIxBDNUpJAtFO+OiA4YCAaDAC77SkEnFkSiAYBASFnVOcURx+soKD1MxgW4RL9qCAQEBvKMj4IPEjQyzehHAJMmyGnA2IaCtLp4FweBgJEN7EVBEoZRY9QwNGGZZlhKiC+GZr0gc5tMAb9Kkxml9BonyHfMDkZxjIZT5ycH+zh11XN7mp1RStMS+YAD3JDWIskyrJuFHC5BsAgBg8IDHTI+MbbcKBWbKvZUcuXfQ0iQLBX/sUIXgIL9gL49XJBQAKAWANTAwWmYisZiJ00SeGi2kCU5AMBd3IgtgSWLm9zIA5lnaUuwyhTatoaBCBG+pcub7CzF5CUOyA/lqN0C/jvV/LwH/uu7d/H5wNQW/6pKuT/yQK05mfiKAHdBFA+HhrAKEqARkMArcsBfABZLjuMkhmAaTFv92aA7iT+xtIQ54W+/wzQflBdqCHUGAqD2kJdoLHQ30ZFZr9/1b9/RapQB4t8XAJ9hGpD9fdwVgLHtRw/vRi/+gyEgT+/XHo493Dm4bRJ4/odU8Rp09y918rPsxNjTo0O4M9HIkv0/nanBajN8LIKddN22g9jnTvdXn8wHI0n0/2Dw6Pjk9Oz84vLq+ub27v7h8en52b28oqNdnRydnF1c/fw9PLG+GBxeF8//4DAIAKRFBxCplBDafSw8IjIqOiY2DgGE5CXllc0tB7o6uw+euRY74njJ0/1/dM/MDQyPDo+NjV5ZrrSAH87O2Vt75M/S3uWNQ+U/QACwK5T8KnvPw/0/BXEcwGAAxcesJo/b5k7d3vl3/t37k40+wB4+vXxi5dA9rtVoPirqEpRU1tX3dQMNP7u7wAuPMokwP/tr+ZKv/ayZr36TJh2NdSAlUHdn/+BdV9DDbQFmPTbRUPm/EccSoCny0a0K/INdiQagABk9GNgRNG37xHDzbkgVdrot5/tzNMrYEZ1rgMU+oaqcvCkf0w72VsJWwPJdi7hwxG1vekdsJCtY9ke69/xnTc4b6r/x396wxZ+laJr35emRXnt9yVpbmZ2EDkfYqOSOyn60zkDwCJDP4X5SMvGTNLTqDbiwIXOBOi3wQcioJJeJuDSPsSMaFgPy/TorjHWehMyiTEmzBIdq6aaVMutLoWeVckoPkIEtGpOibq5a3mHlNZWyBmOoaXSeD+Fvjv8anHowyjKYMZ5tCyobiwXoGU9RfFNI2V+43uutYbegwkowUQvAUx2y7RtJqwwvQtel0n7x40F9BqUmdrLYaTwVTeWW8sLdgscnAtQaATg2eNIoW+EW4aPgSUtWJyPRAE3/MJk6/atcaCgEW0wl5VvyikN+Q3QQj/EtMV+M+ZiVpMra+mGqr8OWXmFADDGxACiVn8drzG9AAScvbrtAhL0Z6NfRbFeIKe0S35ZUWIAl5oD1IfAHaBP83cA4D/4HZMqA7OFfyezyBdxTEoH05tK4zip6IJge2DMiUUbmOaK8X2iSMYJEXnofFIZH5PJA5mo0HjoSjESCSeSlU868q79qAqGK7Vv1jKB6CGFO3L1N5lBSvRPCakZKVINE/gHC6x1jVeUKIWFWEmtlQ5VGLr92NFmJ1Ezs7QL3GiECAXFmPbio80MWc5LIZToFDaKaOGUYJFzbM9CqhUXDDMYLWvtdaDSQKcynalYYCsUHuJQBdpqs87iZRWhmOHZTOCMPtcqw/gSKhG6rNJEYVgrw7ESySObcK1lQYUghGKJKC5EStRLhhFDYsBgykZUSDDElUMXhY9aqsggQjQVI4wRpVP41EThOkIJVTAW4iOiAnfk2PKnHute457qvmw0Sotec3WQcp9imUqc0jFPSX6RlYjLEKtQUWMVlg8ojC14xliMj1oaq6HFgSlzilItlORK0BKj/iBsEuGSkC3TOBUJQnCFcsZdfF1KV0ktQGWunZNrWlazKujMYXoN59BbnVhjhTGce3G4l0MPxMJyH5UL/1uL9qJyiiLJBbfS+yH3hsg1bE6AbtX1VinGpM5lVsrKF7CqnqMdlQVMqrE6nbl1oWxtJIysLRNnDsku5i6iqej1338235+Qi/xKp4ThuYg+lYwIyp5lpUnq4qetiGmmctg1+wS40+iCpC67frMnVd4lt8O1kkpI5ErwqEAKUDyhzEePkcgDX9FvKH9yez8N2JgyUiEwIiLA5ZtAats5EmgNK4Br+/UMapehbE1uGaOnMYVBrt02IrF17CWyYK4gYVenuFK5RVwR+9Bu2/hy6Rx6S3v9Od+YlsdmYGtMNSsgAQ/8VSwkS8P1Dxca8v5yQliboZOsLxEL/meDjzHkLnUJjHXboZvYikfiNGesp+lC1UjHmVN9K24rtIDwiswmzX1A1uOeNuZnuzM5bXLCse8dYkQ0aAJS/YGf5gQ66SX15BBgLGrfOUhPAdg+WxzA6yZUkxtuJDFdqHY+WNGbb6Ip0Q6boRq5p3L4ub9cWl+ZxkhpjXpoxjbxtnTxaNaTy24W7fISoXD0fnK/ALtbOyOYdXa3oNWZxvxeb/Wgc+M3gf89WCyNRoaGYzaOutQ2VBk+ZtRi0sfCTc2+24Z/mascbG/s0L9DdCK2Wg4UTNjobKagMfRc1H1pls7aWw8c2pM+ejWNaCkwI2P9HhYGpRBTCIeC0E4PwYkFtVnDPW5nt9wazXHPGGCaZ+kpAsUq1AqtM0Xo0+s3zaPncDjPSFLvovuQPDoqLmwYSC9kbaeThumSz3nkmAObXf2OQB7H+2ajKSDTxr1tURqqmSAyhqE/8vyzshG0potFAzCY6KIq1Wpsj3qnCm41upn4zNTyg+P8HKtMs5nZaG5Gs9l5Vg0gRKqHxvg6JVLWjEQpI607QDAdUSe+ZTKPszA+yhcvKqxAPAEcMRnlqdMK0N/NSh7D5bPpl6PAxQCTfbGwERUQ/4sGo5nUzoizXdNQ1oiWna2E0XeOQjbaWF/xWWH1Iu9snxmT3IXeQRj7hFcLg++XHp0yaYWa4gcyEPxTnjNJAgUoLg3qbmVwD6ipN9TrNwSogJlGXpjBLAS75+IbAtUiFobVH2hHLxwo9NkaglWaZmtcyQdSJMUikq+CIwpm9MEj1tizWjFv7Ktl+c+DX9bYqj2HgvCLmuwZWv6aFEKz1nCKnPx49l0+IqB/+ahDTLGY9eU2+0u0MWA1RR89JBAsg5+Wi5Jp9IhDDFiXQyw4akNbw9l5rILGseSkVwfN1oDTU1iOcU0FRtY0fX5jeOs89Q7aHa6Qzkd0oRlGYtp2dGUON9k1SNd5fjHztG5Lu63QmApsYapcG4Ji2zcH9gEGQjsHp/3MzD9Bx8L4m6LJL4FhXTFZSVBbaf3aDPpojQC1Lnu0CI1JKH5pAVAtvvlPfPFKvpQB8EC8xSXfoXO0O1jwlxtUhOoorYQ1S0rwjZL/Ly65VJZKlX3JC5Bq7kbk5lqgEWW6MKxe851zA5T988BRYUr8qe1bPFQLdP2VDz7I3zlWhid/89cfjzOmhjX6VvcLJ6tP1gUzVgBpkXWONG1jrTEbmptd4oov87Pkzr4yPoXOsh86hmSCg2nvgRtPe1y+i2i6MGo+WhD0SsinUPYlbDwggaT0vzR+CohBWiJUSXBs38ROF0Mn2tkMzsgQ3cazcopW2REAS2hEXOpYVyphB7vYLmsM6slsBK2ua3/xNiB79Tt5u5uGdwoaUii2Ymn2tqz3Cj7gAKmQfyRlVCssQMjX4Y1hjBEqp6vpEFbW4J3yG4b7wuvpfIk9KQEq0f/0cdxu1HbJ6BqPPMu3IDKa5Z6mfs79btL5HH653DHd1EbOYN+oNnOtr+sjxtJ+eNIYyyD5CZ+e++UTMemMrULu10/9xwKG/EJRcF/KxuO0jG/C6X1SkfU/0mGS36EWo4BntmBtHp5m4fEBSnQm+EvCB04Kkm7RMizxozWswFtuWJzJxi0fVs4pxsWodltKzB6USUb6vExX+a1yVksohlhHJz/auzIsX7CkjuGPVbpz1ciEBW3VP+nzIFfNrET61Q+HX6qjJ6572Xh6SlWmxZoKn1qD1XedjRygapKDguaS0JbcG8sFHU0Sn++EFfhiPpqeNAaNow105XKoCabHKUhYnz4lPR/VjmER4jSEuincL8iSLfwJ51nl/yrnRSKLrvQs9CAscWQMJ3D5hBuZLGxgzXWxPFBxeCa5OrY4XSfdXTlg5Q5eOXlYfEWmDEw57eyRloSBuJqtiwpcjzJpxFWOw4xEj7ICP4ZG+fEgW+Q5mhDoL77B49rA2C8j5oHrkCIWtDti4NnD4NucP3A/eQkrJ6R60e6ncsIzuMObT9ft7HdqGsmVqyUMhf4CSwVnsAIHQQ7EKe7+0UxsxM6DsZJxrON1q3uU62xmQhf6e8Ro6/+FN0pmUOOgoAF5xVaLlOlhU+YzqaTa+mKM+hXQncrgBX1g6WS+aN2sUSTG5QdtPF0s7AstuaDtlCxQ48itmxrdOzjlW+uYwmuu9iSzNkH9/R5ImQuk6RvPDzpCcjAB6ylj/lQWL08TnTklvjd73MfuuWItJ5KhCGk8DnIQ+B1RvKh2taeU6y4Cqk+t2602cQSJckiGZlkBPki1N4DQ7cKgAE9uvqHHyV1Zim9dKGPtlDohAKdtsOKzdNrqCYZhxKPFhUt5t30x/B/bzHBd50/Q6fb4mHecD4FAcrOeQ0Kxx88d+5cI8WlZbIGniV3JFAGV4upsjOA8MdCtqQKmDE3QVUw/OuBwCAc83l7d5MX21O1pTN+TFONjxt6VDqApjoIDY1lXXhdzr1sqVkSJncLEq6npEo+dzBW3srkrlpX/ilidWaxrxnTx99ysXNzLXYrwnSkaVTTNGyrcCJqxZj7mOFdLvG6M0/53/86pT3ed/aZ7uKO0P4NzYHfcw3ADjm2gq0+wUTomGKlI4h33524c7xq309zg88qJgYvQ8aSpJoRr7uQytzETZAmEWIMOSING/enZppap2fqaqTMtTaen9tXQE3jEYDY3LIrNCybFZ0A0uOhGWhl6+Odk/cSs9W3kaeuJMx014SzOQTYn/N3kJ32Qxet2SXOHJiNIwX5EhEvscWn58tiB2pmmfCsNwq9ycyK84rw3HUsKifcLK7ep/YcUezM6lyduqdO+EEjqrb458/3Ks4W0cilTzI+TlvPCU93DWlint4f5iMIDrLEuxr6W7kE4N3x0TKahq8WE/vyvc61moIiVcilBsJTAT7lYxK7p22lsl3qBzb+W3KmXili1A11r3753Paz9RgUZXLySeCXJkTGdvfEpf/PTmWwnxu55JdGJOZO7+QledZvORbmkKXJaW1pzFDnHWo6FJme7kMnOmGgWLTF5jOYeSzSgcep3bUfhfBFudeNvx42TxS5UqmuRKSIqVRBKtbAwDD120OPWpHjehF2gDefKx4LXEkwNbXj3vwm7SBvJLV1xl9JGFpoXoL3YiizS4QYauASrIUUWkSH6f0EA6NPl0orrgDJtfffaCzNlbDU9eTOvXn4/pny2MIo00j05P1DPiV1em6xJn6ofbk1MpXChsfYJtansR9WdQXbnZB3eQfNh6SVNvLiztuX2K/nF0pbwiKi2+L2Xm5v3NpAZvwSHH2453+uN4NEC2XbJyFSbWKKbJLBPe/XVqU05sU7IsyY74wKII8sjqPeoAzcOZoVljpd2Vh16LGktY3MbivJO5Yp67H5Ll2sUiE5MjGAuIWdevgz99cJfQDl6udhl59TM+9Ym7nBHvms0pzuPciVbT88+8HJGZnSnkyTFrydlTmvDQ+GUv0xGH4QtfnH00A61DcW4s2DukvraKPH+nL30/fQMiKBw+e4RI9M+FSi20Dg0OvfkRJGVZE/HwexIWkUN5aRFbECFdoFTXIiL2D97/wGpeZHVqYlcUd2JV5Sqmpfk4+o+NNIPJYtFh5PpDh7kaDu6PmIAu4No8s4Sv8vZBu0XZhWklZAQqE23vPOwodYyefwahkDpyWFJ9tUXuY3QWvK/OaHIbpn5T6V0Di9439ycPthW4BoVURFElVl10CwQQZf5PMkCQ7rwqT5rf24W/WCog3+AWSo2TugcmFdXzx0hzNPShwpyWVBdXG2TZeNrhGQTyqkzaLjgYGdqKDYNxiW2zelR75E3IW9IXcBJnWVVZTu5WFGl0HUZ7XpFehVypOGW2gA6dJAY+yy57MyjwUpflDAkIMYvxBEVaIU+P+jqj09EmNBO4tA4u0PuJl5MSuwxQfXG+koQOhEF2C/h4kqlMnw/3X4iFN27MWVxch/0lBg3yxMWefjQ4iM2YPTQQV1R9JreyebSktd3SrIiS4J3e2llnuVsdNSye2QG9YF5EswrIn44OYL594MGy8oGA+9lHGpUUWvsvjDAK70oezxq0XPU7PxSeDyH1pTehgZ5xQTiC8eWnoGNGmlWRsU09XjlzGyso3fefim3rgVC2sGRpfNNuaVHWRrp6q1n8zqvL56evVHG5MSHh6SnssqWpRFsBpHEZkZIWZRtSM7G6ZENiU0J04iFRAf6OCd1fpPmKdt7Pm0s3SFsIXEWwWzakDg9guR6kt83cCcH0FUDKNyJG5tubK5ZkaUtFyx9U1vd7FL30WPLY8ze5d6csWWfdIFEd0rPPp7a2SGVhPrYi/rnOE7B4wlcCXlqz8ed9Pe61bwsB2YE+gUnL2BPnsXx6azrthdt39/t76kXqZ45eC7MaJuIM5zEk3HySzIOrx959OfF1Se2NfspNMstLIvI12BXPETlQ3bFscKIZVNEkbUQhVqUQrKf46uuz1e2rsnXr/hK21erwaEhCZQvrOuvXsVTHjT0YTyGrzQrpYxMJCrDE0xw5dl8xWMYu/n2N62F+R9at1d+aM4vfNvlS7pj2NX3X1PWvy4l/X/dj12QNdsWYvthGWzfbDZygSfpLhcVNYfMcNk0hWZ+dKa79Oh0tGyCWyv9Ey9/eXcmDFUbFcdz/UHQ1oD/+Y+vNtTp+62xCeTV5OKyUk4QHO0TaSkyKoQWwURukcHovJDjGk9W3eamSvuDgpaI3GRJFME8KhKWBS00KjDP8oykoGRkukdjrnAJUxJ7D9JQuGy1vK9wvdClRtf1I+LI0EzP0eJzBPHRWcXa1sjYxtYRMKOp6zwln5D6COOwMgLO07aodxls54qmtw8ZqBcZbNYOpQHqnevq9etArcrf01p3x36J/mK01vxnardEMxCMnG6H2F/gv8MIsttx3dEuYs6qc2Zi+eOkGZy5vAwPLwIKHw82gIFmHlzv8pBJfwImD2oafyjoGg42UPnAevyPH/A93vVF86PmduWQ6vpqLWuAtkVDWJsZCU52k8QHiMw8b6RJ6kMlzKQjkhx6w7ED32hVMH6wd1Vc9UqKpMuH6ZFlEU90k94JIIniovzzkHZNdp3lHyWKy1aY/H6ugJ0J3ZSYs5/13q5/1jwb20V1DpBbOFYHBMhahk1bRmQB1QSnaML7R4amj74X/FNZEMKvLekarq3rGi2pogoqCwr7vj0yNHMnvHv7WW8uqpviSgCv8KxF7hzQTY2Z+6y59r6mZVQSWB3gWxZWFRgoaRlhdVerJG9flFffV4O/RfzeLDjSJg9sczJmVPjhrvqLH5lC19A2BtAwT1KaLR6TAvcimoaxQYNGk52OB3pHqtvIoZSie1gvPwrZ8dLkJaM7RhGEH28+qc/GdEq+5rKV3kTXg3HMEs8ybWLhrDc9mNWeLllwYurRXBxS/bNcArvoMbOfNq/lGTafkmoW48hzrA4KkIos4Qk4eo9Hpx8QfdvkCjedHcEklAQ1D/hu0OjiEAlopyACJ7/MCQ2h0lZXVnFL/p4HbgdiiBSq5ormoSMjB8mM3epHdmHJqRwPog3dV2uf7tTfCm8uq1RzkALn840qVlfkviOJ7NRShg4V7j+WllRe19g4v1JMIcZQfPKIiKE7xQOdmFwibiAJ7+ocvUej0/Yf6mwbW0nhsGPiiPKgrAFfwvsU30lZxXQIv+11pfhldY349TpVG3+aLKvwnVpLKW+dLixuOaMoa5kqLmydwpaLXXOdjgFHqLHnPuxa//BRay6mk+xKBHehawj+kpbRupqWEUlAdZBjpP/79Q+7zg2IJidhj+4N3nuo5KPW2npd86jEv4aAltttXNI8Egnt16l18e+Jjr7VbYFtJX46bI+UMdvFE+SomHh/tz3eiCR9qY50T5KrN4cgvXpy+Mk+RXjTzQ7vCCrLB7XbiqKVqsvVTLWleDik4uV3T8xK75MegEyMJru2rWy7PHlZBWnvZWNAXXQ4hPEszc0vyHGLK4dOrnA4CREMgty/ZGRldaXQFTMUlr7/wAFfwGf1GfRp7PRCB7H60gjoXH1wbenN0mSC6flgJ2L18dObYTn34/NqKb9CH354Q3pJ+rhS0n59/LsXaTBndTS4WW2XdTQ+G+QTDZ0m2aAwZiQ7nlXM4VeS15Oq+98WfZ2AbxiUItFEt7zSEz2i3IZcx6AwXG1V9B7nXV2LDQp3zK3PFZ04Uip1QxO5NeaA8rGGnzkMjD/kOQaGY2urbxpdVYsLDHPMa8gj9JTmuaGISCkSVVLrUHriiCiPC6GwlTHbOQZCK7qbL9UsJdjcFmNM0iHqYsT6Qn1xw3aVEI18yxL3cKaTZ+eDtibD4nTIF6BcI1GsynK8M5lKCCDnhlpAg1zFucNgysAEmD8QSnh/+bXOGf3Gg/VnNTkNlQVeYQyN4jgN7/DroXIazmqOHzx9Ru+1ztq8MK0nWl8YbZjWnWVpWt0bbOEFS3XOKpu5x87d/0zsJpzi6WLywkhJ1dnxJotbyPZYhU31uwgjIjHv+260V7c/yp0Br4qdioufdUvV9zIO17eJbCCFHM1A5ldTnHoHIMgUmaS9I5d0pLPACpPJWlro+Z3daFsaznU17eXukoU0t8gkzU2hBYc7LVxmmt/RXyJv7z9D20/JSzr+4SPXmoYbqspfTr4se/lx/eOzsmeTz8rLBDXm8gb5Rh+j3w/TpDimNOcENS6aG4Dds4dimGrI1U61obg4xPsw8wrD9G4HDOfc6vrna2kFXban3S2YzvZ1N/dGJhlIdaXmSW7ePCItooRm3u/fV/uke+wH5JOarmq1GX7X3la8AS7Ezezb+dttSTrU0Gzw0KoDDotwwOLsEUVyQOBwxx3s8bh4/L5wQWEbfnxmCoebnK5R5p6e5CrXVHvE6Sllbs00bupcuCc4/k1v75t4cIIGroxZwwtNBV+/DI7zS44J8939Ki5e7Gi7tKjwL/AUHhOWjg8UKhXGseTpkeUBITFOFC8ML4Tuyc5MPuYSpx2CtmFgDuz3CaKURsp5HSxkgKuLTYgxNyI9xMTGOdBN4vbBN3m+Bfjy5jV4+HUiABm0UFSp1xRTLdUrFY4N//k9lHUxM/Ni1tDvP8NDf/64DbbdvdveduduW/udlbrZuytLDR/nvaMpPn6RgSbFF6iyc2HnIXLjTLM9AmN5p1z6QmoAHopLb+tI57S/aVo5N6s195goOISEjCILqKGuLkRXHDXscVtZTntLe854Ib0tvfHKeB1H7x5MZGl/QVbyyNLZUmkxd6/K+NQoyZPujcFlu6sRlDqXKcmHJChvUpgHWjAb1F+S6TGSjox08pNGxpCYItm5mqPieEIay3+Tr1JuEj21v7CBc9Q3jm8IWwyBGSBDFmf+cqA8EIlc13Xb5xY7EVuGJ10uWvfZE9qYYTlw/14KhB9vurRYpwAKJhmA8kDvz0Aeqy4w+ZMLWS53JtTraUy0jvZzibb1gZm4Yy3PUGw9ezJQhSoWrgSiR5A0OtpHYIIF4er//KlBHIkprTBUYpH0p+ba9k3OGiZpX5tuSExsZm9cZgwJlNAbyyO5yXx5aVNQqsPjK3sBEDbM8X+16vJndDGtAj1MUz7NJ0Gef+YV8ia7Jt8V/JfYfUsjetzRuzcuz+zLRxwyOQK02fhsN7V6/+bhOe5o4bnFH/B3dfSTRUSTGCNMVFTyC4xyvalAd9M2wHDNs88ZhRnP1duCd4n/2pHoitnk2B5+VWkrHVLfftPTlbbYuDNCXZxDBSkRCdj+S0Bg6wuGsNYtc+tYP40SGMqOT1e/0z/WhluXz8DOnYOV7ZtrmVNedrgFygnXZem1CXseVnrUaJnB/f2zdjPmGfieMFsLjPjuoKOqQRVEmT/AHmcpF+25pTF6qeRPlgjjJi21nsjOPSHOodPE2Sd2XrN6b2V9NZe6aG31TqKELKapLo8zFD+X8eVjKj/3KavfkSviKD1tLMuLTMAImw0Cnlm6EvPbLrL51KxjAlwjc+QPcJICtxSVbH6VcWww7mcp4/IUkOj1RQNYa+AZ28zsclJG+HzMayu8PAU7Pwf8br+jAwzhgI2RXiwa3ANXwuG4KuwUdJSHL7M3E+aqX/wY21h8WA9qTK9RsNm5RAslfHI7W2jAhamgJkSszxW+3bdvOIZ6+0z96ItwRY7Hb7//BFtGD2OLAtuHTWSI7iko9LosLSfE1cYwFZULOUkaV8DtQ374mBAG6rrxWSHskZFcYoHvHB5XgzuLIOpL80umiwtg5jAYg/FbMVdgSmwJBlB6rviw/DP7KPcHkmrS4rI1O5sD2dyFQzEOuEFeOzuOu+XL/vnkIhOEahxKHNQFd+RJ7gVB35Jb2eUiWq641exuIZPBXLINkAOJzPTRslNpIE5lXG8oqofqRzrX7vuDqChq0AZYdQESFLP+F9QXSYpFUcKMSMieWhSUJ+m89UvMFzLiCsRsv0DFo6PvHl1I6vfm5lM9XVgUd7KjizfMZJGpI9QWWTI93PjB8lt946X/hAQTYhuvHCRGRrEITnvmmIZCPZE509UtNdDNkRnsQUKJDRzTPPHROenRj15Tj0UV7ATVmbhl2Y+KrLGUDX2O5n41hC2EwAo9sTZB6tPlqZ+DlXfMtc4pPwlXj5ZcC9XB9tq/KT/Y+5692YzyB0dMVPaRejh1VyGjBqvxXAy3ggf9W5qMRuZvZjoztTl/FknWbUs97SkjHqdrqQoGb0zu7p+zxw/8Lx9lmkbupRNq0BELn2zeIZY2C5qb8vDVTjeYNXifS4GMraJLruEPOEWkSnMeESO509MmCbm2X+a/raYSTUrEMAADwzAXEsvWy41h6xZkFDHNR3hCwf7b26DBz6zwpLwaJqVgBnys2qxHzzr74s5vBnncg6JqQ11ObfoLIUKImyt2KDZDDEppdanOJrZQUmsJUBCjc4PtXqat1nmrRTsGi3VA+DRHpngQTi8SdseGRm7QUpSe8ldXVs02DPEr0ZBqw24L+Ca/agxCNI5vykK5aLXZtLYie08mAE9Xm8wPhHDj1q9dM/PZ48HdH/vNC6xTnrFksc5qgpM5/kL67WjrxAO+KZ7i9zstXj/R3rVG/b/lZFFxaYtrVlwk5FUkqGBzSteuot3y5Nt5GUXVz7si2gxUINCIkcgBGTr0I4Y4Hqi78y7eImW+dT206eCX5wul1SDN/Ms96nprktqTsNRqZjfuuDGblW5YqpLatIMKj4QoL4wNHIOB22C8opQgyCjPqa3BQQAe2DIOSEi3K9m5itq1ADfn+N5Q64q0gqKatX8z7EJK7uHgoZ5fIN7ni4yybqEIHZIqdikqde9MHUnyVXvn3NuyxPrRspH1tgpJht+TpNJAKyuQ1VZw03BVlPJybOCctPl91q3KxYDK1RVAHMbhXtKWm6+yyY/+/y4sylpTrxdy8FzRxwxs0kVs+bc5dh6b/JFfdA45HPC07+euG5X3qpFFA8jiuxVVN+oz6v37U/0txz0wJrgITqhbVQg/tSN+bhZ2t5YEtTk5MCr8cdf8RWrVXxRf/hb7zavumJQVtE9WV7WNFco6xu37PGwMjOuTTPpT8k629QoyjTiAlyRtofxunCJOkDHBNIRShXlVJhHcgyjg90HYca1xFgCsLVSO35qYNEJ3jw2yoXHrBrVQON/MkBDl1i1yVOlalXTJwtWsl1Z+ujUxcYTmzvDsEgV8XSTWz8lZwDATE8nKDj2r0NvqyeJ8Gsp2AkpUB0mS7mHwdeCyXtC35D2jVD4rlzPi5POipaXwZLErxVzgJimUL067g2SKnE1ng1vIFBy3JqjJG/huRg63y4I1Edooclmq9wPhpu+04Wx1jxvRMos/n8leH4EOLrNCFzxublBvbeIP0WbPx/lglBHKESWtcq4CVc6FFfjG7GFzzsJWgXqeJhQDj5TfI3z/rIdPDlakepnBDzxzfHsB8wIOiYB2JBA4bjqKxqU7b3ZMfYwE4NJZQv0py5Ndjn31DW8/aogjL7hptGJkWSBi1wLD2CfgmTtFUxYcX8/kcjTf3g9Qff/Cqb74s4Hk/3+OZpsggU5hf5HT4vL/F4ejL+RMyS3IsMVMULlhgUlC8EP788NJSlG5BIR2giVIc6j1g1jgfau55eKVIbsZWEJklqXS03MKcB2BXAxppHqgmUnlpbtRiOeIwjWQaABpiXWVILraQY8az8na7UQOuZDlqZZ5YQU0UCJb3AOXkiSpVLUkOpX4eWV0HwTw+W4G1ozdNU0AOFpWEGxKECDRGK28Z8lJGXSAZ5TzNNehY8YVTx9wHkEZHcWnrEH5cLpbh1s51TCyq4QsZV+JHdes/MZSU1bYqubyAHDkvzTyYiGj6sH4lFlfC+QCoMOW9/c1Vs6yYKKLNp+kM0ug+/z6IGlHb9Cth3fNq4lbskHxkuQq7/NLJyvNLmYZHfk5Eubvfn+2qGC/TNk6CKvNF1R+dIGi7lIpJAQEyQBBdeIBHtBGmHVwAhDCaxSeHUwgbMrmrs7zYnd4ejZ2PNk/zmO2MSPxz5CoCBAP+IFscySjvGmWj8LNWTUc9pjWwNVaCp47MY75GOYZN0JkoZ4p5N3dQ1/1pgmUN5aRtieYz3+jOaj68+ZDpA47ZTleuV6udnMcZkgxh8+vXLHgFEpR1oA8ZQIIccv4rvsyRAvhTDvxJcw4PkeI8sZb6xJc6sgI1hFg0QjUxAscwHghQAQO1YvAjEueLiaeBHdCE4tzU0d4FbioQyJEBVZ0O3/LVEk30swMEtJOjhsDUkqguCySulADljyvXzADAIFCWseyfYZJpj7KRRjSC+3ZkWYxsSzw+ldJsSNFZhB3S7PMnFv0oQRb1To0ACS2LO75prfQpcSPyyVmy8weaFqxxFASrDyHwAS0iqegbRcDgHSxxPQvq4zJ/2Zlxql9FlB5w8r8GHRWWk3KBtSGKF89NldN0NFMZRDYGFrnwXxwCfGUNfXTeBvDGAA7oGTy8ydUc/hYE7xzAVPzzJ4r4Xq/A7g3vYUMaUiKg6fjvhUD5oYXOW8KbJ0qhCMgIyK1FzioRcwTEmeeJqwMnFfPhIuL3YInleEteSQtElURUMbWMiN3SVwfb6enSReAQkEqcCjYSAFCAOSe9phH4CwjIYwQKqheSnx3Aq0BKMqpQNsdHEPcF2wPTRgjcUn0OlnCEa8zOQz7zUQGe70ddCLrplaEnsV3KidoEX1pdw95JCIHzWi9i0UQ9TGlbNH9SHABnnApX9YTUBWuJk9hyGDGeB1hfsgWdJ461NFfiAAxj+95+unZupahgh/IHeHeCLDlo2X+/ulL7jaym5zcLOZfT9kZoLDBzWt88kh3Uhug/bnd3R7uhFNmJKOaTwXQShABOpNRGbSaRaqouGHpXHg+xQDCt+1IUdJDQGzMtKfo1PJS0oBDJ+7ZdO3J3p+SpDa4nozHpVCfJJQ6ESiTzOw9zNOEGV+vgNlcLJ4Koyk5aD5vWbPCSb2gHbMIrTRSAiDYsrnndCASCPdPL/0eXZBLv29HpDlXneBhqihkJungbupjsfvJzqKvMb1yPPYxpnFVRz4tdj+I9hz4JKz8u2pkXUH4kiuStT9S9FE3M9mnOb7nT6Xb6pe3P/73rr/d8O5txz//bZG+/ceYXfW5e2t/6+bb8sUdcraTlNcdi96yqU2ptMefvnhDbvWxoyH5Je0fQh+Wycvmx2B613qZPHz6+Zf+JPHHx+D+tRlff0rTG6j2T29f6tRBIBSKUb0wSCWJAuLGumRUaqMqK8blsT47y9ETbj7+GufmLM2I9a1cZLEBNSW2qlMa/DdiABBt6iyWEpl/DVl6NN1SH+Tzxyly2AfJkRvAwGAbvXpiR4f/k0JVhbkrfxEhUzHK0pEleUggUWTBZxEZEJmuflwe10pywP76xmPfVBwQZy1QUNBO4hVb0/yyABB6Tt2ZgGpcnvQuTcNAxRoHEs7jLowr79akGvsydozknh0tBJBodekvoOlymR+bQViKlSTBEmaR/7tSEkhiQTpJkmioE7RLfgxkTvqQtkj+TZ5IIgwgLEgkdq70Xd4N2Y3aeB3VBhyK6C1CW5Atg1w1/wmUBGU5CY7b51vk1XUYVAdLROOVkz2vkXUJKo6HqvnDkHonWNBIuQrHcGymm7tOQbXxdLRt/ZKjqo1Hx4usHwtphiMiJAmqm/KSiJtVlRMV1k5Uo/0ig7/XglMctnJICoDDaQmrvx5aDVK0v1ygqkOc8/NpBBmXhQ2zbKiQK+SEacQyjhMvI4j47+Tr2C2MfqI5yoEiK8JGjBlzBm3JDW5mmDhJN4cSqsk9VU8FqrauIgnpkpEWExXjLJvDguDseAVFQOy5gaknXAMzFWVUC5wtFbJjWrV12bOCiQZbNf4jE1qHanrpPw78AfQ6vWuUuKbv/vklX1PVIufN1lB3neqxzA6naWNguu/jwFoakmOwp5pM6X3XbmxHbvbDvyNXHzjc+g2hoU5KBXfju92H0RRIR7NEqS0HABv0m3pMSi8GCJHogqRylifgB+0XaUz8LHCSPxMiWs/D1ibxPy4Rw04PAYS/YdHN4eJRPLMsm9LGEBgSisRFAsWYl4o2z+1UQeAAR7rczfKFwGBBvObRwJirL3395+/Mmzl623FvU9H+45PX+3v7v3/+qoO/IU1wQ/XEr6oX4OvnefXyxo4v8ulleVE37eFBLwQsw9zsFwOPRbTqyYcFGQywdzo2g9Qkk+NjVoxInEbKfQlQ6oiBQ2MfI08wGPtQSjsOzrCHAup0NwJYc7+EhrRR9yT8WRJbvLB3RSI+Ws2yRN6gq2l9G4iq0wkiQWy4jGDAQJBfKVzPRKwtRbj3aI59XQaavBhFin02DA1VENddoGkCIJmSKSsZteRggSy5/tNkr4dZesFBfdJbq6cy3fSuaUjtfCOgV5VKb/bTMiq+HVG7P45I2ly3H9NH0dR/Mp3kgkwd4+nmx1UaL3ECAopqvgBgC2cZj5pGbqM+b2YKUoaEuHoiVsn9CBUknkRIOI6IqSQEBuMnpEQ2lE01YVoiCFqMHBRY30H0A4miG6Uw5TxwJbQQlAWYXvPHpoFbpgskQaehxjLoxqz0d1A08T2iCoxfvS64aT0vKUg1faI6elIA57a2HG4iWV1z7GY1m5SwuAVftYvIDAesk56jWJ776lIMgpvIRkBJgdjBiBf4GxBZMuJRdyxFlopbHHMbSRKYU88jMdyieZGCS2BzAMskRaSQobEH3G3f24atssN8A8rLkF8P2B82jAltdB5UJW0Oi6IOQ2BYIsbImK0wHjOg5Yki7MCesCQvRLYZvC9B/OyMB5XPFXLMUJBATgAGhNqbVtFFEtbvIhhtMYtBL6jAsppkhs3NMsY3pRiktVWgHEr0YTiWrl53gKNWjkmodYLLC815P1g9BuJJoV1sY3eIe6Awz/JGZRi4bkl8bLDY5lKRpqJEKh8mWDO7WbMwZQoaCiRYsbzTx7tXHh2olBY9PC2VEnArBffLfQzbQKR3k1T88zSeZyiE0M5LnxWYlIeUzknV/xBcxe7FgSQJUI4DLGbFYUddwgnlIJRtMIx5VBQEL2NnYBuyYCD21E+DPZ6fHs6PUqR1XNkKr/l/cJZ6zPP0sC8BazvhieAch36ez3ozFlI5q0JEZO4Sm8v/o/L/ggJOmh4I1DnC1Ya8y6nhnHZ7ZHRM93d8BR3FYAwJncdsB7exVc8PnD2g8ueG4SXMU3FvYw+KtxzNqUC/nk2TIQoLqAz05ddZJ1IRUUKGE17a2HykFxKcoLyMCsgRAzUd8x4MihAfiiLmVoRMJAmYEBcUkHSGgnEyt7ZLJqXuBbjORnQEkA84GqpuBqNtmpHmst8r/mXyxgClrgdEedf78ucfata8wtEbcBaOd5+IAdfy/2B/YTkQhvJ9/d2tv/sF58EJyr++KIphYe4vPtLD6PjuW+b1IL9GDUoc5MUusErrh8xyWFps8KQChGeptwIt276vA5W4F2ZIQgnZBMABhSww624mYYnYZm1YKt6S+DAiLt50M9zAUCHeZh8B4zyirZkgHXRJBnwfMpVMshE5xxdabWpYOJCBHgGmFooBwMATNUSpWpP6IHC8mRJ8EcoIkGqNqJQryd9AZlLlgsdbELqbsZwH02q2AYFPoXqZ7QZT9GBJjzhABJAyt4k7eJBW5nQz1lpC+uE43qmMFVmm/uotd0vqhNyB3M5aDMthwAnKrcLlhVnBQzDQkyliJZKzwNVauZ01lIk4ZqBV00QY7y27NXQV2KI6uVtSgLo/4tsWSCBH0LVd7OV+hxuMxQZBxZwve0e/PhIqm1pLAHjeUKiUwOXVY3ieRybvhJigcjoma+Py2K0E0Fl293GCdCevwQuAx8Kye5fPTJvSdXWel9uTs6cmDqTzZfExaSI2X4yEMYdCT7qPEgE8ZBASmUG7oUKmq2jB4Koyb8kqJmobJhMzrykts8ol+tKHltdV6+Bppw7kBLNpkWQotNYhUNKFdjHY7XM0y4XP75yFQwGzkm/Qb1ikDxWOdkQhHnGapETcH4CPYo9K/QoGQqI9sJRukI5IiJv5jJglkJPZOLphs5K9wiixEppADllrjAzBajcnzSbQOPwy8qwz2sFmnx3cTUqEi+Pim5eGraFXYX/wyJXwOQQXbGMWvGE3Dw/On2fRffByfWcT0upIwH7y2XfWpTmpXCjOiiLI4L9sodIHnDu/BFEAAs8oqEmnVr/d7zlOa9gkFn0dB1h4SkQQwejHfs/c8+C94CDPHZDqbfG7GZbOzy9fP8lKsvn88t+oeuqMJyenl+nqRczPkI3QtrXgQGvgtvFTWFpVImcqINmLf2yQI89NpFJRpIumRMVyWn9A2kWNeLC8ozAqps9OgLSNSl0RwqtKQ8Cc9+bgujJwnNkPwHKocj6uLLXSaIBwXNRamsWYZoEv7r00Fgj9qQfRgaOUJVs6VkFbhfSY7RUnsa3Wpg+ZLWrxglpcCsRVyLcR2F+8PibTbaPQ+Zz2JnQgtc+stDdasxOjsGXYs3E6iPZIabgUJTcFnORkRGAIz0jNZcpqBBRZRyAZZ6wRS+Gc4D5wX2+IX4WVu9LpEvGDZXasem6fIQFsB9BKHBLKifIQL+tFNyniqcOUK4quw6Ek7kDPjKiAYuwXRmee42NFkLko5ubE2Sg4UeI3VQlLl4r4RqVXBx6tyQvavblcIlkv/TwIyHjuWVl8oWog5BXEkVkxsN0QBOIR1xdqq2I8oLIZOkWNz9ZiCZDNJCX8Yj+UrEx6b7EiV2SZ9DMUF3KtIKZS2xLHgCEpCfLOARBA+Mp8K9UtbCpPB6XiOqHGlJZghxV6hYVU0MYSSkACDTHVYuTQMP4TLiAbYqWflr+ecmnmpaCPU5jJEAMUBZeNKFnO7DEspcvz6N4C81IWjmhBER98PRZDDquJQnYtB1APxNPGnaTaLqRMwtPswxOK/k3E+w2UyRMqRNsKwgevraPOo7I10ERTTIXVuqegRBbUVEKOswNTUVBwg7KKaCyRGpznmN1AKZ5hIWO4djJkKzwqokS8ojmp9jkjHAvJ2RVF2PbLyI4FXQtammNri8eIZC+wsPDgybvERq2tZYyoLtlq83453IYOMTZxB6fU7ZncvgYx15fogt/omXqvzzQvvSrVlpohV4DeS1yOm3vxy8UtcvkZ+DVuylesNzlkVm6mddKVyvLx/sOE3J6HtU1lE5wSLqv8+jA+goCVoYbJMpZNPm/H2CpmQj3l1KMthfSBbN5wC4Ae6ux+bd4uUhRi3D+99j/9puClyqQVOTCH8hdNPbmNAyu4E5zxFFdWZWr39QAxsI1XWRcumjhaYCVPrD1OBIWWy4BRtV0um9KFAjaH2Itkz+Uh2aEKIafi3AoP2gPqd4sk4J/NEtCwaA2CRZ2dbY5NJeRua1jKeSVIRrqtAlYbkYYKGsFiGhB0ijJUo4GYqu0EFqM6INXrtDBmHj+cgF2dsauJSVa/K0RQX4N7QA/KiiNsxsIkPxxAM85VwTASupk6G5+WIxaV9PgraMY6u7Kj8XK+jUCUzlYMbimU9q1fdZJWiCb1JJBZci5LbAN5kgH1BM45jcvVzGSvYmrYbIfPwVosBi62vpwLNatsb86ysfyNaIuxPxgdntw/5GJpsYcB1ufU57uIikD2mo6A3y6oUl2vTgE9agdBGkvx5B5jdw7V+aijYxVD8qoSVhexhkpe5Cq8XFJULQGEylaUowaNKJzE9mZ0BE9DznKYWO+Ki4cmAVBtXtf7Hh9Qb/cEmArMlDIlJJBCYsLhrIi+YoV0W5yVsRNWqHMKCtk0mY4Q4FVIOjkQHCRcq9RRQl1Ze/H4cOEqy+eyuPots4wLoMsUyiOgSDSj9oFFkVXxeiZu6G7JHLmq2RAlqgaBxeTLimT61KyVb1OYleapqB574PpzMZk3CD/GSm6OkmtFR/Y4ZfJwtEiIlyc91xm9MoNkfA9NNr4O0arOLnantpX04acLhoHJzHfaizMo1olEoaf9v+vJTsdt5/fB4Zgt2oGz2A3cPNZrILzz9Q4JWau9vlWgzJyXLL88/bluR4dLX77WYPFSZ68/vZpKdLL9rsaH68RmDVnzEOkMB+XbVX4OScjg1Tx0nme36dvN8cU4RT7N0ZdANuHD2qOxiOwntGFZ5TavQHUEazJzCkFrUqg3IBnM9EBzSt2lE2wrJwXh1YLE2NeZ6Fq0paLU8dUYqE2UFStIz3eaokxCygy1D/fYttvToz1sDxOe1YoNncd+KylSDHZaiCW400M0PZ1tooq1iCSGYsGBpRdWqDUUylFqqo+bvtFjtOJ0/7AtYn2nSdKx3oWLgQyz05zCxS8ZPzhNe9BDi0aTIiEH8yvx/NagIVxwPbAs+8x78atCn+e/yrWiMKWLR0uPNH2Ica2wcfKCnjEZhyVHSiF3hcf52VeECRbIdWRcS4CdqRH+pic7y8P9eefWT8QlHRDSLwqmpjdHuXO+qSqOXjb/lDYfUE815Hj7YurQKaB4eTUjioOZ5OPsMlyLbNDDjUndt5+2eRNOaC7OxSd0RnNw6jn7wm/sPxxktjiNcn+oKv/RnXZ05j6fc//wlFPKMThI/2P+b7/e5rNwRZM4ia/o3eD09In3wtmFjUZxfa9P278mf2k7cqzQMdzE0fwCKnSP3lFPh4+1IF5pLa2ntX0Pb+KHRbMdBmuI3YUT+DL+omSpzt/wWeP0+unLHyaVxCvco/g0yupTnb0vbFVjfN9+++nlvlhtf0i+M7R69YeXl9G0nqXyTyIC25ed/iWtgQdPW8gT0pCi3qKY5+n8QU/Mm2c+hb8lk7SFqvUQSpUzcQv0REXi44fN/izw/CMvpzfi5YenmDhE64m6Fc22dxxPaQIfiMeBj4sr7P24vR/hVni9OWeD8NLWC8fZ2v4Tcnv7z6bKo+mF3uX55vHp5XVPt+VgPkh19v1rkxVoEdU60hZk73X78aGURkRJH57f7+vzXQV3XYwQKvDI+V4CJo6Wjjxv7yq5LV/JjPdUQQUTfuePCgRqHr+aBZnhadq6B8L7zit7PN2dUx/u7PSZ3mW2JFpRgOPlI2/Z5Y7CPJI6UZVQATjWsF81n2mrOYb4LkzMseWmeLJJjUfqsvtRJCM6uAvLFG0Ssn7u9qeHN7dv0rCBDqZzi8M1pF78hCwbBRTz7TymidPDVAb1iRKXIwuhFCvngQkx0iecOcduHgxHOMCKWjPJ8hB0c0azEB+YL7T+4YCQf62nZp7T4wuNiQY3I0uhEdv+1VOZrbIjjT+ejsBPMbLJKBq0TAwwvKuOdY0Uhg5S+Xu/64OUlPVK1GgH5/aMcr8WHvRI6npjir2ZdlRUu/QwXDwGjhczncNgUKsnXMlBpshG4KcJtWTaDuUGeb4tjNqOCu4fi3PSVih4lUDnYb0NUJV7UO3VSGf4STMntWoWVnc63mhG76gsets46Oy+RRIUpsS4qzOJ6p3wt/hJQQha6dgxve1pgjNpztFwMgaz8qqZ5bjatV0q18bm5knR2AnUy0zhZPEKTeRrrZBxt4hr5jsLaG7q7PFD+1Mie9p+S3U4ZiecwqwHd8KAUiulIRjg+JtCbE+vKXS7vHJXj++WBj4rGQntdBBHCO/skDn4sZzUmwtxj5J135BCqIDC7gADdgHX2R3N693+cNlFM8gQGELrYSUP8I5C50eVBbAUE+GxuW04YZvrxybWqW2dA5ycrt7W1Ff1lqNbR3kC0D5Td2G/fIW69yTese/rUJ3q7OHdrW2l5MEoxLaxUCVnaNpdsU6UQ3Er2JbRQoN2nG2A1p7Pzz7UN3nWJ9pr5uBxMDMvkmg9a01F55dGPqnd5+OmY5LMlmZoxv48kEhBtkHG8idGEKmHJZs0GB0HbYFBtWcZxeVKMZMBBhsoToHaWQpNn1NQXD5iusmsqxH2VqTqRalDDPFZZgFqojnQaHKnoAshBn1p0PcHy3SDDrdnhqYTrwi63uCrT8FoqsEaPhTecOzqVxqULVTDmiKZQf5cu0wJwIixk5OV3q/Fs3AaQO/5+/7C97UiZeZ50PVwU/UkkqQDw4OK+ccw3hsMPQ2IIB1NtpLJ8GNp5KfZPSBYgbI+WTgx07w5ZrVMs7B5YkNoDa/l+85CCXIn4jr7meq1ppg4qQIXmHet8vtL2qc0LA+fqEoX7/RTp23T9KRoSXF76PkNUwk+P/XWE4B+XWfwaJZw2/SfasnB+si0AOksO1zVzEXNuwThvl5HlrqhBVd6d+H7gttN2FfcUzjaUk2NsLwkcHvR0IIa18PN7pMoRFsN55hX6/U2t3Wmz6MpJOhuGTkHV/002P2OyJcsSiwPdVZxGedwOhfc3jr7sC0TSQQKGUqijJdJJynZ2H/a2KIKEE6aLHA1kwMo5Riza6JW1jZueImyOGIFcxkvoyTAPsgyZ4FaSH8/1tMT+205Dl6fa1Jc5a8MKPgvazoqCqADIBMLeMmxT8Jxv4NuZOLyXdcp8b5i7+jH4RtSLNM/aMowHFohsFSPSnnhEs4l3piAbCji5ORnxxp22D7cfbxlmGpJlNXkYJBxdZTMQ66o0Hb+D2kDn7iU4M5CQCBtfgQ8mAsslEWdU8X2RGw/8qCTiyHIgsvnq8PqaI52KGfpMLqRhqbt2UZqZaF0/wrDDydkS+vPJzUqpDRDm+14bmsOuRaA0IHvyzcTHreh7QvllaGIyh1HkmRsLdelUc5MypPAsyGw6obuLDsfYwVh1wJ42NJKTYButRKsPIDMZ9oI3NwS0a0SWy8NS0h5NkupOF6Z8oSigvO7pW7H4bmaAKcNWdyVCKvhkPGxq8w07nazAOUii/7MACIPscYaGZXap0AmbYlV9HRiSQMsLktENmFQatjWfEB0E+Ktlqa/yaurstAsEqsh9bFXhFGs/Na0eD+EPc46SNzrOcOQGVpxR8tVfcvSnac7IKNWGVOT+oNkbQCpeDT64cts0R1X5Xp8qAVnFORsnBBnPHyQfs3ZrPfGMSlDZqU6/bzmcdJQxLp0JDMcl1fvs2RhRYXaTTPxw0y8Vosdz83TuF3vYLhMyWNyhwPWDeXC6haYp1ZP0uo+tX4M13vrCgx005/m+lNSSqlBO9ihM3oeWUu7R1LvSjy9r70rRwsu7cL3d40G10Rhu/tn+kiOIHpxdgkbf0oCQffInWQ2G/4/Hd/QtnCwf4ZAe47kVk4ZH85Gl2E7LZ8P0EsBkM6fnw4mxW5z+626uxPwjb/YsrIxft5f+5NCVGvPaKt+x4XXCkBr/n+tQKf7bXvyP72/bcFWP/MtLIC888sfJXsAQPyWXlQBZr1rT1b4Nd84HxjXGsFMFJrrNOlzXKP0s/uLlGRz92sXA+qfqEUN2J1Ze53azD6dnLOAX5fWJW+OIZ32MoixzLF0FTqmh976cL0+E7ixVXsEqM0ptdkHumSNJuES6R0dc5d6voXAWN/9/Jn11xui1lXSqFQzwzntHOczQ+neR8vZ5safSqMNXEdEpL4rFQPw/ZuMxJ4Utn/CN4C6RHDtppgfiG9pQFBNEb0y5hKrgqLeyaD+3z7U60HF9iClTG/c0w+YxgEBeSE13VqorrQjPFfl72+iCqiVb7DXhmhJTKKoxohaKfPZGqfKzjij/qzyDCJPtv+B5xrn9m3fWmcRZSvgV15xjwZX3HQ+8csXgNzDSsKMKdSZAWWwEsJmjlKbI2U2NcYdPvVNN5PGTtB4cBRQrNhLvpKrtU60f+vANYibNPl2G+rVXn+BD0++T+zAnlCrSsBe5DosMwyoXvX8opB8JSQtFY5HEACVX5cblKMvG/OY9KoGPc0uTa57y4DqwPWifgE7g9qqRMzn70hfQF4DlBuA1kTYIrcA4gkgZrsN/QDEAYDtAB1UIDlDtueS+oTG67xaOGLg7JTC68hV8vMg1OAA8lI8NYzyDZubEHOIyTwC1G30gOwqnbRbPgjgFwJlAN/Z4nKagAD8ZHHfZXkQoLoRABwADBaI4QBBBVNXoUJQdahK7KyrynQLqqowLxd1g4hg4o37u02qm6Dr9smb2a83q1uJEqOq0+4xdTv1vqZeotkP1cvs+qt6xdYCO3be5oJ8E+8OoDtefHDx7JUpWaIkAlDmWCxAETBkSl2WRpEsHRcHf57TGpQDu8lCgaPlLQ2CUALCX1kJ+M7KJJrnjAcXLBOJmAgzRkwEIlpWF0SAIkG6ZExc6Ivn9n0oLowkFo7YnJqJMQZdMuVgj4YOhJY75hvwABQEPnSEQBBtk8zIRpIFAgvMlcQnIbmvORdbfll4GIxzCvC4sJ12yeqD00bzSSwWLqQoIQu2GUsCQvHCoVjbFj4VaG0zpNUHscXL8qVJxpJAX0rAkFg/OOEJtlkInOmapUsT1Fd4TB8dJjabDWWvHQjgeHQCMBQljuGSAxcOs2PHuWJse2hVFLYtlFYoWGZlEuKXgaFDeQahZJn5FtK+G8vdthvm8r+9nF+ASBAEpARAKFGmYgNVG6nZ9F/qL22rbdRtt8POl0zDmhOsPcG6E6w/UQwxdHJJYyZMmYFZxPxlv7CVRWwmxO55HhwBCQX9qmkv5s6DJy/eMNbWYOHg+fLjL0CgIIQX7FKCd45kFFShaOjChIsQKUq0GLHiMEIZ6FSk2JQmL5WoorBPj65SAcrdU6i+NoBUgcraCJSasxZqwH69vvjsq8NOuuyiU5hYasSbl+CSK65asGjJK2zLrrnuH4nW1brtpluSvPFOmRTJUovDQRwH7Qy8ymoJCT63NstrYtn2ypEn15hDpCQvZkXw5m/9Z0KffqfdcTc2/R8G1t0K2gZSj+2xI3ZGV6G/VGiGVmgbMGjEqHOGDDtP7njpOGO6dENPRemHQRjG7oB2JO7by0uyX0xxqIQHku1kYZdneNsp+wWMAxARIgo76w6OFCDaiw4iQkSKKBEtOopOqlcJ74K9HdjSXo29O1GYmRDP4CfZpzvgu1F4JdzxTK6Vvg0f4OMxMNCluIm7D/Y8BvpbDFQp8C4LXtUPQVWr+z9/gZ9OV/eBffHY6svJwg1cxWpdGNA30AV9yGp+H4cumACQ2ASAp+4DqwxwrymiZzBrRM6gxsg/g8wgfIavg8TpSLsC6uvqh67OENlQvQfBn3g3dID7Nl1sA0e6+RrT5XNkzzJI5M6ylig4yxWi8MwgZ4PwvrgKAK24/f8rAAAA) format("woff2"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGZwABMAAAAA0YwAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcaCcWQkdERUYAAAHEAAAALQAAADIDCwH4R1BPUwAAAfQAAAYpAAAkrLbk8PlHU1VCAAAIIAAAAgoAAAYUTOV1mE9TLzIAAAosAAAAWQAAAGCAnZZAY21hcAAACogAAAGIAAAB4hcHc2ZjdnQgAAAMEAAAAEQAAABEEWET02ZwZ20AAAxUAAABsQAAAmVTtC+nZ2FzcAAADggAAAAIAAAACAAAABBnbHlmAAAOEAAAT1oAAJIA9oFPv2hlYWQAAF1sAAAAMwAAADYMX6XRaGhlYQAAXaAAAAAgAAAAJA7UBslobXR4AABdwAAAAkkAAAOqrd86ZmxvY2EAAGAMAAABzQAAAdhgtoRWbWF4cAAAYdwAAAAgAAAAIAIIATtuYW1lAABh/AAAAcYAAARETh6dlHBvc3QAAGPEAAAB8QAAAu6KLKjscHJlcAAAZbgAAACtAAABCg5QyrB3ZWJmAABmaAAAAAYAAAAG/MJWqAAAAAEAAAAAzD2izwAAAADJGsYyAAAAANLOrUB42mNgZGBg4ANiLQYQYGJgYWBkqAPieoZGIK+J4RmQ/ZzhFVgGJM8AAF/9BQQAAAB42sVZPWwjRRR+jpLoYrjjwvmA6AjOEeAuvhwkMQTIZfk5dFyQEAjTRkIU5wZ0wogCkQ5pJUTjAlGwVIit3dAY0WGQaLbFEgghF1C5dkFxwzdvZh17veud3fUm+zTemdmZefP+34ypQERFeow2qfDh+5/cpTM0jx4SguSXwgd3PpZ9pFr4NsfvMzS3/pscubZ/eUC3aQ8zLNEVPdEWddTaqLepjFpfdMSRcIWD3z6+O+If8SfeXTlCuJTpAa4Or+WKQ5Su6KDPRumJKjA5+N5HqxWY5aK3RJkfufZYu8cUdiLH94IzEmOc4JekDXQzhcKjHB4xCOsT/4luSG9/WBtkwsmcGl0D2tMDuFE7it6rMc7ucPeaMuGxlramzOhAy+VuvWipR81V0uM1vIBGO+KQ651QzkjwuObMSMJ9OrFHHBmOs2GlLdYCR+4wi277EoyjE3z3FB7N4UF2TkpLkF7BxMLSaS/2PAijV+0lmx2a2xmkNWCfnwc2VzR1rQmdcCYswoHN2BwFWnjboiEaQUvTsnA4RnVMrNX3tVJ2Q4/QBbc5dkV445B4ZsqTewNQ10bELKNWBy3Y4z2X5VsFRQeCd4F3H6PaGNsUZVGfok0xWqdHNdQorFUD52T85MgoNsArSxS5Xs3ZJ5TMfDj4cKgoBhekFFu8364JnRkyDF8PUnhbzdvBpJeAdP4Kfgv3T9Danh9tDHzY4Hi1ybX1b5etRvqlfnwcSM9dabWTWcKM5OL5us826YlagJct7q1zTUJDyQ96XUUuIb27xf7EgtY3oftS32sosLswq9KrdqJi+TQ/y9bcVlGN95Mh6zXlp/Jz0XtOG0en4/c1Kk1G4duX5CR2b03Q43GEVjl2X/lHPnU4WrIH0teyX/QgYRu/rpaNk4ybcbkG52hdn7eJM7/OGFVOmL3JU43OHbpKs/g04/oZFFPV1rrt+bnKlJOHl4pOdzTSJfUDKocdWmMpyG32DgccuSXUlMRFEdw9GsrT5h5XlITkurTctvqSyD7j6LT8rELmDcfZRlp/H5Nj2rnFqg7l/KiMPBCTXfjWcj7YRk4D/bGcpSW9te9Rc6LVHtcRpR354tTrFw3HbYAvViZMzoQ8NziHNtjBRFbTzpEjMzuh+l4JOiTPC7WpY9v69JlK3iHnsjr6WqYn4BnR6yQ5daf0CYNAviv9adPEJ+RzOs0JZ4OO9cCmKtUANiCetzXEz1rknViNmuZxW98PHcyAEXXTuxrgGwCrFXda5mhdn5mcZC5ndEub9Rb5OCPhM0PDPIfSt0UGGqUyOul/5M3WSK+FnKbGp3rGrDxEfAYSgrPGtwTeSdpSwVgPOXerZ4tWZqci6KrxfQWkUQ3mqtlyKZkhQYYGdwWQeqqTtczKJ6hwAUa8nZXHBZ09dfudm5/O0/clim6g1I7XPnU2mdk5ux+Ds6d315pNDGQ6+0Z0NpPTOWoPof9q6JsK7ELebdpRUSSJp0935k1325Kfzp8Azpn5ZPX/SfIMIE8vkuDpnSLu6inI3TkVSkvAW6BF+oN2dc8TqL2G91PMh23mxStjc17lnmuA0WeO5rEO0RLdx+0VOkfnubZID6KU6CI9jN5LtEovUZkuMxb/WacrVMF7k56mZ9Ai/O5wv/xyBa3n6QV6kfboBu3TTbJQG51fMaJ2D2U70PdsoD0/MWuRiw+yvqKhzO31EdjETjY1+M91TYMCQtnTYKFuMdXxp7NtwC6gqn+vohRogf5F/6Ie8yTXdlgCEqfk4y49N1xjV1N7HaCeBZQ1rLDE6/vvom6ptiz3Q5pnIc8HoB/L9DjP3dFrbDD/JVzQclD2swWo6LJJD0H+j0ADroFvW2Pzo2S3ONa6yJwLPmtjsDTc9ygsDUFq51kNy3rvo1AZwrFebY31VrAPBSus40voWY6VnZS71J11/bvKkhml84KGOXpUa1kRPC+A6+egkedhQQuwoBKdgf1cAtZVaEwR8r4KSirg6TLsZgvzq/QyOH2LbgPDG/QmrPgtehsj3qH3IIM7gBv0KWCfPgNY9Dl9AWv8EnCLvgK8Tl/TN5j9LX2H2d9Ti96lH+hHzP6JfsYZ9Rf6le7S7/Q3ffQ/sdUZzQAAAHjajZTPShxBEMa/6u7dGAkiWedPJipLCEFElpCTD6CwiIJkg+51YzAJ6EbUFZGERMjBJ/DsA4hP4APkmEPIIeSUS/48geSi1TWzk57Jjs5hu2eKX331dU/VggAM4yHaoI3ObhdDMBzB5aXsBAUNs77dWUO08fplBw/ebL/oYmqnt7WDBhNKKPuLeZ1k3cIopvAYs3iFLeyjyvHb/HSMc/ygIWrQMzqgE4kTncUa9EnePfpKFypSc6qrTtRn9VfX9Zxe1x/1mf6iL0xkZs1zc2ROzfe4qvkW75VqrFN5Ij40xhChnjis8ErwZK3J6peiwkIqKEW5WkEh5ZeiXK3xUr6KqXulqPs5KnZ6N2Gq6bev4T0+4JC//B2m3qKHPekGj/lA8sJcHmGeaeKaE1J7ENHKEErc2fesCknezWRrIDmOR8mpZhy27VD/bn6RMzRn1DEtOa76ojzns2yFEJNSl3jO4viqo+kl9ewNRJJN4r2vu5qj7Nkm/ztbO/kS/Zo+uySeQSTRptNlXsFtN9OpGOT5aUYh5os8u2yz0HMz9exf4zko4Tko8LySUbjes8uW8RxklKZzvaM4ajND7gVKe2ewZr9z8jkN/tn/42E+k+3nP6ywgGX8ln0JvzhjGT95XRJ+QXpYMV/ntYoRnkjNk+nzbNo9lEk9TJ8V30kgvMIm3klkHq0rJwFI+wAAeNpjYGKexBTBwMrAwjqL1ZiBgVEeQjNfZEhjWsXAwMTAysYMolgWMDC9D2B48JsBCnJziosZFBh4f7OwBf0LYmBgd2FKV2BgnA+SY77LGgakFBhYAOBQD+cAAAB42mNgYGBmgGAZBkYGELgD5DGC+SwMB4C0DoMCkMUDZPEy1DH8ZwxmrGA6xnRHgUtBREFKQU5BSUFNQV/BSiFeYY2ikuqf3yz//4PN4QXqW8AYBFXNoCCgIKEgA1VtCVfNCFTN+P/b/yf/D/8v/O/7j+Hv6wcnHhx+cODB/gd7Hux8sPHBigctDyzuH771ivUZ1IVEA0Y2BrgWRiaoP1EUMDCwsLKxc3BycfPw8vELCAoJi4iKiUtISknLyMrJKygqKauoqqlraGpp6+jq6RsYGhmbmJqZW1haWdvY2tk7ODo5u7i6uXt4enn7+Pr5BwQGBYeEhoVHREZFx8TGxSckJjG0d3T1TJk5f8nipcuXrVi1ZvXadRvWb9y0ZdvW7Tt37N2zbz9DcWpa1r3KRYU5T8uzGTpnM5QwMGRUgF2XW8uwcndTSj6InVd3P7m5bcbhI9eu375z4+YuhkNHGZ48fPT8BUPVrbsMrb0tfd0TJk7qnzadYerceXMYjh0vAmqqBmIARoqKjwAAA90FVgDTAJcAqgCwALoAvwDPAQoA1wDPANcA3wDwAPYBCgENALwA/ADHALQAwwDuAHgBBAA/AMkAtgCbAIQARAUReNpdUbtOW0EQ3Q0PA4HE2CA52hSzmZDGe6EFCcTVjWJkO4XlCGk3cpGLcQEfQIFEDdqvGaChpEibBiEXSHxCPiESM2uIojQ7O7NzzpkzS8qRqnfpa89T5ySQwt0GzTb9Tki1swD3pOvrjYy0gwdabGb0ynX7/gsGm9GUO2oA5T1vKQ8ZTTuBWrSn/tH8Cob7/B/zOxi0NNP01DoJ6SEE5ptxS4PvGc26yw/6gtXhYjAwpJim4i4/plL+tzTnasuwtZHRvIMzEfnJNEBTa20Emv7UIdXzcRRLkMumsTaYmLL+JBPBhcl0VVO1zPjawV2ys+hggyrNgQfYw1Z5DB4ODyYU0rckyiwNEfZiq8QIEZMcCjnl3Mn+pED5SBLGvElKO+OGtQbGkdfAoDZPs/88m01tbx3C+FkcwXe/GUs6+MiG2hgRYjtiKYAJREJGVfmGGs+9LAbkUvvPQJSA5fGPf50ItO7YRDyXtXUOMVYIen7b3PLLirtWuc6LQndvqmqo0inN+17OvscDnh4Lw0FjwZvP+/5Kgfo8LK40aA4EQ3o3ev+iteqIq7wXPrIn07+xWgAAAAABAAH//wAPeNrFfQl8FFWaeL2qvu/qM3fS6SRNCEmT7iSdJoSbiBzhCiEiIqcgyiWXiIiICBFF8ECIF6PIuKhsVacFT8RrlFHHUUdYx3Vcx3U1DuOwzqyjmBT/73uvutMJAZnZ/f3+YndXH6l677vv4nhuFMfx87XTOIHTcxUy4UKD43pNwZ/Dsk7774PjAg+HnCzgx1r8OK7X+TsHxwl+HhH9YrFf9I/iC5QiskdZpJ125slRmnc5OCW35Owp0qpt5oyclZvOxQ0cVyYLpo64iefKiGQLSdwJyRSWtc4OfEjmcLtFyxnKElYLV6Ypk6yhhIUeyXZSJlusorOd1xuEIl+Mk02C6JQssYGV0aqasNfj1hWWuPxCYMnUVdOmrZpqIrri59fVNTXVxZqatN7O8Rxdz1zBzx/QLuYsXCa3lIONcWWSI5Iwmzg9XM4XJlIWrknW2TvaTTpcidnC2eErcyhhYkc6h2yFxbjgFz6XFX6RwT7PCCV89EjOhq9NZlidEJN9GfDqiHEDK11VNRG6TjsJ8MXpb+Y2RMKXFDmdc8eQpoZIZQMczh6j+S7ccEml4+trl5BDgXBDQ5gdwh6CHKeJA0yzuXxuBhfPAphKnkhcj3sxR+JaAjA2WiMRWaPpkO154XCCI1laa5ks5sCHHHzo8oVhpwUhyXwC4ZsBa/YjfGHNcavTFYvR9UYjrgA8IgJ96AP0EXDhA78Klr+/7v2yk2sfW/Pemv3r3iv9aP3Jsk/WPnb9b9fuX/vRuzf8hszfQZbfQRYpe/Bxh7Jzh/IgmY8P+JwDShtzNqLZrCvm+nEhrpp7kIsHcSdFEVkQOqSB4XhQMJW1DwuWGMvidtybMyKXwze+cNxejt/YHUagoZqQZDkhlzo6pFKHXELK4oJ9QBj2XEz3FRd9A+GdVOyQI7DDfEeHHIXXUgtghcTk/IjolD1u2K8sBOEjLiaVi4eJxZM/IFwNVCbZnZIbSGwo8frECl11VU20OuLx+vQlQTFP63HbeL0nUF3kcsPXNkKGkKqS4Jgtd7xT1Th7VENZ9rev7//hsdbr9g2dsWz8qMLqq59avl95b9Xcy6dfRebMm3fV7FeevT+fbLf6SkoHX3Jl7cP/Lr78SvZD8WUFyj4xb+DgyUtHTLpjxVjTc8/5hI7ahiwy1Dijc5fjqpsb84CWtVzs7Ffao0DLZs4HtFAMUHyci2cADONFyGalmo54JsCNErns0XQkKvKLBCCDCji0G/EwYdcgwRJpIBK9SgqSxSE7SVlCx94BuefAuxL2rsQhl8E7PyOaSgClE0DZbhQysgFcclmJ6HwmMy8/UJRFebSiFODrz4nFZI8djnRcLJbGCIHCkqjbGwnXVFeVBAp1LhIxkqqaAvyqAL+hXxTqYi/u3nP06J7dLz58VeOkhQsnTVxQKVzd2nkfuf0FMuDoUeV3Lzw0f9/Chfvma9z3vPbaPTtfPrpr+orlLTNXXPfTLm3zmYMkSj8+9vKuy5Ytu2zmihVAe3UAOw3Arh8X4YZx13HxQoRbCcJtgLYjbkaQDdF0EGk4FQelto52QymIA7nKTAmtDnZus3TII+C1CjepC8diUp2YMJcMqPAi5dicclYREtaAQiCsopg0RHyGM9jywzXwLQJhiBAtqVZBYdPqvT6vrybq08GBvySYgk20JAjvXG7fEIFBqc5fNXli1ezfPbLrFU9BLDIxVj5i9JTqyyqk2bNW7FW+Lh//5O+O/fhf2+dev+rmfjOG7H1xVM240YEJgxtmkSX1iyddWpX91Mbbn7t/U1nj4LrSUK63ZdKC2Pa7J320Yd09wUk733732pvnbK+89rL5vLNlbVZ53Zj+9Q1XcgTlJmmicnMEk5qqyCQgolV5eQGZKdu6JWJvSdgt/NIlHgfXbFYW8Q7teqBvF0ckS0giJ2Q9XAekL5ykxuEEaPEOJzBj8/5dW6656qprtuz6iXxLPmuff1zZroSVO95aKMN5Asoi8hmcx0LPA+sVTshGOI+NnsdV43TwwajX6XHz+sC1Cxdeu+Xuxx+/W3nvTbKK/JasOj6/XfH//QclX8Y11Qk83wpwEEFixbUIB7sKB2dIsp+QtOGETVUTYdmFRAJ0367RWx3IDyhUg1FfMKKP+vQ+fdAXiOrr3n679phppfWV2Ntvx16xrjQdE95ddPXc9V9+uX7u1Yvmbfjyyw14Xe4N4bhmF8BiGidxIUkfkYmmAy4X5wjKQs4EUpJweEgEFIsALtMJiQ8njIxxNeG40YRfG/XwS5MRD02csUyFpqvaL4Ii9/jFgFhH1u8h65Ute/gl28leZeF2pYU8AWtYrJwmu4kB9h7h4vakJtdzHNs9CBCdk7NpytQX3D6IVdi/pGNamiFdHxxCokjfi6fGRsxaPH12eLrJKVY3rB80dX7zwueGTMxbVqUbA9erJ/fwpfx44NZC3LNM9B34IJImBGgtSwhOzgiX0SY34Kknp8g9zz2HeFp8toO0wlqNXGma1ZE8IJKJUS2YHfgw01OwFaIdsXha3SAwIprXDZrWtGbaNDgfd/Ykv0W7Edbi5XABuFveiZhXr+8hEUK+3Kdkl2qfONNCbY2ms19p2oBWXFyAG8vFHXjxTKEjrkPh4hdgFUWUpj2guzwOOReoxQz6qRhecz1ANTq7Q0ulqD8T3hGTmaOSwwmSI5wnuG1CYQXvdOfx4SF8VQVfaCNNwekbnvvDcxumB5MH7/pHX//o9aP97IUf9rs3D2+bPHnb4Td/99aR1smTW4+QPe88eeekSXc++c6Td0yceAeHsMuHxa8D+0IHOiWuQblIqLWmD0maE4DQDtkASxQ0VIUi6EkEqEafT1rfP/2ZcJzceeagJv9rjp6rCWyVUQCDHG68SjMWgADVSFlCR3uOXTDAmXNDko/ydtynR8L02YEw85B8LHZqPkk5oqz3gYTNQh2NTFsUCecRqoCBaKuHaKlw1De1EOs9Wz/dPunAO/fyV3YW7jp6eFGT/+6rPt+puWvxiitf2zzzyEvtyz58cem9bdcun1254Nr9sMZKwFMU1jiAu5KL98c1amCNWbhGt9CRsBn7Z4HWtCHCyoHzTshBe4cUdEi5BSdEWYRjMSTnAlQqcMFGAAvwZBBsKMkmSoUxye2Me325sRg1I/IIVXf+Qn11SvEhQ0TCGrqZPMHj1gQKiyo3jXhnyW33K+/f7s7csnHvA+uO77lhauej/0FsVdMXRquunV2vfNVxSPnbGw9NuGzF7Ff4k/yMGTMX7Llv7upfHRy+YnylSVsxceM46Q83Ah3GAAeLAZ8msMFbuLgRMcqj6OLMRt4KogGMQrCrdGFqkBtPSJawbIBtCeG4gcoJgw5EhtFApQeKDDtu1MxR/Eu8KFkRI9UEJIgnAJQAzkCMryRjDx/+izKb7CPVrwizO+MfKm+T6g/5tYwuVgLM18KacrhVXDybsiXA3IowdwDM3cZsK8DcbeygxAEGHsA5LlpwCSIQhyQ6ZB0QYQaAHehEFsEIAS4GmOvEdsHozqZ8I2Qzk84othOzJQO1stspicye64Y+FXuIAiQoTaBgZetdf7yp7b4NhzYcFDZ2La/aP2vV6zcqn32lHHl+/6O3X7Vsy9pKvvNDZXXVyKve2fphZ4rXNwINFYAVtkLdURB2pMEdmWBHrvJsDezIhTui1hZohg7JH5ZsDrm/uhM0p/rbgNdNGhfuQMoAqtehDVGOxmlGTHKJcc7mQNoyOSV9TNKIVLa6qpzADz59BQmAGPCAsYC74T1uLlBYIfjyNCkbq+k24j72l7blg265YumBJj786+uu2L/xUuXr/1h9dFNL8HtN5sCR8+tvuveRddMf4Z84TuqO3n+4fvBNb9+QbRl/Xeyag4tfU34Yuynxm9pQc/OQ4N0zr7+xheEzCjTmoDKjEPRiUmYgXaHcQIHBgVdJDQAmq4mfRIWPu75VzvAazeYPD/w0SbMZpGszwHEJwDEP4Dg0RRuFgmqS1eP5hlHw5QP48h3SQGRCsDwkXUgeSD+iAtQHhz6HJOK3g0C+DgrJIsjW4fDVoIFgo5rd2YX9mR9ZD/bZM5xO9PWvVi2zmmgFqa4awgMMBVRYVNAAaCtI0lyt4IM2jQtkb8osaz60ZeND03cdunLsnZvn1D1y85Z/veebHTs77vnu0evXPDZ0VktRzuiJQ8u80csmBIPjW6J3L1+5i8y68YUB/X5xw+V3NvXPjE1Zd+kN+0oHvHDjmqebpj69e/rixdPDUytzNYKrqOISflD5pQMydLrMskvLm+bNZb5s49kOzTrtEoD4QG6Zql+8SZqrAJrLL3EgzeUjzVVSoAUAFAEHOqhSaVg2Ac2FASIBQIyMbp+ULbY7vJp8ChevA9DljEn5ouSKSSVO2QR2vFQhMgFcRUkMwGMTAoXBKMq1IXw9SQdTtAK+0jWu//o+SlyV83a8vuove5YO2jxzxp3TBlT9evlN7978t0fWTv9FRFsyes24DfcIj9702w1jb0n8ZvWa30k3X7InUTd4wqaHmksnrJr77r1rNzSPrbt2zqB76d6pfhdOgX53AaV0a3grOr9O1PDuZGwBFLxkpy+yp5eed6iRg0BhUuM3r5o2bVCdqvf5/1zVjJ/j9ZTvyW64ngie1ohe1k/cgxfNwovm0Is6wz0tIXBZUbtf0BgSU0GMpFkUaaZmEa5oVfMm1TialLcsohsjuAfBwmLNzZT36rhnwTbcD7zHgRT2GImnTtjR5eZP8bPbyMEDyiFF2o8wqyP7heNCgsZ4sphFBSYkGFNadHQMIdmYsqQIPOAkndcJO8j+1layZft2rve1otVGAper47/p8go7nt1PJpEpB5TmNoqf7LMdwjrg43ywv+Ywz14OmFTNn4tc3D8kOU9IBWHZCm5UMeDI6pCzgBh1wKbgYspWp+hMCI7cQBAlYbEYN9t9GJiQcwOgYXWOfJSCgkqNSIzoRoESBXcAeFe1B1wIVepoZk/8r9ajf6yZcuWUmvLE2KK6hoa6onlXPrF677Q1TYDxaZp9sxcn7rxkzbhLa8eX1ZQMvmRhZPqQaGV4SGBY087OlaohSPc25uwK7RltNviN47kvuXg+YF8qiLTb87NtZfJYAGl9KFFLHWskQmtEHgWflYSlilBCo/rbE6gBWcU8hSqH7IMND7d0SMOZe21gXlMjsGlN1vNDDnz3Z85TZpLyK2xSwzGtXOD60Sb5j0kNjva8hnxXWfsl+ByH54LbC24P6ECFxKS8GNee52+4pAL+I8/k5ReoxxUV0rAsIpcNF51HrBp3dkVtXT3ld3ctSIFBdeCrjx0lOg9zBl+grEpURSLqF40TTRSAZYiyOYIZwe6LRgSdBzl+CF9dxfkLbSAVnKBywD0DS4Yvpm6sC3WTbsx/krUfvET6P9ywYsvI5gUGPvr49J1Pbv147eVbCzJeWaYJFReMGlaqvKkoKz9N3D5+NzE//qv20rf+eEQ58QT51YLm3UujnisbNj9H/naCrPnkkPLZoetfWzP08pGWCVe8dP+2P22dPHxl1/cZvoHhYOOdM34ktRNuT3yy4hfKj7tXxDYdJCXvXbbsAcJXjn+P4pHnOO0s0Fl6sIwGcHEOo09ChCquhM7AERCdOqRUc0i2UP1lAO41ATgioLz8gl9w+cEbzCRlfIZyekHXjgVPkFPf04CDTjlDPua3A6ftAr34PlzDxvnANpjHriLbQUpT/VgAUjrDRy+VgZfyUyltB+WVEZbsDupBgk8g5aAe0wJnFGLkMQfWYQCM+VCcmNFMgLdSgVPS4uJEP5MsqLV0gWI/U/3+6uTBLn7f4fda5y9t++AFpZ60zl22dJ6ylmycsXDhDGWTtvlXu298wiO+uuGx33y44LLJ1344t3HiPNWWP/uVtgH0TSZXxcW9HDPVqBMsm3HxWdSbscEqs6mBCPrjGcLpDS4381scTrDaC1zUSuEcHGoIH+8vLCppWnaMGHaTBcfejTx/zdvK34jl7Wufi7z7mvLwbuWHY7yDVBHTkUXKO4talikdyhSlY+ll+O4IYBDgq22h8WUXN0iFrikJXZeQ1AOo6iSTg0aRUcCgIpBdJozbaGMq0DROB69BeA0B5c8DnEjnB6ShvV15/gNc0s5/W/LDp8rftM2HlOPKdcqvn/5w0+9u+Q0xM9ggnmOwDjM3Ul2FMbkKcCYSWkZOWlyQhS7ICAtCn5y67EYzWNW8LhxWvXHmibPHLuGJrjH8wa5m/llt84fKwx8qWz7seU0jV8+u2ff1TH1cTw8mNB9W/d7uq6Wuxa7UFVfx/qW2CfCex63kUuiWskOIfskTQpsDtAeR8plZC+RqY5QLNm3clYEXdHlggwVIuyCb4mZtNgpvsG4NepToHqAU2ZYBH3lRnksGJ7gUklkEC5fKnnPIphqoWdShn8Q3rXiV6O8hV771Ruz5ZYx2Zh+qVq7mt16tfPH0r5QXXuUPPkTMz1ylfLFs8lWUfL4aW/nRhwq3evMh0qDCURuluBuqSgE9kwKSNpIQTBSSQjfmzABJPiyZHWjVAkzTYlIRjKGI6A0DLE/zb/7lL12AoK73+dCZg3xT11MpvBFgNJAO/jS8qVEF6l/jQ5s6467TKFTY3zrOfiWMgb+1otVjSfpN+mQ2RcciW9RBEyzM+9GL4KalXB44H+pDx7Krb156y2nlvS/WHl6xdYXwaOeMz79WaaqDwmJgL1hoIj0BQLdMbXpZMDIeiojEbwTZqMfN+0hp10f8VOX3SjU4el2r+e1d67tC/NDtynh2HeETuI42KXnpPhgcdEk4xAVKrYIWiEffDWAPnH2GtvmnDd18oMuFc1m4BvVcOmMkbdUsQmmBVVsceB4arMSIpB69Rl6DJIj7iAsGc0yVBrANwCIJEHEXmUJWktVkymll5lUK6IvODcLmMweF7ztN+FDpp5LyoXp9SZd29W72MzpkQb26GQMoRsAPjx4r0HkSkgYVkgSpCC7+Pf/CX77qAursHC8k4KrvdVYm/U3tceBJO9ijl3BxK8fEHbP9MwVmioI0dgA3OhyyF65nBLmHMSa062Ur3XWmCwNLnNGQFNCo5b0gBylvudzOSNiJsrCQb5LJ0F/fT7RHFi06ovx0/6+VV0b/8M7bZ868/c4P5D/IvWTk4WteUM4oHyhnXrjmMG89oXxNMk6cJD7lG2YzIV09QWEkcqPSpZUI0srAeMyAy3amwGUKI8QQT6j4aDBRRImt1SQlttehC/gzCSg2ptda3jv9379R9pAxV23efJUC4vLvyu6/Kzz//vWvXk9hlqAwc4LHNL23v1SAFw9QmLkAZi4Wj0OYFWE8DgAVtzk0KLaMGPBg7pFsscEHBSLA0GzsCUOPAwO8uiQYMexb0xuUR1YcWLvnGIPl4ulPHHhiVi943q988ubG7VumMIiWvtJ6bNPzSaAymGIe0A62xTSV8syM8mQfBq4cFKw0cJWRMiwc1LBwq2AF60V2Y2rGYkKCcNioiSP5xHRbwsbrgasD6ZA+/n3NFSuGkUbllPL+t90A//Zoy91zBpu6viJKEu4E81Sa1eALlHO/5+IDkvE1txoDJGAXS+IJORegnsv4MwgLCzHb99QjrxG0fW3gHkimY3KB+0cpcAzetJutJrB8LfgsFTja/QUBeFuIz3E4TjOEC2Nx+BUemWPcEZPZYi3wFwYq1P/IOZ9Q8zhXZNEtvdiucWcNQBck6JS9PgRSlgY8E46IPuqZuEXJmx7aq9BXV4G+YsEYsIvz9NRqLohtafzDltbW6My1t25ZOzNKPJ+Swa+3Tnhv2dUba2Zef+vm62fWDN3w3m3KL155duriZeMrRpUV+oP1k2+a/OR/Ho1PmHjFhH71QX9h6bCmTVOm714zEuEK+J9P7VewfHTpMRdJCKNDh+pAC2JUq0MxqhWMZXGdFg91GMXr9vZQ1MU0Zcq805rNH3740wbNZiZXQcaE4PwiF1U9Xp0qoyVTJMmpAgYKHXgylLBU7RsxMW+nkWHUNkm14+D8Bdyu7575l18+853yofKZ8gflAz5bqOt898ArrxwQIp1vggD5LRlIr520zXWoI+neOJ6a593hJE5H5SdchSodP08c5GH45+j6WvkI1MMhzRTUmgT0Aqcvo/phl6ozjWbQDxzNjWp0kUhKRxBwQwmLLOqdVEcgDdZ/8JfrqP8lgP/FH5NNrh+1kvnY869W/mU+/dxYIZtNBiBPm6w1wHeaYwIX57UmJK/DvKDRGk3mbuKC0wO/GSwsyQ5rj9Dlw5OFWImJZL1MsomBWJT1Zznle+XvZznYzBeaXHyABjjdCWyN/rd2BNXTJSrnGyI0qAs2C+pppp151CkaE5WXRnoJ+r+O55R8kk9mk1nEr/iBVz9XNimb+Bf5NsVEvu9a1DWC93V1JPHghusY0B7Q98CDkcbCUZuZUKvpKTYALfoeaAHS4omTrAMN6uw6DZZM12F+bOfnXcf5KJ5/BtDwDKoXKlTdrU9KZIEZr9RIlfUs2gySQ42gRKqJn4YRPTP457sahO+6RvPHXxOOffha5zDVLpihrCdnQN5T/mCmMTjiXCregS643smZNGgLJ7Q0T4ZJJRPL3qn8oRrHM8g+RSG8sl733b1nqu/hLiYnBGo8sI98uU+78UwLzUOuJ6/R9YCPwLYI6wFy5tT16E8A42LMiK7AkSAsdUdC+EZdmJAM0/hgVWAF+wOwKAUWN/s77dv3/miD6wT5g0IL5R2RS6VuKM/QXA0JmEmQjH2EjNn//V/5g/xTXU0M27Cns2fOZmtazx6CPfk4vBZWi9DlYZiIngHzLTrNXT+tmHIPwkCzkpzStsHvi+nviakjDRTJ9JxMBJElbhAk75L8Nm2b8jHqsElgzx4VvufywQ68gYv7kMJoyDeg6Yg7MK5m1oM70z/bge6MhqVggFMLzB0g9WncRF8CfpPXTPMvcgFSvBW1sk9s15odLBEQ8LHweX/qXmhp6NyMalxyOCUbC2fykbBPTQjU0OC5GKim0UxejWZWU4E+qX7B2qEfLNm46MDGln/5e/Ndq0acrH187pDrF9R/vHbmpTcVFd106cy1JDRl47iSjfdMm3fjffuCk++a3bVi8dBR/SfePG7inOrK3ZXVc3Dv20EvgqcFPk0Od4VqE1Hx5DYwMRvXIQAyDSwJArt2wC55MRxGkw63brSx9IcPbREdShTZzVHhK2WKkhFsSxZwR7MZYzWY4w4UlgQ9IlVWDgxc67efHHRg1iv/8z+vXPn4oKKdY2/eu/fmsTuLgFGVxiblP0+dVjqmjdtKSmvHHSZFRxpjjLcaAW/HAW8e9D1duGgbLFrA9RpwvV7mKcD6fIh/G9hPkgienRjndDR/IbBohauKw8RFCVWVXjVmxDWS/M9/2Lxjyq7bHn/8th3Tdtz698+Vz8npz0mxtHnV4V13P7t6s0xKWAz8K002hWEuwtCEMLQlYainEh7XlI1ryqNrEm0dmD2iMssHlGMEmOZjeYKI9reNwtDE4irZlFwEZzLHgsEutMspXSTJQqRk0fg/r808MPgkgvK1//ls703jdhaX3DXupr3k21Mkp6mR588c3DpuGvGd3vnsuFrSGht/JBnD/0pTRuFYwF2lQtKiAwmIq87RdSS8RhfG8L2aVHQIkC55qW1Mqd/CgkI+8CbiGgvWboHRItsduBGLi2VPwWQFkvA600L3XC7xUyKI+nA3nMuP0Xob37jx67v+nZi7NNZfbh33QGTupb+9/nPlk8/4ct4/bEnDiGuGF5PTO/68XXn/VGT1A7HInQ1jMZNTcdmkgaGJlzHaAP7lvwR7z4PVaW7ECM14m2FbBGOl9ggoCUBCmJKJG6sUZBfwsy0cd7lptEAES8XtwkM3WiqUhMygNSlJY7AL7ZYILZ5htJNLWOox+7En72qb2lQxatilb731b4L/xegjR5q3lDVNib7Y+ZngV2GuLNNkAswLQOas4eJ5CPMiJBeSJJcyQ4dkD8keXUreFALQC9UAdVClGpQ3hanUSZbYLtg9eVTeYLETpk7yaOqkyCllx6QySkz6HsRUDeYR5k9KglFvd/6Edzq6Kavxb6/O2j/45OA5W29v3Pxay/yl79TOmx6pe3zWq3/7bM9GYFRg2Y3kzJ+I2NTY2tm88BfzhmWOmPzgxpy6ay9dO74FLIqblD/+a2MtWV47AXCzHSQ22BOcC71GajeYImmyxm5IRcwQI3wYHSEzLd6hQTPZ7KL6lwO9L/aULV4QmCJNhenF7Sdrn1/yyL6TC+dO2Npf26xwI2bta+saxS9bcvmE2q5GwMEKIJT12tm0LnS0yrc0N2AwdcTNRA1ngDOmEzvw0W7VEQNdBpoEVjONccho1oPbSC0pp5rVCRQKsKIVE2tqJ0yorak+qdm/tLFxaeNPB4VPOwOI/7OVyjJ6bRuXwTVxcSf1l0wM/2g6CYj2TBZMMaPb3p5v9NjKZIcI3hNQBawI6cCoQ9RTj6BXqEWIpodaSrjUyt4bNmTciIknf7lvylxiUleoHN4XbWrSeH/65hdHCnQeuljGR4irUmrjhXvGYqh0SEVjzN3RGE3f0ZjtJ8kzxKTMJ/uV75T3b9c2dx4knyrDur4ge3Yo3yevReaePyYF8MZHd0xq+8numBT8rS4f+MnPLVJtOEcmxl+ISlWSJSLnAkd5gOEL6fn8jLb8jKEy4V2mQxbhEBVcAF6z/JTMVC1G63zBiMhN352HJR96kx4cqCRYfOSqa1qzQs8tuv2ekxOnjryp6N8eG7GhWPh0a+2iudPGLtl9X1c1v2XqlROrusbzW+ITa4Au6V4EBfbSkz/IP84fJI0/PH3wx7PXPvzoyYWzG7f1gxWNmLW/rWsMv3jplZQ9VL0wBtYhgl4bpcZ3PCCjtL20mRPkktMhZ6jGACqyDCeaQFqky2wPHBrVokuaz05msvn0wsvGMZuOrWz707p1f2pbeWzTmM/aNm/Zu3fL5jZyevFLd07Z0XHXzj/tmHrn0WtuP/by9tajR6ntomzVNMP6UO9ezqWZLSlQZRnQ1k6usy/LJb+X5WJhlksWxTlRSwVU6CUtl8ykm62aLrW/vPL17/76GojIol2X3rR3700gEZWt2mZQtso3p/9b+XrqxC6F3x9tfPbunUcm1FL5PxbW7oa120BTXa7C1tlD/oPJBWJGTefKdoCxXbUYPKrsx+CQCeMmghXX7rQyiyGzbyEfEHUFPe2Fsd+9fuXjsZMnb1Bu+Otne266dBfK8Zv2kNOniRfMrTMHef5RkvHfdz/bGCVbayccUfmM3y/8DSRmZZJHU9A2Yo6fltOjcESBQGPAxNiTCj1J+qs7eEV26ai2AuHTXWNnfaQDJphFebka7Lp1AJtS7jM1a6vRdsSdeIkMLcva2k/I2ZYOKZvFaoosNF2LfvJp3at6FquxOCTjMTnX86NUcAzetJssRldZuxmfpVxHe15uAbzNx+c4HKfFavJjcfgVHpli3BFwmy25efkF3bGa3p/QWE22vTtW48ygQZkip+z2IGI0alV3hthO7J4i/M6ZLOlOBmy0qiGRDNjoWGly9bzaF2bOWjDi6ptvvnrEb5/54uEZFQ/NaJofabp2+bVNkd+/uvHTTQ/Gpo4dHKzKzeo3eNmEjYfuuL96xKjq/AEZ2b6BQ69t2Pr0JApT59mv+I2aU+AlzgZtQy08lVPAWaemkD7co3bTF5I81CpC9YNJG0+qcNNDC7I8aBVl0Po4J7PwOLTwqFUkRmgZFiM2H92I6Nx/8vjxcHlujTUyctuNt4BdROzKf7/YdaZquMf26LDN6/nBSF+Ae0X4lMk+5Iq4SIM+ycVi0Med1AcY9AGdIxnDskWVfVaBGvlgGyA32GJp8Z9oymwu2X7yqjkTtpWePDn4mSUP7yN+/sWuu5dePjbKH+4MbB552T7mh3aC7jPBWtLiP+R88R8hYkSvVvMlhlG+UpZ8LXzalc1/CdoegMpxWtyThXuDSam4AYM/EXq6BBE0On2Rrzv+Y+uO/9hS8Z9Xt38boHEeziFZjtngFxJ/7PnB750y4adaSaiQCW+Az2yyyctCQ69Vsi97hIa8NDT0fP1qdjrgLAM49pL2mFbSOyRDWtBomBGjRgak9oo0Ukf/PZJN8H904gOmz94/9eKp9z9T3v3jl1/+EXZdyb+Hj84A/1FXGaU92L/wLey/Z5yIXDBOhOc3koCRmMg1ysH/PtXxnXKQLPnuLKcopJN8rkhkkpKvaMgS5R6GK7CnEVciV8Yl0YTlJFYDjeez0L2VJc+BUGXeHEthzUb0hdT4rRlKkggMVD6xfmSNv7i8eqSnkuHypxXXL+BtxxwlA1cwmwOklbAMrpkWN9KrXpOgv7i40SzyjeIVDIqLfP8ov/HFh7vWP8/ObVDW807tEvAPlnFxA3VdNB1SVkj20fBRgqhFHOCO5Z4A/ky4WZwG/Bd3LnVaMo3IGPFc6s3kIrOii+bOVfmD8wG4XbngNBARvWKzU9baqZKuRrOxqqaOeFAUiW49WA1uL30LbFxVYqiKPr3mxhujE2bNmhC98cY1T0dJYuPEwWTDtoP3XjZaWbajX7+7lGWjZtzzy21k4+CJan7s7ElSTONUuak4laBGu1gfB7Pr0LfddW+yfpnGq/jyJBywA0e2AQAKaFCIdjt1w0FzAvabyGFwcIXjORrceU4GSCxNDh5qCowIIAqHHKwcxpRXBpKdNocGazAkYwNjxYVw8FHzuSpK91xGqqn1BILEQ4GiKyOBDdHxs2aNj27YsObpmqqqmqfXbPhuxiiy665+/XaQXaMvu/fgNmXz4IkAGmXTtl+iXhOaBDBZYS9XcnEHT3N0cp6mI25DOcB2IhWEVR87UcB2UuCQHaQsITIo4dodBWivUKPf5mOqJU+UzbgHBystdQ3RhvO0kbDLZ9OAoQUPoVrnzBtQP23x5IGBrOx+Oatz79N7yobMG1o/ozyYVV6wrFC4auSyNS1jSkpHTpo4spSsc065ZeuMWHTqnKlRpZX10SlbSavwHfWXpnFqoMXErJRzuuisyS46M+uiM/fsojOnd9EZWKyDlj2qBWjA/i61i85S/HxQmB+bNi02aFrTT7OEeGdjMm4REY5rtoBOy+XWckxRoFZTS3Rd6MBzSePEDF/ozDTxoDEyEytpF/psWKdJ0wZCVjiccKoEaQY7K58qOJFZhWYxwRltWbQsVudkIYAqZ3c3Fm2d8QSqS9DOwmasxj+9vO/VZTuGz50zYseyV/e9/KfPlsyatYScPk6ycu+7x3ff5ss8Xes9Mzbf53vuhRyS9c7qg7n86vwDKL/OfqmJaBfTepJ4Feyi3V5VbmP1vCaaszR0yOEqR8GxEMYNpP7YYFdlspZJWbS9TsoBOqpD/1GqDstuETbvTmZd2mvdOvBj880d8fxa/DA/B6TDYNh+LaizOF81KBaLyflu0flMVm5h0cAwRVK4CoAwMCYFRbmsOkYjCoVUlObXwq9FggVxGPRkFkAFn6zMSpk0gs/vCdCqIHRFk5ZBBc+Kz6urgmUHS/oHb//kxof/q/5o9k0TF+20+r1hIyn/s27isHDNsAPV9XMzZ895dfC1w2eUX37flOtuyeaL76ocfm1s7SsL161ZMfKy9fMDQ4YERlvuyvY33lTqGBvKP7ogN5A76YnqnVNr6yjNRLhlGknTAVZ3kFvJoWbIB+gVh2QNKop+ISnzhJwDlkWOg7IaOLZyKYqLTAAG7yYeH0V+oRjXOZwY5jI72/VGq51CKB/soHabw+1lxYLtRiv7tcbZzvE6lt92RX1o50V9IFXdanY2qA9iF1bUleYORTY9uOHAYxse3LS3pWXvpgdvOLB/055Ne5pbNj1029YHH9x620OaxRsfmjTpoU17b3ns8Vvu23j/pCl7N96/+dHHblE+2RSPb7r5XyUuPXfixTpmW1ruJOEQbRyQizEiOzTY9Jpwe+gHYA66MSUQpjagDStJZau9QzKE41YbUosVC3dM4bjNiu9sbnjnCFPvz2pL5l88PdNiHvYvgDUz+C+VjVHGkh1KBvlayTitZJMv4dHKsjNd19z+Yut337W+eLuau0/pDz0HNhXLnKDeE9QOweRRMjMBekSguuTee0v5rV3rBD8+03PFzs6gdaFh8GpvYN0lciWIYerOhPApAzksD8Odo0OS44TkCcsRC62Uj1CPQ6oPyxXwQWlYboB9RxxJ4/+wxuLKyCuuRLRXOONZ2QNouWgeZmuJJ3vQCFZRL2WhgokmjX/a01nSywPQIqewwmCXO0/jQxbBkm8Su7L26dlXLFd9gJsuO3niX79vbYk8OGn6QuYnXD49/p/P/jhULA1c0q//JQ0F9UP6Xz1N1zp42rhRwdr8/MyKugUj596aM+6Z9Y/fuam2fkx9v+q87NL6FY3NW0vHSrsOCKas0gKv12TKmzK4uLbEZ85qpjGrjzTz+ZXaJrDjPFyIw9ybK4IFyKhTaUOTN9mGhw2bFmyJsLPYO1haaf2WxSkpX9YQCY8eHY40kKcumX8J/K/5NDy6oTLSgB3I9BV7dGec7dB+pl0Gtp2fq+U2MzpO6stoKFHJjspCiWJ2lN9d5BqjqtTFilxdDgzsJCrYuwpag469aVjnOgiWm10hOo/YvJr84mB1lLJ0WaXoHGYxOl1Z2YWBINevqjq9FpX267ESMKcjjy8Ywjsq+AIbcTrSMZkSdTOOkoaXdxLdi8uXv6ic2fmy8vzRhgVPniL8qScXwKuinHpyzd/bn1tV1++WMXe8dXz7pZv71a15Ls4/dYw0vLT8JfiTu5QzR5fDWcgw/PGC7j/u+oSs+n5rrGbIWw+2/WZYTayV1gjz2/mHtSEuC2TdTRxaS3kMPsWhhMCOjKGETYVUPwqpbMZO4FijN6X1h5OWJRWD2WgsmS0g9zzY4mLLoEDKy4BP3d4YCj01WaGl8X4zmlO0PZ52W56T2upuvlUTW2O2XX77uKYRy6cMW/nEoDlTKh6esO3ybQ+NG1Q+xeebUh4bL8yet3TKrNrhLQsXZ0bnjlDmjGxaMb9qcKBgRl5RPeXtem6T8JQwk9MClXK0mTfAnuvJmLeVZ+HJQy5hB+Q7sljZrdxFVrBXVluu1qdrQVOo1enJ7kaNkdWFaZKWa1xDm8M1XKo0DDsYA2KdsGOnULq96zTZQs/5z/cQagCHOuEp2vOaAd5TiHtM7Xz1MvyZQglHEqeSP5II0jfx4iAurBhdgMKwFAolsnr0WFsZA1gdWHqDXdX4LhhONlbnsQ/gL/OoVZTQMxbB1iDaXG1yeIWAn+I+WAw6T291YVugFBKlvCSyWeVvr+ZqUZUBvkAw4BHZ52VkjJJY+9bKrmcSSv3vH2j7+OO2B37/3tvDZ80M3Na0qWVrYW1t4Vbh2We6Vr61NqEoibbf/77tgX/7N+Ua8l3TyDHj33zjDSJEgGGZn8FptvJfaXXUz+j2k1LuUiqDLAKY+a80WzduZPqlTGjh62kfu4drVGHsTvFIskXd2wt8aos6AgcDihiBk40CDST23WpeQ6GBwCh7YMnSBx9cuuSBDZMH1U2bVjdIM3vJQw8tWdrW9i9rpkxd1Yy9EiD8jmuOwl7s3HzVw2TdEpI5golo9O80tJhGYwObVksdHq0e6dRBVTdoRStj6G7tLfTQ3kC7WD4qsqA667robsLF7otkI25rK9/WSh5QFrQqzYTWtDQJs/j3dQ+DbTGBixvRh7EwiLmS8oWaEI4TyTZ+uKyDlgE5LMnYkREDrlZsKmvndA4vk65qJ4WOtlUWJQOtTbUHL98WP/Iq2di1i+iPtowYvd6vyxwxcvPaq99r3bLu+WcnDh0xpAzWNVaYxH8E6yrhZnNSUVIXdMs6XF+Gur4grXhwhNVpAlJ2WO5HsxhFybY9mfhj1C3My4/hOmVPNtYNO2nFlSupwwOsmbJbwqWVvxeWjG0q2zh84mWvjrdkDDk8c8zGmZPWvr7ziSVjx2yI37v0CeHDxeGaoTWr+NuEJVWxK+dtWjd/wnyL9urp19w6hutR35DL5Eef9Q1A09j+m/+ucgh+H8TSBoynKVs124VPwd6dyuYySCKQjoEmOmlAzRihEXIWZc5m+YRsWlZMjV+MMRuyWeWCWZQ8QNpaFPeerFgytqaG1lKZ8yCG2ILi9pPHx20rPRkqdbltAwa9WR5+oGV9CMPiXXe/PT7KH+4KhaKaw1a5cd5YhfUQRcGfC9AaqXEqBxqYODMIyQ5QoHgaJzOdUPW2ZHQkCAUClqgYadwMy2jUhn/MyYEyRmLGf4XR9+4m21ccXH63MJ8U/ebHT7XxM43CPOzVJleRVn4zZ0IZbQyhPcNsGnOPJm0Lk9FJju7u0iZ/g5dBMdanrawkhzkfSOxRHIiMpK41JGW1mthTrRJMP3Gy4GX0ZhDjxEQT6A7QtDYEssgyeUhiwWhE3y1Myi+9IjRqVP+cpmEravyldY03XzFytRKfVRcM1OcPPHirb+KQ8bOKYD1uYRZ5VLeL03F5nNpBnTSWezVRR2kTtVvZeaBVe4/S+S4/606QQw1gR/wAdgT2N0zkcB9WtiNnN5+7MVGKkxYon9MmB5XrqSFhTyVJqZBsJyCi1VpV3I8DM6apWRsNR9seeumlh9qyZx+cM+fgbGEiyXn9NeWPr5Eps1aunIWzM3rp+SitX2P/g55Xnn0bn+4mlyjP/RqPNiVVfJqqB93q5jhdNa1RMoHUz8DJJVhdBlYtKzA0RBJmr55YsVogYWZbFsNxL40ieK3gSOv0xMDQqTkBHlPSGRFobavkCyOK1ajcuVUF2G+RpcIfeDqGZZztBqPVyzofzTTjKOlEMDMykCCIWq3CkIRFVMXVhAbawbEKAgMi2u4UFt3ReR+vI5P+a/ny/d9+q2lhaOy0YK70xZW8RrFsfvHFzWQhwkCgMJivwsDP3cOqnyR9RFV+KUDY8nwACFWAtut8dN+F5+47OxWqAqcpni3iTrN9sNNAj51miwmD0Wxzs6YvtTIqT3xGYxaFbLQsZIKR9Z77NZK+FUP6xmfVPnn5NpkqibuJ/qXpIxrW+3vCgH9+xMhbVJVxBFRGfRnSwliAQ6d2LuiM/lw1eBmfqJOAIhHqDEr9IgkXMyXKaoIZQBKhSKKMkURlOF5ThvusKTeWJYo0+DW80B/bjPSdrdsb6aVtMP9cBbQSDSci7LOKcDxShaeLVAKtVEXwsKrMyDwUPxY29o9JVWJ7v9LyGgq+mjL4bEAsTWXFib829r9WWsZzKKxbjTkaQI3dfHkPNUbGC4u2d+7mDWTSlytW7P/zn/k9oNeG1Kzmt/BLqmpnzUW9No/qtS2Xdj3WFz3yXKWyTLhL+I7LBzws4OIBDN2VgouZG8JycgJOHopjt6NDcrPcn8VC+xotDrnASQPDAzBxUiA641qjiECwiAmTLzdQSmHlw/B3VkwqFeOcKZMGq3xVQzTVVcEonYCj1n/RJBHplvKVvXs2/2VVK+3lJLnYt9m8atqkPrs2p97VNntxQjMUfjIo1tQE/EZrinWnOT3ILdu5HX+W7o4/ewjjvpxMLGoiK9XxFyEBoVfXX/gdkr/339Na/3SnlY87HTyWEqRd09TXNQ19XPPcLkMzAXI4p9NwPbU30vsNyQLV9ki/rg1893Oua+++bjJBQwsWxLTrYhg4ENT33u6Gl19/o/XhvVekbVh7HK/7+ut008lrfwHX9nNF3I7e1y5MXhu9YpHxcV5IFfIEnSnDCWRS/NxPpXnCw7R1CXKhAY37QiqxEzwxZ9CcrscpawO0j4cNW5JFMJTihhw/RlPNeXBsx3xwOlSpoyQgL0aQ5Wivuqf3ZpuXLggOLS3q7ysOrV26oN/Q0kB/X8nAQPre37/5bn9FyD/20uRrpwFRD3KNweEgwMEFdnoBt7A3JNwpSIghKS8im4HZMlkOwsDmQ9hYtUSOnRX52QwY6SXuGEuZeGNSDvAa76GBLuIWmYzpsUXVXnHRtypL9djiJIz3YByoBXY1i4WCUpQcUUNCPyF1vZeKC6l70wcpXbtAYtx0XspGi1+NF+V2RzwKcKgHhjdolzStA0o4GJZxEp2bzWeTssSE1eZ0mRDHDhbfVPlDzgXNFbeYHT2xCvhLbjOY5v2ewzzvrX9q3bqn3EPLBtTXDygb2oOL2p7acOP05vXvlw0bVjZgyBAaf+vkOP142mvjxCw+ZpIlLtKzydPmsKj9NgmtwZLqv3SFJOsJMF5SLZjWZDafNX5iot9N/R4trRocWBkg3e2f8BCIX9QIYzSGrktoH+hznS2K7mEikq2phtBUxzH1DZX1tE83zG1L69OtwOBqqnszPxWw6x9KZKpIiaQ3cIIrhgk9xAgoSbmfTXQOM5m1Dq8vM7+wvIKK9OJ8kWYi+ovxnACGW6VMp+wrR55ziM6Enkv2/vbVxOnjtWkGdTDd0q4QztMS/IISz8vvXzdxE5jb/vJxl6MNnt1UtvWbf5nDH2zro0v4Y+s4L7XFs68cDLZ5Xmit9brET909aTGQkWbA6rif69p1XKhrF0vXjBwrU+vZvYuZ+rQO3s6X3iV5e1NoQ01x7lpG/m/X0msNaEykraHrkKo41EUw6d1jDc6fh4frQmtwnx8eLqpU0pdjPPrG66BQeq3n9depHmNrOkhnHPoxD32hVUmekJQfAYenQ8pK1Rr2vcR2ixGn+TlZWyYmUHCCExrKTiMoGLsnds7K+4yip+P2D6OZJB1NnmpAMdrQjefIOaF1kCltwKxbAN6YV+mnTtrS0qpLA520pWd9tthapdckZ+cJaIGAy38VWh2Xn0YKOhNN1mLyHLhX/Przn1PiWLtyz3OiP4PnvIsSxp7TDAPqafmzX8E5Q3BO9FNK1S4gAz2nmbYA4RgZzDiYwEAGtGjZ+FCBYRrDFJnMZCg8nURtcsXC2Rfh3DMofu1cJneZWqODc6Awx+FjOQ4nG8tqoQ2M7Tq7BTDH2WkrD84cdNAPPHY6d0C2JGtg2chJZwZbTbouxPxUCoOjkvrvo9OZTPulsHWGw2XqupHGA2dw2jtp/3U26nNa92hLTjTDpkuOWARwUTIiMqdjZJiDK0dEokL3heM2miK3ZYGHYaFhQQsGAtWWeQNr0lXbgQ0uNaVLxxN4HFwpEV2pAQVImM5n6JSCuLJKeVXR/IVY2ZiCv5JRyov8GImfdUg5/qbygXIrP0bZzgYWKKullMzRVoKdZuQCXNs5ncsAcdXtAmWtRh3oxLrubmYTqIgAU+EB2mOsDsDFjH6y0xmHMZlYp7PsDWBlahagRieoJSCprmfZlQXUY8oLoMVmRR9CxG7LHt3QfdtsyR5pz5K+bLX0zulzbTUqY2gvNdC3nU7UHdtnN3VBX93UfrWbut2qyWGF/xffUI2exAWaqltQT/xMZ7WwFLXH/6f1o1K5UFP4pVSW/MwO+EuYw9JzD4Xn2UOgrz0Upe0h/x/cg+rhXGAbB5huuqhtgMZK7uMLuo9q7t4+9iENSJle4VAiX+WrmvS94bzdasZJ1cwQK2XvSrv3jVOM+1WLzmesrsx8zYBzdi4XDwAeyhlYTetJwnAc6FdK+emCVNknh10AQBuogxToxXQ/B6+JffChRoXdQQq7IFfJLekLeuAehiJyvgnLbghAsCfY5EI77dMBmMnlcFjeDTAc/9yvEAnFlan5R5m1T91/AbCs7W0K/BxE5HMMBMKtA02/XVNNs6lGEjUSn5HojWQdEttcEiTBucrH9AleNpNSPDxJSvH9ydk9+Ap8gQzwP/tht5MnVdcbUAeHMNjmIYeVUume6aD9GOhtWwBwOJ0wE8W0B9PMJeIzetGtycFAoWRxykYD+p4BbDRw4fd5YruFy+6H3+rBUTfGuscTRiP6VNY+qA9EsVTLR0oQvl4K6iCF6NGHK+JXL1lPYfrOo5H2FQuXf7+Yj8y5/p0fPr76lrfPrOcP/hpA2VS/a47S8dj9CMwrGx6cQ2yPvL1FMNQo33RdPwTg+tF2VrvylRZtF5HzpOa29ehi9/bVxY4+t8CxHi6j2G53uT3q+N5zGtpRjvdqav8jmmZ9dbZrP2Z29j+9Juysb7c7XR4KfFFy970mavD3XBP5kMrjvlaliSft/9S6Mri6vtaV2de6stR1xe1Ojzo4/pwFJa3+XmsayKTr+ReFToCgrusg7YUJcjPPXZmUHZKKI7IHhAKWcPZLX6aTzSGSMhy0UzZgpwMQk4vHwgpaQmHXnW/pfZv9vXaiHc2KaVL83if6c3ozOZtB5gaYGzgLTpTu2WFvpSFrYzg1sAab7GWedsuc22YvYJAwrdVep7p53Q33wt1qfLB7HgvOJRuX1vGVsLLQoBVMWcHXPfooIzmyVObt4XC6tZqJ1iqdRGZQ+0z8yTYjNpuFDR07TRZt/81VC39zO85nWXgLGxfy1dpX1qw+ulr5ipxaM2f2OtaDoPlYu5ir5b5RV5WJyC7QqiqgCksFaWGRXGvukGpp1QROYsclYZGEAT410Foj2WvpwMA9bU254ZUO1poSdEjFx2SH50fJdaxddLhcZe1OfIYv2kuCxS4Qjg5XWkeKMxYvwUKLGHcYrAxXcUkw2YzS6z2bqlcLcMjByb9xTW4VBkQqnbIlFMPkopxZgIjDDnX8SZUYN3hzVQs3WbWBo/No9RmNiKQ1qCTHjHrE7d/+alF8eV3T1Lr6eWvWzqs/8dw2afLs8l9cPnM++6B28qTaJQ1X3Ch8/ss/jrilaej8IbUjSgIVWZllQ1dN2ipPadxdN7GxNliVn1M6+Npxg+cNrYnlRoctvaIzH3iN9uNr28CODHADuY3pHfnBHh35Fd0d+Wy0aBEAvkjtSe6vduTjcNEinKxktRWwmOVh7Mn3FwZYAYuafKr4p9ryaSz+4lrz5+PIgU8voj9f87zyceezqSb9dHgMAHhsvqgJBZXnnVAQ7jWhgEKjvGIginOvUwr9344qQLf+osYVbCD574Ct/rNDC/i/p/IL3XAp4SLcbelw6d8DLpXdcKmicAmacXg2g0u5CpdqHPrTg06OMDopKlFBEwDQ9FdBU/lPgSaZzrg4ipGOvvHG7Q+1zboImhHuUbMf59LNnQCfGNfA/S4dPvU94DMqCR9pYChRyvyCmlAioPoFl1CYDQKYDXJIsYITIrYmqD55jB0NUoE5jAGzfYDXZyhLlLPQ7Zh0ipN9MdE5zIigDZQOrB/Fxh+rUB3VN1Tl0oGAlwKUZTE5UAPHwQHlsdjPMmff6ZWLA/72PrMuwYvBxQPnZGOk7pEb4GMwvDQBXspAx4zgXkvHTKgHZmpSmAGzeFgEx9dKdWBejKQoGQCQLhiAMcQSMCkGqDgIMxxIXoc0BEd2xuC7WEgeAnpzlIoJgKk0gMK3xNmeraXJUSkmtpsdIcwpSz6nXDc8hrcLkQcPQ4URUhFU889JyfTAVzr4ScqYOT8itiRrhJvSYN/ComTnx0GXauZ0bkqCXpjTHfdM4uBbKlOrueHcuxchVaVqoHfGHUNDiYEqd4xIl7QV4CfXMJao6Sl328OUJQazLweHEmHGHCN7MEdNBRxlawH0g8Uj5kD/0MCqasfFjI+RhwJbxSvKwz/PFj3ks7OvTNVFCewymr3yDCsbMHjwgLJhPy+5hUvPyWlRGaV7UfieqwAZNYp7mYsXYwSwf0TO03VgZYUda9S8Edmk75CGhRODsovtgIxBGiqLBCTvWrVMH5AwEJAwkBXoV4WpwMoOo2jCG+VkgiGGtfoDEdYWK51Q0i6Y7P2R3gc5ZWeQ3jsn7s0rVnNI/kJaul/M0kvZYoLzB0NY/y0PqqWNfPTuX7LFCT+3qzcgoISeBnevDxHh7DHnpCDI8FCDBU/1BNFQrA4+mfTeA4uPDL5j+bPbWp5Stj5b3K9l14x3/tYVtu7Z0LCzYt4lx+co360d/B+3TtyxYuTHG3/7SP8dExfyI8GCz6+bP2zw3PpCUt52cOjgXU1zAQnzZg5qjCof/Dmy+v5YZNeo8cdnLCuduPFg25RNl9oro3NxXMrACZfjHB1lLZ2jU85t4FLjc6ScUKKQEXswpJYb0zF5bKQOjh4tBmLPZFQcAsgWmzE7ZxBswOI5+f3LKNkW4pzgfOwaimcWYOwHFKns7k+N0XZO58JfXWAOj52cJztXwveez7P6pD+/jBXB+bEybuTIsuym8rd+6Dmy5xHHZDUXR+vk8kLr3SQP6JDOwAFbwsNlckWY4+k5BadA15HIYlNwspDeilNTcLLoFJxsdQpOSTLp5EWKeUZjcfkyMtU4RF/jcLIuOA6HFnpcaCROK9qUnReci6O5W/m465202Tjpey2AvV7zcxN/is8z8adEnfiDuwQrie5SjNsdgdg/OfYHbcWfH/2zh+RhUPf8A4B4DbUQ0/eZAz77db33GYB95rJ95mo6ki477jOX7jNP3WdpGk7zaIePLyMrhyEVtpvZx3ZzL7TdVE3LhTD7EYYlHmrbcEHcCtcwq68HfjXqvptg337QbjV4V7ueO+8HOy9kOy/UYB5eqorImWBahMC0iKbAUBhu99IMZQ5LtZQDIML2jvZAuNzAQFOLdSGYq8zEMrNysd3i0tCwW8ApDwRzTQpTcOjp3Qd7wajwgiTRo2yEAarbWOgbZAcbIpWjR4GhUJ0OtJWqpXAu8D5iZkVD131Jwlmaiomc3cpxZCWtudan7kCkJWl5UXPHeZKi65AnG0/icLmf7kzO++HWw9NV/9D5kgnR9dQxaj3JirpTp4Q1fghP2XDOHjlRkpYTNf9MTrScORiV6rlffz15duHsE3DuBtrr1SMnSs6XEzX/n+dEW5I50S9O2no1h/3UjMvUfJqWE6WzarRPcVkg0VazSnc5D3uBMZ4kBDJEDCIZUtIsx0ZbPDH55LExUZYD62s3GC1WpF+/eETQa22iKcPFSrskJ9pgeRiB5tg9H7Q4EyihN1gdrmR5CWivkqA2GK0goKuwx5MT8e43nDPV9dHYeezt9ZP/qpws/6/M2eLqG9ecLN9HrlFOffOF8tVne2/FkTe3kg8/It7nD8Q3XzNfHGQ+NLZl1qIxyjFl21+UE8RLpimHDimHKE3ROUHg37lAcz9wnklB2P+Qmyqy8fVQ46npQVI5OnXJQqiQ6repY4Xw9hhASWo1HNX05nK8M5jPXkRVvDplSM4tAjJz90PHTPb1h+PsAn8sdp7pQ0KfvlmPmUTzuz2wNeiB9aMe2DmTijTrz03kCCo9tNH4th87emgWJzM5vSgfSYHVZnhRsbHEDQ4EokE7NeyeIyasLq2HVSnnZ553jhEqanL+WUZ3oURQlPNMNNJ4QEFvSI016rH23LS195y8VNjX5KWAOnkpYdXm5dPkCIjagoufwUQV8HnmMD3K4jN9T2MiZ5K5nu61ZwAnTlPXnpNce2E3C2baaIYnX117iZrhYXf7ecYKRmSGlm7BSbtO0JA8zxZ6RFX6xMDHTNBtOg8K+G9VPZqGhtRe7qQzRaLcXnUvoeReqoG7CkOJbMZd/UIJj8pdtcw5t3W0O9E5T5QxdgL/PMw2255vDBtSfXZ5oUQ+460YZgLKMJ/q0RZSV4OTq0PqvuXsQuApZ0kZ8penHxxnYnF3X+R4gbhHn+BJpHHaklSsY+z5oPV9b4brWp0GN40KtyZKv6VcBCO4FHL+JOSCBrx1g1TJ0iUDwsmwXB6CLA8tDsyW5DloYh3hFTIWwYf94cP+ITlkZ8G6DCqNsa69v9hu1fqTQ5fKK9EgC/rPz67nhCMYVNIMjJ7wOZRURZUpkKxPmhU9QCO0qBqqq0GFCD8/qaQEro57U/hEsweOrJwXPF7JGsJJw8mbIHlCOIietsxpT2BPtQm5m3bWq32hXKoinU/eU6hO2Nf1yvDyipEjZw4bNnPkyIpyfsn27UobPRwuVM0cPnzmyCQtg4/n5fK4ErT56WQMRxItaDYw3OQghwbT52IgEizAoZjP9qkcWiQm9A5tFit28LtRn3tiKDDbLVwmjZcanLLelBaLwMQrQwBNu6pZV52LgT9IIf7Ixoo7F94BQH/yhsgdS7Z8Vkm2Nkzb3LZuzMwte6MM1JOiG+7+AwC7uX7zrn9fMYV8EjqqzK1+efuaKayeiM6PAvnj4nzclPNOkMo4zwSpzGTO1R2TrGK76PH66A4vOEwKpX/PgVJjUeCfO1VK62Lzhv/3a8QpV+2i2+NTc7Den1sjZmN7Db0azPyoc1YpnGKyPH2dWWgBnmed2edZZ04PWCYAlhlZLF8v/SxIVYnec8W7mUt0vhWzPC1bcxOtBy/F2uM+V42jjIMRHLgJTg4dKKduwY0RpSx7r720F1usIH8K7LTBpNjObg6WhQlnkd5VUyrAeyBKVqdc2I+2wcuBYOxn6abPrG7PPV+d9GlwQEJDAwicc3avaVb9mB51nXQelmr/9DERyxtiA20vYiIWpnT7nIplobndc2ZjaTam6AfnM6pzkXvMZ+T/j+Yz6lLzGcV/fD6j7j2FO9+ARkGFX5Oa75/XG4LnZvudJ3ql+GncAK2xdoOV4C3McBIvj64x+ncXBfk+CaRPXHya1FDJQRrnoqXj3PJfdg8Xw0ztYvDxirH7z5Ws1MdgON4jT509lqx+KhI6Eha7DyMHFtRVJbT2KdtBRzHivZX0rnCY3uLDHI7bC7Cy1O7E+zxY4eMghrqzccobnV3lyGXCwS7GuewC2iRjQUc1C70G0DD0zkusIsrrq07rRqDsUwTfpEZZNj1Jql+/9a+j0wqhW0b/9dbXlbfH/fTBnZ9UV/9+xwfkM7KbDE9cd/WbakH0G4tXHea/VCYp3+zcQuK33Zm0+fSjQE8WcQNBXz/CxQvQq8qJyP3o8Ni4RZ2YGNV10GO5wtCRqHQWWKx0hgyRBlNSLgbVWczqAtBGrwyjmY7Wn8PSIdfjHIVigEMBBvqdoqzPw1CJM27x5NDOX1HOyEQI9SsACGXSn2Tk0Tx+nCtG+w+z1fpu3TpEQPOmV5BZ19u61yYDTqhqu3ZmDLlyy4S7/7CmS2c9cNv4B6rmjn1/jfL9zjvOUrP/oZtvefCBzTc/JGTz5Xxg2NKG4YsxAoUq+IcB4yeH7vjbA5E1bTSU8v336Anc9dJLd+147vkhybCy2oPl1h3kDJwbrI5re1aW4K07AKwWE9Yj0/t2sRs5tNt1epC1tLo3RGutPfQDEMqMwIxqzJ0NuOZjchbOQEYx3GdBSp88lF6i8lFqBs3TyYr5tGqVzj5q4jjNSn4Mjbv0o/dBFyKsJV/Pptqxuy90320WQ9siC7owNyQZbWHnWsbvAh8jk5vBSY5Qwsi8CW93Z3UWPSuLs6PDZCFl6gQKFlZBt1SgoWWjA2/77MaAJO0nj+sxz4FX79Mh6NO97sub7jnDhOsxoeR/+Z1mE/3Od85clLRhKJpR9E/o73VLfv73uoHq75uFJrIJZJsD7x2DxfGSLSQbEVMihamF3R+VvWCRFoDQxnpoBVHSqLfhBW7SJ2dnlzRf3TI7Mt1k8VU3TImNmKWxLTwyZELe8ohmzHVT5tN7vgtTyG64pogzIWlBvt3UcTG3pned99b06j1YNZ/2uP0qXks5DSLNANeK9Lob7MVcMHreC4an0wuuV683MW9ZFVyP52YJTQJP9xbAeekUop6IZMfJMwhX2jfIivMtTnqjMyx8y3PSAnyALYb9OCeNnskab6wXfFM82uuTWYumz41MNxqyqkZPHjRiJlmP71uMhmz2vhsFl9bGpsCC098xHQc4ERzquutT66YtOvnJFSfvkqtjQ10yGMSKkxCTdRmxPpFU/HNoI+vh/RVXnw+NsZ5IZetVTgsOitcATsFFzGJLEUZcQQPpkwVp/9DKo//AylX8p1beJz3EelIH0v5WYuBn8B/Teag4JUIw4VwO9UW9CV1CS4d1qC/qzR+7u0K3tr66bdurreT0nG3b5sze1kp18uKzp7QrAR44fyIPKS+XzloVI9SCl3lLOMw+ogM72B0gcQSlls3Ltjs7kncby3JSJcLuv6xesjj9KDXWowlHTzaR75OvU2mb99R1dU1NdbGmplj36zTa2U3lGbeJn0RnUuC9eHTJAS0GTWo8VM9JVMkBVD3/1p/8W7whkCb153SuPhvTEe016CI13gLOEzn7lXaldgnY/Ju4eL/kfcstKIictDOoH1gqqHhxRmReOGHQ0w98EdmgYdPxB9B8RJajI55F5wll5RlBH4XjmqzksCtJH6a5ILwHmWwso4q3EA6LS0DxOLE32qZOko3gWMNAdaSGS/Zd0tENOo/bBy+qtcL7C7lgZBKvmXLNCLLmB7Xf8u4vonxpl6TR8JO6Pop+ca96M9YfldZh5GSrL5JR0/ofxEI7LXdvag3nRHytm/fQe7IS6xeMjwLCPcIMem8yN3e9evcloyUSSXBMyQrh5GgvnbEsbrCB6wH799DZLGyETN93LUPCAvWe1jmM005sTCdjqb8dAyIm9eZaoJJw9AwRcaQxWiQBQQyQ6MYY4Vs2b26JtTnatP7qauU6sgMeryFlKPVktbIdH2ymFTDB58LnwAnBtJnrqSm61N5Imh1MD1aKfhH/pDMf+Scbnr6j90LBisrHWOxHKoh03xIlk1bfm5h/LNv9ke67oxRdzN1RMFWAxlnAjJXN7fmBHBu4bSKYdiE5R2QNWD4XCiPssgrg/No8auHStnijl5q9mWLc4MtODhDt48YqXI+7a2Q/duiOa4aH8qP0Nit86aSaaGNjtKb6JN5x5dFEyT5v8o4rZHP63Td4Co+PKTwycW4shYY3EvfxF7pLTNbFwsHL7iZBjTNvcs/dt47xXejWMeTcfY06dz+dnyV7LTW4F91iupcyrpqL4b3AcT9yaU2E4Rd5HfYj+cPxEC1eVrHcbvcVR4t8dINx0RuktD/oYjfZn5RJGWG5FOttw/HS/vhdaRB+1r8UD/t7jbRRqAZgEIPfxIAmYmGgiXKgifKQHAaawKKc/imaKC+FoxxwcuRYDRxVhSjMqsB7NuYPCLPhcu2GvPJKlmvrE3r+i6Ka9JvzkA/3q8Aefunx4yf5somMiKpOnnPbHhUH0yb3RVOUx3RTVDyEuBeTWBgAWChP0lUaKmiODjAQifREwMD/YwTgMJQQEGNlD2APSAKbkaVsZNl72ZAX+weBS34WpA0/C0pGzv8PRkV+UgAAeNpjYGRgYGBiONqbHuAfz2/zlUGegwEELp1b6wCj/xv+y+CIYVdnYGTgAKoFAgBjKwxvAHjaY2BkYGB3+TuTgYFj33/D/+0cMQxAERTwCgCRdwaueNptk01oU0EUhU/m74UgQUIQIaJgi110IaGEEEIWotgki9BFyKKLLoK6CFj8CYII3YgUCUUeIgWhBBHBiLjMQkopRYqCFEFEuggiKkU0q1KCWniemfIwlj74uDNz5++eM0/8xDnwE8/gPhEHIju4LKOoq02MqY8o6gFy+hTykS7qIoMaGRGvkFeKYztoiEsouHgHUH1UZQwn1BqqahFp9Rg59RbX1Qb7Z5DleI3tip1vsXuEyA5S5izPq0Po0/B1E1X9Ar5aInPsL7P/Gr5IwJebOKwGHD8J33COXmM8zjN6e1Eb5lZ59hLvvso89/RyOKRLMPoohOpiWhwjvDPjiJxjrbeD35EfrKGEKfUELfkLFcaKaqIibiDFWiqqhVakj6uRfpBWGddumQ5a6i55wHybsY2yWOf6dWTEAhIuZ4JdE0VMDhCzbbmBGeoYpaa+1VPFOTfU3p5bwrj6hgl7VztHvkNOTAYfTA7TMo6i/I6CSiJvtZfbKIot1tHgGqvjKD0YRdnVYutYRNbp3XW1JmUB5+16cw1J8xJJL4uyHEfa6X4A3vNg13rhfBhCJIKH9OIe4xZZ1l+QCH3YD+910/livRjGekHP1B9qZHU/AM9gymnS/B96ME/9bzG+J0+d/qEP+znCNxbmh6EXzjPG6Aqq3gIq9k5iklr5gLwPeGP/oqjTozckvQe+Ms4yXmSOXoSoFerb4X+xjRpxb13OYoY05BX+Kz3M608c51q+kYLF7qvbmJCP+B4/07sLfHPE9JBC6i9ZuM9iAAAAeNpjYGDQgcMShmuMVoy3mCqYBZi9mPOYpzBfYBFi8WLJYJnAsoqVjVWHtY71HZsF2wJ2BXYX9lscERwTOO5xfOIU4dTgnMZVxbWGW4g7hnsB9y0ePp46nm08V3hZeC1443jn8d7gM+Ar4rvFr8d/S4BLwEMgT+CGII+gjWCW4CzBTYLPhFiEZIRshHYJSwjHCO8RURMpE/kiaiFaJnpKjEFMTqxF7IS4hHiZ+CUJFol1kkySHpI5km+k5KQipNqk3klzSRdIX5C+ICMh0yZrJLtKjk/ORO6CPI/8CgUlBSeFHIUuRSVFO8UOxRtKKko9SquUGZTtlFOU1yifURFTsVDZpWqnxqRWpLZG7YW6mvoqDQmNCRrPNKs0D2gxaflo7dJ6os2nbaM9RfuXTp3OPV0H3SV6Tnqn9N7o5+hvM2Ay8DPYY/DD0MWIxajHWMJ4hUmJqZnpL7M95nbmWyw0LJZYulnmWc6wPGYlZzXDWs26xfqRjYfNE9sC23V2SnYldifsleyX2b9wcHPY5ejk+MIpxKnK6RwOeMfpldMPZwFnDeck5xnOF1x0XFpcHrjyuCYAYZ3rItdFbhpuPW5r3E3cZ3nEeTIAABo5j3MAAAAAAQAAAOsATQAFAAAAAAACAAEAAgAWAAABAADqAAAAAHjarVK7SgNRED27G5VgCBFBJIVsJRF081AjpvKBFqIiRAzYJXGNwaxRN4n6D36CH2LhB/horAQ7aysra8+dvQkhIanksnvPnTlzZu7MBTCJb1gwQmEAF/wCbGCGpwCbiOFeYwuHeNA4hBR+NB5B3LA1HkXCyGk8hmOjpHGYnCeNx5E1PjSOIGtGNI6iZW5oHMO0+ajxBGLmu8bPmDK/NH5ByvzV+BVRa1bjN0SspQB/Wohba9hEHZe4wzWqqOAMDdhIoIw57nso0n5OlKfXI/MCvvznacvwnikswyFeR43L7lLx5eRyd7m3+D8h84C4jltRK5Kxz1NL0C5j8mR59JVorZHfzt+bPUf+YKUtWhv0Fjs6ua5qh1dg99VwJPX7tKjMSscRpcUepbbOQp/C4IxV6ZJCQb0nEtnueR2nQ2fgDPGpCTQ41xySXDeynI6236dU5u79c5TPXvj0NHkv1b02P4ltiVfzLrJD6o0khe/zVCXLlRwuvRV5Q6orrkQ4ks0jb1BXe7tf4LnETgYZbaRlfgV5jzZ2GBFMdUV8Gd4iI/8UVvWrSSMrkzklt0lNdVuFrvn5nbuoGVzRUqVd1Vz7A/7RrfIAAHjabdBHbFNBEMbx/yQuidN7L/QOfs92Ct1O8ui9dwJJbENIgoOB0BG9CoTEDUS7AKJXgYADIHoTRcCBM10cgCs4ecuNufz07WpnRksUbfXHSlf+V19AoiRaLERjwYoNOzHE4iCOeBJIJIlkUkgljXQyyCSLbHLIJY98CiikiGLa0Z4OdKQTnekSmdSN7vSgJ73oTR+caOi4cOOhhFLKKKcv/ejPAAYyiMF48VFBJVUYDGEowxjOCEYyitGMYSzjGM8EJjKJyUxhKtOYzgxmMovZzGEu1WLlKBvZxA3285HN7GYHBzjOMbGxnfdsYJ/YJYZdEstWbvNBHBzkBL/4yW+OcIoH3OM085jPHmp4RC33ecgzHvOEp3yijpc85wVn8PODvbzhFa8JRH7wG9tYQJCFLKKeBg7RyGKaCNFMmCUsZRmfWc4KWljJalZxlcOsZQ3rWM9XvnONs5zjOm95J3ESLwmSKEmSLCmSKmmSLhmSKVmSzXkucJkr3OEil7jLFk5KDje5JbmSx07JlwIplCIptvnrW5oCmoluDzcEnU5npanXqVTZp+59LqVHWd6qHnmo1JS60qV0Kz3KEmWpskz5r5/XVFN9Nc1RF/SHQ7U11c0B80g3TD2GpSocamwLHqOiVcNn7hFRV7qU7r89QqDBAAAAeNo9za0OwjAUBeB2Zd1G2R9ZAghCQVIkD4BgMzME1SY8BxYMhgQUD3KHIijebFyg1J3v5CTnQdsT0AupIdzohtKraSqu9BQyU0OxxXA0Y+BqpwkwWQJTa4hk+SSMCuKpr0NZ3qOVRYAIFxYcEcwsfAR/WXQQ/siii2DDHygIe9PDVtw81bBqj4w/r+LQEtckOIjPjikyWTpmyHTumCOziWMfmQ/+NFCoN6liSqMAAAAAAVao/MEAAA==) format("woff"),url("proximanova-sbold-webfont.ttf") format("truetype");font-weight:600;font-style:normal}@font-face{font-family:'ProximaNova';src:url("proximanova-thin-webfont.eot");src:url(data:application/font-woff2;charset=utf-8;base64,d09GMgABAAAAAEwsABMAAAAAz3wAAEu9AAIAxQAAAAAAAAAAAAAAAAAAAAAAAAAAP0ZGVE0cGjIbyDgcjBQGYACDYggqCYRlEQgKgqEEgoIYATYCJAOHKguDWAAEIAWIKAeFbgyCHT93ZWJmBhvnvCXM832Bu1UBpKiRMDrQuh303bbF4ZmBYOMAwz/NO/v/r4iG3H21DRBQVaBLQXW36bXK9D6ua1/qjntO3TOd6wlmIAAAEiABAgBwAHXmxARKvAGrFXIK2LoARNixwgXwAAA+AAAAAOD98vxoZBhUyizmo7iFZbtX6KEB+I0PIgBEEvCGa89h+odWAPD05EUQOKUPBQB+AVgAwALbhr1odLSXIFoDnb27/yChJnQA5FDFIkhwETIOADW0VVWhI9rW7B1gFBYG4eJZCGJFwbeFYvdH8dG1xnc0T8Y99jbZtFOxIpbgAA/YP/983bP7p5nIM32BJ7ICKxJLnH/cA/3XMqs6tuVMl8Ya+Zbt0Zo6azA5hl/++iNFLDqCDvCJOECc37eGzvEezN5OAOgnKeC6VpiqGhtbqyfsTIX5hefpsKYmLdjxTDZbHwE7OQZBnL3rJmkdF8FrfezkR7+jJ/OrAKSVDEV4/JoB2maYc1VGzZgYM5L0qDIJERMULEQwUMRIzJ4zOtbGOt2v46OGnOv7wUkJhoGsgOIa0Ly6Ib2Q73JRlndd+39W6yI/kRWoSAQqEoGIFPwjEoGOv9aiS69Vo+cINo4FuM7mbfZjrYXXSt3z9HHPrzvN12cQx5bK2W0pjCCgFpeGVjzicUNSsn8P/cu/3Dk4Ly7ABTAEhcD+valm+95frPSW5MVMBziGHsqteheNi5L7/y7ADQC1+xfgYZe8MwgFI1wAoARQAaSoY7iESzGAlGaO1EXKMRadpz+3rnxlJzedS1e9r6aV9EOmXw+gmQkIsbgBMTVA6p7WyKORVptdWn3K6495doI2BcdAU+AxA+gyIgffjBlAHds3shH0/M+Z9meAqm4SWLIHklNyMj/L5eUnRzmgHFGOcx1B03KaI+rODUmNkxGW3huhB2CNYCx6xXaQasNcu/14OC5LBZRJsBv2/kuy3R1YRLqrPKSIiIgEEQl+6a7r//ibdg/dnI61KV4sJEHiyNmv9u7H9OuR9DVlb/NbM7aGIkqZAdRrl+/9//RK/Xtkw0rhIue3QgAeTlt+HnCv87HfAM8f//ZbF28ODAZIWJBOOFKX4SgjPIM89wosMEaYhRsTkUHbVtdXgjZmiEu4dX3tsQurLJZ7SRvVZwksBj3uzkdAjABAG8rOees7xc47KtEQWrc4h9x+S09qm5aI/KwSrDSSMNuu/xt2qUnCFKybr0KcbnkbbU7n7mAWM7S5c1KF4dARPgFw4bUg2WjOeVWZ3cIA25pCEqJSab0rsHrZwTxZbcUbeUlU6lVVNU7Ask8TEw07Bc+RiUe8Je1WLG1DkMCtInb3Q1VUEQPvNuWlPPhHWDQpHlF2o5ZhAzsNI9dY9xPYiP5Z7zYNBTBJgrGvWLSwFVTPXXn7PJ8OO8vPPVuiCCxr40/g9sw6RUVgeqwD7GT7UvFS0E38rYThf/2VSn2FBl0qlbr0Hp5b4Sq9afg11lMOZEyp6vRC/2Mjkq0QTUVRLWOYaErbb/+10K0PGaDIst25ga0jyuAclxhCLdfQLuGLLZW210aZq/Kh2GBGrHo3lsC6wQ8ybpFgaQWiAMOogXi/Lk64EbvFlKrqUhN28KANQD0yEPF2UkWSKlqGsqEwYweIdtznPpYcmFvTthw45vu8jqAtR+jYNsceEDvrdzSQ9HATjqXH/mRdRkyjmWvWOsegQ1o4OLd0h2Aadwqs2XCOMMHdzkddyN88/uTcrcl2cwgyPstROSYWhuGkh9D2o96U2EPcccmFeomV3yiyjC9SwPwMVhuT53WzSrise9JX6Hi5UAMHs26yrn1egrUZDJYuHkMvSPFyXMIj9pxRMDyYOXkdqdvJJHUoqEVvUAV9WVveCT8g2bJ9w1hTlavoeZzux9ux7GPby8xr16gfSEcExh4f1fjq60fUmcfDj4dogEasLepq1rvRnIHt6d32nYURHNaa97vmgWKCgTo50wgT5Cewlogak0U3aegY9zpBziBVPAm2wklcVYhDHWa5jKlcdxxN3c+denmOJa7TM0SOkbuk6BlDdY1ysKTm1QySFVjg58ULK3u5kOxWG0Pp8f19QeJZDx0+LM109DygO8LSEdTmlSo5u1l4NsYCedScXvfIdV+fe6iCqFUk2QQFel7X753/aMzYjv6jv+CPwx22AQq8I7CDIGtRzG9GOG7xXqwPbxFAP2A0N31bMAOcmUdp53cXJPGHExYO0OgLHRkwOtqaMQ5TZngsWRMIJoIjJNXivTmQAEO4kLMFxnG38fPP1oGcD19+/AUIFC6Iv+9NHkQ93iRgJE7acKsvWFlrPt8FapZStO7tDamUhAi4ioemTyhAx/6QBnGATwkMIaLESFzrHXsY4UhfgbA9446D5JC7K0fTBXqywz1gfFHxIfZKxktSV1ZAN+50dOK+xDYrOkf6ej0G9BkxJMZNdOPodn9gwCycUOFTjMDYEf+qGwlT5sw443H1fQYDKJ4RweNsA/TV323mGWjAkJY6CHSQPgRx05ZAS0dKkakbWBIGMKVYHtBIB2vEpVBfwjhB2LiyhnMMGogJFEGFiRvThxhCzyxcJtjMdNr4G9YhZEOXPScGTXg8jMm5MeEplLlosWzFS2IvRSqJdEMRFaEuQLMuUGvPQUYYJ5hGF2XG8Y82yzwxFlgm0QqbZeiz0xC7HVLkiKMqXHNfFQQ0BnnFe4Y+iwKBQmNt2JNXANbb1MV5YLuztrASnPY2VNeB3PuOgsI1iPbYlRYuJ278lKjWLCg7rjbbHo9CG8kjK1pjqS0+YrN/eJxYn8p2cS0/xjpFpcq0dC7Mr8U5KqvyqN28V/ZHrYtfyS/jurF3IkaUW0tExQmxicoDDWRmBdpQABUEMTdNTUvOcxg0y8G3kIQZNIuS80ACJRekZCYOvtWA+GSSQSZTANcc1sR36X5nmrY+WrsGjRAaWV4urhBLnwcHiUZBzAjBZv+ZLJWYK8QsAIvIQqeBZyYIOGRkL7uxVzgYsN4hCY3mMWd3ezhjkx6MevA0qr+MjphA7Gz2ueFIo69AQ6w96yM4pFyuA0bJi/IKUhSBipfPI4AEjZjs4ypMiTnT1LYZ6TpmeJOuZqHETVkctIwbVN7gWgyKhWOOtwUgIYvB0SKInHPdYJS+GdCR8IwEM8JRaNR9eCSHpDjSZVLL41+hJUjzcumW7AVKmueoh6NHkASIDEUXRuEw1I3ucE4X7moJYRmOFYo5C9cKpULH0YnRMt83F/oVG6uaf54getD8+RnVrAcJu6ZPDsO6jvrv58FP6u+2/a+uDkCzn+Vk/BmBBjOSX09A1wD50+UAPbGA0DhQ6kbAR/Td+K5YDgBDXf7a+kAznf7nHc3p2Nz56uK22BqLsC12wK44AA/FG8W29n8m+/9/HOPY0mR8M+CW2BILVvpjKvn7y4vXnX9fj9Pfv5ytja2zW6e2Tm4tby1sTWz1bym2YE/PPnin9iy5lllHJSHOC6DYPTLDo7Txp0WPUMaFVNrYMHKxT9IsL8qqHk+atpvOoJ5fXF5d39zWd/cPj0/Pzerl/YePn5LVEEhXAIXGYHF4ApFEplBpbu4enl7edAaT5cP25fj5BwQGBXN5IaGgsYXFpbWNbd1dPX29/YPDQyOj42MTk9OzM3ML8yvLqydBCUXhwifyzjjRS1k0aHwTSAqwqRkuh+0doHVLOQIJCNjR+ZSfm3/87Lk7dx8+und/EXRmE+jFsd9evwGl3HoMyitTlJdUVlVX1DeA6lpam0FrW+JvXAC1QNMs8IO+GAUUkAEOISzo44EAJCBXDw7J3k9ARsA0kSSlKUhCo5IAE2pJOFJFsPLLvnUo8RUSmMotXQiS4VtESV0IJUvMUEQzSnGo0DK1JSZhaQrxnqN0ISwZnoaYEbcq7lZnlfw+O1T8rT4q+YyYsKUKEtOovIkL0spmywwC/UvEkfXYosKRxXjcoEF8AiRorf+mdi3D1q8tMzHG/q4uREeGOxigI45XmND28QwmLIcEAmkKTZEmD1/1/fhisZKvKTTLIJgF6s4shcvniqml6cnwpaXQ+vjhSrSkgxQYxzIxeaVYgQvz8Yk+jMGo0M/GGhyrectlNFjDsGIYwhwJCyFvRCmOhBXlYH/WcJTxg69ZisV8fE0jAoiRH48JZM+LFXfJN5Ix+BpjTQYrEjP5YoKUHM1iisYzGgZr4ncmrzMZEpc4F8JVAeYY48kTVzkTYDQXmvk6DOOC8DlT2QLCNGNFpplQyGi0CE5TBPEP1O7QTNYHYSgMF4ES57nAhzPRMSxbARoZCiYfE2Ai+D5AUOrbCMtQ9AIGfEFEL8IIxiS4gFgVCcaJNZeRmliGwGeqS3WArHfyp1i/vgPiNYizoP1JgN6rIOqnJ5j7DxQ2nWJp7FgegT2FCCeI7ktVyGEGfYy+Uj3NPFGUJPSMDDUzcAbzoBw5Fh0JvVwW2jTYnuSJbcHIcAoZtMul1jFDQ7aopCC/VMkWZdl5zZAl9bMHmzOlEbq4WyQQ5zXaCq0UEuIYhlwpl7DOjTyn84uE02VEex8vnBA+vhQhOpUfHwYt5402SvQKRYpoYULFYq/ZgYVUKy4YYh2zaxWpim3nOhsbL5ARCrXeuOhWil6nvtc+RKJDXStQwV7rMEPo0TPmfFlqIoRIusERk0g1O1RrUVIlCAmRhBRNdpfcqWAQfQAKSo6xWCRC+KDQSaCKMRRxFE1EP3KiNCH6ABRm4zGmciFCdEL0eSKODHupFXIBBSXHWDyROCl9yTUCQA3pofEkeeOQAyjMYIOYiYxLj06ILoOLEJ+QxnrM0WnOGC1R1MJhYhxCNkyjVDgFZamMjxw9hKMKk8Eg1ynra8ZWEawcXa2wAqr+69jP5AQteRWiRzECaIu9rW5qDB7SQdSJ5O2Dku+lKfc3G7PbrDdUrKRIUv62Ed6mNNIR6PUwAtQYVUv3dU3VOrGwXipmvzFC1S1qpwmARtZS1JspQJ1MJ7VctxOvzLg30k0d1VEdk3mLFTlE5a+9O/XOp2ovu8pzl1byT/WX+re/1t51m4MRBFEaxkgj2uvLO7VujGt8xwq75sC/TIIl/61EI+WndcNBkz91umjbdG2JZ085r+lKike5QCYfZvwhwUGymAYuOgHpdMDleyz9AFdTWYO6jkC/HdGASFUQXx6Zbws1jZg4cFIeYfTqqTQmC4BwtOEbVBkTyDGkFhisgQZ7l4Yv1WpI5E8Cw8b0NvR9zueKdySv8diMNm4PaCKqMIMEHHDnhVn8FQLZu35IurwDI0DfUjx5UCy46BwkuHpLlXeAaBtPcXTfP1fRvGZQCgtlK7x2zL6HzQd1xBfhKbujW+sJ296w6fY5Sy3AJh/xIjF51v6Ca4g2I8bOn6yijiSbGBSXVOsn7hpTRSoJiWhea3xhLlV1SUKUDbjVH6sE6+52XU7K8VlCx8C/NKq37YmFNgANtfpiTr+OS/z4UzJJZwfuz9Y6DjyqGwTNY6iyoIHHW9N4cKPgCHjFBPq6eqOwiiqchMsIB+dAeblBr7seGWlbi29tuWQLHNrKd3QnjcFrMHZMfs7RgUnra4GBKk+4wQQ68rIkrdU+V3K7aOgQEAS7oJevMAF/SnGjRH6kztGMGfvQb7RmFC5ZCsuY0+iH5Kx/1IGqQDXJYa5U7WiPtKVWONYcbhCVx6eKI3uiLR+7MXERFGB4vr91xMDovR9Bg/HnhMbZJkUPF62B9yzDGi4wyzetP7n8pJEKyemeCCYYGzfpsn4CKuZKphPcFYdPjp/mQ1bgIpLBqhtw+TKcOZtff4lyWioe+EjVlHUx0PNKFZDxA8J/t2KgOmmQdMazcWofNINdSkyuWIKoblG5abnd2+2UANS1tsEoTyAIvRZcPry0BKEctdojrSFesWeuuoygaV/gC2OiWIs6Y8aZttrDDS0r/W4efKvWDe6iDOMNp6N8fVvtVBSP4rSA2V+5gZhCIANZoiFVPQR18dLmJgaPkDVm1SWPq8jnspaZ3ETHaiuBFdnWel/CbFXsIKTUozndbTlOnwlDbcwi2bBMVF7okGIeR9imHcUXTC0dlsVcX80SPA5qXVT9uVQf6fkBhy+dgC86NlILzQ+d+rxjmszrMaj8ufX+IfGZiqKLDhLwamlUXypU2zRGPhYrVsqC9DTcmNtXlYewVMbpJRiaXnOWBj7B/D9on0SqVmuZVPxFER2z1NctdjL6Pldj6adM88LcrBiOWStiBylLT0GjOAbS9H6Dhqa+rSHt5JVXT+FujhN1mOLsYIOyHxCYEdZExpLYjwYo8JXwrNYxDX4x680OSUcXC8Td6wQP6CrbMRYE1XuxD5+72wCZsJbKi2qd34jKZYGlBHvAjYJ1S0NF9qoUPfTSiIb7VjWYtR3PmBGQLieMU3C5gEUV5vh7emJhLPXFN1DwDH6Jqe3LzP64tm5Vuo1/f/k4Z68221/V+qIEwItPoFpcP6jC1A/1/gZbgcSHBxxfVQO5dWSo1hBmWuo4yFj3AW+Dk9JNe5RWP9V0ZAGy75wqml8aGkYmLKaqc8OJ3aFxXXRR2G/ZgwBCcewAlf3QcjQkk3HRWFrTowKdZaMalaICgmYUVYC157tHXzPdh1GguEbPOoK70mdvEM7HDxfs3HpbT7qrRCJX2fOKCr3hoKdjnmdfKf4OKDQzf82ZXBdnAgoSyI5G3FV3luzXrL7kvgCJ7FdY+WFKYgZ8hjTXt3ETyrFSm46PfigcMLc5n85GDwkQoIOB++OwsJ7K5p7xg7ts8MxcEo4lXrj+HjTOYEMrLChuZTipYABK3gsfhWi9DvKBERZBsOPVg3WLuitNd5Uu7NWIdo/WXhJi0PE+q/7cY/oDtWCfxgxncn1XbznM9nErANLbz5j+e1gGqz6zka2NUj8zTyXcU67aoYbxw4oYhHgogvzw+MbDobdx8o0xRR8avXj4n+yFx+0KTPFHkomKDgAG1bpDoJhdURdCTXC5dqN0gy5Q8Cuj8lBPqVyYXnpuaLrsOsAlsiNsjonnQZrr/iZXJmFjZprNEIGQFpfgO9RTT6hm2uugyTIFgIp4Yhc6gVzbNRwX2zUxN+bfYq/WO7EcbN7K7O/2UsrB2H5OSIFek6rCNBGXM5do0VQa5HPVj+mNJpfEAw+zPJ8kJA0SI1QJOCrxkCkMk5HthmiSb15ghBbIkmY1OzeEl5SOAbuOzERIDhdimWOoaPbFkSTxxfE69IiU2p7FDDxzAm8BAY8TDumPG9H/yDR0LbiL4pWccgBijcB3tKoScILEJL0cgunsQErx2eXanVJqKXwipnkf3uOLijTgVJRnZFh6rGUHZI0vzyApZjjChyj86UvgB8RMfA4xXQ3iTQfg4yo2sjNI9JFN4BNjvugYdxU2h6FMCVwsXXMctpOUhd9PXt0G9DX8jF7jhmbYb2j7AclY82W1tjxRjhqj5boYcatyW3tpqHDshe8VdmryRwYuXq8cOgYXjyHBuDKLcWWmhuAnIphwmhk17qdh014JpxMO/caI4jdUJFC0Z6BT5Shj0L6vCPhTMz02iZOeFqolcBLvjJKLxQhfbuqFPodm87VF/kJfNuD2i5v+1xa1RTCzIy3s+eG7c+6cRBCcXZX77sOQ0bEoENsHx2w7nrfxxy8ft62015XBZLr6SbAkpTosW0mqbyHe9tNF84ntE02DARvD6jeamp+yJobqjs75xz42Xf2i9z0rn2D031ktN//Dwy+Lrv7i/8pZYhT5IGh8vwJ8kf80X/0vpvyUJ55xMS5LbYIYdyjEtJPg7K5Dd2j6tDykugO39JdB2Zhtatv9vXEpNG2uOcYcj7Qg6ARA7DQDXXkBtAYnruosbrpK5WWDcu6YI9hbwLf30sMegFaoHl6m084gL9V0qTvgQD/gZoE0Dx4VQNhGmAP/00O3XtX4SmHR2EpVxdhyUeH4Mq48rqRLGF3cGZ9Y1CmKLu7aVj8FUsd2g/SwOxyrxlf3kVtVMb68r1dMUec92sclFnXd+8LXc30wJmIXOtvTyzk4aV6RNzGSmVaWlWx5iPqXUOLuUDW3xqdGJ2ZEy3g8Tj7lDkbbXN/9ij458LG6TmZ7XrzIHStL6LryfdOLU+QRmktiIFUKxm2eONvUiiDJ8jwlZ9hYOsdSvNKaKOzevobpGNtQeQhzNEDI8w0pLA5XgBum3K+/Ka1Wr3guKgL9L9piXmjcYg6aZEx8S/6faPyToI56f3tezVbDv7wnzg29uKjY+Qm169slxYs8PuldhO789vA5QxDVqNZF3GILqmUNt8ZIuqQSEGU3oSok6euRDEzuO1FpRc6OrteAD4CJVRwjF0tDn36MYVi/poK0ZniStigq6feJ9K1CRkR6Fti0abZ3a7bZdJz7FCGsQvpG9rNFpbQlCxO3/dXgamwqh5cJOZ4OKZytm9Xsr3IL1B5BDgZkVHrOVnkSCgyu/xXJKrcCNXQBkBo7/I+7783kcF9KTGCjghuQnEwN9IyxCtINs/dCpvBJUlN05plQFxYbzX0WU04ssEhhutXygjjr8W0fXnaUtOb+F0yiXsqC+p+NyRvcGGmgo1PFlGJTOtcB68AVdMFjCviFF1urZaN+nkEW5ID7kvyYBc/kHgnaQuhKoDuRdcwcvfRYUJy7VRx+6PXdS42vskM8ygnmKrnsoquoqxXYClcAQLN6LpEIEfPhBS03b7QOXttsP1NXypt/C/SzCkZp4ewTUHkUqS8yhNwlEzW7+nRcTxIqBiINTlMWRIUDDGFWXzDA2QH1KvORBNV4BmUCY9rTfAdtHw+vKLdie9Lpzw9veMProuWD1MiILk9hLmnOYN0Nq4YRpaLT2YE5CO/AGpyvyDYNPb253Cd/VMNT7dEB2DZm5y1pZnk6Jvl0CjIt3E8OEPZj9sT68LygcXg2uVDGqDrm5Vl5TM6gFLLx0DieVywEs4dgLAcEfsg0SuvvZ06e+XkK2xYQVdxP4tc/6SmAWfFJBAaUbYI9EHqToSWC+FGA+MNJzmAOAaDY+hpIpsHEAyI7LwARjlJcaq6t32wWajAPz7ulECMHxy67KXMgftrPY6OmfAJPf3qEvT69wc/4j2tRUjWMTSqKV5B7h7R0axbFlavH51kjV6OfMPp550j7TVJyPtGqFoBoOAa9/ozmWDVqDwZpoABAOgC9XodKR+ki5mhVWIto7jE7BlJhTTn+wHDkymwOxj7G3SOIEIRyR9l72eoAP8VKnB/MNtgNH4DOfzc3ki0PEd1VWVU6E0YM3f/DSVemr5ekpx8OS4oif+/Kt35yxzKzpexr8eqp4F8l9yZ+jfQKiaLtRtAXxZElQ2O1Ivb5kqIpeoCgSGDgrl8KZPjp6UAwGFu9GSIC4nu0NnCo5uCe1uHag2kbF5P3lnc37DRuHFxfkO5Z7/5tznKgzyxlXJZVF5+wkocOImI0KVmJgoSNgrh7v6SmdWxP0x62e4P4r3rx2NCmJjPYehqkxqb6L832pFQMhhwU7Wtbl43cODuz7rpRP9BdltE/2bABnKpqaktPa+6sPMVX7PUSbp+d/at4ktHiHRtKwJYwI3MrqLM3+Gt56fCqs28rODNjS0gJoJ2+r1f2V/G2WWfiJ2x2k3Ll+qXg34tKgn8NLiqXL2C6sspf8xr66M9yIhwXwpsq486g41mwfncaBSi7fge+8ymAnC/Xjhl1ROaXbgx7+X8JH4d985abWfRMRKLJnIDEK/5hKomzyv4q2TYrIiBEyLvlWJQb3t7dji7B+CDERo28hJ6x+onlxofYh3xUs4hX6ugd28c+1rrLQ9b8Qxzv0vINDreta+KTPQ6vMwrIaxL1Een6EcV6VI2gYUzUOBzDhCV1yoPXPn2Ku279wweS4nlpM9py+cxpq+UWTLHxCj19Zh2XpbZQbLqtb3R4tCszXVhqt61neDS82HTR7tycv/u0Sxg0Mi+UN3iX1dVNzxoaL0ccnSc83xK5h5vX0vSktW2g6A29O79cl/zst0/PXzDZfj9qyDZhe3h95NVl4aurIz0erDYPsmdJXd3svOFsiPy/IZ+NZPbdhMLYTgSDe5QPocBiuPhUpyJwITjVhUuCxblFJ3ec8oo3bDplWzjx35zLHeleAaIqYNxhHFlFD6iNcNTm4gRhbr12wsafjTtVn1oBj4GrEkPYWAUxpZYW4f3y+d8bjZ4mHiipGXxQE8GVZ9juxsQdxj473A1T29NYxYVN0ST80JT+ILrQ2VeKpQ/bU9P5oebRh57nnZyXDjdyfuM/53M0G5xX2CrFicD47rG+nvtyhGXCVPcO97aPASDdj4TAfKnfepQKWBMVIPVv1JBdn/Fk+oADSC0z9GtVGkbThFzhULSWM4/mDh6IHXKRDBGJUoJ0vxp9ClChBVI7EUgGoywy7BsuT5Zey6vakrZmyUIbKHj6G5pvP13euHi8+iJKnld1ze8ELawR/+BDR5OCP+gOpf6yaNCDrxCPi/ocDzF19VuMFK1/E757/5W/IVkRQei9z+3o5+Ik42uqM9fUiPi81I7hk8IzlLy9U1qacIKOZ56De5bi/dPmU4Ov5mw80Ng5LapdwzNP0BNK75Q5p3x89024LlqKdPUz/bp4Iwf3utBPiiQbX/m46do1VSI5H2dHP2jHOC+VjPukfC6XfbhTnCOeYEoqEfORh9nK8oL1FXnKpZJakid9hpl8Z489UfUQwiAJLfHzUTh70jKc/FlYiVEST7mmF9odVZzTmOhI0T6LqacGBaXER21CN3uBXnbK+3ffbGawX4PA8wvPTp3K6XFl+J5Bex7HJrau9Q8NQxirEgnPAu7dhTX1GUEOSdBLGkpnXY0UzGk/hKRsCEMam+oHZoHZmhxpeug5EcRdlazjPGTvqK2z3/GAjjZIOvYx6jH+DJ6PpbIY/CCeHCVPy0yWCvdBXDuwnqR2dFPhx3m28tCQM/n19LKLYxXG+y8ef4xqCpiV8WKyxfs8rKlz8SEaNpuozZ9XGZPRNm7qQFKcPipydFeN7BUwn74bByeByZrc5LRxW4NNYt/dLCos6kXFb4+K398svnDcs0lP9bs2q5AHNrjzsp16AgOcunlZTBgon831u0oeS2af2guhrygHWcsLiLDFMFMeaIjH19RnrqkQyTl1jcaM//z+q7V1OKDMJkWEm6oVXzPxSEDMSZ5903Vrq7T9Ru6TqSaklw5+il1u2A7viPyWLAFA9JHY5Jvmm0tciKGkuKnapmfxdRurx8mhGTUJ/g4QMgccZ5qkE2fNgUEE+NSZjuGkIeqCkq5TuvaG7NWub39EeLm7kG95YgA/FjOC+wd9C3gWpRwR/1yEi9uOVS06jnc7JQhV236RlRLukrWZddpOdRTd3McUY+Wbdwn7n6cfqEl3iIvu/54edSj38clNZX+oOGTa1Pzd/sDLayZp74lfS0xT3Qi7AcbfF6Nza9S+CujKhpeDMxFu5O536Vgq1JwpSYQu1z7VSLKh1rtvBTtB2cBTQWquVyYqE8EMoTwtCQCnxyVbZGYoIhPI9ErNEWwBUB/KlAVIrR8VT6plQs5EMELJW52EpxRGCGIYzmWWK3iKgvg4AU4QFmpLkJrjlUlRqUnfHmbbhCjkUTGEQB87uaWc6OPE5l49dPP8dpW4CVHMpWEd3W1syKacI76m5DIwm3vl0HXP7QeHzcIKON9AWEvwdgCiVtPjz4yXDtYAFWLQbAaefg7uXoz3VWobH9BXPr2eIQb1AwtLB1s/J3ufb80R7m5sP7Twb5mtCWB2yN3jlwtdNxRBA4pFwg5MUPx5qW0wwZDSFx9de320jmAvhxF5kQEwYP9evCqgmImugSJj7aPsXbAp0ApSSHAzmmvoHGjo6t3F1MedwDYviwiewypfKgb7BrKSllbSpT09Z499kdkLs+E5+9TVlZG8eiY1ubNrsLsnLHtuKSLTFCHhLM7K5ClNxXdRIvZdmJWlyGPjnAW21TaU2Q4z4I/fNyRvyp8bfwV/2QbKTAOrLe6zKEAVqDwWP7pl4Ldtl3jGxezO9Eh7KwrVJtg4Ui+Pb7A51cWKBY2uVCTr5pjmx4SJRxvaE4eYjpgNB0IT1i+5URpsbYWlWgQbROmEPRusqAirINTMJc8ws/B4bt6phg5ynJaPXYd9ETjgtsDsC4679jzSJjrex9IU9yfbYcKm3TI7+X8UQa/tfltjWxPbVJMXvLl1wNbOb+jUCpG4fLJSrWr3skStsmIcq6UVtaqpJ4krK0TnVSFuLbmtXb6GFU5Yj41aj+dFfBkd/VI8WvG1eD3rIr4+z1z8/ffknCSnUFCGptY+uDvAcK0KEyjgZFoJJrEwTjEz+TuQw8/nF8UFl/oHlZBjvGkKzzCiVSKUHqUIF2zAPPyDSoOKE5E8WqQROW6sg2uda6w9xmcrInH9SlZ7u4Ac6x0b+7oRI5UpDir9JrbO3vLaB9Xc+Zl//0zL1uPj12XT//ydmf73r/NUy5Onri22pe2xmDyej+8d/3Yaw2YQKAFupoo1t6xzIef/m2pcYGYhM6ls64W+hmqpsCTLuYplBZkwZ5m4hefx8IRb8ZCQfF4IDQmBy9+osQVv1BD178HuUlZrVkUFKQflL/dleqQgQIqiahzHjLSHaIs/4mUPc5R6hGUlJQaygOsuOHX+9RxCGto7PInL8s/jRMEOwCZQoVl0lpvc148mcvwlUKUMxDYl8O2O0k40nD2N0X1i4eUQ0ZCdG1rr5pFABgeGg41EZ7HZXSzukWiJg+xE0oFBdL6zr+w/sZtg3RYEwWcxea88VBIKj165XI0HcZQh9+rkTRzMr8ZV/rQ2BproXoq2pHUsnItkQGwtr9jAX22iRgHnsjd2rhQyQIj3ZcPCjWDKdQ9HZqBOwLOsUj1108eV46dLykdPVVWOni4vGT8DqH0a150oK+7+VNwlS8S4ZpE7J6TgNdNMubY9/juttlIGyWO7Q3rYOq8gaYe9NTMhma+Rr+kujIclYZyn0vYusRw7X20vJ7sA183oWWFN2YQ01KarbxRqAtqU05I/HHWwAMtplLsxr1KuFph+ls0g2WDTGu+OPzAYvTJ7+EUhfZc3Ql83AiZLMjHCEC9BlFPrn5c/YpUEDgoHb+/7h9V1MO0KGL74o+/H3afDcU3KbWFZ/w+ebYzfawTBicQQKe+L05QkFdT+lQfEi1PfMOKlz80SSbP4z9Zim1GrSAZDSmck0ekIZH0UJB6DhLEDABXXH8APPg0QJLRX4u1D5sE8xcAJ62gTq3cOKh/xeWPrSuW+jUQYvVnDwEKQdJf+eU8uWMlyNZ5X9s+E/J9mFS3V5s6XQTFg4wj6rJRRzyYJHBgG3qZahm1utGBrxIIx/wSrVxrykEsxoQHxwgvVw1NOUD1/0kiKF6rfTjUa1PO1vFJdilE6Ln6J9iqQ1BJ2+Ty9JGiRtLNdVox2MephWZ0lON26EozHfj7e2ajsCFOK3559keE5GDsznMl2gFj4pTTr7a24ffyS/lmatDjh9/giyqqkHJPfq62arCa7oxsOcEOyslLnTv2YHVMpBlyTHjSuiEHXBz3AFaQYWMtyB9MNHDCWBoSlB5U6zJ7P2uflSl9PGiIkPbjInjzXL90XzbaYJuZ69W1DD34+AgfyXO6+pP3R7EA7MG7X4Xcd4Nz1Dq9DOCslzPDq7Xc+ezbjvsu9RKqBcuFWY6pqrpzM5aSlvy2NhtT56IBRYdf9x7MNlDz7G0yDuZPrNm5ePD1fkTGeGmZtRumgWFOsxswIljCim8Qi36jAXAInRrtDzEO9GWX2gQBlA1Uq+pLpm2UNeVxM3qLglQhN5PMxfATRzdazNiBQ3FAtN79racZqjGTTro6A2MThNNu6l5GMCHDbDTC1C2bXwo/+H6WQz+7P8i4cX0Zn0o7kxEij4BTZX0ZNKenvmtscK2mO+aOC/l2awUAivOlJ8UMDgVzMcAyPbOim8l9UlD5M7M4sju6mUOlvKgZ2+Am1IyDECHWiPGazQu5TDgnjkXKMG5iHjdWWrv8/sDqnlkRh9DESSm/XO5VY5d1oLhl+MIHf/WFLU1X7yavV5q60eW9hla3DU6SOFB7L8El3dickOTFZgMQwaSzlc4UTYYVor2p6pMoRP8WDXmMjmkdzyLplnZqtcXRq2PO0qYN1SvVmUhAJDITGDz9ylBttRso1H1VTNsui0hy+nuxYqn51fhDXnQC40wzUBXUlDQed+1hf+VCCfmSk3zPNVGondSMnnXJB2yyTAL1IORY++MHNnvjgrM0LjUcyBErxiS5hKFKOtxfyN75gzbfWo6za5aCQO4HRCBBrG1eGX0q7dZIjTvWxm+QpbVq8cCONNrM64Zo02jfwsqyxetKa+eyjxJCuL5dFFi7kC4pZWBPaUftbYfhYHZYEU07IgwlgiXr6ctKgKZ+rUt94k9TPHkNwCyOR3DaTOtmnLrkA5kbyic+vwb05L8zZfrCAWeAVVHzgB9UXu6ChrhOZoc6ZOBVzfbYoZdzn9+F/doDZXr1tfT8lu9LEUC7Vr3iNE+Ui5w6v6iUHUeiYrTcLOFdDjrjKzE/P5R6veYD/ZCzFQE2Acs/yj/LpY+bjXt04FCwm4Lx6zKfHAJLQjCafX9zvvnf0pMlVwsYDwrrxpVPqAWFlfeA5iZcZsWFEgp2HPl7ca8GkBgaS8+3chYlPjDIbHtEt0JI1MH/Ui8z1IxXaefMOloblYR4D6J2mSyVH/MjVYhWXu7/Pt3E5ZkL3VCpN5WPjPZvluBPkQI86AqAVwwfB3Oa2QwlUaiHhrEpglN1pVSFkFg3oF0duk0pVEJHzaoCMEZs4KnCcMY7UkCaX+lf42+OHgFQHIbiqK0eJc++CiHDGV6refZ+ZidJeqZTJkBZ+SP5ZQ5UDep4daxLGXtPO3wtjrz+B8Fic5TYPFRAH+Rhj9M3E27t72H+cbm4CtxPwltuoV4FNx1u4/+8thLn5Q2Tr8rlA2dvYBeqSWQ4vV5p0lpNDzqKcs/DERuk+JyeKQA9lZ+5un5O8Wdtnt6u4ouoMbyTwuCZarMFU74VYFlDcNH3PsIqvBdmIgjuMfeC2VvS1TbR1jB1NdLRNlG6tH6fUH5IwmEFN9uzNReQJgXnxlVGnvz8g/vunwUkaF4C3muCJjIal/58b+IdrzEjtMMpuCRMTQeFGBPbDHCYlLj5k5SXAdZYXJaTFVbKfed8PES4p/BaABaCzRdgkJ2T3ZT8tUds1IKxFqfb0HCbSRSBZnUbpqVSsFu5YgYHDWmIAxgzScOK9tdJsSapReC8AGzsKosPVCmBJw6ppHLsbmj1GTLwfV3grdAAKbL37ooIC3ek6nxuQ393f7MFCmoW4clsLeU/4Rli9a+GfRHqfLW40dmcFMIyrRk0sE+s2P6Z/Ri2RFwAdbfgM0HX7+Z8XDCzq/egU9X7Hcfij2pWP3TKefo7rz//44XVjeHBPnl+j9CPm4nV40y7Bz6fzbcv7cz0nwT6E5f3Hi2U9+C+1d5mFaDGpbEaRJ//GDy18N5r11Y+k2xg+N99/2EXXWzzXLKZ32+J221tU0Hi5RUebNnWkpAVuncU1AF3uzM+7GqTceNZ/1rLybDEpWBC6kzhud3L+TsEu7bUJbHgOGv7uqJ4U4iwCQLDGG7jBATovR2Q5yyllbteGo+UZrpl/VXE8XZ4PFgns7qpId5gSyZhsJSYn/Xq2+6zjGlg5mYZfLc8fbOlIcERG7xHe408lQxv+fLB+EljTq1xuX3/4qke/iwzpvgV+/bi1I4jx9O6rH/nmizRNt7FwLgBYIdYfL64wtKhwNRqQTnQZYAL3DRMBy8LiTmT3CfzrBpMZkq9iG+iLK2c01bRofcCSAiJaCQJhNQCGSqaFFpiUoBLjLCX2RgpPhNR4rqfUhSaSQ1na5oDGkatfAMB+U1hYjwxs6OHvGZDeokwbf4zAMh45iHuAuBfDE3eU9uwOChfHSg4pHwc1wGjmLhmM62gCS5TJBjhAgDnkOA80WQzN17sTh5wCwwmX5MBMqjJCRlpwtAFtQPvAQkOQ0Bm8GIcBmlqWsRDmIKlO5ZmaPJQcK3gTMTXD9lJIWc5aIzZ44ruM34YC5K2LutfTIxARgwtQ2pdl7VGz078qkkSJMEvMlSIp91MD8CKpRhGxukfb52zV4TIZOeP2yHSOCEpfKoQqIBDRnbuW7ymFUS9CNaZsim1oPKZ2mjmzNCojBD29TDNhZjA6K8m7x1oSnOkhOOgI63oCxKfd5RAKoCzMDNW63iIKnEZKGeXl6TZ1xc5x3qQLA5zm2CkTdOvKj8W2glI0zsO62RQnusbIGcA4MY9ogfOsik7SxuKaJl2fSxnMxu1gD/S2ivDMRQZr2QcQ86m8FQKB8R3YancOLQOz7JvzE0vsx3rUvUZIFBD+fSnznd3DP9nD7dIkMT8/eZ+/+Poqu5lfN1uFwLfbpx1AXpo03/LJIswZpnM4q7+vtk7oAy5ggRNVapObL0R+6fze7k2a/CLP+d47Tx6H2YQtpmlQHfOjhD7mZJMbIFnzviV4agk1MHBgcLQpU2xcK2VQGD/acQIj1Brskk9EsknpaChDAl7iFiZwhmyIzbnx+kwED1uISWdr+hD6ktu6SyMVAIwbdmhpfV5FDU1LWo+wmlzcjvz5ihGrgfsAWzLw5lbaqV5vwqMlDRbRlS+OFqpfhPo1fSyToRLomuGKGX0c4COGRi/waK9Wty50yPZNiqwouIY/+/W//1e/Ue3t87F/35XpZv8Y052+Y27+bs/q/OMRrV03jzUtrP9XpuzvP5Rw9r55F8qXwl9b3/B89PzFt7/80qu19pKev69TR+ibRmb9N18jfvmjr523Wt1/QBAJVs5vdRKlUEBatygFNQAwDoloRazltpHWcvkqNMudjjJkUyVXWdRDZUkb1bxPmHBK9Vgn1gLZS0k25fSxopaF02dVJuF8kNFpxDaEvF0LAbko/48NTBfW+jl0mYQ4UCrUri4FUJ86LpV9h2iSFRxQMNx0hg1lnFSFioFxRCPVianTEBAck8ZfkxitehxmSoXOGxlqpdFlpVAlzPSnqkIkF2l1qFp+lAqtB0KJ7Z5jFU36vSRfY0rmAyV9WgBHKSEP1NltpiExOkYbhKvDfJwBa4uyOFJJyKNX+QGghfU0lW4xMPGW9JhB6NAQEAEhXuodIEBtlW4AcjmuB9WiRWFC9t4KmKLyUppFryCykKpkm05oFe8NSW8yVjQqV+kfIgmNRjsaOaOoRxmMY953iiRvY+UgR4UoiZt9NWqCJNqqHItMkguIGikDz4SpaMBgWmK0oXluSAeLyGrIkoFIZ+iYJkgjseVEd2JipVcUhGKoWcllK3Fnw4qFmNkqHVERNlMWGMsYK8AJLr1mdjkL9engMxAjqRaYrarogRlD5KYY8/Dl6pU9yF1QLTxpc1/rMR1VjNfZjlYkpiVhEj+R74sgnw+ZLbRgWVAHBAcxNTgwPDiJLYQBdere3z+woGmavH73YdFsRl2sNcU8Oz8/q+2xTbRadkd/2ius9TAfLM/F68RPQsTyduimoIlTRqvB/XlPLVhFC9RI5bzF/uBqFkESDaAWzsYA4LA49FTyVWjEv1GQlJ4TQwcJBjuJ18LDPh6ARkgkE9vPZuMoqwdrV+Rng0sHrNhFA0EZCXb/hKXxjUSUkge2bvkqNSooIAjSRE66hqJn/xX6vAwHKLV7BKjR7ufln39V+TQ1Dp8JJmG32xNR/rzIl76/RM3On5E5uNgwbKFY7r9pLfcW+eAEhXcvFMV27293Iz/QvfCJl1XAo/thnK6tzFmBz9yR5OLiwhASbNSH8mzaDg7HzUAaIwCQaWtsC4ApXRCMQu3gdKHQFpI5CwXqRUgi0QwRXw0ERLwrbCecWWyYepGIMnMqxolRyACcSWmQBgRIckEwyIYFSMoCESzVv0jBWEbMHJJU9Z+e3YMosUau6n4jgbUo0ARKjDDHfxsaz4YggHsOXvdOjwB0PMtGLWc80BhJAODzpsFnujSWYmyqKN2UUIZdsn3fLXBzUkUDy60sD17MrVC9EBXcN4L3fL2gERBQeJ7x5RBhZkbUNApBVcR7QtvuGVYR0uUUKOZpj/Kxksyi4ugYCqTX+BBkba/ms5JRwnFLbRTGAOOlYJTBhGo715PDnmKtahvwvNIE98CBVaeB0rJkhYWmvLwsl4jIdYagTnrlCBKLkCeSPEVJ5SRE7Vpxkmsh1IUWsZNAUTubhNGzSTkwOKLCCnDktPBMlBjt5DPYHr/Q5rEnmbMF5rdGgbmTo1BzWPBBJGMHO7TWuwPblR7TLLmgQ2ZDwCqpMqBylsfijhan9zGw2lagnaIyfNh6hSXjDDQgTkucrK88ZDbPItIC1vYSTPMkrBqYACMtVj5cfN7cKlmHIiR+dkLQmZOKaSsfeWN5LRFCakcpuDk4sbM2f/88S0vHwPJGVvC8YZMdOgOWU4Uugumpc0JeLZoEOMnMW5Iw4NsVYkkDpUKp2jOl2C3Jr25DL7eBg1b2yc3UPdkMXUR+0nLjlZF4U8gqe86qFKI7NhzMloOP1UoLJmCGcMD6Es3IQI1SnzYN0iYTEuHuBeR4nJ3bRnci3L2EHGcFHGhUjuGL2ZRw0mA1MzNYy7AFIuZY7qyddZuqjFvBT+pzekAup/6pARQInEAL6iTZDTA5qTme6Y/tRL8jyLeIMu1MZxM+CdJXjUhP5vYV9OhjuTWLxwlTD2nFikBYyiCFVPEBz8bM0Nw9qHg2t7OVBro+M2raiAxXkJyofQ1hK0Q0QFzbURBNW4xyQZgcMOHNOgBHBjz4dnJgkU3CsHL4EX/v/v86+/n/v5srohO41XeD979cmACJqGW7YczzvtEjACZm6flme+V4IjGLSE1fXbwJEKNs7GSpG1tCH08Nk2SY/QjlYIbpShH2+ObxXkgz+EbN7/cMgFUViY9SUkCKYrNkMJumJJWEw8s15ikB6+QFiLQBAcdajbXcaPgQMqBgevlMOAl5f5J1mGKB5jbSUqrph5lGjqFpBs9TCsg5AVCtCb7JiCBIZ5NCYlxPcQYqJhMkKwl6pUzQGsuK1LxZMKsYT2M1P/T2bGdPRANEXZ6okd6XQi1os0ewT9FToUI1eITJKO5ft5TUA0A5rx9ShXeHzefPp2OwDqw2qr4zl8/T2Z+P3IwfgA9HCtVzWXqBSxT+KmL7ZAPLVrlTlE3KcJ9cUWG7b33obOLxdvgEWbSou6YnekWTrfPL91/n/N7qWE0LXO6raLv6KalGN0T/9NwPmO7bPB78RxhWInFeOaG1tBRQJ8IGCqoHqLGP5EAX2Kb+kPFvo6Cp1R3ugQWtZTLLJi3pjSQtfZMTFALt2PQCogpgeUc9FkJH/ksZ3r1ZFXhdBgGtrtxaWo+hkB4j/GKoGfCcMe5bgZnIUwp0Y7E9raOLDL/5CEpxJdxrJPXoCdCd2pckQKKUSLRHj8eXzVuPnlS5cva79npZu2fclEviD3RZ658sD+z6z+70H88U8fTKScSBw4mODhK/z+mxloRw+0JDIj7aYUTPpNCXYBq/shNXVm+k9inCvJN/70/8FRL0BJwMhWmHVoyRaVhEoq7erv/ZPRcS6khM/b5a6K7QIX0B3BZO9mtyuBk/vt/CCeve1p67Mho384uKTAVGEvokDFkICLOLTXepmbTZvU25oxfh7gn2uIIOUHTeDewzXZabSA6xM29t57QUKJ3/6PGeeLXy2feZdbl/U3/5Ne0/D/cd7xdGl3W4++LLqr1PJj528jVAvTh8DbjMOyoLKjOU6H18urDmZqcIlWYhqSZPGZZ5NXtrTD4NfpaSejKwMIB6ZWdCw68d47BTQyCFrYxCXqDjh+RByI4MWXAKi6xPh5PprYNdTEsurZYIIXxyZtK2bu7Z2VVadNHdTq1qK2YK2wXT9HU10LJ6Upyr+plsIeL10E49Fxs4bW/c233DtWSsW1EWdn8Wp6KaCeU2zS/KmfYLwWfbllS7+33H2wTz1ahwFFkifR9aNye+VFkmphsQM8/nFM4aha4qBKLy6T7ANcWUsLGgEErWYwOuhjwdIYaG3Rv5TvClb/Yjf5xOxNS0dHf7yV5pRqLjcJGA9tdAYGHA4bQVTmogMs3aYZgsJ3awvZjaOI+2kE5X+M8ZOFsSfe4SiVB1Qj3dc8oSk+o3e5/YFct77AysNruE5NR8M7mxAoZ/0lquU1TBTmAaKEzyirKV2q1wf7qaZNKJPSbWAcGEAn8ZyTalLkLmsH5JcYiEFWtlhDUlPcg9r0A+CODFOy1tWi7LZA7qoBd5A2VGW5GLR8M0Kry8gq+kAoSBVucAxmmJwyBiNjVvu/psDvQsL9XddLlAyeiI5Ey2QOlwNDDT/80BczQ/ykhdHFHkLXBbsRUTUVnFDuRlsupyuVMoZCvSUaSWlraj5dFFhRfVlKDIkcp2nFFOrL9oVoXmZ280P8hS1qdIkLMskizx1eZAWuTTowICriehdxWt3DiW5aRqfmD0uVmrgiHyaA+w6IlObSpq1fWJEXm0NrzcqjfNntaI3q32Zj55goNoAQ5Fs93YY7WqWH9fxdJvVgsChONO3z+cKHStnBzdq71ogfT9S+jowT+lAyaOC2kJcAK9auPiRe0R5tA3n0J7+uZt5NtmTyvQ0+3mvH950Qj0opHObUxhtr49H9jb3uYg8DXI3NIIBcwBQCm56VABU2ZQC+yhyNi0OBVffBT+D02X7wfmlMRoLbv16fltCrnA/C6FtN48pQy6rTEqB3ZN4fT+Hbj1EFdVgj+Yc8axHYL1ldOfGtLzr8QZvUB2WUUPJnHY7HRTtI+fGIG8RCnJnbz4Mky2TkoXdKKiYiIlmu0DJUPGx9DLnBN/IR6XIA+jrn6y5ghOPHXyLUCluPkoEgUtar84y5fgeDWQAzz8SmQKKJ+Fr8HEe5+9bxWVyyirETRJRaXXAyrOeLLBQ8fghSsnO1a3nUjhpc50EXYKe+RWvo4A8hblAFPr1m3DEqGntd9yEJ9slwZzwIQT3W1YIK5oiwt+J8ZmeTianF+tXmyhw32NL86um9Wbr8mZLZDX23NqbqYGoK5TmBgd202sU7yunt/0lxUbc6memlMUJ8UzG19PxBtFKAs+VIcCv0jBCuugKfCY+i8YVZgj8Q1LgKWAiWHcCFVl4xPBEeg6T1waTby0eeEmpDRMGplie2StccTSkHVRPwBzpXAi60GgTguX0rFxl4xK9NsTjUTz0Cy9sTEdJe6Ahnpc94b5CmUNVKaioQ20Q8HbMFcQgc92GWcWUQeefTUjw2MT5guTXlQRvU0JuIL927HZPPE2IXFRo5aIjtGT00y6Qm3XOFVnkIOdWSZ8svrYFbLGeeLNepjPaycsHN0KXY/PuhdpTSB2B3e4jg0zBnX4QOvP57+WPJiX1/eLsniuIpPPlHRLzNV5Mh2zfuhpblX/ptJFuVSHuE0XaMaY8Wb0YeExpO1a4N5fXFg+wJWXFXoDDE/3RAWjGp6EY93kCeISFW5xOf4NxdRq720tRHqTy8peIE0L7e3NWuwBANw1ejWBnE2Rpnks/d8as8R8rc74Tf+kEsehEnYwG8GomvBGCZAlx4wQJZu2u98MEk0YnxPjTdKpgx/chsqu1GtrjFO6Vw2gosHFpw4Y3PWdEzMaXjc+Ox9+HYqBZCAapZpx6sFO++nVcO94Xv674TnTM84Zy6Zg8YLUpZNrMCPIa1Ln3H+nqmEDa3Khye9yzK2zulybh8fbs9ry7Sl6vSqqb3Gz1m19N+ErUWn776Cb35KmTRfOyr35dO7OR4n6MqXA/WUUfZvVfJElOwgMd+02q27Z+iZc394fK6qUV++m9p9JedZa5trtr+xg43qrtdfJDQ/udYfdv+7haCLN+qAeloG/3x/neG+M7zY+cC4/7+SjYU1Lkmrc/nycvIkQe9PLeu+jiXmOXwktf87rlcxGR0/HwNy+9xa/6b9WhihPutG36W2tXLnl8gU4elzSuS4dmvjgrHSm45Oyvjb35k/VXvzsiMO9Osz1aJz041tJR+RaiG3n2pq4+if/+urmiucHe1s/PGp6GO5rFfPq8f56peG+QavKxdO6+XNJeUXk6z6rv54+ag+v0dB3n0SwalCE6TxUzsg9MEN4UF15VbWYiE/ygu2ziWD8e2Jcscd5WyZ5TElvZHmE2C1pwrppgfZd0l8Fri7vmlTVK4lEsfdrelhmR2SPBp+OkD5g40f8lq14FRIoF2n7XQ/XPN9kXZ3e9fj99UKvP5yfPz1r25vP98cXj09QYRHjFMviIAgRa7NS1+jOBUR5EK//scLXZrPKdgNd85v+c2UZc3sdnzZZeNOw5o3WSHO2TumMkwZ84Owd6fssu5iWEYWiqVM1wwg0EmHOHIVM5RdGlQhrldcV1pxZSZ3POLLFCIPf84cCmorweN1+u6ebo8Y1Kt3ioDVl5XDm/rGVfwbnLDrP0VqJFhD2ur6dzJEYsf/6o5PVI9CnyE2ORCX7WdjdeNyb9IBJmCh8d3msi7X3asW7PDm1T5VMVidHOplkikUZX1YR/5SS1kR1i16kjGnPEs1ijb06h+zuOaeT1seukDUuEpfrsLSvHd8xc8217nA3Wh6BQ5/PehQMbeAPL/AwvIH+n7FVyvd9uWmxyP2PluVLtXlWLyBI04NXtMUbzG7M5qm/uW2FXWXm5NZ6MZGpi9WBNXdnzw/OpBZ4lKurqxsclfZXJcVpbtGAgC7hxW1GHNJxeg+pR/xbn2mjc4QQJjNlurSNhDNcWRm4mQNrKWAbMHXyTQsKZOCsd2PWV5/H2+XYv50KcWNtcizSsOntNOVo0UHG2jkcV7Qw0nYsR/O2mKcuRUqrtanUGsztpgYPphl+U51Wsgizz+pFmrmcUAU+RnR80Ue7Ir6IRAR0fVFQMykNBJK1SafAm5w+ftQkinnX9zcVH2WlpAVwMuXENpbBhEs3eFYzZISiDqRjxmeKhNdBbYj4RCI2IyHZurCcxt6Wdr5BhgIga6IKILM9xXCcShSqqbIz6hbzEnqF+RMwAGCHVQSvUwqEFFJyUSNNgEP0aMWwS6RBVxldnKx1TSxHUeXN0w/1j+uHUsHHTnd+X8V4hCM+Uj7WflTlyKfHUpqYP6Dx8bWK7Nx56SN359pPbNHxIiUyJdYE5e/FDI6nR37pI3H85hnebiAotOQ9FYqyiorMPqfAzKThrQSpJKXQFd1gihiBA8XHeQGhk8L8FGpiwG2Xryl4JJ2Ibz0WCtxqp/xLt9g0oRhVAOhXlFDZasr2QCSOEWDTyjx0joagMz8pCn0VMDg9Adt9lKw4Lx11gC8Rlprq+Omk8dEBDCcFoby5HJecXsFFqoZuXlIfR9XVx2EVS/46tNSB6OBYRU1PwcFmUpJjGD4G4HS/DbRM96Ma10cBX1xZX/PxxwTasMnpT3KLgUhu5jbMaWqb/mrWt6TGokw8NjauOsYOEg6EP3cJ0cFqhd4+DmrZNIW7iZNAOHPr2q/AoleKHA1ZfhaBrWfTn1xmpI4ebwUyJbjKEgJTr+ECB+DskB8VOZt+A1nALHIEGwfh/bKkIv6e0nnbCUCaQ1u+RSSqLj2Vrhn+kFIAnKc0v741LvIc7UCxYCURcEOw1BpTlQ3WNBfDpEm5wAELQZI+MHrwroUVRV7Ts3M2jxVdToGOmoT6HYhAm+9Sa03zJmgre1yVo9gz8w4ZqRfHYVtBER1Bg+A5NchZB+7kYouzvWan3WNQs7sIsyZIzInZaeJOSjzdzSmRJZSI4y+R0lrUM4lJHBM3XsTOdAXowbvFLSgAOVLpmwMSZK7IRKQ1sv5a9YO+BsWp505ZEIUcri9/jhayC3WrazVFfnjvFHa42s8cez5Y/gB7hWRNmglt/fBzur8Obbj/RA9dHrDhvf3Ud9rXPZ7xpWeYY9K29zQ+8XnK8dDlpRg4vIOLn16K4KcpibAau/Aps7uRz8lyQ7vOanXy31T4MR/eHoMHbkROWRifPgAT/24HO0p7OUVpBCRHL8WuH+KToP87bBqCEn9D2FwO+393ZoSWBhwADf8/gn99gAYzfm8FDX8/ALKWX+pf+Ft6IwqQbgH89duCuGnapOvqeN5lnorbKOEsDUuJrqw6dFuFSStk7WeBbpWmUQl2/3XsQHlj9PgKLou0NFRC3aV0jtXrk0bvy7Dd2Afuyv24f0p/8j2860hxxyMtZ/RfjtHXrL+NB4j0bt0apuhU2787iMu0pf+v/peTdqPjAqNbDct42jVtlnLDcLk80voCz8qaZ3lIWpaoSK+YdHX65Ewu5FhGPn9dK0Dpqqtjkf2o7TAwYFox30keLu+PZJEZFB/g8R0sEtsmNq9TtqxOWqpT3VQiu8yA0Qcre5c9wqJaxiUf0zp2zbu05SnDWKV/sZgwGX/eecyWfYspi4SmybdFmBLr/19P/6X+J9W8FMwX513H8XHzHKQRvDnM60KVdlR5NC5Ddg5frgdohThBkoPl+9ZUO0hqXV2/i2qxLH4QRqg0qF6gDKwEKnlUnhMkKhbxmsTlUCWrEmgRUgqnLawMKjGQ1aEk4dxEW97BjAZMA+AfSlChIvGU5Dr3nLS4hydwSwUsA5YLlzMa/jX6/Xwb+V7ZQ5A2gXwcNKjxK9JyEHdADNFf6CuIjcBaUAYOZansk/W6lrBqgDWdNauMVZrq71rbv6b5eam1u4485JLVIWm7DJMfgnyGBKiapM+HR8B36diA//dhDx4IaB6Vb+MV7I2KDoAd4CGPiM4NiFO0TYzTssyMszh5EWezDm6cwzac41oGJMnS2VZXx/X4xAFLH9RvcUONI4tzWablcWPaaVf8BF46FD/JLd2In2KYtfF0jKfvD7y5YJ3tRKpSrUUttWIl6mFOCkhgyfLUKrv7skxqFapUqjMnZDCPP/ck5JSGK597cQBZt0qL1Om0VqM5s5BcmlqSzYFE3iRSQDbeZVlK9B61ypjas7UBlt5ptGb8slp58lUpV+jKE3SImuBzmZOqqEM8Q18pP78vTw57srj4WYaXai7wjpIThZhUMPvKq6iYHlVux+nMetUCuM7rmxJ52MF1QdICVVAgDw/hMrXrNSjkjLtmrmJ8z62XKU95JUhXFHWrtlqBovDtInmKK0UU3eCxh5RHemUVyhnljF+Yq0g+VZQMcy8WWo4VwhKISih97Rd6CODB3VBtZO58irFWlTUoz48qIC3SYHgGyPy5NRqo1ZJmWir/30ne9u/lJPrzvoNIiEYsoLGwcWjRpkOXHn0GDBnhMmZyp2F070i/x5IVa3wCQiI2MDG0GXbs7/bqx5xIOJOScSHnOvcP9+DJi/f9ht0aJFiIUGH3IZMsHR2Oj5cgUZLk+6zCtP+PGTJlyZYjl4LSAAMNMtgQQw2TFzasMMpoe832whiTTbDIOivDAY1bRpoRLaQNk6ID4xx2L3RhsfW+9qVvLbfJScdtlq/AVIVOK3LCKeedcdY5L6lcdsFFWxT70DTXXHFVidfeGq+UWpklnFRpaVSjWjf5BvUvR9vklWatWrTp0G6HZbp03p/TP/Qb7+xC9Njthpuhh/SRATJERogbxmESpmEW5sELi7DUq8822x3Rb6ujxtoQK/vsj3XwTYwghCEKm8C15hHl8thIh8vlHLclVkbZyyWg47D2ZjGLcwTVSXVhcMsRywTVQXVUnVRn1UWFqFAVlqQVw2Yd7OGQDjvC1RGJ8WGCkITI9z5HUqMLSZXYEC9xBi4bDwEJNwcdqY6q0/Kc55X+69RiEiQS7TROD0Llyp6YO7ypJVxlIjHLuP4W3SuFhCMdpIDxxdGElkYRNo7upW/VaaQ5rI9rdkK7wy6hi9ij1TUc19ZawenrmFFEPoTssftJOoVbuE3HHAjtobKRXmizaSOdw3+ZbqRf5CxuZJBEbN7IMOwhXdw7P3csezshHceF442ZR0mWpICW3fg/DQAA) format("woff2"),url(data:application/font-woff;charset=utf-8;base64,d09GRgABAAAAAGHwABMAAAAAz3wAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAABGRlRNAAABqAAAABwAAAAcaCcWKUdERUYAAAHEAAAALQAAADIDCwH4R1BPUwAAAfQAAAVvAAAkOLzR4thHU1VCAAAHZAAAAgoAAAYUTOV1mE9TLzIAAAlwAAAAWAAAAGB/EJXtY21hcAAACcgAAAGIAAAB4hcHc2ZjdnQgAAALUAAAACoAAAAqDNUGKWZwZ20AAAt8AAABsQAAAmVTtC+nZ2FzcAAADTAAAAAIAAAACAAAABBnbHlmAAANOAAAS74AAJCEbEMmXWhlYWQAAFj4AAAAMgAAADYMh6VSaGhlYQAAWSwAAAAgAAAAJA74BzpobXR4AABZTAAAAjsAAAOqen1RRWxvY2EAAFuIAAABzQAAAdhhCIUmbWF4cAAAXVgAAAAgAAAAIAIIAaNuYW1lAABdeAAAAcIAAAQoScCasHBvc3QAAF88AAAB8QAAAu6KLKjscHJlcAAAYTAAAAC1AAABHRokqgp3ZWJmAABh6AAAAAYAAAAG/JJWqAAAAAEAAAAAzD2izwAAAADJGsZIAAAAANLOrRF42mNgZGBg4ANiLQYQYGJgYWBkqAPieoZGIK+J4RmQ/ZzhFVgGJM8AAF/9BQQAAAB42s1ZzW/cRBT/bZRGydKWlLRRVWictmm3bQLZZkkhaRAfou0iEIgVRwvEob3wJSMOiN4qWUJcckAcMCcEZ184IW4YJP4CVuKCEBKnPfcY85s3s17vxvbaG+8mfhrvzHg8M+/j994bLyoAqljCGiofvv/Zx5jFNHsQhlBPKh/c+1T1Qbf4bEp+ZzF16R010vrjwkPcwTbfaIRtkh/arPlSs6THCb3QJXX425Ee9cxDCRfXCqJV1ZpB6Eh/I1rT7xvvhx2UdvXPxdU7pCB5ZNguZUV/kH9Z11d3TPQqU445Vmuq9ZJlWx5HA/o0lpU4NlCWJc+D0Xal9TU4A/kMaLlOEq9iX22zuluevidtOUP3oyRA7nn3tITGz6d4kLbRa7s8VGgvN1kJh03hZ0xYoZzcLm+9ekxzrshS+V5b++L9EuIo7bOV7bfzrdrTYYQcPUuCX0iKLck4Trv2HinrY/yqstiK071d4a9BvprsDdhr+ORYO9OyAr3D4R5TRTP5tbiGy9mrpuVzXUtFtSOBT5u7syXGNozWfe2dxudPqAEj4ySbGh3/Yj2d8N88kU33l4UsvXKRyNqT8Ig+YWwRm9ppRt7B24dGhZ8G77Zkhp7JzyyJcrbszBNc2aFFLPkSBV2lcd4b6TafpIcslHNvjn6uvdaglygnI02N9EG5GEzHWc+yRkdiXBaDs+g4GXly7bGUplzRXNNYhPLOrkSDjo7hJr4GhfDpZeYJjpGtm9c+ssYkrh/0P5OYp7MSpzeCfb7k/lGuovKIQnbrZUcQw6c3aiYe95pJpwVBnCuxrWH0aYk+rQjZVhjsPVL4lBOda3K0ZkF8epn47HoHJxGf/ii4S5PH6HEk19ruJPLkgXZV8hFrXHlfTHadmG9XltA4SFwuKk/JhOyD5QKl7s0x2Zl1UAn3I1mwxuyy+Dm8KFIO98Qv342iDCIlbtsHw1SCv1Ne1Z2onXjjzDIGfYKJGJZkZNZR+pZTypoPsGtqu7iGFukB6X7GGy3BRWvIvC38mNuGGiqbSbfbQlcrvw2pU2hGJu7ovLr0LzJDz55leh3BZzsJn4lZRcHcmjErMJ7b7eJRaZLtpqzsGEm6w6045ftUS7Ipf5KIquS0RJXZKU7HhuyCpw7x7RLTh8XzYnqW/LU9zN8eDCn6q+GAT/DHJ9uU/KMzvu99E/B9Reykk45JE/GcUv2QnZ3Nd89lZUb1nGuO7F36cukgJYr4cpawsz19/v8+ip7ty/Yxo551JmjdpX7bNfHTOepcp17/HOLa9w9B+96hcNriuhXM4C9smp5LrL3C38ssG6izAC/2vfOS9Fwnxa8pTHMeYM60z+IEHpfaDE6xLOA0Ftl7Dk/hBSxhWVbpXhdxhVk8sIqn8Qxb4P2G9KsnV9i6iefwPLawjVt4GTusxd+/lovbLZb6QN8g6qb3vTUjpUuqftbQkrQvxmiVO1k11L3WDA+awLJlaIf1HeF6aeje66RN0oa511gqOIb/KKcZM2ZVahtQ/xotY4UFlNtmNMdNPGt2tGZ6jrGc5wxzLDeiX8u0dFuVx6jN49TnSVzAvNnthplD8VQTusrSk+k6qWZKnXJZwBnawHVawXrf+7UUjmf6WgssK/vGnO+juWjfcZqLSFnncUPzZu9xqkWEaG/rfb017kPTIluLnK9mZsq6VkjKdpbN/ZxoJs7nVUNTRIe2sir3WKG8T9Ii5/EENXWaNIsnSXPk1eKIy3zjhCDxFBFS56gGkXkGt3GXNvca3uCIN/EWZf823qN13CNt43PSLXxB2sFDfEk0fkV6FV+TbuMbfIs7+A7f43X8AHVe/gk/4138gl/59m/4HR/hT/yNT/4H1RWJ0wB42o2Uz0ocQRDGv+ru3RgJIlnnTyYqSwhBRJaQkw+gsIiCZIPudWMwCehG1BWRhETIwSfw7AOIT+AD5JhDyCHklEv+PIHkotU1s5OeyY7OYbtnil999XVP1YIADOMh2qCNzm4XQzAcweWl7AQFDbO+3VlDtPH6ZQcP3my/6GJqp7e1gwYTSij7i3mdZN3CKKbwGLN4hS3so8rx2/x0jHP8oCFq0DM6oBOJE53FGvRJ3j36ShcqUnOqq07UZ/VX1/WcXtcf9Zn+oi9MZGbNc3NkTs33uKr5Fu+VaqxTeSI+NMYQoZ44rPBK8GStyeqXosJCKihFuVpBIeWXolyt8VK+iql7paj7OSp2ejdhqum3r+E9PuCQv/wdpt6ihz3pBo/5QPLCXB5hnmnimhNSexDRyhBK3Nn3rApJ3s1kayA5jkfJqWYctu1Q/25+kTM0Z9QxLTmu+qI857NshRCTUpd4zuL4qqPpJfXsDUSSTeK9r7uao+zZJv87Wzv5Ev2aPrsknkEk0abTZV7BbTfTqRjk+WlGIeaLPLtss9BzM/XsX+M5KOE5KPC8klG43rPLlvEcZJSmc72jOGozQ+4FSntnsGa/c/I5Df7Z/+NhPpPt5z+ssIBl/JZ9Cb84Yxk/eV0SfkF6WDFf57WKEZ5IzZPp82zaPZRJPUyfFd9JILzCJt5JZB6tKycBSPsAAHjaY2BiTmH4xcDKwMI6i9WYgYFRHkIzX2RIY1rFwMDEwMrGDKJYFjAwvQ9gePCbAQpyc4qLgRTvbxa2oH9BDAzs9kwWCgyM80FyzHdZw4CUAgMLAACBEAV42mNgYGBmgGAZBkYGELgD5DGC+SwMB4C0DoMCkMUDZPEy1DH8ZwxmrGA6xnRHgUtBREFKQU5BSUFNQV/BSiFeYY2ikuqf3yz//4PN4QXqW8AYBFXNoCCgIKEgA1VtCVfNCFTN+P/b/yf/D/8v/O/7j+Hv6wcnHhx+cODB/gd7Hux8sPHBigctDyzuH771ivUZ1IVEA0Y2BrgWRiaoP1EUMDCwsLKxc3BycfPw8vELCAoJi4iKiUtISknLyMrJKygqKauoqqlraGpp6+jq6RsYGhmbmJqZW1haWdvY2tk7ODo5u7i6uXt4enn7+Pr5BwQGBYeEhoVHREZFx8TGxSckJjG0d3T1TJk5f8nipcuXrVi1ZvXadRvWb9y0ZdvW7Tt37N2zbz9DcWpa1r3KRYU5T8uzGTpnM5QwMGRUgF2XW8uwcndTSj6InVd3P7m5bcbhI9eu375z4+YuhkNHGZ48fPT8BUPVrbsMrb0tfd0TJk7qnzadYerceXMYjh0vAmqqBmIARoqKjwAAA90FVgA9ADcAOAA+AEgAdwBCAD4AQQBCAEMARABGAEcASAB3ADsFEQAAeNpdUbtOW0EQ3Q0PA4HE2CA52hSzmZDGe6EFCcTVjWJkO4XlCGk3cpGLcQEfQIFEDdqvGaChpEibBiEXSHxCPiESM2uIojQ7O7NzzpkzS8qRqnfpa89T5ySQwt0GzTb9Tki1swD3pOvrjYy0gwdabGb0ynX7/gsGm9GUO2oA5T1vKQ8ZTTuBWrSn/tH8Cob7/B/zOxi0NNP01DoJ6SEE5ptxS4PvGc26yw/6gtXhYjAwpJim4i4/plL+tzTnasuwtZHRvIMzEfnJNEBTa20Emv7UIdXzcRRLkMumsTaYmLL+JBPBhcl0VVO1zPjawV2ys+hggyrNgQfYw1Z5DB4ODyYU0rckyiwNEfZiq8QIEZMcCjnl3Mn+pED5SBLGvElKO+OGtQbGkdfAoDZPs/88m01tbx3C+FkcwXe/GUs6+MiG2hgRYjtiKYAJREJGVfmGGs+9LAbkUvvPQJSA5fGPf50ItO7YRDyXtXUOMVYIen7b3PLLirtWuc6LQndvqmqo0inN+17OvscDnh4Lw0FjwZvP+/5Kgfo8LK40aA4EQ3o3ev+iteqIq7wXPrIn07+xWgAAAAABAAH//wAPeNrNvQlgVNX1P/7ue2/2zGTeLJnsyWSSTJIhmWQmk8kkTMjCGrYYkE1kE5HFsBYRQSkioiIqIi6ISyuiItX3JoMgbohfF9patQu2X2qtbf3atNavtdavQvL4nXPfm8kkBNBv+/v//q3JvJkJ791z7rnnfM6555zLsMxIhmEXai5lOEbHVEmE8Q+P6Xjz3wKSVvPb4TGOhUtG4vBjDX4c02kdvcNjBD8PCm6hxC24R7KFcjG5X16sufT00yP5txm4JbPz7GckSzONMTBmZjkT0zOML87pmQLeFzOyjI+IFr/InIxrbEw+71NfutM0jN4XNxsZP+8Tzf54Gr3q9puNFl/cJDBjeZ+UTnyS2SjYJD0biUimNLjScZEIIxk5wSamRaprwrV1gQynQ1tUag9ynp1l9WXwX9Y0V1lNdllZdq7Xq2k58yWOcRO3nfxCs5TRMwITYIBYxieagnGdnjHA89MDRLTRQVpsTBo82Q5PtjDwPI0BnlddY6fP4TxsOHGxKb8qP7+yoKegKr+gskATyigoyJCnkV2uxAVDeRNiGH4q8CaHKWBGM7Fs4I3oDMZ06vMZkq0z+yQhNxiUGK5HsrsCgbiGpx+m58OHGvjQYA7A+Ar9kpv4cCzhoN0DP0GO/ug89Mdjd8MPfhWy/23v58I/No/cLG8eedOnls8f/sr21ZaRW88yW9q2zOh9SCbbhpN3h5Nt8nr8GS5XD1eu6OcgHV1ng3yetoQZxtQxbWQSE6vAUXuDEq/tEcOBWAVv9HU3V5QbfDEr0mEPSrXwTWYgZq3Fb6yCASZ9pF80n5QqrT1ipVUqJ76YxhoMBAJSmaEnZstqg0uxzCpFgdFuoUcaRXxiXfbRv/34+OOM02e0iDqr2HJMqrF8I+Yc4+Fdt0bXYvcd/fTL45/AH5i6tfiWF2us3Vk1OalfZOPb7gD+5ruDA77D27TSf9fdhi8x+KvC2wpv82gtgi0iZkdicFe8ao0wzWmarGCbVpedUxNoaa1K+R85PPhTsTmbSJVmkEkSkaJl8JoREd2C6ARRreUF2yGGmJ0Z7mIXSOwIkk9cQpU2VFsXDgWdGS5dqVfI1zodFk7n9ISqiN2Rz7kECyFNfKi2ivN2hUb+dHO4bUHjqJLs/z7YeuaO4Mb/DI2f1zKyPNsVnX3/vNa7/1LmDS/saL3rP8i9HTdMDNjLGq+c3vKqf8pqLbs93VnsCUU7ax58SXPkBYvof9TadyQ9q6xs+KjZdf7L54+v1TwX56/hng1cEqrJtbNhzQ/PPKQZ1tQ5oaxx7oiw284wGqb97CeaBbB2TIwL5LiE8TP3MrFMkIlYMfySyjU9sSyQA7qoJCffE68qKOZAgKvgMt1AL9P5HiJW4wqT0sw9YppVssHEa+FSa5Vy4bIULkutkg/Fwdwj1cCrDdZ7t4HLzAG+Sb5SYGNWfoGnOBveMlJVOSxOdy6oBWc6XGmZSISu0iBVB56i0rAjIxioC9WWeoq0dhI0kNq6QvyqEL+hXxRp26VbbhXFW2+R2m5fumz7bVcv276OWzK+917yQ4lYJUn+XGq77de3wX98zs6XX95550sv3blq32Or1z6278wqzbTTB0hw5yuvKB8/9tiqtfv24ZrnmHlnP+GPAr+qmWamg1mkrJ9YFfKqTtsTMyGbJnHAkEsoQ2qEHhBjSQ8kt8BqabFK41H7wKLohNfxIJDPmTK0VXXDM4Fy0SKI9UD/pDr4mNFbvMOGt1G5stc2ceHSkMoBi0an1WW4Mlx1YZcFrzylXoUr+WwwEC71lnotnN3hatIqHJrnqZveUbcutmnjHc7CcHBiwzCzrv2aq+fPHNfC5ZnzMvLdwvdvvnritfv+8aOPx9Zdvrb1xIN7G6+dHJ3eWfHyshrf1LKGbOey6fNvJdOaV3RODhU8f9PWZzZfW97e2FgRKMrU8Vdvunb+tvez9BMLxlY2hbOvX9P6vXdefab9mnbvfzwy5uaVntaZK9hH1j6enRl019e0FF82fztDUGczPVRnexSNraprIhr8EkOoKbkZlLVRUYuDNHO/SmbgXvPkxWSLZgPIsJ0hYhplvBZYbFb+rZW4tKzgsLl0zDzCupd3dS13yzL5gvyBPOH6s3zNWeasvObjLPIE3ssD9xqdei/upGTov1edTbCy3jAjWImH3oiwsixv/pjsYM4Shtz2Z5c8U86X8+SZcK+p3Gi2A2gUQNfGNEhjup7RI41gj9JPSkQDKtNi7JG0RrigZgnkvZvXma24DtAaeMMub1AXdulcOq/LE9ZN/c1vCn6a1mR+uwAu3jY3pf2U61mxIrT1H//YGlJfUU4J08i8zR3htwMdnYzI+EVdUCKgxzWBGENQjzNG0PCEwUvCoUoHUo0nRTYgGQw9Ih+IGYz4nUEHf2Y04KWRMfgSbAi5BUANTrfgERrJw63kIfmKVnZXEzkqj26SG8gbyhjWnbUQD7NGscoaRA4mihwo/cBXi6knxlng3gynN1C7zEgmDWhYC8i8q4mEUKoTUq/VratpTOPzSkryiqrG175dvNTPenNzvA3BcbeVKM+LkvfYctYCq7QIaZYI2FeCa5FXRIqzoYRJmgQNzij5lLwXjeK/pTgHxmoAqz4A5aRcE9F4LtiRTPR2/WBFBSoJkAL3Zs6+z5ZoNsG4MhgcDN6DtaEkqGNxkiAhHzfL2eWaJ0/PoNhiK+iZTpAdF2jkMUzMjgqmABSMFhWMj1M0LjkpZYKCybRKJYimBEW3lmSC0rRrEUv5CkCeCJNmpmrEBmokGMjnHRbeU1TFgjHiA4ohKrJwWwvGdz21ePrdiydXuVxVkxffPX3xU13jy23e1pnfv/+Gma2ltqzhs3c+d/fspix2zBvHXrh92vAltzz6g32P/vCWZcOn73iReMbv2rVxfjg8f+M9d4+f/czTmyZP3vT0M3Re4NcWwElasC8xHvUlodBR5xf5kxJn6qH6keOpjcWpIUEQLF2UGKItv+YbSc7pA/zXnypzvB6U8PvAl2JEXAxypYjribmQK1bkSolfNJ2UckGGPYGYKRcF14SCW4rCVcTQR4hWodtkd+RSpgRDTXpgAQuKUudtIsAfltprt3P9jOV75q1vn+zLGb5w7YhNr9XVNf/hjlG3bJgwc83ffvgIK0fGXb519vrLl89ZVD15w5jiKy71zltePnX3vMvfevS/br8pqowX7Ct3BMZby8xnYgEcLwCtWAGON5PriQtpgQLEiDj0EKzSk5Lf1CP6raKn8KQgOYEMp1/yGHqkOhx/GrAI1q8/EomIgiCVV8Brpi2Wk+uJRFT4Qe0iUqMLgY2ENURNgEoZoZTl84oVbY/U/8fWAyeaV2y/ZK7DMXfhvuU/vXvds5ODY//z5q6j68ujnWM9xR2Xtvn+/NMHPnnbfdnyZ+67ZOO4YraFbbjlilsemTWnfPbKyftXjFg2qjZby+XWT1zd9vSvb0TZnQRz9EeYbyP4DFOZmAFnnEX1x5gMrNkn8oCHQRdpA9R7MJwU0wKSHsjmAjE9VTV6LWgdg54qIJy8dCSeNYFYEzPFAiGQkKDTA1ICjsskduW0d95p6XuNjZI7R3Jbetc1yavInU3cCOD/flhHNhiLm1nKxAoS/Lcg/4HpcaexwAL8d2qB/0UU1NpAKdnM+Gib1eATbVZJB8KZDULqQdwCQFBKI8B3ndDNG50FFLAYFRyYZrZlJ3FgAqDovFRRJiULpqZ0f2jU89se+uV7jx6/N8z29M2IPLto2oPXjRl77UOX/uDnb3sXX/WLhw/8eIebPRLtO1g/vn7pk4vn7+uKrkvohSyQJy9Tz8xjYkVIUVVCL5iBouy6Ii1QlI0SFaGm0A5SZLdKQRh+HkhSA7wG7YItrjVkF5XR8ddVgZpg7HlORGPmbCDRYIyouAOUr0tXRTygIpyAKTgFggAVVZwrnwcRYxUR25o/ruvA0u8/2VRTf8eKy++ZA2oiY9LS7aNf/bzh6qcXX7Vv2Zj8CdqC5ulbOmbfM8P/4yfWf8AeWHz86K1T5s70dUyb/H3x0BU1WaUdE2p++/OOe69rn3zTkbdaWzbecHljW9f1I+Iv3YNrCeTqUapHihR7QvUI+laoS1CJMOD5whLnIop+Jx7Szk3r29fOztBkRStPv6/JQgy3DdbkV8BDDxOGe4JcuJGLZcDFdLzfWLzfeMq6YmBdsVWsx8VoBAk1+qV6E36EPo3kgEsffpUPbJ0AH4yqBzlIz3KXBTSUr2PLUC6MjvzAiASOY8NVXAheEtKgy+cSmDaxeHmvhUfd7ELdjKzdNvyq60a1rJpfP/bauydP2nnduPr5q1pGXXfl8K9fOf5V69Knrrj3Q9+YKdNbXflTumY1ZXhHjZsRzvWM7upofPuee39MOsdeP6vJlh7uWN027dYpw4ZNuXVa2+qOcLqtadb1Yx9++yePXrZ9zP5t9QtH1XvsHJ8ZHreGXVc7s8mfb9Xo7NVNVzXd9NBDqk3qAdnrYkoV2ROQa5nANYQ2UlDbEy+uEDQge8XapOx5gYFeq5QPzDGpspfvBdkTNI7iSsqjYrRWDieA/WAFSKEpnylM8gqYxKHKAvZ4w8ieJuCdly4hxQUIV/EomFsbllERG5t/rhAWrIrPfvW/W088sf53I7SFI6bf1NF+w6XRXO61hJStRCmcOndWvxTWLp32wc/jL+1eS+Wvcty8hUx/LIT7FDCCHfDVAJRgJnBtU1GCA0kXjQEVIYjpiSvJOQgrCINRw0DswO3KLSvLhTfK8ymegucL4KldNgBRxZz4/Gz1+bl+UX9StAUw4JELz3cFRIsV7azI+aU8NLV65LTgyFacDsmZhWDhAtCLS45zAAizK8MdiMX4Pf2DRhx6BHDoPlizDGhtp4E4G7nre9/nytn7feSjdrlTntaOtDWS17gj3L00fpWdQG8I3DQoTHq/ZEiiNgI/eJMt3PXktWiU7G5qYgY/KxwykBA+qxyedf2RdnKAPNMuF/iUuM3Zz7jFsP7dzDBmCRPzIR9LFD6imZLyUQFU+kX7Scls7BGLYInHy2z4vWi2SjnAQI21R6pCyFUELPNFxDLhEGsV8ksqkKE5NsnoQobml6Ba1QhKcMBe51a8N6cDAwOgBDSqcSYJPgPLHyD5P3qnZuKcORNrigu9s/wTZs+e4N+38/bnRpOCstycMm99GX/nqcM3Ni+fNGrEiI6qrKYMf9vM+rkjm5vHzG9YtnPRFWfezi7z5iDyRFrHnl2lOa3JYVrBW/2KEUf4pQbgK0ioOSiN5mFxBsSJfikXrmpUXiuOax0QXmeVXEBkm6VHbLNKVrhU9KFUiJ48/IHbKlXCpdFI3VmM8TSJ/8jBGA8vFlZZxHHHeMlt/8YiFh0Tx1m7C8YV2n3d7fg7Br9TojMFEeZQQaG7aFy7GobpLlCvafjF2ibYDmscuTUNI0ZPRBtVWAxKY3g0gpEYyexFZjsa1I+kiaOp1nUJlXWqJrHVFSv6FqU6SmAVoXCjfslwhYOc1onKBHULW+wp4rXwhzawbGEX/HkxW6JoGju1gWTstg9JxUM7vnhibmzL5AWNLyzefnD67fHLFt6WnxfdxLZU5QwfHS65R/77wXvkT0+sv5/YDrx51P3WHw7LJ58kGzavXvNy82jX5oVrTqwmXz5GKt///uL4/2z/9f8sbTd3rhDvufqN2zqvnLijb39aVl1LRuOM3bOfJo5Hrv+p/Pkd++Qv96z1bz5ASqV19948h7SMu+aW38D8gvDyn4JN1AHaGqYgYpELUsMY1+oZAupYi+Js8gNsQfsIS180Iu4Fn8PDuTm7m/jYyCS2YcL9fdr7RPaE/CANf6yQd5KD3By0l3F4xmh4hgW8kULmChV3pwPupva3EFBHpos+KhMf5aYClG7AqKGYbqWOrQnclFw0lRpwUorgg1zwdEU9zJsLL0yAYwV4KxbaRA0OTnArigchq9ZT4lbAlDuUuIiz7JNv37Wg69FfHJLryVv3HnjqPng9tnPvQ3fJzZpphx+/7mmH8Na6H/1H9PEdN3RHH71+42OKjgD8pEkDG5YPiDyWg3Q4ExbMhNJfQL0qK4yykLqjTpAlwuj0mVmKC2W1AZIrVBERCAqGXOpAUtxFVWTrssNndpDCF4LjPrph00ePzZ372EebbvhoXOi4/PGOM4dZK6klxsOL36+avWzOE1/ccfsXT85dNtv3n4sP4zpFHn8BPE4D7Vevctic4DAFczmUrWZgq1nhqQ4GmYuDzMbopE5lG09RPuGRaYjNqjjgFrn3QcI9PXfu03Lfg/JBMvWOP9/fGbxq52ur5YOaaSte/PrW7f/zQld0/pN/uPGqo3tXNwOfYDzc1zAeE3qfdDSGxGh4mG+NIloaHJgScEmEDWhIwWAC6MwGlPiBGjRQAgbKT5wb2Suz/+gzc6xmWrTvP6J9D6n+UuK5BqZZee7QzzQO8UzOoAYsVJe8/4HJx6kPm5eQhY81HpAFD3M1kxQBjMWDSIjZfikHn1ScEAjRapUyFQwt6gKxzDx8aGY2PA6d70wruGYmTSG6ZnkClexskB2JycPdjRx0w3V664VkSADpFrTomauC5H3b1/H3WxKCdOsfxvS9za69TO7dnSJMv6i87CoqTP94cl7XeLIuKgcWXbPkcJKX/Ck6hyNUzaBTNIOoCcY5I+Um1z+DANBgzkQTDVcCXyWdqSc5d7hJhF45MLOV29fS0jtbM61vG7v+9AH20QQ/4XnMV/A8Dixr/9ypEQ+JA/yHP5rkHeOtqGmUf+sGTM7Dv7WCRotZUN44WJc6+u8Fv6iFyYbR2FDcdRzylSgeLw0Ew70Ux8od/t6z98ZaRnTt6Fj55J6a/S89wJ3qLbniofnB6So/Oik/qgfxgw8OZAIlm/oSMORIRBkuBpo9RAfDZt+Y0fcse+eMvkf3aab1fso5+tb0hdlHY7ItKcPwBaNJaGTkssoLbYIXMY5KLacBAdL1M9kJd38G2PJJ/3rQrKV6IRHv0BqCKaM2K3F3A427o6eqBRZbUDvgjhrLo2lEOmKc3hRRKTHQ+ArQIsSXkP8hXy9p7fvU2QdW5EyEf/P0AY3+9Nf4k5Sh9+h6VJ8valOe3r8MDQAw1afD6pMM6IaxEZETQDElOKlXn09QkggK0gOtrb1XwXPd/IenD/CfnnEkYl+a+2Fdmpk81D4mpNoG0sBTXYhaOp8uSgssSgC2GfA8PejCAnjNADghmSjV2TYa+9LrEosOMABvs7Kwwoo5auCLbarFZ7c+RCqOv0p8Dz8s/+rV4/LJS7cT/TMHif6OO+SvDz4jf72d/IncTppfekl+Rb5GfuWll1jt8/Jvn3ySFD//Ainev1/+bUKH51H5sgPeStFedtBexjS63oy43hxJUUuj6w2hFRpGdA8kO0xcqhEEtOLOImD4rGj3yG+O/HrO8+vlJWT37kOHdsvLNNN+/9jSZ5b1ieyOwyT/sMK/9yj/bOCpTWNiVuSfC/iXhgOiTPQgE72UiXaBRgcKVCaWwWuBHaPQZqsJ0axeENOAmx4XeG2EMektA9jpdLAYmtYmeYoRa4w6DeLrknkPVz1y4M8J1r597x/8f5o661zuvv6Q/PcFe/2P3qZyeP0f/R9P/+euBJMVHtfQ9eBgZqkSqVckUnIAm01mymYTh0qaiM7k8jAHcIUIKqdRZgRcIUYdKGyNIBoQQmJwh9dEEry3aj2wSFKZ//6PPvnkR2T/VHme/DxMwOHDdAJ+Jt/7bl+MnQQ/25+nc0CYrrOfgCx0MX7meSZWmYg70ThlrlaJ3oJ7UWDtEQus6NtIXiV6SzdK04//TtkoTbeK5mNSkeEbsfgYvOm2pJvtPrHI2g38BhANv/tBdAy+hBfmkNmSXuQpVoH0gHcUTOPsYhDUIHTzrmx0wkWvTcwC+nOVMJY9K9ubEsaiIEIHcJnaLHRYwGJpVLe8KzT217esfGxKSWTexttu3Tgvsv7V1SR/b/BW+b6fzb5bku6endW26ImlD3z1qn/69xrnLawbu3xkrddbN2b1+GU/7HjVH/vh9ZO7mgLDO3dfFZh35YTqdci7STDHPoppG5iYNjXOI3IBdAbRHGhMANu0qEI1YPhjWg1eajFa2O8p4v7EJO4DuaZFkxWNnv4Ewz+o02BuAPcw6UxEtTVaraKfRQMoNWtCRYucsnOHkQsUHD0aHrNFSRpAm5NRSG2PFVBxvPVP5OCfWuXTskM+zWq5jl7x497ej/FVPiv/gRTAcxNYXYv2kdKFAB7gen/4itFSvQn3Ry1NPL4JrIN1Tuh7YxLYhK80RjCXhAkyjPZhugZeZ5RFrTeYgmAV8HZxwvFa0HlJ20BggROrpFURo0WRseMLPutGGRMZq5h2zAJ/IbLHjkbv+WwnfqoRuSqJsHr4zCIZTd9oRNOxo8evVr4UDVWSyagXjfCdBr/j4R8+rNwOlo9e1FpFzTEN7vLrj3FMjNUYURKbDSxYeL3BaEqrStlcZ1RaKblgYINjyUJy1ShyFVk4Vt4wSX5IfhhoP5PGf4k/YCVOnSlReMB/QnVtab8WYBVsg7ZcseAs2h2exjLVZxjwIUE21PeXGeSP5E8z+nrY0LS+3r5e9kV2T99edmHf4r5WdnvfWnW+noNn6BEv6AbMl4HG6rUASYxo9XR01mD6dAOmD8TPN5V8Qf4+te9UC+ClRvb13tOgqTsU294F9w9S25rACTpOtXKcAnIpkpV06rYFGFMt3bEgbgyDuJ1d3NLee7kjvbu4DVH+t9HomWK6lzVa3kDuBN2jY2oYFT4DoGX8CnTWU6nQGGH5MInlI2oDiWWjgubRZJz8JUmTN2i/aPrm1igd70X3scC0e0aQ/2rWbDo9g+6lbiBdiXEoZME4QNQZdRxgfrQwDqJNbEOKTHIcboqH3R4Yw5ekXX5OPqJd1/SNBcfhZQ9wUbqOBCa5lUTXD907whn2klUhsnKUfFR+gT3AHuybyq7t2w7/9uzps6v4W88+AzS4GAyHYWIOo+4RKkTogAFa/s4zqzqjSDO/huzT7IG/L8O/jxM9Y+F9KdQbVeolgnlLTEThwmwytkmzR/4NxTObANt2cV8xOYwXc6icKEmZdENP0xOzEvStND1xrjTTioAcsynK6BzlWXrEPCuiAklTFAhIDmMPJttIeSgP5ojoFLq5NGsmDaOWFuDWUAYYrwh4arhJYU5mTbhSN4EynIIHo3tVpE4JbITQDdn0s9vfvfmRdQvuH+kf/9T6B15ouvndmQ8uGvnDm654ur7+6StuIjX3dd/9++9tHtdZPqPzgbv7QuvvHr/n1Kd7J7Z/1T4JaRRBp6ZR/J7LXKpiH1RNkkOjqNaYFgnN0gB1eZQ6K1DDCoEA+lUYZjKYe2ic2GXFnI80hHBZDiDKkM4lgCvdRUHMgQFhZwitEwA6JE1sir5w9Zv/+OKtFS+Hq19fIb75prj8jWpYch/MWiL/4S9/lf/U1bn/j52riYbcQ7Rrp1B53gDz8ijMSzbGAuiE2GCwPI7TpFE8bpDQdLPqZptsaizA4VQxEOWn6seB123DmBENLm1Y+f7tax4cWdmwY9bG5+eeej7eVTnywTW3v0/mk/y/7OicWjJ55MZ3b3xL/p/d3qmddyD/cCzv9/PPiPyzJPinoxk4OK6cfv7ZzD24O0X1jwukw2BU+Ge0IdZGKyXlIP8YkzaiiIINR4vYO4SDZAHDUb8Th7/hH29e/WI0Gq07tuKtL9reFFe8UV39xgqRfPYXkr9kFus5fWB/ZxfJJYfkq+UzqztZ+5S1Skwaxs27gIcuphj3BJw0MpTgIsh3PNPk5DEyxCubs4h702lkCHBvFk47GNdSeM0ywVh5wYkOtEEQbRiQxuwfgDQ0OMQoewJ0Gy2PuGmqC2U2Y3djkKPIwm249v0bl8dWNvYe4Ba+fN1Pby+Z/Ny1J+W/j+Yc+c2ztk5q33RZq5t8fsfftk/d+fxi53VvXbfb2zmVlBJNw7qV00K1l65cp+jlciCsS7MUtNw0dbXS3bU0HiQZyBKtQYnhgfmARVx+0UmzJmBtiumBmMOJqsxhA0TidOClExFJJt28Jf37aqGgEltX8FQeUfYyy/dtWRsYV1nSMO7yOSdORLn94SW37ckqrglvWL0k3DuL24/8lldw7wO/c5kKZjFYJZKQDK+mB82enaehi0KUE5+iRcxUiyDi1XpUORmW0CLpETGDahEl8yobsKGUbgUd4i1E0XENEJ0QQB5tci+mTgmksmFHvxhZiCpIfzh24/4plc0PrH34zfArK978R1Kkrjl4Kfn0L6RwyawDvXk/fjU6Izi59amnD05ZSfL/+mP5m7VTULRueJfOgwh+9K2wJuyJGJRoDKboknRN0pWyG2noAvwYkxqPRqVpQqSrBbLSE5uCCR2CSlBQlKIgNg0/Mf+BvdEt1y94PQwa49Nxy+57qq+dfW7X2q6Jvb3Ac0wyMvIyzYFtU9emCQVB7wentofuYqMps/XgT7dZS/R0EGjAzTCW/lRXjmJHG517ZCUH49lVnJlVVJSVqWvin672FAU8Z9ZzH/R6GPZsVF5Bn2uG1TVJmWucYrAQYoZfEvDJmUpoxIgOeLfH4LAAW2wgiX7JAaOh60uLiygD1UFK4IQLJwMnMAwmOaDXvK1TOxc2ff97Swmnjkt+sbZ9zjx+/ZltG9drh9MRqnPzE4q/AgNjKXTlJ6Mpxv5oCj90NEVsYrfOkPPJb2fIE3+qmdZbyc6SW/s+Il+8JP9EeQ7z2fljSsBd/OmPKYlN/TEl+Lea9bBWCnClKDFrF8ZOiCpBYloQFapopxm4eL8CRY4KlEifC965FO88HR7ixjBfARUp0YUeo2i1Ud84ZwBlTsUqoLuURUDKqJAlXsWm0sPzum4UKo/MJ/qmX3V2V0V/dcmzQe6DB4dfu2JS+xr5F31h9sQ/r57QexpeqPyp6wDoGLgOyL+2DpznWwc3bYR1AAMat2zPgb5JbGzXejoMVdc7YBxm4GgyLpPQ9bk4ikIlLmOmcRk06nqzwjdXf1wm16YEQ5kUI5pPrNRuco6kx8lSbbLql7fc+ssVK3556y2/rJp1eP3s++fX1s6/f/b6w7PIXFL019tu+4v820+3byc3bHhv68Qb98++7PHNE296F/GIvI1Pg7GiPZ3CpEARkgJFABN/ZzTCpSsqUeVgAo1kkQFoJPwy2FFQhS9Eq99YjmhkxevV8jbNNLCi8sd//Yv80ZJZfR+w86asJToAJPzqTuTvGnkb907/mPvNP0kx/6BUvjMC0JoGqXGPcA4CWEOxU5OCo9oofEIgRT7/K8kB7HT6AOuZtYQUkDggAKqmO1era4xt5T4HX7QmsT5xtBocrV7XkwxQKorAgopAnyqFdUFnQvzufdlWOKHbw30Qf7Od3TimLwfvPwtwkRd4Uo5xFC+NowBHbHj7TJS4CppJmQO3z1Hin8XABJ8aR/nm+H1KHCXNCt6qlG/4Riw8Bm+6TWlGu0/Mt3YX5ONmJPxOiaPAlzSOAo5qfkFhIo6S+o7GUXLSFa8ME4FsToyYiMU20QFMz1TiKOmAEwemA1VpqNlXECOGUbTKluSsmpofXnXzw6NXbtu2cnT8wY/WVA57YMEN94Rnrl63emb4uYPXHNxa2XrJ5oXRaVXFZXVXjF61+97yEWO/N6tmrLc4uzJyZduGH7YDr7LOfkJk/lPGyVyiZmekqRIPTjGFLBgSy/CLDiXR06jsnjiSiZ4Omn3lQMjiotEIjJBZ0lXIIig5V+g10K3R0pCQ9VjTiROh0JiqkpaZU6cCYCHp8t/DffrWiSF/0+K5rBJDBt8A9NcHiv4yo4zQwWkTgzMGE/oLdDkGXcBeiIYACg3VX2b0rAQMI2vVDAUl+kJlNwFnS8WmLddf8XpdNDry1QUP7CVe9rm+9l1rF0/gjL2e+ydceZ9iE1ygS5+BsaTEYMhFYjCuMWQr2TJWnjEW7PIybncv2r9KjMvDfdKYTYp2wfgD3qqbcAPDL5b+8IslGX55zfzphnPDL8M/+3SZIrADQygSq8E9cVajT0tETejc0I3cAdGTypEga+U1pJwUjJSP1Mi/kn9VA6PeoqRL9Hq4zb2bKB9g/NweGP/A+An5dvGTSnKPvGUy6SAdHfIWck+H/IC8h/SSj+R28pxcIPPkF3Il8hqwKvKa7umobEYup6EvIPiV3Zw0DJmALWUEiVXAMSUG5MtLMcoIovK/78v2O8PDzCU1taPds5SZONPwpCVibZj4tjK3G4CmEfC8lHgKr1on6lVfNJ6yAaME7It929jNYW5FONy7M4z3tcgbyGuaLqaQGcvE9Il9QkDZLq5HzVShu955J3HXDD0BSwA3uWGSXJiKmwceDBFAgkWTTdKoywnRV21dI3GiJhAcOjDFjgz6FtZVbaklWL9x8qZNDVNnz57asGnT5I315FfR6VHy4cKbmhaMld3bvd7tcuGYK6JbFpLfR6epcc33mS9ofMbFDI2Q0PuLNylZxkp85v0EXTT1zaLsf2KkNZOSR+niT+JqzDUiUlLoyqTlU7kRCoR0EdECno1dmTxKV5jS4CMhCjFgpTopkVof8WxqmDJ79hRKUjgYDAOR8pErxpDfI0Hkw7ELmm5aKLubpkUvbZILF26hdEW4NdzLgAELEAVblBgfRtFRaRQEMdafit8AvFlSEJulAIfqoAlODhqhEXMFyZBFR0vzoTm6g4/h7CoNmqKI0dM4v3nk5dUVo4PT5jmjxqLGeS2BiVXFhcWRUviAu37R3lvbp1133bR3f6m9au/28VVjZ84YW/XOz2mOmLyNZIE9RF/haoZa7bie5hZRw33+ajmTUi1n6q+WM2G1nLm/Ws6UrJYz91fL6Y00fSJRIoE5RDkkaE9Uy7nKXNxBNR/r9D/5tDNfUhwX5B7ltzKZMPPLmJgDV78rKFkAXOSBC2uhRiDDoIJkLiiZ4Zv8QExL02K1PJYLuCnSywIEkqX4llweIBAnSpo5oEqJ2UIDJgajVUhsGmFZVD5BA+gVqP+OdVEU9mFZ1IY/vBhdcd/IyobtM8SuypH3rYi++Mgljyz7wVFSTO4nRY5dd5IpnSUTR7K988F1n0LizzvI59e+scXCPeCUFR3gOftH7hT47lHmIBOD1evrDoarwSuq0PbEzOomkRQKWwuP+aVSrifOkLDZ7BNzaYkeEEnEJsyeA8DaE9O7aDIymEN0AxqVpKeYuxE/deeDkRyBABETasIRsVF4jmdzi0tDUUQCbhvmNEmhCoBfVcF6DGqUClJxJbwyNsndCJPoIPCd3ioo0CzkruITKUlJeMC63E43zYOpQ4ysZJpg6j6mFeMum9dDSmwTq+tymrp+ePnqN/yhgieX3fPzmsj8DFIv/7cbVEe4cdXSUMuGrJIFe0fMq718eMe+vAcfKmE9UeekcOcVDe3bl7WsnVsybs2zu0deN3pJbrS5bdH2ZkdNTX1heG5BScHUttaXrh45Qon1jGAe5WfxR5kc0OfTGNHmx9QfscyP2RlEHOYXs05KuWDucq1SMcormDtMDyvOFWyHWa3Z6nDlGGiYoRABqgV8UrFMOKw1mFn4RsmNsIddCJDCLtCHDnVn0avzYvFTWHUOgGwl1DDC9+TmF166Yb/vySVX7fft2/Ty8Y2P+R5ftLh45uH11x2eMePwdesPz+Tv9B1Ytxb+5sbnn9sCf7V+/T7f/hsPv/B9+fUVL1x77Qsrlh+99tqjiuwk4v0ZySgtLeU0YimnU2dWAj9aDPzEeQ1+IBnSgkGkHhR+aizINCgWJJoDKeEgNBLoXjqc1PKp9TRgghQznkha8Qg+tqTvFPla1it7CLKWnO47hZ+1gO9IjFH2BO4o9IWj8ldN8tdET/egkzZAx+QxarQfn4jQSktf1Ag72gKO2oOmpnJ2W996zo2/4R6zzs7ivLCGIsxE0sjQ+j+pENBjyK/Y0Ul+0XpSzAhIDUYssxAbKLwRRwWkAHxQGZAmKyDns1PHpytwxm4Vxx2D9faNWH7s6OdVr/ZS7KOg8ibtN2JrCiovtXZ7S8vtvu4y/C02WbtHNLXC22b8DXfqbrePg7fj8XcM/jIljbAsEoOP8ao9EoN/hVfNSUDfnG5vbh0POL7UW1beNCKRa9hf+3mxP6Cwv8GqgAetEOey8vwhXO0Bm5iLYs1R3J+RmxegwuxSgix097QuXEUSMb/E8taBiCsJbko1DufKoHvnVZzXQmbVrPjJ5sd87XOXLJnb7tu5fsu2Zx9dezBYGdg789o98PFS/PjtRVe9+oMxq6c11pRWXdnclpe+5Ori6unDgz+4UV95zw2Lq8dVFeXmltVdGl62Nad4+ZXL75/aUj6qde2cYa3l+dm5vsY5TYcml66Zu/X+zOoAe1vp8NJSQdDxVWsuLW+r8NosFetx3Z89zd/JGjUsSFQ642ewbMcSxMCXaAwo8S8rNQYaW4+oUTazzTa6YwpSxqJZAqtUrL5qi6o8niqysaiqqKiKj+FveI+/lfrKWWd7NB9qVjACUwL6ZpXqBWeC9EX9Uhhe/H6pHF7coHVQFpupQbUZmS6eFmtgKBmlMEBLT+MG+oXUghmHAVBDlkzeXe5rjFI15A8LtmaDwZZb6mOGNTQmkkUxsSED/XpMxipmww5ECJgrQmMSrGugC8cmtDI762Uy+pW7iPbFlStflE/f9Yp89OVQ2/ofvLlUIpXPLn7271tv+kJc/KevY4dXlnvvGHfPqeiirWPaby8rX30o9jV78BgZ/dLKl+Df3Smffnkl3mrpm49e1yqSSnHr359dvPjZL75/tHdLeaj510913n1lQ0td+VZwnqheXsRuZ7s0fiYLsPwKBvRQPI9npgI/iv1xTrky+JUyXS+FSdnAoGwrWCCfpCnE0kOjkviRzdDSe9EhdHOmdBdlUh5CWAeAO7FYiDHO/g0mU9qgDaaB+0uJDH26vaRddNuc2y9b3n7T5JLgNZcs2Vp/2e2Xbx++5NLmVcXFq5ovXcItuGL1nO1jLllU2lh/1UK5fuKca+a3zwtU7q6smafQGGU2swe52YwGPJbCRJVnXG9jdDxNMKRRBYnVRtQCMvBTOPo7SsZ2yEfg16rEBSjTpfK98p1klfKq5I6r+ecaplrJPge8oFZKUryjTdSqxXgOP+WZZN4Wam+P0Mhd38LNaJIrye5/rRaRZ8ayWu4g6N80sETF4Kk9wiTLr9GHscKLhyLfEvCgPSU4HI8L7EphQKz0KzstVZQ9ZmVZmJWQVjHMekkA87dxExHhPPyDXFqtHdcp68SPf4YT7gQvRSwXuo2cG0ucxFybZKUYusQj2Lp1ZhtG78RKAfSeKgOqIsNpL8Qc3UItOOlKwbbL4/U4Q0pBlI+MlePr3lrTdyguhz4kwz/8nXz8d7/5SfP02Z6t4zfPv8sdqS+6iztyqG/NW+vishx/6Pe/f+iR3/1Ovop8MWXk2Alvvv66XF9SVq/sR/P72U/4D5S9XOQx34M/KXu5AjAW/mR/OEzz/rn95DTwVcfYmHaVpwLXQ2P5uPVORDtVZHpgjV7xIjSwMnCZWLBigtXqOLomBBMm9vMaopZVKqrNm6hKL9KGbnpx69YXR89vGzl/wc3z+XJ8t+WjtvnwwYIFVJ4bQdlhfS4HOnW+6q0qFQ+iKYiJ+OByxXia1MJbAIpraF8GjQ5lEdSt5SQac0wG1gdiZorYzUrObcxCUbqFV3bTFS0cVMom+ot2MR6QKNyNRgeU7hJmBTeH3aN9mMlnWilfsTrAQOWO5kdrT0oZRuoqaDOSSTc0WzqXSaYWadPMGYpCDWFifUoRIqeWV65Y+8hdY66bMnGDu7x814ySMaNDhcFJm6+5lLzHzam5dPNdW5pmzWisKWloS/fUdlTXr1207vKmEJ33RVwHuxfGV8lMZEQfNQS4LkDBYbVkjir/OiyBkcowJgo/fhyfUamfLEM4ni5InmJ4ddpimVn5CggPp5TthfpbDOi8auF9f7XWovKS6zsWrbt5Sb0trWnB5utmtndVe696auXekoaGvLyWpvL7tyzYzb3vCTXPmzprJlfPdk4dPyMYLtnwvSv8432ZPJvj76i56sYJqhwncgwKkd/nzzEAgcZK4bGz5Qfgn3hpegHG1+RtvIf7AHD5RGUfWxRAhHhEpUqAzRCkke5cqvxzlD2CHDW3CXiDJUH6HJg67GlBNLj8s9UYt2B1K0G2ZNTPi8E2ryA2EX7u63XRUF2WVZsv7LG0Hp3zWguGuPva5S+vxqjbe60T+bBGmnDlzXI2HWf4bJA9RfOWWtXVp4fVp6f6VG8EedUEaNTMmNjRihNKu0j8mF+qVdejhXLCZq0Loijj/4vC79xN2qInondzC0nxz775QPNfp7O5K2hdN4mRLDYM/ngVA2BYrdf6FgXd9sGlWeSrbK83O1eta2LkzWQb6J0sph4tLt2UM/jjAjW3RMymywQTNnJQ8NBgghNhSnOg2hQEMR3zRMIZ/UWi4aCuv79FXuvcximVlZGCyhHRUIF/+Lg10+qvko/WN4Sryv3e7GfvyBobHTnDTfequTnEot3JaGH2kxXVxnMqqsO0orr8mXB0s+bUc71vsx/tUOzqAsAOpwA7mBgn08yoOEF0qEg/Q6k5MNKaA9rVA27tStTBGmgEwjF0jw4b1YZI3AJp+x3PPnvHdqnp1rXrtm9ft5b74K7jr+686/hrRPvZ449/tm+wfS9J2HeQ07ix38QbMY+Z8LgnjVV0iYAk/AdGXj7Sgb+2Ja82J+x7ip3ncW9fM4vmDhmB4kxmu5LZJdrVrGZ9MG7K0BFw9tKDkglYIQRiGSaU0Awz6t6sBIcxTg2WQXRR+IRLzU49PLuAgXQ7df1AI0vZ6kRIxBihyEpvoJqRkTJMCtoigsRlKvqHzhKmMJWoFc5OT6jELdB5m8UtntB7L5tNru/YtKlRfoZ08o8qM3nmVtzz/KSOzej7S90nn9SRUwqWRlr3qLSWMd9XduywE0Qp35OkNsdhwoRZqjXLU4nDjMdCI1aIxYRCJEdAcioGkCMIcb0hM6dUSUEyJdDjIV7gXJlYxymRHAy/aQeR5x5sFBI196mUbhhgIPwzOqpV+zCQ7lRb0ZpVO3t4v6mA+V7EMNrZmgVgK2qY4eBRPM/QZi1iQzCWgxzwBxFWxdIRAhj5nnggWpUOk18XlAIw+fWBWDSAtEdrDb4478Pvkn7HAAOD/Y4aQRyaFK84FIg10DhRQz2IQ2MDXjYGDIon0lgG8MFfXat4IVHwS8RghBqnbjBOWCr8L1onwzkSlLRXTWmD7FVjJGmvSNE5IsbuLQqNABM2gw2jCZsZDBejCWtPmrAtE/seOVf6WGaq3MVt4z5n3IyPuYaJlWActEKJgxb4pSw1YATKJUPoETMUW2TBdWQVvVhvWaTUWxb54156RSNJRRkoTJgQpBcOmdKyCoorlPRlqaQcVVFFFrIwLTdPcb+VCktvOFF1majUKiVJ3T5VKbX0pJZaHhrtf0D+4zPvkDll9V5vfdms89da+k4d5m9JqdHllBxf7ee0Hs9ywYq8dD9mFgxZkaek/g6qypNfp0mFKbV55L8QAfybnkm8cDn4mYvJmMvlB1Kf+QqFHQOfKVzwmTa/0tllyGfag3aPVzf4sX97q/2dyAvxc577z3+m8PiP9NnFzHXnfbaY45ccSqzAwid6g8SLFaeomDpF8UzF8cGwgasYSxxYizGHrkt1vJIDNZipWKk1tRVE6G6HiyrsFEpKqA+EWwmhIA3ocBgeOGcO3543dVizt6imsK6tbn7yMpXQN7/3cHXbyOqu5YlXRY8pNM+gNNuYbGb6+am2+cWsIHgsgIYDNIkx7aRktdH6NXRlMm00n1FyYMUawT23yNCTUzwodHMOMaeTsRx4SaVBTg3rqGPXadWx5zJrLzT2eAbPXAPzk+2PW+gVzXZIOxm3G5lJPAYAMXgat9J3NN0h0y7YniMs7jYYB8xcNqiL7rR0WscygLLSfo9NgSjawbS9uHLvihV7R0z5XmdnQ2NnKm2f7125cu+qVxqnTLmmc4qCoYA+7ae0nsCGOZB0N5gJDiyYtFjTkEYLrWNMS9Yx2pE0wBhY3UY349MSm/HJIkqcNEbisTjfRsnoL6OEH464BR+3iLust4/9si+N43pf7HvuE2JkvcnCyv5SXqx5lG+l9a/1zMaU+tdaDHYnKyCL/VKFpkes9sfzVTirNHNQiyArlY0Q2syhEoSo2WjSOHNy84u9wVrK/+oKWEhed1kgiNo5H4MEtJA2rmMSdbT22vPU0WpSYLB3AECuYtnzFdi+In9aWFA1vB1g8uKCvJb5jZ0UPPtu+vNTC9gDe4aoun2fm6Zg6KxwpA5Bdc61hhXPqfE0WoMKus0EM3rR6lfrxapfhXOqX1EQUypg+zyzyZhocrq0nyt+3f/9caCZSR3HV2TMbHlPciCaE1TXp47DdvFx2C82Dse5/FCsQOpQlp5of6fhaHzQWFT9r4xnBq2zy8H+LRcaEQ4oOyilgzrMCCR84PMPDx1N9DUEUJiCknufZaMu8qBBM4O0Y+roO2l0m2ygGrB/YvUDot3s2T2wIGG61b0apTOWhmY36ikQ1xkSezUcqi7wwhehpExoRRE5HVYTHVmsI2Gt3+o+iL3Rq++iM21sVdiavBWM6RMY0wm4F/oMJWrVi57ey0RLXoxwrzT0xXS0ShHHpswe3jZLmbVdrYnpStyZO/s23PcDar9w1pqV7ikxA0JwcFptyn4C7qI5UvcS1OorzBVXJ0VtoZLYVsCnJuJvQcr111u/Rzmscvt0Do5AfQO8ygKfqIbm2RcxVzGxdEaNAXJq4w/w0tM5cAAKlK0+N4zIgylmqIgFE90GF9KpN+QGYJ8u4GU6buoJat6g0IObn2rJq8GVyJ1KKcx3C/b+0nyUpqxTZHdKff6ylgEF+mSzvInd3sTuSNTps9v7YslS/T6xKaEr+PcAExkYD3bwHFSpi8kqmBle6JfMvFLU3l+3awRz6lFAkYfu5cddyjtXf01vSX9Nr5ThwTK47EhE4ly08UBKfa9kx+5RRg+gpEJBEsBzEc02KcM1sPLXPiRYStQD7waM1FLqAWDU2o+RWlOrhDXvDQGSOKVuGGQX64bdGOEdonK4aKjKYY9aOdxt4vMLlUT471A8jOr84gXEWkTvFy0j5rZT5f//jBY0CRen5Tc0BHlRYtiFiRjlQHqKz0NPyVD0lKbQ4/7uc6Mop4uTNFVxOb4lTWiIEjT9kdIUZu4agiaxyi95Yd3V+iU3rrv6VAoBu8bDykoLWzGwEvcp73z91EfgtSIs2A6ZbNluvuoc+iVvFay3/DCss1pBKgmgl2KTKnyRi3NmyDV4cUZZhlqdbRfn29VD+zUKD2dQHpYwlWDLhuAiCMawoOQGC1EWoLH9fiZi3boHjAVoLi9c+uAyhX24n+XFHStgH/+dhWewib84c0Kpu9sX58ljqYAAY9UjuQW8AywkYzeQsIG4DERnIDtJk3zcR5pI1Ce/Rn/Jx8kKEk15/5qPROXXkjIJ+N5FIy+zlewupQVAsdpQQ+FrvjYZglF7iOIOcJqg5OyUZQq2w7ze6nAacoso4/LBOz7MGNJsTm2OL2Wr3BUO6uhuOY+ZOp5wKRYEuUgplbEMlZ1eyrr4/d72pht2IPde3FnS3njDbWPXXs1uv+kJyjvHTU8hL9ddzR54A9g2s3XRHPlnz70OnJsxYsFcUnPkSfm/p/OjOoBxfdYOZOMTxDZdyXn5hD8IuiUdkMXwoSq6HUNVdDvViu5uswWkwDVUUbcdgXpqYferqMSHqu7W/EWt9fy/NhYK1lPHQu6hwZmhRsO/pire1PFkDD0e11DjyUwZj33o8SRA+4Ah2RUtev4xgeLk1DHNgDG5mALsoT14VDio/KBkhwWfnazNUYeIYWknrHKnUj6YZ6PVbYmBY8anU8DsMg2AkbwsRCraIQv2bYPxeyohX6au4yHnmx2I5ZXcMeCznkk7t1rcnKwWt1y4WpzDGFyyYnwsmtk9qXXj3HplYvt7jZgZJzM+pTIqnmahnk8aQFnOqbT40fbv5ACLWEsgkNjOQR1JM/2dFtqOS21Co27mp3S+aCX3bXh+9n8+l9p3RP766meXPvY7+QjZeojkH2ESuf58u2YpyNr76qhyqe7RqOq8Hs1glA5muLFHHG6lOjodqyetUgiT5OFSpyhzl7FHalJSyf57w3Gfkko2zCpWHAPz8I3oONZttznsPvio2zeswu6LwduUOg74jNZx2OyOCt+wRB1H6jua0OUfDqS7MeQuFkXEkK07jQ/WY+BCJ0i5xRgcqy/GnAeXu0iJIwnJPuxqIwxshsomghVY45HY3HAK4qE7b5BKG8eNaywdvXLbLStHl11yx+wxq6c1uGtWnthx/+iVt2xbOXr0woWjd89efj/vve35jVcOGxeo9FWPKq+fUO4ua7h6Qt0VU2oyqwPFlbtunpsoABmxsKVxQtWk2bvWn1HxFa0x1+yhNeY+ZuW3qjIfdt4q88oBVeaHsMq8rOLfUWeOjuzFas1vASUbvWDBOTeNxqAH0rzu30rzc5TmcrR0osMmVvzrpKPvfTHSx9MVf0HaWb+q2wfSX/Ut59x/Xvqrh5hz379lzhVLcTHaG06Meydy9NC3IJ6GgZL076D0tzDHB9PfRFul80MyIl5fY/CZVXXUmsoTQEHxFgWHtwzkkFiLG1MhZcOgLYVbZdgiSaptAYDEWTMLSn2G+vPzTaqph6uyFkDqTQIoH3j12aTa0Hfi6JDY/WIMvrEfrof6QfyF+R0+F7XzKt9Zync/eD4PfgvJQ8GrC0o+MOl44E19KssxHa3SRs+Swf71IbgMDRLOSAq7yym7ayrBK6LsNvw7hHRwnurFmDnTo4T4FKBwQR4uH5jkmuBfj8q/CHP02/EvHlR2Rur9cZ+6M9IwiI3xGmWTpMaKDePjlcq7ykHMbDyHmXU1GMan3KzwVfkvwFGpPgjGsHxYZZnqA3w39pYms0IuxmDzqr3Ll+9tntLYcMklDY0X5vADuCez8uvvTem8plPRC9rXuK+YGibKtDPPMjE/RsPKg1JIQ48FQPaKmUHJCG9HBeJNhX5kchNoBX44vaQ7/EoH8CDwNmiV6gntkYP5EE0BsdBKSz8Sbb+DDC1LFOsF7JrmR5NRaJOcw2BpjxBimbg3HRHzbWIp5oiHMEe8pHRYIIJ/14QlaEpemtniVKt0kY1JntYBGmNdSuZcHnFn9DcZoZlYap5NlCCXNYlOGJuWPH7Fn+56/LZlj7f77yLG+mWLR+v8P15/6Z2LxhT1fqj9+VMvbykZ9+Sa20/W+n6x/eCpkeLOR49Fn1+6k/WzH2Y3TLlhwsh1U5sKSHDR/e07Tq39PnD9QFZ48ejld4Xnb7l/ivPFs8xu75Qp991+80MxYvl077t3e8dfEmhcuyrRRYMwG+SttLdKLe4zJXur1DBqgwBssIL7shgcqfTHc9R9ppDSOtZM0SCmmmDqXh3GQNLpPhNvy8zKcRdX11ABrcRO4sX5Jf5q2nZZELMitEkL7jOpPVoUZp7boyWdnH+baYjmLc27lqRsMLXOUzeYKm98YxH5/M5BHV06OvlZyuZSppqxlbPRsPNPis2i/VLAZmO/lDJmwcU6ppSfp2NKhdoxJc4LzhJae/y/7JmCLu636Zsy8XIyJnrh5incBBWX/P+NRnSuvlVvmEIFfl2QSrYkib9S6fRdnM5h56GzMpXOsn+BTiz8A6D1bUh9SNmp+TakItriVVpZSuswWNW3X5haJDYYlMrA3PsDiXXdTzoGdSvAzFdYaRv1gI0WbCQYggu+Cg8DSHcWYNROygrQAvD/LV8Gu/rfhkFbUrfwLsKmhYP29bBfTJjm86bsx5GU/Tjj4H29Llxd7bRj2JkdtPsLreuAX8ZvdZ/Evt4iKsBpTUp2cPJWMKYPYUyvwr0G7OuRlH094wX29dyKtNyn3vef/0zcmTv7Jtz3fVobNGBfj3yLfT3jt9zXi9CpeLPpGk9KzdCZVTgC9U2iN4lmM5MLntBc5SxGyY2dIhItaSSfRnF/SLIlEt1aMCueT2ke2GXepLNnO6ht8blpnDiDBtltYJ/jBqNFcAxo/FXq1XhL0HxgvSIjOM7bwmTOQyM3/0T+vYuwExaVbOn4o+tNsvv8PU0mz/3xnk2hNXUjwpcMXxiaIcfkNXcP3eOE9kfaAXyvZB7u7wxTgX6Pi+8Z2CImXpyX7sLDOZLlIWq3mG6HHeuPKxWfp791TLfbaILPC5XPC/1xd3+NSCGA726tK72Y8kptKyPlYVd+B9a4VghSThlWh9ukQnfkPA1nhvZiBrSh0Qx0WdTLc5rT8BuG3A9UZGIP7Vfj6d9zGtCxpniojjUlaseabhNfqES/v0vTGmpSz9+4ZhINb1ygew1XnWJf/h+Mn5rLCzTecStW8gIUsIYBNjJBQ+l5aPAORUNZCg2e70xDwhSen4y9J9p/huGGi5Kh7PUpdOygdERwhz1JRx1tqMz3ExSvLs/1wEqrxpXWkEpbIfhkEWU9RazYhC2x6ir76UbnbFiE7vjlevjqcyiXyqthldE+83WC5K2FV49NGlYZubhcDrneLsCiaUOuvgtyTBgqXqDwjqW8Q4+3awgpQCGoCkoesBYVgcThdirbMKhfAoajZECoIMEwDBmUl9A9vlz+OwvKOdjg/OzY7EmFBBfiwthUQMDRsxhP0VovrLIIM9jkQafkQiuVhmAc8WhIWpGSgaeQiXwgLigZ0PoAjdArRYKJHUlWTWD2FDVyj/Z95sUCFUxVLsvNYXc1Ncnz6Qfc/PqS0pzciqT8gj+WAXNQgVi1f1+wKNFiqn9FKp0DXWba/wxD8WlmpWmgC1W9IyJ6BdwdtDsN2UqOQW6RsjuoddqyKlI8L9wdVPJe1N3BsIPuDYI0Zqhnh3mR5Q+urRk5YcwEYPtj10VGT9vWtow1LtwGTL9r4b04BdF68vnOv942q2XRmB9fA9bwyglr7ul5fQt7fOpN78r2Ocj7BbFmpQ8p2MQ9YBNdTOd5uw1lnqfbECJQTiXRLHQLzgylCPaCjYdQ3w9sPlRDVfw5HYg0ucrezb8+RuyI1C04nDg6MU0QMy42RtTpgxok8YoaP2eU3D8Te0z948zGPabzjDPnPOPMVccZExwuJcf4QgNUFfbAMW5QQ8LnGWMiDqyMk6XZgPQsjyFHigMtCkouvdLmozh12GqaH/YywWI4t42ebZRCDFpUupsoaC9KymCVMpCmrgGOxTmU8bWpuoNVeijBHFgZx1BdlJx+zHX4Nl2UcGtxqE5KbTSXZ1A/JT65z0j76Kl9aQf00WP/bX30hO/cR0/7Tt9H522kx6k8Y2HM2OFm6mCu4coqCEoOEIScAO1kYzspZdhoGQpWa+XblCOKMH1cYq045Iuzd3D8eChW/zE1X34wx48MnPetZz/Rr9csBYkuZ3Yo2prmKdJQWqG2h6ZO4i6vkrbt5XriZmsmnr5n5pS2eDAZuQJtxoLelgNbv+I5CNZALI2erJlmN8CyCMBFusFHD+fW52J5TSYSbMU9dCem8ZkFicFGT2k2SV8cSaZuB3iXkJqInuiVQDNowkJpsaeQ2Tp7/z/vfpaUdfSnxva+2CH/+tnj8smHxmLyzCvEM2qU/Ltj8mn5dfbALsK91CU9TloTieut+w+9RJrfOCr/9ol3T5D/fOtteY9qy3TYT7uaaWUmM/eoFV2wtkMwubkBasewBHYESGZ7IN6WWYVRiTZcLx0UV9SY6ancmMCemd4jtgUw/WUkeoOGHukSeG2oAfKreBphkEzoyYwEPZZfhKgrQ6CtfTJDWGuUX0ADNm2CVNOA4V6bREwpSAzPcDwnMIHtPfghoEgyeosGse3a6aOr83Sm8vbLt00YHKzovGP+hApTWsnYWbd2nANTuJkDYloUp7gjoyaNLPBOvXxsdWoYo2r05ZdWlHfMG1MNEGbjezdPuvEJFcLM6G+JzKm5DTMYPV1RUwZmN2DiuSsopemVPqpZtHzXYqPAjZ5HY6LnwGO2AawxusAukAAxeBn1J0N8ODCnOiUn4sjA/RWlnvojGuvw0bOvuWCypFpH633V5gv9B4bicSuCEu9QTE4i0KHebwW7GLB/FjODiWWwSjs5oFsyoEhl01tmKUAeDEgawHql8QI9KjANrQZHtYgBdSCTRWVI0jnglUtsUwlDYvN5Q+HvoZzd1H4TzIBuEv/id/xm+p3rnB4WKY0r+JH0n9C/13Zd/O+11erfr+K1JI+ej96o1IOL6f64of+IcIaGuEDa8IhwXVriiHBDutLGjRNEXtmCwnXl7A/or2oPVdYMN/N5xSW5RVX8mnG3lhQnj6jEc8nhuR763AB4Ipg0o/n255LbL3wuOe8rXuJnAYeXNgSUg8n/vz4HnWW28VrWT+nzMHNUzjqDwFzRHVT5K2YlIZDOlMpizL2x0YB0TyzLhp9m5StHnCmMlxiMu3KCxGdEhmR++JxPtuF0JIfcm3g31OQEB04VnnkKtBSotHQosyXmBdUJowVuxUPwEJUPYrpC+NSJxcuMMztBBXJWshRGhpzL8IW5/c4Fprpk0MTT81rZAjrvdOw48zAP6uSLef/a2F3/0tgHik3JYCEizJOknI2wR1L7JpiUvgmmAX0TTErfBNMQfROevGb/2rX7ryGfT1m7dkrn2rUUq+88+xnfBTzBM3TzEJvpKbLJCQbVngxSWkYgkHq2Lj3tK9mkAaPHWLCQrh6tS2sa41lK54aCQcfrlgxxlejmcGDga+LI3dxBr8r59ZvJr2hvAjz3RJvalUOXCL+ndhpKNBga+G/diX+LXQ345D+nfdGVLg3hQb0Mkh0M4D4dZz/RhDRdYNG2MbEy6rbjiV6skiodZ0hZWmobw7heRz8Ay6znlELQYbSRpzYgZWO6byCWTTvKZMPqFjMAM2UnuhqJugDdksrGKn+DDw0XA969VFIaiUg2fWpHYOzK5wkF65hEJR9PD09xOmjfQiZRb814Oxbp9YtWhcnyL9TqvV/LL9eyJ/p8ej37q75wkLT9Wj0o80t5Vx05Ha1pLZ8U/Yy4sWyv75fR2rby9uivzjJ4XibxfA5ry8Pt4mbRM6Ic6PHRwi/ajQ/bHHOBRO8mPEhebwF/RDkLTKsefDPUuVGJfQnM9HFYacdNi1E5KSzdgUUtaRG1Vx89rIEIwRx6jh7n4QQPCW+KEHbGli0zInusezTuUEheTe6An9dQIuQoWStvxx8FT8BC+Ij7CFaDN6VndqLfC0cbXqgvqt2sEdwC/pPeArWvA8eCTnTSuPAutYNnYVA5psKkRv6ldLfKDiEQz8pn8FT4LL0SMlYaQJ+3bwVyw64c8+sx9nR7Cl0Wn5RrUwPLeEaEFmt9PIVYe6CcHZ2lOEhagWaRJg64GHi+BTPg3AM87WJMZbbPTw+7IC8njkFQz73IDmUmjr0gmgHnItDzOT6m9Gdh1h+lPiNID1cbyALs4aEwgMK0b0c1TniW0rhFykjQChQShULXhSgk59J16lx6emcl6u1oPxL+ND1rZBgTBhx0St1XragPKvMJ1o46rUVKL59ua2ZppNhF6YrZXGUg2fHqEJ3capzc4d/mQBKUb+yRnhWQKmhTsFiFD7+rKIM/81XgpQ8bilXQxBepEWWgvhJkIAgyEMUyC1wQWgPIQGUFXOUVwFUj5rWFqpFX1SFagC2mCZIBjJWoxW6o5z32xD00K5PCUmpXuZpyNgqZuu/GtWOBy9WzFenxZGZ5PFmZnrwhjk0ZLE55mShOnjPTqDzR9cR/oM5BNfNiYgYqYQaqEjI1aBpiMA3BYOosELHm38x6VMLVIIiBoRmunCgTMxjpXkCV8L9g8cX5euri7FSl+f8AxWeXVAAAeNpjYGRgYGBiOPrTgmtSPL/NVwZ5DgYQuHRurSCM/m/7L4Ojkp0NyOUAqgUCAGXoDFIAAHjaY2BkYGC3/3uCgYHj73/b/10clQxAERTwCgCf0AdDeNptU0FoE0EUfTszu5EiHkSqlR6UFXQpIlJCCWXpoSKlh6JQKngqKrGXaESwlUhzKEvoQUoQKQpBQokY8bDIHkoRQRC9KHjzJNqDhIIexEOxENb3R1Nj6cLjzeyf/2bmvV31DWfARz2FfdQBwGmiqs6jbBaRNQ9QcJ9h3D2EaWcGZadBbsBXK5jUPzHMtbMqj9D2HAPMR0RqCKGp4bYZwbg5jQmzjMecR3qD8zuoyFjWS69obOMFst4oxtxeDJh3SNwpRO4cEnOLGOW8yfkSEvYlehVHTZXcRuKdYC0i9yMyxb9cZw/PbuYw4U6zTk3vAwbdwxg069R/hILzHGflzGRfX8Fxs5BuOSu8Qz/vXkGsf6BELnGfkrOJwI5ziJ0a7jm1NNSbdhxz/1jemyXW58nzuKmusb+Oi2ov+qSmX+OgW8dJ/YbgWK9R8yv20cuE7FMr1/Fe9tXf4dOnETmrrLFaJt3ycuRfyKsNhOKZeE8eUy1mdwpZ62MPrhN5e5cp7r2MIet3hfqLCHSIS9LvriLweog15PURTIpHuyFTJDMLm0MXnGb6kLoFcot4T72+Tg47wXNVhW0WXbBZFK1ebH3fBZkQZZtF9X8wA+bAe9bSz8Rb638nh53oxfB2vQuShWQmvKeNKNPiGvF8nX7OAHoByHj/WF2gh6+IgT/AF/JV8mXWmEUH5iVCr2n/ixvyndv/pIEKMWvxCU9Mm5mwV+1nDyG6/N7PMWtfc399n1kR7l0ECH4DuD/ctQB42mNgYNCBwzqGXYwiTDJMW5gjmOuYlzCfYuFg8WJpYlnAco7lBasfawnrGTY3th62L+xF7NM4jDg2cXzi9OFM4GzinMbFw/WHW497CvcDHg2eFJ5ZvFy8TrwJvJN4j/G+4dPhS+M7xM/GX8J/QiBNYJrAJYFvghWCqwRvCbEJGQl5CZUJTRFaI3RO2EF4lvADERuRZSJfRLNE14m+ErMQyxHrEnsnbiTeIf5IwkYiR5JJ0k9yiuQOKQkpL6kmqXXSTNJS0nnSR6SPyIjJtMgayS6SY5FTk9eTT5H/p1CgsEDhhMIzxSrFSYo3lNSUypTuKf1TDlLuUd6h/EdFRiVBZYoql2qPmofaEbV/6hbqZeofNPw09mmKaC7TfKWlp1WmdUvrn7aKdoD2FGDwNOm80A3Q3aUXo/dIn0W/Tv+IAY9BmMEBgx+GLkYMRlVGv4yrTMxMrpm2mXmYXTF3M99lYWBxzOKVpYCljWWD5S+rLqtX1j7WG2z8bM7ZCti22F6z07Krs3tjr2PfZv/CocxRz7HNcZ0TAw7I5yTjpOXk5BTlNM3pnDObc47zKRcNlxCXdUB4xuWDywfXCtdrrt/cytzuuM/zcAIA5xeQlQAAAAABAAAA6wBRAAUAAAAAAAIAAQACABYAAAEAAU4AAAAAeNqtks0uA1EYht+ZKSpEKhIRC5mIBcKUikq6E2EhiESjiV3ptCb6g2mLe7B0BRYuwkqs/NwAdyAuwNp7vnM6aSrtSk5mznPO9/N+5zsHwBi+4cCKDQKo8tNsYYorzTbiuDXsIIs7wzHM4stwHyathOF+TFvzhgdwZO0YHqTPg+EhpK0nw8PkH8MjaNoLhhOYsO8NjyJuPxp+wbj9bPgVS/aH4TeMOHHD7+RxzZ8OJp0ZbKCGc9zgEgFKOEUdLus/wRznXeS5f0Y6oLVCzypC+S9wL4UljlV45HWUOdy2LKGsfM4+5yb/BXruk2u4lmx5euxx1RTKMkp9AbO3dDtVM/TrnmGTu3Va8zjmXpl6mbYqeyu7kfah1BuSlaKK9yTDSkeGVnwWi1Fsd41A+qFIV1igSiXqbg3Fnt32ethUr+u8wQySHFcyvCh3+CfTCefKP0eF7EFIS4PnUn1r+SexJfF1Vp3njajXkBT/kKuAXr5o+LSW5LWorvgS4YlahX7dutrqeo4Rx+ygVnKxLDeWkxfnYpue+h7XxJZi9SnO+q/fxzLSciNF+jaoqM6oX4HPdRidQnX/gjsBbara8i9GHKevAAB42m3QR2xTQRDG8f8kLonTey/0Dn7PdgrdTvLovXcCSWxDSIKDgdARvQqExA1EuwCiV4GAAyB6E0XAgTNdHIArOHnLjbn89O1qZ0ZLFG31x0pX/ldfQKIkWixEY8GKDTsxxOIgjngSSCSJZFJIJY10Msgki2xyyCWPfAoopIhi2tGeDnSkE53pEpnUje70oCe96E0fnGjouHDjoYRSyiinL/3ozwAGMojBePFRQSVVGAxhKMMYzghGMorRjGEs4xjPBCYyiclMYSrTmM4MZjKL2cxhLtVi5Sgb2cQN9vORzexmBwc4zjGxsZ33bGCf2CWGXRLLVm7zQRwc5AS/+MlvjnCKB9zjNPOYzx5qeEQt93nIMx7zhKd8oo6XPOcFZ/Dzg7284RWvCUR+8BvbWECQhSyingYO0chimgjRTJglLGUZn1nOClpYyWpWcZXDrGUN61jPV75zjbOc4zpveSdxEi8JkihJkiwpkippki4ZkilZks15LnCZK9zhIpe4yxZOSg43uSW5ksdOyZcCKZQiKbb561uaApqJbg83BJ1OZ6Wp16lU2afufS6lR1neqh55qNSUutKldCs9yhJlqbJM+a+f11RTfTXNURf0h0O1NdXNAfNIN0w9hqUqHGpsCx6jolXDZ+4RUVe6lO6/PUKgwQAAAHjaRc67DcIwEIBhO3Ze5I3SghJFVJaYgqRJg6hiiSkoaKGhhFkuVMAC7MACjBHOYOLO338+yzc6nICeSQveuuspvci+cURXQipbyDd4OMoZOGLbEWBFDUyswC7qK3tZ4guOsO8aTlE/COMl0XZx6Ow0PIRb/UDB148FasXnKa70rNljmagSUM+U8HvnMJgSqRLypSmxKpE1NyVRJaYLU1L8QfIemSHT58gpMqv+lJCLD9LwTb0AAAAAAVao/JEAAA==) format("woff"),url("proximanova-thin-webfont.ttf") format("truetype");font-weight:100;font-style:normal}
-
-
-
-
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/fontello.css b/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/fontello.css
deleted file mode 100755
index 90328e75db..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/fontello.css
+++ /dev/null
@@ -1,61 +0,0 @@
-@font-face {
-  font-family: 'fontello';
-  src: url('/fonts/fontello.eot?26878433');
-  src: url('/fonts/fontello.eot?26878433#iefix') format('embedded-opentype'),
-       url('/fonts/fontello.woff2?26878433') format('woff2'),
-       url('/fonts/fontello.woff?26878433') format('woff'),
-       url('/fonts/fontello.ttf?26878433') format('truetype'),
-       url('/fonts/fontello.svg?26878433#fontello') format('svg');
-  font-weight: normal;
-  font-style: normal;
-}
-/* Chrome hack: SVG is rendered more smooth in Windows. 100% magic, uncomment if you need it. */
-/* Note, that will break hinting! In other OS-es font will be not as sharp as it could be */
-/*
-@media screen and (-webkit-min-device-pixel-ratio:0) {
-  @font-face {
-    font-family: 'fontello';
-    src: url('/fonts/fontello.svg?26878433#fontello') format('svg');
-  }
-}
-*/
-
- [class^="icon-"]:before, [class*=" icon-"]:before {
-  font-family: "fontello";
-  font-style: normal;
-  font-weight: normal;
-  speak: none;
-
-  display: inline-block;
-  text-decoration: inherit;
-  width: 1em;
-  margin-right: .2em;
-  text-align: center;
-  /* opacity: .8; */
-
-  /* For safety - reset parent styles, that can break glyph codes*/
-  font-variant: normal;
-  text-transform: none;
-
-  /* fix buttons height, for twitter bootstrap */
-  line-height: 1em;
-
-  /* Animation center compensation - margins should be symmetric */
-  /* remove if not needed */
-  margin-left: .2em;
-
-  /* you can be more comfortable with increased icons size */
-  /* font-size: 120%; */
-
-  /* Font smoothing. That was taken from TWBS */
-  -webkit-font-smoothing: antialiased;
-  -moz-osx-font-smoothing: grayscale;
-
-  /* Uncomment for 3D effect */
-  /* text-shadow: 1px 1px 1px rgba(127, 127, 127, 0.3); */
-}
-
-.icon-ok:before { content: '\e800'; } /* '' */
-.icon-attention:before { content: '\e801'; } /* '' */
-.icon-github-circled:before { content: '\f09b'; } /* '' */
-.icon-logout:before { content: '\f08b'; }
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/style.css b/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/style.css
deleted file mode 100644
index fdc7a062cd..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/css/style.css
+++ /dev/null
@@ -1,22 +0,0 @@
-.main-nav .header {background-color: #004A70;}
-.header .github {position: absolute; right:18px; top:6px;}
-.header .logout {position: absolute; right:210px; top:6px}
-.header .icon-github-circled {font-size:20px}
-.header .icon-logout {font-size:20px}
-
-section {width: 100%; padding-left: 24px; padding-right: 24px; max-width: 1056px; margin: 0 auto; padding-top: 24px;}
-.community-top-section {padding-top: 0;}
-
-
-.card .row {margin:0 18px 10px;}
-.sixty {width:60%; margin-right:5px;}
-.forty {width:35%;}
-.center{ float:none; margin-left:auto; margin-right:auto;}
-.right {float:right; margin-right:18px;}
-li .right {margin-right:120px}
-
-.icon-ok {color:#62A420;}
-.icon-attention {color:#EB8D00;}
-.error-message {color:#c92100; font-size:12px; line-height:12px; display:block; margin-bottom:8px;}
-
-form {padding-top:0;}
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/dashboard.html b/installer/vendor/github.com/vmware/vic/isos/vicadmin/dashboard.html
deleted file mode 100644
index 247a8cc0bc..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/dashboard.html
+++ /dev/null
@@ -1,122 +0,0 @@
-<!DOCTYPE html>
-<!-- saved from url=(0030)http://10.20.232.35/community/ -->
-<html itemscope="" itemtype="http://schema.org/Organization" lang="en-US">
-  <head>
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-    <title>VIC: {{.Hostname}}</title>
-    <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-    <meta content="yes" name="apple-mobile-web-app-capable">
-    <meta name="apple-mobile-web-app-status-bar-style" content="black-translucent">
-
-    <!-- Styles -->
-    <link rel="stylesheet" href="css/clarity-ui.min.css">
-    <link rel="stylesheet" href="css/fontello.css">
-    <link rel="stylesheet" href="css/style.css">
-
-  </head>
-
-  <body id="body" class="page-community layout-community">
-
-    <div class="main-nav">
-      <header class="header">
-        <div class="branding">
-          <a href="http://www.vmware.com"><img src="images/vmw-logo.svg" class="logo"></a>
-          <span class="title">vSphere Integrated Containers</span>
-        </div>
-        <a role="button" class="github btn btn-primary" href="http://www.github.com/vmware/vic">
-          <i class="icon-github-circled" style="vertical-align: middle;"></i>
-          View on Github
-        </a>
-        <a role="button" class="logout btn btn-primary"  href="/logout">
-
-          Log Out
-        </a>
-      </header>
-    </div>
-
-    <div class="main-container">
-      <main class="content-area">
-        <section class="community-top-section">
-          <h1 id="community">Admin Portal for {{.Hostname}} </h1>
-          <h4 id="community">{{.Version}}</h4>
-        </section>
-
-        <section>
-          <div class="row">
-            <div class="col-md-6">
-
-              <div class="card card-block">
-                <h3 class="card-title">Status</h3>
-                <div class="row">
-                  <div class="sixty">Virtual Container Host (VCH){{.VCHIssues}}</div>
-                  <div class="forty">{{.VCHStatus}}</div>
-                </div>
-                <div class="row">
-                  <div class="sixty">Registry and Internet Connectivity{{.NetworkIssues}}</div>
-                  <div class="forty">{{.NetworkStatus}}</div>
-                </div>
-                {{if .VCHReachable}}
-                <div class="row">
-                  <div class="sixty">Firewall{{.FirewallIssues}}</div>
-                  <div class="forty">{{.FirewallStatus}}</div>
-                </div>
-                <div class="row">
-                  <div class="sixty">License{{.LicenseIssues}}</div>
-                  <div class="forty">{{.LicenseStatus}}</div>
-                </div>
-                {{end}}
-              </div>
-
-              <div class="card card-block">
-                <h3 class="card-title">Virtual Container Host Info</h3>
-                <p class="card-text">Docker Endpoint: {{.HostIP}}:{{.DockerPort}}</p>
-                <p class="card-text">System Time: {{.SystemTime}}</p>
-                {{.StorageRemaining}}
-              </div>
-            </div>
-            <div class="col-md-6">
-              <div class="card card-block">
-                <h3 class="card-title">Logs</h3>
-                <div class="row">
-                  <div class="sixty"><a href="/logs.zip">Log Bundle</a></div>
-                </div>
-                {{if .VCHReachable}}
-                <div class="row">
-                  <div class="sixty"><a href="/container-logs.zip">Log Bundle with container logs</a></div>
-                </div>
-                <div class="row">
-                  <div class="sixty"><a href="/logs/docker-personality.log">Docker Personality</a></div>
-                  <div class="forty"><a href="/logs/tail/docker-personality.log">Live Log</a></div>
-                </div>
-                <div class="row">
-                  <div class="sixty"><a href="/logs/port-layer.log">Port Layer Service</a></div>
-                  <div class="forty"><a href="/logs/tail/port-layer.log">Live Log</a></div>
-                </div>
-                <div class="row">
-                  <div class="sixty"><a href="/logs/init.log">Initialization & watchdog</a></div>
-                  <div class="forty"><a href="/logs/tail/init.log">Live Log</a></div>
-                </div>
-                <div class="row">
-                  <div class="sixty"><a href="/logs/vicadmin.log">Admin Server</a></div>
-                  <div class="forty"><a href="/logs/tail/vicadmin.log">Live Log</a></div>
-                </div>
-                {{else}}
-                <div class="row">
-                  <div class="sixty">
-                    <span class="error-message">Other logs are unavailable due to vSphere connection issues.
-                      Please see the log bundle and
-                    <a href="https://vmware.github.io/vic/assets/files/html/vic_admin/vicadmin_status_ref.html">documentation</a>
-                    to troubleshoot the issue.
-                  </span>
-                  </div>
-                </div>
-                {{end}}
-              </div>
-            </div>
-          </div>
-        </section>
-      </main>
-    </div>
-  </body>
-</html>
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.eot b/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.eot
deleted file mode 100755
index 1bcc180eb2..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.eot and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.svg b/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.svg
deleted file mode 100755
index 42ebf87e3d..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.svg
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata>Copyright (C) 2016 by original authors @ fontello.com</metadata>
-<defs>
-<font id="fontello" horiz-adv-x="1000" >
-<font-face font-family="fontello" font-weight="400" font-stretch="normal" units-per-em="1000" ascent="850" descent="-150" />
-<missing-glyph horiz-adv-x="1000" />
-<glyph glyph-name="ok" unicode="&#xe800;" d="M933 534q0-22-16-38l-404-404-76-76q-16-15-38-15t-38 15l-76 76-202 202q-15 16-15 38t15 38l76 76q16 16 38 16t38-16l164-165 366 367q16 16 38 16t38-16l76-76q16-15 16-38z" horiz-adv-x="1000" />
-
-<glyph glyph-name="attention" unicode="&#xe801;" d="M571 83v106q0 8-5 13t-12 5h-108q-7 0-12-5t-5-13v-106q0-8 5-13t12-6h108q7 0 12 6t5 13z m-1 208l10 257q0 6-5 10-7 6-14 6h-122q-6 0-14-6-5-4-5-12l9-255q0-5 6-9t13-3h103q8 0 14 3t5 9z m-7 522l428-786q20-35-1-70-9-17-26-26t-35-10h-858q-18 0-35 10t-26 26q-21 35-1 70l429 786q9 17 26 27t36 10 36-10 27-27z" horiz-adv-x="1000" />
-
-<glyph glyph-name="github-circled" unicode="&#xf09b;" d="M429 779q116 0 215-58t156-156 57-215q0-140-82-252t-211-155q-15-3-22 4t-7 17q0 1 0 43t0 75q0 54-29 79 32 3 57 10t53 22 45 37 30 58 11 84q0 67-44 115 21 51-4 114-16 5-46-6t-51-25l-21-13q-52 15-107 15t-108-15q-8 6-23 15t-47 22-47 7q-25-63-5-114-44-48-44-115 0-47 12-83t29-59 45-37 52-22 57-10q-21-20-27-58-12-5-25-8t-32-3-36 12-31 35q-11 18-27 29t-28 14l-11 1q-12 0-16-2t-3-7 5-8 7-6l4-3q12-6 24-21t18-29l6-13q7-21 24-34t37-17 39-3 31 1l13 3q0-22 0-50t1-30q0-10-8-17t-22-4q-129 43-211 155t-82 252q0 117 58 215t155 156 216 58z m-267-616q2 4-3 7-6 1-8-1-1-4 4-7 5-3 7 1z m18-19q4 3-1 9-6 5-9 2-4-3 1-9 5-6 9-2z m16-25q6 4 0 11-4 7-9 3-5-3 0-10t9-4z m24-23q4 4-2 10-7 7-11 2-5-5 2-11 6-6 11-1z m32-14q1 6-8 9-8 2-10-4t7-9q8-3 11 4z m35-3q0 7-10 6-9 0-9-6 0-7 10-6 9 0 9 6z m32 5q-1 7-10 5-9-1-8-8t10-4 8 7z" horiz-adv-x="857.1" />
-</font>
-</defs>
-</svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.ttf b/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.ttf
deleted file mode 100755
index b8f1488d5e..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.ttf and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff b/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff
deleted file mode 100755
index f7201582c4..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff2 b/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff2
deleted file mode 100755
index 546a70cba6..0000000000
Binary files a/installer/vendor/github.com/vmware/vic/isos/vicadmin/fonts/fontello.woff2 and /dev/null differ
diff --git a/installer/vendor/github.com/vmware/vic/isos/vicadmin/images/vmw-logo.svg b/installer/vendor/github.com/vmware/vic/isos/vicadmin/images/vmw-logo.svg
deleted file mode 100644
index bba64db187..0000000000
--- a/installer/vendor/github.com/vmware/vic/isos/vicadmin/images/vmw-logo.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg width="37px" height="36px" viewBox="0 0 37 36" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <!-- Generator: Sketch 3.8.3 (29802) - http://www.bohemiancoding.com/sketch -->
-    <title>vm bug</title>
-    <desc>Created with Sketch.</desc>
-    <defs></defs>
-    <g id="Headers" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="CL-Headers-Specs" transform="translate(-262.000000, -175.000000)">
-            <g id="01" transform="translate(238.000000, 163.000000)">
-                <g id="vm-bug" transform="translate(24.703125, 12.000000)">
-                    <rect id="Rectangle-42" fill-opacity="0.25" fill="#DDDDDD" opacity="0.6" x="0" y="0" width="36" height="36" rx="3"></rect>
-                    <path d="M7.63948376,13.8762402 C7.32265324,13.2097082 6.53978152,12.9085139 5.80923042,13.219934 C5.07771043,13.5322837 4.80932495,14.3103691 5.13972007,14.9769011 L8.20725954,21.3744923 C8.68977207,22.3784735 9.19844491,22.9037044 10.1528121,22.9037044 C11.1720955,22.9037044 11.6168209,22.3310633 12.0983646,21.3744923 C12.0983646,21.3744923 14.7744682,15.7847341 14.8015974,15.7261685 C14.8287266,15.6666733 14.9149588,15.4863286 15.1872199,15.4872582 C15.4178182,15.490047 15.6106294,15.6657437 15.6106294,15.9018652 L15.6106294,21.3698443 C15.6106294,22.212073 16.0979865,22.9037044 17.0349134,22.9037044 C17.9718403,22.9037044 18.4785754,22.212073 18.4785754,21.3698443 L18.4785754,16.8965503 C18.4785754,16.0338702 19.1219254,15.4742436 20.0007183,15.4742436 C20.8785423,15.4742436 21.4637583,16.0524624 21.4637583,16.8965503 L21.4637583,21.3698443 C21.4637583,22.212073 21.9520842,22.9037044 22.8880423,22.9037044 C23.8240003,22.9037044 24.3326731,22.212073 24.3326731,21.3698443 L24.3326731,16.8965503 C24.3326731,16.0338702 24.9750543,15.4742436 25.8538472,15.4742436 C26.7307023,15.4742436 27.3168871,16.0524624 27.3168871,16.8965503 L27.3168871,21.3698443 C27.3168871,22.212073 27.8052131,22.9037044 28.74214,22.9037044 C29.6771291,22.9037044 30.1848331,22.212073 30.1848331,21.3698443 L30.1848331,16.2783582 C30.1848331,14.4070488 28.6181207,13.0962956 26.7307023,13.0962956 C24.8452216,13.0962956 23.6651006,14.3475536 23.6651006,14.3475536 C23.037253,13.5666793 22.1720247,13.0972252 20.7089847,13.0972252 C19.164557,13.0972252 17.8129406,14.3475536 17.8129406,14.3475536 C17.1841241,13.5666793 16.1154267,13.0972252 15.2308204,13.0972252 C13.8617638,13.0972252 12.7746572,13.675444 12.1119292,15.1302871 L10.1528121,19.5608189 L7.63948376,13.8762402" id="Fill-4" fill="#FFFFFF"></path>
-                </g>
-            </g>
-        </g>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/API-COMPATIBILITY.md b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/API-COMPATIBILITY.md
deleted file mode 100644
index ef3ab28b5b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/API-COMPATIBILITY.md
+++ /dev/null
@@ -1,405 +0,0 @@
-# Docker Remote API Compatibility
-VIC attempts to be compatible with the Docker remote API; however, there are some differences.  The API differences are documented below, grouped together by functional areas.
-
-Here are the [Docker v1.22 docs](https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/) for the readers convenience. Only the calls that will have differences in implementation are documented below.
-
-# Support Matrix
-
-## Container API Support
-
-|API|support?|
-|---|---|
-|List Containers|YES|
-|Create a Container|YES|
-|inspect a container| YES|
-|List processes running inside a container|YES|
-|Get Container Logs|YES|
-|Inspect changes on a containers filesystem|Future|
-|Export a container|Future|
-|Get Container stats based on resource usage|Future|
-|Resize a container TTY|YES|
-|Start a Container|YES|
-|Stop a container|YES|
-|Restart a Container|YES|
-|kill a container|YES|
-|Update a Container|*Maybe*|
-|Rename a Container|YES|
-|Pause a Container|*maybe*|
-|Unpause a Container|*maybe*|
-|Attach a Container|YES|
-|Attach a Container(websocket)|*maybe*|
-|wait a container|YES|
-|Remove a Container|YES|
-|Copy files or folders from a Container|YES|
-|Retrieve information about files and folders in a container|YES|
-|Get and archive of a filesystem resource in a container|YES|
-|Extract an archive of files or folders to a driectory in a container|YES|
-
-## Image API Support
-
-|API|support?|
-|---|---|
-|List Images|YES|
-|Build image from a Dockerfile|Future|
-|Create an Image|YES|
-|Inspect and Image |YES|
-|Get the History of an Image|YES|
-|Push an image on the registry|Future|
-|Tag an image into a repository|YES|
-|Remove and Image|YES|
-|Search Images|YES|
-
-## Misc API Support
-
-|API|support?|
-|---|---|
-|Check auth Configuration|YES|
-|Display System-wide Information|YES|
-|Show the docker version information|YES|
-|Ping the Docker server|YES|
-|Create a New Image from a containers changes|Future|
-|Monitor Docker Events|YES|
-|Get a tarball containing all images in a repository|Future|
-|Get a tarball containing all images|Future|
-|Load a Tarball with a set of images and tags into docker|YES|
-|Exec Create |*maybe*|
-|Exec Start |*maybe*|
-|Exec Resize|*maybe*|
-|Exec Inspect|*maybe*|
-
-
-# Container APIs
-
-## Create a container
-
-```
-POST /containers/create
-```
-
-### Json Fields
-
-**misc**
-
-|field|description|supported?|
-|---|---|---|
-|AttachStdin|Attach to Stdin|YES|
-|AttachStdout|Attach to STDOUT|YES|
-|AttachStderr|Attach to STDERR|YES|
-|Cmd|Array of strings which specify commands to run|YES|
-|Domainname|string to use for the containers domain|YES|
-|Env|Set environment variables|YES|
-|Entrypoint=""|Overwrite the default ENTRYPOINT of the image|YES|
-|Hostname|Container host name|YES|
-|Image|Image name to be used for the container|*maybe*|
-|OpenStdin|Keep STDIN open even if not attached|YES|
-|StdinOnce|close stdin once single attached client disconnects|YES|
-|NetworkDisabled|boolean value that controls the presence of a network for the container.|YES|
-|ExposedPorts|Object mapping to an empty object |YES|
-|StopSignal|Signal to stop the container. can be a string or unsigned integer| *maybe*|
-|Tty|Allocate a pseudo-TTY|*diff*|
-|User|Username or UID|*diff*|
-|WorkingDir|Working directory inside the container|YES|
-
-
-**NetworkSettings**
-
-|Param|Docker|VIC|
-|---|---|---|
-|"Bridge"|""|?|
-|"SandboxID"|""|?|
-|"HairpinMode"|""|?|
-|"LinkLocalIPv6Address"|""|?|
-|"LinkLocalIPv6PrefixLen"|""|?|
-|"Ports"|""|?|
-|"SandboxKey"|""|?|
-|"SecondaryIPAddresses"|""|?|
-|"SecondaryIPv6Addresses"|""|?|
-|"EndpointID"|""|?|
-|"Gateway"|""|?|
-|"GlobalIPv6Address"|""|?|
-|"GlobalIPv6PrefixLen"|""|?|
-|"IPAddress"|""|?|
-|"IPPrefixLen"|""|?|
-|"IPv6Gateway"|""|?|
-|"MacAddress"|""|?|
-|"Networks"|-|VIC will have some form of this data|
-
-
-
-**Host Config field**
-
-|field|description|supported|
-|---|---|---|
-|field|description|Support|
-|Binds|volume binds|*diff*|
-|BlkioWeight|Block IO weight (relative weight) accepts a weight value between 10 and 1000.|NO|
-|BlkioWeightDevice|Block IO weight (relative device weight) in the form of: "BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]|NO|
-|"BlkioDeviceReadBps"|Limit read rate (bytes per second) from a device in the form of: "BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"|NO|
-|BlkioDeviceWriteBps|Limit write rate (bytes per second) to a device in the form of: "BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"|NO|
-|"BlkioDeviceReadIOps"|Limit read rate (IO per second) from a device in the form of: "BlkioDeviceReadIOps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceReadIOps": [{"Path": "/dev/sda", "Rate": "1000"}]|NO|
-|BlkioDeviceWiiteIOps|Limit write rate (IO per second) to a device in the form of: "BlkioDeviceWriteIOps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceWriteIOps": [{"Path": "/dev/sda", "Rate": "1000"}]|NO|
-|CapAdd|A list of kernel capabilities to add to the container.|NO|
-|CapDrop|A list of kernel capabilities to drop from the container.|NO|
-|ContainerIDFile|-|NO|
-|CpusetCpus|CPUs in which to allow execution (e.g., 0-3, 0,1).|NO|
-|CpusetMems|Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.|NO|
-|CpuShares|CPU shares (relative weight).|NO|
-|CpuPeriod|The length of a CPU period in microseconds.|NO|
-|Devices|A list of devices to add to the container specified as a JSON object in the form { "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}|NO|
-|Dns|A list of DNS servers for the container to use.|YES|
-|DnsOptions|A list of DNS options|NO|
-|DnsSearch|A list of DNS search domains|YES|
-|ExtraHosts|A list of hostnames/IP mappings to add to the container’s /etc/hosts file. Specified in the form ["hostname:IP"]|NO|
-|IpcMode|-|NO|
-|Links|A list of links for the container. Each link entry should be in the form of container_name:alias|NO|
-|LxcConf|-|NO|
-|Memory|Memory limit in bytes|NO|
-|MemorySwap|Total memory limit (memory + swap); set -1 to enable unlimited swap. You must use this with memory and make the swap value larger than memory.|NO|
-|MemoryReservation|Memory soft limit in bytes|NO|
-|KernelMemory|Kernel memory limit in bytes.|NO|
-|OomKillDisable|Boolean value, whether to disable OOM Killer for the container or not.|NO|
-|OomScoreAdj|An integer value containing the score given to the container in order to tune OOM killer preferences.|NO|
-|NetworkMode|Sets the networking mode for the container. Supported standard values are: bridge, host, none, and container:<name|id>. Any other value is taken as a custom network’s name to which this container should connect to.|*diff*|
-|PortBindings|A map of exposed container ports and the host port they should map to. A JSON object in the form { <port>/<protocol>: [{ "HostPort": "<port>" }] } Take note that port is specified as a string and not an integer value.|NO|
-|Privileged|Gives the container full access to the host. Specified as a boolean value.|NO, vms are the isolation unit in VIC and the commands inside of the container has access to the host's vm|
-|ReadonlyRootfs|Mount the container’s root filesystem as read only. Specified as a boolean value.|NO|
-|PublishAllPorts|Allocates a random host port for all of a container’s exposed ports. Specified as a boolean value.|NO|
-|RestartPolicy|The behavior to apply when the container exits.|NO|
-|LogConfig|Log configuration for the container, specified as a JSON object in the form { "Type": "<driver_name>", "Config": {"key1": "val1"}}. Available types: json-file, syslog, journald, gelf, awslogs, splunk, none. json-file logging driver.|YES|
-|SecurityOpt|A list of string values to customize labels for MLS systems, such as SELinux.|NO|
-|VolumesFrom|A list of volumes to inherit from another container. Specified in the form <container name>[:<ro|rw>]|NO|
-|Ulimits|A list of ulimits to set in the container, specified as { "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }, for example: Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }|NO|
-|VolumeDriver|Driver that this container users to mount volumes.|NO, VIC has its own volume driver|
-|ShmSize|Size of /dev/shm in bytes. The size must be greater than 0. If omitted the system uses 64MB|NO|
-
-**State**
-
-|Param|Docker|VIC|
-|---|---|---|
-|"Error"|-|NO|
-|"ExitCode"|-|YES|
-|"FinishedAt"|-|YES|
-|"OOMKilled"|-|?|
-|"Dead"|-|YES|
-|"Paused"|-|YES|
-|"Pid"|-|NO|
-|"Restarting"|-|?|
-|"Running"|-|?|
-|"StartedAt"|-|YES|
-|"Status"|-|YES|
-
-
-
-**Mounts**
-
-This is the structure of the `Mounts` field in the request.
-
-```
-    "Mounts": [
-        {
-            "Name": "fac362...80535",
-            "Source": "/data",
-            "Destination": "/data",
-            "Driver": "local",
-            "Mode": "ro,Z",
-            "RW": false,
-            "Propagation": ""
-        }
-    ]
-```
-
-###Response
-
-The response for the create call is very simple in nature
-
-it will return these two fields as json object in the body of an HTTP call.
-
-* __Id__ : this is the id of the created containers.
-* __Warnings__ : an array of strings that contain warning messages.
-
-### Status Codes
-
-* 201 : no error
-* 404 : no such container
-* 506 : impossible to attach
-* 500 : server error
-
-## Get container logs
-
-```GET /containers/(id)/logs```
-
-This operation will return StdOut and StdErr logs from the target container.
-
-### Query parameters
-
-|Parameter|Description|support|
-|---|---|---|
-| __follow__ |1/true/True or 0/false/False, defaults to false. This determines if a stream is returned. | YES |
-| __stdout__ |1/true/True or 0/false/False, defaults to false. Indicates whether stdout logs are desired. | YES |
-| __stderr__ | 1/true/True or 0/false/False, defaults to false. Indicates whether stderr logs are desired.| YES |
-| __since__ | integer based UNIX timestamp with which to filter logs. Only logs since the timestamp will be returned. Default: 0. | *maybe* |
-| __timestamps__ | 1/true/True or 0/false/False, defaults to false. timestamped log lines. Defaults to false.| *maybe* |
-| __tail__ | all or <number>. indicates how many lines to output since the end of the logs. | *maybe* |
-
-### Status Codes
-
-* 101 : no error, indicates proxy about hijacking
-* 200 : no error, no upgrade header from attach found
-* 404 : no such container
-* 500 : server error
-
-## Export a container
-
-```GET /containers/(id)/export```
-
-This exports the contents of a container as a flattened file for other than docker use.
-__VIC plans to support this in the future__
-
-### Response
-
-HTTP response that returns a binary stream of the flattened file in a tarball. The response is of type application/octet-stream.
-
-### Response Status Codes
-
-* 200 : no error
-* 404 : no such container
-* 500 : server error
-
-## Attach to a container
-
-```POST /containers/(id or name)/attach```
-
-This call will return a stream of the targeted containers common io streams(stdout, stdin, stderr). It is important to note that this involves a `HTTP UPGRADE` response.
-
-### Query Parameters
-
-|parameter| description| supported |
-|---|---|---|
-|detachKeys|Override key for detaching a container. e.g. a-z| *maybe*|
-|logs| 1/true/True or 0/false/False. if `true` returns logs defaults to `false`| *maybe*|
-|stream| 1/true/True or 0/false/False. if `true` returns a stream defaults to `false`| YES|
-|stdin| 1/true/True or 0/false/False. if `true` and `stream=1` returns stdin as a stream. defaults to `false`| YES|
-|stdout| 1/true/True or 0/false/False. if `true` and `stream=1` returns stdout as a stream. defaults to `false`| YES|
-|stderr| 1/true/True or 0/false/False. if `true` and `stream=1` returns stderr as a stream. defaults to `false`| YES|
-
-
-###Status codes
-
-* 101 : no error, indicates proxy about hijacking
-* 200 : no error, no upgrade header found
-* 400 : bad parameter
-* 404 : no such container
-* 500 : server error
-
-###Stream Implementation
-
-__TBD__
-
-## Attach to a container (websocket)
-
-```GET /containers/(id or name)/attach/ws```
-
-Handshake according to `RFC 6455`
-
-### Query Parameters
-
-|parameter| description| supported |
-|---|---|---|
-|detachKeys|Override key for detaching a container. e.g. a-z| *maybe*|
-|logs| 1/true/True or 0/false/False. if `true` returns logs defaults to `false`| *maybe*|
-|stream| 1/true/True or 0/false/False. if `true` returns a stream defaults to `false`| YES|
-|stdin| 1/true/True or 0/false/False. if `true` and `stream=1` returns stdin as a stream. defaults to `false`| YES|
-|stdout| 1/true/True or 0/false/False. if `true` and `stream=1` returns stdout as a stream. defaults to `false`| YES|
-|stderr| 1/true/True or 0/false/False. if `true` and `stream=1` returns stderr as a stream. defaults to `false`| YES|
-
-###Status codes
-
-* 101 : no error, indicates proxy about hijacking
-* 200 : no error, no upgrade header found
-* 400 : bad parameter
-* 404 : no such container
-* 500 : server error
-
-## Remove a container
-
-```Delete /containers/(id or name)```
-
-removes indicated container.
-
-###Query Parameter
-
-|parameter|description|supported?|
-|---|---|---|
-|__v__| 1/true/True or 0/false/False. Removes associated volumes of container.| *maybe*|
-|__force__| 1/true/True or 0/false/False. Perform a kill then remove operation | YES |
-
-###Status Codes
-
-* 204 : no error
-* 400 : bad parameter
-* 404 : no container
-* 500 : server error
-
-# Image APIs
-
-## Build image from a Dockerfile
-
-__Supported in the Future__
-
-```POST /build```
-
-build an image from a Dockerfile.
-
-### Request
-
-the request should probide a tar stream of the file to be used as the docker file.
-
-### Query Parameters
-
-|parameter| description | Supported? |
-|---|---|---|
-|dockerfile|Path within build context to the dockerfile.|YES|
-| t | tag name for the build. `name:tag`. Default: `latest`. More than one can be provided. |YES|
-|remote| GIT repository URI or HTTP/HTTPS URI. if the target is a file, the contents are put into a file called Dockerfile. | YES |
-| q | suppress verbose build output| YES |
-|nocache| Do not use build cache | *maybe* |
-| pull | Attempt to pull latest image even if one is cached | YES |
-|rm| remove intermediate containers after build | *maybe* |
-|forcerm|always remove intermediate containers| *maybe* |
-|memory| memory limit for build|  *YES but different*|
-|memswap|total memory|NO|
-|cpushares|CPU shares|NO|
-|cpusetcpus|CPUs in which to allow execution| NO|
-|cpuperiod|the length of a cpu period|NO|
-|cpuquota|micreseconds of cpu time use in each cpu period|NO|
-|buildargs|the key values in this json object are used as the build context for commands run using the `Run` docker command. |YES|
-|shmsize| size of `/dev/shm` in bytes. Default 64MB|NO|
-
-### Request Headers
-
-|header| description|supported?|
-|---|---|---|
-|Content-type| application/tar | YES |
-|x-Registry-Config| JSON config object that allows for providing mapped credentials to different registries that may be needed to build a specific image| YES|
-
-### Status Codes
-
-* 200 : no error
-* 500 : server error
-
-# Network APIs
-
-### List networks
-### Inspect network
-### Create a network
-### Connect a container to a network
-### Disconnect a container from a network
-### Remove a network
-
-
-# Volume APIs
-
-### List volumes
-### Create a volume
-### Inspect a volume
-### Remove a volume
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/CLI-COMPATIBILITY.md b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/CLI-COMPATIBILITY.md
deleted file mode 100644
index 7c5d97254b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/CLI-COMPATIBILITY.md
+++ /dev/null
@@ -1,275 +0,0 @@
-# Docker CLI Compatibility
-VIC attempts to be compatible with the Docker client (CLI); however, there are some differences. The CLI differences are documented below, alphabetically. Note, the operations listed as supported but with differences does not mean incompatible. It means most of these operations support either a smaller subset of the parameters or the request/response parameters have different meanings that apply to running in an ESX or vCenter environment.
-
-The list is organized into 3 separate tables. The first table lists CLI operations that are supported in the first version of VIC. The second table lists operations that VIC may support in the future.
-
-### VIC Support
-
-|Docker CLI Operation | support viable | technical priority |
-|--- | ---| ---|
-|attach | YES| P0 - feel good factor and interactive debug |
-|cp | YES| P1 - live copy |
-|create | *Yes - differences*| P0 - core function: use |
-|events | *Yes - differences*| P1 - necessary for automation |
-|history | YES| - |
-|images | YES| P0 - core function: admin |
-|login | YES| - |
-|logout | YES| - |
-|logs | YES| P0 - core function: use |
-|network connect| YES| P2 - necessary only for dynamic topology changes |
-|network create| *Yes - differences*| P0 - core function: use/admin |
-|network disconnect| YES| P2 - symmetrical with connect |
-|network ls| YES| P0 - core function: use |
-|network rm| YES| - |
-|port | YES| P1 - core function: use - necessity reduced if not using NAT model |
-|ps | YES| P0 - core function: use/admin |
-|pull | YES| P0 - core function: use |
-|rm | YES| P0 - core function: use/admin |
-|rmi | YES| P1 - core function: admin - maybe less critical in production |
-|run | *Yes - differences*| P0 - core function: use |
-|rename | YES| - |
-|restart | YES| P0 - core function: use |
-|start | YES| P0 - core function: use |
-|stop | YES| P0 - core function: use |
-|tag| YES| - |
-|version | YES| P0 - core function: admin |
-|volume create| *Yes - differences*| P0 - core function: use/admin |
-|volume inspect| YES| P1 - core function: admin - maybe less critical in production |
-|volume ls| YES| P0 - core function: use |
-|volume rm| YES| P1 - core function: use/admin - depends on dynamism of volume use |
-|exec | YES | P1 - interactive debug |
-|pause | YES| - |
-|stats | YES| P1 - core function: diagnostics |
-|top | YES| - |
-|unpause | YES| - |
-|wait | YES | P1 - necessary for automation |
-
-The technical priority ranking is as follows (assessed with regard to production deployment):
-P0 - delay GA if not available
-P1 - significant reduction in capability - consider slipping
-P2 - confined reduction in capability
--  - not significant in initial use cases
-
-### Future Support
-
-|Docker CLI Operation |
-|--- |
-|build |
-|commit |
-|diff |
-|export |
-|import |
-|load |
-|push |
-|save |
-|search |
-
-The following sections dive further into these differences.
-
-## create
-
-```
-Usage: docker create [OPTIONS] IMAGE [COMMAND] [ARG...]
-
-Create a new container
-```
-
-| params | Docker | VIC |
-|---|---|---|
-|-a, --attach=[]|Attach to STDIN, STDOUT or STDERR|YES|
-|--add-host=[] |Add a custom host-to-IP mapping (host:ip)|YES|
-|-c, --cpu-shares=0 | CPU shares (relative weight)|*diff*|
-|--cap-add=[]|Add Linux capabilities|NO, VIC containers do not run in cgroups|
-|--cap-drop=[]|Drop Linux capabilities|NO, VIC containers do not run in cgroups|
-|--cgroup-parent=""|Optional parent cgroup for the container|NO, VIC containers do not run in cgroups|
-|--cidfile=""|Write the container ID to the file|YES|
-|--cpuset-cpus=""|CPUs in which to allow execution (0-3, 0,1)|NO|
-|--device=[]|Add a host device to the container|*diff*|
-|--dns=[]|Set custom DNS servers|YES|
-|--dns-search=[]|Set custom DNS search domains|YES|
-|-e, --env=[]|Set environment variables|YES|
-|--entrypoint=""|Overwrite the default ENTRYPOINT of the image|YES|
-|--env-file=[]|Read in a file of environment variables|YES|
-|--expose=[]|Expose a port or a range of ports|YES|
-|-h, --hostname=""|Container host name|YES|
-|-i, --interactive=false|Keep STDIN open even if not attached|*maybe*|
-|--ipc=""|IPC namespace to use|NO, VIC containers run in separate VMs|
-|-l, --label=[]|Set metadata on the container (e.g., --label=com.example.key=value)|YES|
-|--label-file=[]|Read in a line delimited file of labels|YES|
-|--link=[]|Add link to another container|*maybe*|
-|--log-driver=""|Logging driver for container|YES|
-|--lxc-conf=[]|Add custom lxc options|NO, VIC containers do not run in cgroups|
-|-m, --memory=""|Memory limit|*diff*|
-|--mac-address=""|Container MAC address (e.g. 92:d0:c6:0a:29:33)|YES|
-|--name=""|Assign a name to the container|YES|
-|--net="bridge"|Set the Network mode for the container|YES|
-|-P, --publish-all=false|Publish all exposed ports to random ports|*maybe*|
-|-p, --publish=[]|Publish a container's port(s) to the host|YES|
-|--privileged=false|Give extended privileges to this container|*diff*|
-|--read-only=false|Mount the container's root filesystem as read only|*diff*|
-|--restart="no"|Restart policy (no, on-failure[:max-retry], always)|*maybe*|
-|--security-opt=[]|Security options|*maybe*|
-|-t, --tty=false|Allocate a pseudo-TTY|*diff*|
-|-u, --user=""|Username or UID|*diff*|
-|-v, --volume=[]|Bind mount a volume|*diff*|
-|--volumes-from=[]|Mount volumes from the specified container(s)|*maybe*|
-|-w, --workdir=""|Working directory inside the container|YES|
-
-
-## events
-
-Events **may** may also report ESX and vCenter events.
-
-
-## info
-
-The information provided by *info* appears similar to those reported by Docker but many of them are specific to vSphere.
-
-## inspect
-
-Some parameters **returned** by *inspect* are specific to vSphere.  Others are not relevant.
-
-### Response:
-
-The response for inspect is a JSON document composed of several inner documents.  The following are the primary subdocuments that differs.  For the rest of the response, please visit,
-```
-https://docs.docker.com/engine/reference/api/docker_remote_api_v1.22/#inspect-a-container.
-```
-
-**AppArmorProfile**
-
-A VIC container isolation unit is a VM. Processes running in a VIC container do not use AppArmor profiles.
-
-**HostConfig**
-
-|Param|Docker|VIC|
-|---|---|---|
-|"Binds"|volume binds|*diff*|
-|"BlkioWeight|Block IO weight (relative weight) accepts a weight value between 10 and 1000.|NO|
-|"BlkioWeightDevice"|Block IO weight (relative device weight) in the form of: "BlkioWeightDevice": [{"Path": "device_path", "Weight": weight}]|NO|
-|"BlkioDeviceReadBps"|Limit read rate (bytes per second) from a device in the form of: "BlkioDeviceReadBps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceReadBps": [{"Path": "/dev/sda", "Rate": "1024"}]"|NO|
-|"BlkioDeviceWriteBps"|Limit write rate (bytes per second) to a device in the form of: "BlkioDeviceWriteBps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceWriteBps": [{"Path": "/dev/sda", "Rate": "1024"}]"|NO|
-|"BlkioDeviceReadIOps"|Limit read rate (IO per second) from a device in the form of: "BlkioDeviceReadIOps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceReadIOps": [{"Path": "/dev/sda", "Rate": "1000"}]|NO|
-|"BlkioDeviceWiiteIOps"|Limit write rate (IO per second) to a device in the form of: "BlkioDeviceWriteIOps": [{"Path": "device_path", "Rate": rate}], for example: "BlkioDeviceWriteIOps": [{"Path": "/dev/sda", "Rate": "1000"}]|NO|
-|"CapAdd"|A list of kernel capabilities to add to the container.|NO|
-|"CapDrop"|A list of kernel capabilities to drop from the container.|NO|
-|"ContainerIDFile"|-|NO|
-|"CpusetCpus"|CPUs in which to allow execution (e.g., 0-3, 0,1).|NO|
-|"CpusetMems"|Memory nodes (MEMs) in which to allow execution (0-3, 0,1). Only effective on NUMA systems.|NO|
-|"CpuShares"|CPU shares (relative weight).|NO|
-|"CpuPeriod"|The length of a CPU period in microseconds.|NO|
-|"Devices"|A list of devices to add to the container specified as a JSON object in the form { "PathOnHost": "/dev/deviceName", "PathInContainer": "/dev/deviceName", "CgroupPermissions": "mrw"}|NO|
-|"Dns"|A list of DNS servers for the container to use.|YES|
-|"DnsOptions"|A list of DNS options|NO|
-|"DnsSearch"|A list of DNS search domains|YES|
-|"ExtraHosts"|A list of hostnames/IP mappings to add to the container’s /etc/hosts file. Specified in the form ["hostname:IP"]|NO|
-|"IpcMode"|-|NO|
-|"Links"|A list of links for the container. Each link entry should be in the form of container_name:alias|NO|
-|"LxcConf"|-|NO|
-|"Memory"|Memory limit in bytes|NO|
-|"MemorySwap"|Total memory limit (memory + swap); set -1 to enable unlimited swap. You must use this with memory and make the swap value larger than memory.|NO|
-|"MemoryReservation"|Memory soft limit in bytes|NO|
-|"KernelMemory"|Kernel memory limit in bytes.|NO|
-|"OomKillDisable"|Boolean value, whether to disable OOM Killer for the container or not.|NO|
-|"OomScoreAdj"|An integer value containing the score given to the container in order to tune OOM killer preferences.|NO|
-|"NetworkMode"|Sets the networking mode for the container. Supported standard values are: bridge, host, none, and container:name&#124;id. Any other value is taken as a custom network’s name to which this container should connect to.|*diff*|
-|"PortBindings"|A map of exposed container ports and the host port they should map to. A JSON object in the form { <port>/<protocol>: [{ "HostPort": "<port>" }] } Take note that port is specified as a string and not an integer value.|NO|
-|"Privileged"|Gives the container full access to the host. Specified as a boolean value.|NO, vms are the isolation unit in VIC and the commands inside of the container has access to the host's vm|
-|"ReadonlyRootfs"|Mount the container’s root filesystem as read only. Specified as a boolean value.|NO|
-|"PublishAllPorts"|Allocates a random host port for all of a container’s exposed ports. Specified as a boolean value.|NO|
-|"RestartPolicy"|The behavior to apply when the container exits.|NO|
-|"LogConfig"|Log configuration for the container, specified as a JSON object in the form { "Type": "<driver_name>", "Config": {"key1": "val1"}}. Available types: json-file, syslog, journald, gelf, awslogs, splunk, none. json-file logging driver.|YES|
-|"SecurityOpt"|A list of string values to customize labels for MLS systems, such as SELinux.|NO|
-|"VolumesFrom"|A list of volumes to inherit from another container. Specified in the form <container name>[:<ro|rw>]|NO|
-|"Ulimits"|A list of ulimits to set in the container, specified as { "Name": <name>, "Soft": <soft limit>, "Hard": <hard limit> }, for example: Ulimits: { "Name": "nofile", "Soft": 1024, "Hard": 2048 }|NO|
-|"VolumeDriver"|Driver that this container users to mount volumes.|NO, VIC has its own volume driver|
-|"ShmSize"|Size of /dev/shm in bytes. The size must be greater than 0. If omitted the system uses 64MB|NO|
-
-**misc params**
-
-|Param|Docker|VIC|
-|---|:---|---|
-|HostnamePath|e.g. "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hostname"|This has no meaning in VIC.|
-|HostsPath|e.g. "/var/lib/docker/containers/ba033ac4401106a3b513bc9d639eee123ad78ca3616b921167cd74b20e25ed39/hosts"|This has no meaning in VIC|
-|LogPath|e.g. "/var/lib/docker/containers/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b/1eb5fabf5a03807136561b3c00adcd2992b535d624d5e18b6cdc6a6844d9767b-json.log"|This has no meaning in VIC|
-|"Id"|Image ID, Sha256 content addressable hash|YES|
-|"Image"|-|NO?|
-|"MountLabel"|-|NO|
-|"Name"|Docker's human readable name|YES|
-|"Path"|-|NO|
-|"ProcessLabel"|-|NO|
-|"ResolvConfPath"|-|NO|
-|"RestartCount"|-|NO|
-
-**NetworkSettings**
-
-|Param|Docker|VIC|
-|---|---|---|
-|"Bridge"|""|?|
-|"SandboxID"|""|?|
-|"HairpinMode"|""|?|
-|"LinkLocalIPv6Address"|""|?|
-|"LinkLocalIPv6PrefixLen"|""|?|
-|"Ports"|""|?|
-|"SandboxKey"|""|?|
-|"SecondaryIPAddresses"|""|?|
-|"SecondaryIPv6Addresses"|""|?|
-|"EndpointID"|""|?|
-|"Gateway"|""|?|
-|"GlobalIPv6Address"|""|?|
-|"GlobalIPv6PrefixLen"|""|?|
-|"IPAddress"|""|?|
-|"IPPrefixLen"|""|?|
-|"IPv6Gateway"|""|?|
-|"MacAddress"|""|?|
-|"Networks"|-|VIC will have some form of this data|
-
-**State**
-
-|Param|Docker|VIC|
-|---|---|---|
-|"Error"|-|NO|
-|"ExitCode"|-|YES|
-|"FinishedAt"|-|YES|
-|"OOMKilled"|-|?|
-|"Dead"|-|YES|
-|"Paused"|-|YES|
-|"Pid"|-|NO|
-|"Restarting"|-|?|
-|"Running"|-|?|
-|"StartedAt"|-|YES|
-|"Status"|-|YES|
-
-**Mounts**
-
-An array of mount points.  VIC will provide some form of this.  Here is an example of what Docker returns.
-
-```
-    "Mounts": [
-        {
-            "Name": "fac362...80535",
-            "Source": "/data",
-            "Destination": "/data",
-            "Driver": "local",
-            "Mode": "ro,Z",
-            "RW": false,
-            "Propagation": ""
-        }
-    ]
-```
-
-## network create
-
-The network creation workflow will differ from standard Docker.  The -driver option is ignored.  All networks in VIC are of type *bridged*.  Policies on these networks are administered with vSphere.  This makes exposing containers to the external world much simpler.  In the future, support for VMWare's NSX will be incorporated.  For more information on VIC's networking model, please visit, https://github.com/vmware/vic/blob/master/doc/design/networking/MVPnetworking.md
-
-## volume create
-
-Much like network creation, volume creation also leverages the vSphere infrastructure.  Volumes are just VMDKs created within a VCH.  This gives VIC containers a lot of advantages.  A container can run on any ESX server that is part of the VCH and it's data volume can be on another ESX server.  The container and the data volume can be moved from one ESX server to another within the VCH, and they would be able to connect seamlessly.
-
-Shared volumes between containers will eventually be supported.  Stay tune.
-
-VIC can also leverage a vSan infrastructure.
-
-## run
-
-Docker run is a composite operation for pull, create, start.  As such, the parameter support is equivalent to that of docker create.
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/COMPOSE-COMPATIBILITY.md b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/COMPOSE-COMPATIBILITY.md
deleted file mode 100644
index 20d02e9ece..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/COMPOSE-COMPATIBILITY.md
+++ /dev/null
@@ -1,60 +0,0 @@
-# Docker Compose Compatibility
-Docker Compose is a tool to define an application consisting of multiple containers that interact with one another.  The concept has some similarity with RKT's and Kubernete's pods.
-
-The way Compose works is by orchestrating the start of containers, attaching volumes, and attaching networks by calling the Docker Remote API.  Since Compose uses the Remote API, VIC should support nearly every CLI operation and Compose file options.
-
-## Config File options
-
-These are the compose yml config file options support provided by VIC.  See the following for Docker's compose file documentation: https://docs.docker.com/compose/compose-file/
-
-|Compose yml config option|VIC Support|
-|---|:---|
-|build|No, *caveat|
-|context|No, not until VIC support build|
-|dockerfile|No, not until VIC support build|
-|args|No, not until VIC support build|
-|cap_add, cap_drop|?|
-|command|Yes|
-|cgroup_parent|No, VIC does not support cgroups|
-|container_name|Yes|
-|devices|No, a VIC container host is a VCH|
-|depends_on|Yes|
-|dns|Yes|
-|dns_search|Yes|
-|tmpfs|No, a VIC container host is a VCH|
-|entrypoint|Yes|
-|env_file|Yes|
-|environment|Yes|
-|expose|Yes|
-|extends|Yes|
-|external_links|Yes|
-|extra_hosts|Yes|
-|image|Yes|
-|labels|Yes|
-|links|Yes|
-|logging|Yes|
-|log_driver|Yes|
-|log_opt|Yes|
-|network_mode|Yes, *see below|
-|networks|Yes|
-|ipv4_address, ipv6_address|Yes|
-|pid|No, a VIC container host is a VCH|
-|ports|Yes|
-|security_opt|Yes|
-|stop_signal|Yes|
-|ulimits|?|
-|volumes, volume_driver|Yes, *see below|
-|volumes_from|?|
-|cpu_shares, cpu_quota, cpuset, domainname, hostname, ipc, mac_address, mem_limit, memswap_limit, privileged, read_only, restart, shm_size, stdin_open, tty, user, working_dir|?|
-|Volume configuration reference: driver, driver_opts, external|Yes, *see below|
-|Network configuration reference: driver, driver_opts, ipam, external|Yes, *see below|
-
-### network_mode, network_driver
-
-In VIC, all networks are currently *bridged* mode.  Policy around access within those networks are managed via vSphere.  This provides a much simpler model for administration.  Networks can span multiple ESX hosts within a VCH.  These networks can be applied to any container running within the VCH, regardless of which ESX host the container is currently running on.
-
-The network_mode option is ignored.  network_driver option is also ignored.
-
-### volume_driver
-
-VIC provides only one volume driver.  This option is ignored.  Data volumes for VIC containers are VMDKs, and they can exist on any ESX host participating in a VCH.  During volume creation, VIC will handle the mapping of these VMDKs to the path specified in the docker CLI call.  The VIC container and data volume can be on the same ESX host or on different ESX host, as long as the ESX hosts participate in the VCH.  This is much more flexible than the standard docker volumes.
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/README.md b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/README.md
deleted file mode 100644
index b014e33667..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-## Introduction
-The Docker Engine-API personality server is what VIC calls the server daemon that responds to Docker remote API calls.  The primary caller is most likely the Docker CLI or a user using curl.
-
-The server, itself, builds on top of Docker's Engine-API project.  This allows this component to be REST compatible with the Docker Daemon.  Once the Engine-API rest server unmarshals the requests into golang structure, execution is handed off to a set of backend code.  These backend code validates the request inputs and calls VIC's port layer server.
-
-VIC calls this a personality server because it translates Docker requests to VIC operations.  The port layer server should not know anything about Docker.  This allows VIC to add other personality servers in the future.
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive.go
deleted file mode 100644
index fa56fd072e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive.go
+++ /dev/null
@@ -1,787 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/tchap/go-patricia/patricia"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	viccontainer "github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	"github.com/vmware/vic/lib/apiservers/engine/proxy"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	vicarchive "github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/pkg/trace"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/pkg/archive"
-)
-
-// ContainerArchivePath creates an archive of the filesystem resource at the
-// specified path in the container identified by the given name. Returns a
-// tar archive of the resource and whether it was a directory or a single file.
-func (c *Container) ContainerArchivePath(name string, path string) (io.ReadCloser, *types.ContainerPathStat, error) {
-	defer trace.End(trace.Begin(name))
-	op := trace.NewOperation(context.Background(), "ContainerArchivePath: %s", name)
-
-	path = "/" + strings.TrimPrefix(path, "/")
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return nil, nil, NotFoundError(name)
-	}
-
-	stat, err := c.ContainerStatPath(name, path)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	reader, err := c.exportFromContainer(op, vc, path)
-	if err != nil {
-		if IsResourceInUse(err) {
-			err = fmt.Errorf("ContainerArchivePath failed, resource in use: %s", err.Error())
-		}
-		return nil, nil, InternalServerError(err.Error())
-	}
-
-	return reader, stat, nil
-}
-
-func (c *Container) exportFromContainer(op trace.Operation, vc *viccontainer.VicContainer, path string) (io.ReadCloser, error) {
-	mounts := mountsFromContainer(vc)
-	mounts = append(mounts, types.MountPoint{Destination: "/"})
-	readerMap := NewArchiveStreamReaderMap(op, mounts, path)
-
-	readers, err := readerMap.ReadersForSourcePath(archiveProxy, vc.ContainerID, path)
-	if err != nil {
-		op.Errorf("Errors getting readers for export: %s", err.Error())
-		return nil, err
-	}
-	count := len(readers)
-	op.Infof("Got %d archive readers", count)
-
-	// We want to combine the streams, so need to strip the end-of-archive elements for all but the last
-	strippersWithCloser := make([]io.Reader, len(readers))
-	i := 0
-	for ; i < count-1; i++ {
-		stripper := vicarchive.NewStripper(op, tar.NewReader(readers[i]), readers[i].Close)
-		strippersWithCloser[i] = stripper
-		op.Debugf("Added stripping reader: %p", stripper)
-	}
-	op.Debugf("Adding closing reader: %p", readers[i])
-	strippersWithCloser[i] = readers[i]
-
-	return vicarchive.MultiReader(strippersWithCloser...), nil
-}
-
-// ContainerCopy performs a deprecated operation of archiving the resource at
-// the specified path in the container identified by the given name.
-func (c *Container) ContainerCopy(name string, res string) (io.ReadCloser, error) {
-	return nil, fmt.Errorf("%s does not yet implement ContainerCopy", ProductName())
-}
-
-// ContainerExport writes the contents of the container to the given
-// writer. An error is returned if the container cannot be found.
-func (c *Container) ContainerExport(name string, out io.Writer) error {
-	return fmt.Errorf("%s does not yet implement ContainerExport", ProductName())
-}
-
-// ContainerExtractToDir extracts the given archive to the specified location
-// in the filesystem of the container identified by the given name. The given
-// path must be of a directory in the container. If it is not, the error will
-// be ErrExtractPointNotDirectory. If noOverwriteDirNonDir is true then it will
-// be an error if unpacking the given content would cause an existing directory
-// to be replaced with a non-directory and vice versa.
-func (c *Container) ContainerExtractToDir(name, path string, noOverwriteDirNonDir bool, content io.Reader) error {
-	defer trace.End(trace.Begin(name))
-	op := trace.NewOperation(context.Background(), "ContainerExtractToDir: %s", name)
-
-	path = "/" + strings.TrimPrefix(path, "/")
-
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	err := c.importToContainer(op, vc, path, content)
-	if err != nil && IsResourceInUse(err) {
-		op.Errorf("ContainerExtractToDir failed, resource in use: %s", err.Error())
-
-		err = fmt.Errorf("Resource in use")
-	}
-
-	return err
-}
-
-func (c *Container) importToContainer(op trace.Operation, vc *viccontainer.VicContainer, target string, content io.Reader) (err error) {
-	rawReader, err := archive.DecompressStream(content)
-	if err != nil {
-		op.Errorf("Input tar stream to ContainerExtractToDir not recognized: %s", err.Error())
-		return StreamFormatNotRecognized()
-	}
-
-	tarReader := tar.NewReader(rawReader)
-	mounts := mountsFromContainer(vc)
-	mounts = append(mounts, types.MountPoint{Destination: "/"})
-	writerMap := NewArchiveStreamWriterMap(op, mounts, target)
-	defer func() {
-		// This should shutdown all the stream connections to the portlayer.
-		e1 := writerMap.Close(op)
-		if e1 != nil {
-			err = e1
-			op.Debugf("import to container: assigned err as %v", err)
-		}
-	}()
-
-	for {
-		header, err := tarReader.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar header from client archive: %s", err)
-			return err
-		}
-
-		// Lookup the writer for that mount prefix
-		tarWriter, err := writerMap.WriterForAsset(archiveProxy, vc.ContainerID, target, *header)
-		if err != nil {
-			return err
-		}
-
-		if err = tarWriter.WriteHeader(header); err != nil {
-			op.Errorf("Error while copying tar header %#v: %s", *header, err.Error())
-			return err
-		}
-
-		if _, err = io.Copy(tarWriter, tarReader); err != nil {
-			op.Errorf("Error while copying tar data for %s: %s", header.Name, err.Error())
-			return err
-		}
-		// TODO: change this to log level 3
-		if vchConfig.Cfg.Diagnostics.DebugLevel >= 1 {
-			op.Debugf("Wrote entry: %s", header.Name)
-		}
-	}
-
-	return nil
-}
-
-// ContainerStatPath stats the filesystem resource at the specified path in the
-// container identified by the given name.
-func (c *Container) ContainerStatPath(name string, path string) (stat *types.ContainerPathStat, err error) {
-	defer trace.End(trace.Begin(name))
-	op := trace.NewOperation(context.Background(), "ContainerStatPath: %s", name)
-
-	op.Debugf("path received by statpath %s", path)
-
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return nil, NotFoundError(name)
-	}
-
-	// trim / and . off from path and then append / to ensure the format is correct
-	path = filepath.Clean(path)
-	if !strings.HasPrefix(path, "/") {
-		path = "/" + path
-	}
-
-	mounts := mountsFromContainer(vc)
-	mounts = append(mounts, types.MountPoint{Destination: "/"})
-
-	// handle the special case of targeting a volume mount point before it exists.
-	// this will be important for non started container cp, will also be important
-	// to certain behaviors for diff on a non started container.
-	if stat, succeed := tryFakeStatPath(mounts, path); succeed {
-		op.Debugf("faking container stat path %#v", stat)
-		return stat, nil
-	}
-
-	primaryTarget := resolvePathWithMountPoints(op, mounts, path)
-	fs := primaryTarget.filterSpec
-
-	var deviceID string
-	var store string
-	if primaryTarget.mountPoint.Destination == "/" {
-		// Special case. / refers to container VMDK and not a volume vmdk.
-		deviceID = vc.ContainerID
-		store = constants.ContainerStoreName
-	} else {
-		deviceID = primaryTarget.mountPoint.Name
-		store = constants.VolumeStoreName
-	}
-
-	stat, err = c.containerProxy.StatPath(op, store, deviceID, fs)
-	if err != nil {
-		op.Errorf("error getting statpath: %s", err.Error())
-		switch err := err.(type) {
-		case *storage.StatPathNotFound:
-			return nil, ResourceNotFoundError(vc.Name, "file or directory")
-		case *storage.StatPathUnprocessableEntity:
-			return nil, InternalServerError("failed to process given path")
-		default:
-			return nil, InternalServerError(err.Error())
-		}
-	}
-
-	op.Debugf("container stat path %#v", stat)
-	return stat, nil
-}
-
-//----------------------------------
-// Docker cp utility
-//----------------------------------
-
-type ArchiveReader struct {
-	mountPoint types.MountPoint
-	filterSpec vicarchive.FilterSpec
-	reader     io.ReadCloser
-}
-type ArchiveStreamReaderMap struct {
-	prefixTrie *patricia.Trie
-	op         trace.Operation
-}
-
-type ArchiveWriter struct {
-	mountPoint types.MountPoint
-	filterSpec vicarchive.FilterSpec
-	writer     io.WriteCloser
-	tarWriter  *tar.Writer
-}
-
-// ArchiveStreamWriterMap maps mount prefix to io.WriteCloser
-type ArchiveStreamWriterMap struct {
-	prefixTrie *patricia.Trie
-	op         trace.Operation
-	wg         *sync.WaitGroup
-	errchan    chan error
-}
-
-// NewArchiveStreamWriterMap creates a new ArchiveStreamWriterMap.  The map contains all information
-// needed to create a writers for every volume mounts for the container.  This includes the root
-// volume of the container.
-//
-// mounts is the mount data from inspect
-// containerDestPath is the destination path in the container
-func NewArchiveStreamWriterMap(op trace.Operation, mounts []types.MountPoint, dest string) *ArchiveStreamWriterMap {
-	writerMap := &ArchiveStreamWriterMap{}
-	writerMap.prefixTrie = patricia.NewTrie()
-	writerMap.op = op
-	writerMap.errchan = make(chan error, 1)
-	writerMap.wg = &sync.WaitGroup{}
-
-	for _, m := range mounts {
-		aw := ArchiveWriter{
-			mountPoint: m,
-			writer:     nil,
-		}
-
-		// If container destination path is part of this mount point's prefix, we must remove it and
-		// add to the filterspec.  If the container destination path is "/" we do no stripping.
-		//
-		//	e.g. mount A at /mnt/A
-		//
-		//		cp /mnt cid:/mnt
-		//
-		// file data.txt from local /mnt/A/data.txt will come to the persona as A/data.txt.  We must
-		// tell the storage portlayer to remove "A".
-		//
-		//	e.g. mount A at /mnt/A
-		//
-		//		cp / cid:/
-		//
-		// file data.txt from local /mnt/A/data.txt will come to the persona as mnt/A/data.txt.
-		// Here, we must tell the portlayer to remove "mnt/A".  The key to determining whether to
-		// strip "A" or "mnt/A" is based on the container destination path.
-		isPrimary := !strings.Contains(aw.mountPoint.Destination, dest) || aw.mountPoint.Destination == dest
-		aw.filterSpec = vicarchive.GenerateFilterSpec(dest, aw.mountPoint.Destination, isPrimary, vicarchive.CopyTo)
-
-		writerMap.prefixTrie.Insert(patricia.Prefix(m.Destination), &aw)
-	}
-
-	return writerMap
-}
-
-// NewArchiveStreamReaderMap creates a new ArchiveStreamReaderMap.  After the call, it contains
-// information to create readers for every volume mounts for the container
-//
-// mounts is the mount data from inspect
-func NewArchiveStreamReaderMap(op trace.Operation, mounts []types.MountPoint, dest string) *ArchiveStreamReaderMap {
-	readerMap := &ArchiveStreamReaderMap{}
-	readerMap.prefixTrie = patricia.NewTrie()
-	readerMap.op = op
-
-	for _, m := range mounts {
-		ar := ArchiveReader{
-			mountPoint: m,
-			reader:     nil,
-		}
-
-		// If the mount point is not the root file system, we must tell the portlayer to rebase the
-		// files in the return tar stream with the mount point path since the volume does not know
-		// the path it is mounted to.  It only knows it's root file system.
-		//
-		//	e.g. mount A at /mnt/A with a file data.txt in A
-		//
-		//	/mnt/A/data.txt		<-- from container point of view
-		//	/data.txt			<-- from volume point of view
-		//
-		// Neither the volume nor the storage portlayer knows about /mnt/A.  The persona must tell
-		// the portlayer to rebase all files from this volume to the /mnt/A/ in the final tar stream.
-		cleanDest := vicarchive.Clean(dest, false)
-		isPrimary := !strings.Contains(ar.mountPoint.Destination, cleanDest) || ar.mountPoint.Destination == cleanDest
-		ar.filterSpec = vicarchive.GenerateFilterSpec(dest, ar.mountPoint.Destination, isPrimary, vicarchive.CopyFrom)
-
-		readerMap.prefixTrie.Insert(patricia.Prefix(m.Destination), &ar)
-	}
-
-	return readerMap
-}
-
-// FindArchiveWriter finds the one writer that matches the asset name.  There should only be one
-// stream this asset needs to be written to.
-func (wm *ArchiveStreamWriterMap) FindArchiveWriter(containerDestPath, assetName string) (*ArchiveWriter, error) {
-	defer trace.End(trace.Begin(""))
-
-	var aw *ArchiveWriter
-	var err error
-
-	// go function used later for searching
-	findPrefix := func(prefix patricia.Prefix, item patricia.Item) error {
-		if _, ok := item.(*ArchiveWriter); !ok {
-			return fmt.Errorf("item not ArchiveWriter")
-		}
-
-		aw, _ = item.(*ArchiveWriter)
-		return nil
-	}
-
-	// Find the prefix for the final destination.  Final destination is the combination of container destination path
-	// and the asset's name.  For example,
-	//
-	//	container destination path =	/
-	//	asset name =					mnt/A/file.txt
-	//	mount 1	=						/mnt/A
-	//	mount prefix =					/mnt/A
-	//
-	// In the above example, mount prefxi can only be determined by combining both the container destination path and
-	// the asset name, as the final destination includes a mounted volume.
-
-	combinedPath := path.Join(containerDestPath, assetName)
-	prefix := patricia.Prefix(combinedPath)
-	err = wm.prefixTrie.VisitPrefixes(prefix, findPrefix)
-	if err != nil {
-		wm.op.Errorf(err.Error())
-		return nil, fmt.Errorf("Failed to find a node for prefix %s: %s", containerDestPath, err.Error())
-	}
-
-	if aw == nil {
-		return nil, fmt.Errorf("No archive writer found for container destination %s and asset name %s", containerDestPath, assetName)
-	}
-
-	return aw, nil
-}
-
-// WriterForAsset takes a destination path and subpath of the archive data and returns the
-// appropriate writer for the two.  It's intention is to solve the case where there exist
-// a mount point and another mount point within the first mount point.  For instance, the
-// prefix map can have,
-//
-//		R/W -					/
-//		mount 1 -				/mnt/a
-//		mount 2 -				/mnt/a/b
-//
-//		case 1:
-//				containerDestPath -			/mnt/a
-//				archive header source -		b/file.txt
-//
-//			The correct writer would be the one corresponding to mount 2.
-//
-//		case 2:
-//				containerDestPath -			/mnt/a
-//				archive header source -		file.txt
-//
-//			The correct writer would be the one corresponding to mount 1.
-//
-//		case 3:
-//				containerDestPath -			/
-//				archive header source -		mnt/a/file.txt
-//
-//			The correct writer would be the one corresponding to mount 1
-//
-// As demonstrated above, the mount prefix and writer cannot be determined with just the
-// container destination path.  It must be combined with the actual asset's name.
-func (wm *ArchiveStreamWriterMap) WriterForAsset(proxy proxy.VicArchiveProxy, cid, containerDestPath string, assetHeader tar.Header) (*tar.Writer, error) {
-	defer trace.End(trace.Begin(assetHeader.Name))
-
-	var err error
-
-	aw, err := wm.FindArchiveWriter(containerDestPath, assetHeader.Name)
-	if err != nil {
-		return nil, err
-	}
-
-	// Perform the lazy initialization here.
-	if aw.writer == nil || aw.tarWriter == nil {
-		// lazy initialize.
-		wm.op.Debugf("Lazily initializing import stream for %s", aw.mountPoint.Destination)
-		var deviceID string
-		var store string
-		if aw.mountPoint.Destination == "/" {
-			// Special case. / refers to container VMDK and not a volume vmdk.
-			deviceID = cid
-			store = constants.ContainerStoreName
-		} else {
-			deviceID = aw.mountPoint.Name
-			store = constants.VolumeStoreName
-		}
-		rawWriter, err := proxy.ArchiveImportWriter(wm.op, store, deviceID, aw.filterSpec, wm.wg, wm.errchan)
-		if err != nil {
-			err = fmt.Errorf("Unable to initialize import stream writer for mount prefix %s", aw.mountPoint.Destination)
-			wm.op.Errorf(err.Error())
-			return nil, err
-		}
-		aw.writer = rawWriter
-		aw.tarWriter = tar.NewWriter(rawWriter)
-	}
-
-	return aw.tarWriter, nil
-}
-
-// Close visits all the archive writer in the trie and closes the actual io.WritCloser
-func (wm *ArchiveStreamWriterMap) Close(op trace.Operation) error {
-	defer trace.End(trace.Begin(""))
-
-	closeStream := func(prefix patricia.Prefix, item patricia.Item) error {
-		if aw, ok := item.(*ArchiveWriter); ok && aw.writer != nil {
-			aw.tarWriter.Close()
-			aw.writer.Close()
-			aw.tarWriter = nil
-			aw.writer = nil
-		}
-		return nil
-	}
-
-	wm.prefixTrie.Visit(closeStream)
-
-	// wait for all pl calls to return and close the channel
-	go func() {
-		wm.wg.Wait()
-		close(wm.errchan)
-	}()
-
-	var err error
-	// wait for all the streams to finish
-	for result := range wm.errchan {
-		if result != nil {
-			err = result
-			op.Errorf("Error received from portlayer for import streams: %s", result.Error())
-		}
-	}
-
-	return err
-}
-
-// FindArchiveReaders finds all archive readers that are within the container source path.  For example,
-//
-//	mount A -			/mnt/A
-//	mount B -			/mnt/B
-//	mount AB -			/mnt/A/AB
-//	base container -	/
-//
-//	container source path - /mnt/A
-//
-// For the above example, this function returns the readers for mount A and mount AB but not the
-// readers for / or mount B.
-func (rm *ArchiveStreamReaderMap) FindArchiveReaders(containerSourcePath string) ([]*ArchiveReader, error) {
-	defer trace.End(trace.Begin(containerSourcePath))
-
-	var nodes []*ArchiveReader
-	var startingNode *ArchiveReader
-	var err error
-	var isMountPoint bool
-
-	findStartingPrefix := func(prefix patricia.Prefix, item patricia.Item) error {
-		if _, ok := item.(*ArchiveReader); !ok {
-			return fmt.Errorf("item not ArchiveReader")
-		}
-
-		startingNode = item.(*ArchiveReader)
-		return nil
-	}
-
-	walkPrefixSubtree := func(prefix patricia.Prefix, item patricia.Item) error {
-		if _, ok := item.(*ArchiveReader); !ok {
-			return fmt.Errorf("item not ArchiveReader")
-		}
-
-		ar, _ := item.(*ArchiveReader)
-		nodes = append(nodes, ar)
-		isMountPoint = ar.mountPoint.Destination != "/" &&
-			(isMountPoint || strings.HasPrefix(containerSourcePath, ar.mountPoint.Destination))
-		return nil
-	}
-
-	// Clean off any trailing periods from the path, such as `cp cid:/mnt/. -`
-	// Including the periods in the prefix walk would not match with subvolume
-	// mounts like /mnt/vol1 or /mnt/vol2.
-	// Find all mounts for the sourcepath
-	cleanPath := vicarchive.Clean(containerSourcePath, false)
-	prefix := patricia.Prefix(cleanPath)
-	err = rm.prefixTrie.VisitSubtree(prefix, walkPrefixSubtree)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to find a node for prefix %s: %s", containerSourcePath, err.Error())
-		rm.op.Errorf(msg)
-		return nil, fmt.Errorf(msg)
-	}
-
-	// The above subtree walking MAY NOT find the starting prefix.  For example /etc will not find /.
-	// Subtree only finds prefix that starts with /etc.  VisitPrefixes will find the starting prefix.
-	// If the search was for /, then it will not find the starting node.  In that case, we grab the
-	// first node in the slice.
-	err = rm.prefixTrie.VisitPrefixes(prefix, findStartingPrefix)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to find starting node for prefix %s: %s", containerSourcePath, err.Error())
-		rm.op.Errorf(msg)
-		return nil, fmt.Errorf(msg)
-	}
-
-	if startingNode != nil {
-		found := false
-		for _, node := range nodes {
-			if node.mountPoint.Destination == startingNode.mountPoint.Destination {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			// prepend the starting node at the beginning
-			nodes = append([]*ArchiveReader{startingNode}, nodes...)
-		}
-	} else if len(nodes) > 0 {
-		startingNode = nodes[0]
-	} else {
-		msg := fmt.Sprintf("Failed to find starting node for prefix %s: %s", containerSourcePath, err.Error())
-		rm.op.Errorf(msg)
-		return nil, fmt.Errorf(msg)
-	}
-
-	// if the path is a mount path, we need to include the directory header of the actual mountpoint
-	// to ensure the corrent permissions of the directory, eg docker cp cid:/mnt/vol1/ needs to include
-	// 		header from /mnt/vol1 located on containerfs
-	// 		data from /mnt/vol1/ located on deviceId vol1
-	if isMountPoint && path.Base(containerSourcePath) != "." {
-		rm.op.Debugf("%s is a mountpoint, getting dir permissions from parent", cleanPath)
-		// find the parent node using VisitPrefixes
-		parent := path.Dir(cleanPath)
-		prefix = patricia.Prefix(parent)
-		startingNode = nil
-		err = rm.prefixTrie.VisitPrefixes(prefix, findStartingPrefix)
-		if err != nil {
-			msg := fmt.Sprintf("Failed to generate parent node for mountpoint %s: %s", parent, err.Error())
-			rm.op.Errorf(msg)
-			return nil, fmt.Errorf(msg)
-		}
-
-		var found bool
-		if startingNode != nil {
-			for _, node := range nodes {
-				found = found || node.mountPoint.Destination == startingNode.mountPoint.Destination
-			}
-			if !found {
-				nodes = append([]*ArchiveReader{startingNode}, nodes...)
-			}
-		}
-	}
-
-	err = rm.buildFilterSpec(containerSourcePath, nodes, startingNode)
-	if err != nil {
-		return nil, err
-	}
-
-	return nodes, nil
-}
-
-// ReadersForSourcePath returns all an array of io.Reader for all the readers within a container source path.
-//		Example:
-//			Reader 1 -				/mnt/A
-//			Reader 2 -				/mnt/A/B
-//
-//			containerSourcePath -	/mnt/A
-// In the above, both readers are within the the container source path.
-func (rm *ArchiveStreamReaderMap) ReadersForSourcePath(proxy proxy.VicArchiveProxy, cid, containerSourcePath string) ([]io.ReadCloser, error) {
-	defer trace.End(trace.Begin(containerSourcePath))
-
-	var streamReaders []io.ReadCloser
-
-	nodes, err := rm.FindArchiveReaders(containerSourcePath)
-	if err != nil {
-		return nil, err
-	}
-
-	mounts := []string{}
-	for _, node := range nodes {
-		mounts = append(mounts, node.mountPoint.Destination)
-	}
-
-	// Create the io.Reader for those mounts if they haven't already been initialized
-	for _, node := range nodes {
-		if node.reader == nil {
-			var store, deviceID string
-			if node.mountPoint.Destination == "/" {
-				// Special case. / refers to container VMDK and not a volume vmdk.
-				store = constants.ContainerStoreName
-				deviceID = cid
-			} else {
-				store = constants.VolumeStoreName
-				deviceID = node.mountPoint.Name
-			}
-
-			rm.op.Infof("Lazily initializing export stream for %s [%s]", node.mountPoint.Name, node.mountPoint.Destination)
-			reader, err := proxy.ArchiveExportReader(rm.op, store, "", deviceID, "", true, node.filterSpec)
-			if err != nil {
-				err = fmt.Errorf("Unable to initialize export stream reader for prefix %s", node.mountPoint.Destination)
-				rm.op.Errorf(err.Error())
-				return nil, err
-			}
-			rm.op.Infof("Lazy initialization created reader %#v", reader)
-			streamReaders = append(streamReaders, reader)
-		} else {
-			streamReaders = append(streamReaders, node.reader)
-		}
-	}
-
-	if len(nodes) == 0 {
-		rm.op.Infof("Found no archive readers for %s", containerSourcePath)
-	}
-
-	return streamReaders, nil
-}
-
-// Close visits all the archive readers in the trie and closes the actual io.ReadCloser
-func (rm *ArchiveStreamReaderMap) Close() {
-	defer trace.End(trace.Begin(""))
-
-	closeStream := func(prefix patricia.Prefix, item patricia.Item) error {
-		if aw, ok := item.(*ArchiveReader); ok && aw.reader != nil {
-			aw.reader.Close()
-			aw.reader = nil
-		}
-		return nil
-	}
-
-	rm.prefixTrie.Visit(closeStream)
-}
-
-//  tryFakeStatPath tries to fake the statpath for path that targets the mountpoint or along the mountpoint
-func tryFakeStatPath(mounts []types.MountPoint, target string) (*types.ContainerPathStat, bool) {
-	isMountPathTarget := false
-
-	for _, mount := range mounts {
-		if strings.HasPrefix(mount.Destination, target) {
-			isMountPathTarget = true
-		}
-	}
-
-	// check to see if the path is a mount point, if so, return fake path
-	if isMountPathTarget {
-		return &types.ContainerPathStat{
-			Name:       filepath.Base(target),
-			Size:       int64(4096),
-			Mode:       os.ModeDir,
-			Mtime:      time.Now(),
-			LinkTarget: "",
-		}, true
-	}
-
-	return nil, false
-}
-
-// resolvePathWithMountPoints use mounts to generate a filter spec for the given path
-func resolvePathWithMountPoints(op trace.Operation, mounts []types.MountPoint, path string) *ArchiveReader {
-	var primaryTarget *ArchiveReader
-
-	readerMap := NewArchiveStreamReaderMap(op, mounts, path)
-	// #nosec: Errors unhandled.
-	nodes, _ := readerMap.FindArchiveReaders(path)
-
-	for _, node := range nodes {
-		if strings.HasPrefix(path, node.mountPoint.Destination) &&
-			(primaryTarget == nil || len(node.mountPoint.Destination) > len(primaryTarget.mountPoint.Destination)) {
-			primaryTarget = node
-		}
-	}
-
-	return primaryTarget
-}
-
-func (rm *ArchiveStreamReaderMap) buildFilterSpec(containerSourcePath string, nodes []*ArchiveReader, startingNode *ArchiveReader) error {
-
-	mounts, foundNodes, err := rm.buildMountsAndNodes(startingNode.mountPoint.Destination, startingNode)
-	if err != nil {
-		return err
-	}
-
-	for _, node := range foundNodes {
-		vicarchive.AddMountInclusionsExclusions(node.mountPoint.Destination, &node.filterSpec, mounts, containerSourcePath)
-	}
-	return nil
-}
-
-// buildMountsAndNodes returns the node pointers from the prefix tree as well as all mounts involved in the operation
-func (rm *ArchiveStreamReaderMap) buildMountsAndNodes(path string, node *ArchiveReader) ([]string, []*ArchiveReader, error) {
-
-	// NOTE(sflxn): We can modify this to make proper exclusions in the future. For now,
-	// we assemble the list of mounts which are involved in the operation
-	// and use the util.go function for generating all the needed information
-
-	mounts := []string{}
-	nodes := []*ArchiveReader{}
-	childWalker := func(prefix patricia.Prefix, item patricia.Item) error {
-		if _, ok := item.(*ArchiveReader); !ok {
-			return fmt.Errorf("item not ArchiveReader")
-		}
-
-		ar, _ := item.(*ArchiveReader)
-		mounts = append(mounts, ar.mountPoint.Destination)
-		nodes = append(nodes, ar)
-		return nil
-	}
-
-	// prefix = current node's mount path
-	nodePrefix := patricia.Prefix(path)
-
-	err := rm.prefixTrie.VisitSubtree(nodePrefix, childWalker)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to build exclusion filter for %s: %s", path, err.Error())
-		log.Error(msg)
-		return nil, nil, fmt.Errorf(msg)
-	}
-
-	return mounts, nodes, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive_test.go
deleted file mode 100644
index f89c461d8c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/archive_test.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"context"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type MockCopyToData struct {
-	containerDestPath string
-	tarAssetName      string
-	expectedPrefix    string
-}
-
-type ReaderFilters struct {
-	rebase  string
-	strip   string
-	exclude []string
-	include string
-}
-type MockCopyFromData struct {
-	containerSourcePath string
-	expectedPrefices    []string
-	expectedFilterSpecs map[string]ReaderFilters
-}
-
-func TestFindArchiveWriter(t *testing.T) {
-	mounts := []types.MountPoint{
-		{Name: "volA", Destination: "/mnt/A"},
-		{Name: "volAB", Destination: "/mnt/A/AB"},
-		{Name: "volB", Destination: "/mnt/B"},
-		{Name: "R/W", Destination: "/"},
-	}
-
-	mockData := []MockCopyToData{
-		// mock data for tar asset as a file and container dest path including a mount point
-		{
-			containerDestPath: "/mnt/A/",
-			tarAssetName:      "file.txt",
-			expectedPrefix:    "/mnt/A",
-		},
-		{
-			containerDestPath: "/mnt/A/AB",
-			tarAssetName:      "file.txt",
-			expectedPrefix:    "/mnt/A/AB",
-		},
-		// mock data for tar asset containing a mount point and the container dest path as /
-		{
-			containerDestPath: "/",
-			tarAssetName:      "mnt/A/file.txt",
-			expectedPrefix:    "/mnt/A",
-		},
-		{
-			containerDestPath: "/",
-			tarAssetName:      "mnt/A/AB/file.txt",
-			expectedPrefix:    "/mnt/A/AB",
-		},
-		// mock data for cases that do not involve mount points
-		{
-			containerDestPath: "/",
-			tarAssetName:      "test/file.txt",
-			expectedPrefix:    "/",
-		},
-	}
-
-	for _, data := range mockData {
-		op := trace.NewOperation(context.Background(), "")
-		writerMap := NewArchiveStreamWriterMap(op, mounts, data.containerDestPath)
-		aw, err := writerMap.FindArchiveWriter(data.containerDestPath, data.tarAssetName)
-		assert.Nil(t, err, "Expected success from finding archive writer for container dest %s and tar asset path %s", data.containerDestPath, data.tarAssetName)
-		assert.NotNil(t, aw, "Expected non-nil archive writer")
-		if aw != nil {
-			assert.Contains(t, aw.mountPoint.Destination, data.expectedPrefix,
-				"Expected to find prefix %s for container dest %s and tar asset path %s",
-				data.expectedPrefix, data.containerDestPath, data.tarAssetName)
-		}
-	}
-}
-
-func TestFindArchiveReaders(t *testing.T) {
-	mounts := []types.MountPoint{
-		{Name: "volA", Destination: "/mnt/A"},     //mount point
-		{Name: "volAB", Destination: "/mnt/A/AB"}, //mount point
-		{Name: "volB", Destination: "/mnt/B"},     //mount point
-		{Name: "R/W", Destination: "/"},           //container base volume
-	}
-
-	mockData := []MockCopyFromData{
-		// case 1: Get all mount prefix
-		{
-			containerSourcePath: "/",
-			expectedPrefices:    []string{"/", "/mnt/A", "/mnt/B", "/mnt/A/AB"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "",
-					strip:   "",
-					exclude: []string{"mnt/A/", "mnt/B/", "mnt/A/AB/"},
-					include: "",
-				},
-				"/mnt/A": {
-					rebase:  "mnt/A",
-					strip:   "",
-					exclude: []string{"AB/"},
-					include: "",
-				},
-				"/mnt/B": {
-					rebase:  "mnt/B",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-				"/mnt/A/AB": {
-					rebase:  "mnt/A/AB",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-			},
-		},
-		{
-			containerSourcePath: "/mnt",
-			expectedPrefices:    []string{"/", "/mnt/A", "/mnt/B", "/mnt/A/AB"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "mnt",
-					strip:   "mnt",
-					exclude: []string{"mnt/A/", "mnt/B/", "mnt/A/AB/"},
-					include: "",
-				},
-				"/mnt/A": {
-					rebase:  "mnt/A",
-					strip:   "",
-					exclude: []string{"AB/"},
-					include: "",
-				},
-				"/mnt/B": {
-					rebase:  "mnt/B",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-				"/mnt/A/AB": {
-					rebase:  "mnt/A/AB",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-			},
-		},
-		{
-			containerSourcePath: "/mnt/",
-			expectedPrefices:    []string{"/", "/mnt/A", "/mnt/B", "/mnt/A/AB"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "mnt",
-					strip:   "mnt",
-					exclude: []string{"mnt/A/", "mnt/B/", "mnt/A/AB/"},
-					include: "",
-				},
-				"/mnt/A": {
-					rebase:  "mnt/A",
-					strip:   "",
-					exclude: []string{"AB/"},
-					include: "",
-				},
-				"/mnt/B": {
-					rebase:  "mnt/B",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-				"/mnt/A/AB": {
-					rebase:  "mnt/A/AB",
-					strip:   "",
-					exclude: []string{},
-					include: "",
-				},
-			},
-		},
-		// case 2: Do not include /mnt/B
-		{
-			containerSourcePath: "/mnt/A",
-			expectedPrefices:    []string{"/", "/mnt/A", "/mnt/A/AB"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "A",
-					strip:   "mnt/A",
-					exclude: []string{"mnt/A/", "mnt/A/AB/"},
-					include: "/mnt/A",
-				},
-				"/mnt/A": {
-					rebase:  "A",
-					strip:   "",
-					exclude: []string{"AB/"},
-				},
-				"/mnt/A/AB": {
-					rebase:  "A/AB",
-					exclude: []string{},
-					include: "",
-				},
-			},
-		},
-		// case 3: Return only the container base "/"
-		{
-			containerSourcePath: "/mnt/not-a-mount",
-			expectedPrefices:    []string{"/"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "not-a-mount",
-					strip:   "mnt/not-a-mount",
-					exclude: []string{""},
-					include: "mnt/not-a-mount",
-				},
-			},
-		},
-		{
-			containerSourcePath: "/etc/",
-			expectedPrefices:    []string{"/"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/": {
-					rebase:  "etc",
-					strip:   "etc",
-					exclude: []string{""},
-					include: "etc",
-				},
-			},
-		},
-		// case 4: Check inclusion filter
-		{
-			containerSourcePath: "/mnt/A/a/file.txt",
-			expectedPrefices:    []string{"/mnt/A"},
-			expectedFilterSpecs: map[string]ReaderFilters{
-				"/mnt/A": {
-					rebase:  "file.txt",
-					strip:   "a/file.txt",
-					exclude: []string{""},
-					include: "a/file.txt",
-				},
-			},
-		},
-	}
-
-	for i, data := range mockData {
-		op := trace.NewOperation(context.Background(), "")
-		readerMap := NewArchiveStreamReaderMap(op, mounts, data.containerSourcePath)
-		archiveReaders, err := readerMap.FindArchiveReaders(data.containerSourcePath)
-		assert.Nil(t, err, "Expected success from finding archive readers for container source %s", data.containerSourcePath)
-		assert.NotNil(t, archiveReaders, "Expected an array of archive readers but got nil for container source path %s", data.containerSourcePath)
-		assert.NotEmpty(t, archiveReaders, "Expected an array of archive readers %s with more than one items", data.containerSourcePath)
-
-		log.Debugf("Data = %#v", data)
-		pa := PrefixArray(archiveReaders)
-		nonOverlap := UnionMinusIntersection(pa, data.expectedPrefices)
-		assert.Empty(t, nonOverlap, "Found mismatch in the prefix array and expected array for source path %s.  Non-overlapped result = %#v", data.containerSourcePath, nonOverlap)
-
-		// Check filter spec
-		for _, ar := range archiveReaders {
-			currPath := ar.mountPoint.Destination
-			assert.Equal(t, data.expectedFilterSpecs[currPath].rebase, ar.filterSpec.RebasePath, "rebase filterspec not correct")
-			assert.Equal(t, data.expectedFilterSpecs[currPath].strip, ar.filterSpec.StripPath, "strip filterspec not correct")
-			for _, ex := range data.expectedFilterSpecs[currPath].exclude {
-				_, ok := ar.filterSpec.Exclusions[ex]
-				assert.True(t, ok, "Did not find %s in exclusion map for reader %s in mock #%d", ex, currPath, i)
-			}
-		}
-
-		// Check inclusion filter
-		if len(archiveReaders) == 1 {
-			ar := archiveReaders[0]
-			currPath := ar.mountPoint.Destination
-
-			expectedInclusion := data.expectedFilterSpecs[currPath].include
-
-			assert.Len(t, ar.filterSpec.Inclusions, 1, "Expected only 1 inclusion filter for %s but got %d in mock #%d", data.containerSourcePath, len(ar.filterSpec.Inclusions), i)
-
-			if len(ar.filterSpec.Inclusions) == 1 {
-				_, ok := ar.filterSpec.Inclusions[expectedInclusion]
-				assert.True(t, ok, "Expected inclusion filter to contain %s in mock #%d", expectedInclusion, i)
-
-				// Sanity check to make sure include isn't in exclusion.  This should never happen.
-				for _, ex := range data.expectedFilterSpecs[currPath].exclude {
-					assert.NotEqual(t, expectedInclusion, ex, "Expected inclusion %s not to be in exclusion list %#v in mock #%d", expectedInclusion, ex, i)
-				}
-			}
-		}
-	}
-}
-
-func PrefixArray(readers []*ArchiveReader) (pa []string) {
-	for _, reader := range readers {
-		pa = append(pa, reader.mountPoint.Destination)
-	}
-
-	log.Debugf("prefix array - %#v", pa)
-	return
-}
-
-func UnionMinusIntersection(A, B []string) (res []string) {
-	test := make(map[string]bool)
-
-	log.Debugf("Looking for non overlapping in array A-%#v and array B-%#v", A, B)
-
-	for _, data := range A {
-		test[data] = true
-	}
-
-	for _, data := range B {
-		if _, ok := test[data]; ok {
-			delete(test, data)
-		} else {
-			res = append(res, data)
-		}
-	}
-
-	for key := range test {
-		res = append(res, key)
-	}
-
-	log.Debugf("Resulting non overlapped array - %#v", res)
-
-	return
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/backends.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/backends.go
deleted file mode 100644
index 9ce08bead5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/backends.go
+++ /dev/null
@@ -1,537 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"context"
-	"crypto/x509"
-	"fmt"
-	"net"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/daemon/events"
-	"github.com/go-openapi/runtime"
-	rc "github.com/go-openapi/runtime/client"
-	"github.com/go-openapi/swag"
-	"golang.org/x/sync/singleflight"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	vicproxy "github.com/vmware/vic/lib/apiservers/engine/proxy"
-	apiclient "github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/misc"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/scopes"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/dynamic"
-	"github.com/vmware/vic/lib/config/dynamic/admiral"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/imagec"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/registry"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-const (
-	PortlayerName = "Backend Engine"
-
-	// RetryTimeSeconds defines how many seconds to wait between retries
-	RetryTimeSeconds        = 2
-	defaultSessionKeepAlive = 20 * time.Second
-)
-
-var (
-	portLayerClient     *apiclient.PortLayer
-	portLayerServerAddr string
-	portLayerName       string
-	productName         string
-	productVersion      string
-
-	vchConfig        *dynConfig
-	RegistryCertPool *x509.CertPool
-	archiveProxy     vicproxy.VicArchiveProxy
-
-	eventService *events.Events
-
-	servicePort uint
-)
-
-type dynConfig struct {
-	sync.Mutex
-
-	Cfg    *config.VirtualContainerHostConfigSpec
-	src    dynamic.Source
-	merger dynamic.Merger
-	sess   *session.Session
-
-	Whitelist, Blacklist, Insecure registry.Set
-	remoteWl                       bool
-
-	group   singleflight.Group
-	lastCfg *dynConfig
-}
-
-func Init(portLayerAddr, product string, port uint, config *config.VirtualContainerHostConfigSpec) error {
-	servicePort = port
-	_, _, err := net.SplitHostPort(portLayerAddr)
-	if err != nil {
-		return err
-	}
-
-	if config == nil {
-		return fmt.Errorf("docker API server requires VCH config")
-	}
-
-	productName = product
-
-	if config.Version != nil {
-		productVersion = config.Version.ShortVersion()
-	}
-	if productVersion == "" {
-		portLayerName = product + " Backend Engine"
-	} else {
-		portLayerName = product + " " + productVersion + " Backend Engine"
-	}
-
-	if vchConfig, err = newDynConfig(ctx, config); err != nil {
-		return err
-	}
-
-	loadRegistryCACerts()
-
-	t := rc.New(portLayerAddr, "/", []string{"http"})
-	t.Consumers["application/x-tar"] = runtime.ByteStreamConsumer()
-	t.Consumers["application/octet-stream"] = runtime.ByteStreamConsumer()
-	t.Producers["application/x-tar"] = runtime.ByteStreamProducer()
-	t.Producers["application/octet-stream"] = runtime.ByteStreamProducer()
-
-	portLayerClient = apiclient.New(t, nil)
-	portLayerServerAddr = portLayerAddr
-
-	// block indefinitely while waiting on the portlayer to respond to pings
-	// the vic-machine installer timeout will intervene if this blocks for too long
-	pingPortLayer()
-
-	if err := hydrateCaches(); err != nil {
-		return err
-	}
-
-	log.Info("Creating image store")
-	if err := createImageStore(); err != nil {
-		log.Errorf("Failed to create image store")
-		return err
-	}
-
-	archiveProxy = vicproxy.NewArchiveProxy(portLayerClient)
-
-	eventService = events.New()
-
-	return nil
-}
-
-func hydrateCaches() error {
-	const waiters = 3
-
-	wg := sync.WaitGroup{}
-	wg.Add(waiters)
-	errChan := make(chan error, waiters)
-
-	go func() {
-		defer wg.Done()
-		if err := imagec.InitializeLayerCache(portLayerClient); err != nil {
-			errChan <- fmt.Errorf("Failed to initialize layer cache: %s", err)
-			return
-		}
-		log.Info("Layer cache initialized successfully")
-		errChan <- nil
-	}()
-
-	go func() {
-		defer wg.Done()
-		if err := cache.InitializeImageCache(portLayerClient); err != nil {
-			errChan <- fmt.Errorf("Failed to initialize image cache: %s", err)
-			return
-		}
-		log.Info("Image cache initialized successfully")
-
-		// container cache relies on image cache so we share a goroutine to update
-		// them serially
-		if err := syncContainerCache(); err != nil {
-			errChan <- fmt.Errorf("Failed to update container cache: %s", err)
-			return
-		}
-		log.Info("Container cache updated successfully")
-		errChan <- nil
-	}()
-
-	go func() {
-		log.Info("Refreshing repository cache")
-		defer wg.Done()
-		if err := cache.NewRepositoryCache(portLayerClient); err != nil {
-			errChan <- fmt.Errorf("Failed to create repository cache: %s", err.Error())
-			return
-		}
-		errChan <- nil
-		log.Info("Repository cache updated successfully")
-	}()
-
-	wg.Wait()
-	close(errChan)
-
-	var errs []string
-	for err := range errChan {
-		if err != nil {
-			// accumulate all errors into one
-			errs = append(errs, err.Error())
-		}
-	}
-
-	var e error
-	if len(errs) > 0 {
-		e = fmt.Errorf(strings.Join(errs, ", "))
-	}
-
-	if e != nil {
-		log.Errorf("Errors occurred during cache hydration at VCH start: %s", e)
-	}
-
-	return e
-}
-
-func PortLayerClient() *apiclient.PortLayer {
-	return portLayerClient
-}
-
-func PortLayerServer() string {
-	return portLayerServerAddr
-}
-
-func PortLayerName() string {
-	return portLayerName
-}
-
-func ProductName() string {
-	return productName
-}
-
-func ProductVersion() string {
-	return productVersion
-}
-
-func pingPortLayer() {
-	ticker := time.NewTicker(RetryTimeSeconds * time.Second)
-	defer ticker.Stop()
-	params := misc.NewPingParamsWithContext(context.TODO())
-
-	log.Infof("Waiting for portlayer to come up")
-
-	for range ticker.C {
-		if _, err := portLayerClient.Misc.Ping(params); err == nil {
-			log.Info("Portlayer is up and responding to pings")
-			return
-		}
-	}
-}
-
-func createImageStore() error {
-	// TODO(jzt): we should move this to a utility package or something
-	host, err := sys.UUID()
-	if err != nil {
-		log.Errorf("Failed to determine host UUID")
-		return err
-	}
-
-	// attempt to create the image store if it doesn't exist
-	store := &models.ImageStore{Name: host}
-	_, err = portLayerClient.Storage.CreateImageStore(
-		storage.NewCreateImageStoreParamsWithContext(ctx).WithBody(store),
-	)
-
-	if err != nil {
-		if _, ok := err.(*storage.CreateImageStoreConflict); ok {
-			log.Debugf("Store already exists")
-			return nil
-		}
-		return err
-	}
-	log.Infof("Image store created successfully")
-	return nil
-}
-
-// syncContainerCache runs once at startup to populate the container cache
-func syncContainerCache() error {
-	log.Debugf("Updating container cache")
-
-	backend := NewContainerBackend()
-	client := backend.containerProxy.Client()
-
-	reqParams := containers.NewGetContainerListParamsWithContext(ctx).WithAll(swag.Bool(true))
-	containme, err := client.Containers.GetContainerList(reqParams)
-	if err != nil {
-		return errors.Errorf("Failed to retrieve container list from portlayer: %s", err)
-	}
-
-	log.Debugf("Found %d containers", len(containme.Payload))
-	cc := cache.ContainerCache()
-	var errs []string
-	for _, info := range containme.Payload {
-		container := ContainerInfoToVicContainer(*info)
-		cc.AddContainer(container)
-		if err = setPortMapping(info, backend, container); err != nil {
-			errs = append(errs, err.Error())
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.Errorf("Failed to set port mapping: %s", strings.Join(errs, "\n"))
-	}
-	return nil
-}
-
-func setPortMapping(info *models.ContainerInfo, backend *Container, container *container.VicContainer) error {
-	if info.ContainerConfig.State == "" {
-		log.Infof("container state is nil")
-		return nil
-	}
-	if info.ContainerConfig.State != "Running" || len(container.HostConfig.PortBindings) == 0 {
-		log.Infof("Container info state: %s", info.ContainerConfig.State)
-		log.Infof("container portbinding: %+v", container.HostConfig.PortBindings)
-		return nil
-	}
-
-	log.Debugf("Set port mapping for container %q, portmapping %+v", container.Name, container.HostConfig.PortBindings)
-	client := backend.containerProxy.Client()
-	endpointsOK, err := client.Scopes.GetContainerEndpoints(
-		scopes.NewGetContainerEndpointsParamsWithContext(ctx).WithHandleOrID(container.ContainerID))
-	if err != nil {
-		return err
-	}
-	for _, e := range endpointsOK.Payload {
-		if len(e.Ports) > 0 && e.Scope == constants.BridgeScopeType {
-			if err = MapPorts(container.HostConfig, e, container.ContainerID); err != nil {
-				log.Errorf(err.Error())
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-func loadRegistryCACerts() {
-	var err error
-
-	RegistryCertPool, err = x509.SystemCertPool()
-	log.Debugf("Loaded %d CAs for registries from system CA bundle", len(RegistryCertPool.Subjects()))
-	if err != nil {
-		log.Errorf("Unable to load system CAs")
-		return
-	}
-
-	vchConfig.Lock()
-	defer vchConfig.Unlock()
-	if !RegistryCertPool.AppendCertsFromPEM(vchConfig.Cfg.RegistryCertificateAuthorities) {
-		log.Errorf("Unable to load CAs for registry access in config")
-		return
-	}
-
-	log.Debugf("Loaded %d CAs for registries from config", len(RegistryCertPool.Subjects()))
-}
-
-func EventService() *events.Events {
-	return eventService
-}
-
-// RegistryCheck checkes the given url against the registry whitelist, blacklist, and insecure
-// registries lists. It returns true for each list where u matches that list.
-func (d *dynConfig) RegistryCheck(ctx context.Context, u *url.URL) (wl bool, bl bool, insecure bool) {
-	m := d.update(ctx)
-
-	us := u.String()
-	wl = len(m.Whitelist) == 0 || m.Whitelist.Match(us)
-	bl = len(m.Blacklist) == 0 || !m.Blacklist.Match(us)
-	insecure = m.Insecure.Match(us)
-	return
-}
-
-func (d *dynConfig) update(ctx context.Context) *dynConfig {
-	const key = "RegistryCheck"
-	resCh := d.group.DoChan(key, func() (interface{}, error) {
-		d.Lock()
-		src := d.src
-		d.Unlock()
-
-		ctx, cancel := context.WithTimeout(context.Background(), 2*time.Minute)
-		defer cancel()
-
-		c, err := src.Get(ctx)
-		if err != nil {
-			log.Warnf("error getting config from source: %s", err)
-		}
-
-		d.Lock()
-		defer d.Unlock()
-
-		m := d
-		if c != nil {
-			// update config
-			if m, err = d.merged(c); err != nil {
-				log.Errorf("error updating config: %s", err)
-				m = d
-			} else {
-				if len(c.RegistryWhitelist) > 0 {
-					m.remoteWl = true
-				}
-			}
-		} else if err == nil && src == d.src {
-			// err == nil and c == nil, which
-			// indicates no remote sources
-			// were found, try resetting the
-			// source for next time
-			if err := d.resetSrc(); err != nil {
-				log.Warnf("could not reset config source: %s", err)
-			}
-		}
-
-		d.lastCfg = m
-		return m, nil
-	})
-
-	select {
-	case res := <-resCh:
-		return res.Val.(*dynConfig)
-	case <-ctx.Done():
-		return func() *dynConfig {
-			d.Lock()
-			defer d.Unlock()
-
-			if d.lastCfg == nil {
-				return d
-			}
-
-			return d.lastCfg
-		}()
-	}
-}
-
-func (d *dynConfig) resetSrc() error {
-	ep, err := d.clientEndpoint()
-	if err != nil {
-		return err
-	}
-
-	d.src = admiral.NewSource(d.sess, ep.String())
-	return nil
-}
-
-func newDynConfig(ctx context.Context, c *config.VirtualContainerHostConfigSpec) (*dynConfig, error) {
-	d := &dynConfig{
-		Cfg: c,
-	}
-	var err error
-	if d.Insecure, err = dynamic.ParseRegistries(c.InsecureRegistries); err != nil {
-		return nil, err
-	}
-	if d.Whitelist, err = dynamic.ParseRegistries(c.RegistryWhitelist); err != nil {
-		return nil, err
-	}
-
-	if d.sess, err = newSession(ctx, c); err != nil {
-		return nil, err
-	}
-
-	d.merger = dynamic.NewMerger()
-	if err := d.resetSrc(); err != nil {
-		return nil, err
-	}
-
-	return d, nil
-}
-
-// update merges another config into this config. d should be locked before
-// calling this.
-func (d *dynConfig) merged(c *config.VirtualContainerHostConfigSpec) (*dynConfig, error) {
-	if c == nil {
-		return d, nil
-	}
-
-	newcfg, err := d.merger.Merge(d.Cfg, c)
-	if err != nil {
-		return nil, err
-	}
-
-	var wl, bl, insecure registry.Set
-	if wl, err = dynamic.ParseRegistries(newcfg.RegistryWhitelist); err != nil {
-		return nil, err
-	}
-	if bl, err = dynamic.ParseRegistries(newcfg.RegistryBlacklist); err != nil {
-		return nil, err
-	}
-	if insecure, err = dynamic.ParseRegistries(newcfg.InsecureRegistries); err != nil {
-		return nil, err
-	}
-
-	return &dynConfig{
-		Whitelist: wl,
-		Blacklist: bl,
-		Insecure:  insecure,
-		Cfg:       newcfg,
-		src:       d.src,
-	}, nil
-}
-
-func (d *dynConfig) clientEndpoint() (*url.URL, error) {
-	ips, err := net.LookupIP("client.localhost")
-	if err != nil {
-		return nil, err
-	}
-
-	scheme := "https"
-	if d.Cfg.HostCertificate.IsNil() {
-		scheme = "http"
-	}
-
-	return url.Parse(fmt.Sprintf("%s://%s:%d", scheme, ips[0], servicePort))
-}
-
-func newSession(ctx context.Context, config *config.VirtualContainerHostConfigSpec) (*session.Session, error) {
-	// strip the path off of the target url since it may contain the
-	// datacenter
-	u, err := url.Parse(config.Target)
-	if err != nil {
-		return nil, err
-	}
-
-	u.Path = ""
-	sessCfg := &session.Config{
-		Service:    u.String(),
-		User:       url.UserPassword(config.Username, config.Token),
-		Thumbprint: config.TargetThumbprint,
-		Keepalive:  defaultSessionKeepAlive,
-	}
-
-	sess := session.NewSession(sessCfg)
-	if sess.Connect(ctx); err != nil {
-		return nil, err
-	}
-
-	return sess, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/build.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/build.go
deleted file mode 100644
index 06ffd0b16a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/build.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"io"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"golang.org/x/net/context"
-)
-
-type Builder struct {
-}
-
-func (b *Builder) BuildFromContext(ctx context.Context, src io.ReadCloser, remote string, buildOptions *types.ImageBuildOptions, pg backend.ProgressWriter) (string, error) {
-	return "", fmt.Errorf("%s does not yet implement BuildFromContext", ProductName())
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/container_cache.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/container_cache.go
deleted file mode 100644
index ff0488f6e7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/container_cache.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cache
-
-import (
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/pkg/truncindex"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/container"
-)
-
-// Tracks our container info from calls
-type CCache struct {
-	m sync.RWMutex
-
-	idIndex            *truncindex.TruncIndex
-	containersByID     map[string]*container.VicContainer
-	containersByName   map[string]*container.VicContainer
-	containersByExecID map[string]*container.VicContainer
-}
-
-var containerCache *CCache
-
-func init() {
-	containerCache = &CCache{
-		idIndex:            truncindex.NewTruncIndex([]string{}),
-		containersByID:     make(map[string]*container.VicContainer),
-		containersByName:   make(map[string]*container.VicContainer),
-		containersByExecID: make(map[string]*container.VicContainer),
-	}
-}
-
-// ContainerCache returns a reference to the container cache
-func ContainerCache() *CCache {
-	return containerCache
-}
-
-func (cc *CCache) getContainerByName(nameOnly string) *container.VicContainer {
-	if container, exist := cc.containersByName[nameOnly]; exist {
-		return container
-	}
-	return nil
-}
-
-func (cc *CCache) getContainer(nameOrID string) *container.VicContainer {
-	// full name matching should take precedence over id prefix matching
-	if container, exist := cc.containersByName[nameOrID]; exist {
-		return container
-	}
-
-	// get the full ID if we only have a prefix
-	if cid, err := cc.idIndex.Get(nameOrID); err == nil {
-		nameOrID = cid
-	}
-
-	if container, exist := cc.containersByID[nameOrID]; exist {
-		return container
-	}
-	return nil
-}
-
-// GetContainerByName returns a container whose name "exactly" matches nameOnly
-func (cc *CCache) GetContainerByName(nameOnly string) *container.VicContainer {
-	cc.m.RLock()
-	defer cc.m.RUnlock()
-
-	return cc.getContainerByName(nameOnly)
-}
-
-func (cc *CCache) GetContainer(nameOrID string) *container.VicContainer {
-	cc.m.RLock()
-	defer cc.m.RUnlock()
-
-	return cc.getContainer(nameOrID)
-}
-
-func (cc *CCache) AddContainer(container *container.VicContainer) {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	// TODO(jzt): this probably shouldn't assume a valid container ID
-	if err := cc.idIndex.Add(container.ContainerID); err != nil {
-		log.Warnf("Error adding ID into index: %s", err)
-	}
-	cc.containersByID[container.ContainerID] = container
-	cc.containersByName[container.Name] = container
-}
-
-func (cc *CCache) DeleteContainer(nameOrID string) {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	container := cc.getContainer(nameOrID)
-	if container == nil {
-		return
-	}
-
-	delete(cc.containersByID, container.ContainerID)
-	delete(cc.containersByName, container.Name)
-
-	if err := cc.idIndex.Delete(container.ContainerID); err != nil {
-		log.Warnf("Error deleting ID from index: %s", err)
-	}
-
-	// remove exec references
-	for _, id := range container.List() {
-		container.Delete(id)
-	}
-}
-
-func (cc *CCache) AddExecToContainer(container *container.VicContainer, eid string) {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	// ignore if we already have it
-	if _, ok := cc.containersByExecID[eid]; ok {
-		return
-	}
-
-	container.Add(eid)
-	cc.containersByExecID[eid] = container
-}
-
-func (cc *CCache) GetContainerFromExec(eid string) *container.VicContainer {
-	cc.m.RLock()
-	defer cc.m.RUnlock()
-
-	if container, exist := cc.containersByExecID[eid]; exist {
-		return container
-	}
-	return nil
-}
-
-// UpdateContainerName assumes that the newName is already reserved by ReserveName
-// so no need to check the existence of a container with the new name.
-func (cc *CCache) UpdateContainerName(oldName, newName string) error {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	container := cc.getContainer(oldName)
-	if container == nil {
-		return derr.NewRequestNotFoundError(fmt.Errorf("no such container: %s", oldName))
-	}
-
-	delete(cc.containersByName, container.Name)
-
-	container.Name = newName
-	cc.containersByName[newName] = container
-	cc.containersByID[container.ContainerID] = container
-
-	return nil
-}
-
-// ReserveName is used during a container create/rename operation to prevent concurrent
-// container create/rename operations from grabbing the new name.
-func (cc *CCache) ReserveName(container *container.VicContainer, name string) error {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	if cont, exist := cc.containersByName[name]; exist {
-		return fmt.Errorf("conflict. The name %q is already in use by container %s. You have to remove (or rename) that container to be able to re use that name.", name, cont.ContainerID)
-	}
-
-	cc.containersByName[name] = container
-
-	return nil
-}
-
-// ReleaseName is used during a container rename operation to allow concurrent container
-// create/rename operations to use the name. It is also used during a failed create
-// operation to allow subsequent create operations to use that name.
-func (cc *CCache) ReleaseName(name string) {
-	cc.m.Lock()
-	defer cc.m.Unlock()
-
-	if _, exist := cc.containersByName[name]; !exist {
-		log.Errorf("ReleaseName error: Name %s not found", name)
-		return
-	}
-
-	delete(cc.containersByName, name)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/image_cache.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/image_cache.go
deleted file mode 100644
index f748c31c1a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/image_cache.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cache
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"sort"
-	"strings"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/docker/distribution/digest"
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/pkg/truncindex"
-	"github.com/docker/docker/reference"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/kv"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// ICache is an in-memory cache of image metadata. It is refreshed at startup
-// by a call to the portlayer. It is updated when new images are pulled or
-// images are deleted.
-type ICache struct {
-	m           sync.RWMutex
-	iDIndex     *truncindex.TruncIndex
-	cacheByID   map[string]*metadata.ImageConfig
-	cacheByName map[string]*metadata.ImageConfig
-	dirty       bool
-
-	client *client.PortLayer
-}
-
-const (
-	imageCacheKey = "images"
-)
-
-var (
-	imageCache *ICache
-)
-
-// byCreated is a temporary type used to sort a list of images by creation
-// time.
-type byCreated []*metadata.ImageConfig
-
-func (r byCreated) Len() int           { return len(r) }
-func (r byCreated) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-func (r byCreated) Less(i, j int) bool { return r[i].Created.Unix() < r[j].Created.Unix() }
-
-func init() {
-	imageCache = &ICache{
-		iDIndex:     truncindex.NewTruncIndex(nil),
-		cacheByID:   make(map[string]*metadata.ImageConfig),
-		cacheByName: make(map[string]*metadata.ImageConfig),
-	}
-}
-
-// ImageCache returns a reference to the image cache
-func ImageCache() *ICache {
-	return imageCache
-}
-
-// InitializeImageCache will create a new image cache or rehydrate an
-// existing image cache from the portlayer k/v store
-func InitializeImageCache(client *client.PortLayer) error {
-	defer trace.End(trace.Begin(""))
-
-	imageCache.client = client
-
-	log.Debugf("Initializing image cache")
-
-	val, err := kv.Get(client, imageCacheKey)
-	if err != nil && err != kv.ErrKeyNotFound {
-		return err
-	}
-
-	i := struct {
-		IDIndex     *truncindex.TruncIndex
-		CacheByID   map[string]*metadata.ImageConfig
-		CacheByName map[string]*metadata.ImageConfig
-	}{}
-
-	if val != "" {
-
-		if err = json.Unmarshal([]byte(val), &i); err != nil {
-			return fmt.Errorf("Failed to unmarshal image cache: %s", err)
-		}
-
-		// populate the trie with IDs
-		for k := range i.CacheByID {
-			imageCache.iDIndex.Add(k)
-		}
-
-		imageCache.cacheByID = i.CacheByID
-		imageCache.cacheByName = i.CacheByName
-	}
-
-	return nil
-}
-
-// GetImages returns a slice containing metadata for all cached images
-func (ic *ICache) GetImages() []*metadata.ImageConfig {
-	defer trace.End(trace.Begin(""))
-	ic.m.RLock()
-	defer ic.m.RUnlock()
-
-	result := make([]*metadata.ImageConfig, 0, len(ic.cacheByID))
-	for _, image := range ic.cacheByID {
-		result = append(result, copyImageConfig(image))
-	}
-
-	sort.Sort(sort.Reverse(byCreated(result)))
-	return result
-}
-
-// IsImageID will check that a full or partial imageID
-// exists in the cache
-func (ic *ICache) IsImageID(id string) bool {
-	ic.m.RLock()
-	defer ic.m.RUnlock()
-	if _, err := ic.iDIndex.Get(id); err == nil {
-		return true
-	}
-	return false
-}
-
-// Get parses input to retrieve a cached image
-func (ic *ICache) Get(idOrRef string) (*metadata.ImageConfig, error) {
-	defer trace.End(trace.Begin(idOrRef))
-	ic.m.RLock()
-	defer ic.m.RUnlock()
-
-	// cover the case of creating by a full reference
-	if config, ok := ic.cacheByName[idOrRef]; ok {
-		return copyImageConfig(config), nil
-	}
-
-	// get the full image ID if supplied a prefix
-	if id, err := ic.iDIndex.Get(idOrRef); err == nil {
-		idOrRef = id
-	}
-
-	imgDigest, named, err := reference.ParseIDOrReference(idOrRef)
-	if err != nil {
-		return nil, err
-	}
-
-	var config *metadata.ImageConfig
-	if imgDigest != "" {
-		config = ic.getImageByDigest(imgDigest)
-	} else {
-		config = ic.getImageByNamed(named)
-	}
-
-	if config == nil {
-		// docker automatically prints out ":latest" tag if not specified in case if image is not found.
-		postfixLatest := ""
-		if !strings.Contains(idOrRef, ":") {
-			postfixLatest += ":" + reference.DefaultTag
-		}
-		return nil, derr.NewRequestNotFoundError(fmt.Errorf(
-			"No such image: %s%s", idOrRef, postfixLatest))
-	}
-
-	return copyImageConfig(config), nil
-}
-
-func (ic *ICache) getImageByDigest(digest digest.Digest) *metadata.ImageConfig {
-	defer trace.End(trace.Begin(digest.String()))
-	var config *metadata.ImageConfig
-	config, ok := ic.cacheByID[string(digest)]
-	if !ok {
-		return nil
-	}
-	return copyImageConfig(config)
-}
-
-// Looks up image by reference.Named
-func (ic *ICache) getImageByNamed(named reference.Named) *metadata.ImageConfig {
-	defer trace.End(trace.Begin(""))
-	// get the imageID from the repoCache
-	// #nosec: Errors unhandled.
-	id, _ := RepositoryCache().Get(named)
-	return copyImageConfig(ic.cacheByID[prefixImageID(id)])
-}
-
-// Add the "sha256:" prefix to the image ID if missing.
-// Don't assume the image id in image has "sha256:<id> as format.  We store it in
-// this format to make it easier to lookup by digest
-func prefixImageID(imageID string) string {
-	if strings.HasPrefix(imageID, "sha256:") {
-		return imageID
-	}
-	return "sha256:" + imageID
-}
-
-// Add adds an image to the image cache
-func (ic *ICache) Add(imageConfig *metadata.ImageConfig) error {
-	defer trace.End(trace.Begin(""))
-
-	ic.m.Lock()
-	defer ic.m.Unlock()
-
-	imageID := prefixImageID(imageConfig.ImageID)
-	err := ic.iDIndex.Add(imageConfig.ImageID)
-	if err != nil && !os.IsExist(err) {
-		return fmt.Errorf("error adding image %s to index: %s", imageID, err)
-	}
-
-	err = nil
-
-	ic.cacheByID[imageID] = imageConfig
-	ic.dirty = true
-
-	if imageConfig.Name == "" {
-		log.Debugf("Image %s has no name", imageID)
-		return nil
-	}
-
-	// Construct a reference after the image is added into cacheByID so that an image
-	// without a name can at least be added to cacheByID.
-
-	// Normalize the name stored in imageConfig using Docker's reference code
-	ref, err := reference.WithName(imageConfig.Name)
-	if err != nil {
-		return fmt.Errorf("error trying to create reference from %s: %s", imageConfig.Name, err)
-	}
-
-	for _, tag := range imageConfig.Tags {
-		ref, err = reference.WithTag(ref, tag)
-		if err != nil {
-			return fmt.Errorf("error trying to create tagged reference from %s and tag %s: %s", imageConfig.Name, tag, err)
-		}
-
-		ic.cacheByName[imageConfig.Reference] = imageConfig
-	}
-
-	return nil
-}
-
-// RemoveImageByConfig removes image from the cache.
-func (ic *ICache) RemoveImageByConfig(imageConfig *metadata.ImageConfig) {
-	defer trace.End(trace.Begin(""))
-
-	ic.m.Lock()
-	defer ic.m.Unlock()
-
-	// If we get here we definitely want to remove image config from any data structure
-	// where it can be present. So that, if there is something is wrong
-	// it could be tracked on debug level.
-	if err := ic.iDIndex.Delete(imageConfig.ImageID); err != nil {
-		log.Debugf("Not found in image cache index: %v", err)
-	}
-
-	prefixedID := prefixImageID(imageConfig.ImageID)
-	delete(ic.cacheByID, prefixedID)
-	delete(ic.cacheByName, imageConfig.Reference)
-
-	ic.dirty = true
-}
-
-// Save will persist the image cache to the portlayer k/v store
-func (ic *ICache) Save() error {
-	defer trace.End(trace.Begin(""))
-	ic.m.Lock()
-	defer ic.m.Unlock()
-
-	if !ic.dirty {
-		return nil
-	}
-
-	m := struct {
-		IDIndex     *truncindex.TruncIndex
-		CacheByID   map[string]*metadata.ImageConfig
-		CacheByName map[string]*metadata.ImageConfig
-	}{
-		ic.iDIndex,
-		ic.cacheByID,
-		ic.cacheByName,
-	}
-
-	bytes, err := json.Marshal(m)
-	if err != nil {
-		log.Errorf("Unable to marshal image cache: %s", err.Error())
-		return err
-	}
-
-	err = kv.Put(ic.client, imageCacheKey, string(bytes))
-	if err != nil {
-		log.Errorf("Unable to save image cache: %s", err.Error())
-		return err
-	}
-
-	ic.dirty = false
-
-	return nil
-}
-
-// copyImageConfig performs and returns deep copy of an ImageConfig struct
-func copyImageConfig(image *metadata.ImageConfig) *metadata.ImageConfig {
-
-	if image == nil {
-		return nil
-	}
-
-	// copy everything
-	newImage := *image
-
-	// replace the pointer to metadata.ImageConfig.Config and copy the contents
-	newConfig := *image.Config
-	newImage.Config = &newConfig
-
-	// get tags and digests from repo
-	tags := RepositoryCache().Tags(newImage.ImageID)
-	digests := RepositoryCache().Digests(newImage.ImageID)
-
-	// if image has neither then set <none> vals
-	if len(tags) == 0 && len(digests) == 0 {
-		tags = append(tags, "<none>:<none>")
-		digests = append(digests, "<none>@<none>")
-	}
-
-	newImage.Tags = tags
-	if digests != nil {
-		newImage.Digests = digests
-	}
-
-	return &newImage
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache.go
deleted file mode 100644
index 0df14dc830..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache.go
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cache
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"sort"
-	"sync"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/kv"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/pkg/trace"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/reference"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// repoCache is a cache of the docker repository information.
-// This info will help to provide proper tag and digest support
-//
-// The cache will be persisted to disk via the portlayer k/v
-// store and will be restored at system start
-//
-// This code is a heavy leverage of docker's reference store:
-// github.com/docker/docker/reference/store.go
-
-var (
-	rCache  *repoCache
-	repoKey = "repositories"
-)
-
-// Repo provides the set of methods which can operate on a tag store.
-type Repo interface {
-	References(imageID string) []reference.Named
-	ReferencesByName(ref reference.Named) []Association
-	Delete(ref reference.Named, save bool) (bool, error)
-	Get(ref reference.Named) (string, error)
-
-	Save() error
-	GetImageID(layerID string) string
-	Tags(imageID string) []string
-	Digests(imageID string) []string
-	AddReference(ref reference.Named, imageID string, force bool, layerID string, save bool) error
-
-	// Remove will remove from the cache and returns the
-	// stringified Named if successful -- save bool instructs
-	// func to persist to portlayer k/v or not
-	Remove(ref string, save bool) (string, error)
-}
-
-type repoCache struct {
-	// client is needed for k/v store operations
-	client *client.PortLayer
-
-	mu sync.RWMutex
-	// repositories is a map of repositories, indexed by name.
-	Repositories map[string]repository
-	// referencesByIDCache is a cache of references indexed by imageID
-	referencesByIDCache map[string]map[string]reference.Named
-	// Layers is a map of layerIDs to imageIDs
-	// TODO: we might be able to remove this later -- currently
-	// needed because an ImageID isn't generated for every pull
-	Layers map[string]string
-	// images is a map of imageIDs to layerIDs
-	// TODO: much like the Layers map this might be able to be
-	// removed
-	images map[string]string
-}
-
-// Repository maps tags to image IDs. The key is a a stringified Reference,
-// including the repository name.
-type repository map[string]string
-
-var (
-	// ErrDoesNotExist returned if a reference is not found in the
-	// store.
-	ErrDoesNotExist = errors.New("reference does not exist")
-)
-
-// An Association is a tuple associating a reference with an image ID.
-type Association struct {
-	Ref     reference.Named
-	ImageID string
-}
-
-type lexicalRefs []reference.Named
-
-func (a lexicalRefs) Len() int           { return len(a) }
-func (a lexicalRefs) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a lexicalRefs) Less(i, j int) bool { return a[i].String() < a[j].String() }
-
-type lexicalAssociations []Association
-
-func (a lexicalAssociations) Len() int           { return len(a) }
-func (a lexicalAssociations) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a lexicalAssociations) Less(i, j int) bool { return a[i].Ref.String() < a[j].Ref.String() }
-
-// RepositoryCache returns a ref to the repoCache interface
-func RepositoryCache() Repo {
-	return rCache
-}
-
-func init() {
-	rCache = &repoCache{
-		Repositories:        make(map[string]repository),
-		Layers:              make(map[string]string),
-		images:              make(map[string]string),
-		referencesByIDCache: make(map[string]map[string]reference.Named),
-	}
-}
-
-// NewRespositoryCache will create a new repoCache or rehydrate
-// an existing repoCache from the portlayer k/v store
-func NewRepositoryCache(client *client.PortLayer) error {
-	defer trace.End(trace.Begin(""))
-
-	rCache.client = client
-
-	val, err := kv.Get(client, repoKey)
-	if err != nil && err != kv.ErrKeyNotFound {
-		return err
-	}
-	if val != "" {
-		if err = json.Unmarshal([]byte(val), rCache); err != nil {
-			return fmt.Errorf("Failed to unmarshal repository cache: %s", err)
-		}
-		// hydrate refByIDCache
-		for _, repository := range rCache.Repositories {
-			for refStr, refID := range repository {
-				// #nosec: Errors unhandled.
-				ref, _ := reference.ParseNamed(refStr)
-				if rCache.referencesByIDCache[refID] == nil {
-					rCache.referencesByIDCache[refID] = make(map[string]reference.Named)
-				}
-				rCache.referencesByIDCache[refID][refStr] = ref
-			}
-		}
-		// hydrate image -> layer cache
-		for image, layer := range rCache.Layers {
-			rCache.images[image] = layer
-		}
-
-		log.Infof("found %d repositories", len(rCache.Repositories))
-		log.Infof("found %d image layers", len(rCache.Layers))
-	}
-	return nil
-}
-
-// Save will persist the repository cache to the
-// portlayer k/v
-func (store *repoCache) Save() error {
-	defer trace.End(trace.Begin(""))
-
-	b, err := json.Marshal(store)
-	if err != nil {
-		log.Errorf("Unable to marshal repository cache: %s", err.Error())
-		return err
-	}
-
-	err = kv.Put(store.client, repoKey, string(b))
-	if err != nil {
-		log.Errorf("Unable to save repository cache: %s", err.Error())
-		return err
-	}
-
-	return nil
-}
-
-func (store *repoCache) AddReference(ref reference.Named, imageID string, force bool, layerID string, save bool) error {
-	defer trace.End(trace.Begin(""))
-	if ref.Name() == string(digest.Canonical) {
-		return errors.New("refusing to create an ambiguous tag using digest algorithm as name")
-	}
-	var err error
-	store.mu.Lock()
-	defer store.mu.Unlock()
-
-	// does this repo (i.e. busybox) exist?
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists || repository == nil {
-		repository = make(map[string]string)
-		store.Repositories[ref.Name()] = repository
-	}
-
-	refStr := ref.String()
-	oldID, exists := repository[refStr]
-
-	if exists {
-		if oldID == imageID {
-			log.Debugf("Image %s is already tagged as %s", oldID, ref.String())
-			return nil
-		}
-
-		// force only works for tags
-		if digested, isDigest := ref.(reference.Canonical); isDigest {
-			log.Debugf("Unable to overwrite %s with digest %s", oldID, digested.Digest().String())
-
-			return fmt.Errorf("Cannot overwrite digest %s", digested.Digest().String())
-		}
-
-		if !force {
-			log.Debugf("Refusing to overwrite %s with %s unless force is specified", oldID, ref.String())
-
-			return fmt.Errorf("Conflict: Tag %s is already set to image %s, if you want to replace it, please use -f option", ref.String(), oldID)
-		}
-
-		if store.referencesByIDCache[oldID] != nil {
-			delete(store.referencesByIDCache[oldID], refStr)
-			if len(store.referencesByIDCache[oldID]) == 0 {
-				delete(store.referencesByIDCache, oldID)
-			}
-		}
-	}
-
-	repository[refStr] = imageID
-	if store.referencesByIDCache[imageID] == nil {
-		store.referencesByIDCache[imageID] = make(map[string]reference.Named)
-	}
-	store.referencesByIDCache[imageID][refStr] = ref
-
-	if layerID != "" {
-		store.Layers[layerID] = imageID
-		store.images[imageID] = layerID
-	}
-	// should we save this input?
-	if save {
-		err = store.Save()
-	}
-
-	return err
-}
-
-// Remove is a convenience function to allow the passing of a properly
-// formed string that can be parsed into a Named object.
-//
-// Examples:
-// Tags: busybox:1.25.1
-// Digest: nginx@sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64
-func (store *repoCache) Remove(ref string, save bool) (string, error) {
-	defer trace.End(trace.Begin(""))
-	n, err := reference.ParseNamed(ref)
-	if err != nil {
-		return "", err
-	}
-
-	_, err = store.Delete(n, save)
-	if err != nil {
-		return "", err
-	}
-
-	return n.String(), nil
-}
-
-// Delete deletes a reference from the store. It returns true if a deletion
-// happened, or false otherwise.
-func (store *repoCache) Delete(ref reference.Named, save bool) (bool, error) {
-	defer trace.End(trace.Begin(""))
-	ref = reference.WithDefaultTag(ref)
-
-	store.mu.Lock()
-	defer store.mu.Unlock()
-	var err error
-	// return code -- assume success
-	rtc := true
-	repoName := ref.Name()
-
-	repository, exists := store.Repositories[repoName]
-	if !exists {
-		return false, ErrDoesNotExist
-	}
-	refStr := ref.String()
-	if imageID, exists := repository[refStr]; exists {
-		delete(repository, refStr)
-		if len(repository) == 0 {
-			delete(store.Repositories, repoName)
-		}
-		if store.referencesByIDCache[imageID] != nil {
-			delete(store.referencesByIDCache[imageID], refStr)
-			if len(store.referencesByIDCache[imageID]) == 0 {
-				delete(store.referencesByIDCache, imageID)
-			}
-		}
-		if layer, exists := store.images[imageID]; exists {
-			delete(store.Layers, imageID)
-			delete(store.images, layer)
-		}
-		if save {
-			err = store.Save()
-			if err != nil {
-				rtc = false
-			}
-		}
-		return rtc, err
-	}
-
-	return false, ErrDoesNotExist
-}
-
-// GetImageID will return the imageID associated with the
-// specified layerID
-func (store *repoCache) GetImageID(layerID string) string {
-	defer trace.End(trace.Begin(layerID))
-	var imageID string
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-	if image, exists := store.Layers[layerID]; exists {
-		imageID = image
-	}
-	return imageID
-}
-
-// Get returns the imageID for a parsed reference
-func (store *repoCache) Get(ref reference.Named) (string, error) {
-	defer trace.End(trace.Begin(""))
-	ref = reference.WithDefaultTag(ref)
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists || repository == nil {
-		return "", ErrDoesNotExist
-	}
-	imageID, exists := repository[ref.String()]
-	if !exists {
-		return "", ErrDoesNotExist
-	}
-
-	return imageID, nil
-}
-
-// Tags returns a slice of tags for the specified imageID
-func (store *repoCache) Tags(imageID string) []string {
-	defer trace.End(trace.Begin(""))
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-	var tags []string
-	for _, ref := range store.referencesByIDCache[imageID] {
-		if tagged, isTagged := ref.(reference.NamedTagged); isTagged {
-			tags = append(tags, tagged.String())
-		}
-	}
-	return tags
-}
-
-// Digests returns a slice of digests for the specified imageID
-func (store *repoCache) Digests(imageID string) []string {
-	defer trace.End(trace.Begin(""))
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-	var digests []string
-	for _, ref := range store.referencesByIDCache[imageID] {
-		if d, isCanonical := ref.(reference.Canonical); isCanonical {
-			digests = append(digests, d.String())
-		}
-	}
-	return digests
-}
-
-// References returns a slice of references to the given imageID. The slice
-// will be nil if there are no references to this imageID.
-func (store *repoCache) References(imageID string) []reference.Named {
-	defer trace.End(trace.Begin(""))
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	// Convert the internal map to an array for two reasons:
-	// 1) We must not return a mutable
-	// 2) It would be ugly to expose the extraneous map keys to callers.
-
-	var references []reference.Named
-	for _, ref := range store.referencesByIDCache[imageID] {
-		references = append(references, ref)
-	}
-
-	sort.Sort(lexicalRefs(references))
-
-	return references
-}
-
-// ReferencesByName returns the references for a given repository name.
-// If there are no references known for this repository name,
-// ReferencesByName returns nil.
-func (store *repoCache) ReferencesByName(ref reference.Named) []Association {
-	defer trace.End(trace.Begin(""))
-
-	store.mu.RLock()
-	defer store.mu.RUnlock()
-
-	repository, exists := store.Repositories[ref.Name()]
-	if !exists {
-		return nil
-	}
-
-	var associations []Association
-	for refStr, refID := range repository {
-		ref, err := reference.ParseNamed(refStr)
-		if err != nil {
-			// Should never happen
-			return nil
-		}
-		associations = append(associations,
-			Association{
-				Ref:     ref,
-				ImageID: refID,
-			})
-	}
-
-	sort.Sort(lexicalAssociations(associations))
-
-	return associations
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache_test.go
deleted file mode 100644
index c77544ce5c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/cache/repo_cache_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package cache
-
-import (
-	"testing"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/pkg/uid"
-
-	"github.com/docker/docker/reference"
-	"github.com/stretchr/testify/assert"
-)
-
-func repoSetup() {
-	rCache = &repoCache{
-		client:              &client.PortLayer{},
-		Repositories:        make(map[string]repository),
-		Layers:              make(map[string]string),
-		images:              make(map[string]string),
-		referencesByIDCache: make(map[string]map[string]reference.Named),
-	}
-}
-
-func TestRepo(t *testing.T) {
-	repoSetup()
-
-	notInRepo, _ := reference.ParseNamed("alpine")
-	noImageID := uid.New()
-	ref, _ := reference.ParseNamed("busybox:1.25.1")
-	imageID := uid.New()
-	layerID := uid.New()
-
-	// add busybox:1.25.1
-	err := RepositoryCache().AddReference(ref, imageID.String(), false, layerID.String(), false)
-	assert.NoError(t, err)
-
-	// Get will return the imageID for the named object
-	n, err := RepositoryCache().Get(ref)
-	assert.NoError(t, err)
-	assert.Equal(t, imageID.String(), n)
-
-	// Get all references
-	refs := RepositoryCache().References(imageID.String())
-	assert.Equal(t, 1, len(refs))
-
-	// Get reference by Named
-	associated := RepositoryCache().ReferencesByName(ref)
-	assert.Equal(t, 1, len(associated))
-
-	// Get tags for image
-	tags := RepositoryCache().Tags(imageID.String())
-	assert.Equal(t, 1, len(tags))
-
-	// Get references for non-existent image
-	refs = RepositoryCache().References(noImageID.String())
-	assert.Equal(t, 0, len(refs))
-
-	// Get reference by Named
-	associated = RepositoryCache().ReferencesByName(notInRepo)
-	assert.Equal(t, 0, len(associated))
-
-	// get image id via layer id
-	ig := RepositoryCache().GetImageID(layerID.String())
-	assert.Equal(t, imageID.String(), ig)
-
-	// remove busybox from the cache
-	r, err := RepositoryCache().Remove(ref.String(), false)
-	assert.NoError(t, err)
-	assert.Equal(t, ref.String(), r)
-
-	// busybox is removed, so this should fail
-	x, err := RepositoryCache().Remove(ref.String(), false)
-	assert.Error(t, err)
-	assert.Equal(t, "", x)
-
-	// add reference by digest
-	ng, _ := reference.ParseNamed("nginx@sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64")
-	err = RepositoryCache().AddReference(ng, imageID.String(), true, layerID.String(), false)
-	assert.NoError(t, err)
-
-	dd := RepositoryCache().Digests(imageID.String())
-	assert.Equal(t, 1, len(dd))
-	// remove the digest
-	ngx, err := RepositoryCache().Remove(ng.String(), false)
-	assert.NoError(t, err)
-	assert.Equal(t, ng.String(), ngx)
-	// nada
-	nada := RepositoryCache().Digests(imageID.String())
-	assert.Equal(t, 0, len(nada))
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/checkpoint.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/checkpoint.go
deleted file mode 100644
index 23488e32b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/checkpoint.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types"
-)
-
-type Checkpoint struct {
-}
-
-func NewCheckpointBackend() *Checkpoint {
-	return &Checkpoint{}
-}
-
-func (c *Checkpoint) CheckpointCreate(container string, config types.CheckpointCreateOptions) error {
-	return fmt.Errorf("%s does not yet implement checkpointing", ProductName())
-}
-
-func (c *Checkpoint) CheckpointDelete(container string, config types.CheckpointDeleteOptions) error {
-	return fmt.Errorf("%s does not yet implement checkpointing", ProductName())
-}
-
-func (c *Checkpoint) CheckpointList(container string, config types.CheckpointListOptions) ([]types.Checkpoint, error) {
-	return nil, fmt.Errorf("%s does not yet implement checkpointing", ProductName())
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit.go
deleted file mode 100644
index 10b666df19..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit.go
+++ /dev/null
@@ -1,477 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"archive/tar"
-	"compress/gzip"
-	"context"
-	"crypto/sha256"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"runtime"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	containertypes "github.com/docker/docker/api/types/container"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/builder/dockerfile"
-	dockerimage "github.com/docker/docker/image"
-	dockerLayer "github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/imagec"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-// Commit creates a new filesystem image from the current state of a container.
-// The image can optionally be tagged into a repository.
-func (i *Image) Commit(name string, config *backend.ContainerCommitConfig) (imageID string, err error) {
-	defer trace.End(trace.Begin(name))
-	op := trace.NewOperation(context.Background(), "Commit")
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return "", NotFoundError(name)
-	}
-
-	// get container info
-	c, err := containerEngine.ContainerInspect(name, false, "")
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-	container, ok := c.(*types.ContainerJSON)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Container type assertion failed"))
-	}
-	if container.State.Running || container.State.Restarting {
-		return "", ConflictError(fmt.Sprintf("%s does not yet support commit of a running container", ProductName()))
-	}
-	// TODO: pause container after container.Pause is implemented
-	newConfig, err := dockerfile.BuildFromConfig(config.Config, config.Changes)
-	if err != nil {
-		return "", err
-	}
-
-	if config.MergeConfigs {
-		if err := merge(newConfig, container.Config); err != nil {
-			return "", err
-		}
-	}
-	ic, err := getImagec(config)
-	if err != nil {
-		return "", err
-	}
-
-	rc, err := containerEngine.containerProxy.GetContainerChanges(op, vc, true)
-	if err != nil {
-		return "", fmt.Errorf("Unable to initialize export stream reader for container %s", name)
-	}
-
-	layer, err := downloadDiff(rc, container.ID, ic.Options)
-	if err != nil {
-		rc.Close()
-		return "", fmt.Errorf("Unable to export stream reader for container %s: %s", name, err)
-	}
-	// close reader before write image to avoid resource conflict
-	rc.Close()
-	if err = setLayerConfig(layer, container, config, newConfig); err != nil {
-		return "", err
-	}
-	// Dump metadata next to diff file
-	destination := path.Join(imagec.DestinationDirectory(ic.Options), layer.ID)
-	err = ioutil.WriteFile(path.Join(destination, layer.ID+".json"), []byte(layer.Meta), 0644)
-	if err != nil {
-		return "", err
-	}
-	imagec.LayerCache().Add(layer)
-
-	var layers []*imagec.ImageWithMeta
-
-	layers = append(layers, layer)
-	lm := layer
-	for pl := lm.Parent; pl != imagec.ScratchLayerID; pl = lm.Parent {
-		// populate manifest layer with existing cached data
-		if lm, err = imagec.LayerCache().Get(pl); err != nil {
-			return "", InternalServerError(fmt.Sprintf("Failed to get parent image layer %s: %s", pl, err))
-		}
-		layers = append(layers, lm)
-	}
-
-	ic.ImageLayers = layers
-	imageConfig, err := ic.CreateImageConfig(layers)
-	if err != nil {
-		return "", err
-	}
-	imageConfig.Name = config.Repo
-	// place calculated ImageID in struct
-	ic.ImageID = imageConfig.ImageID
-
-	// cache and persist the image
-	if err = cache.ImageCache().Add(&imageConfig); err != nil {
-		return "", fmt.Errorf("error adding image %s to image cache: %s", ic.ImageID, err)
-	}
-	if err = cache.ImageCache().Save(); err != nil {
-		return "", fmt.Errorf("error saving image cache: %s", err)
-	}
-	// if repo:tag is specified, update image to repo cache, otherwise, this image will be updated to repo cache while it's tagged
-	if ic.Reference != nil {
-		imagec.UpdateRepoCache(ic)
-	}
-
-	ic.Storename = layer.Image.Store
-	// Write blob to the storage layer
-	if err = ic.WriteImageBlob(layer, progress.DiscardOutput(), true); err != nil {
-		return "", err
-	}
-
-	imagec.LayerCache().Commit(layer)
-
-	refName := ""
-	if ic.Reference != nil {
-		refName = ic.Reference.String()
-	}
-	actor := CreateImageEventActorWithAttributes(imageConfig.ImageID, refName, map[string]string{})
-	EventService().Log("commit", eventtypes.ImageEventType, actor)
-	return imageConfig.ImageID, nil
-}
-
-func getImagec(config *backend.ContainerCommitConfig) (*imagec.ImageC, error) {
-	var imageRef reference.Named
-	var err error
-
-	if config.Repo != "" {
-		imageRef, err = reference.WithName(config.Repo)
-		if err != nil {
-			return nil, err
-		}
-		if config.Tag != "" {
-			if imageRef, err = reference.WithTag(imageRef, config.Tag); err != nil {
-				return nil, err
-			}
-		}
-	}
-	options := imagec.Options{
-		Destination: os.TempDir(),
-		Reference:   imageRef,
-		Tag:         config.Tag,
-	}
-	portLayerServer := PortLayerServer()
-
-	if portLayerServer != "" {
-		options.Host = portLayerServer
-	}
-
-	ic := imagec.NewImageC(options, streamformatter.NewJSONStreamFormatter())
-	if imageRef != nil {
-		ic.ParseReference()
-	}
-
-	return ic, nil
-}
-
-func setLayerConfig(lm *imagec.ImageWithMeta, container *types.ContainerJSON, config *backend.ContainerCommitConfig, newConfig *containertypes.Config) error {
-	defer trace.End(trace.Begin(lm.ID))
-
-	// Host is either the host's UUID (if run on vsphere) or the hostname of
-	// the system (if run standalone)
-	host, err := sys.UUID()
-	if err != nil {
-		return InternalServerError(fmt.Sprintf("Failed to get host name: %s", err))
-	}
-
-	if host != "" {
-		log.Infof("Using UUID (%s) for imagestore name", host)
-	}
-
-	vc := cache.ContainerCache().GetContainer(container.ID)
-	meta := dockerimage.V1Image{
-		ID:              lm.ID,
-		Parent:          vc.LayerID,
-		Author:          config.Author,
-		Comment:         config.Comment,
-		Created:         time.Now().UTC(),
-		Container:       container.ID,
-		ContainerConfig: *container.Config,
-		Architecture:    runtime.GOARCH,
-		OS:              runtime.GOOS,
-		DockerVersion:   version.DockerServerVersion,
-		Config:          newConfig,
-		Size:            lm.Size,
-	}
-
-	m, err := json.Marshal(meta)
-	if err != nil {
-		return InternalServerError(fmt.Sprintf("Failed to marshal image layer config: %s", err))
-	}
-	// layer metadata
-	lm.Meta = string(m)
-	lm.Image.Parent = vc.LayerID
-	lm.Image.Store = host
-	return nil
-}
-
-func downloadDiff(rc io.ReadCloser, containerID string, options imagec.Options) (*imagec.ImageWithMeta, error) {
-	defer trace.End(trace.Begin(containerID))
-
-	// generate random string as layer ID
-	layerID := stringid.GenerateRandomID()
-
-	tmpLayerFileName, diffIDSum, gzSum, err := compressDiffToTmpFile(rc, containerID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Cleanup function for the error case
-	defer func() {
-		if err != nil {
-			os.Remove(tmpLayerFileName)
-		}
-	}()
-
-	blobSum := digest.NewDigestFromBytes(digest.SHA256, gzSum)
-	log.Debugf("container %s blob sum: %s", containerID, blobSum.String())
-
-	layerFile, err := os.Open(string(tmpLayerFileName))
-	if err != nil {
-		return nil, err
-	}
-	defer layerFile.Close()
-
-	decompressed, err := gzip.NewReader(layerFile)
-	if err != nil {
-		return nil, err
-	}
-	defer decompressed.Close()
-
-	// get a tar reader
-	tr := tar.NewReader(decompressed)
-
-	// iterate through tar headers to get file sizes
-	var size int64
-	for {
-		tarHeader, terr := tr.Next()
-		if terr == io.EOF {
-			break
-		}
-		if terr != nil {
-			err = terr
-			return nil, err
-		}
-		size += tarHeader.Size
-	}
-
-	diffID := digest.NewDigestFromBytes(digest.SHA256, diffIDSum)
-	if size == 0 {
-		diffID = digest.Digest(dockerLayer.DigestSHA256EmptyTar)
-	}
-	log.Debugf("container %s diff id: %s, size: %d", containerID, diffID.String(), size)
-
-	// Ensure the parent directory exists
-	destination := path.Join(imagec.DestinationDirectory(options), layerID)
-	err = os.MkdirAll(destination, 0755) /* #nosec */
-	if err != nil {
-		return nil, err
-	}
-
-	// Move(rename) the temporary file to its final destination
-	err = os.Rename(string(tmpLayerFileName), path.Join(destination, layerID+".tar"))
-	if err != nil {
-		return nil, err
-	}
-
-	// layer metadata
-	lm := &imagec.ImageWithMeta{
-		Image: &models.Image{
-			ID: layerID,
-		},
-		DiffID: diffID.String(),
-		Layer: imagec.FSLayer{
-			BlobSum: blobSum.String(),
-		},
-		Size: size,
-	}
-	return lm, nil
-}
-
-// compressDiffToTmpFile will write stream to temp file, and return temp file name and tar file checksum, compressed file checksum
-func compressDiffToTmpFile(rc io.ReadCloser, containerID string) (string, []byte, []byte, error) {
-	defer trace.End(trace.Begin(containerID))
-	// Create a temporary file and stream the res.Body into it
-	var out *os.File
-	var gzWriter *gzip.Writer
-	var err error
-
-	cleanup := func() {
-		if gzWriter != nil {
-			gzWriter.Close()
-			gzWriter = nil
-		}
-		if out != nil {
-			out.Close()
-			if err != nil {
-				os.Remove(out.Name())
-			}
-			out = nil
-		}
-	}
-	defer cleanup()
-
-	out, err = ioutil.TempFile("", containerID)
-	if err != nil {
-		return "", nil, nil, err
-	}
-
-	// compress tar file using gzip and calculate blobsum and diffID all together using multi writer
-	gzSum := sha256.New()
-	tarSum := sha256.New()
-	compressedMW := io.MultiWriter(out, gzSum)
-
-	gzWriter = gzip.NewWriter(compressedMW)
-	tarMW := io.MultiWriter(gzWriter, tarSum)
-	_, err = io.Copy(tarMW, rc)
-	if err != nil {
-		log.Errorf("failed to stream to file: %s", err)
-		return "", nil, nil, err
-	}
-
-	// close writer before calculate checksum
-	fileName := out.Name()
-	err = gzWriter.Flush()
-	if err != nil {
-		log.Errorf("failed to flush writer: %s", err)
-	}
-	cleanup()
-	// Return the temporary file name and checksum
-	return fileName, tarSum.Sum(nil), gzSum.Sum(nil), nil
-}
-
-// ***** Code from Docker v17.03.2-ce PullImage to merge two Configs
-
-// merge merges two Config, the image container configuration (defaults values),
-// and the user container configuration, either passed by the API or generated
-// by the cli.
-// It will mutate the specified user configuration (userConf) with the image
-// configuration where the user configuration is incomplete.
-func merge(userConf, imageConf *containertypes.Config) error {
-	if userConf.User == "" {
-		userConf.User = imageConf.User
-	}
-	if len(userConf.ExposedPorts) == 0 {
-		userConf.ExposedPorts = imageConf.ExposedPorts
-	} else if imageConf.ExposedPorts != nil {
-		for port := range imageConf.ExposedPorts {
-			if _, exists := userConf.ExposedPorts[port]; !exists {
-				userConf.ExposedPorts[port] = struct{}{}
-			}
-		}
-	}
-
-	if len(userConf.Env) == 0 {
-		userConf.Env = imageConf.Env
-	} else {
-		for _, imageEnv := range imageConf.Env {
-			found := false
-			imageEnvKey := strings.Split(imageEnv, "=")[0]
-			for _, userEnv := range userConf.Env {
-				userEnvKey := strings.Split(userEnv, "=")[0]
-				if runtime.GOOS == "windows" {
-					// Case insensitive environment variables on Windows
-					imageEnvKey = strings.ToUpper(imageEnvKey)
-					userEnvKey = strings.ToUpper(userEnvKey)
-				}
-				if imageEnvKey == userEnvKey {
-					found = true
-					break
-				}
-			}
-			if !found {
-				userConf.Env = append(userConf.Env, imageEnv)
-			}
-		}
-	}
-
-	if userConf.Labels == nil {
-		userConf.Labels = map[string]string{}
-	}
-	for l, v := range imageConf.Labels {
-		if _, ok := userConf.Labels[l]; !ok {
-			userConf.Labels[l] = v
-		}
-	}
-
-	if len(userConf.Entrypoint) == 0 {
-		if len(userConf.Cmd) == 0 {
-			userConf.Cmd = imageConf.Cmd
-			userConf.ArgsEscaped = imageConf.ArgsEscaped
-		}
-
-		if userConf.Entrypoint == nil {
-			userConf.Entrypoint = imageConf.Entrypoint
-		}
-	}
-	if imageConf.Healthcheck != nil {
-		if userConf.Healthcheck == nil {
-			userConf.Healthcheck = imageConf.Healthcheck
-		} else {
-			if len(userConf.Healthcheck.Test) == 0 {
-				userConf.Healthcheck.Test = imageConf.Healthcheck.Test
-			}
-			if userConf.Healthcheck.Interval == 0 {
-				userConf.Healthcheck.Interval = imageConf.Healthcheck.Interval
-			}
-			if userConf.Healthcheck.Timeout == 0 {
-				userConf.Healthcheck.Timeout = imageConf.Healthcheck.Timeout
-			}
-			if userConf.Healthcheck.Retries == 0 {
-				userConf.Healthcheck.Retries = imageConf.Healthcheck.Retries
-			}
-		}
-	}
-
-	if userConf.WorkingDir == "" {
-		userConf.WorkingDir = imageConf.WorkingDir
-	}
-	if len(userConf.Volumes) == 0 {
-		userConf.Volumes = imageConf.Volumes
-	} else {
-		for k, v := range imageConf.Volumes {
-			userConf.Volumes[k] = v
-		}
-	}
-
-	if userConf.StopSignal == "" {
-		userConf.StopSignal = imageConf.StopSignal
-	}
-	return nil
-}
-
-// *****
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit_test.go
deleted file mode 100644
index 852ced6395..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/commit_test.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"archive/tar"
-	"bytes"
-	"compress/gzip"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/imagec"
-)
-
-func getMockReader(t *testing.T) (io.ReadCloser, error) {
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new tar archive.
-	tw := tar.NewWriter(buf)
-
-	// Add some files to the archive.
-	var files = []struct {
-		Name, Body string
-	}{
-		{"readme.txt", "This archive contains some text files."},
-		{"gopher.txt", "Gopher names:\nGeorge\nGeoffrey\nGonzo"},
-		{"todo.txt", "Get animal handling license."},
-	}
-	for _, file := range files {
-		hdr := &tar.Header{
-			Name: file.Name,
-			Mode: 0600,
-			Size: int64(len(file.Body)),
-		}
-		if err := tw.WriteHeader(hdr); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := tw.Write([]byte(file.Body)); err != nil {
-			t.Fatal(err)
-		}
-	}
-	// Make sure to check the error on Close.
-	if err := tw.Close(); err != nil {
-		log.Fatalln(err)
-	}
-
-	// Open the tar archive for reading.
-	r := bytes.NewReader(buf.Bytes())
-	return ioutil.NopCloser(r), nil
-}
-
-func TestDownload(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	tests := []struct {
-		repo string
-		tag  string
-	}{
-		{repo: "registry-1.docker.io", tag: ""},
-		{repo: "registry-1.docker.io", tag: "mycommit"},
-		{repo: "myrepo.io", tag: ""},
-		{repo: "myrepo.io", tag: "mycommit"},
-		{repo: "", tag: ""},
-	}
-	for _, test := range tests {
-		config := &backend.ContainerCommitConfig{}
-		config.Tag = test.tag
-		config.Repo = test.repo
-		ic, err := getImagec(config)
-		if err != nil {
-			t.Errorf("Failed to get imagec: %s", err)
-			return
-		}
-		rc, err := getMockReader(t)
-		if err != nil {
-			t.Errorf("Failed to get mocked reader: %s", err)
-		}
-
-		layer, err := downloadDiff(rc, "abcd", ic.Options)
-		if err != nil {
-			t.Errorf("Failed to download layer: %s", err)
-			return
-		}
-		t.Logf("layer id: %#v", layer)
-		destDir := path.Join(imagec.DestinationDirectory(ic.Options), layer.ID)
-		destination := path.Join(destDir, layer.ID+".tar")
-		if _, err := os.Stat(destination); err != nil {
-			t.Errorf("diff file %s is not created", destination)
-		}
-		assert.Equal(t, int64(101), layer.Size, "layer size is wrong")
-
-		layerFile, err := os.Open(string(destination))
-		if err != nil {
-			t.Errorf("Layer file %s is not created: %s", destination, err)
-		}
-		defer layerFile.Close()
-
-		decompressed, err := gzip.NewReader(layerFile)
-		if err != nil {
-			t.Errorf("Failed to create gzip reader: %s", err)
-		}
-		defer decompressed.Close()
-
-		// get a tar reader
-		tr := tar.NewReader(decompressed)
-
-		// iterate through tar headers to get file sizes
-		var layerSize int64
-		for {
-			tarHeader, terr := tr.Next()
-			if terr == io.EOF {
-				break
-			}
-			if terr != nil {
-				t.Errorf("Failed to read layer file: %s", terr)
-			}
-			t.Logf("Read file: %s", tarHeader.Name)
-			layerSize += tarHeader.Size
-		}
-		assert.Equal(t, int64(101), layerSize, "tar file size is wrong")
-		os.RemoveAll(destDir)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container.go
deleted file mode 100644
index b8c97baf0d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container.go
+++ /dev/null
@@ -1,2232 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"math/rand"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	log "github.com/Sirupsen/logrus"
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	containertypes "github.com/docker/docker/api/types/container"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	dnetwork "github.com/docker/docker/api/types/network"
-	timetypes "github.com/docker/docker/api/types/time"
-	docker "github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/namesgenerator"
-	"github.com/docker/docker/pkg/stdcopy"
-	"github.com/docker/docker/reference"
-	"github.com/docker/docker/utils"
-	gonat "github.com/docker/go-connections/nat"
-	"github.com/docker/go-units"
-	"github.com/docker/libnetwork/iptables"
-	"github.com/docker/libnetwork/portallocator"
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	viccontainer "github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/convert"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/filter"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/portmap"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/scopes"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/tasks"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-// valid filters as of docker commit 49bf474
-var acceptedPsFilterTags = map[string]bool{
-	"ancestor":  true,
-	"before":    true,
-	"exited":    true,
-	"id":        true,
-	"isolation": true,
-	"label":     true,
-	"name":      true,
-	"status":    true,
-	"health":    true,
-	"since":     true,
-	"volume":    true,
-	"network":   true,
-	"is-task":   true,
-}
-
-// currently not supported by vic
-var unSupportedPsFilters = map[string]bool{
-	"ancestor":  false,
-	"health":    false,
-	"isolation": false,
-	"is-task":   false,
-}
-
-const (
-	bridgeIfaceName = "bridge"
-
-	// MemoryAlignMB is the value to which container VM memory must align in order for hotadd to work
-	MemoryAlignMB = 128
-	// MemoryMinMB - the minimum allowable container memory size
-	MemoryMinMB = 512
-	// MemoryDefaultMB - the default container VM memory size
-	MemoryDefaultMB = 2048
-	// MinCPUs - the minimum number of allowable CPUs the container can use
-	MinCPUs = 1
-	// DefaultCPUs - the default number of container VM CPUs
-	DefaultCPUs = 2
-	// Default timeout to stop a container if not specified in container config
-	DefaultStopTimeout = 10
-
-	// maximum elapsed time for retry
-	maxElapsedTime = 2 * time.Minute
-)
-
-var (
-	publicIfaceName = "public"
-
-	defaultScope struct {
-		sync.Mutex
-		scope string
-	}
-
-	portMapper portmap.PortMapper
-
-	// bridge-to-bridge rules, indexed by mapped port;
-	// this map is used to delete the rule once
-	// the container stops or is removed
-	btbRules map[string][]string
-
-	cbpLock         sync.Mutex
-	containerByPort map[string]string // port:containerID
-
-	ctx = context.TODO()
-)
-
-func init() {
-	portMapper = portmap.NewPortMapper()
-	btbRules = make(map[string][]string)
-	containerByPort = make(map[string]string)
-
-	l, err := netlink.LinkByName(publicIfaceName)
-	if l == nil {
-		l, err = netlink.LinkByAlias(publicIfaceName)
-		if err != nil {
-			log.Errorf("interface %s not found", publicIfaceName)
-			return
-		}
-	}
-
-	// don't use interface alias for iptables rules
-	publicIfaceName = l.Attrs().Name
-
-	// seed the random number generator
-	rand.Seed(time.Now().UTC().UnixNano())
-}
-
-// type and funcs to provide sorting by created date
-type containerByCreated []*types.Container
-
-func (r containerByCreated) Len() int           { return len(r) }
-func (r containerByCreated) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
-func (r containerByCreated) Less(i, j int) bool { return r[i].Created < r[j].Created }
-
-var containerEngine *Container
-var once sync.Once
-
-// Container struct represents the Container
-type Container struct {
-	containerProxy VicContainerProxy
-}
-
-// NewContainerBackend will create a new containerEngine or return the existing
-func NewContainerBackend() *Container {
-	once.Do(func() {
-		containerEngine = &Container{
-			containerProxy: NewContainerProxy(PortLayerClient(), PortLayerServer(), PortLayerName()),
-		}
-	})
-	return containerEngine
-}
-
-const (
-	defaultEnvPath = "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
-)
-
-func (c *Container) Handle(id, name string) (string, error) {
-	resp, err := c.containerProxy.Client().Containers.Get(containers.NewGetParamsWithContext(ctx).WithID(id))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetNotFound:
-			cache.ContainerCache().DeleteContainer(id)
-			return "", NotFoundError(name)
-		case *containers.GetDefault:
-			return "", InternalServerError(err.Payload.Message)
-		default:
-			return "", InternalServerError(err.Error())
-		}
-	}
-	return resp.Payload, nil
-}
-
-// docker's container.execBackend
-
-func (c *Container) TaskInspect(cid, cname, eid string) (*models.TaskInspectResponse, error) {
-	// obtain a portlayer client
-	client := c.containerProxy.Client()
-
-	handle, err := c.Handle(cid, cname)
-	if err != nil {
-		return nil, err
-	}
-
-	// inspect the Task to obtain ProcessConfig
-	config := &models.TaskInspectConfig{
-		Handle: handle,
-		ID:     eid,
-	}
-
-	params := tasks.NewInspectParamsWithContext(ctx).WithConfig(config)
-	resp, err := client.Tasks.Inspect(params)
-	if err != nil {
-		return nil, err
-	}
-	return resp.Payload, nil
-
-}
-
-func (c *Container) TaskWaitToStart(cid, cname, eid string) error {
-	// obtain a portlayer client
-	client := c.containerProxy.Client()
-
-	handle, err := c.Handle(cid, cname)
-	if err != nil {
-		return err
-	}
-
-	// wait the Task to start
-	config := &models.TaskWaitConfig{
-		Handle: handle,
-		ID:     eid,
-	}
-
-	params := tasks.NewWaitParamsWithContext(ctx).WithConfig(config)
-	_, err = client.Tasks.Wait(params)
-	if err != nil {
-		switch err := err.(type) {
-		case *tasks.WaitInternalServerError:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	return nil
-}
-
-// ContainerExecCreate sets up an exec in a running container.
-func (c *Container) ContainerExecCreate(name string, config *types.ExecConfig) (string, error) {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return "", NotFoundError(name)
-	}
-	id := vc.ContainerID
-
-	// Is it running?
-	state, err := c.containerProxy.State(vc)
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-	if state.Restarting {
-		return "", ConflictError(fmt.Sprintf("Container %s is restarting, wait until the container is running", id))
-	}
-	if !state.Running {
-		return "", ConflictError(fmt.Sprintf("Container %s is not running", id))
-	}
-
-	handle, err := c.Handle(id, name)
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-
-	// set up the environment
-	config.Env = setEnvFromImageConfig(config.Tty, config.Env, vc.Config.Env)
-
-	handleprime, eid, err := c.containerProxy.CreateExecTask(handle, config)
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-
-	err = c.containerProxy.CommitContainerHandle(handleprime, id, 0)
-	if err != nil {
-		return "", err
-	}
-
-	// associate newly created exec task with container
-	cache.ContainerCache().AddExecToContainer(vc, eid)
-
-	ec, err := c.TaskInspect(id, name, eid)
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-
-	// exec_create event
-	event := "exec_create: " + ec.ProcessConfig.ExecPath + " " + strings.Join(ec.ProcessConfig.ExecArgs[1:], " ")
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-	EventService().Log(event, eventtypes.ContainerEventType, actor)
-
-	return eid, nil
-}
-
-// ContainerExecInspect returns low-level information about the exec
-// command. An error is returned if the exec cannot be found.
-func (c *Container) ContainerExecInspect(eid string) (*backend.ExecInspect, error) {
-	defer trace.End(trace.Begin(eid))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainerFromExec(eid)
-	if vc == nil {
-		return nil, NotFoundError(eid)
-	}
-	id := vc.ContainerID
-	name := vc.Name
-
-	ec, err := c.TaskInspect(id, name, eid)
-	if err != nil {
-		return nil, InternalServerError(err.Error())
-	}
-
-	exit := int(ec.ExitCode)
-	return &backend.ExecInspect{
-		ID:       ec.ID,
-		Running:  ec.Running,
-		ExitCode: &exit,
-		ProcessConfig: &backend.ExecProcessConfig{
-			Tty:        ec.Tty,
-			Entrypoint: ec.ProcessConfig.ExecPath,
-			Arguments:  ec.ProcessConfig.ExecArgs,
-			User:       ec.User,
-		},
-		OpenStdin:   ec.OpenStdin,
-		OpenStdout:  ec.OpenStdout,
-		OpenStderr:  ec.OpenStderr,
-		ContainerID: vc.ContainerID,
-		Pid:         int(ec.Pid),
-	}, nil
-}
-
-// ContainerExecResize changes the size of the TTY of the process
-// running in the exec with the given name to the given height and
-// width.
-func (c *Container) ContainerExecResize(eid string, height, width int) error {
-	defer trace.End(trace.Begin(eid))
-
-	// Look up the container eid in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainerFromExec(eid)
-	if vc == nil {
-		return NotFoundError(eid)
-	}
-
-	// Call the port layer to resize
-	plHeight := int32(height)
-	plWidth := int32(width)
-
-	var err error
-	if err = c.containerProxy.Resize(eid, plHeight, plWidth); err == nil {
-		actor := CreateContainerEventActorWithAttributes(vc, map[string]string{
-			"height": fmt.Sprintf("%d", height),
-			"width":  fmt.Sprintf("%d", width),
-		})
-
-		EventService().Log(containerResizeEvent, eventtypes.ContainerEventType, actor)
-	}
-
-	return err
-}
-
-// ContainerExecStart starts a previously set up exec instance. The
-// std streams are set up.
-func (c *Container) ContainerExecStart(ctx context.Context, eid string, stdin io.ReadCloser, stdout io.Writer, stderr io.Writer) error {
-	defer trace.End(trace.Begin(eid))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainerFromExec(eid)
-	if vc == nil {
-		return NotFoundError(eid)
-	}
-	id := vc.ContainerID
-	name := vc.Name
-
-	// grab the task details
-	ec, err := c.TaskInspect(id, name, eid)
-	if err != nil {
-		return InternalServerError(err.Error())
-	}
-
-	handle, err := c.Handle(id, name)
-	if err != nil {
-		return InternalServerError(err.Error())
-	}
-
-	bindconfig := &models.TaskBindConfig{
-		Handle: handle,
-		ID:     eid,
-	}
-
-	// obtain a portlayer client
-	client := c.containerProxy.Client()
-
-	// call Bind with bindparams
-	bindparams := tasks.NewBindParamsWithContext(ctx).WithConfig(bindconfig)
-	resp, err := client.Tasks.Bind(bindparams)
-	if err != nil {
-		return InternalServerError(err.Error())
-	}
-	handle = resp.Payload.Handle.(string)
-
-	operation := func() error {
-		// exec doesn't have separate attach path so we will decide whether we need interaction/runblocking or not
-		attach := ec.OpenStdin || ec.OpenStdout || ec.OpenStderr
-		if attach {
-			handle, err = c.containerProxy.BindInteraction(handle, name, eid)
-			if err != nil {
-				return err
-			}
-		}
-
-		if err := c.containerProxy.CommitContainerHandle(handle, name, 0); err != nil {
-			return err
-		}
-
-		// we need to be able to cancel it
-		ctx, cancel := context.WithCancel(ctx)
-		defer cancel()
-
-		go func() {
-			defer trace.End(trace.Begin(eid))
-			// wait property collector
-			if err := c.TaskWaitToStart(id, name, eid); err != nil {
-				log.Errorf("Task wait returned %s, canceling the context", err)
-
-				// we can't return a proper error as we close the streams as soon as AttachStreams returns so we mimic Docker and write to stdout directly
-				// https://github.com/docker/docker/blob/a039ca9affe5fa40c4e029d7aae399b26d433fe9/api/server/router/container/exec.go#L114
-				if stdout != nil {
-					stdout.Write([]byte(err.Error() + "\r\n"))
-				}
-				cancel()
-			}
-		}()
-
-		// exec_start event
-		event := "exec_start: " + ec.ProcessConfig.ExecPath + " " + strings.Join(ec.ProcessConfig.ExecArgs[1:], " ")
-
-		actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-		EventService().Log(event, eventtypes.ContainerEventType, actor)
-
-		// no need to attach for detached case
-		if !attach {
-			log.Debugf("Detached mode. Returning early.")
-			return nil
-		}
-		EventService().Log(containerAttachEvent, eventtypes.ContainerEventType, actor)
-
-		ca := &backend.ContainerAttachConfig{
-			UseStdin:  ec.OpenStdin,
-			UseStdout: ec.OpenStdout,
-			UseStderr: ec.OpenStderr,
-		}
-
-		// set UseStderr to false for Tty case as we merge stdout and stderr
-		if ec.Tty {
-			ca.UseStderr = false
-		}
-
-		ac := &AttachConfig{
-			ID: eid,
-			ContainerAttachConfig: ca,
-			UseTty:                ec.Tty,
-			CloseStdin:            true,
-		}
-
-		err = c.containerProxy.AttachStreams(ctx, ac, stdin, stdout, stderr)
-		if err != nil {
-			if _, ok := err.(DetachError); ok {
-				log.Infof("Detach detected, tearing down connection")
-
-				// QUESTION: why are we returning DetachError? It doesn't seem like an error
-				// fire detach event
-				EventService().Log(containerDetachEvent, eventtypes.ContainerEventType, actor)
-
-				// DON'T UNBIND FOR NOW, UNTIL/UNLESS REFERENCE COUNTING IS IN PLACE
-				// This avoids cutting the communication channel for other sessions connected to this
-				// container
-
-				// FIXME: call UnbindInteraction/Commit
-			}
-
-			return err
-		}
-		return nil
-	}
-	if err := retry.Do(operation, IsConflictError); err != nil {
-		return err
-	}
-	return nil
-}
-
-// ExecExists looks up the exec instance and returns a bool if it exists or not.
-// It will also return the error produced by `getConfig`
-func (c *Container) ExecExists(eid string) (bool, error) {
-	defer trace.End(trace.Begin(eid))
-
-	vc := cache.ContainerCache().GetContainerFromExec(eid)
-	if vc == nil {
-		return false, NotFoundError(eid)
-	}
-	return true, nil
-}
-
-// docker's container.stateBackend
-
-// ContainerCreate creates a container.
-func (c *Container) ContainerCreate(config types.ContainerCreateConfig) (containertypes.ContainerCreateCreatedBody, error) {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-
-	// get the image from the cache
-	image, err := cache.ImageCache().Get(config.Config.Image)
-	if err != nil {
-		// if no image found then error thrown and a pull
-		// will be initiated by the docker client
-		log.Errorf("ContainerCreate: image %s error: %s", config.Config.Image, err.Error())
-		return containertypes.ContainerCreateCreatedBody{}, derr.NewRequestNotFoundError(err)
-	}
-
-	setCreateConfigOptions(config.Config, image.Config)
-
-	log.Debugf("config.Config = %+v", config.Config)
-	if err = validateCreateConfig(&config); err != nil {
-		return containertypes.ContainerCreateCreatedBody{}, err
-	}
-
-	// Create a container representation in the personality server.  This representation
-	// will be stored in the cache if create succeeds in the port layer.
-	container, err := createInternalVicContainer(image, &config)
-	if err != nil {
-		return containertypes.ContainerCreateCreatedBody{}, err
-	}
-
-	// Reserve the container name to prevent duplicates during a parallel operation.
-	if err := cache.ContainerCache().ReserveName(container, config.Name); err != nil {
-		return containertypes.ContainerCreateCreatedBody{}, derr.NewRequestConflictError(err)
-	}
-
-	// Create an actualized container in the VIC port layer
-	id, err := c.containerCreate(container, config)
-	if err != nil {
-		cache.ContainerCache().ReleaseName(config.Name)
-		return containertypes.ContainerCreateCreatedBody{}, err
-	}
-
-	// Container created ok, save the container id and save the config override from the API
-	// caller and save this container internal representation in our personality server's cache
-	copyConfigOverrides(container, config)
-	container.ContainerID = id
-	cache.ContainerCache().AddContainer(container)
-
-	log.Debugf("Container create - name(%s), containerID(%s), config(%#v), host(%#v)",
-		container.Name, container.ContainerID, container.Config, container.HostConfig)
-
-	// Add create event
-	actor := CreateContainerEventActorWithAttributes(container, map[string]string{})
-	EventService().Log(containerCreateEvent, eventtypes.ContainerEventType, actor)
-
-	return containertypes.ContainerCreateCreatedBody{ID: id}, nil
-}
-
-// createContainer() makes calls to the container proxy to actually create the backing
-// VIC container.  All remoting code is in the proxy.
-//
-// returns:
-//	(container id, error)
-func (c *Container) containerCreate(vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin("Container.containerCreate"))
-
-	if vc == nil {
-		return "", InternalServerError("Failed to create container")
-	}
-
-	id, h, err := c.containerProxy.CreateContainerHandle(vc, config)
-	if err != nil {
-		return "", err
-	}
-
-	h, err = c.containerProxy.CreateContainerTask(h, id, config)
-	if err != nil {
-		return "", err
-	}
-
-	h, err = c.containerProxy.AddContainerToScope(h, config)
-	if err != nil {
-		return id, err
-	}
-
-	h, err = c.containerProxy.AddInteractionToContainer(h, config)
-	if err != nil {
-		return id, err
-	}
-
-	h, err = c.containerProxy.AddLoggingToContainer(h, config)
-	if err != nil {
-		return id, err
-	}
-
-	h, err = c.containerProxy.AddVolumesToContainer(h, config)
-	if err != nil {
-		return id, err
-	}
-
-	err = c.containerProxy.CommitContainerHandle(h, id, -1)
-	if err != nil {
-		return id, err
-	}
-
-	return id, nil
-}
-
-// ContainerKill sends signal to the container
-// If no signal is given (sig 0), then Kill with SIGKILL and wait
-// for the container to exit.
-// If a signal is given, then just send it to the container and return.
-func (c *Container) ContainerKill(name string, sig uint64) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("%s, %d", name, sig)))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	err := c.containerProxy.Signal(vc, sig)
-	if err == nil {
-		actor := CreateContainerEventActorWithAttributes(vc, map[string]string{"signal": fmt.Sprintf("%d", sig)})
-
-		EventService().Log(containerKillEvent, eventtypes.ContainerEventType, actor)
-
-	}
-
-	return err
-}
-
-// ContainerPause pauses a container
-func (c *Container) ContainerPause(name string) error {
-	return fmt.Errorf("%s does not yet implement ContainerPause", ProductName())
-}
-
-// ContainerResize changes the size of the TTY of the process running
-// in the container with the given name to the given height and width.
-func (c *Container) ContainerResize(name string, height, width int) error {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	// Call the port layer to resize
-	plHeight := int32(height)
-	plWidth := int32(width)
-
-	var err error
-	if err = c.containerProxy.Resize(vc.ContainerID, plHeight, plWidth); err == nil {
-		actor := CreateContainerEventActorWithAttributes(vc, map[string]string{
-			"height": fmt.Sprintf("%d", height),
-			"width":  fmt.Sprintf("%d", width),
-		})
-
-		EventService().Log(containerResizeEvent, eventtypes.ContainerEventType, actor)
-	}
-
-	return err
-}
-
-// ContainerRestart stops and starts a container. It attempts to
-// gracefully stop the container within the given timeout, forcefully
-// stopping it if the timeout is exceeded. If given a negative
-// timeout, ContainerRestart will wait forever until a graceful
-// stop. Returns an error if the container cannot be found, or if
-// there is an underlying error at any stage of the restart.
-func (c *Container) ContainerRestart(name string, seconds *int) error {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache ot get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	operation := func() error {
-		return c.containerProxy.Stop(vc, name, seconds, false)
-	}
-	if err := retry.Do(operation, IsConflictError); err != nil {
-		return InternalServerError(fmt.Sprintf("Stop failed with: %s", err))
-	}
-
-	operation = func() error {
-		return c.containerStart(name, nil, true)
-	}
-	if err := retry.Do(operation, IsConflictError); err != nil {
-		return InternalServerError(fmt.Sprintf("Start failed with: %s", err))
-	}
-
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-	EventService().Log(containerRestartEvent, eventtypes.ContainerEventType, actor)
-
-	return nil
-}
-
-// ContainerRm removes the container id from the filesystem. An error
-// is returned if the container is not found, or if the remove
-// fails. If the remove succeeds, the container name is released, and
-// network links are removed.
-func (c *Container) ContainerRm(name string, config *types.ContainerRmConfig) error {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-	id := vc.ContainerID
-	// Get the portlayer Client API
-	client := c.containerProxy.Client()
-
-	// TODO: Pass this RemoveVolume flag to somewhere
-	_ = &config.RemoveVolume
-
-	// Use the force and stop the container first
-	secs := 0
-
-	if config.ForceRemove {
-		c.containerProxy.Stop(vc, name, &secs, true)
-	} else {
-		state, err := c.containerProxy.State(vc)
-		if err != nil {
-			if IsNotFoundError(err) {
-				// remove container from persona cache, but don't return error to the user
-				cache.ContainerCache().DeleteContainer(id)
-				return nil
-			}
-			return InternalServerError(err.Error())
-		}
-		// force stop if container state is error to make sure container is deletable later
-		if state.Status == ContainerError {
-			c.containerProxy.Stop(vc, name, &secs, true)
-		}
-		// if we are starting let the user know they must use the force
-		if state.Status == "Starting" {
-			return derr.NewRequestConflictError(fmt.Errorf("The container is starting.  To remove use -f"))
-		}
-
-		handle, err := c.Handle(id, name)
-		if err != nil {
-			return err
-		}
-
-		_, err = c.containerProxy.UnbindContainerFromNetwork(vc, handle)
-		if err != nil {
-			return err
-		}
-	}
-
-	//call the remove directly on the name. No need for using a handle.
-	_, err := client.Containers.ContainerRemove(containers.NewContainerRemoveParamsWithContext(ctx).WithID(id))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.ContainerRemoveNotFound:
-			// remove container from persona cache, but don't return error to the user
-			cache.ContainerCache().DeleteContainer(id)
-			return nil
-		case *containers.ContainerRemoveDefault:
-			return InternalServerError(err.Payload.Message)
-		case *containers.ContainerRemoveConflict:
-			return derr.NewRequestConflictError(fmt.Errorf("You cannot remove a running container. Stop the container before attempting removal or use -f"))
-		case *containers.ContainerRemoveInternalServerError:
-			if err.Payload == nil || err.Payload.Message == "" {
-				return InternalServerError(err.Error())
-			}
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	return nil
-}
-
-// cleanupPortBindings gets port bindings for the container and
-// unmaps ports if the cVM that previously bound them isn't powered on
-func (c *Container) cleanupPortBindings(vc *viccontainer.VicContainer) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
-	for ctrPort, hostPorts := range vc.HostConfig.PortBindings {
-		for _, hostPort := range hostPorts {
-			hPort := hostPort.HostPort
-
-			cbpLock.Lock()
-			mappedCtr, mapped := containerByPort[hPort]
-			cbpLock.Unlock()
-			if !mapped {
-				continue
-			}
-
-			log.Debugf("Container %q maps host port %s to container port %s", mappedCtr, hPort, ctrPort)
-			// check state of the previously bound container with PL
-			cc := cache.ContainerCache().GetContainer(mappedCtr)
-			if cc == nil {
-				// The container was removed from the cache and
-				// port bindings were cleaned up by another operation.
-				continue
-			}
-			state, err := c.containerProxy.State(cc)
-			if err != nil {
-				if IsNotFoundError(err) {
-					log.Debugf("container(%s) not found in portLayer, removing from persona cache", cc.ContainerID)
-					// we have a container in the persona cache, but it's been removed from the portLayer
-					// which is the source of truth -- so remove from the persona cache after this func
-					// completes
-					defer cache.ContainerCache().DeleteContainer(cc.ContainerID)
-				} else {
-					// we have issues of an unknown variety...return..
-					return InternalServerError(err.Error())
-				}
-			}
-
-			if state != nil && state.Running {
-				log.Debugf("Running container %q still holds port %s", mappedCtr, hPort)
-				continue
-			}
-
-			log.Debugf("Unmapping ports for powered off / removed container %q", mappedCtr)
-			err = UnmapPorts(cc.ContainerID, cc.HostConfig)
-			if err != nil {
-				return fmt.Errorf("Failed to unmap host port %s for container %q: %s",
-					hPort, mappedCtr, err)
-			}
-		}
-	}
-	return nil
-}
-
-// ContainerStart starts a container.
-func (c *Container) ContainerStart(name string, hostConfig *containertypes.HostConfig, checkpoint string, checkpointDir string) error {
-	defer trace.End(trace.Begin(name))
-
-	operation := func() error {
-		return c.containerStart(name, hostConfig, true)
-	}
-	if err := retry.Do(operation, IsConflictError); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (c *Container) containerStart(name string, hostConfig *containertypes.HostConfig, bind bool) error {
-	var err error
-
-	// Get an API client to the portlayer
-	client := c.containerProxy.Client()
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-	id := vc.ContainerID
-
-	// handle legacy hostConfig
-	if hostConfig != nil {
-		// hostConfig exist for backwards compatibility.  TODO: Figure out which parameters we
-		// need to look at in hostConfig
-	} else if vc != nil {
-		hostConfig = vc.HostConfig
-	}
-
-	if vc != nil && hostConfig.NetworkMode.NetworkName() == "" {
-		hostConfig.NetworkMode = vc.HostConfig.NetworkMode
-	}
-
-	// get a handle to the container
-	handle, err := c.Handle(id, name)
-	if err != nil {
-		return err
-	}
-
-	var endpoints []*models.EndpointConfig
-	// bind network
-	if bind {
-		var bindRes *scopes.BindContainerOK
-		bindRes, err = client.Scopes.BindContainer(scopes.NewBindContainerParamsWithContext(ctx).WithHandle(handle))
-		if err != nil {
-			switch err := err.(type) {
-			case *scopes.BindContainerNotFound:
-				cache.ContainerCache().DeleteContainer(id)
-				return NotFoundError(name)
-			case *scopes.BindContainerInternalServerError:
-				return InternalServerError(err.Payload.Message)
-			default:
-				return InternalServerError(err.Error())
-			}
-		}
-
-		handle = bindRes.Payload.Handle
-		endpoints = bindRes.Payload.Endpoints
-
-		// unbind in case we fail later
-		defer func() {
-			if err != nil {
-				client.Scopes.UnbindContainer(scopes.NewUnbindContainerParamsWithContext(ctx).WithHandle(handle))
-			}
-		}()
-
-		// unmap ports that vc needs if they're not being used by previously mapped container
-		err = c.cleanupPortBindings(vc)
-		if err != nil {
-			return err
-		}
-	}
-
-	// change the state of the container
-	// TODO: We need a resolved ID from the name
-	var stateChangeRes *containers.StateChangeOK
-	stateChangeRes, err = client.Containers.StateChange(containers.NewStateChangeParamsWithContext(ctx).WithHandle(handle).WithState("RUNNING"))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.StateChangeNotFound:
-			cache.ContainerCache().DeleteContainer(id)
-			return NotFoundError(name)
-		case *containers.StateChangeDefault:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	handle = stateChangeRes.Payload
-
-	// map ports
-	if bind {
-		scope, e := c.findPortBoundNetworkEndpoint(hostConfig, endpoints)
-		if scope != nil && scope.ScopeType == constants.BridgeScopeType {
-			if err = MapPorts(hostConfig, e, id); err != nil {
-				return InternalServerError(fmt.Sprintf("error mapping ports: %s", err))
-			}
-
-			defer func() {
-				if err != nil {
-					UnmapPorts(id, hostConfig)
-				}
-			}()
-		}
-	}
-
-	// commit the handle; this will reconfigure and start the vm
-	_, err = client.Containers.Commit(containers.NewCommitParamsWithContext(ctx).WithHandle(handle))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.CommitNotFound:
-			cache.ContainerCache().DeleteContainer(id)
-			return NotFoundError(name)
-		case *containers.CommitConflict:
-			return ConflictError(err.Payload.Message)
-		case *containers.CommitDefault:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-	EventService().Log(containerStartEvent, eventtypes.ContainerEventType, actor)
-
-	return nil
-}
-
-// requestHostPort finds a free port on the host
-func requestHostPort(proto string) (int, error) {
-	pa := portallocator.Get()
-	return pa.RequestPortInRange(nil, proto, 0, 0)
-}
-
-type portMapping struct {
-	intHostPort int
-	strHostPort string
-	portProto   gonat.Port
-}
-
-// unrollPortMap processes config for mapping/unmapping ports e.g. from hostconfig.PortBindings
-func unrollPortMap(portMap gonat.PortMap) ([]*portMapping, error) {
-	var portMaps []*portMapping
-	for i, pb := range portMap {
-
-		proto, port := gonat.SplitProtoPort(string(i))
-		nport, err := gonat.NewPort(proto, port)
-		if err != nil {
-			return nil, err
-		}
-
-		// iterate over all the ports in pb []nat.PortBinding
-		for i := range pb {
-			var hostPort int
-			var hPort string
-			if pb[i].HostPort == "" {
-				// use a random port since no host port is specified
-				hostPort, err = requestHostPort(proto)
-				if err != nil {
-					log.Errorf("could not find available port on host")
-					return nil, err
-				}
-				log.Infof("using port %d on the host for port mapping", hostPort)
-
-				// update the hostconfig
-				pb[i].HostPort = strconv.Itoa(hostPort)
-
-			} else {
-				hostPort, err = strconv.Atoi(pb[i].HostPort)
-				if err != nil {
-					return nil, err
-				}
-			}
-			hPort = strconv.Itoa(hostPort)
-			portMaps = append(portMaps, &portMapping{
-				intHostPort: hostPort,
-				strHostPort: hPort,
-				portProto:   nport,
-			})
-		}
-	}
-	return portMaps, nil
-}
-
-// MapPorts maps ports defined in hostconfig for containerID
-func MapPorts(hostconfig *containertypes.HostConfig, endpoint *models.EndpointConfig, containerID string) error {
-	log.Debugf("mapPorts for %q: %v", containerID, hostconfig.PortBindings)
-
-	if len(hostconfig.PortBindings) == 0 {
-		return nil
-	}
-	if endpoint == nil {
-		return fmt.Errorf("invalid endpoint")
-	}
-
-	var containerIP net.IP
-	containerIP = net.ParseIP(endpoint.Address)
-	if containerIP == nil {
-		return fmt.Errorf("invalid endpoint address %s", endpoint.Address)
-	}
-
-	portMap, err := unrollPortMap(hostconfig.PortBindings)
-	if err != nil {
-		return err
-	}
-
-	cbpLock.Lock()
-	defer cbpLock.Unlock()
-	for _, p := range portMap {
-		if err = portMapper.MapPort(nil, p.intHostPort, p.portProto.Proto(), containerIP.String(), p.portProto.Int(), publicIfaceName, bridgeIfaceName); err != nil {
-			return err
-		}
-
-		// bridge-to-bridge pin hole for traffic from containers for exposed port
-		if err = interBridgeTraffic(portmap.Map, p.strHostPort, p.portProto.Proto(), containerIP.String(), p.portProto.Port()); err != nil {
-			return err
-		}
-
-		// update mapped ports
-		containerByPort[p.strHostPort] = containerID
-		log.Debugf("mapped port %s for container %s", p.strHostPort, containerID)
-	}
-	return nil
-}
-
-// UnmapPorts unmaps ports defined in hostconfig if it's mapped for this container
-func UnmapPorts(id string, hostconfig *containertypes.HostConfig) error {
-	log.Debugf("UnmapPorts: %v", hostconfig.PortBindings)
-
-	if len(hostconfig.PortBindings) == 0 {
-		return nil
-	}
-
-	portMap, err := unrollPortMap(hostconfig.PortBindings)
-	if err != nil {
-		return err
-	}
-
-	cbpLock.Lock()
-	defer cbpLock.Unlock()
-	for _, p := range portMap {
-		// check if we should actually unmap based on current mappings
-		mappedID, mapped := containerByPort[p.strHostPort]
-		if !mapped {
-			log.Debugf("skipping already unmapped %s", p.strHostPort)
-			continue
-		}
-		if mappedID != id {
-			log.Debugf("port is mapped for container %s, not %s, skipping", mappedID, id)
-			continue
-		}
-
-		if err = portMapper.UnmapPort(nil, p.intHostPort, p.portProto.Proto(), p.portProto.Int(), publicIfaceName, bridgeIfaceName); err != nil {
-			return err
-		}
-
-		// bridge-to-bridge pin hole for traffic from containers for exposed port
-		if err = interBridgeTraffic(portmap.Unmap, p.strHostPort, "", "", ""); err != nil {
-			return err
-		}
-
-		// update mapped ports
-		delete(containerByPort, p.strHostPort)
-		log.Debugf("unmapped port %s", p.strHostPort)
-	}
-	return nil
-}
-
-// interBridgeTraffic enables traffic for exposed port from one bridge network to another
-func interBridgeTraffic(op portmap.Operation, hostPort, proto, containerAddr, containerPort string) error {
-	switch op {
-	case portmap.Map:
-		switch proto {
-		case "udp", "tcp":
-		default:
-			return fmt.Errorf("unknown protocol: %s", proto)
-		}
-
-		// rule to allow connections from bridge interface for the
-		// specific mapped port. has to inserted at the top of the
-		// chain rather than appended to supersede bridge-to-bridge
-		// traffic blocking
-		baseArgs := []string{"-t", string(iptables.Filter),
-			"-i", bridgeIfaceName,
-			"-o", bridgeIfaceName,
-			"-p", proto,
-			"-d", containerAddr,
-			"--dport", containerPort,
-			"-j", "ACCEPT",
-		}
-
-		args := append([]string{string(iptables.Insert), "VIC", "1"}, baseArgs...)
-		if _, err := iptables.Raw(args...); err != nil && !os.IsExist(err) {
-			return err
-		}
-
-		btbRules[hostPort] = baseArgs
-	case portmap.Unmap:
-		if args, ok := btbRules[hostPort]; ok {
-			args = append([]string{string(iptables.Delete), "VIC"}, args...)
-			if _, err := iptables.Raw(args...); err != nil && !os.IsNotExist(err) {
-				return err
-			}
-
-			delete(btbRules, hostPort)
-		}
-	}
-
-	return nil
-}
-
-func (c *Container) defaultScope() string {
-	defaultScope.Lock()
-	defer defaultScope.Unlock()
-
-	if defaultScope.scope != "" {
-		return defaultScope.scope
-	}
-
-	client := c.containerProxy.Client()
-	listRes, err := client.Scopes.List(scopes.NewListParamsWithContext(ctx).WithIDName("default"))
-	if err != nil {
-		log.Error(err)
-		return ""
-	}
-
-	if len(listRes.Payload) != 1 {
-		log.Errorf("could not get default scope name")
-		return ""
-	}
-
-	defaultScope.scope = listRes.Payload[0].Name
-	return defaultScope.scope
-}
-
-func (c *Container) findPortBoundNetworkEndpoint(hostconfig *containertypes.HostConfig, endpoints []*models.EndpointConfig) (*models.ScopeConfig, *models.EndpointConfig) {
-	if len(hostconfig.PortBindings) == 0 {
-		return nil, nil
-	}
-
-	// check if the port binding network is a bridge type
-	listRes, err := PortLayerClient().Scopes.List(scopes.NewListParamsWithContext(ctx).WithIDName(hostconfig.NetworkMode.NetworkName()))
-	if err != nil {
-		log.Error(err)
-		return nil, nil
-	}
-
-	if l := len(listRes.Payload); l != 1 {
-		log.Warnf("found %d scopes", l)
-		return nil, nil
-	}
-
-	if listRes.Payload[0].ScopeType != constants.BridgeScopeType {
-		log.Warnf("port binding for network %s is not bridge type", hostconfig.NetworkMode.NetworkName())
-		return listRes.Payload[0], nil
-	}
-
-	// look through endpoints to find the container's IP on the network that has the port binding
-	for _, e := range endpoints {
-		if hostconfig.NetworkMode.NetworkName() == e.Scope || (hostconfig.NetworkMode.IsDefault() && e.Scope == c.defaultScope()) {
-			return listRes.Payload[0], e
-		}
-	}
-
-	return nil, nil
-}
-
-// ContainerStop looks for the given container and terminates it,
-// waiting the given number of seconds before forcefully killing the
-// container. If a negative number of seconds is given, ContainerStop
-// will wait for a graceful termination. An error is returned if the
-// container is not found, is already stopped, or if there is a
-// problem stopping the container.
-func (c *Container) ContainerStop(name string, seconds *int) error {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	if seconds == nil {
-		timeout := DefaultStopTimeout
-		if vc.Config.StopTimeout != nil {
-			timeout = *vc.Config.StopTimeout
-		}
-		seconds = &timeout
-	}
-
-	operation := func() error {
-		return c.containerProxy.Stop(vc, name, seconds, true)
-	}
-
-	config := retry.NewBackoffConfig()
-	config.MaxElapsedTime = maxElapsedTime
-	if err := retry.DoWithConfig(operation, IsConflictError, config); err != nil {
-		return err
-	}
-
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-	EventService().Log(containerStopEvent, eventtypes.ContainerEventType, actor)
-
-	return nil
-}
-
-// ContainerUnpause unpauses a container
-func (c *Container) ContainerUnpause(name string) error {
-	return fmt.Errorf("%s does not yet implement ContainerUnpause", ProductName())
-}
-
-// ContainerUpdate updates configuration of the container
-func (c *Container) ContainerUpdate(name string, hostConfig *containertypes.HostConfig) (containertypes.ContainerUpdateOKBody, error) {
-	return containertypes.ContainerUpdateOKBody{}, fmt.Errorf("%s does not yet implement ontainerUpdate", ProductName())
-}
-
-// ContainerWait stops processing until the given container is
-// stopped. If the container is not found, an error is returned. On a
-// successful stop, the exit code of the container is returned. On a
-// timeout, an error is returned. If you want to wait forever, supply
-// a negative duration for the timeout.
-func (c *Container) ContainerWait(name string, timeout time.Duration) (int, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("name(%s):timeout(%s)", name, timeout)))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return -1, NotFoundError(name)
-	}
-
-	dockerState, err := c.containerProxy.Wait(vc, timeout)
-	if err != nil {
-		return -1, err
-	}
-
-	return dockerState.ExitCode, nil
-}
-
-// docker's container.monitorBackend
-
-// ContainerChanges returns a list of container fs changes
-func (c *Container) ContainerChanges(name string) ([]docker.Change, error) {
-	defer trace.End(trace.Begin(name))
-	op := trace.NewOperation(context.Background(), "ContainerChanges: %s", name)
-
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return nil, NotFoundError(name)
-	}
-
-	r, err := c.containerProxy.GetContainerChanges(op, vc, false)
-	if err != nil {
-		return nil, InternalServerError(err.Error())
-	}
-
-	changes := []docker.Change{}
-
-	tarFile := tar.NewReader(r)
-
-	defer r.Close()
-
-	for {
-		hdr, err := tarFile.Next()
-		if err == io.EOF {
-			break
-		}
-
-		if err != nil {
-			return []docker.Change{}, InternalServerError(err.Error())
-		}
-
-		change := docker.Change{
-			Path: filepath.Join("/", hdr.Name),
-		}
-		switch hdr.Xattrs[archive.ChangeTypeKey] {
-		case "A":
-			change.Kind = docker.ChangeAdd
-		case "D":
-			change.Kind = docker.ChangeDelete
-			path := strings.TrimSuffix(change.Path, "/")
-			p := strings.TrimPrefix(filepath.Base(path), docker.WhiteoutPrefix)
-			change.Path = filepath.Join(filepath.Dir(path), p)
-		case "C":
-			change.Kind = docker.ChangeModify
-		default:
-			return []docker.Change{}, InternalServerError("Invalid change type")
-		}
-		changes = append(changes, change)
-	}
-	return changes, nil
-}
-
-// ContainerInspect returns low-level information about a
-// container. Returns an error if the container cannot be found, or if
-// there is an error getting the data.
-func (c *Container) ContainerInspect(name string, size bool, version string) (interface{}, error) {
-	// Ignore version.  We're supporting post-1.20 version.
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return nil, NotFoundError(name)
-	}
-	id := vc.ContainerID
-	log.Debugf("Found %q in cache as %q", id, vc.ContainerID)
-
-	client := c.containerProxy.Client()
-
-	results, err := client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).WithID(id))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetContainerInfoNotFound:
-			cache.ContainerCache().DeleteContainer(id)
-			return nil, NotFoundError(name)
-		case *containers.GetContainerInfoInternalServerError:
-			return nil, InternalServerError(err.Payload.Message)
-		default:
-			return nil, InternalServerError(err.Error())
-		}
-	}
-
-	inspectJSON, err := ContainerInfoToDockerContainerInspect(vc, results.Payload, PortLayerName())
-	if err != nil {
-		log.Errorf("containerInfoToDockerContainerInspect failed with %s", err)
-		return nil, err
-	}
-
-	log.Debugf("ContainerInspect json config = %+v\n", inspectJSON.Config)
-
-	return inspectJSON, nil
-}
-
-// ContainerLogs hooks up a container's stdout and stderr streams
-// configured with the given struct.
-func (c *Container) ContainerLogs(ctx context.Context, name string, config *backend.ContainerLogsConfig, started chan struct{}) error {
-	defer trace.End(trace.Begin(""))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-	name = vc.ContainerID
-
-	tailLines, since, err := c.validateContainerLogsConfig(vc, config)
-	if err != nil {
-		return err
-	}
-
-	// Outstream modification (from Docker's code) so the stream is streamed with the
-	// necessary headers that the CLI expects.  This is Docker's scheme.
-	wf := ioutils.NewWriteFlusher(config.OutStream)
-	defer wf.Close()
-
-	wf.Flush()
-
-	outStream := io.Writer(wf)
-	if !vc.Config.Tty {
-		outStream = stdcopy.NewStdWriter(outStream, stdcopy.Stdout)
-	}
-
-	// Make a call to our proxy to handle the remoting
-	err = c.containerProxy.StreamContainerLogs(ctx, name, outStream, started, config.Timestamps, config.Follow, since, tailLines)
-	if err != nil {
-		// Don't return an error encountered while streaming logs.
-		// Once we've started streaming logs, the Docker client doesn't expect
-		// an error to be returned as it leads to a malformed response body.
-		log.Errorf("error while streaming logs: %#v", err)
-	}
-
-	return nil
-}
-
-// ContainerStats writes information about the container to the stream
-// given in the config object.
-func (c *Container) ContainerStats(ctx context.Context, name string, config *backend.ContainerStatsConfig) error {
-	defer trace.End(trace.Begin(name))
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-	}
-
-	// get the configured CPUMhz for this VCH so that we can calculate docker CPU stats
-	cpuMhz, err := systemBackend.SystemCPUMhzLimit()
-	if err != nil {
-		// wrap error to provide a bit more detail
-		sysErr := fmt.Errorf("unable to gather system CPUMhz for container(%s): %s", vc.ContainerID, err)
-		log.Error(sysErr)
-		return InternalServerError(sysErr.Error())
-	}
-
-	out := config.OutStream
-	if config.Stream {
-		// Outstream modification (from Docker's code) so the stream is streamed with the
-		// necessary headers that the CLI expects.  This is Docker's scheme.
-		wf := ioutils.NewWriteFlusher(config.OutStream)
-		defer wf.Close()
-		wf.Flush()
-		out = io.Writer(wf)
-	}
-
-	// stats configuration
-	statsConfig := &convert.ContainerStatsConfig{
-		VchMhz:      cpuMhz,
-		Stream:      config.Stream,
-		ContainerID: vc.ContainerID,
-		Out:         out,
-		Memory:      vc.HostConfig.Memory,
-	}
-
-	// if we are not streaming then we need to get the container state
-	if !config.Stream {
-		statsConfig.ContainerState, err = c.containerProxy.State(vc)
-		if err != nil {
-			return InternalServerError(err.Error())
-		}
-
-	}
-
-	err = c.containerProxy.StreamContainerStats(ctx, statsConfig)
-	if err != nil {
-		log.Errorf("error while streaming container (%s) stats: %s", vc.ContainerID, err)
-	}
-	return nil
-}
-
-// ContainerTop lists the processes running inside of the given
-// container by calling ps with the given args, or with the flags
-// "-ef" if no args are given.  An error is returned if the container
-// is not found, or is not running, or if there are any problems
-// running ps, or parsing the output.
-func (c *Container) ContainerTop(name string, psArgs string) (*types.ContainerProcessList, error) {
-	return nil, fmt.Errorf("%s does not yet implement ContainerTop", ProductName())
-}
-
-// Containers returns the list of containers to show given the user's filtering.
-func (c *Container) Containers(config *types.ContainerListOptions) ([]*types.Container, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("ListOptions %#v", config)))
-
-	// validate filters for support and validity
-	listContext, err := filter.ValidateContainerFilters(config, acceptedPsFilterTags, unSupportedPsFilters)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get an API client to the portlayer
-	client := c.containerProxy.Client()
-
-	containme, err := client.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(ctx).WithAll(&listContext.All))
-	if err != nil {
-		switch err := err.(type) {
-
-		case *containers.GetContainerListInternalServerError:
-			return nil, fmt.Errorf("Error invoking GetContainerList: %s", err.Payload.Message)
-
-		default:
-			return nil, fmt.Errorf("Error invoking GetContainerList: %s", err.Error())
-		}
-	}
-	// TODO: move to conversion function
-	containers := make([]*types.Container, 0, len(containme.Payload))
-
-payloadLoop:
-	for _, t := range containme.Payload {
-
-		// get this containers state
-		dockerState := convert.State(t)
-
-		var labels map[string]string
-		if config.Filters.Include("label") {
-			err = convert.ContainerAnnotation(t.ContainerConfig.Annotations, convert.AnnotationKeyLabels, &labels)
-			if err != nil {
-				return nil, fmt.Errorf("unable to convert vic annotations to docker labels (%s)", t.ContainerConfig.ContainerID)
-			}
-		}
-		listContext.Labels = labels
-		listContext.ExitCode = dockerState.ExitCode
-		listContext.ID = t.ContainerConfig.ContainerID
-
-		// prior to further conversion lets determine if this container
-		// is needed or if the list is complete -- if the container is
-		// needed conversion will continue and the container will be added to the
-		// return array
-		action := filter.IncludeContainer(listContext, t)
-		switch action {
-		case filter.ExcludeAction:
-			// skip to next container
-			continue payloadLoop
-		case filter.StopAction:
-			// we're done
-			break payloadLoop
-		}
-
-		cmd := strings.Join(t.ProcessConfig.ExecArgs, " ")
-		// the docker client expects the friendly name to be prefixed
-		// with a forward slash -- create a new slice and add here
-		names := make([]string, 0, len(t.ContainerConfig.Names))
-		for i := range t.ContainerConfig.Names {
-			names = append(names, clientFriendlyContainerName(t.ContainerConfig.Names[i]))
-		}
-
-		var ports []types.Port
-		if t.HostConfig.Address != "" {
-			ports = directPortInformation(t)
-		}
-
-		ips, err := publicIPv4Addrs()
-		if err != nil {
-			log.Errorf("Could not get IP information for reporting port bindings: %s", err)
-			// display port mappings without IP data if we cannot get it
-			ips = []string{""}
-		}
-		ports = append(ports, portForwardingInformation(t, ips)...)
-
-		// verify that the repo:tag exists for the container -- if it doesn't then we should present the
-		// truncated imageID -- if we have a failure determining then we'll show the data we have
-		repo := *t.ContainerConfig.RepoName
-		// #nosec: Errors unhandled.
-		ref, _ := reference.ParseNamed(*t.ContainerConfig.RepoName)
-		if ref != nil {
-			imageID, err := cache.RepositoryCache().Get(ref)
-			if err != nil && err == cache.ErrDoesNotExist {
-				// the tag has been removed, so we need to show the truncated imageID
-				imageID = cache.RepositoryCache().GetImageID(t.ContainerConfig.LayerID)
-				if imageID != "" {
-					id := uid.Parse(imageID)
-					repo = id.Truncate().String()
-				}
-			}
-		}
-
-		c := &types.Container{
-			ID:      t.ContainerConfig.ContainerID,
-			Image:   repo,
-			Created: t.ContainerConfig.CreateTime,
-			Status:  dockerState.Status,
-			Names:   names,
-			Command: cmd,
-			SizeRw:  t.ContainerConfig.StorageSize,
-			Ports:   ports,
-			State:   filter.DockerState(t.ContainerConfig.State),
-		}
-
-		// The container should be included in the list
-		containers = append(containers, c)
-		listContext.Counter++
-
-	}
-
-	return containers, nil
-}
-
-func (c *Container) ContainersPrune(pruneFilters filters.Args) (*types.ContainersPruneReport, error) {
-	return nil, fmt.Errorf("%s does not yet implement ContainersPrune", ProductName())
-}
-
-// docker's container.attachBackend
-
-// ContainerAttach attaches to logs according to the config passed in. See ContainerAttachConfig.
-func (c *Container) ContainerAttach(name string, ca *backend.ContainerAttachConfig) error {
-	defer trace.End(trace.Begin(name))
-
-	operation := func() error {
-		return c.containerAttach(name, ca)
-	}
-	if err := retry.Do(operation, IsConflictError); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *Container) containerAttach(name string, ca *backend.ContainerAttachConfig) error {
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(name)
-	if vc == nil {
-		return NotFoundError(name)
-
-	}
-	id := vc.ContainerID
-
-	handle, err := c.Handle(id, name)
-	if err != nil {
-		return err
-	}
-
-	handleprime, err := c.containerProxy.BindInteraction(handle, name, id)
-	if err != nil {
-		return err
-	}
-
-	if err := c.containerProxy.CommitContainerHandle(handleprime, name, 0); err != nil {
-		return err
-	}
-
-	stdin, stdout, stderr, err := ca.GetStreams()
-	if err != nil {
-		return InternalServerError("Unable to get stdio streams for calling client")
-	}
-	defer stdin.Close()
-
-	if !vc.Config.Tty && ca.MuxStreams {
-		// replace the stdout/stderr with Docker's multiplex stream
-		if ca.UseStderr {
-			stderr = stdcopy.NewStdWriter(stderr, stdcopy.Stderr)
-		}
-		if ca.UseStdout {
-			stdout = stdcopy.NewStdWriter(stdout, stdcopy.Stdout)
-		}
-	}
-
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{})
-	EventService().Log(containerAttachEvent, eventtypes.ContainerEventType, actor)
-
-	if vc.Config.Tty {
-		ca.UseStderr = false
-	}
-
-	ac := &AttachConfig{
-		ID: id,
-		ContainerAttachConfig: ca,
-		UseTty:                vc.Config.Tty,
-		CloseStdin:            vc.Config.StdinOnce,
-	}
-
-	err = c.containerProxy.AttachStreams(context.Background(), ac, stdin, stdout, stderr)
-	if err != nil {
-		if _, ok := err.(DetachError); ok {
-			log.Infof("Detach detected, tearing down connection")
-
-			// fire detach event
-			EventService().Log(containerDetachEvent, eventtypes.ContainerEventType, actor)
-
-			// DON'T UNBIND FOR NOW, UNTIL/UNLESS REFERENCE COUNTING IS IN PLACE
-			// This avoids cutting the communication channel for other sessions connected to this
-			// container
-
-			// FIXME: call UnbindInteraction/Commit
-		}
-		return err
-	}
-
-	return nil
-}
-
-// ContainerRename changes the name of a container, using the oldName
-// to find the container. An error is returned if newName is already
-// reserved.
-func (c *Container) ContainerRename(oldName, newName string) error {
-	defer trace.End(trace.Begin(newName))
-
-	if oldName == "" || newName == "" {
-		err := fmt.Errorf("neither old nor new names may be empty")
-		log.Errorf("%s", err.Error())
-		return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-	}
-
-	if !utils.RestrictedNamePattern.MatchString(newName) {
-		err := fmt.Errorf("invalid container name (%s), only %s are allowed", newName, utils.RestrictedNameChars)
-		log.Errorf("%s", err.Error())
-		return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-	}
-
-	// Look up the container name in the metadata cache to get long ID
-	vc := cache.ContainerCache().GetContainer(oldName)
-	if vc == nil {
-		log.Errorf("Container %s not found", oldName)
-		return NotFoundError(oldName)
-	}
-
-	oldName = vc.Name
-	if oldName == newName {
-		err := fmt.Errorf("renaming a container with the same name as its current name")
-		log.Errorf("%s", err.Error())
-		return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-	}
-
-	// reserve the new name in containerCache
-	if err := cache.ContainerCache().ReserveName(vc, newName); err != nil {
-		log.Errorf("%s", err.Error())
-		return derr.NewRequestConflictError(err)
-	}
-
-	renameOp := func() error {
-		return c.containerProxy.Rename(vc, newName)
-	}
-
-	if err := retry.Do(renameOp, IsConflictError); err != nil {
-		log.Errorf("Rename error: %s", err)
-		cache.ContainerCache().ReleaseName(newName)
-		return err
-	}
-
-	// update containerCache
-	if err := cache.ContainerCache().UpdateContainerName(oldName, newName); err != nil {
-		log.Errorf("Failed to update container cache: %s", err)
-		cache.ContainerCache().ReleaseName(newName)
-		return err
-	}
-
-	log.Infof("Container %s renamed to %s", oldName, newName)
-
-	actor := CreateContainerEventActorWithAttributes(vc, map[string]string{"newName": fmt.Sprintf("%s", newName)})
-
-	EventService().Log("Rename", eventtypes.ContainerEventType, actor)
-
-	return nil
-}
-
-// helper function to format the container name
-// to the docker client approved format
-func clientFriendlyContainerName(name string) string {
-	return fmt.Sprintf("/%s", name)
-}
-
-//------------------------------------
-// ContainerCreate() Utility Functions
-//------------------------------------
-
-// createInternalVicContainer() creates an container representation (for docker personality)
-// This is called by ContainerCreate()
-func createInternalVicContainer(image *metadata.ImageConfig, config *types.ContainerCreateConfig) (*viccontainer.VicContainer, error) {
-	// provide basic container config via the image
-	container := viccontainer.NewVicContainer()
-	container.LayerID = image.V1Image.ID // store childmost layer ID to map to the proper vmdk
-	container.ImageID = image.ImageID
-	container.Config = image.Config //Set defaults.  Overrides will get copied below.
-
-	return container, nil
-}
-
-// SetConfigOptions is a place to add necessary container configuration
-// values that were not explicitly supplied by the user
-func setCreateConfigOptions(config, imageConfig *containertypes.Config) {
-	// Overwrite or append the image's config from the CLI with the metadata from the image's
-	// layer metadata where appropriate
-	if len(config.Cmd) == 0 {
-		config.Cmd = imageConfig.Cmd
-	}
-	if config.WorkingDir == "" {
-		config.WorkingDir = imageConfig.WorkingDir
-	}
-	if len(config.Entrypoint) == 0 {
-		config.Entrypoint = imageConfig.Entrypoint
-	}
-
-	if config.Volumes == nil {
-		config.Volumes = imageConfig.Volumes
-	} else {
-		for k, v := range imageConfig.Volumes {
-			//NOTE: the value of the map is an empty struct.
-			//      we also do not care about duplicates.
-			//      This Volumes map is really a Set.
-			config.Volumes[k] = v
-		}
-	}
-
-	if config.User == "" {
-		config.User = imageConfig.User
-	}
-	// set up environment
-	config.Env = setEnvFromImageConfig(config.Tty, config.Env, imageConfig.Env)
-}
-
-func setEnvFromImageConfig(tty bool, env []string, imgEnv []string) []string {
-	// Set PATH in ENV if needed
-	env = setPathFromImageConfig(env, imgEnv)
-
-	containerEnv := make(map[string]string, len(env))
-	for _, e := range env {
-		kv := strings.SplitN(e, "=", 2)
-		var val string
-		if len(kv) == 2 {
-			val = kv[1]
-		}
-		containerEnv[kv[0]] = val
-	}
-
-	// Set TERM to xterm if tty is set, unless user supplied a different TERM
-	if tty {
-		if _, ok := containerEnv["TERM"]; !ok {
-			env = append(env, "TERM=xterm")
-		}
-	}
-
-	// add remaining environment variables from the image config to the container
-	// config, taking care not to overwrite anything
-	for _, imageEnv := range imgEnv {
-		key := strings.SplitN(imageEnv, "=", 2)[0]
-		// is environment variable already set in container config?
-		if _, ok := containerEnv[key]; !ok {
-			// no? let's copy it from the image config
-			env = append(env, imageEnv)
-		}
-	}
-
-	return env
-}
-
-func setPathFromImageConfig(env []string, imgEnv []string) []string {
-	// check if user supplied PATH environment variable at creation time
-	for _, v := range env {
-		if strings.HasPrefix(v, "PATH=") {
-			// a PATH is set, bail
-			return env
-		}
-	}
-
-	// check to see if the image this container is created from supplies a PATH
-	for _, v := range imgEnv {
-		if strings.HasPrefix(v, "PATH=") {
-			// a PATH was found, add it to the config
-			env = append(env, v)
-			return env
-		}
-	}
-
-	// no PATH set, use the default
-	env = append(env, fmt.Sprintf("PATH=%s", defaultEnvPath))
-
-	return env
-}
-
-// validateCreateConfig() checks the parameters for ContainerCreate().
-// It may "fix up" the config param passed into ConntainerCreate() if needed.
-func validateCreateConfig(config *types.ContainerCreateConfig) error {
-	defer trace.End(trace.Begin("Container.validateCreateConfig"))
-
-	if config.Config == nil {
-		return BadRequestError("invalid config")
-	}
-
-	if config.HostConfig == nil {
-		config.HostConfig = &containertypes.HostConfig{}
-	}
-
-	// process cpucount here
-	var cpuCount int64 = DefaultCPUs
-
-	// support windows client
-	if config.HostConfig.CPUCount > 0 {
-		cpuCount = config.HostConfig.CPUCount
-	} else {
-		// we hijack --cpuset-cpus in the non-windows case
-		if config.HostConfig.CpusetCpus != "" {
-			cpus := strings.Split(config.HostConfig.CpusetCpus, ",")
-			if c, err := strconv.Atoi(cpus[0]); err == nil {
-				cpuCount = int64(c)
-			} else {
-				return fmt.Errorf("Error parsing CPU count: %s", err)
-			}
-		}
-	}
-	config.HostConfig.CPUCount = cpuCount
-
-	// fix-up cpu/memory settings here
-	if cpuCount < MinCPUs {
-		config.HostConfig.CPUCount = MinCPUs
-	}
-	log.Infof("Container CPU count: %d", config.HostConfig.CPUCount)
-
-	// convert from bytes to MiB for vsphere
-	memoryMB := config.HostConfig.Memory / units.MiB
-	if memoryMB == 0 {
-		memoryMB = MemoryDefaultMB
-	} else if memoryMB < MemoryMinMB {
-		memoryMB = MemoryMinMB
-	}
-
-	// check that memory is aligned
-	if remainder := memoryMB % MemoryAlignMB; remainder != 0 {
-		log.Warnf("Default container VM memory must be %d aligned for hotadd, rounding up.", MemoryAlignMB)
-		memoryMB += MemoryAlignMB - remainder
-	}
-
-	config.HostConfig.Memory = memoryMB
-	log.Infof("Container memory: %d MB", config.HostConfig.Memory)
-
-	if config.NetworkingConfig == nil {
-		config.NetworkingConfig = &dnetwork.NetworkingConfig{}
-	} else {
-		if l := len(config.NetworkingConfig.EndpointsConfig); l > 1 {
-			return fmt.Errorf("NetworkMode error: Container can be connected to one network endpoint only")
-		}
-		// If NetworkConfig exists, set NetworkMode to the default endpoint network, assuming only one endpoint network as the default network during container create
-		for networkName := range config.NetworkingConfig.EndpointsConfig {
-			config.HostConfig.NetworkMode = containertypes.NetworkMode(networkName)
-		}
-	}
-
-	// validate port bindings
-	var ips []string
-	if addrs, err := publicIPv4Addrs(); err != nil {
-		log.Warnf("could not get address for public interface: %s", err)
-	} else {
-		ips = make([]string, len(addrs))
-		for i := range addrs {
-			ips[i] = addrs[i]
-		}
-	}
-
-	for _, pbs := range config.HostConfig.PortBindings {
-		for _, pb := range pbs {
-			if pb.HostIP != "" && pb.HostIP != "0.0.0.0" {
-				// check if specified host ip equals any of the addresses on the "client" interface
-				found := false
-				for _, i := range ips {
-					if i == pb.HostIP {
-						found = true
-						break
-					}
-				}
-				if !found {
-					return InternalServerError("host IP for port bindings is only supported for 0.0.0.0 and the public interface IP address")
-				}
-			}
-
-			// #nosec: Errors unhandled.
-			start, end, _ := gonat.ParsePortRangeToInt(pb.HostPort)
-			if start != end {
-				return InternalServerError("host port ranges are not supported for port bindings")
-			}
-		}
-	}
-
-	// https://github.com/vmware/vic/issues/1378
-	if len(config.Config.Entrypoint) == 0 && len(config.Config.Cmd) == 0 {
-		return derr.NewRequestNotFoundError(fmt.Errorf("No command specified"))
-	}
-
-	// Was a name provided - if not create a friendly name
-	generatedName := namesgenerator.GetRandomName(0)
-	if config.Name == "" {
-		//TODO: Assume we could have a name collison here : need to
-		// provide validation / retry CDG June 9th 2016
-		config.Name = generatedName
-	}
-
-	return nil
-}
-
-func copyConfigOverrides(vc *viccontainer.VicContainer, config types.ContainerCreateConfig) {
-	// Copy the create overrides to our new container
-	vc.Name = config.Name
-	vc.Config.Cmd = config.Config.Cmd
-	vc.Config.WorkingDir = config.Config.WorkingDir
-	vc.Config.Entrypoint = config.Config.Entrypoint
-	vc.Config.Env = config.Config.Env
-	vc.Config.AttachStdin = config.Config.AttachStdin
-	vc.Config.AttachStdout = config.Config.AttachStdout
-	vc.Config.AttachStderr = config.Config.AttachStderr
-	vc.Config.Tty = config.Config.Tty
-	vc.Config.OpenStdin = config.Config.OpenStdin
-	vc.Config.StdinOnce = config.Config.StdinOnce
-	vc.Config.StopSignal = config.Config.StopSignal
-	vc.Config.Volumes = config.Config.Volumes
-	vc.HostConfig = config.HostConfig
-}
-
-func publicIPv4Addrs() ([]string, error) {
-	l, err := netlink.LinkByName(publicIfaceName)
-	if err != nil {
-		return nil, fmt.Errorf("could not look up link from interface name %s: %s", publicIfaceName, err.Error())
-	}
-
-	addrs, err := netlink.AddrList(l, netlink.FAMILY_V4)
-	if err != nil {
-		return nil, fmt.Errorf("could not get addresses from public link: %s", err.Error())
-	}
-
-	ips := make([]string, len(addrs))
-	for i := range addrs {
-		ips[i] = addrs[i].IP.String()
-	}
-
-	return ips, nil
-}
-
-func directPortInformation(t *models.ContainerInfo) []types.Port {
-	var redirectPorts []types.Port
-	var directPorts []types.Port
-
-	ip := t.HostConfig.Address
-
-	openNetwork := false
-	for _, p := range t.HostConfig.Ports {
-		port := types.Port{IP: ip}
-
-		// see if it's an open network
-		if p == constants.PortsOpenNetwork {
-			openNetwork = true
-			port.Type = "*"
-			// we're presenting this in redirect ports as that's assured to be returned
-			redirectPorts = append(redirectPorts, port)
-			continue
-		}
-
-		portsAndType := strings.SplitN(p, "/", 2)
-		port.Type = portsAndType[1]
-
-		mapping := strings.Split(portsAndType[0], ":")
-		// if no mapping is supplied then there's only one and that's public. If there is a mapping then the first
-		// entry is the public
-		public, err := strconv.Atoi(mapping[0])
-		if err != nil {
-			log.Errorf("Got an error trying to convert public port number \"%s\" to an int: %s", mapping[0], err)
-			continue
-		}
-		port.PublicPort = uint16(public)
-
-		// If port is on container network then a different container could be forwarding the same port via the endpoint
-		// so must check for explicit ID match. If no match, definitely not forwarded via endpoint.
-		if containerByPort[mapping[0]] == t.ContainerConfig.ContainerID {
-			continue
-		}
-
-		// did not find a way to have the client not render both ports so setting them the same even if there's not
-		// redirect occurring
-		port.PrivatePort = port.PublicPort
-
-		if len(mapping) == 1 {
-			directPorts = append(directPorts, port)
-			continue
-		}
-
-		private, err := strconv.Atoi(mapping[1])
-		if err != nil {
-			log.Errorf("Got an error trying to convert private port number \"%s\" to an int: %s", mapping[1], err)
-			continue
-		}
-		port.PrivatePort = uint16(private)
-		redirectPorts = append(redirectPorts, port)
-	}
-
-	// if it's an open network then don't bother detailing ports without a redirection as all ports are exposed
-	if !openNetwork {
-		redirectPorts = append(redirectPorts, directPorts...)
-	}
-
-	return redirectPorts
-}
-
-// returns port bindings as a slice of Docker Ports for return to the client
-// returns empty slice on error
-func portForwardingInformation(t *models.ContainerInfo, ips []string) []types.Port {
-	cid := t.ContainerConfig.ContainerID
-	c := cache.ContainerCache().GetContainer(cid)
-
-	if c == nil {
-		log.Errorf("Could not find container with ID %s", cid)
-		return nil
-	}
-
-	portBindings := c.HostConfig.PortBindings
-	var resultPorts []types.Port
-
-	// create a port for each IP on the interface (usually only 1, but could be more)
-	// (works with both IPv4 and IPv6 addresses)
-	for _, ip := range ips {
-		port := types.Port{IP: ip}
-
-		for portBindingPrivatePort, hostPortBindings := range portBindings {
-			portAndType := strings.SplitN(string(portBindingPrivatePort), "/", 2)
-			portNum, err := strconv.Atoi(portAndType[0])
-			if err != nil {
-				log.Infof("Got an error trying to convert private port number to an int")
-				continue
-			}
-			port.PrivatePort = uint16(portNum)
-			port.Type = portAndType[1]
-
-			for i := 0; i < len(hostPortBindings); i++ {
-				newport := port
-				publicPort, err := strconv.Atoi(hostPortBindings[i].HostPort)
-				if err != nil {
-					log.Infof("Got an error trying to convert public port number to an int")
-					continue
-				}
-
-				// If port is on container network then a different container could be forwarding the same port via the endpoint
-				// so must check for explicit ID match. If no match, definitely not forwarded via endpoint.
-				if containerByPort[hostPortBindings[i].HostPort] != t.ContainerConfig.ContainerID {
-					continue
-				}
-
-				newport.PublicPort = uint16(publicPort)
-				// sanity check -- sometimes these come back as 0 when no binding actually exists
-				// that doesn't make sense, so in that case we don't want to report these bindings
-				if newport.PublicPort != 0 && newport.PrivatePort != 0 {
-					resultPorts = append(resultPorts, newport)
-				}
-			}
-		}
-	}
-	return resultPorts
-}
-
-//----------------------------------
-// ContainerLogs() utility functions
-//----------------------------------
-
-// validateContainerLogsConfig() validates and extracts options for logging from the
-// backend.ContainerLogsConfig object we're given.
-//
-// returns:
-//	tail lines, since (in unix time), error
-func (c *Container) validateContainerLogsConfig(vc *viccontainer.VicContainer, config *backend.ContainerLogsConfig) (int64, int64, error) {
-	if !(config.ShowStdout || config.ShowStderr) {
-		return 0, 0, fmt.Errorf("You must choose at least one stream")
-	}
-
-	unsupported := func(opt string) (int64, int64, error) {
-		return 0, 0, fmt.Errorf("container %s does not support '--%s'", vc.ContainerID, opt)
-	}
-
-	tailLines := int64(-1)
-	if config.Tail != "" && config.Tail != "all" {
-		n, err := strconv.ParseInt(config.Tail, 10, 64)
-		if err != nil {
-			return 0, 0, fmt.Errorf("error parsing tail option: %s", err)
-		}
-		tailLines = n
-	}
-
-	var since time.Time
-	if config.Since != "" {
-		s, n, err := timetypes.ParseTimestamps(config.Since, 0)
-		if err != nil {
-			return 0, 0, err
-		}
-		since = time.Unix(s, n)
-	}
-
-	// TODO(jzt): this should not require an extra call to the portlayer. We should
-	// update container.DataVersion when we hydrate the container cache at VCH startup
-	// see https://github.com/vmware/vic/issues/4194
-	if config.Timestamps {
-		// check container DataVersion to make sure it's supported
-		params := containers.NewGetContainerInfoParams()
-		params.SetID(vc.ContainerID)
-		info, err := PortLayerClient().Containers.GetContainerInfo(params)
-		if err != nil {
-			return 0, 0, err
-		}
-		if info.Payload.DataVersion == 0 {
-			return unsupported("timestamps")
-		}
-	}
-
-	return tailLines, since.Unix(), nil
-}
-
-func CreateContainerEventActorWithAttributes(vc *viccontainer.VicContainer, attributes map[string]string) eventtypes.Actor {
-	if vc.Config != nil {
-		for k, v := range vc.Config.Labels {
-			attributes[k] = v
-		}
-	}
-	if vc.Config.Image != "" {
-		attributes["image"] = vc.Config.Image
-	}
-	attributes["name"] = strings.TrimLeft(vc.Name, "/")
-
-	return eventtypes.Actor{
-		ID:         vc.ContainerID,
-		Attributes: attributes,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container/viccontainer.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container/viccontainer.go
deleted file mode 100644
index 2987d89f49..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container/viccontainer.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package container
-
-import (
-	"sync"
-
-	containertypes "github.com/docker/docker/api/types/container"
-)
-
-// VicContainer is VIC's abridged version of Docker's container object.
-type VicContainer struct {
-	Name        string
-	ImageID     string // maps to the image used by this container
-	LayerID     string // child-most layer ID used to find vmdk for this container
-	ContainerID string
-	Config      *containertypes.Config //Working copy of config (with overrides from container create)
-	HostConfig  *containertypes.HostConfig
-
-	m     sync.RWMutex
-	execs map[string]struct{}
-}
-
-// NewVicContainer returns a reference to a new VicContainer
-func NewVicContainer() *VicContainer {
-	return &VicContainer{
-		Config: &containertypes.Config{},
-		execs:  make(map[string]struct{}),
-	}
-}
-
-// Add adds a new exec configuration to the container.
-func (v *VicContainer) Add(id string) {
-	v.m.Lock()
-	v.execs[id] = struct{}{}
-	v.m.Unlock()
-}
-
-// Delete removes an exec configuration from the container.
-func (v *VicContainer) Delete(id string) {
-	v.m.Lock()
-	delete(v.execs, id)
-	v.m.Unlock()
-}
-
-// List returns the list of exec ids in the container.
-func (v *VicContainer) List() []string {
-	var IDs []string
-	v.m.RLock()
-	for id := range v.execs {
-		IDs = append(IDs, id)
-	}
-	v.m.RUnlock()
-	return IDs
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy.go
deleted file mode 100644
index 7074cc6f36..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy.go
+++ /dev/null
@@ -1,2046 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-//****
-// container_proxy.go
-//
-// Contains all code that touches the portlayer for container operations and all
-// code that converts swagger based returns to docker personality backend structs.
-// The goal is to make the backend code that implements the docker engine-api
-// interfaces be as simple as possible and contain no swagger or portlayer code.
-//
-// Rule for code to be in here:
-// 1. touches VIC portlayer
-// 2. converts swagger to docker engine-api structs
-// 3. errors MUST be docker engine-api compatible errors.  DO NOT return arbitrary errors!
-//		- Do NOT return portlayer errors
-//		- Do NOT return fmt.Errorf()
-//		- Do NOT return errors.New()
-//		- Please USE the aliased docker error package 'derr'
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net"
-	"net/http"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/strfmt"
-	"github.com/google/uuid"
-
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/mount"
-	dnetwork "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/api/types/strslice"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/pkg/term"
-	"github.com/docker/go-connections/nat"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	viccontainer "github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/convert"
-	epoint "github.com/vmware/vic/lib/apiservers/engine/backends/endpoint"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/interaction"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/logging"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/scopes"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/tasks"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-// VicContainerProxy interface
-type VicContainerProxy interface {
-	CreateContainerHandle(vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error)
-	CreateContainerTask(handle string, id string, config types.ContainerCreateConfig) (string, error)
-	CreateExecTask(handle string, config *types.ExecConfig) (string, string, error)
-	AddContainerToScope(handle string, config types.ContainerCreateConfig) (string, error)
-	AddVolumesToContainer(handle string, config types.ContainerCreateConfig) (string, error)
-	AddLoggingToContainer(handle string, config types.ContainerCreateConfig) (string, error)
-	AddInteractionToContainer(handle string, config types.ContainerCreateConfig) (string, error)
-
-	BindInteraction(handle string, name string, id string) (string, error)
-	UnbindInteraction(handle string, name string, id string) (string, error)
-
-	CommitContainerHandle(handle, containerID string, waitTime int32) error
-	AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer) error
-	StreamContainerLogs(ctx context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error
-	StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error
-
-	StatPath(op trace.Operation, sotre, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error)
-
-	Stop(vc *viccontainer.VicContainer, name string, seconds *int, unbound bool) error
-	State(vc *viccontainer.VicContainer) (*types.ContainerState, error)
-	Wait(vc *viccontainer.VicContainer, timeout time.Duration) (*types.ContainerState, error)
-	Signal(vc *viccontainer.VicContainer, sig uint64) error
-	Resize(id string, height, width int32) error
-	Rename(vc *viccontainer.VicContainer, newName string) error
-
-	GetContainerChanges(op trace.Operation, vc *viccontainer.VicContainer, data bool) (io.ReadCloser, error)
-
-	UnbindContainerFromNetwork(vc *viccontainer.VicContainer, handle string) (string, error)
-
-	Handle(id, name string) (string, error)
-	Client() *client.PortLayer
-	exitCode(vc *viccontainer.VicContainer) (string, error)
-}
-
-// ContainerProxy struct
-type ContainerProxy struct {
-	client        *client.PortLayer
-	portlayerAddr string
-	portlayerName string
-}
-
-type volumeFields struct {
-	ID    string
-	Dest  string
-	Flags string
-}
-
-// AttachConfig wraps backend.ContainerAttachConfig and adds other required fields
-// Similar to https://github.com/docker/docker/blob/master/container/stream/attach.go
-type AttachConfig struct {
-	*backend.ContainerAttachConfig
-
-	// ID of the session
-	ID string
-	// Tells the attach copier that the stream's stdin is a TTY and to look for
-	// escape sequences in stdin to detach from the stream.
-	// When true the escape sequence is not passed to the underlying stream
-	UseTty bool
-	// CloseStdin signals that once done, stdin for the attached stream should be closed
-	// For example, this would close the attached container's stdin.
-	CloseStdin bool
-}
-
-const (
-	attachConnectTimeout  time.Duration = 15 * time.Second //timeout for the connection
-	attachAttemptTimeout  time.Duration = 60 * time.Second //timeout before we ditch an attach attempt
-	attachPLAttemptDiff   time.Duration = 10 * time.Second
-	attachStdinInitString               = "v1c#>"
-	swaggerSubstringEOF                 = "EOF"
-	forceLogType                        = "json-file" //Use in inspect to allow docker logs to work
-	ShortIDLen                          = 12
-	archiveStreamBufSize                = 64 * 1024
-
-	DriverArgFlagKey      = "flags"
-	DriverArgContainerKey = "container"
-	DriverArgImageKey     = "image"
-
-	ContainerRunning = "running"
-	ContainerError   = "error"
-	ContainerStopped = "stopped"
-	ContainerExited  = "exited"
-	ContainerCreated = "created"
-)
-
-// NewContainerProxy will create a new proxy
-func NewContainerProxy(plClient *client.PortLayer, portlayerAddr string, portlayerName string) *ContainerProxy {
-	return &ContainerProxy{client: plClient, portlayerAddr: portlayerAddr, portlayerName: portlayerName}
-}
-
-// Handle retrieves a handle to a VIC container.  Handles should be treated as opaque strings.
-//
-// returns:
-//	(handle string, error)
-func (c *ContainerProxy) Handle(id, name string) (string, error) {
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.Handle failed to get a portlayer client")
-	}
-
-	resp, err := c.client.Containers.Get(containers.NewGetParamsWithContext(ctx).WithID(id))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetNotFound:
-			cache.ContainerCache().DeleteContainer(id)
-			return "", NotFoundError(name)
-		case *containers.GetDefault:
-			return "", InternalServerError(err.Payload.Message)
-		default:
-			return "", InternalServerError(err.Error())
-		}
-	}
-	return resp.Payload, nil
-}
-
-func (c *ContainerProxy) Client() *client.PortLayer {
-	return c.client
-}
-
-// CreateContainerHandle creates a new VIC container by calling the portlayer
-//
-// returns:
-//	(containerID, containerHandle, error)
-func (c *ContainerProxy) CreateContainerHandle(vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error) {
-	defer trace.End(trace.Begin(vc.ImageID))
-
-	if c.client == nil {
-		return "", "", InternalServerError("ContainerProxy.CreateContainerHandle failed to create a portlayer client")
-	}
-
-	if vc.ImageID == "" {
-		return "", "", NotFoundError("No image specified")
-	}
-
-	if vc.LayerID == "" {
-		return "", "", NotFoundError("No layer specified")
-	}
-
-	// Call the Exec port layer to create the container
-	host, err := sys.UUID()
-	if err != nil {
-		return "", "", InternalServerError("ContainerProxy.CreateContainerHandle got unexpected error getting VCH UUID")
-	}
-
-	plCreateParams := dockerContainerCreateParamsToPortlayer(config, vc, host)
-	createResults, err := c.client.Containers.Create(plCreateParams)
-	if err != nil {
-		if _, ok := err.(*containers.CreateNotFound); ok {
-			cerr := fmt.Errorf("No such image: %s", vc.ImageID)
-			log.Errorf("%s (%s)", cerr, err)
-			return "", "", NotFoundError(cerr.Error())
-		}
-
-		// If we get here, most likely something went wrong with the port layer API server
-		return "", "", InternalServerError(err.Error())
-	}
-
-	id := createResults.Payload.ID
-	h := createResults.Payload.Handle
-
-	return id, h, nil
-}
-
-// CreateContainerTask sets the primary command to run in the container
-//
-// returns:
-//	(containerHandle, error)
-func (c *ContainerProxy) CreateContainerTask(handle, id string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(""))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.CreateContainerTask failed to create a portlayer client")
-	}
-
-	plTaskParams := dockerContainerCreateParamsToTask(id, config)
-	plTaskParams.Config.Handle = handle
-
-	responseJoin, err := c.client.Tasks.Join(plTaskParams)
-	if err != nil {
-		log.Errorf("Unable to join primary task to container: %+v", err)
-		return "", InternalServerError(err.Error())
-	}
-
-	handle, ok := responseJoin.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Type assertion failed on handle from task join: %#+v", handle))
-	}
-
-	plBindParams := tasks.NewBindParamsWithContext(ctx).WithConfig(&models.TaskBindConfig{Handle: handle, ID: id})
-	responseBind, err := c.client.Tasks.Bind(plBindParams)
-	if err != nil {
-		log.Errorf("Unable to bind primary task to container: %+v", err)
-		return "", InternalServerError(err.Error())
-	}
-
-	handle, ok = responseBind.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Type assertion failed on handle from task bind %#+v", handle))
-	}
-
-	return handle, nil
-}
-
-func (c *ContainerProxy) CreateExecTask(handle string, config *types.ExecConfig) (string, string, error) {
-	defer trace.End(trace.Begin(""))
-
-	if c.client == nil {
-		return "", "", InternalServerError("ContainerProxy.CreateExecTask failed to create a portlayer client")
-	}
-
-	joinconfig := &models.TaskJoinConfig{
-		Handle:    handle,
-		Path:      config.Cmd[0],
-		Args:      config.Cmd[1:],
-		Env:       config.Env,
-		User:      config.User,
-		Attach:    config.AttachStdin || config.AttachStdout || config.AttachStderr,
-		OpenStdin: config.AttachStdin,
-		Tty:       config.Tty,
-	}
-
-	// call Join with JoinParams
-	joinparams := tasks.NewJoinParamsWithContext(ctx).WithConfig(joinconfig)
-	resp, err := c.client.Tasks.Join(joinparams)
-	if err != nil {
-		return "", "", InternalServerError(err.Error())
-	}
-	eid := resp.Payload.ID
-
-	handleprime, ok := resp.Payload.Handle.(string)
-	if !ok {
-		return "", "", InternalServerError(fmt.Sprintf("Type assertion failed on handle from task bind %#+v", handleprime))
-	}
-
-	return handleprime, eid, nil
-}
-
-// AddContainerToScope adds a container, referenced by handle, to a scope.
-// If an error is return, the returned handle should not be used.
-//
-// returns:
-//	modified handle
-func (c *ContainerProxy) AddContainerToScope(handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddContainerToScope failed to create a portlayer client")
-	}
-
-	log.Debugf("Network Configuration Section - Container Create")
-	// configure networking
-	netConf := toModelsNetworkConfig(config)
-	if netConf != nil {
-		addContRes, err := c.client.Scopes.AddContainer(scopes.NewAddContainerParamsWithContext(ctx).
-			WithScope(netConf.NetworkName).
-			WithConfig(&models.ScopesAddContainerConfig{
-				Handle:        handle,
-				NetworkConfig: netConf,
-			}))
-
-		if err != nil {
-			log.Errorf("ContainerProxy.AddContainerToScope: Scopes error: %s", err.Error())
-			return handle, InternalServerError(err.Error())
-		}
-
-		defer func() {
-			if err == nil {
-				return
-			}
-			// roll back the AddContainer call
-			if _, err2 := c.client.Scopes.RemoveContainer(scopes.NewRemoveContainerParamsWithContext(ctx).WithHandle(handle).WithScope(netConf.NetworkName)); err2 != nil {
-				log.Warnf("could not roll back container add: %s", err2)
-			}
-		}()
-
-		handle = addContRes.Payload
-	}
-
-	return handle, nil
-}
-
-// AddVolumesToContainer adds volumes to a container, referenced by handle.
-// If an error is returned, the returned handle should not be used.
-//
-// returns:
-//	modified handle
-func (c *ContainerProxy) AddVolumesToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddVolumesToContainer failed to create a portlayer client")
-	}
-
-	//Volume Attachment Section
-	log.Debugf("ContainerProxy.AddVolumesToContainer - VolumeSection")
-	log.Debugf("Raw Volume arguments : binds:  %#v : volumes : %#v", config.HostConfig.Binds, config.Config.Volumes)
-
-	// Collect all volume mappings. In a docker create/run, they
-	// can be anonymous (-v /dir) or specific (-v vol-name:/dir).
-	// anonymous volumes can also come from Image Metadata
-
-	rawAnonVolumes := make([]string, 0, len(config.Config.Volumes))
-	for k := range config.Config.Volumes {
-		rawAnonVolumes = append(rawAnonVolumes, k)
-	}
-
-	volList, err := finalizeVolumeList(config.HostConfig.Binds, rawAnonVolumes)
-	if err != nil {
-		return handle, BadRequestError(err.Error())
-	}
-
-	log.Infof("Finalized Volume list : %#v", volList)
-
-	if len(config.Config.Volumes) > 0 {
-		// override anonymous volume list with generated volume id
-		for _, vol := range volList {
-			if _, ok := config.Config.Volumes[vol.Dest]; ok {
-				delete(config.Config.Volumes, vol.Dest)
-				mount := getMountString(vol.ID, vol.Dest, vol.Flags)
-				config.Config.Volumes[mount] = struct{}{}
-				log.Debugf("Replace anonymous volume config %s with %s", vol.Dest, mount)
-			}
-		}
-	}
-
-	// Create and join volumes.
-	for _, fields := range volList {
-
-		//we only set these here for volumes made on a docker create
-		volumeData := make(map[string]string)
-		volumeData[DriverArgFlagKey] = fields.Flags
-		volumeData[DriverArgContainerKey] = config.Name
-		volumeData[DriverArgImageKey] = config.Config.Image
-
-		// NOTE: calling volumeCreate regardless of whether the volume is already
-		// present can be avoided by adding an extra optional param to VolumeJoin,
-		// which would then call volumeCreate if the volume does not exist.
-		vol := &Volume{}
-		_, err := vol.volumeCreate(fields.ID, "vsphere", volumeData, nil)
-		if err != nil {
-			switch err := err.(type) {
-			case *storage.CreateVolumeConflict:
-				// Implicitly ignore the error where a volume with the same name
-				// already exists. We can just join the said volume to the container.
-				log.Infof("a volume with the name %s already exists", fields.ID)
-			case *storage.CreateVolumeNotFound:
-				return handle, VolumeCreateNotFoundError(volumeStore(volumeData))
-			default:
-				return handle, InternalServerError(err.Error())
-			}
-		} else {
-			log.Infof("volumeCreate succeeded. Volume mount section ID: %s", fields.ID)
-		}
-
-		flags := make(map[string]string)
-		//NOTE: for now we are passing the flags directly through. This is NOT SAFE and only a stop gap.
-		flags[constants.Mode] = fields.Flags
-		joinParams := storage.NewVolumeJoinParamsWithContext(ctx).WithJoinArgs(&models.VolumeJoinConfig{
-			Flags:     flags,
-			Handle:    handle,
-			MountPath: fields.Dest,
-		}).WithName(fields.ID)
-
-		res, err := c.client.Storage.VolumeJoin(joinParams)
-		if err != nil {
-			switch err := err.(type) {
-			case *storage.VolumeJoinInternalServerError:
-				return handle, InternalServerError(err.Payload.Message)
-			case *storage.VolumeJoinDefault:
-				return handle, InternalServerError(err.Payload.Message)
-			case *storage.VolumeJoinNotFound:
-				return handle, VolumeJoinNotFoundError(err.Payload.Message)
-			default:
-				return handle, InternalServerError(err.Error())
-			}
-		}
-
-		handle = res.Payload
-	}
-
-	return handle, nil
-}
-
-// AddLoggingToContainer adds logging capability to a container, referenced by handle.
-// If an error is return, the returned handle should not be used.
-//
-// returns:
-//	modified handle
-func (c *ContainerProxy) AddLoggingToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddLoggingToContainer failed to get the portlayer client")
-	}
-
-	response, err := c.client.Logging.LoggingJoin(logging.NewLoggingJoinParamsWithContext(ctx).
-		WithConfig(&models.LoggingJoinConfig{
-			Handle: handle,
-		}))
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-	handle, ok := response.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Type assertion failed for %#+v", handle))
-	}
-
-	return handle, nil
-}
-
-// AddInteractionToContainer adds interaction capabilities to a container, referenced by handle.
-// If an error is return, the returned handle should not be used.
-//
-// returns:
-//	modified handle
-func (c *ContainerProxy) AddInteractionToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddInteractionToContainer failed to get the portlayer client")
-	}
-
-	response, err := c.client.Interaction.InteractionJoin(interaction.NewInteractionJoinParamsWithContext(ctx).
-		WithConfig(&models.InteractionJoinConfig{
-			Handle: handle,
-		}))
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-	handle, ok := response.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Type assertion failed for %#+v", handle))
-	}
-
-	return handle, nil
-}
-
-// BindInteraction enables interaction capabilities
-func (c *ContainerProxy) BindInteraction(handle string, name string, id string) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddInteractionToContainer failed to get the portlayer client")
-	}
-
-	bind, err := c.client.Interaction.InteractionBind(
-		interaction.NewInteractionBindParamsWithContext(ctx).
-			WithConfig(&models.InteractionBindConfig{
-				Handle: handle,
-				ID:     id,
-			}))
-	if err != nil {
-		switch err := err.(type) {
-		case *interaction.InteractionBindInternalServerError:
-			return "", InternalServerError(err.Payload.Message)
-		default:
-			return "", InternalServerError(err.Error())
-		}
-	}
-	handle, ok := bind.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError(fmt.Sprintf("Type assertion failed for %#+v", handle))
-	}
-	return handle, nil
-}
-
-// UnbindInteraction disables interaction capabilities
-func (c *ContainerProxy) UnbindInteraction(handle string, name string, id string) (string, error) {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.AddInteractionToContainer failed to get the portlayer client")
-	}
-
-	unbind, err := c.client.Interaction.InteractionUnbind(
-		interaction.NewInteractionUnbindParamsWithContext(ctx).
-			WithConfig(&models.InteractionUnbindConfig{
-				Handle: handle,
-				ID:     id,
-			}))
-	if err != nil {
-		return "", InternalServerError(err.Error())
-	}
-	handle, ok := unbind.Payload.Handle.(string)
-	if !ok {
-		return "", InternalServerError("type assertion failed")
-	}
-
-	return handle, nil
-}
-
-// CommitContainerHandle commits any changes to container handle.
-//
-// Args:
-//	waitTime <= 0 means no wait time
-func (c *ContainerProxy) CommitContainerHandle(handle, containerID string, waitTime int32) error {
-	defer trace.End(trace.Begin(handle))
-
-	if c.client == nil {
-		return InternalServerError("ContainerProxy.CommitContainerHandle failed to get a portlayer client")
-	}
-
-	var commitParams *containers.CommitParams
-	if waitTime > 0 {
-		commitParams = containers.NewCommitParamsWithContext(ctx).WithHandle(handle).WithWaitTime(&waitTime)
-	} else {
-		commitParams = containers.NewCommitParamsWithContext(ctx).WithHandle(handle)
-	}
-
-	_, err := c.client.Containers.Commit(commitParams)
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.CommitNotFound:
-			return NotFoundError(containerID)
-		case *containers.CommitConflict:
-			return ConflictError(err.Error())
-		case *containers.CommitDefault:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	return nil
-}
-
-// StreamContainerLogs reads the log stream from the portlayer rest server and writes
-// it directly to the io.Writer that is passed in.
-func (c *ContainerProxy) StreamContainerLogs(ctx context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error {
-	defer trace.End(trace.Begin(""))
-
-	close(started)
-
-	params := containers.NewGetContainerLogsParamsWithContext(ctx).
-		WithID(name).
-		WithFollow(&followLogs).
-		WithTimestamp(&showTimestamps).
-		WithSince(&since).
-		WithTaillines(&tailLines)
-	_, err := c.client.Containers.GetContainerLogs(params, out)
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetContainerLogsNotFound:
-			return NotFoundError(name)
-		case *containers.GetContainerLogsInternalServerError:
-			return InternalServerError("Server error from the interaction port layer")
-		default:
-			//Check for EOF.  Since the connection, transport, and data handling are
-			//encapsulated inside of Swagger, we can only detect EOF by checking the
-			//error string
-			if strings.Contains(err.Error(), swaggerSubstringEOF) {
-				return nil
-			}
-			return InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
-		}
-	}
-
-	return nil
-}
-
-// StreamContainerStats will provide a stream of container stats written to the provided
-// io.Writer.  Prior to writing to the provided io.Writer there will be a transformation
-// from the portLayer representation of stats to the docker format
-func (c *ContainerProxy) StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error {
-	defer trace.End(trace.Begin(config.ContainerID))
-
-	// create a child context that we control
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	params := containers.NewGetContainerStatsParamsWithContext(ctx)
-	params.ID = config.ContainerID
-	params.Stream = config.Stream
-
-	config.Ctx = ctx
-	config.Cancel = cancel
-
-	// create our converter
-	containerConverter := convert.NewContainerStats(config)
-	// provide the writer for the portLayer and start listening for metrics
-	writer := containerConverter.Listen()
-	if writer == nil {
-		// problem with the listener
-		return InternalServerError(fmt.Sprintf("unable to gather container(%s) statistics", config.ContainerID))
-	}
-
-	_, err := c.client.Containers.GetContainerStats(params, writer)
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetContainerStatsNotFound:
-			return NotFoundError(config.ContainerID)
-		case *containers.GetContainerStatsInternalServerError:
-			return InternalServerError("Server error from the interaction port layer")
-		default:
-			if ctx.Err() == context.Canceled {
-				return nil
-			}
-			//Check for EOF.  Since the connection, transport, and data handling are
-			//encapsulated inside of Swagger, we can only detect EOF by checking the
-			//error string
-			if strings.Contains(err.Error(), swaggerSubstringEOF) {
-				return nil
-			}
-			return InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
-		}
-	}
-	return nil
-}
-
-// GetContainerChanges returns container changes from portlayer.
-// Set data to true will return file data, otherwise, only return file headers with change type.
-func (c *ContainerProxy) GetContainerChanges(op trace.Operation, vc *viccontainer.VicContainer, data bool) (io.ReadCloser, error) {
-	host, err := sys.UUID()
-	if err != nil {
-		return nil, InternalServerError("Failed to determine host UUID")
-	}
-
-	parent := vc.LayerID
-	spec := archive.FilterSpec{
-		Inclusions: map[string]struct{}{},
-		Exclusions: map[string]struct{}{},
-	}
-
-	r, err := archiveProxy.ArchiveExportReader(op, constants.ContainerStoreName, host, vc.ContainerID, parent, data, spec)
-	if err != nil {
-		return nil, InternalServerError(err.Error())
-	}
-
-	return r, nil
-}
-
-// StatPath requests the portlayer to stat the filesystem resource at the
-// specified path in the container vc.
-func (c *ContainerProxy) StatPath(op trace.Operation, store, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error) {
-	defer trace.End(trace.Begin(deviceID))
-
-	statPathParams := storage.
-		NewStatPathParamsWithContext(op).
-		WithStore(store).
-		WithDeviceID(deviceID)
-
-	spec, err := archive.EncodeFilterSpec(op, &filterSpec)
-	if err != nil {
-		op.Errorf(err.Error())
-		return nil, InternalServerError(err.Error())
-	}
-	statPathParams = statPathParams.WithFilterSpec(spec)
-
-	statPathOk, err := c.client.Storage.StatPath(statPathParams)
-	if err != nil {
-		op.Errorf(err.Error())
-		return nil, err
-	}
-
-	stat := &types.ContainerPathStat{
-		Name:       statPathOk.Name,
-		Mode:       os.FileMode(statPathOk.Mode),
-		Size:       statPathOk.Size,
-		LinkTarget: statPathOk.LinkTarget,
-	}
-
-	var modTime time.Time
-	if err := modTime.GobDecode([]byte(statPathOk.ModTime)); err != nil {
-		op.Debugf("error getting mod time from statpath: %s", err.Error())
-	} else {
-		stat.Mtime = modTime
-	}
-
-	return stat, nil
-}
-
-// Stop will stop (shutdown) a VIC container.
-//
-// returns
-//	error
-func (c *ContainerProxy) Stop(vc *viccontainer.VicContainer, name string, seconds *int, unbound bool) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
-
-	if c.client == nil {
-		return InternalServerError("ContainerProxy.Stop failed to get a portlayer client")
-	}
-
-	//retrieve client to portlayer
-	handle, err := c.Handle(vc.ContainerID, name)
-	if err != nil {
-		return err
-	}
-
-	// we have a container on the PL side lets check the state before proceeding
-	// ignore the error  since others will be checking below..this is an attempt to short circuit the op
-	// TODO: can be replaced with simple cache check once power events are propagated to persona
-	state, err := c.State(vc)
-	if err != nil && IsNotFoundError(err) {
-		cache.ContainerCache().DeleteContainer(vc.ContainerID)
-		return err
-	}
-	// attempt to stop container only if container state is not stopped, exited or created.
-	// we should allow user to stop and remove the container that is in unexpected status, e.g. starting, because of serial port connection issue
-	if state.Status == ContainerStopped || state.Status == ContainerExited || state.Status == ContainerCreated {
-		return nil
-	}
-
-	if unbound {
-		handle, err = c.UnbindContainerFromNetwork(vc, handle)
-		if err != nil {
-			return err
-		}
-
-		// unmap ports
-		if err = UnmapPorts(vc.ContainerID, vc.HostConfig); err != nil {
-			return err
-		}
-	}
-
-	// change the state of the container
-	changeParams := containers.NewStateChangeParamsWithContext(ctx).WithHandle(handle).WithState("STOPPED")
-	stateChangeResponse, err := c.client.Containers.StateChange(changeParams)
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.StateChangeNotFound:
-			cache.ContainerCache().DeleteContainer(vc.ContainerID)
-			return NotFoundError(name)
-		case *containers.StateChangeDefault:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	handle = stateChangeResponse.Payload
-
-	// if no timeout in seconds provided then set to default of 10
-	if seconds == nil {
-		s := 10
-		seconds = &s
-	}
-
-	err = c.CommitContainerHandle(handle, vc.ContainerID, int32(*seconds))
-	if err != nil {
-		if IsNotFoundError(err) {
-			cache.ContainerCache().DeleteContainer(vc.ContainerID)
-		}
-		return err
-	}
-
-	return nil
-}
-
-// UnbindContainerFromNetwork unbinds a container from the networks that it connects to
-func (c *ContainerProxy) UnbindContainerFromNetwork(vc *viccontainer.VicContainer, handle string) (string, error) {
-	defer trace.End(trace.Begin(vc.ContainerID))
-
-	unbindParams := scopes.NewUnbindContainerParamsWithContext(ctx).WithHandle(handle)
-	ub, err := c.client.Scopes.UnbindContainer(unbindParams)
-	if err != nil {
-		switch err := err.(type) {
-		case *scopes.UnbindContainerNotFound:
-			// ignore error
-			log.Warnf("Container %s not found by network unbind", vc.ContainerID)
-		case *scopes.UnbindContainerInternalServerError:
-			return "", InternalServerError(err.Payload.Message)
-		default:
-			return "", InternalServerError(err.Error())
-		}
-	}
-
-	return ub.Payload.Handle, nil
-}
-
-// State returns container state
-func (c *ContainerProxy) State(vc *viccontainer.VicContainer) (*types.ContainerState, error) {
-	defer trace.End(trace.Begin(""))
-
-	if c.client == nil {
-		return nil, InternalServerError("ContainerProxy.State failed to get a portlayer client")
-	}
-
-	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).WithID(vc.ContainerID))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetContainerInfoNotFound:
-			return nil, NotFoundError(vc.Name)
-		case *containers.GetContainerInfoInternalServerError:
-			return nil, InternalServerError(err.Payload.Message)
-		default:
-			return nil, InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
-		}
-	}
-
-	inspectJSON, err := ContainerInfoToDockerContainerInspect(vc, results.Payload, c.portlayerName)
-	if err != nil {
-		return nil, err
-	}
-	return inspectJSON.State, nil
-}
-
-// exitCode returns container exitCode
-func (c *ContainerProxy) exitCode(vc *viccontainer.VicContainer) (string, error) {
-	defer trace.End(trace.Begin(""))
-
-	if c.client == nil {
-		return "", InternalServerError("ContainerProxy.exitCode failed to get a portlayer client")
-	}
-
-	results, err := c.client.Containers.GetContainerInfo(containers.NewGetContainerInfoParamsWithContext(ctx).WithID(vc.ContainerID))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetContainerInfoNotFound:
-			return "", NotFoundError(vc.Name)
-		case *containers.GetContainerInfoInternalServerError:
-			return "", InternalServerError(err.Payload.Message)
-		default:
-			return "", InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
-		}
-	}
-	// get the container state
-	dockerState := convert.State(results.Payload)
-	if dockerState == nil {
-		return "", InternalServerError("Unable to determine container state")
-	}
-
-	return strconv.Itoa(dockerState.ExitCode), nil
-}
-
-func (c *ContainerProxy) Wait(vc *viccontainer.VicContainer, timeout time.Duration) (
-	*types.ContainerState, error) {
-
-	defer trace.End(trace.Begin(vc.ContainerID))
-
-	if vc == nil {
-		return nil, InternalServerError("Wait bad arguments")
-	}
-
-	// Get an API client to the portlayer
-	client := c.client
-	if client == nil {
-		return nil, InternalServerError("Wait failed to create a portlayer client")
-	}
-
-	params := containers.NewContainerWaitParamsWithContext(ctx).
-		WithTimeout(int64(timeout.Seconds())).
-		WithID(vc.ContainerID)
-	results, err := client.Containers.ContainerWait(params)
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.ContainerWaitNotFound:
-			// since the container wasn't found on the PL lets remove from the local
-			// cache
-			cache.ContainerCache().DeleteContainer(vc.ContainerID)
-			return nil, NotFoundError(vc.ContainerID)
-		case *containers.ContainerWaitInternalServerError:
-			return nil, InternalServerError(err.Payload.Message)
-		default:
-			return nil, InternalServerError(err.Error())
-		}
-	}
-
-	if results == nil || results.Payload == nil {
-		return nil, InternalServerError("Unexpected swagger error")
-	}
-
-	dockerState := convert.State(results.Payload)
-	if dockerState == nil {
-		return nil, InternalServerError("Unable to determine container state")
-	}
-	return dockerState, nil
-}
-
-func (c *ContainerProxy) Signal(vc *viccontainer.VicContainer, sig uint64) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
-
-	if vc == nil {
-		return InternalServerError("Signal bad arguments")
-	}
-
-	// Get an API client to the portlayer
-	client := c.client
-	if client == nil {
-		return InternalServerError("Signal failed to create a portlayer client")
-	}
-
-	if state, err := c.State(vc); !state.Running && err == nil {
-		return fmt.Errorf("%s is not running", vc.ContainerID)
-	}
-
-	// If Docker CLI sends sig == 0, we use sigkill
-	if sig == 0 {
-		sig = uint64(syscall.SIGKILL)
-	}
-	params := containers.NewContainerSignalParamsWithContext(ctx).WithID(vc.ContainerID).WithSignal(int64(sig))
-	if _, err := client.Containers.ContainerSignal(params); err != nil {
-		switch err := err.(type) {
-		case *containers.ContainerSignalNotFound:
-			return NotFoundError(vc.ContainerID)
-		case *containers.ContainerSignalInternalServerError:
-			return InternalServerError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	if state, err := c.State(vc); !state.Running && err == nil {
-		// unmap ports
-		if err = UnmapPorts(vc.ContainerID, vc.HostConfig); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (c *ContainerProxy) Resize(id string, height, width int32) error {
-	defer trace.End(trace.Begin(id))
-
-	if c.client == nil {
-		return derr.NewErrorWithStatusCode(fmt.Errorf("ContainerProxy failed to create a portlayer client"),
-			http.StatusInternalServerError)
-	}
-
-	plResizeParam := interaction.NewContainerResizeParamsWithContext(ctx).
-		WithID(id).
-		WithHeight(height).
-		WithWidth(width)
-
-	_, err := c.client.Interaction.ContainerResize(plResizeParam)
-	if err != nil {
-		if _, isa := err.(*interaction.ContainerResizeNotFound); isa {
-			return ResourceNotFoundError(id, "interaction connection")
-		}
-
-		// If we get here, most likely something went wrong with the port layer API server
-		return InternalServerError(err.Error())
-	}
-
-	return nil
-}
-
-// AttachStreams takes the the hijacked connections from the calling client and attaches
-// them to the 3 streams from the portlayer's rest server.
-// stdin, stdout, stderr are the hijacked connection
-func (c *ContainerProxy) AttachStreams(ctx context.Context, ac *AttachConfig, stdin io.ReadCloser, stdout, stderr io.Writer) error {
-	// Cancel will close the child connections.
-	var wg, outWg sync.WaitGroup
-	errors := make(chan error, 3)
-
-	var keys []byte
-	var err error
-	if ac.DetachKeys != "" {
-		keys, err = term.ToBytes(ac.DetachKeys)
-		if err != nil {
-			return fmt.Errorf("Invalid escape keys (%s) provided", ac.DetachKeys)
-		}
-	}
-
-	ctx, cancel := context.WithCancel(ctx)
-	defer cancel()
-
-	if ac.UseStdin {
-		wg.Add(1)
-	}
-
-	if ac.UseStdout {
-		wg.Add(1)
-		outWg.Add(1)
-	}
-
-	if ac.UseStderr {
-		wg.Add(1)
-		outWg.Add(1)
-	}
-
-	// cancel stdin if all output streams are complete
-	go func() {
-		outWg.Wait()
-		cancel()
-	}()
-
-	EOForCanceled := func(err error) bool {
-		return err != nil && ctx.Err() != context.Canceled && !strings.HasSuffix(err.Error(), swaggerSubstringEOF)
-	}
-
-	if ac.UseStdin {
-		go func() {
-			defer wg.Done()
-			err := copyStdIn(ctx, c.client, ac, stdin, keys)
-			if err != nil {
-				log.Errorf("container attach: stdin (%s): %s", ac.ID, err)
-			} else {
-				log.Infof("container attach: stdin (%s) done", ac.ID)
-			}
-
-			if !ac.CloseStdin || ac.UseTty {
-				cancel()
-			}
-
-			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
-			if EOForCanceled(err) {
-				errors <- err
-			}
-		}()
-	}
-
-	if ac.UseStdout {
-		go func() {
-			defer outWg.Done()
-			defer wg.Done()
-
-			err := copyStdOut(ctx, c.client, ac, stdout, attachAttemptTimeout)
-			if err != nil {
-				log.Errorf("container attach: stdout (%s): %s", ac.ID, err)
-			} else {
-				log.Infof("container attach: stdout (%s) done", ac.ID)
-			}
-
-			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
-			if EOForCanceled(err) {
-				errors <- err
-			}
-		}()
-	}
-
-	if ac.UseStderr {
-		go func() {
-			defer outWg.Done()
-			defer wg.Done()
-
-			err := copyStdErr(ctx, c.client, ac, stderr)
-			if err != nil {
-				log.Errorf("container attach: stderr (%s): %s", ac.ID, err)
-			} else {
-				log.Infof("container attach: stderr (%s) done", ac.ID)
-			}
-
-			// Check for EOF or canceled context. We can only detect EOF by checking the error string returned by swagger :/
-			if EOForCanceled(err) {
-				errors <- err
-			}
-		}()
-	}
-
-	// Wait for all stream copy to exit
-	wg.Wait()
-
-	// close the channel so that we don't leak (if there is an error)/or get blocked (if there are no errors)
-	close(errors)
-
-	log.Infof("cleaned up connections to %s. Checking errors", ac.ID)
-	for err := range errors {
-		if err != nil {
-			// check if we got DetachError
-			if _, ok := err.(DetachError); ok {
-				log.Infof("Detached from container detected")
-				return err
-			}
-
-			// If we get here, most likely something went wrong with the port layer API server
-			// These errors originate within the go-swagger client itself.
-			// Go-swagger returns untyped errors to us if the error is not one that we define
-			// in the swagger spec.  Even EOF.  Therefore, we must scan the error string (if there
-			// is an error string in the untyped error) for the term EOF.
-			log.Errorf("container attach error: %s", err)
-
-			return err
-		}
-	}
-
-	log.Infof("No error found. Returning nil...")
-	return nil
-}
-
-// Rename calls the portlayer's RenameContainerHandler to update the container name in the handle,
-// and then commit the new name to vSphere
-func (c *ContainerProxy) Rename(vc *viccontainer.VicContainer, newName string) error {
-	defer trace.End(trace.Begin(vc.ContainerID))
-
-	//retrieve client to portlayer
-	handle, err := c.Handle(vc.ContainerID, vc.Name)
-	if err != nil {
-		return InternalServerError(err.Error())
-	}
-
-	if c.client == nil {
-		return InternalServerError("ContainerProxy.Rename failed to create a portlayer client")
-	}
-
-	// Call the rename functionality in the portlayer.
-	renameParams := containers.NewContainerRenameParamsWithContext(ctx).WithName(newName).WithHandle(handle)
-	result, err := c.client.Containers.ContainerRename(renameParams)
-	if err != nil {
-		switch err := err.(type) {
-		// Here we don't check the portlayer error type for *containers.ContainerRenameConflict since
-		// (1) we already check that in persona cache for ConflictError and
-		// (2) the container name in portlayer cache will be updated when committing the handle in the next step
-		case *containers.ContainerRenameNotFound:
-			return NotFoundError(vc.Name)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	h := result.Payload
-
-	// commit handle
-	_, err = c.client.Containers.Commit(containers.NewCommitParamsWithContext(ctx).WithHandle(h))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.CommitNotFound:
-			return NotFoundError(err.Payload.Message)
-		case *containers.CommitConflict:
-			return ConflictError(err.Payload.Message)
-		default:
-			return InternalServerError(err.Error())
-		}
-	}
-
-	return nil
-}
-
-//----------
-// Utility Functions
-//----------
-
-func dockerContainerCreateParamsToTask(id string, cc types.ContainerCreateConfig) *tasks.JoinParams {
-	config := &models.TaskJoinConfig{}
-
-	var path string
-	var args []string
-
-	// we explicitly specify the ID for the primary task so that it's the same as the containerID
-	config.ID = id
-
-	// Expand cmd into entrypoint and args
-	cmd := strslice.StrSlice(cc.Config.Cmd)
-	if len(cc.Config.Entrypoint) != 0 {
-		path, args = cc.Config.Entrypoint[0], append(cc.Config.Entrypoint[1:], cmd...)
-	} else {
-		path, args = cmd[0], cmd[1:]
-	}
-
-	// copy the path
-	config.Path = path
-
-	// copy the args
-	config.Args = make([]string, len(args))
-	copy(config.Args, args)
-
-	// copy the env array
-	config.Env = make([]string, len(cc.Config.Env))
-	copy(config.Env, cc.Config.Env)
-
-	// working dir
-	config.WorkingDir = cc.Config.WorkingDir
-
-	// user
-	config.User = cc.Config.User
-
-	// attach.  Always set to true otherwise we cannot attach later.
-	// this tells portlayer container is attachable.
-	config.Attach = true
-
-	// openstdin
-	config.OpenStdin = cc.Config.OpenStdin
-
-	// tty
-	config.Tty = cc.Config.Tty
-
-	// container stop signal
-	config.StopSignal = cc.Config.StopSignal
-
-	log.Debugf("dockerContainerCreateParamsToTask = %+v", config)
-
-	return tasks.NewJoinParamsWithContext(ctx).WithConfig(config)
-}
-
-func dockerContainerCreateParamsToPortlayer(cc types.ContainerCreateConfig, vc *viccontainer.VicContainer, imageStore string) *containers.CreateParams {
-	config := &models.ContainerCreateConfig{}
-
-	config.NumCpus = cc.HostConfig.CPUCount
-	config.MemoryMB = cc.HostConfig.Memory
-
-	// Layer/vmdk to use
-	config.Layer = vc.LayerID
-
-	// Image ID
-	config.Image = vc.ImageID
-
-	// Repo Requested
-	config.RepoName = cc.Config.Image
-
-	//copy friendly name
-	config.Name = cc.Name
-
-	// image store
-	config.ImageStore = &models.ImageStore{Name: imageStore}
-
-	// network
-	config.NetworkDisabled = cc.Config.NetworkDisabled
-
-	// Stuff the Docker labels into VIC container annotations
-	if len(cc.Config.Labels) > 0 {
-		convert.SetContainerAnnotation(config, convert.AnnotationKeyLabels, cc.Config.Labels)
-	}
-	// if autoremove then add to annotation
-	if cc.HostConfig.AutoRemove {
-		convert.SetContainerAnnotation(config, convert.AnnotationKeyAutoRemove, cc.HostConfig.AutoRemove)
-	}
-
-	// hostname
-	config.Hostname = cc.Config.Hostname
-	// domainname - https://github.com/moby/moby/issues/27067
-	config.Domainname = cc.Config.Domainname
-
-	log.Debugf("dockerContainerCreateParamsToPortlayer = %+v", config)
-
-	return containers.NewCreateParamsWithContext(ctx).WithCreateConfig(config)
-}
-
-func toModelsNetworkConfig(cc types.ContainerCreateConfig) *models.NetworkConfig {
-	if cc.Config.NetworkDisabled {
-		return nil
-	}
-
-	nc := &models.NetworkConfig{
-		NetworkName: cc.HostConfig.NetworkMode.NetworkName(),
-	}
-
-	// Docker supports link for bridge network and user defined network, we should handle that
-	if len(cc.HostConfig.Links) > 0 {
-		nc.Aliases = append(nc.Aliases, cc.HostConfig.Links...)
-	}
-
-	if cc.NetworkingConfig != nil {
-		log.Debugf("EndpointsConfig: %#v", cc.NetworkingConfig)
-
-		es, ok := cc.NetworkingConfig.EndpointsConfig[nc.NetworkName]
-		if ok {
-			if es.IPAMConfig != nil {
-				nc.Address = es.IPAMConfig.IPv4Address
-			}
-
-			// Pass Links and Aliases to PL
-			nc.Aliases = append(nc.Aliases, epoint.Alias(es)...)
-		}
-	}
-
-	for p := range cc.HostConfig.PortBindings {
-		nc.Ports = append(nc.Ports, fromPortbinding(p, cc.HostConfig.PortBindings[p])...)
-	}
-
-	return nc
-}
-
-// fromPortbinding translate Port/PortBinding pair to string array with format "hostPort:containerPort/protocol" or
-// "containerPort/protocol" if hostPort is empty
-// HostIP is ignored here, cause VCH ip address might change. Will query back real interface address in docker ps
-func fromPortbinding(port nat.Port, binding []nat.PortBinding) []string {
-	var portMappings []string
-	if len(binding) == 0 {
-		portMappings = append(portMappings, string(port))
-		return portMappings
-	}
-
-	proto, privatePort := nat.SplitProtoPort(string(port))
-	for _, bind := range binding {
-		var portMap string
-		if bind.HostPort != "" {
-			portMap = fmt.Sprintf("%s:%s/%s", bind.HostPort, privatePort, proto)
-		} else {
-			portMap = string(port)
-		}
-		portMappings = append(portMappings, portMap)
-	}
-	return portMappings
-}
-
-// processVolumeParam is used to turn any call from docker create -v <stuff> into a volumeFields object.
-// The -v has 3 forms. -v <anonymous mount path>, -v <Volume Name>:<Destination Mount Path> and
-// -v <Volume Name>:<Destination Mount Path>:<mount flags>
-func processVolumeParam(volString string) (volumeFields, error) {
-	volumeStrings := strings.Split(volString, ":")
-	fields := volumeFields{}
-
-	// Error out if the intended volume is a directory on the client filesystem.
-	numVolParams := len(volumeStrings)
-	if numVolParams > 1 && strings.HasPrefix(volumeStrings[0], "/") {
-		return volumeFields{}, InvalidVolumeError{}
-	}
-
-	// This switch determines which type of -v was invoked.
-	switch numVolParams {
-	case 1:
-		VolumeID, err := uuid.NewUUID()
-		if err != nil {
-			return fields, err
-		}
-		fields.ID = VolumeID.String()
-		fields.Dest = volumeStrings[0]
-		fields.Flags = "rw"
-	case 2:
-		fields.ID = volumeStrings[0]
-		fields.Dest = volumeStrings[1]
-		fields.Flags = "rw"
-	case 3:
-		fields.ID = volumeStrings[0]
-		fields.Dest = volumeStrings[1]
-		fields.Flags = volumeStrings[2]
-	default:
-		// NOTE: the docker cli should cover this case. This is here for posterity.
-		return volumeFields{}, InvalidBindError{volume: volString}
-	}
-	return fields, nil
-}
-
-// processVolumeFields parses fields for volume mappings specified in a create/run -v.
-// It returns a map of unique mountable volumes. This means that it removes dupes favoring
-// specified volumes over anonymous volumes.
-func processVolumeFields(volumes []string) (map[string]volumeFields, error) {
-	volumeFields := make(map[string]volumeFields)
-
-	for _, v := range volumes {
-		fields, err := processVolumeParam(v)
-		log.Infof("Processed volume arguments: %#v", fields)
-		if err != nil {
-			return nil, err
-		}
-		volumeFields[fields.Dest] = fields
-	}
-	return volumeFields, nil
-}
-
-func finalizeVolumeList(specifiedVolumes, anonymousVolumes []string) ([]volumeFields, error) {
-	log.Infof("Specified Volumes : %#v", specifiedVolumes)
-	processedVolumes, err := processVolumeFields(specifiedVolumes)
-	if err != nil {
-		return nil, err
-	}
-
-	log.Infof("anonymous Volumes : %#v", anonymousVolumes)
-	processedAnonVolumes, err := processVolumeFields(anonymousVolumes)
-	if err != nil {
-		return nil, err
-	}
-
-	//combine all volumes, specified volumes are taken over anonymous volumes
-	for k, v := range processedVolumes {
-		processedAnonVolumes[k] = v
-	}
-
-	finalizedVolumes := make([]volumeFields, 0, len(processedAnonVolumes))
-	for _, v := range processedAnonVolumes {
-		finalizedVolumes = append(finalizedVolumes, v)
-	}
-	return finalizedVolumes, nil
-}
-
-//-------------------------------------
-// Inspect Utility Functions
-//-------------------------------------
-
-// ContainerInfoToDockerContainerInspect takes a ContainerInfo swagger-based struct
-// returned from VIC's port layer and creates an engine-api based container inspect struct.
-// There maybe other asset gathering if ContainerInfo does not have all the information
-func ContainerInfoToDockerContainerInspect(vc *viccontainer.VicContainer, info *models.ContainerInfo, portlayerName string) (*types.ContainerJSON, error) {
-	if vc == nil || info == nil || info.ContainerConfig == nil {
-		return nil, NotFoundError(fmt.Sprintf("No such container: %s", vc.ContainerID))
-	}
-	// get the docker state
-	containerState := convert.State(info)
-
-	inspectJSON := &types.ContainerJSON{
-		ContainerJSONBase: &types.ContainerJSONBase{
-			State:           containerState,
-			ResolvConfPath:  "",
-			HostnamePath:    "",
-			HostsPath:       "",
-			Driver:          portlayerName,
-			MountLabel:      "",
-			ProcessLabel:    "",
-			AppArmorProfile: "",
-			ExecIDs:         vc.List(),
-			HostConfig:      hostConfigFromContainerInfo(vc, info, portlayerName),
-			GraphDriver:     types.GraphDriverData{Name: portlayerName},
-			SizeRw:          nil,
-			SizeRootFs:      nil,
-		},
-		Mounts:          mountsFromContainer(vc),
-		Config:          containerConfigFromContainerInfo(vc, info),
-		NetworkSettings: networkFromContainerInfo(vc, info),
-	}
-
-	if inspectJSON.NetworkSettings != nil {
-		log.Debugf("Docker inspect - network settings = %#v", inspectJSON.NetworkSettings)
-	} else {
-		log.Debug("Docker inspect - network settings = nil")
-	}
-
-	if info.ProcessConfig != nil {
-		inspectJSON.Path = info.ProcessConfig.ExecPath
-		if len(info.ProcessConfig.ExecArgs) > 0 {
-			// args[0] is the command and should not appear in the args list here
-			inspectJSON.Args = info.ProcessConfig.ExecArgs[1:]
-		}
-	}
-
-	if info.ContainerConfig != nil {
-		// set the status to the inspect expected values
-		containerState.Status = strings.ToLower(info.ContainerConfig.State)
-
-		// https://github.com/docker/docker/blob/master/container/state.go#L77
-		if containerState.Status == ContainerStopped {
-			containerState.Status = ContainerExited
-		}
-
-		inspectJSON.Image = info.ContainerConfig.ImageID
-		inspectJSON.LogPath = info.ContainerConfig.LogPath
-		inspectJSON.RestartCount = int(info.ContainerConfig.RestartCount)
-		inspectJSON.ID = info.ContainerConfig.ContainerID
-		inspectJSON.Created = time.Unix(info.ContainerConfig.CreateTime, 0).Format(time.RFC3339Nano)
-		if len(info.ContainerConfig.Names) > 0 {
-			inspectJSON.Name = fmt.Sprintf("/%s", info.ContainerConfig.Names[0])
-		}
-	}
-
-	return inspectJSON, nil
-}
-
-// hostConfigFromContainerInfo() gets the hostconfig that is passed to the backend during
-// docker create and updates any needed info
-func hostConfigFromContainerInfo(vc *viccontainer.VicContainer, info *models.ContainerInfo, portlayerName string) *container.HostConfig {
-	if vc == nil || vc.HostConfig == nil || info == nil {
-		return nil
-	}
-
-	// Create a copy of the created container's hostconfig.  This is passed in during
-	// container create
-	hostConfig := *vc.HostConfig
-
-	// Resources don't really map well to VIC so we leave most of them empty. If we look
-	// at the struct in engine-api/types/container/host_config.go, Microsoft added
-	// additional attributes to the struct that are applicable to Windows containers.
-	// If understanding VIC's host resources are desirable, we should go down this
-	// same route.
-	//
-	// The values we fill out below is an abridged list of the original struct.
-	resourceConfig := container.Resources{
-	// Applicable to all platforms
-	//			CPUShares int64 `json:"CpuShares"` // CPU shares (relative weight vs. other containers)
-	//			Memory    int64 // Memory limit (in bytes)
-
-	//			// Applicable to UNIX platforms
-	//			DiskQuota            int64           // Disk limit (in bytes)
-	}
-
-	hostConfig.VolumeDriver = portlayerName
-	hostConfig.Resources = resourceConfig
-	hostConfig.DNS = make([]string, 0)
-
-	if len(info.Endpoints) > 0 {
-		for _, ep := range info.Endpoints {
-			for _, dns := range ep.Nameservers {
-				if dns != "" {
-					hostConfig.DNS = append(hostConfig.DNS, dns)
-				}
-			}
-		}
-
-		hostConfig.NetworkMode = container.NetworkMode(info.Endpoints[0].Scope)
-	}
-
-	// Set this to json-file to force the docker CLI to allow us to use docker logs
-	hostConfig.LogConfig.Type = forceLogType
-
-	var err error
-	_, hostConfig.PortBindings, err = nat.ParsePortSpecs(info.HostConfig.Ports)
-	if err != nil {
-		log.Errorf("Failed to parse port mapping %s: %s", info.HostConfig.Ports, err)
-	}
-
-	// get the autoremove annotation from the container annotations
-	convert.ContainerAnnotation(info.ContainerConfig.Annotations, convert.AnnotationKeyAutoRemove, &hostConfig.AutoRemove)
-
-	return &hostConfig
-}
-
-// mountsFromContainer derives []types.MountPoint (used in inspect) from the cached container
-// data.
-func mountsFromContainer(vc *viccontainer.VicContainer) []types.MountPoint {
-	if vc == nil {
-		return nil
-	}
-
-	var mounts []types.MountPoint
-
-	rawAnonVolumes := make([]string, 0, len(vc.Config.Volumes))
-	for k := range vc.Config.Volumes {
-		rawAnonVolumes = append(rawAnonVolumes, k)
-	}
-
-	volList, err := finalizeVolumeList(vc.HostConfig.Binds, rawAnonVolumes)
-	if err != nil {
-		return mounts
-	}
-
-	for _, vol := range volList {
-		mountConfig := types.MountPoint{
-			Type:        mount.TypeVolume,
-			Driver:      DefaultVolumeDriver,
-			Name:        vol.ID,
-			Source:      vol.ID,
-			Destination: vol.Dest,
-			RW:          false,
-			Mode:        vol.Flags,
-		}
-
-		if strings.Contains(strings.ToLower(vol.Flags), "rw") {
-			mountConfig.RW = true
-		}
-		mounts = append(mounts, mountConfig)
-	}
-
-	return mounts
-}
-
-// containerConfigFromContainerInfo() returns a container.Config that has attributes
-// overridden at create or start time.  This is important.  This function is called
-// to help build the Container Inspect struct.  That struct contains the original
-// container config that is part of the image metadata AND the overridden container
-// config.  The user can override these via the remote API or the docker CLI.
-func containerConfigFromContainerInfo(vc *viccontainer.VicContainer, info *models.ContainerInfo) *container.Config {
-	if vc == nil || vc.Config == nil || info == nil || info.ContainerConfig == nil || info.ProcessConfig == nil {
-		return nil
-	}
-
-	// Copy the working copy of our container's config
-	container := *vc.Config
-
-	if info.ContainerConfig.ContainerID != "" {
-		container.Hostname = stringid.TruncateID(info.ContainerConfig.ContainerID) // Hostname
-	}
-	if info.ContainerConfig.AttachStdin != nil {
-		container.AttachStdin = *info.ContainerConfig.AttachStdin // Attach the standard input, makes possible user interaction
-	}
-	if info.ContainerConfig.AttachStdout != nil {
-		container.AttachStdout = *info.ContainerConfig.AttachStdout // Attach the standard output
-	}
-	if info.ContainerConfig.AttachStderr != nil {
-		container.AttachStderr = *info.ContainerConfig.AttachStderr // Attach the standard error
-	}
-	if info.ContainerConfig.Tty != nil {
-		container.Tty = *info.ContainerConfig.Tty // Attach standard streams to a tty, including stdin if it is not closed.
-	}
-	if info.ContainerConfig.OpenStdin != nil {
-		container.OpenStdin = *info.ContainerConfig.OpenStdin
-	}
-	// They are not coming from PL so set them to true unconditionally
-	container.StdinOnce = true
-
-	if info.ContainerConfig.RepoName != nil {
-		container.Image = *info.ContainerConfig.RepoName // Name of the image as it was passed by the operator (eg. could be symbolic)
-	}
-
-	// Fill in information about the process
-	if info.ProcessConfig.Env != nil {
-		container.Env = info.ProcessConfig.Env // List of environment variable to set in the container
-	}
-
-	if info.ProcessConfig.WorkingDir != nil {
-		container.WorkingDir = *info.ProcessConfig.WorkingDir // Current directory (PWD) in the command will be launched
-	}
-
-	container.User = info.ProcessConfig.User
-
-	// Fill in information about the container network
-	if info.Endpoints == nil {
-		container.NetworkDisabled = true
-	} else {
-		container.NetworkDisabled = false
-		container.MacAddress = ""
-		container.ExposedPorts = vc.Config.ExposedPorts
-	}
-
-	// Get the original container config from the image's metadata in our image cache.
-	var imageConfig *metadata.ImageConfig
-
-	if info.ContainerConfig.LayerID != "" {
-		// #nosec: Errors unhandled.
-		imageConfig, _ = cache.ImageCache().Get(info.ContainerConfig.LayerID)
-	}
-
-	// Fill in the values with defaults from the original image's container config
-	// structure
-	if imageConfig != nil {
-		container.StopSignal = imageConfig.ContainerConfig.StopSignal // Signal to stop a container
-
-		container.OnBuild = imageConfig.ContainerConfig.OnBuild // ONBUILD metadata that were defined on the image Dockerfile
-	}
-
-	// Pull labels from the annotation
-	convert.ContainerAnnotation(info.ContainerConfig.Annotations, convert.AnnotationKeyLabels, &container.Labels)
-	return &container
-}
-
-func networkFromContainerInfo(vc *viccontainer.VicContainer, info *models.ContainerInfo) *types.NetworkSettings {
-	networks := &types.NetworkSettings{
-		NetworkSettingsBase: types.NetworkSettingsBase{
-			Bridge:                 "",
-			SandboxID:              "",
-			HairpinMode:            false,
-			LinkLocalIPv6Address:   "",
-			LinkLocalIPv6PrefixLen: 0,
-			Ports:                  portMapFromVicContainer(vc),
-			SandboxKey:             "",
-			SecondaryIPAddresses:   nil,
-			SecondaryIPv6Addresses: nil,
-		},
-		Networks: make(map[string]*dnetwork.EndpointSettings),
-	}
-
-	shortCID := vc.ContainerID[0:ShortIDLen]
-
-	// Fill in as much info from the endpoint struct inside of the ContainerInfo.
-	// The rest of the data must be obtained from the Scopes portlayer.
-	for _, ep := range info.Endpoints {
-		netEp := &dnetwork.EndpointSettings{
-			IPAMConfig:          nil, //Get from Scope PL
-			Links:               nil,
-			Aliases:             nil,
-			NetworkID:           "", //Get from Scope PL
-			EndpointID:          ep.ID,
-			Gateway:             ep.Gateway,
-			IPAddress:           "",
-			IPPrefixLen:         0,  //Get from Scope PL
-			IPv6Gateway:         "", //Get from Scope PL
-			GlobalIPv6Address:   "", //Get from Scope PL
-			GlobalIPv6PrefixLen: 0,  //Get from Scope PL
-			MacAddress:          "", //Container endpoints currently do not have mac addr yet
-		}
-
-		if ep.Address != "" {
-			ip, ipnet, err := net.ParseCIDR(ep.Address)
-			if err == nil {
-				netEp.IPAddress = ip.String()
-				netEp.IPPrefixLen, _ = ipnet.Mask.Size()
-			}
-		}
-
-		if len(ep.Aliases) > 0 {
-			netEp.Aliases = make([]string, len(ep.Aliases))
-			found := false
-			for i, alias := range ep.Aliases {
-				netEp.Aliases[i] = alias
-				if alias == shortCID {
-					found = true
-				}
-			}
-
-			if !found {
-				netEp.Aliases = append(netEp.Aliases, vc.ContainerID[0:ShortIDLen])
-			}
-		}
-
-		networks.Networks[ep.Scope] = netEp
-	}
-
-	return networks
-}
-
-// portMapFromVicContainer() constructs a docker portmap from both the container's
-// hostconfig and config (both stored in VicContainer).  They are added and modified
-// during docker create.  This function creates a new map that is adheres to docker's
-// structure for types.NetworkSettings.Ports.
-func portMapFromVicContainer(vc *viccontainer.VicContainer) nat.PortMap {
-	var portMap nat.PortMap
-
-	if vc == nil {
-		return portMap
-	}
-
-	portMap = make(nat.PortMap)
-
-	// Iterate over the hostconfig that was set in docker create.  Get non-nil
-	// bindings and fix up ip addr and add to networks
-	if vc.HostConfig != nil && vc.HostConfig.PortBindings != nil {
-		//		networks.Ports = vc.HostConfig.PortBindings
-		for port, portbindings := range vc.HostConfig.PortBindings {
-
-			var newbindings []nat.PortBinding
-
-			for _, binding := range portbindings {
-				nb := binding
-
-				// Check host IP.  VIC only support 0.0.0.0
-				if nb.HostIP == "" {
-					nb.HostIP = "0.0.0.0"
-				}
-
-				newbindings = append(newbindings, nb)
-			}
-
-			portMap[port] = newbindings
-		}
-	}
-
-	// Iterate over the container's original image config.  This is the set of
-	// exposed ports.  For ports that were not in hostConfig, we assign value of
-	// nil.  This appears to be the behavior of regular docker.
-	if vc.Config != nil {
-		for port := range vc.Config.ExposedPorts {
-			if _, ok := portMap[port]; ok {
-				continue
-			}
-
-			portMap[port] = nil
-		}
-	}
-
-	return portMap
-}
-
-func ContainerInfoToVicContainer(info models.ContainerInfo) *viccontainer.VicContainer {
-	log.Debugf("Convert container info to vic container")
-
-	vc := viccontainer.NewVicContainer()
-
-	var name string
-	if len(info.ContainerConfig.Names) > 0 {
-		vc.Name = info.ContainerConfig.Names[0]
-	}
-	log.Debugf("Container %q", name)
-
-	if info.ContainerConfig.LayerID != "" {
-		vc.LayerID = info.ContainerConfig.LayerID
-	}
-
-	if info.ContainerConfig.ImageID != "" {
-		vc.ImageID = info.ContainerConfig.ImageID
-	}
-
-	if info.ContainerConfig.ContainerID != "" {
-		vc.ContainerID = info.ContainerConfig.ContainerID
-	}
-
-	tempVC := viccontainer.NewVicContainer()
-	tempVC.HostConfig = &container.HostConfig{}
-	vc.Config = containerConfigFromContainerInfo(tempVC, &info)
-	vc.HostConfig = hostConfigFromContainerInfo(tempVC, &info, PortLayerName())
-
-	// FIXME: duplicate Config.Volumes and HostConfig.Binds here for can not derive them from persisted value right now.
-	// get volumes from volume config
-	vc.Config.Volumes = make(map[string]struct{}, len(info.VolumeConfig))
-	vc.HostConfig.Binds = []string{}
-	for _, volume := range info.VolumeConfig {
-		mount := getMountString(volume.Name, volume.MountPoint, volume.Flags[constants.Mode])
-		vc.Config.Volumes[mount] = struct{}{}
-		vc.HostConfig.Binds = append(vc.HostConfig.Binds, mount)
-		log.Debugf("add volume mount %s to config.volumes and hostconfig.binds", mount)
-	}
-
-	vc.Config.Cmd = info.ProcessConfig.ExecArgs
-
-	return vc
-}
-
-func getMountString(mounts ...string) string {
-	return strings.Join(mounts, ":")
-}
-
-//------------------------------------
-// ContainerAttach() Utility Functions
-//------------------------------------
-
-func copyStdIn(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdin io.ReadCloser, keys []byte) error {
-	// Pipe for stdin so we can interject and watch the input streams for detach keys.
-	stdinReader, stdinWriter := io.Pipe()
-	defer stdinReader.Close()
-
-	var detach bool
-
-	done := make(chan struct{})
-	go func() {
-		// make sure we get out of io.Copy if context is canceled
-		select {
-		case <-ctx.Done():
-			// This will cause the transport to the API client to be shut down, so all output
-			// streams will get closed as well.
-			// See the closer in container_routes.go:postContainersAttach
-
-			// We're closing this here to disrupt the io.Copy below
-			// TODO: seems like we should be providing an io.Copy impl with ctx argument that honors
-			// cancelation with the amount of code dedicated to working around it
-
-			// TODO: I think this still leaves a race between closing of the API client transport and
-			// copying of the output streams, it's just likely the error will be dropped as the transport is
-			// closed when it occurs.
-			// We should move away from needing to close transports to interrupt reads.
-			stdin.Close()
-		case <-done:
-		}
-	}()
-
-	go func() {
-		defer close(done)
-		defer stdinWriter.Close()
-
-		// Copy the stdin from the CLI and write to a pipe.  We need to do this so we can
-		// watch the stdin stream for the detach keys.
-		var err error
-
-		// Write some init bytes into the pipe to force Swagger to make the initial
-		// call to the portlayer, prior to any user input in whatever attach client
-		// he/she is using.
-		log.Debugf("copyStdIn writing primer bytes")
-		stdinWriter.Write([]byte(attachStdinInitString))
-		if ac.UseTty {
-			_, err = copyEscapable(stdinWriter, stdin, keys)
-		} else {
-			_, err = io.Copy(stdinWriter, stdin)
-		}
-
-		if err != nil {
-			if _, ok := err.(DetachError); ok {
-				log.Infof("stdin detach detected")
-				detach = true
-			} else {
-				log.Errorf("stdin err: %s", err)
-			}
-		}
-	}()
-
-	id := ac.ID
-
-	// Swagger wants an io.reader so give it the reader pipe.  Also, the swagger call
-	// to set the stdin is synchronous so we need to run in a goroutine
-	setStdinParams := interaction.NewContainerSetStdinParamsWithContext(ctx).WithID(id)
-	setStdinParams = setStdinParams.WithRawStream(stdinReader)
-
-	_, err := pl.Interaction.ContainerSetStdin(setStdinParams)
-	<-done
-
-	if ac.CloseStdin && !ac.UseTty {
-		// Close the stdin connection.  Mimicing Docker's behavior.
-		log.Errorf("Attach stream has stdinOnce set.  Closing the stdin.")
-		params := interaction.NewContainerCloseStdinParamsWithContext(ctx).WithID(id)
-		_, err := pl.Interaction.ContainerCloseStdin(params)
-		if err != nil {
-			log.Errorf("CloseStdin failed with %s", err)
-		}
-	}
-
-	// ignore the portlayer error when it is DetachError as that is what we should return to the caller when we detach
-	if detach {
-		return DetachError{}
-	}
-
-	return err
-}
-
-func copyStdOut(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stdout io.Writer, attemptTimeout time.Duration) error {
-	id := ac.ID
-
-	//Calculate how much time to let portlayer attempt
-	plAttemptTimeout := attemptTimeout - attachPLAttemptDiff //assumes personality deadline longer than portlayer's deadline
-	plAttemptDeadline := time.Now().Add(plAttemptTimeout)
-	swaggerDeadline := strfmt.DateTime(plAttemptDeadline)
-	log.Debugf("* stdout portlayer deadline: %s", plAttemptDeadline.Format(time.UnixDate))
-	log.Debugf("* stdout personality deadline: %s", time.Now().Add(attemptTimeout).Format(time.UnixDate))
-
-	log.Debugf("* stdout attach start %s", time.Now().Format(time.UnixDate))
-	getStdoutParams := interaction.NewContainerGetStdoutParamsWithContext(ctx).WithID(id).WithDeadline(&swaggerDeadline)
-	_, err := pl.Interaction.ContainerGetStdout(getStdoutParams, stdout)
-	log.Debugf("* stdout attach end %s", time.Now().Format(time.UnixDate))
-	if err != nil {
-		if _, ok := err.(*interaction.ContainerGetStdoutNotFound); ok {
-			return ResourceNotFoundError(id, "interaction connection")
-		}
-
-		return InternalServerError(err.Error())
-	}
-
-	return nil
-}
-
-func copyStdErr(ctx context.Context, pl *client.PortLayer, ac *AttachConfig, stderr io.Writer) error {
-	id := ac.ID
-
-	getStderrParams := interaction.NewContainerGetStderrParamsWithContext(ctx).WithID(id)
-	_, err := pl.Interaction.ContainerGetStderr(getStderrParams, stderr)
-	if err != nil {
-		if _, ok := err.(*interaction.ContainerGetStderrNotFound); ok {
-			ResourceNotFoundError(id, "interaction connection")
-		}
-
-		return InternalServerError(err.Error())
-	}
-
-	return nil
-}
-
-// FIXME: Move this function to a pkg to show it's origination from Docker once
-// we have ignore capabilities in our header-check.sh that checks for copyright
-// header.
-// Code c/c from io.Copy() modified by Docker to handle escape sequence
-// Begin
-
-// DetachError is special error which returned in case of container detach.
-type DetachError struct{}
-
-func (DetachError) Error() string {
-	return "detached from container"
-}
-
-func copyEscapable(dst io.Writer, src io.ReadCloser, keys []byte) (written int64, err error) {
-	if len(keys) == 0 {
-		// Default keys : ctrl-p ctrl-q
-		keys = []byte{16, 17}
-	}
-	buf := make([]byte, 32*1024)
-	for {
-		nr, er := src.Read(buf)
-		if nr > 0 {
-			// ---- Docker addition
-			preservBuf := []byte{}
-			for i, key := range keys {
-				preservBuf = append(preservBuf, buf[0:nr]...)
-				if nr != 1 || buf[0] != key {
-					break
-				}
-				if i == len(keys)-1 {
-					src.Close()
-					return 0, DetachError{}
-				}
-				nr, er = src.Read(buf)
-			}
-			var nw int
-			var ew error
-			if len(preservBuf) > 0 {
-				nw, ew = dst.Write(preservBuf)
-				nr = len(preservBuf)
-			} else {
-				// ---- End of docker
-				nw, ew = dst.Write(buf[0:nr])
-			}
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		if er == io.EOF {
-			break
-		}
-		if er != nil {
-			err = er
-			break
-		}
-	}
-	return written, err
-}
-
-// End
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy_test.go
deleted file mode 100644
index 02d203881b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_proxy_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"testing"
-
-	"github.com/docker/go-connections/nat"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestProcessVolumeParams(t *testing.T) {
-	rawTestVolumes := []string{"/blah", "testVolume:/mount", "testVolume:/mount/path:r"}
-	invalidVolume := "/dir:/dir"
-	var processedTestVolumes []volumeFields
-
-	for _, testString := range rawTestVolumes {
-		processedFields, err := processVolumeParam(testString)
-		assert.Nil(t, err)
-		processedTestVolumes = append(processedTestVolumes, processedFields)
-	}
-	assert.Equal(t, 3, len(processedTestVolumes))
-
-	assert.NotEmpty(t, processedTestVolumes[0].ID)
-	assert.Equal(t, "/blah", processedTestVolumes[0].Dest)
-	assert.Equal(t, "rw", processedTestVolumes[0].Flags)
-
-	assert.Equal(t, "testVolume", processedTestVolumes[1].ID)
-	assert.Equal(t, "/mount", processedTestVolumes[1].Dest)
-	assert.Equal(t, "rw", processedTestVolumes[1].Flags)
-
-	assert.Equal(t, "testVolume", processedTestVolumes[2].ID)
-	assert.Equal(t, "/mount/path", processedTestVolumes[2].Dest)
-	assert.Equal(t, "r", processedTestVolumes[2].Flags)
-
-	invalidFields, _ := processVolumeParam(invalidVolume)
-	assert.Equal(t, volumeFields{}, invalidFields)
-}
-
-func TestPort(t *testing.T) {
-	portMap, bindingMap, err := nat.ParsePortSpecs([]string{
-		"1236:1235/tcp",
-		"1237:1235/tcp",
-		"2345/udp", "80",
-		"127.0.0.1::8080",
-		"127.0.0.1:5279:8080",
-	})
-	if err != nil {
-		t.Errorf("Failed to parse ports: %s", err.Error())
-	}
-	t.Logf("portMap: %s", portMap)
-	t.Logf("bindingMap: %s", bindingMap)
-
-	for p := range bindingMap {
-		expected := bindingMap[p]
-		for i := range expected {
-			expected[i].HostIP = ""
-		}
-
-		bindings := fromPortbinding(p, bindingMap[p])
-		t.Logf("binding: %s", bindings)
-		_, outMap, err := nat.ParsePortSpecs(bindings)
-		if err != nil {
-			t.Errorf("Failed to parse back string bindings: %s", err)
-		}
-		for op := range outMap {
-			assert.Equal(t, outMap[op], bindingMap[op])
-		}
-
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_test.go
deleted file mode 100644
index 58e7c40f1e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/container_test.go
+++ /dev/null
@@ -1,782 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"testing"
-	"time"
-
-	"context"
-
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	dnetwork "github.com/docker/docker/api/types/network"
-	"github.com/docker/docker/reference"
-	"github.com/docker/go-connections/nat"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/go-openapi/runtime"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	viccontainer "github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/convert"
-	plclient "github.com/vmware/vic/lib/apiservers/portlayer/client"
-	plscopes "github.com/vmware/vic/lib/apiservers/portlayer/client/scopes"
-	plmodels "github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-//***********
-// Mock proxy
-//***********
-
-type CreateHandleMockData struct {
-	createInputID   string
-	retID           string
-	retHandle       string
-	retErr          error
-	createErrSubstr string
-}
-
-type AddToScopeMockData struct {
-	createInputID   string
-	retHandle       string
-	retErr          error
-	createErrSubstr string
-}
-
-type AddVolumesMockData struct {
-	retHandle       string
-	retErr          error
-	createErrSubstr string
-}
-
-type AddInteractionMockData struct {
-	retHandle       string
-	retErr          error
-	createErrSubstr string
-}
-
-type AddLoggingMockData struct {
-	retHandle       string
-	retErr          error
-	createErrSubstr string
-}
-
-type CommitHandleMockData struct {
-	createInputID   string
-	createErrSubstr string
-
-	retErr error
-}
-
-type LogMockData struct {
-	continaerID string
-	running     bool
-}
-
-type MockContainerProxy struct {
-	mockRespIndices        []int
-	mockCreateHandleData   []CreateHandleMockData
-	mockAddToScopeData     []AddToScopeMockData
-	mockAddVolumesData     []AddVolumesMockData
-	mockAddInteractionData []AddInteractionMockData
-	mockAddLoggingData     []AddLoggingMockData
-	mockCommitData         []CommitHandleMockData
-}
-
-const (
-	SUCCESS             = 0
-	dummyContainerID    = "abc123"
-	dummyContainerIDTTY = "tty123"
-	fakeContainerID     = ""
-)
-
-var dummyContainers = []string{dummyContainerID, dummyContainerIDTTY}
-
-func NewMockContainerProxy() *MockContainerProxy {
-	return &MockContainerProxy{
-		mockRespIndices:        make([]int, 6),
-		mockCreateHandleData:   MockCreateHandleData(),
-		mockAddToScopeData:     MockAddToScopeData(),
-		mockAddVolumesData:     MockAddVolumesData(),
-		mockAddInteractionData: MockAddInteractionData(),
-		mockAddLoggingData:     MockAddLoggingData(),
-		mockCommitData:         MockCommitData(),
-	}
-}
-
-func MockCreateHandleData() []CreateHandleMockData {
-
-	createHandleTimeoutErr := runtime.NewAPIError("unknown error", "context deadline exceeded", http.StatusServiceUnavailable)
-
-	mockCreateHandleData := []CreateHandleMockData{
-		{"busybox", "321cba", "handle", nil, ""},
-		{"busybox", "", "", derr.NewRequestNotFoundError(fmt.Errorf("No such image: abc123")), "No such image"},
-		{"busybox", "", "", derr.NewErrorWithStatusCode(createHandleTimeoutErr, http.StatusInternalServerError), "context deadline exceeded"},
-	}
-
-	return mockCreateHandleData
-}
-
-func MockAddToScopeData() []AddToScopeMockData {
-	addToScopeNotFound := plscopes.AddContainerNotFound{
-		Payload: &plmodels.Error{
-			Message: "Scope not found",
-		},
-	}
-
-	addToScopeNotFoundErr := fmt.Errorf("ContainerProxy.AddContainerToScope: Scopes error: %s", addToScopeNotFound.Error())
-
-	addToScopeTimeout := plscopes.AddContainerInternalServerError{
-		Payload: &plmodels.Error{
-			Message: "context deadline exceeded",
-		},
-	}
-
-	addToScopeTimeoutErr := fmt.Errorf("ContainerProxy.AddContainerToScope: Scopes error: %s", addToScopeTimeout.Error())
-
-	mockAddToScopeData := []AddToScopeMockData{
-		{"busybox", "handle", nil, ""},
-		{"busybox", "handle", derr.NewErrorWithStatusCode(fmt.Errorf("container.ContainerCreate failed to create a portlayer client"), http.StatusInternalServerError), "failed to create a portlayer"},
-		{"busybox", "handle", derr.NewErrorWithStatusCode(addToScopeNotFoundErr, http.StatusInternalServerError), "Scope not found"},
-		{"busybox", "handle", derr.NewErrorWithStatusCode(addToScopeTimeoutErr, http.StatusInternalServerError), "context deadline exceeded"},
-	}
-
-	return mockAddToScopeData
-}
-
-func MockAddVolumesData() []AddVolumesMockData {
-	return nil
-}
-
-func MockAddInteractionData() []AddInteractionMockData {
-	return nil
-}
-
-func MockAddLoggingData() []AddLoggingMockData {
-	return nil
-}
-
-func MockCommitData() []CommitHandleMockData {
-	noSuchImageErr := fmt.Errorf("No such image: busybox")
-
-	mockCommitData := []CommitHandleMockData{
-		{"buxybox", "", nil},
-		{"busybox", "failed to create a portlayer", derr.NewErrorWithStatusCode(fmt.Errorf("container.ContainerCreate failed to create a portlayer client"), http.StatusInternalServerError)},
-		{"busybox", "No such image", derr.NewRequestNotFoundError(noSuchImageErr)},
-	}
-
-	return mockCommitData
-}
-
-func (m *MockContainerProxy) GetMockDataCount() (int, int, int, int) {
-	return len(m.mockCreateHandleData), len(m.mockAddToScopeData), len(m.mockAddVolumesData), len(m.mockCommitData)
-}
-
-func (m *MockContainerProxy) SetMockDataResponse(createHandleResp int, addToScopeResp int, addVolumeResp int, addInteractionResp int, addLoggingResp int, commitContainerResp int) {
-	m.mockRespIndices[0] = createHandleResp
-	m.mockRespIndices[1] = addToScopeResp
-	m.mockRespIndices[2] = addVolumeResp
-	m.mockRespIndices[3] = addInteractionResp
-	m.mockRespIndices[4] = addLoggingResp
-	m.mockRespIndices[5] = commitContainerResp
-}
-
-func (m *MockContainerProxy) Handle(id, name string) (string, error) {
-	return "", nil
-}
-
-func (m *MockContainerProxy) CreateContainerHandle(vc *viccontainer.VicContainer, config types.ContainerCreateConfig) (string, string, error) {
-	respIdx := m.mockRespIndices[0]
-
-	if respIdx >= len(m.mockCreateHandleData) {
-		return "", "", nil
-	}
-	return m.mockCreateHandleData[respIdx].retID, m.mockCreateHandleData[respIdx].retHandle, m.mockCreateHandleData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) CreateContainerTask(handle string, id string, config types.ContainerCreateConfig) (string, error) {
-	respIdx := m.mockRespIndices[0]
-
-	if respIdx >= len(m.mockCreateHandleData) {
-		return "", nil
-	}
-	return m.mockCreateHandleData[respIdx].retHandle, m.mockCreateHandleData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) AddContainerToScope(handle string, config types.ContainerCreateConfig) (string, error) {
-	respIdx := m.mockRespIndices[1]
-
-	if respIdx >= len(m.mockAddToScopeData) {
-		return "", nil
-	}
-
-	return m.mockAddToScopeData[respIdx].retHandle, m.mockAddToScopeData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) AddVolumesToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	respIdx := m.mockRespIndices[2]
-
-	if respIdx >= len(m.mockAddVolumesData) {
-		return "", nil
-	}
-
-	return m.mockAddVolumesData[respIdx].retHandle, m.mockAddVolumesData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) AddInteractionToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	respIdx := m.mockRespIndices[3]
-
-	if respIdx >= len(m.mockAddInteractionData) {
-		return "", nil
-	}
-
-	return m.mockAddInteractionData[respIdx].retHandle, m.mockAddInteractionData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) AddLoggingToContainer(handle string, config types.ContainerCreateConfig) (string, error) {
-	respIdx := m.mockRespIndices[4]
-
-	if respIdx >= len(m.mockAddLoggingData) {
-		return "", nil
-	}
-
-	return m.mockAddLoggingData[respIdx].retHandle, m.mockAddLoggingData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) BindInteraction(handle string, name string, id string) (string, error) {
-	return "", nil
-}
-
-func (m *MockContainerProxy) CreateExecTask(handle string, config *types.ExecConfig) (string, string, error) {
-	return "", "", nil
-}
-
-func (m *MockContainerProxy) UnbindInteraction(handle string, name string, id string) (string, error) {
-	return "", nil
-}
-
-func (m *MockContainerProxy) CommitContainerHandle(handle, containerID string, waitTime int32) error {
-	respIdx := m.mockRespIndices[5]
-
-	if respIdx >= len(m.mockCommitData) {
-		return nil
-	}
-
-	return m.mockCommitData[respIdx].retErr
-}
-
-func (m *MockContainerProxy) Client() *plclient.PortLayer {
-	return nil
-}
-
-func (m *MockContainerProxy) StreamContainerLogs(_ context.Context, name string, out io.Writer, started chan struct{}, showTimestamps bool, followLogs bool, since int64, tailLines int64) error {
-	if name == "" {
-		return fmt.Errorf("sample error message")
-	}
-
-	var lineCount int64 = 10
-
-	close(started)
-
-	for i := int64(0); i < lineCount; i++ {
-		if !followLogs && i > tailLines {
-			break
-		}
-		if followLogs && i > tailLines {
-			time.Sleep(500 * time.Millisecond)
-		}
-
-		fmt.Fprintf(out, "line %d\n", i)
-	}
-
-	return nil
-}
-
-func (m *MockContainerProxy) Stop(vc *viccontainer.VicContainer, name string, seconds *int, unbound bool) error {
-	return nil
-}
-
-func (m *MockContainerProxy) State(vc *viccontainer.VicContainer) (*types.ContainerState, error) {
-	// Assume container is running if container in cache.  If we need other conditions
-	// in the future, we can add it, but for now, just assume running.
-	c := cache.ContainerCache().GetContainer(vc.ContainerID)
-
-	if c == nil {
-		return nil, nil
-	}
-
-	state := &types.ContainerState{
-		Running: true,
-	}
-	return state, nil
-}
-
-func (m *MockContainerProxy) Wait(vc *viccontainer.VicContainer, timeout time.Duration) (*types.ContainerState, error) {
-	dockerState := &types.ContainerState{ExitCode: 0}
-	return dockerState, nil
-}
-
-func (m *MockContainerProxy) Signal(vc *viccontainer.VicContainer, sig uint64) error {
-	return nil
-}
-
-func (m *MockContainerProxy) Resize(id string, height, width int32) error {
-	return nil
-}
-
-func (m *MockContainerProxy) Rename(vc *viccontainer.VicContainer, newName string) error {
-	return nil
-}
-
-func (m *MockContainerProxy) AttachStreams(ctx context.Context, ac *AttachConfig, clStdin io.ReadCloser, clStdout, clStderr io.Writer) error {
-	return nil
-}
-
-func (m *MockContainerProxy) StreamContainerStats(ctx context.Context, config *convert.ContainerStatsConfig) error {
-	return nil
-}
-
-func (m *MockContainerProxy) StatPath(op trace.Operation, sotre, deviceID string, filterSpec archive.FilterSpec) (*types.ContainerPathStat, error) {
-	return nil, nil
-}
-
-func (m *MockContainerProxy) GetContainerChanges(op trace.Operation, vc *viccontainer.VicContainer, data bool) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (m *MockContainerProxy) UnbindContainerFromNetwork(vc *viccontainer.VicContainer, handle string) (string, error) {
-	return "", nil
-}
-
-func (m *MockContainerProxy) exitCode(vc *viccontainer.VicContainer) (string, error) {
-	return "", nil
-}
-
-func AddMockImageToCache() {
-	mockImage := &metadata.ImageConfig{
-		ImageID:   "e732471cb81a564575aad46b9510161c5945deaf18e9be3db344333d72f0b4b2",
-		Name:      "busybox",
-		Tags:      []string{"latest"},
-		Reference: "busybox:latest",
-	}
-	mockImage.Config = &container.Config{
-		Hostname:     "55cd1f8f6e5b",
-		Domainname:   "",
-		User:         "",
-		AttachStdin:  false,
-		AttachStdout: false,
-		AttachStderr: false,
-		Tty:          false,
-		OpenStdin:    false,
-		StdinOnce:    false,
-		Env:          []string{"PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"},
-		Cmd:          []string{"sh"},
-		Image:        "sha256:e732471cb81a564575aad46b9510161c5945deaf18e9be3db344333d72f0b4b2",
-		Volumes:      nil,
-		WorkingDir:   "",
-		Entrypoint:   nil,
-		OnBuild:      nil,
-	}
-
-	cache.ImageCache().Add(mockImage)
-
-	ref, _ := reference.ParseNamed(mockImage.Reference)
-	cache.RepositoryCache().AddReference(ref, mockImage.ImageID, false, mockImage.ImageID, false)
-}
-
-func AddMockContainerToCache() {
-	AddMockImageToCache()
-
-	image, err := cache.ImageCache().Get("e732471cb81a564575aad46b9510161c5945deaf18e9be3db344333d72f0b4b2")
-	if err == nil {
-		vc := viccontainer.NewVicContainer()
-		vc.ImageID = image.ID
-		vc.Config = image.Config //Set defaults.  Overrides will get copied below.
-		vc.Config.Tty = false
-		vc.ContainerID = dummyContainerID
-		cache.ContainerCache().AddContainer(vc)
-
-		vc = viccontainer.NewVicContainer()
-		vc.ImageID = image.ID
-		vc.Config = image.Config
-		vc.Config.Tty = true
-		vc.ContainerID = dummyContainerIDTTY
-		cache.ContainerCache().AddContainer(vc)
-
-		vc = viccontainer.NewVicContainer()
-		vc.ImageID = image.ID
-		vc.Config = image.Config
-		vc.Config.Tty = false
-		vc.ContainerID = fakeContainerID
-		cache.ContainerCache().AddContainer(vc)
-	}
-}
-
-//***********
-// Tests
-//***********
-
-// TestContainerCreateEmptyImageCache() attempts a ContainerCreate() with an empty image
-// cache
-func TestContainerCreateEmptyImageCache(t *testing.T) {
-	mockContainerProxy := NewMockContainerProxy()
-
-	// Create our personality Container backend
-	cb := &Container{
-		containerProxy: mockContainerProxy,
-	}
-
-	// mock a container create config
-	var config types.ContainerCreateConfig
-
-	config.HostConfig = &container.HostConfig{}
-	config.Config = &container.Config{}
-	config.NetworkingConfig = &dnetwork.NetworkingConfig{}
-	config.Config.Image = "busybox"
-
-	_, err := cb.ContainerCreate(config)
-
-	assert.Contains(t, err.Error(), "No such image", "Error (%s) should have 'No such image' for an empty image cache", err.Error())
-}
-
-// TestCreateHandle() cycles through all possible input/outputs for creating a handle
-// and calls vicbackends.ContainerCreate().  The idea is that if creating handle fails
-// then vicbackends.ContainerCreate() should return errors from that.
-func TestCreateHandle(t *testing.T) {
-	mockContainerProxy := NewMockContainerProxy()
-
-	// Create our personality Container backend
-	cb := &Container{
-		containerProxy: mockContainerProxy,
-	}
-
-	AddMockImageToCache()
-
-	// mock a container create config
-	var config types.ContainerCreateConfig
-
-	config.HostConfig = &container.HostConfig{}
-	config.Config = &container.Config{}
-	config.NetworkingConfig = &dnetwork.NetworkingConfig{}
-
-	mockCreateHandleData := MockCreateHandleData()
-
-	// Iterate over create handler responses and see what the composite ContainerCreate()
-	// returns.  Since the handle is the first operation, we expect to receive a create handle
-	// error.
-	count, _, _, _ := mockContainerProxy.GetMockDataCount()
-
-	for i := 0; i < count; i++ {
-		if i == SUCCESS { //skip success case
-			continue
-		}
-
-		mockContainerProxy.SetMockDataResponse(i, 0, 0, 0, 0, 0)
-		config.Config.Image = mockCreateHandleData[i].createInputID
-		_, err := cb.ContainerCreate(config)
-
-		assert.Contains(t, err.Error(), mockCreateHandleData[i].createErrSubstr)
-	}
-}
-
-// TestContainerAddToScope() assumes container handle create succeeded and cycles through all
-// possible input/outputs for adding container to scope and calls vicbackends.ContainerCreate()
-func TestContainerAddToScope(t *testing.T) {
-	mockContainerProxy := NewMockContainerProxy()
-
-	// Create our personality Container backend
-	cb := &Container{
-		containerProxy: mockContainerProxy,
-	}
-
-	AddMockImageToCache()
-
-	// mock a container create config
-	var config types.ContainerCreateConfig
-
-	config.HostConfig = &container.HostConfig{}
-	config.Config = &container.Config{}
-	config.NetworkingConfig = &dnetwork.NetworkingConfig{}
-
-	mockAddToScopeData := MockAddToScopeData()
-
-	// Iterate over create handler responses and see what the composite ContainerCreate()
-	// returns.  Since the handle is the first operation, we expect to receive a create handle
-	// error.
-	_, count, _, _ := mockContainerProxy.GetMockDataCount()
-
-	for i := 0; i < count; i++ {
-		if i == SUCCESS { //skip success case
-			continue
-		}
-
-		mockContainerProxy.SetMockDataResponse(0, i, 0, 0, 0, 0)
-		config.Config.Image = mockAddToScopeData[i].createInputID
-		_, err := cb.ContainerCreate(config)
-
-		assert.Contains(t, err.Error(), mockAddToScopeData[i].createErrSubstr)
-	}
-}
-
-// TestContainerAddVolumes() assumes container handle create succeeded and cycles through all
-// possible input/outputs for committing the handle and calls vicbackends.ContainerCreate()
-func TestCommitHandle(t *testing.T) {
-	mockContainerProxy := NewMockContainerProxy()
-
-	// Create our personality Container backend
-	cb := &Container{
-		containerProxy: mockContainerProxy,
-	}
-
-	AddMockImageToCache()
-
-	// mock a container create config
-	var config types.ContainerCreateConfig
-
-	config.HostConfig = &container.HostConfig{}
-	config.Config = &container.Config{}
-	config.NetworkingConfig = &dnetwork.NetworkingConfig{}
-
-	mockCommitHandleData := MockCommitData()
-
-	// Iterate over create handler responses and see what the composite ContainerCreate()
-	// returns.  Since the handle is the first operation, we expect to receive a create handle
-	// error.
-	_, _, _, count := mockContainerProxy.GetMockDataCount()
-
-	for i := 0; i < count; i++ {
-		if i == SUCCESS { //skip success case
-			continue
-		}
-
-		mockContainerProxy.SetMockDataResponse(0, 0, 0, 0, 0, i)
-		config.Config.Image = mockCommitHandleData[i].createInputID
-		_, err := cb.ContainerCreate(config)
-
-		assert.Contains(t, err.Error(), mockCommitHandleData[i].createErrSubstr)
-	}
-
-}
-
-// TestContainerLogs() tests the docker logs api when user asks for entire log
-func TestContainerLogs(t *testing.T) {
-	mockContainerProxy := NewMockContainerProxy()
-
-	// Create our personality Container backend
-	cb := &Container{
-		containerProxy: mockContainerProxy,
-	}
-
-	// Prepopulate our image and container cache with dummy data
-	AddMockContainerToCache()
-
-	// Create a buffer io.writer
-	var writer bytes.Buffer
-
-	successDuration := 1 * time.Second
-
-	// Create our mock table
-	mockData := []struct {
-		Config          backend.ContainerLogsConfig
-		ExpectedSuccess bool
-		ExpectedFollow  bool
-	}{
-		{
-			Config: backend.ContainerLogsConfig{
-				ContainerLogsOptions: types.ContainerLogsOptions{
-					ShowStdout: true,
-					ShowStderr: true,
-					Tail:       "all",
-				},
-				OutStream: &writer,
-			},
-			ExpectedSuccess: true,
-			ExpectedFollow:  false,
-		},
-		{
-			Config: backend.ContainerLogsConfig{
-				ContainerLogsOptions: types.ContainerLogsOptions{
-					ShowStdout: false,
-					ShowStderr: false,
-				},
-				OutStream: &writer,
-			},
-			ExpectedSuccess: false,
-			ExpectedFollow:  false,
-		},
-		{
-			Config: backend.ContainerLogsConfig{
-				ContainerLogsOptions: types.ContainerLogsOptions{
-					ShowStdout: true,
-					ShowStderr: true,
-					Follow:     true,
-				},
-				OutStream: &writer,
-			},
-			ExpectedSuccess: true,
-			ExpectedFollow:  true,
-		},
-	}
-
-	for _, containerID := range dummyContainers {
-		for _, data := range mockData {
-			started := make(chan struct{})
-
-			start := time.Now()
-			err := cb.ContainerLogs(context.TODO(), containerID, &data.Config, started)
-			end := time.Now()
-
-			select {
-			case <-started:
-			default:
-				close(started)
-			}
-
-			if data.ExpectedSuccess {
-				assert.Nil(t, err, "Expected success, but got error, config: %#v", data.Config)
-			} else {
-				assert.NotEqual(t, err, nil, "Expected error but received nil, config: %#v", data.Config)
-			}
-
-			immediate := start.Add(successDuration)
-
-			didFollow := immediate.Before(end) //determines if logs continued to stream
-
-			if data.ExpectedFollow {
-				assert.True(t, didFollow, "Expected logs to follow but didn't (%s, %s), config: %#v", start.String(), end.String(), data.Config)
-			} else {
-				assert.False(t, didFollow, "Expected logs to NOT follow but it did, config: %#v", data.Config)
-			}
-		}
-	}
-
-	// Check that ContainerLogs *does not* return an error if StreamContainerLogs
-	// returns an error. Here, the config is valid and the container is in the
-	// cache, so the only error will come from StreamContainerLogs. Since the
-	// containerID = "", StreamContainerLogs will return an error.
-	started := make(chan struct{})
-	err := cb.ContainerLogs(context.TODO(), fakeContainerID, &mockData[0].Config, started)
-	assert.NoError(t, err)
-}
-
-func TestPortInformation(t *testing.T) {
-	mockContainerInfo := &plmodels.ContainerInfo{}
-	mockContainerConfig := &plmodels.ContainerConfig{}
-	containerID := "foo"
-	mockContainerConfig.ContainerID = containerID
-
-	mockHostConfig := &container.HostConfig{}
-
-	portMap := nat.PortMap{}
-	port, _ := nat.NewPort("tcp", "80")
-	portBinding := nat.PortBinding{
-		HostIP:   "127.0.0.1",
-		HostPort: "8000",
-	}
-	portBindings := []nat.PortBinding{portBinding}
-	portMap[port] = portBindings
-	mockHostConfig.PortBindings = portMap
-
-	mockContainerInfo.ContainerConfig = mockContainerConfig
-	mockContainerInfo.HostConfig = &plmodels.HostConfig{
-		Ports: []string{"8000/tcp"},
-	}
-
-	ips := []string{"192.168.1.1"}
-
-	co := viccontainer.NewVicContainer()
-	co.HostConfig = mockHostConfig
-	co.ContainerID = containerID
-	co.Name = "bar"
-	cache.ContainerCache().AddContainer(co)
-
-	// unless there are entries in containerByPort we won't report them as bound
-	ports := portForwardingInformation(mockContainerInfo, ips)
-	assert.Empty(t, ports, "There should be no bound IPs at this point for forwarding")
-
-	// the current port binding should show up as a direct port
-	ports = directPortInformation(mockContainerInfo)
-	assert.NotEmpty(t, ports, "There should be a direct port")
-
-	containerByPort["8000"] = containerID
-	ports = portForwardingInformation(mockContainerInfo, ips)
-	assert.NotEmpty(t, ports, "There should be bound IPs")
-	assert.Equal(t, 1, len(ports), "Expected 1 port binding, found %d", len(ports))
-	// now that this port presents as a forwarded port it should NOT present as a direct port
-	ports = directPortInformation(mockContainerInfo)
-	assert.Empty(t, ports, "There should not be a direct port")
-
-	port, _ = nat.NewPort("tcp", "80")
-	portBinding = nat.PortBinding{
-		HostIP:   "127.0.0.1",
-		HostPort: "00",
-	}
-	portMap[port] = portBindings
-
-	// forwarding of 00 should never happen, but this is allowing us to confirm that
-	// it's kicked out by the function even if present in the map
-	containerByPort["00"] = containerID
-	ports = portForwardingInformation(mockContainerInfo, ips)
-	assert.NotEmpty(t, ports, "There should be 1 bound IP")
-	assert.Equal(t, 1, len(ports), "Expected 1 port binding, found %d", len(ports))
-
-	port, _ = nat.NewPort("tcp", "800")
-	portBinding = nat.PortBinding{
-		HostIP:   "127.0.0.1",
-		HostPort: "800",
-	}
-	portMap[port] = portBindings
-	containerByPort["800"] = containerID
-	ports = portForwardingInformation(mockContainerInfo, ips)
-	assert.Equal(t, 2, len(ports), "Expected 2 port binding, found %d", len(ports))
-}
-
-// TestCreateConfigNetowrkMode() whether the HostConfig.NetworkMode is set correctly in ValidateCreateConfig()
-func TestCreateConfigNetworkMode(t *testing.T) {
-
-	// mock a container create config
-	mockConfig := types.ContainerCreateConfig{
-		HostConfig: &container.HostConfig{},
-		Config: &container.Config{
-			Image: "busybox",
-		},
-		NetworkingConfig: &dnetwork.NetworkingConfig{
-			EndpointsConfig: map[string]*dnetwork.EndpointSettings{
-				"net1": {},
-			},
-		},
-	}
-
-	validateCreateConfig(&mockConfig)
-
-	assert.Equal(t, mockConfig.HostConfig.NetworkMode.NetworkName(), "net1", "expected NetworkMode is net1, found %s", mockConfig.HostConfig.NetworkMode)
-
-	// container connects to two network endpoints; check for NetworkMode error
-	mockConfig.NetworkingConfig.EndpointsConfig["net2"] = &dnetwork.EndpointSettings{}
-
-	err := validateCreateConfig(&mockConfig)
-
-	assert.Contains(t, err.Error(), "NetworkMode error", "error (%s) should have 'NetworkMode error'", err.Error())
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation.go
deleted file mode 100644
index b02c717724..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package convert
-
-import (
-	"encoding/base64"
-	"encoding/json"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-const (
-	AnnotationKeyLabels     = "docker.labels"
-	AnnotationKeyAutoRemove = "docker.autoremove"
-)
-
-// SetContainerAnnotation encodes a docker specific attribute into a vSphere annotation.  These vSphere
-// annotations are stored in the VM vmx file
-func SetContainerAnnotation(config *models.ContainerCreateConfig, key string, value interface{}) error {
-	var err error
-
-	if config == nil || value == nil {
-		return nil
-	}
-
-	if config.Annotations == nil {
-		config.Annotations = make(map[string]string)
-	}
-
-	// Encoding the labels map into a blob that can be stored as ansi regardless
-	// of what encoding the input labels are.  We do this by first marshaling to
-	// to a json byte array to get a self describing encoding and then encoding
-	// to base64.  We could use another encoding for the self describing part,
-	// such as Golang GOB, but this data will be pushed over to a standard REST
-	// server so we use standard web standards instead.
-	if valueBytes, merr := json.Marshal(value); merr == nil {
-		blob := base64.StdEncoding.EncodeToString(valueBytes)
-		config.Annotations[key] = blob
-	} else {
-		err = merr
-		log.Errorf("Unable to marshal annotation %s to json: %s", key, err)
-	}
-
-	return err
-}
-
-// ContainerAnnotation will convert a vSphere annotation into a docker specific attribute
-func ContainerAnnotation(annotations map[string]string, key string, value interface{}) error {
-	var err error
-
-	if len(annotations) == 0 || value == nil {
-		return nil
-	}
-
-	if blob, ok := annotations[key]; ok {
-		if annotationBytes, decodeErr := base64.StdEncoding.DecodeString(blob); decodeErr == nil {
-			if err = json.Unmarshal(annotationBytes, value); err != nil {
-				log.Errorf("Unable to unmarshal %s: %s", key, err)
-			}
-		} else {
-			err = decodeErr
-			log.Errorf("Unable to decode container annotations: %s", err)
-		}
-	}
-
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation_test.go
deleted file mode 100644
index 7ddbdc01a9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/annotation_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package convert
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-func TestSetContainerAnnotation(t *testing.T) {
-
-	config := &models.ContainerCreateConfig{}
-	labels := make(map[string]string)
-	labels["environment"] = "dev"
-
-	err := SetContainerAnnotation(nil, AnnotationKeyLabels, labels)
-	assert.NoError(t, err)
-
-	err = SetContainerAnnotation(config, AnnotationKeyLabels, &labels)
-	assert.NoError(t, err)
-
-	var myLabels map[string]string
-
-	err = ContainerAnnotation(myLabels, AnnotationKeyLabels, &myLabels)
-	assert.NoError(t, err)
-
-	err = ContainerAnnotation(config.Annotations, AnnotationKeyLabels, &myLabels)
-	assert.NoError(t, err)
-	assert.Equal(t, 1, len(myLabels))
-
-	err = ContainerAnnotation(config.Annotations, AnnotationKeyLabels, myLabels)
-	assert.Error(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/state.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/state.go
deleted file mode 100644
index 2e8a1b41c5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/state.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package convert
-
-import (
-	"fmt"
-	"strings"
-	"time"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/go-units"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// State will create and return a docker ContainerState object
-// from the passed vic ContainerInfo object
-func State(info *models.ContainerInfo) *types.ContainerState {
-	defer trace.End(trace.Begin(""))
-
-	// ensure we have the data we need
-	if info == nil || info.ProcessConfig == nil || info.ContainerConfig == nil {
-		return nil
-	}
-
-	dockerState := &types.ContainerState{}
-
-	// convert start / stop times
-	var started time.Time
-	var finished time.Time
-
-	if info.ProcessConfig.StartTime > 0 {
-		started = time.Unix(info.ProcessConfig.StartTime, 0)
-		dockerState.StartedAt = time.Unix(info.ProcessConfig.StartTime, 0).Format(time.RFC3339Nano)
-	}
-
-	if info.ProcessConfig.StopTime > 0 {
-		finished = time.Unix(info.ProcessConfig.StopTime, 0)
-		dockerState.FinishedAt = time.Unix(info.ProcessConfig.StopTime, 0).Format(time.RFC3339Nano)
-	}
-
-	// set docker status to state and we'll change if needed
-	dockStatus := info.ContainerConfig.State
-	// set exitCode and change if needed
-	exitCode := int(info.ProcessConfig.ExitCode)
-
-	switch info.ContainerConfig.State {
-	case "Running":
-		// if we don't have a start date leave the status as the state
-		if !started.IsZero() {
-			dockStatus = fmt.Sprintf("Up %s", units.HumanDuration(time.Now().UTC().Sub(started)))
-			dockerState.Running = true
-		}
-	case "Stopped":
-		// if we don't have a finished date then don't process exitCode and return "Stopped" for the status
-		if !finished.IsZero() {
-			// interrogate the process status returned from the portlayer
-			// and based on status text and exit codes set the appropriate
-			// docker exit code
-			if strings.Contains(info.ProcessConfig.Status, "permission denied") {
-				exitCode = 126
-			} else if strings.Contains(info.ProcessConfig.Status, "no such") {
-				exitCode = 127
-			} else if info.ProcessConfig.Status == "true" && exitCode == -1 {
-				// most likely the process was killed via the cli
-				// or received a sigkill
-				exitCode = 137
-			} else if info.ProcessConfig.Status == "" && exitCode == -1 {
-				// the process was stopped via the cli
-				// or received a sigterm
-				exitCode = 143
-			}
-
-			dockStatus = fmt.Sprintf("Exited (%d) %s ago", exitCode, units.HumanDuration(time.Now().UTC().Sub(finished)))
-		}
-	}
-	dockerState.Status = dockStatus
-	dockerState.ExitCode = exitCode
-	dockerState.Pid = int(info.ProcessConfig.Pid)
-	dockerState.Error = info.ProcessConfig.ErrorMsg
-
-	return dockerState
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats.go
deleted file mode 100644
index 12cc4dc52e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats.go
+++ /dev/null
@@ -1,453 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package convert
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/api/types"
-
-	"github.com/vmware/vic/pkg/vsphere/performance"
-)
-
-// ContainerStats encapsulates the conversion of VMMetrics to
-// docker specific metrics
-type ContainerStats struct {
-	config *ContainerStatsConfig
-
-	totalVCHMhz uint64
-	dblVCHMhz   uint64
-	preTotalMhz uint64
-
-	preDockerStat *types.StatsJSON
-	curDockerStat *types.StatsJSON
-	currentMetric *performance.VMMetrics
-
-	// disk & net stats are accumulated during the life of the
-	// subscription. These maps will assist in that accumulation.
-	diskStats map[string]performance.VirtualDisk
-	netStats  map[string]performance.Network
-
-	mu        sync.Mutex
-	reader    *io.PipeReader
-	writer    *io.PipeWriter
-	listening bool
-}
-
-type ContainerStatsConfig struct {
-	Ctx            context.Context
-	Cancel         context.CancelFunc
-	Out            io.Writer
-	ContainerID    string
-	ContainerState *types.ContainerState
-	Memory         int64
-	Stream         bool
-	VchMhz         int64
-}
-
-type InvalidOrderError struct {
-	current  time.Time
-	previous time.Time
-}
-
-func (iso InvalidOrderError) Error() string {
-	return fmt.Sprintf("The current sample time (%s) is before the previous time (%s)", iso.current, iso.previous)
-}
-
-// NewContainerStats will return a new instance of ContainerStats
-func NewContainerStats(config *ContainerStatsConfig) *ContainerStats {
-	return &ContainerStats{
-		config:        config,
-		curDockerStat: &types.StatsJSON{},
-		totalVCHMhz:   uint64(config.VchMhz),
-		dblVCHMhz:     uint64(config.VchMhz * 2),
-		diskStats:     make(map[string]performance.VirtualDisk),
-		netStats:      make(map[string]performance.Network),
-	}
-}
-
-// IsListening returns the listening flag
-func (cs *ContainerStats) IsListening() bool {
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
-	return cs.listening
-}
-
-// Stop will clean up the pipe and flip listening flag
-func (cs *ContainerStats) Stop() {
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
-
-	if cs.listening {
-		// #nosec: Errors unhandled.
-		cs.reader.Close()
-		// #nosec: Errors unhandled.
-		cs.writer.Close()
-		cs.listening = false
-	}
-}
-
-// newPipe will initialize the pipe for encoding / decoding and
-// set the listening flag
-func (cs *ContainerStats) newPipe() {
-	cs.mu.Lock()
-	defer cs.mu.Unlock()
-
-	// create a new reader / writer
-	cs.reader, cs.writer = io.Pipe()
-	cs.listening = true
-}
-
-// Listen for new metrics from the portLayer, convert to docker format
-// and encode to the configured Writer.
-func (cs *ContainerStats) Listen() *io.PipeWriter {
-	// Are we already listening?
-	if cs.IsListening() {
-		return nil
-	}
-
-	// create pipe for encode/decode
-	cs.newPipe()
-
-	dec := json.NewDecoder(cs.reader)
-	doc := json.NewEncoder(cs.config.Out)
-
-	// channel to transfer metric from decoder to encoder
-	metric := make(chan performance.VMMetrics)
-
-	// if we aren't streaming and the container is not running, then create an empty
-	// docker stat to return
-	if !cs.config.Stream && !cs.config.ContainerState.Running {
-		cs.preDockerStat = &types.StatsJSON{}
-	}
-
-	// go routine to stop on Context.Cancel
-	go func() {
-		<-cs.config.Ctx.Done()
-		close(metric)
-		cs.Stop()
-	}()
-
-	// go routine will decode metrics received from the portLayer and
-	// send them to the encoding routine
-	go func() {
-		for {
-			select {
-			case <-cs.config.Ctx.Done():
-				return
-			default:
-				for dec.More() {
-					var vmm performance.VMMetrics
-					err := dec.Decode(&vmm)
-					if err != nil {
-						log.Errorf("container metric decoding error for container(%s): %s", cs.config.ContainerID, err)
-						cs.config.Cancel()
-					}
-					// send the decoded metric for transform and encoding
-					if cs.IsListening() {
-						metric <- vmm
-					}
-				}
-			}
-		}
-
-	}()
-
-	// go routine will convert incoming metrics to docker specific stats and encode for the docker client.
-	go func() {
-		// docker needs updates quicker than vSphere can produce metrics, so we'll send a minimum of 1 metric/sec
-		ticker := time.NewTicker(time.Millisecond * 500)
-		for range ticker.C {
-			select {
-			case <-cs.config.Ctx.Done():
-				ticker.Stop()
-				return
-			case nm := <-metric:
-				// convert the Stat to docker struct
-				stat, err := cs.ToContainerStats(&nm)
-				if err != nil {
-					log.Errorf("container metric conversion error for container(%s): %s", cs.config.ContainerID, err)
-					cs.config.Cancel()
-				}
-				if stat != nil {
-					cs.preDockerStat = stat
-				}
-			default:
-				if cs.IsListening() && cs.preDockerStat != nil {
-					// send docker stat to client
-					err := doc.Encode(cs.preDockerStat)
-					if err != nil {
-						log.Warnf("container metric encoding error for container(%s): %s", cs.config.ContainerID, err)
-						cs.config.Cancel()
-					}
-					// if we aren't streaming then cancel
-					if !cs.config.Stream {
-						cs.config.Cancel()
-					}
-				}
-			}
-		}
-	}()
-
-	return cs.writer
-}
-
-// ToContainerStats will convert the vic VMMetrics to a docker stats struct -- a complete docker stats
-// struct requires two samples.  Func will return nil until a complete stat is available
-func (cs *ContainerStats) ToContainerStats(current *performance.VMMetrics) (*types.StatsJSON, error) {
-	// if we have a current metric then validate and transform
-	if cs.currentMetric != nil {
-		// do we have the same metric or has the metric not been initialized?
-		if cs.currentMetric.SampleTime.Equal(current.SampleTime) || current.SampleTime.IsZero() {
-			return nil, nil
-		}
-		// we have new current stats so need to move the previous CPU
-		err := cs.previousCPU(current)
-		if err != nil {
-			return nil, err
-		}
-	}
-	cs.currentMetric = current
-
-	// create the current CPU stats
-	cs.currentCPU()
-
-	// create memory stats
-	cs.memory()
-
-	// create network stats
-	cs.network()
-
-	// create storage stats
-	cs.disk()
-
-	// set sample time
-	cs.curDockerStat.Read = cs.currentMetric.SampleTime
-
-	// PreRead will be zero if we don't have two samples
-	if cs.curDockerStat.PreRead.IsZero() {
-		return nil, nil
-	}
-	return cs.curDockerStat, nil
-}
-
-// network will calculate stats by network device.  The stats presented will be the
-// network stats accumulated during the stats subscription.  This differs from vanilla
-// docker as it provides the network stats for the lifetime of the container.
-//
-// TODO: Errors from either Tx or Rx are not currently supported (July 9th 2017)
-func (cs *ContainerStats) network() {
-	cs.curDockerStat.Networks = make(map[string]types.NetworkStats)
-	for _, net := range cs.currentMetric.Networks {
-
-		// get the previous network stats
-		if preNet, exists := cs.netStats[net.Name]; exists {
-			net.Rx.Bytes += preNet.Rx.Bytes
-			net.Rx.Packets += preNet.Rx.Packets
-			net.Rx.Dropped += preNet.Rx.Dropped
-			net.Tx.Bytes += preNet.Tx.Bytes
-			net.Tx.Packets += preNet.Tx.Packets
-			net.Tx.Dropped += preNet.Tx.Dropped
-			cs.netStats[net.Name] = net
-		} else {
-			// initial iteration
-			cs.netStats[net.Name] = net
-		}
-
-		cs.curDockerStat.Networks[net.Name] = types.NetworkStats{
-			RxBytes:   net.Rx.Bytes,
-			RxPackets: uint64(net.Rx.Packets),
-			RxDropped: uint64(net.Rx.Dropped),
-			TxBytes:   net.Tx.Bytes,
-			TxPackets: uint64(net.Tx.Packets),
-			TxDropped: uint64(net.Tx.Dropped),
-		}
-
-	}
-}
-
-// disk will calculate supported stats by disk device.  The stats presented will be the
-// disk stats accumulated during the stats subscription.  This differs from vanilla
-// docker as it provides the disk stats for the lifetime of the container.
-//
-// Supported stats are io_service_bytes_recursive and io_serviced_recursive, so bytes and iops
-// during the stats subscription
-//
-// TODO: Currently disk assumes a single scsi controller.  Multiple scsi controllers will need
-// to be supported in a future release (July 9th 2017)
-func (cs *ContainerStats) disk() {
-	// docker storage stats to populate
-	storage := types.BlkioStats{
-		IoServiceBytesRecursive: []types.BlkioStatEntry{},
-		IoServicedRecursive:     []types.BlkioStatEntry{},
-	}
-
-	for _, disk := range cs.currentMetric.Disks {
-		// disk stats accumulate for the life of subscription, so
-		// either add previous stats or store initial stats
-		if preDisk, exists := cs.diskStats[disk.Name]; exists {
-			// add previous values to current value
-			disk.Read.Bytes += preDisk.Read.Bytes
-			disk.Read.Op += preDisk.Read.Op
-			disk.Write.Bytes += preDisk.Write.Bytes
-			disk.Write.Op += preDisk.Write.Op
-			cs.diskStats[disk.Name] = disk
-		} else {
-			// initial iteration
-			cs.diskStats[disk.Name] = disk
-		}
-
-		// get the minor number for the disk device
-		deviceMinor := diskMinor(cs.config.ContainerID, disk.Name)
-
-		// need to update read, write & total for supported stats (bytes & iops)
-		storage.IoServiceBytesRecursive = append(storage.IoServiceBytesRecursive,
-			createBlkioStatsEntry(deviceMinor, "Read", cs.diskStats[disk.Name].Read.Bytes))
-		storage.IoServiceBytesRecursive = append(storage.IoServiceBytesRecursive,
-			createBlkioStatsEntry(deviceMinor, "Write", cs.diskStats[disk.Name].Write.Bytes))
-		storage.IoServiceBytesRecursive = append(storage.IoServiceBytesRecursive,
-			createBlkioStatsEntry(deviceMinor, "Total", cs.diskStats[disk.Name].Read.Bytes+cs.diskStats[disk.Name].Write.Bytes))
-		// Ops
-		storage.IoServicedRecursive = append(storage.IoServicedRecursive,
-			createBlkioStatsEntry(deviceMinor, "Read", cs.diskStats[disk.Name].Read.Op))
-		storage.IoServicedRecursive = append(storage.IoServicedRecursive,
-			createBlkioStatsEntry(deviceMinor, "Write", cs.diskStats[disk.Name].Write.Op))
-		storage.IoServicedRecursive = append(storage.IoServicedRecursive,
-			createBlkioStatsEntry(deviceMinor, "Total", cs.diskStats[disk.Name].Read.Op+cs.diskStats[disk.Name].Write.Op))
-
-	}
-	// add the block stats to the docker stat
-	cs.curDockerStat.BlkioStats = storage
-}
-
-func (cs *ContainerStats) memory() {
-	// given MB (i.e. 2048) convert to GB
-	cs.curDockerStat.MemoryStats.Limit = uint64(cs.config.Memory * 1024 * 1024)
-	// given KB (i.e. 384.5) convert to Bytes
-	cs.curDockerStat.MemoryStats.Usage = uint64(cs.currentMetric.Memory.Active * 1024)
-}
-
-// previousCPU will move the current stats to the previous CPU location
-func (cs *ContainerStats) previousCPU(current *performance.VMMetrics) error {
-	// validate that the sampling is in the correct order
-	if current.SampleTime.Before(cs.curDockerStat.Read) {
-		err := InvalidOrderError{
-			current:  current.SampleTime,
-			previous: cs.curDockerStat.Read,
-		}
-		return err
-	}
-
-	// move the stats
-	cs.curDockerStat.PreCPUStats = cs.curDockerStat.CPUStats
-
-	// set the previousTotal -- this will be added to the current CPU
-	cs.preTotalMhz = cs.curDockerStat.PreCPUStats.CPUUsage.TotalUsage
-
-	cs.curDockerStat.PreRead = cs.curDockerStat.Read
-	// previous systemUsage will always be the VCH total
-	// see note in func currentCPU() for detail
-	cs.curDockerStat.PreCPUStats.SystemUsage = cs.totalVCHMhz
-
-	return nil
-}
-
-// currentCPU will convert the VM CPU metrics to docker CPU stats
-func (cs *ContainerStats) currentCPU() {
-	cpuCount := len(cs.currentMetric.CPU.CPUs)
-	dockerCPU := types.CPUStats{
-		CPUUsage: types.CPUUsage{
-			PercpuUsage: make([]uint64, cpuCount, cpuCount),
-		},
-	}
-
-	// collect the current CPU Metrics
-	for ci, current := range cs.currentMetric.CPU.CPUs {
-		dockerCPU.CPUUsage.PercpuUsage[ci] = uint64(current.MhzUsage)
-		dockerCPU.CPUUsage.TotalUsage += uint64(current.MhzUsage)
-	}
-
-	// vSphere will report negative usage for a starting VM, lets
-	// set to zero
-	if dockerCPU.CPUUsage.TotalUsage < 0 {
-		dockerCPU.CPUUsage.TotalUsage = 0
-	}
-
-	// The first stat available for a VM will be missing detail
-	if cpuCount > 0 {
-		// TotalUsage is the sum of the individual vCPUs Mhz
-		// consumption this reading.  We must divide that by the
-		// number of vCPUs to get the average across both, since
-		// the cpuUsage calc (explained below) will multiply by
-		// the number of CPUs to get the cpuUsage percent
-		dockerCPU.CPUUsage.TotalUsage /= uint64(cpuCount)
-	}
-
-	// Set the current systemUsage to double the VCH as the
-	// previous systemUsage is the VCH total.  The docker
-	// client formula creates a SystemDelta which is the following:
-	// systemDelta = currentSystemUsage - previousSystemUsage
-	// We always need systemDelta to equal the total amount of
-	// VCH Mhz thus the doubling here.
-	dockerCPU.SystemUsage = cs.dblVCHMhz
-
-	// Much like systemUsage (above) totalCPUUsage and previous
-	// totalCPUUsage will be used to create a CPUUsage delta as such:
-	// CPUDelta = currentTotalCPUUsage - previousTotalCPUUsage
-	// This amount will then be divided by the systemDelta
-	// (explained above) as part of the CPU % Usage calculation
-	// cpuUsage = (CPUDelta / SystemDelta) * cpuCount * 100
-	// This will require the addition of the previous total usage
-	dockerCPU.CPUUsage.TotalUsage += cs.preTotalMhz
-	cs.curDockerStat.CPUStats = dockerCPU
-}
-
-// diskMinor will parse the disk name and return the minor id of
-// the disk device.  The func assumes that minor identifiers are multiples
-// of 16 (0,16,32,48,etc).
-func diskMinor(containerID string, name string) uint64 {
-	// disks are named scsi0:0, scsi0:1
-	// i.e. controller+controller number:device number
-	device := strings.Split(name, ":")
-	// convert to an int
-	minor, err := strconv.Atoi(device[len(device)-1])
-	if err != nil {
-		// log error, but continue and return a minor number of zero
-		// unlikely this would happen, but if it does and there is more than one disk on the vm
-		// then it could go undetected
-		log.Errorf("stats error generating container(%s) disk(%s) minor: %s", containerID, name, err)
-	}
-	// minor identifiers are multiples of 16
-	minor *= 16
-	return uint64(minor)
-}
-
-func createBlkioStatsEntry(minor uint64, op string, value uint64) types.BlkioStatEntry {
-	return types.BlkioStatEntry{
-		Major: 8,
-		Minor: minor,
-		Op:    op,
-		Value: value,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats_test.go
deleted file mode 100644
index bbdd33b5cd..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/convert/stats_test.go
+++ /dev/null
@@ -1,495 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package convert
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"io"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/vsphere/performance"
-)
-
-const (
-	vcpuMhz        = 3300
-	vcpuCount      = 1
-	vchMhzTotal    = 3300
-	memConsumed    = 1024 * 1024 * 500
-	memProvisioned = 1024 * 1024 * 1024
-)
-
-func TestContainerConverter(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-
-	// grab a config object
-	config := ccConfig(plumb)
-
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	// returned writer is given to PL
-	writer := cStats.Listen()
-	assert.NotNil(t, writer)
-	// second call should result in nil writer as
-	// we are already listening
-	w2 := cStats.Listen()
-	assert.Nil(t, w2)
-
-	// // ensure stop closes reader / writer
-	cStats.Stop()
-	// verify we stopped listening
-	assert.False(t, cStats.IsListening())
-}
-
-func TestToContainerStats(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	initCPU := 1000
-	vmBefore := vmMetrics(vcpuCount, initCPU)
-	vmm := vmMetrics(vcpuCount, initCPU)
-	// ensure we are after the initial metric
-	vmm.SampleTime.Add(time.Second * 1)
-
-	// first metric sent, should return nil
-	js, err := cStats.ToContainerStats(vmm)
-	assert.NoError(t, err)
-	assert.Nil(t, js)
-
-	// send the same stat should return nil
-	js, err = cStats.ToContainerStats(vmm)
-	assert.Nil(t, err)
-	assert.Nil(t, js)
-
-	// send out of order stat
-	js, err = cStats.ToContainerStats(vmBefore)
-	assert.NotNil(t, err)
-	assert.Nil(t, js)
-
-	secondCPU := 250
-	// create a new metric
-	vmmm := vmMetrics(vcpuCount, secondCPU)
-	// sample will be 20 seconds apart..
-	vmmm.SampleTime = vmm.SampleTime.Add(time.Second * 20)
-
-	js, err = cStats.ToContainerStats(vmmm)
-	assert.NoError(t, err)
-	assert.NotZero(t, js.Read, js.PreRead)
-	assert.Equal(t, uint64(vchMhzTotal*2), js.CPUStats.SystemUsage)
-	assert.Equal(t, uint64(secondCPU+initCPU), js.CPUStats.CPUUsage.TotalUsage)
-	assert.Equal(t, uint64(initCPU), js.PreCPUStats.CPUUsage.TotalUsage)
-	assert.Equal(t, uint64(vchMhzTotal), js.PreCPUStats.SystemUsage)
-
-	// this reading should show 250mhz of 3300mhz used -- 7.58%
-	cpuPercent := fmt.Sprintf("%2.2f", calculateCPUPercentUnix(js.PreCPUStats.CPUUsage.TotalUsage, js.PreCPUStats.SystemUsage, js))
-	assert.Equal(t, "7.58", cpuPercent)
-
-	config.Cancel()
-	<-config.Ctx.Done()
-	// verify we stopped listening
-	assert.True(t, success(cStats))
-}
-
-func TestContainerStatsListener(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	// start the listener
-	writer := cStats.Listen()
-	assert.NotNil(t, writer)
-
-	// create an initial metric
-	initCPU := 1000
-	vm := vmMetrics(vcpuCount, initCPU)
-	err := plumb.mockPLMetrics(vm, writer)
-	assert.NoError(t, err)
-
-	// send second metric
-	vmm := vmMetrics(vcpuCount, initCPU+100)
-	vmm.SampleTime = vm.SampleTime.Add(time.Second * 20)
-	err = plumb.mockPLMetrics(vmm, writer)
-	assert.NoError(t, err)
-
-	// did client receive metric??
-	ds, err := plumb.mockDockerClient()
-	assert.NoError(t, err)
-	assert.NotNil(t, ds)
-	assert.Equal(t, uint64((initCPU*2+100)/vcpuCount), ds.CPUStats.CPUUsage.TotalUsage)
-
-	// docker expects data quicker than vSphere can produce -- sleep for just over 1 sec
-	// and ensure the previous docker stat is returned to client
-	time.Sleep(time.Millisecond * 1100)
-	same, err := plumb.mockDockerClient()
-	assert.NoError(t, err)
-	assert.NotNil(t, same)
-	assert.Equal(t, ds.CPUStats.CPUUsage.TotalUsage, same.CPUStats.CPUUsage.TotalUsage)
-
-	config.Cancel()
-	<-config.Ctx.Done()
-
-	// verify we stopped listening
-	assert.True(t, success(cStats))
-}
-
-func TestContainerConvertCtxCancel(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	// start the listener
-	writer := cStats.Listen()
-	assert.NotNil(t, writer)
-
-	// cancel the context
-	config.Cancel()
-	<-config.Ctx.Done()
-	// verify we stopped listening
-	assert.True(t, success(cStats))
-}
-
-func TestContainerConvertNoStream(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	config.Stream = false
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	// start the listener
-	writer := cStats.Listen()
-	assert.NotNil(t, writer)
-
-	// create an initial metric
-	initCPU := 1000
-	vm := vmMetrics(vcpuCount, initCPU)
-	err := plumb.mockPLMetrics(vm, writer)
-	assert.NoError(t, err)
-
-	// send second metric
-	vmm := vmMetrics(vcpuCount, initCPU+100)
-	vmm.SampleTime = vm.SampleTime.Add(time.Second * 20)
-	err = plumb.mockPLMetrics(vmm, writer)
-	assert.NoError(t, err)
-
-	ds, err := plumb.mockDockerClient()
-	assert.NoError(t, err)
-	assert.NotNil(t, ds)
-
-	// converter canceled the context
-	<-config.Ctx.Done()
-	// verify we stopped listening
-	assert.True(t, success(cStats))
-}
-
-func TestContainerNotRunningNoStream(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	config.Stream = false
-	config.ContainerState.Running = false
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-
-	// start the listener
-	writer := cStats.Listen()
-	assert.NotNil(t, writer)
-
-	ds, err := plumb.mockDockerClient()
-	assert.NoError(t, err)
-	assert.NotNil(t, ds)
-
-	// converter canceled the context
-	<-config.Ctx.Done()
-	// verify we stopped listening
-	assert.True(t, success(cStats))
-}
-
-func TestDiskMinor(t *testing.T) {
-	containerID := "12345"
-	for i := 0; i <= 15; i++ {
-		name := fmt.Sprintf("scsi0:%d", i)
-		assert.Equal(t, uint64(i*16), diskMinor(containerID, name))
-	}
-
-	minor := uint64(0)
-	// test with invalid disk names to ensure no panic, etc
-	assert.Equal(t, minor, diskMinor(containerID, "foo:bar:0"))
-	assert.Equal(t, minor, diskMinor(containerID, "foo"))
-	assert.Equal(t, minor, diskMinor(containerID, "foo:"))
-}
-
-func TestCreateBlkioStatsEntry(t *testing.T) {
-	minor := uint64(0)
-	val := uint64(12)
-	maj := uint64(8)
-	entry := createBlkioStatsEntry(minor, "Read", val)
-	assert.Equal(t, "Read", entry.Op)
-	assert.Equal(t, val, entry.Value)
-	assert.Equal(t, minor, entry.Minor)
-	assert.Equal(t, maj, entry.Major)
-}
-
-func TestDiskStats(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-	// create metric
-	initCPU := 1000
-	vm := vmMetrics(vcpuCount, initCPU)
-	cStats.currentMetric = vm
-
-	// update disk
-	cStats.disk()
-
-	assert.Equal(t, 3, len(cStats.curDockerStat.BlkioStats.IoServiceBytesRecursive))
-	assert.Equal(t, 1, len(cStats.diskStats))
-
-	// update again -- this should accumulate the totals
-	cStats.disk()
-	assert.Equal(t, 3, len(cStats.curDockerStat.BlkioStats.IoServiceBytesRecursive))
-	assert.Equal(t, 1, len(cStats.diskStats))
-
-	for _, disk := range cStats.curDockerStat.BlkioStats.IoServiceBytesRecursive {
-		switch disk.Op {
-		case "Write":
-			assert.Equal(t, uint64(vm.Disks[0].Write.Bytes*2), disk.Value)
-		}
-	}
-}
-
-func TestNetworkStats(t *testing.T) {
-	plumb := setup()
-	defer teardown(plumb)
-	// grab a config object
-	config := ccConfig(plumb)
-	cStats := NewContainerStats(config)
-	assert.NotNil(t, cStats)
-	// create metric
-	initCPU := 1000
-	vm := vmMetrics(vcpuCount, initCPU)
-	cStats.currentMetric = vm
-
-	// update network
-	cStats.network()
-
-	assert.Equal(t, 1, len(cStats.curDockerStat.Networks))
-	assert.Equal(t, 1, len(cStats.netStats))
-
-	// update again -- this should accumulate the totals
-	cStats.network()
-	assert.Equal(t, 1, len(cStats.curDockerStat.Networks))
-	assert.Equal(t, 1, len(cStats.netStats))
-
-	for network, usage := range cStats.curDockerStat.Networks {
-		switch network {
-		case "eth0":
-			assert.Equal(t, uint64(200), usage.RxBytes)
-		}
-	}
-}
-
-// Test Helpers
-
-type plumbing struct {
-	r   *io.PipeReader
-	w   *io.PipeWriter
-	out io.Writer
-	// mock portlayer
-	mockPL *json.Encoder
-	// mock docker client decoder
-	mockDoc *json.Decoder
-}
-
-func setup() *plumbing {
-	r, o := io.Pipe()
-	out := io.Writer(o)
-
-	return &plumbing{
-		r:       r,
-		w:       o,
-		out:     out,
-		mockDoc: json.NewDecoder(r),
-	}
-}
-
-// success is a helper to check the listening status of the
-// converter
-func success(converter *ContainerStats) bool {
-	op := func() error {
-		listen := converter.IsListening()
-		if listen {
-			return fmt.Errorf("still listening: %t", listen)
-		}
-		return nil
-	}
-	wait := func(err error) bool {
-		if err != nil {
-			return true
-		}
-		return false
-	}
-	// use the retry package and keep retrying until we've hit the limit
-	if err := retry.Do(op, wait); err != nil {
-		return false
-	}
-	return true
-}
-
-func teardown(p *plumbing) {
-	// close the reader / writer
-	p.r.Close()
-	p.w.Close()
-}
-
-func (p *plumbing) mockPLMetrics(metric *performance.VMMetrics, writer io.Writer) error {
-	if p.mockPL == nil {
-		p.mockPL = json.NewEncoder(writer)
-	}
-	return p.mockPL.Encode(metric)
-}
-
-func (p *plumbing) mockDockerClient() (*types.StatsJSON, error) {
-	docStats := &types.StatsJSON{}
-
-	err := p.mockDoc.Decode(docStats)
-	if err != nil {
-		return nil, err
-	}
-
-	return docStats, nil
-}
-
-func ccConfig(p *plumbing) *ContainerStatsConfig {
-	// test config
-	ctx, cancel := context.WithCancel(context.Background())
-	config := &ContainerStatsConfig{
-		VchMhz:      int64(vchMhzTotal),
-		Ctx:         ctx,
-		Cancel:      cancel,
-		ContainerID: "1234",
-		Out:         p.out,
-		Stream:      true,
-		Memory:      2048,
-		ContainerState: &types.ContainerState{
-			Running: true,
-		},
-	}
-	return config
-}
-
-func vmMetrics(count int, vcpuMhz int) *performance.VMMetrics {
-	vmm := &performance.VMMetrics{}
-	vmm.SampleTime = time.Now()
-	vmm.CPU = cpuUsageMetrics(count, vcpuMhz)
-	vmm.Memory = performance.MemoryMetrics{
-		Consumed:    int64(memConsumed),
-		Provisioned: int64(memProvisioned),
-	}
-	disk := performance.VirtualDisk{
-		Name: "scsi0:0",
-		Write: performance.DiskUsage{
-			Bytes: uint64(100),
-			Kbps:  5,
-			Op:    uint64(5),
-			Ops:   5,
-		},
-		Read: performance.DiskUsage{
-			Bytes: uint64(10),
-			Kbps:  5,
-			Op:    uint64(5),
-			Ops:   5,
-		},
-	}
-	vmm.Disks = append(vmm.Disks, disk)
-	network := performance.Network{
-		Name: "eth0",
-		Rx: performance.NetworkUsage{
-			Bytes:   uint64(100),
-			Kbps:    5,
-			Packets: 1,
-		},
-		Tx: performance.NetworkUsage{
-			Bytes:   uint64(10),
-			Packets: 1,
-		},
-	}
-	vmm.Networks = append(vmm.Networks, network)
-	return vmm
-}
-
-// cpuUsageMetrics will return a populated CPUMetrics struct
-func cpuUsageMetrics(count int, cpuMhz int) performance.CPUMetrics {
-	vmCPUs := make([]performance.CPUUsage, count, count)
-	total := count * cpuMhz
-	for i := range vmCPUs {
-		vmCPUs[i] = performance.CPUUsage{
-			ID:       i,
-			MhzUsage: int64(cpuMhz),
-		}
-	}
-
-	return performance.CPUMetrics{
-		CPUs:  vmCPUs,
-		Usage: calcVCPUUsage(total),
-	}
-}
-
-// calcUsage is a helper function that will take the total provdied usage
-// and convert to percentage of total vCPU usage
-func calcVCPUUsage(total int) float32 {
-	return float32(total) / (vcpuMhz * vcpuCount)
-}
-
-// calculateCPUPercentUnix is a copy from docker to test the percentage calculations
-func calculateCPUPercentUnix(previousCPU, previousSystem uint64, v *types.StatsJSON) float64 {
-	var (
-		cpuPercent = 0.0
-		// calculate the change for the cpu usage of the container in between readings
-		cpuDelta = float64(v.CPUStats.CPUUsage.TotalUsage) - float64(previousCPU)
-		// calculate the change for the entire system between readings
-		systemDelta = float64(v.CPUStats.SystemUsage) - float64(previousSystem)
-	)
-
-	if systemDelta > 0.0 && cpuDelta > 0.0 {
-		cpuPercent = (cpuDelta / systemDelta) * float64(len(v.CPUStats.CPUUsage.PercpuUsage)) * 100.0
-	}
-	return cpuPercent
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint.go
deleted file mode 100644
index d1f0bff038..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"net"
-	"net/http"
-
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/types"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-var notImplementedError = derr.NewErrorWithStatusCode(fmt.Errorf("not implemented"), http.StatusInternalServerError)
-
-type endpoint struct {
-	ep *models.EndpointConfig
-	sc *models.ScopeConfig
-}
-
-// A system generated id for this endpoint.
-func (e *endpoint) ID() string {
-	return e.ep.ID
-}
-
-// Name returns the name of this endpoint.
-func (e *endpoint) Name() string {
-	return e.ep.Name
-}
-
-// Network returns the name of the network to which this endpoint is attached.
-func (e *endpoint) Network() string {
-	return e.ep.Scope
-}
-
-// Join joins the sandbox to the endpoint and populates into the sandbox
-// the network resources allocated for the endpoint.
-func (e *endpoint) Join(sandbox libnetwork.Sandbox, options ...libnetwork.EndpointOption) error {
-	return notImplementedError
-}
-
-// Leave detaches the network resources populated in the sandbox.
-func (e *endpoint) Leave(sandbox libnetwork.Sandbox, options ...libnetwork.EndpointOption) error {
-	return notImplementedError
-}
-
-// Return certain operational data belonging to this endpoint
-func (e *endpoint) Info() libnetwork.EndpointInfo {
-	return e
-}
-
-// DriverInfo returns a collection of driver operational data related to this endpoint retrieved from the driver
-func (e *endpoint) DriverInfo() (map[string]interface{}, error) {
-	return nil, notImplementedError
-}
-
-// Delete and detaches this endpoint from the network.
-func (e *endpoint) Delete(force bool) error {
-	return notImplementedError
-}
-
-// Iface returns InterfaceInfo, go interface that can be used
-// to get more information on the interface which was assigned to
-// the endpoint by the driver. This can be used after the
-// endpoint has been created.
-func (e *endpoint) Iface() libnetwork.InterfaceInfo {
-	return e
-}
-
-// Gateway returns the IPv4 gateway assigned by the driver.
-// This will only return a valid value if a container has joined the endpoint.
-func (e *endpoint) Gateway() net.IP {
-	return net.ParseIP(e.sc.Gateway)
-}
-
-// GatewayIPv6 returns the IPv6 gateway assigned by the driver.
-// This will only return a valid value if a container has joined the endpoint.
-func (e *endpoint) GatewayIPv6() net.IP {
-	return nil
-}
-
-// StaticRoutes returns the list of static routes configured by the network
-// driver when the container joins a network
-func (e *endpoint) StaticRoutes() []*types.StaticRoute {
-	return nil
-}
-
-// Sandbox returns the attached sandbox if there, nil otherwise.
-func (e *endpoint) Sandbox() libnetwork.Sandbox {
-	return newSandbox(e.ep.Container)
-}
-
-// MacAddress returns the MAC address assigned to the endpoint.
-func (e *endpoint) MacAddress() net.HardwareAddr {
-	return nil
-}
-
-// Address returns the IPv4 address assigned to the endpoint.
-func (e *endpoint) Address() *net.IPNet {
-	ip := net.ParseIP(e.ep.Address)
-	if ip == nil {
-		return nil
-	}
-
-	_, snet, err := net.ParseCIDR(e.sc.Subnet)
-	if err != nil {
-		return nil
-	}
-
-	return &net.IPNet{IP: ip, Mask: snet.Mask}
-}
-
-// AddressIPv6 returns the IPv6 address assigned to the endpoint.
-func (e *endpoint) AddressIPv6() *net.IPNet {
-	return nil
-}
-
-func (e *endpoint) LinkLocalAddresses() []*net.IPNet {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint/endpoint.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint/endpoint.go
deleted file mode 100644
index f0f20316f8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/endpoint/endpoint.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package endpoint
-
-import (
-	"fmt"
-
-	log "github.com/Sirupsen/logrus"
-	apinet "github.com/docker/docker/api/types/network"
-)
-
-func Alias(endpointConfig *apinet.EndpointSettings) []string {
-	var aliases []string
-
-	log.Debugf("EndpointsConfig: %#v", endpointConfig)
-	log.Debugf("Aliases: %s", endpointConfig.Aliases)
-	log.Debugf("Links: %s", endpointConfig.Links)
-
-	// Links are already in CONTAINERNAME:ALIAS format
-	aliases = endpointConfig.Links
-	// Converts aliases to ":ALIAS" format
-	for i := range endpointConfig.Aliases {
-		aliases = append(aliases, fmt.Sprintf(":%s", endpointConfig.Aliases[i]))
-	}
-	return aliases
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/errors.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/errors.go
deleted file mode 100644
index 032c6dc55e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/errors.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"net/http"
-
-	derr "github.com/docker/docker/api/errors"
-)
-
-// Used to check status code of derr, which is not a public type
-type httpStatusError interface {
-	HTTPErrorStatusCode() int
-}
-
-// InvalidVolumeError is returned when the user specifies a client directory as a volume.
-type InvalidVolumeError struct {
-}
-
-func (e InvalidVolumeError) Error() string {
-	return fmt.Sprintf("%s does not support mounting directories as a data volume.", ProductName())
-}
-
-// InvalidBindError is returned when create/run -v has more params than allowed.
-type InvalidBindError struct {
-	volume string
-}
-
-func (e InvalidBindError) Error() string {
-	return fmt.Sprintf("volume bind input is invalid: -v %s", e.volume)
-}
-
-// VolumeJoinNotFoundError returns a 404 docker error for a volume join request.
-func VolumeJoinNotFoundError(msg string) error {
-	return derr.NewRequestNotFoundError(fmt.Errorf(msg))
-}
-
-// VolumeCreateNotFoundError returns a 404 docker error for a volume create request.
-func VolumeCreateNotFoundError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("No volume store named (%s) exists", msg), http.StatusInternalServerError)
-}
-
-// VolumeNotFoundError returns a 404 docker error for a volume get request.
-func VolumeNotFoundError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("No such volume: %s", msg), http.StatusNotFound)
-}
-
-// VolumeInternalServerError returns a 500 docker error for a volume-related request.
-func VolumeInternalServerError(err error) error {
-	return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-}
-
-func ResourceNotFoundError(cid, res string) error {
-	return derr.NewRequestNotFoundError(fmt.Errorf("No such %s for container: %s", res, cid))
-}
-
-// NotFoundError returns a 404 docker error when a container is not found.
-func NotFoundError(msg string) error {
-	return derr.NewRequestNotFoundError(fmt.Errorf("No such container: %s", msg))
-}
-
-func ImageNotFoundError(image, tag string) error {
-	return derr.NewRequestNotFoundError(fmt.Errorf("An image does not exist locally with the tag: %s", image))
-}
-
-func TagNotFoundError(image, tag string) error {
-	return derr.NewRequestNotFoundError(fmt.Errorf("tag does not exist: %s:%s", image, tag))
-}
-
-// ResourceLockedError returns a 423 http status
-func ResourceLockedError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("Resource locked: %s", msg), http.StatusLocked)
-}
-
-// InternalServerError returns a 500 docker error on a portlayer error.
-func InternalServerError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("Server error from portlayer: %s", msg), http.StatusInternalServerError)
-}
-
-// BadRequestError returns a 400 docker error on a bad request.
-func BadRequestError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("Bad request error from portlayer: %s", msg), http.StatusBadRequest)
-}
-
-func ConflictError(msg string) error {
-	return derr.NewRequestConflictError(fmt.Errorf("Conflict error from portlayer: %s", msg))
-}
-
-func PluginNotFoundError(name string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("plugin %s not found", name), http.StatusNotFound)
-}
-
-func SwarmNotSupportedError() error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("%s does not yet support Docker Swarm", ProductName()), http.StatusNotFound)
-}
-
-func StreamFormatNotRecognized() error {
-	return derr.NewRequestConflictError(fmt.Errorf("Stream format not recognized"))
-}
-
-// Error type check
-
-func IsNotFoundError(err error) bool {
-	// if error was created with the docker error function, check the status code
-	if httpErr, ok := err.(httpStatusError); ok {
-		if httpErr.HTTPErrorStatusCode() == http.StatusNotFound {
-			return true
-		}
-	}
-
-	return false
-}
-
-func IsConflictError(err error) bool {
-	// if error was created with the docker error function, check the status code
-	if httpErr, ok := err.(httpStatusError); ok {
-		if httpErr.HTTPErrorStatusCode() == http.StatusConflict {
-			return true
-		}
-	}
-
-	return false
-}
-
-func IsResourceInUse(err error) bool {
-	if httpErr, ok := err.(httpStatusError); ok {
-		if httpErr.HTTPErrorStatusCode() == http.StatusLocked {
-			return true
-		}
-	}
-
-	return false
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor.go
deleted file mode 100644
index 8b828813fd..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-//**** eventmonitor.go
-//
-// Handles monitoring of events from the portlayer.  Events that are applicable to
-// Docker events are then translated and published to the Docker event subscribers.
-// NOTE:  This does not handle all Docker events.  In fact, most docker events are
-// passively handled by API calls in the backend routers, with no feedback from
-// the portlayer.
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
-
-	"github.com/docker/docker/api/types"
-	eventtypes "github.com/docker/docker/api/types/events"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/events"
-	plevents "github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	containerDieEvent     = "die"
-	containerDestroyEvent = "destroy"
-	containerStopEvent    = "stop"
-	containerStartEvent   = "start"
-	containerCreateEvent  = "create"
-	containerRestartEvent = "restart"
-	containerAttachEvent  = "attach"
-	containerDetachEvent  = "detach"
-	containerKillEvent    = "kill"
-	containerResizeEvent  = "resize"
-)
-
-// for unit testing purposes
-type eventproxy interface {
-	StreamEvents(ctx context.Context, out io.Writer) error
-}
-
-type eventpublisher interface {
-	PublishEvent(event plevents.BaseEvent)
-}
-
-type PlEventProxy struct {
-}
-
-type DockerEventPublisher struct {
-}
-
-type PortlayerEventMonitor struct {
-	stop      chan struct{}
-	proxy     eventproxy
-	publisher eventpublisher
-}
-
-// StreamEvents() handles all swagger interaction to the Portlayer's event manager
-//
-// Input:
-//	context and a io.Writer
-func (ep PlEventProxy) StreamEvents(ctx context.Context, out io.Writer) error {
-	defer trace.End(trace.Begin(""))
-
-	plClient := PortLayerClient()
-	if plClient == nil {
-		return InternalServerError("eventproxy.StreamEvents failed to get a portlayer client")
-	}
-
-	params := events.NewGetEventsParamsWithContext(ctx)
-	if _, err := plClient.Events.GetEvents(params, out); err != nil {
-		switch err := err.(type) {
-		case *events.GetEventsInternalServerError:
-			return InternalServerError("Server error from the events port layer")
-		default:
-			//Check for EOF.  Since the connection, transport, and data handling are
-			//encapsulated inside of Swagger, we can only detect EOF by checking the
-			//error string
-			if strings.Contains(err.Error(), swaggerSubstringEOF) {
-				return nil
-			}
-			return InternalServerError(fmt.Sprintf("Unknown error from the interaction port layer: %s", err))
-		}
-	}
-
-	return nil
-}
-
-func NewPortlayerEventMonitor(proxy eventproxy, publisher eventpublisher) *PortlayerEventMonitor {
-	return &PortlayerEventMonitor{proxy: proxy, publisher: publisher}
-}
-
-// Start() starts the portlayer event monitoring
-func (m *PortlayerEventMonitor) Start() error {
-	defer trace.End(trace.Begin(""))
-
-	if m.stop != nil {
-		return fmt.Errorf("Portlayer event monitor: Already started")
-	}
-
-	m.stop = make(chan struct{})
-	go m.monitor()
-
-	return nil
-}
-
-// Stop() stops the portlayer event monitoring
-func (m *PortlayerEventMonitor) Stop() {
-	defer trace.End(trace.Begin(""))
-
-	if m.stop != nil {
-		close(m.stop)
-	}
-}
-
-// monitor() establishes a streaming connection to the portlayer's event
-// endpoint, decodes the results, translate it to Docker events if needed,
-// and publishes the event to Docker event subscribers.
-func (m *PortlayerEventMonitor) monitor() error {
-	defer trace.End(trace.Begin(""))
-
-	var wg sync.WaitGroup
-	errors := make(chan error, 2)
-
-	reader, writer := io.Pipe()
-	ctx, cancel := context.WithCancel(context.TODO())
-	// Start streaming events
-	wg.Add(1)
-	go func() {
-		var err error
-
-		defer wg.Done()
-
-		if err = m.proxy.StreamEvents(ctx, writer); err != nil {
-			if ctx.Err() != context.Canceled {
-				log.Warnf("Event streaming from portlayer returned: %#v", err)
-			}
-		}
-		if ctx.Err() == context.Canceled {
-			log.Infof("Event streaming from portlayer was cancelled")
-			return
-		}
-		errors <- err
-
-		writer.Close()
-		reader.Close()
-	}()
-
-	// Start decoding event stream json
-	wg.Add(1)
-	go func() {
-		var err error
-		var event plevents.BaseEvent
-
-		defer wg.Done()
-
-		decoder := json.NewDecoder(reader)
-		for decoder.More() {
-			if err = decoder.Decode(&event); err == nil {
-				m.publisher.PublishEvent(event)
-			}
-		}
-		errors <- err
-
-		reader.Close()
-		writer.Close()
-	}()
-
-	// Create a channel signaling when the waitgroup finishes
-	done := make(chan struct{})
-	go func() {
-		wg.Wait()
-		close(errors)
-		close(done)
-	}()
-
-	select {
-	case <-done:
-		for err := range errors {
-			if err != nil {
-				log.Warnf("Exiting Events Monitor: %#v", err)
-				return err
-			}
-		}
-	case <-m.stop:
-		cancel()
-		writer.Close()
-		reader.Close()
-	}
-
-	return nil
-}
-
-// publishEvent() translate a portlayer event into a Docker event if the event is for a
-// known container and publishes them to Docker event subscribers.
-func (p DockerEventPublisher) PublishEvent(event plevents.BaseEvent) {
-	defer trace.End(trace.Begin(""))
-
-	vc := cache.ContainerCache().GetContainer(event.Ref)
-	if vc == nil {
-		log.Warnf("Received portlayer event %s for container %s but not found in cache", event.Event, event.Ref)
-		return
-	}
-
-	var attrs map[string]string
-	// TODO: move to a container.OnEvent() so that container drives the necessary changes based on event activity
-	switch event.Event {
-	case plevents.ContainerStopped,
-		plevents.ContainerPoweredOff,
-		plevents.ContainerFailed:
-		// since we are going to make a call to the portLayer lets execute this in a go routine
-		go func() {
-			attrs := make(map[string]string)
-			// get the containerEngine
-			code, _ := NewContainerBackend().containerProxy.exitCode(vc)
-
-			log.Infof("Sending die event for container %s - code: %s", vc.ContainerID, code)
-			// if the docker client is unable to convert the code to an int the client will return 125
-			attrs["exitCode"] = code
-			actor := CreateContainerEventActorWithAttributes(vc, attrs)
-			EventService().Log(containerDieEvent, eventtypes.ContainerEventType, actor)
-			if err := UnmapPorts(vc.ContainerID, vc.HostConfig); err != nil {
-				log.Errorf("Failed to unmap ports for container %s: %s", vc.ContainerID, err)
-			}
-
-			// auto-remove if required
-			if vc.HostConfig.AutoRemove {
-				config := &types.ContainerRmConfig{
-					ForceRemove:  true,
-					RemoveVolume: true,
-				}
-
-				err := NewContainerBackend().ContainerRm(vc.Name, config)
-				if err != nil {
-					log.Errorf("Failed to remove container %s: %s", vc.ContainerID, err)
-				}
-			}
-		}()
-	case plevents.ContainerRemoved:
-		attrs = make(map[string]string)
-		// pop the destroy event...
-		actor := CreateContainerEventActorWithAttributes(vc, attrs)
-		EventService().Log(containerDestroyEvent, eventtypes.ContainerEventType, actor)
-		if err := UnmapPorts(vc.ContainerID, vc.HostConfig); err != nil {
-			log.Errorf("Failed to unmap ports for container %s: %s", vc.ContainerID, err)
-		}
-		// remove from the container cache...
-		cache.ContainerCache().DeleteContainer(vc.ContainerID)
-	default:
-		// let everything else slide on by...
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor_test.go
deleted file mode 100644
index 14673edf8c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/eventmonitor_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"github.com/stretchr/testify/assert"
-
-	plevents "github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-type MockEventProxy struct {
-	MockEvents []plevents.BaseEvent
-	Delay      time.Duration
-}
-
-type MockEventPublisher struct {
-	MockEventChan chan plevents.BaseEvent
-}
-
-func (ep *MockEventProxy) StreamEvents(ctx context.Context, out io.Writer) error {
-	encoder := json.NewEncoder(out)
-	if encoder == nil {
-		return fmt.Errorf("Failed to create a json encoder")
-	}
-
-	for _, event := range ep.MockEvents {
-		if err := encoder.Encode(event); err != nil {
-			return err
-		}
-
-		time.Sleep(ep.Delay)
-	}
-
-	return nil
-}
-
-func (p *MockEventPublisher) PublishEvent(event plevents.BaseEvent) {
-	if p.MockEventChan != nil {
-		p.MockEventChan <- event
-	}
-}
-
-func TestStartStopMonitor(t *testing.T) {
-	proxy := MockEventProxy{
-		MockEvents: []plevents.BaseEvent{
-			{
-				Event: plevents.ContainerCreated,
-				Ref:   "abc",
-			},
-			{
-				Event: plevents.ContainerStarted,
-				Ref:   "abc",
-			},
-			{
-				Event: plevents.ContainerStopped,
-				Ref:   "abc",
-			},
-		},
-		Delay: 1 * time.Second,
-	}
-	publisher := MockEventPublisher{
-		MockEventChan: make(chan plevents.BaseEvent, 3),
-	}
-	monitor := NewPortlayerEventMonitor(&proxy, &publisher)
-
-	var err error
-
-	// The actual tests
-	err = monitor.Start()
-	assert.Nil(t, err, "Expected monitor start to succeed, but received: %#v", err)
-
-	err = monitor.Start()
-	assert.NotEqual(t, err, nil, "Expected error but received nil on double start")
-	if err != nil {
-		assert.Contains(t, err.Error(), "Already started", "Expected already started error but received: %s", err)
-	}
-
-	monitor.Stop()
-}
-
-func TestEventMonitor(t *testing.T) {
-	proxy := MockEventProxy{
-		MockEvents: []plevents.BaseEvent{
-			{
-				Event: plevents.ContainerCreated,
-				Ref:   "abc",
-			},
-			{
-				Event: plevents.ContainerStarted,
-				Ref:   "abc",
-			},
-			{
-				Event: plevents.ContainerStopped,
-				Ref:   "abc",
-			},
-		},
-		Delay: 0,
-	}
-	publisher := MockEventPublisher{
-		MockEventChan: make(chan plevents.BaseEvent, 3),
-	}
-	monitor := NewPortlayerEventMonitor(&proxy, &publisher)
-
-	var err error
-
-	// The actual tests
-	err = monitor.Start()
-	assert.Nil(t, err, "Expected monitor start to succeed, but received: %#v", err)
-
-	time.Sleep(1 * time.Second)
-
-	count := len(publisher.MockEventChan)
-	for i := 0; i < count; i++ {
-		event := <-publisher.MockEventChan
-		assert.Equal(t, event.Event, proxy.MockEvents[i].Event, "Expected to find event %s but found %s", proxy.MockEvents[i].Event, event.Event)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/executor/SwarmBackend.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/executor/SwarmBackend.go
deleted file mode 100644
index 9ec6d2051b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/executor/SwarmBackend.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package executor
-
-import (
-	"fmt"
-	"io"
-	"time"
-
-	"github.com/docker/distribution"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/network"
-	swarmtypes "github.com/docker/docker/api/types/swarm"
-	clustertypes "github.com/docker/docker/daemon/cluster/provider"
-	"github.com/docker/docker/plugin"
-	"github.com/docker/docker/reference"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/cluster"
-	networktypes "github.com/docker/libnetwork/types"
-	"github.com/docker/swarmkit/agent/exec"
-	"golang.org/x/net/context"
-)
-
-type SwarmBackend struct {
-}
-
-func (b SwarmBackend) CreateManagedNetwork(clustertypes.NetworkCreateRequest) error {
-	return nil
-}
-
-func (b SwarmBackend) DeleteManagedNetwork(name string) error {
-	return nil
-}
-
-func (b SwarmBackend) FindNetwork(idName string) (libnetwork.Network, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) SetupIngress(req clustertypes.NetworkCreateRequest, nodeIP string) error {
-	return nil
-}
-
-func (b SwarmBackend) PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	return nil
-}
-
-func (b SwarmBackend) CreateManagedContainer(config types.ContainerCreateConfig) (container.ContainerCreateCreatedBody, error) {
-	return container.ContainerCreateCreatedBody{}, nil
-}
-
-func (b SwarmBackend) ContainerStart(name string, hostConfig *container.HostConfig, checkpoint string, checkpointDir string) error {
-	return nil
-}
-
-func (b SwarmBackend) ContainerStop(name string, seconds *int) error {
-	return nil
-}
-
-// ContainerLogs hooks up a container's stdout and stderr streams
-// configured with the given struct.
-func (b SwarmBackend) ContainerLogs(ctx context.Context, containerName string, config *backend.ContainerLogsConfig, started chan struct{}) error {
-	return nil
-}
-
-func (b SwarmBackend) ConnectContainerToNetwork(containerName, networkName string, endpointConfig *network.EndpointSettings) error {
-	return nil
-}
-
-func (b SwarmBackend) ActivateContainerServiceBinding(containerName string) error {
-	return nil
-}
-
-func (b SwarmBackend) DeactivateContainerServiceBinding(containerName string) error {
-	return nil
-}
-
-func (b SwarmBackend) UpdateContainerServiceConfig(containerName string, serviceConfig *clustertypes.ServiceConfig) error {
-	return nil
-}
-
-func (b SwarmBackend) ContainerInspectCurrent(name string, size bool) (*types.ContainerJSON, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) ContainerWaitWithContext(ctx context.Context, name string) error {
-	return nil
-}
-
-func (b SwarmBackend) ContainerRm(name string, config *types.ContainerRmConfig) error {
-	return nil
-}
-
-func (b SwarmBackend) ContainerKill(name string, sig uint64) error {
-	return nil
-}
-
-func (b SwarmBackend) SetContainerSecretStore(name string, store exec.SecretGetter) error {
-	return nil
-}
-
-func (b SwarmBackend) SetContainerSecretReferences(name string, refs []*swarmtypes.SecretReference) error {
-	return nil
-}
-
-func (b SwarmBackend) SystemInfo() (*types.Info, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) VolumeCreate(name, driverName string, opts, labels map[string]string) (*types.Volume, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) Containers(config *types.ContainerListOptions) ([]*types.Container, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) SetNetworkBootstrapKeys([]*networktypes.EncryptionKey) error {
-	return nil
-}
-
-func (b SwarmBackend) SetClusterProvider(provider cluster.Provider) {
-}
-
-func (b SwarmBackend) IsSwarmCompatible() error {
-	return fmt.Errorf("vSphere Integrated Containers Engine does not yet support Docker Swarm.")
-}
-
-func (b SwarmBackend) SubscribeToEvents(since, until time.Time, filter filters.Args) ([]events.Message, chan interface{}) {
-	return nil, nil
-}
-
-func (b SwarmBackend) UnsubscribeFromEvents(listener chan interface{}) {
-}
-
-func (b SwarmBackend) UpdateAttachment(string, string, string, *network.NetworkingConfig) error {
-	return nil
-}
-
-func (b SwarmBackend) WaitForDetachment(context.Context, string, string, string, string) error {
-	return nil
-}
-
-func (b SwarmBackend) GetRepository(context.Context, reference.NamedTagged, *types.AuthConfig) (distribution.Repository, bool, error) {
-	return nil, false, nil
-}
-
-func (b SwarmBackend) LookupImage(name string) (*types.ImageInspect, error) {
-	return nil, nil
-}
-
-func (b SwarmBackend) PluginManager() *plugin.Manager {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container.go
deleted file mode 100644
index a8aacecf48..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/docker/docker/api/types"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-// reused from docker/docker/daemon/list.go
-type ContainerListContext struct {
-	FilterContext
-
-	// Counter is the container iteration index for this context
-	Counter int
-	// ExitCode for the passed container
-	ExitCode int
-	// exitAllowed is a list of exit codes allowed to filter with
-	exitAllowed map[int]struct{}
-	// ContainerListOptions is the filters set by the user
-	*types.ContainerListOptions
-}
-
-// IncludeContainer will evaluate the filter criteria in listContext against the provided
-// container and determine what action to take. There are three options:
-//  * IncludeAction
-//  * ExcludeAction
-//  * StopAction
-func IncludeContainer(listContext *ContainerListContext, container *models.ContainerInfo) FilterAction {
-
-	// if we need to filter on name add to the listContext
-	if listContext.Filters.Include("name") {
-		// containerConfig allows for multiple names, but only 1 ever
-		// assigned
-		listContext.Name = container.ContainerConfig.Names[0]
-	}
-
-	// filter common requirements
-	act := filterCommon(&listContext.FilterContext, listContext.Filters)
-	if act != IncludeAction {
-		return act
-	}
-
-	// Stop iteration when the index is over the limit
-	if listContext.Limit > 0 && listContext.Counter == listContext.Limit {
-		return StopAction
-	}
-
-	// Do we have exit codes to evaluate
-	if len(listContext.exitAllowed) > 0 {
-
-		// Is the containers exitCode in the validatedList?
-		_, ok := listContext.exitAllowed[listContext.ExitCode]
-
-		// only include conainter whose exit code is in the list and that's
-		// not currently running and has been started previously
-		// note "Running" state is congruent with PortLayer and not docker
-		if !ok || container.ContainerConfig.State == "Running" || container.ProcessConfig.StartTime == 0 {
-			return ExcludeAction
-		}
-	}
-
-	state := DockerState(container.ContainerConfig.State)
-	// Do not include container if its status doesn't match the filter
-	if !listContext.Filters.Match("status", state) {
-		return ExcludeAction
-	}
-
-	// Filter on network name
-	if listContext.Filters.Include("network") {
-		netFilterValues := listContext.Filters.Get("network")
-
-		// Exclude the container if its network(s) match no supplied filter values
-		exists := false
-		for i := range netFilterValues {
-			for j := range container.Endpoints {
-				if netFilterValues[i] == container.Endpoints[j].Scope {
-					exists = true
-					break
-				}
-			}
-		}
-		if !exists {
-			return ExcludeAction
-		}
-	}
-
-	// Filter on volume name
-	if listContext.Filters.Include("volume") {
-		volFilterValues := listContext.Filters.Get("volume")
-
-		// Exclude the container if its volume(s) match no supplied filter values
-		exists := false
-		for i := range volFilterValues {
-			for j := range container.VolumeConfig {
-				if volFilterValues[i] == container.VolumeConfig[j].Name {
-					exists = true
-					break
-				}
-			}
-		}
-		if !exists {
-			return ExcludeAction
-		}
-	}
-
-	return IncludeAction
-}
-
-// ValidateContainerFilters validates that the container filters are
-// valid docker filters / values and supported by VIC.
-// The function reuses Docker's filter validation.
-func ValidateContainerFilters(options *types.ContainerListOptions, acceptedFilters map[string]bool, unSupportedFilters map[string]bool) (*ContainerListContext, error) {
-	containerFilters := options.Filters
-
-	// ensure filter options are valid and supported by vic
-	if err := ValidateFilters(containerFilters, acceptedFilters, unSupportedFilters); err != nil {
-		return nil, err
-	}
-
-	// we need all containers for these options, so set the All flag
-	if options.Limit > 0 || options.Latest {
-		options.All = true
-	}
-
-	var s struct{}
-	filtExited := make(map[int]struct{})
-
-	err := containerFilters.WalkValues("exited", func(value string) error {
-		code, err := strconv.Atoi(value)
-		if err != nil {
-			return err
-		}
-		// add valid exit code to map
-		filtExited[code] = s
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = containerFilters.WalkValues("status", func(value string) error {
-		if !IsValidDockerState(value) {
-			return fmt.Errorf("Unrecognised filter value for status: %s", value)
-		}
-		options.All = true
-		return nil
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	// return value
-	listContext := &ContainerListContext{
-		FilterContext:        FilterContext{},
-		exitAllowed:          filtExited,
-		ContainerListOptions: options,
-	}
-
-	err = containerFilters.WalkValues("before", func(value string) error {
-		var err error
-		before := cache.ContainerCache().GetContainer(value)
-		if before == nil {
-			err = fmt.Errorf("No such container: %s", value)
-		} else {
-			listContext.BeforeID = &before.ContainerID
-		}
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = containerFilters.WalkValues("since", func(value string) error {
-		var err error
-		since := cache.ContainerCache().GetContainer(value)
-		if since == nil {
-			err = fmt.Errorf("No such container: %s", value)
-		} else {
-			listContext.SinceID = &since.ContainerID
-		}
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return listContext, nil
-}
-
-// DockerState will attempt to transform the passed state
-// to a valid docker state
-// valid states are listed in the func IsValidContainerState
-func DockerState(containerState string) string {
-	var state string
-	switch containerState {
-	case "Stopped":
-		state = "exited"
-	case "Running":
-		state = "running"
-	case "Created":
-		state = "created"
-	default:
-		// not sure what to do, so just return
-		// what was given
-		state = containerState
-	}
-	return state
-}
-
-// IsValidDockerState will verify the provided state is
-// a valid docker container state
-func IsValidDockerState(s string) bool {
-
-	if s != "paused" &&
-		s != "restarting" &&
-		s != "removing" &&
-		s != "running" &&
-		s != "dead" &&
-		s != "created" &&
-		s != "exited" {
-		return false
-	}
-	return true
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container_test.go
deleted file mode 100644
index ee5b3c7c00..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/container_test.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	viccontainer "github.com/vmware/vic/lib/apiservers/engine/backends/container"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-func TestValidateContainerFilters(t *testing.T) {
-
-	options := &types.ContainerListOptions{
-		Filters: filters.NewArgs(),
-	}
-	options.Filters.Add("id", "12345")
-	options.Filters.Add("status", "running")
-	options.Filters.Add("exited", "143")
-	options.Filters.Add("exited", "127")
-	// valid status & exit
-	listContext, err := ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.NoError(t, err)
-
-	// we should have two exit codes added to the list
-	// context
-	assert.Equal(t, 2, len(listContext.exitAllowed))
-	assert.Equal(t, options.Filters, listContext.Filters)
-
-	// remove valid status and replace w/invalid
-	options.Filters.Del("status", "running")
-	options.Filters.Add("status", "jackedup")
-
-	// invalid status
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.Error(t, err)
-
-	// remove valid exit code and replace w/invalid
-	options.Filters.Del("exited", "143")
-	options.Filters.Add("exited", "abc")
-
-	// invalid exit code
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.Error(t, err)
-
-	// add an invalid container option
-	options.Filters.Add("jojo", "jojo")
-
-	// invalid container filter option
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.Error(t, err)
-
-	options.Filters.Del("jojo", "jojo")
-
-	// add before filter
-	options.Filters = filters.NewArgs()
-	options.Filters.Add("before", "1234")
-	// fail because the before container isn't present
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "No such container:")
-
-	// add the container to the cache
-	containerBefore := &viccontainer.VicContainer{
-		ContainerID: "12345",
-		Name:        "fuzzy",
-	}
-	cache.ContainerCache().AddContainer(containerBefore)
-
-	// successful before validation
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.NoError(t, err)
-
-	options.Filters.Add("since", "8888")
-
-	// fail because the since container isn't present
-	_, err = ValidateContainerFilters(options, acceptedPsFilterTags, unSupportedPsFilters)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "No such container:")
-
-}
-
-func TestDockerState(t *testing.T) {
-	vicState := make([]string, 4, 4)
-	vicState[0] = "Running"
-	vicState[1] = "Stopped"
-	vicState[2] = "Created"
-	vicState[3] = "sammy"
-
-	docker := make(map[string]bool)
-	docker["created"] = true
-	docker["running"] = true
-	docker["exited"] = true
-
-	// This is not a docker state, but is used to validate the
-	// default switch in the tested function
-	docker["sammy"] = false
-
-	for i := range vicState {
-		if _, ok := docker[DockerState(vicState[i])]; !ok {
-			t.Errorf("vicState doesn't map to docker state: %s", vicState[i])
-		}
-	}
-
-}
-
-func TestIncludeContainer(t *testing.T) {
-
-	ep := &models.EndpointConfig{
-		Scope: "bridge",
-	}
-	eps := make([]*models.EndpointConfig, 0)
-
-	vol := &models.VolumeConfig{
-		Name: "fooVol",
-	}
-	vols := make([]*models.VolumeConfig, 0)
-
-	contain := &models.ContainerInfo{
-		ContainerConfig: &models.ContainerConfig{
-			Names: []string{"jojo"},
-		},
-		ProcessConfig: &models.ProcessConfig{},
-		VolumeConfig:  append(vols, vol),
-		Endpoints:     append(eps, ep),
-	}
-
-	listCtx := &ContainerListContext{
-		ContainerListOptions: &types.ContainerListOptions{
-			Filters: filters.NewArgs()},
-	}
-
-	listCtx.Filters.Add("name", "jojo")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-
-	listCtx.Limit = 1
-	listCtx.Counter = listCtx.Limit
-	assert.Equal(t, StopAction, IncludeContainer(listCtx, contain))
-
-	// reset counter
-	listCtx.Counter = 0
-
-	// create exited map
-	var s struct{}
-	listCtx.exitAllowed = make(map[int]struct{})
-	listCtx.exitAllowed[137] = s
-
-	// exclude since no container exit code
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-
-	startTime := int64(4444)
-	contain.ProcessConfig.StartTime = startTime
-	listCtx.ExitCode = 137
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-
-	// test network name
-	listCtx.Filters = filters.NewArgs()
-	listCtx.Filters.Add("network", "bridge")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Add("network", "fooNet")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Del("network", "bridge")
-	listCtx.Filters.Del("network", "fooNet")
-	listCtx.Filters.Add("network", "barNet")
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-
-	listCtx.Filters = filters.NewArgs()
-	listCtx.Filters.Add("network", "missed")
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-
-	// test volume name
-	listCtx.Filters = filters.NewArgs()
-	listCtx.Filters.Add("volume", "fooVol")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Add("volume", "barVol")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Del("volume", "fooVol")
-	listCtx.Filters.Del("volume", "barVol")
-	listCtx.Filters.Add("volume", "quxVol")
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-
-	// test volume and network filters together
-	listCtx.Filters = filters.NewArgs()
-	listCtx.Filters.Add("volume", "fooVol")
-	listCtx.Filters.Add("network", "bridge")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Add("volume", "barVol")
-	listCtx.Filters.Add("network", "fooNet")
-	assert.Equal(t, IncludeAction, IncludeContainer(listCtx, contain))
-	listCtx.Filters.Del("volume", "fooVol")
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-
-	listCtx.Filters = filters.NewArgs()
-	listCtx.Filters.Add("status", "stopped")
-	assert.Equal(t, ExcludeAction, IncludeContainer(listCtx, contain))
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter.go
deleted file mode 100644
index 0fc2374866..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"github.com/docker/docker/api/types/filters"
-)
-
-// FilterAction represents possible results during filtering
-type FilterAction int
-
-const (
-	IncludeAction FilterAction = iota
-	ExcludeAction
-	StopAction
-)
-
-// FilterContext will hold the common filter requirements
-type FilterContext struct {
-	// ID of object to filter
-	ID string
-	// Name of object to filter
-	Name string
-	// BeforeID is the filter to ignore objects that appear before the one given
-	BeforeID *string
-	// SinceID is the filter to stop iterating
-	SinceID *string
-	// Labels of object to filter
-	Labels map[string]string
-}
-
-// filterCommon will filter the common criteria across objects
-func filterCommon(filterContext *FilterContext, cmdFilters filters.Args) FilterAction {
-
-	// have we made it to the beforeID
-	if filterContext.BeforeID != nil {
-		if filterContext.ID == *filterContext.BeforeID {
-			filterContext.BeforeID = nil
-		}
-		return ExcludeAction
-	}
-
-	// Stop iteration when the object arrives to the filter object
-	if filterContext.SinceID != nil {
-		if filterContext.ID == *filterContext.SinceID {
-			return StopAction
-		}
-	}
-
-	// Do not include object if any of the labels don't match
-	if !cmdFilters.MatchKVList("label", filterContext.Labels) {
-		return ExcludeAction
-	}
-
-	// Do not include if the id doesn't match
-	if !cmdFilters.Match("id", filterContext.ID) {
-		return ExcludeAction
-	}
-
-	if !cmdFilters.Match("name", filterContext.Name) {
-		return ExcludeAction
-	}
-
-	return IncludeAction
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter_test.go
deleted file mode 100644
index 38307460b8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/filter_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestFilterCommon(t *testing.T) {
-	cmdFilters := filters.NewArgs()
-	id := "123"
-	before := "456"
-
-	fContext := &FilterContext{
-		ID: id,
-	}
-
-	// no common filter
-	assert.Equal(t, IncludeAction, filterCommon(fContext, cmdFilters))
-
-	// exclude on Name
-	cmdFilters.Add("name", "jojo")
-	assert.Equal(t, ExcludeAction, filterCommon(fContext, cmdFilters))
-
-	// exclude on ID
-	cmdFilters.Add("id", before)
-	assert.Equal(t, ExcludeAction, filterCommon(fContext, cmdFilters))
-
-	// we've hit the before id exclude object
-	fContext.ID = before
-	fContext.BeforeID = &before
-	cmdFilters.Add("before", before)
-	assert.Equal(t, ExcludeAction, filterCommon(fContext, cmdFilters))
-
-	// stop due to since
-	since := "859"
-	fContext.SinceID = &since
-	fContext.ID = since
-	cmdFilters.Add("since", since)
-	assert.Equal(t, StopAction, filterCommon(fContext, cmdFilters))
-
-	// exclude based on label mismatch
-	fContext.Labels = createLabels()
-	fContext.ID = id
-	cmdFilters.Add("label", "joe")
-	assert.Equal(t, ExcludeAction, filterCommon(fContext, cmdFilters))
-}
-
-func createLabels() map[string]string {
-	labels := make(map[string]string)
-	labels["prod"] = "ATX"
-	labels["brown"] = "fox"
-	return labels
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image.go
deleted file mode 100644
index 0c0836b412..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"fmt"
-	"path"
-
-	"github.com/docker/distribution/reference"
-	"github.com/docker/docker/api/types/filters"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-)
-
-type ImageListContext struct {
-	FilterContext
-
-	// Tags for an image filtered by reference
-	Tags []string
-	// Digests for an image filtered by reference
-	Digests []string
-}
-
-/*
-* ValidateImageFilters will validate the image filters are
-* valid docker filters / values and supported by vic.
-*
-* The function will reuse dockers filter validation
-*
- */
-func ValidateImageFilters(cmdFilters filters.Args, acceptedFilters map[string]bool, unSupportedFilters map[string]bool) (*ImageListContext, error) {
-
-	// ensure filter options are valid and supported by vic
-	if err := ValidateFilters(cmdFilters, acceptedFilters, unSupportedFilters); err != nil {
-		return nil, err
-	}
-
-	// return value
-	imgFilterContext := &ImageListContext{}
-
-	err := cmdFilters.WalkValues("before", func(value string) error {
-		before, err := cache.ImageCache().Get(value)
-		if before == nil {
-			err = fmt.Errorf("No such image: %s", value)
-		} else {
-			imgFilterContext.BeforeID = &before.ImageID
-		}
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	err = cmdFilters.WalkValues("since", func(value string) error {
-		since, err := cache.ImageCache().Get(value)
-		if since == nil {
-			err = fmt.Errorf("No such image: %s", value)
-		} else {
-			imgFilterContext.SinceID = &since.ImageID
-		}
-		return err
-	})
-	if err != nil {
-		return nil, err
-	}
-	return imgFilterContext, nil
-
-}
-
-/*
-*	IncludeImage will evaluate the filter criteria in filterContext against the provided
-* 	image and determine what action to take.  There are three options:
-*		* IncludeAction
-*		* ExcludeAction
-*		* StopAction
-*
- */
-func IncludeImage(imgFilters filters.Args, listContext *ImageListContext) FilterAction {
-
-	// filter common requirements
-	act := filterCommon(&listContext.FilterContext, imgFilters)
-	if act != IncludeAction {
-		return act
-	}
-
-	// filter on image reference
-	if imgFilters.Include("reference") {
-		// references for this imageID
-		refs := cache.RepositoryCache().References(listContext.ID)
-		// reference filters
-		refFilters := imgFilters.Get("reference")
-
-		// reset the tags / digests
-		listContext.Tags = nil
-		listContext.Digests = nil
-
-		// iterate of reporsitory references and filters
-		for _, ref := range refs {
-			for _, rf := range refFilters {
-				// match on complete ref ie. busybox:latest
-				// #nosec: Errors unhandled.
-				matchRef, _ := path.Match(rf, ref.String())
-				// match on repo only ie. busybox
-				// #nosec: Errors unhandled.
-				matchName, _ := path.Match(rf, ref.Name())
-				// if either matched then add to tag / digest
-				if matchRef || matchName {
-					if _, ok := ref.(reference.Canonical); ok {
-						listContext.Digests = append(listContext.Digests, ref.String())
-					}
-					if _, ok := ref.(reference.NamedTagged); ok {
-						listContext.Tags = append(listContext.Tags, ref.String())
-					}
-				}
-			}
-		}
-		// if there were no reference matches then exclude the image
-		if len(listContext.Tags) == 0 && len(listContext.Digests) == 0 {
-			return ExcludeAction
-		}
-
-	}
-	return IncludeAction
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image_test.go
deleted file mode 100644
index af3c6d26fe..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/image_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/reference"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/metadata"
-)
-
-func loadImageCache(repo string, imageCount int, t *testing.T) {
-
-	for i := 0; i < imageCount; i++ {
-		id := fmt.Sprintf("120%d", i)
-		tag := fmt.Sprintf("1.0%d", i+1)
-		ref := fmt.Sprintf("%s:%s", repo, tag)
-		img := &metadata.ImageConfig{
-			ImageID:   id,
-			Tags:      []string{tag},
-			Name:      repo,
-			Reference: ref,
-		}
-		img.Created = time.Now().UTC()
-		img.ID = id
-		img.Config = &container.Config{}
-		cache.ImageCache().Add(img)
-
-		named, err := reference.ParseNamed(ref)
-		if err != nil {
-			t.Fatalf("Error while parsing reference %s: %#v", ref, err)
-		}
-		cache.RepositoryCache().AddReference(named, id, true, id, false)
-	}
-
-	assert.Equal(t, imageCount, len(cache.ImageCache().GetImages()))
-}
-
-func TestValidateImageFilters(t *testing.T) {
-	loadImageCache("busyboxy", 5, t)
-
-	cmdFilters := filters.NewArgs()
-	cmdFilters.Add("dangling", "true")
-	_, err := ValidateImageFilters(cmdFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	assert.Error(t, err)
-
-	cmdFilters.Del("dangling", "true")
-	cmdFilters.Add("before", "1200")
-	_, err = ValidateImageFilters(cmdFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "No such image")
-
-	cmdFilters.Del("before", "1200")
-	cmdFilters.Add("since", "1200")
-	_, err = ValidateImageFilters(cmdFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	assert.Error(t, err)
-	assert.Contains(t, err.Error(), "No such image")
-}
-
-func TestIncludeImage(t *testing.T) {
-	cmdFilters := filters.NewArgs()
-
-	cmdFilters.Add("before", "busyboxy:1.03")
-	imageContext, err := ValidateImageFilters(cmdFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	assert.NoError(t, err)
-	assert.Equal(t, "1202", *imageContext.BeforeID)
-
-	imageContext.ID = "1202"
-	action := IncludeImage(cmdFilters, imageContext)
-	assert.Equal(t, ExcludeAction, action)
-
-	imageContext.ID = "1200"
-	action = IncludeImage(cmdFilters, imageContext)
-	assert.Equal(t, IncludeAction, action)
-
-	cmdFilters.Del("before", "busyboxy:1.03")
-
-	cmdFilters.Add("since", "busyboxy:1.01")
-	imageContext, err = ValidateImageFilters(cmdFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	assert.NoError(t, err)
-
-	imageContext.ID = "1200"
-	action = IncludeImage(cmdFilters, imageContext)
-	assert.Equal(t, StopAction, action)
-
-	cmdFilters.Del("since", "busyboxy:1.01")
-	cmdFilters.Add("reference", "busy*")
-	imageContext.SinceID = nil
-	action = IncludeImage(cmdFilters, imageContext)
-	assert.Equal(t, IncludeAction, action)
-
-	// remove previous filter and reset tags / digests
-	cmdFilters.Del("reference", "busy*")
-	imageContext.Tags = []string{}
-	imageContext.Digests = []string{}
-	cmdFilters.Add("reference", "busyboxy:1.01")
-
-	action = IncludeImage(cmdFilters, imageContext)
-	assert.Equal(t, action, IncludeAction)
-	assert.EqualValues(t, 1, len(imageContext.Tags))
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation.go
deleted file mode 100644
index 16a0c03238..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/filters"
-)
-
-/*
-* ValidateFilters will evalute the provided filters against the docker acceptedFilters and
-* the filters vic currently doesn't support (unSupportedFilters)
- */
-func ValidateFilters(cmdFilters filters.Args, acceptedFilters map[string]bool, unSupportedFilters map[string]bool) error {
-
-	var err error
-
-	// ensure provided filter args are accepted
-	if err = cmdFilters.Validate(acceptedFilters); err != nil {
-		return err
-	}
-
-	// verify that vic supports the provided filter args
-	// will only make it here if all the filters are valid
-	if err = validateSupport(cmdFilters, unSupportedFilters); err != nil {
-		return err
-	}
-
-	return err
-}
-
-/*
-*	validateSupport will ensure the provided filter arguments are implemented
-*  	by vic
- */
-func validateSupport(cmdFilters filters.Args, unSupported map[string]bool) error {
-
-	for filter := range unSupported {
-		vals := cmdFilters.Get(filter)
-		if len(vals) > 0 {
-			return fmt.Errorf("filter %s is not currently supported by vic", filter)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation_test.go
deleted file mode 100644
index b1a18aeff5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/validation_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/stretchr/testify/assert"
-)
-
-// TODO: what can we do here...don't like this, but can't
-// reference upper package due to import constraints
-// valid filters as of docker commit 49bf474
-var acceptedImageFilterTags = map[string]bool{
-	"dangling":  true,
-	"label":     true,
-	"before":    true,
-	"since":     true,
-	"reference": true,
-}
-
-// currently not supported by vic
-var unSupportedImageFilters = map[string]bool{
-	"dangling": false,
-}
-
-// valid filters as of docker commit 49bf474
-var acceptedPsFilterTags = map[string]bool{
-	"ancestor":  true,
-	"before":    true,
-	"exited":    true,
-	"id":        true,
-	"isolation": true,
-	"label":     true,
-	"name":      true,
-	"status":    true,
-	"health":    true,
-	"since":     true,
-	"volume":    true,
-	"network":   true,
-	"is-task":   true,
-}
-
-// currently not supported by vic
-var unSupportedPsFilters = map[string]bool{
-	"ancestor":  false,
-	"health":    false,
-	"isolation": false,
-	"is-task":   false,
-}
-
-// valid volume filters as of Docker v1.13
-var acceptedVolumeFilterTags = map[string]bool{
-	"dangling": true,
-	"name":     true,
-	"driver":   true,
-	"label":    true,
-}
-
-func TestValidateFilters(t *testing.T) {
-	args := filters.NewArgs()
-	args.Add("id", "12345")
-	args.Add("name", "jojo")
-
-	// valid container filter
-	assert.NoError(t, ValidateFilters(args, acceptedPsFilterTags, unSupportedPsFilters))
-
-	// unsupported container filter
-	args.Add("isolation", "windows")
-	assert.Error(t, ValidateFilters(args, acceptedPsFilterTags, unSupportedPsFilters))
-
-	// invalid container filter
-	args.Add("failure", "yoyo")
-	assert.Error(t, ValidateFilters(args, acceptedPsFilterTags, unSupportedPsFilters))
-
-	// unsupported image filter
-	args = filters.NewArgs()
-	args.Add("dangling", "true")
-	assert.Error(t, ValidateFilters(args, acceptedImageFilterTags, unSupportedImageFilters))
-
-	// invalid image filter
-	args.Add("failure", "yoyo")
-	assert.Error(t, ValidateFilters(args, acceptedImageFilterTags, unSupportedImageFilters))
-
-	// valid image filter
-	args = filters.NewArgs()
-	args.Add("label", "124")
-	assert.NoError(t, ValidateFilters(args, acceptedImageFilterTags, unSupportedImageFilters))
-
-	// valid volume filter
-	args = filters.NewArgs()
-	args.Add("name", "vol")
-	assert.NoError(t, ValidateFilters(args, acceptedVolumeFilterTags, nil))
-
-	// invalid volume filter
-	args.Add("mountpoint", "/volumes")
-	assert.Error(t, ValidateFilters(args, acceptedVolumeFilterTags, nil))
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume.go
deleted file mode 100644
index d4c62c57fe..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"fmt"
-
-	"github.com/docker/docker/api/types/filters"
-)
-
-// VolumeFilterContext stores volume information used while filtering
-type VolumeFilterContext struct {
-	FilterContext
-
-	// Dangling is the value of the dangling filter if supplied
-	Dangling bool
-
-	// Joined tells whether the volume is joined to a container or not
-	Joined bool
-
-	// Driver is the volume's driver
-	Driver string
-}
-
-// ValidateVolumeFilters checks that the supplied filters are valid and supported
-// and returns a context used in the IncludeVolume func.
-func ValidateVolumeFilters(volFilters filters.Args, acceptedFilters, unSupportedFilters map[string]bool) (*VolumeFilterContext, error) {
-
-	if err := ValidateFilters(volFilters, acceptedFilters, unSupportedFilters); err != nil {
-		return nil, err
-	}
-
-	volFilterContext := &VolumeFilterContext{}
-
-	// Set value of dangling filter if it's supplied
-	if volFilters.Include("dangling") {
-
-		// Validate dangling filter's usage (per Docker code)
-		// Supported formats: dangling={true, false, 1, 0}
-		if volFilters.ExactMatch("dangling", "true") || volFilters.ExactMatch("dangling", "1") {
-			volFilterContext.Dangling = true
-		} else if !volFilters.ExactMatch("dangling", "false") && !volFilters.ExactMatch("dangling", "0") {
-			return nil, fmt.Errorf("invalid filter 'dangling=%s'", volFilters.Get("dangling"))
-		}
-	}
-
-	return volFilterContext, nil
-}
-
-// IncludeVolume evaluates volume filters and the filter context and returns
-// an action to indicate whether to include the volume in the output or not.
-func IncludeVolume(volumeFilters filters.Args, volFilterContext *VolumeFilterContext) FilterAction {
-
-	// Filter by name and label
-	action := filterCommon(&volFilterContext.FilterContext, volumeFilters)
-	if action != IncludeAction {
-		return action
-	}
-
-	if volumeFilters.Include("dangling") {
-		// Exclude the volume if dangling=false or it is joined,
-		// and if dangling=true or it is not joined
-		if (!volFilterContext.Dangling || volFilterContext.Joined) && (volFilterContext.Dangling || !volFilterContext.Joined) {
-			return ExcludeAction
-		}
-	}
-
-	if volumeFilters.Include("driver") {
-		if !volumeFilters.ExactMatch("driver", volFilterContext.Driver) {
-			return ExcludeAction
-		}
-	}
-
-	return IncludeAction
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume_test.go
deleted file mode 100644
index b30a0b1d4f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/filter/volume_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filter
-
-import (
-	"testing"
-
-	"github.com/docker/docker/api/types/filters"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestValidateVolumeFilters(t *testing.T) {
-
-	// Valid filters
-	volFilters := filters.NewArgs()
-	volFilters.Add("dangling", "true")
-	volFilters.Add("name", "mulder")
-	volFilters.Add("driver", "aliens")
-	volFilterContext, err := ValidateVolumeFilters(volFilters, acceptedVolumeFilterTags, nil)
-	assert.NoError(t, err)
-	assert.Equal(t, volFilterContext.Dangling, true)
-
-	// Change a filter's value
-	volFilters.Del("dangling", "true")
-	volFilters.Add("dangling", "false")
-	volFilterContext, err = ValidateVolumeFilters(volFilters, acceptedVolumeFilterTags, nil)
-	assert.NoError(t, err)
-	assert.Equal(t, volFilterContext.Dangling, false)
-
-	// Valid filter with invalid value
-	volFilters.Del("dangling", "false")
-	volFilters.Add("dangling", "no")
-	volFilterContext, err = ValidateVolumeFilters(volFilters, acceptedVolumeFilterTags, nil)
-	assert.Error(t, err)
-
-	// Invalid filter
-	volFilters.Add("mountpoint", "/volumes")
-	_, err = ValidateVolumeFilters(volFilters, acceptedVolumeFilterTags, nil)
-	assert.Error(t, err)
-}
-
-func TestIncludeVolume(t *testing.T) {
-
-	// Filter by dangling=true
-	volFilters := filters.NewArgs()
-	volFilters.Add("dangling", "true")
-	volFilterContext := &VolumeFilterContext{
-		FilterContext: FilterContext{
-			Name:   "scully",
-			Labels: map[string]string{"samplelabel": ""},
-		},
-		Driver:   "science",
-		Joined:   false,
-		Dangling: true,
-	}
-	action := IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, IncludeAction)
-
-	// Filter by dangling=false
-	volFilters.Del("dangling", "true")
-	volFilters.Add("dangling", "false")
-	volFilterContext.Dangling = false
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, ExcludeAction)
-
-	// Filter by name and dangling=false
-	volFilters.Add("name", "scul")
-	volFilterContext.Joined = true
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, IncludeAction)
-
-	// Filter by name, dangling=false and driver=science
-	volFilters.Add("driver", "science")
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, IncludeAction)
-
-	// Filter by incorrect name, dangling=false and incorrect driver
-	volFilterContext.Name = "mulder"
-	volFilterContext.Driver = "aliens"
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, ExcludeAction)
-
-	// Filter by name, dangling=false and incorrect driver
-	volFilterContext.Name = "scully"
-	volFilterContext.Driver = "science"
-	volFilters.Del("driver", "science")
-	volFilters.Add("driver", "sci")
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, ExcludeAction)
-
-	// Filter by correct label
-	volFilters = filters.NewArgs()
-	volFilters.Add("label", "samplelabel")
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, IncludeAction)
-
-	// Filter by incorrect label
-	volFilters.Del("label", "samplelabel")
-	volFilters.Add("label", "wronglabel")
-	action = IncludeVolume(volFilters, volFilterContext)
-	assert.Equal(t, action, ExcludeAction)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image.go
deleted file mode 100644
index 041b1c39e3..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/api/types"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/api/types/registry"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/reference"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	vicfilter "github.com/vmware/vic/lib/apiservers/engine/backends/filter"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/imagec"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-// valid filters as of docker commit 49bf474
-var acceptedImageFilterTags = map[string]bool{
-	"dangling":  true,
-	"label":     true,
-	"before":    true,
-	"since":     true,
-	"reference": true,
-}
-
-// currently not supported by vic
-var unSupportedImageFilters = map[string]bool{
-	"dangling": false,
-}
-
-type Image struct {
-}
-
-func NewImageBackend() *Image {
-	return &Image{}
-}
-
-func (i *Image) Exists(containerName string) bool {
-	return false
-}
-
-// TODO fix the errors so the client doesnt print the generic POST or DELETE message
-func (i *Image) ImageDelete(imageRef string, force, prune bool) ([]types.ImageDelete, error) {
-	defer trace.End(trace.Begin(imageRef))
-
-	var (
-		deletedRes  []types.ImageDelete
-		userRefIsID bool
-	)
-
-	// Use the image cache to go from the reference to the ID we use in the image store
-	img, err := cache.ImageCache().Get(imageRef)
-	if err != nil {
-		return nil, err
-	}
-
-	tags := img.Tags
-	digests := img.Digests
-
-	// did the user pass an id or partial id
-	userRefIsID = cache.ImageCache().IsImageID(imageRef)
-	// do we have any reference conflicts
-	if len(tags) > 1 && userRefIsID && !force {
-		t := uid.Parse(img.ImageID).Truncate()
-		return nil,
-			fmt.Errorf("conflict: unable to delete %s (must be forced) - image is referenced in one or more repositories", t)
-	}
-
-	// if we have an ID or only 1 tag/digest lets delete the vmdk(s) via the PL
-	if userRefIsID || len(tags) == 1 || len(digests) == 1 {
-		log.Infof("Deleting image via PL %s (%s)", img.ImageID, img.ID)
-
-		// storeName is the uuid of the host this service is running on.
-		storeName, err := sys.UUID()
-		if err != nil {
-			return nil, err
-		}
-
-		// We're going to delete all of the images in the layer branch starting
-		// at the given leaf.  BUT!  we need to keep the images which may be
-		// referenced by tags.  Therefore, we need to assemble a list of images
-		// (by URI) which are referred to by tags.
-		allImages := cache.ImageCache().GetImages()
-		keepNodes := make([]string, len(allImages))
-		for idx, node := range allImages {
-			imgURL, err := util.ImageURL(storeName, node.ImageID)
-			if err != nil {
-				return nil, err
-			}
-
-			keepNodes[idx] = imgURL.String()
-		}
-
-		params := storage.NewDeleteImageParamsWithContext(ctx).WithStoreName(storeName).WithID(img.ID).WithKeepNodes(keepNodes)
-		// TODO: This will fail if any containerVMs are referencing the vmdk - vanilla docker
-		// allows the removal of an image (via force flag) even if a container is referencing it
-		// should vic?
-		res, err := PortLayerClient().Storage.DeleteImage(params)
-
-		// We may have deleted images despite error.  Account for that in the cache.
-		if res != nil {
-			for _, deletedImage := range res.Payload {
-
-				// map the layer id to the blob sum so the ids map to what we
-				// present to the user on pull
-				id := deletedImage.ID
-				i, err := imagec.LayerCache().Get(deletedImage.ID)
-				if err == nil {
-					id = i.Layer.BlobSum
-				}
-
-				// remove the layer from the layer cache (used by imagec)
-				imagec.LayerCache().Remove(deletedImage.ID)
-
-				// form the response
-				imageDeleted := types.ImageDelete{Deleted: strings.TrimPrefix(id, "sha256:")}
-				deletedRes = append(deletedRes, imageDeleted)
-			}
-
-			if err := imagec.LayerCache().Save(); err != nil {
-				return nil, fmt.Errorf("failed to save layer cache: %s", err)
-			}
-		}
-
-		if err != nil {
-			switch err := err.(type) {
-			case *storage.DeleteImageLocked:
-				return nil, fmt.Errorf("Failed to remove image %q: %s", imageRef, err.Payload.Message)
-			default:
-				return nil, err
-			}
-		}
-
-		// we've deleted the image so remove from cache
-		cache.ImageCache().RemoveImageByConfig(img)
-		if err := cache.ImageCache().Save(); err != nil {
-			return nil, fmt.Errorf("failed to save image cache: %s", err)
-		}
-
-		actor := CreateImageEventActorWithAttributes(imageRef, imageRef, map[string]string{})
-		EventService().Log("delete", eventtypes.ImageEventType, actor)
-	} else {
-
-		// only untag the ref supplied
-		n, err := reference.ParseNamed(imageRef)
-		if err != nil {
-			return nil, fmt.Errorf("unable to parse reference(%s): %s", imageRef, err.Error())
-		}
-		tag := reference.WithDefaultTag(n)
-		tags = []string{tag.String()}
-
-		actor := CreateImageEventActorWithAttributes(imageRef, imageRef, map[string]string{})
-		EventService().Log("untag", eventtypes.ImageEventType, actor)
-	}
-	// loop thru and remove from repoCache
-	for i := range tags {
-		// remove from cache, but don't save -- we'll do that afer all
-		// updates
-		// #nosec: Errors unhandled.
-		refNamed, _ := cache.RepositoryCache().Remove(tags[i], false)
-		deletedRes = append(deletedRes, types.ImageDelete{Untagged: refNamed})
-	}
-
-	for i := range digests {
-		// #nosec: Errors unhandled.
-		refNamed, _ := cache.RepositoryCache().Remove(digests[i], false)
-		deletedRes = append(deletedRes, types.ImageDelete{Untagged: refNamed})
-	}
-
-	// save repo now -- this will limit the number of PL
-	// calls to one per rmi call
-	err = cache.RepositoryCache().Save()
-	if err != nil {
-		return nil, fmt.Errorf("Untag error: %s", err.Error())
-	}
-
-	return deletedRes, err
-}
-
-func (i *Image) ImageHistory(imageName string) ([]*types.ImageHistory, error) {
-	return nil, fmt.Errorf("%s does not yet implement image.History", ProductName())
-}
-
-func (i *Image) Images(imageFilters filters.Args, all bool, withExtraAttrs bool) ([]*types.ImageSummary, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("imageFilters: %#v", imageFilters)))
-
-	// validate filters for accuracy and support
-	filterContext, err := vicfilter.ValidateImageFilters(imageFilters, acceptedImageFilterTags, unSupportedImageFilters)
-	if err != nil {
-		return nil, err
-	}
-
-	// get all images
-	images := cache.ImageCache().GetImages()
-
-	result := make([]*types.ImageSummary, 0, len(images))
-
-imageLoop:
-	for i := range images {
-
-		// provide filter with current ImageID
-		filterContext.ID = images[i].ImageID
-
-		// provide image labels
-		if images[i].Config != nil {
-			filterContext.Labels = images[i].Config.Labels
-		}
-
-		// determine if image should be part of list
-		action := vicfilter.IncludeImage(imageFilters, filterContext)
-
-		switch action {
-		case vicfilter.ExcludeAction:
-			continue imageLoop
-		case vicfilter.StopAction:
-			break imageLoop
-		}
-		// if we are here then add image
-		dockerImage := convertV1ImageToDockerImage(images[i])
-		// reference is a filter, so we must add the tags / digests
-		// identified by the filter
-		if imageFilters.Include("reference") {
-			dockerImage.RepoTags = filterContext.Tags
-			dockerImage.RepoDigests = filterContext.Digests
-
-		}
-		result = append(result, dockerImage)
-	}
-
-	return result, nil
-}
-
-// Docker Inspect.  LookupImage looks up an image by name and returns it as an
-// ImageInspect structure.
-func (i *Image) LookupImage(name string) (*types.ImageInspect, error) {
-	defer trace.End(trace.Begin("LookupImage (docker inspect)"))
-
-	imageConfig, err := cache.ImageCache().Get(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return imageConfigToDockerImageInspect(imageConfig, ProductName()), nil
-}
-
-func (i *Image) TagImage(imageName, repository, tag string) error {
-	img, err := cache.ImageCache().Get(imageName)
-	if err != nil {
-		return err
-	}
-
-	newTag, err := reference.WithName(repository)
-	if err != nil {
-		return err
-	}
-	if tag != "" {
-		if newTag, err = reference.WithTag(newTag, tag); err != nil {
-			return err
-		}
-	}
-
-	// place tag in repo and save to portLayer k/v store
-	err = cache.RepositoryCache().AddReference(newTag, img.ImageID, true, "", true)
-	if err != nil {
-		return err
-	}
-
-	actor := CreateImageEventActorWithAttributes(imageName, newTag.String(), map[string]string{})
-	EventService().Log("tag", eventtypes.ImageEventType, actor)
-
-	return nil
-}
-
-func (i *Image) ImagesPrune(pruneFilters filters.Args) (*types.ImagesPruneReport, error) {
-	return nil, fmt.Errorf("%s does not yet implement image.ImagesPrune", ProductName())
-}
-
-func (i *Image) LoadImage(inTar io.ReadCloser, outStream io.Writer, quiet bool) error {
-	return fmt.Errorf("%s does not yet implement image.LoadImage", ProductName())
-}
-
-func (i *Image) ImportImage(src string, repository, tag string, msg string, inConfig io.ReadCloser, outStream io.Writer, changes []string) error {
-	return fmt.Errorf("%s does not yet implement image.ImportImage", ProductName())
-}
-
-func (i *Image) ExportImage(names []string, outStream io.Writer) error {
-	return fmt.Errorf("%s does not yet implement image.ExportImage", ProductName())
-}
-
-func (i *Image) PullImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	defer trace.End(trace.Begin(""))
-
-	log.Debugf("PullImage: image = %s, tag = %s, metaheaders = %+v\n", image, tag, metaHeaders)
-
-	//***** Code from Docker 1.13 PullImage to convert image and tag to a ref
-	image = strings.TrimSuffix(image, ":")
-
-	ref, err := reference.ParseNamed(image)
-	if err != nil {
-		return err
-	}
-
-	if tag != "" {
-		// The "tag" could actually be a digest.
-		var dgst digest.Digest
-		dgst, err = digest.ParseDigest(tag)
-		if err == nil {
-			ref, err = reference.WithDigest(reference.TrimNamed(ref), dgst)
-		} else {
-			ref, err = reference.WithTag(ref, tag)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	//*****
-
-	options := imagec.Options{
-		Destination: os.TempDir(),
-		Reference:   ref,
-		Timeout:     imagec.DefaultHTTPTimeout,
-		Outstream:   outStream,
-	}
-
-	portLayerServer := PortLayerServer()
-	if portLayerServer != "" {
-		options.Host = portLayerServer
-	}
-
-	ic := imagec.NewImageC(options, streamformatter.NewJSONStreamFormatter())
-	ic.ParseReference()
-	// create url from hostname
-	hostnameURL, err := url.Parse(ic.Registry)
-	if err != nil || hostnameURL.Hostname() == "" {
-		hostnameURL, err = url.Parse("//" + ic.Registry)
-		if err != nil {
-			log.Infof("Error parsing hostname %s during registry access: %s", ic.Registry, err.Error())
-		}
-	}
-
-	// Check if url is contained within set of whitelisted or insecure registries
-	regctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-	whitelistOk, _, insecureOk := vchConfig.RegistryCheck(regctx, hostnameURL)
-	if !whitelistOk {
-		err = fmt.Errorf("Access denied to unauthorized registry (%s) while VCH is in whitelist mode", hostnameURL.Host)
-		log.Errorf(err.Error())
-		sf := streamformatter.NewJSONStreamFormatter()
-		outStream.Write(sf.FormatError(err))
-		return nil
-	}
-
-	ic.InsecureAllowHTTP = insecureOk
-	ic.RegistryCAs = RegistryCertPool
-
-	if authConfig != nil {
-		if len(authConfig.Username) > 0 {
-			ic.Username = authConfig.Username
-		}
-		if len(authConfig.Password) > 0 {
-			ic.Password = authConfig.Password
-		}
-	}
-
-	log.Infof("PullImage: reference: %s, %s, portlayer: %#v",
-		ic.Reference,
-		ic.Host,
-		portLayerServer)
-
-	err = ic.PullImage()
-	if err != nil {
-		return err
-	}
-
-	//TODO:  Need repo name as second parameter.  Leave blank for now
-	actor := CreateImageEventActorWithAttributes(image, "", map[string]string{})
-	EventService().Log("pull", eventtypes.ImageEventType, actor)
-	return nil
-}
-
-func (i *Image) PushImage(ctx context.Context, image, tag string, metaHeaders map[string][]string, authConfig *types.AuthConfig, outStream io.Writer) error {
-	return fmt.Errorf("%s does not yet implement image.PushImage", ProductName())
-}
-
-func (i *Image) SearchRegistryForImages(ctx context.Context, filtersArgs string, term string, limit int, authConfig *types.AuthConfig, metaHeaders map[string][]string) (*registry.SearchResults, error) {
-	return nil, fmt.Errorf("%s does not yet implement image.SearchRegistryForImages", ProductName())
-}
-
-// Utility functions
-
-func convertV1ImageToDockerImage(image *metadata.ImageConfig) *types.ImageSummary {
-	var labels map[string]string
-	if image.Config != nil {
-		labels = image.Config.Labels
-	}
-
-	return &types.ImageSummary{
-		ID:          image.ImageID,
-		ParentID:    image.Parent,
-		RepoTags:    image.Tags,
-		RepoDigests: image.Digests,
-		Created:     image.Created.Unix(),
-		Size:        image.Size,
-		VirtualSize: image.Size,
-		Labels:      labels,
-	}
-}
-
-// Converts the data structure retrieved from the portlayer.  This src datastructure
-// represents the unmarshalled data saved in the storage port layer.  The return
-// data is what the Docker CLI understand and returns to user.
-func imageConfigToDockerImageInspect(imageConfig *metadata.ImageConfig, productName string) *types.ImageInspect {
-	if imageConfig == nil {
-		return nil
-	}
-
-	rootfs := types.RootFS{
-		Type:      "layers",
-		Layers:    make([]string, 0, len(imageConfig.History)),
-		BaseLayer: "",
-	}
-
-	for k := range imageConfig.DiffIDs {
-		rootfs.Layers = append(rootfs.Layers, k)
-	}
-
-	inspectData := &types.ImageInspect{
-		RepoTags:        imageConfig.Tags,
-		RepoDigests:     imageConfig.Digests,
-		Parent:          imageConfig.Parent,
-		Comment:         imageConfig.Comment,
-		Created:         imageConfig.Created.Format(time.RFC3339Nano),
-		Container:       imageConfig.Container,
-		ContainerConfig: &imageConfig.ContainerConfig,
-		DockerVersion:   imageConfig.DockerVersion,
-		Author:          imageConfig.Author,
-		Config:          imageConfig.Config,
-		Architecture:    imageConfig.Architecture,
-		Os:              imageConfig.OS,
-		Size:            imageConfig.Size,
-		VirtualSize:     imageConfig.Size,
-		RootFS:          rootfs,
-	}
-
-	inspectData.GraphDriver.Name = productName + " " + PortlayerName
-
-	//imageid is currently stored within VIC without "sha256:" so we add it to
-	//match Docker
-	inspectData.ID = "sha256:" + imageConfig.ImageID
-
-	return inspectData
-}
-
-func CreateImageEventActorWithAttributes(imageID, refName string, attributes map[string]string) eventtypes.Actor {
-	if imageConfig, err := cache.ImageCache().Get(imageID); err == nil && imageConfig != nil {
-		for k, v := range imageConfig.Config.Labels {
-			attributes[k] = v
-		}
-	}
-
-	if refName != "" {
-		attributes["name"] = refName
-	}
-
-	return eventtypes.Actor{
-		ID:         imageID,
-		Attributes: attributes,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image_test.go
deleted file mode 100644
index cc5199f7ea..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/image_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/docker/docker/api/types/container"
-	v1 "github.com/docker/docker/image"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/metadata"
-)
-
-func TestConvertV1ImageToDockerImage(t *testing.T) {
-	now := time.Now()
-
-	image := &metadata.ImageConfig{
-		V1Image: v1.V1Image{
-			ID:      "deadbeef",
-			Size:    1024,
-			Created: now,
-			Parent:  "",
-			Config: &container.Config{
-				Labels: map[string]string{},
-			},
-		},
-		ImageID:   "test_id",
-		Digests:   []string{fmt.Sprintf("%s@sha:%s", "test_name", "12345")},
-		Tags:      []string{fmt.Sprintf("%s:%s", "test_name", "test_tag")},
-		Name:      "test_name",
-		DiffIDs:   map[string]string{"test_diffid": "test_layerid"},
-		History:   []v1.History{},
-		Reference: "test_name:test_tag",
-	}
-
-	dockerImage := convertV1ImageToDockerImage(image)
-
-	assert.Equal(t, image.ImageID, dockerImage.ID, "Error: expected id %s, got %s", image.ImageID, dockerImage.ID)
-	assert.Equal(t, image.Size, dockerImage.VirtualSize, "Error: expected size %s, got %s", image.Size, dockerImage.VirtualSize)
-	assert.Equal(t, image.Size, dockerImage.Size, "Error: expected size %s, got %s", image.Size, dockerImage.Size)
-	assert.Equal(t, image.Created.Unix(), dockerImage.Created, "Error: expected created %s, got %s", image.Created, dockerImage.Created)
-	assert.Equal(t, image.Parent, dockerImage.ParentID, "Error: expected parent %s, got %s", image.Parent, dockerImage.ParentID)
-	assert.Equal(t, image.Config.Labels, dockerImage.Labels, "Error: expected labels %s, got %s", image.Config.Labels, dockerImage.Labels)
-	assert.Equal(t, image.Digests[0], dockerImage.RepoDigests[0], "Error: expected digest %s, got %s", image.Digests[0], dockerImage.RepoDigests[0])
-	assert.Equal(t, image.Tags[0], dockerImage.RepoTags[0], "Error: expected tag %s, got %s", image.Tags[0], dockerImage.RepoTags[0])
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/kv/kv.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/kv/kv.go
deleted file mode 100644
index d6c6e02661..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/kv/kv.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kv
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	ckv "github.com/vmware/vic/lib/apiservers/portlayer/client/kv"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/pkg/trace"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-const (
-
-	// defaultNamespace is the first part of the
-	// k/v store key (i.e. docker.stuff)
-	defaultNamespace = "docker"
-	defaultSeparator = "."
-)
-
-var (
-	ErrKeyNotFound = errors.New("key not found")
-)
-
-// Get will call to the portlayer for the value of the specified key
-// The key argument is prefixed w/the defaultName space for the docker
-// persona. i.e. docker.{key}
-//
-// If the key doesn't exist an ErrKeyNotFound will be returned
-func Get(client *client.PortLayer, key string) (string, error) {
-	defer trace.End(trace.Begin(key))
-	var val string
-	resp, err := client.Kv.GetValue(ckv.NewGetValueParamsWithContext(
-		context.Background()).WithKey(createNameSpacedKey(key)))
-	if err != nil {
-		switch err.(type) {
-		case *ckv.GetValueNotFound:
-			return val, ErrKeyNotFound
-		default:
-			log.Errorf("Error Getting Key/Value: %s", err.Error())
-			return val, err
-		}
-	}
-	val = resp.Payload.Value
-	// return the value
-	return val, nil
-
-}
-
-// Put will put the key / value in the portlayer k/v store
-func Put(client *client.PortLayer, key string, val string) error {
-	defer trace.End(trace.Begin(key))
-
-	fullKey := createNameSpacedKey(key)
-	keyval := &models.KeyValue{
-		Key:   fullKey,
-		Value: val,
-	}
-
-	_, err := client.Kv.PutValue(ckv.NewPutValueParamsWithContext(
-		context.Background()).WithKey(fullKey).WithKeyValue(keyval))
-	if err != nil {
-		log.Errorf("Error Putting Key/Value: %s", err)
-		return err
-	}
-
-	return nil
-}
-
-// Delete will remove the key / value from the store
-func Delete(client *client.PortLayer, key string) error {
-	defer trace.End(trace.Begin(key))
-
-	_, err := client.Kv.DeleteValue(ckv.NewDeleteValueParamsWithContext(
-		context.Background()).WithKey(createNameSpacedKey(key)))
-	if err != nil {
-		log.Errorf("Error Deleting Key/Value: %s", err)
-		return err
-	}
-
-	return nil
-}
-
-func createNameSpacedKey(key string) string {
-	return fmt.Sprintf("%s%s%s", defaultNamespace, defaultSeparator, key)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/network.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/network.go
deleted file mode 100644
index e5955e7a53..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/network.go
+++ /dev/null
@@ -1,528 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"net"
-	"sync"
-	"time"
-
-	"net/http"
-
-	log "github.com/Sirupsen/logrus"
-	derr "github.com/docker/docker/api/errors"
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	apinet "github.com/docker/docker/api/types/network"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/networkdb"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/engine/backends/convert"
-	vicendpoint "github.com/vmware/vic/lib/apiservers/engine/backends/endpoint"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/scopes"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-type Network struct {
-}
-
-func NewNetworkBackend() *Network {
-	return &Network{}
-}
-
-func (n *Network) NetworkControllerEnabled() bool {
-	return false
-}
-
-func (n *Network) FindNetwork(idName string) (libnetwork.Network, error) {
-	ok, err := PortLayerClient().Scopes.List(scopes.NewListParamsWithContext(ctx).WithIDName(idName))
-	if err != nil {
-		switch err := err.(type) {
-		case *scopes.ListNotFound:
-			return nil, derr.NewRequestNotFoundError(fmt.Errorf("network %s not found", idName))
-
-		case *scopes.ListDefault:
-			return nil, derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return nil, derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	return &network{cfg: ok.Payload[0]}, nil
-}
-
-func (n *Network) GetNetworkByName(idName string) (libnetwork.Network, error) {
-	ok, err := PortLayerClient().Scopes.List(scopes.NewListParamsWithContext(ctx).WithIDName(idName))
-	if err != nil {
-		switch err := err.(type) {
-		case *scopes.ListNotFound:
-			return nil, nil
-
-		case *scopes.ListDefault:
-			return nil, derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return nil, derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	return &network{cfg: ok.Payload[0]}, nil
-}
-
-func (n *Network) GetNetworksByID(partialID string) []libnetwork.Network {
-	ok, err := PortLayerClient().Scopes.List(scopes.NewListParamsWithContext(ctx).WithIDName(partialID))
-	if err != nil {
-		return nil
-	}
-
-	nets := make([]libnetwork.Network, len(ok.Payload))
-	for i, cfg := range ok.Payload {
-		nets[i] = &network{cfg: cfg}
-	}
-
-	return nets
-}
-
-func (n *Network) GetNetworks() []libnetwork.Network {
-	ok, err := PortLayerClient().Scopes.ListAll(scopes.NewListAllParamsWithContext(ctx))
-	if err != nil {
-		return nil
-	}
-
-	nets := make([]libnetwork.Network, len(ok.Payload))
-	for i, cfg := range ok.Payload {
-		nets[i] = &network{cfg: cfg}
-		i++
-	}
-
-	return nets
-}
-
-func (n *Network) CreateNetwork(nc types.NetworkCreateRequest) (*types.NetworkCreateResponse, error) {
-	if nc.IPAM != nil && len(nc.IPAM.Config) > 1 {
-		return nil, fmt.Errorf("at most one ipam config supported")
-	}
-
-	var gateway, subnet string
-	var pools []string
-	if nc.IPAM != nil && len(nc.IPAM.Config) > 0 {
-		if nc.IPAM.Config[0].Gateway != "" {
-			gateway = nc.IPAM.Config[0].Gateway
-		}
-
-		if nc.IPAM.Config[0].Subnet != "" {
-			subnet = nc.IPAM.Config[0].Subnet
-		}
-
-		if nc.IPAM.Config[0].IPRange != "" {
-			pools = append(pools, nc.IPAM.Config[0].IPRange)
-		}
-	}
-
-	if nc.Driver == "" {
-		nc.Driver = "bridge"
-	}
-
-	cfg := &models.ScopeConfig{
-		Gateway:     gateway,
-		Name:        nc.Name,
-		ScopeType:   nc.Driver,
-		Subnet:      subnet,
-		IPAM:        pools,
-		Annotations: make(map[string]string),
-		Internal:    nc.Internal,
-	}
-
-	// Marshal and encode the labels for transport and storage in the portlayer
-	if labelsBytes, err := json.Marshal(nc.Labels); err == nil {
-		encodedLabels := base64.StdEncoding.EncodeToString(labelsBytes)
-		cfg.Annotations[convert.AnnotationKeyLabels] = encodedLabels
-	} else {
-		log.Errorf("error marshaling labels: %s", err)
-		return nil, derr.NewErrorWithStatusCode(fmt.Errorf("unable to marshal labels: %s", err), http.StatusInternalServerError)
-	}
-
-	created, err := PortLayerClient().Scopes.CreateScope(scopes.NewCreateScopeParamsWithContext(ctx).WithConfig(cfg))
-	if err != nil {
-		switch err := err.(type) {
-		case *scopes.CreateScopeConflict:
-			return nil, derr.NewErrorWithStatusCode(fmt.Errorf("network %s already exists", nc.Name), http.StatusConflict)
-
-		case *scopes.CreateScopeDefault:
-			return nil, derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return nil, derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	ncResponse := &types.NetworkCreateResponse{
-		ID:      created.Payload.ID,
-		Warning: "",
-	}
-
-	return ncResponse, nil
-}
-
-func (n *Network) ConnectContainerToNetwork(containerName, networkName string, endpointConfig *apinet.EndpointSettings) error {
-	vc := cache.ContainerCache().GetContainer(containerName)
-	if vc != nil {
-		containerName = vc.ContainerID
-	}
-
-	client := PortLayerClient()
-	getRes, err := client.Containers.Get(containers.NewGetParamsWithContext(ctx).WithID(containerName))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf(err.Payload.Message))
-
-		case *containers.GetDefault:
-			return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	h := getRes.Payload
-	nc := &models.NetworkConfig{NetworkName: networkName}
-	if endpointConfig != nil {
-		if endpointConfig.IPAMConfig != nil && endpointConfig.IPAMConfig.IPv4Address != "" {
-			nc.Address = endpointConfig.IPAMConfig.IPv4Address
-
-		}
-
-		// Pass Links and Aliases to PL
-		nc.Aliases = vicendpoint.Alias(endpointConfig)
-	}
-
-	addConRes, err := client.Scopes.AddContainer(scopes.NewAddContainerParamsWithContext(ctx).
-		WithScope(nc.NetworkName).
-		WithConfig(&models.ScopesAddContainerConfig{
-			Handle:        h,
-			NetworkConfig: nc,
-		}))
-	if err != nil {
-		switch err := err.(type) {
-		case *scopes.AddContainerNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf(err.Payload.Message))
-
-		case *scopes.AddContainerInternalServerError:
-			return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	h = addConRes.Payload
-
-	// only bind if the container is running
-	// get the state of the container
-	getStateRes, err := client.Containers.GetState(containers.NewGetStateParamsWithContext(ctx).WithHandle(h))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.GetStateNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf(err.Payload.Message))
-
-		case *containers.GetStateDefault:
-			return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	h = getStateRes.Payload.Handle
-	if getStateRes.Payload.State == "RUNNING" {
-		bindRes, err := client.Scopes.BindContainer(scopes.NewBindContainerParamsWithContext(ctx).WithHandle(h))
-		if err != nil {
-			switch err := err.(type) {
-			case *scopes.BindContainerNotFound:
-				return derr.NewRequestNotFoundError(fmt.Errorf(err.Payload.Message))
-
-			case *scopes.BindContainerInternalServerError:
-				return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-			default:
-				return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-			}
-		}
-
-		defer func() {
-			if err == nil {
-				return
-			}
-			if _, err2 := client.Scopes.UnbindContainer(scopes.NewUnbindContainerParamsWithContext(ctx).WithHandle(h)); err2 != nil {
-				log.Warnf("failed bind container rollback: %s", err2)
-			}
-		}()
-
-		h = bindRes.Payload.Handle
-	}
-
-	// commit handle
-	_, err = client.Containers.Commit(containers.NewCommitParamsWithContext(ctx).WithHandle(h))
-	if err != nil {
-		switch err := err.(type) {
-		case *containers.CommitNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf(err.Payload.Message))
-
-		case *containers.CommitDefault:
-			return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	return nil
-}
-
-func (n *Network) DisconnectContainerFromNetwork(containerName string, networkName string, force bool) error {
-	vc := cache.ContainerCache().GetContainer(containerName)
-	if vc != nil {
-		containerName = vc.ContainerID
-	}
-	return fmt.Errorf("%s does not yet implement network.DisconnectContainerFromNetwork", ProductName())
-}
-
-func (n *Network) DeleteNetwork(name string) error {
-	client := PortLayerClient()
-
-	if _, err := client.Scopes.DeleteScope(scopes.NewDeleteScopeParamsWithContext(ctx).WithIDName(name)); err != nil {
-		switch err := err.(type) {
-		case *scopes.DeleteScopeNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf("network %s not found", name))
-
-		case *scopes.DeleteScopeInternalServerError:
-			return derr.NewErrorWithStatusCode(fmt.Errorf(err.Payload.Message), http.StatusInternalServerError)
-
-		default:
-			return derr.NewErrorWithStatusCode(err, http.StatusInternalServerError)
-		}
-	}
-
-	return nil
-}
-
-func (n *Network) NetworksPrune(pruneFilters filters.Args) (*types.NetworksPruneReport, error) {
-	return nil, fmt.Errorf("%s does not yet implement NetworksPrune", ProductName())
-}
-
-// network implements the libnetwork.Network and libnetwork.NetworkInfo interfaces
-type network struct {
-	sync.Mutex
-
-	cfg *models.ScopeConfig
-}
-
-// A user chosen name for this network.
-func (n *network) Name() string {
-	return n.cfg.Name
-}
-
-// A system generated id for this network.
-func (n *network) ID() string {
-	return n.cfg.ID
-}
-
-// The type of network, which corresponds to its managing driver.
-func (n *network) Type() string {
-	return n.cfg.ScopeType
-}
-
-// Create a new endpoint to this network symbolically identified by the
-// specified unique name. The options parameter carry driver specific options.
-func (n *network) CreateEndpoint(name string, options ...libnetwork.EndpointOption) (libnetwork.Endpoint, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-// Delete the network.
-func (n *network) Delete() error {
-	return fmt.Errorf("not implemented")
-}
-
-// Endpoints returns the list of Endpoint(s) in this network.
-func (n *network) Endpoints() []libnetwork.Endpoint {
-	eps := make([]libnetwork.Endpoint, len(n.cfg.Endpoints))
-	for i, e := range n.cfg.Endpoints {
-		eps[i] = &endpoint{ep: e, sc: n.cfg}
-	}
-
-	return eps
-}
-
-// WalkEndpoints uses the provided function to walk the Endpoints
-func (n *network) WalkEndpoints(walker libnetwork.EndpointWalker) {
-	for _, e := range n.cfg.Endpoints {
-		if walker(&endpoint{ep: e, sc: n.cfg}) {
-			return
-		}
-	}
-}
-
-// EndpointByName returns the Endpoint which has the passed name. If not found, the error ErrNoSuchEndpoint is returned.
-func (n *network) EndpointByName(name string) (libnetwork.Endpoint, error) {
-	for _, e := range n.cfg.Endpoints {
-		if e.Name == name {
-			return &endpoint{ep: e, sc: n.cfg}, nil
-		}
-	}
-
-	return nil, fmt.Errorf("not found")
-}
-
-// EndpointByID returns the Endpoint which has the passed id. If not found, the error ErrNoSuchEndpoint is returned.
-func (n *network) EndpointByID(id string) (libnetwork.Endpoint, error) {
-	for _, e := range n.cfg.Endpoints {
-		if e.ID == id {
-			return &endpoint{ep: e, sc: n.cfg}, nil
-		}
-	}
-
-	return nil, fmt.Errorf("not found")
-}
-
-// Return certain operational data belonging to this network
-func (n *network) Info() libnetwork.NetworkInfo {
-	return n
-}
-
-func (n *network) IpamConfig() (string, map[string]string, []*libnetwork.IpamConf, []*libnetwork.IpamConf) {
-	n.Lock()
-	defer n.Unlock()
-
-	confs := make([]*libnetwork.IpamConf, len(n.cfg.IPAM))
-	for j, i := range n.cfg.IPAM {
-		conf := &libnetwork.IpamConf{
-			PreferredPool: n.cfg.Subnet,
-			Gateway:       "",
-		}
-
-		if i != n.cfg.Subnet {
-			conf.SubPool = i
-		}
-
-		if n.cfg.Gateway != "" {
-			conf.Gateway = n.cfg.Gateway
-		}
-
-		confs[j] = conf
-	}
-
-	return "", make(map[string]string), confs, nil
-}
-
-func (n *network) IpamInfo() ([]*libnetwork.IpamInfo, []*libnetwork.IpamInfo) {
-	n.Lock()
-	defer n.Unlock()
-
-	var infos []*libnetwork.IpamInfo
-	for _, i := range n.cfg.IPAM {
-		_, pool, err := net.ParseCIDR(i)
-		if err != nil {
-			continue
-		}
-
-		info := &libnetwork.IpamInfo{
-			Meta: make(map[string]string),
-		}
-
-		info.Pool = pool
-		if n.cfg.Gateway != "" {
-			info.Gateway = &net.IPNet{
-				IP:   net.ParseIP(n.cfg.Gateway),
-				Mask: net.CIDRMask(32, 32),
-			}
-		}
-
-		info.AuxAddresses = make(map[string]*net.IPNet)
-		infos = append(infos, info)
-	}
-
-	return infos, nil
-}
-
-func (n *network) DriverOptions() map[string]string {
-	return make(map[string]string)
-}
-
-func (n *network) Scope() string {
-	return ""
-}
-
-func (n *network) IPv6Enabled() bool {
-	return false
-}
-
-func (n *network) Internal() bool {
-	n.Lock()
-	defer n.Unlock()
-
-	return n.cfg.Internal
-}
-
-// Labels decodes and unmarshals the stored blob of network labels.
-func (n *network) Labels() map[string]string {
-	n.Lock()
-	defer n.Unlock()
-
-	labels := make(map[string]string)
-	if n.cfg.Annotations == nil {
-		return labels
-	}
-
-	// Look for the Docker-specific annotation (label) blob and process it for the output
-	if encodedLabels, ok := n.cfg.Annotations[convert.AnnotationKeyLabels]; ok {
-
-		if labelsBytes, decodeErr := base64.StdEncoding.DecodeString(encodedLabels); decodeErr == nil {
-			if unmarshalErr := json.Unmarshal(labelsBytes, &labels); unmarshalErr != nil {
-				log.Errorf("error unmarshaling labels: %s", unmarshalErr)
-			}
-		} else {
-			log.Errorf("error decoding label blob: %s", decodeErr)
-		}
-	}
-
-	return labels
-}
-
-func (n *network) Attachable() bool {
-	return false //?
-}
-
-func (n *network) Dynamic() bool {
-	return false //?
-}
-
-func (n *network) Created() time.Time {
-	return time.Now()
-}
-
-// Peers returns a slice of PeerInfo structures which has the information about the peer
-// nodes participating in the same overlay network. This is currently the per-network
-// gossip cluster. For non-dynamic overlay networks and bridge networks it returns an
-// empty slice
-func (n *network) Peers() []networkdb.PeerInfo {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/plugins.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/plugins.go
deleted file mode 100644
index b564f72707..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/plugins.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-
-	enginetypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/reference"
-	"golang.org/x/net/context"
-)
-
-type Plugin struct {
-}
-
-func NewPluginBackend() *Plugin {
-	return &Plugin{}
-}
-
-func (p *Plugin) Disable(name string, config *enginetypes.PluginDisableConfig) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Enable(name string, config *enginetypes.PluginEnableConfig) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) List() ([]enginetypes.Plugin, error) {
-	return nil, fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Inspect(name string) (*enginetypes.Plugin, error) {
-	return nil, PluginNotFoundError(name)
-}
-
-func (p *Plugin) Remove(name string, config *enginetypes.PluginRmConfig) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Set(name string, args []string) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Privileges(ctx context.Context, ref reference.Named, metaHeaders http.Header, authConfig *enginetypes.AuthConfig) (enginetypes.PluginPrivileges, error) {
-	return nil, fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Pull(ctx context.Context, ref reference.Named, name string, metaHeaders http.Header, authConfig *enginetypes.AuthConfig, privileges enginetypes.PluginPrivileges, outStream io.Writer) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) Push(ctx context.Context, name string, metaHeaders http.Header, authConfig *enginetypes.AuthConfig, outStream io.Writer) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
-
-func (p *Plugin) CreateFromContext(ctx context.Context, tarCtx io.ReadCloser, options *enginetypes.PluginCreateOptions) error {
-	return fmt.Errorf("%s does not yet support plugins", ProductName())
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/portmap/portmap.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/portmap/portmap.go
deleted file mode 100644
index 340b2e6aa6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/portmap/portmap.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package portmap
-
-import (
-	"fmt"
-	"net"
-	"strconv"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/libnetwork/iptables"
-)
-
-type Operation int
-
-const (
-	Map Operation = iota
-	Unmap
-)
-
-func (o Operation) String() string {
-	switch o {
-	case Map:
-		return "Map"
-
-	case Unmap:
-		return "Unmap"
-	}
-
-	return "Unknown"
-}
-
-type PortMapper interface {
-	MapPort(ip net.IP, port int, proto string, destIP string, destPort int, srcIface, destIface string) error
-	UnmapPort(ip net.IP, port int, proto string, destPort int, srcIface, destIface string) error
-}
-
-type bindKey struct {
-	ip   string
-	port int
-}
-
-type portMapper struct {
-	sync.Mutex
-
-	bindings map[bindKey][][]string
-}
-
-func NewPortMapper() PortMapper {
-	return &portMapper{bindings: make(map[bindKey][][]string)}
-}
-
-func (p *portMapper) isPortAvailable(proto string, ip net.IP, port int) bool {
-	addr := ""
-	if ip != nil && !ip.IsUnspecified() {
-		addr = ip.String()
-	}
-
-	if _, ok := p.bindings[bindKey{addr, port}]; ok {
-		return false
-	}
-
-	c, err := net.Dial(proto, net.JoinHostPort(addr, strconv.Itoa(port)))
-	defer func() {
-		if c != nil {
-			// #nosec: Errors unhandled.
-			c.Close()
-		}
-	}()
-
-	if err != nil {
-		return true
-	}
-
-	return false
-}
-
-func (p *portMapper) MapPort(ip net.IP, port int, proto string, destIP string, destPort int, srcIface, destIface string) error {
-	p.Lock()
-	defer p.Unlock()
-
-	// check if port is available
-	if !p.isPortAvailable(proto, ip, port) {
-		return fmt.Errorf("port %d is not available", port)
-	}
-
-	if port <= 0 {
-		return fmt.Errorf("source port must be specified")
-	}
-
-	if destPort <= 0 {
-		log.Infof("destination port not specified, using source port %d", port)
-		destPort = port
-	}
-
-	return p.forward(Map, ip, port, proto, destIP, destPort, srcIface, destIface)
-}
-
-func (p *portMapper) UnmapPort(ip net.IP, port int, proto string, destPort int, srcIface, destIface string) error {
-	p.Lock()
-	defer p.Unlock()
-
-	if port <= 0 {
-		return fmt.Errorf("source port must be specified")
-	}
-
-	if destPort <= 0 {
-		log.Infof("destination port not specified, using source port %d", port)
-		destPort = port
-	}
-
-	return p.forward(Unmap, ip, port, proto, "", destPort, srcIface, destIface)
-}
-
-// iptablesRunAndCheck runs an iptables command with the provided args
-func iptablesRunAndCheck(action iptables.Action, args []string) error {
-	args = append([]string{string(action)}, args...)
-	if output, err := iptables.Raw(args...); err != nil {
-		return err
-	} else if len(output) != 0 {
-		return iptables.ChainError{Chain: "FORWARD", Output: output}
-	}
-	return nil
-}
-
-// iptablesDelete takes the saved args from the Append operation
-// and uses them to delete the previously added rules
-func iptablesDelete(args [][]string) error {
-	var errs []error
-	for _, cmd := range args {
-		if err := iptablesRunAndCheck(iptables.Delete, cmd); err != nil {
-			errs = append(errs, err)
-		}
-	}
-	if len(errs) > 0 {
-		return fmt.Errorf("Failed to delete iptables rules: %s", errs)
-	}
-	return nil
-}
-
-// adapted from https://github.com/docker/libnetwork/blob/master/iptables/iptables.go
-//
-// assumes p is locked
-func (p *portMapper) forward(op Operation, ip net.IP, port int, proto, destAddr string, destPort int, srcIface, destIface string) error {
-	daddr := ip.String()
-	if ip == nil || ip.IsUnspecified() {
-		// iptables interprets "0.0.0.0" as "0.0.0.0/32", whereas we
-		// want "0.0.0.0/0". "0/0" is correctly interpreted as "any
-		// value" by both iptables and ip6tables.
-		daddr = "0/0"
-	}
-	ipStr := ""
-	if ip != nil && !ip.IsUnspecified() {
-		ipStr = ip.String()
-	}
-
-	key := bindKey{ip: ipStr, port: port}
-	switch op {
-	case Unmap:
-		// lookup commands to reverse
-		if args, ok := p.bindings[key]; ok {
-			if err := iptablesDelete(args); err != nil {
-				return err
-			}
-			delete(p.bindings, bindKey{ipStr, port})
-			return nil
-		}
-		return fmt.Errorf("Failed to find unmap data for %s:%d", ipStr, port)
-
-	case Map:
-		var savedArgs [][]string
-
-		args := []string{"VIC", "-t", string(iptables.Nat),
-			"-i", srcIface,
-			"-p", proto,
-			"-d", daddr,
-			"--dport", strconv.Itoa(port),
-			"-j", "DNAT",
-			"--to-destination", net.JoinHostPort(destAddr, strconv.Itoa(destPort))}
-		if err := iptablesRunAndCheck(iptables.Append, args); err != nil {
-			return err
-		}
-		savedArgs = append(savedArgs, args)
-		p.bindings[key] = savedArgs
-
-		// allow traffic from container to container via vch public interface
-		args = []string{"VIC", "-t", string(iptables.Nat),
-			"-i", destIface,
-			"-p", proto,
-			"--dport", strconv.Itoa(port),
-			"-j", "DNAT",
-			"--to-destination", net.JoinHostPort(destAddr, strconv.Itoa(destPort)),
-			"-m", "addrtype",
-			"--dst-type", "LOCAL"}
-		if err := iptablesRunAndCheck(iptables.Append, args); err != nil {
-			return err
-		}
-		savedArgs = append(savedArgs, args)
-		p.bindings[key] = savedArgs
-
-		// rule to allow connections from the public interface for
-		// the mapped port
-		args = []string{"VIC", "-t", string(iptables.Filter),
-			"-i", srcIface,
-			"-o", destIface,
-			"-p", proto,
-			"-d", destAddr,
-			"--dport", strconv.Itoa(destPort),
-			"-j", "ACCEPT"}
-		if err := iptablesRunAndCheck(iptables.Append, args); err != nil {
-			return err
-		}
-		savedArgs = append(savedArgs, args)
-		p.bindings[key] = savedArgs
-
-		args = []string{"POSTROUTING", "-t", string(iptables.Nat),
-			"-p", proto,
-			"-d", destAddr,
-			"--dport", strconv.Itoa(destPort),
-			"-j", "MASQUERADE"}
-		if err := iptablesRunAndCheck(iptables.Append, args); err != nil {
-			return err
-		}
-		savedArgs = append(savedArgs, args)
-		p.bindings[key] = savedArgs
-		return nil
-
-	default:
-		log.Warnf("noop for given operation: %s", op)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/sandbox.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/sandbox.go
deleted file mode 100644
index 80c02641d7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/sandbox.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"net"
-
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/libnetwork"
-	"github.com/docker/libnetwork/types"
-)
-
-type sandbox struct {
-	id          string
-	containerID string
-}
-
-func newSandbox(containerID string) *sandbox {
-	return &sandbox{
-		id:          stringid.GenerateRandomID(),
-		containerID: containerID,
-	}
-}
-
-// ID returns the ID of the sandbox
-func (s *sandbox) ID() string {
-	return s.id
-}
-
-// Key returns the sandbox's key
-func (s *sandbox) Key() string {
-	return ""
-}
-
-// ContainerID returns the container id associated to this sandbox
-func (s *sandbox) ContainerID() string {
-	return s.containerID
-}
-
-// Labels returns the sandbox's labels
-func (s *sandbox) Labels() map[string]interface{} {
-	return nil
-}
-
-// Statistics retrieves the interfaces' statistics for the sandbox
-func (s *sandbox) Statistics() (map[string]*types.InterfaceStatistics, error) {
-	return nil, notImplementedError
-}
-
-// Refresh leaves all the endpoints, resets and re-apply the options,
-// re-joins all the endpoints without destroying the osl sandbox
-func (s *sandbox) Refresh(options ...libnetwork.SandboxOption) error {
-	return notImplementedError
-}
-
-// SetKey updates the Sandbox Key
-func (s *sandbox) SetKey(key string) error {
-	return notImplementedError
-}
-
-// Rename changes the name of all attached Endpoints
-func (s *sandbox) Rename(name string) error {
-	return notImplementedError
-
-}
-
-// Delete destroys this container after detaching it from all connected endpoints.
-func (s *sandbox) Delete() error {
-	return notImplementedError
-
-}
-
-// ResolveName resolves a service name to an IPv4 or IPv6 address by searching
-// the networks the sandbox is connected to. For IPv6 queries, second  return
-// value will be true if the name exists in docker domain but doesn't have an
-// IPv6 address. Such queries shouldn't be forwarded  to external nameservers.
-func (s *sandbox) ResolveName(name string, iplen int) ([]net.IP, bool) {
-	return nil, false
-
-}
-
-// ResolveIP returns the service name for the passed in IP. IP is in reverse dotted
-// notation; the format used for DNS PTR records
-func (s *sandbox) ResolveIP(name string) string {
-	return ""
-
-}
-
-// Endpoints returns all the endpoints connected to the sandbox
-func (s *sandbox) Endpoints() []libnetwork.Endpoint {
-	return nil
-}
-
-// ResolveService returns all the backend details about the containers or hosts
-// backing a service. Its purpose is to satisfy an SRV query
-func (s *sandbox) ResolveService(name string) ([]*net.SRV, []net.IP) {
-	return nil, nil
-}
-
-// EnableService  makes a managed container's service available by adding the
-// endpoint to the service load balancer and service discovery
-func (s *sandbox) EnableService() error {
-	return notImplementedError
-}
-
-// DisableService removes a managed contianer's endpoints from the load balancer
-// and service discovery
-func (s *sandbox) DisableService() error {
-	return notImplementedError
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/swarm.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/swarm.go
deleted file mode 100644
index 624b83e364..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/swarm.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"fmt"
-
-	"golang.org/x/net/context"
-
-	basictypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/backend"
-	types "github.com/docker/docker/api/types/swarm"
-)
-
-type Swarm struct {
-}
-
-func NewSwarmBackend() *Swarm {
-	return &Swarm{}
-}
-
-func (s *Swarm) Init(req types.InitRequest) (string, error) {
-	return "", fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) Join(req types.JoinRequest) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) Leave(force bool) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) Inspect() (types.Swarm, error) {
-	return types.Swarm{}, SwarmNotSupportedError()
-}
-
-func (s *Swarm) Update(uint64, types.Spec, types.UpdateFlags) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) GetUnlockKey() (string, error) {
-	return "", fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) UnlockSwarm(req types.UnlockRequest) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) GetServices(basictypes.ServiceListOptions) ([]types.Service, error) {
-	return nil, SwarmNotSupportedError()
-}
-
-func (s *Swarm) GetService(string) (types.Service, error) {
-	return types.Service{}, SwarmNotSupportedError()
-}
-
-func (s *Swarm) CreateService(types.ServiceSpec, string) (*basictypes.ServiceCreateResponse, error) {
-	return nil, fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) UpdateService(string, uint64, types.ServiceSpec, string, string) (*basictypes.ServiceUpdateResponse, error) {
-	return nil, fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) RemoveService(string) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) ServiceLogs(context.Context, string, *backend.ContainerLogsConfig, chan struct{}) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) GetNodes(basictypes.NodeListOptions) ([]types.Node, error) {
-	return nil, SwarmNotSupportedError()
-}
-
-func (s *Swarm) GetNode(string) (types.Node, error) {
-	return types.Node{}, SwarmNotSupportedError()
-}
-
-func (s *Swarm) UpdateNode(string, uint64, types.NodeSpec) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) RemoveNode(string, bool) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) GetTasks(basictypes.TaskListOptions) ([]types.Task, error) {
-	return nil, SwarmNotSupportedError()
-}
-
-func (s *Swarm) GetTask(string) (types.Task, error) {
-	return types.Task{}, SwarmNotSupportedError()
-}
-
-func (s *Swarm) GetSecrets(opts basictypes.SecretListOptions) ([]types.Secret, error) {
-	return nil, fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) CreateSecret(sp types.SecretSpec) (string, error) {
-	return "", fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) RemoveSecret(id string) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) GetSecret(id string) (types.Secret, error) {
-	return types.Secret{}, fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
-
-func (s *Swarm) UpdateSecret(id string, version uint64, spec types.SecretSpec) error {
-	return fmt.Errorf("%s does not yet support Docker Swarm", ProductName())
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system.go
deleted file mode 100644
index 75f8fbf862..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system.go
+++ /dev/null
@@ -1,446 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-//****
-// system.go
-//
-// Rules for code to be in here:
-// 1. No remote or swagger calls.  Move those code to system_portlayer.go
-// 2. Always return docker engine-api compatible errors.
-//		- Do NOT return fmt.Errorf()
-//		- Do NOT return errors.New()
-//		- DO USE the aliased docker error package 'derr'
-//		- It is OK to return errors returned from functions in system_portlayer.go
-
-import (
-	"crypto/x509"
-	"fmt"
-	"net/url"
-	"runtime"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/imagec"
-	urlfetcher "github.com/vmware/vic/pkg/fetcher"
-	"github.com/vmware/vic/pkg/registry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-
-	"github.com/docker/docker/api/types"
-	eventtypes "github.com/docker/docker/api/types/events"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/docker/daemon/events"
-	"github.com/docker/docker/pkg/platform"
-	"github.com/docker/go-units"
-)
-
-type System struct {
-	systemProxy VicSystemProxy
-}
-
-const (
-	systemStatusMhz          = " VCH CPU limit"
-	systemStatusMemory       = " VCH memory limit"
-	systemStatusCPUUsageMhz  = " VCH CPU usage"
-	systemStatusMemUsage     = " VCH memory usage"
-	systemOS                 = " VMware OS"
-	systemOSVersion          = " VMware OS version"
-	systemProductName        = " VMware Product"
-	volumeStoresID           = "VolumeStores"
-	loginTimeout             = 20 * time.Second
-	infoTimeout              = 5 * time.Second
-	vchWhitelistMode         = " Registry Whitelist Mode"
-	whitelistRegistriesLabel = " Whitelisted Registries"
-	insecureRegistriesLabel  = " Insecure Registries"
-)
-
-// var for use by other engine components
-var systemBackend *System
-
-func NewSystemBackend() *System {
-	systemBackend = &System{
-		systemProxy: &SystemProxy{},
-	}
-	return systemBackend
-}
-
-func (s *System) SystemInfo() (*types.Info, error) {
-	defer trace.End(trace.Begin("SystemInfo"))
-	client := PortLayerClient()
-
-	// Retrieve container status from port layer
-	running, paused, stopped, err := s.systemProxy.ContainerCount()
-	if err != nil {
-		log.Infof("System.SytemInfo unable to get global status on containers: %s", err.Error())
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), infoTimeout)
-	defer cancel()
-
-	vchConfig := vchConfig.update(ctx)
-
-	vchConfig.Lock()
-	defer vchConfig.Unlock()
-
-	cfg := vchConfig.Cfg
-
-	// Build up the struct that the Remote API and CLI wants
-	info := &types.Info{
-		Driver:             PortLayerName(),
-		IndexServerAddress: imagec.DefaultDockerURL,
-		ServerVersion:      ProductVersion(),
-		ID:                 ProductName(),
-		Containers:         running + paused + stopped,
-		ContainersRunning:  running,
-		ContainersPaused:   paused,
-		ContainersStopped:  stopped,
-		Images:             getImageCount(),
-		Debug:              cfg.Diagnostics.DebugLevel > 0,
-		NGoroutines:        runtime.NumGoroutine(),
-		SystemTime:         time.Now().Format(time.RFC3339Nano),
-		LoggingDriver:      "",
-		CgroupDriver:       "",
-		DockerRootDir:      "",
-		ClusterStore:       "",
-		ClusterAdvertise:   "",
-
-		// FIXME: Get this info once we have event listening service
-		//	NEventsListener    int
-
-		// These are system related.  Some refer to cgroup info.  Others are
-		// retrieved from the port layer and are information about the resource
-		// pool.
-		Name:          cfg.Name,
-		KernelVersion: "",
-		Architecture:  platform.Architecture, //stubbed
-
-		// NOTE: These values have no meaning for VIC.  We default them to true to
-		// prevent the CLI from displaying warning messages.
-		CPUCfsPeriod:      true,
-		CPUCfsQuota:       true,
-		CPUShares:         true,
-		CPUSet:            true,
-		OomKillDisable:    true,
-		MemoryLimit:       true,
-		SwapLimit:         true,
-		KernelMemory:      true,
-		IPv4Forwarding:    true,
-		BridgeNfIptables:  true,
-		BridgeNfIP6tables: true,
-		HTTPProxy:         "",
-		HTTPSProxy:        "",
-		NoProxy:           "",
-	}
-
-	// Add in network info from the VCH via guestinfo
-	for _, network := range cfg.ContainerNetworks {
-		info.Plugins.Network = append(info.Plugins.Network, network.Name)
-	}
-
-	info.SystemStatus = make([][2]string, 0)
-
-	// Add in volume label from the VCH via guestinfo
-	volumeStoreString, err := FetchVolumeStores(client)
-	if err != nil {
-		log.Infof("Unable to get the volume store list from the portlayer : %s", err.Error())
-	} else {
-		customInfo := [2]string{volumeStoresID, volumeStoreString}
-		info.SystemStatus = append(info.SystemStatus, customInfo)
-
-		// Show a list of supported volume drivers if there's at least one volume
-		// store configured for the VCH. "local" is excluded because it's the default
-		// driver supplied by the Docker client and is equivalent to "vsphere" in
-		// our implementation.
-		if len(volumeStoreString) > 0 {
-			for driver := range supportedVolDrivers {
-				if driver != "local" {
-					info.Plugins.Volume = append(info.Plugins.Volume, driver)
-				}
-			}
-		}
-	}
-
-	if s.systemProxy.PingPortlayer() {
-		status := [2]string{PortLayerName(), "RUNNING"}
-		info.SystemStatus = append(info.SystemStatus, status)
-	} else {
-		status := [2]string{PortLayerName(), "STOPPED"}
-		info.SystemStatus = append(info.SystemStatus, status)
-	}
-
-	// Add in vch information
-	vchInfo, err := s.systemProxy.VCHInfo()
-	if err != nil || vchInfo == nil {
-		log.Infof("System.SystemInfo unable to get vch info from port layer: %s", err.Error())
-	} else {
-		if vchInfo.CPUMhz > 0 {
-			info.NCPU = int(vchInfo.CPUMhz)
-
-			customInfo := [2]string{systemStatusMhz, fmt.Sprintf("%d MHz", info.NCPU)}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.Memory > 0 {
-			info.MemTotal = vchInfo.Memory * 1024 * 1024 // Get Mebibytes
-
-			customInfo := [2]string{systemStatusMemory, units.BytesSize(float64(info.MemTotal))}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.CPUUsage >= 0 {
-			customInfo := [2]string{systemStatusCPUUsageMhz, fmt.Sprintf("%d MHz", int(vchInfo.CPUUsage))}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.MemUsage >= 0 {
-			customInfo := [2]string{systemStatusMemUsage, units.BytesSize(float64(vchInfo.MemUsage))}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.HostProductName != "" {
-			customInfo := [2]string{systemProductName, vchInfo.HostProductName}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.HostOS != "" {
-			info.OperatingSystem = vchInfo.HostOS
-			info.OSType = vchInfo.HostOS //Value for OS and OS Type the same from vmomi
-
-			customInfo := [2]string{systemOS, vchInfo.HostOS}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if vchInfo.HostOSVersion != "" {
-			customInfo := [2]string{systemOSVersion, vchInfo.HostOSVersion}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if len(vchConfig.Insecure) > 0 {
-			customInfo := [2]string{insecureRegistriesLabel, strings.Join(vchConfig.Insecure.Strings(), ",")}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-		if len(vchConfig.Whitelist) > 0 {
-			s := "enabled"
-			if vchConfig.remoteWl {
-				s += "; remote source"
-			}
-			customInfo := [2]string{vchWhitelistMode, s}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-			customInfo = [2]string{whitelistRegistriesLabel, strings.Join(vchConfig.Whitelist.Strings(), ",")}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		} else {
-			customInfo := [2]string{vchWhitelistMode, "disabled.  All registry access allowed."}
-			info.SystemStatus = append(info.SystemStatus, customInfo)
-		}
-	}
-
-	return info, nil
-}
-
-// layout for build time as per constants defined in https://golang.org/src/time/format.go
-const buildTimeLayout = "2006/01/02@15:04:05"
-
-func (s *System) SystemVersion() types.Version {
-	Arch := runtime.GOARCH
-
-	BuildTime := version.BuildDate
-	if t, err := time.Parse(buildTimeLayout, BuildTime); err == nil {
-		// match time format from docker version's output
-		BuildTime = t.Format(time.ANSIC)
-	}
-
-	Experimental := true
-	GitCommit := version.GitCommit
-	GoVersion := runtime.Version()
-	// FIXME: fill with real kernel version
-	KernelVersion := "-"
-	Os := runtime.GOOS
-	Version := version.Version
-	if Version != "" && Version[0] == 'v' {
-		// match version format from docker version's output
-		Version = Version[1:]
-	}
-
-	// go runtime panics without this so keep this here
-	// until we find a repro case and report it to upstream
-	_ = Arch
-
-	version := types.Version{
-		APIVersion:    version.DockerAPIVersion,
-		MinAPIVersion: version.DockerMinimumVersion,
-		Arch:          Arch,
-		BuildTime:     BuildTime,
-		Experimental:  Experimental,
-		GitCommit:     GitCommit,
-		GoVersion:     GoVersion,
-		KernelVersion: KernelVersion,
-		Os:            Os,
-		Version:       Version,
-	}
-
-	return version
-}
-
-// SystemCPUMhzLimit will return the VCH configured Mhz limit
-func (s *System) SystemCPUMhzLimit() (int64, error) {
-	vchInfo, err := s.systemProxy.VCHInfo()
-	if err != nil || vchInfo == nil {
-		return 0, err
-	}
-	return vchInfo.CPUMhz, nil
-}
-
-func (s *System) SystemDiskUsage() (*types.DiskUsage, error) {
-	return nil, fmt.Errorf("%s does not yet implement SystemDiskUsage", ProductName())
-}
-
-func (s *System) SubscribeToEvents(since, until time.Time, filter filters.Args) ([]eventtypes.Message, chan interface{}) {
-	defer trace.End(trace.Begin(""))
-
-	ef := events.NewFilter(filter)
-	return EventService().SubscribeTopic(since, until, ef)
-}
-
-func (s *System) UnsubscribeFromEvents(listener chan interface{}) {
-	defer trace.End(trace.Begin(""))
-	EventService().Evict(listener)
-}
-
-// AuthenticateToRegistry handles docker logins
-func (s *System) AuthenticateToRegistry(ctx context.Context, authConfig *types.AuthConfig) (string, string, error) {
-	defer trace.End(trace.Begin(""))
-
-	// Only look at V2 registries
-	registryAddress := authConfig.ServerAddress
-	if !strings.Contains(authConfig.ServerAddress, "/v2") {
-		registryAddress = registryAddress + "/v2/"
-	}
-
-	if !strings.HasPrefix(registryAddress, "http") {
-		registryAddress = "//" + registryAddress
-	}
-
-	loginURL, err := url.Parse(registryAddress)
-	if err != nil {
-		msg := fmt.Sprintf("Bad login address: %s", registryAddress)
-		log.Errorf(msg)
-		return msg, "", err
-	}
-
-	// Check if registry is contained within whitelisted or insecure registries
-	regctx, cancel := context.WithTimeout(ctx, 5*time.Second)
-	defer cancel()
-	whitelistOk, _, insecureOk := vchConfig.RegistryCheck(regctx, loginURL)
-	if !whitelistOk {
-		msg := fmt.Sprintf("Access denied to unauthorized registry (%s) while VCH is in whitelist mode", loginURL.Host)
-		return msg, "", fmt.Errorf(msg)
-	}
-
-	var certPool *x509.CertPool
-	if insecureOk {
-		log.Infof("Attempting to log into %s insecurely", loginURL.Host)
-		certPool = nil
-	} else {
-		certPool = RegistryCertPool
-	}
-
-	dologin := func(scheme string, skipVerify bool) (string, error) {
-		loginURL.Scheme = scheme
-
-		var authURL *url.URL
-
-		fetcher := urlfetcher.NewURLFetcher(urlfetcher.Options{
-			Timeout:            loginTimeout,
-			Username:           authConfig.Username,
-			Password:           authConfig.Password,
-			RootCAs:            certPool,
-			InsecureSkipVerify: skipVerify,
-		})
-
-		// Attempt to get the Auth URL from a simple ping operation (GET) to the registry
-		hdr, err := fetcher.Ping(loginURL)
-		if err == nil {
-			if fetcher.IsStatusUnauthorized() {
-				log.Debugf("Looking up OAuth URL from server %s", loginURL)
-				authURL, err = fetcher.ExtractOAuthURL(hdr.Get("www-authenticate"), nil)
-			} else {
-				// We're not suppose to be here, but if we do end up here, use the login
-				//	URL for the auth URL.
-				authURL = loginURL
-			}
-		}
-		if err != nil {
-			log.Errorf("Looking up OAuth URL failed: %s", err)
-			return "", err
-		}
-
-		log.Debugf("logging onto %s", authURL.String())
-
-		// Just check if we get a token back.
-		token, err := fetcher.FetchAuthToken(authURL)
-		if err != nil || token.Token == "" {
-			// At this point, if a request cannot be solved by a retry, it is an authentication error.
-			log.Errorf("Fetch auth token failed: %s", err)
-			if _, ok := err.(urlfetcher.DoNotRetry); ok {
-				err = fmt.Errorf("Get %s: unauthorized: incorrect username or password", loginURL)
-			} else {
-				err = urlfetcher.AuthTokenError{TokenServer: *authURL}
-			}
-			return "", err
-		}
-
-		return token.Token, nil
-	}
-
-	_, err = dologin("https", insecureOk)
-	if err != nil && insecureOk {
-		_, err = dologin("http", insecureOk)
-	}
-
-	if err != nil {
-		return "", "", err
-	}
-
-	// We don't return the token.  The config.json will store token if we return
-	// it, but the regular docker daemon doesn't seem to return it either.
-	return "Login Succeeded", "", nil
-}
-
-// Utility functions
-
-func getImageCount() int {
-	images := cache.ImageCache().GetImages()
-	return len(images)
-}
-
-func FetchVolumeStores(client *client.PortLayer) (string, error) {
-
-	res, err := client.Storage.VolumeStoresList(storage.NewVolumeStoresListParamsWithContext(ctx))
-	if err != nil {
-		return "", err
-	}
-
-	return strings.Join(res.Payload.Stores, " "), nil
-}
-
-func entryStrJoin(entries registry.Set, sep string) string {
-	var s string
-	for _, e := range entries {
-		s += e.String() + sep
-	}
-
-	return s[:len(s)-len(sep)]
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system_portlayer.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system_portlayer.go
deleted file mode 100644
index d4c6438fe9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/system_portlayer.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-//****
-// system_portlayer.go
-//
-// Contains all code that touches the portlayer for system operations and all
-// code that converts swagger based returns to docker personality backend structs.
-// The goal is to make the backend code that implements the docker engine-api
-// interfaces be as simple as possible and contain no swagger or portlayer code.
-//
-// Rule for code to be in here:
-// 1. touches VIC portlayer
-// 2. converts swagger to docker engine-api structs
-// 3. errors MUST be docker engine-api compatible errors.  DO NOT return arbitrary errors!
-//		- Do NOT return portlayer errors
-//		- Do NOT return fmt.Errorf()
-//		- Do NOT return errors.New()
-//		- DO USE the aliased docker error package 'derr'
-
-import (
-	"fmt"
-	"net/http"
-
-	log "github.com/Sirupsen/logrus"
-	derr "github.com/docker/docker/api/errors"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/misc"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type VicSystemProxy interface {
-	PingPortlayer() bool
-	ContainerCount() (int, int, int, error)
-	VCHInfo() (*models.VCHInfo, error)
-}
-
-type SystemProxy struct{}
-
-func (s *SystemProxy) PingPortlayer() bool {
-	defer trace.End(trace.Begin("PingPortlayer"))
-
-	plClient := PortLayerClient()
-	if plClient == nil {
-		return false
-	}
-
-	if plClient != nil {
-		pingParams := misc.NewPingParamsWithContext(ctx)
-		_, err := plClient.Misc.Ping(pingParams)
-		if err != nil {
-			log.Info("Ping to portlayer failed")
-			return false
-		}
-		return true
-	}
-
-	log.Errorf("Portlayer client is invalid")
-	return false
-}
-
-// Use the Portlayer's support for docker ps to get the container count
-//   return order: running, paused, stopped counts
-func (s *SystemProxy) ContainerCount() (int, int, int, error) {
-	defer trace.End(trace.Begin("ContainerCount"))
-
-	var running, paused, stopped int
-
-	plClient := PortLayerClient()
-	if plClient == nil {
-		return 0, 0, 0, derr.NewErrorWithStatusCode(fmt.Errorf("ContainerCount failed to create a portlayer client"),
-			http.StatusInternalServerError)
-	}
-
-	all := true
-	containList, err := plClient.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(ctx).WithAll(&all))
-	if err != nil {
-		return 0, 0, 0, derr.NewErrorWithStatusCode(fmt.Errorf("Failed to get container list: %s", err), http.StatusInternalServerError)
-	}
-
-	for _, t := range containList.Payload {
-		st := t.ContainerConfig.State
-		if st == "Running" {
-			running++
-		} else if st == "Stopped" || st == "Created" {
-			stopped++
-		}
-	}
-
-	return running, paused, stopped, nil
-}
-
-func (s *SystemProxy) VCHInfo() (*models.VCHInfo, error) {
-	defer trace.End(trace.Begin("VCHInfo"))
-
-	plClient := PortLayerClient()
-	if plClient == nil {
-		return nil, derr.NewErrorWithStatusCode(fmt.Errorf("VCHInfo failed to create a portlayer client"),
-			http.StatusInternalServerError)
-	}
-
-	params := misc.NewGetVCHInfoParamsWithContext(ctx)
-	resp, err := plClient.Misc.GetVCHInfo(params)
-	if err != nil {
-		//There are no custom error for this operation.  If we get back an error, it's
-		//unknown.
-		return nil, derr.NewErrorWithStatusCode(fmt.Errorf("Unknown error from port layer: %s", err),
-			http.StatusInternalServerError)
-	}
-
-	return resp.Payload, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume.go
deleted file mode 100644
index 937b2a541d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume.go
+++ /dev/null
@@ -1,447 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"encoding/json"
-	"fmt"
-
-	log "github.com/Sirupsen/logrus"
-	derr "github.com/docker/docker/api/errors"
-
-	"regexp"
-	"strconv"
-	"strings"
-
-	"github.com/docker/docker/api/types"
-	"github.com/docker/docker/api/types/filters"
-	"github.com/docker/go-units"
-	"github.com/google/uuid"
-
-	vicfilter "github.com/vmware/vic/lib/apiservers/engine/backends/filter"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/containers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// NOTE: FIXME: These might be moved to a utility package once there are multiple personalities
-const (
-	OptsVolumeStoreKey     string = "volumestore"
-	OptsCapacityKey        string = "capacity"
-	dockerMetadataModelKey string = "DockerMetaData"
-	DefaultVolumeDriver    string = "vsphere"
-)
-
-// define a set (whitelist) of valid driver opts keys for command line argument validation
-var validDriverOptsKeys = map[string]struct{}{
-	OptsVolumeStoreKey:    {},
-	OptsCapacityKey:       {},
-	DriverArgFlagKey:      {},
-	DriverArgContainerKey: {},
-	DriverArgImageKey:     {},
-}
-
-// Volume drivers currently supported. "local" is the default driver supplied by the client
-// and is equivalent to "vsphere" for our implementation.
-var supportedVolDrivers = map[string]struct{}{
-	"vsphere": {},
-	"local":   {},
-}
-
-//Validation pattern for Volume Names
-var volumeNameRegex = regexp.MustCompile("^[a-zA-Z0-9][a-zA-Z0-9_.-]*$")
-
-func NewVolumeModel(volume *models.VolumeResponse, labels map[string]string) *types.Volume {
-	return &types.Volume{
-		Driver:     volume.Driver,
-		Name:       volume.Name,
-		Labels:     labels,
-		Mountpoint: volume.Label,
-	}
-}
-
-// Volume which defines the docker personalities view of a Volume
-type Volume struct {
-}
-
-// acceptedVolumeFilters are volume filters that are supported by VIC
-var acceptedVolumeFilters = map[string]bool{
-	"dangling": true,
-	"name":     true,
-	"driver":   true,
-	"label":    true,
-}
-
-var errPortlayerClient = fmt.Errorf("failed to get a portlayer client")
-
-func NewVolumeBackend() *Volume {
-	return &Volume{}
-}
-
-// Volumes docker personality implementation for VIC
-func (v *Volume) Volumes(filter string) ([]*types.Volume, []string, error) {
-	defer trace.End(trace.Begin("Volume.Volumes"))
-	var volumes []*types.Volume
-
-	client := PortLayerClient()
-	if client == nil {
-		return nil, nil, VolumeInternalServerError(errPortlayerClient)
-	}
-
-	res, err := client.Storage.ListVolumes(storage.NewListVolumesParamsWithContext(ctx).WithFilterString(&filter))
-	if err != nil {
-		switch err := err.(type) {
-		case *storage.ListVolumesInternalServerError:
-			return nil, nil, VolumeInternalServerError(fmt.Errorf("error from portlayer server: %s", err.Payload.Message))
-		case *storage.ListVolumesDefault:
-			return nil, nil, VolumeInternalServerError(fmt.Errorf("error from portlayer server: %s", err.Payload.Message))
-		default:
-			return nil, nil, VolumeInternalServerError(fmt.Errorf("error from portlayer server: %s", err.Error()))
-		}
-	}
-
-	volumeResponses := res.Payload
-
-	// Parse and validate filters
-	volumeFilters, err := filters.FromParam(filter)
-	if err != nil {
-		return nil, nil, VolumeInternalServerError(err)
-	}
-	volFilterContext, err := vicfilter.ValidateVolumeFilters(volumeFilters, acceptedVolumeFilters, nil)
-	if err != nil {
-		return nil, nil, VolumeInternalServerError(err)
-	}
-
-	// joinedVolumes stores names of volumes that are joined to a container
-	// and is used while filtering the output by dangling (dangling=true should
-	// return volumes that are not attached to a container)
-	joinedVolumes := make(map[string]struct{})
-
-	if volumeFilters.Include("dangling") {
-		// If the dangling filter is specified, gather required items beforehand
-
-		// Get all containers from the portlayer and use their metadata to obtain
-		// non-dangling (joined) volumes
-		conts, err := allContainers()
-		if err != nil {
-			return nil, nil, VolumeInternalServerError(err)
-		}
-
-		var s struct{}
-		for i := range conts {
-			for _, vol := range conts[i].VolumeConfig {
-				joinedVolumes[vol.Name] = s
-			}
-		}
-	}
-
-	log.Infoln("volumes found:")
-	for _, vol := range volumeResponses {
-		log.Infof("%s", vol.Name)
-
-		volumeMetadata, err := extractDockerMetadata(vol.Metadata)
-		if err != nil {
-			return nil, nil, VolumeInternalServerError(fmt.Errorf("error unmarshalling docker metadata: %s", err))
-		}
-
-		// Set fields needed for filtering the output
-		volFilterContext.Name = vol.Name
-		volFilterContext.Driver = vol.Driver
-		_, volFilterContext.Joined = joinedVolumes[vol.Name]
-		volFilterContext.Labels = volumeMetadata.Labels
-
-		// Include the volume in the output if it meets the filtering criteria
-		filterAction := vicfilter.IncludeVolume(volumeFilters, volFilterContext)
-		if filterAction == vicfilter.IncludeAction {
-			volume := NewVolumeModel(vol, volumeMetadata.Labels)
-			volumes = append(volumes, volume)
-		}
-	}
-
-	return volumes, nil, nil
-}
-
-// allContainers obtains all containers from the portlayer, akin to `docker ps -a`.
-func allContainers() ([]*models.ContainerInfo, error) {
-	client := PortLayerClient()
-	if client == nil {
-		return nil, errPortlayerClient
-	}
-
-	all := true
-	cons, err := client.Containers.GetContainerList(containers.NewGetContainerListParamsWithContext(ctx).WithAll(&all))
-	if err != nil {
-		return nil, err
-	}
-
-	return cons.Payload, nil
-}
-
-// VolumeInspect : docker personality implementation for VIC
-func (v *Volume) VolumeInspect(name string) (*types.Volume, error) {
-	defer trace.End(trace.Begin(name))
-
-	client := PortLayerClient()
-	if client == nil {
-		return nil, VolumeInternalServerError(errPortlayerClient)
-	}
-
-	if name == "" {
-		return nil, nil
-	}
-
-	param := storage.NewGetVolumeParamsWithContext(ctx).WithName(name)
-	res, err := client.Storage.GetVolume(param)
-	if err != nil {
-		switch err := err.(type) {
-		case *storage.GetVolumeNotFound:
-			return nil, VolumeNotFoundError(name)
-		default:
-			return nil, VolumeInternalServerError(fmt.Errorf("error from portlayer server: %s", err.Error()))
-		}
-	}
-
-	volumeMetadata, err := extractDockerMetadata(res.Payload.Metadata)
-	if err != nil {
-		return nil, VolumeInternalServerError(fmt.Errorf("error unmarshalling docker metadata: %s", err))
-	}
-	volume := NewVolumeModel(res.Payload, volumeMetadata.Labels)
-
-	return volume, nil
-}
-
-// volumeCreate issues a CreateVolume request to the portlayer
-func (v *Volume) volumeCreate(name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
-	defer trace.End(trace.Begin(""))
-	result := &types.Volume{}
-
-	client := PortLayerClient()
-	if client == nil {
-		return nil, errPortlayerClient
-	}
-
-	if name == "" {
-		name = uuid.New().String()
-	}
-
-	// TODO: support having another driver besides vsphere.
-	// assign the values of the model to be passed to the portlayer handler
-	req, varErr := newVolumeCreateReq(name, driverName, volumeData, labels)
-	if varErr != nil {
-		return result, varErr
-	}
-	log.Infof("Finalized model for volume create request to portlayer: %#v", req)
-
-	res, err := client.Storage.CreateVolume(storage.NewCreateVolumeParamsWithContext(ctx).WithVolumeRequest(req))
-	if err != nil {
-		return result, err
-	}
-	result = NewVolumeModel(res.Payload, labels)
-	return result, nil
-}
-
-// VolumeCreate : docker personality implementation for VIC
-func (v *Volume) VolumeCreate(name, driverName string, volumeData, labels map[string]string) (*types.Volume, error) {
-	defer trace.End(trace.Begin("Volume.VolumeCreate"))
-
-	result, err := v.volumeCreate(name, driverName, volumeData, labels)
-	if err != nil {
-		switch err := err.(type) {
-		case *storage.CreateVolumeConflict:
-			return result, VolumeInternalServerError(fmt.Errorf("A volume named %s already exists. Choose a different volume name.", name))
-
-		case *storage.CreateVolumeNotFound:
-			return result, VolumeInternalServerError(fmt.Errorf("No volume store named (%s) exists", volumeStore(volumeData)))
-
-		case *storage.CreateVolumeInternalServerError:
-			// FIXME: right now this does not return an error model...
-			return result, VolumeInternalServerError(fmt.Errorf("%s", err.Error()))
-
-		case *storage.CreateVolumeDefault:
-			return result, VolumeInternalServerError(fmt.Errorf("%s", err.Payload.Message))
-
-		default:
-			return result, VolumeInternalServerError(fmt.Errorf("%s", err))
-		}
-	}
-
-	return result, nil
-}
-
-// VolumeRm : docker personality for VIC
-func (v *Volume) VolumeRm(name string, force bool) error {
-	defer trace.End(trace.Begin("Volume.VolumeRm"))
-
-	client := PortLayerClient()
-	if client == nil {
-		return VolumeInternalServerError(errPortlayerClient)
-	}
-
-	// FIXME: check whether this is a name or a UUID. UUID expected for now.
-	_, err := client.Storage.RemoveVolume(storage.NewRemoveVolumeParamsWithContext(ctx).WithName(name))
-	if err != nil {
-
-		switch err := err.(type) {
-		case *storage.RemoveVolumeNotFound:
-			return derr.NewRequestNotFoundError(fmt.Errorf("Get %s: no such volume", name))
-
-		case *storage.RemoveVolumeConflict:
-			return derr.NewRequestConflictError(fmt.Errorf(err.Payload.Message))
-
-		case *storage.RemoveVolumeInternalServerError:
-			return VolumeInternalServerError(fmt.Errorf("Server error from portlayer: %s", err.Payload.Message))
-		default:
-			return VolumeInternalServerError(fmt.Errorf("Server error from portlayer: %s", err))
-		}
-	}
-	return nil
-}
-
-func (v *Volume) VolumesPrune(pruneFilters filters.Args) (*types.VolumesPruneReport, error) {
-	return nil, fmt.Errorf("%s does not yet implement VolumesPrune", ProductName())
-}
-
-type volumeMetadata struct {
-	Driver        string
-	DriverOpts    map[string]string
-	Name          string
-	Labels        map[string]string
-	AttachHistory []string
-	Image         string
-}
-
-func createVolumeMetadata(req *models.VolumeRequest, driverargs, labels map[string]string) (string, error) {
-	metadata := volumeMetadata{
-		Driver:        req.Driver,
-		DriverOpts:    req.DriverArgs,
-		Name:          req.Name,
-		Labels:        labels,
-		AttachHistory: []string{driverargs[DriverArgContainerKey]},
-		Image:         driverargs[DriverArgImageKey],
-	}
-	result, err := json.Marshal(metadata)
-	return string(result), err
-}
-
-// Unmarshal the docker metadata using the docker metadata key.  The docker
-// metadatakey.  We stash the vals we know about in that map with that key.
-func extractDockerMetadata(metadataMap map[string]string) (*volumeMetadata, error) {
-	v, ok := metadataMap[dockerMetadataModelKey]
-	if !ok {
-		return nil, fmt.Errorf("metadata %s missing", dockerMetadataModelKey)
-	}
-
-	result := &volumeMetadata{}
-	err := json.Unmarshal([]byte(v), result)
-	return result, err
-}
-
-// Utility Functions
-
-func newVolumeCreateReq(name, driverName string, volumeData, labels map[string]string) (*models.VolumeRequest, error) {
-	if _, ok := supportedVolDrivers[driverName]; !ok {
-		return nil, fmt.Errorf("error looking up volume plugin %s: plugin not found", driverName)
-	}
-
-	if !volumeNameRegex.Match([]byte(name)) && name != "" {
-		return nil, fmt.Errorf("volume name %q includes invalid characters, only \"[a-zA-Z0-9][a-zA-Z0-9_.-]\" are allowed", name)
-	}
-
-	req := &models.VolumeRequest{
-		Driver:     driverName,
-		DriverArgs: volumeData,
-		Name:       name,
-		Metadata:   make(map[string]string),
-	}
-
-	metadata, err := createVolumeMetadata(req, volumeData, labels)
-	if err != nil {
-		return nil, err
-	}
-
-	req.Metadata[dockerMetadataModelKey] = metadata
-
-	if err := validateDriverArgs(volumeData, req); err != nil {
-		return nil, fmt.Errorf("bad driver value - %s", err)
-	}
-
-	return req, nil
-}
-
-// volumeStore returns the value of the optional volume store param specified in the CLI.
-func volumeStore(args map[string]string) string {
-	storeName, ok := args[OptsVolumeStoreKey]
-	if !ok {
-		return "default"
-	}
-	return storeName
-}
-
-func normalizeDriverArgs(args map[string]string) error {
-	// normalize keys to lowercase & validate them
-	for k, val := range args {
-		lowercase := strings.ToLower(k)
-
-		if _, ok := validDriverOptsKeys[lowercase]; !ok {
-			return fmt.Errorf("%s is not a supported option", k)
-		}
-
-		if strings.Compare(lowercase, k) != 0 {
-			delete(args, k)
-			args[lowercase] = val
-		}
-	}
-	return nil
-}
-
-func validateDriverArgs(args map[string]string, req *models.VolumeRequest) error {
-	if err := normalizeDriverArgs(args); err != nil {
-		return err
-	}
-
-	// volumestore name validation
-	req.Store = volumeStore(args)
-
-	// capacity validation
-	capstr, ok := args[OptsCapacityKey]
-	if !ok {
-		req.Capacity = -1
-		return nil
-	}
-
-	//check if it is just a numerical value
-	capacity, err := strconv.ParseInt(capstr, 10, 64)
-	if err == nil {
-		//input has no units in this case.
-		if capacity < 1 {
-			return fmt.Errorf("Invalid size: %s", capstr)
-		}
-		req.Capacity = capacity
-		return nil
-	}
-
-	capacity, err = units.FromHumanSize(capstr)
-	if err != nil {
-		return err
-	}
-
-	if capacity < 1 {
-		return fmt.Errorf("Capacity value too large: %s", capstr)
-	}
-
-	req.Capacity = int64(capacity) / int64(units.MB)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume_test.go
deleted file mode 100644
index e98499c3cc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/backends/volume_test.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package backends
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-)
-
-func TestFillDockerVolume(t *testing.T) {
-	testResponse := &models.VolumeResponse{
-		Driver: "vsphere",
-		Name:   "Test Volume",
-		Label:  "Test Label",
-	}
-	testLabels := make(map[string]string)
-	testLabels["TestMeta"] = "custom info about my volume"
-
-	dockerVolume := NewVolumeModel(testResponse, testLabels)
-
-	assert.Equal(t, "vsphere", dockerVolume.Driver)
-	assert.Equal(t, "Test Volume", dockerVolume.Name)
-	assert.Equal(t, "Test Label", dockerVolume.Mountpoint)
-	assert.Equal(t, "custom info about my volume", dockerVolume.Labels["TestMeta"])
-}
-
-func TestTranslatVolumeRequestModel(t *testing.T) {
-	testLabels := make(map[string]string)
-	testLabels["TestMeta"] = "custom info about my volume"
-
-	testDriverArgs := make(map[string]string)
-	testDriverArgs["testarg"] = "important driver stuff"
-	testDriverArgs[OptsVolumeStoreKey] = "testStore"
-	testDriverArgs[OptsCapacityKey] = "12MB"
-
-	testRequest, err := newVolumeCreateReq("testName", "vsphere", testDriverArgs, testLabels)
-	if !assert.Error(t, err) {
-		return
-	}
-
-	delete(testDriverArgs, "testarg")
-	testRequest, err = newVolumeCreateReq("testName", "vsphere", testDriverArgs, testLabels)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.Equal(t, "testName", testRequest.Name)
-	assert.Equal(t, "", testRequest.DriverArgs["testarg"]) // unsupported keys should just be empty
-	assert.Equal(t, "testStore", testRequest.Store)
-	assert.Equal(t, "vsphere", testRequest.Driver)
-	assert.Equal(t, int64(12), testRequest.Capacity)
-
-	testMetaDatabuf, err := createVolumeMetadata(testRequest, testDriverArgs, testLabels)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.Equal(t, testMetaDatabuf, testRequest.Metadata[dockerMetadataModelKey])
-	assert.Nil(t, err)
-}
-
-func TestCreateVolumeMetada(t *testing.T) {
-	testDriverOpts := make(map[string]string)
-	testDriverOpts["TestArg"] = "test"
-	testModel := models.VolumeRequest{
-		Driver:     "vsphere",
-		DriverArgs: testDriverOpts,
-		Name:       "testModel",
-	}
-	testLabels := make(map[string]string)
-	testLabels["TestMeta"] = "custom info about my volume"
-
-	testMetadataString, err := createVolumeMetadata(&testModel, testDriverOpts, testLabels)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	volumeMetadata := volumeMetadata{}
-	json.Unmarshal([]byte(testMetadataString), &volumeMetadata)
-
-	assert.Equal(t, testModel.Driver, volumeMetadata.Driver)
-	assert.Equal(t, testModel.Name, volumeMetadata.Name)
-	assert.Equal(t, testLabels["TestMeta"], volumeMetadata.Labels["TestMeta"])
-	assert.Equal(t, testLabels["TestArg"], volumeMetadata.DriverOpts["testArg"])
-}
-
-func TestValidateDriverArgs(t *testing.T) {
-	testMap := make(map[string]string)
-	testStore := "Mystore"
-	testCap := "12MB"
-	testBadCap := "This is not valid!"
-	testModel := models.VolumeRequest{
-		Driver:     "vsphere",
-		DriverArgs: testMap,
-		Name:       "testModel",
-	}
-
-	err := validateDriverArgs(testMap, &testModel)
-	if !assert.Equal(t, "default", testModel.Store) || !assert.Equal(t, int64(-1), testModel.Capacity) || !assert.NoError(t, err) {
-		return
-	}
-
-	testMap[OptsVolumeStoreKey] = testStore
-	testMap[OptsCapacityKey] = testCap
-	err = validateDriverArgs(testMap, &testModel)
-	if !assert.Equal(t, testStore, testModel.Store) || !assert.Equal(t, int64(12), testModel.Capacity) || !assert.NoError(t, err) {
-		return
-	}
-
-	//This is a negative test case. We want an error
-	testMap[OptsCapacityKey] = testBadCap
-	err = validateDriverArgs(testMap, &testModel)
-	if !assert.Equal(t, testStore, testModel.Store) || !assert.Equal(t, int64(12), testModel.Capacity) || !assert.Error(t, err) {
-		return
-	}
-
-	testMap[OptsCapacityKey] = testCap
-	delete(testMap, OptsVolumeStoreKey)
-	err = validateDriverArgs(testMap, &testModel)
-	if !assert.Equal(t, "default", testModel.Store) || !assert.Equal(t, int64(12), testModel.Capacity) || !assert.NoError(t, err) {
-		return
-	}
-}
-
-func TestExtractDockerMetadata(t *testing.T) {
-	driver := "vsphere"
-	volumeName := "testVolume"
-	store := "storeName"
-	testCap := "512"
-
-	testOptMap := make(map[string]string)
-	testOptMap[OptsVolumeStoreKey] = store
-	testOptMap[OptsCapacityKey] = testCap
-
-	testLabelMap := make(map[string]string)
-	testLabelMap["someLabel"] = "this is a label"
-
-	metaDataBefore := volumeMetadata{
-		Driver:     driver,
-		Name:       volumeName,
-		DriverOpts: testOptMap,
-		Labels:     testLabelMap,
-	}
-
-	buf, err := json.Marshal(metaDataBefore)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	metadataMap := make(map[string]string)
-	metadataMap[dockerMetadataModelKey] = string(buf)
-	metadataAfter, err := extractDockerMetadata(metadataMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.Equal(t, metaDataBefore.DriverOpts[OptsCapacityKey], metadataAfter.DriverOpts[OptsCapacityKey])
-	assert.Equal(t, metaDataBefore.DriverOpts[OptsVolumeStoreKey], metadataAfter.DriverOpts[OptsVolumeStoreKey])
-	assert.Equal(t, metaDataBefore.Labels["someLabel"], metadataAfter.Labels["someLabel"])
-	assert.Equal(t, metaDataBefore.Name, metadataAfter.Name)
-	assert.Equal(t, metaDataBefore.Driver, metadataAfter.Driver)
-}
-
-func TestNormalizeDriverArgs(t *testing.T) {
-	testOptMap := make(map[string]string)
-	testOptMap["VOLUMESTORE"] = "foo"
-	testOptMap["CAPACITY"] = "bar"
-
-	normalizeDriverArgs(testOptMap)
-
-	assert.Equal(t, testOptMap["volumestore"], "foo")
-	assert.Equal(t, testOptMap["capacity"], "bar")
-
-	testOptMap["bogus"] = "bogus"
-
-	err := normalizeDriverArgs(testOptMap)
-	assert.Error(t, err, "expected: bogus is not a supported option")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/archive.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/archive.go
deleted file mode 100644
index bc3cbc1891..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/archive.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package proxy
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"strings"
-	"sync"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	vicarchive "github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type VicArchiveProxy interface {
-	ArchiveExportReader(op trace.Operation, store, ancestorStore, deviceID, ancestor string, data bool, filterSpec vicarchive.FilterSpec) (io.ReadCloser, error)
-	ArchiveImportWriter(op trace.Operation, store, deviceID string, filterSpec vicarchive.FilterSpec, wg *sync.WaitGroup, errchan chan error) (io.WriteCloser, error)
-}
-
-//------------------------------------
-// ArchiveProxy
-//------------------------------------
-
-type ArchiveProxy struct {
-	client *client.PortLayer
-}
-
-func NewArchiveProxy(client *client.PortLayer) VicArchiveProxy {
-	return &ArchiveProxy{client: client}
-}
-
-// ArchiveExportReader streams a tar archive from the portlayer.  Once the stream is complete,
-// an io.Reader is returned and the caller can use that reader to parse the data.
-func (a *ArchiveProxy) ArchiveExportReader(op trace.Operation, store, ancestorStore, deviceID, ancestor string, data bool, filterSpec vicarchive.FilterSpec) (io.ReadCloser, error) {
-	defer trace.End(trace.Begin(deviceID))
-
-	if store == "" || deviceID == "" {
-		return nil, fmt.Errorf("ArchiveExportReader called with either empty store or deviceID")
-	}
-
-	var err error
-
-	pipeReader, pipeWriter := io.Pipe()
-
-	go func() {
-		// make sure we get out of io.Copy if context is canceled
-		select {
-		case <-op.Done():
-			// Attempt to tell the portlayer to cancel the stream.  This is one way of cancelling the
-			// stream.  The other way is for the caller of this function to close the returned CloseReader.
-			// Callers of this function should do one but not both.
-			err := pipeReader.Close()
-			if err != nil {
-				op.Errorf("Error closing pipereader in ArchiveExportReader: %s", err.Error())
-			}
-		}
-	}()
-
-	go func() {
-		params := storage.NewExportArchiveParamsWithContext(op).
-			WithStore(store).
-			WithAncestorStore(&ancestorStore).
-			WithDeviceID(deviceID).
-			WithAncestor(&ancestor).
-			WithData(data)
-
-		// Encode the filter spec
-		encodedFilter := ""
-		if valueBytes, merr := json.Marshal(filterSpec); merr == nil {
-			encodedFilter = base64.StdEncoding.EncodeToString(valueBytes)
-			params = params.WithFilterSpec(&encodedFilter)
-			op.Infof(" encodedFilter = %s", encodedFilter)
-		}
-
-		_, err = a.client.Storage.ExportArchive(params, pipeWriter)
-		if err != nil {
-			op.Errorf("Error from ExportArchive: %s", err.Error())
-			switch err := err.(type) {
-			case *storage.ExportArchiveInternalServerError:
-				plErr := InternalServerError(fmt.Sprintf("Server error from archive reader for device %s", deviceID))
-				op.Errorf(plErr.Error())
-				pipeWriter.CloseWithError(plErr)
-			case *storage.ExportArchiveLocked:
-				plErr := ResourceLockedError(fmt.Sprintf("Resource locked for device %s", deviceID))
-				op.Errorf(plErr.Error())
-				pipeWriter.CloseWithError(plErr)
-			case *storage.ExportArchiveUnprocessableEntity:
-				plErr := InternalServerError("failed to process given path")
-				op.Errorf(plErr.Error())
-				pipeWriter.CloseWithError(plErr)
-			default:
-				//Check for EOF.  Since the connection, transport, and data handling are
-				//encapsulated inside of Swagger, we can only detect EOF by checking the
-				//error string
-				if strings.Contains(err.Error(), swaggerSubstringEOF) {
-					op.Debugf("swagger error %s", err.Error())
-					pipeWriter.Close()
-				} else {
-					pipeWriter.CloseWithError(err)
-				}
-			}
-		} else {
-			pipeWriter.Close()
-		}
-	}()
-
-	return pipeReader, nil
-}
-
-// ArchiveImportWriter initializes a write stream for a path.  This is usually called
-// for getting a writer during docker cp TO container.
-func (a *ArchiveProxy) ArchiveImportWriter(op trace.Operation, store, deviceID string, filterSpec vicarchive.FilterSpec, wg *sync.WaitGroup, errchan chan error) (io.WriteCloser, error) {
-	defer trace.End(trace.Begin(deviceID))
-
-	if store == "" || deviceID == "" {
-		return nil, fmt.Errorf("ArchiveImportWriter called with either empty store or deviceID")
-	}
-
-	var err error
-
-	pipeReader, pipeWriter := io.Pipe()
-
-	go func() {
-		// make sure we get out of io.Copy if context is canceled
-		select {
-		case <-op.Done():
-			pipeWriter.Close()
-		}
-	}()
-
-	wg.Add(1)
-	go func() {
-		var plErr error
-		defer func() {
-			op.Debugf("Stream for device %s has returned from PL. Err received is %v ", deviceID, plErr)
-			errchan <- plErr
-			wg.Done()
-		}()
-
-		// encodedFilter and destination are not required (from swagge spec) because
-		// they are allowed to be empty.
-		params := storage.NewImportArchiveParamsWithContext(op).
-			WithStore(store).
-			WithDeviceID(deviceID).
-			WithArchive(pipeReader)
-
-		// Encode the filter spec
-		encodedFilter := ""
-		if valueBytes, merr := json.Marshal(filterSpec); merr == nil {
-			encodedFilter = base64.StdEncoding.EncodeToString(valueBytes)
-			params = params.WithFilterSpec(&encodedFilter)
-		}
-
-		_, err = a.client.Storage.ImportArchive(params)
-		if err != nil {
-			switch err := err.(type) {
-			case *storage.ImportArchiveInternalServerError:
-				plErr = InternalServerError(fmt.Sprintf("error writing files to device %s", deviceID))
-				op.Errorf(plErr.Error())
-				pipeReader.CloseWithError(plErr)
-			case *storage.ImportArchiveLocked:
-				plErr = ResourceLockedError(fmt.Sprintf("resource locked for device %s", deviceID))
-				op.Errorf(plErr.Error())
-				pipeReader.CloseWithError(plErr)
-			case *storage.ImportArchiveNotFound:
-				plErr = ResourceNotFoundError("file or directory")
-				op.Errorf(plErr.Error())
-				pipeReader.CloseWithError(plErr)
-			case *storage.ImportArchiveUnprocessableEntity:
-				plErr = InternalServerError("failed to process given path")
-				op.Errorf(plErr.Error())
-				pipeReader.CloseWithError(plErr)
-			case *storage.ImportArchiveConflict:
-				plErr = InternalServerError("unexpected copy failure may result in truncated copy, please try again")
-				op.Errorf(plErr.Error())
-				pipeReader.CloseWithError(plErr)
-			default:
-				//Check for EOF.  Since the connection, transport, and data handling are
-				//encapsulated inside of Swagger, we can only detect EOF by checking the
-				//error string
-				plErr = err
-				if strings.Contains(err.Error(), swaggerSubstringEOF) {
-					op.Error(err)
-					pipeReader.Close()
-				} else {
-					pipeReader.CloseWithError(err)
-				}
-			}
-		} else {
-			pipeReader.Close()
-		}
-	}()
-
-	return pipeWriter, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/common.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/common.go
deleted file mode 100644
index 326870697c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/common.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package proxy
-
-const (
-	swaggerSubstringEOF = "EOF"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/errors.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/errors.go
deleted file mode 100644
index 9fb6cb7b04..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/engine/proxy/errors.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package proxy
-
-import (
-	"fmt"
-	"net/http"
-
-	derr "github.com/docker/docker/api/errors"
-)
-
-// InternalServerError returns a 500 docker error on a portlayer error.
-func InternalServerError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("Server error from portlayer: %s", msg), http.StatusInternalServerError)
-}
-
-// ResourceLockedError returns a 423 http status
-func ResourceLockedError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("Resource locked: %s", msg), http.StatusLocked)
-}
-
-// ResourceNotFoundError returns a 404 http status
-func ResourceNotFoundError(msg string) error {
-	return derr.NewErrorWithStatusCode(fmt.Errorf("No such %s", msg), http.StatusNotFound)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/configure_port_layer.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/configure_port_layer.go
deleted file mode 100644
index 099c9ff3b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/configure_port_layer.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package restapi
-
-import (
-	"context"
-	"crypto/tls"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/errors"
-	"github.com/go-openapi/runtime"
-	"github.com/go-openapi/swag"
-	"github.com/tylerb/graceful"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/options"
-	"github.com/vmware/vic/lib/portlayer"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// This file is safe to edit. Once it exists it will not be overwritten
-
-type handler interface {
-	Configure(api *operations.PortLayerAPI, handlerCtx *handlers.HandlerContext)
-}
-
-var portlayerhandlers = []handler{
-	&handlers.StorageHandlersImpl{},
-	&handlers.MiscHandlersImpl{},
-	&handlers.ScopesHandlersImpl{},
-	&handlers.ContainersHandlersImpl{},
-	&handlers.InteractionHandlersImpl{},
-	&handlers.LoggingHandlersImpl{},
-	&handlers.KvHandlersImpl{},
-	&handlers.EventsHandlerImpl{},
-	&handlers.TaskHandlersImpl{},
-}
-
-var apiServers []*graceful.Server
-
-const stopTimeout = time.Second * 3
-
-func configureFlags(api *operations.PortLayerAPI) {
-	api.CommandLineOptionsGroups = []swag.CommandLineOptionsGroup{
-		{
-			LongDescription:  "Port Layer Options",
-			Options:          options.PortLayerOptions,
-			ShortDescription: "Port Layer Options",
-		},
-	}
-}
-
-func configureAPI(api *operations.PortLayerAPI) http.Handler {
-	api.Logger = log.Printf
-
-	ctx := context.Background()
-
-	sessionconfig := &session.Config{
-		Service:        options.PortLayerOptions.SDK,
-		Insecure:       options.PortLayerOptions.Insecure,
-		Keepalive:      options.PortLayerOptions.Keepalive,
-		DatacenterPath: options.PortLayerOptions.DatacenterPath,
-		ClusterPath:    options.PortLayerOptions.ClusterPath,
-		PoolPath:       options.PortLayerOptions.PoolPath,
-		DatastorePath:  options.PortLayerOptions.DatastorePath,
-		UserAgent:      version.UserAgent("vic-engine"),
-	}
-
-	sess, err := session.NewSession(sessionconfig).Create(ctx)
-	if err != nil {
-		log.Fatalf("configure_port_layer ERROR: %s", err)
-	}
-
-	// Configure the func invoked if the PL panics or is restarted by vic-init
-	api.ServerShutdown = func() {
-		log.Infof("Shutting down port-layer-server")
-
-		// stop the event collectors
-		collectors := exec.Config.EventManager.Collectors()
-		for _, c := range collectors {
-			c.Stop()
-		}
-
-		// Logout the session
-		if err := sess.Logout(ctx); err != nil {
-			log.Warnf("unable to log out of session: %s", err)
-		}
-	}
-
-	// initialize the port layer
-	if err = portlayer.Init(ctx, sess); err != nil {
-		log.Fatalf("could not initialize port layer: %s", err)
-	}
-
-	// configure the api here
-	api.ServeError = errors.ServeError
-
-	// FIXME: after updated go-openapi/runtime vendor code, revert ByteStreamConsumer() back to runtime.ByteStreamConsumer()
-	api.BinConsumer = ByteStreamConsumer()
-	api.JSONConsumer = runtime.JSONConsumer()
-	api.TarConsumer = ByteStreamConsumer()
-
-	// FIXME: after updated go-openapi/runtime vendor code, revert ByteStreamProducer() back to runtime.ByteStreamProducer()
-	api.BinProducer = ByteStreamProducer()
-	api.JSONProducer = runtime.JSONProducer()
-	api.TarProducer = ByteStreamProducer()
-	api.TxtProducer = runtime.TextProducer()
-
-	handlerCtx := &handlers.HandlerContext{
-		Session: sess,
-	}
-	for _, handler := range portlayerhandlers {
-		handler.Configure(api, handlerCtx)
-	}
-
-	return setupGlobalMiddleware(api.Serve(setupMiddlewares))
-}
-
-// The TLS configuration before HTTPS server starts.
-func configureTLS(tlsConfig *tls.Config) {
-	// Make all necessary changes to the TLS configuration here.
-}
-
-func StopAPIServers() {
-	for _, s := range apiServers {
-		s.Stop(stopTimeout)
-	}
-}
-
-// As soon as server is initialized but not run yet, this function will be called.
-// If you need to modify a config, store server instance to stop it individually later, this is the place.
-// This function can be called multiple times, depending on the number of serving schemes.
-// scheme value will be set accordingly: "http", "https" or "unix"
-func configureServer(s *graceful.Server, scheme string) {
-	s.NoSignalHandling = true
-	s.Timeout = stopTimeout
-	apiServers = append(apiServers, s)
-}
-
-// The middleware configuration is for the handler executors. These do not apply to the swagger.json document.
-// The middleware executes after routing but before authentication, binding and validation
-func setupMiddlewares(handler http.Handler) http.Handler {
-	return handler
-}
-
-// The middleware configuration happens before anything, this middleware also applies to serving the swagger.json document.
-// So this is a good place to plug in a panic handling middleware, logging and metrics
-func setupGlobalMiddleware(handler http.Handler) http.Handler {
-	return handler
-}
-
-// FIXME: to avoid update go-openapi/runtime vendor code at this time, write our own
-// ByteStreamConsumer to read back encoded json format error message
-func ByteStreamConsumer() runtime.Consumer {
-	wrapped := runtime.ByteStreamConsumer()
-	return runtime.ConsumerFunc(func(reader io.Reader, data interface{}) error {
-		if reader == nil {
-			return fmt.Errorf("ByteStreamConsumer requires a reader") // early exit
-		}
-
-		if er, ok := data.(*models.Error); ok {
-			dec := json.NewDecoder(reader)
-			return dec.Decode(er)
-		}
-
-		return wrapped.Consume(reader, data)
-	})
-}
-
-// FIXME: to avoid update go-openapi/runtime vendor code at this time, write our own
-// ByteStreamProducer to encode error to json string
-func ByteStreamProducer() runtime.Producer {
-	wrapped := runtime.ByteStreamProducer()
-	return runtime.ProducerFunc(func(writer io.Writer, data interface{}) error {
-		if writer == nil {
-			return fmt.Errorf("ByteStreamProducer requires a writer") // early exit
-		}
-
-		if er, ok := data.(*models.Error); ok {
-			enc := json.NewEncoder(writer)
-			return enc.Encode(er)
-		}
-
-		return wrapped.Produce(writer, data)
-	})
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/containers_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/containers_handlers.go
deleted file mode 100644
index 13ebb39f8e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/containers_handlers.go
+++ /dev/null
@@ -1,667 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"io"
-	"net/http"
-	"sort"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/containers"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/iolog"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/metrics"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/version"
-)
-
-const (
-	containerWaitTimeout = 3 * time.Minute
-)
-
-// ContainersHandlersImpl is the receiver for all of the exec handler methods
-type ContainersHandlersImpl struct {
-	handlerCtx *HandlerContext
-}
-
-// Configure assigns functions to all the exec api handlers
-func (handler *ContainersHandlersImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	api.ContainersCreateHandler = containers.CreateHandlerFunc(handler.CreateHandler)
-	api.ContainersStateChangeHandler = containers.StateChangeHandlerFunc(handler.StateChangeHandler)
-	api.ContainersGetHandler = containers.GetHandlerFunc(handler.GetHandler)
-	api.ContainersCommitHandler = containers.CommitHandlerFunc(handler.CommitHandler)
-	api.ContainersGetStateHandler = containers.GetStateHandlerFunc(handler.GetStateHandler)
-	api.ContainersContainerRemoveHandler = containers.ContainerRemoveHandlerFunc(handler.RemoveContainerHandler)
-	api.ContainersGetContainerInfoHandler = containers.GetContainerInfoHandlerFunc(handler.GetContainerInfoHandler)
-	api.ContainersGetContainerListHandler = containers.GetContainerListHandlerFunc(handler.GetContainerListHandler)
-	api.ContainersContainerSignalHandler = containers.ContainerSignalHandlerFunc(handler.ContainerSignalHandler)
-	api.ContainersGetContainerLogsHandler = containers.GetContainerLogsHandlerFunc(handler.GetContainerLogsHandler)
-	api.ContainersContainerWaitHandler = containers.ContainerWaitHandlerFunc(handler.ContainerWaitHandler)
-	api.ContainersContainerRenameHandler = containers.ContainerRenameHandlerFunc(handler.RenameContainerHandler)
-	api.ContainersGetContainerStatsHandler = containers.GetContainerStatsHandlerFunc(handler.GetContainerStatsHandler)
-
-	handler.handlerCtx = handlerCtx
-}
-
-// CreateHandler creates a new container
-func (handler *ContainersHandlersImpl) CreateHandler(params containers.CreateParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-
-	session := handler.handlerCtx.Session
-
-	ctx := context.Background()
-
-	id := uid.New().String()
-
-	// Init key for tether
-	// #nosec: RSA keys should be at least 2048 bits
-	// Size is 512 because key validation is not performed - see GitHub #2849
-	privateKey, err := rsa.GenerateKey(rand.Reader, 512)
-	if err != nil {
-		return containers.NewCreateNotFound().WithPayload(&models.Error{Message: err.Error()})
-	}
-	privateKeyBlock := pem.Block{
-		Type:    "RSA PRIVATE KEY",
-		Headers: nil,
-		Bytes:   x509.MarshalPKCS1PrivateKey(privateKey),
-	}
-
-	m := &executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   id,
-			Name: params.CreateConfig.Name,
-		},
-		CreateTime: time.Now().UTC().Unix(),
-		Version:    version.GetBuild(),
-		Key:        pem.EncodeToMemory(&privateKeyBlock),
-		LayerID:    params.CreateConfig.Layer,
-		ImageID:    params.CreateConfig.Image,
-		RepoName:   params.CreateConfig.RepoName,
-		Hostname:   params.CreateConfig.Hostname,
-		Domainname: params.CreateConfig.Domainname,
-	}
-
-	if params.CreateConfig.Annotations != nil && len(params.CreateConfig.Annotations) > 0 {
-		m.Annotations = make(map[string]string)
-		for k, v := range params.CreateConfig.Annotations {
-			m.Annotations[k] = v
-		}
-	}
-
-	// Create the executor.ExecutorCreateConfig
-	c := &exec.ContainerCreateConfig{
-		Metadata:       m,
-		ParentImageID:  params.CreateConfig.Layer,
-		ImageStoreName: params.CreateConfig.ImageStore.Name,
-		Resources: exec.Resources{
-			NumCPUs:  params.CreateConfig.NumCpus,
-			MemoryMB: params.CreateConfig.MemoryMB,
-		},
-	}
-
-	h, err := exec.Create(ctx, session, c)
-	if err != nil {
-		log.Errorf("ContainerCreate error: %s", err.Error())
-		return containers.NewCreateNotFound().WithPayload(&models.Error{Message: err.Error()})
-	}
-
-	//  send the container id back to the caller
-	return containers.NewCreateOK().WithPayload(&models.ContainerCreatedInfo{ID: id, Handle: h.String()})
-}
-
-// StateChangeHandler changes the state of a container
-func (handler *ContainersHandlersImpl) StateChangeHandler(params containers.StateChangeParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil {
-		return containers.NewStateChangeNotFound()
-	}
-
-	var state exec.State
-	switch params.State {
-	case "RUNNING":
-		state = exec.StateRunning
-	case "STOPPED":
-		state = exec.StateStopped
-	case "CREATED":
-		state = exec.StateCreated
-	default:
-		return containers.NewStateChangeDefault(http.StatusServiceUnavailable).WithPayload(&models.Error{Message: "unknown state"})
-	}
-
-	h.SetTargetState(state)
-	return containers.NewStateChangeOK().WithPayload(h.String())
-}
-
-func (handler *ContainersHandlersImpl) GetStateHandler(params containers.GetStateParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	// NOTE: I've no idea why GetStateHandler takes a handle instead of an ID - hopefully there was a reason for an inspection
-	// operation to take this path
-	h := exec.GetHandle(params.Handle)
-	if h == nil || h.ExecConfig == nil {
-		return containers.NewGetStateNotFound()
-	}
-
-	container := exec.Containers.Container(h.ExecConfig.ID)
-	if container == nil {
-		return containers.NewGetStateNotFound()
-	}
-
-	var state string
-	switch container.CurrentState() {
-	case exec.StateRunning:
-		state = "RUNNING"
-
-	case exec.StateStopped:
-		state = "STOPPED"
-
-	case exec.StateCreated:
-		state = "CREATED"
-
-	default:
-		return containers.NewGetStateDefault(http.StatusServiceUnavailable)
-	}
-
-	return containers.NewGetStateOK().WithPayload(
-		&models.ContainerGetStateResponse{
-			Handle: h.String(),
-			State:  state,
-		})
-}
-
-func (handler *ContainersHandlersImpl) GetHandler(params containers.GetParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	h := exec.GetContainer(context.Background(), uid.Parse(params.ID))
-	if h == nil {
-		return containers.NewGetNotFound().WithPayload(&models.Error{Message: fmt.Sprintf("container %s not found", params.ID)})
-	}
-
-	return containers.NewGetOK().WithPayload(h.String())
-}
-
-func (handler *ContainersHandlersImpl) CommitHandler(params containers.CommitParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil {
-		return containers.NewCommitNotFound().WithPayload(&models.Error{Message: "container not found"})
-	}
-
-	if err := h.Commit(context.Background(), handler.handlerCtx.Session, params.WaitTime); err != nil {
-		log.Errorf("CommitHandler error on handle(%s) for %s: %s", h, h.ExecConfig.ID, err)
-		switch err := err.(type) {
-		case exec.ConcurrentAccessError:
-			return containers.NewCommitConflict().WithPayload(&models.Error{Message: err.Error()})
-		case exec.DevicesInUseError:
-			return containers.NewCommitConflict().WithPayload(&models.Error{Message: err.Error()})
-		default:
-			return containers.NewCommitDefault(http.StatusServiceUnavailable).WithPayload(&models.Error{Message: err.Error()})
-		}
-	}
-
-	return containers.NewCommitOK()
-}
-
-func (handler *ContainersHandlersImpl) RemoveContainerHandler(params containers.ContainerRemoveParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	// get the indicated container for removal
-	container := exec.Containers.Container(params.ID)
-	if container == nil {
-		return containers.NewContainerRemoveNotFound()
-	}
-
-	// NOTE: this should allowing batching of operations, as with Create, Start, Stop, et al
-	err := container.Remove(context.Background(), handler.handlerCtx.Session)
-	if err != nil {
-		switch err := err.(type) {
-		case exec.NotFoundError:
-			return containers.NewContainerRemoveNotFound()
-		case exec.RemovePowerError:
-			return containers.NewContainerRemoveConflict().WithPayload(&models.Error{Message: err.Error()})
-		default:
-			if f, ok := err.(types.HasFault); ok {
-				switch f.Fault().(type) {
-				case *types.HostNotConnected:
-					p := &models.Error{Message: "Couldn't remove container. The ESX host is temporarily disconnected. Please try again later."}
-					return containers.NewContainerRemoveInternalServerError().WithPayload(p)
-				}
-			}
-			return containers.NewContainerRemoveInternalServerError()
-		}
-	}
-
-	return containers.NewContainerRemoveOK()
-}
-
-func (handler *ContainersHandlersImpl) GetContainerInfoHandler(params containers.GetContainerInfoParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	container := exec.Containers.Container(params.ID)
-	if container == nil {
-		info := fmt.Sprintf("GetContainerInfoHandler ContainerCache miss for container(%s)", params.ID)
-		log.Error(info)
-		return containers.NewGetContainerInfoNotFound().WithPayload(&models.Error{Message: info})
-	}
-
-	// Refresh to get up to date network info
-	container.Refresh(context.Background())
-	containerInfo := convertContainerToContainerInfo(container)
-	return containers.NewGetContainerInfoOK().WithPayload(containerInfo)
-}
-
-// type and funcs to provide sorting by created date
-type containerByCreated []*models.ContainerInfo
-
-func (r containerByCreated) Len() int      { return len(r) }
-func (r containerByCreated) Swap(i, j int) { r[i], r[j] = r[j], r[i] }
-func (r containerByCreated) Less(i, j int) bool {
-	return r[i].ContainerConfig.CreateTime < r[j].ContainerConfig.CreateTime
-}
-
-func (handler *ContainersHandlersImpl) GetContainerListHandler(params containers.GetContainerListParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	var state *exec.State
-	if params.All != nil && !*params.All {
-		state = new(exec.State)
-		*state = exec.StateRunning
-	}
-
-	containerVMs := exec.Containers.Containers(state)
-	containerList := make([]*models.ContainerInfo, 0, len(containerVMs))
-
-	for _, container := range containerVMs {
-		// convert to return model
-		info := convertContainerToContainerInfo(container)
-		containerList = append(containerList, info)
-	}
-
-	sort.Sort(sort.Reverse(containerByCreated(containerList)))
-	return containers.NewGetContainerListOK().WithPayload(containerList)
-}
-
-func (handler *ContainersHandlersImpl) ContainerSignalHandler(params containers.ContainerSignalParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	// NOTE: I feel that this should be in a Commit path for consistency
-	// it would allow phrasings such as:
-	// 1. join Volume to container
-	// 2. send HUP to primary process
-	// Only really relevant when we can connect networks or join volumes live
-	container := exec.Containers.Container(params.ID)
-	if container == nil {
-		return containers.NewContainerSignalNotFound().WithPayload(&models.Error{Message: fmt.Sprintf("container %s not found", params.ID)})
-	}
-
-	err := container.Signal(context.Background(), params.Signal)
-	if err != nil {
-		return containers.NewContainerSignalInternalServerError().WithPayload(&models.Error{Message: err.Error()})
-	}
-
-	return containers.NewContainerSignalOK()
-}
-
-func (handler *ContainersHandlersImpl) GetContainerStatsHandler(params containers.GetContainerStatsParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	c := exec.Containers.Container(params.ID)
-	if c == nil {
-		return containers.NewGetContainerStatsNotFound()
-	}
-
-	r, w := io.Pipe()
-	enc := json.NewEncoder(w)
-	flusher := NewFlushingReader(r)
-
-	// operation that will log the stats subscription for this client
-	statsOp := trace.NewOperation(context.Background(), "container(%s) stats subscription", params.ID)
-
-	// currently all stats requests will be a subscription and it will
-	// be the responsibility of the caller to close the connection
-	// and there by release the subscription
-	ch, err := metrics.Supervisor.Subscribe(statsOp, c)
-	if err != nil {
-		statsOp.Errorf("unable to subscribe container(%s) to stats stream: %s", params.ID, err)
-		return containers.NewGetContainerStatsInternalServerError()
-	}
-	statsOp.Debugf("container(%s) stats stream subscribed", params.ID)
-
-	// closer will be run when the http transport is closed
-	cleaner := func() {
-		statsOp.Debugf("unsubscribing %s from stats", params.ID)
-		metrics.Supervisor.Unsubscribe(statsOp, c, ch)
-		closePipe(r, w)
-	}
-
-	// routine that will listen for new metrics and encode to provided output stream
-	// unsubscription or error will exit the routine
-	go func() {
-		for {
-			select {
-			case metric, ok := <-ch:
-				if !ok {
-					statsOp.Debugf("container stats complete for %s", params.ID)
-					return
-				}
-				err := enc.Encode(metric)
-				if err != nil {
-					statsOp.Errorf("encoding error [%s] for container(%s) stats - stream(%t)", err, params.ID, params.Stream)
-					return
-				}
-			}
-		}
-	}()
-
-	return NewStreamOutputHandler("containerStats").WithPayload(flusher, params.ID, cleaner)
-}
-
-func (handler *ContainersHandlersImpl) GetContainerLogsHandler(params containers.GetContainerLogsParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	container := exec.Containers.Container(params.ID)
-	if container == nil {
-		return containers.NewGetContainerLogsNotFound()
-	}
-
-	follow := false
-	tail := -1
-	since := int64(0)
-
-	if params.Follow != nil {
-		follow = *params.Follow
-	}
-
-	if params.Taillines != nil {
-		tail = int(*params.Taillines)
-	}
-
-	if *params.Since > 0 {
-		since = *params.Since
-	}
-
-	reader, err := container.LogReader(context.Background(), tail, follow, since)
-	if err != nil {
-		// Do not return an error here.  It's a workaround for a panic similar to #2594
-		return containers.NewGetContainerLogsInternalServerError()
-	}
-
-	// containers with DataVersion > 0 will use updated output logging on the backend
-	if container.DataVersion > 0 {
-		ts := false
-		if params.Timestamp != nil {
-			ts = *params.Timestamp
-		}
-
-		// wrap the reader in a LogReader to deserialize persisted containerVM output
-		reader = iolog.NewLogReader(reader, ts)
-	}
-
-	detachableOut := NewFlushingReader(reader)
-
-	return NewStreamOutputHandler("containerLogs").WithPayload(detachableOut, params.ID, nil)
-}
-
-func (handler *ContainersHandlersImpl) ContainerWaitHandler(params containers.ContainerWaitParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("%s:%d", params.ID, params.Timeout)))
-
-	// default context timeout in seconds
-	defaultTimeout := int64(containerWaitTimeout.Seconds())
-
-	// if we have a positive timeout specified then use it
-	if params.Timeout > 0 {
-		defaultTimeout = params.Timeout
-	}
-
-	timeout := time.Duration(defaultTimeout) * time.Second
-
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
-
-	c := exec.Containers.Container(uid.Parse(params.ID).String())
-	if c == nil {
-		return containers.NewContainerWaitNotFound().WithPayload(&models.Error{
-			Message: fmt.Sprintf("container %s not found", params.ID),
-		})
-	}
-
-	select {
-	case <-c.WaitForState(exec.StateStopped):
-		containerInfo := convertContainerToContainerInfo(c)
-
-		return containers.NewContainerWaitOK().WithPayload(containerInfo)
-	case <-ctx.Done():
-		return containers.NewContainerWaitInternalServerError().WithPayload(&models.Error{
-			Message: fmt.Sprintf("ContainerWaitHandler(%s) Error: %s", params.ID, ctx.Err()),
-		})
-	}
-}
-
-func (handler *ContainersHandlersImpl) RenameContainerHandler(params containers.ContainerRenameParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("Rename container to %s", params.Name)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil || h.ExecConfig == nil {
-		return containers.NewContainerRenameNotFound()
-	}
-
-	// get the indicated container for rename
-	container := exec.Containers.Container(h.ExecConfig.ID)
-	if container == nil {
-		return containers.NewContainerRenameNotFound()
-	}
-
-	if container.ExecConfig.Name == params.Name {
-		err := &models.Error{
-			Message: fmt.Sprintf("renaming a container with the same name as its current name: %s", params.Name),
-		}
-		return containers.NewContainerRenameInternalServerError().WithPayload(err)
-	}
-
-	// rename on container version < supportVersionForRename is not supported
-	log.Debugf("The container DataVersion is: %d", h.DataVersion)
-	if h.DataVersion < feature.RenameSupportedVersion {
-		err := &models.Error{
-			Message: fmt.Sprintf("container %s does not support rename", container.ExecConfig.Name),
-		}
-		return containers.NewContainerRenameInternalServerError().WithPayload(err)
-	}
-
-	h = h.Rename(params.Name)
-
-	return containers.NewContainerRenameOK().WithPayload(h.String())
-}
-
-// utility function to convert from a Container type to the API Model ContainerInfo (which should prob be called ContainerDetail)
-func convertContainerToContainerInfo(c *exec.Container) *models.ContainerInfo {
-	container := c.Info()
-	defer trace.End(trace.Begin(container.ExecConfig.ID))
-
-	// ensure we have probably up-to-date info
-	for _, endpoint := range container.ExecConfig.Networks {
-		if !endpoint.Static && (endpoint.IP == nil || ip.IsUnspecifiedIP(endpoint.IP.IP)) {
-			// container has dynamic IP but we do not have a reported address
-			op := trace.NewOperation(context.Background(), "state refresh triggered by missing DHCP data")
-			c.Refresh(op)
-			container = c.Info()
-			// shouldn't need multiple refreshes if multiple dhcps
-			break
-		}
-	}
-
-	// convert the container type to the required model
-	info := &models.ContainerInfo{
-		ContainerConfig: &models.ContainerConfig{},
-		ProcessConfig:   &models.ProcessConfig{},
-		VolumeConfig:    make([]*models.VolumeConfig, 0),
-		Endpoints:       make([]*models.EndpointConfig, 0),
-		DataVersion:     int64(container.DataVersion),
-	}
-
-	// Populate volume information
-	for volName, mountSpec := range container.ExecConfig.Mounts {
-		vol := &models.VolumeConfig{
-			Name:       volName,
-			MountPoint: mountSpec.Path,
-			ReadWrite:  strings.Contains(strings.ToLower(mountSpec.Mode), "rw"),
-			Flags:      make(map[string]string),
-		}
-		vol.Flags[constants.Mode] = mountSpec.Mode
-		info.VolumeConfig = append(info.VolumeConfig, vol)
-	}
-
-	ccid := container.ExecConfig.ID
-	info.ContainerConfig.ContainerID = ccid
-
-	var state string
-	if container.MigrationError != nil {
-		state = "error"
-		info.ProcessConfig.ErrorMsg = fmt.Sprintf("Migration failed: %s", container.MigrationError.Error())
-		info.ProcessConfig.Status = state
-	} else {
-		state = container.State().String()
-	}
-	info.ContainerConfig.State = state
-	info.ContainerConfig.LayerID = container.ExecConfig.LayerID
-	info.ContainerConfig.ImageID = container.ExecConfig.ImageID
-	info.ContainerConfig.RepoName = &container.ExecConfig.RepoName
-	info.ContainerConfig.CreateTime = container.ExecConfig.CreateTime
-	info.ContainerConfig.Names = []string{container.ExecConfig.Name}
-	info.ContainerConfig.RestartCount = int64(container.ExecConfig.Diagnostics.ResurrectionCount)
-	info.ContainerConfig.StorageSize = container.VMUnsharedDisk
-
-	if container.ExecConfig.Annotations != nil && len(container.ExecConfig.Annotations) > 0 {
-		info.ContainerConfig.Annotations = make(map[string]string)
-
-		for k, v := range container.ExecConfig.Annotations {
-			info.ContainerConfig.Annotations[k] = v
-		}
-	}
-
-	// in heavily loaded environments we were seeing a panic due to a missing
-	// session id in execConfig -- this has only manifested itself in short lived containers
-	// that were initilized via run
-	if session, exists := container.ExecConfig.Sessions[ccid]; exists {
-		info.ContainerConfig.Tty = &session.Tty
-		info.ContainerConfig.AttachStdin = &session.Attach
-		info.ContainerConfig.AttachStdout = &session.Attach
-		info.ContainerConfig.AttachStderr = &session.Attach
-		info.ContainerConfig.OpenStdin = &session.OpenStdin
-
-		// started is a string in the vmx that is not to be confused
-		// with started the datetime in the models.ContainerInfo
-		info.ProcessConfig.Status = session.Started
-		info.ProcessConfig.ExecPath = session.Cmd.Path
-		info.ProcessConfig.WorkingDir = &session.Cmd.Dir
-		info.ProcessConfig.ExecArgs = session.Cmd.Args
-		info.ProcessConfig.Env = session.Cmd.Env
-		info.ProcessConfig.ExitCode = int32(session.ExitStatus)
-		info.ProcessConfig.StartTime = session.StartTime
-		info.ProcessConfig.StopTime = session.StopTime
-
-		info.ProcessConfig.User = session.User
-		if session.Group != "" {
-			info.ProcessConfig.User = fmt.Sprintf("%s:%s", session.User, session.Group)
-		}
-	} else {
-		// log that sessionID is missing and print the ExecConfig
-		log.Errorf("Session ID is missing from execConfig, change version %s: %#v", c.Config.ChangeVersion, container.ExecConfig)
-
-		// panic if we are in debug / hopefully CI
-		if log.DebugLevel > 0 {
-			panic("nil session id")
-		}
-
-	}
-
-	info.HostConfig = &models.HostConfig{}
-	for _, endpoint := range container.ExecConfig.Networks {
-		// if an external type this will be the endpoint used to publish ports
-		if endpoint.Network.Type == constants.ExternalScopeType && !ip.IsUnspecifiedIP(endpoint.Assigned.IP) {
-			info.HostConfig.Address = endpoint.Assigned.IP.String()
-			if endpoint.Network.TrustLevel == executor.Open {
-				// add all ports as port range
-				info.HostConfig.Ports = append(info.HostConfig.Ports, constants.PortsOpenNetwork)
-			}
-		}
-
-		ep := &models.EndpointConfig{
-			Address:     "",
-			Container:   ccid,
-			Gateway:     "",
-			ID:          endpoint.ID,
-			Name:        endpoint.Name,
-			Ports:       make([]string, 0),
-			Scope:       endpoint.Network.Name,
-			Aliases:     make([]string, 0),
-			Nameservers: make([]string, 0),
-		}
-
-		if len(endpoint.Network.Gateway.IP) > 0 {
-			ep.Gateway = endpoint.Network.Gateway.String()
-		}
-
-		if len(endpoint.Assigned.IP) > 0 {
-			ep.Address = endpoint.Assigned.String()
-		}
-
-		if len(endpoint.Ports) > 0 {
-			ep.Ports = append(ep.Ports, endpoint.Ports...)
-			info.HostConfig.Ports = append(info.HostConfig.Ports, endpoint.Ports...)
-		}
-
-		for _, alias := range endpoint.Network.Aliases {
-			parts := strings.Split(alias, ":")
-			if len(parts) > 1 {
-				ep.Aliases = append(ep.Aliases, parts[1])
-			} else {
-				ep.Aliases = append(ep.Aliases, parts[0])
-			}
-		}
-
-		for _, dns := range endpoint.Network.Nameservers {
-			ep.Nameservers = append(ep.Nameservers, dns.String())
-		}
-
-		info.Endpoints = append(info.Endpoints, ep)
-	}
-
-	return info
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/event_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/event_handlers.go
deleted file mode 100644
index 1bf1937d54..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/event_handlers.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/events"
-	ple "github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-// EventHandlerImpl is the receiver for all of the event handler methods
-type EventsHandlerImpl struct {
-	handlerCtx *HandlerContext
-}
-
-// Configure assigns functions to all the exec api handlers
-func (handler *EventsHandlerImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	api.EventsGetEventsHandler = events.GetEventsHandlerFunc(handler.GetEventsHandler)
-	handler.handlerCtx = handlerCtx
-}
-
-// GetEventsHandler provides a stream of events
-func (handler *EventsHandlerImpl) GetEventsHandler(params events.GetEventsParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	r, w := io.Pipe()
-	enc := json.NewEncoder(w)
-	flusher := NewFlushingReader(r)
-
-	// uid for subscription
-	id := uid.New().String()
-	sub := fmt.Sprintf("%s-%s", "PLE", id)
-
-	// currently only containerEvents will be streamed
-	topic := ple.NewEventType(ple.ContainerEvent{}).Topic()
-
-	// func to clean up the event stream
-	onClose := func() {
-		exec.Config.EventManager.Unsubscribe(topic, sub)
-		closePipe(r, w)
-	}
-
-	// subscribe to event stream
-	exec.Config.EventManager.Subscribe(topic, sub, func(ie ple.Event) {
-		err := enc.Encode(ie)
-		if err != nil {
-			log.Errorf("Encoding Error: %s", err.Error())
-			exec.Config.EventManager.Unsubscribe(topic, sub)
-			closePipe(r, w)
-		}
-	})
-
-	return NewStreamOutputHandler("events").WithPayload(flusher, sub, onClose)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/handlers.go
deleted file mode 100644
index d00fe71ac6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/handlers.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import "github.com/vmware/vic/pkg/vsphere/session"
-
-// HandlerContext is set of shared objects for the port layer server handlers
-type HandlerContext struct {
-	Session *session.Session
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers.go
deleted file mode 100644
index ec7293c40e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/interaction"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/attach"
-	"github.com/vmware/vic/lib/portlayer/attach/communication"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// InteractionHandlersImpl is the receiver for all of the interaction handler methods
-type InteractionHandlersImpl struct {
-	server *communication.Server
-}
-
-const (
-	// bump to 50 seconds for 30s is not enough for slow environment
-	interactionTimeout    time.Duration = 50 * time.Second
-	attachStdinInitString               = "v1c#>"
-
-	// in sync with lib/tether/tether_linux.go
-	// 115200 bps is 14.4 KB/s so use that
-	ioCopyBufferSize = 14 * 1024
-)
-
-func (i *InteractionHandlersImpl) Configure(api *operations.PortLayerAPI, _ *HandlerContext) {
-
-	api.InteractionInteractionJoinHandler = interaction.InteractionJoinHandlerFunc(i.JoinHandler)
-	api.InteractionInteractionBindHandler = interaction.InteractionBindHandlerFunc(i.BindHandler)
-	api.InteractionInteractionUnbindHandler = interaction.InteractionUnbindHandlerFunc(i.UnbindHandler)
-
-	api.InteractionContainerResizeHandler = interaction.ContainerResizeHandlerFunc(i.ContainerResizeHandler)
-	api.InteractionContainerSetStdinHandler = interaction.ContainerSetStdinHandlerFunc(i.ContainerSetStdinHandler)
-	api.InteractionContainerGetStdoutHandler = interaction.ContainerGetStdoutHandlerFunc(i.ContainerGetStdoutHandler)
-	api.InteractionContainerGetStderrHandler = interaction.ContainerGetStderrHandlerFunc(i.ContainerGetStderrHandler)
-
-	api.InteractionContainerCloseStdinHandler = interaction.ContainerCloseStdinHandlerFunc(i.ContainerCloseStdinHandler)
-
-	i.server = communication.NewServer("localhost", constants.AttachServerPort)
-	if err := i.server.Start(); err != nil {
-		log.Fatalf("Attach server unable to start: %s", err)
-	}
-}
-
-// JoinHandler calls the Join
-func (i *InteractionHandlersImpl) JoinHandler(params interaction.InteractionJoinParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return interaction.NewInteractionJoinInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := attach.Join(handle)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return interaction.NewInteractionJoinInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-	res := &models.InteractionJoinResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return interaction.NewInteractionJoinOK().WithPayload(res)
-}
-
-// BindHandler calls the Bind
-func (i *InteractionHandlersImpl) BindHandler(params interaction.InteractionBindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return interaction.NewInteractionBindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := attach.Bind(handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return interaction.NewInteractionBindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.InteractionBindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return interaction.NewInteractionBindOK().WithPayload(res)
-}
-
-// UnbindHandler calls the Unbind
-func (i *InteractionHandlersImpl) UnbindHandler(params interaction.InteractionUnbindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return interaction.NewInteractionUnbindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := attach.Unbind(handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return interaction.NewInteractionUnbindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.InteractionUnbindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return interaction.NewInteractionUnbindOK().WithPayload(res)
-}
-
-// ContainerResizeHandler calls resize
-func (i *InteractionHandlersImpl) ContainerResizeHandler(params interaction.ContainerResizeParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	ctx, cancel := context.WithTimeout(context.Background(), 0)
-	defer cancel()
-
-	// See whether there is an active session to the container
-	session, err := i.server.Interaction(ctx, params.ID)
-	if err != nil {
-		// just note the warning and return, resize requires an active connection
-		log.Warnf("No resize connection found (id: %s): %s", params.ID, err)
-
-		return interaction.NewContainerResizeOK()
-	}
-
-	// Request a resize
-	cWidth := uint32(params.Width)
-	cHeight := uint32(params.Height)
-
-	if err = session.Resize(cWidth, cHeight, 0, 0); err != nil {
-		log.Errorf("%s", err.Error())
-
-		return interaction.NewContainerResizeInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	return interaction.NewContainerResizeOK()
-}
-
-// ContainerSetStdinHandler returns the stdin
-func (i *InteractionHandlersImpl) ContainerSetStdinHandler(params interaction.ContainerSetStdinParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	ctx, cancel := context.WithTimeout(context.Background(), interactionTimeout)
-	if params.Deadline != nil {
-		ctx, cancel = context.WithDeadline(context.Background(), time.Time(*params.Deadline))
-	}
-	defer cancel()
-
-	session, err := i.server.Interaction(ctx, params.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		e := &models.Error{
-			Message: fmt.Sprintf("No stdin connection found (id: %s): %s", params.ID, err.Error()),
-		}
-		return interaction.NewContainerSetStdinNotFound().WithPayload(e)
-	}
-
-	detachableIn := NewFlushingReaderWithInitBytes(params.RawStream, []byte(attachStdinInitString))
-	_, err = io.Copy(session.Stdin(), detachableIn)
-	if err != nil {
-		log.Errorf("Copy@ContainerSetStdinHandler returned %s", err.Error())
-		/*
-			// FIXME(caglar10ur): need a way to differentiate detach from pipe
-			// Close the stdin if we get an EOF in the middle of the stream
-			if err == io.ErrUnexpectedEOF {
-				if err = session.CloseStdin(); err != nil {
-					log.Errorf("CloseStdin@ContainerSetStdinHandler failed with %s", err.Error())
-				} else {
-					log.Infof("CloseStdin@ContainerSetStdinHandler succeeded")
-				}
-			}
-
-			// FIXME(caglar10ur): Do not return an error here - https://github.com/vmware/vic/issues/2594
-			e := &models.Error{
-				Message: fmt.Sprintf("Error copying stdin (id: %s): %s", params.ID, err.Error()),
-			}
-			return interaction.NewContainerSetStdinInternalServerError().WithPayload(e)
-		*/
-	}
-
-	// close the stream
-	params.RawStream.Close()
-
-	log.Debugf("Done copying stdin")
-
-	return interaction.NewContainerSetStdinOK()
-}
-
-// ContainerCloseStdinHandler closes the stdin, it returns an error if there is no active connection between portlayer and the tether
-func (i *InteractionHandlersImpl) ContainerCloseStdinHandler(params interaction.ContainerCloseStdinParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	ctx, cancel := context.WithTimeout(context.Background(), interactionTimeout)
-	defer cancel()
-
-	session, err := i.server.Interaction(ctx, params.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		e := &models.Error{
-			Message: fmt.Sprintf("No stdin connection found (id: %s): %s", params.ID, err.Error()),
-		}
-		return interaction.NewContainerCloseStdinNotFound().WithPayload(e)
-	}
-
-	if err = session.CloseStdin(); err != nil {
-		log.Errorf("%s", err.Error())
-
-		return interaction.NewContainerCloseStdinInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-	return interaction.NewContainerCloseStdinOK()
-}
-
-// ContainerGetStdoutHandler returns the stdout
-func (i *InteractionHandlersImpl) ContainerGetStdoutHandler(params interaction.ContainerGetStdoutParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	ctx, cancel := context.WithTimeout(context.Background(), interactionTimeout)
-	if params.Deadline != nil {
-		ctx, cancel = context.WithDeadline(context.Background(), time.Time(*params.Deadline))
-	}
-	defer cancel()
-
-	session, err := i.server.Interaction(ctx, params.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		// FIXME (caglar10ur): Do not return an error here - https://github.com/vmware/vic/issues/2594
-		/*
-			e := &models.Error{
-				Message: fmt.Sprintf("No stdout connection found (id: %s): %s", params.ID, err.Error()),
-			}
-			return interaction.NewContainerGetStdoutNotFound().WithPayload(e)
-		*/
-		return interaction.NewContainerGetStdoutNotFound()
-	}
-
-	return NewStreamOutputHandler("stdout").WithPayload(
-		NewFlushingReader(
-			session.Stdout(),
-		),
-		params.ID,
-		nil,
-	)
-}
-
-// ContainerGetStderrHandler returns the stderr
-func (i *InteractionHandlersImpl) ContainerGetStderrHandler(params interaction.ContainerGetStderrParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.ID))
-
-	ctx, cancel := context.WithTimeout(context.Background(), interactionTimeout)
-	if params.Deadline != nil {
-		ctx, cancel = context.WithDeadline(context.Background(), time.Time(*params.Deadline))
-	}
-	defer cancel()
-
-	session, err := i.server.Interaction(ctx, params.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		// FIXME (caglar10ur): Do not return an error here - https://github.com/vmware/vic/issues/2594
-		/*
-			e := &models.Error{
-				Message: fmt.Sprintf("No stderr connection found (id: %s): %s", params.ID, err.Error()),
-			}
-			return interaction.NewContainerGetStderrNotFound().WithPayload(e)
-		*/
-		return interaction.NewContainerGetStderrNotFound()
-	}
-
-	return NewStreamOutputHandler("stderr").WithPayload(
-		NewFlushingReader(
-			session.Stderr(),
-		),
-		params.ID,
-		nil,
-	)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers_test.go
deleted file mode 100644
index 9a150c074f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/interaction_handlers_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"io"
-	"strings"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-func init() {
-	log.SetLevel(log.DebugLevel)
-}
-
-// A ChunkReader reads C bytes from R in each Read
-type ChunkReader struct {
-	R io.Reader
-	C int64
-}
-
-func NewChunkReader(r io.Reader, c int64) io.Reader {
-	return &ChunkReader{r, c}
-}
-
-func (l *ChunkReader) Read(p []byte) (n int, err error) {
-	return l.R.Read(p[:l.C])
-}
-
-func TestNewFlushingReaderWithInitBytes(t *testing.T) {
-
-	var tests = []struct {
-		in  string
-		err error
-	}{
-		{attachStdinInitString, nil},
-		{attachStdinInitString + "# uname -a", nil},
-		{"@^" + attachStdinInitString + "# uname -a", nil},
-		{attachStdinInitString[:2], io.EOF},
-	}
-
-	for _, test := range tests {
-		for i := 1; i < len(test.in)+1; i++ {
-			buf := make([]byte, 64)
-
-			lr := NewChunkReader(strings.NewReader(test.in), int64(i))
-
-			f := NewFlushingReaderWithInitBytes(lr, []byte(attachStdinInitString))
-			_, err := f.readDetectInit(buf)
-			if err != test.err {
-				t.Error(err)
-			}
-		}
-	}
-}
-
-func TestNewFlushingReaderWithInitBytesPanic(t *testing.T) {
-	defer func() {
-		if r := recover(); r == nil {
-			t.Errorf("The function did not panic")
-		}
-	}()
-
-	// pass a smaller buffer to cause it to panic
-	str := attachStdinInitString
-	var buf []byte
-
-	lr := NewChunkReader(strings.NewReader(str), 1)
-	f := NewFlushingReaderWithInitBytes(lr, []byte(attachStdinInitString))
-	f.readDetectInit(buf)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/kv_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/kv_handlers.go
deleted file mode 100644
index 593df39619..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/kv_handlers.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"net/http"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/kv"
-	"github.com/vmware/vic/lib/portlayer/store"
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type KvHandlersImpl struct {
-	defaultStore kvstore.KeyValueStore
-}
-
-func (handler *KvHandlersImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	api.KvGetValueHandler = kv.GetValueHandlerFunc(handler.GetValueHandler)
-	api.KvPutValueHandler = kv.PutValueHandlerFunc(handler.PutValueHandler)
-	api.KvDeleteValueHandler = kv.DeleteValueHandlerFunc(handler.DeleteValueHandler)
-
-	// Get the APIKV store -- it should always be present since it's
-	// initialized when the portlayer starts
-	// #nosec: Errors unhandled.
-	s, _ := store.Store(store.APIKV)
-	handler.defaultStore = s
-}
-
-func (handler *KvHandlersImpl) GetValueHandler(params kv.GetValueParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.Key))
-
-	val, err := handler.defaultStore.Get(params.Key)
-	if err != nil {
-		switch err {
-		case kvstore.ErrKeyNotFound:
-			return kv.NewGetValueNotFound()
-		default:
-			log.Errorf("Error Getting Key/Value: %s", err.Error())
-			return kv.NewGetValueInternalServerError().WithPayload(&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-		}
-	}
-	return kv.NewGetValueOK().WithPayload(&models.KeyValue{Key: params.Key, Value: string(val)})
-}
-
-func (handler *KvHandlersImpl) PutValueHandler(params kv.PutValueParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.KeyValue.Key))
-
-	err := handler.defaultStore.Put(
-		context.Background(),
-		params.KeyValue.Key,
-		[]byte(params.KeyValue.Value))
-	if err != nil {
-		log.Errorf("Error Setting Key/Value: %s", err.Error())
-		return kv.NewGetValueInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-	return kv.NewPutValueOK()
-}
-
-func (handler *KvHandlersImpl) DeleteValueHandler(params kv.DeleteValueParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.Key))
-
-	err := handler.defaultStore.Delete(trace.NewOperation(context.Background(), "DeleteValue"), params.Key)
-	if err != nil {
-		switch err {
-		case kvstore.ErrKeyNotFound:
-			return kv.NewDeleteValueNotFound()
-		default:
-			log.Errorf("Error deleting Key/Value: %s", err.Error())
-			return kv.NewGetValueInternalServerError().WithPayload(&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-		}
-	}
-	return kv.NewDeleteValueOK()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/logging_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/logging_handlers.go
deleted file mode 100644
index af1d50c1f8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/logging_handlers.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/logging"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	portlayer "github.com/vmware/vic/lib/portlayer/logging"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// LoggingHandlersImpl is the receiver for all of the logging handler methods
-type LoggingHandlersImpl struct {
-}
-
-// Configure initializes the handler
-func (i *LoggingHandlersImpl) Configure(api *operations.PortLayerAPI, _ *HandlerContext) {
-	api.LoggingLoggingJoinHandler = logging.LoggingJoinHandlerFunc(i.JoinHandler)
-	api.LoggingLoggingBindHandler = logging.LoggingBindHandlerFunc(i.BindHandler)
-	api.LoggingLoggingUnbindHandler = logging.LoggingUnbindHandlerFunc(i.UnbindHandler)
-}
-
-// JoinHandler calls the Join
-func (i *LoggingHandlersImpl) JoinHandler(params logging.LoggingJoinParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return logging.NewLoggingJoinInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := portlayer.Join(handle)
-	if err != nil {
-		return logging.NewLoggingJoinInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.LoggingJoinResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return logging.NewLoggingJoinOK().WithPayload(res)
-}
-
-// BindHandler calls the Bind
-func (i *LoggingHandlersImpl) BindHandler(params logging.LoggingBindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return logging.NewLoggingBindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := portlayer.Bind(handle)
-	if err != nil {
-		return logging.NewLoggingBindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.LoggingBindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return logging.NewLoggingBindOK().WithPayload(res)
-}
-
-// UnbindHandler calls the Unbind
-func (i *LoggingHandlersImpl) UnbindHandler(params logging.LoggingUnbindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return logging.NewLoggingUnbindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := portlayer.Unbind(handle)
-	if err != nil {
-		return logging.NewLoggingUnbindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.LoggingUnbindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return logging.NewLoggingUnbindOK().WithPayload(res)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/misc_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/misc_handlers.go
deleted file mode 100644
index 1904689487..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/misc_handlers.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/misc"
-	"github.com/vmware/vic/lib/portlayer/exec"
-)
-
-// MiscHandlersImpl is the receiver for all the misc handler methods
-type MiscHandlersImpl struct{}
-
-// Configure assigns functions to all the miscellaneous api handlers
-func (h *MiscHandlersImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	api.MiscPingHandler = misc.PingHandlerFunc(h.Ping)
-	api.MiscGetVCHInfoHandler = misc.GetVCHInfoHandlerFunc(h.GetVCHInfo)
-}
-
-// Ping sends an OK response to let the client know the server is up
-func (h *MiscHandlersImpl) Ping(param misc.PingParams) middleware.Responder {
-	return misc.NewPingOK().WithPayload("OK")
-}
-
-// GetVCHInfo returns VCH-related info for a `docker info` call
-func (h *MiscHandlersImpl) GetVCHInfo(params misc.GetVCHInfoParams) middleware.Responder {
-
-	vch := exec.GetVCHstats(context.Background())
-
-	vchInfo := &models.VCHInfo{
-		CPUMhz:          vch.CPULimit,
-		Memory:          vch.MemoryLimit,
-		CPUUsage:        vch.CPUUsage,
-		MemUsage:        vch.MemoryUsage,
-		HostOS:          exec.Config.HostOS,
-		HostOSVersion:   exec.Config.HostOSVersion,
-		HostProductName: exec.Config.HostProductName,
-	}
-
-	return misc.NewGetVCHInfoOK().WithPayload(vchInfo)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/scopes_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/scopes_handlers.go
deleted file mode 100644
index f3b4871d31..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/scopes_handlers.go
+++ /dev/null
@@ -1,399 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"net/http"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/scopes"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/network"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// ScopesHandlersImpl is the receiver for all of the storage handler methods
-type ScopesHandlersImpl struct {
-	netCtx     *network.Context
-	handlerCtx *HandlerContext
-}
-
-// Configure assigns functions to all the scopes api handlers
-func (handler *ScopesHandlersImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	api.ScopesCreateScopeHandler = scopes.CreateScopeHandlerFunc(handler.ScopesCreate)
-	api.ScopesDeleteScopeHandler = scopes.DeleteScopeHandlerFunc(handler.ScopesDelete)
-	api.ScopesListAllHandler = scopes.ListAllHandlerFunc(handler.ScopesListAll)
-	api.ScopesListHandler = scopes.ListHandlerFunc(handler.ScopesList)
-	api.ScopesGetContainerEndpointsHandler = scopes.GetContainerEndpointsHandlerFunc(handler.ScopesGetContainerEndpoints)
-	api.ScopesAddContainerHandler = scopes.AddContainerHandlerFunc(handler.ScopesAddContainer)
-	api.ScopesRemoveContainerHandler = scopes.RemoveContainerHandlerFunc(handler.ScopesRemoveContainer)
-	api.ScopesBindContainerHandler = scopes.BindContainerHandlerFunc(handler.ScopesBindContainer)
-	api.ScopesUnbindContainerHandler = scopes.UnbindContainerHandlerFunc(handler.ScopesUnbindContainer)
-
-	handler.netCtx = network.DefaultContext
-	handler.handlerCtx = handlerCtx
-}
-
-func parseScopeConfig(cfg *models.ScopeConfig) (subnet *net.IPNet, gateway net.IP, dns []net.IP, annotations map[string]string, err error) {
-	if cfg.Subnet != "" {
-		if _, subnet, err = net.ParseCIDR(cfg.Subnet); err != nil {
-			return
-		}
-	}
-
-	gateway = net.IPv4(0, 0, 0, 0)
-	if cfg.Gateway != "" {
-		if gateway = net.ParseIP(cfg.Gateway); gateway == nil {
-			err = fmt.Errorf("invalid gateway")
-			return
-		}
-	}
-
-	dns = make([]net.IP, len(cfg.DNS))
-	for i, d := range cfg.DNS {
-		dns[i] = net.ParseIP(d)
-		if dns[i] == nil {
-			err = fmt.Errorf("invalid dns entry")
-			return
-		}
-	}
-
-	// Parse annotations
-	if len(cfg.Annotations) > 0 {
-		annotations = make(map[string]string)
-		for k, v := range cfg.Annotations {
-			annotations[k] = v
-		}
-	}
-
-	return
-}
-
-func (handler *ScopesHandlersImpl) listScopes(idName string) ([]*models.ScopeConfig, error) {
-	defer trace.End(trace.Begin(idName))
-	scs, err := handler.netCtx.Scopes(context.Background(), &idName)
-	if err != nil {
-		return nil, err
-	}
-
-	cfgs := make([]*models.ScopeConfig, len(scs))
-	for i, s := range scs {
-		cfgs[i] = toScopeConfig(s)
-	}
-
-	return cfgs, nil
-}
-
-func errorPayload(err error) *models.Error {
-	return &models.Error{Message: err.Error()}
-}
-
-func (handler *ScopesHandlersImpl) ScopesCreate(params scopes.CreateScopeParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	cfg := params.Config
-	if cfg.ScopeType == "external" {
-		return scopes.NewCreateScopeDefault(http.StatusServiceUnavailable).WithPayload(
-			&models.Error{Message: "cannot create external networks"})
-	}
-
-	subnet, gateway, dns, annotations, err := parseScopeConfig(cfg)
-	if err != nil {
-		return scopes.NewCreateScopeDefault(http.StatusServiceUnavailable).WithPayload(
-			errorPayload(err))
-	}
-
-	scopeData := &network.ScopeData{
-		ScopeType:   cfg.ScopeType,
-		Name:        cfg.Name,
-		Subnet:      subnet,
-		Gateway:     gateway,
-		DNS:         dns,
-		Pools:       cfg.IPAM,
-		Annotations: annotations,
-		Internal:    cfg.Internal,
-	}
-
-	s, err := handler.netCtx.NewScope(context.Background(), scopeData)
-	if _, ok := err.(network.DuplicateResourceError); ok {
-		return scopes.NewCreateScopeConflict()
-	}
-
-	if err != nil {
-		return scopes.NewCreateScopeDefault(http.StatusServiceUnavailable).WithPayload(
-			errorPayload(err))
-	}
-
-	return scopes.NewCreateScopeCreated().WithPayload(toScopeConfig(s))
-}
-
-func (handler *ScopesHandlersImpl) ScopesDelete(params scopes.DeleteScopeParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.IDName))
-
-	if err := handler.netCtx.DeleteScope(context.Background(), params.IDName); err != nil {
-		switch err := err.(type) {
-		case network.ResourceNotFoundError:
-			return scopes.NewDeleteScopeNotFound().WithPayload(errorPayload(err))
-
-		default:
-			return scopes.NewDeleteScopeInternalServerError().WithPayload(errorPayload(err))
-		}
-	}
-
-	return scopes.NewDeleteScopeOK()
-}
-
-func (handler *ScopesHandlersImpl) ScopesListAll(params scopes.ListAllParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	cfgs, err := handler.listScopes("")
-	if err != nil {
-		return scopes.NewListDefault(http.StatusServiceUnavailable).WithPayload(errorPayload(err))
-	}
-
-	return scopes.NewListAllOK().WithPayload(cfgs)
-}
-
-func (handler *ScopesHandlersImpl) ScopesList(params scopes.ListParams) middleware.Responder {
-	defer trace.End(trace.Begin("ScopesList"))
-
-	cfgs, err := handler.listScopes(params.IDName)
-	if _, ok := err.(network.ResourceNotFoundError); ok {
-		return scopes.NewListNotFound().WithPayload(errorPayload(err))
-	}
-
-	return scopes.NewListOK().WithPayload(cfgs)
-}
-
-func (handler *ScopesHandlersImpl) ScopesGetContainerEndpoints(params scopes.GetContainerEndpointsParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.HandleOrID))
-
-	cid := params.HandleOrID
-	// lookup by handle
-	h := exec.GetHandle(cid)
-	if h != nil {
-		cid = h.ExecConfig.ID
-	}
-
-	c := handler.netCtx.Container(cid)
-	if c == nil {
-		return scopes.NewGetContainerEndpointsNotFound().WithPayload(errorPayload(fmt.Errorf("container not found")))
-	}
-	eps := c.Endpoints()
-	ecs := make([]*models.EndpointConfig, len(eps))
-	for i, e := range eps {
-		ecs[i] = toEndpointConfig(e)
-	}
-
-	return scopes.NewGetContainerEndpointsOK().WithPayload(ecs)
-}
-
-func (handler *ScopesHandlersImpl) ScopesAddContainer(params scopes.AddContainerParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Config.Handle)))
-
-	h := exec.GetHandle(params.Config.Handle)
-	if h == nil {
-		return scopes.NewAddContainerNotFound().WithPayload(&models.Error{Message: "container not found"})
-	}
-
-	err := func() error {
-		addr := params.Config.NetworkConfig.Address
-		var ip net.IP
-		if addr != "" {
-			ip = net.ParseIP(addr)
-			if ip == nil {
-				return fmt.Errorf("invalid ip address %q", addr)
-			}
-		}
-
-		if len(params.Config.NetworkConfig.Aliases) > 0 {
-			log.Debugf("Links/Aliases: %#v", params.Config.NetworkConfig.Aliases)
-		}
-
-		options := &network.AddContainerOptions{
-			Scope:   params.Config.NetworkConfig.NetworkName,
-			IP:      ip,
-			Aliases: params.Config.NetworkConfig.Aliases,
-			Ports:   params.Config.NetworkConfig.Ports,
-		}
-		return handler.netCtx.AddContainer(h, options)
-	}()
-
-	if err != nil {
-		if _, ok := err.(*network.ResourceNotFoundError); ok {
-			return scopes.NewAddContainerNotFound().WithPayload(errorPayload(err))
-		}
-
-		return scopes.NewAddContainerInternalServerError().WithPayload(errorPayload(err))
-	}
-
-	return scopes.NewAddContainerOK().WithPayload(h.String())
-}
-
-func (handler *ScopesHandlersImpl) ScopesRemoveContainer(params scopes.RemoveContainerParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil {
-		return scopes.NewRemoveContainerNotFound().WithPayload(&models.Error{Message: "container not found"})
-	}
-
-	if err := handler.netCtx.RemoveContainer(h, params.Scope); err != nil {
-		if _, ok := err.(*network.ResourceNotFoundError); ok {
-			return scopes.NewRemoveContainerNotFound().WithPayload(errorPayload(err))
-		}
-
-		return scopes.NewRemoveContainerInternalServerError().WithPayload(errorPayload(err))
-	}
-
-	return scopes.NewRemoveContainerOK().WithPayload(h.String())
-}
-
-func (handler *ScopesHandlersImpl) ScopesBindContainer(params scopes.BindContainerParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil {
-		return scopes.NewBindContainerNotFound().WithPayload(&models.Error{Message: "container not found"})
-	}
-
-	var endpoints []*network.Endpoint
-	var err error
-	if endpoints, err = handler.netCtx.BindContainer(h); err != nil {
-		switch err := err.(type) {
-		case network.ResourceNotFoundError:
-			return scopes.NewBindContainerNotFound().WithPayload(errorPayload(err))
-
-		default:
-			return scopes.NewBindContainerInternalServerError().WithPayload(errorPayload(err))
-		}
-	}
-
-	res := &models.BindContainerResponse{
-		Handle:    h.String(),
-		Endpoints: make([]*models.EndpointConfig, len(endpoints)),
-	}
-	for i, e := range endpoints {
-		res.Endpoints[i] = toEndpointConfig(e)
-	}
-
-	return scopes.NewBindContainerOK().WithPayload(res)
-}
-
-func (handler *ScopesHandlersImpl) ScopesUnbindContainer(params scopes.UnbindContainerParams) middleware.Responder {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle(%s)", params.Handle)))
-
-	h := exec.GetHandle(params.Handle)
-	if h == nil {
-		return scopes.NewUnbindContainerNotFound()
-	}
-
-	var endpoints []*network.Endpoint
-	var err error
-	if endpoints, err = handler.netCtx.UnbindContainer(h); err != nil {
-		switch err := err.(type) {
-		case network.ResourceNotFoundError:
-			return scopes.NewUnbindContainerNotFound().WithPayload(errorPayload(err))
-
-		default:
-			return scopes.NewUnbindContainerInternalServerError().WithPayload(errorPayload(err))
-		}
-	}
-
-	res := &models.UnbindContainerResponse{
-		Handle:    h.String(),
-		Endpoints: make([]*models.EndpointConfig, len(endpoints)),
-	}
-	for i, e := range endpoints {
-		res.Endpoints[i] = toEndpointConfig(e)
-	}
-
-	return scopes.NewUnbindContainerOK().WithPayload(res)
-}
-
-func toScopeConfig(scope *network.Scope) *models.ScopeConfig {
-	subnet := ""
-	if !ip.IsUnspecifiedIP(scope.Subnet().IP) {
-		subnet = scope.Subnet().String()
-	}
-
-	gateway := ""
-	if !scope.Gateway().IsUnspecified() {
-		gateway = scope.Gateway().String()
-	}
-
-	sc := &models.ScopeConfig{
-		ID:        scope.ID().String(),
-		Name:      scope.Name(),
-		ScopeType: scope.Type(),
-		Subnet:    subnet,
-		Gateway:   gateway,
-		Internal:  scope.Internal(),
-	}
-
-	var pools []string
-	for _, p := range scope.Pools() {
-		pools = append(pools, p.String())
-	}
-
-	sc.IPAM = pools
-	if len(sc.IPAM) == 0 {
-		sc.IPAM = []string{subnet}
-	}
-
-	eps := scope.Endpoints()
-	sc.Endpoints = make([]*models.EndpointConfig, len(eps))
-	for i, e := range eps {
-		sc.Endpoints[i] = toEndpointConfig(e)
-	}
-
-	sc.Annotations = make(map[string]string)
-	annotations := scope.Annotations()
-	for k, v := range annotations {
-		sc.Annotations[k] = v
-	}
-
-	return sc
-}
-
-func toEndpointConfig(e *network.Endpoint) *models.EndpointConfig {
-	addr := ""
-	if !ip.IsUnspecifiedIP(e.IP()) {
-		addr = e.IP().String()
-	}
-
-	ports := e.Ports()
-	ecports := make([]string, len(ports))
-	for i, p := range e.Ports() {
-		ecports[i] = p.String()
-	}
-
-	return &models.EndpointConfig{
-		Address:   addr,
-		Container: e.ID().String(),
-		ID:        e.ID().String(),
-		Name:      e.Name(),
-		Scope:     e.Scope().Name(),
-		Ports:     ecports,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers.go
deleted file mode 100644
index 31a89852fd..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers.go
+++ /dev/null
@@ -1,823 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"fmt"
-	"net/http"
-	"net/url"
-	"os"
-	"strconv"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/storage"
-	"github.com/vmware/vic/lib/archive"
-	epl "github.com/vmware/vic/lib/portlayer/exec"
-	spl "github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/storage/nfs"
-	"github.com/vmware/vic/lib/portlayer/storage/vsphere"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-)
-
-// StorageHandlersImpl is the receiver for all of the storage handler methods
-type StorageHandlersImpl struct {
-	imageCache     *spl.NameLookupCache
-	volumeCache    *spl.VolumeLookupCache
-	containerStore *vsphere.ContainerStore
-}
-
-const (
-	nfsScheme = "nfs"
-	dsScheme  = "ds"
-
-	uidQueryKey = "uid"
-	gidQueryKey = "gid"
-)
-
-// Configure assigns functions to all the storage api handlers
-func (h *StorageHandlersImpl) Configure(api *operations.PortLayerAPI, handlerCtx *HandlerContext) {
-	var err error
-
-	ctx := context.Background()
-	op := trace.NewOperation(ctx, "configure")
-
-	if len(spl.Config.ImageStores) == 0 {
-		op.Panicf("No image stores provided; unable to instantiate storage layer")
-	}
-
-	imageStoreURL := spl.Config.ImageStores[0]
-	// TODO: support multiple image stores. Right now we only support the first one
-	if len(spl.Config.ImageStores) > 1 {
-		op.Warnf("Multiple image stores found. Multiple image stores are not yet supported. Using [%s] %s", imageStoreURL.Host, imageStoreURL.Path)
-	}
-
-	ds, err := vsphere.NewImageStore(op, handlerCtx.Session, &imageStoreURL)
-	if err != nil {
-		op.Panicf("Cannot instantiate storage layer: %s", err)
-	}
-
-	// The imagestore is implemented via a cache which is backed via an
-	// implementation that writes to disks.  The cache is used to avoid
-	// expensive metadata lookups.
-	h.imageCache = spl.NewLookupCache(ds)
-
-	spl.RegisterImporter(op, imageStoreURL.String(), ds)
-	spl.RegisterExporter(op, imageStoreURL.String(), ds)
-
-	c, err := vsphere.NewContainerStore(op, handlerCtx.Session, h.imageCache)
-	if err != nil {
-		op.Panicf("Couldn't create containerStore: %s", err.Error())
-	}
-	h.containerStore = c
-
-	spl.RegisterImporter(op, "container", h.containerStore)
-	spl.RegisterExporter(op, "container", h.containerStore)
-
-	// add the volume stores, errors are logged within this function.
-	h.configureVolumeStores(op, handlerCtx)
-
-	api.StorageCreateImageStoreHandler = storage.CreateImageStoreHandlerFunc(h.CreateImageStore)
-	api.StorageGetImageHandler = storage.GetImageHandlerFunc(h.GetImage)
-	api.StorageListImagesHandler = storage.ListImagesHandlerFunc(h.ListImages)
-	api.StorageWriteImageHandler = storage.WriteImageHandlerFunc(h.WriteImage)
-	api.StorageDeleteImageHandler = storage.DeleteImageHandlerFunc(h.DeleteImage)
-
-	api.StorageVolumeStoresListHandler = storage.VolumeStoresListHandlerFunc(h.VolumeStoresList)
-	api.StorageCreateVolumeHandler = storage.CreateVolumeHandlerFunc(h.CreateVolume)
-	api.StorageRemoveVolumeHandler = storage.RemoveVolumeHandlerFunc(h.RemoveVolume)
-	api.StorageVolumeJoinHandler = storage.VolumeJoinHandlerFunc(h.VolumeJoin)
-	api.StorageListVolumesHandler = storage.ListVolumesHandlerFunc(h.VolumesList)
-	api.StorageGetVolumeHandler = storage.GetVolumeHandlerFunc(h.GetVolume)
-
-	api.StorageExportArchiveHandler = storage.ExportArchiveHandlerFunc(h.ExportArchive)
-	api.StorageImportArchiveHandler = storage.ImportArchiveHandlerFunc(h.ImportArchive)
-	api.StorageStatPathHandler = storage.StatPathHandlerFunc(h.StatPath)
-}
-
-func (h *StorageHandlersImpl) configureVolumeStores(op trace.Operation, handlerCtx *HandlerContext) {
-	var (
-		vs  spl.VolumeStorer
-		err error
-	)
-
-	h.volumeCache = spl.NewVolumeLookupCache(op)
-
-	// register the pseudo-store to handle the generic "volume" store name
-	spl.RegisterImporter(op, "volume", h.volumeCache)
-	spl.RegisterExporter(op, "volume", h.volumeCache)
-
-	// Configure the datastores
-	// Each volume store name maps to a datastore + path, which can be referred to by the name.
-	for name, dsurl := range spl.Config.VolumeLocations {
-		switch dsurl.Scheme {
-		case nfsScheme:
-			vs, err = createNFSVolumeStore(op, dsurl, name)
-		case dsScheme:
-			vs, err = createVsphereVolumeStore(op, dsurl, name, handlerCtx)
-		default:
-			err = fmt.Errorf("unknown scheme for %s", dsurl.String())
-			op.Error(err)
-		}
-
-		// if an error has been logged skip volume store cache addition
-		if err != nil {
-			continue
-		}
-
-		op.Infof("Adding volume store %s (%s)", name, dsurl.String())
-		if _, err = h.volumeCache.AddStore(op, name, vs); err != nil {
-			op.Errorf("volume addition error %s", err)
-		}
-
-		spl.RegisterImporter(op, dsurl.String(), vs)
-		spl.RegisterExporter(op, dsurl.String(), vs)
-
-		// get the mangled store URLs that the cache uses
-		// #nosec: Errors unhandled.
-		cURL, _ := h.volumeCache.GetVolumeStore(op, name)
-		if cURL != nil {
-			spl.RegisterImporter(op, cURL.String(), vs)
-			spl.RegisterExporter(op, cURL.String(), vs)
-		}
-	}
-}
-
-// CreateImageStore creates a new image store
-func (h *StorageHandlersImpl) CreateImageStore(params storage.CreateImageStoreParams) middleware.Responder {
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("CreateImageStore(%s)", params.Body.Name))
-	name := params.Body.Name
-
-	registerImageStore := func(h *StorageHandlersImpl, name string) {
-		// register image store importer/export
-		spl.RegisterImporter(op, name, h.imageCache.DataStore)
-		spl.RegisterExporter(op, name, h.imageCache.DataStore)
-
-		storeURL, err := util.ImageStoreNameToURL(name)
-		if err == nil {
-			spl.RegisterImporter(op, storeURL.String(), h.imageCache.DataStore)
-			spl.RegisterExporter(op, storeURL.String(), h.imageCache.DataStore)
-		}
-	}
-
-	url, err := h.imageCache.CreateImageStore(op, name)
-	if err != nil {
-		if os.IsExist(err) {
-			registerImageStore(h, name)
-			return storage.NewCreateImageStoreConflict().WithPayload(
-				&models.Error{
-					Code:    http.StatusConflict,
-					Message: "An image store with that name already exists",
-				})
-		}
-
-		return storage.NewCreateImageStoreDefault(http.StatusInternalServerError).WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-	registerImageStore(h, name)
-
-	s := &models.StoreURL{
-		Code: http.StatusCreated,
-		URL:  url.String(),
-	}
-	return storage.NewCreateImageStoreCreated().WithPayload(s)
-}
-
-// GetImage retrieves an image from a store
-func (h *StorageHandlersImpl) GetImage(params storage.GetImageParams) middleware.Responder {
-	id := params.ID
-
-	url, err := util.ImageStoreNameToURL(params.StoreName)
-	if err != nil {
-		return storage.NewGetImageDefault(http.StatusInternalServerError).WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("GetImage(%s)", id))
-	image, err := h.imageCache.GetImage(op, url, id)
-	if err != nil {
-		e := &models.Error{
-			Code:    http.StatusNotFound,
-			Message: err.Error(),
-		}
-		return storage.NewGetImageNotFound().WithPayload(e)
-	}
-
-	result := convertImage(image)
-	return storage.NewGetImageOK().WithPayload(result)
-}
-
-// DeleteImage deletes an image from a store
-func (h *StorageHandlersImpl) DeleteImage(params storage.DeleteImageParams) middleware.Responder {
-
-	ferr := func(err error, code int) middleware.Responder {
-		log.Errorf("DeleteImage: error %s", err.Error())
-		return storage.NewDeleteImageDefault(code).WithPayload(
-			&models.Error{
-				Code:    int64(code),
-				Message: err.Error(),
-			})
-	}
-
-	imageURL, err := util.ImageURL(params.StoreName, params.ID)
-	if err != nil {
-		return ferr(err, http.StatusInternalServerError)
-	}
-
-	image, err := spl.Parse(imageURL)
-	if err != nil {
-		return ferr(err, http.StatusInternalServerError)
-	}
-
-	keepNodes := make([]*url.URL, len(params.KeepNodes))
-	for idx, kn := range params.KeepNodes {
-		k, err := url.Parse(kn)
-		if err != nil {
-			return ferr(err, http.StatusInternalServerError)
-		}
-
-		keepNodes[idx] = k
-	}
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("DeleteBranch(%s)", image.ID))
-	deletedImages, err := h.imageCache.DeleteBranch(op, image, keepNodes)
-	if err != nil {
-		switch {
-		case spl.IsErrImageInUse(err):
-			return ferr(err, http.StatusLocked)
-
-		case os.IsNotExist(err):
-			return ferr(err, http.StatusNotFound)
-
-		default:
-			return ferr(err, http.StatusInternalServerError)
-		}
-	}
-
-	result := make([]*models.Image, len(deletedImages))
-	for idx, image := range deletedImages {
-		result[idx] = convertImage(image)
-	}
-
-	return storage.NewDeleteImageOK().WithPayload(result)
-}
-
-// ListImages returns a list of images in a store
-func (h *StorageHandlersImpl) ListImages(params storage.ListImagesParams) middleware.Responder {
-	u, err := util.ImageStoreNameToURL(params.StoreName)
-	if err != nil {
-		return storage.NewListImagesDefault(http.StatusInternalServerError).WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("ListImages(%s, %q)", u.String(), params.Ids))
-	images, err := h.imageCache.ListImages(op, u, params.Ids)
-	if err != nil {
-		return storage.NewListImagesNotFound().WithPayload(
-			&models.Error{
-				Code:    http.StatusNotFound,
-				Message: err.Error(),
-			})
-	}
-
-	result := make([]*models.Image, 0, len(images))
-
-	for _, image := range images {
-		result = append(result, convertImage(image))
-	}
-	return storage.NewListImagesOK().WithPayload(result)
-}
-
-// WriteImage writes an image to an image store
-func (h *StorageHandlersImpl) WriteImage(params storage.WriteImageParams) middleware.Responder {
-	u, err := util.ImageStoreNameToURL(params.StoreName)
-	if err != nil {
-		return storage.NewWriteImageDefault(http.StatusInternalServerError).WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-
-	parent := &spl.Image{
-		Store: u,
-		ID:    params.ParentID,
-	}
-
-	var meta map[string][]byte
-
-	if params.Metadatakey != nil && params.Metadataval != nil {
-		meta = map[string][]byte{*params.Metadatakey: []byte(*params.Metadataval)}
-	}
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("WriteImage(%s)", params.ImageID))
-	image, err := h.imageCache.WriteImage(op, parent, params.ImageID, meta, params.Sum, params.ImageFile)
-	if err != nil {
-		return storage.NewWriteImageDefault(http.StatusInternalServerError).WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-	i := convertImage(image)
-	return storage.NewWriteImageCreated().WithPayload(i)
-}
-
-// VolumeStoresList lists the configured volume stores and their datastore path URIs.
-func (h *StorageHandlersImpl) VolumeStoresList(params storage.VolumeStoresListParams) middleware.Responder {
-	defer trace.End(trace.Begin("storage_handlers.VolumeStoresList"))
-
-	op := trace.NewOperation(context.Background(), "VolumeStoresList")
-	stores, err := h.volumeCache.VolumeStoresList(op)
-	if err != nil {
-		return storage.NewVolumeStoresListInternalServerError().WithPayload(
-			&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-	}
-
-	resp := &models.VolumeStoresListResponse{Stores: stores}
-
-	return storage.NewVolumeStoresListOK().WithPayload(resp)
-}
-
-//CreateVolume : Create a Volume
-func (h *StorageHandlersImpl) CreateVolume(params storage.CreateVolumeParams) middleware.Responder {
-	defer trace.End(trace.Begin("storage_handlers.CreateVolume"))
-
-	//TODO: FIXME: add more errorcodes as we identify error scenarios.
-	storeURL, err := util.VolumeStoreNameToURL(params.VolumeRequest.Store)
-	if err != nil {
-		log.Errorf("storagehandler: VolumeStoreName error: %s", err)
-		return storage.NewCreateVolumeInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	byteMap := make(map[string][]byte)
-	for key, value := range params.VolumeRequest.Metadata {
-		byteMap[key] = []byte(value)
-	}
-
-	capacity := uint64(0)
-	if params.VolumeRequest.Capacity < 0 {
-		capacity = uint64(1024) //FIXME: this should look for a default cap and set or fail here.
-	} else {
-		capacity = uint64(params.VolumeRequest.Capacity)
-	}
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("VolumeCreate(%s)", params.VolumeRequest.Name))
-	volume, err := h.volumeCache.VolumeCreate(op, params.VolumeRequest.Name, storeURL, capacity*1024, byteMap)
-	if err != nil {
-
-		if os.IsExist(err) {
-			op.Warnf("Reusing existing volume with target identity")
-			return storage.NewCreateVolumeConflict().WithPayload(&models.Error{
-				Code:    http.StatusConflict,
-				Message: err.Error(),
-			})
-		}
-
-		op.Errorf("storagehandler: VolumeCreate error: %#v", err)
-		if _, ok := err.(spl.VolumeStoreNotFoundError); ok {
-			return storage.NewCreateVolumeNotFound().WithPayload(&models.Error{
-				Code:    http.StatusNotFound,
-				Message: err.Error(),
-			})
-		}
-
-		return storage.NewCreateVolumeInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	response := volumeToCreateResponse(volume, params.VolumeRequest)
-	return storage.NewCreateVolumeCreated().WithPayload(&response)
-}
-
-//GetVolume : Gets a handle to a volume
-func (h *StorageHandlersImpl) GetVolume(params storage.GetVolumeParams) middleware.Responder {
-	defer trace.End(trace.Begin(params.Name))
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("VolumeGet(%s)", params.Name))
-	data, err := h.volumeCache.VolumeGet(op, params.Name)
-	if err == os.ErrNotExist {
-		return storage.NewGetVolumeNotFound().WithPayload(&models.Error{
-			Code:    http.StatusNotFound,
-			Message: err.Error(),
-		})
-	}
-
-	response, err := fillVolumeModel(data)
-	if err != nil {
-		return storage.NewListVolumesInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	op.Debugf("VolumeGet returned : %#v", response)
-	return storage.NewGetVolumeOK().WithPayload(&response)
-}
-
-//RemoveVolume : Remove a Volume from existence
-func (h *StorageHandlersImpl) RemoveVolume(params storage.RemoveVolumeParams) middleware.Responder {
-	defer trace.End(trace.Begin("storage_handlers.RemoveVolume"))
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("VolumeDestroy(%s)", params.Name))
-	err := h.volumeCache.VolumeDestroy(op, params.Name)
-	if err != nil {
-		switch {
-		case os.IsNotExist(err):
-			return storage.NewRemoveVolumeNotFound().WithPayload(&models.Error{
-				Message: err.Error(),
-			})
-
-		case spl.IsErrVolumeInUse(err):
-			return storage.NewRemoveVolumeConflict().WithPayload(&models.Error{
-				Message: err.Error(),
-			})
-
-		default:
-			return storage.NewRemoveVolumeInternalServerError().WithPayload(&models.Error{
-				Message: err.Error(),
-			})
-		}
-	}
-	return storage.NewRemoveVolumeOK()
-}
-
-//VolumesList : Lists available volumes for use
-func (h *StorageHandlersImpl) VolumesList(params storage.ListVolumesParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	var result []*models.VolumeResponse
-
-	op := trace.NewOperation(context.Background(), "VolumeList")
-	portlayerVolumes, err := h.volumeCache.VolumesList(op)
-	if err != nil {
-		op.Error(err)
-		return storage.NewListVolumesInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	op.Debugf("volumes fetched from list call : %#v", portlayerVolumes)
-
-	for i := range portlayerVolumes {
-		model, err := fillVolumeModel(portlayerVolumes[i])
-		if err != nil {
-			op.Error(err)
-			return storage.NewListVolumesInternalServerError().WithPayload(&models.Error{
-				Code:    http.StatusInternalServerError,
-				Message: err.Error(),
-			})
-		}
-
-		result = append(result, &model)
-	}
-
-	op.Debugf("volumes returned from list call : %#v", result)
-	return storage.NewListVolumesOK().WithPayload(result)
-}
-
-//VolumeJoin : modifies the config spec of a container to mount the specified container
-func (h *StorageHandlersImpl) VolumeJoin(params storage.VolumeJoinParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	op := trace.NewOperation(context.Background(), fmt.Sprintf("VolumeJoin(%s)", params.Name))
-
-	actualHandle := epl.GetHandle(params.JoinArgs.Handle)
-
-	//Note: Name should already be populated by now.
-	volume, err := h.volumeCache.VolumeGet(op, params.Name)
-	if err != nil {
-		op.Errorf("Volumes: StorageHandler : %#v", err)
-
-		return storage.NewVolumeJoinInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	switch volume.Device.DiskPath().Scheme {
-	case nfsScheme:
-		actualHandle, err = nfs.VolumeJoin(op, actualHandle, volume, params.JoinArgs.MountPath, params.JoinArgs.Flags)
-	case dsScheme:
-		actualHandle, err = vsphere.VolumeJoin(op, actualHandle, volume, params.JoinArgs.MountPath, params.JoinArgs.Flags)
-	default:
-		err = fmt.Errorf("unknown scheme (%s) for Volume (%#v)", volume.Device.DiskPath().Scheme, *volume)
-	}
-
-	if err != nil {
-		op.Errorf("Volumes: StorageHandler : %#v", err)
-
-		return storage.NewVolumeJoinInternalServerError().WithPayload(&models.Error{
-			Code:    http.StatusInternalServerError,
-			Message: err.Error(),
-		})
-	}
-
-	op.Infof("volume %s has been joined to a container", volume.ID)
-	return storage.NewVolumeJoinOK().WithPayload(actualHandle.String())
-}
-
-// ImportArchive takes an input tar archive and unpacks to destination
-func (h *StorageHandlersImpl) ImportArchive(params storage.ImportArchiveParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-
-	id := params.DeviceID
-	op := trace.NewOperation(context.Background(), "ImportArchive: %s", id)
-
-	filterSpec, err := archive.DecodeFilterSpec(op, params.FilterSpec)
-	if err != nil {
-		return storage.NewImportArchiveUnprocessableEntity()
-	}
-
-	store, ok := spl.GetImporter(params.Store)
-	if !ok {
-		op.Errorf("Failed to locate import capable store %s", params.Store)
-		op.Debugf("Available importers are: %+q", spl.GetImporters())
-
-		return storage.NewImportArchiveNotFound()
-	}
-
-	err = store.Import(op, id, filterSpec, params.Archive)
-	if err != nil {
-		op.Errorf("import failed: %s", err)
-		// error checking for no such file/directory
-		if os.IsNotExist(err) {
-			return storage.NewImportArchiveNotFound()
-		}
-		// error checking for internal server error from toolbox
-		if vsphere.IsToolBoxStateChangeErr(err) {
-			return storage.NewImportArchiveConflict()
-		}
-		return storage.NewExportArchiveInternalServerError()
-	}
-
-	return storage.NewImportArchiveOK()
-}
-
-// ExportArchive creates a tar archive and returns to caller
-func (h *StorageHandlersImpl) ExportArchive(params storage.ExportArchiveParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	id := params.DeviceID
-	ancestor := ""
-	if params.Ancestor != nil {
-		ancestor = *params.Ancestor
-	}
-
-	op := trace.NewOperation(context.Background(), "ExportArchive: %s:%s", id, ancestor)
-
-	filterSpec, err := archive.DecodeFilterSpec(op, params.FilterSpec)
-	if err != nil {
-		return storage.NewExportArchiveUnprocessableEntity()
-	}
-
-	store, ok := spl.GetExporter(params.Store)
-	if !ok {
-		op.Errorf("Failed to locate export capable store %s", params.Store)
-		op.Debugf("Available exporters are: %+q", spl.GetExporters())
-
-		return storage.NewExportArchiveNotFound()
-	}
-
-	r, err := store.Export(op, id, ancestor, filterSpec, params.Data)
-	if err != nil {
-		// hickeng: we're in need of typed errors - should check for id not found for 404 return
-		op.Errorf("export failed: %s", err)
-		if r != nil {
-			r.Close()
-		}
-		return storage.NewExportArchiveInternalServerError()
-	}
-
-	return NewStreamOutputHandler("ExportArchive").WithPayload(NewFlushingReader(r), params.DeviceID, func() { r.Close() })
-}
-
-// StatPath returns file info on the target path of a container copy
-func (h *StorageHandlersImpl) StatPath(params storage.StatPathParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "StatPath: %s", params.DeviceID)
-
-	filterSpec, err := archive.DecodeFilterSpec(op, params.FilterSpec)
-	if err != nil {
-		return storage.NewStatPathUnprocessableEntity()
-	}
-
-	if len(filterSpec.Inclusions) != 1 {
-		return storage.NewStatPathUnprocessableEntity()
-	}
-
-	store, ok := spl.GetExporter(params.Store)
-	if !ok {
-		op.Errorf("Error getting exporter: %s", err.Error())
-		return storage.NewStatPathNotFound()
-	}
-
-	dataSource, err := store.NewDataSource(op, params.DeviceID)
-	if err != nil {
-		op.Errorf("Error getting data source: %s", err.Error())
-		return storage.NewStatPathInternalServerError()
-	}
-	defer dataSource.Close()
-
-	fileStat, err := dataSource.Stat(op, filterSpec)
-	if err != nil {
-		if os.IsNotExist(err) {
-			// would like to be able to differentiate between store and files, but....
-			op.Debugf("Stat target did not exist: %s", err)
-			return storage.NewStatPathNotFound()
-		}
-		op.Errorf("Error getting datasource stats: %s", err)
-		return storage.NewStatPathInternalServerError()
-	}
-
-	modTimeBytes, err := fileStat.ModTime.GobEncode()
-	if err != nil {
-		return storage.NewStatPathUnprocessableEntity()
-	}
-
-	op.Debugf("found data successfully")
-	return storage.
-		NewStatPathOK().
-		WithMode(fileStat.Mode).
-		WithLinkTarget(fileStat.LinkTarget).
-		WithName(fileStat.Name).
-		WithSize(fileStat.Size).
-		WithModTime(string(modTimeBytes))
-
-}
-
-//utility functions
-
-// convert an SPL Image to a swagger-defined Image
-func convertImage(image *spl.Image) *models.Image {
-	var parent, selfLink string
-
-	// scratch image
-	if image.ParentLink != nil {
-		parent = image.ParentLink.String()
-	}
-
-	if image.SelfLink != nil {
-		selfLink = image.SelfLink.String()
-	}
-
-	meta := make(map[string]string)
-	if image.Metadata != nil {
-		for k, v := range image.Metadata {
-			meta[k] = string(v)
-		}
-	}
-
-	return &models.Image{
-		ID:       image.ID,
-		SelfLink: selfLink,
-		Parent:   parent,
-		Metadata: meta,
-		Store:    image.Store.String(),
-	}
-}
-
-func volumeToCreateResponse(volume *spl.Volume, model *models.VolumeRequest) models.VolumeResponse {
-	response := models.VolumeResponse{
-		Driver:   model.Driver,
-		Name:     volume.ID,
-		Label:    volume.Label,
-		Store:    model.Store,
-		Metadata: model.Metadata,
-	}
-	return response
-}
-
-func fillVolumeModel(volume *spl.Volume) (models.VolumeResponse, error) {
-	storeName, err := util.VolumeStoreName(volume.Store)
-	if err != nil {
-		return models.VolumeResponse{}, err
-	}
-
-	metadata := createMetadataMap(volume)
-
-	model := models.VolumeResponse{
-		Name:     volume.ID,
-		Driver:   "vsphere",
-		Store:    storeName,
-		Metadata: metadata,
-		Label:    volume.Label,
-	}
-
-	return model, nil
-}
-
-func createMetadataMap(volume *spl.Volume) map[string]string {
-	stringMap := make(map[string]string)
-	for k, v := range volume.Info {
-		stringMap[k] = string(v)
-	}
-	return stringMap
-}
-
-func createNFSVolumeStore(op trace.Operation, dsurl *url.URL, name string) (spl.VolumeStorer, error) {
-	var err error
-	uid, gid, err := parseUIDAndGID(dsurl)
-	if err != nil {
-		op.Errorf("%s", err.Error())
-		return nil, err
-	}
-
-	// XXX replace with the vch name
-	mnt := nfs.NewMount(dsurl, "vic", uint32(uid), uint32(gid))
-	vs, err := nfs.NewVolumeStore(op, name, mnt)
-	if err != nil {
-		op.Errorf("%s", err.Error())
-		return nil, err
-	}
-
-	return vs, nil
-}
-
-func parseUIDAndGID(queryURL *url.URL) (int, int, error) {
-	var err error
-	uid := nfs.DefaultUID
-	gid := nfs.DefaultUID
-
-	vsUID := queryURL.Query().Get(uidQueryKey)
-	vsGID := queryURL.Query().Get(gidQueryKey)
-
-	if vsGID == "" {
-		vsGID = vsUID
-	}
-
-	if vsUID != "" {
-		uid, err = strconv.Atoi(vsUID)
-		if err != nil {
-			return -1, -1, err
-		}
-	}
-
-	if vsGID != "" {
-		gid, err = strconv.Atoi(vsGID)
-		if err != nil {
-			return -1, -1, err
-		}
-	}
-
-	if uid < 0 {
-		return -1, -1, fmt.Errorf("supplied url (%s) for nfs volume store has invalid uid : (%d)", queryURL.String(), uid)
-	}
-
-	if gid < 0 {
-		return -1, -1, fmt.Errorf("supplied url (%s) for nfs volume store has invalid gid : (%d)", queryURL.String(), gid)
-	}
-
-	return uid, gid, nil
-}
-
-func createVsphereVolumeStore(op trace.Operation, dsurl *url.URL, name string, handlerCtx *HandlerContext) (spl.VolumeStorer, error) {
-	ds, err := datastore.NewHelperFromURL(op, handlerCtx.Session, dsurl)
-	if err != nil {
-		err = fmt.Errorf("cannot find datastores: %s", err)
-		op.Errorf("%s", err.Error())
-		return nil, err
-	}
-
-	vs, err := vsphere.NewVolumeStore(op, name, handlerCtx.Session, ds)
-	if err != nil {
-		err = fmt.Errorf("cannot instantiate the volume store: %s", err)
-		op.Errorf("%s", err.Error())
-		return nil, err
-	}
-	return vs, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers_test.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers_test.go
deleted file mode 100644
index c17075cda7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/storage_handlers_test.go
+++ /dev/null
@@ -1,659 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/storage"
-	"github.com/vmware/vic/lib/archive"
-	spl "github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-var (
-	testImageID     = "testImage"
-	testImageSum    = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-	testHostName, _ = os.Hostname()
-	testStoreName   = "testStore"
-	testStoreURL    = url.URL{
-		Scheme: "http",
-		Host:   testHostName,
-		Path:   "/" + util.ImageURLPath + "/" + testStoreName,
-	}
-)
-
-type MockDataStore struct {
-}
-
-type MockVolumeStore struct {
-	// id -> volume
-	db map[string]*spl.Volume
-}
-
-func NewMockVolumeStore() *MockVolumeStore {
-	m := &MockVolumeStore{
-		db: make(map[string]*spl.Volume),
-	}
-
-	return m
-}
-
-// Creates a volume on the given volume store, of the given size, with the given metadata.
-func (m *MockVolumeStore) VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*spl.Volume, error) {
-	storeName, err := util.VolumeStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	selfLink, err := util.VolumeURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	vol := &spl.Volume{
-		ID:       ID,
-		Store:    store,
-		SelfLink: selfLink,
-	}
-
-	m.db[ID] = vol
-
-	return vol, nil
-}
-
-// Get an existing volume via it's ID and volume store.
-func (m *MockVolumeStore) VolumeGet(op trace.Operation, ID string) (*spl.Volume, error) {
-	vol, ok := m.db[ID]
-	if !ok {
-		return nil, os.ErrNotExist
-	}
-
-	return vol, nil
-}
-
-// Destroys a volume
-func (m *MockVolumeStore) VolumeDestroy(op trace.Operation, vol *spl.Volume) error {
-	if _, ok := m.db[vol.ID]; !ok {
-		return os.ErrNotExist
-	}
-
-	delete(m.db, vol.ID)
-
-	return nil
-}
-
-func (m *MockVolumeStore) VolumeStoresList(op trace.Operation) (map[string]url.URL, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-// Lists all volumes on the given volume store`
-func (m *MockVolumeStore) VolumesList(op trace.Operation) ([]*spl.Volume, error) {
-	var i int
-	list := make([]*spl.Volume, len(m.db))
-	for _, v := range m.db {
-		t := *v
-		list[i] = &t
-		i++
-	}
-
-	return list, nil
-}
-
-func (m *MockVolumeStore) Export(op trace.Operation, child, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	return nil
-}
-
-func (m *MockVolumeStore) NewDataSink(op trace.Operation, id string) (spl.DataSink, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) NewDataSource(op trace.Operation, id string) (spl.DataSource, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, nil
-}
-
-// GetImageStore checks to see if a named image store exists and returls the
-// URL to it if so or error.
-func (c *MockDataStore) GetImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-	return nil, fmt.Errorf("store (%s) doesn't exist", u.String())
-}
-
-func (c *MockDataStore) CreateImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	return u, nil
-}
-
-func (c *MockDataStore) DeleteImageStore(op trace.Operation, storeName string) error {
-	return nil
-}
-
-func (c *MockDataStore) ListImageStores(op trace.Operation) ([]*url.URL, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) Export(op trace.Operation, child, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	return nil
-}
-
-func (c *MockDataStore) NewDataSink(op trace.Operation, id string) (spl.DataSink, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) NewDataSource(op trace.Operation, id string) (spl.DataSource, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) WriteImage(op trace.Operation, parent *spl.Image, ID string, meta map[string][]byte, sum string, r io.Reader) (*spl.Image, error) {
-	storeName, err := util.ImageStoreName(parent.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	selflink, err := util.ImageURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	i := spl.Image{
-		ID:         ID,
-		Store:      parent.Store,
-		ParentLink: parent.SelfLink,
-		SelfLink:   selflink,
-		Metadata:   meta,
-	}
-
-	return &i, nil
-}
-func (c *MockDataStore) WriteMetadata(op trace.Operation, storeName string, ID string, meta map[string][]byte) error {
-	return nil
-}
-
-// GetImage gets the specified image from the given store by retreiving it from the cache.
-func (c *MockDataStore) GetImage(op trace.Operation, store *url.URL, ID string) (*spl.Image, error) {
-	if ID == spl.Scratch.ID {
-		return &spl.Image{Store: store}, nil
-	}
-
-	return nil, fmt.Errorf("store (%s) doesn't have image %s", store.String(), ID)
-}
-
-// ListImages resturns a list of Images for a list of IDs, or all if no IDs are passed
-func (c *MockDataStore) ListImages(op trace.Operation, store *url.URL, IDs []string) ([]*spl.Image, error) {
-	return nil, fmt.Errorf("store (%s) doesn't exist", store.String())
-}
-
-func (c *MockDataStore) DeleteImage(op trace.Operation, image *spl.Image) (*spl.Image, error) {
-	return nil, nil
-}
-
-func TestCreateImageStore(t *testing.T) {
-	s := &StorageHandlersImpl{
-		imageCache: spl.NewLookupCache(&MockDataStore{}),
-	}
-
-	store := &models.ImageStore{
-		Name: "testStore",
-	}
-
-	params := storage.CreateImageStoreParams{
-		Body: store,
-	}
-
-	result := s.CreateImageStore(params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-
-	// try to recreate the same image store
-	result = s.CreateImageStore(params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-
-	// expect 409 since it already exists
-	conflict := &storage.CreateImageStoreConflict{
-		Payload: &models.Error{
-			Code:    http.StatusConflict,
-			Message: "An image store with that name already exists",
-		},
-	}
-	if !assert.Equal(t, conflict, result) {
-		return
-	}
-}
-
-func TestGetImage(t *testing.T) {
-
-	s := &StorageHandlersImpl{
-		imageCache: spl.NewLookupCache(&MockDataStore{}),
-	}
-
-	params := &storage.GetImageParams{
-		ID:        testImageID,
-		StoreName: testStoreName,
-	}
-
-	// expect 404 since no image store exists by that name
-	storeNotFound := &storage.GetImageNotFound{
-		Payload: &models.Error{
-			Code:    http.StatusNotFound,
-			Message: fmt.Sprintf("store (%s) doesn't exist", testStoreURL.String()),
-		},
-	}
-
-	result := s.GetImage(*params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-	if !assert.Equal(t, storeNotFound, result) {
-		return
-	}
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	// create the image store
-	url, err := s.imageCache.CreateImageStore(op, testStoreName)
-	// TODO(jzt): these are testing NameLookupCache, do we need them here?
-	if !assert.Nil(t, err, "Error while creating image store") {
-		return
-	}
-	if !assert.Equal(t, testStoreURL.String(), url.String()) {
-		return
-	}
-
-	// expect 404 since no image exists by that name in that store
-	imageNotFound := &storage.GetImageNotFound{
-		Payload: &models.Error{
-			Code:    http.StatusNotFound,
-			Message: fmt.Sprintf("store (%s) doesn't have image %s", testStoreURL.String(), testImageID),
-		},
-	}
-	// try GetImage again
-	result = s.GetImage(*params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-	if !assert.Equal(t, imageNotFound, result) {
-		return
-	}
-
-	// add image to store
-	parent := spl.Image{
-		ID:         "scratch",
-		SelfLink:   nil,
-		ParentLink: nil,
-		Store:      &testStoreURL,
-	}
-
-	expectedMeta := make(map[string][]byte)
-	expectedMeta["foo"] = []byte("bar")
-	// add the image to the store
-	image, err := s.imageCache.WriteImage(op, &parent, testImageID, expectedMeta, testImageSum, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, image) {
-		return
-	}
-
-	selflink, err := util.ImageURL(testStoreName, testImageID)
-	if !assert.NoError(t, err) {
-		return
-	}
-	sl := selflink.String()
-
-	parentlink, err := util.ImageURL(testStoreName, parent.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-	p := parentlink.String()
-
-	eMeta := make(map[string]string)
-	eMeta["foo"] = "bar"
-	// expect our image back now that we've created it
-	expected := &storage.GetImageOK{
-		Payload: &models.Image{
-			ID:       image.ID,
-			SelfLink: sl,
-			Parent:   p,
-			Store:    testStoreURL.String(),
-			Metadata: eMeta,
-		},
-	}
-
-	result = s.GetImage(*params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-	if !assert.Equal(t, expected, result) {
-		return
-	}
-}
-
-func TestListImages(t *testing.T) {
-
-	s := &StorageHandlersImpl{
-		imageCache: spl.NewLookupCache(&MockDataStore{}),
-	}
-
-	params := &storage.ListImagesParams{
-		StoreName: testStoreName,
-	}
-
-	// expect 404 if image store doesn't exist
-	notFound := &storage.ListImagesNotFound{
-		Payload: &models.Error{
-			Code:    http.StatusNotFound,
-			Message: fmt.Sprintf("store (%s) doesn't exist", testStoreURL.String()),
-		},
-	}
-
-	outImages := s.ListImages(*params)
-	if !assert.NotNil(t, outImages) {
-		return
-	}
-	if !assert.Equal(t, notFound, outImages) {
-		return
-	}
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	// create the image store
-	url, err := s.imageCache.CreateImageStore(op, testStoreName)
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.NotNil(t, url) {
-		return
-	}
-
-	// create a set of images
-	images := make(map[string]*spl.Image)
-	parent := spl.Scratch
-	parent.Store = &testStoreURL
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("id-%d", i)
-		img, err := s.imageCache.WriteImage(op, &parent, id, nil, testImageSum, nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		if !assert.NotNil(t, img) {
-			return
-		}
-		images[id] = img
-	}
-
-	// List all images
-	outImages = s.ListImages(*params)
-	assert.IsType(t, &storage.ListImagesOK{}, outImages)
-	assert.Equal(t, len(outImages.(*storage.ListImagesOK).Payload), len(images))
-
-	for _, img := range outImages.(*storage.ListImagesOK).Payload {
-		_, ok := images[img.ID]
-		if !assert.True(t, ok) {
-			return
-		}
-	}
-
-	// List specific images
-	var ids []string
-
-	// query for odd-numbered image ids
-	for i := 1; i < 50; i += 2 {
-		ids = append(ids, fmt.Sprintf("id-%d", i))
-	}
-	params.Ids = ids
-	outImages = s.ListImages(*params)
-	assert.IsType(t, &storage.ListImagesOK{}, outImages)
-	assert.Equal(t, len(ids), len(outImages.(*storage.ListImagesOK).Payload))
-
-	outmap := make(map[string]*models.Image)
-	for _, image := range outImages.(*storage.ListImagesOK).Payload {
-		outmap[image.ID] = image
-	}
-
-	// ensure no even-numbered image ids in our result
-	for i := 2; i < 50; i += 2 {
-		id := fmt.Sprintf("id-%d", i)
-		_, ok := outmap[id]
-		if !assert.False(t, ok) {
-			return
-		}
-	}
-}
-
-func TestWriteImage(t *testing.T) {
-	ic := spl.NewLookupCache(&MockDataStore{})
-
-	// create image store
-	op := trace.NewOperation(context.Background(), "test")
-	_, err := ic.CreateImageStore(op, testStoreName)
-	if err != nil {
-		return
-	}
-
-	s := &StorageHandlersImpl{
-		imageCache: ic,
-	}
-
-	eMeta := make(map[string]string)
-	eMeta["foo"] = "bar"
-
-	name := new(string)
-	val := new(string)
-	*name = "foo"
-	*val = eMeta["foo"]
-
-	params := &storage.WriteImageParams{
-		StoreName:   testStoreName,
-		ImageID:     testImageID,
-		ParentID:    "scratch",
-		Sum:         testImageSum,
-		Metadatakey: name,
-		Metadataval: val,
-		ImageFile:   nil,
-	}
-
-	parentlink, err := util.ImageURL(testStoreName, params.ParentID)
-	if !assert.NoError(t, err) {
-		return
-	}
-	p := parentlink.String()
-
-	selflink, err := util.ImageURL(testStoreName, testImageID)
-	if !assert.NoError(t, err) {
-		return
-	}
-	sl := selflink.String()
-
-	expected := &storage.WriteImageCreated{
-		Payload: &models.Image{
-			ID:       testImageID,
-			Parent:   p,
-			SelfLink: sl,
-			Store:    testStoreURL.String(),
-			Metadata: eMeta,
-		},
-	}
-
-	result := s.WriteImage(*params)
-	if !assert.NotNil(t, result) {
-		return
-	}
-	if !assert.Equal(t, expected, result) {
-		return
-	}
-}
-
-func TestVolumeCreate(t *testing.T) {
-
-	op := trace.NewOperation(context.Background(), "test")
-	volCache := spl.NewVolumeLookupCache(op)
-
-	testStore := NewMockVolumeStore()
-	_, err := volCache.AddStore(op, "testStore", testStore)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	handler := StorageHandlersImpl{
-		volumeCache: volCache,
-	}
-
-	model := models.VolumeRequest{}
-	model.Store = "testStore"
-	model.Name = "testVolume"
-	model.Capacity = 1
-	model.Driver = "vsphere"
-	model.DriverArgs = make(map[string]string)
-	model.DriverArgs["stuff"] = "things"
-	model.Metadata = make(map[string]string)
-	params := storage.NewCreateVolumeParams()
-	params.VolumeRequest = &model
-
-	handler.CreateVolume(params)
-	testVolume, err := testStore.VolumeGet(op, model.Name)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.NotNil(t, testVolume) {
-		return
-	}
-	testVolumeStoreName, err := util.VolumeStoreName(testVolume.Store)
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.Equal(t, "testStore", testVolumeStoreName) {
-		return
-	}
-	if !assert.Equal(t, "testVolume", testVolume.ID) {
-		return
-	}
-}
-
-func TestParseUIDAndGID(t *testing.T) {
-	positiveCases := []url.URL{
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=1234&gid=5678",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=00000000000000&gid=00000000000000000000000000",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=321321321&gid=123123123",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=0&gid=0",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=&gid=",
-			Path:     "/test/path",
-		},
-	}
-
-	negativeCases := []url.URL{
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=Hello&gid=World",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=ASKJHG#!@#LJK$&gid=!@#$$%#@@!",
-			Path:     "/test/path",
-		},
-		{
-			Scheme:   "nfs",
-			Host:     "testURL",
-			RawQuery: "uid=9999999999999999999999999999999999999999999999999&gid=7777777777777777777777777777777777777777777777777777777",
-			Path:     "/test/path",
-		},
-	}
-
-	for _, v := range positiveCases {
-
-		testUID, testGID, err := parseUIDAndGID(&v)
-		assert.Nil(t, err, v.String())
-		assert.NotEqual(t, -1, testUID, v.String())
-		assert.NotEqual(t, -1, testGID, v.String())
-	}
-
-	for _, v := range negativeCases {
-		testUID, testGID, err := parseUIDAndGID(&v)
-		assert.NotNil(t, err, v.String())
-		assert.Equal(t, -1, testUID, v.String())
-		assert.Equal(t, -1, testGID, v.String())
-
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/stream_handler.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/stream_handler.go
deleted file mode 100644
index 8a93e6dadc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/stream_handler.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// StreamOutputHandler is a custom return handler that provides common
-// stream handling across the API.
-type StreamOutputHandler struct {
-	outputStream *FlushingReader
-	id           string
-	outputName   string
-	onHTTPClose  func() // clean up func called when transport closed
-}
-
-// NewStreamOutputHandler creates StreamOutputHandler with default headers values
-func NewStreamOutputHandler(name string) *StreamOutputHandler {
-	return &StreamOutputHandler{outputName: name}
-}
-
-// WithPayload adds the payload to the container set stdin internal server error response
-func (s *StreamOutputHandler) WithPayload(payload *FlushingReader, id string, cleanup func()) *StreamOutputHandler {
-	s.outputStream = payload
-	s.id = id
-	s.onHTTPClose = cleanup
-	return s
-}
-
-// WriteResponse to the client
-func (s *StreamOutputHandler) WriteResponse(rw http.ResponseWriter, producer runtime.Producer) {
-	defer trace.End(trace.Begin(fmt.Sprintf("Stream of %s:%s", s.outputName, s.id)))
-
-	rw.WriteHeader(http.StatusOK)
-	if f, ok := rw.(http.Flusher); ok {
-		f.Flush()
-		s.outputStream.AddFlusher(f)
-	}
-
-	// prevent us from being dependent on client closing the connection once we've copied
-	// all available data.
-	done := make(chan bool)
-	defer close(done)
-
-	if s.onHTTPClose != nil {
-		notify := rw.(http.CloseNotifier).CloseNotify()
-		go func() {
-			// continue on either
-			select {
-			case <-notify:
-			case <-done:
-			}
-
-			// execute cleanup function
-			s.onHTTPClose()
-
-			log.Debugf("Completed stream cleanup for %s:%s", s.outputName, s.id)
-		}()
-	}
-
-	_, err := io.Copy(rw, s.outputStream)
-	if err != nil {
-		log.Errorf("Error streaming %s for %s: %s", s.outputName, s.id, err)
-	} else {
-		log.Debugf("Finished streaming %s for %s", s.outputName, s.id)
-	}
-}
-
-// closePipe is a convenience function for closing the event stream pipe
-func closePipe(pipeReader *io.PipeReader, pipeWriter *io.PipeWriter) {
-	if pipeReader != nil {
-		pipeReader.Close()
-	}
-	if pipeWriter != nil {
-		pipeWriter.Close()
-	}
-}
-
-// GenericFlusher is a custom reader to allow us to detach cleanly during an io.Copy
-type GenericFlusher interface {
-	Flush()
-}
-
-type FlushingReader struct {
-	io.Reader
-	io.WriterTo
-
-	flusher   GenericFlusher
-	initBytes []byte
-}
-
-func NewFlushingReader(rdr io.Reader) *FlushingReader {
-	return &FlushingReader{Reader: rdr, flusher: nil, initBytes: nil}
-}
-
-func NewFlushingReaderWithInitBytes(rdr io.Reader, initBytes []byte) *FlushingReader {
-	return &FlushingReader{Reader: rdr, flusher: nil, initBytes: initBytes}
-}
-
-func (d *FlushingReader) AddFlusher(flusher GenericFlusher) {
-	d.flusher = flusher
-}
-
-// readDetectInit() is used by WriteTo() which is used by io.Copy.  It attempts
-// to detect a init byte buffer.  If it finds that init byte sequence, it is
-// ignored.  This reader does not care about the init sequeunce.  The init sequence
-// maybe used by the higher level interaction, which in this case is the Swagger
-// establishing initial connection for stdin.
-//
-// Panics if the buf is smaller than the initBytes
-func (d *FlushingReader) readDetectInit(buf []byte) (int, error) {
-	initLen := len(d.initBytes)
-
-	// fast path - len(nil) return 0
-	if initLen == 0 {
-		return d.Read(buf)
-	}
-
-	// make sure we have enough room
-	if len(buf) < initLen {
-		panic("Read buffer is smaller than the initialization byte sequence")
-	}
-
-	total := 0
-	upto := 0
-	for total < initLen {
-		nr, err := d.Read(buf[total:])
-		if nr > 0 {
-			total += nr
-			// we are only interested with the first initLen bytes
-			upto = total
-			if upto > initLen {
-				upto = initLen
-			}
-			if bytes.Compare(d.initBytes[0:upto], buf[0:upto]) != 0 {
-				// First bytes aren't part of init bytes so client must not be
-				// the docker personality so break and ignore looking for the
-				// init bytes.
-				log.Debugf("Did not find primer bytes, stopping watch")
-				return total, err
-			}
-		}
-		if err != nil && total < initLen {
-			log.Debugf("Primer bytes read %d bytes, err %s, stopping watch", nr, err)
-			return 0, err
-		}
-	}
-
-	// would have returned in the compare clause if not matching init bytes
-	copy(buf[0:], buf[initLen:])
-	log.Debugf("Found primer bytes, port layer client might be personality server")
-
-	// no risk of returning <0
-	return total - initLen, nil
-}
-
-// WriteTo is derived from go's io.Copy.  We use a smaller buffer so as to not hold up
-// writing out data.  Go's version allocates 32k, and the Read will wait till
-// buffer is filled (unless EOF is encountered).  Also, we force a flush if
-// a flusher is added.  We've seen cases where the last bit of data for a
-// screen doesn't reach the docker engine api server.  The flush solves that
-// issue.
-func (d *FlushingReader) WriteTo(w io.Writer) (written int64, err error) {
-	buf := make([]byte, ioCopyBufferSize)
-
-	nr, er := d.readDetectInit(buf)
-	for {
-		if nr > 0 {
-			nw, ew := w.Write(buf[0:nr])
-			if d.flusher != nil {
-				d.flusher.Flush()
-			}
-			if nw > 0 {
-				written += int64(nw)
-			}
-			if ew != nil {
-				err = ew
-				break
-			}
-			if nr != nw {
-				err = io.ErrShortWrite
-				break
-			}
-		}
-		// it's safe to ignore ErrClosedPipe -- encountered when
-		// you close the pipe that is feeding the flushingReader
-		if er == io.EOF || er == io.ErrClosedPipe {
-			break
-		}
-		if er != nil {
-			err = er
-			break
-		}
-		nr, er = d.Read(buf)
-	}
-	return written, err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/task_handlers.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/task_handlers.go
deleted file mode 100644
index a2cff5e4e9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/handlers/task_handlers.go
+++ /dev/null
@@ -1,266 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package handlers
-
-import (
-	"context"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime/middleware"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations"
-	"github.com/vmware/vic/lib/apiservers/portlayer/restapi/operations/tasks"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/task"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-// TaskHandlersImpl is the receiver for all of the task handler methods
-type TaskHandlersImpl struct {
-}
-
-func (handler *TaskHandlersImpl) Configure(api *operations.PortLayerAPI, _ *HandlerContext) {
-	api.TasksJoinHandler = tasks.JoinHandlerFunc(handler.JoinHandler)
-	api.TasksBindHandler = tasks.BindHandlerFunc(handler.BindHandler)
-	api.TasksUnbindHandler = tasks.UnbindHandlerFunc(handler.UnbindHandler)
-	api.TasksRemoveHandler = tasks.RemoveHandlerFunc(handler.RemoveHandler)
-	api.TasksInspectHandler = tasks.InspectHandlerFunc(handler.InspectHandler)
-	api.TasksWaitHandler = tasks.WaitHandlerFunc(handler.WaitHandler)
-}
-
-// JoinHandler calls the Join
-func (handler *TaskHandlersImpl) JoinHandler(params tasks.JoinParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Join(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewJoinInternalServerError().WithPayload(err)
-	}
-
-	// TODO: ensure uniqueness of ID - this is already an issue with containercreate now we're not using it as
-	// the VM name and cannot rely on vSphere for uniqueness guarantee
-	id := params.Config.ID
-	if id == "" {
-		id = uid.New().String()
-	}
-
-	op.Debugf("ID: %#v", id)
-	op.Debugf("Path: %#v", params.Config.Path)
-	op.Debugf("WorkingDir: %#v", params.Config.WorkingDir)
-	op.Debugf("OpenStdin: %#v", params.Config.OpenStdin)
-	op.Debugf("Attach: %#v", params.Config.Attach)
-
-	op.Debugf("User: %s", params.Config.User)
-
-	sessionConfig := &executor.SessionConfig{
-		Common: executor.Common{
-			ID: id,
-		},
-		Tty:       params.Config.Tty,
-		Attach:    params.Config.Attach,
-		OpenStdin: params.Config.OpenStdin,
-		Cmd: executor.Cmd{
-			Env:  params.Config.Env,
-			Dir:  params.Config.WorkingDir,
-			Path: params.Config.Path,
-			Args: append([]string{params.Config.Path}, params.Config.Args...),
-		},
-		StopSignal: params.Config.StopSignal,
-	}
-
-	// parsing user
-	if params.Config.User != "" {
-		parts := strings.Split(params.Config.User, ":")
-		if len(parts) > 0 {
-			sessionConfig.User = parts[0]
-		}
-		if len(parts) > 1 {
-			sessionConfig.Group = parts[1]
-		}
-	}
-
-	handleprime, err := task.Join(&op, handle, sessionConfig)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewJoinInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-	res := &models.TaskJoinResponse{
-		ID:     id,
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return tasks.NewJoinOK().WithPayload(res)
-}
-
-// BindHandler calls the Bind
-func (handler *TaskHandlersImpl) BindHandler(params tasks.BindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Bind(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewBindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := task.Bind(&op, handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewBindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.TaskBindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-
-	return tasks.NewBindOK().WithPayload(res)
-}
-
-// UnbindHandler calls the Unbind
-func (handler *TaskHandlersImpl) UnbindHandler(params tasks.UnbindParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Unbind(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewUnbindInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := task.Unbind(&op, handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewUnbindInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.TaskUnbindResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return tasks.NewUnbindOK().WithPayload(res)
-}
-
-// RemoveHandler calls remove
-func (handler *TaskHandlersImpl) RemoveHandler(params tasks.RemoveParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Remove(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewRemoveInternalServerError().WithPayload(err)
-	}
-
-	handleprime, err := task.Remove(&op, handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewRemoveInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	res := &models.TaskRemoveResponse{
-		Handle: exec.ReferenceFromHandle(handleprime),
-	}
-	return tasks.NewRemoveOK().WithPayload(res)
-}
-
-// InspectHandler calls inspect
-func (handler *TaskHandlersImpl) InspectHandler(params tasks.InspectParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Inspect(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewInspectInternalServerError().WithPayload(err)
-	}
-
-	t, err := task.Inspect(&op, handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewInspectInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	op.Debugf("ID: %#v", t.ID)
-	op.Debugf("Path: %#v", t.Cmd.Path)
-	op.Debugf("Args: %#v", t.Cmd.Args)
-	op.Debugf("Running: %#v", t.StartTime)
-	op.Debugf("ExitCode: %#v", t.ExitStatus)
-
-	res := &models.TaskInspectResponse{
-		ID:       t.ID,
-		Running:  t.Started == "true",
-		ExitCode: int64(t.ExitStatus),
-		ProcessConfig: &models.ProcessConfig{
-			ExecPath: t.Cmd.Path,
-			ExecArgs: t.Cmd.Args,
-		},
-		Tty:        t.Tty,
-		User:       t.User,
-		OpenStdin:  t.OpenStdin,
-		OpenStdout: t.Attach,
-		OpenStderr: t.Attach,
-		Pid:        0,
-	}
-
-	// report launch error if we failed
-	if t.Started != "" && t.Started != "true" {
-		res.ProcessConfig.ErrorMsg = t.Started
-	}
-
-	return tasks.NewInspectOK().WithPayload(res)
-}
-
-// WaitHandler calls wait
-func (handler *TaskHandlersImpl) WaitHandler(params tasks.WaitParams) middleware.Responder {
-	defer trace.End(trace.Begin(""))
-	op := trace.NewOperation(context.Background(), "task.Wait(%s, %s)", params.Config.Handle, params.Config.ID)
-
-	handle := exec.HandleFromInterface(params.Config.Handle)
-	if handle == nil {
-		err := &models.Error{Message: "Failed to get the Handle"}
-		return tasks.NewInspectInternalServerError().WithPayload(err)
-	}
-
-	// wait task to set started field to something
-	err := task.Wait(&op, handle, params.Config.ID)
-	if err != nil {
-		log.Errorf("%s", err.Error())
-
-		return tasks.NewWaitInternalServerError().WithPayload(
-			&models.Error{Message: err.Error()},
-		)
-	}
-
-	return tasks.NewWaitOK()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/options/options.go b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/options/options.go
deleted file mode 100644
index b819df179f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/restapi/options/options.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package options
-
-import "time"
-
-type PortLayerOptionsType struct {
-	SDK       string        `long:"sdk" description:"SDK URL or proxy" env:"VC_URL" required:"true"`
-	Cert      string        `long:"cert" description:"Client certificate" env:"VC_CERTIFICATE"`
-	Key       string        `long:"key" description:"Private key file" env:"VC_PRIVATE_KEY"`
-	Insecure  bool          `long:"insecure" default:"false" description:"Skip verification of server certificate" env:"VC_INSECURE"`
-	Keepalive time.Duration `long:"keepalive" default:"20s" description:"Session timeout" env:"VC_KEEPALIVE"`
-
-	DatacenterPath string `long:"datacenter" default:"/ha-datacenter" description:"Datacenter path" env:"DC_PATH" required:"true"`
-	ClusterPath    string `long:"cluster" default:"" description:"Cluster path" env:"CS_PATH" required:"true"`
-	PoolPath       string `long:"pool" default:"" description:"Resource pool path" env:"POOL_PATH" required:"true"`
-	DatastorePath  string `long:"datastore" default:"/ha-datacenter/datastore/*" description:"Datastore path" env:"DS_PATH" required:"true"`
-}
-
-var (
-	PortLayerOptions = new(PortLayerOptionsType)
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/swagger.json b/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/swagger.json
deleted file mode 100644
index 1eb68ef6d2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/apiservers/portlayer/swagger.json
+++ /dev/null
@@ -1,3892 +0,0 @@
-{
-	"swagger": "2.0",
-	"basePath": "/",
-	"info": {
-		"description": "Port Layer API",
-		"title": "Port Layer API",
-		"version": "v0.0.1"
-	},
-	"produces": [
-		"application/json"
-	],
-	"consumes": [
-		"application/json"
-	],
-	"schemes": [
-		"http"
-	],
-	"paths": {
-		"/_ping": {
-			"get": {
-				"description": "Pings the server to see if it's running",
-				"summary": "ping the portlayer server",
-				"tags": [
-					"misc"
-				],
-				"operationId": "Ping",
-				"produces": [
-					"text/plain"
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					}
-				}
-			}
-		},
-		"/vch/info": {
-			"get": {
-				"description": "Gets vital information about the vch",
-				"tags": [
-					"misc"
-				],
-				"operationId": "GetVCHInfo",
-				"consumes": [
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"responses": {
-					"200": {
-						"description": "retrieval success",
-						"schema": {
-							"$ref": "#/definitions/VCHInfo"
-						}
-					}
-				}
-			}
-		},
-		"/kv/{key}": {
-			"get": {
-				"description": "Gets value from k/v store",
-				"tags": [
-					"kv"
-				],
-				"operationId": "GetValue",
-				"consumes": [
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "key",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/KeyValue"
-						}
-					},
-					"404": {
-						"description": "Not found"
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "deletes entry in k/v store",
-				"tags": [
-					"kv"
-				],
-				"operationId": "DeleteValue",
-				"consumes": [
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "key",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Not found"
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"put": {
-				"description": "Adds / updates value in k/v store",
-				"tags": [
-					"kv"
-				],
-				"operationId": "PutValue",
-				"consumes": [
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "key",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "key_value",
-						"required": true,
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/KeyValue"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/archive": {
-			"get": {
-				"description": "Exports a tar archive from the target device.",
-				"summary": "Export tar archive from supplied target",
-				"tags": [
-					"storage"
-				],
-				"produces": [
-					"application/x-tar"
-				],
-				"operationId": "ExportArchive",
-				"parameters": [
-					{
-						"name": "store",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "ancestorStore",
-						"in": "query",
-						"required": false,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "deviceID",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "ancestor",
-						"in": "query",
-						"required": false,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "data",
-						"in": "query",
-						"required": true,
-						"type": "boolean",
-						"x-nullable": false
-					},
-					{
-						"name": "filterSpec",
-						"in": "query",
-						"required": false,
-						"type": "string",
-						"x-nullable": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Supplied target not found"
-					},
-					"422": {
-						"description": "Format error in supplied filter or archive"
-					},
-					"423": {
-						"description": "Device or resource is locked"
-					},
-					"500": {
-						"description": "failed to export tar archive from target"
-					},
-					"default": {
-						"description": "error"
-					}
-				}
-			},
-			"post": {
-				"description": "Imports a tar stream to a device at the target path",
-				"summary": "Import tar stream to supplied target",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/x-tar"
-				],
-				"operationId": "ImportArchive",
-				"parameters": [
-					{
-						"name": "store",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "deviceID",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "filterSpec",
-						"in": "query",
-						"required": false,
-						"type": "string",
-						"x-nullable": true
-					},
-					{
-						"name": "Archive",
-						"required": true,
-						"in": "body",
-						"schema": {
-							"type": "string",
-							"format": "binary"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"422": {
-						"description": "Format error in supplied filter or archive"
-					},
-					"404": {
-						"description": "Supplied target not found"
-					},
-					"409": {
-						"description": "Unexpected resource conflict"
-					},
-					"423": {
-						"description": "Device or resource is locked"
-					},
-					"500": {
-						"description": "failed to export tar archive from target"
-					},
-					"default": {
-						"description": "error"
-					}
-				}
-			},
-			"head": {
-				"description": "Fetches filesystem stats on the device id at the specified path",
-				"operationId": "StatPath",
-				"tags": [
-					"storage"
-				],
-				"parameters": [
-					{
-						"name": "store",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "deviceID",
-						"in": "query",
-						"required": true,
-						"type": "string",
-						"x-nullable": false
-					},
-					{
-						"name": "filterSpec",
-						"in": "query",
-						"required": false,
-						"type": "string",
-						"x-nullable": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"headers": {
-							"name": {
-								"type": "string",
-								"x-nullable": false
-							},
-							"mode": {
-								"type": "integer",
-								"format": "uint32"
-							},
-							"size": {
-								"type": "integer",
-								"format": "int64"
-							},
-							"linkTarget": {
-								"type": "string",
-								"x-nullable": false
-							},
-							"modTime": {
-								"type": "string",
-								"x-nullable": false
-							}
-						}
-					},
-					"422": {
-						"description": "Format error in supplied filter or archive"
-					},
-					"404": {
-						"description": "Supplied target not found"
-					},
-					"500": {
-						"description": "failed to export tar archive from target"
-					},
-					"default": {
-						"description": "error"
-					}
-				}
-			}
-		},
-		"/storage": {
-			"post": {
-				"description": "Creates a location to store images",
-				"summary": "creates an image store",
-				"tags": [
-					"storage"
-				],
-				"operationId": "CreateImageStore",
-				"parameters": [
-					{
-						"name": "body",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/ImageStore"
-						}
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created",
-						"schema": {
-							"$ref": "#/definitions/StoreUrl"
-						}
-					},
-					"409": {
-						"description": "An image store with that name already exists.",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/{store_name}": {
-			"get": {
-				"description": "Retrieves a list of images given a list of image IDs, or all images in the image store if no param is passed.",
-				"summary": "Retrieve a list of images in an image store",
-				"tags": [
-					"storage"
-				],
-				"operationId": "ListImages",
-				"parameters": [
-					{
-						"name": "store_name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "ids",
-						"type": "array",
-						"in": "query",
-						"items": {
-							"type": "string",
-							"collectionFormat": "csv"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/Image"
-							}
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"post": {
-				"description": "Creates a new image layer in an image store",
-				"summary": "Creates a new image layer",
-				"tags": [
-					"storage"
-				],
-				"operationId": "WriteImage",
-				"consumes": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "image_file",
-						"in": "body",
-						"schema": {
-							"type": "string",
-							"format": "binary"
-						}
-					},
-					{
-						"name": "store_name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "image_id",
-						"type": "string",
-						"in": "query",
-						"required": true
-					},
-					{
-						"name": "parent_id",
-						"type": "string",
-						"in": "query",
-						"required": true
-					},
-					{
-						"name": "sum",
-						"type": "string",
-						"in": "query",
-						"required": true
-					},
-					{
-						"name": "metadatakey",
-						"type": "string",
-						"x-nullable": false,
-						"in": "query"
-					},
-					{
-						"name": "metadataval",
-						"type": "string",
-						"x-nullable": false,
-						"in": "query"
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created",
-						"schema": {
-							"$ref": "#/definitions/Image"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/{store_name}/info/{id}": {
-			"get": {
-				"description": "Inspect an image by id in an image store",
-				"summary": "Inspect an image",
-				"tags": [
-					"storage"
-				],
-				"operationId": "GetImage",
-				"parameters": [
-					{
-						"name": "store_name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "id",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/Image"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Delete an image by id in an image store",
-				"summary": "Delete an image",
-				"tags": [
-					"storage"
-				],
-				"operationId": "DeleteImage",
-				"parameters": [
-					{
-						"name": "store_name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "id",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "keepNodes",
-						"type": "array",
-						"required": true,
-						"in": "query",
-						"items": {
-							"type": "string",
-							"collectionFormat": "csv"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/Image"
-							}
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"423": {
-						"description": "In use",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/{store_name}/tar/{id}": {
-			"get": {
-				"description": "Get an image by id in an image store as a tar file",
-				"summary": "Get an image as a tar file",
-				"tags": [
-					"storage"
-				],
-				"operationId": "GetImageTar",
-				"parameters": [
-					{
-						"name": "store_name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					},
-					{
-						"name": "id",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string",
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Not found"
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/volumestores": {
-			"get": {
-				"description": "Get a list of available volume store locations",
-				"operationId": "VolumeStoresList",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/VolumeStoresListResponse"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/volumes": {
-			"get": {
-				"description": "Get a list of available volumes",
-				"operationId": "ListVolumes",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "filterString",
-						"type": "string",
-						"in": "query",
-						"required": false
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/VolumeResponse"
-							}
-						}
-					},
-					"500": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"post": {
-				"description": "Create a volume",
-				"operationId": "CreateVolume",
-				"summary": "Creates a Volume with metadata that is provided from the personality",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "VolumeRequest",
-						"required": true,
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/VolumeRequest"
-						}
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created",
-						"schema": {
-							"$ref": "#/definitions/VolumeResponse"
-						}
-					},
-					"409": {
-						"description": "Volume already exists by that ID",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"404": {
-						"description": "VolumeStore Does not Exist",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/storage/volumes/{name}": {
-			"get": {
-				"description": "Get info about a volume",
-				"operationId": "GetVolume",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "name",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/VolumeResponse"
-						}
-					},
-					"404": {
-						"description": "Volume not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"summary": "Remove a volume",
-				"tags": [
-					"storage"
-				],
-				"operationId": "RemoveVolume",
-				"parameters": [
-					{
-						"name": "name",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "Volume successfully removed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"404": {
-						"description": "Volume not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"409": {
-						"description": "Volume in use",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Server Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"post": {
-				"description": "Attach a volume to a container",
-				"operationId": "VolumeJoin",
-				"tags": [
-					"storage"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "name",
-						"required": true,
-						"type": "string",
-						"in": "path"
-					},
-					{
-						"name": "JoinArgs",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/VolumeJoinConfig"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "Volume not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "ServerError",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes": {
-			"post": {
-				"summary": "Create a new scope",
-				"tags": [
-					"scopes"
-				],
-				"operationId": "CreateScope",
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/ScopeConfig"
-						}
-					}
-				],
-				"responses": {
-					"201": {
-						"description": "Created",
-						"schema": {
-							"$ref": "#/definitions/ScopeConfig"
-						}
-					},
-					"409": {
-						"description": "A scope with that name exists.",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"get": {
-				"tags": [
-					"scopes"
-				],
-				"operationId": "ListAll",
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/ScopeConfig"
-							}
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes/{idName}": {
-			"get": {
-				"tags": [
-					"scopes"
-				],
-				"operationId": "List",
-				"parameters": [
-					{
-						"name": "idName",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/ScopeConfig"
-							}
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"tags": [
-					"scopes"
-				],
-				"operationId": "DeleteScope",
-				"parameters": [
-					{
-						"name": "idName",
-						"type": "string",
-						"in": "path",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Internal server error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes/{scope}/containers": {
-			"post": {
-				"description": "Add a container to scopes modifying the container VM's config as necessary",
-				"tags": [
-					"scopes"
-				],
-				"operationId": "AddContainer",
-				"parameters": [
-					{
-						"name": "scope",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					},
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/ScopesAddContainerConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes/{scope}/containers/{handle}": {
-			"delete": {
-				"description": "Remove a container from a scope",
-				"tags": [
-					"scopes"
-				],
-				"operationId": "RemoveContainer",
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					},
-					{
-						"name": "scope",
-						"in": "path",
-						"required": true,
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes/containers/{handleOrId}": {
-			"get": {
-				"tags": [
-					"scopes"
-				],
-				"description": "Get a list of the endpoints for a container",
-				"operationId": "GetContainerEndpoints",
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handleOrId",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/EndpointConfig"
-							}
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/scopes/containers/{handle}/binding": {
-			"post": {
-				"tags": [
-					"scopes"
-				],
-				"description": "Perform scope initialization for each of the scopes the container belongs to. Network initialization may include, for example, assigning addresses on a scope.",
-				"operationId": "BindContainer",
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/BindContainerResponse"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"tags": [
-					"scopes"
-				],
-				"operationId": "UnbindContainer",
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/UnbindContainerResponse"
-						}
-					},
-					"404": {
-						"description": "Not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/events": {
-			"get": {
-				"description": "Gets portlayer events",
-				"summary": "Gets portlayer events",
-				"operationId": "GetEvents",
-				"tags": [
-					"events"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/octet-stream"
-				],
-				"parameters": [],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"500": {
-						"description": "Failed to get events"
-					}
-				}
-			}
-		},
-		"/containers": {
-			"post": {
-				"description": "Initiates a container create operation",
-				"summary": "Initiates a container create operation",
-				"operationId": "Create",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "name",
-						"in": "query",
-						"type": "string",
-						"pattern": "/?[a-zA-Z0-9_-]+"
-					},
-					{
-						"name": "createConfig",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/ContainerCreateConfig"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/ContainerCreatedInfo"
-						}
-					},
-					"404": {
-						"description": "Create failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/info/{id}": {
-			"get": {
-				"description": "Gets information about a container by id",
-				"operationId": "GetContainerInfo",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/ContainerInfo"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "server error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/list": {
-			"get": {
-				"description": "Gets a list of all containers",
-				"operationId": "GetContainerList",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "all",
-						"required": false,
-						"in": "query",
-						"type": "boolean"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "array",
-							"items": {
-								"$ref": "#/definitions/ContainerInfo"
-							}
-						}
-					},
-					"500": {
-						"description": "server error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{id}": {
-			"get": {
-				"description": "Get a container handle",
-				"operationId": "Get",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Remove a container from existence",
-				"operationId": "ContainerRemove",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					},
-					{
-						"name": "force",
-						"in": "query",
-						"type": "boolean",
-						"default": false
-					},
-					{
-						"name": "v",
-						"in": "query",
-						"type": "boolean",
-						"default": false
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"400": {
-						"description": "bad parameter"
-					},
-					"404": {
-						"description": "no such container"
-					},
-					"409": {
-						"description": "conflict",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "server error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{handle}": {
-			"put": {
-				"description": "Commit and close a container handle",
-				"operationId": "Commit",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"in": "path",
-						"required": true,
-						"type": "string"
-					},
-					{
-						"name": "wait_time",
-						"in": "query",
-						"type": "integer",
-						"format": "int32"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"409": {
-						"description": "conflict",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{handle}/state": {
-			"put": {
-				"description": "Changes the state of a container",
-				"operationId": "StateChange",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"x-nullable": false,
-						"in": "path",
-						"type": "string"
-					},
-					{
-						"name": "state",
-						"required": true,
-						"in": "body",
-						"schema": {
-							"x-nullable": false,
-							"type": "string",
-							"enum": [
-								"RUNNING",
-								"STOPPED"
-							]
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"get": {
-				"description": "Get the current state of the a container",
-				"operationId": "GetState",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/ContainerGetStateResponse"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"default": {
-						"description": "Error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/tasks": {
-			"put": {
-				"description": "Initiates an task wait operation",
-				"summary": "Initiates an task wait operation",
-				"operationId": "Wait",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/TaskWaitConfig"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Wait of task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"get": {
-				"description": "Initiates an task inspect operation",
-				"summary": "Initiates an task inspect operation",
-				"operationId": "Inspect",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/TaskInspectConfig"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/TaskInspectResponse"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Inspect of task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"post": {
-				"description": "Initiates an task join operation",
-				"summary": "Initiates an task join operation",
-				"operationId": "Join",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"required": true,
-						"schema": {
-							"$ref": "#/definitions/TaskJoinConfig"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/TaskJoinResponse"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Join of task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Initiates an task remove operation",
-				"summary": "Initiates an task remove operation",
-				"operationId": "Remove",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/TaskRemoveConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/TaskRemoveResponse"
-						}
-					},
-					"404": {
-						"description": "not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Removal of task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/tasks/binding": {
-			"post": {
-				"description": "Activate a task that exists within the context of the provided handle",
-				"summary": "Activate an existing task",
-				"operationId": "Bind",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/TaskBindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/TaskBindResponse"
-						}
-					},
-					"404": {
-						"description": "No such task",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Activating task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Deactivate a task that exists within the context of the provided handle",
-				"summary": "Deactivate an existing task",
-				"operationId": "Unbind",
-				"tags": [
-					"tasks"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/TaskUnbindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/TaskUnbindResponse"
-						}
-					},
-					"404": {
-						"description": "No such task",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Deactivating task failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{handle}/name": {
-			"patch": {
-				"description": "Rename a container to the new name",
-				"operationId": "ContainerRename",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/json",
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "handle",
-						"required": true,
-						"in": "path",
-						"type": "string"
-					},
-					{
-						"name": "name",
-						"in": "query",
-						"type": "string",
-						"description": "New name for the container",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"type": "string"
-						}
-					},
-					"404": {
-						"description": "no such container",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"409": {
-						"description": "conflict, name already assigned",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "server error",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{id}/signal": {
-			"post": {
-				"description": "Sends a signal to a container by id",
-				"summary": "Signal a running container",
-				"operationId": "ContainerSignal",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "signal",
-						"in": "query",
-						"type": "integer",
-						"format": "int64",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Container not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Failed to signal container",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{id}/stats": {
-			"get": {
-				"description": "Gets the container stats by id",
-				"summary": "Gets the container stats",
-				"operationId": "GetContainerStats",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "stream",
-						"in": "query",
-						"type": "boolean",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Stats not found"
-					},
-					"500": {
-						"description": "Failed to get stats"
-					}
-				}
-			}
-		},
-		"/containers/{id}/logs": {
-			"get": {
-				"description": "Gets the container logs by id",
-				"summary": "Gets the container logs",
-				"operationId": "GetContainerLogs",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "follow",
-						"in": "query",
-						"type": "boolean",
-						"default": false,
-						"required": false
-					},
-					{
-						"name": "since",
-						"in": "query",
-						"type": "integer",
-						"format": "int64",
-						"required": false
-					},
-					{
-						"name": "timestamp",
-						"in": "query",
-						"type": "boolean",
-						"default": false,
-						"required": false
-					},
-					{
-						"name": "taillines",
-						"in": "query",
-						"type": "integer",
-						"format": "int64",
-						"required": false
-					},
-					{
-						"name": "deadline",
-						"in": "query",
-						"type": "integer",
-						"format": "int64",
-						"required": false
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Logs not found"
-					},
-					"500": {
-						"description": "Failed to get logs"
-					}
-				}
-			}
-		},
-		"/logging": {
-			"post": {
-				"description": "Adds logging capabilities to given handle",
-				"summary": "Add logging capability",
-				"operationId": "LoggingJoin",
-				"tags": [
-					"logging"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/LoggingJoinConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/LoggingJoinResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Adding a VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/logging/binding": {
-			"post": {
-				"description": "Enable/bind/activate the VirtualDevice",
-				"summary": "Enable/bind/activate the VirtualDevice",
-				"operationId": "LoggingBind",
-				"tags": [
-					"logging"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/LoggingBindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/LoggingBindResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Connecting VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Disable/unbind/deactivate the VirtualDevice",
-				"summary": "Disable/unbind/deactivate the VirtualDevice",
-				"operationId": "LoggingUnbind",
-				"tags": [
-					"logging"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/LoggingUnbindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/LoggingUnbindResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Disconnecting VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/interaction": {
-			"post": {
-				"description": "Adds interaction capabilities to given handle",
-				"summary": "Add interaction capability",
-				"operationId": "InteractionJoin",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/InteractionJoinConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/InteractionJoinResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Adding a VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/interaction/binding": {
-			"post": {
-				"description": "Enable/bind/activate the VirtualDevice",
-				"summary": "Enable/bind/activate the VirtualDevice",
-				"operationId": "InteractionBind",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/InteractionBindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/InteractionBindResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Connecting VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Disable/unbind/deactivate the VirtualDevice",
-				"summary": "Disable/unbind/deactivate the VirtualDevice",
-				"operationId": "InteractionUnbind",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "config",
-						"in": "body",
-						"schema": {
-							"$ref": "#/definitions/InteractionUnbindConfig"
-						},
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/InteractionUnbindResponse"
-						}
-					},
-					"404": {
-						"description": "VirtualDevice not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Disconnecting VirtualDevice failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/containers/{id}/wait": {
-			"get": {
-				"description": "Wait for the container to stop",
-				"operationId": "ContainerWait",
-				"tags": [
-					"containers"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "timeout",
-						"in": "query",
-						"type": "integer",
-						"format": "int64",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"$ref": "#/definitions/ContainerInfo"
-						}
-					},
-					"404": {
-						"description": "Container not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Failed to wait on Container",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/interaction/{id}/resize": {
-			"post": {
-				"description": "Resize the container's tty session",
-				"summary": "Resize tty session",
-				"operationId": "ContainerResize",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream",
-					"application/json"
-				],
-				"produces": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "height",
-						"in": "query",
-						"type": "integer",
-						"format": "int32",
-						"required": true
-					},
-					{
-						"name": "width",
-						"in": "query",
-						"type": "integer",
-						"format": "int32",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Container not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Container resize failed",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/interaction/{id}/stdin": {
-			"post": {
-				"description": "Set a stdin for the container",
-				"summary": "Set stdin",
-				"operationId": "ContainerSetStdin",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/raw-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "deadline",
-						"in": "query",
-						"type": "string",
-						"format": "datetime"
-					},
-					{
-						"name": "raw_stream",
-						"in": "body",
-						"schema": {
-							"type": "string",
-							"format": "binary"
-						}
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Container not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Failed to Set stdin",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			},
-			"delete": {
-				"description": "Close a stdin for the container",
-				"summary": "Close stdin",
-				"operationId": "ContainerCloseStdin",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/json"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK"
-					},
-					"404": {
-						"description": "Container not found",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					},
-					"500": {
-						"description": "Failed to Close stdin",
-						"schema": {
-							"$ref": "#/definitions/Error"
-						}
-					}
-				}
-			}
-		},
-		"/interaction/{id}/stdout": {
-			"get": {
-				"description": "Get a stdout for the container",
-				"summary": "Get stdout",
-				"operationId": "ContainerGetStdout",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "deadline",
-						"in": "query",
-						"type": "string",
-						"format": "datetime"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Container not found"
-					},
-					"500": {
-						"description": "Failed to get stdout"
-					}
-				}
-			}
-		},
-		"/interaction/{id}/stderr": {
-			"get": {
-				"description": "Get a stderr for the container",
-				"summary": "Get stderr",
-				"operationId": "ContainerGetStderr",
-				"tags": [
-					"interaction"
-				],
-				"consumes": [
-					"application/octet-stream"
-				],
-				"produces": [
-					"application/octet-stream"
-				],
-				"parameters": [
-					{
-						"name": "id",
-						"in": "path",
-						"type": "string",
-						"required": true
-					},
-					{
-						"name": "deadline",
-						"in": "query",
-						"type": "string",
-						"format": "datetime"
-					}
-				],
-				"responses": {
-					"200": {
-						"description": "OK",
-						"schema": {
-							"format": "binary"
-						}
-					},
-					"404": {
-						"description": "Container not found"
-					},
-					"500": {
-						"description": "Failed to get stderr"
-					}
-				}
-			}
-		}
-	},
-	"definitions": {
-		"Error": {
-			"type": "object",
-			"required": [
-				"message"
-			],
-			"properties": {
-				"code": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"message": {
-					"type": "string",
-					"x-nullable": false
-				}
-			}
-		},
-		"VCHInfo": {
-			"type": "object",
-			"properties": {
-				"cpuMhz": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"memory": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"cpuUsage": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"memUsage": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"hostProductName": {
-					"type": "string"
-				},
-				"hostOS": {
-					"type": "string"
-				},
-				"hostOSVersion": {
-					"type": "string"
-				}
-			}
-		},
-		"KeyValue": {
-			"type": "object",
-			"properties": {
-				"Key": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Value": {
-					"x-nullable": false,
-					"type": "string"
-				}
-			}
-		},
-		"StoreUrl": {
-			"type": "object",
-			"required": [
-				"url"
-			],
-			"properties": {
-				"code": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"url": {
-					"x-nullable": false,
-					"type": "string"
-				}
-			}
-		},
-		"ImageStore": {
-			"type": "object",
-			"required": [
-				"name"
-			],
-			"properties": {
-				"name": {
-					"type": "string",
-					"x-nullable": false
-				}
-			}
-		},
-		"Image": {
-			"type": "object",
-			"required": [
-				"ID",
-				"Store"
-			],
-			"properties": {
-				"ID": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Store": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"SelfLink": {
-					"type": "string"
-				},
-				"Parent": {
-					"type": "string"
-				},
-				"Metadata": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"ScopeConfig": {
-			"type": "object",
-			"required": [
-				"name",
-				"scopeType"
-			],
-			"properties": {
-				"id": {
-					"type": "string"
-				},
-				"name": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"scopeType": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"subnet": {
-					"type": "string"
-				},
-				"gateway": {
-					"type": "string"
-				},
-				"dns": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"ipam": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"endpoints": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/EndpointConfig"
-					}
-				},
-				"annotations": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				},
-				"internal": {
-					"type": "boolean"
-				}
-			}
-		},
-		"EndpointConfig": {
-			"type": "object",
-			"required": [
-				"id",
-				"name",
-				"scope",
-				"address",
-				"gateway",
-				"container",
-				"ports",
-				"aliases",
-				"nameservers"
-			],
-			"properties": {
-				"id": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"name": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"scope": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"address": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"gateway": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"container": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"ports": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"aliases": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"nameservers": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"ContainerCreateConfig": {
-			"type": "object",
-			"properties": {
-				"name": {
-					"type": "string"
-				},
-				"imageStore": {
-					"$ref": "#/definitions/ImageStore"
-				},
-				"image": {
-					"type": "string"
-				},
-				"layer": {
-					"type": "string"
-				},
-				"repoName": {
-					"type": "string"
-				},
-				"numCPUs": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"memoryMB": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"networkDisabled": {
-					"type": "boolean"
-				},
-				"annotations": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				},
-				"hostname": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"domainname": {
-					"type": "string",
-					"x-nullable": false
-				}
-			}
-		},
-		"ContainerCreatedInfo": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"handle": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				}
-			}
-		},
-		"ScopesAddContainerConfig": {
-			"type": "object",
-			"required": [
-				"networkConfig",
-				"handle"
-			],
-			"properties": {
-				"networkConfig": {
-					"$ref": "#/definitions/NetworkConfig"
-				},
-				"handle": {
-					"x-nullable": false,
-					"type": "string"
-				}
-			}
-		},
-		"NetworkConfig": {
-			"type": "object",
-			"required": [
-				"networkName"
-			],
-			"properties": {
-				"networkName": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"address": {
-					"type": "string"
-				},
-				"aliases": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"ports": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"ContainerGetStateResponse": {
-			"type": "object",
-			"required": [
-				"handle",
-				"state"
-			],
-			"properties": {
-				"handle": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"state": {
-					"type": "string",
-					"x-nullable": false,
-					"enum": [
-						"RUNNING",
-						"STOPPED"
-					]
-				}
-			}
-		},
-		"VolumeRequest": {
-			"type": "object",
-			"required": [
-				"Name",
-				"Store",
-				"Capacity",
-				"Driver"
-			],
-			"properties": {
-				"Name": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Driver": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"DriverArgs": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				},
-				"Store": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Capacity": {
-					"x-nullable": false,
-					"type": "integer"
-				},
-				"Metadata": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"VolumeResponse": {
-			"type": "object",
-			"required": [
-				"Name",
-				"Label",
-				"Store",
-				"Driver"
-			],
-			"properties": {
-				"Name": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Label": {
-					"description": "this is the label used to mount the block device",
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Driver": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Store": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Metadata": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"VolumeJoinConfig": {
-			"type": "object",
-			"required": [
-				"Handle",
-				"MountPath",
-				"Flags"
-			],
-			"properties": {
-				"Handle": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"MountPath": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"Flags": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"VolumeStoresListResponse": {
-			"type": "object",
-			"required": [
-				"Stores"
-			],
-			"properties": {
-				"Stores": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"ContainerInfo": {
-			"type": "object",
-			"properties": {
-				"containerConfig": {
-					"$ref": "#/definitions/ContainerConfig"
-				},
-				"HostConfig": {
-					"$ref": "#/definitions/HostConfig"
-				},
-				"processConfig": {
-					"$ref": "#/definitions/ProcessConfig"
-				},
-				"volumeConfig": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/VolumeConfig"
-					}
-				},
-				"endpoints": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/EndpointConfig"
-					}
-				},
-				"dataVersion": {
-					"type": "integer",
-					"format": "int64"
-				}
-			}
-		},
-		"ContainerConfig": {
-			"type": "object",
-			"properties": {
-				"containerId": {
-					"type": "string"
-				},
-				"layerId": {
-					"type": "string"
-				},
-				"imageId": {
-					"type": "string"
-				},
-				"repoName": {
-					"x-nullable": true,
-					"type": "string"
-				},
-				"createTime": {
-					"type": "integer"
-				},
-				"names": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"annotations": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				},
-				"state": {
-					"type": "string"
-				},
-				"restartCount": {
-					"type": "integer"
-				},
-				"hostName": {
-					"x-nullable": true,
-					"type": "string"
-				},
-				"attachStdin": {
-					"x-nullable": true,
-					"type": "boolean"
-				},
-				"attachStdout": {
-					"x-nullable": true,
-					"type": "boolean"
-				},
-				"attachStderr": {
-					"x-nullable": true,
-					"type": "boolean"
-				},
-				"tty": {
-					"x-nullable": true,
-					"type": "boolean"
-				},
-				"consoleSize": {
-					"type": "object",
-					"properties": {
-						"width": {
-							"type": "integer"
-						},
-						"height": {
-							"type": "integer"
-						}
-					}
-				},
-				"openStdin": {
-					"x-nullable": true,
-					"type": "boolean"
-				},
-				"logPath": {
-					"type": "string"
-				},
-				"reservation": {
-					"$ref": "#/definitions/ReservationConfig"
-				},
-				"storageSize": {
-					"type": "integer"
-				}
-			}
-		},
-		"ReservationConfig": {
-			"type": "object",
-			"properties": {
-				"cpuCount": {
-					"type": "integer"
-				},
-				"memoryLimit": {
-					"type": "integer"
-				}
-			}
-		},
-		"HostConfig": {
-			"description": "Information about the virtual container host (VCH)",
-			"type": "object",
-			"properties": {
-				"architecture": {
-					"type": "string"
-				},
-				"ostype": {
-					"type": "string"
-				},
-				"kernelVersion": {
-					"type": "string"
-				},
-				"reservation": {
-					"$ref": "#/definitions/ReservationConfig"
-				},
-				"address": {
-					"type": "string"
-				},
-				"ports": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				}
-			}
-		},
-		"ProcessConfig": {
-			"type": "object",
-			"properties": {
-				"pid": {
-					"type": "integer"
-				},
-				"execPath": {
-					"type": "string"
-				},
-				"execArgs": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"workingDir": {
-					"x-nullable": true,
-					"type": "string"
-				},
-				"user": {
-					"type": "string"
-				},
-				"env": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"status": {
-					"type": "string"
-				},
-				"startTime": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"stopTime": {
-					"type": "integer",
-					"format": "int64"
-				},
-				"exitCode": {
-					"type": "integer",
-					"format": "int32"
-				},
-				"errorMsg": {
-					"type": "string"
-				}
-			}
-		},
-		"VolumeConfig": {
-			"type": "object",
-			"properties": {
-				"name": {
-					"type": "string"
-				},
-				"mountPoint": {
-					"type": "string"
-				},
-				"flags": {
-					"type": "object",
-					"additionalProperties": {
-						"type": "string"
-					}
-				},
-				"readWrite": {
-					"type": "boolean"
-				}
-			}
-		},
-		"BindContainerResponse": {
-			"type": "object",
-			"required": [
-				"handle",
-				"endpoints"
-			],
-			"properties": {
-				"handle": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"endpoints": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/EndpointConfig"
-					}
-				}
-			}
-		},
-		"UnbindContainerResponse": {
-			"type": "object",
-			"required": [
-				"handle",
-				"endpoints"
-			],
-			"properties": {
-				"handle": {
-					"x-nullable": false,
-					"type": "string"
-				},
-				"endpoints": {
-					"type": "array",
-					"items": {
-						"$ref": "#/definitions/EndpointConfig"
-					}
-				}
-			}
-		},
-		"LoggingJoinConfig": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"LoggingBindConfig": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"LoggingUnbindConfig": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"LoggingJoinResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"LoggingBindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"LoggingUnbindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionJoinConfig": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionBindConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionUnbindConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionJoinResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionBindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"InteractionUnbindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskJoinConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"path"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				},
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"path": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"args": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"workingDir": {
-					"type": "string"
-				},
-				"env": {
-					"type": "array",
-					"items": {
-						"type": "string"
-					}
-				},
-				"user": {
-					"type": "string"
-				},
-				"attach": {
-					"type": "boolean",
-					"default": true,
-					"x-nullable": false
-				},
-				"openStdin": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"tty": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"stopSignal": {
-					"type": "string"
-				}
-			}
-		},
-		"TaskBindConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskUnbindConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskRemoveConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskInspectConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskWaitConfig": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskJoinResponse": {
-			"type": "object",
-			"required": [
-				"handle",
-				"id"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				},
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				}
-			}
-		},
-		"TaskBindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskUnbindResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskRemoveResponse": {
-			"type": "object",
-			"required": [
-				"handle"
-			],
-			"properties": {
-				"handle": {
-					"type": "object"
-				}
-			}
-		},
-		"TaskInspectResponse": {
-			"type": "object",
-			"required": [
-				"id"
-			],
-			"properties": {
-				"id": {
-					"type": "string",
-					"x-nullable": false
-				},
-				"running": {
-					"type": "boolean",
-					"x-nullable": false
-				},
-				"exitCode": {
-					"type": "integer",
-					"x-nullable": false
-				},
-				"processConfig": {
-					"$ref": "#/definitions/ProcessConfig"
-				},
-				"openStdin": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"openStderr": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"openStdout": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"tty": {
-					"type": "boolean",
-					"default": false,
-					"x-nullable": false
-				},
-				"user": {
-					"type": "string"
-				},
-				"pid": {
-					"type": "integer",
-					"x-nullable": false
-				}
-			}
-		}
-	}
-}
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/archive_unix.go b/installer/vendor/github.com/vmware/vic/lib/archive/archive_unix.go
deleted file mode 100644
index 36080a2389..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/archive_unix.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// NOTE: This file is borrowed directly from docker in order to use unexported
-// functions that it provides.
-// https://github.com/moby/moby/blob/master/pkg/archive/archive_unix.go
-
-// +build !windows
-
-package archive
-
-import (
-	"archive/tar"
-	"errors"
-	"os"
-	"path/filepath"
-	"syscall"
-
-	"github.com/docker/docker/pkg/system"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return srcPath
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a separate function as this is platform specific. On Linux, we
-// can't use filepath.Join(srcPath,include) because this will clean away
-// a trailing "." or "/" which may be important.
-func getWalkRoot(srcPath string, include string) string {
-	return srcPath + string(filepath.Separator) + include
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	return p, nil // already unix-style
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	return perm // noop for unix as golang APIs provide perm bits correctly
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		return -1, -1, errors.New("cannot convert stat value to syscall.Stat_t")
-	}
-	return int(s.Uid), int(s.Gid), nil
-}
-
-func major(device uint64) uint64 {
-	return (device >> 8) & 0xfff
-}
-
-func minor(device uint64) uint64 {
-	return (device & 0xff) | ((device >> 12) & 0xfff00)
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-
-	mode := uint32(hdr.Mode & 07777)
-	switch hdr.Typeflag {
-	case tar.TypeBlock:
-		mode |= syscall.S_IFBLK
-	case tar.TypeChar:
-		mode |= syscall.S_IFCHR
-	case tar.TypeFifo:
-		mode |= syscall.S_IFIFO
-	}
-
-	if err := system.Mknod(path, mode, int(system.Mkdev(hdr.Devmajor, hdr.Devminor))); err != nil {
-		return err
-	}
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	if hdr.Typeflag == tar.TypeLink {
-		if fi, err := os.Lstat(hdr.Linkname); err == nil && (fi.Mode()&os.ModeSymlink == 0) {
-			if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-				return err
-			}
-		}
-	} else if hdr.Typeflag != tar.TypeSymlink {
-		if err := os.Chmod(path, hdrInfo.Mode()); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, stat interface{}) (inode uint64, err error) {
-	s, ok := stat.(*syscall.Stat_t)
-
-	if !ok {
-		err = errors.New("cannot convert stat value to syscall.Stat_t")
-		return
-	}
-
-	inode = uint64(s.Ino)
-
-	// Currently go does not fill in the major/minors
-	if s.Mode&syscall.S_IFBLK != 0 ||
-		s.Mode&syscall.S_IFCHR != 0 {
-		hdr.Devmajor = int64(major(uint64(s.Rdev)))
-		hdr.Devminor = int64(minor(uint64(s.Rdev)))
-	}
-
-	return
-}
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return fi.Sys().(*syscall.Stat_t).Nlink > 1
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/archive_windows.go b/installer/vendor/github.com/vmware/vic/lib/archive/archive_windows.go
deleted file mode 100644
index e0e24e3f40..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/archive_windows.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// NOTE: This file is borrowed directly from docker in order to use unexported
-// functions that it provides.
-// https://github.com/moby/moby/blob/master/pkg/archive/archive_unix.go
-
-// +build windows
-
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/docker/docker/pkg/longpath"
-)
-
-// fixVolumePathPrefix does platform specific processing to ensure that if
-// the path being passed in is not in a volume path format, convert it to one.
-func fixVolumePathPrefix(srcPath string) string {
-	return longpath.AddPrefix(srcPath)
-}
-
-// getWalkRoot calculates the root path when performing a TarWithOptions.
-// We use a separate function as this is platform specific.
-func getWalkRoot(srcPath string, include string) string {
-	return filepath.Join(srcPath, include)
-}
-
-// CanonicalTarNameForPath returns platform-specific filepath
-// to canonical posix-style path for tar archival. p is relative
-// path.
-func CanonicalTarNameForPath(p string) (string, error) {
-	// windows: convert windows style relative path with backslashes
-	// into forward slashes. Since windows does not allow '/' or '\'
-	// in file names, it is mostly safe to replace however we must
-	// check just in case
-	if strings.Contains(p, "/") {
-		return "", fmt.Errorf("Windows path contains forward slash: %s", p)
-	}
-	return strings.Replace(p, string(os.PathSeparator), "/", -1), nil
-
-}
-
-// chmodTarEntry is used to adjust the file permissions used in tar header based
-// on the platform the archival is done.
-func chmodTarEntry(perm os.FileMode) os.FileMode {
-	perm &= 0755
-	// Add the x bit: make everything +x from windows
-	perm |= 0111
-
-	return perm
-}
-
-func setHeaderForSpecialDevice(hdr *tar.Header, stat interface{}) (inode uint64, err error) {
-	// do nothing. no notion of Rdev, Inode, Nlink in stat on Windows
-	return
-}
-
-// handleTarTypeBlockCharFifo is an OS-specific helper function used by
-// createTarFile to handle the following types of header: Block; Char; Fifo
-func handleTarTypeBlockCharFifo(hdr *tar.Header, path string) error {
-	return nil
-}
-
-func handleLChmod(hdr *tar.Header, path string, hdrInfo os.FileInfo) error {
-	return nil
-}
-
-func getFileUIDGID(stat interface{}) (int, int, error) {
-	// no notion of file ownership mapping yet on Windows
-	return 0, 0, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/archiver.go b/installer/vendor/github.com/vmware/vic/lib/archive/archiver.go
deleted file mode 100644
index 2a18a3540f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/archiver.go
+++ /dev/null
@@ -1,196 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/url"
-	"strings"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// FilterType specifies what type of filter to apply in a FilterSpec
-type FilterType int
-
-const (
-	// Include specifies a path inclusion.
-	// Note: An included path that sits under an excluded path should be included.
-	// Example: if / is excluded, and /files is included, /files should  be added to the archive.
-	Include = iota
-	// Exclude specifies a path exclusion.
-	Exclude
-	// Rebase specifies a path rebase.
-	// The rebase path is prepended to the path in the archive header.
-	// for an Export this will ensure proper headers on the way out.
-	// for an Import it will ensure that the tar unpacking occurs in
-	// right location
-	Rebase
-	// Strip specifies a path strip.
-	// The inverse of a rebase, the path is stripped from the header path
-	// before writing to disk.
-	Strip
-)
-
-// FilterSpec describes rules for handling specified paths during archival
-type FilterSpec struct {
-	Inclusions map[string]struct{}
-	Exclusions map[string]struct{}
-	RebasePath string
-	StripPath  string
-}
-
-// Archiver defines an API for creating archives consisting of data that
-// exist between a child and parent layer, as well as unpacking archives
-// to container filesystems
-type Archiver interface {
-
-	// Export reads the delta between child and ancestor layers, returning
-	// the difference as a tar archive.
-	//
-	// store - the store containing the two layers
-	// id - must inherit from ancestor if ancestor is specified
-	// ancestor - the old layer against which to diff. If omitted, the entire filesystem will be included
-	// spec - describes filters on paths found in the data (include, exclude, rebase, strip)
-	// data - include file data in the tar archive if true, headers only otherwise
-	Export(op trace.Operation, store *url.URL, id, ancestor string, spec *FilterSpec, data bool) (io.ReadCloser, error)
-
-	// Import will process the input tar stream based on the supplied path spec and write the stream to the
-	// target device.
-	//
-	// store - the device store containing the target device
-	// id - the id for the device that is contained within the store
-	// spec - describes filters on paths found in the data (include, exclude, rebase, strip)
-	// tarstream - the tar stream that is to be written to the target on the device
-	Import(op trace.Operation, store *url.URL, id string, spec *FilterSpec, tarstream io.ReadCloser) error
-}
-
-// CreateFilterSpec creates a FilterSpec from a supplied map
-func CreateFilterSpec(op trace.Operation, spec map[string]FilterType) (*FilterSpec, error) {
-	fs := &FilterSpec{
-		Inclusions: make(map[string]struct{}),
-		Exclusions: make(map[string]struct{}),
-	}
-
-	if spec == nil {
-		return fs, nil
-	}
-
-	for k, v := range spec {
-		switch v {
-		case Include:
-			fs.Inclusions[k] = struct{}{}
-		case Exclude:
-			fs.Exclusions[k] = struct{}{}
-		case Rebase:
-			if fs.RebasePath != "" {
-				return nil, fmt.Errorf("error creating filter spec: only one rebase path allowed")
-			}
-			fs.RebasePath = k
-		case Strip:
-			if fs.StripPath != "" {
-				return nil, fmt.Errorf("error creating filter spec: only one strip path allowed")
-			}
-			fs.StripPath = k
-		default:
-			return nil, fmt.Errorf("invalid filter specification: %d", v)
-		}
-	}
-
-	return fs, nil
-}
-
-// Decodes a base64 encoded string from EncodeFilterSpec into a FilterSpec
-func DecodeFilterSpec(op trace.Operation, spec *string) (*FilterSpec, error) {
-	var filterSpec FilterSpec
-
-	// empty spec means don't apply any filtering
-	if spec != nil && len(*spec) > 0 {
-		decoded, err := base64.StdEncoding.DecodeString(*spec)
-		if err != nil {
-			op.Errorf("Unable to decode filter spec: %s", err)
-			return nil, err
-		}
-		op.Debugf("decoded spec: %+s", string(decoded))
-
-		if len(decoded) > 0 {
-			if err = json.Unmarshal(decoded, &filterSpec); err != nil {
-				op.Errorf("Unable to unmarshal decoded spec: %s", err)
-				return nil, err
-			}
-		}
-	}
-
-	// normalize empty spec
-	if filterSpec.Inclusions == nil {
-		op.Debugf("Empty inclusion set")
-		filterSpec.Inclusions = make(map[string]struct{})
-	}
-	if filterSpec.Exclusions == nil {
-		op.Debugf("Empty exclusion set")
-		filterSpec.Exclusions = make(map[string]struct{})
-	}
-
-	return &filterSpec, nil
-}
-
-// Encode the filter spec
-func EncodeFilterSpec(op trace.Operation, spec *FilterSpec) (*string, error) {
-	mashalled, err := json.Marshal(spec)
-	if err != nil {
-		op.Errorf("Unable to encode filter spec: %s", err)
-		return nil, err
-	}
-
-	encoded := base64.StdEncoding.EncodeToString(mashalled)
-	op.Debugf("encodedFilter = %s", encoded)
-
-	return &encoded, nil
-}
-
-// Excludes returns true if the provided filter excludes the provided filepath
-// If the spec is completely empty it will include everything.
-// If an inclusion is set, but not exclusion, then we'll only return matches for the inclusions.
-func (spec *FilterSpec) Excludes(op trace.Operation, filePath string) bool {
-	if spec == nil {
-		return false
-	}
-
-	inclusionLength := -1
-	exclusionLength := -1
-
-	for path := range spec.Inclusions {
-		if strings.HasPrefix(filePath, path) {
-			if len(path) > inclusionLength {
-				// more specific inclusion, so update
-				inclusionLength = len(path)
-			}
-		}
-	}
-
-	for path := range spec.Exclusions {
-		if strings.HasPrefix(filePath, path) {
-			if len(path) > exclusionLength {
-				// more specific exclusion, so update
-				exclusionLength = len(path)
-			}
-		}
-	}
-
-	return inclusionLength < exclusionLength
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/changes_windows.go b/installer/vendor/github.com/vmware/vic/lib/archive/changes_windows.go
deleted file mode 100644
index 93bc4f98e4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/changes_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// NOTE: This file is borrowed directly from docker in order to use unexported
-// functions that it provides.
-// https://github.com/moby/moby/blob/master/pkg/archive/archive_unix.go
-
-package archive
-
-import (
-	"os"
-)
-
-func hasHardlinks(fi os.FileInfo) bool {
-	return false
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/diff.go b/installer/vendor/github.com/vmware/vic/lib/archive/diff.go
deleted file mode 100644
index a4325b3cb3..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/diff.go
+++ /dev/null
@@ -1,299 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"io"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	docker "github.com/docker/docker/pkg/archive"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	// ChangeTypeKey defines the key for the type of diff change stored in the tar Xattrs header
-	ChangeTypeKey = "change_type"
-)
-
-// CancelNotifyKey allows for a notification when cancelation is complete
-type CancelNotifyKey struct{}
-
-var (
-	seenFiles map[uint64]string
-)
-
-func min(a, b int) int {
-	if a < b {
-		return a
-	}
-	return b
-}
-
-// for sort.Sort
-type changesByPath []docker.Change
-
-// This will walk the two path components up to min(i, j) length.
-// If at any time those components do not match, a comparison of the non-matching
-// components is returned.
-// If the shorter path is a prefix of the longer path, the shorter path wins.
-func (c changesByPath) Less(i, j int) bool {
-	a := strings.Split(c[i].Path[1:], "/")
-	b := strings.Split(c[j].Path[1:], "/")
-
-	m := min(len(a), len(b))
-	for x := 0; x < m; x++ {
-		if a[x] != b[x] {
-			return a[x] < b[x]
-		}
-	}
-
-	return len(a) < len(b)
-}
-
-func (c changesByPath) Len() int      { return len(c) }
-func (c changesByPath) Swap(i, j int) { c[j], c[i] = c[i], c[j] }
-
-// Diff produces a tar archive containing the differences between two filesystems
-func Diff(op trace.Operation, newDir, oldDir string, spec *FilterSpec, data bool, xattr bool) (io.ReadCloser, error) {
-	var err error
-	if spec == nil {
-		spec, err = CreateFilterSpec(op, nil)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	changes, err := docker.ChangesDirs(newDir, oldDir)
-	if err != nil {
-		return nil, err
-	}
-
-	sort.Sort(changesByPath(changes))
-
-	return Tar(op, newDir, changes, spec, data, xattr)
-}
-
-func Tar(op trace.Operation, dir string, changes []docker.Change, spec *FilterSpec, data bool, xattr bool) (io.ReadCloser, error) {
-	var (
-		err error
-		hdr *tar.Header
-	)
-
-	// NOTE(hickeng): I don't like this as we've not assurance that it's appropriately buffered, but cannot think of a go-idomatic way to
-	// do better right now
-	var notify *sync.WaitGroup
-	n := op.Value(CancelNotifyKey{})
-	if n != nil {
-		var ok bool
-		if notify, ok = n.(*sync.WaitGroup); ok {
-			// this lets us block the creator of the cancel-notifier until we've cleaned up
-			notify.Add(1)
-		}
-	}
-	seenFiles = make(map[uint64]string)
-
-	// Note: it is up to the caller to handle errors and the closing of the read side of the pipe
-	r, w := io.Pipe()
-	go func() {
-		tw := tar.NewWriter(w)
-
-		defer func() {
-			var cerr error
-			defer w.Close()
-
-			if notify != nil {
-				// inform waiters that we're done with cleanup
-				notify.Done()
-			}
-
-			if oerr := op.Err(); oerr != nil {
-				// don't close the archive if we're truncating the copy - it's misleading
-				// #nosec: Errors unhandled.
-				_ = w.CloseWithError(oerr)
-				return
-			}
-
-			if cerr = tw.Close(); cerr != nil {
-				op.Errorf("Error closing tar writer: %s", cerr.Error())
-			}
-			if err == nil {
-				if cerr != nil {
-					op.Errorf("Closing down tar writer with clean exit: %s", cerr)
-				} else {
-					op.Debugf("Closing down tar writer with pristine exit")
-				}
-				// #nosec: Errors unhandled.
-				_ = w.CloseWithError(cerr)
-			} else {
-				op.Errorf("Closing down tar writer with error during tar: %s", err)
-				// #nosec: Errors unhandled.
-				_ = w.CloseWithError(err)
-			}
-		}()
-
-		for _, change := range changes {
-			if cerr := op.Err(); cerr != nil {
-				// this will still trigger the defer to close the archive neatly
-				op.Warnf("Aborting tar due to cancellation: %s", cerr)
-				break
-			}
-
-			if spec.Excludes(op, strings.TrimPrefix(change.Path, "/")) {
-				continue
-			}
-
-			hdr, err = createHeader(op, dir, change, spec, xattr)
-
-			if err != nil {
-				op.Errorf("Error creating header from change: %s", err.Error())
-				return
-			}
-
-			var f *os.File
-
-			if !data {
-				hdr.Size = 0
-			}
-
-			// #nosec: Errors unhandled.
-			_ = tw.WriteHeader(hdr)
-			p := filepath.Join(dir, change.Path)
-			if (hdr.Typeflag == tar.TypeReg || hdr.Typeflag == tar.TypeRegA) && hdr.Size != 0 {
-				f, err = os.Open(p)
-				if err != nil {
-					if os.IsPermission(err) {
-						err = nil
-					}
-					return
-				}
-
-				if f != nil {
-					// make sure we get out of io.Copy if context is canceled
-					done := make(chan struct{})
-					go func() {
-						select {
-						case <-op.Done():
-							f.Close()
-							// force the io.Copy to exit whether it's in the read or write portion of the copy.
-							// If this causes problems with inflight data we can try moving the cancellation notifier
-							// Done call here and see if the other end of w/tw will be shut down.
-							w.Close()
-						case <-done:
-						}
-					}()
-
-					_, err = io.Copy(tw, f)
-					close(done)
-					// #nosec: Errors unhandled.
-					_ = f.Close()
-					if err != nil {
-						op.Errorf("Error writing archive data: %s", err.Error())
-						if err == io.EOF || err == io.ErrClosedPipe {
-							// no point in continuing
-							break
-						}
-					}
-				}
-			}
-		}
-	}()
-	return r, err
-}
-
-func createHeader(op trace.Operation, dir string, change docker.Change, spec *FilterSpec, xattr bool) (*tar.Header, error) {
-	var hdr *tar.Header
-	timestamp := time.Now()
-
-	switch change.Kind {
-	case docker.ChangeDelete:
-		whiteOutDir := filepath.Dir(change.Path)
-		whiteOutBase := filepath.Base(change.Path)
-		whiteOut := filepath.Join(whiteOutDir, docker.WhiteoutPrefix+whiteOutBase)
-
-		hdr = &tar.Header{
-			ModTime:    timestamp,
-			Size:       0,
-			AccessTime: timestamp,
-			ChangeTime: timestamp,
-		}
-
-		whiteOut = strings.TrimPrefix(whiteOut, "/")
-		strippedName := strings.TrimPrefix(whiteOut, spec.StripPath)
-		hdr.Name = filepath.Join(spec.RebasePath, strippedName)
-	default:
-		path := filepath.Join(dir, change.Path)
-		fi, err := os.Lstat(path)
-		if err != nil {
-			op.Errorf("Error getting file info: %s", err.Error())
-			return nil, err
-		}
-
-		link := ""
-		if fi.Mode()&os.ModeSymlink != 0 {
-			if link, err = os.Readlink(path); err != nil {
-				return nil, err
-			}
-		}
-
-		hdr, err = tar.FileInfoHeader(fi, link)
-		if err != nil {
-			op.Errorf("Error getting file info header: %s", err.Error())
-			return nil, err
-		}
-
-		name := strings.TrimPrefix(change.Path, "/")
-		name = strings.TrimPrefix(name, spec.StripPath)
-		name = filepath.Join(spec.RebasePath, name)
-
-		if fi.IsDir() && !strings.HasSuffix(change.Path, "/") {
-			name += "/"
-		}
-
-		hdr.Name = strings.TrimPrefix(name, "/")
-
-		inode, err := setHeaderForSpecialDevice(hdr, fi.Sys())
-		if err != nil {
-			return nil, err
-		}
-
-		// if it's not a directory and has more than 1 link,
-		// it's hard linked, so set the type flag accordingly
-		if !fi.IsDir() && hasHardlinks(fi) {
-			// a link should have a name that it links to
-			// and that linked name should be first in the tar archive
-			if oldpath, ok := seenFiles[inode]; ok {
-				hdr.Typeflag = tar.TypeLink
-				hdr.Linkname = oldpath
-				hdr.Size = 0 // This Must be here for the writer math to add up!
-			} else {
-				seenFiles[inode] = strings.TrimPrefix(name, "/")
-			}
-		}
-	}
-
-	if xattr {
-		hdr.Xattrs = make(map[string]string)
-		hdr.Xattrs[ChangeTypeKey] = change.Kind.String()
-	}
-
-	return hdr, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/diff_test.go b/installer/vendor/github.com/vmware/vic/lib/archive/diff_test.go
deleted file mode 100644
index b0312f7719..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/diff_test.go
+++ /dev/null
@@ -1,629 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"context"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-var (
-	newDir, oldDir string
-	a, b           []byte
-	files          map[string][]string
-	directories    map[string]struct{}
-	err            error
-)
-
-func TestMain(m *testing.M) {
-
-	var err error
-
-	directories = make(map[string]struct{}, 4)
-	files = make(map[string][]string, 6)
-	files["original"] = []string{"file1", "file2", "file3", "file4",
-		"original/file1", "original/file2", "original/remove",
-		"exclude/excludeme", "exclude/includeme", "excludeme", "include/excludeme", "include/includeme"}
-	files["added"] = []string{"added1", "added2", "add/file1", "add/file2"}
-	files["changed"] = []string{"file1", "original/file2",
-		"exclude/excludeme", "exclude/includeme",
-		"include/excludeme", "include/includeme",
-		"excludeme"}
-	files["removed"] = []string{"file2", "original/file1", "original/remove"}
-	files["excluded"] = []string{"exclude/", "excludeme", "include/excludeme"}
-	files["included"] = []string{"exclude/includeme", "include/"}
-
-	newDir, err = ioutil.TempDir("", "mnt")
-	if err != nil {
-		return
-	}
-	defer os.RemoveAll(newDir)
-
-	oldDir, err = ioutil.TempDir("", "mnt")
-	if err != nil {
-		return
-	}
-	defer os.RemoveAll(oldDir)
-
-	a = []byte("The mollusk lingers with its wandering eye\n")
-	b = []byte("The waking of all creatures that live on the land\n")
-
-	for _, dir := range []string{"original/", "add/", "exclude/", "include/"} {
-		directories[dir] = struct{}{}
-		if err = os.Mkdir(filepath.Join(oldDir, dir), 0777); err != nil {
-			log.Errorf("Failed to add directory: %s", err.Error())
-			return
-		}
-		if err = os.Mkdir(filepath.Join(newDir, dir), 0777); err != nil {
-			log.Errorf("Failed to add directory: %s", err.Error())
-			return
-		}
-	}
-
-	for _, file := range files["original"] {
-		if err = ioutil.WriteFile(filepath.Join(oldDir, file), a, 0777); err != nil {
-			log.Errorf("Failed to add file: %s", err.Error())
-			return
-		}
-		if err = ioutil.WriteFile(filepath.Join(newDir, file), a, 0777); err != nil {
-			log.Errorf("Failed to add file: %s", err.Error())
-			return
-		}
-	}
-	for _, file := range append(files["added"], files["changed"]...) {
-		if err = ioutil.WriteFile(filepath.Join(newDir, file), b, 0777); err != nil {
-			log.Errorf("Failed to add file: %s", err.Error())
-			return
-		}
-	}
-	for _, file := range files["removed"] {
-		if err = os.Remove(filepath.Join(newDir, file)); err != nil {
-			log.Errorf("Failed to remove file: %s", err.Error())
-			return
-		}
-	}
-
-	os.Exit(m.Run())
-}
-
-func TestDiff(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "TestDiff")
-
-	tarFile, err := Diff(op, newDir, oldDir, nil, true, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string][]byte)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar archive: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		if _, err := io.Copy(buf, tr); !assert.NoError(t, err) {
-			return
-		}
-		tarredFiles[hdr.Name] = buf.Bytes()
-	}
-
-	all := append(files["added"], append(files["changed"], files["included"]...)...)
-	for _, file := range all {
-		if strings.HasSuffix(file, "/") {
-			continue
-		}
-
-		f, ok := tarredFiles[file]
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, b, f, "Expected file contents \"%s\", but found \"%s\"", b, f)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		_, ok := tarredFiles[wh]
-		assert.True(t, ok, "Expected to find whiteout file in archive: %s", wh)
-	}
-
-}
-
-func TestDiffNoAncestor(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "TestDiffNoParent")
-
-	// test without ancestor
-	tarFile, err := Diff(op, newDir, "", nil, true, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string][]byte)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar header: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		if _, err := io.Copy(buf, tr); !assert.NoError(t, err) {
-			return
-		}
-		tarredFiles[hdr.Name] = buf.Bytes()
-		if hdr.Typeflag == tar.TypeDir {
-			directories[hdr.Name] = struct{}{}
-		}
-	}
-
-	all := append(files["added"], append(files["changed"], files["included"]...)...)
-	for _, file := range all {
-		f, ok := tarredFiles[file]
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, b, f, "Expected file contents \"%s\", but found \"%s\"", b, f)
-		}
-	}
-
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		_, ok := tarredFiles[wh]
-		assert.False(t, ok, "Expected not to find whiteout file in archive: %s", wh)
-	}
-}
-
-func TestDiffNoData(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "TestDiffNoData")
-
-	tarFile, err := Diff(op, newDir, oldDir, nil, false, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string]string)
-	changeTypes := make(map[string]string)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if !assert.NoError(t, err) {
-			op.Errorf("Error reading tar header: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		n, err := io.Copy(buf, tr)
-		if !assert.NoError(t, err) {
-			return
-		}
-		assert.EqualValues(t, 0, n, "Expected 0 bytes copied, got %d instead", n)
-		tarredFiles[hdr.Name] = string(buf.Bytes())
-		changeTypes[hdr.Name] = hdr.Xattrs[ChangeTypeKey]
-	}
-
-	for _, file := range files["added"] {
-		f, ok := tarredFiles[file]
-		ctype := changeTypes[file]
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, "", f, "Expected file contents \"%s\", but found \"%s\"", "", f)
-			assert.Equal(t, "A", ctype, "Expected change type \"%s\", but found \"%s\"", "A", ctype)
-		}
-	}
-	for _, file := range append(files["changed"], files["included"]...) {
-		f, ok := tarredFiles[file]
-		ctype := changeTypes[file]
-		assert.True(t, ok, "expected to find %s in tar archive", file)
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, "", f, "expected file contents \"%s\", but found \"%s\"", "", f)
-			assert.Equal(t, "C", ctype, "expected change type \"%s\", but found \"%s\"", "C", ctype)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		_, ok := tarredFiles[wh]
-		ctype, cok := changeTypes[wh]
-		assert.True(t, ok, "Expected to find whiteout file in archive: %s", wh)
-		assert.True(t, cok, "Expected to find change type for %s", wh)
-		assert.Equal(t, "D", ctype, "Expected change type \"%s\" but found \"%s\"", "D", ctype)
-	}
-}
-
-func TestDiffFilterSpec(t *testing.T) {
-
-	op := trace.NewOperation(context.Background(), "TestDiffFilterSpec")
-
-	filter := make(map[string]FilterType)
-	for _, path := range files["excluded"] {
-		p := strings.TrimSuffix(path, "/")
-		filter[p] = Exclude
-	}
-	for _, path := range files["included"] {
-		filter[path] = Include
-	}
-
-	spec, err := CreateFilterSpec(op, filter)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarFile, err := Diff(op, newDir, oldDir, spec, true, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string][]byte)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar archive: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		if _, err := io.Copy(buf, tr); !assert.NoError(t, err) {
-			return
-		}
-		tarredFiles[hdr.Name] = buf.Bytes()
-	}
-
-	all := append(files["added"], files["included"]...)
-	for _, file := range all {
-		if file == string(filepath.Separator) {
-			continue
-		}
-		f, ok := tarredFiles[file]
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, b, f, "Expected file contents \"%s\" for %s, but found \"%s\"", b, file, f)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		_, ok := tarredFiles[wh]
-		assert.True(t, ok, "Expected to find whiteout file in archive: %s", wh)
-	}
-	for _, file := range files["excluded"] {
-		_, ok := tarredFiles[file]
-		assert.False(t, ok, "Expected excluded file to be missing from archive: %s", file)
-	}
-}
-
-func TestDiffFilterSpecNoAncestor(t *testing.T) {
-
-	op := trace.NewOperation(context.Background(), "TestDiffFilterSpecNoParent")
-
-	filter := make(map[string]FilterType)
-	for _, path := range files["excluded"] {
-		p := strings.TrimSuffix(path, "/")
-		filter[p] = Exclude
-	}
-	for _, path := range files["included"] {
-		filter[path] = Include
-	}
-
-	spec, err := CreateFilterSpec(op, filter)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// test without ancestor
-	tarFile, err := Diff(op, newDir, "", spec, true, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string][]byte)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar archive: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		if _, err := io.Copy(buf, tr); !assert.NoError(t, err) {
-			return
-		}
-		tarredFiles[hdr.Name] = buf.Bytes()
-	}
-
-	all := append(files["added"], files["included"]...)
-	for _, file := range all {
-		f, ok := tarredFiles[file]
-		if file == string(filepath.Separator) {
-			continue
-		}
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if _, ok := directories[file]; !ok {
-			assert.Equal(t, b, f, "Expected file contents \"%s\", but found \"%s\" for target file (%s)", b, f, file)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		_, ok := tarredFiles[wh]
-		assert.False(t, ok, "Expected not to find whiteout file in archive: %s", wh)
-	}
-	for _, file := range files["excluded"] {
-		_, ok := tarredFiles[file]
-		assert.False(t, ok, "Expected excluded file to be missing from archive: %s", file)
-	}
-}
-
-func TestDiffFilterSpecRebase(t *testing.T) {
-
-	op := trace.NewOperation(context.Background(), "TestDiffFilterSpecRebase")
-
-	filter := make(map[string]FilterType)
-	for _, path := range files["excluded"] {
-		filter[path] = Exclude
-	}
-	for _, path := range files["included"] {
-		filter[path] = Include
-	}
-	rebasePath := "path/to/prefix"
-	filter[rebasePath] = Rebase
-
-	spec, err := CreateFilterSpec(op, filter)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// test without ancestor
-	tarFile, err := Diff(op, newDir, oldDir, spec, true, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string][]byte)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			op.Errorf("Error reading tar archive: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		if _, err := io.Copy(buf, tr); !assert.NoError(t, err) {
-			return
-		}
-		tarredFiles[strings.TrimSuffix(hdr.Name, "/")] = buf.Bytes()
-	}
-
-	all := append(files["added"], files["included"]...)
-	for _, file := range all {
-		if file == string(filepath.Separator) {
-			continue
-		}
-
-		rebasedPath := filepath.Join(rebasePath, file)
-		var isDir bool
-		_, isDir = directories[file]
-
-		f, ok := tarredFiles[rebasedPath]
-		assert.True(t, ok, "Expected to find %s in tar archive", rebasedPath)
-		if !isDir {
-			assert.Equal(t, b, f, "Expected file contents \"%s\", but found \"%s\" for target file (%s)", b, f, rebasedPath)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		wh = filepath.Join(rebasePath, wh)
-		_, ok := tarredFiles[wh]
-		assert.True(t, ok, "Expected not to find whiteout file in archive: %s", wh)
-	}
-	for _, file := range files["excluded"] {
-		_, ok := tarredFiles[file]
-		assert.False(t, ok, "Expected excluded file to be missing from archive: %s", file)
-	}
-}
-
-func TestDiffFilterSpecRebaseNoData(t *testing.T) {
-
-	op := trace.NewOperation(context.Background(), "TestDiffFilterSpecRebase")
-
-	filter := make(map[string]FilterType)
-	for _, path := range files["excluded"] {
-		filter[path] = Exclude
-	}
-	for _, path := range files["included"] {
-		filter[path] = Include
-	}
-	rebasePath := "path/to/prefix"
-	filter[rebasePath] = Rebase
-
-	spec, err := CreateFilterSpec(op, filter)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarFile, err := Diff(op, newDir, oldDir, spec, false, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarredFiles := make(map[string]struct{})
-	changeTypes := make(map[string]string)
-	tr := tar.NewReader(tarFile)
-	for {
-		hdr, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if !assert.NoError(t, err) {
-			op.Errorf("Error reading tar header: %s", err.Error())
-		}
-
-		buf := bytes.NewBuffer([]byte{})
-		n, err := io.Copy(buf, tr)
-		if !assert.NoError(t, err) {
-			return
-		}
-		assert.EqualValues(t, 0, n, "Expected 0 bytes copied, got %d instead", n)
-		tarredFiles[strings.TrimSuffix(hdr.Name, "/")] = struct{}{}
-		changeTypes[hdr.Name] = hdr.Xattrs[ChangeTypeKey]
-	}
-
-	for _, file := range files["added"] {
-
-		rebasedPath := filepath.Join(rebasePath, file)
-		var isDir bool
-		_, isDir = directories[file]
-
-		_, ok := tarredFiles[rebasedPath]
-		ctype := changeTypes[rebasedPath]
-		assert.True(t, ok, "Expected to find %s in tar archive", file)
-
-		// don't try to check the contents if its a directory
-		if !isDir {
-			assert.Equal(t, "A", ctype, "Expected change type \"%s\", but found \"%s\"", "A", ctype)
-		}
-	}
-	for _, file := range append(files["changed"], files["included"]...) {
-
-		// don't check for excludes or whiteouts yet
-		base := filepath.Base(file)
-		if strings.HasSuffix(file, "excludeme") || strings.HasPrefix(base, ".wh.") {
-			continue
-		}
-
-		rebasedPath := filepath.Join(rebasePath, file)
-		var isDir bool
-		_, isDir = directories[file]
-		_, ok := tarredFiles[rebasedPath]
-		ctype := changeTypes[rebasedPath]
-		assert.True(t, ok, "expected to find %s in tar archive", file)
-		// don't try to check the contents if its a directory
-		if !isDir {
-			assert.Equal(t, "C", ctype, "expected change type \"%s\", but found \"%s\"", "C", ctype)
-		}
-	}
-	for _, file := range files["removed"] {
-		wh := filepath.Join(filepath.Dir(file), ".wh."+filepath.Base(file))
-		wh = filepath.Join(rebasePath, wh)
-		_, ok := tarredFiles[wh]
-		ctype, cok := changeTypes[wh]
-		assert.True(t, ok, "Expected to find whiteout file in archive: %s", wh)
-		assert.True(t, cok, "Expected to find change type for %s", wh)
-		assert.Equal(t, "D", ctype, "Expected change type \"%s\" but found \"%s\"", "D", ctype)
-	}
-
-	for _, file := range files["excluded"] {
-		_, ok := tarredFiles[file]
-		assert.False(t, ok, "Expected excluded file to be missing from archive: %s", file)
-	}
-}
-
-func TestDiffCreateFilterSpec(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "TestDiffCreateFilterSpec")
-
-	filter := make(map[string]FilterType)
-	for _, path := range files["excluded"] {
-		filter[path] = Exclude
-	}
-	for _, path := range files["included"] {
-		filter[path] = Include
-	}
-	rebasePath := "/path/to/prefix"
-	filter[rebasePath] = Rebase
-
-	stripPath := "/path/to/strip"
-	filter[stripPath] = Strip
-
-	spec, err := CreateFilterSpec(op, filter)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	for _, path := range files["included"] {
-		_, ok := spec.Inclusions[path]
-		assert.True(t, ok, "Expected to find %s in inclusions set", path)
-		_, ok = spec.Exclusions[path]
-		assert.False(t, ok, "Expected not to find %s in exclusions set", path)
-	}
-
-	for _, path := range files["excluded"] {
-		_, ok := spec.Exclusions[path]
-		assert.True(t, ok, "Expected to find %s in exclusions set", path)
-		_, ok = spec.Inclusions[path]
-		assert.False(t, ok, "Expected not to find %s in inclusions set", path)
-	}
-
-	assert.Equal(t, rebasePath, spec.RebasePath)
-	assert.Equal(t, stripPath, spec.StripPath)
-	e := "/path/to/extra/rebase"
-	filter[e] = Rebase
-
-	spec, err = CreateFilterSpec(op, filter)
-	assert.Nil(t, spec, "Expected nil spec")
-	assert.Error(t, err)
-	assert.EqualError(t, err, "error creating filter spec: only one rebase path allowed")
-
-	delete(filter, e)
-
-	s := "/path/to/extra/strippath"
-	filter[s] = Strip
-	spec, err = CreateFilterSpec(op, filter)
-	assert.Nil(t, spec, "Expected nil spec")
-	assert.Error(t, err)
-	assert.EqualError(t, err, "error creating filter spec: only one strip path allowed")
-
-	delete(filter, s)
-
-	filter[s] = 20
-	spec, err = CreateFilterSpec(op, filter)
-	assert.Nil(t, spec, "Expected nil spec")
-	assert.Error(t, err)
-	assert.EqualError(t, err, "invalid filter specification: 20")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/stripper.go b/installer/vendor/github.com/vmware/vic/lib/archive/stripper.go
deleted file mode 100644
index 2d9b14c8e6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/stripper.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"io"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Stripper strips the end-of-archive entries from a tar stream
-type Stripper struct {
-	// op allows threaded tracing
-	op trace.Operation
-
-	// be opinionated about the type of the source
-	source *tar.Reader
-
-	// close function to call if treated as io.Closer
-	closer func() error
-}
-
-// NewStripper returns a WriterTo that will strip the trailing end-of-archive bytes
-// from the supplied tar stream.
-// It implements io.Reader only so that it can be passed to io.Copy
-func NewStripper(op trace.Operation, reader *tar.Reader, close func() error) *Stripper {
-	return &Stripper{
-		op:     op,
-		source: reader,
-		closer: close,
-	}
-}
-
-// Read is implemented solely so this can be provided to io.Copy as an io.Reader.
-// This works on the assumption of io.Copy making use of the WriterTo implementation.
-func (s *Stripper) Read(b []byte) (int, error) {
-	panic("io.Reader usage not supported - intended use is as io.WriterTo")
-}
-
-// WriteTo is the primary function, allowing easy use of the underlying tar stream without
-// requiring chunking and assocated tracking to another buffer size.
-// Of note is that this returns the number of DATA bytes written, excluding the header bytes.
-func (s *Stripper) WriteTo(w io.Writer) (sum int64, err error) {
-	// TODO: should we nil s.source on error then handle a post-error call? What's the expected
-	// semantic?
-
-	tw := tar.NewWriter(w)
-	for {
-		var header *tar.Header
-		header, err = s.source.Next()
-		if err == io.EOF {
-			// do NOT call tarwriter.Close() and drop the EOF for io.Copy behaviour
-			err = nil
-			s.op.Debugf("Stripper dropping end of archive")
-			return
-		}
-
-		if err != nil {
-			s.op.Errorf("Error reading archive header: %s", err)
-			return
-		}
-
-		err = tw.WriteHeader(header)
-		if err != nil {
-			s.op.Errorf("Error writing tar header: %s", err)
-			return
-		}
-
-		var n int64
-		n, err = io.Copy(tw, s.source)
-		sum += n
-		if err != nil {
-			s.op.Errorf("Error copying file data: %s", err)
-			return
-		}
-
-		// #nosec: Errors unhandled.
-		tw.Flush()
-	}
-}
-
-// Close allows us to proxy a close on the stripper to the wrapped input
-func (s *Stripper) Close() error {
-	if s.closer != nil {
-		s.op.Debugf("Closing stripper source: %p", s)
-		return s.closer()
-	}
-
-	return nil
-}
-
-// eofReader copied from io package to support MultiWriterTo variant
-type eofReader struct{}
-
-func (eofReader) WriteTo(w io.Writer) (int64, error) {
-	return 0, io.EOF
-}
-
-func (eofReader) Read(b []byte) (int, error) {
-	return 0, io.EOF
-}
-
-func (eofReader) ReadFrom(r io.Reader) (int64, error) {
-	return 0, io.EOF
-}
-
-// multiStripper based off io.MultiReader but delegating to io.WriterTo
-// instead of performing buffer copy
-type multiReader struct {
-	readers []io.Reader
-}
-
-func (mr *multiReader) Read(p []byte) (n int, err error) {
-	panic("io.Reader usage not supported - intended use is as io.WriterTo")
-}
-
-func (mr *multiReader) WriteTo(w io.Writer) (sum int64, err error) {
-	for _, reader := range mr.readers {
-		var n int64
-
-		n, err = io.Copy(w, reader)
-		sum += n
-
-		// io.Copy never returns EOF so treat nil as EOF but keeping
-		// EOF for clarity
-		if err == io.EOF || err == nil {
-			continue
-		}
-
-		// err was non-nil/EOF and we read data - legitimate error scenario
-		if n > 0 {
-			return
-		}
-	}
-
-	err = nil
-	return
-}
-
-// Close allows this to be a Closer as well - specific to expected usage but necessary.
-func (mr *multiReader) Close() error {
-	for _, r := range mr.readers {
-		// if it's a closer, close it
-		if closer, ok := r.(io.Closer); ok {
-			// #nosec: Errors unhandled.
-			closer.Close()
-		}
-	}
-
-	return nil
-}
-
-// MultiReader is based off the io.MultiReader but will make use of WriteTo or
-// ReadFrom delegation and ONLY supports usage via the WriteTo method on itself.
-// It is specifically intended to be passed to io.Copy
-func MultiReader(readers ...io.Reader) io.ReadCloser {
-	r := make([]io.Reader, len(readers))
-	copy(r, readers)
-	return &multiReader{r}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/stripper_test.go b/installer/vendor/github.com/vmware/vic/lib/archive/stripper_test.go
deleted file mode 100644
index 0911aa7083..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/stripper_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"context"
-	"fmt"
-	"io"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-// generateArchive takes a number of files and a file size and generates a tar archive
-// based on that data. It returns:
-// index of entry names in the archive
-// archive byte stream
-func generateArchive(name string, num, size int) ([]string, io.Reader) {
-	r, w := io.Pipe()
-	tw := tar.NewWriter(w)
-
-	// stable reference for expected archive entries
-	index := make([]string, num)
-	for i := 0; i < num; i++ {
-		index[i] = string(uid.New())
-	}
-
-	// our file contents are zeros - this is the worst case for stripping trailing headers
-	zeros := make([]byte, size)
-
-	go func() {
-		for i := 0; i < num; i++ {
-			// we only really care about two things in the header
-			hdr := &tar.Header{
-				Name: index[i],
-				Size: int64(size),
-			}
-
-			fmt.Printf("Writing header for file %s:%d\n", name, i)
-			err := tw.WriteHeader(hdr)
-			if err != nil {
-				panic(err)
-			}
-
-			fmt.Printf("Writing data for file %s:%d\n", name, i)
-			n, err := tw.Write(zeros)
-			if err != nil {
-				panic(err)
-			}
-			if n != size {
-				panic(fmt.Sprintf("Failed to write all bytes: %d != %d", n, size))
-			}
-		}
-
-		// add the end-of-archive
-		tw.Close()
-		w.Close()
-	}()
-
-	return index, r
-}
-
-// TestSingleStripper ensures that basic function (stripping end-of-archive footer) works as
-// expected. I found no real way, when using the TarReader to actually assert that the footer
-// has been dropped so this is left to assert correct passthrough of archive data and the
-// dropping of the footer is asserted by the multistream cases.
-func TestSingleStripper(t *testing.T) {
-	size := 2048
-	count := 5
-	index, reader := generateArchive("single", count, size)
-
-	source := tar.NewReader(reader)
-	stripper := NewStripper(trace.NewOperation(context.Background(), "strip"), source, nil)
-
-	pr, pw := io.Pipe()
-	tr := tar.NewReader(pr)
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		n, err := io.Copy(pw, stripper)
-		pw.Close()
-
-		wg.Done()
-		fmt.Printf("Done copying from stripper: %d, %s\n", n, err)
-		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
-			t.FailNow()
-		}
-
-	}()
-
-	for i := 0; i <= len(index); i++ {
-		fmt.Printf("Reading header for file %d\n", i)
-		header, err := tr.Next()
-		if err == io.EOF {
-			fmt.Printf("End-of-file")
-			// TODO: is this pass or fail?
-			return
-		}
-
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, len(index), "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
-
-		if !assert.Equal(t, header.Name, index[i], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
-
-		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
-		buf := make([]byte, size+10)
-
-		fmt.Printf("Reading data for file %d\n", i)
-		n, err := tr.Read(buf)
-
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
-		}
-	}
-
-	wg.Wait()
-}
-
-// TestConjoinedStrippers ensures that the footer is correctly dropped from a stripped archive
-// and that a TarReader continues to provide headers from the following conjoined streams.
-func TestConjoinedStrippers(t *testing.T) {
-	size := 2048
-	count := 3
-	multiplicity := 3
-
-	indices := make([][]string, multiplicity)
-	strippers := make([]io.Reader, multiplicity)
-
-	for m := 0; m < multiplicity; m++ {
-		var reader io.Reader
-		indices[m], reader = generateArchive(fmt.Sprintf("archive-%d", m), count, size)
-		source := tar.NewReader(reader)
-		strippers[m] = NewStripper(trace.NewOperation(context.Background(), fmt.Sprintf("strip-%d", m)), source, nil)
-	}
-
-	conjoined := MultiReader(strippers...)
-
-	pr, pw := io.Pipe()
-	tr := tar.NewReader(pr)
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		n, err := io.Copy(pw, conjoined)
-		pw.Close()
-
-		wg.Done()
-		fmt.Printf("Done copying from strippers: %d, %s\n", n, err)
-		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
-			t.FailNow()
-		}
-	}()
-
-	expectedEntries := count * multiplicity
-	for i := 0; i <= expectedEntries; i++ {
-		fmt.Printf("Reading header for file %d\n", i)
-		header, err := tr.Next()
-		if err == io.EOF {
-			fmt.Printf("End-of-file\n")
-			// TODO: is this pass or fail?
-			return
-		}
-
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
-
-		member := i / count
-		entry := i % count
-
-		if !assert.Equal(t, header.Name, indices[member][entry], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
-
-		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
-		buf := make([]byte, size+10)
-
-		fmt.Printf("Reading data for file %d\n", i)
-		n, err := tr.Read(buf)
-
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
-		}
-	}
-
-	wg.Wait()
-}
-
-// TestConjoinedStrippersWithCloser ensures that we can conjoin readers, multiple strippers and a regular, in order to get
-// the end-of-archive footer as the finale. We have a wait group to ensure that all routines have finished before declaring
-// success.
-func TestConjoinedStrippersWithCloser(t *testing.T) {
-	size := 2048
-	count := 3
-	multiplicity := 3
-
-	indices := make([][]string, multiplicity)
-	readers := make([]io.Reader, multiplicity)
-
-	for m := 0; m < multiplicity; m++ {
-		var reader io.Reader
-		indices[m], reader = generateArchive(fmt.Sprintf("archive-%d", m), count, size)
-		source := tar.NewReader(reader)
-
-		if m < multiplicity-1 {
-			fmt.Printf("added stripper\n")
-			readers[m] = NewStripper(trace.NewOperation(context.Background(), fmt.Sprintf("strip-%d", m)), source, nil)
-		} else {
-			fmt.Printf("added raw\n")
-			readers[m] = reader
-		}
-	}
-
-	conjoined := MultiReader(readers...)
-
-	pr, pw := io.Pipe()
-	tr := tar.NewReader(pr)
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		n, err := io.Copy(pw, conjoined)
-		pw.Close()
-
-		wg.Done()
-		fmt.Printf("Done copying from all sources: %d, %s\n", n, err)
-		if !assert.NoError(t, err, "Expected nil error from io.Copy on end-of-file") {
-			t.FailNow()
-		}
-	}()
-
-	expectedEntries := count * multiplicity
-	for i := 0; i <= expectedEntries; i++ {
-		fmt.Printf("Reading header for file %d\n", i)
-		header, err := tr.Next()
-		if err == io.EOF {
-			fmt.Printf("End-of-file\n")
-
-			wg.Wait()
-			return
-		}
-
-		if err != nil {
-			fmt.Printf("Error from archive: %s\n", err)
-			t.FailNow()
-		}
-
-		if !assert.NotEqual(t, i, expectedEntries, "Expected EOF after index exhausted") {
-			t.FailNow()
-		}
-
-		member := i / count
-		entry := i % count
-
-		if !assert.Equal(t, header.Name, indices[member][entry], "Expected header name to match index") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, header.Size, int64(size), "Expected file size in header to match target generated size") {
-			t.FailNow()
-		}
-
-		// make the buf just that little bit bigger to allow for errrors in the copy if they would occur
-		buf := make([]byte, size+10)
-
-		fmt.Printf("Reading data for file %d\n", i)
-		n, err := tr.Read(buf)
-
-		if !assert.NoError(t, err, "No expected errors from file data copy") {
-			t.FailNow()
-		}
-		if !assert.Equal(t, n, size, "Expected file data size to match target generated size") {
-			t.FailNow()
-		}
-	}
-
-	wg.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/unpack.go b/installer/vendor/github.com/vmware/vic/lib/archive/unpack.go
deleted file mode 100644
index 6b051857f2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/unpack.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"fmt"
-	"io"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	// fileWriteFlags is a collection of flags configuring our writes for general tar behavior
-	//
-	// O_CREATE = Create file if it does not exist
-	// O_TRUNC = truncate file to 0 length if it does exist(overwrite the file)
-	// O_WRONLY = We use this since we do not intend to read, we only need to write.
-	fileWriteFlags = os.O_CREATE | os.O_TRUNC | os.O_WRONLY
-)
-
-// unpack will unpack the given tarstream(if it is a tar stream) on the local filesystem based on the specified root
-// combined with any rebase from the path spec
-//
-// the pathSpec will include the following elements
-// - include : any tar entry that has a path below(after stripping) the include path will be written
-// - strip : The strip string will indicate the
-// - exlude : marks paths that are to be excluded from the write operation
-// - rebase : marks the the write path that will be tacked onto the "root". e.g /tmp/unpack + /my/target/path = /tmp/unpack/my/target/path
-func Unpack(op trace.Operation, tarStream io.Reader, filter *FilterSpec, root string) error {
-	op.Debugf("unpacking archive to root: %s, filter: %+v", root, filter)
-
-	// Online datasource is sending a tar reader instead of an io reader.
-	// Type check here to see if we actually need to create a tar reader.
-	var tr *tar.Reader
-	if trCheck, ok := tarStream.(*tar.Reader); ok {
-		tr = trCheck
-	} else {
-		tr = tar.NewReader(tarStream)
-	}
-
-	fi, err := os.Stat(root)
-	if err != nil {
-		// the target unpack path does not exist. We should not get here.
-		op.Errorf("tar unpack target does not exist: %s", root)
-		return err
-	}
-
-	if !fi.IsDir() {
-		err := fmt.Errorf("unpack root target is not a directory: %s", root)
-		op.Error(err)
-		return err
-	}
-
-	op.Debugf("using FilterSpec : (%#v)", *filter)
-	// process the tarball onto the filesystem
-	for {
-		header, err := tr.Next()
-		if err == io.EOF {
-			// This indicates the end of the archive
-			break
-		}
-
-		if err != nil {
-			op.Errorf("Error reading tar header: %s", err)
-			return err
-		}
-
-		op.Debugf("processing tar header: asset(%s), size(%d)", header.Name, header.Size)
-		// skip excluded elements unless explicitly included
-		if filter.Excludes(op, header.Name) {
-			continue
-		}
-
-		// fix up path
-		stripped := strings.TrimPrefix(header.Name, filter.StripPath)
-		rebased := filepath.Join(filter.RebasePath, stripped)
-		absPath := filepath.Join(root, rebased)
-
-		switch header.Typeflag {
-		case tar.TypeDir:
-			err = os.MkdirAll(absPath, header.FileInfo().Mode())
-			if err != nil {
-				op.Errorf("Failed to create directory%s: %s", absPath, err)
-				return err
-			}
-		case tar.TypeSymlink:
-			err := os.Symlink(header.Linkname, absPath)
-			if err != nil {
-				op.Errorf("Failed to create symlink %s->%s: %s", absPath, header.Linkname, err)
-				return err
-			}
-		case tar.TypeReg:
-			f, err := os.OpenFile(absPath, fileWriteFlags, header.FileInfo().Mode())
-			if err != nil {
-				op.Errorf("Failed to open file %s: %s", absPath, err)
-				return err
-			}
-			_, err = io.Copy(f, tr)
-			// TODO: add ctx.Done cancellation
-			f.Close()
-			if err != nil {
-				return err
-			}
-		default:
-			// TODO: add support for special file types - otherwise we will do absurd things such as read infinitely from /dev/random
-		}
-		op.Debugf("Finished writing to: %s", absPath)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/unpack_test.go b/installer/vendor/github.com/vmware/vic/lib/archive/unpack_test.go
deleted file mode 100644
index 160955a474..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/unpack_test.go
+++ /dev/null
@@ -1,1084 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"archive/tar"
-	"bytes"
-	"context"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-var (
-	// L1 directories
-	path1dir1 = "/path1dir1"
-	path2dir1 = "/path2dir1"
-
-	// l1 files
-	l1file1 = "/file1"
-	l1file2 = "/file2"
-
-	// l2 directories
-	path1dir2 = filepath.Join(path1dir1, "path1dir2")
-	path1dir3 = filepath.Join(path1dir1, "path1dir3")
-	path2dir2 = filepath.Join(path2dir1, "path2dir2")
-	path2dir3 = filepath.Join(path2dir1, "path2dir3")
-
-	// l2 files
-	l2file1 = filepath.Join(path1dir1, "file1")
-	l2file2 = filepath.Join(path1dir1, "file2")
-	l2file3 = filepath.Join(path2dir1, "file1")
-	l2file4 = filepath.Join(path2dir1, "file2")
-
-	// l3 directories
-	path1dir4 = filepath.Join(path1dir3, "path1dir4")
-
-	// l3 files
-	l3file1 = filepath.Join(path1dir3, "file1")
-	l3file2 = filepath.Join(path2dir2, "file1")
-)
-
-func TestInvalidStream(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	// assemble an invalid stream
-	var invalidBuffer *bytes.Buffer
-	invalidBuffer = bytes.NewBufferString("I am not a tar stream, I am just a simple string.")
-	tarStream := bytes.NewReader(invalidBuffer.Bytes())
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	// just in case this test fails and attempts to write to the filesystem
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.Error(t, err) {
-		return
-	}
-
-	validEmptyBuffer := bytes.NewBufferString("")
-	tarStream = bytes.NewReader(validEmptyBuffer.Bytes())
-
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-}
-
-func TestSimpleWrite(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-			op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-		}
-
-		// In this test every file should have been written to the filesystem
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestSimpleWriteSymLink(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	writetarget := "/"
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	filesToWrite := prepareTarFileSlice()
-
-	symLinks := []TarFile{}
-	// assemble standard file symlink
-	symlinkName := filepath.Join(path1dir1, "link1")
-	symlinkBody := filepath.Join("../", l1file1)
-	symLink := TarFile{
-		Name: symlinkName,
-		Type: tar.TypeSymlink,
-		Body: symlinkBody,
-	}
-	symLinks = append(symLinks, symLink)
-
-	// assemble broken symlink
-	brokenlinkName := filepath.Join(path1dir1, "BrokenSymLink")
-	brokenlinkBody := filepath.Join("../DOES_NOT_EXIST")
-	brokenLink := TarFile{
-		Name: brokenlinkName,
-		Type: tar.TypeSymlink,
-		Body: brokenlinkBody,
-	}
-	symLinks = append(symLinks, brokenLink)
-
-	dirlinkName := filepath.Join(path1dir1, "DirSymLink")
-	dirlinkBody := filepath.Join("../", path1dir1)
-	dirLink := TarFile{
-		Name: dirlinkName,
-		Type: tar.TypeSymlink,
-		Body: dirlinkBody,
-	}
-	symLinks = append(symLinks, dirLink)
-	op.Infof("Assembled list of test symlinks : (%s)", symLinks)
-	filesToWrite = append(filesToWrite, symLinks...)
-
-	tarBytes, err := TarFiles(filesToWrite)
-	if !assert.NoError(t, err) {
-		return
-	}
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	op.Infof("%s", tempPath)
-
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// expect file not found for broken links, assemble list.
-	NotExist := map[string]struct{}{
-		brokenlinkName: {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-			if _, ok := NotExist[file.Name]; ok && os.IsNotExist(err) {
-				// we expect and EOF only for the broken links in this test
-				continue
-			}
-			op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-		}
-
-		// In this test every file should have been written to the filesystem
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestSimpleWriteSymLinkNonRootTarget(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	writetarget := "/nonRootPath"
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	filesToWrite := prepareTarFileSlice()
-
-	symLinks := []TarFile{}
-	// assemble standard file symlink
-	symlinkName := filepath.Join(path1dir1, "link1")
-	symlinkBody := filepath.Join("../", l1file1)
-	symLink := TarFile{
-		Name: symlinkName,
-		Type: tar.TypeSymlink,
-		Body: symlinkBody,
-	}
-	symLinks = append(symLinks, symLink)
-
-	// assemble broken symlink
-	brokenlinkName := filepath.Join(path1dir1, "BrokenSymLink")
-	brokenlinkBody := filepath.Join("../DOES_NOT_EXIST")
-	brokenLink := TarFile{
-		Name: brokenlinkName,
-		Type: tar.TypeSymlink,
-		Body: brokenlinkBody,
-	}
-	symLinks = append(symLinks, brokenLink)
-
-	dirlinkName := filepath.Join(path1dir1, "DirSymLink")
-	dirlinkBody := filepath.Join("../", path1dir1)
-	dirLink := TarFile{
-		Name: dirlinkName,
-		Type: tar.TypeSymlink,
-		Body: dirlinkBody,
-	}
-	symLinks = append(symLinks, dirLink)
-	op.Infof("Assembled list of test symlinks : (%s)", symLinks)
-	filesToWrite = append(filesToWrite, symLinks...)
-
-	tarBytes, err := TarFiles(filesToWrite)
-	if !assert.NoError(t, err) {
-		return
-	}
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	op.Infof("%s", tempPath)
-
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// expect file not found for broken links, assemble list.
-	NotExist := map[string]struct{}{
-		brokenlinkName: {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-
-		// it is important to note for this test that the behavior of os.Stat
-		// is to report the type of the target of a symlink. unless the link is broken.
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-			if _, ok := NotExist[file.Name]; ok && os.IsNotExist(err) {
-				// we expect and EOF only for the broken links in this test
-				continue
-			}
-			op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-		}
-
-		// In this test every file should have been written to the filesystem
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestSimpleWriteNonRootTarget(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	writetarget := "/data/target"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-			op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-		}
-
-		// In this test every file should have been written to the filesystem
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestSimpleExclusion(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir1,
-	}
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-		path2dir1: {},
-		path2dir2: {},
-		path2dir3: {},
-		l2file3:   {},
-		l2file4:   {},
-		l3file2:   {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestInclusionAfterExclusion(t *testing.T) {
-	t.Skip("skipping until filterspec stabilizes and this is updated to reflect final form")
-
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir1,
-	}
-
-	inclusions := []string{
-		l3file2,
-	}
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	for _, v := range inclusions {
-		specMap[v] = Include
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-		path2dir1: {},
-		path2dir3: {},
-		l2file3:   {},
-		l2file4:   {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestMultiExclusion(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir2,
-		path1dir3,
-	}
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-
-		// first exclusion
-		path2dir2: {},
-		l3file2:   {},
-
-		// second exclusion
-		path1dir3: {},
-		path1dir4: {},
-		l3file1:   {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestMultiExclusionMultiInclusion(t *testing.T) {
-	t.Skip("skipping until filterspec stabilizes and this is updated to reflect final form")
-
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir2,
-		path1dir3,
-	}
-
-	inclusions := []string{
-		l3file1,
-		l3file2,
-	}
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	for _, v := range inclusions {
-		specMap[v] = Include
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-		path1dir4: {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestMultiExclusionMultiInclusionDirectories(t *testing.T) {
-	t.Skip("skipping until filterspec stabilizes and this is updated to reflect final form")
-
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir1,
-		path1dir1,
-	}
-
-	inclusions := []string{
-		path1dir3,
-		path2dir2,
-	}
-
-	writetarget := "/"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	for _, v := range inclusions {
-		specMap[v] = Include
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-		// expected directory exclusions
-		path1dir1: {},
-		path1dir2: {},
-		path2dir1: {},
-		path2dir3: {},
-
-		// expected file exclusions
-		l2file1: {},
-		l2file2: {},
-		l2file3: {},
-		l2file4: {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func TestMultiExclusionMultiInclusionDirectoriesNonRootTarget(t *testing.T) {
-	t.Skip("skipping until filterspec stabilizes and this is updated to reflect final form")
-
-	op := trace.NewOperation(context.TODO(), "")
-
-	filesToWrite := prepareTarFileSlice()
-	tarBytes, err := TarFiles(filesToWrite)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	tarStream := ioutil.NopCloser(tarBytes)
-
-	tempPath, err := ioutil.TempDir("", "write-unit-test")
-	defer os.RemoveAll(tempPath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	op.Infof("%s", tempPath)
-
-	exclusions := []string{
-		path2dir1,
-		path1dir1,
-	}
-
-	inclusions := []string{
-		path1dir3,
-		path2dir2,
-	}
-
-	writetarget := "/data/target"
-	specMap := make(map[string]FilterType)
-	specMap[writetarget] = Rebase
-
-	for _, v := range exclusions {
-		specMap[v] = Exclude
-	}
-
-	for _, v := range inclusions {
-		specMap[v] = Include
-	}
-
-	filterSpec, err := CreateFilterSpec(op, specMap)
-	if !assert.NoError(t, err) {
-		return
-	}
-	err = Unpack(op, tarStream, filterSpec, tempPath)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// record the expected excluded items for checking.
-	expectedExcluded := map[string]struct{}{
-		// expected directory exclusions
-		path1dir1: {},
-		path1dir2: {},
-		path2dir1: {},
-		path2dir3: {},
-
-		// expected file exclusions
-		l2file1: {},
-		l2file2: {},
-		l2file3: {},
-		l2file4: {},
-	}
-
-	for _, file := range filesToWrite {
-		pathToFile := filepath.Join(tempPath, writetarget, file.Name)
-		_, err = os.Stat(pathToFile)
-
-		if err != nil {
-
-			if os.IsNotExist(err) {
-				if _, ok := expectedExcluded[file.Name]; ok {
-					err = nil
-				} else {
-					// we did not want to exclude this but it was
-				}
-			} else {
-
-				// some other path error occurred, record it for test purposes
-				op.Infof("error for (%s) is (%s) ", file.Name, err.Error())
-			}
-
-		}
-
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-}
-
-func prepareTarFileSlice() []TarFile {
-
-	defaultTestFileBody := "There is not a single vacant room throughout the entire infinite hotel."
-
-	// Tree structure of the test file structure.
-	// .
-	// ├── file1
-	// ├── file2
-	// ├── path1dir1
-	// │   ├── file1
-	// │   ├── file2
-	// │   ├── path1dir2
-	// │   └── path1dir3
-	// │       ├── file1
-	// │       └── path1dir4
-	// └── path2dir1
-	//     ├── file1
-	//     ├── file2
-	//     ├── path2dir2
-	//     │   └── file1
-	//     └── path2dir3
-
-	// This is an assembled default file structure to imitate an incoming tar stream
-	filesToWrite := []TarFile{
-		// level 1 directories
-		{
-			Name: path1dir1,
-			Type: tar.TypeDir,
-		},
-		{
-			Name: path2dir1,
-			Type: tar.TypeDir,
-		},
-		// level 1 files
-		{
-			Name: l1file1,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-		{
-			Name: l1file2,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-
-		// Level 2 directories
-		{
-			Name: path1dir2,
-			Type: tar.TypeDir,
-		},
-		{
-			Name: path1dir3,
-			Type: tar.TypeDir,
-		},
-		{
-			Name: path2dir2,
-			Type: tar.TypeDir,
-		},
-		{
-			Name: path2dir3,
-			Type: tar.TypeDir,
-		},
-
-		// level 2 files
-		{
-			Name: l2file1,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-		{
-			Name: l2file2,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-		{
-			Name: l2file3,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-		{
-			Name: l2file4,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-
-		// level 3 directories
-		{
-			Name: path1dir4,
-			Type: tar.TypeDir,
-		},
-
-		// level 3 files
-		{
-			Name: l3file1,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-		{
-			Name: l3file2,
-			Type: tar.TypeReg,
-			Body: defaultTestFileBody,
-		},
-	}
-
-	return filesToWrite
-}
-
-// Below are some structs and utility functions for unit testing the untar functionality
-
-type TarFile struct {
-	Name string
-	Type byte
-	Body string
-}
-
-func TarFiles(files []TarFile) (*bytes.Buffer, error) {
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new tar archive.
-	tw := tar.NewWriter(buf)
-
-	// Write data to the tar as if it came from the hub
-	for _, file := range files {
-
-		var hdr *tar.Header
-
-		switch file.Type {
-		case tar.TypeDir:
-			hdr = &tar.Header{
-				Name:     file.Name,
-				Mode:     0777,
-				Typeflag: file.Type,
-				Size:     0,
-			}
-		case tar.TypeSymlink:
-			hdr = &tar.Header{
-				Name:     file.Name,
-				Mode:     0777,
-				Typeflag: file.Type,
-				Size:     0,
-				Linkname: file.Body,
-			}
-		default:
-			hdr = &tar.Header{
-				Name:     file.Name,
-				Mode:     0777,
-				Typeflag: file.Type,
-				Size:     int64(len(file.Body)),
-			}
-		}
-
-		if err := tw.WriteHeader(hdr); err != nil {
-			return nil, err
-		}
-
-		if file.Type == tar.TypeDir || file.Type == tar.TypeSymlink {
-			continue
-		}
-
-		if _, err := tw.Write([]byte(file.Body)); err != nil {
-			return nil, err
-		}
-	}
-
-	// Make sure to check the error on Close.
-	if err := tw.Close(); err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/util.go b/installer/vendor/github.com/vmware/vic/lib/archive/util.go
deleted file mode 100644
index b73d15ea7e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/util.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"fmt"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	// CopyTo is used to indicate that the desired filter spec is for a CopyTo direction
-	CopyTo = true
-
-	// CopyFrom is used to indicate that the desired filter spec is for the CopyFrom direction
-	CopyFrom = false
-)
-
-// GenerateFilterSpec will populate the appropriate relative Rebase and Strip paths based on the supplied scenarios.
-// Inclusion/Exclusion should be constructed separately. Please also note that any mount that exists before the copy
-// target that is not primary and comes before the primary target will have a bogus filterspec, since it would not be
-// written or read to.
-func GenerateFilterSpec(copyPath string, mountPoint string, primaryTarget bool, direction bool) FilterSpec {
-	var filter FilterSpec
-
-	// NOTE: this solidifies that this function is very heavily designed for docker cp behavior.
-	// which is why this should mainly only be used by the docker personality
-	// scrub trailing '/' before passing copyPath along and create a Clean fs path
-	copyPath = strings.TrimSuffix(copyPath, "/")
-
-	// Note I know they are just booleans, if that changes then this statement will not need to.
-	if direction == CopyTo {
-		filter = generateCopyToFilterSpec(copyPath, mountPoint, primaryTarget)
-	} else {
-		filter = generateCopyFromFilterSpec(copyPath, mountPoint, primaryTarget)
-	}
-
-	filter.Exclusions = make(map[string]struct{})
-	filter.Inclusions = make(map[string]struct{})
-	return filter
-}
-
-func generateCopyFromFilterSpec(copyPath string, mountPoint string, primaryTarget bool) FilterSpec {
-	var filter FilterSpec
-
-	// If the copyPath ends with '/.', we don't want the content's directory name
-	// to be included in the resulting tar header. we do this by removing the directory
-	// portion of the rebase path.
-	// if the copyPath does not end with '/.', we only need the right most element of copyPath.
-	first := filepath.Base(copyPath)
-	if first == "." {
-		first = ""
-		copyPath = Clean(copyPath, false)
-	}
-
-	// primary target was provided so we wil need to split the target and take the right most element for the rebase.
-	// then strip set the strip as the target path.
-	if primaryTarget {
-		filter.RebasePath = Clean(first, true)
-		filter.StripPath = Clean(strings.TrimPrefix(copyPath, mountPoint), true)
-		return filter
-	}
-
-	// non primary target was provided. in this case we will need rebase to include the right most member of the target(or "/") joined to the front of the mountPath - the target path. 3
-	filter.RebasePath = Clean(filepath.Join(first, strings.TrimPrefix(mountPoint, copyPath)), true)
-	filter.StripPath = ""
-	return filter
-}
-
-func generateCopyToFilterSpec(copyPath string, mountPoint string, primaryTarget bool) FilterSpec {
-	var filter FilterSpec
-
-	// primary target was provided so we will need to rebase header assets for this mount to have the target in front for the write.
-	if primaryTarget {
-		filter.RebasePath = Clean(strings.TrimPrefix(copyPath, mountPoint), true)
-		filter.StripPath = ""
-		return filter
-	}
-
-	// non primary target, this implies that the asset header has part of the mount point path in it. We must strip out that part since the non primary target will be mounted and be looking at the world from it's own root "/"
-	filter.RebasePath = ""
-	filter.StripPath = Clean(strings.TrimPrefix(mountPoint, copyPath), true)
-
-	return filter
-}
-
-func AddMountInclusionsExclusions(currentMount string, filter *FilterSpec, mounts []string, copyTarget string) error {
-	if filter == nil {
-		return fmt.Errorf("filterSpec for (%s) was nil, cannot add exclusions or inclusions", currentMount)
-	}
-
-	if filter.Exclusions == nil || filter.Inclusions == nil {
-		return fmt.Errorf("either the inclusions or exclusions map was nil for (%s)", currentMount)
-	}
-
-	if strings.HasPrefix(copyTarget, currentMount) && copyTarget != currentMount {
-
-		inclusion := Clean(strings.TrimPrefix(copyTarget, currentMount), true)
-
-		if filepath.Base(copyTarget) == "." {
-			inclusion += "/"
-		}
-
-		filter.Inclusions[inclusion] = struct{}{}
-		filter.Exclusions[""] = struct{}{}
-	} else {
-		// this would be a mount that is after the target. It would mean we have to include root. then exclude any mounts after root.
-		filter.Inclusions[""] = struct{}{}
-	}
-
-	for _, mount := range mounts {
-		if strings.HasPrefix(mount, currentMount) && currentMount != mount {
-			// exclusions are relative to the mount so the leading `/` should be removed unless we decide otherwise.
-			exclusion := Clean(strings.TrimPrefix(mount, currentMount), true) + "/"
-			filter.Exclusions[exclusion] = struct{}{}
-		}
-	}
-	return nil
-}
-
-// Clean run filepath.Clean on the target and will remove leading
-// and trailing slashes from the target path corresponding to supplied booleans
-func Clean(path string, leading bool) string {
-	path = filepath.Clean(path)
-	// path returns '.' if the result of the Clean was an empty string.
-	if path == "." {
-		return ""
-	}
-
-	if leading {
-		path = strings.TrimPrefix(path, "/")
-	}
-
-	return path
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/archive/util_test.go b/installer/vendor/github.com/vmware/vic/lib/archive/util_test.go
deleted file mode 100644
index 747fd92294..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/archive/util_test.go
+++ /dev/null
@@ -1,1094 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package archive
-
-import (
-	"fmt"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// COPY TO TESTS
-
-func TestComplexWriteSpec(t *testing.T) {
-	copyTarget := "/mnt/vols"
-	direction := CopyTo
-
-	mounts := []testMount{
-
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/B",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A/subvols/AB",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "mnt/vols",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "",
-			StripPath:  "A",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/B": {
-			RebasePath: "",
-			StripPath:  "B",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A/subvols/AB": {
-			RebasePath: "",
-			StripPath:  "A/subvols/AB",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestWriteIntoMountSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A/a/path"
-	direction := CopyTo
-
-	mounts := []testMount{
-		// "/" will exist but since it is past the write path we do not care about the filterspec. It will be filled out as a non primary target in any case. and is a non primary target that comes before the primary target.
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		// not a valid spec since this is past the copy target. The filterspec will be completely bogus. The generateFilterSpec function assumes you have given it a target that lives along the CopyTarget. In our case here we have "/" as the mount point and the target as "/mnt/vols/A/a/path"
-		"/": {
-			RebasePath: "",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "a/path",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestWriteFileIntoMountSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A/a/path/file.txt"
-	direction := CopyTo
-
-	mounts := []testMount{
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/mnt/vols/A": {
-			RebasePath: "a/path/file.txt",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestWriteFilespec(t *testing.T) {
-	copyTarget := "/path/file.txt"
-	direction := CopyTo
-
-	mounts := []testMount{
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "path/file.txt",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-// COPY FROM TESTS
-
-func TestComplexReadOfRootSpec(t *testing.T) {
-	copyTarget := "/"
-	direction := CopyFrom
-
-	mounts := []testMount{
-
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/B",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A/subvols/AB",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "mnt/vols/A",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/B": {
-			RebasePath: "mnt/vols/B",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A/subvols/AB": {
-			RebasePath: "mnt/vols/A/subvols/AB",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestComplexReadSpec(t *testing.T) {
-	copyTarget := "/mnt/vols"
-	direction := CopyFrom
-
-	mounts := []testMount{
-
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/B",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A/subvols/AB",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "vols",
-			StripPath:  "mnt/vols",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "vols/A",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/B": {
-			RebasePath: "vols/B",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A/subvols/AB": {
-			RebasePath: "vols/A/subvols/AB",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadDirectorySlashdot(t *testing.T) {
-	copyTarget := "/mnt/vols/."
-	direction := CopyFrom
-
-	mounts := []testMount{
-
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "",
-			StripPath:  "mnt/vols",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "A",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestComplexReadWithEndingSlashSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/"
-	direction := CopyFrom
-
-	mounts := []testMount{
-
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/B",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-		{
-			mount:              "/mnt/vols/A/subvols/AB",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: false,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "vols",
-			StripPath:  "mnt/vols",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A": {
-			RebasePath: "vols/A",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/B": {
-			RebasePath: "vols/B",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-		"/mnt/vols/A/subvols/AB": {
-			RebasePath: "vols/A/subvols/AB",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadIntoMountSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A/a/path"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/mnt/vols/A": {
-			RebasePath: "path",
-			StripPath:  "a/path",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadLevelOneDirpec(t *testing.T) {
-	copyTarget := "/mnt/"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "mnt",
-			StripPath:  "mnt",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadLevelOneNoTrailingSlash(t *testing.T) {
-	copyTarget := "/mnt"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/": {
-			RebasePath: "mnt",
-			StripPath:  "mnt",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadFileSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A/a/path/file.txt"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		// "/" will exist but since it is past the write path we do not care about the filterspec. It will be filled out as a non primary target in any case.
-		{
-			mount:              "/",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		// not since this is past the copy target the filterspec will be completely bogus. The generateFilterSpec function assumes you have given it a target that lives along the CopyTarget. In our case here we have "/" as the mount point and the target as "/mnt/vols/A/a/path"
-		"/": {
-			RebasePath: "file.txt",
-			StripPath:  "mnt/vols/A/a/path/file.txt",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadFileInMountSpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A/a/path/file.txt"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/mnt/vols/A": {
-			RebasePath: "file.txt",
-			StripPath:  "a/path/file.txt",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-func TestReadAtMountBoundarySpec(t *testing.T) {
-	copyTarget := "/mnt/vols/A"
-	direction := CopyFrom
-
-	mounts := []testMount{
-		{
-			mount:              "/mnt/vols/A",
-			CopyTarget:         copyTarget,
-			primaryMountTarget: true,
-			direction:          direction,
-		},
-	}
-
-	expectedFilterSpecs := map[string]FilterSpec{
-		"/mnt/vols/A": {
-			RebasePath: "A",
-			StripPath:  "",
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		},
-	}
-
-	assertStripRebase(t, mounts, expectedFilterSpecs)
-
-}
-
-// ADD INCLUSIONS/EXCLUSIONS TESTS
-
-func TestAddExclusionsNonNested(t *testing.T) {
-	copyTarget := "/mnt"
-	testMounts := []string{
-		"/",
-		"/mnt/A",
-		"/mnt/B",
-		"/mnt/C",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/": {
-			Exclusions: map[string]struct{}{
-				"":       {},
-				"mnt/A/": {},
-				"mnt/B/": {},
-				"mnt/C/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"mnt": {},
-			},
-		},
-		"/mnt/A": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/B": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/C": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		for k := range expectedResults[mount].Inclusions {
-			_, ok := spec.Inclusions[k]
-
-			if !assert.True(t, ok, "did not find expected entry (%s) in inclusions map for mount (%s). ", k, mount) {
-				return
-			}
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s", path, mount) {
-				return
-			}
-
-		}
-
-	}
-
-}
-
-func TestAddExclusionsTrailingSlash(t *testing.T) {
-	copyTarget := "/mnt/"
-	testMounts := []string{
-		"/",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/": {
-			Exclusions: map[string]struct{}{
-				"": {},
-			},
-			Inclusions: map[string]struct{}{
-				"mnt": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		for k := range expectedResults[mount].Inclusions {
-			_, ok := spec.Inclusions[k]
-
-			if !assert.True(t, ok, "did not find expected entry (%s) in inclusions map for mount (%s). ", k, mount) {
-				return
-			}
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s", path, mount) {
-				return
-			}
-
-		}
-
-	}
-
-}
-
-func TestAddExclusionsTrailingSlashdot(t *testing.T) {
-	copyTarget := "/mnt/."
-	testMounts := []string{
-		"/",
-		"/mnt/A",
-		"/mnt/B",
-		"/mnt/C",
-		"/mnt/A/dir/AB",
-		"/mnt/A/dir/AC",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/": {
-			Exclusions: map[string]struct{}{
-				"":              {},
-				"mnt/A/":        {},
-				"mnt/B/":        {},
-				"mnt/C/":        {},
-				"mnt/A/dir/AB/": {},
-				"mnt/A/dir/AC/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"mnt/": {},
-			},
-		},
-		"/mnt/A": {
-			Exclusions: map[string]struct{}{
-				"dir/AB/": {},
-				"dir/AC/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/B": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/C": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/A/dir/AB": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/A/dir/AC": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			fmt.Printf("Expected exclusions: %+v, actual: %+v", expectedSpec.Exclusions, spec.Exclusions)
-			return
-		}
-
-		expectedSpec = expectedResults[mount]
-		expectedLength = len(expectedSpec.Inclusions)
-		actualLength = len(spec.Inclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the inclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			fmt.Printf("Expected inclusions: %+v, actual: %+v", expectedSpec.Inclusions, spec.Inclusions)
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s \n exclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-		for path := range expectedSpec.Inclusions {
-			_, ok := spec.Inclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the inclusion map for %s \n inclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-	}
-
-}
-
-func TestAddExclusionsNestedMounts(t *testing.T) {
-	copyTarget := "/mnt"
-	testMounts := []string{
-		"/",
-		"/mnt/A",
-		"/mnt/B",
-		"/mnt/C",
-		"/mnt/A/dir/AB",
-		"/mnt/A/dir/AC",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/": {
-			Exclusions: map[string]struct{}{
-				"":              {},
-				"mnt/A/":        {},
-				"mnt/B/":        {},
-				"mnt/C/":        {},
-				"mnt/A/dir/AB/": {},
-				"mnt/A/dir/AC/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"mnt": {},
-			},
-		},
-		"/mnt/A": {
-			Exclusions: map[string]struct{}{
-				"dir/AB/": {},
-				"dir/AC/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/B": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/C": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/A/dir/AB": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/A/dir/AC": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		expectedSpec = expectedResults[mount]
-		expectedLength = len(expectedSpec.Inclusions)
-		actualLength = len(spec.Inclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the inclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s \n exclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-		for path := range expectedSpec.Inclusions {
-			_, ok := spec.Inclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the inclusion map for %s \n inclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-	}
-
-}
-
-func TestAddExclusionsMountTarget(t *testing.T) {
-	copyTarget := "/mnt/vols/A"
-	testMounts := []string{
-		"/",
-		"/mnt/vols/A",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/mnt/vols/A": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-
-		if mount == "/" {
-			continue
-		}
-
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		expectedSpec = expectedResults[mount]
-		expectedLength = len(expectedSpec.Inclusions)
-		actualLength = len(spec.Inclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the inclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s \n exclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-		for path := range expectedSpec.Inclusions {
-			_, ok := spec.Inclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the inclusion map for %s \n inclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-	}
-
-}
-
-func TestAddExclusionsRootTarget(t *testing.T) {
-	copyTarget := "/"
-	testMounts := []string{
-		"/",
-		"/mnt/vols/A",
-	}
-
-	expectedResults := map[string]FilterSpec{
-		"/": {
-			Exclusions: map[string]struct{}{
-				"mnt/vols/A/": {},
-			},
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-		"/mnt/vols/A": {
-			Exclusions: make(map[string]struct{}),
-			Inclusions: map[string]struct{}{
-				"": {},
-			},
-		},
-	}
-
-	for _, mount := range testMounts {
-
-		if mount == "/" {
-			continue
-		}
-
-		spec := FilterSpec{
-			Exclusions: make(map[string]struct{}),
-			Inclusions: make(map[string]struct{}),
-		}
-
-		err := AddMountInclusionsExclusions(mount, &spec, testMounts, copyTarget)
-
-		if !assert.Nil(t, err) {
-			return
-		}
-
-		expectedSpec := expectedResults[mount]
-		expectedLength := len(expectedSpec.Exclusions)
-		actualLength := len(spec.Exclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the exclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		expectedSpec = expectedResults[mount]
-		expectedLength = len(expectedSpec.Inclusions)
-		actualLength = len(spec.Inclusions)
-		if !assert.Equal(t, expectedLength, actualLength, "there were %d entries instead of %d for the inclusions generated for mount (%s)", actualLength, expectedLength, mount) {
-			return
-		}
-
-		for path := range expectedSpec.Exclusions {
-			_, ok := spec.Exclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the exclusion map for %s \n exclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-
-		for path := range expectedSpec.Inclusions {
-			_, ok := spec.Inclusions[path]
-
-			if !assert.True(t, ok, "Should have found (%s) in the inclusion map for %s \n inclusion map: %s", path, mount, spec.Exclusions) {
-				return
-			}
-
-		}
-	}
-
-}
-
-// test utility functions and structs
-
-type testMount struct {
-	mount              string
-	CopyTarget         string
-	primaryMountTarget bool
-	direction          bool
-}
-
-func assertStripRebase(t *testing.T, mounts []testMount, expectedFilterSpecs map[string]FilterSpec) {
-	for _, v := range mounts {
-		actualFilterSpec := GenerateFilterSpec(v.CopyTarget, v.mount, v.primaryMountTarget, v.direction)
-		expectedFilterSpec := expectedFilterSpecs[v.mount]
-
-		if !assert.Equal(t, expectedFilterSpec.RebasePath, actualFilterSpec.RebasePath, "rebase path check failed (%s)", v.mount) {
-			return
-		}
-
-		if !assert.Equal(t, expectedFilterSpec.StripPath, actualFilterSpec.StripPath, "strip path check failed (%s)", v.mount) {
-			return
-		}
-
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source.go b/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source.go
deleted file mode 100644
index cabbc57b99..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source.go
+++ /dev/null
@@ -1,491 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package admiral
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"net"
-	"net/http"
-	"net/url"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/go-openapi/runtime"
-	rtclient "github.com/go-openapi/runtime/client"
-	strfmt "github.com/go-openapi/strfmt"
-	"github.com/mitchellh/mapstructure"
-	"github.com/pkg/errors"
-
-	"github.com/vmware/govmomi/vim25/types"
-	vchcfg "github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/dynamic"
-	"github.com/vmware/vic/lib/config/dynamic/admiral/client"
-	"github.com/vmware/vic/lib/config/dynamic/admiral/client/config_registries"
-	"github.com/vmware/vic/lib/config/dynamic/admiral/client/projects"
-	"github.com/vmware/vic/lib/config/dynamic/admiral/client/resources_compute"
-	"github.com/vmware/vic/lib/config/dynamic/admiral/models"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tags"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	VicProductCategory = "VsphereIntegratedContainers"
-	ProductVMTag       = "ProductVM"
-	admiralEndpointKey = "guestinfo.vicova.admiral.endpoint"
-
-	clusterFilter = "(address eq '%s' and customProperties.__containerHostType eq 'VCH')"
-)
-
-// #nosec
-const admiralTokenKey = "guestinfo.vicova.engine.token"
-
-var (
-	trueStr        = "true"
-	projectsFilter = "customProperties.__enableContentTrust eq 'true'"
-
-	// #nosec
-	admClient = &http.Client{
-		Transport: // copied from http.DefaultTransport
-		&http.Transport{
-			Proxy: http.ProxyFromEnvironment,
-			DialContext: (&net.Dialer{
-				Timeout:   30 * time.Second,
-				KeepAlive: 30 * time.Second,
-				DualStack: true,
-			}).DialContext,
-			MaxIdleConns:          100,
-			IdleConnTimeout:       90 * time.Second,
-			TLSHandshakeTimeout:   10 * time.Second,
-			ExpectContinueTimeout: 1 * time.Second,
-			TLSClientConfig:       &tls.Config{InsecureSkipVerify: true},
-		},
-	}
-)
-
-// NewSource creates a new Admiral dynamic config source. sess
-// is a valid vsphere session object. vchID is a unique identifier
-// that will be used to lookup the VCH in the Admiral instance; currently
-// this is a URI to the docker endpoint in the VCH.
-func NewSource(sess *session.Session, vchID string) dynamic.Source {
-	return &source{
-		d:     DefaultDiscovery,
-		sess:  sess,
-		vchID: vchID,
-	}
-}
-
-var DefaultDiscovery = &productDiscovery{
-	clients: make(map[string]*tags.RestClient),
-}
-
-type source struct {
-	mu      sync.Mutex
-	d       discovery
-	sess    *session.Session
-	vchID   string
-	lastCfg *vchcfg.VirtualContainerHostConfigSpec
-
-	// the discovered product VM
-	v *vm.VirtualMachine
-	// cached values to minimize running discovery
-	projs []string
-	c     *client.Admiral
-}
-
-// Get returns the dynamic config portion from an Admiral instance. For now,
-// this is empty pending details from the Admiral team.
-func (a *source) Get(ctx context.Context) (*vchcfg.VirtualContainerHostConfigSpec, error) {
-	a.mu.Lock()
-	lastCfg := a.lastCfg
-	a.mu.Unlock()
-
-	c, projs, err := a.discover(ctx)
-	if err != nil {
-		log.Warnf("could not locate management portal, returning last known config: %s", err)
-		return lastCfg, nil
-	}
-
-	if len(projs) == 0 {
-		return nil, nil
-	}
-
-	wl, err := a.whitelist(ctx, c, projs)
-	if err != nil {
-		log.Warnf("could not get whitelist from management portal, returning last known config: %s")
-		return lastCfg, nil
-	}
-
-	log.Debugf("got whitelist: %+v", wl)
-
-	newCfg := &vchcfg.VirtualContainerHostConfigSpec{
-		Registry: vchcfg.Registry{RegistryWhitelist: wl},
-	}
-
-	a.mu.Lock()
-	defer a.mu.Unlock()
-
-	err = nil
-	if !a.diff(newCfg) {
-		err = dynamic.ErrConfigNotModified
-	}
-
-	a.lastCfg = newCfg
-	return newCfg, err
-}
-
-func (a *source) diff(newCfg *vchcfg.VirtualContainerHostConfigSpec) bool {
-	if a.lastCfg == nil {
-		if newCfg == nil {
-			return false
-		}
-
-		return true
-	}
-
-	if newCfg == nil {
-		return true
-	}
-
-	// compare whitelists
-	if len(a.lastCfg.RegistryWhitelist) != len(newCfg.RegistryWhitelist) {
-		return true
-	}
-
-	for _, w1 := range a.lastCfg.RegistryWhitelist {
-		found := false
-		for _, w2 := range newCfg.RegistryWhitelist {
-			if w2 == w1 {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (a *source) discover(ctx context.Context) (*client.Admiral, []string, error) {
-	a.mu.Lock()
-	c := a.c
-	v := a.v
-	a.mu.Unlock()
-
-	var vms []*vm.VirtualMachine
-	removed := true
-	if c != nil {
-		projs, err := a.projects(ctx, c)
-		if err != nil {
-			log.Debugf("could not get projects: %s", err)
-			vms = append(vms, v)
-			removed = false
-		} else if len(projs) > 0 {
-			return c, projs, nil
-		}
-	}
-
-	a.mu.Lock()
-	defer a.mu.Unlock()
-
-	if c != a.c && a.c != nil {
-		return a.c, a.projs, nil
-	}
-
-	var err error
-	// if there isn't a list of potential product VMs
-	// already, then run discovery
-	if removed {
-		log.Infof("running product VM discovery")
-		vms, err = a.d.Discover(ctx, a.sess)
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	for _, v := range vms {
-		u, token, err := admiralEndpoint(ctx, v)
-		if err != nil {
-			log.Warnf("ignoring potential product VM %s: %s", v, err)
-			continue
-		}
-
-		rt := rtclient.NewWithClient(u.Host, u.Path, []string{u.Scheme}, admClient)
-		rt.DefaultAuthentication = &admiralAuth{token: token}
-		c := client.New(rt, strfmt.Default)
-		projs, err := a.projects(ctx, c)
-		if err == nil && len(projs) > 0 {
-			log.Infof("using Admiral endpoint at %s", u)
-			a.c = c
-			a.projs = projs
-			a.v = v
-			return c, projs, nil
-		}
-
-		log.Warnf("ignoring product VM Admiral endpoint %s since it does not have the VCH added to any project", u)
-	}
-
-	if removed {
-		a.c = nil
-		a.v = nil
-		a.projs = nil
-		err = nil
-	} else {
-		// only return source unavailable if
-		// the VCH was not removed from the
-		// Admiral instance
-		err = dynamic.ErrSourceUnavailable
-	}
-
-	return nil, nil, err
-}
-
-func admiralEndpoint(ctx context.Context, v *vm.VirtualMachine) (*url.URL, string, error) {
-	values, err := keys(ctx, v, []string{admiralEndpointKey, admiralTokenKey})
-	if err != nil {
-		return nil, "", err
-	}
-
-	token := values[admiralTokenKey]
-	if token == "" {
-		// not a useable product installation
-		return nil, "", fmt.Errorf("empty token set in product VM %s", v)
-	}
-
-	u, err := url.Parse(values[admiralEndpointKey])
-	if err != nil {
-		return nil, "", fmt.Errorf("bad admiral endpoint %s in product VM %s: %s", values[admiralEndpointKey], v, err)
-	}
-
-	return u, token, nil
-}
-
-type admiralAuth struct {
-	token string
-}
-
-func (a *admiralAuth) AuthenticateRequest(req runtime.ClientRequest, _ strfmt.Registry) error {
-	return req.SetHeaderParam("x-xenon-auth-token", a.token)
-}
-
-func (a *source) projects(ctx context.Context, c *client.Admiral) ([]string, error) {
-	ids := []string{a.vchID}
-	if u, err := url.Parse(a.vchID); err == nil {
-		if u.Scheme == "" {
-			ids = append(ids, "https://"+a.vchID)
-		} else {
-			ids = append(ids, strings.TrimPrefix(a.vchID, u.Scheme+"://"))
-		}
-	}
-
-	var err error
-	var comps *resources_compute.GetResourcesComputeOK
-	for _, vchID := range ids {
-		filter := fmt.Sprintf(clusterFilter, vchID)
-		log.Debugf("getting compute resources with filter %s", filter)
-		comps, err = c.ResourcesCompute.GetResourcesCompute(resources_compute.NewGetResourcesComputeParamsWithContext(ctx).WithDollarFilter(&filter))
-		if err == nil && comps.Payload.DocumentCount > 0 {
-			break
-		}
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	if comps.Payload.DocumentCount == 0 {
-		return nil, nil
-	}
-
-	// more than one project has the VCH added, just pick the first one
-	comp := &models.ComVmwarePhotonControllerModelResourcesComputeServiceComputeState{}
-	if err := mapstructure.Decode(comps.Payload.Documents[comps.Payload.DocumentLinks[0]], comp); err != nil {
-		return nil, err
-	}
-
-	return comp.TenantLinks, nil
-}
-
-func (a *source) whitelist(ctx context.Context, c *client.Admiral, hostProjs []string) ([]string, error) {
-	// find at least one project with enable content trust
-	// that also contains the vch
-	projs, err := c.Projects.GetProjects(projects.NewGetProjectsParamsWithContext(ctx).WithDollarFilter(&projectsFilter))
-	if err != nil {
-		return nil, err
-	}
-
-	trust := false
-	for _, t := range hostProjs {
-		for _, p := range projs.Payload.DocumentLinks {
-			if t == p {
-				trust = true
-				break
-			}
-		}
-
-		if trust {
-			break
-		}
-	}
-
-	if !trust {
-		// no project with enable content trust and vch
-		return nil, nil
-	}
-
-	regs, err := c.ConfigRegistries.GetConfigRegistries(config_registries.NewGetConfigRegistriesParamsWithContext(ctx).WithExpand(&trueStr))
-	if err != nil {
-		return nil, err
-	}
-
-	var wl []string
-	for _, r := range regs.Payload.Documents {
-		m := &models.ComVmwareAdmiralServiceCommonRegistryServiceRegistryState{}
-		if err := mapstructure.Decode(r, m); err != nil {
-			log.Warnf("skipping registry: %s", err)
-			continue
-		}
-
-		wl = append(wl, m.Address)
-	}
-
-	return wl, nil
-}
-
-type discovery interface {
-	Discover(ctx context.Context, sess *session.Session) ([]*vm.VirtualMachine, error)
-}
-
-type productDiscovery struct {
-	mu      sync.Mutex
-	clients map[string]*tags.RestClient
-}
-
-func (o *productDiscovery) Discover(ctx context.Context, sess *session.Session) ([]*vm.VirtualMachine, error) {
-	service, err := url.Parse(sess.Service)
-	if err != nil {
-		return nil, err
-	}
-
-	service.User = sess.User
-
-	o.mu.Lock()
-	t := o.clients[service.String()]
-	if t == nil {
-		t = tags.NewClient(service, sess.Insecure, sess.Thumbprint)
-		o.clients[service.String()] = t
-	}
-	o.mu.Unlock()
-
-	var tag string
-	tag, err = findOVATag(ctx, t)
-	if err != nil {
-		err = errors.Errorf("could not find ova tag: %s", err)
-		return nil, err
-	}
-
-	objs, err := t.ListAttachedObjects(ctx, tag)
-	if err != nil || len(objs) == 0 {
-		err = errors.Errorf("could not find ova vm: %s", err)
-		return nil, err
-	}
-
-	var vms []*vm.VirtualMachine
-	for _, o := range objs {
-		if o.Type == nil || o.ID == nil {
-			log.Warnf("skipping invalid object reference %+v", o)
-			continue
-		}
-
-		if *o.Type != "VirtualMachine" {
-			// not a virtual machine
-			continue
-		}
-
-		v := vm.NewVirtualMachine(ctx, sess, types.ManagedObjectReference{Type: *o.Type, Value: *o.ID})
-		st, err := v.PowerState(ctx)
-		if err != nil {
-			log.Warnf("ignoring potential product VM: %s", err)
-			continue
-		}
-
-		if st != types.VirtualMachinePowerStatePoweredOn {
-			log.Warnf("ignoring potential product VM %s: not powered on", *o.ID)
-			continue
-		}
-
-		vms = append(vms, v)
-	}
-
-	return vms, nil
-}
-
-func findOVATag(ctx context.Context, t *tags.RestClient) (string, error) {
-	cats, err := t.GetCategoriesByName(ctx, VicProductCategory)
-	if err != nil {
-		return "", err
-	}
-
-	// just use the first one
-	if len(cats) == 0 {
-		return "", errors.New("could not find tag")
-	}
-
-	cat := cats[0]
-	tags, err := t.GetTagByNameForCategory(ctx, ProductVMTag, cat.ID)
-	if err != nil {
-		return "", err
-	}
-
-	if len(tags) == 0 {
-		return "", errors.New("could not find tag")
-	}
-
-	return tags[0].ID, nil
-}
-
-func keys(ctx context.Context, v *vm.VirtualMachine, keys []string) (map[string]string, error) {
-	ovs, err := v.FetchExtraConfigBaseOptions(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	res := make(map[string]string)
-	for _, k := range keys {
-		found := false
-		for _, ov := range ovs {
-			log.Debugf("key: %s", ov.GetOptionValue().Key)
-			if k == ov.GetOptionValue().Key {
-				log.Debugf("found %s", ov.GetOptionValue().Key)
-				res[k] = ov.GetOptionValue().Value.(string)
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			return nil, errors.Errorf("key not found: %s", k)
-		}
-	}
-
-	return res, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source_test.go b/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source_test.go
deleted file mode 100644
index 7f46d031bd..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/source_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package admiral
-
-import (
-	"context"
-	"flag"
-	"net/url"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-var (
-	target     *string
-	user       *string
-	password   *string
-	thumbprint *string
-	vchID      *string
-)
-
-func init() {
-	thumbprint = flag.String("thumbprint", "", "ESX/VC thumbprint")
-	target = flag.String("target", "", "ESX/VC target")
-	user = flag.String("user", "root", "ESX/VC username")
-	password = flag.String("password", "", "ESX/VC password")
-	vchID = flag.String("vch", "", "VCH docker endpoint")
-}
-
-func TestMain(m *testing.M) {
-	os.Exit(m.Run())
-}
-
-func TestGetConfig(t *testing.T) {
-	if target == nil || *target == "" {
-		t.SkipNow()
-	}
-
-	log.SetLevel(log.DebugLevel)
-	sess := session.NewSession(&session.Config{
-		Service:    *target,
-		User:       url.UserPassword(*user, *password),
-		Insecure:   true,
-		Thumbprint: *thumbprint,
-	})
-
-	ctx := context.Background()
-	sess.Connect(ctx)
-
-	src := NewSource(sess, *vchID)
-	cfg, err := src.Get(ctx)
-	if err != nil {
-		log.Errorf("error: %s", err)
-		os.Exit(1)
-	}
-
-	log.Infof("%+v", cfg)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/swagger.json b/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/swagger.json
deleted file mode 100644
index 44702ce1b1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/admiral/swagger.json
+++ /dev/null
@@ -1,33976 +0,0 @@
-{
-  "swagger" : "2.0",
-  "info" : {
-    "version" : "0.0.1",
-    "title" : "Container Management"
-  },
-  "host" : "10.152.8.48:8285",
-  "basePath" : "/",
-  "tags" : [ {
-    "name" : "/counter-subtasks"
-  }, {
-    "name" : "/request/reservation-removal-tasks"
-  }, {
-    "name" : "/request/composition-sub-tasks"
-  }, {
-    "name" : "/provisioning/load-balancer-tasks"
-  }, {
-    "name" : "/request/load-balancer-provision-tasks"
-  }, {
-    "name" : "/resources/closure-descriptions"
-  }, {
-    "name" : "/request/reservation-tasks"
-  }, {
-    "name" : "/resources/container-volumes"
-  }, {
-    "name" : "/resources/tags"
-  }, {
-    "name" : "/request/endpoint-healthcheck-tasks"
-  }, {
-    "name" : "/templates"
-  }, {
-    "name" : "/resources/disks"
-  }, {
-    "name" : "/provisioning/security-group-tasks"
-  }, {
-    "name" : "/config/auth-bootstrap"
-  }, {
-    "name" : "/request/load-balancer-allocation-tasks"
-  }, {
-    "name" : "/monitoring/stats-aggregation"
-  }, {
-    "name" : "/request/container-ports-allocation-tasks"
-  }, {
-    "name" : "/provisioning/endpoint-removal-tasks"
-  }, {
-    "name" : "/delete-tasks"
-  }, {
-    "name" : "/resources/images"
-  }, {
-    "name" : "/config/trusted-certificates"
-  }, {
-    "name" : "/request/compute-network-removal-tasks"
-  }, {
-    "name" : "/request/provision-container-volume-tasks"
-  }, {
-    "name" : "/resources/elastic-placement-zones-config"
-  }, {
-    "name" : "/resources/composite-descriptions-clone"
-  }, {
-    "name" : "/request/provision-container-network-tasks"
-  }, {
-    "name" : "/resources/kubernetes-templates"
-  }, {
-    "name" : "/core/authz/roles"
-  }, {
-    "name" : "/resources/network-interfaces-descriptions"
-  }, {
-    "name" : "/requests"
-  }, {
-    "name" : "/resources/kubernetes-pods"
-  }, {
-    "name" : "/resources/load-balancer-descriptions"
-  }, {
-    "name" : "/request/clustering-task"
-  }, {
-    "name" : "/request/placement-tasks"
-  }, {
-    "name" : "/config/props"
-  }, {
-    "name" : "/request/compute-provision-tasks"
-  }, {
-    "name" : "/config/storage-profiles"
-  }, {
-    "name" : "/extensibility-callbacks"
-  }, {
-    "name" : "/resources/compute-descriptions"
-  }, {
-    "name" : "/resources/containers"
-  }, {
-    "name" : "/provisioning/snapshot-tasks"
-  }, {
-    "name" : "/resources/hosts"
-  }, {
-    "name" : "/resources/hosts-data-collections"
-  }, {
-    "name" : "/monitoring/in-memory-metrics"
-  }, {
-    "name" : "/request/container-network-allocation-tasks"
-  }, {
-    "name" : "/request/container-volume-removal-tasks"
-  }, {
-    "name" : "/request/allocation-tasks"
-  }, {
-    "name" : "/adapters/docker-service/operations"
-  }, {
-    "name" : "/request/compute-network-allocation-tasks"
-  }, {
-    "name" : "/resources/elastic-placement-zones"
-  }, {
-    "name" : "/provisioning/resource-enumeration-tasks"
-  }, {
-    "name" : "/request/provision-compute-network-tasks"
-  }, {
-    "name" : "/resources/compute-network-cidr-allocations"
-  }, {
-    "name" : "/resources/composite-components"
-  }, {
-    "name" : "/request/container-network-removal-tasks"
-  }, {
-    "name" : "/request/resource-removal-operations"
-  }, {
-    "name" : "/resources/container-volume-descriptions"
-  }, {
-    "name" : "/resources/deployment-policies"
-  }, {
-    "name" : "/provisioning/sub-network-tasks"
-  }, {
-    "name" : "/monitoring/stats-collection-resource-tasks"
-  }, {
-    "name" : "/config/event-topic"
-  }, {
-    "name" : "/resources/kubernetes-replica-sets"
-  }, {
-    "name" : "/core/local-query-tasks"
-  }, {
-    "name" : "/config/photon-model-adapters-registry"
-  }, {
-    "name" : "/config/image-profiles"
-  }, {
-    "name" : "/request/composition-removal-kubernetes-tasks"
-  }, {
-    "name" : "/resources/firewalls"
-  }, {
-    "name" : "/core/graph-queries"
-  }, {
-    "name" : "/config/instance-types"
-  }, {
-    "name" : "/resources/event-logs"
-  }, {
-    "name" : "/resources/composite-templates"
-  }, {
-    "name" : "/core/tenants"
-  }, {
-    "name" : "/extensibility-subscriptions"
-  }, {
-    "name" : "/resources/kubernetes-deployments"
-  }, {
-    "name" : "/resources/security-groups"
-  }, {
-    "name" : "/resources/snapshots"
-  }, {
-    "name" : "/monitoring/single-resource-stats-aggregation"
-  }, {
-    "name" : "/request/closures-run"
-  }, {
-    "name" : "/resources/groups"
-  }, {
-    "name" : "/request/reservation-allocation-tasks"
-  }, {
-    "name" : "/provisioning/ssh-command-tasks"
-  }, {
-    "name" : "/resources/epz-compute-enumeration-tasks"
-  }, {
-    "name" : "/logs"
-  }, {
-    "name" : "/request/compute-allocation-tasks"
-  }, {
-    "name" : "/projects"
-  }, {
-    "name" : "/request/provision-closure-tasks"
-  }, {
-    "name" : "/core/authz/user-groups"
-  }, {
-    "name" : "/config/trust-certs-import"
-  }, {
-    "name" : "/resources/endpoints"
-  }, {
-    "name" : "/provisioning/resource-allocation-tasks"
-  }, {
-    "name" : "/resources/closures"
-  }, {
-    "name" : "/images"
-  }, {
-    "name" : "/request/container-redeployment-tasks"
-  }, {
-    "name" : "/resources/sub-networks"
-  }, {
-    "name" : "/request/provision-composite-kubernetes-tasks"
-  }, {
-    "name" : "/resources/container-control-loop"
-  }, {
-    "name" : "/resources/group-placements"
-  }, {
-    "name" : "/resources/kubernetes-replication-controllers"
-  }, {
-    "name" : "/resources/host-kubernetes-entity-data-collection"
-  }, {
-    "name" : "/auth/idm/local/principals"
-  }, {
-    "name" : "/request/container-volume-allocation-tasks"
-  }, {
-    "name" : "/resources/pools"
-  }, {
-    "name" : "/monitoring/stats-collection-tasks"
-  }, {
-    "name" : "/provisioning/endpoint-tasks"
-  }, {
-    "name" : "/resources/storage-descriptions"
-  }, {
-    "name" : "/core/auth/credentials"
-  }, {
-    "name" : "/config/ca-credentials"
-  }, {
-    "name" : "/request/closure-removal-tasks"
-  }, {
-    "name" : "/provisioning/network-allocation-tasks"
-  }, {
-    "name" : "/provisioning/image-enumeration-tasks"
-  }, {
-    "name" : "/config/trust-certs"
-  }, {
-    "name" : "/core/authz/users"
-  }, {
-    "name" : "/request/resource-prefix-tasks"
-  }, {
-    "name" : "/request/composition-removal-tasks"
-  }, {
-    "name" : "/provisioning/scheduled-tasks"
-  }, {
-    "name" : "/config/profiles"
-  }, {
-    "name" : "/config/registries"
-  }, {
-    "name" : "/request/composition-tasks"
-  }, {
-    "name" : "/resources/container-logs"
-  }, {
-    "name" : "/resources/kubernetes-services"
-  }, {
-    "name" : "/resources/host-port-profiles"
-  }, {
-    "name" : "/monitoring/resource-metrics"
-  }, {
-    "name" : "/request/compute-removal-operations"
-  }, {
-    "name" : "/core/loader"
-  }, {
-    "name" : "/resources/container-network-descriptions"
-  }, {
-    "name" : "/request/compute-placement-tasks"
-  }, {
-    "name" : "/config/resource-operation"
-  }, {
-    "name" : "/resources/kubernetes-descriptions"
-  }, {
-    "name" : "/request/closure-allocation-tasks"
-  }, {
-    "name" : "/core/synch-tasks"
-  }, {
-    "name" : "/resources/compute"
-  }, {
-    "name" : "/config/network-profiles"
-  }, {
-    "name" : "/resources/host-volume-list-data-collection"
-  }, {
-    "name" : "/resources/resource-descriptions"
-  }, {
-    "name" : "/request/provision-compute-container-hosts-tasks"
-  }, {
-    "name" : "/resources/networks"
-  }, {
-    "name" : "/management/migration-tasks"
-  }, {
-    "name" : "/resources/container-stats"
-  }, {
-    "name" : "/request-status"
-  }, {
-    "name" : "/request/compute-resource-operations"
-  }, {
-    "name" : "/resources/container-descriptions"
-  }, {
-    "name" : "/resources/placement-update-tasks"
-  }, {
-    "name" : "/request/resource-operations"
-  }, {
-    "name" : "/resources/name-prefixes"
-  }, {
-    "name" : "/tasks/sub-tasks"
-  }, {
-    "name" : "/core/query-tasks"
-  }, {
-    "name" : "/resources/closure-images"
-  }, {
-    "name" : "/provisioning/resource-removal-tasks"
-  }, {
-    "name" : "/resources/host-network-list-data-collection"
-  }, {
-    "name" : "/resources/host-container-list-data-collection"
-  }, {
-    "name" : "/request/configure-host"
-  }, {
-    "name" : "/request/load-balancer-removal-tasks"
-  }, {
-    "name" : "/resources/kubernetes-pod-logs"
-  }, {
-    "name" : "/config/compute-profiles"
-  }, {
-    "name" : "/resources/composite-descriptions"
-  }, {
-    "name" : "/request/host-removal-operations"
-  }, {
-    "name" : "/resources/container-networks"
-  }, {
-    "name" : "/core/authz/resource-groups"
-  }, {
-    "name" : "/resources/network-interfaces"
-  }, {
-    "name" : "/request/compute-reservation-tasks"
-  }, {
-    "name" : "/resources/compute-networks"
-  }, {
-    "name" : "/images/tags"
-  }, {
-    "name" : "/provisioning/compute-tasks"
-  }, {
-    "name" : "/config/healthcheck"
-  }, {
-    "name" : "/resources/load-balancers"
-  }, {
-    "name" : "/popular-images"
-  }, {
-    "name" : "/config/migration"
-  }, {
-    "name" : "/resources/compute-network-descriptions"
-  } ],
-  "schemes" : [ ],
-  "consumes" : [ "application/json" ],
-  "produces" : [ "application/json" ],
-  "paths" : {
-    "/adapters/docker-service/operations" : {
-      "get" : {
-        "tags" : [ "/adapters/docker-service/operations" ],
-        "description" : "Get list containing docker Day 2 operation types.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:lang:String[]"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/auth/idm/local/principals" : {
-      "get" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-            }
-          }
-        }
-      }
-    },
-    "/auth/idm/local/principals/{id}" : {
-      "get" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/auth/idm/local/principals" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/auth-bootstrap" : {
-      "get" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          }
-        }
-      }
-    },
-    "/config/auth-bootstrap/{id}" : {
-      "get" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/auth-bootstrap" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/ca-credentials" : {
-      "get" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          }
-        }
-      }
-    },
-    "/config/ca-credentials/{id}" : {
-      "get" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/ca-credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/compute-profiles" : {
-      "get" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-            }
-          }
-        }
-      }
-    },
-    "/config/compute-profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/compute-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/event-topic" : {
-      "get" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-            }
-          }
-        }
-      }
-    },
-    "/config/event-topic/{id}" : {
-      "get" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/event-topic" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:EventTopicState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/healthcheck" : {
-      "get" : {
-        "tags" : [ "/config/healthcheck" ],
-        "description" : "Do health check of services in default node group if they are available and ready for replication.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success"
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/healthcheck" ],
-        "description" : "Register services for health check.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:NodeHealthCheckService"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/config/image-profiles" : {
-      "get" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-            }
-          }
-        }
-      }
-    },
-    "/config/image-profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/image-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/instance-types" : {
-      "get" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-            }
-          }
-        }
-      }
-    },
-    "/config/instance-types/{id}" : {
-      "get" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/instance-types" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/migration" : {
-      "get" : {
-        "tags" : [ "/config/migration" ],
-        "description" : "Do migration of documents from another xenon node.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:NodeMigrationService:MigrationRequest"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/migration" ],
-        "description" : "Add services for migration from another xenon node.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:NodeMigrationService"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/config/network-profiles" : {
-      "get" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-            }
-          }
-        }
-      }
-    },
-    "/config/network-profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/network-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/photon-model-adapters-registry" : {
-      "get" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-            }
-          }
-        }
-      }
-    },
-    "/config/photon-model-adapters-registry/{id}" : {
-      "get" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/photon-model-adapters-registry" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/profiles" : {
-      "get" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-            }
-          }
-        }
-      }
-    },
-    "/config/profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:ProfileService:ProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/props" : {
-      "get" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-            }
-          }
-        }
-      }
-    },
-    "/config/props/{id}" : {
-      "get" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/props" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ConfigurationService:ConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/registries" : {
-      "get" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-            }
-          }
-        }
-      }
-    },
-    "/config/registries/{id}" : {
-      "get" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/registries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:RegistryService:RegistryState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/resource-operation" : {
-      "get" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-            }
-          }
-        }
-      }
-    },
-    "/config/resource-operation/{id}" : {
-      "get" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/resource-operation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/storage-profiles" : {
-      "get" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-            }
-          }
-        }
-      }
-    },
-    "/config/storage-profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/storage-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/trust-certs" : {
-      "get" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          }
-        }
-      }
-    },
-    "/config/trust-certs-import" : {
-      "put" : {
-        "tags" : [ "/config/trust-certs-import" ],
-        "description" : "Import certificate from an URI. When the certificate is downloaded and validated successfully the response is empty with status code 204. If the certificate is not validated, the response body contains the certificate with status code 200.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/config/trust-certs/{id}" : {
-      "get" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/trust-certs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/config/trusted-certificates" : {
-      "get" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          }
-        }
-      }
-    },
-    "/config/trusted-certificates/{id}" : {
-      "get" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/config/trusted-certificates" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/auth/credentials" : {
-      "get" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-            }
-          }
-        }
-      }
-    },
-    "/core/auth/credentials/{id}" : {
-      "get" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/auth/credentials" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/authz/resource-groups" : {
-      "get" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-            }
-          }
-        }
-      }
-    },
-    "/core/authz/resource-groups/{id}" : {
-      "get" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/authz/resource-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/authz/roles" : {
-      "get" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-            }
-          }
-        }
-      }
-    },
-    "/core/authz/roles/{id}" : {
-      "get" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/authz/roles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:RoleService:RoleState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/authz/user-groups" : {
-      "get" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-            }
-          }
-        }
-      }
-    },
-    "/core/authz/user-groups/{id}" : {
-      "get" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/authz/user-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserGroupService:UserGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/authz/users" : {
-      "get" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-            }
-          }
-        }
-      }
-    },
-    "/core/authz/users/{id}" : {
-      "get" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/authz/users" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:UserService:UserState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/graph-queries" : {
-      "get" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-            }
-          }
-        }
-      }
-    },
-    "/core/graph-queries/{id}" : {
-      "get" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/graph-queries" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:GraphQueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/loader" : {
-      "get" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-            }
-          }
-        }
-      }
-    },
-    "/core/loader/{id}" : {
-      "get" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/loader" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:LoaderService:LoaderServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/local-query-tasks" : {
-      "get" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          }
-        }
-      }
-    },
-    "/core/local-query-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/local-query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/query-tasks" : {
-      "get" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          }
-        }
-      }
-    },
-    "/core/query-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/query-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/synch-tasks" : {
-      "get" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-            }
-          }
-        }
-      }
-    },
-    "/core/synch-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/synch-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:SynchronizationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/core/tenants" : {
-      "get" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-            }
-          }
-        }
-      }
-    },
-    "/core/tenants/{id}" : {
-      "get" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/core/tenants" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:TenantService:TenantState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/counter-subtasks" : {
-      "get" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/counter-subtasks/{id}" : {
-      "get" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/counter-subtasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/delete-tasks" : {
-      "get" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/delete-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/delete-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/extensibility-callbacks" : {
-      "get" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-            }
-          }
-        }
-      }
-    },
-    "/extensibility-callbacks/{id}" : {
-      "get" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/extensibility-callbacks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/extensibility-subscriptions" : {
-      "get" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-            }
-          }
-        }
-      }
-    },
-    "/extensibility-subscriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/extensibility-subscriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/images" : {
-      "get" : {
-        "tags" : [ "/images" ],
-        "description" : "Search for images. Specify the name of the resource you are searching for with URI query with key \"q\".",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:adapter:registry:service:RegistrySearchResponse"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/images/tags" : {
-      "get" : {
-        "tags" : [ "/images/tags" ],
-        "description" : "Search for tags for given image. Specify the name of the resource you are searching for with URI query with key \"q\".",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:lang:String"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/logs" : {
-      "get" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          }
-        }
-      }
-    },
-    "/logs/{id}" : {
-      "get" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/management/migration-tasks" : {
-      "get" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-            }
-          }
-        }
-      }
-    },
-    "/management/migration-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/management/migration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:services:common:MigrationTaskService:State"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/in-memory-metrics" : {
-      "get" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/in-memory-metrics/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/in-memory-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/resource-metrics" : {
-      "get" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/resource-metrics/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/resource-metrics" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/single-resource-stats-aggregation" : {
-      "get" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/single-resource-stats-aggregation/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/single-resource-stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/stats-aggregation" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/stats-aggregation/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/stats-aggregation" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/stats-collection-resource-tasks" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/stats-collection-resource-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/stats-collection-resource-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/monitoring/stats-collection-tasks" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/monitoring/stats-collection-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/monitoring/stats-collection-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/popular-images" : {
-      "get" : {
-        "tags" : [ "/popular-images" ],
-        "description" : "Get predefined set of popular images, common for all tenants.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:lang:String"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/projects" : {
-      "get" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-            }
-          }
-        }
-      }
-    },
-    "/projects/{id}" : {
-      "get" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/projects" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:auth:project:ProjectService:ProjectState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/compute-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/compute-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/compute-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/endpoint-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/endpoint-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/endpoint-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/endpoint-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/endpoint-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/endpoint-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/image-enumeration-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/image-enumeration-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/image-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/load-balancer-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/load-balancer-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/load-balancer-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/network-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/network-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/resource-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/resource-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/resource-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/resource-enumeration-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/resource-enumeration-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/resource-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/resource-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/resource-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/resource-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/scheduled-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/scheduled-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/scheduled-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/security-group-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/security-group-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/security-group-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/snapshot-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/snapshot-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/snapshot-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/ssh-command-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/ssh-command-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/ssh-command-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/provisioning/sub-network-tasks" : {
-      "get" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/provisioning/sub-network-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/provisioning/sub-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request-status" : {
-      "get" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-            }
-          }
-        }
-      }
-    },
-    "/request-status/{id}" : {
-      "get" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request-status" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestStatusService:RequestStatus"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/closure-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/closure-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/closure-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/closure-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/closure-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/closure-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/closures-run" : {
-      "get" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/closures-run/{id}" : {
-      "get" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/closures-run" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/clustering-task" : {
-      "get" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/clustering-task/{id}" : {
-      "get" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/clustering-task" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/composition-removal-kubernetes-tasks" : {
-      "get" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/composition-removal-kubernetes-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/composition-removal-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/composition-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/composition-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/composition-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/composition-sub-tasks" : {
-      "get" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/composition-sub-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/composition-sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/composition-tasks" : {
-      "get" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/composition-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/composition-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-network-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-network-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-network-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-network-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-placement-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-placement-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-provision-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-provision-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-removal-operations" : {
-      "get" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-removal-operations/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-reservation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-reservation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/compute-resource-operations" : {
-      "get" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/compute-resource-operations/{id}" : {
-      "get" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/compute-resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/configure-host" : {
-      "get" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-            }
-          }
-        }
-      }
-    },
-    "/request/configure-host/{id}" : {
-      "get" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/configure-host" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-network-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-network-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-network-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-network-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-network-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-network-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-ports-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-ports-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-ports-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-redeployment-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-redeployment-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-redeployment-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-volume-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-volume-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-volume-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/container-volume-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/container-volume-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/container-volume-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/endpoint-healthcheck-tasks" : {
-      "get" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/endpoint-healthcheck-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/endpoint-healthcheck-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/host-removal-operations" : {
-      "get" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/host-removal-operations/{id}" : {
-      "get" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/host-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/load-balancer-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/load-balancer-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/load-balancer-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/load-balancer-provision-tasks" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/load-balancer-provision-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/load-balancer-provision-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/load-balancer-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/load-balancer-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/load-balancer-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/placement-tasks" : {
-      "get" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/placement-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/placement-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-closure-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-closure-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-closure-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-composite-kubernetes-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-composite-kubernetes-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-composite-kubernetes-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-compute-container-hosts-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-compute-container-hosts-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-compute-container-hosts-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-compute-network-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-compute-network-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-compute-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-container-network-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-container-network-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-container-network-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/provision-container-volume-tasks" : {
-      "get" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/provision-container-volume-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/provision-container-volume-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/reservation-allocation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/reservation-allocation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/reservation-allocation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/reservation-removal-tasks" : {
-      "get" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/reservation-removal-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/reservation-removal-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/reservation-tasks" : {
-      "get" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/reservation-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/reservation-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ReservationTaskService:ReservationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/resource-operations" : {
-      "get" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/resource-operations/{id}" : {
-      "get" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/resource-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/resource-prefix-tasks" : {
-      "get" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/resource-prefix-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/resource-prefix-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/request/resource-removal-operations" : {
-      "get" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/request/resource-removal-operations/{id}" : {
-      "get" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/request/resource-removal-operations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/requests" : {
-      "get" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-            }
-          }
-        }
-      }
-    },
-    "/requests/{id}" : {
-      "get" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/requests" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:RequestBrokerService:RequestBrokerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/closure-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/closure-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/closure-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ClosureDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/closure-images" : {
-      "get" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-            }
-          }
-        }
-      }
-    },
-    "/resources/closure-images/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/closure-images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:images:DockerImage"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/closures" : {
-      "get" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-            }
-          }
-        }
-      }
-    },
-    "/resources/closures/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/closures" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:closures:services:closure:Closure"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/composite-components" : {
-      "get" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-            }
-          }
-        }
-      }
-    },
-    "/resources/composite-components/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/composite-components" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/composite-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/composite-descriptions-clone" : {
-      "post" : {
-        "tags" : [ "/resources/composite-descriptions-clone" ],
-        "description" : "Post a composite description to clone it with a new copy of the container descriptions inside it.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/composite-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/composite-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/composite-templates" : {
-      "get" : {
-        "tags" : [ "/resources/composite-templates" ],
-        "description" : "Provide the composite description documentSelfLink in URI query parameter with key \"selfLink\" to get it's YAML definition.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:lang:String"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/composite-templates" ],
-        "description" : "Import YAML definition of composite description. Resource reference of the imported template can be acquired from \"Location\" response header.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success"
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute" : {
-      "get" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/compute-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/compute-network-cidr-allocations" : {
-      "get" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute-network-cidr-allocations/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/compute-network-cidr-allocations" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/compute-network-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute-network-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/compute-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/compute-networks" : {
-      "get" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-            }
-          }
-        }
-      }
-    },
-    "/resources/compute-networks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/compute-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/compute/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/compute" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ComputeService:ComputeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-control-loop" : {
-      "get" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-control-loop/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-control-loop" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-logs" : {
-      "get" : {
-        "tags" : [ "/resources/container-logs" ],
-        "description" : "Get container logs. Provide the ContainerState id in URI query parameter with key \"id\".",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:LogService:LogServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-network-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-network-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-network-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-networks" : {
-      "get" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-networks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-stats" : {
-      "get" : {
-        "tags" : [ "/resources/container-stats" ],
-        "description" : "Get container stats. Provide the ContainerState id in URI query parameter with key \"id\".",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:maintenance:ContainerStats"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-volume-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-volume-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-volume-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/container-volumes" : {
-      "get" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/container-volumes/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/container-volumes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/containers" : {
-      "get" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/containers/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/containers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerService:ContainerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/deployment-policies" : {
-      "get" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-            }
-          }
-        }
-      }
-    },
-    "/resources/deployment-policies/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/deployment-policies" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/disks" : {
-      "get" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/disks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/disks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/elastic-placement-zones" : {
-      "get" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/elastic-placement-zones-config" : {
-      "get" : {
-        "tags" : [ "/resources/elastic-placement-zones-config" ],
-        "description" : "Use the service URL to get all elastic placement zones. Append the resource pool link to this service URL to retrieve the ElasticPlacementZoneConfigurationState for a single existing resource pool. For example: http://host:port/resources/elastic-placement-zones-config/resources/pools/pool-1",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/elastic-placement-zones-config" ],
-        "description" : "Post a valid ElasticPlacementZoneConfigurationState with no document self links to create a resource pool and optionally a corresponding elastic placement zone.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneConfigurationService:ElasticPlacementZoneConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "delete" : {
-        "tags" : [ "/resources/elastic-placement-zones-config" ],
-        "description" : "Append the resource pool link to this service URL to delete the placement zone (both the resource pool and its corresponding EPZ state will be deleted).  For example: http://host:port/resources/elastic-placement-zones-config/resources/pools/pool-1.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success"
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/elastic-placement-zones-config" ],
-        "description" : "Send a valid ElasticPlacementZoneConfigurationState to update the resource pool and optionally the elastic placement zone. PATCH is done for the resource pool and a PUT is done for the elastic placement zone.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneConfigurationService:ElasticPlacementZoneConfigurationState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/elastic-placement-zones/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/elastic-placement-zones" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/endpoints" : {
-      "get" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/endpoints/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/endpoints" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/epz-compute-enumeration-tasks" : {
-      "get" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/epz-compute-enumeration-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/epz-compute-enumeration-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/event-logs" : {
-      "get" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/event-logs/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/event-logs" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:log:EventLogService:EventLogState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/firewalls" : {
-      "get" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/firewalls/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/firewalls" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/group-placements" : {
-      "get" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/group-placements/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/group-placements" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/groups" : {
-      "get" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/groups/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/host-container-list-data-collection" : {
-      "get" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/host-container-list-data-collection/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/host-container-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/host-kubernetes-entity-data-collection" : {
-      "get" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/host-kubernetes-entity-data-collection/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/host-kubernetes-entity-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/host-network-list-data-collection" : {
-      "get" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/host-network-list-data-collection/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/host-network-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/host-port-profiles" : {
-      "get" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/host-port-profiles/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/host-port-profiles" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/host-volume-list-data-collection" : {
-      "get" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/host-volume-list-data-collection/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/host-volume-list-data-collection" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/hosts" : {
-      "put" : {
-        "tags" : [ "/resources/hosts" ],
-        "description" : "Add container host. If host is added successfully, it's reference can be acquired from \"Location\" response header.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success"
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/hosts-data-collections" : {
-      "get" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/hosts-data-collections/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/hosts-data-collections" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/images" : {
-      "get" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/images/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/images" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-deployments" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-deployments/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-deployments" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-pod-logs" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-pod-logs" ],
-        "description" : "Get container logs for all containers in a pod. Provide the PodState id in URI query parameter with key \"id\". The response body is map where the key is string containing the container name and the value is LogServiceState object.",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:util:Map"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-pods" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-pods/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-pods" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:PodService:PodState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-replica-sets" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-replica-sets/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-replica-sets" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-replication-controllers" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-replication-controllers/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-replication-controllers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-services" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/kubernetes-services/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/kubernetes-services" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/kubernetes-templates" : {
-      "post" : {
-        "tags" : [ "/resources/kubernetes-templates" ],
-        "description" : "Post single or multiple kubernetes YAML definitions to create composite description. If there are multiple YAML definitions separate them with \"---\".",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/java:lang:String[]"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    },
-    "/resources/load-balancer-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/load-balancer-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/load-balancer-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/load-balancers" : {
-      "get" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/load-balancers/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/load-balancers" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/name-prefixes" : {
-      "get" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/name-prefixes/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/name-prefixes" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/network-interfaces" : {
-      "get" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/network-interfaces-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/network-interfaces-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/network-interfaces-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/network-interfaces/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/network-interfaces" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/networks" : {
-      "get" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/networks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:NetworkService:NetworkState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/placement-update-tasks" : {
-      "get" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/placement-update-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/placement-update-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/pools" : {
-      "get" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/pools/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/pools" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/resource-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/resource-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/resource-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/security-groups" : {
-      "get" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/security-groups/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/security-groups" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/snapshots" : {
-      "get" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/snapshots/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/snapshots" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/storage-descriptions" : {
-      "get" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-            }
-          }
-        }
-      }
-    },
-    "/resources/storage-descriptions/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/storage-descriptions" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/sub-networks" : {
-      "get" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/sub-networks/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/sub-networks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SubnetService:SubnetState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/resources/tags" : {
-      "get" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-            }
-          }
-        }
-      }
-    },
-    "/resources/tags/{id}" : {
-      "get" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/resources/tags" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:TagService:TagState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/tasks/sub-tasks" : {
-      "get" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ {
-          "name" : "$filter",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        }, {
-          "name" : "expand",
-          "in" : "query",
-          "required" : false,
-          "type" : "string"
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-            }
-          }
-        }
-      }
-    },
-    "/tasks/sub-tasks/{id}" : {
-      "get" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "post" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "put" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "patch" : {
-        "tags" : [ "/tasks/sub-tasks" ],
-        "parameters" : [ {
-          "in" : "body",
-          "name" : "body",
-          "required" : false,
-          "schema" : {
-            "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocument"
-          }
-        } ],
-        "responses" : {
-          "200" : {
-            "description" : "Success",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState"
-            }
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      },
-      "parameters" : [ {
-        "name" : "id",
-        "in" : "path",
-        "required" : true,
-        "type" : "string"
-      } ]
-    },
-    "/templates" : {
-      "get" : {
-        "tags" : [ "/templates" ],
-        "description" : "Search for composite descriptions, container images and closure descriptions. Specify the type you are searching with one of the boolean URI queries \"templatesOnly\", \"imagesOnly\", \"closuresOnly\". Specify the name of the resource you are searching for with URI query with key \"q\"",
-        "parameters" : [ ],
-        "responses" : {
-          "200" : {
-            "description" : "Success"
-          },
-          "404" : {
-            "description" : "Error",
-            "schema" : {
-              "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-            }
-          }
-        }
-      }
-    }
-  },
-  "definitions" : {
-    "com:vmware:photon:controller:model:resources:ImageService:ImageState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "diskConfigs" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ImageService:ImageState:DiskConfiguration"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "ab5064b7-f1b7-4f10-b23b-38261ce0ab45"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "osFamily" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:SshCommandTaskService:SshCommandTaskState" : {
-      "properties" : {
-        "authCredentialLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "commandResponse" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "commands" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "host" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "port" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:admiral:request:PlacementHostSelectionTaskService:PlacementHostSelectionTaskState" : {
-      "properties" : {
-        "contextId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourcePoolLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeAllocationTaskService:ComputeAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "groupResourcePlacementLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "(Required) the groupResourcePlacementState that links to ResourcePool"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "(Required) Number of resources to provision. "
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Set by the task with the links of the provisioned resources.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "(Optional) the resourcePoolLink to ResourcePool"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Type of resource to create"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:NetworkService:NetworkState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "80eca3b9-80c3-4220-b416-887a272686cf"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "subnetCIDR" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:GitRepoVolumeSource" : {
-      "properties" : {
-        "directory" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "repository" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "revision" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:LoadBalancerAllocationTaskService:LoadBalancerAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:HTTPGetAction" : {
-      "properties" : {
-        "host" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "port" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "scheme" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:TenantService:TenantState" : {
-      "properties" : {
-        "id" : {
-          "type" : "string",
-          "example" : "4c9fe56e-8368-4f81-8b49-cf7bb4184fc2"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "VMware Inc."
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The parent (if any) of this tenant"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:ConfigMapVolumeSource" : {
-      "properties" : {
-        "defaultMode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "items" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:KeyToPath"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:DeploymentService:DeploymentState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a entity is part of App/Composition request."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "deployment" : {
-          "description" : "Deployment enables declarative updates for Pods and ReplicaSets.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:Deployment"
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "43d0ee25-9092-4c0c-94c8-16a8d926ecd4"
-        },
-        "kubernetesSelfLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The kubernetes self link of the entity created by the Kubernetes itself."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Entity host link"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:NodeMigrationService" : {
-      "properties" : {
-        "services" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:closures:drivers:ImageConfiguration" : {
-      "properties" : {
-        "baseImageName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "baseImageVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "imageName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "imageNameVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "registry" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerCondition" : {
-      "properties" : {
-        "lastTransitionTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "status" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:KubernetesDescriptionService:KubernetesDescription" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "5b2aa98c-a5fd-482c-b342-784e8f4aee48"
-        },
-        "kubernetesEntity" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Serialized kubernetes entity in YAML format."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The type of the kubernetes entity."
-        }
-      }
-    },
-    "java:lang:String[]" : { },
-    "com:vmware:admiral:compute:container:CompositeDescriptionService:CompositeDescription" : {
-      "properties" : {
-        "bindings" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:content:Binding:ComponentBinding"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "descriptionLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "lastPublished" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "status" : {
-          "type" : "string",
-          "enum" : [ "DRAFT", "PUBLISHED", "RETIRED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:DownwardAPIVolumeFile" : {
-      "properties" : {
-        "fieldRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectFieldSelector"
-        },
-        "mode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourceFieldRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ResourceFieldSelector"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationController" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "kind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerSpec"
-        },
-        "status" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerStatus"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:PodSpec" : {
-      "properties" : {
-        "activeDeadlineSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "containers" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:Container"
-          }
-        },
-        "dnsPolicy" : {
-          "type" : "string",
-          "enum" : [ "ClusterFirst", "Default" ]
-        },
-        "hostIPC" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "hostNetwork" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "hostPID" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "hostname" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "nodeName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "nodeSelector" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "restartPolicy" : {
-          "type" : "string",
-          "enum" : [ "Always", "OnFailure", "Never" ]
-        },
-        "securityContext" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodSecurityContext"
-        },
-        "subdomain" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "terminationGracePeriodSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "volumes" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:Volume"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:QueryTask" : {
-      "properties" : {
-        "indexLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "nodeSelectorLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "querySpec" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QuerySpecification"
-        },
-        "results" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:CounterSubTaskService:CounterSubTaskState" : {
-      "properties" : {
-        "completionsRemaining" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "failCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "finishedCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerStatus" : {
-      "properties" : {
-        "availableReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "conditions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerCondition"
-          }
-        },
-        "fullyLabeledReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "observedGeneration" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readyReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ResourceGroupService:ResourceGroupState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "7461793f-30f1-4613-9641-92667fd9168d"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "query" : {
-          "description" : "Query used to define resource group membership",
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:ServiceStatus" : {
-      "properties" : {
-        "loadBalancer" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:LoadBalancerStatus"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:ResourceEnumerationRequest" : {
-      "properties" : {
-        "delayMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "refreshIntervalMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ResourceRemovalTaskService:ResourceRemovalTaskState" : {
-      "properties" : {
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "nextPageLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "resourceQueryLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceQuerySpec" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QuerySpecification"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "WAITING_FOR_QUERY_COMPLETION", "ISSUE_ADAPTER_DELETES", "DELETE_DOCUMENTS", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerNetworkProvisionTaskService:ContainerNetworkProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Type of resource to create."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to already allocated resources that are going to be provisioned.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:security:service:SslTrustCertificateService:SslTrustCertificateState" : {
-      "properties" : {
-        "certificate" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The SSL trust certificate encoded into .PEM format."
-        },
-        "commonName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The common name of the certificate."
-        },
-        "fingerprint" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The fingerprint of the certificate in SHA-1 form. "
-        },
-        "issuerName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The issuer name of the certificate."
-        },
-        "serial" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The serial of the certificate."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "validSince" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The date since the certificate is valid."
-        },
-        "validTo" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The date until the certificate is valid."
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:GlusterfsVolumeSource" : {
-      "properties" : {
-        "endpoints" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:ImageProfileService:ImageProfileState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint this profile is associated with"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The endpoint type if this profile is not for a specific endpoint "
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "30ebc107-5c2d-4bed-b833-7b1bacb5ba23"
-        },
-        "imageMapping" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ClosureAllocationTaskService:ClosureAllocationTaskState" : {
-      "properties" : {
-        "closureLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the closure."
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the closure description."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Set by a Task with the links of the provisioned resources.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:RequestStatusService:RequestStatus" : {
-      "properties" : {
-        "component" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "components" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:request:composition:CompositionGraph:ResourceNode"
-          }
-        },
-        "eventLogLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "phase" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "progress" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "requestProgressByComponent" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "subStage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "trackedAllocationTasksByResourceType" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "trackedExecutionTasksByResourceType" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeNetworkRemovalTaskService:ComputeNetworkRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:ReplicationControllerService:ReplicationControllerState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a entity is part of App/Composition request."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "07f67283-2264-4818-aa53-ef64f2912c45"
-        },
-        "kubernetesSelfLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The kubernetes self link of the entity created by the Kubernetes itself."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Entity host link"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "replicationController" : {
-          "description" : "ReplicationController represents the configuration of a replication controller.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationController"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:ContainerDescriptionService:ContainerDescription" : {
-      "properties" : {
-        "_cluster" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The number of nodes to be provisioned. Default is one."
-        },
-        "affinity" : {
-          "type" : "array",
-          "description" : " Affinity or anti-affinity conditions of containers deployed or not deployed on the same host. Format: [!]serviceName[:soft|hard].If not specified, the default constraint type is 'hard'. Examples: ['cont1', '!cont2', 'cont3:soft', 'cont4:hard', '!cont5:soft', '!cont6:hard']",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "capAdd" : {
-          "type" : "array",
-          "description" : "A list of kernel capabilities to add to the container.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "capDrop" : {
-          "type" : "array",
-          "description" : "A list of kernel capabilities to add to the container.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "command" : {
-          "type" : "array",
-          "description" : "Commands to run.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "cpuShares" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "CPU Shares for container."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "dependsOn" : {
-          "type" : "array",
-          "description" : "A list of services (in a blueprint) the container depends on.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "deploymentPolicyId" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Document link to the deployment policy if any. Container description with a deployment policy will be deployed on hosts/policies with the same policy."
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "device" : {
-          "type" : "array",
-          "description" : "A list of devices to add to the container specified in the format hostPath:containerPath:rwm",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "dns" : {
-          "type" : "array",
-          "description" : "Force Docker to use specific DNS servers.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "dnsSearch" : {
-          "type" : "array",
-          "description" : "Custom DNS search domains (Use . if you don't wish to set the search domain).",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "domainName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Domain name of the container."
-        },
-        "entryPoint" : {
-          "type" : "array",
-          "description" : "Set the entrypoints for the container.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "env" : {
-          "type" : "array",
-          "description" : "A list of environment variables in the form of VAR=value.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "extraHosts" : {
-          "type" : "array",
-          "description" : "Add a custom host-to-IP mapping (host:ip).",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "healthConfig" : {
-          "description" : "Health service for this container.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:container:HealthChecker:HealthConfig"
-        },
-        "hostname" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Hostname of the container."
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "0070e839-3fa3-438d-b786-f681ada808ee"
-        },
-        "image" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The docker image."
-        },
-        "imageReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "An image reference to a docker image in .tgz format to be downloaded to the server and pushed to the local host repository."
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Instance Adapter reference for provisioning of containers."
-        },
-        "links" : {
-          "type" : "array",
-          "description" : "A list of services (in a blueprint) the container depends on.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "logConfig" : {
-          "description" : "Log configuration of the container",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:container:LogConfig"
-        },
-        "maximumRetryCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "When restart policy is set to on-failure, the max retries."
-        },
-        "memoryLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Memory limit in bytes."
-        },
-        "memorySwapLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Total memory usage (memory + swap); set -1 to set infinite (disable swap limit), 0 to disable swap."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkMode" : {
-          "type" : "string",
-          "example" : "bridge",
-          "description" : "Network mode for the container (bridge / none / container:<name|id> / host)."
-        },
-        "networks" : {
-          "type" : "object",
-          "description" : "Networks to join, referencing declared or already existing networks.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "parentDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the parent container description."
-        },
-        "pidMode" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "PID namespace for the container ( '' / host )"
-        },
-        "pod" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The identity of a grouping associated usually with a host for multiple containers."
-        },
-        "portBindings" : {
-          "type" : "array",
-          "description" : "Port bindings in the format: ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort where range of ports can also be provided.",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:PortBinding"
-          }
-        },
-        "privileged" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Run in privileged mode"
-        },
-        "publishAll" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Automatically bind all exposed ports declared for the image."
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "restartPolicy" : {
-          "type" : "string",
-          "example" : "always",
-          "description" : "Restart policy to apply when a container exits (no, on-failure[:max-retry], always)."
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "ulimits" : {
-          "type" : "array",
-          "description" : "A list of resource limits to set in the container",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:Ulimit"
-          }
-        },
-        "user" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "User to use inside the container."
-        },
-        "volumeDriver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Specify volume driver name (default \"local\")"
-        },
-        "volumes" : {
-          "type" : "array",
-          "description" : "Mount a volume e.g /host:/container or /host:/container:ro",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "volumesFrom" : {
-          "type" : "array",
-          "description" : "Mount volumes from the specified container(s) of the format <container name>[:<ro|rw>]",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "workingDir" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Working dir for commands to run in."
-        },
-        "zoneId" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Data-center or other identification of the group of resources."
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ProvisionSubnetTaskService:ProvisionSubnetTaskState" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "requestType" : {
-          "type" : "string",
-          "enum" : [ "CREATE", "DELETE" ]
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ServiceTaskCallback"
-        },
-        "subnetDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "subnetLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "CREATED", "PROVISIONING_SUBNET", "REMOVING_SUBNET", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:PlacementCapacityUpdateTaskService:PlacementCapacityUpdateTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the resource pool which capacity to update."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:RollbackConfig" : {
-      "properties" : {
-        "revision" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:ResourceRequirements" : {
-      "properties" : {
-        "limits" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requests" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:PodTemplateSpec" : {
-      "properties" : {
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodSpec"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSet" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "kind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetSpec"
-        },
-        "status" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetStatus"
-        }
-      }
-    },
-    "com:vmware:xenon:common:TaskState" : {
-      "properties" : {
-        "durationMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "failure" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:ServiceErrorResponse"
-        },
-        "isDirect" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "stage" : {
-          "type" : "string",
-          "enum" : [ "CREATED", "STARTED", "FINISHED", "FAILED", "CANCELLED" ]
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:SnapshotService:SnapshotState" : {
-      "properties" : {
-        "computeLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "1c5cec22-5d1e-458e-8288-18881270b828"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsAggregationTaskService:SingleResourceStatsAggregationTaskState" : {
-      "properties" : {
-        "aggregations" : {
-          "type" : "object",
-          "description" : "Aggregation type per metric name",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "latestValueOnly" : {
-          "type" : "array",
-          "description" : "Metrics to be aggregated on latest value only",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "metricNames" : {
-          "type" : "array",
-          "description" : "The set of metric names to aggregate on",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "parentTaskReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Task to patch back to"
-        },
-        "query" : {
-          "description" : "The query to lookup resources for stats aggregation. If no query is specified, the aggregation is performed on the resource identified by the resourceLink parameter",
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        },
-        "resourceLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Resource to invoke stats aggregation on"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:LabelSelector" : {
-      "properties" : {
-        "matchExpressions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LabelSelectorRequirement"
-          }
-        },
-        "matchLabels" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:CinderVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "volumeID" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:ConfigMapKeySelector" : {
-      "properties" : {
-        "key" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeNetworkAllocationTaskService:ComputeNetworkAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:volume:ContainerVolumeDescriptionService:ContainerVolumeDescription" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "driver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of the volume driver to use. Defaults to local for the name."
-        },
-        "external" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Composite Template use only. If set to true, specifies that this volume exists outside of the Composite Template."
-        },
-        "externalName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Composite Template use only. The name of the external volume. If set then the value of the attribute 'external' is considered 'true'."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "3c1e8669-c027-48eb-a023-086466882949"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Defines which adapter will serve the provision request"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "object",
-          "description" : "A map of field-value pairs for a given volume. These are usedto specify volume options that are used by the volume drivers.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "parentDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the parent volume description."
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ResourceDescriptionService:ResourceDescription" : {
-      "properties" : {
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "computeType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "061d174c-f8be-4a2c-b7f1-ce1b1681ea49"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:monitoring:StatsCollectionTaskService:StatsCollectionTaskState" : {
-      "properties" : {
-        "customizationClauses" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-          }
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "statsAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "INIT", "GET_RESOURCES" ]
-        }
-      }
-    },
-    "com:vmware:admiral:request:ServiceDocumentDeleteTaskService:ServiceDocumentDeleteTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "deleteDocumentKind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:LoadBalancerStatus" : {
-      "properties" : {
-        "ingress" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:LoadBalancerIngress"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:ProfileService:ProfileState" : {
-      "properties" : {
-        "computeProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the compute profile for this profile"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint this profile is associated with"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The endpoint type if this profile is not for a specific endpoint "
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "418ef7f6-d325-406c-bb8c-6c7605943eaa"
-        },
-        "misc" : {
-          "type" : "object",
-          "description" : "Misc properties",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the network profile for this profile"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "storageProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the storage profile for this profile"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:closures:services:closuredescription:ResourceConstraints" : {
-      "properties" : {
-        "cpuShares" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "ramMB" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "timeoutSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeRemovalTaskService:ComputeRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "The compute resources to be removed",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourceRemovalOptions" : {
-          "type" : "array",
-          "description" : "Optional resource removal options",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "skipReleaseResourceQuota" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Whether to skip the associated reservation or not"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ExecAction" : {
-      "properties" : {
-        "command" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:EpzComputeEnumerationTaskService:EpzComputeEnumerationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the resource pool which capacity to update."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:RegistryService:RegistryState" : {
-      "properties" : {
-        "address" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "URI or other connection address."
-        },
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to associated authentication credentials."
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties ",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "disabled" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Disabling the registry and removing it from the active registries."
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "container.docker.registry",
-          "description" : " The type of the endpoint configuration"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name/type of a component/service"
-        },
-        "protocolType" : {
-          "type" : "string",
-          "example" : "HTTP, SSH...",
-          "description" : "Connection protocol type"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "version" : {
-          "type" : "string",
-          "example" : "v1",
-          "description" : "Version of the API supported by service registration."
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:ResourceNamePrefixService:ResourceNamePrefixState" : {
-      "properties" : {
-        "addRandomToken" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Flag indicating whether to add additional generated token to the  sequence."
-        },
-        "nextNumber" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The number where the prefix sequence will begin."
-        },
-        "numberOfDigits" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The amount of ending digits"
-        },
-        "prefix" : {
-          "type" : "string",
-          "example" : "prefix",
-          "description" : "Prefix or suffix name"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "java:time:LocalDateTime" : { },
-    "com:vmware:xenon:common:ServiceDocumentQueryResult" : {
-      "properties" : {
-        "continuousResults" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:ServiceDocumentQueryResult:ContinuousResult"
-        },
-        "documentCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "documentLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "documents" : {
-            "type" : "object",
-            "additionalProperties" : {
-                "type" : "object"
-            }
-        },
-        "nextPageLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "nextPageLinksPerGroup" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "prevPageLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "queryTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "selectedDocuments" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "selectedLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "selectedLinksPerDocument" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:QueryTask:QuerySpecification" : {
-      "properties" : {
-        "additionalGroupSortTerms" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-          }
-        },
-        "additionalSortTerms" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-          }
-        },
-        "expectedResultCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "groupByTerm" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-        },
-        "groupResultLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "groupSortOrder" : {
-          "type" : "string",
-          "enum" : [ "ASC", "DESC" ]
-        },
-        "groupSortTerm" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-        },
-        "linkTerms" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-          }
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "CONTINUOUS", "COUNT", "DO_NOT_REFRESH", "TOP_RESULTS", "EXPAND_CONTENT", "EXPAND_SELECTED_FIELDS", "EXPAND_BINARY_CONTENT", "EXPAND_BUILTIN_CONTENT_ONLY", "EXPAND_LINKS", "INCLUDE_ALL_VERSIONS", "INCLUDE_DELETED", "SORT", "TASK", "BROADCAST", "OWNER_SELECTION", "SELECT_LINKS", "GROUP_BY", "TIME_SNAPSHOT", "SINGLE_USE" ]
-          }
-        },
-        "query" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        },
-        "resultLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "selectTerms" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-          }
-        },
-        "sortOrder" : {
-          "type" : "string",
-          "enum" : [ "ASC", "DESC" ]
-        },
-        "sortTerm" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-        },
-        "timeSnapshotBoundaryMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:ServiceTaskCallback:ServiceTaskCallbackResponse" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "$ref" : "#/definitions/java:lang:Object"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState" : {
-      "properties" : {
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "egress" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState:Rule"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "d10489e0-a544-4504-b58f-400a53a14510"
-        },
-        "ingress" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState:Rule"
-          }
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:ServiceSpec" : {
-      "properties" : {
-        "clusterIP" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "deprecatedPublicIPs" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "externalIPs" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "externalName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "loadBalancerIP" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "loadBalancerSourceRanges" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ports" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:ServicePort"
-          }
-        },
-        "selector" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "sessionAffinity" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "ClusterIP", "NodePort", "LoadBalancer", "ExternalName" ]
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:NetworkProfileService:NetworkProfile" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint this profile is associated with"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "19282fc9-2647-4d45-8340-2a4dcaef413a"
-        },
-        "isolatedSubnetCIDRPrefix" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The CIDR prefix length to be used for the isolated subnets to be created (example: Subnet with CIDR 192.168.0.0/20 has CIDR prefix length: 20."
-        },
-        "isolationNetworkCIDR" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "CIDR of the isolation network. If not provided it will be retrieved from the isolation network itself. To be used when isolation network doesn't have a CIDR itself."
-        },
-        "isolationNetworkCIDRAllocationLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CIDR Allocation Service matching the provided "
-        },
-        "isolationNetworkLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the network used for creating isolated subnets. This field should be populated only when isolation Type is SUBNET."
-        },
-        "isolationType" : {
-          "type" : "string",
-          "description" : "Specifies the isolation support type e.g. none, subnet or security group",
-          "enum" : [ "NONE", "SUBNET", "SECURITY_GROUP" ]
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "securityGroupLinks" : {
-          "type" : "array",
-          "description" : "SecurityGroupStates included in this network profile",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "subnetLinks" : {
-          "type" : "array",
-          "description" : "SubnetStates included in this network profile",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeReservationTaskService:ComputeReservationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ProvisionContainerHostsTaskService:ProvisionContainerHostsTaskState" : {
-      "properties" : {
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "The compute resource links of the provisioned Docker Host VMs.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:StorageProfileService:StorageItem" : {
-      "properties" : {
-        "defaultItem" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "diskProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourceGroupLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "storageDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "supportsEncryption" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:PhotonPersistentDiskVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "pdID" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:HealthChecker:HealthConfig" : {
-      "properties" : {
-        "autoredeploy" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Automatic redeployment of containers."
-        },
-        "command" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "healthyThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "httpMethod" : {
-          "type" : "string",
-          "enum" : [ "GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS" ]
-        },
-        "httpVersion" : {
-          "type" : "string",
-          "enum" : [ "HTTP_v1_1", "HTTP_v2" ]
-        },
-        "ignoreOnProvision" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Ignore health check on provision. Default is true."
-        },
-        "port" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "protocol" : {
-          "type" : "string",
-          "enum" : [ "HTTP", "TCP", "COMMAND" ]
-        },
-        "timeoutMillis" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "unhealthyThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "urlPath" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:EnvVarSource" : {
-      "properties" : {
-        "configMapKeyRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ConfigMapKeySelector"
-        },
-        "fieldRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectFieldSelector"
-        },
-        "resourceFieldRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ResourceFieldSelector"
-        },
-        "secretKeyRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:SecretKeySelector"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:Ulimit" : {
-      "properties" : {
-        "hard" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "soft" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:FirewallService:FirewallState" : {
-      "properties" : {
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "egress" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState:Allow"
-          }
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "dd200574-93cc-4151-a876-437571749d62"
-        },
-        "ingress" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:FirewallService:FirewallState:Allow"
-          }
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ClusteringTaskService:ClusteringTaskState" : {
-      "properties" : {
-        "contextId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "postAllocation" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerControlLoopService:ContainerControlLoopState" : { },
-    "com:vmware:admiral:request:composition:CompositionTaskService:CompositionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "errorCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:ExtensibilitySubscriptionService:ExtensibilitySubscription" : {
-      "properties" : {
-        "blocking" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Blocking or asynchronous flag"
-        },
-        "callbackReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Callback address, when the specified task reaches the stage and substage, a POST request with the task state will be sent to the subscriber"
-        },
-        "stage" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task stage"
-        },
-        "substage" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task substage"
-        },
-        "task" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task name"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:LocalObjectReference" : {
-      "properties" : {
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:RollingUpdateDeployment" : {
-      "properties" : {
-        "maxSurge" : {
-          "$ref" : "#/definitions/java:lang:Object"
-        },
-        "maxUnavailable" : {
-          "$ref" : "#/definitions/java:lang:Object"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:ElasticPlacementZoneConfigurationService:ElasticPlacementZoneConfigurationState" : {
-      "properties" : {
-        "epzState" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState"
-        },
-        "resourcePoolState" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:ContainerHostDataCollectionService:ContainerHostDataCollectionState" : {
-      "properties" : {
-        "computeContainerHostLinks" : {
-          "type" : "array",
-          "description" : "List of container host links to be updated as part of Patch triggered data collection.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "createOrUpdateHost" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "lastRunTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Indicator of the last run of data-collection."
-        },
-        "remove" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Flag indicating if this is data-collection after container remove."
-        },
-        "skipRunCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Count of how many times the last run data-collection has been run within very small time period."
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:AzureDiskVolumeSource" : {
-      "properties" : {
-        "cachingMode" : {
-          "$ref" : "#/definitions/java:lang:Object"
-        },
-        "diskName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "diskURI" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:CephFSVolumeSource" : {
-      "properties" : {
-        "monitors" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "secretFile" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "secretRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LocalObjectReference"
-        },
-        "user" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:FlexVolumeSource" : {
-      "properties" : {
-        "driver" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "secretRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LocalObjectReference"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:LoadBalancerService:LoadBalancerState" : {
-      "properties" : {
-        "address" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "computeLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "8a48a297-8506-462c-953e-68346975cecb"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "instancePort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "instanceProtocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "internetFacing" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "port" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "routes" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription:RouteConfiguration"
-          }
-        },
-        "subnetLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateWaiting" : {
-      "properties" : {
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:AuthCredentialsService:AuthCredentialsServiceState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "privateKey" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "privateKeyId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "publicKey" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tokenReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "userEmail" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "userLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerVolumeRemovalTaskService:ContainerVolumeRemovalTaskState" : {
-      "properties" : {
-        "cleanupRemoval" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "externalInspectOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "removeOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:monitoring:InMemoryResourceMetricService:InMemoryResourceMetric" : {
-      "properties" : {
-        "timeSeriesStats" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ResourceAllocationTaskService:ResourceAllocationTaskState" : {
-      "properties" : {
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "computeType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "parentLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "QUERYING_AVAILABLE_COMPUTE_RESOURCES", "PROVISIONING_PHYSICAL", "PROVISIONING_VM_GUESTS", "PROVISIONING_CONTAINERS", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ResourceEnumerationTaskService:ResourceEnumerationTaskState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "enumerationAction" : {
-          "type" : "string",
-          "enum" : [ "START", "STOP", "REFRESH" ]
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "parentComputeLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:RoleService:RoleState" : {
-      "properties" : {
-        "policy" : {
-          "type" : "string",
-          "enum" : [ "ALLOW", "DENY" ]
-        },
-        "priority" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceGroupLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "userGroupLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "verbs" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "GET", "POST", "PATCH", "PUT", "DELETE", "OPTIONS" ]
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ClosureProvisionTaskService:ClosureProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the closure description."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Set by a Task with the links of the provisioned resources.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription:HealthCheckConfiguration" : {
-      "properties" : {
-        "healthyThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "intervalSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "port" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "timeoutSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "unhealthyThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "urlPath" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ResourceNamePrefixTaskService:ResourceNamePrefixTaskState" : {
-      "properties" : {
-        "baseResourceNameFormat" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:google:gson:JsonElement" : { },
-    "com:vmware:admiral:compute:kubernetes:entities:replicationcontrollers:ReplicationControllerSpec" : {
-      "properties" : {
-        "minReadySeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "selector" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "template" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodTemplateSpec"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:Volume" : {
-      "properties" : {
-        "awsElasticBlockStore" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:AWSElasticBlockStoreVolumeSource"
-        },
-        "azureDisk" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:AzureDiskVolumeSource"
-        },
-        "azureFile" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:AzureFileVolumeSource"
-        },
-        "cephfs" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:CephFSVolumeSource"
-        },
-        "cinder" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:CinderVolumeSource"
-        },
-        "configMap" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:ConfigMapVolumeSource"
-        },
-        "downwardAPI" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:DownwardAPIVolumeSource"
-        },
-        "emptyDir" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:EmptyDirVolumeSource"
-        },
-        "fc" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:FCVolumeSource"
-        },
-        "flexVolume" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:FlexVolumeSource"
-        },
-        "gcePersistentDisk" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:GCEPersistentDiskVolumeSource"
-        },
-        "gitRepo" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:GitRepoVolumeSource"
-        },
-        "glusterfs" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:GlusterfsVolumeSource"
-        },
-        "hostPath" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:HostPathVolumeSource"
-        },
-        "iscsi" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:ISCSIVolumeSource"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "nfs" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:NFSVolumeSource"
-        },
-        "persistentVolumeClaim" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:PersistentVolumeClaimVolumeSource"
-        },
-        "photonPersistentDisk" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:PhotonPersistentDiskVolumeSource"
-        },
-        "quobyte" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:QuobyteVolumeSource"
-        },
-        "rbd" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:RBDVolumeSource"
-        },
-        "secret" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:SecretVolumeSource"
-        },
-        "vsphereVolume" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:VsphereVirtualDiskVolumeSource"
-        }
-      }
-    },
-    "com:vmware:admiral:closures:drivers:ContainerConfiguration" : {
-      "properties" : {
-        "cpuShares" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "dependencies" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "envVars" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "logConfiguration" : {
-          "$ref" : "#/definitions/com:google:gson:JsonElement"
-        },
-        "memoryMB" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "sourceURL" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ComputeService:ComputeState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "address" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "bootAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "cpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "cpuMhzPerCore" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "diskLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "enumerationAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "environmentName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "gpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "healthAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "hostName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "5656a89c-adfe-4de9-9938-8ff0f990869b"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "instanceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lifecycleState" : {
-          "type" : "string",
-          "description" : "Lifecycle state indicating runtime state of a resource instance.",
-          "enum" : [ "PROVISIONING", "READY", "SUSPEND", "STOPPED", "RETIRED" ]
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkInterfaceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "powerAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "powerState" : {
-          "type" : "string",
-          "enum" : [ "ON", "OFF", "UNKNOWN", "SUSPEND" ]
-        },
-        "primaryMAC" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "statsAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "statsAdapterReferences" : {
-          "type" : "array",
-          "description" : "Set of URIs for stats adapters of this host",
-          "items" : {
-            "type" : "string",
-            "format" : "uri"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "totalMemoryBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "VM_HOST", "VM_GUEST", "DOCKER_CONTAINER", "PHYSICAL", "OS_ON_PHYSICAL", "ZONE" ]
-        },
-        "zoneId" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:auth:idm:local:LocalPrincipalService:LocalPrincipalState" : {
-      "properties" : {
-        "email" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupMembersLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isAdmin" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "password" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "USER", "GROUP" ]
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:PersistentVolumeClaimVolumeSource" : {
-      "properties" : {
-        "claimName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription:RouteConfiguration" : {
-      "properties" : {
-        "healthCheckConfiguration" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription:HealthCheckConfiguration"
-        },
-        "instancePort" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "instanceProtocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "port" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:TagService:TagState" : {
-      "properties" : {
-        "external" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Whether this tag is from external source"
-        },
-        "key" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Tag key"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "description" : "A list of tenant links that can access this tag",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "value" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Tag value, empty string used for none (null not accepted)"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:monitoring:StatsAggregationTaskService:StatsAggregationTaskState" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metricNames" : {
-          "type" : "array",
-          "description" : "The set of metric names to aggregate on",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "query" : {
-          "description" : "The query to lookup resources for stats aggregation",
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetCondition" : {
-      "properties" : {
-        "lastTransitionTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "status" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:adapterapi:ResourceOperationResponse" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourceLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:StorageDescriptionService:StorageDescription" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "capacityBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "computeHostLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "08a328ef-235c-4990-a4a3-b99f7e89eb55"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "supportsEncryption" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:adapter:registry:service:RegistrySearchResponse" : {
-      "properties" : {
-        "isPartialResult" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "numPages" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "numResults" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "page" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "pageSize" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "query" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "results" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:adapter:registry:service:RegistrySearchResponse:Result"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:ContainerService:ContainerState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Defines which adapter which serve the provision request"
-        },
-        "address" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Defines the address of the container"
-        },
-        "attributes" : {
-          "type" : "object",
-          "description" : "Unmodeled container attributes",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "command" : {
-          "type" : "array",
-          "description" : "Commands to run.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a container is part of App/Composition request."
-        },
-        "cpuShares" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Percentages of the relative CPU sharing in a given resource pool. This is not an actual limit but a guideline of how much CPU should be divided among all containers running at a given time."
-        },
-        "created" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Container created time in milliseconds"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "env" : {
-          "type" : "array",
-          "description" : "A list of environment variables in the form of VAR=value.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "extraHosts" : {
-          "type" : "array",
-          "description" : "Add a custom host-to-IP mapping (host:ip)",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "groupResourcePlacementLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the resource placement associated with a given container instance. Null if no placement"
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "4aab48b4-853f-418a-ae27-4681f90c48a8"
-        },
-        "image" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The docker image."
-        },
-        "isDeleted" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Is the docker container deleted by Admiral."
-        },
-        "links" : {
-          "type" : "array",
-          "description" : "A list of services (in a blueprint) the container depends on.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "memoryLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Effective memory limit"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "names" : {
-          "type" : "array",
-          "description" : "The list of names of a given container host.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "networks" : {
-          "type" : "object",
-          "description" : "Joined networks.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Container host link"
-        },
-        "ports" : {
-          "type" : "array",
-          "description" : "Port bindings in the format ip:hostPort:containerPort | ip::containerPort | hostPort:containerPort | containerPort where range of ports can also be provided",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:PortBinding"
-          }
-        },
-        "powerState" : {
-          "type" : "string",
-          "description" : "Container state indicating runtime state of a container instance.",
-          "enum" : [ "UNKNOWN", "PROVISIONING", "RUNNING", "PAUSED", "STOPPED", "RETIRED", "ERROR" ]
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "started" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Container started time in milliseconds"
-        },
-        "status" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Status of the container"
-        },
-        "storageLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Storage limit in bytes"
-        },
-        "system" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Is system container"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "ulimits" : {
-          "type" : "array",
-          "description" : "A list of resource limits to set in the container",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:Ulimit"
-          }
-        },
-        "volumeDriver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Specify volume driver name (default \"local\")"
-        },
-        "volumes" : {
-          "type" : "array",
-          "description" : "Mount a volume e.g /host:/container[:ro] or just named volume like 'vol1'",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "volumesFrom" : {
-          "type" : "array",
-          "description" : "Volumes from the specified container(s) of the format <container name>[:<ro|rw>]",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:ElasticPlacementZoneService:ElasticPlacementZoneState" : {
-      "properties" : {
-        "placementPolicy" : {
-          "type" : "string",
-          "description" : "Advanced placement policy.",
-          "enum" : [ "DEFAULT", "SPREAD", "BINPACK" ]
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the elastic resource pool"
-        },
-        "tagLinksToMatch" : {
-          "type" : "array",
-          "description" : "Links to tags that must be set on the computes in order to add them to the elastic resource pool",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:VolumeMount" : {
-      "properties" : {
-        "mountPath" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "subPath" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ScheduledTaskService:ScheduledTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "delayMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "enabled" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "factoryLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "initialStateJson" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "intervalMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "userLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The user in whose context the task will be executed"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerNetworkRemovalTaskService:ContainerNetworkRemovalTaskState" : {
-      "properties" : {
-        "cleanupRemoval" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "externalInspectOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "removeOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:DownwardAPIVolumeSource" : {
-      "properties" : {
-        "defaultMode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "items" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:DownwardAPIVolumeFile"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:InstanceTypeService:InstanceTypeState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The endpoint type if this profile is not for a specific endpoint "
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "8315387c-60d7-4476-8d6f-51406edaae62"
-        },
-        "instanceTypeMapping" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:ISCSIVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "iqn" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "iscsiInterface" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lun" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "targetPortal" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStatus" : {
-      "properties" : {
-        "containerID" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "image" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "imageID" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lastState" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerState"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ready" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "restartCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "state" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerState"
-        }
-      }
-    },
-    "java:util:Map" : { },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:PodStatus" : {
-      "properties" : {
-        "conditions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodCondition"
-          }
-        },
-        "containerStatuses" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStatus"
-          }
-        },
-        "hostIP" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "phase" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "podIP" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "startTime" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentStrategy" : {
-      "properties" : {
-        "rollingUpdate" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:RollingUpdateDeployment"
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "Recreate", "RollingUpdate" ]
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:EmptyDirVolumeSource" : {
-      "properties" : {
-        "medium" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:Pod" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "kind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "description" : "Specification of the desired behavior of the pod.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodSpec"
-        },
-        "status" : {
-          "description" : "Most recently observed status of the pod.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodStatus"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetStatus" : {
-      "properties" : {
-        "availableReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "conditions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetCondition"
-          }
-        },
-        "fullyLabeledReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "observedGeneration" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readyReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:Lifecycle" : {
-      "properties" : {
-        "podStart" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:Handler"
-        },
-        "preStop" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:Handler"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerAllocationTaskService:ContainerAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "groupResourcePlacementLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "postAllocation" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:composition:CompositeComponentRemovalTaskService:CompositeComponentRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "(Required) The composites on which the given operation will be applied.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription" : {
-      "properties" : {
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "e7e252b7-b317-4d6e-8bd7-81e8267fdf72"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "instancePort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "instanceProtocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "internetFacing" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "port" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "routes" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:LoadBalancerDescriptionService:LoadBalancerDescription:RouteConfiguration"
-          }
-        },
-        "subnetLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeOperationTaskService:ComputeOperationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "operation" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The identifier of the resource operation to be performed."
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "The resources on which the given operation will be applied",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:AzureFileVolumeSource" : {
-      "properties" : {
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "secretName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "shareName" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:HostPortProfileService:HostPortProfileState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endPort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Host port profile range end port."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "hostLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link of the ComputeState associated with this host port profile."
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "9b846983-8224-4615-bb7a-83dea6d2c431"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reservedPorts" : {
-          "type" : "object",
-          "description" : "Host port to container link map.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "startPort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Host port profile range start port."
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:NodeMigrationService:MigrationRequest" : {
-      "properties" : {
-        "destinationNodeGroup" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "sourceNodeGroup" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:CompositeComponentService:CompositeComponent" : {
-      "properties" : {
-        "componentLinks" : {
-          "type" : "array",
-          "description" : "Component links.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "compositeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "CompositeDescription link."
-        },
-        "created" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Composite creation time in milliseconds"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of composite description."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:SecurityGroupService:SecurityGroupState:Rule" : {
-      "properties" : {
-        "access" : {
-          "type" : "string",
-          "enum" : [ "Allow", "Deny" ]
-        },
-        "ipRangeCidr" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ports" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:NFSVolumeSource" : {
-      "properties" : {
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "server" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:SslTrustCertificateService:SslTrustCertificateState" : {
-      "properties" : {
-        "certificate" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The SSL trust certificate encoded into .PEM format."
-        },
-        "commonName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The common name of the certificate."
-        },
-        "fingerprint" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The fingerprint of the certificate in SHA-1 form. "
-        },
-        "issuerName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The issuer name of the certificate."
-        },
-        "serial" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The serial of the certificate."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "validSince" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0,
-          "description" : "The date since the certificate is valid."
-        },
-        "validTo" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0,
-          "description" : "The date until the certificate is valid."
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:EndpointService:EndpointState" : {
-      "properties" : {
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link to the credentials to authenticate against this endpoint."
-        },
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link to the compute description that represents this endpoint."
-        },
-        "computeLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link to the compute that represents this endpoint."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointProperties" : {
-          "type" : "object",
-          "description" : "Endpoint specific properties. The specific endpoint adapter will extract them and enhance the linked Credentials,Compute and ComputeDescription.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Endpoint type of the endpoint instance,e.g. aws,azure,..."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "e3ed32fb-7f9e-4df6-8ae5-1cbc2b6240ea"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link to the parent endpoint link of this endpoint"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link to the resource pool that is default for an endpoint."
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:KeyToPath" : {
-      "properties" : {
-        "key" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "mode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateTerminated" : {
-      "properties" : {
-        "containerID" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "exitCode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "finishedAt" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "signal" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "startedAt" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ReservationTaskService:ReservationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:PortBinding" : {
-      "properties" : {
-        "containerPort" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "hostIp" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "hostPort" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:MigrationTaskService:State" : {
-      "properties" : {
-        "continuousMigration" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "destinationFactoryLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "destinationNodeGroupReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "latestSourceUpdateTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "maintenanceIntervalMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "maximumConvergenceChecks" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "migrationOptions" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "CONTINUOUS", "DELETE_AFTER", "USE_TRANSFORM_REQUEST", "ALL_VERSIONS", "ESTIMATE_COUNT" ]
-          }
-        },
-        "querySpec" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QuerySpecification"
-        },
-        "sourceFactoryLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "sourceNodeGroupReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "transformationServiceLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ClosureRemovalTaskService:ClosureRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:ConfigureHostOverSshTaskService:ConfigureHostOverSshTaskServiceState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "hostLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to configured host"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:SubnetService:SubnetState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "defaultForZone" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "dnsSearchDomains" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "dnsServerAddresses" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "domain" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "gatewayAddress" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "cf221b72-965c-47d9-80e8-79f53754dad1"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "lifecycleState" : {
-          "type" : "string",
-          "description" : "Lifecycle state indicating runtime state of a resource instance.",
-          "enum" : [ "PROVISIONING", "READY", "SUSPEND", "STOPPED", "RETIRED" ]
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "subnetCIDR" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "supportPublicIpAddress" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "zoneId" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:network:ContainerNetworkDescriptionService:ContainerNetworkDescription" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "driver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The name of the driver for this network. Can be bridge, host, overlay, none."
-        },
-        "external" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Composite Template use only. If set to true, specifies that this network exists outside of the Composite Template."
-        },
-        "externalName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Composite Template use only. The name of the external network. If set then the value of the attribute 'external' is considered 'true'."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "b49277d3-0da2-4e98-b943-fb8597a80635"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Instance Adapter reference for provisioning of containers."
-        },
-        "ipam" : {
-          "description" : "An IPAM configuration for a given network.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:Ipam"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "object",
-          "description" : "A map of field-value pairs for a given network. These are usedto specify network options that are used by the network drivers.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "parentDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the parent network description."
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:SecurityContext" : {
-      "properties" : {
-        "privileged" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "readOnlyRootFilesystem" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "runAsNonRoot" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "runAsUser" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:request:ReservationAllocationTaskService:ReservationAllocationTaskState" : {
-      "properties" : {
-        "contextId" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The overall contextId of this request (could be the same across multiple request - composite allocation)"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of the container."
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Type of resource to create."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerPort" : {
-      "properties" : {
-        "containerPort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "hostIP" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "hostPort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:endpoint:EndpointHealthCheckTaskService:EndpointHealthCheckTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint to check."
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ReservationRemovalTaskService:ReservationRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "groupResourcePlacementLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:network:ComputeNetworkService:ComputeNetwork" : {
-      "properties" : {
-        "assignment" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the network."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "16fc116e-9217-4702-a6a1-6905fc358a36"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkType" : {
-          "type" : "string",
-          "description" : "Specifies the network type e.g. public or isolated",
-          "enum" : [ "PUBLIC", "ISOLATED", "EXTERNAL" ]
-        },
-        "provisionProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to a profile where the network will be provisioned."
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "securityGroupLinks" : {
-          "type" : "array",
-          "description" : "Security groups to apply to all instances connected to this network",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "subnetLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to a new subnet state to provision."
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:monitoring:SingleResourceStatsCollectionTaskService:SingleResourceStatsCollectionTaskState" : {
-      "properties" : {
-        "computeLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentPatchBody" : {
-          "$ref" : "#/definitions/java:lang:Object"
-        },
-        "parentTaskReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "statsAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "The stats adapter reference"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskStage" : {
-          "type" : "string",
-          "enum" : [ "GET_DESCRIPTIONS", "UPDATE_STATS" ]
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:NetworkInterfaceService:NetworkInterfaceState" : {
-      "properties" : {
-        "address" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "deviceIndex" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "firewallLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "011d432f-a273-4067-8560-b53ca1eb7f42"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkInterfaceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "networkLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "securityGroupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "subnetLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:PodSecurityContext" : {
-      "properties" : {
-        "fsGroup" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "runAsNonRoot" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "runAsUser" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "supplementalGroups" : {
-          "type" : "array",
-          "items" : {
-            "type" : "integer",
-            "format" : "int64"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:network:ContainerNetworkService:ContainerNetworkState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Defines which adapter will serve the provision request"
-        },
-        "compositeComponentLinks" : {
-          "type" : "array",
-          "description" : "Links to CompositeComponents when a network is part of App/Composition request.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "connected" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Network connected time in milliseconds"
-        },
-        "connectedContainersCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Runtime property that will be populated during network inspections. Contains the number of containers that are connected to this container network."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the network."
-        },
-        "driver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The name of the driver for this network. Can be bridge, host, overlay, none."
-        },
-        "external" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "If set to true, specifies that this network exists independently of any application."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "b873074a-21fb-41a0-8c2f-02ce091653a8"
-        },
-        "ipam" : {
-          "description" : "An IPAM configuration for a given network.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:Ipam"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "object",
-          "description" : "A map of field-value pairs for a given network. These are used to specify network options that are used by the network drivers.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "originatingHostLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Reference to the host that this network was created on."
-        },
-        "parentLinks" : {
-          "type" : "array",
-          "description" : "Container host links",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "powerState" : {
-          "type" : "string",
-          "description" : "Network state indicating runtime state of a network instance.",
-          "enum" : [ "UNKNOWN", "PROVISIONING", "CONNECTED", "RETIRED", "ERROR" ]
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:volume:ContainerVolumeService:ContainerVolumeState" : {
-      "properties" : {
-        "adapterManagementReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Defines which adapter will serve the provision request"
-        },
-        "compositeComponentLinks" : {
-          "type" : "array",
-          "description" : "Links to CompositeComponents when a volume is part of App/Composition request.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "connected" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Volume connected time in milliseconds"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the volume."
-        },
-        "driver" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of the volume driver to use. Defaults to local for the name."
-        },
-        "external" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "If set to true, specifies that this volume exists independently of any application."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "5029d107-90f7-4ca5-89aa-131caa82d4f7"
-        },
-        "mountpoint" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Mount path of the volume on the host."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "object",
-          "description" : "A map of field-value pairs for a given volume. These are used to specify volume options that are used by the volume drivers.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "originatingHostLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Reference to the host that this volume was created on."
-        },
-        "parentLinks" : {
-          "type" : "array",
-          "description" : "Container host links",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "powerState" : {
-          "type" : "string",
-          "description" : "Volume state indicating runtime state of a volume instance.",
-          "enum" : [ "UNKNOWN", "PROVISIONING", "CONNECTED", "RETIRED", "ERROR" ]
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "scope" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Scope describes the level at which the volume exists, can be one of global for cluster-wide or local for machine level. The default is local."
-        },
-        "status" : {
-          "type" : "object",
-          "description" : "Low-level details about the volume, provided by the volume driver. Details are returned as a map with key/value pairs: {\"key\":\"value\",\"key2\":\"value2\"}",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:KubernetesEntityDataCollection:KubernetesEntityDataCollectionState" : {
-      "properties" : {
-        "computeHostLinks" : {
-          "type" : "array",
-          "description" : "The list of compute host links.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateRunning" : {
-      "properties" : {
-        "startedAt" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ProvisionNetworkTaskService:ProvisionNetworkTaskState" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "networkDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "requestType" : {
-          "type" : "string",
-          "enum" : [ "CREATE", "DELETE" ]
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "CREATED", "PROVISIONING_NETWORK", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:EventTopicService:TopicTaskInfo" : {
-      "properties" : {
-        "stage" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task stage"
-        },
-        "substage" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task substage"
-        },
-        "task" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task name"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:adapters:registry:operations:ResourceOperationSpecService:ResourceOperationSpec" : {
-      "properties" : {
-        "adapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "azure, aws, gcp, vsphere, openstack, virtustream, etc.",
-          "description" : "Endpoint type for which the resource operation is defined"
-        },
-        "extensions" : {
-          "type" : "object",
-          "description" : "Optional extensions, e.g. UI specific configuration, related to the resource operation specification.The values of the map shall bespecialization of ResourceOperationSpec.Extension",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "Openstack, Virtustream, etc.",
-          "description" : "Name of the photon model adapter configuration."
-        },
-        "operation" : {
-          "type" : "string",
-          "example" : "powerOff, powerOn, snapshot, reconfigure, etc.",
-          "description" : "The operation technical name."
-        },
-        "resourceType" : {
-          "type" : "string",
-          "description" : "Resource type for which the resource operation is applicable",
-          "enum" : [ "COMPUTE", "NETWORK", "STORAGE" ]
-        },
-        "schema" : {
-          "description" : "Optional schema describing the expected by the resource operation payload",
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:data:Schema"
-        },
-        "targetCriteria" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:common:SynchronizationTaskService:State" : {
-      "properties" : {
-        "childDocumentIndexLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "childOptions" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "INSTRUMENTATION", "PERIODIC_MAINTENANCE", "PERSISTENCE", "REPLICATION", "OWNER_SELECTION", "STRICT_UPDATE_CHECKING", "HTML_USER_INTERFACE", "CONCURRENT_UPDATE_HANDLING", "CONCURRENT_GET_HANDLING", "IDEMPOTENT_POST", "ON_DEMAND_LOAD", "IMMUTABLE", "LIFO_QUEUE", "URI_NAMESPACE_OWNER", "CORE", "UTILITY", "FACTORY", "FACTORY_ITEM", "DOCUMENT_OWNER", "TRANSACTION_PENDING", "STATELESS", "NONE" ]
-          }
-        },
-        "factorySelfLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "factoryStateKind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "membershipUpdateTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "nodeSelectorLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "queryPageReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "queryResultLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "subStage" : {
-          "type" : "string",
-          "enum" : [ "QUERY", "SYNCHRONIZE", "RESTART" ]
-        },
-        "synchCompletionCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:ServicePort" : {
-      "properties" : {
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "nodePort" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "port" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "targetPort" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:closures:services:closuredescription:ClosureDescription" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "dependencies" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Additional dependencies needed for code snippet execution. The format depends on the runtime."
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Description of the closure"
-        },
-        "entrypoint" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Entry point to start execution from: in the format: <name of the file>.<name of handler function>"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "f9393b34-d323-49b0-a2d8-3977660c8689"
-        },
-        "inputs" : {
-          "type" : "object",
-          "description" : "Names of the input parameters.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "logConfiguration" : {
-          "description" : "Log configuration of execution.",
-          "$ref" : "#/definitions/com:google:gson:JsonElement"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "notifyUrl" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Notification URL that can be used as Webhook."
-        },
-        "outputNames" : {
-          "type" : "array",
-          "description" : "Names of the output parameters.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "parentDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the parent closure description."
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resources" : {
-          "description" : "Resource constraints to use when executing code snippet. Could be CPU, memory or execution timeout.",
-          "$ref" : "#/definitions/com:vmware:admiral:closures:services:closuredescription:ResourceConstraints"
-        },
-        "runtime" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Runtime environment used for code execution"
-        },
-        "source" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Actual source of the code snippet"
-        },
-        "sourceURL" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "URL to fetch the source snippet code from. If set will be used with priority against the source field."
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:ComputeProfileService:ComputeProfile" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint this profile is associated with"
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The endpoint type if this profile is not for a specific endpoint "
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "df8e67ac-4fc2-4e8e-88c8-35fb217925f3"
-        },
-        "imageMapping" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "imageProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the image profile for this profile"
-        },
-        "instanceTypeMapping" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "instanceTypeProfileLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the instance type profile for this profile"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:Constraint:Condition" : {
-      "properties" : {
-        "enforcement" : {
-          "type" : "string",
-          "enum" : [ "HARD", "SOFT" ]
-        },
-        "expression" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-        },
-        "occurrence" : {
-          "type" : "string",
-          "enum" : [ "MUST_OCCUR", "MUST_NOT_OCCUR", "SHOULD_OCCUR" ]
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "TAG", "FIELD" ]
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:network:IpamConfig" : {
-      "properties" : {
-        "auxAddresses" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "gateway" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ipRange" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "subnet" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:ObjectFieldSelector" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "fieldPath" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ProvisionLoadBalancerTaskService:ProvisionLoadBalancerTaskState" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "loadBalancerLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "requestType" : {
-          "type" : "string",
-          "enum" : [ "CREATE", "DELETE" ]
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "CREATED", "PROVISIONING", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ImageService:ImageState:DiskConfiguration" : {
-      "properties" : {
-        "capacityMBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "encrypted" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "persistent" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "properties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:kubernetes:CompositeKubernetesProvisioningTaskService:KubernetesProvisioningTaskState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link of the composite component that will be provisioned."
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:Probe" : {
-      "properties" : {
-        "exec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ExecAction"
-        },
-        "failureThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "httpGet" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:HTTPGetAction"
-        },
-        "initialDelaySeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "periodSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "successThreshold" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "tcpSocket" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:TCPSocketAction"
-        },
-        "timeoutSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:DiskService:DiskState:BootConfig:FileEntry" : {
-      "properties" : {
-        "contents" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "contentsReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:profile:StorageProfileService:StorageProfile" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to the endpoint this profile is associated with"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "aa7e248d-1faf-44b6-a37b-228e55bda63b"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "storageItems" : {
-          "type" : "array",
-          "description" : "Contains storageItems that define disk properties to be used by providers",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:profile:StorageProfileService:StorageItem"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ServiceTaskCallback" : {
-      "properties" : {
-        "serviceURI" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta" : {
-      "properties" : {
-        "annotations" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "clusterName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "creationTimestamp" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "generateName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "labels" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "namespace" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "selfLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "uid" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:ResourceFieldSelector" : {
-      "properties" : {
-        "containerName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "divisor" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resource" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:EnvVar" : {
-      "properties" : {
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "value" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "valueFrom" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:EnvVarSource"
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:ExtensibilitySubscriptionCallbackService:ExtensibilitySubscriptionCallback" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "due" : {
-          "description" : "Due time of the reply.",
-          "$ref" : "#/definitions/java:time:LocalDateTime"
-        },
-        "notificationPayload" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Defines Task fields which will be sent to client for information about the task."
-        },
-        "replyPayload" : {
-          "description" : "Defines Task fields which will be merged when subscriber return response.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback:ServiceTaskCallbackResponse"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "retryCounter" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Resume counter"
-        },
-        "serviceCallback" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "Callback address"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "status" : {
-          "type" : "string",
-          "description" : "State status",
-          "enum" : [ "BLOCKED", "RESUME", "DONE" ]
-        },
-        "statusMessage" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Status message"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskStateClassName" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task class name"
-        },
-        "taskStateJson" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Task state json"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:QueryTask:NumericRange" : {
-      "properties" : {
-        "isMaxInclusive" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "isMinInclusive" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "max" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "min" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "precisionStep" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "LONG", "STRING", "BYTES", "PODO", "COLLECTION", "MAP", "BOOLEAN", "DOUBLE", "InternetAddressV4", "InternetAddressV6", "DATE", "URI", "ENUM" ]
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:ConfigurationService:ConfigurationState" : {
-      "properties" : {
-        "key" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The name used as a key for a given property value."
-        },
-        "value" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The value for a given key."
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:LoadBalancerRemovalTaskService:LoadBalancerRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeProvisionTaskService:ComputeProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to already allocated resources that are going to be provisioned.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:content:Binding" : {
-      "properties" : {
-        "originalFieldExpression" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "placeholder" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:content:Binding:BindingPlaceholder"
-        },
-        "targetFieldPath" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerPortsAllocationTaskService:ContainerPortsAllocationTaskState" : {
-      "properties" : {
-        "containerStateLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:DiskService:DiskState" : {
-      "properties" : {
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "bootArguments" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "bootConfig" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState:BootConfig"
-        },
-        "bootOrder" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "capacityMBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "computeHostLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "constraint" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:Constraint"
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "currencyUnit" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "customizationServiceReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "encrypted" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "a402cb35-fade-4c71-84f0-98a37064afe1"
-        },
-        "imageLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "persistent" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "sourceImageReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "status" : {
-          "type" : "string",
-          "enum" : [ "DETACHED", "ATTACHED" ]
-        },
-        "storageDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "storageType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "SSD", "HDD", "CDROM", "FLOPPY", "NETWORK" ]
-        },
-        "zoneId" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:GCEPersistentDiskVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "partition" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "pdName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentStatus" : {
-      "properties" : {
-        "availableReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "conditions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentCondition"
-          }
-        },
-        "observedGeneration" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readyReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "unavailableReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "updatedReplicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:adapters:registry:PhotonModelAdaptersRegistryService:PhotonModelAdapterConfig" : {
-      "properties" : {
-        "adapterEndpoints" : {
-          "type" : "object",
-          "description" : "Map with endpoints, given photon adapter provides.The key represents the endpoint type id (e.g. instanceAdapterLink, enumerationAdapterLink, etc) and the value is the actual link (url) of the endpoint",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom property bag that can be used to store photon model adapter specific properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "fbbd3afe-7aef-4bd4-802c-4b71c730df6c",
-          "description" : "Identifier of the photon model adapter configuration."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "Openstack, Virtustream, etc.",
-          "description" : "Name of the photon model adapter configuration."
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:TCPSocketAction" : {
-      "properties" : {
-        "port" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:common:ServiceErrorResponse" : {
-      "properties" : {
-        "details" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "SHOULD_RETRY" ]
-          }
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "messageId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "stackTrace" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "statusCode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        }
-      }
-    },
-    "com:vmware:admiral:adapter:registry:service:RegistrySearchResponse:Result" : {
-      "properties" : {
-        "automated" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "official" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "registry" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "starCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "trusted" : {
-          "type" : "boolean",
-          "example" : false
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ProvisionSecurityGroupTaskService:ProvisionSecurityGroupTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestType" : {
-          "type" : "string",
-          "enum" : [ "CREATE", "DELETE" ]
-        },
-        "securityGroupDescriptionLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "CREATED", "PROVISIONING_SECURITY_GROUPS", "REMOVING_SECURITY_GROUPS", "FINISHED", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:QuobyteVolumeSource" : {
-      "properties" : {
-        "group" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "registry" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "user" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "volume" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:network:ComputeNetworkDescriptionService:ComputeNetworkDescription" : {
-      "properties" : {
-        "assignment" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "constraints" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "326656df-8977-4b3d-bde6-984a653d4c62"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkType" : {
-          "type" : "string",
-          "description" : "Composite Template use only. Specifies the network type e.g public or isolated",
-          "enum" : [ "PUBLIC", "ISOLATED", "EXTERNAL" ]
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "securityGroupLinks" : {
-          "type" : "array",
-          "description" : "Security groups to apply to all instances connected to this network",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:PodService:PodState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a entity is part of App/Composition request."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "67f1b7aa-d523-49d8-ae15-93cf847b78f8"
-        },
-        "kubernetesSelfLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The kubernetes self link of the entity created by the Kubernetes itself."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Entity host link"
-        },
-        "pod" : {
-          "description" : "Pod is a collection of containers that can run on a host. This resource is created by clients and scheduled onto hosts.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:Pod"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ComputeDescriptionService:ComputeDescription" : {
-      "properties" : {
-        "authCredentialsLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "bootAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "constraints" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "costPerMinute" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "cpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "cpuMhzPerCore" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "currencyUnit" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "dataStoreId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "diskDescLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "enumerationAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "environmentName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "gpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "healthAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "8c46d918-a157-467c-b91b-f7b3e25d0fbe"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "instanceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkInterfaceDescLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "powerAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "powerState" : {
-          "type" : "string",
-          "enum" : [ "ON", "OFF", "UNKNOWN", "SUSPEND" ]
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "statsAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "statsAdapterReferences" : {
-          "type" : "array",
-          "description" : "Set of URIs for stats adapters of this host",
-          "items" : {
-            "type" : "string",
-            "format" : "uri"
-          }
-        },
-        "supportedChildren" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "totalMemoryBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "zoneId" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:AWSElasticBlockStoreVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "partition" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "volumeID" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerNetworkAllocationTaskService:ContainerNetworkAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerRedeploymentTaskService:ContainerRedeploymentTaskState" : {
-      "properties" : {
-        "containerDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "containerStateLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "contextId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desiredClusterSize" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:QueryTask:QueryTerm" : {
-      "properties" : {
-        "matchType" : {
-          "type" : "string",
-          "enum" : [ "WILDCARD", "TERM", "PHRASE", "PREFIX" ]
-        },
-        "matchValue" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "propertyName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "propertyType" : {
-          "type" : "string",
-          "enum" : [ "LONG", "STRING", "BYTES", "PODO", "COLLECTION", "MAP", "BOOLEAN", "DOUBLE", "InternetAddressV4", "InternetAddressV6", "DATE", "URI", "ENUM" ]
-        },
-        "range" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:NumericRange"
-        },
-        "sortOrder" : {
-          "type" : "string",
-          "enum" : [ "ASC", "DESC" ]
-        }
-      }
-    },
-    "com:vmware:admiral:closures:services:images:DockerImage" : {
-      "properties" : {
-        "computeStateLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link of the compute state where the image has been built."
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "imageDetails" : {
-          "$ref" : "#/definitions/com:google:gson:JsonElement"
-        },
-        "lastAccessedTimeMillis" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Last time accessed"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of the docker image"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:GroupResourcePlacementService:GroupResourcePlacementState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "deploymentPolicyLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : " Link to the deployment policy of this placement. If the same policy is set to a container description, then that description should be provisioned from this placement."
-        },
-        "maxNumberInstances" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The maximum number of resource instances for this placement for a group."
-        },
-        "memoryLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Memory limit in bytes per group for a resource pool."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Name of the reservation."
-        },
-        "priority" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "The priority with which the group resource placements will be applied. Lower number means higher priority."
-        },
-        "resourcePoolLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link of the ResourcePoolState associated with this placement"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The resource type for which the group resource quotas will be applied."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:content:Binding:BindingPlaceholder" : {
-      "properties" : {
-        "bindingExpression" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "defaultValue" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:content:Binding:ComponentBinding" : {
-      "properties" : {
-        "bindings" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:content:Binding"
-          }
-        },
-        "componentName" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerVolumeAllocationTaskService:ContainerVolumeAllocationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:FCVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lun" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "targetWWNs" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:HostVolumeListDataCollection:HostVolumeListDataCollectionState" : {
-      "properties" : {
-        "containerHostLinks" : {
-          "type" : "object",
-          "description" : "The list of container host links.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:Container" : {
-      "properties" : {
-        "args" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "command" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "env" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:EnvVar"
-          }
-        },
-        "image" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "imagePullPolicy" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lifecycle" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:Lifecycle"
-        },
-        "livenessProbe" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:Probe"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ports" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerPort"
-          }
-        },
-        "readinessProbe" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:Probe"
-        },
-        "resources" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ResourceRequirements"
-        },
-        "securityContext" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:SecurityContext"
-        },
-        "stdin" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "stdinOnce" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "terminationMessagePath" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tty" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "volumeMounts" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:VolumeMount"
-          }
-        },
-        "workingDir" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:HostNetworkListDataCollection:HostNetworkListDataCollectionState" : {
-      "properties" : {
-        "containerHostLinks" : {
-          "type" : "object",
-          "description" : "The list of container host links.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:HostPathVolumeSource" : {
-      "properties" : {
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:PodCondition" : {
-      "properties" : {
-        "lastProbeTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lastTransitionTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "status" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:HostContainerListDataCollection:HostContainerListDataCollectionState" : {
-      "properties" : {
-        "containerHostLinks" : {
-          "type" : "object",
-          "description" : "The map of container host links.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:maintenance:ContainerStats" : {
-      "properties" : {
-        "containerStopped" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "cpuUsage" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "healthCheckSuccess" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "healthFailureCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "healthSuccessCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "memLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "memUsage" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "networkIn" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "networkOut" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        }
-      }
-    },
-    "com:vmware:admiral:request:RequestBrokerService:RequestBrokerState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "operation" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:pods:ContainerState" : {
-      "properties" : {
-        "running" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateRunning"
-        },
-        "terminated" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateTerminated"
-        },
-        "waiting" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ContainerStateWaiting"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:support:CertificateInfo" : {
-      "properties" : {
-        "certificate" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "properties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:QueryTask:Query" : {
-      "properties" : {
-        "booleanClauses" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-          }
-        },
-        "occurance" : {
-          "type" : "string",
-          "enum" : [ "MUST_OCCUR", "MUST_NOT_OCCUR", "SHOULD_OCCUR" ]
-        },
-        "term" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:QueryTerm"
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:LogService:LogServiceState" : {
-      "properties" : {
-        "logs" : {
-          "type" : "string",
-          "format" : "binary",
-          "description" : "Stream of container log data."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:auth:project:ProjectService:ProjectState" : {
-      "properties" : {
-        "administratorsUserGroupLinks" : {
-          "type" : "array",
-          "description" : "Links to the groups of administrators for this project.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Used for descripe the purpose of the project"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "32e9b7cc-f002-433f-904a-12b0182504b7"
-        },
-        "isPublic" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Used for define a public project"
-        },
-        "membersUserGroupLinks" : {
-          "type" : "array",
-          "description" : "Links to the groups of members for this project.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ImageEnumerationTaskService:ImageEnumerationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties associated with the task.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Optional link of the end-point for which private (specific just for this endpoint) images enumeration should be triggered. Set either this property or endpointType."
-        },
-        "endpointType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Optional type of the end-points for which public (global for all endpoints of this type) images enumeration should be triggered. Set either this property or endpointLink."
-        },
-        "enumerationAction" : {
-          "type" : "string",
-          "description" : "Optional type of image enumeration: start, stop, refresh.",
-          "enum" : [ "START", "STOP", "REFRESH" ]
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "filter" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "description" : "Options used to configure specific aspects of this task execution.",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Optional identifier of the region for which public images enumeration should be triggered. Only applicable with endpointType property."
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "description" : "Optional list of tenants that can access this task.",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "java:lang:Object" : { },
-    "com:vmware:photon:controller:model:monitoring:ResourceMetricsService:ResourceMetrics" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "entries" : {
-          "type" : "object",
-          "description" : "Map of datapoints. The key represents the metric name and the valuerepresents the the metric value",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "timestampMicrosUtc" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "timestamp associated with this metric entry"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:LogConfig" : {
-      "properties" : {
-        "config" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "type" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:SubTaskService:SubTaskState" : {
-      "properties" : {
-        "completed" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:adapterapi:ResourceOperationResponse"
-          }
-        },
-        "completionsRemaining" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "failCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "failures" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:adapterapi:ResourceOperationResponse"
-          }
-        },
-        "finishedCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:NodeHealthCheckService" : {
-      "properties" : {
-        "services" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentCondition" : {
-      "properties" : {
-        "lastTransitionTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "lastUpdateTime" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "message" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "reason" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "status" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "type" : {
-          "type" : "string",
-          "enum" : [ "Available", "Progressing", "ReplicaFailure" ]
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerHostRemovalTaskService:ContainerHostRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "skipComputeHostRemoval" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:RBDVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "image" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "keyring" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "monitors" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "pool" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "readOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "sourceRef" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LocalObjectReference"
-        },
-        "user" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:ProvisionComputeTaskService:ProvisionComputeTaskState" : {
-      "properties" : {
-        "bootAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "computeLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "instanceAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "powerAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "serviceTaskCallback" : {
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "enum" : [ "CREATING_HOST", "BOOTING_FROM_NETWORK", "BOOTING_FROM_CDROM", "BOOTING_FROM_ANY", "VALIDATE_COMPUTE_HOST", "DONE", "FAILED" ]
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:ReplicaSetService:ReplicaSetState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a entity is part of App/Composition request."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "331609c4-e47b-449b-9620-8b15f1337c33"
-        },
-        "kubernetesSelfLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The kubernetes self link of the entity created by the Kubernetes itself."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Entity host link"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "replicaSet" : {
-          "description" : "ReplicaSet represents the configuration of a ReplicaSet.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSet"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:Constraint" : {
-      "properties" : {
-        "conditions" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:Constraint:Condition"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:log:EventLogService:EventLogState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Additional data like operation request/response body, Request IP, etc.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "User-friendly description of the event"
-        },
-        "eventLogType" : {
-          "type" : "string",
-          "description" : "Severity level type.",
-          "enum" : [ "INFO", "WARNING", "ERROR" ]
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "The operation this event originates from. Example: Host config, Registry config, Create container, Maintenance task."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:service:common:EventTopicService:EventTopicState" : {
-      "properties" : {
-        "blockable" : {
-          "type" : "boolean",
-          "example" : false,
-          "description" : "Blocking or asynchronous flag"
-        },
-        "description" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Reply payload."
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Event Topic id"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Event Topic name"
-        },
-        "schema" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Schema of the topic."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "topicTaskInfo" : {
-          "description" : "Topic task info.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:EventTopicService:TopicTaskInfo"
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:UserGroupService:UserGroupState" : {
-      "properties" : {
-        "query" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:Handler" : {
-      "properties" : {
-        "exec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:ExecAction"
-        },
-        "httpGet" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:HTTPGetAction"
-        },
-        "tcpSocket" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:TCPSocketAction"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:SecretVolumeSource" : {
-      "properties" : {
-        "defaultMode" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "items" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:volumes:KeyToPath"
-          }
-        },
-        "secretName" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "java:lang:String" : { },
-    "com:vmware:admiral:closures:services:closure:Closure" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "errorMsg" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Error message in case closure execution fails."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "50520c65-19b5-43e9-bce4-4aa0374690b4"
-        },
-        "inputs" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "logs" : {
-          "type" : "string",
-          "format" : "binary",
-          "description" : "Closure log data."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "outputs" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to used resource.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "state" : {
-          "type" : "string",
-          "description" : "Business state of the closure",
-          "enum" : [ "CREATED", "STARTED", "FINISHED", "FAILED", "CANCELLED" ]
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:FirewallService:FirewallState:Allow" : {
-      "properties" : {
-        "ipRange" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ports" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "protocol" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:LoadBalancerIngress" : {
-      "properties" : {
-        "hostname" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "ip" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:kubernetes:CompositeKubernetesRemovalTaskService:CompositeKubernetesRemovalTaskState" : {
-      "properties" : {
-        "cleanupOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "(Required) The composites on which the given operation will be applied.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:NetworkInterfaceDescriptionService:NetworkInterfaceDescription" : {
-      "properties" : {
-        "address" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "assignPublicIpAddress" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "assignment" : {
-          "type" : "string",
-          "enum" : [ "STATIC", "DYNAMIC" ]
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "deviceIndex" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "firewallLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "01960666-2fea-4a3a-9af4-2ca2b53d8b07"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "networkLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "securityGroupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "subnetLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerVolumeProvisionTaskService:ContainerVolumeProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Type of resource to create."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to already allocated resources that are going to be provisioned.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "Type of resource to create."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:ResourcePoolService:ResourcePoolState" : {
-      "properties" : {
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "currencyUnit" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "ceaa65ba-aee8-433f-8b59-2e83f536ee79"
-        },
-        "maxCpuCostPerMinute" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "maxCpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "maxDiskCapacityBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "maxDiskCostPerMinute" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "maxGpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "maxMemoryBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "minCpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "minDiskCapacityBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "minGpuCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "minMemoryBytes" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "projectName" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "properties" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "ELASTIC" ]
-          }
-        },
-        "query" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:composition:CompositionGraph:ResourceNode" : {
-      "properties" : {
-        "dependents" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "dependsOn" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "level" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "resourceDescLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:EndpointRemovalTaskService:EndpointRemovalTaskState" : {
-      "properties" : {
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "A link to endpoint to be deleted."
-        },
-        "errorThreshold" : {
-          "type" : "number",
-          "format" : "double",
-          "example" : 0.0
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "description" : "A list of tenant links which can access this task.",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:service:ServiceEntityHandler:ServiceState" : {
-      "properties" : {
-        "compositeComponentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Link to CompositeComponent when a entity is part of App/Composition request."
-        },
-        "creationTimeMicros" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "customProperties" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "desc" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "descriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Defines the description of the container."
-        },
-        "groupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "id" : {
-          "type" : "string",
-          "example" : "fa23806b-ad0b-4d94-ab7d-60ba1d39a76b"
-        },
-        "kubernetesSelfLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The kubernetes self link of the entity created by the Kubernetes itself."
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "parentLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Entity host link"
-        },
-        "regionId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "service" : {
-          "description" : "Service is a named abstraction of software service (for example, mysql) consisting of local port (for example 3306) that the proxy listens on, and the selector that determines which pods will answer requests sent through the proxy.",
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:Service"
-        },
-        "tagLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:network:ComputeNetworkCIDRAllocationService:ComputeNetworkCIDRAllocationState" : {
-      "properties" : {
-        "networkLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The link of the NetworkState to be partitioned to subnet CIDRs."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:network:Ipam" : {
-      "properties" : {
-        "config" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:admiral:compute:container:network:IpamConfig"
-          }
-        },
-        "driver" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:ResourceGroupService:ResourceGroupState" : {
-      "properties" : {
-        "query" : {
-          "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask:Query"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:volumes:VsphereVirtualDiskVolumeSource" : {
-      "properties" : {
-        "fsType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "volumePath" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:data:Schema" : {
-      "properties" : {
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "fields" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:container:DeploymentPolicyService:DeploymentPolicy" : {
-      "properties" : {
-        "description" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:closures:services:adapter:AdmiralAdapterService:AdmiralAdapterTaskState" : {
-      "properties" : {
-        "configuration" : {
-          "$ref" : "#/definitions/com:vmware:admiral:closures:drivers:ContainerConfiguration"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "imageConfig" : {
-          "$ref" : "#/definitions/com:vmware:admiral:closures:drivers:ImageConfiguration"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:common:ServiceDocumentQueryResult:ContinuousResult" : {
-      "properties" : {
-        "documentCountAdded" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "documentCountDeleted" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        },
-        "documentCountUpdated" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:GraphQueryTask" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "FILTER_STAGE_RESULTS" ]
-          }
-        },
-        "stages" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:xenon:services:common:QueryTask"
-          }
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:Deployment" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "kind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentSpec"
-        },
-        "status" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentStatus"
-        }
-      }
-    },
-    "com:vmware:xenon:common:ServiceDocument" : { },
-    "com:vmware:admiral:service:common:ServiceTaskCallback" : {
-      "properties" : {
-        "serviceSelfLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:EndpointAllocationTaskState" : {
-      "properties" : {
-        "adapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service",
-          "description" : "URI reference to the adapter used to validate and enhance the endpoint data."
-        },
-        "certificateInfo" : {
-          "description" : "Certificate info populated in case of failure when validate the endpoint.",
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:support:CertificateInfo"
-        },
-        "endpointState" : {
-          "description" : "Endpoint payload to use to create/update Endpoint.",
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:EndpointService:EndpointState"
-        },
-        "enumerationRequest" : {
-          "description" : "If specified a Resource enumeration will be scheduled.",
-          "$ref" : "#/definitions/com:vmware:photon:controller:model:tasks:EndpointAllocationTaskService:ResourceEnumerationRequest"
-        },
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "options" : {
-          "type" : "array",
-          "description" : "Task's options",
-          "items" : {
-            "type" : "string",
-            "enum" : [ "DOCUMENT_CHANGES_ONLY", "VALIDATE_ONLY", "IS_MOCK", "PRESERVE_MISSING_RESOUCES", "SELF_DELETE_ON_COMPLETION" ]
-          }
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "description" : " List of tenants that can access this task.",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:SecretKeySelector" : {
-      "properties" : {
-        "key" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentSpec" : {
-      "properties" : {
-        "minReadySeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "paused" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "progressDeadlineSeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "revisionHistoryLimit" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "rollbackTo" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:RollbackConfig"
-        },
-        "selector" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LabelSelector"
-        },
-        "strategy" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:deployments:DeploymentStrategy"
-        },
-        "template" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodTemplateSpec"
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:LoadBalancerProvisionTaskService:LoadBalancerProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to already allocated resources that are going to be provisioned.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:tasks:SnapshotTaskService:SnapshotTaskState" : {
-      "properties" : {
-        "failureMessage" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "isMockRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "snapshotAdapterReference" : {
-          "type" : "string",
-          "format" : "uri",
-          "example" : "http://localhost:1234/some/service"
-        },
-        "snapshotLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "taskInfo" : {
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:services:common:UserService:UserState" : {
-      "properties" : {
-        "email" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "userGroupLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:composition:CompositionSubTaskService:CompositionSubTaskState" : {
-      "properties" : {
-        "allocationRequest" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "compositeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "currentDependsOnLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "dependentLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "dependsOnLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "errorCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "name" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "operation" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "postAllocation" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestId" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service"
-        },
-        "resourceType" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:photon:controller:model:resources:DiskService:DiskState:BootConfig" : {
-      "properties" : {
-        "data" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "files" : {
-          "type" : "array",
-          "items" : {
-            "$ref" : "#/definitions/com:vmware:photon:controller:model:resources:DiskService:DiskState:BootConfig:FileEntry"
-          }
-        },
-        "label" : {
-          "type" : "string",
-          "example" : "example string"
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputeNetworkProvisionTaskService:ComputeNetworkProvisionTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourceDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "Type of resource to create."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "description" : "Links to already allocated resources that are going to be provisioned.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerRemovalTaskService:ContainerRemovalTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "removeOnly" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "skipReleaseResourcePlacement" : {
-          "type" : "boolean",
-          "example" : false
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:common:LabelSelectorRequirement" : {
-      "properties" : {
-        "key" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "operator" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "values" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:services:Service" : {
-      "properties" : {
-        "apiVersion" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "kind" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "metadata" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:ObjectMeta"
-        },
-        "spec" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:ServiceSpec"
-        },
-        "status" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:services:ServiceStatus"
-        }
-      }
-    },
-    "com:vmware:admiral:request:ContainerOperationTaskService:ContainerOperationTaskState" : {
-      "properties" : {
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "operation" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:xenon:common:LoaderService:LoaderServiceState" : {
-      "properties" : {
-        "loaderType" : {
-          "type" : "string",
-          "enum" : [ "FILESYSTEM" ]
-        },
-        "path" : {
-          "type" : "string",
-          "example" : "example string"
-        },
-        "servicePackages" : {
-          "type" : "object",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        }
-      }
-    },
-    "com:vmware:admiral:compute:kubernetes:entities:replicaset:ReplicaSetSpec" : {
-      "properties" : {
-        "minReadySeconds" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "replicas" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0
-        },
-        "selector" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:common:LabelSelector"
-        },
-        "template" : {
-          "$ref" : "#/definitions/com:vmware:admiral:compute:kubernetes:entities:pods:PodTemplateSpec"
-        }
-      }
-    },
-    "com:vmware:admiral:request:compute:ComputePlacementSelectionTaskService:ComputePlacementSelectionTaskState" : {
-      "properties" : {
-        "computeDescriptionLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The description that defines the requested resource."
-        },
-        "contextId" : {
-          "type" : "string",
-          "example" : "example string",
-          "description" : "(Required) The overall contextId of thisrequest (could be the same across multiple request - composite allocation)"
-        },
-        "customProperties" : {
-          "type" : "object",
-          "description" : "Custom properties.",
-          "additionalProperties" : {
-            "type" : "string"
-          }
-        },
-        "endpointLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "The endpoint to be used for this placement."
-        },
-        "requestTrackerLink" : {
-          "type" : "string",
-          "example" : "some/service",
-          "description" : "link to a service that will receive updates when the task changes state."
-        },
-        "resourceCount" : {
-          "type" : "integer",
-          "format" : "int64",
-          "example" : 0.0,
-          "description" : "Number of resources to provision."
-        },
-        "resourcePoolLinks" : {
-          "type" : "array",
-          "description" : "The resource pool to be used for this placement.",
-          "items" : {
-            "type" : "string"
-          }
-        },
-        "serviceTaskCallback" : {
-          "description" : "Callback link and response from the service initiated this task.",
-          "$ref" : "#/definitions/com:vmware:admiral:service:common:ServiceTaskCallback"
-        },
-        "taskInfo" : {
-          "description" : " Describes a service task state.",
-          "$ref" : "#/definitions/com:vmware:xenon:common:TaskState"
-        },
-        "taskSubStage" : {
-          "type" : "string",
-          "description" : " Describes a service task sub stage."
-        },
-        "tenantLinks" : {
-          "type" : "array",
-          "items" : {
-            "type" : "string"
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/merger_test.go b/installer/vendor/github.com/vmware/vic/lib/config/dynamic/merger_test.go
deleted file mode 100644
index 7a2164c391..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/config/dynamic/merger_test.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package dynamic
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/registry"
-)
-
-func TestWhitelistMerger(t *testing.T) {
-	var tests = []struct {
-		orig, other registry.Entry
-		res         registry.Entry
-		err         error
-	}{
-		{
-			orig:  registry.ParseEntry("10.10.10.10"),
-			other: registry.ParseEntry("10.10.10.10"),
-			res:   registry.ParseEntry("10.10.10.10"),
-		},
-		{
-			orig:  registry.ParseEntry("10.10.10.10"),
-			other: registry.ParseEntry("10.10.10.20"),
-		},
-		{
-			orig:  registry.ParseEntry("10.10.10.10/24"),
-			other: registry.ParseEntry("10.10.10.10/24"),
-			res:   registry.ParseEntry("10.10.10.10/24"),
-		},
-		{
-			other: registry.ParseEntry("10.10.10.10/24"),
-			orig:  registry.ParseEntry("192.168.1.0/24"),
-		},
-		{
-			orig:  registry.ParseEntry("10.10.10.10/24"),
-			other: registry.ParseEntry("10.10.10.10/16"),
-			err:   assert.AnError,
-		},
-		{
-			orig:  registry.ParseEntry("10.10.10.10/16"),
-			other: registry.ParseEntry("10.10.10.10/24"),
-			res:   registry.ParseEntry("10.10.10.10/24"),
-		},
-		{
-			orig:  registry.ParseEntry("*.google.com"),
-			other: registry.ParseEntry("*.google.com"),
-			res:   registry.ParseEntry("*.google.com"),
-		},
-		{
-			orig:  registry.ParseEntry("*.yahoo.com"),
-			other: registry.ParseEntry("*.google.com"),
-		},
-		{
-			orig:  registry.ParseEntry("*.google.com"),
-			other: registry.ParseEntry("mail.google.com"),
-			res:   registry.ParseEntry("mail.google.com"),
-		},
-		{
-			orig:  registry.ParseEntry("mail.google.com"),
-			other: registry.ParseEntry("*.google.com"),
-			err:   assert.AnError,
-		},
-		{
-			orig:  registry.ParseEntry("192.168.1.1:123"),
-			other: registry.ParseEntry("192.168.1.1"),
-			err:   assert.AnError,
-		},
-		{
-			orig:  registry.ParseEntry("192.168.1.1"),
-			other: registry.ParseEntry("192.168.1.1:123"),
-			res:   registry.ParseEntry("192.168.1.1"),
-		},
-		{
-			orig:  registry.ParseEntry("foo:123"),
-			other: registry.ParseEntry("foo"),
-			err:   assert.AnError,
-		},
-		{
-			orig:  registry.ParseEntry("foo"),
-			other: registry.ParseEntry("foo:123"),
-			res:   registry.ParseEntry("foo"),
-		},
-		{
-			orig:  registry.ParseEntry("http://foo"),
-			other: registry.ParseEntry("foo:123"),
-		},
-		{
-			orig:  registry.ParseEntry("http://foo"),
-			other: registry.ParseEntry("http://foo:123"),
-		},
-		{
-			orig:  registry.ParseEntry("http://foo:123"),
-			other: registry.ParseEntry("http://foo"),
-		},
-		{
-			orig:  registry.ParseEntry("http://foo/bar"),
-			other: registry.ParseEntry("http://foo"),
-			err:   assert.AnError,
-		},
-		{
-			orig:  registry.ParseEntry("https://foo/bar"),
-			other: registry.ParseEntry("http://foo/bar"),
-		},
-		{
-			orig:  registry.ParseEntry("https://foo"),
-			other: registry.ParseEntry("foo"),
-			err:   assert.AnError,
-		},
-	}
-
-	m := &whitelistMerger{}
-
-	for _, te := range tests {
-		res, err := m.Merge(te.orig, te.other)
-		if te.err == nil {
-			assert.Nil(t, err, "case: orig: %s, other: %s, err: %v, res: %s", te.orig, te.other, te.err, te.res)
-		} else {
-			assert.NotNil(t, err, "case: orig: %s, other: %s, err: %v, res: %s", te.orig, te.other, te.err, te.res)
-		}
-
-		if te.res == nil {
-			assert.Nil(t, res, "case: orig: %s, other: %s, err: %v, res: %s", te.orig, te.other, te.err, te.res)
-		} else {
-			assert.True(t, te.res.Equal(res), "%s merge %s, %s (expected) == %s (actual)", te.orig, te.other, te.res, res)
-		}
-	}
-}
-
-func TestMergerMergeWhitelist(t *testing.T) {
-	var tests = []struct {
-		orig, other, res *config.VirtualContainerHostConfigSpec
-		err              error
-	}{
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: nil,
-				},
-			},
-			res: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-		},
-		// disallow the merge if the other whitelist
-		// has an entry that is not allowed on the
-		// original whitelist
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"foo.docker.io", "malicious.io"},
-				},
-			},
-			err: assert.AnError,
-		},
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"*.docker.io"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"bar.docker.io", "foo.docker.io"},
-				},
-			},
-			res: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"bar.docker.io", "foo.docker.io"},
-				},
-			},
-		},
-		// result of a merge is always the other if
-		// its a subset of the original
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io", "harbor.ci.local"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-			res: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-		},
-		// empty original whitelist and non-empty other
-		// whitelist results in other whitelist
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: nil,
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-			res: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"docker.io"},
-				},
-			},
-		},
-		// more permissive other whitelist results in error
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"foo.docker.io"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"*.docker.io"},
-				},
-			},
-			err: assert.AnError,
-		},
-		// less permissive other whitelist results in other whitelist
-		{
-			orig: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"*.docker.io"},
-				},
-			},
-			other: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"foo.docker.io"},
-				},
-			},
-			res: &config.VirtualContainerHostConfigSpec{
-				Registry: config.Registry{
-					RegistryWhitelist: []string{"foo.docker.io"},
-				},
-			},
-		},
-	}
-
-	m := NewMerger()
-	for _, te := range tests {
-		t.Logf("orig: %+v, other: %+v, err: %+v", te.orig.RegistryWhitelist, te.other.RegistryWhitelist, te.err)
-		if te.res != nil {
-			t.Logf("res: %+v", te.res.RegistryWhitelist)
-		}
-		res, err := m.Merge(te.orig, te.other)
-		if te.err != nil {
-			assert.NotNil(t, err, "expected error, got nil")
-			assert.Nil(t, res)
-			continue
-		}
-
-		assert.Nil(t, err, "expected no error, got \"%+v\"", err)
-		assert.NotNil(t, res)
-		assert.Len(t, res.RegistryWhitelist, len(te.res.RegistryWhitelist), "expected %v, got %v", te.res.RegistryWhitelist, res.RegistryWhitelist)
-		for i := range res.RegistryWhitelist {
-			found := false
-			for j := range te.res.RegistryWhitelist {
-				if res.RegistryWhitelist[i] == te.res.RegistryWhitelist[j] {
-					found = true
-					break
-				}
-			}
-
-			assert.True(t, found, "expected whitelist %v, got %v", te.res.RegistryWhitelist, res.RegistryWhitelist)
-			if !found {
-				t.FailNow()
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/executor/container_vm.go b/installer/vendor/github.com/vmware/vic/lib/config/executor/container_vm.go
index ef6c90d373..a6a23d36ac 100644
--- a/installer/vendor/github.com/vmware/vic/lib/config/executor/container_vm.go
+++ b/installer/vendor/github.com/vmware/vic/lib/config/executor/container_vm.go
@@ -320,6 +320,8 @@ func ParseTrustLevel(value string) (TrustLevel, error) {
 		trust = Outbound
 	case "peers":
 		trust = Peers
+	case "":
+		trust = Unspecified
 	default:
 		return Unspecified, fmt.Errorf("Unrecognized container trust level %s.", value)
 	}
diff --git a/installer/vendor/github.com/vmware/vic/lib/config/virtual_container_host.go b/installer/vendor/github.com/vmware/vic/lib/config/virtual_container_host.go
index 1cef750242..3f51b99ecc 100644
--- a/installer/vendor/github.com/vmware/vic/lib/config/virtual_container_host.go
+++ b/installer/vendor/github.com/vmware/vic/lib/config/virtual_container_host.go
@@ -1,4 +1,4 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -34,11 +34,14 @@ type PatternToken string
 
 const (
 	// VM is the VM name - i.e. [ds] {vm}/{vm}.vmx
-	VM PatternToken = "{vm}"
+	VMToken PatternToken = "{vm}"
 	// ID is the container ID for the VM
-	ID PatternToken = "{id}"
+	IDToken PatternToken = "{id}"
 	// Name is the container name of the VM
-	Name PatternToken = "{name}"
+	NameToken PatternToken = "{name}"
+
+	// The default naming pattern that gets applied if no convention is supplied
+	DefaultNamePattern = "{name}-{id}"
 
 	// ID represents the VCH in creating status, which helps to identify VCH VM which still does not have a valid VM moref set
 	CreatingVCH = "CreatingVCH"
@@ -55,8 +58,14 @@ const (
 	GeneralHTTPSProxy  = "HTTPS_PROXY"
 	VICAdminHTTPProxy  = "VICADMIN_HTTP_PROXY"
 	VICAdminHTTPSProxy = "VICADMIN_HTTPS_PROXY"
+
+	AddPerms = "ADD"
 )
 
+func (p PatternToken) String() string {
+	return string(p)
+}
+
 // Can we just treat the VCH appliance as a containerVM booting off a specific bootstrap image
 // It has many of the same requirements (around networks being attached, version recorded,
 // volumes mounted, et al). Each of the components can easily be captured as a Session given they
@@ -96,6 +105,9 @@ type VirtualContainerHostConfigSpec struct {
 	// configuration for vic-machine
 	CreateBridgeNetwork bool `vic:"0.1" scope:"read-only" key:"create_bridge_network"`
 
+	// grant ops-user permissions, string instead of bool for future enhancements
+	GrantPermsLevel string `vic:"0.1" scope:"read-only" key:"grant_permissions"`
+
 	// vic-machine create options used to create or reconfigure the VCH
 	VicMachineCreateOptions []string `vic:"0.1" scope:"read-only" key:"vic_machine_create_options"`
 }
@@ -110,6 +122,10 @@ type Container struct {
 	BootstrapImagePath string `vic:"0.1" scope:"read-only" key:"bootstrap_image_path"`
 	// Allow custom naming convention for containerVMs
 	ContainerNameConvention string
+	// Whether to create and manage a DRS VM Group for the VCH and its containerVMs
+	UseVMGroup bool
+	// Name to use for the DRS VM Group
+	VMGroupName string
 	// Permitted datastore URLs for container storage for this virtual container host
 	ContainerStores []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
 }
@@ -248,6 +264,18 @@ func (t *VirtualContainerHostConfigSpec) IsCreating() bool {
 	return t.ExecutorConfig.ID == CreatingVCH
 }
 
+func (t *VirtualContainerHostConfigSpec) SetGrantPerms() {
+	t.GrantPermsLevel = AddPerms
+}
+
+func (t *VirtualContainerHostConfigSpec) ClearGrantPerms() {
+	t.GrantPermsLevel = ""
+}
+
+func (t *VirtualContainerHostConfigSpec) ShouldGrantPerms() bool {
+	return t.GrantPermsLevel == AddPerms
+}
+
 // AddNetwork adds a network that will be configured on the appliance VM
 func (t *VirtualContainerHostConfigSpec) AddNetwork(net *executor.NetworkEndpoint) {
 	if net != nil {
diff --git a/installer/vendor/github.com/vmware/vic/lib/constants/constants.go b/installer/vendor/github.com/vmware/vic/lib/constants/constants.go
index 3e3326bbbd..cbe4117110 100644
--- a/installer/vendor/github.com/vmware/vic/lib/constants/constants.go
+++ b/installer/vendor/github.com/vmware/vic/lib/constants/constants.go
@@ -24,6 +24,7 @@ import (
 /* VCH constants */
 const (
 	SerialOverLANPort  = 2377
+	VchAdminPortalPort = 2378
 	AttachServerPort   = 2379
 	ManagementHostName = "management.localhost"
 	ClientHostName     = "client.localhost"
@@ -62,6 +63,18 @@ const (
 
 	// NilSlot is an invalid PCI slot number
 	NilSlot int32 = 0
+
+	// All paths on the datastore for images are relative to <datastore>/VIC/
+	StorageParentDir = "VIC"
+
+	// Key-value storage directory.
+	KVStoreFolder = "kvStores"
+
+	// All volumes are stored in this directory.
+	VolumesDir = "volumes"
+
+	// Scratch layer ID
+	ScratchLayerID = "scratch"
 )
 
 func DefaultAltVCHGuestName() string {
diff --git a/installer/vendor/github.com/vmware/vic/lib/constants/install.go b/installer/vendor/github.com/vmware/vic/lib/constants/install.go
new file mode 100644
index 0000000000..bc36894273
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/lib/constants/install.go
@@ -0,0 +1,20 @@
+// Copyright 2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package constants
+
+const (
+	DefaultBaseImageScratchSize = "8GB"
+	DefaultEndpointMemoryMB     = 2048
+)
diff --git a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client.go b/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client.go
deleted file mode 100644
index 491abbeee0..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client.go
+++ /dev/null
@@ -1,433 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package client
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/d2g/dhcp4"
-	"github.com/d2g/dhcp4client"
-
-	"github.com/vmware/vic/lib/dhcp"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Client represents a DHCP client
-type Client interface {
-	// SetTimeout sets the timeout for a subsequent DHCP request
-	SetTimeout(t time.Duration)
-
-	// Request sends a full DHCP request, resulting in a DHCP lease.
-	// On a successful lease, returns a DHCP acknowledgment packet
-	Request() error
-
-	// Renew renews an existing DHCP lease. Returns a new acknowledgment
-	// packet on success.
-	Renew() error
-
-	// Release releases an existing DHCP lease.
-	Release() error
-
-	// SetParamterRequestList sets the DHCP parameter request list
-	// per RFC 2132, section 9.8
-	SetParameterRequestList(...byte)
-
-	// LastAck returns the last ack packet from a request or renew operation.
-	LastAck() *dhcp.Packet
-}
-
-type client struct {
-	timeout time.Duration
-	id      ID
-	params  []byte
-	ack     dhcp4.Packet
-}
-
-// The default timeout for the client
-const defaultTimeout = 10 * time.Second
-
-// NewClient creates a new DHCP client. Note the returned object is not thread-safe.
-func NewClient(ifIndex int, hwaddr net.HardwareAddr) (Client, error) {
-	defer trace.End(trace.Begin(""))
-
-	id, err := NewID(ifIndex, hwaddr)
-	if err != nil {
-		return nil, err
-	}
-
-	return &client{
-		id:      id,
-		timeout: defaultTimeout,
-	}, nil
-}
-
-func (c *client) SetTimeout(t time.Duration) {
-	defer trace.End(trace.Begin(""))
-
-	c.timeout = t
-}
-
-// Note that the Go runtime sets SA_RESTART for syscalls which retries them automatically if they interrupted.
-// However, from the signal man page:
-//
-//      The following interfaces are never restarted after being interrupted
-//      by a signal handler, regardless of the use of SA_RESTART; they always
-//      fail with the error EINTR when interrupted by a signal handler:
-//
-//      * "Input" socket interfaces, when a timeout (SO_RCVTIMEO) has been
-//      set on the socket using setsockopt(2): accept(2), recv(2),
-//      recvfrom(2), recvmmsg(2) (also with a non-NULL timeout argument),
-//      and recvmsg(2).
-//
-//      * "Output" socket interfaces, when a timeout (SO_RCVTIMEO) has been
-//      set on the socket using setsockopt(2): connect(2), send(2),
-//      sendto(2), and sendmsg(2).
-func withRetry(name string, op func() error) error {
-	defer trace.End(trace.Begin(""))
-
-	for {
-		if err := op(); err != nil {
-			if errno, ok := err.(syscall.Errno); ok {
-				if errno == syscall.EAGAIN || errno == syscall.EINTR {
-					log.Debugf("retrying %q: errno=%d, error=%s", name, errno, err)
-					continue
-				}
-			}
-			return err
-		}
-
-		return nil
-	}
-}
-
-func (c *client) isCompletePacket(p *dhcp.Packet) bool {
-	complete := !ip.IsUnspecifiedIP(p.YourIP()) &&
-		!ip.IsUnspecifiedIP(p.ServerIP())
-
-	if !complete {
-		return false
-	}
-
-	for _, param := range c.params {
-		switch dhcp4.OptionCode(param) {
-		case dhcp4.OptionSubnetMask:
-			ones, bits := p.SubnetMask().Size()
-			if ones == 0 || bits == 0 {
-				return false
-			}
-		case dhcp4.OptionRouter:
-			if ip.IsUnspecifiedIP(p.Gateway()) {
-				return false
-			}
-		case dhcp4.OptionDomainNameServer:
-			if len(p.DNS()) == 0 {
-				return false
-			}
-		}
-	}
-
-	if p.LeaseTime().Seconds() == 0 {
-		return false
-	}
-
-	return true
-}
-
-func (c *client) discoverPacket(cl *dhcp4client.Client) (dhcp4.Packet, error) {
-	defer trace.End(trace.Begin(""))
-
-	dp := cl.DiscoverPacket()
-	return c.setOptions(dp)
-}
-
-func (c *client) requestPacket(cl *dhcp4client.Client, op *dhcp4.Packet) (dhcp4.Packet, error) {
-	defer trace.End(trace.Begin(""))
-
-	rp := cl.RequestPacket(op)
-	return c.setOptions(rp)
-}
-
-func logDHCPPacketNoOptions(p dhcp4.Packet) {
-	log.Debugf("OpCode: %d, HType: %d, HLen: %d, Hops: %d, XId: %+v, Secs: %+v, Flags: %+v, CIAddr: %s, "+
-		"YIAddr: %s, SIAddr: %s, GIAddr: %s, CHAddr: %s, Cookie: %+v, Broadcast: %v",
-		p.OpCode(), p.HType(), p.HLen(), p.Hops(), p.XId(), p.Secs(), p.Flags(),
-		p.CIAddr().String(), p.YIAddr().String(), p.SIAddr().String(), p.GIAddr().String(), p.CHAddr().String(),
-		p.Cookie(), p.Broadcast())
-}
-
-func logDHCPPacketAndOptions(p dhcp4.Packet, o dhcp4.Options) {
-	logDHCPPacketNoOptions(p)
-	log.Debugf("Options: %+v", o)
-}
-
-func logDHCPPacket(p dhcp4.Packet) {
-	o := p.ParseOptions()
-	logDHCPPacketAndOptions(p, o)
-}
-
-func (c *client) request(cl *dhcp4client.Client) (bool, dhcp4.Packet, error) {
-	defer trace.End(trace.Begin(""))
-
-	dp, err := c.discoverPacket(cl)
-	if err != nil {
-		return false, nil, err
-	}
-
-	dp.PadToMinSize()
-	if err = cl.SendPacket(dp); err != nil {
-		return false, nil, err
-	}
-
-	var op dhcp4.Packet
-	for {
-		op, err = cl.GetOffer(&dp)
-		if err != nil {
-			return false, nil, err
-		}
-
-		if c.isCompletePacket(dhcp.NewPacket([]byte(op))) {
-			break
-		}
-	}
-
-	rp, err := c.requestPacket(cl, &op)
-	if err != nil {
-		return false, nil, err
-	}
-
-	rp.PadToMinSize()
-	if err = cl.SendPacket(rp); err != nil {
-		return false, nil, err
-	}
-
-	ack, err := cl.GetAcknowledgement(&rp)
-	if err != nil {
-		return false, nil, err
-	}
-
-	opts := ack.ParseOptions()
-	logDHCPPacketAndOptions(ack, opts)
-
-	if dhcp4.MessageType(opts[dhcp4.OptionDHCPMessageType][0]) == dhcp4.NAK {
-		return false, nil, fmt.Errorf("Got NAK from DHCP server")
-	}
-
-	return true, ack, nil
-}
-
-func (c *client) Request() error {
-	defer trace.End(trace.Begin(""))
-
-	log.Debugf("id: %+v", c.id)
-	// send the request over a raw socket
-	raw, err := dhcp4client.NewPacketSock(c.id.IfIndex)
-	if err != nil {
-		return err
-	}
-
-	rawc, err := dhcp4client.New(
-		dhcp4client.Connection(raw),
-		dhcp4client.Timeout(c.timeout),
-		dhcp4client.HardwareAddr(c.id.HardwareAddr))
-	if err != nil {
-		return err
-	}
-	defer rawc.Close()
-
-	success := false
-	var p dhcp4.Packet
-	err = withRetry("DHCP request", func() error {
-		var err error
-		success, p, err = c.request(rawc)
-		return err
-	})
-
-	if err != nil {
-		return err
-	}
-
-	if !success {
-		return fmt.Errorf("failed dhcp request")
-	}
-
-	log.Debugf("%+v", p)
-	c.ack = p
-	return nil
-}
-
-func (c *client) newClient() (*dhcp4client.Client, error) {
-	defer trace.End(trace.Begin(""))
-
-	ack := dhcp.NewPacket(c.ack)
-	conn, err := dhcp4client.NewInetSock(dhcp4client.SetRemoteAddr(net.UDPAddr{IP: ack.ServerIP(), Port: 67}))
-	if err != nil {
-		return nil, err
-	}
-
-	cl, err := dhcp4client.New(dhcp4client.Connection(conn), dhcp4client.Timeout(c.timeout))
-	if err != nil {
-		return nil, err
-	}
-
-	return cl, nil
-}
-
-func (c *client) renew(cl *dhcp4client.Client) (dhcp4.Packet, error) {
-	defer trace.End(trace.Begin(""))
-
-	rp := cl.RenewalRequestPacket(&c.ack)
-	rp, err := c.setOptions(rp)
-	if err != nil {
-		return nil, err
-	}
-
-	rp.PadToMinSize()
-	if err = cl.SendPacket(rp); err != nil {
-		return nil, err
-	}
-
-	newack, err := cl.GetAcknowledgement(&rp)
-	if err != nil {
-		return nil, err
-	}
-
-	opts := newack.ParseOptions()
-	if dhcp4.MessageType(opts[dhcp4.OptionDHCPMessageType][0]) == dhcp4.NAK {
-		return nil, fmt.Errorf("received NAK from DHCP server")
-	}
-
-	return newack, nil
-}
-
-func (c *client) Renew() error {
-	defer trace.End(trace.Begin(""))
-
-	if c.ack == nil {
-		return fmt.Errorf("no ack packet, call Request first")
-	}
-
-	cl, err := c.newClient()
-	if err != nil {
-		return err
-	}
-	defer cl.Close()
-
-	var newack dhcp4.Packet
-	err = withRetry("DHCP renew", func() error {
-		var err error
-		newack, err = c.renew(cl)
-		return err
-	})
-
-	if err != nil {
-		return err
-	}
-
-	c.ack = newack
-	return nil
-}
-
-func (c *client) Release() error {
-	defer trace.End(trace.Begin(""))
-
-	if len(c.ack) == 0 {
-		return fmt.Errorf("no ack packet, call Request first")
-	}
-
-	cl, err := c.newClient()
-	if err != nil {
-		return err
-	}
-	defer cl.Close()
-
-	return withRetry("DHCP release", func() error {
-		return cl.Release(c.ack)
-	})
-}
-
-// SetParamterRequestList sets the DHCP parameter request list
-// per RFC 2132, section 9.8
-func (c *client) SetParameterRequestList(params ...byte) {
-	defer trace.End(trace.Begin(""))
-
-	c.params = make([]byte, len(params))
-	copy(c.params, params)
-	log.Debugf("c.params=%#v", c.params)
-}
-
-// setOptions sets dhcp options on a dhcp packet
-func (c *client) setOptions(p dhcp4.Packet) (dhcp4.Packet, error) {
-	defer trace.End(trace.Begin(""))
-
-	dirty := false
-	opts := p.ParseOptions()
-
-	// the current parameter request list
-	rl := opts[dhcp4.OptionParameterRequestList]
-	// figure out if there are any new parameters
-	for _, p := range c.params {
-		if bytes.IndexByte(rl, p) == -1 {
-			dirty = true
-			rl = append(rl, p)
-		}
-	}
-
-	opts[dhcp4.OptionParameterRequestList] = rl
-
-	if _, ok := opts[dhcp4.OptionClientIdentifier]; !ok {
-		b, err := c.id.MarshalBinary()
-		if err != nil {
-			return p, err
-		}
-
-		opts[dhcp4.OptionClientIdentifier] = b
-		dirty = true
-	}
-
-	// finally reset the options on the packet, if necessary
-	if dirty {
-		// strip out all options, and add them back in with the new changed options;
-		// this is the only way currently to delete/modify a packet option
-		p.StripOptions()
-		// have to copy since values in opts (of type []byte) are still pointing into p
-		var newp dhcp4.Packet
-		newp = make([]byte, len(p))
-		copy(newp, p)
-		log.Debugf("opts=%#v", opts)
-		for o, v := range opts {
-			newp.AddOption(o, v)
-		}
-
-		p = newp
-	}
-
-	return p, nil
-}
-
-func (c *client) LastAck() *dhcp.Packet {
-	defer trace.End(trace.Begin(""))
-
-	if c.ack == nil {
-		return nil
-	}
-
-	return dhcp.NewPacket(c.ack)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client_test.go b/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client_test.go
deleted file mode 100644
index 2f3b3a2a7f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/client_test.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package client
-
-import (
-	"bufio"
-	"errors"
-	"net"
-	"os"
-	"strings"
-	"syscall"
-	"testing"
-
-	"io/ioutil"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/d2g/dhcp4"
-	"github.com/google/uuid"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/system"
-)
-
-var dummyHWAddr net.HardwareAddr = []byte{0x6, 0x0, 0x0, 0x0, 0x0, 0x0}
-
-func TestMain(m *testing.M) {
-	Sys = system.System{
-		UUID: uuid.New().String(),
-	}
-
-	os.Exit(m.Run())
-}
-
-func TestSetOptions(t *testing.T) {
-	id, err := NewID(0, dummyHWAddr)
-	assert.NoError(t, err)
-	c := &client{
-		id: id,
-	}
-	p := dhcp4.NewPacket(dhcp4.BootRequest)
-
-	var tests = []struct {
-		prl []byte
-	}{
-		{
-			prl: []byte{
-				byte(dhcp4.OptionSubnetMask),
-				byte(dhcp4.OptionRouter),
-			},
-		},
-		{
-			prl: []byte{
-				byte(dhcp4.OptionSubnetMask),
-				byte(dhcp4.OptionRouter),
-				byte(dhcp4.OptionNameServer),
-			},
-		},
-	}
-
-	for _, te := range tests {
-		c.SetParameterRequestList(te.prl...)
-		p, err := c.setOptions(p)
-		assert.NoError(t, err)
-		assert.NotEmpty(t, p)
-
-		opts := p.ParseOptions()
-
-		prl := opts[dhcp4.OptionParameterRequestList]
-		assert.NotNil(t, prl)
-		assert.EqualValues(t, te.prl, prl)
-
-		// packet should have client id set
-		cid := opts[dhcp4.OptionClientIdentifier]
-		assert.NotNil(t, cid)
-		b, _ := id.MarshalBinary()
-		assert.EqualValues(t, cid, b)
-	}
-}
-
-func TestWithRetry(t *testing.T) {
-	errors := []error{
-		syscall.Errno(syscall.EAGAIN),
-		syscall.Errno(syscall.EINTR),
-		errors.New("fail"),
-	}
-
-	i := 0
-
-	err := withRetry("test fail", func() error {
-		e := errors[i]
-		i++
-		return e
-	})
-
-	if err != errors[len(errors)-1] {
-		t.Errorf("err=%s", err)
-	}
-
-	err = withRetry("test ok", func() error {
-		return nil
-	})
-
-	if err != nil {
-		t.Errorf("err=%s", err)
-	}
-}
-
-const packetStr string = "OpCode: 1, HType: 2, HLen: 14, Hops: 3, XId: [1 2 3 4], Secs: [0 0], Flags: [5 6], " +
-	"CIAddr: 1.2.3.4, YIAddr: 0.0.0.0, SIAddr: 0.0.0.0, GIAddr: 0.0.0.0, " + "" +
-	"CHAddr: 01:02:03:04:05:06:07:08:09:0a:0b:0c:0d:0e, " +
-	"Cookie: [7 8 9 10], Broadcast: false"
-
-const optionStr string = "Options: map"
-
-func TestLog(t *testing.T) {
-	id, err := NewID(0, dummyHWAddr)
-	assert.NoError(t, err)
-	c := &client{
-		id: id,
-	}
-
-	p := dhcp4.NewPacket(dhcp4.BootRequest)
-	p.SetHType(2)
-	p.SetHops(3)
-	p.SetXId([]byte{1, 2, 3, 4})
-	p.SetFlags([]byte{5, 6})
-	p.SetCookie([]byte{7, 8, 9, 10})
-	p.SetCIAddr([]byte{1, 2, 3, 4})
-	p.SetCHAddr([]byte{0x1, 0x2, 0x3, 0x4, 0x5, 0x6, 0x7, 0x8, 0x9, 0xa, 0xb, 0xc, 0xd, 0xe})
-
-	var opts = struct {
-		prl []byte
-	}{
-		prl: []byte{
-			byte(dhcp4.OptionSubnetMask),
-			byte(dhcp4.OptionRouter),
-			byte(dhcp4.OptionNameServer),
-		},
-	}
-
-	f, err := ioutil.TempFile("", "DhcpClient-")
-	defer os.Remove(f.Name())
-
-	if err == nil {
-		log.SetOutput(f)
-		log.SetLevel(log.DebugLevel)
-	}
-
-	c.SetParameterRequestList(opts.prl...)
-	p, err = c.setOptions(p)
-	assert.NoError(t, err)
-	assert.NotEmpty(t, p)
-	// Log packet
-	logDHCPPacket(p)
-	// Log packet and options
-	o := p.ParseOptions()
-	logDHCPPacketAndOptions(p, o)
-	res := verifyLog(f)
-	assert.True(t, res)
-}
-
-func verifyLog(lFile *os.File) bool {
-	f, err := os.Open(lFile.Name())
-	if err != nil {
-		return false
-	}
-
-	countBody := 0
-	countOptions := 0
-	scanner := bufio.NewScanner(f)
-
-	for scanner.Scan() {
-		line := scanner.Text()
-		if strings.Contains(line, packetStr) {
-			countBody++
-		} else if strings.Contains(line, optionStr) {
-			countOptions++
-		}
-	}
-
-	return countBody == 2 && countOptions == 2
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/id.go b/installer/vendor/github.com/vmware/vic/lib/dhcp/client/id.go
deleted file mode 100644
index 9330941fa1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dhcp/client/id.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package client
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"net"
-
-	"github.com/dchest/siphash"
-	"github.com/google/uuid"
-
-	"github.com/vmware/vic/lib/system"
-)
-
-var Sys system.System
-
-func init() {
-	Sys = system.New()
-}
-
-// Duid is a vendor based DUID per https://tools.ietf.org/html/rfc3315#section-9.3
-type Duid struct {
-	Type uint16
-	PEN  uint32
-	ID   uint64
-}
-
-// Iaid is an opaque 32-bit identifier unique to a network interface; see https://tools.ietf.org/html/rfc4361#section-6.1
-type Iaid []byte
-
-// ID is a DHCPv4 client ID
-type ID struct {
-	Type uint8
-	Iaid Iaid
-	Duid Duid
-
-	IfIndex      int
-	HardwareAddr net.HardwareAddr
-}
-
-// VMwarePEN is VMware's PEN (Private Enterprise Number); see http://www.iana.org/assignments/enterprise-numbers/enterprise-numbers
-const VMwarePEN uint32 = 6876
-
-// DuidEn is the DUID type; see https://tools.ietf.org/html/rfc3315#section-9.3
-const DuidEn uint16 = 2
-
-var key = []byte{0xc4, 0xeb, 0x38, 0x9e, 0x4e, 0xd9, 0x48, 0x12, 0x93, 0xa6, 0xb7, 0x0b, 0x9b, 0x07, 0xcc, 0x2b}
-
-// NewID generates a DHCPv4 client ID, per https://tools.ietf.org/html/rfc4361#section-6.1
-func NewID(ifindex int, hw net.HardwareAddr) (ID, error) {
-	iaid := makeIaid(ifindex, hw)
-	duid, err := makeDuid()
-	if err != nil {
-		return ID{}, err
-	}
-
-	return ID{
-		Type:         255,
-		Iaid:         iaid,
-		Duid:         duid,
-		IfIndex:      ifindex,
-		HardwareAddr: hw,
-	}, nil
-}
-
-// MarshalBinary implements the BinaryMarshaler interface
-func (i ID) MarshalBinary() ([]byte, error) {
-	var b []byte
-	b = append(b, i.Type)
-	ib, err := i.Iaid.MarshalBinary()
-	if err != nil {
-		return nil, err
-	}
-	b = append(b, ib...)
-	db, err := i.Duid.MarshalBinary()
-	if err != nil {
-		return nil, err
-	}
-	return append(b, db...), nil
-}
-
-// MarshalBinary implements the BinaryMarshaler interface
-func (ia Iaid) MarshalBinary() ([]byte, error) {
-	return ia[:], nil
-}
-
-// MarshalBinary implements the BinaryMarshaler interface
-func (d Duid) MarshalBinary() ([]byte, error) {
-	b := new(bytes.Buffer)
-	// #nosec: Errors unhandled.
-	binary.Write(b, binary.BigEndian, d.Type)
-	// #nosec: Errors unhandled.
-	binary.Write(b, binary.BigEndian, d.PEN)
-	// #nosec: Errors unhandled.
-	binary.Write(b, binary.BigEndian, d.ID)
-	return b.Bytes(), nil
-}
-
-// makeIaid constructs a new IAID. Ported from systemd's
-// implementation here: https://github.com/systemd/systemd/blob/master/src/libsystemd-network/dhcp-identifier.c
-func makeIaid(ifindex int, hw net.HardwareAddr) Iaid {
-	h := siphash.New(key)
-	// #nosec: Errors unhandled.
-	h.Write(hw)
-	id := h.Sum64()
-
-	// fold into 32 bits
-	iaid := make(Iaid, 4)
-	binary.BigEndian.PutUint32(iaid, uint32(id&0xffffffff)^uint32(id>>32))
-	return iaid
-}
-
-func getMachineID() ([]byte, error) {
-	id := Sys.UUID
-	if id == "" {
-		return nil, fmt.Errorf("could not get machine id")
-	}
-
-	uid, err := uuid.Parse(id)
-	if err != nil {
-		return nil, err
-	}
-
-	return uid.MarshalBinary()
-}
-
-// makeDuid constructs a new DUID. Adapted from systemd's implemenation here: https://github.com/systemd/systemd/blob/master/src/libsystemd-network/dhcp-identifier.c
-func makeDuid() (Duid, error) {
-	id, err := getMachineID()
-	if err != nil {
-		return Duid{}, err
-	}
-
-	h := siphash.New(key)
-	// #nosec: Errors unhandled.
-	h.Write(id)
-	return Duid{Type: DuidEn, PEN: VMwarePEN, ID: h.Sum64()}, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dhcp/packet.go b/installer/vendor/github.com/vmware/vic/lib/dhcp/packet.go
deleted file mode 100644
index 7e2057a4d0..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dhcp/packet.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dhcp
-
-import (
-	"bytes"
-	"net"
-	"time"
-
-	"encoding/binary"
-
-	"github.com/d2g/dhcp4"
-)
-
-type Options dhcp4.Options
-
-// Packet is a representation of a DHCP packet
-type Packet struct {
-	Packet  []byte
-	Options Options
-}
-
-func NewPacket(p []byte) *Packet {
-	return &Packet{
-		Packet:  p,
-		Options: Options(dhcp4.Packet(p).ParseOptions()),
-	}
-}
-
-// YourIP returns the YIP field in the packet (this is IP assigned by server to the client)
-func (p *Packet) YourIP() net.IP {
-	if len(p.Packet) == 0 {
-		return nil
-	}
-
-	return dhcp4.Packet(p.Packet).YIAddr()
-}
-
-// Gateway return the GIP field in the packet (server assigned gateway)
-func (p *Packet) Gateway() net.IP {
-	if len(p.Packet) == 0 {
-		return nil
-	}
-
-	b := p.Options[dhcp4.OptionRouter]
-	if len(b) >= 4 {
-		return net.IP(b[:4])
-	}
-
-	return nil
-}
-
-// SubnetMask returns the subnet mask option in the packet
-func (p *Packet) SubnetMask() net.IPMask {
-	return p.Options[dhcp4.OptionSubnetMask]
-}
-
-// LeaseTime returns the lease time (in seconds) in the packet
-func (p *Packet) LeaseTime() time.Duration {
-	b := p.Options[dhcp4.OptionIPAddressLeaseTime]
-	if b == nil {
-		return 0
-	}
-
-	var t uint32
-	if err := binary.Read(bytes.NewReader(b), binary.BigEndian, &t); err != nil {
-		return 0 * time.Second
-	}
-
-	return time.Duration(t) * time.Second
-}
-
-// DNS returns the name server entries in the dhcp packet
-func (p *Packet) DNS() []net.IP {
-	b := p.Options[dhcp4.OptionDomainNameServer]
-	if b == nil {
-		return nil
-	}
-
-	var dns []net.IP
-	for i := 0; i < len(b); i += 4 {
-		dns = append(dns, net.IP(b[i:i+4]))
-	}
-
-	return dns
-}
-
-// ServerIP returns the DHCP server's IP address
-func (p *Packet) ServerIP() net.IP {
-	if len(p.Packet) == 0 {
-		return nil
-	}
-
-	b := p.Options[dhcp4.OptionServerIdentifier]
-	if len(b) < net.IPv4len {
-		return nil
-	}
-
-	return net.IP(b[:net.IPv4len])
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/cache.go b/installer/vendor/github.com/vmware/vic/lib/dns/cache.go
deleted file mode 100644
index 93649364bd..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/cache.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-import (
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	mdns "github.com/miekg/dns"
-)
-
-// Item represents an item in the cache
-type Item struct {
-	Expiration time.Time
-	Msg        *mdns.Msg
-}
-
-// CacheOptions represents the cache options
-type CacheOptions struct {
-	// Max capacity of cache, after this limit cache starts to evict random elements
-	capacity int
-	// Default ttl used by items
-	ttl time.Duration
-}
-
-// Cache stores dns.Msgs and their expiration time
-type Cache struct {
-	CacheOptions
-
-	// Protects following map
-	sync.RWMutex
-	m map[string]*Item
-
-	// atomic cache hits & misses counters
-	// ^ cause we update them while holding the read lock
-	hits   uint64
-	misses uint64
-}
-
-// NewCache returns a new cache
-func NewCache(options CacheOptions) *Cache {
-	return &Cache{
-		CacheOptions: options,
-		m:            make(map[string]*Item, options.capacity),
-	}
-}
-
-// Capacity returns the capacity of the cache
-func (c *Cache) Capacity() int {
-	return c.capacity
-}
-
-// Count returns the element count of the cache
-func (c *Cache) Count() int {
-	c.RLock()
-	defer c.RUnlock()
-	return len(c.m)
-}
-
-func generateKey(q mdns.Question) string {
-	return fmt.Sprintf("%s:%s", q.Name, mdns.TypeToString[q.Qtype])
-}
-
-// Add adds dns.Msg to the cache
-func (c *Cache) Add(msg *mdns.Msg) {
-	c.Lock()
-	defer c.Unlock()
-
-	if len(c.m) >= c.capacity {
-		// pick a random key and remove it
-		for k := range c.m {
-			delete(c.m, k)
-			break
-		}
-	}
-
-	key := generateKey(msg.Question[0])
-	if _, ok := c.m[key]; !ok {
-		c.m[key] = &Item{
-			Expiration: time.Now().UTC().Add(c.ttl),
-			Msg:        msg.Copy(),
-		}
-	}
-}
-
-// Remove removes the dns.Msg from the cache
-func (c *Cache) Remove(msg *mdns.Msg) {
-	c.Lock()
-	defer c.Unlock()
-
-	if len(c.m) <= 0 {
-		return
-	}
-
-	key := generateKey(msg.Question[0])
-	delete(c.m, key)
-}
-
-// Get returns the dns.Msg from the cache
-func (c *Cache) Get(msg *mdns.Msg) *mdns.Msg {
-	key := generateKey(msg.Question[0])
-
-	c.RLock()
-	e, ok := c.m[key]
-	c.RUnlock()
-
-	if ok {
-		atomic.AddUint64(&c.hits, 1)
-
-		if time.Since(e.Expiration) < 0 {
-			return e.Msg.Copy()
-		}
-		// Expired msg, remove it from the cache
-		c.Remove(msg)
-	} else {
-		atomic.AddUint64(&c.misses, 1)
-	}
-	return nil
-}
-
-// Hits returns the number of cache hits
-func (c *Cache) Hits() uint64 {
-	return atomic.LoadUint64(&c.hits)
-}
-
-// Misses returns the number of cache misses
-func (c *Cache) Misses() uint64 {
-	return atomic.LoadUint64(&c.misses)
-}
-
-// Reset resets the cache
-func (c *Cache) Reset() {
-	c.Lock()
-	defer c.Unlock()
-
-	// drop the old map for GC and reset counters
-	c.m = make(map[string]*Item, c.capacity)
-	atomic.StoreUint64(&c.hits, 0)
-	atomic.StoreUint64(&c.misses, 0)
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/cache_test.go b/installer/vendor/github.com/vmware/vic/lib/dns/cache_test.go
deleted file mode 100644
index dfcbc99992..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/cache_test.go
+++ /dev/null
@@ -1,217 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-import (
-	"math/rand"
-	"sync"
-	"testing"
-	"time"
-
-	mdns "github.com/miekg/dns"
-)
-
-func init() {
-	rand.Seed(time.Now().UnixNano())
-}
-
-func RandStringRunes(n int) string {
-	runes := []rune("abcdefghijklmnopqrstuvwxyz")
-
-	b := make([]rune, n)
-	for i := range b {
-		b[i] = runes[rand.Intn(len(runes))]
-	}
-	return string(b)
-}
-
-func RandDNSType() uint16 {
-	types := []uint16{
-		mdns.TypeA,
-		mdns.TypeAAAA,
-	}
-	return types[rand.Intn(len(types))]
-}
-
-func NewMsg() *mdns.Msg {
-	m := &mdns.Msg{}
-	name := RandStringRunes(16) + ".vmware.local."
-	qtype := RandDNSType()
-	m.SetQuestion(name, qtype)
-	return m
-}
-
-func TestCache(t *testing.T) {
-	o := CacheOptions{
-		capacity: 10,
-		ttl:      10 * time.Second,
-	}
-	c := NewCache(o)
-
-	var msgs []*mdns.Msg
-	for i := 0; i < 10; i++ {
-		msgs = append(msgs, NewMsg())
-	}
-
-	for _, msg := range msgs {
-		c.Add(msg)
-	}
-	if c.Count() != len(msgs) {
-		t.Fatalf("Add failed")
-	}
-
-	for _, msg := range msgs {
-		m := c.Get(msg)
-		if m.Question[0] != msg.Question[0] {
-			t.Fatalf("Get failed")
-		}
-	}
-
-	for _, msg := range msgs {
-		c.Remove(msg)
-	}
-	if c.Count() != 0 {
-		t.Fatalf("Remove failed")
-	}
-}
-
-func TestCapacity(t *testing.T) {
-	o := CacheOptions{
-		capacity: 10,
-		ttl:      10 * time.Second,
-	}
-	c := NewCache(o)
-
-	var msgs []*mdns.Msg
-	for i := 0; i < 100; i++ {
-		msgs = append(msgs, NewMsg())
-	}
-
-	for _, msg := range msgs {
-		c.Add(msg)
-	}
-
-	if c.Count() != c.Capacity() {
-		t.Fatalf("Add failed")
-	}
-}
-
-func TestReset(t *testing.T) {
-	o := CacheOptions{
-		capacity: 10,
-		ttl:      10 * time.Second,
-	}
-	c := NewCache(o)
-
-	var msgs []*mdns.Msg
-	for i := 0; i < 10; i++ {
-		msgs = append(msgs, NewMsg())
-	}
-
-	for _, msg := range msgs {
-		c.Add(msg)
-	}
-	if c.Count() != len(msgs) {
-		t.Fatalf("Add failed")
-	}
-
-	c.Reset()
-
-	if c.Count() != 0 {
-		t.Fatalf("Reset failed")
-	}
-}
-
-func TestExpiration(t *testing.T) {
-	o := CacheOptions{
-		capacity: 100,
-		ttl:      time.Nanosecond,
-	}
-	c := NewCache(o)
-
-	var msgs []*mdns.Msg
-	for i := 0; i < 100; i++ {
-		msgs = append(msgs, NewMsg())
-	}
-
-	for _, msg := range msgs {
-		c.Add(msg)
-	}
-	for _, msg := range msgs {
-		// All of them should be expired
-		if c.Get(msg) != nil {
-			t.Fatalf("Get failed")
-		}
-	}
-}
-
-// For best result run with -race
-func TestConcurrency(t *testing.T) {
-	var wg sync.WaitGroup
-
-	samplesize := 1 << 10
-	o := CacheOptions{
-		capacity: samplesize,
-		ttl:      10 * time.Minute,
-	}
-	c := NewCache(o)
-
-	// create a map so that we can iterate on it randomly
-	msgs := make(map[int]*mdns.Msg)
-	for i := 0; i < samplesize; i++ {
-		msgs[i] = NewMsg()
-	}
-
-	writer := func() {
-		for _, msg := range msgs {
-			c.Add(msg)
-		}
-		wg.Done()
-	}
-
-	reader := func() {
-		for _, msg := range msgs {
-			c.Get(msg)
-		}
-		wg.Done()
-	}
-
-	remover := func() {
-		for _, msg := range msgs {
-			c.Remove(msg)
-		}
-		wg.Done()
-	}
-
-	// 3 writer
-	for i := 0; i < 3; i++ {
-		wg.Add(1)
-		go writer()
-	}
-
-	// 5 reader
-	for i := 0; i < 5; i++ {
-		wg.Add(1)
-		go reader()
-	}
-
-	// 2 remover
-	for i := 0; i < 2; i++ {
-		wg.Add(1)
-		go remover()
-	}
-
-	wg.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/dns.go b/installer/vendor/github.com/vmware/vic/lib/dns/dns.go
deleted file mode 100644
index 75076cdbee..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/dns.go
+++ /dev/null
@@ -1,641 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-import (
-	"bufio"
-	"fmt"
-	"math/rand"
-	"net"
-	"os"
-	"strings"
-
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/portlayer/network"
-	"github.com/vmware/vic/pkg/trace"
-
-	mdns "github.com/miekg/dns"
-)
-
-const (
-	DefaultIP        = "127.0.0.1"
-	DefaultPort      = 53
-	DefaultTTL       = 600 * time.Second
-	DefaultCacheSize = 1024
-	DefaultTimeout   = 4 * time.Second
-)
-
-var (
-	options = ServerOptions{}
-	random  *rand.Rand
-)
-
-func init() {
-	random = rand.New(rand.NewSource(time.Now().UnixNano()))
-}
-
-// ServerOptions represents the server options
-type ServerOptions struct {
-	IP        string
-	Port      int
-	Interface string
-
-	Nameservers flagMultipleVar
-
-	Timeout time.Duration
-
-	TTL       time.Duration
-	CacheSize int
-
-	Debug bool
-}
-
-// Server represents udp/tcp server and clients
-type Server struct {
-	ServerOptions
-
-	// used for serving dns
-	udpserver *mdns.Server
-	udpconn   *net.UDPConn
-
-	tcpserver *mdns.Server
-	tcplisten *net.TCPListener
-
-	// used for forwarding queries
-	udpclient *mdns.Client
-	tcpclient *mdns.Client
-
-	// used for speeding up external lookups
-	cache *Cache
-	wg    *sync.WaitGroup
-}
-
-type flagMultipleVar []string
-
-func (i *flagMultipleVar) String() string {
-	return fmt.Sprint(*i)
-}
-
-func (i *flagMultipleVar) Set(value string) error {
-	*i = append(*i, value)
-	return nil
-}
-
-// NewServer returns a new Server
-func NewServer(options ServerOptions) *Server {
-	var err error
-
-	// Default TTL
-	if options.TTL == 0 {
-		options.TTL = DefaultTTL
-	}
-
-	// Default port
-	if options.Port == 0 {
-		options.Port = DefaultPort
-	}
-
-	// Default nameservers
-	if len(options.Nameservers) == 0 {
-		options.Nameservers = resolvconf()
-	}
-
-	// Default cache size
-	if options.CacheSize == 0 {
-		options.CacheSize = DefaultCacheSize
-	}
-
-	// Default timeout
-	if options.Timeout == 0 {
-		options.Timeout = DefaultTimeout
-	}
-
-	server := &Server{
-		ServerOptions: options,
-		cache:         NewCache(CacheOptions{options.CacheSize, options.TTL}),
-		wg:            new(sync.WaitGroup),
-	}
-
-	udpaddr := &net.UDPAddr{
-		IP:   net.ParseIP(server.IP),
-		Port: server.Port,
-	}
-
-	server.udpconn, err = net.ListenUDP("udp", udpaddr)
-	if err != nil {
-		log.Errorf("ListenUDP failed %s", err)
-		return nil
-	}
-
-	tcpaddr := &net.TCPAddr{
-		IP:   net.ParseIP(server.IP),
-		Port: server.Port,
-	}
-
-	server.tcplisten, err = net.ListenTCP("tcp", tcpaddr)
-	if err != nil {
-		log.Errorf("ListenTCP failed %s", err)
-		return nil
-	}
-
-	server.udpclient = &mdns.Client{
-		Net:            "udp",
-		ReadTimeout:    server.Timeout,
-		WriteTimeout:   server.Timeout,
-		SingleInflight: true,
-	}
-
-	server.tcpclient = &mdns.Client{
-		Net:            "tcp",
-		ReadTimeout:    server.Timeout,
-		WriteTimeout:   server.Timeout,
-		SingleInflight: true,
-	}
-
-	return server
-}
-
-// Addr returns the ip:port of the server
-func (s *Server) Addr() string {
-	return fmt.Sprintf("%s:%d", s.IP, s.Port)
-}
-
-func respServerFailure(w mdns.ResponseWriter, r *mdns.Msg) error {
-	m := new(mdns.Msg)
-	m.SetRcode(r, mdns.RcodeServerFailure)
-	// Does not matter if this write fails
-	return w.WriteMsg(m)
-}
-
-func respNotImplemented(w mdns.ResponseWriter, r *mdns.Msg) error {
-	m := &mdns.Msg{
-		MsgHdr: mdns.MsgHdr{
-			Authoritative:      false,
-			RecursionDesired:   false,
-			RecursionAvailable: false,
-			Rcode:              mdns.RcodeNotImplemented,
-		},
-		Compress: true,
-	}
-	m.SetReply(r)
-
-	if err := w.WriteMsg(m); err != nil {
-		log.Errorf("Error writing RcodeNotImplemented response, %s", err)
-		return err
-	}
-	return nil
-}
-
-func resolvconf() []string {
-	var servers []string
-
-	file, err := os.Open("/etc/resolv.conf")
-	if err != nil {
-		return nil
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-
-		// skip comments
-		if len(line) > 0 && (line[0] == ';' || line[0] == '#') {
-			continue
-		}
-		f := strings.SplitN(line, " ", 2)
-
-		if len(f) < 1 {
-			continue
-		}
-
-		if f[0] == "nameserver" {
-			if len(f) > 1 && len(servers) < 3 { // small, but the standard limit
-				// One more check: make sure server name is
-				// just an IP address.  Otherwise we need DNS
-				// to look it up.
-				if net.ParseIP(f[1]) != nil {
-					servers = append(servers, f[1])
-				}
-			}
-		}
-	}
-	if err := scanner.Err(); err != nil {
-		return nil
-	}
-	return servers
-}
-
-// SeenBefore returns the cached response
-func (s *Server) SeenBefore(w mdns.ResponseWriter, r *mdns.Msg) (bool, error) {
-	defer trace.End(trace.Begin(r.String()))
-
-	// Do we have it in the cache
-	if m := s.cache.Get(r); m != nil {
-		log.Debugf("Cache hit for %q", r.String())
-
-		// Overwrite the ID with the request's ID
-		m.Id = r.Id
-		m.Compress = true
-		m.Truncated = false
-
-		if err := w.WriteMsg(m); err != nil {
-			log.Errorf("Error writing response: %q", err)
-			return true, err
-		}
-		return true, nil
-	}
-	return false, nil
-}
-
-// HandleForwarding forwards a request to the nameservers and returns the response
-func (s *Server) HandleForwarding(w mdns.ResponseWriter, r *mdns.Msg) (bool, error) {
-	defer trace.End(trace.Begin(r.String()))
-
-	var m *mdns.Msg
-	var err error
-	var try int
-
-	if len(s.Nameservers) == 0 {
-		log.Errorf("No nameservers defined, can not forward")
-		return false, respServerFailure(w, r)
-	}
-
-	// which protocol are they talking
-	tcp := false
-	if _, ok := w.RemoteAddr().(*net.TCPAddr); ok {
-		tcp = true
-	}
-
-	// Use request ID for "random" nameserver selection.
-	nsid := int(r.Id) % len(s.Nameservers)
-
-Redo:
-	nameserver := s.Nameservers[nsid]
-	if i := strings.Index(nameserver, ":"); i < 0 {
-		nameserver += ":53"
-	}
-
-	if tcp {
-		m, _, err = s.tcpclient.Exchange(r, nameserver)
-	} else {
-		m, _, err = s.udpclient.Exchange(r, nameserver)
-	}
-	if err != nil {
-		// Seen an error, this can only mean, "server not reached", try again but only if we have not exausted our nameservers.
-		if try < len(s.Nameservers) {
-			try++
-			nsid = (nsid + 1) % len(s.Nameservers)
-			goto Redo
-		}
-
-		log.Errorf("Failure to forward request: %q", err)
-		return false, respServerFailure(w, r)
-	}
-
-	// We have a response so cache it
-	s.cache.Add(m)
-
-	m.Compress = true
-	if err := w.WriteMsg(m); err != nil {
-		log.Errorf("Error writing response: %q", err)
-		return true, err
-	}
-	return true, nil
-}
-
-// lookupByAlias looks up a container by alias, given the requesting container
-// and the network of the incoming request. It first does a container-scoped
-// alias search, followed by a network-scoped aliased search for alias. The
-// result is a collection of endpoints for the matching container that are
-// only on the same network as the requesting container.
-func lookupByAlias(netCtx *network.Context, scope *network.Scope, reqc *network.Container, alias string) []*network.Endpoint {
-	// container specific alias search
-	cons := netCtx.ContainersByAlias(network.ScopedAliasName(scope.Name(), reqc.Name(), alias))
-	if len(cons) == 0 {
-		// scope-wide alias search
-		cons = netCtx.ContainersByAlias(network.ScopedAliasName(scope.Name(), "", alias))
-	}
-
-	if len(cons) == 0 {
-		return nil
-	}
-
-	var eps []*network.Endpoint
-	for _, c := range cons {
-		if e := c.Endpoint(scope); e != nil {
-			eps = append(eps, e)
-		}
-	}
-
-	return eps
-}
-
-// lookupByName looks up a container by name given the requesting container. It returns a collection
-// of endpoints on networks that both the requesting and matching container share.
-func lookupByName(netCtx *network.Context, reqc *network.Container, name string) []*network.Endpoint {
-	var eps []*network.Endpoint
-	if m := netCtx.Container(name); m != nil {
-		// look if networks overlap for the requesting container and the
-		// matched container
-		for _, ec := range reqc.Endpoints() {
-			if em := m.Endpoint(ec.Scope()); em != nil {
-				eps = append(eps, em)
-			}
-		}
-	}
-
-	return eps
-}
-
-// HandleVIC returns a response to a container name/id request
-func (s *Server) HandleVIC(w mdns.ResponseWriter, r *mdns.Msg) (bool, error) {
-	defer trace.End(trace.Begin(r.String()))
-
-	question := r.Question[0]
-
-	netCtx := network.DefaultContext
-	if netCtx == nil {
-		log.Errorf("DefaultContext is not initialized")
-		return false, fmt.Errorf("DefaultContext is not initialized")
-	}
-
-	clientIP, _, err := net.SplitHostPort(w.RemoteAddr().String())
-	if err != nil {
-		log.Errorf("SplitHostPort failed: %q", err)
-		return false, err
-	}
-
-	log.Debugf("RemoteAddr: %s", clientIP)
-	ip := net.ParseIP(clientIP)
-
-	var name string
-	var domain string
-
-	name = strings.TrimSuffix(question.Name, ".")
-	// Do we have a domain?
-	i := strings.IndexRune(name, '.')
-	if i >= 0 {
-		name, domain = name[:i], name[i+1:]
-	}
-
-	// get the requesting container's endpoint
-	e := netCtx.ContainerByAddr(ip)
-	if e == nil {
-		return false, fmt.Errorf("Could not find requesting container with ip %s", ip)
-	}
-
-	if domain != "" && e.Scope().Name() != domain {
-		return false, fmt.Errorf("Intra-scope request for container %s in %s from %s", name, domain, e.Scope().Name())
-	}
-
-	eps := lookupByAlias(netCtx, e.Scope(), e.Container(), name)
-	if len(eps) == 0 {
-		// lookup container by name
-		eps = lookupByName(netCtx, e.Container(), name)
-	}
-
-	if len(eps) == 0 {
-		log.Debugf("Can't find the container: %q", name)
-		return false, fmt.Errorf("Can't find the container: %q", name)
-	}
-
-	// FIXME: Add AAAA when we support it
-	answer := make([]mdns.RR, len(eps))
-	// shuffle eps (Fisher–Yates shuffle)
-	for i := len(eps) - 1; i > 0; i-- {
-		j := random.Intn(i + 1)
-		eps[i], eps[j] = eps[j], eps[i]
-	}
-
-	for i, e := range eps {
-		if e.IP().IsUnspecified() {
-			return false, fmt.Errorf("No ip for container %q", name)
-		}
-
-		answer[i] = &mdns.A{
-			Hdr: mdns.RR_Header{
-				Name:   question.Name,
-				Rrtype: mdns.TypeA,
-				Class:  mdns.ClassINET,
-				Ttl:    uint32(DefaultTTL.Seconds()),
-			},
-			A: e.IP(),
-		}
-	}
-
-	// Start crafting reply msg
-	m := &mdns.Msg{
-		MsgHdr: mdns.MsgHdr{
-			Authoritative:      true,
-			RecursionAvailable: true,
-		},
-		Compress: true,
-	}
-	m.SetReply(r)
-
-	m.Answer = append(m.Answer, answer...)
-
-	// Which protocol we are talking
-	tcp := false
-	if _, ok := w.LocalAddr().(*net.TCPAddr); ok {
-		tcp = true
-	}
-
-	// 512 byte payload guarantees that DNS packets can be reassembled if fragmented in transit.
-	bufsize := 512
-
-	// With EDNS0 in use a larger payload size can be specified.
-	if o := r.IsEdns0(); o != nil {
-		bufsize = int(o.UDPSize())
-	}
-
-	// Make sure we are not smaller than 512
-	if bufsize < 512 {
-		bufsize = 512
-	}
-
-	// With TCP we can send up to 64K
-	if tcp {
-		bufsize = mdns.MaxMsgSize - 1
-	}
-
-	// Trim the answer RRs one by one till the whole message fits within the reply size
-	if m.Len() > bufsize {
-		if tcp {
-			m.Truncated = true
-		}
-
-		for m.Len() > bufsize {
-			m.Answer = m.Answer[:len(m.Answer)-1]
-		}
-	}
-
-	if err := w.WriteMsg(m); err != nil {
-		log.Errorf("Error writing response, %s", err)
-		return true, err
-	}
-	w.Close()
-
-	return true, nil
-}
-
-// ServeDNS implements the handler interface
-func (s *Server) ServeDNS(w mdns.ResponseWriter, r *mdns.Msg) {
-	defer trace.End(trace.Begin(r.String()))
-
-	if r == nil || len(r.Question) == 0 {
-		return
-	}
-
-	// Reject multi-question query
-	if len(r.Question) != 1 {
-		log.Errorf("Rejected multi-question query")
-
-		respServerFailure(w, r)
-		return
-	}
-	q := r.Question[0]
-
-	// Reject non-INET type query
-	if q.Qclass != mdns.ClassINET {
-		log.Errorf("Rejected non-inet query")
-
-		respNotImplemented(w, r)
-		return
-	}
-
-	// Reject ANY type query
-	if q.Qtype == mdns.TypeANY {
-		log.Errorf("Rejected ANY query")
-
-		respNotImplemented(w, r)
-		return
-	}
-
-	// Check VIC first
-	// Currently VIC can only answer ipv4 "A" queries
-	if q.Qtype == mdns.TypeA {
-		ok, err := s.HandleVIC(w, r)
-		if ok {
-			if err != nil {
-				log.Errorf("HandleVIC returned: %q", err)
-			}
-			return
-		}
-	}
-
-	// Do we have the response in our cache?
-	ok, err := s.SeenBefore(w, r)
-	if ok {
-		if err != nil {
-			log.Errorf("SeenBefore returned: %q", err)
-		}
-		return
-	}
-
-	// Then forward
-	ok, err = s.HandleForwarding(w, r)
-	if ok {
-		if err != nil {
-			log.Errorf("HandleForwarding returned: %q", err)
-		}
-		return
-	}
-
-}
-
-// Start starts the DNS server
-func (s *Server) Start() {
-	// Call BindToDevice if IP is empty and Interface is set
-	if s.IP == "" && s.Interface != "" {
-		uf, err := s.udpconn.File()
-		if err != nil {
-			log.Errorf("Getting the fd failed with: %s", err)
-		} else {
-			// BindToDevice binds the socket associated with fd to device.
-			if err := BindToDevice(int(uf.Fd()), s.Interface); err != nil {
-				log.Errorf("Calling BindToDevice failed with: %s", err)
-			}
-		}
-	}
-
-	udpserver := &mdns.Server{
-		Handler:    s,
-		PacketConn: s.udpconn,
-	}
-	s.udpserver = udpserver
-
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-
-		udpserver.ActivateAndServe()
-		log.Debugf("UDP server exited")
-	}()
-	log.Infof("Ready for queries on udp://%s", s.Addr())
-
-	// Call BindToDevice if IP is empty and Interface is set
-	if s.IP == "" && s.Interface != "" {
-		tf, err := s.tcplisten.File()
-		if err != nil {
-			log.Errorf("Getting the fd failed with: %s", err)
-		} else {
-			// BindToDevice binds the socket associated with fd to device.
-			if err := BindToDevice(int(tf.Fd()), s.Interface); err != nil {
-				log.Errorf("Calling BindToDevice failed with: %s", err)
-			}
-		}
-	}
-
-	tcpserver := &mdns.Server{Handler: s, Listener: s.tcplisten}
-	s.tcpserver = tcpserver
-
-	s.wg.Add(1)
-	go func() {
-		defer s.wg.Done()
-
-		tcpserver.ActivateAndServe()
-		log.Debugf("TCP server exited")
-	}()
-	log.Infof("Ready for queries on tcp://%s", s.Addr())
-
-}
-
-// Stop stops the DNS server gracefully
-func (s *Server) Stop() {
-	if s.udpserver != nil {
-		log.Debugf("Shutting down udpserver")
-		s.udpserver.Shutdown()
-	}
-	s.udpconn = nil
-	s.udpserver = nil
-
-	if s.tcpserver != nil {
-		log.Debugf("Shutting down tcpserver")
-		s.tcpserver.Shutdown()
-	}
-	s.tcplisten = nil
-	s.tcpserver = nil
-}
-
-// Wait block until wg returns
-func (s *Server) Wait() {
-	s.wg.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/dns_test.go b/installer/vendor/github.com/vmware/vic/lib/dns/dns_test.go
deleted file mode 100644
index cccf4eebf4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/dns_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-import (
-	"net"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/network"
-
-	mdns "github.com/miekg/dns"
-)
-
-var (
-	Rtypes = []uint16{
-		mdns.TypeA,
-		mdns.TypeTXT,
-		mdns.TypeAAAA,
-	}
-
-	Dnames = []string{
-		"facebook.com.",
-		"google.com.",
-	}
-)
-
-func TestForwarding(t *testing.T) {
-	t.Skipf("Failing with CI")
-
-	log.SetLevel(log.PanicLevel)
-
-	options.IP = "127.0.0.1"
-	options.Port = 5354
-
-	server := NewServer(options)
-	if server != nil {
-		server.Start()
-	}
-
-	c := new(mdns.Client)
-
-	size := 1024
-	for i := 0; i < size; i++ {
-		for _, Δ := range Rtypes {
-			for _, Θ := range Dnames {
-				m := new(mdns.Msg)
-
-				m.SetQuestion(Θ, Δ)
-
-				r, _, err := c.Exchange(m, server.Addr())
-				if err != nil || len(r.Answer) == 0 {
-					t.Fatalf("Exchange failed: %s", err)
-				}
-			}
-		}
-	}
-
-	n := len(Rtypes) * len(Dnames)
-	if server.cache.Hits() != uint64(n*size-n) && server.cache.Misses() != uint64(size) {
-		t.Fatalf("Cache hits %d misses %d", server.cache.Hits(), server.cache.Misses())
-	}
-
-	server.Stop()
-	server.Wait()
-}
-
-func TestVIC(t *testing.T) {
-	t.Skipf("Failing with CI")
-
-	log.SetLevel(log.PanicLevel)
-
-	options.IP = "127.0.0.1"
-	options.Port = 5354
-
-	// BEGIN - Context initialization
-	var bridgeNetwork object.NetworkReference
-
-	n := object.NewNetwork(nil, types.ManagedObjectReference{})
-	n.InventoryPath = "testBridge"
-	bridgeNetwork = n
-
-	conf := &network.Configuration{
-		Network: config.Network{
-			BridgeNetwork: "lo",
-			ContainerNetworks: map[string]*executor.ContainerNetwork{
-				"lo": {
-					Common: executor.Common{
-						Name: "testBridge",
-					},
-					Type: constants.BridgeScopeType,
-				},
-			},
-		},
-		PortGroups: map[string]object.NetworkReference{
-			"lo": bridgeNetwork,
-		},
-	}
-
-	// initialize the context
-	ctx, err := network.NewContext(conf, nil)
-	if err != nil {
-		t.Fatalf("%s", err)
-	}
-
-	// create the container
-	con := exec.TestHandle("foo")
-	ip := net.IPv4(172, 16, 0, 2)
-
-	ctxOptions := &network.AddContainerOptions{
-		Scope: "bridge",
-		IP:    ip,
-	}
-	// add it
-	err = ctx.AddContainer(con, ctxOptions)
-	if err != nil {
-		t.Fatalf("%s", err)
-	}
-
-	// bind it
-	_, err = ctx.BindContainer(con)
-	if err != nil {
-		t.Fatalf("%s", err)
-	}
-
-	server := NewServer(options)
-	if server != nil {
-		server.Start()
-	}
-	// END - Context initialization
-
-	m := new(mdns.Msg)
-	m.SetQuestion("foo.", mdns.TypeA)
-
-	c := new(mdns.Client)
-	r, _, err := c.Exchange(m, server.Addr())
-	if err != nil || len(r.Answer) == 0 {
-		t.Fatalf("Exchange failed: %s", err)
-	}
-
-	m = new(mdns.Msg)
-	m.SetQuestion("foo.bridge.", mdns.TypeA)
-
-	r, _, err = c.Exchange(m, server.Addr())
-	if err != nil || len(r.Answer) == 0 {
-		t.Fatalf("Exchange failed: %s", err)
-	}
-
-	server.Stop()
-	server.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_darwin.go b/installer/vendor/github.com/vmware/vic/lib/dns/syscall_darwin.go
deleted file mode 100644
index 0e49fbb23a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_darwin.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-// BindToDevice binds the socket associated with fd to device.
-func BindToDevice(fd int, device string) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_linux.go b/installer/vendor/github.com/vmware/vic/lib/dns/syscall_linux.go
deleted file mode 100644
index 0eb4565d04..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_linux.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-import "syscall"
-
-// BindToDevice binds the socket associated with fd to device.
-func BindToDevice(fd int, device string) error {
-	return syscall.BindToDevice(fd, device)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_windows.go b/installer/vendor/github.com/vmware/vic/lib/dns/syscall_windows.go
deleted file mode 100644
index 0e49fbb23a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/dns/syscall_windows.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dns
-
-// BindToDevice binds the socket associated with fd to device.
-func BindToDevice(fd int, device string) error {
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/etcconf.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/etcconf.go
deleted file mode 100644
index 905082ea0d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/etcconf.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-import (
-	"bufio"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-type EntryConsumer interface {
-	ConsumeEntry(string) error
-}
-
-type EntryWalker interface {
-	HasNext() bool
-	Next() string
-}
-
-type Conf interface {
-	Copy(Conf) error
-	Load() error
-	Save() error
-	Path() string
-}
-
-func load(filePath string, con EntryConsumer) error {
-	f, err := os.Open(filePath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			log.Infof("not loading file %s as it does not exist", filePath)
-			return nil
-		}
-
-		return err
-	}
-	// #nosec: Errors unhandled
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	for s.Scan() {
-		t := strings.TrimSpace(s.Text())
-		if t == "" || strings.HasPrefix(t, "#") {
-			continue
-		}
-
-		if err = con.ConsumeEntry(t); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func save(filePath string, walker EntryWalker) error {
-	f, err := ioutil.TempFile(path.Dir(filePath), path.Base(filePath))
-	if err != nil {
-		return err
-	}
-	defer os.Remove(f.Name())
-
-	w := bufio.NewWriter(f)
-	for walker.HasNext() {
-		l := fmt.Sprintf("%s\n", walker.Next())
-		log.Debugf("writing %q to %s", l, filePath)
-		var n int
-		for n < len(l) {
-			b, err := w.WriteString(l[n:])
-			if err != nil {
-				// #nosec: Errors unhandled
-				_ = f.Close()
-				return err
-			}
-
-			n += b
-		}
-	}
-
-	if err = w.Flush(); err != nil {
-		// #nosec: Errors unhandled
-		_ = f.Close()
-		log.Errorf("Unable to flush file content to %s: %s", f.Name(), err)
-		return err
-	}
-
-	if err = f.Close(); err != nil {
-		log.Errorf("Error closing file %s: %s", f.Name(), err)
-		return err
-	}
-
-	if err = os.Rename(f.Name(), filePath); err != nil {
-		log.Errorf("Unable to rename tempory file into final location %s->%s: %s", f.Name(), filePath, err)
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts.go
deleted file mode 100644
index deb2bd362a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"os"
-	"sort"
-	"strings"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-type Hosts interface {
-	Conf
-
-	SetHost(hostname string, ip net.IP)
-	RemoveHost(hostname string)
-	RemoveAll()
-
-	HostIP(hostname string) []net.IP
-}
-
-type hostEntry struct {
-	IP        net.IP
-	Hostnames []string
-	newAddr   bool
-}
-
-func (e *hostEntry) String() string {
-	return fmt.Sprintf("%s %s", e.IP, strings.Join(e.Hostnames, " "))
-}
-
-func (e *hostEntry) addNames(names ...string) string {
-	e.Hostnames = append(e.Hostnames, names...)
-	sort.Strings(e.Hostnames)
-
-	return e.IP.String() + " " + strings.Join(e.Hostnames, " ")
-}
-
-func (e *hostEntry) setAddress(ip net.IP) {
-	if e.IP != nil {
-		hostnames := strings.Join(e.Hostnames, " ")
-
-		log.Infof("Changing IP address: %s -> %s", e.IP.String(), ip.String())
-		log.Infof("IP change impacts the following hostnames: %s", hostnames)
-		if e.newAddr {
-			log.Warn("Address has changed more than once since last load, implying a configuration race")
-		}
-		e.newAddr = true
-	}
-
-	e.IP = ip
-}
-
-type hosts struct {
-	sync.Mutex
-
-	EntryConsumer
-
-	hostsIPv4 map[string]*hostEntry
-	hostsIPv6 map[string]*hostEntry
-	entries   map[string]*hostEntry
-	dirty     bool
-	path      string
-}
-
-type hostsWalker struct {
-	entries []*hostEntry
-	i       int
-}
-
-func (w *hostsWalker) HasNext() bool {
-	return w.i < len(w.entries)
-}
-
-func (w *hostsWalker) Next() string {
-	s := w.entries[w.i].String()
-	w.i++
-	return s
-}
-
-func NewHosts(path string) Hosts {
-	return newHosts(path)
-}
-
-func newHosts(path string) *hosts {
-	if path == "" {
-		path = HostsPath
-	}
-
-	return &hosts{
-		path:      path,
-		hostsIPv4: make(map[string]*hostEntry),
-		hostsIPv6: make(map[string]*hostEntry),
-		entries:   make(map[string]*hostEntry),
-	}
-}
-
-func (h *hosts) ConsumeEntry(t string) error {
-	h.Lock()
-	defer h.Unlock()
-
-	fs := strings.Fields(t)
-	if len(fs) < 2 {
-		log.Warnf("ignoring incomplete line %q", t)
-		return nil
-	}
-
-	ip := net.ParseIP(fs[0])
-	if ip == nil {
-		log.Warnf("ignoring line %q due to invalid ip address", t)
-		return nil
-	}
-
-	for _, hs := range fs[1:] {
-		h.setHost(hs, ip)
-	}
-
-	return nil
-}
-
-// Needs to ensure that host entries don't occur twice, and that we have stable reconsiliation if they do
-func (h *hosts) Load() error {
-	h.Lock()
-	defer h.Unlock()
-
-	newHosts := newHosts(h.path)
-
-	if err := load(h.path, newHosts); err != nil {
-		return err
-	}
-
-	h.hostsIPv4 = newHosts.hostsIPv4
-	h.hostsIPv6 = newHosts.hostsIPv6
-	h.entries = newHosts.entries
-	h.dirty = false
-	return nil
-}
-
-// Seed pulls replaces the current state with that from the provided hosts
-// It _does not_ perform a deep copy so performs a Save immediately.
-func (h *hosts) Copy(conf Conf) error {
-	// straight up panic if not the appropriate type
-	existing := conf.(*hosts)
-
-	existing.Lock()
-	defer existing.Unlock()
-
-	h.hostsIPv4 = existing.hostsIPv4
-	h.hostsIPv6 = existing.hostsIPv6
-	h.entries = existing.entries
-	h.dirty = true
-
-	return h.Save()
-}
-
-// ensure hostname is associated with localhost
-
-func (h *hosts) Save() error {
-	h.Lock()
-	defer h.Unlock()
-
-	if !h.dirty {
-		log.Debugf("skipping writing file since there are no new entries")
-		return nil
-	}
-
-	var entries []*hostEntry
-	for _, v := range h.entries {
-		entries = append(entries, v)
-	}
-
-	if err := save(h.path, &hostsWalker{entries: entries}); err != nil {
-		return err
-	}
-
-	// make sure the file is readable
-	// #nosec: Expect file permissions to be 0600 or less
-	if err := os.Chmod(h.path, 0644); err != nil {
-		return err
-	}
-
-	h.dirty = false
-	return nil
-}
-
-func (h *hosts) SetHost(hostname string, ip net.IP) {
-	h.Lock()
-	defer h.Unlock()
-
-	h.setHost(hostname, ip)
-}
-
-func (h *hosts) setHost(hostname string, ip net.IP) {
-	h.dirty = true
-
-	if ip == nil {
-		return
-	}
-
-	// what type of address is it?
-	hostmap := h.hostsIPv6
-	ipv4 := ip.To4()
-	if ipv4 != nil {
-		// this drops any leading garbage in the array so that byte comparisons work as
-		// expected
-		ip = ipv4
-		hostmap = h.hostsIPv4
-	}
-
-	hentry := hostmap[hostname]
-	ientry := h.entries[ip.String()]
-
-	if hentry != nil {
-		// existing entry with no changes
-		if bytes.Equal(hentry.IP, ip) {
-			h.dirty = false
-			return
-		}
-
-		// existing hostname with a new address - change address for all assocated hostnames
-		hentry.setAddress(ip)
-		return
-	}
-
-	// completely new entry for this ip address type
-	if ientry == nil {
-		entry := &hostEntry{
-			IP:        ip,
-			Hostnames: []string{hostname},
-		}
-
-		h.entries[ip.String()] = entry
-		hostmap[hostname] = entry
-		return
-	}
-
-	// add the hostname indexed IP record
-	ientry.Hostnames = append(ientry.Hostnames, hostname)
-	hostmap[hostname] = ientry
-
-	return
-}
-
-func (h *hosts) RemoveHost(hostname string) {
-	h.Lock()
-	defer h.Unlock()
-
-	for _, hostmap := range []map[string]*hostEntry{h.hostsIPv4, h.hostsIPv6} {
-		entry := hostmap[hostname]
-		if entry == nil {
-			continue
-		}
-
-		h.dirty = true
-		delete(hostmap, hostname)
-
-		if len(entry.Hostnames) < 2 {
-			log.Infof("Removing hostname and address: %s (%s)", hostname, entry.IP.String())
-			delete(h.entries, entry.IP.String())
-			continue
-		}
-
-		var remaining []string
-		for i := range entry.Hostnames {
-			if entry.Hostnames[i] == hostname {
-				remaining = entry.Hostnames[:i]
-				remaining = append(remaining, entry.Hostnames[i+1:]...)
-			}
-		}
-		entry.Hostnames = remaining
-	}
-}
-
-func (h *hosts) RemoveAll() {
-	h.Lock()
-	defer h.Unlock()
-
-	h.dirty = len(h.hostsIPv4) > 0 || len(h.hostsIPv6) > 0
-
-	h.hostsIPv4 = make(map[string]*hostEntry)
-	h.hostsIPv6 = make(map[string]*hostEntry)
-	h.entries = make(map[string]*hostEntry)
-}
-
-func (h *hosts) HostIP(hostname string) []net.IP {
-	h.Lock()
-	defer h.Unlock()
-
-	var ips []net.IP
-	if ipv4, ok := h.hostsIPv4[hostname]; ok {
-		ips = append(ips, ipv4.IP)
-	}
-	if ipv6, ok := h.hostsIPv6[hostname]; ok {
-		ips = append(ips, ipv6.IP)
-	}
-
-	return ips
-}
-
-func (h *hosts) Path() string {
-	return h.path
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_darwin.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_darwin.go
deleted file mode 100644
index fe612105fc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_darwin.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-const HostsPath = "/etc/hosts"
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_linux.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_linux.go
deleted file mode 100644
index fe612105fc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_linux.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-const HostsPath = "/etc/hosts"
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_test.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_test.go
deleted file mode 100644
index 634c9443ab..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-import (
-	"io/ioutil"
-	"net"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-type entry struct {
-	addr      net.IP
-	hostnames []string
-}
-
-var (
-	localv4 = &entry{
-		addr:      net.ParseIP("127.0.0.1"),
-		hostnames: []string{"localhost", "localhost.localdomain", "localhost4"},
-	}
-	localv6 = &entry{
-		addr:      net.ParseIP("::1"),
-		hostnames: []string{"localhost", "localhost.localdomain", "localhost6"},
-	}
-	independent = &entry{
-		addr:      net.ParseIP("8.8.8.8"),
-		hostnames: []string{"dns.google.com"},
-	}
-	name = &entry{
-		addr:      net.ParseIP("192.168.0.2"),
-		hostnames: []string{"system.host.name"},
-	}
-	namev6 = &entry{
-		addr:      net.ParseIP("::2"),
-		hostnames: []string{"system.host.name"},
-	}
-	alias = &entry{
-		addr:      net.ParseIP("192.168.0.2"),
-		hostnames: []string{"other.host.name"},
-	}
-)
-
-// initializes a hosts file from entry, adds name and alias, and saves the file
-func initializeHostsFile(t *testing.T) *hosts {
-	log.SetLevel(log.DebugLevel)
-
-	f, err := ioutil.TempFile("", "hosts-test")
-	require.NoError(t, err, "Unable to create tmpfile")
-	// defer os.Remove(f.Name())
-
-	hosts := newHosts(f.Name())
-	hosts.Load()
-	require.Equal(t, 0, len(hosts.entries), "New hosts file contains entries")
-
-	hosts.SetHost(name.hostnames[0], name.addr)
-	hosts.SetHost(alias.hostnames[0], alias.addr)
-
-	require.Equal(t, 1, len(hosts.entries), "Hosts was expected to have only one entry after non-local entry and alias added")
-
-	err = hosts.Save()
-	require.NoError(t, err, "Failed to save hosts file")
-
-	return hosts
-}
-
-// TestAddressTypeIsolation checks that hostnames can be assigned to multiple
-// addresses so long as those addresses are of different types. Types are limited
-// to IPv4 and IPv6 at this time.
-func TestAddressTypeIsolation(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	f, err := ioutil.TempFile("", "hosts-test")
-	require.NoError(t, err, "Unable to create tmpfile")
-	defer os.Remove(f.Name())
-
-	hosts := newHosts(f.Name())
-	hosts.Load()
-	require.Equal(t, 0, len(hosts.entries), "New hosts file contains entries")
-
-	hosts.SetHost(localv4.hostnames[0], localv4.addr)
-	hosts.SetHost(localv4.hostnames[1], localv4.addr)
-	hosts.SetHost(localv4.hostnames[2], localv4.addr)
-
-	require.Equal(t, 1, len(hosts.entries), "Hosts was expected to have only one entry after IPv4 local aliases added")
-
-	hosts.SetHost(localv6.hostnames[0], localv6.addr)
-	hosts.SetHost(localv6.hostnames[1], localv6.addr)
-	hosts.SetHost(localv6.hostnames[2], localv6.addr)
-
-	require.Equal(t, 2, len(hosts.entries), "Hosts was expected to have two entries after IPv6 local aliases added")
-
-	localhostIPs := hosts.HostIP("localhost")
-	require.Equal(t, 2, len(localhostIPs), "Expected two results for localhost lookup")
-	ipv4 := localhostIPs[0].To4() != nil
-	require.Equal(t, !ipv4, localhostIPs[1].To4() != nil, "Expected one address for localhost to be IPv6")
-
-	require.True(t, localhostIPs[0].IsLoopback(), "Expected localhost IP to be loopback: %s", localhostIPs[0].String())
-	require.True(t, localhostIPs[1].IsLoopback(), "Expected localhost IP to be loopback: %s", localhostIPs[1].String())
-
-	err = hosts.Save()
-	require.NoError(t, err, "Failed to save hosts file")
-
-	// confirm preservation across load/save - overwrite previous hosts to avoid cross referencing accidents
-	hosts = newHosts(f.Name())
-	hosts.Load()
-
-	localhostIPs = hosts.HostIP("localhost")
-	require.Equal(t, 2, len(localhostIPs), "Expected two results for localhost lookup")
-	ipv4 = localhostIPs[0].To4() != nil
-	require.Equal(t, !ipv4, localhostIPs[1].To4() != nil, "Expected one address for localhost to be IPv6")
-
-	require.True(t, localhostIPs[0].IsLoopback(), "Expected localhost IP to be loopback: %s", localhostIPs[0].String())
-	require.True(t, localhostIPs[1].IsLoopback(), "Expected localhost IP to be loopback: %s", localhostIPs[1].String())
-
-}
-
-// TestAddressReassignment confirms that if the IP address is updated for a given
-// hostname then it's updated for all of the current aliases (i.e. first field in hosts
-// entry is the only thing that changes)
-func TestAddressReassignment(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	hosts := initializeHostsFile(t)
-	f := hosts.Path()
-
-	// confirm preservation across load/save - overwrite previous hosts to avoid cross referencing accidents
-	hosts = newHosts(f)
-	hosts.Load()
-
-	// changes the IP address for the entire entry
-	hosts.SetHost(name.hostnames[0], net.ParseIP("192.168.0.3"))
-	ips := hosts.HostIP(name.hostnames[0])
-	require.Equal(t, 1, len(ips), "Expected only one results for name lookup")
-	require.Equal(t, "192.168.0.3", ips[0].String(), "Expected update of address to take effect")
-
-	// and check the alias is updated as well
-	ips = hosts.HostIP(alias.hostnames[0])
-	require.Equal(t, 1, len(ips), "Expected only one results for name lookup")
-	require.Equal(t, "192.168.0.3", ips[0].String(), "Expected update of address to take effect")
-}
-
-// TestNameReassignment confirms that if a name is Removed then set again with a different
-// address it does not cause updates to aliases prior to the Removal.
-func TestNameReassignment(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	hosts := initializeHostsFile(t)
-	f := hosts.Path()
-
-	// confirm preservation across load/save - overwrite previous hosts to avoid cross referencing accidents
-	hosts = newHosts(f)
-	hosts.Load()
-
-	// This is the primary different from TestAddressReassignment test
-	hosts.RemoveHost(name.hostnames[0])
-
-	// changes the IP address for the entire entry
-	hosts.SetHost(name.hostnames[0], net.ParseIP("192.168.0.3"))
-	ips := hosts.HostIP(name.hostnames[0])
-	require.Equal(t, 1, len(ips), "Expected only one results for name lookup")
-	require.Equal(t, "192.168.0.3", ips[0].String(), "Expected update of address to take effect")
-
-	// and check the alias is NOT updated as well
-	ips = hosts.HostIP(alias.hostnames[0])
-	require.Equal(t, 1, len(ips), "Expected only one results for name lookup")
-	require.Equal(t, "192.168.0.2", ips[0].String(), "Expected alias entry not to have been updated to take effect")
-}
-
-// TestNoChange confirms that performing an operation that should not cause a change causes
-// no update
-func TestNoChange(t *testing.T) {
-	hosts := initializeHostsFile(t)
-	f := hosts.Path()
-
-	finfo, err := os.Stat(f)
-	require.NoError(t, err, "Unable to stat hosts file")
-	modTime := finfo.ModTime()
-
-	// perform the no-op update
-	ip := hosts.HostIP(name.hostnames[0])
-	hosts.SetHost(name.hostnames[0], ip[0])
-
-	// save the file - this should be a a no-op
-	err = hosts.Save()
-	require.NoError(t, err, "Unable to save hosts file")
-
-	finfo, err = os.Stat(f)
-	require.NoError(t, err, "Unable to stat hosts file for verification")
-
-	assert.Equal(t, modTime, finfo.ModTime(), "Expected modification time to be unchanged")
-}
-
-// TestLocalToPublic checks the behaviour of reassignment for a hostname that is currently
-// assigned to a local address with the new address being public.
-// This is a distinct case as we should NOT be moving the standard localhost aliases.
-func TestLocalToPublic(t *testing.T) {
-	t.Skipf("Unimplemented - current implementation behaviour does not reflect this requirement")
-}
-
-// TestPublicToLocal checks the behaviour of reassignment for a hostname that is currently
-// assigned to a public address with the new address being private.
-// This is a distinct case as we should NOT be moving any aliases
-func TestPublicToLocal(t *testing.T) {
-	t.Skipf("Unimplemented - current implementation behaviour does not reflect this requirement")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_windows.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_windows.go
deleted file mode 100644
index 37f82a15c4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/hosts_windows.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-const HostsPath = "c:\\Windows\\System32\\Drivers\\etc\\hosts"
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf.go
deleted file mode 100644
index a933dcbbd4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf.go
+++ /dev/null
@@ -1,281 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-const (
-	ResolvConfPath       = "/etc/resolv.conf"
-	DefaultAttempts uint = 5
-	DefaultTimeout       = 15 * time.Second
-)
-
-type ResolvConf interface {
-	Conf
-
-	AddNameservers(...net.IP)
-	RemoveNameservers(...net.IP)
-	Nameservers() []net.IP
-	Attempts() uint
-	Timeout() time.Duration
-	SetAttempts(uint)
-	SetTimeout(time.Duration)
-}
-
-type resolvConf struct {
-	sync.Mutex
-
-	EntryConsumer
-
-	dirty       bool
-	path        string
-	nameservers []net.IP
-	timeout     time.Duration
-	attempts    uint
-}
-
-type resolvConfWalker struct {
-	lines []string
-	i     int
-}
-
-func (w *resolvConfWalker) HasNext() bool {
-	return w.i < len(w.lines)
-}
-
-func (w *resolvConfWalker) Next() string {
-	s := w.lines[w.i]
-	w.i++
-	return s
-}
-
-func NewResolvConf(path string) ResolvConf {
-	if path == "" {
-		path = ResolvConfPath
-	}
-
-	return &resolvConf{
-		path:     path,
-		timeout:  DefaultTimeout,
-		attempts: DefaultAttempts,
-	}
-}
-
-func (r *resolvConf) ConsumeEntry(t string) error {
-	r.Lock()
-	defer r.Unlock()
-
-	fs := strings.Fields(t)
-	if len(fs) < 2 {
-		log.Warnf("skipping invalid line %q", t)
-		return nil
-	}
-
-	switch fs[0] {
-	case "nameserver":
-		ip := net.ParseIP(fs[1])
-		if ip == nil {
-			log.Warnf("skipping invalid line %q: invalid ip address", t)
-			return nil
-		}
-
-		r.addNameservers(ip)
-	case "options":
-		parts := strings.Split(fs[1], ":")
-		if len(parts) > 2 {
-			log.Warnf("skipping invalid line %q", t)
-			return nil
-		}
-
-		var v uint
-		switch parts[0] {
-		case "timeout":
-			fallthrough
-		case "attempts":
-			if len(parts) < 2 {
-				log.Warnf("skipping invalid line %q", t)
-				return nil
-			}
-
-			o, err := strconv.ParseUint(parts[1], 10, strconv.IntSize)
-			if err != nil {
-				log.Warnf("skipping invalid line %q: %s", t, err)
-				return nil
-			}
-			v = uint(o)
-		}
-
-		switch parts[0] {
-		case "timeout":
-			r.timeout = time.Duration(v) * time.Second
-		case "attempts":
-			r.attempts = v
-		}
-	}
-
-	return nil
-}
-
-func (r *resolvConf) Copy(conf Conf) error {
-	existing := conf.(*resolvConf)
-
-	existing.Lock()
-	defer existing.Unlock()
-
-	r.nameservers = existing.nameservers
-	r.dirty = true
-
-	return r.Save()
-}
-
-func (r *resolvConf) Load() error {
-	r.Lock()
-	defer r.Unlock()
-
-	rc := &resolvConf{}
-	if err := load(r.path, rc); err != nil {
-		return err
-	}
-
-	r.nameservers = rc.nameservers
-	return nil
-}
-
-func (r *resolvConf) Save() error {
-	r.Lock()
-	defer r.Unlock()
-
-	log.Debugf("%+v", r)
-	if !r.dirty {
-		return nil
-	}
-
-	walker := &resolvConfWalker{lines: r.lines()}
-	log.Debugf("%+v", walker)
-	if err := save(r.path, walker); err != nil {
-		return err
-	}
-
-	// make sure the file is readable
-	// #nosec: Expect file permissions to be 0600 or less
-	if err := os.Chmod(r.path, 0644); err != nil {
-		return err
-	}
-
-	r.dirty = false
-	return nil
-}
-
-func (r *resolvConf) AddNameservers(nss ...net.IP) {
-	r.Lock()
-	defer r.Unlock()
-
-	r.addNameservers(nss...)
-}
-
-func (r *resolvConf) addNameservers(nss ...net.IP) {
-	for _, n := range nss {
-		if n == nil {
-			continue
-		}
-
-		found := false
-		for _, rn := range r.nameservers {
-			if rn.Equal(n) {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			r.nameservers = append(r.nameservers, n)
-			r.dirty = true
-		}
-	}
-}
-
-func (r *resolvConf) RemoveNameservers(nss ...net.IP) {
-	r.Lock()
-	defer r.Unlock()
-
-	for _, n := range nss {
-		if n == nil {
-			continue
-		}
-
-		for i, rn := range r.nameservers {
-			if n.Equal(rn) {
-				r.nameservers = append(r.nameservers[:i], r.nameservers[i+1:]...)
-				r.dirty = true
-				break
-			}
-		}
-	}
-}
-
-func (r *resolvConf) Nameservers() []net.IP {
-	r.Lock()
-	defer r.Unlock()
-
-	return r.nameservers
-}
-
-func (r *resolvConf) Timeout() time.Duration {
-	return r.timeout
-}
-
-func (r *resolvConf) Attempts() uint {
-	return r.attempts
-}
-
-func (r *resolvConf) SetTimeout(t time.Duration) {
-	r.timeout = t
-	r.dirty = true
-}
-
-func (r *resolvConf) SetAttempts(attempts uint) {
-	if attempts > 0 {
-		r.attempts = attempts
-		r.dirty = true
-	}
-}
-
-func (r *resolvConf) Path() string {
-	return r.path
-}
-
-func (r *resolvConf) lines() []string {
-	var l []string
-	for _, n := range r.nameservers {
-		l = append(l, fmt.Sprintf("nameserver %s", n))
-	}
-
-	l = append(l, []string{
-		fmt.Sprintf("options timeout:%d", r.timeout/time.Second),
-		fmt.Sprintf("options attempts:%d", r.attempts),
-	}...)
-
-	return l
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf_test.go b/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf_test.go
deleted file mode 100644
index 32f1e97761..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/etcconf/resolvconf_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package etcconf
-
-import (
-	"net"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestConsumeEntry(t *testing.T) {
-	r := NewResolvConf("")
-
-	assert.Equal(t, r.Timeout(), DefaultTimeout)
-
-	c := r.(EntryConsumer)
-	var tests = []struct {
-		in          string
-		nameservers []net.IP
-		timeout     time.Duration
-		attempts    uint
-	}{
-		{"options", nil, DefaultTimeout, DefaultAttempts},
-		{"nameserver", nil, DefaultTimeout, DefaultAttempts},
-		{"options timeout", nil, DefaultTimeout, DefaultAttempts},
-		{"options attempts", nil, DefaultTimeout, DefaultAttempts},
-		{"options timeout:", nil, DefaultTimeout, DefaultAttempts},
-		{"options attempts:", nil, DefaultTimeout, DefaultAttempts},
-		{"options foo:1", nil, DefaultTimeout, DefaultAttempts},
-		{"options timeout:10", nil, 10 * time.Second, DefaultAttempts},
-		{"options attempts:5", nil, 10 * time.Second, 5},
-		{"nameserver 10.10.10", nil, 10 * time.Second, 5},
-		{"nameserver 10.10.10.10", []net.IP{net.ParseIP("10.10.10.10")}, 10 * time.Second, 5},
-	}
-
-	for _, te := range tests {
-		c.ConsumeEntry(te.in)
-		assert.EqualValues(t, te.nameservers, r.Nameservers())
-		assert.Equal(t, te.timeout, r.Timeout())
-		assert.Equal(t, te.attempts, r.Attempts())
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/docker.go b/installer/vendor/github.com/vmware/vic/lib/imagec/docker.go
deleted file mode 100644
index 28d8600b62..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/docker.go
+++ /dev/null
@@ -1,472 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"archive/tar"
-	"context"
-	"crypto/sha256"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-
-	log "github.com/Sirupsen/logrus"
-
-	ddigest "github.com/docker/distribution/digest"
-	"github.com/docker/distribution/manifest/schema1"
-	"github.com/docker/distribution/manifest/schema2"
-	dlayer "github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/archive"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/reference"
-	"github.com/docker/libtrust"
-
-	urlfetcher "github.com/vmware/vic/pkg/fetcher"
-	registryutils "github.com/vmware/vic/pkg/registry"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	// DigestSHA256EmptyTar is the canonical sha256 digest of empty tar file -
-	// (1024 NULL bytes)
-	DigestSHA256EmptyTar = string(dlayer.DigestSHA256EmptyTar)
-)
-
-// FSLayer is a container struct for BlobSums defined in an image manifest
-type FSLayer struct {
-	// BlobSum is the tarsum of the referenced filesystem image layer
-	BlobSum string `json:"blobSum"`
-}
-
-// History is a container struct for V1Compatibility defined in an image manifest
-type History struct {
-	V1Compatibility string `json:"v1Compatibility"`
-}
-
-// Manifest represents the Docker Manifest file
-type Manifest struct {
-	Name     string    `json:"name"`
-	Tag      string    `json:"tag"`
-	Digest   string    `json:"digest,omitempty"`
-	FSLayers []FSLayer `json:"fsLayers"`
-	History  []History `json:"history"`
-	// ignoring signatures
-}
-
-// LearnRegistryURL returns the registry URL after making sure that it responds to queries
-func LearnRegistryURL(options *Options) (string, error) {
-	defer trace.End(trace.Begin(options.Registry))
-
-	log.Debugf("Trying https scheme for %#v", options)
-
-	registry, err := registryutils.Reachable(options.Registry, "https", options.Username, options.Password, options.RegistryCAs, options.Timeout, options.InsecureSkipVerify)
-
-	if err != nil && options.InsecureAllowHTTP {
-		// try https without verification
-		log.Debugf("Trying https without verification, last error: %+v", err)
-		registry, err = registryutils.Reachable(options.Registry, "https", options.Username, options.Password, options.RegistryCAs, options.Timeout, true)
-		if err == nil {
-			// Success, set InsecureSkipVerify to true
-			options.InsecureSkipVerify = true
-		} else {
-			// try http
-			log.Debugf("Falling back to http")
-			registry, err = registryutils.Reachable(options.Registry, "http", options.Username, options.Password, options.RegistryCAs, options.Timeout, options.InsecureSkipVerify)
-		}
-	}
-
-	return registry, err
-}
-
-// LearnAuthURL returns the URL of the OAuth endpoint
-func LearnAuthURL(options Options) (*url.URL, error) {
-	defer trace.End(trace.Begin(options.Reference.String()))
-
-	url, err := url.Parse(options.Registry)
-	if err != nil {
-		return nil, err
-	}
-
-	tagOrDigest := tagOrDigest(options.Reference, options.Tag)
-	url.Path = path.Join(url.Path, options.Image, "manifests", tagOrDigest)
-	log.Debugf("URL: %s", url)
-
-	fetcher := urlfetcher.NewURLFetcher(urlfetcher.Options{
-		Timeout:            options.Timeout,
-		Username:           options.Username,
-		Password:           options.Password,
-		InsecureSkipVerify: options.InsecureSkipVerify,
-		RootCAs:            options.RegistryCAs,
-	})
-
-	// We expect docker registry to return a 401 to us - with a WWW-Authenticate header
-	// We parse that header and learn the OAuth endpoint to fetch OAuth token.
-	hdr, err := fetcher.Head(url)
-	if err == nil && fetcher.IsStatusUnauthorized() {
-		return fetcher.ExtractOAuthURL(hdr.Get("www-authenticate"), url)
-	}
-
-	// Private registry returned the manifest directly as auth option is optional.
-	// https://github.com/docker/distribution/blob/master/docs/configuration.md#auth
-	if err == nil && options.Registry != DefaultDockerURL && fetcher.IsStatusOK() {
-		log.Debugf("%s does not support OAuth", url)
-		return nil, nil
-	}
-
-	// Do we even have the image on that registry
-	if err != nil && fetcher.IsStatusNotFound() {
-		err = fmt.Errorf("image not found")
-		return nil, urlfetcher.ImageNotFoundError{Err: err}
-	}
-
-	return nil, fmt.Errorf("%s returned an unexpected response: %s", url, err)
-}
-
-// FetchToken fetches the OAuth token from OAuth endpoint
-func FetchToken(ctx context.Context, options Options, url *url.URL, progressOutput progress.Output) (*urlfetcher.Token, error) {
-	defer trace.End(trace.Begin(url.String()))
-
-	log.Debugf("URL: %s", url)
-
-	fetcher := urlfetcher.NewURLFetcher(urlfetcher.Options{
-		Timeout:            options.Timeout,
-		Username:           options.Username,
-		Password:           options.Password,
-		InsecureSkipVerify: options.InsecureSkipVerify,
-		RootCAs:            options.RegistryCAs,
-	})
-
-	token, err := fetcher.FetchAuthToken(url)
-	if err != nil {
-		err := fmt.Errorf("FetchToken (%s) failed: %s", url, err)
-		log.Error(err)
-		return nil, err
-	}
-
-	return token, nil
-}
-
-// FetchImageBlob fetches the image blob
-func FetchImageBlob(ctx context.Context, options Options, image *ImageWithMeta, progressOutput progress.Output) (string, error) {
-	defer trace.End(trace.Begin(options.Image + "/" + image.Layer.BlobSum))
-
-	id := image.ID
-	layer := image.Layer.BlobSum
-	meta := image.Meta
-	diffID := ""
-
-	url, err := url.Parse(options.Registry)
-	if err != nil {
-		return diffID, err
-	}
-	url.Path = path.Join(url.Path, options.Image, "blobs", layer)
-
-	log.Debugf("URL: %s\n ", url)
-
-	fetcher := urlfetcher.NewURLFetcher(urlfetcher.Options{
-		Timeout:            options.Timeout,
-		Username:           options.Username,
-		Password:           options.Password,
-		Token:              options.Token,
-		InsecureSkipVerify: options.InsecureSkipVerify,
-		RootCAs:            options.RegistryCAs,
-	})
-
-	// ctx
-	ctx, cancel := context.WithTimeout(ctx, options.Timeout)
-	defer cancel()
-
-	imageFileName, err := fetcher.Fetch(ctx, url, nil, true, progressOutput, image.String())
-	if err != nil {
-		return diffID, err
-	}
-
-	// Cleanup function for the error case
-	defer func() {
-		if err != nil {
-			os.Remove(imageFileName)
-		}
-	}()
-
-	// Open the file so that we can use it as a io.Reader for sha256 calculation
-	imageFile, err := os.Open(string(imageFileName))
-	if err != nil {
-		return diffID, err
-	}
-	defer imageFile.Close()
-
-	// blobSum is the sha of the compressed layer
-	blobSum := sha256.New()
-
-	// diffIDSum is the sha of the uncompressed layer
-	diffIDSum := sha256.New()
-
-	// blobTr is an io.TeeReader that writes bytes to blobSum that it reads from imageFile
-	// see https://golang.org/pkg/io/#TeeReader
-	blobTr := io.TeeReader(imageFile, blobSum)
-
-	progress.Update(progressOutput, image.String(), "Verifying Checksum")
-	decompressedTar, err := archive.DecompressStream(blobTr)
-	if err != nil {
-		return diffID, err
-	}
-
-	// Copy bytes from decompressed layer into diffIDSum to calculate diffID
-	_, cerr := io.Copy(diffIDSum, decompressedTar)
-	if cerr != nil {
-		return diffID, cerr
-	}
-
-	bs := fmt.Sprintf("sha256:%x", blobSum.Sum(nil))
-	if bs != layer {
-		return diffID, fmt.Errorf("Failed to validate layer checksum. Expected %s got %s", layer, bs)
-	}
-
-	diffID = fmt.Sprintf("sha256:%x", diffIDSum.Sum(nil))
-
-	// this isn't an empty layer, so we need to calculate the size
-	if diffID != string(DigestSHA256EmptyTar) {
-		var layerSize int64
-
-		// seek to the beginning of the file
-		imageFile.Seek(0, 0)
-
-		// recreate the decompressed tar Reader
-		decompressedTar, err := archive.DecompressStream(imageFile)
-		if err != nil {
-			return "", err
-		}
-
-		// get a tar reader for access to the files in the archive
-		tr := tar.NewReader(decompressedTar)
-
-		// iterate through tar headers to get file sizes
-		for {
-			tarHeader, err := tr.Next()
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				return "", err
-			}
-			layerSize += tarHeader.Size
-		}
-
-		image.Size = layerSize
-	}
-
-	log.Infof("diffID for layer %s: %s", id, diffID)
-
-	// Ensure the parent directory exists
-	destination := path.Join(DestinationDirectory(options), id)
-	err = os.MkdirAll(destination, 0755) /* #nosec */
-	if err != nil {
-		return diffID, err
-	}
-
-	// Move(rename) the temporary file to its final destination
-	err = os.Rename(string(imageFileName), path.Join(destination, id+".tar"))
-	if err != nil {
-		return diffID, err
-	}
-
-	// Dump the history next to it
-	err = ioutil.WriteFile(path.Join(destination, id+".json"), []byte(meta), 0644)
-	if err != nil {
-		return diffID, err
-	}
-
-	progress.Update(progressOutput, image.String(), "Download complete")
-
-	return diffID, nil
-}
-
-// tagOrDigest returns an image's digest if it's pulled by digest, or its tag
-// otherwise.
-func tagOrDigest(r reference.Named, tag string) string {
-	if digested, ok := r.(reference.Canonical); ok {
-		return digested.Digest().String()
-	}
-
-	return tag
-}
-
-// FetchImageManifest fetches the image manifest file
-func FetchImageManifest(ctx context.Context, options Options, schemaVersion int, progressOutput progress.Output) (interface{}, string, error) {
-	defer trace.End(trace.Begin(options.Reference.String()))
-
-	if schemaVersion != 1 && schemaVersion != 2 {
-		return nil, "", fmt.Errorf("Unknown schema version %d requested!", schemaVersion)
-	}
-
-	url, err := url.Parse(options.Registry)
-	if err != nil {
-		return nil, "", err
-	}
-
-	tagOrDigest := tagOrDigest(options.Reference, options.Tag)
-	url.Path = path.Join(url.Path, options.Image, "manifests", tagOrDigest)
-	log.Debugf("URL: %s", url)
-
-	fetcher := urlfetcher.NewURLFetcher(urlfetcher.Options{
-		Timeout:            options.Timeout,
-		Username:           options.Username,
-		Password:           options.Password,
-		Token:              options.Token,
-		InsecureSkipVerify: options.InsecureSkipVerify,
-		RootCAs:            options.RegistryCAs,
-	})
-
-	reqHeaders := make(http.Header)
-	if schemaVersion == 2 {
-		reqHeaders.Add("Accept", schema2.MediaTypeManifest)
-		reqHeaders.Add("Accept", schema1.MediaTypeManifest)
-	}
-
-	manifestFileName, err := fetcher.Fetch(ctx, url, &reqHeaders, true, progressOutput)
-	if err != nil {
-		return nil, "", err
-	}
-
-	// Cleanup function for the error case
-	defer func() {
-		if err != nil {
-			os.Remove(manifestFileName)
-		}
-	}()
-
-	switch schemaVersion {
-	case 1: //schema 1, signed manifest
-		return decodeManifestSchema1(manifestFileName, options, url.Hostname())
-	case 2: //schema 2
-		return decodeManifestSchema2(manifestFileName, options)
-	}
-
-	//We shouldn't really get here
-	return nil, "", fmt.Errorf("Unknown schema version %d requested!", schemaVersion)
-}
-
-// decodeManifestSchema1() reads a manifest schema 1 and creates an imageC
-// defined Manifest structure and returns the digest of the manifest as a string.
-// For historical reason, we did not use the Docker's defined schema1.Manifest
-// instead of our own and probably should do so in the future.
-func decodeManifestSchema1(filename string, options Options, registry string) (interface{}, string, error) {
-	// Read the entire file into []byte for json.Unmarshal
-	content, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, "", err
-	}
-
-	manifest := &Manifest{}
-	err = json.Unmarshal(content, manifest)
-	if err != nil {
-		return nil, "", err
-	}
-
-	digest, err := getManifestDigest(content, options.Reference)
-	if err != nil {
-		return nil, "", err
-	}
-
-	manifest.Digest = digest
-
-	// Verify schema 1 manifest's fields per docker/docker/distribution/pull_v2.go
-	numFSLayers := len(manifest.FSLayers)
-	if numFSLayers == 0 {
-		return nil, "", fmt.Errorf("no FSLayers in manifest")
-	}
-	if numFSLayers != len(manifest.History) {
-		return nil, "", fmt.Errorf("length of history not equal to number of layers")
-	}
-
-	return manifest, digest, nil
-}
-
-// verifyManifestDigest checks the manifest digest against the received payload.
-func verifyManifestDigest(digested reference.Canonical, bytes []byte) error {
-	verifier, err := ddigest.NewDigestVerifier(digested.Digest())
-	if err != nil {
-		return err
-	}
-	if _, err = verifier.Write(bytes); err != nil {
-		return err
-	}
-	if !verifier.Verified() {
-		return fmt.Errorf("image manifest verification failed for digest %s", digested.Digest())
-	}
-
-	return nil
-}
-
-// decodeManifestSchema2() reads a manifest schema 2 and creates a Docker
-// defined Manifest structure and returns the digest of the manifest as a string.
-func decodeManifestSchema2(filename string, options Options) (interface{}, string, error) {
-	// Read the entire file into []byte for json.Unmarshal
-	content, err := ioutil.ReadFile(filename)
-	if err != nil {
-		return nil, "", err
-	}
-
-	manifest := &schema2.DeserializedManifest{}
-
-	err = json.Unmarshal(content, manifest)
-	if err != nil {
-		return nil, "", err
-	}
-
-	_, canonical, err := manifest.Payload()
-	if err != nil {
-		return nil, "", err
-	}
-
-	digest := ddigest.FromBytes(canonical)
-
-	return manifest, string(digest), nil
-}
-
-func getManifestDigest(content []byte, ref reference.Named) (string, error) {
-	jsonSig, err := libtrust.ParsePrettySignature(content, "signatures")
-	if err != nil {
-		return "", err
-	}
-
-	// Resolve the payload in the manifest.
-	bytes, err := jsonSig.Payload()
-	if err != nil {
-		return "", err
-	}
-
-	log.Debugf("Canonical Bytes: %d", len(bytes))
-
-	// Verify the manifest digest if the image is pulled by digest. If the image
-	// is not pulled by digest, we proceed without this check because we don't
-	// have a digest to verify the received content with.
-	// https://docs.docker.com/registry/spec/api/#content-digests
-	if digested, ok := ref.(reference.Canonical); ok {
-		if err := verifyManifestDigest(digested, bytes); err != nil {
-			return "", err
-		}
-	}
-
-	digest := ddigest.FromBytes(bytes)
-	// Correct Manifest Digest
-	log.Debugf("Manifest Digest: %v", digest)
-	return string(digest), nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/docker_test.go b/installer/vendor/github.com/vmware/vic/lib/imagec/docker_test.go
deleted file mode 100644
index 5fc0fb7e5f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/docker_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"testing"
-
-	"github.com/docker/docker/reference"
-	"github.com/stretchr/testify/assert"
-)
-
-const (
-	UbuntuTaggedRef      = "library/ubuntu:latest"
-	UbuntuDigest         = "ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2"
-	UbuntuDigestSHA      = "sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2"
-	UbuntuDigestManifest = `{
-   "schemaVersion": 1,
-   "name": "library/ubuntu",
-   "tag": "14.04",
-   "architecture": "amd64",
-   "fsLayers": [
-      {
-         "blobSum": "sha256:a3ed95caeb02ffe68cdd9fd84406680ae93d633cb16422d00e8a7c22955b46d4"
-      },
-      {
-         "blobSum": "sha256:28a2f68d1120598986362662445c47dce7ec13c2662479e7aab9f0ecad4a7416"
-      },
-      {
-         "blobSum": "sha256:fd2731e4c50ce221d785d4ce26a8430bca9a95bfe4162fafc997a1cc65682cce"
-      },
-      {
-         "blobSum": "sha256:5a132a7e7af11f304041e93efb9cb2a0a7839bccaec5a03cfbdc9a3f5d0eb481"
-      }
-   ],
-   "history": [
-      {
-         "v1Compatibility": "{\"id\":\"56063ad57855f2632f641a622efa81a0feda1731bfadda497b1288d11feef4da\",\"parent\":\"4e1f7c524148bf80fcc4ce9991e88d708048d38440e3e3a14d56e72c17ddccc7\",\"created\":\"2016-03-03T21:38:53.80360049Z\",\"container\":\"b6361ab0a2a82f71c5bd3becbb9c854331f8259b9c3fe466bf6e7e073c735a2c\",\"container_config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/bin/bash\\\"]\"],\"Image\":\"4e1f7c524148bf80fcc4ce9991e88d708048d38440e3e3a14d56e72c17ddccc7\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.9.1\",\"config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/bash\"],\"Image\":\"4e1f7c524148bf80fcc4ce9991e88d708048d38440e3e3a14d56e72c17ddccc7\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\"}"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"4e1f7c524148bf80fcc4ce9991e88d708048d38440e3e3a14d56e72c17ddccc7\",\"parent\":\"38112156678df7d8001ae944f118d283009565540dc0cd88fb39fccc88c3c7f2\",\"created\":\"2016-03-03T21:38:53.085760873Z\",\"container\":\"ccc6ec8b31df981344b4107bd890394be35564adb8d13df34d1cb1849c7f0c3e\",\"container_config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/sh\",\"-c\",\"sed -i 's/^#\\\\s*\\\\(deb.*universe\\\\)$/\\\\1/g' /etc/apt/sources.list\"],\"Image\":\"38112156678df7d8001ae944f118d283009565540dc0cd88fb39fccc88c3c7f2\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.9.1\",\"config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":null,\"Image\":\"38112156678df7d8001ae944f118d283009565540dc0cd88fb39fccc88c3c7f2\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":1895}"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"38112156678df7d8001ae944f118d283009565540dc0cd88fb39fccc88c3c7f2\",\"parent\":\"454970bd163ba95435b50e963edd63b2b2fff4c1845e5d3cd03d5ba8afb8a08d\",\"created\":\"2016-03-03T21:38:51.45368726Z\",\"container\":\"3c8556d1a209f22cfbc87f3cbd9bcb6674c5f9645a14aa488756d129f6987f40\",\"container_config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/sh\",\"-c\",\"echo '#!/bin/sh' \\u003e /usr/sbin/policy-rc.d \\t\\u0026\\u0026 echo 'exit 101' \\u003e\\u003e /usr/sbin/policy-rc.d \\t\\u0026\\u0026 chmod +x /usr/sbin/policy-rc.d \\t\\t\\u0026\\u0026 dpkg-divert --local --rename --add /sbin/initctl \\t\\u0026\\u0026 cp -a /usr/sbin/policy-rc.d /sbin/initctl \\t\\u0026\\u0026 sed -i 's/^exit.*/exit 0/' /sbin/initctl \\t\\t\\u0026\\u0026 echo 'force-unsafe-io' \\u003e /etc/dpkg/dpkg.cfg.d/docker-apt-speedup \\t\\t\\u0026\\u0026 echo 'DPkg::Post-Invoke { \\\"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true\\\"; };' \\u003e /etc/apt/apt.conf.d/docker-clean \\t\\u0026\\u0026 echo 'APT::Update::Post-Invoke { \\\"rm -f /var/cache/apt/archives/*.deb /var/cache/apt/archives/partial/*.deb /var/cache/apt/*.bin || true\\\"; };' \\u003e\\u003e /etc/apt/apt.conf.d/docker-clean \\t\\u0026\\u0026 echo 'Dir::Cache::pkgcache \\\"\\\"; Dir::Cache::srcpkgcache \\\"\\\";' \\u003e\\u003e /etc/apt/apt.conf.d/docker-clean \\t\\t\\u0026\\u0026 echo 'Acquire::Languages \\\"none\\\";' \\u003e /etc/apt/apt.conf.d/docker-no-languages \\t\\t\\u0026\\u0026 echo 'Acquire::GzipIndexes \\\"true\\\"; Acquire::CompressionTypes::Order:: \\\"gz\\\";' \\u003e /etc/apt/apt.conf.d/docker-gzip-indexes\"],\"Image\":\"454970bd163ba95435b50e963edd63b2b2fff4c1845e5d3cd03d5ba8afb8a08d\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.9.1\",\"config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":null,\"Image\":\"454970bd163ba95435b50e963edd63b2b2fff4c1845e5d3cd03d5ba8afb8a08d\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":194533}"
-      },
-      {
-         "v1Compatibility": "{\"id\":\"454970bd163ba95435b50e963edd63b2b2fff4c1845e5d3cd03d5ba8afb8a08d\",\"created\":\"2016-03-03T21:38:46.169812943Z\",\"container\":\"c24ffee5b2b808674d335e2c42c9c47aa9aff1b368eb5920018cde7dd26f2046\",\"container_config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) ADD file:b9504126dc55908988977286e89c43c7ea73a506d43fae82c29ef132e21b6ece in /\"],\"Image\":\"\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":null},\"docker_version\":\"1.9.1\",\"config\":{\"Hostname\":\"c24ffee5b2b8\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":null,\"Image\":\"\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":null},\"architecture\":\"amd64\",\"os\":\"linux\",\"Size\":187763841}"
-      }
-   ],
-   "signatures": [
-      {
-         "header": {
-            "jwk": {
-               "crv": "P-256",
-               "kid": "G2JA:NPRD:EWRM:EFEJ:4PHQ:TRZR:6W6O:D5LC:UJ36:RHOE:ZN7D:N55I",
-               "kty": "EC",
-               "x": "NrETepARqTLeOBcTdBCE8K8jbQJgiTH1p7XJ78zBxjk",
-               "y": "ay0SmJatkJs-JdnW80807CcNPWHElsh6MW_JTh7NdbU"
-            },
-            "alg": "ES256"
-         },
-         "signature": "kHbWdD1NQw2RIAQ8uYnKmolU3Z_WeUW8DfRtJRprVDzK7AZaF-ChI4V9Lh74HnjSNwoNZ_QRhUQDl_Nezb0Hgw",
-         "protected": "eyJmb3JtYXRMZW5ndGgiOjY3NzksImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNy0wNS0xN1QxODowMjozMFoifQ"
-      }
-   ]
-}
-`
-)
-
-func TestGetManifestDigest(t *testing.T) {
-	// Get the manifest content when the image is not pulled by digest
-	ref, err := reference.ParseNamed(UbuntuTaggedRef)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	digest, err := getManifestDigest([]byte(UbuntuDigestManifest), ref)
-	assert.NoError(t, err)
-	assert.Equal(t, digest, UbuntuDigestSHA)
-
-	// Get and verify the manifest content with the correct digest
-	ref, err = reference.ParseNamed(UbuntuDigest)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	_, ok := ref.(reference.Canonical)
-	assert.True(t, ok)
-	digest, err = getManifestDigest([]byte(UbuntuDigestManifest), ref)
-	assert.NoError(t, err)
-	assert.Equal(t, digest, UbuntuDigestSHA)
-
-	// Attempt to get and verify an incorrect manifest content with the digest
-	digest, err = getManifestDigest([]byte(DefaultManifest), ref)
-	assert.NotNil(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/download.go b/installer/vendor/github.com/vmware/vic/lib/imagec/download.go
deleted file mode 100644
index 40057627b6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/download.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissi[ons and
-// limitations under the License.
-
-package imagec
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"sync"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/pkg/trace"
-
-	"github.com/docker/docker/distribution/xfer"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-)
-
-const (
-	maxDownloadAttempts    = 5
-	maxConcurrentDownloads = 3
-)
-
-type downloadTransfer struct {
-	xfer.Transfer
-
-	layer *ImageWithMeta
-	err   error
-}
-
-// result returns the layer resulting from the download, if the download
-// and registration were successful.
-func (d *downloadTransfer) result() error {
-	return d.err
-}
-
-// LayerDownloader keeps track of what layers are currently being downloaded
-type LayerDownloader struct {
-	m             sync.Mutex
-	downloadsByID map[string]*downloadTransfer
-
-	tm xfer.TransferManager
-}
-
-// NewLayerDownloader creates and returns a new LayerDownloadManager
-func NewLayerDownloader() *LayerDownloader {
-	return &LayerDownloader{
-		tm:            xfer.NewTransferManager(maxConcurrentDownloads),
-		downloadsByID: make(map[string]*downloadTransfer),
-	}
-}
-
-func (ldm *LayerDownloader) registerDownload(download *downloadTransfer) {
-	ldm.downloadsByID[download.layer.ID] = download
-}
-
-func (ldm *LayerDownloader) unregisterDownload(layer *ImageWithMeta) {
-	// stop tracking the download transfer
-	delete(ldm.downloadsByID, layer.ID)
-}
-
-type prog struct {
-	err chan error
-	p   progress.Progress
-}
-
-type serialProgressOutput struct {
-	c   chan prog
-	out progress.Output
-}
-
-func (s *serialProgressOutput) WriteProgress(p progress.Progress) error {
-	pr := prog{err: make(chan error, 1), p: p}
-	s.c <- pr
-	err := <-pr.err
-	close(pr.err)
-	return err
-}
-
-func (s *serialProgressOutput) run() {
-	for pr := range s.c {
-		err := s.out.WriteProgress(pr.p)
-		pr.err <- err
-	}
-}
-
-func (s *serialProgressOutput) stop() {
-	close(s.c)
-}
-
-// DownloadLayers ensures layers end up in the portlayer's image store
-// It handles existing and simultaneous layer download de-duplication
-// This code is utilizes Docker's xfer package: https://github.com/docker/docker/tree/v1.11.2/distribution/xfer
-func (ldm *LayerDownloader) DownloadLayers(ctx context.Context, ic *ImageC) error {
-	defer trace.End(trace.Begin(""))
-
-	var (
-		topDownload    *downloadTransfer
-		watcher        *xfer.Watcher
-		d              xfer.Transfer
-		layerCount     = 0
-		sf             = streamformatter.NewJSONStreamFormatter()
-		progressOutput = &serialProgressOutput{
-			c:   make(chan prog, 100),
-			out: sf.NewProgressOutput(ic.Outstream, false),
-		}
-	)
-
-	go progressOutput.run()
-	defer progressOutput.stop()
-
-	// lock here so that we get all layers in flight before another client comes along
-	ldm.m.Lock()
-
-	// Grab the imageLayers
-	layers := ic.ImageLayers
-
-	// iterate backwards through layers to download
-	for i := len(layers) - 1; i >= 0; i-- {
-
-		layer := layers[i]
-		id := layer.ID
-
-		layerConfig, err := LayerCache().Get(id)
-		if err != nil {
-
-			switch err := err.(type) {
-			case LayerNotFoundError:
-
-				layerCount++
-
-				// layer does not already exist in store and is not currently in flight, so download it
-				progress.Update(progressOutput, layer.String(), "Pulling fs layer")
-
-				xferFunc := ldm.makeDownloadFunc(layer, ic, topDownload, layers)
-				d, watcher = ldm.tm.Transfer(id, xferFunc, progressOutput)
-				topDownload = d.(*downloadTransfer)
-
-				defer topDownload.Transfer.Release(watcher)
-
-				ldm.registerDownload(topDownload)
-				layer.Downloading = true
-				LayerCache().Add(layer)
-
-				continue
-			default:
-				return err
-			}
-		}
-
-		if layerConfig.Downloading {
-
-			layerCount++
-
-			if existingDownload, ok := ldm.downloadsByID[id]; ok {
-
-				xferFunc := ldm.makeDownloadFuncFromDownload(layer, existingDownload, topDownload, layers)
-				d, watcher = ldm.tm.Transfer(id, xferFunc, progressOutput)
-				topDownload = d.(*downloadTransfer)
-
-				defer topDownload.Transfer.Release(watcher)
-
-			}
-			continue
-		}
-
-		progress.Update(progressOutput, layer.String(), "Already exists")
-	}
-
-	ldm.m.Unlock()
-
-	// each layer download will block until the parent download finishes,
-	// so this will block until the child-most layer, and thus all layers, have finished downloading
-	if layerCount > 0 {
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-topDownload.Done():
-		default:
-			<-topDownload.Done()
-		}
-		err := topDownload.result()
-		if err != nil {
-			return err
-		}
-	} else {
-		if err := UpdateRepoCache(ic); err != nil {
-			return err
-		}
-	}
-
-	progress.Message(progressOutput, "", "Digest: "+ic.ManifestDigest)
-
-	tagOrDigest := tagOrDigest(ic.Reference, ic.Tag)
-	if layerCount > 0 {
-		progress.Message(progressOutput, "", "Status: Downloaded newer image for "+ic.Image+":"+tagOrDigest)
-	} else {
-		progress.Message(progressOutput, "", "Status: Image is up to date for "+ic.Image+":"+tagOrDigest)
-	}
-
-	return nil
-}
-
-// makeDownloadFunc returns a func used by xfer.TransferManager to download a layer
-func (ldm *LayerDownloader) makeDownloadFunc(layer *ImageWithMeta, ic *ImageC, parentDownload *downloadTransfer, layers []*ImageWithMeta) xfer.DoFunc {
-	return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) xfer.Transfer {
-
-		d := &downloadTransfer{
-			Transfer: xfer.NewTransfer(),
-			layer:    layer,
-		}
-
-		go func() {
-
-			defer func() {
-				close(progressChan)
-
-				// remove layer from cache if there was an error attempting to download
-				if d.err != nil {
-					LayerCache().Remove(layer.ID)
-				}
-
-			}()
-
-			progressOutput := progress.ChanOutput(progressChan)
-
-			// wait for TransferManager to give the go-ahead
-			select {
-			case <-start:
-			default:
-				progress.Update(progressOutput, layer.String(), "Waiting")
-				<-start
-			}
-
-			if parentDownload != nil {
-				// bail if parent download failed or was cancelled
-				select {
-				case <-parentDownload.Done():
-					if err := parentDownload.result(); err != nil {
-						d.err = err
-						return
-					}
-				default:
-				}
-			}
-
-			// fetch blob
-			diffID, err := FetchImageBlob(d.Transfer.Context(), ic.Options, layer, progressOutput)
-			if err != nil {
-				d.err = fmt.Errorf("%s/%s returned %s", ic.Image, layer.ID, err)
-				return
-			}
-
-			layer.DiffID = diffID
-
-			close(inactive)
-
-			if parentDownload != nil {
-				select {
-				case <-d.Transfer.Context().Done():
-					d.err = errors.New("layer download cancelled")
-					return
-				default:
-					<-parentDownload.Done() // block until parent download completes
-				}
-
-				if err := parentDownload.result(); err != nil {
-					d.err = err
-					return
-				}
-			}
-
-			// is this the leaf layer?
-			imageLayer := layer.ID == layers[0].ID
-
-			if !ic.Standalone {
-				// if this is the leaf layer, we are done and can now create the image config
-				if imageLayer {
-					imageConfig, err := ic.CreateImageConfig(layers)
-					if err != nil {
-						d.err = err
-						return
-					}
-					// cache and persist the image
-					cache.ImageCache().Add(&imageConfig)
-					if err := cache.ImageCache().Save(); err != nil {
-						d.err = fmt.Errorf("error saving image cache: %s", err)
-						return
-					}
-
-					// place calculated ImageID in struct
-					ic.ImageID = imageConfig.ImageID
-
-					if err = UpdateRepoCache(ic); err != nil {
-						d.err = err
-						return
-					}
-
-				}
-			}
-
-			ldm.m.Lock()
-			defer ldm.m.Unlock()
-
-			// Write blob to the storage layer
-			if err := ic.WriteImageBlob(layer, progressOutput, imageLayer); err != nil {
-				d.err = err
-				return
-			}
-
-			if !ic.Standalone {
-				// mark the layer as finished downloading
-				LayerCache().Commit(layer)
-			}
-
-			ldm.unregisterDownload(layer)
-
-		}()
-
-		return d
-	}
-}
-
-// makeDownloadFuncFromDownload returns a func used by the TransferManager to
-// handle a layer that was already seen in this image pull, or is currently being downloaded
-func (ldm *LayerDownloader) makeDownloadFuncFromDownload(layer *ImageWithMeta, sourceDownload, parentDownload *downloadTransfer, layers []*ImageWithMeta) xfer.DoFunc {
-
-	return func(progressChan chan<- progress.Progress, start <-chan struct{}, inactive chan<- struct{}) xfer.Transfer {
-
-		d := &downloadTransfer{
-			Transfer: xfer.NewTransfer(),
-			layer:    layer,
-		}
-
-		go func() {
-			defer close(progressChan)
-
-			<-start
-
-			close(inactive)
-
-			if parentDownload != nil {
-				select {
-				case <-d.Transfer.Context().Done():
-					d.err = errors.New("layer download cancelled")
-					return
-				case <-parentDownload.Done(): // wait for parent layer download to complete
-				}
-
-				if err := parentDownload.result(); err != nil {
-					d.err = err
-					return
-				}
-			}
-
-			// sourceDownload should have already finished if
-			// parentDownload finished, but wait for it explicitly
-			// to be sure.
-			select {
-			case <-d.Transfer.Context().Done():
-				d.err = errors.New("layer download cancelled")
-				return
-			case <-sourceDownload.Done():
-			}
-
-			if err := sourceDownload.result(); err != nil {
-				d.err = err
-				return
-			}
-
-		}()
-
-		return d
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/imagec.go b/installer/vendor/github.com/vmware/vic/lib/imagec/imagec.go
deleted file mode 100644
index 3ece4cd012..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/imagec.go
+++ /dev/null
@@ -1,651 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"crypto/sha256"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"golang.org/x/net/context"
-
-	"github.com/docker/distribution/manifest/schema2"
-	docker "github.com/docker/docker/image"
-	dockerLayer "github.com/docker/docker/layer"
-	"github.com/docker/docker/pkg/ioutils"
-	"github.com/docker/docker/pkg/progress"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/pkg/stringid"
-	"github.com/docker/docker/reference"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/cache"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	urlfetcher "github.com/vmware/vic/pkg/fetcher"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-// ImageC is responsible for pulling docker images from a repository
-type ImageC struct {
-	Options
-
-	// https://raw.githubusercontent.com/docker/docker/master/distribution/pull_v2.go
-	sf             *streamformatter.StreamFormatter
-	progressOutput progress.Output
-
-	// ImageLayers are sourced from the manifest file
-	ImageLayers []*ImageWithMeta
-
-	// ImageID is the docker ImageID calculated during download
-	ImageID string
-}
-
-// NewImageC returns a new instance of ImageC
-func NewImageC(options Options, strfmtr *streamformatter.StreamFormatter) *ImageC {
-	return &ImageC{
-		Options:        options,
-		sf:             strfmtr,
-		progressOutput: strfmtr.NewProgressOutput(options.Outstream, false),
-	}
-}
-
-// Options contain all options for a single instance of imagec
-type Options struct {
-	Reference reference.Named
-
-	Registry string
-	Image    string
-	Tag      string
-
-	Destination string
-
-	Host      string
-	Storename string
-
-	Username string
-	Password string
-
-	Token *urlfetcher.Token
-
-	Timeout time.Duration
-
-	Outstream io.Writer
-
-	InsecureSkipVerify bool
-	InsecureAllowHTTP  bool
-
-	// Get both schema 1 and schema 2 manifests.  Schema 1 is used to get history
-	// and was imageC implementation predated schema 2.  Schema 2 is used to
-	// calculate digest.
-	ImageManifestSchema1 *Manifest
-	ImageManifestSchema2 *schema2.DeserializedManifest
-
-	//Digest of manifest schema 2 or schema 1; therefore, it may not match hash
-	//of the above manifest.
-	ManifestDigest string
-
-	// RegistryCAs will not be modified by imagec
-	RegistryCAs *x509.CertPool
-
-	// If true, do not bother portlayer or persona
-	Standalone bool
-
-	// image store name or url
-	ImageStore string
-}
-
-// ImageWithMeta wraps the models.Image with some additional metadata
-type ImageWithMeta struct {
-	*models.Image
-
-	DiffID string
-	Layer  FSLayer
-	Meta   string
-	Size   int64
-
-	Downloading bool
-}
-
-func (i *ImageWithMeta) String() string {
-	return stringid.TruncateID(i.Layer.BlobSum)
-}
-
-var (
-	ldm *LayerDownloader
-)
-
-const (
-	// DefaultDockerURL holds the URL of Docker registry
-	DefaultDockerURL = "registry.hub.docker.com"
-
-	// DefaultDestination specifies the default directory to use
-	DefaultDestination = "images"
-
-	// DefaultPortLayerHost specifies the default port layer server
-	DefaultPortLayerHost = "localhost:2377"
-
-	// DefaultLogfile specifies the default log file name
-	DefaultLogfile = "imagec.log"
-
-	// DefaultHTTPTimeout specifies the default HTTP timeout
-	DefaultHTTPTimeout = 3600 * time.Second
-
-	// Scratch layer ID
-	ScratchLayerID = "scratch"
-
-	// attribute update actions
-	Add = iota + 1
-)
-
-func init() {
-	ldm = NewLayerDownloader()
-}
-
-// ParseReference parses the -reference parameter and populate options struct
-func (ic *ImageC) ParseReference() {
-	if reference.IsNameOnly(ic.Reference) {
-		ic.Tag = reference.DefaultTag
-	} else {
-		if tagged, isTagged := ic.Reference.(reference.NamedTagged); isTagged {
-			ic.Tag = tagged.Tag()
-		}
-	}
-
-	ic.Registry = ic.Reference.Hostname()
-	if ic.Registry == reference.DefaultHostname {
-		ic.Registry = DefaultDockerURL
-	}
-
-	ic.Image = ic.Reference.RemoteName()
-}
-
-// DestinationDirectory returns the path of the output directory
-func DestinationDirectory(options Options) string {
-	// #nosec: Errors unhandled.
-	u, _ := url.Parse(options.Registry)
-
-	// Use a hierarchy like following so that we can support multiple schemes, registries and versions
-	/*
-		https/
-		├── 192.168.218.5:5000
-		│   └── v2
-		│       └── busybox
-		│           └── latest
-		...
-		│               ├── fef924a0204a00b3ec67318e2ed337b189c99ea19e2bf10ed30a13b87c5e17ab
-		│               │   ├── fef924a0204a00b3ec67318e2ed337b189c99ea19e2bf10ed30a13b87c5e17ab.json
-		│               │   └── fef924a0204a00b3ec67318e2ed337b189c99ea19e2bf10ed30a13b87c5e17ab.tar
-		│               └── manifest.json
-		└── registry-1.docker.io
-		    └── v2
-		        └── library
-		            └── golang
-		                └── latest
-		                    ...
-		                    ├── f61ebe2817bb4e6a7f0a4cf249a5316223f7ecc886feac24b9887a490feaed57
-		                    │   ├── f61ebe2817bb4e6a7f0a4cf249a5316223f7ecc886feac24b9887a490feaed57.json
-		                    │   └── f61ebe2817bb4e6a7f0a4cf249a5316223f7ecc886feac24b9887a490feaed57.tar
-		                    └── manifest.json
-
-	*/
-	if u.Scheme == "" && u.Host == "" && u.Path == "" {
-		return path.Join(
-			options.Destination,
-			"localhost",
-			options.Image,
-			options.Tag,
-		)
-	}
-	return path.Join(
-		options.Destination,
-		u.Scheme,
-		u.Host,
-		u.Path,
-		options.Image,
-		options.Tag,
-	)
-}
-
-// LayersToDownload creates a slice of ImageWithMeta for the layers that need to be downloaded
-func (ic *ImageC) LayersToDownload() ([]*ImageWithMeta, error) {
-	images := make([]*ImageWithMeta, len(ic.ImageManifestSchema1.FSLayers))
-
-	manifest := ic.ImageManifestSchema1
-	v1 := docker.V1Image{}
-
-	// iterate from parent to children
-	for i := len(ic.ImageManifestSchema1.History) - 1; i >= 0; i-- {
-		history := manifest.History[i]
-		layer := manifest.FSLayers[i]
-
-		// unmarshall V1Compatibility to get the image ID
-		if err := json.Unmarshal([]byte(history.V1Compatibility), &v1); err != nil {
-			return nil, fmt.Errorf("Failed to unmarshall image history: %s", err)
-		}
-
-		// if parent is empty set it to scratch
-		parent := ScratchLayerID
-		if v1.Parent != "" {
-			parent = v1.Parent
-		}
-
-		// add image to ImageWithMeta list
-		images[i] = &ImageWithMeta{
-			Image: &models.Image{
-				ID:     v1.ID,
-				Parent: parent,
-				Store:  ic.Storename,
-			},
-			Meta:  history.V1Compatibility,
-			Layer: layer,
-		}
-
-		// populate manifest layer with existing cached data
-		if layer, err := LayerCache().Get(images[i].ID); err == nil {
-			if !layer.Downloading { // possibly unnecessary but won't hurt anything
-				images[i] = layer
-			}
-		}
-	}
-
-	return images, nil
-}
-
-// UpdateRepositoryCache will update the repository cache
-// that resides in the docker persona.  This will add image tag,
-// digest and layer information.
-func UpdateRepoCache(ic *ImageC) error {
-	// if standalone then no persona, so exit
-	if ic.Standalone {
-		return nil
-	}
-
-	// LayerID for the image layer
-	imageLayerID := ic.ImageLayers[0].ID
-
-	// get the repoCache
-	repoCache := cache.RepositoryCache()
-
-	// In the case that we don't have the ImageID, then we need
-	// to go to the RepositoryCache to get it.
-	if ic.ImageID == "" {
-		// call to repository cache for the imageID for this layer
-		ic.ImageID = repoCache.GetImageID(imageLayerID)
-
-		// if we still don't have an imageID we can't continue
-		if ic.ImageID == "" {
-			return fmt.Errorf("ImageID not found by LayerID(%s) in RepositoryCache", imageLayerID)
-		}
-	}
-	// AddReference will add the repo:tag to the repositoryCache and save to the portLayer
-	err := repoCache.AddReference(ic.Reference, ic.ImageID, true, imageLayerID, true)
-	if err != nil {
-		return fmt.Errorf("Unable to Add Image Reference(%s): %s", ic.Reference.String(), err.Error())
-	}
-
-	dig, err := reference.ParseNamed(fmt.Sprintf("%s@%s", ic.Reference.Name(), ic.ManifestDigest))
-	if err != nil {
-		return fmt.Errorf("Unable to parse digest: %s", err.Error())
-	}
-
-	// AddReference will add the digest and persist to the portLayer
-	err = repoCache.AddReference(dig, ic.ImageID, true, imageLayerID, true)
-	if err != nil {
-		return fmt.Errorf("Unable to Add Image Digest(%s): %s", dig.String(), err.Error())
-	}
-
-	return nil
-}
-
-// WriteImageBlob writes the image blob to the storage layer
-func (ic *ImageC) WriteImageBlob(image *ImageWithMeta, progressOutput progress.Output, cleanup bool) error {
-	defer trace.End(trace.Begin(image.Image.ID))
-
-	destination := DestinationDirectory(ic.Options)
-
-	id := image.Image.ID
-	filePath := path.Join(destination, id, id+".tar")
-	log.Infof("Path: %s", filePath)
-	f, err := os.Open(filePath)
-	if err != nil {
-		return fmt.Errorf("Failed to open file: %s", err)
-	}
-	defer f.Close()
-
-	fi, err := f.Stat()
-	if err != nil {
-		return fmt.Errorf("Failed to stat file: %s", err)
-	}
-
-	in := progress.NewProgressReader(
-		ioutils.NewCancelReadCloser(context.Background(), f),
-		progressOutput,
-		fi.Size(),
-		image.String(),
-		"Extracting",
-	)
-	defer in.Close()
-
-	if !ic.Standalone {
-		// Write the image
-		err = WriteImage(ic.Host, image, in)
-		if err != nil {
-			return fmt.Errorf("Failed to write to image store: %s", err)
-		}
-	} else {
-		// If standalone, write to a local directory
-		cleanup = false
-	}
-
-	progress.Update(progressOutput, image.String(), "Pull complete")
-
-	if cleanup {
-		if err := os.RemoveAll(destination); err != nil {
-			return fmt.Errorf("Failed to remove download directory: %s", err)
-		}
-	}
-	return nil
-}
-
-// CreateImageConfig constructs the image metadata from layers that compose the image
-func (ic *ImageC) CreateImageConfig(images []*ImageWithMeta) (metadata.ImageConfig, error) {
-
-	imageLayer := images[0] // the layer that represents the actual image
-
-	// if we already have an imageID associated with this layerID, we don't need
-	// to calculate imageID and can just grab the image config from the cache
-	id := cache.RepositoryCache().GetImageID(imageLayer.ID)
-	if image, err := cache.ImageCache().Get(id); err == nil {
-		return *image, nil
-	}
-
-	manifest := ic.ImageManifestSchema1
-	image := docker.V1Image{}
-	rootFS := docker.NewRootFS()
-	history := make([]docker.History, 0, len(images))
-	diffIDs := make(map[string]string)
-	var size int64
-
-	// step through layers to get command history and diffID from oldest to newest
-	for i := len(images) - 1; i >= 0; i-- {
-		layer := images[i]
-		if err := json.Unmarshal([]byte(layer.Meta), &image); err != nil {
-			return metadata.ImageConfig{}, fmt.Errorf("Failed to unmarshall layer history: %s", err)
-		}
-		h := docker.History{
-			Created:   image.Created,
-			Author:    image.Author,
-			CreatedBy: strings.Join(image.ContainerConfig.Cmd, " "),
-			Comment:   image.Comment,
-		}
-
-		// is this an empty layer?
-		if layer.DiffID == dockerLayer.DigestSHA256EmptyTar.String() {
-			h.EmptyLayer = true
-		} else {
-			// if not empty, add diffID to rootFS
-			rootFS.DiffIDs = append(rootFS.DiffIDs, dockerLayer.DiffID(layer.DiffID))
-		}
-		history = append(history, h)
-		size += layer.Size
-	}
-
-	// result is constructed without unused fields
-	result := docker.Image{
-		V1Image: docker.V1Image{
-			Comment:         image.Comment,
-			Created:         image.Created,
-			Container:       image.Container,
-			ContainerConfig: image.ContainerConfig,
-			DockerVersion:   image.DockerVersion,
-			Author:          image.Author,
-			Config:          image.Config,
-			Architecture:    image.Architecture,
-			OS:              image.OS,
-		},
-		RootFS:  rootFS,
-		History: history,
-	}
-
-	imageConfigBytes, err := result.MarshalJSON()
-	if err != nil {
-		return metadata.ImageConfig{}, fmt.Errorf("Failed to marshall image metadata: %s", err)
-	}
-
-	// calculate image ID
-	sum := fmt.Sprintf("%x", sha256.Sum256(imageConfigBytes))
-	log.Infof("Image ID: sha256:%s", sum)
-
-	// prepare metadata
-	result.V1Image.Parent = image.Parent
-	result.Size = size
-	result.V1Image.ID = imageLayer.ID
-	imageConfig := metadata.ImageConfig{
-		V1Image: result.V1Image,
-		ImageID: sum,
-		DiffIDs: diffIDs,
-		History: history,
-	}
-
-	if ic.Tag != "" {
-		imageConfig.Tags = []string{ic.Tag}
-	}
-	if manifest != nil {
-		imageConfig.Name = manifest.Name
-	}
-	if ic.Reference != nil {
-		imageConfig.Reference = ic.Reference.String()
-	}
-	if _, ok := ic.Reference.(reference.Canonical); ok {
-		log.Debugf("Populating digest in imageConfig for image: %s", ic.Reference.String())
-		imageConfig.Digests = []string{ic.ManifestDigest}
-	}
-
-	return imageConfig, nil
-}
-
-// PullImage pulls an image from docker hub
-func (ic *ImageC) PullImage() error {
-	ctx, cancel := context.WithTimeout(ctx, ic.Options.Timeout)
-	defer cancel()
-
-	// Authenticate, get URL, get token
-	if err := ic.prepareTransfer(ctx); err != nil {
-		return err
-	}
-
-	// Output message
-	tagOrDigest := tagOrDigest(ic.Reference, ic.Tag)
-	progress.Message(ic.progressOutput, "", tagOrDigest+": Pulling from "+ic.Image)
-
-	// Pull the image manifest
-	if err := ic.pullManifest(ctx); err != nil {
-		return err
-	}
-	log.Infof("Manifest for image = %#v", ic.ImageManifestSchema1)
-
-	// Get layers to download from manifest
-	layers, err := ic.LayersToDownload()
-	if err != nil {
-		return err
-	}
-	ic.ImageLayers = layers
-
-	// Download all the layers
-	if err := ldm.DownloadLayers(ctx, ic); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// ListLayer prints out the layers for an image to progress.  This is used by imagec standalone binary
-// for debug/validation.
-func (ic *ImageC) ListLayers() error {
-	defer trace.End(trace.Begin(""))
-
-	ctx, cancel := context.WithTimeout(ctx, ic.Options.Timeout)
-	defer cancel()
-
-	// Authenticate, get URL, get token
-	if err := ic.prepareTransfer(ctx); err != nil {
-		return err
-	}
-
-	// Output message
-	tagOrDigest := tagOrDigest(ic.Reference, ic.Tag)
-	progress.Message(ic.progressOutput, "", tagOrDigest+": Fetching layers from "+ic.Image)
-
-	// Pull the image manifest
-	if err := ic.pullManifest(ctx); err != nil {
-		return err
-	}
-
-	// Get layers to download from manifest
-	layers, err := ic.LayersToDownload()
-	if err != nil {
-		return err
-	}
-
-	progress.Message(ic.progressOutput, "", storage.Scratch.ID)
-	for i := len(layers) - 1; i >= 0; i-- {
-		progress.Message(ic.progressOutput, "", layers[i].ID)
-	}
-
-	return nil
-}
-
-// prepareTransfer Looks up URLs and fetch auth token
-func (ic *ImageC) prepareTransfer(ctx context.Context) error {
-
-	// Parse the -reference parameter
-	ic.ParseReference()
-
-	// Host is either the host's UUID (if run on vsphere) or the hostname of
-	// the system (if run standalone)
-	host, err := sys.UUID()
-	if err != nil {
-		log.Errorf("Failed to return host name: %s", err)
-		return err
-	}
-
-	if host != "" {
-		log.Infof("Using UUID (%s) for imagestore name", host)
-	} else if ic.Standalone {
-		host, err = os.Hostname()
-		log.Infof("Using host (%s) for imagestore name", host)
-	}
-
-	ic.Storename = host
-
-	if !ic.Standalone {
-		log.Debugf("Running with portlayer")
-
-		// Ping the server to ensure it's at least running
-		ok, err := PingPortLayer(ic.Host)
-		if err != nil || !ok {
-			log.Errorf("Failed to ping portlayer: %s", err)
-			return err
-		}
-	} else {
-		log.Debugf("Running standalone")
-	}
-
-	// Calculate (and overwrite) the registry URL and make sure that it responds to requests
-	ic.Registry, err = LearnRegistryURL(&ic.Options)
-	if err != nil {
-		log.Errorf("Error while pulling image: %s", err)
-		return err
-	}
-
-	// Get the URL of the OAuth endpoint
-	url, err := LearnAuthURL(ic.Options)
-	if err != nil {
-		log.Infof(err.Error())
-		switch err := err.(type) {
-		case urlfetcher.ImageNotFoundError:
-			return fmt.Errorf("Error: image %s not found", ic.Reference)
-		default:
-			return fmt.Errorf("Failed to obtain OAuth endpoint: %s", err)
-		}
-	}
-
-	// Get the OAuth token - if only we have a URL
-	if url != nil {
-		token, err := FetchToken(ctx, ic.Options, url, ic.progressOutput)
-		if err != nil {
-			log.Errorf("Failed to fetch OAuth token: %s", err)
-			return err
-		}
-		ic.Token = token
-	}
-
-	return nil
-}
-
-// pullManifest attempts to pull manifest for an image.  Attempts to get schema 2 but will fall back to schema 1.
-func (ic *ImageC) pullManifest(ctx context.Context) error {
-	// Get the schema1 manifest
-	manifest, digest, err := FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err != nil {
-		log.Infof(err.Error())
-		switch err := err.(type) {
-		case urlfetcher.ImageNotFoundError:
-			return fmt.Errorf("Error: image %s not found", ic.Image)
-		case urlfetcher.TagNotFoundError:
-			return fmt.Errorf("Tag %s not found in repository %s", ic.Tag, ic.Image)
-		default:
-			return fmt.Errorf("Error while pulling image manifest: %s", err)
-		}
-	}
-
-	schema1, ok := manifest.(*Manifest)
-	if !ok {
-		return fmt.Errorf("Error pulling manifest schema 1")
-	}
-
-	ic.ImageManifestSchema1 = schema1
-	ic.ManifestDigest = digest
-
-	// Attempt to get schema2 manifest
-	manifest, digest, err = FetchImageManifest(ctx, ic.Options, 2, ic.progressOutput)
-	if err == nil {
-		if schema2, ok := manifest.(*schema2.DeserializedManifest); ok {
-			if schema2 != nil {
-				log.Infof("pullManifest - schema 2: %#v", schema2)
-			}
-			ic.ImageManifestSchema2 = schema2
-
-			// Override the manifest digest as Docker uses schema 2, unless the image
-			// is pulled by digest since we only support pull-by-digest for schema 1.
-			// TODO(anchal): this check should be removed once issue #5187 is implemented.
-			if _, ok := ic.Reference.(reference.Canonical); !ok {
-				ic.ManifestDigest = digest
-			}
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/imagec_test.go b/installer/vendor/github.com/vmware/vic/lib/imagec/imagec_test.go
deleted file mode 100644
index fdfc6acfd8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/imagec_test.go
+++ /dev/null
@@ -1,616 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"archive/tar"
-	"bytes"
-	"context"
-	"encoding/json"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"testing"
-
-	"github.com/docker/distribution/digest"
-	"github.com/docker/docker/pkg/streamformatter"
-	"github.com/docker/docker/reference"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	urlfetcher "github.com/vmware/vic/pkg/fetcher"
-)
-
-const (
-	OAuthToken = "Top_Secret_Token"
-	Image      = "library/photon"
-	Tag        = "latest"
-	Reference  = Image + ":" + Tag
-
-	BusyboxImage = "library/busybox"
-
-	// fake content
-	LayerContent = "Cannot_Contain_Myself"
-	// fake ID
-	LayerID = "f9767cae14f372c98900f15bb07cb40b8e1a6d1507912489e1342db499313d32"
-	// fake history
-	LayerHistory = "{\"id\":\"f9767cae14f372c98900f15bb07cb40b8e1a6d1507912489e1342db499313d32\"" + "," +
-		"\"parent\":\"09a5baea69e9c781d64df5366c36492d53d507048035abd68632264dc23a1edb\"}"
-	// fake store
-	Storename = "PetStore"
-
-	// sha256 sum of LayerContent
-	DigestSHA256LayerContent = "sha256:1f1f9635040c465c7f7b32a396e56e26c1396dbadfbed744b0aab9337a24ad5a"
-
-	//DigestSHA256EmptyData is the canonical sha256 digest of empty data
-	DigestSHA256EmptyData = "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-
-	DefaultManifest = `
-{
-	"schemaVersion": 1,
-	"name": "library/photon",
-	"tag": "latest",
-	"architecture": "amd64",
-	"fsLayers": [
-			{
-				"blobSum": "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-			}
-	],
-	"history": [
-			{
-				"v1Compatibility": "{\"architecture\":\"amd64\",\"config\":{\"Hostname\":\"156e10b83429\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"sh\"],\"Image\":\"56ed16bd6310cca65920c653a9bb22de6b235990dcaa1742ff839867aed730e5\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"container\":\"5f8098ec29947b5bea80483cd3275008911ce87438fed628e34ec0c522665510\",\"container_config\":{\"Hostname\":\"156e10b83429\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":null,\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"sh\\\"]\"],\"Image\":\"56ed16bd6310cca65920c653a9bb22de6b235990dcaa1742ff839867aed730e5\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"created\":\"2016-03-18T18:22:48.810791943Z\",\"docker_version\":\"1.9.1\",\"id\":\"437595becdebaaaf3a4fc3db02c59a980f955dee825c153308c670610bb694e1\",\"os\":\"linux\",\"parent\":\"920777304d1d5e337bc59877253e946f224df5aae64c72538672eb74637b3c9e\"}"
-			}
-	],
-	"signatures": [
-			{
-				"header": {
-						"jwk": {
-							"crv": "P-256",
-							"kid": "LUQI:WBTB:JRDU:TTD2:FUVY:EMCB:64HP:MZF6:SGFS:XAB6:JPUK:6PK4",
-							"kty": "EC",
-							"x": "zjkAuFGpCuWOBl-iMMzZqgl_1cid-04S04-k-A1qEeU",
-							"y": "9HWcOMfVFUMXJGeNajIAlPicL4UOsCJSpqRcIxpUl0Q"
-						},
-						"alg": "ES256"
-				},
-				"signature": "dTXnnt3IkTScpZhyyqRlmZFcQV1QzD7lWDqnjlD4Cj-KsMuGd1pl5QpFL2Cadw-8KeTBlSleSecxjHU4t3yhCQ",
-				"protected": "eyJmb3JtYXRMZW5ndGgiOjE5MjIsImZvcm1hdFRhaWwiOiJDbjAiLCJ0aW1lIjoiMjAxNi0wNi0wOVQxNzoyMzo1NFoifQ"
-			}
-	]
-}
-	`
-)
-
-func TestParseReference(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	ref, err := reference.ParseNamed("index.docker.io/library/busybox")
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, reference.DefaultTag)
-	assert.Equal(t, ic.Image, BusyboxImage)
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-
-	ref, err = reference.ParseNamed("vmware/photon")
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, reference.DefaultTag)
-	assert.Equal(t, ic.Image, "vmware/photon")
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-
-	ref, err = reference.ParseNamed("busybox")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, reference.DefaultTag)
-	assert.Equal(t, ic.Image, BusyboxImage)
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-
-	ref, err = reference.ParseNamed("library/busybox")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, reference.DefaultTag)
-	assert.Equal(t, ic.Image, BusyboxImage)
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-
-	ref, err = reference.ParseNamed("library/busybox:latest")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, reference.DefaultTag)
-	assert.Equal(t, ic.Image, BusyboxImage)
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-
-	ic = NewImageC(options, streamformatter.NewJSONStreamFormatter())
-	ref, err = reference.ParseNamed("busybox")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	digest, err := digest.ParseDigest("sha256:c79345819a6882c31b41bc771d9a94fc52872fa651b36771fbe0c8461d7ee558")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	ref, err = reference.WithDigest(reference.TrimNamed(ref), digest)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	ic.Options.Reference = ref
-	ic.ParseReference()
-	assert.Equal(t, ic.Tag, "")
-	assert.Equal(t, ic.Image, BusyboxImage)
-	assert.Equal(t, ic.Registry, DefaultDockerURL)
-}
-
-func TestLearnRegistryURL(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Docker-Distribution-API-Version", "registry/2.0")
-			http.Error(w, "You shall not pass", http.StatusUnauthorized)
-		}))
-	defer s.Close()
-
-	ic.Options.Registry = s.URL[7:]
-	ic.Options.Image = Image
-	ic.Options.Tag = Tag
-	ic.Options.Timeout = DefaultHTTPTimeout
-
-	// should fail
-	_, err := LearnRegistryURL(&ic.Options)
-	if err == nil {
-		t.Errorf(err.Error())
-	}
-
-	// should pass
-	ic.Options.InsecureAllowHTTP = true
-	_, err = LearnRegistryURL(&ic.Options)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-}
-
-func TestLearnAuthURL(t *testing.T) {
-	var err error
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("www-authenticate",
-				"Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/photon:pull\"")
-			http.Error(w, "You shall not pass", http.StatusUnauthorized)
-		}))
-	defer s.Close()
-
-	ic.Options.Registry = s.URL
-	ic.Options.Image = Image
-	ic.Options.Tag = Tag
-	ic.Options.Timeout = DefaultHTTPTimeout
-	ic.Options.Reference, err = reference.ParseNamed(Reference)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	url, err := LearnAuthURL(ic.Options)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	if url.String() != "https://auth.docker.io/token?scope=repository%3Alibrary%2Fphoton%3Apull&service=registry.docker.io" {
-		t.Errorf("Returned url %s is different than expected", url)
-	}
-}
-
-func TestFetchToken(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-		Timeout:   DefaultHTTPTimeout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Type", "application/json")
-
-			body, err := json.Marshal(&urlfetcher.Token{Token: OAuthToken})
-			if err != nil {
-				t.Errorf(err.Error())
-			}
-			w.Write(body)
-
-		}))
-	defer s.Close()
-
-	url, err := url.Parse(s.URL)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	url.Path = path.Join(url.Path, "token?scope=repository%3Alibrary%2Fphoton%3Apull&service=registry.docker.io")
-
-	ctx := context.TODO()
-	token, err := FetchToken(ctx, ic.Options, url, ic.progressOutput)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	if token.Token != OAuthToken {
-		t.Errorf("Returned token %s is different than expected", token.Token)
-	}
-}
-
-func TestFetchImageManifest(t *testing.T) {
-	var err error
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Type", "application/json")
-
-			w.Write([]byte(DefaultManifest))
-
-		}))
-	defer s.Close()
-
-	ic.Options.Registry = s.URL
-	ic.Options.Image = Image
-	ic.Options.Tag = Tag
-	ic.Options.Timeout = DefaultHTTPTimeout
-	ic.Options.Token = &urlfetcher.Token{Token: OAuthToken}
-	ic.Options.Reference, err = reference.ParseNamed(Reference)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	// create a temporary directory
-	dir, err := ioutil.TempDir("", "imagec")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	defer os.RemoveAll(dir)
-
-	ic.Options.Destination = dir
-
-	ctx := context.TODO()
-	manifest, _, err := FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	if schema1, ok := manifest.(*Manifest); ok {
-		if schema1.FSLayers[0].BlobSum != DigestSHA256EmptyData {
-			t.Errorf("Returned manifest %#v is different than expected", manifest)
-		}
-	}
-}
-
-func TestFetchImageBlob(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	// create a tar archive from our dummy data
-	r := strings.NewReader(LayerContent)
-	buf := new(bytes.Buffer)
-	tw := tar.NewWriter(buf)
-	defer tw.Close()
-
-	// create and populate tar header
-	header := new(tar.Header)
-	header.Size = r.Size()
-	header.Name = LayerID
-	header.Mode = 0644
-
-	// write the header
-	if err := tw.WriteHeader(header); err != nil {
-		t.Errorf(err.Error())
-	}
-
-	// write the file into the tar archive
-	if _, err := io.Copy(tw, r); err != nil {
-		t.Error(err.Error())
-	}
-
-	attempt := 3
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			attempt--
-			if attempt == 0 {
-				w.Header().Set("Content-Type", "application/x-gzip")
-				// return our tar archive
-				w.Write(buf.Bytes())
-			} else {
-				// return an error to force caller to retry
-				w.WriteHeader(http.StatusInternalServerError)
-			}
-		}))
-	defer s.Close()
-
-	ic.Options.Registry = s.URL
-	ic.Options.Image = Image
-	ic.Options.Tag = Tag
-	ic.Options.Timeout = DefaultHTTPTimeout
-	ic.Options.Token = &urlfetcher.Token{Token: OAuthToken}
-
-	// create a temporary directory
-	dir, err := ioutil.TempDir("", "imagec")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	defer os.RemoveAll(dir)
-
-	ic.Options.Destination = dir
-
-	parent := "scratch"
-	image := ImageWithMeta{
-		Image: &models.Image{
-			ID:     LayerID,
-			Parent: parent,
-			Store:  Storename,
-		},
-		Meta:  LayerHistory,
-		Layer: FSLayer{BlobSum: DigestSHA256LayerContent},
-	}
-	diffID, err := FetchImageBlob(ctx, ic.Options, &image, ic.progressOutput)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	if diffID == "" {
-		t.Errorf("Expected a diffID, got nil.")
-	}
-
-	tarFile, err := ioutil.ReadFile(path.Join(DestinationDirectory(ic.Options), LayerID, LayerID+".tar"))
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	br := bytes.NewReader(tarFile)
-	tr := tar.NewReader(br)
-	out := new(bytes.Buffer)
-
-	// extract the tar file
-	for {
-		_, err := tr.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Errorf(err.Error())
-		}
-		if _, err := io.Copy(out, tr); err != nil {
-			t.Errorf(err.Error())
-		}
-	}
-
-	// compare contents of tar file to dummy data
-	if out.String() != LayerContent {
-		t.Errorf(err.Error())
-	}
-
-	hist, err := ioutil.ReadFile(path.Join(DestinationDirectory(ic.Options), LayerID, LayerID+".json"))
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	if string(hist) != LayerHistory {
-		t.Errorf(err.Error())
-	}
-}
-
-func TestPingPortLayer(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Type", "application/json")
-			w.Write([]byte("\"OK\""))
-		}))
-	defer s.Close()
-
-	ic.Options.Host = s.URL[7:]
-
-	b, err := PingPortLayer(ic.Host)
-	if err != nil || b != true {
-		t.Errorf(err.Error())
-	}
-}
-
-func TestListImages(t *testing.T) {
-
-	options := Options{
-		Outstream: os.Stdout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.Header().Set("Content-Type", "application/json")
-			w.WriteHeader(http.StatusOK)
-
-			resp := `
-[
-  {
-    "ID": "7bd023c8937ded982c1b98da453b1a5afec86f390ffad8fa0f4fba244a6155f1",
-    "Metadata": {
-      "v1Compatibility": "{\"id\":\"7bd023c8937ded982c1b98da453b1a5afec86f390ffad8fa0f4fba244a6155f1\",\"parent\":\"b873f334fa5259acb24cf0e2cd2639d3a9fb3eb9bafbca06ed4f702c289b31c0\",\"created\":\"2016-05-27T14:15:02.359284074Z\",\"container\":\"b8bd6a8e8874a87f626871ce370f4775bdf598865637082da2949ee0f4786432\",\"container_config\":{\"Hostname\":\"914cf42a3e15\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/sh\",\"-c\",\"#(nop) CMD [\\\"/bin/bash\\\"]\"],\"Image\":\"b873f334fa5259acb24cf0e2cd2639d3a9fb3eb9bafbca06ed4f702c289b31c0\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"docker_version\":\"1.9.1\",\"config\":{\"Hostname\":\"914cf42a3e15\",\"Domainname\":\"\",\"User\":\"\",\"AttachStdin\":false,\"AttachStdout\":false,\"AttachStderr\":false,\"Tty\":false,\"OpenStdin\":false,\"StdinOnce\":false,\"Env\":[],\"Cmd\":[\"/bin/bash\"],\"Image\":\"b873f334fa5259acb24cf0e2cd2639d3a9fb3eb9bafbca06ed4f702c289b31c0\",\"Volumes\":null,\"WorkingDir\":\"\",\"Entrypoint\":null,\"OnBuild\":null,\"Labels\":{}},\"architecture\":\"amd64\",\"os\":\"linux\"}"
-    },
-    "SelfLink": "http://Photon/storage/7bd023c8937ded982c1b98da453b1a5afec86f390ffad8fa0f4fba244a6155f1",
-    "Store": "http://Photon/storage/PetStore"
-  }
-]
-`
-			w.Write([]byte(resp))
-		}))
-	defer s.Close()
-
-	ic.Options.Host = s.URL[7:]
-
-	m, err := ListImages(ic.Host, ic.Storename, nil)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	if m["7bd023c8937ded982c1b98da453b1a5afec86f390ffad8fa0f4fba244a6155f1"].ID != "7bd023c8937ded982c1b98da453b1a5afec86f390ffad8fa0f4fba244a6155f1" {
-		t.Errorf("Returned list %#v is different than expected", m)
-	}
-}
-
-func TestFetchScenarios(t *testing.T) {
-	var err error
-	ctx := context.TODO()
-
-	options := Options{
-		Outstream: os.Stdout,
-		Timeout:   DefaultHTTPTimeout,
-	}
-
-	ic := NewImageC(options, streamformatter.NewJSONStreamFormatter())
-
-	wwwAuthenticate := false
-	insufficientScope := false
-	invalidToken := false
-
-	s := httptest.NewServer(
-		http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			auth := r.Header.Get("Authorization")
-			if auth == "" {
-				if wwwAuthenticate {
-					w.Header().Set("www-authenticate", "Bearer realm=\"https://auth.docker.io/token\",service=\"registry.docker.io\",scope=\"repository:library/busybox:pull\"")
-				}
-				w.WriteHeader(http.StatusUnauthorized)
-			} else {
-				if !insufficientScope && !invalidToken {
-					w.Header().Set("Content-Type", "application/json")
-					w.Write([]byte(DefaultManifest))
-				} else if insufficientScope {
-					w.Header().Set("www-authenticate", "error=\"insufficient_scope\"")
-					w.WriteHeader(http.StatusUnauthorized)
-				} else if invalidToken {
-					w.Header().Set("www-authenticate", "error=\"invalid_token\"")
-					w.WriteHeader(http.StatusUnauthorized)
-				} else {
-					w.WriteHeader(http.StatusUnauthorized)
-				}
-			}
-		}))
-	defer s.Close()
-
-	ic.Options.Registry = s.URL
-	ic.Options.Image = Image
-	ic.Options.Tag = Tag
-	ic.Options.InsecureAllowHTTP = true
-	ic.Options.Reference, err = reference.ParseNamed(Reference)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	// create a temporary directory
-	dir, err := ioutil.TempDir("", "imagec")
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	defer os.RemoveAll(dir)
-
-	ic.Options.Destination = dir
-
-	ic.Options.Token = nil
-	// try without token, response will miss www-authenticate so we will retry (and fail eventually)
-	_, _, err = FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err == nil {
-		t.Errorf("Condition didn't fail (testing failure)")
-	}
-
-	// set the www-authenticate
-	wwwAuthenticate = true
-	// try without token, response will carry a valid www-authenticate so we won't retry
-	_, _, err = FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err != nil {
-		// we should get a DNR error
-		if _, isDNR := err.(urlfetcher.DoNotRetry); !isDNR {
-			t.Errorf(err.Error())
-		}
-	}
-	wwwAuthenticate = false
-
-	// set a valid token
-	ic.Options.Token = &urlfetcher.Token{Token: OAuthToken}
-
-	// enable invalid token test
-	invalidToken = true
-	// valid token but faulty hub, we should retry but eventually fail
-	_, _, err = FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err == nil {
-		t.Errorf("Condition didn't fail (testing failure)")
-	}
-	invalidToken = false
-
-	// enable insufficient_scope test
-	insufficientScope = true
-	// valid token but image is missing we shouldn't retry
-	_, _, err = FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err != nil {
-		// we should get a ImageNotFoundError
-		if _, imageErr := err.(urlfetcher.ImageNotFoundError); !imageErr {
-			t.Errorf(err.Error())
-		}
-	}
-	insufficientScope = false
-
-	// valid token, existing image, correct header. We should succeed
-	_, _, err = FetchImageManifest(ctx, ic.Options, 1, ic.progressOutput)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/layer_cache.go b/installer/vendor/github.com/vmware/vic/lib/imagec/layer_cache.go
deleted file mode 100644
index caed471f7d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/layer_cache.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"encoding/json"
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/apiservers/engine/backends/kv"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// LCache is an in-memory cache to account for existing image layers
-// It is used primarily by imagec when coordinating layer downloads
-// The cache is initially hydrated by way of the image cache at startup
-type LCache struct {
-	m      sync.RWMutex
-	layers map[string]*ImageWithMeta
-
-	client *client.PortLayer
-	dirty  bool
-}
-
-// LayerNotFoundError is returned when a layer does not exist in the cache
-type LayerNotFoundError struct{}
-
-func (e LayerNotFoundError) Error() string {
-	return "Layer does not exist"
-}
-
-const (
-	layerCacheKey = "layers"
-)
-
-var (
-	layerCache *LCache
-)
-
-func init() {
-	layerCache = &LCache{
-		layers: make(map[string]*ImageWithMeta),
-	}
-}
-
-// LayerCache returns a reference to the layer cache
-func LayerCache() *LCache {
-	return layerCache
-}
-
-// InitializeLayerCache will create a new layer cache or rehydrate an
-// existing layer cache from the portlayer k/v store
-func InitializeLayerCache(client *client.PortLayer) error {
-	defer trace.End(trace.Begin(""))
-
-	log.Debugf("Initializing layer cache")
-
-	layerCache.client = client
-
-	val, err := kv.Get(client, layerCacheKey)
-	if err != nil && err != kv.ErrKeyNotFound {
-		return err
-	}
-
-	l := struct {
-		Layers map[string]*ImageWithMeta
-	}{}
-
-	if val != "" {
-		if err = json.Unmarshal([]byte(val), &l); err != nil {
-			return fmt.Errorf("Failed to unmarshal layer cache: %s", err)
-		}
-
-		layerCache.layers = l.Layers
-	}
-
-	return nil
-}
-
-// Add adds a new layer to the cache
-func (lc *LCache) Add(layer *ImageWithMeta) {
-	defer trace.End(trace.Begin(""))
-	lc.m.Lock()
-	defer lc.m.Unlock()
-
-	lc.layers[layer.ID] = layer
-	lc.dirty = true
-}
-
-// Remove removes a layer from the cache
-func (lc *LCache) Remove(id string) {
-	defer trace.End(trace.Begin(""))
-	lc.m.Lock()
-	defer lc.m.Unlock()
-
-	if _, ok := lc.layers[id]; ok {
-		delete(lc.layers, id)
-		lc.dirty = true
-	}
-}
-
-// Commit marks a layer as downloaded
-func (lc *LCache) Commit(layer *ImageWithMeta) error {
-	defer trace.End(trace.Begin(""))
-	lc.m.Lock()
-	defer lc.m.Unlock()
-
-	lc.layers[layer.ID] = layer
-	lc.layers[layer.ID].Downloading = false
-	lc.dirty = true
-
-	return lc.save()
-}
-
-// Get returns a cached layer, or LayerNotFoundError if it doesn't exist
-func (lc *LCache) Get(id string) (*ImageWithMeta, error) {
-	defer trace.End(trace.Begin(""))
-	lc.m.RLock()
-	defer lc.m.RUnlock()
-
-	layer, ok := lc.layers[id]
-	if !ok {
-		return nil, LayerNotFoundError{}
-	}
-
-	return layer, nil
-}
-
-func (lc *LCache) save() error {
-	defer trace.End(trace.Begin(""))
-
-	if !lc.dirty {
-		return nil
-	}
-
-	m := struct {
-		Layers map[string]*ImageWithMeta
-	}{
-		Layers: lc.layers,
-	}
-
-	bytes, err := json.Marshal(m)
-	if err != nil {
-		log.Errorf("Unable to marshal layer cache: %s", err.Error())
-		return err
-	}
-
-	err = kv.Put(lc.client, layerCacheKey, string(bytes))
-	if err != nil {
-		log.Errorf("Unable to save layer cache: %s", err.Error())
-		return err
-	}
-
-	lc.dirty = false
-	return nil
-}
-
-// Save will persist the image cache to the portlayer k/v store
-func (lc *LCache) Save() error {
-	defer trace.End(trace.Begin(""))
-	lc.m.Lock()
-	defer lc.m.Unlock()
-
-	return lc.save()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/imagec/storage.go b/installer/vendor/github.com/vmware/vic/lib/imagec/storage.go
deleted file mode 100644
index 97de109659..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/imagec/storage.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package imagec
-
-import (
-	"context"
-	"io"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/go-openapi/runtime"
-	rc "github.com/go-openapi/runtime/client"
-
-	apiclient "github.com/vmware/vic/lib/apiservers/portlayer/client"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/misc"
-	"github.com/vmware/vic/lib/apiservers/portlayer/client/storage"
-	"github.com/vmware/vic/lib/apiservers/portlayer/models"
-	"github.com/vmware/vic/lib/metadata"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-var (
-	ctx = context.TODO()
-)
-
-// PingPortLayer calls the _ping endpoint of the portlayer
-func PingPortLayer(host string) (bool, error) {
-	defer trace.End(trace.Begin(host))
-
-	transport := rc.New(host, "/", []string{"http"})
-	client := apiclient.New(transport, nil)
-
-	ok, err := client.Misc.Ping(misc.NewPingParamsWithContext(ctx))
-	if err != nil {
-		return false, err
-	}
-	return ok.Payload == "OK", nil
-}
-
-// ListImages lists the images from given image store
-func ListImages(host, storename string, images []*ImageWithMeta) (map[string]*models.Image, error) {
-	defer trace.End(trace.Begin(storename))
-
-	transport := rc.New(host, "/", []string{"http"})
-	client := apiclient.New(transport, nil)
-
-	ids := make([]string, len(images))
-
-	for i := range images {
-		ids = append(ids, images[i].ID)
-	}
-
-	imageList, err := client.Storage.ListImages(
-		storage.NewListImagesParamsWithContext(ctx).WithStoreName(storename).WithIds(ids),
-	)
-	if err != nil {
-		return nil, err
-	}
-
-	existingImages := make(map[string]*models.Image)
-	for i := range imageList.Payload {
-		v := imageList.Payload[i]
-		existingImages[v.ID] = v
-	}
-	return existingImages, nil
-}
-
-// WriteImage writes the image to given image store
-func WriteImage(host string, image *ImageWithMeta, data io.ReadCloser) error {
-	defer trace.End(trace.Begin(image.ID))
-
-	transport := rc.New(host, "/", []string{"http"})
-	client := apiclient.New(transport, nil)
-
-	transport.Consumers["application/json"] = runtime.JSONConsumer()
-	transport.Producers["application/json"] = runtime.JSONProducer()
-	transport.Consumers["application/octet-stream"] = runtime.ByteStreamConsumer()
-	transport.Producers["application/octet-stream"] = runtime.ByteStreamProducer()
-
-	key := new(string)
-	blob := new(string)
-
-	*key = metadata.MetaDataKey
-	*blob = image.Meta
-
-	r, err := client.Storage.WriteImage(
-		storage.NewWriteImageParamsWithContext(ctx).
-			WithImageID(image.ID).
-			WithParentID(image.Parent).
-			WithStoreName(image.Store).
-			WithMetadatakey(key).
-			WithMetadataval(blob).
-			WithImageFile(data).
-			WithSum(image.Layer.BlobSum),
-	)
-	if err != nil {
-		log.Debugf("Creating an image failed: %s", err)
-		return err
-	}
-	log.Printf("Created an image %#v", r.Payload)
-
-	return nil
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/data/data.go b/installer/vendor/github.com/vmware/vic/lib/install/data/data.go
index 5a2f83b8c8..b7eed0aedc 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/data/data.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/data/data.go
@@ -48,9 +48,8 @@ type Data struct {
 	RegistryCAs []byte
 	common.Images
 
-	ImageDatastorePath     string              `cmd:"image-store"`
-	VolumeLocations        map[string]*url.URL `cmd:"volume-store" label:"value-key"`
-	ContainerDatastoreName string
+	ImageDatastorePath string              `cmd:"image-store"`
+	VolumeLocations    map[string]*url.URL `cmd:"volume-store" label:"value-key"`
 
 	BridgeNetworkName string        `cmd:"bridge-network"`
 	ClientNetwork     NetworkConfig `cmd:"client-network"`
@@ -76,7 +75,6 @@ type Data struct {
 	Timeout time.Duration
 
 	Force               bool
-	UseRP               bool `cmd:"use-rp"`
 	ResetInProgressFlag bool
 
 	AsymmetricRouting bool `cmd:"asymmetric-routes"`
@@ -138,8 +136,6 @@ type InstallerData struct {
 	PreUpgradeVersion string
 	Timeout           time.Duration
 
-	UseRP bool
-
 	HTTPSProxy *url.URL
 	HTTPProxy  *url.URL
 }
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/data/data_test.go b/installer/vendor/github.com/vmware/vic/lib/install/data/data_test.go
deleted file mode 100644
index d8f0a7478a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/data/data_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package data
-
-import (
-	"net"
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/pkg/ip"
-)
-
-func TestCopyNonEmpty(t *testing.T) {
-	d := NewData()
-	s := NewData()
-
-	ipAddr, mask, _ := net.ParseCIDR("1.1.1.1/32")
-	s.ClientNetwork.IP.IP = ipAddr
-	s.ClientNetwork.IP.Mask = mask.Mask
-
-	d.PublicNetwork.IP.IP = ipAddr
-	d.PublicNetwork.IP.Mask = mask.Mask
-
-	d.CopyNonEmpty(s)
-	assert.Equal(t, s.ClientNetwork.IP.IP, d.ClientNetwork.IP.IP, "client ip is not right")
-	assert.False(t, d.PublicNetwork.IP.IP.Equal(s.PublicNetwork.IP.IP), "public ip should not be changed")
-	assert.Equal(t, d.OpsCredentials, s.OpsCredentials)
-
-	opsUser := "ops"
-	opsPassword := "pass"
-	s.OpsCredentials = common.OpsCredentials{
-		OpsUser:     &opsUser,
-		OpsPassword: &opsPassword,
-	}
-	d.CopyNonEmpty(s)
-	assert.NotEqual(t, d.OpsCredentials, s.OpsCredentials)
-
-	s.OpsCredentials.IsSet = true
-	d.CopyNonEmpty(s)
-	assert.Equal(t, d.OpsCredentials, s.OpsCredentials)
-
-	s.Target.Thumbprint = "te:st:th:um:bp:ri:nt"
-	d.CopyNonEmpty(s)
-	assert.Equal(t, d.Target.Thumbprint, s.Target.Thumbprint)
-}
-
-func TestEqualIPRanges(t *testing.T) {
-	emptyIPRange := ip.Range{}
-	assert.True(t, equalIPRanges([]ip.Range{emptyIPRange}, []ip.Range{emptyIPRange}))
-
-	fooRange := ip.Range{
-		FirstIP: net.ParseIP("10.10.10.10"),
-		LastIP:  net.ParseIP("10.10.10.24"),
-	}
-	barRange := ip.Range{
-		FirstIP: net.ParseIP("10.10.10.10"),
-		LastIP:  net.ParseIP("10.10.10.16"),
-	}
-	assert.False(t, equalIPRanges([]ip.Range{fooRange}, []ip.Range{barRange}))
-}
-
-func TestEqualIPSlices(t *testing.T) {
-	emptyIP := net.IP{}
-	assert.True(t, equalIPSlices([]net.IP{emptyIP}, []net.IP{emptyIP}))
-
-	fooIP, _, _ := net.ParseCIDR("1.1.1.1/32")
-	barIP, _, _ := net.ParseCIDR("2.2.2.2/32")
-	assert.False(t, equalIPSlices([]net.IP{fooIP}, []net.IP{barIP}))
-}
-
-func TestCopyContainerNetworks(t *testing.T) {
-	d := NewData()
-	src := NewData()
-
-	fooLabel := "foo"
-	fooNet := "Foo Network"
-	ipAddr, mask, _ := net.ParseCIDR("1.1.1.1/32")
-	ipRange := ip.Range{
-		FirstIP: net.ParseIP("10.10.10.10"),
-		LastIP:  net.ParseIP("10.10.10.24"),
-	}
-	trust := executor.Closed
-	src.ContainerNetworks.MappedNetworks[fooLabel] = fooNet
-	src.ContainerNetworks.MappedNetworksGateways[fooLabel] = *mask
-	src.ContainerNetworks.MappedNetworksIPRanges[fooLabel] = []ip.Range{ipRange}
-	src.ContainerNetworks.MappedNetworksDNS[fooLabel] = []net.IP{ipAddr}
-	src.ContainerNetworks.MappedNetworksFirewalls[fooLabel] = trust
-
-	// Everything in src should be copied to d.
-	err := d.copyContainerNetworks(src)
-	assert.NoError(t, err)
-	assert.Equal(t, d.ContainerNetworks, src.ContainerNetworks)
-
-	barLabel := "bar"
-	barNet := "Bar Network"
-	src.ContainerNetworks.MappedNetworks[barLabel] = barNet
-	src.ContainerNetworks.MappedNetworksGateways[barLabel] = net.IPNet{}
-	src.ContainerNetworks.MappedNetworksIPRanges[barLabel] = []ip.Range{}
-	src.ContainerNetworks.MappedNetworksDNS[barLabel] = []net.IP{}
-	src.ContainerNetworks.MappedNetworksFirewalls[barLabel] = executor.Published
-
-	// The new network should be copied to d.
-	err = d.copyContainerNetworks(src)
-	assert.NoError(t, err)
-	assert.Equal(t, d.ContainerNetworks, src.ContainerNetworks)
-
-	delete(src.ContainerNetworks.MappedNetworks, barLabel)
-	delete(src.ContainerNetworks.MappedNetworksGateways, barLabel)
-	delete(src.ContainerNetworks.MappedNetworksIPRanges, barLabel)
-	delete(src.ContainerNetworks.MappedNetworksDNS, barLabel)
-	delete(src.ContainerNetworks.MappedNetworksFirewalls, barLabel)
-
-	// There should be an error if anything in d is not in src.
-	err = d.copyContainerNetworks(src)
-	assert.NotNil(t, err)
-
-	src.ContainerNetworks.MappedNetworks[barLabel] = barNet
-	src.ContainerNetworks.MappedNetworksGateways[barLabel] = net.IPNet{}
-	src.ContainerNetworks.MappedNetworksIPRanges[barLabel] = []ip.Range{ipRange}
-	src.ContainerNetworks.MappedNetworksDNS[barLabel] = []net.IP{ipAddr}
-	src.ContainerNetworks.MappedNetworksFirewalls[barLabel] = trust
-
-	// There should be an error on an attempt to change an existing network.
-	err = d.copyContainerNetworks(src)
-	assert.NotNil(t, err)
-}
-
-func TestCopyVolumeStores(t *testing.T) {
-	d := NewData()
-	src := NewData()
-	d.VolumeLocations = make(map[string]*url.URL)
-	src.VolumeLocations = make(map[string]*url.URL)
-
-	var err error
-	src.VolumeLocations["foo"], err = url.Parse("ds://fooDS/dir")
-	assert.NoError(t, err)
-	// Everything in src should be copied to d.
-	err = d.copyVolumeStores(src)
-	assert.NoError(t, err)
-	assert.Equal(t, d.VolumeLocations, src.VolumeLocations)
-
-	src.VolumeLocations["bar"], err = url.Parse("barDS/dir")
-	// The new volume store should be copied to d.
-	err = d.copyVolumeStores(src)
-	assert.NoError(t, err)
-	assert.Equal(t, d.VolumeLocations, src.VolumeLocations)
-
-	delete(src.VolumeLocations, "bar")
-	// There should be an error if anything in d is not in src.
-	err = d.copyVolumeStores(src)
-	assert.NotNil(t, err)
-
-	src.VolumeLocations["bar"], err = url.Parse("barDS/path")
-	assert.NoError(t, err)
-	// There should be an error on an attempt to change an existing volume store.
-	err = d.copyVolumeStores(src)
-	assert.NotNil(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/appliance.go b/installer/vendor/github.com/vmware/vic/lib/install/management/appliance.go
deleted file mode 100644
index f794b3f925..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/appliance.go
+++ /dev/null
@@ -1,1189 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	dockertypes "github.com/docker/docker/api/types"
-	"github.com/docker/docker/opts"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/spec"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/compute"
-	"github.com/vmware/vic/pkg/vsphere/diag"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	portLayerPort = constants.SerialOverLANPort
-
-	// this is generated in the crypto/tls.alert code
-	badTLSCertificate = "tls: bad certificate"
-
-	// This is a constant also used in the lib/apiservers/engine/backends/system.go to assign custom info the docker types.info struct
-	volumeStoresID = "VolumeStores"
-)
-
-var (
-	lastSeenProgressMessage string
-	unitNumber              int32
-)
-
-func (d *Dispatcher) isVCH(vm *vm.VirtualMachine) (bool, error) {
-	if vm == nil {
-		return false, errors.New("nil parameter")
-	}
-	defer trace.End(trace.Begin(vm.InventoryPath))
-
-	info, err := vm.FetchExtraConfig(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to fetch guest info of appliance vm: %s", err)
-		return false, err
-	}
-
-	var remoteConf config.VirtualContainerHostConfigSpec
-	extraconfig.Decode(extraconfig.MapSource(info), &remoteConf)
-
-	// if the moref of the target matches where we expect to find it for a VCH, run with it
-	if remoteConf.ExecutorConfig.ID == vm.Reference().String() || remoteConf.IsCreating() {
-		return true, nil
-	}
-
-	return false, nil
-}
-
-func (d *Dispatcher) checkExistence(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	d.vchPoolPath = path.Join(settings.ResourcePoolPath, conf.Name)
-	var orp *object.ResourcePool
-	var vapp *object.VirtualApp
-	if d.isVC {
-		vapp, err = d.findVirtualApp(d.vchPoolPath)
-		if err != nil {
-			return err
-		}
-		if vapp != nil {
-			orp = vapp.ResourcePool
-		}
-	}
-	if orp == nil {
-		if orp, err = d.findResourcePool(d.vchPoolPath); err != nil {
-			return err
-		}
-	}
-	if orp == nil {
-		return nil
-	}
-
-	rp := compute.NewResourcePool(d.ctx, d.session, orp.Reference())
-	vm, err := rp.GetChildVM(d.ctx, d.session, conf.Name)
-	if err != nil {
-		return err
-	}
-	if vm == nil {
-		if vapp != nil {
-			err = errors.Errorf("Found virtual app %q, but it is not a VCH. Please choose a different virtual app.", d.vchPoolPath)
-			log.Error(err)
-			return err
-		}
-		return nil
-	}
-
-	log.Debugf("Appliance is found")
-	if ok, verr := d.isVCH(vm); !ok {
-		verr = errors.Errorf("Found virtual machine %q, but it is not a VCH. Please choose a different virtual app.", conf.Name)
-		return verr
-	}
-	err = errors.Errorf("Virtual app %q already exists. Please delete it before reinstalling.", conf.Name)
-	return err
-}
-
-func (d *Dispatcher) getName(vm *vm.VirtualMachine) string {
-	name, err := vm.Name(d.ctx)
-	if err != nil {
-		log.Errorf("VM name not found: %s", err)
-		return ""
-	}
-	return name
-}
-
-func (d *Dispatcher) deleteVM(vm *vm.VirtualMachine, force bool) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("vm %q, force %t", vm.String(), force)))
-
-	var err error
-	power, err := vm.PowerState(d.ctx)
-	if err != nil || power != types.VirtualMachinePowerStatePoweredOff {
-		if err != nil {
-			log.Warnf("Failed to get vm power status %q: %s", vm.Reference(), err)
-		}
-		if !force {
-			if err != nil {
-				return err
-			}
-			name := d.getName(vm)
-			if name != "" {
-				err = errors.Errorf("VM %q is powered on", name)
-			} else {
-				err = errors.Errorf("VM %q is powered on", vm.Reference())
-			}
-			return err
-		}
-		if _, err = vm.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-			return vm.PowerOff(ctx)
-		}); err != nil {
-			log.Debugf("Failed to power off existing appliance for %s, try to remove anyway", err)
-		}
-	}
-	// get the actual folder name before we delete it
-	folder, err := vm.FolderName(d.ctx)
-	if err != nil {
-		// failed to get folder name, might not be able to remove files for this VM
-		name := d.getName(vm)
-		if name == "" {
-			log.Errorf("Unable to automatically remove all files in datastore for VM %q", vm.Reference())
-		} else {
-			// try to use the vm name in place of folder
-			log.Infof("Delete will attempt to remove datastore files for VM %q", name)
-			folder = name
-		}
-	}
-
-	//removes the vm from vsphere, but detaches the disks first
-	_, err = vm.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vm.DeleteExceptDisks(ctx)
-	})
-	// We are getting ConcurrentAccess errors from DeleteExceptDisks - even though we don't set ChangeVersion in that path
-	// We are ignoring the error because in reality the operation finishes successfully.
-	ignore := false
-	if err != nil {
-		if f, ok := err.(types.HasFault); ok {
-			switch f.Fault().(type) {
-			case *types.ConcurrentAccess:
-				log.Warnf("DeleteExceptDisks failed with ConcurrentAccess error. Ignoring it.")
-				ignore = true
-			}
-		}
-		if !ignore {
-			err = errors.Errorf("Failed to destroy VM %q: %s", vm.Reference(), err)
-			err2 := vm.Unregister(d.ctx)
-			if err2 != nil {
-				return errors.Errorf("%s then failed to unregister VM: %s", err, err2)
-			}
-			log.Infof("Unregistered VM to cleanup after failed destroy: %q", vm.Reference())
-		}
-	}
-
-	if _, err = d.deleteDatastoreFiles(d.session.Datastore, folder, true); err != nil {
-		log.Warnf("Failed to remove datastore files for VM path %q: %s", folder, err)
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) addNetworkDevices(conf *config.VirtualContainerHostConfigSpec, cspec *spec.VirtualMachineConfigSpec, devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
-	defer trace.End(trace.Begin(""))
-
-	// network name:alias, to avoid create multiple devices for same network
-	slots := make(map[int32]bool)
-	nets := make(map[string]*executor.NetworkEndpoint)
-
-	for name, endpoint := range conf.ExecutorConfig.Networks {
-		if pnic, ok := nets[endpoint.Network.Common.ID]; ok {
-			// there's already a NIC on this network
-			endpoint.Common.ID = pnic.Common.ID
-			log.Infof("Network role %q is sharing NIC with %q", name, pnic.Network.Common.Name)
-			continue
-		}
-
-		moref := new(types.ManagedObjectReference)
-		if ok := moref.FromString(endpoint.Network.ID); !ok {
-			return nil, fmt.Errorf("serialized managed object reference in unexpected format: %q", endpoint.Network.ID)
-		}
-		obj, err := d.session.Finder.ObjectReference(d.ctx, *moref)
-		if err != nil {
-			return nil, fmt.Errorf("unable to reacquire reference for network %q from serialized form: %q", endpoint.Network.Name, endpoint.Network.ID)
-		}
-		network, ok := obj.(object.NetworkReference)
-		if !ok {
-			return nil, fmt.Errorf("reacquired reference for network %q, from serialized form %q, was not a network: %T", endpoint.Network.Name, endpoint.Network.ID, obj)
-		}
-
-		backing, err := network.EthernetCardBackingInfo(d.ctx)
-		if err != nil {
-			err = errors.Errorf("Failed to get network backing info for %q: %s", network, err)
-			return nil, err
-		}
-
-		nic, err := devices.CreateEthernetCard("vmxnet3", backing)
-		if err != nil {
-			err = errors.Errorf("Failed to create Ethernet Card spec for %s", err)
-			return nil, err
-		}
-
-		slot := cspec.AssignSlotNumber(nic, slots)
-		if slot == constants.NilSlot {
-			err = errors.Errorf("Failed to assign stable PCI slot for %q network card", name)
-		}
-
-		endpoint.Common.ID = strconv.Itoa(int(slot))
-		slots[slot] = true
-		log.Debugf("Setting %q to slot %d", name, slot)
-
-		devices = append(devices, nic)
-
-		nets[endpoint.Network.Common.ID] = endpoint
-	}
-	return devices, nil
-}
-
-func (d *Dispatcher) addIDEController(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
-	defer trace.End(trace.Begin(""))
-
-	// IDE controller
-	scsi, err := devices.CreateIDEController()
-	if err != nil {
-		return nil, err
-	}
-	devices = append(devices, scsi)
-	return devices, nil
-}
-
-func (d *Dispatcher) addParaVirtualSCSIController(devices object.VirtualDeviceList) (object.VirtualDeviceList, error) {
-	defer trace.End(trace.Begin(""))
-
-	// para virtual SCSI controller
-	scsi, err := devices.CreateSCSIController("pvscsi")
-	if err != nil {
-		return nil, err
-	}
-	devices = append(devices, scsi)
-	return devices, nil
-}
-
-func (d *Dispatcher) createApplianceSpec(conf *config.VirtualContainerHostConfigSpec, vConf *data.InstallerData) (*types.VirtualMachineConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	var devices object.VirtualDeviceList
-	var err error
-	var cpus int32   // appliance number of CPUs
-	var memory int64 // appliance memory in MB
-
-	// set to creating VCH
-	conf.SetIsCreating(true)
-
-	cfg, err := d.encodeConfig(conf)
-	if err != nil {
-		return nil, err
-	}
-
-	if vConf.ApplianceSize.CPU.Limit != nil {
-		cpus = int32(*vConf.ApplianceSize.CPU.Limit)
-	}
-	if vConf.ApplianceSize.Memory.Limit != nil {
-		memory = *vConf.ApplianceSize.Memory.Limit
-	}
-
-	spec := &spec.VirtualMachineConfigSpec{
-		VirtualMachineConfigSpec: &types.VirtualMachineConfigSpec{
-			Name:               conf.Name,
-			GuestId:            string(types.VirtualMachineGuestOsIdentifierOtherGuest64),
-			AlternateGuestName: constants.DefaultAltVCHGuestName(),
-			Files:              &types.VirtualMachineFileInfo{VmPathName: fmt.Sprintf("[%s]", conf.ImageStores[0].Host)},
-			NumCPUs:            cpus,
-			MemoryMB:           memory,
-			// Encode the config both here and after the VMs created so that it can be identified as a VCH appliance as soon as
-			// creation is complete.
-			ExtraConfig: append(vmomi.OptionValueFromMap(cfg, true), &types.OptionValue{Key: "answer.msg.serial.file.open", Value: "Append"}),
-		},
-	}
-
-	if devices, err = d.addIDEController(devices); err != nil {
-		return nil, err
-	}
-
-	if devices, err = d.addParaVirtualSCSIController(devices); err != nil {
-		return nil, err
-	}
-
-	if devices, err = d.addNetworkDevices(conf, spec, devices); err != nil {
-		return nil, err
-	}
-
-	deviceChange, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-	if err != nil {
-		return nil, err
-	}
-
-	spec.DeviceChange = deviceChange
-	return spec.VirtualMachineConfigSpec, nil
-}
-
-func isManagedObjectNotFoundError(err error) bool {
-	if soap.IsSoapFault(err) {
-		_, ok := soap.ToSoapFault(err).VimFault().(types.ManagedObjectNotFound)
-		return ok
-	}
-
-	return false
-}
-
-func (d *Dispatcher) findApplianceByID(conf *config.VirtualContainerHostConfigSpec) (*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	var vmm *vm.VirtualMachine
-
-	moref := new(types.ManagedObjectReference)
-	if ok := moref.FromString(conf.ID); !ok {
-		message := "Failed to get appliance VM mob reference"
-		log.Errorf(message)
-		return nil, errors.New(message)
-	}
-	ref, err := d.session.Finder.ObjectReference(d.ctx, *moref)
-	if err != nil {
-		if !isManagedObjectNotFoundError(err) {
-			err = errors.Errorf("Failed to query appliance (%q): %s", moref, err)
-			return nil, err
-		}
-		log.Debugf("Appliance is not found")
-		return nil, nil
-
-	}
-	ovm, ok := ref.(*object.VirtualMachine)
-	if !ok {
-		log.Errorf("Failed to find VM %q: %s", moref, err)
-		return nil, err
-	}
-	vmm = vm.NewVirtualMachine(d.ctx, d.session, ovm.Reference())
-	return vmm, nil
-}
-
-func (d *Dispatcher) configIso(conf *config.VirtualContainerHostConfigSpec, vm *vm.VirtualMachine, settings *data.InstallerData) (object.VirtualDeviceList, error) {
-	defer trace.End(trace.Begin(""))
-
-	var devices object.VirtualDeviceList
-	var err error
-
-	vmDevices, err := vm.Device(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm devices for appliance: %s", err)
-		return nil, err
-	}
-	ide, err := vmDevices.FindIDEController("")
-	if err != nil {
-		log.Errorf("Failed to find IDE controller for appliance: %s", err)
-		return nil, err
-	}
-	cdrom, err := devices.CreateCdrom(ide)
-	if err != nil {
-		log.Errorf("Failed to create Cdrom device for appliance: %s", err)
-		return nil, err
-	}
-	cdrom = devices.InsertIso(cdrom, fmt.Sprintf("[%s] %s/%s", conf.ImageStores[0].Host, d.vmPathName, settings.ApplianceISO))
-	devices = append(devices, cdrom)
-	return devices, nil
-}
-
-func (d *Dispatcher) configLogging(conf *config.VirtualContainerHostConfigSpec, vm *vm.VirtualMachine, settings *data.InstallerData) (object.VirtualDeviceList, error) {
-	defer trace.End(trace.Begin(""))
-
-	devices, err := vm.Device(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm devices for appliance: %s", err)
-		return nil, err
-	}
-
-	p, err := devices.CreateSerialPort()
-	if err != nil {
-		return nil, err
-	}
-
-	err = vm.AddDevice(d.ctx, p)
-	if err != nil {
-		return nil, err
-	}
-
-	devices, err = vm.Device(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm devices for appliance: %s", err)
-		return nil, err
-	}
-
-	serial, err := devices.FindSerialPort("")
-	if err != nil {
-		log.Errorf("Failed to locate serial port for persistent log configuration: %s", err)
-		return nil, err
-	}
-
-	// TODO: we need to add an accessor for generating paths within the VM directory
-	vmx, err := vm.VMPathName(d.ctx)
-	if err != nil {
-		log.Errorf("Unable to determine path of appliance VM: %s", err)
-		return nil, err
-	}
-
-	// TODO: move this construction into the spec package and update portlayer/logging to use it as well
-	serial.Backing = &types.VirtualSerialPortFileBackingInfo{
-		VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-			// name consistency with containerVM
-			FileName: fmt.Sprintf("%s/tether.debug", path.Dir(vmx)),
-		},
-	}
-
-	return []types.BaseVirtualDevice{serial}, nil
-}
-
-func (d *Dispatcher) setDockerPort(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) {
-	if conf.HostCertificate != nil {
-		d.DockerPort = fmt.Sprintf("%d", opts.DefaultTLSHTTPPort)
-	} else {
-		d.DockerPort = fmt.Sprintf("%d", opts.DefaultHTTPPort)
-	}
-}
-
-func (d *Dispatcher) createAppliance(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(""))
-
-	log.Infof("Creating appliance on target")
-
-	spec, err := d.createApplianceSpec(conf, settings)
-	if err != nil {
-		log.Errorf("Unable to create appliance spec: %s", err)
-		return err
-	}
-
-	var info *types.TaskInfo
-	// create appliance VM
-	if d.isVC && d.vchVapp != nil {
-		info, err = tasks.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-			return d.vchVapp.CreateChildVM(ctx, *spec, d.session.Host)
-		})
-	} else {
-		// if vapp is not created, fall back to create VM under default resource pool
-		info, err = tasks.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-			return d.session.VMFolder.CreateVM(ctx, *spec, d.vchPool, d.session.Host)
-		})
-	}
-
-	if err != nil {
-		log.Errorf("Unable to create appliance VM: %s", err)
-		return err
-	}
-	if info.Error != nil || info.State != types.TaskInfoStateSuccess {
-		log.Errorf("Create appliance reported: %s", info.Error.LocalizedMessage)
-	}
-
-	if err = d.createVolumeStores(conf); err != nil {
-		return errors.Errorf("Exiting because we could not create volume stores due to error: %s", err)
-	}
-
-	// get VM reference and save it
-	moref := info.Result.(types.ManagedObjectReference)
-	conf.SetMoref(&moref)
-	obj, err := d.session.Finder.ObjectReference(d.ctx, moref)
-	if err != nil {
-		log.Errorf("Failed to reacquire reference to appliance VM after creation: %s", err)
-		return err
-	}
-	gvm, ok := obj.(*object.VirtualMachine)
-	if !ok {
-		return fmt.Errorf("Required reference after appliance creation was not for a VM: %T", obj)
-	}
-	vm2 := vm.NewVirtualMachineFromVM(d.ctx, d.session, gvm)
-
-	vm2.DisableDestroy(d.ctx)
-
-	// update the displayname to the actual folder name used
-	if d.vmPathName, err = vm2.FolderName(d.ctx); err != nil {
-		log.Errorf("Failed to get canonical name for appliance: %s", err)
-		return err
-	}
-	log.Debugf("vm folder name: %q", d.vmPathName)
-	log.Debugf("vm inventory path: %q", vm2.InventoryPath)
-
-	vicadmin := executor.Cmd{
-		Path: "/sbin/vicadmin",
-		Args: []string{
-			"/sbin/vicadmin",
-			"--dc=" + settings.DatacenterName,
-			"--pool=" + settings.ResourcePoolPath,
-			"--cluster=" + settings.ClusterPath,
-		},
-		Env: []string{
-			"PATH=/sbin:/bin",
-			"GOTRACEBACK=all",
-		},
-		Dir: "/home/vicadmin",
-	}
-	if settings.HTTPProxy != nil {
-		vicadmin.Env = append(vicadmin.Env, fmt.Sprintf("%s=%s", config.VICAdminHTTPProxy, settings.HTTPProxy.String()))
-	}
-	if settings.HTTPSProxy != nil {
-		vicadmin.Env = append(vicadmin.Env, fmt.Sprintf("%s=%s", config.VICAdminHTTPSProxy, settings.HTTPSProxy.String()))
-	}
-
-	conf.AddComponent(config.VicAdminService, &executor.SessionConfig{
-		User:    "vicadmin",
-		Group:   "vicadmin",
-		Cmd:     vicadmin,
-		Restart: true,
-		Active:  true,
-	},
-	)
-
-	d.setDockerPort(conf, settings)
-
-	personality := executor.Cmd{
-		Path: "/sbin/docker-engine-server",
-		Args: []string{
-			"/sbin/docker-engine-server",
-			//FIXME: hack during config migration
-			"-port=" + d.DockerPort,
-			fmt.Sprintf("-port-layer-port=%d", portLayerPort),
-		},
-		Env: []string{
-			"PATH=/sbin",
-			"GOTRACEBACK=all",
-		},
-	}
-	if settings.HTTPProxy != nil {
-		personality.Env = append(personality.Env, fmt.Sprintf("%s=%s", config.GeneralHTTPProxy, settings.HTTPProxy.String()))
-	}
-	if settings.HTTPSProxy != nil {
-		personality.Env = append(personality.Env, fmt.Sprintf("%s=%s", config.GeneralHTTPSProxy, settings.HTTPSProxy.String()))
-	}
-
-	conf.AddComponent(config.PersonaService, &executor.SessionConfig{
-		// currently needed for iptables interaction
-		// User:  "nobody",
-		// Group: "nobody",
-		Cmd:     personality,
-		Restart: true,
-		Active:  true,
-	},
-	)
-
-	cfg := &executor.SessionConfig{
-		Cmd: executor.Cmd{
-			Path: "/sbin/port-layer-server",
-			Args: []string{
-				"/sbin/port-layer-server",
-				"--host=localhost",
-				fmt.Sprintf("--port=%d", portLayerPort),
-			},
-			Env: []string{
-				//FIXME: hack during config migration
-				"VC_URL=" + conf.Target,
-				"DC_PATH=" + settings.DatacenterName,
-				"CS_PATH=" + settings.ClusterPath,
-				"POOL_PATH=" + settings.ResourcePoolPath,
-				"DS_PATH=" + conf.ImageStores[0].Host,
-			},
-		},
-		Restart: true,
-		Active:  true,
-	}
-
-	conf.AddComponent(config.PortLayerService, cfg)
-
-	// fix up those parts of the config that depend on the final applianceVM folder name
-	conf.BootstrapImagePath = fmt.Sprintf("[%s] %s/%s", conf.ImageStores[0].Host, d.vmPathName, settings.BootstrapISO)
-
-	if len(conf.ImageStores[0].Path) == 0 {
-		conf.ImageStores[0].Path = d.vmPathName
-	}
-
-	// apply the fixed-up configuration
-	spec, err = d.reconfigureApplianceSpec(vm2, conf, settings)
-	if err != nil {
-		log.Errorf("Error while getting appliance reconfig spec: %s", err)
-		return err
-	}
-
-	// reconfig
-	info, err = vm2.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vm2.Reconfigure(ctx, *spec)
-	})
-
-	if err != nil {
-		log.Errorf("Error while setting component parameters to appliance: %s", err)
-		return err
-	}
-	if info.State != types.TaskInfoStateSuccess {
-		log.Errorf("Setting parameters to appliance reported: %s", info.Error.LocalizedMessage)
-		return err
-	}
-
-	d.appliance = vm2
-	return nil
-}
-
-func (d *Dispatcher) encodeConfig(conf *config.VirtualContainerHostConfigSpec) (map[string]string, error) {
-	log.Debug("generating new config secret key")
-
-	s, err := extraconfig.NewSecretKey()
-	if err != nil {
-		return nil, err
-	}
-	d.secret = s
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(d.secret.Sink(extraconfig.MapSink(cfg)), conf)
-	return cfg, nil
-}
-
-func (d *Dispatcher) decryptVCHConfig(vm *vm.VirtualMachine, cfg map[string]string) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	if d.secret == nil {
-		name, err := vm.Name(d.ctx)
-		if err != nil {
-			err = errors.Errorf("Failed to get vm name %q: %s", vm.Reference(), err)
-			return nil, err
-		}
-		// set session datastore to where the VM is running
-		ds, err := d.getImageDatastore(vm, nil, true)
-		if err != nil {
-			err = errors.Errorf("Failure finding image store from VCH VM %q: %s", name, err)
-			return nil, err
-		}
-		path, err := vm.FolderName(d.ctx)
-		if err != nil {
-			err = errors.Errorf("Failed to get VM %q datastore path: %s", name, err)
-			return nil, err
-		}
-		s, err := d.GuestInfoSecret(name, path, ds)
-		if err != nil {
-			return nil, err
-		}
-		d.secret = s
-	}
-
-	conf := &config.VirtualContainerHostConfigSpec{}
-	extraconfig.Decode(d.secret.Source(extraconfig.MapSource(cfg)), conf)
-	return conf, nil
-}
-
-func (d *Dispatcher) reconfigureApplianceSpec(vm *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) (*types.VirtualMachineConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	var devices object.VirtualDeviceList
-	var err error
-
-	spec := &types.VirtualMachineConfigSpec{}
-
-	// create new devices
-	if devices, err = d.configIso(conf, vm, settings); err != nil {
-		return nil, err
-	}
-
-	newDevices, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-	if err != nil {
-		log.Errorf("Failed to create config spec for appliance: %s", err)
-		return nil, err
-	}
-
-	spec.DeviceChange = newDevices
-
-	// update existing devices
-	if devices, err = d.configLogging(conf, vm, settings); err != nil {
-		return nil, err
-	}
-
-	updateDevices, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationEdit)
-	if err != nil {
-		log.Errorf("Failed to create config spec for logging update: %s", err)
-		return nil, err
-	}
-
-	spec.DeviceChange = append(spec.DeviceChange, updateDevices...)
-
-	cfg, err := d.encodeConfig(conf)
-	if err != nil {
-		return nil, err
-	}
-
-	spec.ExtraConfig = append(spec.ExtraConfig, vmomi.OptionValueFromMap(cfg, true)...)
-	return spec, nil
-}
-
-// applianceConfiguration updates the configuration passed in with the latest from the appliance VM.
-// there's no guarantee of consistency within the configuration at this time
-func (d *Dispatcher) applianceConfiguration(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-
-	extraConfig, err := d.appliance.FetchExtraConfig(d.ctx)
-	if err != nil {
-		return err
-	}
-
-	extraconfig.Decode(extraconfig.MapSource(extraConfig), conf)
-	return nil
-}
-
-// waitForKey squashes the return values and simpy blocks until the key is updated or there is an error
-func (d *Dispatcher) waitForKey(key string) {
-	defer trace.End(trace.Begin(key))
-
-	d.appliance.WaitForKeyInExtraConfig(d.ctx, key)
-	return
-}
-
-// isPortLayerRunning decodes the `docker info` response to check if the portlayer is running
-func isPortLayerRunning(res *http.Response, conf *config.VirtualContainerHostConfigSpec) bool {
-	defer res.Body.Close()
-	resBody, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		log.Debugf("error while reading res body: %s", err.Error())
-		return false
-	}
-
-	var sysInfo dockertypes.Info
-	if err = json.Unmarshal(resBody, &sysInfo); err != nil {
-		log.Debugf("error while unmarshalling res body: %s", err.Error())
-		return false
-	}
-	// At this point the portlayer is up successfully. However, we need to report the Volume Stores that were not created successfully.
-	volumeStoresLine := ""
-
-	for _, value := range sysInfo.SystemStatus {
-		if value[0] == volumeStoresID {
-			log.Debugf("Portlayer has established volume stores (%s)", value[1])
-			volumeStoresLine = value[1]
-			break
-		}
-	}
-
-	allVolumeStoresPresent := confirmVolumeStores(conf, volumeStoresLine)
-	if !allVolumeStoresPresent {
-		log.Error("Not all configured volume stores are online - check port layer log via vicadmin")
-	}
-
-	for _, status := range sysInfo.SystemStatus {
-		if status[0] == sysInfo.Driver {
-			return status[1] == "RUNNING"
-		}
-	}
-
-	return false
-}
-
-// confirmVolumeStores is a helper function that will log and warn the vic-machine user if some of their volumestores did not present in the portlayer
-func confirmVolumeStores(conf *config.VirtualContainerHostConfigSpec, rawVolumeStores string) bool {
-	establishedVolumeStores := make(map[string]struct{})
-
-	splitStores := strings.Split(rawVolumeStores, " ")
-	for _, v := range splitStores {
-		establishedVolumeStores[v] = struct{}{}
-	}
-
-	result := true
-	for k := range conf.VolumeLocations {
-		if _, ok := establishedVolumeStores[k]; !ok {
-			log.Errorf("VolumeStore (%s) cannot be brought online - check network, nfs server, and --volume-store configurations", k)
-			result = false
-		}
-	}
-	return result
-}
-
-// CheckDockerAPI checks if the appliance components are initialized by issuing
-// `docker info` to the appliance
-func (d *Dispatcher) CheckDockerAPI(conf *config.VirtualContainerHostConfigSpec, clientCert *tls.Certificate) error {
-	defer trace.End(trace.Begin(""))
-
-	var (
-		proto          string
-		client         *http.Client
-		res            *http.Response
-		err            error
-		req            *http.Request
-		tlsErrExpected bool
-	)
-
-	if conf.HostCertificate.IsNil() {
-		// TLS disabled
-		proto = "http"
-		client = &http.Client{}
-	} else {
-		// TLS enabled
-		proto = "https"
-
-		// #nosec: TLS InsecureSkipVerify set true
-		tr := &http.Transport{
-			TLSClientConfig: &tls.Config{
-				InsecureSkipVerify: true,
-			},
-		}
-
-		// appliance is configured for tlsverify, but we don't have a client certificate
-		if len(conf.CertificateAuthorities) > 0 {
-			// if tlsverify was configured at all then we must verify the remote
-			tr.TLSClientConfig.InsecureSkipVerify = false
-
-			func() {
-				log.Debug("Loading CAs for client auth")
-				pool, err := x509.SystemCertPool()
-				if err != nil {
-					log.Warnf("Unable to load system root certificates - continuing with only the provided CA")
-					pool = x509.NewCertPool()
-				}
-
-				if !pool.AppendCertsFromPEM(conf.CertificateAuthorities) {
-					log.Warn("Unable add CAs from config to validation pool")
-				}
-
-				// tr.TLSClientConfig.ClientCAs = pool
-				tr.TLSClientConfig.RootCAs = pool
-
-				if clientCert == nil {
-					// we know this will fail, but we can try to distinguish the expected error vs
-					// unresponsive endpoint
-					tlsErrExpected = true
-					log.Debugf("CA configured on appliance but no client certificate available")
-					return
-				}
-
-				cert, err := conf.HostCertificate.X509Certificate()
-				if err != nil {
-					log.Debugf("Unable to extract host certificate: %s", err)
-					tlsErrExpected = true
-					return
-				}
-
-				cip := net.ParseIP(d.HostIP)
-				if err != nil {
-					log.Debugf("Unable to process Docker API host address from %q: %s", d.HostIP, err)
-					tlsErrExpected = true
-					return
-				}
-
-				// find the name to use and override the IP if found
-				addr, err := addrToUse([]net.IP{cip}, cert, conf.CertificateAuthorities)
-				if err != nil {
-					log.Debugf("Unable to determine address to use with remote certificate, checking SANs")
-					// #nosec: Errors unhandled.
-					addr, _ = viableHostAddress([]net.IP{cip}, cert, conf.CertificateAuthorities)
-					log.Debugf("Using host address: %s", addr)
-				}
-				if addr != "" {
-					d.HostIP = addr
-				} else {
-					log.Debug("Failed to find a viable address for Docker API from certificates")
-					// Server certificate won't validate since we don't have a hostname
-					tlsErrExpected = true
-				}
-				log.Debugf("Host address set to: %q", d.HostIP)
-			}()
-		}
-
-		if clientCert != nil {
-			log.Debug("Assigning certificates for client auth")
-			tr.TLSClientConfig.Certificates = []tls.Certificate{*clientCert}
-		}
-
-		client = &http.Client{Transport: tr}
-	}
-
-	dockerInfoURL := fmt.Sprintf("%s://%s:%s/info", proto, d.HostIP, d.DockerPort)
-	log.Debugf("Docker API endpoint: %s", dockerInfoURL)
-	req, err = http.NewRequest("GET", dockerInfoURL, nil)
-	if err != nil {
-		return errors.New("invalid HTTP request for docker info")
-	}
-	req = req.WithContext(d.ctx)
-
-	ticker := time.NewTicker(time.Second)
-	defer ticker.Stop()
-	for {
-		res, err = client.Do(req)
-		if err == nil {
-			if res.StatusCode == http.StatusOK {
-				if isPortLayerRunning(res, conf) {
-					log.Debug("Confirmed port layer is operational")
-					break
-				}
-			}
-
-			log.Debugf("Received HTTP status %d: %s", res.StatusCode, res.Status)
-		} else {
-			// DEBU[2016-10-11T22:22:38Z] Error received from endpoint: Get https://192.168.78.127:2376/info: dial tcp 192.168.78.127:2376: getsockopt: connection refused &{%!t(string=Get) %!t(string=https://192.168.78.127:2376/info) %!t(*net.OpError=&{dial tcp <nil> 0xc4204505a0 0xc4203a5e00})}
-			// DEBU[2016-10-11T22:22:39Z] Components not yet initialized, retrying
-			// ERR=&url.Error{
-			//     Op:  "Get",
-			//     URL: "https://192.168.78.127:2376/info",
-			//     Err: &net.OpError{
-			//         Op:     "dial",
-			//         Net:    "tcp",
-			//         Source: nil,
-			//         Addr:   &net.TCPAddr{
-			//             IP:   {0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0xff, 0xff, 0xc0, 0xa8, 0x4e, 0x7f},
-			//             Port: 2376,
-			//             Zone: "",
-			//         },
-			//         Err: &os.SyscallError{
-			//             Syscall: "getsockopt",
-			//             Err:     syscall.Errno(0x6f),
-			//         },
-			//     },
-			// }
-			// DEBU[2016-10-11T22:22:41Z] Error received from endpoint: Get https://192.168.78.127:2376/info: remote error: tls: bad certificate &{%!t(string=Get) %!t(string=https://192.168.78.127:2376/info) %!t(*net.OpError=&{remote error  <nil> <nil> 42})}
-			// DEBU[2016-10-11T22:22:42Z] Components not yet initialized, retrying
-			// ERR=&url.Error{
-			//     Op:  "Get",
-			//     URL: "https://192.168.78.127:2376/info",
-			//     Err: &net.OpError{
-			//         Op:     "remote error",
-			//         Net:    "",
-			//         Source: nil,
-			//         Addr:   nil,
-			//         Err:    tls.alert(0x2a),
-			//     },
-			// }
-
-			// ECONNREFUSED: 111, 0x6f
-
-			uerr, ok := err.(*url.Error)
-			if ok {
-				switch neterr := uerr.Err.(type) {
-				case *net.OpError:
-					switch root := neterr.Err.(type) {
-					case *os.SyscallError:
-						if root.Err == syscall.Errno(syscall.ECONNREFUSED) {
-							// waiting for API server to start
-							log.Debug("connection refused")
-						} else {
-							log.Debugf("Error was expected to be ECONNREFUSED: %#v", root.Err)
-						}
-					default:
-						errmsg := root.Error()
-
-						if tlsErrExpected {
-							log.Warnf("Expected TLS error without access to client certificate, received error: %s", errmsg)
-							return nil
-						}
-
-						// the TLS package doesn't expose the raw reason codes
-						// but we're actually looking for alertBadCertificate (42)
-						if errmsg == badTLSCertificate {
-							// TODO: programmatic check for clock skew on host
-							log.Errorf("Connection failed with TLS error \"bad certificate\" - check for clock skew on the host")
-						} else {
-							log.Errorf("Connection failed with error: %s", root)
-						}
-
-						return fmt.Errorf("failed to connect to %s: %s", dockerInfoURL, root)
-					}
-
-				case x509.UnknownAuthorityError:
-					// This will occur if the server certificate was signed by a CA that is not the one used for client authentication
-					// and does not have a trusted root registered on the system running vic-machine
-					msg := fmt.Sprintf("Unable to validate server certificate with configured CAs (unknown CA): %s", neterr.Error())
-					if tlsErrExpected {
-						// Legitimate deployment so no error, but definitely requires a warning.
-						log.Warn(msg)
-						return nil
-					}
-					// TLS error not expected, the validation failure is a problem
-					log.Error(msg)
-					return neterr
-
-				case x509.HostnameError:
-					// e.g. "doesn't contain any IP SANs"
-					msg := fmt.Sprintf("Server certificate hostname doesn't match: %s", neterr.Error())
-					if tlsErrExpected {
-						log.Warn(msg)
-						return nil
-					}
-					log.Error(msg)
-					return neterr
-
-				default:
-					log.Debugf("Unhandled net error type: %#v", neterr)
-					return neterr
-				}
-			} else {
-				log.Debugf("Error type was expected to be url.Error: %#v", err)
-			}
-		}
-
-		select {
-		case <-ticker.C:
-		case <-d.ctx.Done():
-			return d.ctx.Err()
-		}
-
-		log.Debug("Components not yet initialized, retrying")
-	}
-
-	return nil
-}
-
-// ensureApplianceInitializes checks if the appliance component processes are launched correctly
-func (d *Dispatcher) ensureApplianceInitializes(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-
-	if d.appliance == nil {
-		return errors.New("cannot validate appliance due to missing VM reference")
-	}
-
-	log.Infof("Waiting for IP information")
-	d.waitForKey(extraconfig.CalculateKeys(conf, "ExecutorConfig.Networks.client.Assigned.IP", "")[0])
-	ctxerr := d.ctx.Err()
-
-	if ctxerr == nil {
-		log.Info("Waiting for major appliance components to launch")
-		for _, k := range extraconfig.CalculateKeys(conf, "ExecutorConfig.Sessions.*.Started", "") {
-			d.waitForKey(k)
-		}
-	}
-
-	// at this point either everything has succeeded or we're going into diagnostics, ignore error
-	// as we're only using it for IP in the success case
-	updateErr := d.applianceConfiguration(conf)
-
-	// confirm components launched correctly
-	log.Debug("  State of components:")
-	for name, session := range conf.ExecutorConfig.Sessions {
-		status := "waiting to launch"
-		if session.Started == "true" {
-			status = "started successfully"
-		} else if session.Started != "" {
-			status = session.Started
-			log.Errorf("  Component did not launch successfully - %s: %s", name, status)
-		}
-
-		log.Debugf("    %q: %q", name, status)
-	}
-
-	// TODO: we should call to the general vic-machine inspect implementation here for more detail
-	// but instead...
-	if !ip.IsUnspecifiedIP(conf.ExecutorConfig.Networks["client"].Assigned.IP) {
-		d.HostIP = conf.ExecutorConfig.Networks["client"].Assigned.IP.String()
-		log.Infof("Obtained IP address for client interface: %q", d.HostIP)
-		return nil
-	}
-
-	// it's possible we timed out... get updated info having adjusted context to allow it
-	// keeping it short
-	ctxerr = d.ctx.Err()
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second)
-	defer cancel()
-	d.ctx = ctx
-	err := d.applianceConfiguration(conf)
-	if err != nil {
-		return fmt.Errorf("unable to retrieve updated configuration from appliance for diagnostics: %s", err)
-	}
-
-	if ctxerr == context.DeadlineExceeded {
-		log.Info("")
-		log.Error("Failed to obtain IP address for client interface")
-		log.Info("Use vic-machine inspect to see if VCH has received an IP address at a later time")
-		log.Info("  State of all interfaces:")
-
-		// if we timed out, then report status - if cancelled this doesn't need reporting
-		for name, net := range conf.ExecutorConfig.Networks {
-			addr := net.Assigned.String()
-			if ip.IsUnspecifiedIP(net.Assigned.IP) {
-				addr = "waiting for IP"
-			}
-			log.Infof("    %q IP: %q", name, addr)
-		}
-
-		// if we timed out, then report status - if cancelled this doesn't need reporting
-		log.Info("  State of components:")
-		for name, session := range conf.ExecutorConfig.Sessions {
-			status := "waiting to launch"
-			if session.Started == "true" {
-				status = "started successfully"
-			} else if session.Started != "" {
-				status = session.Started
-			}
-			log.Infof("    %q: %q", name, status)
-		}
-
-		return errors.New("Failed to obtain IP address for client interface (timed out)")
-	}
-
-	return fmt.Errorf("Failed to get IP address information from appliance: %s", updateErr)
-}
-
-// CheckServiceReady checks if service is launched correctly, including ip address, service initialization, VC connection and Docker API
-// Should expand this method for any more VCH service checking
-func (d *Dispatcher) CheckServiceReady(ctx context.Context, conf *config.VirtualContainerHostConfigSpec, clientCert *tls.Certificate) error {
-	oldCtx := d.ctx
-	d.ctx = ctx
-	defer func() {
-		d.ctx = oldCtx
-	}()
-
-	if err := d.ensureApplianceInitializes(conf); err != nil {
-		return err
-	}
-
-	// vic-init will try to reach out to the vSphere target.
-	log.Info("Checking VCH connectivity with vSphere target")
-	// Checking access to vSphere API
-	if cd, err := d.CheckAccessToVCAPI(d.ctx, d.appliance, conf.Target); err == nil {
-		code := int(cd)
-		if code > 0 {
-			log.Warningf("vSphere API Test: %s %s", conf.Target, diag.UserReadableVCAPITestDescription(code))
-		} else {
-			log.Infof("vSphere API Test: %s %s", conf.Target, diag.UserReadableVCAPITestDescription(code))
-		}
-	} else {
-		log.Warningf("Could not run VCH vSphere API target check due to %v but the VCH may still function normally", err)
-	}
-
-	if err := d.CheckDockerAPI(conf, clientCert); err != nil {
-		err = errors.Errorf("Docker API endpoint check failed: %s", err)
-		// log with info cause this might not be an error
-		log.Info(err.Error())
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/appliance_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/appliance_test.go
deleted file mode 100644
index ea0adbac10..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/appliance_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config"
-)
-
-func TestConfirmVolumeStores(t *testing.T) {
-	testVolumeLocations := map[string]*url.URL{
-		"test1":        {},
-		"test2":        {},
-		"volume-store": {},
-	}
-
-	plVolumeStores1 := "test2 volume-store"
-	plVolumeStores2 := "test1 test2"
-	plVolumeStores3 := "volume-store"
-	plVolumeStores4 := "test1 test2 volume-store"
-	plVolumeStores5 := ""
-
-	testconf := &config.VirtualContainerHostConfigSpec{}
-	testconf.VolumeLocations = testVolumeLocations
-
-	result1 := confirmVolumeStores(testconf, plVolumeStores1)
-	assert.False(t, result1, "Failed first confirmVolumeStores check")
-
-	result2 := confirmVolumeStores(testconf, plVolumeStores2)
-	assert.False(t, result2, "Failed second confirmVolumeStores check")
-
-	result3 := confirmVolumeStores(testconf, plVolumeStores3)
-	assert.False(t, result3, "Failed third confirmVolumeStores check")
-
-	result4 := confirmVolumeStores(testconf, plVolumeStores4)
-	assert.True(t, result4, "Failed fourth confirmVolumeStores check")
-
-	result5 := confirmVolumeStores(testconf, plVolumeStores5)
-	assert.False(t, result5, "Failed fifth confirmVolumeStores check")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/configure.go b/installer/vendor/github.com/vmware/vic/lib/install/management/configure.go
deleted file mode 100644
index 73b05fc344..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/configure.go
+++ /dev/null
@@ -1,548 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"io"
-	"path"
-	"reflect"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	// deprecated snapshot name prefix
-	UpgradePrefix = "upgrade for"
-	// new snapshot name for upgrade and configure are using same process
-	ConfigurePrefix = "reconfigure for"
-)
-
-var (
-	errSecretKeyNotFound = fmt.Errorf("unable to find guestinfo secret")
-	errNilDatastore      = fmt.Errorf("session's datastore is not set")
-)
-
-// Configure will try to reconfigure vch appliance. If failed will try to roll back to original status.
-func (d *Dispatcher) Configure(vch *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData, isConfigureOp bool) (err error) {
-	defer trace.End(trace.Begin(conf.Name))
-
-	d.appliance = vch
-
-	// update the displayname to the actual folder name used
-	if d.vmPathName, err = d.appliance.FolderName(d.ctx); err != nil {
-		log.Errorf("Failed to get canonical name for appliance: %s", err)
-		return err
-	}
-
-	ds, err := d.session.Finder.Datastore(d.ctx, conf.ImageStores[0].Host)
-	if err != nil {
-		err = errors.Errorf("Failed to find image datastore %q", conf.ImageStores[0].Host)
-		return err
-	}
-	d.session.Datastore = ds
-	d.setDockerPort(conf, settings)
-
-	if len(settings.ImageFiles) > 0 {
-		// Need to update iso files
-		if err = d.uploadImages(settings.ImageFiles); err != nil {
-			return errors.Errorf("Uploading images failed with %s. Exiting...", err)
-		}
-		conf.BootstrapImagePath = fmt.Sprintf("[%s] %s/%s", conf.ImageStores[0].Host, d.vmPathName, settings.BootstrapISO)
-	}
-
-	if err = d.updateResourceSettings(conf.Name, settings); err != nil {
-		err = errors.Errorf("Failed to reconfigure resources: %s", err)
-		return err
-	}
-
-	defer func() {
-		if err != nil {
-			d.rollbackResourceSettings(conf.Name, settings)
-		}
-	}()
-
-	// ensure that we wait for components to come up
-	for _, s := range conf.ExecutorConfig.Sessions {
-		s.Started = ""
-	}
-
-	snapshotName := fmt.Sprintf("%s %s", ConfigurePrefix, conf.Version.BuildNumber)
-	snapshotName = strings.TrimSpace(snapshotName)
-
-	// check for old snapshot
-	// #nosec: Errors unhandled.
-	oldSnapshot, _ := d.appliance.GetCurrentSnapshotTree(d.ctx)
-
-	newSnapshotRef, err := d.tryCreateSnapshot(snapshotName, "configure snapshot")
-	if err != nil {
-		d.deleteUpgradeImages(ds, settings)
-		return err
-	}
-
-	if err = d.update(conf, settings, isConfigureOp); err == nil {
-		// compatible with old version's upgrade snapshot name
-		if oldSnapshot != nil && (vm.IsConfigureSnapshot(oldSnapshot, ConfigurePrefix) || vm.IsConfigureSnapshot(oldSnapshot, UpgradePrefix)) {
-			d.retryDeleteSnapshotByRef(&oldSnapshot.Snapshot, oldSnapshot.Name, conf.Name)
-		}
-		return nil
-	}
-
-	log.Errorf("Failed to upgrade: %s", err)
-	log.Infof("Rolling back upgrade")
-
-	if rerr := d.rollback(conf, snapshotName, settings); rerr != nil {
-		log.Errorf("Failed to revert appliance to snapshot: %s", rerr)
-		return err
-	}
-	log.Infof("Appliance is rolled back to old version")
-
-	d.deleteUpgradeImages(ds, settings)
-	d.retryDeleteSnapshotByRef(newSnapshotRef, snapshotName, conf.Name)
-
-	// return the error message for upgrade
-	return err
-}
-
-func (d *Dispatcher) rollbackResourceSettings(poolName string, settings *data.InstallerData) error {
-	if !settings.VCHSizeIsSet || d.oldVCHResources == nil {
-		log.Debugf("VCH resource settings are not changed")
-		return nil
-	}
-	return updateResourcePoolConfig(d.ctx, d.vchPool, poolName, d.oldVCHResources)
-}
-
-func (d *Dispatcher) updateResourceSettings(poolName string, settings *data.InstallerData) error {
-	if !settings.VCHSizeIsSet {
-		log.Debugf("VCH resource settings are not changed")
-		return nil
-	}
-	var err error
-	// compute resource
-	d.vchPool, err = d.appliance.ResourcePool(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to get parent resource pool %q: %s", poolName, err)
-		return err
-	}
-	oldSettings, err := d.getPoolResourceSettings(d.vchPool)
-	if err != nil {
-		err = errors.Errorf("Failed to get parent resource settings %q: %s", poolName, err)
-		return err
-	}
-	if reflect.DeepEqual(oldSettings, &settings.VCHSize) {
-		log.Debugf("VCH resource settings are same as old value")
-		return nil
-	}
-	d.oldVCHResources = oldSettings
-	return updateResourcePoolConfig(d.ctx, d.vchPool, poolName, &settings.VCHSize)
-}
-
-func (d *Dispatcher) Rollback(vch *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-
-	// some setup that is only necessary because we didn't just create a VCH in this case
-	d.appliance = vch
-	d.setDockerPort(conf, settings)
-
-	// ensure that we wait for components to come up
-	// TODO this stanza appears in Update too so we need to abstract it into a helper function
-	for _, s := range conf.ExecutorConfig.Sessions {
-		s.Started = ""
-	}
-
-	notfound := "A VCH version available from before the last upgrade could not be found."
-	snapshot, err := d.appliance.GetCurrentSnapshotTree(d.ctx)
-	if err != nil {
-		return errors.Errorf("%s An error was reported while trying to discover it: %s", notfound, err)
-	}
-
-	if snapshot == nil {
-		return errors.Errorf("%s No error was reported, so it's possible that this VCH has never been upgraded or the saved previous version was removed out-of-band.", notfound)
-	}
-
-	err = d.rollback(conf, snapshot.Name, settings)
-	if err != nil {
-		return errors.Errorf("could not complete manual rollback: %s", err)
-	}
-
-	return d.retryDeleteSnapshotByRef(&snapshot.Snapshot, snapshot.Name, conf.Name)
-}
-
-// retryDeleteSnapshotByRef will retry to delete snapshot by its reference if there is GenericVmConfigFault returned. This is a workaround for vSAN delete snapshot
-func (d *Dispatcher) retryDeleteSnapshotByRef(snapshot *types.ManagedObjectReference, snapshotName, applianceName string) error {
-	// delete snapshot immediately after snapshot rollback usually fail in vSAN, so have to retry several times
-	operation := func() error {
-		return d.deleteSnapshotByRef(snapshot, snapshotName, applianceName)
-	}
-	var err error
-	if err = retry.Do(operation, isSystemError); err != nil {
-		log.Errorf("Failed to clean up appliance upgrade snapshot %q: %s.", snapshotName, err)
-		log.Errorf("Snapshot %q of appliance virtual machine %q MUST be removed manually before upgrade again", snapshotName, applianceName)
-	}
-	return err
-}
-
-func isSystemError(err error) bool {
-	if soap.IsSoapFault(err) {
-		if _, ok := soap.ToSoapFault(err).VimFault().(*types.SystemError); ok {
-			return true
-		}
-	}
-
-	if soap.IsVimFault(err) {
-		if _, ok := soap.ToVimFault(err).(*types.SystemError); ok {
-			return true
-		}
-	}
-
-	if terr, ok := err.(task.Error); ok {
-		if _, ok := terr.Fault().(*types.SystemError); ok {
-			return true
-		}
-	}
-
-	return false
-}
-
-func (d *Dispatcher) deleteSnapshotByRef(snapshot *types.ManagedObjectReference, snapshotName, applianceName string) error {
-	defer trace.End(trace.Begin(snapshotName))
-	log.Infof("Deleting upgrade snapshot %q", snapshotName)
-	// do clean up aggressively, even the previous operation failed with context deadline exceeded.
-	ctx := context.Background()
-	if _, err := d.appliance.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		consolidate := true
-		return d.appliance.RemoveSnapshotByRef(ctx, snapshot, false, &consolidate)
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-// tryCreateSnapshot try to create upgrade snapshot. It will check if upgrade snapshot already exists. If exists, return error.
-// if succeed, return snapshot refID
-func (d *Dispatcher) tryCreateSnapshot(name, desc string) (*types.ManagedObjectReference, error) {
-	defer trace.End(trace.Begin(name))
-
-	// TODO detect whether another upgrade is in progress & bail if it is.
-	// Use solution from https://github.com/vmware/vic/issues/4069 to do this either as part of 4069 or once it's closed
-
-	info, err := d.appliance.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return d.appliance.CreateSnapshot(d.ctx, name, desc, true, false)
-	})
-	if err != nil {
-		return nil, errors.Errorf("Failed to create upgrade snapshot %q: %s.", name, err)
-	}
-	return info.Entity, nil
-}
-
-func (d *Dispatcher) deleteUpgradeImages(ds *object.Datastore, settings *data.InstallerData) {
-	defer trace.End(trace.Begin(""))
-
-	log.Infof("Deleting upgrade images")
-
-	// do clean up aggressively, even the previous operation failed with context deadline exceeded.
-	d.ctx = context.Background()
-
-	m := ds.NewFileManager(d.session.Datacenter, true)
-
-	file := ds.Path(path.Join(d.vmPathName, settings.ApplianceISO))
-	if err := d.deleteVMFSFiles(m, ds, file); err != nil {
-		log.Warnf("Image file %q is not removed for %s. Use the vSphere UI to delete content", file, err)
-	}
-
-	file = ds.Path(path.Join(d.vmPathName, settings.BootstrapISO))
-	if err := d.deleteVMFSFiles(m, ds, file); err != nil {
-		log.Warnf("Image file %q is not removed for %s. Use the vSphere UI to delete content", file, err)
-	}
-}
-
-func (d *Dispatcher) update(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData, isConfigureOp bool) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	power, err := d.appliance.PowerState(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm power status %q: %s", d.appliance.Reference(), err)
-		return err
-	}
-	if power != types.VirtualMachinePowerStatePoweredOff {
-		if _, err = d.appliance.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-			return d.appliance.PowerOff(ctx)
-		}); err != nil {
-			log.Errorf("Failed to power off appliance: %s", err)
-			return err
-		}
-	}
-
-	isoFile := ""
-	if settings.ApplianceISO != "" {
-		isoFile = fmt.Sprintf("[%s] %s/%s", conf.ImageStores[0].Host, d.vmPathName, settings.ApplianceISO)
-	}
-
-	// Create volume stores only for a configure operation, where conf has its storage fields validated.
-	if isConfigureOp {
-		if err := d.createVolumeStores(conf); err != nil {
-			return err
-		}
-	}
-
-	if err = d.reconfigVCH(conf, isoFile); err != nil {
-		return err
-	}
-
-	if err = d.startAppliance(conf); err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithTimeout(d.ctx, settings.Timeout)
-	defer cancel()
-	if err = d.CheckServiceReady(ctx, conf, nil); err != nil {
-		if ctx.Err() == context.DeadlineExceeded {
-			//context deadline exceeded, replace returned error message
-			err = errors.Errorf("Upgrading VCH exceeded time limit of %s. Please increase the timeout using --timeout to accommodate for a busy vSphere target", settings.Timeout)
-		}
-
-		log.Info("\tAPI may be slow to start - please retry with increased timeout using --timeout")
-		return err
-	}
-	return nil
-}
-
-func (d *Dispatcher) rollback(conf *config.VirtualContainerHostConfigSpec, snapshot string, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("old appliance iso: %q, snapshot: %q", d.oldApplianceISO, snapshot)))
-
-	// do not power on appliance in this snapshot revert
-	log.Infof("Reverting to snapshot %s", snapshot)
-	if _, err := d.appliance.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return d.appliance.RevertToSnapshot(d.ctx, snapshot, true)
-	}); err != nil {
-		return errors.Errorf("Failed to roll back upgrade: %s.", err)
-	}
-	return d.ensureRollbackReady(conf, settings)
-}
-
-func (d *Dispatcher) ensureRollbackReady(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	power, err := d.appliance.PowerState(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm power status %q after rollback: %s", d.appliance.Reference(), err)
-		return err
-	}
-	if power == types.VirtualMachinePowerStatePoweredOff {
-		log.Infof("Roll back finished - Appliance is kept in powered off status")
-		return nil
-	}
-	if err = d.startAppliance(conf); err != nil {
-		return err
-	}
-
-	ctx, cancel := context.WithTimeout(d.ctx, settings.Timeout)
-	defer cancel()
-	if err = d.CheckServiceReady(ctx, conf, nil); err != nil {
-		// do not return error in this case, to make sure clean up continues
-		log.Info("\tAPI may be slow to start - try to connect to API after a few minutes")
-	}
-	return nil
-}
-
-func (d *Dispatcher) reconfigVCH(conf *config.VirtualContainerHostConfigSpec, isoFile string) error {
-	defer trace.End(trace.Begin(isoFile))
-
-	spec := &types.VirtualMachineConfigSpec{}
-
-	if isoFile != "" {
-		deviceChange, err := d.switchISO(isoFile)
-		if err != nil {
-			return err
-		}
-
-		spec.DeviceChange = deviceChange
-	}
-
-	if conf != nil {
-		// reset service started attribute
-		for _, sess := range conf.ExecutorConfig.Sessions {
-			sess.Started = ""
-			sess.Active = true
-		}
-		if err := d.addExtraConfig(spec, conf); err != nil {
-			return err
-		}
-	}
-
-	if spec.DeviceChange == nil && spec.ExtraConfig == nil {
-		// nothing need to do
-		log.Debugf("Nothing changed, no need to reconfigure appliance")
-		return nil
-	}
-
-	// reconfig
-	log.Infof("Setting VM configuration")
-	info, err := d.appliance.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return d.appliance.Reconfigure(ctx, *spec)
-	})
-
-	if err != nil {
-		log.Errorf("Error while reconfiguring appliance: %s", err)
-		return err
-	}
-	if info.State != types.TaskInfoStateSuccess {
-		log.Errorf("Reconfiguring appliance reported: %s", info.Error.LocalizedMessage)
-		return err
-	}
-	return nil
-}
-
-func (d *Dispatcher) addExtraConfig(spec *types.VirtualMachineConfigSpec, conf *config.VirtualContainerHostConfigSpec) error {
-	if conf == nil {
-		return nil
-	}
-	cfg, err := d.encodeConfig(conf)
-	if err != nil {
-		return err
-	}
-	spec.ExtraConfig = append(spec.ExtraConfig, vmomi.OptionValueFromMap(cfg, true)...)
-
-	// get back old configuration, to remove keys not existed in new guestinfo. We don't care about value atm
-	oldConfig, err := d.GetNoSecretVCHConfig(d.appliance)
-	if err != nil {
-		return err
-	}
-	old := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(old), oldConfig)
-	for k := range old {
-		if _, ok := cfg[k]; !ok {
-			// set old key value to empty string, will remove that key from guestinfo
-			spec.ExtraConfig = append(spec.ExtraConfig, &types.OptionValue{Key: k, Value: ""})
-		}
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) switchISO(filePath string) ([]types.BaseVirtualDeviceConfigSpec, error) {
-	defer trace.End(trace.Begin(filePath))
-
-	var devices object.VirtualDeviceList
-	var err error
-
-	log.Infof("Switching appliance iso to %s", filePath)
-	devices, err = d.appliance.Device(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm devices for appliance: %s", err)
-		return nil, err
-	}
-	// find the single cdrom
-	cd, err := devices.FindCdrom("")
-	if err != nil {
-		log.Errorf("Failed to get CD rom device from appliance: %s", err)
-		return nil, err
-	}
-
-	oldApplianceISO := cd.Backing.(*types.VirtualCdromIsoBackingInfo).FileName
-	if oldApplianceISO == filePath {
-		log.Debugf("Target file name %q is same to old one, no need to change.")
-		return nil, nil
-	}
-	cd = devices.InsertIso(cd, filePath)
-	changedDevices := object.VirtualDeviceList([]types.BaseVirtualDevice{cd})
-
-	deviceChange, err := changedDevices.ConfigSpec(types.VirtualDeviceConfigSpecOperationEdit)
-	if err != nil {
-		log.Errorf("Failed to create config spec for appliance: %s", err)
-		return nil, err
-	}
-
-	d.oldApplianceISO = oldApplianceISO
-	return deviceChange, nil
-}
-
-// extractSecretFromFile reads and extracts the GuestInfoSecretKey value from the input.
-func extractSecretFromFile(rc io.ReadCloser) (string, error) {
-
-	scanner := bufio.NewScanner(rc)
-	for scanner.Scan() {
-		line := scanner.Text()
-
-		// The line is of the format: key = "value"
-		if strings.HasPrefix(line, extraconfig.GuestInfoSecretKey) {
-
-			tokens := strings.SplitN(line, "=", 2)
-			if len(tokens) < 2 {
-				return "", fmt.Errorf("parse error: unexpected token count in line")
-			}
-
-			// Ensure that the key fully matches the secret key
-			if strings.Trim(tokens[0], ` `) != extraconfig.GuestInfoSecretKey {
-				continue
-			}
-
-			// Trim double quotes and spaces
-			return strings.Trim(tokens[1], `" `), nil
-		}
-	}
-
-	return "", errSecretKeyNotFound
-}
-
-// GuestInfoSecret downloads the VCH's .vmx file and returns the GuestInfoSecretKey value.
-func (d *Dispatcher) GuestInfoSecret(vchName, vmPath string, ds *object.Datastore) (*extraconfig.SecretKey, error) {
-	defer trace.End(trace.Begin(""))
-
-	if ds == nil {
-		return nil, errNilDatastore
-	}
-
-	helper, err := datastore.NewHelper(d.ctx, d.session, ds, vmPath)
-	if err != nil {
-		return nil, err
-	}
-
-	// Download the VCH's .vmx file
-	path := fmt.Sprintf("%s.vmx", vchName)
-	rc, err := helper.Download(d.ctx, path)
-	if err != nil {
-		return nil, err
-	}
-
-	secret, err := extractSecretFromFile(rc)
-	if err != nil {
-		return nil, err
-	}
-
-	secretKey := &extraconfig.SecretKey{}
-	if err = secretKey.FromString(secret); err != nil {
-		return nil, err
-	}
-
-	return secretKey, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/configure_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/configure_test.go
deleted file mode 100644
index c133bed15b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/configure_test.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"path"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/test"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func TestGuestInfoSecret(t *testing.T) {
-	ctx := context.Background()
-
-	for i, m := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-
-		defer m.Remove()
-		err := m.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		server := m.Service.NewServer()
-		defer server.Close()
-
-		var s *session.Session
-		if i == 0 {
-			s, err = test.SessionWithESX(ctx, server.URL.String())
-		} else {
-			s, err = test.SessionWithVPX(ctx, server.URL.String())
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		name := "my-vm"
-		vmx := fmt.Sprintf("%s/%s.vmx", name, name)
-		ds := s.Datastore
-		secretKey, err := extraconfig.NewSecretKey()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		spec := types.VirtualMachineConfigSpec{
-			Name:    name,
-			GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-			Files: &types.VirtualMachineFileInfo{
-				VmPathName: fmt.Sprintf("[%s] %s", ds.Name(), vmx),
-			},
-			ExtraConfig: []types.BaseOptionValue{
-				&types.OptionValue{
-					Key:   extraconfig.GuestInfoSecretKey,
-					Value: secretKey.String(),
-				},
-			},
-		}
-
-		task, err := s.VMFolder.CreateVM(ctx, spec, s.Pool, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		err = task.Wait(ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		d := &Dispatcher{
-			session:    s,
-			ctx:        ctx,
-			vmPathName: name,
-		}
-
-		// Attempt to extract the secret without setting the session's datastore
-		secret, err := d.GuestInfoSecret(name, name, nil)
-		assert.Nil(t, secret)
-		assert.Equal(t, err, errNilDatastore)
-
-		// Attempt to extract the secret with an empty .vmx file
-		// TODO: simulator should write ExtraConfig to the .vmx file
-		secret, err = d.GuestInfoSecret(name, name, ds)
-		assert.Nil(t, secret)
-		assert.Equal(t, err, errSecretKeyNotFound)
-
-		// Write malformed key-value pairs
-		dir := simulator.Map.Get(ds.Reference()).(*simulator.Datastore).Info.(*types.LocalDatastoreInfo).Path
-		text := fmt.Sprintf("foo.bar = \"baz\"\n%s \"%s\"\n", extraconfig.GuestInfoSecretKey, secretKey.String())
-		if err = ioutil.WriteFile(path.Join(dir, vmx), []byte(text), 0); err != nil {
-			t.Fatal(err)
-		}
-
-		// Attempt to extract the secret from an incorrectly populated .vmx file
-		secret, err = d.GuestInfoSecret(name, name, ds)
-		assert.Nil(t, secret)
-		assert.Error(t, err)
-
-		// Write an invalid key that only prefix-matches the secret key
-		text = fmt.Sprintf("%s = \"%s\"\n", extraconfig.GuestInfoSecretKey+"1", secretKey.String())
-		if err = ioutil.WriteFile(path.Join(dir, vmx), []byte(text), 0); err != nil {
-			t.Fatal(err)
-		}
-
-		// Attempt to extract the secret from an incorrectly populated .vmx file
-		secret, err = d.GuestInfoSecret(name, name, ds)
-		assert.Nil(t, secret)
-		assert.Equal(t, err, errSecretKeyNotFound)
-
-		// Write valid key-value pairs
-		text = fmt.Sprintf("foo.bar = \"baz\"\n%s = \"%s\"\n", extraconfig.GuestInfoSecretKey, secretKey.String())
-		if err = ioutil.WriteFile(path.Join(dir, vmx), []byte(text), 0); err != nil {
-			t.Fatal(err)
-		}
-
-		// Extract the secret from a correctly populated .vmx file
-		secret, err = d.GuestInfoSecret(name, name, ds)
-		assert.NoError(t, err)
-		assert.Equal(t, secret.String(), secretKey.String())
-	}
-}
-
-func testUpdateResources(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, vConf *data.InstallerData, hasErr bool, t *testing.T) {
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   false,
-	}
-
-	appliance, err := sess.Finder.VirtualMachine(ctx, conf.Name)
-	if err != nil {
-		t.Errorf("Didn't find appliance vm: %s", err)
-	}
-	d.appliance = vm.NewVirtualMachine(ctx, sess, appliance.Reference())
-
-	settings := &data.InstallerData{}
-	limit := int64(1024)
-	settings.VCHSize.CPU.Limit = &limit
-	settings.VCHSize.Memory.Limit = &limit
-	settings.VCHSizeIsSet = true
-
-	if err = d.updateResourceSettings(conf.Name, settings); err != nil {
-		t.Errorf("Failed to update resources: %s", err)
-	}
-	newSettings, err := d.getPoolResourceSettings(d.vchPool)
-	if err != nil {
-		t.Errorf("Failed to get pool resources: %s", err)
-	}
-
-	assert.Equal(t, settings.VCHSize.CPU.Limit, newSettings.CPU.Limit, "Cpu limit is not updated")
-	assert.Equal(t, 0, d.oldVCHResources.CPU.Limit, "Old Cpu limit is not as expected")
-
-	d.oldVCHResources = nil
-	if err = d.updateResourceSettings(conf.Name, settings); err != nil {
-		t.Errorf("Failed to update resources: %s", err)
-	}
-	assert.Equal(t, d.oldVCHResources, nil, "should not update for same resource settings")
-
-	settings2 := &data.InstallerData{}
-	limit = int64(2048)
-	settings2.VCHSize.CPU.Limit = &limit
-	settings2.VCHSize.Memory.Limit = &limit
-	settings2.VCHSizeIsSet = false
-	if err = d.updateResourceSettings(conf.Name, settings); err != nil {
-		t.Errorf("Failed to update resources: %s", err)
-	}
-	assert.Equal(t, d.oldVCHResources, nil, "should not update if VCH size is not set")
-
-	settings2.VCHSizeIsSet = true
-	if err = d.updateResourceSettings(conf.Name, settings); err != nil {
-		t.Errorf("Failed to update resources: %s", err)
-	}
-	newSettings, err = d.getPoolResourceSettings(d.vchPool)
-	if err != nil {
-		t.Errorf("Failed to get pool resources: %s", err)
-	}
-
-	assert.Equal(t, settings2.VCHSize.CPU.Limit, newSettings.CPU.Limit, "Cpu limit is not updated")
-
-	if err = d.rollbackResourceSettings(conf.Name, settings); err != nil {
-		t.Errorf("Rollback failed: %s", err)
-	}
-	newSettings, err = d.getPoolResourceSettings(d.vchPool)
-	if err != nil {
-		t.Errorf("Failed to get pool resources: %s", err)
-	}
-
-	assert.Equal(t, settings.VCHSize.CPU.Limit, newSettings.CPU.Limit, "Cpu limit is not rollback")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/create.go b/installer/vendor/github.com/vmware/vic/lib/install/management/create.go
deleted file mode 100644
index 062150e2c4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/create.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"fmt"
-	"path"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-)
-
-const (
-	uploadRetryLimit      = 5
-	uploadMaxElapsedTime  = 30 * time.Minute
-	uploadMaxInterval     = 1 * time.Minute
-	uploadInitialInterval = 10 * time.Second
-)
-
-func (d *Dispatcher) CreateVCH(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	var err error
-
-	if err = d.checkExistence(conf, settings); err != nil {
-		return err
-	}
-
-	if err = d.createPool(conf, settings); err != nil {
-		return err
-	}
-
-	if err = d.createBridgeNetwork(conf); err != nil {
-		return err
-	}
-
-	if err = d.createAppliance(conf, settings); err != nil {
-		return errors.Errorf("Creating the appliance failed with %s. Exiting...", err)
-	}
-
-	if err = d.uploadImages(settings.ImageFiles); err != nil {
-		return errors.Errorf("Uploading images failed with %s. Exiting...", err)
-	}
-
-	return d.startAppliance(conf)
-}
-
-func (d *Dispatcher) createPool(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-
-	if d.isVC && !settings.UseRP {
-		if d.vchVapp, err = d.createVApp(conf, settings); err != nil {
-			detail := fmt.Sprintf("Creating virtual app failed: %s", err)
-			if !d.force {
-				return errors.New(detail)
-			}
-
-			log.Error(detail)
-			log.Errorf("Deploying vch under parent pool %q, (--force=true)", settings.ResourcePoolPath)
-			d.vchPool = d.session.Pool
-			conf.ComputeResources = append(conf.ComputeResources, d.vchPool.Reference())
-		}
-	} else {
-		if d.vchPool, err = d.createResourcePool(conf, settings); err != nil {
-			detail := fmt.Sprintf("Creating resource pool failed: %s", err)
-			return errors.New(detail)
-		}
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) startAppliance(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	_, err = d.appliance.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return d.appliance.PowerOn(ctx)
-	})
-
-	if err != nil {
-		return errors.Errorf("Failed to power on appliance %s. Exiting...", err)
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) uploadImages(files map[string]string) error {
-	defer trace.End(trace.Begin(""))
-
-	// upload the images
-	log.Infof("Uploading images for container")
-
-	results := make(chan error, len(files))
-	var wg sync.WaitGroup
-
-	for key, image := range files {
-
-		wg.Add(1)
-		go func(key string, image string) {
-			finalMessage := ""
-			log.Infof("\t%q", image)
-
-			// upload function that is passed to retry
-			operationForRetry := func() error {
-				// attempt to delete the iso image first in case of failed upload
-				dc := d.session.Datacenter
-				fm := d.session.Datastore.NewFileManager(dc, false)
-				ds := d.session.Datastore
-
-				isoTargetPath := path.Join(d.vmPathName, key)
-				// check iso first
-				_, err := ds.Stat(d.ctx, isoTargetPath)
-				if err != nil {
-					switch err.(type) {
-					// if not found, do nothing
-					case object.DatastoreNoSuchFileError:
-					// otherwise force delete
-					default:
-						log.Debugf("target delete path = %s", isoTargetPath)
-						err := fm.Delete(d.ctx, isoTargetPath)
-						if err != nil {
-							log.Debugf("Failed to delete image (%s) with error (%s)", image, err.Error())
-							return err
-						}
-					}
-				}
-
-				return d.session.Datastore.UploadFile(d.ctx, image, path.Join(d.vmPathName, key), nil)
-			}
-
-			// counter for retry decider
-			retryCount := uploadRetryLimit
-
-			// decider for our retry, will retry the upload uploadRetryLimit times
-			uploadRetryDecider := func(err error) bool {
-				if err == nil {
-					return false
-				}
-
-				retryCount--
-				if retryCount < 0 {
-					log.Warnf("Attempted upload a total of %d times without success, Upload process failed.", uploadRetryLimit)
-					return false
-				}
-				log.Warnf("failed an attempt to upload isos with err (%s), %d retries remain", err.Error(), retryCount)
-				return true
-			}
-
-			// Build retry config
-			backoffConf := retry.NewBackoffConfig()
-			backoffConf.InitialInterval = uploadInitialInterval
-			backoffConf.MaxInterval = uploadMaxInterval
-			backoffConf.MaxElapsedTime = uploadMaxElapsedTime
-
-			uploadErr := retry.DoWithConfig(operationForRetry, uploadRetryDecider, backoffConf)
-			if uploadErr != nil {
-				finalMessage = fmt.Sprintf("\t\tUpload failed for %q: %s\n", image, uploadErr)
-				if d.force {
-					finalMessage = fmt.Sprintf("%s\t\tContinuing despite failures (due to --force option)\n", finalMessage)
-					finalMessage = fmt.Sprintf("%s\t\tNote: The VCH will not function without %q...", finalMessage, image)
-					results <- errors.New(finalMessage)
-				} else {
-					results <- errors.New(finalMessage)
-				}
-			}
-			wg.Done()
-		}(key, image)
-	}
-
-	wg.Wait()
-	close(results)
-
-	uploadFailed := false
-	for err := range results {
-		if err != nil {
-			log.Error(err.Error())
-			uploadFailed = true
-		}
-	}
-
-	if uploadFailed {
-		return errors.New("Failed to upload iso images successfully.")
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/create_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/create_test.go
deleted file mode 100644
index ffb3247bf2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/create_test.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"net/url"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-func TestMain(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	ctx := context.Background()
-
-	for i, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		t.Logf("%d", i)
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		s.URL.User = url.UserPassword("user", "pass")
-		s.URL.Path = ""
-		t.Logf("server URL: %s", s.URL)
-
-		var input *data.Data
-		if i == 0 {
-			input = getESXData(s.URL)
-		} else {
-			input = getVPXData(s.URL)
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		installSettings := &data.InstallerData{}
-		cpu := int64(1)
-		memory := int64(1024)
-		installSettings.ApplianceSize.CPU.Limit = &cpu
-		installSettings.ApplianceSize.Memory.Limit = &memory
-
-		validator, err := validate.NewValidator(ctx, input)
-		if err != nil {
-			t.Fatalf("Failed to validator: %s", err)
-		}
-
-		conf, err := validator.Validate(ctx, input)
-		if err != nil {
-			log.Errorf("Failed to validate conf: %s", err)
-			validator.ListIssues()
-		}
-
-		testCreateNetwork(ctx, validator.Session, conf, t)
-
-		testCreateVolumeStores(ctx, validator.Session, conf, false, t)
-		testDeleteVolumeStores(ctx, validator.Session, conf, 1, t)
-		errConf := &config.VirtualContainerHostConfigSpec{}
-		*errConf = *conf
-		errConf.VolumeLocations = make(map[string]*url.URL)
-		errConf.VolumeLocations["volume-store"], _ = url.Parse("ds://store_not_exist/volumes/test")
-		testCreateVolumeStores(ctx, validator.Session, errConf, true, t)
-		testCreateAppliance(ctx, validator.Session, conf, installSettings, false, t)
-		// cannot run test for func not implemented in vcsim: ResourcePool:resourcepool-24 does not implement: UpdateConfig
-		// testUpdateResources(ctx, validator.Session, conf, installSettings, false, t)
-	}
-}
-
-func getESXData(esxURL *url.URL) *data.Data {
-	result := data.NewData()
-	result.URL = esxURL
-	result.DisplayName = "test001"
-	result.ComputeResourcePath = "/ha-datacenter/host/localhost.localdomain/Resources"
-	result.ImageDatastorePath = "LocalDS_0"
-	result.BridgeNetworkName = "bridge"
-	result.ManagementNetwork.Name = "VM Network"
-	result.PublicNetwork.Name = "VM Network"
-	result.VolumeLocations = make(map[string]*url.URL)
-	testURL := &url.URL{
-		Host: "LocalDS_0",
-		Path: "volumes/test",
-	}
-	result.VolumeLocations["volume-store"] = testURL
-
-	return result
-}
-
-func getVPXData(vcURL *url.URL) *data.Data {
-	result := data.NewData()
-	result.URL = vcURL
-	result.DisplayName = "test001"
-	result.ComputeResourcePath = "/DC0/host/DC0_C0/Resources"
-	result.ImageDatastorePath = "LocalDS_0"
-	result.PublicNetwork.Name = "VM Network"
-	result.BridgeNetworkName = "DC0_DVPG0"
-	result.VolumeLocations = make(map[string]*url.URL)
-	testURL := &url.URL{
-		Host: "LocalDS_0",
-		Path: "volumes/test",
-	}
-	result.VolumeLocations["volume-store"] = testURL
-
-	return result
-}
-
-func testCreateNetwork(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, t *testing.T) {
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   false,
-	}
-
-	err := d.createBridgeNetwork(conf)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if d.isVC {
-		bnet := conf.ExecutorConfig.Networks[conf.BridgeNetwork]
-		delete(conf.ExecutorConfig.Networks, conf.BridgeNetwork)
-
-		err = d.createBridgeNetwork(conf)
-		if err == nil {
-			t.Error("expected error")
-		}
-
-		conf.ExecutorConfig.Networks[conf.BridgeNetwork] = bnet
-	}
-}
-
-func testCreateVolumeStores(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, hasErr bool, t *testing.T) {
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   false,
-	}
-
-	err := d.createVolumeStores(conf)
-	if hasErr && err != nil {
-		t.Logf("Got exepcted err: %s", err)
-		return
-	}
-	if hasErr {
-		t.Errorf("Should have error, but got success")
-		return
-	}
-	if err != nil {
-		t.Errorf("Unexpected error: %s", err)
-	}
-}
-
-func testDeleteVolumeStores(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, numVols int, t *testing.T) {
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   true,
-	}
-
-	if removed := d.deleteVolumeStoreIfForced(conf); removed != numVols {
-		t.Errorf("Did not successfully remove all specified volumes")
-	}
-
-}
-
-func testCreateAppliance(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, vConf *data.InstallerData, hasErr bool, t *testing.T) {
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   false,
-	}
-
-	err := d.createPool(conf, vConf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = d.createAppliance(conf, vConf)
-	if err != nil {
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/debug.go b/installer/vendor/github.com/vmware/vic/lib/install/management/debug.go
deleted file mode 100644
index 1ae146a935..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/debug.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func (d *Dispatcher) DebugVCH(vch *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, password, authorizedKey string) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	op, err := trace.FromContext(d.ctx)
-	if err != nil {
-		op = trace.NewOperation(d.ctx, "enable appliance debug")
-	}
-
-	err = d.enableSSH(op, vch, password, authorizedKey)
-	if err != nil {
-		op.Errorf("Unable to enable ssh on the VCH appliance VM: %s", err)
-		return err
-	}
-
-	d.sshEnabled = true
-
-	return nil
-}
-
-func (d *Dispatcher) enableSSH(ctx context.Context, vch *vm.VirtualMachine, password, authorizedKey string) error {
-	op, err := trace.FromContext(ctx)
-	if err != nil {
-		op = trace.NewOperation(ctx, "enable ssh in appliance")
-	}
-
-	state, err := vch.PowerState(op)
-	if err != nil {
-		log.Errorf("Failed to get appliance power state, service might not be available at this moment.")
-	}
-	if state != types.VirtualMachinePowerStatePoweredOn {
-		err = errors.Errorf("VCH appliance is not powered on, state %s", state)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	running, err := vch.IsToolsRunning(op)
-	if err != nil || !running {
-		err = errors.New("Tools is not running in the appliance, unable to continue")
-		op.Errorf("%s", err)
-		return err
-	}
-
-	pm, err := d.opManager(ctx, vch)
-	if err != nil {
-		err = errors.Errorf("Unable to manage processes in appliance VM: %s", err)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	auth := types.NamePasswordAuthentication{}
-
-	spec := types.GuestProgramSpec{
-		ProgramPath: "enable-ssh",
-		Arguments:   string(authorizedKey),
-	}
-
-	pid, err := pm.StartProgram(op, &auth, &spec)
-	if err != nil {
-		err = errors.Errorf("Unable to enable SSH in appliance VM: %s", err)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	_, err = d.opManagerWait(ctx, pm, &auth, pid)
-	if err != nil {
-		err = errors.Errorf("Unable to check enable SSH status: %s", err)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	if password == "" {
-		return nil
-	}
-
-	// set the password as well
-	spec = types.GuestProgramSpec{
-		ProgramPath: "passwd",
-		Arguments:   password,
-	}
-
-	pid, err = pm.StartProgram(op, &auth, &spec)
-	if err != nil {
-		err = errors.Errorf("Unable to enable passwd in appliance VM: %s", err)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	_, err = d.opManagerWait(ctx, pm, &auth, pid)
-	if err != nil {
-		err = errors.Errorf("Unable to check enable passwd status: %s", err)
-		op.Errorf("%s", err)
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/delete.go b/installer/vendor/github.com/vmware/vic/lib/install/management/delete.go
deleted file mode 100644
index 27898bdd1e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/delete.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"strings"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/compute"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func (d *Dispatcher) DeleteVCH(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	var errs []string
-
-	var err error
-	var vmm *vm.VirtualMachine
-
-	if vmm, err = d.findApplianceByID(conf); err != nil {
-		return err
-	}
-	if vmm == nil {
-		return nil
-	}
-
-	if err = d.DeleteVCHInstances(vmm, conf); err != nil {
-		// if container delete failed, do not remove anything else
-		log.Infof("Specify --force to force delete")
-		return err
-	}
-
-	if err = d.deleteImages(conf); err != nil {
-		errs = append(errs, err.Error())
-	}
-
-	d.deleteVolumeStoreIfForced(conf) // logs errors but doesn't ever bail out if it has an issue
-
-	if err = d.deleteNetworkDevices(vmm, conf); err != nil {
-		errs = append(errs, err.Error())
-	}
-	if err = d.removeNetwork(conf); err != nil {
-		errs = append(errs, err.Error())
-	}
-	if len(errs) > 0 {
-		// stop here, leave vch appliance there for next time delete
-		return errors.New(strings.Join(errs, "\n"))
-	}
-
-	err = d.deleteVM(vmm, true)
-	if err != nil {
-		log.Debugf("Error deleting appliance VM %s", err)
-		return err
-	}
-	if err = d.destroyResourcePoolIfEmpty(conf); err != nil {
-		log.Warnf("VCH resource pool is not removed: %s", err)
-	}
-	return nil
-}
-
-func (d *Dispatcher) getComputeResource(vmm *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec) (*compute.ResourcePool, error) {
-	var rpRef types.ManagedObjectReference
-	var err error
-
-	if len(conf.ComputeResources) == 0 {
-		if !d.force {
-			err = errors.Errorf("Cannot find compute resources from configuration")
-			return nil, err
-		}
-		log.Warnf("Cannot find compute resources from configuration, attempting to delete under parent resource pool")
-		parent, err := vmm.Parent(d.ctx)
-		if err != nil {
-			return nil, err
-		}
-		if parent == nil {
-			err = errors.Errorf("Cannot find VCH parent resource pool")
-			return nil, err
-		}
-		rpRef = *parent
-	} else {
-		rpRef = conf.ComputeResources[len(conf.ComputeResources)-1]
-	}
-
-	ref, err := d.session.Finder.ObjectReference(d.ctx, rpRef)
-	if err != nil {
-		err = errors.Errorf("Failed to get VCH resource pool %q: %s", rpRef, err)
-		return nil, err
-	}
-	switch ref.(type) {
-	case *object.VirtualApp:
-	case *object.ResourcePool:
-		//		ok
-	default:
-		err = errors.Errorf("Unsupported compute resource %q", rpRef)
-		return nil, err
-	}
-
-	rp := compute.NewResourcePool(d.ctx, d.session, ref.Reference())
-	return rp, nil
-}
-
-func (d *Dispatcher) getImageDatastore(vmm *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, force bool) (*object.Datastore, error) {
-	var err error
-	if conf == nil || len(conf.ImageStores) == 0 {
-		if !force {
-			err = errors.Errorf("Cannot find image stores from configuration")
-			return nil, err
-		}
-		log.Debugf("Cannot find image stores from configuration; attempting to find from vm datastore")
-		dss, err := vmm.DatastoreReference(d.ctx)
-		if err != nil {
-			return nil, errors.Errorf("Failed to query vm datastore: %s", err)
-		}
-		if len(dss) == 0 {
-			return nil, errors.New("No VCH datastore found, cannot continue")
-		}
-		ds, err := d.session.Finder.ObjectReference(d.ctx, dss[0])
-		if err != nil {
-			return nil, errors.Errorf("Failed to search vm datastore %s: %s", dss[0], err)
-		}
-		return ds.(*object.Datastore), nil
-	}
-	ds, err := d.session.Finder.Datastore(d.ctx, conf.ImageStores[0].Host)
-	if err != nil {
-		err = errors.Errorf("Failed to find image datastore %q", conf.ImageStores[0].Host)
-		return nil, err
-	}
-	return ds, nil
-}
-
-// detach all VMDKs attached to vm
-func (d *Dispatcher) detachAttachedDisks(v *vm.VirtualMachine) error {
-	devices, err := v.Device(d.ctx)
-	if err != nil {
-		log.Debugf("Couldn't find any devices to detach: %s", err.Error())
-		return nil
-	}
-
-	disks := devices.SelectByType(&types.VirtualDisk{})
-	if disks == nil {
-		// nothing attached
-		log.Debugf("No disks found attached to VM")
-		return nil
-	}
-
-	config := []types.BaseVirtualDeviceConfigSpec{}
-	for _, disk := range disks {
-		config = append(config,
-			&types.VirtualDeviceConfigSpec{
-				Device:    disk,
-				Operation: types.VirtualDeviceConfigSpecOperationRemove,
-			})
-	}
-
-	op := trace.NewOperation(d.ctx, "detach disks before delete")
-	_, err = v.WaitForResult(op,
-		func(ctx context.Context) (tasks.Task, error) {
-			t, er := v.Reconfigure(ctx,
-				types.VirtualMachineConfigSpec{DeviceChange: config})
-			if t != nil {
-				op.Debugf("Detach reconfigure task=%s", t.Reference())
-			}
-			return t, er
-		})
-
-	return err
-}
-
-func (d *Dispatcher) DeleteVCHInstances(vmm *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	log.Infof("Removing VMs")
-
-	// serializes access to errs
-	var mu sync.Mutex
-	var errs []string
-
-	var err error
-	var children []*vm.VirtualMachine
-	d.parentResourcepool, err = d.getComputeResource(vmm, conf)
-	if err != nil {
-		return err
-	}
-
-	if children, err = d.parentResourcepool.GetChildrenVMs(d.ctx, d.session); err != nil {
-		return err
-	}
-
-	if d.session.Datastore, err = d.getImageDatastore(vmm, conf, d.force); err != nil {
-		return err
-	}
-
-	var wg sync.WaitGroup
-	for _, child := range children {
-		//Leave VCH appliance there until everything else is removed, cause it has VCH configuration. Then user could retry delete in case of any failure.
-		ok, err := d.isVCH(child)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		if ok {
-			// child is vch; detach all attached disks so later removal of images is successful
-			if err = d.detachAttachedDisks(child); err != nil {
-				errs = append(errs, err.Error())
-			}
-			continue
-		}
-
-		wg.Add(1)
-		go func(child *vm.VirtualMachine) {
-			defer wg.Done()
-			if err = d.deleteVM(child, d.force); err != nil {
-				mu.Lock()
-				errs = append(errs, err.Error())
-				mu.Unlock()
-			}
-		}(child)
-	}
-	wg.Wait()
-
-	if len(errs) > 0 {
-		log.Debugf("Error deleting container VMs %s", errs)
-		return errors.New(strings.Join(errs, "\n"))
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) deleteNetworkDevices(vmm *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	log.Infof("Removing appliance VM network devices")
-
-	power, err := vmm.PowerState(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm power status %q: %s", vmm.Reference(), err)
-		return err
-
-	}
-	if power != types.VirtualMachinePowerStatePoweredOff {
-		if _, err = vmm.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-			return vmm.PowerOff(ctx)
-		}); err != nil {
-			log.Errorf("Failed to power off existing appliance for %s", err)
-			return err
-		}
-	}
-
-	devices, err := d.networkDevices(vmm)
-	if err != nil {
-		log.Errorf("Unable to get network devices: %s", err)
-		return err
-	}
-
-	if len(devices) == 0 {
-		log.Infof("No network device attached")
-		return nil
-	}
-	// remove devices
-	return vmm.RemoveDevice(d.ctx, false, devices...)
-}
-
-func (d *Dispatcher) networkDevices(vmm *vm.VirtualMachine) ([]types.BaseVirtualDevice, error) {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-	vmDevices, err := vmm.Device(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get vm devices for appliance: %s", err)
-		return nil, err
-	}
-	var devices []types.BaseVirtualDevice
-	for _, device := range vmDevices {
-		if _, ok := device.(types.BaseVirtualEthernetCard); ok {
-			devices = append(devices, device)
-		}
-	}
-	return devices, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/delete_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/delete_test.go
deleted file mode 100644
index c65a17257b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/delete_test.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-func TestDelete(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-	ctx := context.Background()
-
-	for i, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		t.Logf("%d", i)
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		s.URL.User = url.UserPassword("user", "pass")
-		s.URL.Path = ""
-		t.Logf("server URL: %s", s.URL)
-
-		var input *data.Data
-		if i == 0 {
-			input = getESXData(s.URL)
-		} else {
-			input = getVPXData(s.URL)
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		installSettings := &data.InstallerData{}
-		cpu := int64(1)
-		memory := int64(1024)
-		installSettings.ApplianceSize.CPU.Limit = &cpu
-		installSettings.ApplianceSize.Memory.Limit = &memory
-		installSettings.ResourcePoolPath = path.Join(input.ComputeResourcePath, input.DisplayName)
-
-		validator, err := validate.NewValidator(ctx, input)
-		if err != nil {
-			t.Errorf("Failed to validator: %s", err)
-		}
-
-		conf, err := validator.Validate(ctx, input)
-		if err != nil {
-			log.Errorf("Failed to validate conf: %s", err)
-			validator.ListIssues()
-		}
-
-		testCreateNetwork(ctx, validator.Session, conf, t)
-		createAppliance(ctx, validator.Session, conf, installSettings, false, t)
-
-		testNewVCHFromCompute(input.ComputeResourcePath, input.DisplayName, validator, t)
-		//		testUpgrade(input.ComputeResourcePath, input.DisplayName, validator, installSettings, t) TODO: does not implement: CreateSnapshot_Task
-		testDeleteVCH(validator, conf, t)
-
-		testDeleteDatastoreFiles(validator, t)
-	}
-}
-
-func testUpgrade(computePath string, name string, v *validate.Validator, settings *data.InstallerData, t *testing.T) {
-	// TODO: add tests for rollback after snapshot func is added in vcsim
-	d := &Dispatcher{
-		session: v.Session,
-		ctx:     v.Context,
-		isVC:    v.Session.IsVC(),
-		force:   false,
-	}
-	vch, err := d.NewVCHFromComputePath(computePath, name, v)
-	if err != nil {
-		t.Errorf("Failed to get VCH: %s", err)
-		return
-	}
-	t.Logf("Got VCH %s, path %s", vch, path.Dir(vch.InventoryPath))
-	conf, err := d.GetVCHConfig(vch)
-	if err != nil {
-
-		t.Errorf("Failed to get vch configuration: %s", err)
-	}
-	if err := d.Configure(vch, conf, settings, false); err != nil {
-		t.Errorf("Failed to upgrade: %s", err)
-	}
-}
-
-func createAppliance(ctx context.Context, sess *session.Session, conf *config.VirtualContainerHostConfigSpec, vConf *data.InstallerData, hasErr bool, t *testing.T) {
-	var err error
-
-	d := &Dispatcher{
-		session: sess,
-		ctx:     ctx,
-		isVC:    sess.IsVC(),
-		force:   false,
-	}
-
-	err = d.createPool(conf, vConf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = d.createAppliance(conf, vConf)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testNewVCHFromCompute(computePath string, name string, v *validate.Validator, t *testing.T) {
-	d := &Dispatcher{
-		session: v.Session,
-		ctx:     v.Context,
-		isVC:    v.Session.IsVC(),
-		force:   false,
-	}
-	vch, err := d.NewVCHFromComputePath(computePath, name, v)
-	if err != nil {
-		t.Errorf("Failed to get VCH: %s", err)
-		return
-	}
-
-	if d.session.Cluster == nil {
-		t.Errorf("Failed to set cluster: %s", err)
-		return
-	}
-
-	t.Logf("Got VCH %s, path %s", vch, path.Dir(vch.InventoryPath))
-}
-
-func testDeleteVCH(v *validate.Validator, conf *config.VirtualContainerHostConfigSpec, t *testing.T) {
-	d := &Dispatcher{
-		session: v.Session,
-		ctx:     v.Context,
-		isVC:    v.Session.IsVC(),
-		force:   false,
-	}
-	// failed to get vm FolderName, that will eventually cause panic in simulator to delete empty datastore file
-	if err := d.DeleteVCH(conf); err != nil {
-		t.Errorf("Failed to get VCH: %s", err)
-		return
-	}
-	t.Logf("Successfully deleted VCH")
-	// check images directory is removed
-	dsPath := "[LocalDS_0] VIC"
-	_, err := d.lsFolder(v.Session.Datastore, dsPath)
-	if err != nil {
-		if !types.IsFileNotFound(err) {
-			t.Errorf("Failed to browse folder %s: %s", dsPath, errors.ErrorStack(err))
-		}
-		t.Logf("Images Folder is not found")
-	}
-
-	// check appliance vm is deleted
-	vm, err := d.findApplianceByID(conf)
-	if vm != nil {
-		t.Errorf("Should not found vm %s", vm.Reference())
-	}
-
-	if err != nil {
-		t.Errorf("Unexpected error to get appliance VM: %s", err)
-	}
-	// delete VM does not clean up resource pool after VM is removed, so resource pool could not be removed
-}
-
-func testDeleteDatastoreFiles(v *validate.Validator, t *testing.T) {
-	d := &Dispatcher{
-		session: v.Session,
-		ctx:     v.Context,
-		isVC:    v.Session.IsVC(),
-		force:   false,
-	}
-
-	ds := v.Session.Datastore
-	m := object.NewFileManager(ds.Client())
-	err := m.MakeDirectory(v.Context, ds.Path("Test/folder/data"), v.Session.Datacenter, true)
-	if err != nil {
-		t.Errorf("Failed to create datastore dir: %s", err)
-		return
-	}
-	err = m.MakeDirectory(v.Context, ds.Path("Test/folder/metadata"), v.Session.Datacenter, true)
-	if err != nil {
-		t.Errorf("Failed to create datastore dir: %s", err)
-		return
-	}
-	err = m.MakeDirectory(v.Context, ds.Path("Test/folder/file"), v.Session.Datacenter, true)
-	if err != nil {
-		t.Errorf("Failed to create datastore dir: %s", err)
-		return
-	}
-
-	isVSAN := d.isVSAN(ds)
-	t.Logf("datastore is vsan: %t", isVSAN)
-
-	if err = createDatastoreFiles(d, ds, t); err != nil {
-		t.Errorf("Failed to upload file: %s", err)
-		return
-	}
-
-	fm := ds.NewFileManager(d.session.Datacenter, true)
-	if err = d.deleteFilesIteratively(fm, ds, ds.Path("Test")); err != nil {
-		t.Errorf("Failed to delete recursively: %s", err)
-	}
-
-	err = m.MakeDirectory(v.Context, ds.Path("Test/folder/data"), v.Session.Datacenter, true)
-	if err != nil {
-		t.Errorf("Failed to create datastore dir: %s", err)
-		return
-	}
-
-	if err = createDatastoreFiles(d, ds, t); err != nil {
-		t.Errorf("Failed to upload file: %s", err)
-		return
-	}
-
-	if _, err = d.deleteDatastoreFiles(ds, "Test", true); err != nil {
-		t.Errorf("Failed to delete recursively: %s", err)
-	}
-}
-
-func createDatastoreFiles(d *Dispatcher, ds *object.Datastore, t *testing.T) error {
-	tmpfile, err := ioutil.TempFile("", "tempDatastoreFile.vmdk")
-	if err != nil {
-		t.Errorf("Failed to create file: %s", err)
-		return err
-	}
-
-	defer os.Remove(tmpfile.Name()) // clean up
-
-	if err = ds.UploadFile(d.ctx, tmpfile.Name(), "Test/folder/data/temp.vmdk", nil); err != nil {
-		t.Errorf("Failed to upload file %q: %s", "Test/folder/data/temp.vmdk", err)
-		return err
-	}
-	if err = ds.UploadFile(d.ctx, tmpfile.Name(), "Test/folder/tempMetadata", nil); err != nil {
-		t.Errorf("Failed to upload file %q: %s", "Test/folder/tempMetadata", err)
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/dispatcher.go b/installer/vendor/github.com/vmware/vic/lib/install/management/dispatcher.go
deleted file mode 100644
index 47992af051..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/dispatcher.go
+++ /dev/null
@@ -1,435 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"math"
-	"net"
-	"os"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/guest"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/compute"
-	"github.com/vmware/vic/pkg/vsphere/diagnostic"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-type Dispatcher struct {
-	session *session.Session
-	ctx     context.Context
-	force   bool
-	secret  *extraconfig.SecretKey
-
-	isVC          bool
-	vchPoolPath   string
-	vmPathName    string
-	dockertlsargs string
-
-	DockerPort string
-	HostIP     string
-
-	vchPool   *object.ResourcePool
-	vchVapp   *object.VirtualApp
-	appliance *vm.VirtualMachine
-
-	oldApplianceISO string
-	oldVCHResources *config.Resources
-
-	sshEnabled         bool
-	parentResourcepool *compute.ResourcePool
-}
-
-type diagnosticLog struct {
-	key     string
-	name    string
-	start   int32
-	host    *object.HostSystem
-	collect bool
-}
-
-var diagnosticLogs = make(map[string]*diagnosticLog)
-
-// NewDispatcher creates a dispatcher that can act upon VIC management operations.
-// clientCert is an optional client certificate to allow interaction with the Docker API for verification
-// force will ignore some errors
-func NewDispatcher(ctx context.Context, s *session.Session, conf *config.VirtualContainerHostConfigSpec, force bool) *Dispatcher {
-	defer trace.End(trace.Begin(""))
-	isVC := s.IsVC()
-	e := &Dispatcher{
-		session: s,
-		ctx:     ctx,
-		isVC:    isVC,
-		force:   force,
-	}
-	if conf != nil {
-		e.InitDiagnosticLogsFromConf(conf)
-	}
-	return e
-}
-
-// Get the current log header LineEnd of the hostd/vpxd logs based on VCH configuration
-// With this we avoid collecting log file data that existed prior to install.
-func (d *Dispatcher) InitDiagnosticLogsFromConf(conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
-
-	if d.isVC {
-		diagnosticLogs[d.session.ServiceContent.About.InstanceUuid] =
-			&diagnosticLog{"vpxd:vpxd.log", "vpxd.log", 0, nil, true}
-	}
-
-	var err error
-	// try best to get datastore and cluster, but do not return for any error. The least is to collect VC log only
-	if d.session.Datastore == nil {
-		if len(conf.ImageStores) > 0 {
-			if d.session.Datastore, err = d.session.Finder.DatastoreOrDefault(d.ctx, conf.ImageStores[0].Host); err != nil {
-				log.Debugf("Failure finding image store from VCH config (%s): %s", conf.ImageStores[0].Host, err.Error())
-			} else {
-				log.Debugf("Found ds: %s", conf.ImageStores[0].Host)
-			}
-		} else {
-			log.Debugf("Image datastore is empty")
-		}
-	}
-
-	// find the host(s) attached to given storage
-	if d.session.Cluster == nil {
-		if len(conf.ComputeResources) > 0 {
-			rp := compute.NewResourcePool(d.ctx, d.session, conf.ComputeResources[0])
-			if d.session.Cluster, err = rp.GetCluster(d.ctx); err != nil {
-				log.Debugf("Unable to get cluster for given resource pool %s: %s", conf.ComputeResources[0], err)
-			}
-		} else {
-			log.Debugf("Compute resource is empty")
-		}
-	}
-
-	var hosts []*object.HostSystem
-	if d.session.Datastore != nil && d.session.Cluster != nil {
-		hosts, err = d.session.Datastore.AttachedClusterHosts(d.ctx, d.session.Cluster)
-		if err != nil {
-			log.Debugf("Unable to get the list of hosts attached to given storage: %s", err)
-		}
-	}
-
-	if d.session.Host == nil {
-		// vCenter w/ auto DRS.
-		// Set collect=false here as we do not want to collect all hosts logs,
-		// just the hostd log where the VM is placed.
-		for _, host := range hosts {
-			diagnosticLogs[host.Reference().Value] =
-				&diagnosticLog{"hostd", "hostd.log", 0, host, false}
-		}
-	} else {
-		// vCenter w/ manual DRS or standalone ESXi
-		var host *object.HostSystem
-		if d.isVC {
-			host = d.session.Host
-		}
-
-		diagnosticLogs[d.session.Host.Reference().Value] =
-			&diagnosticLog{"hostd", "hostd.log", 0, host, true}
-	}
-
-	m := diagnostic.NewDiagnosticManager(d.session)
-
-	for k, l := range diagnosticLogs {
-		if l == nil {
-			continue
-		}
-		// get LineEnd without any LineText
-		h, err := m.BrowseLog(d.ctx, l.host, l.key, math.MaxInt32, 0)
-		if err != nil {
-			log.Warnf("Disabling %s %s collection (%s)", k, l.name, err)
-			diagnosticLogs[k] = nil
-			continue
-		}
-
-		l.start = h.LineEnd
-	}
-}
-
-// Get the current log header LineEnd of the hostd/vpxd logs based on vch VM hardwares, cause VCH configuration might not be available at this time
-// With this we avoid collecting log file data that existed prior to install.
-func (d *Dispatcher) InitDiagnosticLogsFromVCH(vch *vm.VirtualMachine) {
-	defer trace.End(trace.Begin(""))
-
-	if d.isVC {
-		diagnosticLogs[d.session.ServiceContent.About.InstanceUuid] =
-			&diagnosticLog{"vpxd:vpxd.log", "vpxd.log", 0, nil, true}
-	}
-
-	var err error
-	// where the VM is running
-	ds, err := d.getImageDatastore(vch, nil, true)
-	if err != nil {
-		log.Debugf("Failure finding image store from VCH VM %s: %s", vch.Reference(), err.Error())
-	}
-
-	var hosts []*object.HostSystem
-	if ds != nil && d.session.Cluster != nil {
-		hosts, err = ds.AttachedClusterHosts(d.ctx, d.session.Cluster)
-		if err != nil {
-			log.Debugf("Unable to get the list of hosts attached to given storage: %s", err)
-		}
-	}
-
-	for _, host := range hosts {
-		diagnosticLogs[host.Reference().Value] =
-			&diagnosticLog{"hostd", "hostd.log", 0, host, false}
-	}
-
-	m := diagnostic.NewDiagnosticManager(d.session)
-
-	for k, l := range diagnosticLogs {
-		if l == nil {
-			continue
-		}
-		// get LineEnd without any LineText
-		h, err := m.BrowseLog(d.ctx, l.host, l.key, math.MaxInt32, 0)
-
-		if err != nil {
-			log.Warnf("Disabling %s %s collection (%s)", k, l.name, err)
-			diagnosticLogs[k] = nil
-			continue
-		}
-
-		l.start = h.LineEnd
-	}
-}
-
-func (d *Dispatcher) CollectDiagnosticLogs() {
-	defer trace.End(trace.Begin(""))
-
-	m := diagnostic.NewDiagnosticManager(d.session)
-
-	for k, l := range diagnosticLogs {
-		if l == nil || !l.collect {
-			continue
-		}
-
-		log.Infof("Collecting %s %s", k, l.name)
-
-		var lines []string
-		start := l.start
-
-		for i := 0; i < 2; i++ {
-			h, err := m.BrowseLog(d.ctx, l.host, l.key, start, 0)
-			if err != nil {
-				log.Errorf("Failed to collect %s %s: %s", k, l.name, err)
-				break
-			}
-
-			lines = h.LineText
-			if len(lines) != 0 {
-				break // l.start was still valid, log was not rolled over
-			}
-
-			// log rolled over, start at the beginning.
-			// TODO: If this actually happens we will have missed some log data,
-			// it is possible to get data from the previous log too.
-			start = 0
-			log.Infof("%s %s rolled over", k, l.name)
-		}
-
-		if len(lines) == 0 {
-			log.Warnf("No log data for %s %s", k, l.name)
-			continue
-		}
-
-		f, err := os.Create(l.name)
-		if err != nil {
-			log.Errorf("Failed to create local %s: %s", l.name, err)
-			continue
-		}
-		defer f.Close()
-
-		for _, line := range lines {
-			fmt.Fprintln(f, line)
-		}
-	}
-}
-
-func (d *Dispatcher) opManager(ctx context.Context, vch *vm.VirtualMachine) (*guest.ProcessManager, error) {
-	state, err := vch.PowerState(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to get appliance power state, service might not be available at this moment.")
-	}
-	if state != types.VirtualMachinePowerStatePoweredOn {
-		return nil, fmt.Errorf("VCH appliance is not powered on, state %s", state)
-	}
-
-	running, err := vch.IsToolsRunning(ctx)
-	if err != nil || !running {
-		return nil, errors.New("Tools are not running in the appliance, unable to continue")
-	}
-
-	manager := guest.NewOperationsManager(d.session.Client.Client, vch.Reference())
-	processManager, err := manager.ProcessManager(ctx)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to manage processes in appliance VM: %s", err)
-	}
-	return processManager, nil
-}
-
-// opManagerWait polls for state of the process with the given pid, waiting until the process has completed.
-// The pid param must be one returned by ProcessManager.StartProgram.
-func (d *Dispatcher) opManagerWait(ctx context.Context, pm *guest.ProcessManager, auth types.BaseGuestAuthentication, pid int64) (*types.GuestProcessInfo, error) {
-	pids := []int64{pid}
-
-	for {
-		select {
-		case <-time.After(time.Millisecond * 250):
-		case <-ctx.Done():
-			return nil, fmt.Errorf("opManagerWait(%d): %s", pid, ctx.Err())
-		}
-
-		procs, err := pm.ListProcesses(ctx, auth, pids)
-		if err != nil {
-			return nil, err
-		}
-
-		if len(procs) == 1 && procs[0].EndTime != nil {
-			return &procs[0], nil
-		}
-	}
-}
-
-func (d *Dispatcher) CheckAccessToVCAPI(ctx context.Context, vch *vm.VirtualMachine, target string) (int64, error) {
-	pm, err := d.opManager(ctx, vch)
-	if err != nil {
-		return -1, err
-	}
-	auth := types.NamePasswordAuthentication{}
-	spec := types.GuestProgramSpec{
-		ProgramPath: "test-vc-api",
-		Arguments:   target,
-	}
-	pid, err := pm.StartProgram(ctx, &auth, &spec)
-	if err != nil {
-		return -1, err
-	}
-
-	info, err := d.opManagerWait(ctx, pm, &auth, pid)
-	if err != nil {
-		return -1, err
-	}
-
-	return int64(info.ExitCode), nil
-}
-
-// addrToUse given candidateIPs, determines an address in cert that resolves to
-// a candidateIP - this address can be used as the remote address to connect to with
-// cert to ensure that certificate validation is successful
-// if none can be found, return empty string and an err
-func addrToUse(candidateIPs []net.IP, cert *x509.Certificate, cas []byte) (string, error) {
-	if cert == nil {
-		return "", errors.New("unable to determine suitable address with nil certificate")
-	}
-
-	pool, err := x509.SystemCertPool()
-	if err != nil {
-		log.Warnf("Failed to load system cert pool: %s. Using empty pool.", err)
-		pool = x509.NewCertPool()
-	}
-	pool.AppendCertsFromPEM(cas)
-
-	// update target to use FQDN
-	for _, ip := range candidateIPs {
-		names, err := net.LookupAddr(ip.String())
-		if err != nil {
-			log.Debugf("Unable to perform reverse lookup of IP address %s: %s", ip, err)
-		}
-
-		// check all the returned names, and lastly the raw IP
-		for _, n := range append(names, ip.String()) {
-			opts := x509.VerifyOptions{
-				Roots:   pool,
-				DNSName: n,
-			}
-
-			_, err := cert.Verify(opts)
-			if err == nil {
-				// this identifier will work
-				log.Debugf("Matched %q for use against host certificate", n)
-				// trim '.' fqdn suffix if fqdn
-				return strings.TrimSuffix(n, "."), nil
-			}
-
-			log.Debugf("Checked %q, no match for host certificate", n)
-		}
-	}
-
-	// no viable address
-	return "", errors.New("unable to determine viable address")
-}
-
-/// viableHostAddresses attempts to determine which possibles addresses in the certificate
-// are viable from the current location.
-// This will return all IP addresses - it attempts to validate DNS names via resolution.
-// This does NOT check connectivity
-func viableHostAddress(candidateIPs []net.IP, cert *x509.Certificate, cas []byte) (string, error) {
-	if cert == nil {
-		return "", fmt.Errorf("unable to determine suitable address with nil certificate")
-	}
-
-	log.Debug("Loading CAs for client auth")
-	pool := x509.NewCertPool()
-	pool.AppendCertsFromPEM(cas)
-
-	dnsnames := cert.DNSNames
-
-	// assemble the common name and alt names
-	ip := net.ParseIP(cert.Subject.CommonName)
-	if ip != nil {
-		candidateIPs = append(candidateIPs, ip)
-	} else {
-		// assume it's dns
-		dnsnames = append([]string{cert.Subject.CommonName}, dnsnames...)
-	}
-
-	// turn the DNS names into IPs
-	for _, n := range dnsnames {
-		// see which resolve from here
-		ips, err := net.LookupIP(n)
-		if err != nil {
-			log.Debugf("Unable to perform IP lookup of %q: %s", n, err)
-		}
-		// Allow wildcard names for later validation
-		if len(ips) == 0 && !strings.HasPrefix(n, "*") {
-			log.Debugf("Discarding name from viable set: %s", n)
-			continue
-		}
-
-		candidateIPs = append(candidateIPs, ips...)
-	}
-
-	// always add all the altname IPs - we're not checking for connectivity
-	candidateIPs = append(candidateIPs, cert.IPAddresses...)
-
-	return addrToUse(candidateIPs, cert, cas)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/finder.go b/installer/vendor/github.com/vmware/vic/lib/install/management/finder.go
deleted file mode 100644
index d1ab56d462..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/finder.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"fmt"
-	"path"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/lib/migration"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/compute"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	vchIDType = "VirtualMachine"
-)
-
-func (d *Dispatcher) NewVCHFromID(id string) (*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(id))
-
-	var err error
-	var vmm *vm.VirtualMachine
-
-	moref := &types.ManagedObjectReference{
-		Type:  vchIDType,
-		Value: id,
-	}
-	ref, err := d.session.Finder.ObjectReference(d.ctx, *moref)
-	if err != nil {
-		if !isManagedObjectNotFoundError(err) {
-			err = errors.Errorf("Failed to query appliance (%q): %s", moref, err)
-			return nil, err
-		}
-		log.Debugf("Appliance is not found")
-		return nil, fmt.Errorf("id %q could not be found", id)
-	}
-	ovm, ok := ref.(*object.VirtualMachine)
-	if !ok {
-		log.Errorf("Failed to find VM %q: %s", moref, err)
-		return nil, err
-	}
-	vmm = vm.NewVirtualMachine(d.ctx, d.session, ovm.Reference())
-
-	// check if it's VCH
-	if ok, err = d.isVCH(vmm); err != nil {
-		log.Error(err)
-		return nil, err
-	}
-	if !ok {
-		err = errors.Errorf("Not a VCH")
-		log.Error(err)
-		return nil, err
-	}
-	pool, err := vmm.ResourcePool(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get VM parent resource pool: %s", err)
-		return nil, err
-	}
-
-	rp := compute.NewResourcePool(d.ctx, d.session, pool.Reference())
-	if d.session.Cluster, err = rp.GetCluster(d.ctx); err != nil {
-		log.Debugf("Unable to get the cluster for the VCH's resource pool: %s", err)
-	}
-
-	d.InitDiagnosticLogsFromVCH(vmm)
-	return vmm, nil
-}
-
-func (d *Dispatcher) NewVCHFromComputePath(computePath string, name string, v *validate.Validator) (*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("path %q, name %q", computePath, name)))
-
-	var err error
-
-	parent, err := v.ResourcePoolHelper(d.ctx, computePath)
-	if err != nil {
-		return nil, err
-	}
-	d.vchPoolPath = path.Join(parent.InventoryPath, name)
-	var vchPool *object.ResourcePool
-	if d.isVC {
-		vapp, err := d.findVirtualApp(d.vchPoolPath)
-		if err != nil {
-			log.Errorf("Failed to get VCH virtual app %q: %s", d.vchPoolPath, err)
-			return nil, err
-		}
-		if vapp != nil {
-			vchPool = vapp.ResourcePool
-		}
-	}
-	if vchPool == nil {
-		vchPool, err = d.session.Finder.ResourcePool(d.ctx, d.vchPoolPath)
-		if err != nil {
-			log.Errorf("Failed to get VCH resource pool %q: %s", d.vchPoolPath, err)
-			return nil, err
-		}
-	}
-
-	rp := compute.NewResourcePool(d.ctx, d.session, vchPool.Reference())
-
-	if d.session.Cluster, err = rp.GetCluster(d.ctx); err != nil {
-		log.Debugf("Unable to get the cluster for the VCH's resource pool: %s", err)
-	}
-
-	var vmm *vm.VirtualMachine
-	if vmm, err = rp.GetChildVM(d.ctx, d.session, name); err != nil {
-		log.Errorf("Failed to get VCH VM: %s", err)
-		return nil, err
-	}
-	if vmm == nil {
-		err = errors.Errorf("Didn't find VM %q in resource pool %q", name, rp.Reference())
-		log.Error(err)
-		return nil, err
-	}
-	vmm.InventoryPath = path.Join(d.vchPoolPath, name)
-
-	// check if it's VCH
-	var ok bool
-	if ok, err = d.isVCH(vmm); err != nil {
-		log.Error(err)
-		return nil, err
-	}
-	if !ok {
-		err = errors.Errorf("Not a VCH")
-		log.Error(err)
-		return nil, err
-	}
-	d.InitDiagnosticLogsFromVCH(vmm)
-	return vmm, nil
-}
-
-// GetVCHConfig queries VCH configuration and decrypts secret information
-func (d *Dispatcher) GetVCHConfig(vm *vm.VirtualMachine) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	//this is the appliance vm
-	mapConfig, err := vm.FetchExtraConfigBaseOptions(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to get VM extra config of %q: %s", vm.Reference(), err)
-		log.Error(err)
-		return nil, err
-	}
-
-	kv := vmomi.OptionValueMap(mapConfig)
-	vchConfig, err := d.decryptVCHConfig(vm, kv)
-	if err != nil {
-		err = errors.Errorf("Failed to decode VM configuration %q: %s", vm.Reference(), err)
-		log.Error(err)
-		return nil, err
-	}
-
-	if vchConfig.IsCreating() {
-		vmRef := vm.Reference()
-		vchConfig.SetMoref(&vmRef)
-	}
-	return vchConfig, nil
-}
-
-// GetNoSecretVCHConfig queries vch configure from vm configuration, without decrypting secret information
-// this method is used to accommodate old vch version without secret information
-func (d *Dispatcher) GetNoSecretVCHConfig(vm *vm.VirtualMachine) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	//this is the appliance vm
-	mapConfig, err := vm.FetchExtraConfigBaseOptions(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to get VM extra config of %q: %s", vm.Reference(), err)
-		log.Error(err)
-		return nil, err
-	}
-
-	kv := vmomi.OptionValueMap(mapConfig)
-	vchConfig := &config.VirtualContainerHostConfigSpec{}
-	extraconfig.Decode(extraconfig.MapSource(kv), vchConfig)
-
-	if vchConfig.IsCreating() {
-		vmRef := vm.Reference()
-		vchConfig.SetMoref(&vmRef)
-	}
-	return vchConfig, nil
-}
-
-// FetchAndMigrateVCHConfig queries VCH guestinfo, and try to migrate older version data to latest if the data is old
-func (d *Dispatcher) FetchAndMigrateVCHConfig(vm *vm.VirtualMachine) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-
-	//this is the appliance vm
-	mapConfig, err := vm.FetchExtraConfigBaseOptions(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to get VM extra config of %q: %s", vm.Reference(), err)
-		return nil, err
-	}
-
-	kv := vmomi.OptionValueMap(mapConfig)
-	newMap, migrated, err := migration.MigrateApplianceConfig(d.ctx, d.session, kv)
-	if err != nil {
-		err = errors.Errorf("Failed to migrate config of %q: %s", vm.Reference(), err)
-		return nil, err
-	}
-	if !migrated {
-		log.Debugf("No need to migrate configuration for %q", vm.Reference())
-	}
-	return d.decryptVCHConfig(vm, newMap)
-}
-
-func (d *Dispatcher) SearchVCHs(computePath string) ([]*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(computePath))
-	if computePath != "" {
-		return d.searchVCHsFromComputePath(computePath)
-	}
-	if d.session.Datacenter != nil {
-		return d.searchVCHsPerDC(d.session.Datacenter)
-	}
-	dcs, err := d.session.Finder.DatacenterList(d.ctx, "*")
-	if err != nil {
-		err = errors.Errorf("Failed to get datacenter list: %s", err)
-		return nil, err
-	}
-
-	var vchs []*vm.VirtualMachine
-	for _, dc := range dcs {
-		dcVCHs, err := d.searchVCHsPerDC(dc)
-		if err != nil {
-			return nil, err
-		}
-		vchs = append(vchs, dcVCHs...)
-	}
-	return vchs, nil
-}
-
-// searchVCHsFromComputePath searches for VCHs in all child ResourcePools under computePath.
-// The computePath can itself be a ResourcePool, ComputeResource or ClusterComputeResource.
-func (d *Dispatcher) searchVCHsFromComputePath(computePath string) ([]*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(computePath))
-
-	pools, err := d.session.Finder.ResourcePoolList(d.ctx, path.Join(computePath, "..."))
-	if err != nil {
-		if _, ok := err.(*find.NotFoundError); ok {
-			return nil, nil
-		}
-	}
-
-	var vchs []*vm.VirtualMachine
-	for _, pool := range pools {
-		children, err := d.getChildVCHs(pool, true)
-		if err != nil {
-			return nil, err
-		}
-		vchs = append(vchs, children...)
-	}
-	return vchs, nil
-}
-
-func (d *Dispatcher) searchVCHsPerDC(dc *object.Datacenter) ([]*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(dc.InventoryPath))
-
-	var err error
-	var pools []*object.ResourcePool
-
-	d.session.Datacenter = dc
-	d.session.Finder.SetDatacenter(dc)
-
-	var vchs []*vm.VirtualMachine
-	if pools, err = d.session.Finder.ResourcePoolList(d.ctx, "*"); err != nil {
-		if _, ok := err.(*find.NotFoundError); ok {
-			return vchs, nil
-		}
-		err = errors.Errorf("Failed to search resource pools for datacenter %q: %s", dc.InventoryPath, err)
-		return nil, err
-	}
-
-	for _, pool := range pools {
-		children, err := d.getChildVCHs(pool, true)
-		if err != nil {
-			return nil, err
-		}
-		vchs = append(vchs, children...)
-	}
-	return vchs, nil
-}
-
-// getVCHs will check vm with same name under this resource pool, to see if that's VCH vm, and it will also check children vApp, to see if that's a VCH.
-// eventually return all fond VCH VMs
-func (d *Dispatcher) getChildVCHs(pool *object.ResourcePool, searchVapp bool) ([]*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(pool.InventoryPath))
-
-	// check if pool itself contains VCH vm.
-	var vchs []*vm.VirtualMachine
-	poolName := pool.Name()
-	computeResource := compute.NewResourcePool(d.ctx, d.session, pool.Reference())
-	vmm, err := computeResource.GetChildVM(d.ctx, d.session, poolName)
-	if err != nil {
-		return nil, errors.Errorf("Failed to query children VM in resource pool %q: %s", pool.InventoryPath, err)
-	}
-	if vmm != nil {
-		vmm.InventoryPath = path.Join(pool.InventoryPath, poolName)
-		// #nosec: Errors unhandled.
-		if ok, _ := d.isVCH(vmm); ok {
-			log.Debugf("%q is VCH", vmm.InventoryPath)
-			vchs = append(vchs, vmm)
-		}
-	}
-
-	if !searchVapp {
-		return vchs, nil
-	}
-
-	vappPath := path.Join(pool.InventoryPath, "*")
-	vapps, err := d.session.Finder.VirtualAppList(d.ctx, vappPath)
-	if err != nil {
-		if _, ok := err.(*find.NotFoundError); ok {
-			return vchs, nil
-		}
-		log.Debugf("Failed to query vapp %q: %s", vappPath, err)
-	}
-	for _, vapp := range vapps {
-		childVCHs, err := d.getChildVCHs(vapp.ResourcePool, false)
-		if err != nil {
-			return nil, err
-		}
-		vchs = append(vchs, childVCHs...)
-	}
-	return vchs, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/finder_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/finder_test.go
deleted file mode 100644
index cfc060dacc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/finder_test.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"path"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-)
-
-func TestFinder(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-	ctx := context.Background()
-
-	for i, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		t.Logf("%d", i)
-		defer model.Remove()
-		if i == 1 {
-			model.Datacenter = 2
-			model.Cluster = 2
-			model.Host = 2
-			model.Pool = 0
-		}
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		s.URL.User = url.UserPassword("user", "pass")
-		s.URL.Path = ""
-		t.Logf("server URL: %s", s.URL)
-
-		var input *data.Data
-		if i == 0 {
-			input = getESXData(s.URL)
-		} else {
-			input = getVPXData(s.URL)
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		validator, err := validate.NewValidator(ctx, input)
-		if err != nil {
-			t.Errorf("Failed to create validator: %s", err)
-		}
-		if _, err = validator.ValidateTarget(ctx, input); err != nil {
-			t.Logf("Got expected error to validate target: %s", err)
-		}
-		validator.AllowEmptyDC()
-		if _, err = validator.ValidateTarget(ctx, input); err != nil {
-			t.Errorf("Failed to valiate target: %s", err)
-		}
-		prefix := fmt.Sprintf("p%d-", i)
-		if err = createTestData(ctx, validator.Session, prefix); err != nil {
-			t.Errorf("Failed to create test data: %s", err)
-		}
-
-		found := testSearchVCHs(t, validator, false)
-		if found != 0 {
-			t.Errorf("found %d VCHs, expected %d", found, 0)
-		}
-
-		found = testSearchVCHs(t, validator, true)
-		expect := 1 // 1 VCH per Resource pool
-		if model.Host != 0 {
-			expect *= (model.Host + model.Cluster) * 2
-		}
-		if found != expect {
-			t.Errorf("found %d VCHs, expected %d", found, expect)
-		}
-	}
-}
-
-func testSearchVCHs(t *testing.T, v *validate.Validator, expect bool) int {
-	d := &Dispatcher{
-		session: v.Session,
-		ctx:     v.Context,
-		isVC:    v.Session.IsVC(),
-	}
-
-	if expect {
-		// Add guestinfo so isVCH() returns true for all VMs
-		vms, err := d.session.Finder.VirtualMachineList(d.ctx, "/...")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		for _, vm := range vms {
-			ref := vm.Reference()
-			svm := simulator.Map.Get(ref).(*simulator.VirtualMachine)
-
-			svm.Config.ExtraConfig = []types.BaseOptionValue{&types.OptionValue{
-				Key:   extraconfig.DefaultGuestInfoPrefix + "/init/common/id",
-				Value: ref.String(),
-			}}
-		}
-	} else {
-		_, err := d.SearchVCHs("enoent") // NotFound
-		if err != nil {
-			t.Error(err)
-		}
-
-		n, err := d.SearchVCHs("/")
-		if err != nil {
-			t.Error(err)
-		}
-
-		if len(n) != 0 {
-			t.Errorf("unexpected: %d", len(n))
-		}
-	}
-
-	vchs, err := d.SearchVCHs("")
-	if err != nil {
-		t.Errorf("Failed to search vchs: %s", err)
-	}
-	n := len(vchs)
-	t.Logf("Found %d VCHs without a compute-path", n)
-	nexpect := 1
-	if d.isVC {
-		nexpect = 2 // 1 for the top-level vApp, VC only
-	}
-
-	for _, vm := range vchs {
-		// Find with --compute-resource
-		// The VM HostSystem's parent will be a cluster or standalone compute resource
-		host, err := vm.HostSystem(d.ctx)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		c := property.DefaultCollector(vm.VirtualMachine.Client())
-		var me mo.ManagedEntity
-
-		err = c.RetrieveOne(d.ctx, host.Reference(), []string{"parent"}, &me)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		obj, err := d.session.Finder.Element(d.ctx, *me.Parent)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		name := path.Base(obj.Path)
-
-		paths := []string{
-			obj.Path,             // "/dc1/cluster1"
-			name,                 // "cluster1"
-			path.Join(".", name), // "./cluster1"
-		}
-
-		for _, path := range paths {
-			vchs, err := d.SearchVCHs(path)
-			if err != nil {
-				t.Errorf("SearchVCHs(%s): %s", path, err)
-			}
-
-			if len(vchs) != nexpect {
-				t.Errorf("Found %d VCHs with compute-path=%s", len(vchs), path)
-			}
-		}
-	}
-
-	return n
-}
-
-func createTestData(ctx context.Context, sess *session.Session, prefix string) error {
-	dcs, err := sess.Finder.DatacenterList(ctx, "*")
-	if err != nil {
-		return err
-	}
-	kind := rpNode
-	if sess.IsVC() {
-		kind = vappNode
-	}
-	for _, dc := range dcs {
-		sess.Config.DatacenterPath = dc.InventoryPath
-		sess.Populate(ctx)
-
-		resources := &Node{
-			Kind: rpNode,
-			Name: prefix + "Root",
-			Children: []*Node{
-				{
-					Kind: rpNode,
-					Name: prefix + "pool1",
-					Children: []*Node{
-						{
-							Kind: vmNode,
-							Name: prefix + "pool1",
-						},
-						{
-							Kind: rpNode,
-							Name: prefix + "pool1-2",
-							Children: []*Node{
-								{
-									Kind: kind,
-									Name: prefix + "pool1-2-1",
-									Children: []*Node{
-										{
-											Kind: vmNode,
-											Name: prefix + "vch1-2-1",
-										},
-									},
-								},
-							},
-						},
-					},
-				},
-				{
-					Kind: vmNode,
-					Name: prefix + "vch2",
-				},
-			},
-		}
-		if err = createResources(ctx, sess, resources); err != nil {
-			return err
-		}
-		if sess.IsVC() {
-			// Test with a top-level VApp
-			vapp := &Node{
-				Kind: vappNode,
-				Name: prefix + "VApp",
-			}
-			if err = createResources(ctx, sess, vapp); err != nil {
-				return err
-			}
-		}
-	}
-	return nil
-}
-
-type nodeKind string
-
-const (
-	vmNode   = nodeKind("VM")
-	rpNode   = nodeKind("RP")
-	vappNode = nodeKind("VAPP")
-)
-
-type Node struct {
-	Kind     nodeKind
-	Name     string
-	Children []*Node
-}
-
-func createResources(ctx context.Context, sess *session.Session, node *Node) error {
-	rootPools, err := sess.Finder.ResourcePoolList(ctx, "Resources")
-	if err != nil {
-		return err
-	}
-	for _, pool := range rootPools {
-		base := path.Base(path.Dir(pool.InventoryPath))
-		log.Debugf("root pool base name %q", base)
-		if err = createNodes(ctx, sess, pool, node, base); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func createNodes(ctx context.Context, sess *session.Session, pool *object.ResourcePool, node *Node, base string) error {
-	log.Debugf("create node %+v", node)
-	if node == nil {
-		return nil
-	}
-	spec := types.DefaultResourceConfigSpec()
-	node.Name = fmt.Sprintf("%s-%s", base, node.Name)
-	switch node.Kind {
-	case rpNode:
-		child, err := pool.Create(ctx, node.Name, spec)
-		if err != nil {
-			return err
-		}
-		for _, childNode := range node.Children {
-			return createNodes(ctx, sess, child, childNode, base)
-		}
-	case vappNode:
-		confSpec := simulator.NewVAppConfigSpec()
-		vapp, err := pool.CreateVApp(ctx, node.Name, spec, confSpec, nil)
-		if err != nil {
-			return err
-		}
-		config := types.VirtualMachineConfigSpec{
-			Name:    node.Name,
-			GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-			Files: &types.VirtualMachineFileInfo{
-				VmPathName: fmt.Sprintf("[LocalDS_0] %s", node.Name),
-			},
-		}
-		if _, err = tasks.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-			return vapp.CreateChildVM(ctx, config, nil)
-		}); err != nil {
-			return err
-		}
-	case vmNode:
-		config := types.VirtualMachineConfigSpec{
-			Name:    node.Name,
-			GuestId: string(types.VirtualMachineGuestOsIdentifierOtherGuest),
-			Files: &types.VirtualMachineFileInfo{
-				VmPathName: fmt.Sprintf("[LocalDS_0] %s", node.Name),
-			},
-		}
-		if _, err := tasks.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-			return sess.VMFolder.CreateVM(ctx, config, pool, nil)
-		}); err != nil {
-			return err
-		}
-	default:
-		return nil
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/inspect.go b/installer/vendor/github.com/vmware/vic/lib/install/management/inspect.go
deleted file mode 100644
index a07b87c0d4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/inspect.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/user"
-	"path/filepath"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/docker/docker/opts"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/certificate"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func (d *Dispatcher) InspectVCH(vch *vm.VirtualMachine, conf *config.VirtualContainerHostConfigSpec, certPath string) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	state, err := vch.PowerState(d.ctx)
-	if err != nil {
-		log.Errorf("Failed to get VM power state, service might not be available at this moment.")
-	}
-	if state != types.VirtualMachinePowerStatePoweredOn {
-		err = errors.Errorf("VCH is not powered on, state %s", state)
-		log.Errorf("%s", err)
-		return err
-	}
-
-	var clientIP net.IP
-	var publicIP net.IP
-
-	clientNet := conf.ExecutorConfig.Networks["client"]
-	if clientNet != nil {
-		clientIP = clientNet.Assigned.IP
-	}
-	publicNet := conf.ExecutorConfig.Networks["public"]
-	if publicNet != nil {
-		publicIP = publicNet.Assigned.IP
-	}
-
-	if ip.IsUnspecifiedIP(clientIP) {
-		err = errors.Errorf("No client IP address assigned")
-		log.Errorf("%s", err)
-		return err
-	}
-
-	if ip.IsUnspecifiedIP(publicIP) {
-		err = errors.Errorf("No public IP address assigned")
-		log.Errorf("%s", err)
-		return err
-	}
-
-	d.HostIP = clientIP.String()
-	log.Debugf("IP address for client interface: %s", d.HostIP)
-	if !conf.HostCertificate.IsNil() {
-		d.DockerPort = fmt.Sprintf("%d", opts.DefaultTLSHTTPPort)
-	} else {
-		d.DockerPort = fmt.Sprintf("%d", opts.DefaultHTTPPort)
-	}
-
-	// try looking up preferred name, irrespective of CAs
-	if cert, err := conf.HostCertificate.X509Certificate(); err == nil {
-		// #nosec: Errors unhandled.
-		name, _ := viableHostAddress([]net.IP{clientIP}, cert, conf.CertificateAuthorities)
-		if name != "" {
-			log.Debugf("Retrieved proposed name from host certificate: %q", name)
-			log.Debugf("Assigning first name from set: %s", name)
-
-			if name != d.HostIP {
-				log.Infof("Using address from host certificate over allocated IP: %s", d.HostIP)
-				// reassign
-				d.HostIP = name
-			}
-		} else {
-			log.Warnf("Unable to identify address acceptable to host certificate")
-		}
-	} else {
-		log.Debugf("No host certificates provided")
-	}
-
-	// Check for valid client cert for a tls-verify configuration
-	if len(conf.CertificateAuthorities) > 0 {
-		possibleCertPaths := findCertPaths(conf.Name, certPath)
-
-		// Check if a valid client cert exists in one of possibleCertPaths
-		certPath = ""
-		for _, path := range possibleCertPaths {
-			certFile := filepath.Join(path, certificate.ClientCert)
-			keyFile := filepath.Join(path, certificate.ClientKey)
-			ckp := certificate.NewKeyPair(certFile, keyFile, nil, nil)
-			if err = ckp.LoadCertificate(); err != nil {
-				log.Debugf("Unable to load client cert in %s: %s", path, err)
-				continue
-			}
-
-			if _, err = certificate.VerifyClientCert(conf.CertificateAuthorities, ckp); err != nil {
-				log.Debugf(err.Error())
-				continue
-			}
-
-			certPath = path
-			break
-		}
-	}
-
-	d.ShowVCH(conf, "", "", "", "", certPath)
-	return nil
-}
-
-// findCertPaths returns candidate paths for client certs depending on whether
-// a certPath was specified in the CLI.
-func findCertPaths(vchName, certPath string) []string {
-	var possibleCertPaths []string
-
-	if certPath != "" {
-		log.Infof("--tls-cert-path supplied - only checking for certs in %s/", certPath)
-		possibleCertPaths = append(possibleCertPaths, certPath)
-		return possibleCertPaths
-	}
-
-	possibleCertPaths = append(possibleCertPaths, vchName, ".")
-	logMsg := fmt.Sprintf("--tls-cert-path not supplied - checking for certs in current directory, %s/", vchName)
-
-	dockerConfPath := ""
-	user, err := user.Current()
-	if err == nil {
-		dockerConfPath = filepath.Join(user.HomeDir, ".docker")
-		possibleCertPaths = append(possibleCertPaths, dockerConfPath)
-		logMsg = fmt.Sprintf("%s and %s/", logMsg, dockerConfPath)
-	}
-	log.Infof(logMsg)
-
-	return possibleCertPaths
-}
-
-func (d *Dispatcher) ShowVCH(conf *config.VirtualContainerHostConfigSpec, key string, cert string, cacert string, envfile string, certpath string) {
-	if d.sshEnabled {
-		log.Infof("")
-		log.Infof("SSH to appliance:")
-		log.Infof("ssh root@%s", d.HostIP)
-	}
-
-	log.Infof("")
-	log.Infof("VCH Admin Portal:")
-	log.Infof("https://%s:2378", d.HostIP)
-
-	log.Infof("")
-	publicIP := conf.ExecutorConfig.Networks["public"].Assigned.IP
-	log.Infof("Published ports can be reached at:")
-	log.Infof("%s", publicIP.String())
-
-	cmd, env := d.GetDockerAPICommand(conf, key, cert, cacert, certpath)
-
-	log.Info("")
-	log.Infof("Docker environment variables:")
-	log.Info(env)
-
-	if envfile != "" {
-		if err := ioutil.WriteFile(envfile, []byte(env), 0644); err == nil {
-			log.Infof("")
-			log.Infof("Environment saved in %s", envfile)
-		}
-	}
-
-	log.Infof("")
-	log.Infof("Connect to docker:")
-	log.Infof(cmd)
-}
-
-// GetDockerAPICommand generates values to display for usage of a deployed VCH
-func (d *Dispatcher) GetDockerAPICommand(conf *config.VirtualContainerHostConfigSpec, key string, cert string, cacert string, certpath string) (cmd, env string) {
-	var dEnv []string
-	tls := ""
-
-	if d.HostIP == "" {
-		return "", ""
-	}
-
-	if !conf.HostCertificate.IsNil() {
-		// if we're generating then there's no CA currently
-		if len(conf.CertificateAuthorities) > 0 {
-			// find the name to use
-			if key != "" {
-				tls = fmt.Sprintf(" --tlsverify --tlscacert=%q --tlscert=%q --tlskey=%q", cacert, cert, key)
-			} else {
-				tls = fmt.Sprintf(" --tlsverify")
-			}
-
-			dEnv = append(dEnv, "DOCKER_TLS_VERIFY=1")
-			info, err := os.Stat(certpath)
-			if err == nil && info.IsDir() {
-				if abs, err := filepath.Abs(info.Name()); err == nil {
-					dEnv = append(dEnv, fmt.Sprintf("DOCKER_CERT_PATH=%s", abs))
-				}
-			} else {
-				log.Infof("")
-				log.Warnf("Unable to find valid client certs")
-				log.Warnf("DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments")
-			}
-		} else {
-			tls = " --tls"
-		}
-	}
-	dEnv = append(dEnv, fmt.Sprintf("DOCKER_HOST=%s:%s", d.HostIP, d.DockerPort))
-
-	cmd = fmt.Sprintf("docker -H %s:%s%s info", d.HostIP, d.DockerPort, tls)
-	env = strings.Join(dEnv, " ")
-
-	return cmd, env
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/inspect_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/inspect_test.go
deleted file mode 100644
index 850009145d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/inspect_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestFindCertPaths(t *testing.T) {
-	vchName := "vch-foo"
-
-	// NOTE: not checking for dockerConfPath since $HOME is dependent on the user
-	// running the test
-	possiblePaths := map[string]bool{
-		vchName: false,
-		".":     false,
-	}
-
-	// Get paths when an input certPath is not specified
-	paths := findCertPaths(vchName, "")
-	assert.True(t, len(paths) >= 2)
-	for i := range paths {
-		possiblePaths[paths[i]] = true
-	}
-	assert.True(t, possiblePaths[vchName])
-	assert.True(t, possiblePaths["."])
-
-	// Get paths when an input certPath is specified
-	paths = findCertPaths(vchName, "foopath")
-	for i := range paths {
-		possiblePaths[paths[i]] = true
-	}
-	assert.True(t, len(paths) == 1)
-	assert.True(t, possiblePaths["foopath"])
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/network.go b/installer/vendor/github.com/vmware/vic/lib/install/management/network.go
deleted file mode 100644
index 84883e9f17..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/network.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"fmt"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func (d *Dispatcher) createBridgeNetwork(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-
-	// if the bridge network is already extant there's nothing to do
-	bnet := conf.ExecutorConfig.Networks[conf.BridgeNetwork]
-	if bnet != nil && bnet.ID != "" {
-		return nil
-	}
-
-	// network didn't exist during validation given we don't have a moref, so create it
-	if d.session.Client.IsVC() {
-		// double check
-		return errors.New("bridge network must already exist for vCenter environments")
-	}
-
-	// in this case the name to use is held in container network ID
-	name := bnet.Network.ID
-
-	log.Infof("Creating VirtualSwitch")
-	hostNetSystem, err := d.session.Host.ConfigManager().NetworkSystem(d.ctx)
-	if err != nil {
-		err = errors.Errorf("Failed to retrieve host network system: %s", err)
-		return err
-	}
-
-	if err = hostNetSystem.AddVirtualSwitch(d.ctx, name, &types.HostVirtualSwitchSpec{
-		NumPorts: 1024,
-	}); err != nil {
-		err = errors.Errorf("Failed to add virtual switch (%q): %s", name, err)
-		return err
-	}
-
-	log.Infof("Creating Portgroup")
-	if err = hostNetSystem.AddPortGroup(d.ctx, types.HostPortGroupSpec{
-		Name:        name,
-		VlanId:      1, // TODO: expose this for finer grained grouping within the switch
-		VswitchName: name,
-		Policy:      types.HostNetworkPolicy{},
-	}); err != nil {
-		err = errors.Errorf("Failed to add port group (%q): %s", name, err)
-		return err
-	}
-
-	net, err := d.session.Finder.Network(d.ctx, name)
-	if err != nil {
-		_, ok := err.(*find.NotFoundError)
-		if !ok {
-			err = errors.Errorf("Failed to query virtual switch (%q): %s", name, err)
-			return err
-		}
-	}
-
-	// assign the moref to the bridge network config on the appliance
-	bnet.ID = net.Reference().String()
-	bnet.Network.ID = net.Reference().String()
-	conf.CreateBridgeNetwork = true
-	log.Debugf("Created portgroup %q: %s", name, net)
-	return nil
-}
-
-func (d *Dispatcher) removeNetwork(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(conf.Name))
-
-	if d.session.IsVC() {
-		log.Debugf("Remove network is not supported for vCenter")
-		return nil
-	}
-	if !conf.CreateBridgeNetwork {
-		log.Infof("Bridge network was not created during VCH deployment, leaving it there")
-		return nil
-	}
-
-	br := conf.ExecutorConfig.Networks["bridge"]
-	if br == nil {
-		return fmt.Errorf("Bridge Network ID is unknown")
-	}
-	name := br.Network.ID
-	log.Debugf("Remove bridge network based on %s", name)
-
-	moref := types.ManagedObjectReference{}
-	ok := moref.FromString(name)
-	if !ok {
-		return fmt.Errorf("Unable to delete port group - failed to get moref from: %q", name)
-	}
-
-	net, err := d.session.Finder.ObjectReference(d.ctx, moref)
-	if err != nil {
-		return fmt.Errorf("Unable to delete port group - failed to find network from: %q", name)
-	}
-	log.Debugf("Delete bridge network: %s", net)
-
-	netw, ok := net.(*object.Network)
-	if !ok {
-		log.Errorf("Expected Network Type, got %#v", net)
-		return fmt.Errorf("Failed to get network for %q", moref)
-	}
-	pgName := netw.Name()
-
-	hostNetSystem, err := d.session.Host.ConfigManager().NetworkSystem(d.ctx)
-	if err != nil {
-		return err
-	}
-
-	log.Infof("Removing Portgroup %q", pgName)
-	err = hostNetSystem.RemovePortGroup(d.ctx, pgName)
-	if err != nil {
-		return err
-	}
-
-	log.Infof("Removing VirtualSwitch %q", pgName)
-	err = hostNetSystem.RemoveVirtualSwitch(d.ctx, pgName)
-	if err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/rbac.go b/installer/vendor/github.com/vmware/vic/lib/install/management/rbac.go
deleted file mode 100644
index 31c0e20b68..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/rbac.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-)
-
-const (
-	VCenter = iota
-	Datacenter
-	Cluster
-	DatastoreFolder
-	Datastore
-	VSANDatastore
-	Network
-	Endpoint
-)
-
-type AuthzManager struct {
-	authzManager *object.AuthorizationManager
-	client       *vim25.Client
-	vchConfig    *config.VirtualContainerHostConfigSpec
-	principal    string
-}
-
-type RBACResource struct {
-	Type      int8
-	Propagate bool
-	Role      types.AuthorizationRole
-}
-
-type RBACConfig struct {
-	Resources []RBACResource
-}
-
-type PermissionList []types.Permission
-
-var rolePrefix = "vic-vch-"
-
-var RoleVCenter = types.AuthorizationRole{
-	Name: "vcenter",
-	Privilege: []string{
-		"Datastore.Config",
-	},
-}
-
-var RoleDataCenter = types.AuthorizationRole{
-	Name: "datacenter",
-	Privilege: []string{
-		"Datastore.Config",
-		"Datastore.FileManagement",
-	},
-}
-
-var RoleDataStore = types.AuthorizationRole{
-	Name: "datastore",
-	Privilege: []string{
-		"Datastore.AllocateSpace",
-		"Datastore.Browse",
-		"Datastore.Config",
-		"Datastore.DeleteFile",
-		"Datastore.FileManagement",
-		"Host.Config.SystemManagement",
-	},
-}
-
-var RoleNetwork = types.AuthorizationRole{
-	Name: "network",
-	Privilege: []string{
-		"Network.Assign",
-	},
-}
-
-var RoleEndpoint = types.AuthorizationRole{
-	Name: "endpoint",
-	Privilege: []string{
-		"DVPortgroup.Create",
-		"DVPortgroup.Delete",
-		"DVPortgroup.Modify",
-		"DVPortgroup.PolicyOp",
-		"DVPortgroup.ScopeOp",
-		"Resource.AssignVMToPool",
-		"VirtualMachine.Config.AddNewDisk",
-		"VirtualMachine.Config.AdvancedConfig",
-		"VirtualMachine.Config.EditDevice",
-		"VirtualMachine.Config.RemoveDisk",
-		"VirtualMachine.GuestOperations.Execute",
-		"VirtualMachine.Interact.DeviceConnection",
-		"VirtualMachine.Interact.PowerOff",
-		"VirtualMachine.Interact.PowerOn",
-		"VirtualMachine.Inventory.Create",
-		"VirtualMachine.Inventory.Delete",
-		"VirtualMachine.Inventory.Register",
-		"VirtualMachine.Inventory.Unregister",
-	},
-}
-
-var RBACConf = RBACConfig{
-	Resources: []RBACResource{
-		{
-			Type:      VCenter,
-			Propagate: false,
-			Role:      RoleVCenter,
-		},
-		{
-			Type:      Datacenter,
-			Propagate: false,
-			Role:      RoleDataCenter,
-		},
-		{
-			Type:      Cluster,
-			Propagate: true,
-			Role:      RoleDataStore,
-		},
-		{
-			Type:      DatastoreFolder,
-			Propagate: true,
-			Role:      RoleDataStore,
-		},
-		{
-			Type:      Datastore,
-			Propagate: true,
-			Role:      RoleDataStore,
-		},
-		{
-			Type:      VSANDatastore,
-			Propagate: false,
-			Role:      RoleDataStore,
-		},
-		{
-			Type:      Network,
-			Propagate: false,
-			Role:      RoleNetwork,
-		},
-		{
-			Type:      Endpoint,
-			Propagate: true,
-			Role:      RoleEndpoint,
-		},
-	},
-}
-
-func NewAuthzManager(ctx context.Context, client *vim25.Client, principal string) *AuthzManager {
-	authManager := object.NewAuthorizationManager(client)
-	mgr := &AuthzManager{
-		client:       client,
-		authzManager: authManager,
-		principal:    principal,
-	}
-	return mgr
-}
-
-func (am *AuthzManager) CreateRoles(ctx context.Context) (int, error) {
-	return am.createOrRepairRoles(ctx, getTargetRoles())
-}
-
-func (am *AuthzManager) DeleteRoles(ctx context.Context) (int, error) {
-	return am.deleteRoles(ctx, getTargetRoles())
-}
-
-func (am *AuthzManager) RoleList(ctx context.Context) (object.AuthorizationRoleList, error) {
-	return am.getRoleList(ctx)
-}
-
-func (am *AuthzManager) createOrRepairRoles(ctx context.Context, targetRoles []types.AuthorizationRole) (int, error) {
-	// Get all the existing roles
-	mgr := am.authzManager
-	roleList, err := mgr.RoleList(ctx)
-	if err != nil {
-		return 0, err
-	}
-
-	var count int
-	for _, targetRole := range targetRoles {
-		foundRole := roleList.ByName(targetRole.Name)
-		if foundRole != nil {
-			isMod, err := am.checkAndRepairRole(ctx, &targetRole, foundRole)
-			if isMod && err == nil {
-				count++
-			}
-		} else {
-			_, err = mgr.AddRole(ctx, targetRole.Name, targetRole.Privilege)
-			if err == nil {
-				count++
-			}
-		}
-		if err != nil {
-			return count, err
-		}
-	}
-	return count, nil
-}
-
-func (am *AuthzManager) deleteRoles(ctx context.Context, targetRoles []types.AuthorizationRole) (int, error) {
-	mgr := am.authzManager
-	// Get all the existing roles
-	roleList, err := mgr.RoleList(ctx)
-	if err != nil {
-		return 0, err
-	}
-
-	var count int
-	for _, targetRole := range targetRoles {
-		foundRole := roleList.ByName(targetRole.Name)
-		if foundRole != nil {
-			err = mgr.RemoveRole(ctx, foundRole.RoleId, true)
-			if err == nil {
-				count++
-			}
-		}
-	}
-	return count, nil
-}
-
-func (am *AuthzManager) getRoleList(ctx context.Context) (object.AuthorizationRoleList, error) {
-	return am.authzManager.RoleList(ctx)
-}
-
-func (am *AuthzManager) checkAndRepairRole(ctx context.Context, tRole *types.AuthorizationRole, fRole *types.AuthorizationRole) (bool, error) {
-	mgr := am.authzManager
-	// Check that the privileges list in Target Role is a subset of the list in Found role
-	fSet := make(map[string]bool)
-	for _, p := range fRole.Privilege {
-		fSet[p] = true
-	}
-
-	var isModified bool
-	for _, p := range tRole.Privilege {
-		if _, found := fSet[p]; !found {
-			// Privilege not found
-			// Add it to the found Role
-			fRole.Privilege = append(fRole.Privilege, p)
-			isModified = true
-		}
-	}
-
-	if !isModified {
-		return false, nil
-	}
-
-	// Not a subset need to call go-vmomi to set the new privileges
-	err := mgr.UpdateRole(ctx, fRole.RoleId, fRole.Name, fRole.Privilege)
-
-	return true, err
-}
-
-func getTargetRoles() []types.AuthorizationRole {
-	count := len(RBACConf.Resources)
-	roles := make([]types.AuthorizationRole, 0, count)
-	dSet := make(map[string]bool)
-	for _, resource := range RBACConf.Resources {
-		name := rolePrefix + resource.Role.Name
-		// Discard duplicates
-		if _, found := dSet[name]; !found {
-			role := new(types.AuthorizationRole)
-			*role = resource.Role
-			role.Name = name
-			dSet[name] = true
-			roles = append(roles, *role)
-		}
-	}
-	return roles
-}
-
-func getResource(resourceType int8) *RBACResource {
-	for _, resource := range RBACConf.Resources {
-		if resource.Type == resourceType {
-			return &resource
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/rbac_test.go b/installer/vendor/github.com/vmware/vic/lib/install/management/rbac_test.go
deleted file mode 100644
index 2a8705a6ed..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/rbac_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/require"
-
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-)
-
-func TestRolesSimulatorVPX(t *testing.T) {
-	ctx := context.Background()
-	m := simulator.VPX()
-	defer m.Remove()
-
-	err := m.Create()
-	require.NoError(t, err, "Cannot create VPX Simulator")
-
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	config := &session.Config{
-		Service:   s.URL.String(),
-		Insecure:  true,
-		Keepalive: time.Duration(5) * time.Minute,
-	}
-
-	session, err := session.NewSession(config).Connect(ctx)
-	require.NoError(t, err, "Cannot connect to VPX Simulator")
-
-	mgr := NewAuthzManager(ctx, session.Vim25(), "ops-user")
-
-	doTestRoles(ctx, t, mgr)
-}
-
-func TestRolesVCenter(t *testing.T) {
-	ctx := context.Background()
-
-	config := &session.Config{
-		Service:   env.URL(t),
-		Insecure:  true,
-		Keepalive: time.Duration(5) * time.Minute,
-	}
-
-	session, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.SkipNow()
-	}
-
-	mgr := NewAuthzManager(ctx, session.Vim25(), "ops-user")
-
-	doTestRoles(ctx, t, mgr)
-}
-
-func initRoles(ctx context.Context, t *testing.T, am *AuthzManager, tRoles []types.AuthorizationRole) int {
-	cleanup(ctx, t, am, false)
-
-	count, err := am.createOrRepairRoles(ctx, tRoles)
-	require.NoError(t, err, "Failed to initialize Roles")
-
-	return count
-}
-
-func doTestRoles(ctx context.Context, t *testing.T, am *AuthzManager) {
-	targetRoles := getTargetRoles()
-	var roleCount = len(targetRoles)
-	count := initRoles(ctx, t, am, targetRoles)
-
-	defer cleanup(ctx, t, am, true)
-	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
-
-	// Test correct role validation, it should return 0
-	roleCount = 0
-	count, err := am.createOrRepairRoles(ctx, targetRoles)
-	require.NoError(t, err, "Failed to create roles")
-	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
-
-	// Remove two Privileges from two roles
-	roles, err := am.getRoleList(ctx)
-	fmt.Println(err)
-	fmt.Println(roles)
-
-	targetRoleName1 := rolePrefix + "datastore"
-	targetRoleName2 := rolePrefix + "endpoint"
-
-	for _, role := range roles {
-		if role.Name == targetRoleName1 {
-			removePrivilege(&role, "Datastore.DeleteFile")
-			am.authzManager.UpdateRole(ctx, role.RoleId, role.Name, role.Privilege)
-		}
-		if role.Name == targetRoleName2 {
-			removePrivilege(&role, "VirtualMachine.Config.AddNewDisk")
-			am.authzManager.UpdateRole(ctx, role.RoleId, role.Name, role.Privilege)
-		}
-	}
-
-	// Test
-	roleCount = 2
-	count, err = am.createOrRepairRoles(ctx, targetRoles)
-	require.NoError(t, err, "Failed to repair roles 1")
-	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
-
-	// Test correct role validation, it should return 0
-	roleCount = 0
-	count, err = am.createOrRepairRoles(ctx, targetRoles)
-	require.NoError(t, err, "Failed to repair roles 2")
-	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
-}
-
-func removePrivilege(role *types.AuthorizationRole, privilege string) {
-	for i, priv := range role.Privilege {
-		if priv == privilege {
-			role.Privilege = append(role.Privilege[:i], role.Privilege[i+1:]...)
-			return
-		}
-	}
-}
-
-func cleanup(ctx context.Context, t *testing.T, am *AuthzManager, checkCount bool) {
-	targetRoles := getTargetRoles()
-	var roleCount = len(targetRoles)
-	count, err := am.deleteRoles(ctx, targetRoles)
-	require.NoError(t, err, "Failed to delete roles")
-
-	if checkCount && count != roleCount {
-		t.Fatalf("Incorrect number of roles: expcted %d, actual %d", roleCount, count)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/resource_pool.go b/installer/vendor/github.com/vmware/vic/lib/install/management/resource_pool.go
deleted file mode 100644
index 431dfdf820..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/resource_pool.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"context"
-	"fmt"
-	"path"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func (d *Dispatcher) createResourcePool(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) (*object.ResourcePool, error) {
-	defer trace.End(trace.Begin(""))
-
-	d.vchPoolPath = path.Join(settings.ResourcePoolPath, conf.Name)
-
-	rp, err := d.session.Finder.ResourcePool(d.ctx, d.vchPoolPath)
-	if err != nil {
-		// if we didn't find the resource pool then we will create
-		_, ok := err.(*find.NotFoundError)
-		if !ok {
-			err = errors.Errorf("Failed to query compute resource (%q): %q", d.vchPoolPath, err)
-			return nil, err
-		}
-	} else {
-		conf.ComputeResources = append(conf.ComputeResources, rp.Reference())
-		return rp, nil
-	}
-
-	log.Infof("Creating Resource Pool %q", conf.Name)
-	resSpec := types.DefaultResourceConfigSpec()
-	setResources(&resSpec.CpuAllocation, settings.VCHSize.CPU)
-	setResources(&resSpec.MemoryAllocation, settings.VCHSize.Memory)
-
-	rp, err = d.session.Pool.Create(d.ctx, conf.Name, resSpec)
-	if err != nil {
-		log.Debugf("Failed to create resource pool %q: %s", d.vchPoolPath, err)
-		return nil, err
-	}
-
-	conf.ComputeResources = append(conf.ComputeResources, rp.Reference())
-	return rp, nil
-}
-
-// setResources will modify the resourceAllocation spec with the user provided allocation info
-func setResources(spec *types.ResourceAllocationInfo, resource types.ResourceAllocationInfo) {
-	if resource.Limit != nil {
-		// if no limit is requested then set to -1 for unlimited
-		if *resource.Limit == int64(0) {
-			resource.Limit = types.NewInt64(-1)
-		}
-		spec.Limit = resource.Limit
-	}
-	if resource.Reservation != nil {
-		spec.Reservation = resource.Reservation
-	}
-	if resource.Shares != nil {
-		// were custom shares specified
-		if resource.Shares.Shares != 0 {
-			spec.Shares = resource.Shares
-		} else {
-			// resource shares are zero, so set level to anything except custom
-			if resource.Shares.Level != "custom" {
-				spec.Shares.Level = resource.Shares.Level
-			}
-		}
-
-	}
-	if resource.ExpandableReservation != nil {
-		spec.ExpandableReservation = resource.ExpandableReservation
-	}
-}
-
-func (d *Dispatcher) destroyResourcePoolIfEmpty(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-
-	log.Infof("Removing Resource Pool %q", conf.Name)
-
-	if d.parentResourcepool == nil {
-		log.Warnf("Did not find parent VCH resource pool")
-		return nil
-	}
-	var vms []*vm.VirtualMachine
-	var err error
-	if vms, err = d.parentResourcepool.GetChildrenVMs(d.ctx, d.session); err != nil {
-		err = errors.Errorf("Unable to get children vm of resource pool %q: %s", d.parentResourcepool.Name(), err)
-		return err
-	}
-	if len(vms) != 0 {
-		err = errors.Errorf("Resource pool is not empty: %q", d.parentResourcepool.Name())
-		return err
-	}
-	if _, err := tasks.WaitForResult(d.ctx, func(ctx context.Context) (tasks.Task, error) {
-		return d.parentResourcepool.Destroy(ctx)
-	}); err != nil {
-		return err
-	}
-	return nil
-}
-
-func (d *Dispatcher) findResourcePool(path string) (*object.ResourcePool, error) {
-	defer trace.End(trace.Begin(path))
-	rp, err := d.session.Finder.ResourcePool(d.ctx, path)
-	if err != nil {
-		_, ok := err.(*find.NotFoundError)
-		if !ok {
-			err = errors.Errorf("Failed to query resource pool %q: %s", path, err)
-			return nil, err
-		}
-		return nil, nil
-	}
-	return rp, nil
-}
-
-func (d *Dispatcher) getPoolResourceSettings(pool *object.ResourcePool) (*config.Resources, error) {
-	var p mo.ResourcePool
-	ps := []string{"config.cpuAllocation", "config.memoryAllocation"}
-
-	if err := pool.Properties(d.ctx, pool.Reference(), ps, &p); err != nil {
-		return nil, err
-	}
-
-	res := &config.Resources{
-		CPU:    p.Config.CpuAllocation,
-		Memory: p.Config.MemoryAllocation,
-	}
-	return res, nil
-}
-
-func updateResourcePoolConfig(ctx context.Context, pool *object.ResourcePool, name string, size *config.Resources) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("cpu %#v, memory: %#v", size.CPU, size.Memory)))
-	resSpec := types.DefaultResourceConfigSpec()
-	// update with user provided configuration
-	setResources(&resSpec.CpuAllocation, size.CPU)
-	setResources(&resSpec.MemoryAllocation, size.Memory)
-	return pool.UpdateConfig(ctx, name, &resSpec)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/store_files.go b/installer/vendor/github.com/vmware/vic/lib/install/management/store_files.go
deleted file mode 100644
index 8123bbaf10..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/store_files.go
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	"bytes"
-	"fmt"
-	"path"
-	"sort"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/cmd/vic-machine/common"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/portlayer/storage/vsphere"
-	"github.com/vmware/vic/lib/portlayer/store"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-)
-
-const (
-	volumeRoot = "volumes"
-	dsScheme   = "ds"
-)
-
-func (d *Dispatcher) deleteImages(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-	var errs []string
-
-	log.Infoln("Removing image stores")
-
-	for _, imageDir := range conf.ImageStores {
-		imageDSes, err := d.session.Finder.DatastoreList(d.ctx, imageDir.Host)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		if len(imageDSes) != 1 {
-			errs = append(errs, fmt.Sprintf("Found %d datastores with provided datastore path %s. Provided datastore path must identify exactly one datastore.",
-				len(imageDSes),
-				imageDir.String()))
-
-			continue
-		}
-
-		// delete images subfolder
-		imagePath := path.Join(imageDir.Path, vsphere.StorageParentDir)
-		if _, err = d.deleteDatastoreFiles(imageDSes[0], imagePath, true); err != nil {
-			errs = append(errs, err.Error())
-		}
-
-		// delete kvStores subfolder
-		kvPath := path.Join(imageDir.Path, store.KVStoreFolder)
-		if _, err = d.deleteDatastoreFiles(imageDSes[0], kvPath, true); err != nil {
-			errs = append(errs, err.Error())
-		}
-
-		dsPath, err := datastore.URLtoDatastore(&imageDir)
-		if err != nil {
-			errs = append(errs, err.Error())
-			continue
-		}
-
-		children, err := d.getChildren(imageDSes[0], dsPath)
-		if err != nil {
-			if !types.IsFileNotFound(err) {
-				errs = append(errs, err.Error())
-			}
-			continue
-		}
-
-		if len(children) == 0 {
-			log.Debugf("Removing empty image store parent directory [%s] %s", imageDir.Host, imageDir.Path)
-			if _, err = d.deleteDatastoreFiles(imageDSes[0], imageDir.Path, true); err != nil {
-				errs = append(errs, err.Error())
-			}
-		} else {
-			log.Debugf("Image store parent directory not empty, leaving in place.")
-		}
-	}
-
-	if len(errs) > 0 {
-		return errors.New(strings.Join(errs, "\n"))
-	}
-
-	return nil
-}
-
-func (d *Dispatcher) deleteParent(ds *object.Datastore, root string) (bool, error) {
-	defer trace.End(trace.Begin(""))
-
-	// alway forcing delete images
-	return d.deleteDatastoreFiles(ds, root, true)
-}
-
-func (d *Dispatcher) deleteDatastoreFiles(ds *object.Datastore, path string, force bool) (bool, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("path %q, force %t", path, force)))
-
-	// refuse to delete everything on the datstore, ignore force
-	if path == "" {
-		// #nosec: Errors unhandled.
-		dsn, _ := ds.ObjectName(d.ctx)
-		msg := fmt.Sprintf("refusing to remove datastore files for path \"\" on datastore %q", dsn)
-		return false, errors.New(msg)
-	}
-
-	var empty bool
-	dsPath := ds.Path(path)
-
-	res, err := d.lsFolder(ds, dsPath)
-	if err != nil {
-		if !types.IsFileNotFound(err) {
-			err = errors.Errorf("Failed to browse folder %q: %s", dsPath, err)
-			return empty, err
-		}
-		log.Debugf("Folder %q is not found", dsPath)
-		empty = true
-		return empty, nil
-	}
-	if len(res.File) > 0 && !force {
-		log.Debugf("Folder %q is not empty, leave it there", dsPath)
-		return empty, nil
-	}
-
-	m := ds.NewFileManager(d.session.Datacenter, true)
-	if err = d.deleteFilesIteratively(m, ds, dsPath); err != nil {
-		return empty, err
-	}
-	return true, nil
-}
-
-func (d *Dispatcher) isVSAN(ds *object.Datastore) bool {
-	// #nosec: Errors unhandled.
-	dsType, _ := ds.Type(d.ctx)
-
-	return dsType == types.HostFileSystemVolumeFileSystemTypeVsan
-}
-
-func (d *Dispatcher) deleteFilesIteratively(m *object.DatastoreFileManager, ds *object.Datastore, dsPath string) error {
-	defer trace.End(trace.Begin(dsPath))
-
-	// Get sorted result to make sure children files listed ahead of folder. Then we can empty folder before delete it
-	// This function specifically designed for vSan, as vSan sometimes will throw error to delete folder is the folder is not empty
-	res, err := d.getSortedChildren(ds, dsPath)
-	if err != nil {
-		if !types.IsFileNotFound(err) {
-			err = errors.Errorf("Failed to browse sub folders %q: %s", dsPath, err)
-			return err
-		}
-		log.Debugf("Folder %q is not found", dsPath)
-		return nil
-	}
-
-	for _, path := range res {
-		if err = d.deleteVMFSFiles(m, ds, path); err != nil {
-			return err
-		}
-	}
-	return d.deleteVMFSFiles(m, ds, dsPath)
-}
-
-func (d *Dispatcher) deleteVMFSFiles(m *object.DatastoreFileManager, ds *object.Datastore, dsPath string) error {
-	defer trace.End(trace.Begin(dsPath))
-
-	for _, ext := range []string{"-delta.vmdk", "-flat.vmdk"} {
-		if strings.HasSuffix(dsPath, ext) {
-			// Skip backing files as Delete() will do so via DeleteVirtualDisk
-			return nil
-		}
-	}
-
-	if err := m.Delete(d.ctx, dsPath); err != nil {
-		log.Debugf("Failed to delete %q: %s", dsPath, err)
-	}
-	return nil
-}
-
-// getChildren returns all children under datastore path in unsorted order. (see also getSortedChildren)
-func (d *Dispatcher) getChildren(ds *object.Datastore, dsPath string) ([]string, error) {
-	res, err := d.lsSubFolder(ds, dsPath)
-	if err != nil {
-		return nil, err
-	}
-	var result []string
-	for _, dir := range res.HostDatastoreBrowserSearchResults {
-		for _, f := range dir.File {
-			dsf, ok := f.(*types.FileInfo)
-			if !ok {
-				continue
-			}
-			result = append(result, path.Join(dir.FolderPath, dsf.Path))
-		}
-	}
-	return result, nil
-}
-
-// getSortedChildren returns all children under datastore path in reversed order.
-func (d *Dispatcher) getSortedChildren(ds *object.Datastore, dsPath string) ([]string, error) {
-	result, err := d.getChildren(ds, dsPath)
-	if err != nil {
-		return nil, err
-	}
-	sort.Sort(sort.Reverse(sort.StringSlice(result)))
-	return result, nil
-}
-
-func (d *Dispatcher) lsSubFolder(ds *object.Datastore, dsPath string) (*types.ArrayOfHostDatastoreBrowserSearchResults, error) {
-	defer trace.End(trace.Begin(dsPath))
-
-	spec := types.HostDatastoreBrowserSearchSpec{
-		MatchPattern: []string{"*"},
-	}
-
-	b, err := ds.Browser(d.ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	task, err := b.SearchDatastoreSubFolders(d.ctx, dsPath, &spec)
-	if err != nil {
-		return nil, err
-	}
-
-	info, err := task.WaitForResult(d.ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	res := info.Result.(types.ArrayOfHostDatastoreBrowserSearchResults)
-	return &res, nil
-}
-
-func (d *Dispatcher) lsFolder(ds *object.Datastore, dsPath string) (*types.HostDatastoreBrowserSearchResults, error) {
-	defer trace.End(trace.Begin(dsPath))
-
-	spec := types.HostDatastoreBrowserSearchSpec{
-		MatchPattern: []string{"*"},
-	}
-
-	b, err := ds.Browser(d.ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	task, err := b.SearchDatastore(d.ctx, dsPath, &spec)
-	if err != nil {
-		return nil, err
-	}
-
-	info, err := task.WaitForResult(d.ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	res := info.Result.(types.HostDatastoreBrowserSearchResults)
-	return &res, nil
-}
-
-func (d *Dispatcher) createVolumeStores(conf *config.VirtualContainerHostConfigSpec) error {
-	defer trace.End(trace.Begin(""))
-	for _, url := range conf.VolumeLocations {
-
-		// NFS volumestores need only make it into the config of the vch
-		if url.Scheme != dsScheme {
-			log.Debugf("Skipping nfs volume store for vic-machine creation operation : (%s)", url.String())
-			continue
-		}
-
-		ds, err := d.session.Finder.Datastore(d.ctx, url.Host)
-		if err != nil {
-			return errors.Errorf("Could not retrieve datastore with host %q due to error %s", url.Host, err)
-		}
-
-		if url.Path == "/" || url.Path == "" {
-			url.Path = vsphere.StorageParentDir
-		}
-
-		nds, err := datastore.NewHelper(d.ctx, d.session, ds, url.Path)
-		if err != nil {
-			return errors.Errorf("Could not create volume store due to error: %s", err)
-		}
-		// FIXME: (GitHub Issue #1301) this is not valid URL syntax and should be translated appropriately when time allows
-		url.Path = nds.RootURL.String()
-	}
-	return nil
-}
-
-// returns # of removed stores
-func (d *Dispatcher) deleteVolumeStoreIfForced(conf *config.VirtualContainerHostConfigSpec) (removed int) {
-	defer trace.End(trace.Begin(""))
-	removed = 0
-
-	if !d.force {
-		if len(conf.VolumeLocations) == 0 {
-			return 0
-		}
-
-		dsVolumeStores := new(bytes.Buffer)
-		nfsVolumeStores := new(bytes.Buffer)
-		for label, url := range conf.VolumeLocations {
-			switch url.Scheme {
-			case common.DsScheme:
-				dsVolumeStores.WriteString(fmt.Sprintf("\t%s: %s\n", label, url.Path))
-			case common.NfsScheme:
-				nfsVolumeStores.WriteString(fmt.Sprintf("\t%s: %s\n", label, url.Path))
-			}
-		}
-		log.Warnf("Since --force was not specified, the following volume stores will not be removed. Use the vSphere UI or supplied nfs targets to delete content you do not wish to keep.\n vsphere volumestores:\n%s\n NFS volumestores:\n%s\n", dsVolumeStores.String(), nfsVolumeStores.String())
-		return 0
-	}
-
-	log.Infoln("Removing volume stores")
-	for label, url := range conf.VolumeLocations {
-
-		// NOTE: We cannot remove nfs VolumeStores at vic-machine delete time. We are not guaranteed to be on the correct network for any of the nfs stores.
-		if url.Scheme != dsScheme {
-			log.Warnf("Cannot delete VolumeStore (%s). It may not be reachable by vic-machine and has been skipped by the delete process.", url.String())
-			continue
-		}
-
-		// FIXME: url is being encoded by the portlayer incorrectly, so we have to convert url.Path to the right url.URL object
-		dsURL, err := datastore.ToURL(url.Path)
-		if err != nil {
-			log.Warnf("Didn't receive an expected volume store path format: %q", url.Path)
-			continue
-		}
-
-		if dsURL.Path == vsphere.StorageParentDir {
-			dsURL.Path = path.Join(dsURL.Path, vsphere.VolumesDir)
-		}
-
-		log.Debugf("Provided datastore URL: %q\nParsed volume store path: %q", url.Path, dsURL.Path)
-		log.Infof("Deleting volume store %q on Datastore %q at path %q", label, dsURL.Host, dsURL.Path)
-
-		datastores, err := d.session.Finder.DatastoreList(d.ctx, dsURL.Host)
-
-		if err != nil {
-			log.Errorf("Error finding datastore %q: %s", dsURL.Host, err)
-			continue
-		}
-		if len(datastores) > 1 {
-			foundDatastores := new(bytes.Buffer)
-			for _, d := range datastores {
-				foundDatastores.WriteString(fmt.Sprintf("\n%s\n", d.InventoryPath))
-			}
-			log.Errorf("Ambiguous datastore name (%q) provided. Results were: %q", dsURL.Host, foundDatastores)
-			continue
-		}
-
-		datastore := datastores[0]
-		if _, err := d.deleteDatastoreFiles(datastore, dsURL.Path, d.force); err != nil {
-			log.Errorf("Failed to delete volume store %q on Datastore %q at path %q", label, dsURL.Host, dsURL.Path)
-		} else {
-			removed++
-		}
-	}
-	return removed
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/update.go b/installer/vendor/github.com/vmware/vic/lib/install/management/update.go
deleted file mode 100644
index 9eff0cf96e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/update.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type State int
-
-// ruleset ID from /etc/vmware/firewall/service.xml
-const RulesetID string = "vSPC"
-const (
-	enable State = iota
-	disable
-)
-
-func (s State) String() string {
-	switch s {
-	case enable:
-		return "enable"
-	case disable:
-		return "disable"
-	}
-	return ""
-}
-
-// EnableFirewallRuleset enables the ruleset on the target, allowing VIC backchannel traffic
-func (d *Dispatcher) EnableFirewallRuleset() error {
-	defer trace.End(trace.Begin(""))
-	return d.modifyFirewall(enable)
-}
-
-// DisableFirewallRuleset disables the ruleset on the target, denying VIC backchannel traffic
-func (d *Dispatcher) DisableFirewallRuleset() error {
-	defer trace.End(trace.Begin(""))
-	return d.modifyFirewall(disable)
-}
-
-// modifyFirewall sets the state of the firewall ruleset specified by RulesetID
-func (d *Dispatcher) modifyFirewall(state State) error {
-	defer trace.End(trace.Begin(""))
-	var err error
-	var hosts []*object.HostSystem
-
-	log.Debugf("cluster: %s", d.session.Cluster)
-
-	hosts, err = d.session.Cluster.Hosts(d.ctx)
-	if err != nil {
-		return err
-	}
-
-	if len(hosts) == 0 {
-		log.Infof("No hosts to modify")
-		return nil
-	}
-
-	for _, host := range hosts {
-		fs, err := host.ConfigManager().FirewallSystem(d.ctx)
-		if err != nil {
-			log.Errorf("Failed to get firewall system for host %q: %s", host.Name(), err)
-			return err
-		}
-
-		switch state {
-		case enable:
-			err = fs.EnableRuleset(d.ctx, RulesetID)
-		case disable:
-			err = fs.DisableRuleset(d.ctx, RulesetID)
-		}
-		if err != nil {
-			log.Errorf("Failed to %s ruleset %q on host %q: %s", state.String(), RulesetID, host.Name(), err)
-			return err
-		}
-		log.Infof("Ruleset %q %sd on host %q", RulesetID, state.String(), host)
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/management/virtual_app.go b/installer/vendor/github.com/vmware/vic/lib/install/management/virtual_app.go
deleted file mode 100644
index a9ac2dd766..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/management/virtual_app.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package management
-
-import (
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-)
-
-func (d *Dispatcher) createVApp(conf *config.VirtualContainerHostConfigSpec, settings *data.InstallerData) (*object.VirtualApp, error) {
-	defer trace.End(trace.Begin(""))
-	var err error
-	log.Infof("Creating virtual app %q", conf.Name)
-
-	resSpec := types.DefaultResourceConfigSpec()
-
-	if settings.VCHSize.CPU.Limit != nil && *settings.VCHSize.CPU.Limit != 0 {
-		resSpec.CpuAllocation.Limit = settings.VCHSize.CPU.Limit
-	}
-
-	if settings.VCHSize.CPU.Reservation != nil && *settings.VCHSize.CPU.Reservation != 0 {
-		resSpec.CpuAllocation.Reservation = settings.VCHSize.CPU.Reservation
-	}
-
-	if settings.VCHSize.CPU.Shares != nil {
-		resSpec.CpuAllocation.Shares = settings.VCHSize.CPU.Shares
-	}
-
-	if settings.VCHSize.Memory.Limit != nil && *settings.VCHSize.Memory.Limit != 0 {
-		resSpec.MemoryAllocation.Limit = settings.VCHSize.Memory.Limit
-	}
-
-	if settings.VCHSize.Memory.Reservation != nil && *settings.VCHSize.Memory.Reservation != 0 {
-		resSpec.MemoryAllocation.Reservation = settings.VCHSize.Memory.Reservation
-	}
-
-	if settings.VCHSize.Memory.Shares != nil {
-		resSpec.MemoryAllocation.Shares = settings.VCHSize.Memory.Shares
-	}
-
-	prodSpec := types.VAppProductSpec{
-		Info: &types.VAppProductInfo{
-			Name:      "vSphere Integrated Containers",
-			Vendor:    "VMware",
-			VendorUrl: "http://www.vmware.com/",
-			Version:   version.Version,
-		},
-		ArrayUpdateSpec: types.ArrayUpdateSpec{
-			Operation: types.ArrayUpdateOperationAdd,
-		},
-	}
-
-	configSpec := types.VAppConfigSpec{
-		Annotation: "vSphere Integrated Containers",
-		VmConfigSpec: types.VmConfigSpec{
-			Product: []types.VAppProductSpec{prodSpec},
-		},
-	}
-
-	app, err := d.session.Pool.CreateVApp(d.ctx, conf.Name, resSpec, configSpec, d.session.VMFolder)
-	if err != nil {
-		log.Debugf("Failed to create virtual app %q: %s", conf.Name, err)
-		return nil, err
-	}
-	conf.ComputeResources = append(conf.ComputeResources, app.Reference())
-	return app, nil
-}
-
-func (d *Dispatcher) findVirtualApp(path string) (*object.VirtualApp, error) {
-	defer trace.End(trace.Begin(path))
-	vapp, err := d.session.Finder.VirtualApp(d.ctx, path)
-	if err != nil {
-		_, ok := err.(*find.NotFoundError)
-		if !ok {
-			err = errors.Errorf("Failed to query virtual app %q: %s", path, err)
-			return nil, err
-		}
-		return nil, nil
-	}
-	return vapp, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser.go b/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser.go
new file mode 100644
index 0000000000..6e0a6c1e27
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser.go
@@ -0,0 +1,301 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package opsuser
+
+import (
+	"context"
+	"net/url"
+
+	log "github.com/Sirupsen/logrus"
+
+	"github.com/vmware/govmomi"
+	"github.com/vmware/govmomi/find"
+	gvsession "github.com/vmware/govmomi/session"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/lib/config"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/vsphere/compute"
+	"github.com/vmware/vic/pkg/vsphere/rbac"
+	"github.com/vmware/vic/pkg/vsphere/session"
+)
+
+var opsuserRolePrefix = "vic-vch-"
+
+type RBACManager struct {
+	AuthzManager *rbac.AuthzManager
+	configSpec   *config.VirtualContainerHostConfigSpec
+	session      *session.Session
+	client       *vim25.Client
+}
+
+// resourceDesc encapsulates a resource's type and reference.
+type resourceDesc struct {
+	rType int8
+	ref   types.ManagedObjectReference
+}
+
+func NewRBACManager(ctx context.Context, session *session.Session, rbacConfig *rbac.Config, configSpec *config.VirtualContainerHostConfigSpec) (*RBACManager, error) {
+	if session == nil {
+		return nil, errors.New("unable to create an RBACManager - session not set")
+	}
+
+	rbacMgr := &RBACManager{
+		configSpec: configSpec,
+		session:    session,
+		client:     session.Vim25(),
+	}
+
+	am := rbac.NewAuthzManager(ctx, rbacMgr.client)
+	am.InitConfig(configSpec.Connection.Username, opsuserRolePrefix, rbacConfig)
+	rbacMgr.AuthzManager = am
+
+	return rbacMgr, nil
+}
+
+func GrantDCReadOnlyPerms(ctx context.Context, session *session.Session, configSpec *config.VirtualContainerHostConfigSpec) error {
+	mgr, err := NewRBACManager(ctx, session, &DCReadOnlyConf, configSpec)
+	if err != nil {
+		return err
+	}
+
+	_, err = mgr.SetupDCReadOnlyPermissions(ctx)
+	return err
+}
+
+func GrantOpsUserPerms(ctx context.Context, session *session.Session, configSpec *config.VirtualContainerHostConfigSpec) error {
+	var rbacConfig *rbac.Config
+
+	// Use a separate RBAC configuration depending on whether DRS is enabled.
+	if session.DRSEnabled == nil || !*session.DRSEnabled {
+		rbacConfig = &NoDRSConf
+	} else {
+		if configSpec.UseVMGroup {
+			rbacConfig = &ClusterConf
+		} else {
+			rbacConfig = &DRSConf
+		}
+	}
+
+	mgr, err := NewRBACManager(ctx, session, rbacConfig, configSpec)
+	if err != nil {
+		return err
+	}
+
+	_, err = mgr.SetupRolesAndPermissions(ctx)
+	return err
+}
+
+func (mgr *RBACManager) SetupRolesAndPermissions(ctx context.Context) ([]rbac.ResourcePermission, error) {
+	am := mgr.AuthzManager
+	res, err := am.IsPrincipalAnAdministrator(ctx)
+	if err != nil {
+		return nil, err
+	}
+	if res {
+		log.Warnf("Skipping ops-user Role/Permissions initialization. The current ops-user (%s) has administrative privileges.", am.Principal)
+		log.Warnf("This occurs when \"%s\" is a member of the \"Administrators\" group or has been granted \"Admin\" role to any of the resources in the system.", am.Principal)
+		return nil, nil
+	}
+	if _, err = am.CreateRoles(ctx); err != nil {
+		return nil, err
+	}
+	return mgr.SetupPermissions(ctx)
+}
+
+func (mgr *RBACManager) SetupPermissions(ctx context.Context) ([]rbac.ResourcePermission, error) {
+	return mgr.setupPermissions(ctx)
+}
+
+func (mgr *RBACManager) SetupDCReadOnlyPermissions(ctx context.Context) (*rbac.ResourcePermission, error) {
+	am := mgr.AuthzManager
+	res, err := am.IsPrincipalAnAdministrator(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// If administrator, skip setting the root permissions
+	if res {
+		log.Warnf("Cannot perform ops-user Role/Permissions initialization. The current ops-user (%s) has administrative privileges.", am.Principal)
+		log.Warnf("This occurs when \"%s\" is a member of the \"Administrators\" group or has been granted \"Admin\" role to any of the resources in the system.", am.Principal)
+		return nil, errors.Errorf("Cannot grant ops-user permissions as %s has administrative privileges", am.Principal)
+	}
+
+	dcRef := mgr.session.Datacenter.Reference()
+	hasPrivs, err := am.ReadPermsOnDC(ctx, dcRef)
+	if err != nil {
+		return nil, err
+	}
+
+	// If the ops-user already has enough privileges on the datacenter to at least
+	// satisfy the read-only role, skip setting read-only permissions.
+	if hasPrivs {
+		log.Debugf("ops-user already has enough privileges for read-only access to datacenter, skipping setting read-only permissions")
+		return nil, nil
+	}
+
+	return mgr.setupDcReadOnlyPermissions(ctx)
+}
+
+func (mgr *RBACManager) setupDcReadOnlyPermissions(ctx context.Context) (*rbac.ResourcePermission, error) {
+	session := mgr.session
+	am := mgr.AuthzManager
+	dcRef := session.Datacenter.Reference()
+
+	// Apply permissions
+	resourcePermission, err := am.AddPermission(ctx, dcRef, rbac.DatacenterReadOnly, false)
+	if err != nil {
+		return nil, errors.Errorf("Ops-User: RBACManager, Unable to set top read only permissions on %s, error: %s",
+			dcRef.String(), err.Error())
+	}
+
+	return resourcePermission, nil
+}
+
+func (mgr *RBACManager) setupPermissions(ctx context.Context) ([]rbac.ResourcePermission, error) {
+	am := mgr.AuthzManager
+	resourceDescs := make([]resourceDesc, 0, len(am.Config.Resources))
+
+	// Get a reference to the top object
+	finder := find.NewFinder(mgr.client, false)
+
+	root, err := finder.Folder(ctx, "/")
+	if err != nil {
+		return nil, errors.Errorf("Ops-User: RBACManager, Unable to find top object: %s", err.Error())
+	}
+
+	resourceDescs = append(resourceDescs, resourceDesc{rbac.VCenter, root.Reference()})
+
+	session := session.NewSession(&session.Config{})
+	// Set client
+	session.Client = &govmomi.Client{
+		Client:         mgr.client,
+		SessionManager: gvsession.NewManager(mgr.client),
+	}
+
+	// Use the VirtualContainerHostConfigSpec to find the various resources
+	// Start with Resource Pool, Cluster and Datacenter
+	rpRef := mgr.configSpec.ComputeResources[0]
+	rp := compute.NewResourcePool(ctx, session, rpRef)
+
+	datacenter, err := rp.GetDatacenter(ctx)
+	if err != nil {
+		return nil, errors.Errorf("Ops-User: RBACManager, Unable to find Datacenter: %s", err.Error())
+	}
+	resourceDescs = append(resourceDescs, resourceDesc{rbac.Datacenter, datacenter.Reference()})
+
+	finder.SetDatacenter(datacenter)
+
+	cluster, err := rp.GetCluster(ctx)
+	if err != nil {
+		return nil, errors.Errorf("Ops-User: RBACManager, Unable to find Cluster: %s", err.Error())
+	}
+
+	// In a DRS environment, this will add RoleDataStore to the cluster. In a non-DRS environment,
+	// this will add RoleEndpointDatastore to the cluster per the no-DRS RBAC configuration.
+	resourceDescs = append(resourceDescs, resourceDesc{rbac.Cluster, cluster.Reference()})
+
+	// Find image and volume datastores
+	dsNameToRef := make(rbac.NameToRef)
+	err = mgr.collectDatastores(ctx, finder, dsNameToRef)
+	if err != nil {
+		return nil, errors.Errorf("Ops-User: RBACManager, Unable to find Datastores: %s", err.Error())
+	}
+
+	// Add datastores
+	for _, ref := range dsNameToRef {
+		resourceDescs = append(resourceDescs, resourceDesc{rbac.Datastore, ref})
+	}
+
+	// Add networks
+	for _, network := range mgr.configSpec.Network.ContainerNetworks {
+		netRef := &types.ManagedObjectReference{}
+		netRef.FromString(network.ID)
+		if netRef.Type == "" || netRef.Value == "" {
+			return nil, errors.Errorf("Ops-User: RBACManager, Unable to build Bridged Network MoRef: %s", network.ID)
+		}
+		resourceDescs = append(resourceDescs, resourceDesc{rbac.Network, *netRef})
+	}
+
+	// In a DRS environment, add the endpoint role to the resource pool(s). In a
+	// non-DRS environment, this role's privileges are applied at the cluster
+	// level by using RoleEndpointDatastore.
+	if mgr.session.DRSEnabled != nil && *mgr.session.DRSEnabled {
+		for _, rPoolRef := range mgr.configSpec.ComputeResources {
+			resourceDescs = append(resourceDescs, resourceDesc{rbac.Endpoint, rPoolRef})
+		}
+	}
+
+	// For vCenter, apply the endpoint role to the VCH inventory folder as well.
+	if mgr.session.IsVC() {
+		vchFolder := mgr.session.VCHFolder
+		if vchFolder == nil {
+			return nil, errors.Errorf("VCH folder not set, unable to set permissions")
+		}
+
+		resourceDescs = append(resourceDescs, resourceDesc{rbac.Endpoint, vchFolder.Reference()})
+	}
+
+	resourcePermissions := make([]rbac.ResourcePermission, 0, len(am.Config.Resources))
+	// Apply permissions
+	for _, desc := range resourceDescs {
+		resourcePermission, err := am.AddPermission(ctx, desc.ref, desc.rType, false)
+		if err != nil {
+			return nil, errors.Errorf("Ops-User: RBACManager, Unable to set permissions on %s, error: %s",
+				desc.ref.String(), err.Error())
+		}
+		if resourcePermission != nil {
+			resourcePermissions = append(resourcePermissions, *resourcePermission)
+		}
+	}
+
+	return resourcePermissions, nil
+}
+
+func (mgr *RBACManager) collectDatastores(ctx context.Context, finder *find.Finder, dsNameToRef rbac.NameToRef) error {
+	err := mgr.findDatastores(ctx, finder, mgr.configSpec.Storage.ImageStores, dsNameToRef)
+	if err != nil {
+		return err
+	}
+	volumeLocations := make([]url.URL, 0, len(mgr.configSpec.Storage.VolumeLocations))
+	for _, volumeLocation := range mgr.configSpec.Storage.VolumeLocations {
+		// Only apply changes to datastores managed by vSphere
+		if volumeLocation.Scheme != "ds" {
+			continue
+		}
+		volumeLocations = append(volumeLocations, *volumeLocation)
+	}
+	if err = mgr.findDatastores(ctx, finder, volumeLocations, dsNameToRef); err != nil {
+		return err
+	}
+	return nil
+}
+
+func (mgr *RBACManager) findDatastores(ctx context.Context, finder *find.Finder,
+	storeURLs []url.URL, dsNameToRef rbac.NameToRef) error {
+	for _, storeURL := range storeURLs {
+		dsName := storeURL.Host
+		// Skip if we already have one
+		if _, ok := dsNameToRef[dsName]; ok {
+			continue
+		}
+		ds, err := finder.Datastore(ctx, dsName)
+		if err != nil {
+			return err
+		}
+		dsNameToRef[dsName] = ds.Reference()
+	}
+	return nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser_conf.go b/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser_conf.go
new file mode 100644
index 0000000000..49d7ab4ffc
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/lib/install/opsuser/opsuser_conf.go
@@ -0,0 +1,181 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package opsuser
+
+import (
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/vsphere/rbac"
+)
+
+var vchRolePrefix = "vic-vch-"
+
+// Pre-existing ReadOnly Role, no need to specify the privileges
+var RoleReadOnly = types.AuthorizationRole{
+	Name:      "ReadOnly",
+	Privilege: []string{},
+}
+
+var RoleVCenter = types.AuthorizationRole{
+	Name: "vcenter",
+	Privilege: []string{
+		"Datastore.Config",
+		"Global.EnableMethods",
+		"Global.DisableMethods",
+	},
+}
+
+var RoleDataCenter = types.AuthorizationRole{
+	Name: "datacenter",
+	Privilege: []string{
+		"Datastore.Config",
+		"Datastore.FileManagement",
+	},
+}
+
+var RoleCluster = types.AuthorizationRole{
+	Name: "cluster",
+	Privilege: []string{
+		"Datastore.AllocateSpace",
+		"Datastore.Browse",
+		"Datastore.Config",
+		"Datastore.DeleteFile",
+		"Datastore.FileManagement",
+		"Host.Config.SystemManagement",
+		"Host.Inventory.EditCluster",
+	},
+}
+
+var RoleDataStore = types.AuthorizationRole{
+	Name: "datastore",
+	Privilege: []string{
+		"Datastore.AllocateSpace",
+		"Datastore.Browse",
+		"Datastore.Config",
+		"Datastore.DeleteFile",
+		"Datastore.FileManagement",
+		"Host.Config.SystemManagement",
+	},
+}
+
+var RoleNetwork = types.AuthorizationRole{
+	Name: "network",
+	Privilege: []string{
+		"Network.Assign",
+	},
+}
+
+var RoleEndpoint = types.AuthorizationRole{
+	Name: "endpoint",
+	Privilege: []string{
+		"DVPortgroup.Modify",
+		"DVPortgroup.PolicyOp",
+		"DVPortgroup.ScopeOp",
+		"Resource.AssignVMToPool",
+		"Resource.ColdMigrate",
+		"VirtualMachine.Config.AddExistingDisk",
+		"VirtualMachine.Config.AddNewDisk",
+		"VirtualMachine.Config.AddRemoveDevice",
+		"VirtualMachine.Config.AdvancedConfig",
+		"VirtualMachine.Config.EditDevice",
+		"VirtualMachine.Config.RemoveDisk",
+		"VirtualMachine.Config.Rename",
+		"VirtualMachine.GuestOperations.Execute",
+		"VirtualMachine.GuestOperations.Modify",
+		"VirtualMachine.GuestOperations.Query",
+		"VirtualMachine.Interact.DeviceConnection",
+		"VirtualMachine.Interact.PowerOff",
+		"VirtualMachine.Interact.PowerOn",
+		"VirtualMachine.Inventory.Create",
+		"VirtualMachine.Inventory.Delete",
+		"VirtualMachine.Inventory.Register",
+		"VirtualMachine.Inventory.Unregister",
+	},
+}
+
+// RoleEndpointDatastore combines the privileges of RoleDataStore and RoleEndpoint
+// and is applied to the cluster in a non-DRS environment.
+var RoleEndpointDatastore = types.AuthorizationRole{
+	Name:      "endpoint-datastore",
+	Privilege: append(RoleDataStore.Privilege, RoleEndpoint.Privilege...),
+}
+
+var DCReadOnlyConf = rbac.Config{
+	Resources: []rbac.Resource{
+		{
+			Type:      rbac.DatacenterReadOnly,
+			Propagate: false,
+			Role:      RoleReadOnly,
+		},
+	},
+}
+
+func buildConfig(clusterRole types.AuthorizationRole) rbac.Config {
+	return rbac.Config{
+		Resources: []rbac.Resource{
+			{
+				Type:      rbac.VCenter,
+				Propagate: false,
+				Role:      RoleVCenter,
+			},
+			{
+				Type:      rbac.Datacenter,
+				Propagate: true,
+				Role:      RoleDataCenter,
+			},
+			{
+				Type:      rbac.Cluster,
+				Propagate: true,
+				Role:      clusterRole,
+			},
+			{
+				Type:      rbac.DatastoreFolder,
+				Propagate: true,
+				Role:      RoleDataStore,
+			},
+			{
+				Type:      rbac.Datastore,
+				Propagate: false,
+				Role:      RoleDataStore,
+			},
+			{
+				Type:      rbac.VSANDatastore,
+				Propagate: false,
+				Role:      RoleDataStore,
+			},
+			{
+				Type:      rbac.Network,
+				Propagate: true,
+				Role:      RoleNetwork,
+			},
+			{
+				Type:      rbac.Endpoint,
+				Propagate: true,
+				Role:      RoleEndpoint,
+			},
+		},
+	}
+}
+
+// DRSConf stores the RBAC configuration for the ops-user's roles in a DRS environment.
+var DRSConf = buildConfig(RoleDataStore)
+
+// NoDRSConf stores the configuration for the ops-user's roles in a non-DRS environment.
+// It is different from DRSConf in that RoleEndpointDatastore is used for the cluster
+// instead of RoleDataStore. In a non-DRS environment, we need to apply the Endpoint and
+// Datastore roles at the cluster level since there are no resource pools.
+var NoDRSConf = buildConfig(RoleEndpointDatastore)
+
+// Configuration for the ops-user with increased cluster-level permissions, required for managing DRS VM Groups
+var ClusterConf = buildConfig(RoleCluster)
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/plugin/register.go b/installer/vendor/github.com/vmware/vic/lib/install/plugin/register.go
deleted file mode 100644
index 7af15e49e1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/plugin/register.go
+++ /dev/null
@@ -1,241 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin
-
-import (
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"net/url"
-	"strings"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-
-	"context"
-)
-
-type Info struct {
-	Company               string
-	Key                   string
-	Name                  string
-	ServerThumbprint      string
-	ShowInSolutionManager bool
-	Summary               string
-	Type                  string
-	URL                   string
-	Version               string
-}
-
-type Pluginator struct {
-	Session          *session.Session
-	ExtensionManager *object.ExtensionManager
-	Context          context.Context
-
-	info *Info
-
-	tURL        *url.URL
-	tThumbprint string
-	connected   bool
-}
-
-func NewPluginator(ctx context.Context, target *url.URL, thumbprint string, i *Info) (*Pluginator, error) {
-	defer trace.End(trace.Begin(""))
-
-	p := &Pluginator{
-		tURL:        target,
-		tThumbprint: thumbprint,
-		info:        i,
-	}
-	p.Context = ctx
-
-	err := p.connect()
-	if err != nil {
-		return nil, err
-	}
-
-	return p, nil
-}
-
-func (p *Pluginator) disconnect() error {
-	defer trace.End(trace.Begin(""))
-	if p.Session != nil {
-		err := p.Session.Client.Logout(p.Context)
-		if err != nil {
-			return fmt.Errorf("failed to disconnect: %s", err)
-		}
-	}
-	p.connected = false
-	return nil
-}
-
-func (p *Pluginator) connect() error {
-	defer trace.End(trace.Begin(""))
-	var err error
-
-	if p.tURL.Scheme == "https" && p.tThumbprint == "" {
-		var cert object.HostCertificateInfo
-		if err = cert.FromURL(p.tURL, new(tls.Config)); err != nil {
-			return err
-		}
-
-		if cert.Err != nil {
-			log.Errorf("Failed to verify certificate for target=%s (thumbprint=%s)",
-				p.tURL.Host, cert.ThumbprintSHA1)
-			return cert.Err
-		}
-
-		p.tThumbprint = cert.ThumbprintSHA1
-		log.Debugf("Accepting host %q thumbprint %s", p.tURL.Host, p.tThumbprint)
-	}
-
-	sessionconfig := &session.Config{
-		Thumbprint: p.tThumbprint,
-	}
-	sessionconfig.Service = p.tURL.String()
-
-	p.Session = session.NewSession(sessionconfig)
-	p.Session, err = p.Session.Connect(p.Context)
-	if err != nil {
-		return fmt.Errorf("failed to connect: %s", err)
-	}
-
-	// #nosec: Errors unhandled.
-	p.Session.Populate(p.Context)
-
-	em, err := object.GetExtensionManager(p.Session.Client.Client)
-	if err != nil {
-		return fmt.Errorf("failed to get extension manager: %s", err)
-	}
-	p.ExtensionManager = em
-
-	p.connected = true
-	return nil
-}
-
-// Register installs an extension to the target
-func (p *Pluginator) Register() error {
-	defer trace.End(trace.Begin(""))
-	var err error
-	if !p.connected {
-		return errors.New("not connected")
-	}
-
-	desc := types.Description{
-		Label:   p.info.Name,
-		Summary: p.info.Summary,
-	}
-
-	e := types.Extension{
-		Key:         p.info.Key,
-		Version:     p.info.Version,
-		Company:     p.info.Company,
-		Description: &desc,
-	}
-
-	eci := types.ExtensionClientInfo{
-		Version:     p.info.Version,
-		Company:     p.info.Company,
-		Description: &desc,
-		Type:        p.info.Type,
-		Url:         p.info.URL,
-	}
-	e.Client = append(e.Client, eci)
-
-	d := types.KeyValue{
-		Key:   "name",
-		Value: p.info.Name,
-	}
-
-	eri := types.ExtensionResourceInfo{
-		Locale: "en_US",
-		Module: "name",
-	}
-
-	eri.Data = append(eri.Data, d)
-
-	e.ResourceList = append(e.ResourceList, eri)
-
-	// HTTPS requires extension server info
-	if strings.HasPrefix(strings.ToLower(p.info.URL), "https://") {
-		esi := types.ExtensionServerInfo{
-			Url:              p.info.URL,
-			Description:      &desc,
-			Company:          p.info.Company,
-			Type:             "HTTPS",
-			AdminEmail:       []string{"noreply@vmware.com"},
-			ServerThumbprint: p.info.ServerThumbprint,
-		}
-		e.Server = append(e.Server, esi)
-	}
-
-	e.ShownInSolutionManager = &p.info.ShowInSolutionManager
-
-	e.LastHeartbeatTime = time.Now().UTC()
-
-	err = p.ExtensionManager.Register(p.Context, e)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Unregister removes an extension from the target
-func (p *Pluginator) Unregister(key string) error {
-	defer trace.End(trace.Begin(""))
-	if !p.connected {
-		return errors.New("not connected")
-	}
-
-	if err := p.ExtensionManager.Unregister(p.Context, key); err != nil {
-		return err
-	}
-	return nil
-}
-
-// IsRegistered checks for presence of an extension on the target
-func (p *Pluginator) IsRegistered(key string) (bool, error) {
-	defer trace.End(trace.Begin(""))
-	if !p.connected {
-		return false, errors.New("not connected")
-	}
-
-	e, err := p.ExtensionManager.Find(p.Context, key)
-	if err != nil {
-		return false, err
-	}
-	if e != nil {
-		log.Debugf("%q is registered", key)
-		return true, nil
-	}
-	log.Debugf("%q is not registered", key)
-	return false, nil
-}
-
-// IsRegistered checks for presence of an extension on the target
-func (p *Pluginator) GetPlugin(key string) (*types.Extension, error) {
-	defer trace.End(trace.Begin(""))
-	if !p.connected {
-		return nil, errors.New("not connected")
-	}
-
-	return p.ExtensionManager.Find(p.Context, key)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/compute.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/compute.go
index 8ed2cba80c..eaabbee79b 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/compute.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/compute.go
@@ -1,4 +1,4 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@ import (
 	"fmt"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
-
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/mo"
@@ -30,25 +28,65 @@ import (
 	"github.com/vmware/vic/pkg/trace"
 )
 
-func (v *Validator) compute(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) compute(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// ComputeResourcePath should resolve to a ComputeResource, ClusterComputeResource or ResourcePool
 
-	pool, err := v.ResourcePoolHelper(ctx, input.ComputeResourcePath)
+	pool, err := v.ResourcePoolHelper(op, input.ComputeResourcePath)
 	v.NoteIssue(err)
 	if pool == nil {
 		return
 	}
 
-	// TODO: for vApp creation assert that the name doesn't exist
 	// TODO: for RP creation assert whatever we decide about the pool - most likely that it's empty
 }
 
-func (v *Validator) inventoryPath(obj object.Reference) string {
-	elt, err := v.Session.Finder.Element(v.Context, obj.Reference())
+func (v *Validator) checkVMGroup(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
+
+	if input.UseVMGroup {
+		if !v.IsVC() {
+			v.NoteIssue(errors.New("DRS VM Groups may only be configured when using VC"))
+			return
+		}
+
+		if v.Session.DRSEnabled == nil || !*v.Session.DRSEnabled {
+			v.NoteIssue(errors.New("DRS VM Groups may not be used without DRS"))
+			return
+		}
+
+		if input.ID != "" {
+			op.Debug("Skipping DRS VM Group existence check as VCH has already been created")
+			return
+		}
+
+		conf.UseVMGroup = input.UseVMGroup
+		// For now, we always name the VM Group based on the name of the VCH
+		conf.VMGroupName = conf.Name
+
+		if v.Session.Cluster == nil {
+			// We already note a more helpful issue for this following the compute method's call to ResourcePoolHelper.
+			v.NoteIssue(errors.New("Unable to determine presence of DRS VM Groups due to previous errors"))
+			return
+		}
+
+		exists, err := VMGroupExists(op, v.Session.Cluster, conf.VMGroupName)
+		if err != nil {
+			v.NoteIssue(err)
+			return
+		}
+		if exists {
+			v.NoteIssue(errors.Errorf("DRS VM Group named %q already exists", conf.VMGroupName))
+			return
+		}
+	}
+}
+
+func (v *Validator) inventoryPath(op trace.Operation, obj object.Reference) string {
+	elt, err := v.Session.Finder.Element(op, obj.Reference())
 	if err != nil {
-		log.Warnf("failed to get inventory path for %s: %s", obj.Reference(), err)
+		op.Warnf("failed to get inventory path for %s: %s", obj.Reference(), err)
 		return ""
 	}
 
@@ -58,28 +96,29 @@ func (v *Validator) inventoryPath(obj object.Reference) string {
 // ResourcePoolHelper finds a resource pool from the input compute path and shows
 // suggestions if unable to do so when the path is ambiguous.
 func (v *Validator) ResourcePoolHelper(ctx context.Context, path string) (*object.ResourcePool, error) {
-	defer trace.End(trace.Begin(path))
+	op := trace.FromContext(ctx, "ResourcePoolHelper")
+	defer trace.End(trace.Begin(path, op))
 
 	// if compute-resource is unspecified is there a default
 	if path == "" {
-		if v.Session.Pool != nil {
-			log.Debugf("Using default resource pool for compute resource: %q", v.Session.Pool.InventoryPath)
-			return v.Session.Pool, nil
+		if v.Session.Pool == nil {
+			// if no path specified and no default available the show all
+			v.suggestComputeResource(op)
+			return nil, errors.New("No unambiguous default compute resource available: --compute-resource must be specified")
 		}
 
-		// if no path specified and no default available the show all
-		v.suggestComputeResource()
-		return nil, errors.New("No unambiguous default compute resource available: --compute-resource must be specified")
+		path = v.Session.Pool.InventoryPath
+		op.Debugf("Using default resource pool for compute resource: %q", v.Session.Pool.InventoryPath)
 	}
 
-	pool, err := v.Session.Finder.ResourcePool(ctx, path)
+	pool, err := v.Session.Finder.ResourcePool(op, path)
 	if err != nil {
 		switch err.(type) {
 		case *find.NotFoundError:
 			// fall through to ComputeResource check
 		case *find.MultipleFoundError:
-			log.Errorf("Failed to use --compute-resource=%q as resource pool: %s", path, err)
-			v.suggestResourcePool(path)
+			op.Errorf("Failed to use --compute-resource=%q as resource pool: %s", path, err)
+			v.suggestResourcePool(op, path)
 			return nil, err
 		default:
 			return nil, err
@@ -90,33 +129,33 @@ func (v *Validator) ResourcePoolHelper(ctx context.Context, path string) (*objec
 
 	if pool == nil {
 		// check if its a ComputeResource or ClusterComputeResource
-		compute, err = v.Session.Finder.ComputeResource(ctx, path)
+		compute, err = v.Session.Finder.ComputeResource(op, path)
 		if err != nil {
 			switch err.(type) {
 			case *find.NotFoundError, *find.MultipleFoundError:
-				v.suggestComputeResource()
+				v.suggestComputeResource(op)
 			}
 
 			return nil, err
 		}
 
 		// Use the default pool
-		pool, err = compute.ResourcePool(ctx)
+		pool, err = compute.ResourcePool(op)
 		if err != nil {
 			return nil, err
 		}
-		pool.InventoryPath = v.inventoryPath(pool.Reference())
+		pool.InventoryPath = v.inventoryPath(op, pool.Reference())
 	} else {
 		// TODO: add an object.ResourcePool.Owner method (see compute.ResourcePool.GetCluster)
 		var p mo.ResourcePool
 
-		if err = pool.Properties(ctx, pool.Reference(), []string{"owner"}, &p); err != nil {
-			log.Errorf("unable to get cluster of resource pool %s: %s", pool.Name(), err)
+		if err = pool.Properties(op, pool.Reference(), []string{"owner"}, &p); err != nil {
+			op.Errorf("unable to get cluster of resource pool %s: %s", pool.Name(), err)
 			return nil, err
 		}
 
 		compute = object.NewComputeResource(pool.Client(), p.Owner)
-		compute.InventoryPath = v.inventoryPath(compute.Reference())
+		compute.InventoryPath = v.inventoryPath(op, compute.Reference())
 	}
 
 	// stash the pool for later use
@@ -149,18 +188,18 @@ func (v *Validator) ListComputeResource() ([]string, error) {
 	return matches, nil
 }
 
-func (v *Validator) suggestComputeResource() {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) suggestComputeResource(op trace.Operation) {
+	defer trace.End(trace.Begin("", op))
 
 	compute, err := v.ListComputeResource()
 	if err != nil {
-		log.Error(err)
+		op.Error(err)
 		return
 	}
 
-	log.Info("Suggested values for --compute-resource:")
+	op.Info("Suggested values for --compute-resource:")
 	for _, c := range compute {
-		log.Infof("  %q", c)
+		op.Infof("  %q", c)
 	}
 }
 
@@ -181,31 +220,33 @@ func (v *Validator) ListResourcePool(path string) ([]string, error) {
 	return matches, nil
 }
 
-func (v *Validator) suggestResourcePool(path string) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) suggestResourcePool(op trace.Operation, path string) {
+	defer trace.End(trace.Begin("", op))
 
 	pools, err := v.ListResourcePool(path)
 	if err != nil {
-		log.Error(err)
+		op.Error(err)
 		return
 	}
 
-	log.Info("Suggested resource pool values for --compute-resource:")
+	op.Info("Suggested resource pool values for --compute-resource:")
 	for _, c := range pools {
 		p := strings.TrimPrefix(c, v.DatacenterPath+"/host/")
-		log.Infof("  %q", p)
+		op.Infof("  %q", p)
 	}
 }
 
 func (v *Validator) ValidateCompute(ctx context.Context, input *data.Data, computeRequired bool) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "ValidateCompute")
+	defer trace.End(trace.Begin("", op))
+
 	conf := &config.VirtualContainerHostConfigSpec{}
 
 	if input.ComputeResourcePath == "" && !computeRequired {
 		return conf, nil
 	}
 
-	log.Infof("Validating compute resource")
-	v.compute(ctx, input, conf)
-	return conf, v.ListIssues()
+	op.Info("Validating compute resource")
+	v.compute(op, input, conf)
+	return conf, v.ListIssues(ctx)
 }
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/config.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/config.go
index 2e9f9e97a7..57f5934cf0 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/config.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/config.go
@@ -15,25 +15,25 @@
 package validate
 
 import (
+	"context"
 	"fmt"
 	"net"
 
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
 	"github.com/vmware/govmomi/govc/host/esxcli"
 	"github.com/vmware/govmomi/license"
 	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/vic/lib/config"
 	"github.com/vmware/vic/lib/constants"
+	"github.com/vmware/vic/lib/install/data"
 	"github.com/vmware/vic/pkg/errors"
 	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/optmanager"
 )
 
+const persistNetworkBackingKey = "config.vpxd.SerialPort.PersistNetworkBacking"
+
 type FirewallStatus struct {
 	Rule                          types.HostFirewallRule
 	MisconfiguredEnabled          []string
@@ -88,18 +88,20 @@ func (e *FirewallMisconfiguredAllowedIPError) Error() string {
 
 // CheckFirewall verifies that host firewall configuration allows tether traffic and outputs results
 func (v *Validator) CheckFirewall(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "CheckFirewall")
+	defer trace.End(trace.Begin("", op))
 
 	mgmtIP := v.GetMgmtIP(conf)
-	log.Debugf("Checking firewall with management network IP %s", mgmtIP)
-	fwStatus := v.CheckFirewallForTether(ctx, mgmtIP)
+	op.Debugf("Checking firewall with management network IP %s", mgmtIP)
+	fwStatus := v.CheckFirewallForTether(op, mgmtIP)
 
 	// log the results
-	v.FirewallCheckOutput(fwStatus)
+	v.FirewallCheckOutput(op, fwStatus)
 }
 
 // CheckFirewallForTether which host firewalls are configured to allow tether traffic
 func (v *Validator) CheckFirewallForTether(ctx context.Context, mgmtIP net.IPNet) FirewallStatus {
+	op := trace.FromContext(ctx, "CheckFirewallForTether")
 
 	var hosts []*object.HostSystem
 	var err error
@@ -114,24 +116,24 @@ func (v *Validator) CheckFirewallForTether(ctx context.Context, mgmtIP net.IPNet
 	status := FirewallStatus{Rule: requiredRule}
 
 	errMsg := "Firewall check SKIPPED"
-	if !v.sessionValid(errMsg) {
+	if !v.sessionValid(op, errMsg) {
 		return status
 	}
 
-	if hosts, err = v.Session.Datastore.AttachedClusterHosts(ctx, v.Session.Cluster); err != nil {
-		log.Errorf("Unable to get the list of hosts attached to given storage: %s", err)
+	if hosts, err = v.Session.Datastore.AttachedClusterHosts(op, v.Session.Cluster); err != nil {
+		op.Errorf("Unable to get the list of hosts attached to given storage: %s", err)
 		v.NoteIssue(err)
 		return status
 	}
 
 	for _, host := range hosts {
-		firewallEnabled, err := v.FirewallEnabled(host)
+		firewallEnabled, err := v.firewallEnabled(op, host)
 		if err != nil {
 			v.NoteIssue(err)
 			break
 		}
 
-		mgmtAllowed, err := v.ManagementNetAllowed(ctx, mgmtIP, host, requiredRule)
+		mgmtAllowed, err := v.ManagementNetAllowed(op, mgmtIP, host, requiredRule)
 		if mgmtAllowed && err == nil {
 			status.Correct = append(status.Correct, host.InventoryPath)
 		}
@@ -139,40 +141,40 @@ func (v *Validator) CheckFirewallForTether(ctx context.Context, mgmtIP net.IPNet
 			switch err.(type) {
 			case *FirewallMisconfiguredError:
 				if firewallEnabled {
-					log.Debugf("fw misconfigured with fw enabled %q", host.InventoryPath)
+					op.Debugf("fw misconfigured with fw enabled %q", host.InventoryPath)
 					status.MisconfiguredEnabled = append(status.MisconfiguredEnabled, host.InventoryPath)
 				} else {
-					log.Debugf("fw misconfigured with fw disabled %q", host.InventoryPath)
+					op.Debugf("fw misconfigured with fw disabled %q", host.InventoryPath)
 					status.MisconfiguredDisabled = append(status.MisconfiguredDisabled, host.InventoryPath)
 				}
 			case *FirewallUnknownDHCPAllowedIPError:
 				if firewallEnabled {
-					log.Debugf("fw unknown (dhcp) with fw enabled %q", host.InventoryPath)
+					op.Debugf("fw unknown (dhcp) with fw enabled %q", host.InventoryPath)
 					status.UnknownEnabled = append(status.UnknownEnabled, host.InventoryPath)
 				} else {
-					log.Debugf("fw unknown (dhcp) with fw disabled %q", host.InventoryPath)
+					op.Debugf("fw unknown (dhcp) with fw disabled %q", host.InventoryPath)
 					status.UnknownDisabled = append(status.UnknownDisabled, host.InventoryPath)
 				}
-				log.Warn(err)
+				op.Warn(err)
 			case *FirewallMisconfiguredAllowedIPError:
 				if firewallEnabled {
-					log.Debugf("fw misconfigured allowed IP with fw enabled %q", host.InventoryPath)
+					op.Debugf("fw misconfigured allowed IP with fw enabled %q", host.InventoryPath)
 					status.MisconfiguredAllowedIPEnabled = append(status.MisconfiguredAllowedIPEnabled, host.InventoryPath)
-					log.Error(err)
+					op.Error(err)
 				} else {
-					log.Debugf("fw misconfigured allowed IP with fw disabled %q", host.InventoryPath)
+					op.Debugf("fw misconfigured allowed IP with fw disabled %q", host.InventoryPath)
 					status.MisconfiguredDisabled = append(status.MisconfiguredDisabled, host.InventoryPath)
-					log.Warn(err)
+					op.Warn(err)
 				}
 			case *FirewallConfigUnavailableError:
 				if firewallEnabled {
-					log.Debugf("fw configuration unavailable %q", host.InventoryPath)
+					op.Debugf("fw configuration unavailable %q", host.InventoryPath)
 					status.UnknownEnabled = append(status.UnknownEnabled, host.InventoryPath)
-					log.Error(err)
+					op.Error(err)
 				} else {
-					log.Debugf("fw configuration unavailable %q", host.InventoryPath)
+					op.Debugf("fw configuration unavailable %q", host.InventoryPath)
 					status.UnknownDisabled = append(status.UnknownDisabled, host.InventoryPath)
-					log.Warn(err)
+					op.Warn(err)
 				}
 			default:
 				v.NoteIssue(err)
@@ -186,67 +188,69 @@ func (v *Validator) CheckFirewallForTether(ctx context.Context, mgmtIP net.IPNet
 
 // FirewallCheckOutput outputs firewall status messages associated
 // with the hosts in each of the status categories
-func (v *Validator) FirewallCheckOutput(status FirewallStatus) {
+func (v *Validator) FirewallCheckOutput(ctx context.Context, status FirewallStatus) {
+	op := trace.FromContext(ctx, "FirewallCheckOutput")
+
 	var err error
 	// TODO: when we can intelligently place containerVMs on hosts with proper config, install
 	// can proceed if there is at least one host properly configured. For now this prevents install.
 	if len(status.Correct) > 0 {
-		log.Info("Firewall configuration OK on hosts:")
+		op.Info("Firewall configuration OK on hosts:")
 		for _, h := range status.Correct {
-			log.Infof("\t%q", h)
+			op.Infof("\t%q", h)
 		}
 	}
 	if len(status.MisconfiguredEnabled) > 0 {
-		log.Error("Firewall configuration incorrect on hosts:")
+		op.Error("Firewall configuration incorrect on hosts:")
 		for _, h := range status.MisconfiguredEnabled {
-			log.Errorf("\t%q", h)
+			op.Errorf("\t%q", h)
 		}
 		err = fmt.Errorf("Firewall must permit %s %d/%s %s to the VCH management interface",
 			status.Rule.PortType, status.Rule.Port, status.Rule.Protocol, status.Rule.Direction)
-		log.Error(err)
+		op.Error(err)
 		v.NoteIssue(err)
 	}
 	if len(status.MisconfiguredAllowedIPEnabled) > 0 {
-		log.Error("Firewall configuration incorrect due to allowed IP restrictions on hosts:")
+		op.Error("Firewall configuration incorrect due to allowed IP restrictions on hosts:")
 		for _, h := range status.MisconfiguredAllowedIPEnabled {
-			log.Errorf("\t%q", h)
+			op.Errorf("\t%q", h)
 		}
 		err = fmt.Errorf("Firewall must permit %s %d/%s %s to the VCH management interface",
 			status.Rule.PortType, status.Rule.Port, status.Rule.Protocol, status.Rule.Direction)
-		log.Error(err)
+		op.Error(err)
 		v.NoteIssue(err)
 	}
 	if len(status.MisconfiguredDisabled) > 0 {
-		log.Warning("Firewall configuration will be incorrect if firewall is reenabled on hosts:")
+		op.Warn("Firewall configuration will be incorrect if firewall is reenabled on hosts:")
 		for _, h := range status.MisconfiguredDisabled {
-			log.Warningf("\t%q", h)
+			op.Warnf("\t%q", h)
 		}
-		log.Infof("Firewall must permit %s %d/%s %s to VCH management interface if firewall is reenabled",
+		op.Infof("Firewall must permit %s %d/%s %s to VCH management interface if firewall is reenabled",
 			status.Rule.PortType, status.Rule.Port, status.Rule.Protocol, status.Rule.Direction)
 	}
 
 	preMsg := "Firewall allowed IP configuration may prevent required connection on hosts:"
 	postMsg := fmt.Sprintf("Firewall must permit %s %d/%s %s to the VCH management interface",
 		status.Rule.PortType, status.Rule.Port, status.Rule.Protocol, status.Rule.Direction)
-	v.FirewallCheckDHCPMessage(status.UnknownEnabled, preMsg, postMsg)
+	v.firewallCheckDHCPMessage(op, status.UnknownEnabled, preMsg, postMsg)
 
 	preMsg = "Firewall configuration may be incorrect if firewall is reenabled on hosts:"
 	postMsg = fmt.Sprintf("Firewall must permit %s %d/%s %s to the VCH management interface if firewall is reenabled",
 		status.Rule.PortType, status.Rule.Port, status.Rule.Protocol, status.Rule.Direction)
-	v.FirewallCheckDHCPMessage(status.UnknownDisabled, preMsg, postMsg)
+	v.firewallCheckDHCPMessage(op, status.UnknownDisabled, preMsg, postMsg)
 }
 
-// FirewallCheckDHCPMessage outputs warning message when we are unable to check
+// firewallCheckDHCPMessage outputs warning message when we are unable to check
 // that the management interface is allowed by the host firewall allowed IP rules due to DHCP
-func (v *Validator) FirewallCheckDHCPMessage(hosts []string, preMsg, postMsg string) {
+func (v *Validator) firewallCheckDHCPMessage(op trace.Operation, hosts []string, preMsg, postMsg string) {
 	if len(hosts) > 0 {
-		log.Warn("Unable to fully verify firewall configuration due to DHCP use on management network")
-		log.Warn("VCH management interface IP assigned by DHCP must be permitted by allowed IP settings")
-		log.Warn(preMsg)
+		op.Warn("Unable to fully verify firewall configuration due to DHCP use on management network")
+		op.Warn("VCH management interface IP assigned by DHCP must be permitted by allowed IP settings")
+		op.Warn(preMsg)
 		for _, h := range hosts {
-			log.Warningf("\t%q", h)
+			op.Warnf("\t%q", h)
 		}
-		log.Infof(postMsg)
+		op.Info(postMsg)
 	}
 }
 
@@ -281,7 +285,7 @@ func isMethodNotFoundError(err error) bool {
 }
 
 // FirewallEnabled checks if the host firewall is enabled
-func (v *Validator) FirewallEnabled(host *object.HostSystem) (bool, error) {
+func (v *Validator) firewallEnabled(op trace.Operation, host *object.HostSystem) (bool, error) {
 	esxfw, err := esxcli.GetFirewallInfo(host)
 	if err != nil {
 		if isMethodNotFoundError(err) {
@@ -290,10 +294,10 @@ func (v *Validator) FirewallEnabled(host *object.HostSystem) (bool, error) {
 		return false, err
 	}
 	if esxfw.Enabled {
-		log.Infof("Firewall status: ENABLED on %q", host.InventoryPath)
+		op.Infof("Firewall status: ENABLED on %q", host.InventoryPath)
 		return true, nil
 	}
-	log.Infof("Firewall status: DISABLED on %q", host.InventoryPath)
+	op.Infof("Firewall status: DISABLED on %q", host.InventoryPath)
 	return false, nil
 }
 
@@ -316,12 +320,13 @@ func (v *Validator) GetMgmtIP(conf *config.VirtualContainerHostConfigSpec) net.I
 // on the host firewall's allowed IP settings
 func (v *Validator) ManagementNetAllowed(ctx context.Context, mgmtIP net.IPNet,
 	host *object.HostSystem, requiredRule types.HostFirewallRule) (bool, error) {
+	op := trace.FromContext(ctx, "ManagementNetAllowed")
 
-	fs, err := host.ConfigManager().FirewallSystem(ctx)
+	fs, err := host.ConfigManager().FirewallSystem(op)
 	if err != nil {
 		return false, err
 	}
-	info, err := fs.Info(ctx)
+	info, err := fs.Info(op)
 	if err != nil {
 		return false, err
 	}
@@ -336,13 +341,13 @@ func (v *Validator) ManagementNetAllowed(ctx context.Context, mgmtIP net.IPNet,
 	if err != nil {                                            // rule not enabled (fw is misconfigured)
 		return false, &FirewallMisconfiguredError{Host: host.InventoryPath, Rule: requiredRule}
 	}
-	log.Debugf("filtered rules: %v", filteredRules)
+	op.Debugf("filtered rules: %v", filteredRules)
 
 	// check that allowed IPs permit management IP
 	var allowedIPs []string
 	var allowedNets []string
 	for _, r := range filteredRules {
-		log.Debugf("filtered IPs: %v networks: %v allIP: %v rule: %v",
+		op.Debugf("filtered IPs: %v networks: %v allIP: %v rule: %v",
 			r.AllowedHosts.IpAddress, r.AllowedHosts.IpNetwork, r.AllowedHosts.AllIp, r.Key)
 
 		if r.AllowedHosts.AllIp { // this rule allows all hosts
@@ -379,21 +384,24 @@ func (v *Validator) ManagementNetAllowed(ctx context.Context, mgmtIP net.IPNet,
 		TargetIP: mgmtIP}
 }
 
+// CheckLicense checks license features on the Validator's target
 func (v *Validator) CheckLicense(ctx context.Context) {
+	op := trace.FromContext(ctx, "CheckLicense")
+
 	var err error
 
 	errMsg := "License check SKIPPED"
-	if !v.sessionValid(errMsg) {
+	if !v.sessionValid(op, errMsg) {
 		return
 	}
 
 	if v.IsVC() {
-		if err = v.checkAssignedLicenses(ctx); err != nil {
+		if err = v.checkAssignedLicenses(op); err != nil {
 			v.NoteIssue(err)
 			return
 		}
 	} else {
-		if err = v.checkLicense(ctx); err != nil {
+		if err = v.checkLicense(op); err != nil {
 			v.NoteIssue(err)
 			return
 		}
@@ -409,21 +417,22 @@ func (v *Validator) assignedLicenseHasFeature(la []types.LicenseAssignmentManage
 	return false
 }
 
-func (v *Validator) checkAssignedLicenses(ctx context.Context) error {
+// checkAssignedLicenses checks for the features required on vCenter
+func (v *Validator) checkAssignedLicenses(op trace.Operation) error {
 	var hosts []*object.HostSystem
 	var invalidLic []string
 	var validLic []string
 	var err error
 	client := v.Session.Client.Client
 
-	if hosts, err = v.Session.Datastore.AttachedClusterHosts(ctx, v.Session.Cluster); err != nil {
-		log.Errorf("Unable to get the list of hosts attached to given storage: %s", err)
+	if hosts, err = v.Session.Datastore.AttachedClusterHosts(op, v.Session.Cluster); err != nil {
+		op.Errorf("Unable to get the list of hosts attached to given storage: %s", err)
 		return err
 	}
 
 	lm := license.NewManager(client)
 
-	am, err := lm.AssignmentManager(ctx)
+	am, err := lm.AssignmentManager(op)
 	if err != nil {
 		return err
 	}
@@ -432,7 +441,7 @@ func (v *Validator) checkAssignedLicenses(ctx context.Context) error {
 
 	for _, host := range hosts {
 		valid := true
-		la, err := am.QueryAssigned(ctx, host.Reference().Value)
+		la, err := am.QueryAssigned(op, host.Reference().Value)
 		if err != nil {
 			return err
 		}
@@ -451,15 +460,15 @@ func (v *Validator) checkAssignedLicenses(ctx context.Context) error {
 	}
 
 	if len(validLic) > 0 {
-		log.Infof("License check OK on hosts:")
+		op.Info("License check OK on hosts:")
 		for _, h := range validLic {
-			log.Infof("  %q", h)
+			op.Infof("  %q", h)
 		}
 	}
 	if len(invalidLic) > 0 {
-		log.Errorf("License check FAILED on hosts:")
+		op.Error("License check FAILED on hosts:")
 		for _, h := range invalidLic {
-			log.Errorf("  %q", h)
+			op.Errorf("  %q", h)
 		}
 		msg := "License does not meet minimum requirements to use VIC"
 		return errors.New(msg)
@@ -467,16 +476,16 @@ func (v *Validator) checkAssignedLicenses(ctx context.Context) error {
 	return nil
 }
 
-func (v *Validator) checkLicense(ctx context.Context) error {
+// checkLicense checks for the features required on standalone ESXi
+func (v *Validator) checkLicense(op trace.Operation) error {
 	var invalidLic []string
 	client := v.Session.Client.Client
 
 	lm := license.NewManager(client)
-	licenses, err := lm.List(ctx)
+	licenses, err := lm.List(op)
 	if err != nil {
 		return err
 	}
-	v.checkEvalLicense(licenses)
 
 	features := []string{"serialuri"}
 
@@ -488,72 +497,122 @@ func (v *Validator) checkLicense(ctx context.Context) error {
 	}
 
 	if len(invalidLic) > 0 {
-		log.Errorf("License check FAILED:")
+		op.Error("License check FAILED:")
 		for _, h := range invalidLic {
-			log.Errorf("  %q", h)
+			op.Errorf("  %q", h)
 		}
 		msg := "License does not meet minimum requirements to use VIC"
 		return errors.New(msg)
 	}
-	log.Infof("License check OK")
+	op.Info("License check OK")
 	return nil
 }
 
-func (v *Validator) checkEvalLicense(licenses []types.LicenseManagerLicenseInfo) {
-	for _, l := range licenses {
-		if l.EditionKey == "eval" {
-			log.Warning("Evaluation license detected. VIC may not function if evaluation expires or insufficient license is later assigned.")
-		}
-	}
-}
-
-// isStandaloneHost checks if host is ESX or vCenter with single host
-func (v *Validator) isStandaloneHost() bool {
-	cl := v.Session.Cluster.Reference()
+// CheckDRS will validate DRS settings.  If DRS is disabled then config
+// options surrounding resource pools will be ignored.
+func (v *Validator) CheckDRS(ctx context.Context, input *data.Data) {
+	op := trace.FromContext(ctx, "CheckDRS")
+	defer trace.End(trace.Begin("", op))
 
-	if cl.Type != "ClusterComputeResource" {
-		return true
+	errMsg := "DRS check SKIPPED"
+	if !v.sessionValid(op, errMsg) || !v.Session.IsVC() {
+		return
 	}
-	return false
-}
 
-// drs checks that DRS is enabled
-func (v *Validator) CheckDrs(ctx context.Context) {
-	if v.DisableDRSCheck {
+	// TODO:  Cluster should only every be a cluster
+	if v.Session.Cluster.Reference().Type != "ClusterComputeResource" {
+		op.Info("DRS check SKIPPED - target is standalone host")
 		return
 	}
-	defer trace.End(trace.Begin(""))
 
-	errMsg := "DRS check SKIPPED"
-	if !v.sessionValid(errMsg) {
-		return
+	// TODO: @ROBO - if we can't verify DRS is vic placement acceptable
+	// TODO: Practice DRY -- this is also in session.Populate
+	if v.Session.DRSEnabled == nil {
+		cc := object.NewClusterComputeResource(v.Session.Client.Client, v.Session.Cluster.Reference())
+		clusterConfig, err := cc.Configuration(op)
+		if err != nil {
+			op.Error("DRS check FAILED")
+			op.Errorf("  vSphere communication error: %s", err)
+			v.NoteIssue(errors.New("Unable to verify DRS Status"))
+			return
+		}
+		v.Session.DRSEnabled = clusterConfig.DrsConfig.Enabled
 	}
 
-	cl := v.Session.Cluster
-	ref := cl.Reference()
+	// if DRS is disabled warn
+	if !*v.Session.DRSEnabled {
+		op.Warn("DRS is recommended, but is disabled:")
+		op.Warnf("  VIC will select container hosts from %q", v.Session.Cluster.InventoryPath)
 
-	if v.isStandaloneHost() {
-		log.Info("DRS check SKIPPED - target is standalone host")
+		// DRS is disabled so there are no resource pools -- if resource pool config options have
+		// been provided let the user know that they will not be used
+		var disabled []string
+		if input.VCHCPULimitsMHz != nil {
+			disabled = append(disabled, "CPU Limit")
+			input.VCHCPULimitsMHz = nil
+		}
+		if input.VCHCPUReservationsMHz != nil {
+			disabled = append(disabled, "CPU Reservation")
+			input.VCHCPUReservationsMHz = nil
+		}
+		if input.VCHCPUShares != nil {
+			disabled = append(disabled, "CPU Shares")
+			input.VCHCPUShares = nil
+		}
+		if input.VCHMemoryLimitsMB != nil {
+			disabled = append(disabled, "Memory Limit")
+			input.VCHMemoryLimitsMB = nil
+		}
+		if input.VCHMemoryReservationsMB != nil {
+			disabled = append(disabled, "Memory Reservation")
+			input.VCHMemoryReservationsMB = nil
+		}
+		if input.VCHMemoryShares != nil {
+			disabled = append(disabled, "Memory Shares")
+			input.VCHMemoryShares = nil
+		}
+
+		if len(disabled) > 0 {
+			op.Warn("  Provided VCH Resource Pool options are ignored:")
+			for i := range disabled {
+				op.Warnf("    %s", disabled[i])
+			}
+		}
 		return
+
 	}
 
-	var ccr mo.ClusterComputeResource
+	op.Info("DRS check OK on:")
+	op.Infof("  %q", v.Session.Cluster.InventoryPath)
+}
 
-	err := cl.Properties(ctx, ref, []string{"configurationEx"}, &ccr)
-	if err != nil {
-		msg := fmt.Sprintf("Failed to validate DRS config: %s", err)
-		v.NoteIssue(errors.New(msg))
-		return
-	}
+// check that PersistNetworkBacking is set
+func (v *Validator) CheckPersistNetworkBacking(ctx context.Context, quiet bool) bool {
+	op := trace.FromContext(ctx, "Check vCenter serial port backing")
+	defer trace.End(trace.Begin("", op))
 
-	z := ccr.ConfigurationEx.(*types.ClusterConfigInfoEx).DrsConfig
+	errMsg := "vCenter settings check SKIPPED"
+	if !v.sessionValid(op, errMsg) {
+		return false
+	}
+	if !v.IsVC() {
+		op.Debug(errMsg)
+		return true
+	}
 
-	if !(*z.Enabled) {
-		log.Error("DRS check FAILED")
-		log.Errorf("  DRS must be enabled on cluster %q", v.Session.Cluster.InventoryPath)
-		v.NoteIssue(errors.New("DRS must be enabled to use VIC"))
-		return
+	val, err := optmanager.QueryOptionValue(ctx, v.Session, persistNetworkBackingKey)
+	if err != nil {
+		// the key is not set
+		val = "false"
+	}
+	if val != "true" {
+		if !quiet {
+			op.Errorf("vCenter settings check FAILED")
+			msg := fmt.Sprintf("vCenter advanced option %s=true must be set", persistNetworkBackingKey)
+			v.NoteIssue(errors.New(msg))
+		}
+		return false
 	}
-	log.Info("DRS check OK on:")
-	log.Infof("  %q", v.Session.Cluster.InventoryPath)
+	op.Infof("vCenter settings check OK")
+	return true
 }
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/config_to_data.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/config_to_data.go
index ca7c7ef354..9f820d1cf1 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/config_to_data.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/config_to_data.go
@@ -1,4 +1,4 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
+// Copyright 2017-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -21,7 +21,6 @@ import (
 	"path"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/docker/go-units"
 
 	"github.com/vmware/govmomi/object"
@@ -30,6 +29,7 @@ import (
 	"github.com/vmware/vic/lib/config"
 	"github.com/vmware/vic/lib/config/executor"
 	"github.com/vmware/vic/lib/install/data"
+	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/vsphere/vm"
 )
 
@@ -45,52 +45,59 @@ type Finder interface {
 
 // SetDataFromVM set value based on VCH VM properties
 func SetDataFromVM(ctx context.Context, finder Finder, vm *vm.VirtualMachine, d *data.Data) error {
+	op := trace.FromContext(ctx, "SetDataFromVM")
+
 	// display name
-	name, err := vm.Name(ctx)
+	name, err := vm.ObjectName(op)
 	if err != nil {
 		return err
 	}
 	d.DisplayName = name
 
+	// id
+	d.ID = vm.Reference().Value
+
 	// compute resource
-	parent, err := vm.ResourcePool(ctx)
+	parent, err := vm.ResourcePool(op)
 	if err != nil {
 		return err
 	}
 
-	if parent.Reference().Type != "VirtualApp" {
-		d.UseRP = true
-	}
-
 	var mrp mo.ResourcePool
-	if err = parent.Properties(ctx, parent.Reference(), []string{"parent"}, &mrp); err != nil {
+	if err = parent.Properties(op, parent.Reference(), []string{"parent"}, &mrp); err != nil {
 		return err
 	}
 
 	if mrp.Parent == nil {
 		return fmt.Errorf("Failed to get parent resource pool")
 	}
-	or, err := finder.ObjectReference(ctx, *mrp.Parent)
+	or, err := finder.ObjectReference(op, *mrp.Parent)
 	if err != nil {
 		return err
 	}
-	rp, ok := or.(*object.ResourcePool)
-	if !ok {
+
+	// we are attempting to present the resource pool inventory path
+	// in a DRS disabled environment that inventory path could point to a
+	// cluster, so we need to evaluate the type and set the path accordingly
+	switch r := or.(type) {
+	case *object.ResourcePool:
+		d.ComputeResourcePath = r.InventoryPath
+	case *object.ClusterComputeResource:
+		d.ComputeResourcePath = r.InventoryPath
+	default:
 		return fmt.Errorf("parent resource %s is not resource pool", mrp.Parent)
 	}
-	d.ComputeResourcePath = rp.InventoryPath
 
-	// Set VCH resource limits and VCH endpoint VM resource limits
-	setVCHResources(ctx, parent, d)
-	setApplianceResources(ctx, vm, d)
+	setVCHResources(op, parent, d)
+	setApplianceResources(op, vm, d)
 	return nil
 }
 
-func setApplianceResources(ctx context.Context, vm *vm.VirtualMachine, d *data.Data) error {
+func setApplianceResources(op trace.Operation, vm *vm.VirtualMachine, d *data.Data) error {
 	var m mo.VirtualMachine
 	ps := []string{"config.hardware.numCPU", "config.hardware.memoryMB"}
 
-	if err := vm.Properties(ctx, vm.Reference(), ps, &m); err != nil {
+	if err := vm.Properties(op, vm.Reference(), ps, &m); err != nil {
 		return err
 	}
 	if m.Config != nil {
@@ -101,11 +108,11 @@ func setApplianceResources(ctx context.Context, vm *vm.VirtualMachine, d *data.D
 }
 
 // setVCHResources will populate the configuration data based on the deployed VCH config
-func setVCHResources(ctx context.Context, vch *object.ResourcePool, d *data.Data) error {
+func setVCHResources(op trace.Operation, vch *object.ResourcePool, d *data.Data) error {
 	var p mo.ResourcePool
-	ps := []string{"config.cpuAllocation", "config.memoryAllocation"}
+	ps := []string{"config"}
 
-	if err := vch.Properties(ctx, vch.Reference(), ps, &p); err != nil {
+	if err := vch.Properties(op, vch.Reference(), ps, &p); err != nil {
 		return err
 	}
 
@@ -137,8 +144,10 @@ func setVCHResources(ctx context.Context, vch *object.ResourcePool, d *data.Data
 }
 
 // NewDataFromConfig converts VirtualContainerHostConfigSpec back to data.Data object
-// This method does not touch any configuration for VCH VM or resource pool, which should be retrieved from VM or vApp attributes
+// This method does not touch any configuration for VCH VM or resource pool, which should be retrieved from VM attributes
 func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualContainerHostConfigSpec) (d *data.Data, err error) {
+	op := trace.FromContext(ctx, "NewDataFromConfig")
+
 	if conf == nil {
 		err = fmt.Errorf("configuration is empty")
 		return
@@ -154,7 +163,7 @@ func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualC
 
 	d.AsymmetricRouting = conf.AsymmetricRouting
 
-	if err = setBridgeNetwork(ctx, finder, d, conf); err != nil {
+	if err = setBridgeNetwork(op, finder, d, conf); err != nil {
 		return
 	}
 
@@ -165,17 +174,17 @@ func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualC
 	d.ClientCAs = conf.Certificate.CertificateAuthorities
 	d.RegistryCAs = conf.RegistryCertificateAuthorities
 
-	clientNet, err := getNetworkConfig(ctx, finder, conf.ExecutorConfig.Networks[config.ClientNetworkName])
+	clientNet, err := getNetworkConfig(op, finder, conf.ExecutorConfig.Networks[config.ClientNetworkName])
 	if err != nil {
 		return
 	}
 	d.ClientNetwork = *clientNet
-	publicNet, err := getNetworkConfig(ctx, finder, conf.ExecutorConfig.Networks[config.PublicNetworkName])
+	publicNet, err := getNetworkConfig(op, finder, conf.ExecutorConfig.Networks[config.PublicNetworkName])
 	if err != nil {
 		return
 	}
 	d.PublicNetwork = *publicNet
-	mgmtNet, err := getNetworkConfig(ctx, finder, conf.ExecutorConfig.Networks[config.ManagementNetworkName])
+	mgmtNet, err := getNetworkConfig(op, finder, conf.ExecutorConfig.Networks[config.ManagementNetworkName])
 	if err != nil {
 		return
 	}
@@ -190,7 +199,7 @@ func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualC
 		d.ClientNetwork = data.NetworkConfig{}
 	}
 
-	if err = setContainerNetworks(ctx, finder, d, conf.Network.ContainerNetworks, conf.BridgeNetwork); err != nil {
+	if err = setContainerNetworks(op, finder, d, conf.Network.ContainerNetworks, conf.BridgeNetwork); err != nil {
 		return
 	}
 
@@ -206,7 +215,7 @@ func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualC
 	if err = setImageStore(d, conf); err != nil {
 		return
 	}
-	setVolumeLocations(d, conf)
+	setVolumeLocations(op, d, conf)
 	d.InsecureRegistries = conf.InsecureRegistries
 	d.WhitelistRegistries = conf.RegistryWhitelist
 	if d.ScratchSize, err = getHumanSize(conf.ScratchSize, "KB"); err != nil {
@@ -219,6 +228,7 @@ func NewDataFromConfig(ctx context.Context, finder Finder, conf *config.VirtualC
 	}
 
 	d.ContainerNameConvention = conf.ContainerNameConvention
+	d.UseVMGroup = conf.UseVMGroup
 	return
 }
 
@@ -253,13 +263,13 @@ func setImageStore(d *data.Data, conf *config.VirtualContainerHostConfigSpec) er
 	return nil
 }
 
-func setVolumeLocations(d *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+func setVolumeLocations(op trace.Operation, d *data.Data, conf *config.VirtualContainerHostConfigSpec) {
 	d.VolumeLocations = make(map[string]*url.URL, len(conf.VolumeLocations))
 
 	var dsURL object.DatastorePath
 	for k, v := range conf.VolumeLocations {
 		if ok := dsURL.FromString(v.Path); !ok {
-			log.Debugf("%s is not datastore path", v.Path)
+			op.Debugf("%s is not datastore path", v.Path)
 			d.VolumeLocations[k] = v
 			continue
 		}
@@ -307,13 +317,13 @@ func setHTTPProxies(d *data.Data, conf *config.VirtualContainerHostConfigSpec) e
 	return nil
 }
 
-func setContainerNetworks(ctx context.Context, finder Finder, d *data.Data, containerNetworks map[string]*executor.ContainerNetwork, bridge string) error {
+func setContainerNetworks(op trace.Operation, finder Finder, d *data.Data, containerNetworks map[string]*executor.ContainerNetwork, bridge string) error {
 	for k, v := range containerNetworks {
 		if k == bridge {
 			// bridge network is persisted in executor network as well, skip it here
 			continue
 		}
-		name, err := getNameFromID(ctx, finder, v.Common.ID)
+		name, err := getNameFromID(op, finder, v.Common.ID)
 		if err != nil {
 			return err
 		}
@@ -326,12 +336,12 @@ func setContainerNetworks(ctx context.Context, finder Finder, d *data.Data, cont
 	return nil
 }
 
-func getNetworkConfig(ctx context.Context, finder Finder, conf *executor.NetworkEndpoint) (net *data.NetworkConfig, err error) {
+func getNetworkConfig(op trace.Operation, finder Finder, conf *executor.NetworkEndpoint) (net *data.NetworkConfig, err error) {
 	net = &data.NetworkConfig{}
 	if conf == nil {
 		return
 	}
-	if net.Name, err = getNameFromID(ctx, finder, conf.Network.ID); err != nil {
+	if net.Name, err = getNameFromID(op, finder, conf.Network.ID); err != nil {
 		return
 	}
 	net.Destinations = conf.Network.Destinations
@@ -342,9 +352,9 @@ func getNetworkConfig(ctx context.Context, finder Finder, conf *executor.Network
 	return
 }
 
-func setBridgeNetwork(ctx context.Context, finder Finder, d *data.Data, conf *config.VirtualContainerHostConfigSpec) error {
+func setBridgeNetwork(op trace.Operation, finder Finder, d *data.Data, conf *config.VirtualContainerHostConfigSpec) error {
 	bridgeNet := conf.ExecutorConfig.Networks[conf.Network.BridgeNetwork]
-	name, err := getNameFromID(ctx, finder, bridgeNet.Network.ID)
+	name, err := getNameFromID(op, finder, bridgeNet.Network.ID)
 	if err != nil {
 		return err
 	}
@@ -354,7 +364,7 @@ func setBridgeNetwork(ctx context.Context, finder Finder, d *data.Data, conf *co
 	return nil
 }
 
-func getNameFromID(ctx context.Context, finder Finder, mobID string) (string, error) {
+func getNameFromID(op trace.Operation, finder Finder, mobID string) (string, error) {
 	moref := new(types.ManagedObjectReference)
 	ok := moref.FromString(mobID)
 	if !ok {
@@ -365,7 +375,7 @@ func getNameFromID(ctx context.Context, finder Finder, mobID string) (string, er
 		return "", fmt.Errorf("finder is not set")
 	}
 
-	obj, err := finder.ObjectReference(ctx, *moref)
+	obj, err := finder.ObjectReference(op, *moref)
 	if err != nil {
 		return "", err
 	}
@@ -375,6 +385,6 @@ func getNameFromID(ctx context.Context, finder Finder, mobID string) (string, er
 	}
 	name := obj.(common).Name()
 
-	log.Debugf("%s name: %s", mobID, name)
+	op.Debugf("%s name: %s", mobID, name)
 	return name, nil
 }
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/network.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/network.go
index b66c950e2b..3d07941ea0 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/network.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/network.go
@@ -20,10 +20,6 @@ import (
 	"path"
 	"strings"
 
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
 	"github.com/vmware/govmomi/find"
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/mo"
@@ -36,20 +32,20 @@ import (
 	"github.com/vmware/vic/pkg/trace"
 )
 
-func (v *Validator) getEndpoint(ctx context.Context, conf *config.VirtualContainerHostConfigSpec, network data.NetworkConfig, epName, contNetName string, def bool, ns []net.IP) (*executor.NetworkEndpoint, error) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) getEndpoint(op trace.Operation, conf *config.VirtualContainerHostConfigSpec, network data.NetworkConfig, epName, contNetName string, def bool, ns []net.IP) (*executor.NetworkEndpoint, error) {
+	defer trace.End(trace.Begin("", op))
 	var gw net.IPNet
 	var dest []net.IPNet
 	var staticIP *net.IPNet
 
 	if !network.Empty() {
-		log.Debugf("Setting static IP for %q on port group %q", contNetName, network.Name)
+		op.Debugf("Setting static IP for %q on port group %q", contNetName, network.Name)
 		gw = network.Gateway
 		dest = network.Destinations
 		staticIP = &network.IP
 	}
 
-	moid, err := v.networkHelper(ctx, network.Name)
+	moid, err := v.networkHelper(op, network.Name)
 	if err != nil {
 		return nil, err
 	}
@@ -85,8 +81,8 @@ func (v *Validator) checkNetworkConflict(bridgeNetName, otherNetName, otherNetTy
 
 // portGroupConfig gets the input config for all networks
 // for use in checking that the config is valid
-func (v *Validator) portGroupConfig(input *data.Data, ips map[string][]data.NetworkConfig) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) portGroupConfig(op trace.Operation, input *data.Data, ips map[string][]data.NetworkConfig) {
+	defer trace.End(trace.Begin("", op))
 
 	if input.ManagementNetwork.Name != "" {
 		if !input.ManagementNetwork.Empty() {
@@ -109,8 +105,8 @@ func (v *Validator) portGroupConfig(input *data.Data, ips map[string][]data.Netw
 // enforce that networks that share a port group with public are configured via the pubic args
 // prevent assigning > 1 static IP to the same port group
 // warn if assigning addresses in the same subnet to > 1 port group
-func (v *Validator) checkPortGroups(input *data.Data, ips map[string][]data.NetworkConfig) error {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) checkPortGroups(op trace.Operation, input *data.Data, ips map[string][]data.NetworkConfig) error {
+	defer trace.End(trace.Begin("", op))
 
 	networks := make(map[string]string)
 
@@ -121,9 +117,9 @@ func (v *Validator) checkPortGroups(input *data.Data, ips map[string][]data.Netw
 		config.ManagementNetworkName: &input.ManagementNetwork,
 	} {
 		if n.Name == input.PublicNetwork.Name && !n.Empty() {
-			log.Errorf("%s network shares port group with public network, but has static IP configuration", nn)
-			log.Errorf("To resolve this, configure static IP for public network and assign %s network to same port group", nn)
-			log.Error("The static IP will be automatically configured for networks sharing the port group")
+			op.Errorf("%s network shares port group with public network, but has static IP configuration", nn)
+			op.Errorf("To resolve this, configure static IP for public network and assign %s network to same port group", nn)
+			op.Error("The static IP will be automatically configured for networks sharing the port group")
 			shared = true
 		}
 	}
@@ -138,10 +134,10 @@ func (v *Validator) checkPortGroups(input *data.Data, ips map[string][]data.Netw
 			for _, v := range config {
 				msgIPs = append(msgIPs, v.IP.IP.String())
 			}
-			log.Errorf("Port group %q is configured for networks with more than one static IP: %s", pg, msgIPs)
-			log.Error("All VCH networks on the same port group must have the same IP address")
-			log.Error("To resolve this, configure static IP for one network and assign other networks to same port group")
-			log.Error("The static IP will be automatically configured for networks sharing the port group")
+			op.Errorf("Port group %q is configured for networks with more than one static IP: %s", pg, msgIPs)
+			op.Error("All VCH networks on the same port group must have the same IP address")
+			op.Error("To resolve this, configure static IP for one network and assign other networks to same port group")
+			op.Error("The static IP will be automatically configured for networks sharing the port group")
 			return fmt.Errorf("Incorrect static IP configuration for networks on port group %q", pg)
 		}
 
@@ -150,7 +146,7 @@ func (v *Validator) checkPortGroups(input *data.Data, ips map[string][]data.Netw
 		_, net, _ := net.ParseCIDR(config[0].IP.String())
 		netAddr := net.String()
 		if networks[netAddr] != "" {
-			log.Warnf("Unsupported static IP configuration: Same subnet %q is assigned to multiple port groups %q and %q", netAddr, networks[netAddr], pg)
+			op.Warnf("Unsupported static IP configuration: Same subnet %q is assigned to multiple port groups %q and %q", netAddr, networks[netAddr], pg)
 		} else {
 			networks[netAddr] = pg
 		}
@@ -161,15 +157,15 @@ func (v *Validator) checkPortGroups(input *data.Data, ips map[string][]data.Netw
 
 // configureSharedPortGroups sets VCH static IP for networks that share a
 // portgroup with another network that has a configured static IP
-func (v *Validator) configureSharedPortGroups(input *data.Data, ips map[string][]data.NetworkConfig) error {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) configureSharedPortGroups(op trace.Operation, input *data.Data, ips map[string][]data.NetworkConfig) error {
+	defer trace.End(trace.Begin("", op))
 
 	// find other networks using same portgroup and copy the NetworkConfig to them
 	for name, config := range ips {
 		if len(config) != 1 {
 			return fmt.Errorf("Failed to configure static IP for additional networks using port group %q", name)
 		}
-		log.Infof("Configuring static IP for additional networks using port group %q", name)
+		op.Infof("Configuring static IP for additional networks using port group %q", name)
 		if input.ClientNetwork.Name == name && input.ClientNetwork.Empty() {
 			input.ClientNetwork = config[0]
 		}
@@ -184,8 +180,8 @@ func (v *Validator) configureSharedPortGroups(input *data.Data, ips map[string][
 	return nil
 }
 
-func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) network(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	var e *executor.NetworkEndpoint
 	var err error
@@ -199,12 +195,12 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 	}
 
 	i := make(map[string][]data.NetworkConfig) // user configured IPs for portgroup
-	v.portGroupConfig(input, i)
+	v.portGroupConfig(op, input, i)
 
-	err = v.checkPortGroups(input, i)
+	err = v.checkPortGroups(op, input, i)
 	v.NoteIssue(err)
 
-	err = v.configureSharedPortGroups(input, i)
+	err = v.configureSharedPortGroups(op, input, i)
 	v.NoteIssue(err)
 
 	// client and management networks need to have at least one
@@ -238,35 +234,35 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 	usingDHCP := ip.IsUnspecifiedIP(input.ClientNetwork.IP.IP) || ip.IsUnspecifiedIP(input.PublicNetwork.IP.IP) || ip.IsUnspecifiedIP(input.ManagementNetwork.IP.IP)
 
 	if !usingDHCP && !specifiedDNS { // Set default DNS servers
-		log.Debug("Setting default DNS servers 8.8.8.8 and 8.8.4.4")
+		op.Debugf("Setting default DNS servers 8.8.8.8 and 8.8.4.4")
 		input.DNS = []net.IP{net.ParseIP("8.8.8.8"), net.ParseIP("8.8.4.4")}
 	}
 
 	// Public net
 	// public network is default for appliance
-	e, err = v.getEndpoint(ctx, conf, input.PublicNetwork, config.PublicNetworkName, config.PublicNetworkName, true, input.DNS)
+	e, err = v.getEndpoint(op, conf, input.PublicNetwork, config.PublicNetworkName, config.PublicNetworkName, true, input.DNS)
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Error checking network for --public-network: %s", err))
-		v.suggestNetwork("--public-network", true)
+		v.suggestNetwork(op, "--public-network", true)
 	}
 	// Bridge network should be different than all other networks
 	v.checkNetworkConflict(input.BridgeNetworkName, input.PublicNetwork.Name, config.PublicNetworkName)
 	conf.AddNetwork(e)
 
 	// Client net - defaults to connect to same portgroup as public
-	e, err = v.getEndpoint(ctx, conf, input.ClientNetwork, config.ClientNetworkName, config.ClientNetworkName, false, input.DNS)
+	e, err = v.getEndpoint(op, conf, input.ClientNetwork, config.ClientNetworkName, config.ClientNetworkName, false, input.DNS)
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Error checking network for --client-network: %s", err))
-		v.suggestNetwork("--client-network", true)
+		v.suggestNetwork(op, "--client-network", true)
 	}
 	v.checkNetworkConflict(input.BridgeNetworkName, input.ClientNetwork.Name, config.ClientNetworkName)
 	conf.AddNetwork(e)
 
 	// Management net - defaults to connect to the same portgroup as client
-	e, err = v.getEndpoint(ctx, conf, input.ManagementNetwork, "", config.ManagementNetworkName, false, input.DNS)
+	e, err = v.getEndpoint(op, conf, input.ManagementNetwork, "", config.ManagementNetworkName, false, input.DNS)
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Error checking network for --management-network: %s", err))
-		v.suggestNetwork("--management-network", true)
+		v.suggestNetwork(op, "--management-network", true)
 	}
 	v.checkNetworkConflict(input.BridgeNetworkName, input.ManagementNetwork.Name, config.ManagementNetworkName)
 	conf.AddNetwork(e)
@@ -277,7 +273,7 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 	//
 	// for now we're hardcoded to "bridge" for the container host name
 	conf.BridgeNetwork = "bridge"
-	endpointMoref, err := v.dpgHelper(ctx, input.BridgeNetworkName)
+	endpointMoref, err := v.dpgHelper(op, input.BridgeNetworkName)
 
 	var bridgeID, netMoid string
 	if err != nil {
@@ -292,7 +288,7 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 	if err != nil {
 		if _, ok := err.(*find.NotFoundError); !ok || v.IsVC() {
 			v.NoteIssue(fmt.Errorf("An existing distributed port group must be specified for bridge network on vCenter: %s", err))
-			v.suggestNetwork("--bridge-network", false)
+			v.suggestNetwork(op, "--bridge-network", false)
 			checkBridgeVDS = false // prevent duplicate error output
 		}
 
@@ -330,12 +326,12 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 	}
 	conf.BridgeIPRange = input.BridgeIPRange
 
-	log.Debug("Network configuration:")
+	op.Debug("Network configuration:")
 	for net, val := range conf.ExecutorConfig.Networks {
-		log.Debugf("\tNetwork: %s NetworkEndpoint: %v", net, val)
+		op.Debugf("\tNetwork: %s NetworkEndpoint: %v", net, val)
 	}
 
-	err = v.checkVDSMembership(ctx, endpointMoref, input.BridgeNetworkName)
+	err = v.checkVDSMembership(op, endpointMoref, input.BridgeNetworkName)
 	if err != nil && checkBridgeVDS {
 		v.NoteIssue(fmt.Errorf("Unable to check hosts in vDS for %q: %s", input.BridgeNetworkName, err))
 	}
@@ -392,12 +388,12 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 			continue
 		}
 
-		moref, err := v.dpgHelper(ctx, net)
+		moref, err := v.dpgHelper(op, net)
 		if err != nil {
 			v.NoteIssue(fmt.Errorf("Error adding container network %q: %s", name, err))
 			checkMappedVDS = false
 			if !suggestedMapped {
-				v.suggestNetwork("--container-network", true)
+				v.suggestNetwork(op, "--container-network", true)
 				suggestedMapped = true
 			}
 		}
@@ -416,7 +412,7 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 			v.NoteIssue(errors.Errorf("the bridge network must not be shared with another network role - %q also mapped as container network %q", input.BridgeNetworkName, name))
 		}
 
-		err = v.checkVDSMembership(ctx, moref, net)
+		err = v.checkVDSMembership(op, moref, net)
 		if err != nil && checkMappedVDS {
 			v.NoteIssue(fmt.Errorf("Unable to check hosts in vDS for %q: %s", net, err))
 		}
@@ -428,8 +424,8 @@ func (v *Validator) network(ctx context.Context, input *data.Data, conf *config.
 }
 
 // generateBridgeName returns a name that can be used to create a switch/pg pair on ESX
-func (v *Validator) generateBridgeName(ctx, input *data.Data, conf *config.VirtualContainerHostConfigSpec) string {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) generateBridgeName(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) string {
+	defer trace.End(trace.Begin("", op))
 
 	return input.DisplayName
 }
@@ -448,12 +444,12 @@ func (v *Validator) checkBridgeIPRange(bridgeIPRange *net.IPNet) error {
 }
 
 // getNetwork gets a moref based on the network name
-func (v *Validator) getNetwork(ctx context.Context, name string) (object.NetworkReference, error) {
-	defer trace.End(trace.Begin(name))
+func (v *Validator) getNetwork(op trace.Operation, name string) (object.NetworkReference, error) {
+	defer trace.End(trace.Begin(name, op))
 
-	nets, err := v.Session.Finder.NetworkList(ctx, name)
+	nets, err := v.Session.Finder.NetworkList(op, name)
 	if err != nil {
-		log.Debugf("no such network %q", name)
+		op.Debugf("no such network %q", name)
 		// TODO: error message about no such match and how to get a network list
 		// we return err directly here so we can check the type
 		return nil, err
@@ -466,10 +462,10 @@ func (v *Validator) getNetwork(ctx context.Context, name string) (object.Network
 }
 
 // networkHelper gets a moid based on the network name
-func (v *Validator) networkHelper(ctx context.Context, name string) (string, error) {
-	defer trace.End(trace.Begin(name))
+func (v *Validator) networkHelper(op trace.Operation, name string) (string, error) {
+	defer trace.End(trace.Begin(name, op))
 
-	net, err := v.getNetwork(ctx, name)
+	net, err := v.getNetwork(op, name)
 	if err != nil {
 		return "", err
 	}
@@ -477,8 +473,8 @@ func (v *Validator) networkHelper(ctx context.Context, name string) (string, err
 	return moref.String(), nil
 }
 
-func (v *Validator) dpgMorefHelper(ctx context.Context, ref string) (string, error) {
-	defer trace.End(trace.Begin(ref))
+func (v *Validator) dpgMorefHelper(op trace.Operation, ref string) (string, error) {
+	defer trace.End(trace.Begin(ref, op))
 
 	moref := new(types.ManagedObjectReference)
 	ok := moref.FromString(ref)
@@ -487,7 +483,7 @@ func (v *Validator) dpgMorefHelper(ctx context.Context, ref string) (string, err
 		return "", errors.New("could not restore serialized managed object reference: " + ref)
 	}
 
-	net, err := v.Session.Finder.ObjectReference(ctx, *moref)
+	net, err := v.Session.Finder.ObjectReference(op, *moref)
 	if err != nil {
 		// TODO: error message about no such match and how to get a network list
 		return "", errors.New("unable to locate network from moref: " + ref)
@@ -505,10 +501,10 @@ func (v *Validator) dpgMorefHelper(ctx context.Context, ref string) (string, err
 	return ref, nil
 }
 
-func (v *Validator) dpgHelper(ctx context.Context, path string) (types.ManagedObjectReference, error) {
-	defer trace.End(trace.Begin(path))
+func (v *Validator) dpgHelper(op trace.Operation, path string) (types.ManagedObjectReference, error) {
+	defer trace.End(trace.Begin(path, op))
 
-	net, err := v.getNetwork(ctx, path)
+	net, err := v.getNetwork(op, path)
 	if err != nil {
 		return types.ManagedObjectReference{}, err
 	}
@@ -526,8 +522,8 @@ func (v *Validator) dpgHelper(ctx context.Context, path string) (types.ManagedOb
 }
 
 // inDVP checks if the host is in the distributed virtual portgroup (dvpHosts)
-func (v *Validator) inDVP(host types.ManagedObjectReference, dvpHosts []types.ManagedObjectReference) bool {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) inDVP(op trace.Operation, host types.ManagedObjectReference, dvpHosts []types.ManagedObjectReference) bool {
+	defer trace.End(trace.Begin("", op))
 
 	for _, h := range dvpHosts {
 		if host == h {
@@ -538,8 +534,8 @@ func (v *Validator) inDVP(host types.ManagedObjectReference, dvpHosts []types.Ma
 }
 
 // checkVDSMembership verifes all hosts in the vCenter are connected to the vDS
-func (v *Validator) checkVDSMembership(ctx context.Context, network types.ManagedObjectReference, netName string) error {
-	defer trace.End(trace.Begin(network.Value))
+func (v *Validator) checkVDSMembership(op trace.Operation, network types.ManagedObjectReference, netName string) error {
+	defer trace.End(trace.Begin(network.Value, op))
 
 	var dvp mo.DistributedVirtualPortgroup
 	var nonMembers []string
@@ -552,40 +548,40 @@ func (v *Validator) checkVDSMembership(ctx context.Context, network types.Manage
 		return errors.New("Invalid cluster. Check --compute-resource")
 	}
 
-	clusterHosts, err := v.Session.Cluster.Hosts(ctx)
+	clusterHosts, err := v.Session.Cluster.Hosts(op)
 	if err != nil {
 		return err
 	}
 
 	r := object.NewDistributedVirtualPortgroup(v.Session.Client.Client, network)
-	if err := r.Properties(ctx, r.Reference(), []string{"name", "host"}, &dvp); err != nil {
+	if err := r.Properties(op, r.Reference(), []string{"name", "host"}, &dvp); err != nil {
 		return err
 	}
 
 	for _, h := range clusterHosts {
-		if !v.inDVP(h.Reference(), dvp.Host) {
+		if !v.inDVP(op, h.Reference(), dvp.Host) {
 			nonMembers = append(nonMembers, h.InventoryPath)
 		}
 	}
 
 	if len(nonMembers) > 0 {
-		log.Errorf("vDS configuration incorrect on %q. All cluster hosts must be in the vDS.", netName)
-		log.Errorf("  %q is missing hosts:", netName)
+		op.Errorf("vDS configuration incorrect on %q. All cluster hosts must be in the vDS.", netName)
+		op.Errorf("  %q is missing hosts:", netName)
 		for _, hs := range nonMembers {
-			log.Errorf("    %q", hs)
+			op.Errorf("    %q", hs)
 		}
 
 		errMsg := fmt.Sprintf("All cluster hosts must be in the vDS. %q is missing hosts: %s", netName, nonMembers)
 		v.NoteIssue(errors.New(errMsg))
 	} else {
-		log.Infof("vDS configuration OK on %q", netName)
+		op.Infof("vDS configuration OK on %q", netName)
 	}
 	return nil
 }
 
 // ListNetworks returns the InventoryPath of all networks (excluding DVS uplinks) or
 // all networks excluding standard networks
-func (v *Validator) ListNetworks(incStdNets bool) ([]string, error) {
+func (v *Validator) listNetworks(op trace.Operation, incStdNets bool) ([]string, error) {
 	var selectedNets []string
 
 	nets, err := v.Session.Finder.NetworkList(v.Context, "*")
@@ -601,7 +597,7 @@ func (v *Validator) ListNetworks(incStdNets bool) ([]string, error) {
 		switch o := net.(type) {
 		case *object.DistributedVirtualPortgroup:
 			// Filter out DVS uplink
-			if !v.isDVSUplink(net.Reference()) {
+			if !v.isDVSUplink(op, net.Reference()) {
 				selectedNets = append(selectedNets, o.InventoryPath)
 			}
 		case *object.Network:
@@ -616,37 +612,37 @@ func (v *Validator) ListNetworks(incStdNets bool) ([]string, error) {
 
 // suggestNetwork suggests all networks
 // incStdNets includes standard Networks in addition to DPGs
-func (v *Validator) suggestNetwork(flag string, incStdNets bool) {
-	defer trace.End(trace.Begin(flag))
+func (v *Validator) suggestNetwork(op trace.Operation, flag string, incStdNets bool) {
+	defer trace.End(trace.Begin(flag, op))
 
-	nets, err := v.ListNetworks(incStdNets)
+	nets, err := v.listNetworks(op, incStdNets)
 	if err != nil {
-		log.Error(err)
+		op.Error(err)
 		return
 	}
 
 	if len(nets) == 0 {
-		log.Info("No networks found")
+		op.Info("No networks found")
 		return
 	}
 
-	log.Infof("Suggested values for %s:", flag)
+	op.Infof("Suggested values for %s:", flag)
 	for _, n := range nets {
 		if v.isNetworkNameValid(n, flag) {
-			log.Infof("  %q", path.Base(n))
+			op.Infof("  %q", path.Base(n))
 		}
 	}
 }
 
 // isDVSUplink determines if the DVP is an uplink
-func (v *Validator) isDVSUplink(ref types.ManagedObjectReference) bool {
-	defer trace.End(trace.Begin(ref.Value))
+func (v *Validator) isDVSUplink(op trace.Operation, ref types.ManagedObjectReference) bool {
+	defer trace.End(trace.Begin(ref.Value, op))
 
 	var dvp mo.DistributedVirtualPortgroup
 
 	r := object.NewDistributedVirtualPortgroup(v.Session.Client.Client, ref)
 	if err := r.Properties(v.Context, r.Reference(), []string{"tag"}, &dvp); err != nil {
-		log.Errorf("Unable to check tags on %q: %s", ref, err)
+		op.Errorf("Unable to check tags on %q: %s", ref, err)
 		return false
 	}
 	for _, t := range dvp.Tag {
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/storage.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/storage.go
index e3d340146b..9699c5e77d 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/storage.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/storage.go
@@ -15,14 +15,11 @@
 package validate
 
 import (
+	"context"
 	"fmt"
 	"net/url"
 	"strings"
 
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/vic/cmd/vic-machine/common"
 	"github.com/vmware/vic/lib/config"
@@ -32,11 +29,11 @@ import (
 	"github.com/vmware/vic/pkg/vsphere/datastore"
 )
 
-func (v *Validator) storage(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) storage(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// Image Store
-	imageDSpath, ds, err := v.DatastoreHelper(ctx, input.ImageDatastorePath, "", "--image-store")
+	imageDSpath, ds, err := v.DatastoreHelper(op, input.ImageDatastorePath, "", "--image-store")
 
 	if err != nil {
 		v.NoteIssue(err)
@@ -45,7 +42,7 @@ func (v *Validator) storage(ctx context.Context, input *data.Data, conf *config.
 
 	// provide a default path if only a DS name is provided
 	if imageDSpath.Path == "" {
-		log.Debug("No path element specified for image store - will use default")
+		op.Debug("No path element specified for image store - will use default")
 	}
 
 	if ds != nil {
@@ -65,11 +62,11 @@ func (v *Validator) storage(ctx context.Context, input *data.Data, conf *config.
 			v.NoteIssue(vsErr)
 		case common.DsScheme:
 			// TODO: change v.DatastoreHelper to take url struct instead of string and modify tests.
-			targetURL, _, vsErr = v.DatastoreHelper(ctx, targetURL.Path, label, "--volume-store")
+			targetURL, _, vsErr = v.DatastoreHelper(op, targetURL.Path, label, "--volume-store")
 			v.NoteIssue(vsErr)
 		default:
 			// We should not reach here, if we do we will attempt to treat this as a vsphere datastore
-			targetURL, _, vsErr = v.DatastoreHelper(ctx, targetURL.String(), label, "--volume-store")
+			targetURL, _, vsErr = v.DatastoreHelper(op, targetURL.String(), label, "--volume-store")
 			v.NoteIssue(vsErr)
 		}
 
@@ -95,7 +92,8 @@ func validateNFSTarget(nfsURL *url.URL) error {
 }
 
 func (v *Validator) DatastoreHelper(ctx context.Context, path string, label string, flag string) (*url.URL, *object.Datastore, error) {
-	defer trace.End(trace.Begin(path))
+	op := trace.FromContext(ctx, "DatastoreHelper")
+	defer trace.End(trace.Begin(path, op))
 
 	stripRawTarget := path
 
@@ -133,27 +131,27 @@ func (v *Validator) DatastoreHelper(ctx context.Context, path string, label stri
 
 	if dsURL.Host == "" {
 		// see if we can find a default datastore
-		store, err := v.Session.Finder.DatastoreOrDefault(ctx, "*")
+		store, err := v.Session.Finder.DatastoreOrDefault(op, "*")
 		if err != nil {
-			v.suggestDatastore("*", label, flag)
+			v.suggestDatastore(op, "*", label, flag)
 			return nil, nil, errors.New("datastore empty")
 		}
 
 		dsURL.Host = store.Name()
-		log.Infof("Using default datastore: %s", dsURL.Host)
+		op.Infof("Using default datastore: %s", dsURL.Host)
 	}
 
-	stores, err := v.Session.Finder.DatastoreList(ctx, dsURL.Host)
+	stores, err := v.Session.Finder.DatastoreList(op, dsURL.Host)
 	if err != nil {
-		log.Debugf("no such datastore %#v", dsURL)
-		v.suggestDatastore(path, label, flag)
+		op.Debugf("no such datastore %#v", dsURL)
+		v.suggestDatastore(op, path, label, flag)
 		// TODO: error message about no such match and how to get a datastore list
 		// we return err directly here so we can check the type
 		return nil, nil, err
 	}
 	if len(stores) > 1 {
 		// TODO: error about required disabmiguation and list entries in stores
-		v.suggestDatastore(path, label, flag)
+		v.suggestDatastore(op, path, label, flag)
 		return nil, nil, errors.New("ambiguous datastore " + dsURL.Host)
 	}
 
@@ -192,8 +190,8 @@ func (v *Validator) ListDatastores() ([]string, error) {
 }
 
 // suggestDatastore suggests all datastores present on target in datastore:label format if applicable
-func (v *Validator) suggestDatastore(path string, label string, flag string) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) suggestDatastore(op trace.Operation, path string, label string, flag string) {
+	defer trace.End(trace.Begin("", op))
 
 	var val string
 	if label != "" {
@@ -201,26 +199,26 @@ func (v *Validator) suggestDatastore(path string, label string, flag string) {
 	} else {
 		val = path
 	}
-	log.Infof("Suggesting valid values for %s based on %q", flag, val)
+	op.Infof("Suggesting valid values for %s based on %q", flag, val)
 
 	dss, err := v.ListDatastores()
 	if err != nil {
-		log.Error(err)
+		op.Error(err)
 		return
 	}
 
 	if len(dss) == 0 {
-		log.Info("No datastores found")
+		op.Info("No datastores found")
 		return
 	}
 
 	if dss != nil {
-		log.Infof("Suggested values for %s:", flag)
+		op.Infof("Suggested values for %s:", flag)
 		for _, d := range dss {
 			if label != "" {
 				d = fmt.Sprintf("%s:%s", d, label)
 			}
-			log.Infof("  %q", d)
+			op.Infof("  %q", d)
 		}
 	}
 }
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/update.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/update.go
index 6e8625dc66..5db4c0b197 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/update.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/update.go
@@ -25,12 +25,12 @@ import (
 
 // MigrateConfig migrate old VCH configuration to new version. Currently check required fields only
 func (v *Validator) ValidateMigratedConfig(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(conf.Name))
+	defer trace.End(trace.Begin(conf.Name, ctx))
 
-	v.assertTarget(conf)
-	v.assertDatastore(conf)
-	v.assertNetwork(conf)
-	if err := v.ListIssues(); err != nil {
+	v.assertTarget(ctx, conf)
+	v.assertDatastore(ctx, conf)
+	v.assertNetwork(ctx, conf)
+	if err := v.ListIssues(ctx); err != nil {
 		return conf, err
 	}
 	return v.migrateData(ctx, conf)
@@ -41,20 +41,20 @@ func (v *Validator) migrateData(ctx context.Context, conf *config.VirtualContain
 	return conf, nil
 }
 
-func (v *Validator) assertNetwork(conf *config.VirtualContainerHostConfigSpec) {
+func (v *Validator) assertNetwork(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
 	// minimum network configuration check
 }
 
 // assertDatastore check required datastore configuration only
-func (v *Validator) assertDatastore(conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) assertDatastore(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", ctx))
 	if len(conf.ImageStores) == 0 {
 		v.NoteIssue(errors.New("Image store is not set"))
 	}
 }
 
-func (v *Validator) assertTarget(conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) assertTarget(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", ctx))
 
 	if conf.Target == "" {
 		v.NoteIssue(errors.New("target is not set"))
@@ -69,10 +69,10 @@ func (v *Validator) assertTarget(conf *config.VirtualContainerHostConfigSpec) {
 	}
 }
 
-func (v *Validator) AssertVersion(conf *config.VirtualContainerHostConfigSpec) (err error) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) AssertVersion(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) (err error) {
+	defer trace.End(trace.Begin("", ctx))
 	defer func() {
-		err = v.ListIssues()
+		err = v.ListIssues(ctx)
 	}()
 
 	if conf.Version == nil {
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/validator.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/validator.go
index 4bd6847662..570b6dcf1d 100644
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/validator.go
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/validator.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,7 +25,6 @@ import (
 	"strings"
 	"time"
 
-	log "github.com/Sirupsen/logrus"
 	units "github.com/docker/go-units"
 
 	"github.com/vmware/govmomi"
@@ -40,11 +39,14 @@ import (
 	"github.com/vmware/vic/lib/config"
 	"github.com/vmware/vic/lib/config/dynamic"
 	"github.com/vmware/vic/lib/config/executor"
+	"github.com/vmware/vic/lib/constants"
 	"github.com/vmware/vic/lib/install/data"
+	"github.com/vmware/vic/lib/install/opsuser"
 	"github.com/vmware/vic/pkg/errors"
 	"github.com/vmware/vic/pkg/registry"
 	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/version"
+	"github.com/vmware/vic/pkg/vsphere/optmanager"
 	"github.com/vmware/vic/pkg/vsphere/session"
 )
 
@@ -67,12 +69,11 @@ type Validator struct {
 	isVC   bool
 	issues []error
 
-	DisableDRSCheck bool
-	allowEmptyDC    bool
+	allowEmptyDC bool
 }
 
 func CreateFromVCHConfig(ctx context.Context, vch *config.VirtualContainerHostConfigSpec, sess *session.Session) (*Validator, error) {
-	defer trace.End(trace.Begin(""))
+	defer trace.End(trace.Begin("", ctx))
 
 	v := &Validator{}
 	v.Session = sess
@@ -83,7 +84,9 @@ func CreateFromVCHConfig(ctx context.Context, vch *config.VirtualContainerHostCo
 }
 
 func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
-	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "NewValidator")
+	defer trace.End(trace.Begin("", op))
+
 	var err error
 
 	v := &Validator{}
@@ -113,14 +116,14 @@ func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
 		if cert.Err != nil {
 			if !input.Force {
 				// TODO: prompt user / check ./known_hosts
-				log.Errorf("Failed to verify certificate for target=%s (thumbprint=%s)",
+				op.Errorf("Failed to verify certificate for target=%s (thumbprint=%s)",
 					tURL.Host, cert.ThumbprintSHA1)
 				return nil, cert.Err
 			}
 		}
 
 		input.Thumbprint = cert.ThumbprintSHA1
-		log.Debugf("Accepting host %q thumbprint %s", tURL.Host, input.Thumbprint)
+		op.Debugf("Accepting host %q thumbprint %s", tURL.Host, input.Thumbprint)
 	}
 
 	sessionconfig := &session.Config{
@@ -128,6 +131,9 @@ func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
 		Insecure:   input.Force,
 	}
 
+	// if a compute resource path was specified, set it
+	v.ClusterPath = input.ComputeResourcePath
+
 	// if a datacenter was specified, set it
 	v.DatacenterPath = tURL.Path
 	if v.DatacenterPath != "" {
@@ -137,8 +143,11 @@ func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
 		tURL.Path = ""
 	}
 
+	sessionconfig.ClusterPath = input.ComputeResourcePath
 	sessionconfig.Service = tURL.String()
 
+	sessionconfig.CloneTicket = input.CloneTicket
+
 	v.Session = session.NewSession(sessionconfig)
 	v.Session.UserAgent = version.UserAgent("vic-machine")
 	v.Session, err = v.Session.Connect(v.Context)
@@ -154,13 +163,13 @@ func NewValidator(ctx context.Context, input *data.Data) (*Validator, error) {
 	// Intentionally ignore any error returned by Populate
 	_, err = v.Session.Populate(ctx)
 	if err != nil {
-		log.Debugf("new validator Session.Populate: %s", err)
+		op.Debugf("new validator Session.Populate: %s", err)
 	}
 
 	if strings.Contains(sessionconfig.DatacenterPath, "/") {
 		detail := "--target should only specify datacenter in the path (e.g. https://addr/datacenter) - specify cluster, resource pool, or folder with --compute-resource"
-		log.Error(detail)
-		v.suggestDatacenter()
+		op.Error(detail)
+		v.suggestDatacenter(op)
 		return nil, errors.New(detail)
 	}
 
@@ -195,7 +204,7 @@ func (v *Validator) AllowEmptyDC() {
 	v.allowEmptyDC = true
 }
 
-func (v *Validator) datacenter() error {
+func (v *Validator) datacenter(op trace.Operation) error {
 	if v.allowEmptyDC && v.DatacenterPath == "" {
 		return nil
 	}
@@ -210,8 +219,8 @@ func (v *Validator) datacenter() error {
 		// this means multiple datacenter exists, but user did not specify it in --target
 		detail = "Datacenter must be specified in --target (e.g. https://addr/datacenter)"
 	}
-	log.Error(detail)
-	v.suggestDatacenter()
+	op.Error(detail)
+	v.suggestDatacenter(op)
 	return errors.New(detail)
 }
 
@@ -233,25 +242,25 @@ func (v *Validator) ListDatacenters() ([]string, error) {
 }
 
 // suggestDatacenter suggests all datacenters on the target
-func (v *Validator) suggestDatacenter() {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) suggestDatacenter(op trace.Operation) {
+	defer trace.End(trace.Begin("", op))
 
-	log.Info("Suggesting valid values for datacenter in --target")
+	op.Info("Suggesting valid values for datacenter in --target")
 
 	dcs, err := v.ListDatacenters()
 	if err != nil {
-		log.Error(err)
+		op.Error(err)
 		return
 	}
 
 	if len(dcs) == 0 {
-		log.Info("No datacenters found")
+		op.Info("No datacenters found")
 		return
 	}
 
-	log.Info("Suggested datacenters:")
+	op.Info("Suggested datacenters:")
 	for _, d := range dcs {
-		log.Infof("  %q", d)
+		op.Infof("  %q", d)
 	}
 	return
 }
@@ -262,16 +271,17 @@ func (v *Validator) NoteIssue(err error) {
 	}
 }
 
-func (v *Validator) ListIssues() error {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) ListIssues(ctx context.Context) error {
+	op := trace.FromContext(ctx, "ListIssues")
+	defer trace.End(trace.Begin("", op))
 
 	if len(v.issues) == 0 {
 		return nil
 	}
 
-	log.Error("--------------------")
+	op.Error("--------------------")
 	for _, err := range v.issues {
-		log.Error(err)
+		op.Error(err)
 	}
 
 	return errors.New("validation of configuration failed")
@@ -288,54 +298,68 @@ func (v *Validator) ClearIssues() {
 // Validate runs through various validations, starting with basics such as naming, moving onto vSphere entities
 // and then the compatibility between those entities. It assembles a set of issues that are found for reporting.
 func (v *Validator) Validate(ctx context.Context, input *data.Data) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
-	log.Infof("Validating supplied configuration")
+	op := trace.FromContext(ctx, "Validate")
+	defer trace.End(trace.Begin("", op))
+	op.Info("Validating supplied configuration")
 
 	conf := &config.VirtualContainerHostConfigSpec{}
 
-	if err := v.datacenter(); err != nil {
+	if err := v.datacenter(op); err != nil {
 		return conf, err
 	}
 
-	v.basics(ctx, input, conf)
-
-	v.target(ctx, input, conf)
-	v.credentials(ctx, input, conf)
-	v.compute(ctx, input, conf)
-	v.storage(ctx, input, conf)
-	v.network(ctx, input, conf)
-	v.CheckFirewall(ctx, conf)
-	v.CheckLicense(ctx)
-	v.CheckDrs(ctx)
+	v.basics(op, input, conf)
+	v.target(op, input, conf)
+	v.credentials(op, input, conf)
+	v.compute(op, input, conf)
+	v.storage(op, input, conf)
+	v.network(op, input, conf)
+	// FIXME ATC DEBT setting this value needs to be moved to Dispatcher
+	// https://github.com/vmware/vic/issues/6803
+	ok := v.CheckPersistNetworkBacking(op, true)
+	if !ok {
+		err := v.ConfigureVCenter(op)
+		if err != nil {
+			op.Errorf("%s", err)
+			op.Errorf("vCenter settings update FAILED")
+		}
+	}
+	v.CheckFirewall(op, conf)
+	v.CheckPersistNetworkBacking(op, false)
+	v.CheckLicense(op)
+	v.CheckDRS(op, input)
+	v.checkVMGroup(op, input, conf) // Depends on a side-effect of the CheckDRS method.
 
-	v.certificate(ctx, input, conf)
-	v.certificateAuthorities(ctx, input, conf)
-	v.registries(ctx, input, conf)
+	v.certificate(op, input, conf)
+	v.certificateAuthorities(op, input, conf)
+	v.registries(op, input, conf)
 
 	// Perform the higher level compatibility and consistency checks
-	v.compatibility(ctx, conf)
+	v.compatibility(op, conf)
 
-	v.syslog(conf, input)
+	v.syslog(op, conf, input)
 
 	// TODO: determine if this is where we should turn the noted issues into message
-	return conf, v.ListIssues()
+	return conf, v.ListIssues(op)
 
 }
 
 func (v *Validator) ValidateTarget(ctx context.Context, input *data.Data) (*config.VirtualContainerHostConfigSpec, error) {
-	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "ValidateTarget")
+	defer trace.End(trace.Begin("", op))
+
 	conf := &config.VirtualContainerHostConfigSpec{}
 
-	log.Infof("Validating target")
-	if err := v.datacenter(); err != nil {
+	op.Info("Validating target")
+	if err := v.datacenter(op); err != nil {
 		return conf, err
 	}
-	v.target(ctx, input, conf)
-	return conf, v.ListIssues()
+	v.target(op, input, conf)
+	return conf, v.ListIssues(op)
 }
 
-func (v *Validator) basics(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) basics(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// TODO: ensure that displayname doesn't violate constraints (length, characters, etc)
 	conf.SetName(input.DisplayName)
@@ -352,17 +376,19 @@ func (v *Validator) basics(ctx context.Context, input *data.Data, conf *config.V
 		v.NoteIssue(errors.Errorf("Invalid default image size %s provided; error from parser: %s", input.ScratchSize, err.Error()))
 	} else {
 		conf.ScratchSize = scratchSize / units.KB
-		log.Debugf("Setting scratch image size to %d KB in VCHConfig", conf.ScratchSize)
+		op.Debugf("Setting scratch image size to %d KB in VCHConfig", conf.ScratchSize)
 	}
 
 	if input.ContainerNameConvention != "" {
 		// ensure token is present
-		if !strings.Contains(input.ContainerNameConvention, string(config.ID)) && !strings.Contains(input.ContainerNameConvention, string(config.Name)) {
-			v.NoteIssue(errors.Errorf("Container name convention must include %s or %s token", config.ID, config.Name))
+		if !strings.Contains(input.ContainerNameConvention, string(config.IDToken)) && !strings.Contains(input.ContainerNameConvention, string(config.NameToken)) {
+			v.NoteIssue(errors.Errorf("Container name convention must include %s or %s token", config.IDToken, config.NameToken))
 		}
-		// guard against both -- possibly we want to allow, but for now only allow one
-		if strings.Contains(input.ContainerNameConvention, string(config.ID)) && strings.Contains(input.ContainerNameConvention, string(config.Name)) {
-			v.NoteIssue(errors.Errorf("Container name convention only allows one token, either %s or %s", config.ID, config.Name))
+
+		// coarse check - only enforce that there's enough capcity for a shortID
+		// name lengths are many and vary significantly so much harder to provide sanity checks for - they will truncate when convention is applied.
+		if len(input.ContainerNameConvention)-len(config.IDToken) >= constants.MaxVMNameLength-constants.ShortIDLen {
+			v.NoteIssue(errors.Errorf("Container name convetion exceeds maximum length (%d, discounting tokens)", constants.MaxVMNameLength-constants.ShortIDLen))
 		}
 	}
 
@@ -382,11 +408,11 @@ func (v *Validator) checkSessionSet() []string {
 	return errs
 }
 
-func (v *Validator) sessionValid(errMsg string) bool {
+func (v *Validator) sessionValid(op trace.Operation, errMsg string) bool {
 	if c := v.checkSessionSet(); len(c) > 0 {
-		log.Error(errMsg)
+		op.Error(errMsg)
 		for _, e := range c {
-			log.Errorf("  %s", e)
+			op.Errorf("  %s", e)
 		}
 		v.NoteIssue(errors.New(errMsg))
 		return false
@@ -394,20 +420,20 @@ func (v *Validator) sessionValid(errMsg string) bool {
 	return true
 }
 
-func (v *Validator) target(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) target(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// check if host is managed by VC
-	v.managedbyVC(ctx)
+	v.managedbyVC(op)
 }
 
-func (v *Validator) managedbyVC(ctx context.Context) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) managedbyVC(op trace.Operation) {
+	defer trace.End(trace.Begin("", op))
 
 	if v.IsVC() {
 		return
 	}
-	host, err := v.Session.Finder.DefaultHostSystem(ctx)
+	host, err := v.Session.Finder.DefaultHostSystem(op)
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Failed to get host system: %s", err))
 		return
@@ -415,7 +441,7 @@ func (v *Validator) managedbyVC(ctx context.Context) {
 
 	var mh mo.HostSystem
 
-	if err = host.Properties(ctx, host.Reference(), []string{"summary.managementServerIp"}, &mh); err != nil {
+	if err = host.Properties(op, host.Reference(), []string{"summary.managementServerIp"}, &mh); err != nil {
 		v.NoteIssue(fmt.Errorf("Failed to get host properties: %s", err))
 		return
 	}
@@ -426,7 +452,7 @@ func (v *Validator) managedbyVC(ctx context.Context) {
 	return
 }
 
-func (v *Validator) credentials(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+func (v *Validator) credentials(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
 	// empty string for password is horrific, but a legitimate scenario especially in isolated labs
 	if input.OpsCredentials.OpsUser == nil || input.OpsCredentials.OpsPassword == nil {
 		v.NoteIssue(errors.New("User/password for the operations user has not been set"))
@@ -440,6 +466,34 @@ func (v *Validator) credentials(ctx context.Context, input *data.Data, conf *con
 	conf.Token = *input.OpsCredentials.OpsPassword
 	conf.TargetThumbprint = input.Thumbprint
 
+	// If Grant Perms has  been explicitly requested (either true or false)
+	// set it to the new value. Otherwise leave the value in conf as it is
+	if input.OpsCredentials.GrantPerms != nil {
+		if *input.OpsCredentials.GrantPerms {
+			// Set Grant Permissions level
+			conf.SetGrantPerms()
+		} else {
+			conf.ClearGrantPerms()
+		}
+	}
+
+	// If Grant Perms is set trying adding ReadOnly role to the Datacenter
+	// for the ops-user. This is necessary since the Login operation below
+	// fails if the ops-user has no permissions.
+	//
+	// FIXME DEBT.
+	// https://github.com/vmware/vic/issues/6870
+	// Notice that this operation should not be performed from the Validator.
+	// Eventually, this must be moved to the Dispatcher as the Validator
+	// should not modify VC configuration.
+	if conf.ShouldGrantPerms() {
+		err := opsuser.GrantDCReadOnlyPerms(v.Context, v.Session, conf)
+		if err != nil {
+			v.NoteIssue(fmt.Errorf("Failed to validate operations credentials: %s", err))
+			return
+		}
+	}
+
 	// Discard anything other than these URL fields for the target
 	stripped := &url.URL{
 		Scheme: u.Scheme,
@@ -462,7 +516,7 @@ func (v *Validator) credentials(ctx context.Context, input *data.Data, conf *con
 	}
 	soapClient.UserAgent = "vice-validator"
 
-	vimClient, err := vim25.NewClient(ctx, soapClient)
+	vimClient, err := vim25.NewClient(op, soapClient)
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Failed to create client for validation of operations credentials: %s", err))
 		return
@@ -473,23 +527,23 @@ func (v *Validator) credentials(ctx context.Context, input *data.Data, conf *con
 		SessionManager: vmomisession.NewManager(vimClient),
 	}
 
-	err = client.Login(ctx, url.UserPassword(conf.Username, conf.Token))
+	err = client.Login(op, url.UserPassword(conf.Username, conf.Token))
 	if err != nil {
 		v.NoteIssue(fmt.Errorf("Failed to validate operations credentials: %s", err))
 		return
 	}
-	client.Logout(ctx)
+	client.Logout(op)
 
 	// confirm the RBAC configuration of the provided user
 	// TODO: this can be dropped once we move to configuration the RBAC during creation
 }
 
-func (v *Validator) certificate(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) certificate(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	if len(input.CertPEM) == 0 && len(input.KeyPEM) == 0 {
 		// if there's no data supplied then we're configuring without TLS
-		log.Debug("Configuring without TLS due to empty key and cert buffers")
+		op.Debug("Configuring without TLS due to empty key and cert buffers")
 		return
 	}
 
@@ -503,12 +557,12 @@ func (v *Validator) certificate(ctx context.Context, input *data.Data, conf *con
 	}
 }
 
-func (v *Validator) certificateAuthorities(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) certificateAuthorities(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	if len(input.ClientCAs) == 0 {
 		// if there's no data supplied then we're configuring without client verification
-		log.Debug("Configuring without client verification due to empty certificate authorities")
+		op.Debug("Configuring without client verification due to empty certificate authorities")
 		return
 	}
 
@@ -528,8 +582,8 @@ func (v *Validator) certificateAuthorities(ctx context.Context, input *data.Data
 	conf.CertificateAuthorities = input.ClientCAs
 }
 
-func (v *Validator) registries(ctx context.Context, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) registries(op trace.Operation, input *data.Data, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// Check if CAs can be loaded
 	pool := x509.NewCertPool()
@@ -543,7 +597,7 @@ func (v *Validator) registries(ctx context.Context, input *data.Data, conf *conf
 	conf.RegistryCertificateAuthorities = input.RegistryCAs
 
 	// test reachability
-	insecureRegistries, whitelistRegistries, err := v.reachableRegistries(ctx, input, pool)
+	insecureRegistries, whitelistRegistries, err := v.reachableRegistries(op, input, pool)
 	if err != nil {
 		v.NoteIssue(err)
 		return
@@ -558,11 +612,11 @@ func (v *Validator) registries(ctx context.Context, input *data.Data, conf *conf
 	// create vic-machine info message
 	msg := v.friendlyRegistryList("Insecure registries", conf.InsecureRegistries)
 	if msg != "" {
-		log.Infof(msg)
+		op.Info(msg)
 	}
 	msg = v.friendlyRegistryList("Whitelist registries", conf.RegistryWhitelist)
 	if msg != "" {
-		log.Infof(msg)
+		op.Info(msg)
 	}
 
 	if len(input.RegistryCAs) == 0 {
@@ -580,7 +634,7 @@ func (v *Validator) friendlyRegistryList(registryType string, registryList []str
 
 // Validate registries are reachable.  Secure registries that are not specified as insecure are validated with the
 // CA certs passed into vic-machine.
-func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, pool *x509.CertPool) (insecureRegistries []string, whitelistRegistries []string, err error) {
+func (v *Validator) reachableRegistries(op trace.Operation, input *data.Data, pool *x509.CertPool) (insecureRegistries []string, whitelistRegistries []string, err error) {
 	secureRegistriesSet, err := dynamic.ParseRegistries(input.WhitelistRegistries)
 	if err != nil {
 		return nil, nil, err
@@ -612,7 +666,7 @@ func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, p
 
 		// Make sure address is not a wildcard domain or CIDR.  If it is, do not validate.
 		if strings.HasPrefix(r.URL().Host, "*") {
-			log.Debugf("Skipping registry validation for %s", r)
+			op.Debugf("Skipping registry validation for %s", r)
 			continue
 		}
 
@@ -629,9 +683,9 @@ func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, p
 		}
 
 		if err != nil {
-			log.Warnf("Unable to confirm insecure registry %s is a valid registry at this time.", r)
+			op.Warnf("Unable to confirm insecure registry %s is a valid registry at this time.", r)
 		} else {
-			log.Debugf("Insecure registry %s confirmed.", r)
+			op.Debugf("Insecure registry %s confirmed.", r)
 		}
 	}
 
@@ -639,18 +693,18 @@ func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, p
 	for _, w := range secureRegistriesSet {
 		// Make sure address is not a wildcard domain or CIDR.  If it is, do not validate.
 		if w.IsCIDR() {
-			log.Debugf("Skipping registry validation for %s", w)
+			op.Debugf("Skipping registry validation for %s", w)
 			continue
 		}
 
 		w, ok := w.(registry.URLEntry)
 		if !ok {
-			log.Debugf("Skipping registry validation for %s", w)
+			op.Debugf("Skipping registry validation for %s", w)
 			continue
 		}
 
 		if strings.HasPrefix(w.URL().Host, "*") {
-			log.Debugf("Skipping registry validation for %s", w)
+			op.Debugf("Skipping registry validation for %s", w)
 			continue
 		}
 
@@ -660,9 +714,9 @@ func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, p
 		}
 
 		if _, err = registry.Reachable(w.String(), scheme, "", "", pool, registryValidationTime, false); err != nil {
-			log.Warnf("Unable to confirm secure registry %s is a valid registry at this time.", w)
+			op.Warnf("Unable to confirm secure registry %s is a valid registry at this time.", w)
 		} else {
-			log.Debugf("Secure registry %s confirmed.", w)
+			op.Debugf("Secure registry %s confirmed.", w)
 		}
 	}
 
@@ -681,12 +735,12 @@ func (v *Validator) reachableRegistries(ctx context.Context, input *data.Data, p
 	return
 }
 
-func (v *Validator) compatibility(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) compatibility(op trace.Operation, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// TODO: add checks such as datastore is acessible from target cluster
 	errMsg := "Compatibility check SKIPPED"
-	if !v.sessionValid(errMsg) {
+	if !v.sessionValid(op, errMsg) {
 		return
 	}
 
@@ -694,16 +748,16 @@ func (v *Validator) compatibility(ctx context.Context, conf *config.VirtualConta
 	_, err := v.Session.Datastore.AttachedClusterHosts(v.Context, v.Session.Cluster)
 	v.NoteIssue(err)
 
-	v.checkDatastoresAreWriteable(ctx, conf)
+	v.checkDatastoresAreWriteable(op, conf)
 }
 
 // looks up a datastore and adds it to the set
-func (v *Validator) getDatastore(ctx context.Context, u *url.URL, datastoreSet map[types.ManagedObjectReference]*object.Datastore) map[types.ManagedObjectReference]*object.Datastore {
+func (v *Validator) getDatastore(op trace.Operation, u *url.URL, datastoreSet map[types.ManagedObjectReference]*object.Datastore) map[types.ManagedObjectReference]*object.Datastore {
 	if datastoreSet == nil {
 		datastoreSet = make(map[types.ManagedObjectReference]*object.Datastore)
 	}
 
-	datastores, err := v.Session.Finder.DatastoreList(ctx, u.Host)
+	datastores, err := v.Session.Finder.DatastoreList(op, u.Host)
 	v.NoteIssue(err)
 
 	if len(datastores) != 1 {
@@ -716,35 +770,35 @@ func (v *Validator) getDatastore(ctx context.Context, u *url.URL, datastoreSet m
 }
 
 // populates the v.datastoreSet "set" with datastore references generated from config
-func (v *Validator) getAllDatastores(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) map[types.ManagedObjectReference]*object.Datastore {
+func (v *Validator) getAllDatastores(op trace.Operation, conf *config.VirtualContainerHostConfigSpec) map[types.ManagedObjectReference]*object.Datastore {
 	// note that ImageStores, ContainerStores, and VolumeLocations
 	// have just-different-enough types/structures that this cannot be made more succinct
 	var datastoreSet map[types.ManagedObjectReference]*object.Datastore
 	for _, u := range conf.ImageStores {
-		datastoreSet = v.getDatastore(ctx, &u, datastoreSet)
+		datastoreSet = v.getDatastore(op, &u, datastoreSet)
 	}
 	for _, u := range conf.ContainerStores {
-		datastoreSet = v.getDatastore(ctx, &u, datastoreSet)
+		datastoreSet = v.getDatastore(op, &u, datastoreSet)
 	}
 	for _, u := range conf.VolumeLocations {
 		//skip non datastore volume stores
 		if u.Scheme != common.DsScheme {
 			continue
 		}
-		datastoreSet = v.getDatastore(ctx, u, datastoreSet)
+		datastoreSet = v.getDatastore(op, u, datastoreSet)
 	}
 	return datastoreSet
 }
 
-func (v *Validator) checkDatastoresAreWriteable(ctx context.Context, conf *config.VirtualContainerHostConfigSpec) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) checkDatastoresAreWriteable(op trace.Operation, conf *config.VirtualContainerHostConfigSpec) {
+	defer trace.End(trace.Begin("", op))
 
 	// gather compute host references
-	clusterDatastores, err := v.Session.Cluster.Datastores(ctx)
+	clusterDatastores, err := v.Session.Cluster.Datastores(op)
 	v.NoteIssue(err)
 
 	// check that the cluster can see all of the datastores in question
-	requestedDatastores := v.getAllDatastores(ctx, conf)
+	requestedDatastores := v.getAllDatastores(op, conf)
 	validStores := make(map[types.ManagedObjectReference]*object.Datastore)
 	// remove any found datastores from requested datastores
 	for _, cds := range clusterDatastores {
@@ -758,12 +812,12 @@ func (v *Validator) checkDatastoresAreWriteable(ctx context.Context, conf *confi
 		v.NoteIssue(errors.Errorf("Datastore %q is not accessible by the compute resource", store.Name()))
 	}
 
-	clusterHosts, err := v.Session.Cluster.Hosts(ctx)
+	clusterHosts, err := v.Session.Cluster.Hosts(op)
 	justOneHost := len(clusterHosts) == 1
 	v.NoteIssue(err)
 
 	for _, store := range validStores {
-		aHosts, err := store.AttachedHosts(ctx)
+		aHosts, err := store.AttachedHosts(op)
 		v.NoteIssue(err)
 		clusterHosts = intersect(clusterHosts, aHosts)
 	}
@@ -775,7 +829,7 @@ func (v *Validator) checkDatastoresAreWriteable(ctx context.Context, conf *confi
 	if len(clusterHosts) == 1 && v.Session.IsVC() && !justOneHost {
 		// if we have a cluster with >1 host to begin with, on VC, and only one host can talk to all the datastores, warn
 		// on ESX and clusters with only one host to begin with, this warning would be redundant/irrelevant
-		log.Warnf("Only one host can access all of the image/container/volume datastores. This may be a point of contention/performance degradation and HA/DRS may not work as intended.")
+		op.Warn("Only one host can access all of the image/container/volume datastores. This may be a point of contention/performance degradation and HA/DRS may not work as intended.")
 	}
 }
 
@@ -797,7 +851,8 @@ func (v *Validator) IsVC() bool {
 }
 
 func (v *Validator) AddDeprecatedFields(ctx context.Context, conf *config.VirtualContainerHostConfigSpec, input *data.Data) *data.InstallerData {
-	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "AddDeprecatedFields")
+	defer trace.End(trace.Begin("", op))
 
 	dconfig := data.InstallerData{}
 
@@ -810,20 +865,19 @@ func (v *Validator) AddDeprecatedFields(ctx context.Context, conf *config.Virtua
 		dconfig.Datacenter = v.Session.Datacenter.Reference()
 		dconfig.DatacenterName = v.Session.Datacenter.Name()
 	} else {
-		log.Debugf("session datacenter is nil")
+		op.Debug("session datacenter is nil")
 	}
 
 	if v.Session.Cluster != nil {
 		dconfig.Cluster = v.Session.Cluster.Reference()
 		dconfig.ClusterPath = v.Session.Cluster.InventoryPath
 	} else {
-		log.Debugf("session cluster is nil")
+		op.Debug("session cluster is nil")
 	}
 
 	dconfig.ResourcePoolPath = v.ResourcePoolPath
-	dconfig.UseRP = input.UseRP
 
-	log.Debugf("Datacenter: %q, Cluster: %q, Resource Pool: %q", dconfig.DatacenterName, dconfig.Cluster, dconfig.ResourcePoolPath)
+	op.Debugf("Datacenter: %q, Cluster: %q, Resource Pool: %q", dconfig.DatacenterName, dconfig.Cluster, dconfig.ResourcePoolPath)
 
 	if input.VCHCPUReservationsMHz != nil {
 		cpuReserve := int64(*input.VCHCPUReservationsMHz)
@@ -848,8 +902,8 @@ func (v *Validator) AddDeprecatedFields(ctx context.Context, conf *config.Virtua
 	return &dconfig
 }
 
-func (v *Validator) syslog(conf *config.VirtualContainerHostConfigSpec, input *data.Data) {
-	defer trace.End(trace.Begin(""))
+func (v *Validator) syslog(op trace.Operation, conf *config.VirtualContainerHostConfigSpec, input *data.Data) {
+	defer trace.End(trace.Begin("", op))
 
 	if input.SyslogConfig.Addr == nil {
 		return
@@ -884,3 +938,28 @@ func (v *Validator) syslog(conf *config.VirtualContainerHostConfigSpec, input *d
 		RAddr:   host,
 	}
 }
+
+// FIXME ATC DEBT setting this value needs to be moved to Dispatcher
+// https://github.com/vmware/vic/issues/6803
+// set PersistNetworkBacking key to "true"
+func (v *Validator) ConfigureVCenter(ctx context.Context) error {
+	op := trace.FromContext(ctx, "Set vCenter serial port backing")
+	defer trace.End(trace.Begin("", op))
+
+	errMsg := "Set vCenter settings SKIPPED"
+	if !v.sessionValid(op, errMsg) {
+		return nil
+	}
+	if !v.IsVC() {
+		op.Debug(errMsg)
+		return nil
+	}
+
+	err := optmanager.UpdateOptionValue(ctx, v.Session, persistNetworkBackingKey, "true")
+	if err != nil {
+		msg := fmt.Sprintf("Failed to set required value \"true\" for %s: %s", persistNetworkBackingKey, err)
+		return errors.New(msg)
+	}
+	op.Infof("Set vCenter settings OK")
+	return nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test.go
deleted file mode 100644
index 813c56e7e8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test.go
+++ /dev/null
@@ -1,780 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package validate
-
-import (
-	"context"
-	"crypto/tls"
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/simulator/esx"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/install/data"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-func init() {
-	// Globally enable the vSPC firewall rule by modifying the source template directly
-	simulator.EnableRuleset(&esx.HostFirewallInfo, "vSPC") // TODO: can't use management.RulesetID here due to import cycle
-}
-
-func TestParseURL(t *testing.T) {
-	var hosts = []string{
-		"host.domain.com",
-		"host.domain.com:123",
-		"1.2.3.4",
-		"1.2.3.4:10",
-		"[2001:4860:0:2001::68]",
-		"[2001:db8:1f70::999:de8:7648:6e8]:123",
-	}
-
-	for _, urlString := range hosts {
-		u, err := ParseURL(urlString)
-		assert.Nil(t, err)
-		assert.Equal(t, u.String(), "https://"+urlString)
-		// Null the scheme
-		u.Scheme = ""
-		assert.Equal(t, u.String(), "//"+urlString)
-		assert.Equal(t, u.Host, urlString)
-	}
-
-	// Add path to create a more significant URL
-	var urls = []string{}
-
-	for i, h := range hosts {
-		url := fmt.Sprintf("%s/path%d/test", h, i)
-		urls = append(urls, url)
-	}
-
-	for i, urlString := range urls {
-		u, err := ParseURL(urlString)
-		assert.Nil(t, err)
-		assert.Equal(t, u.String(), "https://"+urlString)
-
-		// Null the scheme
-		u.Scheme = ""
-		assert.Equal(t, u.String(), "//"+urlString)
-
-		// Check host
-		assert.Equal(t, u.Host, hosts[i])
-		// Check path
-		path := fmt.Sprintf("/path%d/test", i)
-		assert.Equal(t, u.Path, path)
-		// Check concatenation
-		assert.Equal(t, u.Host+u.Path, urlString)
-	}
-
-	// Add an HTTP scheme to verify that it is preserved
-	var urlsWithHTTPScheme = []string{}
-
-	for _, u := range urls {
-		uws := fmt.Sprintf("http://%s", u)
-		urlsWithHTTPScheme = append(urlsWithHTTPScheme, uws)
-	}
-
-	for _, urlString := range urlsWithHTTPScheme {
-		u, err := ParseURL(urlString)
-		fmt.Printf("UrlString: %s\n", u.String())
-		assert.Nil(t, err)
-		assert.Equal(t, u.String(), urlString)
-	}
-
-	var invalidUrls = []string{
-		"[2001:db8/path",
-		"1.2.3.4\\path",
-	}
-
-	for _, urlString := range invalidUrls {
-		_, err := ParseURL(urlString)
-		assert.NotNil(t, err)
-	}
-}
-
-func TestMain(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-	ctx := context.Background()
-
-	for i, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		t.Logf("%d", i)
-		model.Datastore = 3
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		s.URL.User = url.UserPassword("user", "pass")
-		s.URL.Path = ""
-		t.Logf("server URL: %s", s.URL)
-
-		var input *data.Data
-		if i == 0 {
-			input = getESXData(s.URL)
-		} else {
-			input = getVPXData(s.URL)
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		validator, err := NewValidator(ctx, input)
-		if err != nil {
-			t.Errorf("Failed to new validator: %s", err)
-		}
-		ds, _ := validator.Session.Finder.Datastore(validator.Context, "LocalDS_1")
-		simulator.Map.Get(ds.Reference()).(mo.Entity).Entity().Name = "Local DS_0"
-
-		ds, _ = validator.Session.Finder.Datastore(validator.Context, "LocalDS_2")
-		simulator.Map.Get(ds.Reference()).(mo.Entity).Entity().Name = `😗`
-
-		t.Logf("session pool: %s", validator.Session.Pool)
-		if err = createPool(ctx, validator.Session, input.ComputeResourcePath, "validator", t); err != nil {
-			t.Errorf("Unable to create resource pool: %s", err)
-		}
-
-		conf := testCompute(validator, input, t)
-		testTargets(validator, input, conf, t)
-		testStorage(validator, input, conf, t)
-	}
-}
-
-func getESXData(testURL *url.URL) *data.Data {
-	result := data.NewData()
-	testURL.Path = testURL.Path + "/ha-datacenter"
-	user := testURL.User.Username()
-	result.OpsCredentials.OpsUser = &user
-	passwd, _ := testURL.User.Password()
-	result.OpsCredentials.OpsPassword = &passwd
-	result.URL = testURL
-	result.DisplayName = "test001"
-	result.ComputeResourcePath = "/ha-datacenter/host/localhost.localdomain/Resources"
-	result.ImageDatastorePath = "LocalDS_0"
-	result.BridgeNetworkName = "bridge"
-	_, result.BridgeIPRange, _ = net.ParseCIDR("172.16.0.0/12")
-	result.ManagementNetwork.Name = "VM Network"
-	result.PublicNetwork.Name = "VM Network"
-	result.VolumeLocations = make(map[string]*url.URL)
-	testVolumeStoreURL := &url.URL{
-		Host: "LocalDS_0",
-		Path: "volumes/test",
-	}
-	result.VolumeLocations["volume-store"] = testVolumeStoreURL
-	return result
-}
-
-func getVPXData(testURL *url.URL) *data.Data {
-	result := data.NewData()
-	testURL.Path = testURL.Path + "/DC0"
-	user := testURL.User.Username()
-	result.OpsCredentials.OpsUser = &user
-	passwd, _ := testURL.User.Password()
-	result.OpsCredentials.OpsPassword = &passwd
-	result.URL = testURL
-	result.DisplayName = "test001"
-	result.ComputeResourcePath = "/DC0/host/DC0_C0/Resources"
-	result.ImageDatastorePath = "LocalDS_0"
-	result.PublicNetwork.Name = "VM Network"
-	result.BridgeNetworkName = "bridge"
-	_, result.BridgeIPRange, _ = net.ParseCIDR("172.16.0.0/12")
-
-	result.VolumeLocations = make(map[string]*url.URL)
-	testVolumeStoreURL := &url.URL{
-		Host: "LocalDS_0",
-		Path: "volumes/test",
-	}
-	result.VolumeLocations["volume-store"] = testVolumeStoreURL
-	return result
-}
-
-func createPool(ctx context.Context, sess *session.Session, poolPath string, name string, t *testing.T) error {
-	rp, err := sess.Finder.ResourcePool(ctx, poolPath)
-	if err != nil {
-		t.Logf("Failed to get parent pool: %s", err)
-		return err
-	}
-	t.Logf("Creating Resource Pool %s", name)
-	resSpec := types.DefaultResourceConfigSpec()
-	_, err = rp.Create(ctx, name, resSpec)
-	if err != nil {
-		t.Logf("Failed to create resource pool %s: %s", name, err)
-		return err
-	}
-	return nil
-}
-
-func testCompute(v *Validator, input *data.Data, t *testing.T) *config.VirtualContainerHostConfigSpec {
-	tests := []struct {
-		path   string
-		vc     bool
-		hasErr bool
-	}{
-		{"DC0_C0/Resources/validator", true, false},
-		{"DC0_C0/validator", true, true},
-		{"validator", true, false},
-		{"DC0_C0/test", true, true},
-		{"/DC0_C1/test", true, true},
-		{"/DC0_C1/test", true, true},
-		{"/DC0/host/DC0_C1/Resources/validator", true, true},
-		{"/DC1/host/DC0_C1/Resources/validator", true, true},
-		{"DC0_H0/Resources", true, false},
-		{"DC0_H0", true, false},
-		{"/DC0/host/DC0_C0/Resources/validator", true, false},
-		{"localhost.localdomain/Resources/validator", false, false},
-		{"validator", false, false},
-		{"test", false, true},
-		{"/ha-datacenter/host/localhost.localdomain/Resources/validator", false, false},
-	}
-	conf := &config.VirtualContainerHostConfigSpec{}
-
-	for _, test := range tests {
-		if v.isVC && !test.vc {
-			continue
-		}
-		if !v.isVC && test.vc {
-			continue
-		}
-		t.Logf("%+v", test)
-		input.ComputeResourcePath = test.path
-		v.compute(v.Context, input, conf)
-		v.ListIssues()
-		if !test.hasErr {
-			assert.Equal(t, 0, len(v.issues))
-		} else {
-			assert.True(t, len(v.issues) > 0, "Should have errors")
-		}
-		v.issues = nil
-	}
-	return conf
-}
-
-func testTargets(v *Validator, input *data.Data, conf *config.VirtualContainerHostConfigSpec, t *testing.T) {
-	v.target(v.Context, input, conf)
-	v.credentials(v.Context, input, conf)
-
-	u, err := url.Parse(conf.Target)
-	assert.NoError(t, err)
-	assert.Nil(t, u.User)
-	assert.NotEmpty(t, conf.Token)
-	assert.NotEmpty(t, conf.Username)
-}
-
-func testStorage(v *Validator, input *data.Data, conf *config.VirtualContainerHostConfigSpec, t *testing.T) {
-	// specifically ignoring err here because we do not care about the parse result.
-	testURL1, _ := url.Parse("LocalDS_0/volumes/volume1")
-	testURL2, _ := url.Parse("LocalDS_0/volumes/volume2")
-	testURL2.Scheme = "ds"
-	testURL3, _ := url.Parse("LocalDS_0/volumes/volume1")
-	testURL3.Scheme = "ds"
-
-	// These two should report errors due to bad characters in the url. These should test how DatastoreHelper handles a nil or malformed url.
-	testURL4, _ := url.Parse("😗/volumes/volume1")
-	testURL5, _ := url.Parse("ds://😗/volumes/volume2")
-
-	testURL6, _ := url.Parse("LocalDS_1/volumes/volume1")
-	testURL7, _ := url.Parse("ds://LocalDS_1/volumes/volume2")
-	testURL8, _ := url.Parse("")
-	testURL9, _ := url.Parse("ds://")
-
-	// positive nfs case
-	nfsTestURL1, _ := url.Parse("nfs://prod.shared.storage/vchprod/volumes")
-
-	// the two current negative nfs cases for validation
-	nfsTestURL2, _ := url.Parse("nfs:///no/host/here")
-	nfsTestURL3, _ := url.Parse("nfs://no.actual.path")
-
-	tests := []struct {
-		image         string
-		volumes       map[string]*url.URL
-		hasErr        bool
-		expectImage   string
-		expectVolumes map[string]*url.URL
-	}{
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": testURL1,
-				"volume2": testURL2},
-			false,
-			"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": testURL3,
-				"volume2": testURL2}},
-		{"LocalDS_0/images",
-			map[string]*url.URL{"volume1": testURL1,
-				"volume2": testURL2},
-			false,
-			"ds://LocalDS_0/images",
-			map[string]*url.URL{"volume1": testURL3,
-				"volume2": testURL2}},
-
-		{"ds://LocalDS_0/images",
-			map[string]*url.URL{"volume1": testURL1,
-				"volume2": testURL2},
-			false,
-			"ds://LocalDS_0/images",
-			map[string]*url.URL{"volume1": testURL3,
-				"volume2": testURL2}},
-
-		{"ds://LocalDS_0/images/xyz",
-			map[string]*url.URL{"volume1": testURL1,
-				"volume2": testURL2},
-			false,
-			"ds://LocalDS_0/images/xyz",
-			map[string]*url.URL{"volume1": testURL3,
-				"volume2": testURL2}},
-
-		{"ds://😗",
-			map[string]*url.URL{"volume1": testURL4,
-				"volume2": testURL5},
-			true,
-			"ds://😗/test001",
-			nil},
-
-		{"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": testURL6,
-				"volume2": testURL7},
-			true,
-			"ds://LocalDS_0",
-			nil},
-
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": testURL6,
-				"volume2": testURL7},
-			true,
-			"ds://LocalDS_0",
-			nil},
-
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": testURL6,
-				"volume2": testURL7},
-			true,
-			"ds://LocalDS_0",
-			nil},
-
-		{"",
-			map[string]*url.URL{"volume1": testURL8,
-				"volume2": testURL9},
-			true,
-			"",
-			nil},
-
-		{"ds://",
-			map[string]*url.URL{"volume1": testURL8,
-				"volume2": testURL9},
-			true,
-			"",
-			nil},
-		// below here lies the setup for nfs validation checks
-
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1},
-			false,
-			"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1}},
-
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1,
-				"volume2": nfsTestURL2},
-			true,
-			"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1}},
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1,
-				"volume2": nfsTestURL3},
-			true,
-			"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL1}},
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": nfsTestURL3,
-				"volume2": nfsTestURL2},
-			true,
-			"ds://LocalDS_0",
-			nil},
-		// below here lies the mixed store validation checks
-		{"LocalDS_0",
-			map[string]*url.URL{"volume1": testURL1,
-				"volume2": nfsTestURL1,
-				"volume3": nfsTestURL2,
-				"volume4": testURL4,
-			},
-			true,
-			"ds://LocalDS_0",
-			map[string]*url.URL{"volume1": testURL3,
-				"volume2": nfsTestURL1}},
-	}
-
-	for _, test := range tests {
-		t.Logf("%+v", test)
-		input.ImageDatastorePath = test.image
-		input.VolumeLocations = test.volumes
-		v.storage(v.Context, input, conf)
-		v.ListIssues()
-		if !test.hasErr {
-			assert.Equal(t, 0, len(v.issues))
-			assert.Equal(t, test.expectImage, conf.ImageStores[0].String())
-			conf.ImageStores = conf.ImageStores[1:]
-			for key, volume := range conf.VolumeLocations {
-				if _, ok := test.expectVolumes[key]; !ok {
-					assert.Fail(t, "Could not find volume store that was expected to present", "volume : %s", volume.String())
-				} else {
-					assert.Equal(t, test.expectVolumes[key].String(), volume.String())
-				}
-			}
-		} else {
-			assert.True(t, len(v.issues) > 0, "Should have errors")
-		}
-		v.issues = nil
-		conf.VolumeLocations = nil
-	}
-}
-
-func TestValidateWithFolders(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	ctx := context.Background()
-
-	m := simulator.VPX()
-	m.Datacenter = 3
-	m.Folder = 2
-	m.Datastore = 2
-	m.ClusterHost = 3
-	m.Pool = 1
-
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m.Service.TLS = new(tls.Config)
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	input := data.NewData()
-	input.URL = &url.URL{
-		Scheme: s.URL.Scheme,
-		Host:   s.URL.Host,
-	}
-
-	newShouldFail := true
-	license := simulator.EvalLicense
-	simulator.EvalLicense.Properties = nil // erase features
-
-	var validator *Validator
-	var dc string
-
-	// Cover various failure paths while we're at it
-	steps := []func(){
-		func() {},
-		func() {
-			input.Thumbprint = "nope"
-		},
-		func() {
-			input.Force = true
-			input.Thumbprint = ""
-		},
-		func() {
-			input.Force = false
-			input.Thumbprint = s.CertificateInfo().ThumbprintSHA1
-		},
-		func() {
-			input.URL.Path = "/"
-			input.URL.User = s.URL.User
-			newShouldFail = false
-			if _, err = validator.ValidateCompute(ctx, input, false); err != nil {
-				t.Error(err)
-			}
-		},
-		func() {
-			input.URL.Path = "/enoent" // Datacenter "enoent" in --target is not found
-		},
-		func() {
-			input.URL.Path = "/DC1/sorry" // --target should only specify datacenter in the path
-		},
-		func() {
-			input.URL.Path = "/DC1" // ok
-			dc = input.URL.Path
-		},
-		func() {
-			if _, err = validator.ValidateCompute(ctx, input, true); err == nil {
-				t.Error("expected error")
-			}
-			input.ComputeResourcePath = "enoent"
-		},
-		func() {
-			input.ComputeResourcePath = "DC1_C0"
-		},
-		func() {
-			input.PublicNetwork.Name = "enoent"
-		},
-		func() {
-			input.PublicNetwork.Name = "VM Network"
-			input.ManagementNetwork.Name = input.PublicNetwork.Name
-			input.ClientNetwork.Name = input.PublicNetwork.Name
-			input.BridgeNetworkName = "DC1_DVPG0"
-		},
-		func() {
-			input.ScratchSize = "10GB"
-			p, _ := s.URL.User.Password()
-			input.OpsCredentials.OpsPassword = &p
-		},
-		func() {
-			input.ImageDatastorePath = "enoent"
-		},
-		func() {
-			input.ImageDatastorePath = "LocalDS_*" // > 1
-		},
-		func() {
-			input.ImageDatastorePath = "LocalDS_0"
-		},
-		func() {
-			// TODO: volume
-		},
-		func() {
-			user := s.URL.User.Username()
-			input.OpsCredentials.OpsUser = &user
-		},
-		func() {
-			simulator.EvalLicense.Properties = license.Properties // restore license features
-		},
-	}
-
-	for i, step := range steps {
-		if testing.Verbose() {
-			fmt.Fprintf(os.Stderr, "TestValidateVPX(%d)%s\n", i, strings.Repeat(".", 30))
-		}
-		step()
-
-		validator, err = NewValidator(ctx, input)
-		if err != nil {
-			continue
-		}
-
-		if newShouldFail {
-			t.Fatalf("%d: expected error", i)
-		}
-
-		_, err = validator.Validate(ctx, input)
-		if i == len(steps)-1 {
-			if err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			if err == nil {
-				t.Fatal("expected error")
-			}
-		}
-
-		if dc != "" {
-			// NewValidator has the side-effect of setting input.URL.Path=""
-			input.URL.Path = dc
-		}
-	}
-
-	// we have valid input at this point, test various compute-resource suggestions
-	vs := validator.Session
-	crs := []struct {
-		flag    string
-		pool    string
-		cluster string
-	}{
-		{"*", "", ""},         // MultipleFoundError
-		{"Resources", "", ""}, // MultipleFoundError
-		{"DC1_[CH]0", "", ""}, // MultipleFoundError
-		{"DC1_C0_RP1", "/F0/DC1/host/F0/DC1_C0/Resources/DC1_C0_RP1", "/F0/DC1/host/F0/DC1_C0"}, // ResourcePool (nested)
-		{"DC1_H0", "/F0/DC1/host/F0/DC1_H0/Resources", "/F0/DC1/host/F0/DC1_H0"},                // Host (standalone)
-		{"DC1_C0", "/F0/DC1/host/F0/DC1_C0/Resources", "/F0/DC1/host/F0/DC1_C0"},                // Cluster
-	}
-
-	for _, cr := range crs {
-		vs.Pool = nil
-		vs.PoolPath = ""
-
-		vs.Cluster = nil
-		vs.ClusterPath = ""
-
-		_, err = validator.ResourcePoolHelper(ctx, cr.flag)
-
-		if vs.ClusterPath != cr.cluster {
-			t.Errorf("%s ClusterPath=%s", cr.flag, vs.ClusterPath)
-		}
-
-		if vs.PoolPath != cr.pool {
-			t.Errorf("%s PoolPath=%s", cr.flag, vs.PoolPath)
-		}
-
-		if err == nil {
-			continue
-		}
-
-		switch err.(type) {
-		case *find.MultipleFoundError:
-			// expected
-		default:
-			t.Errorf("ResourcePoolHelper(%s): %s", cr.flag, err)
-		}
-	}
-
-	// cover some other paths now that we have a valid config
-	spec, err := validator.ValidateTarget(ctx, input)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	validator.AddDeprecatedFields(ctx, spec, input)
-
-	_, err = CreateFromVCHConfig(ctx, spec, vs)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// force vim25.NewClient to fail
-	simulator.Map.Remove(methods.ServiceInstance)
-	validator.credentials(ctx, input, spec)
-
-	// cover some of the return+error paths for certs (TODO: move this elsewhere and include valid data)
-	validator.certificate(ctx, input, spec)
-	validator.certificateAuthorities(ctx, input, spec)
-
-	input.CertPEM = s.Certificate().Raw
-	validator.certificate(ctx, input, spec)
-	validator.certificateAuthorities(ctx, input, spec)
-
-	input.ClientCAs = []byte{1}
-	validator.certificateAuthorities(ctx, input, spec)
-
-	validator.registries(ctx, input, spec)
-	input.RegistryCAs = input.ClientCAs
-	validator.registries(ctx, input, spec)
-}
-
-func TestValidateWithESX(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	ctx := context.Background()
-
-	m := simulator.ESX()
-	defer m.Remove()
-
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	m.Service.TLS = new(tls.Config)
-	s := m.Service.NewServer()
-	defer s.Close()
-
-	input := data.NewData()
-	input.URL = &url.URL{
-		Path: s.URL.Host,
-		User: s.URL.User,
-	}
-
-	input.Thumbprint = s.CertificateInfo().ThumbprintSHA1
-
-	steps := []func(){
-		func() {
-			input.ComputeResourcePath = "enoent"
-		},
-		func() {
-			input.PublicNetwork.Name = "enoent"
-		},
-		func() {
-			input.ImageDatastorePath = "enoent"
-		},
-		func() {
-			input.ImageDatastorePath = "enoent"
-		},
-		func() {
-			input = getESXData(s.URL)
-			input.URL.Path = "/"
-			input.ScratchSize = "10GB"
-			input.Force = true
-		},
-	}
-
-	var validator *Validator
-
-	for i, step := range steps {
-		if testing.Verbose() {
-			fmt.Fprintf(os.Stderr, "TestValidateESX(%d)%s\n", i, strings.Repeat(".", 30))
-		}
-
-		step()
-
-		validator, err = NewValidator(ctx, input)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		validator.AllowEmptyDC()
-
-		_, err = validator.Validate(ctx, input)
-		if i == len(steps)-1 {
-			if err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			if err == nil {
-				t.Fatal("expected error")
-			}
-		}
-	}
-
-	// cover some errors paths by destroying this ESX system
-	ref := esx.HostSystem.Reference()
-	host := simulator.Map.Get(ref).(*simulator.HostSystem)
-
-	steps = []func(){
-		func() {
-			host.Summary.ManagementServerIp = "owned"
-		},
-		func() {
-			host.Summary.ManagementServerIp = ""
-			simulator.Map.Remove(ref) // remove the host, forcing Finder.DefaultHostSystem to fail
-		},
-	}
-
-	for i, step := range steps {
-		step()
-
-		validator.managedbyVC(ctx)
-		issues := validator.GetIssues()
-
-		if len(issues) != 1 {
-			t.Errorf("%d issues: %s", i, issues)
-		}
-		validator.ClearIssues()
-	}
-
-	simulator.Map.Remove(esx.Datacenter.Reference()) // goodnight now.
-	validator.suggestDatacenter()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test_sim_util.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test_sim_util.go
new file mode 100644
index 0000000000..911420d813
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/validator_test_sim_util.go
@@ -0,0 +1,221 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package validate
+
+import (
+	"context"
+	"net"
+	"net/url"
+
+	log "github.com/Sirupsen/logrus"
+
+	"github.com/vmware/vic/cmd/vic-machine/common"
+	"github.com/vmware/vic/lib/config"
+	"github.com/vmware/vic/lib/config/executor"
+	"github.com/vmware/vic/lib/install/data"
+	"github.com/vmware/vic/pkg/ip"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+var (
+	inputConfigAdminPassword = "Admin!23"
+	inputConfigOpsUser       = "ops-user@vsphere.local"
+	inputConfigOpsPassword   = "ops-user-password"
+)
+
+var testInputConfigVPX = data.Data{
+	Target: &common.Target{
+		URL: &url.URL{
+			Scheme:     "http",
+			Opaque:     "",
+			User:       url.UserPassword("administrator@vsphere.local", "Admin!23"),
+			Host:       "", // This is set after the simulator starts
+			Path:       "/DC0",
+			RawPath:    "",
+			ForceQuery: false,
+			RawQuery:   "",
+			Fragment:   "",
+		},
+		User:       "administrator@vsphere.local",
+		Password:   &inputConfigAdminPassword,
+		Thumbprint: "",
+	},
+	Debug:           common.Debug{},
+	Compute:         common.Compute{ComputeResourcePath: "/DC0/host/DC0_C0/Resources/DC0_C0_RP1", DisplayName: "vch-test-1787"},
+	VCHID:           common.VCHID{},
+	ContainerConfig: common.ContainerConfig{},
+	OpsCredentials: common.OpsCredentials{
+		OpsUser:     &inputConfigOpsUser,
+		OpsPassword: &inputConfigOpsPassword,
+		IsSet:       false,
+	},
+	CertPEM:     nil,
+	KeyPEM:      nil,
+	ClientCAs:   nil,
+	RegistryCAs: nil,
+	Images: common.Images{ApplianceISO: "V1.2.0-RC1-100000-DD73850-appliance.iso",
+		BootstrapISO: "V1.2.0-RC1-100000-DD73850-bootstrap.iso", OSType: "linux"},
+	ImageDatastorePath: "LocalDS_0",
+	VolumeLocations: map[string]*url.URL{
+		"default": {
+			Scheme:     "ds",
+			Opaque:     "",
+			User:       (*url.Userinfo)(nil),
+			Host:       "",
+			Path:       "LocalDS_0/volumes",
+			RawPath:    "",
+			ForceQuery: false,
+			RawQuery:   "",
+			Fragment:   "",
+		},
+		"local": {
+			Scheme:     "ds",
+			Opaque:     "",
+			User:       (*url.Userinfo)(nil),
+			Host:       "",
+			Path:       "LocalDS_0/volumes_local",
+			RawPath:    "",
+			ForceQuery: false,
+			RawQuery:   "",
+			Fragment:   "",
+		},
+		"nfs": {
+			Scheme:     "nfs",
+			Opaque:     "",
+			User:       (*url.Userinfo)(nil),
+			Host:       "nfs-host",
+			Path:       "vic-volumes:nas",
+			RawPath:    "",
+			ForceQuery: false,
+			RawQuery:   "",
+			Fragment:   "",
+		},
+	},
+	BridgeNetworkName: "DC0_DVPG0",
+	ClientNetwork: data.NetworkConfig{
+		Name:         "VM Network",
+		Destinations: nil,
+		Gateway:      net.IPNet{},
+		IP:           net.IPNet{},
+	},
+	PublicNetwork: data.NetworkConfig{
+		Name:         "VM Network",
+		Destinations: nil,
+		Gateway:      net.IPNet{},
+		IP:           net.IPNet{},
+	},
+	ManagementNetwork: data.NetworkConfig{
+		Name:         "VM Network",
+		Destinations: nil,
+		Gateway:      net.IPNet{},
+		IP:           net.IPNet{},
+	},
+	DNS: nil,
+	ContainerNetworks: common.ContainerNetworks{
+		MappedNetworks:          map[string]string{},
+		MappedNetworksGateways:  map[string]net.IPNet{},
+		MappedNetworksIPRanges:  map[string][]ip.Range{},
+		MappedNetworksDNS:       map[string][]net.IP{},
+		MappedNetworksFirewalls: map[string]executor.TrustLevel{},
+	},
+	ResourceLimits: common.ResourceLimits{},
+	BridgeIPRange: &net.IPNet{
+		IP:   []byte{0xac, 0x10, 0x0, 0x0},
+		Mask: []byte{0xff, 0xf0, 0x0, 0x0},
+	},
+	InsecureRegistries:  nil,
+	WhitelistRegistries: nil,
+	HTTPSProxy:          (*url.URL)(nil),
+	HTTPProxy:           (*url.URL)(nil),
+	ProxyIsSet:          false,
+	NumCPUs:             1,
+	MemoryMB:            2048,
+	Timeout:             180000000000,
+	Force:               true,
+	ResetInProgressFlag: false,
+	AsymmetricRouting:   false,
+	ScratchSize:         "8GB",
+	Rollback:            false,
+	SyslogConfig:        data.SyslogConfig{},
+}
+
+func GetVcsimInputConfig(ctx context.Context, URL *url.URL) *data.Data {
+	localInputConfig := testInputConfigVPX
+	// Fix the URL to point to vcsim
+	if URL != nil {
+		// Update the Host from the URL
+		localInputConfig.Target.URL.Host = URL.Host
+	}
+	// Copy the URL pointer
+	localInputConfig.Target = common.NewTarget()
+	*localInputConfig.Target = *testInputConfigVPX.Target
+	localInputConfig.Target.URL = new(url.URL)
+	*localInputConfig.Target.URL = *testInputConfigVPX.Target.URL
+	return &localInputConfig
+}
+
+// This method allows to perform validation of a configuration when
+// interacting with GO vmomi simulator, it skips some of the tests
+// that otherwise would fail (e.g. Firewall)
+func (v *Validator) VcsimValidate(ctx context.Context, localInputConfig *data.Data) (*config.VirtualContainerHostConfigSpec, error) {
+	defer trace.End(trace.Begin(""))
+	op := trace.FromContext(ctx, "validateForSim")
+	log.Infof("Validating supplied configuration")
+
+	conf := &config.VirtualContainerHostConfigSpec{}
+
+	if err := v.datacenter(op); err != nil {
+		return conf, err
+	}
+
+	v.basics(op, localInputConfig, conf)
+
+	v.target(op, localInputConfig, conf)
+	v.credentials(op, localInputConfig, conf)
+	v.compute(op, localInputConfig, conf)
+	v.storage(op, localInputConfig, conf)
+	v.network(op, localInputConfig, conf)
+	v.CheckLicense(op)
+	v.CheckDRS(op, localInputConfig)
+
+	// Perform the higher level compatibility and consistency checks
+	v.compatibility(op, conf)
+
+	v.syslog(op, conf, localInputConfig)
+
+	pool, err := v.ResourcePoolHelper(op, localInputConfig.ComputeResourcePath)
+	v.NoteIssue(err)
+
+	if pool == nil {
+		return conf, v.ListIssues(op)
+	}
+
+	// Add the resource pool
+	conf.ComputeResources = append(conf.ComputeResources, pool.Reference())
+
+	// Add the VM
+	vm, err := v.Session.Finder.VirtualMachine(op, "/DC0/vm/DC0_C0_RP0_VM0")
+	v.NoteIssue(err)
+
+	if vm == nil {
+		return conf, v.ListIssues(op)
+	}
+
+	vmRef := vm.Reference()
+	conf.SetMoref(&vmRef)
+
+	// TODO: determine if this is where we should turn the noted issues into message
+	return conf, v.ListIssues(op)
+}
diff --git a/installer/vendor/github.com/vmware/vic/lib/install/validate/vmgroup.go b/installer/vendor/github.com/vmware/vic/lib/install/validate/vmgroup.go
new file mode 100644
index 0000000000..2e1c8ed120
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/lib/install/validate/vmgroup.go
@@ -0,0 +1,46 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package validate
+
+import (
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+func VMGroupExists(op trace.Operation, cluster *object.ComputeResource, group string) (bool, error) {
+	op.Debugf("Checking for existence of DRS VM Group %q on %s", group, cluster)
+
+	var clusterConfig mo.ClusterComputeResource
+	err := cluster.Properties(op, cluster.Reference(), []string{"configurationEx"}, &clusterConfig)
+	if err != nil {
+		return false, errors.Errorf("Unable to obtain cluster config: %s", err)
+	}
+
+	clusterConfigEx := clusterConfig.ConfigurationEx.(*types.ClusterConfigInfoEx)
+	for _, g := range clusterConfigEx.Group {
+		info := g.GetClusterGroupInfo()
+		if info.Name == group {
+			op.Debugf("DRS VM Group named %q exists", group)
+			return true, nil
+		}
+	}
+
+	op.Debugf("DRS VM Group named %q does not exist", group)
+	return false, nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/lib/iolog/constants.go b/installer/vendor/github.com/vmware/vic/lib/iolog/constants.go
deleted file mode 100644
index 184afa0a1f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/iolog/constants.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iolog
-
-const (
-	// TODO(jzt): re-arrange header layout so that size is on the LSB side, and TS is on MSB,
-	// with space for flags in the middle
-	futureFlag1 = 1 << iota
-	futureFlag2
-	futureFlag4
-	streamFlag
-
-	maxEntrySizeKB           = 4
-	maxEntrySizeBytes        = maxEntrySizeKB*1024 - 1
-	headerLengthBytes        = 10
-	encodedHeaderLengthBytes = 16 // base64 encoded header
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/iolog/iolog_test.go b/installer/vendor/github.com/vmware/vic/lib/iolog/iolog_test.go
deleted file mode 100644
index 4ff5de1767..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/iolog/iolog_test.go
+++ /dev/null
@@ -1,248 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iolog
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"encoding/base64"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"math/rand"
-	"testing"
-	"time"
-)
-
-type TestReadCloser struct {
-	*bytes.Buffer
-	io.Closer
-}
-
-type testClock struct{}
-
-func (testClock) Now() time.Time {
-	return time.Unix(191193300, 0)
-}
-
-var (
-	tc         testClock
-	expectedTs = time.Unix(0, tc.Now().UTC().UnixNano()).Format(RFC3339NanoFixed)
-)
-
-func TestWriteEntry(t *testing.T) {
-	var buf bytes.Buffer
-	w := NewLogWriter(&buf, tc)
-	msg := "The quick brown fox jumped over the lazy dog\n"
-	size := len(msg)
-
-	n, err := w.Write([]byte(msg))
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-
-	if n != size {
-		t.Errorf("Wrote %d bytes, expected to write %d", n, len(msg))
-	}
-
-	b := buf.Bytes()
-	expected := size + encodedHeaderLengthBytes
-	if len(b) != expected {
-		t.Errorf("Serialized entry was %d bytes, expected %d", len(b), expected)
-	}
-
-	entry := string(b[encodedHeaderLengthBytes:])
-	if entry != msg {
-		t.Errorf("Written message did not match original. Got %s, expected %s", entry, msg)
-	}
-}
-
-func TestWriteLargeEntry(t *testing.T) {
-	var buf bytes.Buffer
-	w := NewLogWriter(&buf, tc)
-	size := 32 * 1024
-	msg := make([]byte, size)
-
-	n, err := w.Write(msg)
-	if err != nil {
-		t.Errorf(err.Error())
-	}
-	w.Close()
-
-	if n != size {
-		t.Errorf("Wrote %d bytes, expected to write %d", n, len(msg))
-	}
-
-	// 32KB entry should have been broken into 8 4095B entries and 1 8B entry
-	// for a total of 32KB in data + 9*encodedHeaderLengthBytes in headers
-	expected := len(msg) + 9*encodedHeaderLengthBytes
-	if len(buf.Bytes()) != expected {
-		t.Errorf("Wrote %d bytes, expected to write %d", len(buf.Bytes()), expected)
-	}
-}
-
-func TestWriteReadLargeEntry(t *testing.T) {
-	var in bytes.Buffer
-	w := NewLogWriter(&in, tc)
-	rc := &TestReadCloser{Buffer: &in}
-	r := NewLogReader(rc, false)
-
-	rand.Seed(time.Now().Unix())
-	data := make([]byte, 32*1024)
-	n := 0
-	for n < len(data) {
-		w, err := rand.Read(data[n:])
-		n += w
-		if err != nil {
-			break
-		}
-	}
-
-	h := sha256.New()
-	d := bytes.NewBuffer(data)
-	if _, err := io.Copy(h, d); err != nil {
-		t.Errorf("Error calculating sha256: %s", err)
-	}
-	shaSrc := fmt.Sprintf("%x", h.Sum(nil))
-
-	n, err := w.Write(data)
-	if n != len(data) {
-		t.Errorf("Wrote %d bytes, expected to write %d", n, len(data))
-	}
-	w.Close()
-
-	if err != nil {
-		t.Errorf("Error writing random data: %s", err)
-	}
-
-	result := make([]byte, len(data))
-	n = 0
-	for n < len(data) {
-		w, err := r.Read(result[n:])
-		n += w
-		if err != nil {
-			break
-		}
-	}
-
-	if err != nil {
-		t.Errorf("Error reading random data: %s", err)
-	}
-
-	if len(result) != len(data) {
-		t.Errorf("Expected result of size %d, got %d", len(data), len(result))
-	}
-
-	h = sha256.New()
-	d = bytes.NewBuffer(result)
-	if _, err := io.Copy(h, d); err != nil {
-		t.Errorf("Error calculating sha256: %s", err)
-	}
-	shaDst := fmt.Sprintf("%x", h.Sum(nil))
-
-	if shaSrc != shaDst {
-		t.Errorf("Checksum failed: expected %s, got %s", shaSrc, shaDst)
-	}
-}
-
-func TestSplit(t *testing.T) {
-	var in bytes.Buffer
-
-	w := NewLogWriter(&in, tc)
-	numEntries := 5
-	data := make([]byte, numEntries*maxEntrySizeBytes)
-	entries := w.split(data)
-
-	if len(entries) != numEntries {
-		t.Errorf("Expected %d entries, got %d", numEntries, len(entries))
-	}
-
-	for _, entry := range entries {
-		h, err := base64.StdEncoding.DecodeString(string(entry[:encodedHeaderLengthBytes]))
-		if err != nil {
-			t.Errorf("Error decoding base64 header: %s", err)
-		}
-		ts := time.Unix(0, int64(binary.LittleEndian.Uint64(h[:8])))
-
-		expected := tc.Now().UTC().UnixNano()
-		actual := ts.UnixNano()
-		if expected != actual {
-			t.Errorf("Expected unix timestamp %d, got %d", expected, actual)
-		}
-
-		s := binary.LittleEndian.Uint16(h[8:10])
-
-		stream := (s & streamFlag) >> 3
-		if stream != 0 {
-			t.Errorf("Expected stream %d, got %d", 0, stream)
-		}
-
-		size := int(s >> 4)
-		msg := entry[encodedHeaderLengthBytes:]
-		if size != len(msg) {
-			t.Errorf("Expected msg size %d, got %d", len(msg), size)
-		}
-	}
-}
-
-func TestTimestamps(t *testing.T) {
-	var in bytes.Buffer
-	w := NewLogWriter(&in, tc)
-	rc := &TestReadCloser{Buffer: &in}
-	r := NewLogReader(rc, true) // enable timestamp output
-
-	msgs := []string{
-		"Jerry, it’s Frank Costanza. Steinbrenner’s here. George is dead. Call me back.\n",
-		"When you look annoyed all the time, people think that you’re busy.\n",
-		"You put the balm on? Who told you to put the balm on? I didn't tell you to put the balm on. Why'd you put the balm on?\n",
-		"At the Festivus dinner, you gather your family around and you tell them all the ways they have disappointed you over the past year.\n",
-	}
-
-	for _, msg := range msgs {
-		n, err := w.Write([]byte(msg))
-		if n != len(msg) {
-			t.Errorf("Wrote %d bytes, expected to write %d", n, len(msg))
-		}
-		if err != nil {
-			t.Errorf("Error writing message: %s", err)
-		}
-	}
-	w.Close()
-
-	tslen := len(expectedTs)
-	results := [][]byte{}
-	for _, m := range msgs {
-		msg := make([]byte, len(m)+tslen+1) // we need room for the message, the timestamp, and a space
-		_, err := r.Read(msg)
-		if err != nil && err != io.EOF {
-			t.Errorf("Error reading message: %s", err)
-		}
-		results = append(results, msg)
-	}
-
-	if len(results) != len(msgs) {
-		t.Errorf("Expected results of size %d, got %d", len(msgs), len(results))
-	}
-	for i, result := range results {
-		ts := string(result[:tslen])
-		msg := result[tslen+1:]
-		if string(ts) != expectedTs {
-			t.Errorf("Expected timestamp %s, got %s", expectedTs, ts)
-		}
-		if string(msg) != msgs[i] {
-			t.Errorf("Expected result %s, got %s", msgs[i], string(msg))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/iolog/log_reader.go b/installer/vendor/github.com/vmware/vic/lib/iolog/log_reader.go
deleted file mode 100644
index 554202cdc8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/iolog/log_reader.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iolog
-
-import (
-	"encoding/base64"
-	"encoding/binary"
-	"io"
-	"time"
-)
-
-const (
-	// RFC3339NanoFixed is Docker's version of RFC339Nano that pads the
-	// nanoseconds with zeros to ensure that the timestamps are aligned in the logs.
-	RFC3339NanoFixed = "2006-01-02T15:04:05.000000000Z07:00"
-)
-
-// LogReader reads containerVM entries from a stream and decodes them into
-// their original form
-type LogReader struct {
-	io.ReadCloser
-	prev []byte
-	ts   bool
-}
-
-// Header describes the header of a containerVM log entry
-type Header struct {
-	Timestamp time.Time
-	Size      int
-	Stream    int
-}
-
-// Entry describes a containerVM log entry
-type Entry struct {
-	Header
-	Message []byte
-}
-
-// NewLogReader wraps an io.ReadCloser in a LogReader.
-func NewLogReader(r io.ReadCloser, ts bool) *LogReader {
-	return &LogReader{
-		ReadCloser: r,
-		ts:         ts}
-}
-
-// ParseLogEntry parses data from an io.Reader into a Entry
-func ParseLogEntry(r io.Reader) (*Entry, error) {
-	var (
-		err  error
-		n, w int
-		ts   time.Time
-	)
-
-	ehdr := make([]byte, encodedHeaderLengthBytes)
-	// read a header
-	n = 0
-	for n < encodedHeaderLengthBytes {
-		w, err = r.Read(ehdr[n:])
-		n += w
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// decode base64 header
-	hdr, err := base64.StdEncoding.DecodeString(string(ehdr))
-	if err != nil {
-		return nil, err
-	}
-
-	// parse header
-	ts = time.Unix(0, int64(binary.LittleEndian.Uint64(hdr[:8])))
-	s := binary.LittleEndian.Uint16(hdr[8:10])
-	// stream := int((s&streamFlag) >> 3)
-	size := int(s >> 4)
-
-	entry := &Entry{
-		Header: Header{
-			Timestamp: ts,
-			Size:      size,
-		},
-	}
-
-	// read the associated entry
-	msg := make([]byte, size)
-	n = 0
-	for n < size {
-		w, err = r.Read(msg[n:])
-		n += w
-		if err != nil {
-			if err != io.EOF {
-				// only return if not EOF as we may actually have some bytes to copy
-				return nil, err
-			}
-			break
-		}
-	}
-	entry.Message = msg
-	return entry, nil
-}
-
-// Read reads a 10 byte header and decodes it into the timestamp, stream and
-// size of an entry. It uses the size to read the next set of bytes as the
-// message, and then copies the message into the supplied buffer, saving
-// what will not fit in the buffer for the next call to Read.
-func (lr *LogReader) Read(p []byte) (int, error) {
-	var (
-		entry *Entry
-		err   error
-	)
-	msg := lr.prev
-	partial := true // treat msg as a partial entry until we verify otherwise
-
-	if msg == nil {
-		// we know msg is not a partial entry as we had no bytes left from the previous call
-		partial = false
-		entry, err = ParseLogEntry(lr.ReadCloser)
-		if err != nil {
-			return 0, err
-		}
-		msg = entry.Message
-	}
-
-	lr.prev = nil
-	if len(p) < len(msg) {
-		// copy what we can and save the rest for the next call
-		lr.prev = msg[len(p):]
-		msg = msg[:len(p)]
-	}
-
-	// add timestamp if enabled
-	if lr.ts && !partial {
-		msg = append([]byte(entry.Timestamp.Format(RFC3339NanoFixed)+" "), msg...)
-	}
-
-	// write the log message
-	return copy(p, msg), err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/iolog/log_writer.go b/installer/vendor/github.com/vmware/vic/lib/iolog/log_writer.go
deleted file mode 100644
index 4f5b9dd932..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/iolog/log_writer.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package iolog
-
-import (
-	"bytes"
-	"encoding/base64"
-	"encoding/binary"
-	"io"
-	"sync"
-	"time"
-)
-
-// Clock defines an interface that wraps time.Now()
-type Clock interface {
-	Now() time.Time
-}
-
-// LogClock is an implementation of the Clock interface that
-// returns time.Now() for use in the iolog package
-type LogClock struct{}
-
-// Now returns the local time time.Now()
-func (LogClock) Now() time.Time {
-	return time.Now()
-}
-
-// LogWriter tags log entries with a descriptive header and writes
-// them to the underlying io.Writer
-type LogWriter struct {
-	Clock
-	w    io.Writer
-	prev []byte
-
-	m      sync.Mutex
-	closed bool
-}
-
-// NewLogWriter wraps an io.WriteCloser in a LogWriter
-func NewLogWriter(w io.Writer, clock Clock) *LogWriter {
-	return &LogWriter{
-		w:     w,
-		Clock: clock,
-	}
-}
-
-// Write scans the supplied buffer, breaking off indvidual entries
-// and writing them to the underlying Writer, flushing any leftover bytes
-func (lw *LogWriter) Write(p []byte) (n int, err error) {
-	var (
-		start, end, i int
-		entry         []byte
-	)
-
-	for {
-		i = 0
-		if i = bytes.IndexByte(p[start:], '\n') + 1; i == 0 {
-			break
-		}
-		end = start + i
-		entry = p[start:end]
-
-		// do we have bytes left over from the last call?
-		if lw.prev != nil {
-			entry = append(lw.prev, entry...)
-			lw.prev = nil
-		}
-
-		// we have a complete entry, let's write it
-		n, err = lw.write(entry)
-		if err != nil {
-			return n, err
-		}
-
-		// advance starting index
-		start = end
-	}
-
-	if start < len(p) {
-		// save the rest of the buffer for the next call
-		lw.prev = append(lw.prev, p[start:]...)
-	}
-
-	return len(p), err
-}
-
-func (lw *LogWriter) write(b []byte) (int, error) {
-	var (
-		err  error
-		n, w int
-	)
-	for _, entry := range lw.split(b) {
-		w, err = lw.w.Write(entry)
-		n += w
-		if err != nil {
-			break
-		}
-	}
-	// if we have to return with error, we should let the caller know
-	// how many of the provided bytes were written, not including our header
-	return n - encodedHeaderLengthBytes, err
-}
-
-// split breaks a log entry into smaller entries if necessary, adding a header to each
-func (lw *LogWriter) split(b []byte) [][]byte {
-	// break the entry up into multiple entries if necessary
-	entries := [][]byte{}
-	for len(b) > maxEntrySizeBytes {
-		entries = append(entries, b[:maxEntrySizeBytes])
-		b = b[maxEntrySizeBytes:]
-	}
-	entries = append(entries, b)
-
-	for i := range entries {
-
-		entry := entries[i]
-
-		// Each entry has a 10-byte header that describes the entry as follows:
-		// The first 8 bytes are the timestamp in int64 unix epoch format
-		// The first 12 bits of the final two bytes represent the size of the entry
-		// 0x8 represents the stream - 0 for stdout, 1 for stderr
-		// 0x4 currently unused, reserved for a future flag
-		// 0x2 currently unused, reserved for a future flag
-		// 0x1 currently unused, reserved for a future flag
-		header := make([]byte, headerLengthBytes)
-		// prepare the header
-		size := len(entry)
-		s := uint16(size << 4) // make some room for stream and partial flags
-		stream := 0            // TODO(jzt): defaults to 0 (stdout) until we figure out how to add stream tag
-		s |= uint16(stream << 3)
-		binary.LittleEndian.PutUint64(header[:8], uint64(lw.Now().UTC().UnixNano()))
-		binary.LittleEndian.PutUint16(header[8:], s)
-
-		// base64 encode the header
-		encodedHeader := base64.StdEncoding.EncodeToString(header)
-		entries[i] = append([]byte(encodedHeader), entry...)
-	}
-	return entries
-}
-
-// Close will flush the remaining bytes that have not yet been written
-func (lw *LogWriter) Close() (err error) {
-	lw.m.Lock()
-	defer lw.m.Unlock()
-
-	if lw.closed {
-		return nil
-	}
-
-	// flush buffer if there are leftover bytes
-	if lw.prev != nil {
-		var n, w int
-		for n < len(lw.prev) {
-			w, err = lw.write(lw.prev[n:])
-			n += w
-			if err != nil {
-				break
-			}
-		}
-		// reset lw.prev
-		lw.prev = nil
-	}
-
-	if c, ok := lw.w.(io.Closer); ok {
-		c.Close()
-		lw.closed = true
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/metadata/image_config.go b/installer/vendor/github.com/vmware/vic/lib/metadata/image_config.go
deleted file mode 100644
index 8030bf3f0e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/metadata/image_config.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package metadata
-
-import (
-	docker "github.com/docker/docker/image"
-)
-
-// ImageConfig contains configuration data describing images and their layers
-type ImageConfig struct {
-	docker.V1Image
-
-	// image specific data
-	ImageID   string            `json:"image_id"`
-	Digests   []string          `json:"digests,omitempty"`
-	Tags      []string          `json:"tags,omitempty"`
-	Name      string            `json:"name,omitempty"`
-	DiffIDs   map[string]string `json:"diff_ids,omitempty"`
-	History   []docker.History  `json:"history,omitempty"`
-	Reference string            `json:"registry"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/metadata/metadata.go b/installer/vendor/github.com/vmware/vic/lib/metadata/metadata.go
deleted file mode 100644
index cd31532db8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/metadata/metadata.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package metadata
-
-const (
-	// MetaDataKey specifies the key that maps to metadata blobs in the portlayer
-	MetaDataKey = "metaData"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/errors/errors.go b/installer/vendor/github.com/vmware/vic/lib/migration/errors/errors.go
deleted file mode 100644
index b0aefb09b5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/errors/errors.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package errors
-
-import (
-	"fmt"
-)
-
-// InternalError is returned when there is internal issue
-type InternalError struct {
-	Message string
-}
-
-func (e InternalError) Error() string {
-	return e.Message
-}
-
-type DataTypeError struct {
-	ExpectedType string
-}
-
-func (e DataTypeError) Error() string {
-	return fmt.Sprintf("Data type is not %s", e.ExpectedType)
-}
-
-type KeyNotFound struct {
-	Key     string
-	Message string
-}
-
-func (e KeyNotFound) Error() string {
-	return fmt.Sprintf("key %s is not found: %s", e.Key, e.Message)
-}
-
-type InvalidMigrationVersion struct {
-	Version string
-	Err     error
-}
-
-func (e InvalidMigrationVersion) Error() string {
-	return fmt.Sprintf("Data migration version is invalid %s: %s", e.Version, e.Err)
-}
-
-type DecodeError struct {
-	Err error
-}
-
-func (e DecodeError) Error() string {
-	if e.Err != nil {
-		return fmt.Sprintf("Failed to decode data: %s", e.Err)
-	}
-
-	return fmt.Sprintf("Failed to decode data")
-}
-
-type ValueFormatError struct {
-	Key   string
-	Value interface{}
-}
-
-func (e ValueFormatError) Error() string {
-	return fmt.Sprintf("Failed to convert value of key %s: %#v", e.Key, e.Value)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/feature/feature.go b/installer/vendor/github.com/vmware/vic/lib/migration/feature/feature.go
index a2d79061dd..485f688720 100644
--- a/installer/vendor/github.com/vmware/vic/lib/migration/feature/feature.go
+++ b/installer/vendor/github.com/vmware/vic/lib/migration/feature/feature.go
@@ -24,6 +24,14 @@ const (
 	VicadminProxyVarRenameVersion
 	InsecureRegistriesTypeChangeVersion
 
+	// ContainerCreateTimestampVersion represents the data version where a container's
+	// create time is stored in nanoseconds (previously seconds) in the portlayer.
+	ContainerCreateTimestampVersion
+
+	// VCHFolderSupportVersion represents the VCH version that first introduced
+	// VM folder support for the VCH.
+	VCHFolderSupportVersion
+
 	// Add new feature flag here
 
 	// MaxPluginVersion must be the last
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager.go b/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager.go
deleted file mode 100644
index 1b32149b65..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package manager
-
-import (
-	"context"
-	"fmt"
-	"sort"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const (
-	ApplianceConfigure = "ApplianceConfigure"
-	ContainerConfigure = "ContainerConfigure"
-
-	ApplianceVersionKey = "guestinfo.vice./init/version/PluginVersion"
-	ContainerVersionKey = "guestinfo.vice./version/PluginVersion"
-)
-
-var (
-	Migrator = NewDataMigrator()
-)
-
-type Plugin interface {
-	Migrate(ctx context.Context, s *session.Session, data interface{}) error
-}
-
-type DataMigration interface {
-	// Register plugin to data migration system
-	Register(version int, target string, plugin Plugin) error
-	// Migrate data with current version ID, return maximum ID number of executed plugins
-	Migrate(ctx context.Context, s *session.Session, target string, currentVersion int, data interface{}) (int, error)
-	// LatestVersion return the latest plugin version for specified target
-	LatestVersion(target string) int
-}
-
-type DataMigrator struct {
-	targetVers map[string][]int
-	verPlugins map[int]Plugin
-	once       sync.Once
-}
-
-func NewDataMigrator() DataMigration {
-	return &DataMigrator{
-		targetVers: make(map[string][]int),
-		verPlugins: make(map[int]Plugin),
-	}
-}
-
-// Register plugin to data migration system
-func (m *DataMigrator) Register(ver int, target string, plugin Plugin) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("plugin %s:%d", target, ver)))
-	// assert if plugin version less than max plugin version, which is forcing deveoper to change MaxPluginVersion variable everytime new plugin is added
-	if plugin == nil {
-		return &errors.InternalError{
-			Message: "Empty Plugin object is not allowed",
-		}
-	}
-	if ver > feature.MaxPluginVersion {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("Plugin %d is bigger than Max Plugin Version %d", ver, feature.MaxPluginVersion),
-		}
-	}
-
-	if m.verPlugins[ver] != nil {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("Plugin %d is conflict with another plugin, please make sure the plugin Version is unique and ascending", ver),
-		}
-	}
-	m.targetVers[target] = append(m.targetVers[target], ver)
-	m.verPlugins[ver] = plugin
-	return nil
-}
-
-func (m *DataMigrator) sortVersions() {
-	m.once.Do(func() {
-		sort.Ints(m.targetVers[ApplianceConfigure])
-		sort.Ints(m.targetVers[ContainerConfigure])
-	})
-}
-
-// Migrate data with current version ID, return true if has any plugin executed
-func (m *DataMigrator) Migrate(ctx context.Context, s *session.Session, target string, currentVersion int, data interface{}) (int, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("migrate %s from %d", target, currentVersion)))
-	m.sortVersions()
-
-	pluginVers := m.targetVers[target]
-	if len(pluginVers) == 0 {
-		log.Debugf("No plugins registered for %s", target)
-		return currentVersion, nil
-	}
-
-	i := sort.SearchInts(pluginVers, currentVersion)
-	if i >= len(pluginVers) {
-		log.Debugf("No plugins greater than %d", currentVersion)
-		return currentVersion, nil
-	}
-
-	latestVer := currentVersion
-	j := i
-	if pluginVers[i] == currentVersion {
-		j = i + 1
-	}
-	for ; j < len(pluginVers); j++ {
-		ver := pluginVers[j]
-		p := m.verPlugins[ver]
-		err := p.Migrate(ctx, s, data)
-		if err != nil {
-			return latestVer, err
-		}
-		latestVer = ver
-	}
-	return latestVer, nil
-}
-
-// LatestVersion return the latest plugin version for specified target
-func (m *DataMigrator) LatestVersion(target string) int {
-	pluginVers := m.targetVers[target]
-	l := len(pluginVers)
-	if l == 0 {
-		log.Debugf("No plugin registered for %s", target)
-		return 0
-	}
-	return pluginVers[l-1]
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager_test.go b/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager_test.go
deleted file mode 100644
index 501f259da6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/manager/manager_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package manager
-
-import (
-	"context"
-	"fmt"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-var testMap map[int]bool
-
-type TestPlugin struct {
-	Version int
-}
-
-func NewTestPlugin(version int) *TestPlugin {
-	return &TestPlugin{version}
-}
-
-func (p *TestPlugin) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	testMap[p.Version] = true
-	return nil
-}
-
-func setUp() {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-	testMap = make(map[int]bool)
-}
-
-func TestInsertID(t *testing.T) {
-	setUp()
-
-	tester := &DataMigrator{
-		targetVers: make(map[string][]int),
-		verPlugins: make(map[int]Plugin),
-	}
-
-	tester.targetVers[ApplianceConfigure] = []int{1, 11, 9, 5, 8, 2, 4}
-	tester.sortVersions()
-	assert.Equal(t, []int{1, 2, 4, 5, 8, 9, 11}, tester.targetVers[ApplianceConfigure], "Should have expected array")
-	tester.targetVers[ApplianceConfigure] = append(tester.targetVers[ApplianceConfigure], []int{20, 15}...)
-
-	// sort will only execute once
-	tester.sortVersions()
-	assert.NotEqual(t, []int{1, 2, 4, 5, 8, 9, 11, 15, 20}, tester.targetVers[ApplianceConfigure], "Should have expected array")
-}
-
-func TestMigratePluginExecution(t *testing.T) {
-	setUp()
-
-	tester := &DataMigrator{
-		targetVers: make(map[string][]int),
-		verPlugins: make(map[int]Plugin),
-	}
-
-	ids := []int{1, 2, 3, 4, 5}
-	var err error
-	for _, id := range ids {
-		if err = tester.Register(id, ApplianceConfigure, NewTestPlugin(id)); err != nil {
-			t.Errorf("Failed to register plugin %d: %s", id, err)
-		}
-	}
-
-	dataID, err := tester.Migrate(nil, nil, ApplianceConfigure, 0, nil)
-	assert.Equal(t, 5, dataID, "migrated id mismatch")
-	for _, id := range ids {
-		assert.True(t, testMap[id], fmt.Sprintf("plugin %d should be executed", id))
-	}
-	testMap = make(map[int]bool)
-	dataID, err = tester.Migrate(nil, nil, ApplianceConfigure, 3, nil)
-	assert.Equal(t, 5, dataID, "migrated id mismatch")
-	for _, id := range ids[:3] {
-		assert.False(t, testMap[id], fmt.Sprintf("plugin %d should not be executed", id))
-	}
-	for _, id := range ids[3:] {
-		assert.True(t, testMap[id], fmt.Sprintf("plugin %d should be executed", id))
-	}
-
-	testMap = make(map[int]bool)
-	dataID, err = tester.Migrate(nil, nil, ApplianceConfigure, 20, nil)
-	assert.Equal(t, 20, dataID, "migrated id mismatch")
-	for _, id := range ids {
-		assert.False(t, testMap[id], fmt.Sprintf("plugin %d should not be executed", id))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/migrator.go b/installer/vendor/github.com/vmware/vic/lib/migration/migrator.go
deleted file mode 100644
index 9f26bf8eb1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/migrator.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package migration
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-	// imported for the side effect
-	_ "github.com/vmware/vic/lib/migration/plugins"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// MigrateApplianceConfigure migrate VCH appliance configuration, including guestinfo, keyvaluestore, or any other configuration related change.
-//
-// Note: Input map conf is VCH appliance guestinfo map, and returned map is the new guestinfo.
-// Returns false without error means no need to migrate, and returned map is the copy of input map
-// If there is error returned, returns true and half-migrated value
-func MigrateApplianceConfig(ctx context.Context, s *session.Session, conf map[string]string) (map[string]string, bool, error) {
-	return migrateConfig(ctx, s, conf, manager.ApplianceConfigure, manager.ApplianceVersionKey)
-}
-
-// MigrateContainerConfigure migrate container configuration
-//
-// Note: Migrated data will be returned in map, and input object is not changed.
-// Returns false without error means no need to migrate, and returned map is the copy of input map
-// If there is error returned, returns true and half-migrated value
-func MigrateContainerConfig(conf map[string]string) (map[string]string, bool, error) {
-	return migrateConfig(nil, nil, conf, manager.ContainerConfigure, manager.ContainerVersionKey)
-}
-
-// ContainerDataIsOlder returns true if input container config is older than latest version. If error happens, always returns false
-func ContainerDataIsOlder(conf map[string]string) (bool, error) {
-	return dataIsOlder(conf, manager.ContainerConfigure, manager.ContainerVersionKey)
-}
-
-// ApplianceDataIsOlder returns true if input appliance config is older than latest version. If error happens, always returns false
-func ApplianceDataIsOlder(conf map[string]string) (bool, error) {
-	return dataIsOlder(conf, manager.ApplianceConfigure, manager.ApplianceVersionKey)
-}
-
-// ContainerDataVersion returns container data version
-func ContainerDataVersion(conf map[string]string) (int, error) {
-	return getCurrentID(conf, manager.ContainerVersionKey)
-}
-
-// dataIsOlder returns true if data is older than latest. If error happens, always returns false
-func dataIsOlder(data map[string]string, target string, verKey string) (bool, error) {
-	var currentID int
-	var err error
-
-	if currentID, err = getCurrentID(data, verKey); err != nil {
-		return false, err
-	}
-	latestVer := manager.Migrator.LatestVersion(target)
-	return latestVer > currentID, nil
-}
-
-func migrateConfig(ctx context.Context, s *session.Session, data map[string]string, target string, verKey string) (map[string]string, bool, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("target: %s, version key: %s", target, verKey)))
-
-	dst := make(map[string]string)
-	for k, v := range data {
-		dst[k] = v
-	}
-
-	if len(data) == 0 {
-		return dst, false, nil
-	}
-
-	var currentID int
-	var err error
-
-	if currentID, err = getCurrentID(data, verKey); err != nil {
-		return dst, false, err
-	}
-	latestVer := manager.Migrator.LatestVersion(target)
-	if latestVer <= currentID {
-		return dst, false, nil
-	}
-
-	_, err = manager.Migrator.Migrate(ctx, s, target, currentID, dst)
-	dst[verKey] = strconv.Itoa(feature.MaxPluginVersion - 1)
-	return dst, true, err
-}
-
-func getCurrentID(data map[string]string, verKey string) (int, error) {
-	var currentID int
-	var err error
-	strID := data[verKey]
-
-	if strID == "" {
-		return 0, nil
-	}
-	if currentID, err = strconv.Atoi(strID); err != nil {
-		return 0, &errors.InvalidMigrationVersion{
-			Version: strID,
-			Err:     err,
-		}
-	}
-	return currentID, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/migrator_test.go b/installer/vendor/github.com/vmware/vic/lib/migration/migrator_test.go
deleted file mode 100644
index d6594414d1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/migrator_test.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package migration
-
-import (
-	"os"
-	"strconv"
-	"strings"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/lib/migration/samples/plugins/plugin1"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var (
-	MaxPluginVersion = feature.MaxPluginVersion
-)
-
-func setUp() {
-	// register sample plugin into test
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-
-	if err := manager.Migrator.Register(MaxPluginVersion, manager.ApplianceConfigure, &plugin1.ApplianceStopSignalRename{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", manager.ApplianceConfigure, MaxPluginVersion, err)
-		panic(err)
-	}
-}
-
-func TestMigrateConfigure(t *testing.T) {
-
-	conf := &config.VirtualContainerHostConfigSpec{
-		ExecutorConfig: executor.ExecutorConfig{
-			Sessions: map[string]*executor.SessionConfig{
-				"abc": {
-					Attach:     true,
-					StopSignal: "2",
-				},
-				"def": {
-					Attach:     false,
-					StopSignal: "10",
-				},
-			},
-		},
-		Network: config.Network{
-			BridgeNetwork: "VM Network",
-		},
-	}
-	mapData := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(mapData), conf)
-	t.Logf("Old data: %#v", mapData)
-	newData, migrated, err := MigrateApplianceConfig(nil, nil, mapData)
-	if err != nil {
-		t.Errorf("migration failed: %s", err)
-		assert.Fail(t, "migration failed")
-	}
-	assert.True(t, migrated, "should be migrated")
-
-	latestVer := newData[manager.ApplianceVersionKey]
-	assert.Equal(t, strconv.Itoa(feature.MaxPluginVersion-1), latestVer, "upgrade version mismatch")
-
-	// check new data
-	var found bool
-	for k := range newData {
-		if strings.Contains(k, "stopSignal") {
-			assert.Fail(t, "key %s still exists in migrated data", k)
-		}
-		if strings.Contains(k, "forceStopSignal") {
-			found = true
-		}
-	}
-	assert.True(t, found, "Should found migrated data")
-
-	// verify old data
-	found = false
-	for k := range mapData {
-		if strings.Contains(k, "stopSignal") {
-			found = true
-		}
-		if strings.Contains(k, "forceStopSignal") {
-			assert.Fail(t, "key %s is found in old data", k)
-		}
-	}
-	assert.True(t, found, "Should found old data")
-
-	t.Logf("New data: %#v", newData)
-	newConf := &config.VirtualContainerHostConfigSpec{}
-	extraconfig.Decode(extraconfig.MapSource(newData), newConf)
-
-	assert.Equal(t, feature.MaxPluginVersion-1, newConf.Version.PluginVersion, "should not be migrated")
-	t.Logf("other version fields: %s", newConf.Version.String())
-}
-
-func TestIsDataOlder(t *testing.T) {
-
-	conf := &config.VirtualContainerHostConfigSpec{
-		ExecutorConfig: executor.ExecutorConfig{
-			Sessions: map[string]*executor.SessionConfig{
-				"abc": {
-					Attach:     true,
-					StopSignal: "2",
-				},
-				"def": {
-					Attach:     false,
-					StopSignal: "10",
-				},
-			},
-		},
-		Network: config.Network{
-			BridgeNetwork: "VM Network",
-		},
-	}
-	mapData := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(mapData), conf)
-	t.Logf("Old appliance data: %#v", mapData)
-	older, err := ApplianceDataIsOlder(mapData)
-	assert.Equal(t, nil, err, "should not have error")
-	assert.True(t, older, "Test data should be older than latest")
-
-	mapData = make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(mapData), conf.ExecutorConfig)
-	t.Logf("Old container data: %#v", mapData)
-
-	older, err = ContainerDataIsOlder(mapData)
-	assert.Equal(t, nil, err, "should not have error")
-	assert.True(t, older, "Test data should be older than latest since a container update plugin has been registered")
-}
-
-func TestMain(m *testing.M) {
-	setUp()
-	code := m.Run()
-	os.Exit(code)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/init.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/init.go
deleted file mode 100644
index 1d5c17b9ce..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/init.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugins
-
-// import all plugin packages here to register plugins
-import (
-	// imported for the side effect
-	_ "github.com/vmware/vic/lib/migration/plugins/plugin1"
-	_ "github.com/vmware/vic/lib/migration/plugins/plugin2"
-	_ "github.com/vmware/vic/lib/migration/plugins/plugin5"
-	_ "github.com/vmware/vic/lib/migration/plugins/plugin7"
-	_ "github.com/vmware/vic/lib/migration/plugins/plugin8"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin1/commonSpecForVCH.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin1/commonSpecForVCH.go
deleted file mode 100644
index 2080f50430..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin1/commonSpecForVCH.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin1
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const (
-	target = manager.ApplianceConfigure
-)
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, feature.AddCommonSpecForVCHVersion)))
-	if err := manager.Migrator.Register(feature.AddCommonSpecForVCHVersion, target, &AddCommonSpecForVCH{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, feature.AddCommonSpecForVCHVersion, err)
-		panic(err)
-	}
-}
-
-// AddCommonSpecForVCH is plugin for vic 0.8.0-GA version upgrade
-type AddCommonSpecForVCH struct {
-}
-
-type VirtualContainerHostConfigSpec struct {
-	ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-}
-
-type ExecutorConfig struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-}
-
-type Common struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-type UpdatedVCHConfigSpec struct {
-	UpdatedExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-}
-
-type UpdatedExecutorConfig struct {
-	UpdatedCommon `vic:"0.1" scope:"read-only" key:"common"`
-}
-
-type UpdatedCommon struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"hidden" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-func (p *AddCommonSpecForVCH) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("AddCommonSpecForVCH version: %d", feature.AddCommonSpecForVCHVersion)))
-	if data == nil {
-		return nil
-	}
-	mapData, ok := data.(map[string]string)
-	if !ok {
-		// Log the error here and return nil so that other plugins can proceed
-		log.Errorf("Migration data format is not map: %+v", data)
-		return nil
-	}
-	oldStruct := &VirtualContainerHostConfigSpec{}
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
-	log.Debugf("The oldStruct is %+v", oldStruct)
-	if result == nil {
-		return &errors.DecodeError{Err: fmt.Errorf("decode oldStruct %+v failed", oldStruct)}
-	}
-
-	newStruct := &UpdatedVCHConfigSpec{
-		UpdatedExecutorConfig: UpdatedExecutorConfig{
-			UpdatedCommon: UpdatedCommon{
-				Name:                 oldStruct.Name,
-				ID:                   oldStruct.ID,
-				ExecutionEnvironment: oldStruct.ExecutionEnvironment,
-				Notes:                oldStruct.Notes,
-			},
-		},
-	}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), newStruct)
-
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin2/commonSpecForContainer.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin2/commonSpecForContainer.go
deleted file mode 100644
index 852b376bbb..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin2/commonSpecForContainer.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin2
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const (
-	target = manager.ContainerConfigure
-)
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, feature.AddCommonSpecForContainerVersion)))
-	if err := manager.Migrator.Register(feature.AddCommonSpecForContainerVersion, target, &AddCommonSpecForContainer{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, feature.AddCommonSpecForContainerVersion, err)
-		panic(err)
-	}
-}
-
-// AddCommonSpecForContainer is plugin for vic 0.8.0-GA version upgrade
-type AddCommonSpecForContainer struct {
-}
-
-type ExecutorConfig struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-}
-
-type Common struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-type UpdatedExecutorConfig struct {
-	UpdatedCommon `vic:"0.1" scope:"read-only" key:"common"`
-}
-
-type UpdatedCommon struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"hidden" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-func (p *AddCommonSpecForContainer) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("AddCommonSpecForContainer version %d", feature.AddCommonSpecForContainerVersion)))
-	if data == nil {
-		return nil
-	}
-	mapData, ok := data.(map[string]string)
-	if !ok {
-		// Log the error here and return nil so that other plugins can proceed
-		log.Errorf("Migration data format is not map: %+v", data)
-		return nil
-	}
-	oldStruct := &ExecutorConfig{}
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
-	log.Debugf("The oldStruct is %+v", oldStruct)
-	if result == nil {
-		return &errors.DecodeError{Err: fmt.Errorf("decode oldStruct %+v failed", oldStruct)}
-	}
-
-	newStruct := &UpdatedExecutorConfig{
-		UpdatedCommon: UpdatedCommon{
-			Name:                 oldStruct.Name,
-			ID:                   oldStruct.ID,
-			Notes:                oldStruct.Notes,
-			ExecutionEnvironment: oldStruct.ExecutionEnvironment,
-		}}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), newStruct)
-
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry.go
deleted file mode 100644
index 218eb078aa..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package plugin5 Plugin to migrate urls from go1.7 to go1.8
-// Issue# https://github.com/vmware/vic/issues/4388
-package plugin5
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const (
-	target = manager.ApplianceConfigure
-)
-
-// VirtualContainerHostConfigSpec holds the metadata for a
-// Virtual Container Host that should be visible inside the appliance VM.
-type VirtualContainerHostConfigSpec struct {
-	// Registry configuration for Imagec
-	Registry `vic:"0.1" scope:"read-only" key:"registry"`
-}
-
-// Registry defines the registries virtual container host can talk to
-type Registry struct {
-	// Insecure registries
-	InsecureRegistries []url.URL `vic:"0.1" scope:"read-only" key:"insecure_registries"`
-}
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, feature.MigrateRegistryVersion)))
-	if err := manager.Migrator.Register(feature.MigrateRegistryVersion, target, &MigrateRegistry{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, feature.MigrateRegistryVersion, err)
-		panic(err)
-	}
-}
-
-// MigrateRegistry is plugin for vic 0.9.0-GA version upgrade
-type MigrateRegistry struct {
-}
-
-func (p *MigrateRegistry) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("MigrateRegistry version %d", feature.MigrateRegistryVersion)))
-	if data == nil {
-		log.Debugf("No data received plugin %s:%d", target, feature.MigrateRegistryVersion)
-		return nil
-	}
-
-	mapData, ok := data.(map[string]string)
-	if !ok {
-		// Log the error here and return nil so that other plugins can proceed
-		log.Errorf("Migration data format is not map: %+v", data)
-		return nil
-	}
-
-	oldVCHSpec := &VirtualContainerHostConfigSpec{}
-
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldVCHSpec)
-	if result == nil {
-		log.Errorf("Error decoding vchspec: %+v", oldVCHSpec)
-		return &errors.DecodeError{}
-	}
-
-	log.Debugf("The oldVCHSpec is %+v", oldVCHSpec)
-
-	newVCHSpec := &VirtualContainerHostConfigSpec{}
-
-	for _, registry := range oldVCHSpec.InsecureRegistries {
-		log.Debugf("Checking insecure registry url: %v", registry.String())
-		if registry.Host == "" {
-			log.Debugf("Fixing insecure registry url: %v", registry.String())
-
-			// split host:port/path
-			sp := strings.SplitN(registry.Path, "/", 2)
-
-			// Fix host from the first index of split
-			registry.Host = sp[0]
-			// if a path was present, in the second index of split
-			if len(sp) > 1 {
-				registry.Path = sp[1]
-			} else {
-				// else set path as empty
-				registry.Path = ""
-			}
-		}
-		newVCHSpec.InsecureRegistries = append(newVCHSpec.InsecureRegistries, registry)
-	}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), newVCHSpec)
-
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry_test.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry_test.go
deleted file mode 100644
index cdeb07e263..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin5/migrate_registry_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin5
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-func TestMigrateRegistry(t *testing.T) {
-
-	inConfig := []url.URL{
-		{Path: "1.1.1.1:5000"},
-		{Path: "2.2.2.2"},
-		{Host: "3.3.3.3:6000"},
-		{Host: "3.3.3.3"},
-		{Host: "vic.vmware.com"},
-		{Path: "[1234:1234:0:1234::11]:7000"},
-		{Host: "[1234:1234:0:1234::11]:7000"},
-		{Path: "3.3.3.3/foo/bar"},
-	}
-
-	outConfig := []url.URL{
-		{Host: "1.1.1.1:5000"},
-		{Host: "2.2.2.2"},
-		{Host: "3.3.3.3:6000"},
-		{Host: "3.3.3.3"},
-		{Host: "vic.vmware.com"},
-		{Host: "[1234:1234:0:1234::11]:7000"},
-		{Host: "[1234:1234:0:1234::11]:7000"},
-		{Host: "3.3.3.3", Path: "foo/bar"},
-	}
-
-	m := MigrateRegistry{}
-
-	vch := VirtualContainerHostConfigSpec{
-		Registry{
-			InsecureRegistries: inConfig,
-		}}
-
-	mapData := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(mapData), vch)
-
-	err := m.Migrate(nil, nil, mapData)
-	assert.NoError(t, err)
-
-	vchMigrated := extraconfig.Decode(extraconfig.MapSource(mapData), vch)
-	assert.Equal(t, outConfig, vchMigrated.(VirtualContainerHostConfigSpec).InsecureRegistries)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin7/vicadminProxyVarRename.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin7/vicadminProxyVarRename.go
deleted file mode 100644
index 7087af80c6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin7/vicadminProxyVarRename.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin7
-
-import (
-	"context"
-	"fmt"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Translates the proxy environment variables from the old appliance to the new appliance for vic admin
-const (
-	target      = manager.ApplianceConfigure
-	oldHProxy   = "HTTP_PROXY"
-	newHProxy   = "VICADMIN_HTTP_PROXY"
-	oldSProxy   = "HTTPS_PROXY"
-	newSProxy   = "VICADMIN_HTTPS_PROXY"
-	sessionName = "vicadmin"
-)
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, feature.VicadminProxyVarRenameVersion)))
-	if err := manager.Migrator.Register(feature.VicadminProxyVarRenameVersion, target, &VicadminProxyVarRename{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, feature.VicadminProxyVarRenameVersion, err)
-	}
-}
-
-// VicadminProxyVarRename is plugin for vic 0.8.0-GA version upgrade
-type VicadminProxyVarRename struct {
-}
-
-type VCHConfig struct {
-	ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-}
-
-type ExecutorConfig struct {
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-}
-
-type SessionConfig struct {
-	Cmd Cmd `vic:"0.1" scope:"read-only" key:"cmd"`
-}
-
-type Cmd struct {
-	Env []string `vic:"0.1" scope:"read-only" key:"Env"`
-}
-
-func (p *VicadminProxyVarRename) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("%d", feature.VicadminProxyVarRenameVersion)))
-	if data == nil {
-		return nil
-	}
-	mapData := data.(map[string]string)
-	oldStruct := &VCHConfig{}
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
-	if result == nil {
-		return &errors.DecodeError{}
-	}
-
-	// translate old proxy env var keys into to proxy env var keys
-	// skip upgrading if the proxy isn't defined or something is wrong with the the vicadmin executor
-	if oldStruct.Sessions == nil || oldStruct.Sessions[sessionName] == nil || oldStruct.Sessions[sessionName].Cmd.Env == nil {
-		log.Debugln("vicadmin session not found. skipping proxy rename")
-	} else {
-		var newEnvs []string
-		for _, envVar := range oldStruct.Sessions[sessionName].Cmd.Env {
-			envVarArgs := strings.Split(envVar, "=")
-			envVarValue := ""
-			if len(envVarArgs) > 1 {
-				envVarValue = envVarArgs[1]
-			}
-			if strings.Contains(envVar, oldHProxy) {
-				newEnvs = append(newEnvs, fmt.Sprintf("%s=%s", newHProxy, envVarValue))
-			} else if strings.Contains(envVar, oldSProxy) {
-				newEnvs = append(newEnvs, fmt.Sprintf("%s=%s", newSProxy, envVarValue))
-			} else {
-				newEnvs = append(newEnvs, envVar)
-			}
-		}
-		oldStruct.Sessions[sessionName].Cmd.Env = newEnvs
-	}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), oldStruct)
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin8/insecure_registries_type_change.go b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin8/insecure_registries_type_change.go
deleted file mode 100644
index 17713d89ef..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugin8/insecure_registries_type_change.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin8
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Translates the proxy environment variables from the old appliance to the new appliance for vic admin
-const (
-	target = manager.ApplianceConfigure
-)
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, feature.InsecureRegistriesTypeChangeVersion)))
-	if err := manager.Migrator.Register(feature.InsecureRegistriesTypeChangeVersion, target, &InsecureRegistriesTypeChange{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, feature.InsecureRegistriesTypeChangeVersion, err)
-	}
-}
-
-// InsecureRegistriesTypeChange
-type InsecureRegistriesTypeChange struct {
-}
-
-type OldVCHConfig struct {
-	OldRegistry `vic:"0.1" scope:"read-only" key:"registry"`
-}
-
-type OldRegistry struct {
-	InsecureRegistries []url.URL `vic:"0.1" scope:"read-only" key:"insecure_registries"`
-}
-
-type VCHConfig struct {
-	Registry `vic:"0.1" scope:"read-only" key:"registry"`
-}
-
-type Registry struct {
-	InsecureRegistries []string `vic:"0.1" scope:"read-only" key:"insecure_registries"`
-}
-
-func (p *InsecureRegistriesTypeChange) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("%d", feature.InsecureRegistriesTypeChangeVersion)))
-
-	if data == nil {
-		return nil
-	}
-	mapData := data.(map[string]string)
-	oldStruct := &OldVCHConfig{}
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
-	if result == nil {
-		return &errors.DecodeError{}
-	}
-
-	vchConfig := &VCHConfig{}
-	for _, r := range oldStruct.InsecureRegistries {
-		vchConfig.InsecureRegistries = append(vchConfig.InsecureRegistries, strings.TrimPrefix(r.String(), r.Scheme+"://"))
-	}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), vchConfig)
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugins.md b/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugins.md
deleted file mode 100644
index 12a06d06e7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/plugins/plugins.md
+++ /dev/null
@@ -1,43 +0,0 @@
-# Developer guideline to write a data migration plugin
-
-## Who and When to develop a data migration plugin
-
-As [upgrade design](../../../doc/design/upgrade.md) mentioned, every developer who changed configuration from VCH appliance configuration, container vm configuration, or key/value store, whatever it is, they should add data migration plugin here.
-
-## How to develop a data migration plugin
-
-### VM guestinfo changes including VCH appliance and container VM
-
-- Be sure to check if there is file conflict with other's commit. If there is conflict, that means others had plugin check in as well, make sure you did not use same version number with others
-- Create one package in this directory for your plugin
-- Add plugin files to the new package
-- Your plugin might rely on previous version and current version, if you need the whole VCH appliance or container configuration definition, copy them to package lib/migration/config, with correct new package created. For example, if you are working on migration from version 4 to version 5, create a package named v4 if there is no one existing, and copy all old configuration files to there, and create a new package v5,  copy all new configuration files to v5 package. Remember to update package name.
-- If only a few attributes are touched, you could define that piece of attribute definition in your plugin package, without whole configuration files copied in the above step. Which can save binary size, and also configuration encodeing/decoding time.
-- Develop plugin based on your specific change, read the input data, decoding to acceptable format, and change value inside of them. stop_singal_rename_sample.go is one VCH appliance configuration change sample, you can follow that to write your own plugin.
-- register your plugin to data migration framework, and put the function in package init() method.
-  * Register appliance data migration plugin to manager.ApplianceConfigure category
-  * Register container data migration plugin to manager.ContainerConfigure category
-  * The two kinds of plugs target for different data, be sure the type is selected correctly in registration.
-- Add import of your package in init.go in this package, to make sure the plugin is registered dynamically.
-
-### key/value store changes
-
-- Be sure to check if there is file conflict with other's commit. If there is conflict, that means others had plugin check in as well, make sure you did not use same version number with others
-- Create one package in this directory for your plugin
-- Add your plugin files to the new package
-- Develop plugin based on your specific change.
-  * Create new key/value store file in datastore, instead of change in existing file. The new file for new version, e.g. v4, could use file name as XXX.v4, to differentiate with old version's file.
-  * Copy all existing key/values to the new file, and update to the new file directly.
-  * Write to new datastore file only, because old file is still correct if migration failed eventually.
-- register your plugin to data migration framework, and put the function in package init() method.
-  * Register key/value store data migration plugin to manager.ApplianceConfigure category
-- Add import of your package in init.go in this package, to make sure the plugin is registered dynamically.
-
-Note:
-- Plugin version should be greater than 0
-- If you changed both key/value store and VCH appliance configuration, please add two separate plugins for them. Eventually, data migration framework will execute both of them, but separation will make the code easy to read.
-- While copy configuration files, remove unnecessary methods from that file, to reduce binary file size
-
-## Add integration test
-
-Be sure to add test scenario into upgrade test group, to cover your changes, to make sure after upgrade, your function works well
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/container_vm.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/container_vm.go
deleted file mode 100644
index 3adee2aa0f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/container_vm.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package executor
-
-import (
-	"net/url"
-	"time"
-
-	"github.com/vmware/vic/pkg/version"
-)
-
-type State int
-
-const (
-	STARTED State = iota
-	EXITED
-	KILLED
-)
-
-// Common data between managed entities, across execution environments
-type Common struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-// Diagnostics records some basic control and lifecycle information for diagnostic purposes
-type Diagnostics struct {
-	// Should debugging be enabled on whatever component this is and at what level
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"debug"`
-
-	// RessurectionCount is a log of how many times the entity has been restarted due
-	// to error exit
-	ResurrectionCount int `vic:"0.1" scope:"read-write" key:"resurrections"`
-	// ExitLogs is a best effort record of the time of process death and the cause for
-	// restartable entities
-	ExitLogs []ExitLog `vic:"0.1" scope:"read-write" key:"exitlogs"`
-}
-
-// ExitLog records some basic diagnostics about anomalous exit for restartable entities
-type ExitLog struct {
-	Time       time.Time
-	ExitStatus int
-	Message    string
-}
-
-// MountSpec details a mount that must be executed within the executor
-// A mount is a URI -> path mapping with a credential of some kind
-// In the case of a labeled disk:
-// 	label://<label name> => </mnt/path>
-type MountSpec struct {
-	// A URI->path mapping, e.g.
-	// May contain credentials
-	Source url.URL `vic:"0.1" scope:"read-only" key:"source"`
-
-	// The path in the executor at which this should be mounted
-	Path string `vic:"0.1" scope:"read-only" key:"dest"`
-
-	// Freeform mode string, which could translate directly to mount options
-	// We may want to turn this into a more structured form eventually
-	Mode string `vic:"0.1" scope:"read-only" key:"mode"`
-}
-
-// ContainerVM holds that data tightly associated with a containerVM, but that should not
-// be visible to the guest. This is the external complement to ExecutorConfig.
-type ContainerVM struct {
-	Common
-
-	// The version of the bootstrap image that this container was booted from.
-	Version string
-
-	// Name aliases for this specific container, Maps alias to unambiguous name
-	// This uses unambiguous name rather than reified network endpoint to persist
-	// the intent rather than a point-in-time manifesting of that intent.
-	Aliases map[string]string
-
-	// The location of the interaction service that the tether should connect to. Examples:
-	// * tcp://x.x.x.x:2377
-	// * vmci://moid - should this be an moid or a VMCI CID? Does one insulate us from reboots?
-	Interaction url.URL
-
-	// Key is the host key used during communicate back with the Interaction endpoint if any
-	// Used if the vSocket agent is responsible for authenticating the connection
-	AgentKey []byte
-}
-
-// ExecutorConfig holds the data tightly associated with an Executor. This is distinct from Sessions
-// in that there is no process inherently associated - this is closer to a ThreadPool than a Thread and
-// is the owner of the shared filesystem environment. This is the guest visible complement to ContainerVM.
-type ExecutorConfig struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-
-	// CreateTime stamp
-	CreateTime int64 `vic:"0.1" scope:"read-write" key:"createtime"`
-
-	// Diagnostics holds basic diagnostics data
-	Diagnostics Diagnostics `vic:"0.1" scope:"read-only" key:"diagnostics"`
-
-	// Sessions is the set of sessions currently hosted by this executor
-	// These are keyed by session ID
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-
-	// Maps the mount name to the detail mount specification
-	Mounts map[string]MountSpec `vic:"0.1" scope:"read-only" key:"mounts"`
-
-	// This describes an executors presence on a network, and contains sufficient
-	// information to configure the interface in the guest.
-	Networks map[string]*NetworkEndpoint `vic:"0.1" scope:"read-only" key:"networks"`
-
-	// Key is the host key used during communicate back with the Interaction endpoint if any
-	// Used if the in-guest tether is responsible for authenticating the connection
-	Key []byte `vic:"0.1" scope:"read-only" key:"key"`
-
-	// Layer id that is backing this container VM
-	LayerID string `vic:"0.1" scope:"read-only" key:"layerid"`
-
-	// Blob metadata for the caller
-	Annotations map[string]string `vic:"0.1" scope:"hidden" key:"annotations"`
-
-	// Repository requested by user
-	// TODO: a bit docker specific
-	RepoName string `vic:"0.1" scope:"read-only" key:"repo"`
-
-	// version
-	Version *version.Build `vic:"0.1" scope:"read-only" key:"version"`
-}
-
-// Cmd is here because the encoding packages seem to have issues with the full exec.Cmd struct
-type Cmd struct {
-	// Path is the command to run
-	Path string `vic:"0.1" scope:"read-only" key:"Path"`
-
-	// Args is the command line arguments including the command in Args[0]
-	Args []string `vic:"0.1" scope:"read-only" key:"Args"`
-
-	// Env specifies the environment of the process
-	Env []string `vic:"0.1" scope:"read-only" key:"Env"`
-
-	// Dir specifies the working directory of the command
-	Dir string `vic:"0.1" scope:"read-only" key:"Dir"`
-}
-
-// SessionConfig defines the content of a session - this maps to the root of a process tree
-// inside an executor
-// This is close to but not perfectly aligned with the new docker/docker/daemon/execdriver/driver:CommonProcessConfig
-type SessionConfig struct {
-	// The primary session may have the same ID as the executor owning it
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-	Detail `vic:"0.1" scope:"read-write" key:"detail"`
-
-	// The primary process for the session
-	Cmd Cmd `vic:"0.1" scope:"read-only" key:"cmd"`
-
-	// Allow attach
-	Attach bool `vic:"0.1" scope:"read-only" key:"attach"`
-
-	OpenStdin bool `vic:"0.1" scope:"read-only" key:"openstdin"`
-
-	// Delay launching the Cmd until an attach request comes
-	RunBlock bool `vic:"0.1" scope:"read-only" key:"runblock"`
-
-	// Allocate a tty or not
-	Tty bool `vic:"0.1" scope:"read-only" key:"tty"`
-
-	ExitStatus int `vic:"0.1" scope:"read-write" key:"status"`
-
-	Started string `vic:"0.1" scope:"read-write" key:"started"`
-
-	Restart bool `vic:"0.1" scope:"read-only" key:"restart"`
-
-	// StopSignal is the signal name or number used to stop container session
-	StopSignal string `vic:"0.1" scope:"read-only" key:"stopSignal"`
-
-	// Diagnostics holds basic diagnostics data
-	Diagnostics Diagnostics `vic:"0.1" scope:"read-only" key:"diagnostics"`
-
-	// Maps the intent to the signal for this specific app
-	// Signals map[int]int
-
-	// Use struct composition to add in the guest specific portions
-	// http://attilaolah.eu/2014/09/10/json-and-struct-composition-in-go/
-	// ulimits
-	// user
-	// rootfs - within the container context
-
-	// User and group for setuid programs.
-	// Need to go here since UID/GID resolution must be done on appliance
-	User  string `vic:"0.1" scope:"read-only" key:"User"`
-	Group string `vic:"0.1" scope:"read-only" key:"Group"`
-}
-
-type Detail struct {
-
-	// creation, started & stopped timestamps
-	CreateTime int64 `vic:"0.1" scope:"read-write" key:"createtime"`
-	StartTime  int64 `vic:"0.1" scope:"read-write" key:"starttime"`
-	StopTime   int64 `vic:"0.1" scope:"read-write" key:"stoptime"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/network_interface.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/network_interface.go
deleted file mode 100644
index 8e655d6c40..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/executor/network_interface.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package executor
-
-import (
-	"net"
-
-	"github.com/vmware/vic/pkg/ip"
-)
-
-// NetworkEndpoint describes a network presence in the form a vNIC in sufficient detail that it can be:
-// a. created - the vNIC added to a VM
-// b. identified - the guestOS can determine which interface it corresponds to
-// c. configured - the guestOS can configure the interface correctly
-type NetworkEndpoint struct {
-	// Common.Name - the nic alias requested (only one name and one alias possible in linux)
-	// Common.ID - pci slot of the vnic allowing for interface identifcation in-guest
-	Common
-
-	// Whether this endpoint's IP was specified by the client (true if it was)
-	Static bool `vic:"0.1" scope:"read-only" key:"static"`
-
-	// IP address to assign
-	IP *net.IPNet `vic:"0.1" scope:"read-only" key:"ip"`
-
-	// Actual IP address assigned
-	Assigned net.IPNet `vic:"0.1" scope:"read-write" key:"assigned"`
-
-	// The network in which this information should be interpreted. This is embedded directly rather than
-	// as a pointer so that we can ensure the data is consistent
-	Network ContainerNetwork `vic:"0.1" scope:"read-only" key:"network"`
-
-	// The list of exposed ports on the container
-	Ports []string `vic:"0.1" scope:"read-only" key:"ports"`
-}
-
-// ContainerNetwork is the data needed on a per container basis both for vSphere to ensure it's attached
-// to the correct network, and in the guest to ensure the interface is correctly configured.
-type ContainerNetwork struct {
-	// Common.Name - the symbolic name for the network, e.g. web or backend
-	// Common.ID - identifier of the underlay for the network
-	Common
-
-	Type string `vic:"0.1" scope:"read-write" key:"type"`
-
-	// Destinations is a list of CIDRs used for routing traffic to the gateway
-	Destinations []net.IPNet `vic:"0.1" scope:"read-only" key:"destinations"`
-
-	// The network scope the IP belongs to.
-	// The IP address is the default gateway
-	Gateway net.IPNet `vic:"0.1" scope:"read-only" key:"gateway"`
-
-	// Should this gateway be the default route for containers on the network
-	Default bool `vic:"0.1" scope:"read-only" key:"default"`
-
-	// The set of nameservers associated with this network - may be empty
-	Nameservers []net.IP `vic:"0.1" scope:"read-only" key:"dns"`
-
-	// The IP ranges for this network
-	Pools []ip.Range `vic:"0.1" scope:"read-only" key:"pools"`
-
-	// set of network wide links and aliases for this container on this network
-	Aliases []string `vic:"0.1" scope:"hidden" key:"aliases"`
-
-	Assigned struct {
-		Gateway     net.IPNet `vic:"0.1" scope:"read-write" key:"gateway"`
-		Nameservers []net.IP  `vic:"0.1" scope:"read-write" key:"dns"`
-	} `vic:"0.1" scope:"read-write" key:"assigned"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/virtual_container_host.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/virtual_container_host.go
deleted file mode 100644
index 83e9d6bbe9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v1/virtual_container_host.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package v1
-
-import (
-	"net"
-	"net/mail"
-	"net/url"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-)
-
-// PatternToken is a set of tokens that can be placed into string constants
-// for containerVMs that will be replaced with the specific values
-type PatternToken string
-
-const (
-	// VM is the VM name - i.e. [ds] {vm}/{vm}.vmx
-	VM PatternToken = "{vm}"
-	// ID is the container ID for the VM
-	ID = "{id}"
-	// Name is the container name of the VM
-	Name = "{name}"
-)
-
-// Can we just treat the VCH appliance as a containerVM booting off a specific bootstrap image
-// It has many of the same requirements (around networks being attached, version recorded,
-// volumes mounted, et al). Each of the components can easily be captured as a Session given they
-// are simply processes.
-// This would require that the bootstrap read session record for the VM and relaunch them - that
-// actually aligns very well with containerVMs restarting their processes if restarted directly
-// (this is obviously a behaviour we'd want to toggles for in regular containers).
-
-// VirtualContainerHostConfigSpec holds the metadata for a Virtual Container Host that should be visible inside the appliance VM.
-type VirtualContainerHostConfigSpec struct {
-	// The base config for the appliance. This includes the networks that are to be attached
-	// and disks to be mounted.
-	// Networks are keyed by interface name
-	executor.ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-
-	// vSphere connection configuration
-	Connection `vic:"0.1" scope:"read-only" key:"connect"`
-
-	// basic contact information
-	Contacts `vic:"0.1" scope:"read-only" key:"contact"`
-
-	// certificate configuration, for both inbound and outbound access
-	Certificate `vic:"0.1" scope:"read-only" key:"cert"`
-
-	// Port Layer - storage
-	Storage `vic:"0.1" scope:"read-only" key:"storage"`
-
-	// Port Layer - network
-	Network `vic:"0.1" scope:"read-only" key:"network"`
-
-	// Port Layer - exec
-	Container `vic:"0.1" scope:"read-only" key:"container"`
-
-	// Registry configuration for Imagec
-	Registry `vic:"0.1" scope:"read-only" key:"registry"`
-
-	// configuration for vic-machine
-	CreateBridgeNetwork bool `vic:"0.1" scope:"read-only" key:"create_bridge_network"`
-}
-
-// ContainerConfig holds the container configuration for a virtual container host
-type Container struct {
-	// Default containerVM capacity
-	ContainerVMSize Resources `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Resource pools under which all containers will be created
-	ComputeResources []types.ManagedObjectReference `vic:"0.1" scope:"read-only"`
-	// Path of the ISO to use for bootstrapping containers
-	BootstrapImagePath string `vic:"0.1" scope:"read-only" key:"bootstrap_image_path"`
-	// Allow custom naming convention for containerVMs
-	ContainerNameConvention string
-	// Permitted datastore URLs for container storage for this virtual container host
-	ContainerStores []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-}
-
-// RegistryConfig defines the registries virtual container host can talk to
-type Registry struct {
-	// Whitelist of registries
-	RegistryWhitelist []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Blacklist of registries
-	RegistryBlacklist []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Insecure registries
-	InsecureRegistries []url.URL `vic:"0.1" scope:"read-only" key:"insecure_registries"`
-}
-
-// NetworkConfig defines the network configuration of virtual container host
-type Network struct {
-	// The network to use by default to provide access to the world
-	BridgeNetwork string `vic:"0.1" scope:"read-only" key:"bridge_network"`
-	// Published networks available for containers to join, keyed by consumption name
-	ContainerNetworks map[string]*executor.ContainerNetwork `vic:"0.1" scope:"read-only" key:"container_networks"`
-	// The IP range for the bridge networks
-	BridgeIPRange *net.IPNet `vic:"0.1" scope:"read-only" key:"bridge-ip-range"`
-	// The width of each new bridge network
-	BridgeNetworkWidth *net.IPMask `vic:"0.1" scope:"read-only" key:"bridge-net-width"`
-}
-
-// StorageConfig defines the storage configuration including images and volumes
-type Storage struct {
-	// Datastore URLs for image stores - the top layer is [0], the bottom layer is [len-1]
-	ImageStores []url.URL `vic:"0.1" scope:"read-only" key:"image_stores"`
-	// Permitted datastore URL roots for volumes
-	// Keyed by the volume store name (which is used by the docker user to
-	// refer to the datstore + path), valued by the datastores and the path.
-	VolumeLocations map[string]*url.URL `vic:"0.1" scope:"read-only"`
-	// default size for root image
-	ScratchSize int64 `vic:"0.1" scope:"read-only" key:"scratch_size"`
-}
-
-type Certificate struct {
-	// Certificates for user authentication - this needs to be expanded to allow for directory server auth
-	UserCertificates []*RawCertificate
-	// Certificates for general outgoing network access, keyed by CIDR (IPNet.String())
-	NetworkCertificates map[string]*RawCertificate
-	// The certificate used to validate the appliance to clients
-	HostCertificate *RawCertificate `vic:"0.1" scope:"read-only"`
-	// The CAs to validate client connections
-	CertificateAuthorities []byte `vic:"0.1" scope:"read-only"`
-	// The CAs to validate docker registry connections
-	RegistryCertificateAuthorities []byte `vic:"0.1" scope:"read-only"`
-	// Certificates for specific system access, keyed by FQDN
-	HostCertificates map[string]*RawCertificate
-}
-
-// Connection holds the vSphere connection configuration
-type Connection struct {
-	// The sdk URL
-	Target string `vic:"0.1" scope:"read-only" key:"target"`
-	// Username for target login
-	Username string `vic:"0.1" scope:"read-only" key:"username"`
-	// Token is an SSO token or password
-	Token string `vic:"0.1" scope:"secret" key:"token"`
-	// TargetThumbprint is the SHA-1 digest of the Target's public certificate
-	TargetThumbprint string `vic:"0.1" scope:"read-only" key:"target_thumbprint"`
-	// The session timeout
-	Keepalive time.Duration `vic:"0.1" scope:"read-only" key:"keepalive"`
-}
-
-type Contacts struct {
-	// Administrative contact for the Virtual Container Host
-	Admin []mail.Address
-	// Administrative contact for hosting infrastructure
-	InfrastructureAdmin []mail.Address
-}
-
-// RawCertificate is present until we add extraconfig support for [][]byte slices that are present
-// in tls.Certificate
-type RawCertificate struct {
-	Key  []byte `vic:"0.1" scope:"secret"`
-	Cert []byte
-}
-
-// CustomerExperienceImprovementProgram provides configuration for the phone home mechanism
-// This is broken out so that we can have more granular configuration in here in the future
-// and so that it is insulated from changes to Virtual Container Host structure
-type CustomerExperienceImprovementProgram struct {
-	// The server target is as follows, where the uuid is the raw number, no dashes
-	// "https://vcsa.vmware.com/ph-stg/api/hyper/send?_v=1.0&_c=vic.1_0&_i="+vc.uuid
-	// If this is non-nil then it's enabled
-	CEIPGateway url.URL
-}
-
-// Resources is used instead of the ResourceAllocation structs in govmomi as
-// those don't currently hold IO or storage related data.
-type Resources struct {
-	CPU     types.ResourceAllocationInfo
-	Memory  types.ResourceAllocationInfo
-	IO      types.ResourceAllocationInfo
-	Storage types.ResourceAllocationInfo
-}
-
-// Remove all methods from this file to reduce binary size
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/container_vm.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/container_vm.go
deleted file mode 100644
index 3adee2aa0f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/container_vm.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package executor
-
-import (
-	"net/url"
-	"time"
-
-	"github.com/vmware/vic/pkg/version"
-)
-
-type State int
-
-const (
-	STARTED State = iota
-	EXITED
-	KILLED
-)
-
-// Common data between managed entities, across execution environments
-type Common struct {
-	// A reference to the components hosting execution environment, if any
-	ExecutionEnvironment string
-
-	// Unambiguous ID with meaning in the context of its hosting execution environment
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	// Convenience field to record a human readable name
-	Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-	// Freeform notes related to the entity
-	Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-}
-
-// Diagnostics records some basic control and lifecycle information for diagnostic purposes
-type Diagnostics struct {
-	// Should debugging be enabled on whatever component this is and at what level
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"debug"`
-
-	// RessurectionCount is a log of how many times the entity has been restarted due
-	// to error exit
-	ResurrectionCount int `vic:"0.1" scope:"read-write" key:"resurrections"`
-	// ExitLogs is a best effort record of the time of process death and the cause for
-	// restartable entities
-	ExitLogs []ExitLog `vic:"0.1" scope:"read-write" key:"exitlogs"`
-}
-
-// ExitLog records some basic diagnostics about anomalous exit for restartable entities
-type ExitLog struct {
-	Time       time.Time
-	ExitStatus int
-	Message    string
-}
-
-// MountSpec details a mount that must be executed within the executor
-// A mount is a URI -> path mapping with a credential of some kind
-// In the case of a labeled disk:
-// 	label://<label name> => </mnt/path>
-type MountSpec struct {
-	// A URI->path mapping, e.g.
-	// May contain credentials
-	Source url.URL `vic:"0.1" scope:"read-only" key:"source"`
-
-	// The path in the executor at which this should be mounted
-	Path string `vic:"0.1" scope:"read-only" key:"dest"`
-
-	// Freeform mode string, which could translate directly to mount options
-	// We may want to turn this into a more structured form eventually
-	Mode string `vic:"0.1" scope:"read-only" key:"mode"`
-}
-
-// ContainerVM holds that data tightly associated with a containerVM, but that should not
-// be visible to the guest. This is the external complement to ExecutorConfig.
-type ContainerVM struct {
-	Common
-
-	// The version of the bootstrap image that this container was booted from.
-	Version string
-
-	// Name aliases for this specific container, Maps alias to unambiguous name
-	// This uses unambiguous name rather than reified network endpoint to persist
-	// the intent rather than a point-in-time manifesting of that intent.
-	Aliases map[string]string
-
-	// The location of the interaction service that the tether should connect to. Examples:
-	// * tcp://x.x.x.x:2377
-	// * vmci://moid - should this be an moid or a VMCI CID? Does one insulate us from reboots?
-	Interaction url.URL
-
-	// Key is the host key used during communicate back with the Interaction endpoint if any
-	// Used if the vSocket agent is responsible for authenticating the connection
-	AgentKey []byte
-}
-
-// ExecutorConfig holds the data tightly associated with an Executor. This is distinct from Sessions
-// in that there is no process inherently associated - this is closer to a ThreadPool than a Thread and
-// is the owner of the shared filesystem environment. This is the guest visible complement to ContainerVM.
-type ExecutorConfig struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-
-	// CreateTime stamp
-	CreateTime int64 `vic:"0.1" scope:"read-write" key:"createtime"`
-
-	// Diagnostics holds basic diagnostics data
-	Diagnostics Diagnostics `vic:"0.1" scope:"read-only" key:"diagnostics"`
-
-	// Sessions is the set of sessions currently hosted by this executor
-	// These are keyed by session ID
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-
-	// Maps the mount name to the detail mount specification
-	Mounts map[string]MountSpec `vic:"0.1" scope:"read-only" key:"mounts"`
-
-	// This describes an executors presence on a network, and contains sufficient
-	// information to configure the interface in the guest.
-	Networks map[string]*NetworkEndpoint `vic:"0.1" scope:"read-only" key:"networks"`
-
-	// Key is the host key used during communicate back with the Interaction endpoint if any
-	// Used if the in-guest tether is responsible for authenticating the connection
-	Key []byte `vic:"0.1" scope:"read-only" key:"key"`
-
-	// Layer id that is backing this container VM
-	LayerID string `vic:"0.1" scope:"read-only" key:"layerid"`
-
-	// Blob metadata for the caller
-	Annotations map[string]string `vic:"0.1" scope:"hidden" key:"annotations"`
-
-	// Repository requested by user
-	// TODO: a bit docker specific
-	RepoName string `vic:"0.1" scope:"read-only" key:"repo"`
-
-	// version
-	Version *version.Build `vic:"0.1" scope:"read-only" key:"version"`
-}
-
-// Cmd is here because the encoding packages seem to have issues with the full exec.Cmd struct
-type Cmd struct {
-	// Path is the command to run
-	Path string `vic:"0.1" scope:"read-only" key:"Path"`
-
-	// Args is the command line arguments including the command in Args[0]
-	Args []string `vic:"0.1" scope:"read-only" key:"Args"`
-
-	// Env specifies the environment of the process
-	Env []string `vic:"0.1" scope:"read-only" key:"Env"`
-
-	// Dir specifies the working directory of the command
-	Dir string `vic:"0.1" scope:"read-only" key:"Dir"`
-}
-
-// SessionConfig defines the content of a session - this maps to the root of a process tree
-// inside an executor
-// This is close to but not perfectly aligned with the new docker/docker/daemon/execdriver/driver:CommonProcessConfig
-type SessionConfig struct {
-	// The primary session may have the same ID as the executor owning it
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-	Detail `vic:"0.1" scope:"read-write" key:"detail"`
-
-	// The primary process for the session
-	Cmd Cmd `vic:"0.1" scope:"read-only" key:"cmd"`
-
-	// Allow attach
-	Attach bool `vic:"0.1" scope:"read-only" key:"attach"`
-
-	OpenStdin bool `vic:"0.1" scope:"read-only" key:"openstdin"`
-
-	// Delay launching the Cmd until an attach request comes
-	RunBlock bool `vic:"0.1" scope:"read-only" key:"runblock"`
-
-	// Allocate a tty or not
-	Tty bool `vic:"0.1" scope:"read-only" key:"tty"`
-
-	ExitStatus int `vic:"0.1" scope:"read-write" key:"status"`
-
-	Started string `vic:"0.1" scope:"read-write" key:"started"`
-
-	Restart bool `vic:"0.1" scope:"read-only" key:"restart"`
-
-	// StopSignal is the signal name or number used to stop container session
-	StopSignal string `vic:"0.1" scope:"read-only" key:"stopSignal"`
-
-	// Diagnostics holds basic diagnostics data
-	Diagnostics Diagnostics `vic:"0.1" scope:"read-only" key:"diagnostics"`
-
-	// Maps the intent to the signal for this specific app
-	// Signals map[int]int
-
-	// Use struct composition to add in the guest specific portions
-	// http://attilaolah.eu/2014/09/10/json-and-struct-composition-in-go/
-	// ulimits
-	// user
-	// rootfs - within the container context
-
-	// User and group for setuid programs.
-	// Need to go here since UID/GID resolution must be done on appliance
-	User  string `vic:"0.1" scope:"read-only" key:"User"`
-	Group string `vic:"0.1" scope:"read-only" key:"Group"`
-}
-
-type Detail struct {
-
-	// creation, started & stopped timestamps
-	CreateTime int64 `vic:"0.1" scope:"read-write" key:"createtime"`
-	StartTime  int64 `vic:"0.1" scope:"read-write" key:"starttime"`
-	StopTime   int64 `vic:"0.1" scope:"read-write" key:"stoptime"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/network_interface.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/network_interface.go
deleted file mode 100644
index 8e655d6c40..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/executor/network_interface.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package executor
-
-import (
-	"net"
-
-	"github.com/vmware/vic/pkg/ip"
-)
-
-// NetworkEndpoint describes a network presence in the form a vNIC in sufficient detail that it can be:
-// a. created - the vNIC added to a VM
-// b. identified - the guestOS can determine which interface it corresponds to
-// c. configured - the guestOS can configure the interface correctly
-type NetworkEndpoint struct {
-	// Common.Name - the nic alias requested (only one name and one alias possible in linux)
-	// Common.ID - pci slot of the vnic allowing for interface identifcation in-guest
-	Common
-
-	// Whether this endpoint's IP was specified by the client (true if it was)
-	Static bool `vic:"0.1" scope:"read-only" key:"static"`
-
-	// IP address to assign
-	IP *net.IPNet `vic:"0.1" scope:"read-only" key:"ip"`
-
-	// Actual IP address assigned
-	Assigned net.IPNet `vic:"0.1" scope:"read-write" key:"assigned"`
-
-	// The network in which this information should be interpreted. This is embedded directly rather than
-	// as a pointer so that we can ensure the data is consistent
-	Network ContainerNetwork `vic:"0.1" scope:"read-only" key:"network"`
-
-	// The list of exposed ports on the container
-	Ports []string `vic:"0.1" scope:"read-only" key:"ports"`
-}
-
-// ContainerNetwork is the data needed on a per container basis both for vSphere to ensure it's attached
-// to the correct network, and in the guest to ensure the interface is correctly configured.
-type ContainerNetwork struct {
-	// Common.Name - the symbolic name for the network, e.g. web or backend
-	// Common.ID - identifier of the underlay for the network
-	Common
-
-	Type string `vic:"0.1" scope:"read-write" key:"type"`
-
-	// Destinations is a list of CIDRs used for routing traffic to the gateway
-	Destinations []net.IPNet `vic:"0.1" scope:"read-only" key:"destinations"`
-
-	// The network scope the IP belongs to.
-	// The IP address is the default gateway
-	Gateway net.IPNet `vic:"0.1" scope:"read-only" key:"gateway"`
-
-	// Should this gateway be the default route for containers on the network
-	Default bool `vic:"0.1" scope:"read-only" key:"default"`
-
-	// The set of nameservers associated with this network - may be empty
-	Nameservers []net.IP `vic:"0.1" scope:"read-only" key:"dns"`
-
-	// The IP ranges for this network
-	Pools []ip.Range `vic:"0.1" scope:"read-only" key:"pools"`
-
-	// set of network wide links and aliases for this container on this network
-	Aliases []string `vic:"0.1" scope:"hidden" key:"aliases"`
-
-	Assigned struct {
-		Gateway     net.IPNet `vic:"0.1" scope:"read-write" key:"gateway"`
-		Nameservers []net.IP  `vic:"0.1" scope:"read-write" key:"dns"`
-	} `vic:"0.1" scope:"read-write" key:"assigned"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/virtual_container_host.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/virtual_container_host.go
deleted file mode 100644
index f560ad833e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/config/v2/virtual_container_host.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package v2
-
-import (
-	"net"
-	"net/mail"
-	"net/url"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-)
-
-// PatternToken is a set of tokens that can be placed into string constants
-// for containerVMs that will be replaced with the specific values
-type PatternToken string
-
-const (
-	// VM is the VM name - i.e. [ds] {vm}/{vm}.vmx
-	VM PatternToken = "{vm}"
-	// ID is the container ID for the VM
-	ID = "{id}"
-	// Name is the container name of the VM
-	Name = "{name}"
-)
-
-// Can we just treat the VCH appliance as a containerVM booting off a specific bootstrap image
-// It has many of the same requirements (around networks being attached, version recorded,
-// volumes mounted, et al). Each of the components can easily be captured as a Session given they
-// are simply processes.
-// This would require that the bootstrap read session record for the VM and relaunch them - that
-// actually aligns very well with containerVMs restarting their processes if restarted directly
-// (this is obviously a behaviour we'd want to toggles for in regular containers).
-
-// VirtualContainerHostConfigSpec holds the metadata for a Virtual Container Host that should be visible inside the appliance VM.
-type VirtualContainerHostConfigSpec struct {
-	// The base config for the appliance. This includes the networks that are to be attached
-	// and disks to be mounted.
-	// Networks are keyed by interface name
-	executor.ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-
-	// vSphere connection configuration
-	Connection `vic:"0.1" scope:"read-only" key:"connect"`
-
-	// basic contact information
-	Contacts `vic:"0.1" scope:"read-only" key:"contact"`
-
-	// certificate configuration, for both inbound and outbound access
-	Certificate `vic:"0.1" scope:"read-only" key:"cert"`
-
-	// Port Layer - storage
-	Storage `vic:"0.1" scope:"read-only" key:"storage"`
-
-	// Port Layer - network
-	Network `vic:"0.1" scope:"read-only" key:"network"`
-
-	// Port Layer - exec
-	Container `vic:"0.1" scope:"read-only" key:"container"`
-
-	// Registry configuration for Imagec
-	Registry `vic:"0.1" scope:"read-only" key:"registry"`
-
-	// configuration for vic-machine
-	CreateBridgeNetwork bool `vic:"0.1" scope:"read-only" key:"create_bridge_network"`
-}
-
-// ContainerConfig holds the container configuration for a virtual container host
-type Container struct {
-	// Default containerVM capacity
-	ContainerVMSize Resources `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Resource pools under which all containers will be created
-	ComputeResources []types.ManagedObjectReference `vic:"0.1" scope:"read-only"`
-	// Path of the ISO to use for bootstrapping containers
-	BootstrapImagePath string `vic:"0.1" scope:"read-only" key:"bootstrap_image_path"`
-	// Allow custom naming convention for containerVMs
-	ContainerNameConvention string
-	// Permitted datastore URLs for container storage for this virtual container host
-	ContainerStores []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-}
-
-// RegistryConfig defines the registries virtual container host can talk to
-type Registry struct {
-	// Whitelist of registries
-	RegistryWhitelist []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Blacklist of registries
-	RegistryBlacklist []url.URL `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	// Insecure registries
-	InsecureRegistries []url.URL `vic:"0.1" scope:"read-only" key:"insecure_registries"`
-}
-
-// NetworkConfig defines the network configuration of virtual container host
-type Network struct {
-	// The network to use by default to provide access to the world
-	BridgeNetwork string `vic:"0.1" scope:"read-only" key:"bridge_network"`
-	// Published networks available for containers to join, keyed by consumption name
-	ContainerNetworks map[string]*executor.ContainerNetwork `vic:"0.1" scope:"read-only" key:"container_networks"`
-	// The IP range for the bridge networks
-	BridgeIPRange *net.IPNet `vic:"0.1" scope:"read-only" key:"bridge-ip-range"`
-	// The width of each new bridge network
-	BridgeNetworkWidth *net.IPMask `vic:"0.1" scope:"read-only" key:"bridge-net-width"`
-}
-
-// StorageConfig defines the storage configuration including images and volumes
-type Storage struct {
-	// Datastore URLs for image stores - the top layer is [0], the bottom layer is [len-1]
-	ImageStores []url.URL `vic:"0.1" scope:"read-only" key:"image_stores"`
-	// Permitted datastore URL roots for volumes
-	// Keyed by the volume store name (which is used by the docker user to
-	// refer to the datstore + path), valued by the datastores and the path.
-	VolumeLocations map[string]*url.URL `vic:"0.1" scope:"read-only"`
-	// default size for root image
-	ScratchSize int64 `vic:"0.1" scope:"read-only" key:"scratch_size"`
-}
-
-type Certificate struct {
-	// Certificates for user authentication - this needs to be expanded to allow for directory server auth
-	UserCertificates []*RawCertificate
-	// Certificates for general outgoing network access, keyed by CIDR (IPNet.String())
-	NetworkCertificates map[string]*RawCertificate
-	// The certificate used to validate the appliance to clients
-	HostCertificate *RawCertificate `vic:"0.1" scope:"read-only"`
-	// The CAs to validate client connections
-	CertificateAuthorities []byte `vic:"0.1" scope:"read-only"`
-	// The CAs to validate docker registry connections
-	RegistryCertificateAuthorities []byte `vic:"0.1" scope:"read-only"`
-	// Certificates for specific system access, keyed by FQDN
-	HostCertificates map[string]*RawCertificate
-}
-
-// Connection holds the vSphere connection configuration
-type Connection struct {
-	// The sdk URL
-	Target string `vic:"0.1" scope:"read-only" key:"target"`
-	// Username for target login
-	Username string `vic:"0.1" scope:"read-only" key:"username"`
-	// Token is an SSO token or password
-	Token string `vic:"0.1" scope:"secret" key:"token"`
-	// TargetThumbprint is the SHA-1 digest of the Target's public certificate
-	TargetThumbprint string `vic:"0.1" scope:"read-only" key:"target_thumbprint"`
-	// The session timeout
-	Keepalive time.Duration `vic:"0.1" scope:"read-only" key:"keepalive"`
-}
-
-type Contacts struct {
-	// Administrative contact for the Virtual Container Host
-	Admin []mail.Address
-	// Administrative contact for hosting infrastructure
-	InfrastructureAdmin []mail.Address
-}
-
-// RawCertificate is present until we add extraconfig support for [][]byte slices that are present
-// in tls.Certificate
-type RawCertificate struct {
-	Key  []byte `vic:"0.1" scope:"secret"`
-	Cert []byte
-}
-
-// CustomerExperienceImprovementProgram provides configuration for the phone home mechanism
-// This is broken out so that we can have more granular configuration in here in the future
-// and so that it is insulated from changes to Virtual Container Host structure
-type CustomerExperienceImprovementProgram struct {
-	// The server target is as follows, where the uuid is the raw number, no dashes
-	// "https://vcsa.vmware.com/ph-stg/api/hyper/send?_v=1.0&_c=vic.1_0&_i="+vc.uuid
-	// If this is non-nil then it's enabled
-	CEIPGateway url.URL
-}
-
-// Resources is used instead of the ResourceAllocation structs in govmomi as
-// those don't currently hold IO or storage related data.
-type Resources struct {
-	CPU     types.ResourceAllocationInfo
-	Memory  types.ResourceAllocationInfo
-	IO      types.ResourceAllocationInfo
-	Storage types.ResourceAllocationInfo
-}
-
-// Remove all methods from this file to reduce binary size
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/init.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/init.go
deleted file mode 100644
index 6f8f325f80..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/init.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugins
-
-// import all plugin packages here to register plugins
-
-import (
-	// imported for the side effect
-	_ "github.com/vmware/vic/lib/migration/samples/plugins/plugin1"
-	_ "github.com/vmware/vic/lib/migration/samples/plugins/plugin2"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin1/stop_signal_rename_sample.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin1/stop_signal_rename_sample.go
deleted file mode 100644
index d78a125dab..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin1/stop_signal_rename_sample.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin1
-
-import (
-	"context"
-	"fmt"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// sample plugin to migrate data in appliance configuration VirtualContainerHost
-// If only a couple of items changed in the configuration, you don't have to copy all VirtualContainerHost. Only define the few items used by
-// this upgrade plugin will simplify the extraconfig encoding/decoding process
-const (
-	version = 1
-	target  = manager.ApplianceConfigure
-)
-
-func init() {
-	defer trace.End(trace.Begin(fmt.Sprintf("Registering plugin %s:%d", target, version)))
-	if err := manager.Migrator.Register(version, target, &ApplianceStopSignalRename{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, version, err)
-	}
-}
-
-// ApplianceStopSignalRename is plugin for vic 0.8.0-GA version upgrade
-type ApplianceStopSignalRename struct {
-}
-
-type OldStopSignal struct {
-	ExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-}
-
-type ExecutorConfig struct {
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-}
-
-type SessionConfig struct {
-	StopSignal string `vic:"0.1" scope:"read-only" key:"stopSignal"`
-}
-
-type NewStopSignal struct {
-	NewExecutorConfig `vic:"0.1" scope:"read-only" key:"init"`
-}
-
-type NewExecutorConfig struct {
-	Sessions map[string]*NewSessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-}
-
-type NewSessionConfig struct {
-	StopSignal string `vic:"0.1" scope:"read-only" key:"forceStopSignal"`
-}
-
-func (p *ApplianceStopSignalRename) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("%d", version)))
-	if data == nil {
-		return nil
-	}
-	mapData := data.(map[string]string)
-	oldStruct := &OldStopSignal{}
-	result := extraconfig.Decode(extraconfig.MapSource(mapData), oldStruct)
-	if result == nil {
-		return &errors.DecodeError{}
-	}
-	keys := extraconfig.CalculateKeys(oldStruct, "ExecutorConfig.Sessions.*.StopSignal", "")
-	for _, key := range keys {
-		log.Debugf("old %s:%s", key, mapData[key])
-	}
-
-	newStruct := &NewStopSignal{}
-	if len(oldStruct.ExecutorConfig.Sessions) == 0 {
-		return nil
-	}
-	newStruct.Sessions = make(map[string]*NewSessionConfig)
-	for id, sess := range oldStruct.ExecutorConfig.Sessions {
-		newSess := &NewSessionConfig{}
-		newSess.StopSignal = sess.StopSignal
-		newStruct.Sessions[id] = newSess
-	}
-
-	cfg := make(map[string]string)
-	extraconfig.Encode(extraconfig.MapSink(cfg), newStruct)
-	// remove old data
-	for _, key := range keys {
-		delete(mapData, key)
-	}
-	for k, v := range cfg {
-		log.Debugf("New data: %s:%s", k, v)
-		mapData[k] = v
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin2/another_plugin_sample.go b/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin2/another_plugin_sample.go
deleted file mode 100644
index c009feb97b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/migration/samples/plugins/plugin2/another_plugin_sample.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package plugin2
-
-import (
-	"context"
-	"fmt"
-	"os"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/migration/errors"
-	"github.com/vmware/vic/lib/migration/manager"
-	"github.com/vmware/vic/lib/migration/samples/config/v2"
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Sample plugin to migrate data in keyvalue store
-// If there is any key/value change, should create a new keyvalue store file with version appendix, like .v2, to differentiate with old keyvalue store file
-// Migrate keyvalue plugin should read configuration from input VirtualContainerHost configuration, and then read from old keyvalue store file directly
-// After migration, write back to new datastore file with version appendix
-// Data migration framework is not responsible for data roll back. With versioned datastore file, even roll back happens, old version's datastore file is still useable by old binary
-// Make sure to delete existing new version datastore file, which might be a left over of last failed data migration attempt.
-const (
-	version = 2
-	target  = manager.ApplianceConfigure
-
-	KVStoreFolder = "kvStores"
-	APIKV         = "apiKV"
-
-	oldKey = "image.name"
-	newKey = "image.tag"
-)
-
-func init() {
-	log.Debugf("Registering plugin %s:%d", target, version)
-	if err := manager.Migrator.Register(version, target, &NewImageMeta{}); err != nil {
-		log.Errorf("Failed to register plugin %s:%d, %s", target, version, err)
-	}
-}
-
-// NewImageMeta is plugin for vic 0.8.0-GA version upgrade
-type NewImageMeta struct {
-}
-
-func (p *NewImageMeta) Migrate(ctx context.Context, s *session.Session, data interface{}) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("%d", version)))
-	if data == nil {
-		return nil
-	}
-	vchConfMap := data.(map[string]string)
-	// No plugin query keyvalue store yet, load from datastore file
-	// get a ds helper for this ds url
-	vchConf := &v2.VirtualContainerHostConfigSpec{}
-	extraconfig.Decode(extraconfig.MapSource(vchConfMap), vchConf)
-
-	imageURL := vchConf.ImageStores[0]
-	// TODO: sample code, should get datastore from imageURL
-	dsHelper, err := datastore.NewHelper(trace.NewOperation(ctx, "datastore helper creation"), s,
-		s.Datastore, fmt.Sprintf("%s/%s", imageURL.Path, KVStoreFolder))
-	if err != nil {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("unable to get datastore helper for %s store creation: %s", APIKV, err.Error()),
-		}
-	}
-	// restore the modified K/V store
-	oldKeyValStore, err := kvstore.NewKeyValueStore(ctx, kvstore.NewDatastoreBackend(dsHelper), APIKV)
-	if err != nil && !os.IsExist(err) {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("unable to create %s datastore backed store: %s", APIKV, err.Error()),
-		}
-	}
-
-	// create new k/v store with version appendix v2
-	newDsFile := fmt.Sprintf("%s.v%d", APIKV, version)
-	// try to remove new k/v store file in case it's created already
-	dsHelper.Rm(ctx, newDsFile)
-	newKeyValueStore, err := kvstore.NewKeyValueStore(ctx, kvstore.NewDatastoreBackend(dsHelper), newDsFile)
-	if err != nil && !os.IsExist(err) {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("unable to create %s datastore backed store: %s", newDsFile, err.Error()),
-		}
-	}
-
-	// copy all key/value from old k/v store
-	allKeyVals, err := oldKeyValStore.List(".*")
-	if err != nil {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("unable to list key/value store %s: %s", APIKV, err.Error()),
-		}
-	}
-
-	for key, val := range allKeyVals {
-		newKeyValueStore.Put(ctx, key, val)
-	}
-	val, err := newKeyValueStore.Get(oldKey)
-	if err != nil && err != kvstore.ErrKeyNotFound {
-		return &errors.InternalError{
-			Message: fmt.Sprintf("failed to get %s from store %s: %s", oldKey, APIKV, err.Error()),
-		}
-	}
-	// put the new key/value to store, and leave the old key/value there, in case upgrade failed, old binary still works well with half-changed store
-	newKeyValueStore.Put(ctx, newKey, []byte(fmt.Sprintf("%s:%s", val, "latest")))
-	// persist new data back to vsphere, framework does not take of it
-	newKeyValueStore.Save(ctx)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/bind.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/bind.go
deleted file mode 100644
index 03a380e707..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/bind.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package attach
-
-import (
-	"fmt"
-
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Bind sets the *Connected fields of the VirtualSerialPort
-func Bind(h interface{}, id string) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-	if handle.MigrationError != nil {
-		return nil, fmt.Errorf("Migration failed %s", handle.MigrationError)
-	}
-
-	return toggle(handle, id, true)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/common.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/common.go
deleted file mode 100644
index f54173e8cb..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/common.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package attach
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/portlayer/exec"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-func lookupVCHIP() (net.IP, error) {
-	// FIXME: THERE MUST BE ANOTHER WAY
-	// following is from Create@exec.go
-	ips, err := net.LookupIP(constants.ManagementHostName)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(ips) == 0 {
-		return nil, fmt.Errorf("No IP found on %s", constants.ManagementHostName)
-	}
-
-	if len(ips) > 1 {
-		return nil, fmt.Errorf("Multiple IPs found on %s: %#v", constants.ManagementHostName, ips)
-	}
-	return ips[0], nil
-}
-
-func toggle(handle *exec.Handle, id string, connected bool) (*exec.Handle, error) {
-	// check to see whether id is in Execs, if so set its RunBlock property to connected
-	session, ok := handle.ExecConfig.Execs[id]
-	if ok {
-		if err := compatible(handle); err != nil {
-			return nil, err
-		}
-
-		if session.Attach {
-			session.RunBlock = connected
-		}
-	}
-
-	// get the virtual device list
-	devices := object.VirtualDeviceList(handle.Config.Hardware.Device)
-
-	// select the virtual serial ports
-	serials := devices.SelectByBackingInfo((*types.VirtualSerialPortURIBackingInfo)(nil))
-	if len(serials) == 0 {
-		return nil, fmt.Errorf("Unable to find a device with desired backing")
-	}
-	if len(serials) > 1 {
-		return nil, fmt.Errorf("Multiple matches found with desired backing")
-	}
-	serial := serials[0]
-
-	ip, err := lookupVCHIP()
-	if err != nil {
-		return nil, err
-	}
-
-	log.Debugf("Found a device with desired backing: %#v", serial)
-
-	c := serial.GetVirtualDevice().Connectable
-	b := serial.GetVirtualDevice().Backing.(*types.VirtualSerialPortURIBackingInfo)
-
-	serviceURI := fmt.Sprintf("tcp://127.0.0.1:%d", constants.AttachServerPort)
-	proxyURI := fmt.Sprintf("telnet://%s:%d", ip, constants.SerialOverLANPort)
-
-	if b.ProxyURI == proxyURI && c.Connected == connected {
-		log.Debugf("Already in the desired state, (connected: %t, proxyURI: %s)", connected, proxyURI)
-		return handle, nil
-	}
-
-	// set the values
-	log.Debugf("Setting Connected to %t", connected)
-	c.Connected = connected
-	if connected && handle.ExecConfig.Sessions[handle.ExecConfig.ID].Attach {
-		log.Debugf("Setting the start connected state to %t", connected)
-		c.StartConnected = handle.ExecConfig.Sessions[handle.ExecConfig.ID].Attach
-	}
-
-	log.Debugf("Setting ServiceURI to %s", serviceURI)
-	b.ServiceURI = serviceURI
-
-	log.Debugf("Setting the ProxyURI to %s", proxyURI)
-	b.ProxyURI = proxyURI
-
-	config := &types.VirtualDeviceConfigSpec{
-		Device:    serial,
-		Operation: types.VirtualDeviceConfigSpecOperationEdit,
-	}
-	handle.Spec.DeviceChange = append(handle.Spec.DeviceChange, config)
-
-	// check to see whether id is in Sessions, if so set its RunBlock property to connected
-	// if attach happens before start then this property will be persist in the vmx
-	// if attach happens after start then this propery will be thrown away by commit (one cannot change persistent extraconfig values if the vm is powered on)
-	session, ok = handle.ExecConfig.Sessions[id]
-	if ok {
-		if session.Attach {
-			session.RunBlock = connected
-		}
-	}
-
-	return handle, nil
-}
-
-func compatible(h interface{}) error {
-	if handle, ok := h.(*exec.Handle); ok {
-		if handle.DataVersion < feature.ExecSupportedVersion {
-			return fmt.Errorf("attaching exec tasks not supported for this container")
-		}
-
-		return nil
-	}
-
-	return fmt.Errorf("Type assertion failed for %#+v", h)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/connector.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/connector.go
deleted file mode 100644
index 48e4a4e7f8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/connector.go
+++ /dev/null
@@ -1,484 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/serial"
-	"github.com/vmware/vic/pkg/trace"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/sync/singleflight"
-)
-
-const (
-	VersionString = "SSH-2.0-VIC"
-	ClientTimeout = 10 * time.Second
-)
-
-// Connector defines the connection and interactions
-type Connector struct {
-	mutex        sync.RWMutex
-	cond         *sync.Cond
-	interactions map[string]*LazySessionInteractor
-
-	listener net.Listener
-	// Quit channel for serve
-	done chan struct{}
-
-	// deduplication of incoming calls
-	fg singleflight.Group
-
-	// graceful shutdown
-	wg sync.WaitGroup
-}
-
-// NewConnector returns a new Connector
-func NewConnector(listener net.Listener) *Connector {
-	defer trace.End(trace.Begin(""))
-
-	connector := &Connector{
-		interactions: make(map[string]*LazySessionInteractor),
-		listener:     listener,
-		done:         make(chan struct{}),
-	}
-	connector.cond = sync.NewCond(connector.mutex.RLocker())
-
-	return connector
-}
-
-// SessionIfAlive returns SessionInteractor or error
-func (c *Connector) SessionIfAlive(ctx context.Context, id string) (SessionInteractor, error) {
-	c.mutex.RLock()
-	v, ok := c.interactions[id]
-	c.mutex.RUnlock()
-
-	if !ok {
-		return nil, fmt.Errorf("attach connector: no such connection in the map")
-	}
-	// we have an entry in the map, let's check its status
-	var conn SessionInteractor
-	var err error
-
-	conn, err = v.Initialize()
-	if err != nil {
-		goto Error
-	}
-
-	log.Debugf("attach connector: Pinging for %s", id)
-	if err = conn.Ping(); err != nil {
-		goto Error
-	}
-
-	log.Debugf("attach connector: Unblocking for %s", id)
-	if err = conn.Unblock(); err != nil {
-		goto Error
-	}
-	log.Debugf("attach connector: Unblocked %s, returning", id)
-
-	return conn, nil
-
-Error:
-	log.Debugf("attach connector: liveness check failed, removing %s from connection map", id)
-
-	c.mutex.Lock()
-	delete(c.interactions, id)
-	c.mutex.Unlock()
-
-	return nil, err
-}
-
-// Interaction returns the interactor corresponding to the specified ID. If the connection doesn't exist
-// the method will wait for the specified timeout, returning when the connection is created
-// or the timeout expires, whichever occurs first
-func (c *Connector) Interaction(ctx context.Context, id string) (SessionInteractor, error) {
-	defer trace.End(trace.Begin(id))
-
-	// make sure that we have only one call in-flight for each ID at any given time
-	si, err, shared := c.fg.Do(id, func() (interface{}, error) {
-		return c.interaction(ctx, id)
-	})
-	if err != nil {
-		c.fg.Forget(id)
-		return nil, err
-	}
-	if shared {
-		log.Debugf("Eliminated duplicated calls to Interaction for %s", id)
-	}
-	return si.(SessionInteractor), nil
-}
-
-func (c *Connector) interaction(ctx context.Context, id string) (SessionInteractor, error) {
-	defer trace.End(trace.Begin(id))
-
-	conn, err := c.SessionIfAlive(ctx, id)
-	if conn != nil && err == nil {
-		return conn, nil
-	}
-
-	if ctx.Err() == context.DeadlineExceeded {
-		return nil, fmt.Errorf("attach connector: no such connection")
-	}
-
-	result := make(chan SessionInteractor, 1)
-	go func() {
-		ok := false
-		var v *LazySessionInteractor
-
-		c.mutex.RLock()
-		defer c.mutex.RUnlock()
-
-		for !ok && ctx.Err() == nil {
-			v, ok = c.interactions[id]
-			if ok {
-				conn, err := v.Initialize()
-				if conn != nil && err == nil {
-					// no need to test this connection as we just created it, unblock if needed
-					log.Debugf("attach connector: Unblocking for %s", id)
-					err = conn.Unblock()
-					if err == nil {
-						log.Debugf("attach connector: Unblocked %s, returning", id)
-
-						result <- conn
-						return
-					}
-				}
-				if err != nil {
-					log.Error(err)
-				}
-				ok = false
-			}
-
-			// block until cond is updated
-			log.Infof("attach connector:  Connection not found yet for %s", id)
-			c.cond.Wait()
-		}
-		log.Debugf("attach connector:  Giving up on connection for %s", id)
-	}()
-
-	select {
-	case client := <-result:
-		log.Debugf("attach connector: Found connection for %s: %p", id, client)
-		return client, nil
-	case <-ctx.Done():
-		err := fmt.Errorf("attach connector: Connection not found error for id:%s: %s", id, ctx.Err())
-		log.Error(err)
-		// wake up the result gofunc before returning
-		c.mutex.RLock()
-		c.cond.Broadcast()
-		c.mutex.RUnlock()
-
-		return nil, err
-	}
-}
-
-// RemoveInteraction removes the session the inteactions map
-func (c *Connector) RemoveInteraction(id string) error {
-	defer trace.End(trace.Begin(id))
-
-	var err error
-
-	c.mutex.Lock()
-	v, ok := c.interactions[id]
-	if ok {
-		log.Debugf("attach connector: Removing %s from the connection map", id)
-		delete(c.interactions, id)
-		c.fg.Forget(id)
-	}
-	c.mutex.Unlock()
-
-	// the !ok case, but let's check the actual condition that impacts us
-	if v == nil {
-		return nil
-	}
-
-	conn := v.SessionInteractor()
-	if conn != nil {
-		err = conn.Close()
-	}
-	return err
-}
-
-// Start starts the connector
-func (c *Connector) Start() {
-	defer trace.End(trace.Begin(""))
-
-	c.wg.Add(1)
-	go c.serve()
-}
-
-// Stop stops the connector
-func (c *Connector) Stop() {
-	defer trace.End(trace.Begin(""))
-
-	c.listener.Close()
-	close(c.done)
-	c.wg.Wait()
-}
-
-// Starts the connector listening on the specified source
-// TODO: should have mechanism for stopping this, and probably handing off the interactions to another
-// routine to insert into the map
-func (c *Connector) serve() {
-	defer c.wg.Done()
-	for {
-		if c.listener == nil {
-			log.Debugf("attach connector: listener closed")
-			break
-		}
-
-		// check to see whether we should stop accepting new connections and exit
-		select {
-		case <-c.done:
-			log.Debugf("attach connector: done closed")
-			return
-		default:
-		}
-
-		conn, err := c.listener.Accept()
-		if err != nil {
-			log.Errorf("Error waiting for incoming connection: %s", errors.ErrorStack(err))
-			continue
-		}
-		log.Debugf("attach connector: Received incoming connection")
-
-		go c.processIncoming(conn)
-	}
-}
-
-// takes the base connection, determines the ID of the source and stashes it in the map
-func (c *Connector) processIncoming(conn net.Conn) {
-	var err error
-	defer func() {
-		if err != nil && conn != nil {
-			conn.Close()
-		}
-	}()
-
-	log.Debugf("Initiating ssh handshake with new connection attempt")
-	for {
-		if conn == nil {
-			log.Infof("attach connector: connection closed")
-			return
-		}
-
-		// TODO needs timeout handling.  This could take 30s.
-
-		// Timeout for client handshake should be reasonably small.
-		// Server will try to drain a buffer and if the buffer doesn't contain
-		// 2 or more bytes it will just wait, so client should timeout.
-		// However, if timeout is too short, client will flood server with Syn requests.
-		ctx, cancel := context.WithTimeout(context.TODO(), time.Second)
-		defer cancel()
-
-		deadline, ok := ctx.Deadline()
-		if ok {
-			conn.SetReadDeadline(deadline)
-		}
-		if err = serial.HandshakeClient(conn); err == nil {
-			conn.SetReadDeadline(time.Time{})
-			log.Debugf("HandshakeClient: connection handshake established")
-			cancel()
-			break
-		}
-
-		switch e := err.(type) {
-		case *serial.HandshakeError:
-			log.Debugf("HandshakeClient: %v", e)
-			continue
-		case *net.OpError:
-			if e.Temporary() || e.Timeout() {
-				// if it's a passing error or timeout then try again
-				continue
-			}
-			// if it's not a temporary condition, then treat it as a transport error
-			log.Errorf("HandshakeClient: transport op-error: %v", e)
-			conn.Close()
-			return
-		default: // includes the io.EOF case
-			// treat everything unknown as transport errror
-			log.Errorf("HandshakeClient: transport error: %v (%T)", e, e)
-			conn.Close()
-			return
-		}
-	}
-
-	callback := func(hostname string, remote net.Addr, key ssh.PublicKey) error {
-		return nil
-	}
-
-	config := &ssh.ClientConfig{
-		User:            "daemon",
-		HostKeyCallback: callback,
-		ClientVersion:   VersionString,
-		Timeout:         ClientTimeout,
-	}
-
-	// create the SSH connection
-	clientConn, chans, reqs, err := ssh.NewClientConn(conn, "", config)
-	if err != nil {
-		log.Errorf("SSH connection could not be established: %s", errors.ErrorStack(err))
-		return
-	}
-
-	// ask the IDs
-	ids, err := ContainerIDs(clientConn)
-	if err != nil {
-		log.Errorf("SSH connection could not be established: %s", errors.ErrorStack(err))
-		return
-	}
-
-	// Handle global requests
-	go c.reqs(reqs, clientConn, ids)
-	// Handle channel open messages
-	go c.chans(chans)
-
-	// create the connections
-	c.ids(clientConn, ids)
-
-	return
-}
-
-// ids iterates over the gived ids and
-// - calls Ping for existing connections
-// - calls NewSSHInteraction for new connections and fills the connection map
-func (c *Connector) ids(conn ssh.Conn, ids []string) {
-	for _, id := range ids {
-		// needed for following closure - https://golang.org/doc/faq#closures_and_goroutines
-		id := id
-
-		c.mutex.RLock()
-		v, ok := c.interactions[id]
-		c.mutex.RUnlock()
-
-		if ok {
-			si, err := v.Initialize()
-			if si != nil && err == nil {
-				if err := si.Ping(); err == nil {
-					log.Debugf("Connection %s found and alive", id)
-
-					continue
-				}
-			}
-			log.Warnf("Connection found but it wasn't alive. Creating a new one")
-		}
-
-		// this is a new connection so learn the version
-		version, err := ContainerVersion(conn)
-		if err != nil {
-			log.Errorf("SSH version could not be learned (id=%s): %s", id, errors.ErrorStack(err))
-			return
-		}
-
-		lazy := &LazySessionInteractor{
-			fn: func() (SessionInteractor, error) {
-				defer trace.End(trace.Begin(id))
-
-				return NewSSHInteraction(conn, id, version)
-			},
-		}
-
-		log.Infof("Established connection with container VM: %s", id)
-
-		c.mutex.Lock()
-
-		c.interactions[id] = lazy
-
-		c.cond.Broadcast()
-		c.mutex.Unlock()
-	}
-}
-
-// reqs is the global request channel of the portlayer side of the connection
-// we keep a list of sessions associated with this connection and drop them from the map when the global mux exits
-func (c *Connector) reqs(reqs <-chan *ssh.Request, conn ssh.Conn, ids []string) {
-	defer trace.End(trace.Begin(""))
-
-	var pending func()
-
-	// list of session ids mux'ed on this connection
-	droplist := make(map[string]struct{})
-
-	// fill the map with the initial ids
-	for _, id := range ids {
-		droplist[id] = struct{}{}
-	}
-
-	for req := range reqs {
-		ok := true
-
-		log.Infof("received global request type %v", req.Type)
-		switch req.Type {
-		case msgs.ContainersReq:
-			pending = func() {
-				ids := msgs.ContainersMsg{}
-				if err := ids.Unmarshal(req.Payload); err != nil {
-					log.Errorf("Unmarshal failed with %s", err)
-					return
-				}
-				c.ids(conn, ids.IDs)
-
-				// drop the drop list to clear no longer active sessions from the map
-				droplist = make(map[string]struct{})
-
-				// fill the droplist with the latest info
-				for _, id := range ids.IDs {
-					droplist[id] = struct{}{}
-				}
-			}
-		default:
-			ok = false
-		}
-
-		// make sure that errors get send back if we failed
-		if req.WantReply {
-			log.Infof("Sending global request reply %t", ok)
-			if err := req.Reply(ok, nil); err != nil {
-				log.Warnf("Failed to reply a request back")
-			}
-		}
-
-		// run any pending work now that a reply has been sent
-		if pending != nil {
-			log.Debug("Invoking pending work for global mux")
-			go pending()
-			pending = nil
-		}
-	}
-
-	// global mux closed so it is time to do cleanup
-	for id := range droplist {
-		log.Infof("Droping %s from connection map", id)
-		c.RemoveInteraction(id)
-	}
-}
-
-// this is the channel mux for the ssh channel . It is configured to reject everything (required)
-func (c *Connector) chans(chans <-chan ssh.NewChannel) {
-	defer trace.End(trace.Begin(""))
-
-	for ch := range chans {
-		ch.Reject(ssh.UnknownChannelType, fmt.Sprintf("unknown channel type: %v", ch.ChannelType()))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/interactor.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/interactor.go
deleted file mode 100644
index c58c4cf255..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/interactor.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"fmt"
-	"io"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/matryer/resync"
-
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	attachChannelType = "attach"
-)
-
-// SessionInteractor defines the interaction interface
-type SessionInteractor interface {
-	// Send specific signal
-	Signal(signal ssh.Signal) error
-	// Stdout stream
-	Stdout() io.Reader
-	// Stderr stream
-	Stderr() io.Reader
-	// Stdin stream
-	Stdin() io.WriteCloser
-	Close() error
-
-	// Resize the terminal
-	Resize(cols, rows, widthpx, heightpx uint32) error
-
-	CloseStdin() error
-
-	Ping() error
-	Unblock() error
-}
-
-// interaction implements SessionInteractor using SSH
-type interaction struct {
-	channel ssh.Channel
-
-	// to serialize unblock requests
-	mu sync.Mutex
-	// avoid spamming unblock messages
-	unblocked resync.Once
-
-	// current feature version that the container provides
-	version uint32
-}
-
-// ContainerVersion asks the version of the containers on the other hand and return them to the caller
-func ContainerVersion(conn ssh.Conn) (uint32, error) {
-	defer trace.End(trace.Begin(""))
-
-	ok, reply, err := conn.SendRequest(msgs.VersionReq, true, nil)
-	if !ok && err == nil {
-		log.Warnf("VersionReq not supported by the container")
-		return 0, nil
-	}
-	if !ok || err != nil {
-		return 0, fmt.Errorf("failed to get container version from remote: %s", err)
-	}
-
-	version := msgs.VersionMsg{}
-	if err = version.Unmarshal(reply); err != nil {
-		return 0, fmt.Errorf("failed to unmarshal version from remote: %s", err)
-	}
-
-	return version.Version, nil
-}
-
-// ContainerIDs asks the ids of the containers on the other hand and return them to the caller
-func ContainerIDs(conn ssh.Conn) ([]string, error) {
-	defer trace.End(trace.Begin(""))
-
-	ok, reply, err := conn.SendRequest(msgs.ContainersReq, true, nil)
-	if !ok || err != nil {
-		return nil, fmt.Errorf("failed to get container IDs from remote: %s", err)
-	}
-
-	ids := msgs.ContainersMsg{}
-	if err = ids.Unmarshal(reply); err != nil {
-		return nil, fmt.Errorf("failed to unmarshal ids from remote: %s", err)
-	}
-
-	return ids.IDs, nil
-}
-
-// NewSSHInteraction returns a stream connection to the requested session
-// The ssh conn is assumed to be connected to the Executor hosting the session
-func NewSSHInteraction(conn ssh.Conn, id string, version uint32) (SessionInteractor, error) {
-	defer trace.End(trace.Begin(id))
-
-	channel, _, err := conn.OpenChannel(attachChannelType, []byte(id))
-	if err != nil {
-		return nil, err
-	}
-
-	i := &interaction{
-		channel: channel,
-		version: version,
-	}
-	return i, nil
-}
-
-func (t *interaction) Signal(signal ssh.Signal) error {
-	defer trace.End(trace.Begin(""))
-
-	msg := msgs.SignalMsg{Signal: signal}
-	ok, err := t.channel.SendRequest(msgs.SignalReq, true, msg.Marshal())
-	if err == nil && !ok {
-		return fmt.Errorf("unknown error")
-	}
-
-	if err != nil {
-		return fmt.Errorf("signal error: %s", err)
-	}
-
-	return nil
-}
-
-func (t *interaction) CloseStdin() error {
-	defer trace.End(trace.Begin(""))
-
-	// configure remote to relay EOFs
-	ok, err := t.channel.SendRequest(msgs.CloseStdinReq, true, nil)
-	if err == nil && !ok {
-		return fmt.Errorf("unknown error closing stdin")
-	}
-
-	if err != nil {
-		return fmt.Errorf("close stdin request error: %s", err)
-	}
-
-	// send inline EOF on the stdin stream
-	err = t.channel.CloseWrite()
-	if err != nil {
-		return fmt.Errorf("close stdin error: %s", err)
-	}
-
-	return nil
-}
-
-func (t *interaction) Stdout() io.Reader {
-	defer trace.End(trace.Begin(""))
-
-	return t.channel
-}
-
-func (t *interaction) Stderr() io.Reader {
-	defer trace.End(trace.Begin(""))
-
-	return t.channel.Stderr()
-}
-
-func (t *interaction) Stdin() io.WriteCloser {
-	defer trace.End(trace.Begin(""))
-
-	return t.channel
-}
-
-func (t *interaction) Close() error {
-	defer trace.End(trace.Begin(""))
-
-	return t.channel.Close()
-}
-
-// Resize resizes the terminal.
-func (t *interaction) Resize(cols, rows, widthpx, heightpx uint32) error {
-	defer trace.End(trace.Begin(""))
-
-	msg := msgs.WindowChangeMsg{
-		Columns:  cols,
-		Rows:     rows,
-		WidthPx:  widthpx,
-		HeightPx: heightpx,
-	}
-	ok, err := t.channel.SendRequest(msgs.WindowChangeReq, true, msg.Marshal())
-	if err == nil && !ok {
-		return fmt.Errorf("unknown error")
-	}
-
-	if err != nil {
-		return fmt.Errorf("resize error: %s", err)
-	}
-	return nil
-}
-
-// Ping checks the liveliness of the connection
-func (t *interaction) Ping() error {
-	defer trace.End(trace.Begin(""))
-
-	if t.version < feature.ExecSupportedVersion {
-		log.Warnf("Running container does not support Ping request, skipping.")
-		return nil
-	}
-
-	ok, err := t.channel.SendRequest(msgs.PingReq, true, []byte(msgs.PingMsg))
-	if !ok || err != nil {
-		return fmt.Errorf("failed to ping the other side: %s", err)
-	}
-
-	return nil
-}
-
-// Unblock sends an unblock msg
-func (t *interaction) Unblock() error {
-	defer trace.End(trace.Begin(""))
-
-	var ok bool
-	var err error
-	var reset bool
-
-	if t.version < feature.ExecSupportedVersion {
-		log.Warnf("Running container does not support Unblock request, skipping.")
-		return nil
-	}
-
-	t.mu.Lock()
-	defer t.mu.Unlock()
-
-	t.unblocked.Do(func() {
-		if ok, err = t.channel.SendRequest(msgs.UnblockReq, true, []byte(msgs.UnblockMsg)); !ok || err != nil {
-			log.Errorf("failed to unblock the other side: %s", err)
-			// #5038: resync package is not reentrant so we need to call Reset after this
-			reset = true
-		}
-	})
-
-	if reset {
-		t.unblocked.Reset()
-	}
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy.go
deleted file mode 100644
index f8ac305081..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"sync"
-)
-
-// LazyInitializer defines the function that returns SessionInteractor
-type LazyInitializer func() (SessionInteractor, error)
-
-// LazySessionInteractor holds lazily initialized SessionInteractor
-type LazySessionInteractor struct {
-	mu sync.Mutex
-	si SessionInteractor
-	fn LazyInitializer
-}
-
-// Initialize either returns either already initialized connection or returns the connection after initializing it
-func (l *LazySessionInteractor) Initialize() (SessionInteractor, error) {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	if l.si != nil {
-		return l.si, nil
-	}
-
-	if l.si == nil && l.fn == nil {
-		panic("both si and fn are nil")
-	}
-
-	var err error
-
-	// l.si is nil but l.fn is not
-	l.si, err = l.fn()
-	if err != nil {
-		return nil, err
-	}
-	return l.si, nil
-}
-
-// SessionInteractor returns either an initialized connection, or nil if it was never initialized
-func (l *LazySessionInteractor) SessionInteractor() SessionInteractor {
-	l.mu.Lock()
-	defer l.mu.Unlock()
-
-	return l.si
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy_test.go
deleted file mode 100644
index 6bf31e043e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/lazy_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func TestLazySessionInteractor_Initialize(t *testing.T) {
-	type fields struct {
-		si SessionInteractor
-		fn LazyInitializer
-	}
-	tests := []struct {
-		name    string
-		fields  fields
-		want    SessionInteractor
-		wantErr bool
-	}{
-		{"FnIsNil", fields{si: &interaction{}}, &interaction{}, false},
-		{"SiIsNil", fields{si: nil, fn: func() (SessionInteractor, error) { return &interaction{}, nil }}, &interaction{}, false},
-		{"FnAndSIAreNotNil", fields{si: &interaction{}, fn: func() (SessionInteractor, error) { return nil, fmt.Errorf("failure") }}, &interaction{}, false},
-		{"SiIsNilFnWillFail", fields{si: nil, fn: func() (SessionInteractor, error) { return nil, fmt.Errorf("failure") }}, nil, true},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			l := &LazySessionInteractor{
-				si: tt.fields.si,
-				fn: tt.fields.fn,
-			}
-			got, err := l.Initialize()
-			if (err != nil) != tt.wantErr {
-				t.Errorf("LazySessionInteractor.Initialize() error = %v, wantErr %v", err, tt.wantErr)
-				return
-			}
-			if !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("LazySessionInteractor.Initialize() = %v, want %v", got, tt.want)
-			}
-		})
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server.go
deleted file mode 100644
index bcd774ba34..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Server waits for TCP client connections on serialOverLANPort, then
-// once connected, attempts to negotiate an SSH connection to the attached
-// client.  The client is the ssh server.
-type Server struct {
-	port int
-	ip   string
-
-	m sync.RWMutex
-	l *net.TCPListener
-	c *Connector
-}
-
-// NewServer returns a Server instance
-func NewServer(ip string, port int) *Server {
-	defer trace.End(trace.Begin(""))
-
-	return &Server{
-		ip:   ip,
-		port: port,
-	}
-}
-
-// Start starts the connector with given listener
-func (n *Server) Start() error {
-	defer trace.End(trace.Begin(""))
-
-	n.m.Lock()
-	defer n.m.Unlock()
-
-	addr, err := net.ResolveTCPAddr("tcp", fmt.Sprintf("%s:%d", n.ip, n.port))
-	if err != nil {
-		return fmt.Errorf("Attach server error %s:%d: %s", n.ip, n.port, errors.ErrorStack(err))
-	}
-
-	n.l, err = net.ListenTCP("tcp", addr)
-	if err != nil {
-		return fmt.Errorf("Attach server error %s: %s", addr, errors.ErrorStack(err))
-	}
-
-	log.Infof("Attach server listening on %s:%d", n.ip, n.port)
-
-	// starts serving requests immediately
-	n.c = NewConnector(n.l)
-	n.c.Start()
-
-	return nil
-}
-
-// Stop stops the connector
-func (n *Server) Stop() error {
-	defer trace.End(trace.Begin(""))
-
-	n.m.Lock()
-	defer n.m.Unlock()
-
-	err := n.l.Close()
-	n.c.Stop()
-
-	return err
-}
-
-// Addr returns the address of the underlying listener
-func (n *Server) Addr() string {
-	defer trace.End(trace.Begin(""))
-
-	n.m.RLock()
-	defer n.m.RUnlock()
-
-	return n.l.Addr().String()
-}
-
-// Interaction returns the session interface for the given container.  If the container
-// cannot be found, this call will wait for the given timeout.
-// id is ID of the container.
-func (n *Server) Interaction(ctx context.Context, id string) (SessionInteractor, error) {
-	defer trace.End(trace.Begin(id))
-
-	n.m.RLock()
-	defer n.m.RUnlock()
-
-	return n.c.Interaction(ctx, id)
-}
-
-// RemoveInteraction removes the session interface from underlying connector
-func (n *Server) RemoveInteraction(id string) error {
-	defer trace.End(trace.Begin(id))
-
-	n.m.Lock()
-	defer n.m.Unlock()
-
-	return n.c.RemoveInteraction(id)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server_test.go
deleted file mode 100644
index c0ae07bf58..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/communication/server_test.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package communication
-
-import (
-	"net"
-	"sync"
-	"testing"
-	"time"
-
-	"context"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/testdata"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/pkg/serial"
-)
-
-// Start the server, make 200 client connections, test they connect, then Stop.
-func TestAttachStartStop(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	s := NewServer("localhost", 0)
-
-	var wg sync.WaitGroup
-
-	dial := func() {
-		defer wg.Done()
-
-		c, err := net.Dial("tcp", s.l.Addr().String())
-		if !assert.NoError(t, err) || !assert.NotNil(t, c) {
-			return
-		}
-		defer c.Close()
-
-		buf := make([]byte, 1)
-		c.SetReadDeadline(time.Now().Add(time.Second))
-		c.Read(buf)
-
-		// This will pass if the client has written a second syn packet by the time it's called. As such we set an
-		// unbounded readdeadline on the connection.
-		// We can assert behaviours that take a while, but cannot reliably assert behaviours that require fast scheduling
-		// of lots of threads on all systems running the CI.
-		c.SetReadDeadline(time.Time{})
-		if !assert.NoError(t, serial.HandshakeServer(c), "Expected handshake to succeed on 2nd syn packet from client") {
-			return
-		}
-	}
-
-	assert.NoError(t, s.Start())
-
-	for i := 0; i < 100; i++ {
-		wg.Add(1)
-		go dial()
-	}
-
-	done := make(chan bool)
-	go func() {
-		wg.Wait()
-		close(done)
-	}()
-
-	select {
-	case <-done:
-	case <-time.After(10 * time.Second):
-		t.Fail()
-	}
-	assert.NoError(t, s.Stop())
-
-	_, err := net.Dial("tcp", s.Addr())
-	assert.Error(t, err)
-}
-
-func TestAttachSshSession(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	s := NewServer("localhost", 0)
-	assert.NoError(t, s.Start())
-	defer s.Stop()
-
-	expectedID := "foo"
-
-	// This should block until the ssh server returns its container ID
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	go func() {
-		defer wg.Done()
-
-		ctx, cancel := context.WithTimeout(context.Background(), 5*time.Second)
-		defer cancel()
-
-		_, err := s.c.Interaction(ctx, expectedID)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// Dial the attach server.  This is a TCP client
-	networkClientCon, err := net.Dial("tcp", s.Addr())
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.NoError(t, serial.HandshakeServer(networkClientCon)) {
-		return
-	}
-
-	containerConfig := &ssh.ServerConfig{
-		NoClientAuth: true,
-	}
-
-	signer, err := ssh.ParsePrivateKey(testdata.PEMBytes["dsa"])
-	if !assert.NoError(t, err) {
-		return
-	}
-	containerConfig.AddHostKey(signer)
-
-	// create the SSH server on the client.  The attach server will ssh connect to this.
-	sshConn, chans, reqs, err := ssh.NewServerConn(networkClientCon, containerConfig)
-	if !assert.NoError(t, err) {
-		return
-	}
-	defer sshConn.Close()
-
-	// Service the incoming Channel channel.
-	wg.Add(2)
-	go func() {
-		defer wg.Done()
-		exit := 0
-		for req := range reqs {
-			if req.Type == msgs.ContainersReq {
-				msg := msgs.ContainersMsg{IDs: []string{expectedID}}
-				req.Reply(true, msg.Marshal())
-				exit++
-			}
-			if req.Type == msgs.VersionReq {
-				msg := msgs.VersionMsg{Version: feature.MaxPluginVersion - 1}
-				req.Reply(true, msg.Marshal())
-				exit++
-			}
-			if exit == 2 {
-				break
-			}
-		}
-	}()
-
-	go func() {
-		defer wg.Done()
-		for ch := range chans {
-			assert.Equal(t, ch.ChannelType(), attachChannelType)
-			_, reqs, _ = ch.Accept()
-			for req := range reqs {
-				if req.Type == msgs.UnblockReq {
-					req.Reply(true, nil)
-					break
-				}
-			}
-			break
-		}
-	}()
-
-	wg.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/join.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/join.go
deleted file mode 100644
index ad675d61b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/join.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package attach
-
-import (
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Join adds network backed serial port to the caller and configures them
-func Join(h interface{}) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	// Tether serial port - backed by network
-	serial := &types.VirtualSerialPort{
-		VirtualDevice: types.VirtualDevice{
-			Backing: &types.VirtualSerialPortURIBackingInfo{
-				VirtualDeviceURIBackingInfo: types.VirtualDeviceURIBackingInfo{
-					Direction: string(types.VirtualDeviceURIBackingOptionDirectionClient),
-					ProxyURI:  fmt.Sprintf("telnet://0.0.0.0:%d", constants.SerialOverLANPort),
-					// Set it to 0.0.0.0 during Join call, VCH IP will be set when we call Bind
-					ServiceURI: fmt.Sprintf("tcp://127.0.0.1:%d", constants.AttachServerPort),
-				},
-			},
-			Connectable: &types.VirtualDeviceConnectInfo{
-				Connected:         false,
-				StartConnected:    false,
-				AllowGuestControl: true,
-			},
-		},
-		YieldOnPoll: true,
-	}
-	config := &types.VirtualDeviceConfigSpec{
-		Device:    serial,
-		Operation: types.VirtualDeviceConfigSpecOperationAdd,
-	}
-	handle.Spec.DeviceChange = append(handle.Spec.DeviceChange, config)
-
-	return handle, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/unbind.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/unbind.go
deleted file mode 100644
index 1273438cf1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/attach/unbind.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package attach
-
-import (
-	"fmt"
-
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Unbind unsets the *Connected fields of the VirtualSerialPort
-func Unbind(h interface{}, id string) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-	if handle.MigrationError != nil {
-		return nil, fmt.Errorf("Migration failed %s", handle.MigrationError)
-	}
-	return toggle(handle, id, false)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/collector.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/collector.go
deleted file mode 100644
index f1df5c79d5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/collector.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package collector
-
-import (
-	"github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-type Collector interface {
-
-	// AddMonitoredObject will add the object for event listening
-	AddMonitoredObject(ref string) error
-
-	// RemoveMonitoredObject will remove the object from event listening
-	RemoveMonitoredObject(ref string)
-
-	// Start listening for events and publish to function
-	Start() error
-
-	// Stop listening for events
-	Stop()
-
-	// Register a callback function
-	Register(func(events.Event))
-
-	// Name returns the collector name
-	Name() string
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector.go
deleted file mode 100644
index 6f9bf8855a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector.go
+++ /dev/null
@@ -1,208 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	"github.com/vmware/vic/lib/portlayer/event/events"
-
-	vmwEvents "github.com/vmware/govmomi/event"
-	"github.com/vmware/govmomi/vim25"
-	"github.com/vmware/govmomi/vim25/types"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-const (
-	name = "vSphere Event Collector"
-)
-
-type EventCollector struct {
-	vmwManager *vmwEvents.Manager
-	mos        monitoredCache
-	callback   func(events.Event)
-
-	lastProcessedID int32
-}
-
-type monitoredCache struct {
-	mu sync.RWMutex
-
-	mos map[string]types.ManagedObjectReference
-}
-
-func NewCollector(client *vim25.Client, objects ...string) *EventCollector {
-	ec := &EventCollector{
-		vmwManager: vmwEvents.NewManager(client),
-		mos:        monitoredCache{mos: make(map[string]types.ManagedObjectReference)},
-		// initialize to an index that will not be present in a page
-		lastProcessedID: -1,
-	}
-
-	for i := range objects {
-		// #nosec: Errors unhandled.
-		ec.AddMonitoredObject(objects[i])
-	}
-
-	return ec
-}
-
-func (ec *EventCollector) Name() string {
-	return name
-}
-
-// Register an event manager callback with the collector
-func (ec *EventCollector) Register(callback func(events.Event)) {
-	ec.callback = callback
-}
-
-func (ec *EventCollector) AddMonitoredObject(ref string) error {
-	ec.mos.mu.Lock()
-	defer ec.mos.mu.Unlock()
-
-	moRef := types.ManagedObjectReference{}
-	if !moRef.FromString(ref) {
-		return fmt.Errorf("%s received an invalid Object to monitor(%s)", name, ref)
-	}
-	ec.mos.mos[ref] = moRef
-	return nil
-}
-
-func (ec *EventCollector) RemoveMonitoredObject(ref string) {
-	ec.mos.mu.Lock()
-	defer ec.mos.mu.Unlock()
-
-	delete(ec.mos.mos, ref)
-}
-
-func (ec *EventCollector) monitoredObjects() []types.ManagedObjectReference {
-	ec.mos.mu.RLock()
-	defer ec.mos.mu.RUnlock()
-
-	refs := make([]types.ManagedObjectReference, 0, len(ec.mos.mos))
-	for k := range ec.mos.mos {
-		refs = append(refs, ec.mos.mos[k])
-	}
-	return refs
-}
-func (ec *EventCollector) Stop() {
-	_, err := ec.vmwManager.Destroy(context.Background())
-	if err != nil {
-		log.Warnf("%s failed to destroy the govmomi manager: %s", name, err.Error())
-	}
-}
-
-// Start the event collector
-func (ec *EventCollector) Start() error {
-	// array of managed objects
-	refs := ec.monitoredObjects()
-
-	// only continue if we have object to monitor
-	if len(refs) == 0 {
-		return fmt.Errorf("%s requires at least one Monitored Object: objects[%d]", name, 0)
-	}
-
-	log.Debugf("%s starting collection for %d managed objects", name, len(refs))
-
-	// we don't want the event listener to timeout
-	ctx := context.Background()
-
-	// pageSize is the number of events on the last page of the eventCollector
-	// as new events are added the oldest are removed.  Originally this value
-	// was 1 and we encountered missed events due to them being evicted
-	// before being processed.  A setting of 25 should provide ample buffer.
-	pageSize := int32(25)
-	// bool to follow the stream
-	followStream := true
-	// don't exceed the govmomi object limit
-	force := false
-
-	//TODO: need a proper way to handle failures / status
-	go func(pageSize int32, follow bool, ff bool, refs []types.ManagedObjectReference, ec *EventCollector) error {
-		// the govmomi event listener can only be configured once per session -- so if it's already listening it
-		// will be replaced
-		//
-		// the manager will be closed with the session
-
-		for {
-			err := ec.vmwManager.Events(ctx, refs, pageSize, followStream, force, func(_ types.ManagedObjectReference, page []types.BaseEvent) error {
-				evented(ec, page)
-				return nil
-			})
-			// TODO: this will disappear in the ether
-			if err != nil {
-				log.Debugf("Error configuring %s: %s", name, err.Error())
-			}
-		}
-	}(pageSize, followStream, force, refs, ec)
-
-	return nil
-}
-
-// evented will process the event and execute the registered callback
-//
-// Initial implmentation will only act on certain events -- future implementations
-// may provide more flexibility
-func evented(ec *EventCollector, page []types.BaseEvent) {
-	if ec.callback == nil {
-		log.Warn("No callback defined for EventManager")
-		return
-	}
-
-	if len(page) == 0 {
-		return
-	}
-
-	// skip events already seen
-	oldIndex := len(page)
-	for i := range page {
-		if page[i].GetEvent().Key == ec.lastProcessedID {
-			oldIndex = i
-		}
-	}
-
-	// events appear in page with most recent first - need to reverse for sane ordering
-	// we start from the first new event after the last one processed
-	for i := oldIndex - 1; i >= 0; i-- {
-		// what type of event do we have
-		switch page[i].(type) {
-		case *types.VmGuestShutdownEvent,
-			*types.VmPoweredOnEvent,
-			*types.DrsVmPoweredOnEvent,
-			*types.VmPoweredOffEvent,
-			*types.VmRemovedEvent,
-			*types.VmSuspendedEvent,
-			*types.VmMigratedEvent,
-			*types.DrsVmMigratedEvent,
-			*types.VmRelocatedEvent:
-
-			// we have an event we need to process
-			ec.callback(NewVMEvent(page[i]))
-		case *types.VmReconfiguredEvent:
-			// reconfigures happen often, so completely ignore for now
-			continue
-		default:
-			// log the skipped event
-			e := page[i].GetEvent()
-			log.Debugf("vSphere Event %s for eventID(%d) ignored by the event collector", e.FullFormattedMessage, int(e.Key))
-		}
-
-		ec.lastProcessedID = page[i].GetEvent().Key
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector_test.go
deleted file mode 100644
index 1739950100..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/collector_test.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"strconv"
-	"testing"
-
-	"github.com/vmware/vic/lib/portlayer/event/events"
-
-	"github.com/vmware/govmomi/vim25/types"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const (
-	LifeCycle = iota
-	Reconfigure
-	Mixed
-)
-
-// used to test callbacks
-var callcount int
-
-func newVMMO() *types.ManagedObjectReference {
-	return &types.ManagedObjectReference{Value: "101", Type: "vm"}
-}
-
-func TestMonitoredObject(t *testing.T) {
-
-	mgr := newCollector()
-	mo := newVMMO()
-
-	mgr.AddMonitoredObject(mo.String())
-	mos := mgr.monitoredObjects()
-	assert.Equal(t, 1, len(mos))
-	mgr.RemoveMonitoredObject(mo.String())
-	mos = mgr.monitoredObjects()
-	assert.Equal(t, 0, len(mos))
-}
-
-func TestRegistration(t *testing.T) {
-	mgr := newCollector()
-
-	mgr.Register(callMe)
-	assert.NotNil(t, mgr.callback)
-
-}
-
-func TestEvented(t *testing.T) {
-	mgr := newCollector()
-	callcount = 0
-
-	// register local callback
-	mgr.Register(callMe)
-
-	// test lifecycle events
-	page := eventPage(3, LifeCycle)
-	evented(mgr, page)
-	assert.Equal(t, 3, callcount)
-
-	// non-lifecycle events, should be ignored
-	callcount = 0
-	page = eventPage(2, Reconfigure)
-	evented(mgr, page)
-	assert.Equal(t, 0, callcount)
-
-	// mixed events, ignore half
-	callcount = 0
-	page = eventPage(6, Mixed)
-	evented(mgr, page)
-	assert.Equal(t, 3, callcount)
-
-}
-
-func TestName(t *testing.T) {
-	mgr := newCollector()
-	assert.NotNil(t, mgr.Name())
-	assert.Equal(t, name, mgr.Name())
-}
-
-func TestStart(t *testing.T) {
-	mgr := newCollector()
-	// start should fail as no objects registered
-	assert.Error(t, mgr.Start())
-}
-
-func newCollector() *EventCollector {
-	return &EventCollector{mos: monitoredCache{mos: make(map[string]types.ManagedObjectReference)}, lastProcessedID: -1}
-}
-
-// simple callback counter
-func callMe(vm events.Event) {
-	callcount++
-}
-
-// utility function to mock a vsphere event
-//
-// size is the number of events to create
-// lifeCycle is true when we want to generate state events
-// lifeCycle events == poweredOn, poweredOff, etc..
-
-func eventPage(size int, eventType int) []types.BaseEvent {
-	page := make([]types.BaseEvent, 0, size)
-	moid := 100
-	for i := 0; i < size; i++ {
-		var eve types.BaseEvent
-		var eType int
-		moid++
-		vm := types.ManagedObjectReference{Value: strconv.Itoa(moid), Type: "vm"}
-		eType = eventType
-		if eType == Mixed {
-			if i%2 == 0 {
-				eType = LifeCycle
-			} else {
-				eType = Reconfigure
-			}
-		}
-		if eType == LifeCycle {
-			eve = types.BaseEvent(&types.VmPoweredOnEvent{VmEvent: types.VmEvent{Event: types.Event{Vm: &types.VmEventArgument{Vm: vm}}}})
-		} else {
-			eve = types.BaseEvent(&types.VmReconfiguredEvent{VmEvent: types.VmEvent{Event: types.Event{Vm: &types.VmEventArgument{Vm: vm}}}})
-		}
-
-		page = append(page, eve)
-	}
-
-	return page
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event.go
deleted file mode 100644
index 69d9cb7446..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"github.com/vmware/vic/lib/portlayer/event/events"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type VMEvent struct {
-	*events.BaseEvent
-}
-
-func NewVMEvent(be types.BaseEvent) *VMEvent {
-	var ee string
-	// vm events that we care about
-	switch be.(type) {
-	case *types.VmPoweredOnEvent,
-		*types.DrsVmPoweredOnEvent:
-		ee = events.ContainerPoweredOn
-	case *types.VmPoweredOffEvent:
-		ee = events.ContainerPoweredOff
-	case *types.VmSuspendedEvent:
-		ee = events.ContainerSuspended
-	case *types.VmRemovedEvent:
-		ee = events.ContainerRemoved
-	case *types.VmGuestShutdownEvent:
-		ee = events.ContainerShutdown
-	case *types.VmMigratedEvent:
-		ee = events.ContainerMigrated
-	case *types.DrsVmMigratedEvent:
-		ee = events.ContainerMigratedByDrs
-	case *types.VmRelocatedEvent:
-		ee = events.ContainerRelocated
-	default:
-		panic("Unknown event")
-	}
-	e := be.GetEvent()
-	return &VMEvent{
-		&events.BaseEvent{
-			Event:       ee,
-			ID:          int(e.Key),
-			Detail:      e.FullFormattedMessage,
-			Ref:         e.Vm.Vm.String(),
-			CreatedTime: e.CreatedTime,
-		},
-	}
-
-}
-
-func (vme *VMEvent) Topic() string {
-	if vme.Type == "" {
-		vme.Type = events.NewEventType(vme)
-	}
-	return vme.Type.Topic()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event_test.go
deleted file mode 100644
index 9ced688e02..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/collector/vsphere/vm_event_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewEvent(t *testing.T) {
-	vm := newVMMO()
-	k := 1
-	msg := "jojo the idiot circus boy"
-	tt := time.Now().UTC()
-	vmwEve := &types.VmPoweredOnEvent{VmEvent: types.VmEvent{Event: types.Event{CreatedTime: tt, FullFormattedMessage: msg, Key: int32(k), Vm: &types.VmEventArgument{Vm: *vm}}}}
-	vme := NewVMEvent(vmwEve)
-	assert.NotNil(t, vme)
-	assert.Equal(t, events.ContainerPoweredOn, vme.String())
-	assert.Equal(t, vm.String(), vme.Reference())
-	assert.Equal(t, k, vme.EventID())
-	assert.Equal(t, msg, vme.Message())
-	assert.Equal(t, "vsphere.VMEvent", vme.Topic())
-	assert.Equal(t, tt, vme.Created())
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/doc.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/doc.go
deleted file mode 100644
index dd6b3e946f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/doc.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-/*
-Package event manages events via a simple pub / sub mechanism.  Events could be created
-by vic components or registered Collectors.
-
-Basic Overview
-
-The Event Manager provides basic pub / sub functionality.  A subscription consists of a
-topic (any defined Event), a subscription name (string) and a callback function.  When an event is
-published the event manager will determine the event type and check to see if any components
-have registered a callback for that event type.  For all subscriptions the event manager will
-facilitate the callback.  Publication of events can be accomplished by any component that has
-a pointer to the event manager or via the registered collectors.
-
-Collectors are responsible for collecting events or data from external systems and then publishing
-relevant vic events to the event manager.  In theory the collector could monitor anything and when
-certain criteria are meet publish vic events to the manager.  Collectors are registered with the
-event manager which instructs the collector where to publish.  Multiple collectors are allowed per
-event manager, but each collector has a single publish target.
-
-An example of a collector is the vSphere Event Collector which uses the vSphere EventHistoryCollector
-to monitor the vSphere event stream and publish relevant events to vic.  In the initial implementation
-the vSphere Event Collector is focused on a subset of VM Events that are then transformed to vic Events
-and published to the event manager.
-*/
-package event
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/event_manager.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/event_manager.go
deleted file mode 100644
index 9ca2895421..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/event_manager.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package event
-
-import (
-	"github.com/vmware/vic/lib/portlayer/event/collector"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-// EventManager will provide a basic event pub/sub implementation
-type EventManager interface {
-
-	// RegisterCollector a collector with the manager
-	RegisterCollector(collector.Collector)
-
-	// Collectors returns registered collectors
-	Collectors() map[string]collector.Collector
-
-	// Subscribe for event callbacks
-	Subscribe(eventTopic string, caller string, callback func(events.Event)) Subscriber
-
-	// Unsubscribe from event callbacks
-	Unsubscribe(eventTopic string, caller string)
-
-	// Subscribers will return the subscriber map
-	Subscribers() map[string]map[string]Subscriber
-
-	// Subscribed returns subscriber count
-	Subscribed() int
-
-	// Publish the event to the subscribers
-	Publish(e events.Event)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event.go
deleted file mode 100644
index acf224aae2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package events
-
-import (
-	"fmt"
-	"path"
-	"reflect"
-	"time"
-)
-
-type EventType string
-
-type BaseEvent struct {
-	Type        EventType
-	Event       string
-	ID          int
-	Detail      string
-	Ref         string
-	CreatedTime time.Time
-}
-
-func (be *BaseEvent) EventID() int {
-	return be.ID
-}
-
-// return event type / description
-func (be *BaseEvent) String() string {
-	return be.Event
-}
-
-func (be *BaseEvent) Message() string {
-	return be.Detail
-}
-
-func (be *BaseEvent) Reference() string {
-	return be.Ref
-}
-func (be *BaseEvent) Created() time.Time {
-	return be.CreatedTime
-}
-
-// NewEventType utility function that uses reflection to return
-// the event type
-func NewEventType(kind interface{}) EventType {
-	t := reflect.TypeOf(kind)
-	if t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	return EventType(fmt.Sprintf("%s.%s", path.Base(t.PkgPath()), t.Name()))
-}
-
-func (t EventType) Topic() string {
-	return string(t)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event_test.go
deleted file mode 100644
index de70ee6c02..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/base_event_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package events
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewEventType(t *testing.T) {
-	topic := NewEventType(BaseEvent{})
-	assert.Contains(t, topic.Topic(), "events", ".", "BaseEvent")
-	topic = NewEventType(&BaseEvent{})
-	assert.Contains(t, topic.Topic(), "events", ".", "BaseEvent")
-}
-
-func TestBaseEvent(t *testing.T) {
-	be := &BaseEvent{
-		Event:  "PoweredOn",
-		ID:     12,
-		Detail: "VM 123 PoweredOn",
-		Ref:    "vm:12",
-	}
-
-	assert.Equal(t, "PoweredOn", be.String())
-	assert.Equal(t, 12, be.EventID())
-	assert.Equal(t, "VM 123 PoweredOn", be.Message())
-	assert.Equal(t, "vm:12", be.Reference())
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/container_event.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/container_event.go
deleted file mode 100644
index 49bc009469..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/container_event.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package events
-
-const (
-	ContainerCreated       = "Created"
-	ContainerFailed        = "Failed"
-	ContainerMigrated      = "Migrated"
-	ContainerMigratedByDrs = "MigratedByDrs"
-	ContainerPoweredOff    = "PoweredOff"
-	ContainerPoweredOn     = "PoweredOn"
-	ContainerReconfigured  = "Reconfigured"
-	ContainerRelocated     = "Relocated"
-	ContainerRemoved       = "Removed"
-	ContainerResumed       = "Resumed"
-	ContainerShutdown      = "Shutdown"
-	ContainerStarted       = "Started"
-	ContainerStopped       = "Stopped"
-	ContainerSuspended     = "Suspended"
-)
-
-type ContainerEvent struct {
-	*BaseEvent
-}
-
-func (ce *ContainerEvent) Topic() string {
-	if ce.Type == "" {
-		ce.Type = NewEventType(ce)
-	}
-	return ce.Type.Topic()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/events.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/events.go
deleted file mode 100644
index 6b9d07ffe7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/events/events.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package events
-
-import (
-	"time"
-)
-
-type Event interface {
-	EventTopic
-	// id of event
-	EventID() int
-	// event (PowerOn, PowerOff, etc)
-	String() string
-	// reference evented object
-	Reference() string
-	// event message
-	Message() string
-
-	Created() time.Time
-}
-
-type EventTopic interface {
-	Topic() string
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager.go
deleted file mode 100644
index a6c5623f68..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager.go
+++ /dev/null
@@ -1,163 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package event
-
-import (
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/portlayer/event/collector"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type Manager struct {
-	cos    collectorCache
-	subs   subscriberCache
-	eventQ chan events.Event
-}
-
-const eventQSize = 1000
-
-type collectorCache struct {
-	mu sync.RWMutex
-
-	collectors map[string]collector.Collector
-}
-
-type subscriberCache struct {
-	mu sync.RWMutex
-
-	subscribers map[string]map[string]Subscriber
-}
-
-func NewEventManager(collectors ...collector.Collector) *Manager {
-	mgr := &Manager{
-		cos: collectorCache{
-			collectors: make(map[string]collector.Collector),
-		},
-		subs: subscriberCache{
-			subscribers: make(map[string]map[string]Subscriber),
-		},
-		eventQ: make(chan events.Event, eventQSize),
-	}
-
-	// register any collectors provided
-	for i := range collectors {
-		mgr.RegisterCollector(collectors[i])
-	}
-
-	// event processor routine
-	go func() {
-		for e := range mgr.eventQ {
-			// subscribers for this event
-			mgr.subs.mu.RLock()
-			subs := mgr.subs.subscribers[e.Topic()]
-			mgr.subs.mu.RUnlock()
-
-			log.Debugf("Found %d subscribers to id: %d - %s: %s", len(subs), e.EventID(), e.Topic(), e.Message())
-
-			for sub, s := range subs {
-				log.Debugf("Event manager calling back to %s for %d - %s: %s", sub, e.EventID(), e.Topic(), e.Message())
-				s.onEvent(e)
-			}
-		}
-	}()
-
-	return mgr
-}
-
-func (mgr *Manager) RegisterCollector(collector collector.Collector) {
-	if collector == nil {
-		return
-	}
-
-	mgr.cos.mu.Lock()
-	defer mgr.cos.mu.Unlock()
-
-	collector.Register(mgr.Publish)
-
-	mgr.cos.collectors[collector.Name()] = collector
-}
-
-func (mgr *Manager) Collectors() map[string]collector.Collector {
-	mgr.cos.mu.RLock()
-	defer mgr.cos.mu.RUnlock()
-
-	c := make(map[string]collector.Collector)
-	for name, collector := range mgr.cos.collectors {
-		c[name] = collector
-	}
-	return c
-}
-
-// Subscribe to the event manager for callback
-func (mgr *Manager) Subscribe(eventTopic string, caller string, callback func(events.Event)) Subscriber {
-	defer trace.End(trace.Begin(fmt.Sprintf("%s:%s", eventTopic, caller)))
-	mgr.subs.mu.Lock()
-	defer mgr.subs.mu.Unlock()
-
-	if _, ok := mgr.subs.subscribers[eventTopic]; !ok {
-		mgr.subs.subscribers[eventTopic] = make(map[string]Subscriber)
-	}
-	s := newSubscriber(eventTopic, caller, callback)
-	mgr.subs.subscribers[eventTopic][caller] = s
-	return s
-}
-
-// Unsubscribe from callbacks
-func (mgr *Manager) Unsubscribe(eventTopic string, caller string) {
-	defer trace.End(trace.Begin(fmt.Sprintf("%s:%s", eventTopic, caller)))
-	mgr.subs.mu.Lock()
-	defer mgr.subs.mu.Unlock()
-	if _, ok := mgr.subs.subscribers[eventTopic]; ok {
-		delete(mgr.subs.subscribers[eventTopic], caller)
-	}
-}
-
-func (mgr *Manager) Subscribers() map[string]map[string]Subscriber {
-	mgr.subs.mu.RLock()
-	defer mgr.subs.mu.RUnlock()
-	s := make(map[string]map[string]Subscriber)
-	for i, m := range mgr.subs.subscribers {
-
-		if _, ok := s[i]; !ok {
-			s[i] = make(map[string]Subscriber)
-		}
-
-		for k, v := range m {
-			s[i][k] = v
-		}
-	}
-	return s
-}
-
-// RegistryCount returns the callback count
-func (mgr *Manager) Subscribed() int {
-	mgr.subs.mu.RLock()
-	defer mgr.subs.mu.RUnlock()
-	count := 0
-	for _, m := range mgr.subs.subscribers {
-		count += len(m)
-	}
-	return count
-}
-
-// Publish events to subscribers
-func (mgr *Manager) Publish(e events.Event) {
-	mgr.eventQ <- e
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager_test.go
deleted file mode 100644
index a55f22d1e0..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/manager_test.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package event
-
-import (
-	"testing"
-
-	"github.com/vmware/vic/lib/portlayer/event/collector/vsphere"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-
-	"github.com/vmware/govmomi/vim25/types"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewManager(t *testing.T) {
-	mgr := NewEventManager()
-	assert.NotNil(t, mgr)
-}
-
-func TestTopic(t *testing.T) {
-	vmEvent := newVMEvent()
-	assert.Equal(t, vmEvent.Topic(), "vsphere.VMEvent")
-}
-
-func TestSubscribe(t *testing.T) {
-	mgr := NewEventManager()
-	topic := events.NewEventType(vsphere.VMEvent{}).Topic()
-	mgr.Subscribe(topic, "tester", callback)
-	subs := mgr.Subscribers()
-	assert.Equal(t, 1, len(subs))
-	assert.Equal(t, 1, mgr.Subscribed())
-
-	mgr.Subscribe(topic, "tester2", callback)
-	subs = mgr.Subscribers()
-
-	// should still have 1 topic
-	assert.Equal(t, 1, len(subs))
-	// now two subscribers for that topic
-	assert.Equal(t, 2, mgr.Subscribed())
-
-	mgr.Subscribe(events.NewEventType(&vsphere.VMEvent{}).Topic(), "tester3", callback)
-	subs = mgr.Subscribers()
-	// should still have 1 topic
-	assert.Equal(t, 1, len(subs))
-	// now two subscribers for that topic
-	assert.Equal(t, 3, mgr.Subscribed())
-
-	mgr.Unsubscribe(topic, "tester2")
-	subs = mgr.Subscribers()
-	// should still have 1 topic
-	assert.Equal(t, 1, len(subs))
-	// now two subscribers for that topic
-	assert.Equal(t, 2, mgr.Subscribed())
-
-	mgr.Unsubscribe(events.NewEventType(&vsphere.VMEvent{}).Topic(), "tester3")
-	subs = mgr.Subscribers()
-	// should still have 1 topic
-	assert.Equal(t, 1, len(subs))
-	// now one subscribers for that topic
-	assert.Equal(t, 1, mgr.Subscribed())
-
-}
-
-func TestRegisterCollector(t *testing.T) {
-	mgr := NewEventManager()
-	// register nil
-	mgr.RegisterCollector(nil)
-	assert.Equal(t, 0, len(mgr.Collectors()))
-}
-
-// utility methods
-func newVMMO() *types.ManagedObjectReference {
-	return &types.ManagedObjectReference{Value: "101", Type: "vm"}
-}
-
-func newBaseEvent() types.BaseEvent {
-	vm := newVMMO()
-	return types.BaseEvent(&types.VmPoweredOnEvent{VmEvent: types.VmEvent{Event: types.Event{Vm: &types.VmEventArgument{Vm: *vm}}}})
-}
-
-func newVMEvent() *vsphere.VMEvent {
-	return vsphere.NewVMEvent(newBaseEvent())
-}
-
-func callback(e events.Event) {}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber.go
deleted file mode 100644
index 351de21de4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package event
-
-import (
-	"sync/atomic"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-const (
-	suspendDisabled int32 = iota
-	suspendDiscard
-	suspendQueue
-)
-
-type Subscriber interface {
-	// Topic returns the topic this subscriber is subscribed to
-	Topic() string
-	// Name returns the name of the subscriber
-	Name() string
-
-	// Suspend suspends processing events by the subscriber. If
-	// queueEvents is true, the events are queued until Resume()
-	// is called. If queueEvents is false, events passed into
-	// onEvent() after this call are discarded.
-	Suspend(queueEvents bool)
-	// Resume resumes processing of events by the subscriber.
-	// If Suspend() was called with queueEvents as true, any events
-	// that were passed to onEvent() after Suspend() returned are
-	// processed first.
-	Resume()
-	// IsSuspended returns true if the subscriber is suspended.
-	IsSuspended() bool
-
-	// Discarded returns the number of packets that were discarded by
-	// the subscriber as a result of Pause() being called with
-	// queueEvents as false.
-	Discarded() uint64
-	// Dropped returns the number of packets that were dropped when
-	// the event queue overflows. This only happens when Pause()
-	// is called with queueEvents as true.
-	Dropped() uint64
-
-	// onEvent is called by event.Manager to send an event to
-	// a subscriber
-	onEvent(events.Event)
-}
-
-type subscriber struct {
-	topic              string
-	name               string
-	callback           func(e events.Event)
-	eventQ             chan events.Event
-	suspendState       int32
-	discarded, dropped uint64
-	suspend            chan suspendCmd
-}
-
-type suspendCmd struct {
-	suspend bool
-	done    chan struct{}
-}
-
-const maxEventQueueSize = 1000
-
-// newSubscriber creates a new subscriber to topic
-func newSubscriber(topic, name string, callback func(e events.Event)) Subscriber {
-	s := &subscriber{
-		topic:    topic,
-		name:     name,
-		callback: callback,
-		eventQ:   make(chan events.Event, maxEventQueueSize),
-		suspend:  make(chan suspendCmd),
-	}
-
-	go func() {
-		suspended := false
-		var done chan struct{}
-		for {
-			if done != nil {
-				done <- struct{}{}
-				done = nil
-			}
-
-			if suspended {
-				select {
-				case c := <-s.suspend:
-					suspended = c.suspend
-					done = c.done
-				}
-
-				continue
-			}
-
-			// not suspended
-			select {
-			case e := <-s.eventQ:
-				s.callback(e)
-			case c := <-s.suspend:
-				suspended = c.suspend
-				done = c.done
-			}
-		}
-	}()
-
-	return s
-}
-
-// Topic returns the topic this subscriber is subscribed to
-func (s *subscriber) Topic() string {
-	return s.topic
-}
-
-// Name returns the name of the subscriber
-func (s *subscriber) Name() string {
-	return s.name
-}
-
-// onEvent is called by event.Manager to send an event to
-// a subscriber
-func (s *subscriber) onEvent(e events.Event) {
-	switch atomic.LoadInt32(&s.suspendState) {
-	case suspendDisabled:
-		s.eventQ <- e
-	case suspendDiscard:
-		log.Warnf("discarding event %q", e)
-		atomic.AddUint64(&s.discarded, 1)
-	case suspendQueue:
-		done := false
-		for !done {
-			select {
-			case s.eventQ <- e:
-				done = true
-			default:
-				// make room; discard oldest
-				log.Warnf("dropping event %q", <-s.eventQ)
-				atomic.AddUint64(&s.dropped, 1)
-			}
-		}
-	}
-}
-
-// Suspend suspends processing events by the subscriber. If
-// queueEvents is true, the events are queued until Resume()
-// is called. If queueEvents is false, events passed into
-// onEvent() after this call are discarded.
-func (s *subscriber) Suspend(queueEvents bool) {
-	defer func() {
-		done := make(chan struct{})
-		s.suspend <- suspendCmd{suspend: true, done: done}
-		<-done
-		close(done)
-	}()
-
-	if queueEvents {
-		atomic.StoreInt32(&s.suspendState, suspendQueue)
-		return
-	}
-
-	atomic.StoreInt32(&s.suspendState, suspendDiscard)
-}
-
-// Resume resumes processing of events by the subscriber.
-// If Suspend() was called with queueEvents as true, any events
-// that were passed to onEvent() after Suspend() returned are
-// processed first.
-func (s *subscriber) Resume() {
-	defer func() {
-		done := make(chan struct{})
-		s.suspend <- suspendCmd{suspend: false, done: done}
-		<-done
-		close(done)
-	}()
-	atomic.StoreInt32(&s.suspendState, suspendDisabled)
-}
-
-// IsSuspended returns true if the subscriber is suspended.
-func (s *subscriber) IsSuspended() bool {
-	return atomic.LoadInt32(&s.suspendState) != suspendDisabled
-}
-
-// Discarded returns the number of packets that were discarded by
-// the subscriber as a result of Pause() being called with
-// queueEvents as false.
-func (s *subscriber) Discarded() uint64 {
-	return atomic.LoadUint64(&s.discarded)
-}
-
-// Dropped returns the number of packets that were dropped when
-// the event queue overflows. This only happens when Pause()
-// is called with queueEvents as true.
-func (s *subscriber) Dropped() uint64 {
-	return atomic.LoadUint64(&s.dropped)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber_test.go
deleted file mode 100644
index 5f6e17ba11..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/event/subscriber_test.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package event
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-func init() {
-	log.SetLevel(log.DebugLevel)
-}
-
-type mockCollector struct {
-	c func(events.Event)
-}
-
-// AddMonitoredObject will add the object for event listening
-func (m *mockCollector) AddMonitoredObject(_ string) error {
-	return nil
-}
-
-// RemoveMonitoredObject will remove the object from event listening
-func (m *mockCollector) RemoveMonitoredObject(_ string) {
-}
-
-// Start listening for events and publish to function
-func (m *mockCollector) Start() error {
-	return nil
-}
-
-// Stop listening for events
-func (m *mockCollector) Stop() {}
-
-// Register a callback function
-func (m *mockCollector) Register(c func(events.Event)) {
-	m.c = c
-}
-
-// Name returns the collector name
-func (m *mockCollector) Name() string {
-	return "mock"
-}
-
-type mockEvent struct {
-	id int
-}
-
-// id of event
-func (e *mockEvent) EventID() int {
-	return e.id
-}
-
-// event (PowerOn, PowerOff, etc)
-func (e *mockEvent) String() string {
-	return fmt.Sprintf("%d", e.id)
-}
-
-// reference evented object
-func (e *mockEvent) Reference() string {
-	return ""
-}
-
-// event message
-func (e *mockEvent) Message() string {
-	return ""
-}
-
-func (e *mockEvent) Created() time.Time {
-	return time.Now()
-}
-
-func (e *mockEvent) Topic() string {
-	return "test"
-}
-
-func TestSuspendQueue(t *testing.T) {
-	c := &mockCollector{}
-	m := NewEventManager(c)
-	var evs []events.Event
-	done := make(chan struct{})
-	s := m.Subscribe("test", "test", func(e events.Event) {
-		evs = append(evs, e)
-		if len(evs) == 100 {
-			close(done)
-		}
-	})
-
-	suspended := false
-	for i := 0; i < 100; i++ {
-		if !suspended && i >= 50 {
-			s.Suspend(true)
-			assert.True(t, s.IsSuspended())
-			suspended = true
-		}
-		c.c(&mockEvent{id: i})
-	}
-
-	select {
-	case <-done:
-		assert.Fail(t, "unexpectedly got all events despite suspend")
-	case <-time.After(2 * time.Second):
-		assert.Condition(t, func() bool { return len(evs) <= 50 })
-	}
-
-	s.Resume()
-	assert.False(t, s.IsSuspended())
-
-	select {
-	case <-done:
-	case <-time.After(2 * time.Second):
-		assert.Fail(t, "timed out waiting for suspended events")
-	}
-
-	// check for dups
-	for i := range evs {
-		for j := range evs {
-			if j == i {
-				continue
-			}
-			if evs[j].EventID() == evs[i].EventID() {
-				assert.Fail(t, "dup event found for id %d", evs[j].EventID())
-			}
-		}
-	}
-}
-
-func TestSuspendDiscard(t *testing.T) {
-	c := &mockCollector{}
-	m := NewEventManager(c)
-	var evs []events.Event
-	s := m.Subscribe("test", "test", func(e events.Event) {
-		assert.Fail(t, "got an event %q when expecting none", e)
-	})
-
-	// discard events
-	s.Suspend(false)
-	assert.True(t, s.IsSuspended())
-	for i := 0; i < 50; i++ {
-		c.c(&mockEvent{id: i})
-	}
-
-	<-time.After(5 * time.Second)
-
-	assert.Empty(t, evs)
-	assert.Equal(t, uint64(50), s.Discarded())
-	assert.Equal(t, uint64(0), s.Dropped())
-}
-
-func TestSuspendOverflow(t *testing.T) {
-	c := &mockCollector{}
-	m := NewEventManager(c)
-	var evs []events.Event
-	done := make(chan struct{})
-	s := m.Subscribe("test", "test", func(e events.Event) {
-		evs = append(evs, e)
-		if len(evs) == maxEventQueueSize {
-			close(done)
-		}
-	})
-
-	s.Suspend(true)
-	assert.True(t, s.IsSuspended())
-	for i := 0; i < maxEventQueueSize+1; i++ {
-		c.c(&mockEvent{id: i})
-	}
-
-	select {
-	case <-done:
-		assert.Fail(t, "unexpectedly got all events despite suspend")
-	case <-time.After(5 * time.Second):
-	}
-
-	s.Resume()
-	assert.False(t, s.IsSuspended())
-
-	select {
-	case <-done:
-	case <-time.After(5 * time.Second):
-		assert.Fail(t, "timed out waiting for sentinel event")
-	}
-
-	assert.Len(t, evs, maxEventQueueSize)
-	assert.Equal(t, uint64(1), s.Dropped())
-	assert.Equal(t, uint64(0), s.Discarded())
-
-	// check for dups
-	for i := range evs {
-		// should not have an event with id 0
-		assert.NotEqual(t, 0, evs[i].EventID(), "got event with event id 0")
-		for j := range evs {
-			if j == i {
-				continue
-			}
-			if evs[j].EventID() == evs[i].EventID() {
-				assert.Fail(t, "dup event found for id %d", evs[j].EventID())
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/base.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/base.go
deleted file mode 100644
index e2a6bc9421..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/base.go
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"context"
-	"fmt"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/govmomi/guest"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/migration"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// NotYetExistError is returned when a call that requires a VM exist is made
-type NotYetExistError struct {
-	ID string
-}
-
-func (e NotYetExistError) Error() string {
-	return fmt.Sprintf("%s is not completely created", e.ID)
-}
-
-// containerBase holds fields common between Handle and Container. The fields and
-// methods in containerBase should not require locking as they're primary use is:
-// a. for read-only reference when used in Container
-// b. single use/no-concurrent modification when used in Handle
-type containerBase struct {
-	ExecConfig *executor.ExecutorConfig
-
-	// Migrated is used during in memory migration to assign whether an execConfig is viable for a commit phase
-	Migrated bool
-	// MigrationError means the errors happens during data migration, some operation might fail for we cannot extract the whole container configuration
-	MigrationError error
-	DataVersion    int
-
-	// original - can be pointers so long as refreshes
-	// use different instances of the structures
-	Config  *types.VirtualMachineConfigInfo
-	Runtime *types.VirtualMachineRuntimeInfo
-
-	// doesn't change so can be copied here
-	vm *vm.VirtualMachine
-}
-
-func newBase(vm *vm.VirtualMachine, c *types.VirtualMachineConfigInfo, r *types.VirtualMachineRuntimeInfo) *containerBase {
-	base := &containerBase{
-		ExecConfig: &executor.ExecutorConfig{},
-		Config:     c,
-		Runtime:    r,
-		vm:         vm,
-	}
-
-	// construct a working copy of the exec config
-	if c != nil && c.ExtraConfig != nil {
-		var migratedConf map[string]string
-		containerExecKeyValues := vmomi.OptionValueMap(c.ExtraConfig)
-		// #nosec: Errors unhandled.
-		base.DataVersion, _ = migration.ContainerDataVersion(containerExecKeyValues)
-		migratedConf, base.Migrated, base.MigrationError = migration.MigrateContainerConfig(containerExecKeyValues)
-		extraconfig.Decode(extraconfig.MapSource(migratedConf), base.ExecConfig)
-	}
-
-	return base
-}
-
-// String returns the string representation of ContainerBase
-func (c *containerBase) String() string {
-	return c.ExecConfig.ID
-}
-
-// VMReference will provide the vSphere vm managed object reference
-func (c *containerBase) VMReference() types.ManagedObjectReference {
-	var moref types.ManagedObjectReference
-	if c.vm != nil {
-		moref = c.vm.Reference()
-	}
-	return moref
-}
-
-// unlocked refresh of container state
-func (c *containerBase) refresh(ctx context.Context) error {
-	base, err := c.updates(ctx)
-	if err != nil {
-		log.Errorf("Update: unable to update container %s: %s", c, err)
-		return err
-	}
-
-	// copy over the new state
-	*c = *base
-	return nil
-}
-
-// updates acquires updates from the infrastructure without holding a lock
-func (c *containerBase) updates(ctx context.Context) (*containerBase, error) {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	var o mo.VirtualMachine
-
-	// make sure we have vm
-	if c.vm == nil {
-		return nil, NotYetExistError{c.ExecConfig.ID}
-	}
-
-	if c.Config != nil {
-		log.Debugf("Update: for %s, refreshing from change version %s", c, c.Config.ChangeVersion)
-	}
-
-	if err := c.vm.Properties(ctx, c.vm.Reference(), []string{"config", "runtime"}, &o); err != nil {
-		return nil, err
-	}
-
-	base := &containerBase{
-		vm:         c.vm,
-		Config:     o.Config,
-		Runtime:    &o.Runtime,
-		ExecConfig: &executor.ExecutorConfig{},
-	}
-
-	// Get the ExtraConfig
-	var migratedConf map[string]string
-	containerExecKeyValues := vmomi.OptionValueMap(o.Config.ExtraConfig)
-	if containerExecKeyValues["guestinfo.vice./common/id"] == "" {
-		return nil, fmt.Errorf("Update: change version %s failed assertion extraconfig id != nil", o.Config.ChangeVersion)
-	}
-
-	log.Debugf("Update: for %s, change version %s, extraconfig id: %+v", c, o.Config.ChangeVersion, containerExecKeyValues["guestinfo.vice./common/id"])
-	// #nosec: Errors unhandled.
-	base.DataVersion, _ = migration.ContainerDataVersion(containerExecKeyValues)
-	migratedConf, base.Migrated, base.MigrationError = migration.MigrateContainerConfig(containerExecKeyValues)
-	extraconfig.Decode(extraconfig.MapSource(migratedConf), base.ExecConfig)
-
-	return base, nil
-}
-
-func (c *containerBase) ReloadConfig(ctx context.Context) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	return c.startGuestProgram(ctx, "reload", "")
-}
-
-// WaitForExec waits exec'ed task to set started field or timeout
-func (c *containerBase) WaitForExec(ctx context.Context, id string) error {
-	defer trace.End(trace.Begin(id))
-
-	return c.waitForExec(ctx, id)
-}
-
-// WaitForSession waits non-exec'ed task to set started field or timeout
-func (c *containerBase) WaitForSession(ctx context.Context, id string) error {
-	defer trace.End(trace.Begin(id))
-
-	return c.waitForSession(ctx, id)
-}
-
-func (c *containerBase) startGuestProgram(ctx context.Context, name string, args string) error {
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	defer trace.End(trace.Begin(c.ExecConfig.ID + ":" + name))
-	o := guest.NewOperationsManager(c.vm.Client.Client, c.vm.Reference())
-	m, err := o.ProcessManager(ctx)
-	if err != nil {
-		return err
-	}
-
-	spec := types.GuestProgramSpec{
-		ProgramPath: name,
-		Arguments:   args,
-	}
-
-	auth := types.NamePasswordAuthentication{
-		Username: c.ExecConfig.ID,
-	}
-
-	_, err = m.StartProgram(ctx, &auth, &spec)
-
-	return err
-}
-
-func (c *containerBase) start(ctx context.Context) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	// Power on
-	_, err := c.vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return c.vm.PowerOn(ctx)
-	})
-
-	return err
-}
-
-func (c *containerBase) stop(ctx context.Context, waitTime *int32) error {
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	// get existing state and set to stopping
-	// if there's a failure we'll revert to existing
-
-	err := c.shutdown(ctx, waitTime)
-	if err == nil {
-		return nil
-	}
-
-	log.Warnf("stopping %s via hard power off due to: %s", c, err)
-
-	return c.poweroff(ctx)
-}
-
-func (c *containerBase) kill(ctx context.Context) error {
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	wait := 10 * time.Second // default
-	timeout, cancel := context.WithTimeout(ctx, wait)
-	defer cancel()
-
-	sig := string(ssh.SIGKILL)
-	log.Infof("sending kill -%s %s", sig, c)
-
-	err := c.startGuestProgram(timeout, "kill", sig)
-	if err == nil && timeout.Err() != nil {
-		log.Warnf("timeout (%s) waiting for %s to power off via SIG%s", wait, c, sig)
-	}
-	if err != nil {
-		log.Warnf("killing %s attempt resulted in: %s", c, err)
-
-		if isInvalidPowerStateError(err) {
-			return nil
-		}
-	}
-
-	// Even if startGuestProgram failed above, it may actually have executed.  If the container came up and then
-	// we kill it before VC gets a chance to detect the toolbox, vSphere can execute the kill but report an
-	// error 3016 indicating the guest toolbox wasn't found.  If we then try to poweroff, it may throw vSphere
-	// into an invalid transition and will need to recover.  If we try to grab properties at this time, the
-	// power state may be incorrect.  We work around this by waiting on the power state, regardless of error
-	// from startGuestProgram. https://github.com/vmware/vic/issues/5803
-	log.Infof("waiting %s for %s to power off", wait, c)
-	err = c.vm.WaitForPowerState(timeout, types.VirtualMachinePowerStatePoweredOff)
-	if err == nil {
-		return nil // VM has powered off
-	}
-
-	log.Warnf("killing %s via hard power off", c)
-
-	// stop wait time is not applied for the hard kill
-	return c.poweroff(ctx)
-}
-
-func (c *containerBase) shutdown(ctx context.Context, waitTime *int32) error {
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	wait := 10 * time.Second // default
-	if waitTime != nil && *waitTime > 0 {
-		wait = time.Duration(*waitTime) * time.Second
-	}
-
-	cs := c.ExecConfig.Sessions[c.ExecConfig.ID]
-	stop := []string{cs.StopSignal, string(ssh.SIGKILL)}
-	if stop[0] == "" {
-		stop[0] = string(ssh.SIGTERM)
-	}
-
-	var killed bool
-
-	for _, sig := range stop {
-		msg := fmt.Sprintf("sending kill -%s %s", sig, c)
-		log.Info(msg)
-
-		timeout, cancel := context.WithTimeout(ctx, wait)
-		defer cancel()
-
-		err := c.startGuestProgram(timeout, "kill", sig)
-		if err != nil {
-			// Just warn and proceed to waiting for power state per issue https://github.com/vmware/vic/issues/5803
-			// Description above in function kill()
-			log.Warnf("%s: %s", msg, err)
-
-			// If the error tells us "The attempted operation cannot be performed in the current state (Powered off)" (InvalidPowerState),
-			// we can avoid hard poweroff (issues #6236 and #6252). Here we wait for the power state changes instead of return
-			// immediately to avoid excess vSphere queries
-			if isInvalidPowerStateError(err) {
-				killed = true
-			}
-		}
-
-		log.Infof("waiting %s for %s to power off", wait, c)
-		err = c.vm.WaitForPowerState(timeout, types.VirtualMachinePowerStatePoweredOff)
-		if err == nil {
-			return nil // VM has powered off
-		}
-
-		if timeout.Err() == nil {
-			return err // error other than timeout
-		}
-
-		log.Warnf("timeout (%s) waiting for %s to power off via SIG%s", wait, c, sig)
-
-		if killed {
-			return nil
-		}
-	}
-
-	return fmt.Errorf("failed to shutdown %s via kill signals %s", c, stop)
-}
-
-func (c *containerBase) poweroff(ctx context.Context) error {
-	// make sure we have vm
-	if c.vm == nil {
-		return NotYetExistError{c.ExecConfig.ID}
-	}
-
-	_, err := c.vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return c.vm.PowerOff(ctx)
-	})
-
-	if err != nil {
-
-		// It is possible the VM has finally shutdown in between, ignore the error in that case
-		if terr, ok := err.(task.Error); ok {
-			switch terr := terr.Fault().(type) {
-			case *types.InvalidPowerState:
-				if terr.ExistingState == types.VirtualMachinePowerStatePoweredOff {
-					log.Warnf("power off %s task skipped (state was already %s)", c, terr.ExistingState)
-					return nil
-				}
-				log.Warnf("invalid power state during power off: %s", terr.ExistingState)
-
-			case *types.GenericVmConfigFault:
-
-				// Check if the poweroff task was canceled due to a concurrent guest shutdown
-				if len(terr.FaultMessage) > 0 {
-					k := terr.FaultMessage[0].Key
-					if k == vmNotSuspendedKey || k == vmPoweringOffKey {
-						log.Infof("power off %s task skipped due to guest shutdown", c)
-						return nil
-					}
-				}
-				log.Warnf("generic vm config fault during power off: %#v", terr)
-
-			default:
-				log.Warnf("hard power off failed due to: %#v", terr)
-			}
-		}
-
-		return err
-	}
-
-	return nil
-}
-
-func (c *containerBase) waitForPowerState(ctx context.Context, max time.Duration, state types.VirtualMachinePowerState) (bool, error) {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	timeout, cancel := context.WithTimeout(ctx, max)
-	defer cancel()
-
-	err := c.vm.WaitForPowerState(timeout, state)
-	if err != nil {
-		return timeout.Err() != nil, err
-	}
-
-	return false, nil
-}
-
-func (c *containerBase) waitForSession(ctx context.Context, id string) error {
-	defer trace.End(trace.Begin(id))
-
-	// guestinfo key that we want to wait for
-	key := extraconfig.CalculateKeys(c.ExecConfig, fmt.Sprintf("Sessions.%s.Started", id), "")[0]
-	return c.waitFor(ctx, key)
-}
-
-func (c *containerBase) waitForExec(ctx context.Context, id string) error {
-	defer trace.End(trace.Begin(id))
-
-	// guestinfo key that we want to wait for
-	key := extraconfig.CalculateKeys(c.ExecConfig, fmt.Sprintf("Execs.%s.Started", id), "")[0]
-	return c.waitFor(ctx, key)
-}
-
-func (c *containerBase) waitFor(ctx context.Context, key string) error {
-	detail, err := c.vm.WaitForKeyInExtraConfig(ctx, key)
-	if err != nil {
-		return fmt.Errorf("unable to wait for process launch status: %s", err)
-	}
-
-	if detail != "true" {
-		return fmt.Errorf("%s", detail)
-	}
-
-	return nil
-}
-
-// isInvalidPowerStateError verifies if an error is the InvalidPowerStateError
-func isInvalidPowerStateError(err error) bool {
-	if soap.IsSoapFault(err) {
-		_, ok := soap.ToSoapFault(err).VimFault().(types.InvalidPowerState)
-		return ok
-	}
-
-	return false
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/commit.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/commit.go
deleted file mode 100644
index a27c63e567..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/commit.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// Commit executes the requires steps on the handle
-func Commit(ctx context.Context, sess *session.Session, h *Handle, waitTime *int32) error {
-	defer trace.End(trace.Begin(h.ExecConfig.ID))
-
-	c := Containers.Container(h.ExecConfig.ID)
-	creation := h.vm == nil
-	if creation {
-		if h.Spec == nil {
-			return fmt.Errorf("a spec must be provided for create operations")
-		}
-
-		if sess == nil {
-			// session must not be nil
-			return fmt.Errorf("no session provided for create operations")
-		}
-
-		// the only permissible operation is to create a VM
-		if h.Spec == nil {
-			return fmt.Errorf("only create operations can be committed without an existing VM")
-		}
-
-		if c != nil {
-			return fmt.Errorf("a container already exists in the cache with this ID")
-		}
-
-		var res *types.TaskInfo
-		var err error
-		if sess.IsVC() && Config.VirtualApp.ResourcePool != nil {
-			// Create the vm
-			res, err = tasks.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-				return Config.VirtualApp.CreateChildVM(ctx, *h.Spec.Spec(), nil)
-			})
-		} else {
-			// Create the vm
-			res, err = tasks.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-				return sess.VMFolder.CreateVM(ctx, *h.Spec.Spec(), Config.ResourcePool, nil)
-			})
-		}
-
-		if err != nil {
-			log.Errorf("An error occurred while waiting for a creation operation to complete. Spec was %+v", *h.Spec.Spec())
-			return err
-		}
-
-		h.vm = vm.NewVirtualMachine(ctx, sess, res.Result.(types.ManagedObjectReference))
-		h.vm.DisableDestroy(ctx)
-		c = newContainer(&h.containerBase)
-		Containers.Put(c)
-		// inform of creation irrespective of remaining operations
-		publishContainerEvent(c.ExecConfig.ID, time.Now().UTC(), events.ContainerCreated)
-
-		// clear the spec as we've acted on it - this prevents a reconfigure from occurring in follow-on
-		// processing
-		h.Spec = nil
-	}
-
-	// if we're stopping the VM, do so before the reconfigure to preserve the extraconfig
-	if h.TargetState() == StateStopped {
-		if h.Runtime == nil {
-			log.Warnf("Commit called with incomplete runtime state for %s", h.ExecConfig.ID)
-		}
-
-		if h.Runtime != nil && h.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOff {
-			log.Infof("Dropping duplicate power off operation for %s", h.ExecConfig.ID)
-		} else {
-			// stop the container
-			if err := c.stop(ctx, waitTime); err != nil {
-				return err
-			}
-
-			// we must refresh now to get the new ChangeVersion - this is used to gate on powerstate in the reconfigure
-			// because we cannot set the ExtraConfig if the VM is powered on. There is still a race here unfortunately because
-			// tasks don't appear to contain the new ChangeVersion
-			h.refresh(ctx)
-
-			// inform of state change irrespective of remaining operations - but allow remaining operations to complete first
-			// to avoid data race on container config
-			defer publishContainerEvent(h.ExecConfig.ID, time.Now().UTC(), events.ContainerStopped)
-		}
-	}
-
-	// reconfigure operation
-	if h.Spec != nil {
-		if h.Runtime == nil {
-			log.Errorf("Refusing to perform reconfigure operation with incomplete runtime state for %s", h.ExecConfig.ID)
-		} else {
-			// ensure that our logic based on Runtime state remains valid
-
-			// NOTE: this inline refresh can be removed when switching away from guestinfo where we have non-persistence issues
-			// when updating ExtraConfig via the API with a powered on VM - we therefore have to be absolutely certain about the
-			// power state to decide if we can continue without nilifying extraconfig
-			//
-			// For the power off path this depends on handle.refresh() having been called to update the ChangeVersion
-			s := h.Spec.Spec()
-
-			log.Infof("Reconfigure: attempting update to %s with change version %q (%s)", h.ExecConfig.ID, s.ChangeVersion, h.Runtime.PowerState)
-
-			// nilify ExtraConfig if container configuration is migrated
-			// in this case, VCH and container are in different version. Migrated configuration cannot be written back to old container, to avoid data loss in old version's container
-			if h.Migrated {
-				log.Debugf("Reconfigure: dropping extraconfig as configuration of container %s is migrated", h.ExecConfig.ID)
-				s.ExtraConfig = nil
-			}
-
-			// address the race between power operation and refresh of config (and therefore ChangeVersion) in StateStopped block above
-			if s.ExtraConfig != nil && h.TargetState() == StateStopped && h.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOff {
-				detail := fmt.Sprintf("Reconfigure: collision of concurrent operations - expected power state poweredOff, found %s", h.Runtime.PowerState)
-				log.Warn(detail)
-
-				// log out current vm power state and runtime power state got from refresh, to see if there is anything mismatch,
-				// cause in issue #6127, we see the runtime power state is not updated even after 1 minute
-				ps, _ := h.vm.PowerState(ctx)
-				log.Debugf("Container %s power state: %s, runtime power state: %s", h.ExecConfig.ID, ps, h.Runtime.PowerState)
-				// this should cause a second attempt at the power op. This could result repeated contention that fails to resolve, but the randomness in the backoff and the tight timing
-				// to hit this scenario should mean it will resolve in a reasonable timeframe.
-				return ConcurrentAccessError{errors.New(detail)}
-			}
-
-			_, err := h.vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-				return h.vm.Reconfigure(ctx, *s)
-			})
-			if err != nil {
-				log.Errorf("Reconfigure: failed update to %s with change version %s: %+v", h.ExecConfig.ID, s.ChangeVersion, err)
-
-				// Check whether we get ConcurrentAccess and wrap it if needed
-				if f, ok := err.(types.HasFault); ok {
-					switch f.Fault().(type) {
-					case *types.ConcurrentAccess:
-						log.Errorf("Reconfigure: failed update to %s due to ConcurrentAccess, our change version %s", h.ExecConfig.ID, s.ChangeVersion)
-
-						return ConcurrentAccessError{err}
-					}
-				}
-				return err
-			}
-
-			log.Infof("Reconfigure: committed update to %s with change version: %s", h.ExecConfig.ID, s.ChangeVersion)
-
-			// trigger a configuration reload in the container if needed
-			if h.reload && h.Runtime != nil && h.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOn {
-				err = c.ReloadConfig(ctx)
-				if err != nil {
-					// NOTE: not sure how to handle this error - the change is already applied, it's just not picked up in the container
-				}
-			}
-		}
-	}
-
-	// best effort update of container cache using committed state - this will not reflect the power on below, however
-	// this is primarily for updating ExtraConfig state.
-	if !creation {
-		defer c.RefreshFromHandle(ctx, h)
-	}
-
-	if h.TargetState() == StateRunning {
-		if h.Runtime != nil && h.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOn {
-			log.Infof("Dropping duplicate power on operation for %s", h.ExecConfig.ID)
-			return nil
-		}
-
-		if h.Runtime == nil && !creation {
-			log.Warnf("Commit called with incomplete runtime state for %s", h.ExecConfig.ID)
-		}
-
-		// start the container
-		if err := c.start(ctx); err != nil {
-			// We observed that PowerOn_Task could get stuck on VC time to time even though the VM was starting fine on the host ESXi.
-			// Eventually the task was getting timed out (After 20 min.) and that was setting the container state back to Stopped.
-			// During that time VC was not generating any other event so the persona listener was getting nothing.
-			// This new event is for signaling the eventmonitor so that it can autoremove the container after this failure.
-			publishContainerEvent(h.ExecConfig.ID, time.Now().UTC(), events.ContainerFailed)
-			return err
-		}
-
-		// inform of creation irrespective of remaining operations
-		publishContainerEvent(h.ExecConfig.ID, time.Now().UTC(), events.ContainerStarted)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/config.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/config.go
deleted file mode 100644
index b5a1a155c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/config.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"net/url"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/event"
-)
-
-var Config Configuration
-
-// Configuration is a slice of the VCH config that is relevant to the exec part of the port layer
-type Configuration struct {
-	// Turn on debug logging
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"init/diagnostics/debug"`
-
-	SysLogConfig *executor.SysLogConfig `vic:"0.1" scope:"read-only" key:"init/diagnostics/syslog"`
-
-	// Port Layer - exec
-	config.Container `vic:"0.1" scope:"read-only" key:"container"`
-
-	// Resource pool is the working version of the compute resource config
-	ResourcePool *object.ResourcePool
-	// Parent resource will be a VirtualApp on VC
-	VirtualApp *object.VirtualApp
-
-	// For now throw the Event Manager here
-	EventManager event.EventManager
-
-	// Information about the VCH resource pool and about the real host that we want
-	// tol retrieve just once.
-	VCHMhz          int64
-	VCHMemoryLimit  int64
-	HostOS          string
-	HostOSVersion   string
-	HostProductName string //'VMware vCenter Server' or 'VMare ESXi'
-
-	// Datastore URLs for image stores - the top layer is [0], the bottom layer is [len-1]
-	ImageStores []url.URL `vic:"0.1" scope:"read-only" key:"storage/image_stores"`
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container.go
deleted file mode 100644
index 2576a8c58d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container.go
+++ /dev/null
@@ -1,849 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"io"
-	"path"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/iolog"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/google/uuid"
-)
-
-type State int
-
-const (
-	StateUnknown State = iota
-	StateStarting
-	StateRunning
-	StateStopping
-	StateStopped
-	StateSuspending
-	StateSuspended
-	StateCreated
-	StateCreating
-	StateRemoving
-	StateRemoved
-
-	containerLogName = "output.log"
-
-	vmNotSuspendedKey = "msg.suspend.powerOff.notsuspended"
-	vmPoweringOffKey  = "msg.rpc.error.poweringoff"
-)
-
-func (s State) String() string {
-	switch s {
-	case StateCreated:
-		return "Created"
-	case StateStarting:
-		return "Starting"
-	case StateRunning:
-		return "Running"
-	case StateRemoving:
-		return "Removing"
-	case StateRemoved:
-		return "Removed"
-	case StateStopping:
-		return "Stopping"
-	case StateStopped:
-		return "Stopped"
-	case StateUnknown:
-		return "Unknown"
-	}
-	return ""
-}
-
-// NotFoundError is returned when a types.ManagedObjectNotFound is returned from a vmomi call
-type NotFoundError struct {
-	err error
-}
-
-func (r NotFoundError) Error() string {
-	return "VM has either been deleted or has not been fully created"
-}
-
-func IsNotFoundError(err error) bool {
-	if soap.IsSoapFault(err) {
-		fault := soap.ToSoapFault(err).VimFault()
-		if _, ok := fault.(types.ManagedObjectNotFound); ok {
-			return true
-		}
-	}
-	return false
-}
-
-// RemovePowerError is returned when attempting to remove a containerVM that is powered on
-type RemovePowerError struct {
-	err error
-}
-
-func (r RemovePowerError) Error() string {
-	return r.err.Error()
-}
-
-// ConcurrentAccessError is returned when concurrent calls tries to modify same object
-type ConcurrentAccessError struct {
-	err error
-}
-
-func (r ConcurrentAccessError) Error() string {
-	return r.err.Error()
-}
-
-func IsConcurrentAccessError(err error) bool {
-	_, ok := err.(ConcurrentAccessError)
-	return ok
-}
-
-type DevicesInUseError struct {
-	Devices []string
-}
-
-func (e DevicesInUseError) Error() string {
-	return fmt.Sprintf("device %s in use", strings.Join(e.Devices, ","))
-}
-
-// Container is used to return data about a container during inspection calls
-// It is a copy rather than a live reflection and does not require locking
-type ContainerInfo struct {
-	containerBase
-
-	state State
-
-	// Size of the leaf (unused)
-	VMUnsharedDisk int64
-}
-
-// Container is used for an entry in the container cache - this is a "live" representation
-// of containers in the infrastructure.
-// DANGEROUS USAGE CONSTRAINTS:
-//   None of the containerBase fields should be partially updated - consider them immutable once they're
-//   part of a cache entry
-//   i.e. Do not make changes in containerBase.ExecConfig - only swap, under lock, the pointer for a
-//   completely new ExecConfig.
-//   This constraint allows us to avoid deep copying those structs every time a container is inspected
-type Container struct {
-	m sync.Mutex
-
-	ContainerInfo
-
-	logFollowers []io.Closer
-
-	newStateEvents map[State]chan struct{}
-}
-
-// newContainer constructs a Container suitable for adding to the cache
-// it's state is set from the Runtime.PowerState field, or StateCreated if that is not
-// viable
-// This copies (shallow) the containerBase that's provided
-func newContainer(base *containerBase) *Container {
-	c := &Container{
-		ContainerInfo: ContainerInfo{
-			containerBase: *base,
-			state:         StateCreated,
-		},
-		newStateEvents: make(map[State]chan struct{}),
-	}
-
-	// if this is a creation path, then Runtime will be nil
-	if base.Runtime != nil {
-		// set state
-		switch base.Runtime.PowerState {
-		case types.VirtualMachinePowerStatePoweredOn:
-			// the containerVM is poweredOn, so set state to starting
-			// then check to see if a start was successful
-			c.state = StateStarting
-			// If any sessions successfully started then set to running
-			for _, s := range base.ExecConfig.Sessions {
-				if s.Started != "" {
-					c.state = StateRunning
-					break
-				}
-			}
-		case types.VirtualMachinePowerStatePoweredOff:
-			// check if any of the sessions was started
-			for _, s := range base.ExecConfig.Sessions {
-				if s.Started != "" {
-					c.state = StateStopped
-					break
-				}
-			}
-		case types.VirtualMachinePowerStateSuspended:
-			c.state = StateSuspended
-			log.Warnf("container VM %s: invalid power state %s", base.vm.Reference(), base.Runtime.PowerState)
-		}
-	}
-
-	return c
-}
-
-func GetContainer(ctx context.Context, id uid.UID) *Handle {
-	// get from the cache
-	container := Containers.Container(id.String())
-	if container != nil {
-		return container.NewHandle(ctx)
-	}
-
-	return nil
-}
-
-func (c *ContainerInfo) String() string {
-	return c.ExecConfig.ID
-}
-
-// State returns the state at the time the ContainerInfo object was created
-func (c *ContainerInfo) State() State {
-	return c.state
-}
-
-func (c *Container) String() string {
-	return c.ExecConfig.ID
-}
-
-// Info returns a copy of the public container configuration that
-// is consistent and copied under lock
-func (c *Container) Info() *ContainerInfo {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	info := c.ContainerInfo
-	return &info
-}
-
-// CurrentState returns current state.
-func (c *Container) CurrentState() State {
-	c.m.Lock()
-	defer c.m.Unlock()
-	return c.state
-}
-
-// SetState changes container state.
-func (c *Container) SetState(s State) State {
-	c.m.Lock()
-	defer c.m.Unlock()
-	return c.updateState(s)
-}
-
-func (c *Container) updateState(s State) State {
-	log.Debugf("Setting container %s state: %s", c, s)
-	prevState := c.state
-	if s != c.state {
-		c.state = s
-		if ch, ok := c.newStateEvents[s]; ok {
-			delete(c.newStateEvents, s)
-			close(ch)
-		}
-	}
-	return prevState
-}
-
-// transitionState changes the container state to finalState if the current state is initialState
-// and returns an error otherwise.
-func (c *Container) transitionState(initialState, finalState State) error {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.state == initialState {
-		c.state = finalState
-		log.Debugf("Set container %s state: %s", c, finalState)
-		return nil
-	}
-
-	return fmt.Errorf("container state is %s and was not changed to %s", c.state, finalState)
-}
-
-var closedEventChannel = func() <-chan struct{} {
-	a := make(chan struct{})
-	close(a)
-	return a
-}()
-
-// WaitForState subscribes a caller to an event returning
-// a channel that will be closed when an expected state is set.
-// If expected state is already set the caller will receive a closed channel immediately.
-func (c *Container) WaitForState(s State) <-chan struct{} {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if s == c.state {
-		return closedEventChannel
-	}
-
-	if ch, ok := c.newStateEvents[s]; ok {
-		return ch
-	}
-
-	eventChan := make(chan struct{})
-	c.newStateEvents[s] = eventChan
-	return eventChan
-}
-
-func (c *Container) NewHandle(ctx context.Context) *Handle {
-	// Call property collector to fill the data
-	if c.vm != nil {
-		// FIXME: this should be calling the cache to decide if a refresh is needed
-		if err := c.Refresh(ctx); err != nil {
-			log.Errorf("refreshing container %s failed: %s", c, err)
-			return nil // nil indicates error
-		}
-	}
-
-	// return a handle that represents zero changes over the current configuration
-	// for this container
-	return newHandle(c)
-}
-
-// Refresh updates config and runtime info, holding a lock only while swapping
-// the new data for the old
-func (c *Container) Refresh(ctx context.Context) error {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if err := c.refresh(ctx); err != nil {
-		return err
-	}
-
-	var started bool
-	// determine if the containerVM has started
-	if session, exists := c.ExecConfig.Sessions[c.ExecConfig.ID]; exists {
-		if session.Started == "true" {
-			started = true
-		}
-	}
-
-	// conditionally sync state (see issue 4872, 6372)
-	switch c.containerBase.Runtime.PowerState {
-	case types.VirtualMachinePowerStatePoweredOn:
-		// only set to running if the container process has started
-		if started {
-			c.state = StateRunning
-		}
-	case types.VirtualMachinePowerStatePoweredOff:
-		if c.state != StateCreated {
-			c.state = StateStopped
-		}
-	}
-
-	return nil
-}
-
-func (c *Container) refresh(ctx context.Context) error {
-	return c.containerBase.refresh(ctx)
-}
-
-// RefreshFromHandle updates config and runtime info, holding a lock only while swapping
-// the new data for the old
-func (c *Container) RefreshFromHandle(ctx context.Context, h *Handle) {
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.Config != nil && (h.Config == nil || h.Config.ChangeVersion != c.Config.ChangeVersion) {
-		log.Warnf("container and handle ChangeVersions do not match for %s: %s != %s", c, c.Config.ChangeVersion, h.Config.ChangeVersion)
-		return
-	}
-
-	// power off doesn't necessarily cause a change version increment and bug1898149 occasionally impacts power on
-	if c.Runtime != nil && (h.Runtime == nil || h.Runtime.PowerState != c.Runtime.PowerState) {
-		log.Warnf("container and handle PowerStates do not match: %s != %s", c.Runtime.PowerState, h.Runtime.PowerState)
-		return
-	}
-
-	// copy over the new state
-	c.containerBase = h.containerBase
-	if c.Config != nil {
-		log.Debugf("Update: updated change version from handle: %s", c.Config.ChangeVersion)
-	}
-}
-
-// Start starts a container vm with the given params
-func (c *Container) start(ctx context.Context) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	if c.vm == nil {
-		return fmt.Errorf("vm not set")
-	}
-	// Set state to Starting
-	c.SetState(StateStarting)
-
-	err := c.containerBase.start(ctx)
-	if err != nil {
-		// change state to stopped because start task failed
-		c.SetState(StateStopped)
-
-		// check if locked disk error
-		devices := disk.LockedDisks(err)
-		if len(devices) > 0 {
-			for i := range devices {
-				// get device id from datastore file path
-				// FIXME: find a reasonable way to get device ID from datastore path in exec
-				devices[i] = strings.TrimSuffix(path.Base(devices[i]), ".vmdk")
-			}
-			return DevicesInUseError{devices}
-		}
-		return err
-	}
-
-	// wait task to set started field to something
-	ctx, cancel := context.WithTimeout(ctx, constants.PropertyCollectorTimeout)
-	defer cancel()
-
-	err = c.waitForSession(ctx, c.ExecConfig.ID)
-	if err != nil {
-		// leave this in state starting - if it powers off then the event
-		// will cause transition to StateStopped which is likely our original state
-		// if the container was just taking a very long time it'll eventually
-		// become responsive.
-
-		// TODO: mechanism to trigger reinspection of long term transitional states
-		return err
-	}
-
-	// Transition the state to Running only if it's Starting.
-	// The current state is already Stopped if the container's process has exited or
-	// a poweredoff event has been processed.
-	if err = c.transitionState(StateStarting, StateRunning); err != nil {
-		log.Debug(err)
-	}
-
-	return nil
-}
-
-func (c *Container) stop(ctx context.Context, waitTime *int32) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	defer c.onStop()
-
-	// get existing state and set to stopping
-	// if there's a failure we'll revert to existing
-	finalState := c.SetState(StateStopping)
-
-	err := c.containerBase.stop(ctx, waitTime)
-	if err != nil {
-		// we've got no idea what state the container is in at this point
-		// running is an _optimistic_ statement
-		// If the current state is Stopping, revert it to the old state.
-		if stateErr := c.transitionState(StateStopping, finalState); stateErr != nil {
-			log.Debug(stateErr)
-		}
-
-		return err
-	}
-
-	// Transition the state to Stopped only if it's Stopping.
-	if err = c.transitionState(StateStopping, StateStopped); err != nil {
-		log.Debug(err)
-	}
-
-	return nil
-}
-
-func (c *Container) Signal(ctx context.Context, num int64) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-
-	if c.vm == nil {
-		return fmt.Errorf("vm not set")
-	}
-
-	if num == int64(syscall.SIGKILL) {
-		return c.containerBase.kill(ctx)
-	}
-
-	return c.startGuestProgram(ctx, "kill", fmt.Sprintf("%d", num))
-}
-
-func (c *Container) onStop() {
-	lf := c.logFollowers
-	c.logFollowers = nil
-
-	log.Debugf("Container(%s) closing %d log followers", c, len(lf))
-	for _, l := range lf {
-		// #nosec: Errors unhandled.
-		_ = l.Close()
-	}
-}
-
-func (c *Container) LogReader(ctx context.Context, tail int, follow bool, since int64) (io.ReadCloser, error) {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.vm == nil {
-		return nil, fmt.Errorf("vm not set")
-	}
-
-	url, err := c.vm.VMPathNameAsURL(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	name := fmt.Sprintf("%s/%s", url.Path, containerLogName)
-
-	var via string
-
-	if c.state == StateRunning && c.vm.IsVC() {
-		// #nosec: Errors unhandled.
-		hosts, _ := c.vm.Datastore.AttachedHosts(ctx)
-		if len(hosts) > 1 {
-			// In this case, we need download from the VM host as it owns the file lock
-			// #nosec: Errors unhandled.
-			h, _ := c.vm.HostSystem(ctx)
-			if h != nil {
-				ctx = c.vm.Datastore.HostContext(ctx, h)
-				via = fmt.Sprintf(" via %s", h.Reference())
-			}
-		}
-	}
-
-	log.Infof("pulling %s%s", name, via)
-
-	file, err := c.vm.Datastore.Open(ctx, name)
-	if err != nil {
-		return nil, err
-	}
-
-	if since > 0 {
-		err = file.TailFunc(tail, func(line int, message string) bool {
-			if tail <= line && tail != -1 {
-				return false
-			}
-
-			buf := bytes.NewBufferString(message)
-
-			entry, err := iolog.ParseLogEntry(buf)
-			if err != nil {
-				log.Errorf("Error parsing log entry: %s", err.Error())
-				return false
-			}
-
-			if entry.Timestamp.Unix() <= since {
-				return false
-			}
-
-			return true
-		})
-	} else if tail >= 0 {
-		err = file.Tail(tail)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	if follow && c.state == StateRunning {
-		follower := file.Follow(time.Second)
-
-		c.logFollowers = append(c.logFollowers, follower)
-
-		return follower, nil
-	}
-
-	return file, nil
-}
-
-// Remove removes a containerVM after detaching the disks
-func (c *Container) Remove(ctx context.Context, sess *session.Session) error {
-	defer trace.End(trace.Begin(c.ExecConfig.ID))
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.vm == nil {
-		return NotFoundError{}
-	}
-
-	// check state first
-	if c.state == StateRunning {
-		return RemovePowerError{fmt.Errorf("Container %s is powered on", c)}
-	}
-
-	// get existing state and set to removing
-	// if there's a failure we'll revert to existing
-	existingState := c.updateState(StateRemoving)
-
-	// get the folder the VM is in
-	url, err := c.vm.VMPathNameAsURL(ctx)
-	if err != nil {
-
-		// handle the out-of-band removal case
-		if IsNotFoundError(err) {
-			Containers.Remove(c.ExecConfig.ID)
-			return NotFoundError{}
-		}
-
-		log.Errorf("Failed to get datastore path for %s: %s", c, err)
-		c.updateState(existingState)
-		return err
-	}
-
-	ds, err := sess.Finder.Datastore(ctx, url.Host)
-	if err != nil {
-		return err
-	}
-
-	// enable Destroy
-	c.vm.EnableDestroy(ctx)
-
-	concurrent := false
-	// if DeleteExceptDisks succeeds on VC, it leaves the VM orphan so we need to call Unregister
-	// if DeleteExceptDisks succeeds on ESXi, no further action needed
-	// if DeleteExceptDisks fails, we should call Unregister and only return an error if that fails too
-	//		Unregister sometimes can fail with ManagedObjectNotFound so we ignore it
-	_, err = c.vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return c.vm.DeleteExceptDisks(ctx)
-	})
-	if err != nil {
-		f, ok := err.(types.HasFault)
-		if !ok {
-			log.Warnf("DeleteExceptDisks failed with non-fault error %s for %s.", err, c)
-
-			c.updateState(existingState)
-			return err
-		}
-
-		switch f.Fault().(type) {
-		case *types.InvalidState:
-			log.Warnf("container VM %s is in invalid state, unregistering", c)
-			if err := c.vm.Unregister(ctx); err != nil {
-				log.Errorf("Error while attempting to unregister container VM %s: %s", c, err)
-				return err
-			}
-		case *types.ConcurrentAccess:
-			// We are getting ConcurrentAccess errors from DeleteExceptDisks - even though we don't set ChangeVersion in that path
-			// We are ignoring the error because in reality the operation finishes successfully.
-			log.Warnf("DeleteExceptDisks failed with ConcurrentAccess error for %s. Ignoring it.", c)
-			concurrent = true
-		default:
-			log.Debugf("Unhandled fault while attempting to destroy vm %s: %#v", c, f.Fault())
-
-			c.updateState(existingState)
-			return err
-		}
-	}
-
-	if concurrent && c.vm.IsVC() {
-		if err := c.vm.Unregister(ctx); err != nil {
-			if !IsNotFoundError(err) {
-				log.Errorf("Error while attempting to unregister container VM %s: %s", c, err)
-				return err
-			}
-		}
-	}
-
-	// remove from datastore
-	fm := ds.NewFileManager(sess.Datacenter, true)
-	if err = fm.Delete(ctx, url.Path); err != nil {
-		// at this phase error doesn't matter. Just log it.
-		log.Debugf("Failed to delete %s, %s for %s", url, err, c)
-	}
-
-	//remove container from cache
-	Containers.Remove(c.ExecConfig.ID)
-	publishContainerEvent(c.ExecConfig.ID, time.Now(), events.ContainerRemoved)
-
-	return nil
-}
-
-// eventedState will determine the target container
-// state based on the current container state and the vsphere event
-func eventedState(e events.Event, current State) State {
-	defer trace.End(trace.Begin(fmt.Sprintf("event %s received for id: %d", e.String(), e.EventID())))
-	switch e.String() {
-	case events.ContainerPoweredOn:
-		// are we in the process of starting
-		if current != StateStarting {
-			return StateRunning
-		}
-	case events.ContainerPoweredOff:
-		// are we in the process of stopping
-		if current != StateStopping {
-			return StateStopped
-		}
-	case events.ContainerSuspended:
-		// are we in the process of suspending
-		if current != StateSuspending {
-			return StateSuspended
-		}
-	case events.ContainerRemoved:
-		if current != StateRemoving {
-			return StateRemoved
-		}
-	}
-	return current
-}
-
-func (c *Container) OnEvent(e events.Event) {
-	defer trace.End(trace.Begin(fmt.Sprintf("event %s received for id: %d", e.String(), e.EventID())))
-	c.m.Lock()
-	defer c.m.Unlock()
-
-	if c.vm == nil {
-		log.Warnf("c.vm is nil for id: %d", e.String(), e.EventID())
-		return
-	}
-	newState := eventedState(e, c.state)
-	// do we have a state change
-	if newState != c.state {
-		switch newState {
-		case StateStopping,
-			StateRunning,
-			StateStopped,
-			StateSuspended:
-
-			// container state has changed so we need to update the container attributes
-			ctx, cancel := context.WithTimeout(context.Background(), constants.PropertyCollectorTimeout)
-			defer cancel()
-
-			if err := c.refresh(ctx); err != nil {
-				log.Errorf("Event driven container update failed: %s", err)
-			}
-
-			c.updateState(newState)
-			if newState == StateStopped {
-				c.onStop()
-			}
-			log.Debugf("Container(%s) state set to %s via event activity", c, newState)
-		case StateRemoved:
-			if c.vm != nil && c.vm.IsFixing() {
-				// is fixing vm, which will be registered back soon, so do not remove from containers cache
-				log.Debugf("Container(%s) %s is being fixed - %s event ignored", c, newState)
-
-				// Received remove event triggered by unregister VM operation - leave
-				// fixing state now. In a loaded environment, the remove event may be
-				// received after vm.fixVM() has returned, at which point the container
-				// should still be in fixing state to avoid removing it from the cache below.
-				c.vm.LeaveFixingState()
-				// since we're leaving the container in cache, just return w/o allowing
-				// a container event to be propogated to subscribers
-				return
-			}
-			log.Debugf("Container(%s) %s via event activity", c, newState)
-			// if we are here the containerVM has been removed from vSphere, so lets remove it
-			// from the portLayer cache
-			Containers.Remove(c.ExecConfig.ID)
-			c.vm = nil
-		default:
-			return
-		}
-
-		// regardless of state update success or failure publish the container event
-		publishContainerEvent(c.ExecConfig.ID, e.Created(), e.String())
-		return
-	}
-
-	log.Debugf("Container(%s) state didn't changed (%s)", c, newState)
-
-	switch e.String() {
-	case events.ContainerRelocated:
-		// container relocated so we need to update the container attributes
-		ctx, cancel := context.WithTimeout(context.Background(), constants.PropertyCollectorTimeout)
-		defer cancel()
-
-		err := c.refresh(ctx)
-		if err != nil {
-			log.Errorf("Event driven container update failed for %s with %s", c, err)
-		}
-	}
-}
-
-// get the containerVMs from infrastructure for this resource pool
-func infraContainers(ctx context.Context, sess *session.Session) ([]*Container, error) {
-	defer trace.End(trace.Begin(""))
-	var rp mo.ResourcePool
-
-	// popluate the vm property of the vch resource pool
-	if err := Config.ResourcePool.Properties(ctx, Config.ResourcePool.Reference(), []string{"vm"}, &rp); err != nil {
-		name := Config.ResourcePool.Name()
-		log.Errorf("List failed to get %s resource pool child vms: %s", name, err)
-		return nil, err
-	}
-	vms, err := populateVMAttributes(ctx, sess, rp.Vm)
-	if err != nil {
-		return nil, err
-	}
-
-	return convertInfraContainers(ctx, sess, vms), nil
-}
-
-func instanceUUID(id string) (string, error) {
-	// generate VM instance uuid, which will be used to query back VM
-	u, err := sys.UUID()
-	if err != nil {
-		return "", err
-	}
-	namespace, err := uuid.Parse(u)
-	if err != nil {
-		return "", errors.Errorf("unable to parse VCH uuid: %s", err)
-	}
-	return uuid.NewSHA1(namespace, []byte(id)).String(), nil
-}
-
-// populate the vm attributes for the specified morefs
-func populateVMAttributes(ctx context.Context, sess *session.Session, refs []types.ManagedObjectReference) ([]mo.VirtualMachine, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("populating %d refs", len(refs))))
-	var vms []mo.VirtualMachine
-
-	// current attributes we care about
-	attrib := []string{"config", "runtime.powerState", "summary"}
-
-	// populate the vm properties
-	err := sess.Retrieve(ctx, refs, attrib, &vms)
-	return vms, err
-}
-
-// convert the infra containers to a container object
-func convertInfraContainers(ctx context.Context, sess *session.Session, vms []mo.VirtualMachine) []*Container {
-	defer trace.End(trace.Begin(fmt.Sprintf("converting %d containers", len(vms))))
-	var cons []*Container
-
-	for _, v := range vms {
-		vm := vm.NewVirtualMachine(ctx, sess, v.Reference())
-		base := newBase(vm, v.Config, &v.Runtime)
-		c := newContainer(base)
-
-		id := uid.Parse(c.ExecConfig.ID)
-		if id == uid.NilUID {
-			log.Warnf("skipping converting container VM %s: could not parse id", v.Reference())
-			continue
-		}
-
-		if v.Summary.Storage != nil {
-			c.VMUnsharedDisk = v.Summary.Storage.Unshared
-		}
-
-		cons = append(cons, c)
-	}
-
-	return cons
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache.go
deleted file mode 100644
index fb5fa558ed..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"sync"
-
-	"context"
-
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-/*
-* ContainerCache will provide an in-memory cache of containerVMs.  It will
-* be refreshed on portlayer start and updated via container lifecycle
-* operations (start, stop, rm) and well as in response to infrastructure
-* events
- */
-type containerCache struct {
-	m sync.RWMutex
-
-	// cache by container id
-	cache map[string]*Container
-}
-
-var Containers *containerCache
-
-func NewContainerCache() {
-	// cache by the container ID and the vsphere
-	// managed object reference
-	Containers = &containerCache{
-		cache: make(map[string]*Container),
-	}
-}
-
-func (conCache *containerCache) Container(idOrRef string) *Container {
-	conCache.m.RLock()
-	defer conCache.m.RUnlock()
-	// find by id or moref
-	return conCache.cache[idOrRef]
-}
-
-func (conCache *containerCache) Containers(state *State) []*Container {
-	conCache.m.RLock()
-	defer conCache.m.RUnlock()
-	// cache contains 2 items for each container
-	capacity := len(conCache.cache) / 2
-	containers := make([]*Container, 0, capacity)
-
-	for id, con := range conCache.cache {
-		// is the key a proper ID?
-		if !isContainerID(id) {
-			continue
-		}
-		// filter by container state
-		// DO NOT use container.CurrentState as that can
-		// cause cache deadlocks
-		if state == nil || *state == con.State() {
-			containers = append(containers, con)
-		}
-	}
-
-	return containers
-}
-
-// puts a container in the cache and will overwrite an existing container
-func (conCache *containerCache) Put(container *Container) {
-	// only add containers w/backing VMs
-	if container.vm == nil {
-		return
-	}
-
-	conCache.m.Lock()
-	defer conCache.m.Unlock()
-
-	conCache.put(container)
-}
-
-func (conCache *containerCache) put(container *Container) {
-	// add pointer to cache by container ID
-	conCache.cache[container.ExecConfig.ID] = container
-	conCache.cache[container.vm.Reference().String()] = container
-
-}
-
-func (conCache *containerCache) Remove(idOrRef string) {
-	conCache.m.Lock()
-	defer conCache.m.Unlock()
-	// find by id
-	container := conCache.cache[idOrRef]
-	if container != nil {
-		delete(conCache.cache, container.ExecConfig.ID)
-		delete(conCache.cache, container.vm.Reference().String())
-	}
-}
-
-func (conCache *containerCache) sync(ctx context.Context, sess *session.Session) error {
-	conCache.m.Lock()
-	defer conCache.m.Unlock()
-
-	cons, err := infraContainers(ctx, sess)
-	if err != nil {
-		return err
-	}
-
-	conCache.cache = make(map[string]*Container)
-	for _, c := range cons {
-		conCache.put(c)
-	}
-
-	return nil
-}
-
-func isContainerID(id string) bool {
-	return uid.Parse(id) != uid.NilUID
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache_test.go
deleted file mode 100644
index aada2743ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_cache_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestContainerCache(t *testing.T) {
-	NewContainerCache()
-	containerID := uid.New().String()
-
-	// create a new container
-	container := newTestContainer(containerID)
-
-	// put it in the cache
-	Containers.Put(container)
-	// still shouldn't have a container because there's no vm
-	assert.Equal(t, len(Containers.cache), 0)
-
-	// add a test vm
-	addTestVM(container)
-
-	// put in cache
-	Containers.Put(container)
-	// get all containers -- should have 1
-	assert.Equal(t, len(Containers.Containers(nil)), 1)
-	// Get specific container
-	cachedContainer := Containers.Container(containerID)
-	// did we find it?
-	assert.NotNil(t, cachedContainer)
-	// do we have this one in the cache?
-	assert.Equal(t, cachedContainer.ExecConfig.ID, containerID)
-	// remove the container
-	Containers.Remove(containerID)
-	assert.Equal(t, len(Containers.cache), 0)
-	// remove non-existent container
-	Containers.Remove("blahblah")
-}
-
-func TestIsContainerID(t *testing.T) {
-	validID := uid.New().String()
-	invalidID := "ABC-XZ_@"
-
-	assert.True(t, isContainerID(validID))
-	assert.False(t, isContainerID(invalidID))
-}
-
-// addTestVM will add a pseudo VM to the container
-func addTestVM(container *Container) {
-	mo := types.ManagedObjectReference{Type: "vm", Value: "12"}
-	v := object.NewVirtualMachine(nil, mo)
-	container.vm = vm.NewVirtualMachineFromVM(nil, nil, v)
-}
-
-func newTestContainer(id string) *Container {
-	h := TestHandle(id)
-	return newContainer(&h.containerBase)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_test.go
deleted file mode 100644
index 203c499d29..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/container_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/uid"
-)
-
-func TestStateStringer(t *testing.T) {
-
-	c := &Container{
-		ContainerInfo: ContainerInfo{
-			state: StateRunning,
-		},
-	}
-
-	assert.Equal(t, "Running", c.state.String())
-	c.state = StateStopped
-	assert.Equal(t, "Stopped", c.state.String())
-	c.state = StateStopping
-	assert.Equal(t, "Stopping", c.state.String())
-	c.state = StateRemoving
-	assert.Equal(t, "Removing", c.state.String())
-	c.state = StateStarting
-	assert.Equal(t, "Starting", c.state.String())
-	c.state = StateCreated
-	assert.Equal(t, "Created", c.state.String())
-}
-
-func NewContainer(id uid.UID) *Handle {
-	con := &Container{
-		ContainerInfo: ContainerInfo{
-			state: StateCreating,
-		},
-		newStateEvents: make(map[State]chan struct{}),
-	}
-
-	h := newHandle(con)
-	h.ExecConfig.ID = id.String()
-
-	return h
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec.go
deleted file mode 100644
index 048e540355..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"fmt"
-	"sync"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/portlayer/event"
-	"github.com/vmware/vic/lib/portlayer/event/collector/vsphere"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-var (
-	initializer struct {
-		err  error
-		once sync.Once
-	}
-)
-
-func Init(ctx context.Context, sess *session.Session, source extraconfig.DataSource, _ extraconfig.DataSink) error {
-	log.Info("Beginning initialization of portlayer exec component")
-	initializer.once.Do(func() {
-		var err error
-		defer func() {
-			if err != nil {
-				initializer.err = err
-			}
-		}()
-		f := find.NewFinder(sess.Vim25(), false)
-
-		extraconfig.Decode(source, &Config)
-
-		log.Debugf("Decoded VCH config for execution: %#v", Config)
-		ccount := len(Config.ComputeResources)
-		if ccount != 1 {
-			err = fmt.Errorf("expected singular compute resource element, found %d", ccount)
-			log.Error(err)
-			return
-		}
-
-		cr := Config.ComputeResources[0]
-		var r object.Reference
-		r, err = f.ObjectReference(ctx, cr)
-		if err != nil {
-			err = fmt.Errorf("could not get resource pool or virtual app reference from %q: %s", cr.String(), err)
-			log.Error(err)
-			return
-		}
-		switch o := r.(type) {
-		case *object.VirtualApp:
-			Config.VirtualApp = o
-			Config.ResourcePool = o.ResourcePool
-		case *object.ResourcePool:
-			Config.ResourcePool = o
-		default:
-			err = fmt.Errorf("could not get resource pool or virtual app from reference %q: object type is wrong", cr.String())
-			log.Error(err)
-			return
-		}
-
-		// we want to monitor the cluster, so create a vSphere Event Collector
-		// The cluster managed object will either be a proper vSphere Cluster or
-		// a specific host when standalone mode
-		ec := vsphere.NewCollector(sess.Vim25(), sess.Cluster.Reference().String())
-
-		// start the collection of vsphere events
-		err = ec.Start()
-		if err != nil {
-			err = fmt.Errorf("%s failed to start: %s", ec.Name(), err)
-			log.Error(err)
-			return
-		}
-
-		// instantiate the container cache now
-		NewContainerCache()
-
-		// create the event manager &  register the existing collector
-		Config.EventManager = event.NewEventManager(ec)
-
-		// subscribe the exec layer to the event stream for Vm events
-		vmSub := Config.EventManager.Subscribe(events.NewEventType(vsphere.VMEvent{}).Topic(), "exec", func(e events.Event) {
-			if c := Containers.Container(e.Reference()); c != nil {
-				c.OnEvent(e)
-			}
-		})
-
-		// Grab the AboutInfo about our host environment
-		about := sess.Vim25().ServiceContent.About
-
-		vch := GetVCHstats(ctx)
-		Config.VCHMhz = vch.CPULimit
-		Config.VCHMemoryLimit = vch.MemoryLimit
-
-		Config.HostOS = about.OsType
-		Config.HostOSVersion = about.Version
-		Config.HostProductName = about.Name
-		log.Debugf("Host - OS (%s), version (%s), name (%s)", about.OsType, about.Version, about.Name)
-		log.Debugf("VCH limits - %d Mhz, %d MB", Config.VCHMhz, Config.VCHMemoryLimit)
-
-		// sync container cache
-		vmSub.Suspend(true)
-		defer vmSub.Resume()
-		log.Info("Syncing container cache")
-		if err = Containers.sync(ctx, sess); err != nil {
-			log.Errorf("Error encountered during container cache sync during init process: %s", err)
-			return
-		}
-	})
-
-	return initializer.err
-}
-
-// publishContainerEvent will publish a ContainerEvent to the vic event stream
-func publishContainerEvent(id string, created time.Time, eventType string) {
-	if Config.EventManager == nil || eventType == "" {
-		return
-	}
-
-	ce := &events.ContainerEvent{
-		BaseEvent: &events.BaseEvent{
-			Ref:         id,
-			CreatedTime: created,
-			Event:       eventType,
-			Detail:      fmt.Sprintf("Container %s %s", id, eventType),
-		},
-	}
-
-	Config.EventManager.Publish(ce)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec_test.go
deleted file mode 100644
index ee636afc87..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/exec_test.go
+++ /dev/null
@@ -1,175 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/event"
-	"github.com/vmware/vic/lib/portlayer/event/collector/vsphere"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-)
-
-var containerEvents []events.Event
-
-func TestEventedState(t *testing.T) {
-	id := "123439"
-	container := newTestContainer(id)
-	addTestVM(container)
-	// poweredOn event
-	event := createVMEvent(container, StateRunning)
-	assert.EqualValues(t, StateStarting, eventedState(event, StateStarting))
-	assert.EqualValues(t, StateRunning, eventedState(event, StateRunning))
-	assert.EqualValues(t, StateRunning, eventedState(event, StateStopped))
-	assert.EqualValues(t, StateRunning, eventedState(event, StateSuspended))
-
-	// // powerOff event
-	event = createVMEvent(container, StateStopped)
-	assert.EqualValues(t, StateStopping, eventedState(event, StateStopping))
-	assert.EqualValues(t, StateStopped, eventedState(event, StateStopped))
-	assert.EqualValues(t, StateStopped, eventedState(event, StateRunning))
-
-	// // suspended event
-	event = createVMEvent(container, StateSuspended)
-	assert.EqualValues(t, StateSuspending, eventedState(event, StateSuspending))
-	assert.EqualValues(t, StateSuspended, eventedState(event, StateSuspended))
-	assert.EqualValues(t, StateSuspended, eventedState(event, StateRunning))
-
-	// removed event
-	event = createVMEvent(container, StateRemoved)
-	assert.EqualValues(t, StateRemoved, eventedState(event, StateRemoved))
-	assert.EqualValues(t, StateRemoved, eventedState(event, StateStopped))
-	assert.EqualValues(t, StateRemoving, eventedState(event, StateRemoving))
-}
-
-func TestPublishContainerEvent(t *testing.T) {
-
-	NewContainerCache()
-	containerEvents = make([]events.Event, 0)
-	Config = Configuration{}
-
-	mgr := event.NewEventManager()
-	Config.EventManager = mgr
-	mgr.Subscribe(events.NewEventType(events.ContainerEvent{}).Topic(), "testing", containerCallback)
-
-	// create new running container and place in cache
-	id := "123439"
-	container := newTestContainer(id)
-	addTestVM(container)
-	container.SetState(StateRunning)
-	Containers.Put(container)
-
-	publishContainerEvent(id, time.Now().UTC(), events.ContainerPoweredOff)
-	time.Sleep(time.Millisecond * 30)
-
-	assert.Equal(t, 1, len(containerEvents))
-	assert.Equal(t, id, containerEvents[0].Reference())
-	assert.Equal(t, events.ContainerPoweredOff, containerEvents[0].String())
-}
-
-func TestVMRemovedEventCallback(t *testing.T) {
-
-	NewContainerCache()
-	containerEvents = make([]events.Event, 0)
-	Config = Configuration{}
-
-	mgr := event.NewEventManager()
-	Config.EventManager = mgr
-
-	// subscribe the exec layer to the event stream for VM events
-	mgr.Subscribe(events.NewEventType(&vsphere.VMEvent{}).Topic(), "testing", func(e events.Event) {
-		if c := Containers.Container(e.Reference()); c != nil {
-			c.OnEvent(e)
-		}
-	})
-
-	// create new running container and place in cache
-	id := "123439"
-	container := newTestContainer(id)
-	addTestVM(container)
-	container.SetState(StateRunning)
-	Containers.Put(container)
-
-	container.vm.EnterFixingState()
-	vmEvent := createVMEvent(container, StateRemoved)
-
-	mgr.Publish(vmEvent)
-	time.Sleep(time.Millisecond * 30)
-	assertMsg := "Container should have left fixing state in VM remove event handler"
-	assert.False(t, container.vm.IsFixing(), assertMsg)
-
-	mgr.Publish(vmEvent)
-	time.Sleep(time.Millisecond * 30)
-	assertMsg = "Container should be removed now that it has left fixing state"
-	assert.True(t, Containers.Container(id) == nil, assertMsg)
-}
-
-func containerCallback(ee events.Event) {
-	containerEvents = append(containerEvents, ee)
-}
-
-func createVMEvent(container *Container, state State) *vsphere.VMEvent {
-	// event to return
-	var vmEvent *vsphere.VMEvent
-	// basic event info
-	vme := types.Event{
-		CreatedTime: time.Now().UTC(),
-		Key:         int32(101),
-		Vm: &types.VmEventArgument{
-			Vm: container.vm.Reference(),
-		},
-	}
-
-	switch state {
-	case StateSuspended:
-		// suspended
-		vmwEve := &types.VmSuspendedEvent{
-			VmEvent: types.VmEvent{
-				Event: vme,
-			},
-		}
-		vmEvent = vsphere.NewVMEvent(vmwEve)
-	case StateStopped:
-		// poweredOff
-		vmwEve := &types.VmPoweredOffEvent{
-			VmEvent: types.VmEvent{
-				Event: vme,
-			},
-		}
-		vmEvent = vsphere.NewVMEvent(vmwEve)
-	case StateRemoved:
-		// removed
-		vmwEve := &types.VmRemovedEvent{
-			VmEvent: types.VmEvent{
-				Event: vme,
-			},
-		}
-		vmEvent = vsphere.NewVMEvent(vmwEve)
-	default:
-		// poweredOn
-		vmwEve := &types.VmPoweredOnEvent{
-			VmEvent: types.VmEvent{
-				Event: vme,
-			},
-		}
-		vmEvent = vsphere.NewVMEvent(vmwEve)
-	}
-
-	return vmEvent
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/handle.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/handle.go
deleted file mode 100644
index 549028a5b6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/handle.go
+++ /dev/null
@@ -1,391 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-	"sync"
-	"time"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/golang/groupcache/lru"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/lib/spec"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Resources describes the resource allocation for the containerVM
-type Resources struct {
-	NumCPUs  int64
-	MemoryMB int64
-}
-
-// ContainerCreateConfig defines the parameters for Create call
-type ContainerCreateConfig struct {
-	Metadata *executor.ExecutorConfig
-
-	ParentImageID  string
-	ImageStoreName string
-	Resources      Resources
-}
-
-var handles *lru.Cache
-var handlesLock sync.Mutex
-
-const (
-	handleLen = 16
-	lruSize   = 1000
-)
-
-func init() {
-	handles = lru.New(lruSize)
-}
-
-type Handle struct {
-	// copy from container cache
-	containerBase
-
-	// desired spec
-	Spec *spec.VirtualMachineConfigSpec
-	// desired changes to extraconfig
-	changes []types.BaseOptionValue
-
-	// desired state
-	targetState State
-
-	// should this change trigger a reload in the target container
-	reload bool
-
-	// allow for passing outside of the process
-	key string
-}
-
-func newHandleKey() string {
-	b := make([]byte, handleLen)
-	if _, err := io.ReadFull(rand.Reader, b); err != nil {
-		panic(err) // This shouldn't happen
-	}
-	return hex.EncodeToString(b)
-}
-
-// Added solely to support testing - need a better way to do this
-func TestHandle(id string) *Handle {
-	defer trace.End(trace.Begin("Handle.Create"))
-
-	h := newHandle(&Container{})
-	h.ExecConfig.ID = id
-
-	return h
-}
-
-// newHandle creates a handle for an existing container
-// con must not be nil
-func newHandle(con *Container) *Handle {
-	h := &Handle{
-		key:           newHandleKey(),
-		targetState:   StateUnknown,
-		containerBase: *newBase(con.vm, con.Config, con.Runtime),
-		// currently every operation has a spec, because even the power operations
-		// make changes to extraconfig for timestamps and session status
-		Spec: &spec.VirtualMachineConfigSpec{
-			VirtualMachineConfigSpec: &types.VirtualMachineConfigSpec{},
-		},
-	}
-
-	handlesLock.Lock()
-	defer handlesLock.Unlock()
-
-	handles.Add(h.key, h)
-
-	return h
-}
-
-func (h *Handle) TargetState() State {
-	return h.targetState
-}
-
-func (h *Handle) SetTargetState(s State) {
-	h.targetState = s
-}
-
-func (h *Handle) Reload() {
-	h.reload = true
-}
-
-// Rename updates the container name in ExecConfig as well as the vSphere display name
-func (h *Handle) Rename(newName string) *Handle {
-	defer trace.End(trace.Begin(newName))
-
-	h.ExecConfig.Name = newName
-
-	s := &spec.VirtualMachineConfigSpecConfig{
-		ID:   h.ExecConfig.ID,
-		Name: newName,
-	}
-	// Only rename on vSphere when the containerNameConvention is name
-	var convention string
-	if strings.Contains(Config.ContainerNameConvention, "{name}") {
-		convention = Config.ContainerNameConvention
-	}
-
-	h.Spec.Spec().Name = util.DisplayName(s, convention)
-
-	return h
-}
-
-// GetHandle finds and returns the handle that is referred by key
-func GetHandle(key string) *Handle {
-	handlesLock.Lock()
-	defer handlesLock.Unlock()
-
-	if h, ok := handles.Get(key); ok {
-		return h.(*Handle)
-	}
-
-	return nil
-}
-
-// HandleFromInterface returns the Handle
-func HandleFromInterface(key interface{}) *Handle {
-	defer trace.End(trace.Begin(""))
-
-	if h, ok := key.(string); ok {
-		return GetHandle(h)
-	}
-
-	log.Errorf("Type assertion failed for %#+v", key)
-	return nil
-}
-
-// ReferenceFromHandle returns the reference of the given handle
-func ReferenceFromHandle(handle interface{}) interface{} {
-	defer trace.End(trace.Begin(""))
-
-	if h, ok := handle.(*Handle); ok {
-		return h.String()
-	}
-
-	log.Errorf("Type assertion failed for %#+v", handle)
-	return nil
-}
-
-func (h *Handle) String() string {
-	return h.key
-}
-
-func (h *Handle) Commit(ctx context.Context, sess *session.Session, waitTime *int32) error {
-	cfg := make(map[string]string)
-
-	// Set timestamps based on target state
-	switch h.TargetState() {
-	case StateRunning:
-		for _, sc := range h.ExecConfig.Sessions {
-			sc.StartTime = time.Now().UTC().Unix()
-			sc.Started = ""
-			sc.ExitStatus = 0
-		}
-	case StateStopped:
-		for _, sc := range h.ExecConfig.Sessions {
-			sc.StopTime = time.Now().UTC().Unix()
-			sc.Started = ""
-		}
-	}
-
-	s := h.Spec.Spec()
-	if h.Config != nil {
-		s.ChangeVersion = h.Config.ChangeVersion
-	}
-
-	// if runtime is nil, should be fresh container create
-	var filter int
-	if h.Runtime == nil || h.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOff || h.TargetState() == StateStopped {
-		// any values set with VM powered off are inherently persistent
-		filter = ^extraconfig.NonPersistent
-	} else {
-		filter = extraconfig.NonPersistent | extraconfig.Hidden
-	}
-
-	extraconfig.Encode(extraconfig.ScopeFilterSink(uint(filter), extraconfig.MapSink(cfg)), h.ExecConfig)
-
-	// strip unmodified keys from the update
-	if h.Config != nil {
-		h.changes = append(s.ExtraConfig, vmomi.OptionValueUpdatesFromMap(h.Config.ExtraConfig, cfg)...)
-	} else {
-		h.changes = append(s.ExtraConfig, vmomi.OptionValueFromMap(cfg, true)...)
-	}
-	s.ExtraConfig = h.changes
-
-	if err := Commit(ctx, sess, h, waitTime); err != nil {
-		return err
-	}
-
-	h.Close()
-	return nil
-}
-
-// refresh is for internal use only - it's sole purpose at this time is to allow the stop path to update ChangeVersion
-// and corresponding state before performing any associated reconfigure
-func (h *Handle) refresh(ctx context.Context) {
-	// update Config and Runtime to reflect current state
-	h.containerBase.refresh(ctx)
-
-	// reapply extraconfig changes
-	s := h.Spec.Spec()
-
-	s.ExtraConfig = h.changes
-	s.ChangeVersion = h.Config.ChangeVersion
-}
-
-// CommitWithoutSpec sets the handle's spec to nil so that Commit operation only does a state change and won't touch the extraconfig
-func (h *Handle) CommitWithoutSpec(ctx context.Context, sess *session.Session, waitTime *int32) error {
-	h.Spec = nil
-
-	if err := Commit(ctx, sess, h, waitTime); err != nil {
-		return err
-	}
-
-	h.Close()
-	return nil
-}
-
-func (h *Handle) Close() {
-	handlesLock.Lock()
-	defer handlesLock.Unlock()
-
-	handles.Remove(h.key)
-}
-
-// Create returns a new handle that can be Committed to create a new container.
-// At this time the config is *not* deep copied so should not be changed once passed
-//
-// TODO: either deep copy the configuration, or provide an alternative means of passing the data that
-// avoids the need for the caller to unpack/repack the parameters
-func Create(ctx context.Context, vmomiSession *session.Session, config *ContainerCreateConfig) (*Handle, error) {
-	defer trace.End(trace.Begin("Handle.Create"))
-
-	h := &Handle{
-		key:         newHandleKey(),
-		targetState: StateCreated,
-		containerBase: containerBase{
-			ExecConfig: config.Metadata,
-		},
-	}
-
-	// configure with debug
-	h.ExecConfig.Diagnostics.DebugLevel = Config.DebugLevel
-	h.ExecConfig.Diagnostics.SysLogConfig = Config.SysLogConfig
-
-	// Convert the management hostname to IP
-	ips, err := net.LookupIP(constants.ManagementHostName)
-	if err != nil {
-		log.Errorf("Unable to look up %s during create of %s: %s", constants.ManagementHostName, config.Metadata.ID, err)
-		return nil, err
-	}
-
-	if len(ips) == 0 {
-		log.Errorf("No IP found for %s during create of %s", constants.ManagementHostName, config.Metadata.ID)
-		return nil, fmt.Errorf("No IP found on %s", constants.ManagementHostName)
-	}
-
-	if len(ips) > 1 {
-		log.Errorf("Multiple IPs found for %s during create of %s: %v", constants.ManagementHostName, config.Metadata.ID, ips)
-		return nil, fmt.Errorf("Multiple IPs found on %s: %#v", constants.ManagementHostName, ips)
-	}
-
-	uuid, err := instanceUUID(config.Metadata.ID)
-	if err != nil {
-		detail := fmt.Sprintf("unable to get instance UUID: %s", err)
-		log.Error(detail)
-		return nil, errors.New(detail)
-	}
-
-	specconfig := &spec.VirtualMachineConfigSpecConfig{
-		NumCPUs:  int32(config.Resources.NumCPUs),
-		MemoryMB: config.Resources.MemoryMB,
-
-		ID:       config.Metadata.ID,
-		Name:     config.Metadata.Name,
-		BiosUUID: uuid,
-
-		ParentImageID: config.ParentImageID,
-		BootMediaPath: Config.BootstrapImagePath,
-		VMPathName:    fmt.Sprintf("[%s]", vmomiSession.Datastore.Name()),
-
-		ImageStoreName: config.ImageStoreName,
-		ImageStorePath: &Config.ImageStores[0],
-
-		Metadata: config.Metadata,
-	}
-
-	// if not vsan, set the datastore folder name to containerID
-	if !vmomiSession.IsVSAN(ctx) {
-		specconfig.VMPathName = fmt.Sprintf("[%s] %s/%s.vmx", vmomiSession.Datastore.Name(), specconfig.ID, specconfig.ID)
-	}
-
-	specconfig.VMFullName = util.DisplayName(specconfig, Config.ContainerNameConvention)
-
-	// log only core portions
-	s := specconfig
-	log.Debugf("id: %s, name: %s, cpu: %d, mem: %d, parent: %s, os: %s, path: %s", s.ID, s.Name, s.NumCPUs, s.MemoryMB, s.ParentImageID, s.BootMediaPath, s.VMPathName)
-	m := s.Metadata
-	log.Debugf("annotations: %#v, reponame: %s", m.Annotations, m.RepoName)
-	for name, sess := range m.Sessions {
-		log.Debugf("session: %s, path: %s, dir: %s, runblock: %t, tty: %t, restart: %t, stdin: %t, stopsig: %s",
-			name, sess.Cmd.Path, sess.Cmd.Dir, sess.RunBlock, sess.Tty, sess.Restart, sess.OpenStdin, sess.StopSignal)
-	}
-
-	// If the debug level is high, dump everything
-	// we still do the logging above for consistency so searching the logs for common strings works.
-	// TODO: move this into a debug level aware structure renderer
-	if Config.DebugLevel > 2 {
-		log.Debugf("Config: %#v", specconfig)
-		log.Debugf("Executor spec: %#v", *specconfig.Metadata)
-		for _, sess := range m.Sessions {
-			log.Debugf("Session spec: %#v", *sess)
-		}
-	}
-
-	// Create a linux guest
-	linux, err := guest.NewLinuxGuest(ctx, vmomiSession, specconfig)
-	if err != nil {
-		log.Errorf("Failed during linux specific spec generation during create of %s: %s", config.Metadata.ID, err)
-		return nil, err
-	}
-
-	h.Spec = linux.Spec()
-
-	handlesLock.Lock()
-	defer handlesLock.Unlock()
-
-	handles.Add(h.key, h)
-
-	return h, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/vchinfo.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/vchinfo.go
deleted file mode 100644
index 4e76972bae..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec/vchinfo.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec
-
-import (
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-type VCHStats struct {
-	CPULimit    int64 // resource pool CPU limit
-	CPUUsage    int64 // resource pool CPU usage in MhZ
-	MemoryLimit int64 // resource pool Memory limit
-	MemoryUsage int64 // resource pool Memory Usage
-}
-
-func GetVCHstats(ctx context.Context, moref ...types.ManagedObjectReference) VCHStats {
-	var p mo.ResourcePool
-	var vch VCHStats
-
-	if Config.ResourcePool == nil {
-		log.Errorf("Unable to retrieve VCHstats: Config.ResourcePool is nil")
-		return vch
-	}
-
-	r := Config.ResourcePool.Reference()
-	if len(moref) > 0 {
-		r = moref[0]
-	}
-
-	ps := []string{"config.cpuAllocation", "config.memoryAllocation", "runtime.cpu", "runtime.memory", "parent"}
-
-	if err := Config.ResourcePool.Properties(ctx, r, ps, &p); err != nil {
-		log.Errorf("VCH stats error: %s", err)
-		return vch
-	}
-
-	vch.CPUUsage = p.Runtime.Cpu.OverallUsage
-	vch.MemoryUsage = p.Runtime.Memory.OverallUsage
-
-	if p.Config.CpuAllocation.Limit != nil {
-		vch.CPULimit = *p.Config.CpuAllocation.Limit
-	}
-
-	if p.Config.MemoryAllocation.Limit != nil {
-		vch.MemoryLimit = *p.Config.MemoryAllocation.Limit
-	}
-
-	stats := []int64{vch.CPULimit,
-		vch.MemoryLimit,
-		vch.CPUUsage,
-		vch.MemoryUsage}
-
-	log.Debugf("The VCH stats are: %+v", stats)
-
-	// If any of the stats is -1, we need to get the vch stats from the parent resource pool
-	for _, v := range stats {
-		if v == -1 {
-			return GetVCHstats(ctx, *p.Parent)
-		}
-	}
-
-	return vch
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/container.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/container.go
deleted file mode 100644
index c7d202a825..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/container.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec2
-
-import (
-	"net/url"
-	"time"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-type ID uuid.UUID
-
-func GenerateID() ID {
-	return ID(uuid.New())
-}
-
-func ParseID(idStr string) (ID, error) {
-	result, err := uuid.Parse(idStr)
-	return ID(result), err
-}
-
-func (id ID) String() string {
-	return uuid.UUID(id).String()
-}
-
-// Struct that represents the internal port-layer representation of a container
-// All data in this struct must be data that is either immutable
-// or can be relied upon without having to query either the container guest
-// or the underlying infrastructure. Some of this state will be updated by events
-type container struct {
-	ConstantConfig
-
-	vm       vm.VirtualMachine
-	runState RunState
-
-	config       Config
-	mainProcess  ProcessConfig // container main process
-	execdProcess []ProcessConfig
-
-	filesToCopy []FileToCopy // cache if copy while stopped
-}
-
-// config that will be applied to a container on commit
-// Needs to be public as it will be shared by net, storage etc
-type PendingCommit struct {
-	ConstantConfig
-
-	runState    RunState
-	config      Config
-	mainProcess ProcessConfig
-	filesToCopy []FileToCopy
-}
-
-// config state that cannot change for the lifetime of the container
-type ConstantConfig struct {
-	ContainerID ID
-	Created     time.Time
-}
-
-// variable container configuration state
-type Config struct {
-	Name   string
-	Limits ResourceLimits
-}
-
-// configuration state of a container process
-type ProcessConfig struct {
-	ProcessID ID
-	WorkDir   string
-	ExecPath  string
-	ExecArgs  string
-}
-
-func NewProcessConfig(workDir string, execPath string, execArgs string) ProcessConfig {
-	return ProcessConfig{ProcessID: GenerateID(), WorkDir: workDir, ExecArgs: execArgs, ExecPath: execPath}
-}
-
-type ProcessStatus int
-
-const (
-	_ ProcessStatus = iota
-	Started
-	Exited
-)
-
-// runtime status of a container process
-type ProcessRunState struct {
-	ProcessID  ID
-	Status     ProcessStatus
-	GuestPid   int
-	ExitCode   int
-	ExitMsg    string
-	StartedAt  time.Time
-	FinishedAt time.Time
-}
-
-type FileToCopy struct {
-	target url.URL
-	perms  int16
-	data   []byte
-}
-
-type ResourceLimits struct {
-	MemoryMb int
-	CPUMhz   int
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution.go
deleted file mode 100644
index 131500fb89..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec2
-
-// ContainerLifecycle represents operations concerned with the creation, modification
-// and deletion of containers
-type ContainerLifecycle interface {
-
-	// CreateContainer creates a new container representation and returns a Handle
-	// The Handle can be used to configure the container before its actually created
-	// Calling Commit on the Handle will create the container
-	CreateContainer(name string) (Handle, error)
-
-	// GetHandle allows for an existing container to be modified
-	// The Handle can be used to reconfigure the container
-	// Calling Commit on the Handle will apply the reconfiguration
-	// Commit will fail if another client committed a modification after GetHandle was called
-	GetHandle(cid ID) (Handle, error)
-
-	// CopyTo copies a file into the container represented by the handle
-	// If the container is stopped, the file will be copied in when it is next started
-	CopyTo(handle Handle, targetDir string, fname string, perms int16, data []byte) (Handle, error)
-
-	// SetEntryPoint sets the entry point for the container
-	// This is the executable, the lifecycle of which is tied to the container lifecycle
-	SetEntryPoint(handle Handle, workDir string, execPath string, execArgs string) (Handle, error)
-
-	// SetLimits sets resource limits on the container
-	// A value of -1 implies a default value, not unlimited
-	// New limits will be ignored if committed to a running container
-	SetLimits(handle Handle, memoryMb int, cpuMhz int) (Handle, error)
-
-	// SetRunState allows for the running state of a container to be modified
-	// Created is not a valid state and will return an error
-	SetRunState(handle Handle, runState RunState) (Handle, error)
-
-	// Commit applies changes made to the Handle to either a new or running container
-	// Commit will fail if another client committed a modification after GetHandle was called
-	// Commit blocks until all changes have been committed
-	Commit(handle Handle) (ID, error)
-
-	// DestroyContainer destroys an stopped container
-	// It is up to the caller to put the container in stopped state before calling Destroy
-	DestroyContainer(cid ID) error
-}
-
-type ProcessLifecycle interface {
-	// ExecProcess executes a process in the container
-	// The lifecycle of the process is independent of the container main process
-	// The ID returned is a uuid handle to the process
-	ExecProcess(cid ID, workDir string, execPath string, execArgs string) (ID, error)
-
-	// Send a signal to the process
-	// Specifying a process ID will signal an exec'd process. Specifying the container ID will signal the main process
-	Signal(processID ID, signal int) error
-}
-
-// ContainerQuery represents queries that can be made against a Container
-type ContainerQuery interface {
-
-	// ListContainers lists all container IDs for a given state
-	// If forState is nil, all containers are returned
-	ListContainers(forState RunState) ([]ID, error)
-
-	// GetConfig returns container and process config
-	GetContainerConfig(cid ID) (ContainerConfig, error)
-
-	// GetState returns the current state of the container and its processes
-	// This call will return a snapshot of the most recent state for each entity
-	GetContainerState(cid ID) (ContainerState, error)
-
-	// CopyFrom copies file data out of a running container
-	// Returns an error if the container is not running
-	CopyFrom(cid ID, sourceDir string, fname string) ([]byte, error)
-}
-
-// RunState represents the running state of a container
-type RunState int
-
-const (
-	_ RunState = iota
-	Created
-	Running
-	Stopped
-)
-
-// ContainerConfig is a type representing the configuration of a container and its processes
-type ContainerConfig struct {
-	ConstantConfig
-	Config
-	MainProcess ProcessConfig
-	ExecdProcs  []ProcessConfig
-}
-
-// ContainerState is a type representing the runtime state of a container and its processes
-type ContainerState struct {
-	Status      RunState
-	MainProcess ProcessState
-	ExecdProcs  []ProcessState
-}
-
-// ProcessState is the runtime state of a process in a container
-type ProcessState struct {
-	ProcessRunState
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution_vsphere.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution_vsphere.go
deleted file mode 100644
index 0276d40eda..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/execution_vsphere.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec2
-
-import (
-	"fmt"
-	"net/url"
-)
-
-// PortLayerVsphere is a WIP implementation of the execution.go interfaces
-type PortLayerVsphere struct {
-	vmomiGateway VmomiGateway
-	handles      HandleFactory
-	containers   map[ID]*container
-}
-
-func (p *PortLayerVsphere) getContainer(handle Handle) *container {
-	return p.containers[handle.(*PendingCommit).ContainerID]
-}
-
-func (p *PortLayerVsphere) newHandle(cid ID) *PendingCommit {
-	return p.handles.createHandle(cid).(*PendingCommit)
-}
-
-func (p *PortLayerVsphere) Init(gateway VmomiGateway, factory HandleFactory) error {
-	p.handles = factory
-	p.vmomiGateway = gateway
-	p.containers = make(map[ID]*container)
-	return nil
-}
-
-func (p *PortLayerVsphere) CreateContainer(name string) (Handle, error) {
-	cid := GenerateID()
-	handle := p.newHandle(cid)
-	handle.config.Name = name
-	handle.runState = Created
-	return handle, nil
-}
-
-func (p *PortLayerVsphere) GetHandle(cid ID) (Handle, error) {
-	c := p.containers[cid]
-	if c == nil {
-		return nil, fmt.Errorf("Invalid container ID")
-	}
-	return p.handles.createHandle(c.ContainerID), nil
-}
-
-func (p *PortLayerVsphere) SetEntryPoint(handle Handle, workDir string, execPath string, execArgs string) (Handle, error) {
-	resolvedHandle := handle.(*PendingCommit)
-	resolvedHandle.mainProcess = NewProcessConfig(workDir, execPath, execArgs)
-	return p.handles.refreshHandle(handle), nil
-}
-
-func (p *PortLayerVsphere) Commit(handle Handle) (ID, error) {
-	var err error
-	c := p.getContainer(handle)
-	if c == nil {
-		c, err = p.createContainer(handle)
-	} else {
-		//		if c.vm == nil {
-		//			return "", fmt.Errorf("Cannot modify container with no VM")
-		//		}
-		err = p.modifyContainer(c.runState, handle)
-	}
-	// Handle will be garbage collected
-	return c.ContainerID, err
-}
-
-func (p *PortLayerVsphere) CopyTo(handle Handle, targetDir string, fname string, perms int16, data []byte) (Handle, error) {
-	var result Handle
-	resolvedHandle := handle.(*PendingCommit)
-	u, err := url.Parse("file://" + targetDir + "/" + fname)
-	if err == nil {
-		fileToCopy := FileToCopy{target: *u, perms: perms, data: data}
-		resolvedHandle.filesToCopy = append(resolvedHandle.filesToCopy, fileToCopy)
-		result = p.handles.refreshHandle(handle)
-	}
-	return result, err
-}
-
-func (p *PortLayerVsphere) SetLimits(handle Handle, memoryMb int, cpuMhz int) (Handle, error) {
-	resolvedHandle := handle.(*PendingCommit)
-	resolvedHandle.config.Limits = ResourceLimits{MemoryMb: memoryMb, CPUMhz: cpuMhz}
-	return p.handles.refreshHandle(handle), nil
-}
-
-func (p *PortLayerVsphere) SetRunState(handle Handle, runState RunState) (Handle, error) {
-	resolvedHandle := handle.(*PendingCommit)
-	resolvedHandle.runState = runState
-	return p.handles.refreshHandle(handle), nil
-}
-
-func (p *PortLayerVsphere) DestroyContainer(cid ID) error {
-	c := p.containers[cid]
-	if c == nil {
-		return fmt.Errorf("Invalid container ID")
-	}
-	delete(p.containers, cid)
-	return nil
-}
-
-func (p *PortLayerVsphere) createContainer(handle Handle) (*container, error) {
-	resolvedHandle := handle.(*PendingCommit)
-	c := container{}
-	p.containers[resolvedHandle.ContainerID] = &c
-	c.ContainerID = resolvedHandle.ContainerID
-	c.runState = resolvedHandle.runState
-	// followed by other transfer of state from pending to container
-	//	fmt.Printf("Creating container for %v\n", pending)
-	return &c, nil
-}
-
-func (p *PortLayerVsphere) modifyContainer(runState RunState, handle Handle) error {
-	// fmt.Printf("Modifying container for %v\n", pending)
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/handle.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/handle.go
deleted file mode 100644
index bc5caa1d3c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/handle.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec2
-
-/* A Handle should be completely opaque */
-type Handle interface{}
-
-type HandleFactory interface {
-	createHandle(cID ID) Handle
-	refreshHandle(oldHandle Handle) Handle
-}
-
-type BasicHandleFactory struct {
-}
-
-func (h *BasicHandleFactory) createHandle(cid ID) Handle {
-	newPc := &PendingCommit{}
-	newPc.ContainerID = cid
-	return newPc
-}
-
-// Basic handle resolver just passes back the handle passed in
-func (h *BasicHandleFactory) refreshHandle(oldHandle Handle) Handle {
-	return oldHandle
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/portlayer_rpc_client.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/portlayer_rpc_client.go
deleted file mode 100644
index 0c6acc951b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/portlayer_rpc_client.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package remote
-
-import (
-	"encoding/gob"
-	"net/rpc"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/vic/lib/portlayer/exec2"
-)
-
-const serverAddress string = "localhost"
-
-type PortLayerRPCClient struct {
-	client *rpc.Client
-}
-
-func (p *PortLayerRPCClient) Connect() error {
-	// Ignore Init args on the client - that is the server's responsibility
-	var err error
-	gob.Register(uuid.New())
-	p.client, err = rpc.DialHTTP("tcp", serverAddress+":1234")
-	return err
-}
-
-type CreateArgs struct {
-	Name string
-}
-
-func (p *PortLayerRPCClient) CreateContainer(name string) (exec2.Handle, error) {
-	args := &CreateArgs{Name: name}
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.CreateContainer", args, &reply)
-	return reply, err
-}
-
-func (p *PortLayerRPCClient) GetHandle(cid exec2.ID) (exec2.Handle, error) {
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.GetHandle", cid, &reply)
-	return reply, err
-}
-
-type CopyToArgs struct {
-	Handle    exec2.Handle
-	TargetDir string
-	Fname     string
-	Perms     int16
-	Data      []byte
-}
-
-func (p *PortLayerRPCClient) CopyTo(handle exec2.Handle, targetDir string, fname string, perms int16, data []byte) (exec2.Handle, error) {
-	args := &CopyToArgs{Handle: handle, TargetDir: targetDir, Fname: fname, Perms: perms, Data: data}
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.CopyTo", args, &reply)
-	return reply, err
-}
-
-type SetEntryPointArgs struct {
-	Handle   exec2.Handle
-	WorkDir  string
-	ExecPath string
-	Args     string
-}
-
-func (p *PortLayerRPCClient) SetEntryPoint(handle exec2.Handle, workDir string, execPath string, args string) (exec2.Handle, error) {
-	epArgs := &SetEntryPointArgs{Handle: handle, WorkDir: workDir, ExecPath: execPath, Args: args}
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.SetEntryPoint", epArgs, &reply)
-	return reply, err
-}
-
-type SetLimitsArgs struct {
-	Handle   exec2.Handle
-	MemoryMb int
-	CPUMhz   int
-}
-
-func (p *PortLayerRPCClient) SetLimits(handle exec2.Handle, memoryMb int, cpuMhz int) (exec2.Handle, error) {
-	args := &SetLimitsArgs{Handle: handle, MemoryMb: memoryMb, CPUMhz: cpuMhz}
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.SetLimits", args, &reply)
-	return reply, err
-}
-
-type SetRunStateArgs struct {
-	Handle   exec2.Handle
-	RunState exec2.RunState
-}
-
-func (p *PortLayerRPCClient) SetRunState(handle exec2.Handle, runState exec2.RunState) (exec2.Handle, error) {
-	args := &SetRunStateArgs{Handle: handle, RunState: runState}
-	var reply exec2.Handle
-	err := p.client.Call("PortLayerRPCServer.SetRunState", args, &reply)
-	return reply, err
-}
-
-type CommitArgs struct {
-	Handle exec2.Handle
-}
-
-func (p *PortLayerRPCClient) Commit(handle exec2.Handle) (exec2.ID, error) {
-	args := &CommitArgs{Handle: handle}
-	var reply exec2.ID
-	err := p.client.Call("PortLayerRPCServer.Commit", args, &reply)
-	return reply, err
-}
-
-func (p *PortLayerRPCClient) DestroyContainer(cid exec2.ID) error {
-	/* Ignore the reply */
-	var reply exec2.ID
-	return p.client.Call("PortLayerRPCServer.DestroyContainer", cid, &reply)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/server/portlayer_rpc_server.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/server/portlayer_rpc_server.go
deleted file mode 100644
index 7e0b068faf..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/remote/server/portlayer_rpc_server.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"encoding/gob"
-	"fmt"
-	"log"
-	"net"
-	"net/http"
-	"net/rpc"
-
-	"github.com/google/uuid"
-
-	"github.com/vmware/vic/lib/portlayer/exec2"
-	"github.com/vmware/vic/lib/portlayer/exec2/remote"
-)
-
-type PortLayerRPCServer struct {
-}
-
-// A Handle can be anything, so this takes advantage of that by creating a sparse handle
-// to send to the client and using that sparse handle as a key in a hashtable which points to
-// rich handles created by the HandleFactory
-type SparseHandle exec2.Handle
-
-var lcTarget exec2.ContainerLifecycle
-
-//var lcQuery exec2.ContainerQuery
-var handles map[SparseHandle]exec2.Handle
-
-func init() {
-	pl := &exec2.PortLayerVsphere{}
-	pl.Init(nil, &exec2.BasicHandleFactory{})
-	lcTarget = pl
-	//lcQuery = lcTarget
-	handles = make(map[SparseHandle]exec2.Handle)
-}
-
-func main() {
-	gob.Register(uuid.New())
-	rpcServer := new(PortLayerRPCServer)
-	rpc.Register(rpcServer)
-	rpc.HandleHTTP()
-	// #nosec: Binds to all network interfaces
-	l, e := net.Listen("tcp", ":1234")
-	if e != nil {
-		log.Fatal("listen error:", e)
-	}
-	fmt.Println("Server listening")
-	http.Serve(l, nil)
-}
-
-// A sparse handle is simply a random string
-func newSparseHandle() SparseHandle {
-	return SparseHandle(uuid.New())
-}
-
-func createSparseHandle(handle exec2.Handle) SparseHandle {
-	key := newSparseHandle()
-	handles[key] = handle
-	return key
-}
-
-func resolveSparseHandle(handle SparseHandle) exec2.Handle {
-	return handles[handle]
-}
-
-func refreshHandle(result *exec2.Handle, oldHandle SparseHandle, newHandle exec2.Handle, err error) error {
-	*result = createSparseHandle(newHandle)
-	delete(handles, oldHandle)
-	return err
-}
-
-func (*PortLayerRPCServer) CreateContainer(args remote.CreateArgs, result *exec2.Handle) error {
-	handle, err := lcTarget.CreateContainer(args.Name)
-	*result = createSparseHandle(handle)
-	return err
-}
-
-func (*PortLayerRPCServer) GetHandle(cid exec2.ID, result *exec2.Handle) error {
-	handle, err := lcTarget.GetHandle(cid)
-	*result = createSparseHandle(handle)
-	return err
-}
-
-func (*PortLayerRPCServer) CopyTo(args remote.CopyToArgs, result *exec2.Handle) error {
-	handle := resolveSparseHandle(args.Handle)
-	newHandle, err := lcTarget.CopyTo(handle, args.TargetDir, args.Fname, args.Perms, args.Data)
-	return refreshHandle(result, handle, newHandle, err)
-}
-
-func (*PortLayerRPCServer) SetEntryPoint(args remote.SetEntryPointArgs, result *exec2.Handle) error {
-	handle := resolveSparseHandle(args.Handle)
-	newHandle, err := lcTarget.SetEntryPoint(handle, args.WorkDir, args.ExecPath, args.Args)
-	return refreshHandle(result, handle, newHandle, err)
-}
-
-func (*PortLayerRPCServer) SetLimits(args remote.SetLimitsArgs, result *exec2.Handle) error {
-	handle := resolveSparseHandle(args.Handle)
-	newHandle, err := lcTarget.SetLimits(handle, args.MemoryMb, args.CPUMhz)
-	return refreshHandle(result, handle, newHandle, err)
-}
-
-func (*PortLayerRPCServer) SetRunState(args remote.SetRunStateArgs, result *exec2.Handle) error {
-	handle := resolveSparseHandle(args.Handle)
-	newHandle, err := lcTarget.SetRunState(handle, args.RunState)
-	return refreshHandle(result, handle, newHandle, err)
-}
-
-func (*PortLayerRPCServer) Commit(args remote.CommitArgs, result *exec2.ID) error {
-	cid, err := lcTarget.Commit(resolveSparseHandle(args.Handle))
-	*result = cid
-	return err
-}
-
-func (*PortLayerRPCServer) DestroyContainer(cid exec2.ID, result *exec2.ID) error {
-	err := lcTarget.DestroyContainer(cid)
-	*result = cid
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/vmomi_gateway.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/vmomi_gateway.go
deleted file mode 100644
index 4b75458803..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/exec2/vmomi_gateway.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package exec2
-
-// VmomiGateway represents an interface to a pre-authenticated Vmomi API
-type VmomiGateway interface {
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/logging/logging.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/logging/logging.go
deleted file mode 100644
index 9ccfc6612a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/logging/logging.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package logging
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/event/collector/vsphere"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-var once sync.Once
-
-func Init(ctx context.Context) error {
-	once.Do(func() {
-		// Subscribe to vm events
-		exec.Config.EventManager.Subscribe(
-			events.NewEventType(vsphere.VMEvent{}).Topic(),
-			"logging",
-			func(ie events.Event) {
-				eventCallback(ctx, ie)
-			})
-	})
-	return nil
-}
-
-// listens migrated events and connects the file backed serial ports
-func eventCallback(ctx context.Context, ie events.Event) {
-	defer trace.End(trace.Begin(""))
-
-	switch ie.String() {
-	case events.ContainerMigrated,
-		events.ContainerMigratedByDrs:
-		log.Debugf("Received %s event", ie)
-
-		// grab the container from the cache
-		container := exec.Containers.Container(ie.Reference())
-		if container == nil {
-			log.Errorf("Container %s not found. Dropping the event %s from Logging subsystem.", ie.Reference(), ie)
-			return
-		}
-
-		operation := func() error {
-			var err error
-
-			handle := container.NewHandle(ctx)
-			if handle == nil {
-				err = fmt.Errorf("Handle for %s cannot be created", ie.Reference())
-				log.Error(err)
-				return err
-			}
-			defer handle.Close()
-
-			// set them to true
-			if handle, err = toggle(handle, true); err != nil {
-				log.Errorf("Failed to toggle logging after %s event for container %s: %s", ie, ie.Reference(), err)
-				return err
-			}
-
-			if err = handle.Commit(ctx, nil, nil); err != nil {
-				log.Errorf("Failed to commit handle after getting %s event for container %s: %s", ie, ie.Reference(), err)
-				return err
-			}
-			return nil
-		}
-
-		if err := retry.Do(operation, exec.IsConcurrentAccessError); err != nil {
-			log.Errorf("Multiple attempts failed to commit handle after getting %s event for container %s: %s", ie, ie.Reference(), err)
-		}
-	}
-
-}
-
-func toggle(handle *exec.Handle, connected bool) (*exec.Handle, error) {
-	defer trace.End(trace.Begin(""))
-
-	// get the virtual device list
-	devices := object.VirtualDeviceList(handle.Config.Hardware.Device)
-
-	// select the virtual serial ports
-	serials := devices.SelectByBackingInfo((*types.VirtualSerialPortFileBackingInfo)(nil))
-	if len(serials) == 0 {
-		return nil, fmt.Errorf("Unable to find a device with desired backing")
-	}
-
-	for i := range serials {
-		serial := serials[i]
-
-		log.Debugf("Found a device with desired backing: %#v", serial)
-
-		c := serial.GetVirtualDevice().Connectable
-		if c.Connected == connected {
-			log.Debugf("Already in the desired state (connected: %t)", connected)
-			continue
-		}
-		log.Debugf("Setting Connected to %t", connected)
-		c.Connected = connected
-
-		config := &types.VirtualDeviceConfigSpec{
-			Device:    serial,
-			Operation: types.VirtualDeviceConfigSpecOperationEdit,
-		}
-		handle.Spec.DeviceChange = append(handle.Spec.DeviceChange, config)
-	}
-	return handle, nil
-}
-
-// Join adds two file backed serial port and configures them
-func Join(h interface{}) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	var logFilePath string
-
-	VMPathName := handle.Spec.VMPathName()
-	VMName := handle.Spec.Spec().Name
-
-	logFilePath = fmt.Sprintf("%s/%s", VMPathName, VMName)
-	// on non-vsan setup, VMPathName is set to "[datastore_name] containerID/containerID.vmx"
-	if strings.HasSuffix(VMPathName, ".vmx") {
-		idx := strings.LastIndex(VMPathName, "/")
-		logFilePath = VMPathName[:idx]
-	}
-
-	for _, logFile := range []string{"tether.debug", "output.log"} {
-		filename := fmt.Sprintf("%s/%s", logFilePath, logFile)
-		log.Infof("set log file name to: %s", filename)
-
-		// Debug and log serial ports - backed by datastore file
-		serial := &types.VirtualSerialPort{
-			VirtualDevice: types.VirtualDevice{
-				Backing: &types.VirtualSerialPortFileBackingInfo{
-					VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-						FileName: filename,
-					},
-				},
-				Connectable: &types.VirtualDeviceConnectInfo{
-					Connected:         true,
-					StartConnected:    true,
-					AllowGuestControl: true,
-				},
-			},
-			YieldOnPoll: true,
-		}
-		config := &types.VirtualDeviceConfigSpec{
-			Device:    serial,
-			Operation: types.VirtualDeviceConfigSpecOperationAdd,
-		}
-		handle.Spec.DeviceChange = append(handle.Spec.DeviceChange, config)
-	}
-
-	return handle, nil
-}
-
-// Bind sets the *Connected fields of the VirtualSerialPort
-func Bind(h interface{}) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-	return toggle(handle, true)
-}
-
-// Unbind unsets the *Connected fields of the VirtualSerialPort
-func Unbind(h interface{}) (interface{}, error) {
-	defer trace.End(trace.Begin(""))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-	return toggle(handle, false)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/metrics/metrics.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/metrics/metrics.go
deleted file mode 100644
index 06c623ab96..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/metrics/metrics.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package metrics
-
-import (
-	"context"
-	"fmt"
-	"reflect"
-	"sync"
-
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/performance"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-var (
-	Supervisor *super
-
-	initializer struct {
-		err  error
-		once sync.Once
-	}
-)
-
-// super manages the lifecycle and access to the
-// available metrics collectors
-type super struct {
-	vms *performance.VMCollector
-}
-
-type UnsupportedTypeError struct {
-	subscriber interface{}
-}
-
-func (ute UnsupportedTypeError) Error() string {
-	t := reflect.TypeOf(ute.subscriber)
-	if t.Kind() == reflect.Ptr {
-		t = t.Elem()
-	}
-	return fmt.Sprintf("type %s is not supported by metrics", t)
-}
-
-func Init(ctx context.Context, session *session.Session) error {
-	defer trace.End(trace.Begin(""))
-	initializer.once.Do(func() {
-		var err error
-		defer func() {
-			if err != nil {
-				initializer.err = err
-			}
-		}()
-		Supervisor = newSupervisor(session)
-
-	})
-	return initializer.err
-
-}
-
-func newSupervisor(session *session.Session) *super {
-	defer trace.End(trace.Begin(""))
-	// create the vm metric collector
-	v := performance.NewVMCollector(session)
-	return &super{
-		vms: v,
-	}
-}
-
-func (s *super) Subscribe(op trace.Operation, subscriber interface{}) (chan interface{}, error) {
-	switch sub := subscriber.(type) {
-	case *exec.Container:
-		return s.vms.Subscribe(op, sub.VMReference(), sub.String())
-	}
-
-	err := UnsupportedTypeError{
-		subscriber: subscriber,
-	}
-	op.Errorf("%s", err)
-
-	return nil, err
-}
-
-func (s *super) Unsubscribe(op trace.Operation, subscriber interface{}, ch chan interface{}) {
-	switch sub := subscriber.(type) {
-	case *exec.Container:
-		s.vms.Unsubscribe(op, sub.VMReference(), ch)
-	default:
-		err := UnsupportedTypeError{
-			subscriber: subscriber,
-		}
-		op.Errorf("%s", err)
-	}
-	return
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/config.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/config.go
deleted file mode 100644
index 04cc999c01..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/config.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-type Configuration struct {
-	source extraconfig.DataSource `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	sink   extraconfig.DataSink   `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// Turn on debug logging
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"init/diagnostics/debug"`
-
-	// Port Layer - network
-	config.Network `vic:"0.1" scope:"read-only" key:"network"`
-
-	// The bridge link
-	BridgeLink Link `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// the vsphere portgroups corresponding to container network configuration
-	PortGroups map[string]object.NetworkReference `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-}
-
-func (c *Configuration) Encode() {
-	extraconfig.Encode(c.sink, c)
-}
-
-func (c *Configuration) Decode() {
-	extraconfig.Decode(c.source, c)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/container.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/container.go
deleted file mode 100644
index d3fced2307..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/container.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-type Container struct {
-	sync.Mutex
-
-	id        uid.UID
-	name      string
-	endpoints []*Endpoint
-}
-
-func (c *Container) Endpoints() []*Endpoint {
-	c.Lock()
-	defer c.Unlock()
-
-	ret := make([]*Endpoint, len(c.endpoints))
-	copy(ret, c.endpoints)
-	return ret
-}
-
-func (c *Container) ID() uid.UID {
-	return c.id
-}
-
-func (c *Container) Name() string {
-	return c.name
-}
-
-func (c *Container) endpoint(s *Scope) *Endpoint {
-	for _, e := range c.endpoints {
-		if e.Scope() == s {
-			return e
-		}
-	}
-
-	return nil
-}
-
-func (c *Container) Endpoint(s *Scope) *Endpoint {
-	c.Lock()
-	defer c.Unlock()
-
-	return c.endpoint(s)
-}
-
-func (c *Container) Scopes() []*Scope {
-	c.Lock()
-	defer c.Unlock()
-
-	scopes := make([]*Scope, len(c.endpoints))
-	i := 0
-	for _, e := range c.endpoints {
-		scopes[i] = e.Scope()
-		i++
-	}
-
-	return scopes
-}
-
-func (c *Container) addEndpoint(e *Endpoint) {
-	c.Lock()
-	defer c.Unlock()
-
-	c.endpoints = append(c.endpoints, e)
-}
-
-func (c *Container) removeEndpoint(e *Endpoint) {
-	c.Lock()
-	defer c.Unlock()
-
-	c.endpoints = removeEndpointHelper(e, c.endpoints)
-}
-
-func (c *Container) Refresh(ctx context.Context) error {
-	c.Lock()
-	defer c.Unlock()
-
-	// this will "refresh" the container executor config that contains
-	// the current ip addresses
-	h := exec.GetContainer(ctx, c.ID())
-	if h == nil {
-		return fmt.Errorf("could not find container %s", c.ID())
-	}
-	defer h.Close()
-
-	for _, e := range c.endpoints {
-		if err := e.refresh(h); err != nil {
-			log.Warnf("could not refresh endpoint for container %s: %s", h.ExecConfig.ID, err)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context.go
deleted file mode 100644
index 77784ea8ea..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context.go
+++ /dev/null
@@ -1,1386 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"context"
-	"fmt"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/go-connections/nat"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/spec"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-const (
-	DefaultBridgeName = "bridge"
-)
-
-// Context denotes a networking context that represents a set of scopes, endpoints,
-// and containers. Each context has its own separate IPAM.
-type Context struct {
-	sync.Mutex
-
-	config *Configuration
-
-	defaultBridgePool *AddressSpace
-	defaultBridgeMask net.IPMask
-
-	scopes       map[string]*Scope
-	containers   map[string]*Container
-	aliases      map[string][]*Container
-	defaultScope *Scope
-
-	kv kvstore.KeyValueStore
-}
-
-type AddContainerOptions struct {
-	Scope   string
-	IP      net.IP
-	Aliases []string
-	Ports   []string
-}
-
-func NewContext(config *Configuration, kv kvstore.KeyValueStore) (*Context, error) {
-	defer trace.End(trace.Begin(""))
-
-	if config == nil {
-		return nil, fmt.Errorf("missing config")
-	}
-
-	bridgeRange := config.BridgeIPRange
-	if bridgeRange == nil || len(bridgeRange.IP) == 0 || bridgeRange.IP.IsUnspecified() {
-		var err error
-		_, bridgeRange, err = net.ParseCIDR(constants.DefaultBridgeRange)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	bridgeWidth := config.BridgeNetworkWidth
-	if bridgeWidth == nil || len(*bridgeWidth) == 0 {
-		w := net.CIDRMask(16, 32)
-		bridgeWidth = &w
-	}
-
-	pones, pbits := bridgeRange.Mask.Size()
-	mones, mbits := bridgeWidth.Size()
-	if pbits != mbits || mones < pones {
-		return nil, fmt.Errorf("bridge mask is not compatible with bridge pool mask")
-	}
-
-	ctx := &Context{
-		config:            config,
-		defaultBridgeMask: *bridgeWidth,
-		defaultBridgePool: NewAddressSpaceFromNetwork(bridgeRange),
-		scopes:            make(map[string]*Scope),
-		containers:        make(map[string]*Container),
-		aliases:           make(map[string][]*Container),
-		kv:                kv,
-	}
-
-	n := ctx.config.ContainerNetworks[ctx.config.BridgeNetwork]
-	if n == nil {
-		return nil, fmt.Errorf("default bridge network %s not present in config", ctx.config.BridgeNetwork)
-	}
-
-	scopeData := &ScopeData{
-		ScopeType: n.Type,
-		Name:      n.Name,
-	}
-	s, err := ctx.newScope(scopeData)
-	if err != nil {
-		return nil, err
-	}
-	s.builtin = true
-	ctx.defaultScope = s
-
-	// add any bridge/external networks
-	for nn, n := range ctx.config.ContainerNetworks {
-		if nn == ctx.config.BridgeNetwork {
-			continue // already added above
-		}
-
-		pools := make([]string, len(n.Pools))
-		for i, p := range n.Pools {
-			pools[i] = p.String()
-		}
-
-		subnet := net.IPNet{IP: n.Gateway.IP.Mask(n.Gateway.Mask), Mask: n.Gateway.Mask}
-
-		scopeData = &ScopeData{
-			ScopeType:  n.Type,
-			Name:       nn,
-			Subnet:     &subnet,
-			Gateway:    n.Gateway.IP,
-			DNS:        n.Nameservers,
-			TrustLevel: n.TrustLevel,
-			Pools:      pools,
-		}
-
-		s, err := ctx.newScope(scopeData)
-		if err != nil {
-			return nil, err
-		}
-
-		s.builtin = true
-	}
-
-	// load saved scopes in the kv store
-	if kv != nil {
-		values, err := kv.List(`context\.scopes\..+`)
-		if err != nil && err != kvstore.ErrKeyNotFound {
-			log.Warnf("error listing scopes from key value store: %s", err)
-		}
-
-		for k, v := range values {
-			s := newScope(uid.NilUID, "", nil, &ScopeData{})
-			if err := s.UnmarshalJSON(v); err != nil {
-				log.Warnf("error loading scope data from key %s, skipping: %s", k, err)
-				continue
-			}
-
-			var nn string
-			switch s.Type() {
-			case constants.BridgeScopeType:
-				nn = "bridge"
-			case constants.ExternalScopeType:
-				nn = s.name
-			}
-
-			pg := config.PortGroups[nn]
-			if pg == nil {
-				log.Warnf("skipping adding scope %s: port group %s not found", s.name, nn)
-				continue
-			}
-
-			s.network = pg
-
-			if err := ctx.addScope(s); err != nil {
-				log.Warnf("skipping adding scope %s: %s", s.name, err)
-				continue
-			}
-
-			if s.Type() == constants.BridgeScopeType {
-				if err = ctx.addGatewayAddr(s); err != nil {
-					log.Warnf("could not add gateway addr to bridge interface for scope %s", s.Name())
-				}
-			}
-		}
-	}
-
-	return ctx, nil
-}
-
-func reserveGateway(gateway net.IP, subnet *net.IPNet, spaces []*AddressSpace) (net.IP, error) {
-	defer trace.End(trace.Begin(""))
-	if ip.IsUnspecifiedSubnet(subnet) {
-		return nil, fmt.Errorf("cannot reserve gateway for nil subnet")
-	}
-
-	if !ip.IsUnspecifiedIP(gateway) {
-		// verify gateway is routable address
-		if !ip.IsRoutableIP(gateway, subnet) {
-			return nil, fmt.Errorf("gateway address %s is not routable on network %s", gateway, subnet)
-		}
-
-		// optionally reserve it in one of the pools
-		for _, p := range spaces {
-			if err := p.ReserveIP4(gateway); err == nil {
-				break
-			}
-		}
-
-		return gateway, nil
-	}
-
-	// gateway is not specified, pick one from the available pools
-	if len(spaces) > 0 {
-		var err error
-		if gateway, err = spaces[0].ReserveNextIP4(); err != nil {
-			return nil, err
-		}
-
-		if !ip.IsRoutableIP(gateway, subnet) {
-			return nil, fmt.Errorf("gateway address %s is not routable on network %s", gateway, subnet)
-		}
-
-		return gateway, nil
-	}
-
-	return nil, fmt.Errorf("could not reserve gateway address for network %s", subnet)
-}
-
-func (c *Context) addScope(s *Scope) error {
-	defer trace.End(trace.Begin(""))
-
-	if _, ok := c.scopes[s.name]; ok {
-		return DuplicateResourceError{}
-	}
-
-	var err error
-	var defaultPool bool
-	var allZeros, allOnes net.IP
-	var space *AddressSpace
-	spaces := s.spaces
-	subnet := s.subnet
-	gateway := s.gateway
-
-	// cleanup
-	defer func() {
-		if err == nil || space == nil || !defaultPool {
-			return
-		}
-
-		for _, p := range spaces {
-			// release DNS IPs
-			for _, d := range s.dns {
-				p.ReleaseIP4(d)
-			}
-
-			// release gateway
-			if !ip.IsUnspecifiedIP(gateway) {
-				p.ReleaseIP4(gateway)
-			}
-
-			// release all-ones and all-zeros addresses
-			if !ip.IsUnspecifiedIP(allZeros) {
-				p.ReleaseIP4(allZeros)
-			}
-			if !ip.IsUnspecifiedIP(allOnes) {
-				p.ReleaseIP4(allOnes)
-			}
-		}
-
-		c.defaultBridgePool.ReleaseIP4Range(space)
-	}()
-
-	// subnet may not be specified, e.g. for "external" networks
-	if !ip.IsUnspecifiedSubnet(subnet) {
-		// allocate the subnet
-		space, defaultPool, err = c.reserveSubnet(subnet)
-		if err != nil {
-			return err
-		}
-
-		subnet = space.Network
-
-		spaces, err = reservePools(space, spaces)
-		if err != nil {
-			return err
-		}
-
-		// reserve all-ones and all-zeros addresses, which are not routable and so
-		// should not be handed out
-		allOnes = ip.AllOnesAddr(subnet)
-		allZeros = ip.AllZerosAddr(subnet)
-		for _, p := range spaces {
-			p.ReserveIP4(allOnes)
-			p.ReserveIP4(allZeros)
-
-			// reserve DNS IPs
-			for _, d := range s.dns {
-				if d.Equal(gateway) {
-					continue // gateway will be reserved later
-				}
-
-				p.ReserveIP4(d)
-			}
-		}
-
-		if gateway, err = reserveGateway(gateway, subnet, spaces); err != nil {
-			return err
-		}
-
-		s.gateway = gateway
-		s.spaces = spaces
-		s.subnet = subnet
-	}
-
-	c.scopes[s.name] = s
-
-	return nil
-}
-
-func (c *Context) newScopeCommon(id uid.UID, scopeType string, network object.NetworkReference, scopeData *ScopeData) (*Scope, error) {
-	defer trace.End(trace.Begin(""))
-
-	newScope := newScope(id, scopeType, network, scopeData)
-	newScope.spaces = make([]*AddressSpace, len(scopeData.Pools))
-	for i, p := range scopeData.Pools {
-		r := ip.ParseRange(p)
-		if r == nil {
-			return nil, fmt.Errorf("invalid pool %s specified for scope %s", p, scopeData.Name)
-		}
-
-		newScope.spaces[i] = NewAddressSpaceFromRange(r.FirstIP, r.LastIP)
-	}
-
-	for k, v := range scopeData.Annotations {
-		newScope.annotations[k] = v
-	}
-
-	if err := c.addScope(newScope); err != nil {
-		return nil, err
-	}
-
-	return newScope, nil
-}
-
-func (c *Context) addGatewayAddr(s *Scope) error {
-	if err := c.config.BridgeLink.AddrAdd(net.IPNet{IP: s.Gateway(), Mask: s.Subnet().Mask}); err != nil {
-		if errno, ok := err.(syscall.Errno); !ok || errno != syscall.EEXIST {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (c *Context) newBridgeScope(id uid.UID, scopeData *ScopeData) (newScope *Scope, err error) {
-	defer trace.End(trace.Begin(""))
-	bnPG, ok := c.config.PortGroups[c.config.BridgeNetwork]
-	if !ok || bnPG == nil {
-		return nil, fmt.Errorf("bridge network not set")
-	}
-
-	if ip.IsUnspecifiedSubnet(scopeData.Subnet) {
-		// get the next available subnet from the default bridge pool
-		var err error
-		scopeData.Subnet, err = c.defaultBridgePool.NextIP4Net(c.defaultBridgeMask)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	s, err := c.newScopeCommon(id, constants.BridgeScopeType, bnPG, scopeData)
-	if err != nil {
-		return nil, err
-	}
-
-	// add the gateway address to the bridge interface
-	if err = c.addGatewayAddr(s); err != nil {
-		log.Warnf("failed to add gateway address %s to bridge interface: %s", s.Gateway(), err)
-	}
-
-	return s, nil
-}
-
-func (c *Context) newExternalScope(id uid.UID, scopeData *ScopeData) (*Scope, error) {
-	defer trace.End(trace.Begin(""))
-
-	// ipam cannot be specified without gateway and subnet
-	if len(scopeData.Pools) > 0 {
-		if ip.IsUnspecifiedSubnet(scopeData.Subnet) || scopeData.Gateway.IsUnspecified() {
-			return nil, fmt.Errorf("ipam cannot be specified without gateway and subnet for external network")
-		}
-	}
-
-	if !ip.IsUnspecifiedSubnet(scopeData.Subnet) {
-		// cannot overlap with the default bridge pool
-		if c.defaultBridgePool.Network.Contains(scopeData.Subnet.IP) ||
-			c.defaultBridgePool.Network.Contains(highestIP4(scopeData.Subnet)) {
-			return nil, fmt.Errorf("external network cannot overlap with default bridge network")
-		}
-	}
-
-	pg := c.config.PortGroups[scopeData.Name]
-	if pg == nil {
-		return nil, fmt.Errorf("no network info for external scope %s", scopeData.Name)
-	}
-
-	return c.newScopeCommon(id, constants.ExternalScopeType, pg, scopeData)
-}
-
-func (c *Context) reserveSubnet(subnet *net.IPNet) (*AddressSpace, bool, error) {
-	defer trace.End(trace.Begin(""))
-	err := c.checkNetOverlap(subnet)
-	if err != nil {
-		return nil, false, err
-	}
-
-	// reserve from the default pool first
-	space, err := c.defaultBridgePool.ReserveIP4Net(subnet)
-	if err == nil {
-		return space, true, nil
-	}
-
-	space = NewAddressSpaceFromNetwork(subnet)
-	return space, false, nil
-}
-
-func (c *Context) checkNetOverlap(subnet *net.IPNet) error {
-	// check if the requested subnet is available
-	highestIP := highestIP4(subnet)
-	for _, scope := range c.scopes {
-		if scope.subnet.Contains(subnet.IP) || scope.subnet.Contains(highestIP) {
-			return fmt.Errorf("subnet %s overlaps with scope %s subnet %s", subnet, scope.Name(), scope.Subnet())
-		}
-	}
-
-	return nil
-}
-
-func reservePools(space *AddressSpace, pools []*AddressSpace) ([]*AddressSpace, error) {
-	defer trace.End(trace.Begin(""))
-	if len(pools) == 0 {
-		// pool not specified so use the entire space
-		return []*AddressSpace{space}, nil
-	}
-
-	var err error
-	subSpaces := make([]*AddressSpace, len(pools))
-	defer func() {
-		if err == nil {
-			return
-		}
-
-		for _, s := range subSpaces {
-			if s == nil {
-				continue
-			}
-			space.ReleaseIP4Range(s)
-
-		}
-	}()
-
-	for i, p := range pools {
-		var ss *AddressSpace
-		if p.Network != nil {
-			ss, err = space.ReserveIP4Net(p.Network)
-			if err != nil {
-				return nil, err
-			}
-
-			subSpaces[i] = ss
-			continue
-		}
-
-		ss, err = space.ReserveIP4Range(p.Pool.FirstIP, p.Pool.LastIP)
-		if err != nil {
-			return nil, err
-		}
-
-		subSpaces[i] = ss
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return subSpaces, nil
-}
-
-func scopeKey(sn string) string {
-	return fmt.Sprintf("context.scopes.%s", sn)
-}
-
-// ScopeData holds fields used to create a new scope
-type ScopeData struct {
-	ScopeType   string
-	Name        string
-	Subnet      *net.IPNet
-	Gateway     net.IP
-	DNS         []net.IP
-	TrustLevel  executor.TrustLevel
-	Pools       []string
-	Annotations map[string]string
-	Internal    bool
-}
-
-func (c *Context) NewScope(ctx context.Context, scopeData *ScopeData) (*Scope, error) {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	s, err := c.newScope(scopeData)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			c.deleteScope(s)
-		}
-	}()
-
-	// save the scope in the kv store
-	if c.kv != nil {
-		var d []byte
-		d, err = s.MarshalJSON()
-		if err != nil {
-			return nil, err
-		}
-
-		if err = c.kv.Put(ctx, scopeKey(s.Name()), d); err != nil {
-			return nil, err
-		}
-	}
-
-	return s, nil
-}
-
-func (c *Context) newScope(scopeData *ScopeData) (*Scope, error) {
-	// sanity checks
-	if scopeData.Name == "" {
-		return nil, fmt.Errorf("scope name must not be empty")
-	}
-
-	if scopeData.Gateway == nil {
-		scopeData.Gateway = net.IPv4(0, 0, 0, 0)
-	}
-
-	if _, ok := c.scopes[scopeData.Name]; ok {
-		return nil, DuplicateResourceError{resID: scopeData.Name}
-	}
-
-	var s *Scope
-	var err error
-	switch scopeData.ScopeType {
-	case constants.BridgeScopeType:
-		s, err = c.newBridgeScope(uid.New(), scopeData)
-
-	case constants.ExternalScopeType:
-		s, err = c.newExternalScope(uid.New(), scopeData)
-
-	default:
-		return nil, fmt.Errorf("scope type not supported")
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	return s, nil
-}
-
-func (c *Context) findScopes(idName *string) ([]*Scope, error) {
-	defer trace.End(trace.Begin(""))
-
-	if idName != nil && *idName != "" {
-		if *idName == "default" {
-			return []*Scope{c.DefaultScope()}, nil
-		}
-
-		// search by name
-		scope, ok := c.scopes[*idName]
-		if ok {
-			return []*Scope{scope}, nil
-		}
-
-		// search by id or partial id
-		var ss []*Scope
-		for _, s := range c.scopes {
-			if strings.HasPrefix(s.id.String(), *idName) {
-				ss = append(ss, s)
-			}
-		}
-
-		if len(ss) > 0 {
-			return ss, nil
-		}
-
-		return nil, ResourceNotFoundError{error: fmt.Errorf("scope %s not found", *idName)}
-	}
-
-	_scopes := make([]*Scope, len(c.scopes))
-	// list all scopes
-	i := 0
-	for _, scope := range c.scopes {
-		_scopes[i] = scope
-		i++
-	}
-
-	return _scopes, nil
-}
-
-func (c *Context) Scopes(ctx context.Context, idName *string) ([]*Scope, error) {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	scopes, err := c.findScopes(idName)
-	if err != nil {
-		return nil, err
-	}
-
-	// collate the containers to update
-	containers := make(map[uid.UID]*Container)
-	for _, s := range scopes {
-		if !s.isDynamic() {
-			continue
-		}
-
-		for _, c := range s.Containers() {
-			containers[c.ID()] = c
-		}
-	}
-
-	for _, c := range containers {
-		c.Refresh(ctx)
-	}
-
-	return scopes, nil
-}
-
-func (c *Context) DefaultScope() *Scope {
-	return c.defaultScope
-}
-
-func (c *Context) BindContainer(h *exec.Handle) ([]*Endpoint, error) {
-	defer trace.End(trace.Begin(""))
-	c.Lock()
-	defer c.Unlock()
-
-	return c.bindContainer(h)
-}
-
-func (c *Context) bindContainer(h *exec.Handle) ([]*Endpoint, error) {
-	con, err := c.container(h)
-	if con != nil {
-		return con.Endpoints(), nil // already bound
-	}
-
-	if _, ok := err.(ResourceNotFoundError); !ok {
-		return nil, err
-	}
-
-	con = &Container{
-		id:   uid.Parse(h.ExecConfig.ID),
-		name: h.ExecConfig.Name,
-	}
-
-	defaultMarked := false
-	aliases := make(map[string]*Container)
-	var endpoints []*Endpoint
-	for _, ne := range h.ExecConfig.Networks {
-		var s *Scope
-		s, ok := c.scopes[ne.Network.Name]
-		if !ok {
-			return nil, &ResourceNotFoundError{error: fmt.Errorf("network %s not found", ne.Network.Name)}
-		}
-
-		defer func() {
-			if err == nil {
-				return
-			}
-
-			s.RemoveContainer(con)
-		}()
-
-		var eip *net.IP
-		if ne.Static {
-			eip = &ne.IP.IP
-		} else if !ip.IsUnspecifiedIP(ne.Assigned.IP) {
-			// for VCH restart, we need to reserve
-			// the IP of the running container
-			//
-			// this may be a DHCP assigned IP, however, the
-			// addContainer call below will ignore reserving
-			// an IP if the scope is "dynamic"
-			eip = &ne.Assigned.IP
-		}
-
-		e := newEndpoint(con, s, eip, nil)
-		e.static = ne.Static
-		if err = s.AddContainer(con, e); err != nil {
-			return nil, err
-		}
-
-		ports, _, err := nat.ParsePortSpecs(ne.Ports)
-		if err != nil {
-			return nil, err
-		}
-		for p := range ports {
-			var port Port
-			if port, err = ParsePort(string(p)); err != nil {
-				return nil, err
-			}
-
-			if err = e.addPort(port); err != nil {
-				return nil, err
-			}
-		}
-
-		if !ip.IsUnspecifiedIP(e.IP()) {
-			ne.IP = &net.IPNet{
-				IP:   e.IP(),
-				Mask: e.Scope().Subnet().Mask,
-			}
-		}
-		ne.Network.Gateway = net.IPNet{IP: e.Gateway(), Mask: e.Subnet().Mask}
-		ne.Network.Nameservers = make([]net.IP, len(s.dns))
-		ne.Internal = s.Internal()
-		copy(ne.Network.Nameservers, s.dns)
-
-		// mark the external network as default
-		scope := e.Scope()
-		if !defaultMarked && scope.Type() == constants.ExternalScopeType {
-			defaultMarked = true
-			ne.Network.Default = true
-		}
-
-		if scope.Internal() {
-			ne.Network.Default = false
-		}
-
-		// dns lookup aliases
-		aliases[fmt.Sprintf("%s:%s", s.Name(), con.name)] = con
-		aliases[fmt.Sprintf("%s:%s", s.Name(), con.id.Truncate())] = con
-
-		// container specific aliases
-		for _, a := range ne.Network.Aliases {
-			log.Debugf("parsing alias %s", a)
-			l := strings.Split(a, ":")
-			if len(l) != 2 {
-				err = fmt.Errorf("Parsing network alias %s failed", a)
-				return nil, err
-			}
-
-			who, what := l[0], l[1]
-			if who == "" {
-				who = con.name
-			}
-			if a, exists := e.addAlias(who, what); a != badAlias && !exists {
-				whoc := con
-				// if the alias is not for this container, then
-				// find it in the container collection
-				if who != con.name {
-					whoc = c.containers[who]
-				}
-
-				// whoc may be nil here, which means that the aliased
-				// container is not bound yet; this is OK, and will be
-				// fixed up when "who" is bound
-				if whoc != nil {
-					aliases[a.scopedName()] = whoc
-				} else {
-					log.Debugf("skipping alias %s since %s is not bound yet", a, who)
-				}
-			}
-		}
-
-		// fix up the aliases to this container
-		// from other containers
-		for _, e := range s.Endpoints() {
-			if e.Container() == con {
-				continue
-			}
-
-			log.Debugf("getting aliases for %s from %s", con.name, e.Container().Name())
-			for _, a := range e.getAliases(con.name) {
-				aliases[a.scopedName()] = con
-			}
-		}
-
-		endpoints = append(endpoints, e)
-	}
-
-	// FIXME: if there was no external network to mark as default,
-	// then just pick the first network to mark as default
-	if !defaultMarked {
-		defaultMarked = true
-		for _, ne := range h.ExecConfig.Networks {
-
-			if s, ok := c.scopes[ne.Network.Name]; ok && s.Internal() {
-				log.Debugf("not setting internal network %s as default", ne.Network.Name)
-				continue
-			}
-
-			ne.Network.Default = true
-			break
-		}
-	}
-
-	// long id
-	c.containers[con.id.String()] = con
-	// short id
-	c.containers[con.id.Truncate().String()] = con
-	// name
-	c.containers[con.name] = con
-	// aliases
-	for k, v := range aliases {
-		log.Debugf("adding alias %s -> %s", k, v.Name())
-		cons := c.aliases[k]
-		found := false
-		for _, c := range cons {
-			if v == c {
-				found = true
-				break
-			}
-		}
-		if !found {
-			c.aliases[k] = append(cons, v)
-		}
-	}
-
-	return endpoints, nil
-}
-
-func (c *Context) container(h *exec.Handle) (*Container, error) {
-	defer trace.End(trace.Begin(""))
-	id := uid.Parse(h.ExecConfig.ID)
-	if id == uid.NilUID {
-		return nil, fmt.Errorf("invalid container id %s", h.ExecConfig.ID)
-	}
-
-	if con, ok := c.containers[id.String()]; ok {
-		return con, nil
-	}
-
-	return nil, ResourceNotFoundError{error: fmt.Errorf("container %s not found", id.String())}
-}
-
-func (c *Context) populateAliases(con *Container, s *Scope, e *Endpoint) []string {
-	var aliases []string
-
-	// aliases to remove
-	// name for dns lookup
-	aliases = append(aliases, fmt.Sprintf("%s:%s", s.Name(), con.name))
-	aliases = append(aliases, fmt.Sprintf("%s:%s", s.Name(), con.id.Truncate()))
-	for _, as := range e.aliases {
-		for _, a := range as {
-			aliases = append(aliases, a.scopedName())
-		}
-	}
-
-	// aliases from other containers
-	for _, e := range s.Endpoints() {
-		if e.Container() == con {
-			continue
-		}
-
-		for _, a := range e.getAliases(con.name) {
-			aliases = append(aliases, a.scopedName())
-		}
-	}
-	return aliases
-}
-
-func (c *Context) removeAliases(aliases []string, con *Container) {
-	// remove aliases
-	for _, a := range aliases {
-		as := c.aliases[a]
-		for i := range as {
-			if as[i] == con {
-				as = append(as[:i], as[i+1:]...)
-				if len(as) == 0 {
-					delete(c.aliases, a)
-				} else {
-					c.aliases[a] = as
-				}
-
-				break
-			}
-		}
-	}
-	// long id
-	delete(c.containers, con.ID().String())
-	// short id
-	delete(c.containers, con.ID().Truncate().String())
-	// name
-	delete(c.containers, con.Name())
-}
-
-// RemoveIDFromScopes removes the container from the scopes but doesn't touch the runtime state
-// Because of that it requires an id
-func (c *Context) RemoveIDFromScopes(id string) ([]*Endpoint, error) {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	uuid := uid.Parse(id)
-	if uuid == uid.NilUID {
-		return nil, fmt.Errorf("invalid container id %s", id)
-	}
-
-	con, ok := c.containers[uuid.String()]
-	if !ok || con == nil {
-		return nil, nil // not bound
-	}
-
-	// aliases to remove
-	var aliases []string
-	var endpoints []*Endpoint
-	for _, ne := range con.endpoints {
-		s := ne.scope
-
-		// save the endpoint info
-		e := con.Endpoint(s).copy()
-
-		if err := s.RemoveContainer(con); err != nil {
-			return nil, err
-		}
-
-		aliases = append(aliases, c.populateAliases(con, s, e)...)
-		endpoints = append(endpoints, e)
-	}
-
-	c.removeAliases(aliases, con)
-
-	return endpoints, nil
-}
-
-// UnbindContainer removes the container from the scopes and clears out the assigned IP
-// Because of that, it requires a handle
-func (c *Context) UnbindContainer(h *exec.Handle) ([]*Endpoint, error) {
-	defer trace.End(trace.Begin(""))
-	c.Lock()
-	defer c.Unlock()
-
-	con, err := c.container(h)
-	if err != nil {
-		if _, ok := err.(ResourceNotFoundError); ok {
-			return nil, nil // not bound
-		}
-
-		return nil, err
-	}
-
-	// aliases to remove
-	var aliases []string
-	var endpoints []*Endpoint
-	for _, ne := range h.ExecConfig.Networks {
-		s, ok := c.scopes[ne.Network.Name]
-		if !ok {
-			return nil, &ResourceNotFoundError{}
-		}
-
-		// save the endpoint info
-		e := con.Endpoint(s).copy()
-
-		if err = s.RemoveContainer(con); err != nil {
-			return nil, err
-		}
-
-		// clear out assigned ip
-		ne.Assigned.IP = net.IPv4zero
-
-		aliases = append(aliases, c.populateAliases(con, s, e)...)
-		endpoints = append(endpoints, e)
-	}
-
-	c.removeAliases(aliases, con)
-
-	return endpoints, nil
-}
-
-var addEthernetCard = func(h *exec.Handle, s *Scope) (types.BaseVirtualDevice, error) {
-	var devices object.VirtualDeviceList
-	var d types.BaseVirtualDevice
-	var dc types.BaseVirtualDeviceConfigSpec
-
-	ctx := context.Background()
-	dcs, err := h.Spec.FindNICs(ctx, s.Network())
-	if err != nil {
-		return nil, err
-	}
-
-	for _, ds := range dcs {
-		if ds.GetVirtualDeviceConfigSpec().Operation == types.VirtualDeviceConfigSpecOperationAdd {
-			d = ds.GetVirtualDeviceConfigSpec().Device
-			dc = ds
-			break
-		}
-	}
-
-	if d == nil {
-		backing, err := s.Network().EthernetCardBackingInfo(ctx)
-		if err != nil {
-			return nil, err
-		}
-
-		if d, err = devices.CreateEthernetCard("vmxnet3", backing); err != nil {
-			return nil, err
-		}
-
-		d.GetVirtualDevice().DeviceInfo = &types.Description{
-			Label: s.name,
-		}
-	}
-
-	if spec.VirtualDeviceSlotNumber(d) == constants.NilSlot {
-		slots := make(map[int32]bool)
-		for _, e := range h.ExecConfig.Networks {
-			if e.Common.ID != "" {
-				slot, err := strconv.Atoi(e.Common.ID)
-				if err == nil {
-					slots[int32(slot)] = true
-				}
-			}
-		}
-
-		h.Spec.AssignSlotNumber(d, slots)
-	}
-
-	if dc == nil {
-		devices = append(devices, d)
-		deviceSpecs, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-		if err != nil {
-			return nil, err
-		}
-
-		h.Spec.DeviceChange = append(h.Spec.DeviceChange, deviceSpecs...)
-	}
-
-	return d, nil
-}
-
-func (c *Context) resolveScope(scope string) (*Scope, error) {
-	scopes, err := c.findScopes(&scope)
-	if err != nil || len(scopes) != 1 {
-		return nil, err
-	}
-
-	return scopes[0], nil
-}
-
-// AddContainer add a container to the specified scope, optionally specifying an ip address
-// for the container in the scope
-func (c *Context) AddContainer(h *exec.Handle, options *AddContainerOptions) error {
-	defer trace.End(trace.Begin(""))
-	c.Lock()
-	defer c.Unlock()
-
-	if h == nil {
-		return fmt.Errorf("handle is required")
-	}
-
-	var err error
-	s, err := c.resolveScope(options.Scope)
-	if err != nil {
-		return err
-	}
-
-	if h.ExecConfig.Networks != nil {
-		if _, ok := h.ExecConfig.Networks[s.Name()]; ok {
-			// already part of this scope
-			return nil
-		}
-
-		// check if container is already part of an "external" scope;
-		// only one "external" scope per container is allowed
-		if s.Type() == constants.ExternalScopeType {
-			for name := range h.ExecConfig.Networks {
-				// #nosec: Errors unhandled.
-				sc, _ := c.resolveScope(name)
-				if sc.Type() == constants.ExternalScopeType {
-					return fmt.Errorf("container can only be added to at most one mapped network")
-				}
-			}
-		}
-	}
-
-	if s.Type() == constants.ExternalScopeType {
-		// Check that ports are only opened on published network firewall configuration.
-		// Redirects are allow for all network types other than Closed and Outbound
-		if len(options.Ports) > 0 {
-			if s.TrustLevel() == executor.Closed || s.TrustLevel() == executor.Outbound {
-				err = fmt.Errorf("ports cannot be published via container network %s (firewall configured as either \"closed\" or \"outbound\")", s.Name())
-				log.Errorln(err)
-				return err
-			}
-
-			for _, p := range options.Ports {
-				if strings.Contains(p, ":") {
-					if strings.Contains(p, "-") {
-						err = fmt.Errorf("ports published on external networks cannot include both a redirect and a range (%s)", p)
-						log.Errorln(err)
-						return err
-					}
-				} else if s.TrustLevel() == executor.Peers {
-					err = fmt.Errorf("ports published via container network %s must specify a mapping (firewall configured for \"peers\" - no need for publishing unless redirecting)", s.Name())
-					log.Errorln(err)
-					return err
-				}
-			}
-		}
-	}
-
-	// figure out if we need to add a new NIC
-	// if there is already a NIC connected to a
-	// bridge network and we are adding the container
-	// to a bridge network, we just reuse that
-	// NIC
-	var pciSlot int32
-	if s.Type() == constants.BridgeScopeType {
-		for _, ne := range h.ExecConfig.Networks {
-			sc, err := c.resolveScope(ne.Network.Name)
-			if err != nil {
-				return err
-			}
-
-			if sc.Type() != constants.BridgeScopeType {
-				continue
-			}
-
-			if ne.ID != "" {
-				pciSlot = atoiOrZero(ne.ID)
-				if pciSlot != 0 {
-					break
-				}
-			}
-		}
-	}
-
-	if pciSlot == 0 {
-		d, err := addEthernetCard(h, s)
-		if err != nil {
-			return err
-		}
-
-		pciSlot = spec.VirtualDeviceSlotNumber(d)
-	}
-
-	if h.ExecConfig.Networks == nil {
-		h.ExecConfig.Networks = make(map[string]*executor.NetworkEndpoint)
-	}
-
-	ne := &executor.NetworkEndpoint{
-		Common: executor.Common{
-			ID: strconv.Itoa(int(pciSlot)),
-		},
-		Network: executor.ContainerNetwork{
-			Common: executor.Common{
-				Name: s.Name(),
-			},
-			Aliases:    options.Aliases,
-			Type:       s.Type(),
-			TrustLevel: s.TrustLevel(),
-		},
-		Ports: options.Ports,
-	}
-	pools := s.Pools()
-	ne.Network.Pools = make([]ip.Range, len(pools))
-	for i, p := range pools {
-		ne.Network.Pools[i] = *p
-	}
-
-	ne.Static = false
-	if len(options.IP) > 0 && !ip.IsUnspecifiedIP(options.IP) {
-		ne.Static = true
-		ne.IP = &net.IPNet{
-			IP:   options.IP,
-			Mask: s.Subnet().Mask,
-		}
-	}
-
-	h.ExecConfig.Networks[s.Name()] = ne
-	return nil
-}
-
-func (c *Context) RemoveContainer(h *exec.Handle, scope string) error {
-	defer trace.End(trace.Begin(""))
-	c.Lock()
-	defer c.Unlock()
-
-	if h == nil {
-		return fmt.Errorf("handle is required")
-	}
-
-	// #nosec: Errors unhandled.
-	if con, _ := c.container(h); con != nil {
-		return fmt.Errorf("container is bound")
-	}
-
-	var err error
-	s, err := c.resolveScope(scope)
-	if err != nil {
-		return err
-	}
-
-	var ne *executor.NetworkEndpoint
-	ne, ok := h.ExecConfig.Networks[s.Name()]
-	if !ok {
-		return fmt.Errorf("container %s not part of network %s", h.ExecConfig.ID, s.Name())
-	}
-
-	// figure out if any other networks are using the NIC
-	removeNIC := true
-	for _, ne2 := range h.ExecConfig.Networks {
-		if ne2 == ne {
-			continue
-		}
-		if ne2.ID == ne.ID {
-			removeNIC = false
-			break
-		}
-	}
-
-	if removeNIC {
-		var devices object.VirtualDeviceList
-		backing, err := s.network.EthernetCardBackingInfo(context.Background())
-		if err != nil {
-			return err
-		}
-
-		d, err := devices.CreateEthernetCard("vmxnet3", backing)
-		if err != nil {
-			return err
-		}
-
-		devices = append(devices, d)
-		spec, err := devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationRemove)
-		if err != nil {
-			return err
-		}
-		h.Spec.DeviceChange = append(h.Spec.DeviceChange, spec...)
-	}
-
-	delete(h.ExecConfig.Networks, s.Name())
-
-	return nil
-}
-
-func (c *Context) Container(key string) *Container {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	log.Debugf("container lookup for %s", key)
-	if con, ok := c.containers[key]; ok {
-		return con
-	}
-
-	return nil
-}
-
-func (c *Context) ContainersByAlias(alias string) []*Container {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	if cons, ok := c.aliases[alias]; ok {
-		log.Debugf("cons=%#v", cons)
-		return cons
-	}
-
-	return nil
-}
-
-func (c *Context) ContainerByAddr(addr net.IP) *Endpoint {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	for _, s := range c.scopes {
-		if e := s.ContainerByAddr(addr); e != nil {
-			return e
-		}
-	}
-
-	return nil
-}
-
-func (c *Context) DeleteScope(ctx context.Context, name string) error {
-	defer trace.End(trace.Begin(""))
-
-	c.Lock()
-	defer c.Unlock()
-
-	s, err := c.resolveScope(name)
-	if err != nil {
-		return err
-	}
-
-	if s == nil {
-		return ResourceNotFoundError{}
-	}
-
-	if s.builtin {
-		return fmt.Errorf("cannot remove builtin scope")
-	}
-
-	if len(s.Endpoints()) != 0 {
-		return fmt.Errorf("%s has active endpoints", s.Name())
-	}
-
-	var allZeros, allOnes net.IP
-	if !ip.IsUnspecifiedSubnet(s.subnet) {
-		allZeros = ip.AllZerosAddr(s.subnet)
-		allOnes = ip.AllOnesAddr(s.subnet)
-	}
-
-	for _, p := range s.spaces {
-		for _, i := range append(s.dns, s.gateway, allZeros, allOnes) {
-			if !ip.IsUnspecifiedIP(i) {
-				p.ReleaseIP4(i)
-			}
-		}
-
-		if p.Parent != nil {
-			p.Parent.ReleaseIP4Range(p)
-		}
-	}
-
-	var parentSpace *AddressSpace
-	if len(s.spaces) == 1 {
-		parentSpace = s.spaces[0]
-	} else if len(s.spaces) > 1 {
-		parentSpace = s.spaces[0].Parent
-	}
-
-	if parentSpace != nil {
-		c.defaultBridgePool.ReleaseIP4Range(parentSpace)
-	}
-
-	if c.kv != nil {
-		if err = c.kv.Delete(ctx, scopeKey(s.Name())); err != nil && err != kvstore.ErrKeyNotFound {
-			return err
-		}
-	}
-
-	c.deleteScope(s)
-	return nil
-}
-
-func (c *Context) deleteScope(s *Scope) {
-	if s.Type() == constants.BridgeScopeType {
-		// remove gateway ip from bridge interface
-		addr := net.IPNet{IP: s.Gateway(), Mask: s.Subnet().Mask}
-		if err := c.config.BridgeLink.AddrDel(addr); err != nil {
-			if errno, ok := err.(syscall.Errno); !ok || errno != syscall.EADDRNOTAVAIL {
-				log.Warnf("could not remove gateway address %s for scope %s on link %s: %s", addr, s.Name(), c.config.BridgeLink.Attrs().Name, err)
-			}
-		}
-	}
-
-	delete(c.scopes, s.Name())
-}
-
-func atoiOrZero(a string) int32 {
-	// #nosec: Errors unhandled.
-	i, _ := strconv.Atoi(a)
-	return int32(i)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context_test.go
deleted file mode 100644
index 225b3cb03d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/context_test.go
+++ /dev/null
@@ -1,1464 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"math"
-	"math/rand"
-	"net"
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/spec"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var testBridgeNetwork, testExternalNetwork object.NetworkReference
-
-type params struct {
-	scopeType, name string
-	subnet          *net.IPNet
-	gateway         net.IP
-	dns             []net.IP
-	pools           []string
-}
-
-var validScopeTests = []struct {
-	in  params
-	out *params
-	err error
-}{
-	// bridge scopes
-
-	// default bridge pool, only name specified
-	{params{"bridge", "bar1", nil, net.IPv4(0, 0, 0, 0), nil, nil},
-		&params{"bridge", "bar1", &net.IPNet{IP: net.IPv4(172, 17, 0, 0), Mask: net.CIDRMask(16, 32)}, net.ParseIP("172.17.0.1"), nil, nil},
-		nil},
-	// default bridge pool with gateway specified
-	{params{"bridge", "bar2", nil, net.IPv4(172, 18, 0, 2), nil, nil},
-		&params{"bridge", "bar2", &net.IPNet{IP: net.IPv4(172, 18, 0, 0), Mask: net.CIDRMask(16, 32)}, net.ParseIP("172.18.0.2"), nil, nil},
-		nil},
-	// not from default bridge pool
-	{params{"bridge", "bar3", &net.IPNet{IP: net.ParseIP("10.10.0.0"), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, nil},
-		&params{"bridge", "bar3", &net.IPNet{IP: net.ParseIP("10.10.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("10.10.0.1"), nil, nil},
-		nil},
-	// not from default bridge pool, dns specified
-	{params{"bridge", "bar4", &net.IPNet{IP: net.ParseIP("10.11.0.0"), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), []net.IP{net.ParseIP("10.10.1.1")}, nil},
-		&params{"bridge", "bar4", &net.IPNet{IP: net.ParseIP("10.11.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("10.11.0.1"), []net.IP{net.ParseIP("10.10.1.1")}, nil},
-		nil},
-	// not from default pool, dns and ipam specified
-	{params{"bridge", "bar5", &net.IPNet{IP: net.ParseIP("10.12.0.0"), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), []net.IP{net.ParseIP("10.10.1.1")}, []string{"10.12.1.0/24", "10.12.2.0/28"}},
-		&params{"bridge", "bar5", &net.IPNet{IP: net.ParseIP("10.12.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("10.12.1.0"), []net.IP{net.ParseIP("10.10.1.1")}, nil},
-		nil},
-	// not from default pool, dns, gateway, and ipam specified
-	{params{"bridge", "bar51", &net.IPNet{IP: net.ParseIP("10.33.0.0"), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 33, 0, 1), []net.IP{net.ParseIP("10.10.1.1")}, []string{"10.33.0.0/16"}},
-		&params{"bridge", "bar51", &net.IPNet{IP: net.ParseIP("10.33.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("10.33.0.1"), []net.IP{net.ParseIP("10.10.1.1")}, nil},
-		nil},
-	// from default pool, subnet specified
-	{params{"bridge", "bar6", &net.IPNet{IP: net.IPv4(172, 19, 0, 0), Mask: net.CIDRMask(16, 32)}, nil, nil, nil},
-		&params{"bridge", "bar6", &net.IPNet{IP: net.IPv4(172, 19, 0, 0), Mask: net.CIDRMask(16, 32)}, net.ParseIP("172.19.0.1"), nil, nil},
-		nil},
-}
-
-type mockLink struct{}
-
-func (l *mockLink) AddrAdd(_ net.IPNet) error {
-	return nil
-}
-
-func (l *mockLink) AddrDel(_ net.IPNet) error {
-	return nil
-}
-
-func (l *mockLink) Attrs() *LinkAttrs {
-	return &LinkAttrs{Name: "foo"}
-}
-
-type mockNetwork struct {
-	name string
-}
-
-func (n mockNetwork) Reference() types.ManagedObjectReference {
-	return types.ManagedObjectReference{Type: "mockNetwork", Value: n.name}
-}
-
-func (n mockNetwork) EthernetCardBackingInfo(ctx context.Context) (types.BaseVirtualDeviceBackingInfo, error) {
-	return &types.VirtualEthernetCardNetworkBackingInfo{
-		VirtualDeviceDeviceBackingInfo: types.VirtualDeviceDeviceBackingInfo{
-			DeviceName: n.name,
-		},
-	}, nil
-}
-
-func testConfig() *Configuration {
-	return &Configuration{
-		source:     extraconfig.MapSource(map[string]string{}),
-		sink:       extraconfig.MapSink(map[string]string{}),
-		BridgeLink: &mockLink{},
-		Network: config.Network{
-			BridgeNetwork: "bridge",
-			ContainerNetworks: map[string]*executor.ContainerNetwork{
-				"bridge": {
-					Common: executor.Common{
-						Name: "bridge",
-					},
-					Type: constants.BridgeScopeType,
-				},
-				"bar7": {
-					Common: executor.Common{
-						Name: "external",
-					},
-					Gateway:     net.IPNet{IP: net.ParseIP("10.13.0.1"), Mask: net.CIDRMask(16, 32)},
-					Nameservers: []net.IP{net.ParseIP("10.10.1.1")},
-					Pools:       []ip.Range{*ip.ParseRange("10.13.1.0-255"), *ip.ParseRange("10.13.2.0-10.13.2.15")},
-					Type:        constants.ExternalScopeType,
-				},
-				"bar71": {
-					Common: executor.Common{
-						Name: "external",
-					},
-					Gateway:     net.IPNet{IP: net.ParseIP("10.131.0.1"), Mask: net.CIDRMask(16, 32)},
-					Nameservers: []net.IP{net.ParseIP("10.131.0.1"), net.ParseIP("10.131.0.2")},
-					Pools:       []ip.Range{*ip.ParseRange("10.131.1.0/16")},
-					Type:        constants.ExternalScopeType,
-				},
-				"bar72": {
-					Common: executor.Common{
-						Name: "external",
-					},
-					Type: constants.ExternalScopeType,
-				},
-				"bar73": {
-					Common: executor.Common{
-						Name: "external",
-					},
-					Gateway: net.IPNet{IP: net.ParseIP("10.133.0.1"), Mask: net.CIDRMask(16, 32)},
-					Type:    constants.ExternalScopeType,
-				},
-			},
-		},
-		PortGroups: map[string]object.NetworkReference{
-			"bridge": testBridgeNetwork,
-			"bar7":   testExternalNetwork,
-			"bar71":  testExternalNetwork,
-			"bar72":  testExternalNetwork,
-			"bar73":  testExternalNetwork,
-		},
-	}
-}
-
-func TestMain(m *testing.M) {
-	testBridgeNetwork = &mockNetwork{name: "testBridge"}
-	testExternalNetwork = &mockNetwork{name: "testExternal"}
-
-	log.SetLevel(log.DebugLevel)
-
-	rc := m.Run()
-
-	os.Exit(rc)
-}
-
-func TestMapExternalNetworks(t *testing.T) {
-	conf := testConfig()
-	ctx, err := NewContext(conf, nil)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-	}
-
-	// check if external networks were loaded
-	for n, nn := range conf.ContainerNetworks {
-		scopes, err := ctx.findScopes(&n)
-		if err != nil || len(scopes) != 1 {
-			t.Fatalf("external network %s was not loaded", n)
-		}
-
-		s := scopes[0]
-		pools := s.Pools()
-		if !ip.IsUnspecifiedIP(nn.Gateway.IP) {
-			subnet := &net.IPNet{IP: nn.Gateway.IP.Mask(nn.Gateway.Mask), Mask: nn.Gateway.Mask}
-			if ip.IsUnspecifiedSubnet(s.Subnet()) || !s.Subnet().IP.Equal(subnet.IP) || !bytes.Equal(s.Subnet().Mask, subnet.Mask) {
-				t.Fatalf("external network %s was loaded with wrong subnet, got: %s, want: %s", n, s.Subnet(), subnet)
-			}
-
-			if ip.IsUnspecifiedIP(s.Gateway()) || !s.Gateway().Equal(nn.Gateway.IP) {
-				t.Fatalf("external network %s was loaded with wrong gateway, got: %s, want: %s", n, s.Gateway(), nn.Gateway.IP)
-			}
-
-			if len(nn.Pools) == 0 {
-				// only one pool corresponding to the subnet
-				if len(pools) != 1 || !pools[0].Equal(ip.ParseRange(subnet.String())) {
-					t.Fatalf("external network %s was loaded with wrong pool, got: %+v, want %+v", n, pools, []*net.IPNet{subnet})
-				}
-			}
-		}
-
-		for _, d := range nn.Nameservers {
-			found := false
-			for _, d2 := range s.DNS() {
-				if d2.Equal(d) {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				t.Fatalf("external network %s was loaded with wrong nameservers, got: %+v, want: %+v", n, s.DNS(), nn.Nameservers)
-			}
-		}
-
-		for _, p := range nn.Pools {
-			found := false
-			for _, p2 := range pools {
-				if p2.Equal(&p) {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				t.Fatalf("external network %s was loaded with wrong pools, got: %+v, want: %+v", n, s.Pools(), nn.Pools)
-			}
-		}
-	}
-}
-
-func TestContextNewScope(t *testing.T) {
-	kv := &kvstore.MockKeyValueStore{}
-	kv.On("List", mock.Anything).Return(nil, nil)
-	ctx, err := NewContext(testConfig(), kv)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-	}
-
-	kv.AssertNumberOfCalls(t, "List", 1)
-	kv.AssertCalled(t, "List", `context\.scopes\..+`)
-
-	var tests = []struct {
-		in  params
-		out *params
-		err error
-	}{
-		// empty name
-		{params{"bridge", "", nil, net.IPv4(0, 0, 0, 0), nil, nil}, nil, fmt.Errorf("")},
-		// unsupported network type
-		{params{"foo", "bar8", nil, net.IPv4(0, 0, 0, 0), nil, nil}, nil, fmt.Errorf("")},
-		// duplicate name
-		{params{"bridge", "bar6", nil, net.IPv4(0, 0, 0, 0), nil, nil}, nil, DuplicateResourceError{}},
-		// ip range already allocated
-		{params{"bridge", "bar9", &net.IPNet{IP: net.IPv4(172, 16, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, nil}, nil, fmt.Errorf("")},
-		// ipam out of range of network
-		{params{"bridge", "bar10", &net.IPNet{IP: net.IPv4(10, 14, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, []string{"10.14.1.0/24", "10.15.1.0/24"}}, nil, fmt.Errorf("")},
-		// gateway not on subnet
-		{params{"bridge", "bar101", &net.IPNet{IP: net.IPv4(10, 141, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 14, 0, 1), nil, nil}, nil, fmt.Errorf("")},
-		// gateway is allzeros address
-		{params{"bridge", "bar102", &net.IPNet{IP: net.IPv4(10, 142, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 142, 0, 0), nil, nil}, nil, fmt.Errorf("")},
-		// gateway is allones address
-		{params{"bridge", "bar103", &net.IPNet{IP: net.IPv4(10, 143, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 143, 255, 255), nil, nil}, nil, fmt.Errorf("")},
-		// this should succeed now
-		{params{"bridge", "bar11", &net.IPNet{IP: net.IPv4(10, 14, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, []string{"10.14.1.0/24"}},
-			&params{"bridge", "bar11", &net.IPNet{IP: net.IPv4(10, 14, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 14, 1, 0), nil, nil},
-			nil},
-		// bad ipam
-		{params{"bridge", "bar12", &net.IPNet{IP: net.IPv4(10, 14, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, []string{"10.14.1.0/24", "10.15.1"}}, nil, fmt.Errorf("")},
-		// bad ipam, default bridge pool
-		{params{"bridge", "bar12", &net.IPNet{IP: net.IPv4(172, 21, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, []string{"172.21.1.0/24", "10.15.1"}}, nil, fmt.Errorf("")},
-		// external networks must have subnet specified, if pool is specified
-		{params{"external", "bar13", nil, net.IPv4(0, 0, 0, 0), nil, []string{"10.15.0.0/24"}}, nil, fmt.Errorf("")},
-		// external networks must have gateway specified, if pool is specified
-		{params{"external", "bar14", &net.IPNet{IP: net.IPv4(10, 14, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(0, 0, 0, 0), nil, []string{"10.15.0.0/24"}}, nil, fmt.Errorf("")},
-		// external networks cannot overlap bridge pool
-		{params{"external", "bar16", &net.IPNet{IP: net.IPv4(172, 20, 0, 0), Mask: net.CIDRMask(16, 32)}, net.IPv4(10, 14, 0, 1), nil, []string{"172.20.0.0/16"}}, nil, fmt.Errorf("")},
-	}
-
-	kv.On("Put", context.TODO(), mock.Anything, mock.Anything).Return(nil)
-	setCalls := 0
-
-	tests = append(validScopeTests, tests...)
-
-	for _, te := range tests {
-
-		scopeData := &ScopeData{
-			ScopeType: te.in.scopeType,
-			Name:      te.in.name,
-			Subnet:    te.in.subnet,
-			Gateway:   te.in.gateway,
-			DNS:       te.in.dns,
-			Pools:     te.in.pools,
-		}
-		s, err := ctx.NewScope(context.TODO(), scopeData)
-
-		if te.out == nil {
-			// no additional call to kv.Set
-			kv.AssertNumberOfCalls(t, "Put", setCalls)
-
-			// error case
-			if s != nil || err == nil {
-				t.Fatalf("NewScope(%+v) => (s, nil), want (nil, err)", scopeData)
-			}
-
-			// if there is an error specified, check if we got that error
-			if te.err != nil &&
-				reflect.TypeOf(err) != reflect.TypeOf(te.err) {
-				t.Fatalf("NewScope() => (nil, %s), want (nil, %s)", reflect.TypeOf(err), reflect.TypeOf(te.err))
-			}
-
-			if _, o := err.(DuplicateResourceError); !o {
-				// sanity check
-				if _, ok := ctx.scopes[te.in.name]; ok {
-					t.Fatalf("scope %s added on error", te.in.name)
-				}
-			}
-
-			continue
-		}
-
-		if err != nil {
-			t.Fatalf("got: %s, expected: nil", err)
-			continue
-		}
-
-		setCalls++
-		kv.AssertNumberOfCalls(t, "Put", setCalls)
-
-		// check if kv.Set was called with the expected arguments
-		d, err := s.MarshalJSON()
-		assert.NoError(t, err)
-		kv.AssertCalled(t, "Put", context.TODO(), scopeKey(s.Name()), d)
-
-		if s.Type() != te.out.scopeType {
-			t.Fatalf("s.Type() => %s, want %s", s.Type(), te.out.scopeType)
-			continue
-		}
-
-		if s.Name() != te.out.name {
-			t.Fatalf("s.Name() => %s, want %s", s.Name(), te.out.name)
-		}
-
-		if s.Subnet().String() != te.out.subnet.String() {
-			t.Fatalf("s.Subnet() => %s, want %s", s.Subnet(), te.out.subnet)
-		}
-
-		if !s.Gateway().Equal(te.out.gateway) {
-			t.Fatalf("s.Gateway() => %s, want %s", s.Gateway(), te.out.gateway)
-		}
-
-		for _, d1 := range s.DNS() {
-			found := false
-			for _, d2 := range te.out.dns {
-				if d2.Equal(d1) {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				t.Fatalf("s.DNS() => %q, want %q", s.DNS(), te.out.dns)
-				break
-			}
-		}
-
-		if s.Type() == constants.BridgeScopeType && s.Network() != testBridgeNetwork {
-			t.Fatalf("s.NetworkName => %v, want %s", s.Network(), testBridgeNetwork)
-			continue
-		}
-
-		hasPools := len(te.in.pools) > 0
-		if hasPools {
-			assert.Len(t, te.in.pools, len(s.spaces))
-		} else {
-			assert.Len(t, s.spaces, 1)
-		}
-
-		var parent *AddressSpace
-		for i, p := range s.spaces {
-			if parent == nil {
-				parent = p.Parent
-			}
-
-			if !hasPools {
-				// only one pool equal to the subnet
-				assert.EqualValues(t, *p.Network, *s.subnet)
-				continue
-			}
-
-			assert.NotNil(t, p.Parent)
-			// all pools should have the same parent
-			assert.Equal(t, parent, p.Parent)
-			// if subnet is specified, it should be the same as the parent space
-			if s.subnet != nil {
-				assert.EqualValues(t, *s.subnet, *p.Parent.Network)
-			}
-
-			if p.Network != nil {
-				if p.Network.String() != te.in.pools[i] {
-					t.Fatalf("p.Network => %s, want %s", p.Network, te.in.pools[i])
-				}
-			} else if p.Pool.String() != te.in.pools[i] {
-				t.Fatalf("p.Pool => %s, want %s", p.Pool, te.in.pools[i])
-			}
-		}
-	}
-}
-
-func TestScopes(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-		return
-	}
-
-	scopes := make([]*Scope, 0, 0)
-	scopesByID := make(map[string]*Scope)
-	scopesByName := make(map[string]*Scope)
-	for _, te := range validScopeTests {
-
-		scopeData := &ScopeData{
-			ScopeType: te.in.scopeType,
-			Name:      te.in.name,
-			Subnet:    te.in.subnet,
-			Gateway:   te.in.gateway,
-			DNS:       te.in.dns,
-			Pools:     te.in.pools,
-		}
-
-		s, err := ctx.NewScope(context.TODO(), scopeData)
-		if err != nil {
-			t.Fatalf("NewScope() => (_, %s), want (_, nil)", err)
-		}
-
-		scopesByID[s.ID().String()] = s
-		scopesByName[s.Name()] = s
-		scopes = append(scopes, s)
-	}
-
-	id := scopesByName[validScopeTests[0].in.name].ID().String()
-	partialID := id[:8]
-	partialID2 := partialID[1:]
-	badName := "foo"
-
-	var tests = []struct {
-		in  *string
-		out []*Scope
-	}{
-		// name match
-		{&validScopeTests[0].in.name, []*Scope{scopesByName[validScopeTests[0].in.name]}},
-		// id match
-		{&id, []*Scope{scopesByName[validScopeTests[0].in.name]}},
-		// partial id match
-		{&partialID, []*Scope{scopesByName[validScopeTests[0].in.name]}},
-		// all scopes
-		{nil, scopes},
-		// partial id match only matches prefix
-		{&partialID2, nil},
-		// no match
-		{&badName, nil},
-	}
-
-	for _, te := range tests {
-		l, err := ctx.Scopes(context.TODO(), te.in)
-		if te.out == nil {
-			if err == nil {
-				t.Fatalf("Scopes() => (_, nil), want (_, err)")
-				continue
-			}
-		} else {
-			if err != nil {
-				t.Fatalf("Scopes() => (_, %s), want (_, nil)", err)
-				continue
-			}
-		}
-
-		// +5 for the default bridge scope, and 4 external networks
-		if te.in == nil {
-			if len(l) != len(te.out)+5 {
-				t.Fatalf("len(scopes) => %d != %d", len(l), len(te.out)+5)
-				continue
-			}
-		} else {
-			if len(l) != len(te.out) {
-				t.Fatalf("len(scopes) => %d != %d", len(l), len(te.out))
-				continue
-			}
-		}
-
-		for _, s1 := range te.out {
-			found := false
-			for _, s2 := range l {
-				if s1 == s2 {
-					found = true
-					break
-				}
-			}
-
-			if !found {
-				t.Fatalf("got=%v, want=%v", l, te.out)
-				break
-			}
-		}
-	}
-}
-
-func TestContextAddContainer(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-		return
-	}
-
-	h := newContainer("foo")
-
-	var devices object.VirtualDeviceList
-	backing, _ := ctx.DefaultScope().Network().EthernetCardBackingInfo(context.TODO())
-
-	specWithEthCard := &spec.VirtualMachineConfigSpec{
-		VirtualMachineConfigSpec: &types.VirtualMachineConfigSpec{},
-	}
-
-	var d types.BaseVirtualDevice
-	if d, err = devices.CreateEthernetCard("vmxnet3", backing); err == nil {
-		d.GetVirtualDevice().SlotInfo = &types.VirtualDevicePciBusSlotInfo{
-			PciSlotNumber: 1111,
-		}
-		devices = append(devices, d)
-		var cs []types.BaseVirtualDeviceConfigSpec
-		if cs, err = devices.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd); err == nil {
-			specWithEthCard.DeviceChange = cs
-		}
-	}
-
-	if err != nil {
-		t.Fatalf(err.Error())
-	}
-
-	aecErr := func(_ *exec.Handle, _ *Scope) (types.BaseVirtualDevice, error) {
-		return nil, fmt.Errorf("error")
-	}
-
-	scopeData := &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "other",
-		Gateway:   net.IPv4(0, 0, 0, 0),
-	}
-	otherScope, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("failed to add scope")
-	}
-
-	hBar := newContainer("bar")
-
-	var tests = []struct {
-		aec   func(h *exec.Handle, s *Scope) (types.BaseVirtualDevice, error)
-		h     *exec.Handle
-		s     *spec.VirtualMachineConfigSpec
-		scope string
-		ip    net.IP
-		err   error
-	}{
-		// nil handle
-		{nil, nil, nil, "", nil, fmt.Errorf("")},
-		// scope not found
-		{nil, h, nil, "foo", nil, ResourceNotFoundError{}},
-		// addEthernetCard returns error
-		{aecErr, h, nil, "default", nil, fmt.Errorf("")},
-		// add a container
-		{nil, h, nil, "default", nil, nil},
-		// container already added
-		// requires that we preserve h.ExecConfig & h.Spec
-		{nil, h, nil, "default", nil, nil},
-		{nil, hBar, specWithEthCard, "default", nil, nil},
-		{nil, hBar, nil, otherScope.Name(), nil, nil},
-	}
-
-	origAEC := addEthernetCard
-	defer func() { addEthernetCard = origAEC }()
-
-	for i, te := range tests {
-		// setup
-		addEthernetCard = origAEC
-		scopy := &spec.VirtualMachineConfigSpec{}
-		if te.h != nil {
-			// seed with a specific spec state
-			if te.s != nil {
-				te.h.Spec = te.s
-			}
-
-			if te.h.Spec != nil {
-				*scopy = *te.h.Spec
-			} else {
-				te.h.Spec = &spec.VirtualMachineConfigSpec{
-					VirtualMachineConfigSpec: &types.VirtualMachineConfigSpec{},
-				}
-			}
-		}
-
-		if te.aec != nil {
-			addEthernetCard = te.aec
-		}
-
-		options := &AddContainerOptions{
-			Scope: te.scope,
-			IP:    te.ip,
-		}
-		err := ctx.AddContainer(te.h, options)
-		if te.err != nil {
-			// expect an error
-			if err == nil {
-				t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) => nil want err", i, te.h, te.scope, te.ip)
-			}
-
-			if reflect.TypeOf(err) != reflect.TypeOf(te.err) {
-				t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) => (%v, %v) want (%v, %v)", i, te.h, te.scope, te.ip, err, te.err, err, te.err)
-			}
-
-			if _, ok := te.err.(DuplicateResourceError); ok {
-				continue
-			}
-
-			// verify no device changes in the spec
-			if te.s != nil {
-				if len(scopy.DeviceChange) != len(h.Spec.DeviceChange) {
-					t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) added device", i, te.h, te.scope, te.ip)
-				}
-			}
-
-			continue
-		}
-
-		if err != nil {
-			t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) => %s want nil", i, te.h, te.scope, te.ip, err)
-		}
-
-		// verify the container was not added to the scope
-		s, _ := ctx.resolveScope(te.scope)
-		if s != nil && te.h != nil {
-			c := s.Container(uid.Parse(te.h.ExecConfig.ID))
-			if c != nil {
-				t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) added container", i, te.h, te.scope, te.ip)
-			}
-		}
-
-		// spec should have a nic attached to the scope's network
-		var dev types.BaseVirtualDevice
-		dcs, err := te.h.Spec.FindNICs(context.TODO(), s.Network())
-		if len(dcs) == 0 {
-			t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) no NIC was added for scope %s", i, te.h, te.scope, te.ip, s.Network())
-		} else if len(dcs) > 1 {
-			t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) more than one NIC added for scope %s", i, te.h, te.scope, te.ip, s.Network())
-		}
-		dev = dcs[0].GetVirtualDeviceConfigSpec().Device
-		if spec.VirtualDeviceSlotNumber(dev) == constants.NilSlot {
-			t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) NIC added has nil pci slot", i, te.h, te.scope, te.ip)
-		}
-
-		// spec metadata should be updated with endpoint info
-		ne, ok := te.h.ExecConfig.Networks[s.Name()]
-		if !ok {
-			t.Fatalf("case %d: ctx.AddContainer(%v, %s, %s) no network endpoint info added", i, te.h, te.scope, te.ip)
-		}
-
-		if spec.VirtualDeviceSlotNumber(dev) != atoiOrZero(ne.ID) {
-			t.Fatalf("case %d; ctx.AddContainer(%v, %s, %s) => ne.ID == %d, want %d", i, te.h, te.scope, te.ip, atoiOrZero(ne.ID), spec.VirtualDeviceSlotNumber(dev))
-		}
-
-		if ne.Network.Name != s.Name() {
-			t.Fatalf("case %d; ctx.AddContainer(%v, %s, %s) => ne.NetworkName == %s, want %s", i, te.h, te.scope, te.ip, ne.Network.Name, s.Name())
-		}
-
-		if te.ip != nil && (!ne.Static || !te.ip.Equal(ne.IP.IP)) {
-			t.Fatalf("case %d; ctx.AddContainer(%v, %s, %s) => ne.IP.IP=%s ne.Static=%v, want ne.IP.IP=%s ne.Static=%v", i, te.h, te.scope, te.ip, ne.IP.IP, ne.Static, te.ip, true)
-		}
-
-		if te.ip == nil && (ne.Static || ne.IP != nil) {
-			t.Fatalf("case %d; ctx.AddContainer(%v, %s, %s) => ne.Static=%v, want ne.Static=%v", i, te.h, te.scope, te.ip, ne.Static, false)
-		}
-	}
-}
-
-func newContainer(name string) *exec.Handle {
-	h := exec.TestHandle(uid.New().String())
-	h.ExecConfig.ExecutorConfigCommon.Name = name
-	return h
-}
-
-func TestContextBindUnbindContainer(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-	}
-
-	scopeData := &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "scope",
-	}
-	scope, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope(%+v) => (nil, %s)", scopeData, err)
-	}
-
-	foo := newContainer("foo")
-	added := newContainer("added")
-	staticIP := newContainer("staticIP")
-	ipErr := newContainer("ipErr")
-
-	options := &AddContainerOptions{
-		Scope: ctx.DefaultScope().Name(),
-	}
-	// add a container to the default scope
-	if err = ctx.AddContainer(added, options); err != nil {
-		t.Fatalf("ctx.AddContainer(%s, %s, nil) => %s", added, ctx.DefaultScope().Name(), err)
-	}
-
-	// add a container with a static IP
-	ip := net.IPv4(172, 16, 0, 10)
-	options = &AddContainerOptions{
-		Scope: ctx.DefaultScope().Name(),
-		IP:    ip,
-	}
-	if err = ctx.AddContainer(staticIP, options); err != nil {
-		t.Fatalf("ctx.AddContainer(%s, %s, nil) => %s", staticIP, ctx.DefaultScope().Name(), err)
-	}
-
-	// add the "added" container to the "scope" scope
-	options = &AddContainerOptions{
-		Scope: scope.Name(),
-	}
-	if err = ctx.AddContainer(added, options); err != nil {
-		t.Fatalf("ctx.AddContainer(%s, %s, nil) => %s", added, scope.Name(), err)
-	}
-
-	// add a container with an ip that is already taken,
-	// causing Scope.BindContainer call to fail
-	gw := ctx.DefaultScope().Gateway()
-	options = &AddContainerOptions{
-		Scope: scope.Name(),
-	}
-	ctx.AddContainer(ipErr, options)
-
-	options = &AddContainerOptions{
-		Scope: ctx.DefaultScope().Name(),
-		IP:    gw,
-	}
-	ctx.AddContainer(ipErr, options)
-
-	var tests = []struct {
-		h      *exec.Handle
-		scopes []string
-		ips    []net.IP
-		static bool
-		err    error
-	}{
-		// no scopes to bind to
-		{foo, []string{}, []net.IP{}, false, nil},
-		// container has bad ip address
-		{ipErr, []string{}, nil, false, fmt.Errorf("")},
-		// successful container bind
-		{added, []string{ctx.DefaultScope().Name(), scope.Name()}, []net.IP{net.IPv4(172, 16, 0, 2), net.IPv4(172, 17, 0, 2)}, false, nil},
-		{staticIP, []string{ctx.DefaultScope().Name()}, []net.IP{net.IPv4(172, 16, 0, 10)}, true, nil},
-	}
-
-	for i, te := range tests {
-		eps, err := ctx.BindContainer(te.h)
-		if te.err != nil {
-			// expect an error
-			if err == nil || eps != nil {
-				t.Fatalf("%d: ctx.BindContainer(%s) => (%+v, %+v), want (%+v, %+v)", i, te.h, eps, err, nil, te.err)
-			}
-
-			con := ctx.Container(te.h.ExecConfig.ID)
-			if con != nil {
-				t.Fatalf("%d: ctx.BindContainer(%s) added container %#v", i, te.h, con)
-			}
-
-			continue
-		}
-
-		if len(te.h.ExecConfig.Networks) == 0 {
-			continue
-		}
-
-		// check if the correct endpoints were added
-		con := ctx.Container(te.h.ExecConfig.ID)
-		if con == nil {
-			t.Fatalf("%d: ctx.Container(%s) => nil, want %s", i, te.h.ExecConfig.ID, te.h.ExecConfig.ID)
-		}
-
-		if len(con.Scopes()) != len(te.scopes) {
-			t.Fatalf("%d: len(con.Scopes()) %#v != len(te.scopes) %#v", i, con.Scopes(), te.scopes)
-		}
-
-		// check endpoints
-		for i, s := range te.scopes {
-			found := false
-			for _, e := range eps {
-				if e.Scope().Name() != s {
-					continue
-				}
-
-				found = true
-				if !e.Gateway().Equal(e.Scope().Gateway()) {
-					t.Fatalf("%d: ctx.BindContainer(%s) => endpoint gateway %s, want %s", i, te.h, e.Gateway(), e.Scope().Gateway())
-				}
-				if !e.IP().Equal(te.ips[i]) {
-					t.Fatalf("%d: ctx.BindContainer(%s) => endpoint IP %s, want %s", i, te.h, e.IP(), te.ips[i])
-				}
-				if e.Subnet().String() != e.Scope().Subnet().String() {
-					t.Fatalf("%d: ctx.BindContainer(%s) => endpoint subnet %s, want %s", i, te.h, e.Subnet(), e.Scope().Subnet())
-				}
-
-				ne := te.h.ExecConfig.Networks[s]
-				if !ne.IP.IP.Equal(te.ips[i]) {
-					t.Fatalf("%d: ctx.BindContainer(%s) => metadata endpoint IP %s, want %s", i, te.h, ne.IP.IP, te.ips[i])
-				}
-				if ne.IP.Mask.String() != e.Scope().Subnet().Mask.String() {
-					t.Fatalf("%d: ctx.BindContainer(%s) => metadata endpoint IP mask %s, want %s", i, te.h, ne.IP.Mask.String(), e.Scope().Subnet().Mask.String())
-				}
-				if !ne.Network.Gateway.IP.Equal(e.Scope().Gateway()) {
-					t.Fatalf("%d: ctx.BindContainer(%s) => metadata endpoint gateway %s, want %s", i, te.h, ne.Network.Gateway.IP, e.Scope().Gateway())
-				}
-				if ne.Network.Gateway.Mask.String() != e.Scope().Subnet().Mask.String() {
-					t.Fatalf("%d: ctx.BindContainer(%s) => metadata endpoint gateway mask %s, want %s", i, te.h, ne.Network.Gateway.Mask.String(), e.Scope().Subnet().Mask.String())
-				}
-
-				break
-			}
-
-			if !found {
-				t.Fatalf("%d: ctx.BindContainer(%s) => endpoint for scope %s not added", i, te.h, s)
-			}
-		}
-	}
-
-	tests = []struct {
-		h      *exec.Handle
-		scopes []string
-		ips    []net.IP
-		static bool
-		err    error
-	}{
-		// container not bound
-		{foo, []string{}, nil, false, nil},
-		// successful container unbind
-		{added, []string{ctx.DefaultScope().Name(), scope.Name()}, nil, false, nil},
-		{staticIP, []string{ctx.DefaultScope().Name()}, nil, true, nil},
-	}
-
-	// test UnbindContainer
-	for i, te := range tests {
-		eps, err := ctx.UnbindContainer(te.h)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("%d: ctx.UnbindContainer(%s) => nil, want err", i, te.h)
-			}
-
-			continue
-		}
-
-		// container should not be there
-		con := ctx.Container(te.h.ExecConfig.ID)
-		if con != nil {
-			t.Fatalf("%d: ctx.Container(%s) => %#v, want nil", i, te.h, con)
-		}
-
-		for _, s := range te.scopes {
-			found := false
-			for _, e := range eps {
-				if e.Scope().Name() == s {
-					found = true
-				}
-			}
-
-			if !found {
-				t.Fatalf("%d: ctx.UnbindContainer(%s) did not return endpoint for scope %s. Endpoints: %+v", i, te.h, s, eps)
-			}
-
-			// container should not be part of scope
-			scopes, err := ctx.findScopes(&s)
-			if err != nil || len(scopes) != 1 {
-				t.Fatalf("%d: ctx.Scopes(%s) => (%#v, %#v)", i, s, scopes, err)
-			}
-			if scopes[0].Container(uid.Parse(te.h.ExecConfig.ID)) != nil {
-				t.Fatalf("%d: container %s is still part of scope %s", i, te.h.ExecConfig.ID, s)
-			}
-
-			// check if endpoint is still there, but without the ip
-			ne, ok := te.h.ExecConfig.Networks[s]
-			if !ok {
-				t.Fatalf("%d: container endpoint not present in %v", i, te.h.ExecConfig)
-			}
-
-			if te.static != ne.Static {
-				t.Fatalf("%d: ne.Static=%v, want %v", i, ne.Static, te.static)
-			}
-		}
-	}
-}
-
-func TestContextRemoveContainer(t *testing.T) {
-
-	hFoo := newContainer("foo")
-
-	ctx, err := NewContext(testConfig(), nil)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-	}
-
-	scopeData := &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "scope",
-	}
-	scope, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope() => (nil, %s), want (scope, nil)", err)
-	}
-
-	options := &AddContainerOptions{
-		Scope: scope.Name(),
-	}
-	ctx.AddContainer(hFoo, options)
-	ctx.BindContainer(hFoo)
-
-	// container that is added to multiple bridge scopes
-	hBar := newContainer("bar")
-	options.Scope = "default"
-	ctx.AddContainer(hBar, options)
-	options.Scope = scope.Name()
-	ctx.AddContainer(hBar, options)
-
-	var tests = []struct {
-		h     *exec.Handle
-		scope string
-		err   error
-	}{
-		{nil, "", fmt.Errorf("")},                        // nil handle
-		{hBar, "bar", fmt.Errorf("")},                    // scope not found
-		{hFoo, scope.Name(), fmt.Errorf("")},             // bound container
-		{newContainer("baz"), "default", fmt.Errorf("")}, // container not part of scope
-		{hBar, "default", nil},
-		{hBar, scope.Name(), nil},
-	}
-
-	for i, te := range tests {
-		var ne *executor.NetworkEndpoint
-		if te.h != nil && te.h.ExecConfig.Networks != nil {
-			ne = te.h.ExecConfig.Networks[te.scope]
-		}
-
-		err = ctx.RemoveContainer(te.h, te.scope)
-		if te.err != nil {
-			// expect error
-			if err == nil {
-				t.Fatalf("%d: ctx.RemoveContainer(%#v, %s) => nil want err", i, te.h, te.scope)
-			}
-
-			continue
-		}
-
-		s, err := ctx.resolveScope(te.scope)
-		if err != nil {
-			t.Fatalf(err.Error())
-		}
-
-		if s.Container(uid.Parse(te.h.ExecConfig.ID)) != nil {
-			t.Fatalf("container %s is part of scope %s", te.h, s.Name())
-		}
-
-		// should have a remove spec for NIC, if container was only part of one bridge scope
-		dcs, err := te.h.Spec.FindNICs(context.TODO(), s.Network())
-		if err != nil {
-			t.Fatalf(err.Error())
-		}
-
-		found := false
-		var d types.BaseVirtualDevice
-		for _, dc := range dcs {
-			if dc.GetVirtualDeviceConfigSpec().Operation != types.VirtualDeviceConfigSpecOperationRemove {
-				continue
-			}
-
-			d = dc.GetVirtualDeviceConfigSpec().Device
-			found = true
-			break
-		}
-
-		// if a remove spec for the NIC was found, check if any other
-		// network endpoints are still using it
-		if found {
-			for _, ne := range te.h.ExecConfig.Networks {
-				if atoiOrZero(ne.ID) == spec.VirtualDeviceSlotNumber(d) {
-					t.Fatalf("%d: NIC with pci slot %d is still in use by a network endpoint %#v", i, spec.VirtualDeviceSlotNumber(d), ne)
-				}
-			}
-		} else if ne != nil {
-			// check if remove spec for NIC should have been there
-			for _, ne2 := range te.h.ExecConfig.Networks {
-				if ne.ID == ne2.ID {
-					t.Fatalf("%d: NIC with pci slot %s should have been removed", i, ne.ID)
-				}
-			}
-		}
-
-		// metadata should be gone
-		if _, ok := te.h.ExecConfig.Networks[te.scope]; ok {
-			t.Fatalf("%d: endpoint metadata for container still present in handle %#v", i, te.h.ExecConfig)
-		}
-	}
-}
-
-func TestDeleteScope(t *testing.T) {
-	kv := &kvstore.MockKeyValueStore{}
-	kv.On("List", mock.Anything).Return(nil, nil)
-	kv.On("Put", context.TODO(), mock.Anything, mock.Anything).Return(nil)
-	kv.On("Delete", context.TODO(), mock.Anything).Return(nil)
-	ctx, err := NewContext(testConfig(), kv)
-	if err != nil {
-		t.Fatalf("NewContext() => (nil, %s), want (ctx, nil)", err)
-	}
-
-	scopeData := &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "foo",
-	}
-	foo, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope(%+v) => (nil, %#v), want (foo, nil)", scopeData, err)
-	}
-	h := newContainer("container")
-	options := &AddContainerOptions{
-		Scope: foo.Name(),
-	}
-	ctx.AddContainer(h, options)
-
-	// bar is a scope with bound endpoints
-	scopeData = &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "bar",
-	}
-	bar, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope(%+v) => (nil, %#v), want (bar, nil)", scopeData, err)
-	}
-
-	h = newContainer("container2")
-	options.Scope = bar.Name()
-	ctx.AddContainer(h, options)
-	ctx.BindContainer(h)
-
-	scopeData = &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "bazScope",
-	}
-	baz, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope(%+v) => (nil, %#v), want (baz, nil)", scopeData, err)
-	}
-
-	scopeData = &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "quxScope",
-	}
-	qux, err := ctx.NewScope(context.TODO(), scopeData)
-	if err != nil {
-		t.Fatalf("ctx.NewScope(%+v) => (nil, %#v), want (qux, nil)", scopeData, err)
-	}
-
-	var tests = []struct {
-		name string
-		err  error
-	}{
-		{"", ResourceNotFoundError{}},
-		{ctx.DefaultScope().Name(), fmt.Errorf("cannot delete builtin scopes")},
-		{bar.Name(), fmt.Errorf("cannot delete scope with bound endpoints")},
-		// full name
-		{foo.Name(), nil},
-		// full id
-		{baz.ID().String(), nil},
-		// partial id
-		{qux.ID().String()[:6], nil},
-	}
-
-	calls := 0
-	for _, te := range tests {
-		err := ctx.DeleteScope(context.TODO(), te.name)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("DeleteScope(%s) => nil, expected err", te.name)
-			}
-
-			if reflect.TypeOf(te.err) != reflect.TypeOf(err) {
-				t.Fatalf("DeleteScope(%s) => %#v, want %#v", te.name, err, te.err)
-			}
-
-			kv.AssertNumberOfCalls(t, "Delete", calls)
-			continue
-		}
-
-		calls++
-		kv.AssertNumberOfCalls(t, "Delete", calls)
-		scopes, err := ctx.findScopes(&te.name)
-		if _, ok := err.(ResourceNotFoundError); !ok || len(scopes) != 0 {
-			t.Fatalf("scope %s not deleted", te.name)
-		}
-	}
-}
-
-func TestAliases(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	assert.NoError(t, err)
-	assert.NotNil(t, ctx)
-
-	scope := ctx.DefaultScope()
-
-	var tests = []struct {
-		con     string
-		aliases []string
-		err     error
-	}{
-		// bad alias
-		{"bad1", []string{"bad1"}, assert.AnError},
-		{"bad2", []string{"foo:bar:baz"}, assert.AnError},
-		// ok
-		{"c1", []string{"c2:other", ":c1", ":c1"}, nil},
-		{"c2", []string{"c1:other"}, nil},
-		{"c3", []string{"c2:c2", "c1:c1"}, nil},
-	}
-
-	containers := make(map[string]*exec.Handle)
-	for _, te := range tests {
-		t.Logf("%+v", te)
-		c := newContainer(te.con)
-
-		opts := &AddContainerOptions{
-			Scope:   scope.Name(),
-			Aliases: te.aliases,
-		}
-
-		err = ctx.AddContainer(c, opts)
-		assert.NoError(t, err)
-		assert.EqualValues(t, opts.Aliases, c.ExecConfig.Networks[scope.Name()].Network.Aliases)
-
-		eps, err := ctx.BindContainer(c)
-		if te.err != nil {
-			assert.Error(t, err)
-			assert.Empty(t, eps)
-			continue
-		}
-
-		assert.NoError(t, err)
-		assert.Len(t, eps, 1)
-
-		// verify aliases are present
-		assert.NotNil(t, ctx.Container(c.ExecConfig.ID))
-		assert.NotNil(t, ctx.Container(uid.Parse(c.ExecConfig.ID).Truncate().String()))
-		assert.NotNil(t, ctx.Container(c.ExecConfig.Name))
-		assert.NotNil(t, ctx.ContainersByAlias(fmt.Sprintf("%s:%s", scope.Name(), uid.Parse(c.ExecConfig.ID).Truncate())))
-		assert.NotNil(t, ctx.ContainersByAlias(fmt.Sprintf("%s:%s", scope.Name(), c.ExecConfig.Name)))
-
-		aliases := c.ExecConfig.Networks[scope.Name()].Network.Aliases
-		for _, a := range aliases {
-			l := strings.Split(a, ":")
-			con, al := l[0], l[1]
-			found := false
-			var ea alias
-			for _, a := range eps[0].getAliases(con) {
-				if al == a.Name {
-					found = true
-					ea = a
-					break
-				}
-			}
-			assert.True(t, found, "alias %s not found for container %s", al, con)
-
-			// if the aliased container is bound we should be able to look it up with
-			// the scoped alias name
-			if c := ctx.Container(ea.Container); c != nil {
-				assert.NotNil(t, ctx.ContainersByAlias(ea.scopedName()))
-			} else {
-				assert.Nil(t, ctx.ContainersByAlias(ea.scopedName()), "scoped name=%s", ea.scopedName())
-			}
-		}
-
-		// now that the container is bound, there
-		// should be additional aliases scoped to
-		// other containers
-		for _, e := range scope.Endpoints() {
-			for _, a := range e.getAliases(c.ExecConfig.Name) {
-				t.Logf("alias: %s", a.scopedName())
-				assert.NotNil(t, ctx.ContainersByAlias(a.scopedName()))
-			}
-		}
-
-		containers[te.con] = c
-	}
-
-	t.Logf("containers: %#v", ctx.containers)
-
-	c := containers["c2"]
-	_, err = ctx.UnbindContainer(c)
-	assert.NoError(t, err)
-	// verify aliases are gone
-	assert.Nil(t, ctx.Container(c.ExecConfig.ID))
-	assert.Nil(t, ctx.Container(uid.Parse(c.ExecConfig.ID).Truncate().String()))
-	assert.Nil(t, ctx.Container(c.ExecConfig.Name))
-	assert.Nil(t, ctx.Container(fmt.Sprintf("%s:%s", scope.Name(), c.ExecConfig.Name)))
-	assert.Nil(t, ctx.Container(fmt.Sprintf("%s:%s", scope.Name(), uid.Parse(c.ExecConfig.ID).Truncate())))
-
-	// aliases from c1 and c3 to c2 should not resolve anymore
-	assert.Nil(t, ctx.Container(fmt.Sprintf("%s:c1:other", scope.Name())))
-	assert.Nil(t, ctx.Container(fmt.Sprintf("%s:c3:c2", scope.Name())))
-}
-
-func TestLoadScopesFromKV(t *testing.T) {
-	// sample kv store data
-	var tests = []struct {
-		pg string
-		sn string
-		s  *Scope
-	}{
-		{
-			pg: "bridge",
-			sn: "foo",
-			s: &Scope{
-				id:         uid.New(),
-				name:       "foo",
-				scopeType:  constants.BridgeScopeType,
-				subnet:     &net.IPNet{IP: net.ParseIP("10.10.10.0"), Mask: net.CIDRMask(16, 32)},
-				gateway:    net.ParseIP("10.10.10.1"),
-				containers: map[uid.UID]*Container{},
-				spaces:     []*AddressSpace{NewAddressSpaceFromNetwork(&net.IPNet{IP: net.ParseIP("10.10.10.0"), Mask: net.CIDRMask(16, 32)})},
-			},
-		},
-		{
-			pg: "bridge",
-			sn: "bar",
-			s: &Scope{
-				id:         uid.New(),
-				name:       "bar",
-				scopeType:  constants.BridgeScopeType,
-				subnet:     &net.IPNet{IP: net.ParseIP("10.11.0.0"), Mask: net.CIDRMask(16, 32)},
-				gateway:    net.ParseIP("10.11.0.1"),
-				containers: map[uid.UID]*Container{},
-				dns:        []net.IP{net.ParseIP("8.8.8.8")},
-				spaces:     []*AddressSpace{NewAddressSpaceFromNetwork(&net.IPNet{IP: net.ParseIP("10.11.0.0"), Mask: net.CIDRMask(16, 32)})},
-			},
-		},
-		{
-			pg: "ext",
-			sn: "ext",
-			s: &Scope{
-				id:         uid.New(),
-				name:       "ext",
-				scopeType:  constants.ExternalScopeType,
-				subnet:     &net.IPNet{IP: net.ParseIP("10.12.0.0"), Mask: net.CIDRMask(16, 32)},
-				gateway:    net.ParseIP("10.12.0.1"),
-				containers: map[uid.UID]*Container{},
-				dns:        []net.IP{net.ParseIP("8.8.8.8")},
-				spaces:     []*AddressSpace{NewAddressSpaceFromNetwork(&net.IPNet{IP: net.ParseIP("10.12.0.0"), Mask: net.CIDRMask(16, 32)})},
-			},
-		},
-		{
-			sn: "bad",
-		},
-	}
-
-	// load the kv store data
-	kvdata := map[string][]byte{}
-	for _, te := range tests {
-		var d []byte
-		if te.s != nil {
-			var err error
-			d, err = te.s.MarshalJSON()
-			assert.NoError(t, err)
-		}
-
-		kvdata[scopeKey(te.sn)] = d
-	}
-
-	// cases where there is no data in the kv store,
-	// or kv.List returns error
-	for _, e := range []error{nil, kvstore.ErrKeyNotFound, assert.AnError} {
-		kv := &kvstore.MockKeyValueStore{}
-		kv.On("List", `context\.scopes\..+`).Return(nil, e)
-		ctx, err := NewContext(testConfig(), kv)
-		assert.NoError(t, err)
-		assert.NotNil(t, ctx)
-
-		// check to see if the only networks
-		// are the ones in the config
-		scs, err := ctx.Scopes(context.TODO(), nil)
-		assert.NoError(t, err)
-		assert.Len(t, scs, len(testConfig().ContainerNetworks))
-	}
-
-	// kv.List returns kvdata
-	kv := &kvstore.MockKeyValueStore{}
-	kv.On("List", `context\.scopes\..+`).Return(kvdata, nil)
-	ctx, err := NewContext(testConfig(), kv)
-	assert.NoError(t, err)
-	assert.NotNil(t, ctx)
-	for _, te := range tests {
-		scs, err := ctx.Scopes(context.TODO(), &te.sn)
-		if te.s == nil || ctx.config.PortGroups[te.pg] == nil {
-			assert.Error(t, err)
-			assert.Len(t, scs, 0)
-			continue
-		}
-
-		assert.NoError(t, err)
-		assert.Len(t, scs, 1)
-
-		assert.Equal(t, scs[0].Name(), te.s.Name())
-		assert.Equal(t, scs[0].ID(), te.s.ID())
-		assert.Equal(t, scs[0].Type(), te.s.Type())
-		assert.True(t, scs[0].Subnet().IP.Equal(te.s.Subnet().IP))
-		assert.Equal(t, scs[0].Subnet().Mask, te.s.Subnet().Mask)
-		assert.True(t, scs[0].Gateway().Equal(te.s.Gateway()))
-		assert.EqualValues(t, scs[0].DNS(), te.s.DNS())
-		assert.Len(t, te.s.Pools(), len(scs[0].Pools()))
-		for _, p := range te.s.Pools() {
-			found := false
-			for _, p2 := range scs[0].Pools() {
-				if p2.Equal(p) {
-					found = true
-					break
-				}
-			}
-
-			assert.True(t, found)
-		}
-	}
-}
-
-func TestKVStoreSetFails(t *testing.T) {
-	sn := "foo"
-
-	// set up kv
-	kv := &kvstore.MockKeyValueStore{}
-	kv.On("List", mock.Anything).Return(nil, nil)
-	kv.On("Put", context.TODO(), scopeKey(sn), mock.Anything).Return(assert.AnError)
-
-	ctx, err := NewContext(testConfig(), kv)
-	assert.NoError(t, err)
-	assert.NotNil(t, ctx)
-
-	scopeData := &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      sn,
-	}
-	_, err = ctx.NewScope(context.TODO(), scopeData)
-	assert.EqualError(t, err, assert.AnError.Error())
-	scs, err := ctx.Scopes(context.TODO(), &sn)
-	assert.Error(t, err)
-	assert.IsType(t, ResourceNotFoundError{}, err)
-	assert.Len(t, scs, 0)
-}
-
-func TestDeleteScopeFreeAddressSpace(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	assert.NoError(t, err)
-	assert.NotNil(t, ctx)
-
-	maskOnes, _ := ctx.defaultBridgeMask.Size()
-	poolOnes, _ := ctx.defaultBridgePool.Network.Mask.Size()
-	maxNets := int(math.Pow(2, float64(maskOnes-poolOnes)))
-
-	// maxNets-1 since there is a default network
-	// called "bridge" already
-	scopes := make([]*Scope, maxNets-1)
-	// create the maximum number of networks allowed
-	for i := range scopes {
-		s, err := ctx.NewScope(context.TODO(), &ScopeData{
-			ScopeType: constants.BridgeScopeType,
-			Name:      fmt.Sprintf("foo%d", i),
-		})
-		assert.NoError(t, err)
-		assert.NotNil(t, s)
-		scopes[i] = s
-	}
-
-	// pick a random scope to delete
-	rand.Seed(time.Now().Unix())
-	t.Log(scopes)
-	s := scopes[rand.Intn(len(scopes))]
-	subnet := s.Subnet()
-	t.Log(subnet)
-
-	err = ctx.DeleteScope(context.TODO(), s.Name())
-	assert.NoError(t, err)
-
-	// create a new scope and check if we got
-	// the subnet for the scope we just
-	// deleted
-	s, err = ctx.NewScope(context.TODO(), &ScopeData{
-		ScopeType: constants.BridgeScopeType,
-		Name:      "bar",
-	})
-	assert.NotNil(t, s)
-	assert.NoError(t, err)
-	assert.Equal(t, subnet.String(), s.Subnet().String())
-}
-
-func TestDeleteScopeLimits(t *testing.T) {
-	ctx, err := NewContext(testConfig(), nil)
-	assert.NoError(t, err)
-	assert.NotNil(t, ctx)
-
-	// repeatedly create and delete a scope
-	// to make sure we are free'ing address
-	// space for the scope
-	const numTries = 100
-	scopes, err := ctx.Scopes(context.TODO(), nil)
-	assert.NoError(t, err)
-	numScopes := len(scopes)
-	for i := 0; i < numTries; i++ {
-		s, err := ctx.NewScope(context.TODO(), &ScopeData{
-			ScopeType: constants.BridgeScopeType,
-			Name:      "foo",
-		})
-		assert.NotNil(t, s)
-		assert.NoError(t, err)
-		if err != nil {
-			t.FailNow()
-		}
-
-		err = ctx.DeleteScope(context.TODO(), s.Name())
-		assert.NoError(t, err)
-		if err != nil {
-			t.FailNow()
-		}
-	}
-
-	scopes, err = ctx.Scopes(context.TODO(), nil)
-	assert.NoError(t, err)
-	assert.Equal(t, numScopes, len(scopes))
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint.go
deleted file mode 100644
index b6b2591d87..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-type alias struct {
-	Name      string
-	Container string
-
-	ep *Endpoint
-}
-
-var badAlias = alias{}
-
-type Endpoint struct {
-	container *Container
-	scope     *Scope
-	ip        net.IP
-	static    bool
-	ports     map[Port]interface{} // exposed ports
-	aliases   map[string][]alias
-	gw        *net.IP
-	subnet    *net.IPNet
-}
-
-// scopeName returns the "fully qualified" name of an alias. Aliases are scoped
-// by the container and network scope they are in.
-func (a alias) scopedName() string {
-	// an alias for the container itself is network scoped
-	for _, al := range a.ep.getAliases("") {
-		if a.Name == al.Name {
-			return ScopedAliasName(a.ep.Scope().Name(), "", a.Name)
-		}
-	}
-
-	return ScopedAliasName(a.ep.Scope().Name(), a.ep.Container().Name(), a.Name)
-}
-
-// ScopedAliasName returns the fully qualified name of an alias, scoped to
-// the scope and optionally a container
-func ScopedAliasName(scope string, container string, alias string) string {
-	if container != "" {
-		return fmt.Sprintf("%s:%s:%s", scope, container, alias)
-	}
-
-	return fmt.Sprintf("%s:%s", scope, alias)
-}
-
-func newEndpoint(container *Container, scope *Scope, eip *net.IP, pciSlot *int32) *Endpoint {
-	e := &Endpoint{
-		container: container,
-		scope:     scope,
-		ip:        net.IPv4(0, 0, 0, 0),
-		static:    false,
-		ports:     make(map[Port]interface{}),
-		aliases:   make(map[string][]alias),
-	}
-
-	if eip != nil && !ip.IsUnspecifiedIP(*eip) {
-		e.ip = *eip
-		e.static = true
-	}
-
-	return e
-}
-
-func removeEndpointHelper(ep *Endpoint, eps []*Endpoint) []*Endpoint {
-	for i, e := range eps {
-		if ep != e {
-			continue
-		}
-
-		return append(eps[:i], eps[i+1:]...)
-	}
-
-	return eps
-}
-
-func (e *Endpoint) addPort(p Port) error {
-	if _, ok := e.ports[p]; ok {
-		return fmt.Errorf("port %s already exposed", p)
-	}
-
-	e.ports[p] = nil
-	return nil
-}
-
-func (e *Endpoint) IP() net.IP {
-	return e.ip
-}
-
-func (e *Endpoint) Scope() *Scope {
-	return e.scope
-}
-
-func (e *Endpoint) Subnet() *net.IPNet {
-	if e.subnet != nil {
-		return e.subnet
-	}
-
-	return e.Scope().Subnet()
-}
-
-func (e *Endpoint) Container() *Container {
-	return e.container
-}
-
-func (e *Endpoint) ID() uid.UID {
-	return e.container.ID()
-}
-
-func (e *Endpoint) Name() string {
-	return e.container.Name()
-}
-
-func (e *Endpoint) Gateway() net.IP {
-	if e.gw != nil {
-		return *e.gw
-	}
-
-	return e.Scope().Gateway()
-}
-
-func (e *Endpoint) Ports() []Port {
-	ports := make([]Port, len(e.ports))
-	i := 0
-	for p := range e.ports {
-		ports[i] = p
-		i++
-	}
-
-	return ports
-}
-
-func (e *Endpoint) addAlias(con, a string) (alias, bool) {
-	if a == "" {
-		return badAlias, false
-	}
-
-	if con == "" {
-		con = e.container.Name()
-	}
-
-	aliases := e.aliases[con]
-	for _, as := range aliases {
-		if as.Name == a {
-			// already present
-			return as, true
-		}
-	}
-
-	na := alias{
-		Name:      a,
-		Container: con,
-		ep:        e,
-	}
-	e.aliases[con] = append(aliases, na)
-	return na, false
-}
-
-func (e *Endpoint) getAliases(con string) []alias {
-	if con == "" {
-		con = e.container.Name()
-	}
-
-	return e.aliases[con]
-}
-
-func (e *Endpoint) copy() *Endpoint {
-	other := *e
-	other.aliases = make(map[string][]alias)
-	for k, v := range e.aliases {
-		a := make([]alias, len(v))
-		copy(a, v)
-		other.aliases[k] = a
-	}
-	other.ports = make(map[Port]interface{})
-	for p := range e.ports {
-		other.ports[p] = nil
-	}
-
-	return &other
-}
-
-func (e *Endpoint) refresh(h *exec.Handle) error {
-	if !e.scope.isDynamic() {
-		return nil
-	}
-
-	s := e.scope
-	ne := h.ExecConfig.Networks[s.Name()]
-	if ne == nil {
-		return fmt.Errorf("container config does not have info for network scope %s", s.Name())
-	}
-
-	if ip.IsUnspecifiedSubnet(&ne.Network.Assigned.Gateway) {
-		return fmt.Errorf("updating endpoint for container %s: gateway not present for scope %s", h.ExecConfig.ID, s.name)
-	}
-
-	gw, snet, err := net.ParseCIDR(ne.Network.Assigned.Gateway.String())
-	if err != nil {
-		return fmt.Errorf("could not parse gateway for container %s: %s", h.ExecConfig.ID, err)
-	}
-
-	e.ip = ne.Assigned.IP
-	e.gw = &gw
-	e.subnet = snet
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint_test.go
deleted file mode 100644
index 17e8428ab7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/endpoint_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEndpointNameID(t *testing.T) {
-	c := &Container{id: "foo", name: "bar"}
-	s := &Scope{
-		gateway: net.ParseIP("10.10.10.1"),
-		subnet:  &net.IPNet{IP: net.ParseIP("10.10.10.0"), Mask: net.CIDRMask(24, 32)},
-	}
-	e := Endpoint{
-		container: c,
-		scope:     s,
-		ip:        net.ParseIP("10.10.10.10"),
-		static:    true,
-		ports:     make(map[Port]interface{}),
-	}
-
-	assert.Equal(t, c.ID(), e.ID())
-	assert.Equal(t, c.Name(), e.Name())
-}
-
-func TestEndpointCopy(t *testing.T) {
-	c := &Container{id: "foo"}
-	s := &Scope{
-		gateway: net.ParseIP("10.10.10.1"),
-		subnet:  &net.IPNet{IP: net.ParseIP("10.10.10.0"), Mask: net.CIDRMask(24, 32)},
-	}
-	e := Endpoint{
-		container: c,
-		scope:     s,
-		ip:        net.ParseIP("10.10.10.10"),
-		static:    true,
-		ports:     make(map[Port]interface{}),
-	}
-
-	p, err := ParsePort("80/tcp")
-	assert.NoError(t, err, "")
-	e.ports[p] = nil
-
-	other := e.copy()
-
-	assert.Equal(t, other.ID(), e.ID())
-	assert.Equal(t, other.container, c)
-	assert.Equal(t, other.container, e.container)
-	assert.Equal(t, other.scope, s)
-	assert.Equal(t, other.scope, e.scope)
-	assert.True(t, other.ip.Equal(e.ip), "other.ip (%s) != e.ip (%s)", other.ip, e.ip)
-	assert.True(t, other.Gateway().Equal(e.Gateway()), "other.Gateway() (%s) != e.Gateway() (%s)", other.Gateway(), e.Gateway())
-	assert.True(t, other.Subnet().IP.Equal(e.Subnet().IP), "other.Subnet() (%s) != e.Subnet() (%s)", other.Subnet(), e.Subnet())
-	assert.Equal(t, other.Subnet().Mask, e.Subnet().Mask, "other.Subnet() (%s) != e.Subnet() (%s)", other.Subnet(), e.Subnet())
-	assert.EqualValues(t, other.ports, e.ports)
-
-	// make sure .ports is a copy
-	other.ports["foo"] = nil
-	assert.NotContains(t, e.ports, "foo")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam.go
deleted file mode 100644
index c60eae9433..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam.go
+++ /dev/null
@@ -1,410 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// IP address management
-//
-// The API here just concerns itself with tracking blocks of
-// IP addresses, as well as individual IPs within the blocks.
-// The API does not have a concept of "network", in particular
-// when managing CIDR blocks, the network and broadcast address
-// are available as valid addresses. This behavior can be
-// accomplished, however, by just reserving those two addresses
-// first thing after requesting a CIDR address space, by using
-// the ReserveIP4() call.
-
-package network
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-
-	"github.com/vmware/vic/pkg/ip"
-)
-
-// An AddressSpace is a collection of
-// IP address ranges
-type AddressSpace struct {
-	Parent          *AddressSpace
-	Network         *net.IPNet
-	Pool            *ip.Range
-	availableRanges []*ip.Range
-}
-
-// compareIPv4 compares two IPv4 addresses.
-// Returns -1 if ip1 < ip2, 0 if they are equal,
-// and 1 if ip1 > ip2
-func compareIP4(ip1 net.IP, ip2 net.IP) int {
-	ip1 = ip1.To16()
-	ip2 = ip2.To16()
-	return bytes.Compare(ip1, ip2)
-}
-
-func incrementIP4(ip net.IP) net.IP {
-	if !isIP4(ip) {
-		return nil
-	}
-
-	newIP := copyIP(ip)
-	s := 0
-	if len(ip) == net.IPv6len {
-		s = 12
-	}
-	for i := len(newIP) - 1; i >= s; i-- {
-		newIP[i]++
-		if newIP[i] > 0 {
-			break
-		}
-	}
-
-	return newIP
-}
-
-func decrementIP4(ip net.IP) net.IP {
-	if !isIP4(ip) {
-		return nil
-	}
-
-	newIP := copyIP(ip)
-	s := 0
-	if len(ip) == net.IPv6len {
-		s = 12
-	}
-	for i := len(newIP) - 1; i >= s; i-- {
-		newIP[i]--
-		if newIP[i] != 0xff {
-			break
-		}
-	}
-
-	return newIP
-}
-
-func copyIP(ip net.IP) net.IP {
-	newIP := make([]byte, len(ip))
-	copy(newIP, ip)
-	return newIP
-}
-
-func isIP4(ip net.IP) bool {
-	return ip.To4() != nil
-}
-
-// lowestIP4 returns the lowest possible IP address
-// in an IP network. For example:
-//
-//     lowestIP4(net.IPNet{}IP: net.ParseIP("172.16.0.0"), Mask: net.CIDRMask(16, 32)}) -> 172.16.0.0
-//
-func lowestIP4(ipRange *net.IPNet) net.IP {
-	return ipRange.IP.Mask(ipRange.Mask).To16()
-}
-
-// highestIP4 returns the highest possible IP address
-// in an IP network. For example:
-//
-//     highestIP4(net.IPNet{}IP: net.ParseIP("172.16.0.0"), Mask: net.CIDRMask(16, 32)}) -> 172.16.255.255
-//
-func highestIP4(ipRange *net.IPNet) net.IP {
-	if !isIP4(ipRange.IP) {
-		return nil
-	}
-
-	newIP := net.IPv4(0, 0, 0, 0)
-	ipRange.IP = ipRange.IP.To4()
-	for i := 0; i < len(ipRange.Mask); i++ {
-		newIP[i+12] = ipRange.IP[i] | ^ipRange.Mask[i]
-	}
-
-	return newIP
-}
-
-// NewAddressSpaceFromNetwork creates a new AddressSpace from a network specification.
-func NewAddressSpaceFromNetwork(ipRange *net.IPNet) *AddressSpace {
-	s := &AddressSpace{
-		Network: ipRange,
-		Pool:    &ip.Range{FirstIP: lowestIP4(ipRange), LastIP: highestIP4(ipRange)},
-	}
-	s.availableRanges = []*ip.Range{s.Pool}
-
-	return s
-}
-
-// NewAddressSpaceFromRange creates a new AddressSpace from a range of IP addresses.
-func NewAddressSpaceFromRange(firstIP net.IP, lastIP net.IP) *AddressSpace {
-	if compareIP4(firstIP, lastIP) > 0 {
-		return nil
-	}
-
-	return &AddressSpace{
-		Pool:            &ip.Range{FirstIP: firstIP, LastIP: lastIP},
-		availableRanges: []*ip.Range{{FirstIP: firstIP, LastIP: lastIP}}}
-}
-
-func (s *AddressSpace) NextIP4Net(mask net.IPMask) (*net.IPNet, error) {
-	ones, _ := mask.Size()
-	for _, r := range s.availableRanges {
-		network := r.FirstIP.Mask(mask).To16()
-		var firstIP net.IP
-		// check if the start of the current range
-		// is lower than the network boundary
-		if compareIP4(network, r.FirstIP) >= 0 {
-			// found the start of the range
-			firstIP = network
-		} else {
-			// network address is lower than the first
-			// ip in the range; try the next network
-			// in the mask
-			for i := len(network) - 1; i >= 12; i-- {
-				partialByteIndex := ones/8 + 12
-				var inc byte
-				if i == partialByteIndex {
-					// this octet may only be occupied
-					// by the mask partially, e.g.
-					// for a /25, the last octet has
-					// only one bit in the mask
-					//
-					// in order to get the next network
-					// we need to increment starting at
-					// the last bit of the mask, e.g. 25
-					// in this example, which would be
-					// bit 8 in the last octet.
-					inc = (byte)(1 << (uint)(8-ones%8))
-				} else if i < partialByteIndex {
-					// we are past the partial octets,
-					// so this is portion where the mask
-					// occupies the octets fully, so
-					// we can just increment the last bit
-					inc = 1
-				}
-
-				if inc == 0 {
-					continue
-				}
-
-				network[i] += inc
-				if network[i] > 0 {
-					firstIP = network
-					break
-				}
-
-			}
-		}
-
-		if firstIP != nil {
-			// we found the first IP for the requested range,
-			// now check if the available range can accommodate
-			// the highest address given the first IP and the mask
-			lastIP := highestIP4(&net.IPNet{IP: firstIP, Mask: mask})
-			if compareIP4(lastIP, r.LastIP) <= 0 {
-				return &net.IPNet{IP: firstIP, Mask: mask}, nil
-			}
-		}
-	}
-
-	return nil, fmt.Errorf("could not find IP range for mask %s", mask)
-}
-
-// ReserveNextIP4Net reserves a new sub address space within the given address
-// space, given a bitmask specifying the "width" of the requested space.
-func (s *AddressSpace) ReserveNextIP4Net(mask net.IPMask) (*AddressSpace, error) {
-	n, err := s.NextIP4Net(mask)
-	if err != nil {
-		return nil, err
-	}
-
-	return s.ReserveIP4Net(n)
-}
-
-func splitRange(parentRange *ip.Range, firstIP net.IP, lastIP net.IP) (before, reserved, after *ip.Range) {
-	if !firstIP.Equal(parentRange.FirstIP) {
-		before = ip.NewRange(parentRange.FirstIP, decrementIP4(firstIP))
-	}
-	if !lastIP.Equal(parentRange.LastIP) {
-		after = ip.NewRange(incrementIP4(lastIP), parentRange.LastIP)
-	}
-
-	reserved = ip.NewRange(firstIP, lastIP)
-	return
-}
-
-// ReserveIP4Net reserves a new sub address space given an IP and mask.
-// Mask is required.
-// If IP is nil or "0.0.0.0", same as calling ReserveNextIP4Net
-// with the mask.
-func (s *AddressSpace) ReserveIP4Net(ipNet *net.IPNet) (*AddressSpace, error) {
-	if ipNet.Mask == nil {
-		return nil, fmt.Errorf("network mask not specified")
-	}
-
-	if ipNet.IP == nil || ipNet.IP.Equal(net.ParseIP("0.0.0.0")) {
-		return s.ReserveNextIP4Net(ipNet.Mask)
-	}
-
-	sub, err := s.ReserveIP4Range(lowestIP4(ipNet), highestIP4(ipNet))
-	if err != nil {
-		return nil, err
-	}
-
-	sub.Network = &net.IPNet{IP: ipNet.IP, Mask: ipNet.Mask}
-	return sub, nil
-}
-
-func (s *AddressSpace) reserveSubRange(firstIP net.IP, lastIP net.IP, index int) {
-	before, _, after := splitRange(s.availableRanges[index], firstIP, lastIP)
-	s.availableRanges = append(s.availableRanges[:index], s.availableRanges[index+1:]...)
-	if before != nil {
-		s.availableRanges = insertAddressRanges(s.availableRanges, index, before)
-		index++
-	}
-	if after != nil {
-		s.availableRanges = insertAddressRanges(s.availableRanges, index, after)
-	}
-}
-
-// ReserveIP4Range reserves a sub address space given a first and last IP.
-func (s *AddressSpace) ReserveIP4Range(firstIP net.IP, lastIP net.IP) (*AddressSpace, error) {
-	for i, r := range s.availableRanges {
-		if compareIP4(firstIP, r.FirstIP) < 0 ||
-			compareIP4(lastIP, r.LastIP) > 0 {
-			continue
-		}
-
-		// found range
-		s.reserveSubRange(firstIP, lastIP, i)
-		subSpace := NewAddressSpaceFromRange(firstIP, lastIP)
-		subSpace.Parent = s
-		return subSpace, nil
-	}
-
-	return nil, fmt.Errorf("could not find IP range")
-}
-
-func insertAddressRanges(r []*ip.Range, index int, ranges ...*ip.Range) []*ip.Range {
-	if index == len(r) {
-		return append(r, ranges...)
-	}
-
-	for i := 0; i < len(ranges); i++ {
-		r = append(r, &ip.Range{})
-	}
-
-	copy(r[index+len(ranges):], r[index:])
-	for i := 0; i < len(ranges); i++ {
-		r[index+i] = ranges[i]
-	}
-
-	return r
-}
-
-// ReserveNextIP4 reserves the next available IPv4 address.
-func (s *AddressSpace) ReserveNextIP4() (net.IP, error) {
-	space, err := s.ReserveIP4Net(&net.IPNet{Mask: net.CIDRMask(32, 32)})
-	if err != nil {
-		return nil, err
-	}
-
-	return space.availableRanges[0].FirstIP, nil
-}
-
-// ReserveIP4 reserves the given IPv4 address.
-func (s *AddressSpace) ReserveIP4(ip net.IP) error {
-	_, err := s.ReserveIP4Range(ip, ip)
-	return err
-}
-
-// ReleaseIP4Range releases a sub address space into the parent address space.
-// Sub address space has to have only a single available range.
-func (s *AddressSpace) ReleaseIP4Range(space *AddressSpace) error {
-	// nothing to release
-	if space == nil || len(space.availableRanges) == 0 {
-		return nil
-	}
-
-	if space.Parent != s {
-		return fmt.Errorf("cannot release subspace into another parent")
-	}
-
-	// cannot release a range if it has more than one available sub range
-	if len(space.availableRanges) > 1 {
-		return fmt.Errorf("can not release an address space with more than one available range")
-	}
-
-	firstIP := space.availableRanges[0].FirstIP
-	lastIP := space.availableRanges[0].LastIP
-	if compareIP4(firstIP, lastIP) > 0 {
-		return fmt.Errorf("address space first ip %s is greater than last ip %s", firstIP, lastIP)
-	}
-
-	i := 0
-	for ; i < len(s.availableRanges); i++ {
-		if compareIP4(lastIP, s.availableRanges[i].FirstIP) < 0 {
-			if i == 0 {
-				break
-			}
-
-			if i > 0 && compareIP4(firstIP, s.availableRanges[i-1].LastIP) > 0 {
-				break
-			}
-		}
-	}
-
-	if i > 0 && i == len(s.availableRanges) {
-		if compareIP4(firstIP, s.availableRanges[i-1].LastIP) <= 0 {
-			return fmt.Errorf("Could not release IP range")
-		}
-	}
-
-	s.availableRanges = insertAddressRanges(s.availableRanges, i, space.availableRanges...)
-	// #nosec: Errors unhandled.
-	s.Defragment()
-	return nil
-}
-
-// ReleaseIP4 releases the given IPv4 address.
-func (s *AddressSpace) ReleaseIP4(ip net.IP) error {
-	tmp := NewAddressSpaceFromRange(ip, ip)
-	tmp.Parent = s
-	return s.ReleaseIP4Range(tmp)
-}
-
-func (s *AddressSpace) Defragment() error {
-	for i := 1; i < len(s.availableRanges); {
-		first := s.availableRanges[i-1]
-		second := s.availableRanges[i]
-		if incrementIP4(first.LastIP).Equal(second.FirstIP) {
-			first.LastIP = second.LastIP
-			s.availableRanges = append(s.availableRanges[:i], s.availableRanges[i+1:]...)
-		} else {
-			i++
-		}
-	}
-
-	return nil
-}
-
-// Equal compares two address spaces for equality.
-func (s *AddressSpace) Equal(other *AddressSpace) bool {
-	if len(s.availableRanges) != len(other.availableRanges) {
-		return false
-	}
-
-	for i := 0; i < len(s.availableRanges); i++ {
-		if compareIP4(s.availableRanges[i].FirstIP, other.availableRanges[i].FirstIP) != 0 ||
-			compareIP4(s.availableRanges[i].LastIP, other.availableRanges[i].LastIP) != 0 {
-			return false
-		}
-	}
-
-	return true
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam_test.go
deleted file mode 100644
index 88e94e05a7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/ipam_test.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"net"
-	"testing"
-)
-
-func TestIncrementIP4(t *testing.T) {
-	var tests = []struct {
-		in  net.IP
-		out net.IP
-	}{
-		{net.IPv6loopback, nil},
-		{net.ParseIP("10.10.10.255"), net.ParseIP("10.10.11.0")},
-		{net.ParseIP("10.10.255.255"), net.ParseIP("10.11.0.0")},
-		{net.ParseIP("10.255.255.255"), net.ParseIP("11.0.0.0")},
-		{net.ParseIP("255.255.255.255"), net.ParseIP("0.0.0.0")},
-	}
-
-	for _, te := range tests {
-		ip := incrementIP4(te.in)
-		if !te.out.Equal(ip) {
-			t.Errorf("got: %s, expected: %s", ip, te.out)
-		}
-	}
-}
-
-func TestDecrementIP4(t *testing.T) {
-	var tests = []struct {
-		in  net.IP
-		out net.IP
-	}{
-		{net.IPv6loopback, nil},
-		{net.ParseIP("10.10.10.0"), net.ParseIP("10.10.9.255")},
-		{net.ParseIP("10.10.0.0"), net.ParseIP("10.9.255.255")},
-		{net.ParseIP("10.0.0.0"), net.ParseIP("9.255.255.255")},
-		{net.ParseIP("0.0.0.0"), net.ParseIP("255.255.255.255")},
-	}
-
-	for _, te := range tests {
-		ip := decrementIP4(te.in)
-		if !te.out.Equal(ip) {
-			t.Errorf("got: %s, expected: %s", ip, te.out)
-		}
-	}
-}
-
-func TestCompareIP4(t *testing.T) {
-	ips := []net.IP{
-		net.ParseIP("10.10.10.10"),
-		net.ParseIP("10.10.10.9"),
-		net.ParseIP("10.10.9.9"),
-		net.ParseIP("10.9.9.9"),
-		net.ParseIP("9.9.9.9")}
-
-	for i := 0; i < len(ips)-1; i++ {
-		if res := compareIP4(ips[i+1], ips[i]); res != -1 {
-			t.Fatalf("comparing %s %s got: %v, expected: -1", ips[i+1], ips[i], res)
-		}
-		if res := compareIP4(ips[i], ips[i+1]); res != 1 {
-			t.Fatalf("comparing %s %s got: %v, expected: 1", ips[i], ips[i+1], res)
-		}
-		if res := compareIP4(ips[i], ips[i]); res != 0 {
-			t.Fatalf("comparing %s %s got: %v expected: 0", ips[i], ips[i], res)
-		}
-	}
-}
-
-func TestIsIP4(t *testing.T) {
-	ip4 := net.IPv4(10, 10, 10, 10)
-	if !isIP4(ip4) {
-		t.Fatalf("ip %s got: false expected: true", ip4)
-	}
-	ip6 := net.IPv6loopback
-	if isIP4(ip6) {
-		t.Fatalf("ip %s got: true, expected: false", ip6)
-	}
-}
-
-func TestLowestIP4(t *testing.T) {
-	r := &net.IPNet{IP: net.ParseIP("10.10.10.10").To4(), Mask: net.CIDRMask(24, 32)}
-	ip := net.ParseIP("10.10.10.0")
-	if res := lowestIP4(r); !res.Equal(ip) {
-		t.Errorf("range %s got: %s expected %s", r, res, ip)
-	}
-}
-
-func TestHighestIP4(t *testing.T) {
-	var tests = []struct {
-		in  *net.IPNet
-		out net.IP
-	}{
-		{&net.IPNet{IP: net.IPv6loopback}, nil},
-		{&net.IPNet{IP: net.ParseIP("10.10.10.10").To4(), Mask: net.CIDRMask(24, 32)}, net.ParseIP("10.10.10.255")},
-	}
-
-	for _, te := range tests {
-		if res := highestIP4(te.in); !res.Equal(te.out) {
-			t.Errorf("range %s got: %s expected %s", te.in, res, te.out)
-		}
-	}
-}
-
-func TestReserveIP4(t *testing.T) {
-	space := NewAddressSpaceFromRange(net.ParseIP("10.10.10.10"),
-		net.ParseIP("10.10.10.11"))
-
-	ip, err := space.ReserveNextIP4()
-	expected := net.ParseIP("10.10.10.10")
-	if err != nil || !ip.Equal(expected) {
-		t.Errorf("got: %s, %s expected: %s, nil", ip, err, expected)
-	}
-
-	ip, err = space.ReserveNextIP4()
-	expected = net.ParseIP("10.10.10.11")
-	if err != nil || !ip.Equal(expected) {
-		t.Errorf("got: %s, %s expected: %s, nil", ip, err, expected)
-	}
-
-	ip, err = space.ReserveNextIP4()
-	if err == nil {
-		t.Errorf("got: %s, %s expected: nil, error", ip, err)
-	}
-}
-
-func TestReleaseIP4(t *testing.T) {
-	space := NewAddressSpaceFromRange(net.ParseIP("10.10.10.10"),
-		net.ParseIP("10.10.10.11"))
-
-	ip, err := space.ReserveNextIP4()
-	expected := net.ParseIP("10.10.10.10")
-	if err != nil || !ip.Equal(expected) {
-		t.Errorf("got: %s, %s expected: %s, nil", ip, err, expected)
-	}
-
-	ip, err = space.ReserveNextIP4()
-	expected = net.ParseIP("10.10.10.11")
-	if err != nil || !ip.Equal(expected) {
-		t.Errorf("got: %s, %s expected: %s, nil", ip, err, expected)
-	}
-
-	ip, err = space.ReserveNextIP4()
-	if err == nil {
-		t.Errorf("got: %s, %s expected: nil, error", ip, err)
-	}
-
-	err = space.ReleaseIP4(net.ParseIP("10.10.10.10"))
-	if err != nil {
-		t.Errorf("got: %s expected: nil", err)
-	}
-
-	err = space.ReleaseIP4(net.ParseIP("10.10.10.10"))
-	if err == nil {
-		t.Errorf("got: nil expected: error")
-	}
-
-	err = space.ReleaseIP4(net.ParseIP("10.10.10.11"))
-	if err != nil {
-		t.Errorf("got: %s expected: nil", err)
-	}
-
-	ip, err = space.ReserveNextIP4()
-	expected = net.ParseIP("10.10.10.10")
-	if err != nil || !ip.Equal(expected) {
-		t.Errorf("got: %s, %s expected: %s, nil", ip, err, expected)
-	}
-
-}
-
-func TestReserveNextIP4Net(t *testing.T) {
-	_, net1, _ := net.ParseCIDR("172.16.0.0/12")
-	space := NewAddressSpaceFromNetwork(net1)
-	firstIP := net.IPv4(172, 16, 0, 0)
-	lastIP := net.IPv4(172, 16, 255, 255)
-	totalSubspaces := 0
-	subspace, err := space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	for err == nil {
-		totalSubspaces++
-		if compareIP4(firstIP, subspace.availableRanges[0].FirstIP) != 0 {
-			t.Errorf("got: %s, expected: %s", subspace.availableRanges[0].FirstIP, firstIP)
-		}
-		if compareIP4(lastIP, subspace.availableRanges[0].LastIP) != 0 {
-			t.Errorf("got: %s, expected: %s", subspace.availableRanges[0].LastIP, lastIP)
-		}
-		firstIP = net.IPv4(172, firstIP[13]+1, 0, 0)
-		lastIP = net.IPv4(172, lastIP[13]+1, 255, 255)
-		subspace, err = space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	}
-
-	if totalSubspaces != 16 {
-		t.Errorf("got: %d, expected: 16", totalSubspaces)
-	}
-
-	space = NewAddressSpaceFromNetwork(net1)
-	// peal off one ip from the range
-	ip, err := space.ReserveNextIP4()
-	if !ip.Equal(net.ParseIP("172.16.0.0")) {
-		t.Errorf("got: %s, expected: 172.16.0.0", ip)
-	}
-	subSpace, err := space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	ip, err = subSpace.ReserveNextIP4()
-	if compareIP4(ip, net.ParseIP("172.17.0.0")) != 0 {
-		t.Errorf("got: %s, expected: %s", ip, net.ParseIP("172.17.0.0"))
-	}
-
-	subSpace, err = space.ReserveNextIP4Net(net.CIDRMask(15, 32))
-	ip, err = subSpace.ReserveNextIP4()
-	if compareIP4(ip, net.ParseIP("172.18.0.0")) != 0 {
-		t.Errorf("got: %s, expected: %s", ip, net.ParseIP("172.18.0.0"))
-	}
-}
-
-func TestReserveIP4Net(t *testing.T) {
-	ipNet := &net.IPNet{IP: net.ParseIP("172.16.0.0"), Mask: net.CIDRMask(12, 32)}
-	space := NewAddressSpaceFromNetwork(ipNet)
-	// no mask
-	_, err := space.ReserveIP4Net(&net.IPNet{IP: net.ParseIP("10.10.10.10")})
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-
-	// IP == nil, Mask != nil
-	_, err = space.ReserveIP4Net(&net.IPNet{Mask: net.CIDRMask(12, 32)})
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	_, err = space.ReserveNextIP4()
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-	space = NewAddressSpaceFromNetwork(ipNet)
-
-	// ip == "0.0.0.0", Mask != nil
-	_, err = space.ReserveIP4Net(&net.IPNet{IP: net.ParseIP("0.0.0.0"), Mask: net.CIDRMask(12, 32)})
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	_, err = space.ReserveNextIP4()
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-	space = NewAddressSpaceFromNetwork(ipNet)
-
-	// reserve the full space
-	_, err = space.ReserveIP4Net(ipNet)
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	// no more ips left
-	_, err = space.ReserveNextIP4()
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-}
-
-func TestReserveIP4Range(t *testing.T) {
-	s := NewAddressSpaceFromNetwork(&net.IPNet{IP: net.IPv4(10, 10, 10, 0), Mask: net.CIDRMask(24, 32)})
-	s.ReserveNextIP4()
-	// try to reserve an unavailable range
-	_, err := s.ReserveIP4Range(net.IPv4(10, 10, 10, 0), net.IPv4(10, 10, 10, 255))
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-}
-
-func TestReleaseIP4Range(t *testing.T) {
-	_, net1, _ := net.ParseCIDR("172.16.0.0/12")
-	space := NewAddressSpaceFromNetwork(net1)
-	err := space.ReleaseIP4Range(nil)
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-
-	// reserve the full range
-	subSpaces := make([]*AddressSpace, 16)
-	totalReserved := 0
-	subSpaces[0], err = space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	totalReserved++
-	for i := 1; i < len(subSpaces) && err == nil; i++ {
-		totalReserved++
-		subSpaces[i], err = space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	}
-	if totalReserved != 16 {
-		t.Errorf("got: %d, expected: 16", totalReserved)
-	}
-
-	// release a range at the beginning
-	err = space.ReleaseIP4Range(subSpaces[0])
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-
-	// try to release an already released range
-	err = space.ReleaseIP4Range(subSpaces[0])
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-
-	// release a range in the middle
-	err = space.ReleaseIP4Range(subSpaces[5])
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-
-	// release a range at the end
-	err = space.ReleaseIP4Range(subSpaces[len(subSpaces)-1])
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-
-	// try to reserve a released range
-	subspace, err := space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	if err != nil || !subSpaces[0].Equal(subspace) {
-		t.Fail()
-	}
-
-	space = NewAddressSpaceFromNetwork(net1)
-	// get a sub space
-	subSpace, err := space.ReserveNextIP4Net(net.CIDRMask(16, 32))
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	// fragment the sub space
-	err = subSpace.ReserveIP4(net.ParseIP("172.16.0.2"))
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-	// try to release it; should fail
-	err = space.ReleaseIP4Range(subSpace)
-	if err == nil {
-		t.Errorf("got: nil, expected: error")
-	}
-}
-
-func TestDefragment(t *testing.T) {
-	_, net1, _ := net.ParseCIDR("172.16.0.0/24")
-	space := NewAddressSpaceFromNetwork(net1)
-	ip, _ := space.ReserveNextIP4()
-	if compareIP4(ip, net.ParseIP("172.16.0.0")) != 0 {
-		t.Errorf("got: %s, expected: %s", ip, net.ParseIP("172.16.0.0"))
-	}
-
-	err := space.ReserveIP4(net.ParseIP("172.16.0.24"))
-	if err != nil {
-		t.Errorf("got: %s, expected: nil", err)
-	}
-
-	space.ReleaseIP4(ip)
-	if len(space.availableRanges) != 2 {
-		t.Errorf("got: %d, expected: 2", len(space.availableRanges))
-	}
-
-	space.Defragment()
-	if len(space.availableRanges) != 2 {
-		t.Errorf("got: %d, expected: 2", len(space.availableRanges))
-	}
-
-	space.ReleaseIP4(net.ParseIP("172.16.0.24"))
-	if len(space.availableRanges) != 1 {
-		t.Errorf("got: %d, expected: 1", len(space.availableRanges))
-	}
-
-	space.Defragment()
-	if len(space.availableRanges) != 1 {
-		t.Errorf("got: %d, expected: 1", len(space.availableRanges))
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link.go
deleted file mode 100644
index ef6a4433d2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import "net"
-
-type Link interface {
-	AddrAdd(net.IPNet) error
-	AddrDel(net.IPNet) error
-	Attrs() *LinkAttrs
-}
-
-type LinkAttrs struct {
-	Name string
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_darwin.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_darwin.go
deleted file mode 100644
index 3a7d618a8b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_darwin.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import "fmt"
-
-func LinkByName(name string) (Link, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func LinkByAlias(alias string) (Link, error) {
-	return nil, fmt.Errorf("not implemented")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_linux.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_linux.go
deleted file mode 100644
index 76d76930ae..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_linux.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import "net"
-import "github.com/vishvananda/netlink"
-
-type link struct {
-	netlink.Link
-
-	attrs *LinkAttrs
-}
-
-func newLink(l netlink.Link) Link {
-	attrs := &LinkAttrs{Name: l.Attrs().Name}
-	return &link{Link: l, attrs: attrs}
-}
-
-func LinkByName(name string) (Link, error) {
-	l, err := netlink.LinkByName(name)
-	if err != nil {
-		return nil, err
-	}
-
-	return newLink(l), nil
-}
-
-func LinkByAlias(alias string) (Link, error) {
-	l, err := netlink.LinkByAlias(alias)
-	if err != nil {
-		return nil, err
-	}
-
-	return newLink(l), nil
-}
-
-func (l *link) AddrAdd(addr net.IPNet) error {
-	return netlink.AddrAdd(l.Link, &netlink.Addr{IPNet: &addr})
-}
-
-func (l *link) AddrDel(addr net.IPNet) error {
-	return netlink.AddrDel(l.Link, &netlink.Addr{IPNet: &addr})
-}
-
-func (l *link) Attrs() *LinkAttrs {
-	return l.attrs
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_windows.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_windows.go
deleted file mode 100644
index 3a7d618a8b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/link_windows.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import "fmt"
-
-func LinkByName(name string) (Link, error) {
-	return nil, fmt.Errorf("not implemented")
-}
-
-func LinkByAlias(alias string) (Link, error) {
-	return nil, fmt.Errorf("not implemented")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/network.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/network.go
deleted file mode 100644
index 31c3f7f972..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/network.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"context"
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/event"
-	"github.com/vmware/vic/lib/portlayer/event/events"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/store"
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/uid"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-var (
-	DefaultContext *Context
-
-	initializer struct {
-		err  error
-		once sync.Once
-	}
-)
-
-type DuplicateResourceError struct {
-	resID string
-}
-
-type ResourceNotFoundError struct {
-	error
-}
-
-func (e DuplicateResourceError) Error() string {
-	return fmt.Sprintf("%s already exists", e.resID)
-}
-
-func Init(ctx context.Context, sess *session.Session, source extraconfig.DataSource, sink extraconfig.DataSink) error {
-	trace.End(trace.Begin(""))
-
-	initializer.once.Do(func() {
-		var err error
-		defer func() {
-			initializer.err = err
-		}()
-
-		f := find.NewFinder(sess.Vim25(), false)
-
-		var config Configuration
-		config.sink = sink
-		config.source = source
-		config.Decode()
-		config.PortGroups = make(map[string]object.NetworkReference)
-
-		log.Debugf("Decoded VCH config for network: %#v", config)
-		for nn, n := range config.ContainerNetworks {
-			pgref := new(types.ManagedObjectReference)
-			if !pgref.FromString(n.ID) {
-				log.Warnf("Could not reacquire object reference from id for network %s: %s", nn, n.ID)
-			}
-
-			var r object.Reference
-			if r, err = f.ObjectReference(ctx, *pgref); err != nil {
-				log.Warnf("could not get network reference for %s network: %s", nn, err)
-				err = nil
-				continue
-			}
-
-			config.PortGroups[nn] = r.(object.NetworkReference)
-		}
-
-		// make sure a NIC attached to the bridge network exists
-		config.BridgeLink, err = getBridgeLink(&config)
-		if err != nil {
-			return
-		}
-
-		var kv kvstore.KeyValueStore
-		kv, err = store.NewDatastoreKeyValue(ctx, sess, "network.contexts.default")
-		if err != nil {
-			return
-		}
-
-		var netctx *Context
-		if netctx, err = NewContext(&config, kv); err != nil {
-			return
-		}
-
-		if err = engageContext(ctx, netctx, exec.Config.EventManager); err == nil {
-			DefaultContext = netctx
-			log.Infof("Default network context allocated")
-		}
-	})
-
-	return initializer.err
-}
-
-// handleEvent processes events
-func handleEvent(netctx *Context, ie events.Event) {
-	switch ie.String() {
-	case events.ContainerPoweredOff:
-		handle := exec.GetContainer(context.Background(), uid.Parse(ie.Reference()))
-		if handle == nil {
-			_, err := netctx.RemoveIDFromScopes(ie.Reference())
-			if err != nil {
-				log.Errorf("Failed to remove container %s scope: %s", ie.Reference(), err)
-			}
-			return
-		}
-		defer handle.Close()
-
-		if _, err := netctx.UnbindContainer(handle); err != nil {
-			log.Warnf("Failed to unbind container %s: %s", ie.Reference(), err)
-			return
-		}
-
-		if err := handle.Commit(context.Background(), nil, nil); err != nil {
-			log.Warnf("Failed to commit handle after network unbind for container %s: %s", ie.Reference(), err)
-		}
-
-	}
-	return
-}
-
-// engageContext connects the given network context into a vsphere environment
-// using an event manager, and a container cache. This hooks up a callback to
-// react to vsphere events, as well as populate the context with any containers
-// that are present.
-func engageContext(ctx context.Context, netctx *Context, em event.EventManager) error {
-	var err error
-
-	// grab the context lock so that we do not unbind any containers
-	// that stop out of band. this could cause, for example, for us
-	// to bind a container when it has already been unbound by an
-	// event callback
-	netctx.Lock()
-	defer netctx.Unlock()
-
-	// subscribe to the event stream for Vm events
-	if em == nil {
-		return fmt.Errorf("event manager is required for default network context")
-	}
-
-	sub := fmt.Sprintf("%s(%p)", "netCtx", netctx)
-	topic := events.NewEventType(events.ContainerEvent{}).Topic()
-	s := em.Subscribe(topic, sub, func(ie events.Event) {
-		handleEvent(netctx, ie)
-	})
-
-	defer func() {
-		if err != nil {
-			em.Unsubscribe(topic, sub)
-		}
-	}()
-
-	s.Suspend(true)
-	defer s.Resume()
-	for _, c := range exec.Containers.Containers(nil) {
-		log.Debugf("adding container %s", c)
-		h := c.NewHandle(ctx)
-		defer h.Close()
-
-		// add any user created networks that show up in container's config
-		for n, ne := range h.ExecConfig.Networks {
-			var s []*Scope
-			s, err = netctx.findScopes(&n)
-			if err != nil {
-				if _, ok := err.(ResourceNotFoundError); !ok {
-					return err
-				}
-			}
-
-			if len(s) > 0 {
-				continue
-			}
-
-			pools := make([]string, len(ne.Network.Pools))
-			for i := range ne.Network.Pools {
-				pools[i] = ne.Network.Pools[i].String()
-			}
-
-			log.Debugf("adding scope %s", n)
-
-			scopeData := &ScopeData{
-				ScopeType: ne.Network.Type,
-				Name:      n,
-				Subnet:    &ne.Network.Gateway,
-				Gateway:   ne.Network.Gateway.IP,
-				DNS:       ne.Network.Nameservers,
-				Pools:     pools,
-			}
-			if _, err = netctx.newScope(scopeData); err != nil {
-				return err
-			}
-		}
-
-		if c.CurrentState() == exec.StateRunning {
-			if _, err = netctx.bindContainer(h); err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func getBridgeLink(config *Configuration) (Link, error) {
-	// add the gateway address to the bridge interface
-	link, err := LinkByName(config.BridgeNetwork)
-	if err != nil {
-		// lookup by alias
-		return LinkByAlias(config.BridgeNetwork)
-	}
-
-	return link, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/port.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/port.go
deleted file mode 100644
index 781e0ccb1c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/port.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/docker/go-connections/nat"
-)
-
-type Port string
-
-const NilPort = Port("")
-
-func ParsePort(p string) (Port, error) {
-	if _, err := Port(p).Port(); err != nil {
-		return NilPort, err
-	}
-	proto := Port(p).Proto()
-	if proto == "" {
-		return NilPort, fmt.Errorf("bad port spec %s", p)
-	}
-
-	return Port(p), nil
-}
-
-func (p Port) Proto() string {
-	proto, _ := nat.SplitProtoPort(string(p))
-	return proto
-}
-
-func (p Port) Port() (uint16, error) {
-	_, port := nat.SplitProtoPort(string(p))
-	if port == "" {
-		return 0, fmt.Errorf("bad port spec %s", p)
-	}
-
-	pout, err := strconv.Atoi(port)
-	if err != nil {
-		return 0, fmt.Errorf("bad port spec %s", p)
-	}
-
-	return uint16(pout), nil
-}
-
-func (p Port) String() string {
-	return string(p)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope.go
deleted file mode 100644
index 529dc9bca0..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope.go
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"encoding/json"
-	"fmt"
-	"net"
-	"sync"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-type Scope struct {
-	sync.RWMutex
-
-	id          uid.UID
-	name        string
-	scopeType   string
-	subnet      *net.IPNet
-	gateway     net.IP
-	dns         []net.IP
-	trustLevel  executor.TrustLevel
-	containers  map[uid.UID]*Container
-	endpoints   []*Endpoint
-	spaces      []*AddressSpace
-	builtin     bool
-	network     object.NetworkReference
-	annotations map[string]string
-	internal    bool
-}
-
-func newScope(id uid.UID, scopeType string, network object.NetworkReference, scopeData *ScopeData) *Scope {
-	return &Scope{
-		id:          id,
-		name:        scopeData.Name,
-		scopeType:   scopeType,
-		subnet:      scopeData.Subnet,
-		gateway:     scopeData.Gateway,
-		dns:         scopeData.DNS,
-		trustLevel:  scopeData.TrustLevel,
-		network:     network,
-		containers:  make(map[uid.UID]*Container),
-		annotations: make(map[string]string),
-		internal:    scopeData.Internal,
-	}
-}
-
-func (s *Scope) Annotations() map[string]string {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.annotations
-}
-
-func (s *Scope) Name() string {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.name
-}
-
-func (s *Scope) ID() uid.UID {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.id
-}
-
-func (s *Scope) Type() string {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.scopeType
-}
-
-func (s *Scope) Internal() bool {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.internal
-}
-
-func (s *Scope) Network() object.NetworkReference {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.network
-}
-
-func (s *Scope) isDynamic() bool {
-	return s.scopeType != constants.BridgeScopeType && len(s.spaces) == 0
-}
-
-func (s *Scope) Pools() []*ip.Range {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.pools()
-}
-
-func (s *Scope) TrustLevel() executor.TrustLevel {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.trustLevel
-}
-
-func (s *Scope) pools() []*ip.Range {
-	pools := make([]*ip.Range, len(s.spaces))
-	for i := range s.spaces {
-		sp := s.spaces[i]
-		if sp.Network != nil {
-			r := ip.ParseRange(sp.Network.String())
-			if r == nil {
-				continue
-			}
-			pools[i] = r
-			continue
-		}
-
-		pools[i] = sp.Pool
-	}
-
-	return pools
-}
-
-func (s *Scope) reserveEndpointIP(e *Endpoint) error {
-	if s.isDynamic() {
-		return nil
-	}
-
-	// reserve an ip address
-	var err error
-	for _, p := range s.spaces {
-		if !ip.IsUnspecifiedIP(e.ip) {
-			if err = p.ReserveIP4(e.ip); err == nil {
-				return nil
-			}
-		} else {
-			var eip net.IP
-			if eip, err = p.ReserveNextIP4(); err == nil {
-				e.ip = eip
-				return nil
-			}
-		}
-	}
-
-	return err
-}
-
-func (s *Scope) releaseEndpointIP(e *Endpoint) error {
-	if s.isDynamic() {
-		return nil
-	}
-
-	for _, p := range s.spaces {
-		if err := p.ReleaseIP4(e.ip); err == nil {
-			if !e.static {
-				e.ip = net.IPv4(0, 0, 0, 0)
-			}
-			return nil
-		}
-	}
-
-	return fmt.Errorf("could not release IP for endpoint")
-}
-
-func (s *Scope) AddContainer(con *Container, e *Endpoint) error {
-	s.Lock()
-	defer s.Unlock()
-
-	if con == nil {
-		return fmt.Errorf("container is nil")
-	}
-
-	_, ok := s.containers[con.id]
-	if ok {
-		return DuplicateResourceError{resID: con.id.String()}
-	}
-
-	if err := s.reserveEndpointIP(e); err != nil {
-		return err
-	}
-
-	con.addEndpoint(e)
-	s.endpoints = append(s.endpoints, e)
-	s.containers[con.id] = con
-	return nil
-}
-
-func (s *Scope) RemoveContainer(con *Container) error {
-	s.Lock()
-	defer s.Unlock()
-
-	c, ok := s.containers[con.id]
-	if !ok || c != con {
-		return ResourceNotFoundError{}
-	}
-
-	e := c.Endpoint(s)
-	if e == nil {
-		return ResourceNotFoundError{}
-	}
-
-	if err := s.releaseEndpointIP(e); err != nil {
-		return err
-	}
-
-	delete(s.containers, c.id)
-	s.endpoints = removeEndpointHelper(e, s.endpoints)
-	c.removeEndpoint(e)
-	return nil
-}
-
-func (s *Scope) Containers() []*Container {
-	s.RLock()
-	defer s.RUnlock()
-
-	containers := make([]*Container, len(s.containers))
-	i := 0
-	for _, c := range s.containers {
-		containers[i] = c
-		i++
-	}
-
-	return containers
-}
-
-func (s *Scope) Container(id uid.UID) *Container {
-	s.RLock()
-	defer s.RUnlock()
-
-	if c, ok := s.containers[id]; ok {
-		return c
-	}
-
-	return nil
-}
-
-func (s *Scope) ContainerByAddr(addr net.IP) *Endpoint {
-	s.RLock()
-	defer s.RUnlock()
-
-	if addr == nil || addr.IsUnspecified() {
-		return nil
-	}
-
-	for _, e := range s.endpoints {
-		if addr.Equal(e.IP()) {
-			return e
-		}
-	}
-
-	return nil
-}
-
-func (s *Scope) Endpoints() []*Endpoint {
-	s.RLock()
-	defer s.RUnlock()
-
-	eps := make([]*Endpoint, len(s.endpoints))
-	copy(eps, s.endpoints)
-	return eps
-}
-
-func (s *Scope) Subnet() *net.IPNet {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.subnet
-}
-
-func (s *Scope) Gateway() net.IP {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.gateway
-}
-
-func (s *Scope) DNS() []net.IP {
-	s.RLock()
-	defer s.RUnlock()
-
-	return s.dns
-}
-
-type scopeJSON struct {
-	ID          uid.UID
-	Name        string
-	Type        string
-	Subnet      *net.IPNet
-	Gateway     net.IP
-	DNS         []net.IP
-	Builtin     bool
-	Pools       []*ip.Range
-	Annotations map[string]string
-	Internal    bool
-}
-
-func (s *Scope) MarshalJSON() ([]byte, error) {
-	s.RLock()
-	defer s.RUnlock()
-
-	return json.Marshal(&scopeJSON{
-		ID:          s.id,
-		Name:        s.name,
-		Type:        s.scopeType,
-		Subnet:      s.subnet,
-		Gateway:     s.gateway,
-		DNS:         s.dns,
-		Builtin:     s.builtin,
-		Pools:       s.pools(),
-		Annotations: s.annotations,
-		Internal:    s.internal,
-	})
-}
-
-func (s *Scope) UnmarshalJSON(data []byte) error {
-	s.Lock()
-	defer s.Unlock()
-
-	var sj scopeJSON
-	if err := json.Unmarshal(data, &sj); err != nil {
-		return err
-	}
-
-	ns := Scope{
-		containers:  make(map[uid.UID]*Container),
-		annotations: make(map[string]string),
-	}
-	ns.id = sj.ID
-	ns.name = sj.Name
-	ns.scopeType = sj.Type
-	ns.subnet = sj.Subnet
-	ns.gateway = sj.Gateway
-	ns.dns = sj.DNS
-	ns.builtin = sj.Builtin
-	ns.spaces = make([]*AddressSpace, len(sj.Pools))
-	for i := range sj.Pools {
-		sp := NewAddressSpaceFromRange(sj.Pools[i].FirstIP, sj.Pools[i].LastIP)
-		if sp == nil {
-			return fmt.Errorf("invalid pool %s in scope %s", sj.Pools[i].String(), sj.Name)
-		}
-
-		ns.spaces[i] = sp
-	}
-
-	for k, v := range sj.Annotations {
-		ns.annotations[k] = v
-	}
-
-	ns.internal = sj.Internal
-
-	s.swap(&ns)
-
-	return nil
-}
-
-func (s *Scope) swap(other *Scope) {
-	s.id, other.id = other.id, s.id
-	s.name, other.name = other.name, s.name
-	s.scopeType, other.scopeType = other.scopeType, s.scopeType
-	s.subnet, other.subnet = other.subnet, s.subnet
-	s.gateway, other.gateway = other.gateway, s.gateway
-	s.dns, other.dns = other.dns, s.dns
-	s.builtin, other.builtin = other.builtin, s.builtin
-	s.spaces, other.spaces = other.spaces, s.spaces
-	s.endpoints, other.endpoints = other.endpoints, s.endpoints
-	s.containers, other.containers = other.containers, s.containers
-	s.network, other.network = other.network, s.network
-	s.annotations, other.annotations = other.annotations, s.annotations
-	s.internal, other.internal = other.internal, s.internal
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope_test.go
deleted file mode 100644
index 396807da97..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/network/scope_test.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package network
-
-import (
-	"fmt"
-	"net"
-	"reflect"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/uid"
-)
-
-func makeIP(a, b, c, d byte) *net.IP {
-	i := net.IPv4(a, b, c, d)
-	return &i
-}
-
-var addEthernetCardOrig = addEthernetCard
-var addEthernetCardErr = func(_ *exec.Handle, _ *Scope) (types.BaseVirtualDevice, error) {
-	return nil, fmt.Errorf("")
-}
-
-func TestScopeAddRemoveContainer(t *testing.T) {
-	var err error
-	ctx, err := NewContext(testConfig(), nil)
-	if err != nil {
-		t.Errorf("NewContext() => (nil, %s), want (ctx, nil)", err)
-		return
-	}
-
-	s := ctx.defaultScope
-
-	idFoo := uid.New()
-	idBar := uid.New()
-
-	var tests1 = []struct {
-		c   *Container
-		ip  *net.IP
-		out *Endpoint
-		err error
-	}{
-		// no container
-		{nil, nil, nil, fmt.Errorf("")},
-		// add a new container to scope
-		{&Container{id: idFoo}, nil, &Endpoint{ip: net.IPv4(172, 16, 0, 2), scope: s}, nil},
-		// container already part of scope
-		{&Container{id: idFoo}, nil, nil, DuplicateResourceError{}},
-		// container with ip
-		{&Container{id: idBar}, makeIP(172, 16, 0, 3), &Endpoint{ip: net.IPv4(172, 16, 0, 3), scope: s, static: true}, nil},
-	}
-
-	for _, te := range tests1 {
-		e := newEndpoint(te.c, s, te.ip, nil)
-		err = s.AddContainer(te.c, e)
-		if te.err != nil {
-			if err == nil {
-				t.Errorf("s.AddContainer() => (_, nil), want (_, err)")
-				continue
-			}
-
-			if reflect.TypeOf(err) != reflect.TypeOf(te.err) {
-				t.Errorf("s.AddContainer() => (_, %v), want (_, %v)", reflect.TypeOf(err), reflect.TypeOf(te.err))
-				continue
-			}
-
-			if te.c == nil {
-				continue
-			}
-
-			// for any other error other than DuplicateResourcError
-			// verify that the container was not added
-			if _, ok := err.(DuplicateResourceError); !ok {
-				c := s.Container(te.c.ID())
-				if c != nil {
-					t.Errorf("s.Container(%s) => (%v, %v), want (nil, err)", te.c.ID(), c, err)
-				}
-			}
-
-			continue
-		}
-
-		if !e.IP().Equal(te.out.IP()) {
-			t.Errorf("s.AddContainer() => e.IP() == %v, want e.IP() == %v", e.IP(), te.out.IP())
-			continue
-		}
-
-		if !e.Gateway().Equal(te.out.Gateway()) {
-			t.Errorf("s.AddContainer() => e.Gateway() == %v, want e.Gateway() == %v", e.Gateway(), te.out.Gateway())
-			continue
-		}
-
-		if e.Subnet().String() != s.Subnet().String() {
-			t.Errorf("s.AddContainer() => e.Subnet() == %s, want e.Subnet() == %s", e.Subnet(), s.Subnet())
-			continue
-		}
-
-		if e.static != te.out.static {
-			t.Errorf("s.AddContainer() => e.static == %#v, want e.static == %#v", e.static, te.out.static)
-		}
-
-		if e.container.ID() != te.c.ID() {
-			t.Errorf("s.AddContainer() => e.container == %s, want e.container == %s", e.container.ID(), te.c.ID())
-			continue
-		}
-
-		found := false
-		for _, e1 := range s.Endpoints() {
-			if e1 == e {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			t.Errorf("s.endpoints does not contain %v", e)
-		}
-
-		c := s.Container(te.c.id)
-		if c == nil {
-			t.Errorf("s.Container(%s) => nil, want %v", te.c.ID(), te.c)
-			continue
-		}
-
-		if c.Endpoint(s) != e {
-			t.Errorf("container %s does not contain %v", te.c.ID(), e)
-		}
-	}
-
-	options := &AddContainerOptions{
-		Scope: ctx.defaultScope.Name(),
-	}
-	bound := exec.TestHandle("bound")
-	ctx.AddContainer(bound, options)
-	ctx.BindContainer(bound)
-
-	// test RemoveContainer
-	var tests2 = []struct {
-		c   *Container
-		err error
-	}{
-		// container not found
-		{&Container{id: "c1"}, ResourceNotFoundError{}},
-		// remove a container
-		{s.Container(idFoo), nil},
-	}
-
-	for _, te := range tests2 {
-		err = s.RemoveContainer(te.c)
-		if te.err != nil {
-			if err == nil {
-				t.Errorf("s.RemoveContainer() => nil, want %v", te.err)
-			}
-
-			continue
-		}
-
-		// container was removed, verify
-		if err != nil {
-			t.Errorf("s.RemoveContainer() => %s, want nil", err)
-			continue
-		}
-
-		c := s.Container(te.c.ID())
-		if c != nil {
-			t.Errorf("s.RemoveContainer() did not remove container %s", te.c.ID())
-			continue
-		}
-
-		for _, e := range s.endpoints {
-			if e.container.ID() == te.c.ID() {
-				t.Errorf("s.RemoveContainer() did not remove endpoint for container %s", te.c.ID())
-				break
-			}
-		}
-
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/portlayer.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/portlayer.go
deleted file mode 100644
index 90d3f34a10..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/portlayer.go
+++ /dev/null
@@ -1,185 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package portlayer
-
-import (
-	"context"
-	"fmt"
-	"path"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/portlayer/attach"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/logging"
-	"github.com/vmware/vic/lib/portlayer/metrics"
-	"github.com/vmware/vic/lib/portlayer/network"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/store"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// Init initializes portlayer components at startup
-func Init(ctx context.Context, sess *session.Session) error {
-	defer trace.End(trace.Begin(""))
-
-	source, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		return err
-	}
-
-	sink, err := extraconfig.GuestInfoSink()
-	if err != nil {
-		return err
-	}
-
-	// create or restore a portlayer k/v store in the VCH's directory.
-	vch, err := guest.GetSelf(ctx, sess)
-	if err != nil {
-		return err
-	}
-
-	vchvm := vm.NewVirtualMachineFromVM(ctx, sess, vch)
-	vmPath, err := vchvm.VMPathName(ctx)
-	if err != nil {
-		return err
-	}
-
-	// vmPath is set to the vmx.  Grab the directory from that.
-	vmFolder, err := datastore.ToURL(path.Dir(vmPath))
-	if err != nil {
-		return err
-	}
-
-	vmParentPool, err := vchvm.ResourcePool(ctx)
-	if err != nil {
-		return err
-	}
-
-	if err = storage.Init(ctx, sess, vmParentPool, source, sink); err != nil {
-		return err
-	}
-
-	if err = store.Init(ctx, sess, vmFolder); err != nil {
-		return err
-	}
-
-	if err := exec.Init(ctx, sess, source, sink); err != nil {
-		return err
-	}
-
-	if err = network.Init(ctx, sess, source, sink); err != nil {
-		return err
-	}
-
-	if err = logging.Init(ctx); err != nil {
-		return err
-	}
-
-	if err = metrics.Init(ctx, sess); err != nil {
-		return err
-	}
-
-	// Unbind containerVM serial ports configured with the old VCH IP.
-	// Useful when the appliance restarts and the VCH has a different IP.
-	TakeCareOfSerialPorts(sess)
-
-	return nil
-}
-
-// TakeCareOfSerialPorts disconnects serial ports backed by network on the VCH's old IP and connects serial ports backed by file.
-// This is useful when the appliance or the portlayer restarts and the VCH has a new IP or container vms gets migrated
-// Any errors are logged and portlayer init proceeds as usual.
-func TakeCareOfSerialPorts(sess *session.Session) {
-	defer trace.End(trace.Begin(""))
-
-	ctx := context.Background()
-
-	// Get all running containers from the portlayer cache
-	runningState := new(exec.State)
-	*runningState = exec.StateRunning
-	containers := exec.Containers.Containers(runningState)
-
-	for i := range containers {
-		var containerID string
-
-		if containers[i].ExecConfig != nil {
-			containerID = containers[i].ExecConfig.ID
-		}
-		log.Infof("unbinding serial port for running container %s", containerID)
-
-		operation := func() error {
-			// Obtain a container handle
-			handle := containers[i].NewHandle(ctx)
-			if handle == nil {
-				err := fmt.Errorf("unable to obtain a handle for container %s", containerID)
-				log.Error(err)
-
-				return err
-			}
-
-			// Unbind the network backed VirtualSerialPort
-			unbindHandle, err := attach.Unbind(handle, containerID)
-			if err != nil {
-				err := fmt.Errorf("unable to unbind serial port for container %s: %s", containerID, err)
-				log.Error(err)
-
-				return err
-			}
-
-			execHandle, ok := unbindHandle.(*exec.Handle)
-			if !ok {
-				err := fmt.Errorf("handle type assertion failed for container %s", containerID)
-				log.Error(err)
-
-				return err
-			}
-
-			// Bind the file backed VirtualSerialPort
-			bindHandle, err := logging.Bind(execHandle)
-			if err != nil {
-				err := fmt.Errorf("unable to unbind serial port for container %s: %s", containerID, err)
-				log.Error(err)
-
-				return err
-			}
-
-			execHandle, ok = bindHandle.(*exec.Handle)
-			if !ok {
-				err := fmt.Errorf("handle type assertion failed for container %s", containerID)
-				log.Error(err)
-
-				return err
-			}
-
-			// Commit the handle
-			if err := execHandle.Commit(ctx, sess, nil); err != nil {
-				log.Errorf("unable to commit handle for container %s: %s", containerID, err)
-				return err
-			}
-			return nil
-		}
-
-		if err := retry.Do(operation, exec.IsConcurrentAccessError); err != nil {
-			log.Errorf("Multiple attempts failed for committing the handle with %s", err)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/config.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/config.go
deleted file mode 100644
index 969f1e782b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/config.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/vic/lib/config"
-)
-
-var Config Configuration
-
-// Configuration is a slice of the VCH config that is relevant to the exec part of the port layer
-type Configuration struct {
-	// Turn on debug logging
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"init/diagnostics/debug"`
-
-	// Port Layer - storage
-	config.Storage `vic:"0.1" scope:"read-only" key:"storage"`
-
-	// ContainerView
-	// https://pubs.vmware.com/vsphere-6-0/index.jsp#com.vmware.wssdk.apiref.doc/vim.view.ContainerView.html
-	ContainerView *view.ContainerView
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_sink.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_sink.go
deleted file mode 100644
index 2d633ca25d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_sink.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"errors"
-	"io"
-	"os"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// MountDataSink implements the DataSink interface for mounted devices
-// This is a single use mechanism and will be tidied up on exit from MountDataSink.Import
-type MountDataSink struct {
-	Path    *os.File
-	Clean   func()
-	cleanOp trace.Operation
-}
-
-// NewMountDataSink creates a new data sink associated with a specific mount, with the mount
-// point being the path argument.
-// The cleanup function is invoked once the import is complete.
-func NewMountDataSink(op trace.Operation, path *os.File, cleanup func()) *MountDataSink {
-	if path == nil {
-		return nil
-	}
-
-	op.Debugf("Created mount data sink at %s", path.Name())
-
-	return &MountDataSink{
-		Path:    path,
-		Clean:   cleanup,
-		cleanOp: trace.FromOperation(op, "clean up from new mount sink"),
-	}
-}
-
-// Sink returns the data source associated with the DataSink
-func (m *MountDataSink) Sink() interface{} {
-	return m.Path
-}
-
-// Import writes `data` to the data source associated with this DataSource
-// This will call MountDataSink.Close on exit, irrespective of success or error
-func (m *MountDataSink) Import(op trace.Operation, spec *archive.FilterSpec, data io.ReadCloser) error {
-	// reparent cleanup to Export operation
-	m.cleanOp = trace.FromOperation(op, "clean up from export")
-	// ensure that mounts are tidied up - a data sink is a single use mechanism.
-	defer m.Close()
-
-	name := m.Path.Name()
-
-	fi, err := m.Path.Stat()
-	if err != nil {
-		op.Errorf("Unable to stat mount path %s for data sink: %s", name, err)
-		return err
-	}
-
-	if !fi.IsDir() {
-		return errors.New("Path must be a directory")
-	}
-
-	// This assumes that m.Path was opened with a useful path (i.e. absolute) as that argument is what's
-	// returned by Name.
-	op.Infof("Importing supplied data stream to %s", name)
-	return archive.Unpack(op, data, spec, name)
-}
-
-func (m *MountDataSink) Close() error {
-	m.cleanOp.Infof("cleaning up after import")
-
-	// #nosec: Errors unhandled.
-	m.Path.Close()
-	if m.Clean != nil {
-		m.Clean()
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_source.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_source.go
deleted file mode 100644
index 644deddb9e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/data_source.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"errors"
-	"io"
-	"os"
-	"path/filepath"
-	"sync"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// MountDataSource implements the DataSource interface for mounted devices
-type MountDataSource struct {
-	Path    *os.File
-	Clean   func()
-	cleanOp trace.Operation
-	cancel  func()
-	done    sync.WaitGroup
-}
-
-// NewMountDataSource creates a new data source associated with a specific mount, with the mount
-// point being the path argument.
-// The cleanup function is invoked with the Close of the ReadCloser from Export, or explicitly
-func NewMountDataSource(op trace.Operation, path *os.File, cleanup func()) *MountDataSource {
-	if path == nil {
-		return nil
-	}
-
-	op.Debugf("Created mount data source at %s", path.Name())
-
-	return &MountDataSource{
-		Path:    path,
-		Clean:   cleanup,
-		cleanOp: trace.FromOperation(op, "clean up from new mount source"),
-	}
-}
-
-// Source returns the data source associated with the DataSource
-func (m *MountDataSource) Source() interface{} {
-	return m.Path
-}
-
-// Export reads data from the associated data source and returns it as a tar archive
-func (m *MountDataSource) Export(op trace.Operation, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	// reparent cleanup to Export operation
-	m.cleanOp = trace.FromOperation(op, "clean up from export")
-	notifyOp := trace.WithValue(&op, archive.CancelNotifyKey{}, &m.done, "with cancel notifier")
-	cop, cancel := trace.WithCancel(&notifyOp, "cancellable export from mount")
-	m.cancel = cancel
-
-	name := m.Path.Name()
-	fi, err := m.Path.Stat()
-	if err != nil {
-		op.Errorf("Unable to stat mount path %s for data source: %s", name, err)
-		return nil, err
-	}
-
-	if !fi.IsDir() {
-		return nil, errors.New("path must be a directory")
-	}
-
-	op.Infof("Exporting data from %s", name)
-	// Diff is supplied "" to indicate that we are performing a read against a single target.
-	rc, err := archive.Diff(cop, name, "", spec, data, false)
-
-	// return the proxy regardless of error so that Close can be called
-	return &ProxyReadCloser{
-		rc,
-		m.Close,
-	}, err
-}
-
-// Stat stats the filesystem target indicated by the last entry in the given Filterspecs inclusion map
-func (m *MountDataSource) Stat(op trace.Operation, spec *archive.FilterSpec) (*FileStat, error) {
-	// retrieve relative path
-
-	var targetPath string
-	for path := range spec.Inclusions {
-		targetPath = path
-	}
-
-	filePath := filepath.Join(m.Path.Name(), targetPath)
-	fileInfo, err := os.Lstat(filePath)
-	if err != nil {
-		// Does not exist is an expected result so no errors logged
-		if !os.IsNotExist(err) {
-			op.Errorf("failed to stat file: %s", err)
-		}
-		return nil, err
-	}
-
-	var linkTarget string
-	// check for symlink
-	if fileInfo.Mode()&os.ModeSymlink != 0 {
-		linkTarget, err = os.Readlink(filePath)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return &FileStat{linkTarget, uint32(fileInfo.Mode()), fileInfo.Name(), fileInfo.Size(), fileInfo.ModTime()}, nil
-}
-
-func (m *MountDataSource) Close() error {
-	m.cleanOp.Infof("cleaning up after export - waiting for cancelation completion if necessary")
-
-	// trigger cancelation of any ongoing operations
-	if m.cancel != nil {
-		m.cancel()
-	}
-
-	// wait for cancelation to take effect
-	m.done.Wait()
-
-	m.Path.Close()
-	if m.Clean != nil {
-		m.cleanOp.Debugf("calling specified cleaner function")
-		m.Clean()
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/errors.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/errors.go
deleted file mode 100644
index 6a21cd04c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/errors.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-type ErrImageInUse struct {
-	Msg string
-}
-
-func (e *ErrImageInUse) Error() string {
-	return e.Msg
-}
-
-func IsErrImageInUse(err error) bool {
-	if err == nil {
-		return false
-	}
-	_, ok := err.(*ErrImageInUse)
-
-	return ok
-}
-
-type ErrVolumeInUse struct {
-	Msg string
-}
-
-func (e *ErrVolumeInUse) Error() string {
-	return e.Msg
-}
-
-func IsErrVolumeInUse(err error) bool {
-	if err == nil {
-		return false
-	}
-	_, ok := err.(*ErrVolumeInUse)
-
-	return ok
-}
-
-// VolumeStoreNotFoundError : custom error type for when we fail to find a target volume store
-type VolumeStoreNotFoundError struct {
-	Msg string
-}
-
-func (e VolumeStoreNotFoundError) Error() string {
-	return e.Msg
-}
-
-// VolumeExistsError : custom error type for when a create operation targets and already occupied ID
-type VolumeExistsError struct {
-	Msg string
-}
-
-func (e VolumeExistsError) Error() string {
-	return e.Msg
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image.go
deleted file mode 100644
index b38a1be1f3..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"errors"
-	"io"
-	"net/url"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/index"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-)
-
-// ImageStorer is an interface to store images in the Image Store
-type ImageStorer interface {
-
-	// CreateImageStore creates a location to store images and creates a root
-	// disk which serves as the parent of all layers.
-	//
-	// storeName - The name of the image store to be created.  This must be
-	// unique.
-	//
-	// Returns the URL of the created store
-	CreateImageStore(op trace.Operation, storeName string) (*url.URL, error)
-
-	// DeleteImageStore is used to cleanup the image store.  This can only be
-	// called once there are no images left in the image store.
-	DeleteImageStore(op trace.Operation, storeName string) error
-
-	// Gets the url to an image store via name
-	GetImageStore(op trace.Operation, storeName string) (*url.URL, error)
-
-	// ListImageStores lists the available image stores
-	ListImageStores(op trace.Operation) ([]*url.URL, error)
-
-	// WriteImage creates a new image layer from the given parent.  Eg
-	// parentImage + newLayer = new Image built from parent
-	//
-	// parent - The parent image to create the new image from.
-	// ID - textual ID for the image to be written
-	// meta - metadata associated with the image
-	// sum - expected sha266 sum of the image content.
-	// r - the image tar to be written
-	WriteImage(op trace.Operation, parent *Image, ID string, meta map[string][]byte, sum string, r io.Reader) (*Image, error)
-
-	// GetImage queries the image store for the specified image.
-	//
-	// store - The image store to query name - The name of the image (optional)
-	// ID - textual ID for the image to be retrieved
-	GetImage(op trace.Operation, store *url.URL, ID string) (*Image, error)
-
-	// ListImages returns a list of Images given a list of image IDs, or all
-	// images in the image store if no param is passed.
-	ListImages(op trace.Operation, store *url.URL, IDs []string) ([]*Image, error)
-
-	// DeleteImage deletes an image from the image store.  If the image is in
-	// use either by way of inheritance or because it's attached to a
-	// container, this will return an error.
-	DeleteImage(op trace.Operation, image *Image) (*Image, error)
-
-	Resolver
-	Importer
-	Exporter
-}
-
-// Image is the handle to identify an image layer on the backing store.  The
-// URI namespace used to identify the Image in the storage layer has the
-// following path scheme:
-//
-// `/storage/<image store identifier, usually the vch uuid>/<image id>`
-//
-type Image struct {
-	// ID is the identifier for this layer.  Usually a SHA
-	ID string
-
-	// SelfLink is the URL for this layer.  Filled in by the runtime.
-	SelfLink *url.URL
-
-	// ParentLink is the URL for the parent.  It's the VMDK this snapshot inherits from.
-	ParentLink *url.URL
-
-	// Store is the URL for the image store the image can be found on.
-	Store *url.URL
-
-	// Metadata associated with the image.
-	Metadata map[string][]byte
-
-	// Disk is the underlying disk implementation
-	Disk *disk.VirtualDisk
-}
-
-func (i *Image) Copy() index.Element {
-
-	// #nosec: Errors unhandled.
-	selflink, _ := url.Parse(i.SelfLink.String())
-	// #nosec: Errors unhandled.
-	store, _ := url.Parse(i.Store.String())
-
-	var parent *url.URL
-	if i.ParentLink != nil {
-		// #nosec: Errors unhandled.
-		parent, _ = url.Parse(i.ParentLink.String())
-	}
-
-	c := &Image{
-		ID:         i.ID,
-		SelfLink:   selflink,
-		ParentLink: parent,
-		Store:      store,
-	}
-
-	if i.Metadata != nil {
-		c.Metadata = make(map[string][]byte)
-
-		for k, v := range i.Metadata {
-			buf := make([]byte, len(v))
-			copy(buf, v)
-			c.Metadata[k] = buf
-		}
-	}
-	return c
-}
-
-// Returns the Selflink of the image
-func (i *Image) Self() string {
-	return i.SelfLink.String()
-}
-
-// Returns a link to the parent.  Returns link to self if there is no parent
-func (i *Image) Parent() string {
-	if i.ParentLink != nil {
-		return i.ParentLink.String()
-	}
-	return i.Self()
-}
-
-func Parse(u *url.URL) (*Image, error) {
-	// Check the path isn't malformed.
-	if !filepath.IsAbs(u.Path) {
-		return nil, errors.New("invalid uri path")
-	}
-
-	segments := strings.Split(filepath.Clean(u.Path), "/")
-	if segments[0] == "" {
-		segments = segments[1:]
-	}
-
-	if segments[0] != util.StorageURLPath {
-		return nil, errors.New("not a storage path")
-	}
-
-	if len(segments) < 3 {
-		return nil, errors.New("uri path mismatch")
-	}
-
-	store, err := util.ImageStoreNameToURL(segments[2])
-	if err != nil {
-		return nil, err
-	}
-
-	id := segments[3]
-
-	var SelfLink url.URL
-	SelfLink = *u
-
-	i := &Image{
-		ID:       id,
-		SelfLink: &SelfLink,
-		Store:    store,
-	}
-
-	return i, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache.go
deleted file mode 100644
index 956979ec27..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache.go
+++ /dev/null
@@ -1,471 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"sync"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/index"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-var Scratch = Image{
-	ID: "scratch",
-}
-
-var ErrCorruptImageStore = errors.New("Corrupt image store")
-
-// NameLookupCache the global view of all of the image stores.  To avoid unnecessary
-// lookups, the image cache keeps an in memory map of the store URI to the map
-// of images on disk.
-type NameLookupCache struct {
-
-	// The individual store locations -> Index
-	storeCache map[url.URL]*index.Index
-	// Guard against concurrent writes to the storeCache map
-	storeCacheLock sync.Mutex
-
-	// The image store implementation.  This mutates the actual disk images.
-	DataStore ImageStorer
-}
-
-func NewLookupCache(ds ImageStorer) *NameLookupCache {
-	return &NameLookupCache{
-		DataStore:  ds,
-		storeCache: make(map[url.URL]*index.Index),
-	}
-}
-
-// GetImageStore checks to see if a named image store exists and returns the
-// URL to it if so or error.
-func (c *NameLookupCache) GetImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	store, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	c.storeCacheLock.Lock()
-	defer c.storeCacheLock.Unlock()
-
-	// check the cache
-	_, ok := c.storeCache[*store]
-
-	if !ok {
-		op.Infof("Refreshing image cache from datastore.")
-		// Store isn't in the cache.  Look it up in the datastore.
-		storeName, err := util.ImageStoreName(store)
-		if err != nil {
-			return nil, err
-		}
-
-		// If the store doesn't exist, we'll fall out here.
-		_, err = c.DataStore.GetImageStore(op, storeName)
-		if err != nil {
-			return nil, err
-		}
-
-		indx := index.NewIndex()
-
-		c.storeCache[*store] = indx
-
-		// Add Scratch
-		scratch, err := c.DataStore.GetImage(op, store, Scratch.ID)
-		if err != nil {
-			op.Errorf("ImageCache Error: looking up scratch on %s: %s", store.String(), err)
-			return nil, ErrCorruptImageStore
-		}
-
-		if err = indx.Insert(scratch); err != nil {
-			return nil, err
-		}
-
-		// XXX after creating the indx and populating the map, we can put the rest in a go routine
-
-		images, err := c.DataStore.ListImages(op, store, nil)
-		if err != nil {
-			return nil, err
-		}
-
-		op.Debugf("Found %d images", len(images))
-
-		// Build image map to simplify tree traversal.
-		imageMap := make(map[string]*Image, len(images))
-		for _, img := range images {
-			if img.ID == Scratch.ID {
-				continue
-			}
-			imageMap[img.Self()] = img
-		}
-
-		for k := range imageMap {
-			parentTree(op, k, indx, imageMap)
-		}
-	}
-
-	return store, nil
-}
-
-// parentTree adds images into the cache starting from the parent.
-func parentTree(op trace.Operation, imgLink string, idx *index.Index, imageMap map[string]*Image) {
-	img, ok := imageMap[imgLink]
-	if !ok {
-		return
-	}
-
-	if img.Parent() != img.Self() {
-		op.Debugf("Looking for parent %s for %s", img.Parent(), img.Self())
-		parentTree(op, img.Parent(), idx, imageMap)
-	}
-
-	if err := idx.Insert(img); err != nil {
-		op.Errorf("Could not insert image %s: %v", imgLink, err)
-	} else {
-		op.Infof("Added image %s on datastore.", imgLink)
-	}
-
-	delete(imageMap, imgLink)
-}
-
-func (c *NameLookupCache) CreateImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	store, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check for existence and rehydrate the cache if it exists on disk.
-	_, err = c.GetImageStore(op, storeName)
-	// we expect this not to exist.
-	if err == nil {
-		return nil, os.ErrExist
-	}
-
-	if !os.IsNotExist(err) {
-		op.Warnf("Error getting image store %s: %s", storeName, err)
-	}
-
-	c.storeCacheLock.Lock()
-	defer c.storeCacheLock.Unlock()
-
-	store, err = c.DataStore.CreateImageStore(op, storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the root image
-	scratch, err := c.DataStore.WriteImage(op, &Image{Store: store}, Scratch.ID, nil, "", nil)
-	if err != nil {
-		// if we failed here, remove the image store
-		op.Infof("Removing failed image store %s", storeName)
-		if e := c.DataStore.DeleteImageStore(op, storeName); e != nil {
-			op.Errorf("image store cleanup failed: %s", e.Error())
-		}
-
-		return nil, err
-	}
-
-	indx := index.NewIndex()
-	c.storeCache[*store] = indx
-	if err = indx.Insert(scratch); err != nil {
-		return nil, err
-	}
-
-	return store, nil
-}
-
-// ListImageStores returns a list of strings representing all existing image stores
-func (c *NameLookupCache) ListImageStores(op trace.Operation) ([]*url.URL, error) {
-	c.storeCacheLock.Lock()
-	defer c.storeCacheLock.Unlock()
-
-	stores := make([]*url.URL, 0, len(c.storeCache))
-	for key := range c.storeCache {
-		stores = append(stores, &key)
-	}
-	return stores, nil
-}
-
-func (c *NameLookupCache) WriteImage(op trace.Operation, parent *Image, ID string, meta map[string][]byte, sum string, r io.Reader) (*Image, error) {
-	// Check the parent exists (at least in the cache).
-	p, err := c.GetImage(op, parent.Store, parent.ID)
-	if err != nil {
-		return nil, fmt.Errorf("parent (%s) doesn't exist in %s: %s", parent.ID, parent.Store.String(), err)
-	}
-
-	// Check the image doesn't already exist in the cache.  A miss in this will trigger a datastore lookup.
-	i, err := c.GetImage(op, p.Store, ID)
-	if err == nil && i != nil {
-		// TODO(FA) check sums to make sure this is the right image
-
-		return i, nil
-	}
-
-	// Definitely not in cache or image store, create image.
-	i, err = c.DataStore.WriteImage(op, p, ID, meta, sum, r)
-	if err != nil {
-		op.Errorf("WriteImage of %s failed with: %s", ID, err)
-		return nil, err
-	}
-
-	c.storeCacheLock.Lock()
-	indx := c.storeCache[*parent.Store]
-	c.storeCacheLock.Unlock()
-
-	// Add the new image to the cache
-	if err = indx.Insert(i); err != nil {
-		return nil, err
-	}
-
-	return i, nil
-}
-
-func (c *NameLookupCache) Export(op trace.Operation, store *url.URL, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return c.DataStore.Export(op, id, ancestor, spec, data)
-}
-
-func (c *NameLookupCache) Import(op trace.Operation, store *url.URL, diskID string, spec *archive.FilterSpec, tarStream io.ReadCloser) error {
-	return c.DataStore.Import(op, diskID, spec, tarStream)
-}
-
-func (c *NameLookupCache) NewDataSource(op trace.Operation, id string) (DataSource, error) {
-	return c.DataStore.NewDataSource(op, id)
-}
-
-func (c *NameLookupCache) URL(op trace.Operation, id string) (*url.URL, error) {
-	return c.DataStore.URL(op, id)
-}
-
-func (c *NameLookupCache) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return c.DataStore.Owners(op, url, filter)
-}
-
-// GetImage gets the specified image from the given store by retreiving it from the cache.
-func (c *NameLookupCache) GetImage(op trace.Operation, store *url.URL, ID string) (*Image, error) {
-	op.Debugf("Getting image %s from %s", ID, store.String())
-
-	storeName, err := util.ImageStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	// Check the store exists
-	if _, err = c.GetImageStore(op, storeName); err != nil {
-		return nil, err
-	}
-
-	c.storeCacheLock.Lock()
-	indx := c.storeCache[*store]
-	c.storeCacheLock.Unlock()
-
-	imgURL, err := util.ImageURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-	node, err := c.storeCache[*store].Get(imgURL.String())
-
-	var img *Image
-	if err != nil {
-		if err == index.ErrNodeNotFound {
-			op.Debugf("Image %s not in cache, retreiving from datastore", ID)
-			// Not in the cache.  Try to load it.
-			img, err = c.DataStore.GetImage(op, store, ID)
-			if err != nil {
-				return nil, err
-			}
-
-			if err = indx.Insert(img); err != nil {
-				return nil, err
-			}
-		} else {
-			return nil, err
-		}
-	} else {
-		img, _ = node.(*Image)
-	}
-
-	return img, nil
-}
-
-// ListImages returns a list of Images for a list of IDs, or all if no IDs are passed
-func (c *NameLookupCache) ListImages(op trace.Operation, store *url.URL, IDs []string) ([]*Image, error) {
-	// Filter the results
-	imageList := make([]*Image, 0, len(IDs))
-
-	if len(IDs) > 0 {
-		for _, id := range IDs {
-			i, err := c.GetImage(op, store, id)
-			if err == nil {
-				imageList = append(imageList, i)
-			}
-		}
-
-	} else {
-
-		storeName, err := util.ImageStoreName(store)
-		if err != nil {
-			return nil, err
-		}
-		// Check the store exists before we start iterating it.  This will populate the cache if it's empty.
-		if _, err := c.GetImageStore(op, storeName); err != nil {
-			return nil, err
-		}
-
-		// get the relevant cache
-		c.storeCacheLock.Lock()
-		indx := c.storeCache[*store]
-		c.storeCacheLock.Unlock()
-
-		images, err := indx.List()
-		if err != nil {
-			return nil, err
-		}
-
-		for _, v := range images {
-			img, _ := v.(*Image)
-			// filter out scratch
-			if img.ID == Scratch.ID {
-				continue
-			}
-
-			imageList = append(imageList, img)
-		}
-	}
-
-	return imageList, nil
-}
-
-// DeleteImage deletes an image from the image store.  If it is in use or is
-// being inheritted from, then this will return an error.
-func (c *NameLookupCache) DeleteImage(op trace.Operation, image *Image) (*Image, error) {
-	// prevent deletes of scratch
-	if image.ID == Scratch.ID {
-		return nil, nil
-	}
-
-	op.Infof("DeleteImage: deleting %s", image.Self())
-
-	// Check the image exists.  This will rehydrate the cache if necessary.
-	img, err := c.GetImage(op, image.Store, image.ID)
-	if err != nil {
-		op.Errorf("DeleteImage: %s", err)
-		return nil, err
-	}
-
-	// get the relevant cache
-	c.storeCacheLock.Lock()
-	indx := c.storeCache[*img.Store]
-	c.storeCacheLock.Unlock()
-
-	hasChildren, err := indx.HasChildren(img.Self())
-	if err != nil {
-		op.Errorf("DeleteImage: %s", err)
-		return nil, err
-	}
-
-	if hasChildren {
-		return nil, &ErrImageInUse{img.Self() + " in use by child images"}
-	}
-
-	// The datastore will tell us if the image is attached
-	if _, err = c.DataStore.DeleteImage(op, img); err != nil {
-		op.Errorf("%s", err)
-		return nil, err
-	}
-
-	// Remove the image from the cache
-	if _, err = indx.Delete(img.Self()); err != nil {
-		op.Errorf("%s", err)
-		return nil, err
-	}
-
-	return img, nil
-}
-
-// DeleteBranch deletes a branch of images, starting from nodeID, up to the
-// first node with degree greater than 1.  keepNodes is the array of images to
-// keep (and their branches).
-func (c *NameLookupCache) DeleteBranch(op trace.Operation, image *Image, keepNodes []*url.URL) ([]*Image, error) {
-	op.Infof("DeleteBranch: deleting branch starting at %s", image.Self())
-
-	var deletedImages []*Image
-
-	// map of images to keep
-	keep := make(map[url.URL]int)
-	for _, elem := range keepNodes {
-		op.Debugf("DeleteBranch:  keep node %s", elem.String())
-		keep[*elem] = 0
-	}
-
-	// Check if the error is actually an error.  If we deleted something,
-	// then eat the error.  This should really only return an error if the leaf
-	// has issues.
-	checkErr := func(err error, deleted []*Image) ([]*Image, error) {
-		if err != nil {
-			if len(deleted) == 0 {
-				// we failed deleting any elements.
-				return nil, err
-			}
-		}
-
-		if len(deleted) == 0 {
-			// This can't happen.  deleteNode should have returned an err
-			op.Debugf("No images deleted!!")
-		}
-
-		// we deleted a section of a branch
-		return deleted, nil
-	}
-
-	for {
-		if _, ok := keep[*image.SelfLink]; ok {
-			return checkErr(fmt.Errorf("%s can't be deleted", image.Self()), deletedImages)
-		}
-
-		deletedImage, err := c.DeleteImage(op, image)
-		if err != nil {
-			op.Debugf(err.Error())
-			return checkErr(err, deletedImages)
-		}
-
-		deletedImages = append(deletedImages, deletedImage)
-
-		// iterate to the parent
-		parent, err := Parse(deletedImage.ParentLink)
-		if err != nil {
-			return deletedImages, err
-		}
-
-		// set image to the parent
-		image, err = c.GetImage(op, parent.Store, parent.ID)
-		if err != nil {
-			return deletedImages, err
-		}
-
-		if image.ID == Scratch.ID {
-			op.Infof("DeleteBranch: Done deleting images")
-			break
-		}
-	}
-
-	return deletedImages, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache_test.go
deleted file mode 100644
index bda4224fd0..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_cache_test.go
+++ /dev/null
@@ -1,685 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"strconv"
-	"testing"
-
-	"context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-type MockDataStore struct {
-	// id -> image
-	db map[url.URL]map[string]*Image
-
-	createImageStoreError error
-	writeImageError       error
-}
-
-func NewMockDataStore() *MockDataStore {
-	m := &MockDataStore{
-		db: make(map[url.URL]map[string]*Image),
-	}
-
-	return m
-}
-
-// GetImageStore checks to see if a named image store exists and returls the
-// URL to it if so or error.
-func (c *MockDataStore) GetImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, ok := c.db[*u]; !ok {
-		return nil, os.ErrNotExist
-	}
-
-	return u, nil
-}
-
-func (c *MockDataStore) CreateImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	if c.createImageStoreError != nil {
-		return nil, c.createImageStoreError
-	}
-
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	c.db[*u] = make(map[string]*Image)
-	return u, nil
-}
-
-func (c *MockDataStore) DeleteImageStore(op trace.Operation, storeName string) error {
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return err
-	}
-
-	c.db[*u] = nil
-	return nil
-}
-
-func (c *MockDataStore) ListImageStores(op trace.Operation) ([]*url.URL, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) WriteImage(op trace.Operation, parent *Image, ID string, meta map[string][]byte, sum string, r io.Reader) (*Image, error) {
-	if c.writeImageError != nil {
-		op.Infof("WriteImage: returning error")
-		return nil, c.writeImageError
-	}
-
-	storeName, err := util.ImageStoreName(parent.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	selflink, err := util.ImageURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	var parentLink *url.URL
-	if parent.ID != "" {
-		parentLink, err = util.ImageURL(storeName, parent.ID)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	i := &Image{
-		ID:         ID,
-		Store:      parent.Store,
-		ParentLink: parentLink,
-		SelfLink:   selflink,
-		Metadata:   meta,
-	}
-
-	c.db[*parent.Store][ID] = i
-
-	return i, nil
-}
-
-// GetImage gets the specified image from the given store by retreiving it from the cache.
-func (c *MockDataStore) GetImage(op trace.Operation, store *url.URL, ID string) (*Image, error) {
-	i, ok := c.db[*store][ID]
-	if !ok {
-		return nil, fmt.Errorf("not found")
-	}
-	return i, nil
-}
-
-// ListImages resturns a list of Images for a list of IDs, or all if no IDs are passed
-func (c *MockDataStore) ListImages(op trace.Operation, store *url.URL, IDs []string) ([]*Image, error) {
-	var imageList []*Image
-	for _, i := range c.db[*store] {
-		imageList = append(imageList, i)
-	}
-	return imageList, nil
-}
-
-// DeleteImage removes an image from the image store
-func (c *MockDataStore) DeleteImage(op trace.Operation, image *Image) (*Image, error) {
-	delete(c.db[*image.Store], image.ID)
-	return image, nil
-}
-
-func (c *MockDataStore) Export(op trace.Operation, child, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	return nil
-}
-
-func (c *MockDataStore) NewDataSink(op trace.Operation, id string) (DataSink, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) NewDataSource(op trace.Operation, id string) (DataSource, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	return nil, nil
-}
-
-func (c *MockDataStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, nil
-}
-
-func TestListImages(t *testing.T) {
-	s := NewLookupCache(NewMockDataStore())
-
-	op := trace.NewOperation(context.Background(), "test")
-	storeURL, err := s.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	// Create a set of images
-	images := make(map[string]*Image)
-	parent := Scratch
-	parent.Store = storeURL
-	testSum := "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("ID-%d", i)
-
-		img, werr := s.WriteImage(op, &parent, id, nil, testSum, nil)
-		if !assert.NoError(t, werr) {
-			return
-		}
-		if !assert.NotNil(t, img) {
-			return
-		}
-
-		images[id] = img
-	}
-
-	// List all images
-	outImages, err := s.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// check we retrieve all of the iamges
-	assert.Equal(t, len(outImages), len(images))
-	for _, img := range outImages {
-		_, ok := images[img.ID]
-		if !assert.True(t, ok) {
-			return
-		}
-	}
-
-	// Check we can retrieve a subset
-	inIDs := []string{"ID-1", "ID-2", "ID-3"}
-	outImages, err = s.ListImages(op, storeURL, inIDs)
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	for _, img := range outImages {
-		reference, ok := images[img.ID]
-		if !assert.True(t, ok) {
-			return
-		}
-
-		if !assert.Equal(t, reference, img) {
-			return
-		}
-	}
-}
-
-// Create an image on the datastore directly and try to WriteImage via the
-// cache.  The datastore should reflect the image already exists and bale out
-// without an error.
-func TestOutsideCacheWriteImage(t *testing.T) {
-	s := NewLookupCache(NewMockDataStore())
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := s.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	// Create a set of images
-	images := make(map[string]*Image)
-	parent := Scratch
-	parent.Store = storeURL
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("ID-%d", i)
-
-		// Write to the datastore creating images
-		img, werr := s.DataStore.WriteImage(op, &parent, id, nil, "", nil)
-		if !assert.NoError(t, werr) {
-			return
-		}
-		if !assert.NotNil(t, img) {
-			return
-		}
-
-		images[id] = img
-	}
-
-	testSum := "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-	// Try to write the same images as above, but this time via the cache.  WriteImage should return right away without any data written.
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("ID-%d", i)
-
-		// Write to the datastore creating images
-		img, werr := s.WriteImage(op, &parent, id, nil, testSum, nil)
-		if !assert.NoError(t, werr) {
-			return
-		}
-		if !assert.NotNil(t, img) {
-			return
-		}
-
-		// assert it's the same image
-		if !assert.Equal(t, images[img.ID], img) {
-			return
-		}
-	}
-}
-
-// Create 2 store caches but use the same backing datastore.  Create images
-// with the first cache, then get the image with the second.  This simulates
-// restart since the second cache is empty and has to go to the backing store.
-func TestImageStoreRestart(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	ds := NewMockDataStore()
-	op := trace.NewOperation(context.Background(), "test")
-
-	firstCache := NewLookupCache(ds)
-	secondCache := NewLookupCache(ds)
-
-	storeURL, err := firstCache.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-	if !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	// Create a set of images
-	expectedImages := make(map[string]*Image)
-
-	parent, err := firstCache.GetImage(op, storeURL, Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	testSum := "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("ID-%d", i)
-
-		img, werr := firstCache.WriteImage(op, parent, id, nil, testSum, nil)
-		if !assert.NoError(t, werr) {
-			return
-		}
-		if !assert.NotNil(t, img) {
-			return
-		}
-
-		expectedImages[id] = img
-	}
-
-	// get the images from the second cache to ensure it goes to the ds
-	for id, expectedImg := range expectedImages {
-		img, werr := secondCache.GetImage(op, storeURL, id)
-		if !assert.NoError(t, werr) || !assert.Equal(t, expectedImg, img) {
-			return
-		}
-	}
-
-	// Nuke the second cache's datastore.  All data should come from the cache.
-	secondCache.DataStore = nil
-	for id, expectedImg := range expectedImages {
-		img, gerr := secondCache.GetImage(op, storeURL, id)
-		if !assert.NoError(t, gerr) || !assert.Equal(t, expectedImg, img) {
-			return
-		}
-	}
-
-	// Same should happen with a third cache when image list is called
-	thirdCache := NewLookupCache(ds)
-	imageList, err := thirdCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	if !assert.Equal(t, len(expectedImages), len(imageList)) {
-		return
-	}
-
-	// check the image data is the same
-	for id, expectedImg := range expectedImages {
-		img, err := thirdCache.GetImage(op, storeURL, id)
-		if !assert.NoError(t, err) || !assert.Equal(t, expectedImg, img) {
-			return
-		}
-	}
-}
-
-func TestDeleteImage(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	imageCache := NewLookupCache(NewMockDataStore())
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := imageCache.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	scratch, err := imageCache.GetImage(op, storeURL, Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// create a 3 level tree with 4 branches
-	branches := 4
-	images := make(map[int]*Image)
-	for branch := 1; branch < branches; branch++ {
-		// level 1
-		img, err := imageCache.WriteImage(op, scratch, strconv.Itoa(branch), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-			return
-		}
-		images[branch] = img
-
-		// level 2
-		i, err := imageCache.WriteImage(op, img, strconv.Itoa(branch*10), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, i) {
-			return
-		}
-		images[branch*10] = i
-
-		// level 3
-		i, err = imageCache.WriteImage(op, img, strconv.Itoa(branch*100), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, i) {
-			return
-		}
-		images[branch*100] = i
-	}
-
-	// Deletion of an intermediate node should fail
-	_, err = imageCache.DeleteImage(op, images[1])
-	if !assert.Error(t, err) {
-		return
-	}
-
-	imageList, err := imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	// image list should be uneffected
-	if !assert.Equal(t, len(images), len(imageList)) {
-		return
-	}
-
-	// Deletion of leaves should be fine
-	for branch := 1; branch < branches; branch++ {
-		// range up the branch
-		for _, img := range []*Image{images[branch*100], images[branch*10], images[branch]} {
-
-			_, err = imageCache.DeleteImage(op, img)
-			if !assert.NoError(t, err) {
-				return
-			}
-
-			// the image should be gone
-			i, err := imageCache.GetImage(op, storeURL, img.ID)
-			if !assert.Error(t, err) || !assert.Nil(t, i) {
-				return
-			}
-		}
-	}
-
-	// List images should be empty (because we filter out scratch)
-	imageList, err = imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	if !assert.True(t, len(imageList) == 0) {
-		return
-	}
-}
-
-func TestDeleteBranch(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	trace.Logger.Level = logrus.DebugLevel
-
-	imageCache := NewLookupCache(NewMockDataStore())
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := imageCache.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	scratch, err := imageCache.GetImage(op, storeURL, Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// create a 3 level tree with 3 branches.  The third branch will have an extra node.
-	//             scratch
-	//        1    2      3
-	//       10   20      30
-	//       100  200   300 301
-	branches := 4
-	images := make(map[int]*Image)
-	for branch := 1; branch < branches; branch++ {
-		// level 1
-		img, err := imageCache.WriteImage(op, scratch, strconv.Itoa(branch), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-			return
-		}
-		images[branch] = img
-
-		// level 2
-		img, err = imageCache.WriteImage(op, img, strconv.Itoa(branch*10), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-			return
-		}
-		images[branch*10] = img
-
-		// level 3
-		img, err = imageCache.WriteImage(op, img, strconv.Itoa(branch*100), nil, "", nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-			return
-		}
-		images[branch*100] = img
-	}
-
-	// Add an extra node to the last branch
-	img, err := imageCache.WriteImage(op, images[30], "301", nil, "", nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-		return
-	}
-	images[301] = img
-
-	//
-	// Everything above here is just setup.  Everything from here on is the test.
-	//
-
-	// Deletion of an intermediate node should fail
-	imagesDeleted, err := imageCache.DeleteBranch(op, images[1], nil)
-	if !assert.Error(t, err) && assert.Nil(t, imagesDeleted) {
-		return
-	}
-
-	imageList, err := imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	// image list should be uneffected
-	if !assert.Equal(t, len(images), len(imageList)) {
-		return
-	}
-
-	//
-	// Deletion of a branch
-	//
-	imagesDeleted, err = imageCache.DeleteBranch(op, images[100], nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// List images should be missing a branch
-	imageList, err = imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	if !assert.Equal(t, 7, len(imageList)) || !assert.Equal(t, 3, len(imagesDeleted)) {
-		return
-	}
-
-	//
-	// Deletion of the split branch should only allow deletion of a single image
-	//
-	imagesDeleted, err = imageCache.DeleteBranch(op, images[300], nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	imageList, err = imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	// only 300 should have been deleted
-	if !assert.Equal(t, 6, len(imageList)) || !assert.Equal(t, images[300], imagesDeleted[0]) {
-		return
-	}
-
-	//
-	// Test keep with our 1 remaining branch
-	//
-
-	imagesDeleted, err = imageCache.DeleteBranch(op, images[200], []*url.URL{images[2].SelfLink})
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	imageList, err = imageCache.ListImages(op, storeURL, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, imageList) {
-		return
-	}
-
-	// only 20 and 200 should have been deleted
-	if !assert.Equal(t, 4, len(imageList)) || !assert.Equal(t, images[200], imagesDeleted[0]) || !assert.Equal(t, images[20], imagesDeleted[1]) {
-		for _, img = range imageList {
-			t.Logf("image = %#v", img)
-		}
-		return
-	}
-
-}
-
-func TestCreateImageStoreFailureCleanup(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	trace.Logger.Level = logrus.DebugLevel
-
-	mds := NewMockDataStore()
-	imageCache := NewLookupCache(mds)
-	op := trace.NewOperation(context.Background(), "create image store error")
-	mds.createImageStoreError = fmt.Errorf("foo error")
-
-	storeURL, err := imageCache.CreateImageStore(op, "testStore")
-	if !assert.Error(t, err) || !assert.Nil(t, storeURL) {
-		return
-	}
-
-	mds.createImageStoreError = nil
-	storeURL, err = imageCache.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	op = trace.NewOperation(context.Background(), "write image error")
-	mds = NewMockDataStore()
-	mds.writeImageError = fmt.Errorf("foo error")
-	imageCache = NewLookupCache(mds)
-
-	storeURL, err = imageCache.CreateImageStore(op, "testStore2")
-	if !assert.Error(t, err) || !assert.Nil(t, storeURL) {
-		return
-	}
-
-	mds.writeImageError = nil
-	storeURL, err = imageCache.CreateImageStore(op, "testStore2")
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-}
-
-// Cache population should be happening in order starting from parent(id1) to children(id4)
-func TestPopulateCacheInExpectedOrder(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	st := NewMockDataStore()
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, _ := util.ImageStoreNameToURL("testStore")
-
-	storageURLStr := storeURL.String()
-
-	url1, _ := url.Parse(storageURLStr + "/id1")
-	url2, _ := url.Parse(storageURLStr + "/id2")
-	url3, _ := url.Parse(storageURLStr + "/id3")
-	url4, _ := url.Parse(storageURLStr + "/id4")
-	scratchURL, _ := url.Parse(storageURLStr + Scratch.ID)
-
-	img1 := &Image{ID: "id1", SelfLink: url1, ParentLink: scratchURL, Store: storeURL}
-	img2 := &Image{ID: "id2", SelfLink: url2, ParentLink: url1, Store: storeURL}
-	img3 := &Image{ID: "id3", SelfLink: url3, ParentLink: url2, Store: storeURL}
-	img4 := &Image{ID: "id4", SelfLink: url4, ParentLink: url3, Store: storeURL}
-	scratchImg := &Image{
-		ID:         Scratch.ID,
-		SelfLink:   scratchURL,
-		ParentLink: scratchURL,
-		Store:      storeURL,
-	}
-
-	// Order does matter for some reason.
-	imageMap := map[string]*Image{
-		img1.ID:       img1,
-		img4.ID:       img4,
-		img2.ID:       img2,
-		img3.ID:       img3,
-		scratchImg.ID: scratchImg,
-	}
-
-	st.db[*storeURL] = imageMap
-
-	imageCache := NewLookupCache(st)
-	imageCache.GetImageStore(op, "testStore")
-
-	// Check if all images are available.
-	imageIds := []string{"id1", "id2", "id3", "id4"}
-	for _, imageID := range imageIds {
-		v, _ := imageCache.GetImage(op, storeURL, imageID)
-		assert.NotNil(t, v)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_test.go
deleted file mode 100644
index 375fc33d92..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/image_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/portlayer/util"
-)
-
-func TestImageCopy(t *testing.T) {
-	storeName := "testStore"
-	ID := "testImageID"
-
-	imageURL, err := util.ImageURL(storeName, ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	parentURL, err := util.ImageURL(storeName, Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	img, err := Parse(imageURL)
-	if !assert.NoError(t, err) || !assert.NotNil(t, img) {
-		return
-	}
-
-	storeURL, err := util.ImageStoreNameToURL(storeName)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	expected := &Image{
-		ID:         ID,
-		SelfLink:   imageURL,
-		ParentLink: parentURL,
-		Store:      storeURL,
-		Metadata: map[string][]byte{
-			"1": {byte(1)},
-			"2": {byte(2)},
-			"3": []byte("three"),
-		},
-	}
-
-	actual := expected.Copy().(*Image)
-
-	if !assert.Equal(t, expected, actual) {
-		return
-	}
-
-	actual.Metadata["4"] = []byte("four")
-
-	if !assert.NotEqual(t, expected, actual) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/disk.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/disk.go
deleted file mode 100644
index c3bf4b99dc..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/disk.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs
-
-import (
-	"net/url"
-	"path"
-)
-
-//  Volume identifies an NFS based volume
-type Volume struct {
-
-	// VS Host + Path to the actual volume
-	Host *url.URL
-
-	// Path of the volume from the volumestore target
-	Path string
-}
-
-func NewVolume(host *url.URL, NFSPath string) Volume {
-	volumeLocation := &url.URL{
-		Scheme: host.Scheme,
-		Host:   host.Host,
-		Path:   path.Join(host.Path, NFSPath),
-	}
-
-	v := Volume{
-		Host: volumeLocation,
-		Path: NFSPath,
-	}
-	return v
-}
-
-func (v Volume) MountPath() (string, error) {
-	return v.Path, nil
-}
-
-// DiskPath includes the url to the nfs directory for the container to mount,
-func (v Volume) DiskPath() url.URL {
-	if v.Host == nil {
-		return url.URL{}
-	}
-
-	return *v.Host
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/target.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/target.go
deleted file mode 100644
index fdb23a0ac3..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/target.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs
-
-import (
-	"io"
-	"net/url"
-	"os"
-
-	nfsClient "github.com/vmware/go-nfs-client/nfs"
-	"github.com/vmware/go-nfs-client/nfs/rpc"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// MountServer is an interface used to communicate with network attached storage.
-type MountServer interface {
-	// Mount executes the mount program on the Target.
-	Mount(op trace.Operation) (Target, error)
-
-	// Unmount terminates the Mount on the Target.
-	Unmount(op trace.Operation) error
-
-	URL() (*url.URL, error)
-}
-
-// Target is the filesystem interface for performing actions against attached storage.
-type Target interface {
-	// Open opens a file on the Target in RD_ONLY
-	Open(path string) (io.ReadCloser, error)
-
-	// OpenFile opens a file on the Target with the given mode
-	OpenFile(path string, perm os.FileMode) (io.ReadWriteCloser, error)
-
-	// Mkdir creates a directory at the given path
-	Mkdir(path string, perm os.FileMode) ([]byte, error)
-
-	// RemoveAll deletes Directory recursively
-	RemoveAll(Path string) error
-
-	// ReadDir reads the dirents in the given directory
-	ReadDir(path string) ([]os.FileInfo, error)
-
-	// Lookup reads os.FileInfo for the given path
-	Lookup(path string) (os.FileInfo, []byte, error)
-}
-
-// NfsMount is used to wrap a MountServer to do the Mount()/Unmount() and Close()
-type NfsMount struct {
-	// Hostname is the name to authenticate with to the target as
-	Hostname string
-
-	// UID and GID are the user id and group id to authenticate with the target
-	UID, GID uint32
-
-	// The URL (host + path) of the NFS server and target path
-	TargetURL *url.URL
-
-	s *nfsClient.Mount
-}
-
-func NewMount(t *url.URL, hostname string, uid, gid uint32) *NfsMount {
-	return &NfsMount{
-		Hostname:  hostname,
-		UID:       uid,
-		GID:       gid,
-		TargetURL: t,
-	}
-}
-
-func (m *NfsMount) Mount(op trace.Operation) (Target, error) {
-	op.Debugf("Mounting %s", m.TargetURL.String())
-	s, err := nfsClient.DialMount(m.TargetURL.Host)
-	if err != nil {
-		return nil, err
-	}
-	m.s = s
-
-	defer func() {
-		if err != nil {
-			// #nosec: Errors unhandled.
-			m.s.Close()
-		}
-	}()
-
-	auth := rpc.NewAuthUnix(m.Hostname, m.UID, m.GID)
-	mnt, err := s.Mount(m.TargetURL.Path, auth.Auth())
-	if err != nil {
-		op.Errorf("unable to mount volume: %v", err)
-		return nil, err
-	}
-
-	op.Infof("Mounted %s", m.TargetURL.String())
-	return &target{mnt}, nil
-}
-
-func (m *NfsMount) Unmount(op trace.Operation) error {
-	op.Debugf("Unmounting %s", m.TargetURL.String())
-	if err := m.s.Unmount(); err != nil {
-		return err
-	}
-
-	if err := m.s.Close(); err != nil {
-		return err
-	}
-
-	op.Debugf("Unmounted %s", m.TargetURL.String())
-	m.s = nil
-	return nil
-}
-
-func (m *NfsMount) URL() (*url.URL, error) {
-	return m.TargetURL, nil
-}
-
-// wrap ReadDir to return a slice of os.FileInfo
-type target struct {
-	*nfsClient.Target
-}
-
-func (t *target) ReadDir(path string) ([]os.FileInfo, error) {
-	entries, err := t.ReadDirPlus(path)
-	if err != nil {
-		return nil, err
-	}
-
-	var e []os.FileInfo
-	for i := 0; i < len(entries); i++ {
-
-		// filter out . and ..
-		name := entries[i].Name()
-		if name == "." || name == ".." {
-			continue
-		}
-
-		e = append(e, os.FileInfo(entries[i]))
-	}
-
-	return e, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/vm.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/vm.go
deleted file mode 100644
index 2d3909cd6f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/vm.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs
-
-import (
-	"fmt"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	//Below is a list of options included in the mount options and a brief reason why.
-	// rw : on by default, for ro the syscall.MS_READONLY flag must be set instead of putting it in the options pointer of the mount call.
-	// "noatime" : this option prevents read's from triggering a write to update the accesstime of an inode. Helps with efficient reads. (Specified as a flag during the tether operation.)
-	// "vers=3" : we want to use NFSv3 it is simpler to implement and we do not need all the features of NFSv4 at this time
-	// "rsize=131072" : indicates the maximum read size for data on the NFS server. If the rsize is too big for either the client or server a negotion will occur to determine a supportable size. the value chosen is a default for /bin/mount for ubuntu 16.04
-	// "wsize=131072" : indicates the maximum write size for data on the NFS server. Like rsize it is negotiated if the value is too large. the value chosen is a default for /bin/mount for ubuntu 16.04
-	// "hard" : implies that we will retry indefinitely upon a failed transmission of data. this was agreed upon to indicate that problems have occurred with the mount if a hang on a write occurs.
-	// "proto=tcp" : tcp is a realiable protocol. The client used by the VCH also uses TCP as it's protocol. meaning we gain consistency in the communication between the tether->nfs and portlayer->nfs
-	// "timeo=600" : 600 deciseconds. This means a 60 second timout. With "hard" enabled this option likely does not matter.
-	// "sec=sys" : this means the NFS client uses the AUTH_SYS security flavor for all NFS requests on this mount point. This requires UID and GID of the user for permissions. also allows squashing permissions
-	// "mountvers=3" : this is listed as the RPC bind version. However, it is listed as a default by /bin/mount even when RPC is not the protocol used.
-	// "mountProto=TCP" : since the VCH uses TCP we should be using it as well here on the tether. Additionally, the mountProto does effect the initial protocol used for interacting with an nfs server. Keeping everything as the same protocol makes protocol issues easier to detect.
-	nfsMountOptions = "vers=3,rsize=131072,wsize=131072,hard,proto=tcp,timeo=600,sec=sys,mountvers=3,mountproto=tcp,nolock"
-)
-
-func VolumeJoin(op trace.Operation, handle *exec.Handle, volume *storage.Volume, mountPath string, diskOpts map[string]string) (*exec.Handle, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("handle.ID(%s), volume(%s), mountPath(%s), diskPath(%#v)", handle.ExecConfig.ID, volume.ID, mountPath, volume.Device.DiskPath())))
-
-	if _, ok := handle.ExecConfig.Mounts[volume.ID]; ok {
-		return nil, fmt.Errorf("Volume with ID %s is already in container %s's mountspec config", volume.ID, handle.ExecConfig.ID)
-	}
-
-	// construct MountSpec for the tether
-	mountSpec := createMountSpec(volume, mountPath, diskOpts)
-	if handle.ExecConfig.Mounts == nil {
-		handle.ExecConfig.Mounts = make(map[string]executor.MountSpec)
-	}
-	handle.ExecConfig.Mounts[volume.ID] = *mountSpec
-
-	return handle, nil
-}
-
-func createMountSpec(volume *storage.Volume, mountPath string, diskOpts map[string]string) *executor.MountSpec {
-	host := volume.Device.DiskPath()
-	deviceMode := nfsMountOptions + ",addr=" + host.Host
-
-	// Note: rw mode is not specified in the device node since the syscall.Mount defaults to rw. Additional, "noatime" must be indicated with the flag syscall.MS_NOATIME
-	newMountSpec := executor.MountSpec{
-		Source:   host,
-		Path:     mountPath,
-		Mode:     deviceMode,
-		CopyMode: volume.CopyMode,
-	}
-	return &newMountSpec
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume.go
deleted file mode 100644
index 02cd562701..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	// The directory created in the NFS VolumeStore which we create volumes under
-	volumesDir = "volumes"
-
-	// path that namespaces the metadata for a specific volume. It lives beside the Volumes Directory.
-	metadataDir = "volumes_metadata"
-
-	// Stock permissions that are set, In the future we may pass these in.
-	defaultPermissions = 0755
-
-	DefaultUID = 1000
-
-	nfsFilesystemTypeString = "nfs"
-)
-
-// VolumeStore this is nfs related volume store definition
-type VolumeStore struct {
-	// volume store name
-	Name string
-
-	// Service is the interface to the nfs target.
-	Service MountServer
-
-	// Service selflink to volume store.
-	SelfLink *url.URL
-
-	// Archiver defines WriteArchive and Export interface methods
-	archive.Archiver
-}
-
-func NewVolumeStore(op trace.Operation, storeName string, mount MountServer) (*VolumeStore, error) {
-	// #nosec: Errors unhandled.
-	u, _ := mount.URL()
-	op.Infof("Creating nfs volumestore %s on %s", storeName, u.String())
-
-	target, err := mount.Mount(op)
-	if err != nil {
-		op.Errorf("error occurred while attempting to mount volumestore (%s). err: (%s)", storeName, err.Error())
-		return nil, err
-	}
-	defer mount.Unmount(op)
-
-	selfLink, err := util.VolumeStoreNameToURL(storeName)
-	if err != nil {
-		op.Errorf("Failed to construct URL for volume store %s: %s", storeName, err)
-		return nil, err
-	}
-
-	v := &VolumeStore{
-		Name:     storeName,
-		Service:  mount,
-		SelfLink: selfLink,
-	}
-
-	// we assume that nfsTargetURL.path already exists.
-	// make volumes directory
-	if _, err := target.Mkdir(volumesDir, defaultPermissions); err != nil && !os.IsExist(err) {
-		op.Errorf("Failed to create volumes directory '%s': %s", volumesDir, err)
-		return nil, err
-	}
-
-	// make metadata directory
-	if _, err := target.Mkdir(metadataDir, defaultPermissions); err != nil && !os.IsExist(err) {
-		op.Errorf("Failed to create metadata directory '%s': %s", metadataDir, err)
-		return nil, err
-	}
-
-	return v, nil
-}
-
-// Returns the path to the vol relative to the given store.  The dir structure
-// for a vol in a nfs store is `<configured nfs server path>/volumes/<vol ID>/<volume contents>`.
-func (v *VolumeStore) volDirPath(ID string) string {
-	return path.Join(volumesDir, ID)
-}
-
-// Returns the path to the metadata directory for a volume
-func (v *VolumeStore) volMetadataDirPath(ID string) string {
-	return path.Join(metadataDir, ID)
-}
-
-// Creates a volume directory and volume object for NFS based volumes
-func (v *VolumeStore) VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*storage.Volume, error) {
-	target, err := v.Service.Mount(op)
-	if err != nil {
-		return nil, err
-	}
-	defer v.Service.Unmount(op)
-
-	dir := v.volDirPath(ID)
-	if _, err := target.Mkdir(dir, defaultPermissions); err != nil {
-		op.Errorf("Failed to create volume path '%s' on store %s: %s", dir, v.Name, err)
-		return nil, err
-	}
-
-	// #nosec: Errors unhandled.
-	u, _ := v.Service.URL()
-	if u.Scheme != nfsFilesystemTypeString {
-		op.Errorf("URL from nfs mount target had scheme (%s) instead of nfs for volume store (%s)", u.Scheme, v.Name)
-		return nil, fmt.Errorf("Unexpected scheme (%s) for volume store (%s)", u.Scheme, v.Name)
-	}
-
-	vol, err := storage.NewVolume(v.SelfLink, ID, info, NewVolume(u, v.volDirPath(ID)), executor.CopyNew)
-	if err != nil {
-		op.Errorf("Created volume directory but failed to create volume: %s", err)
-		return nil, err
-	}
-
-	if err := v.writeMetadata(op, ID, info, target); err != nil {
-		return nil, err
-	}
-
-	op.Infof("nfs volume (%s) successfully created on volume store (%s)", ID, v.Name)
-	return vol, nil
-}
-
-// VolumeDestroy Removes a volume and all of its contents from the nfs store. We already know via the cache if it is in use.
-func (v *VolumeStore) VolumeDestroy(op trace.Operation, vol *storage.Volume) error {
-	target, err := v.Service.Mount(op)
-	if err != nil {
-		return err
-	}
-	defer v.Service.Unmount(op)
-
-	op.Infof("Attempting to remove volume (%s) and its metadata from volume store (%s)", vol.ID, v.Name)
-
-	// remove volume directory and children
-	if err := target.RemoveAll(v.volDirPath(vol.ID)); err != nil {
-		op.Errorf("failed to remove volume (%s) on volume store (%s) due to error (%s)", vol.ID, v.Name, err)
-		return err
-	}
-
-	// remove volume metadata directory and children
-	if err := target.RemoveAll(v.volMetadataDirPath(vol.ID)); err != nil {
-		op.Errorf("failed to remove metadata for volume (%s) at path (%q) on volume store (%s)", vol.ID, v.volDirPath(vol.ID), v.Name)
-	}
-	op.Infof("Successfully removed volume (%s) from volumestore (%s)", vol.ID, v.Name)
-
-	return nil
-}
-
-func (v *VolumeStore) VolumesList(op trace.Operation) ([]*storage.Volume, error) {
-
-	target, err := v.Service.Mount(op)
-	if err != nil {
-		return nil, err
-	}
-	defer v.Service.Unmount(op)
-
-	volFileInfo, err := target.ReadDir(volumesDir)
-	if err != nil {
-		return nil, err
-	}
-	var volumes []*storage.Volume
-	var fetchErr error
-
-	for _, fileInfo := range volFileInfo {
-
-		if fileInfo.Name() == "." || fileInfo.Name() == ".." {
-			continue
-		}
-
-		volMetadata, err := v.getMetadata(op, fileInfo.Name(), target)
-		if err != nil {
-			op.Errorf("getting metadata for %s: %s", fileInfo.Name(), err.Error())
-			fetchErr = err
-			continue
-		}
-
-		// #nosec: Errors unhandled.
-		u, _ := v.Service.URL()
-		vol, err := storage.NewVolume(v.SelfLink, fileInfo.Name(), volMetadata, NewVolume(u, v.volDirPath(fileInfo.Name())), executor.CopyNew)
-		if err != nil {
-			op.Errorf("Failed to create volume struct from volume directory (%s)", fileInfo.Name())
-			return nil, err
-		}
-
-		volumes = append(volumes, vol)
-	}
-
-	if fetchErr != nil {
-		return nil, err
-	}
-
-	return volumes, nil
-}
-
-// Import takes a tar archive stream and extracts it into the target volume
-func (v *VolumeStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarStream io.ReadCloser) error {
-	return fmt.Errorf("Write for nfs volumes is not Implemented")
-}
-
-// Export creates and returns a tar archive containing data found between an nfs layer one or all of its ancestors
-func (v *VolumeStore) Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return nil, fmt.Errorf("vSphere Integrated Containers does not yet implement Export for nfs volumes")
-}
-
-func (v *VolumeStore) NewDataSource(op trace.Operation, id string) (storage.DataSource, error) {
-	return nil, errors.New("NFS VolumeStore does not yet implement NewDataSource")
-}
-
-func (v *VolumeStore) NewDataSink(op trace.Operation, id string) (storage.DataSink, error) {
-	return nil, errors.New("NFS VolumeStore does not yet implement NewDataSink")
-}
-
-func (v *VolumeStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	return nil, errors.New("NFS VolumeStore does not yet implement URL")
-}
-
-func (v *VolumeStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, errors.New("NFS VolumeStore does not yet implement Owners")
-}
-
-func (v *VolumeStore) writeMetadata(op trace.Operation, ID string, info map[string][]byte, target Target) error {
-	// write metadata into the metadata directory by key (filename) / value
-	// (data), namespaced by volume id
-	//
-	// <root>/volume_matadata/<id>/<key>
-	metadataPath := v.volMetadataDirPath(ID)
-
-	_, err := target.Mkdir(metadataPath, defaultPermissions)
-	if err != nil {
-		op.Errorf("Failed to create metadata directory '%s': %s", metadataPath, err)
-		return err
-	}
-
-	op.Infof("Writing metadata to (%s)", metadataPath)
-	for fileName, data := range info {
-		targetPath := path.Join(metadataPath, fileName)
-		blobFile, err := target.OpenFile(targetPath, defaultPermissions)
-		if err != nil {
-			op.Errorf("openning file %s: %s", targetPath, err.Error())
-			return err
-		}
-		defer blobFile.Close()
-
-		_, err = blobFile.Write(data)
-		if err != nil {
-			op.Errorf("failed to write metadata to '%s': %s", targetPath, err.Error())
-			return err
-		}
-		defer blobFile.Close()
-	}
-	op.Infof("Successfully wrote metadata to (%s)", metadataPath)
-	return nil
-}
-
-func (v *VolumeStore) getMetadata(op trace.Operation, ID string, target Target) (map[string][]byte, error) {
-	metadataPath := v.volMetadataDirPath(ID)
-	op.Debugf("Attempting to retrieve volume metadata for (%s) at (%s)", ID, metadataPath)
-
-	dataKeys, err := target.ReadDir(metadataPath)
-	if err != nil {
-		op.Errorf("readdir(%s): %s", metadataPath, err.Error())
-		return nil, err
-	}
-
-	info := make(map[string][]byte)
-	for _, keyFile := range dataKeys {
-
-		if keyFile.Name() == "." || keyFile.Name() == ".." {
-			continue
-		}
-
-		pth := path.Join(metadataPath, keyFile.Name())
-
-		f, err := target.Open(pth)
-		if err != nil {
-			op.Errorf("open(%s): %s", pth, err.Error())
-			return nil, err
-		}
-		defer f.Close()
-
-		dataBlob, err := ioutil.ReadAll(f)
-		if err != nil {
-			op.Errorf("readall(%s): %s", pth, err.Error())
-			return nil, err
-		}
-
-		info[keyFile.Name()] = dataBlob
-	}
-
-	op.Infof("Successfully read volume metadata at (%s)", metadataPath)
-	return info, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume_test.go
deleted file mode 100644
index a0ba5f7102..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/nfs/volume_test.go
+++ /dev/null
@@ -1,489 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package nfs
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	nfsTestDir = "NFSVolumeStoreTests"
-)
-
-type MockMount struct {
-	Path string
-}
-
-func (m MockMount) Mount(op trace.Operation) (Target, error) {
-	return NewMocktarget(m.Path), nil
-}
-
-func (m MockMount) Unmount(op trace.Operation) error {
-	return nil
-}
-
-func (m MockMount) URL() (*url.URL, error) {
-	return url.Parse("nfs://localhost/some/interesting/dir")
-}
-
-type MockTarget struct {
-	dirPath string
-}
-
-func NewMocktarget(pth string) MockTarget {
-	return MockTarget{dirPath: pth}
-}
-
-func (v MockTarget) Open(pth string) (io.ReadCloser, error) {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("open(%s)", pth)
-	return os.Open(pth)
-}
-
-func (v MockTarget) OpenFile(pth string, mode os.FileMode) (io.ReadWriteCloser, error) {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("openfile(%s)", pth)
-	return os.OpenFile(pth, os.O_RDWR|os.O_CREATE, mode)
-}
-
-func (v MockTarget) Mkdir(pth string, perm os.FileMode) ([]byte, error) {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("mkdir(%s)", pth)
-	return nil, os.Mkdir(pth, perm)
-}
-
-func (v MockTarget) RemoveAll(pth string) error {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("RemoveAll(%s)", pth)
-	return os.RemoveAll(pth)
-}
-
-func (v MockTarget) ReadDir(pth string) ([]os.FileInfo, error) {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("readdir(%s)", pth)
-	dir, err := os.Open(pth)
-	defer dir.Close()
-	if err != nil {
-		return nil, err
-	}
-
-	return dir.Readdir(0)
-}
-
-func (v MockTarget) Lookup(pth string) (os.FileInfo, []byte, error) {
-	pth = path.Join(v.dirPath, pth)
-	logrus.Infof("stat(%s)", pth)
-	info, err := os.Stat(pth)
-	return info, nil, err
-}
-
-var (
-	expected Target
-	mnt      MountServer
-)
-
-func TestMain(m *testing.M) {
-
-	nfsurl := os.Getenv("NFS_TEST_URL")
-	if nfsurl != "" {
-		u, err := url.Parse(nfsurl)
-		if err != nil {
-			logrus.Errorf(err.Error())
-			os.Exit(-1)
-		}
-
-		logrus.Infof("testing nfs against %#v", u)
-
-		mnt = NewMount(u, "hasselhoff", 1001, 10001)
-		expected, err = mnt.Mount(trace.NewOperation(context.TODO(), "mount"))
-		if err != nil {
-			logrus.Errorf("error mounting %s: %s", u.String(), err.Error())
-			os.Exit(-1)
-		}
-
-	} else {
-
-		testdir, err := ioutil.TempDir(os.TempDir(), nfsTestDir)
-		if err != nil {
-			logrus.Errorf("error creating tmpdir: %s", err.Error())
-			os.Exit(-1)
-		}
-
-		os.Mkdir(testdir, 0755)
-		defer os.RemoveAll(testdir)
-
-		// We can twiddle the target directly via expected and use it to verify the
-		// right things are happening.
-		mnt = &MockMount{testdir}
-		expected = &MockTarget{testdir}
-	}
-
-	result := m.Run()
-	os.Exit(result)
-}
-
-func TestSimpleVolumeStoreOperations(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "TestOp")
-
-	// Create a Volume Store
-	vs, err := NewVolumeStore(op, "testStore", mnt)
-	if !assert.NoError(t, err, "Failed during call to NewVolumeStore with err (%s)", err) {
-		return
-	}
-
-	_, _, err = expected.Lookup(volumesDir)
-	if !assert.NoError(t, err, "Could not find the initial volume store directory after creation of volume store. err (%s)", err) {
-		return
-	}
-
-	if !assert.NotNil(t, vs, "Volume Store created with nil err, but return is also nil") {
-		return
-	}
-
-	info := make(map[string][]byte)
-	testInfoKey := "junk"
-	info[testInfoKey] = make([]byte, 20)
-
-	// Create a Volume
-	testVolName := "testVolume"
-
-	vol, err := vs.VolumeCreate(op, testVolName, vs.SelfLink, 0 /*we do not use this*/, info)
-	if !assert.NoError(t, err, "Failed during call to VolumeCreate with err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, testVolName, vol.ID, "expected volume ID (%s) got ID (%s)", testVolName, vol.ID) {
-		return
-	}
-
-	_, ok := vol.Info[testInfoKey]
-	if !assert.True(t, ok, "TestInfoKey did not exist in the return metadata map") {
-		return
-	}
-
-	// Check Metadata Pathing
-	metaDirEntries, err := expected.ReadDir(metadataDir)
-	if !assert.NoError(t, err, "Failed to read the metadata directory with err (%s)", err) {
-		return
-	}
-
-	if !assert.Len(t, metaDirEntries, 1) {
-		return
-	}
-
-	volumeDirEntries, err := expected.ReadDir(volumesDir)
-	if !assert.NoError(t, err, "Failed to read the volume data directory with err (%s)", err) {
-		return
-	}
-
-	if !assert.Len(t, volumeDirEntries, 1) {
-		return
-	}
-
-	// Remove the Volume
-	err = vs.VolumeDestroy(op, vol)
-	if !assert.NoError(t, err, "Failed during a call to VolumeDestroy with err (%s)", err) {
-		return
-	}
-
-	// should throw an error since the directory got nuked
-	metaDirEntries, err = expected.ReadDir(path.Join(metadataDir, vol.ID))
-	if !assert.Error(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, len(metaDirEntries), 0, "expected metadata directory to have 1 entry and it had (%s)", len(metaDirEntries)) {
-		return
-	}
-
-	// Should throw an error on the volume directory
-	volumeDirEntries, err = expected.ReadDir(path.Join(volumesDir, vol.ID))
-	if !assert.Error(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, len(volumeDirEntries), 0, "expected metadata directory to have 1 entry and it had (%s)", len(volumeDirEntries)) {
-		return
-	}
-
-	volToCheck, err := vs.VolumeCreate(op, testVolName, vs.SelfLink, 0, info)
-	if !assert.NoError(t, err, "Failed during call to VolumeCreate with err (%s)", err) {
-		return
-	}
-
-	volumeList, err := vs.VolumesList(op)
-	if !assert.NoError(t, err, "Failed during call to VolumesList with err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, 1, len(volumeList)) {
-		return
-	}
-
-	if !assert.Equal(t, volumeList[0].ID, volToCheck.ID, "Failed due to VolumeList returning an unexpected volume %#v when volume %#v was expected.", volumeList[0], volToCheck) {
-		return
-	}
-
-	RetrievedInfo := volumeList[0].Info
-	CreatedInfo := volToCheck.Info
-
-	if !assert.Equal(t, len(RetrievedInfo), len(CreatedInfo), "Length mismatch between the created volume(%s) and the volume returned from VolumeList(%s)", len(CreatedInfo), len(RetrievedInfo)) {
-		return
-	}
-
-	if !assert.Equal(t, RetrievedInfo[testInfoKey], CreatedInfo[testInfoKey], "Failed due to mismatch in metadata between the content of the Created volume(%s) and the volume return from VolumesList", CreatedInfo[testInfoKey], RetrievedInfo[testInfoKey]) {
-		return
-	}
-
-	err = vs.VolumeDestroy(op, volToCheck)
-	if !assert.NoError(t, err, "Failed during a call to VolumeDestroy with err (%s)", err) {
-		return
-	}
-
-	volumeList, err = vs.VolumesList(op)
-	if !assert.NoError(t, err, "Failed during a call to VolumesListwith err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, len(volumeList), 0, "Expected %s volumes, VolumesList returned %s", 0, len(volumeList)) {
-		return
-	}
-}
-
-func TestMultipleVolumes(t *testing.T) {
-	op := trace.NewOperation(context.TODO(), "TestOp")
-
-	//Create a Volume Store
-	vs, err := NewVolumeStore(op, "testStore", mnt)
-	if !assert.NoError(t, err, "Failed during call to NewVolumeStore with err (%s)", err) {
-		return
-	}
-
-	if !assert.NotNil(t, vs, "Volume Store created with nil err, but return is also nil") {
-		return
-	}
-
-	_, _, err = expected.Lookup(volumesDir)
-	if !assert.NoError(t, err, "Could not find the initial volume store directory after creation of volume store. err (%s)", err) {
-		return
-	}
-
-	// setup volume inputs
-	testVolNameOne := "test1"
-	infoOne := make(map[string][]byte)
-	testOneInfoKey := "junk"
-	infoOne[testOneInfoKey] = make([]byte, 20)
-
-	testVolNameTwo := "test2"
-	testTwoInfoKey := "important"
-	infoTwo := make(map[string][]byte)
-	infoTwo[testTwoInfoKey] = []byte("42")
-	testTwoInfoKeyTwo := "lessImportant"
-	infoTwo[testTwoInfoKeyTwo] = []byte("41")
-
-	testVolNameThree := "test3"
-	infoThree := make(map[string][]byte)
-	testThreeInfoKey := "lotsOfStuff"
-	infoThree[testThreeInfoKey] = []byte("importantData")
-	testThreeInfoKeyTwo := "someMoreStuff"
-	infoThree[testThreeInfoKeyTwo] = []byte("maybeSomeLabels")
-
-	//make volume one
-	volOne, err := vs.VolumeCreate(op, testVolNameOne, vs.SelfLink, 0 /*we do not use this*/, infoOne)
-
-	if !assert.NoError(t, err, "Failed during call to VolumeCreate with err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, testVolNameOne, volOne.ID, "expected volume ID (%s) got ID (%s)", testVolNameOne, volOne.ID) {
-		return
-	}
-
-	valOne, ok := volOne.Info[testOneInfoKey]
-	if !assert.True(t, ok, "TestInfoKey did not exist in the return metadata map") {
-		return
-	}
-
-	if !assert.Equal(t, valOne, volOne.Info[testOneInfoKey], "TestVolOne expected to have data (%s) and (%s) was found", infoOne, valOne) {
-		return
-	}
-
-	// make volume two
-	volTwo, err := vs.VolumeCreate(op, testVolNameTwo, vs.SelfLink, 0 /*we do not use this*/, infoTwo)
-
-	if !assert.NoError(t, err, "Failed during call to VolumeCreate with err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, testVolNameTwo, volTwo.ID, "expected volume ID (%s) got ID (%s)", testVolNameTwo, volTwo.ID) {
-		return
-	}
-
-	valOne, ok = volTwo.Info[testTwoInfoKey]
-	if !assert.True(t, ok, "TestInfoKey did not exist in the return metadata map") {
-		return
-	}
-
-	if !assert.Equal(t, []byte("42"), valOne, "TestVolTwo expected to have data (%s) and (%s) was found", []byte("42"), valOne) {
-		return
-	}
-
-	valTwo, ok := volTwo.Info[testTwoInfoKeyTwo]
-	if !assert.True(t, ok, "TestTwoInfoKeyTwo did not exist in the return metadata map for volTwo") {
-		return
-	}
-
-	if !assert.Equal(t, []byte("41"), valTwo, "TestVolTwo expected to have data (%s) and (%s) was found", []byte("41"), valTwo) {
-		return
-	}
-
-	// make volume three
-	volThree, err := vs.VolumeCreate(op, testVolNameThree, vs.SelfLink, 0 /*we do not use this*/, infoThree)
-
-	if !assert.NoError(t, err, "Failed during call to VolumeCreate with err (%s)", err) {
-		return
-	}
-
-	if !assert.Equal(t, testVolNameThree, volThree.ID, "expected volume ID (%s) got ID (%s)", testVolNameThree, volThree.ID) {
-		return
-	}
-
-	valOne, ok = volThree.Info[testThreeInfoKey]
-	if !assert.True(t, ok, "TestInfoKey did not exist in the return metadata map") {
-		return
-	}
-
-	if !assert.Equal(t, []byte("importantData"), valOne, "TestVolThree expected to have data (%s) and (%s) was found", []byte("importantData"), valOne) {
-		return
-	}
-
-	valTwo, ok = volThree.Info[testThreeInfoKeyTwo]
-	if !assert.True(t, ok, "TestThreeInfoKeyTwo did not exist in the return metadata map for volThree") {
-		return
-	}
-
-	if !assert.Equal(t, []byte("maybeSomeLabels"), valTwo, "TestVolThree expected to have data (%s) and (%s) was found", []byte("maybeSomeLabels"), valTwo) {
-		return
-	}
-
-	// list volumes
-	volumes, err := vs.VolumesList(op)
-	if !assert.NoError(t, err, "Failed during a call to VolumesList with err (%s)", err) {
-		return
-	}
-
-	volCount := len(volumes)
-	if !assert.Equal(t, volCount, 3, "VolumesList returned unexpected volume count. expected (%s), but received (%s) ", 3, volCount) {
-		return
-	}
-
-	// check metadatas
-	metaDirEntries, err := expected.ReadDir(metadataDir)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, len(metaDirEntries), 3, "expected metadata directory to have 1 entry and it had (%s)", len(metaDirEntries)) {
-		return
-	}
-
-	volumeDirEntries, err := expected.ReadDir(volumesDir)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, len(volumeDirEntries), 3, "expected metadata directory to have 1 entry and it had (%s)", len(volumeDirEntries)) {
-		return
-	}
-
-	verify := func(vols map[string]int) error {
-		for name, num := range vols {
-			metadataFiles, err := expected.ReadDir(path.Join(metadataDir, name))
-			if err != nil {
-				return err
-			}
-
-			if len(metadataFiles) != num {
-				return fmt.Errorf("len metadata %d != %d", len(metadataFiles), num)
-			}
-		}
-
-		return nil
-	}
-
-	// check and individual metadata dir
-	volmap := map[string]int{
-		testVolNameThree: 2,
-		testVolNameTwo:   2,
-		testVolNameOne:   1,
-	}
-	if !assert.NoError(t, verify(volmap)) {
-		return
-	}
-
-	// remove volume one
-	err = vs.VolumeDestroy(op, volOne)
-	if !assert.NoError(t, err, "Failed during a call to VolumeDestroy with error (%s)", err) {
-		return
-	}
-
-	// assert it's gone
-	_, _, err = expected.Lookup(path.Join(metadataDir, volOne.ID))
-	if !assert.Error(t, err) {
-		return
-	}
-
-	_, _, err = expected.Lookup(path.Join(volumesDir, volOne.ID))
-	if !assert.Error(t, err) {
-		return
-	}
-
-	// check that volume two and three exist with appropriate metadata
-	delete(volmap, testVolNameOne)
-	if !assert.NoError(t, verify(volmap)) {
-		return
-	}
-
-	// remove the rest of the volumes
-	err = vs.VolumeDestroy(op, volTwo)
-	if !assert.NoError(t, err, "Failed during a call to VolumeDestroy with error (%s)", err) {
-		return
-	}
-
-	err = vs.VolumeDestroy(op, volThree)
-	if !assert.NoError(t, err, "Failed during a call to VolumeDestroy with error (%s)", err) {
-		return
-	}
-
-	// verify they're gone
-	vols, err := vs.VolumesList(op)
-	if !assert.Len(t, vols, 0) {
-		return
-	}
-
-	return
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/proxy_readcloser.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/proxy_readcloser.go
deleted file mode 100644
index 96fcfa178d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/proxy_readcloser.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"io"
-)
-
-// ProxyReadCloser is a read closer that provides for wrapping the Close with
-// a custom Close call. The original ReadCloser.Close function will be invoked
-// after the custom call. Errors from the custom call with be ignored.
-type ProxyReadCloser struct {
-	io.ReadCloser
-	Closer func() error
-}
-
-func (p *ProxyReadCloser) Close() error {
-	/* #nosec - no useful way to handle this error */
-	p.Closer()
-	return p.ReadCloser.Close()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/storage.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/storage.go
deleted file mode 100644
index c9d305dd70..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/storage.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"context"
-	"io"
-	"net/url"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-var (
-	once sync.Once
-
-	importers map[string]Importer
-	exporters map[string]Exporter
-)
-
-type FileStat struct {
-	LinkTarget string
-	Mode       uint32
-	Name       string
-	Size       int64
-	ModTime    time.Time
-}
-
-func init() {
-	importers = make(map[string]Importer)
-	exporters = make(map[string]Exporter)
-}
-
-func create(ctx context.Context, session *session.Session, pool *object.ResourcePool) error {
-	var err error
-
-	mngr := view.NewManager(session.Vim25())
-
-	// Create view of VirtualMachine objects under the VCH's resource pool
-	Config.ContainerView, err = mngr.CreateContainerView(ctx, pool.Reference(), []string{"VirtualMachine"}, true)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// Init performs basic initialization, including population of storage.Config
-func Init(ctx context.Context, session *session.Session, pool *object.ResourcePool, source extraconfig.DataSource, _ extraconfig.DataSink) error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-
-	once.Do(func() {
-		// Grab the storage layer config blobs from extra config
-		extraconfig.Decode(source, &Config)
-		log.Debugf("Decoded VCH config for storage: %#v", Config)
-
-		err = create(ctx, session, pool)
-	})
-	return err
-}
-
-// RegisterImporter registers the specified importer against the provided store for later retrieval.
-func RegisterImporter(op trace.Operation, store string, i Importer) {
-	op.Infof("Registering importer: %s => %T", store, i)
-
-	importers[store] = i
-}
-
-// RegisterExporter registers the specified exporter against the provided store for later retrieval.
-func RegisterExporter(op trace.Operation, store string, e Exporter) {
-	op.Infof("Registering exporter: %s => %T", store, e)
-
-	exporters[store] = e
-}
-
-// GetImporter retrieves an importer registered with the provided store.
-// Will return nil, false if the store is not found.
-func GetImporter(store string) (Importer, bool) {
-	i, ok := importers[store]
-	return i, ok
-}
-
-// GetExporter retrieves an exporter registered with the provided store.
-// Will return nil, false if the store is not found.
-func GetExporter(store string) (Exporter, bool) {
-	e, ok := exporters[store]
-	return e, ok
-}
-
-// GetImporters returns the set of known importers.
-func GetImporters() []string {
-	keys := make([]string, 0, len(importers))
-	for key := range importers {
-		keys = append(keys, key)
-	}
-
-	return keys
-}
-
-// GetExporters returns the set of known importers.
-func GetExporters() []string {
-	keys := make([]string, 0, len(exporters))
-	for key := range exporters {
-		keys = append(keys, key)
-	}
-
-	return keys
-}
-
-// Resolver defines methods for mapping ids to URLS, and urls to owners of that device
-type Resolver interface {
-	// URL returns a url to the data source representing `id`
-	// For historic reasons this is not the same URL that other parts of the storage component use, but an actual
-	// URL suited for locating the storage element without having additional precursor knowledge.
-	URL(op trace.Operation, id string) (*url.URL, error)
-
-	// Owners returns a list of VMs that are using the resource specified by `url`
-	Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error)
-}
-
-// DataSource defines the methods for exporting data from a specific storage element as a tar stream
-type DataSource interface {
-	// Close releases all resources associated with this source. Shared resources should be reference counted.
-	io.Closer
-
-	// Export performs an export of the specified files, returning the data as a tar stream. This is single use; once
-	// the export has completed it should not be assumed that the source remains functional.
-	//
-	// spec: specifies which files will be included/excluded in the export and allows for path rebasing/stripping
-	// data: if true the actual file data is included, if false only the file headers are present
-	Export(op trace.Operation, spec *archive.FilterSpec, data bool) (io.ReadCloser, error)
-
-	// Source returns the mechanism by which the data source is accessed
-	// Examples:
-	//     vmdk mounted locally: *os.File
-	//     nfs volume:  		 XDR-client
-	//     via guesttools:  	 toolbox client
-	Source() interface{}
-
-	// Stat stats the filesystem target indicated by the last entry in the given Filterspecs inclusion map
-	Stat(op trace.Operation, spec *archive.FilterSpec) (*FileStat, error)
-}
-
-// DataSink defines the methods for importing data to a specific storage element from a tar stream
-type DataSink interface {
-	// Close releases all resources associated with this sink. Shared resources should be reference counted.
-	io.Closer
-
-	// Import performs an import of the tar stream to the source held by this DataSink.  This is single use; once
-	// the export has completed it should not be assumed that the sink remains functional.
-	//
-	// spec: specifies which files will be included/excluded in the import and allows for path rebasing/stripping
-	// tarStream: the tar stream to from which to import data
-	Import(op trace.Operation, spec *archive.FilterSpec, tarStream io.ReadCloser) error
-
-	// Sink returns the mechanism by which the data sink is accessed
-	// Examples:
-	//     vmdk mounted locally: *os.File
-	//     nfs volume:  		 XDR-client
-	//     via guesttools:  	 toolbox client
-	Sink() interface{}
-}
-
-// Importer defines the methods needed to write data into a storage element. This should be implemented by the various
-// store types.
-type Importer interface {
-	// Import allows direct construction and invocation of a data sink for the specified ID.
-	Import(op trace.Operation, id string, spec *archive.FilterSpec, tarStream io.ReadCloser) error
-
-	// NewDataSink constructs a data sink for the specified ID within the context of the Importer. This is a single
-	// use sink which may hold resources until Closed.
-	NewDataSink(op trace.Operation, id string) (DataSink, error)
-}
-
-// Exporter defines the methods needed to read data from a storage element, optionally diff with an ancestor. This
-// shoiuld be implemented by the various store types.
-type Exporter interface {
-	// Export allows direct construction and invocation of a data source for the specified ID.
-	Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error)
-
-	// NewDataSource constructs a data source for the specified ID within the context of the Exporter. This is a single
-	// use source which may hold resources until Closed.
-	NewDataSource(op trace.Operation, id string) (DataSource, error)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume.go
deleted file mode 100644
index 837e8a97e4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"crypto/md5" // #nosec: Use of weak cryptographic primitive
-	"errors"
-	"fmt"
-	"net/url"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type Disk interface {
-	// Path to this disk on the VCH
-	MountPath() (string, error)
-
-	// Path to the disk on the datastore
-	DiskPath() url.URL
-}
-
-// VolumeStorer is an interface to create, remove, enumerate, and get Volumes.
-type VolumeStorer interface {
-	// Creates a volume on the given volume store, of the given size, with the given metadata.
-	VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*Volume, error)
-
-	// Destroys a volume
-	VolumeDestroy(op trace.Operation, vol *Volume) error
-
-	// Lists all volumes
-	VolumesList(op trace.Operation) ([]*Volume, error)
-
-	// The interfaces necessary for Import and Export
-	Resolver
-	Importer
-	Exporter
-}
-
-// Volume is the handle to identify a volume on the backing store.  The URI
-// namespace used to identify the Volume in the storage layer has the following
-// path scheme:
-//
-// `/storage/volumes/<volume store identifier, usually the vch uuid>/<volume id>`
-//
-type Volume struct {
-	// Identifies the volume
-	ID string
-
-	// Label is the computed label of the Volume.  This is set by the runtime.
-	Label string
-
-	// The volumestore the volume lives on. (e.g the datastore + vch + configured vol directory)
-	Store *url.URL
-
-	// Metadata the volume is included with.  Is persisted along side the volume vmdk.
-	Info map[string][]byte
-
-	// Namespace in the storage layer to look up this volume.
-	SelfLink *url.URL
-
-	// Backing device
-	Device Disk
-
-	CopyMode executor.CopyMode
-}
-
-// NewVolume creates a Volume
-func NewVolume(store *url.URL, ID string, info map[string][]byte, device Disk, copyMode executor.CopyMode) (*Volume, error) {
-	storeName, err := util.VolumeStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	selflink, err := util.VolumeURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	// Set the label to the md5 of the ID
-
-	vol := &Volume{
-		ID:       ID,
-		Label:    Label(ID),
-		Store:    store,
-		SelfLink: selflink,
-		Device:   device,
-		Info:     info,
-		CopyMode: copyMode,
-	}
-	return vol, nil
-}
-
-// given an ID, compute the volume's label
-func Label(ID string) string {
-
-	// e2label's manpage says the label size is 16 chars
-	// #nosec: Use of weak cryptographic primitive
-	m := md5.Sum([]byte(ID))
-	return fmt.Sprintf("%x", m)[:16]
-}
-
-func (v *Volume) Parse(u *url.URL) error {
-	// Check the path isn't malformed.
-	if !filepath.IsAbs(u.Path) {
-		return errors.New("invalid uri path")
-	}
-
-	segments := strings.Split(filepath.Clean(u.Path), "/")[1:]
-
-	if segments[0] != util.StorageURLPath {
-		return errors.New("not a storage path")
-	}
-
-	if len(segments) < 3 {
-		return errors.New("uri path mismatch")
-	}
-
-	store, err := util.VolumeStoreNameToURL(segments[2])
-	if err != nil {
-		return err
-	}
-
-	id := segments[3]
-
-	var SelfLink url.URL
-	SelfLink = *u
-
-	v.ID = id
-	v.SelfLink = &SelfLink
-	v.Store = store
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache.go
deleted file mode 100644
index 0d299cc22b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache.go
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// VolumeLookupCache caches Volume references to volumes in the system.
-type VolumeLookupCache struct {
-
-	// Maps IDs to Volumes.
-	//
-	// id -> Volume
-	vlc     map[string]Volume
-	vlcLock sync.RWMutex
-
-	// Maps the service url of the volume store to the underlying data storage implementation
-	volumeStores map[string]VolumeStorer
-}
-
-func NewVolumeLookupCache(op trace.Operation) *VolumeLookupCache {
-	v := &VolumeLookupCache{
-		vlc:          make(map[string]Volume),
-		volumeStores: make(map[string]VolumeStorer),
-	}
-
-	return v
-}
-
-func (v *VolumeLookupCache) GetVolumeStore(op trace.Operation, storeName string) (*url.URL, error) {
-	u, err := util.VolumeStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-	return u, nil
-}
-
-// AddStore adds a volumestore by name.  The url returned is the service url to the volume store.
-func (v *VolumeLookupCache) AddStore(op trace.Operation, storeName string, vs VolumeStorer) (*url.URL, error) {
-	v.vlcLock.Lock()
-	defer v.vlcLock.Unlock()
-
-	// get the service url
-	u, err := util.VolumeStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, ok := v.volumeStores[u.String()]; ok {
-		return nil, fmt.Errorf("volumestore (%s) already added", u.String())
-	}
-
-	v.volumeStores[u.String()] = vs
-	return u, v.rebuildCache(op)
-}
-
-func (v *VolumeLookupCache) volumeStore(store *url.URL) (VolumeStorer, error) {
-
-	// find the datastore
-	vs, ok := v.volumeStores[store.String()]
-	if !ok {
-		err := VolumeStoreNotFoundError{
-			Msg: fmt.Sprintf("volume store (%s) not found", store.String()),
-		}
-		return nil, err
-	}
-
-	return vs, nil
-}
-
-// VolumeStoresList returns a list of volume store names
-func (v *VolumeLookupCache) VolumeStoresList(op trace.Operation) ([]string, error) {
-
-	v.vlcLock.RLock()
-	defer v.vlcLock.RUnlock()
-
-	stores := make([]string, 0, len(v.volumeStores))
-	for u := range v.volumeStores {
-
-		// from the storage url, get the store name
-		storeURL, err := url.Parse(u)
-		if err != nil {
-			return nil, err
-		}
-
-		storeName, err := util.VolumeStoreName(storeURL)
-		if err != nil {
-			return nil, err
-		}
-
-		stores = append(stores, storeName)
-	}
-
-	return stores, nil
-}
-
-func (v *VolumeLookupCache) VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*Volume, error) {
-	v.vlcLock.Lock()
-	defer v.vlcLock.Unlock()
-
-	// check if it exists
-	_, ok := v.vlc[ID]
-	if ok {
-		return nil, os.ErrExist
-	}
-
-	vs, err := v.volumeStore(store)
-	if err != nil {
-		return nil, err
-	}
-
-	vol, err := vs.VolumeCreate(op, ID, store, capacityKB, info)
-	if err != nil {
-		return nil, err
-	}
-	// Add it to the cache.
-	v.vlc[vol.ID] = *vol
-
-	return vol, nil
-}
-
-func (v *VolumeLookupCache) VolumeDestroy(op trace.Operation, ID string) error {
-	v.vlcLock.Lock()
-	defer v.vlcLock.Unlock()
-
-	// Check if it exists
-	vol, ok := v.vlc[ID]
-	if !ok {
-		return os.ErrNotExist
-	}
-
-	if err := volumeInUse(vol.ID); err != nil {
-		op.Errorf("VolumeStore: delete error: %s", err.Error())
-		return err
-	}
-
-	vs, err := v.volumeStore(vol.Store)
-	if err != nil {
-		return err
-	}
-
-	// remove it from the volumestore
-	if err := vs.VolumeDestroy(op, &vol); err != nil {
-		return err
-	}
-	delete(v.vlc, vol.ID)
-
-	return nil
-}
-
-func (v *VolumeLookupCache) VolumeGet(op trace.Operation, ID string) (*Volume, error) {
-	v.vlcLock.RLock()
-	defer v.vlcLock.RUnlock()
-
-	// look in the cache
-	vol, ok := v.vlc[ID]
-	if !ok {
-		return nil, os.ErrNotExist
-	}
-
-	return &vol, nil
-}
-
-func (v *VolumeLookupCache) VolumesList(op trace.Operation) ([]*Volume, error) {
-	v.vlcLock.RLock()
-	defer v.vlcLock.RUnlock()
-
-	// look in the cache, return the list
-	l := make([]*Volume, 0, len(v.vlc))
-	for _, vol := range v.vlc {
-		// this is idiotic
-		var e Volume
-		e = vol
-		l = append(l, &e)
-	}
-
-	return l, nil
-}
-
-// goto the volume store and repopulate the cache.
-func (v *VolumeLookupCache) rebuildCache(op trace.Operation) error {
-	op.Infof("Refreshing volume cache.")
-
-	for _, vs := range v.volumeStores {
-		vols, err := vs.VolumesList(op)
-		if err != nil {
-			return err
-		}
-
-		for _, vol := range vols {
-			log.Infof("Volumestore: Found vol %s on store %s.", vol.ID, vol.Store)
-			// Add it to the cache.
-			v.vlc[vol.ID] = *vol
-		}
-	}
-
-	return nil
-}
-
-func volumeInUse(ID string) error {
-	conts := exec.Containers.Containers(nil)
-	if len(conts) == 0 {
-		return nil
-	}
-
-	for _, cont := range conts {
-
-		if cont.ExecConfig.Mounts == nil {
-			continue
-		}
-
-		if _, mounted := cont.ExecConfig.Mounts[ID]; mounted {
-			return &ErrVolumeInUse{
-				Msg: fmt.Sprintf("volume %s in use by %s", ID, cont.ExecConfig.ID),
-			}
-		}
-	}
-
-	return nil
-}
-
-// Import is a fake store import so that we can do a late lookup of the actual store - this is a work around for the fact that the store
-// URL isn't available in useful form outside of the volumeCache
-func (v *VolumeLookupCache) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarStream io.ReadCloser) error {
-	volume, err := v.VolumeGet(op, id)
-	if err != nil {
-		return err
-	}
-
-	store, err := v.volumeStore(volume.Store)
-	if err != nil {
-		return err
-	}
-
-	// relay call to actual store
-	return store.Import(op, id, spec, tarStream)
-}
-
-func (v *VolumeLookupCache) NewDataSink(op trace.Operation, id string) (DataSink, error) {
-	volume, err := v.VolumeGet(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	store, err := v.volumeStore(volume.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	// relay call to actual store
-	return store.NewDataSink(op, id)
-}
-
-// Export is a fake store export so that we can do a late lookup of the actual store - this is a work around for the fact that the store
-// URL isn't available in useful form outside of the volumeCache
-func (v *VolumeLookupCache) Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	volume, err := v.VolumeGet(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	store, err := v.volumeStore(volume.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	// relay call to actual store
-	return store.Export(op, id, ancestor, spec, data)
-}
-
-func (v *VolumeLookupCache) NewDataSource(op trace.Operation, id string) (DataSource, error) {
-	volume, err := v.VolumeGet(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	store, err := v.volumeStore(volume.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	// relay call to actual store
-	return store.NewDataSource(op, id)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache_test.go
deleted file mode 100644
index 5a8af665b6..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_cache_test.go
+++ /dev/null
@@ -1,261 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"sync"
-	"testing"
-
-	"context"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-type MockVolumeStore struct {
-	// id -> volume
-	db map[string]*Volume
-}
-
-func NewMockVolumeStore() *MockVolumeStore {
-	m := &MockVolumeStore{
-		db: make(map[string]*Volume),
-	}
-
-	return m
-}
-
-func (m *MockVolumeStore) VolumeStoresList(op trace.Operation) (map[string]url.URL, error) {
-	return nil, nil
-}
-
-// Creates a volume on the given volume store, of the given size, with the given metadata.
-func (m *MockVolumeStore) VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*Volume, error) {
-	storeName, err := util.VolumeStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	selfLink, err := util.VolumeURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	vol := &Volume{
-		ID:       ID,
-		Store:    store,
-		SelfLink: selfLink,
-	}
-
-	m.db[ID] = vol
-
-	return vol, nil
-}
-
-// Get an existing volume via it's ID and volume store.
-func (m *MockVolumeStore) VolumeGet(op trace.Operation, ID string) (*Volume, error) {
-	vol, ok := m.db[ID]
-	if !ok {
-		return nil, os.ErrNotExist
-	}
-
-	return vol, nil
-}
-
-// Destroys a volume
-func (m *MockVolumeStore) VolumeDestroy(op trace.Operation, vol *Volume) error {
-	if _, ok := m.db[vol.ID]; !ok {
-		return os.ErrNotExist
-	}
-
-	delete(m.db, vol.ID)
-
-	return nil
-}
-
-// Lists all volumes on the given volume store`
-func (m *MockVolumeStore) VolumesList(op trace.Operation) ([]*Volume, error) {
-	var i int
-	list := make([]*Volume, len(m.db))
-	for _, v := range m.db {
-		t := *v
-		list[i] = &t
-		i++
-	}
-
-	return list, nil
-}
-
-func (m *MockVolumeStore) Export(op trace.Operation, child, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	return nil
-}
-
-func (m *MockVolumeStore) NewDataSink(op trace.Operation, id string) (DataSink, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) NewDataSource(op trace.Operation, id string) (DataSource, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	return nil, nil
-}
-
-func (m *MockVolumeStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, nil
-}
-
-func TestVolumeCreateGetListAndDelete(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-
-	exec.NewContainerCache()
-
-	mvs := NewMockVolumeStore()
-	v := NewVolumeLookupCache(op)
-	storeURL, err := v.AddStore(op, "testStore", mvs)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	inVols := make(map[string]*Volume)
-	inVolsM := &sync.Mutex{}
-
-	wg := &sync.WaitGroup{}
-	createFn := func(i int) {
-		defer wg.Done()
-
-		id := fmt.Sprintf("ID-%d", i)
-
-		// Write to the datastore
-		vol, err := v.VolumeCreate(op, id, storeURL, 0, nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, vol) {
-			return
-		}
-
-		inVolsM.Lock()
-		inVols[id] = vol
-		inVolsM.Unlock()
-	}
-
-	// Create a set of volumes
-	numVolumes := 5
-	wg.Add(numVolumes)
-	for i := 0; i < numVolumes; i++ {
-		go createFn(i)
-	}
-	wg.Wait()
-
-	getFn := func(inVol *Volume) {
-		vol, err := v.VolumeGet(op, inVol.ID)
-		if !assert.NoError(t, err) || !assert.NotNil(t, vol) {
-			return
-		}
-
-		if !assert.Equal(t, inVol, vol) {
-			return
-		}
-		wg.Done()
-	}
-
-	wg.Add(numVolumes)
-	for _, inVol := range inVols {
-		getFn(inVol)
-	}
-	wg.Wait()
-
-	volumeList, err := v.VolumesList(op)
-	if !assert.NoError(t, err) || !assert.Equal(t, numVolumes, len(volumeList)) {
-		return
-	}
-
-	// Test that the list returned by VolumeList matches our inVols list.  Then
-	// delete each vol via the cache, then check the datastore to ensure it's
-	// empty
-	for _, outVol := range volumeList {
-		if !assert.Equal(t, inVols[outVol.ID], outVol) {
-			return
-		}
-
-		if err = v.VolumeDestroy(op, outVol.ID); !assert.NoError(t, err) {
-			return
-		}
-	}
-
-	// check the datastore is empty.
-	if !assert.Empty(t, mvs.db) {
-		return
-	}
-}
-
-// Create 2 store caches but use the same backing datastore.  Create images
-// with the first cache, then get the image with the second.  This simulates
-// restart since the second cache is empty and has to go to the backing store.
-func TestVolumeCacheRestart(t *testing.T) {
-	mvs := NewMockVolumeStore()
-	op := trace.NewOperation(context.Background(), "test")
-
-	firstCache := NewVolumeLookupCache(op)
-	storeURL, err := firstCache.AddStore(op, "testStore", mvs)
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	// Create a set of volumes
-	inVols := make(map[string]*Volume)
-	for i := 1; i < 50; i++ {
-		id := fmt.Sprintf("ID-%d", i)
-
-		// Write to the datastore
-		vol, err := firstCache.VolumeCreate(op, id, storeURL, 0, nil)
-		if !assert.NoError(t, err) || !assert.NotNil(t, vol) {
-			return
-		}
-
-		inVols[id] = vol
-	}
-
-	secondCache := NewVolumeLookupCache(op)
-	if !assert.NotNil(t, secondCache) {
-		return
-	}
-
-	_, err = secondCache.AddStore(op, "testStore", mvs)
-	if !assert.NoError(t, err) || !assert.NotNil(t, storeURL) {
-		return
-	}
-
-	// get the vols from the second cache to ensure it goes to the ds
-	for _, expectedVol := range inVols {
-		vol, err := secondCache.VolumeGet(op, expectedVol.ID)
-		if !assert.NoError(t, err) || !assert.Equal(t, expectedVol, vol) {
-			return
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_test.go
deleted file mode 100644
index dc75a6b2e2..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/volume_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package storage
-
-import (
-	"net/url"
-	"path"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/portlayer/util"
-)
-
-func TestVolumeParseURL(t *testing.T) {
-	util.DefaultHost, _ = url.Parse("http://foo.com/")
-
-	in, _ := url.Parse(util.DefaultHost.String())
-	in.Path = "/" + path.Join("storage", "volumes", "volStore", "volName")
-
-	v := &Volume{}
-	err := v.Parse(in)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, "volName", v.ID) {
-		return
-	}
-
-	volStore, _ := url.Parse(util.DefaultHost.String())
-	util.AppendDir(volStore, "/storage/volumes/volStore")
-	if !assert.Equal(t, volStore.String(), v.Store.String()) {
-		return
-	}
-
-	util.AppendDir(volStore, "volName")
-	if !assert.Equal(t, volStore.String(), v.SelfLink.String()) {
-		return
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/container.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/container.go
deleted file mode 100644
index 389f8da57f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/container.go
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"errors"
-	"io"
-	"net/url"
-	"os"
-	"strings"
-
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// ContainerStorer defines the interface contract expected to allow import and export
-// against containers
-type ContainerStorer interface {
-	storage.Resolver
-	storage.Importer
-	storage.Exporter
-}
-
-// ContainerStore stores container storage information
-type ContainerStore struct {
-	disk.Vmdk
-
-	// used to resolve images when diffing
-	images storage.Resolver
-}
-
-// NewContainerStore creates and returns a new container store
-func NewContainerStore(op trace.Operation, s *session.Session, imageResolver storage.Resolver) (*ContainerStore, error) {
-	dm, err := disk.NewDiskManager(op, s, storage.Config.ContainerView)
-	if err != nil {
-		return nil, err
-	}
-
-	cs := &ContainerStore{
-		Vmdk: disk.Vmdk{
-			Manager: dm,
-			//ds: ds,
-			Session: s,
-		},
-
-		images: imageResolver,
-	}
-	return cs, nil
-}
-
-// URL converts the id of a resource to a URL
-func (c *ContainerStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	// using diskfinder with a basic suffix match is an inefficient and potentially error prone way of doing this
-	// mapping, but until the container store has a structured means of knowing this information it's at least
-	// not going to be incorrect without an ID collision.
-	dsPath, err := c.DiskFinder(op, func(filename string) bool {
-		return strings.HasSuffix(filename, id+".vmdk")
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	return &url.URL{
-		Scheme: "ds",
-		Path:   dsPath,
-	}, nil
-}
-
-// Owners returns a list of VMs that are using the resource specified by `url`
-func (c *ContainerStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	if url.Scheme != "ds" {
-		return nil, errors.New("vmdk path must be a datastore url with \"ds\" scheme")
-	}
-
-	return c.Vmdk.Owners(op, url, filter)
-}
-
-// NewDataSource creates and returns an DataSource associated with container storage
-func (c *ContainerStore) NewDataSource(op trace.Operation, id string) (storage.DataSource, error) {
-	uri, err := c.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	offlineAttempt := 0
-offline:
-	offlineAttempt++
-
-	// This is persistent to avoid issues with concurrent Stat/Import calls
-	source, err := c.newDataSource(op, uri, true)
-	if err == nil {
-		return source, err
-	}
-
-	// check for vmdk locked error here
-	if !disk.IsLockedError(err) {
-		op.Warnf("Unable to mount %s and do not know how to recover from error")
-		// continue anyway because maybe there's an online option
-	}
-
-	// online - Owners() should filter out the appliance VM
-	// #nosec: Errors unhandled.
-	owners, _ := c.Owners(op, uri, disk.LockedVMDKFilter)
-	if len(owners) == 0 {
-		op.Infof("No online owners were found for %s", id)
-		return nil, errors.New("unable to create offline data source and no online owners found")
-	}
-
-	for _, o := range owners {
-		// sanity check to see if we are the owner - this should catch transitions
-		// from container running to diff or commit for example between the offline attempt and here
-		uuid, err := o.UUID(op)
-		if err == nil {
-			// check if the vm is appliance VM if we can successfully get its UUID
-			// #nosec: Errors unhandled.
-			self, _ := guest.IsSelf(op, uuid)
-			if self && offlineAttempt < 2 {
-				op.Infof("Appliance is owner of online vmdk - retrying offline source path")
-				goto offline
-			}
-		}
-
-		online, err := c.newOnlineDataSource(op, o, id)
-		if online != nil {
-			return online, err
-		}
-
-		op.Debugf("Failed to create online datasource with owner %s: %s", o.Reference(), err)
-	}
-
-	return nil, errors.New("unable to create online or offline data source")
-}
-
-func (c *ContainerStore) newDataSource(op trace.Operation, url *url.URL, persistent bool) (storage.DataSource, error) {
-	mountPath, cleanFunc, err := c.Mount(op, url, persistent)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	op.Debugf("Created mount data source for access to %s at %s", url, mountPath)
-	return storage.NewMountDataSource(op, f, cleanFunc), nil
-}
-
-func (c *ContainerStore) newOnlineDataSource(op trace.Operation, owner *vm.VirtualMachine, id string) (storage.DataSource, error) {
-	op.Debugf("Constructing toolbox data source: %s.%s", owner.Reference(), id)
-
-	return &ToolboxDataSource{
-		VM:    owner,
-		ID:    id,
-		Clean: func() { return },
-	}, nil
-}
-
-// NewDataSink creates and returns an DataSink associated with container storage
-func (c *ContainerStore) NewDataSink(op trace.Operation, id string) (storage.DataSink, error) {
-	uri, err := c.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	offlineAttempt := 0
-offline:
-	offlineAttempt++
-
-	sink, err := c.newDataSink(op, uri)
-	if err == nil {
-		return sink, err
-	}
-
-	// check for vmdk locked error here
-	if !disk.IsLockedError(err) {
-		op.Warnf("Unable to mount %s and do not know how to recover from error")
-		// continue anyway because maybe there's an online option
-	}
-
-	// online - Owners() should filter out the appliance VM
-	// #nosec: Errors unhandled.
-	owners, _ := c.Owners(op, uri, disk.LockedVMDKFilter)
-	if len(owners) == 0 {
-		op.Infof("No online owners were found for %s", id)
-		return nil, errors.New("unable to create offline data sink and no online owners found")
-	}
-
-	for _, o := range owners {
-		// sanity check to see if we are the owner - this should catch transitions
-		// from container running to diff or commit for example between the offline attempt and here
-		uuid, err := o.UUID(op)
-		if err == nil {
-			// check if the vm is appliance VM if we can successfully get its UUID
-			// #nosec: Errors unhandled.
-			self, _ := guest.IsSelf(op, uuid)
-			if self && offlineAttempt < 2 {
-				op.Infof("Appliance is owner of online vmdk - retrying offline source path")
-				goto offline
-			}
-		}
-
-		online, err := c.newOnlineDataSink(op, o, id)
-		if online != nil {
-			return online, err
-		}
-
-		op.Debugf("Failed to create online datasink with owner %s: %s", o.Reference(), err)
-	}
-
-	return nil, errors.New("unable to create online or offline data sink")
-}
-
-func (c *ContainerStore) newDataSink(op trace.Operation, url *url.URL) (storage.DataSink, error) {
-	mountPath, cleanFunc, err := c.Mount(op, url, true)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	op.Debugf("Created mount data sink for access to %s at %s", url, mountPath)
-	return storage.NewMountDataSink(op, f, cleanFunc), nil
-}
-
-func (c *ContainerStore) newOnlineDataSink(op trace.Operation, owner *vm.VirtualMachine, id string) (storage.DataSink, error) {
-	op.Debugf("Constructing toolbox data sink: %s.%s", owner.Reference(), id)
-
-	return &ToolboxDataSink{
-		VM:    owner,
-		ID:    id,
-		Clean: func() { return },
-	}, nil
-}
-
-func (c *ContainerStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	l, err := c.NewDataSink(op, id)
-	if err != nil {
-		return err
-	}
-
-	return l.Import(op, spec, tarstream)
-}
-
-func (c *ContainerStore) Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	l, err := c.NewDataSource(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	if ancestor == "" {
-		op.Infof("No ancestor specified so following basic export path")
-		return l.Export(op, spec, data)
-	}
-
-	// for now we assume ancetor instead of entirely generic left/right
-	// this allows us to assume it's an image
-	img, err := c.images.URL(op, ancestor)
-	if err != nil {
-		op.Errorf("Failed to map ancestor %s to image: %s", ancestor, err)
-
-		l.Close()
-		return nil, err
-	}
-	op.Debugf("Mapped ancestor %s to %s", ancestor, img.String())
-
-	r, err := c.newDataSource(op, img, false)
-	if err != nil {
-		op.Debugf("Unable to get datasource for ancestor: %s", err)
-
-		l.Close()
-		return nil, err
-	}
-
-	closers := func() error {
-		op.Debugf("Callback to io.Closer function for container export")
-
-		l.Close()
-		r.Close()
-
-		return nil
-	}
-
-	ls := l.Source()
-	rs := r.Source()
-
-	fl, lok := ls.(*os.File)
-	fr, rok := rs.(*os.File)
-
-	if !lok || !rok {
-		go closers()
-		return nil, errors.New("mismatched datasource types")
-	}
-
-	// if we want data, exclude the xattrs, otherwise assume diff
-	xattrs := !data
-
-	tar, err := archive.Diff(op, fl.Name(), fr.Name(), spec, data, xattrs)
-	if err != nil {
-		go closers()
-		return nil, err
-	}
-
-	return &storage.ProxyReadCloser{
-		ReadCloser: tar,
-		Closer:     closers,
-	}, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/export.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/export.go
deleted file mode 100644
index 11fbafbc2f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/export.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// Export reads the delta between child and parent volume layers, returning
-// the difference as a tar archive.
-//
-// store - the volume store containing the two layers
-// id - must inherit from ancestor if ancestor is specified
-// ancestor - the volume layer up the chain against which to diff
-// spec - describes filters on paths found in the data (include, exclude, strip)
-// data - set to true to include file data in the tar archive, false to include headers only
-func (v *VolumeStore) Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	if ancestor != "" {
-		return nil, fmt.Errorf("volume diff is not supported in this volume store: %s", v.SelfLink.String())
-	}
-
-	l, err := v.NewDataSource(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	return l.Export(op, spec, data)
-}
-
-// NewDataSource creates and returns an DataSource associated with container storage
-func (v *VolumeStore) NewDataSource(op trace.Operation, id string) (storage.DataSource, error) {
-	uri, err := v.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	offlineAttempt := 0
-offline:
-	offlineAttempt++
-
-	// offline disk attempt
-	source, err := v.newDataSource(op, uri)
-	if err == nil {
-		return source, err
-	}
-
-	// check for vmdk locked error here
-	if !disk.IsLockedError(err) {
-		op.Warnf("Unable to mount %s and do not know how to recover from error")
-		// continue anyway because maybe there's an online option
-	}
-
-	// online - Owners() should filter out the appliance VM
-	// #nosec: Errors unhandled.
-	owners, _ := v.Owners(op, uri, disk.LockedVMDKFilter)
-	if len(owners) == 0 {
-		op.Infof("No online owners were found for %s", id)
-		return nil, errors.New("unable to create offline data source and no online owners found")
-	}
-
-	for _, o := range owners {
-		// sanity check to see if we are the owner - this should catch transitions
-		// from container running to diff or commit for example between the offline attempt and here
-		uuid, err := o.UUID(op)
-		if err == nil {
-			// check if the vm is appliance VM if we can successfully get its UUID
-			// #nosec: Errors unhandled.
-			self, _ := guest.IsSelf(op, uuid)
-			if self && offlineAttempt < 2 {
-				op.Infof("Appliance is owner of online vmdk - retrying offline source path")
-				goto offline
-			}
-		}
-
-		online, err := v.newOnlineDataSource(op, o, id)
-		if online != nil {
-			return online, err
-		}
-
-		op.Debugf("Failed to create online datasource with owner %s: %s", o.Reference(), err)
-	}
-
-	return nil, errors.New("unable to create online or offline data source")
-}
-
-func (v *VolumeStore) newDataSource(op trace.Operation, url *url.URL) (storage.DataSource, error) {
-	// This is persistent to avoid issues with concurrent Stat/Import calls
-	mountPath, cleanFunc, err := v.Mount(op, url, true)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	op.Debugf("Created mount data source for access to %s at %s", url, mountPath)
-	return storage.NewMountDataSource(op, f, cleanFunc), nil
-}
-
-func (v *VolumeStore) newOnlineDataSource(op trace.Operation, owner *vm.VirtualMachine, id string) (storage.DataSource, error) {
-	op.Debugf("Constructing toolbox data source: %s.%s", owner.Reference(), id)
-
-	return &ToolboxDataSource{
-		VM:    owner,
-		ID:    storage.Label(id),
-		Clean: func() { return },
-	}, nil
-}
-
-// Export reads the delta between child and parent image layers, returning
-// the difference as a tar archive.
-//
-// id - must inherit from ancestor if ancestor is specified
-// ancestor - the layer up the chain against which to diff
-// spec - describes filters on paths found in the data (include, exclude, rebase, strip)
-// data - set to true to include file data in the tar archive, false to include headers only
-func (i *ImageStore) Export(op trace.Operation, id, ancestor string, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	l, err := i.NewDataSource(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	if ancestor == "" {
-		return l.Export(op, spec, data)
-	}
-
-	// for now we assume ancestor instead of entirely generic left/right
-	// this allows us to assume it's an image
-	r, err := i.NewDataSource(op, ancestor)
-	if err != nil {
-		op.Debugf("Unable to get datasource for ancestor: %s", err)
-
-		l.Close()
-		return nil, err
-	}
-
-	closers := func() error {
-		op.Debugf("Callback to io.Closer function for image delta export")
-
-		l.Close()
-		r.Close()
-
-		return nil
-	}
-
-	ls := l.Source()
-	rs := r.Source()
-
-	fl, lok := ls.(*os.File)
-	fr, rok := rs.(*os.File)
-
-	if !lok || !rok {
-		go closers()
-		return nil, fmt.Errorf("mismatched datasource types: %T, %T", ls, rs)
-	}
-
-	// if we want data, exclude the xattrs, otherwise assume diff
-	tar, err := archive.Diff(op, fl.Name(), fr.Name(), spec, data, !data)
-	if err != nil {
-		go closers()
-		return nil, err
-	}
-
-	return &storage.ProxyReadCloser{
-		ReadCloser: tar,
-		Closer:     closers,
-	}, nil
-}
-
-func (i *ImageStore) NewDataSource(op trace.Operation, id string) (storage.DataSource, error) {
-	url, err := i.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	return i.newDataSource(op, url)
-}
-
-func (i *ImageStore) newDataSource(op trace.Operation, url *url.URL) (storage.DataSource, error) {
-	mountPath, cleanFunc, err := i.Mount(op, url, false)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	op.Debugf("Created mount data source for access to %s at %s", url, mountPath)
-	return storage.NewMountDataSource(op, f, cleanFunc), nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image.go
deleted file mode 100644
index ee6aadd125..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image.go
+++ /dev/null
@@ -1,780 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"crypto/sha256"
-	"errors"
-	"fmt"
-	"io"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"syscall"
-
-	docker "github.com/docker/docker/pkg/archive"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	portlayer "github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// All paths on the datastore for images are relative to <datastore>/VIC/
-var StorageParentDir = "VIC"
-
-// Set to false for unit tests
-var (
-	DetachAll = true
-
-	FileForMinOS = map[string]os.FileMode{
-		"/etc/hostname":    0644,
-		"/etc/hosts":       0644,
-		"/etc/resolv.conf": 0644,
-	}
-
-	SymLinkForMinOS = map[string]string{
-		"/etc/mtab": "/proc/mounts",
-	}
-
-	// Here the permission of .tether should be drwxrwxrwt.
-	// The sticky bit 't' is added when mounting the tmpfs in bootstrap
-	DirForMinOS = map[string]os.FileMode{
-		"/etc":         0755,
-		"/lib/modules": 0755,
-		"/proc":        0555,
-		"/sys":         0555,
-		"/run":         0755,
-		"/.tether":     0777,
-	}
-)
-
-const (
-	StorageImageDir     = "images"
-	defaultDiskLabel    = "containerfs"
-	defaultDiskSizeInKB = 8 * 1024 * 1024
-	metaDataDir         = "imageMetadata"
-	manifest            = "manifest"
-)
-
-type ImageStore struct {
-	disk.Vmdk
-}
-
-func NewImageStore(op trace.Operation, s *session.Session, u *url.URL) (*ImageStore, error) {
-	dm, err := disk.NewDiskManager(op, s, portlayer.Config.ContainerView)
-	if err != nil {
-		return nil, err
-	}
-
-	if DetachAll {
-		if err = dm.DetachAll(op); err != nil {
-			return nil, err
-		}
-	}
-
-	datastores, err := s.Finder.DatastoreList(op, u.Host)
-	if err != nil {
-		return nil, fmt.Errorf("Host returned error when trying to locate provided datastore %s: %s", u.String(), err.Error())
-	}
-
-	if len(datastores) != 1 {
-		return nil, fmt.Errorf("Found %d datastores with provided datastore path %s. Cannot create image store.", len(datastores), u)
-	}
-
-	ds, err := datastore.NewHelper(op, s, datastores[0], path.Join(u.Path, StorageParentDir))
-	if err != nil {
-		return nil, err
-	}
-
-	vis := &ImageStore{
-		Vmdk: disk.Vmdk{
-			Manager: dm,
-			Helper:  ds,
-			Session: s,
-		},
-	}
-
-	return vis, nil
-}
-
-// Returns the path to a given image store.  Currently this is the UUID of the VCH.
-// `/VIC/imageStoreName (currently the vch uuid)/images`
-func (v *ImageStore) imageStorePath(storeName string) string {
-	return path.Join(storeName, StorageImageDir)
-}
-
-// Returns the path to the image relative to the given
-// store.  The dir structure for an image in the datastore is
-// `/VIC/imageStoreName (currently the vch uuid)/imageName/imageName.vmkd`
-func (v *ImageStore) imageDirPath(storeName, imageName string) string {
-	return path.Join(v.imageStorePath(storeName), imageName)
-}
-
-func (v *ImageStore) imageDiskPath(storeName, imageName string) string {
-	return path.Join(v.imageDirPath(storeName, imageName), imageName+".vmdk")
-}
-
-// Returns the path to the vmdk itself in datastore url format
-func (v *ImageStore) imageDiskDSPath(storeName, imageName string) *object.DatastorePath {
-	return &object.DatastorePath{
-		Datastore: v.Helper.RootURL.Datastore,
-		Path:      path.Join(v.Helper.RootURL.Path, v.imageDiskPath(storeName, imageName)),
-	}
-}
-
-// Returns the path to the metadata directory for an image
-func (v *ImageStore) imageMetadataDirPath(storeName, imageName string) string {
-	return path.Join(v.imageDirPath(storeName, imageName), metaDataDir)
-}
-
-// Returns the path to the manifest file.  This file is our "done" file.
-func (v *ImageStore) manifestPath(storeName, imageName string) string {
-	return path.Join(v.imageDirPath(storeName, imageName), manifest)
-}
-
-func (v *ImageStore) CreateImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	// convert the store name to a port layer url.
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err = v.Mkdir(op, true, v.imageStorePath(storeName)); err != nil {
-		return nil, err
-	}
-
-	return u, nil
-}
-
-// DeleteImageStore deletes the image store top level directory
-func (v *ImageStore) DeleteImageStore(op trace.Operation, storeName string) error {
-	op.Infof("Cleaning up image store %s", storeName)
-	return v.Rm(op, v.imageStorePath(storeName))
-}
-
-// GetImageStore checks to see if the image store exists on disk and returns an
-// error or the store's URL.
-func (v *ImageStore) GetImageStore(op trace.Operation, storeName string) (*url.URL, error) {
-	u, err := util.ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	p := v.imageStorePath(storeName)
-	info, err := v.Stat(op, p)
-	if err != nil {
-		return nil, err
-	}
-
-	_, ok := info.(*types.FolderFileInfo)
-	if !ok {
-		return nil, fmt.Errorf("Stat error:  path doesn't exist (%s)", p)
-	}
-
-	// This is startup.  Look for image directories without manifest files and
-	// nuke them.
-	if err := v.cleanup(op, u); err != nil {
-		return nil, err
-	}
-
-	return u, nil
-}
-
-func (v *ImageStore) ListImageStores(op trace.Operation) ([]*url.URL, error) {
-	op.Debugf("Listing image stores under %s", v.Helper.RootURL)
-	res, err := v.Ls(op, "")
-	if err != nil {
-		op.Errorf("Error listing image stores: %s", err.Error())
-		return nil, err
-	}
-
-	stores := []*url.URL{}
-	for _, f := range res.File {
-		path := f.GetFileInfo().Path
-		_, ok := f.(*types.FolderFileInfo)
-		if !ok {
-			op.Debugf("Skipping directory element %s as it's not a folder: %T", path, f)
-			continue
-		}
-
-		u, err := util.ImageStoreNameToURL(path)
-		if err != nil {
-			op.Errorf("Error converting image store name to URL: %s", err.Error())
-			return nil, err
-		}
-
-		op.Debugf("Mapped image store name %s to %s", path, u.String())
-		stores = append(stores, u)
-	}
-
-	return stores, nil
-}
-
-// WriteImage creates a new image layer from the given parent.
-// Eg parentImage + newLayer = new Image built from parent
-//
-// parent - The parent image to create the new image from.
-// ID - textual ID for the image to be written
-// meta - metadata associated with the image
-// Tag - the tag of the image to be written
-func (v *ImageStore) WriteImage(op trace.Operation, parent *portlayer.Image, ID string, meta map[string][]byte, sum string,
-	r io.Reader) (*portlayer.Image, error) {
-
-	storeName, err := util.ImageStoreName(parent.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	imageURL, err := util.ImageURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	var dsk *disk.VirtualDisk
-	// If this is scratch, then it's the root of the image store.  All images
-	// will be descended from this created and prepared fs.
-	if ID == portlayer.Scratch.ID {
-		// Create the scratch layer
-		if err := v.scratch(op, storeName); err != nil {
-			return nil, err
-		}
-	} else {
-
-		if parent.ID == "" {
-			return nil, fmt.Errorf("parent ID is empty")
-		}
-
-		dsk, err = v.writeImage(op, storeName, parent.ID, ID, meta, sum, r)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	newImage := &portlayer.Image{
-		ID:         ID,
-		SelfLink:   imageURL,
-		ParentLink: parent.SelfLink,
-		Store:      parent.Store,
-		Metadata:   meta,
-		Disk:       dsk,
-	}
-
-	return newImage, nil
-}
-
-// URL returns a url to the disk image represented by `id`
-// This is a "ds://" URL so cannot be used as input to most of the ImageStore methods that
-// take URLs.
-func (v *ImageStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	stores, err := v.ListImageStores(op)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(stores) < 1 {
-		detail := "expected to find at least one image store available"
-		op.Errorf("Listing image stores: %s", detail)
-		return nil, errors.New(detail)
-	}
-
-	storeName, err := util.ImageStoreName(stores[0])
-	if err != nil {
-		op.Infof("Error getting image store name for %s: %s", stores[0], err.Error())
-		return nil, err
-	}
-
-	url := util.ImageDatastoreURL(v.imageDiskDSPath(storeName, id))
-	if err != nil {
-		op.Infof("Error getting image URL: %s", err.Error())
-		return nil, err
-	}
-
-	op.Debugf("Mapped image %s to %s", id, url)
-	return url, err
-}
-
-// Owners returns a list of VMs that are using the disk specified by `url`
-func (v *ImageStore) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	return nil, nil
-}
-
-// cleanup safely on error
-func (v *ImageStore) cleanupDisk(op trace.Operation, ID, storeName string, vmdisk *disk.VirtualDisk) {
-	op.Errorf("Cleaning up failed image %s", ID)
-
-	if vmdisk != nil {
-		if vmdisk.Mounted() {
-			op.Debugf("Unmounting abandoned disk")
-			// #nosec: Errors unhandled.
-			vmdisk.Unmount(op)
-		}
-
-		if vmdisk.Attached() {
-			op.Debugf("Detaching abandoned disk")
-			// #nosec: Errors unhandled.
-			v.Detach(op, vmdisk.VirtualDiskConfig)
-		}
-	}
-
-	// #nosec: Errors unhandled.
-	v.deleteImage(op, storeName, ID)
-}
-
-// Create the image directory, create a temp vmdk in this directory,
-// attach/mount the disk, unpack the tar, check the checksum.  If the data
-// doesn't match the expected checksum, abort by nuking the image directory.
-// If everything matches, move the tmp vmdk to ID.vmdk.  The unwind path is a
-// bit convoluted here;  we need to clean up on the way out in the error case
-func (v *ImageStore) writeImage(op trace.Operation, storeName, parentID, ID string, meta map[string][]byte,
-	sum string, r io.Reader) (*disk.VirtualDisk, error) {
-
-	// Create a temp image directory in the store.
-	imageDir := v.imageDirPath(storeName, ID)
-	_, err := v.Mkdir(op, true, imageDir)
-	if err != nil {
-		return nil, err
-	}
-
-	// Write the metadata to the datastore
-	metaDataDir := v.imageMetadataDirPath(storeName, ID)
-	err = writeMetadata(op, v.Helper, metaDataDir, meta)
-	if err != nil {
-		return nil, err
-	}
-
-	// datastore path to the parent
-	parentDiskDsURI := v.imageDiskDSPath(storeName, parentID)
-
-	// datastore path to the disk we're creating
-	diskDsURI := v.imageDiskDSPath(storeName, ID)
-	op.Infof("Creating image %s (%s)", ID, diskDsURI)
-
-	var vmdisk *disk.VirtualDisk
-	// On error, unmount if mounted, detach if attached, and nuke the image directory
-	defer func() {
-		if err == nil {
-			return
-		}
-		v.cleanupDisk(op, ID, storeName, vmdisk)
-	}()
-
-	config := disk.NewPersistentDisk(diskDsURI).WithParent(parentDiskDsURI)
-	// Create the disk
-	vmdisk, err = v.CreateAndAttach(op, config)
-	if err != nil {
-		return nil, err
-	}
-
-	dir, err := vmdisk.Mount(op, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	h := sha256.New()
-	t := io.TeeReader(r, h)
-
-	// Untar the archive
-	var n int64
-	if n, err = docker.ApplyLayer(dir, t); err != nil {
-		return nil, err
-	}
-
-	op.Debugf("%s wrote %d bytes", ID, n)
-
-	actualSum := fmt.Sprintf("sha256:%x", h.Sum(nil))
-	if actualSum != sum {
-		err = fmt.Errorf("Failed to validate image checksum. Expected %s, got %s", sum, actualSum)
-		return nil, err
-	}
-
-	if err = vmdisk.Unmount(op); err != nil {
-		return nil, err
-	}
-
-	if err = v.Detach(op, vmdisk.VirtualDiskConfig); err != nil {
-		return nil, err
-	}
-
-	// Write our own bookkeeping manifest file to the image's directory.  We
-	// treat the manifest file like a done file.  Its existence means this vmdk
-	// is consistent.  Previously we were writing the vmdk to a tmp vmdk file
-	// then moving it (using the MoveDatastoreFile or MoveVirtualDisk calls).
-	// However(!!) this flattens the vmdk.  Also mkdir foo && ls -l foo fails
-	// on VSAN (see
-	// https://github.com/vmware/vic/pull/1764#issuecomment-237093424 for
-	// detail).  We basically can't trust any of the datastore calls to help us
-	// with atomic operations.  Touching an empty file seems to work well
-	// enough.
-	if err = v.writeManifest(op, storeName, ID, nil); err != nil {
-		return nil, err
-	}
-
-	return vmdisk, nil
-}
-
-func (v *ImageStore) scratch(op trace.Operation, storeName string) error {
-	var (
-		vmdisk *disk.VirtualDisk
-		size   int64
-		err    error
-	)
-
-	// Create the image directory in the store.
-	imageDir := v.imageDirPath(storeName, portlayer.Scratch.ID)
-	if _, err := v.Mkdir(op, false, imageDir); err != nil {
-		return err
-	}
-
-	// Write the metadata to the datastore
-	metaDataDir := v.imageMetadataDirPath(storeName, portlayer.Scratch.ID)
-	if err := writeMetadata(op, v.Helper, metaDataDir, nil); err != nil {
-		return err
-	}
-
-	imageDiskDsURI := v.imageDiskDSPath(storeName, portlayer.Scratch.ID)
-	op.Infof("Creating image %s (%s)", portlayer.Scratch.ID, imageDiskDsURI)
-
-	size = defaultDiskSizeInKB
-	if portlayer.Config.ScratchSize != 0 {
-		size = portlayer.Config.ScratchSize
-	}
-
-	defer func() {
-		if err == nil {
-			return
-		}
-		v.cleanupDisk(op, portlayer.Scratch.ID, storeName, vmdisk)
-	}()
-
-	config := disk.NewPersistentDisk(imageDiskDsURI).WithCapacity(size)
-	// Create the disk
-	vmdisk, err = v.CreateAndAttach(op, config)
-	if err != nil {
-		op.Errorf("CreateAndAttach(%s) error: %s", imageDiskDsURI, err)
-		return err
-	}
-
-	op.Debugf("Scratch disk created with size %d", portlayer.Config.ScratchSize)
-
-	// Make the filesystem and set its label to defaultDiskLabel
-	if err = vmdisk.Mkfs(op, defaultDiskLabel); err != nil {
-		op.Errorf("Failed to create scratch filesystem: %s", err)
-		return err
-	}
-
-	if err = createBaseStructure(op, vmdisk); err != nil {
-		op.Errorf("Failed to create base filesystem structure: %s", err)
-		return err
-	}
-
-	if err = v.Detach(op, vmdisk.VirtualDiskConfig); err != nil {
-		op.Errorf("Failed to detach scratch image: %s", err)
-		return err
-	}
-
-	if err = v.writeManifest(op, storeName, portlayer.Scratch.ID, nil); err != nil {
-		op.Errorf("Failed to create manifest for scratch image: %s", err)
-		return err
-	}
-
-	return nil
-}
-
-func (v *ImageStore) GetImage(op trace.Operation, store *url.URL, ID string) (*portlayer.Image, error) {
-	defer trace.End(trace.Begin(store.String() + "/" + ID))
-	storeName, err := util.ImageStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	imageURL, err := util.ImageURL(storeName, ID)
-	if err != nil {
-		return nil, err
-	}
-
-	if err = v.verifyImage(op, storeName, ID); err != nil {
-		return nil, err
-	}
-
-	// get the metadata
-	metaDataDir := v.imageMetadataDirPath(storeName, ID)
-	meta, err := getMetadata(op, v.Helper, metaDataDir)
-	if err != nil {
-		return nil, err
-	}
-
-	diskDsURI := v.imageDiskDSPath(storeName, ID)
-
-	var s = *store
-
-	config := disk.NewPersistentDisk(diskDsURI)
-	dsk, err := v.Get(op, config)
-	if err != nil {
-		return nil, err
-	}
-
-	var parentURL *url.URL
-	if dsk.ParentDatastoreURI != nil {
-		vmdk := path.Base(dsk.ParentDatastoreURI.Path)
-		parentURL, err = util.ImageURL(storeName, strings.TrimSuffix(vmdk, path.Ext(vmdk)))
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	newImage := &portlayer.Image{
-		ID:         ID,
-		SelfLink:   imageURL,
-		Store:      &s,
-		ParentLink: parentURL,
-		Metadata:   meta,
-		Disk:       dsk,
-	}
-
-	op.Debugf("GetImage(%s) has parent %s", newImage.SelfLink, newImage.Parent())
-	return newImage, nil
-}
-
-func (v *ImageStore) ListImages(op trace.Operation, store *url.URL, IDs []string) ([]*portlayer.Image, error) {
-
-	storeName, err := util.ImageStoreName(store)
-	if err != nil {
-		return nil, err
-	}
-
-	res, err := v.Ls(op, v.imageStorePath(storeName))
-	if err != nil {
-		return nil, err
-	}
-
-	images := []*portlayer.Image{}
-	for _, f := range res.File {
-		file, ok := f.(*types.FolderFileInfo)
-		if !ok {
-			continue
-		}
-
-		ID := file.Path
-
-		// filter out scratch
-		if ID == portlayer.Scratch.ID {
-			continue
-		}
-
-		// GetImage verifies the image is good by calling verifyImage.
-		img, err := v.GetImage(op, store, ID)
-		if err != nil {
-			return nil, err
-		}
-
-		images = append(images, img)
-	}
-
-	return images, nil
-}
-
-// DeleteImage deletes an image from the image store.  If the image is in
-// use either by way of inheritance or because it's attached to a
-// container, this will return an error.
-func (v *ImageStore) DeleteImage(op trace.Operation, image *portlayer.Image) (*portlayer.Image, error) {
-	//  check if the image is in use.
-	if err := imagesInUse(op, image.ID); err != nil {
-		op.Errorf("ImageStore: delete image error: %s", err.Error())
-		return nil, err
-	}
-
-	storeName, err := util.ImageStoreName(image.Store)
-	if err != nil {
-		return nil, err
-	}
-
-	return image, v.deleteImage(op, storeName, image.ID)
-}
-
-func (v *ImageStore) deleteImage(op trace.Operation, storeName, ID string) error {
-	// Delete in order of manifest (the done file), the vmdk (because VC honors
-	// the deletable flag in the vmdk file), then the directory to get
-	// everything else.
-	paths := []string{
-		v.manifestPath(storeName, ID),
-		v.imageDiskPath(storeName, ID),
-		v.imageDirPath(storeName, ID),
-	}
-
-	for _, pth := range paths {
-		err := v.Rm(op, pth)
-
-		// not exist is ok
-		if err == nil || types.IsFileNotFound(err) {
-			continue
-		}
-
-		// something isn't right.  bale.
-		op.Errorf("ImageStore: delete image error: %s", err.Error())
-		return err
-	}
-
-	return nil
-}
-
-// Find any image directories without the manifest file and remove them.
-func (v *ImageStore) cleanup(op trace.Operation, store *url.URL) error {
-	op.Infof("Checking for inconsistent images on %s", store.String())
-
-	storeName, err := util.ImageStoreName(store)
-	if err != nil {
-		return err
-	}
-
-	res, err := v.Ls(op, v.imageStorePath(storeName))
-	if err != nil {
-		return err
-	}
-
-	// We could call v.ListImages here but that results in calling GetImage,
-	// which pulls and unmarshalls the metadata.  We don't need that.
-	for _, f := range res.File {
-		file, ok := f.(*types.FolderFileInfo)
-		if !ok {
-			continue
-		}
-
-		ID := file.Path
-
-		if err := v.verifyImage(op, storeName, ID); err != nil {
-			if ID == portlayer.Scratch.ID {
-				op.Errorf("Failed to verify scratch image - skipping deletion so as not to invalidate image chain but this is probably non-functional")
-				continue
-			}
-
-			if err = v.deleteImage(op, storeName, ID); err != nil {
-				// deleteImage logs the error in the event there is one.
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// Manifest file for the image.
-func (v *ImageStore) writeManifest(op trace.Operation, storeName, ID string, r io.Reader) error {
-
-	if err := v.Upload(op, r, v.manifestPath(storeName, ID)); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// check for the manifest file AND the vmdk
-func (v *ImageStore) verifyImage(op trace.Operation, storeName, ID string) error {
-
-	// Check for the manifiest file and the vmdk
-	for _, p := range []string{v.manifestPath(storeName, ID), v.imageDiskPath(storeName, ID)} {
-		if _, err := v.Stat(op, p); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// XXX TODO This should be tied to an interface so we don't have to import exec
-// here (or wherever the cache lives).
-func imagesInUse(op trace.Operation, ID string) error {
-	// XXX Why doesnt this ever return an error?  Strange.
-	// Gather all containers
-	conts := exec.Containers.Containers(nil)
-	if len(conts) == 0 {
-		return nil
-	}
-
-	for _, cont := range conts {
-		layerID := cont.ExecConfig.LayerID
-
-		if layerID == ID {
-			return &portlayer.ErrImageInUse{
-				Msg: fmt.Sprintf("image %s in use by %s", ID, cont.ExecConfig.ID),
-			}
-		}
-	}
-
-	return nil
-}
-
-// populate the scratch with minimum OS structure defined in FileForMinOS and DirForMinOS
-func createBaseStructure(op trace.Operation, vmdisk *disk.VirtualDisk) (err error) {
-	dir, err := vmdisk.Mount(op, nil)
-	if err != nil {
-		op.Errorf("Failed to mount device %s to dir %s", vmdisk.DevicePath, dir)
-		return err
-	}
-
-	defer func() {
-		e2 := vmdisk.Unmount(op)
-		if e2 != nil {
-			op.Errorf("Failed to unmount device: %s", e2)
-			if err == nil {
-				err = e2
-			}
-		}
-	}()
-
-	for dname, dmode := range DirForMinOS {
-		dirPath := path.Join(dir, dname)
-		if err = os.MkdirAll(dirPath, dmode); err != nil {
-			op.Errorf("Failed to create directory %s: %s", dirPath, err)
-			return err
-		}
-	}
-
-	op.Infof("Creating base file structure on disk")
-	// The directory has to exist before creating the new file
-	for fname, fmode := range FileForMinOS {
-		filePath := path.Join(dir, fname)
-		f, err := os.OpenFile(filePath, os.O_CREATE, fmode)
-		if err != nil {
-			op.Errorf("Failed to open file %s: %s", filePath, err)
-			return err
-		}
-
-		err = f.Close()
-		if err != nil {
-			op.Errorf("Failed to close file %s: %s", filePath, err)
-			return err
-		}
-	}
-
-	for fname, target := range SymLinkForMinOS {
-		filePath := path.Join(dir, fname)
-		err := syscall.Symlink(target, filePath)
-		if err != nil {
-			op.Errorf("Failed to create symlink %s->%s: %s", filePath, target, err)
-			return err
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image_test.go
deleted file mode 100644
index f7e2436293..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/image_test.go
+++ /dev/null
@@ -1,625 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"archive/tar"
-	"bytes"
-	"crypto/sha256"
-	"fmt"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"sync"
-	"testing"
-
-	"context"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	portlayer "github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-func setup(t *testing.T) (*portlayer.NameLookupCache, *session.Session, string, error) {
-	logrus.SetLevel(logrus.DebugLevel)
-	trace.Logger.Level = logrus.DebugLevel
-	DetachAll = false
-
-	client := datastore.Session(context.TODO(), t)
-	if client == nil {
-		return nil, nil, "", fmt.Errorf("skip")
-	}
-
-	storeURL := &url.URL{
-		Path: datastore.TestName("imageTests"),
-		Host: client.DatastorePath}
-
-	op := trace.NewOperation(context.Background(), "setup")
-	vsImageStore, err := NewImageStore(op, client, storeURL)
-	if err != nil {
-		if err.Error() == "can't find the hosting vm" {
-			t.Skip("Skipping: test must be run in a VM")
-		} else {
-			t.Log(err.Error())
-		}
-		return nil, nil, "", err
-	}
-
-	s := portlayer.NewLookupCache(vsImageStore)
-
-	return s, client, storeURL.Path, nil
-}
-
-func TestRestartImageStore(t *testing.T) {
-	t.Skip("this test needs TLC")
-
-	// Start the image store once
-	cacheStore, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	origVsStore := cacheStore.DataStore.(*ImageStore)
-	defer cleanup(t, client, origVsStore, parentPath)
-
-	storeName := "bogusStoreName"
-	op := trace.NewOperation(context.Background(), "test")
-	origStore, err := cacheStore.CreateImageStore(op, storeName)
-	if !assert.NoError(t, err) || !assert.NotNil(t, origStore) {
-		return
-	}
-
-	imageStoreURL := &url.URL{
-		Path: StorageParentDir,
-		Host: client.DatastorePath}
-
-	// now start it again
-	restartedVsStore, err := NewImageStore(op, client, imageStoreURL)
-	if !assert.NoError(t, err) || !assert.NotNil(t, restartedVsStore) {
-		return
-	}
-
-	// Check we didn't create a new UUID directory (relevant if vsan)
-	if !assert.Equal(t, origVsStore.RootURL, restartedVsStore.RootURL) {
-		return
-	}
-
-	restartedStore, err := restartedVsStore.GetImageStore(op, storeName)
-	if !assert.NoError(t, err) || !assert.NotNil(t, restartedStore) {
-		return
-	}
-
-	if !assert.Equal(t, origStore.String(), restartedStore.String()) {
-		return
-	}
-}
-
-// Create an image store then test it exists
-func TestCreateAndGetImageStore(t *testing.T) {
-	vsis, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the parent image store directory
-	defer rm(t, client, client.Datastore.Path(parentPath))
-
-	storeName := "bogusStoreName"
-	op := trace.NewOperation(context.Background(), "test")
-	u, err := vsis.CreateImageStore(op, storeName)
-	if !assert.NoError(t, err) || !assert.NotNil(t, u) {
-		return
-	}
-
-	u, err = vsis.GetImageStore(op, storeName)
-	if !assert.NoError(t, err) || !assert.NotNil(t, u) {
-		return
-	}
-
-	// Negative test.  Check for a dir that doesn't exist
-	u, err = vsis.GetImageStore(op, storeName+"garbage")
-	if !assert.Error(t, err) || !assert.Nil(t, u) {
-		return
-	}
-
-	// Test for a store that already exists
-	u, err = vsis.CreateImageStore(op, storeName)
-	if !assert.Error(t, err) || !assert.Nil(t, u) || !assert.Equal(t, err, os.ErrExist) {
-		return
-	}
-}
-
-func TestListImageStore(t *testing.T) {
-	vsis, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the parent image store directory
-	defer rm(t, client, client.Datastore.Path(parentPath))
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	count := 3
-	for i := 0; i < count; i++ {
-		storeName := fmt.Sprintf("storeName%d", i)
-		u, err := vsis.CreateImageStore(op, storeName)
-		if !assert.NoError(t, err) || !assert.NotNil(t, u) {
-			return
-		}
-	}
-
-	images, err := vsis.ListImageStores(op)
-	if !assert.NoError(t, err) || !assert.Equal(t, len(images), count) {
-		return
-	}
-}
-
-// Creates a tar archive in memory for each layer and uses this to test image creation of layers
-func TestCreateImageLayers(t *testing.T) {
-	numLayers := 4
-
-	cacheStore, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	vsStore := cacheStore.DataStore.(*ImageStore)
-	defer cleanup(t, client, vsStore, parentPath)
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := cacheStore.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Get an image that doesn't exist and check for error
-	grbg, err := cacheStore.GetImage(op, storeURL, "garbage")
-	if !assert.Error(t, err) || !assert.Nil(t, grbg) {
-		return
-	}
-
-	// base this image off scratch
-	parent, err := cacheStore.GetImage(op, storeURL, portlayer.Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Keep a list of all files we're extracting via layers so we can verify
-	// they exist in the leaf layer.  Ext adds lost+found, so add it here.
-	expectedFilesOnDisk := []string{"lost+found"}
-
-	// Keep a list of images we created
-	expectedImages := make(map[string]*portlayer.Image)
-	expectedImages[parent.ID] = parent
-
-	for layer := 0; layer < numLayers; layer++ {
-
-		dirName := fmt.Sprintf("dir%d", layer)
-		// Add some files to the archive.
-		var files = []tarFile{
-			{dirName, tar.TypeDir, ""},
-			{dirName + "/readme.txt", tar.TypeReg, "This archive contains some text files."},
-			{dirName + "/gopher.txt", tar.TypeReg, "Gopher names:\nGeorge\nGeoffrey\nGonzo"},
-			{dirName + "/todo.txt", tar.TypeReg, "Get animal handling license."},
-		}
-
-		for _, i := range files {
-			expectedFilesOnDisk = append(expectedFilesOnDisk, i.Name)
-		}
-
-		// meta for the image
-		meta := make(map[string][]byte)
-		meta[dirName+"_meta"] = []byte("Some Meta")
-		meta[dirName+"_moreMeta"] = []byte("Some More Meta")
-		meta[dirName+"_scorpions"] = []byte("Here I am, rock you like a hurricane")
-
-		// Tar the files
-		buf, terr := tarFiles(files)
-		if !assert.NoError(t, terr) {
-			return
-		}
-
-		// Calculate the checksum
-		h := sha256.New()
-		h.Write(buf.Bytes())
-		sum := fmt.Sprintf("sha256:%x", h.Sum(nil))
-
-		// Write the image via the cache (which writes to the vsphere impl)
-		writtenImage, terr := cacheStore.WriteImage(op, parent, dirName, meta, sum, buf)
-		if !assert.NoError(t, terr) || !assert.NotNil(t, writtenImage) {
-			return
-		}
-
-		expectedImages[dirName] = writtenImage
-
-		// Get the image directly via the vsphere image store impl.
-		vsImage, terr := vsStore.GetImage(op, parent.Store, dirName)
-		if !assert.NoError(t, terr) || !assert.NotNil(t, vsImage) {
-			return
-		}
-
-		assert.Equal(t, writtenImage, vsImage)
-
-		// make the next image a child of the one we just created
-		parent = writtenImage
-	}
-
-	// Test list images on the datastore
-	listedImages, err := vsStore.ListImages(op, parent.Store, nil)
-	if !assert.NoError(t, err) || !assert.NotNil(t, listedImages) {
-		return
-	}
-	for _, img := range listedImages {
-		if !assert.Equal(t, expectedImages[img.ID].Store.String(), img.Store.String()) {
-			return
-		}
-		if !assert.Equal(t, expectedImages[img.ID].SelfLink.String(), img.SelfLink.String()) {
-			return
-		}
-	}
-
-	// verify the disk's data by attaching the last layer rdonly
-	roDisk, err := mountLayerRO(vsStore, parent)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	p, err := roDisk.MountPath()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	rodiskcleanupfunc := func() {
-		if roDisk != nil {
-			if roDisk.Mounted() {
-				roDisk.Unmount(op)
-			}
-			if roDisk.Attached() {
-				vsStore.Detach(op, roDisk.VirtualDiskConfig)
-			}
-		}
-		os.RemoveAll(p)
-	}
-
-	filesFoundOnDisk := []string{}
-	// Diff the contents of the RO file of the last child (with all of the contents)
-	err = filepath.Walk(p, func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-
-		f := path[len(p):]
-		if f != "" {
-			// strip the slash
-			filesFoundOnDisk = append(filesFoundOnDisk, f[1:])
-		}
-		return nil
-	})
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	rodiskcleanupfunc()
-	sort.Strings(filesFoundOnDisk)
-	sort.Strings(expectedFilesOnDisk)
-
-	if !assert.Equal(t, expectedFilesOnDisk, filesFoundOnDisk) {
-		return
-	}
-
-	// Try to delete an intermediate image (should fail)
-	exec.NewContainerCache()
-	_, err = cacheStore.DeleteImage(op, expectedImages["dir1"])
-	if !assert.Error(t, err) || !assert.True(t, portlayer.IsErrImageInUse(err)) {
-		return
-	}
-
-	// Try to delete a leaf (should pass)
-	leaf := expectedImages["dir"+strconv.Itoa(numLayers-1)]
-	_, err = cacheStore.DeleteImage(op, leaf)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Get the delete image directly via the vsphere image store impl.
-	deletedImage, err := vsStore.GetImage(op, parent.Store, leaf.ID)
-	if !assert.Error(t, err) || !assert.Nil(t, deletedImage) || !assert.True(t, os.IsNotExist(err)) {
-		return
-	}
-}
-
-func TestBrokenPull(t *testing.T) {
-
-	cacheStore, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	vsStore := cacheStore.DataStore.(*ImageStore)
-
-	defer cleanup(t, client, vsStore, parentPath)
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := cacheStore.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// base this image off scratch
-	parent, err := cacheStore.GetImage(op, storeURL, portlayer.Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	imageID := "dir0"
-
-	// Add some files to the archive.
-	var files = []tarFile{
-		{imageID, tar.TypeDir, ""},
-		{imageID + "/readme.txt", tar.TypeReg, "This archive contains some text files."},
-		{imageID + "/gopher.txt", tar.TypeReg, "Gopher names:\nGeorge\nGeoffrey\nGonzo"},
-		{imageID + "/todo.txt", tar.TypeReg, "Get animal handling license."},
-	}
-
-	// meta for the image
-	meta := make(map[string][]byte)
-	meta[imageID+"_meta"] = []byte("Some Meta")
-	meta[imageID+"_moreMeta"] = []byte("Some More Meta")
-	meta[imageID+"_scorpions"] = []byte("Here I am, rock you like a hurricane")
-
-	// Tar the files
-	buf, terr := tarFiles(files)
-	if !assert.NoError(t, terr) {
-		return
-	}
-
-	// Calculate the checksum
-	h := sha256.New()
-	h.Write(buf.Bytes())
-	actualsum := fmt.Sprintf("sha256:%x", h.Sum(nil))
-
-	// Write the image via the cache (which writes to the vsphere impl).  We're passing a bogus sum so the image should fail to save.
-	writtenImage, err := cacheStore.WriteImage(op, parent, imageID, meta, "bogusSum", new(bytes.Buffer))
-	if !assert.Error(t, err) || !assert.Nil(t, writtenImage) {
-		return
-	}
-
-	// Now try again with the right sum and there shouldn't be an error.
-	writtenImage, err = cacheStore.WriteImage(op, parent, imageID, meta, actualsum, buf)
-	if !assert.NoError(t, err) || !assert.NotNil(t, writtenImage) {
-		return
-	}
-}
-
-// Creates numLayers layers in parallel using the same parent to exercise parallel reconfigures
-func TestParallel(t *testing.T) {
-	numLayers := 10
-
-	cacheStore, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	vsStore := cacheStore.DataStore.(*ImageStore)
-	defer cleanup(t, client, vsStore, parentPath)
-
-	op := trace.NewOperation(context.Background(), "test")
-	storeURL, err := cacheStore.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// base this image off scratch
-	parent, err := cacheStore.GetImage(op, storeURL, portlayer.Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	wg := sync.WaitGroup{}
-	wg.Add(numLayers)
-	for i := 0; i < numLayers; i++ {
-		go func(idx int) {
-			defer wg.Done()
-
-			imageID := fmt.Sprintf("testStore-%d", idx)
-
-			op := trace.NewOperation(context.Background(), imageID)
-			// Write the image via the cache (which writes to the vsphere impl).  We're passing a bogus sum so the image should fail to save.
-			writtenImage, err := cacheStore.WriteImage(op, parent, imageID, nil, "sha256:e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855", new(bytes.Buffer))
-			if !assert.NoError(t, err) || !assert.NotNil(t, writtenImage) {
-				t.FailNow()
-				return
-			}
-		}(i)
-	}
-	wg.Wait()
-}
-
-func TestInProgressCleanup(t *testing.T) {
-
-	cacheStore, client, parentPath, err := setup(t)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	vsStore := cacheStore.DataStore.(*ImageStore)
-
-	defer cleanup(t, client, vsStore, parentPath)
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	storeURL, err := cacheStore.CreateImageStore(op, "testStore")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// base this image off scratch
-	parent, err := cacheStore.GetImage(op, storeURL, portlayer.Scratch.ID)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// create a test image
-	imageID := "testImage"
-
-	// meta for the image
-	meta := make(map[string][]byte)
-	meta[imageID+"_meta"] = []byte("Some Meta")
-
-	// Tar the files
-	buf, err := tarFiles([]tarFile{})
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Calculate the checksum
-	h := sha256.New()
-	h.Write(buf.Bytes())
-	sum := fmt.Sprintf("sha256:%x", h.Sum(nil))
-
-	writtenImage, err := cacheStore.WriteImage(op, parent, imageID, meta, sum, buf)
-	if !assert.NoError(t, err) || !assert.NotNil(t, writtenImage) {
-		return
-	}
-
-	// nuke the done file.
-	rm(t, client, path.Join(vsStore.RootURL.String(), vsStore.imageDirPath("testStore", imageID), manifest))
-
-	// ensure GetImage doesn't find this image now
-	if _, err = vsStore.GetImage(op, storeURL, imageID); !assert.Error(t, err) {
-		return
-	}
-
-	// call cleanup
-	if err = vsStore.cleanup(op, storeURL); !assert.NoError(t, err) {
-		return
-	}
-
-	// Make sure list is now empty.
-	listedImages, err := vsStore.ListImages(op, parent.Store, nil)
-	if !assert.NoError(t, err) || !assert.Equal(t, len(listedImages), 1) || !assert.Equal(t, listedImages[0].ID, portlayer.Scratch.ID) {
-		return
-	}
-}
-
-type tarFile struct {
-	Name string
-	Type byte
-	Body string
-}
-
-func tarFiles(files []tarFile) (*bytes.Buffer, error) {
-	// Create a buffer to write our archive to.
-	buf := new(bytes.Buffer)
-
-	// Create a new tar archive.
-	tw := tar.NewWriter(buf)
-
-	// Write data to the tar as if it came from the hub
-	for _, file := range files {
-		hdr := &tar.Header{
-			Name:     file.Name,
-			Mode:     0777,
-			Typeflag: file.Type,
-			Size:     int64(len(file.Body)),
-		}
-
-		if err := tw.WriteHeader(hdr); err != nil {
-			return nil, err
-		}
-
-		if file.Type == tar.TypeDir {
-			continue
-		}
-
-		if _, err := tw.Write([]byte(file.Body)); err != nil {
-			return nil, err
-		}
-	}
-
-	// Make sure to check the error on Close.
-	if err := tw.Close(); err != nil {
-		return nil, err
-	}
-
-	return buf, nil
-}
-
-func mountLayerRO(v *ImageStore, parent *portlayer.Image) (*disk.VirtualDisk, error) {
-	roName := v.imageDiskDSPath("testStore", parent.ID)
-	roName.Path = roName.Path + "-ro.vmdk"
-
-	parentDsURI := v.imageDiskDSPath("testStore", parent.ID)
-
-	op := trace.NewOperation(context.TODO(), "ro")
-
-	config := disk.NewNonPersistentDisk(roName).WithParent(parentDsURI)
-	roDisk, err := v.CreateAndAttach(op, config)
-	if err != nil {
-		return nil, err
-	}
-
-	_, err = roDisk.Mount(op, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	return roDisk, nil
-}
-
-func rm(t *testing.T, client *session.Session, name string) {
-	t.Logf("deleting %s", name)
-	fm := object.NewFileManager(client.Vim25())
-	task, err := fm.DeleteDatastoreFile(context.TODO(), name, client.Datacenter)
-	if !assert.NoError(t, err) {
-		return
-	}
-	_, _ = task.WaitForResult(context.TODO(), nil)
-}
-
-// Nuke the files and then the parent dir.  Unfortunately, because this is
-// vsan, we need to delete the files in the directories first (maybe
-// because they're linked vmkds) before we can delete the parent directory.
-func cleanup(t *testing.T, client *session.Session, vsStore *ImageStore, parentPath string) {
-	res, err := vsStore.LsDirs(context.TODO(), "")
-	if err != nil {
-		t.Logf("error: %s", err)
-		return
-	}
-
-	for _, dir := range res.HostDatastoreBrowserSearchResults {
-		for _, f := range dir.File {
-			fpath := f.GetFileInfo().Path
-
-			rm(t, client, path.Join(dir.FolderPath, fpath))
-		}
-		rm(t, client, dir.FolderPath)
-	}
-
-	rm(t, client, client.Datastore.Path(parentPath))
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/import.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/import.go
deleted file mode 100644
index 48130be051..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/import.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"errors"
-	"io"
-	"net/url"
-	"os"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-func (v *VolumeStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarstream io.ReadCloser) error {
-	l, err := v.NewDataSink(op, id)
-	if err != nil {
-		return err
-	}
-
-	return l.Import(op, spec, tarstream)
-}
-
-// NewDataSource creates and returns an DataSource associated with container storage
-func (v *VolumeStore) NewDataSink(op trace.Operation, id string) (storage.DataSink, error) {
-	uri, err := v.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	offlineAttempt := 0
-offline:
-	offlineAttempt++
-
-	source, err := v.newDataSink(op, uri)
-	if err == nil {
-		return source, err
-	}
-
-	// check for vmdk locked error here
-	if !disk.IsLockedError(err) {
-		op.Warnf("Unable to mount %s and do not know how to recover from error")
-		// continue anyway because maybe there's an online option
-	}
-
-	// online - Owners() should filter out the appliance VM
-	// #nosec: Errors unhandled.
-	owners, _ := v.Owners(op, uri, disk.LockedVMDKFilter)
-	if len(owners) == 0 {
-		op.Infof("No online owners were found for %s", id)
-		return nil, errors.New("unable to create offline data sink and no online owners found")
-	}
-
-	for _, o := range owners {
-		// sanity check to see if we are the owner - this should catch transitions
-		// from container running to diff or commit for example between the offline attempt and here
-		uuid, err := o.UUID(op)
-		if err == nil {
-			// check if the vm is appliance VM if we can successfully get its UUID
-			// #nosec: Errors unhandled.
-			self, _ := guest.IsSelf(op, uuid)
-			if self && offlineAttempt < 2 {
-				op.Infof("Appliance is owner of online vmdk - retrying offline source path")
-				goto offline
-			}
-		}
-
-		online, err := v.newOnlineDataSink(op, o, id)
-		if online != nil {
-			return online, err
-		}
-
-		op.Debugf("Failed to create online sink with owner %s: %s", o.Reference(), err)
-	}
-
-	return nil, errors.New("unable to create online or offline data sink")
-}
-
-func (v *VolumeStore) newDataSink(op trace.Operation, url *url.URL) (storage.DataSink, error) {
-	mountPath, cleanFunc, err := v.Mount(op, url, true)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	op.Debugf("Created mount data sink for access to %s at %s", url, mountPath)
-	return storage.NewMountDataSink(op, f, cleanFunc), nil
-}
-
-func (v *VolumeStore) newOnlineDataSink(op trace.Operation, owner *vm.VirtualMachine, id string) (storage.DataSink, error) {
-	op.Debugf("Constructing toolbox data sink: %s.%s", owner.Reference(), id)
-
-	return &ToolboxDataSink{
-		VM:    owner,
-		ID:    storage.Label(id),
-		Clean: func() { return },
-	}, nil
-}
-
-func (i *ImageStore) Import(op trace.Operation, id string, spec *archive.FilterSpec, tarStream io.ReadCloser) error {
-	l, err := i.NewDataSink(op, id)
-	if err != nil {
-		return err
-	}
-
-	return l.Import(op, spec, tarStream)
-}
-
-// NewDataSink creates and returns an DataSource associated with image storage
-func (i *ImageStore) NewDataSink(op trace.Operation, id string) (storage.DataSink, error) {
-	uri, err := i.URL(op, id)
-	if err != nil {
-		return nil, err
-	}
-
-	// there is no online fail over path for images
-	// we should probably have a check in here as to whether the image is "sealed" and can no longer
-	// be modified.
-	return i.newDataSink(op, uri)
-}
-
-func (i *ImageStore) newDataSink(op trace.Operation, url *url.URL) (storage.DataSink, error) {
-	mountPath, cleanFunc, err := i.Mount(op, url, true)
-	if err != nil {
-		return nil, err
-	}
-
-	f, err := os.Open(mountPath)
-	if err != nil {
-		cleanFunc()
-		return nil, err
-	}
-
-	return &storage.MountDataSink{
-		Path:  f,
-		Clean: cleanFunc,
-	}, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/metadata.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/metadata.go
deleted file mode 100644
index 5188b3528d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/metadata.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"bytes"
-	"io/ioutil"
-	"path"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-)
-
-// Write the opaque metadata blobs (by name).
-// Each blob in the metadata map is written to a file with the corresponding
-// name.  Likewise, when we read it back (on restart) we populate the map
-// accordingly.
-func writeMetadata(op trace.Operation, ds *datastore.Helper, dir string, meta map[string][]byte) error {
-	// XXX this should be done via disklib so this meta follows the disk in
-	// case of motion.
-
-	if meta != nil && len(meta) != 0 {
-		for name, value := range meta {
-			r := bytes.NewReader(value)
-			pth := path.Join(dir, name)
-			op.Infof("Writing metadata %s", pth)
-			if err := ds.Upload(op, r, pth); err != nil {
-				return err
-			}
-		}
-	} else {
-		if _, err := ds.Mkdir(op, false, dir); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Read the metadata from the given dir
-func getMetadata(op trace.Operation, ds *datastore.Helper, dir string) (map[string][]byte, error) {
-
-	res, err := ds.Ls(op, dir)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(res.File) == 0 {
-		op.Infof("No meta found for %s", dir)
-		return nil, nil
-	}
-
-	meta := make(map[string][]byte)
-	for _, f := range res.File {
-		// we're only interested in files, not folders
-		finfo, ok := f.(*types.FileInfo)
-		if !ok {
-			continue
-		}
-
-		p := path.Join(dir, finfo.Path)
-		op.Infof("Getting metadata %s", p)
-		rc, err := ds.Download(op, p)
-		if err != nil {
-			return nil, err
-		}
-		defer rc.Close()
-
-		buf, err := ioutil.ReadAll(rc)
-		if err != nil {
-			return nil, err
-		}
-
-		meta[finfo.Path] = buf
-	}
-
-	return meta, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_common.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_common.go
deleted file mode 100644
index 802c539a3f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_common.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"net"
-	"net/url"
-	"path"
-	"strconv"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/guest"
-	"github.com/vmware/govmomi/guest/toolbox"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/tether/shared"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	VixEToolsNotRunning = "(3016, 0)"
-)
-
-var (
-	toolboxRetryConf *retry.BackoffConfig
-)
-
-func init() {
-	toolboxRetryConf = retry.NewBackoffConfig()
-
-	// These numbers are somewhat arbitrary best guesses
-	toolboxRetryConf.MaxElapsedTime = time.Second * 30
-	toolboxRetryConf.InitialInterval = time.Millisecond * 500
-	toolboxRetryConf.MaxInterval = time.Second * 5
-}
-
-// Parse Archive builds an archive url with disklabel, filtersec, recursive, and data booleans.
-func BuildArchiveURL(op trace.Operation, disklabel, target string, fs *archive.FilterSpec, recurse, data bool) (string, error) {
-	encodedSpec, err := archive.EncodeFilterSpec(op, fs)
-	if err != nil {
-		return "", err
-	}
-	target = path.Join("/archive:/", target)
-
-	// if diskLabel is longer than 16 characters, then the function was passed a containerID
-	// use containerfs as the diskLabel
-	if len(disklabel) > 16 {
-		disklabel = "containerfs"
-	}
-
-	// note that the query parameters a SkipX for recurse and data so values are inverted
-	target += "?" + (url.Values{
-		shared.DiskLabelQueryName:   []string{disklabel},
-		shared.FilterSpecQueryName:  []string{*encodedSpec},
-		shared.SkipRecurseQueryName: []string{strconv.FormatBool(!recurse)},
-		shared.SkipDataQueryName:    []string{strconv.FormatBool(!data)},
-	}).Encode()
-
-	op.Debugf("OnlineData* Url: %s", target)
-	return target, nil
-}
-
-// GetToolboxClient returns a toolbox client given a vm and id
-func GetToolboxClient(op trace.Operation, vm *vm.VirtualMachine, id string) (*toolbox.Client, error) {
-	opmgr := guest.NewOperationsManager(vm.Session.Client.Client, vm.Reference())
-	pm, err := opmgr.ProcessManager(op)
-	if err != nil {
-		op.Debugf("Failed to create new process manager ")
-		return nil, err
-	}
-	fm, err := opmgr.FileManager(op)
-	if err != nil {
-		op.Debugf("Failed to create new file manager ")
-		return nil, err
-	}
-
-	return &toolbox.Client{
-		ProcessManager: pm,
-		FileManager:    fm,
-		Authentication: &types.NamePasswordAuthentication{
-			Username: id,
-		},
-	}, nil
-}
-
-// isInvalidStateError is used to identify whether the supplied error is an InvalidState fault
-func isInvalidStateError(err error) bool {
-	if soap.IsSoapFault(err) {
-		switch soap.ToSoapFault(err).VimFault().(type) {
-		case types.InvalidState:
-			return true
-		}
-	}
-
-	if soap.IsVimFault(err) {
-		switch soap.ToVimFault(err).(type) {
-		case *types.InvalidState:
-			return true
-		}
-	}
-
-	switch err := err.(type) {
-	case task.Error:
-		switch err.Fault().(type) {
-		case *types.InvalidState:
-			return true
-		}
-	}
-	return false
-}
-
-// IsToolBoxConflictErr checks for conflictError for online import
-func IsToolBoxStateChangeErr(err error) bool {
-	// check if error has to do with toolbox state changes
-	if soap.IsSoapFault(err) {
-		switch soap.ToSoapFault(err).VimFault().(type) {
-		case types.InvalidState:
-			return true
-		case types.InvalidPowerState:
-			return true
-		case types.GuestOperationsUnavailable:
-			return true
-		case types.SystemError:
-			return strings.Contains(err.Error(), VixEToolsNotRunning)
-		}
-	}
-
-	switch err.(type) {
-	case *url.Error:
-		err = err.(*url.Error).Err
-		switch err.(type) {
-		case *net.OpError:
-			// can check for error message as well
-			return true
-		}
-	}
-
-	// NOTE: on certain failures toolbox only returns 500 which can be caused by state change in the middle
-	// but can also be caused by invalid command. There is no way to tell unless toolbox returns more information.
-	return false
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasink.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasink.go
deleted file mode 100644
index 5f73e1dff5..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasink.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"bytes"
-	"io"
-
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// ToolboxDataSink implements the DataSink interface for mounted devices
-type ToolboxDataSink struct {
-	ID    string
-	VM    *vm.VirtualMachine
-	Clean func()
-}
-
-// Sink returns the data sink associated with the DataSink
-func (t *ToolboxDataSink) Sink() interface{} {
-	return t.VM
-}
-
-// Import writes `data` to the data sink associated with this DataSink
-func (t *ToolboxDataSink) Import(op trace.Operation, spec *archive.FilterSpec, data io.ReadCloser) error {
-	defer trace.End(trace.Begin("toolbox import"))
-
-	client, err := GetToolboxClient(op, t.VM, t.ID)
-	if err != nil {
-		op.Debugf("Cannot get toolbox client: %s", err.Error())
-		return err
-	}
-
-	target, err := BuildArchiveURL(op, t.ID, spec.RebasePath, spec, true, true)
-	if err != nil {
-		op.Debugf("Cannot build archive url: %s", err.Error())
-		return err
-	}
-
-	// buffer the data - needed to allow retry or the Upload drains the reader before the failure
-	// and we lose the data
-	// TODO: should look into chunking so that we can support copy of very large files.
-	// NOW: need a check that size doesn't exceed available memory - and error recommending offline
-	// copy as alternative
-	buf := new(bytes.Buffer)
-	_, err = io.Copy(buf, data)
-	if err != nil {
-		op.Errorf("Unable to buffer archive data for upload")
-		return err
-	}
-
-	// upload the gzip archive.
-	p := soap.DefaultUpload
-
-	retryFunc := func() error {
-		return client.Upload(op, buf, target, p, &types.GuestPosixFileAttributes{}, true)
-	}
-
-	err = retry.DoWithConfig(retryFunc, isInvalidStateError, toolboxRetryConf)
-
-	if err != nil {
-		op.Debugf("Upload error: %s", err.Error())
-	}
-
-	return err
-}
-
-func (t *ToolboxDataSink) Close() error {
-	t.Clean()
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasource.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasource.go
deleted file mode 100644
index f9699e8e5e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/toolbox_datasource.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"archive/tar"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/retry"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// ToolboxDataSource implements the DataSource interface for mounted devices
-type ToolboxDataSource struct {
-	ID    string
-	VM    *vm.VirtualMachine
-	Clean func()
-}
-
-// Source returns the data source associated with the DataSource
-func (t *ToolboxDataSource) Source() interface{} {
-	return t.VM
-}
-
-// Export reads data from the associated data source and returns it as a tar archive
-func (t *ToolboxDataSource) Export(op trace.Operation, spec *archive.FilterSpec, data bool) (io.ReadCloser, error) {
-	defer trace.End(trace.Begin("toolbox export"))
-
-	client, err := GetToolboxClient(op, t.VM, t.ID)
-	if err != nil {
-		op.Errorf("Cannot get toolbox client: %s", err.Error())
-		return nil, err
-	}
-
-	var readers []io.Reader
-	for inclusion := range spec.Inclusions {
-		// build a proper target
-		target, err := BuildArchiveURL(op, t.ID, inclusion, spec, true, true)
-		if err != nil {
-			op.Errorf("Cannot build archive url: %s", err.Error())
-			return nil, err
-		}
-		var tar io.ReadCloser
-		var contentLength int64
-
-		retryFunc := func() error {
-			var retryErr error
-			tar, contentLength, retryErr = client.Download(op, target)
-			return retryErr
-		}
-
-		err = retry.DoWithConfig(retryFunc, isInvalidStateError, toolboxRetryConf)
-		if err != nil {
-			op.Errorf("Download error: %s", err.Error())
-			return nil, err
-		}
-		op.Debugf("Downloaded from %s with size %d", target, contentLength)
-		readers = append(readers, tar)
-
-	}
-	return ioutil.NopCloser(io.MultiReader(readers...)), nil
-}
-
-// Stat returns file stats of the destination header determined but the filterspec inclusion path
-func (t *ToolboxDataSource) Stat(op trace.Operation, spec *archive.FilterSpec) (*storage.FileStat, error) {
-	defer trace.End(trace.Begin("toolbox stat"))
-
-	client, err := GetToolboxClient(op, t.VM, t.ID)
-	if err != nil {
-		op.Errorf("Cannot get toolbox client: %s", err.Error())
-		return nil, err
-	}
-
-	// should only find a single path to stat, but make sure here.
-	if len(spec.Inclusions) != 1 {
-		op.Errorf("Stat called on more than one path: %+v", spec.Inclusions)
-	}
-
-	var statPath string
-	inclusions := len(spec.Inclusions)
-	if inclusions == 0 {
-		op.Debugf("filter spec for stat operation has no inclusion specified : %#v", *spec)
-	}
-
-	if inclusions > 1 {
-		op.Debugf("filter spec for stat operation had multiple inclusion paths : %#v", *spec)
-	}
-
-	for inclusion := range spec.Inclusions {
-		statPath = inclusion
-	}
-
-	target, err := BuildArchiveURL(op, t.ID, statPath, spec, false, false)
-	if err != nil {
-		op.Errorf("Cannot build archive url: %s", err.Error())
-		return nil, err
-	}
-
-	var statTar io.ReadCloser
-
-	retryFunc := func() error {
-		var retryErr error
-		statTar, _, retryErr = client.Download(op, target)
-		return retryErr
-	}
-
-	err = retry.DoWithConfig(retryFunc, isInvalidStateError, toolboxRetryConf)
-	if err != nil {
-		op.Errorf("Download error: %s", err.Error())
-		return nil, err
-	}
-	defer statTar.Close()
-
-	// decode from guest tools
-	header, err := tar.NewReader(statTar).Next()
-	if err == io.EOF {
-		// special case - unable to get a single header translates to Not Found
-		return nil, os.ErrNotExist
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	stat := &storage.FileStat{
-		Mode:       uint32(header.FileInfo().Mode()),
-		Name:       header.Name,
-		Size:       header.Size,
-		ModTime:    header.ModTime,
-		LinkTarget: header.Linkname,
-	}
-
-	return stat, nil
-}
-
-func (t *ToolboxDataSource) Close() error {
-	t.Clean()
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vm.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vm.go
deleted file mode 100644
index 120ac67c7d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vm.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"fmt"
-	"net/url"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func VolumeJoin(op trace.Operation, handle *exec.Handle, volume *storage.Volume, mountPath string, diskOpts map[string]string) (*exec.Handle, error) {
-	defer trace.End(trace.Begin("vsphere.VolumeJoin"))
-
-	if _, ok := handle.ExecConfig.Mounts[volume.ID]; ok {
-		return nil, fmt.Errorf("Volume with ID %s is already in container %s's mountspec config", volume.ID, handle.ExecConfig.ID)
-	}
-
-	//constuct MountSpec for the tether
-	mountSpec := createMountSpec(volume, mountPath, diskOpts)
-	//append a device addition spec change to the container config
-	diskDevice := createVolumeVirtualDisk(volume)
-	config := createDeviceConfigSpec(diskDevice)
-	handle.Spec.DeviceChange = append(handle.Spec.DeviceChange, config)
-
-	if handle.ExecConfig.Mounts == nil {
-		handle.ExecConfig.Mounts = make(map[string]executor.MountSpec)
-	}
-	handle.ExecConfig.Mounts[volume.ID] = mountSpec
-
-	return handle, nil
-}
-
-func createVolumeVirtualDisk(volume *storage.Volume) *types.VirtualDisk {
-	unitNumber := int32(-1)
-	diskDevice := &types.VirtualDisk{
-		CapacityInKB: 0,
-		VirtualDevice: types.VirtualDevice{
-			Key:           -1,
-			ControllerKey: 100, //FIXME: This is hardcoded for now and should be located from the config spec in the future.
-			UnitNumber:    &unitNumber,
-			Backing: &types.VirtualDiskFlatVer2BackingInfo{
-				DiskMode: string(types.VirtualDiskModeIndependent_persistent),
-				VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-					FileName: volume.Device.DiskPath().Path,
-				},
-			},
-		},
-	}
-	return diskDevice
-}
-
-func createDeviceConfigSpec(diskDevice *types.VirtualDisk) *types.VirtualDeviceConfigSpec {
-	config := &types.VirtualDeviceConfigSpec{
-		Device:        diskDevice,
-		Operation:     types.VirtualDeviceConfigSpecOperationAdd,
-		FileOperation: "", //blank for existing disk
-	}
-	return config
-}
-
-func createMountSpec(volume *storage.Volume, mountPath string, diskOpts map[string]string) executor.MountSpec {
-	deviceMode := diskOpts[constants.Mode]
-	newMountSpec := executor.MountSpec{
-		Source: url.URL{
-			Scheme: "label",
-			Path:   volume.Label,
-		},
-		Path:     mountPath,
-		Mode:     deviceMode,
-		CopyMode: volume.CopyMode,
-	}
-	return newMountSpec
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume.go
deleted file mode 100644
index 58d3f5f58a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"fmt"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/lib/portlayer/util"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/disk"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-const VolumesDir = "volumes"
-
-// VolumeStore caches Volume references to volumes in the system.
-type VolumeStore struct {
-	disk.Vmdk
-
-	// Service url to this VolumeStore
-	SelfLink *url.URL
-}
-
-func NewVolumeStore(op trace.Operation, storeName string, s *session.Session, ds *datastore.Helper) (*VolumeStore, error) {
-	// Create the volume dir if it doesn't already exist
-	if _, err := ds.Mkdir(op, true, VolumesDir); err != nil && !os.IsExist(err) {
-		return nil, err
-	}
-
-	dm, err := disk.NewDiskManager(op, s, storage.Config.ContainerView)
-	if err != nil {
-		return nil, err
-	}
-
-	if DetachAll {
-		if err = dm.DetachAll(op); err != nil {
-			return nil, err
-		}
-	}
-
-	u, err := util.VolumeStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-
-	v := &VolumeStore{
-		Vmdk: disk.Vmdk{
-			Manager: dm,
-			Helper:  ds,
-			Session: s,
-		},
-		SelfLink: u,
-	}
-
-	return v, nil
-}
-
-// Returns the path to the vol relative to the given store.  The dir structure
-// for a vol in the datastore is `<configured datastore path>/volumes/<vol ID>/<vol ID>.vmkd`.
-// Everything up to "volumes" is taken care of by the datastore wrapper.
-func (v *VolumeStore) volDirPath(ID string) string {
-	return path.Join(VolumesDir, ID)
-}
-
-// Returns the path to the metadata directory for a volume
-func (v *VolumeStore) volMetadataDirPath(ID string) string {
-	return path.Join(v.volDirPath(ID), metaDataDir)
-}
-
-// Returns the path to the vmdk itself (in datastore URL format)
-func (v *VolumeStore) volDiskDSPath(ID string) *object.DatastorePath {
-	return &object.DatastorePath{
-		Datastore: v.Helper.RootURL.Datastore,
-		Path:      path.Join(v.Helper.RootURL.Path, v.volDirPath(ID), ID+".vmdk"),
-	}
-}
-
-func (v *VolumeStore) VolumeCreate(op trace.Operation, ID string, store *url.URL, capacityKB uint64, info map[string][]byte) (*storage.Volume, error) {
-
-	// Create the volume directory in the store.
-	if _, err := v.Mkdir(op, false, v.volDirPath(ID)); err != nil {
-		return nil, err
-	}
-
-	// Get the path to the disk in datastore uri format
-	volDiskDSPath := v.volDiskDSPath(ID)
-
-	config := disk.NewPersistentDisk(volDiskDSPath).WithCapacity(int64(capacityKB))
-	// Create the disk
-	vmdisk, err := v.CreateAndAttach(op, config)
-	if err != nil {
-		return nil, err
-	}
-	defer v.Detach(op, vmdisk.VirtualDiskConfig)
-	vol, err := storage.NewVolume(store, ID, info, vmdisk, executor.CopyNew)
-	if err != nil {
-		return nil, err
-	}
-
-	// Make the filesystem and set its label
-	if err = vmdisk.Mkfs(op, vol.Label); err != nil {
-		return nil, err
-	}
-
-	// mask lost+found from containerVM
-	opts := []string{"noatime"}
-	path, err := vmdisk.Mount(op, opts)
-	if err != nil {
-		return nil, err
-	}
-	defer vmdisk.Unmount(op)
-
-	// #nosec
-	err = os.Mkdir(filepath.Join(path, disk.VolumeDataDir), 0755)
-	if err != nil {
-		return nil, err
-	}
-
-	// Persist the metadata
-	metaDataDir := v.volMetadataDirPath(ID)
-	if err = writeMetadata(op, v.Helper, metaDataDir, info); err != nil {
-		return nil, err
-	}
-
-	op.Infof("volumestore: %s (%s)", ID, vol.SelfLink)
-	return vol, nil
-}
-
-func (v *VolumeStore) VolumeDestroy(op trace.Operation, vol *storage.Volume) error {
-	volDir := v.volDirPath(vol.ID)
-
-	op.Infof("VolumeStore: Deleting %s", volDir)
-	if err := v.Rm(op, volDir); err != nil {
-		op.Errorf("VolumeStore: delete error: %s", err.Error())
-		return err
-	}
-	return nil
-}
-
-func (v *VolumeStore) VolumeGet(op trace.Operation, ID string) (*storage.Volume, error) {
-	// We can't get the volume directly without looking up what datastore it's on.
-	return nil, fmt.Errorf("not supported: use VolumesList")
-}
-
-func (v *VolumeStore) VolumesList(op trace.Operation) ([]*storage.Volume, error) {
-	volumes := []*storage.Volume{}
-
-	res, err := v.Ls(op, VolumesDir)
-	if err != nil {
-		return nil, fmt.Errorf("error listing vols: %s", err)
-	}
-
-	for _, f := range res.File {
-		ID := f.GetFileInfo().Path
-
-		// Get the path to the disk in datastore uri format
-		volDiskDSPath := v.volDiskDSPath(ID)
-
-		config := disk.NewPersistentDisk(volDiskDSPath)
-		dev, err := disk.NewVirtualDisk(op, config, v.Manager.Disks)
-		if err != nil {
-			return nil, err
-		}
-
-		metaDataDir := v.volMetadataDirPath(ID)
-		meta, err := getMetadata(op, v.Helper, metaDataDir)
-		if err != nil {
-			return nil, err
-		}
-
-		vol, err := storage.NewVolume(v.SelfLink, ID, meta, dev, executor.CopyNew)
-		if err != nil {
-			return nil, err
-		}
-
-		volumes = append(volumes, vol)
-	}
-
-	return volumes, nil
-}
-
-func (v *VolumeStore) URL(op trace.Operation, id string) (*url.URL, error) {
-	path := v.volDiskDSPath(id).String()
-	if path == "" {
-		return nil, fmt.Errorf("unable to translate %s into datastore path", id)
-	}
-
-	return &url.URL{
-		Scheme: "ds",
-		Path:   path,
-	}, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume_test.go
deleted file mode 100644
index da42133b63..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/volume_test.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"context"
-	"fmt"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	portlayer "github.com/vmware/vic/lib/portlayer/storage"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-)
-
-func TestVolumeCreateListAndRestart(t *testing.T) {
-	client := datastore.Session(context.TODO(), t)
-	if client == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.Background(), "test")
-
-	// Root our datastore
-	testStorePath := datastore.TestName("voltest")
-	ds, err := datastore.NewHelper(op, client, client.Datastore, testStorePath)
-	if !assert.NoError(t, err) || !assert.NotNil(t, ds) {
-		return
-	}
-
-	// Create the backing store on vsphere
-	DetachAll = false
-	vsVolumeStore, err := NewVolumeStore(op, "testStoreName", client, ds)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vsVolumeStore) {
-		return
-	}
-
-	// Clean up the mess
-	defer func() {
-		fm := object.NewFileManager(client.Vim25())
-		tasks.WaitForResult(context.TODO(), func(ctx context.Context) (tasks.Task, error) {
-			return fm.DeleteDatastoreFile(ctx, client.Datastore.Path(testStorePath), client.Datacenter)
-		})
-	}()
-
-	// Create the cache
-	cache := portlayer.NewVolumeLookupCache(op)
-	if !assert.NotNil(t, cache) {
-		return
-	}
-
-	// add the vs to the cache and assert the url matches
-	storeURL, err := cache.AddStore(op, "testStoreName", vsVolumeStore)
-	if !assert.NoError(t, err) || !assert.Equal(t, vsVolumeStore.SelfLink, storeURL) {
-		return
-	}
-
-	// test we can list it
-	m, err := cache.VolumeStoresList(op)
-	if !assert.NoError(t, err) || !assert.Len(t, m, 1) || !assert.Equal(t, m[0], "testStoreName") {
-		return
-	}
-
-	// Create the volumes (in parallel)
-	numVols := 5
-	wg := &sync.WaitGroup{}
-	wg.Add(numVols)
-	volumes := make(map[string]*portlayer.Volume)
-	for i := 0; i < numVols; i++ {
-		go func(idx int) {
-			defer wg.Done()
-			ID := fmt.Sprintf("testvolume-%d", idx)
-
-			// add some metadata if i is even
-			var info map[string][]byte
-
-			if idx%2 == 0 {
-				info = make(map[string][]byte)
-				info[ID] = []byte(ID)
-			}
-
-			outVol, err := cache.VolumeCreate(op, ID, storeURL, 10240, info)
-			if !assert.NoError(t, err) || !assert.NotNil(t, outVol) {
-				return
-			}
-
-			volumes[ID] = outVol
-		}(i)
-	}
-
-	wg.Wait()
-
-	// list using the datastore (skipping the cache)
-	outVols, err := vsVolumeStore.VolumesList(op)
-	if !assert.NoError(t, err) || !assert.NotNil(t, outVols) || !assert.Equal(t, numVols, len(outVols)) {
-		return
-	}
-
-	for _, outVol := range outVols {
-		if !assert.Equal(t, volumes[outVol.ID], outVol) {
-			return
-		}
-	}
-
-	// Test restart
-
-	// Create a new vs and cache to the same datastore (simulating restart) and compare
-	secondVStore, err := NewVolumeStore(op, "testStoreName", client, ds)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vsVolumeStore) {
-		return
-	}
-
-	secondCache := portlayer.NewVolumeLookupCache(op)
-	if !assert.NotNil(t, secondCache) {
-		return
-	}
-
-	_, err = secondCache.AddStore(op, "testStore", secondVStore)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	secondOutVols, err := secondCache.VolumesList(op)
-	if !assert.NoError(t, err) || !assert.NotNil(t, secondOutVols) || !assert.Equal(t, numVols, len(secondOutVols)) {
-		return
-	}
-
-	for _, outVol := range secondOutVols {
-		// XXX we could compare the Volumes, but the paths are different the
-		// second time around on vsan since the vsan UUID is not included.
-		if !assert.NotEmpty(t, volumes[outVol.ID].Device.DiskPath()) {
-			return
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vsphere.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vsphere.go
deleted file mode 100644
index 5d753bff3e..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/storage/vsphere/vsphere.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vsphere
-
-import (
-	"io"
-)
-
-const (
-	// Persistent is used as a constant input for disk persistence configuration
-	persistent = true
-)
-
-// cleanReader wraps an io.ReadCloser, calling the supplied cleanup function on Close()
-type cleanReader struct {
-	io.ReadCloser
-	clean func()
-}
-
-func (c *cleanReader) Read(p []byte) (int, error) {
-	return c.ReadCloser.Read(p)
-}
-
-func (c *cleanReader) Close() error {
-	defer c.clean()
-	return c.ReadCloser.Close()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store.go
deleted file mode 100644
index d6d57dc656..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package store
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"os"
-	"regexp"
-	"sync"
-
-	"github.com/vmware/vic/pkg/kvstore"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/session"
-
-	"context"
-)
-
-type StoreManager struct {
-	m            sync.RWMutex
-	dsStores     map[string]kvstore.KeyValueStore
-	datastoreURL url.URL
-}
-
-var (
-	mgr         *StoreManager
-	initializer struct {
-		once sync.Once
-		err  error
-	}
-)
-
-const (
-	// default store folder name
-	KVStoreFolder = "kvStores"
-	// available via portLayer API
-	APIKV = "apiKV"
-)
-
-var (
-	ErrDoesNotExist  = errors.New("requested store does not exist")
-	ErrDuplicateName = errors.New("duplicate store name")
-	ErrInvalidName   = errors.New("invalid store name, must be regexp(^[a-zA-Z0-9_]*$) compliant")
-)
-
-// Init will initialize the package vars and create the default portLayerKV store
-//
-// Note: The imgStoreURL is provided by the portlayer init function and is currently
-// based on the image-store specified at appliance creation via vic-machine.  That URL
-// is the starting point for the datastore persistence path and does not mean that the
-// k/v stores are presisted w/the images.
-func Init(ctx context.Context, session *session.Session, imgStoreURL *url.URL) error {
-	defer trace.End(trace.Begin(imgStoreURL.String()))
-
-	initializer.once.Do(func() {
-		var err error
-		defer func() {
-			initializer.err = err
-		}()
-
-		mgr = &StoreManager{
-			dsStores:     make(map[string]kvstore.KeyValueStore),
-			datastoreURL: *imgStoreURL,
-		}
-		//create or restore the api accessible datastore backed k/v store
-		_, err = NewDatastoreKeyValue(ctx, session, APIKV)
-	})
-
-	return initializer.err
-}
-
-// Store will return the requested store
-func Store(name string) (kvstore.KeyValueStore, error) {
-	mgr.m.RLock()
-	defer mgr.m.RUnlock()
-
-	if kv, exists := mgr.dsStores[name]; exists {
-		return kv, nil
-	}
-
-	return nil, ErrDoesNotExist
-}
-
-// NewDatastoreKeyValue will validate the supplied name and create a datastore
-// backed key / value store
-//
-// The file will be located at the init datastoreURL  -- currently that's in the
-// appliance directory under the {dsFolder} folder (i.e. [datastore]vch-appliance/{dsFolder}/{name})
-func NewDatastoreKeyValue(ctx context.Context, session *session.Session, name string) (kvstore.KeyValueStore, error) {
-	defer trace.End(trace.Begin(name))
-
-	mgr.m.Lock()
-	defer mgr.m.Unlock()
-
-	// validate the name
-	err := validateStoreName(name)
-	if err != nil {
-		return nil, err
-	}
-	// get a ds helper for this ds url
-	dsHelper, err := datastore.NewHelper(trace.NewOperation(ctx, "datastore helper creation"), session,
-		session.Datastore, fmt.Sprintf("%s/%s", mgr.datastoreURL.Path, KVStoreFolder))
-	if err != nil {
-		return nil, fmt.Errorf("unable to get datastore helper for %s store creation: %s", name, err.Error())
-	}
-
-	// create or restore the specified K/V store
-	keyVal, err := kvstore.NewKeyValueStore(ctx, kvstore.NewDatastoreBackend(dsHelper), name)
-	if err != nil && !os.IsExist(err) {
-		return nil, fmt.Errorf("unable to create %s datastore backed store: %s", name, err.Error())
-	}
-	// throw it in the store map
-	mgr.dsStores[name] = keyVal
-
-	return keyVal, nil
-}
-
-// validateStoreName will validate that the store name is not in use
-// and follows the regexp []
-func validateStoreName(name string) error {
-	// is the name already in use
-	if _, dupe := mgr.dsStores[name]; dupe {
-		return ErrDuplicateName
-	}
-	// compliant w/regexp
-	re := regexp.MustCompile("^[a-zA-Z0-9_\\.]*$")
-	if !re.MatchString(name) {
-		return ErrInvalidName
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store_test.go
deleted file mode 100644
index 6a372fc8ba..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/store/store_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package store
-
-import (
-	"context"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/kvstore"
-)
-
-func setup() {
-	// set up fake store manager
-	mgr = &StoreManager{
-		dsStores: make(map[string]kvstore.KeyValueStore),
-	}
-
-	kv, err := kvstore.NewKeyValueStore(context.TODO(), &kvstore.MockBackend{}, "test")
-	log.Errorf("failed to create kv store: %s", err)
-	mgr.dsStores[APIKV] = kv
-}
-
-func TestMain(m *testing.M) {
-	setup()
-	os.Exit(m.Run())
-}
-
-func TestNameValidation(t *testing.T) {
-
-	// fail regex
-	assert.Error(t, validateStoreName("jojo-1"))
-	assert.Error(t, validateStoreName("jojo%1"))
-
-	// dupe store
-	assert.Error(t, validateStoreName(APIKV))
-	// valid name
-	assert.NoError(t, validateStoreName("AB_63cd."))
-
-}
-
-func TestStore(t *testing.T) {
-
-	// API store created in first test
-	s, err := Store(APIKV)
-	assert.NoError(t, err)
-	assert.NotNil(t, s)
-
-	// store not found
-	s, err = Store("jojo")
-	assert.Error(t, err)
-	assert.Nil(t, s)
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/bind.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/bind.go
deleted file mode 100644
index 3754bc6874..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/bind.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Bind enables launching of the process in the container
-func Bind(op *trace.Operation, h interface{}, id string) (interface{}, error) {
-	defer trace.End(trace.Begin(id))
-
-	return toggleActive(op, h, id, true)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/common.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/common.go
deleted file mode 100644
index 94cfb4f673..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/common.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/migration/feature"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Toggle launching of the process in the container
-func toggleActive(op *trace.Operation, h interface{}, id string, active bool) (interface{}, error) {
-	defer trace.End(trace.Begin(id))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	stasks := handle.ExecConfig.Sessions
-	etasks := handle.ExecConfig.Execs
-
-	taskS, okS := stasks[id]
-	taskE, okE := etasks[id]
-
-	if !okS && !okE {
-		return nil, fmt.Errorf("unknown task ID: %s", id)
-	}
-
-	task := taskS
-	if handle.Runtime != nil && handle.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOff {
-		op.Debugf("Task bind configuration applies to ephemeral set")
-		task = taskE
-
-		if err := compatible(handle); err != nil {
-			return nil, err
-		}
-	}
-
-	// if no task has been joined that can be manipulated in the container's current state
-	if task == nil {
-		return nil, fmt.Errorf("Cannot modify task %s in current state", id)
-	}
-
-	op.Debugf("Toggling active state of task %s (%s): %t", id, task.Cmd.Path, active)
-
-	task.Active = active
-	handle.Reload()
-
-	return handle, nil
-}
-
-func compatible(h interface{}) error {
-	if handle, ok := h.(*exec.Handle); ok {
-		if handle.DataVersion < feature.TasksSupportedVersion {
-			return fmt.Errorf("running tasks not supported for this container")
-		}
-
-		return nil
-	}
-
-	return fmt.Errorf("Type assertion failed for %#+v", h)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/inspect.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/inspect.go
deleted file mode 100644
index 54de95ff67..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/inspect.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Inspect the task configuration from the containerVM config
-func Inspect(op *trace.Operation, h interface{}, id string) (*executor.SessionConfig, error) {
-	defer trace.End(trace.Begin(id))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	stasks := handle.ExecConfig.Sessions
-	etasks := handle.ExecConfig.Execs
-
-	_, okS := stasks[id]
-	_, okE := etasks[id]
-
-	if !okS && !okE {
-		return nil, fmt.Errorf("unknown task ID: %s", id)
-	}
-
-	tasks := stasks
-	if handle.Runtime != nil && handle.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOff {
-		op.Debugf("Task configuration applies to ephemeral set")
-		tasks = etasks
-	}
-
-	if _, ok := tasks[id]; !ok {
-		return nil, fmt.Errorf("Cannot find task %s", id)
-	}
-
-	return tasks[id], nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/join.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/join.go
deleted file mode 100644
index 3e584f53ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/join.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Join adds the task configuration to the containerVM config
-func Join(op *trace.Operation, h interface{}, task *executor.SessionConfig) (interface{}, error) {
-	defer trace.End(trace.Begin(task.ID))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	// if the container isn't running then this is a persistent change
-	var tasks map[string]*executor.SessionConfig
-	if handle.Runtime == nil || handle.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOff {
-		if handle.ExecConfig.Sessions == nil {
-			handle.ExecConfig.Sessions = make(map[string]*executor.SessionConfig)
-		}
-		tasks = handle.ExecConfig.Sessions
-		task.Diagnostics.SysLogConfig = handle.ExecConfig.Diagnostics.SysLogConfig
-	} else {
-		op.Debugf("Task join configuration applies to ephemeral set")
-		if handle.ExecConfig.Execs == nil {
-			handle.ExecConfig.Execs = make(map[string]*executor.SessionConfig)
-		}
-		tasks = handle.ExecConfig.Execs
-
-		if err := compatible(h); err != nil {
-			return nil, err
-		}
-	}
-
-	_, ok = tasks[task.ID]
-	if ok {
-		return nil, fmt.Errorf("task ID collides: %s", task.ID)
-	}
-
-	op.Debugf("Adding task (%s): %s", task.Cmd.Path, task.ID)
-
-	tasks[task.ID] = task
-
-	return handle, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/remove.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/remove.go
deleted file mode 100644
index 2d7c882356..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/remove.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Remove the task configuration from the containerVM config
-func Remove(op *trace.Operation, h interface{}, id string) (interface{}, error) {
-	defer trace.End(trace.Begin(id))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return nil, fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	stasks := handle.ExecConfig.Sessions
-	etasks := handle.ExecConfig.Execs
-
-	_, okS := stasks[id]
-	_, okE := etasks[id]
-
-	if !okS && !okE {
-		return nil, fmt.Errorf("unknown task ID: %s", id)
-	}
-
-	tasks := stasks
-	if handle.Runtime != nil && handle.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOff {
-		op.Debugf("Task configuration applies to ephemeral set")
-		tasks = etasks
-
-		if err := compatible(h); err != nil {
-			return nil, err
-		}
-	}
-
-	// if no task has been bound to the
-	if _, ok := tasks[id]; !ok {
-		return nil, fmt.Errorf("Cannot modify task %s in current state", id)
-	}
-
-	delete(tasks, id)
-	handle.Reload()
-
-	return handle, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/unbind.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/unbind.go
deleted file mode 100644
index bb0d9713f3..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/unbind.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Unbind disables launching of the process in the container
-func Unbind(op *trace.Operation, h interface{}, id string) (interface{}, error) {
-	defer trace.End(trace.Begin(id))
-
-	return toggleActive(op, h, id, false)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/wait.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/task/wait.go
deleted file mode 100644
index 472b218972..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/task/wait.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package task
-
-import (
-	"context"
-	"fmt"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/portlayer/exec"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Wait waits the task to start
-func Wait(op *trace.Operation, h interface{}, id string) error {
-	defer trace.End(trace.Begin(id))
-
-	handle, ok := h.(*exec.Handle)
-	if !ok {
-		return fmt.Errorf("Type assertion failed for %#+v", handle)
-	}
-
-	if handle.Runtime != nil && handle.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOn {
-		return fmt.Errorf("Unable to wait for task when container %s is not running", id)
-	}
-
-	_, okS := handle.ExecConfig.Sessions[id]
-	_, okE := handle.ExecConfig.Execs[id]
-
-	if !okS && !okE {
-		return fmt.Errorf("Unknown task ID: %s", id)
-	}
-
-	// wait task to set started field
-	ctx, cancel := context.WithTimeout(context.Background(), constants.PropertyCollectorTimeout)
-	defer cancel()
-
-	c := exec.Containers.Container(handle.ExecConfig.ID)
-	if c == nil {
-		return fmt.Errorf("Unknown container ID: %s", handle.ExecConfig.ID)
-	}
-
-	if okS {
-		return c.WaitForSession(ctx, id)
-	}
-	return c.WaitForExec(ctx, id)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths.go
deleted file mode 100644
index 8a638a7781..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"errors"
-	"fmt"
-	"net/url"
-	"path"
-	"path/filepath"
-	"strings"
-
-	"github.com/vmware/govmomi/object"
-)
-
-const (
-	StorageURLPath = "storage"
-	ImageURLPath   = StorageURLPath + "/images"
-	VolumeURLPath  = StorageURLPath + "/volumes"
-)
-
-// ImageStoreNameToURL parses the image URL in the form /storage/images/<image store>/<image name>
-func ImageStoreNameToURL(storeName string) (*url.URL, error) {
-	a := ServiceURL(ImageURLPath)
-	AppendDir(a, storeName)
-	return a, nil
-}
-
-func ImageStoreName(u *url.URL) (string, error) {
-	// Check the path isn't malformed.
-	if !filepath.IsAbs(u.Path) {
-		return "", errors.New("invalid uri path")
-	}
-
-	segments := strings.Split(filepath.Clean(u.Path), "/")[1:]
-
-	if len(segments) < 3 ||
-		segments[0] != filepath.Clean(StorageURLPath) {
-		return "", errors.New("not a storage path")
-	}
-
-	if segments[1] != "images" {
-		return "", errors.New("not an imagestore path")
-	}
-
-	if len(segments) < 2 {
-		return "", errors.New("uri path mismatch")
-	}
-
-	return segments[2], nil
-}
-
-// ImageURL converts a store and image name into an URL that is an internal imagestore representation
-// NOTE: this is NOT a datastore URL and cannot be used in any calls that expect a ds:// scheme
-func ImageURL(storeName, imageName string) (*url.URL, error) {
-	if imageName == "" {
-		return nil, fmt.Errorf("image ID missing")
-	}
-
-	u, err := ImageStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-	AppendDir(u, imageName)
-	return u, nil
-}
-
-// ImageDatastoreURL takes a datastore path object and converts it into a stable URL for with a "ds" scheme
-func ImageDatastoreURL(path *object.DatastorePath) *url.URL {
-	return &url.URL{
-		Scheme: "ds",
-		Path:   path.String(),
-	}
-}
-
-// VolumeStoreNameToURL parses the volume URL in the form /storage/volumes/<volume store>/<volume name>
-func VolumeStoreNameToURL(storeName string) (*url.URL, error) {
-	a := ServiceURL(VolumeURLPath)
-	AppendDir(a, storeName)
-	return a, nil
-}
-
-func VolumeStoreName(u *url.URL) (string, error) {
-	// Check the path isn't malformed.
-	if !filepath.IsAbs(u.Path) {
-		return "", errors.New("invalid uri path")
-	}
-
-	segments := strings.Split(filepath.Clean(u.Path), "/")[1:]
-
-	if len(segments) < 3 ||
-		segments[0] != filepath.Clean(StorageURLPath) {
-		return "", errors.New("not a storage path")
-	}
-
-	if segments[1] != "volumes" {
-		return "", errors.New("not an volumestore path")
-	}
-
-	if len(segments) < 2 {
-		return "", errors.New("uri path mismatch")
-	}
-
-	return segments[2], nil
-}
-
-func VolumeURL(storeName, volumeName string) (*url.URL, error) {
-	u, err := VolumeStoreNameToURL(storeName)
-	if err != nil {
-		return nil, err
-	}
-	AppendDir(u, volumeName)
-	return u, nil
-}
-
-func AppendDir(u *url.URL, dir string) {
-	u.Path = path.Join(u.Path, dir)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths_test.go
deleted file mode 100644
index 9ba48db292..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/paths_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestImageStoreName(t *testing.T) {
-	u, _ := url.Parse("/storage/images/imgstore/image")
-	store, err := ImageStoreName(u)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	expectedStore := "imgstore"
-	if !assert.Equal(t, expectedStore, store) {
-		return
-	}
-}
-
-func TestImageStoreNameErrors(t *testing.T) {
-	u, _ := url.Parse("fail")
-	_, err := ImageStoreName(u)
-	expectedError := "invalid uri path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-
-	u, _ = url.Parse("/storage:123")
-	_, err = ImageStoreName(u)
-	expectedError = "not a storage path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-
-	u, _ = url.Parse("/storage")
-	_, err = ImageStoreName(u)
-	expectedError = "not a storage path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-}
-
-func TestImageURL(t *testing.T) {
-	DefaultHost, _ = url.Parse("http://foo.com/")
-	storeName := "storeName"
-	imageName := "imageName"
-
-	u, err := ImageURL(storeName, imageName)
-	if err != nil {
-		t.Errorf("ImageURL failed %v", err)
-	}
-	expectedURL := "http://foo.com/storage/images/storeName/imageName"
-	if !assert.Equal(t, expectedURL, u.String()) {
-		return
-	}
-}
-
-func TestVolumeStoreName(t *testing.T) {
-	u, _ := url.Parse("/storage/volumes/volstore/volume")
-	store, err := VolumeStoreName(u)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	expectedStore := "volstore"
-	if !assert.Equal(t, expectedStore, store) {
-		return
-	}
-}
-
-func TestVolumeStoreNameErrors(t *testing.T) {
-	u, _ := url.Parse("fail")
-	_, err := VolumeStoreName(u)
-	expectedError := "invalid uri path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-
-	u, _ = url.Parse("/storage:123")
-	_, err = VolumeStoreName(u)
-	expectedError = "not a storage path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-
-	u, _ = url.Parse("/storage")
-	_, err = VolumeStoreName(u)
-	expectedError = "not a storage path"
-	if err.Error() != expectedError {
-		t.Errorf("Got: %s Expected: %s", err, expectedError)
-	}
-}
-
-func TestVolumeURL(t *testing.T) {
-	DefaultHost, _ = url.Parse("http://foo.com/")
-	storeName := "storeName"
-	volumeName := "volumeName"
-
-	u, err := VolumeURL(storeName, volumeName)
-	if err != nil {
-		t.Errorf("VolumeURL failed %v", err)
-	}
-	expectedURL := "http://foo.com/storage/volumes/storeName/volumeName"
-	if !assert.Equal(t, expectedURL, u.String()) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util.go
deleted file mode 100644
index 6637563f76..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"fmt"
-	"net"
-	"net/url"
-	"os"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/lib/spec"
-)
-
-const (
-	// XXX leaving this as http for now.  We probably want to make this unix://
-	scheme = "http://"
-)
-
-var (
-	DefaultHost = Host()
-)
-
-func Host() *url.URL {
-	name, err := os.Hostname()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	thisHost, err := url.Parse(scheme + name)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return thisHost
-}
-
-// ServiceURL returns the URL for a given service relative to this host
-func ServiceURL(serviceName string) *url.URL {
-	s, err := DefaultHost.Parse(serviceName)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	return s
-}
-
-// Update the VM display name on vSphere UI
-func DisplayName(config *spec.VirtualMachineConfigSpecConfig, namingConvention string) string {
-	var name string
-	shortID := config.ID[:constants.ShortIDLen]
-	nameMaxLen := constants.MaxVMNameLength - len(shortID)
-	prettyName := config.Name
-
-	if namingConvention != "" {
-		//TODO: need to respect max length -- potentially enforce '-' separator
-		if strings.Contains(namingConvention, "{id}") {
-			name = strings.Replace(namingConvention, "{id}", shortID, -1)
-		} else {
-			//assume name
-			name = strings.Replace(namingConvention, "{name}", prettyName, -1)
-		}
-		log.Infof("Applied naming convention: %s resulting %s", namingConvention, name)
-	} else {
-		// no naming convention specified during VCH creation / reconfigure so apply
-		// standard VM display name convention
-		if len(prettyName) > nameMaxLen-1 {
-			name = fmt.Sprintf("%s-%s", prettyName[:nameMaxLen-1], shortID)
-		} else {
-			name = fmt.Sprintf("%s-%s", prettyName, shortID)
-		}
-	}
-	return name
-}
-
-func ClientIP() (net.IP, error) {
-	ips, err := net.LookupIP(constants.ClientHostName)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(ips) == 0 {
-		return nil, fmt.Errorf("No IP found on %s", constants.ClientHostName)
-	}
-
-	if len(ips) > 1 {
-		return nil, fmt.Errorf("Multiple IPs found on %s: %#v", constants.ClientHostName, ips)
-	}
-	return ips[0], nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util_test.go b/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util_test.go
deleted file mode 100644
index c0774ccc66..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/portlayer/util/util_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"net/url"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestServiceUrl(t *testing.T) {
-	DefaultHost, _ = url.Parse("http://foo.com/")
-	u := ServiceURL(StorageURLPath)
-
-	if !assert.Equal(t, "http://foo.com/storage", u.String()) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/pprof/pprof.go b/installer/vendor/github.com/vmware/vic/lib/pprof/pprof.go
deleted file mode 100644
index 706c63fe96..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/pprof/pprof.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//	http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package pprof
-
-import (
-
-	// imported for the side effect
-	_ "expvar"
-	"fmt"
-	"net"
-	"net/http"
-	// imported for the side effect
-	_ "net/http/pprof"
-	"net/url"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-type PprofPort int
-
-const basePort = 6060
-
-const (
-	VCHInitPort PprofPort = iota
-	VicadminPort
-	DockerPort
-	PortlayerPort
-	maxPort
-)
-
-var (
-	debugLevel int
-)
-
-func init() {
-	// load the vch config
-	// TODO: Optimize this to just pull the fields we need...
-	src, err := extraconfig.GuestInfoSource()
-	if err != nil {
-		log.Errorf("Unable to load configuration from guestinfo")
-		return
-	}
-
-	vchConfig := new(config.VirtualContainerHostConfigSpec)
-	extraconfig.Decode(src, vchConfig)
-	debugLevel = vchConfig.ExecutorConfig.Diagnostics.DebugLevel
-}
-
-func GetPprofEndpoint(component PprofPort) *url.URL {
-	if component >= maxPort {
-		return nil
-	}
-	port := component + basePort
-
-	ip := "127.0.0.1"
-	// exposing this data on an external port definitely counts as a change of behaviour,
-	// so this is > 1, just debug on/off.
-	if debugLevel > 1 {
-		ips, err := net.LookupIP("client.localhost")
-		if err != nil || len(ips) == 0 {
-			log.Warnf("Unable to resolve 'client.localhost': ", err)
-		} else {
-			ip = ips[0].String()
-		}
-	}
-
-	endpoint, err := url.Parse(fmt.Sprintf("http://%s:%d", ip, port))
-	if err != nil {
-		return nil
-	}
-	return endpoint
-}
-
-func StartPprof(name string, component PprofPort) error {
-	url := GetPprofEndpoint(component)
-	if url == nil {
-		err := fmt.Errorf("Unable to get pprof endpoint for %s.", name)
-		log.Error(err.Error())
-		return err
-	}
-	location := url.String()[7:] // Strip off leading "http://"
-
-	log.Info(fmt.Sprintf("Launching %s pprof server on %s", name, location))
-	go func() {
-		log.Info(http.ListenAndServe(location, nil))
-	}()
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/spec/spec_test.go b/installer/vendor/github.com/vmware/vic/lib/spec/spec_test.go
deleted file mode 100644
index 1447918f14..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/spec/spec_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package spec
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"context"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-)
-
-func TestVirtualMachineConfigSpec(t *testing.T) {
-
-	ctx := context.Background()
-
-	sessionconfig := &session.Config{
-		Service:        env.URL(t),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(sessionconfig).Create(ctx)
-	if err != nil {
-		t.Logf("%+v", err.Error())
-		if _, ok := err.(*find.MultipleFoundError); !ok {
-			t.Errorf(err.Error())
-		} else {
-			t.SkipNow()
-		}
-	}
-	defer s.Logout(ctx)
-
-	specconfig := &VirtualMachineConfigSpecConfig{
-		NumCPUs:       2,
-		MemoryMB:      2048,
-		VMForkEnabled: true,
-
-		ID: "zombie_attack",
-
-		BootMediaPath: s.Datastore.Path("brainz.iso"),
-		VMPathName:    fmt.Sprintf("[%s]", s.Datastore.Name()),
-	}
-	// FIXME: find a better way to pass those
-	var scsibus int32
-	var scsikey int32 = 100
-	var idekey int32 = 200
-
-	root, _ := NewVirtualMachineConfigSpec(ctx, s, specconfig)
-	scsi := NewVirtualSCSIController(scsibus, scsikey)
-
-	pv := NewParaVirtualSCSIController(scsi)
-	root.AddParaVirtualSCSIController(pv)
-
-	bl := NewVirtualBusLogicController(scsi)
-	root.AddVirtualBusLogicController(bl)
-
-	ll := NewVirtualLsiLogicController(scsi)
-	root.AddVirtualLsiLogicController(ll)
-
-	ls := NewVirtualLsiLogicSASController(scsi)
-	root.AddVirtualLsiLogicSASController(ls)
-	///
-	ide := NewVirtualIDEController(idekey)
-	root.AddVirtualIDEController(ide)
-
-	cdrom := NewVirtualCdrom(ide)
-	root.AddVirtualCdrom(cdrom)
-
-	floppy := NewVirtualFloppy(ide)
-	root.AddVirtualFloppy(floppy)
-
-	vmxnet3 := NewVirtualVmxnet3()
-	root.AddVirtualVmxnet3(vmxnet3)
-
-	pcnet32 := NewVirtualPCNet32()
-	root.AddVirtualPCNet32(pcnet32)
-
-	e1000 := NewVirtualE1000()
-	root.AddVirtualE1000(e1000)
-
-	for i := 0; i < len(root.DeviceChange); i++ {
-		t.Logf("%+v", root.DeviceChange[i].GetVirtualDeviceConfigSpec().Device)
-	}
-
-}
-
-func TestCollectSlotNumbers(t *testing.T) {
-	s := &VirtualMachineConfigSpec{
-		config: &VirtualMachineConfigSpecConfig{
-			ID: "foo",
-		},
-		VirtualMachineConfigSpec: &types.VirtualMachineConfigSpec{},
-	}
-
-	slots := s.CollectSlotNumbers(nil)
-	assert.Empty(t, slots)
-
-	s.AddVirtualVmxnet3(NewVirtualVmxnet3())
-	s.DeviceChange[0].GetVirtualDeviceConfigSpec().Device.GetVirtualDevice().SlotInfo = &types.VirtualDevicePciBusSlotInfo{PciSlotNumber: 32}
-	slots = s.CollectSlotNumbers(nil)
-	assert.EqualValues(t, map[int32]bool{32: true}, slots)
-
-	// add a device without a slot number
-	s.AddVirtualVmxnet3(NewVirtualVmxnet3())
-	slots = s.CollectSlotNumbers(nil)
-	assert.EqualValues(t, map[int32]bool{32: true}, slots)
-
-	// add another device with slot number
-	s.AddVirtualVmxnet3(NewVirtualVmxnet3())
-	s.DeviceChange[len(s.DeviceChange)-1].GetVirtualDeviceConfigSpec().Device.GetVirtualDevice().SlotInfo = &types.VirtualDevicePciBusSlotInfo{PciSlotNumber: 33}
-	slots = s.CollectSlotNumbers(slots)
-	assert.EqualValues(t, map[int32]bool{32: true, 33: true}, slots)
-
-}
-
-func TestFindSlotNumber(t *testing.T) {
-	allSlots := make(map[int32]bool)
-	for s := constants.PCISlotNumberBegin; s != constants.PCISlotNumberEnd; s += constants.PCISlotNumberInc {
-		allSlots[s] = true
-	}
-
-	// missing first slot
-	missingFirstSlot := make(map[int32]bool)
-	for s := constants.PCISlotNumberBegin + constants.PCISlotNumberInc; s != constants.PCISlotNumberEnd; s += constants.PCISlotNumberInc {
-		missingFirstSlot[s] = true
-	}
-
-	// missing last slot
-	missingLastSlot := make(map[int32]bool)
-	for s := constants.PCISlotNumberBegin; s != constants.PCISlotNumberEnd-constants.PCISlotNumberInc; s += constants.PCISlotNumberInc {
-		missingLastSlot[s] = true
-	}
-
-	// missing a slot in the middle
-	var missingSlot int32
-	missingMiddleSlot := make(map[int32]bool)
-	for s := constants.PCISlotNumberBegin; s != constants.PCISlotNumberEnd-constants.PCISlotNumberInc; s += constants.PCISlotNumberInc {
-		if constants.PCISlotNumberBegin+(2*constants.PCISlotNumberInc) == s {
-			missingSlot = s
-			continue
-		}
-		missingMiddleSlot[s] = true
-	}
-
-	var tests = []struct {
-		slots map[int32]bool
-		out   int32
-	}{
-		{make(map[int32]bool), constants.PCISlotNumberBegin},
-		{allSlots, constants.NilSlot},
-		{missingFirstSlot, constants.PCISlotNumberBegin},
-		{missingLastSlot, constants.PCISlotNumberEnd - constants.PCISlotNumberInc},
-		{missingMiddleSlot, missingSlot},
-	}
-
-	for _, te := range tests {
-		if s := findSlotNumber(te.slots); s != te.out {
-			t.Fatalf("findSlotNumber(%v) => %d, want %d", te.slots, s, te.out)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/system/syscall.go b/installer/vendor/github.com/vmware/vic/lib/system/syscall.go
deleted file mode 100644
index cbd08bdfaf..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/system/syscall.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package system
-
-import "syscall"
-
-// Syscall provides an interface to make system calls
-type Syscall interface {
-	Mount(source string, target string, fstype string, flags uintptr, data string) error
-	Sethostname(p []byte) error
-	Symlink(oldname, newname string) error
-	Unmount(path string, flags int) error
-}
-
-type syscallImpl struct {
-}
-
-func (s syscallImpl) Symlink(oldname, newname string) error {
-	return syscall.Symlink(oldname, newname)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/system/syscall_darwin.go b/installer/vendor/github.com/vmware/vic/lib/system/syscall_darwin.go
deleted file mode 100644
index 566b8456b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/system/syscall_darwin.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package system
-
-import "syscall"
-
-func (s syscallImpl) Mount(source string, target string, fstype string, flags uintptr, data string) error {
-	return syscall.ENOSYS
-}
-
-func (s syscallImpl) Sethostname(hostname []byte) error {
-	return syscall.ENOSYS
-}
-
-func (s syscallImpl) Unmount(target string, flags int) error {
-	return syscall.ENOSYS
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/system/syscall_linux.go b/installer/vendor/github.com/vmware/vic/lib/system/syscall_linux.go
deleted file mode 100644
index 14fcf1dff1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/system/syscall_linux.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package system
-
-import "syscall"
-
-func (s syscallImpl) Mount(source string, target string, fstype string, flags uintptr, data string) error {
-	return syscall.Mount(source, target, fstype, flags, data)
-}
-
-func (s syscallImpl) Sethostname(hostname []byte) error {
-	return syscall.Sethostname(hostname)
-}
-
-func (s syscallImpl) Unmount(target string, flags int) error {
-	return syscall.Unmount(target, flags)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/system/syscall_windows.go b/installer/vendor/github.com/vmware/vic/lib/system/syscall_windows.go
deleted file mode 100644
index 566b8456b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/system/syscall_windows.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package system
-
-import "syscall"
-
-func (s syscallImpl) Mount(source string, target string, fstype string, flags uintptr, data string) error {
-	return syscall.ENOSYS
-}
-
-func (s syscallImpl) Sethostname(hostname []byte) error {
-	return syscall.ENOSYS
-}
-
-func (s syscallImpl) Unmount(target string, flags int) error {
-	return syscall.ENOSYS
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/system/system.go b/installer/vendor/github.com/vmware/vic/lib/system/system.go
deleted file mode 100644
index 4e2a7079ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/system/system.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// The system package provides a collection of interfaces
-// that can be used to modify certain properties of the system
-// the go program is running on. It can also be used to make
-// system calls. The main purpose of this package is to
-// abstract away the system so that it can be mocked for
-// unit tests.
-
-package system
-
-import (
-	"path"
-
-	"github.com/vmware/vic/lib/etcconf"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-)
-
-type System struct {
-	Hosts      etcconf.Hosts      // the hosts file on the system, e.g. /etc/hosts
-	ResolvConf etcconf.ResolvConf // the resolv.conf file on the system, e.g. /etc/resolv.conf
-	Syscall    Syscall            // syscall interface for making system calls
-
-	// constants
-	Root string // system's root path
-	UUID string // machine id
-}
-
-func New() System {
-	// #nosec: Errors unhandled.
-	id, _ := sys.UUID()
-	return System{
-		Hosts:      etcconf.NewHosts(""),      // default hosts files, e.g. /etc/hosts on linux
-		ResolvConf: etcconf.NewResolvConf(""), // default resolv.conf file, e.g. /etc/resolv.conf on linux
-		Syscall:    &syscallImpl{},            // the syscall interface
-		Root:       "/",                       // the system root path
-		UUID:       id,
-	}
-}
-
-// NewWithRoot takes a path at which to set the "root" of the system.
-// This will cause the hosts and resolv.conf files to be in their default paths, but
-// relative to that root
-func NewWithRoot(root string) System {
-	id, _ := sys.UUID()
-	return System{
-		Hosts:      etcconf.NewHosts(path.Join(root, etcconf.HostsPath)),           // default hosts files, e.g. /etc/hosts on linux
-		ResolvConf: etcconf.NewResolvConf(path.Join(root, etcconf.ResolvConfPath)), // default resolv.conf file, e.g. /etc/resolv.conf on linux
-		Syscall:    &syscallImpl{},                                                 // the syscall interface
-		Root:       root,                                                           // the system root path
-		UUID:       id,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/cmd_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/cmd_test.go
deleted file mode 100644
index a4d66291ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/cmd_test.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"fmt"
-	"os/exec"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestPathLookup constructs the spec for a Session where the binary path must be
-// resolved from the PATH environment variable - this is a variation from normal
-// Cmd handling where that is done during creation of Cmd
-//
-
-func TestPathLookup(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "pathlookup",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"pathlookup": {
-				Common: executor.Common{
-					ID:   "pathlookup",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "date",
-					Args: []string{"date", "--reference=/"},
-					Env:  []string{"PATH=/bin"},
-					Dir:  "/bin",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.NoError(t, err, "Didn't expected error from runTether")
-
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	assert.Equal(t, "true", result.Sessions["pathlookup"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["pathlookup"].ExitStatus, "Expected command to have exited cleanly")
-}
-
-func TestRelativePath(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "relpath",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"relpath": {
-				Common: executor.Common{
-					ID:   "relpath",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "./date",
-					Args: []string{"./date", "--reference=/"},
-					Env:  []string{"PATH="},
-					Dir:  "/bin",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.NoError(t, err, "Didn't expected error from RunTether")
-
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	assert.Equal(t, "true", result.Sessions["relpath"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["relpath"].ExitStatus, "Expected command to have exited cleanly")
-}
-
-func TestAbsPath(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "abspath",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"abspath": {
-				Common: executor.Common{
-					ID:   "abspath",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test abs path
-					Path: "/bin/date",
-					Args: []string{"date", "--reference=/"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.NoError(t, err, "Didn't expected error from RunTether")
-
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	assert.Equal(t, "true", result.Sessions["abspath"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["abspath"].ExitStatus, "Expected command to have exited cleanly")
-
-	// read the output from the session
-	log := mocker.SessionLogBuffer.Bytes()
-
-	// block until tether exits
-	<-mocker.Cleaned
-
-	// run the command directly
-	out, err := exec.Command("/bin/date", "--reference=/").Output()
-	if err != nil {
-		fmt.Printf("Failed to run date for comparison data: %s", err)
-		t.Error(err)
-		return
-	}
-
-	if !assert.Equal(t, out, log) {
-		return
-	}
-}
-
-func TestHalt(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "abspath",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"abspath": {
-				Common: executor.Common{
-					ID:   "abspath",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test abs path
-					Path: "/bin/date",
-					Args: []string{"date", "--reference=/"},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.NoError(t, err, "Didn't expected error from RunTether")
-
-	// block until tether exits
-	<-mocker.Cleaned
-
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	assert.Equal(t, "true", result.Sessions["abspath"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["abspath"].ExitStatus, "Expected command to have exited cleanly")
-
-	// read the output from the session
-	log := mocker.SessionLogBuffer.Bytes()
-
-	// run the command directly
-	out, err := exec.Command("/bin/date", "--reference=/").Output()
-	if err != nil {
-		fmt.Printf("Failed to run date for comparison data: %s", err)
-		t.Error(err)
-		return
-	}
-
-	if !assert.Equal(t, out, log) {
-		return
-	}
-}
-
-func TestAbsPathRepeat(t *testing.T) {
-	log.SetLevel(log.WarnLevel)
-
-	for i := 0; i < 2000 && !t.Failed(); i++ {
-		TestAbsPath(t)
-	}
-
-	defer log.SetLevel(log.DebugLevel)
-
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestMissingBinaryConfig constructs the spec for a Session with invalid binary path
-//
-
-func TestMissingBinary(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "missing",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"missing": {
-				Common: executor.Common{
-					ID:   "missing",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "/not/there",
-					Args: []string{"/not/there"},
-					Env:  []string{"PATH=/not"},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.Error(t, err, "Expected error from RunTether")
-
-	// refresh the cfg with current data
-	extraconfig.Decode(src, &cfg)
-
-	// check the launch status was failed
-	status := cfg.Sessions["missing"].Started
-
-	assert.Equal(t, "stat /not/there: no such file or directory", status, "Expected status to have a command not found error message")
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
-
-/////////////////////////////////////////////////////////////////////////////////////
-// TestMissingRelativeBinaryConfig constructs the spec for a Session with invalid binary path
-//
-
-func TestMissingRelativeBinary(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "missing",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"missing": {
-				Common: executor.Common{
-					ID:   "missing",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "notthere",
-					Args: []string{"notthere"},
-					Env:  []string{"PATH=/not"},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	_, src, err := RunTether(t, &cfg, mocker)
-	assert.Error(t, err, "Expected error from RunTether")
-
-	// refresh the cfg with current data
-	extraconfig.Decode(src, &cfg)
-
-	// check the launch status was failed
-	status := cfg.Sessions["missing"].Started
-
-	assert.Equal(t, "notthere: no such executable in PATH", status, "Expected status to have a command not found error message")
-}
-
-//
-/////////////////////////////////////////////////////////////////////////////////////
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/config.go b/installer/vendor/github.com/vmware/vic/lib/tether/config.go
deleted file mode 100644
index 4434770542..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/config.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"io"
-	"net"
-	"os"
-	"os/exec"
-	"sync"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/ip"
-)
-
-type ExecutorConfig struct {
-	// allow us to lock the maps when config is being updated
-	// subelements tend to have their own locks
-	sync.Mutex
-
-	// The name of the system
-	Name string `vic:"0.1" scope:"read-only" key:"common/name"`
-
-	// ID corresponds to that of the primary session
-	ID string `vic:"0.1" scope:"read-only" key:"common/id"`
-
-	// Debug is a numeric level that controls extent of debugging
-	DebugLevel int `vic:"0.1" scope:"read-only" key:"diagnostics/debug"`
-
-	// Exclusive access to childPidTable
-	pidMutex sync.Mutex `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// Set of child PIDs created by us.
-	pids map[int]*SessionConfig `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// Sessions is the set of sessions currently hosted by this executor
-	// These are keyed by session ID
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-
-	// Execs is the set of non-persistent sessions hosted by this executor
-	Execs map[string]*SessionConfig `vic:"0.1" scope:"read-only,non-persistent" key:"execs"`
-
-	// Maps the mount name to the detail mount specification
-	Mounts map[string]executor.MountSpec `vic:"0.1" scope:"read-only" key:"mounts"`
-
-	// This describes an executors presence on a network, and contains sufficient
-	// information to configure the interface in the guest.
-	Networks map[string]*NetworkEndpoint `vic:"0.1" scope:"read-only" key:"networks"`
-
-	// Key is the host key used during communicate back with the Interaction endpoint if any
-	// Used if the in-guest tether is responsible for authenticating the connection
-	Key []byte `vic:"0.1" scope:"read-only" key:"key"`
-
-	// AsymmetricRouting is set to true if the VCH needs to be setup for asymmetric routing
-	AsymmetricRouting bool `vic:"0.1" scope:"read-only" key:"asymrouting"`
-
-	// Hostname and domainname provided by personality
-	Hostname   string `vic:"0.1" scope:"read-only" key:"hostname"`
-	Domainname string `vic:"0.1" scope:"read-only" key:"domainname"`
-}
-
-// SessionConfig defines the content of a session - this maps to the root of a process tree
-// inside an executor
-// This is close to but not perfectly aligned with the new docker/docker/daemon/execdriver/driver:CommonProcessConfig
-type SessionConfig struct {
-	// Protects the structure
-	sync.Mutex `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// The primary session may have the same ID as the executor owning it
-	executor.Common `vic:"0.1" scope:"read-only" key:"common"`
-	executor.Detail `vic:"0.1" scope:"read-write" key:"detail"`
-
-	// Diagnostics holds basic diagnostics data
-	Diagnostics executor.Diagnostics `vic:"0.1" scope:"read-write" key:"diagnostics"`
-
-	// The primary process for the session
-	Cmd exec.Cmd `vic:"0.1" scope:"read-only" key:"cmd" recurse:"depth=2,nofollow"`
-
-	// The exit status of the process, if any
-	ExitStatus int `vic:"0.1" scope:"read-write" key:"status"`
-
-	Started string `vic:"0.1" scope:"read-write" key:"started"`
-
-	// Allow attach
-	Attach bool `vic:"0.1" scope:"read-only" key:"attach"`
-
-	OpenStdin bool `vic:"0.1" scope:"read-only" key:"openstdin"`
-
-	// Delay launching the Cmd until an attach request comes
-	RunBlock bool `vic:"0.1" scope:"read-write" key:"runblock"`
-
-	// Should this config be activated or not
-	Active bool `vic:"0.1" scope:"read-only" key:"active"`
-
-	// Allocate a tty or not
-	Tty bool `vic:"0.1" scope:"read-only" key:"tty"`
-
-	// Restart controls whether a process gets relaunched if it exists
-	Restart bool `vic:"0.1" scope:"read-only" key:"restart"`
-
-	// StopSignal is the signal name or number used to stop a container
-	StopSignal string `vic:"0.1" scope:"read-only" key:"stopSignal"`
-
-	// User and group for setuid programs
-	User  string `vic:"0.1" scope:"read-only" key:"user"`
-	Group string `vic:"0.1" scope:"read-only" key:"group"`
-
-	// if there's a pty then we need additional management data
-	Pty       *os.File               `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	Outwriter dio.DynamicMultiWriter `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	Errwriter dio.DynamicMultiWriter `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	Reader    dio.DynamicMultiReader `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	StdinPipe  io.WriteCloser `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	StdoutPipe io.ReadCloser  `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-	StderrPipe io.ReadCloser  `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	// Blocks launching the process.
-	// The channel contains no value; we’re only interested in its closed property.
-	ClearToLaunch chan struct{} `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	wait *sync.WaitGroup
-
-	// record the config prefix associated with this session - allows partial encoding
-	// without hardcoding the sessions parent in the config.
-	// This is basically a workaround for:
-	// a. not having integrated Exec sessions in to the Sessions map
-	// b. having only an implementation of CalculateKeys that requires a prefix instead
-	//    of performing a search
-	extraconfigKey string
-}
-
-type NetworkEndpoint struct {
-	// Common.Name - the nic alias requested (only one name and one alias possible in linux)
-	// Common.ID - pci slot of the vnic allowing for interface identifcation in-guest
-	executor.Common
-
-	// Whether this endpoint's IP was specified by the client (true if it was)
-	Static bool `vic:"0.1" scope:"read-only" key:"static"`
-
-	// IP address to assign
-	IP *net.IPNet `vic:"0.1" scope:"read-only" key:"ip"`
-
-	// Actual IP address assigned
-	Assigned net.IPNet `vic:"0.1" scope:"read-write" key:"assigned"`
-
-	// The network in which this information should be interpreted. This is embedded directly rather than
-	// as a pointer so that we can ensure the data is consistent
-	Network executor.ContainerNetwork `vic:"0.1" scope:"read-only" key:"network"`
-
-	// DHCP runtime info
-	DHCP *DHCPInfo `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-
-	Ports []string `vic:"0.1" scope:"read-only" key:"ports"`
-
-	// is this endpoint connected to an internal network?
-	Internal bool `vic:"0.1" scope:"read-only" key:"internal"`
-
-	// whether the network config was successfully applied
-	configured bool `vic:"0.1" scope:"read-only" recurse:"depth=0"`
-}
-
-func (e *NetworkEndpoint) IsDynamic() bool {
-	return !e.Static && (e.IP == nil || ip.IsUnspecifiedIP(e.IP.IP))
-}
-
-type DHCPInfo struct {
-	Assigned    net.IPNet
-	Nameservers []net.IP
-	Gateway     net.IPNet
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/config_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/config_test.go
deleted file mode 100644
index 591b6510db..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/config_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var (
-	localhost, lmask, _ = net.ParseCIDR("127.0.0.2/24")
-	gateway, gmask, _   = net.ParseCIDR("127.0.0.1/24")
-)
-
-func TestToExtraConfig(t *testing.T) {
-	exec := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "deadbeef",
-			Name: "configtest",
-		},
-		Sessions: map[string]*executor.SessionConfig{
-			"deadbeef": {
-				Cmd: executor.Cmd{
-					Path: "/bin/bash",
-					Args: []string{"/bin/bash", "-c", "echo hello"},
-					Dir:  "/",
-					Env:  []string{"HOME=/", "PATH=/bin"},
-				},
-			},
-			"beefed": {
-				Cmd: executor.Cmd{
-					Path: "/bin/bash",
-					Args: []string{"/bin/bash", "-c", "echo goodbye"},
-					Dir:  "/",
-					Env:  []string{"HOME=/", "PATH=/bin"},
-				},
-			},
-		},
-		Networks: map[string]*executor.NetworkEndpoint{
-			"eth0": {
-				Static: true,
-				IP:     &net.IPNet{IP: localhost, Mask: lmask.Mask},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "notsure",
-					},
-					Gateway:      net.IPNet{IP: gateway, Mask: gmask.Mask},
-					Destinations: []net.IPNet{},
-					Nameservers:  []net.IP{},
-					Pools:        []ip.Range{},
-					Aliases:      []string{},
-				},
-			},
-		},
-	}
-
-	exec.Networks["eth0"].Network.Assigned.Nameservers = []net.IP{}
-
-	// encode exec package's ExecutorConfig
-	encoded := map[string]string{}
-	extraconfig.Encode(extraconfig.MapSink(encoded), exec)
-
-	// decode into this package's ExecutorConfig
-	var decoded ExecutorConfig
-	extraconfig.Decode(extraconfig.MapSource(encoded), &decoded)
-
-	// the source and destination structs are different - we're doing a sparse comparison
-	expectedNet := exec.Networks["eth0"]
-	actualNet := decoded.Networks["eth0"]
-
-	assert.Equal(t, expectedNet.Common, actualNet.Common)
-	assert.Equal(t, expectedNet.Static, actualNet.Static)
-	assert.Equal(t, expectedNet.Assigned, actualNet.Assigned)
-	assert.Equal(t, expectedNet.Network, actualNet.Network)
-
-	expectedSession := exec.Sessions["deadbeef"]
-	actualSession := decoded.Sessions["deadbeef"]
-
-	assert.Equal(t, expectedSession.Cmd.Path, actualSession.Cmd.Path)
-	assert.Equal(t, expectedSession.Cmd.Args, actualSession.Cmd.Args)
-	assert.Equal(t, expectedSession.Cmd.Dir, actualSession.Cmd.Dir)
-	assert.Equal(t, expectedSession.Cmd.Env, actualSession.Cmd.Env)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/exec_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/exec_test.go
deleted file mode 100644
index 415af1a68c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/exec_test.go
+++ /dev/null
@@ -1,317 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-func TestExec(t *testing.T) {
-	_, mocker := testSetup(t)
-
-	defer testTeardown(t, mocker)
-
-	dir, err := ioutil.TempDir("", "tetherTestExec")
-	if !assert.Nil(t, err, "Unable to create temp file") {
-		t.FailNow()
-	}
-
-	flagFile := path.Join(dir, "flagfile")
-	defer os.RemoveAll(flagFile)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "primary",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"primary": {
-				Common: executor.Common{
-					ID:   "primary",
-					Name: "tether_test_session",
-				},
-				Tty:       true,
-				Active:    true,
-				OpenStdin: true,
-
-				Cmd: executor.Cmd{
-					// test abs path
-					Path: "/bin/bash",
-					Args: []string{"/bin/bash", "-c", fmt.Sprintf("until /usr/bin/test -e %s;do /bin/sleep 0.1;done", flagFile)},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	tthr, src, sink := StartTether(t, &cfg, mocker)
-
-	<-mocker.Started
-
-	// at this point the primary process should be up and running, so grab the pid
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	for result.Sessions["primary"].Started != "true" {
-		time.Sleep(200 * time.Millisecond)
-		extraconfig.Decode(src, &result)
-	}
-
-	// configure a command to kill the primary
-	cfg.Execs = map[string]*executor.SessionConfig{
-		"touch": {
-			Common: executor.Common{
-				ID:   "touch",
-				Name: "tether_test_session",
-			},
-			Tty:    false,
-			Active: true,
-
-			Cmd: executor.Cmd{
-				// test abs path
-				Path: "/bin/touch",
-				Args: []string{"touch", flagFile},
-				Env:  []string{},
-				Dir:  "/",
-			},
-		},
-	}
-
-	// update the active config
-	extraconfig.Encode(sink, cfg)
-
-	// trigger tether reload
-	tthr.Reload()
-
-	<-mocker.Reloaded
-
-	// block until tether exits - exit within test timeout is a pass given the pairing of processes in the test
-	<-mocker.Cleaned
-}
-
-func TestMissingBinaryNonFatal(t *testing.T) {
-	_, mocker := testSetup(t)
-
-	defer testTeardown(t, mocker)
-
-	dir, err := ioutil.TempDir("", "tetherTestExec")
-	if !assert.Nil(t, err, "Unable to create temp file") {
-		t.FailNow()
-	}
-
-	flagFile := path.Join(dir, "flagfile")
-	defer os.RemoveAll(flagFile)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "primary",
-			Name: "tether_test_executor",
-		},
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 2,
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"primary": {
-				Common: executor.Common{
-					ID:   "primary",
-					Name: "tether_test_session",
-				},
-				Tty:       true,
-				Active:    true,
-				OpenStdin: true,
-
-				Cmd: executor.Cmd{
-					// test abs path
-					Path: "/bin/bash",
-					Args: []string{"/bin/bash", "-c", fmt.Sprintf("until /usr/bin/test -e %s;do /bin/sleep 0.1;done", flagFile)},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	tthr, src, sink := StartTether(t, &cfg, mocker)
-
-	<-mocker.Started
-
-	// at this point the primary process should be up and running, so grab the pid
-	extraconfig.Decode(src, &cfg)
-
-	for cfg.Sessions["primary"].Started != "true" {
-		time.Sleep(time.Second)
-		extraconfig.Decode(src, &cfg)
-	}
-
-	// configure a command to kill the primary
-	cfg.Execs = map[string]*executor.SessionConfig{
-		"nonfatal": {
-			Common: executor.Common{
-				ID:   "nonfatal",
-				Name: "nonfatal_exec_session",
-			},
-			Tty:    false,
-			Active: true,
-
-			Cmd: executor.Cmd{
-				// test abs path
-				Path: "/not/there",
-				Args: []string{"/not/there"},
-				Env:  []string{},
-				Dir:  "/",
-			},
-		},
-	}
-
-	// update the active config
-	extraconfig.Encode(sink, cfg)
-
-	// trigger tether reload
-	tthr.Reload()
-
-	// wait for the reload to be processed
-	<-mocker.Reloaded
-
-	for cfg.Execs["nonfatal"].Started == "" {
-		time.Sleep(time.Second)
-		extraconfig.Decode(src, &cfg)
-	}
-
-	// reconfigure the missing process to make it inactive
-	cfg.Execs["nonfatal"].Active = false
-
-	// configure a command to kill the primary
-	cfg.Execs["touch"] = &executor.SessionConfig{
-		Common: executor.Common{
-			ID:   "touch",
-			Name: "tether_test_session",
-		},
-		Tty:    false,
-		Active: true,
-
-		Cmd: executor.Cmd{
-			// test abs path
-			Path: "/bin/touch",
-			Args: []string{"touch", flagFile},
-			Env:  []string{},
-			Dir:  "/",
-		},
-		ExitStatus: -1,
-	}
-
-	// update the active config
-	extraconfig.Encode(sink, cfg)
-
-	// trigger tether reload
-	tthr.Reload()
-
-	// block until tether exits - exit within test timeout is a pass given the pairing of processes in the test
-	<-mocker.Cleaned
-
-	// update config - into existing data
-	extraconfig.Decode(src, &cfg)
-
-	// check that nonfatal error was as expected
-	status := cfg.Execs["nonfatal"].Started
-	assert.Equal(t, "stat /not/there: no such file or directory", status, "Expected nonfatal status to have a command not found error message")
-	status = cfg.Execs["touch"].Started
-	assert.Equal(t, "true", status, "Expected touch status to be clean")
-	exit := cfg.Execs["touch"].ExitStatus
-	assert.Equal(t, 0, exit, "Expected touch exit status to be success")
-
-}
-
-func TestExecHalt(t *testing.T) {
-	_, mocker := testSetup(t)
-
-	defer testTeardown(t, mocker)
-
-	dir, err := ioutil.TempDir("", "tetherTestExec")
-	if !assert.Nil(t, err, "Unable to create temp file") {
-		t.FailNow()
-	}
-
-	flagFile := path.Join(dir, "flagfile")
-	defer os.RemoveAll(flagFile)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "primary",
-			Name: "tether_test_executor",
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"primary": {
-				Common: executor.Common{
-					ID:   "primary",
-					Name: "tether_test_session",
-				},
-				Tty:       true,
-				Active:    true,
-				OpenStdin: true,
-
-				Cmd: executor.Cmd{
-					// test abs path
-					Path: "/bin/bash",
-					Args: []string{"/bin/bash", "-c", fmt.Sprintf("until /usr/bin/test -e %s;do /bin/sleep 0.1;done", flagFile)},
-					Env:  []string{},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	tthr, src, sink := StartTether(t, &cfg, mocker)
-
-	<-mocker.Started
-
-	// at this point the primary process should be up and running, so grab the pid
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	for result.Sessions["primary"].Started != "true" {
-		time.Sleep(200 * time.Millisecond)
-		extraconfig.Decode(src, &result)
-	}
-
-	// reconfigure the primary process to make it inactive
-	cfg.Sessions["primary"].Active = false
-
-	// update the active config
-	extraconfig.Encode(sink, cfg)
-
-	// trigger tether reload
-	tthr.Reload()
-
-	// block until tether exits - exit within test timeout is a pass given we're deactivating the primary
-	<-mocker.Cleaned
-
-	// process should have been killed via signal due to deactivation
-	extraconfig.Decode(src, &result)
-	assert.Equal(t, -1, result.Sessions["primary"].ExitStatus, "Expected exit code for primary to indicate signal death")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/interfaces.go b/installer/vendor/github.com/vmware/vic/lib/tether/interfaces.go
deleted file mode 100644
index 3517b13d98..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/interfaces.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"context"
-	"io"
-	"net/url"
-	"os"
-
-	"github.com/vmware/vic/pkg/dio"
-)
-
-// UtilityFn is the sigature of a function that can be used to launch a utility process
-type UtilityFn func() (*os.Process, error)
-
-// Operations defines the set of operations that Tether depends upon. These are split out for:
-// * portability
-// * dependency injection (primarily for testing)
-// * behavioural control (e.g. what behaviour is required when a session exits)
-type Operations interface {
-	Setup(Config) error
-	Cleanup() error
-	// Log returns the tether debug log writer
-	Log() (io.Writer, error)
-
-	SetHostname(hostname string, aliases ...string) error
-	SetupFirewall(ctx context.Context, config *ExecutorConfig) error
-	Apply(endpoint *NetworkEndpoint) error
-	MountLabel(ctx context.Context, label, target string) error
-	MountTarget(ctx context.Context, source url.URL, target string, mountOptions string) error
-	CopyExistingContent(source string) error
-	Fork() error
-	// Returns two DynamicMultiWriters for stdout and stderr
-	SessionLog(session *SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error)
-	// Returns a function to invoke after the session state has been persisted
-	HandleSessionExit(config *ExecutorConfig, session *SessionConfig) func()
-	ProcessEnv(env []string) []string
-	// LaunchUtility starts a process and provides a way to block on completion and retrieve
-	// it's exit code. This is needed to co-exist with a childreaper.
-	LaunchUtility(UtilityFn) (<-chan int, error)
-	// HandleUtilityExit will process the utility exit. If the pid cannot be matched to a launched
-	// utility process then this returns false and does nothing.
-	HandleUtilityExit(pid, exitCode int) bool
-}
-
-// Tether presents the consumption interface for code needing to run a tether
-type Tether interface {
-	Start() error
-	Stop() error
-	Reload()
-	Register(name string, ext Extension)
-}
-
-// Extension is a very simple extension interface for supporting code that need to be
-// notified when the configuration is reloaded.
-type Extension interface {
-	Start() error
-	Reload(config *ExecutorConfig) error
-	Stop() error
-}
-
-type Config interface {
-	UpdateNetworkEndpoint(e *NetworkEndpoint) error
-	Flush() error
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/mocks.go b/installer/vendor/github.com/vmware/vic/lib/tether/mocks.go
deleted file mode 100644
index e85ab77705..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/mocks.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"net"
-	"time"
-
-	"github.com/vmware/vic/lib/etcconf"
-)
-
-type MockSyscall struct{}
-
-func (m MockSyscall) Mount(source string, target string, fstype string, flags uintptr, data string) error {
-	return nil
-}
-
-func (m MockSyscall) Sethostname(_ []byte) error {
-	return nil
-}
-
-func (m MockSyscall) Symlink(_, _ string) error {
-	return nil
-}
-
-func (m MockSyscall) Unmount(_ string, _ int) error {
-	return nil
-}
-
-type MockHosts struct{}
-
-func (h MockHosts) Load() error {
-	return nil
-}
-
-func (h MockHosts) Save() error {
-	return nil
-}
-
-func (h MockHosts) Copy(conf etcconf.Conf) error {
-	return nil
-}
-
-func (h MockHosts) SetHost(_ string, _ net.IP) {
-}
-
-func (h MockHosts) RemoveHost(_ string) {
-}
-
-func (h MockHosts) RemoveAll() {
-}
-
-func (h MockHosts) HostIP(_ string) []net.IP {
-	return nil
-}
-
-func (h MockHosts) Path() string {
-	return ""
-}
-
-type MockResolvConf struct{}
-
-func (h MockResolvConf) Load() error {
-	return nil
-}
-
-func (h MockResolvConf) Save() error {
-	return nil
-}
-
-func (h MockResolvConf) Copy(conf etcconf.Conf) error {
-	return nil
-}
-
-func (h MockResolvConf) AddNameservers(...net.IP) {
-}
-
-func (h MockResolvConf) RemoveNameservers(...net.IP) {
-}
-
-func (h MockResolvConf) Nameservers() []net.IP {
-	return nil
-}
-
-func (h MockResolvConf) Attempts() uint {
-	return etcconf.DefaultAttempts
-}
-
-func (h MockResolvConf) Timeout() time.Duration {
-	return etcconf.DefaultTimeout
-}
-
-func (h MockResolvConf) SetAttempts(uint) {
-}
-
-func (h MockResolvConf) SetTimeout(time.Duration) {
-}
-
-func (h MockResolvConf) Path() string {
-	return ""
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/net_linux_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/net_linux_test.go
deleted file mode 100644
index e996cc74a8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/net_linux_test.go
+++ /dev/null
@@ -1,245 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package tether
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"strconv"
-	"testing"
-
-	"github.com/vishvananda/netlink"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/etcconf"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-// Utility method to add an interface to Mocked
-// This assigns the interface name and returns the "slot" as a string
-func AddInterface(name string, mocker *Mocker) string {
-	mocker.maxSlot++
-
-	mocker.Interfaces[name] = &Interface{
-		LinkAttrs: netlink.LinkAttrs{
-			Name:  name,
-			Index: mocker.maxSlot,
-		},
-		Up: true,
-	}
-
-	return strconv.Itoa(mocker.maxSlot)
-}
-
-func TestSetIpAddress(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	hFile, err := ioutil.TempFile("", "vic_set_ip_test_hosts")
-	if err != nil {
-		t.Errorf("Failed to create tmp hosts file: %s", err)
-	}
-	rFile, err := ioutil.TempFile("", "vic_set_ip_test_resolv")
-	if err != nil {
-		t.Errorf("Failed to create tmp resolv file: %s", err)
-	}
-
-	// give us a hosts file we can modify
-	defer func(hosts etcconf.Hosts, resolv etcconf.ResolvConf) {
-		Sys.Hosts = hosts
-		Sys.ResolvConf = resolv
-	}(Sys.Hosts, Sys.ResolvConf)
-
-	Sys.Hosts = etcconf.NewHosts(hFile.Name())
-	Sys.ResolvConf = etcconf.NewResolvConf(rFile.Name())
-
-	bridge := AddInterface("eth1", mocker)
-	public := AddInterface("eth2", mocker)
-
-	secondIP, _ := netlink.ParseIPNet("172.16.0.10/24")
-	gwIP, _ := netlink.ParseIPNet("172.16.0.1/24")
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "ipconfig",
-			Name: "tether_test_executor",
-		},
-		Networks: map[string]*executor.NetworkEndpoint{
-			"bridge": {
-				Common: executor.Common{
-					ID: bridge,
-					// interface rename
-					Name: "bridge",
-				},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "bridge",
-					},
-					Default: true,
-					Gateway: *gwIP,
-				},
-				Static: true,
-				IP: &net.IPNet{
-					IP:   localhost,
-					Mask: lmask.Mask,
-				},
-			},
-			"cnet": {
-				Common: executor.Common{
-					ID: bridge,
-					// no interface rename
-				},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "cnet",
-					},
-				},
-				Static: true,
-				IP:     secondIP,
-			},
-			"public": {
-				Common: executor.Common{
-					ID: public,
-					// interface rename
-					Name: "public",
-				},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "public",
-					},
-				},
-				Static: true,
-				IP: &net.IPNet{
-					IP:   gateway,
-					Mask: gmask.Mask,
-				},
-			},
-		},
-	}
-
-	tthr, _, _ := StartTether(t, &cfg, mocker)
-
-	defer func() {
-		// prevent indefinite wait in tether - normally session exit would trigger this
-		tthr.Stop()
-
-		// wait for tether to exit
-		<-mocker.Cleaned
-	}()
-
-	<-mocker.Started
-
-	assert.NotNil(t, mocker.Interfaces["bridge"], "Expected bridge network if endpoints applied correctly")
-	// check addresses
-	bIface, _ := mocker.Interfaces["bridge"].(*Interface)
-	assert.NotNil(t, bIface)
-
-	assert.Equal(t, 2, len(bIface.Addrs), "Expected two addresses on bridge interface")
-
-	eIface, _ := mocker.Interfaces["public"].(*Interface)
-	assert.NotNil(t, eIface)
-
-	assert.Equal(t, 1, len(eIface.Addrs), "Expected one address on public interface")
-}
-
-func TestOutboundRuleAndCmd(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	// give us a hosts file we can modify
-	defer func(hosts etcconf.Hosts, resolv etcconf.ResolvConf) {
-		Sys.Hosts = hosts
-		Sys.ResolvConf = resolv
-	}(Sys.Hosts, Sys.ResolvConf)
-
-	fmt.Printf("Test root dir: %s, hosts: %s\n", Sys.Root, Sys.Hosts.Path())
-
-	bridge := AddInterface("eth1", mocker)
-
-	gwIP, _ := netlink.ParseIPNet("172.16.0.1/24")
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "outboundrule",
-			Name: "tether_test_executor",
-		},
-		Diagnostics: executor.Diagnostics{
-			DebugLevel: 3,
-		},
-		Networks: map[string]*executor.NetworkEndpoint{
-			"bridge": {
-				Common: executor.Common{
-					ID: bridge,
-					// interface rename
-					Name: "bridge",
-				},
-				Network: executor.ContainerNetwork{
-					Common: executor.Common{
-						Name: "bridge",
-					},
-					Default: true,
-					Gateway: *gwIP,
-				},
-				Static: true,
-				IP: &net.IPNet{
-					IP:   localhost,
-					Mask: lmask.Mask,
-				},
-			},
-		},
-
-		Sessions: map[string]*executor.SessionConfig{
-			"outboundrule": {
-				Common: executor.Common{
-					ID:   "outboundrule",
-					Name: "tether_test_session",
-				},
-				Tty:    false,
-				Active: true,
-
-				Cmd: executor.Cmd{
-					// test relative path
-					Path: "./date",
-					Args: []string{"./date", "--reference=/"},
-					Env:  []string{"PATH="},
-					Dir:  "/bin",
-				},
-			},
-		},
-	}
-
-	_, src, _ := StartTether(t, &cfg, mocker)
-
-	fmt.Println("Waiting for tether start")
-	<-mocker.Started
-
-	// wait for tether to exit
-	fmt.Println("Waiting for tether exit")
-	<-mocker.Cleaned
-
-	result := ExecutorConfig{}
-	extraconfig.Decode(src, &result)
-
-	// confirm command ran - necessary to detect early exit due to net config error
-	assert.Equal(t, "true", result.Sessions["outboundrule"].Started, "Expected command to have been started successfully")
-	assert.Equal(t, 0, result.Sessions["outboundrule"].ExitStatus, "Expected command to have exited cleanly")
-
-	// confirm outbound rules configured
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/net_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/net_test.go
deleted file mode 100644
index ab6206b3af..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/net_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"testing"
-
-	"github.com/docker/docker/pkg/stringid"
-
-	"github.com/vmware/vic/lib/config/executor"
-)
-
-func TestSetHostname(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "sethostname",
-			Name: "tether_test_executor",
-		},
-	}
-
-	tthr, _, _ := StartTether(t, &cfg, mocker)
-
-	<-mocker.Started
-
-	// prevent indefinite wait in tether - normally session exit would trigger this
-	tthr.Stop()
-
-	// wait for tether to exit
-	<-mocker.Cleaned
-
-	expected := stringid.TruncateID(cfg.ID)
-	if mocker.Hostname != expected {
-		t.Errorf("expected: %s, actual: %s", expected, mocker.Hostname)
-	}
-}
-
-func TestNoNetwork(t *testing.T) {
-	_, mocker := testSetup(t)
-	defer testTeardown(t, mocker)
-
-	cfg := executor.ExecutorConfig{
-		ExecutorConfigCommon: executor.ExecutorConfigCommon{
-			ID:   "ipconfig",
-			Name: "tether_test_executor",
-		},
-	}
-
-	tthr, _, _ := StartTether(t, &cfg, mocker)
-
-	<-mocker.Started
-
-	// prevent indefinite wait in tether - normally session exit would trigger this
-	tthr.Stop()
-
-	// wait for tether to exit
-	<-mocker.Cleaned
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux.go b/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux.go
deleted file mode 100644
index 03cda5e1d7..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package netfilter
-
-import (
-	"context"
-	"os"
-	"os/exec"
-	"strings"
-
-	"syscall"
-
-	"github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/tether"
-)
-
-//
-// # default
-// # iptables -A INPUT -m state --state ESTABLISHED -i eth0 -j ACCEPT
-
-// # Expose()
-// # iptables -A INPUT -p tcp --dport 7 -i eth0 -j ACCEPT
-//
-// # default on non-bridge
-// # iptables -A INPUT -i eth0 -j REJECT
-//
-// # iptables --list
-//
-// Chain INPUT (policy ACCEPT)
-// target     prot opt source               destination
-// ACCEPT     all  --  anywhere             anywhere             state ESTABLISHED
-// ACCEPT     tcp  --  anywhere             anywhere             tcp dpt:echo
-// REJECT     all  --  anywhere             anywhere             reject-with icmp-port-unreachable
-//
-// Chain FORWARD (policy ACCEPT)
-// target     prot opt source               destination
-//
-// Chain OUTPUT (policy ACCEPT)
-// target     prot opt source               destination
-//
-
-type Chain string
-type State string
-type Protocol string
-type Target string
-type Table string
-type ICMPType string
-
-const (
-	Filter   = Table("filter")
-	Nat      = Table("nat")
-	Mangle   = Table("mangle")
-	Raw      = Table("raw")
-	Security = Table("security")
-
-	Prerouting = Chain("PREROUTING")
-	Input      = Chain("INPUT")
-	Forward    = Chain("FORWARD")
-	Output     = Chain("OUTPUT")
-
-	Invalid     = State("INVALID")
-	Established = State("ESTABLISHED")
-	New         = State("NEW")
-	Related     = State("RELATED")
-	Untracked   = State("UNTRACKED")
-
-	TCP  = Protocol("tcp")
-	UDP  = Protocol("udp")
-	ICMP = Protocol("icmp")
-
-	Drop     = Target("DROP")
-	Accept   = Target("ACCEPT")
-	Queue    = Target("QUEUE")
-	NoQueue  = Target("NFQUEUE")
-	Reject   = Target("REJECT")
-	Redirect = Target("REDIRECT")
-
-	EchoRequest = ICMPType("echo-request")
-	EchoReply   = ICMPType("echo-reply")
-)
-
-type Rule struct {
-	Table
-	Chain
-	States []State
-	ICMPType
-
-	Protocol
-	Target
-
-	Interface       string
-	SourceAddresses []string
-	FromPort        string
-	SrcPort         string
-	ToPort          string
-}
-
-func (r *Rule) Commit(ctx context.Context) tether.UtilityFn {
-	return iptables(ctx, r.args())
-}
-
-func (r *Rule) args() []string {
-	var args []string
-
-	if r.Table != "" {
-		args = append(args, "-t", string(r.Table))
-	}
-
-	if r.Chain == Input || r.Chain == Output {
-		args = append(args, "-A", "VIC")
-	} else {
-		args = append(args, "-A", string(r.Chain))
-	}
-
-	if r.Protocol != "" {
-		args = append(args, "-p", string(r.Protocol))
-	}
-
-	if r.ICMPType != "" {
-		args = append(args, "--icmp-type", string(r.ICMPType))
-	}
-
-	if len(r.SourceAddresses) > 0 {
-		args = append(args, "-s", strings.Join(r.SourceAddresses, ","))
-	}
-
-	if r.FromPort != "" {
-		args = append(args, "--dport", r.FromPort)
-	}
-
-	if r.SrcPort != "" {
-		args = append(args, "--sport", r.SrcPort)
-	}
-
-	if len(r.States) > 0 {
-		args = append(args, "-m", "state", "--state", joinStates(r.States))
-	}
-
-	if r.Interface != "" {
-		if r.Chain == Output {
-			args = append(args, "-o", r.Interface)
-		} else {
-			args = append(args, "-i", r.Interface)
-		}
-	}
-
-	args = append(args, "-j", string(r.Target))
-
-	if r.ToPort != "" {
-		args = append(args, "--to-port", r.ToPort)
-	}
-
-	return args
-}
-
-func iptables(ctx context.Context, args []string) tether.UtilityFn {
-	logrus.Infof("Execing iptables %q", args)
-
-	// #nosec: Subprocess launching with variable
-	cmd := &exec.Cmd{
-		Path: "/lib64/ld-linux-x86-64.so.2",
-		Dir:  "/",
-		Args: append([]string{"/lib64/ld-linux-x86-64.so.2", "/iptables"}, args...),
-		SysProcAttr: &syscall.SysProcAttr{
-			Chroot: "/.tether",
-		},
-	}
-
-	return func() (*os.Process, error) {
-		return os.StartProcess(cmd.Path, cmd.Args, &os.ProcAttr{
-			Dir: cmd.Dir,
-			Sys: cmd.SysProcAttr,
-		})
-	}
-}
-
-func Flush(ctx context.Context, chain string) tether.UtilityFn {
-	args := []string{"-F"}
-	if chain != "" {
-		args = append(args, chain)
-	}
-
-	return iptables(ctx, args)
-}
-
-func Return(ctx context.Context, chain string) tether.UtilityFn {
-	return iptables(ctx, []string{"-A", chain, "-j", "RETURN"})
-}
-
-func Policy(ctx context.Context, chain Chain, target Target) tether.UtilityFn {
-	return iptables(ctx, []string{"-P", string(chain), string(target)})
-}
-
-func joinStates(states []State) string {
-	tmp := make([]string, len(states))
-	for i, v := range states {
-		tmp[i] = string(v)
-	}
-	return strings.Join(tmp, ",")
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux_test.go
deleted file mode 100644
index 7ccc540b3b..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/netfilter/netfilter_linux_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package netfilter
-
-import (
-	"strings"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type input struct {
-	r        *Rule
-	expected string
-}
-
-func TestArgs(t *testing.T) {
-	input := []input{
-		{
-			&Rule{
-				Chain:     Input,
-				States:    []State{Established},
-				Interface: "external",
-				Target:    Accept,
-			},
-			"-A VIC -m state --state ESTABLISHED -i external -j ACCEPT",
-		},
-		{
-			&Rule{
-				Chain:     Input,
-				Protocol:  TCP,
-				FromPort:  "7",
-				Interface: "external",
-				Target:    Accept,
-			},
-			"-A VIC -p tcp --dport 7 -i external -j ACCEPT",
-		},
-		{
-			&Rule{
-				Chain:     Input,
-				Interface: "external",
-				Target:    Reject,
-			},
-			"-A VIC -i external -j REJECT",
-		},
-		{
-			&Rule{
-				Table:     Nat,
-				Chain:     Prerouting,
-				Interface: "external",
-				Protocol:  TCP,
-				FromPort:  "80",
-				Target:    Redirect,
-				ToPort:    "8080",
-			},
-			"-t nat -A PREROUTING -p tcp --dport 80 -i external -j REDIRECT --to-port 8080",
-		},
-	}
-
-	for _, rule := range input {
-		args := rule.r.args()
-
-		if !assert.Equal(t, strings.Join(args, " "), rule.expected) {
-			return
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux.go b/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux.go
deleted file mode 100644
index e6791a532a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux.go
+++ /dev/null
@@ -1,1228 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"net/url"
-	"os"
-	"path"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"sync"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/d2g/dhcp4"
-	"github.com/docker/docker/pkg/archive"
-	// need to use libcontainer for user validation, for os/user package cannot find user here if container image is busybox
-	"github.com/opencontainers/runc/libcontainer/user"
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/vic/lib/dhcp"
-	"github.com/vmware/vic/lib/dhcp/client"
-	"github.com/vmware/vic/lib/etcconf"
-	"github.com/vmware/vic/pkg/ip"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vmw-guestinfo/rpcout"
-)
-
-var (
-	defaultExecUser = &user.ExecUser{
-		Uid:  syscall.Getuid(),
-		Gid:  syscall.Getgid(),
-		Home: "/",
-	}
-
-	filesForMinOSLinux = map[string]os.FileMode{
-		"/etc/hostname":            0644,
-		"/etc/hosts":               0644,
-		"/etc/resolv.conf":         0644,
-		"/.tether/etc/hostname":    0644,
-		"/.tether/etc/hosts":       0644,
-		"/.tether/etc/resolv.conf": 0644,
-	}
-)
-
-const (
-	hostnameFile          = "/etc/hostname"
-	hostnameFileBindSrc   = "/.tether/etc/hostname"
-	hostsPathBindSrc      = "/.tether/etc/hosts"
-	resolvConfPathBindSrc = "/.tether/etc/resolv.conf"
-	byLabelDir            = "/dev/disk/by-label"
-
-	pciDevPath         = "/sys/bus/pci/devices"
-	nfsFileSystemType  = "nfs"
-	ext4FileSystemType = "ext4"
-	bridgeTableNumber  = 201
-
-	// directory in which to perform the direct mount of disk for bind mount to actual
-	// target
-	diskBindBase = "/.filesystem-by-label/"
-	// used to isolate applications from the lost+found in the root of ext4
-	volumeDataDir = "/.vic.vol.data"
-
-	// temp directory to copy existing data to mounts
-	bindDir = "/.bind"
-)
-
-type BaseOperations struct {
-	dhcpLoops    map[string]chan struct{}
-	dynEndpoints map[string][]*NetworkEndpoint
-	config       Config
-
-	// Exclusive access to utilityPids table
-	utilityPidMutex sync.Mutex
-	// set of child PIDs for one-off non-persistent processes
-	utilityPids map[int]chan int
-}
-
-// NetLink gives us an interface to the netlink calls used so that
-// we can test the calling code.
-type Netlink interface {
-	LinkByName(string) (netlink.Link, error)
-	LinkSetName(netlink.Link, string) error
-	LinkSetDown(netlink.Link) error
-	LinkSetUp(netlink.Link) error
-	LinkSetAlias(netlink.Link, string) error
-	AddrList(netlink.Link, int) ([]netlink.Addr, error)
-	AddrAdd(netlink.Link, *netlink.Addr) error
-	AddrDel(netlink.Link, *netlink.Addr) error
-	RouteAdd(*netlink.Route) error
-	RouteDel(*netlink.Route) error
-	RuleList(family int) ([]netlink.Rule, error)
-	// Not quite netlink, but tightly associated
-
-	LinkBySlot(slot int32) (netlink.Link, error)
-}
-
-func (t *BaseOperations) LinkByName(name string) (netlink.Link, error) {
-	return netlink.LinkByName(name)
-}
-
-func (t *BaseOperations) LinkSetName(link netlink.Link, name string) error {
-	return netlink.LinkSetName(link, name)
-}
-
-func (t *BaseOperations) LinkSetDown(link netlink.Link) error {
-	return netlink.LinkSetDown(link)
-}
-
-func (t *BaseOperations) LinkSetUp(link netlink.Link) error {
-	return netlink.LinkSetUp(link)
-}
-
-func (t *BaseOperations) LinkSetAlias(link netlink.Link, alias string) error {
-	return netlink.LinkSetAlias(link, alias)
-}
-
-func (t *BaseOperations) AddrList(link netlink.Link, family int) ([]netlink.Addr, error) {
-	return netlink.AddrList(link, family)
-}
-
-func (t *BaseOperations) AddrAdd(link netlink.Link, addr *netlink.Addr) error {
-	return netlink.AddrAdd(link, addr)
-}
-
-func (t *BaseOperations) AddrDel(link netlink.Link, addr *netlink.Addr) error {
-	return netlink.AddrDel(link, addr)
-}
-
-func (t *BaseOperations) RouteAdd(route *netlink.Route) error {
-	return netlink.RouteAdd(route)
-}
-
-func (t *BaseOperations) RouteDel(route *netlink.Route) error {
-	return netlink.RouteDel(route)
-}
-
-func (t *BaseOperations) RuleList(family int) ([]netlink.Rule, error) {
-	return netlink.RuleList(family)
-}
-
-func (t *BaseOperations) LinkBySlot(slot int32) (netlink.Link, error) {
-	pciPath, err := slotToPCIPath(slot, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	name, err := pciToLinkName(pciPath)
-	if err != nil {
-		return nil, err
-	}
-
-	log.Debugf("got link name: %#v", name)
-	return t.LinkByName(name)
-}
-
-// SetHostname sets both the kernel hostname and /etc/hostname to the specified string
-func (t *BaseOperations) SetHostname(hostname string, aliases ...string) error {
-	defer trace.End(trace.Begin("setting hostname to " + hostname))
-
-	old, err := os.Hostname()
-	if err != nil {
-		log.Warnf("Unable to get current hostname - will not be able to revert on failure: %s", err)
-	}
-
-	err = Sys.Syscall.Sethostname([]byte(hostname))
-	if err != nil {
-		log.Errorf("Unable to set hostname: %s", err)
-		return err
-	}
-	log.Debugf("Updated kernel hostname")
-
-	// bind-mount /.tether/etc/hostname to /etc/hostname
-	if err = bindMount(hostnameFileBindSrc, hostnameFile); err != nil {
-		return err
-	}
-
-	// update /etc/hostname to match
-	err = ioutil.WriteFile(hostnameFile, []byte(hostname), 0644)
-	if err != nil {
-		log.Errorf("Failed to update hostname in %s", hostnameFile)
-
-		// revert the hostname
-		if old != "" {
-			log.Warnf("Reverting kernel hostname to %s", old)
-			err2 := Sys.Syscall.Sethostname([]byte(old))
-			if err2 != nil {
-				log.Errorf("Unable to revert kernel hostname - kernel and hostname file are out of sync! Error: %s", err2)
-			}
-		}
-
-		return err
-	}
-
-	if err := BindSys.Hosts.Load(); err != nil {
-		log.Errorf("Unable to load existing /etc/hosts file - modifications since last load will be overwritten: %s", err)
-	}
-
-	// add entry to hosts for resolution without nameservers
-	lo4 := net.IPv4(127, 0, 1, 1)
-	for _, a := range append(aliases, hostname) {
-		BindSys.Hosts.SetHost(a, lo4)
-		BindSys.Hosts.SetHost(a, net.IPv6loopback)
-	}
-
-	if err = bindMountAndSave(Sys.Hosts, BindSys.Hosts); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func slotToPCIPath(pciSlot int32, fun int32) (string, error) {
-	// see https://kb.vmware.com/kb/2047927
-	dev := pciSlot & 0x1f        // DDDDD
-	bus := (pciSlot >> 5) & 0x1f // BBBBB
-	if fun == 0 {
-		fun = (pciSlot >> 10) & 0x7 // FFF
-	}
-	if bus == 0 {
-		return path.Join(pciDevPath, fmt.Sprintf("0000:%02x:%02x.%d", bus, dev, fun)), nil
-	}
-
-	// device on secondary bus, prepend pci bridge address, pciBridge0.pciSlotNumber is "17" aka "0x11"
-	bridgeSlot := 0x11 + (bus - 1)
-	bridgeAddr, err := slotToPCIPath(bridgeSlot, fun)
-	if err != nil {
-		return "", err
-	}
-
-	return path.Join(bridgeAddr, fmt.Sprintf("0000:*:%02x.0", dev)), nil
-}
-
-func pciToLinkName(pciPath string) (string, error) {
-	p := filepath.Join(pciPath, "net", "*")
-	matches, err := filepath.Glob(p)
-	if err != nil {
-		return "", err
-	}
-
-	if len(matches) != 1 {
-		return "", fmt.Errorf("%d eth interfaces match %s (%v)", len(matches), p, matches)
-	}
-
-	return path.Base(matches[0]), nil
-}
-
-func renameLink(t Netlink, link netlink.Link, slot int32, endpoint *NetworkEndpoint) (rlink netlink.Link, err error) {
-	rlink = link
-	defer func() {
-		// we still need to ensure that the link is up irrespective of path
-		err = t.LinkSetUp(link)
-		if err != nil {
-			err = fmt.Errorf("failed to bring link %s up: %s", link.Attrs().Name, err)
-		}
-	}()
-
-	if link.Attrs().Name == endpoint.Name || link.Attrs().Alias == endpoint.Name || endpoint.Name == "" {
-		// if the network is already identified, whether as primary name or alias it doesn't need repeating.
-		// if the name is empty then it should not be aliases or named directly. IPAM data should still be applied.
-		return link, nil
-	}
-
-	if strings.HasPrefix(link.Attrs().Name, "eth") {
-		log.Infof("Renaming link %s to %s", link.Attrs().Name, endpoint.Name)
-
-		err := t.LinkSetDown(link)
-		if err != nil {
-			detail := fmt.Sprintf("failed to set link %s down for rename: %s", link.Attrs().Name, err)
-			return nil, errors.New(detail)
-		}
-
-		err = t.LinkSetName(link, endpoint.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		// reacquire link with updated attributes
-		link, err := t.LinkBySlot(slot)
-		if err != nil {
-			detail := fmt.Sprintf("unable to reacquire link %s after rename pass: %s", link.Attrs().Name, err)
-			return nil, errors.New(detail)
-		}
-
-		return link, nil
-	}
-
-	if link.Attrs().Alias == "" {
-		log.Infof("Aliasing link %s to %s", link.Attrs().Name, endpoint.Name)
-		err := t.LinkSetAlias(link, endpoint.Name)
-		if err != nil {
-			return nil, err
-		}
-
-		// reacquire link with updated attributes
-		link, err := t.LinkBySlot(slot)
-		if err != nil {
-			detail := fmt.Sprintf("unable to reacquire link %s after rename pass: %s", link.Attrs().Name, err)
-			return nil, errors.New(detail)
-		}
-
-		return link, nil
-	}
-
-	log.Warnf("Unable to add additional alias on link %s for %s", link.Attrs().Name, endpoint.Name)
-	return link, nil
-}
-
-func getDynamicIP(t Netlink, link netlink.Link, endpoint *NetworkEndpoint) (client.Client, error) {
-	var ack *dhcp.Packet
-	var err error
-
-	// use dhcp to acquire address
-	dc, err := client.NewClient(link.Attrs().Index, link.Attrs().HardwareAddr)
-	if err != nil {
-		return nil, err
-	}
-
-	params := []byte{byte(dhcp4.OptionSubnetMask)}
-	if ip.IsUnspecifiedIP(endpoint.Network.Gateway.IP) {
-		params = append(params, byte(dhcp4.OptionRouter))
-	}
-	if len(endpoint.Network.Nameservers) == 0 {
-		params = append(params, byte(dhcp4.OptionDomainNameServer))
-	}
-
-	dc.SetParameterRequestList(params...)
-
-	err = dc.Request()
-	if err != nil {
-		log.Errorf("error sending dhcp request: %s", err)
-		return nil, err
-	}
-
-	ack = dc.LastAck()
-	if ack.YourIP() == nil || ack.SubnetMask() == nil {
-		err = fmt.Errorf("dhcp assigned nil ip or subnet mask")
-		log.Error(err)
-		return nil, err
-	}
-
-	log.Infof("DHCP response: IP=%s, SubnetMask=%s, Gateway=%s, DNS=%s, Lease Time=%s", ack.YourIP(), ack.SubnetMask(), ack.Gateway(), ack.DNS(), ack.LeaseTime())
-	defer func() {
-		if err != nil && ack != nil {
-			dc.Release()
-		}
-	}()
-
-	return dc, nil
-}
-
-func updateEndpoint(newIP *net.IPNet, endpoint *NetworkEndpoint) {
-	log.Debugf("updateEndpoint(%s, %+v)", newIP, endpoint)
-
-	dhcp := endpoint.DHCP
-	if dhcp == nil {
-		endpoint.Assigned = *newIP
-		endpoint.Network.Assigned.Gateway = endpoint.Network.Gateway
-		endpoint.Network.Assigned.Nameservers = endpoint.Network.Nameservers
-		return
-	}
-
-	endpoint.Assigned = dhcp.Assigned
-	endpoint.Network.Assigned.Gateway = dhcp.Gateway
-	if len(dhcp.Nameservers) > 0 {
-		endpoint.Network.Assigned.Nameservers = dhcp.Nameservers
-	}
-}
-
-func linkAddrUpdate(old, new *net.IPNet, t Netlink, link netlink.Link) error {
-	log.Infof("setting ip address %s for link %s", new, link.Attrs().Name)
-
-	if old != nil && !old.IP.Equal(new.IP) {
-		log.Debugf("removing old address %s", old)
-		if err := t.AddrDel(link, &netlink.Addr{IPNet: old}); err != nil {
-			if errno, ok := err.(syscall.Errno); !ok || errno != syscall.EADDRNOTAVAIL {
-				log.Errorf("failed to remove existing address %s: %s", old, err)
-				return err
-			}
-		}
-
-		log.Debugf("removed old address %s for link %s", old, link.Attrs().Name)
-	}
-
-	// assign IP to NIC
-	if err := t.AddrAdd(link, &netlink.Addr{IPNet: new}); err != nil {
-		if errno, ok := err.(syscall.Errno); !ok || errno != syscall.EEXIST {
-			log.Errorf("failed to assign ip %s for link %s", new, link.Attrs().Name)
-			return err
-
-		}
-
-		log.Warnf("address %s already set on interface %s", new, link.Attrs().Name)
-	}
-
-	log.Debugf("added address %s to link %s", new, link.Attrs().Name)
-	return nil
-}
-
-func updateRoutes(t Netlink, link netlink.Link, endpoint *NetworkEndpoint) error {
-	gw := endpoint.Network.Assigned.Gateway
-	if ip.IsUnspecifiedIP(gw.IP) {
-		return nil
-	}
-
-	if endpoint.Network.Default {
-		return updateDefaultRoute(t, link, endpoint)
-	}
-
-	for _, d := range endpoint.Network.Destinations {
-		r := &netlink.Route{
-			LinkIndex: link.Attrs().Index,
-			Dst:       &d,
-			Gw:        gw.IP,
-		}
-
-		if err := t.RouteAdd(r); err != nil && !os.IsNotExist(err) {
-			log.Errorf("failed to add route for destination %s via gateway %s", d, gw.IP)
-		}
-	}
-
-	return nil
-}
-
-func bridgeTableExists(t Netlink) bool {
-	rules, err := t.RuleList(syscall.AF_INET)
-	if err != nil {
-		return false
-	}
-
-	for _, r := range rules {
-		if r.Table == bridgeTableNumber {
-			return true
-		}
-	}
-
-	return false
-}
-
-func updateDefaultRoute(t Netlink, link netlink.Link, endpoint *NetworkEndpoint) error {
-	gw := endpoint.Network.Assigned.Gateway
-	// Add routes
-	if !endpoint.Network.Default || ip.IsUnspecifiedIP(gw.IP) {
-		log.Debugf("not setting route for network: default=%v gateway=%s", endpoint.Network.Default, gw.IP)
-		return nil
-	}
-
-	// #nosec: Errors unhandled.
-	_, defaultNet, _ := net.ParseCIDR("0.0.0.0/0")
-	// delete default route first
-	if err := t.RouteDel(&netlink.Route{LinkIndex: link.Attrs().Index, Dst: defaultNet}); err != nil {
-		if errno, ok := err.(syscall.Errno); !ok || errno != syscall.ESRCH {
-			return fmt.Errorf("could not update default route: %s", err)
-		}
-	}
-
-	// delete the default route for the bridge.out table, if it exists
-	bTablePresent := bridgeTableExists(t)
-	if bTablePresent {
-		if err := t.RouteDel(&netlink.Route{LinkIndex: link.Attrs().Index, Dst: defaultNet, Table: bridgeTableNumber}); err != nil {
-			if errno, ok := err.(syscall.Errno); !ok || errno != syscall.ESRCH {
-				return fmt.Errorf("could not update default route for bridge.out table: %s", err)
-			}
-		}
-	}
-
-	log.Infof("Setting default gateway to %s", gw.IP)
-	route := &netlink.Route{LinkIndex: link.Attrs().Index, Dst: defaultNet, Gw: gw.IP}
-	if err := t.RouteAdd(route); err != nil {
-		return fmt.Errorf("failed to add gateway route for endpoint %s: %s", endpoint.Network.Name, err)
-	}
-
-	if bTablePresent {
-		route = &netlink.Route{LinkIndex: link.Attrs().Index, Dst: defaultNet, Gw: gw.IP, Table: bridgeTableNumber}
-		if err := t.RouteAdd(route); err != nil {
-			return fmt.Errorf("failed to add gateway route for table bridge.out for endpoint %s: %s", endpoint.Network.Name, err)
-		}
-	}
-
-	log.Infof("updated default route to %s interface, gateway: %s", endpoint.Network.Name, gw.IP)
-	return nil
-}
-
-func (t *BaseOperations) updateHosts(endpoint *NetworkEndpoint) error {
-	log.Debugf("%+v", endpoint)
-	// Add /etc/hosts entry
-	if endpoint.Network.Name == "" {
-		return nil
-	}
-
-	if err := BindSys.Hosts.Load(); err != nil {
-		log.Errorf("Unable to load existing /etc/hosts file - modifications since last load will be overwritten: %s", err)
-	}
-
-	BindSys.Hosts.SetHost(fmt.Sprintf("%s.localhost", endpoint.Network.Name), endpoint.Assigned.IP)
-
-	if err := bindMountAndSave(Sys.Hosts, BindSys.Hosts); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *BaseOperations) updateNameservers(endpoint *NetworkEndpoint) error {
-	gw := endpoint.Network.Assigned.Gateway
-	ns := endpoint.Network.Assigned.Nameservers
-	// if `--dns-server` option is supplied at VCH creation, do not overwrite with
-	// dhcp-provided name servers, and make sure they appear at the top of the list
-	if len(endpoint.Network.Nameservers) > 0 {
-		ns = append(endpoint.Network.Nameservers, ns...)
-	}
-	// Add nameservers
-	// This is incredibly trivial for now - should be updated to a less messy approach
-	if len(ns) > 0 {
-		BindSys.ResolvConf.AddNameservers(ns...)
-		log.Infof("Added nameservers: %+v", ns)
-	} else if !ip.IsUnspecifiedIP(gw.IP) {
-		BindSys.ResolvConf.AddNameservers(gw.IP)
-		log.Infof("Added nameserver: %s", gw.IP)
-	}
-
-	if err := bindMountAndSave(Sys.ResolvConf, BindSys.ResolvConf); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func (t *BaseOperations) Apply(endpoint *NetworkEndpoint) error {
-	defer trace.End(trace.Begin("applying endpoint configuration for " + endpoint.Network.Name))
-
-	return ApplyEndpoint(t, t, endpoint)
-}
-
-func ApplyEndpoint(nl Netlink, t *BaseOperations, endpoint *NetworkEndpoint) error {
-	if endpoint.configured {
-		log.Infof("skipping applying config for network %s as it has been applied already", endpoint.Network.Name)
-		return nil // already applied
-	}
-
-	// Locate interface
-	slot, err := strconv.Atoi(endpoint.ID)
-	if err != nil {
-		return fmt.Errorf("endpoint ID must be a base10 numeric pci slot identifier: %s", err)
-	}
-
-	defer func() {
-		if err == nil {
-			log.Infof("successfully applied config for network %s", endpoint.Network.Name)
-			endpoint.configured = true
-		}
-	}()
-
-	var link netlink.Link
-	link, err = nl.LinkBySlot(int32(slot))
-	if err != nil {
-		return fmt.Errorf("unable to acquire reference to link %s: %s", endpoint.ID, err)
-	}
-
-	// rename the link if needed
-	link, err = renameLink(nl, link, int32(slot), endpoint)
-	if err != nil {
-		return fmt.Errorf("unable to reacquire link %s after rename pass: %s", endpoint.ID, err)
-	}
-
-	var dc client.Client
-	defer func() {
-		if err != nil && dc != nil {
-			dc.Release()
-		}
-	}()
-
-	var newIP *net.IPNet
-
-	if endpoint.IsDynamic() && endpoint.DHCP == nil {
-		if e, ok := t.dynEndpoints[endpoint.ID]; ok {
-			// endpoint shares NIC, copy over DHCP
-			endpoint.DHCP = e[0].DHCP
-		}
-	}
-
-	log.Debugf("%+v", endpoint)
-	if endpoint.IsDynamic() {
-		if endpoint.DHCP == nil {
-			dc, err = getDynamicIP(nl, link, endpoint)
-			if err != nil {
-				return err
-			}
-
-			ack := dc.LastAck()
-			endpoint.DHCP = &DHCPInfo{
-				Assigned:    net.IPNet{IP: ack.YourIP(), Mask: ack.SubnetMask()},
-				Nameservers: ack.DNS(),
-				Gateway:     net.IPNet{IP: ack.Gateway(), Mask: ack.SubnetMask()},
-			}
-		}
-		newIP = &endpoint.DHCP.Assigned
-	} else {
-		newIP = endpoint.IP
-		if newIP.IP.Equal(net.IPv4zero) {
-			// managed externally
-			return nil
-		}
-	}
-
-	var old *net.IPNet
-	if !ip.IsUnspecifiedIP(endpoint.Assigned.IP) {
-		old = &endpoint.Assigned
-	}
-
-	if err = linkAddrUpdate(old, newIP, nl, link); err != nil {
-		return err
-	}
-
-	updateEndpoint(newIP, endpoint)
-
-	if err = updateRoutes(nl, link, endpoint); err != nil {
-		return err
-	}
-
-	if err = t.updateHosts(endpoint); err != nil {
-		return err
-	}
-
-	Sys.ResolvConf.RemoveNameservers(endpoint.Network.Assigned.Nameservers...)
-	if err = t.updateNameservers(endpoint); err != nil {
-		return err
-	}
-
-	if endpoint.IsDynamic() {
-		eps := t.dynEndpoints[endpoint.ID]
-		found := false
-		for _, e := range eps {
-			if e == endpoint {
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			eps = append(eps, endpoint)
-			t.dynEndpoints[endpoint.ID] = eps
-		}
-	}
-
-	// add renew/release loop if necessary
-	if dc != nil {
-		if _, ok := t.dhcpLoops[endpoint.ID]; !ok {
-			stop := make(chan struct{})
-			if err != nil {
-				log.Errorf("could not make DHCP client id for link %s: %s", link.Attrs().Name, err)
-			} else {
-				t.dhcpLoops[endpoint.ID] = stop
-				go t.dhcpLoop(stop, endpoint, dc)
-			}
-		}
-	}
-
-	return nil
-}
-
-func (t *BaseOperations) dhcpLoop(stop chan struct{}, e *NetworkEndpoint, dc client.Client) {
-	divisor := time.Duration(2)
-	exp := time.After(dc.LastAck().LeaseTime() / 2)
-	for {
-		select {
-		case <-stop:
-			// release the ip
-			log.Infof("releasing IP address for network %s", e.Name)
-			dc.Release()
-			return
-
-		case <-exp:
-			log.Infof("renewing IP address for network %s", e.Name)
-			err := dc.Renew()
-			if err != nil {
-				log.Errorf("failed to renew ip address for network %s: %s", e.Name, err)
-
-				// wait half of the remaining lease time before trying again
-				divisor *= 2
-				duration := dc.LastAck().LeaseTime() / divisor
-
-				// for now go with a minimum retry of 1min
-				if duration < time.Minute {
-					duration = time.Minute
-				}
-
-				exp = time.After(duration)
-
-				continue
-			}
-
-			ack := dc.LastAck()
-			log.Infof("successfully renewed ip address: IP=%s, SubnetMask=%s, Gateway=%s, DNS=%s, Lease Time=%s", ack.YourIP(), ack.SubnetMask(), ack.Gateway(), ack.DNS(), ack.LeaseTime())
-
-			e.DHCP = &DHCPInfo{
-				Assigned:    net.IPNet{IP: ack.YourIP(), Mask: ack.SubnetMask()},
-				Gateway:     net.IPNet{IP: ack.Gateway(), Mask: ack.SubnetMask()},
-				Nameservers: ack.DNS(),
-			}
-
-			// TODO: determine if there are actually any changes to apply before performing updates
-			e.configured = false
-			t.Apply(e)
-			if err = t.config.UpdateNetworkEndpoint(e); err != nil {
-				log.Error(err)
-			}
-			// update any endpoints that share this NIC
-			for _, d := range t.dynEndpoints[e.ID] {
-				if e == d {
-					// already applied above
-					continue
-				}
-
-				d.DHCP = e.DHCP
-				d.configured = false
-				t.Apply(d)
-				if err = t.config.UpdateNetworkEndpoint(d); err != nil {
-					log.Error(err)
-				}
-			}
-
-			t.config.Flush()
-
-			exp = time.After(ack.LeaseTime() / 2)
-		}
-	}
-}
-
-// MountLabel performs a mount with the label and target being absolute paths
-func (t *BaseOperations) MountLabel(ctx context.Context, label, target string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Mounting %s on %s", label, target)))
-
-	bindTarget := path.Join(BindSys.Root, diskBindBase, label)
-
-	fi, err := os.Stat(target)
-	if err != nil {
-		// #nosec
-		if err := os.MkdirAll(target, 0744); err != nil {
-			// same as MountFileSystem error for consistency
-			return fmt.Errorf("unable to create mount point %s: %s", target, err)
-		}
-	}
-
-	// convert the label to a filesystem path
-	label = "/dev/disk/by-label/" + label
-
-	var e1, e2 error
-	_, e1 = os.Stat(bindTarget)
-	if e1 == nil {
-		// bindTarget exists, check whether or not bindTarget is a mount point
-		e2 = os.Remove(bindTarget)
-	}
-
-	if (e1 == nil && e2 == nil) || os.IsNotExist(e1) {
-		// #nosec
-		if err := os.MkdirAll(bindTarget, 0744); err != nil {
-			return fmt.Errorf("unable to create mount point %s: %s", bindTarget, err)
-		}
-		if err := mountDeviceLabel(ctx, label, bindTarget); err != nil {
-			return err
-		}
-	}
-
-	// at this point bindTarget should be mounted successfully
-	mntsrc := path.Join(bindTarget, volumeDataDir)
-	mnttype := "bind"
-	mntflags := uintptr(syscall.MS_BIND)
-	// if the volume contains a volumeDataDir directory then mount that instead of the root of the filesystem
-	// if we cannot read it we go with the root of the filesystem
-	_, err = os.Stat(mntsrc)
-	if err != nil {
-		if os.IsNotExist(err) {
-			// if there's not such directory then revert to using the device directly
-			log.Info("No " + volumeDataDir + " data directory in volume, mounting filesystem directly")
-			mntsrc = label
-			mnttype = ext4FileSystemType
-			mntflags = syscall.MS_NOATIME
-		} else {
-			return fmt.Errorf("unable to determine whether lost+found masking is required: %s", err)
-		}
-	}
-
-	if err := Sys.Syscall.Mount(mntsrc, target, mnttype, mntflags, ""); err != nil {
-		// consistent with MountFileSystem
-		detail := fmt.Sprintf("mounting %s on %s failed: %s", label, target, err)
-		return errors.New(detail)
-	}
-
-	// change the ownership of the target directory to the original uid/gid
-	if fi != nil {
-		sys, ok := fi.Sys().(*syscall.Stat_t)
-		if !ok {
-			return fmt.Errorf("unable to get uid/gid from existing target directory %s", target)
-		}
-		uid := int(sys.Uid)
-		gid := int(sys.Gid)
-
-		if err := os.Chown(target, uid, gid); err != nil {
-			return fmt.Errorf("unable to change the owner of the mount point %s: %s", target, err)
-		}
-	}
-	return nil
-}
-
-// mountDeviceLabel mounts the device to target
-func mountDeviceLabel(ctx context.Context, label string, target string) error {
-	// wait for device label to show up until the ctx deadline exceeds.
-WaitForDevice:
-	for {
-		select {
-		case <-ctx.Done():
-			detail := fmt.Sprintf("timed out waiting for %s to appear", label)
-			return errors.New(detail)
-		default:
-			_, err := os.Stat(label)
-			if err == nil || !os.IsNotExist(err) {
-				break WaitForDevice
-			}
-			// sleep for 1 ms to reduce pressure on cpu
-			time.Sleep(time.Millisecond)
-		}
-	}
-
-	if err := Sys.Syscall.Mount(label, target, ext4FileSystemType, syscall.MS_NOATIME, ""); err != nil {
-		// consistent with MountFileSystem
-		detail := fmt.Sprintf("Actual mount: mounting %s on %s failed: %s", label, target, err)
-		return errors.New(detail)
-	}
-
-	return nil
-}
-
-// MountTarget performs a mount based on the target path from the source url
-// This assumes that the source url is valid and available.
-func (t *BaseOperations) MountTarget(ctx context.Context, source url.URL, target string, mountOptions string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Mounting %s on %s", source.String(), target)))
-
-	if err := os.MkdirAll(target, 0644); err != nil {
-		// same as MountLabel error for consistency
-		return fmt.Errorf("unable to create mount point %s: %s", target, err)
-	}
-
-	rawSource := source.Hostname() + ":/" + source.Path
-	// NOTE: by default we are supporting "NOATIME" and it can be configurable later. this must be specfied as a flag.
-	// Additionally, we must parse out the "ro" option and supply it as a flag as well for this flavor of the mount call.
-	if err := Sys.Syscall.Mount(rawSource, target, nfsFileSystemType, syscall.MS_NOATIME, mountOptions); err != nil {
-		log.Errorf("mounting %s on %s failed: %s", source.String(), target, err)
-		return err
-	}
-
-	return nil
-}
-
-// CopyExistingContent copies the underlying files shadowed by a mount on a directory
-// to the volume mounted on the directory
-// see bug https://github.com/vmware/vic/issues/3482
-func (t *BaseOperations) CopyExistingContent(source string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("copyExistingContent from %s", source)))
-
-	source = filepath.Clean(source)
-
-	bind := path.Join(BindSys.Root, bindDir)
-
-	// if mounted volume is not empty skip the copy task
-	if empty, err := isEmpty(source); err != nil || !empty {
-		if err != nil {
-			log.Errorf("error checking directory for contents %s: %+v", source, err)
-			return err
-		}
-		log.Debugf("Skipping copy as volume %s is not empty", source)
-		return nil
-	}
-
-	log.Debugf("creating directory %s", bind)
-	if err := os.MkdirAll(bind, 0644); err != nil {
-		log.Errorf("error creating directory %s: %+v", bind, err)
-		return err
-	}
-
-	// remove dir
-	defer func() {
-		log.Debugf("removing %s", bind)
-		if err := os.Remove(bind); err != nil {
-			log.Errorf("error removing directory %s: %+v", bind, err)
-		}
-	}()
-
-	parentDir := filepath.Dir(source)
-	// mount the parent directory of the source to bind
-	// e.g if source is /foo/bar, mount /foo to ./bind
-	log.Debugf("mounting %s on %s", parentDir, bind)
-	if err := Sys.Syscall.Mount(parentDir, bind, ext4FileSystemType, syscall.MS_BIND, ""); err != nil {
-		log.Errorf("error mounting to %s: %+v", bind, err)
-		return err
-	}
-
-	// unmount
-	defer func() {
-		log.Debugf("unmounting %s", bind)
-		if err := Sys.Syscall.Unmount(bind, syscall.MNT_DETACH); err != nil {
-			log.Errorf("error unmounting %+v", err)
-		}
-	}()
-
-	mountedSource := filepath.Join(bind, filepath.Base(source))
-	// copy data from the bind to the source
-	// e.g if source is /foo/bar, copy ./bind/bar to /foo/bar
-	log.Debugf("copying contents from to %s to %s", mountedSource, source)
-	if err := archive.CopyWithTar(mountedSource, source); err != nil {
-		log.Errorf("err copying %s to %s: %+v", mountedSource, source, err)
-		return err
-	}
-
-	return nil
-}
-
-// ProcessEnv does OS specific checking and munging on the process environment prior to launch
-func (t *BaseOperations) ProcessEnv(env []string) []string {
-	// TODO: figure out how we're going to specify user and pass all the settings along
-	// in the meantime, hardcode HOME to /root
-	homeIndex := -1
-	for i, tuple := range env {
-		if strings.HasPrefix(tuple, "HOME=") {
-			homeIndex = i
-			break
-		}
-	}
-	if homeIndex == -1 {
-		return append(env, "HOME=/root")
-	}
-
-	return env
-}
-
-// Fork triggers vmfork and handles the necessary pre/post OS level operations
-func (t *BaseOperations) Fork() error {
-	// unload vmxnet3 module
-
-	// fork
-	out, ok, err := rpcout.SendOne("vmfork-begin -1 -1")
-	if err != nil {
-		detail := fmt.Sprintf("error while calling vmfork: err=%s, out=%s, ok=%t", err, out, ok)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	if !ok {
-		detail := fmt.Sprintf("failed to vmfork: %s", out)
-		log.Error(detail)
-		return errors.New(detail)
-	}
-
-	log.Infof("vmfork call succeeded: %s", out)
-
-	// update system time
-
-	// rescan scsi bus
-
-	// reload vmxnet3 module
-
-	// ensure memory and cores are brought online if not using udev
-
-	return nil
-}
-
-func (t *BaseOperations) Setup(config Config) error {
-	if err := createBindSrcTarget(filesForMinOSLinux); err != nil {
-		return err
-	}
-
-	err := Sys.Hosts.Load()
-	if err != nil {
-		return err
-	}
-
-	// Seed the working copy of the hosts file with that from the image
-	BindSys.Hosts.Copy(Sys.Hosts)
-
-	// make sure localhost entries are present
-	entries := []struct {
-		hostname string
-		addr     net.IP
-	}{
-		{"localhost", net.ParseIP("127.0.0.1")},
-		{"localhost4", net.ParseIP("127.0.0.1")},
-		{"localhost.localdomain", net.ParseIP("127.0.0.1")},
-		{"localhost4.localdomain4", net.ParseIP("127.0.0.1")},
-		{"ip6-localhost", net.ParseIP("::1")},
-		{"localhost", net.ParseIP("::1")},
-		{"localhost.localdomain", net.ParseIP("::1")},
-		{"localhost6.localdomain6", net.ParseIP("::1")},
-		{"ip6-loopback", net.ParseIP("::1")},
-		{"ip6-localnet", net.ParseIP("fe00::0")},
-		{"ip6-mcastprefix", net.ParseIP("ff00::0")},
-		{"ip6-allnodes", net.ParseIP("ff02::1")},
-		{"ip6-allrouters", net.ParseIP("ff02::2")},
-	}
-
-	for _, e := range entries {
-		BindSys.Hosts.SetHost(e.hostname, e.addr)
-	}
-
-	if err := bindMountAndSave(Sys.Hosts, BindSys.Hosts); err != nil {
-		return err
-	}
-
-	t.dynEndpoints = make(map[string][]*NetworkEndpoint)
-	t.dhcpLoops = make(map[string]chan struct{})
-	t.config = config
-
-	return nil
-}
-
-func (t *BaseOperations) Cleanup() error {
-	for _, stop := range t.dhcpLoops {
-		close(stop)
-	}
-
-	return nil
-}
-
-// Need to put this here because Windows does not support SysProcAttr.Credential
-// getUserSysProcAttr relies on docker user package to verify user specification
-// Examples of valid user specifications are:
-//     * ""
-//     * "user"
-//     * "uid"
-//     * "user:group"
-//     * "uid:gid
-//     * "user:gid"
-//     * "uid:group"
-func getUserSysProcAttr(uid, gid string) (*syscall.SysProcAttr, error) {
-	if uid == "" && gid == "" {
-		log.Debugf("no user id or group id specified")
-		return nil, nil
-	}
-
-	userGroup := uid
-	if gid != "" {
-		userGroup = fmt.Sprintf("%s:%s", uid, gid)
-	}
-	passwdPath, err := user.GetPasswdPath()
-	if err != nil {
-		return nil, err
-	}
-	groupPath, err := user.GetGroupPath()
-	if err != nil {
-		return nil, err
-	}
-	execUser, err := user.GetExecUserPath(userGroup, defaultExecUser, passwdPath, groupPath)
-	if err != nil {
-		return nil, err
-	}
-
-	sysProc := &syscall.SysProcAttr{
-		Credential: &syscall.Credential{
-			Uid: uint32(execUser.Uid),
-			Gid: uint32(execUser.Gid),
-		},
-		Setsid: true,
-	}
-	for _, sgid := range execUser.Sgids {
-		sysProc.Credential.Groups = append(sysProc.Credential.Groups, uint32(sgid))
-	}
-	return sysProc, nil
-}
-
-// isEmpty returns true if the directory is empty or contains a lost+found folder
-func isEmpty(name string) (bool, error) {
-	files, err := readDir(name)
-	if err != nil || len(files) > 0 {
-		return false, err
-	}
-	return true, nil
-}
-
-// readDir reads a directory and hides a specific dir "lost+found"
-func readDir(dir string) ([]os.FileInfo, error) {
-	lostnfound := "lost+found"
-	files, err := ioutil.ReadDir(dir)
-	if err != nil {
-		return nil, err
-	}
-
-	result := files[:0]
-	for _, f := range files {
-		if f.Name() != lostnfound {
-			result = append(result, f)
-		}
-	}
-
-	return result, nil
-}
-
-func bindMount(src, target string) error {
-	// no need to return if unmount fails; it's possible that the target is not mounted previously
-	log.Infof("unmounting %s", target)
-	if err := Sys.Syscall.Unmount(target, syscall.MNT_DETACH); err != nil {
-		if err.Error() == os.ErrInvalid.Error() {
-			log.Debug("path is not currently a bindmount target")
-		} else {
-			log.Errorf("failed to unmount %s: %s", target, err)
-		}
-	}
-
-	// bind mount src to target
-	log.Infof("bind-mounting %s on %s", src, target)
-	if err := Sys.Syscall.Mount(src, target, "bind", syscall.MS_BIND, ""); err != nil {
-		detail := fmt.Errorf("failed to mount %s to %s: %s", src, target, err)
-		log.Error(detail)
-		return detail
-	}
-
-	// make sure the file is readable
-	// #nosec: Expect file permissions to be 0600 or less
-	if err := os.Chmod(target, 0644); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func bindMountAndSave(conf etcconf.Conf, bind etcconf.Conf) error {
-	if err := bind.Save(); err != nil {
-		return err
-	}
-
-	return bindMount(bind.Path(), conf.Path())
-}
-
-// Create necessary directories/files as the src/target for bind mount.
-// See https://github.com/vmware/vic/issues/489
-func createBindSrcTarget(files map[string]os.FileMode) error {
-	// The directory has to exist before creating the new file
-	for filePath, fmode := range files {
-		// this allows us to prefix arbitrary path so as to support unit testing
-		filePath = path.Join(Sys.Root, filePath)
-
-		dir := path.Dir(filePath)
-		if _, err := os.Stat(dir); os.IsNotExist(err) {
-			// #nosec: Expect file permissions to be 0600 or less
-			if err := os.MkdirAll(dir, 0755); err != nil {
-				return fmt.Errorf("failed to create directory %s: %s", dir, err)
-			}
-		}
-		f, err := os.OpenFile(filePath, os.O_CREATE, fmode)
-		if err != nil {
-			return fmt.Errorf("failed to open file %s: %s", filePath, err)
-		}
-
-		if err = f.Close(); err != nil {
-			return fmt.Errorf("failed to close file %s: %s", filePath, err)
-		}
-	}
-
-	return nil
-}
-
-// LaunchUtility allows for starting, blocking on, and receiving the exit code of a
-// process while in the presence of an embedded child reaper.
-// The function passed in will be launched under lock and MUST NOT wait for the process to
-// exit. It's expected the function be a closure wrapped around StartProcess or similar.
-func (t *BaseOperations) LaunchUtility(fn UtilityFn) (<-chan int, error) {
-	return launchUtility(t, fn)
-}
-
-func launchUtility(t *BaseOperations, fn UtilityFn) (<-chan int, error) {
-	t.utilityPidMutex.Lock()
-	defer t.utilityPidMutex.Unlock()
-
-	if t.utilityPids == nil {
-		t.utilityPids = make(map[int]chan int)
-		log.Debug("Initialized utility process pid map")
-	}
-
-	log.Debug("Launching utility process")
-	proc, err := fn()
-	if err != nil {
-		return nil, err
-	}
-
-	pid := proc.Pid
-	exitChan := make(chan int, 1)
-	t.utilityPids[pid] = exitChan
-	log.Debugf("Registered utility pid: %d", pid)
-
-	return exitChan, nil
-}
-
-func (t *BaseOperations) HandleUtilityExit(pid, exitCode int) bool {
-	return handleUtilityExit(t, pid, exitCode)
-}
-
-func handleUtilityExit(t *BaseOperations, pid, exitCode int) bool {
-	t.utilityPidMutex.Lock()
-	defer t.utilityPidMutex.Unlock()
-
-	pidchannel, ok := t.utilityPids[pid]
-	if !ok {
-		return false
-	}
-
-	delete(t.utilityPids, pid)
-	pidchannel <- exitCode
-	close(pidchannel)
-
-	return true
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux_test.go
deleted file mode 100644
index bbefa4a493..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/ops_linux_test.go
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build linux
-
-package tether
-
-import (
-	"errors"
-	"fmt"
-	"os/user"
-	"path"
-	"strconv"
-	"strings"
-	"syscall"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/vishvananda/netlink"
-
-	"os"
-
-	"io/ioutil"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type Interface struct {
-	netlink.LinkAttrs
-	Up    bool
-	Addrs []netlink.Addr
-}
-
-func (t *Interface) Attrs() *netlink.LinkAttrs {
-	return &t.LinkAttrs
-}
-
-func (t *Interface) Type() string {
-	return "mocked"
-}
-
-func (t *Mocker) LinkByName(name string) (netlink.Link, error) {
-	defer trace.End(trace.Begin(fmt.Sprintf("Getting link by name %s", name)))
-
-	return t.Interfaces[name], nil
-}
-
-func (t *Mocker) LinkSetName(link netlink.Link, name string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Renaming %s to %s", link.Attrs().Name, name)))
-
-	iface := link.(*Interface)
-	_, ok := t.Interfaces[name]
-	if ok {
-		return fmt.Errorf("Interface with name %s already exists", name)
-	}
-
-	oldName := iface.Name
-	iface.Name = name
-	// make sure there's no period where the interface isn't "present"
-	t.Interfaces[name] = iface
-	delete(t.Interfaces, oldName)
-
-	return nil
-}
-
-func (t *Mocker) LinkSetDown(link netlink.Link) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Bringing %s down", link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Up = false
-	// TODO: should this drop addresses?
-	return nil
-}
-
-func (t *Mocker) LinkSetUp(link netlink.Link) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Bringing %s up", link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Up = true
-	return nil
-}
-
-func (t *Mocker) LinkSetAlias(link netlink.Link, alias string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Adding alias %s to %s", alias, link.Attrs().Name)))
-
-	iface := link.(*Interface)
-	iface.Alias = alias
-	return nil
-}
-
-func (t *Mocker) AddrList(link netlink.Link, family int) ([]netlink.Addr, error) {
-	defer trace.End(trace.Begin(""))
-
-	iface := link.(*Interface)
-	return iface.Addrs, nil
-}
-
-func (t *Mocker) AddrAdd(link netlink.Link, addr *netlink.Addr) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("Adding %s to %s", addr.String(), link.Attrs().Name)))
-
-	iface := link.(*Interface)
-
-	for _, adr := range iface.Addrs {
-		if addr.IP.String() == adr.IP.String() {
-			return syscall.EEXIST
-		}
-	}
-
-	iface.Addrs = append(iface.Addrs, *addr)
-	return nil
-}
-
-func (t *Mocker) AddrDel(link netlink.Link, addr *netlink.Addr) error {
-	iface := link.(*Interface)
-
-	for i, adr := range iface.Addrs {
-		if addr.IP.String() == adr.IP.String() {
-			iface.Addrs = append(iface.Addrs[:i], iface.Addrs[i+1:]...)
-			return nil
-		}
-	}
-
-	return syscall.EADDRNOTAVAIL
-}
-
-func (t *Mocker) RouteAdd(route *netlink.Route) error {
-	defer trace.End(trace.Begin("no implemented"))
-
-	// currently ignored
-	return nil
-}
-
-func (t *Mocker) RouteDel(route *netlink.Route) error {
-	defer trace.End(trace.Begin("no implemented"))
-
-	// currently ignored
-	return nil
-}
-
-func (t *Mocker) RuleList(int) ([]netlink.Rule, error) {
-	defer trace.End(trace.Begin("not implemented"))
-
-	return nil, nil
-}
-
-func (t *Mocker) LinkBySlot(slot int32) (netlink.Link, error) {
-	defer trace.End(trace.Begin(""))
-
-	id := int(slot)
-	for _, intf := range t.Interfaces {
-		if intf.Attrs().Index == id {
-			return intf, nil
-		}
-	}
-
-	return nil, errors.New("no such interface")
-}
-
-func TestSlotToPciPath(t *testing.T) {
-	var tests = []struct {
-		slot int32
-		p    string
-		err  error
-	}{
-		{0, path.Join(pciDevPath, "0000:00:00.0"), nil},
-		{32, path.Join(pciDevPath, "0000:00:11.0", "0000:*:00.0"), nil},
-		{33, path.Join(pciDevPath, "0000:00:11.0", "0000:*:01.0"), nil},
-		{192, path.Join(pciDevPath, "0000:00:16.0", "0000:*:00.0"), nil},
-		{1184, path.Join(pciDevPath, "0000:00:15.1", "0000:*:00.0"), nil},
-		{1216, path.Join(pciDevPath, "0000:00:16.1", "0000:*:00.0"), nil},
-		{1248, path.Join(pciDevPath, "0000:00:17.1", "0000:*:00.0"), nil},
-		{1280, path.Join(pciDevPath, "0000:00:18.1", "0000:*:00.0"), nil},
-	}
-
-	for _, te := range tests {
-		p, err := slotToPCIPath(te.slot, 0)
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("slotToPCIPath(%d) => (%#v, %#v), want (%s, nil)", te.slot, p, err, te.p)
-			}
-
-			continue
-		}
-
-		if p != te.p {
-			t.Fatalf("slotToPCIPath(%d) => (%#v, %#v), want (%s, nil)", te.slot, p, err, te.p)
-		}
-	}
-}
-
-func TestGetUserSysProcAttr(t *testing.T) {
-	curr, err := user.Current()
-	if err != nil {
-		t.Logf("Failed to get current user, skip test")
-		return
-	}
-	currUID, _ := strconv.Atoi(curr.Uid)
-	currGID, _ := strconv.Atoi(curr.Gid)
-
-	moreThanMax := strconv.Itoa(1 << 33)
-	lessThanMin := "-100"
-
-	var tests = []struct {
-		uid  string
-		gid  string
-		ruid int
-		rgid int
-		err  error
-	}{
-		{"", "", 0, 0, nil},
-		{"notexist", "notexist", 0, 0, errors.New("Unable to find user notexist")},
-		{"notexist", curr.Gid, 0, 0, errors.New("Unable to find user notexist")},
-		{"", "notexist", 0, 0, errors.New("Unable to find group notexist")},
-		{"0", "notexist", 0, 0, errors.New("Unable to find group notexist")},
-		{curr.Uid, "notexist", 0, 0, errors.New("Unable to find group notexist")},
-		{"2000000", "notexist", 0, 0, errors.New("Unable to find group notexist")},
-		{curr.Username, "notexist", 0, 0, errors.New("Unable to find group notexist")},
-		{curr.Username, "0", currUID, 0, nil},
-		{curr.Uid, "1000", currUID, 1000, nil},
-		{curr.Uid, curr.Gid, currUID, currGID, nil},
-		{"root", curr.Gid, 0, currGID, nil},
-		{"root", "root", 0, 0, nil},
-		{moreThanMax, "root", 0, 0, errors.New("Uids and gids must be in range 0-2147483647")},
-		{curr.Username, moreThanMax, 0, 0, errors.New("Uids and gids must be in range 0-2147483647")},
-		{lessThanMin, "root", 0, 0, errors.New("Uids and gids must be in range 0-2147483647")},
-		{curr.Username, lessThanMin, 0, 0, errors.New("Uids and gids must be in range 0-2147483647")},
-	}
-	for _, test := range tests {
-		t.Logf("uid: %s, gid: %s", test.uid, test.gid)
-		user, err := getUserSysProcAttr(test.uid, test.gid)
-		if err != nil {
-			assert.True(t, test.err != nil, fmt.Sprintf("Should not have error %s", err))
-			if !strings.Contains(err.Error(), test.err.Error()) {
-				assert.True(t, false, fmt.Sprintf("error message mismatch, expected %s, actual %s", test.err, err.Error()))
-			}
-			continue
-		}
-		assert.True(t, test.err == nil, fmt.Sprintf("didn't get expected error: %s", test.err))
-		if user == nil {
-			assert.True(t, (test.ruid == 0 && test.rgid == 0), "returned user is nil, but expect not nil result: %d:%d", test.ruid, test.rgid)
-			continue
-		}
-		assert.Equal(t, test.ruid, int(user.Credential.Uid), "returned user id mismatch")
-		assert.Equal(t, test.rgid, int(user.Credential.Gid), "returned group id mismatch")
-	}
-}
-
-func TestIsEmpty(t *testing.T) {
-	dir, err := ioutil.TempDir("", "testisEmpty")
-	assert.NoError(t, err)
-
-	defer os.RemoveAll(dir)
-
-	err = os.MkdirAll(dir+"/lost+found", 0644)
-	assert.NoError(t, err)
-
-	ok, err := isEmpty(dir)
-	assert.True(t, ok)
-	assert.NoError(t, err)
-
-	err = os.MkdirAll(dir+"/test1", 0644)
-	assert.NoError(t, err)
-	err = os.MkdirAll(dir+"/test2", 0644)
-	assert.NoError(t, err)
-	err = ioutil.WriteFile(dir+"/test3.txt", []byte{}, 0644)
-	assert.NoError(t, err)
-
-	ok, err = isEmpty(dir)
-	assert.False(t, ok)
-	assert.NoError(t, err)
-
-}
-
-func TestCreateBindSrcTarget(t *testing.T) {
-	dir, err := ioutil.TempDir("", "testCreateBindSrcTarget")
-	assert.NoError(t, err)
-
-	defer os.RemoveAll(dir)
-
-	// Create a file under an existing directory
-	file := dir + "/test1"
-	err = createBindSrcTarget(map[string]os.FileMode{file: 0644})
-	assert.NoError(t, err, "createBindSrcTarget failed: %s", err)
-	_, err = os.Stat(dir)
-	assert.NoError(t, err)
-
-	// Create a file under non-existent directory
-	file = dir + "/testDir/test1"
-	err = createBindSrcTarget(map[string]os.FileMode{file: 0644})
-	assert.NoError(t, err, "createBindSrcTarget failed: %s", err)
-	_, err = os.Stat(dir)
-	assert.NoError(t, err)
-
-	// Create an existing file
-	err = createBindSrcTarget(map[string]os.FileMode{file: 0644})
-	assert.NoError(t, err, "createBindSrcTarget failed: %s", err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants.go b/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants.go
deleted file mode 100644
index 410774c58c..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package shared is intended for isolating constants and minor functions required
-// to be consistent across packages so as to avoid transitive package includes
-package shared
-
-/* Constants used by tether for exchange outside of tether */
-const (
-	DiskLabelQueryName   = "disk-label"
-	FilterSpecQueryName  = "filter-spec"
-	SkipRecurseQueryName = "skip-recurse"
-	SkipDataQueryName    = "skip-data"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants_linux.go b/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants_linux.go
deleted file mode 100644
index e300a34140..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/shared/constants_linux.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shared
-
-const (
-	pidFilePath = ".tether/run"
-)
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/shared/func_linux.go b/installer/vendor/github.com/vmware/vic/lib/tether/shared/func_linux.go
deleted file mode 100644
index d38b72415f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/shared/func_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package shared
-
-import (
-	"path"
-
-	"github.com/vmware/vic/lib/system"
-)
-
-var Sys = system.New()
-
-func PIDFileDir() string {
-	return path.Join(Sys.Root, pidFilePath)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/signer.go b/installer/vendor/github.com/vmware/vic/lib/tether/signer.go
deleted file mode 100644
index 420a5a5198..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/signer.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"io"
-
-	"golang.org/x/crypto/ssh"
-)
-
-type ContainerSigner struct {
-	id string
-}
-
-func (c *ContainerSigner) PublicKey() ssh.PublicKey {
-	return *c
-}
-
-// we're going to ignore everything for the moment as we're repurposing the host key for the id.
-// later we may use a genuine host key and an SSH out-of-band request to get the container id.
-func (c *ContainerSigner) Sign(rand io.Reader, data []byte) (*ssh.Signature, error) {
-	return &ssh.Signature{
-		Format: "container-id",
-		Blob:   []byte{},
-	}, nil
-}
-
-func (c ContainerSigner) Type() string {
-	return "container-id"
-}
-
-func (c ContainerSigner) Marshal() []byte {
-	return []byte(c.id)
-}
-
-func (c ContainerSigner) Verify(data []byte, sig *ssh.Signature) error {
-	return nil
-}
-
-func NewSigner(id string) *ContainerSigner {
-	signer := &ContainerSigner{
-		id: id,
-	}
-
-	return signer
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/tether.go b/installer/vendor/github.com/vmware/vic/lib/tether/tether.go
deleted file mode 100644
index 22d4d0516f..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/tether.go
+++ /dev/null
@@ -1,1005 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	_ "net/http/pprof" // allow enabling pprof in contianerVM
-	"os"
-	"os/exec"
-	"os/signal"
-	"path"
-	"runtime/debug"
-	"sort"
-	"sync"
-	"syscall"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/system"
-	"github.com/vmware/vic/lib/tether/shared"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/log/syslog"
-	"github.com/vmware/vic/pkg/serial"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-const (
-	// MaxDeathRecords The maximum number of records to keep for restarting processes
-	MaxDeathRecords = 5
-
-	// the length of a truncated ID for use as hostname
-	shortLen = 12
-)
-
-// Sys is used to configure where the target system files are
-var (
-	// Used to access the acutal system paths and files
-	Sys = shared.Sys
-	// Used to access and manipulate the tether modified bind sources
-	// that are mounted over the system ones.
-	BindSys = system.NewWithRoot("/.tether")
-	once    sync.Once
-)
-
-type tether struct {
-	// the implementation to use for tailored operations
-	ops Operations
-
-	// the reload channel is used to block reloading of the config
-	reload chan struct{}
-
-	// config holds the main configuration for the executor
-	config *ExecutorConfig
-
-	// a set of extensions that get to operate on the config
-	extensions map[string]Extension
-
-	src  extraconfig.DataSource
-	sink extraconfig.DataSink
-
-	// Cancelable context and its cancel func.
-	ctx    context.Context
-	cancel context.CancelFunc
-
-	incoming chan os.Signal
-
-	// syslog writer shared by all sessions
-	writer syslog.Writer
-
-	// used for running vm initialization logic once in the reload loop
-	initialize sync.Once
-}
-
-func New(src extraconfig.DataSource, sink extraconfig.DataSink, ops Operations) Tether {
-	ctx, cancel := context.WithCancel(context.Background())
-	return &tether{
-		ops:    ops,
-		reload: make(chan struct{}, 1),
-		config: &ExecutorConfig{
-			pids: make(map[int]*SessionConfig),
-		},
-		extensions: make(map[string]Extension),
-		src:        src,
-		sink:       sink,
-		ctx:        ctx,
-		cancel:     cancel,
-		incoming:   make(chan os.Signal, 32),
-	}
-}
-
-// removeChildPid is a synchronized accessor for the pid map the deletes the entry and returns the value
-func (t *tether) removeChildPid(pid int) (*SessionConfig, bool) {
-	t.config.pidMutex.Lock()
-	defer t.config.pidMutex.Unlock()
-
-	session, ok := t.config.pids[pid]
-	delete(t.config.pids, pid)
-	return session, ok
-}
-
-// lenChildPid returns the number of entries
-func (t *tether) lenChildPid() int {
-	t.config.pidMutex.Lock()
-	defer t.config.pidMutex.Unlock()
-
-	return len(t.config.pids)
-}
-
-func (t *tether) setup() error {
-	defer trace.End(trace.Begin("main tether setup"))
-
-	// set up tether logging destination
-	out, err := t.ops.Log()
-	if err != nil {
-		log.Errorf("failed to open tether log: %s", err)
-		return err
-	}
-	if out != nil {
-		log.SetOutput(out)
-	}
-
-	t.reload = make(chan struct{}, 1)
-	t.config = &ExecutorConfig{
-		pids: make(map[int]*SessionConfig),
-	}
-
-	if err := t.childReaper(); err != nil {
-		log.Errorf("Failed to start reaper %s", err)
-		return err
-	}
-
-	if err := t.ops.Setup(t); err != nil {
-		log.Errorf("Failed tether setup: %s", err)
-		return err
-	}
-
-	for name, ext := range t.extensions {
-		log.Infof("Starting extension %s", name)
-		err := ext.Start()
-		if err != nil {
-			log.Errorf("Failed to start extension %s: %s", name, err)
-			return err
-		}
-	}
-
-	pidDir := shared.PIDFileDir()
-
-	// #nosec: Expect directory permissions to be 0700 or less
-	if err = os.MkdirAll(pidDir, 0755); err != nil {
-		log.Errorf("could not create pid file directory %s: %s", pidDir, err)
-	}
-
-	// Create PID file for tether
-	tname := path.Base(os.Args[0])
-	err = ioutil.WriteFile(fmt.Sprintf("%s.pid", path.Join(pidDir, tname)),
-		[]byte(fmt.Sprintf("%d", os.Getpid())),
-		0644)
-	if err != nil {
-		log.Errorf("Unable to open PID file for %s : %s", os.Args[0], err)
-	}
-
-	// seed the incoming channel once to trigger child reaper. This is required to collect the zombies created by switch-root
-	t.triggerReaper()
-
-	return nil
-}
-
-func (t *tether) cleanup() {
-	defer trace.End(trace.Begin("main tether cleanup"))
-
-	// stop child reaping
-	t.stopReaper()
-
-	// stop the extensions first as they may use the config
-	for name, ext := range t.extensions {
-		log.Infof("Stopping extension %s", name)
-		err := ext.Stop()
-		if err != nil {
-			log.Warnf("Failed to cleanly stop extension %s", name)
-		}
-	}
-
-	// return logging to standard location
-	log.SetOutput(os.Stdout)
-
-	// perform basic cleanup
-	t.ops.Cleanup()
-}
-
-func (t *tether) setLogLevel() {
-	// TODO: move all of this into an extension.Pre() block when we move to that model
-	// adjust the logging level appropriately
-	log.SetLevel(log.InfoLevel)
-	// TODO: do not echo application output to console without debug enabled
-	serial.DisableTracing()
-
-	if t.config.DebugLevel > 0 {
-		log.SetLevel(log.DebugLevel)
-
-		logConfig(t.config)
-	}
-
-	if t.config.DebugLevel > 1 {
-		serial.EnableTracing()
-
-		log.Info("Launching pprof server on port 6060")
-		fn := func() {
-			go http.ListenAndServe("0.0.0.0:6060", nil)
-		}
-
-		once.Do(fn)
-	}
-
-	if t.config.DebugLevel > 3 {
-		// extraconfig is very, very verbose
-		extraconfig.SetLogLevel(log.DebugLevel)
-	}
-}
-
-func (t *tether) setHostname() error {
-	short := t.config.ID
-	if len(short) > shortLen {
-		short = short[:shortLen]
-	}
-
-	full := t.config.Hostname
-	if t.config.Hostname != "" && t.config.Domainname != "" {
-		full = fmt.Sprintf("%s.%s", t.config.Hostname, t.config.Domainname)
-	}
-
-	hostname := short
-	if full != "" {
-		hostname = full
-	}
-
-	if err := t.ops.SetHostname(hostname, t.config.Name); err != nil {
-		// we don't attempt to recover from this - it's a fundamental misconfiguration
-		// so just exit
-		return fmt.Errorf("failed to set hostname: %s", err)
-	}
-	return nil
-}
-
-func (t *tether) setNetworks() error {
-
-	// internal networks must be applied first
-	for _, network := range t.config.Networks {
-		if !network.Internal {
-			continue
-		}
-		if err := t.ops.Apply(network); err != nil {
-			return fmt.Errorf("failed to apply network endpoint config: %s", err)
-		}
-	}
-	for _, network := range t.config.Networks {
-		if network.Internal {
-			continue
-		}
-		if err := t.ops.Apply(network); err != nil {
-			return fmt.Errorf("failed to apply network endpoint config: %s", err)
-		}
-	}
-
-	return nil
-}
-
-func (t *tether) setMounts() error {
-	// provides a lookup from path to volume reference.
-	pathIndex := make(map[string]string, 0)
-	mounts := make([]string, 0, len(t.config.Mounts))
-	for k, v := range t.config.Mounts {
-		mounts = append(mounts, v.Path)
-		pathIndex[v.Path] = k
-	}
-	// Order the mount paths so that we are doing them in shortest order first.
-	sort.Strings(mounts)
-
-	for _, v := range mounts {
-		targetRef := pathIndex[v]
-		mountTarget := t.config.Mounts[targetRef]
-		switch mountTarget.Source.Scheme {
-		case "label":
-			// this could block indefinitely while waiting for a volume to present
-			// return error if mount volume failed, to fail container start
-			if err := t.ops.MountLabel(context.Background(), mountTarget.Source.Path, mountTarget.Path); err != nil {
-				return err
-			}
-		case "nfs":
-			// return error if mount nfs volume failed, to fail container start, so user knows there is something wrong
-			if err := t.ops.MountTarget(context.Background(), mountTarget.Source, mountTarget.Path, mountTarget.Mode); err != nil {
-				return err
-			}
-		default:
-			return fmt.Errorf("unsupported volume mount type for %s: %s", targetRef, mountTarget.Source.Scheme)
-		}
-	}
-
-	// FIXME: populateVolumes() does not handle the nested volume case properly.
-	return t.populateVolumes()
-}
-
-func (t *tether) populateVolumes() error {
-	defer trace.End(trace.Begin(fmt.Sprintf("populateVolumes")))
-	// skip if no mounts present
-	if len(t.config.Mounts) == 0 {
-		return nil
-	}
-
-	for _, mnt := range t.config.Mounts {
-		if mnt.Path == "" {
-			continue
-		}
-		if mnt.CopyMode == executor.CopyNew {
-			err := t.ops.CopyExistingContent(mnt.Path)
-			if err != nil {
-				log.Errorf("error copyExistingContent for mount %s: %+v", mnt.Path, err)
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-func (t *tether) initializeSessions() error {
-
-	maps := map[string]map[string]*SessionConfig{
-		"Sessions": t.config.Sessions,
-		"Execs":    t.config.Execs,
-	}
-
-	// we need to iterate over both sessions and execs
-	for name, m := range maps {
-		// Iterate over the Sessions and initialize them if needed
-		for id, session := range m {
-			log.Debugf("Initializing session %s", id)
-
-			session.Lock()
-			if session.wait != nil {
-				log.Warnf("Session %s already initialized", id)
-			} else {
-				if session.RunBlock {
-					log.Infof("Session %s wants attach capabilities. Creating its channel", id)
-					session.ClearToLaunch = make(chan struct{})
-				}
-
-				// this will need altering if tether should be capable of being restarted itself
-				session.Started = ""
-				session.StopTime = 0
-
-				session.wait = &sync.WaitGroup{}
-				session.extraconfigKey = name
-				err := t.loggingLocked(session)
-				if err != nil {
-					log.Errorf("initializing logging for session failed with %s", err)
-					session.Unlock()
-					return err
-				}
-			}
-			session.Unlock()
-		}
-	}
-	return nil
-}
-
-func (t *tether) reloadExtensions() error {
-	// reload the extensions
-	for name, ext := range t.extensions {
-		log.Debugf("Passing config to %s", name)
-		err := ext.Reload(t.config)
-		if err != nil {
-			return fmt.Errorf("Failed to cleanly reload config for extension %s: %s", name, err)
-		}
-	}
-	return nil
-}
-
-func (t *tether) processSessions() error {
-	type results struct {
-		id    string
-		path  string
-		err   error
-		fatal bool
-	}
-
-	// so that we can launch multiple sessions in parallel
-	var wg sync.WaitGroup
-	// to collect the errors back from them
-	resultsCh := make(chan results, len(t.config.Sessions)+len(t.config.Execs))
-
-	maps := []struct {
-		sessions map[string]*SessionConfig
-		fatal    bool
-	}{
-		{t.config.Sessions, true},
-		{t.config.Execs, false},
-	}
-
-	// we need to iterate over both sessions and execs
-	for i := range maps {
-		m := maps[i]
-
-		// process the sessions and launch if needed
-		for id, session := range m.sessions {
-			func() {
-				session.Lock()
-				defer session.Unlock()
-
-				log.Debugf("Processing config for session: %s", id)
-				var proc = session.Cmd.Process
-
-				// check if session is alive and well
-				if proc != nil && proc.Signal(syscall.Signal(0)) == nil {
-					log.Debugf("Process for session %s is running (pid: %d)", id, proc.Pid)
-					if !session.Active {
-						// stop process - for now this doesn't do any staged levels of aggression
-						log.Infof("Running session %s has been deactivated (pid: %d)", id, proc.Pid)
-
-						killHelper(session)
-					}
-
-					return
-				}
-
-				// if we're not activating this session and it's not running, then skip
-				if !session.Active {
-					log.Debugf("Skipping inactive session: %s", id)
-					return
-				}
-
-				priorLaunch := proc != nil || session.Started != ""
-				if priorLaunch && !session.Restart {
-					log.Debugf("Skipping non-restartable exited or failed session: %s", id)
-					return
-				}
-
-				if !priorLaunch {
-					log.Infof("Launching process for session %s", id)
-					log.Debugf("Launch failures are fatal: %t", m.fatal)
-				} else {
-					session.Diagnostics.ResurrectionCount++
-
-					// FIXME: we cannot have this embedded knowledge of the extraconfig encoding pattern, but not
-					// currently sure how to expose it neatly via a utility function
-					extraconfig.EncodeWithPrefix(t.sink, session, extraconfig.CalculateKeys(t.config, fmt.Sprintf("%s.%s", session.extraconfigKey, id), "")[0])
-					log.Warnf("Re-launching process for session %s (count: %d)", id, session.Diagnostics.ResurrectionCount)
-					session.Cmd = *restartableCmd(&session.Cmd)
-				}
-
-				wg.Add(1)
-				go func(session *SessionConfig) {
-					defer wg.Done()
-					resultsCh <- results{
-						id:    session.ID,
-						path:  session.Cmd.Path,
-						err:   t.launch(session),
-						fatal: m.fatal,
-					}
-				}(session)
-			}()
-		}
-	}
-
-	wg.Wait()
-	// close the channel
-	close(resultsCh)
-
-	// iterate over the results
-	for result := range resultsCh {
-		if result.err != nil {
-			detail := fmt.Errorf("failed to launch %s for %s: %s", result.path, result.id, result.err)
-			if result.fatal {
-				log.Error(detail)
-				return detail
-			}
-
-			log.Warn(detail)
-			return nil
-		}
-	}
-	return nil
-}
-
-type TetherKey struct{}
-
-func (t *tether) Start() error {
-	defer trace.End(trace.Begin("main tether loop"))
-
-	defer func() {
-		e := recover()
-		if e != nil {
-			log.Errorf("Panic in main tether loop: %s: %s", e, debug.Stack())
-			// continue panicing now it's logged
-			panic(e)
-		}
-	}()
-
-	// do the initial setup and start the extensions
-	if err := t.setup(); err != nil {
-		log.Errorf("Failed to run setup: %s", err)
-		return err
-	}
-	defer t.cleanup()
-
-	// initial entry, so seed this
-	t.reload <- struct{}{}
-	for range t.reload {
-		var err error
-
-		select {
-		case <-t.ctx.Done():
-			log.Warnf("Someone called shutdown, returning from start")
-			return nil
-		default:
-		}
-		log.Info("Loading main configuration")
-
-		// load the config - this modifies the structure values in place
-		t.config.Lock()
-		extraconfig.Decode(t.src, t.config)
-		t.config.Unlock()
-
-		t.setLogLevel()
-
-		// TODO: this ensures that we run vm related setup code once
-		// This is temporary as none of those functions are idempotent at this point
-		// https://github.com/vmware/vic/issues/5833
-		t.initialize.Do(func() {
-			if err = t.setHostname(); err != nil {
-				return
-			}
-
-			// process the networks then publish any dynamic data
-			if err = t.setNetworks(); err != nil {
-				return
-			}
-			extraconfig.Encode(t.sink, t.config)
-
-			// setup the firewall
-			if err = retryOnError(func() error { return t.ops.SetupFirewall(t.ctx, t.config) }, 5); err != nil {
-				err = fmt.Errorf("Couldn't set up container-network firewall: %v", err)
-				return
-			}
-
-			//process the filesystem mounts - this is performed after networks to allow for network mounts
-			if err = t.setMounts(); err != nil {
-				return
-			}
-		})
-
-		if err != nil {
-			log.Error(err)
-			return err
-		}
-
-		if err = t.initializeSessions(); err != nil {
-			log.Error(err)
-			return err
-		}
-
-		// Danger, Will Robinson! There is a strict ordering here.
-		// We need to start attach server first so that it can unblock the session
-		if err = t.reloadExtensions(); err != nil {
-			log.Error(err)
-			return err
-		}
-
-		if err = t.processSessions(); err != nil {
-			log.Error(err)
-			return err
-		}
-	}
-
-	log.Info("Finished processing sessions")
-
-	return nil
-}
-
-func (t *tether) Stop() error {
-	defer trace.End(trace.Begin(""))
-
-	// cancel the context to signal waiters
-	t.cancel()
-
-	// TODO: kill all the children
-	close(t.reload)
-
-	return nil
-}
-
-func (t *tether) Reload() {
-	defer trace.End(trace.Begin(""))
-
-	select {
-	case <-t.ctx.Done():
-		log.Warnf("Someone called shutdown, dropping the reload request")
-		return
-	default:
-		t.reload <- struct{}{}
-	}
-}
-
-func (t *tether) Register(name string, extension Extension) {
-	log.Infof("Registering tether extension " + name)
-
-	t.extensions[name] = extension
-}
-
-func retryOnError(cmd func() error, maximumAttempts int) error {
-	for i := 0; i < maximumAttempts-1; i++ {
-		if err := cmd(); err != nil {
-			log.Warningf("Failed with error \"%v\". Retrying (Attempt %v).", err, i+1)
-		} else {
-			return nil
-		}
-	}
-	return cmd()
-}
-
-// cleanupSession performs some common cleanup work between handling a session exit and
-// handling a failure to launch
-// caller needs to hold session Lock
-func (t *tether) cleanupSession(session *SessionConfig) {
-	// close down the outputs
-	log.Debugf("Calling close on writers")
-	if session.Outwriter != nil {
-		if err := session.Outwriter.Close(); err != nil {
-			log.Warnf("Close for Outwriter returned %s", err)
-		}
-	}
-
-	// this is a little ugly, however ssh channel.Close will get invoked by these calls,
-	// whereas CloseWrite will be invoked by the OutWriter.Close so that goes first.
-	if session.Errwriter != nil {
-		if err := session.Errwriter.Close(); err != nil {
-			log.Warnf("Close for Errwriter returned %s", err)
-		}
-	}
-
-	// if we're calling this we don't care about truncation of pending input, so this is
-	// called last
-	if session.Reader != nil {
-		log.Debugf("Calling close on reader")
-		if err := session.Reader.Close(); err != nil {
-			log.Warnf("Close for Reader returned %s", err)
-		}
-	}
-
-	// close the signaling channel (it is nil for detached sessions) and set it to nil (for restart)
-	if session.ClearToLaunch != nil {
-		log.Debugf("Calling close chan: %s", session.ID)
-		close(session.ClearToLaunch)
-		session.ClearToLaunch = nil
-		// reset Runblock to unblock process start next time
-		session.RunBlock = false
-	}
-}
-
-// handleSessionExit processes the result from the session command, records it in persistent
-// maner and determines if the Executor should exit
-// caller needs to hold session Lock
-func (t *tether) handleSessionExit(session *SessionConfig) {
-	defer trace.End(trace.Begin("handling exit of session " + session.ID))
-
-	log.Debugf("Waiting on session.wait")
-	session.wait.Wait()
-	log.Debugf("Wait on session.wait completed")
-
-	log.Debugf("Calling wait on cmd")
-	if err := session.Cmd.Wait(); err != nil {
-		// we expect this to get an error because the child reaper will have gathered it
-		log.Debugf("Wait returned %s", err)
-	}
-
-	t.cleanupSession(session)
-
-	// Remove associated PID file
-	cmdname := path.Base(session.Cmd.Path)
-
-	_ = os.Remove(fmt.Sprintf("%s.pid", path.Join(shared.PIDFileDir(), cmdname)))
-
-	// set the stop time
-	session.StopTime = time.Now().UTC().Unix()
-
-	// this returns an arbitrary closure for invocation after the session status update
-	f := t.ops.HandleSessionExit(t.config, session)
-
-	extraconfig.EncodeWithPrefix(t.sink, session, extraconfig.CalculateKeys(t.config, fmt.Sprintf("%s.%s", session.extraconfigKey, session.ID), "")[0])
-
-	if f != nil {
-		log.Debugf("Calling t.ops.HandleSessionExit")
-		f()
-	}
-}
-
-func (t *tether) loggingLocked(session *SessionConfig) error {
-	stdout, stderr, err := t.ops.SessionLog(session)
-	if err != nil {
-		detail := fmt.Errorf("failed to get log writer for session: %s", err)
-		session.Started = detail.Error()
-
-		return detail
-	}
-	session.Outwriter = stdout
-	session.Errwriter = stderr
-	session.Reader = dio.MultiReader()
-
-	if session.Diagnostics.SysLogConfig != nil {
-		cfg := session.Diagnostics.SysLogConfig
-		var w syslog.Writer
-		if t.writer == nil {
-			t.writer, err = syslog.Dial(cfg.Network, cfg.RAddr, syslog.Info|syslog.Daemon, fmt.Sprintf("%s", t.config.ID[:shortLen]))
-			if err != nil {
-				log.Warnf("could not connect to syslog server: %s", err)
-			}
-			w = t.writer
-		} else {
-			w = t.writer.WithTag(fmt.Sprintf("%s", t.config.ID[:shortLen]))
-		}
-
-		if w != nil {
-			stdout.Add(w)
-			stderr.Add(w.WithPriority(syslog.Err | syslog.Daemon))
-		}
-	}
-
-	return nil
-}
-
-// launch will launch the command defined in the session.
-// This will return an error if the session fails to launch
-func (t *tether) launch(session *SessionConfig) error {
-	defer trace.End(trace.Begin("launching session " + session.ID))
-
-	session.Lock()
-	defer session.Unlock()
-
-	var err error
-	defer func() {
-		if session.Started != "true" {
-			// if we didn't launch cleanly then clean up
-			t.cleanupSession(session)
-		}
-
-		// encode the result whether success or error
-		prefix := extraconfig.CalculateKeys(t.config, fmt.Sprintf("%s.%s", session.extraconfigKey, session.ID), "")[0]
-		log.Debugf("Encoding result of launch for session %s under key: %s", session.ID, prefix)
-		extraconfig.EncodeWithPrefix(t.sink, session, prefix)
-	}()
-
-	if len(session.User) > 0 || len(session.Group) > 0 {
-		user, err := getUserSysProcAttr(session.User, session.Group)
-		if err != nil {
-			log.Errorf("user lookup failed %s:%s, %s", session.User, session.Group, err)
-			session.Started = err.Error()
-			return err
-		}
-		session.Cmd.SysProcAttr = user
-	}
-
-	if session.Diagnostics.ResurrectionCount > 0 {
-		// override session logging only while it's restarted to avoid break exec #6004
-		err = t.loggingLocked(session)
-		if err != nil {
-			log.Errorf("initializing logging for session failed with %s", err)
-			return err
-		}
-	}
-
-	session.Cmd.Env = t.ops.ProcessEnv(session.Cmd.Env)
-	// Set Std{in|out|err} to nil, we will control pipes
-	session.Cmd.Stdin = nil
-	session.Cmd.Stdout = nil
-	session.Cmd.Stderr = nil
-
-	// Set StopTime to its default value
-	session.StopTime = 0
-
-	resolved, err := lookPath(session.Cmd.Path, session.Cmd.Env, session.Cmd.Dir)
-	if err != nil {
-		log.Errorf("Path lookup failed for %s: %s", session.Cmd.Path, err)
-		session.Started = err.Error()
-		return err
-	}
-	log.Debugf("Resolved %s to %s", session.Cmd.Path, resolved)
-	session.Cmd.Path = resolved
-
-	// block until we have a connection
-	if session.RunBlock && session.ClearToLaunch != nil {
-		log.Infof("Waiting clear signal to launch %s", session.ID)
-		select {
-		case <-t.ctx.Done():
-			log.Warnf("Waiting to launch %s canceled, bailing out", session.ID)
-			return nil
-		case <-session.ClearToLaunch:
-			log.Infof("Received the clear signal to launch %s", session.ID)
-		}
-		// reset RunBlock to unblock process start next time
-		session.RunBlock = false
-	}
-
-	pid := 0
-	// Use the mutex to make creating a child and adding the child pid into the
-	// childPidTable appear atomic to the reaper function. Use a anonymous function
-	// so we can defer unlocking locally
-	// logging is done after the function to keep the locked time as low as possible
-	err = func() error {
-		t.config.pidMutex.Lock()
-		defer t.config.pidMutex.Unlock()
-
-		if !session.Tty {
-			err = establishNonPty(session)
-		} else {
-			err = establishPty(session)
-		}
-		if err != nil {
-			return err
-		}
-
-		pid = session.Cmd.Process.Pid
-		t.config.pids[pid] = session
-
-		return nil
-	}()
-
-	if err != nil {
-		detail := fmt.Sprintf("failed to start container process: %s", err)
-		log.Error(detail)
-
-		// Set the Started key to the undecorated error message
-		session.Started = err.Error()
-
-		return errors.New(detail)
-	}
-
-	// Set the Started key to "true" - this indicates a successful launch
-	session.Started = "true"
-
-	// Write the PID to the associated PID file
-	cmdname := path.Base(session.Cmd.Path)
-	err = ioutil.WriteFile(fmt.Sprintf("%s.pid", path.Join(shared.PIDFileDir(), cmdname)),
-		[]byte(fmt.Sprintf("%d", pid)),
-		0644)
-	if err != nil {
-		log.Errorf("Unable to write PID file for %s: %s", cmdname, err)
-	}
-	log.Debugf("Launched command with pid %d", pid)
-
-	return nil
-}
-
-func logConfig(config *ExecutorConfig) {
-	// just pretty print the json for now
-	log.Info("Loaded executor config")
-
-	// figure out the keys to filter
-	keys := make(map[string]interface{})
-	if config.DebugLevel < 2 {
-		for _, f := range []string{
-			"Sessions.*.Cmd.Args",
-			"Sessions.*.Cmd.Args.*",
-			"Sessions.*.Cmd.Env",
-			"Sessions.*.Cmd.Env.*",
-			"Key"} {
-			for _, k := range extraconfig.CalculateKeys(config, f, "") {
-				keys[k] = nil
-			}
-		}
-	}
-
-	sink := map[string]string{}
-	extraconfig.Encode(
-		func(k, v string) error {
-			if _, ok := keys[k]; !ok {
-				sink[k] = v
-			}
-
-			return nil
-		},
-		config,
-	)
-
-	for k, v := range sink {
-		log.Debugf("%s: %s", k, v)
-	}
-
-}
-
-func (t *tether) forkHandler() {
-	defer trace.End(trace.Begin("start fork trigger handler"))
-
-	defer func() {
-		if r := recover(); r != nil {
-			log.Println("Recovered in forkHandler", r)
-		}
-	}()
-
-	incoming := make(chan os.Signal, 1)
-	signal.Notify(incoming, syscall.SIGABRT)
-
-	log.Info("SIGABRT handling initialized for fork support")
-	for range incoming {
-		// validate that this is a fork trigger and not just a random signal from
-		// container processes
-		log.Info("Received SIGABRT - preparing to transition to fork parent")
-
-		// TODO: record fork trigger in Config and persist
-
-		// TODO: do we need to rebind session executions stdio to /dev/null or to files?
-		err := t.ops.Fork()
-		if err != nil {
-			log.Errorf("vmfork failed:%s\n", err)
-			// TODO: how do we handle fork failure behaviour at a container level?
-			// Does it differ if triggered manually vs via pointcut conditions in a build file
-			continue
-		}
-
-		// trigger a reload of the configuration
-		log.Info("Triggering reload of config after fork")
-		t.reload <- struct{}{}
-	}
-}
-
-// restartableCmd takes the Cmd struct for a process that has been run and creates a new
-// one that can be lauched again. Stdin/out will need to be set up again.
-func restartableCmd(cmd *exec.Cmd) *exec.Cmd {
-	return &exec.Cmd{
-		Path:        cmd.Path,
-		Args:        cmd.Args,
-		Env:         cmd.Env,
-		Dir:         cmd.Dir,
-		ExtraFiles:  cmd.ExtraFiles,
-		SysProcAttr: cmd.SysProcAttr,
-	}
-}
-
-// Config interface
-func (t *tether) UpdateNetworkEndpoint(e *NetworkEndpoint) error {
-	defer trace.End(trace.Begin("tether.UpdateNetworkEndpoint"))
-
-	if e == nil {
-		return fmt.Errorf("endpoint must be specified")
-	}
-
-	if _, ok := t.config.Networks[e.Network.Name]; !ok {
-		return fmt.Errorf("network endpoint not found in config")
-	}
-
-	t.config.Networks[e.Network.Name] = e
-	return nil
-}
-
-func (t *tether) Flush() error {
-	defer trace.End(trace.Begin("tether.Flush"))
-
-	extraconfig.Encode(t.sink, t.config)
-	return nil
-}
-
-// killHelper was pulled from toolbox, and that variant should be directed at this
-// one eventually
-func killHelper(session *SessionConfig) error {
-	sig := new(msgs.SignalMsg)
-	name := session.StopSignal
-	if name == "" {
-		name = string(ssh.SIGTERM)
-	}
-
-	err := sig.FromString(name)
-	if err != nil {
-		return err
-	}
-
-	num := syscall.Signal(sig.Signum())
-
-	log.Infof("sending signal %s (%d) to %s", sig.Signal, num, session.ID)
-
-	if err := session.Cmd.Process.Signal(num); err != nil {
-		return fmt.Errorf("failed to signal %s: %s", session.ID, err)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/tether_linux.go b/installer/vendor/github.com/vmware/vic/lib/tether/tether_linux.go
deleted file mode 100644
index 66b4a982ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/tether_linux.go
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"os/signal"
-	"path/filepath"
-	"runtime/debug"
-	"strings"
-	"syscall"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/kr/pty"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	//https://github.com/golang/go/blob/master/src/syscall/zerrors_linux_arm64.go#L919
-	SetChildSubreaper = 0x24
-
-	// in sync with lib/apiservers/portlayer/handlers/interaction_handler.go
-	// 115200 bps is 14.4 KB/s so use that
-	ioCopyBufferSize = 14 * 1024
-)
-
-// Mkdev will hopefully get rolled into go.sys at some point
-func Mkdev(majorNumber int, minorNumber int) int {
-	return (majorNumber << 8) | (minorNumber & 0xff) | ((minorNumber & 0xfff00) << 12)
-}
-
-// ReloadConfig signals the current process, which triggers the signal handler
-// to reload the config.
-func ReloadConfig() error {
-	defer trace.End(trace.Begin(""))
-
-	p, err := os.FindProcess(os.Getpid())
-	if err != nil {
-		return err
-	}
-
-	if err = p.Signal(syscall.SIGHUP); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// childReaper is used to handle events from child processes, including child exit.
-// If running as pid=1 then this means it handles zombie process reaping for orphaned children
-// as well as direct child processes.
-func (t *tether) childReaper() error {
-	signal.Notify(t.incoming, syscall.SIGCHLD)
-
-	/*
-	   PR_SET_CHILD_SUBREAPER (since Linux 3.4)
-	          If arg2 is nonzero, set the "child subreaper" attribute of the
-	          calling process; if arg2 is zero, unset the attribute.  When a
-	          process is marked as a child subreaper, all of the children
-	          that it creates, and their descendants, will be marked as
-	          having a subreaper.  In effect, a subreaper fulfills the role
-	          of init(1) for its descendant processes.  Upon termination of
-	          a process that is orphaned (i.e., its immediate parent has
-	          already terminated) and marked as having a subreaper, the
-	          nearest still living ancestor subreaper will receive a SIGCHLD
-	          signal and be able to wait(2) on the process to discover its
-	          termination status.
-	*/
-	if _, _, err := syscall.RawSyscall(syscall.SYS_PRCTL, SetChildSubreaper, uintptr(1), 0); err != 0 {
-		return err
-	}
-
-	log.Info("Started reaping child processes")
-
-	go func() {
-		var status syscall.WaitStatus
-		flag := syscall.WNOHANG | syscall.WUNTRACED | syscall.WCONTINUED
-
-		for range t.incoming {
-			func() {
-				// general resiliency
-				defer func() {
-					if r := recover(); r != nil {
-						fmt.Fprintf(os.Stderr, "Recovered in childReaper: %s\n%s", r, debug.Stack())
-					}
-				}()
-
-				// reap until no more children to process
-				for {
-					log.Debugf("Inspecting children with status change")
-
-					select {
-					case <-t.ctx.Done():
-						log.Warnf("Someone called shutdown, returning from child reaper")
-						return
-					default:
-					}
-
-					pid, err := syscall.Wait4(-1, &status, flag, nil)
-					// pid 0 means no processes wish to report status
-					if pid == 0 || err == syscall.ECHILD {
-						log.Debug("No more child processes to reap")
-						break
-					}
-
-					if err != nil {
-						log.Warnf("Wait4 got error: %v\n", err)
-						break
-					}
-
-					if !status.Exited() && !status.Signaled() {
-						log.Debugf("Received notifcation about non-exit status change for %d: %d", pid, status)
-						// no reaping or exit handling required
-						continue
-					}
-
-					exitCode := status.ExitStatus()
-					log.Debugf("Reaped process %d, return code: %d", pid, exitCode)
-
-					session, ok := t.removeChildPid(pid)
-					if ok {
-						log.Debugf("Removed child pid: %d", pid)
-						session.Lock()
-						session.ExitStatus = exitCode
-
-						t.handleSessionExit(session)
-						session.Unlock()
-						continue
-					}
-
-					ok = t.ops.HandleUtilityExit(pid, exitCode)
-					if ok {
-						log.Debugf("Remove utility pid: %d", pid)
-						continue
-					}
-
-					log.Infof("Reaped zombie process PID %d", pid)
-				}
-			}()
-		}
-		log.Info("Stopped reaping child processes")
-	}()
-
-	return nil
-}
-
-func (t *tether) stopReaper() {
-	defer trace.End(trace.Begin("Shutting down child reaping"))
-
-	// Ordering is important otherwise we may one goroutine closing, and the other goroutine is trying to write afterwards
-	log.Debugf("Removing the signal notifier")
-	signal.Reset(syscall.SIGCHLD)
-
-	// just closing the incoming channel is not going to stop the iteration
-	// so we use the context cancellation to signal it
-	t.cancel()
-
-	log.Debugf("Closing the reapers signal channel")
-	close(t.incoming)
-}
-
-func (t *tether) triggerReaper() {
-	defer trace.End(trace.Begin("Triggering child reaping"))
-
-	t.incoming <- syscall.SIGCHLD
-}
-
-func findExecutable(file string) error {
-	d, err := os.Stat(file)
-	if err != nil {
-		return err
-	}
-	if m := d.Mode(); !m.IsDir() && m&0111 != 0 {
-		return nil
-	}
-	return os.ErrPermission
-}
-
-// lookPath searches for an executable binary named file in the directories
-// specified by the path argument.
-// This is a direct modification of the unix os/exec core library impl
-func lookPath(file string, env []string, dir string) (string, error) {
-	// if it starts with a ./ or ../ it's a relative path
-	// need to check explicitly to allow execution of .hidden files
-
-	if strings.HasPrefix(file, "./") || strings.HasPrefix(file, "../") {
-		file = fmt.Sprintf("%s%c%s", dir, os.PathSeparator, file)
-		err := findExecutable(file)
-		if err == nil {
-			return filepath.Clean(file), nil
-		}
-		return "", err
-	}
-
-	// check if it's already a path spec
-	if strings.Contains(file, "/") {
-		err := findExecutable(file)
-		if err == nil {
-			return filepath.Clean(file), nil
-		}
-		return "", err
-	}
-
-	// extract path from the env
-	var pathenv string
-	for _, value := range env {
-		if strings.HasPrefix(value, "PATH=") {
-			pathenv = value
-			break
-		}
-	}
-
-	pathval := strings.TrimPrefix(pathenv, "PATH=")
-
-	dirs := filepath.SplitList(pathval)
-	for _, dir := range dirs {
-		if dir == "" {
-			// Unix shell semantics: path element "" means "."
-			dir = "."
-		}
-		path := dir + "/" + file
-		if err := findExecutable(path); err == nil {
-			return filepath.Clean(path), nil
-		}
-	}
-
-	return "", fmt.Errorf("%s: no such executable in PATH", file)
-}
-
-func establishPty(session *SessionConfig) error {
-	defer trace.End(trace.Begin("initializing pty handling for session " + session.ID))
-
-	// pty.Start creates a process group anyway so no change needed to kill all descendants
-	var err error
-	session.Pty, err = pty.Start(&session.Cmd)
-	if err != nil {
-		return err
-	}
-
-	session.wait.Add(1)
-	go func() {
-		_, gerr := io.CopyBuffer(session.Outwriter, session.Pty, make([]byte, ioCopyBufferSize))
-		log.Debugf("PTY stdout copy: %s", gerr)
-
-		session.wait.Done()
-	}()
-
-	go func() {
-		_, gerr := io.CopyBuffer(session.Pty, session.Reader, make([]byte, ioCopyBufferSize))
-		log.Debugf("PTY stdin copy: %s", gerr)
-
-		// ensure that an EOT is delivered to the process - this makes the behaviour on EOF at this layer
-		// consistent between tty and non-tty cases
-		n, gerr := session.Pty.Write([]byte("\x04"))
-		if n != 1 || gerr != nil {
-			log.Errorf("Failed to write EOT to pty, closing directly: %s", gerr)
-			session.Pty.Close()
-		}
-		log.Debug("Written EOT to pty")
-	}()
-
-	return nil
-}
-
-func establishNonPty(session *SessionConfig) error {
-	defer trace.End(trace.Begin("initializing nonpty handling for session " + session.ID))
-	var err error
-
-	// configure a process group so we can kill any descendants
-	if session.Cmd.SysProcAttr == nil {
-		session.Cmd.SysProcAttr = &syscall.SysProcAttr{}
-	}
-	session.Cmd.SysProcAttr.Setsid = true
-
-	if session.OpenStdin {
-		log.Debugf("Setting StdinPipe")
-		if session.StdinPipe, err = session.Cmd.StdinPipe(); err != nil {
-			log.Errorf("StdinPipe failed with %s", err)
-			return err
-		}
-	}
-
-	log.Debugf("Setting StdoutPipe")
-	if session.StdoutPipe, err = session.Cmd.StdoutPipe(); err != nil {
-		log.Errorf("Setting StdoutPipe failed with %s", err)
-		return err
-	}
-
-	log.Debugf("Setting StderrPipe")
-	if session.StderrPipe, err = session.Cmd.StderrPipe(); err != nil {
-		log.Errorf("Setting StderrPipe failed with %s", err)
-		return err
-	}
-
-	if session.OpenStdin {
-		go func() {
-			_, gerr := io.CopyBuffer(session.StdinPipe, session.Reader, make([]byte, ioCopyBufferSize))
-			log.Debugf("Reader stdin returned: %s", gerr)
-
-			if gerr == nil {
-				if cerr := session.StdinPipe.Close(); cerr != nil {
-					log.Errorf("(stdin): Close StdinPipe failed with %s", cerr)
-				}
-			}
-		}()
-	}
-
-	// Add 2 for Std{out|err}
-	session.wait.Add(2)
-	go func() {
-		_, gerr := io.CopyBuffer(session.Outwriter, session.StdoutPipe, make([]byte, ioCopyBufferSize))
-		log.Debugf("Writer goroutine for stdout returned: %s", gerr)
-
-		if session.StdinPipe != nil {
-			log.Debugf("(stdout): Writing zero byte to stdin pipe")
-			n, werr := session.StdinPipe.Write([]byte{})
-			if n == 0 && werr != nil && werr.Error() == "write |1: bad file descriptor" {
-				log.Debugf("(stdout): Closing stdin pipe")
-				if cerr := session.StdinPipe.Close(); cerr != nil {
-					log.Errorf("Close failed with %s", cerr)
-				}
-			}
-		}
-		log.Debugf("Writer goroutine for stdout exiting")
-
-		session.wait.Done()
-	}()
-
-	go func() {
-		_, gerr := io.CopyBuffer(session.Errwriter, session.StderrPipe, make([]byte, ioCopyBufferSize))
-		log.Debugf("Writer goroutine for stderr returned: %s", gerr)
-
-		if session.StdinPipe != nil {
-			log.Debugf("(stderr): Writing zero byte to stdin pipe")
-			n, werr := session.StdinPipe.Write([]byte{})
-			if n == 0 && werr != nil && werr.Error() == "write |1: bad file descriptor" {
-				log.Debugf("(stderr): Closing stdin pipe")
-				if cerr := session.StdinPipe.Close(); cerr != nil {
-					log.Errorf("Close failed with %s", cerr)
-				}
-			}
-		}
-		log.Debugf("Writer goroutine for stderr exiting")
-
-		session.wait.Done()
-	}()
-
-	return session.Cmd.Start()
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/tether_test.go b/installer/vendor/github.com/vmware/vic/lib/tether/tether_test.go
deleted file mode 100644
index 5c9176b8c8..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/tether_test.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tether
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"runtime"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/vishvananda/netlink"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config/executor"
-	"github.com/vmware/vic/lib/etcconf"
-	"github.com/vmware/vic/lib/system"
-	"github.com/vmware/vic/pkg/dio"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-var Tthr Tether
-
-type Mocker struct {
-	Base BaseOperations
-
-	// allow tests to tell when the tether has finished setup
-	Started chan bool
-	// allow tests to tell when the tether has finished
-	Cleaned chan bool
-	// allow tests to wait for a reload to complete
-	Reloaded chan bool
-
-	// debug output gets logged here
-	LogWriter io.Writer
-
-	// session output gets logged here
-	SessionLogBuffer bytes.Buffer
-
-	// the hostname of the system
-	Hostname string
-	Aliases  []string
-	// the maximum slot number returned from this mocker
-	maxSlot int
-	// the interfaces in the system indexed by name
-	Interfaces map[string]netlink.Link
-	// filesystem mounts, indexed by disk label
-	Mounts map[string]string
-
-	WindowCol uint32
-	WindowRow uint32
-	Signal    ssh.Signal
-
-	FirewallRules []string
-}
-
-// Start implements the extension method
-func (t *Mocker) Start() error {
-	return nil
-}
-
-// Stop implements the extension method
-func (t *Mocker) Stop() error {
-	close(t.Cleaned)
-
-	defer func() {
-		// tolerate closing started again
-		recover()
-	}()
-	close(t.Started)
-	close(t.Reloaded)
-	return nil
-}
-
-// Reload implements the extension method
-func (t *Mocker) Reload(config *ExecutorConfig) error {
-	// the tether has definitely finished it's startup by the time we hit this
-	defer func() {
-		// if we trigger another Reload we don't want to panic
-		recover()
-	}()
-
-	t.Reloaded <- true
-	close(t.Started)
-	return nil
-}
-
-func (t *Mocker) Cleanup() error {
-	return nil
-}
-
-func (t *Mocker) Setup(c Config) error {
-	return t.Base.Setup(c)
-}
-
-func (t *Mocker) Log() (io.Writer, error) {
-	if t.LogWriter != nil {
-		return t.LogWriter, nil
-	}
-
-	return os.Stdout, nil
-}
-
-func (t *Mocker) SetupFirewall(ctx context.Context, conf *ExecutorConfig) error {
-	return nil
-}
-
-func (t *Mocker) SessionLog(session *SessionConfig) (dio.DynamicMultiWriter, dio.DynamicMultiWriter, error) {
-	return dio.MultiWriter(&t.SessionLogBuffer), dio.MultiWriter(&t.SessionLogBuffer), nil
-}
-
-func (t *Mocker) HandleSessionExit(config *ExecutorConfig, session *SessionConfig) func() {
-	// check for executor behaviour
-	return func() {
-		if session.ID == config.ID {
-			Tthr.Stop()
-		}
-	}
-}
-
-func (t *Mocker) ProcessEnv(env []string) []string {
-	return t.Base.ProcessEnv(env)
-}
-
-// SetHostname sets both the kernel hostname and /etc/hostname to the specified string
-func (t *Mocker) SetHostname(hostname string, aliases ...string) error {
-	defer trace.End(trace.Begin("mocking hostname to " + hostname))
-
-	// TODO: we could mock at a much finer granularity, only extracting the syscall
-	// that would exercise the file modification paths, however it's much less generalizable
-	t.Hostname = hostname
-	t.Aliases = aliases
-	return nil
-}
-
-// Apply takes the network endpoint configuration and applies it to the system
-func (t *Mocker) Apply(endpoint *NetworkEndpoint) error {
-	return ApplyEndpoint(t, &t.Base, endpoint)
-}
-
-// MountLabel performs a mount with the source treated as a disk label
-// This assumes that /dev/disk/by-label is being populated, probably by udev
-func (t *Mocker) MountLabel(ctx context.Context, label, target string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", label, target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[label] = target
-	return nil
-}
-
-// MountTarget performs a mount with the source treated as an nfs target
-func (t *Mocker) MountTarget(ctx context.Context, source url.URL, target string, mountOptions string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking mounting %s on %s", source.String(), target)))
-
-	if t.Mounts == nil {
-		t.Mounts = make(map[string]string)
-	}
-
-	t.Mounts[source.String()] = target
-	return nil
-}
-
-// CopyExistingContent copies the underlying files shadowed by a mount on a directory
-// to the volume mounted on the directory
-func (t *Mocker) CopyExistingContent(source string) error {
-	defer trace.End(trace.Begin(fmt.Sprintf("mocking copyExistingContent from %s", source)))
-	return nil
-}
-
-// Fork triggers vmfork and handles the necessary pre/post OS level operations
-func (t *Mocker) Fork() error {
-	defer trace.End(trace.Begin("mocking fork"))
-	return errors.New("Fork test not implemented")
-}
-
-// LaunchUtility uses the underlying implementation for launching and tracking utility processes
-func (t *Mocker) LaunchUtility(fn UtilityFn) (<-chan int, error) {
-	return launchUtility(&t.Base, fn)
-}
-
-func (t *Mocker) HandleUtilityExit(pid, exitCode int) bool {
-	return handleUtilityExit(&t.Base, pid, exitCode)
-}
-
-// TestMain simply so we have control of debugging level and somewhere to call package wide test setup
-func TestMain(m *testing.M) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger = log.StandardLogger()
-
-	// restore what we inherited.
-	defer func(hosts etcconf.Hosts, resolv etcconf.ResolvConf) {
-		Sys.Hosts = hosts
-		Sys.ResolvConf = resolv
-	}(Sys.Hosts, Sys.ResolvConf)
-
-	// replace the Sys variable with a mock
-	r, err := ioutil.TempDir("", "tether-root")
-	if err != nil {
-		os.Exit(1)
-		log.Fatalf("Failed to create tmpdir for test root filesytem: %s", err)
-	}
-
-	Sys = system.NewWithRoot(r)
-	Sys.Syscall = &MockSyscall{}
-
-	BindSys = system.NewWithRoot(path.Join(Sys.Root, "/.tether"))
-	BindSys.Syscall = &MockSyscall{}
-
-	// ensure that the bindsys root exists
-	// #nosec
-	os.MkdirAll(BindSys.Root, 0744)
-
-	log.Debugf("Configured sys and bindsys to root in %s and %s", Sys.Root, BindSys.Root)
-
-	retCode := m.Run()
-
-	// call with result of m.Run()
-	os.Exit(retCode)
-}
-
-func StartTether(t *testing.T, cfg *executor.ExecutorConfig, mocker *Mocker) (Tether, extraconfig.DataSource, extraconfig.DataSink) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	Tthr = New(src, sink, mocker)
-	Tthr.Register("mocker", mocker)
-
-	// run the tether to service the attach
-	go func() {
-		erR := Tthr.Start()
-		if erR != nil {
-			t.Error(erR)
-		}
-	}()
-
-	return Tthr, src, sink
-}
-
-func RunTether(t *testing.T, cfg *executor.ExecutorConfig, mocker *Mocker) (Tether, extraconfig.DataSource, error) {
-	store := extraconfig.New()
-	sink := store.Put
-	src := store.Get
-	extraconfig.Encode(sink, cfg)
-	log.Debugf("Test configuration: %#v", sink)
-
-	Tthr = New(src, sink, mocker)
-	Tthr.Register("Mocker", mocker)
-
-	// run the tether to service the attach
-	erR := Tthr.Start()
-
-	return Tthr, src, erR
-}
-
-func OptionValueArrayToString(options []types.BaseOptionValue) string {
-	// create the key/value store from the extraconfig slice for lookups
-	kv := make(map[string]string)
-	for i := range options {
-		k := options[i].GetOptionValue().Key
-		v := options[i].GetOptionValue().Value.(string)
-		kv[k] = v
-	}
-
-	return fmt.Sprintf("%#v", kv)
-}
-
-func testSetup(t *testing.T) (string, *Mocker) {
-	pc, _, _, _ := runtime.Caller(1)
-	name := runtime.FuncForPC(pc).Name()
-
-	log.Infof("Started test setup for %s", name)
-
-	// use the mock ops - fresh one each time as tests might apply different mocked calls
-	mocker := &Mocker{
-		Started:    make(chan bool, 0),
-		Cleaned:    make(chan bool, 0),
-		Reloaded:   make(chan bool, 100),
-		Interfaces: make(map[string]netlink.Link, 0),
-	}
-
-	return name, mocker
-}
-
-func testTeardown(t *testing.T, mocker *Mocker) {
-	// cleanup
-	// os.RemoveAll(pathPrefix)
-	log.SetOutput(os.Stdout)
-
-	<-mocker.Cleaned
-
-	pc, _, _, _ := runtime.Caller(1)
-	name := runtime.FuncForPC(pc).Name()
-
-	log.Infof("Finished test teardown for %s", name)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/tether/toolbox.go b/installer/vendor/github.com/vmware/vic/lib/tether/toolbox.go
deleted file mode 100644
index 3b549d3562..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/tether/toolbox.go
+++ /dev/null
@@ -1,422 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !windows,!darwin
-
-package tether
-
-import (
-	"archive/tar"
-	"context"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"strconv"
-	"sync"
-	"syscall"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	dar "github.com/docker/docker/pkg/archive"
-	"golang.org/x/crypto/ssh"
-
-	"github.com/vmware/govmomi/toolbox"
-	"github.com/vmware/govmomi/toolbox/hgfs"
-	"github.com/vmware/govmomi/toolbox/vix"
-	"github.com/vmware/vic/cmd/tether/msgs"
-	"github.com/vmware/vic/lib/archive"
-	"github.com/vmware/vic/lib/tether/shared"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Toolbox is a tether extension that wraps toolbox.Service
-type Toolbox struct {
-	*toolbox.Service
-
-	sess struct {
-		sync.Mutex
-		session *SessionConfig
-	}
-
-	// IDs that can be used to authenticate
-	authIDs map[string]struct{}
-
-	stop chan struct{}
-}
-
-var (
-	defaultArchiveHandler = hgfs.NewArchiveHandler().(*hgfs.ArchiveHandler)
-	baseOp                = &BaseOperations{}
-)
-
-// NewToolbox returns a tether.Extension that wraps the vsphere/toolbox service
-func NewToolbox() *Toolbox {
-	in := toolbox.NewBackdoorChannelIn()
-	out := toolbox.NewBackdoorChannelOut()
-
-	service := toolbox.NewService(in, out)
-	service.PrimaryIP = toolbox.DefaultIP
-
-	return &Toolbox{
-		Service: service,
-		authIDs: make(map[string]struct{}),
-	}
-}
-
-// Start implementation of the tether.Extension interface
-func (t *Toolbox) Start() error {
-	t.stop = make(chan struct{})
-	on := make(chan struct{})
-
-	t.Service.Power.PowerOn.Handler = func() error {
-		log.Info("toolbox: service is ready (power on event received)")
-		close(on)
-		return nil
-	}
-
-	err := t.Service.Start()
-	if err != nil {
-		return err
-	}
-
-	// Wait for the vmx to send the OS_PowerOn message,
-	// at which point it will be ready to service vix command requests.
-	log.Info("toolbox: waiting for initialization")
-
-	select {
-	case <-on:
-	case <-time.After(time.Second):
-		log.Warn("toolbox: timeout waiting for power on event")
-	}
-
-	return nil
-}
-
-// Stop implementation of the tether.Extension interface
-func (t *Toolbox) Stop() error {
-	t.Service.Stop()
-
-	t.Service.Wait()
-
-	close(t.stop)
-
-	return nil
-}
-
-// Reload implementation of the tether.Extension interface
-func (t *Toolbox) Reload(config *ExecutorConfig) error {
-	if config != nil && config.Sessions != nil {
-		t.sess.Lock()
-		defer t.sess.Unlock()
-		t.sess.session = config.Sessions[config.ID]
-	}
-
-	// we allow the primary session
-	t.authIDs[config.ID] = struct{}{}
-	// we also allow any device IDs that are attached
-	for _, mspec := range config.Mounts {
-		// mounstpect.source.path is the disk label for vmdks
-		// TODO: this is not the case for other volumes, eg nfs vols.
-		if mspec.Source.Scheme == "label" {
-			t.authIDs[mspec.Source.Path] = struct{}{}
-		}
-	}
-
-	return nil
-}
-
-// InContainer configures the toolbox to run within a container VM
-func (t *Toolbox) InContainer() *Toolbox {
-	t.Power.Halt.Handler = t.halt
-
-	cmd := t.Service.Command
-	cmd.Authenticate = t.containerAuthenticate
-	cmd.ProcessStartCommand = t.containerStartCommand
-
-	cmd.FileServer.RegisterFileHandler(hgfs.ArchiveScheme, &hgfs.ArchiveHandler{
-		Read:  toolboxOverrideArchiveRead,
-		Write: toolboxOverrideArchiveWrite,
-	})
-
-	return t
-}
-
-func (t *Toolbox) session() *SessionConfig {
-	t.sess.Lock()
-	defer t.sess.Unlock()
-	return t.sess.session
-}
-
-func (t *Toolbox) kill(_ context.Context, name string) error {
-	session := t.session()
-	if session == nil {
-		return fmt.Errorf("failed to kill container: process not found")
-	}
-
-	session.Lock()
-	defer session.Unlock()
-	return t.killHelper(session, name)
-}
-
-func (t *Toolbox) killHelper(session *SessionConfig, name string) error {
-	if name == "" {
-		name = string(ssh.SIGTERM)
-	}
-
-	if session.Cmd.Process == nil {
-		return fmt.Errorf("the session %s hasn't launched yet", session.ID)
-	}
-
-	sig := new(msgs.SignalMsg)
-	err := sig.FromString(name)
-	if err != nil {
-		return err
-	}
-
-	num := syscall.Signal(sig.Signum())
-
-	log.Infof("sending signal %s (%d) to process group for %s", sig.Signal, num, session.ID)
-	if err := syscall.Kill(-session.Cmd.Process.Pid, num); err != nil {
-		return fmt.Errorf("failed to signal %s group: %s", session.ID, err)
-	}
-
-	return nil
-}
-
-func (t *Toolbox) containerAuthenticate(_ vix.CommandRequestHeader, data []byte) error {
-	var c vix.UserCredentialNamePassword
-	if err := c.UnmarshalBinary(data); err != nil {
-		return err
-	}
-
-	session := t.session()
-	if session == nil {
-		return errors.New("not yet initialized")
-	}
-
-	session.Lock()
-	defer session.Unlock()
-
-	// no authentication yet, just using container ID and device IDs as a sanity check for now
-	if _, ok := t.authIDs[c.Name]; !ok {
-		return errors.New("failed to verify authentication ID")
-	}
-
-	return nil
-}
-
-func (t *Toolbox) containerStartCommand(m *toolbox.ProcessManager, r *vix.StartProgramRequest) (int64, error) {
-	var p *toolbox.Process
-
-	switch r.ProgramPath {
-	case "kill":
-		p = toolbox.NewProcessFunc(t.kill)
-	case "reload":
-		p = toolbox.NewProcessFunc(func(_ context.Context, _ string) error {
-			return ReloadConfig()
-		})
-	default:
-		return -1, fmt.Errorf("unknown command %q", r.ProgramPath)
-	}
-
-	return m.Start(r, p)
-}
-
-func (t *Toolbox) halt() error {
-	session := t.session()
-	if session == nil {
-		return fmt.Errorf("failed to halt container: not initialized yet")
-	}
-
-	session.Lock()
-	defer session.Unlock()
-
-	if session.Cmd.Process == nil {
-		return fmt.Errorf("the session %s hasn't launched yet", session.ID)
-	}
-
-	log.Infof("stopping %s", session.ID)
-
-	if err := t.killHelper(session, session.StopSignal); err != nil {
-		return err
-	}
-
-	// Killing the executor session in the container VM will stop the tether and its extensions.
-	// If that doesn't happen within the timeout, send a SIGKILL.
-	select {
-	case <-t.stop:
-		log.Infof("%s has stopped", session.ID)
-		return nil
-	case <-time.After(time.Second * 10):
-	}
-
-	log.Warnf("killing %s", session.ID)
-
-	return session.Cmd.Process.Kill()
-}
-
-// toolboxOverrideArchiveRead is the online DataSink Override Handler
-func toolboxOverrideArchiveRead(u *url.URL, tr *tar.Reader) error {
-
-	// special behavior when using disk-labels and filterspec
-	diskLabel := u.Query().Get(shared.DiskLabelQueryName)
-	filterSpec := u.Query().Get(shared.FilterSpecQueryName)
-	if diskLabel != "" && filterSpec != "" {
-		op := trace.NewOperation(context.Background(), "ToolboxOnlineDataSink: %s", u.String())
-		op.Debugf("Reading from tar archive to path %s: %s", u.Path, u.String())
-		spec, err := archive.DecodeFilterSpec(op, &filterSpec)
-		if err != nil {
-			op.Errorf(err.Error())
-			return err
-		}
-
-		diskPath, err := mountDiskLabel(op, diskLabel)
-		if err != nil {
-			op.Errorf(err.Error())
-			return err
-		}
-		defer unmount(op, diskPath)
-
-		// no need to join on u.Path here. u.Path == spec.Rebase, but
-		// Unpack will rebase tar headers for us. :thumbsup:
-		err = archive.Unpack(op, tr, spec, diskPath)
-		if err != nil {
-			op.Errorf(err.Error())
-		}
-		op.Debugf("Finished reading from tar archive to path %s: %s", u.Path, u.String())
-		return err
-	}
-	return defaultArchiveHandler.Read(u, tr)
-
-}
-
-// toolboxOverrideArchiveWrite is the Online DataSource Override Handler
-func toolboxOverrideArchiveWrite(u *url.URL, tw *tar.Writer) error {
-
-	// special behavior when using disk-labels and filterspec
-	diskLabel := u.Query().Get(shared.DiskLabelQueryName)
-	filterSpec := u.Query().Get(shared.FilterSpecQueryName)
-
-	skiprecurse, _ := strconv.ParseBool(u.Query().Get(shared.SkipRecurseQueryName))
-	skipdata, _ := strconv.ParseBool(u.Query().Get(shared.SkipDataQueryName))
-
-	if diskLabel != "" && filterSpec != "" {
-		op := trace.NewOperation(context.Background(), "ToolboxOnlineDataSource: %s", u.String())
-		op.Debugf("Writing to archive from %s: %s", u.Path, u.String())
-
-		spec, err := archive.DecodeFilterSpec(op, &filterSpec)
-		if err != nil {
-			op.Errorf(err.Error())
-			return err
-		}
-
-		// get the container fs mount
-		diskPath, err := mountDiskLabel(op, diskLabel)
-		if err != nil {
-			op.Errorf(err.Error())
-			return err
-		}
-		defer unmount(op, diskPath)
-
-		var rc io.ReadCloser
-		if skiprecurse {
-			// we only want a single file - this is a hack while we're abusing Diff, but
-			// accomplish this by generating a single entry ChangeSet
-			changes := []dar.Change{
-				{
-					Kind: dar.ChangeModify,
-					Path: u.Path,
-				},
-			}
-
-			rc, err = archive.Tar(op, diskPath, changes, spec, !skipdata, false)
-		} else {
-			rc, err = archive.Diff(op, diskPath, "", spec, !skipdata, false)
-		}
-
-		if err != nil {
-			op.Errorf(err.Error())
-			return err
-		}
-
-		tr := tar.NewReader(rc)
-		defer rc.Close()
-		for {
-			hdr, err := tr.Next()
-			if err == io.EOF {
-				op.Debugf("Finished writing to archive from %s: %s with error %#v", u.Path, u.String(), err)
-				break
-			}
-			if err != nil {
-				op.Errorf("error writing tar: %s", err.Error())
-				return err
-			}
-			op.Debugf("Writing header: %#s", *hdr)
-			err = tw.WriteHeader(hdr)
-			if err != nil {
-				op.Errorf("error writing tar header: %s", err.Error())
-				return err
-			}
-			_, err = io.Copy(tw, tr)
-			if err != nil {
-				op.Errorf("error writing tar contents: %s", err.Error())
-				return err
-			}
-		}
-
-		return nil
-	}
-	return defaultArchiveHandler.Write(u, tw)
-}
-
-func mountDiskLabel(op trace.Operation, label string) (string, error) {
-	// We know the vmdk will always be attached at '/'
-	if label == "containerfs" {
-		return "/", nil
-	}
-
-	// otherwise, label represents a volume that needs to be mounted
-	tmpDir, err := ioutil.TempDir("", fmt.Sprintf("toolbox-%s", label))
-	if err != nil {
-		op.Errorf("failed to create mountpoint %s: %s", tmpDir, err)
-		return "", fmt.Errorf("failed to create mountpoint %s: %s", tmpDir, err)
-	}
-
-	err = baseOp.MountLabel(op, label, tmpDir)
-	if err != nil {
-		os.Remove(tmpDir)
-		op.Errorf("failed to mount label %s at %s: %s", label, tmpDir, err)
-		return "", fmt.Errorf("failed to mount label %s at %s: %s", label, tmpDir, err)
-	}
-
-	return tmpDir, nil
-}
-
-func unmount(op trace.Operation, unmountPath string) {
-	// don't unmount the root vmdk
-	if unmountPath == "/" {
-		return
-	}
-
-	// unmount the disk from the temporary directory
-	if err := Sys.Syscall.Unmount(unmountPath, syscall.MNT_DETACH); err != nil {
-		op.Errorf("failed to unmount %s: %s", unmountPath, err.Error())
-	}
-
-	// finally, remove the temporary directory
-	os.Remove(unmountPath)
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/vicadmin/validate.go b/installer/vendor/github.com/vmware/vic/lib/vicadmin/validate.go
deleted file mode 100644
index cb42981f4a..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/vicadmin/validate.go
+++ /dev/null
@@ -1,420 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vicadmin
-
-import (
-	"context"
-	"fmt"
-	"html/template"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/opts"
-
-	"github.com/vishvananda/netlink"
-
-	"github.com/vmware/govmomi/property"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/lib/install/validate"
-	"github.com/vmware/vic/lib/tether/shared"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/version"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-type Validator struct {
-	Hostname         string
-	Version          string
-	FirewallStatus   template.HTML
-	FirewallIssues   template.HTML
-	LicenseStatus    template.HTML
-	LicenseIssues    template.HTML
-	NetworkStatus    template.HTML
-	NetworkIssues    template.HTML
-	StorageRemaining template.HTML
-	HostIP           string
-	DockerPort       string
-	VCHStatus        template.HTML
-	VCHIssues        template.HTML
-	VCHReachable     bool
-	SystemTime       string
-}
-
-const (
-	GoodStatus     = template.HTML(`<i class="icon-ok"></i>`)
-	BadStatus      = template.HTML(`<i class="icon-attention"></i>`)
-	DefaultVCHName = ` `
-)
-
-func GetMgmtIP() net.IPNet {
-	var mgmtIP net.IPNet
-	// management alias may not be present, try others if not found
-	link := LinkByOneOfNameOrAlias(config.ManagementNetworkName, "public", "client")
-	if link == nil {
-		log.Error("unable to find any interfaces when searching for mgmt IP")
-		return mgmtIP
-	}
-
-	addrs, err := netlink.AddrList(link, netlink.FAMILY_V4)
-	if err != nil {
-		log.Errorf("error getting address list: %s", err)
-		return mgmtIP
-	}
-	if len(addrs) == 0 {
-		log.Warnf("no addresses on interface when searching for mgmt IP")
-		return mgmtIP
-	}
-	if len(addrs) > 1 {
-		log.Warnf("multiple addresses on interface when searching for mgmt IP, using first")
-	}
-	return *addrs[0].IPNet
-}
-
-func LinkByOneOfNameOrAlias(name ...string) netlink.Link {
-	for _, n := range name {
-		// #nosec: Errors unhandled.
-		if l, _ := netlink.LinkByName(n); l != nil {
-			return l
-		}
-		// #nosec: Errors unhandled.
-		if l, _ := netlink.LinkByAlias(n); l != nil {
-			return l
-		}
-	}
-	return nil
-}
-
-func NewValidator(ctx context.Context, vch *config.VirtualContainerHostConfigSpec, sess *session.Session) *Validator {
-	defer trace.End(trace.Begin(""))
-	log.Infof("Creating new validator")
-	v := &Validator{}
-
-	if version.Version != "" {
-		v.Version = version.Version
-	}
-	log.Infof("Setting version to %s", v.Version)
-
-	if err := v.GetVCHName(ctx, sess); err != nil {
-		log.Errorf("Failed to obtain the VCH name: %s", err)
-	}
-
-	// System time
-	v.SystemTime = time.Now().Format(time.UnixDate)
-
-	if sess == nil {
-		// We can't connect to vSphere
-		v.VCHReachable = false
-		v.FirewallStatus = BadStatus
-		v.FirewallIssues = template.HTML("")
-		v.LicenseStatus = BadStatus
-		v.LicenseIssues = template.HTML("")
-	} else {
-		v.VCHReachable = true
-		// Firewall status check
-		// #nosec: Errors unhandled.
-		v2, _ := validate.CreateFromVCHConfig(ctx, vch, sess)
-		mgmtIP := GetMgmtIP()
-		log.Infof("Using management IP %s for firewall check", mgmtIP)
-		fwStatus := v2.CheckFirewallForTether(ctx, mgmtIP)
-		v2.FirewallCheckOutput(fwStatus)
-
-		firewallIssues := v2.GetIssues()
-
-		if len(firewallIssues) == 0 {
-			v.FirewallStatus = GoodStatus
-			v.FirewallIssues = template.HTML("")
-		} else {
-			v.FirewallStatus = BadStatus
-			for _, err := range firewallIssues {
-				// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-				v.FirewallIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">%s</span>\n", v.FirewallIssues, err))
-			}
-		}
-
-		// License status check
-		v2.ClearIssues()
-		v2.CheckLicense(ctx)
-		licenseIssues := v2.GetIssues()
-
-		if len(licenseIssues) == 0 {
-			v.LicenseStatus = GoodStatus
-			v.LicenseIssues = template.HTML("")
-		} else {
-			v.LicenseStatus = BadStatus
-			for _, err := range licenseIssues {
-				// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-				v.LicenseIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">%s</span>\n", v.LicenseIssues, err))
-			}
-		}
-	}
-
-	log.Infof("FirewallStatus set to: %s", v.FirewallStatus)
-	log.Infof("FirewallIssues set to: %s", v.FirewallIssues)
-	log.Infof("LicenseStatus set to: %s", v.LicenseStatus)
-	log.Infof("LicenseIssues set to: %s", v.LicenseIssues)
-
-	// Network Connection Check
-	hosts := []string{
-		"http://google.com",
-		"https://docker.io",
-	}
-
-	nwErrors := []error{}
-
-	// create a http client with a custom transport using the proxy from env vars
-	client := &http.Client{Timeout: 10 * time.Second}
-	// priority given to https proxies
-	proxy := os.Getenv("VICADMIN_HTTPS_PROXY")
-	if proxy == "" {
-		proxy = os.Getenv("VICADMIN_HTTP_PROXY")
-	}
-	if proxy != "" {
-		url, err := url.Parse(proxy)
-		if err != nil {
-			nwErrors = append(nwErrors, err)
-		} else {
-			client.Transport = &http.Transport{Proxy: http.ProxyURL(url)}
-		}
-	}
-
-	// perform the wan check
-	var wg sync.WaitGroup
-	wg.Add(len(hosts))
-	errs := make(chan error, len(hosts))
-	for _, host := range hosts {
-		go func(host string) {
-			defer wg.Done()
-			log.Infof("Getting %s", host)
-			_, err := client.Get(host)
-			if err != nil {
-				errs <- err
-			}
-		}(host)
-	}
-
-	wg.Wait()
-	close(errs)
-	for err := range errs {
-		nwErrors = append(nwErrors, err)
-	}
-
-	if len(nwErrors) > 0 {
-		v.NetworkStatus = BadStatus
-		for _, err := range nwErrors {
-			// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-			v.NetworkIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">%s</span>\n", v.NetworkIssues, err))
-		}
-	} else {
-		v.NetworkStatus = GoodStatus
-		v.NetworkIssues = template.HTML("")
-	}
-	log.Infof("NetworkStatus set to: %s", v.NetworkStatus)
-	log.Infof("NetworkIssues set to: %s", v.NetworkIssues)
-
-	// Retrieve Host IP Information and Set Docker Endpoint
-	v.HostIP = vch.ExecutorConfig.Networks["client"].Assigned.IP.String()
-
-	if vch.HostCertificate.IsNil() {
-		v.DockerPort = fmt.Sprintf("%d", opts.DefaultHTTPPort)
-	} else {
-		v.DockerPort = fmt.Sprintf("%d", opts.DefaultTLSHTTPPort)
-	}
-
-	err := v.QueryDatastore(ctx, vch, sess)
-	if err != nil {
-		log.Errorf("Had a problem querying the datastores: %s", err.Error())
-	}
-	v.QueryVCHStatus(vch, sess)
-	defer func() {
-		if sess != nil && len(nwErrors) > 0 {
-			sess.Logout(ctx)
-		}
-	}()
-	return v
-}
-
-type dsList []mo.Datastore
-
-func (d dsList) Len() int           { return len(d) }
-func (d dsList) Swap(i, j int)      { d[i], d[j] = d[j], d[i] }
-func (d dsList) Less(i, j int) bool { return d[i].Name < d[j].Name }
-
-// Obtain the VCH name from vsphere
-func (v *Validator) GetVCHName(ctx context.Context, sess *session.Session) error {
-	defer trace.End(trace.Begin(""))
-
-	var err error
-
-	if sess == nil {
-		v.Hostname = DefaultVCHName
-		return fmt.Errorf("session is nil")
-	}
-
-	self, err := guest.GetSelf(ctx, sess)
-	if err != nil {
-		v.Hostname = DefaultVCHName
-		return fmt.Errorf("unknown self-reference: %s", err)
-	}
-
-	newVM := vm.NewVirtualMachineFromVM(ctx, sess, self)
-	vchName, err := newVM.Name(ctx)
-	if err != nil {
-		v.Hostname = DefaultVCHName
-		return err
-	}
-
-	v.Hostname = vchName
-	log.Infof("Setting the VCH name to %s", vchName)
-	return nil
-}
-
-func (v *Validator) QueryDatastore(ctx context.Context, vch *config.VirtualContainerHostConfigSpec, sess *session.Session) error {
-	if sess == nil {
-		// If we can't connect to vSphere, don't display datastore info
-		v.StorageRemaining = template.HTML("")
-		return nil
-	}
-
-	var dataStores dsList
-	dsNames := make(map[string]bool)
-
-	for _, url := range vch.ImageStores {
-		dsNames[url.Host] = true
-	}
-
-	for _, url := range vch.VolumeLocations {
-		dsNames[url.Host] = true
-	}
-
-	for _, url := range vch.ContainerStores {
-		dsNames[url.Host] = true
-	}
-
-	refs := []types.ManagedObjectReference{}
-	for dsName := range dsNames {
-		ds, err := sess.Finder.DatastoreOrDefault(ctx, dsName)
-		if err != nil {
-			log.Errorf("Unable to collect information for datastore %s: %s", dsName, err)
-		} else {
-			refs = append(refs, ds.Reference())
-		}
-	}
-
-	if len(refs) == 0 {
-		return fmt.Errorf("No datastore references found")
-	}
-
-	pc := property.DefaultCollector(sess.Client.Client)
-	if pc == nil {
-		return fmt.Errorf("Could not get default propery collector; prop-collector came back nil")
-	}
-
-	err := pc.Retrieve(ctx, refs, nil, &dataStores)
-	if err != nil {
-		log.Errorf("Error while accessing datastore: %s", err)
-	}
-
-	sort.Sort(dataStores)
-	for _, ds := range dataStores {
-		log.Infof("Datastore %s Status: %s", ds.Name, ds.OverallStatus)
-		log.Infof("Datastore %s Free Space: %.1fGB", ds.Name, float64(ds.Summary.FreeSpace)/(1<<30))
-		log.Infof("Datastore %s Capacity: %.1fGB", ds.Name, float64(ds.Summary.Capacity)/(1<<30))
-
-		// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-		v.StorageRemaining = template.HTML(fmt.Sprintf(`%s
-			<p class="card-text">
-			  %s:
-			  %.1f GB remaining
-			</p>`, v.StorageRemaining, ds.Name, float64(ds.Summary.FreeSpace)/(1<<30)))
-	}
-
-	return nil
-}
-
-func (v *Validator) QueryVCHStatus(vch *config.VirtualContainerHostConfigSpec, sess *session.Session) {
-	defer trace.End(trace.Begin(""))
-
-	if sess == nil {
-		// We can't connect to vSphere
-		v.VCHStatus = BadStatus
-		return
-	}
-
-	v.VCHIssues = template.HTML("")
-	v.VCHStatus = GoodStatus
-
-	procs := map[string]string{"vic-init": "vic-init"}
-
-	// Extract required components from vchConfig
-	// Only report on components with Restart set to true
-	for service, sess := range vch.ExecutorConfig.Sessions {
-		if !sess.Restart {
-			continue
-		}
-		cmd := path.Base(sess.Cmd.Path)
-		procs[service] = cmd
-	}
-	log.Infof("Processes to check: %+v", procs)
-
-	for service, proc := range procs {
-		log.Infof("Checking status of %s", proc)
-		pid, err := ioutil.ReadFile(fmt.Sprintf("%s.pid", path.Join(shared.PIDFileDir(), proc)))
-		if err != nil {
-			// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-			v.VCHIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">%s service is not running</span>\n",
-				v.VCHIssues, strings.Title(service)))
-			log.Errorf("Process %s not running: %s", proc, err)
-			continue
-		}
-
-		status, err := ioutil.ReadFile(path.Join("/proc", string(pid), "stat"))
-		if err != nil {
-			// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-			v.VCHIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">Unable to query service %s</span>\n",
-				v.VCHIssues, strings.Title(service)))
-			continue
-		}
-
-		fields := strings.Split(string(status), " ")
-		// Field 3 is the current state as reported by the kernel
-		switch fields[2][0] {
-		// We're good
-		case 'R', 'S', 'D':
-			log.Infof("Process %s running as PID %s", proc, pid)
-			break
-		// Process has been killed, is dying, or a zombie
-		case 'K', 'X', 'x', 'Z':
-			// #nosec: this method will not auto-escape HTML. Verify data is well formed.
-			v.VCHIssues = template.HTML(fmt.Sprintf("%s<span class=\"error-message\">%s has failed</span>\n",
-				v.VCHIssues, strings.Title(service)))
-		}
-	}
-	if v.VCHIssues != template.HTML("") {
-		v.VCHStatus = BadStatus
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/vspc/handlers.go b/installer/vendor/github.com/vmware/vic/lib/vspc/handlers.go
deleted file mode 100644
index 3301b3118d..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/vspc/handlers.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vspc
-
-import (
-	"bytes"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/telnet"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// handler is the handler struct for the vspc
-type handler struct {
-	vspc *Vspc
-}
-
-func (h *handler) closeHdlr(tc *telnet.Conn) {
-	h.vspc.vmManagerMu.Lock()
-	defer h.vspc.vmManagerMu.Unlock()
-
-	cvm, exists := h.vspc.cvmFromTelnetConnUnlocked(tc)
-	if exists {
-		cvm.Lock()
-		log.Debugf("(vspc) detected closed connection for VM %s", cvm)
-		log.Debugf("(vspc) closing connection to the AttachServer")
-		cvm.remoteConn.Close()
-		log.Debugf("(vspc) deleting vm records from the vm manager %s", cvm)
-		delete(h.vspc.vmManager, cvm.vmUUID)
-		cvm.Unlock()
-	}
-}
-
-// dataHdlr is the telnet data handler
-func (h *handler) dataHdlr(w io.Writer, b []byte, tc *telnet.Conn) {
-	cvm, exists := h.vspc.cvmFromTelnetConn(tc)
-	if !exists {
-		// the fsm will sense the closed connection and perform the necessary cleanup
-		if tc.UnderlyingConnection() != nil {
-			log.Errorln("cannot find a vm associated with this connection.")
-			log.Infoln("closing connection")
-			tc.UnderlyingConnection().Close()
-		}
-		return
-	}
-	cvm.remoteConn.Write(b)
-
-}
-
-// CmdHdlr is the telnet command handler
-func (h *handler) cmdHdlr(w io.Writer, b []byte, tc *telnet.Conn) {
-	switch {
-	case isKnownSuboptions(b):
-		log.Infof("vspc received KNOWN-SUBOPTIONS command")
-		h.knownSuboptions(w, b)
-	case isDoProxy(b):
-		log.Infof("vspc received DO-PROXY command")
-		h.doProxy(w, b)
-	case isVmotionBegin(b):
-		log.Infof("vspc received VMOTION-BEGIN command")
-		h.vmotionBegin(w, tc, b)
-	case isVmotionPeer(b):
-		log.Infof("vspc received VMOTION-PEER command")
-		h.vmotionPeer(w, b)
-	case isVMUUID(b):
-		log.Infof("vspc received VMUUID command")
-		h.cVMUUID(w, tc, b)
-	case isVmotionComplete(b):
-		log.Infof("vspc received VMOTION-COMPLETE command")
-		h.vmotionComplete(w, tc, b)
-	case isVmotionAbort(b):
-		log.Infof("vspc received VMOTION-ABORT command")
-		h.vmotionAbort(w, tc, b)
-	default:
-		// log an error here. this should never happen. all commands should be handled appropriately
-		log.Errorf("(vspc) received unexpected command")
-	}
-}
-
-// handleVMUUID handles the telnet vm-uuid response
-func (h *handler) cVMUUID(w io.Writer, tc *telnet.Conn, b []byte) {
-	defer trace.End(trace.Begin("handling VMUUID"))
-
-	vmuuid := strings.Replace(string(b[3:len(b)-1]), " ", "", -1)
-	log.Infof("vmuuid of the connected containerVM: %s", vmuuid)
-	// check if there exists another vm with the same vmuuid
-	cvm, exists := h.vspc.cVM(vmuuid)
-	if !exists || !cvm.isInVMotion() {
-		// create a new vm associated with this telnet connection
-		cvm = newCVM(tc)
-		log.Infof("attempting to connect to the attach server")
-		remoteConn, err := net.Dial("tcp", fmt.Sprintf("%s:%d", h.vspc.attachSrvrAddr, h.vspc.attachSrvrPort))
-		if err != nil {
-			log.Errorf("cannot connect to the attach-server: %v", err)
-		}
-		cvm.remoteConn = remoteConn
-		cvm.vmUUID = vmuuid
-		h.vspc.addCVM(vmuuid, cvm)
-		// relay Reads from the remote system connection to the telnet connection associated with this vm
-		go h.vspc.relayReads(cvm, remoteConn)
-	} else { //the vm existed before and was shut down or vmotioned
-		log.Infof("established second serial-port telnet connection with vm (vmuuid: %s)", cvm.vmUUID)
-		cvm.Lock()
-		defer cvm.Unlock()
-		cvm.prevContainerConn = cvm.containerConn
-		cvm.containerConn = tc
-	}
-}
-
-// handleKnownSuboptions handles the known suboptions telnet command
-func (h *handler) knownSuboptions(w io.Writer, b []byte) {
-	defer trace.End(trace.Begin("handling KNOWN-SUBOPTIONS"))
-
-	var resp []byte
-	suboptions := b[3 : len(b)-1]
-	resp = append(resp, []byte{telnet.Iac, telnet.Sb, VmwareExt, KnownSuboptions2}...)
-	resp = append(resp, suboptions...)
-	resp = append(resp, telnet.Iac, telnet.Se)
-	log.Debugf("response to KNOWN-SUBOPTIONS: %v", resp)
-
-	if bytes.IndexByte(suboptions, GetVMVCUUID) != -1 && bytes.IndexByte(suboptions, VMVCUUID) != -1 {
-		resp = append(resp, getVMUUID()...)
-	}
-	w.Write(resp)
-}
-
-// handleDoProxy handles the DO-PROXY telnet command
-func (h *handler) doProxy(w io.Writer, b []byte) {
-	defer trace.End(trace.Begin("handling DO-PROXY"))
-
-	var resp []byte
-	resp = append(resp, []byte{telnet.Iac, telnet.Sb, VmwareExt, WillProxy, telnet.Iac, telnet.Se}...)
-	log.Debugf("response to DO-PROXY: %v", resp)
-	w.Write(resp)
-}
-
-// handleVmotionBegin handles the VMOTION-BEGIN telnet command
-func (h *handler) vmotionBegin(w io.Writer, tc *telnet.Conn, b []byte) {
-	defer trace.End(trace.Begin("handling VMOTION-BEGIN"))
-
-	if cvm, exists := h.vspc.cvmFromTelnetConn(tc); exists {
-		cvm.Lock()
-		cvm.inVmotion = true
-		cvm.Unlock()
-		ch := make(chan struct{})
-		cvm.vmotionStartedChan <- ch
-		<-ch
-	}
-	seq := b[3 : len(b)-1]
-	var escapedSeq []byte
-	for _, v := range seq {
-		if v == telnet.Iac {
-			escapedSeq = append(escapedSeq, telnet.Iac)
-		}
-		escapedSeq = append(escapedSeq, v)
-	}
-	secret := make([]byte, 4)
-	var escapedSecret []byte
-	rand.Read(secret)
-	// escaping Iac
-	for _, v := range secret {
-		if v == telnet.Iac {
-			escapedSecret = append(escapedSecret, telnet.Iac)
-		}
-		escapedSecret = append(escapedSecret, v)
-	}
-	var resp []byte
-	resp = append(resp, []byte{telnet.Iac, telnet.Sb, VmwareExt, VmotionGoahead}...)
-	resp = append(resp, escapedSeq...)
-	resp = append(resp, escapedSecret...)
-	resp = append(resp, telnet.Iac, telnet.Se)
-	log.Debugf("response to VMOTION-BEGIN: %v", resp)
-	w.Write(resp)
-}
-
-// handleVmotionPeer handles the VMOTION-PEER telnet command
-func (h *handler) vmotionPeer(w io.Writer, b []byte) {
-	defer trace.End(trace.Begin("handling VMOTION-PEER"))
-
-	// cookie is the sequence + secret
-	cookie := b[3 : len(b)-1]
-	var resp []byte
-	resp = append(resp, []byte{telnet.Iac, telnet.Sb, VmwareExt, VmotionPeerOK}...)
-	resp = append(resp, cookie...)
-	resp = append(resp, telnet.Iac, telnet.Se)
-	log.Debugf("response to VMOTION-PEER: %v", resp)
-	w.Write(resp)
-}
-
-// handleVmotionComplete handles the VMOTION-Complete telnet command
-func (h *handler) vmotionComplete(w io.Writer, tc *telnet.Conn, b []byte) {
-	defer trace.End(trace.Begin("handling VMOTION-COMPLETE"))
-
-	if cvm, exists := h.vspc.cvmFromTelnetConn(tc); exists {
-		cvm.Lock()
-		cvm.prevContainerConn = nil
-		cvm.inVmotion = false
-		cvm.Unlock()
-		ch := make(chan struct{})
-		cvm.vmotionCompletedChan <- ch
-		<-ch
-		log.Info("vMotion completed successfully")
-	} else {
-		log.Errorf("couldnt find previous information of vm after vmotion (vmuuid: %s)", cvm.vmUUID)
-	}
-
-}
-
-// handleVmotionAbort handles the VMOTION-abort telnet command
-func (h *handler) vmotionAbort(w io.Writer, tc *telnet.Conn, b []byte) {
-	defer trace.End(trace.Begin("handling VMOTION-ABORT"))
-
-	log.Errorf("vMotion failed")
-	if cvm, exists := h.vspc.cvmFromTelnetConn(tc); exists {
-		cvm.Lock()
-		cvm.inVmotion = false
-		cvm.Unlock()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/vspc/helpers.go b/installer/vendor/github.com/vmware/vic/lib/vspc/helpers.go
deleted file mode 100644
index 6358183113..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/vspc/helpers.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vspc
-
-import (
-	"fmt"
-	"net"
-
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/pkg/telnet"
-)
-
-func isKnownSuboptions(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == KnownSuboptions1
-}
-
-func isDoProxy(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == DoProxy
-}
-
-func isVmotionBegin(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VmotionBegin
-}
-
-func isVmotionPeer(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VmotionPeer
-}
-
-func isVmotionComplete(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VmotionComplete
-}
-
-func isVmotionAbort(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VmotionAbort
-}
-
-func isVMName(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VMName
-}
-
-func isVMUUID(cmd []byte) bool {
-	if len(cmd) < 3 {
-		return false
-	}
-	return cmd[0] == telnet.Sb && cmd[1] == VmwareExt && cmd[2] == VMVCUUID
-}
-
-func getVMUUID() []byte {
-	return []byte{telnet.Iac, telnet.Sb, VmwareExt, GetVMVCUUID, telnet.Iac, telnet.Se}
-}
-
-func lookupVCHIP() (net.IP, error) {
-	ips, err := net.LookupIP(constants.ManagementHostName)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(ips) == 0 {
-		return nil, fmt.Errorf("no ip found on %s", constants.ManagementHostName)
-	}
-
-	if len(ips) > 1 {
-		return nil, fmt.Errorf("multiple ips found on %s: %#v", constants.ManagementHostName, ips)
-	}
-	return ips[0], nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/vspc/vspc.go b/installer/vendor/github.com/vmware/vic/lib/vspc/vspc.go
deleted file mode 100644
index b0fa45dda1..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/vspc/vspc.go
+++ /dev/null
@@ -1,277 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vspc
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/lib/config"
-	"github.com/vmware/vic/lib/constants"
-	"github.com/vmware/vic/pkg/telnet"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig"
-)
-
-/* Vsphere telnet extension constants */
-const (
-	VmwareExt             byte = 232
-	KnownSuboptions1      byte = 0
-	KnownSuboptions2      byte = 1
-	UnknownSuboptionRcvd1 byte = 2
-	UnknownSuboptionRcvd2 byte = 3
-	VmotionBegin          byte = 40
-	VmotionGoahead        byte = 41
-	VmotionNotNow         byte = 43
-	VmotionPeer           byte = 44
-	VmotionPeerOK         byte = 45
-	VmotionComplete       byte = 46
-	VmotionAbort          byte = 48
-	DoProxy               byte = 70
-	WillProxy             byte = 71
-	WontProxy             byte = 73
-	VMVCUUID              byte = 80
-	GetVMVCUUID           byte = 81
-	VMName                byte = 82
-	GetVMName             byte = 83
-	VMBiosUUID            byte = 84
-	GetVMBiosUUID         byte = 85
-	VMLocationUUID        byte = 86
-	GetsVMLocationUUID    byte = 87
-	vspcPort              int  = 2377
-)
-const remoteConnReadDeadline = 1 * time.Second
-
-// cVM is a struct that represents the state of the containerVM
-type cVM struct {
-	sync.Mutex
-	// this is the current connection between the vspc and the containerVM serial port
-	containerConn *telnet.Conn
-	// in case of vmotion, at some point we will have two telnet connections to the containerVM
-	// prevContainerConn is the connection of the source
-	// containerConn will be the connection to the destination
-	prevContainerConn *telnet.Conn
-	// inVmotion is a boolean denoting whether this VM is in a state of vmotion or not
-	inVmotion bool
-
-	// remoteConn is the remote-system connection
-	// this is the connection between the vspc and the attach-server
-	remoteConn net.Conn
-
-	vmUUID               string
-	vmotionStartedChan   chan chan struct{}
-	vmotionCompletedChan chan chan struct{}
-}
-
-// newCVM is the constructor of the VM
-func newCVM(tc *telnet.Conn) *cVM {
-	return &cVM{
-		containerConn:        tc,
-		inVmotion:            false,
-		vmotionStartedChan:   make(chan chan struct{}),
-		vmotionCompletedChan: make(chan chan struct{}),
-	}
-}
-
-func (cvm *cVM) isInVMotion() bool {
-	cvm.Lock()
-	defer cvm.Unlock()
-	return cvm.inVmotion
-}
-
-func (cvm *cVM) String() string {
-	return cvm.vmUUID
-}
-
-// Vspc is all the vspc singletons
-type Vspc struct {
-	vmManagerMu sync.Mutex
-	vmManager   map[string]*cVM
-
-	*telnet.Server
-
-	attachSrvrAddr string
-	attachSrvrPort uint
-
-	doneCh chan bool
-
-	verbose bool
-}
-
-// NewVspc is the constructor
-func NewVspc() *Vspc {
-	defer trace.End(trace.Begin("new vspc"))
-
-	var vchconfig config.VirtualContainerHostConfigSpec
-	vchIP, err := lookupVCHIP()
-	if err != nil {
-		log.Fatalf("cannot retrieve vch-endpoint ip: %v", err)
-	}
-	address := vchIP.String()
-	port := constants.SerialOverLANPort
-
-	vspc := &Vspc{
-		vmManager: make(map[string]*cVM),
-
-		attachSrvrAddr: "127.0.0.1",
-		attachSrvrPort: constants.AttachServerPort,
-
-		doneCh: make(chan bool),
-	}
-	hdlr := handler{vspc}
-	opts := telnet.ServerOpts{
-		Addr:       fmt.Sprintf("%s:%d", address, port),
-		ServerOpts: []byte{telnet.Binary, telnet.Sga, telnet.Echo},
-		ClientOpts: []byte{telnet.Binary, telnet.Sga, VmwareExt},
-		Handlers: telnet.Handlers{
-			DataHandler:  hdlr.dataHdlr,
-			CmdHandler:   hdlr.cmdHdlr,
-			CloseHandler: hdlr.closeHdlr,
-		},
-	}
-	vspc.Server = telnet.NewServer(opts)
-	vspc.verbose = false
-
-	// load the vchconfig to get debug level
-	if src, err := extraconfig.GuestInfoSource(); err == nil {
-		extraconfig.Decode(src, &vchconfig)
-		if vchconfig.Diagnostics.DebugLevel > 2 {
-			vspc.verbose = true
-		}
-	}
-
-	return vspc
-}
-
-// Start starts the vspc server
-func (vspc *Vspc) Start() {
-	defer trace.End(trace.Begin("start vspc"))
-
-	go func() {
-		for {
-			_, err := vspc.Accept()
-			if err != nil {
-				log.Errorf("vSPC cannot accept connections: %v", err)
-				log.Errorf("vSPC exiting...")
-				return
-			}
-		}
-	}()
-	log.Infof("vSPC started...")
-}
-
-// Stop stops the vspc server
-func (vspc *Vspc) Stop() {
-	defer trace.End(trace.Begin("stop vspc"))
-
-	vspc.doneCh <- true
-}
-
-// cVM returns the VM struct from its uuid
-func (vspc *Vspc) cVM(uuid string) (*cVM, bool) {
-	vspc.vmManagerMu.Lock()
-	defer vspc.vmManagerMu.Unlock()
-
-	if vm, ok := vspc.vmManager[uuid]; ok {
-		return vm, true
-	}
-	return nil, false
-}
-
-// addVM adds a VM to the map
-func (vspc *Vspc) addCVM(uuid string, cvm *cVM) {
-	vspc.vmManagerMu.Lock()
-	defer vspc.vmManagerMu.Unlock()
-
-	vspc.vmManager[uuid] = cvm
-}
-
-// relayReads reads from the AttachServer connection and relays the data to the telnet connection
-func (vspc *Vspc) relayReads(containervm *cVM, conn net.Conn) {
-	vmotion := false
-	var tmpBuf bytes.Buffer
-	for {
-		select {
-		case ch := <-containervm.vmotionStartedChan:
-			vmotion = true
-			ch <- struct{}{}
-			log.Debugf("vspc started to buffer data coming from the remote system")
-		case ch := <-containervm.vmotionCompletedChan:
-			vmotion = false
-			ch <- struct{}{}
-			log.Debugf("vspc stopped buffering data coming from the remote system")
-		default:
-			b := make([]byte, 4096)
-			conn.SetReadDeadline(time.Now().Add(remoteConnReadDeadline))
-			var n int
-			var err error
-			if n, err = conn.Read(b); n > 0 {
-				if vspc.verbose {
-					log.Debugf("vspc read %d bytes from the  remote system connection", n)
-				}
-				if !vmotion {
-					if tmpBuf.Len() > 0 {
-						buf := tmpBuf.Bytes()
-						tmpBuf.Reset()
-						if err != nil {
-							log.Errorf("read error from vspc temporary buffer: %v", err)
-						}
-						log.Debugf("vspc writing buffered data during vmotion to the containerVM")
-						if n, err := containervm.containerConn.WriteData(buf); n == -1 {
-							log.Errorf("vspc: RelayReads: %v", err)
-							return
-						}
-					}
-					if n, err := containervm.containerConn.WriteData(b[:n]); n == -1 {
-						log.Errorf("vspc: RelayReads: %v", err)
-						return
-					}
-				} else {
-					tmpBuf.Write(b[:n])
-				}
-			}
-			// if not timeout error exit this goroutine because connection is closed
-			if err != nil {
-				if err, ok := err.(net.Error); !ok || !err.Timeout() {
-					log.Infof("(vspc) remote system connection closed: %v", err)
-					return
-				}
-			}
-		}
-	}
-}
-
-func (vspc *Vspc) cvmFromTelnetConn(tc *telnet.Conn) (*cVM, bool) {
-	vspc.vmManagerMu.Lock()
-	defer vspc.vmManagerMu.Unlock()
-
-	return vspc.cvmFromTelnetConnUnlocked(tc)
-}
-
-// cvmFromTelnetConnUnlocked is the unlocked version of cvmFromTelnetConn
-// it expects caller to hold the lock
-func (vspc *Vspc) cvmFromTelnetConnUnlocked(tc *telnet.Conn) (*cVM, bool) {
-	for _, v := range vspc.vmManager {
-		if v.containerConn == tc {
-			return v, true
-		}
-	}
-	return nil, false
-}
diff --git a/installer/vendor/github.com/vmware/vic/lib/vspc/vspc_test.go b/installer/vendor/github.com/vmware/vic/lib/vspc/vspc_test.go
deleted file mode 100644
index 3b23fbbef4..0000000000
--- a/installer/vendor/github.com/vmware/vic/lib/vspc/vspc_test.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vspc
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/telnet"
-)
-
-type dummyWriter struct {
-	buf []byte
-}
-
-func (w *dummyWriter) Write(b []byte) (int, error) {
-	w.buf = b
-	return len(b), nil
-}
-
-func newTestItem() *Vspc {
-	return &Vspc{
-		vmManager: make(map[string]*cVM),
-		doneCh:    make(chan bool),
-	}
-}
-
-func TestAddCVM(t *testing.T) {
-	vspc := newTestItem()
-	cvm := newCVM(nil)
-	assert.NotNil(t, cvm)
-	vspc.addCVM("dummyid", cvm)
-	assert.Equal(t, 1, len(vspc.vmManager))
-	for k, v := range vspc.vmManager {
-		assert.Equal(t, "dummyid", k)
-		assert.Equal(t, cvm, v)
-	}
-}
-
-func TestGetCVM(t *testing.T) {
-	vspc := newTestItem()
-	cvm := newCVM(nil)
-	assert.NotNil(t, cvm)
-	vspc.addCVM("dummyid", cvm)
-	storedCVM, exists := vspc.cVM("dummyid")
-	assert.Equal(t, true, exists)
-	assert.Equal(t, cvm, storedCVM)
-	storedCVM, exists = vspc.cVM("dummyidnothere")
-	assert.Equal(t, false, exists)
-	assert.Nil(t, storedCVM)
-}
-
-func TestNewVMStartsWithCorrectVmotion(t *testing.T) {
-	vm := newCVM(nil)
-	assert.Equal(t, vm.inVmotion, false)
-}
-
-func TestHandleSubOptions(t *testing.T) {
-	h := &handler{newTestItem()}
-	w := &dummyWriter{}
-	h.cmdHdlr(w, []byte{telnet.Sb, VmwareExt, KnownSuboptions1, 4, 5, 6, telnet.Se}, nil)
-	assert.Equal(t, []byte{telnet.Iac, telnet.Sb, VmwareExt, KnownSuboptions2, 4, 5, 6, telnet.Iac, telnet.Se}, w.buf)
-}
-
-func TestHandleDoProxy(t *testing.T) {
-	h := &handler{newTestItem()}
-	w := &dummyWriter{}
-	h.cmdHdlr(w, []byte{telnet.Sb, VmwareExt, DoProxy, telnet.Se}, nil)
-	assert.Equal(t, []byte{telnet.Iac, telnet.Sb, VmwareExt, WillProxy, telnet.Iac, telnet.Se}, w.buf)
-}
-
-func TestHandleVmotionPeer(t *testing.T) {
-	h := &handler{newTestItem()}
-	w := &dummyWriter{}
-	h.cmdHdlr(w, []byte{telnet.Sb, VmwareExt, VmotionPeer, telnet.Se}, nil)
-	assert.Equal(t, []byte{telnet.Iac, telnet.Sb, VmwareExt, VmotionPeerOK, telnet.Iac, telnet.Se}, w.buf)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/certificate/certificate_test.go b/installer/vendor/github.com/vmware/vic/pkg/certificate/certificate_test.go
deleted file mode 100644
index d06c8d4dff..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/certificate/certificate_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package certificate
-
-import (
-	"crypto/x509"
-	"os"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestCreateCA(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	cacert, cakey, err := CreateRootCA("somewhere.com", []string{"MyOrg"}, 2048)
-	assert.NoError(t, err, "Failed generating CA certificate")
-
-	_, _, err = ParseCertificate(cacert.Bytes(), cakey.Bytes())
-	assert.NoError(t, err, "Failed reparsing CA certificate")
-
-}
-
-func TestSignedCertificate(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	cacert, cakey, err := CreateRootCA("somewhere.com", []string{"MyOrg"}, 2048)
-	assert.NoError(t, err, "Failed generating ca certificate")
-
-	cert, key, err := CreateServerCertificate("somewere.com", []string{"MyOrg"}, 2048, cacert.Bytes(), cakey.Bytes())
-	assert.NoError(t, err, "Failed generating signed certificate")
-
-	// validate
-	roots := x509.NewCertPool()
-	ok := roots.AppendCertsFromPEM(cacert.Bytes())
-	assert.Equal(t, true, ok, "Failed to append CA to roots")
-
-	opts := x509.VerifyOptions{
-		Roots: roots,
-	}
-
-	tlsCert, _, err := ParseCertificate(cert.Bytes(), key.Bytes())
-	assert.NoError(t, err, "Failed loading signed certificate")
-
-	_, err = tlsCert.Verify(opts)
-	assert.NoError(t, err, "Failed loading signed certificate")
-}
-
-func TestFailedValidation(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-
-	cacert, cakey, err := CreateRootCA("somewhere.com", []string{"MyOrg"}, 2048)
-	assert.NoError(t, err, "Failed generating ca certificate")
-
-	cert, key, err := CreateServerCertificate("somewere.com", []string{"MyOrg"}, 2048, cacert.Bytes(), cakey.Bytes())
-	assert.NoError(t, err, "Failed generating signed certificate")
-
-	// validate
-	roots := x509.NewCertPool()
-	ok := roots.AppendCertsFromPEM(cacert.Bytes())
-	assert.Equal(t, true, ok, "Failed to append CA to roots")
-
-	tlsCert, _, err := ParseCertificate(cert.Bytes(), key.Bytes())
-	assert.NoError(t, err, "Failed loading signed certificate")
-
-	opts := x509.VerifyOptions{
-		Roots:   roots,
-		DNSName: "somewhereELSE.com",
-	}
-
-	_, err = tlsCert.Verify(opts)
-	assert.Error(t, err, "Expected to fail initial verify")
-
-	opts = x509.VerifyOptions{
-		Roots:   roots,
-		DNSName: "somewhere.com",
-	}
-
-	_, err = tlsCert.Verify(opts)
-	assert.Error(t, err, "Expected to pass second verify")
-
-}
-
-func TestVerifyClientCert(t *testing.T) {
-	cacert, cakey, err := CreateRootCA("foo.com", []string{"FooOrg"}, 2048)
-	assert.NoError(t, err)
-
-	cert, key, err := CreateClientCertificate("foo.com", []string{"FooOrg"}, 2048, cacert.Bytes(), cakey.Bytes())
-	assert.NoError(t, err)
-
-	kp := NewKeyPair(ClientCert, ClientKey, cert.Bytes(), key.Bytes())
-	err = kp.SaveCertificate()
-	assert.NoError(t, err)
-	defer func() {
-		os.Remove(ClientCert)
-		os.Remove(ClientKey)
-	}()
-
-	// Validate client certificate keypair created with the right CA
-	_, err = VerifyClientCert(cacert.Bytes(), kp)
-	assert.NoError(t, err)
-
-	cacert, cakey, err = CreateRootCA("bar.com", []string{"BarOrg"}, 2048)
-	assert.NoError(t, err)
-
-	// Attempt to validate client certificate keypair created with a different CA
-	_, err = VerifyClientCert(cacert.Bytes(), kp)
-	assert.NotNil(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/certificate/keypair_test.go b/installer/vendor/github.com/vmware/vic/pkg/certificate/keypair_test.go
deleted file mode 100644
index 37598e5f9f..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/certificate/keypair_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package certificate
-
-import (
-	"os"
-	"strings"
-	"testing"
-
-	"crypto/tls"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	keyFile  = "./key.pem"
-	certFile = "./cert.pem"
-)
-
-func TestMain(t *testing.T) {
-	log.SetLevel(log.DebugLevel)
-	trace.Logger.Level = log.DebugLevel
-}
-
-func TestCreateSelfSigned(t *testing.T) {
-	cert, key, err := CreateSelfSigned("somewhere.com", []string{"MyOrg"}, 2048)
-	if err != nil {
-		t.Errorf("CreateSelfSigned failed with error %s", err)
-	}
-
-	certString := cert.String()
-	keyString := key.String()
-
-	log.Infof("cert: %s", certString)
-	log.Infof("key: %s", keyString)
-
-	if !strings.HasPrefix(certString, "-----BEGIN CERTIFICATE-----") {
-		t.Errorf("Certificate lacks proper prefix; must not have been generated properly.")
-	}
-
-	if !strings.HasSuffix(certString, "-----END CERTIFICATE-----\n") {
-		t.Errorf("Certificate lacks proper suffix; must not have been generated properly.")
-	}
-
-	if !strings.HasPrefix(keyString, "-----BEGIN RSA PRIVATE KEY-----") {
-		t.Errorf("Private key lacks proper prefix; must not have been generated properly.")
-	}
-
-	if !strings.HasSuffix(keyString, "-----END RSA PRIVATE KEY-----\n") {
-		t.Errorf("Private key lacks proper suffix; must not have been generated properly.")
-	}
-
-	_, err = tls.X509KeyPair([]byte(certString), []byte(keyString))
-	if err != nil {
-		t.Errorf("Unable to load X509 key pair(%s,%s): %s", certString, keyString, err)
-	}
-
-}
-
-func TestGenerate(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if _, err := os.Stat(keyFile); err == nil {
-		os.Remove(keyFile)
-	}
-
-	pair := NewKeyPair(keyFile, certFile, nil, nil)
-
-	err := pair.CreateSelfSigned("somewhere.com", []string{"MyOrg"}, 2048)
-	assert.NoError(t, err, "Failed generating self-signed certificate")
-
-	err = pair.SaveCertificate()
-	assert.NoError(t, err, "Failed saving generated certificate")
-	defer os.Remove(keyFile)
-	defer os.Remove(certFile)
-
-	assert.NotEmpty(t, pair.KeyPEM, "Expected contents in key PEM data")
-	assert.NotEmpty(t, pair.CertPEM, "Expected contents in cert PEM data")
-
-	_, err = os.Stat(keyFile)
-	assert.NoError(t, err, "Key file was not created")
-
-	assert.Contains(t, string(pair.KeyPEM), "RSA PRIVATE KEY", "Key is not correctly generated")
-}
-
-func TestGetCertificate(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if _, err := os.Stat(keyFile); err == nil {
-		os.Remove(keyFile)
-	}
-
-	pair := NewKeyPair(keyFile, certFile, nil, nil)
-
-	err := pair.CreateSelfSigned("somewhere.com", []string{"MyOrg"}, 2048)
-	assert.NoError(t, err, "Failed generating self-signed certificate")
-
-	err = pair.SaveCertificate()
-	assert.NoError(t, err, "Failed saving generated certificate")
-	defer os.Remove(keyFile)
-	defer os.Remove(certFile)
-
-	pair2 := NewKeyPair(keyFile, certFile, nil, nil)
-
-	err = pair2.LoadCertificate()
-	assert.NoError(t, err, "Failed loading self-signed certificate")
-
-	assert.Equal(t, pair, pair2, "Expected loads to be consistent")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/dio/doc.go b/installer/vendor/github.com/vmware/vic/pkg/dio/doc.go
deleted file mode 100644
index 927b912ef2..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/dio/doc.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package dio adds dynamic behaviour to the standard io package mutliX types
-package dio
-
-var verbose = true
diff --git a/installer/vendor/github.com/vmware/vic/pkg/dio/multi_test.go b/installer/vendor/github.com/vmware/vic/pkg/dio/multi_test.go
deleted file mode 100644
index 749ea1ecb0..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/dio/multi_test.go
+++ /dev/null
@@ -1,430 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package dio
-
-import (
-	"bytes"
-	"io"
-	"strings"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const (
-	count = 32
-
-	base    = "base functionality"
-	dynamic = "dynamic add/remove functionality"
-)
-
-type filterf func(idx int) bool
-
-func FilterBuffers(in []*bytes.Buffer, fn filterf) []*bytes.Buffer {
-	var out []*bytes.Buffer
-
-	for i := 0; i < len(in); i++ {
-		if fn(i) {
-			out = append(out, in[i])
-		}
-	}
-	return out
-}
-
-func FilterWriters(in []io.Writer, fn filterf) []io.Writer {
-	var out []io.Writer
-
-	for i := 0; i < len(in); i++ {
-		if fn(i) {
-			out = append(out, in[i])
-		}
-	}
-	return out
-}
-
-func FilterReaders(in []io.Reader, fn filterf) []io.Reader {
-	var out []io.Reader
-
-	for i := 0; i < len(in); i++ {
-		if fn(i) {
-			out = append(out, in[i])
-		}
-	}
-	return out
-}
-
-func write(t *testing.T, mwriter DynamicMultiWriter, p []byte) {
-	n, err := mwriter.Write(p)
-	if err != nil {
-		t.Errorf("write: %v", err)
-	}
-	if n != len(p) {
-		t.Errorf("short write: %d != %d", n, len(p))
-	}
-}
-
-func read(t *testing.T, mreader DynamicMultiReader, limit int) []byte {
-	total := 0
-
-	var buf = make([]byte, 32*1024)
-	for {
-		n, err := mreader.Read(buf[total:limit])
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Errorf("read: %v", err)
-		}
-
-		total += n
-		if total >= limit {
-			break
-		}
-	}
-
-	return buf[:limit]
-}
-
-func each(t *testing.T, buffers []*bytes.Buffer, s string) {
-	for i := range buffers {
-		assert.Equal(t, buffers[i].String(), s)
-	}
-}
-
-// TestMultiWrite creates multi writers and writes to them, then removes some of them and writes again
-func TestMultiWrite(t *testing.T) {
-	var wg sync.WaitGroup
-
-	var writers []io.Writer
-	var buffers []*bytes.Buffer
-
-	// create & initialize writers and buffers
-	for i := 0; i < count; i++ {
-		var buffer bytes.Buffer
-
-		reader, writer := io.Pipe()
-
-		writers = append(writers, writer)
-		buffers = append(buffers, &buffer)
-
-		wg.Add(1)
-		go func() {
-			// set up a goroutine so we don't block writes
-			io.CopyN(&buffer, reader, int64(len(base)))
-
-			wg.Done()
-		}()
-	}
-
-	// create the multi writer
-	mwriter := MultiWriter(writers...)
-
-	// write and ensure io.Copy returns
-	write(t, mwriter, []byte(base))
-	wg.Wait()
-
-	each(t, buffers, base)
-}
-
-// TestMultiWrite creates bunch of multi writers and writes to them, then adds more and writes again
-func TestWriteAdd(t *testing.T) {
-	var wg sync.WaitGroup
-	var wgAdded sync.WaitGroup
-
-	var writers []io.Writer
-	var buffers []*bytes.Buffer
-
-	// create & initialize writers and buffers into two categories
-	// *Added ones will be added to multi writer later
-	for i := 0; i < count; i++ {
-		var buffer bytes.Buffer
-
-		reader, writer := io.Pipe()
-
-		writers = append(writers, writer)
-		buffers = append(buffers, &buffer)
-
-		if i%3 != 0 {
-			wg.Add(1)
-		}
-		wgAdded.Add(1)
-		go func(i int) {
-			if i%3 != 0 {
-				io.CopyN(&buffer, reader, int64(len(base)))
-				wg.Done()
-			}
-			io.CopyN(&buffer, reader, int64(len(dynamic)))
-
-			wgAdded.Done()
-		}(i)
-	}
-
-	writersAdded := FilterWriters(writers, func(i int) bool { return i%3 == 0 })
-	writersLeft := FilterWriters(writers, func(i int) bool { return i%3 != 0 })
-
-	buffersAdded := FilterBuffers(buffers, func(i int) bool { return i%3 == 0 })
-	buffersLeft := FilterBuffers(buffers, func(i int) bool { return i%3 != 0 })
-
-	// create the multi writer
-	mwriter := MultiWriter(writersLeft...)
-
-	// write and ensure io.Copy returns
-	write(t, mwriter, []byte(base))
-	wg.Wait()
-
-	each(t, buffersLeft, base)
-
-	// add skipped writers to the writer
-	mwriter.Add(writersAdded...)
-
-	// write and ensure io.Copy returns
-	write(t, mwriter, []byte(dynamic))
-	wgAdded.Wait()
-
-	each(t, buffersLeft, base+dynamic)
-	each(t, buffersAdded, dynamic)
-}
-
-// TestMultiWrite creates multi writers and writes to them, then removes some of them and writes again
-func TestWriteRemove(t *testing.T) {
-	var wg sync.WaitGroup
-	var wgRemoved sync.WaitGroup
-
-	var writers []io.Writer
-	var buffers []*bytes.Buffer
-
-	// create & initialize writers and buffers into two categories
-	// *Removed ones will be filtered out from multi writer later
-	for i := 0; i < count; i++ {
-		var buffer bytes.Buffer
-
-		reader, writer := io.Pipe()
-
-		writers = append(writers, writer)
-		buffers = append(buffers, &buffer)
-
-		// set up a goroutine so we don't block writes
-		wg.Add(1)
-		wgRemoved.Add(1)
-		go func(i int) {
-			// set up a goroutine so we don't block writes
-			io.CopyN(&buffer, reader, int64(len(base)))
-
-			wg.Done()
-
-			if i%3 == 0 {
-				wgRemoved.Done()
-				return
-			}
-
-			io.CopyN(&buffer, reader, int64(len(dynamic)))
-
-			wgRemoved.Done()
-		}(i)
-	}
-
-	// create the multi writer
-	mwriter := MultiWriter(writers...)
-
-	// write and ensure io.Copy returns
-	write(t, mwriter, []byte(base))
-	wg.Wait()
-
-	each(t, buffers, base)
-
-	// remove the writers
-	for i := 0; i < count; i++ {
-		if i%3 == 0 {
-			mwriter.Remove(writers[i])
-		}
-	}
-
-	// write and ensure io.Copy returns
-	write(t, mwriter, []byte(dynamic))
-	wgRemoved.Wait()
-
-	buffersLeft := FilterBuffers(buffers, func(i int) bool { return i%3 != 0 })
-	buffersRemoved := FilterBuffers(buffers, func(i int) bool { return i%3 == 0 })
-
-	each(t, buffersLeft, base+dynamic)
-	each(t, buffersRemoved, base)
-
-}
-
-// TestMultiRead creates multi readers and reads from them
-func TestMultiRead(t *testing.T) {
-	var wg sync.WaitGroup
-
-	var readers []io.Reader
-
-	// create & initialize writers and buffers
-	for i := 0; i < count; i++ {
-		reader, writer := io.Pipe()
-
-		readers = append(readers, reader)
-
-		wg.Add(1)
-		go func() {
-			// set up a  goroutine so we don't block reads
-			io.CopyN(writer, bytes.NewReader([]byte(base)), int64(len(base)))
-
-			wg.Done()
-		}()
-	}
-
-	// create the multi writer
-	mreader := MultiReader(readers...)
-
-	expected := strings.Repeat(base, count)
-	// read and ensure io.Copy returns
-	buffer := read(t, mreader, len(expected))
-	wg.Wait()
-
-	assert.Equal(t, expected, string(buffer))
-}
-
-// TestMultiRead creates multi readers and reads from them, then adds mores and reads again
-func TestReadAdd(t *testing.T) {
-	var wg sync.WaitGroup
-	var wgAdded sync.WaitGroup
-	var wgLeft sync.WaitGroup
-
-	var readers []io.Reader
-	var pipereaders []io.PipeReader
-
-	wgLeft.Add(1)
-	// create & initialize writers and buffers
-	for i := 0; i < count; i++ {
-		reader, writer := io.Pipe()
-
-		readers = append(readers, reader)
-
-		if i%3 != 0 {
-			pipereaders = append(pipereaders, *reader)
-
-			wg.Add(1)
-		}
-		wgAdded.Add(1)
-		go func(i int) {
-			if i%3 != 0 {
-				io.CopyN(writer, bytes.NewReader([]byte(base)), int64(len(base)))
-				wg.Done()
-			}
-			wgLeft.Wait()
-			io.CopyN(writer, bytes.NewReader([]byte(dynamic)), int64(len(dynamic)))
-
-			wgAdded.Done()
-		}(i)
-	}
-
-	readersAdded := FilterReaders(readers, func(i int) bool { return i%3 == 0 })
-	readersLeft := FilterReaders(readers, func(i int) bool { return i%3 != 0 })
-
-	// create the multi writer
-	mreader := MultiReader(readersLeft...)
-
-	expected := strings.Repeat(base, len(readersLeft))
-	// read and ensure io.Copy returns
-	buffer := read(t, mreader, len(expected))
-	wg.Wait()
-
-	assert.Equal(t, expected, string(buffer))
-
-	// close the initial set otherwise they will block
-	for i := range pipereaders {
-		pipereaders[i].Close()
-	}
-
-	wgLeft.Done()
-
-	// add the rest of the readers
-	mreader.Add(readersAdded...)
-
-	expected = strings.Repeat(dynamic, len(readersAdded))
-	// read and ensure io.Copy returns
-	buffer = read(t, mreader, len(expected))
-	wgAdded.Wait()
-
-	assert.Equal(t, expected, string(buffer))
-
-}
-
-// TestReadRemove creates multi readers and reads from them, then removes some and reads again
-func TestReadRemove(t *testing.T) {
-	var wg sync.WaitGroup
-	var wgRemoved sync.WaitGroup
-	var wgLeft sync.WaitGroup
-
-	var readers []io.Reader
-	var writers []io.Writer
-
-	wgLeft.Add(1)
-	// create & initialize writers and buffers
-	for i := 0; i < count; i++ {
-		reader, writer := io.Pipe()
-
-		readers = append(readers, reader)
-		writers = append(writers, writer)
-
-		// set up a goroutine so we don't block writes
-		wg.Add(1)
-		wgRemoved.Add(1)
-		go func(i int) {
-			// set up a goroutine so we don't block writes
-			io.CopyN(writer, bytes.NewReader([]byte(base)), int64(len(base)))
-
-			wg.Done()
-
-			if i%3 == 0 {
-				wgRemoved.Done()
-				return
-			}
-
-			wgLeft.Wait()
-
-			io.CopyN(writer, bytes.NewReader([]byte(dynamic)), int64(len(dynamic)))
-
-			wgRemoved.Done()
-		}(i)
-
-	}
-
-	// create the multi writer
-	mreader := MultiReader(readers...)
-
-	expected := strings.Repeat(base, count)
-	// read and ensure io.Copy returns
-	buffer := read(t, mreader, len(expected))
-	wg.Wait()
-
-	assert.Equal(t, expected, string(buffer))
-	wgLeft.Done()
-
-	readersLeft := FilterReaders(readers, func(i int) bool { return i%3 != 0 })
-	readersRemoved := FilterReaders(readers, func(i int) bool { return i%3 == 0 })
-
-	for i := range readersRemoved {
-		mreader.Remove(readersRemoved[i])
-	}
-
-	expected = strings.Repeat(dynamic, len(readersLeft))
-	// read and ensure io.Copy returns
-	buffer = read(t, mreader, len(expected))
-	wgRemoved.Wait()
-
-	assert.Equal(t, expected, string(buffer))
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/dio/reader.go b/installer/vendor/github.com/vmware/vic/pkg/dio/reader.go
deleted file mode 100644
index c428469fee..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/dio/reader.go
+++ /dev/null
@@ -1,220 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package dio adds dynamic behaviour to the standard io package mutliX types
-package dio
-
-import (
-	"io"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// DynamicMultiReader adds dynamic add/remove to the base multireader behaviour
-type DynamicMultiReader interface {
-	io.Reader
-	Add(...io.Reader)
-	Remove(io.Reader)
-	Close() error
-	PropagateEOF(bool)
-}
-
-type multiReader struct {
-	mutex sync.Mutex
-
-	cond           *sync.Cond
-	err            error
-	readers        []io.Reader
-	honorInlineEOF bool
-}
-
-// PropagateEOF toggles whether to return EOF when all readers return EOF.
-// Setting this to true will result in an EOF if there are no readers available
-// when Read is next called
-func (t *multiReader) PropagateEOF(val bool) {
-	t.mutex.Lock()
-	t.honorInlineEOF = val
-	t.cond.Broadcast()
-	t.mutex.Unlock()
-}
-
-func (t *multiReader) Read(p []byte) (int, error) {
-	var n int
-	var err error
-	var rTmp []io.Reader
-
-	if verbose {
-		defer func() {
-			log.Debugf("[%p] read %q from %d readers (err: %#+v)", t, string(p[:n]), len(rTmp), err)
-		}()
-	}
-
-	t.mutex.Lock()
-	// stash a copy of the t.err
-	err = t.err
-	t.mutex.Unlock()
-
-	// Close sets this
-	if err == io.EOF || err == io.ErrClosedPipe {
-		if verbose {
-			log.Debugf("[%p] read from closed multi-reader, returning EOF", t)
-		}
-		return 0, io.EOF
-	}
-
-	// if there's no readers we are steady state - has to be after t.err check to
-	// get correct Close behaviour.
-	// Blocking behaviour!
-	t.mutex.Lock()
-	for len(t.readers) == 0 && t.err == nil {
-		log.Debugf("[%p] Going into sleep with %d readers", t, len(t.readers))
-		t.cond.Wait()
-		log.Debugf("[%p] Woken from sleep %d readers", t, len(t.readers))
-	}
-
-	// stash a copy of the readers slie to iterate later
-	rTmp = make([]io.Reader, len(t.readers))
-	copy(rTmp, t.readers)
-	// stash a copy of the t.err
-	err = t.err
-	t.mutex.Unlock()
-
-	if err != nil {
-		return 0, err
-	}
-
-	// eof counter
-	eof := 0
-	for _, r := range rTmp {
-		slice := p[n:]
-		if len(slice) == 0 {
-			// we've run out of target space and don't know what
-			// the remaining readers have, so not EOF
-			return n, nil
-		}
-
-		x, err := r.Read(slice)
-		n += x
-		if err != nil {
-			if err != io.EOF && err != io.ErrClosedPipe {
-				t.mutex.Lock()
-				// if there was an actual error, return that
-				t.err = err
-				t.mutex.Unlock()
-
-				return n, err
-			}
-			// increment the EOF counter and remove the reader that retured EOF
-			log.Debugf("[%p] removing reader due to EOF", t)
-			// Remove grabs the lock
-			t.Remove(r)
-
-			eof++
-		}
-	}
-
-	// This means readers closed/removed while we iterate
-	// if no data is to be returned, there's no major error, and the number of
-	// reported EOFs matches the number of readers on entry to the main loop
-	if n == 0 && t.err == nil && eof == len(rTmp) {
-		log.Debugf("[%p] All of the readers returned EOF (%d)", t, len(rTmp))
-		t.mutex.Lock()
-		// queue up an EOF for the next time around if no new readers are added
-		if t.honorInlineEOF {
-			t.err = io.EOF
-		}
-		t.mutex.Unlock()
-	}
-	return n, nil
-}
-
-func (t *multiReader) Add(reader ...io.Reader) {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	t.readers = append(t.readers, reader...)
-	// if we've got a new reader, we're not EOF any more until that reader EOFs
-	t.err = nil
-	t.cond.Broadcast()
-
-	if verbose {
-		log.Debugf("[%p] added reader - now %d readers", t, len(t.readers))
-
-		for i, r := range t.readers {
-			log.Debugf("[%p] Reader %d [%p]", t, i, r)
-		}
-	}
-}
-
-// TODO: add a WriteTo for more efficient copy
-
-func (t *multiReader) Close() error {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	log.Debugf("[%p] Close on readers", t)
-	for _, r := range t.readers {
-		if c, ok := r.(io.Closer); ok {
-			log.Debugf("[%p] Closing reader %+v", t, r)
-			c.Close()
-		}
-	}
-
-	t.err = io.EOF
-	t.cond.Broadcast()
-	return nil
-}
-
-// Remove doesn't return an error if element isn't found as the end result is
-// identical
-func (t *multiReader) Remove(reader io.Reader) {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	if verbose {
-		log.Debugf("[%p] removing reader - currently %d readers", t, len(t.readers))
-	}
-
-	for i, r := range t.readers {
-		if r == reader {
-			t.readers = append(t.readers[:i], t.readers[i+1:]...)
-			// using range directly means that we're looping up, so indexes are now invalid
-			if verbose {
-				log.Debugf("[%p] removed reader - now %d readers", t, len(t.readers))
-
-				for i, r := range t.readers {
-					log.Debugf("[%p] Reader %d [%p]", t, i, r)
-				}
-			}
-			break
-		}
-	}
-}
-
-// MultiReader returns a Reader that's the logical concatenation of
-// the provided input readers.  They're read sequentially.  Once all
-// inputs have returned EOF, Read will return EOF.  If any of the readers
-// return a non-nil, non-EOF error, Read will return that error.
-func MultiReader(readers ...io.Reader) DynamicMultiReader {
-	r := make([]io.Reader, len(readers))
-	copy(r, readers)
-	t := &multiReader{readers: r}
-	t.cond = sync.NewCond(&t.mutex)
-
-	if verbose {
-		log.Debugf("[%p] created multireader", t)
-	}
-	return t
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/dio/writer.go b/installer/vendor/github.com/vmware/vic/pkg/dio/writer.go
deleted file mode 100644
index f73745de8e..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/dio/writer.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package dio adds dynamic behaviour to the standard io package mutliX types
-package dio
-
-import (
-	"io"
-	"os"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// DynamicMultiWriter adds dynamic add/remove to the base multiwriter behaviour
-type DynamicMultiWriter interface {
-	io.Writer
-	Add(...io.Writer)
-	Remove(io.Writer)
-	Close() error
-}
-
-type multiWriter struct {
-	mutex     sync.Mutex
-	waitGroup sync.WaitGroup
-
-	writers []io.Writer
-}
-
-func (t *multiWriter) Write(p []byte) (int, error) {
-	var n int
-	var err error
-
-	var wTmp []io.Writer
-	if verbose {
-		defer func() {
-			log.Debugf("[%p] write %q to %d writers (err: %#+v)", t, string(p[:n]), len(wTmp), err)
-		}()
-	}
-
-	t.mutex.Lock()
-
-	t.waitGroup.Add(1)
-	defer t.waitGroup.Done()
-
-	// stash a local copy of the slice as we never want to write twice to a single writer
-	// if remove is called during this flow
-	wTmp = make([]io.Writer, len(t.writers))
-	copy(wTmp, t.writers)
-
-	t.mutex.Unlock()
-
-	eof := 0
-	// possibly want to add buffering or parallelize this
-	for _, w := range wTmp {
-		n, err = w.Write(p)
-		if err != nil {
-			// remove the writer
-			log.Debugf("[%p] removing writer %p due to %s", t, w, err.Error())
-
-			// Remove grabs the lock
-			t.Remove(w)
-
-			if err == io.EOF {
-				eof++
-			}
-		}
-
-		// FIXME: figure out what semantics we need here - currently we may not write to
-		// everything as we abort
-		if n != len(p) {
-			// remove the writer
-			log.Debugf("[%p] removing writer %p due to short write: %d != %d", t, w, n, len(p))
-
-			// Remove grabs the lock
-			t.Remove(w)
-		}
-	}
-
-	// This means writers closed/removed while we iterate
-	if eof != 0 && n == 0 && err == nil && eof == len(wTmp) {
-		log.Debugf("[%p] All of the writers returned EOF (%d)", t, len(wTmp))
-	}
-	return len(p), nil
-}
-
-func (t *multiWriter) Add(writer ...io.Writer) {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	t.writers = append(t.writers, writer...)
-	if verbose {
-		log.Debugf("[%p] added writer - now %d writers", t, len(t.writers))
-
-		for i, w := range t.writers {
-			log.Debugf("[%p] Writer %d [%p]", t, i, w)
-		}
-	}
-}
-
-// CloseWriter is an interface that implements structs
-// that close input streams to prevent from writing.
-type CloseWriter interface {
-	CloseWrite() error
-}
-
-// FIXME: provide a mechanism for selectively closing writers
-//  - currently this closes /dev/stdout and logging as well if present
-func (t *multiWriter) Close() error {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	// allow any pending writes to complete
-	t.waitGroup.Wait()
-
-	log.Debugf("[%p] Close on writers", t)
-	for _, w := range t.writers {
-		log.Debugf("[%p] Closing writer %+v", t, w)
-
-		if c, ok := w.(CloseWriter); ok {
-			log.Debugf("[%p] is a CloseWriter", t, w)
-			c.CloseWrite()
-		} else if c, ok := w.(io.Closer); ok && c != os.Stdout && c != os.Stderr {
-			log.Debugf("[%p] is a Closer", t, w)
-			// squash closing of stdout/err if bound
-			c.Close()
-		}
-	}
-
-	return nil
-}
-
-// TODO: add a ReadFrom for more efficient copy
-
-// Remove doesn't return an error if element isn't found as the end result is
-// identical
-func (t *multiWriter) Remove(writer io.Writer) {
-	t.mutex.Lock()
-	defer t.mutex.Unlock()
-
-	if verbose {
-		log.Debugf("[%p] removing writer %p - currently %d writers", t, writer, len(t.writers))
-	}
-	for i, w := range t.writers {
-		if w == writer {
-			t.writers = append(t.writers[:i], t.writers[i+1:]...)
-			if verbose {
-				log.Debugf("[%p] removed writer - now %d writers", t, len(t.writers))
-
-				for i, w := range t.writers {
-					log.Debugf("[%p] Writer %d [%p]", t, i, w)
-				}
-			}
-			break
-		}
-	}
-}
-
-// MultiWriter extends io.MultiWriter to allow add/remove of writers dynamically
-// without disrupting existing writing
-func MultiWriter(writers ...io.Writer) DynamicMultiWriter {
-	w := make([]io.Writer, len(writers))
-	copy(w, writers)
-	t := &multiWriter{writers: w}
-
-	if verbose {
-		log.Debugf("[%p] created multiwriter", t)
-	}
-	return t
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/errors/errors_test.go b/installer/vendor/github.com/vmware/vic/pkg/errors/errors_test.go
deleted file mode 100644
index 024ed2701d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/errors/errors_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package errors
-
-import (
-	"testing"
-
-	"errors"
-)
-
-const errMsg = "Winter is coming"
-
-func TestErrorStack(t *testing.T) {
-	e := errors.New(errMsg)
-	val := ErrorStack(e)
-	if val != errMsg {
-		t.Errorf("Got %s, expected %s", val, errMsg)
-	}
-}
-
-func TestErrorf(t *testing.T) {
-	val := Errorf("%s", errMsg)
-	if val.Error() != errMsg {
-		t.Errorf("Got %s, expected %s", val, errMsg)
-	}
-}
-
-func TestNew(t *testing.T) {
-	val := Errorf("%s", errMsg)
-	if val.Error() != errMsg {
-		t.Errorf("Got %s, expected %s", val, errMsg)
-	}
-}
-
-func TestTrace(t *testing.T) {
-	e := errors.New(errMsg)
-	val := Trace(e)
-	if val != e {
-		t.Errorf("Got %s, expected %s", val, errMsg)
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher.go b/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher.go
index eccbf2ae20..b49073f87e 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher.go
@@ -453,7 +453,12 @@ func (u *URLFetcher) buildRegistryErrMsg(url *url.URL, respBody io.ReadCloser) s
 		return errMsg
 	}
 
-	errMsg += fmt.Sprintf(", Message: %s", errDetail)
+	if strings.Contains(errDetail, "does not have permission") {
+		errMsg = fmt.Sprintf("unauthorized: %s", errDetail)
+	} else {
+		errMsg += fmt.Sprintf("Message: %s", errDetail)
+	}
+
 	return errMsg
 }
 
diff --git a/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher_test.go b/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher_test.go
deleted file mode 100644
index 018b40f52c..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/fetcher/fetcher_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package fetcher
-
-import (
-	"bytes"
-	"io/ioutil"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-const (
-	errJSONStr401 = `{
-	"errors":
-		[{"code":"UNAUTHORIZED",
-		  "message":"authentication required",
-		  "detail":[{"Type":"repository","Class":"","Name":"library/jiowengew","Action":"pull"}]
-		}]
-	}
-	`
-	multipleErrJSONStr = `{
-	"errors":
-		[{"code":"UNAUTHORIZED",
-		  "message":"authentication required",
-		  "detail":[{"Type":"repository","Class":"","Name":"library/jiowengew","Action":"pull"}]
-		},
-		{"code":"NOTFOUND",
-		 "message": "image not found",
-		 "detail": "image not found"
-		}]
-	}
-	`
-	unexpectedStr                = `random`
-	unexpectedJSONStr            = `{"nope":"nope"}`
-	errJSONWithEmptyErrorsField  = `{"errors":[]}`
-	errJSONWithNoMessageField    = `{"errors":[{"code":"nope","detail":"nope"}]}`
-	errJSONWithEmptyMessageField = `{"errors":[{"code":"nope","message":""},{"message":""}]}`
-)
-
-func TestExtractErrResponseMessage(t *testing.T) {
-	// Test set up: create the io streams for testing purposes
-	// multiple streams needed: these streams only have read ends
-	singleErrTestStream := ioutil.NopCloser(bytes.NewReader([]byte(errJSONStr401)))
-	multipleErrTestStream := ioutil.NopCloser(bytes.NewReader([]byte(multipleErrJSONStr)))
-	unexpectedStrTestStream := ioutil.NopCloser(bytes.NewReader([]byte(unexpectedStr)))
-	malformedJSONTestStream := ioutil.NopCloser(bytes.NewReader([]byte(unexpectedJSONStr)))
-	emptyErrorsJSONTestStream := ioutil.NopCloser(bytes.NewReader([]byte(errJSONWithEmptyErrorsField)))
-	noMessageJSONTestStream := ioutil.NopCloser(bytes.NewReader([]byte(errJSONWithNoMessageField)))
-	emptyMessageJSONTestStream := ioutil.NopCloser(bytes.NewReader([]byte(errJSONWithEmptyMessageField)))
-
-	// Test 1: single error message extraction
-	msg, err := extractErrResponseMessage(singleErrTestStream)
-	assert.Nil(t, err, "test: (single error message) extraction should success for well-formatted error json")
-	assert.Equal(t, "authentication required", msg,
-		"test: (single error message) extracted message: %s; expected: authentication required", msg)
-
-	// Test 2: multiple error message extraction
-	msg, err = extractErrResponseMessage(multipleErrTestStream)
-	assert.Nil(t, err, "test: (multiple error messages) extraction should success for well-formatted error json")
-	assert.Equal(t, "authentication required, image not found", msg,
-		"test: (multiple error messages) extracted message: %s; expected: authentication required, image not found", msg)
-
-	// Test 3: random string in the stream that is not a json
-	msg, err = extractErrResponseMessage(unexpectedStrTestStream)
-	assert.Equal(t, "", msg, "test: (non-json string) no message should be extracted")
-	assert.NotNil(t, err, "test: (non-json string) extraction should fail")
-
-	// Test 4: malformed json string
-	msg, err = extractErrResponseMessage(malformedJSONTestStream)
-	assert.Equal(t, "", msg, "test: (malformed json string) no message should be extracted")
-	assert.Equal(t, errJSONFormat, err,
-		"test: (malformed json string) error: %s; expected error: %s", err)
-
-	// Test 5: malformed json with empty `errors` field
-	msg, err = extractErrResponseMessage(emptyErrorsJSONTestStream)
-	assert.Equal(t, "", msg, "test: (malformed json string, empty errors field) no message should be extracted")
-	assert.Equal(t, errJSONFormat, err,
-		"test: (malformerrJsonFormated json string, empty errors field) error: %s; expected error: %s", err, errJSONFormat)
-
-	// Test 6: malformed json with no `message` field
-	msg, err = extractErrResponseMessage(noMessageJSONTestStream)
-	assert.Equal(t, "", msg, "test: (malformed json string, no message field) no message should be extracted")
-	assert.Equal(t, errJSONFormat, err,
-		"test: (malformed json string, no message field) error: %s; expected error: %s", err, errJSONFormat)
-
-	// Test 7: malformed json with empty string in `message` field
-	msg, err = extractErrResponseMessage(emptyMessageJSONTestStream)
-	assert.Equal(t, "", msg, "test: (malformed json string, empty message field) no message should be extracted")
-	assert.Equal(t, errJSONFormat, err,
-		"test: (malformed json string, empty message field) error: %s; expected error: %s", err, errJSONFormat)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/filelock/flock.go b/installer/vendor/github.com/vmware/vic/pkg/filelock/flock.go
deleted file mode 100644
index 6c6672c7d6..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/filelock/flock.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filelock
-
-import (
-	"os"
-	"path/filepath"
-	"sync"
-	"syscall"
-)
-
-// FileLock is a cross-process lock designed to work over FS that supports locking.
-type FileLock struct {
-	LockFile string
-	LockName string
-
-	mu sync.Mutex
-	fh *os.File
-}
-
-// NewFileLock returns a new instance of the file based lock.
-// it is a user responsibility to ensure lock name is unique and doesn't collide
-// with any other file names in the TEMP directory.
-func NewFileLock(lockName string) *FileLock {
-	return &FileLock{
-		LockName: lockName,
-		LockFile: filepath.Join("/var/run/lock", lockName),
-	}
-}
-
-// Acquire grabs the lock. If lock is already acquired, it will block.
-// User should check for errors if lock is actually acquired, if lock is not acquired
-// it will panic on Release.
-func (fl *FileLock) Acquire() error {
-	fl.mu.Lock()
-	fh, err := os.Create(fl.LockFile)
-	if err != nil {
-		fl.mu.Unlock()
-		return err
-	}
-	fl.fh = fh
-	err = syscall.Flock(int(fh.Fd()), syscall.LOCK_EX)
-	if err != nil {
-		// #nosec: Errors unhandled
-		fh.Close()
-		fh = nil
-		fl.mu.Unlock()
-	}
-	return err
-}
-
-// Release lock. If lock is not acquired, it will panic.
-func (fl *FileLock) Release() error {
-	if fl.fh == nil {
-		panic("Attempt to release not acquired lock!")
-	}
-	// #nosec: Errors unhandled
-	syscall.Flock(int(fl.fh.Fd()), syscall.LOCK_UN)
-	err := fl.fh.Close()
-	fl.fh = nil
-	fl.mu.Unlock()
-	return err
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/filelock/flock_test.go b/installer/vendor/github.com/vmware/vic/pkg/filelock/flock_test.go
deleted file mode 100644
index 821246821d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/filelock/flock_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filelock
-
-import (
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestFlock(t *testing.T) {
-	lockName := "test_lock" + strconv.FormatInt(time.Now().UnixNano(), 10)
-	fl1 := NewFileLock(lockName)
-	fl2 := NewFileLock(lockName)
-	st := time.Now()
-	et := st
-	var wg sync.WaitGroup
-
-	wg.Add(1)
-	fl1.Acquire()
-
-	go func() {
-
-		if err := fl2.Acquire(); err != nil {
-			t.Fatal(err)
-		}
-		et = time.Now()
-
-		if err := fl2.Release(); err != nil {
-			t.Fatal(err)
-		}
-		wg.Done()
-	}()
-
-	time.Sleep(time.Millisecond * 100)
-	fl1.Release()
-	wg.Wait()
-
-	delta := (et.UnixNano() - st.UnixNano()) / 1000000
-	if delta < 50 {
-		t.Errorf("Wait time is less than 50: %d", delta)
-	}
-}
-
-func TestManyLocks(t *testing.T) {
-	lockName := "test_lock" + strconv.FormatInt(time.Now().UnixNano(), 10)
-	baseLock := NewFileLock(lockName)
-
-	var wg sync.WaitGroup
-	if err := baseLock.Acquire(); err != nil {
-		t.Fatal(err)
-	}
-
-	locksCount := 200
-	cnt := 0
-
-	for i := 0; i < locksCount; i++ {
-		wg.Add(1)
-		go func() {
-			time.Sleep(time.Millisecond)
-			defer wg.Done()
-			l := NewFileLock(lockName)
-			if err := l.Acquire(); err != nil {
-				t.Error(err)
-			} else {
-				cnt++
-				l.Release()
-			}
-		}()
-	}
-	baseLock.Release()
-	wg.Wait()
-	assert.Equal(t, locksCount, cnt)
-}
-
-func TestManyLocksWithNoBaseLock(t *testing.T) {
-	lockName := "test_lock" + strconv.FormatInt(time.Now().UnixNano(), 10)
-
-	var wg sync.WaitGroup
-
-	locksCount := 200
-	cnt := 0
-	for i := 0; i < locksCount; i++ {
-		wg.Add(1)
-		go func() {
-			time.Sleep(time.Millisecond)
-			defer wg.Done()
-			l := NewFileLock(lockName)
-			if err := l.Acquire(); err != nil {
-				t.Error(err)
-			} else {
-				cnt++
-				l.Release()
-			}
-		}()
-	}
-	wg.Wait()
-	assert.Equal(t, locksCount, cnt)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/filelock/glocks.go b/installer/vendor/github.com/vmware/vic/pkg/filelock/glocks.go
deleted file mode 100644
index b800cdbcf3..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/filelock/glocks.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package filelock
-
-// LogRotateLockName used to lock processes which can touch /var/log/vic logs to avoid race condition during
-// export and logrotate run.
-const LogRotateLockName = "logrotate_run.lock"
diff --git a/installer/vendor/github.com/vmware/vic/pkg/flags/optional_bool.go b/installer/vendor/github.com/vmware/vic/pkg/flags/optional_bool.go
new file mode 100644
index 0000000000..90754c5606
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/flags/optional_bool.go
@@ -0,0 +1,52 @@
+// Copyright 2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package flags
+
+import (
+	"flag"
+	"strconv"
+)
+
+type optionalBool struct {
+	val **bool
+}
+
+func (b *optionalBool) Set(s string) error {
+	v, err := strconv.ParseBool(s)
+	*b.val = &v
+	return err
+}
+
+func (b *optionalBool) Get() interface{} {
+	if *b.val == nil {
+		return nil
+	}
+	return **b.val
+}
+
+func (b *optionalBool) String() string {
+	if b.val == nil || *b.val == nil {
+		return "<nil>"
+	}
+	return strconv.FormatBool(**b.val)
+}
+
+func (b *optionalBool) IsBoolFlag() bool { return true }
+
+// NewOptionalString returns a flag.Value implementation where there is no default value.
+// This avoids sending a default value over the wire as using flag.StringVar() would.
+func NewOptionalBool(b **bool) flag.Value {
+	return &optionalBool{b}
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/flags/optional_int_test.go b/installer/vendor/github.com/vmware/vic/pkg/flags/optional_int_test.go
deleted file mode 100644
index eaec5bf8bc..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/flags/optional_int_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package flags
-
-import (
-	"flag"
-	"testing"
-)
-
-func TestOptionalInt(t *testing.T) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var val *int
-
-	fs.Var(NewOptionalInt(&val), "oint", "optional int")
-
-	b := fs.Lookup("oint")
-
-	if b.DefValue != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.String() != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != nil {
-		t.Fail()
-	}
-
-	b.Value.Set("1")
-
-	if b.Value.String() != "1" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != 1 {
-		t.Fail()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/flags/optional_string_test.go b/installer/vendor/github.com/vmware/vic/pkg/flags/optional_string_test.go
deleted file mode 100644
index 8a786d36c6..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/flags/optional_string_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package flags
-
-import (
-	"flag"
-	"testing"
-)
-
-func TestOptionalString(t *testing.T) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var val *string
-
-	fs.Var(NewOptionalString(&val), "obool", "optional bool")
-
-	b := fs.Lookup("obool")
-
-	if b.DefValue != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.String() != "<nil>" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != nil {
-		t.Fail()
-	}
-
-	b.Value.Set("test")
-
-	if b.Value.String() != "test" {
-		t.Fail()
-	}
-
-	if b.Value.(flag.Getter).Get() != "test" {
-		t.Fail()
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/flags/shares_flag_test.go b/installer/vendor/github.com/vmware/vic/pkg/flags/shares_flag_test.go
deleted file mode 100644
index e0c918180b..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/flags/shares_flag_test.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package flags
-
-import (
-	"flag"
-	"strings"
-	"testing"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestShareFlag(t *testing.T) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var val *types.SharesInfo
-
-	fs.Var(NewSharesFlag(&val), "shares", "memory shares")
-
-	u := fs.Lookup("shares")
-
-	if u.DefValue != "<nil>" {
-		t.Errorf("DefValue: %s", u.DefValue)
-	}
-
-	if u.Value.String() != "<nil>" {
-		t.Errorf("Value: %s", u.Value)
-	}
-
-	ref := "2000"
-	u.Value.Set(ref)
-
-	if u.Value.String() != strings.ToLower(ref) {
-		t.Errorf("Value after set: %q", u.Value)
-	}
-
-	if val == nil {
-		t.Errorf("val is not set")
-	}
-	if val.Level != types.SharesLevelCustom {
-		t.Errorf("shares level is not set correctly: %s", val.Level)
-	}
-	if val.Shares != 2000 {
-		t.Errorf("shares Share is not set correctly: %d", val.Shares)
-	}
-
-	ref = "HIGH"
-	u.Value.Set(ref)
-
-	if u.Value.String() != strings.ToLower(ref) {
-		t.Errorf("Value after set: %q", u.Value)
-	}
-
-	if val == nil {
-		t.Errorf("val is not set")
-	}
-	if val.Level != types.SharesLevelHigh {
-		t.Errorf("shares level is not set correctly: %s", val.Level)
-	}
-	if val.Shares != 0 {
-		t.Errorf("shares Share is not set correctly: %d", val.Shares)
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/flags/url_flag_test.go b/installer/vendor/github.com/vmware/vic/pkg/flags/url_flag_test.go
deleted file mode 100644
index 2e3054edd3..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/flags/url_flag_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package flags
-
-import (
-	"flag"
-	"net/url"
-	"testing"
-)
-
-func TestURLFlag(t *testing.T) {
-	fs := flag.NewFlagSet("", flag.ContinueOnError)
-	var val *url.URL
-
-	fs.Var(NewURLFlag(&val), "url", "url flag")
-
-	u := fs.Lookup("url")
-
-	if u.DefValue != "<nil>" {
-		t.Errorf("DefValue: %s", u.DefValue)
-	}
-
-	if u.Value.String() != "<nil>" {
-		t.Errorf("Value: %s", u.Value)
-	}
-
-	ref := "http://x:y@127.0.0.1"
-	u.Value.Set(ref)
-
-	if u.Value.String() != ref {
-		t.Errorf("Value after set: %s", u.Value)
-	}
-
-	if val == nil {
-		t.Errorf("val is not set")
-	}
-	if val.String() != ref {
-		t.Errorf("val is not set correctly: %s", val.String())
-	}
-
-	if val.User == nil {
-		t.Fatalf("Expected user info to be parsed from url")
-	}
-
-	if val.User.Username() != "x" {
-		t.Errorf("user was not extracted correctly")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/fs/ext4.go b/installer/vendor/github.com/vmware/vic/pkg/fs/ext4.go
deleted file mode 100644
index dd33c508b0..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/fs/ext4.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package fs
-
-import (
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/mount"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// Ext4 satisfies the Filesystem interface
-type Ext4 struct{}
-
-func NewExt4() *Ext4 {
-	return &Ext4{}
-}
-
-// Mkfs creates an ext4 fs on the given device and applices the given label
-func (e *Ext4) Mkfs(op trace.Operation, devPath, label string) error {
-	defer trace.End(trace.Begin(devPath))
-
-	op.Infof("Creating ext4 filesystem on device %s", devPath)
-
-	// -v is verbose - this is only useful when things go wrong,
-	// -F is needed to use the entire disk without prompting
-	// we can't use -V as well for fs specific stuff as that prevents it actually being done.
-	// #nosec: Subprocess launching with variable
-	cmd := exec.Command("/sbin/mkfs.ext4", "-L", label, "-vF", devPath)
-
-	if output, err := cmd.CombinedOutput(); err != nil {
-		op.Errorf("vmdk storage driver failed to format disk %s: %s", devPath, err)
-		op.Errorf("mkfs output: %s", string(output))
-		return err
-	}
-	op.Debugf("Filesystem created on device %s", devPath)
-
-	return nil
-}
-
-// Mount mounts an ext4 formatted device at the given path.  From the Docker
-// mount pkg, args must in the form arg=val.
-func (e *Ext4) Mount(op trace.Operation, devPath, targetPath string, options []string) error {
-	defer trace.End(trace.Begin(devPath))
-	op.Infof("Mounting %s to %s", devPath, targetPath)
-	return mount.Mount(devPath, targetPath, "ext4", strings.Join(options, ","))
-}
-
-// Unmount unmounts the disk.
-// path can be a device path or a mount point
-func (e *Ext4) Unmount(op trace.Operation, path string) error {
-	defer trace.End(trace.Begin(path))
-	op.Infof("Unmounting %s", path)
-	return mount.Unmount(path)
-}
-
-// SetLabel sets the label of an ext4 formated device
-func (e *Ext4) SetLabel(op trace.Operation, devPath, labelName string) error {
-	defer trace.End(trace.Begin(devPath))
-
-	// #nosec: Subprocess launching with variable
-	cmd := exec.Command("/sbin/e2label", devPath, labelName)
-	if output, err := cmd.CombinedOutput(); err != nil {
-		op.Errorf("failed to set label %s: %s", devPath, err)
-		op.Errorf(string(output))
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/fs/xfs.go b/installer/vendor/github.com/vmware/vic/pkg/fs/xfs.go
deleted file mode 100644
index f837e7b029..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/fs/xfs.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package fs
-
-import (
-	"os/exec"
-	"strings"
-
-	"github.com/docker/docker/pkg/mount"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// XFS satisfies the Filesystem interface
-type XFS struct{}
-
-// Create an XFS filesystem manager
-func NewXFS() *XFS {
-	return &XFS{}
-}
-
-// Mkfs creates an xfs fs on the given device and applices the given label
-func (e *XFS) Mkfs(op trace.Operation, devPath, label string) error {
-	defer trace.End(trace.Begin(devPath))
-
-	op.Infof("Creating xfs filesystem on device %s", devPath)
-
-	// #nosec: Subprocess launching with variable
-	cmd := exec.Command("/sbin/mkfs.xfs", "-n", "ftype=1", "-L", label, devPath)
-
-	if output, err := cmd.CombinedOutput(); err != nil {
-		op.Errorf("vmdk storage driver failed to format disk %s: %s", devPath, err)
-		op.Errorf("mkfs output: %s", string(output))
-		return err
-	}
-	op.Debugf("Filesystem created on device %s", devPath)
-
-	return nil
-}
-
-// Mount mounts an xfs formatted device at the given path.  From the Docker
-// mount pkg, args must in the form arg=val.
-func (e *XFS) Mount(op trace.Operation, devPath, targetPath string, options []string) error {
-	defer trace.End(trace.Begin(devPath))
-	op.Infof("Mounting %s to %s", devPath, targetPath)
-	return mount.Mount(devPath, targetPath, "xfs", strings.Join(options, ","))
-}
-
-// Unmount unmounts the disk.
-// path can be a device path or a mount point
-func (e *XFS) Unmount(op trace.Operation, path string) error {
-	defer trace.End(trace.Begin(path))
-	op.Infof("Unmounting %s", path)
-	return mount.Unmount(path)
-}
-
-// SetLabel sets the label of an xfs formated device
-func (e *XFS) SetLabel(op trace.Operation, devPath, labelName string) error {
-	defer trace.End(trace.Begin(devPath))
-
-	// #nosec: Subprocess launching with variable
-	cmd := exec.Command("/sbin/e2label", devPath, labelName)
-	if output, err := cmd.CombinedOutput(); err != nil {
-		op.Errorf("failed to set label %s: %s", devPath, err)
-		op.Errorf(string(output))
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n.go b/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n.go
deleted file mode 100644
index 2a242b37b7..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// Package i18n provides functionality to retrieve strings from a
-// messages catalog based on a key (string ID).
-//
-// The messages catalog is loaded from a file containing all of the
-// strings for a given language. Here is an example:
-//
-// English
-//
-//			File: messages/en
-//
-// 			greeting=hello
-// 			thanks=thank you
-//
-// Spanish
-//
-// 			File: messages/es
-//
-// 			greeting=hola
-// 			thanks=gracias
-//
-// To use the translation functionality, call LoadLanguage with the desired
-// messages file for the local language. Replace uses of string literals
-// with a call to T and a given string ID. If the string ID is not present
-// in the loaded messages file, the string ID will be returned as the default.
-//
-// Once initialized, Printer can also be used directly with fmt-like print functions.
-// This can be used to include format strings for localization as below:
-//
-// 			val := Printer.Sprintf("You know nothing %s", "Jon Snow")
-//
-// The corresponding messages catalogs would be:
-//
-// 			File: messages/en
-//
-// 			You know nothing %s=You know nothing %s
-//
-// 			File: messages/es
-//
-// 			You know nothing %s=No sabes nada %s
-//
-//
-// Packaging message catalogs
-//
-// Instead of loading a messages file from an on disk file, it is possible to
-// load it from a byte array that has been included with the source.
-//
-// For an executable's messages files in the messages directory, use
-// https://github.com/jteeuwen/go-bindata to convert these files to Go source code.
-// This MUST be done whenever any file in messages is added or edited.
-//
-// 			go-bindata -o messages.go messages
-//
-// Use the messages by recovering the byte[] corresponding to the file in the
-// messages directory and loading it.
-//
-//			data, err := Asset("messages/en")
-//			i18n.LoadLanguageBytes(language.English, data)
-//
-package i18n
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"os"
-	"strings"
-
-	"golang.org/x/text/language"
-	"golang.org/x/text/message"
-)
-
-// Printer is the message printer used by T
-// to obtain a translated value.
-var Printer *message.Printer
-
-// DefaultLang is the default langugage, set to English
-var DefaultLang = language.English
-
-func getPrinter(scanner *bufio.Scanner, lang language.Tag) (*message.Printer, error) {
-	catalog := message.DefaultCatalog
-	scanner.Split(bufio.ScanLines)
-	for scanner.Scan() {
-		s := scanner.Text()
-		line := strings.SplitN(s, "=", 2)
-		if len(line) != 2 {
-			return nil, fmt.Errorf("Invalid line in messages file: %v", line)
-		}
-		catalog.SetString(lang, line[0], line[1])
-	}
-	if err := scanner.Err(); err != nil {
-		return nil, err
-	}
-	return catalog.Printer(lang), nil
-}
-
-// LoadLanguage sets the package level Printer after loading
-// the desired language file from the path messagesFile.
-func LoadLanguage(lang language.Tag, messagesFile string) error {
-	f, err := os.Open(messagesFile)
-	if err != nil {
-		return fmt.Errorf("Failed to open messages file: %v", err)
-	}
-	defer f.Close()
-
-	s := bufio.NewScanner(f)
-	return loadLanguageScanner(lang, s)
-}
-
-// LoadLanguageBytes sets the package level Printer after loading
-// the desired language data from a byte array
-func LoadLanguageBytes(lang language.Tag, messagesData []byte) error {
-	data := bytes.NewReader(messagesData)
-	s := bufio.NewScanner(data)
-	return loadLanguageScanner(lang, s)
-}
-
-func loadLanguageScanner(lang language.Tag, s *bufio.Scanner) error {
-	printer, err := getPrinter(s, lang)
-	if err == nil {
-		Printer = printer
-	}
-	return err
-}
-
-// T (Translate) takes the message key stringID and returns the string
-// value that the key maps to in the loaded messages file. If the key
-// is not found, stringID is returned as the default value.
-func T(stringID string) string {
-	k := message.Key(stringID, stringID)
-	if Printer == nil {
-		panic("Message file has not been loaded. Call LoadLanguage.")
-	}
-	return Printer.Sprintf(k)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n_test.go b/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n_test.go
deleted file mode 100644
index 4514a70cae..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/i18n/i18n_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package i18n
-
-import (
-	"bufio"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-const testData = `key1=message1 english
-key2=message2 english
-format key %s=format message english %s`
-
-const badTestData = `key1message1`
-
-func TestGetPrinter(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(testData))
-	p, err := getPrinter(scanner, language.English)
-	if p == nil {
-		t.Errorf("Failed to getPrinter: %s", err)
-	}
-}
-
-func TestGetPrinterInvalid(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(badTestData))
-	p, err := getPrinter(scanner, language.English)
-	if err == nil {
-		t.Errorf("Failed to get an expected error.")
-	}
-	if p != nil {
-		t.Errorf("Got an unexpected printer from getPrinter")
-	}
-}
-
-func TestPrinterFormat(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(testData))
-	p, _ := getPrinter(scanner, language.English)
-	Printer = p
-	testKey := "format key %s"
-	expectedValue := "format message english HAI"
-
-	val := Printer.Sprintf(testKey, "HAI")
-	if val != expectedValue {
-		t.Errorf("Got: %s Expected: %s", val, expectedValue)
-	}
-}
-
-func TestTranslate(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(testData))
-	p, _ := getPrinter(scanner, language.English)
-	Printer = p
-	testKey := "key1"
-	expectedValue := "message1 english"
-
-	val := T(testKey)
-	if val != expectedValue {
-		t.Errorf("Got: %s Expected: %s", val, expectedValue)
-	}
-}
-
-func TestTranslateDefault(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(testData))
-	p, _ := getPrinter(scanner, language.English)
-	Printer = p
-	testKey := "undefined"
-
-	val := T(testKey)
-	if val != testKey {
-		t.Errorf("Got: %s Expected: %s", val, testKey)
-	}
-}
-
-func TestUnloadedTranslate(t *testing.T) {
-	defer func() {
-		if r := recover(); r == nil {
-			t.Errorf("Did not receive expected panic.")
-		}
-	}()
-
-	Printer = nil
-	testKey := "key1"
-	T(testKey)
-}
-
-func TestLoadLanguageScanner(t *testing.T) {
-	scanner := bufio.NewScanner(strings.NewReader(testData))
-	err := loadLanguageScanner(language.English, scanner)
-	if err != nil {
-		t.Errorf("Failed to getPrinter")
-	}
-	if Printer == nil {
-		t.Errorf("Failed to set Printer")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/index/index.go b/installer/vendor/github.com/vmware/vic/pkg/index/index.go
deleted file mode 100644
index 13eabdfc69..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/index/index.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package index
-
-import (
-	"container/list"
-	"errors"
-	"fmt"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-var (
-	ErrNodeNotFound = errors.New("Node not found")
-)
-
-type Element interface {
-	// Returns the identifier of the node
-	Self() string
-
-	// Returns the string respresentation of the nodes parent (usually it's ID)
-	Parent() string
-
-	// Deep copy of the node
-	Copy() Element
-}
-
-type node struct {
-	Element
-	parent   *node
-	children []*node
-	mask     uint32
-}
-
-func (n *node) addChild(child *node) {
-	n.children = append(n.children, child)
-}
-
-type Index struct {
-	root        *node
-	lookupTable map[string]*node
-	m           sync.RWMutex
-}
-
-func NewIndex() *Index {
-	return &Index{
-		lookupTable: make(map[string]*node),
-	}
-}
-
-// Insert inserts a copy of the given node to the tree under the given parent.
-func (i *Index) Insert(n Element) error {
-	defer i.m.Unlock()
-	i.m.Lock()
-
-	_, ok := i.lookupTable[n.Self()]
-	if ok {
-		return fmt.Errorf("node %s already exists in index", n.Self())
-	}
-
-	log.Debugf("Index: inserting %s (parent: %s) in index", n.Self(), n.Parent())
-
-	newNode := &node{
-		Element: n.Copy(),
-	}
-
-	if n.Parent() == n.Self() {
-		if i.root != nil {
-			return fmt.Errorf("node cannot point to self unless it's root")
-		}
-
-		// set root
-		i.root = newNode
-	} else {
-		p, ok := i.lookupTable[n.Parent()]
-		if !ok {
-			return fmt.Errorf("Can't find parent %s", n.Parent())
-		}
-		newNode.parent = p
-		p.addChild(newNode)
-	}
-
-	i.lookupTable[n.Self()] = newNode
-	return nil
-}
-
-// Get returns a Copy of the named node.
-func (i *Index) Get(nodeID string) (Element, error) {
-	defer i.m.RUnlock()
-	i.m.RLock()
-
-	n, ok := i.lookupTable[nodeID]
-	if !ok {
-		return nil, ErrNodeNotFound
-	}
-
-	return n.Copy(), nil
-}
-
-// HasChildren returns whether a node has children or not
-func (i *Index) HasChildren(nodeID string) (bool, error) {
-	defer i.m.RUnlock()
-	i.m.RLock()
-
-	n, ok := i.lookupTable[nodeID]
-	if !ok {
-		return false, ErrNodeNotFound
-	}
-
-	return (len(n.children) > 0), nil
-}
-
-func (i *Index) List() ([]Element, error) {
-	defer i.m.RUnlock()
-	i.m.RLock()
-
-	nodes := make([]Element, 0, len(i.lookupTable))
-
-	for _, v := range i.lookupTable {
-		nodes = append(nodes, v.Copy())
-	}
-
-	return nodes, nil
-}
-
-// Delete deletes a leaf node
-func (i *Index) Delete(nodeID string) (Element, error) {
-	defer i.m.Unlock()
-	i.m.Lock()
-
-	return i.deleteNode(nodeID)
-}
-
-func (i *Index) deleteNode(nodeID string) (Element, error) {
-	log.Debugf("deleting %s", nodeID)
-
-	n, ok := i.lookupTable[nodeID]
-	if !ok {
-		return nil, fmt.Errorf("Node %s not found", nodeID)
-	}
-
-	if len(n.children) != 0 {
-		return nil, fmt.Errorf("Node %s has children %#v", nodeID, n.children)
-	}
-
-	// remove the reference to the node from its parent
-	parent := n.parent
-	var deleted bool
-	for idx, child := range parent.children {
-		if child.Self() == nodeID {
-			parent.children = append(parent.children[:idx], parent.children[idx+1:]...)
-			deleted = true
-		}
-	}
-
-	if !deleted {
-		err := fmt.Errorf("%s not found in tree", nodeID)
-		log.Errorf("%s", err)
-		return nil, err
-	}
-
-	// remove from the lookup table
-	delete(i.lookupTable, nodeID)
-	n.parent = nil
-
-	return n.Element, nil
-}
-
-type iterflag int
-
-const (
-	NOOP iterflag = iota
-	STOP
-)
-
-type visitor func(Element) (iterflag, error)
-
-func (i *Index) bfs(root *node, visitFunc visitor) error {
-	defer i.m.Unlock()
-	i.m.Lock()
-
-	// XXX Look into parallelizing this without breaking API boundaries.
-	return i.bfsworker(root, func(n *node) (iterflag, error) { return visitFunc(n.Element) })
-}
-
-func (i *Index) bfsworker(root *node, visitFunc func(*node) (iterflag, error)) error {
-
-	queue := list.New()
-	queue.PushBack(root)
-
-	for queue.Len() > 0 {
-		n := queue.Remove(queue.Front()).(*node)
-
-		flag, err := visitFunc(n)
-		if err != nil {
-			return err
-		}
-
-		if flag == STOP {
-			return nil
-		}
-
-		for _, child := range n.children {
-			queue.PushBack(child)
-		}
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/index/index_test.go b/installer/vendor/github.com/vmware/vic/pkg/index/index_test.go
deleted file mode 100644
index bf4a5abbbf..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/index/index_test.go
+++ /dev/null
@@ -1,203 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package index
-
-import (
-	"strconv"
-	"sync"
-	"testing"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-type mockEntry struct {
-	number int
-	parent int
-}
-
-func newMockEntry(n, parent int) *mockEntry {
-	return &mockEntry{
-		number: n,
-		parent: parent,
-	}
-}
-
-func (m *mockEntry) Self() string {
-	return strconv.Itoa(m.number)
-}
-
-func (m *mockEntry) Parent() string {
-	return strconv.Itoa(m.parent)
-}
-
-func (m *mockEntry) Copy() Element {
-	return &mockEntry{
-		number: m.number,
-		parent: m.parent,
-	}
-}
-
-func TestInsertAndGet(t *testing.T) {
-	i := NewIndex()
-	root := newMockEntry(0, 0)
-	err := i.Insert(root)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	max := 10
-
-	// insert
-	for n := 1; n < max; n++ {
-		err = i.Insert(newMockEntry(n, n-1))
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-
-	// add an entry that already exists
-	err = i.Insert(newMockEntry(1, 1))
-	if !assert.Error(t, err) {
-		return
-	}
-
-	// check children
-	for _, node := range i.lookupTable {
-		if node.Self() != "9" && !assert.True(t, len(node.children) > 0) {
-			return
-		}
-	}
-
-	// Now get
-	wg := sync.WaitGroup{}
-	wg.Add(max)
-	for idx := 0; idx < max; idx++ {
-		go func(idx int) {
-			defer wg.Done()
-			_, err := i.Get(strconv.Itoa(idx))
-			if !assert.NoError(t, err) {
-				return
-			}
-		}(idx)
-	}
-	wg.Wait()
-}
-
-func TestBFS(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	i := NewIndex()
-
-	root := newMockEntry(0, 0)
-
-	i.Insert(root)
-
-	branches := 10
-	expectedNodes := createTree(t, i, branches)
-	expectedNodes[0] = root
-
-	var count int
-	err := i.bfs(i.root, func(n Element) (iterflag, error) {
-		mynode := n.(*mockEntry)
-		t.Logf("%#v\n", mynode)
-
-		// will point to different elements but check their values
-		assert.Equal(t, expectedNodes[mynode.number], mynode)
-		count++
-		return NOOP, nil
-	})
-
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, (4*(branches-1))+1, count) {
-		return
-	}
-}
-
-func TestDelete(t *testing.T) {
-	logrus.SetLevel(logrus.DebugLevel)
-	i := NewIndex()
-
-	root := newMockEntry(0, 0)
-
-	i.Insert(root)
-
-	branches := 10
-	expectedNodes := createTree(t, i, branches)
-	expectedNodes[0] = root
-
-	// list what we added
-	before, err := i.List()
-	if !assert.NoError(t, err) || !assert.True(t, len(before) > 0) {
-		return
-	}
-
-	// is a leaf, should delete without issue
-	n, err := i.Delete("9000")
-	if !assert.NoError(t, err) || !assert.NotNil(t, n) {
-		return
-	}
-
-	// check it's gone
-	_, ok := i.lookupTable["9000"]
-	if !assert.False(t, ok) {
-		return
-	}
-
-	// isn't a leaf, should throw an error
-	n, err = i.Delete("9")
-	if !assert.Error(t, err) || !assert.Nil(t, n) {
-		return
-	}
-
-	// isn't in the index
-	n, err = i.Delete("foo")
-	if !assert.Error(t, err) || !assert.Nil(t, n) {
-		return
-	}
-
-	// list once more and make sure we nuked the image
-	after, err := i.List()
-	if !assert.NoError(t, err) || !assert.Equal(t, len(before), len(after)+1) {
-		return
-	}
-}
-
-func createTree(t *testing.T, i *Index, count int) map[int]*mockEntry {
-	expectedNodes := make(map[int]*mockEntry)
-
-	insert := func(n *mockEntry) {
-		if !assert.NoError(t, i.Insert(n)) {
-			return
-		}
-	}
-
-	// insert and create 3 children for each branch
-	for n := 1; n < count; n++ {
-		expectedNodes[n] = newMockEntry(n, 0)
-		expectedNodes[n*10] = newMockEntry(n*10, n)
-		expectedNodes[n*100] = newMockEntry(n*100, n)
-		expectedNodes[n*1000] = newMockEntry(n*1000, n)
-
-		insert(expectedNodes[n])
-		insert(expectedNodes[n*10])
-		insert(expectedNodes[n*100])
-		insert(expectedNodes[n*1000])
-	}
-
-	return expectedNodes
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/ip/ip_test.go b/installer/vendor/github.com/vmware/vic/pkg/ip/ip_test.go
deleted file mode 100644
index 5e3d7544e2..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/ip/ip_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package ip
-
-import (
-	"fmt"
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRangeMarshalText(t *testing.T) {
-	var tests = []struct {
-		ipr *Range
-		s   string
-		err error
-	}{
-		{&Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, "10.10.10.10-10.10.10.24", nil},
-	}
-
-	for _, te := range tests {
-		b, err := te.ipr.MarshalText()
-		if te.err != nil && err == nil {
-			t.Fatalf("MarshalText() => (%v, nil) want (nil, err)", b)
-			continue
-		}
-
-		if string(b) != te.s {
-			t.Fatalf("MarshalText() => (%s, %s) want (%s, nil)", string(b), err, te.s)
-		}
-	}
-}
-
-func TestRangeUnmarshalText(t *testing.T) {
-
-	var tests = []struct {
-		r   string
-		ipr *Range
-		err error
-	}{
-		{"10.10.10.10-9", nil, fmt.Errorf("")},
-		{"10.10.10.10-10.10.10.9", nil, fmt.Errorf("")},
-		{"10.10.10.10-24", &Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, nil},
-		{"10.10.10.10-10.10.10.24", &Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, nil},
-		{"10.10.10.0/24", &Range{net.ParseIP("10.10.10.0"), net.ParseIP("10.10.10.255")}, nil},
-	}
-
-	for _, te := range tests {
-		ipr := &Range{}
-		err := ipr.UnmarshalText([]byte(te.r))
-		if te.err != nil {
-			if err == nil {
-				t.Fatalf("UnmarshalText(%s) => nil want err", te.r)
-			}
-
-			continue
-		}
-
-		if !te.ipr.FirstIP.Equal(ipr.FirstIP) ||
-			!te.ipr.LastIP.Equal(ipr.LastIP) {
-			t.Fatalf("UnmarshalText(%s) => %#v want %#v", te.r, ipr, te.ipr)
-		}
-	}
-}
-
-func TestRangeOverlap(t *testing.T) {
-	var tests = []struct {
-		ipr1, ipr2 Range
-		res        bool
-	}{
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, true},
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.15"), net.ParseIP("10.10.10.24")}, true},
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.15"), net.ParseIP("10.10.10.20")}, true},
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.9"), net.ParseIP("10.10.10.25")}, true},
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.24"), net.ParseIP("10.10.10.25")}, true},
-		{Range{net.ParseIP("10.10.10.10"), net.ParseIP("10.10.10.24")}, Range{net.ParseIP("10.10.10.25"), net.ParseIP("10.10.10.50")}, false},
-	}
-
-	for _, te := range tests {
-		res := te.ipr1.Overlaps(te.ipr2)
-		if res != te.res {
-			t.Fatalf("(%s).Overlaps(%s) => %t want %t", te.ipr1, te.ipr2, res, te.res)
-		}
-	}
-}
-
-func TestAllZerosAddr(t *testing.T) {
-	var tests = []struct {
-		subnet *net.IPNet
-		addr   net.IP
-	}{
-		{&net.IPNet{IP: net.ParseIP("192.168.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("192.168.0.0")},
-		{&net.IPNet{IP: net.ParseIP("192.168.100.0"), Mask: net.CIDRMask(24, 32)}, net.ParseIP("192.168.100.0")},
-	}
-
-	for _, te := range tests {
-		addr := AllZerosAddr(te.subnet)
-		if !te.addr.Equal(addr) {
-			t.Fatalf("AllZerosAddr(%s) => got %s, want %s", te.subnet, addr, te.addr)
-		}
-	}
-}
-
-func TestAllOnesAddr(t *testing.T) {
-	var tests = []struct {
-		subnet *net.IPNet
-		addr   net.IP
-	}{
-		{&net.IPNet{IP: net.ParseIP("192.168.0.0"), Mask: net.CIDRMask(16, 32)}, net.ParseIP("192.168.255.255")},
-		{&net.IPNet{IP: net.ParseIP("192.168.100.0"), Mask: net.CIDRMask(24, 32)}, net.ParseIP("192.168.100.255")},
-	}
-
-	for _, te := range tests {
-		addr := AllOnesAddr(te.subnet)
-		if !te.addr.Equal(addr) {
-			t.Fatalf("AllOnesAddr(%s) => got %s, want %s", te.subnet, addr, te.addr)
-		}
-	}
-}
-
-func TestRangeNetwork(t *testing.T) {
-	var tests = []struct {
-		r *Range
-		n *net.IPNet
-	}{
-		{ParseRange("10.10.10.10/24"), &net.IPNet{IP: net.ParseIP("10.10.10.0"), Mask: net.CIDRMask(24, 32)}},
-		{ParseRange("10.10.10.10-10.10.14.11"), nil},
-		{ParseRange("10.10.10.10-10.10.10.11"), &net.IPNet{IP: net.ParseIP("10.10.10.10"), Mask: net.CIDRMask(31, 32)}},
-	}
-
-	for _, te := range tests {
-		n := te.r.Network()
-		if te.n != nil {
-			assert.NotNil(t, n)
-		} else {
-			assert.Nil(t, n)
-			continue
-		}
-
-		if !n.IP.Equal(te.n.IP) {
-			assert.FailNow(t, fmt.Sprintf("got %s, want %s", n, te.n))
-		}
-
-		assert.EqualValues(t, n.Mask, te.n.Mask)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/kvstore/backend.go b/installer/vendor/github.com/vmware/vic/pkg/kvstore/backend.go
deleted file mode 100644
index 60c8bdd38d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/kvstore/backend.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kvstore
-
-import (
-	"context"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/stringutils"
-
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-)
-
-type Backend interface {
-	// Save saves data to the specified path
-	Save(ctx context.Context, r io.Reader, path string) error
-	// Load loads data from the specified path
-	Load(ctx context.Context, path string) (io.ReadCloser, error)
-}
-
-func NewDatastoreBackend(ds *datastore.Helper) Backend {
-	return &dsBackend{ds: ds}
-}
-
-type dsBackend struct {
-	ds *datastore.Helper
-}
-
-// Save saves data to the specified path
-func (d *dsBackend) Save(ctx context.Context, r io.Reader, path string) error {
-	// upload to an ephemeral file
-	tmpfile := fmt.Sprintf("%s-%s.tmp", path, stringutils.GenerateRandomAlphaOnlyString(10))
-	if err := d.ds.Upload(ctx, r, tmpfile); err != nil {
-		return err
-	}
-	log.Debugf("kv store upload of file (%s) was successful", tmpfile)
-
-	return d.ds.Mv(ctx, tmpfile, path)
-}
-
-func toOsError(err error) error {
-	switch err.Error() {
-	case fmt.Sprintf("%d %s", http.StatusNotFound, http.StatusText(http.StatusNotFound)):
-		return os.ErrNotExist
-	}
-
-	return err
-}
-
-// Load loads data from the specified path
-func (d *dsBackend) Load(ctx context.Context, path string) (io.ReadCloser, error) {
-	rc, err := d.ds.Download(ctx, path)
-	if err != nil {
-		return nil, toOsError(err)
-	}
-	log.Debugf("kv store download of file (%s) was successful", path)
-
-	return rc, err
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore.go b/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore.go
deleted file mode 100644
index 9cc8e8eedc..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kvstore
-
-import (
-	"bytes"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"regexp"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-var (
-	ErrKeyNotFound = errors.New("key not found")
-)
-
-// This package implements a very basic key/value store.  It is up to the
-// caller to provision the namespace.
-
-type KeyValueStore interface {
-	// Set adds a new key or modifies an existing key in the key-value store
-	Put(ctx context.Context, key string, value []byte) error
-
-	// Get gets an existing key in the key-value store. Returns ErrKeyNotFound
-	// if key does not exist the key-value store.
-	Get(key string) ([]byte, error)
-
-	// List lists the key-value pairs whose keys match the regular expression
-	// passed in.
-	List(re string) (map[string][]byte, error)
-
-	// Delete deletes existing keys from the key-value store. Returns ErrKeyNotFound
-	// if key does not exist the key-value store.
-	Delete(ctx context.Context, key string) error
-
-	// Save saves the key-value store data to the backend.
-	Save(ctx context.Context) error
-
-	// Name returns the unique identifier/name for the key-value store. This is
-	// used to determine the path that is passed to the backend operations.
-	Name() string
-}
-
-type kv struct {
-	b    Backend
-	kv   map[string][]byte
-	name string
-	l    sync.RWMutex
-}
-
-func fileName(name string) string {
-	return fmt.Sprintf("%s.dat", name)
-}
-
-// Create a new KeyValueStore instance using the given Backend with the given
-// file.  If the file exists on the Backend, it is restored.
-func NewKeyValueStore(ctx context.Context, store Backend, name string) (KeyValueStore, error) {
-	p := &kv{
-		b:    store,
-		kv:   make(map[string][]byte),
-		name: name,
-	}
-
-	if err := p.restore(ctx); err != nil {
-		return nil, err
-	}
-
-	log.Infof("NewKeyValueStore(%s) restored %d keys", name, len(p.kv))
-
-	return p, nil
-}
-
-func (p *kv) Name() string {
-	return p.name
-}
-
-func (p *kv) restore(ctx context.Context) error {
-	p.l.Lock()
-	defer p.l.Unlock()
-
-	rc, err := p.b.Load(ctx, fileName(p.name))
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-
-		return err
-	}
-	defer rc.Close()
-
-	if err = json.NewDecoder(rc).Decode(&p.kv); err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// Set a key to the KeyValueStore with the given value.  If they key already
-// exists, the value is overwritten.
-func (p *kv) Put(ctx context.Context, key string, value []byte) error {
-	p.l.Lock()
-	defer p.l.Unlock()
-
-	// get the old value in case we need to roll back
-	oldvalue, ok := p.kv[key]
-
-	if ok && bytes.Compare(oldvalue, value) == 0 {
-		// NOOP
-		return nil
-	}
-
-	p.kv[key] = value
-
-	if err := p.save(ctx); err != nil && ok {
-		// revert if failure
-		p.kv[key] = oldvalue
-		return err
-	}
-
-	return nil
-}
-
-// Get retrieves a key from the KeyValueStore.
-func (p *kv) Get(key string) ([]byte, error) {
-	p.l.RLock()
-	defer p.l.RUnlock()
-
-	v, ok := p.kv[key]
-	if !ok {
-		return []byte{}, ErrKeyNotFound
-	}
-
-	return v, nil
-}
-
-func (p *kv) List(re string) (map[string][]byte, error) {
-	p.l.RLock()
-	defer p.l.RUnlock()
-
-	regex, err := regexp.Compile(re)
-	if err != nil {
-		return nil, err
-	}
-
-	kv := make(map[string][]byte)
-	for k, v := range p.kv {
-		if regex.MatchString(k) {
-			kv[k] = v
-		}
-	}
-
-	if len(kv) == 0 {
-		return nil, ErrKeyNotFound
-	}
-
-	return kv, nil
-}
-
-// Delete removes a key from the KeyValueStore.
-func (p *kv) Delete(ctx context.Context, key string) error {
-	p.l.Lock()
-	defer p.l.Unlock()
-
-	oldvalue, ok := p.kv[key]
-	if !ok {
-		return ErrKeyNotFound
-	}
-
-	delete(p.kv, key)
-
-	if err := p.save(ctx); err != nil {
-		// restore the key
-		p.kv[key] = oldvalue
-		return err
-	}
-
-	return nil
-}
-
-// Save persists the KeyValueStore to the Backend.
-func (p *kv) Save(ctx context.Context) error {
-	p.l.Lock()
-	defer p.l.Unlock()
-	return p.save(ctx)
-}
-
-func (p *kv) save(ctx context.Context) error {
-	buf, err := json.Marshal(p.kv)
-	if err != nil {
-		return err
-	}
-
-	r := bytes.NewReader(buf)
-	if err = p.b.Save(ctx, r, fileName(p.name)); err != nil {
-		return fmt.Errorf("Error uploading %s: %s", fileName(p.name), err)
-	}
-
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore_test.go b/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore_test.go
deleted file mode 100644
index baa46cacd5..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/kvstore/kvstore_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kvstore
-
-import (
-	"context"
-	"fmt"
-	"strconv"
-	"sync"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func save(t *testing.T, kv KeyValueStore, key string, expectedvalue []byte) {
-	op := trace.NewOperation(context.Background(), "save")
-
-	if !assert.NoError(t, kv.Put(op, key, expectedvalue)) {
-		return
-	}
-}
-
-func get(t *testing.T, kv KeyValueStore, key string, expectedval []byte) {
-	// get the value we added
-	v, err := kv.Get(key)
-	if !assert.NoError(t, err) || !assert.NotNil(t, v) || !assert.Equal(t, expectedval, v) {
-		return
-	}
-}
-
-func TestAddAndGet(t *testing.T) {
-	mb := &MockBackend{}
-
-	op := trace.NewOperation(context.Background(), "testaddsaveget")
-
-	// Save some entries in parallel
-	entries := 500
-	wg := sync.WaitGroup{}
-	wg.Add(entries)
-
-	expected := make(map[string][]byte)
-
-	firstkv, err := NewKeyValueStore(op, mb, "datfile")
-	if !assert.NoError(t, err) || !assert.NotNil(t, firstkv) {
-		return
-	}
-
-	for i := 0; i < entries; i++ {
-		k := fmt.Sprintf("key-%d", i)
-		v := []byte(strconv.Itoa(i))
-
-		expected[k] = v
-		go func() {
-			defer wg.Done()
-			save(t, firstkv, k, v)
-			get(t, firstkv, k, v)
-		}()
-	}
-	wg.Wait()
-
-	if t.Failed() {
-		return
-	}
-
-	// Restart the kv store by creating a new one and attempt to get the same
-	// entries.
-	secondkv, err := NewKeyValueStore(op, mb, "datfile")
-	if !assert.NoError(t, err) || !assert.NotNil(t, secondkv) {
-		return
-	}
-
-	wg.Add(entries)
-	for k, v := range expected {
-		go func(key string, value []byte) {
-			defer wg.Done()
-			get(t, secondkv, key, value)
-		}(k, v)
-	}
-	wg.Wait()
-
-	if t.Failed() {
-		return
-	}
-
-	// Ovewrite all of the values and verify again
-	wg.Add(entries)
-	for k := range expected {
-		newval := []byte("ddddd")
-
-		expected[k] = newval
-		go func(key string, value []byte) {
-			defer wg.Done()
-			save(t, secondkv, key, value)
-			get(t, secondkv, key, value)
-		}(k, newval)
-	}
-	wg.Wait()
-
-	if t.Failed() {
-		return
-	}
-
-	// Restart and verify the overwritten values match the expected
-	thirdkv, err := NewKeyValueStore(op, mb, "datfile")
-	if !assert.NoError(t, err) || !assert.NotNil(t, thirdkv) {
-		return
-	}
-
-	wg.Add(entries)
-	for k, v := range expected {
-		go func(key string, value []byte) {
-			defer wg.Done()
-			get(t, thirdkv, key, value)
-		}(k, v)
-	}
-	wg.Wait()
-
-	if t.Failed() {
-		return
-	}
-
-	// Remove all of the entries and assert nothing can be found
-	wg.Add(entries)
-	for k := range expected {
-		go func(key string) {
-			defer wg.Done()
-			if !assert.NoError(t, thirdkv.Delete(op, key)) {
-				return
-			}
-
-			_, err := thirdkv.Get(key)
-			if !assert.Error(t, err) {
-				return
-			}
-		}(k)
-	}
-	wg.Wait()
-
-	if t.Failed() {
-		return
-	}
-
-	// Check the kv is empty after restart
-	fourthkv, err := NewKeyValueStore(op, mb, "datfile")
-	wg.Add(entries)
-	for k := range expected {
-		go func(key string) {
-			defer wg.Done()
-			_, err := fourthkv.Get(key)
-			if !assert.Error(t, err) {
-				return
-			}
-		}(k)
-	}
-	wg.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/kvstore/mocks.go b/installer/vendor/github.com/vmware/vic/pkg/kvstore/mocks.go
deleted file mode 100644
index e28b4cc2b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/kvstore/mocks.go
+++ /dev/null
@@ -1,158 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package kvstore
-
-import (
-	"bytes"
-	"context"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/stretchr/testify/mock"
-)
-
-type MockBackend struct {
-	buf []byte
-}
-
-// Creates path and ovewrites whatever is there
-func (m *MockBackend) Save(ctx context.Context, r io.Reader, pth string) error {
-	buf, err := ioutil.ReadAll(r)
-	if err != nil {
-		return err
-	}
-
-	m.buf = buf
-
-	return nil
-}
-
-func (m *MockBackend) Load(ctx context.Context, pth string) (io.ReadCloser, error) {
-	if len(m.buf) == 0 {
-		return nil, os.ErrNotExist
-	}
-
-	return ioutil.NopCloser(bytes.NewReader(m.buf)), nil
-}
-
-// MockKeyValueStore is an autogenerated mock type for the KeyValueStore type
-type MockKeyValueStore struct {
-	mock.Mock
-}
-
-// Delete provides a mock function with given fields: ctx, key
-func (_m *MockKeyValueStore) Delete(ctx context.Context, key string) error {
-	ret := _m.Called(ctx, key)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, string) error); ok {
-		r0 = rf(ctx, key)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Get provides a mock function with given fields: key
-func (_m *MockKeyValueStore) Get(key string) ([]byte, error) {
-	ret := _m.Called(key)
-
-	var r0 []byte
-	if rf, ok := ret.Get(0).(func(string) []byte); ok {
-		r0 = rf(key)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).([]byte)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(key)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// List provides a mock function with given fields: re
-func (_m *MockKeyValueStore) List(re string) (map[string][]byte, error) {
-	ret := _m.Called(re)
-
-	var r0 map[string][]byte
-	if rf, ok := ret.Get(0).(func(string) map[string][]byte); ok {
-		r0 = rf(re)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(map[string][]byte)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(string) error); ok {
-		r1 = rf(re)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// Name provides a mock function with given fields:
-func (_m *MockKeyValueStore) Name() string {
-	ret := _m.Called()
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func() string); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-// Save provides a mock function with given fields: ctx
-func (_m *MockKeyValueStore) Save(ctx context.Context) error {
-	ret := _m.Called(ctx)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context) error); ok {
-		r0 = rf(ctx)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Set provides a mock function with given fields: ctx, key, value
-func (_m *MockKeyValueStore) Put(ctx context.Context, key string, value []byte) error {
-	ret := _m.Called(ctx, key, value)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(context.Context, string, []byte) error); ok {
-		r0 = rf(ctx, key, value)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-var _ KeyValueStore = (*MockKeyValueStore)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/log.go b/installer/vendor/github.com/vmware/vic/pkg/log/log.go
index b00b5b8690..5a6faffdef 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/log/log.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/log/log.go
@@ -70,22 +70,28 @@ func Init(cfg *LoggingConfig) error {
 
 			logrus.Debugf("log cfg: %+v", *cfg)
 
-			if cfg.Syslog != nil {
-				logrus.Debugf("syslog cfg: %+v", *cfg.Syslog)
-				hook, err := syslog.NewHook(
-					cfg.Syslog.Network,
-					cfg.Syslog.RAddr,
-					cfg.Syslog.Priority,
-					cfg.Syslog.Tag,
-				)
-				if err != nil {
-					// not a fatal error, so just log a warning
-					logrus.Warnf("error trying to initialize syslog: %s", err)
-				} else {
-					logrus.AddHook(hook)
-				}
+			hook, err := CreateSyslogHook(cfg)
+			if err == nil && hook != nil {
+				logrus.AddHook(hook)
 			}
 		})
 
 	return initializer.err
 }
+
+func CreateSyslogHook(cfg *LoggingConfig) (logrus.Hook, error) {
+	if cfg.Syslog == nil {
+		return nil, nil
+	}
+	hook, err := syslog.NewHook(
+		cfg.Syslog.Network,
+		cfg.Syslog.RAddr,
+		cfg.Syslog.Priority,
+		cfg.Syslog.Tag,
+	)
+	if err != nil {
+		// not a fatal error, so just log a warning
+		logrus.Warnf("error trying to initialize syslog: %s", err)
+	}
+	return hook, err
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/formatter_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/formatter_test.go
deleted file mode 100644
index 4d4693eb7e..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/formatter_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package syslog
-
-import (
-	"fmt"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestNewFormatter(t *testing.T) {
-	f := newFormatter("", RFC3164)
-	assert.IsType(t, &localFormatter{}, f)
-
-	f = newFormatter("tcp", RFC3164)
-	assert.IsType(t, &rfc3164Formatter{}, f)
-
-	f = newFormatter("tcp", 123)
-	assert.Nil(t, f)
-}
-
-func TestFormatterFormats(t *testing.T) {
-	var tests = []struct {
-		format   string
-		tsLayout string
-		local    bool
-		f        formatter
-	}{
-		{"<%d>%s %s[%d]: %s", time.Stamp, true, &localFormatter{}},
-		{"<%d>%s %s %s[%d]: %s", time.RFC3339, false, &rfc3164Formatter{}},
-	}
-
-	for _, te := range tests {
-		ts := time.Now()
-		if te.local {
-			assert.Equal(t, fmt.Sprintf(te.format, priority, ts.Format(te.tsLayout), tag, os.Getpid(), "foo"), te.f.Format(priority, ts, "host", tag, "foo"))
-		} else {
-			assert.Equal(t, fmt.Sprintf(te.format, priority, ts.Format(te.tsLayout), "host", tag, os.Getpid(), "foo"), te.f.Format(priority, ts, "host", tag, "foo"))
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/hook_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/hook_test.go
deleted file mode 100644
index 8dc80e34d3..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/hook_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package syslog
-
-import (
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-func TestNewSyslogHook(t *testing.T) {
-	// error case
-	d := &mockDialer{}
-	d.On("dial").Return(nil, assert.AnError)
-	h, err := newHook(d)
-	assert.Nil(t, h)
-	assert.Error(t, err)
-	assert.EqualError(t, err, assert.AnError.Error())
-	d.AssertCalled(t, "dial")
-	d.AssertNumberOfCalls(t, "dial", 1)
-
-	// no error
-	d = &mockDialer{}
-	w := &MockWriter{}
-	d.On("dial").Return(w, nil)
-	h, err = newHook(d)
-	assert.NotNil(t, h)
-	assert.NoError(t, err)
-	assert.Equal(t, w, h.writer)
-	d.AssertCalled(t, "dial")
-	d.AssertNumberOfCalls(t, "dial", 1)
-}
-
-func TestLevels(t *testing.T) {
-	m := &MockWriter{}
-	d := &mockDialer{}
-	d.On("dial").Return(m, nil)
-	h, err := newHook(d)
-
-	assert.NotNil(t, h)
-	assert.NoError(t, err)
-
-	m.On("Crit", mock.Anything).Return(nil)
-	m.On("Err", mock.Anything).Return(nil)
-	m.On("Warning", mock.Anything).Return(nil)
-	m.On("Debug", mock.Anything).Return(nil)
-	m.On("Info", mock.Anything).Return(nil)
-
-	var tests = []struct {
-		entry *logrus.Entry
-		f     string
-	}{
-		{
-			entry: &logrus.Entry{Message: "panic", Level: logrus.PanicLevel},
-			f:     "Crit",
-		},
-		{
-			entry: &logrus.Entry{Message: "fatal", Level: logrus.FatalLevel},
-			f:     "Crit",
-		},
-		{
-			entry: &logrus.Entry{Message: "error", Level: logrus.ErrorLevel},
-			f:     "Err",
-		},
-		{
-			entry: &logrus.Entry{Message: "warn", Level: logrus.WarnLevel},
-			f:     "Warning",
-		},
-		{
-			entry: &logrus.Entry{Message: "info", Level: logrus.InfoLevel},
-			f:     "Info",
-		},
-		{
-			entry: &logrus.Entry{Message: "debug", Level: logrus.DebugLevel},
-			f:     "Debug",
-		},
-	}
-
-	calls := make(map[string]int)
-	for _, te := range tests {
-		calls[te.f] = 0
-	}
-
-	for _, te := range tests {
-		assert.NoError(t, h.writeEntry(te.entry))
-		calls[te.f]++
-		m.AssertCalled(t, te.f, te.entry.Message)
-		m.AssertNumberOfCalls(t, te.f, calls[te.f])
-	}
-}
-
-func TestConnect(t *testing.T) {
-	// attempt a connection to a server that
-	// does not exist
-	h, err := NewHook(
-		"tcp",
-		"foo:514",
-		Info,
-		"test",
-	)
-
-	assert.NoError(t, err)
-	assert.NotNil(t, h)
-
-	h.Fire(&logrus.Entry{
-		Message: "foo",
-		Level:   logrus.InfoLevel,
-	})
-
-	<-time.After(5 * time.Second)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_addr_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_addr_test.go
deleted file mode 100644
index 5f119f0ccb..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_addr_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import (
-	"net"
-
-	mock "github.com/stretchr/testify/mock"
-)
-
-// MockAddr is an autogenerated mock type for the Addr type
-type MockAddr struct {
-	mock.Mock
-}
-
-// Network provides a mock function with given fields:
-func (_m *MockAddr) Network() string {
-	ret := _m.Called()
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func() string); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-// String provides a mock function with given fields:
-func (_m *MockAddr) String() string {
-	ret := _m.Called()
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func() string); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-var _ net.Addr = (*MockAddr)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_dialer_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_dialer_test.go
deleted file mode 100644
index 11fef84fa6..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_dialer_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import mock "github.com/stretchr/testify/mock"
-
-// mockDialer is an autogenerated mock type for the dialer type
-type mockDialer struct {
-	mock.Mock
-}
-
-// dial provides a mock function with given fields:
-func (_m *mockDialer) dial() (Writer, error) {
-	ret := _m.Called()
-
-	var r0 Writer
-	if rf, ok := ret.Get(0).(func() Writer); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(Writer)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-var _ dialer = (*mockDialer)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_formatter_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_formatter_test.go
deleted file mode 100644
index 051fea8a05..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_formatter_test.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import mock "github.com/stretchr/testify/mock"
-import time "time"
-
-// mockFormatter is an autogenerated mock type for the formatter type
-type mockFormatter struct {
-	mock.Mock
-}
-
-// Format provides a mock function with given fields: p, ts, hostname, tag, msg
-func (_m *mockFormatter) Format(p Priority, ts time.Time, hostname string, tag string, msg string) string {
-	ret := _m.Called(p, ts, hostname, tag, msg)
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func(Priority, time.Time, string, string, string) string); ok {
-		r0 = rf(p, ts, hostname, tag, msg)
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-var _ formatter = (*mockFormatter)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netconn_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netconn_test.go
deleted file mode 100644
index 4da860ea57..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netconn_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import mock "github.com/stretchr/testify/mock"
-import net "net"
-import time "time"
-
-// MockConn is an autogenerated mock type for the Conn type
-type MockNetConn struct {
-	mock.Mock
-}
-
-// Close provides a mock function with given fields:
-func (_m *MockNetConn) Close() error {
-	ret := _m.Called()
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// LocalAddr provides a mock function with given fields:
-func (_m *MockNetConn) LocalAddr() net.Addr {
-	ret := _m.Called()
-
-	var r0 net.Addr
-	if rf, ok := ret.Get(0).(func() net.Addr); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(net.Addr)
-		}
-	}
-
-	return r0
-}
-
-// Read provides a mock function with given fields: b
-func (_m *MockNetConn) Read(b []byte) (int, error) {
-	ret := _m.Called(b)
-
-	var r0 int
-	if rf, ok := ret.Get(0).(func([]byte) int); ok {
-		r0 = rf(b)
-	} else {
-		r0 = ret.Get(0).(int)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func([]byte) error); ok {
-		r1 = rf(b)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-// RemoteAddr provides a mock function with given fields:
-func (_m *MockNetConn) RemoteAddr() net.Addr {
-	ret := _m.Called()
-
-	var r0 net.Addr
-	if rf, ok := ret.Get(0).(func() net.Addr); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(net.Addr)
-		}
-	}
-
-	return r0
-}
-
-// SetDeadline provides a mock function with given fields: t
-func (_m *MockNetConn) SetDeadline(t time.Time) error {
-	ret := _m.Called(t)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
-		r0 = rf(t)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// SetReadDeadline provides a mock function with given fields: t
-func (_m *MockNetConn) SetReadDeadline(t time.Time) error {
-	ret := _m.Called(t)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
-		r0 = rf(t)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// SetWriteDeadline provides a mock function with given fields: t
-func (_m *MockNetConn) SetWriteDeadline(t time.Time) error {
-	ret := _m.Called(t)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(time.Time) error); ok {
-		r0 = rf(t)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Write provides a mock function with given fields: b
-func (_m *MockNetConn) Write(b []byte) (int, error) {
-	ret := _m.Called(b)
-
-	var r0 int
-	if rf, ok := ret.Get(0).(func([]byte) int); ok {
-		r0 = rf(b)
-	} else {
-		r0 = ret.Get(0).(int)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func([]byte) error); ok {
-		r1 = rf(b)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-var _ net.Conn = (*MockNetConn)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netdialer_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netdialer_test.go
deleted file mode 100644
index 4708069c66..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_netdialer_test.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import mock "github.com/stretchr/testify/mock"
-import net "net"
-
-// mockNetDialer is an autogenerated mock type for the netDialer type
-type mockNetDialer struct {
-	mock.Mock
-}
-
-// dial provides a mock function with given fields:
-func (_m *mockNetDialer) dial() (net.Conn, error) {
-	ret := _m.Called()
-
-	var r0 net.Conn
-	if rf, ok := ret.Get(0).(func() net.Conn); ok {
-		r0 = rf()
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(net.Conn)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func() error); ok {
-		r1 = rf()
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-var _ netDialer = (*mockNetDialer)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_writer_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_writer_test.go
deleted file mode 100644
index 54ba970707..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/mock_writer_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package syslog
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockWriter is an autogenerated mock type for the Writer type
-type MockWriter struct {
-	mock.Mock
-}
-
-// Close provides a mock function with given fields:
-func (_m *MockWriter) Close() error {
-	ret := _m.Called()
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Crit provides a mock function with given fields: _a0
-func (_m *MockWriter) Crit(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Debug provides a mock function with given fields: _a0
-func (_m *MockWriter) Debug(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Emerg provides a mock function with given fields: _a0
-func (_m *MockWriter) Emerg(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Err provides a mock function with given fields: _a0
-func (_m *MockWriter) Err(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Info provides a mock function with given fields: _a0
-func (_m *MockWriter) Info(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// Warning provides a mock function with given fields: _a0
-func (_m *MockWriter) Warning(_a0 string) error {
-	ret := _m.Called(_a0)
-
-	var r0 error
-	if rf, ok := ret.Get(0).(func(string) error); ok {
-		r0 = rf(_a0)
-	} else {
-		r0 = ret.Error(0)
-	}
-
-	return r0
-}
-
-// WithPriority provides a mock function with given fields: priority
-func (_m *MockWriter) WithPriority(priority Priority) Writer {
-	ret := _m.Called(priority)
-
-	var r0 Writer
-	if rf, ok := ret.Get(0).(func(Priority) Writer); ok {
-		r0 = rf(priority)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(Writer)
-		}
-	}
-
-	return r0
-}
-
-// WithTag provides a mock function with given fields: tag
-func (_m *MockWriter) WithTag(tag string) Writer {
-	ret := _m.Called(tag)
-
-	var r0 Writer
-	if rf, ok := ret.Get(0).(func(string) Writer); ok {
-		r0 = rf(tag)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(Writer)
-		}
-	}
-
-	return r0
-}
-
-// Write provides a mock function with given fields: p
-func (_m *MockWriter) Write(p []byte) (int, error) {
-	ret := _m.Called(p)
-
-	var r0 int
-	if rf, ok := ret.Get(0).(func([]byte) int); ok {
-		r0 = rf(p)
-	} else {
-		r0 = ret.Get(0).(int)
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func([]byte) error); ok {
-		r1 = rf(p)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-var _ Writer = (*MockWriter)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_test.go
deleted file mode 100644
index 1152f983e3..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package syslog
-
-import (
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-var (
-	network  = "tcp"
-	raddr    = "localhost:514"
-	tag      = "test"
-	priority = Info | Daemon
-)
-
-func TestMakeTag(t *testing.T) {
-	p := filepath.Base(os.Args[0])
-	var tests = []struct {
-		prefix string
-		proc   string
-		out    string
-	}{
-		{
-			prefix: "",
-			proc:   "",
-			out:    p,
-		},
-		{
-			prefix: "",
-			proc:   "foo",
-			out:    "foo",
-		},
-		{
-			prefix: "foo",
-			proc:   "",
-			out:    "foo" + sep + p,
-		},
-		{
-			prefix: "bar",
-			proc:   "foo",
-			out:    "bar" + sep + "foo",
-		},
-	}
-
-	for _, te := range tests {
-		out := MakeTag(te.prefix, te.proc)
-		assert.Equal(t, te.out, out)
-	}
-}
-
-func TestDefaultDialerBadPriority(t *testing.T) {
-	d := &defaultDialer{
-		priority: -1,
-	}
-
-	w, err := d.dial()
-	assert.Nil(t, w)
-	assert.Error(t, err)
-
-	d.priority = (Local7 | Debug) + 1
-	w, err = d.dial()
-	assert.Nil(t, w)
-	assert.Error(t, err)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_unix_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_unix_test.go
deleted file mode 100644
index e1b353ee05..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_unix_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !windows,!nacl,!plan9
-
-package syslog
-
-import "testing"
-import "github.com/stretchr/testify/assert"
-
-func TestNewNetDialer(t *testing.T) {
-	d := newNetDialer("", "")
-
-	assert.IsType(t, &unixSyslogDialer{}, d)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_windows_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_windows_test.go
deleted file mode 100644
index 4e185792ae..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/syslog_windows_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build windows
-
-package syslog
-
-import "testing"
-import "github.com/stretchr/testify/assert"
-
-func TestNewNetDialer(t *testing.T) {
-	d := newNetDialer("tcp", "foo")
-	assert.IsType(t, &defaultDialer{}, d)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/writer_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/syslog/writer_test.go
deleted file mode 100644
index 5a2479914e..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/syslog/writer_test.go
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package syslog
-
-import (
-	"fmt"
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-func TestWriterReconnect(t *testing.T) {
-	dn := &mockNetDialer{}
-	dn.On("dial").Return(nil, assert.AnError)
-	w := newWriter(priority, tag, "", dn, nil)
-
-	go w.run()
-	<-w.running
-
-	calls := []func(string) error{
-		w.Emerg,
-		w.Crit,
-		w.Err,
-		w.Warning,
-		w.Info,
-		w.Debug,
-	}
-	for _, f := range calls {
-		err := f("test")
-		assert.NoError(t, err)
-	}
-
-	w.Close()
-
-	dn.AssertNumberOfCalls(t, "dial", 1+len(calls))
-}
-
-func TestWriterWrite(t *testing.T) {
-	msg := "foo"
-
-	f := &mockFormatter{}
-	f.On("Format", priority, mock.Anything, "host", tag, msg).Return("test")
-
-	a := &MockAddr{}
-	a.On("String").Return("host:123")
-
-	c := &MockNetConn{}
-	c.On("LocalAddr").Return(a)
-	c.On("Write", []byte("test\n")).Return(len(msg), nil)
-	c.On("Close").Return(nil)
-
-	dn := &mockNetDialer{}
-	dn.On("dial").Return(c, nil)
-
-	w := newWriter(priority, tag, "", dn, f)
-	n, err := w.Write([]byte(msg))
-	assert.NoError(t, err)
-	assert.Equal(t, len(msg), n)
-
-	go w.run()
-	<-w.running
-
-	w.Close()
-
-	c.AssertExpectations(t)
-	dn.AssertNumberOfCalls(t, "dial", 1)
-}
-
-func TestMaxLogBuffer(t *testing.T) {
-	f := &mockFormatter{}
-
-	dn := &mockNetDialer{}
-	c := &MockNetConn{}
-	a := &MockAddr{}
-	a.On("String").Return("foo")
-	c.On("LocalAddr").Return(a)
-	c.On("Close").Return(nil)
-
-	dn.On("dial").Return(c, nil)
-	w := newWriter(priority, tag, "", dn, f)
-
-	for i := 0; i < maxLogBuffer+1; i++ {
-		msg := fmt.Sprintf("%d", i)
-		f.On("Format", priority, mock.Anything, "", tag, msg).Return(msg)
-		c.On("Write", []byte(msg+"\n")).Return(len(msg), nil)
-		w.Write([]byte(msg))
-	}
-
-	go w.run()
-
-	<-w.running
-
-	w.Close()
-
-	for i := 0; i < maxLogBuffer; i++ {
-		if !f.AssertCalled(t, "Format", priority, mock.Anything, "", tag, fmt.Sprintf("%d", i)) ||
-			!c.AssertCalled(t, "Write", []byte(fmt.Sprintf("%d\n", i))) {
-		}
-	}
-
-	f.AssertNumberOfCalls(t, "Format", maxLogBuffer)
-	f.AssertNotCalled(t, "Format", priority, mock.Anything, "", tag, fmt.Sprintf("%d", maxLogBuffer))
-}
-
-func TestWriterReconnectWrite(t *testing.T) {
-	dn := &mockNetDialer{}
-	c := &MockNetConn{}
-	a := &MockAddr{}
-	a.On("String").Return("addr:123")
-	c.On("LocalAddr").Return(a)
-	c.On("Close").Return(nil)
-
-	dn.On("dial").Return(nil, assert.AnError)
-	f := &mockFormatter{}
-	w := newWriter(priority, tag, "", dn, f)
-
-	go w.run()
-	<-w.running
-
-	dn.AssertNumberOfCalls(t, "dial", 1)
-
-	dn = &mockNetDialer{}
-	dn.On("dial").Return(c, nil)
-	w.dialer = dn
-
-	f.On("Format", priority, mock.Anything, "addr", tag, "test").Return("test")
-	c.On("Write", []byte("test\n")).Return(len("test"), nil)
-
-	w.Write([]byte("test"))
-	w.Close()
-
-	dn.AssertNumberOfCalls(t, "dial", 1)
-	c.AssertNumberOfCalls(t, "Write", 1) // 1 call to writer.write
-	f.AssertNumberOfCalls(t, "Format", 1)
-}
-
-func TestWriterReconnectWriteError(t *testing.T) {
-	dn := &mockNetDialer{}
-	c := &MockNetConn{}
-	a := &MockAddr{}
-	a.On("String").Return("addr:123")
-	c.On("LocalAddr").Return(a)
-	c.On("Close").Return(nil)
-
-	dn.On("dial").Return(c, nil)
-	f := &mockFormatter{}
-	w := newWriter(priority, tag, "", dn, f)
-
-	go w.run()
-	<-w.running
-
-	dn.AssertNumberOfCalls(t, "dial", 1)
-
-	f.On("Format", priority, mock.Anything, "addr", tag, "test").Return("test")
-	c.On("Write", []byte("test\n")).Return(0, assert.AnError)
-
-	w.Write([]byte("test"))
-
-	w.Close()
-
-	f.AssertExpectations(t)
-	c.AssertExpectations(t)
-}
-
-func TestWriterWithTag(t *testing.T) {
-	f := &mockFormatter{}
-	f.On("Format", priority, mock.Anything, "addr", "child", "child").Return("child")
-	f.On("Format", priority, mock.Anything, "addr", "gchild", "gchild").Return("gchild")
-
-	dn := &mockNetDialer{}
-	c := &MockNetConn{}
-	a := &MockAddr{}
-	a.On("String").Return("addr:123")
-	c.On("LocalAddr").Return(a)
-	c.On("Close").Return(nil)
-	c.On("Write", []byte("child\n")).Return(len("child"), nil)
-	c.On("Write", []byte("gchild\n")).Return(len("gchild"), nil)
-
-	dn.On("dial").Return(c, nil)
-
-	w := newWriter(priority, tag, "", dn, f)
-
-	child := w.WithTag("child")
-	child.Write([]byte("child"))
-
-	gchild := child.WithTag("gchild")
-	gchild.Write([]byte("gchild"))
-
-	go w.run()
-	<-w.running
-
-	child.Close()
-	gchild.Close()
-
-	select {
-	case <-w.done:
-	default:
-		assert.FailNow(t, "parent writer is not closed by child Close call")
-	}
-
-	f.AssertExpectations(t)
-	c.AssertExpectations(t)
-}
-
-func TestWriterWithPriority(t *testing.T) {
-	f := &mockFormatter{}
-	f.On("Format", Err|Daemon, mock.Anything, "addr", tag, "err").Return("err")
-	f.On("Format", Debug|Daemon, mock.Anything, "addr", tag, "debug").Return("debug")
-
-	dn := &mockNetDialer{}
-	c := &MockNetConn{}
-	a := &MockAddr{}
-	a.On("String").Return("addr:123")
-	c.On("LocalAddr").Return(a)
-	c.On("Close").Return(nil)
-	c.On("Write", []byte("err\n")).Return(len("err"), nil)
-	c.On("Write", []byte("debug\n")).Return(len("debug"), nil)
-
-	dn.On("dial").Return(c, nil)
-
-	w := newWriter(priority, tag, "", dn, f)
-
-	errw := w.WithPriority(Err | Daemon)
-	errw.Write([]byte("err"))
-
-	debugw := errw.WithPriority(Debug | Daemon)
-	debugw.Write([]byte("debug"))
-
-	go w.run()
-	<-w.running
-
-	errw.Close()
-
-	select {
-	case <-w.done:
-	default:
-		assert.FailNow(t, "parent writer is not closed by child Close call")
-	}
-
-	f.AssertExpectations(t)
-	c.AssertExpectations(t)
-}
-
-func TestWriterInitialConnectError(t *testing.T) {
-
-	var tests = []error{
-		&net.ParseError{},
-		&net.AddrError{},
-	}
-
-	for _, e := range tests {
-		dn := &mockNetDialer{}
-		dn.On("dial").Return(nil, e)
-
-		w := newWriter(priority, tag, "", dn, &mockFormatter{})
-		w.run()
-
-		select {
-		case <-w.running:
-			assert.FailNow(t, "writer should not run when connect() fails initially")
-		default:
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/log/text_formatter_test.go b/installer/vendor/github.com/vmware/vic/pkg/log/text_formatter_test.go
deleted file mode 100644
index a11715598b..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/log/text_formatter_test.go
+++ /dev/null
@@ -1,136 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package log
-
-import (
-	"bufio"
-	"fmt"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-func BenchmarkFormatNonEmpty(b *testing.B) {
-	f := NewTextFormatter()
-	e := &logrus.Entry{
-		Time:    time.Now(),
-		Level:   logrus.InfoLevel,
-		Message: "the quick brown fox jumps over the lazy dog",
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		f.Format(e)
-	}
-}
-
-func BenchmarkFormatEmpty(b *testing.B) {
-	f := NewTextFormatter()
-	e := &logrus.Entry{
-		Time:  time.Now(),
-		Level: logrus.InfoLevel,
-	}
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		f.Format(e)
-	}
-}
-
-func TestFormatEmpty(t *testing.T) {
-	ti := time.Now()
-	e := &logrus.Entry{Time: ti, Level: logrus.InfoLevel}
-	f := NewTextFormatter()
-
-	b, err := f.Format(e)
-	assert.NoError(t, err)
-	assert.Equal(t, fmt.Sprintf("%s %s \n", ti.Format(f.TimestampFormat), levelToString(e.Level)), string(b))
-}
-
-func TestFormatNonEmpty(t *testing.T) {
-	ti := time.Now()
-	m := "foo bar baz"
-	e := &logrus.Entry{Time: ti, Level: logrus.InfoLevel, Message: m}
-	f := NewTextFormatter()
-
-	b, err := f.Format(e)
-	assert.NoError(t, err)
-	assert.Equal(t, fmt.Sprintf("%s %s %s\n", ti.Format(f.TimestampFormat), levelToString(e.Level), m), string(b))
-
-	// test with multiple lines
-	pre := fmt.Sprintf("%s %s ", ti.Format(f.TimestampFormat), levelToString(e.Level))
-	var tests = []struct {
-		in  string
-		out []string
-	}{
-		{
-			"foo",
-			[]string{
-				pre + "foo",
-			},
-		},
-		{
-			"\n",
-			[]string{
-				pre,
-				"",
-			},
-		},
-		{
-			"foo\n",
-			[]string{
-				pre + "foo",
-				"",
-			},
-		},
-		{
-			"\nfoo\n",
-			[]string{
-				pre + "",
-				"foo",
-				"",
-			},
-		},
-		{
-			"foo\n",
-			[]string{
-				pre + "foo",
-				"",
-			},
-		},
-		{
-			"foo \nbar\n baz ",
-			[]string{
-				pre + "foo ",
-				"bar",
-				" baz ",
-			},
-		},
-	}
-
-	for idx, te := range tests {
-		e.Message = te.in
-		b, err = f.Format(e)
-		assert.NoError(t, err)
-		s := bufio.NewScanner(strings.NewReader(string(b)))
-		i := 0
-		for s.Scan() {
-			assert.True(t, i < len(te.out), "case %d", idx)
-			assert.Equal(t, te.out[i], s.Text(), "case %d", idx)
-			i++
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr.go b/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr.go
deleted file mode 100644
index e1c1617126..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package logmgr
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"github.com/vmware/vic/lib/tether"
-	"github.com/vmware/vic/pkg/filelock"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// RotateInterval defines a type for a log rotate frequency.
-type RotateInterval uint32
-
-// LogRotateBinary points to a logrotate path in the system. For testing purposes it should be overwritten to be empty.
-var LogRotateBinary = "/usr/sbin/logrotate"
-
-const (
-	// Daily to trim logs daily.
-	Daily RotateInterval = iota
-	// Hourly to trim logs hourly.
-	Hourly
-	// Weekly to trim logs weekly.
-	Weekly
-	// Monthly to trim logs monthly.
-	Monthly
-)
-
-type logRotateConfig struct {
-	rotateInterval  RotateInterval
-	logFilePath     string
-	logFileName     string
-	maxLogSizeBytes int64
-	maxLogFiles     int64
-	compress        bool
-}
-
-// ConfigFileContent formats log configuration according to logrotate requirements.
-func (lrc *logRotateConfig) ConfigFileContent() string {
-	b := make([]string, 0, 32)
-	if lrc.compress {
-		b = append(b, "compress")
-	}
-
-	switch lrc.rotateInterval {
-	case Hourly:
-		b = append(b, string("hourly"))
-	case Daily:
-		b = append(b, string("daily"))
-	case Weekly:
-		b = append(b, string("weekly"))
-	case Monthly:
-		fallthrough
-	default:
-		b = append(b, string("monthly"))
-	}
-
-	b = append(b, fmt.Sprintf("rotate %d", lrc.maxLogFiles))
-	if lrc.maxLogSizeBytes > 0 {
-		b = append(b, fmt.Sprintf("size %d", lrc.maxLogSizeBytes))
-	}
-
-	if lrc.maxLogSizeBytes > 2 {
-		b = append(b, fmt.Sprintf("minsize %d", lrc.maxLogSizeBytes-1))
-	}
-
-	// VIC doesn't support HUP yet, thus we are using logrotate copytruncate option that
-	// will copy and truncate log file.
-	b = append(b, "copytruncate")
-	b = append(b, "dateext")
-	b = append(b, "dateformat -%Y%m%d-%s")
-
-	for i, v := range b {
-		b[i] = "    " + v
-	}
-
-	return fmt.Sprintf("%s {\n%s\n}\n", lrc.logFilePath, strings.Join(b, "\n"))
-}
-
-// LogManager runs logrotate for specified log files.
-// TODO: Upload compressed logs into vSphere storage.
-// TODO: Upload all logs into vSphere storage during graceful shutdown.
-type LogManager struct {
-	// Frequency of running log rotate.
-	runInterval time.Duration
-
-	// list of log files and their log rotate parameters to rotate.
-	logFiles []*logRotateConfig
-
-	// channel gets closed on stop.
-	closed chan struct{}
-	op     trace.Operation
-
-	// used to wait until logrotate goroutine stops.
-	wg sync.WaitGroup
-	// just to make sure start is not called twice accidentally.
-	once sync.Once
-
-	logConfig string
-
-	// Mostly for debug purposes to insure log rotate loop is running.
-	// It also will log on debug level periodically that it runs.
-	loopsCount uint64
-}
-
-// NewLogManager creates a new log manager instance.
-func NewLogManager(runInterval time.Duration) (*LogManager, error) {
-	lm := &LogManager{
-		runInterval: runInterval,
-		op:          trace.NewOperation(context.Background(), "logrotate"),
-		closed:      make(chan struct{}),
-	}
-
-	// LogRotateBinary is set to empty during unit testing.
-	if s, err := os.Stat(LogRotateBinary); (err != nil || s.IsDir()) && LogRotateBinary != "" {
-		return nil, fmt.Errorf("logrotate is not available at %s, without it logs will not be rotated", LogRotateBinary)
-	}
-	return lm, nil
-}
-
-// AddLogRotate adds a log to rotate.
-func (lm *LogManager) AddLogRotate(logFilePath string, ri RotateInterval, maxSize, maxLogFiles int64, compress bool) {
-	lm.logFiles = append(lm.logFiles, &logRotateConfig{
-		rotateInterval:  ri,
-		logFilePath:     logFilePath,
-		logFileName:     filepath.Base(logFilePath),
-		maxLogSizeBytes: maxSize,
-		maxLogFiles:     maxLogFiles,
-		compress:        compress,
-	})
-}
-
-// Reload - just to satisfy Tether interface.
-func (lm *LogManager) Reload(*tether.ExecutorConfig) error { return nil }
-
-// Start log rotate loop.
-func (lm *LogManager) Start() error {
-	if len(lm.logFiles) == 0 {
-		lm.op.Errorf("Attempt to start logrotate with no log files configured.")
-		return nil
-	}
-	lm.once.Do(func() {
-		lm.wg.Add(1)
-		lm.logConfig = lm.buildConfig()
-		lm.op.Debugf("logrotate config: %s", lm.logConfig)
-
-		go func() {
-			for {
-				lm.loopsCount++
-				if lm.loopsCount%10 == 0 {
-					lm.op.Debugf("logrotate has been run %d times", lm.loopsCount)
-				}
-				select {
-				case <-time.After(lm.runInterval):
-				case <-lm.closed:
-					lm.rotateLogs()
-					lm.wg.Done()
-					return
-				}
-				lm.rotateLogs()
-			}
-		}()
-	})
-	return nil
-}
-
-// Stop loop.
-func (lm *LogManager) Stop() error {
-	select {
-	case <-lm.closed:
-	default:
-		close(lm.closed)
-	}
-	lm.wg.Wait()
-	return nil
-}
-
-func (lm *LogManager) saveConfig(logConf string) string {
-	tf, err := ioutil.TempFile("", "vic-logrotate-conf-")
-	if err != nil {
-		lm.op.Errorf("Failed to create temp file for logrotate: %v", err)
-		return ""
-	}
-
-	tempFilePath := tf.Name()
-	if _, err = tf.Write([]byte(logConf)); err != nil {
-		lm.op.Errorf("Failed to store logrotate config %s: %v", tempFilePath, err)
-		if err = tf.Close(); err != nil {
-			lm.op.Errorf("Failed to close temp file %s: %v", tempFilePath, err)
-		}
-		if err = os.Remove(tempFilePath); err != nil {
-			lm.op.Errorf("Failed to remove temp file %s: %v", tempFilePath, err)
-		}
-		return ""
-	}
-
-	if err = tf.Close(); err != nil {
-		lm.op.Errorf("Failed to close logrotate config file %s: %v", tempFilePath, err)
-		return ""
-	}
-	return tempFilePath
-}
-
-func (lm *LogManager) buildConfig() string {
-	c := make([]string, 0, len(lm.logFiles))
-	for _, v := range lm.logFiles {
-		c = append(c, v.ConfigFileContent())
-	}
-	return strings.Join(c, "\n")
-}
-
-func (lm *LogManager) rotateLogs() {
-	// Check if logrotate config exists, create one
-	configFile := lm.saveConfig(lm.logConfig)
-	logrotateLock := filelock.NewFileLock(filelock.LogRotateLockName)
-
-	// This lock is necessary to avoid race condition when user requests log bundle.
-	if err := logrotateLock.Acquire(); err != nil {
-		lm.op.Errorf("Failed to acquire logrotate lock: %v", err)
-	} else {
-		defer func() { logrotateLock.Release() }()
-	}
-
-	if configFile == "" {
-		lm.op.Errorf("Can not run logrotate dues to missing logrotate config")
-		return
-	}
-	// remove config file as soon as logrotate finishes its work.
-	defer os.Remove(configFile)
-
-	lm.op.Debugf("Running logrotate: %s %s", LogRotateBinary, configFile)
-
-	if LogRotateBinary == "" {
-		lm.op.Debugf("logrotate is not defined. Skipping.")
-		return
-	}
-	// #nosec: Subprocess launching with variable
-	output, err := exec.Command(LogRotateBinary, configFile).CombinedOutput()
-	if err == nil {
-		if len(output) > 0 {
-			lm.op.Debugf("Logrotate output: %s", output)
-		}
-		lm.op.Debugf("logrotate finished successfully")
-	} else {
-		lm.op.Errorf("logrotate exited with non 0 status: %v", err)
-		if len(output) > 0 {
-			lm.op.Errorf("Logrotate output: %s", output)
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr_test.go b/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr_test.go
deleted file mode 100644
index e171dcbc5d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/logmgr/logmgr_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package logmgr
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// TestContentIsGeneratedAndSaved tests:
-// 1. Config file content for log rotate is as expected.
-// 2. Config file is saved on disk and can be read back.
-func TestContentIsGeneratedAndSaved(t *testing.T) {
-	oldLogRotate := LogRotateBinary
-	LogRotateBinary = ""
-	defer func() { LogRotateBinary = oldLogRotate }()
-
-	m, e := NewLogManager(time.Millisecond)
-	if !assert.Nil(t, e) {
-		return
-	}
-	expectedConfig := `/var/log/test.log {
-    compress
-    hourly
-    rotate 3
-    size 10000
-    minsize 9999
-    copytruncate
-    dateext
-    dateformat -%Y%m%d-%s
-}
-
-/var/log/test1.log {
-    daily
-    rotate 2
-    size 20000
-    minsize 19999
-    copytruncate
-    dateext
-    dateformat -%Y%m%d-%s
-}
-`
-	m.AddLogRotate("/var/log/test.log", Hourly, 10000, 3, true)
-	m.AddLogRotate("/var/log/test1.log", Daily, 20000, 2, false)
-	actualConfig := m.buildConfig()
-	assert.Equal(t, expectedConfig, actualConfig)
-
-	fn := m.saveConfig(expectedConfig)
-	if !assert.NotEqual(t, "", fn) {
-		return
-	}
-	// delete temp file when test is done.
-	defer func() {
-		assert.Nil(t, os.Remove(fn))
-	}()
-	data, err := ioutil.ReadFile(fn)
-	if !assert.Nil(t, err) {
-		return
-	}
-	assert.Equal(t, expectedConfig, string(data))
-}
-
-// TestStartAndStop starts and stop the service checking that start/stop conditions are met.
-func TestStartAndStop(t *testing.T) {
-	oldLogRotate := LogRotateBinary
-	LogRotateBinary = ""
-	defer func() { LogRotateBinary = oldLogRotate }()
-
-	m, e := NewLogManager(time.Millisecond)
-	if !assert.Nil(t, e) {
-		return
-	}
-	m.AddLogRotate("/var/log/test.log", Hourly, 10000, 3, true)
-	m.AddLogRotate("/var/log/test1.log", Daily, 20000, 2, false)
-
-	go func() {
-		assert.Nil(t, m.Start())
-		time.Sleep(time.Millisecond * 100)
-		assert.Nil(t, m.Stop())
-	}()
-
-	select {
-	case <-time.After(time.Second * 10):
-		assert.Fail(t, "timeout to start/stop log manager")
-	case _, ok := <-m.closed:
-		assert.False(t, ok)
-	}
-	assert.True(t, m.loopsCount > 0)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/registry/entry_test.go b/installer/vendor/github.com/vmware/vic/pkg/registry/entry_test.go
deleted file mode 100644
index 97118c382c..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/registry/entry_test.go
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package registry
-
-import (
-	"net"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestEntryContains(t *testing.T) {
-	var tests = []struct {
-		first, second Entry
-		res           bool
-	}{
-		{
-			first:  ParseEntry("192.168.0.1"),
-			second: ParseEntry("192.168.0.1"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("192.168.0.1"),
-			second: ParseEntry("192.168.0.1/16"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("192.168.0.1"),
-			second: ParseEntry("192.168.0.2"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("192.168.0.1/24"),
-			second: ParseEntry("192.168.0.11"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("172.16.0.0/12"),
-			second: ParseEntry("172.17.0.0/24"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("172.16.0.0/12"),
-			second: ParseEntry("172.15.0.0/24"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("172.16.0.0/12"),
-			second: ParseEntry("*.google.com"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("192.168.0.1/24"),
-			second: ParseEntry("192.168.1.0"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("192.168.0.1/24"),
-			second: ParseEntry("192.168.0.1/24"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("*.google.com"),
-			second: ParseEntry("*.com"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("mail.google.com"),
-			second: ParseEntry("*.google.com"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("*.google.com"),
-			second: ParseEntry("mail.google.com"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("*.com"),
-			second: ParseEntry("*.google.com"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("192.168.1.1:123"),
-			second: ParseEntry("192.168.1.1"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("foo:123"),
-			second: ParseEntry("foo"),
-			res:    false,
-		},
-		{
-			first:  ParseEntry("foo"),
-			second: ParseEntry("foo:123"),
-			res:    true,
-		},
-		{
-			first:  ParseEntry("192.168.1.1"),
-			second: ParseEntry("192.168.1.1:123"),
-			res:    true,
-		},
-	}
-
-	for _, te := range tests {
-		assert.Equal(t, te.res, te.first.Contains(te.second), "test: %s contains %s", te.first, te.second)
-	}
-}
-
-func TestEntryMatch(t *testing.T) {
-	var tests = []struct {
-		e   Entry
-		s   string
-		res bool
-	}{
-		{
-			e:   ParseEntry("192.168.0.1"),
-			s:   "192.168.0.1",
-			res: true,
-		},
-		{
-			e:   ParseEntry("192.168.0.1"),
-			s:   "192.168.0",
-			res: false,
-		},
-		{
-			e:   ParseEntry("192.168.0.1/24"),
-			s:   "192.168.0.1",
-			res: true,
-		},
-		{
-			e:   ParseEntry("192.168.0.1/24"),
-			s:   "192.168.1.1",
-			res: false,
-		},
-		{
-			e:   ParseEntry("192.168.0.1/24"),
-			s:   "192.168.0.1/24",
-			res: true,
-		},
-		{
-			e:   ParseEntry("*.google.com"),
-			s:   "mail.google.com",
-			res: true,
-		},
-		{
-			e:   ParseEntry("*.google.com"),
-			s:   "mail.yahoo.com",
-			res: false,
-		},
-		{
-			e:   ParseEntry("*.google.com"),
-			s:   "google.com",
-			res: false,
-		},
-		{
-			e:   ParseEntry("foo:123"),
-			s:   "foo",
-			res: false,
-		},
-		{
-			e:   ParseEntry("foo:123"),
-			s:   "http://foo/bar", // this should be interpreted as http://foo:80/bar
-			res: false,
-		},
-		{
-			e:   ParseEntry("foo:123"),
-			s:   "http://foo:123/bar",
-			res: true,
-		},
-		{
-			e:   ParseEntry("foo:123"),
-			s:   "https://foo:123/bar",
-			res: true,
-		},
-		{
-			e:   ParseEntry("foo"),
-			s:   "foo:123",
-			res: true,
-		},
-		{
-			e:   ParseEntry("192.168.1.1"),
-			s:   "192.168.1.1:123",
-			res: true,
-		},
-		{
-			e:   ParseEntry("http://192.168.1.1"),
-			s:   "http://192.168.1.1",
-			res: true,
-		},
-		{
-			e:   ParseEntry("http://192.168.1.1"),
-			s:   "192.168.1.1/foo/bar",
-			res: true,
-		},
-		{
-			e:   ParseEntry("http://192.168.1.1"),
-			s:   "https://192.168.1.1",
-			res: false,
-		},
-		{
-			e:   ParseEntry("https://192.168.1.1"),
-			s:   "http://192.168.1.1",
-			res: false,
-		},
-		// fqdn and corresponding ip should not match
-		{
-			e:   ParseEntry("https://google.com"),
-			s:   "216.58.195.78",
-			res: false,
-		},
-	}
-
-	for _, te := range tests {
-		assert.Equal(t, te.res, te.e.Match(te.s), "test: %s match %s", te.e, te.s)
-	}
-}
-
-func TestEntryEqual(t *testing.T) {
-	var tests = []struct {
-		e, other Entry
-		res      bool
-	}{
-		{
-			e:     ParseEntry("192.168.0.1"),
-			other: ParseEntry("192.168.0.1"),
-			res:   true,
-		},
-		{
-			e:     ParseEntry("192.168.0.1"),
-			other: ParseEntry("192.168.0.2"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("192.168.0.1"),
-			other: ParseEntry("192.168.1.0/24"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("192.168.0.1"),
-			other: ParseEntry("*.google.com"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("192.168.0.1/24"),
-			other: ParseEntry("192.168.0.1/24"),
-			res:   true,
-		},
-		{
-			e:     ParseEntry("192.168.0.1/24"),
-			other: ParseEntry("192.168.0.1/16"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("192.168.0.1/24"),
-			other: ParseEntry("192.168.0.1"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("192.168.0.1/24"),
-			other: ParseEntry("*.google.com"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("*.google.com"),
-			other: ParseEntry("*.google.com"),
-			res:   true,
-		},
-		{
-			e:     ParseEntry("*.google.com"),
-			other: ParseEntry("mail.google.com"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("*.google.com"),
-			other: ParseEntry("*.yahoo.com"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("*.google.com"),
-			other: ParseEntry("192.168.0.1"),
-			res:   false,
-		},
-		{
-			e:     ParseEntry("*.google.com"),
-			other: ParseEntry("192.168.0.1/24"),
-			res:   false,
-		},
-	}
-
-	for _, te := range tests {
-		assert.Equal(t, te.res, te.e.Equal(te.other), "test: %s equal %s", te.e, te.other)
-	}
-}
-
-func TestParseEntry(t *testing.T) {
-	var tests = []struct {
-		s   string
-		res Entry
-	}{
-		{
-			s: "foo bar",
-		},
-		{
-			s:   "192.168.0.1",
-			res: &urlEntry{u: parseURL("192.168.0.1")},
-		},
-		{
-			s:   "192.168.0.1:80",
-			res: &urlEntry{u: parseURL("192.168.0.1:80")},
-		},
-		{
-			s:   "192.168.0",
-			res: &urlEntry{u: parseURL("192.168.0")},
-		},
-		{
-			s:   "192.168.0.1/24",
-			res: &cidrEntry{ipnet: &net.IPNet{IP: net.ParseIP("192.168.0.0"), Mask: net.CIDRMask(24, 32)}},
-		},
-		{
-			s:   "192.168.0/24",
-			res: &urlEntry{u: parseURL("192.168.0/24")},
-		},
-		{
-			s:   "*.google.com",
-			res: &urlEntry{u: parseURL("*.google.com")},
-		},
-		{
-			s:   "google.com",
-			res: &urlEntry{u: parseURL("google.com")},
-		},
-		{
-			s:   "google.com:8080",
-			res: &urlEntry{u: parseURL("google.com:8080")},
-		},
-		{
-			s:   "http://*.google.com",
-			res: &urlEntry{u: parseURL("http://*.google.com")},
-		},
-		{
-			s:   "http://google.com",
-			res: &urlEntry{u: parseURL("http://google.com")},
-		},
-		{
-			s:   "http://google.com:8080",
-			res: &urlEntry{u: parseURL("http://google.com:8080")},
-		},
-	}
-
-	for _, te := range tests {
-		res := ParseEntry(te.s)
-		if te.res == nil {
-			assert.Nil(t, res, "ParseEntry(%s) != %s, got %s", te.s, te.res, res)
-			continue
-		}
-
-		assert.True(t, te.res.Equal(res), "ParseEntry(%s) != %s, got %s", te.s, te.res, res)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Entry_test.go b/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Entry_test.go
deleted file mode 100644
index 82f0413524..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Entry_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package registry
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockEntry is an autogenerated mock type for the Entry type
-type MockEntry struct {
-	mock.Mock
-}
-
-// Contains provides a mock function with given fields: e
-func (_m *MockEntry) Contains(e Entry) bool {
-	ret := _m.Called(e)
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func(Entry) bool); ok {
-		r0 = rf(e)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// Equal provides a mock function with given fields: other
-func (_m *MockEntry) Equal(other Entry) bool {
-	ret := _m.Called(other)
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func(Entry) bool); ok {
-		r0 = rf(other)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// IsCIDR provides a mock function with given fields:
-func (_m *MockEntry) IsCIDR() bool {
-	ret := _m.Called()
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func() bool); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// IsURL provides a mock function with given fields:
-func (_m *MockEntry) IsURL() bool {
-	ret := _m.Called()
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func() bool); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// Match provides a mock function with given fields: e
-func (_m *MockEntry) Match(e string) bool {
-	ret := _m.Called(e)
-
-	var r0 bool
-	if rf, ok := ret.Get(0).(func(string) bool); ok {
-		r0 = rf(e)
-	} else {
-		r0 = ret.Get(0).(bool)
-	}
-
-	return r0
-}
-
-// String provides a mock function with given fields:
-func (_m *MockEntry) String() string {
-	ret := _m.Called()
-
-	var r0 string
-	if rf, ok := ret.Get(0).(func() string); ok {
-		r0 = rf()
-	} else {
-		r0 = ret.Get(0).(string)
-	}
-
-	return r0
-}
-
-var _ Entry = (*MockEntry)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Merger_test.go b/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Merger_test.go
deleted file mode 100644
index d797f1fbeb..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/registry/mock_Merger_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-package registry
-
-import mock "github.com/stretchr/testify/mock"
-
-// MockMerger is an autogenerated mock type for the Merger type
-type MockMerger struct {
-	mock.Mock
-}
-
-// Merge provides a mock function with given fields: _a0, _a1
-func (_m *MockMerger) Merge(_a0 Entry, _a1 Entry) (Entry, error) {
-	ret := _m.Called(_a0, _a1)
-
-	var r0 Entry
-	if rf, ok := ret.Get(0).(func(Entry, Entry) Entry); ok {
-		r0 = rf(_a0, _a1)
-	} else {
-		if ret.Get(0) != nil {
-			r0 = ret.Get(0).(Entry)
-		}
-	}
-
-	var r1 error
-	if rf, ok := ret.Get(1).(func(Entry, Entry) error); ok {
-		r1 = rf(_a0, _a1)
-	} else {
-		r1 = ret.Error(1)
-	}
-
-	return r0, r1
-}
-
-var _ Merger = (*MockMerger)(nil)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/registry/set_test.go b/installer/vendor/github.com/vmware/vic/pkg/registry/set_test.go
deleted file mode 100644
index fc30751a54..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/registry/set_test.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package registry
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-)
-
-func TestSetMerge(t *testing.T) {
-	var tests = []struct {
-		orig, other Set
-		res         Set
-		err         error
-	}{
-		{},
-		{
-			orig:  nil,
-			other: Set{ParseEntry("192.168.0.1")},
-			res:   Set{ParseEntry("192.168.0.1")},
-		},
-		{
-			orig:  Set{ParseEntry("192.168.0.1")},
-			other: nil,
-			res:   Set{ParseEntry("192.168.0.1")},
-		},
-		{
-			orig:  Set{ParseEntry("192.168.0.1")},
-			other: Set{ParseEntry("192.168.0.1")},
-			res:   Set{ParseEntry("192.168.0.1")},
-		},
-		{
-			orig:  Set{ParseEntry("192.168.0.1")},
-			other: Set{ParseEntry("192.168.0.2")},
-			res: Set{
-				ParseEntry("192.168.0.1"),
-				ParseEntry("192.168.0.2"),
-			},
-		},
-		{
-			orig: Set{
-				ParseEntry("192.168.0.1"),
-				ParseEntry("192.168.0.2"),
-			},
-			other: Set{
-				ParseEntry("192.168.0.2"),
-			},
-			res: Set{
-				ParseEntry("192.168.0.1"),
-				ParseEntry("192.168.0.2"),
-			},
-		},
-		{
-			orig: Set{
-				ParseEntry("192.168.0.1"),
-				ParseEntry("192.168.0.2"),
-			},
-			other: Set{
-				ParseEntry("192.168.0.3"),
-			},
-			res: Set{
-				ParseEntry("192.168.0.1"),
-				ParseEntry("192.168.0.2"),
-				ParseEntry("192.168.0.3"),
-			},
-		},
-	}
-
-	for _, te := range tests {
-		res, err := te.orig.Merge(te.other, nil)
-		assert.Equal(t, te.err, err)
-		assert.Len(t, res, len(te.res))
-		for _, r := range res {
-			found := false
-			for _, r2 := range te.res {
-				if r2.String() == r.String() {
-					found = true
-					break
-				}
-			}
-
-			assert.True(t, found)
-		}
-	}
-}
-
-func TestSetMergeMergerError(t *testing.T) {
-	m := &MockMerger{}
-	m.On("Merge", mock.Anything, mock.Anything).Return(nil, assert.AnError)
-
-	s := Set{ParseEntry("192.168.0.1")}
-	other := Set{ParseEntry("192.168.0.1")}
-	res, err := s.Merge(other, m)
-	assert.Nil(t, res)
-	assert.Error(t, err)
-	assert.EqualValues(t, assert.AnError, err)
-}
-
-func TestSetMatch(t *testing.T) {
-	e1 := &MockEntry{}
-	e1.On("Match", mock.Anything).Return(false)
-	e2 := &MockEntry{}
-	e2.On("Match", mock.Anything).Return(true)
-
-	s := Set{e1, e2}
-	assert.True(t, s.Match("foo"))
-
-	s = Set{e2}
-	assert.True(t, s.Match("foo"))
-
-	s = Set{e1}
-	assert.False(t, s.Match("foo"))
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/retry/retry.go b/installer/vendor/github.com/vmware/vic/pkg/retry/retry.go
index cd0c5dc6f3..3f10a17a91 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/retry/retry.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/retry/retry.go
@@ -57,15 +57,8 @@ func NewBackoffConfig() *BackoffConfig {
 // Do retries the given function until defaultMaxInterval time passes, while sleeping some time between unsuccessful attempts
 // if retryOnError returns true, continue retry, otherwise, return error
 func Do(operation func() error, retryOnError func(err error) bool) error {
-	bConf := &BackoffConfig{
-		InitialInterval:     defaultInitialInterval,
-		RandomizationFactor: defaultRandomizationFactor,
-		Multiplier:          defaultMultiplier,
-		MaxInterval:         defaultMaxInterval,
-		MaxElapsedTime:      defaultMaxElapsedTime,
-	}
-
-	return DoWithConfig(operation, retryOnError, bConf)
+	conf := NewBackoffConfig()
+	return DoWithConfig(operation, retryOnError, conf)
 }
 
 // DoWithConfig will attempt an operation while retrying using an exponential back off based on the config supplied by the caller. The retry decider is the supplied function retryOnError
diff --git a/installer/vendor/github.com/vmware/vic/pkg/retry/retry_test.go b/installer/vendor/github.com/vmware/vic/pkg/retry/retry_test.go
deleted file mode 100644
index f1bdc76f50..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/retry/retry_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package retry
-
-import (
-	"fmt"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestRetry(t *testing.T) {
-	i := 0
-	operation := func() error {
-		i++
-		t.Logf("Retry called: %s", time.Now().UTC())
-		return fmt.Errorf("designed error")
-	}
-	retryOnError := func(err error) bool {
-		if i < 4 {
-			return true
-		}
-		return false
-	}
-	err := Do(operation, retryOnError)
-	assert.True(t, i == 4, "should retried 4 times")
-	assert.True(t, err != nil, fmt.Sprintf("retry do not depend on error status"))
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/serial/debug.go b/installer/vendor/github.com/vmware/vic/pkg/serial/debug.go
deleted file mode 100644
index a9b0bf372a..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/serial/debug.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package serial
-
-var (
-	verbose = false
-	tracing = false
-)
-
-// EnableTracing enables trace output for the serial package
-func EnableTracing() {
-	tracing = true
-}
-
-// DisableTracing disables trace output for the serial package
-func DisableTracing() {
-	tracing = false
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/serial/handshake.go b/installer/vendor/github.com/vmware/vic/pkg/serial/handshake.go
deleted file mode 100644
index eac6265356..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/serial/handshake.go
+++ /dev/null
@@ -1,221 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-//
-//	Client:
-//		generate a random uint8 (#)
-//		send 2 bytes Syn|#
-//
-//	Server:
-//		generate a random uint8 (&)
-//		read at least 2 bytes and make sure Syn|# is received
-//		send 3 bytes Ack|#+1|& (or Nak)
-//
-//  Client:
-//	    read at least 3 bytes and make sure Ack|#+1|& is received
-//		send 2 bytes Ack|&+1
-//
-//	Server:
-//		read at least 2 bytes and make sure Ack|&+1 is received
-//		send 1 byte Ack (or Nak)
-//	Client:
-//		read at leat 1 byte and make sure Ack is received
-
-package serial
-
-import (
-	"fmt"
-	"io"
-	"math"
-	"math/rand"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-const (
-	flagSyn byte = 0x16
-	flagAck      = 0x06
-	flagNak      = 0x15
-)
-
-// HandshakeError should only occure if the protocol between HandshakeServer and HandshakeClient was violated.
-type HandshakeError struct {
-	msg string
-}
-
-func (he *HandshakeError) Error() string {
-	return he.msg
-}
-func init() {
-	rand.Seed(time.Now().UTC().UnixNano())
-}
-
-// ReadAtLeastN reads at least l bytes and returns those l bytes or errors
-// We get lots of garbage data when we get the initial connection which handshake supposed to clear them and leave the connection in a known state so that the real ssh handshake can start.
-// Client and server is looping with different frequencies so client could send multiple requests before server even had a chance to read.
-// By getting the last l bytes we are saying that we are not interested with garbage data and also eliminating duplicated flags by only using the last one
-func ReadAtLeastN(conn io.ReadWriter, buffer []byte, l int) ([]byte, error) {
-	n, err := io.ReadAtLeast(conn, buffer, l)
-	if err != nil {
-		return nil, err
-	}
-
-	// however if we read more than l, it means buffer is not empty
-	if n != l {
-		buffer = buffer[n-l:]
-	}
-
-	return buffer, nil
-}
-
-// HandshakeClient establishes connection with the server making sure
-// they both are in sync.
-func HandshakeClient(conn io.ReadWriter) error {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-
-	// generate a random pos between [0, math.MaxUint8)
-	pos := uint8(rand.Intn(math.MaxUint8))
-	buffer := make([]byte, 32*1024)
-
-	// send syn with pos
-	log.Debugf("HandshakeClient: Sending syn with pos %d", pos)
-	if _, err := conn.Write([]byte{flagSyn, pos}); err != nil {
-		log.Errorf("syn: write failed")
-		return err
-	}
-
-	// read ack with pos+1 and token
-	buffer, err := ReadAtLeastN(conn, buffer, 3)
-	if err != nil {
-		return err
-	}
-
-	// extract pos and the token from it
-	flag, posack, token := uint8(buffer[0]), uint8(buffer[1]), uint8(buffer[2])
-	if flag == flagNak {
-		return &HandshakeError{
-			msg: "HandshakeClient: Server declined handshake request",
-		}
-	}
-	if flag != flagAck {
-		return &HandshakeError{
-			msg: fmt.Sprintf("HandshakeClient: Unexpected server response: %#v", flag),
-		}
-	}
-
-	if posack != pos+1 {
-		return &HandshakeError{
-			msg: fmt.Sprintf("HandshakeClient: Unexpected ack position: %d, expected %d", posack, pos+1),
-		}
-	}
-
-	log.Debugf("HandshakeClient: Sending ack with %d", token+1)
-
-	if _, err := conn.Write([]byte{flagAck, token + 1}); err != nil {
-		return err
-	}
-
-	// last ack packet is 1 byte and could be followed by SSH handshake so read only 1 byteand leave the rest in the net.Conn buffer
-	buffer = buffer[:1]
-	if _, err := conn.Read(buffer); err != nil {
-		return err
-	}
-
-	if buffer[0] != flagAck {
-		return &HandshakeError{
-			msg: fmt.Sprintf("HandshakeClient: Unexpected server response: %#v", flag),
-		}
-	}
-
-	log.Debug("HandshakeClient: Connection established.")
-	return nil
-}
-
-// HandshakeServer establishes connection with the client making sure
-// they both are in sync.
-func HandshakeServer(conn io.ReadWriter) error {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-
-	// generate a random pos between [0, math.MaxUint8)
-	pos := uint8(rand.Intn(math.MaxUint8))
-	buffer := make([]byte, 32*1024)
-
-	log.Debug("HandshakeServer: Waiting for incoming syn request...")
-
-	// Sync packet is 2 bytes, however if we read more than 2 it means buffer is not empty and data is not trusted for this sync.
-	buffer, err := ReadAtLeastN(conn, buffer, 2)
-	if err != nil {
-		return err
-	}
-
-	// Read 2 bytes, extract flag and the token from it
-	flag, token := uint8(buffer[0]), uint8(buffer[1])
-	if flag != flagSyn {
-		if _, err := conn.Write([]byte{flagNak}); err != nil {
-			return err
-		}
-		return &HandshakeError{
-			msg: fmt.Sprintf("Unexpected syn packet: %x", flag),
-		}
-	}
-	log.Debugf("HandshakeServer: Received syn with pos %d. Writing syn-ack with %d and %d", token, token+1, pos)
-
-	// token contains position token that needs to be incremented by one to send it back.
-	if _, err := conn.Write([]byte{flagAck, token + 1, pos}); err != nil {
-		return err
-	}
-
-	// ACK packet is 2 bytes, however if we read more than 2 it means buffer is not empty and data is not trusted for this sync.
-	buffer, err = ReadAtLeastN(conn, buffer, 2)
-	if err != nil {
-		return err
-	}
-
-	// Read 2 bytes, extract flag and the token from it
-	flag, token = uint8(buffer[0]), uint8(buffer[1])
-	if flag != flagAck {
-		if _, err := conn.Write([]byte{flagNak}); err != nil {
-			return err
-		}
-		return &HandshakeError{
-			msg: fmt.Sprintf("Unexpected syn packet: %x", flag),
-		}
-	}
-
-	// token should contain incremented pos
-	if token != pos+1 {
-		if _, err := conn.Write([]byte{flagNak}); err != nil {
-			return err
-		}
-		return &HandshakeError{
-			msg: fmt.Sprintf("HandshakeServer: Unexpected position %x, expected: %x", token, pos+1),
-		}
-	}
-	log.Debugf("HandshakeServer: Received ACK with %d.", token)
-
-	// send the last ACK
-	if _, err := conn.Write([]byte{flagAck}); err != nil {
-		return err
-	}
-
-	log.Debug("HandshakeServer: Connection established.")
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/serial/handshake_test.go b/installer/vendor/github.com/vmware/vic/pkg/serial/handshake_test.go
deleted file mode 100644
index 77d8a93251..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/serial/handshake_test.go
+++ /dev/null
@@ -1,429 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package serial
-
-import (
-	"errors"
-	"sync"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-const (
-	timeout = 10 * time.Second
-)
-
-type readErr struct {
-	err error
-	n   int
-}
-
-type BlockingSendReceiver struct {
-	c        chan byte
-	deadline chan struct{}
-}
-
-func NewBlockingSendReceiver() *BlockingSendReceiver {
-	return &BlockingSendReceiver{
-		c:        make(chan byte, 10240),
-		deadline: make(chan struct{}, 1),
-	}
-}
-
-func (f *BlockingSendReceiver) Send(b []byte) (int, error) {
-	for i := 0; i < len(b); i++ {
-		f.c <- b[i]
-	}
-	return 0, nil
-}
-
-func (f *BlockingSendReceiver) Timeout(d time.Duration) *BlockingSendReceiver {
-	go func() {
-		time.Sleep(d)
-		f.deadline <- struct{}{}
-	}()
-	return f
-}
-
-func (f *BlockingSendReceiver) Receive(b []byte) (int, error) {
-	select {
-	case <-f.deadline:
-		return 0, errors.New("Timeout error")
-	default:
-	}
-	count := 0
-	for count < len(b) {
-		select {
-		case v := <-f.c:
-			b[count] = v
-			count++
-		case _, ok := <-f.deadline:
-			if ok {
-				close(f.deadline)
-			}
-			return 0, errors.New("Timeout error")
-		default:
-			if count == 0 {
-				time.Sleep(time.Millisecond)
-			} else {
-				return count, nil
-			}
-		}
-	}
-	return count, nil
-}
-
-type BiChannel struct {
-	L *BlockingSendReceiver
-	R *BlockingSendReceiver
-}
-
-func (bc *BiChannel) Write(b []byte) (int, error) {
-	return bc.L.Send(b)
-}
-
-func (bc *BiChannel) Read(b []byte) (int, error) {
-	return bc.R.Receive(b)
-}
-
-func NewFakeConnection(t time.Duration) (*BiChannel, *BiChannel) {
-	l := NewBlockingSendReceiver().Timeout(t)
-	r := NewBlockingSendReceiver().Timeout(t)
-	return &BiChannel{L: l, R: r}, &BiChannel{L: r, R: l}
-}
-
-func TestHandshakeServerNormalCaseScenario(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		buf := make([]byte, 10)
-		clientConn.Write([]byte{flagSyn, 200})
-
-		if n, e := clientConn.Read(buf); e != nil || n != 3 {
-			t.Errorf("Only 3 bytes are expected: %x, received: %d", buf[:n], n)
-			return
-		}
-
-		if buf[0] != flagAck || buf[1] != 201 {
-			t.Errorf("Error, unexpected data: %v", buf[:3])
-			return
-		}
-		clientConn.Write([]byte{flagAck, buf[2] + 1})
-	}()
-
-	if e := HandshakeServer(serverConn); e != nil {
-		t.Errorf("Unexpected error: %v", e)
-	}
-}
-
-func TestHandshakeServerLotsOfTrashOnTheLine(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		buf := make([]byte, 10)
-
-		// Do not send too many bytes, otherwise "write" will block on server side due too many flagNak.
-		x := "sdfkgn sdflkjsfdfdgis dfgs"
-		for i := 0; i < 5; i++ {
-			x += x
-		}
-		clientConn.Write([]byte(x))
-		clientConn.Write([]byte{flagSyn, 200})
-
-		n, e := clientConn.Read(buf)
-		if e != nil {
-			t.Errorf("Unexpected server error: %v", e)
-			return
-		}
-
-		if n < 3 {
-			t.Errorf("Unexpected server error: %v", e)
-			return
-		}
-
-		if buf[0] == flagNak {
-			t.Errorf("Unexpected server error: %v", e)
-			return
-		}
-
-		if buf[0] != flagAck || buf[1] != 201 {
-			t.Errorf("Error, unexpected data: %x", buf[:3])
-			return
-		}
-		clientConn.Write([]byte{flagAck, buf[2] + 1})
-	}()
-
-	e := HandshakeServer(serverConn)
-	if e != nil {
-		if _, ok := e.(*HandshakeError); !ok {
-			t.Errorf("Unexpected error: %v", e)
-			return
-		}
-	}
-	if e != nil {
-		e = HandshakeServer(serverConn)
-		if _, ok := e.(*HandshakeError); !ok {
-			t.Errorf("Unexpected error: %v", e)
-		}
-	}
-}
-
-func TestHandshakeServerComportSync(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		buf := make([]byte, 10)
-		// this is the sequence we see from Linux serial driver on the real world
-		clientConn.Write([]byte{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22})
-
-		for {
-			clientConn.Write([]byte{flagSyn, 200})
-
-			n, e := clientConn.Read(buf)
-			if e != nil {
-				t.Errorf("Unexpected server error: %v", e)
-				return
-			}
-
-			if n < 3 {
-				continue
-			}
-
-			data := buf[n-3:]
-			if data[0] == flagNak {
-				continue
-			}
-
-			if data[0] != flagAck || data[1] != 201 {
-				t.Errorf("Error, unexpected data: %x", data[:3])
-				return
-			}
-			clientConn.Write([]byte{flagAck, data[2] + 1})
-			break
-		}
-	}()
-
-	for {
-		if e := HandshakeServer(serverConn); e == nil {
-			break
-		} else {
-			if _, ok := e.(*HandshakeError); !ok {
-				t.Errorf("Unexpected error: %v", e)
-				return
-			}
-		}
-	}
-}
-
-func TestHandshakeServerAckNakResponse(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		buf := make([]byte, 10)
-
-		// Do not send too many bytes, otherwise "write" will block on server side due too many flagNak.
-		clientConn.Write([]byte{flagSyn, 200})
-
-		n, e := clientConn.Read(buf)
-		if e != nil {
-			t.Errorf("Unexpected server error: %v", e)
-			return
-		}
-
-		data := buf[n-3:]
-		if data[0] != flagAck || data[1] != 201 {
-			t.Errorf("Error, unexpected data: %x", data[:3])
-			return
-		}
-		// intentional error. data[2] has to be incremented.
-		clientConn.Write([]byte{flagAck, data[2]})
-		if n, err := clientConn.Read(buf); n != 1 || err != nil || buf[0] != flagNak {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-
-		clientConn.Write([]byte{flagSyn, 200})
-
-		n, e = clientConn.Read(buf)
-		if e != nil {
-			t.Errorf("Unexpected server error: %v", e)
-			return
-		}
-
-		data = buf[n-3:]
-		if data[0] != flagAck || data[1] != 201 {
-			t.Errorf("Error, unexpected data: %x", data[:3])
-			return
-		}
-
-		// intentional error. 99 in a wrong code.
-		clientConn.Write([]byte{99, data[2] + 1})
-		if n, err := clientConn.Read(buf); n != 1 || err != nil || buf[0] != flagNak {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-	}()
-
-	e := HandshakeServer(serverConn)
-	if e != nil {
-		if _, ok := e.(*HandshakeError); !ok {
-			t.Errorf("Unexpected error: %v", e)
-			return
-		}
-	}
-	if e != nil {
-		e = HandshakeServer(serverConn)
-		if _, ok := e.(*HandshakeError); !ok {
-			t.Errorf("Unexpected error: %v", e)
-		}
-	}
-}
-
-func TestHandshakeClientNormalConnection(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		pos := byte(200)
-		buf := make([]byte, 1024)
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagSyn {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-		serverConn.Write([]byte{flagAck, buf[1] + 1, pos})
-
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagAck || buf[1] != pos+1 {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-
-		serverConn.Write([]byte{flagAck})
-	}()
-
-	e := HandshakeClient(clientConn)
-	if e != nil {
-		t.Errorf("Unexpected error: %v", e)
-	}
-}
-
-func TestHandshakeClientWrongServerAckPos(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		pos := byte(200)
-		buf := make([]byte, 1024)
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagSyn {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-
-		// writing the wrong buf[1] that supposed to be incremented.
-		serverConn.Write([]byte{flagAck, buf[1], pos})
-
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagAck || buf[1] != pos+1 {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-	}()
-
-	err, ok := HandshakeClient(clientConn).(*HandshakeError)
-	if !ok {
-		t.Errorf("Unexpected error: %v", err)
-	}
-}
-
-func TestHandshakeClientWrongServerAck(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-
-	go func() {
-		pos := byte(200)
-		buf := make([]byte, 1024)
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagSyn {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-
-		// writing 90 instead of flagAck
-		serverConn.Write([]byte{90, buf[1] + 1, pos})
-
-		if n, err := serverConn.Read(buf); n != 2 || err != nil || buf[0] != flagAck || buf[1] != pos+1 {
-			t.Errorf("Unexpected data or error %d, %v", n, err)
-			return
-		}
-	}()
-
-	err, ok := HandshakeClient(clientConn).(*HandshakeError)
-	if !ok {
-		t.Errorf("Unexpected error: %v", err)
-	}
-}
-
-func TestHandshakeServerVsClient(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-	clientConn, serverConn := NewFakeConnection(timeout)
-	w := sync.WaitGroup{}
-	w.Add(2)
-
-	go func() {
-		defer w.Done()
-		err := HandshakeClient(clientConn)
-		if err != nil {
-			t.Errorf("Unexpected error: %v", err)
-		}
-	}()
-
-	go func() {
-		defer w.Done()
-		err := HandshakeServer(serverConn)
-		if err != nil {
-			t.Errorf("Unexpected error: %v", err)
-		}
-	}()
-
-	w.Wait()
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/serial/rawaddr.go b/installer/vendor/github.com/vmware/vic/pkg/serial/rawaddr.go
deleted file mode 100644
index 2791672f65..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/serial/rawaddr.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package serial
-
-import "github.com/vmware/vic/pkg/trace"
-
-type RawAddr struct {
-	Net  string
-	Addr string
-}
-
-func (addr RawAddr) Network() string {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return addr.Net
-}
-
-func (addr RawAddr) String() string {
-	if tracing {
-
-		defer trace.End(trace.Begin(""))
-	}
-	return addr.Network() + "://" + addr.Addr
-}
-
-func NewRawAddr(net string, addr string) *RawAddr {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return &RawAddr{
-		Net:  net,
-		Addr: addr,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/serial/rawconn.go b/installer/vendor/github.com/vmware/vic/pkg/serial/rawconn.go
deleted file mode 100644
index a6bb1e838d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/serial/rawconn.go
+++ /dev/null
@@ -1,231 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package serial
-
-import (
-	"io"
-	"net"
-	"os"
-	"runtime"
-	"sync"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-type NamedReadChannel interface {
-	io.ReadCloser
-	Name() string
-	Fd() uintptr
-}
-
-type NamedWriteChannel interface {
-	io.WriteCloser
-	Name() string
-	Fd() uintptr
-}
-
-type RawConn struct {
-	rchannel   NamedReadChannel
-	wchannel   NamedWriteChannel
-	localAddr  net.Addr
-	remoteAddr net.Addr
-	err        chan error
-	mutex      sync.Mutex
-	closed     bool
-}
-
-func NewTypedConn(r NamedReadChannel, w NamedWriteChannel, net string) (*RawConn, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	conn := &RawConn{
-		rchannel: r,
-		wchannel: w,
-
-		localAddr:  *NewRawAddr(net, r.Name()),
-		remoteAddr: *NewRawAddr(net, w.Name()),
-		err:        make(chan error, 1),
-		closed:     false,
-	}
-
-	return conn, nil
-}
-
-// NewFileConn creates a connection of the provided file - assumes file is a
-// full duplex comm mechanism
-func NewFileConn(file *os.File) (*RawConn, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return NewTypedConn(file, file, "file")
-}
-
-// NewRawConn creates a connection via the provided file descriptor - assumes file is a
-// full duplex comm mechanism
-func NewRawConn(fd uintptr, name string, net string) (*RawConn, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	file := os.NewFile(fd, name)
-	return NewTypedConn(file, file, net)
-}
-
-// NewHalfDuplexFileConn creates a connection via the provided files - this assumes that
-// each file is a half-duplex mechanism, such as a linux fifo pipe
-func NewHalfDuplexFileConn(read *os.File, write *os.File, name string, net string) (*RawConn, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return NewTypedConn(read, write, net)
-}
-
-// Read reads data from the connection.
-func (conn *RawConn) Read(b []byte) (int, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-
-	var n int
-	var err error
-
-	if verbose {
-		defer func() {
-			log.Debugf("Returning error and bytes from read (%s:%s): %d, %s", conn.rchannel.Name(), conn.wchannel.Name(), n, err)
-		}()
-	}
-
-	// TODO: this is horrific from a performance perspective - really need a better
-	// way to interrupt that file.Read call
-	bytes := make(chan int, 1)
-
-	go func() {
-		n, err = conn.rchannel.Read(b)
-
-		// if we've got any bytes we need to pass them back so we cannot return
-		// the error via conn.err
-		bytes <- n
-		close(bytes)
-	}()
-
-	conn.mutex.Lock()
-	closed := conn.closed
-	conn.mutex.Unlock()
-
-	select {
-	case n = <-bytes:
-		if err != nil && closed {
-			err = io.EOF
-		}
-		return n, err
-	case e := <-conn.err:
-		log.Debugf("Returning error from read: %s", e)
-		// only one close will send an error and we have that, so this won't block
-		// we do need to interrupt all reads
-		conn.err <- e
-		return n, e
-	}
-}
-
-// Write writes data to the connection
-func (conn *RawConn) Write(b []byte) (int, error) {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return conn.wchannel.Write(b)
-}
-
-// Close closes the connection.
-func (conn *RawConn) Close() error {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	var closed bool
-
-	conn.mutex.Lock()
-	closed = conn.closed
-	conn.closed = true
-	conn.mutex.Unlock()
-
-	if closed {
-		log.Debugf("Close called again on RawConn (%s:%s) - dropping", conn.rchannel.Name(), conn.wchannel.Name())
-		return nil
-	}
-
-	// process the close
-	log.Debugf("Closing the RawConn (%s:%s)", conn.rchannel.Name(), conn.wchannel.Name())
-	errR := conn.rchannel.Close()
-	errW := conn.wchannel.Close()
-
-	if verbose {
-		buf := make([]byte, 4096)
-		bytes := runtime.Stack(buf, false)
-		log.Debugf("Close called on RawConn (%s:%s):\n%s", conn.rchannel.Name(), conn.wchannel.Name(), string(buf[:bytes]))
-	}
-
-	log.Debugf("Pushing EOF to any blocked readers on the raw connection (%s:%s)", conn.rchannel.Name(), conn.wchannel.Name())
-	conn.err <- io.EOF
-
-	if errR != nil {
-		return errR
-	}
-	return errW
-}
-
-// LocalAddr returns the local network address.
-func (conn *RawConn) LocalAddr() net.Addr {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return conn.localAddr
-}
-
-// RemoteAddr returns the remote network address.
-func (conn *RawConn) RemoteAddr() net.Addr {
-	if tracing {
-		defer trace.End(trace.Begin(""))
-	}
-	return conn.remoteAddr
-}
-
-// SetDeadline sets the read and write deadlines associated
-// with the connection
-func (conn *RawConn) SetDeadline(t time.Time) error {
-	if tracing {
-		defer trace.End(trace.Begin(t.String()))
-	}
-	// https://golang.org/src/net/fd_poll_runtime.go#L133
-	// consider implementing this by making RawConn a netFD
-	// if we can find a way around the lack of export
-	return nil
-}
-
-// SetReadDeadline sets the deadline for future Read calls.
-func (conn *RawConn) SetReadDeadline(t time.Time) error {
-	if tracing {
-		defer trace.End(trace.Begin(t.String()))
-	}
-	return nil
-}
-
-// SetWriteDeadline sets the deadline for future Write calls.
-func (conn *RawConn) SetWriteDeadline(t time.Time) error {
-	if tracing {
-		defer trace.End(trace.Begin(t.String()))
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/connection.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/connection.go
deleted file mode 100644
index 25b662cda0..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/connection.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"io/ioutil"
-	"net"
-	"sync"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-type optCallBackFunc func(byte, byte)
-
-type connOpts struct {
-	// conn is the underlying connection
-	conn net.Conn
-	fsm  *fsm
-
-	serverOpts  map[byte]bool
-	clientOpts  map[byte]bool
-	optCallback optCallBackFunc
-
-	Handlers
-}
-
-// Conn is the struct representing the telnet connection
-type Conn struct {
-	connOpts
-
-	// the connection write channel. Everything required to be written to the connection goes to this channel
-	writeCh chan []byte
-	// dataRW is the data buffer. It is written to by the FSM and read from by the data handler
-	dataRW        io.ReadWriter
-	cmdBuffer     bytes.Buffer
-	handlerWriter io.WriteCloser
-
-	// used in the dataHandlerWrapper to notify that the telnet connection is closed
-	dataHandlerCloseCh chan chan struct{}
-	// used in the dataHandlerWrapper to notify that data has been writeen to the dataRW buffer
-	dataWrittenCh chan bool
-
-	// connWriteDoneCh closes the write loop when the telnet connection is closed
-	connWriteDoneCh chan chan struct{}
-
-	closedMutex sync.Mutex
-	closed      bool
-}
-
-// Safely read/write concurrently to the data Buffer
-// databuffer is written to by the FSM and it is read from by the dataHandler
-type dataReadWriter struct {
-	buf bytes.Buffer
-	sync.Mutex
-}
-
-func (drw *dataReadWriter) Read(p []byte) (int, error) {
-	drw.Lock()
-	defer drw.Unlock()
-	return drw.buf.Read(p)
-}
-
-func (drw *dataReadWriter) Write(p []byte) (int, error) {
-	drw.Lock()
-	defer drw.Unlock()
-	return drw.buf.Write(p)
-}
-
-// This is the Writer that is passed to the handlers to write to the telnet connection
-type connectionWriter struct {
-	ch chan []byte
-}
-
-func (cw *connectionWriter) Write(b []byte) (int, error) {
-	if cw.ch != nil {
-		cw.ch <- b
-	}
-	return len(b), nil
-}
-
-func (cw *connectionWriter) Close() error {
-	close(cw.ch)
-	cw.ch = nil
-	return nil
-}
-
-func newConn(opts *connOpts) *Conn {
-	tc := &Conn{
-		connOpts:           *opts,
-		writeCh:            make(chan []byte),
-		dataHandlerCloseCh: make(chan chan struct{}),
-		dataWrittenCh:      make(chan bool),
-		connWriteDoneCh:    make(chan chan struct{}),
-		closed:             false,
-	}
-	if tc.optCallback == nil {
-		tc.optCallback = tc.handleOptionCommand
-	}
-	tc.handlerWriter = &connectionWriter{
-		ch: tc.writeCh,
-	}
-	tc.dataRW = &dataReadWriter{}
-	tc.fsm.tc = tc
-	return tc
-}
-
-//UnderlyingConnection returns the underlying TCP connection
-func (c *Conn) UnderlyingConnection() net.Conn {
-	return c.conn
-}
-
-func (c *Conn) writeLoop() {
-	log.Debugf("entered write loop")
-	for {
-		select {
-		case writeBytes := <-c.writeCh:
-			c.conn.Write(writeBytes)
-		case ch := <-c.connWriteDoneCh:
-			ch <- struct{}{}
-			return
-		}
-	}
-}
-
-func (c *Conn) startNegotiation() {
-	for k := range c.serverOpts {
-		log.Infof("sending WILL %d", k)
-		c.sendCmd(Will, k)
-	}
-	for k := range c.clientOpts {
-		log.Infof("sending DO %d", k)
-		c.sendCmd(Do, k)
-	}
-}
-
-// close closes the telnet connection
-func (c *Conn) close() {
-	c.closedMutex.Lock()
-	defer c.closedMutex.Unlock()
-
-	c.closed = true
-	log.Infof("Closing the connection")
-	c.conn.Close()
-	c.closeConnLoopWrite()
-	c.closeDatahandler()
-	c.handlerWriter.Close()
-	log.Infof("telnet connection closed")
-
-	// calling the CloseHandler passed by vspc
-	c.CloseHandler(c)
-
-}
-
-func (c *Conn) closeConnLoopWrite() {
-	connLoopWriteCh := make(chan struct{})
-	c.connWriteDoneCh <- connLoopWriteCh
-	<-connLoopWriteCh
-	log.Debugf("connection loop write-side closed")
-}
-
-func (c *Conn) closeDatahandler() {
-	dataCh := make(chan struct{})
-	c.dataHandlerCloseCh <- dataCh
-	<-dataCh
-}
-
-func (c *Conn) sendCmd(cmd byte, opt byte) {
-	c.writeCh <- []byte{Iac, cmd, opt}
-	log.Debugf("Sending command: %v %v", cmd, opt)
-}
-
-func (c *Conn) handleOptionCommand(cmd byte, opt byte) {
-	if cmd == Will || cmd == Wont {
-		if _, ok := c.clientOpts[opt]; !ok {
-			c.sendCmd(Dont, opt)
-			return
-		}
-		c.sendCmd(Do, opt)
-	}
-
-	if cmd == Do || cmd == Dont {
-		if _, ok := c.serverOpts[opt]; !ok {
-			c.sendCmd(Wont, opt)
-			return
-		}
-		log.Debugf("Sending WILL command")
-		c.sendCmd(Will, opt)
-
-	}
-}
-
-func (c *Conn) dataHandlerWrapper(w io.Writer, r io.Reader) {
-	defer func() {
-		log.Debugf("data handler closed")
-	}()
-	for {
-		select {
-		case ch := <-c.dataHandlerCloseCh:
-			ch <- struct{}{}
-			return
-		case <-c.dataWrittenCh:
-			// #nosec: Errors unhandled.
-			if b, _ := ioutil.ReadAll(r); len(b) > 0 {
-				c.DataHandler(w, b, c)
-			}
-		}
-	}
-}
-
-func (c *Conn) cmdHandlerWrapper(w io.Writer, r io.Reader) {
-	// #nosec: Errors unhandled.
-	if cmd, _ := ioutil.ReadAll(r); len(cmd) > 0 {
-		c.CmdHandler(w, cmd, c)
-	}
-}
-
-// IsClosed returns true if the connection is already closed
-func (c *Conn) IsClosed() bool {
-	c.closedMutex.Lock()
-	defer c.closedMutex.Unlock()
-	return c.closed
-}
-
-// WriteData writes telnet data to the underlying connection doubling every IAC
-func (c *Conn) WriteData(b []byte) (int, error) {
-	var escaped []byte
-	for _, v := range b {
-		if v == Iac {
-			escaped = append(escaped, 255)
-		}
-		escaped = append(escaped, v)
-	}
-	if c.IsClosed() {
-		return -1, errors.New("telnet connection is already closed")
-	}
-	c.writeCh <- escaped
-	return len(b), nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/connection_test.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/connection_test.go
deleted file mode 100644
index 41b858a4ae..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/connection_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-import (
-	"bytes"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type dummyConn struct {
-	dataBuf bytes.Buffer
-}
-
-func (c *dummyConn) Read(b []byte) (n int, err error) {
-	return 3, nil
-}
-
-func (c *dummyConn) Write(b []byte) (n int, err error) {
-	return c.dataBuf.Write(b)
-}
-
-func (c *dummyConn) Close() error {
-	return nil
-}
-
-func (c *dummyConn) LocalAddr() net.Addr {
-	return nil
-}
-
-func (c *dummyConn) RemoteAddr() net.Addr {
-	return nil
-}
-
-func (c *dummyConn) SetDeadline(t time.Time) error {
-	return nil
-}
-
-func (c *dummyConn) SetReadDeadline(t time.Time) error {
-	return nil
-}
-
-func (c *dummyConn) SetWriteDeadline(t time.Time) error {
-	return nil
-}
-
-func newTestItem() *Conn {
-	opts := connOpts{
-		conn: &dummyConn{},
-		serverOpts: map[byte]bool{
-			Binary: true,
-			Echo:   true,
-		},
-		clientOpts: map[byte]bool{
-			Naocrd: true,
-			Naohts: true,
-		},
-	}
-	return &Conn{
-		connOpts:        opts,
-		writeCh:         make(chan []byte),
-		connWriteDoneCh: make(chan chan struct{}),
-	}
-}
-
-func TestWriteData(t *testing.T) {
-	conn := newTestItem()
-	data := [][]byte{{10, 15, 23, 210}, {10, Iac, 30, 40}, {10, Iac, Iac, 30, 40}}
-	expected := [][]byte{{10, 15, 23, 210}, {10, Iac, Iac, 30, 40}, {10, Iac, Iac, Iac, Iac, 30, 40}}
-	for i, d := range data {
-		go conn.WriteData(d)
-		received := <-conn.writeCh
-		assert.Equal(t, expected[i], received)
-	}
-}
-
-func TestSendCmd(t *testing.T) {
-	conn := newTestItem()
-	go conn.sendCmd(Do, Binary)
-	received := <-conn.writeCh
-	assert.Equal(t, []byte{Iac, Do, Binary}, received)
-}
-
-func TestNegotiation(t *testing.T) {
-	conn := newTestItem()
-	go conn.startNegotiation()
-	expected := map[byte][]byte{
-		Binary: {Iac, Will, Binary},
-		Echo:   {Iac, Will, Echo},
-		Naocrd: {Iac, Do, Naocrd},
-		Naohts: {Iac, Do, Naohts},
-	}
-	for i := 0; i < 4; i++ {
-		r := <-conn.writeCh
-		assert.Equal(t, expected[r[2]], r)
-	}
-}
-
-func TestWriteLoop(t *testing.T) {
-	conn := newTestItem()
-	go conn.writeLoop()
-	conn.writeCh <- []byte{1, 2, 3, 4}
-	conn.writeCh <- []byte{5, 6}
-	conn.writeCh <- []byte{7}
-	ch := make(chan struct{})
-	conn.connWriteDoneCh <- ch
-	<-ch
-	assert.Equal(t, []byte{1, 2, 3, 4, 5, 6, 7}, conn.connOpts.conn.(*dummyConn).dataBuf.Bytes())
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm.go
deleted file mode 100644
index 56120372ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-import log "github.com/Sirupsen/logrus"
-
-type state int
-
-const (
-	dataState state = iota
-	optionNegotiationState
-	cmdState
-	subnegState
-	subnegEndState
-	errorState
-)
-
-type fsm struct {
-	curState state
-	tc       *Conn
-}
-
-func newFSM() *fsm {
-	f := &fsm{
-		curState: dataState,
-	}
-	return f
-}
-
-func (fsm *fsm) start() {
-	defer func() {
-		log.Infof("FSM closed")
-	}()
-	for {
-		b := make([]byte, 4096)
-		n, err := fsm.readFromRawConnection(b)
-		if n > 0 {
-			for i := 0; i < n; i++ {
-				ch := b[i]
-				ns := fsm.nextState(ch)
-				fsm.curState = ns
-			}
-		}
-		if err != nil {
-			log.Debugf("connection read: %v", err)
-			fsm.tc.close()
-			break
-		}
-	}
-}
-
-func (fsm *fsm) readFromRawConnection(b []byte) (int, error) {
-	return fsm.tc.conn.Read(b)
-}
-
-// this function returns what the next state is and performs the appropriate action
-func (fsm *fsm) nextState(ch byte) state {
-	var nextState state
-	b := []byte{ch}
-	switch fsm.curState {
-	case dataState:
-		if ch != Iac {
-			fsm.tc.dataRW.Write(b)
-			fsm.tc.dataWrittenCh <- true
-			nextState = dataState
-		} else {
-			nextState = cmdState
-		}
-
-	case cmdState:
-		if ch == Iac { // this is an escaping of IAC to send it as data
-			fsm.tc.dataRW.Write(b)
-			fsm.tc.dataWrittenCh <- true
-			nextState = dataState
-		} else if ch == Do || ch == Dont || ch == Will || ch == Wont {
-			fsm.tc.cmdBuffer.WriteByte(ch)
-			nextState = optionNegotiationState
-		} else if ch == Sb {
-			fsm.tc.cmdBuffer.WriteByte(ch)
-			nextState = subnegState
-		} else { // anything else
-			fsm.tc.cmdBuffer.WriteByte(ch)
-			fsm.tc.cmdHandlerWrapper(fsm.tc.handlerWriter, &fsm.tc.cmdBuffer)
-			fsm.tc.cmdBuffer.Reset()
-			nextState = dataState
-		}
-	case optionNegotiationState:
-		fsm.tc.cmdBuffer.WriteByte(ch)
-		opt := ch
-		cmd := fsm.tc.cmdBuffer.Bytes()[0]
-		fsm.tc.optCallback(cmd, opt)
-		fsm.tc.cmdBuffer.Reset()
-		nextState = dataState
-	case subnegState:
-		if ch == Iac {
-			nextState = subnegEndState
-		} else {
-			nextState = subnegState
-			fsm.tc.cmdBuffer.WriteByte(ch)
-		}
-	case subnegEndState:
-		if ch == Se {
-			fsm.tc.cmdBuffer.WriteByte(ch)
-			fsm.tc.cmdHandlerWrapper(fsm.tc.handlerWriter, &fsm.tc.cmdBuffer)
-			fsm.tc.cmdBuffer.Reset()
-			nextState = dataState
-		} else if ch == Iac { // escaping IAC
-			nextState = subnegState
-			fsm.tc.cmdBuffer.WriteByte(ch)
-		} else {
-			nextState = errorState
-		}
-	case errorState:
-		nextState = dataState
-		log.Infof("Finite state machine is in an error state. This should not happen for correct telnet protocol syntax")
-	}
-	return nextState
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm_test.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm_test.go
deleted file mode 100644
index 5063f260db..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/fsm_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-import (
-	"bytes"
-	"io"
-	"log"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-)
-
-type mockConn struct {
-	r io.Reader
-	w io.Writer
-}
-
-func (c *mockConn) Read(b []byte) (int, error) {
-	return c.r.Read(b)
-}
-
-func (c *mockConn) Write(b []byte) (int, error) {
-	return c.w.Write(b)
-}
-
-func (c *mockConn) Close() error {
-	return nil
-}
-
-func (c *mockConn) LocalAddr() net.Addr {
-	return nil
-}
-
-func (c *mockConn) RemoteAddr() net.Addr {
-	return nil
-}
-
-func (c *mockConn) SetDeadline(t time.Time) error {
-	return nil
-}
-
-func (c *mockConn) SetReadDeadline(t time.Time) error {
-	return nil
-}
-
-func (c *mockConn) SetWriteDeadline(t time.Time) error {
-	return nil
-}
-
-func newMockConn(r io.Reader, w io.Writer) net.Conn {
-	return &mockConn{
-		r: r,
-		w: w,
-	}
-}
-
-type cmd struct {
-	cmdBuf []byte
-	called bool
-}
-
-func (d *cmd) mockCmdHandler(w io.Writer, b []byte, tc *Conn) {
-	d.called = true
-	d.cmdBuf = b
-}
-
-type opt struct {
-	cmd    byte
-	optn   byte
-	called bool
-}
-
-func (o *opt) optCallback(cmd, option byte) {
-	o.cmd = cmd
-	o.optn = option
-	o.called = true
-}
-
-type testSample struct {
-	inputSeq []byte
-	expState []state
-	expOpt   []*opt
-	expCmd   []*cmd
-}
-
-var samples = []testSample{
-	{
-		inputSeq: []byte{10, 20, 5, 12, 34, 125, 98},
-		expState: []state{0, 0, 0, 0, 0, 0, 0},
-		expOpt:   []*opt{nil, nil, nil, nil, nil, nil, nil},
-		expCmd:   []*cmd{nil, nil, nil, nil, nil, nil, nil},
-	},
-	{
-		inputSeq: []byte{Iac, Do, Echo, 10, 20, Iac, Will, Sga},
-		expState: []state{cmdState, optionNegotiationState, dataState, dataState, dataState, cmdState, optionNegotiationState, dataState},
-		expOpt:   []*opt{nil, nil, {Do, Echo, true}, nil, nil, nil, nil, {Will, Sga, true}},
-		expCmd:   []*cmd{nil, nil, nil, nil, nil, nil, nil, nil},
-	},
-	{
-		inputSeq: []byte{10, 20, Iac, Ayt, 5, Iac, Ao},
-		expState: []state{dataState, dataState, cmdState, dataState, dataState, cmdState, dataState},
-		expOpt:   []*opt{nil, nil, nil, nil, nil, nil, nil},
-		expCmd:   []*cmd{nil, nil, nil, {[]byte{Ayt}, true}, nil, nil, {[]byte{Ao}, true}},
-	},
-	{
-		inputSeq: []byte{10, Iac, Sb, 5, 12, Iac, Se},
-		expState: []state{dataState, cmdState, subnegState, subnegState, subnegState, subnegEndState, dataState},
-		expOpt:   []*opt{nil, nil, nil, nil, nil, nil, nil},
-		expCmd:   []*cmd{nil, nil, nil, nil, nil, nil, {[]byte{Sb, 5, 12, Se}, true}},
-	},
-}
-
-func TestFSM(t *testing.T) {
-	for count, s := range samples {
-		log.Printf("test sample %d", count)
-		b := make([]byte, 512)
-		outBuf := bytes.NewBuffer(b)
-		inBuf := bytes.NewBuffer(s.inputSeq)
-		cmdPtr := &cmd{
-			called: false,
-		}
-		optPtr := &opt{
-			called: false,
-		}
-		dummyConn := newMockConn(inBuf, outBuf)
-		fsm := newFSM()
-		opts := connOpts{
-			conn: dummyConn,
-			fsm:  fsm,
-			Handlers: Handlers{
-				CmdHandler:  cmdPtr.mockCmdHandler,
-				DataHandler: defaultDataHandlerFunc,
-			},
-			optCallback: optPtr.optCallback,
-		}
-		tc := newConn(&opts)
-		go tc.dataHandlerWrapper(tc.handlerWriter, tc.dataRW)
-		assert.Equal(t, fsm.curState, dataState)
-
-		for i, ch := range s.inputSeq {
-			ns := fsm.nextState(ch)
-			fsm.curState = ns
-			assert.Equal(t, s.expState[i], ns)
-			if optPtr.called {
-				assert.Equal(t, s.expOpt[i].cmd, optPtr.cmd)
-				assert.Equal(t, s.expOpt[i].optn, optPtr.optn)
-			} else {
-				assert.Nil(t, s.expOpt[i])
-			}
-			if cmdPtr.called {
-				exp := s.expCmd[i].cmdBuf
-				actual := cmdPtr.cmdBuf
-				assert.Equal(t, exp, actual)
-			} else {
-				assert.Nil(t, s.expCmd[i])
-			}
-			optPtr.called = false
-			cmdPtr.called = false
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/protocol.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/protocol.go
deleted file mode 100644
index e6ea15a092..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/protocol.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-// Telnet protocol specific  values
-const (
-	// Iac is Interpret as Command
-	Iac  byte = 255
-	Dont byte = 254
-	Do   byte = 253
-	Wont byte = 252
-	Will byte = 251
-	Null byte = 0
-
-	Se  byte = 240 // Subnegotiation End
-	Nop byte = 241 // No Operation
-	Dm  byte = 242 // Data Mark
-	Brk byte = 243 // Break
-	IP  byte = 244 // Interrupt process
-	Ao  byte = 245 // Abort output
-	Ayt byte = 246 // Are You There
-	Ec  byte = 247 // Erase Character
-	El  byte = 248 // Erase Line
-	Ga  byte = 249 // Go Ahead
-	Sb  byte = 250 // Subnegotiation Begin
-
-	Binary          byte = 0   // 8-bit data path
-	Echo            byte = 1   // echo
-	Rcp             byte = 2   // prepare to reconnect
-	Sga             byte = 3   // suppress go ahead
-	Nams            byte = 4   // approximate message size
-	Status          byte = 5   // give status
-	Tm              byte = 6   // timing mark
-	Rcte            byte = 7   // remote controlled transmission and echo
-	Naol            byte = 8   // negotiate about output line width
-	Naop            byte = 9   // negotiate about output page size
-	Naocrd          byte = 10  // negotiate about CR disposition
-	Naohts          byte = 11  // negotiate about horizontal tabstops
-	Naohtd          byte = 12  // negotiate about horizontal tab disposition
-	Naoffd          byte = 13  // negotiate about formfeed disposition
-	Naovts          byte = 14  // negotiate about vertical tab stops
-	Naovtd          byte = 15  // negotiate about vertical tab disposition
-	Naolfd          byte = 16  // negotiate about output LF disposition
-	Xascii          byte = 17  // extended ascii character set
-	Logout          byte = 18  // force logout
-	Bm              byte = 19  // byte macro
-	Det             byte = 20  // data entry terminal
-	Supdup          byte = 21  // supdup protocol
-	SupdupOutput    byte = 22  // supdup output
-	SndLoc          byte = 23  // send location
-	Ttype           byte = 24  // terminal type
-	Eor             byte = 25  // end or record
-	TuID            byte = 26  // TACACS user identification
-	OutMrk          byte = 27  // output marking
-	TtyLoc          byte = 28  // terminal location number
-	Vt3270Regime    byte = 29  // 3270 regime
-	X3Pad           byte = 30  // X.3 PAD
-	Naws            byte = 31  // window size
-	Tspeed          byte = 32  // terminal speed
-	Lflow           byte = 33  // remote flow control
-	LineMode        byte = 34  // Linemode option
-	XDispLoc        byte = 35  // X Display Location
-	OldEnviron      byte = 36  // Old - Environment variables
-	Authentication  byte = 37  // Authenticate
-	Encrypt         byte = 38  // Encryption option
-	NewEnviron      byte = 39  // New - Environment variables
-	TN3270E         byte = 40  // TN3270E
-	XAuth           byte = 41  // XAUTH
-	Charset         byte = 42  // CHARSET
-	Rsp             byte = 43  // Telnet Remote Serial Port
-	ComPortOption   byte = 44  // Com Port Control Option
-	SupLocalEcho    byte = 45  // Telnet Suppress Local Echo
-	TLS             byte = 46  // Telnet Start TLS
-	Kermit          byte = 47  // KERMIT
-	SendURL         byte = 48  // SEND-URL
-	ForwardX        byte = 49  // FORWARD_X
-	PragmaLogon     byte = 138 // TELOPT PRAGMA LOGON
-	SspiLogin       byte = 139 // TELOPT SSPI LOGON
-	PragmaHeartbeat byte = 140 // TELOPT PRAGMA HEARTBEAT
-	ExtOptList      byte = 255 // Extended-Options-List
-	NoOp            byte = 0
-)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/telnet/server.go b/installer/vendor/github.com/vmware/vic/pkg/telnet/server.go
deleted file mode 100644
index 916b4ea3ad..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/telnet/server.go
+++ /dev/null
@@ -1,116 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package telnet
-
-import (
-	"fmt"
-	"io"
-	"net"
-
-	log "github.com/Sirupsen/logrus"
-)
-
-// DataHandlerFunc is the callback function in the event of receiving data from the telnet client
-type DataHandlerFunc func(w io.Writer, data []byte, tc *Conn)
-
-// CmdHandlerFunc is the callback function in the event of receiving a command from the telnet client
-type CmdHandlerFunc func(w io.Writer, cmd []byte, tc *Conn)
-
-// CloseHandlerFunc is the callback function in the event of receiving EOF from the telnet client
-type CloseHandlerFunc func(tc *Conn)
-
-var defaultDataHandlerFunc = func(w io.Writer, data []byte, tc *Conn) {}
-
-var defaultCmdHandlerFunc = func(w io.Writer, cmd []byte, tc *Conn) {}
-
-var defaultCloseHandlerFunc = func(tc *Conn) {}
-
-type Handlers struct {
-	DataHandler  DataHandlerFunc
-	CmdHandler   CmdHandlerFunc
-	CloseHandler CloseHandlerFunc
-}
-
-// ServerOpts is the telnet server constructor options
-type ServerOpts struct {
-	Addr       string
-	ServerOpts []byte
-	ClientOpts []byte
-
-	Handlers
-}
-
-// Server is the struct representing the telnet server
-type Server struct {
-	ServerOptions map[byte]bool
-	ClientOptions map[byte]bool
-
-	Handlers
-
-	ln net.Listener
-}
-
-// NewServer is the constructor of the telnet server
-func NewServer(opts ServerOpts) *Server {
-	ts := new(Server)
-	ts.ClientOptions = make(map[byte]bool)
-	ts.ServerOptions = make(map[byte]bool)
-	for _, v := range opts.ServerOpts {
-		ts.ServerOptions[v] = true
-	}
-	for _, v := range opts.ClientOpts {
-		ts.ClientOptions[v] = true
-	}
-	ts.DataHandler = defaultDataHandlerFunc
-	if opts.DataHandler != nil {
-		ts.DataHandler = opts.DataHandler
-	}
-
-	ts.CmdHandler = defaultCmdHandlerFunc
-	if opts.CmdHandler != nil {
-		ts.CmdHandler = opts.CmdHandler
-	}
-
-	ts.CloseHandler = defaultCloseHandlerFunc
-	if opts.CloseHandler != nil {
-		ts.CloseHandler = opts.CloseHandler
-	}
-
-	ln, err := net.Listen("tcp", opts.Addr)
-	if err != nil {
-		panic(fmt.Sprintf("cannot start telnet server: %v", err))
-	}
-	ts.ln = ln
-	return ts
-}
-
-// Accept accepts a connection and returns the Telnet connection
-func (ts *Server) Accept() (*Conn, error) {
-	// #nosec: Errors unhandled.
-	conn, _ := ts.ln.Accept()
-	log.Info("connection received")
-	opts := connOpts{
-		conn:       conn,
-		Handlers:   ts.Handlers,
-		clientOpts: ts.ClientOptions,
-		fsm:        newFSM(),
-	}
-	tc := newConn(&opts)
-	go tc.writeLoop()
-	go tc.dataHandlerWrapper(tc.handlerWriter, tc.dataRW)
-	go tc.fsm.start()
-	go tc.startNegotiation()
-	return tc, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/trace/entry.go b/installer/vendor/github.com/vmware/vic/pkg/trace/entry.go
new file mode 100644
index 0000000000..504c030f3b
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/trace/entry.go
@@ -0,0 +1,45 @@
+// Copyright 2016 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package trace
+
+import (
+	"github.com/Sirupsen/logrus"
+)
+
+// Entry is like logrus.Entry, but for Operation. Functionality is added as needed.
+type Entry struct {
+	// Contains all the fields set by the user.
+	Data logrus.Fields
+
+	// A reference to the operation-local logger the entry was constructed for.
+	local *logrus.Logger
+}
+
+func (o *Operation) WithFields(fields logrus.Fields) *Entry {
+	entry := Entry{
+		Data:  fields,
+		local: o.Logger,
+	}
+
+	return &entry
+}
+
+func (e *Entry) Debug(args ...interface{}) {
+	Logger.WithFields(e.Data).Debug(args...)
+
+	if e.local != nil {
+		e.local.WithFields(e.Data).Debug(args...)
+	}
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/trace/operation.go b/installer/vendor/github.com/vmware/vic/pkg/trace/operation.go
index 826881834c..47e62a29ee 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/trace/operation.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/trace/operation.go
@@ -23,6 +23,8 @@ import (
 	"time"
 
 	"github.com/Sirupsen/logrus"
+
+	"github.com/vmware/govmomi/vim25/types"
 )
 
 type OperationKey string
@@ -31,12 +33,16 @@ const OpTraceKey OperationKey = "traceKey"
 
 var opIDPrefix = os.Getpid()
 
-// monotonic counter which inrements on Start()
+// opCount is a monotonic counter which increments on Start()
 var opCount uint64
 
 type Operation struct {
 	context.Context
 	operation
+
+	// Logger is used to configure an Operation-specific destination for log messages, in addition
+	// to the global logger. This logger is passed to any children which are created.
+	Logger *logrus.Logger
 }
 
 type operation struct {
@@ -52,7 +58,7 @@ func newOperation(ctx context.Context, id string, skip int, msg string) Operatio
 		id: id,
 
 		// Start the trace.
-		t: []Message{*newTrace(msg, skip)},
+		t: []Message{*newTrace(msg, skip, id)},
 	}
 
 	// We need to be able to identify this operation across API (and process)
@@ -61,6 +67,12 @@ func newOperation(ctx context.Context, id string, skip int, msg string) Operatio
 	// the operation itself as a value to the embedded context (it's circular)
 	ctx = context.WithValue(ctx, OpTraceKey, op)
 
+	// By adding the op.id any operations passed to govmomi will result
+	// in the op.id being logged in vSphere (vpxa / hostd) as the prefix to opID
+	// For example if the op.id was 299.16 hostd would show
+	// verbose hostd[12281B70] [Originator@6876 sub=PropertyProvider opID=299.16-5b05 user=root]
+	ctx = context.WithValue(ctx, types.ID{}, op.id)
+
 	o := Operation{
 		Context:   ctx,
 		operation: op,
@@ -71,9 +83,6 @@ func newOperation(ctx context.Context, id string, skip int, msg string) Operatio
 
 // Creates a header string to be printed.
 func (o *Operation) header() string {
-	if Logger.Level >= logrus.DebugLevel {
-		return fmt.Sprintf("op=%s (delta:%s)", o.id, o.t[0].delta())
-	}
 	return fmt.Sprintf("op=%s", o.id)
 }
 
@@ -88,7 +97,7 @@ func (o Operation) Err() error {
 		buf := &bytes.Buffer{}
 
 		// Add a frame for this Err call, then walk the stack
-		currFrame := newTrace("Err", 2)
+		currFrame := newTrace("Err", 2, o.id)
 		fmt.Fprintf(buf, "%s: %s error: %s\n", currFrame.funcName, o.t[0].msg, err)
 
 		// handle the carriage return
@@ -112,37 +121,102 @@ func (o Operation) Err() error {
 	return nil
 }
 
+func (o Operation) String() string {
+	return o.header()
+}
+
 func (o *Operation) ID() string {
 	return o.id
 }
 
 func (o *Operation) Infof(format string, args ...interface{}) {
-	Logger.Infof("%s: %s", o.header(), fmt.Sprintf(format, args...))
+	o.Info(fmt.Sprintf(format, args...))
+}
+
+func (o *Operation) Info(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Infof("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Info(msg)
+	}
 }
 
 func (o *Operation) Debugf(format string, args ...interface{}) {
-	Logger.Debugf("%s: %s", o.header(), fmt.Sprintf(format, args...))
+	o.Debug(fmt.Sprintf(format, args...))
+}
+
+func (o *Operation) Debug(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Debugf("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Debug(msg)
+	}
 }
 
 func (o *Operation) Warnf(format string, args ...interface{}) {
-	Logger.Warnf("%s: %s", o.header(), fmt.Sprintf(format, args...))
+	o.Warn(fmt.Sprintf(format, args...))
+}
+
+func (o *Operation) Warn(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Warnf("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Warn(msg)
+	}
 }
 
 func (o *Operation) Errorf(format string, args ...interface{}) {
-	Logger.Errorf("%s: %s", o.header(), fmt.Sprintf(format, args...))
+	o.Error(fmt.Sprintf(format, args...))
 }
 
-func (o *Operation) Error(err error) {
-	Logger.Errorf("%s: %s", o.header(), err.Error())
+func (o *Operation) Error(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Errorf("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Error(msg)
+	}
 }
 
 func (o *Operation) Panicf(format string, args ...interface{}) {
-	Logger.Panicf("%s: %s", o.header(), fmt.Sprintf(format, args...))
+	o.Panic(fmt.Sprintf(format, args...))
+}
+
+func (o *Operation) Panic(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Panicf("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Panic(msg)
+	}
+}
+
+func (o *Operation) Fatalf(format string, args ...interface{}) {
+	o.Fatal(fmt.Sprintf(format, args...))
+}
+
+func (o *Operation) Fatal(args ...interface{}) {
+	msg := fmt.Sprint(args...)
+
+	Logger.Fatalf("%s: %s", o.header(), msg)
+
+	if o.Logger != nil {
+		o.Logger.Fatal(msg)
+	}
 }
 
 func (o *Operation) newChild(ctx context.Context, msg string) Operation {
 	child := newOperation(ctx, o.id, 4, msg)
 	child.t = append(child.t, o.t...)
+	child.Logger = o.Logger
 	return child
 }
 
@@ -150,7 +224,7 @@ func opID(opNum uint64) string {
 	return fmt.Sprintf("%d.%d", opIDPrefix, opNum)
 }
 
-// Add tracing info to the context.
+// NewOperation will return a new operation with operationID added as a value to the context
 func NewOperation(ctx context.Context, format string, args ...interface{}) Operation {
 	o := newOperation(ctx, opID(atomic.AddUint64(&opCount, 1)), 3, fmt.Sprintf(format, args...))
 
@@ -159,6 +233,18 @@ func NewOperation(ctx context.Context, format string, args ...interface{}) Opera
 	return o
 }
 
+// NewOperationWithLoggerFrom will return a new operation with operationID added as a value to the
+// context and logging settings copied from the supplied operation.
+//
+// Deprecated: This method was added to aid in converting old code to use operation-based logging.
+//             Its use almost always indicates a broken context/operation model (e.g., a context
+//             being improperly stored in a struct instead of being passed between functions).
+func NewOperationWithLoggerFrom(ctx context.Context, oldOp Operation, format string, args ...interface{}) Operation {
+	op := NewOperation(ctx, format, args...)
+	op.Logger = oldOp.Logger
+	return op
+}
+
 // WithTimeout creates a new operation from parent with context.WithTimeout
 func WithTimeout(parent *Operation, timeout time.Duration, format string, args ...interface{}) (Operation, context.CancelFunc) {
 	ctx, cancelFunc := context.WithTimeout(parent.Context, timeout)
@@ -197,20 +283,36 @@ func FromOperation(parent Operation, format string, args ...interface{}) Operati
 	return parent.newChild(parent.Context, fmt.Sprintf(format, args...))
 }
 
-// FromContext unpacks the values in the ctx to create an Operation
-func FromContext(ctx context.Context) (Operation, error) {
-
-	o := Operation{
-		Context: ctx,
+// FromContext will return an Operation
+//
+// The Operation returned will be one of the following:
+//   The operation in the context value
+//   The operation passed as the context param
+//   A new operation
+func FromContext(ctx context.Context, message string, args ...interface{}) Operation {
+
+	// do we have an operation
+	if op, ok := ctx.(Operation); ok {
+		return op
 	}
 
-	op := ctx.Value(OpTraceKey)
-	switch val := op.(type) {
-	case operation:
-		o.operation = val
-	default:
-		return Operation{}, fmt.Errorf("not an Operation")
+	// do we have a context w/the op added as a value
+	if op, ok := ctx.Value(OpTraceKey).(operation); ok {
+		// ensure we have an initialized operation
+		if op.id == "" {
+			return NewOperation(ctx, message, args...)
+		}
+		// return an operation based off the context value
+		return Operation{
+			Context:   ctx,
+			operation: op,
+		}
 	}
 
-	return o, nil
+	op := newOperation(ctx, opID(atomic.AddUint64(&opCount, 1)), 3, fmt.Sprintf(message, args...))
+	frame := op.t[0]
+	Logger.Debugf("%s: [OperationFromContext] [%s:%d]", op.id, frame.funcName, frame.lineNo)
+
+	// return the new operation
+	return op
 }
diff --git a/installer/vendor/github.com/vmware/vic/pkg/trace/operation_test.go b/installer/vendor/github.com/vmware/vic/pkg/trace/operation_test.go
deleted file mode 100644
index 646e2b1b7b..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/trace/operation_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package trace
-
-import (
-	"bytes"
-	"context"
-	"fmt"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-func TestContextUnpack(t *testing.T) {
-	Logger.Level = logrus.DebugLevel
-
-	cnt := 100
-	wg := &sync.WaitGroup{}
-	wg.Add(cnt)
-	for i := 0; i < cnt; i++ {
-		go func(i int) {
-			defer wg.Done()
-			ctx := NewOperation(context.TODO(), "testmsg")
-
-			// unpack an Operation via the context using it's Values fields
-			c, err := FromContext(ctx)
-
-			if !assert.NoError(t, err) || !assert.NotNil(t, c) {
-				return
-			}
-			c.Infof("test info message %d", i)
-		}(i) // fix race in test
-	}
-	wg.Wait()
-}
-
-// If we timeout a child, test a stack is printed of contexts
-func TestNestedLogging(t *testing.T) {
-	// create a buf to check the log
-	buf := new(bytes.Buffer)
-	Logger.Out = buf
-
-	root := NewOperation(context.Background(), "root")
-
-	var ctxFunc func(parent Operation, level int) Operation
-
-	levels := 10
-	ctxFunc = func(parent Operation, level int) Operation {
-		if level == levels {
-			return parent
-		}
-
-		child, _ := WithDeadline(&parent, time.Time{}, fmt.Sprintf("level %d", level))
-
-		return ctxFunc(child, level+1)
-	}
-
-	child := ctxFunc(root, 0)
-
-	// Assert the child has an error and prints a stack.  The parent doesn't
-	// see this and should not have an error.  Only cancelation trickles up the
-	// stack to the parent.
-	if !assert.NoError(t, root.Err()) || !assert.Error(t, child.Err()) {
-		return
-	}
-
-	// Assert we got a stack trace in the log
-	log := buf.String()
-	lines := strings.Count(log, "\n")
-	t.Log(log)
-
-	// Sample stack
-	//
-	//        ERRO[0000] op=21598.101: github.com/vmware/vic/pkg/trace.TestNestedLogging: level 9 error: context deadline exceeded
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 9
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 8
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 7
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 6
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 5
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 4
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 3
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 2
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 1
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging.func1:71 level 0
-	//                        github.com/vmware/vic/pkg/trace.TestNestedLogging:61 root
-
-	// We arrive at 2 because we have the err line (line 0), then the root
-	// (line 11) of where we created the ctx.
-	if assert.False(t, lines < levels) {
-		t.Logf("exepected at least %d and got %d", levels, lines)
-		return
-	}
-}
-
-// Just checking behavior of the context package
-func TestSanity(t *testing.T) {
-	Logger.Level = logrus.InfoLevel
-	levels := 10
-
-	root, cancel := context.WithDeadline(context.Background(), time.Time{})
-	defer cancel()
-
-	var ctxFunc func(parent context.Context, level int) context.Context
-
-	ctxFunc = func(parent context.Context, level int) context.Context {
-		if level == levels {
-			return parent
-		}
-
-		child, cancel := context.WithDeadline(parent, time.Now().Add(time.Hour))
-		defer cancel()
-
-		return ctxFunc(child, level+1)
-	}
-
-	child := ctxFunc(root, 0)
-
-	if !assert.Error(t, child.Err()) {
-		t.FailNow()
-	}
-
-	err := root.Err()
-	if !assert.Error(t, err) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/trace/trace.go b/installer/vendor/github.com/vmware/vic/pkg/trace/trace.go
index e29b33c257..9ee87b0ae8 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/trace/trace.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/trace/trace.go
@@ -15,12 +15,16 @@
 package trace
 
 import (
+	"context"
+	"fmt"
 	"os"
 	"runtime"
+	"strings"
 	"time"
 
 	"github.com/Sirupsen/logrus"
 
+	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/vic/pkg/log"
 )
 
@@ -47,9 +51,10 @@ var Logger = &logrus.Logger{
 
 // trace object used to grab run-time state
 type Message struct {
-	msg      string
-	funcName string
-	lineNo   int
+	msg         string
+	funcName    string
+	lineNo      int
+	operationID string
 
 	startTime time.Time
 }
@@ -61,31 +66,62 @@ func (t *Message) delta() time.Duration {
 	return time.Now().Sub(t.startTime)
 }
 
+// Add Syslog hook
+// This method is not thread safe, this is currently
+// not a problem because it is only called once from main
+func InitLogger(cfg *log.LoggingConfig) error {
+	hook, err := log.CreateSyslogHook(cfg)
+	if err == nil && hook != nil {
+		Logger.Hooks.Add(hook)
+	}
+	return err
+}
+
 // begin a trace from this stack frame less the skip.
-func newTrace(msg string, skip int) *Message {
+func newTrace(msg string, skip int, opID string) *Message {
 	pc, _, line, ok := runtime.Caller(skip)
 	if !ok {
 		return nil
 	}
 
-	name := runtime.FuncForPC(pc).Name()
+	// lets only return the func name from the repo (vic)
+	// down - i.e. vic/lib/etc vs. github.com/vmware/vic/lib/etc
+	// if github.com/vmware doesn't match then the original is returned
+	name := strings.TrimPrefix(runtime.FuncForPC(pc).Name(), "github.com/vmware/")
+
+	message := Message{
+		msg:      msg,
+		funcName: name,
+		lineNo:   line,
 
-	return &Message{
-		msg:       msg,
-		funcName:  name,
-		lineNo:    line,
 		startTime: time.Now(),
 	}
+
+	// if we have an operationID then format the output
+	if opID != "" {
+		message.operationID = fmt.Sprintf("op=%s", opID)
+	}
+
+	return &message
 }
 
 // Begin starts the trace.  Msg is the msg to log.
-func Begin(msg string) *Message {
+// context provided to allow tracing of operationID
+// context added as optional to avoid breaking current usage
+func Begin(msg string, ctx ...context.Context) *Message {
 	if tracingEnabled && Logger.Level >= logrus.DebugLevel {
-		if t := newTrace(msg, 2); t != nil {
+		var opID string
+		// populate operationID if provided
+		if len(ctx) == 1 {
+			if id, ok := ctx[0].Value(types.ID{}).(string); ok {
+				opID = id
+			}
+		}
+		if t := newTrace(msg, 2, opID); t != nil {
 			if msg == "" {
-				Logger.Debugf("[BEGIN] [%s:%d]", t.funcName, t.lineNo)
+				Logger.Debugf("[BEGIN] %s [%s:%d]", t.operationID, t.funcName, t.lineNo)
 			} else {
-				Logger.Debugf("[BEGIN] [%s:%d] %s", t.funcName, t.lineNo, t.msg)
+				Logger.Debugf("[BEGIN] %s [%s:%d] %s", t.operationID, t.funcName, t.lineNo, t.msg)
 			}
 			return t
 
@@ -99,5 +135,5 @@ func End(t *Message) {
 	if t == nil {
 		return
 	}
-	Logger.Debugf("[ END ] [%s:%d] [%s] %s", t.funcName, t.lineNo, t.delta(), t.msg)
+	Logger.Debugf("[ END ] %s [%s:%d] [%s] %s", t.operationID, t.funcName, t.lineNo, t.delta(), t.msg)
 }
diff --git a/installer/vendor/github.com/vmware/vic/pkg/uid/uid.go b/installer/vendor/github.com/vmware/vic/pkg/uid/uid.go
deleted file mode 100644
index 3692974171..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/uid/uid.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package uid
-
-import (
-	"regexp"
-
-	"github.com/docker/docker/pkg/stringid"
-)
-
-// UID is a unique id
-type UID string
-
-// NilUID is a placeholder for an empty ID
-const NilUID UID = UID("")
-
-var (
-	idRegex      = regexp.MustCompile("^[0-9a-f]{64}$")
-	shortIDRegex = regexp.MustCompile("^[0-9a-f]{12}$")
-)
-
-// New generates a UID
-func New() UID {
-	return Parse(stringid.GenerateNonCryptoID())
-}
-
-// Parse converts a string to UID
-func Parse(u string) UID {
-	if idRegex.MatchString(u) || shortIDRegex.MatchString(u) {
-		return UID(u)
-	}
-
-	return NilUID
-}
-
-// Truncate returns the truncated UID
-func (u UID) Truncate() UID {
-	return Parse(stringid.TruncateID(string(u)))
-}
-
-// String converts a UID to a string
-func (u UID) String() string {
-	return string(u)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/uid/uid_test.go b/installer/vendor/github.com/vmware/vic/pkg/uid/uid_test.go
deleted file mode 100644
index 188c249e59..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/uid/uid_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package uid
-
-import "testing"
-import "github.com/stretchr/testify/assert"
-
-func TestParse(t *testing.T) {
-	// valid ids
-	var tests = []string{
-		"abcdef01234567890123456789abcdefabcdef01234567890123456789abcdef",
-		"abcdefabcdef", // short id
-	}
-
-	for _, te := range tests {
-		id := Parse(te)
-		assert.NotEqual(t, id, NilUID)
-		assert.Equal(t, te, id.String())
-	}
-
-	// invalid ids
-	tests = []string{
-		"foobar",
-		"",
-		"abcde",
-		"abcdefe",
-		"abcdef01234567890123456789abcdefabcdef01234567890123456789abcdefe",
-		"abcdef01234567890123456789abcdefabcdef01234567890123456789abcde",
-	}
-
-	for _, te := range tests {
-		id := Parse(te)
-		assert.Equal(t, id, NilUID)
-	}
-
-}
-
-func TestTruncate(t *testing.T) {
-	var tests = []struct {
-		in, out UID
-	}{
-		{Parse("abcdef01234567890123456789abcdefabcdef01234567890123456789abcdef"), Parse("abcdef012345")},
-		{Parse("abcdefabcdef"), Parse("abcdefabcdef")},
-		{NilUID, NilUID},
-	}
-
-	for _, te := range tests {
-		assert.Equal(t, te.out, te.in.Truncate())
-	}
-
-}
-
-func TestNew(t *testing.T) {
-	assert.NotEqual(t, NilUID, New())
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/version/version.go b/installer/vendor/github.com/vmware/vic/pkg/version/version.go
index 6960ba4d32..5abc2ae225 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/version/version.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/version/version.go
@@ -101,6 +101,10 @@ func (v *Build) String() string {
 }
 
 func (v *Build) ShortVersion() string {
+	if v == nil {
+		return "unknown"
+	}
+
 	return fmt.Sprintf("%s-%s-%s", v.Version, v.BuildNumber, v.GitCommit)
 }
 
diff --git a/installer/vendor/github.com/vmware/vic/pkg/version/version_test.go b/installer/vendor/github.com/vmware/vic/pkg/version/version_test.go
deleted file mode 100644
index 8be27443dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/version/version_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package version
-
-import (
-	"errors"
-	"testing"
-)
-
-var (
-	a = &Build{
-		Version:     "v1.2.3",
-		GitCommit:   "aaaaaaa",
-		BuildDate:   "2009/11/10@23:00:00",
-		BuildNumber: "10",
-		State:       "",
-	}
-
-	b = &Build{
-		Version:     "v1.2.3",
-		GitCommit:   "bbbbbbb",
-		BuildDate:   "2009/11/10@23:00:01",
-		BuildNumber: "10",
-		State:       "",
-	}
-
-	c = &Build{
-		Version:     "v1.2.4",
-		GitCommit:   "aaaaaaa",
-		BuildDate:   "2009/11/10@23:00:00",
-		BuildNumber: "10",
-		State:       "",
-	}
-
-	d = &Build{
-		Version:     "v1.2.3",
-		GitCommit:   "aaaaaaa",
-		BuildDate:   "2009/11/10@23:00:00",
-		BuildNumber: "11",
-		State:       "",
-	}
-
-	e = &Build{
-		Version:     "v1.2.3",
-		GitCommit:   "aaaaaaa",
-		BuildDate:   "2009/11/10@23:00:00",
-		BuildNumber: "",
-		State:       "",
-	}
-
-	f = &Build{
-		Version:     "v1.2.3",
-		GitCommit:   "aaaaaaa",
-		BuildDate:   "2009/11/10@23:00:00",
-		BuildNumber: "wow",
-		State:       "",
-	}
-)
-
-func TestEqual(t *testing.T) {
-	var tests = []struct {
-		b1, b2   *Build
-		expected bool
-	}{
-		{a, a, true},
-		{a, b, true},
-		{a, c, true},
-		{a, d, false},
-	}
-
-	for _, te := range tests {
-		res := te.b1.Equal(te.b2)
-		if res != te.expected {
-			t.Errorf("%s %s Got: %t Expected: %t", te.b1, te.b2, res, te.expected)
-		}
-	}
-}
-
-func TestIsOlder(t *testing.T) {
-	var tests = []struct {
-		b1, b2      *Build
-		expected    bool
-		expectedErr error
-	}{
-		{a, a, false, nil},
-		{a, b, false, nil},
-		{a, c, false, nil},
-		{a, d, true, nil},
-		{a, e, false, errors.New("")},
-		{a, f, false, errors.New("")},
-	}
-
-	for _, te := range tests {
-		res, err := te.b1.IsOlder(te.b2)
-		if te.expectedErr != nil {
-			if err == nil {
-				t.Errorf("%s %s Got error: %s Expected error: %s", te.b1, te.b2, err, te.expectedErr)
-			}
-		}
-
-		if res != te.expected {
-			t.Errorf("%s %s Got: %t Expected: %t", te.b1, te.b2, res, te.expected)
-		}
-	}
-}
-
-func TestIsNewer(t *testing.T) {
-	var tests = []struct {
-		b1, b2      *Build
-		expected    bool
-		expectedErr error
-	}{
-		{a, a, false, nil},
-		{a, b, false, nil},
-		{b, a, false, nil},
-		{a, c, false, nil},
-		{c, a, false, nil},
-		{a, d, false, nil},
-		{d, a, true, nil},
-		{a, e, false, errors.New("")},
-		{a, f, false, errors.New("")},
-	}
-
-	for _, te := range tests {
-		res, err := te.b1.IsNewer(te.b2)
-		if te.expectedErr != nil {
-			if err == nil {
-				t.Errorf("%s %s Got error: %s Expected error: %s", te.b1, te.b2, err, te.expectedErr)
-			}
-		}
-
-		if res != te.expected {
-			t.Errorf("%s %s Got: %t Expected: %t", te.b1, te.b2, res, te.expected)
-		}
-	}
-}
-
-func TestUserAgent(t *testing.T) {
-	for _, v := range []string{"0.0.1", "v0.0.1"} {
-		Version = v
-
-		a := UserAgent("foo")
-		if a != "foo/0.0.1" {
-			t.Error(a)
-		}
-	}
-
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/cluster.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/cluster.go
new file mode 100644
index 0000000000..7b83199161
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/cluster.go
@@ -0,0 +1,46 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package compute
+
+import (
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+type Cluster struct {
+	*object.ClusterComputeResource
+}
+
+func NewCluster(compute object.ComputeResource) *Cluster {
+	// ensure we have a cluster
+	if compute.Reference().Type != "ClusterComputeResource" {
+		return nil
+	}
+
+	return &Cluster{
+		&object.ClusterComputeResource{
+			ComputeResource: compute,
+		},
+	}
+}
+
+// DRSEnabled returns a bool indicating if DRS is enabled
+func (c *Cluster) DRSEnabled(op trace.Operation) (bool, error) {
+	config, err := c.Configuration(op)
+	if err != nil {
+		return false, err
+	}
+	return *config.DrsConfig.Enabled, nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/placement.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/placement.go
new file mode 100644
index 0000000000..faed020c0f
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/placement.go
@@ -0,0 +1,33 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package placement
+
+import (
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+// HostPlacementPolicy defines the interface for using metrics to decide the appropriate host
+// for a VM based on host metrics and VM provisioned resources.
+type HostPlacementPolicy interface {
+	// TODO(jzt): refactor to consider vm resource needs in the future
+	// CheckHost checks whether or not the host a VM was created on is adequate for power-on.
+	CheckHost(trace.Operation, *object.VirtualMachine) bool
+
+	// RecommendHost recommends an ordered list of hosts on which a VM
+	// may be placed prior to power-on. The list is ordered from more
+	// ideal to less ideal based on weighted host metrics.
+	RecommendHost(trace.Operation, []*object.HostSystem) ([]*object.HostSystem, error)
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/random.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/random.go
new file mode 100644
index 0000000000..1f6c891f5b
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/random.go
@@ -0,0 +1,61 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package placement
+
+import (
+	"math/rand"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+// RandomHostPolicy chooses a random host on which to power-on a VM.
+type RandomHostPolicy struct {
+	cluster *object.ComputeResource
+}
+
+// NewRandomHostPolicy returns a RandomHostPolicy instance.
+func NewRandomHostPolicy(op trace.Operation, cls *object.ComputeResource) (*RandomHostPolicy, error) {
+	return &RandomHostPolicy{cluster: cls}, nil
+}
+
+// CheckHost always returns false in a RandomHostPolicy.
+func (p *RandomHostPolicy) CheckHost(op trace.Operation, vm *object.VirtualMachine) bool {
+	return false
+}
+
+// RecommendHost recommends a random host on which to place a newly created VM. As this
+// HostPlacementPolicy implementation does not rely on host metrics in its recommendation
+// logic, hosts that are disconnected or in maintenance mode are not filtered from the
+// returned list. Subsequent attempts to relocate to one of these hosts should result in
+// the host being removed from the list and the resulting subset being used in a new call
+// to RecommendHost.
+func (p *RandomHostPolicy) RecommendHost(op trace.Operation, hosts []*object.HostSystem) ([]*object.HostSystem, error) {
+	var err error
+	if hosts == nil {
+		hosts, err = p.cluster.Hosts(op)
+		if err != nil {
+			return nil, err
+		}
+	}
+
+	// shuffle hosts
+	for i := range hosts {
+		j := rand.Intn(i + 1)
+		hosts[i], hosts[j] = hosts[j], hosts[i]
+	}
+
+	return hosts, nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked.go
new file mode 100644
index 0000000000..3dca05aec6
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked.go
@@ -0,0 +1,137 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package placement
+
+import (
+	"fmt"
+	"sort"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/performance"
+)
+
+type rankedHost struct {
+	*performance.HostMetricsInfo
+
+	HostReference string
+	score         float64
+}
+
+// rankedHosts implements the sort.Sort interface:
+// see https://golang.org/pkg/sort/#Interface
+type rankedHosts []rankedHost
+
+func (r rankedHosts) Len() int           { return len(r) }
+func (r rankedHosts) Swap(i, j int)      { r[i], r[j] = r[j], r[i] }
+func (r rankedHosts) Less(i, j int) bool { return r[i].score > r[j].score }
+
+// WeightConfiguration holds weights for different host metrics. These weights are
+// used to determine a host ranking.
+type WeightConfiguration struct {
+	memUnconsumedWeight float64
+	memInactiveWeight   float64
+}
+
+// RankedHostPolicy uses data from a MetricsProvider to decide on which host to power-on a VM.
+type RankedHostPolicy struct {
+	cluster *object.ComputeResource
+	source  performance.MetricsProvider
+	config  WeightConfiguration
+}
+
+// NewRankedHostPolicy returns a RandomHostPolicy instance using the supplied MetricsProvider with
+// the default weighting configuration.
+func NewRankedHostPolicy(op trace.Operation, cls *object.ComputeResource, mp performance.MetricsProvider) (*RankedHostPolicy, error) {
+	return NewRankedHostPolicyWithConfig(op, cls, mp, WeightConfiguration{
+		memInactiveWeight:   memDefaultInactiveWeight,
+		memUnconsumedWeight: memDefaultUnconsumedWeight,
+	})
+}
+
+// NewRankedHostPolicyWithConfig returns a RandomHostPolicy instance using the supplied MetricsProvider and
+// WeightConfiguration.
+func NewRankedHostPolicyWithConfig(op trace.Operation, cls *object.ComputeResource, mp performance.MetricsProvider, wc WeightConfiguration) (*RankedHostPolicy, error) {
+	return &RankedHostPolicy{
+		cluster: cls,
+		source:  mp,
+		config:  wc,
+	}, nil
+}
+
+// CheckHost returns true if the host has adequate capacity to power on the VM, false otherwise.
+func (r *RankedHostPolicy) CheckHost(op trace.Operation, vm *object.VirtualMachine) bool {
+	// TODO(jzt): return false until we have host checking logic decided
+	// see https://github.com/vmware/vic/issues/7654
+	return false
+}
+
+// RecommendHost returns an ordered list of the supplied hosts, ranked by current performance
+// metrics and weighting configuration. The front of the list is more ideal, the end of the
+// list is less ideal, with regard to choosing the optimal host on which to power-on a VM.
+func (r *RankedHostPolicy) RecommendHost(op trace.Operation, hosts []*object.HostSystem) ([]*object.HostSystem, error) {
+	var (
+		err error
+		hm  map[string]*performance.HostMetricsInfo
+	)
+
+	if len(hosts) == 0 {
+		op.Debugf("no hosts specified - gathering metrics on cluster")
+		hm, err = r.source.GetMetricsForComputeResource(op, r.cluster)
+	} else {
+		hm, err = r.source.GetMetricsForHosts(op, hosts)
+	}
+	if err != nil {
+		return nil, err
+	}
+
+	if len(hm) == 0 {
+		return nil, fmt.Errorf("no candidate hosts to rank")
+	}
+
+	ranked := r.rankHosts(op, hm)
+	result := make([]*object.HostSystem, 0, len(ranked))
+	for _, h := range ranked {
+		ref := types.ManagedObjectReference{}
+		if ok := ref.FromString(h.HostReference); !ok {
+			return nil, fmt.Errorf("could not restore serialized managed object reference: %s", h.HostReference)
+		}
+
+		result = append(result, object.NewHostSystem(r.cluster.Client(), ref))
+	}
+
+	return result, nil
+}
+
+func (r *RankedHostPolicy) rankHosts(op trace.Operation, hm map[string]*performance.HostMetricsInfo) []rankedHost {
+	ranking := []rankedHost{}
+	for h, m := range hm {
+		rh := rankedHost{
+			HostReference:   h,
+			HostMetricsInfo: m,
+			score:           r.rankMemory(m) * (1.0 - (m.CPU.UsagePercent / 100.0)),
+		}
+		ranking = append(ranking, rh)
+	}
+	sort.Sort(rankedHosts(ranking))
+	return ranking
+}
+
+func (r *RankedHostPolicy) rankMemory(hm *performance.HostMetricsInfo) float64 {
+	free := float64(hm.Memory.TotalKB - hm.Memory.ConsumedKB)
+	inactive := float64(hm.Memory.TotalKB - hm.Memory.ActiveKB)
+	return free*r.config.memUnconsumedWeight + inactive*r.config.memInactiveWeight
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked_defaults.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked_defaults.go
new file mode 100644
index 0000000000..6192ae6902
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/placement/ranked_defaults.go
@@ -0,0 +1,26 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package placement
+
+const (
+	// These default values serve as a simple weighting approach towards unconsumed vs. inactive memory.
+	// They are basically an initial arbitrary guess with the intention of preferring a host with more
+	// unconsumed memory vs. one with more active memory.
+
+	// memDefaultInactiveWeight defines the default value used to weight inactive memory when ranking hosts by metric.
+	memDefaultInactiveWeight = 0.3
+	// memDefaultUnconsumedWeight defines the default value used to weight unconsumed memory when ranking hosts by metric.
+	memDefaultUnconsumedWeight = 0.7
+)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp.go
index d7b620be26..eb136640e8 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp.go
@@ -15,8 +15,6 @@
 package compute
 
 import (
-	log "github.com/Sirupsen/logrus"
-
 	"context"
 
 	"github.com/vmware/govmomi/object"
@@ -24,6 +22,7 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 
 	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/vsphere/session"
 	"github.com/vmware/vic/pkg/vsphere/vm"
 )
@@ -47,26 +46,37 @@ func NewResourcePool(ctx context.Context, session *session.Session, moref types.
 	}
 }
 
-func (rp *ResourcePool) GetChildrenVMs(ctx context.Context, s *session.Session) ([]*vm.VirtualMachine, error) {
-	var err error
+// VM returns a slice of MoRefs that are the virtual machines of the provided resource pool
+func VM(op trace.Operation, session *session.Session, pool *object.ResourcePool) ([]types.ManagedObjectReference, error) {
 	var mrp mo.ResourcePool
-	var vms []*vm.VirtualMachine
-
-	if err = rp.Properties(ctx, rp.Reference(), []string{"vm"}, &mrp); err != nil {
-		log.Errorf("Unable to get children vm of resource pool %s: %s", rp.Name(), err)
-		return vms, err
+	err := session.Retrieve(op, []types.ManagedObjectReference{pool.Reference()}, []string{"vm"}, &mrp)
+	if err != nil {
+		op.Errorf("Error retrieving VMs for resource pool %s: %s", pool.Name(), err)
+		return nil, err
 	}
+	return mrp.Vm, nil
+}
 
-	for _, o := range mrp.Vm {
-		v := vm.NewVirtualMachine(ctx, s, o)
+// GetChildrenVMs returns a slice of VirtualMachines that are the pools VMs
+func (rp *ResourcePool) GetChildrenVMs(op trace.Operation) ([]*vm.VirtualMachine, error) {
+	var vms []*vm.VirtualMachine
+	refs, err := VM(op, rp.Session, rp.ResourcePool)
+	if err != nil {
+		return nil, err
+	}
+	for _, o := range refs {
+		v := vm.NewVirtualMachine(op, rp.Session, o)
 		vms = append(vms, v)
 	}
 	return vms, nil
 }
 
-func (rp *ResourcePool) GetChildVM(ctx context.Context, s *session.Session, name string) (*vm.VirtualMachine, error) {
-	searchIndex := object.NewSearchIndex(s.Client.Client)
-	child, err := searchIndex.FindChild(ctx, rp.Reference(), name)
+// GetChildVM searches the pool for a VM by name and returns a VirtualMachine
+func (rp *ResourcePool) GetChildVM(ctx context.Context, name string) (*vm.VirtualMachine, error) {
+	op := trace.FromContext(ctx, name)
+
+	searchIndex := object.NewSearchIndex(rp.Vim25())
+	child, err := searchIndex.FindChild(op, rp.Reference(), name)
 	if err != nil {
 		return nil, errors.Errorf("Unable to find VM(%s): %s", name, err.Error())
 	}
@@ -74,37 +84,41 @@ func (rp *ResourcePool) GetChildVM(ctx context.Context, s *session.Session, name
 		return nil, nil
 	}
 	// instantiate the vm object
-	return vm.NewVirtualMachine(ctx, s, child.Reference()), nil
+	return vm.NewVirtualMachine(op, rp.Session, child.Reference()), nil
 }
 
 func (rp *ResourcePool) GetCluster(ctx context.Context) (*object.ComputeResource, error) {
+	op := trace.FromContext(ctx, rp.Name())
+
 	var err error
 	var mrp mo.ResourcePool
 
-	if err = rp.Properties(ctx, rp.Reference(), []string{"owner"}, &mrp); err != nil {
-		log.Errorf("Unable to get cluster of resource pool %s: %s", rp.Name(), err)
+	if err = rp.Properties(op, rp.Reference(), []string{"owner"}, &mrp); err != nil {
+		op.Errorf("Unable to get cluster of resource pool %s: %s", rp.Name(), err)
 		return nil, err
 	}
 
-	return object.NewComputeResource(rp.Client.Client, mrp.Owner), nil
+	return object.NewComputeResource(rp.Vim25(), mrp.Owner), nil
 }
 
 func (rp *ResourcePool) GetDatacenter(ctx context.Context) (*object.Datacenter, error) {
-	dcRef, err := rp.getLowestAncestor(ctx, "Datacenter")
+	op := trace.FromContext(ctx, rp.Name())
+
+	dcRef, err := rp.getLowestAncestor(op, "Datacenter")
 	if err != nil || dcRef == nil {
-		log.Errorf("Unable to get datacenter ancestor of rp %s: %s", rp.Name(), err)
+		op.Errorf("Unable to get datacenter ancestor of rp %s: %s", rp.Name(), err)
 		return nil, errors.Errorf("Unable to get datacenter ancestor of rp %s: %s", rp.Name(), err)
 	}
 
-	return object.NewDatacenter(rp.Client.Client, *dcRef), nil
+	return object.NewDatacenter(rp.Vim25(), *dcRef), nil
 }
 
-func (rp *ResourcePool) getAncestors(ctx context.Context, inType string) ([]types.ManagedObjectReference, error) {
+func (rp *ResourcePool) getAncestors(op trace.Operation, inType string) ([]types.ManagedObjectReference, error) {
 	client := rp.Session.Vim25()
 
-	ancestors, err := mo.Ancestors(ctx, client, client.ServiceContent.PropertyCollector, rp.Reference())
+	ancestors, err := mo.Ancestors(op, client, client.ServiceContent.PropertyCollector, rp.Reference())
 	if err != nil {
-		log.Errorf("Unable to get ancestors of rp %s: %s", rp.Name(), err)
+		op.Errorf("Unable to get ancestors of rp %s: %s", rp.Name(), err)
 		return nil, err
 	}
 
@@ -119,10 +133,10 @@ func (rp *ResourcePool) getAncestors(ctx context.Context, inType string) ([]type
 	return outAncestors, nil
 }
 
-func (rp *ResourcePool) getLowestAncestor(ctx context.Context, inType string) (*types.ManagedObjectReference, error) {
-	ancestors, err := rp.getAncestors(ctx, inType)
+func (rp *ResourcePool) getLowestAncestor(op trace.Operation, inType string) (*types.ManagedObjectReference, error) {
+	ancestors, err := rp.getAncestors(op, inType)
 	if err != nil {
-		log.Errorf("Unable to get ancestors of rp %s: %s", rp.Name(), err)
+		op.Errorf("Unable to get ancestors of rp %s: %s", rp.Name(), err)
 		return nil, err
 	}
 
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp_test.go
deleted file mode 100644
index 8c5d613244..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/compute/rp_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package compute
-
-import (
-	"context"
-	"net/url"
-	"testing"
-
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/test"
-)
-
-func TestRp(t *testing.T) {
-
-	ctx := context.Background()
-
-	for i, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		t.Logf("%d", i)
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		s.URL.User = url.UserPassword("user", "pass")
-		t.Logf("server URL: %s", s.URL)
-
-		var sess *session.Session
-		if i == 0 {
-			sess, err = test.SessionWithESX(ctx, s.URL.String())
-		} else {
-			sess, err = test.SessionWithVPX(ctx, s.URL.String())
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer sess.Logout(ctx)
-		testGetChildrenVMs(ctx, sess, t)
-		testGetChildVM(ctx, sess, t)
-		testGetCluster(ctx, sess, t)
-		testGetDatacenter(ctx, sess, t)
-	}
-}
-
-func testGetChildrenVMs(ctx context.Context, sess *session.Session, t *testing.T) {
-	rp := NewResourcePool(ctx, sess, sess.Pool.Reference())
-	vms, err := rp.GetChildrenVMs(ctx, sess)
-	if err != nil {
-		t.Errorf("Failed to get children vm of resource pool %s, %s", rp.Name(), err)
-	}
-	//	if vms == nil || len(vms) == 0 {
-	//		t.Error("Didn't get children VM")
-	//	}
-	for _, vm := range vms {
-		t.Logf("vm: %s", vm)
-	}
-}
-
-func testGetChildVM(ctx context.Context, sess *session.Session, t *testing.T) {
-	rp := NewResourcePool(ctx, sess, sess.Pool.Reference())
-	vm, err := rp.GetChildVM(ctx, sess, "random")
-	if err == nil && vm != nil {
-		t.Logf("vm: %s", vm.Reference())
-		t.Errorf("Should not find VM random")
-	}
-}
-
-func testGetCluster(ctx context.Context, sess *session.Session, t *testing.T) {
-	rp := NewResourcePool(ctx, sess, sess.Pool.Reference())
-	cluster, err := rp.GetCluster(ctx)
-	if err != nil {
-		t.Logf("Failed to owner cluster: %s", err)
-		t.Errorf("Should get owner")
-	}
-	t.Logf("Cluster: %s", cluster)
-}
-
-func testGetDatacenter(ctx context.Context, sess *session.Session, t *testing.T) {
-	rp := NewResourcePool(ctx, sess, sess.Pool.Reference())
-	datacenter, err := rp.GetDatacenter(ctx)
-	if err != nil {
-		t.Logf("Failed to find parent Datacenter: %s", err)
-		t.Errorf("Should get Datacenter")
-	}
-	t.Logf("Datacenter: %s", datacenter)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore.go
index de0faee7f2..4dd8a272b1 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore.go
@@ -25,13 +25,13 @@ import (
 	"regexp"
 	"strings"
 
-	log "github.com/Sirupsen/logrus"
 	"github.com/google/uuid"
 
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/vsphere/session"
 	"github.com/vmware/vic/pkg/vsphere/tasks"
 )
@@ -58,6 +58,7 @@ type Helper struct {
 // rootdir is the top level directory to root all data.  If root does not exist,
 // it will be created.  If it already exists, NOOP. This cannot be empty.
 func NewHelper(ctx context.Context, s *session.Session, ds *object.Datastore, rootdir string) (*Helper, error) {
+	op := trace.FromContext(ctx, "NewHelper")
 
 	d := &Helper{
 		ds: ds,
@@ -69,8 +70,8 @@ func NewHelper(ctx context.Context, s *session.Session, ds *object.Datastore, ro
 		rootdir = rootdir[1:]
 	}
 
-	if err := d.mkRootDir(ctx, rootdir); err != nil {
-		log.Infof("error creating root directory %s: %s", rootdir, err)
+	if err := d.mkRootDir(op, rootdir); err != nil {
+		op.Infof("error creating root directory %s: %s", rootdir, err)
 		return nil, err
 	}
 
@@ -78,7 +79,7 @@ func NewHelper(ctx context.Context, s *session.Session, ds *object.Datastore, ro
 		return nil, fmt.Errorf("failed to create root directory")
 	}
 
-	log.Infof("Datastore path is %s", d.RootURL.String())
+	op.Infof("Datastore path is %s", d.RootURL.String())
 	return d, nil
 }
 
@@ -134,18 +135,18 @@ func (d *Helper) Summary(ctx context.Context) (*types.DatastoreSummary, error) {
 	return &mds.Summary, nil
 }
 
-func mkdir(ctx context.Context, sess *session.Session, fm *object.FileManager, createParentDirectories bool, path string) (string, error) {
-	log.Infof("Creating directory %s", path)
+func mkdir(op trace.Operation, sess *session.Session, fm *object.FileManager, createParentDirectories bool, path string) (string, error) {
+	op.Infof("Creating directory %s", path)
 
-	if err := fm.MakeDirectory(ctx, path, sess.Datacenter, createParentDirectories); err != nil {
+	if err := fm.MakeDirectory(op, path, sess.Datacenter, createParentDirectories); err != nil {
 		if soap.IsSoapFault(err) {
 			soapFault := soap.ToSoapFault(err)
 			if _, ok := soapFault.VimFault().(types.FileAlreadyExists); ok {
-				log.Debugf("File already exists: %s", path)
+				op.Debugf("File already exists: %s", path)
 				return "", os.ErrExist
 			}
 		}
-		log.Debugf("Creating %s error: %s", path, err)
+		op.Debugf("Creating %s error: %s", path, err)
 		return "", err
 	}
 
@@ -154,10 +155,13 @@ func mkdir(ctx context.Context, sess *session.Session, fm *object.FileManager, c
 
 // Mkdir creates directories.
 func (d *Helper) Mkdir(ctx context.Context, createParentDirectories bool, dirs ...string) (string, error) {
-	return mkdir(ctx, d.s, d.fm, createParentDirectories, path.Join(d.RootURL.String(), path.Join(dirs...)))
+	op := trace.FromContext(ctx, "Mkdir")
+
+	return mkdir(op, d.s, d.fm, createParentDirectories, path.Join(d.RootURL.String(), path.Join(dirs...)))
 }
 
-// Ls returns a list of dirents at the given path (relative to root)
+// Ls returns a list of dirents at the given path (relative to root), given a search pattern
+// (default to all files under the path if no pattern is provided)
 //
 // A note aboutpaths and the datastore browser.
 // None of these work paths work
@@ -176,9 +180,13 @@ func (d *Helper) Mkdir(ctx context.Context, createParentDirectories bool, dirs .
 // The only URI that works on VC + VSAN.
 // r, err := ds.Ls(ctx, "[vsanDatastore] /0ea65357-0494-d42d-2ede-000c292dc5b5")
 //
-func (d *Helper) Ls(ctx context.Context, p string) (*types.HostDatastoreBrowserSearchResults, error) {
+func (d *Helper) Ls(ctx context.Context, p string, match ...string) (*types.HostDatastoreBrowserSearchResults, error) {
+	if len(match) == 0 {
+		match = []string{"*"}
+	}
+
 	spec := types.HostDatastoreBrowserSearchSpec{
-		MatchPattern: []string{"*"},
+		MatchPattern: match,
 		Details: &types.FileQueryFlags{
 			FileType:  true,
 			FileOwner: types.NewBool(true),
@@ -257,9 +265,11 @@ func (d *Helper) Stat(ctx context.Context, pth string) (types.BaseFileInfo, erro
 }
 
 func (d *Helper) Mv(ctx context.Context, fromPath, toPath string) error {
+	op := trace.FromContext(ctx, "Mv")
+
 	from := path.Join(d.RootURL.String(), fromPath)
 	to := path.Join(d.RootURL.String(), toPath)
-	log.Infof("Moving %s to %s", from, to)
+	op.Infof("Moving %s to %s", from, to)
 	err := tasks.Wait(ctx, func(context.Context) (tasks.Task, error) {
 		return d.fm.MoveDatastoreFile(ctx, from, d.s.Datacenter, to, d.s.Datacenter, true)
 	})
@@ -268,8 +278,10 @@ func (d *Helper) Mv(ctx context.Context, fromPath, toPath string) error {
 }
 
 func (d *Helper) Rm(ctx context.Context, pth string) error {
+	op := trace.FromContext(ctx, "Rm")
+
 	f := path.Join(d.RootURL.String(), pth)
-	log.Infof("Removing %s", pth)
+	op.Infof("Removing %s", pth)
 	return d.ds.NewFileManager(d.s.Datacenter, true).Delete(ctx, f) // TODO: NewHelper should create the DatastoreFileManager
 }
 
@@ -285,7 +297,7 @@ func (d *Helper) IsVSAN(ctx context.Context) bool {
 // same for each and this tries to create the directory and stash the relevant
 // result so the URI doesn't need to be recomputed for every datastore
 // operation.
-func (d *Helper) mkRootDir(ctx context.Context, rootdir string) error {
+func (d *Helper) mkRootDir(op trace.Operation, rootdir string) error {
 	if rootdir == "" {
 		return fmt.Errorf("root directory is empty")
 	}
@@ -297,7 +309,7 @@ func (d *Helper) mkRootDir(ctx context.Context, rootdir string) error {
 	// Handle vsan
 	// Vsan will complain if the root dir exists.  Just call it directly and
 	// swallow the error if it's already there.
-	if d.IsVSAN(ctx) {
+	if d.IsVSAN(op) {
 		comps := strings.Split(rootdir, "/")
 
 		nm := object.NewDatastoreNamespaceManager(d.s.Vim25())
@@ -305,7 +317,7 @@ func (d *Helper) mkRootDir(ctx context.Context, rootdir string) error {
 		// This returns the vmfs path (including the datastore and directory
 		// UUIDs).  Use the directory UUID in future operations because it is
 		// the stable path which we can use regardless of vsan state.
-		uuid, err := nm.CreateDirectory(ctx, d.ds, comps[0], "")
+		uuid, err := nm.CreateDirectory(op, d.ds, comps[0], "")
 		if err != nil {
 			if !soap.IsSoapFault(err) {
 				return err
@@ -330,12 +342,12 @@ func (d *Helper) mkRootDir(ctx context.Context, rootdir string) error {
 
 	// create the rest of the root dir in case of vSAN, otherwise
 	// create the full path
-	if _, err := mkdir(ctx, d.s, d.fm, true, rooturl); err != nil {
+	if _, err := mkdir(op, d.s, d.fm, true, rooturl); err != nil {
 		if !os.IsExist(err) {
 			return err
 		}
 
-		log.Infof("datastore root %s already exists", rooturl)
+		op.Infof("datastore root %s already exists", rooturl)
 	}
 
 	d.RootURL.FromString(rooturl)
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore_test.go
deleted file mode 100644
index 3a29a82cfb..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/datastore/datastore_test.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package datastore
-
-import (
-	"math/rand"
-	"net/url"
-	"os"
-	"path"
-	"testing"
-	"time"
-
-	"context"
-
-	"github.com/stretchr/testify/assert"
-)
-
-// test if we can get a Datastore via the rooturl
-func TestDatastoreGetDatastores(t *testing.T) {
-	ctx, ds, cleanupfunc := DSsetup(t)
-	if t.Failed() {
-		return
-	}
-	defer cleanupfunc()
-
-	firstSummary, err := ds.Summary(ctx)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	t.Logf("Name:\t%s\n", firstSummary.Name)
-	t.Logf("  Path:\t%s\n", ds.ds.InventoryPath)
-	t.Logf("  Type:\t%s\n", firstSummary.Type)
-	t.Logf("  URL:\t%s\n", firstSummary.Url)
-	t.Logf("  Capacity:\t%.1f GB\n", float64(firstSummary.Capacity)/(1<<30))
-	t.Logf("  Free:\t%.1f GB\n", float64(firstSummary.FreeSpace)/(1<<30))
-
-	inMap := make(map[string]*url.URL)
-
-	p, err := url.Parse(ds.RootURL.String())
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	inMap["foo"] = p
-
-	dstores, err := GetDatastores(context.TODO(), ds.s, inMap)
-	if !assert.NoError(t, err) || !assert.NotNil(t, dstores) {
-		return
-	}
-
-	secondSummary, err := ds.Summary(ctx)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.Equal(t, firstSummary, secondSummary) {
-		return
-	}
-}
-
-func TestDatastoreRestart(t *testing.T) {
-	// creates a root in the datastore
-	ctx, ds, cleanupfunc := DSsetup(t)
-	if t.Failed() {
-		return
-	}
-	defer cleanupfunc()
-
-	// Create a nested dir in the root and use that as the datastore
-	nestedRoot := path.Join(ds.RootURL.Path, "foo")
-	ds, err := NewHelper(ctx, ds.s, ds.s.Datastore, nestedRoot)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// test we can ls the root
-	_, err = ds.Ls(ctx, "")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// create a dir
-	_, err = ds.Mkdir(ctx, true, "baz")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// create a new datastore object with the same path as the nested one
-	ds, err = NewHelper(ctx, ds.s, ds.s.Datastore, nestedRoot)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// try to create the same baz dir, assert it exists
-	_, err = ds.Mkdir(ctx, true, "baz")
-	if !assert.Error(t, err) || !assert.True(t, os.IsExist(err)) {
-		return
-	}
-
-	assert.NotEmpty(t, ds.RootURL)
-}
-
-func TestDatastoreCreateDir(t *testing.T) {
-	ctx, ds, cleanupfunc := DSsetup(t)
-	if t.Failed() {
-		return
-	}
-	defer cleanupfunc()
-
-	_, err := ds.Ls(ctx, "")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// assert create dir of a dir that exists is os.ErrExists
-	_, err = ds.Mkdir(ctx, true, "foo")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	_, err = ds.Mkdir(ctx, true, "foo")
-	if !assert.Error(t, err) || !assert.True(t, os.IsExist(err)) {
-		return
-	}
-}
-
-func TestDatastoreMkdirAndLs(t *testing.T) {
-	ctx, ds, cleanupfunc := DSsetup(t)
-	if t.Failed() {
-		return
-	}
-	defer cleanupfunc()
-
-	dirs := []string{"dir1", "dir1/child1"}
-
-	// create the dir then test it exists by calling ls
-	for _, dir := range dirs {
-		_, err := ds.Mkdir(ctx, true, dir)
-		if !assert.NoError(t, err) {
-			return
-		}
-
-		_, err = ds.Ls(ctx, dir)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-}
-
-func TestDatastoreToURLParsing(t *testing.T) {
-	expectedURL := "ds://datastore1/path/to/thing"
-
-	input := [][]string{
-		{"[datastore1] /path/to/thing", expectedURL},
-		{"[datastore1] path/to/thing", expectedURL},
-		{"[datastore1] ///path////to/thing", expectedURL},
-		{"[Datastore (1)] /path/to/thing", "ds://Datastore%20(1)/path/to/thing"},
-		{"[datastore1] path", "ds://datastore1/path"},
-		{"[datastore1] pa-th", "ds://datastore1/pa-th"},
-		{"[datastore1] pa_th", "ds://datastore1/pa_th"},
-		{"[data_store1] pa_th", "ds://data_store1/pa_th"},
-	}
-
-	dsoutputs := []string{
-		"[datastore1] /path/to/thing",
-		"[datastore1] path/to/thing",
-		"[datastore1] /path/to/thing",
-		"[Datastore (1)] /path/to/thing",
-		"[datastore1] path",
-		"[datastore1] pa-th",
-		"[datastore1] pa_th",
-		"[data_store1] pa_th",
-	}
-
-	for i, in := range input {
-		u, err := ToURL(in[0])
-
-		if !assert.NoError(t, err) || !assert.NotNil(t, u) {
-			return
-		}
-
-		if !assert.Equal(t, in[1], u.String()) {
-			return
-		}
-
-		out, err := URLtoDatastore(u)
-		if !assert.NoError(t, err) || !assert.True(t, len(out) > 0) {
-			return
-		}
-
-		if !assert.Equal(t, dsoutputs[i], out) {
-			return
-		}
-	}
-}
-
-// From https://siongui.github.io/2015/04/13/go-generate-random-string/
-func RandomString(strlen int) string {
-	rand.Seed(time.Now().UTC().UnixNano())
-	const chars = "abcdefghijklmnopqrstuvwxyz0123456789"
-	result := make([]byte, strlen)
-	for i := 0; i < strlen; i++ {
-		result[i] = chars[rand.Intn(len(chars))]
-	}
-	return string(result)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag.go
deleted file mode 100644
index 9ce171bb04..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package diag
-
-import (
-	"bytes"
-	"context"
-	"crypto/tls"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-	"time"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// StatusCodeFatalThreshold defines a threshold after which all codes can be treated as fatal.
-const StatusCodeFatalThreshold = 64
-
-const (
-	// VCStatusOK vSphere API is available.
-	VCStatusOK = 0
-	// VCStatusInvalidURL Provided vSphere API URL is wrong.
-	VCStatusInvalidURL = 64
-	// VCStatusErrorQuery Error happened trying to query vSphere API
-	VCStatusErrorQuery = 65
-	// VCStatusErrorResponse Received response doesn't contain expected data.
-	VCStatusErrorResponse = 66
-	// VCStatusIncorrectResponse Received in case if returned data from server is different from expected.
-	VCStatusIncorrectResponse = 67
-	// VCStatusNotXML Received response is not XML
-	VCStatusNotXML = 68
-	// VCStatusUnknownHost is returned in case if DNS failed to resolve name.
-	VCStatusUnknownHost = 69
-	// VCStatusHostIsNotReachable
-	VCStatusHostIsNotReachable = 70
-)
-
-// UserReadableVCAPITestDescription convert API test code into user readable text
-func UserReadableVCAPITestDescription(code int) string {
-	switch code {
-	case VCStatusOK:
-		return "vSphere API target responds as expected"
-	case VCStatusInvalidURL:
-		return "vSphere API target url is invalid"
-	case VCStatusErrorQuery:
-		return "vSphere API target failed to respond to the query"
-	case VCStatusIncorrectResponse:
-		return "vSphere API target returns unexpected response"
-	case VCStatusErrorResponse:
-		return "vSphere API target returns error"
-	case VCStatusNotXML:
-		return "vSphere API target returns non XML response"
-	case VCStatusUnknownHost:
-		return "vSphere API target can not be resolved from VCH"
-	case VCStatusHostIsNotReachable:
-		return "vSphere API target is out of reach. Wrong routing table?"
-	default:
-		return "vSphere API target test returned unknown code"
-	}
-}
-
-// CheckAPIAvailability accesses vSphere API to ensure it is a correct end point that is up and running.
-func CheckAPIAvailability(targetURL string) int {
-	op := trace.NewOperation(context.Background(), "api test")
-	errorCode := VCStatusErrorQuery
-
-	u, err := url.Parse(targetURL)
-	if err != nil {
-		return VCStatusInvalidURL
-	}
-
-	u.Path = "/sdk/vimService.wsdl"
-	apiURL := u.String()
-
-	op.Debugf("Checking access to: %s", apiURL)
-
-	for attempts := 5; errorCode != VCStatusOK && attempts > 0; attempts-- {
-
-		// #nosec: TLS InsecureSkipVerify set true
-		c := http.Client{
-			Transport: &http.Transport{
-				TLSClientConfig: &tls.Config{
-					InsecureSkipVerify: true,
-				},
-			},
-			// Is 20 seconds enough to receive any response from vSphere target server?
-			Timeout: time.Second * 20,
-		}
-		errorCode = queryAPI(op, c.Get, apiURL)
-	}
-	return errorCode
-}
-
-func queryAPI(op trace.Operation, getter func(string) (*http.Response, error), apiURL string) int {
-	resp, err := getter(apiURL)
-	if err != nil {
-		errTxt := err.Error()
-		op.Errorf("Query error: %s", err)
-		if strings.Contains(errTxt, "no such host") {
-			return VCStatusUnknownHost
-		}
-		if strings.Contains(errTxt, "no route to host") {
-			return VCStatusHostIsNotReachable
-		}
-		if strings.Contains(errTxt, "host is down") {
-			return VCStatusHostIsNotReachable
-		}
-		return VCStatusErrorQuery
-	}
-
-	data := make([]byte, 65636)
-	n, err := io.ReadFull(resp.Body, data)
-	if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-		op.Errorf("Query error: %s", err)
-		return VCStatusErrorResponse
-	}
-	if n >= len(data) {
-		// #nosec: Errors unhandled.
-		io.Copy(ioutil.Discard, resp.Body)
-	}
-	// #nosec: Errors unhandled.
-	resp.Body.Close()
-
-	contentType := strings.ToLower(resp.Header.Get("Content-Type"))
-	if !strings.Contains(contentType, "text/xml") {
-		op.Errorf("Unexpected content type %s, should be text/xml", contentType)
-		op.Errorf("Response from the server: %s", string(data))
-		return VCStatusNotXML
-	}
-	// we just want to make sure that response contains something familiar that we could
-	// use as vSphere API marker.
-	if !bytes.Contains(data, []byte("urn:vim25Service")) {
-		op.Errorf("Server response doesn't contain 'urn:vim25Service': %s", string(data))
-		return VCStatusIncorrectResponse
-	}
-	return VCStatusOK
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag_test.go
deleted file mode 100644
index 8d98578429..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diag/diag_test.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package diag
-
-import (
-	"bytes"
-	"context"
-	"errors"
-	"net/http"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func TestCheckAPIAvailability(t *testing.T) {
-	assert.Equal(t, VCStatusErrorQuery, CheckAPIAvailability("http://127.0.0.1:65535"))
-	assert.Equal(t, VCStatusErrorQuery, CheckAPIAvailability("http://127.0.0.1:65536"))
-}
-
-func TestCheckAPIAvailabilityQueryWithGetterError(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-	f := func(s string) (*http.Response, error) { return nil, errors.New("wrong query") }
-	code := queryAPI(op, f, "testurl")
-	assert.Equal(t, VCStatusErrorQuery, code)
-}
-
-type readerWithError struct {
-	err  error
-	data *bytes.Reader
-}
-
-func (r *readerWithError) Read(b []byte) (int, error) {
-	if r.err != nil {
-		return 0, r.err
-	}
-	return r.data.Read(b)
-}
-
-func (r *readerWithError) Close() error {
-	return r.err
-}
-
-func TestCheckAPIAvailabilityQueryReadError(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-	f := func(s string) (*http.Response, error) {
-		hr := &http.Response{
-			Body: &readerWithError{
-				err: errors.New("read error happened"),
-			},
-		}
-		return hr, nil
-	}
-	code := queryAPI(op, f, "testurl")
-	assert.Equal(t, VCStatusErrorResponse, code)
-}
-
-func TestCheckAPIAvailabilityQueryIncorrectDataType(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-	f := func(s string) (*http.Response, error) {
-		hr := &http.Response{
-			Body: &readerWithError{
-				data: bytes.NewReader([]byte("some data")),
-			},
-		}
-		return hr, nil
-	}
-	code := queryAPI(op, f, "testurl")
-	assert.Equal(t, VCStatusNotXML, code)
-}
-
-func TestCheckAPIAvailabilityQueryIncorrectData(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-	f := func(s string) (*http.Response, error) {
-		hr := &http.Response{
-			Body: &readerWithError{
-				data: bytes.NewReader([]byte("some data")),
-			},
-			Header: http.Header{"Content-Type": []string{"text/xml"}},
-		}
-		return hr, nil
-	}
-	code := queryAPI(op, f, "testurl")
-	assert.Equal(t, VCStatusIncorrectResponse, code)
-}
-
-func TestCheckAPIAvailabilityQueryCorrectData(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "test")
-	f := func(s string) (*http.Response, error) {
-		hr := &http.Response{
-			Body: &readerWithError{
-				data: bytes.NewReader([]byte("some urn:vim25Service data")),
-			},
-			Header: http.Header{"Content-Type": []string{"text/xml"}},
-		}
-		return hr, nil
-	}
-	code := queryAPI(op, f, "testurl")
-	assert.Equal(t, VCStatusOK, code)
-}
-
-func TestCheckAPIAvailabilityIncorrectDNSName(t *testing.T) {
-	assert.Equal(t, VCStatusUnknownHost, CheckAPIAvailability("https://example.notexisting.domain"))
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diagnostic/manager.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/diagnostic/manager.go
deleted file mode 100644
index 1d21df5aab..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/diagnostic/manager.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package diagnostic
-
-import (
-	"github.com/vmware/govmomi/object"
-
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Manager struct defines the Manager which provides additional
-// VIC specific methods over object.DiagnosticManager
-type Manager struct {
-	*object.DiagnosticManager
-
-	*session.Session
-}
-
-// NewDiagnosticManager returns a new DiagnosticManager object
-func NewDiagnosticManager(session *session.Session) *Manager {
-	return &Manager{
-		DiagnosticManager: object.NewDiagnosticManager(
-			session.Vim25(),
-		),
-		Session: session,
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/config.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/config.go
deleted file mode 100644
index 43814df6ca..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/config.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"fmt"
-	"hash/fnv"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/fs"
-)
-
-type VirtualDiskConfig struct {
-	// The URI in the datastore this disk can be found with
-	DatastoreURI *object.DatastorePath
-
-	// The URI in the datastore to the parent of this disk
-	ParentDatastoreURI *object.DatastorePath
-
-	// The size of the disk
-	CapacityInKB int64
-
-	// Underlying filesystem
-	Filesystem Filesystem
-
-	DiskMode types.VirtualDiskMode
-}
-
-func NewPersistentDisk(URI *object.DatastorePath) *VirtualDiskConfig {
-	return &VirtualDiskConfig{
-		DatastoreURI: URI,
-		DiskMode:     types.VirtualDiskModeIndependent_persistent,
-		Filesystem:   fs.NewExt4(),
-	}
-}
-
-func NewNonPersistentDisk(URI *object.DatastorePath) *VirtualDiskConfig {
-	return &VirtualDiskConfig{
-		DatastoreURI: URI,
-		DiskMode:     types.VirtualDiskModeIndependent_nonpersistent,
-		Filesystem:   fs.NewExt4(),
-	}
-}
-
-func (d *VirtualDiskConfig) WithParent(parent *object.DatastorePath) *VirtualDiskConfig {
-	d.ParentDatastoreURI = parent
-
-	return d
-}
-
-func (d *VirtualDiskConfig) WithFilesystem(ftype FilesystemType) *VirtualDiskConfig {
-	switch ftype {
-	case Xfs:
-		d.Filesystem = fs.NewXFS()
-	default:
-		d.Filesystem = fs.NewExt4()
-	}
-	return d
-}
-
-func (d *VirtualDiskConfig) WithCapacity(capacity int64) *VirtualDiskConfig {
-	d.CapacityInKB = capacity
-
-	return d
-}
-
-func (d *VirtualDiskConfig) Hash() uint64 {
-	key := fmt.Sprintf("%s-%t", d.DatastoreURI, d.IsPersistent())
-
-	hash := fnv.New64a()
-	hash.Write([]byte(key))
-
-	return hash.Sum64()
-}
-
-func (d *VirtualDiskConfig) IsPersistent() bool {
-	return d.DiskMode == types.VirtualDiskModeIndependent_persistent || d.DiskMode == types.VirtualDiskModePersistent
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk.go
deleted file mode 100644
index 059a63fdc5..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk.go
+++ /dev/null
@@ -1,473 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"sync"
-	"sync/atomic"
-
-	"github.com/vmware/vic/pkg/trace"
-)
-
-// FilesystemType represents the filesystem in use by a virtual disk
-type FilesystemType uint8
-
-const (
-	// Ext4 represents the ext4 file system
-	Ext4 FilesystemType = iota + 1
-
-	// Xfs represents the XFS file system
-	Xfs
-
-	// Ntfs represents the NTFS file system
-	Ntfs
-
-	// directory in which to perform the direct mount of disk for bind mount
-	// to actual target
-	diskBindBase = "/.filesystem-by-label/"
-
-	// used to isolate applications from the lost+found in the root of ext4
-	VolumeDataDir = "/.vic.vol.data"
-)
-
-// Filesystem defines the interface for handling an attached virtual disk
-type Filesystem interface {
-	Mkfs(op trace.Operation, devPath, label string) error
-	SetLabel(op trace.Operation, devPath, labelName string) error
-	Mount(op trace.Operation, devPath, targetPath string, options []string) error
-	Unmount(op trace.Operation, path string) error
-}
-
-// Semaphore represents the number of references to a disk
-type Semaphore struct {
-	resource string
-	refname  string
-	count    uint64
-}
-
-// NewSemaphore creates and returns a Semaphore initialized to 0
-func NewSemaphore(r, n string) *Semaphore {
-	return &Semaphore{
-		resource: r,
-		refname:  n,
-		count:    0,
-	}
-}
-
-// Increment increases the reference count by one
-func (r *Semaphore) Increment() uint64 {
-	return atomic.AddUint64(&r.count, 1)
-}
-
-// Decrement decreases the reference count by one
-func (r *Semaphore) Decrement() uint64 {
-	return atomic.AddUint64(&r.count, ^uint64(0))
-}
-
-// Count returns the current reference count
-func (r *Semaphore) Count() uint64 {
-	return atomic.LoadUint64(&r.count)
-}
-
-// InUseError is returned when a detach is attempted on a disk that is
-// still in use
-type InUseError struct {
-	error
-}
-
-// VirtualDisk represents a VMDK in the datastore, the device node it may be
-// attached at (if it's attached), the mountpoint it is mounted at (if
-// mounted), and other configuration.
-type VirtualDisk struct {
-	*VirtualDiskConfig
-
-	// The device node the disk is attached to
-	DevicePath string
-
-	// The path on the filesystem this device is attached to.
-	mountPath string
-	// The options that the disk is currently mounted with.
-	mountOpts string
-
-	// To avoid attach/detach races, this lock serializes operations to the disk.
-	l sync.Mutex
-
-	mountedRefs *Semaphore
-
-	attachedRefs *Semaphore
-}
-
-// NewVirtualDisk creates and returns a new VirtualDisk object associated with the
-// given datastore formatted with the specified FilesystemType
-func NewVirtualDisk(op trace.Operation, config *VirtualDiskConfig, disks map[uint64]*VirtualDisk) (*VirtualDisk, error) {
-	if !strings.HasSuffix(config.DatastoreURI.String(), ".vmdk") {
-		return nil, fmt.Errorf("%s doesn't have a vmdk suffix", config.DatastoreURI.String())
-	}
-
-	if d, ok := disks[config.Hash()]; ok {
-		return d, nil
-	}
-	op.Debugf("Didn't find the disk %s in the DiskManager cache, creating it", config.DatastoreURI)
-
-	uri := config.DatastoreURI.String()
-	d := &VirtualDisk{
-		VirtualDiskConfig: config,
-		mountedRefs:       NewSemaphore(uri, "mount"),
-		attachedRefs:      NewSemaphore(uri, "attach"),
-	}
-	disks[config.Hash()] = d
-
-	return d, nil
-}
-
-func (d *VirtualDisk) setAttached(op trace.Operation, devicePath string) (err error) {
-	if d.DevicePath == "" {
-		// Question: what happens if this is called a second time with a different devicePath?
-		d.DevicePath = devicePath
-	}
-
-	count := d.attachedRefs.Increment()
-	op.Debugf("incremented attach count for %s: %d", d.DatastoreURI, count)
-
-	return nil
-}
-
-func (d *VirtualDisk) canBeDetached() error {
-	if !d.attached() {
-		return fmt.Errorf("%s is already detached", d.DatastoreURI)
-	}
-
-	if d.mounted() {
-		return fmt.Errorf("%s is mounted (%s)", d.DatastoreURI, d.mountPath)
-	}
-
-	if d.inUseByOther() {
-		return fmt.Errorf("Detach skipped - %s is still in use", d.DatastoreURI)
-	}
-
-	return nil
-}
-
-func (d *VirtualDisk) setDetached(op trace.Operation, disks map[uint64]*VirtualDisk) {
-	// we only call this when it's been detached, so always make the updates
-	op.Debugf("Dropping %s from the DiskManager cache", d.DatastoreURI)
-	d.DevicePath = ""
-	delete(disks, d.Hash())
-}
-
-// Mkfs formats the disk with Filesystem and sets the disk label
-func (d *VirtualDisk) Mkfs(op trace.Operation, labelName string) error {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	if !d.attached() {
-		return fmt.Errorf("%s isn't attached", d.DatastoreURI)
-	}
-
-	if d.mounted() {
-		return fmt.Errorf("%s is still mounted (%s)", d.DatastoreURI, d.mountPath)
-	}
-
-	return d.Filesystem.Mkfs(op, d.DevicePath, labelName)
-}
-
-// SetLabel sets this disk's label
-func (d *VirtualDisk) SetLabel(op trace.Operation, labelName string) error {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	if !d.attached() {
-		return fmt.Errorf("%s isn't attached", d.DatastoreURI)
-	}
-
-	return d.Filesystem.SetLabel(op, d.DevicePath, labelName)
-}
-
-func (d *VirtualDisk) attached() bool {
-	return d.DevicePath != ""
-}
-
-// Attached returns true if this disk is attached, false otherwise
-func (d *VirtualDisk) Attached() bool {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.attached()
-}
-
-func (d *VirtualDisk) attachedByOther() bool {
-	return d.attachedRefs.Count() > 1
-}
-
-// AttachedByOther returns true if the attached references are > 1
-func (d *VirtualDisk) AttachedByOther() bool {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.attachedByOther()
-}
-
-func (d *VirtualDisk) mountedByOther() bool {
-	return d.mountedRefs.Count() > 1
-}
-
-// MountedByOther returns true if the mounted references are > 1
-func (d *VirtualDisk) MountedByOther() bool {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.mountedByOther()
-}
-
-func (d *VirtualDisk) inUseByOther() bool {
-	return d.mountedByOther() || d.attachedByOther()
-}
-
-// InUseByOther returns true if the disk is currently attached or
-// mounted by someone else
-func (d *VirtualDisk) InUseByOther() bool {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.inUseByOther()
-}
-
-// Mount attempts to mount this disk. A NOP occurs if the disk is already mounted
-// It returns the path at which the disk is mounted
-// Enhancement: allow provision of mount path and refcount for:
-//   specific mount point and options
-func (d *VirtualDisk) Mount(op trace.Operation, options []string) (string, error) {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	op.Debugf("Mounting %s", d.DatastoreURI)
-
-	if !d.attached() {
-		err := fmt.Errorf("%s isn't attached", d.DatastoreURI)
-		op.Error(err)
-		return "", err
-	}
-
-	opts := strings.Join(options, ";")
-	if !d.mounted() {
-		mntpath, err := ioutil.TempDir("", "mnt")
-		if err != nil {
-			err := fmt.Errorf("unable to create mountpint: %s", err)
-			op.Error(err)
-			return "", err
-		}
-
-		// get mount source, disk is already mounted if this func returns without error
-		mntsrc, err := d.getMountSource(op, options)
-		if err != nil {
-			op.Error(err)
-			return "", err
-		}
-
-		// then mount it at the correct source
-		if strings.HasSuffix(mntsrc, VolumeDataDir) {
-			// append bind mount options if we are masking lost+found
-			options = append(options, "bind")
-		}
-
-		if err = d.Filesystem.Mount(op, mntsrc, mntpath, options); err != nil {
-			op.Errorf("Failed to mount disk: %s", err)
-			return "", err
-		}
-
-		d.mountPath = mntpath
-		d.mountOpts = opts
-	} else {
-		// basic santiy check for matching options - we don't want to share a r/o mount
-		// if the request was for r/w. Ideally we'd just mount this at a different location with the
-		// requested options but that requires separate ref counting.
-		// TODO: support differing mount opts
-		if d.mountOpts != opts {
-			op.Errorf("Unable to use mounted disk due to differing options: %s != %s", d.mountOpts, opts)
-			return "", fmt.Errorf("incompatible mount options for disk reuse")
-		}
-	}
-
-	count := d.mountedRefs.Increment()
-	op.Debugf("incremented mount count for %s: %d", d.mountPath, count)
-
-	return d.mountPath, nil
-}
-
-// getMountSource mounts the disk rootfs, checks if it has volumeDataDir, if so it returns volumeDataDir
-// as the mount source to mask the lost+found folder, otherwise it returns the device path
-// NOTE: this mount should not be counted in the ref counts, bindTarget will be unmounted when disk detaches.
-// TODO: if we support different mount opts, we can't use the same bindTarget anymore.
-// need to assign each opt a different name, we can add a field in VirtualDisk that tracks bindTarget
-func (d *VirtualDisk) getMountSource(op trace.Operation, options []string) (string, error) {
-	// need to first mount the disk under the diskBindBase
-	bindTarget := path.Join(diskBindBase, d.DevicePath)
-
-	// sanity check to make sure previous bindTarget is cleaned up properly
-	var e1, e2 error
-	_, e1 = os.Stat(bindTarget)
-	if e1 == nil {
-		// bindTarget exists, check whether or not bindTarget is a mount point
-		e2 = os.Remove(bindTarget)
-	}
-
-	// we don't want to remount under the same mountpoint, so we only mounts under the following cases
-	// first case: bindTarget exists but not a mountpoint
-	// second case: bindTarget doesn't exist
-	if (e1 == nil && e2 == nil) || os.IsNotExist(e1) {
-		// #nosec
-		if err := os.MkdirAll(bindTarget, 0744); err != nil {
-			err = fmt.Errorf("unable to create mount point %s: %s", bindTarget, err)
-			op.Error(err)
-			return "", err
-		}
-		if err := d.Filesystem.Mount(op, d.DevicePath, bindTarget, options); err != nil {
-			op.Errorf("Failed to mount disk: %s", err)
-			return "", err
-		}
-	}
-
-	mntsrc := path.Join(bindTarget, VolumeDataDir)
-	// if the volume contains a volumeDataDir directory then mount that instead of the root of the filesystem
-	// if we cannot read it we go with the root of the filesystem
-	_, err := os.Stat(mntsrc)
-	if err != nil {
-		if os.IsNotExist(err) {
-			// if there's no such directory then revert to using the device directly
-			op.Infof("No " + VolumeDataDir + " data directory in volume, mounting filesystem directly")
-			mntsrc = d.DevicePath
-		} else {
-			return "", fmt.Errorf("unable to determine whether lost+found masking is required: %s", err)
-		}
-	}
-	return mntsrc, nil
-}
-
-// Unmount attempts to unmount a virtual disk
-func (d *VirtualDisk) Unmount(op trace.Operation) error {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	if !d.mounted() {
-		return fmt.Errorf("%s already unmounted", d.DatastoreURI)
-	}
-
-	count := d.mountedRefs.Decrement()
-	op.Debugf("decremented mount count for %s: %d", d.mountPath, count)
-
-	if count > 0 {
-		return nil
-	}
-
-	// no more mount references to this disk, so actually unmount
-	if err := d.Filesystem.Unmount(op, d.mountPath); err != nil {
-		err := fmt.Errorf("failed to unmount disk: %s", err)
-		op.Error(err)
-		return err
-	}
-
-	// only remove the mount directory - if we've succeeded in the unmount there won't be anything in it
-	// if we somehow get here and there is content we do NOT want to delete it
-	if err := os.Remove(d.mountPath); err != nil {
-		err := fmt.Errorf("failed to clean up mount point: %s", err)
-		op.Error(err)
-		return err
-	}
-
-	d.mountPath = ""
-
-	// mountpath is cleaned, we need to clean up the bindTarget as well
-	bindTarget := path.Join(diskBindBase, d.DevicePath)
-	if err := d.Filesystem.Unmount(op, bindTarget); err != nil {
-		return fmt.Errorf("failed to clean up actual mount point on device: %s", err)
-	}
-
-	// only remove the mount directory - if we've succeeded in the unmount there won't be anything in it
-	// if we somehow get here and there is content we do NOT want to delete it
-	if err := os.Remove(bindTarget); err != nil {
-		err := fmt.Errorf("failed to clean up actual mount point: %s", err)
-		return err
-	}
-
-	return nil
-}
-
-func (d *VirtualDisk) mountPathFn() (string, error) {
-	if !d.mounted() {
-		return "", fmt.Errorf("%s isn't mounted", d.DatastoreURI)
-	}
-
-	return d.mountPath, nil
-}
-
-// MountPath returns the path on which the virtual disk is mounted,
-// or an error if the disk is not mounted
-func (d *VirtualDisk) MountPath() (string, error) {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.mountPathFn()
-}
-
-// DiskPath returns a URL referencing the path of the virtual disk
-// on the datastore
-func (d *VirtualDisk) DiskPath() url.URL {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return url.URL{
-		Scheme: "ds",
-		Path:   d.DatastoreURI.String(),
-	}
-}
-
-func (d *VirtualDisk) mounted() bool {
-	return d.mountPath != ""
-}
-
-// Mounted returns true if the virtual disk is mounted, false otherwise
-func (d *VirtualDisk) Mounted() bool {
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	return d.mounted()
-}
-
-func (d *VirtualDisk) canBeUnmounted() error {
-	if !d.attached() {
-		return fmt.Errorf("%s is detached", d.DatastoreURI)
-	}
-
-	if !d.mounted() {
-		return fmt.Errorf("%s is unmounted", d.DatastoreURI)
-	}
-
-	return nil
-}
-
-func (d *VirtualDisk) setUmounted() error {
-	if !d.mounted() {
-		return fmt.Errorf("%s already unmounted", d.DatastoreURI)
-	}
-
-	d.mountPath = ""
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_ext4_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_ext4_test.go
deleted file mode 100644
index f37802e763..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_ext4_test.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"path"
-	"testing"
-
-	"context"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/docker/docker/pkg/mount"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-)
-
-// Create a disk, make an ext filesystem on it, set the label, mount it,
-// unmount it, then clean up.
-func TestCreateFS(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-	d, err := vdm.CreateAndAttach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// make the filesysetem
-	if err = d.Mkfs(op, "foo"); !assert.NoError(t, err) {
-		return
-	}
-
-	// set the label
-	if err = d.SetLabel(op, "foo"); !assert.NoError(t, err) {
-		return
-	}
-
-	// do the mount
-	dir, err := d.Mount(op, nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// boom
-	if mounted, err := mount.Mounted(dir); !assert.NoError(t, err) || !assert.True(t, mounted) {
-		return
-	}
-
-	//  clean up
-	err = d.Unmount(op)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = vdm.Detach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-}
-
-func TestAttachFS(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-	d, err := vdm.CreateAndAttach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// make the filesysetem
-	if err = d.Mkfs(op, "foo"); !assert.NoError(t, err) {
-		return
-	}
-
-	// set the label
-	if err = d.SetLabel(op, "foo"); !assert.NoError(t, err) {
-		return
-	}
-
-	// do the mount
-	dir, err := d.Mount(op, nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// boom
-	if mounted, err := mount.Mounted(dir); !assert.NoError(t, err) || !assert.True(t, mounted) {
-		return
-	}
-
-	//  clean up
-	err = d.Unmount(op)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = vdm.Detach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	child := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "child.vmdk"),
-	}
-
-	config = NewPersistentDisk(child).WithParent(scratch)
-	d, err = vdm.CreateAndAttach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// do the mount
-	dir, err = d.Mount(op, nil)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// boom
-	if mounted, err := mount.Mounted(dir); !assert.NoError(t, err) || !assert.True(t, mounted) {
-		return
-	}
-
-	//  clean up
-	err = d.Unmount(op)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = vdm.Detach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	for i := 0; i < 5; i++ {
-		config = NewPersistentDisk(child)
-		d, err = vdm.CreateAndAttach(op, config)
-		if !assert.NoError(t, err) {
-			return
-		}
-
-		// do the mount
-		dir, err = d.Mount(op, nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-
-		// boom
-		if mounted, err := mount.Mounted(dir); !assert.NoError(t, err) || !assert.True(t, mounted) {
-			return
-		}
-
-		//  clean up
-		err = d.Unmount(op)
-		if !assert.NoError(t, err) {
-			return
-		}
-
-		err = vdm.Detach(op, config)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager.go
deleted file mode 100644
index d1b6f4b8b9..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager.go
+++ /dev/null
@@ -1,664 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"context"
-	"fmt"
-	"net/url"
-	"os"
-	"sync"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/guest"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	// You can assign the device to (1:z ), where 1 is SCSI controller 1 and z is a virtual device node from 0 to 15.
-	// https://pubs.vmware.com/vsphere-65/index.jsp#com.vmware.vsphere.vm_admin.doc/GUID-5872D173-A076-42FE-8D0B-9DB0EB0E7362.html
-	MaxAttachedDisks = 16
-)
-
-// Manager manages disks for the vm it runs on.  The expectation is this is run
-// from a VM on a vsphere instance.  This VM creates disks on ESX, attaches
-// them to itself, writes to them, then detaches them.
-type Manager struct {
-	// We can't have more than this number of disks attached.
-	maxAttached chan bool
-
-	// reference to the vm this is running on.
-	vm *vm.VirtualMachine
-
-	// VirtualDiskManager that is used to create vmdks directly on datastore
-	// from https://pubs.vmware.com/vsphere-65/index.jsp?topic=%2Fcom.vmware.vspsdk.apiref.doc%2Fvim.VirtualDiskManager.html
-	// Most VirtualDiskManager APIs will be DEPRECATED as of vSphere 6.5. Please use VStorageObjectManager APIs to manage Virtual disks.
-	vdMngr *object.VirtualDiskManager
-
-	// ContainerView - https://pubs.vmware.com/vsphere-6-0/index.jsp#com.vmware.wssdk.apiref.doc/vim.view.ContainerView.html
-	view *view.ContainerView
-
-	// The controller on this vm.
-	controller *types.ParaVirtualSCSIController
-
-	// The PCI + SCSI device /dev node string format the disks can be attached with
-	byPathFormat string
-
-	// serialize reconfigure operations
-	mu sync.Mutex
-
-	// map of URIs to VirtualDisk structs so that we can return the same instance to the caller, required for ref counting
-	Disks map[uint64]*VirtualDisk
-	// used for locking the disk cache
-	disksLock sync.Mutex
-}
-
-// NewDiskManager creates a new Manager instance associated with the caller VM
-func NewDiskManager(op trace.Operation, session *session.Session, v *view.ContainerView) (*Manager, error) {
-	defer trace.End(trace.Begin(""))
-
-	vm, err := guest.GetSelf(op, session)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-
-	// create handle to the docker daemon VM as we need to mount disks on it
-	controller, byPathFormat, err := verifyParavirtualScsiController(op, vm)
-	if err != nil {
-		op.Errorf("scsi controller verification failed: %s", err.Error())
-		return nil, err
-	}
-
-	return &Manager{
-		maxAttached:  make(chan bool, MaxAttachedDisks),
-		vm:           vm,
-		vdMngr:       object.NewVirtualDiskManager(vm.Vim25()),
-		view:         v,
-		controller:   controller,
-		byPathFormat: byPathFormat,
-		Disks:        make(map[uint64]*VirtualDisk),
-	}, nil
-}
-
-// toSpec converts the given config to VirtualDisk spec
-func (m *Manager) toSpec(config *VirtualDiskConfig) *types.VirtualDisk {
-	backing := &types.VirtualDiskFlatVer2BackingInfo{
-		DiskMode:        string(config.DiskMode),
-		ThinProvisioned: types.NewBool(true),
-		VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-			FileName: config.DatastoreURI.String(),
-		},
-	}
-
-	disk := &types.VirtualDisk{
-		VirtualDevice: types.VirtualDevice{
-			Key:           -1,
-			ControllerKey: m.controller.Key,
-			UnitNumber:    new(int32),
-			Backing:       backing,
-		},
-		// As of vSphere API 5.5 capacityInKB is deprecated. Documentation suggest using capacityInBytes but we can't unset CapacityInKB and its default value 0 causes problems
-		// ... Exception thrown during reconfigure: (vim.vm.ConfigSpec) {
-		// ...
-		// -->             unitNumber = -1,
-		// -->             capacityInKB = 0,
-		// -->             capacityInBytes = 8192000000,
-		// -->             shares = (vim.SharesInfo) null,
-		// ...
-		CapacityInBytes: config.CapacityInKB * 1024,
-		CapacityInKB:    config.CapacityInKB,
-	}
-
-	if config.ParentDatastoreURI != nil {
-		backing.Parent = &types.VirtualDiskFlatVer2BackingInfo{
-			VirtualDeviceFileBackingInfo: types.VirtualDeviceFileBackingInfo{
-				FileName: config.ParentDatastoreURI.String(),
-			},
-		}
-
-		// Capacity needs to be 0 as we inherit it from the parent
-		disk.CapacityInBytes = 0
-		disk.CapacityInKB = 0
-	}
-
-	// It's possible the VCH has a disk already attached.
-	*disk.VirtualDevice.UnitNumber = -1
-
-	return disk
-}
-
-// CreateAndAttach creates a new VMDK, attaches it and ensures that the device becomes visible to the caller.
-// Returns a VirtualDisk corresponding to the created and attached disk.
-func (m *Manager) CreateAndAttach(op trace.Operation, config *VirtualDiskConfig) (*VirtualDisk, error) {
-	defer trace.End(trace.Begin(config.DatastoreURI.String()))
-
-	// Get or create entry in disk cache
-	m.disksLock.Lock()
-	d, err := NewVirtualDisk(op, config, m.Disks)
-	if err != nil {
-		m.disksLock.Unlock()
-
-		op.Errorf("Unable to create disk entry: %s", err)
-		return nil, err
-	}
-	// take disk lock before we release the cache lock - this prevents the disk being removed from the cache
-	// before we get a chance to adjust refcounts
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	m.disksLock.Unlock()
-
-	// check if the disk is attached from the perspective of the cache entry
-	if d.DevicePath != "" {
-		// this is a horrificaly misnamed call - it's incrementing the reference count
-		d.setAttached(op, "")
-		return d, nil
-	}
-
-	op.Infof("Create/attach vmdk %s from parent %s", config.DatastoreURI, config.ParentDatastoreURI)
-
-	// we use findDiskByFilename to check if the disk is already attached
-	// if it is then it's indicative of an error because it wasn't found in the cache, but this lets us recover
-	_, ferr := findDiskByFilename(op, m.vm, d.DatastoreURI.String(), d.IsPersistent())
-	if os.IsNotExist(ferr) {
-		if err := m.attach(op, config); err != nil {
-			return nil, errors.Trace(err)
-		}
-	} else {
-		op.Errorf("Failed to determine if disk is already attached: %s", err)
-		// this will be tidied up if/when the waitForDevice fails
-	}
-
-	op.Debugf("Mapping vmdk to pci device %s", config.DatastoreURI)
-	devicePath, err := m.devicePathByURI(op, config.DatastoreURI, d.IsPersistent())
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-
-	blockDev, err := waitForDevice(op, devicePath)
-	if err != nil {
-		op.Errorf("waitForDevice failed for %s with %s", d.DatastoreURI, errors.ErrorStack(err))
-		// ensure that the disk is detached if it's the publish that's failed
-
-		disk, findErr := findDiskByFilename(op, m.vm, d.DatastoreURI.String(), d.IsPersistent())
-		if findErr != nil {
-			op.Debugf("findDiskByFilename(%s) failed with %s", d.DatastoreURI, errors.ErrorStack(findErr))
-		}
-
-		if detachErr := m.detach(op, disk); detachErr != nil {
-			op.Debugf("detach(%s) failed with %s", d.DatastoreURI, errors.ErrorStack(detachErr))
-		}
-
-		return nil, errors.Trace(err)
-	}
-
-	err = d.setAttached(op, blockDev)
-
-	return d, err
-}
-
-// Create creates a disk without a parent (and doesn't attach it).
-func (m *Manager) Create(op trace.Operation, config *VirtualDiskConfig) (*VirtualDisk, error) {
-	defer trace.End(trace.Begin(config.DatastoreURI.String()))
-
-	var err error
-
-	d, err := NewVirtualDisk(op, config, m.Disks)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	spec := &types.FileBackedVirtualDiskSpec{
-		VirtualDiskSpec: types.VirtualDiskSpec{
-			DiskType:    string(types.VirtualDiskTypeThin),
-			AdapterType: string(types.VirtualDiskAdapterTypeLsiLogic),
-		},
-		CapacityKb: config.CapacityInKB,
-	}
-
-	op.Infof("Creating vmdk for layer or volume %s", d.DatastoreURI)
-	err = tasks.Wait(op, func(ctx context.Context) (tasks.Task, error) {
-		return m.vdMngr.CreateVirtualDisk(ctx, d.DatastoreURI.String(), nil, spec)
-	})
-
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-
-	return d, nil
-}
-
-// Gets a disk given a datastore path URI to the vmdk
-func (m *Manager) Get(op trace.Operation, config *VirtualDiskConfig) (*VirtualDisk, error) {
-	defer trace.End(trace.Begin(config.DatastoreURI.String()))
-
-	d, err := NewVirtualDisk(op, config, m.Disks)
-	if err != nil {
-		return nil, errors.Trace(err)
-	}
-
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	d.ParentDatastoreURI, err = m.DiskParent(op, config)
-	return d, err
-}
-
-// DiskParent returns the parent for an existing disk, based on the disk datastore URI in the config,
-// and ignoring any parent specified in the config.
-// datastore path will be nil if the disk has no parent
-func (m *Manager) DiskParent(op trace.Operation, config *VirtualDiskConfig) (*object.DatastorePath, error) {
-	defer trace.End(trace.Begin(config.DatastoreURI.String()))
-
-	info, err := m.vdMngr.QueryVirtualDiskInfo(op, config.DatastoreURI.String(), m.vm.Datacenter, true)
-	if err != nil {
-		op.Errorf("Error querying parents (%s): %s", config.DatastoreURI, err.Error())
-		return nil, err
-	}
-
-	// the last elem in the info list is the disk we just looked up.
-	p := info[len(info)-1]
-
-	if p.Parent != "" {
-		ppth, err := datastore.PathFromString(p.Parent)
-		if err != nil {
-			op.Errorf("Error converting parent to datastore URI (%s): %s", p.Parent, err)
-			return nil, err
-		}
-		return ppth, nil
-	}
-
-	// no parent
-	return nil, nil
-}
-
-// TODO(FA) this doesn't work since delta disks get set with `deletable =
-// false` when they become parents.  This needs some thought and will require
-// some answers from a larger context.
-//func (m *DiskManager) Delete(ctx context.Context, d *VirtualDisk) error {
-//	defer trace.End(trace.Begin(d.DatastoreURI))
-//
-//	log.Infof("Deleting %s", d.DatastoreURI)
-//
-//	d.l.Lock()
-//	defer d.l.Unlock()
-//
-//	if d.isAttached() {
-//		return fmt.Errorf("cannot delete %s, still attached (%s)", d.DatastoreURI, d.devicePath)
-//	}
-//
-//	// TODO(FA) Check if disk is a parent.
-//
-//	vdm := object.NewVirtualDiskManager(m.vm.Client())
-//	task, err := vdm.DeleteVirtualDisk(ctx, d.DatastoreURI, nil)
-//	if err != nil {
-//		return err
-//	}
-//
-//	err = task.Wait(ctx)
-//	if err != nil {
-//		return errors.Trace(err)
-//	}
-//
-//	return nil
-// }
-
-// Attach attempts to attach a virtual disk
-func (m *Manager) attach(op trace.Operation, config *VirtualDiskConfig) error {
-	defer trace.End(trace.Begin(""))
-
-	disk := m.toSpec(config)
-
-	deviceList := object.VirtualDeviceList{}
-	deviceList = append(deviceList, disk)
-
-	changeSpec, err := deviceList.ConfigSpec(types.VirtualDeviceConfigSpecOperationAdd)
-	if err != nil {
-		return err
-	}
-
-	machineSpec := types.VirtualMachineConfigSpec{}
-	machineSpec.DeviceChange = append(machineSpec.DeviceChange, changeSpec...)
-
-	// ensure we abide by max attached disks limits
-	m.maxAttached <- true
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	// make sure the op is still valid as the above line could block for a long time
-	select {
-	case <-op.Done():
-		return op.Err()
-	default:
-	}
-
-	_, err = m.vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
-		t, er := m.vm.Reconfigure(ctx, machineSpec)
-
-		if t != nil {
-			op.Debugf("Attach reconfigure task=%s", t.Reference())
-		}
-
-		return t, er
-	})
-
-	if err != nil {
-		select {
-		case <-m.maxAttached:
-		default:
-		}
-
-		op.Errorf("vmdk storage driver failed to attach disk: %s", errors.ErrorStack(err))
-		return errors.Trace(err)
-	}
-
-	return nil
-}
-
-// Detach attempts to detach a virtual disk
-func (m *Manager) Detach(op trace.Operation, config *VirtualDiskConfig) error {
-	defer trace.End(trace.Begin(""))
-
-	// we have to hold the cache lock until we're done deleting the cache entry
-	// or until we know we're not going to delete the entry
-	m.disksLock.Lock()
-	defer m.disksLock.Unlock()
-
-	d, err := NewVirtualDisk(op, config, m.Disks)
-	if err != nil {
-		return errors.Trace(err)
-	}
-
-	d.l.Lock()
-	defer d.l.Unlock()
-
-	count := d.attachedRefs.Decrement()
-	op.Debugf("decremented attach count for %s: %d", d.DatastoreURI, count)
-	if count > 0 {
-		return nil
-	}
-
-	if err := d.canBeDetached(); err != nil {
-		op.Errorf("disk needs to be detached but is still in use: %s", err)
-		return errors.Trace(err)
-	}
-
-	op.Infof("Detaching disk %s", d.DevicePath)
-
-	disk, err := findDiskByFilename(op, m.vm, d.DatastoreURI.String(), d.IsPersistent())
-	if err != nil {
-		return errors.Trace(err)
-	}
-
-	if err = m.detach(op, disk); err != nil {
-		op.Errorf("detach for %s failed with %s", d.DevicePath, errors.ErrorStack(err))
-		return errors.Trace(err)
-	}
-
-	// this deletes the disk from the disk cache
-	d.setDetached(op, m.Disks)
-
-	return nil
-}
-
-func (m *Manager) DetachAll(op trace.Operation) error {
-	defer trace.End(trace.Begin(""))
-
-	disks, err := findAllDisks(op, m.vm)
-	if err != nil {
-		return err
-	}
-
-	for _, disk := range disks {
-		if err2 := m.detach(op, disk); err != nil {
-			op.Errorf("error detaching disk: %s", err2.Error())
-			// return the last error on the return of this function
-			err = err2
-			// if we failed here that means we have a disk attached, ensure we abide by max attached disks limits
-			m.maxAttached <- true
-		}
-	}
-
-	return err
-}
-
-func (m *Manager) detach(op trace.Operation, disk *types.VirtualDisk) error {
-	config := []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:    disk,
-			Operation: types.VirtualDeviceConfigSpecOperationRemove,
-		},
-	}
-
-	spec := types.VirtualMachineConfigSpec{}
-	spec.DeviceChange = config
-
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	_, err := m.vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
-		t, er := m.vm.Reconfigure(ctx, spec)
-
-		if t != nil {
-			op.Debugf("Detach reconfigure task=%s", t.Reference())
-		}
-
-		return t, er
-	})
-
-	if err == nil {
-		select {
-		case <-m.maxAttached:
-		default:
-		}
-	}
-
-	return err
-}
-
-func (m *Manager) devicePathByURI(op trace.Operation, datastoreURI *object.DatastorePath, persistent bool) (string, error) {
-	disk, err := findDiskByFilename(op, m.vm, datastoreURI.String(), persistent)
-	if err != nil {
-		op.Errorf("findDisk failed for %s with %s", datastoreURI.String(), errors.ErrorStack(err))
-		return "", errors.Trace(err)
-	}
-
-	sysPath := fmt.Sprintf(m.byPathFormat, *disk.UnitNumber)
-
-	return sysPath, nil
-}
-
-// AttachAndMount creates and attaches a vmdk as a non-persistent disk, mounts it, and returns the mount path.
-func (m *Manager) AttachAndMount(op trace.Operation, datastoreURI *object.DatastorePath, persistent bool) (string, error) {
-	var config *VirtualDiskConfig
-
-	op.Infof("Attach/Mount %s", datastoreURI.String())
-
-	if !persistent {
-		config = NewNonPersistentDisk(datastoreURI)
-	} else {
-		config = NewPersistentDisk(datastoreURI)
-	}
-
-	d, err := m.CreateAndAttach(op, config)
-	if err != nil {
-		return "", err
-	}
-
-	// don't update access time - that would cause the diff operation to mutate the filesystem
-	opts := []string{"noatime"}
-
-	if !persistent {
-		opts = append(opts, "ro")
-	}
-
-	return d.Mount(op, opts)
-
-}
-
-// UnmountAndDetach unmounts and detaches a disk, subsequently cleaning the mount path
-func (m *Manager) UnmountAndDetach(op trace.Operation, datastoreURI *object.DatastorePath, persistent bool) error {
-	var config *VirtualDiskConfig
-
-	if !persistent {
-		config = NewNonPersistentDisk(datastoreURI)
-	} else {
-		config = NewPersistentDisk(datastoreURI)
-	}
-
-	d, err := NewVirtualDisk(op, config, m.Disks)
-	if err != nil {
-		return err
-	}
-
-	op.Infof("Unmount and Detach %s:%s", d.mountPath, d.DatastoreURI)
-
-	err = d.Unmount(op)
-	derr := m.Detach(op, config)
-
-	if err != nil || derr != nil {
-		op.Errorf("Error during unmount or detach, unmount: %s, detach: %s", err, derr)
-		// prioritize first error
-		if err == nil {
-			err = derr
-		}
-	}
-
-	return err
-}
-
-func (m *Manager) InUse(op trace.Operation, config *VirtualDiskConfig, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	defer trace.End(trace.Begin(""))
-
-	mngr := view.NewManager(m.vm.Vim25())
-
-	// Create view of VirtualMachine objects under the VCH's resource pool
-	view2, err := mngr.CreateContainerView(op, m.vm.Session.Pool.Reference(), []string{"VirtualMachine"}, true)
-	if err != nil {
-		op.Errorf("failed to create view: %s", err)
-		return nil, err
-	}
-	defer view2.Destroy(op)
-
-	var mos []mo.VirtualMachine
-	// Retrieve needed properties of all machines under this view
-	err = view2.Retrieve(op, []string{"VirtualMachine"}, []string{"name", "config.hardware", "runtime.powerState"}, &mos)
-	if err != nil {
-		return nil, err
-	}
-
-	var vms []*vm.VirtualMachine
-	// iterate over them to see whether they have the disk we want
-	for i := range mos {
-		mo := mos[i]
-		op.Debugf("Working on vm %q", mo.Name)
-
-		if !filter(&mo) {
-			op.Debugf("Filtering out vm %q", mo.Name)
-			continue
-		}
-
-		for _, device := range mo.Config.Hardware.Device {
-			label := device.GetVirtualDevice().DeviceInfo.GetDescription().Label
-			db := device.GetVirtualDevice().Backing
-			if db == nil {
-				continue
-			}
-
-			switch t := db.(type) {
-			case types.BaseVirtualDeviceFileBackingInfo:
-				if config.DatastoreURI.String() == t.GetVirtualDeviceFileBackingInfo().FileName {
-					op.Infof("Found active user of target disk %s: %q", label, mo.Name)
-					vms = append(vms, vm.NewVirtualMachine(context.Background(), m.vm.Session, mo.Reference()))
-				}
-			default:
-			}
-		}
-	}
-	return vms, nil
-}
-
-func (m *Manager) DiskFinder(op trace.Operation, filter func(p string) bool) (string, error) {
-	defer trace.End(trace.Begin(""))
-
-	mngr := view.NewManager(m.vm.Vim25())
-
-	// Create view of VirtualMachine objects under the VCH's resource pool
-	view2, err := mngr.CreateContainerView(op, m.vm.Session.Pool.Reference(), []string{"VirtualMachine"}, true)
-	if err != nil {
-		op.Errorf("failed to create view: %s", err)
-		return "", err
-	}
-	defer view2.Destroy(op)
-
-	var mos []mo.VirtualMachine
-	// Retrieve needed properties of all machines under this view
-	err = view2.Retrieve(op, []string{"VirtualMachine"}, []string{"name", "config.hardware", "runtime.powerState"}, &mos)
-	if err != nil {
-		return "", err
-	}
-
-	// iterate over them to see whether they have the disk we want
-	for i := range mos {
-		mo := mos[i]
-
-		op.Debugf("Working on vm %q", mo.Name)
-
-		// observed empty fields here when copying to all 14 volumes on a cVM so being paranoid
-		if mo.Config == nil || mo.Config.Hardware.Device == nil {
-			op.Warnf("Skipping disk presence check for %q: failed to retrieve vm config", mo.Name)
-			continue
-		}
-
-		for _, device := range mo.Config.Hardware.Device {
-			label := device.GetVirtualDevice().DeviceInfo.GetDescription().Label
-			db := device.GetVirtualDevice().Backing
-			if db == nil {
-				continue
-			}
-
-			switch t := db.(type) {
-			case types.BaseVirtualDeviceFileBackingInfo:
-				diskPath := t.GetVirtualDeviceFileBackingInfo().FileName
-				if filter(diskPath) {
-					op.Infof("Found disk matching filter: (label: %s), %q", label, diskPath)
-					return diskPath, nil
-				}
-			default:
-			}
-		}
-	}
-	return "", errors.New("Not found")
-}
-
-func (m *Manager) Owners(op trace.Operation, url *url.URL, filter func(vm *mo.VirtualMachine) bool) ([]*vm.VirtualMachine, error) {
-	dsPath, err := datastore.PathFromString(url.Path)
-	if err != nil {
-		return nil, err
-	}
-
-	return m.InUse(op, NewPersistentDisk(dsPath), filter)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager_test.go
deleted file mode 100644
index 342fd03071..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/disk_manager_test.go
+++ /dev/null
@@ -1,739 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"context"
-	"fmt"
-	"io/ioutil"
-	"math/rand"
-	"os"
-	"path"
-	"sync"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/view"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-)
-
-func Session(ctx context.Context, t *testing.T) *session.Session {
-	config := &session.Config{
-		Service: env.URL(t),
-
-		DatastorePath: env.DS(t),
-
-		Insecure:  true,
-		Keepalive: time.Duration(5) * time.Minute,
-	}
-
-	s := session.NewSession(config)
-
-	_, err := s.Connect(ctx)
-	if err != nil {
-		t.Skip(err.Error())
-		return nil
-	}
-
-	// we're treating this as an atomic behaviour, so log out if we failed
-	defer func() {
-		if err != nil {
-			t.Skip(err.Error())
-			s.Client.Logout(ctx)
-		}
-	}()
-
-	_, err = s.Populate(ctx)
-	if err != nil {
-		t.Skip(err.Error())
-		return nil
-	}
-
-	// Vsan has special UUID / URI handling of top level directories which
-	// we've implemented at another level.  We can't import them here or it'd
-	// be a circular dependency.  Also, we already have tests that test these
-	// cases but from a higher level.
-	if err != nil || s.IsVSAN(ctx) {
-		t.Logf("error: %s", err.Error())
-		t.SkipNow()
-	}
-
-	return s
-}
-
-func ContainerView(ctx context.Context, session *session.Session, vm *object.VirtualMachine) *view.ContainerView {
-	mngr := view.NewManager(session.Vim25())
-
-	pool, err := vm.ResourcePool(ctx)
-	if err != nil {
-		return nil
-	}
-
-	// Create view of VirtualMachine objects under the VCH's resource pool
-	v, err := mngr.CreateContainerView(ctx, pool.Reference(), []string{"VirtualMachine"}, true)
-	if err != nil {
-		return nil
-	}
-	return v
-}
-
-// Create a lineage of disks inheriting from eachother, write portion of a
-// string to each, the confirm the result is the whole string
-func TestCreateAndDetach(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-	parent, err := vdm.Create(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	numChildren := 3
-	children := make([]*VirtualDisk, numChildren)
-
-	testString := "Ground control to Major Tom"
-	writeSize := len(testString) / numChildren
-	// Create children which inherit from each other
-	for i := 0; i < numChildren; i++ {
-
-		p := &object.DatastorePath{
-			Datastore: imagestore.Datastore,
-			Path:      path.Join(imagestore.Path, fmt.Sprintf("child%d.vmdk", i)),
-		}
-
-		config := NewPersistentDisk(p).WithParent(parent.DatastoreURI)
-		child, cerr := vdm.CreateAndAttach(op, config)
-		if !assert.NoError(t, cerr) {
-			return
-		}
-		refs := child.attachedRefs.Count()
-		assert.EqualValues(t, 1, refs, "Expected %d attach references, found %d", refs)
-
-		// attempt to recreate and attach the already attached disk
-		config = NewPersistentDisk(p).WithParent(parent.DatastoreURI)
-		child, cerr = vdm.CreateAndAttach(op, config)
-		if !assert.NoError(t, cerr) {
-			return
-		}
-		refs = child.attachedRefs.Count()
-		assert.EqualValues(t, 2, refs, "Expected %d attach references, found %d", refs)
-
-		// attempt detach
-		cerr = vdm.Detach(op, config)
-		if !assert.NoError(t, cerr) {
-			return
-		}
-		// should not actually detach, and should still have 1 reference
-		refs = child.attachedRefs.Count()
-		assert.EqualValues(t, 1, refs, "Expected %d attach references, found %d", refs)
-
-		children[i] = child
-
-		// Write directly to the disk
-		f, cerr := os.OpenFile(child.DevicePath, os.O_RDWR, os.FileMode(0777))
-		if !assert.NoError(t, cerr) {
-			return
-		}
-
-		start := i * writeSize
-		end := start + writeSize
-
-		if i == numChildren-1 {
-			// last chunk, write to the end.
-			_, cerr = f.WriteAt([]byte(testString[start:]), int64(start))
-			if !assert.NoError(t, cerr) || !assert.NoError(t, f.Sync()) {
-				return
-			}
-
-			// Try to read the whole string
-			b := make([]byte, len(testString))
-			f.Seek(0, 0)
-			_, cerr = f.Read(b)
-			if !assert.NoError(t, cerr) {
-				return
-			}
-
-			//check against the test string
-			if !assert.Equal(t, testString, string(b)) {
-				return
-			}
-
-		} else {
-			_, cerr = f.WriteAt([]byte(testString[start:end]), int64(start))
-			if !assert.NoError(t, cerr) || !assert.NoError(t, f.Sync()) {
-				return
-			}
-		}
-
-		f.Close()
-
-		cerr = vdm.Detach(op, config)
-		if !assert.NoError(t, cerr) {
-			return
-		}
-
-		// use this image as the next parent
-		parent = child
-	}
-}
-
-func TestRefCounting(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-	p, err := vdm.Create(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.False(t, p.Attached(), "%s is attached but should not be", p.DatastoreURI)
-
-	child := &object.DatastorePath{
-		Datastore: imagestore.Datastore,
-		Path:      path.Join(imagestore.Path, "testDisk.vmdk"),
-	}
-	config = NewPersistentDisk(child).WithParent(scratch)
-
-	// attempt attach
-	assert.NoError(t, vdm.attach(op, config), "Error attempting to attach %s", config)
-
-	devicePath, err := vdm.devicePathByURI(op, child, config.IsPersistent())
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	d, err := NewVirtualDisk(op, config, vdm.Disks)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	blockDev, err := waitForDevice(op, devicePath)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.False(t, d.Attached(), "%s is attached but should not be", d.DatastoreURI)
-
-	// Attach the disk
-	assert.NoError(t, d.setAttached(op, blockDev), "Error attempting to mark %s as attached", d.DatastoreURI)
-
-	assert.True(t, d.Attached(), "%s is not attached but should be", d.DatastoreURI)
-	assert.NoError(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 1, d.attachedRefs.Count(), "%s has %d attach references but should have 1", d.DatastoreURI, d.attachedRefs.Count())
-
-	// attempt another attach at disk level to increase reference count
-	// TODO(jzt): This should probably eventually use the attach code coming in
-	// https://github.com/vmware/vic/issues/5422
-	assert.NoError(t, d.setAttached(op, blockDev), "Error attempting to mark %s as attached", d.DatastoreURI)
-
-	assert.True(t, d.Attached(), "%s is not attached but should be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should not be detachable but is", d.DatastoreURI)
-	assert.True(t, d.InUseByOther(), "%s is not in use but should be", d.DatastoreURI)
-	assert.Equal(t, 2, d.attachedRefs.Count(), "%s has %d attach references but should have 2", d.DatastoreURI, d.attachedRefs.Count())
-
-	// reduce reference count by calling detach
-	d.setDetached(op, vdm.Disks)
-
-	assert.True(t, d.Attached(), "%s is not attached but should be", d.DatastoreURI)
-	assert.NoError(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 1, d.attachedRefs.Count(), "%s has %d attach references but should have 1", d.DatastoreURI, d.attachedRefs.Count())
-
-	// test mount reference counting
-	assert.NoError(t, d.Mkfs(op, "testDisk"), "Error attempting to format %s", d.DatastoreURI)
-
-	// create temp mount path
-	dir, err := ioutil.TempDir("", "mnt")
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// cleanup
-	defer func() {
-		assert.NoError(t, os.RemoveAll(dir), "Error cleaning up mount path %s", dir)
-	}()
-
-	// initial mount
-	dir, err = d.Mount(op, nil)
-	assert.NoError(t, err, "Error attempting to mount %s at %s", d.DatastoreURI, dir)
-
-	mountPath, err := d.MountPath()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.True(t, d.Mounted(), "%s is not mounted but should be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should not be detachable but is", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 1, d.mountedRefs.Count(), "%s has %d mount references but should have 1", d.DatastoreURI, d.mountedRefs.Count())
-	assert.Equal(t, dir, mountPath, "%s is mounted at %s but should be mounted at %s", d.DatastoreURI, mountPath, dir)
-
-	// attempt another mount
-	dir, err = d.Mount(op, nil)
-	assert.NoError(t, err, "Error attempting to mount %s at %s", d.DatastoreURI, dir)
-
-	assert.True(t, d.Mounted(), "%s is not mounted but should be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should not be detachable but is", d.DatastoreURI)
-	assert.True(t, d.InUseByOther(), "%s is not in use but should be", d.DatastoreURI)
-	assert.Equal(t, 2, d.mountedRefs.Count(), "%s has %d mount references but should have 2", d.DatastoreURI, d.mountedRefs.Count())
-
-	// attempt unmount
-	assert.NoError(t, d.Unmount(op), "Error attempting to unmount %s", d.DatastoreURI)
-
-	assert.True(t, d.Mounted(), "%s is not mounted but should be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should not be detachable but is", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 1, d.mountedRefs.Count(), "%s has %d mount references but should have 1", d.DatastoreURI, d.mountedRefs.Count())
-
-	// actually unmount
-	assert.NoError(t, d.Unmount(op), "Error attempting to unmount %s", d.DatastoreURI)
-
-	assert.False(t, d.Mounted(), "%s is mounted but should not be", d.DatastoreURI)
-	assert.NoError(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 0, d.mountedRefs.Count(), "%s has %d mount references but should have 0", d.DatastoreURI, d.mountedRefs.Count())
-
-	// detach
-	assert.NoError(t, vdm.Detach(op, config), "Error attempting to detach %s", d.DatastoreURI)
-
-	assert.False(t, d.Attached(), "%s is attached but should not be", d.DatastoreURI)
-	assert.False(t, d.Mounted(), "%s is mounted but should not be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should not be detachable but is", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.Equal(t, 0, d.attachedRefs.Count(), "%s has %d attach references but should have 0", d.DatastoreURI, d.attachedRefs.Count())
-	assert.Equal(t, 0, d.mountedRefs.Count(), "%s has %d mount references but should have 0", d.DatastoreURI, d.mountedRefs.Count())
-
-	if !assert.NoError(t, err) {
-		return
-	}
-}
-
-func TestRefCountingParallel(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	diskSize := int64(1 << 10)
-	uri := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "test.vmdk"),
-	}
-	config := NewPersistentDisk(uri).WithCapacity(diskSize)
-	d, err := vdm.CreateAndAttach(op, config)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	assert.True(t, d.Attached(), "%s is not attached but should be", d.DatastoreURI)
-	assert.NoError(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.EqualValues(t, 1, d.attachedRefs.Count(), "%s has %d attach references but should have 1", d.DatastoreURI, d.attachedRefs.Count())
-
-	wg := sync.WaitGroup{}
-	for i := 0; i < 5; i++ {
-		wg.Add(1)
-		go func() {
-			var err error
-			defer wg.Done()
-
-			for j := 0; j < 5; j++ {
-
-				time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond)
-
-				d, err = vdm.CreateAndAttach(op, config)
-				if !assert.NoError(t, err) {
-					return
-				}
-
-				time.Sleep(time.Duration(rand.Intn(1000)) * time.Millisecond)
-
-				err = vdm.Detach(op, config)
-				if !assert.NoError(t, err) {
-					return
-				}
-			}
-		}()
-	}
-	wg.Wait()
-
-	assert.True(t, d.Attached(), "%s is not attached but should be", d.DatastoreURI)
-	assert.NoError(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.EqualValues(t, 1, d.attachedRefs.Count(), "%s has %d attach references but should have 1", d.DatastoreURI, d.attachedRefs.Count())
-
-	err = vdm.Detach(op, config)
-	if !assert.NoError(t, err) {
-		log.Error("Error detaching disk: %s", err.Error())
-		return
-	}
-
-	assert.False(t, d.Attached(), "%s is attached but should not be", d.DatastoreURI)
-	assert.Error(t, d.canBeDetached(), "%s should be detachable but is not", d.DatastoreURI)
-	assert.False(t, d.InUseByOther(), "%s is in use but should not be", d.DatastoreURI)
-	assert.EqualValues(t, 0, d.attachedRefs.Count(), "%s has %d attach references but should have 0", d.DatastoreURI, d.attachedRefs.Count())
-}
-
-func TestInUse(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	// helper fn
-	reconfigure := func(changes []types.BaseVirtualDeviceConfigSpec) error {
-		t.Logf("Calling reconfigure")
-
-		machineSpec := types.VirtualMachineConfigSpec{}
-		machineSpec.DeviceChange = changes
-
-		_, err := vdm.vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
-			t, er := vdm.vm.Reconfigure(ctx, machineSpec)
-
-			if t != nil {
-				op.Debugf("reconfigure task=%s", t.Reference())
-			}
-
-			return t, er
-		})
-		return err
-	}
-	// 1MB
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-	// config
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-
-	// attach + create spec (scratch)
-	spec := []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:        vdm.toSpec(config),
-			Operation:     types.VirtualDeviceConfigSpecOperationAdd,
-			FileOperation: types.VirtualDeviceConfigSpecFileOperationCreate,
-		},
-	}
-
-	// filter powered off vms
-	filter := func(vm *mo.VirtualMachine) bool {
-		return vm.Runtime.PowerState != types.VirtualMachinePowerStatePoweredOn
-	}
-
-	vms, err := vdm.InUse(op, config, filter)
-	if !assert.NoError(t, err) && !assert.Len(t, vms, 0) {
-		return
-	}
-
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("scratch created and attached")
-
-	vms, err = vdm.InUse(op, config, filter)
-	if !assert.NoError(t, err) && !assert.Len(t, vms, 1) {
-		return
-	}
-	t.Logf("InUse by %s", vms)
-
-	// ref to scratch (needed for detach as initial spec's Key and UnitNumber was unset)
-	disk, err := findDiskByFilename(op, vdm.vm, scratch.Path, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// DO NOT DETACH AND START WORKING ON THE CHILD
-
-	// child
-	child := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "child.vmdk"),
-	}
-	// config
-	config = NewPersistentDisk(child).WithParent(scratch)
-
-	// detach (scratch) AND attach + create (child) spec
-	spec = []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:    disk,
-			Operation: types.VirtualDeviceConfigSpecOperationRemove,
-		},
-		&types.VirtualDeviceConfigSpec{
-			Device:        vdm.toSpec(config),
-			Operation:     types.VirtualDeviceConfigSpecOperationAdd,
-			FileOperation: types.VirtualDeviceConfigSpecFileOperationCreate,
-		},
-	}
-
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("scratch detached, child created and attached")
-
-	vms, err = vdm.InUse(op, config, filter)
-	if !assert.NoError(t, err) && !assert.Len(t, vms, 1) {
-		return
-	}
-	t.Logf("InUse by %s", vms)
-
-	// ref to child (needed for detach as initial spec's Key and UnitNumber was unset)
-	disk, err = findDiskByFilename(op, vdm.vm, child.Path, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// detach  spec (child)
-	spec = []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:    disk,
-			Operation: types.VirtualDeviceConfigSpecOperationRemove,
-		},
-	}
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("child detached")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/lazy_detach_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/lazy_detach_test.go
deleted file mode 100644
index 66bcf82b2d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/lazy_detach_test.go
+++ /dev/null
@@ -1,238 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path"
-	"testing"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-)
-
-// TestLazyDetach tests lazy detach functionality to make sure that every ESXi version shows this behaviour
-// https://github.com/vmware/vic/issues/5565
-func TestLazyDetach(t *testing.T) {
-	log.SetLevel(log.InfoLevel)
-	if testing.Verbose() {
-		log.SetLevel(log.DebugLevel)
-	}
-
-	session := Session(context.Background(), t)
-	if session == nil {
-		return
-	}
-
-	op := trace.NewOperation(context.TODO(), t.Name())
-
-	vchvm, err := guest.GetSelf(op, session)
-	if err != nil {
-		t.Skip("Not in a vm")
-	}
-	view := ContainerView(op, session, vchvm)
-	if view == nil {
-		t.Skip("Can't create a view")
-	}
-
-	imagestore := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      datastore.TestName(t.Name()),
-	}
-
-	// file manager
-	fm := object.NewFileManager(session.Vim25())
-	// create a directory in the datastore
-	err = fm.MakeDirectory(context.TODO(), imagestore.String(), nil, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// Nuke the image store
-	defer func() {
-		task, err := fm.DeleteDatastoreFile(context.TODO(), imagestore.String(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-		_, err = task.WaitForResult(context.TODO(), nil)
-		if !assert.NoError(t, err) {
-			return
-		}
-	}()
-
-	// create a diskmanager
-	vdm, err := NewDiskManager(op, session, view)
-	if !assert.NoError(t, err) || !assert.NotNil(t, vdm) {
-		return
-	}
-
-	// helper fn
-	reconfigure := func(changes []types.BaseVirtualDeviceConfigSpec) error {
-		t.Logf("Calling reconfigure")
-
-		machineSpec := types.VirtualMachineConfigSpec{}
-		machineSpec.DeviceChange = changes
-
-		_, err := vdm.vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
-			t, er := vdm.vm.Reconfigure(ctx, machineSpec)
-
-			if t != nil {
-				op.Debugf("reconfigure task=%s", t.Reference())
-			}
-
-			return t, er
-		})
-		return err
-	}
-
-	oddity := "Ground control to Major Tom"
-	operation := func(path *object.DatastorePath, read bool) error {
-		// this is fundamentally checking persistent disks
-		devicePath, err := vdm.devicePathByURI(op, path, true)
-		if err != nil {
-			return err
-		}
-
-		blockDev, err := waitForDevice(op, devicePath)
-		if err != nil {
-			return err
-		}
-
-		f, err := os.OpenFile(blockDev, os.O_RDWR, os.FileMode(0777))
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-
-		if read {
-			// Try to read the whole string
-			b := make([]byte, len(oddity))
-			_, err = f.Read(b)
-			if err != nil {
-				return err
-			}
-			// Check against the test string
-			if oddity != string(b) {
-				return fmt.Errorf("Read string is not the same one we wrote")
-			}
-		} else {
-			// Write directly to the disk
-			_, err = f.Write([]byte(oddity))
-			if err != nil {
-				return err
-			}
-		}
-
-		return f.Sync()
-	}
-
-	// 1MB
-	diskSize := int64(1 << 10)
-	scratch := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "scratch.vmdk"),
-	}
-	// config
-	config := NewPersistentDisk(scratch).WithCapacity(diskSize)
-
-	// attach + create spec (scratch)
-	spec := []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:        vdm.toSpec(config),
-			Operation:     types.VirtualDeviceConfigSpecOperationAdd,
-			FileOperation: types.VirtualDeviceConfigSpecFileOperationCreate,
-		},
-	}
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("scratch created and attached")
-
-	// ref to scratch (needed for detach as initial spec's Key and UnitNumber was unset)
-	disk, err := findDiskByFilename(op, vdm.vm, scratch.Path, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	err = operation(scratch, false)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// DO NOT DETACH AND START WORKING ON THE CHILD
-
-	// child
-	child := &object.DatastorePath{
-		Datastore: session.Datastore.Name(),
-		Path:      path.Join(imagestore.Path, "child.vmdk"),
-	}
-	// config
-	config = NewPersistentDisk(child).WithParent(scratch)
-
-	// detach (scratch) AND attach + create (child) spec
-	spec = []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:    disk,
-			Operation: types.VirtualDeviceConfigSpecOperationRemove,
-		},
-		&types.VirtualDeviceConfigSpec{
-			Device:        vdm.toSpec(config),
-			Operation:     types.VirtualDeviceConfigSpecOperationAdd,
-			FileOperation: types.VirtualDeviceConfigSpecFileOperationCreate,
-		},
-	}
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("scratch detached, child created and attached")
-
-	err = operation(child, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// ref to child (needed for detach as initial spec's Key and UnitNumber was unset)
-	disk, err = findDiskByFilename(op, vdm.vm, child.Path, true)
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	// detach  spec (child)
-	spec = []types.BaseVirtualDeviceConfigSpec{
-		&types.VirtualDeviceConfigSpec{
-			Device:    disk,
-			Operation: types.VirtualDeviceConfigSpecOperationRemove,
-		},
-	}
-	// reconfigure
-	err = reconfigure(spec)
-	if !assert.NoError(t, err) {
-		return
-	}
-	t.Logf("child detached")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util.go
deleted file mode 100644
index d0fe8947f7..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util.go
+++ /dev/null
@@ -1,339 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"time"
-
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	// The duration waitForPath will tolerate before timing out.
-	// TODO FIXME see GH issues 2340 and 2385
-	// TODO We need to add a vSphere cancellation step to cancel calls that are taking too long
-	// TODO Remove these TODOs after 2385 is completed
-	pathTimeout = 60 * time.Second
-)
-
-// scsiScan tells the kernel to rescan the scsi bus.
-func scsiScan() error {
-	root := "/sys/class/scsi_host"
-
-	dirs, err := ioutil.ReadDir(root)
-	if err != nil {
-		return err
-	}
-
-	for _, dir := range dirs {
-		file := path.Join(root, dir.Name(), "scan")
-		// Channel, SCSI target ID, and LUN: "-" == rescan all
-		err = ioutil.WriteFile(file, []byte("- - -"), 0)
-		if err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// Waits for a device to appear in the given directory and returns the
-// resultant dev path (e.g /dev/sda). For instance, if sysPath is
-// /sys/bus/pci/devices/0000:03:00.0/host0/subsystem/devices/0:0:0:0/block, the
-// directory to appear in block will be mapped to /dev/<device>.  waitForDevice
-// will wait for the entry to appear as a scsi target AND the blockdev to exist
-// in /dev/, returning the path to /dev/<blockdev>.
-func waitForDevice(op trace.Operation, sysPath string) (string, error) {
-	defer trace.End(trace.Begin(sysPath))
-
-	var err error
-	op, _ = trace.WithTimeout(&op, time.Duration(pathTimeout), "waitForDevice(%s)", sysPath)
-	errCh := make(chan error)
-
-	var blockDev string
-	go func() {
-		t := time.NewTicker(200 * time.Microsecond)
-		defer t.Stop()
-		defer close(errCh)
-
-		for range t.C {
-			// We've timed out.
-			if op.Err() != nil {
-				return
-			}
-
-			// Syspath includes the scsi target itself.  Wait for it and try
-			// again before trying to identify the device node it maps to.
-			dirents, err := ioutil.ReadDir(sysPath)
-			if err != nil {
-
-				// try again
-				if os.IsNotExist(err) {
-					op.Debugf("Expected %s to appear. Trying again.", sysPath)
-					continue
-				}
-
-				errCh <- err
-				return
-			}
-
-			if len(dirents) > 1 {
-				errCh <- fmt.Errorf("too many devices returned: %#v", dirents)
-				return
-			}
-
-			if len(dirents) == 1 {
-				blockDev = "/dev/" + dirents[0].Name()
-
-				// check it exists
-				if _, err := os.Stat(blockDev); err != nil {
-
-					// try again
-					if os.IsNotExist(err) {
-						continue
-					}
-
-					errCh <- err
-					return
-				}
-
-				// happy path
-				return
-			}
-
-			// run a manual scan of the scsi bus
-			if serr := scsiScan(); serr != nil {
-				op.Warnf("scsi scan: %s", serr)
-			}
-		}
-	}()
-
-	op.Debugf("Waiting for attached disk to appear in %s, or timeout", sysPath)
-	select {
-	case err = <-errCh:
-
-		if err != nil {
-			return "", err
-		}
-
-		op.Infof("Attached disk present at %s", blockDev)
-	case <-op.Done():
-		if op.Err() != nil {
-			return "", errors.Errorf("timeout waiting for layer to present in %s", sysPath)
-		}
-	}
-
-	return blockDev, nil
-}
-
-// Ensures that a paravirtual scsi controller is present and determines the
-// base path of disks attached to it returns a handle to the controller and a
-// format string, with a single decimal for the disk unit number which will
-// result in the /sys/bus/pci/devices/{pci id like
-// 0000:03:00.0}/host{N provided by kernel}/subsystem/devices/N:0:{disk id like 0}:0/block/sd{Y provided by kernel} path.
-// The directory inside block isn't a devnode, but it's name can be mapped to
-// its /dev/ path.
-func verifyParavirtualScsiController(op trace.Operation, vm *vm.VirtualMachine) (*types.ParaVirtualSCSIController, string, error) {
-	devices, err := vm.Device(op)
-	if err != nil {
-		op.Errorf("vmware driver failed to retrieve device list for VM %s: %s", vm, errors.ErrorStack(err))
-		return nil, "", errors.Trace(err)
-	}
-
-	controller, ok := devices.PickController((*types.ParaVirtualSCSIController)(nil)).(*types.ParaVirtualSCSIController)
-	if controller == nil || !ok {
-		err = errors.Errorf("vmware driver failed to find a paravirtual SCSI controller - ensure setup ran correctly")
-		op.Errorf(err.Error())
-		return nil, "", errors.Trace(err)
-	}
-
-	// build the base path
-	// first we determine which label we're looking for (requires VMW hardware version >=10)
-	controllerLabel := fmt.Sprintf("SCSI%d", controller.BusNumber)
-	op.Debugf("Looking for scsi controller with label %s", controllerLabel)
-
-	pciDevicesDir := "/sys/bus/pci/devices"
-	pciBus, err := os.Open(pciDevicesDir)
-	if err != nil {
-		op.Errorf("Failed to open %s for reading: %s", pciDevicesDir, errors.ErrorStack(err))
-		return controller, "", errors.Trace(err)
-	}
-	defer pciBus.Close()
-
-	pciDevices, err := pciBus.Readdirnames(0)
-	if err != nil {
-		op.Errorf("Failed to read contents of %s: %s", pciDevicesDir, errors.ErrorStack(err))
-		return controller, "", errors.Trace(err)
-	}
-
-	var controllerName string
-
-	for _, pciDev := range pciDevices {
-		labelPath := path.Join(pciDevicesDir, pciDev, "label")
-		flabel, err := os.Open(labelPath)
-		if err != nil {
-			if !os.IsNotExist(err) {
-				op.Errorf("Unable to read label from %s: %s", labelPath, errors.ErrorStack(err))
-			}
-			continue
-		}
-		defer flabel.Close()
-
-		buf := make([]byte, len(controllerLabel))
-		_, err = flabel.Read(buf)
-		if err != nil {
-			op.Errorf("Unable to read label from %s: %s", labelPath, errors.ErrorStack(err))
-			continue
-		}
-
-		if controllerLabel == string(buf) {
-			// we've found our controller
-			controllerName = pciDev
-			op.Debugf("Found pvscsi controller directory: %s", controllerName)
-
-			break
-		}
-	}
-
-	if controllerName == "" {
-		err := errors.Errorf("Failed to locate pvscsi controller directory")
-		return controller, "", errors.Trace(err)
-	}
-
-	// Use the block subsystem directly.
-	// /sys/bus/pci/devices/0000:03:00.0/host0/subsystem/devices/0:0:0:0/block
-	// hostN (host0 in this case) is provided to us by the kernel.
-	// N:0:0:X where N is from above X is provided by vsphere
-
-	// Glob for the scsi host
-	matches, err := filepath.Glob(path.Join(pciDevicesDir, controllerName, "host*"))
-	if err != nil {
-		return controller, "", fmt.Errorf("scsi host glob failed: %s", err.Error())
-	}
-
-	if len(matches) != 1 {
-		return controller, "", fmt.Errorf("too many scsi hosts")
-	}
-
-	// Get the number on the end
-	hostStr := matches[0]
-	hostidx := string(hostStr[len(hostStr)-1])
-
-	// First param in the X:X:X:X path is the host id.  So `host2` will mean all devices will start with 2.
-	formatString := path.Join(hostStr, fmt.Sprintf("subsystem/devices/%s:0:%%d:0/block/", hostidx))
-	op.Debugf("Disk location format: %s", formatString)
-	return controller, formatString, nil
-}
-
-func findDisk(op trace.Operation, vm *vm.VirtualMachine, filter func(diskName string, mode string) bool) ([]*types.VirtualDisk, error) {
-	defer trace.End(trace.Begin(vm.String()))
-
-	devices, err := vm.Device(op)
-	if err != nil {
-		return nil, fmt.Errorf("Failed to refresh devices for vm: %s", errors.ErrorStack(err))
-	}
-
-	candidates := devices.Select(func(device types.BaseVirtualDevice) bool {
-		db := device.GetVirtualDevice().Backing
-		if db == nil {
-			return false
-		}
-
-		backing, ok := device.GetVirtualDevice().Backing.(*types.VirtualDiskFlatVer2BackingInfo)
-		if !ok {
-			return false
-		}
-
-		backingFileName := backing.VirtualDeviceFileBackingInfo.FileName
-		mode := backing.DiskMode
-		op.Debugf("backing file name %s, mode: %s", backingFileName, mode)
-
-		return filter(backingFileName, mode)
-	})
-
-	if len(candidates) == 0 {
-		return nil, nil
-	}
-
-	disks := make([]*types.VirtualDisk, len(candidates))
-	for idx, disk := range candidates {
-		disks[idx] = disk.(*types.VirtualDisk)
-	}
-
-	return disks, nil
-}
-
-// Find the disk by name attached to the given vm.
-func findDiskByFilename(op trace.Operation, vm *vm.VirtualMachine, name string, persistent bool) (*types.VirtualDisk, error) {
-	defer trace.End(trace.Begin(vm.String()))
-
-	op.Debugf("Looking for attached disk matching filename %s", name)
-
-	candidates, err := findDisk(op, vm, func(diskName string, mode string) bool {
-		if persistent != (mode == string(types.VirtualDiskModePersistent) || mode == string(types.VirtualDiskModeIndependent_persistent)) {
-			return false
-		}
-
-		match := strings.HasSuffix(diskName, name)
-		if match {
-			op.Debugf("Found candidate disk for %s at %s", name, diskName)
-		}
-		return match
-	})
-
-	if err != nil {
-		op.Errorf("error finding disk: %s", err.Error())
-		return nil, err
-	}
-
-	if len(candidates) == 0 {
-		op.Infof("No disks match name and persistence: %s, %t", name, persistent)
-		return nil, os.ErrNotExist
-	}
-
-	if len(candidates) > 1 {
-		op.Errorf("Multiple disks match name: %s", name)
-		// returning the first allows doing something with it
-		return candidates[0], errors.Errorf("multiple disks match name: %s", name)
-	}
-
-	return candidates[0], nil
-}
-
-func findAllDisks(op trace.Operation, vm *vm.VirtualMachine) ([]*types.VirtualDisk, error) {
-	defer trace.End(trace.Begin(vm.String()))
-
-	op.Debugf("Looking for all attached disks")
-
-	disks, err := findDisk(op, vm, func(diskName string, mode string) bool {
-		return true
-	})
-
-	if err != nil {
-		op.Errorf("error finding disk: %s", err.Error())
-		return nil, err
-	}
-
-	return disks, nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util_test.go
deleted file mode 100644
index c27f8ef787..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/util_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"os"
-	"runtime"
-	"testing"
-)
-
-func TestScsiScan(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.SkipNow()
-	}
-
-	err := scsiScan()
-	if err != nil && os.IsNotExist(err) {
-		// ignoring "permission denied" or "read-only file system" errors
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk.go
deleted file mode 100644
index 920026dc5f..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"net/url"
-
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-	"github.com/vmware/vic/pkg/vsphere/datastore"
-	"github.com/vmware/vic/pkg/vsphere/session"
-)
-
-// Vmdk is intended to be embedded by stores that manage VMDK-based data resources
-type Vmdk struct {
-	*Manager
-	*datastore.Helper
-	*session.Session
-}
-
-const (
-	DiskBackendKey = "msg.disk.noBackEnd"
-	LockedFileKey  = "msg.fileio.lock"
-)
-
-// Mount mounts the disk, returning the mount path and the function used to unmount/detaches
-// when no longer in use
-func (v *Vmdk) Mount(op trace.Operation, uri *url.URL, persistent bool) (string, func(), error) {
-	if uri.Scheme != "ds" {
-		return "", nil, errors.New("vmdk path must be a datastore url with \"ds\" scheme")
-	}
-
-	dsPath, err := datastore.PathFromString(uri.Path)
-	if err != nil {
-		return "", nil, err
-	}
-
-	cleanFunc := func() {
-		if err := v.UnmountAndDetach(op, dsPath, persistent); err != nil {
-			op.Errorf("Error cleaning up disk: %s", err.Error())
-		}
-	}
-
-	mountPath, err := v.AttachAndMount(op, dsPath, persistent)
-	return mountPath, cleanFunc, err
-}
-
-func LockedVMDKFilter(vm *mo.VirtualMachine) bool {
-	if vm == nil {
-		return false
-	}
-
-	return vm.Runtime.PowerState == types.VirtualMachinePowerStatePoweredOn
-}
-
-// IsLockedError will determine if the error received is:
-// a. related to a vmdk
-// b. due to the vmdk being locked
-// It will return false in absence of confirmation, meaning incomplete vim errors
-// will return false
-func IsLockedError(err error) bool {
-	disks := LockedDisks(err)
-	//if device is locked, disks will not be nil
-	return len(disks) > 0
-}
-
-// LockedDisks returns locked devices path in the error if it's device lock error
-func LockedDisks(err error) []string {
-	var faultMessage []types.LocalizableMessage
-
-	if soap.IsSoapFault(err) {
-		switch f := soap.ToSoapFault(err).VimFault().(type) {
-		case *types.GenericVmConfigFault:
-			faultMessage = f.FaultMessage
-		}
-	} else if soap.IsVimFault(err) {
-		faultMessage = soap.ToVimFault(err).GetMethodFault().FaultMessage
-	} else {
-		switch err := err.(type) {
-		case task.Error:
-			faultMessage = err.Fault().GetMethodFault().FaultMessage
-		}
-	}
-
-	if faultMessage == nil {
-		return nil
-	}
-
-	lockedFile := false
-	var devices []string
-	for _, message := range faultMessage {
-		switch message.Key {
-		case LockedFileKey:
-			lockedFile = true
-		case DiskBackendKey:
-			for _, arg := range message.Arg {
-				if device, ok := arg.Value.(string); ok {
-					devices = append(devices, device)
-					continue
-				}
-			}
-		}
-	}
-	if lockedFile {
-		// make sure locked devices are returned only when both keys appear in the error
-		return devices
-	}
-	return nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk_test.go
deleted file mode 100644
index 6a294ed8d6..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/disk/vmdk_test.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package disk
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestLockedDisks(t *testing.T) {
-	lockErrJSON := "{\"FaultCause\":null,\"FaultMessage\":[{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"msg.fileio.lock\",\"Arg\":null,\"Message\":\"Failed to lock the file\"},{\"Key\":\"msg.disk.noBackEnd\",\"Arg\":[{\"Key\":\"1\",\"Value\":\"/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/bad81f01-8d32-4640-8b83-b4bb7e4a2350/bad81f01-8d32-4640-8b83-b4bb7e4a2350.vmdk\"}],\"Message\":\"Cannot open the disk '/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/bad81f01-8d32-4640-8b83-b4bb7e4a2350/bad81f01-8d32-4640-8b83-b4bb7e4a2350.vmdk' or one of the snapshot disks it depends on. \"},{\"Key\":\"msg.moduletable.powerOnFailed\",\"Arg\":[{\"Key\":\"1\",\"Value\":\"Disk\"}],\"Message\":\"Module 'Disk' power on failed. \"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.OpenFile.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of OpenFile[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"vob.fssvec.LookupAndOpen.file.failed\",\"Arg\":null,\"Message\":\"File system specific implementation of LookupAndOpen[file] failed\"},{\"Key\":\"msg.fileio.lock\",\"Arg\":null,\"Message\":\"Failed to lock the file\"},{\"Key\":\"msg.disk.noBackEnd\",\"Arg\":[{\"Key\":\"1\",\"Value\":\"/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/f1915d56-2c34-454f-bcdf-2a96db0600c2/f1915d56-2c34-454f-bcdf-2a96db0600c2.vmdk\"}],\"Message\":\"Cannot open the disk '/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/f1915d56-2c34-454f-bcdf-2a96db0600c2/f1915d56-2c34-454f-bcdf-2a96db0600c2.vmdk' or one of the snapshot disks it depends on. \"},{\"Key\":\"msg.vmx.poweron.failed\",\"Arg\":null,\"Message\":\"Failed to start the virtual machine.\"},{\"Key\":\"vpxd.vm.poweron.unexpectedfailure\",\"Arg\":[{\"Key\":\"1\",\"Value\":\"dazzling_almeida-db324aa3f47f\"}],\"Message\":\"An error was received from the ESX host while powering on VM dazzling_almeida-db324aa3f47f.\"}],\"Reason\":\"File system specific implementation of LookupAndOpen[file] failed\"}"
-	nonLockErrJSON := "{\"FaultCause\":null,\"FaultMessage\":[{\"Key\":\"msg.vigor.operationCancelled\",\"Arg\":null,\"Message\":\"The operation was cancelled by the user.\"},{\"Key\":\"vpxd.vm.poweron.unexpectedfailure\",\"Arg\":[{\"Key\":\"1\",\"Value\":\"clever_brattain-f2d3325e3730\"}],\"Message\":\"An error was received from the ESX host while powering on VM clever_brattain-f2d3325e3730.\"}]}"
-
-	tests := []struct {
-		in            string
-		lockedDevices []string
-	}{
-		{
-			in: lockErrJSON,
-			lockedDevices: []string{
-				"/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/bad81f01-8d32-4640-8b83-b4bb7e4a2350/bad81f01-8d32-4640-8b83-b4bb7e4a2350.vmdk",
-				"/vmfs/volumes/vsan:528032dc62774050-6ae24609f5c3816d/9d7c7159-c1b0-0579-1858-020023f9738b/volumes/f1915d56-2c34-454f-bcdf-2a96db0600c2/f1915d56-2c34-454f-bcdf-2a96db0600c2.vmdk",
-			},
-		},
-		{
-			in:            nonLockErrJSON,
-			lockedDevices: nil,
-		},
-	}
-
-	var vmFault types.GenericVmConfigFault
-	for _, test := range tests {
-		json.Unmarshal([]byte(test.in), &vmFault)
-		err := task.Error{
-			LocalizedMethodFault: &types.LocalizedMethodFault{
-				Fault: &vmFault,
-			},
-		}
-
-		devices := LockedDisks(err)
-		assert.Equal(t, test.lockedDevices, devices, "didn't get expected locked devices")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/basic_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/basic_test.go
deleted file mode 100644
index 8f2963c83d..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/basic_test.go
+++ /dev/null
@@ -1,454 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package extraconfig
-
-import (
-	"encoding/base64"
-	"net"
-	"net/url"
-	"os/exec"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-// [BEGIN] SLIMMED DOWNED and MODIFIED VERSION of github.com/vmware/vic/lib/metadata
-type Common struct {
-	ExecutionEnvironment string `vic:"0.1" recurse:"depth=0"`
-
-	ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-	Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-	Notes string `vic:"0.1" scope:"read-only" key:"notes"`
-}
-
-type ContainerVM struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-
-	Version string `vic:"0.1" scope:"hidden" key:"version"`
-
-	Aliases map[string]string `vic:"0.1" recurse:"depth=0"`
-
-	Interaction url.URL `vic:"0.1" recurse:"depth=0"`
-
-	AgentKey []byte `vic:"0.1" recurse:"depth=0"`
-}
-
-type ExecutorConfig struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-
-	Sessions map[string]SessionConfig `vic:"0.1" scope:"hidden" key:"sessions"`
-
-	Key string `json:"string"`
-}
-
-type ExecutorConfigPointers struct {
-	Common `vic:"0.1" scope:"read-only" key:"common"`
-
-	Sessions map[string]*SessionConfig `vic:"0.1" scope:"hidden" key:"sessions"`
-
-	Key string `json:"string"` // will inherit parent vic attributes
-}
-
-type Cmd struct {
-	Path string `vic:"0.1" scope:"hidden" key:"path"`
-
-	Args []string `vic:"0.1" scope:"hidden" key:"args"`
-
-	Env []string `vic:"0.1" scope:"hidden" key:"env"`
-
-	Dir string `vic:"0.1" scope:"hidden" key:"dir"`
-
-	Cmd *exec.Cmd `vic:"0.1" scope:"hidden" key:"cmd" recurse:"depth=0"`
-}
-
-type SessionConfig struct {
-	Common `vic:"0.1" scope:"hidden" key:"common" json:"page"`
-
-	Cmd Cmd `vic:"0.1" scope:"hidden" key:"cmd"`
-
-	Tty bool `vic:"0.1" scope:"hidden" key:"tty"`
-}
-
-type ExecutorConfigPointersVisible struct {
-	Sessions map[string]*VisibleSessionConfig `vic:"0.1" scope:"read-only" key:"sessions"`
-}
-
-type VisibleSessionConfig struct {
-	Cmd Cmd `vic:"0.1" scope:"read-only" key:"cmd"`
-
-	Tty bool `vic:"0.1" scope:"read-only" key:"tty"`
-}
-
-// [END] SLIMMED VERSION of github.com/vmware/vic/lib/metadata
-
-// make it verbose during testing
-func init() {
-	logger.Level = logrus.DebugLevel
-}
-
-func TestBasic(t *testing.T) {
-	type Type struct {
-		Int    int     `vic:"0.1" scope:"read-write" key:"int"`
-		Bool   bool    `vic:"0.1" scope:"read-write" key:"bool"`
-		Float  float64 `vic:"0.1" scope:"read-write" key:"float"`
-		String string  `vic:"0.1" scope:"read-write" key:"string"`
-	}
-
-	Struct := Type{
-		42,
-		true,
-		3.14,
-		"Grrr",
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Struct)
-
-	expected := map[string]string{
-		visibleRW("int"):    "42",
-		visibleRW("bool"):   "true",
-		visibleRW("float"):  "3.14E+00",
-		visibleRW("string"): "Grrr",
-	}
-
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Struct, decoded, "Encoded and decoded does not match")
-}
-
-func TestBasicMap(t *testing.T) {
-	type Type struct {
-		IntMap map[string]int `vic:"0.1" scope:"read-only" key:"intmap"`
-	}
-
-	// key is not present
-	var decoded Type
-	Decode(MapSource(nil), &decoded)
-	assert.NotNil(t, decoded.IntMap)
-	assert.Empty(t, decoded.IntMap)
-
-	IntMap := Type{
-		map[string]int{
-			"1st": 12345,
-			"2nd": 67890,
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), IntMap)
-
-	expected := map[string]string{
-		visibleRO("intmap" + Separator + "1st"): "12345",
-		visibleRO("intmap" + Separator + "2nd"): "67890",
-		visibleRO("intmap"):                     "1st" + Separator + "2nd",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	// Decode to new variable
-	decoded = Type{}
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, IntMap, decoded, "Encoded and decoded does not match")
-
-	// Decode to already existing variable
-	IntMapOptimusPrime := Type{
-		map[string]int{
-			"first":  1,
-			"second": 2,
-			"1st":    0,
-		},
-	}
-	Decode(MapSource(encoded), &IntMapOptimusPrime)
-
-	// We expect a merge and over-write
-	expectedOptimusPrime := Type{
-		map[string]int{
-			"1st":    12345,
-			"2nd":    67890,
-			"first":  1,
-			"second": 2,
-		},
-	}
-	assert.Equal(t, IntMapOptimusPrime, expectedOptimusPrime, "Decoded and expected does not match")
-
-}
-
-func TestBasicSlice(t *testing.T) {
-	type Type struct {
-		IntSlice []int `vic:"0.1" scope:"read-only" key:"intslice"`
-	}
-
-	IntSlice := Type{
-		[]int{1, 2, 3, 4, 5},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), IntSlice)
-
-	expected := map[string]string{
-		visibleRO("intslice~"): "1" + Separator + "2" + Separator + "3" + Separator + "4" + Separator + "5",
-		visibleRO("intslice"):  "4",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	decoded.IntSlice = make([]int, 1)
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, IntSlice, decoded, "Encoded and decoded does not match")
-}
-
-func TestStruct(t *testing.T) {
-	type Type struct {
-		Common Common `vic:"0.1" scope:"read-only" key:"common"`
-	}
-
-	Struct := Type{
-		Common: Common{
-			ID:   "0xDEADBEEF",
-			Name: "Struct",
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Struct)
-
-	expected := map[string]string{
-		visibleRO("common/id"):    "0xDEADBEEF",
-		visibleRO("common/name"):  "Struct",
-		visibleRO("common/notes"): "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Struct, decoded, "Encoded and decoded does not match")
-}
-
-func TestTime(t *testing.T) {
-	type Type struct {
-		Time time.Time `vic:"0.1" scope:"read-only" key:"time"`
-	}
-
-	Time := Type{
-		Time: time.Date(2009, 11, 10, 23, 00, 00, 0, time.UTC),
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Time)
-
-	expected := map[string]string{
-		visibleRO("time"): "2009-11-10 23:00:00 +0000 UTC",
-	}
-	assert.Equal(t, encoded, expected, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Time, decoded, "Encoded and decoded does not match")
-}
-
-func TestNet(t *testing.T) {
-	type Type struct {
-		Net net.IPNet `vic:"0.1" scope:"read-only" key:"net"`
-	}
-
-	// 127.0.0.1/8
-	n := net.IPNet{IP: net.IP{0x7f, 0x0, 0x0, 0x1}, Mask: net.IPMask{0xff, 0x0, 0x0, 0x0}}
-	Net := Type{
-		Net: n,
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Net)
-
-	expected := map[string]string{
-		visibleRO("net/IP"):   base64.StdEncoding.EncodeToString(n.IP),
-		visibleRO("net/Mask"): base64.StdEncoding.EncodeToString(n.Mask),
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Net, decoded, "Encoded and decoded does not match")
-}
-
-func TestNilNetPointer(t *testing.T) {
-	type Type struct {
-		Net *net.IPNet `vic:"0.1" scope:"read-only" key:"net"`
-	}
-
-	Net := Type{
-		Net: nil,
-	}
-
-	// Net should be nil - pointers are supposed to be nil if the referenced tree is zero valued
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Net)
-
-	expected := map[string]string{}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Net, decoded, "Encoded and decoded does not match")
-}
-
-func TestPointer(t *testing.T) {
-	type Type struct {
-		Pointer           *ContainerVM `vic:"0.1" scope:"hidden" key:"pointer"`
-		PointerOmitnested *ContainerVM `vic:"0.1" scope:"non-persistent" key:"pointeromitnested" recurse:"depth=0"`
-	}
-
-	Pointer := Type{
-		Pointer: &ContainerVM{Version: "0.1"},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Pointer)
-
-	expected := map[string]string{
-		visibleRO("pointer/common/id"):    "",
-		visibleRO("pointer/common/name"):  "",
-		visibleRO("pointer/common/notes"): "",
-		"pointer/version":                 "0.1",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Pointer, decoded, "Encoded and decoded does not match")
-}
-
-func TestInheritenceOfNonPersistence(t *testing.T) {
-	type CommonPersistence struct {
-		ExecutionEnvironment string `vic:"0.1" recurse:"depth=0"`
-
-		ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-		Name string `vic:"0.1" scope:"read-only" key:"name"`
-
-		Notes string `vic:"0.1" scope:"hidden" key:"notes"`
-	}
-
-	type Type struct {
-		Common CommonPersistence `vic:"0.1" scope:"read-write,non-persistent" key:"common"`
-	}
-
-	Struct := Type{
-		Common: CommonPersistence{
-			ID:   "0xDEADBEEF",
-			Name: "Struct",
-		},
-	}
-
-	encoded := map[string]string{}
-	filterSink := ScopeFilterSink(NonPersistent|Hidden, MapSink(encoded))
-	Encode(filterSink, Struct)
-
-	expected := map[string]string{
-		visibleRONonpersistent("common/id"):   "0xDEADBEEF",
-		visibleRONonpersistent("common/name"): "Struct",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Struct, decoded, "Encoded and decoded does not match")
-}
-
-func TestInheritenceOfNonPersistenceWithPointer(t *testing.T) {
-
-	type Persistence struct {
-		ExecutorConfigPointersVisible `vic:"0.1" scope:"read-only,non-persistent" key:"pointers"`
-	}
-
-	Struct := Persistence{
-		ExecutorConfigPointersVisible: ExecutorConfigPointersVisible{
-			Sessions: map[string]*VisibleSessionConfig{
-				"primary": {
-					Tty: true,
-				},
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	filterSink := ScopeFilterSink(NonPersistent|Hidden, MapSink(encoded))
-	Encode(filterSink, Struct)
-
-	expected := map[string]string{
-		visibleRONonpersistent("pointers/sessions"):                             "primary",
-		visibleRONonpersistent("pointers/sessions" + Separator + "primary/tty"): "true",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Persistence
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Struct, decoded, "Encoded and decoded does not match")
-}
-
-func TestFilterSink(t *testing.T) {
-	type CommonPersistence struct {
-		ExecutionEnvironment string `vic:"0.1" recurse:"depth=0"`
-
-		ID string `vic:"0.1" scope:"read-only" key:"id"`
-
-		Name string `vic:"0.1" scope:"read-only,non-persistent" key:"name"`
-
-		Notes string `vic:"0.1" scope:"read-only" key:"notes"`
-	}
-
-	type Type struct {
-		Common CommonPersistence `vic:"0.1" scope:"read-write" key:"common"`
-	}
-
-	Struct := Type{
-		Common: CommonPersistence{
-			ID:   "0xDEADBEEF",
-			Name: "Struct",
-		},
-	}
-
-	encoded := map[string]string{}
-	filterSink := ScopeFilterSink(NonPersistent|Hidden, MapSink(encoded))
-	Encode(filterSink, Struct)
-
-	expected := map[string]string{
-		visibleRONonpersistent("common/name"): "Struct",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	// strip ID as that would be filtered out
-	Struct.Common.ID = ""
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Struct, decoded, "Encoded and decoded does not match")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/clean_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/clean_test.go
deleted file mode 100644
index 5c09f6374a..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/clean_test.go
+++ /dev/null
@@ -1,537 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package extraconfig
-
-import (
-	"encoding/base64"
-	"fmt"
-	"net"
-	"testing"
-	"time"
-
-	"github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-)
-
-// make it verbose during testing
-func init() {
-	logger.Level = logrus.DebugLevel
-}
-
-func TestEmbedded(t *testing.T) {
-
-	type Type struct {
-		Common `vic:"0.1" scope:"read-only" key:"common"`
-	}
-
-	Embedded := Type{
-		Common: Common{
-			ID:   "0xDEADBEEF",
-			Name: "Embedded",
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Embedded)
-
-	expected := map[string]string{
-		visibleRO("common/id"):    "0xDEADBEEF",
-		visibleRO("common/name"):  "Embedded",
-		visibleRO("common/notes"): "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Embedded, decoded, "Encoded and decoded does not match")
-}
-
-func TestNetPointer(t *testing.T) {
-	type Type struct {
-		Net *net.IPNet `vic:"0.1" scope:"read-only" key:"net"`
-	}
-
-	// 127.0.0.1/8
-	n := net.IPNet{IP: net.IP{0x7f, 0x0, 0x0, 0x1}, Mask: net.IPMask{0xff, 0x0, 0x0, 0x0}}
-	Net := Type{
-		Net: &n,
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Net)
-
-	expected := map[string]string{
-		visibleRO("net/IP"):   base64.StdEncoding.EncodeToString(n.IP),
-		visibleRO("net/Mask"): base64.StdEncoding.EncodeToString(n.Mask),
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Net, decoded, "Encoded and decoded does not match")
-}
-
-func TestTimePointer(t *testing.T) {
-	d := time.Date(2009, 11, 10, 23, 00, 00, 0, time.UTC)
-
-	type Type struct {
-		Time *time.Time `vic:"0.1" scope:"read-only" key:"time"`
-	}
-
-	Time := Type{
-		Time: &d,
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), Time)
-
-	expected := map[string]string{
-		visibleRO("time"): "2009-11-10 23:00:00 +0000 UTC",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, Time, decoded, "Encoded and decoded does not match")
-}
-
-func TestStructMap(t *testing.T) {
-	type Type struct {
-		StructMap map[string]Common `vic:"0.1" scope:"read-only" key:"map"`
-	}
-
-	StructMap := Type{
-		map[string]Common{
-			"Key1": {
-				ID:   "0xDEADBEEF",
-				Name: "beef",
-			},
-			"Key2": {
-				ID:   "0x8BADF00D",
-				Name: "food",
-			},
-			"Key3": {
-				ID:   "0xDEADF00D",
-				Name: "dead",
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), StructMap)
-
-	expected := map[string]string{
-		visibleRO("map" + Separator + "Key1/id"):    "0xDEADBEEF",
-		visibleRO("map" + Separator + "Key1/name"):  "beef",
-		visibleRO("map" + Separator + "Key1/notes"): "",
-		visibleRO("map" + Separator + "Key2/id"):    "0x8BADF00D",
-		visibleRO("map" + Separator + "Key2/name"):  "food",
-		visibleRO("map" + Separator + "Key2/notes"): "",
-		visibleRO("map" + Separator + "Key3/id"):    "0xDEADF00D",
-		visibleRO("map" + Separator + "Key3/name"):  "dead",
-		visibleRO("map" + Separator + "Key3/notes"): "",
-		visibleRO("map"):                            "Key1" + Separator + "Key2" + Separator + "Key3",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, StructMap, decoded, "Encoded and decoded does not match")
-}
-
-func TestIntStructMap(t *testing.T) {
-	type Type struct {
-		StructMap map[int]Common `vic:"0.1" scope:"read-only" key:"map"`
-	}
-
-	StructMap := Type{
-		map[int]Common{
-			1: {
-				ID:   "0xDEADBEEF",
-				Name: "beef",
-			},
-			2: {
-				ID:   "0x8BADF00D",
-				Name: "food",
-			},
-			3: {
-				ID:   "0xDEADF00D",
-				Name: "dead",
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), StructMap)
-
-	expected := map[string]string{
-		visibleRO("map" + Separator + "1/id"):    "0xDEADBEEF",
-		visibleRO("map" + Separator + "1/name"):  "beef",
-		visibleRO("map" + Separator + "1/notes"): "",
-		visibleRO("map" + Separator + "2/id"):    "0x8BADF00D",
-		visibleRO("map" + Separator + "2/name"):  "food",
-		visibleRO("map" + Separator + "2/notes"): "",
-		visibleRO("map" + Separator + "3/id"):    "0xDEADF00D",
-		visibleRO("map" + Separator + "3/name"):  "dead",
-		visibleRO("map" + Separator + "3/notes"): "",
-		visibleRO("map"):                         "1" + Separator + "2" + Separator + "3",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, StructMap, decoded, "Encoded and decoded does not match")
-}
-
-func TestStructSlice(t *testing.T) {
-	type Type struct {
-		StructSlice []Common `vic:"0.1" scope:"read-only" key:"slice"`
-	}
-
-	StructSlice := Type{
-		[]Common{
-			{
-				ID:   "0xDEADFEED",
-				Name: "feed",
-			},
-			{
-				ID:   "0xFACEFEED",
-				Name: "face",
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), StructSlice)
-
-	expected := map[string]string{
-		visibleRO("slice"):                         "1",
-		visibleRO("slice" + Separator + "0/id"):    "0xDEADFEED",
-		visibleRO("slice" + Separator + "0/name"):  "feed",
-		visibleRO("slice" + Separator + "0/notes"): "",
-		visibleRO("slice" + Separator + "1/id"):    "0xFACEFEED",
-		visibleRO("slice" + Separator + "1/name"):  "face",
-		visibleRO("slice" + Separator + "1/notes"): "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, StructSlice, decoded, "Encoded and decoded does not match")
-}
-
-func TestMultipleScope(t *testing.T) {
-	MultipleScope := struct {
-		MultipleScope string `vic:"0.1" scope:"read-only,hidden,non-persistent" key:"multiscope"`
-	}{
-		"MultipleScope",
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), MultipleScope)
-
-	expected := map[string]string{}
-	assert.Equal(t, expected, encoded, "Not equal")
-}
-
-func TestUnknownScope(t *testing.T) {
-	UnknownScope := struct {
-		UnknownScope int `vic:"0.1" scope:"unknownscope" key:"unknownscope"`
-	}{
-		42,
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), UnknownScope)
-
-	expected := map[string]string{}
-	assert.Equal(t, encoded, expected, "Not equal")
-}
-
-func TestUnknownProperty(t *testing.T) {
-	UnknownProperty := struct {
-		UnknownProperty int `vic:"0.1" scope:"hidden" key:"unknownproperty" recurse:"unknownproperty"`
-	}{
-		42,
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), UnknownProperty)
-
-	expected := map[string]string{
-		hidden("unknownproperty"): "42",
-	}
-	assert.Equal(t, expected, encoded, "Not equal")
-}
-
-func TestOmitNested(t *testing.T) {
-	OmitNested := struct {
-		Time        time.Time `vic:"0.1" scope:"volatile" key:"time" recurse:"depth=0"`
-		CurrentTime time.Time `vic:"0.1" scope:"volatile" key:"time"`
-	}{
-		Time:        time.Date(2009, 11, 10, 23, 00, 00, 0, time.UTC),
-		CurrentTime: time.Date(2009, 11, 10, 23, 00, 00, 0, time.UTC),
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), OmitNested)
-
-	expected := map[string]string{
-		visibleRO("time"): "2009-11-10 23:00:00 +0000 UTC",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and decoded does not match")
-
-}
-
-func TestComplex(t *testing.T) {
-	type Type struct {
-		ExecutorConfig ExecutorConfig `vic:"0.1" scope:"hidden" key:"executorconfig"`
-	}
-
-	ExecutorConfig := Type{
-		ExecutorConfig{
-			Sessions: map[string]SessionConfig{
-				"Session1": {
-					Common: Common{
-						ID:   "SessionID",
-						Name: "SessionName",
-					},
-					Tty: true,
-					Cmd: Cmd{
-						Path: "/vmware",
-						Args: []string{"/bin/imagec", "-standalone"},
-						Env:  []string{"PATH=/bin", "USER=imagec"},
-						Dir:  "/",
-					},
-				},
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), ExecutorConfig)
-
-	expected := map[string]string{
-		visibleRO("executorconfig/common/id"):                                      "",
-		visibleRO("executorconfig/common/name"):                                    "",
-		visibleRO("executorconfig/common/notes"):                                   "",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/id"):    "SessionID",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/name"):  "SessionName",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/notes"): "",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/path"):        "/vmware",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/args~"):       "/bin/imagec" + Separator + "-standalone",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/args"):        "1",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/env~"):        "PATH=/bin" + Separator + "USER=imagec",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/env"):         "1",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/dir"):         "/",
-		hidden("executorconfig/sessions" + Separator + "Session1/tty"):             "true",
-		hidden("executorconfig/sessions"):                                          "Session1",
-		hidden("executorconfig/Key"):                                               "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, ExecutorConfig, decoded, "Encoded and decoded does not match")
-}
-
-func TestComplexPointer(t *testing.T) {
-	type Type struct {
-		ExecutorConfig *ExecutorConfig `vic:"0.1" scope:"hidden" key:"executorconfig"`
-	}
-
-	ExecutorConfig := Type{
-		&ExecutorConfig{
-			Sessions: map[string]SessionConfig{
-				"Session1": {
-					Common: Common{
-						ID:   "SessionID",
-						Name: "SessionName",
-					},
-					Tty: true,
-					Cmd: Cmd{
-						Path: "/vmware",
-						Args: []string{"/bin/imagec", "-standalone"},
-						Env:  []string{"PATH=/bin", "USER=imagec"},
-						Dir:  "/",
-					},
-				},
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), ExecutorConfig)
-
-	expected := map[string]string{
-		visibleRO("executorconfig/common/id"):                                      "",
-		visibleRO("executorconfig/common/name"):                                    "",
-		visibleRO("executorconfig/common/notes"):                                   "",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/id"):    "SessionID",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/name"):  "SessionName",
-		visibleRO("executorconfig/sessions" + Separator + "Session1/common/notes"): "",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/path"):        "/vmware",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/args~"):       "/bin/imagec" + Separator + "-standalone",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/args"):        "1",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/env~"):        "PATH=/bin" + Separator + "USER=imagec",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/env"):         "1",
-		hidden("executorconfig/sessions" + Separator + "Session1/cmd/dir"):         "/",
-		hidden("executorconfig/sessions" + Separator + "Session1/tty"):             "true",
-		hidden("executorconfig/sessions"):                                          "Session1",
-		hidden("executorconfig/Key"):                                               "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Type
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, ExecutorConfig, decoded, "Encoded and decoded does not match")
-}
-
-// TestPointerDecode tests the translation from a type where the sessions are direct values to
-// one where they are pointers
-func TestPointerDecode(t *testing.T) {
-	reference := ExecutorConfig{
-		Sessions: map[string]SessionConfig{
-			"Session1": {
-				Common: Common{
-					ID:   "SessionID",
-					Name: "SessionName",
-				},
-				Tty: true,
-				Cmd: Cmd{
-					Path: "/vmware",
-					Args: []string{"/bin/imagec", "-standalone"},
-					Env:  []string{"PATH=/bin", "USER=imagec"},
-					Dir:  "/",
-				},
-			},
-		},
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), reference)
-
-	expected := map[string]string{
-		visibleRO("common/id"):                                      "",
-		visibleRO("common/name"):                                    "",
-		visibleRO("common/notes"):                                   "",
-		visibleRO("sessions" + Separator + "Session1/common/id"):    "SessionID",
-		visibleRO("sessions" + Separator + "Session1/common/name"):  "SessionName",
-		visibleRO("sessions" + Separator + "Session1/common/notes"): "",
-		hidden("sessions" + Separator + "Session1/cmd/path"):        "/vmware",
-		hidden("sessions" + Separator + "Session1/cmd/args~"):       "/bin/imagec" + Separator + "-standalone",
-		hidden("sessions" + Separator + "Session1/cmd/args"):        "1",
-		hidden("sessions" + Separator + "Session1/cmd/env~"):        "PATH=/bin" + Separator + "USER=imagec",
-		hidden("sessions" + Separator + "Session1/cmd/env"):         "1",
-		hidden("sessions" + Separator + "Session1/cmd/dir"):         "/",
-		hidden("sessions" + Separator + "Session1/tty"):             "true",
-		hidden("sessions"):                                          "Session1",
-		hidden("Key"):                                               "",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded ExecutorConfigPointers
-	Decode(MapSource(encoded), &decoded)
-
-	// cannot assert equality at a high level because of the different structure types, but we can test the
-	// common structure fragments
-	assert.Equal(t, reference.Sessions["Session1"], *decoded.Sessions["Session1"], "Encoded and decoded sessions do not match")
-
-}
-
-func TestInsideOutside(t *testing.T) {
-	type Inside struct {
-		ID   string `vic:"0.1" scope:"read-write" key:"id"`
-		Name string `vic:"0.1" scope:"read-write" key:"name"`
-	}
-
-	type Outside struct {
-		Inside Inside `vic:"0.1" scope:"read-only" key:"inside"`
-		ID     string `vic:"0.1" scope:"read-write" key:"id"`
-		Name   string `vic:"0.1" scope:"read-write" key:"name"`
-	}
-	outside := Outside{
-		Inside: Inside{
-			ID:   "inside",
-			Name: "Inside",
-		},
-		ID:   "outside",
-		Name: "Outside",
-	}
-
-	encoded := map[string]string{}
-	Encode(MapSink(encoded), outside)
-
-	expected := map[string]string{
-		visibleRW("inside.id"):   "inside",
-		visibleRW("inside.name"): "Inside",
-		visibleRW("id"):          "outside",
-		visibleRW("name"):        "Outside",
-	}
-	assert.Equal(t, expected, encoded, "Encoded and expected does not match")
-
-	var decoded Outside
-	Decode(MapSource(encoded), &decoded)
-
-	assert.Equal(t, outside, decoded, "Encoded and decoded does not match")
-
-}
-
-func TestIPSlice(t *testing.T) {
-	type Slice struct {
-		Slice []net.IP `vic:"0.1" scope:"read-only" key:"slice"`
-	}
-
-	ips := []net.IP{
-		net.ParseIP("10.10.10.10"),
-		net.ParseIP("10.10.10.1"),
-	}
-
-	encodedIPs := make([]string, len(ips))
-	for i := range ips {
-		Encode(func(key, value string) error {
-			encodedIPs[i] = value
-			return nil
-		}, ips[i])
-	}
-
-	s := Slice{
-		Slice: ips,
-	}
-
-	encoded := make(map[string]string)
-	Encode(MapSink(encoded), s)
-
-	expected := map[string]string{
-		visibleRO("slice"): fmt.Sprintf("%d", len(ips)-1),
-	}
-	for i := range encodedIPs {
-		expected[visibleRO(fmt.Sprintf("slice"+Separator+"%d", i))] = encodedIPs[i]
-	}
-
-	assert.Equal(t, expected, encoded, "Encoded and expected do not match")
-
-	var decoded Slice
-	Decode(MapSource(encoded), &decoded)
-	assert.Equal(t, s, decoded, "Encoded and decoded do not match")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/existing_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/existing_test.go
deleted file mode 100644
index 9953c4b946..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/existing_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package extraconfig
-
-import "testing"
-
-func TestExistingBasic(t *testing.T) {
-	t.Skip("decode into existing target tests not yet implemented")
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/keys_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/keys_test.go
deleted file mode 100644
index 42d706bdbd..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/keys_test.go
+++ /dev/null
@@ -1,269 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package extraconfig
-
-import (
-	"testing"
-
-	"strings"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func visibleRO(key string) string {
-	return calculateKey(calculateScope([]string{"read-only"}), "", key)
-}
-
-func visibleRONonpersistent(key string) string {
-	return calculateKey(calculateScope([]string{"read-only", "non-persistent"}), "", key)
-}
-
-func visibleRW(key string) string {
-	return calculateKey(calculateScope([]string{"read-write"}), "", key)
-}
-
-func hidden(key string) string {
-	return calculateKey(calculateScope([]string{"hidden"}), "", key)
-}
-
-func TestHidden(t *testing.T) {
-	scopes := []string{"hidden"}
-
-	key := calculateKey(calculateScope(scopes), "a/b", "c")
-
-	assert.Equal(t, "a/b/c", key, "Key should remain hidden")
-}
-
-func TestHide(t *testing.T) {
-	scopes := []string{"hidden"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+"/a/b", "c")
-
-	assert.Equal(t, "a/b/c", key, "Key should be hidden")
-}
-
-func TestReveal(t *testing.T) {
-	scopes := []string{"read-only"}
-
-	key := calculateKey(calculateScope(scopes), "a/b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+"/a/b/c", key, "Key should be exposed")
-}
-
-func TestVisibleReadOnly(t *testing.T) {
-	scopes := []string{"read-only"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+"/a/b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+"/a/b/c", key, "Key should be remain visible and read-only")
-}
-
-func TestVisibleReadWrite(t *testing.T) {
-	scopes := []string{"read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+".a.b.c", key, "Key should be remain visible and read-write")
-}
-
-func TestTopLevelReadOnly(t *testing.T) {
-	scopes := []string{"read-only"}
-
-	key := calculateKey(calculateScope(scopes), "", "a")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+"/a", key, "Key should be visible and read-only")
-}
-
-func TestReadOnlyToReadWrite(t *testing.T) {
-	scopes := []string{"read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+"/a/b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+".a.b.c", key, "Key should be visible and change to read-write")
-}
-
-func TestReadWriteToReadOnly(t *testing.T) {
-	scopes := []string{"read-only"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+"/a/b/c", key, "Key should be visible and change to read-only")
-}
-
-func TestCompoundKey(t *testing.T) {
-	scopes := []string{"read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a", "b/c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+".a.b.c", key, "Key should be visible and read-write")
-}
-
-func TestNoScopes(t *testing.T) {
-	scopes := []string{}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a/b", "c")
-	assert.Equal(t, "a/b/c", key, "Key should be completely proscriptive")
-
-	key = calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-	assert.Equal(t, "a.b/c", key, "Key should be hidden")
-
-	key = calculateKey(calculateScope(scopes), "a.b", "c")
-	assert.Equal(t, "a.b/c", key, "Key should remain hidden")
-}
-
-func TestSecret(t *testing.T) {
-	scopes := []string{"secret", "read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+".a.b.c"+suffixSeparator+secretSuffix, key, "Key should have secret suffix")
-}
-
-func TestNonpersistent(t *testing.T) {
-	scopes := []string{"non-persistent", "read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-
-	assert.Equal(t, DefaultGuestInfoPrefix+".a.b.c"+suffixSeparator+nonpersistentSuffix, key, "Key should have non-persistent suffix")
-}
-
-func TestMultipleSuffixes(t *testing.T) {
-	scopes := []string{"non-persistent", "secret", "read-write"}
-
-	key := calculateKey(calculateScope(scopes), DefaultGuestInfoPrefix+".a.b", "c")
-
-	assert.True(t, strings.Contains(key, suffixSeparator+secretSuffix) && strings.Contains(key, suffixSeparator+nonpersistentSuffix), "Key should contain both secret and non-persistent suffix")
-}
-
-func TestCalculateKeys(t *testing.T) {
-	type AStruct struct {
-		I int
-	}
-	type Type struct {
-		ExecutorConfig ExecutorConfig `vic:"0.1" scope:"hidden" key:"executorconfig"`
-		Array          []AStruct      `vic:"0.1" scope:"read-write" key:"array"`
-		Ptr            *AStruct       `vic:"0.1" scope:"read-only" key:"ptr"`
-		Str            string         `vic:"0.1" scope:"read-only" key:"str"`
-		Bytes          []uint8        `vic:"0.1" scope:"read-write" key:"bytes"`
-	}
-
-	ec := Type{
-		ExecutorConfig: ExecutorConfig{
-			Sessions: map[string]SessionConfig{
-				"Session1": {
-					Common: Common{
-						ID:   "SessionID",
-						Name: "SessionName",
-					},
-					Tty: true,
-					Cmd: Cmd{
-						Path: "/vmware",
-						Args: []string{"/bin/imagec", "-standalone"},
-						Env:  []string{"PATH=/bin", "USER=imagec"},
-						Dir:  "/",
-					},
-				},
-			},
-		},
-		Array: []AStruct{
-			{I: 0},
-		},
-		Ptr: &AStruct{
-			I: 1,
-		},
-		Str:   "foo",
-		Bytes: []byte{0xd, 0xe, 0xa, 0xd, 0xb, 0xe, 0xe, 0xf},
-	}
-
-	var tests = []struct {
-		in  string
-		out []string
-	}{
-		{
-			"ExecutorConfig.*",
-			[]string{
-				visibleRO("executorconfig/common"),
-				hidden("executorconfig/sessions"),
-				"executorconfig/Key",
-			},
-		},
-		{
-			"ExecutorConfig.Sessions.*",
-			[]string{"executorconfig/sessions" + Separator + "Session1"},
-		},
-		{
-			"ExecutorConfig.Sessions.Session1.Cmd.Args",
-			[]string{"executorconfig/sessions" + Separator + "Session1/cmd/args"},
-		},
-		{
-			"ExecutorConfig.Sessions.*.Cmd.Args.*",
-			[]string{"executorconfig/sessions" + Separator + "Session1/cmd/args~"},
-		},
-		{
-			"ExecutorConfig.Sessions.*.Cmd.Args.0",
-			[]string{"executorconfig/sessions" + Separator + "Session1/cmd/args~"},
-		},
-		{
-			"Array.0.I",
-			[]string{visibleRW("array" + Separator + "0/I")},
-		},
-		{
-			"Array.*",
-			[]string{visibleRW("array" + Separator + "0")},
-		},
-		{
-			"Ptr.I",
-			[]string{visibleRO("ptr/I")},
-		},
-		{
-			"Str",
-			[]string{visibleRO("str")},
-		},
-		{
-			"Bytes",
-			[]string{visibleRW("bytes")},
-		},
-		{
-			"Bytes.0",
-			[]string{visibleRW("bytes")},
-		},
-		{
-			"Bytes.*",
-			[]string{visibleRW("bytes")},
-		},
-	}
-
-	for _, te := range tests {
-		keys := CalculateKeys(ec, te.in, "")
-		assert.Equal(t, te.out, keys)
-	}
-
-	panicTests := []string{
-		"Array.1.I",
-		"Array.0.i",
-		"Array.f.i",
-		"ExecutorConfig.foo",
-		"foo",
-		"ExecutorConfig.Sessions.foo",
-		"Str.*",
-		"Str.foo",
-	}
-
-	for _, te := range panicTests {
-		assert.Panics(t, func() {
-			CalculateKeys(ec, te, "")
-		})
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/secret_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/secret_test.go
deleted file mode 100644
index 685af1b5fa..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/secret_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package extraconfig
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestSecretFields(t *testing.T) {
-	type tell struct {
-		Who string `vic:"0.1" scope:"secret" key:"who"`
-	}
-
-	type stuff struct {
-		Username string `vic:"0.1" scope:"read-only" key:"username"`
-		Password string `vic:"0.1" scope:"secret" key:"password"`
-		Tell     tell
-	}
-
-	config := stuff{
-		Username: "root",
-		Password: "super-s@fe-passw0rd",
-		Tell:     tell{"noone"},
-	}
-
-	out, err := NewSecretKey()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	encoded := map[string]string{}
-	Encode(out.Sink(MapSink(encoded)), config)
-
-	password := encoded["guestinfo.vice./password"+suffixSeparator+secretSuffix]
-	assert.NotEmpty(t, password, "encrypted password")
-	assert.NotEqual(t, password, config.Password, "encrypted password")
-
-	for _, expectEq := range []bool{true, false} {
-		var in SecretKey
-
-		var decoded stuff
-		Decode(in.Source(MapSource(encoded)), &decoded)
-
-		if expectEq {
-			assert.Equal(t, config, decoded, "Encoded and decoded does not match")
-		} else {
-			assert.NotEqual(t, config, decoded, "Encoded and decoded should not not match")
-		}
-
-		// second time should fail to decrypt w/o GuestInfoSecretKey
-		delete(encoded, GuestInfoSecretKey)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi/delta_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi/delta_test.go
deleted file mode 100644
index dfd098ec55..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi/delta_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vmomi
-
-import (
-	"testing"
-
-	"reflect"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi/vim25/types"
-)
-
-func TestDelta(t *testing.T) {
-	new := map[string]string{
-		"hello":  "goodbye",
-		"cruel":  "world",
-		"is":     "not",
-		"enough": "already",
-	}
-
-	existing := []types.BaseOptionValue{
-		&types.OptionValue{Key: "hello", Value: "goodbye"},
-		&types.OptionValue{Key: "is", Value: "always"},
-		&types.OptionValue{Key: "present", Value: "regardless"},
-	}
-
-	updatesSlice := OptionValueUpdatesFromMap(existing, new)
-
-	expected := map[string]string{
-		"enough": "already", // added
-		"cruel":  "world",   // added
-		"is":     "not",     // changed
-	}
-
-	// turn them back into maps for equality check
-	updates := OptionValueMap(updatesSlice)
-
-	if !assert.True(t, reflect.DeepEqual(expected, updates), "DeepEqual says they do not match") {
-		t.Fatalf("Expected: %+q \nActual: %+q\n", expected, updates)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_linux.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_linux.go
deleted file mode 100644
index 0f4b34bbec..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_linux.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package guest
-
-import (
-	"fmt"
-	"io/ioutil"
-	"strings"
-
-	"context"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-const (
-	UUIDPath   = "/sys/class/dmi/id/product_serial"
-	UUIDPrefix = "VMware-"
-)
-
-// UUID gets the BIOS UUID via the sys interface.  This UUID is known by vphsere
-func UUID() (string, error) {
-	id, err := ioutil.ReadFile(UUIDPath)
-	if err != nil {
-		return "", fmt.Errorf("error retrieving vm uuid: %s", err)
-	}
-
-	uuidstr := string(id[:])
-
-	// check the uuid starts with "VMware-"
-	if !strings.HasPrefix(uuidstr, UUIDPrefix) {
-		return "", fmt.Errorf("cannot find this VM's UUID")
-	}
-
-	// Strip the prefix, white spaces, and the trailing '\n'
-	uuidstr = strings.Replace(uuidstr[len(UUIDPrefix):(len(uuidstr)-1)], " ", "", -1)
-
-	// need to add dashes, e.g. "564d395e-d807-e18a-cb25-b79f65eb2b9f"
-	uuidstr = fmt.Sprintf("%s-%s-%s-%s", uuidstr[0:8], uuidstr[8:12], uuidstr[12:21], uuidstr[21:])
-
-	return uuidstr, nil
-}
-
-// GetSelf gets VirtualMachine reference for the VM this process is running on
-func GetSelf(ctx context.Context, s *session.Session) (*vm.VirtualMachine, error) {
-	u, err := UUID()
-	if err != nil {
-		return nil, err
-	}
-
-	search := object.NewSearchIndex(s.Vim25())
-	ref, err := search.FindByUuid(ctx, s.Datacenter, u, true, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	if ref == nil {
-		return nil, fmt.Errorf("can't find the hosting vm")
-	}
-
-	return vm.NewVirtualMachine(ctx, s, ref.Reference()), nil
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_other.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_other.go
deleted file mode 100644
index 47a715c681..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_other.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-// +build !linux
-
-package guest
-
-import (
-	"fmt"
-	"runtime"
-
-	"context"
-
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
-)
-
-// UUID gets the BIOS UUID via the sys interface.  This UUID is known by vphsere
-func UUID() (string, error) {
-	return "", fmt.Errorf("unimplemented on %s", runtime.GOOS)
-}
-
-// GetSelf gets VirtualMachine reference for the VM this process is running on
-func GetSelf(ctx context.Context, s *session.Session) (*vm.VirtualMachine, error) {
-	return nil, fmt.Errorf("unimplemented on %s", runtime.GOOS)
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_test.go
deleted file mode 100644
index 05f5c1eb2a..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/guest/util_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package guest
-
-import (
-	"os/user"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/vmw-guestinfo/vmcheck"
-)
-
-func TestUUID(t *testing.T) {
-	if isVM, err := vmcheck.IsVirtualWorld(); !isVM || err != nil {
-		t.Skip("can get uuid if not running on a vm")
-	}
-	// need to be root and on esx to run this test
-	u, err := user.Current()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if u.Uid != "0" {
-		t.SkipNow()
-		return
-	}
-
-	s, err := UUID()
-	if !assert.NoError(t, err) {
-		return
-	}
-
-	if !assert.NotNil(t, s) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager.go
index cb666d63c6..7ce7981d46 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager.go
@@ -20,6 +20,7 @@ import (
 	"fmt"
 
 	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/vic/pkg/vsphere/session"
 )
 
@@ -39,3 +40,19 @@ func QueryOptionValue(ctx context.Context, s *session.Session, option string) (s
 
 	return "", fmt.Errorf("%d values querying option %q", len(opts), option)
 }
+
+// UpdateOptionValue uses the session client and OptionManager to set the input option
+func UpdateOptionValue(ctx context.Context, s *session.Session, option string, value string) error {
+	client := s.Vim25()
+	optMgr := object.NewOptionManager(client, *client.ServiceContent.Setting)
+	var opts []types.BaseOptionValue
+	opts = append(opts, &types.OptionValue{
+		Key:   option,
+		Value: value,
+	})
+	err := optMgr.Update(ctx, opts)
+	if err != nil {
+		return fmt.Errorf("error setting option %q: %s", option, err)
+	}
+	return nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager_test.go
deleted file mode 100644
index afdfc70701..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/optmanager/optmanager_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package optmanager
-
-import (
-	"context"
-	"testing"
-
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/vic/pkg/vsphere/test"
-)
-
-func TestQueryOptionValue(t *testing.T) {
-	ctx := context.Background()
-
-	model := simulator.VPX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-
-	s, err := test.SessionWithVPX(ctx, server.URL.String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Multiple value error
-	optValue, err := QueryOptionValue(ctx, s, "")
-	if err == nil {
-		t.Fatal("expected multiple value error")
-	}
-
-	// Invalid option
-	optValue, err = QueryOptionValue(ctx, s, "foo-bar")
-	if err == nil {
-		t.Fatal("expected invalid query error")
-	}
-
-	// Valid option
-	adminOptKey := "config.vpxd.sso.default.admin"
-	adminOptVal := "Administrator@vsphere.local"
-	optValue, err = QueryOptionValue(ctx, s, "config.vpxd.sso.default.admin")
-	if err != nil {
-		t.Fatalf("expected nil error, got: %s", err)
-	}
-	if optValue != adminOptVal {
-		t.Fatalf("expected value %s for query %q, got: %s", adminOptVal, adminOptKey, optValue)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/host_metrics.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/host_metrics.go
new file mode 100644
index 0000000000..23420b14c6
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/host_metrics.go
@@ -0,0 +1,226 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package performance
+
+import (
+	"fmt"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/performance"
+	"github.com/vmware/govmomi/property"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+const (
+	// cpuUsage measures the actively used CPU of the host, as a percentage of the total available CPU.
+	cpuUsage = "cpu.usage.average"
+
+	// memActive measures the sum of all active metrics for all powered-on VMs plus vSphere services on the host.
+	memActive = "mem.active.average"
+
+	// memConsumed measures the amount of machine memory used on the host, including vSphere services, VMkernel,
+	// the service console and the total consumed memory metrics for all running VMs.
+	memConsumed = "mem.consumed.average"
+
+	// memTotalCapacity measures the total amount of memory reservation used by and available for powered-on VMs
+	// and vSphere services on the host.
+	memTotalCapacity = "mem.totalCapacity.average"
+
+	// memOverhead measures the total of all overhead metrics for powered-on VMs, plus the overhead of running
+	// vSphere services on the host.
+	memOverhead = "mem.overhead.average"
+)
+
+// HostMemory stores an ESXi host's memory metrics.
+type HostMemory struct {
+	ActiveKB   int64
+	ConsumedKB int64
+	OverheadKB int64
+	TotalKB    int64
+}
+
+// HostCPU stores an ESXi host's CPU metrics.
+type HostCPU struct {
+	UsagePercent float64
+}
+
+// HostMetricsInfo stores an ESXi host's memory and CPU metrics.
+type HostMetricsInfo struct {
+	Memory HostMemory
+	CPU    HostCPU
+}
+
+// HostMetricsProvider returns CPU and memory metrics for all ESXi hosts in a cluster
+// via implementation of the MetricsProvider interface.
+type HostMetricsProvider struct {
+	*vim25.Client
+}
+
+// NewHostMetricsProvider returns a new instance of HostMetricsProvider.
+func NewHostMetricsProvider(c *vim25.Client) *HostMetricsProvider {
+	return &HostMetricsProvider{Client: c}
+}
+
+// GetMetricsForComputeResource gathers host metrics from the supplied compute resource.
+// Returned map is keyed on the host ManagedObjectReference in string form.
+func (h *HostMetricsProvider) GetMetricsForComputeResource(op trace.Operation, cr *object.ComputeResource) (map[string]*HostMetricsInfo, error) {
+	// Gather hosts from the session cluster and then obtain their morefs.
+	hosts, err := cr.Hosts(op)
+	if err != nil {
+		return nil, fmt.Errorf("unable to obtain host morefs from compute resource: %s", err)
+	}
+
+	if hosts == nil {
+		return nil, fmt.Errorf("no hosts found in compute resource")
+	}
+
+	return h.GetMetricsForHosts(op, hosts)
+}
+
+// GetMetricsForHosts returns metrics pertaining to supplied ESX hosts.
+// Returned map is keyed on the host ManagedObjectReference in string form.
+func (h *HostMetricsProvider) GetMetricsForHosts(op trace.Operation, hosts []*object.HostSystem) (map[string]*HostMetricsInfo, error) {
+	if len(hosts) == 0 {
+		return nil, fmt.Errorf("no hosts provided")
+	}
+
+	if h.Client == nil {
+		return nil, fmt.Errorf("client not set")
+	}
+
+	// filter out hosts that are in maintenance mode or disconnected
+	hosts, err := filterHosts(op, h.Client, hosts)
+	if err != nil {
+		return nil, err
+	}
+
+	morefToHost := make(map[string]*object.HostSystem)
+	morefs := make([]types.ManagedObjectReference, len(hosts))
+	for i, host := range hosts {
+		moref := host.Reference()
+		morefToHost[moref.String()] = host
+		morefs[i] = moref
+	}
+
+	// Query CPU and memory metrics for the morefs.
+	spec := types.PerfQuerySpec{
+		Format:     string(types.PerfFormatNormal),
+		IntervalId: sampleInterval,
+	}
+
+	counters := []string{cpuUsage, memActive, memConsumed, memTotalCapacity, memOverhead}
+	perfMgr := performance.NewManager(h.Client)
+	sample, err := perfMgr.SampleByName(op.Context, spec, counters, morefs)
+	if err != nil {
+		errStr := "unable to get metric sample: %s"
+		op.Errorf(errStr, err)
+		return nil, fmt.Errorf(errStr, err)
+	}
+
+	results, err := perfMgr.ToMetricSeries(op.Context, sample)
+	if err != nil {
+		errStr := "unable to convert metric sample to metric series: %s"
+		op.Errorf(errStr, err)
+		return nil, fmt.Errorf(errStr, err)
+	}
+
+	metrics := assembleMetrics(op, morefToHost, results)
+	return metrics, nil
+}
+
+// assembleMetrics processes the metric samples received from govmomi and returns a finalized metrics map
+// keyed by the hosts.
+func assembleMetrics(op trace.Operation, morefToHost map[string]*object.HostSystem,
+	results []performance.EntityMetric) map[string]*HostMetricsInfo {
+	metrics := make(map[string]*HostMetricsInfo)
+
+	for _, host := range morefToHost {
+		metrics[host.Reference().String()] = &HostMetricsInfo{}
+	}
+
+	for i := range results {
+		res := results[i]
+		host, exists := morefToHost[res.Entity.String()]
+		if !exists {
+			op.Warnf("moref %s does not exist in requested morefs, skipping", res.Entity.String())
+			continue
+		}
+
+		ref := host.Reference().String()
+		// Process each value and assign it directly to the corresponding metric field
+		// since there is only one sample.
+		for _, v := range res.Value {
+
+			// We don't need to collect non-aggregate (non-empty Instance) metrics.
+			if v.Instance != "" {
+				continue
+			}
+
+			if len(v.Value) == 0 {
+				op.Warnf("metric %s for moref %s has no value, skipping", v.Name, res.Entity.String())
+				continue
+			}
+
+			switch v.Name {
+			case cpuUsage:
+				// Convert percent units from 1/100th of a percent (100 = 1%) to a human-readable percentage.
+				metrics[ref].CPU.UsagePercent = float64(v.Value[0]) / 100.0
+			case memActive:
+				metrics[ref].Memory.ActiveKB = v.Value[0]
+			case memConsumed:
+				metrics[ref].Memory.ConsumedKB = v.Value[0]
+			case memOverhead:
+				metrics[ref].Memory.OverheadKB = v.Value[0]
+			case memTotalCapacity:
+				// Total capacity is in MB, convert to KB so as to have all memory values in KB.
+				metrics[ref].Memory.TotalKB = v.Value[0] * 1024
+			}
+		}
+	}
+
+	return metrics
+}
+
+// filterHosts removes candidate hosts who are either disconnected or in maintenance mode.
+func filterHosts(op trace.Operation, client *vim25.Client, hosts []*object.HostSystem) ([]*object.HostSystem, error) {
+	if len(hosts) == 0 {
+		return nil, fmt.Errorf("no candidate hosts to filter check")
+	}
+
+	props := []string{"summary.runtime"}
+	refs := make([]types.ManagedObjectReference, 0, len(hosts))
+	for _, h := range hosts {
+		refs = append(refs, h.Reference())
+	}
+
+	hs := make([]mo.HostSystem, 0, len(hosts))
+	pc := property.DefaultCollector(client)
+	err := pc.Retrieve(op, refs, props, &hs)
+	if err != nil {
+		return nil, err
+	}
+
+	result := hosts[:0]
+	for i, h := range hs {
+		if h.Summary.Runtime.ConnectionState == types.HostSystemConnectionStateConnected && !h.Summary.Runtime.InMaintenanceMode {
+			result = append(result, hosts[i])
+		}
+	}
+
+	return result, nil
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/metrics_provider.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/metrics_provider.go
new file mode 100644
index 0000000000..dd28f7c330
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/metrics_provider.go
@@ -0,0 +1,30 @@
+// Copyright 2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package performance
+
+import (
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+// MetricsProvider defines the interface for providing metrics.
+type MetricsProvider interface {
+	// GetMetricsForComputeResource returns metrics for a particular compute resource. The metrics are
+	// returned in a map of HostMetricsInfo keyed on host ManagedObjectReferences.
+	GetMetricsForComputeResource(trace.Operation, *object.ComputeResource) (map[string]*HostMetricsInfo, error)
+
+	// GetMetricsForHosts returns metrics pertaining to supplied ESX hosts.
+	GetMetricsForHosts(trace.Operation, []*object.HostSystem) (map[string]*HostMetricsInfo, error)
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/vm_subscription.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/vm_subscription.go
index 3d46929fee..275098b69b 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/vm_subscription.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/performance/vm_subscription.go
@@ -26,13 +26,12 @@ import (
 
 	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/vm"
 )
 
 // vmSubscription is a 1:1 relationship to a Virtual Machine and a
 // 1:M relationship to subscribers
 type vmSubscription struct {
-	vm *vm.VirtualMachine
+	vm *object.VirtualMachine
 	id string
 
 	pub                 *pubsub.Publisher
@@ -171,7 +170,7 @@ func newVMSubscription(op trace.Operation, session *session.Session, moref types
 	}
 
 	sub := &vmSubscription{
-		vm:                  vm.NewVirtualMachine(op.Context, session, moref),
+		vm:                  object.NewVirtualMachine(session.Vim25(), moref),
 		deviceInstanceToKey: make(map[string]string),
 	}
 
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac.go
new file mode 100644
index 0000000000..b464f7b580
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac.go
@@ -0,0 +1,470 @@
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rbac
+
+import (
+	"context"
+	"fmt"
+	"reflect"
+	"strings"
+
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/soap"
+	"github.com/vmware/govmomi/vim25/types"
+	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
+)
+
+const (
+	VCenter = iota
+	DatacenterReadOnly
+	Datacenter
+	Cluster
+	DatastoreFolder
+	Datastore
+	VSANDatastore
+	Network
+	Endpoint
+)
+
+const (
+	sysAnonPriv = "System.Anonymous"
+	sysReadPriv = "System.Read"
+	sysViewPriv = "System.View"
+)
+
+type NameToRef map[string]types.ManagedObjectReference
+
+type AuthzManager struct {
+	authzManager *object.AuthorizationManager
+	client       *vim25.Client
+	resources    map[int8]*Resource
+	TargetRoles  []types.AuthorizationRole
+	RolePrefix   string
+	Principal    string
+	Config       *Config
+}
+
+type Resource struct {
+	Type      int8
+	Propagate bool
+	Role      types.AuthorizationRole
+}
+
+type Config struct {
+	Resources []Resource
+}
+
+type ResourcePermission struct {
+	RType      int8
+	Reference  types.ManagedObjectReference
+	Permission types.Permission
+}
+
+func NewAuthzManager(ctx context.Context, client *vim25.Client) *AuthzManager {
+	authManager := object.NewAuthorizationManager(client)
+	mgr := &AuthzManager{
+		client:       client,
+		authzManager: authManager,
+	}
+	return mgr
+}
+
+func (am *AuthzManager) InitConfig(principal string, rolePrefix string, config *Config) {
+	am.Principal = principal
+	am.RolePrefix = rolePrefix
+	am.Config = config
+	am.initTargetRoles()
+	am.initResourceMap()
+}
+
+func (am *AuthzManager) CreateRoles(ctx context.Context) (int, error) {
+	return am.createOrRepairRoles(ctx)
+}
+
+func (am *AuthzManager) DeleteRoles(ctx context.Context) (int, error) {
+	return am.deleteRoles(ctx)
+}
+
+func (am *AuthzManager) RoleList(ctx context.Context) (object.AuthorizationRoleList, error) {
+	return am.getRoleList(ctx)
+}
+
+func (am *AuthzManager) IsPrincipalAnAdministrator(ctx context.Context) (bool, error) {
+	// Check if the principal belongs to the Administrators group
+	res, err := am.PrincipalBelongsToGroup(ctx, "Administrators")
+	if err != nil {
+		return false, err
+	}
+
+	if res {
+		return res, nil
+	}
+
+	// Check if the principal has an Admin Role
+	res, err = am.PrincipalHasRole(ctx, "Admin")
+	if err != nil {
+		return false, err
+	}
+
+	return res, nil
+}
+
+func (am *AuthzManager) PrincipalBelongsToGroup(ctx context.Context, group string) (bool, error) {
+	op := trace.FromContext(ctx, "PrincipalBelongsToGroup")
+
+	ref := *am.client.ServiceContent.UserDirectory
+
+	components := strings.Split(am.Principal, "@")
+	name := components[0]
+	var domain string
+	if len(components) >= 2 {
+		domain = components[1]
+	}
+
+	req := types.RetrieveUserGroups{
+		This:           ref,
+		Domain:         domain,
+		SearchStr:      name,
+		ExactMatch:     true,
+		BelongsToGroup: group,
+		FindUsers:      true,
+		FindGroups:     false,
+	}
+
+	results, err := methods.RetrieveUserGroups(ctx, am.client, &req)
+
+	// This is to work around a bug in vSphere, when AD is added to
+	// the identity source list, the API returns Object Not Found,
+	// In this case, we ignore the error and return false (BUG: 2037706)
+	if err != nil && (isNotSupportedError(ctx, err) || isNotFoundError(ctx, err)) {
+		op.Debugf("Received Error (%s) from PrincipalBelongsToGroup(), could not verify user %s is not a member of the Administrators group", err.Error(), am.Principal)
+		op.Warnf("If ops-user (%s) belongs to the Administrators group, permissions on some resources might have been restricted", am.Principal)
+		return false, nil
+	}
+
+	if err != nil {
+		op.Debugf("Error from PrincipalBelongsToGroup: %s", err.Error())
+		return false, err
+	}
+
+	if len(results.Returnval) > 0 {
+		return true, nil
+	}
+
+	return false, nil
+}
+
+// ReadPermsOnDC returns true if the user (principal) in the AuthzManager has at least
+// read permissions on the input datacenter ref, false otherwise.
+func (am *AuthzManager) ReadPermsOnDC(ctx context.Context, dcRef types.ManagedObjectReference) (bool, error) {
+	perms, err := am.GetPermissions(ctx, dcRef)
+	if err != nil {
+		return false, err
+	}
+
+	roles, err := am.RoleList(ctx)
+	if err != nil {
+		return false, err
+	}
+
+	opsUser := strings.ToLower(am.Principal)
+
+	// These vars keep track of whether the corresponding privileges have been found.
+	var anon, read, view bool
+
+	for _, perm := range perms {
+		// Skip permission entries assigned to other users.
+		user := am.formatPrincipal(perm.Principal)
+		if user != opsUser {
+			continue
+		}
+
+		role := roles.ById(perm.RoleId)
+		if role == nil {
+			return false, fmt.Errorf("unable to find role %d by ID", perm.RoleId)
+		}
+
+		// Check the role for privileges that satisfy the read-only role and set their flags.
+		privs := role.Privilege
+		for i := range privs {
+			anon = anon || privs[i] == sysAnonPriv
+			read = read || privs[i] == sysReadPriv
+			view = view || privs[i] == sysViewPriv
+		}
+
+		if anon && read && view {
+			// The ops-user has enough privileges for the read-only role.
+			return true, nil
+		}
+	}
+
+	return false, nil
+}
+
+func (am *AuthzManager) PrincipalHasRole(ctx context.Context, roleName string) (bool, error) {
+	// Build expected representation of the ops-user
+	principal := strings.ToLower(am.Principal)
+
+	// Get role id for admin Role
+	roleList, err := am.RoleList(ctx)
+	if err != nil {
+		return false, err
+	}
+
+	role := roleList.ByName(roleName)
+
+	allPerms, err := am.authzManager.RetrieveAllPermissions(ctx)
+	if err != nil {
+		return false, err
+	}
+
+	for _, perm := range allPerms {
+		if perm.RoleId != role.RoleId {
+			continue
+		}
+
+		fPrincipal := am.formatPrincipal(perm.Principal)
+		if fPrincipal == principal {
+			return true, nil
+		}
+	}
+
+	return false, nil
+}
+
+func (am *AuthzManager) GetPermissions(ctx context.Context,
+	ref types.ManagedObjectReference) ([]types.Permission, error) {
+	// Get current Permissions
+	return am.authzManager.RetrieveEntityPermissions(ctx, ref, false)
+}
+
+func (am *AuthzManager) AddPermission(ctx context.Context, ref types.ManagedObjectReference, resourceType int8, isGroup bool) (*ResourcePermission, error) {
+
+	resource := am.getResource(resourceType)
+	if resource == nil {
+		return nil, fmt.Errorf("cannot find resource of type %d", resourceType)
+	}
+
+	// Collect the new roles, possibly cache the result in the Authz manager
+	roleList, err := am.getRoleList(ctx)
+	if err != nil {
+		return nil, err
+	}
+
+	// Locate target role
+	role := roleList.ByName(am.getRoleName(resource))
+	if role == nil {
+		return nil, fmt.Errorf("cannot find role: %s", resource.Role.Name)
+	}
+
+	// Get current permissions
+	permissions, err := am.authzManager.RetrieveEntityPermissions(ctx, ref, false)
+	if err != nil {
+		return nil, err
+	}
+
+	for _, permission := range permissions {
+		if permission.Principal == am.Principal &&
+			permission.RoleId == role.RoleId &&
+			permission.Propagate == resource.Propagate {
+			return nil, nil
+		}
+	}
+
+	// No match found, create new permission
+	permission := types.Permission{
+		Principal: am.Principal,
+		RoleId:    role.RoleId,
+		Propagate: resource.Propagate,
+		Group:     isGroup,
+	}
+	permissions = append(permissions, permission)
+
+	if err = am.authzManager.SetEntityPermissions(ctx, ref, permissions); err != nil {
+		return nil, err
+	}
+
+	resourcePermission := &ResourcePermission{
+		RType:      resourceType,
+		Reference:  ref,
+		Permission: permission,
+	}
+
+	return resourcePermission, nil
+}
+
+func (am *AuthzManager) createOrRepairRoles(ctx context.Context) (int, error) {
+	// Get all the existing roles
+	mgr := am.authzManager
+	roleList, err := mgr.RoleList(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	var count int
+	for _, targetRole := range am.TargetRoles {
+		foundRole := roleList.ByName(targetRole.Name)
+		if foundRole != nil {
+			isMod, err := am.checkAndRepairRole(ctx, &targetRole, foundRole)
+			if isMod && err == nil {
+				count++
+			}
+		} else {
+			_, err = mgr.AddRole(ctx, targetRole.Name, targetRole.Privilege)
+			if err == nil {
+				count++
+			}
+		}
+		if err != nil {
+			return count, err
+		}
+	}
+	return count, nil
+}
+
+func (am *AuthzManager) deleteRoles(ctx context.Context) (int, error) {
+	mgr := am.authzManager
+	// Get all the existing roles
+	roleList, err := mgr.RoleList(ctx)
+	if err != nil {
+		return 0, err
+	}
+
+	var count int
+	for _, targetRole := range am.TargetRoles {
+		foundRole := roleList.ByName(targetRole.Name)
+		if foundRole != nil {
+			err = mgr.RemoveRole(ctx, foundRole.RoleId, true)
+			if err == nil {
+				count++
+			}
+		}
+	}
+	return count, nil
+}
+
+func (am *AuthzManager) getRoleList(ctx context.Context) (object.AuthorizationRoleList, error) {
+	return am.authzManager.RoleList(ctx)
+}
+
+func (am *AuthzManager) checkAndRepairRole(ctx context.Context, tRole *types.AuthorizationRole, fRole *types.AuthorizationRole) (bool, error) {
+	mgr := am.authzManager
+	// Check that the privileges list in Target Role is a subset of the list in Found role
+	fSet := make(map[string]bool)
+	for _, p := range fRole.Privilege {
+		fSet[p] = true
+	}
+
+	var isModified bool
+	for _, p := range tRole.Privilege {
+		if _, found := fSet[p]; !found {
+			// Privilege not found
+			// Add it to the found Role
+			fRole.Privilege = append(fRole.Privilege, p)
+			isModified = true
+		}
+	}
+
+	if !isModified {
+		return false, nil
+	}
+
+	// Not a subset, need to call govmomi to set the new privileges
+	err := mgr.UpdateRole(ctx, fRole.RoleId, fRole.Name, fRole.Privilege)
+
+	return true, err
+}
+
+func (am *AuthzManager) initTargetRoles() {
+	count := len(am.Config.Resources)
+	roles := make([]types.AuthorizationRole, 0, count)
+	dSet := make(map[string]bool)
+	for index, resource := range am.Config.Resources {
+		name := am.getRoleName(&am.Config.Resources[index])
+		// Discard duplicates
+		if _, found := dSet[name]; !found {
+			role := new(types.AuthorizationRole)
+			*role = resource.Role
+			role.Name = name
+			dSet[name] = true
+			roles = append(roles, *role)
+		}
+	}
+	am.TargetRoles = roles
+}
+
+func (am *AuthzManager) initResourceMap() {
+	am.resources = make(map[int8]*Resource)
+	for i, resource := range am.Config.Resources {
+		am.resources[resource.Type] = &am.Config.Resources[i]
+	}
+}
+
+func (am *AuthzManager) getResource(resourceType int8) *Resource {
+	resource, ok := am.resources[resourceType]
+	if !ok {
+		panic(errors.Errorf("Cannot find RBAC resource type: %d", resourceType))
+	}
+	return resource
+}
+
+func (am *AuthzManager) formatPrincipal(principal string) string {
+	components := strings.Split(principal, "\\")
+	if len(components) != 2 {
+		return strings.ToLower(principal)
+	}
+	ret := strings.ToLower(components[1]) + "@" + strings.ToLower(components[0])
+	return ret
+}
+
+func (am *AuthzManager) getRoleName(resource *Resource) string {
+	switch resource.Type {
+	case DatacenterReadOnly:
+		return resource.Role.Name
+	default:
+		return am.RolePrefix + resource.Role.Name
+	}
+}
+
+func isNotSupportedError(ctx context.Context, err error) bool {
+	op := trace.FromContext(ctx, "isNotSupportedError")
+
+	if soap.IsSoapFault(err) {
+		vimFault := soap.ToSoapFault(err).VimFault()
+		op.Debugf("Error type: %s", reflect.TypeOf(vimFault))
+
+		_, ok := soap.ToSoapFault(err).VimFault().(types.NotSupported)
+		return ok
+	}
+
+	return false
+}
+
+func isNotFoundError(ctx context.Context, err error) bool {
+	op := trace.FromContext(ctx, "isNotFoundError")
+
+	if soap.IsSoapFault(err) {
+		vimFault := soap.ToSoapFault(err).VimFault()
+		op.Debugf("Error type: %s", reflect.TypeOf(vimFault))
+
+		_, ok := soap.ToSoapFault(err).VimFault().(types.NotFound)
+		return ok
+	}
+
+	return false
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac_test_util.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac_test_util.go
new file mode 100644
index 0000000000..717c7be31b
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/rbac/rbac_test_util.go
@@ -0,0 +1,120 @@
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package rbac
+
+import (
+	"context"
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func DoTestRoles(ctx context.Context, t *testing.T, am *AuthzManager, testRoleNames []string, testRolePrivileges []string) {
+	var roleCount = len(am.TargetRoles)
+	count := InitRoles(ctx, t, am)
+
+	defer Cleanup(ctx, t, am, true)
+	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
+
+	// Test correct role validation, it should return 0
+	roleCount = 0
+	count, err := am.createOrRepairRoles(ctx)
+	require.NoError(t, err, "Failed to create roles")
+	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
+
+	// Remove two Privileges from two roles
+	roles, err := am.getRoleList(ctx)
+	fmt.Println(err)
+	fmt.Println(roles)
+
+	for i, name := range testRoleNames {
+		testRoleNames[i] = am.RolePrefix + name
+	}
+
+	for _, role := range roles {
+		if role.Name == testRoleNames[0] {
+			removePrivilege(&role, testRolePrivileges[0])
+			am.authzManager.UpdateRole(ctx, role.RoleId, role.Name, role.Privilege)
+		}
+		if role.Name == testRoleNames[1] {
+			removePrivilege(&role, testRolePrivileges[1])
+			am.authzManager.UpdateRole(ctx, role.RoleId, role.Name, role.Privilege)
+		}
+	}
+
+	// Test
+	roleCount = 2
+	count, err = am.createOrRepairRoles(ctx)
+	require.NoError(t, err, "Failed to repair roles 1")
+	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
+
+	// Test correct role validation, it should return 0
+	roleCount = 0
+	count, err = am.createOrRepairRoles(ctx)
+	require.NoError(t, err, "Failed to repair roles 2")
+	require.Equal(t, roleCount, count, "Incorrect number of roles: expected %d, actual %d", roleCount, count)
+}
+
+func VerifyResourcePermissions(ctx context.Context, t *testing.T, am *AuthzManager, retPerms []ResourcePermission) {
+	for _, retPerm := range retPerms {
+
+		// Validate returned permission against the configured permission
+		configPerm := am.getResource(retPerm.RType)
+		require.Equal(t, am.Principal, retPerm.Permission.Principal)
+		require.Equal(t, configPerm.Propagate, retPerm.Permission.Propagate)
+
+		actPerms, err := am.GetPermissions(ctx, retPerm.Reference)
+		require.NoError(t, err)
+
+		for _, actPerm := range actPerms {
+			if actPerm.Principal != am.Principal {
+				continue
+			}
+			// RoleId must be the same
+			require.Equal(t, retPerm.Permission.RoleId, actPerm.RoleId)
+		}
+	}
+}
+
+func InitRoles(ctx context.Context, t *testing.T, am *AuthzManager) int {
+	Cleanup(ctx, t, am, false)
+
+	count, err := am.createOrRepairRoles(ctx)
+	require.NoError(t, err, "Failed to initialize Roles")
+
+	return count
+}
+
+func Cleanup(ctx context.Context, t *testing.T, am *AuthzManager, checkCount bool) {
+	var roleCount = len(am.TargetRoles)
+	count, err := am.deleteRoles(ctx)
+	require.NoError(t, err, "Failed to delete roles")
+
+	if checkCount && count != roleCount {
+		t.Fatalf("Incorrect number of roles: expcted %d, actual %d", roleCount, count)
+	}
+}
+
+func removePrivilege(role *types.AuthorizationRole, privilege string) {
+	for i, priv := range role.Privilege {
+		if priv == privilege {
+			role.Privilege = append(role.Privilege[:i], role.Privilege[i+1:]...)
+			return
+		}
+	}
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session.go
index 3fa8939b72..6a3b4bc037 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 package session
 
 import (
+	"context"
 	"fmt"
 	"net/http"
 	"net/url"
@@ -33,9 +34,7 @@ import (
 	"strings"
 	"time"
 
-	"context"
-
-	log "github.com/Sirupsen/logrus"
+	"github.com/Sirupsen/logrus"
 
 	"github.com/vmware/govmomi"
 	"github.com/vmware/govmomi/find"
@@ -47,6 +46,7 @@ import (
 	"github.com/vmware/govmomi/vim25/types"
 	"github.com/vmware/vic/lib/config"
 	"github.com/vmware/vic/pkg/errors"
+	"github.com/vmware/vic/pkg/trace"
 	"github.com/vmware/vic/pkg/vsphere/extraconfig"
 )
 
@@ -61,6 +61,8 @@ type Config struct {
 	Service string
 	// Credentials
 	User *url.Userinfo
+	// CloneTicket is used to clone an existing session
+	CloneTicket string
 	// Allow insecure connection to Service
 	Insecure bool
 	// Target thumbprint
@@ -89,9 +91,14 @@ type Session struct {
 	Host       *object.HostSystem
 	Pool       *object.ResourcePool
 
+	// Default vSphere VMFolder
 	VMFolder *object.Folder
+	// Folder where appliance is located
+	VCHFolder *object.Folder
 
 	Finder *find.Finder
+
+	DRSEnabled *bool
 }
 
 // RoundTripFunc alias
@@ -120,11 +127,8 @@ func LimitConcurrency(rt http.RoundTripper, limit int) http.RoundTripper {
 	})
 }
 
-// NewSession creates a new Session struct. If config is nil,
-// it creates a Flags object from the command line arguments or
-// environment, and uses that instead to create a Session.
+// NewSession creates a new Session struct.
 func NewSession(config *Config) *Session {
-	log.Debugf("Creating VMOMI session with thumbprint %s", config.Thumbprint)
 	return &Session{Config: config}
 }
 
@@ -148,21 +152,27 @@ func (s *Session) IsVSAN(ctx context.Context) bool {
 
 // Create accepts a Config and returns a Session with the cached vSphere resources.
 func (s *Session) Create(ctx context.Context) (*Session, error) {
-	var vchExtraConfig config.VirtualContainerHostConfigSpec
+	op := trace.FromContext(ctx, "Create")
+
+	var vchConfig config.VirtualContainerHostConfigSpec
+	var connConfig config.Connection
+
 	source, err := extraconfig.GuestInfoSource()
 	if err != nil {
 		return nil, err
 	}
 
-	extraconfig.Decode(source, &vchExtraConfig)
-
-	s.Service = vchExtraConfig.Target
-
-	s.User = url.UserPassword(vchExtraConfig.Username, vchExtraConfig.Token)
+	prefix := extraconfig.CalculateKeys(vchConfig, "Connection", "")
+	if len(prefix) != 1 {
+		return nil, fmt.Errorf("must be exactly one Connection defined in VCH configuration")
+	}
+	extraconfig.DecodeWithPrefix(source, &connConfig, prefix[0])
 
-	s.Thumbprint = vchExtraConfig.TargetThumbprint
+	s.Service = connConfig.Target
+	s.User = url.UserPassword(connConfig.Username, connConfig.Token)
+	s.Thumbprint = connConfig.TargetThumbprint
 
-	_, err = s.Connect(ctx)
+	_, err = s.Connect(op)
 	if err != nil {
 		return nil, err
 	}
@@ -171,11 +181,11 @@ func (s *Session) Create(ctx context.Context) (*Session, error) {
 	defer func() {
 		if err != nil {
 			// #nosec: Errors unhandled.
-			s.Client.Logout(ctx)
+			s.Client.Logout(op)
 		}
 	}()
 
-	_, err = s.Populate(ctx)
+	_, err = s.Populate(op)
 	if err != nil {
 		return nil, err
 	}
@@ -185,6 +195,10 @@ func (s *Session) Create(ctx context.Context) (*Session, error) {
 
 // Connect establishes the connection for the session but nothing more
 func (s *Session) Connect(ctx context.Context) (*Session, error) {
+	op := trace.FromContext(ctx, "Connect")
+
+	op.Debugf("Creating VMOMI session with thumbprint %s", s.Thumbprint)
+
 	soapURL, err := soap.ParseURL(s.Service)
 	if soapURL == nil || err != nil {
 		return nil, SDKURLError{
@@ -202,6 +216,7 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 	}
 
 	soapClient := soap.NewClient(soapURL, s.Insecure)
+
 	soapClient.Version = "6.0" // Pin to 6.0 until we need 6.5+ specific API
 
 	var login func(context.Context) error
@@ -220,7 +235,7 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 			maxInFlight = i
 		}
 	}
-	// Limit the concurrenty of SOAP requests
+	// Limit the concurrency of SOAP requests
 	if t, ok := soapClient.Transport.(*http.Transport); ok {
 		t.MaxIdleConnsPerHost = maxInFlight
 		t.TLSHandshakeTimeout = tlsHandshakeTimeout
@@ -228,7 +243,7 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 	soapClient.Transport = LimitConcurrency(soapClient.Transport, maxInFlight)
 
 	// TODO: option to set http.Client.Transport.TLSClientConfig.RootCAs
-	vimClient, err := vim25.NewClient(ctx, soapClient)
+	vimClient, err := vim25.NewClient(op, soapClient)
 	if err != nil {
 		return nil, SoapClientError{
 			Host: soapURL.Host,
@@ -239,19 +254,21 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 	if s.Keepalive != 0 {
 		vimClient.RoundTripper = session.KeepAliveHandler(soapClient, s.Keepalive,
 			func(roundTripper soap.RoundTripper) error {
-				_, err := methods.GetCurrentTime(context.Background(), roundTripper)
+				cop := trace.FromOperation(op, "KeepAlive")
+
+				_, err := methods.GetCurrentTime(cop, roundTripper)
 				if err == nil {
 					return nil
 				}
 
-				log.Warnf("session keepalive error: %s", err)
+				cop.Warnf("session keepalive error: %s", err)
 
 				if isNotAuthenticated(err) {
 
-					if err = login(ctx); err != nil {
-						log.Errorf("session keepalive failed to re-authenticate: %s", err)
+					if err = login(cop); err != nil {
+						cop.Errorf("session keepalive failed to re-authenticate: %s", err)
 					} else {
-						log.Info("session keepalive re-authenticated")
+						cop.Info("session keepalive re-authenticated")
 					}
 				}
 
@@ -265,7 +282,13 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 		SessionManager: session.NewManager(vimClient),
 	}
 
-	err = login(ctx)
+	if s.CloneTicket != "" {
+		// clone a user session if we have a ticket
+		err = s.SessionManager.CloneSession(op, s.CloneTicket)
+	} else {
+		// otherwise login to create a new one
+		err = login(op)
+	}
 	if err != nil {
 		return nil, UserPassLoginError{
 			Host: soapURL.Host,
@@ -275,82 +298,103 @@ func (s *Session) Connect(ctx context.Context) (*Session, error) {
 
 	s.Finder = find.NewFinder(s.Vim25(), false)
 	// log high-level environment information
-	s.logEnvironmentInfo()
+	s.logEnvironmentInfo(op)
 	return s, nil
 }
 
-// Populate resolves the set of cached resources that should be presented
-// This returns accumulated error detail if there is ambiguity, but sets all
-// unambiguous or correct resources.
+// Populate caches resources on the session object.  These resources
+// are based off of the config provided at session creation.
+//
+// vic specific:
+// The values that end in Path (DataCenterPath, ClusterPath, etc..) are
+// either from the CLI or have been retreived from the appliance extraConfig
 func (s *Session) Populate(ctx context.Context) (*Session, error) {
+	op := trace.FromContext(ctx, "Populate")
+
 	// Populate s
 	var errs []string
 	var err error
 
 	finder := s.Finder
 
-	log.Debug("vSphere resource cache populating...")
-	s.Datacenter, err = finder.DatacenterOrDefault(ctx, s.DatacenterPath)
+	op.Debugf("vSphere resource cache populating...")
+	s.Datacenter, err = finder.DatacenterOrDefault(op, s.DatacenterPath)
 	if err != nil {
 		errs = append(errs, fmt.Sprintf("Failure finding dc (%s): %s", s.DatacenterPath, err.Error()))
 	} else {
 		finder.SetDatacenter(s.Datacenter)
-		log.Debugf("Cached dc: %s", s.DatacenterPath)
+		op.Debugf("Cached dc: %s", s.DatacenterPath)
 	}
 
 	finder.SetDatacenter(s.Datacenter)
 
-	s.Cluster, err = finder.ComputeResourceOrDefault(ctx, s.ClusterPath)
+	s.Cluster, err = finder.ComputeResourceOrDefault(op, s.ClusterPath)
 	if err != nil {
 		errs = append(errs, fmt.Sprintf("Failure finding cluster (%s): %s", s.ClusterPath, err.Error()))
 	} else {
-		log.Debugf("Cached cluster: %s", s.ClusterPath)
+		op.Debugf("Cached cluster: %s", s.ClusterPath)
+		// if we have a cluster lets get DRS Status
+		if s.Cluster != nil && s.Cluster.Reference().Type == "ClusterComputeResource" {
+			cc := object.NewClusterComputeResource(s.Client.Client, s.Cluster.Reference())
+			clusterConfig, _ := cc.Configuration(op)
+			if clusterConfig != nil {
+				s.DRSEnabled = clusterConfig.DrsConfig.Enabled
+			}
+		}
 	}
 
-	s.Datastore, err = finder.DatastoreOrDefault(ctx, s.DatastorePath)
+	s.Datastore, err = finder.DatastoreOrDefault(op, s.DatastorePath)
 	if err != nil {
 		errs = append(errs, fmt.Sprintf("Failure finding ds (%s): %s", s.DatastorePath, err.Error()))
 	} else {
-		log.Debugf("Cached ds: %s", s.DatastorePath)
+		op.Debugf("Cached ds: %s", s.DatastorePath)
 	}
 
-	s.Host, err = finder.HostSystemOrDefault(ctx, s.HostPath)
+	s.Host, err = finder.HostSystemOrDefault(op, s.HostPath)
 	if err != nil {
 		if _, ok := err.(*find.DefaultMultipleFoundError); !ok || !s.IsVC() {
 			errs = append(errs, fmt.Sprintf("Failure finding host (%s): %s", s.HostPath, err.Error()))
 		}
 	} else {
-		log.Debugf("Cached host: %s", s.HostPath)
+		op.Debugf("Cached host: %s", s.HostPath)
 	}
 
-	s.Pool, err = finder.ResourcePoolOrDefault(ctx, s.PoolPath)
+	s.Pool, err = finder.ResourcePoolOrDefault(op, s.PoolPath)
 	if err != nil {
 		errs = append(errs, fmt.Sprintf("Failure finding pool (%s): %s", s.PoolPath, err.Error()))
 	} else {
-		log.Debugf("Cached pool: %s", s.PoolPath)
+		op.Debugf("Cached pool: %s", s.PoolPath)
 	}
 
 	if s.Datacenter != nil {
-		folders, err := s.Datacenter.Folders(ctx)
+		folders, err := s.Datacenter.Folders(op)
 		if err != nil {
 			errs = append(errs, fmt.Sprintf("Failure finding folders (%s): %s", s.DatacenterPath, err.Error()))
 		} else {
-			log.Debugf("Cached folders: %s", s.DatacenterPath)
+			op.Debugf("Cached folders: %s", s.DatacenterPath)
 		}
 		s.VMFolder = folders.VmFolder
+		// We don't persist the VCH folder location so set
+		// the VCH folder to the default VM folder.
+		// The actual location of the VCH will be determined later
+		// and this folder ref will be updated accordingly.
+		//
+		// This will provide standalone ESXi and backwards
+		// compatibility to non-folder versions.
+		s.VCHFolder = folders.VmFolder
 	}
 
 	if len(errs) > 0 {
-		log.Debugf("Error count populating vSphere cache: (%d)", len(errs))
+		op.Debugf("Error count populating vSphere cache: (%d)", len(errs))
 		return nil, errors.New(strings.Join(errs, "\n"))
 	}
-	log.Debug("vSphere resource cache populated...")
+	op.Debug("vSphere resource cache populated...")
 	return s, nil
 }
 
-func (s *Session) logEnvironmentInfo() {
+func (s *Session) logEnvironmentInfo(op trace.Operation) {
 	a := s.ServiceContent.About
-	log.WithFields(log.Fields{
+	op.WithFields(logrus.Fields{
 		"Name":        a.Name,
 		"Vendor":      a.Vendor,
 		"Version":     a.Version,
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session_test.go
deleted file mode 100644
index af728b2603..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/session/session_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package session
-
-import (
-	"context"
-	"crypto/tls"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-)
-
-func TestSessionDefaults(t *testing.T) {
-	ctx := context.Background()
-
-	config := &Config{
-		Service:  env.URL(t),
-		Insecure: true,
-	}
-
-	session, err := NewSession(config).Create(ctx)
-	if err != nil {
-		eStr := err.Error()
-		t.Logf("%+v", eStr)
-		// FIXME: See comments below
-		if strings.Contains(eStr, "resolves to multiple hosts") {
-			t.SkipNow()
-		}
-		t.Logf("%+v", eStr)
-		if _, ok := err.(*find.DefaultMultipleFoundError); !ok {
-			t.Errorf(eStr)
-		} else {
-			t.SkipNow()
-		}
-	}
-	if session != nil {
-		defer session.Logout(ctx)
-	}
-
-	t.Logf("%+v", session)
-}
-
-func TestSession(t *testing.T) {
-	ctx := context.Background()
-
-	config := &Config{
-		Service:        env.URL(t),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	session, err := NewSession(config).Create(ctx)
-	if err != nil {
-		eStr := err.Error()
-		t.Logf("%+v", eStr)
-		// FIXME: session.Create incorporates Populate which loses the type of any original error from vmomi
-		// In the case where the test is run on a cluster with multiple hosts, find.MultipleFoundError
-		// gets rolled up into a generic error in Populate. As such, the best we can do is just grep for the string, which is lame
-		// The test shouldn't fail if it's run on a cluster with multiple hosts. However, it won't test for anything either.
-		if strings.Contains(eStr, "resolves to multiple hosts") {
-			t.SkipNow()
-		}
-		if _, ok := err.(*find.MultipleFoundError); !ok {
-			t.Errorf(eStr)
-		} else {
-			t.SkipNow()
-		}
-	}
-
-	if session != nil {
-		defer session.Logout(ctx)
-
-		t.Logf("Session: %+v", session)
-
-		t.Logf("IsVC: %t", session.IsVC())
-		t.Logf("IsVSAN: %t", session.IsVSAN(ctx))
-	}
-}
-
-func TestFolder(t *testing.T) {
-	ctx := context.Background()
-
-	config := &Config{
-		Service:        env.URL(t),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	session, err := NewSession(config).Create(ctx)
-	if err != nil {
-		eStr := err.Error()
-		t.Logf("%+v", eStr)
-		// FIXME: See comments above
-		if strings.Contains(eStr, "resolves to multiple hosts") {
-			t.SkipNow()
-		}
-		if _, ok := err.(*find.MultipleFoundError); !ok {
-			t.Errorf(eStr)
-		} else {
-			t.SkipNow()
-		}
-	}
-
-	if session != nil {
-		defer session.Logout(ctx)
-
-		if session.VMFolder == nil {
-			t.Errorf("Get empty folder")
-		}
-	}
-}
-
-func TestConnect(t *testing.T) {
-	ctx := context.Background()
-
-	for _, model := range []*simulator.Model{simulator.ESX(), simulator.VPX()} {
-		defer model.Remove()
-		err := model.Create()
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		model.Service.TLS = new(tls.Config)
-		s := model.Service.NewServer()
-		defer s.Close()
-
-		config := &Config{
-			Keepalive: time.Minute,
-			Service:   s.URL.String(),
-		}
-
-		for _, thumbprint := range []string{"", s.CertificateInfo().ThumbprintSHA1} {
-			u := *s.URL
-			config.Service = u.String()
-			config.Thumbprint = thumbprint
-
-			_, err = NewSession(config).Connect(ctx)
-			if thumbprint == "" {
-				if err == nil {
-					t.Error("expected x509.UnknownAuthorityError error")
-				}
-			} else {
-				if err != nil {
-					t.Error(err)
-				}
-			}
-
-			u.User = nil
-			config.Service = u.String()
-			_, err = NewSession(config).Connect(ctx)
-			if err == nil {
-				t.Fatal("expected login error")
-			}
-
-			config.Service = ""
-			_, err = NewSession(config).Connect(ctx)
-			if err == nil {
-				t.Fatal("expected URL parse error")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tags/rest_client.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/tags/rest_client.go
index b73e5ba0e5..d2fd972d6a 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tags/rest_client.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/tags/rest_client.go
@@ -31,8 +31,9 @@ import (
 )
 
 const (
-	RestPrefix = "/rest"
-	loginURL   = "/com/vmware/cis/session"
+	RestPrefix          = "/rest"
+	loginURL            = "/com/vmware/cis/session"
+	sessionIDCookieName = "vmware-api-session-id"
 )
 
 type RestClient struct {
@@ -68,6 +69,23 @@ func NewClient(u *url.URL, insecure bool, thumbprint string) *RestClient {
 	}
 }
 
+// NewClientWithSessionID creates a new REST client with a supplied session ID
+// to re-connect to existing sessions.
+//
+// Note that the session is not checked for validity - to check for a valid
+// session after creating the client, use the Valid method. If the session is
+// no longer valid and the session needs to be re-saved, Login should be called
+// again before calling SessionID to extract the new session ID. Clients
+// created with this function function work in the exact same way as clients
+// created with NewClient, including supporting re-login on invalid sessions on
+// all SDK calls.
+func NewClientWithSessionID(u *url.URL, insecure bool, thumbprint string, sessionID string) *RestClient {
+	c := NewClient(u, insecure, thumbprint)
+	c.setSessionID(sessionID)
+
+	return c
+}
+
 func (c *RestClient) encodeData(data interface{}) (*bytes.Buffer, error) {
 	params := bytes.NewBuffer(nil)
 	if data != nil {
@@ -173,6 +191,10 @@ func (c *RestClient) Login(ctx context.Context) error {
 	if err != nil {
 		return errors.Wrap(err, "login failed")
 	}
+	if c.user != nil {
+		password, _ := c.user.Password()
+		request.SetBasicAuth(c.user.Username(), password)
+	}
 	resp, err := c.HTTP.Do(request)
 	if err != nil {
 		return errors.Wrap(err, "login failed")
@@ -194,15 +216,63 @@ func (c *RestClient) Login(ctx context.Context) error {
 }
 
 func (c *RestClient) newRequest(method, urlStr string, body io.Reader) (*http.Request, error) {
-	req, err := http.NewRequest(method, c.endpoint.String()+urlStr, body)
+	return http.NewRequest(method, c.endpoint.String()+urlStr, body)
+}
+
+// SessionID returns the current session ID of the REST client. An empty string
+// means there was no session cookie currently loaded.
+func (c *RestClient) SessionID() string {
+	for _, cookie := range c.cookies {
+		if cookie.Name == sessionIDCookieName {
+			return cookie.Value
+		}
+	}
+	return ""
+}
+
+// setSessionID sets the session cookie with the supplied session ID.
+//
+// This does not necessarily mean the session is valid. The session should be
+// checked with Valid before proceeding, and logged back in if it has expired.
+//
+// This function will overwrite any existing session.
+func (c *RestClient) setSessionID(sessionID string) {
+	Logger.Debugf("Setting existing session ID %q", sessionID)
+	idx := -1
+	for i, cookie := range c.cookies {
+		if cookie.Name == sessionIDCookieName {
+			idx = i
+		}
+	}
+	sessionCookie := &http.Cookie{
+		Name:  sessionIDCookieName,
+		Value: sessionID,
+		Path:  RestPrefix,
+	}
+	if idx > -1 {
+		c.cookies[idx] = sessionCookie
+	} else {
+		c.cookies = append(c.cookies, sessionCookie)
+	}
+}
+
+// Valid checks to see if the session cookies in a REST client are still valid.
+// This should be used when restoring a session to determine if a new login is
+// necessary.
+func (c *RestClient) Valid(ctx context.Context) bool {
+	sessionID := c.SessionID()
+	Logger.Debugf("Checking if session ID %q is still valid", sessionID)
+
+	_, _, statusCode, err := c.clientRequest(ctx, "POST", loginURL+"?~action=get", nil, nil)
 	if err != nil {
-		return nil, err
+		Logger.Debugf("Error getting current session information for ID %q - session is invalid (%d - %s)", sessionID, statusCode, err)
 	}
 
-	if c.user != nil {
-		password, _ := c.user.Password()
-		req.SetBasicAuth(c.user.Username(), password)
+	if statusCode == http.StatusOK {
+		Logger.Debugf("Session ID %q is valid", sessionID)
+		return true
 	}
 
-	return req, nil
+	Logger.Debugf("Session is invalid for %v (%d)", sessionID, statusCode)
+	return false
 }
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter.go
index c3144fd870..1db2bdc02b 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter.go
@@ -1,4 +1,4 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -60,13 +60,20 @@ func Wait(ctx context.Context, f func(context.Context) (Task, error)) error {
 //       return vm, vm.Reconfigure(ctx, config)
 //    })
 func WaitForResult(ctx context.Context, f func(context.Context) (Task, error)) (*types.TaskInfo, error) {
+	return WaitForResultAndRetryIf(ctx, f, IsRetryError)
+}
+
+// WaitForResultAndRetryIf wraps govmomi operations and wait the operation to complete, retrying under specified conditions.
+// Return the operation result
+// Sample usage:
+//    info, err := WaitForResult(ctx, func(ctx) (*TaskInfo, error) {
+//       return vm, vm.Reconfigure(ctx, config)
+//    })
+func WaitForResultAndRetryIf(ctx context.Context, f func(context.Context) (Task, error), shouldRetry func(op trace.Operation, err error) bool) (*types.TaskInfo, error) {
 	var err error
 	var backoffFactor int64 = 1
 
-	op, err := trace.FromContext(ctx)
-	if err != nil {
-		op = trace.NewOperation(ctx, "WaitForResult")
-	}
+	op := trace.FromContext(ctx, "WaitForResult")
 
 	for {
 		var t Task
@@ -78,7 +85,7 @@ func WaitForResult(ctx context.Context, f func(context.Context) (Task, error)) (
 			}
 		}
 
-		if !isRetryError(op, err) {
+		if !shouldRetry(op, err) {
 			return info, err
 		}
 
@@ -103,11 +110,10 @@ const (
 	taskFault = "task"
 )
 
-// isRetryErrors will return true for vSphere errors, which can be fixed by retry.
-// Currently the error includes TaskInProgress, NetworkDisruptedAndConfigRolledBack and InvalidArgument
+// IsTransientError will return true for vSphere errors, which can be fixed by retry.
+// Currently the error includes TaskInProgress, NetworkDisruptedAndConfigRolledBack, FailToLockFaultToleranceVMs, HostCommunication
 // Retry on NetworkDisruptedAndConfigRolledBack is to workaround vSphere issue
-// Retry on InvalidArgument(invlid path) is to workaround vSAN bug: https://bugzilla.eng.vmware.com/show_bug.cgi?id=1770798. TODO: Should remove it after vSAN fixed the bug
-func isRetryError(op trace.Operation, err error) bool {
+func IsTransientError(op trace.Operation, err error) bool {
 	if soap.IsSoapFault(err) {
 		switch f := soap.ToSoapFault(err).VimFault().(type) {
 		case types.TaskInProgress:
@@ -115,7 +121,13 @@ func isRetryError(op trace.Operation, err error) bool {
 		case types.NetworkDisruptedAndConfigRolledBack:
 			logExpectedFault(op, soapFault, f)
 			return true
-		case types.InvalidArgument:
+		case types.VAppTaskInProgress:
+			logExpectedFault(op, soapFault, f)
+			return true
+		case types.FailToLockFaultToleranceVMs:
+			logExpectedFault(op, soapFault, f)
+			return true
+		case types.HostCommunication:
 			logExpectedFault(op, soapFault, f)
 			return true
 		default:
@@ -131,8 +143,14 @@ func isRetryError(op trace.Operation, err error) bool {
 		case *types.NetworkDisruptedAndConfigRolledBack:
 			logExpectedFault(op, vimFault, f)
 			return true
-		case *types.InvalidArgument:
-			logExpectedFault(op, vimFault, f)
+		case *types.VAppTaskInProgress:
+			logExpectedFault(op, soapFault, f)
+			return true
+		case *types.FailToLockFaultToleranceVMs:
+			logExpectedFault(op, soapFault, f)
+			return true
+		case *types.HostCommunication:
+			logExpectedFault(op, soapFault, f)
 			return true
 		default:
 			logFault(op, f)
@@ -148,7 +166,7 @@ func isRetryError(op trace.Operation, err error) bool {
 		case *types.NetworkDisruptedAndConfigRolledBack:
 			logExpectedFault(op, taskFault, f)
 			return true
-		case *types.InvalidArgument:
+		case *types.HostCommunication:
 			logExpectedFault(op, taskFault, f)
 			return true
 		default:
@@ -167,13 +185,106 @@ func isRetryError(op trace.Operation, err error) bool {
 	}
 }
 
+// Add an additional retry error InvalidArgument
+// This is added for potential race conditions concerning vSAN host partition
+// Normally VM configuration is provided without user input. If there's InvalidArgument fault, it would more possibly be a system error.
+// Details see: https://github.com/vmware/vic/pull/4597
+func IsRetryError(op trace.Operation, err error) bool {
+	return IsTransientError(op, err) || IsInvalidArgumentError(err)
+}
+
+// Helper functions checking if a error has a specific vim type
+// TODO[AngieCris]: sometimes we got the correct fault but a wrong type (i.e. the error type cannot be captured)
+// It could be due to pointer/non-pointer type, or it could be govmomi bug on error type wrappers
+// Need to figure out which type, pointer or non-pointer, should the vim fault have
+
+// IsInvalidArgumentError checks if a soap fault or vim fault is InvalidArgument error
+func IsInvalidArgumentError(err error) bool {
+	if soap.IsVimFault(err) {
+		_, ok1 := soap.ToVimFault(err).(*types.InvalidArgument)
+		_, ok2 := soap.ToVimFault(err).(types.InvalidArgumentFault)
+		return ok1 || ok2
+	}
+
+	if soap.IsSoapFault(err) {
+		_, ok1 := soap.ToSoapFault(err).VimFault().(types.InvalidArgument)
+		_, ok2 := soap.ToSoapFault(err).VimFault().(types.InvalidArgumentFault)
+
+		// sometimes we get the correct fault but wrong type
+		return ok1 || ok2 || soap.ToSoapFault(err).String == "vim.fault.InvalidArgument" ||
+			soap.ToSoapFault(err).String == "vim.fault.InvalidArgumentFault"
+	}
+
+	return false
+}
+
+// IsConcurrentAccessError checks if a soap fault or vim fault is ConcurrentAccess error
+func IsConcurrentAccessError(err error) bool {
+	if soap.IsVimFault(err) {
+		_, ok1 := soap.ToVimFault(err).(*types.ConcurrentAccess)
+		_, ok2 := soap.ToVimFault(err).(*types.ConcurrentAccessFault)
+		return ok1 || ok2
+	}
+
+	if soap.IsSoapFault(err) {
+		_, ok1 := soap.ToSoapFault(err).VimFault().(types.ConcurrentAccess)
+		_, ok2 := soap.ToSoapFault(err).VimFault().(types.ConcurrentAccessFault)
+
+		// sometimes we get the correct fault but wrong type
+		return ok1 || ok2 || soap.ToSoapFault(err).String == "vim.fault.ConcurrentAccess" ||
+			soap.ToSoapFault(err).String == "vim.fault.ConcurrentAccessFault"
+	}
+
+	return false
+}
+
+// IsMethodDisabledError checks if a soap fault or vim fault is MethodDisabled error
+func IsMethodDisabledError(err error) bool {
+	if soap.IsVimFault(err) {
+		_, ok1 := soap.ToVimFault(err).(*types.MethodDisabled)
+		_, ok2 := soap.ToVimFault(err).(*types.MethodDisabledFault)
+		return ok1 || ok2
+	}
+
+	if soap.IsSoapFault(err) {
+		_, ok1 := soap.ToSoapFault(err).VimFault().(types.MethodDisabled)
+		_, ok2 := soap.ToSoapFault(err).VimFault().(types.MethodDisabledFault)
+
+		// sometimes we get the correct fault but wrong type
+		return ok1 || ok2 || soap.ToSoapFault(err).String == "vim.fault.MethodDisabled" ||
+			soap.ToSoapFault(err).String == "vim.fault.MethodDisabledFault"
+	}
+
+	return false
+}
+
+// IsNotFoundError checks if a soap fault or vim fault is ManagementObjectNotFound error
+func IsNotFoundError(err error) bool {
+	if soap.IsVimFault(err) {
+		_, ok1 := soap.ToVimFault(err).(*types.ManagedObjectNotFound)
+		_, ok2 := soap.ToVimFault(err).(*types.ManagedObjectNotFoundFault)
+		return ok1 || ok2
+	}
+
+	if soap.IsSoapFault(err) {
+		_, ok1 := soap.ToSoapFault(err).VimFault().(types.ManagedObjectNotFound)
+		_, ok2 := soap.ToSoapFault(err).VimFault().(types.ManagedObjectNotFoundFault)
+
+		// sometimes we get the correct fault but wrong type
+		return ok1 || ok2 || soap.ToSoapFault(err).String == "vim.fault.ManagedObjectNotFound" ||
+			soap.ToSoapFault(err).String == "vim.fault.ManagedObjectNotFoundFault"
+	}
+
+	return false
+}
+
 // Helper Functions
 func logFault(op trace.Operation, fault types.BaseMethodFault) {
 	op.Errorf("unexpected fault on task retry: %#v", fault)
 }
 
 func logSoapFault(op trace.Operation, fault types.AnyType) {
-	op.Debugf("unexpected soap fault on task retry: %s", fault)
+	op.Debugf("unexpected soap fault on task retry: %#v", fault)
 }
 
 func logError(op trace.Operation, err error) {
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter_test.go
deleted file mode 100644
index b286b24366..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/tasks/waiter_test.go
+++ /dev/null
@@ -1,439 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package tasks
-
-import (
-	"context"
-	"strings"
-	"testing"
-	"time"
-
-	log "github.com/Sirupsen/logrus"
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/task"
-	"github.com/vmware/govmomi/vim25/methods"
-	"github.com/vmware/govmomi/vim25/progress"
-	"github.com/vmware/govmomi/vim25/soap"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/pkg/errors"
-	"github.com/vmware/vic/pkg/trace"
-)
-
-func TestMain(m *testing.M) {
-	log.SetLevel(log.DebugLevel)
-
-	m.Run()
-}
-
-type MyTask struct {
-	success bool
-}
-
-func (t *MyTask) Wait(ctx context.Context) error {
-	_, err := t.WaitForResult(ctx, nil)
-	return err
-}
-func (t *MyTask) WaitForResult(ctx context.Context, s progress.Sinker) (*types.TaskInfo, error) {
-	if t.success {
-		return nil, nil
-	}
-	return nil, errors.Errorf("Wait failed")
-}
-
-func createFailedTask(context.Context) (Task, error) {
-	return nil, errors.Errorf("Create VM failed")
-}
-
-func createFailedResultWaiter(context.Context) (Task, error) {
-	task := &MyTask{
-		false,
-	}
-	return task, nil
-}
-
-func createResultWaiter(context.Context) (Task, error) {
-	task := &MyTask{
-		true,
-	}
-	return task, nil
-}
-
-func TestFailedInvokeResult(t *testing.T) {
-	ctx := context.TODO()
-	_, err := WaitForResult(ctx, func(ctx context.Context) (Task, error) {
-		return createFailedTask(ctx)
-	})
-	if err == nil || !strings.Contains(err.Error(), "Create VM failed") {
-		t.Errorf("Not expected error message")
-	}
-}
-
-func TestFailedWaitResult(t *testing.T) {
-	ctx := context.TODO()
-	_, err := WaitForResult(ctx, func(ctx context.Context) (Task, error) {
-		return createFailedResultWaiter(ctx)
-	})
-	log.Debugf("got error: %s", err.Error())
-	if err == nil || !strings.Contains(err.Error(), "Wait failed") {
-		t.Errorf("Not expected error message")
-	}
-}
-
-func TestSuccessWaitResult(t *testing.T) {
-	ctx := context.TODO()
-	_, err := WaitForResult(ctx, func(ctx context.Context) (Task, error) {
-		return createResultWaiter(ctx)
-	})
-	if err != nil {
-		t.Errorf("Unexpected error: %s", err.Error())
-	}
-}
-
-func createFailed(context.Context) (Task, error) {
-	return nil, errors.Errorf("Create VM failed")
-}
-
-func createFailedWaiter(context.Context) (Task, error) {
-	task := &MyTask{
-		false,
-	}
-	return task, nil
-}
-
-func createWaiter(context.Context) (Task, error) {
-	task := &MyTask{
-		true,
-	}
-	return task, nil
-}
-
-func TestFailedInvoke(t *testing.T) {
-	ctx := context.TODO()
-	err := Wait(ctx, func(ctx context.Context) (Task, error) {
-		return createFailed(ctx)
-	})
-	if err == nil || !strings.Contains(err.Error(), "Create VM failed") {
-		t.Errorf("Not expected error message")
-	}
-}
-
-func TestFailedWait(t *testing.T) {
-	ctx := context.TODO()
-	err := Wait(ctx, func(ctx context.Context) (Task, error) {
-		return createFailedWaiter(ctx)
-	})
-	log.Debugf("got error: %s", err.Error())
-	if err == nil || !strings.Contains(err.Error(), "Wait failed") {
-		t.Errorf("Not expected error message")
-	}
-}
-
-func TestSuccessWait(t *testing.T) {
-	ctx := context.TODO()
-	err := Wait(ctx, func(ctx context.Context) (Task, error) {
-		return createWaiter(ctx)
-	})
-	if err != nil {
-		t.Errorf("Unexpected error: %s", err.Error())
-	}
-}
-
-var taskInProgressFault = task.Error{
-	LocalizedMethodFault: &types.LocalizedMethodFault{
-		Fault: &types.TaskInProgress{},
-	},
-}
-
-type taskInProgressTask struct {
-	cur, max int
-	err      error
-	info     *types.TaskInfo
-}
-
-func (t *taskInProgressTask) Wait(ctx context.Context) error {
-	t.cur++
-	if t.cur == t.max {
-		return t.err
-	}
-
-	return taskInProgressFault
-}
-
-func (t *taskInProgressTask) WaitForResult(ctx context.Context, s progress.Sinker) (*types.TaskInfo, error) {
-	return t.info, t.Wait(ctx)
-}
-
-func mustRunInTime(t *testing.T, d time.Duration, f func()) {
-	done := make(chan bool)
-
-	go func() {
-		f()
-		close(done)
-	}()
-
-	ctx, cancel := context.WithTimeout(context.Background(), d)
-	defer cancel()
-
-	select {
-	case <-done: // ran within alloted time
-	case <-ctx.Done():
-		t.Fatalf("test did not run in alloted time %s", d)
-	}
-}
-
-func TestRetry(t *testing.T) {
-	mustRunInTime(t, 2*time.Second, func() {
-		ctx := context.Background()
-		i := 0
-		ti, err := WaitForResult(ctx, func(_ context.Context) (Task, error) {
-			i++
-			return nil, assert.AnError
-		})
-
-		assert.Nil(t, ti)
-		assert.Equal(t, i, 1)
-		assert.Error(t, err)
-		assert.Equal(t, err, assert.AnError)
-
-		// error != TaskInProgress during task creation
-		i = 0
-		e := &task.Error{
-			LocalizedMethodFault: &types.LocalizedMethodFault{
-				Fault:            &types.RuntimeFault{}, // random fault != TaskInProgress
-				LocalizedMessage: "random fault",
-			},
-		}
-		ti, err = WaitForResult(ctx, func(_ context.Context) (Task, error) {
-			i++
-			return nil, e
-		})
-
-		assert.Nil(t, ti)
-		assert.Equal(t, i, 1)
-		assert.Error(t, err)
-		assert.Equal(t, err, e)
-
-		// context cancelled after two retries
-		i = 0
-		ctx, cancel := context.WithCancel(ctx)
-		ti, err = WaitForResult(ctx, func(_ context.Context) (Task, error) {
-			i++
-			if i == 2 {
-				cancel()
-			}
-			return nil, taskInProgressFault
-		})
-
-		assert.Nil(t, ti)
-		assert.Equal(t, i, 2)
-		assert.Error(t, err)
-		assert.Equal(t, err, ctx.Err())
-
-		// TaskInProgress from task creation for 2 iterations and
-		// then nil error
-		tsk := &taskInProgressTask{
-			max: 1,
-			info: &types.TaskInfo{
-				Task: types.ManagedObjectReference{
-					Type:  "task",
-					Value: "foo",
-				},
-			},
-		}
-		i = 0
-		ti, err = WaitForResult(context.Background(), func(_ context.Context) (Task, error) {
-			i++
-			if i == 2 {
-				return tsk, nil
-			}
-			return nil, taskInProgressFault
-		})
-
-		assert.Equal(t, tsk.info, ti)
-		assert.Equal(t, i, 2)
-		assert.NoError(t, err)
-
-		// return TaskInPregress from task.WaitForResult for 2 iterations
-		// and then return assert.AnError
-		tsk = &taskInProgressTask{
-			max: 2,
-			err: assert.AnError,
-			info: &types.TaskInfo{
-				Task: types.ManagedObjectReference{
-					Type:  "task",
-					Value: "foo",
-				},
-			},
-		}
-		ti, err = WaitForResult(context.Background(), func(_ context.Context) (Task, error) {
-			return tsk, nil
-		})
-
-		assert.Equal(t, tsk.info, ti)
-		assert.Equal(t, tsk.max, tsk.cur)
-		assert.Error(t, err)
-		assert.Equal(t, err, tsk.err)
-
-		// return TaskInPregress from task.WaitForResult for 2 iterations
-		// and then return nil error
-		tsk.cur = 0
-		tsk.err = nil
-		ti, err = WaitForResult(context.Background(), func(_ context.Context) (Task, error) {
-			return tsk, nil
-		})
-
-		assert.Equal(t, tsk.info, ti)
-		assert.Equal(t, tsk.info, ti)
-		assert.Equal(t, tsk.cur, tsk.max)
-		assert.NoError(t, err)
-	})
-}
-
-// faultyVirtualMachine wrap simulator.VirtualMachine with fault injection
-type faultyVirtualMachine struct {
-	simulator.VirtualMachine
-
-	fault types.BaseMethodFault
-}
-
-// Run implements simulator.TaskRunner and always returns vm.fault
-func (vm *faultyVirtualMachine) Run(task *simulator.Task) (types.AnyType, types.BaseMethodFault) {
-	return nil, vm.fault
-}
-
-// Override PowerOffVMTask to inject a fault
-func (vm *faultyVirtualMachine) PowerOffVMTask(c *types.PowerOffVM_Task) soap.HasFault {
-	r := &methods.PowerOffVM_TaskBody{}
-
-	task := simulator.NewTask(vm)
-
-	r.Res = &types.PowerOffVM_TaskResponse{
-		Returnval: task.Self,
-	}
-
-	task.Run()
-
-	return r
-}
-
-// MarkAsTemplate implements a non-Task method to inject vm.fault
-func (vm *faultyVirtualMachine) MarkAsTemplate(c *types.MarkAsTemplate) soap.HasFault {
-	return &methods.MarkAsTemplateBody{
-		Fault_: simulator.Fault("nope", vm.fault),
-	}
-}
-
-// TestSoapFaults covers the various soap fault checking paths
-func TestSoapFaults(t *testing.T) {
-	op := trace.NewOperation(context.Background(), "TestSoapFaults")
-
-	// Nothing VC specific in this test, so we use the simpler ESX model
-	model := simulator.ESX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-
-	client, err := govmomi.NewClient(op, server.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Any VM will do
-	finder := find.NewFinder(client.Client, false)
-	vm, err := finder.VirtualMachine(op, "/ha-datacenter/vm/*_VM0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Test the success path
-	err = Wait(op, func(ctx context.Context) (Task, error) {
-		return vm.PowerOn(ctx)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Wrap existing vm MO with faultyVirtualMachine
-	ref := simulator.Map.Get(vm.Reference())
-	fvm := &faultyVirtualMachine{*ref.(*simulator.VirtualMachine), nil}
-	simulator.Map.Put(fvm)
-
-	// Inject TaskInProgress fault
-	fvm.fault = new(types.TaskInProgress)
-	task, err := vm.PowerOff(op)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Test the task.Error path
-	res, err := task.WaitForResult(op, nil)
-	if !isRetryError(op, err) {
-		t.Error(err)
-	}
-
-	// Test the soap.IsVimFault() path
-	if !isRetryError(op, soap.WrapVimFault(res.Error.Fault)) {
-		t.Errorf("fault=%#v", res.Error.Fault)
-	}
-
-	// Test the soap.IsSoapFault() path
-	err = vm.MarkAsTemplate(op)
-	if !isRetryError(op, err) {
-		t.Error(err)
-	}
-
-	// Test a fault other than TaskInProgress
-	fvm.fault = &types.QuestionPending{
-		Text: "now why would you want to do such a thing?",
-	}
-
-	err = Wait(op, func(ctx context.Context) (Task, error) {
-		return vm.PowerOff(ctx)
-	})
-	if err == nil {
-		t.Error("expected error")
-	}
-	if isRetryError(op, err) {
-		t.Error(err)
-	}
-
-	// Test with retry
-	fvm.fault = new(types.TaskInProgress)
-	called := 0
-
-	err = Wait(op, func(ctx context.Context) (Task, error) {
-		called++
-		if called > 1 {
-			simulator.Map.Put(ref) // remove fault injection
-		}
-
-		return vm.PowerOff(ctx)
-	})
-	if err != nil {
-		t.Error(err)
-	}
-	if called != 2 {
-		t.Errorf("called=%d", called)
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/test/test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/test/test.go
deleted file mode 100644
index 44dcfd53c8..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/test/test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package test
-
-import (
-	"fmt"
-	"math/rand"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/vic/lib/spec"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/test/env"
-
-	"context"
-)
-
-// Session returns a session.Session struct
-func Session(ctx context.Context, t *testing.T) *session.Session {
-	config := &session.Config{
-		Service:        env.URL(t),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(config).Create(ctx)
-	if err != nil {
-		// FIXME: See session_test.go TestSession for detail. We never get to PickRandomHost in the case of multiple hosts
-		if strings.Contains(err.Error(), "resolves to multiple hosts") {
-			t.SkipNow()
-		} else {
-			t.Errorf("ERROR: %s", err)
-			t.SkipNow()
-		}
-	}
-	return s
-}
-
-// SessionWithESX returns a general-purpose ESX session for tests.
-func SessionWithESX(ctx context.Context, service string) (*session.Session, error) {
-	config := &session.Config{
-		Service:        service,
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "/ha-datacenter",
-		ClusterPath:    "*",
-		DatastorePath:  "/ha-datacenter/datastore/LocalDS_0",
-		PoolPath:       "/ha-datacenter/host/localhost.localdomain/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	if s, err = s.Populate(ctx); err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-// SessionWithVPX returns a general-purpose VPX session for tests.
-func SessionWithVPX(ctx context.Context, service string) (*session.Session, error) {
-	config := &session.Config{
-		Service:        service,
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "/DC0",
-		ClusterPath:    "/DC0/host/DC0_C0",
-		DatastorePath:  "/DC0/datastore/LocalDS_0",
-		PoolPath:       "/DC0/host/DC0_C0/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		return nil, err
-	}
-
-	if s, err = s.Populate(ctx); err != nil {
-		return nil, err
-	}
-	return s, nil
-}
-
-// SpecConfig returns a spec.VirtualMachineConfigSpecConfig struct
-func SpecConfig(session *session.Session, name string) *spec.VirtualMachineConfigSpecConfig {
-	return &spec.VirtualMachineConfigSpecConfig{
-		NumCPUs:       2,
-		MemoryMB:      2048,
-		VMForkEnabled: true,
-
-		ID:            name,
-		Name:          "zombie_attack",
-		BootMediaPath: session.Datastore.Path("brainz.iso"),
-		VMPathName:    fmt.Sprintf("[%s]", session.Datastore.Name()),
-	}
-}
-
-// PickRandomHost returns a random object.HostSystem from the hosts attached to the datastore and also lives in the same cluster
-func PickRandomHost(ctx context.Context, session *session.Session, t *testing.T) *object.HostSystem {
-	hosts, err := session.Datastore.AttachedClusterHosts(ctx, session.Cluster)
-	if err != nil {
-		t.Errorf("ERROR: %s", err)
-		t.SkipNow()
-	}
-	return hosts[rand.Intn(len(hosts))]
-}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm.go
index 4dfadd3caf..5adc8f2e64 100644
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm.go
+++ b/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm.go
@@ -1,4 +1,4 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2018 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -24,16 +24,20 @@ import (
 	"strconv"
 	"strings"
 	"sync/atomic"
-
-	log "github.com/Sirupsen/logrus"
+	"time"
 
 	"github.com/vmware/govmomi/object"
 	"github.com/vmware/govmomi/property"
 	"github.com/vmware/govmomi/vim25/methods"
 	"github.com/vmware/govmomi/vim25/mo"
+	"github.com/vmware/govmomi/vim25/soap"
 	"github.com/vmware/govmomi/vim25/types"
 
+	"github.com/vmware/vic/pkg/retry"
+	"github.com/vmware/vic/pkg/trace"
+	"github.com/vmware/vic/pkg/vsphere/compute/placement"
 	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
+	"github.com/vmware/vic/pkg/vsphere/performance"
 	"github.com/vmware/vic/pkg/vsphere/session"
 	"github.com/vmware/vic/pkg/vsphere/tasks"
 )
@@ -65,9 +69,33 @@ type VirtualMachine struct {
 	fixing int32
 }
 
+// Attributes will retrieve the properties for the provided references.  A variadic arg of attribs
+// is provided to allow overriding the default properties retrieved
+func Attributes(ctx context.Context, session *session.Session, refs []types.ManagedObjectReference, attribs ...string) ([]mo.VirtualMachine, error) {
+	defer trace.End(trace.Begin(fmt.Sprintf("populating %d refs", len(refs))))
+	var vms []mo.VirtualMachine
+	// default attributes to retrieve
+	props := []string{"config", "runtime.powerState", "summary"}
+	// if attributes provided then use those instead of default
+	if len(attribs) > 0 {
+		props = attribs
+	}
+	// retrieve the properties via the session property collector
+	err := session.Retrieve(ctx, refs, props, &vms)
+	return vms, err
+}
+
 // NewVirtualMachine returns a NewVirtualMachine object
 func NewVirtualMachine(ctx context.Context, session *session.Session, moref types.ManagedObjectReference) *VirtualMachine {
-	return NewVirtualMachineFromVM(ctx, session, object.NewVirtualMachine(session.Vim25(), moref))
+	vm := NewVirtualMachineFromVM(ctx, session, object.NewVirtualMachine(session.Vim25(), moref))
+	// best effort to get the correct path
+	if session.Finder != nil {
+		e, _ := session.Finder.Element(ctx, moref)
+		if e != nil {
+			vm.VirtualMachine.InventoryPath = e.Path
+		}
+	}
+	return vm
 }
 
 // NewVirtualMachineFromVM returns a NewVirtualMachine object
@@ -81,10 +109,12 @@ func NewVirtualMachineFromVM(ctx context.Context, session *session.Session, vm *
 // VMPathNameAsURL returns the full datastore path of the VM as a url. The datastore name is in the host
 // portion, the path is in the Path field, the scheme is set to "ds"
 func (vm *VirtualMachine) VMPathNameAsURL(ctx context.Context) (url.URL, error) {
+	op := trace.FromContext(ctx, "VMPathNameAsURL")
+
 	var mvm mo.VirtualMachine
 
-	if err := vm.Properties(ctx, vm.Reference(), []string{"config.files.vmPathName"}, &mvm); err != nil {
-		log.Errorf("Unable to get managed config for VM: %s", err)
+	if err := vm.Properties(op, vm.Reference(), []string{"config.files.vmPathName"}, &mvm); err != nil {
+		op.Errorf("Unable to get managed config for VM: %s", err)
 		return url.URL{}, err
 	}
 
@@ -106,10 +136,12 @@ func (vm *VirtualMachine) VMPathNameAsURL(ctx context.Context) (url.URL, error)
 	return val, nil
 }
 
-// FolderName returns the name of the namespace(vsan) or directory(vmfs) that holds the VM
+// DatastoreFolderName returns the name of the namespace(vsan) or directory(vmfs) that holds the VM
 // this equates to the normal directory that contains the vmx file, stripped of any parent path
-func (vm *VirtualMachine) FolderName(ctx context.Context) (string, error) {
-	u, err := vm.VMPathNameAsURL(ctx)
+func (vm *VirtualMachine) DatastoreFolderName(ctx context.Context) (string, error) {
+	op := trace.FromContext(ctx, "DatastoreFolderName")
+
+	u, err := vm.VMPathNameAsURL(op)
 	if err != nil {
 		return "", err
 	}
@@ -117,7 +149,43 @@ func (vm *VirtualMachine) FolderName(ctx context.Context) (string, error) {
 	return path.Base(u.Path), nil
 }
 
-func (vm *VirtualMachine) getNetworkName(ctx context.Context, nic types.BaseVirtualEthernetCard) (string, error) {
+// Folder returns a reference to the parent folder that owns the vm
+func (vm *VirtualMachine) Folder(op trace.Operation) (*object.Folder, error) {
+	name, err := vm.ObjectName(op)
+	if err != nil {
+		op.Errorf("Unable to get VM Name to acquire folder: %s", err)
+		return nil, err
+	}
+	// find the VM by name - this is to ensure we have a
+	// consistent inventory path
+	v, err := vm.Session.Finder.VirtualMachine(op, name)
+	if err != nil {
+		op.Errorf("Unable to find VM(name: %s) to acquire folder: %s", name, err)
+		return nil, err
+	}
+	inv := path.Dir(v.InventoryPath)
+	// Parent to determine if VM or vApp
+	p, err := vm.Parent(op)
+	if err != nil {
+		op.Errorf("Unable to get VM Parent to acquire folder: %s", err)
+		return nil, err
+	}
+	// if vApp then move up a slot in the inventory path
+	if p.Type == "VirtualApp" {
+		inv = path.Dir(inv)
+	}
+	// find the vm folder
+	folderRef, err := vm.Session.Finder.Folder(op, inv)
+	if err != nil {
+		e := fmt.Errorf("Error finding folder: %s", err)
+		op.Errorf(e.Error())
+		return nil, e
+	}
+
+	return folderRef, nil
+}
+
+func (vm *VirtualMachine) getNetworkName(op trace.Operation, nic types.BaseVirtualEthernetCard) (string, error) {
 	if card, ok := nic.GetVirtualEthernetCard().Backing.(*types.VirtualEthernetCardDistributedVirtualPortBackingInfo); ok {
 		pg := card.Port.PortgroupKey
 		pgref := object.NewDistributedVirtualPortgroup(vm.Session.Vim25(), types.ManagedObjectReference{
@@ -126,9 +194,9 @@ func (vm *VirtualMachine) getNetworkName(ctx context.Context, nic types.BaseVirt
 		})
 
 		var pgo mo.DistributedVirtualPortgroup
-		err := pgref.Properties(ctx, pgref.Reference(), []string{"config"}, &pgo)
+		err := pgref.Properties(op, pgref.Reference(), []string{"config"}, &pgo)
 		if err != nil {
-			log.Errorf("Failed to query portgroup %s for %s", pg, err)
+			op.Errorf("Failed to query portgroup %s for %s", pg, err)
 			return "", err
 		}
 		return pgo.Config.Name, nil
@@ -137,12 +205,14 @@ func (vm *VirtualMachine) getNetworkName(ctx context.Context, nic types.BaseVirt
 }
 
 func (vm *VirtualMachine) FetchExtraConfigBaseOptions(ctx context.Context) ([]types.BaseOptionValue, error) {
+	op := trace.FromContext(ctx, "FetchExtraConfigBaseOptions")
+
 	var err error
 
 	var mvm mo.VirtualMachine
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"config.extraConfig"}, &mvm); err != nil {
-		log.Errorf("Unable to get vm config: %s", err)
+	if err = vm.Properties(op, vm.Reference(), []string{"config.extraConfig"}, &mvm); err != nil {
+		op.Errorf("Unable to get vm config: %s", err)
 		return nil, err
 	}
 
@@ -150,9 +220,11 @@ func (vm *VirtualMachine) FetchExtraConfigBaseOptions(ctx context.Context) ([]ty
 }
 
 func (vm *VirtualMachine) FetchExtraConfig(ctx context.Context) (map[string]string, error) {
+	op := trace.FromContext(ctx, "FetchExtraConfig")
+
 	info := make(map[string]string)
 
-	v, err := vm.FetchExtraConfigBaseOptions(ctx)
+	v, err := vm.FetchExtraConfigBaseOptions(op)
 	if err != nil {
 		return nil, err
 	}
@@ -167,15 +239,19 @@ func (vm *VirtualMachine) FetchExtraConfig(ctx context.Context) (map[string]stri
 
 // WaitForExtraConfig waits until key shows up with the expected value inside the ExtraConfig
 func (vm *VirtualMachine) WaitForExtraConfig(ctx context.Context, waitFunc func(pc []types.PropertyChange) bool) error {
+	op := trace.FromContext(ctx, "WaitForExtraConfig")
+
 	// Get the default collector
 	p := property.DefaultCollector(vm.Vim25())
 
 	// Wait on config.extraConfig
 	// https://www.vmware.com/support/developer/vc-sdk/visdk2xpubs/ReferenceGuide/vim.vm.ConfigInfo.html
-	return property.Wait(ctx, p, vm.Reference(), []string{"config.extraConfig", object.PropRuntimePowerState}, waitFunc)
+	return property.Wait(op, p, vm.Reference(), []string{"config.extraConfig", object.PropRuntimePowerState}, waitFunc)
 }
 
 func (vm *VirtualMachine) WaitForKeyInExtraConfig(ctx context.Context, key string) (string, error) {
+	op := trace.FromContext(ctx, "WaitForKeyInExtraConfig")
+
 	var detail string
 	var poweredOff error
 
@@ -192,6 +268,9 @@ func (vm *VirtualMachine) WaitForKeyInExtraConfig(ctx context.Context, key strin
 					if key == value.GetOptionValue().Key {
 						detail = value.GetOptionValue().Value.(string)
 						if detail != "" && detail != "<nil>" {
+							// ensure we clear any tentative error
+							poweredOff = nil
+
 							return true
 						}
 						break // continue the outer loop as we may have a powerState change too
@@ -206,14 +285,14 @@ func (vm *VirtualMachine) WaitForKeyInExtraConfig(ctx context.Context, key strin
 						msg = string(v)
 					}
 					poweredOff = fmt.Errorf("container VM has unexpectedly %s", msg)
-					return true
 				}
 			}
 		}
-		return false
+
+		return poweredOff != nil
 	}
 
-	err := vm.WaitForExtraConfig(ctx, waitFunc)
+	err := vm.WaitForExtraConfig(op, waitFunc)
 	if err == nil && poweredOff != nil {
 		err = poweredOff
 	}
@@ -224,52 +303,94 @@ func (vm *VirtualMachine) WaitForKeyInExtraConfig(ctx context.Context, key strin
 	return detail, nil
 }
 
-func (vm *VirtualMachine) Name(ctx context.Context) (string, error) {
+func (vm *VirtualMachine) UUID(ctx context.Context) (string, error) {
+	op := trace.FromContext(ctx, "UUID")
+
 	var err error
 	var mvm mo.VirtualMachine
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"summary.config"}, &mvm); err != nil {
-		log.Errorf("Unable to get vm summary.config property: %s", err)
+	if err = vm.Properties(op, vm.Reference(), []string{"summary.config"}, &mvm); err != nil {
+		op.Errorf("Unable to get vm summary.config property: %s", err)
 		return "", err
 	}
 
-	return mvm.Summary.Config.Name, nil
+	return mvm.Summary.Config.Uuid, nil
 }
 
-func (vm *VirtualMachine) UUID(ctx context.Context) (string, error) {
-	var err error
-	var mvm mo.VirtualMachine
+// DeleteExceptDisks destroys the VM after detaching all virtual disks
+func (vm *VirtualMachine) DeleteExceptDisks(ctx context.Context) (*types.TaskInfo, error) {
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"summary.config"}, &mvm); err != nil {
-		log.Errorf("Unable to get vm summary.config property: %s", err)
-		return "", err
+	op := trace.FromContext(ctx, "DeleteExceptDisks")
+	vmName, err := vm.ObjectName(op)
+	if err != nil {
+		vmName = vm.String()
+		op.Debugf("Failed to get VM name, using moref %q instead due to: %s", vmName, err)
 	}
 
-	return mvm.Summary.Config.Uuid, nil
-}
+	firstTime := true
+	err = retry.Do(func() error {
+		op.Debugf("Getting list of the devices for VM %q", vmName)
+		devices, err := vm.Device(op)
+		if err != nil {
+			return err
+		}
+
+		disks := devices.SelectByType(&types.VirtualDisk{})
+		if len(disks) > 0 {
+			op.Debugf("Removing disks from VM %q", vmName)
+			firstTime = false
+			return vm.RemoveDevice(op, true, disks...)
+		}
+
+		if firstTime {
+			op.Debugf("Disk list is empty for VM %q", vmName)
+		} else {
+			op.Debugf("All VM %q disks were removed at first call, but the result yielded an error that caused a retry", "%q")
+		}
+
+		return nil
+
+	}, func(err error) bool {
+		return tasks.IsRetryError(op, err)
+	})
 
-// DeleteExceptDisks destroys the VM after detaching all virtual disks
-func (vm *VirtualMachine) DeleteExceptDisks(ctx context.Context) (*object.Task, error) {
-	devices, err := vm.Device(ctx)
 	if err != nil {
 		return nil, err
 	}
 
-	disks := devices.SelectByType(&types.VirtualDisk{})
-	err = vm.RemoveDevice(ctx, true, disks...)
+	op.Debugf("Destroying VM %q", vmName)
+	info, err := vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
+		return vm.Destroy(ctx)
+	})
+
+	if err == nil || !tasks.IsMethodDisabledError(err) {
+		return info, err
+	}
+
+	// If destroy method is disabled on this VM, re-enable it and retry
+	op.Debugf("Destroy is disabled. Enabling destroy for VM %q", vmName)
+	err = retry.Do(func() error {
+		return vm.EnableDestroy(op)
+	}, tasks.IsConcurrentAccessError)
+
 	if err != nil {
 		return nil, err
 	}
 
-	return vm.Destroy(ctx)
+	op.Debugf("Retrying destroy of VM %q again", vmName)
+	return vm.WaitForResult(op, func(ctx context.Context) (tasks.Task, error) {
+		return vm.Destroy(ctx)
+	})
 }
 
 func (vm *VirtualMachine) VMPathName(ctx context.Context) (string, error) {
+	op := trace.FromContext(ctx, "VMPathName")
+
 	var err error
 	var mvm mo.VirtualMachine
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"config.files.vmPathName"}, &mvm); err != nil {
-		log.Errorf("Unable to get vm config.files property: %s", err)
+	if err = vm.Properties(op, vm.Reference(), []string{"config.files.vmPathName"}, &mvm); err != nil {
+		op.Errorf("Unable to get vm config.files property: %s", err)
 		return "", err
 	}
 	return mvm.Config.Files.VmPathName, nil
@@ -277,12 +398,13 @@ func (vm *VirtualMachine) VMPathName(ctx context.Context) (string, error) {
 
 // GetCurrentSnapshotTree returns current snapshot, with tree information
 func (vm *VirtualMachine) GetCurrentSnapshotTree(ctx context.Context) (*types.VirtualMachineSnapshotTree, error) {
-	var err error
+	op := trace.FromContext(ctx, "GetCurrentSnapshotTree")
 
+	var err error
 	var mvm mo.VirtualMachine
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"snapshot"}, &mvm); err != nil {
-		log.Infof("Unable to get vm properties: %s", err)
+	if err = vm.Properties(op, vm.Reference(), []string{"snapshot"}, &mvm); err != nil {
+		op.Infof("Unable to get vm properties: %s", err)
 		return nil, err
 	}
 	if mvm.Snapshot == nil {
@@ -307,12 +429,13 @@ func (vm *VirtualMachine) GetCurrentSnapshotTree(ctx context.Context) (*types.Vi
 
 // GetCurrentSnapshotTreeByName returns current snapshot, with tree information
 func (vm *VirtualMachine) GetSnapshotTreeByName(ctx context.Context, name string) (*types.VirtualMachineSnapshotTree, error) {
-	var err error
+	op := trace.FromContext(ctx, "GetSnapshotTreeByName")
 
+	var err error
 	var mvm mo.VirtualMachine
 
-	if err = vm.Properties(ctx, vm.Reference(), []string{"snapshot"}, &mvm); err != nil {
-		log.Infof("Unable to get vm properties: %s", err)
+	if err = vm.Properties(op, vm.Reference(), []string{"snapshot"}, &mvm); err != nil {
+		op.Infof("Unable to get vm properties: %s", err)
 		return nil, err
 	}
 	if mvm.Snapshot == nil {
@@ -356,9 +479,9 @@ func IsConfigureSnapshot(node *types.VirtualMachineSnapshotTree, prefix string)
 	return node != nil && strings.HasPrefix(node.Name, prefix)
 }
 
-func (vm *VirtualMachine) registerVM(ctx context.Context, path, name string,
+func (vm *VirtualMachine) registerVM(op trace.Operation, path, name string,
 	vapp, pool, host *types.ManagedObjectReference, vmfolder *object.Folder) (*object.Task, error) {
-	log.Debugf("Register VM %s", name)
+	op.Debugf("Register VM %s", name)
 
 	if vapp == nil {
 		var hostObject *object.HostSystem
@@ -366,7 +489,7 @@ func (vm *VirtualMachine) registerVM(ctx context.Context, path, name string,
 			hostObject = object.NewHostSystem(vm.Vim25(), *host)
 		}
 		poolObject := object.NewResourcePool(vm.Vim25(), *pool)
-		return vmfolder.RegisterVM(ctx, path, name, false, poolObject, hostObject)
+		return vmfolder.RegisterVM(op, path, name, false, poolObject, hostObject)
 	}
 
 	req := types.RegisterChildVM_Task{
@@ -379,7 +502,7 @@ func (vm *VirtualMachine) registerVM(ctx context.Context, path, name string,
 		req.Name = name
 	}
 
-	res, err := methods.RegisterChildVM_Task(ctx, vm.Vim25(), &req)
+	res, err := methods.RegisterChildVM_Task(op, vm.Vim25(), &req)
 	if err != nil {
 		return nil, err
 	}
@@ -400,34 +523,34 @@ func (vm *VirtualMachine) LeaveFixingState() {
 }
 
 // FixInvalidState fix vm invalid state issue through unregister & register
-func (vm *VirtualMachine) fixVM(ctx context.Context) error {
-	log.Debugf("Fix invalid state VM: %s", vm.Reference())
+func (vm *VirtualMachine) fixVM(op trace.Operation) error {
+	op.Debugf("Fix invalid state VM: %s", vm.Reference())
 
 	properties := []string{"summary.config", "summary.runtime.host", "resourcePool", "parentVApp"}
-	log.Debugf("Get vm properties %s", properties)
+	op.Debugf("Get vm properties %s", properties)
 	var mvm mo.VirtualMachine
-	if err := vm.VirtualMachine.Properties(ctx, vm.Reference(), properties, &mvm); err != nil {
-		log.Errorf("Unable to get vm properties: %s", err)
+	if err := vm.VirtualMachine.Properties(op, vm.Reference(), properties, &mvm); err != nil {
+		op.Errorf("Unable to get vm properties: %s", err)
 		return err
 	}
 
 	name := mvm.Summary.Config.Name
-	log.Debugf("Unregister VM %s", name)
+	op.Debugf("Unregister VM %s", name)
 	vm.EnterFixingState()
-	if err := vm.Unregister(ctx); err != nil {
-		log.Errorf("Unable to unregister vm %q: %s", name, err)
+	if err := vm.Unregister(op); err != nil {
+		op.Errorf("Unable to unregister vm %q: %s", name, err)
 
 		// Leave fixing state since it will not be reset in the remove event handler
 		vm.LeaveFixingState()
 		return err
 	}
 
-	task, err := vm.registerVM(ctx, mvm.Summary.Config.VmPathName, name, mvm.ParentVApp, mvm.ResourcePool, mvm.Summary.Runtime.Host, vm.Session.VMFolder)
+	task, err := vm.registerVM(op, mvm.Summary.Config.VmPathName, name, mvm.ParentVApp, mvm.ResourcePool, mvm.Summary.Runtime.Host, vm.Session.VCHFolder)
 	if err != nil {
-		log.Errorf("Unable to register VM %q back: %s", name, err)
+		op.Errorf("Unable to register VM %q back: %s", name, err)
 		return err
 	}
-	info, err := task.WaitForResult(ctx, nil)
+	info, err := task.WaitForResult(op, nil)
 	if err != nil {
 		return err
 	}
@@ -444,12 +567,12 @@ func (vm *VirtualMachine) fixVM(ctx context.Context) error {
 	return nil
 }
 
-func (vm *VirtualMachine) needsFix(ctx context.Context, err error) bool {
+func (vm *VirtualMachine) needsFix(op trace.Operation, err error) bool {
 	if err == nil {
 		return false
 	}
-	if vm.IsInvalidState(ctx) {
-		log.Debugf("vm %s is invalid", vm.Reference())
+	if vm.IsInvalidState(op) {
+		op.Debugf("vm %s is invalid", vm.Reference())
 		return true
 	}
 
@@ -457,9 +580,11 @@ func (vm *VirtualMachine) needsFix(ctx context.Context, err error) bool {
 }
 
 func (vm *VirtualMachine) IsInvalidState(ctx context.Context) bool {
+	op := trace.FromContext(ctx, "IsInvalidState")
+
 	var o mo.VirtualMachine
-	if err := vm.VirtualMachine.Properties(ctx, vm.Reference(), []string{"summary.runtime.connectionState"}, &o); err != nil {
-		log.Debugf("Failed to get vm properties: %s", err)
+	if err := vm.VirtualMachine.Properties(op, vm.Reference(), []string{"summary.runtime.connectionState"}, &o); err != nil {
+		op.Debugf("Failed to get vm properties: %s", err)
 		return false
 	}
 	if o.Summary.Runtime.ConnectionState == types.VirtualMachineConnectionStateInvalid {
@@ -468,59 +593,84 @@ func (vm *VirtualMachine) IsInvalidState(ctx context.Context) bool {
 	return false
 }
 
+// IsInvalidPowerStateError is an error certifier function for errors coming back from vsphere. It checks for an InvalidPowerStateFault
+func (vm *VirtualMachine) IsInvalidPowerStateError(err error) bool {
+	if soap.IsVimFault(err) {
+		_, ok1 := soap.ToVimFault(err).(*types.InvalidPowerState)
+		_, ok2 := soap.ToVimFault(err).(*types.InvalidPowerStateFault)
+		return ok1 || ok2
+	}
+
+	if soap.IsSoapFault(err) {
+		_, ok1 := soap.ToSoapFault(err).VimFault().(types.InvalidPowerState)
+		_, ok2 := soap.ToSoapFault(err).VimFault().(types.InvalidPowerStateFault)
+		// sometimes we get the correct fault but wrong type
+		return ok1 || ok2 || soap.ToSoapFault(err).String == "vim.fault.InvalidPowerState" ||
+			soap.ToSoapFault(err).String == "vim.fault.InvalidPowerState"
+	}
+	return false
+}
+
 // WaitForResult is designed to handle VM invalid state error for any VM operations.
 // It will call tasks.WaitForResult to retry if there is task in progress error.
 func (vm *VirtualMachine) WaitForResult(ctx context.Context, f func(context.Context) (tasks.Task, error)) (*types.TaskInfo, error) {
-	info, err := tasks.WaitForResult(ctx, f)
-	if err == nil || !vm.needsFix(ctx, err) {
+	op := trace.FromContext(ctx, "WaitForResult")
+
+	info, err := tasks.WaitForResult(op, f)
+	if err == nil || !vm.needsFix(op, err) {
 		return info, err
 	}
 
-	log.Debugf("Try to fix task failure %s", err)
-	if nerr := vm.fixVM(ctx); nerr != nil {
-		log.Errorf("Failed to fix task failure: %s", nerr)
+	op.Debugf("Try to fix task failure %s", err)
+	if nerr := vm.fixVM(op); nerr != nil {
+		op.Errorf("Failed to fix task failure: %s", nerr)
 		return info, err
 	}
-	log.Debugf("Fixed")
-	return tasks.WaitForResult(ctx, f)
+	op.Debug("Fixed")
+	return tasks.WaitForResult(op, f)
 }
 
 func (vm *VirtualMachine) Properties(ctx context.Context, r types.ManagedObjectReference, ps []string, o *mo.VirtualMachine) error {
-	log.Debugf("get vm properties %s of vm %s", ps, r)
+	// lets ensure we have an operation
+	op := trace.FromContext(ctx, "VM Properties")
+	defer trace.End(trace.Begin(fmt.Sprintf("VM(%s) Properties(%s)", r, ps), op))
+
 	contains := false
-	for i := range ps {
-		if ps[i] == "summary" || ps[i] == "summary.runtime" {
+	for _, v := range ps {
+		if v == "summary" || v == "summary.runtime" {
 			contains = true
 			break
 		}
 	}
-	var newps []string
+
 	if !contains {
-		newps = append(ps, "summary.runtime.connectionState")
-	} else {
-		newps = append(newps, ps...)
+		ps = append(ps, "summary.runtime.connectionState")
 	}
-	log.Debugf("properties: %s", newps)
-	if err := vm.VirtualMachine.Properties(ctx, r, newps, o); err != nil {
+
+	op.Debugf("properties: %s", ps)
+
+	if err := vm.VirtualMachine.Properties(op, r, ps, o); err != nil {
 		return err
 	}
 	if o.Summary.Runtime.ConnectionState != types.VirtualMachineConnectionStateInvalid {
 		return nil
 	}
-	log.Infof("vm %s is in invalid state", r)
-	if err := vm.fixVM(ctx); err != nil {
-		log.Errorf("Failed to fix vm %s: %s", vm.Reference(), err)
+	op.Infof("vm %s is in invalid state", r)
+	if err := vm.fixVM(op); err != nil {
+		op.Errorf("Failed to fix vm %s: %s", vm.Reference(), err)
 		return &InvalidState{r: vm.Reference()}
 	}
-	log.Debugf("Retry properties query %s of vm %s", ps, vm.Reference())
-	return vm.VirtualMachine.Properties(ctx, vm.Reference(), ps, o)
+
+	return vm.VirtualMachine.Properties(op, vm.Reference(), ps, o)
 }
 
 func (vm *VirtualMachine) Parent(ctx context.Context) (*types.ManagedObjectReference, error) {
+	op := trace.FromContext(ctx, "Parent")
+
 	var mvm mo.VirtualMachine
 
-	if err := vm.Properties(ctx, vm.Reference(), []string{"parentVApp", "resourcePool"}, &mvm); err != nil {
-		log.Errorf("Unable to get VM parent: %s", err)
+	if err := vm.Properties(op, vm.Reference(), []string{"parentVApp", "resourcePool"}, &mvm); err != nil {
+		op.Errorf("Unable to get VM parent: %s", err)
 		return nil, err
 	}
 	if mvm.ParentVApp != nil {
@@ -530,10 +680,12 @@ func (vm *VirtualMachine) Parent(ctx context.Context) (*types.ManagedObjectRefer
 }
 
 func (vm *VirtualMachine) DatastoreReference(ctx context.Context) ([]types.ManagedObjectReference, error) {
+	op := trace.FromContext(ctx, "DatastoreReference")
+
 	var mvm mo.VirtualMachine
 
-	if err := vm.Properties(ctx, vm.Reference(), []string{"datastore"}, &mvm); err != nil {
-		log.Errorf("Unable to get VM datastore: %s", err)
+	if err := vm.Properties(op, vm.Reference(), []string{"datastore"}, &mvm); err != nil {
+		op.Errorf("Unable to get VM datastore: %s", err)
 		return nil, err
 	}
 	return mvm.Datastore, nil
@@ -542,9 +694,11 @@ func (vm *VirtualMachine) DatastoreReference(ctx context.Context) ([]types.Manag
 // VCHUpdateStatus tells if an upgrade/configure has already been started based on the UpdateInProgress flag in ExtraConfig
 // It returns the error if the vm operation does not succeed
 func (vm *VirtualMachine) VCHUpdateStatus(ctx context.Context) (bool, error) {
-	info, err := vm.FetchExtraConfig(ctx)
+	op := trace.FromContext(ctx, "VCHUpdateStatus")
+
+	info, err := vm.FetchExtraConfig(op)
 	if err != nil {
-		log.Errorf("Unable to get vm ExtraConfig: %s", err)
+		op.Errorf("Unable to get vm ExtraConfig: %s", err)
 		return false, err
 	}
 
@@ -563,6 +717,8 @@ func (vm *VirtualMachine) VCHUpdateStatus(ctx context.Context) (bool, error) {
 
 // SetVCHUpdateStatus sets the VCH update status in ExtraConfig
 func (vm *VirtualMachine) SetVCHUpdateStatus(ctx context.Context, status bool) error {
+	op := trace.FromContext(ctx, "SetVCHUpdateStatus")
+
 	info := make(map[string]string)
 	info[UpdateStatus] = strconv.FormatBool(status)
 
@@ -570,22 +726,26 @@ func (vm *VirtualMachine) SetVCHUpdateStatus(ctx context.Context, status bool) e
 		ExtraConfig: vmomi.OptionValueFromMap(info, true),
 	}
 
-	_, err := vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vm.Reconfigure(ctx, *s)
+	_, err := vm.WaitForResult(op, func(op context.Context) (tasks.Task, error) {
+		return vm.Reconfigure(op, *s)
 	})
 
 	return err
 }
 
-// DisableDestroy attempts to disable the VirtualMachine.Destroy_Task method.
-// When the method is disabled, the VC UI will disable/grey out the VM "delete" action.
-// Requires the "Global.Disable" VC privilege.
-// The VirtualMachine.Destroy_Task method can still be invoked via the API.
-func (vm *VirtualMachine) DisableDestroy(ctx context.Context) {
+// DisableDestroy attempts to disable the VirtualMachine.Destroy_Task method on the VM
+// After destroy is disabled for the VM, any session other than the session that disables the destroy can't evoke the method
+// The "VM delete" option will be grayed out on VC UI
+// Requires the "Global.Disable" VC privilege
+func (vm *VirtualMachine) DisableDestroy(ctx context.Context) error {
+	// For nonVC, OOB deletion won't disrupt disk images (ESX doesn't delete parent disks)
+	// See https://github.com/vmware/vic/issues/2928
 	if !vm.IsVC() {
-		return
+		return nil
 	}
 
+	op := trace.FromContext(ctx, "DisableDestroy")
+
 	m := object.NewAuthorizationManager(vm.Vim25())
 
 	method := []object.DisabledMethodRequest{
@@ -597,41 +757,204 @@ func (vm *VirtualMachine) DisableDestroy(ctx context.Context) {
 
 	obj := []types.ManagedObjectReference{vm.Reference()}
 
-	err := m.DisableMethods(ctx, obj, method, "VIC")
+	err := m.DisableMethods(op, obj, method, "VIC")
 	if err != nil {
-		log.Warnf("Failed to disable method %s for %s: %s", method[0].Method, obj[0], err)
+		op.Warnf("Failed to disable method %s for %s: %s", method[0].Method, obj[0], err)
+		return err
 	}
+
+	return nil
 }
 
-// EnableDestroy attempts to enable the VirtualMachine.Destroy_Task method
-// so that the VC UI can enable the VM "delete" action.
-func (vm *VirtualMachine) EnableDestroy(ctx context.Context) {
+// EnableDestroy attempts to enable the VirtualMachine.Destroy_Task method for all sessions
+func (vm *VirtualMachine) EnableDestroy(ctx context.Context) error {
+	// For nonVC, OOB deletion won't disrupt disk images (ESX doesn't delete parent disks)
+	// See https://github.com/vmware/vic/issues/2928
 	if !vm.IsVC() {
-		return
+		return nil
 	}
 
+	op := trace.FromContext(ctx, "EnableDestroy")
+
 	m := object.NewAuthorizationManager(vm.Vim25())
 
 	obj := []types.ManagedObjectReference{vm.Reference()}
 
-	err := m.EnableMethods(ctx, obj, []string{DestroyTask}, "VIC")
+	err := m.EnableMethods(op, obj, []string{DestroyTask}, "VIC")
 	if err != nil {
-		log.Warnf("Failed to enable Destroy_Task for %s: %s", obj[0], err)
+		op.Warnf("Failed to enable Destroy_Task for %s: %s", obj[0], err)
+		return err
 	}
+
+	return nil
 }
 
-// RemoveSnapshot removes a snapshot by reference
-func (vm *VirtualMachine) RemoveSnapshotByRef(ctx context.Context, snapshot *types.ManagedObjectReference, removeChildren bool, consolidate *bool) (*object.Task, error) {
+// RemoveSnapshot removes the provided snapshot
+func (vm *VirtualMachine) RemoveSnapshot(op trace.Operation, snapshot *types.ManagedObjectReference, removeChildren bool, consolidate *bool) (*object.Task, error) {
 	req := types.RemoveSnapshot_Task{
 		This:           snapshot.Reference(),
 		RemoveChildren: removeChildren,
 		Consolidate:    consolidate,
 	}
 
-	res, err := methods.RemoveSnapshot_Task(ctx, vm.Vim25(), &req)
+	res, err := methods.RemoveSnapshot_Task(op, vm.Vim25(), &req)
 	if err != nil {
 		return nil, err
 	}
 
 	return object.NewTask(vm.Vim25(), res.Returnval), nil
 }
+
+// PowerOn powers on a VM. If the environment is VC without DRS enabled, it will attempt to relocate  the VM
+// to the most suitable host in the cluster. If relocation or subsequent power-on fail, it will attempt the next
+// best host, and repeat this process until a successful power-on is achieved or there are no more hosts to try.
+func (vm *VirtualMachine) PowerOn(op trace.Operation) error {
+	// if we aren't in VC, we don't need to recommend or use DRS-aware power-on
+	if !vm.IsVC() {
+		_, err := vm.WaitForResult(op, func(op context.Context) (tasks.Task, error) {
+			return vm.VirtualMachine.PowerOn(op)
+		})
+		return err
+	}
+
+	h, err := vm.Cluster.Hosts(op)
+	if err != nil {
+		return err
+	}
+
+	// we only recommend if the VM is in a cluster with more than one host
+	cls := vm.InCluster(op) && len(h) > 1
+	op.Debugf("%s resides in a multi-host cluster: %t", vm.Reference().String(), cls)
+
+	// or if DRS is disabled
+	drs := vm.Session.DRSEnabled != nil && *vm.Session.DRSEnabled
+	op.Debugf("DRS enabled: %t", drs)
+
+	if !cls || drs {
+		// if we aren't in a multi-host cluster or if we are and DRS is enabled,
+		// there is no reason to recommend a host, so bail early and power-on.
+		return vm.powerOnDRS(op)
+	}
+
+	// otherwise place the VM before powering it on
+	hmp := performance.NewHostMetricsProvider(vm.Session.Vim25())
+	rhp, err := placement.NewRankedHostPolicy(op, vm.Cluster, hmp)
+	if err != nil {
+		return err
+	}
+
+	// first we check if the host on which the VM was created is adequate for power-on
+	if rhp.CheckHost(op, vm.VirtualMachine) {
+		// if so, just power-on, don't bother recommending a better host
+		return vm.powerOnDRS(op)
+	}
+
+	op.Debugf("Host is not adequate for power-on, getting placement recommendation")
+
+	var hosts, subset []*object.HostSystem
+
+	f := func() error {
+		hosts, err = rhp.RecommendHost(op, subset)
+		if err != nil {
+			return fmt.Errorf("error recommending host: %s", err.Error())
+		}
+		return nil
+	}
+
+	conf := retry.NewBackoffConfig()
+	conf.MaxInterval = 1 * time.Second
+	conf.MaxElapsedTime = 20 * time.Second
+
+	err = retry.DoWithConfig(f, retry.OnError, conf)
+	if err != nil {
+		return err
+	}
+
+	for len(hosts) > 0 {
+		op.Debugf("hosts: %s", hosts)
+		op.Infof("Placement recommended %s", hosts[0].Reference().String())
+
+		var err error
+		if err = vm.relocate(op, hosts[0]); err != nil {
+			op.Warnf("VM relocation failed: %s", err.Error())
+		} else if err = vm.powerOnDRS(op); err != nil {
+			op.Warnf("VM power-on failed: %s", err.Error())
+		} else {
+			return nil
+		}
+
+		// if relocation or powerOn fails, something has changed and we need a new recommendation
+		subset = hosts[1:]
+
+		if err = retry.DoWithConfig(f, retry.OnError, conf); err != nil {
+			return err
+		}
+
+	}
+	op.Warnf("vm placement failed: no available hosts. Attempting power-on.")
+	return vm.powerOnDRS(op)
+}
+
+func (vm *VirtualMachine) powerOnDRS(op trace.Operation) error {
+	option := &types.OptionValue{
+		Key:   string(types.ClusterPowerOnVmOptionOverrideAutomationLevel),
+		Value: string(types.DrsBehaviorFullyAutomated),
+	}
+
+	t, err := vm.WaitForResult(op, func(op context.Context) (tasks.Task, error) {
+		return vm.Datacenter.PowerOnVM(op, []types.ManagedObjectReference{vm.Reference()}, option)
+	})
+	if err != nil {
+		return err
+	}
+
+	switch r := t.Result.(type) {
+	case types.ClusterPowerOnVmResult:
+		attempts := len(r.Attempted)
+		if attempts != 1 {
+			return fmt.Errorf("Attempted to power on the wrong number of VMs. Expected 1, attempted %d", attempts)
+		}
+		info := r.Attempted[0]
+		task := object.NewTask(vm.Session.Vim25(), *info.Task)
+		_, err := task.WaitForResult(op, nil)
+		return err
+	default:
+		return fmt.Errorf("Unexpected return type when attempting to power on VM: %T", r)
+	}
+}
+
+func (vm *VirtualMachine) relocate(op trace.Operation, host *object.HostSystem) error {
+	h, err := vm.HostSystem(op)
+	if err != nil {
+		return err
+	}
+	src := h.Reference()
+	dst := host.Reference()
+
+	// NOP if dest host and src host are the same
+	if src.String() == dst.String() {
+		op.Debugf("Skipping relocate - source and destination hosts are the same")
+		return nil
+	}
+
+	op.Debugf("Attempting to relocate %s from host %s to host %s", vm.Reference().String(), src.String(), dst.String())
+
+	spec := types.VirtualMachineRelocateSpec{Host: &dst}
+	_, err = vm.WaitForResult(op, func(op context.Context) (tasks.Task, error) {
+		return vm.Relocate(op, spec, types.VirtualMachineMovePriorityDefaultPriority)
+	})
+	if err != nil {
+		return err
+	}
+
+	op.Infof("VM %s successfully relocated", vm.Reference().String())
+
+	return nil
+}
+
+// InCluster returns true if the VM belongs to a cluster
+func (vm *VirtualMachine) InCluster(op trace.Operation) bool {
+	cls := vm.Cluster.Reference().Type == "ClusterComputeResource"
+	op.Debugf("vm compute resource: %s", vm.Cluster.Name())
+	return cls
+}
diff --git a/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm_test.go b/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm_test.go
deleted file mode 100644
index 6cc409d2be..0000000000
--- a/installer/vendor/github.com/vmware/vic/pkg/vsphere/vm/vm_test.go
+++ /dev/null
@@ -1,774 +0,0 @@
-// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vm
-
-import (
-	"container/list"
-	"context"
-	"fmt"
-	"math"
-	"math/rand"
-	"os"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-
-	"github.com/vmware/govmomi"
-	"github.com/vmware/govmomi/find"
-	"github.com/vmware/govmomi/object"
-	"github.com/vmware/govmomi/simulator"
-	"github.com/vmware/govmomi/vim25/mo"
-	"github.com/vmware/govmomi/vim25/types"
-	"github.com/vmware/vic/lib/guest"
-	"github.com/vmware/vic/pkg/vsphere/extraconfig/vmomi"
-	"github.com/vmware/vic/pkg/vsphere/session"
-	"github.com/vmware/vic/pkg/vsphere/sys"
-	"github.com/vmware/vic/pkg/vsphere/tasks"
-	"github.com/vmware/vic/pkg/vsphere/test"
-)
-
-func CreateVM(ctx context.Context, session *session.Session, host *object.HostSystem, name string) (*types.ManagedObjectReference, error) {
-	// Create the spec config
-	specconfig := test.SpecConfig(session, name)
-
-	// Create a linux guest
-	linux, err := guest.NewLinuxGuest(ctx, session, specconfig)
-	if err != nil {
-		return nil, err
-	}
-
-	// Create the vm
-	task, err := session.VMFolder.CreateVM(ctx, *linux.Spec().Spec(), session.Pool, host)
-	if err != nil {
-		return nil, err
-	}
-	info, err := task.WaitForResult(ctx, nil)
-	if err != nil {
-		return nil, err
-	}
-
-	moref := info.Result.(types.ManagedObjectReference)
-	// Return the moRef
-	return &moref, nil
-}
-
-func TestDeleteExceptDisk(t *testing.T) {
-	s := os.Getenv("DRONE")
-	if s != "" {
-		t.Skip("Skipping: test must be run in a VM")
-	}
-
-	ctx := context.Background()
-
-	session := test.Session(ctx, t)
-	defer session.Logout(ctx)
-
-	host := test.PickRandomHost(ctx, session, t)
-
-	uuid, err := sys.UUID()
-	if err != nil {
-		t.Fatalf("unable to get UUID for guest - used for VM name: %s", err)
-	}
-	name := fmt.Sprintf("%s-%d", uuid, rand.Intn(math.MaxInt32))
-
-	moref, err := CreateVM(ctx, session, host, name)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	// Wrap the result with our version of VirtualMachine
-	vm := NewVirtualMachine(ctx, session, *moref)
-
-	folder, err := vm.FolderName(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	// generate the disk name
-	diskName := fmt.Sprintf("%s/%s.vmdk", folder, folder)
-
-	// Delete the VM but not it's disk
-	task, err := vm.DeleteExceptDisks(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	_, err = task.WaitForResult(ctx, nil)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	// check that the disk still exists
-	session.Datastore.Stat(ctx, diskName)
-	if err != nil {
-		t.Fatalf("Disk does not exist")
-	}
-
-	// clean up
-	dm := object.NewVirtualDiskManager(session.Client.Client)
-
-	task, err = dm.DeleteVirtualDisk(context.TODO(), diskName, nil)
-	if err != nil {
-		t.Fatalf("Unable to locate orphan vmdk: %s", err)
-	}
-
-	if err = task.Wait(context.TODO()); err != nil {
-		t.Fatalf("Unable to remove orphan vmdk: %s", err)
-	}
-}
-
-func TestVM(t *testing.T) {
-
-	s := os.Getenv("DRONE")
-	if s != "" {
-		t.Skip("Skipping: test must be run in a VM")
-	}
-
-	ctx := context.Background()
-
-	session := test.Session(ctx, t)
-	defer session.Logout(ctx)
-
-	host := test.PickRandomHost(ctx, session, t)
-
-	uuid, err := sys.UUID()
-	if err != nil {
-		t.Fatalf("unable to get UUID for guest - used for VM name: %s", err)
-		return
-	}
-	name := fmt.Sprintf("%s-%d", uuid, rand.Intn(math.MaxInt32))
-
-	moref, err := CreateVM(ctx, session, host, name)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	// Wrap the result with our version of VirtualMachine
-	vm := NewVirtualMachine(ctx, session, *moref)
-
-	// Check the state
-	state, err := vm.PowerState(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	assert.Equal(t, types.VirtualMachinePowerStatePoweredOff, state)
-
-	// Check VM name
-	rname, err := vm.Name(ctx)
-	if err != nil {
-		t.Errorf("Failed to load VM name: %s", err)
-	}
-	assert.Equal(t, name, rname)
-
-	// Get VM UUID
-	ruuid, err := vm.UUID(ctx)
-	if err != nil {
-		t.Errorf("Failed to load VM UUID: %s", err)
-	}
-	t.Logf("Got UUID: %s", ruuid)
-
-	err = vm.fixVM(ctx)
-	if err != nil {
-		t.Errorf("Failed to fix vm: %s", err)
-	}
-	newVM, err := session.Finder.VirtualMachine(ctx, name)
-	if err != nil {
-		t.Errorf("Failed to find fixed vm: %s", err)
-	}
-	assert.Equal(t, vm.Reference(), newVM.Reference())
-
-	// VM properties
-	var ovm mo.VirtualMachine
-	if err = vm.Properties(ctx, newVM.Reference(), []string{"config"}, &ovm); err != nil {
-		t.Errorf("Failed to get vm properties: %s", err)
-	}
-
-	// Destroy the vm
-	task, err := vm.Destroy(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	_, err = task.WaitForResult(ctx, nil)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-}
-
-func TestVMFailureWithTimeout(t *testing.T) {
-	ctx := context.Background()
-
-	session := test.Session(ctx, t)
-	defer session.Logout(ctx)
-
-	host := test.PickRandomHost(ctx, session, t)
-
-	ctx, cancel := context.WithTimeout(ctx, 1*time.Microsecond)
-	defer cancel()
-
-	uuid, err := sys.UUID()
-	if err != nil {
-		t.Fatalf("unable to get UUID for guest - used for VM name: %s", err)
-		return
-	}
-	name := fmt.Sprintf("%s-%d", uuid, rand.Intn(math.MaxInt32))
-
-	_, err = CreateVM(ctx, session, host, name)
-	if err != nil && err != context.DeadlineExceeded {
-		t.Fatalf("ERROR: %s", err)
-	}
-}
-
-func TestVMAttributes(t *testing.T) {
-
-	ctx := context.Background()
-
-	session := test.Session(ctx, t)
-	defer session.Logout(ctx)
-
-	host := test.PickRandomHost(ctx, session, t)
-
-	uuid, err := sys.UUID()
-	if err != nil {
-		t.Fatalf("unable to get UUID for guest - used for VM name: %s", err)
-		return
-	}
-	ID := fmt.Sprintf("%s-%d", uuid, rand.Intn(math.MaxInt32))
-
-	moref, err := CreateVM(ctx, session, host, ID)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	// Wrap the result with our version of VirtualMachine
-	vm := NewVirtualMachine(ctx, session, *moref)
-
-	folder, err := vm.FolderName(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	name, err := vm.Name(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	assert.Equal(t, name, folder)
-	task, err := vm.PowerOn(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	_, err = task.WaitForResult(ctx, nil)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	if guest, err := vm.FetchExtraConfig(ctx); err != nil {
-		t.Fatalf("ERROR: %s", err)
-	} else {
-		assert.NotEmpty(t, guest)
-	}
-	defer func() {
-		// Destroy the vm
-		task, err := vm.PowerOff(ctx)
-		if err != nil {
-			t.Fatalf("ERROR: %s", err)
-		}
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
-			t.Fatalf("ERROR: %s", err)
-		}
-		task, err = vm.Destroy(ctx)
-		if err != nil {
-			t.Fatalf("ERROR: %s", err)
-		}
-		_, err = task.WaitForResult(ctx, nil)
-		if err != nil {
-			t.Fatalf("ERROR: %s", err)
-		}
-	}()
-}
-
-func TestWaitForKeyInExtraConfig(t *testing.T) {
-	ctx := context.Background()
-
-	m := simulator.ESX()
-	defer m.Remove()
-	err := m.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := m.Service.NewServer()
-	defer server.Close()
-
-	config := &session.Config{
-		Service: server.URL.String(),
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if s, err = s.Populate(ctx); err != nil {
-		t.Fatal(err)
-	}
-
-	vms, err := s.Finder.VirtualMachineList(ctx, "*")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	vm := NewVirtualMachineFromVM(ctx, s, vms[0])
-
-	opt := &types.OptionValue{Key: "foo", Value: "bar"}
-	obj := simulator.Map.Get(vm.Reference()).(*simulator.VirtualMachine)
-
-	val, err := vm.WaitForKeyInExtraConfig(ctx, opt.Key)
-
-	if err == nil {
-		t.Error("expected error")
-	}
-
-	obj.Config.ExtraConfig = append(obj.Config.ExtraConfig, opt)
-	obj.Summary.Runtime.PowerState = types.VirtualMachinePowerStatePoweredOn
-
-	val, err = vm.WaitForKeyInExtraConfig(ctx, opt.Key)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if val != opt.Value {
-		t.Errorf("%s != %s", val, opt.Value)
-	}
-}
-
-func createSnapshotTree(prefix string, deep int, wide int) []types.VirtualMachineSnapshotTree {
-	var result []types.VirtualMachineSnapshotTree
-	if deep == 0 {
-		return nil
-	}
-	for i := 1; i <= wide; i++ {
-		nodeID := fmt.Sprintf("%s%d", prefix, i)
-		node := types.VirtualMachineSnapshotTree{
-			Snapshot: types.ManagedObjectReference{
-				Type:  "Snapshot",
-				Value: nodeID,
-			},
-			Name: nodeID,
-		}
-		node.ChildSnapshotList = createSnapshotTree(nodeID, deep-1, wide)
-		result = append(result, node)
-	}
-	return result
-}
-
-func TestBfsSnapshotTree(t *testing.T) {
-	ref := &types.ManagedObjectReference{
-		Type:  "Snapshot",
-		Value: "12131",
-	}
-	rootList := createSnapshotTree("", 5, 5)
-
-	ctx := context.Background()
-
-	session := test.Session(ctx, t)
-	defer session.Logout(ctx)
-	vm := NewVirtualMachine(ctx, session, *ref)
-	q := list.New()
-	for _, c := range rootList {
-		q.PushBack(c)
-	}
-
-	compareID := func(node types.VirtualMachineSnapshotTree) bool {
-		if node.Snapshot == *ref {
-			t.Logf("Found match")
-			return true
-		}
-		return false
-	}
-	current := vm.bfsSnapshotTree(q, compareID)
-	if current == nil {
-		t.Errorf("Should found current snapshot")
-	}
-	q = list.New()
-	for _, c := range rootList {
-		q.PushBack(c)
-	}
-
-	ref = &types.ManagedObjectReference{
-		Type:  "Snapshot",
-		Value: "185",
-	}
-	current = vm.bfsSnapshotTree(q, compareID)
-	if current != nil {
-		t.Errorf("Should not found snapshot")
-	}
-
-	name := "12131"
-	compareName := func(node types.VirtualMachineSnapshotTree) bool {
-		if node.Name == name {
-			t.Logf("Found match")
-			return true
-		}
-		return false
-	}
-	q = list.New()
-	for _, c := range rootList {
-		q.PushBack(c)
-	}
-	found := vm.bfsSnapshotTree(q, compareName)
-	if found == nil {
-		t.Errorf("Should found snapshot %q", name)
-	}
-	q = list.New()
-	for _, c := range rootList {
-		q.PushBack(c)
-	}
-	name = "185"
-	found = vm.bfsSnapshotTree(q, compareName)
-	if found != nil {
-		t.Errorf("Should not found snapshot")
-	}
-}
-
-// TestProperties test vm.properties happy path and fix vm path
-func TestIsFixing(t *testing.T) {
-	mo := types.ManagedObjectReference{Type: "vm", Value: "12"}
-	v := object.NewVirtualMachine(nil, mo)
-	vm := NewVirtualMachineFromVM(nil, nil, v)
-	assert.False(t, vm.IsFixing(), "new vm should not in fixing status")
-	vm.EnterFixingState()
-	assert.True(t, vm.IsFixing(), "vm should be in fixing status")
-	vm.EnterFixingState()
-	assert.True(t, vm.IsFixing(), "vm should be in fixing status")
-	vm.LeaveFixingState()
-	assert.False(t, vm.IsFixing(), "vm should not be in fixing status")
-}
-
-// TestProperties test vm.properties happy path and fix vm path
-func TestProperties(t *testing.T) {
-	ctx := context.Background()
-
-	// Nothing VC specific in this test, so we use the simpler ESX model
-	model := simulator.ESX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-	client, err := govmomi.NewClient(ctx, server.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Any VM will do
-	finder := find.NewFinder(client.Client, false)
-	vmo, err := finder.VirtualMachine(ctx, "/ha-datacenter/vm/*_VM0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	config := &session.Config{
-		Service:        server.URL.String(),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.Populate(ctx)
-	vmm := NewVirtualMachine(ctx, s, vmo.Reference())
-	// Test the success path
-	var o mo.VirtualMachine
-	err = vmm.Properties(ctx, vmo.Reference(), []string{"config", "summary", "resourcePool", "parentVApp"}, &o)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	//	// Inject invalid connection state to vm
-	ref := simulator.Map.Get(vmo.Reference()).(*simulator.VirtualMachine)
-	ref.Summary.Config.VmPathName = ref.Config.Files.VmPathName
-	ref.Summary.Runtime.ConnectionState = types.VirtualMachineConnectionStateInvalid
-
-	err = vmm.Properties(ctx, vmo.Reference(), []string{"config", "summary"}, &o)
-	if err != nil {
-		t.Fatal(err)
-	}
-	assert.True(t, o.Summary.Runtime.ConnectionState != types.VirtualMachineConnectionStateInvalid, "vm state should be fixed")
-}
-
-// TestWaitForResult covers the success path and invalid vm fix path
-func TestWaitForResult(t *testing.T) {
-	ctx := context.Background()
-
-	// Nothing VC specific in this test, so we use the simpler ESX model
-	model := simulator.ESX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-
-	client, err := govmomi.NewClient(ctx, server.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Any VM will do
-	finder := find.NewFinder(client.Client, false)
-	vmo, err := finder.VirtualMachine(ctx, "/ha-datacenter/vm/*_VM0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	config := &session.Config{
-		Service:        server.URL.String(),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.Populate(ctx)
-	vmm := NewVirtualMachine(ctx, s, vmo.Reference())
-	// Test the success path
-	_, err = vmm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vmm.PowerOn(ctx)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = vmm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vmm.PowerOff(ctx)
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ref := simulator.Map.Get(vmm.Reference()).(*simulator.VirtualMachine)
-
-	// Test task failed, but vm is not in invalid state
-	called := 0
-	_, err = vmm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		called++
-		return vmm.PowerOff(ctx)
-	})
-	if err == nil {
-		t.Fatal("Should have error")
-	}
-	assert.True(t, called == 1, "task should not be retried")
-
-	// Test task failure with invalid state vm
-	ref.Summary.Config.VmPathName = ref.Config.Files.VmPathName
-	ref.Summary.Runtime.ConnectionState = types.VirtualMachineConnectionStateInvalid
-	called = 0
-	_, err = vmm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		called++
-		return vmm.PowerOff(ctx)
-	})
-	assert.True(t, called == 2, "task should be retried once")
-	assert.True(t, !vmm.IsInvalidState(ctx), "vm state should be fixed")
-}
-
-// SetUpdateStatus sets the VCH upgrade/configure status.
-func SetUpdateStatus(ctx context.Context, updateStatus string, vm *VirtualMachine) error {
-	info := make(map[string]string)
-	info[UpdateStatus] = updateStatus
-
-	s := &types.VirtualMachineConfigSpec{
-		ExtraConfig: vmomi.OptionValueFromMap(info, true),
-	}
-
-	_, err := vm.WaitForResult(ctx, func(ctx context.Context) (tasks.Task, error) {
-		return vm.Reconfigure(ctx, *s)
-	})
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-// TestVCHUpdateStatus tests if VCHUpdateStatus() could obtain the correct VCH upgrade/configure status
-func TestVCHUpdateStatus(t *testing.T) {
-	ctx := context.Background()
-
-	// Nothing VC specific in this test, so we use the simpler ESX model
-	model := simulator.ESX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-	client, err := govmomi.NewClient(ctx, server.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Any VM will do
-	finder := find.NewFinder(client.Client, false)
-	vmo, err := finder.VirtualMachine(ctx, "/ha-datacenter/vm/*_VM0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	config := &session.Config{
-		Service:        server.URL.String(),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.Populate(ctx)
-	vmm := NewVirtualMachine(ctx, s, vmo.Reference())
-
-	updateStatus, err := vmm.VCHUpdateStatus(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	assert.False(t, updateStatus, "updateStatus should be false if UpdateInProgress is not set in the VCH's ExtraConfig")
-
-	// Set UpdateInProgress to false
-	SetUpdateStatus(ctx, "false", vmm)
-
-	updateStatus, err = vmm.VCHUpdateStatus(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	assert.False(t, updateStatus, "updateStatus should be false since UpdateInProgress is set to false")
-
-	// Set UpdateInProgress to true
-	SetUpdateStatus(ctx, "true", vmm)
-
-	updateStatus, err = vmm.VCHUpdateStatus(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-	assert.True(t, updateStatus, "updateStatus should be true since UpdateInProgress is set to true")
-
-	// Set UpdateInProgress to NonBool
-	SetUpdateStatus(ctx, "NonBool", vmm)
-
-	updateStatus, err = vmm.VCHUpdateStatus(ctx)
-	if assert.Error(t, err, "An error was expected") {
-		assert.Contains(t, err.Error(), "failed to parse", "Error msg should contain 'failed to parse' since UpdateInProgress is set to NonBool")
-	}
-}
-
-// TestSetVCHUpdateStatus tests if SetVCHUpdateStatus() could set the VCH upgrade/configure status correctly
-func TestSetVCHUpdateStatus(t *testing.T) {
-	ctx := context.Background()
-
-	// Nothing VC specific in this test, so we use the simpler ESX model
-	model := simulator.ESX()
-	defer model.Remove()
-	err := model.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	server := model.Service.NewServer()
-	defer server.Close()
-	client, err := govmomi.NewClient(ctx, server.URL, true)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Any VM will do
-	finder := find.NewFinder(client.Client, false)
-	vmo, err := finder.VirtualMachine(ctx, "/ha-datacenter/vm/*_VM0")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	config := &session.Config{
-		Service:        server.URL.String(),
-		Insecure:       true,
-		Keepalive:      time.Duration(5) * time.Minute,
-		DatacenterPath: "",
-		DatastorePath:  "/ha-datacenter/datastore/*",
-		HostPath:       "/ha-datacenter/host/*/*",
-		PoolPath:       "/ha-datacenter/host/*/Resources",
-	}
-
-	s, err := session.NewSession(config).Connect(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	s.Populate(ctx)
-	vmm := NewVirtualMachine(ctx, s, vmo.Reference())
-
-	// Set UpdateInProgress to true and then check status
-	err = vmm.SetVCHUpdateStatus(ctx, true)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	info, err := vmm.FetchExtraConfig(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	v, ok := info[UpdateStatus]
-	if ok {
-		assert.Equal(t, "true", v, "UpdateInProgress should be true")
-	} else {
-		t.Fatal("ERROR: UpdateInProgress does not exist in ExtraConfig")
-	}
-
-	// Set UpdateInProgress to false and then check status
-	err = vmm.SetVCHUpdateStatus(ctx, false)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	info, err = vmm.FetchExtraConfig(ctx)
-	if err != nil {
-		t.Fatalf("ERROR: %s", err)
-	}
-
-	v, ok = info[UpdateStatus]
-	if ok {
-		assert.Equal(t, "false", v, "UpdateInProgress should be false")
-	} else {
-		t.Fatal("ERROR: UpdateInProgress does not exist in ExtraConfig")
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vic/tests/README.md b/installer/vendor/github.com/vmware/vic/tests/README.md
deleted file mode 100644
index 3dc12f58ab..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# VIC Engine Integration & Functional Test Suite
-
-To run the integration tests locally:
-
-## Automatic with defaults
-
-Use ./local-integration-test.sh
-
-## Manually configure local Drone
-
-* Create a `test.secrets` file containing secrets in KEY=VALUE format which includes:
-
-  ```
-    GITHUB_AUTOMATION_API_KEY=<token from https://github.com/settings/tokens>
-    TEST_BUILD_IMAGE=""
-    TEST_URL_ARRAY=<IP address of your test server>
-    TEST_USERNAME=<username you use to login to test server>
-    TEST_PASSWORD=<password you use to login to test server>
-    TEST_RESOURCE=<resource pool, e.g. /ha-datacenter/host/localhost.localdomain/Resources>
-    TEST_DATASTORE=<datastore name, e.g. datastore1>
-    TEST_TIMEOUT=60s
-    VIC_ESX_TEST_DATASTORE=<datastore path, e.g. /ha-datacenter/datastore/datastore1>
-    VIC_ESX_TEST_URL=<user:password@IP address of your test server>
-    DOMAIN=<domain for TLS cert generation, may be blank>
-  ```
-
-  If you are using a vSAN environment or non-default ESX install, then you can also specify the two networks to use with the following command (make sure to add them to the yaml file in Step 2 below as well):
-
-  ```
-    BRIDGE_NETWORK=bridge
-    PUBLIC_NETWORK=public
-  ```
-
-  If you want to use an existing VCH to run a test (e.g. any of the group 1 tests) on, add the following secret to the secrets file:
-
-  ```
-    TARGET_VCH=<name of an existing VCH>
-  ```
-
-  The above TARGET_VCH is best used for tests where you do not want to exercise vic-machine's create/delete operations.  The Group 1 tests is a great example.  Their main goal is to test docker commands.
-
-  If TARGET_VCH is not specified, and you have a group initializer and cleanup file (see the group 1 tests), there is another variable to control whether use a shared VCH.
-
-  ```
-    MULTI_VCH=<1 for enable>
-  ```
-
-  Enabling MULTI_VCH forces each suite to install a new VCH and cleans it up at the end of the test.  If the test is in 'single vch' mode, it will respect the group initializer and cleanup file.  If the initializer creates the shared VCH, then all tests will use that shared VCH.  If TARGET_VCH exist, MULTI_VCH is ignored.
-
-  ```
-    DEBUG_VCH=<1 to enable>
-  ```
-
-  Enabling DEBUG_VCH will log existing docker images and containers on a VCH at the start of a test suite.
-
-
-* Execute Drone from the project root directory:
-
-  Drone will run based on `.drone.local.yml` - defaults should be fine, edit as needed
-
-  *  To run only the regression tests:
-     ```
-     drone exec --repo.trusted --secrets-file "test.secrets"  .drone.local.yml
-     ```
-
-  * To run the full suite:
-     ```
-		 drone exec --repo.trusted --repo.branch=master --repo.fullname="vmware/vic"  --secrets-file "test.secrets"  .drone.local.yml
-     ```
-
-## Test a specific .robot file
-
-* Set environment in robot.sh
-* Run robot.sh with the desired .robot file
-
-  From the project root directory:
-  ```
-  ./tests/robot.sh tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.robot
-  ```
-
-## Find the documentation for each of the tests here:
-
-* [Automated Test Suite Documentation](test-cases/TestGroups.md)
-* [Manual Test Suite Documentation](manual-test-cases/TestGroups.md)
-
-## Tips on running tests more efficiently
-
-Here are some recommendations that will make running tests more effective.
-
-1. If a group of tests do not need an independent VCH to run on, there is a facility to use a single VCH for the entire group.  The Group 1 tests utilizes this facility.  To utilize this in a group (a folder of robot files),
-    - Add an __init__.robot file as the first robot file in your group.  This special init file should install the VCH and save the VCH-NAME to environment variable REUSE-VCH.  The bootrap file also needs to save the VCH to the removal exception list.
-    - Every robot file should neither assume a group-wide VCH.  It should install and remove a VCH for it's own use.  This allows the single robot file to be properly targeted for testing as a single test or as part of a group of test (with group-wide VCH).  When a group wide VCH is in use, the exception list will bypass the per-robot file VCH install and removal.
-    - Write individual tests within a robot file with NO assumption of a standalone VCH.  Assume a shared VCH.  This will allow the
-    tests to run in either shared VCH or standalone VCH mode.
-    - Add a cleanup.robot file that handles cleaning up the group-wide VCH.  It needs to remove the group-wide VCH-NAME from the cleanup exception list.
-2. Write all tests within robot file with the assumption that the VCH is in shared mode.  Don't assume there are no previously created containers and images.  If a robot file needs this precondition, make sure the suite setup cleans out the VCH before running any test.
-3. If there is an existing VCH available, it is possible to bypass the VCH installation/deletion by adding a TARGET_VCH into the list of test secrets.
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/ci-env.sh b/installer/vendor/github.com/vmware/vic/tests/ci-env.sh
deleted file mode 100644
index b0fdb04519..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/ci-env.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -e
-
-if [ ! -f /ci/test_env ]; then
-    echo "'/ci/test_env' file not found! Make sure its available on host and mounted.";
-fi
-
-# update file permissions
-chmod 777 /ci/test_env
-
-# source env variables from volume mounted test_env file
-. /ci/test_env
-
-# check if DRONE_MACHINE is set
-# TODO: use DRONE_MACHINE from 0.8 drone version
-if [ -z "${DRONE_MACHINE}" ]; then
-    echo "WARN: DRONE_MACHINE is not set";
-else
-    echo "DRONE_MACHINE is set to '$DRONE_MACHINE'";
-fi
diff --git a/installer/vendor/github.com/vmware/vic/tests/get_test_url.sh b/installer/vendor/github.com/vmware/vic/tests/get_test_url.sh
deleted file mode 100755
index 28901da9f4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/get_test_url.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-DRONE_BUILD_NUMBER=${DRONE_BUILD_NUMBER:=0}
-unit_test_array=($TEST_URL_ARRAY)
-arrLen=${#unit_test_array[@]}
-
-echo $TEST_USERNAME:$TEST_PASSWORD@${unit_test_array[$(($DRONE_BUILD_NUMBER % $arrLen))]}
diff --git a/installer/vendor/github.com/vmware/vic/tests/integration-test.sh b/installer/vendor/github.com/vmware/vic/tests/integration-test.sh
deleted file mode 100755
index d8943e3d75..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/integration-test.sh
+++ /dev/null
@@ -1,83 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-set -x
-gsutil version -l
-set +x
-
-dpkg -l > package.list
-
-
-buildinfo=$(drone build info vmware/vic $DRONE_BUILD_NUMBER)
-
-if [[ $DRONE_BRANCH == "master" || $DRONE_BRANCH == "releases/"* ]] && [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "push" ]]; then
-    echo "Running full CI for $DRONE_BUILD_EVENT on $DRONE_BRANCH"
-    pybot --removekeywords TAG:secret --exclude skip tests/test-cases
-elif [[ $DRONE_BRANCH == *"refs/tags"* ]] && [[ $DRONE_REPO == "vmware/vic" ]] && [[ $DRONE_BUILD_EVENT == "tag" ]]; then
-    echo "Running only Group11-Upgrade and 7-01-Regression for $DRONE_BUILD_EVENT on $DRONE_BRANCH"
-    pybot --removekeywords TAG:secret --suite Group11-Upgrade --suite 7-01-Regression tests/test-cases
-elif grep -q "\[full ci\]" <(drone build info vmware/vic $DRONE_BUILD_NUMBER); then
-    echo "Running full CI as per commit message"
-    pybot --removekeywords TAG:secret --exclude skip tests/test-cases
-elif (echo $buildinfo | grep -q "\[specific ci="); then
-    echo "Running specific CI as per commit message"
-    buildtype=$(echo $buildinfo | grep "\[specific ci=")
-    testsuite=$(echo $buildtype | awk -F"\[specific ci=" '{sub(/\].*/,"",$2);print $2}')
-    pybot --removekeywords TAG:secret --suite $testsuite --suite 7-01-Regression tests/test-cases
-else
-    echo "Running regressions"
-    pybot --removekeywords TAG:secret --exclude skip --include regression tests/test-cases
-fi
-
-rc="$?"
-
-timestamp=$(date +%s)
-outfile="integration_logs_"$DRONE_BUILD_NUMBER"_"$DRONE_COMMIT".zip"
-
-zip -9 $outfile output.xml log.html report.html package.list *container-logs.zip *.log
-
-# GC credentials
-keyfile="/root/vic-ci-logs.key"
-botofile="/root/.boto"
-echo -en $GS_PRIVATE_KEY > $keyfile
-chmod 400 $keyfile
-echo "[Credentials]" >> $botofile
-echo "gs_service_key_file = $keyfile" >> $botofile
-echo "gs_service_client_id = $GS_CLIENT_EMAIL" >> $botofile
-echo "[GSUtil]" >> $botofile
-echo "content_language = en" >> $botofile
-echo "default_project_id = $GS_PROJECT_ID" >> $botofile
-
-
-if [ -f "$outfile" ]; then
-  gsutil cp $outfile gs://vic-ci-logs
-  source "$(dirname "${BASH_SOURCE[0]}")/save-test-results.sh"
-
-  echo "----------------------------------------------"
-  echo "View test logs:"
-  echo "https://vic-logs.vcna.io/$DRONE_BUILD_NUMBER/"
-  echo "Download test logs:"
-  echo "https://console.cloud.google.com/m/cloudstorage/b/vic-ci-logs/o/$outfile?authuser=1"
-  echo "----------------------------------------------"
-else
-  echo "No log output file to upload"
-fi
-
-if [ -f "$keyfile" ]; then
-  rm -f $keyfile
-fi
-
-exit $rc
diff --git a/installer/vendor/github.com/vmware/vic/tests/local-integration-test.sh b/installer/vendor/github.com/vmware/vic/tests/local-integration-test.sh
deleted file mode 100755
index 0e0c859760..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/local-integration-test.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash -e
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Run robot integration tests locally, no .yml files required.
-# Set GITHUB_TOKEN once and switch environments just by changing GOVC_URL
-
-cmd="pybot"
-
-while getopts t: flag
-do
-    case $flag in
-        # run a specific test
-        t)
-            cmd="$cmd --exclude skip -t \"$OPTARG\""
-            ;;
-    esac
-done
-
-shift $((OPTIND-1))
-
-if [ -z "$GITHUB_TOKEN" ] || [ -z "$GOVC_URL" ]; then
-    echo "usage: GITHUB_TOKEN=... GOVC_URL=... $0 test.robot..."
-    exit 1
-fi
-
-# check if govc env command works as expected
-if ! govc version -require 0.9.0; then
-    echo "govc version must be updated"
-    exit 1
-fi
-
-if [ -z "$DOMAIN" ]; then
-  echo "DOMAIN not set, using --no-tlsverify for all tests"
-fi
-
-cd "$(git rev-parse --show-toplevel)"
-
-tests=${*#${PWD}/}
-
-# Create a temp drone.yml file
-tempfile() {
-    # tempprefix=$(basename "$0")
-    # mktemp /tmp/${tempprefix}.yml
-    mktemp .tmp.drone.XXXXX.yml
-    # $(mktemp .tmp.drone.`date +%s`.yml)
-}
-
-cleanup() {
-    echo "removing temp file $tmpYml"
-    rm -f $tmpYml
-}
-tmpYml=$(tempfile)
-#cleanup temp file on exit
-trap cleanup EXIT
-
-cat > $tmpYml <<CONFIG
----
-workspace:
-  base: /go
-  path: src/github.com/vmware/vic
-
-pipeline:
-  clone:
-    image: plugins/git
-    tags: true
-    # dont clone submodules
-    recursive: false
-  vic-integration-test-on-pr:
-    image: gcr.io/eminent-nation-87317/vic-integration-test:1.36
-    pull: true
-    environment:
-      GITHUB_AUTOMATION_API_KEY: $GITHUB_TOKEN
-      TEST_URL_ARRAY:   $(govc env -x GOVC_URL_HOST)
-      TEST_USERNAME:    $(govc env GOVC_USERNAME)
-      TEST_PASSWORD:    $(govc env GOVC_PASSWORD)
-      TEST_DATASTORE:   ${GOVC_DATASTORE:-$(basename "$(govc ls datastore | head -1)")}
-      TEST_RESOURCE:    ${GOVC_RESOURCE_POOL:-$(govc ls host/*/Resources)}
-      BRIDGE_NETWORK:   $BRIDGE_NETWORK
-      PUBLIC_NETWORK:   $PUBLIC_NETWORK
-      DOMAIN:           $DOMAIN
-      BIN: bin
-      GOPATH: /go
-      SHELL: /bin/bash
-      TEST_TIMEOUT: 60s
-      GOVC_INSECURE: true
-    commands:
-      - $cmd ${tests:-tests/test-cases}
-CONFIG
-
-drone exec --privileged --local $tmpYml
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.0 b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.0
deleted file mode 100644
index ee58f85d55..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.0
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-FROM longevity-base
-ENV GOVC_URL=bart.eng.vmware.com
-ENV TEST_URL_ARRAY=bart.eng.vmware.com
-ENV STATIC_VCH_OPTIONS="--insecure-registry=willie.eng.vmware.com --public-network-ip 10.17.109.6/24 --public-network-gateway 10.17.109.253 --dns-server 10.118.81.1"
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.5 b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.5
deleted file mode 100644
index 1ac31d545e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.6.5
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-FROM longevity-base
-ENV GOVC_URL=blinky.eng.vmware.com
-ENV TEST_URL_ARRAY=blinky.eng.vmware.com
-ENV STATIC_VCH_OPTIONS="--insecure-registry=willie.eng.vmware.com --public-network-ip 10.17.109.7/24 --public-network-gateway 10.17.109.253 --dns-server 10.118.81.1"
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.foundation b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.foundation
deleted file mode 100644
index c9b487a04a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/Dockerfile.foundation
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-FROM gcr.io/eminent-nation-87317/vic-integration-test:1.36
-RUN mkdir -p /go/src/github.com/vmware/vic
-COPY secrets /go/src/github.com/vmware/vic
-ENV LONGEVITY=1
-ENV GOVC_INSECURE=1
-ENV GOVC_USERNAME=administrator@vsphere.local
-ENV GOVC_DATASTORE=vsanDatastore
-ENV TEST_DATASTORE=vsanDatastore
-ENV TEST_USERNAME=administrator@vsphere.local
-ENV TEST_TIMEOUT=3m
-ENV TEST_RESOURCE=cls
-ENV DOMAIN=
-ENV BRIDGE_NETWORK=bridge
-ENV PUBLIC_NETWORK=vm-network
-ENV DOCKER_API_VERSION=1.23
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/get-and-start-harbor.bash b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/get-and-start-harbor.bash
deleted file mode 100755
index 17354c2e3b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/get-and-start-harbor.bash
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-#!/bin/bash
-set -e
-
-if [ $# -ne 1 ]; then
-    echo "Usage: $0 harbor-version"
-    exit 1
-fi
-version=$1
-pushd /home/$USER
-[ -e harbor ] \
-    && echo "/home/$USER/harbor exists. Delete it if you want to install a newer version and re-run $0" \
-    && pushd harbor && docker-compose start && popd && exit 0
-
-echo "Pulling down version ${version} of Harbor..."
-wget https://github.com/vmware/harbor/releases/download/v${version}/harbor-online-installer-v${version}.tgz -qO - | tar xz
-pushd harbor
-echo "Configuring Harbor"
-sed -i 's/hostname = reg.mydomain.com/hostname = willie.eng.vmware.com/g' harbor.cfg
-echo "Installing & starting Harbor"
-sudo ./install.sh
-popd
-popd
-
-echo "Preparing Harbor..."
-echo "Logging in..."
-docker login willie.eng.vmware.com --username=admin --password="Harbor12345"
-echo "Pulling some images to put in Harbor and putting them in Harbor.."
-
-pushd /home/$USER/vic/tests/resources
-for image in $(python -c "vars=__import__('dynamic-vars'); print(\" \".join(vars.images))"); do
-    docker pull $image
-    docker tag $image willie.eng.vmware.com/library/${image}
-    docker push willie.eng.vmware.com/library/${image}
-done
-popd
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/run-longevity.bash b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/run-longevity.bash
deleted file mode 100755
index b27c58dd69..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/run-longevity.bash
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-#!/bin/bash
-pushd /home/$USER/vic/tests/longevity-tests
-set -e
-if [ $# -ne 1 ] && [ $# -ne 2 ]; then
-    echo "Usage: $0 target-cluster optional-harbor-version"
-    exit 1
-fi
-
-if [[ $1 != "6.0" && $1 != "6.5" ]]; then
-    echo "Please specify a target cluster. One of: 6.0, 6.5"
-    exit 1
-fi
-
-if [[ ! $(grep dns /etc/docker/daemon.json) ]]; then
-    echo "NOTE: /etc/docker/daemon.json should contain
-{
- \"dns\": [\"10.118.81.1\", \"10.16.188.210\"]
-}
-
- in order for this script to function behind VMW's firewall.
-
- If the file does not exist, create it & restart the docker daemon before
- attempting to run this script
-"
-    exit 1
-fi
-
-target="$1"
-
-# set an output directory
-odir="/home/$USER/vic-longevity-test-output-$(date -Iminute | sed 's/:/_/g')"
-
-
-# set up harbor if necessary
-if [[ $(docker ps | grep harbor) == "" ]]; then
-    if [[ $2 != "" ]]; then
-        hversion=$2
-    else
-        hversion="1.2.0"
-        echo "No Harbor version specified. Using default $hversion"
-    fi
-    ./get-and-start-harbor.bash $hversion
-fi
-
-echo "Building container images...."
-docker build -q -t longevity-base -f Dockerfile.foundation .
-docker build -q -t tests-"$target" -f Dockerfile."${target}" .
-
-# remove old binaries
-pushd /home/$USER/vic
-rm -rf bin && mkdir bin
-
-pushd bin
-input=$(gsutil ls -l gs://vic-engine-builds/vic_* | grep -v TOTAL | sort -k2 -r | head -n1 | xargs | cut -d ' ' -f 3 | cut -d '/' -f 4)
-echo "Downloading VIC build $input..."
-wget https://storage.googleapis.com/vic-engine-builds/$input -qO - | tar xz
-mv vic/* .
-rmdir vic
-popd
-
-
-echo "Creating container..."
-testsContainer=$(docker create -it\
-                        -w /go/src/github.com/vmware/vic/ \
-                        -v "$odir":/tmp/ -e GOVC_URL="$ip" \
-                        tests-"$target" \
-                        bash -c \
-                        ". secrets && pybot -d /tmp/ /go/src/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.robot;\
-                 mv *-container-logs.zip /tmp/ 2>/dev/null; \
-                 mv VCH-*-vmware.log /tmp/ 2>/dev/null; \
-                 mv vic-machine.log /tmp/ 2>/dev/null; \
-                 mv index.html* /tmp/ 2>/dev/null; \
-                 mv VCH-* /tmp/ 2>/dev/null")
-
-echo "Copying code and binaries into container...."
-docker cp /home/$USER/vic $testsContainer:/go/src/github.com/vmware/
-
-echo "Running tests.."
-echo "Run docker attach $testsContainer to interact with the container or use docker logs -f to simply view test output as the tests run"
-docker start $testsContainer
-
-echo "Output can be found in $odir"
-popd
diff --git a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/secrets b/installer/vendor/github.com/vmware/vic/tests/longevity-tests/secrets
deleted file mode 100644
index 19817cf7b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/longevity-tests/secrets
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-#!/bin/bash
-export  DRONE_TOKEN=
-export GITHUB_AUTOMATION_API_KEY=
-export SLACK_URL=
-export TEST_PASSWORD=
-export GOVC_PASSWORD=
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.md
deleted file mode 100644
index a2f3652b05..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 11-1 - VIC Install Stress
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the install component of the system
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. In a loop, install and delete a VCH appliance as rapidly as possible 100 times
-2. After the last install, run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error each time and each of the docker commands executed against the last install should return without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.robot
deleted file mode 100644
index c9106babb6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-1-VIC-Install-Stress.robot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-1-VIC-Install-Stress
-Resource  ../../resources/Util.robot
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-VIC Install Stress
-    :FOR  ${idx}  IN RANGE  0  100
-    \   Log To Console  \nLoop ${idx+1}
-    \   Install VIC Appliance To Test Server  vol=default %{STATIC_VCH_OPTIONS}
-    \   Cleanup VIC Appliance On Test Server
-    
-    Install VIC Appliance To Test Server  vol=default %{STATIC_VCH_OPTIONS}
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.md
deleted file mode 100644
index 662db62c87..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 11-2 - Container Boot Storm
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the container start component of the system
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Create 100 container on the new VCH appliance
-3. In parallel, attempt to start all 100 containers at once
-4. After the boot storm, run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each of the containers should start without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.robot
deleted file mode 100644
index 9870dc44b1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-2-Container-Boot-Storm.robot
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-2-Container-Boot-Storm
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Container Boot Storm
-    ${containers}=  Create List
-    ${pids}=  Create List
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-
-    Log To Console  \nCreate 100 containers
-    :FOR  ${idx}  IN RANGE  0  100
-    \   ${id}=  Run  docker %{VCH-PARAMS} create busybox /bin/top
-    \   Append To List  ${containers}  ${id}
-    
-    Log To Console  \nRapidly start each container
-    :FOR  ${id}  IN  @{containers}
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} start ${id}  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.md
deleted file mode 100644
index 9cdf35fc61..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 11-3 - Many Containers
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of containers
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. In a loop, create 1000 containers using docker run busybox date
-3. After the last iteration, run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each of the containers should start without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.robot
deleted file mode 100644
index fe7c58cf50..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-3-Many-Containers.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-3-Many-Containers
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Docker run 1000 containers rapidly
-    ${pids}=  Create List
-
-    Log To Console  \nRun 1000 containers rapidly
-    :FOR  ${idx}  IN RANGE  0  1000
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} run busybox date  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.md
deleted file mode 100644
index 68eb22035f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 11-4 - Many Volumes
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of volumes
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. In a loop, create 1000 small volumes
-3. After the last iteration, run a variety of docker commands on the VCH appliance including creating a container that uses one of the volumes created in the loop
-
-# Expected Outcome:
-Each of the volume create commands should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.robot
deleted file mode 100644
index b89dde8f16..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-4-Many-Volumes.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-4-Many-Volumes
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Docker volume create 1000 volumes rapidly
-    ${pids}=  Create List
-
-    Log To Console  \nCreate 1000 volumes rapidly
-    :FOR  ${idx}  IN RANGE  0  1000
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} volume create --name\=multiple${idx} --opt Capacity\=32MB  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.md
deleted file mode 100644
index 40072e96ff..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 11-5 - Many Networks
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of networks
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. In a loop, create 1000 networks
-3. After the last iteration, run a variety of docker commands on the VCH appliance including creating a container that uses one of the networks created in the loop
-
-# Expected Outcome:
-Each of the volume create commands should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.robot
deleted file mode 100644
index cc65e57e1a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-5-Many-Networks.robot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-5-Many-Networks
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Many Networks
-    Log To Console  Create 1000 networks
-    :FOR  ${idx}  IN RANGE  0  1000
-    \   Log To Console  \nCreate network ${idx}
-    \   ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} network create net${idx}
-    \   Should Be Equal As Integers  ${rc}  0
-
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    ${container}=  Run  docker %{VCH-PARAMS} create --net=net999 busybox ping -C2 google.com
-    ${out}=  Run  docker %{VCH-PARAMS} start ${container}
-    Should Contain  ${out}  2 packets transmitted, 2 received
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.md
deleted file mode 100644
index 52c92c751e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 11-6 - Stop Storm
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of stop commands at once
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Create 100 containers that keep running
-3. In parallel, attempt to stop each of the containers as quickly as possible
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each of the volume stop commands should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.robot
deleted file mode 100644
index 39ef1c3bde..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-6-Stop-Storm.robot
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-6-Stop-Storm
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Stop Storm
-    ${containers}=  Create List
-    ${pids}=  Create List
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-
-    Log To Console  \nCreate 100 containers
-    :FOR  ${idx}  IN RANGE  0  100
-    \   Log To Console  \nCreating container ${idx}
-    \   ${id}=  Run  docker %{VCH-PARAMS} run busybox /bin/top
-    \   Append To List  ${containers}  ${id}
-
-    Log To Console  \nRapidly stop each container
-    :FOR  ${id}  IN  @{containers}
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} stop ${id}  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.md
deleted file mode 100644
index 6c20c6db05..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 11-7 - Remove Storm
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of rm commands at once
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Create 100 containers
-3. In parallel, attempt to rm each of the containers as quickly as possible
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each of the volume rm commands should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.robot
deleted file mode 100644
index e8c9076449..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-7-Remove-Storm.robot
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-7-Remove-Storm
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Remove Storm
-    ${containers}=  Create List
-    ${pids}=  Create List
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-
-    Log To Console  \nCreate 100 containers
-    :FOR  ${idx}  IN RANGE  0  100
-    \   Log To Console  \nCreating container ${idx}
-    \   ${id}=  Run  docker %{VCH-PARAMS} create busybox /bin/top
-    \   Append To List  ${containers}  ${id}
-
-    Log To Console  \nRapidly rm each container
-    :FOR  ${id}  IN  @{containers}
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} rm ${id}  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.md
deleted file mode 100644
index 3a882749cc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 11-8 - Image Pull Stress
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of image pull commands at once
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Pull 100 images all at once, with at least 10 of the images pulled being the same image
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each of the image pull commands should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.robot
deleted file mode 100644
index 4a0dadc9b6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-8-Image-Pull-Stress.robot
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-8-Image-Pull-Stress
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Image Pull Stress
-    ${pids}=  Create List
-
-    Log To Console  \nRapidly pull images
-    :FOR  ${idx}  IN RANGE  0  50
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} pull busybox  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nRapidly pull images
-    :FOR  ${idx}  IN RANGE  0  25
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} pull alpine  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nRapidly pull images
-    :FOR  ${idx}  IN RANGE  0  25
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} pull ubuntu  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.md
deleted file mode 100644
index 389de882e9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 11-9 - Container Disk Stress
-=======
-
-# Purpose:
-To verify the VIC appliance works when stressing the appliance with a lot of disk operations
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Create a container with a 10GB volume attached
-3. Within the container, execute bonnie++ disk stress test
-4. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The bonnie++ command should return without error and at the end, the variety of docker commands run should work without error
-
-# Possible Problems:
-If you exhaust the resources of the vSphere server, it is not necessarily a failure as long as the VCH appliance continues to function and behave as expected
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.robot
deleted file mode 100644
index d228fdbbc9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/11-9-Container-Disk-Stress.robot
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-9-Container-Disk-Stress
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Container Disk Stress
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ubuntu bash -c "apt-get update; apt-get install bonnie++; bonnie++ -u root;"
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Delete files in random order...done.
-    
-    Run Regression Tests
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/TestCases.md
deleted file mode 100644
index 5c330e45dc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group11-Stress/TestCases.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Group 11 - Stress
-=======
-
-
-[Test 11-1 - VIC Install Stress](11-1-VIC-Install-Stress.md)
--
-[Test 11-2 - Container Boot Storm](11-2-Container-Boot-Storm.md)
--
-[Test 11-3 - Many Containers](11-3-Many-Containers.md)
--
-[Test 11-4 - Many Volumes](11-4-Many-Volumes.md)
--
-[Test 11-5 - Many Networks](11-5-Many-Networks.md)
--
-[Test 11-6 - Stop Storm](11-6-Stop-Storm.md)
--
-[Test 11-7 - Remove Storm](11-7-Remove-Storm.md)
--
-[Test 11-8 - Image Pull Stress](11-8-Image-Pull-Stress.md)
--
-[Test 11-9 - Container Disk Stress](11-9-Container-Disk-Stress.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-1-VIC-Machine-Maintenance-Mode.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-1-VIC-Machine-Maintenance-Mode.md
deleted file mode 100644
index b1b36178a1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-1-VIC-Machine-Maintenance-Mode.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 12-1 VIC Machine Maintenance Mode
-=======
-
-# Purpose:
-To verify the VIC appliance provides a reasonable error message when installing or deleting it from a host in maintenance mode
-
-# References:
-[1- VMware Maintenance Mode](https://pubs.vmware.com/vsphere-4-esx-vcenter/index.jsp?topic=/com.vmware.vsphere.resourcemanagement.doc_41/using_drs_clusters_to_manage_resources/c_using_maintenance_mode.html)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Put the vSphere server into maintenance mode
-2. Issue a vic-machine create command to attempt to install VIC into the server while it is in maintenance mode
-3. Instruct the vSphere server to exit maintenance mode
-4. Issue a vic-machine create command to install VIC into the server
-5. Instruct the vSphere server to enter maintenance mode
-6. Issue a vic-machine delete command to attempt to delete VIC from the server while it is in maintenance mode
-
-# Expected Outcome:
-* For Step 2, the VCH appliance should deploy with an error that indicates the reason why it cannot install into a server in maintenance mode
-* For Step 6, the vic-machine delete command should return with an error indicating the reason why it cannot delete the VCH while the server is in maintenance mode
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-2-Docker-Commands-Maintenance-Mode.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-2-Docker-Commands-Maintenance-Mode.md
deleted file mode 100644
index 707751c82f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/12-2-Docker-Commands-Maintenance-Mode.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 12-2 Docker Commands Maintenance Mode
-=======
-
-#Purpose:
-To verify the VIC appliance provides reasonable behavior when the host it is running on has been placed in maintenance mode
-
-#References:
-[1- VMware Maintenance Mode](https://pubs.vmware.com/vsphere-4-esx-vcenter/index.jsp?topic=/com.vmware.vsphere.resourcemanagement.doc_41/using_drs_clusters_to_manage_resources/c_using_maintenance_mode.html)
-
-#Environment:
-This test requires that a vSphere server is running and available
-
-#Test Steps:
-1. Install a new VIC appliance on the vSphere server
-2. After the install, place the host into maintenance mode
-3. Issue a variety of docker commands to the VIC appliance while the host is in maintenance mode
-
-#Expected Outcome:
-The VCH appliance should deploy without error and the docker commands should return an error that is reasonable and indicates that it cannot complete due to the host being in maintenance mode
-
-#Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/TestCases.md
deleted file mode 100644
index 53e5a4c1f2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group12-Maintenance-Mode/TestCases.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Group 12 - Maintenance Mode
-=======
-
-
-[Test 12-1 - VIC Machine Maintenance Mode](12-1-VIC-Machine-Maintenance-Mode.md)
--
-[Test 12-2 - Docker Commands Maintenance Mode](12-2-Docker-Commands-Maintenance-Mode.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.md
deleted file mode 100644
index bc9970e78c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Test 13-1 vMotion VCH Appliance
-=======
-
-# Purpose:
-To verify the VCH appliance continues to function properly after being vMotioned to a new host
-
-# References:
-[1- vMotion A Powered On Virtual Machine](http://pubs.vmware.com/vsphere-4-esx-vcenter/index.jsp?topic=/com.vmware.vsphere.dcadmin.doc_41/vsp_dc_admin_guide/migrating_virtual_machines/t_migrate_a_powered-on_virtual_machine_with_vmotion.html)
-
-# Environment:
-This test requires that a vCenter server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance onto one of the hosts within the vCenter server
-2. Power down the VCH appliance
-3. vMotion the VCH appliance to a new host
-4. Power on the VCH appliance and run a variety of docker commands
-5. Delete the VCH appliance
-6. Install a new VCH appliance onto one of the hosts within the vCenter server
-7. While the VCH appliance is powered on, vMotion the VCH appliance to a new host
-8. Run a variety of docker commands on the VCH appliance after it has moved
-9. Delete the VCH appliance
-10. Install a new VCH appliance onto on the hosts within the vCenter server
-11. Create several containers on the new VCH appliance that are in the following states: created but not started, started and running, started and stopped, stopped after running and being attached to, running after being attached to but currently not attached to, running and currently attached to
-12. vMotion the VCH appliance to a new host
-13. Complete the life cycle of the containers created in Step 11, including getting docker logs and re-attaching to containers that are running
-
-# Expected Outcome:
-In each scenario, the VCH appliance should continue to work as expected after being vMotioned and all docker commands should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.robot
deleted file mode 100644
index 5b15c4115b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-1-vMotion-VCH-Appliance.robot
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 13-1 - vMotion VCH Appliance
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Create a VSAN Cluster  vic-vmotion-13-1
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-Test Teardown  Gather Logs From Test Server 
-
-*** Test Cases ***
-#Step 1-5
-#    ${status}=  Get State Of Github Issue  701
-#    Run Keyword If  '${status}' == 'closed'  Fail  Test 13-1-vMotion-VCH-Appliance.robot needs to be updated now that Issue #701 has been resolved
-#    Log  Issue \#701 is blocking implementation  WARN
-#    Install VIC Appliance To Test Server
-#    Run Regression Tests
-#    ${host}=  Get VM Host Name  %{VCH-NAME}/%{VCH-NAME}
-#    Power Off VM OOB  %{VCH-NAME}
-#    ${status}=  Run Keyword And Return Status  Should Contain  ${host}  ${esx1-ip}
-#    Run Keyword If  ${status}  Run  govc vm.migrate -host cls/${esx2-ip} -pool cls/Resources %{VCH-NAME}/%{VCH-NAME}
-#    Run Keyword Unless  ${status}  Run  govc vm.migrate -host cls/${esx1-ip} -pool cls/Resources %{VCH-NAME}/%{VCH-NAME}
-#    Set Environment Variable  VCH-NAME  "%{VCH-NAME} (1)"
-#    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.power -on %{VCH-NAME}
-#    Should Be Equal As Integers  ${rc}  0
-
-#    Log To Console  Waiting for VM to power on ...
-#    :FOR  ${idx}  IN RANGE  0  30
-#    \   ${ret}=  Run  govc vm.info %{VCH-NAME}
-#    \   ${status}=  Run Keyword And Return Status  Should Contain  ${ret}  poweredOn
-#    \   Exit For Loop If  ${status}
-#    \   Sleep  1
-
-#    Log To Console  Getting VCH IP ...
-#    ${new-vch-ip}=  Get VM IP  %{VCH-NAME}
-#    Log To Console  New VCH IP is ${new-vch-ip}
-#    Replace String  %{VCH-PARAMS}  %{VCH-IP}  ${new-vch-ip}
-
-#    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-#    Run Regression Tests
-    #TODO
-    #This does not work currently, as the VM has been migrated out of the vApp
-
-Step 6-9
-    Set Test Variable  ${user}  %{NIMBUS_USER}
-    Set Suite Variable  @{list}  ${user}-vic-vmotion-13-1.vcva-${VC_VERSION}  ${user}-vic-vmotion-13-1.esx.0  ${user}-vic-vmotion-13-1.esx.1  ${user}-vic-vmotion-13-1.esx.2  ${user}-vic-vmotion-13-1.esx.3  ${user}-vic-vmotion-13-1.nfs.0  ${user}-vic-vmotion-13-1.iscsi.0
-    Install VIC Appliance To Test Server
-    Run Regression Tests
-    ${host}=  Get VM Host Name  %{VCH-NAME}/%{VCH-NAME}
-    ${status}=  Run Keyword And Return Status  Should Contain  ${host}  ${esx1-ip}
-    Run Keyword If  ${status}  Run  govc vm.migrate -host cls/${esx2-ip} %{VCH-NAME}/%{VCH-NAME}
-    Run Keyword Unless  ${status}  Run  govc vm.migrate -host cls/${esx1-ip} %{VCH-NAME}/%{VCH-NAME}
-    Run Regression Tests
-
-Step 10-13
-    Install VIC Appliance To Test Server
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container2}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${container3}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container3}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${host}=  Get VM Host Name  %{VCH-NAME}/%{VCH-NAME}
-    ${status}=  Run Keyword And Return Status  Should Contain  ${host}  ${esx1-ip}
-    Run Keyword If  ${status}  Run  govc vm.migrate -host cls/${esx2-ip} %{VCH-NAME}/%{VCH-NAME}
-    Run Keyword Unless  ${status}  Run  govc vm.migrate -host cls/${esx1-ip} %{VCH-NAME}/%{VCH-NAME}
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container1}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container2}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container2}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${container3}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container3}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.md
deleted file mode 100644
index 93548b9332..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 13-2 vMotion Container
-=======
-
-# Purpose:
-To verify the VCH appliance continues to function properly after some or all of it's related containers are vMotioned
-
-# References:
-[1- vMotion A Powered On Virtual Machine](http://pubs.vmware.com/vsphere-4-esx-vcenter/index.jsp?topic=/com.vmware.vsphere.dcadmin.doc_41/vsp_dc_admin_guide/migrating_virtual_machines/t_migrate_a_powered-on_virtual_machine_with_vmotion.html)
-
-# Environment:
-This test requires that a vCenter server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance onto one of the hosts within the vCenter server
-2. Create several containers on the new VCH appliance that are in the following states: created but not started, started and running, started and stopped, stopped after running and being attached to, running after being attached to but currently not attached to, running and currently attached to
-3. vMotion each of the containers to a new host within the vCenter server
-4. Complete the life cycle of the containers created in Step 2, including getting docker logs and re-attaching to containers that are running
-
-# Expected Outcome:
-In each scenario, the VCH appliance should continue to work as expected after being vMotioned and all docker commands should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.robot
deleted file mode 100644
index 7122f3a711..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/13-2-vMotion-Container.robot
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 13-2 - vMotion Container
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Create a VSAN Cluster  vic-vmotion-13-2
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-Test Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Test
-    Set Test Variable  ${user}  %{NIMBUS_USER}
-    Set Suite Variable  @{list}  ${user}-vic-vmotion-13-2.vcva-${VC_VERSION}  ${user}-vic-vmotion-13-2.esx.0  ${user}-vic-vmotion-13-2.esx.1  ${user}-vic-vmotion-13-2.esx.2  ${user}-vic-vmotion-13-2.esx.3  ${user}-vic-vmotion-13-2.nfs.0  ${user}-vic-vmotion-13-2.iscsi.0
-    Install VIC Appliance To Test Server
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container2}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${container3}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container3}
-    Should Be Equal As Integers  ${rc}  0
-    
-    ${vmName1}=  Get VM display name  ${container1}
-    ${vmName2}=  Get VM display name  ${container2}
-    ${vmName3}=  Get VM display name  ${container3}
-    
-    vMotion A VM  %{VCH-NAME}/${vmName1}
-    vMotion A VM  %{VCH-NAME}/${vmName2}
-    vMotion A VM  %{VCH-NAME}/${vmName3}
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container1}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container2}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container2}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${container3}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container3}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/TestCases.md
deleted file mode 100644
index 8358e4285c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group13-vMotion/TestCases.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Group 13 - vMotion
-=======
-
-
-[Test 13-1 - vMotion VCH Appliance](13-1-vMotion-VCH-Appliance.md)
--
-[Test 13-2 - vMotion Container](13-2-vMotion-Container.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.md
deleted file mode 100644
index 750c45652c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 14-1 - Longevity
-=======
-
-# Purpose:
-To verify that VIC appliance can run for prolonged periods of time without leaking or causing system instability
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running, isolated, and available for long periods of time
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Execute a random loop of 10-50 iterations of the regression suite
-3. Issue vic-machine delete to cleanup the VCH
-4. Repeat Steps 1-3 48 times alternating between using TLS certificates and not on each install.
-
-# Expected Outcome:
-* VIC appliance should install correctly and cleanup after itself each time
-* Each iteration of the regression suite should pass without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.robot
deleted file mode 100644
index ff78108948..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-1-Longevity.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 14-1 - Longevity
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Longevity cleanup
-
-*** Keywords ***
-Longevity cleanup
-    Run Keyword And Continue On Failure  Post Message To Slack Channel  mwilliamson-staff  Longevity has failed on %{GOVC_URL}
-    Run Keyword And Continue On Failure  Run  govc logs.download
-
-*** Test Cases ***
-Longevity
-    # Each loop should take between 1 and 2 hours
-    :FOR  ${idx}  IN RANGE  0  48
-    \   ${rand}=  Evaluate  random.randint(10, 50)  modules=random
-    \   Log To Console  \nLoop: ${idx}
-    \   Install VIC Appliance To Test Server  debug=0  additional-args=%{STATIC_VCH_OPTIONS}
-    \   Repeat Keyword  ${rand} times  Run Regression Tests
-    \   Cleanup VIC Appliance On Test Server
-    \   ${rand}=  Evaluate  random.randint(10, 50)  modules=random
-    \   Install VIC Appliance To Test Server  debug=0  certs=${true}  additional-args=%{STATIC_VCH_OPTIONS}
-    \   Repeat Keyword  ${rand} times  Run Regression Tests
-    \   Cleanup VIC Appliance On Test Server
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.md
deleted file mode 100644
index 8db23f0904..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Test 14-2 - Longevity - Single - VCH
-=======
-
-# Purpose:
-To verify that a single VIC appliance can run for prolonged periods of time without leaking or causing system instability
-
-# References:
-None
-
-# Environment:
-This test requires that a vSphere server is running, isolated, and available for long periods of time
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Execute a loop of the regression suite for up to 2 days
-3. Issue vic-machine delete to cleanup the VCH
-4. Install another VCH
-5. Execute a single iteration of the regression suite
-6. Issue vic-machine delete to cleanup the VCH
-
-# Expected Outcome:
-* VIC appliance should install correctly and cleanup after itself each time
-* Each iteration of the regression suite should pass without error
-* The VCH installed after the long loop should install correctly, function as expected and cleanup after itself
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.robot
deleted file mode 100644
index 29878b8f0b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/14-2-Longevity-Single-VCH.robot
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 14-2 - Longevity - Single - VCH
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Longevity cleanup
-
-*** Keywords ***
-Longevity cleanup
-    Run Keyword And Continue On Failure  Post Message To Slack Channel  mwilliamson-staff  Longevity has failed on %{GOVC_URL}
-    Run Keyword And Continue On Failure  Run  govc logs.download
-
-*** Test Cases ***
-Longevity - Single - VCH
-    # Just install with certs, as it is our most common expected install path
-    Install VIC Appliance To Test Server  debug=0  certs=${true}  additional-args=%{STATIC_VCH_OPTIONS}
-    # Each regression test takes about 1-2 minutes, so round down and call it a minute
-    # 2880 is the number of minutes in 2 days
-    :FOR  ${idx}  IN RANGE  0  2880
-    \   Log To Console  \nLoop: ${idx}
-    \   Run Regression Tests
-    
-    Cleanup VIC Appliance On Test Server
-    
-    Install VIC Appliance To Test Server  debug=0  certs=${true}  additional-args=%{STATIC_VCH_OPTIONS}
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/TestCases.md
deleted file mode 100644
index a353bd8de9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group14-Longevity/TestCases.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Group 14 - Longevity
-=======
-
-
-[Test 14-1 - Longevity](14-1-Longevity.md)
--
-[Test 14-2 - Longevity - Single - VCH](14-2-Longevity-Single-VCH.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.md
deleted file mode 100644
index eb475d98e0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 15-1 Drone Continuous Integration
-=======
-
-# Purpose:
-To verify the VCH appliance can be used as the docker engine replacement for a drone continuous integration environment
-
-# References:
-[1- Drone Server Setup](http://readme.drone.io/setup/overview/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere server
-2. Clone the latest git repo code of VIC
-3. Execute the following command in the VIC repo:
-```
-drone exec --docker-host <VCH-IP>:2375 --trusted -E secrets.yml -yaml .drone.yml
-
-```
-
-# Expected Outcome:
-VIC should build properly and execute each of the unit and integration tests properly from within the drone environment.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.robot
deleted file mode 100644
index 2a6a193465..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-1-Drone-Continuous-Integration.robot
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 15-1 - Drone Continuous Integration
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server Without TLS
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Install VIC Appliance To Test Server Without TLS
-    [Arguments]  ${vic-machine}=bin/vic-machine-linux  ${appliance-iso}=bin/appliance.iso  ${bootstrap-iso}=bin/bootstrap.iso  ${vol}=default
-    Set Test Environment Variables
-    # disable firewall
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.esxcli network firewall set -e false
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Run Keyword And Ignore Error  Cleanup Dangling Networks On Test Server
-    Run Keyword And Ignore Error  Cleanup Dangling vSwitches On Test Server
-
-    # Install the VCH now
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  No TLS VIC Install  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${vol}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${false}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-
-No TLS VIC Install
-    [Tags]  secret
-    [Arguments]  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${vol}
-    ${output}=  Run  ${vic-machine} create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=${appliance-iso} --bootstrap-iso=${bootstrap-iso} --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:${vol} --no-tls
-    Should Contain  ${output}  Installer completed successfully
-    [Return]  ${output}
-
-*** Test Cases ***
-Drone CI
-    ${output}=  Run  git clone https://github.com/vmware/vic.git drone-ci
-    Log  ${output}
-    ${result}=  Run Process  drone exec --docker-host %{VCH-IP}:2375 --trusted -e .drone.sec -yaml .drone.yml  shell=True  cwd=drone-ci
-    Log  ${result.stderr}
-    Log  ${result.stdout}
-    Log  ${result.rc}
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-2-Basic-Harbor.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-2-Basic-Harbor.robot
deleted file mode 100644
index 9250fbafba..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-2-Basic-Harbor.robot
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 15-2 - Basic Harbor
-Resource  ../../resources/Util.robot
-Test Teardown  Harbor Test Cleanup
-
-*** Keywords ***
-Harbor Test Cleanup
-    Cleanup VIC Appliance On Test Server
-    ${out}=  Run  govc vm.destroy harbor
-
-Pull image
-    [Arguments]  ${image}
-    Log To Console  \nRunning docker pull ${image}...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Digest:
-    Should Contain  ${output}  Status:
-    Should Not Contain  ${output}  No such image:
-
-*** Test Cases ***
-Basic Harbor Install
-    Install Harbor To Test Server
-    Install VIC Appliance To Test Server  vol=default --insecure-registry %{HARBOR_IP}
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  %{HARBOR_IP}/library/photon:1.0
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.md
deleted file mode 100644
index 4d8066df9d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Test 15-03 - Appliance and Network Settings
-
-# Purpose:
-To verify that the guest OS deployed using built ova has user specified appliance and network settings
-
-# Environment:
-This test requires that a vCenter and a vSphere server are running and available
-
-# Test Steps:
-1. Deploy Unified OVA to vCenter with provided network parameters
-2. For loop on a GOVC command to query guest network information until returned result is not null or maximum retry reached
-3. Issue a GOVC command to get the IP addresses for "VM Network"
-4. Issue a GOVC command to get the subnet netmask for the first IP address in "VM Network"
-5. Issue a GOVC command to get the dhcp option for guest os
-6. Issue a GOVC command to get the dns address for guest os
-7. Issue a GOVC command to get the dns searchdomains for guest os
-8. Issue a GOVC command to check disk size('disk-1000-1') for guest os
-9. Issue a GOVC command to resize disk-1000-1 and assure the resizing works
-10. Remove deployed Unified OVA, Redeploy Unified OVA to vCenter without network parameters(dhcp by default)
-11. Issue a GOVC command to make sure the first ip address under "VM Network" is an IPv4 address(including three '.' in address)
-
-# Expected Outcome:
-* Step 2 should exit for loop on a non-null network information
-* Step 3 should result in an output where 'ips' contains '${ova_network_ip0}'
-* Step 4 should result in an output where 'netmask' should be 24
-* Step 5 should result in an output where 'dhcp' should be false
-* Step 6 should result in an output where 'dns' should be '${ova_network_dns}'
-* Step 7 should result in an output where 'search_domains' should be 'ova_network_searchpath'
-* Step 8 should result in an output where 'size' should be '${ova_default_disk_size_inKB}'
-* Step 9 should successfully resize 'disk-1000-1' and result in an output where 'size' being '${ova_adjusted_disk_size_inKB}'
-
-# Possible Problems:
-* Step 2 exit for loop when maximum retry reached, meaning guest network has not been configured yet, which will fail this test
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.robot
deleted file mode 100644
index 869fb6b1a6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/15-3-OVA.robot
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 15-03 - Appliance and Network basic settings
-Resource  ../../resources/Util.robot
-Suite Setup  Setup Suite Environment
-Suite Teardown  Cleanup Suite Environment
-
-*** Variables ***
-${dhcp}  True
-${not_collect_log}  False
-${esx_number}  1
-${network}  False
-${maximum_retry}  10
-
-*** Keywords ***
-Setup Suite Environment
-    @{vms}=  Create A Simple VC Cluster  datacenter  cls  ${esx_number}  ${network}
-    ${vm_num}=  Evaluate  ${esx_number}+1
-    ${vm-names}=  Get Slice From List  ${vms}  0  ${vm_num}
-    ${vm-ips}=  Get Slice From List  ${vms}  ${vm_num}
-    Set Suite Variable  ${vc-ip}  @{vm-ips}[${esx_number}]
-    Set Suite Variable  ${vm-names}  ${vm-names}
-    Set Suite Variable  ${vm-ips}  ${vm-ips}
-    ${size}=  Evaluate  50*1024*1024
-    Set Suite Variable  ${ova_default_disk_size_inKB}  ${size}
-    ${size}=  Evaluate  80*1024*1024
-    Set Suite Variable  ${ova_adjusted_disk_size_inKB}  ${size}
-    GOVC Use VC Environment 
-
-Cleanup Suite Environment
-    Nimbus Cleanup  ${vm-names}  ${not_collect_log}
-
-Check VCH VM Disk Size 
-    [Arguments]  ${target_size}
-    ${size}=  Run  govc device.info -json -vm ${ova_target_vm_name} disk-1000-1 | jq .Devices[].CapacityInKB
-    
-    Should Be Equal As Integers  ${size}  ${target_size}
-
-Resize VCH VM Disk
-    [Arguments]  ${target_size}
-    Run  govc vm.disk.change -vm=${ova_target_vm_name} -disk.name "disk-1000-1" -size=${target_size}KB
-
-GOVC Use VC Environment
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-GOVC Use ESXi Environment
-    Set Environment Variable  GOVC_URL  @{vm-ips}[0]
-    Set Environment Variable  GOVC_USERNAME  root
-    Set Environment Variable  GOVC_PASSWORD  ${NIMBUS_ESX_PASSWORD}
-
-*** Test Cases ***
-Check VCH VM Network Settings
-    [Setup]  Deploy VIC-OVA To Test Server
-    ${ip}=  Run  govc vm.ip -n ethernet-0 -v4 ${ova_target_vm_name}
-    Should Be Equal  ${ip}  ${ova_network_ip0}
-    ${netmasks}=  Run  govc vm.info -json ${ova_target_vm_name} | jq -r '.VirtualMachines[].Guest.Net[] | select(.Network == "VM Network").IpConfig.IpAddress[].PrefixLength'
-    @{netmasks}=  Split To Lines  ${netmasks}
-    ${netmask}=  Convert To Integer  @{netmasks}[0]
-    Should Be Equal As Integers  ${netmask}  24
-    ${dhcp}=  Run  govc vm.info -json ${ova_target_vm_name} | jq -r '.VirtualMachines[].Guest.IpStack[].DnsConfig.Dhcp'
-    Should Be Equal  ${dhcp}  false
-    ${dns}=  Run  govc vm.info -json ${ova_target_vm_name} | jq -r '.VirtualMachines[].Guest.IpStack[].DnsConfig.IpAddress[]'
-    Should Be Equal  ${dns}  ${ova_network_dns}
-    ${search_domains}=  Run  govc vm.info -json ${ova_target_vm_name} | jq -r '.VirtualMachines[].Guest.IpStack[].DnsConfig.SearchDomain[]'
-    @{search_domains}=  Split String  ${search_domains}  ,
-    @{search_domains_setting}=  Split String  ${ova_network_searchpath}  ,
-    ${length}=  Get Length  ${search_domains}
-    Length Should Be  ${search_domains_setting}  ${length}
-    :For  ${index}  IN RANGE  ${length}
-    \   Should Be Equal  @{search_domains}[${index}]  @{search_domains_setting}[${index}]
-
-Check VCH VM Disk Repartition
-    Check VCH VM Disk Size  ${ova_default_disk_size_inKB}
-    Resize VCH VM Disk  ${ova_adjusted_disk_size_inKB}
-    Check VCH VM Disk Size  ${ova_adjusted_disk_size_inKB}
-    [Teardown]  Cleanup VIC-OVA On Test Server
-
-# If the first ipaddress for VM Network is an IPv4 ipaddress, then dhcp is assumed to be successful
-Check VCH VM Network DHCP Settings
-    [Setup]  Deploy VIC-OVA To Test Server  ${dhcp}
-    ${ips}=  Run  govc vm.info -json ${ova_target_vm_name} | jq -r '.VirtualMachines[].Guest.Net[] | select(.Network == "VM Network").IpConfig.IpAddress[].IpAddress' 
-    @{ips}=  Split To Lines  ${ips}
-    ${ip_dot_number}=  Run  echo @{ips}[0] | awk '{print gsub(/\\\./, "")}'
-    ${ip_dot_number}=  Convert To Integer  ${ip_dot_number}
-    Should Be Equal As Integers  ${ip_dot_number}  3
-    [Teardown]  Cleanup VIC-OVA On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/TestCases.md
deleted file mode 100644
index ca0b626508..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group15-Dogfood/TestCases.md
+++ /dev/null
@@ -1,7 +0,0 @@
-Group 15 - Dogfood
-=======
-
-[Test 15-1 - Drone Continuous Integration](15-1-Drone-Continuous-Integration.md)
-[Test 15-2 - Basic Harbor](15-2-Basic-Harbor.md)
-[Test 15-3 - OVA](15-3-OVA.md)
--
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.md
deleted file mode 100644
index 8abde922f4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 16-1 Windows VCH Install
-=======
-
-# Purpose:
-To verify the VCH appliance can be installed and used from a windows based client
-
-# References:
-* vic-machine-windows.exe -h
-
-# Environment:
-This test requires that a vSphere server is running and available and a windows client
-
-# Test Steps:
-1. From the windows client, download the latest VIC release
-2. From within the release package, run vic-machine-windows.exe to install the VCH into the vSphere server with TLS enabled
-3. Run a variety of docker commands on the new VCH
-4. Delete the VCH
-5. Install a new VCH server with TLS disabled
-6. Run a variety of docker commands on the new VCH
-7. Delete the VCH
-
-# Expected Outcome:
-Each VCH should install properly and all docker commands executed should complete without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.robot
deleted file mode 100644
index f45a6ac249..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/16-1-Windows-VIC-Machine.robot
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 16-1 - Windows VIC Machine
-Resource  ../../resources/Util.robot
-Test Setup  Set Test Environment Variables
-
-*** Variables ***
-${ver}  8351
-
-*** Keywords ***
-Cleanup Folders
-    ${output}=  Execute Command  rm -Recurse -Force vic*
-    ${output}=  Execute Command  rm *.pem
-
-*** Test Cases ***
-Install VCH With TLS
-    Open Connection  %{WINDOWS_URL}  prompt=>
-    Login  %{WINDOWS_USERNAME}  %{WINDOWS_PASSWORD}
-    Cleanup Folders
-    ${output}=  Execute Command  wget https://storage.googleapis.com/vic-engine-builds/vic_${ver}.tar.gz -OutFile vic.tar.gz
-    ${output}=  Execute Command  7z x vic.tar.gz
-    ${output}=  Execute Command  7z x vic.tar
-    ${output}=  Execute Command  ./vic/vic-machine-windows.exe create --target %{TEST_URL} --user %{TEST_USERNAME} --password %{TEST_PASSWORD}
-    Get Docker Params  ${output}  ${true}
-    Run Regression Tests
-    ${output}=  Execute Command  ./vic/vic-machine-windows.exe delete --target %{TEST_URL} --user %{TEST_USERNAME} --password %{TEST_PASSWORD}    
-    Cleanup Folders
-    
-Install VCH Without TLS
-    Open Connection  %{WINDOWS_URL}  prompt=>
-    Login  %{WINDOWS_USERNAME}  %{WINDOWS_PASSWORD}
-    Cleanup Folders
-    ${output}=  Execute Command  wget https://storage.googleapis.com/vic-engine-builds/vic_${ver}.tar.gz -OutFile vic.tar.gz
-    ${output}=  Execute Command  7z x vic.tar.gz
-    ${output}=  Execute Command  7z x vic.tar
-    ${output}=  Execute Command  ./vic/vic-machine-windows.exe create --target %{TEST_URL} --user %{TEST_USERNAME} --password %{TEST_PASSWORD} --no-tls
-    Get Docker Params  ${output}  ${false}
-    Run Regression Tests
-    ${output}=  Execute Command  ./vic/vic-machine-windows.exe delete --target %{TEST_URL} --user %{TEST_USERNAME} --password %{TEST_PASSWORD}    
-    Cleanup Folders
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/TestCases.md
deleted file mode 100644
index 8e1ed14fa0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group16-WindowsClient/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 16 - Windows Client
-=======
-
-
-[Test 16-1 - Windows VIC Machine](16-1-Windows-VIC-Machine.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.md
deleted file mode 100644
index 64ebd17823..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 17-1 - TTY Tests
-=======
-
-# Purpose:
-To verify that docker commands using TTY work with VIC
-
-# References:
-
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases
-1. Deploy VIC appliance to vSphere server
-2. Issue docker run -it busybox date to the new VCH
-3. Issue docker run -it busybox df to the new VCH
-4. Issue docker run -it busybox top to the new VCH
-5. Issue docker create -it busybox /bin/top to VIC appliance
-6. Issue docker start -ai <containerID> from previous step
-7. Issue commands to make container stuck in starting status, and then test docker stop can stop the container
-8. Issue commands to test the second start works after docker run with -it
-
-### Expected Outcome:
-* Steps 1-8 should all succeed and return the expected output from those commands
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.robot
deleted file mode 100644
index 201fdaab46..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/17-1-TTY-Tests.robot
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 17-1 - TTY Tests
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Make sure container starts
-    :FOR  ${idx}  IN RANGE  0  30
-    \   ${out}=  Run  docker %{VCH-PARAMS} ps
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  /bin/top
-    \   Exit For Loop If  ${status}
-    \   Sleep  1
-
-Make Fifo
-    ${rc}  ${tmpdir}=  Run And Return Rc And Output  mktemp -d
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  mkfifo ${tmpdir}/fifo
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${tmpdir}/fifo
-
-*** Test Cases ***
-Docker run -it date
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it busybox date
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  UTC
-
-Docker run -it df
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it busybox df
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  Filesystem
-
-Docker run -it command that doesn't stop
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm -f
-    ${result}=  Start Process  docker %{VCH-PARAMS} run -itd busybox /bin/top  shell=True  alias=top
-
-    Make sure container starts
-    ${containerID}=  Run  docker %{VCH-PARAMS} ps -q
-    ${out}=  Run  docker %{VCH-PARAMS} logs ${containerID}
-    Should Contain  ${out}  Mem:
-    Should Contain  ${out}  CPU:
-    Should Contain  ${out}  Load average:
-
-Docker run with -i
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -i busybox /bin/ash -c "dmesg;echo END_OF_THE_TEST"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-Docker run with -it
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it busybox /bin/ash -c "dmesg;echo END_OF_THE_TEST"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-Hello world with -i
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -i hello-world
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  https://docs.docker.com/engine/userguide/
-
-Hello world with -it
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it hello-world
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  https://docs.docker.com/engine/userguide/
-
-Start with attach and interactive
-    ${fifo}=  Make Fifo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    Start Process  docker %{VCH-PARAMS} start -ai ${output} < ${fifo}  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > ${fifo}
-    ${ret}=  Wait For Process  custom
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Not Contain  ${ret.stdout}  Error:
-    Should Not Contain  ${ret.stderr}  Error:
-
-Start a container after docker run
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Generate Random String  15
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it --name ${name} busybox /bin/date
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${name}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-Attach with custom detach keys
-    ${status}=  Get State Of Github Issue  5723
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 17-1-TTY-Tests.robot needs to be updated now that Issue #5723 has been resolved
-    Log  Issue \#5723 is blocking implementation  WARN
-    # ${fifo}=  Make Fifo
-    # ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    # ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox /bin/top
-    # Should Be Equal As Integers  ${rc}  0
-    # ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    # Should Be Equal As Integers  ${rc}  0
-    # Start Process  docker %{VCH-PARAMS} attach --detach-keys\=a ${containerID} < ${fifo}  shell=True  alias=custom
-    # Sleep  3
-    # Run  echo a > ${fifo}
-    # ${ret}=  Wait For Process  custom
-    # Should Be Equal As Integers  ${ret.rc}  0
-    # Should Be Empty  ${ret.stdout}
-    # Should Be Empty  ${ret.stderr}
-
-Reattach to container
-    ${status}=  Get State Of Github Issue  5723
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 17-1-TTY-Tests.robot needs to be updated now that Issue #5723 has been resolved
-    Log  Issue \#5723 is blocking implementation  WARN
-    # ${fifo}=  Make Fifo
-    # ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    # ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox /bin/top
-    # Should Be Equal As Integers  ${rc}  0
-    # ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    # Should Be Equal As Integers  ${rc}  0
-    # Start Process  docker %{VCH-PARAMS} attach --detach-keys\=a ${containerID} < ${fifo}  shell=True  alias=custom
-    # Sleep  3
-    # Run  echo a > ${fifo}
-    # ${ret}=  Wait For Process  custom
-    # Should Be Equal As Integers  ${ret.rc}  0
-    # Should Be Empty  ${ret.stdout}
-    # Should Be Empty  ${ret.stderr}
-    # Start Process  docker %{VCH-PARAMS} attach --detach-keys\=a ${containerID} < ${fifo}  shell=True  alias=custom2
-    # Sleep  3
-    # Run  echo a > ${fifo}
-    # ${ret}=  Wait For Process  custom2
-    # Should Be Equal As Integers  ${ret.rc}  0
-    # Should Be Empty  ${ret.stdout}
-    # Should Be Empty  ${ret.stderr}
-
-Exec Echo -it
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -it ${id} /bin/echo "I find your lack of faith disturbing."
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Be Equal As Strings  ${output}  I find your lack of faith disturbing.
-
-Exec Sort -it
-    ${fifo}=  Make Fifo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \     Start Process  docker %{VCH-PARAMS} exec -it ${output} /bin/sort < ${fifo}  shell=True  alias=custom
-    \     Run  echo one > ${fifo}
-    \     ${ret}=  Wait For Process  custom
-    \     Log  ${ret.stderr}
-    \     Should Be Equal  ${ret.stderr}  the input device is not a TTY
-    \     Should Be Equal As Integers  ${ret.rc}  1
-    \     Should Be Empty  ${ret.stdout}
-    Run  rm -rf $(dirname ${fifo})
-
-Exec Sort -i
-    ${fifo}=  Make Fifo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \     Start Process  docker %{VCH-PARAMS} exec -i ${output} /bin/sort < ${fifo}  shell=True  alias=custom
-    \     Run  echo one > ${fifo}
-    \     ${ret}=  Wait For Process  custom
-    \     Log  ${ret.stderr}
-    \     Should Be Equal  ${ret.stdout}  one
-    \     Should Be Equal As Integers  ${ret.rc}  0
-    \     Should Be Empty  ${ret.stderr}
-    Run  rm -rf $(dirname ${fifo})
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/TestCases.md
deleted file mode 100644
index a692aab62b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group17-ManualTTY/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 17 - Manual TTY Tests
-=======
-
-
-[Test 17-1 - TTY Tests](17-1-TTY-Tests.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.md
deleted file mode 100644
index fa313f60ae..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Test 18-1 - VIC UI Installation
-======
-
-# Purpose:
-To test all possible installation failures and success scenarios on VCSA
-
-# References:
-
-# Environment:
-* Testing VIC UI requires a working VCSA setup with VCH installed
-* Target VCSA has Bash enabled for the root account
-
-# Test Steps:
-1. Check if the configs file exists
-2. Ensure UI plugin is not registered with VC before testing
-3. Try installing UI without the configs file
-4. Try installing UI with vsphere-client-serenity folder missing
-5. Try installing UI with vCenter IP missing
-6. Try installing UI with invalid vCenter IP
-7. Try installing UI with wrong vCenter credentials
-8. [SKIP] Try installing UI with wrong vCenter root password
-9. Try installing UI with Bash disabled
-10. Install UI successfully without a web server
-11. Try installing UI when it is already installed
-12. Install UI successfully with the --force flag when the plugin is already registered
-13. Try installing UI with a web server and an invalid URL to the plugin zip file
-
-# Expected Outcome:
-* Each step should return success
-
-# Possible Problems:
-Attempting to `ssh` into VCSA with a wrong root password three times locks the account for a certain amount of time. For this reason Step 8 is skipped.
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.robot
deleted file mode 100644
index 8a6136c394..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-1-VIC-UI-Installer.robot
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 18-1 - VIC UI Installation
-Resource  ../../resources/Util.robot
-Resource  ./vicui-common.robot
-Test Teardown  Cleanup Installer Environment
-Suite Setup  Check Config And Install VCH  remove
-Suite Teardown  Uninstall VCH  ${TRUE}
-
-*** Test Cases ***
-Attempt To Install With Configs File Missing
-    # Rename the configs file and run the installer script to see if it fails in an expected way
-    Move File  ${UI_INSTALLER_PATH}/configs  ${UI_INSTALLER_PATH}/configs_renamed
-    ${rc}  ${output}=  Run And Return Rc And Output  ${INSTALLER_SCRIPT_PATH}
-    Run Keyword And Continue On Failure  Should Contain  ${output}  Configs file is missing
-    Move File  ${UI_INSTALLER_PATH}/configs_renamed  ${UI_INSTALLER_PATH}/configs
-
-Attempt To Install With Manifest Missing
-    Move File  ${UI_INSTALLER_PATH}/../plugin-manifest  ${UI_INSTALLER_PATH}/../plugin-manifest-a
-    ${rc}  ${output}=  Run And Return Rc And Output  cd ${UI_INSTALLER_PATH} && ${INSTALLER_SCRIPT_PATH}
-    Run Keyword And Continue On Failure  Should Contain  ${output}  manifest was not found
-    Move File  ${UI_INSTALLER_PATH}/../plugin-manifest-a  ${UI_INSTALLER_PATH}/../plugin-manifest
-
-Attempt To Install To A Non vCenter Server
-    Install Fails  not-a-vcenter-server  admin  password  ${TRUE}
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  vCenter Server was not found
-    Run Keyword Unless  ${passed}  Move File  install.log  install-fail-attempt-to-a-non-vcenter-server.log
-    Should Be True  ${passed}
-
-Attempt To Install With Wrong Vcenter Credentials
-    Set Fileserver And Thumbprint In Configs
-    Append To File  ${UI_INSTALLER_PATH}/configs  BYPASS_PLUGIN_VERIFICATION=1\n
-    Install Fails  ${TEST_VC_IP}  ${TEST_VC_USERNAME}_nope  ${TEST_VC_PASSWORD}_nope  ${FALSE}  %{VC_FINGERPRINT}
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  Cannot complete login due to an incorrect user name or password
-    Run Keyword Unless  ${passed}  Move File  install.log  install-fail-attempt-to-install-with-wrong-vcenter-credentials.log
-    Should Be True  ${passed}
-
-Attempt to Install With Unmatching Fingerprint
-    Append To File  ${UI_INSTALLER_PATH}/configs  BYPASS_PLUGIN_VERIFICATION=1\n
-    Install Fails  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}  ${FALSE}  ff:ff:ff
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  does not match
-    Run Keyword Unless  ${passed}  Move File  install.log  install-fail-attempt-to-install-with-unmatching-fingerprint.log
-    Should Be True  ${passed}
-
-Attempt To Install With Wrong OVA Fileserver URL
-    Set Fileserver And Thumbprint In Configs  ${TRUE}
-    Install Fails  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}  ${TRUE}
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  Error
-    Run Keyword Unless  ${passed}  Move File  install.log  install-fail-attempt-to-install-with-wrong-ova-fileserver-url.log
-    Should Be True  ${passed}
-
-Install Plugin Successfully
-    Set Fileserver And Thumbprint In Configs
-    Append To File  ${UI_INSTALLER_PATH}/configs  BYPASS_PLUGIN_VERIFICATION=1\n
-    Install Plugin Successfully  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}  ${TRUE}
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  exited successfully
-    Run Keyword Unless  ${passed}  Move File  install.log  install-fail-ensure-vicui-is-installed-before-testing.log
-    Should Be True  ${passed}
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.md
deleted file mode 100644
index f9c2dd8b46..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 18-2 - VIC UI Uninstallation
-======
-
-# Purpose:
-To test all possible uninstallation failures and success scenarios on VCSA
-
-# References:
-
-# Environment:
-* Testing VIC UI requires a working VCSA setup with VCH installed
-* Target VCSA has Bash enabled for the root account
-
-# Test Steps:
-1. Check if the configs file exists
-2. Ensure UI plugin is already registered with VC before testing
-3. Try uninstalling UI without the configs file
-4. Try uninstalling UI with vsphere-client-serenity folder missing
-5. Try uninstalling UI with vCenter IP missing
-6. Try uninstalling UI with wrong vCenter credentials
-7. Uninstall UI successfully
-8. Try uninstalling UI when it's already uninstalled
-
-# Expected Outcome:
-* Each step should return success
-
-# Possible Problems:
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.robot
deleted file mode 100644
index c2928ec403..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-2-VIC-UI-Uninstaller.robot
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 18-2 - VIC UI Uninstallation
-Resource  ../../resources/Util.robot
-Resource  ./vicui-common.robot
-Test Teardown  Cleanup Installer Environment
-Suite Setup  Check Config And Install VCH  install
-Suite Teardown  Uninstall VCH  ${TRUE}
-
-*** Test Cases ***
-Attempt To Uninstall With Configs File Missing
-    # Rename the configs file and run the uninstaller script to see if it fails in an expected way
-    Move File  ${UI_INSTALLER_PATH}/configs  ${UI_INSTALLER_PATH}/configs_renamed
-    ${rc}  ${output}=  Run And Return Rc And Output  ${UNINSTALLER_SCRIPT_PATH}
-    Run Keyword And Continue On Failure  Should Contain  ${output}  Configs file is missing
-    Move File  ${UI_INSTALLER_PATH}/configs_renamed  ${UI_INSTALLER_PATH}/configs
-
-Attempt To Uninstall With Plugin Manifest Missing
-    Move File  ${UI_INSTALLER_PATH}/../plugin-manifest  ${UI_INSTALLER_PATH}/../plugin-manifest-a
-    ${rc}  ${output}=  Run And Return Rc And Output  cd ${UI_INSTALLER_PATH} && ${UNINSTALLER_SCRIPT_PATH}
-    Run Keyword And Continue On Failure  Should Contain  ${output}  manifest was not found
-    Move File  ${UI_INSTALLER_PATH}/../plugin-manifest-a  ${UI_INSTALLER_PATH}/../plugin-manifest
-
-Attempt To Uninstall From A Non vCenter Server
-    Uninstall Fails  not-a-vcenter-server  admin  password
-    ${output}=  OperatingSystem.GetFile  uninstall.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  vCenter Server was not found
-    Run Keyword Unless  ${passed}  Move File  uninstall.log  uninstall-fail-attempt-to-uninstall-from-a-non-vcenter-server.log
-    Should Be True  ${passed}
-
-Attempt To Uninstall With Wrong Vcenter Credentials
-    Set Fileserver And Thumbprint In Configs
-    Uninstall Fails  ${TEST_VC_IP}  ${TEST_VC_USERNAME}_nope  ${TEST_VC_PASSWORD}_nope
-    ${output}=  OperatingSystem.GetFile  uninstall.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  Cannot complete login due to an incorrect user name or password
-    Run Keyword Unless  ${passed}  Move File  uninstall.log  uninstall-fail-attempt-to-uninstall-with-wrong-vcenter-credentials.log
-    Should Be True  ${passed}
-
-Uninstall Successfully
-    Set Fileserver And Thumbprint In Configs
-    Uninstall Vicui  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}
-    ${output}=  OperatingSystem.GetFile  uninstall.log
-    ${passed}=  Run Keyword And Return Status  Should Match Regexp  ${output}  exited successfully
-    Run Keyword Unless  ${passed}  Move File  uninstall.log  uninstall-fail-uninstall-successfully.log
-    Should Be True  ${passed}
-
-Attempt To Uninstall Plugin That Is Already Gone
-    Set Fileserver And Thumbprint In Configs
-    Uninstall Vicui  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}
-    ${output}=  OperatingSystem.GetFile  uninstall.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  'com.vmware.vic.ui' is not registered
-    ${passed2}=  Run Keyword And Return Status  Should Contain  ${output}  'com.vmware.vic' is not registered
-    Run Keyword Unless  (${passed} and ${passed2})  Move File  uninstall.log  uninstall-fail-attempt-to-uninstall-plugin-that-is-already-gone.log
-    Should Be True  ${passed}
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.md
deleted file mode 100644
index 8f6f40c6a6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.md
+++ /dev/null
@@ -1,57 +0,0 @@
-Test 18-3 - VIC UI NGC Tests
-======
-
-# Purpose:
-To test user interactions with VIC UI in vSphere Web Client
-
-# References:
-
-# Environment:
-* Testing VIC UI requires a working VCSA setup with VCH installed
-
-# Test Steps:
-1. Check if provider properties files exist
-2. Ensure UI plugin is already registered with VC before testing
-3. Run the NGC tests
-  - Test 1: Verify if the VIC UI plugin is installed correctly
-    - Open a browser
-    - Log in as admin user
-    - Navigate to Administration -> Client Plug-Ins
-    - Verify if item “VicUI” exists
-
-  - Test 2.1: Verify if VCH VM Portlet exists
-    - Open a browser
-    - Log in as admin user
-    - Navigate to the VCH VM Summary tab
-    - Verify if property id `dockerApiEndpoint` exists
-
-  - Test 2.2: Verify if VCH VM Portlet displays correct information while VM is OFF
-    - Ensure the vApp is off
-    - Open a browser
-    - Log in as admin user
-    - Navigate to the VCH VM Summary tab
-    - Verify if `dockerApiEndpoint` equals the placeholder value `-`
-
-  - Test 2.3: Verify if VCH VM Portlet displays correct information while VM is ON
-    - Ensure the vApp is on
-    - Open a browser
-    - Log in as admin user
-    - Navigate to the VCH VM Summary tab
-    - Verify if `dockerApiEndpoint` does not equal the placeholder value `-`
-
-  - Test 3: Verify if Container VM Portlet exists
-    - Open a browser
-    - Log in as admin user
-    - Navigate to the Container VM Summary tab
-    - Verify if property id `containerName` exists
-
-# Expected Outcome:
-* Each step should return success
-
-# Possible Problems:
-1. NGC automated testing is not available on VC 5.5, so if the tests were to run against a box with VC 5.5 Step 3 above would be skipped. However, you can manually run the NGC tests by following the steps above.
-2. Some Selenium Web Drivers are known to have bugs that slow down or even crash the tests
-  - 64 bit version of the Internet Explorer Driver has an issue with text input speed where it takes about 4-5 seconds per keystroke. (using the 32 bit version solves the issue)
-  - When run with the Chrome Driver, tests fail at the login page of the vSphere Web Client; browser hangs and does not automatically enter username and password
-  - Firefox driver has been the most stable and thus was set as the default browser for testing
-  - The findings were made using the latest non-beta release of Selenium (v2.53.1) and the latest browser drivers on a Nimbus-based Windows 7 VM
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.robot
deleted file mode 100644
index 8140fe97b3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/18-3-VIC-UI-NGC-tests.robot
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 18-3 - VIC UI NGC tests
-Resource  ../../resources/Util.robot
-Resource  ../../resources/Docker-Util.robot
-Resource  ./vicui-common.robot
-Test Teardown  Clean Up Testbed Config Files
-Suite Setup  Check Config And Install VCH
-Suite Teardown  Uninstall VCH  ${TRUE}
-
-*** Test Cases ***
-Check Prerequisites
-    Set Suite Variable  ${VCH_VM_NAME}  %{VCH_VM_NAME}
-    ${pwd}=  Run  pwd
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Should Exist  ${pwd}/../../../ui/vic-uia/flex-automation-test/uia/vic-uia
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Set Suite Variable  ${NGC_TESTS_PATH}  ${pwd}/../../../ui/vic-uia/flex-automation-test/uia/vic-uia
-    Set Suite Variable  ${use_existing_container_vm}  False
-    Log To Console  Checking if Selenium Grid is reachable at %{SELENIUM_SERVER_IP}...
-    ${ping_rc}=  Run And Return Rc  nc -zv %{SELENIUM_SERVER_IP} 4444 -w 3
-    Run Keyword If  ${ping_rc} > 0  Fatal Error  Seleinum Grid %{SELENIUM_SERVER_IP} is not reachable!
-
-    # check if the files required by the ngc automation tests exist
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Should Exist  ${NGC_TESTS_PATH}/resources/browservm.tpl.properties
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Should Exist  ${NGC_TESTS_PATH}/resources/commonTestbedProvider.tpl.properties
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Should Exist  ${NGC_TESTS_PATH}/resources/hostProvider.tpl.properties
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Should Exist  ${NGC_TESTS_PATH}/resources/vicEnvProvider.tpl.properties
-
-Ensure Vicui Is Installed
-    # ensure vicui is installed before running ngc automation tests
-    Force Install Vicui Plugin
-    Cleanup Installer Environment
-    Reboot vSphere Client
-
-Run Ngc Tests Project
-    # create a container and get its name-id which is essentially the name of the vm
-    Run Keyword If  ${use_existing_container_vm} == True  Log To Console  \nUsing the container specified in vicui-common.robot  ELSE  Create And Run Test Container
-    Log To Console  Using container ${CONTAINER_VM_TRUNCATED_NAME}\n
-
-    # given the information in vicui-common.robot edit the above properties files
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Set Up Testbed Config Files  ELSE  Set Up Testbed For HSUIA
-
-    # start running ngc tests and expect the output does not include words 'BUILD FAILURE'
-    Run Keyword If  '${TEST_VC_VERSION}'=='5.5'  Skip Ngc Tests  ELSE  Start Ngc Tests
-
-
-*** Keywords ***
-Is vSphere Client Ready
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Log To Console  Waiting until vSphere Web Client is up and ready...  ELSE  Log To Console  Waiting until vSphere Client is up and ready...
-    ${out}=  Run Keyword If  %{TEST_VSPHERE_VER} == 60  Run  curl -sL https://${TEST_VC_IP}/vsphere-client/ -k  ELSE  Run  curl -sL https://${TEST_VC_IP}/ui/ -k
-    ${out_len}=  Get Length  ${out}
-    Should Be True  ${out_len} > 0
-    Should Not Contain  ${out}  Service Unavailable
-    Should Not Contain  ${out}  is still initializing
-
-Reboot vSphere Client
-    # reboot vsphere (web) client after installing the plugin
-    Open Connection  ${TEST_VC_IP}  prompt=#
-    Login  root  vmware
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Execute Command  service vsphere-client stop  ELSE  Execute Command  service-control --stop vsphere-ui
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Execute Command  service vsphere-client start  ELSE  Execute Command  service-control --start vsphere-ui
-
-    # wait until vsphere-client/ui server is up and running
-    Wait Until Keyword Succeeds  20x  30s  Is vSphere Client Ready
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Log To Console  vSphere Web Client has booted.  ELSE  Log To Console  vSphere Client has booted.
-    Close connection
-
-Set Up Testbed For HSUIA
-    ${testbed-prep-args-65}=  Set Variable  VC_IP=%{TEST_VC_IP} VC_ADMIN_USERNAME=Administrator VC_ADMIN_DOMAIN=vsphere.local VC_ADMIN_PW=%{TEST_PASSWORD} HOST_IP=%{ESX_HOST_IP} HOST_DATASTORE_NAME=%{TEST_DATASTORE} H5C_IP=%{TEST_VC_IP} H5C_PORT=443 SELENIUM_IP=%{SELENIUM_SERVER_IP} SELENIUM_PORT=4444 BROWSER=%{SELENIUM_BROWSER} VCH_NAME=%{VCH_VM_NAME} VCH_IP=%{VCH-IP} CONTAINER_NAME=${CONTAINER_VM_TRUNCATED_NAME}
-    ${rc}  ${out}=  Run And Return Rc And Output  bash -c "cd ../../../ui/vic-ui-h5c/uia/h5-plugin-tests ; ${testbed-prep-args-65} ./prepare-testbed.sh"
-    Log To Console  testbed provisioning result ::: ${rc} ${out}
-
-Set Up Testbed Config Files
-    # set up common testbed provider, host provider and vicenvprovider configurations here according to the content of vicui-common.robot
-    ${browservm}=  OperatingSystem.GetFile  ${NGC_TESTS_PATH}/resources/browservm.tpl.properties
-    ${commontestbed}=  OperatingSystem.GetFile  ${NGC_TESTS_PATH}/resources/commonTestbedProvider.tpl.properties
-    ${host}=  OperatingSystem.GetFile  ${NGC_TESTS_PATH}/resources/hostProvider.tpl.properties
-    ${vicenv}=  OperatingSystem.GetFile  ${NGC_TESTS_PATH}/resources/vicEnvProvider.tpl.properties
-
-    # make original copies
-    Set Suite Variable  ${browservm_original}  ${browser_vm}
-    Set Suite Variable  ${commontestbed_original}  ${commontestbed}
-    Set Suite Variable  ${host_original}  ${host}
-    Set Suite Variable  ${vicenv_original}  ${vicenv}
-
-    # populate browservm props
-    ${browservm}=  Replace String Using Regexp  ${browservm}  (?<!\#)testbed\.seleniumServer=.*  testbed\.seleniumServer=${SELENIUM_SERVER_IP}
-    ${browservm}=  Replace String Using Regexp  ${browservm}  (?<!\#)testbed\.seleniumServerPort=.*  testbed\.seleniumServerPort=${SELENIUM_SERVER_PORT}
-    ${browservm}=  Replace String Using Regexp  ${browservm}  (?<!\#)testbed\.seleniumBrowser=.*  testbed\.seleniumBrowser=*%{SELENIUM_BROWSER}
-
-    # populate common test provider props
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.datacenter=.*  testbed\.datacenter=${DATACENTER_NAME}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.pass=.*  testbed.pass=${TEST_VC_PASSWORD}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.host=.*  testbed.host=${ESX_HOST_IP}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.name=.*  testbed.name=${TEST_VC_IP}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.vsc\.url=.*  testbed\.vsc\.url=https\:\/\/${TEST_VC_IP}\/vsphere-client\/
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.cluster=.*  testbed\.cluster=${CLUSTER_NAME}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.endpoint=.*  testbed\.endpoint=${TEST_VC_IP}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.datastore\.type=.*  testbed\.datastore\.type=${DATASTORE_TYPE}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.datastore=.*  testbed\.datastore=${DATASTORE_NAME}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.host\.datastore\.name=.*  testbed\.host\.datastore\.name=${TEST_DATASTORE}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.datastore\.ip=.*  testbed\.datastore\.ip=${DATASTORE_IP}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.host\.password=.*  testbed\.host\.password=${ESX_HOST_PASSWORD}
-    ${commontestbed}=  Replace String Using Regexp  ${commontestbed}  (?<!\#)testbed\.user=.*  testbed\.user=${TEST_VC_USERNAME}
-
-    # populate host provider props
-    ${host}=  Replace String Using Regexp  ${host}  (?<!\#)testbed\.endpoint=.*  testbed\.endpoint=${ESX_HOST_IP}
-    ${host}=  Replace String Using Regexp  ${host}  (?<!\#)testbed\.local\.datastore\.name=.*  testbed\.local\.datastore\.name=${TEST_DATASTORE}
-    ${host}=  Replace String Using Regexp  ${host}  (?<!\#)testbed\.pass=.*  testbed\.pass=${ESX_HOST_PASSWORD}
-
-    # populate vicenv provider props
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.vc_version=.*  testbed\.vc_version=${TEST_VC_VERSION}
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.vch_vm_name=.*  testbed\.vch_vm_name=${VCH_VM_NAME}
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.container_vm_name=.*  testbed\.container_vm_name=${CONTAINER_VM_TRUNCATED_NAME}
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.user=.*  testbed\.user=${TEST_VC_USERNAME}
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.pass=.*  testbed\.pass=${TEST_VC_PASSWORD}
-    ${vicenv}=  Replace String Using Regexp  ${vicenv}  (?<!\#)testbed\.endpoint=.*  testbed\.endpoint=${TEST_VC_IP}
-
-    Create File  ${NGC_TESTS_PATH}/resources/browservm.properties  ${browservm}
-    Create File  ${NGC_TESTS_PATH}/resources/commonTestbedProvider.properties  ${commontestbed}
-    Create File  ${NGC_TESTS_PATH}/resources/hostProvider.properties  ${host}
-    Create File  ${NGC_TESTS_PATH}/resources/vicEnvProvider.properties  ${vicenv}
-    Remove Files  ${NGC_TESTS_PATH}/resources/*.tpl.properties
-
-Revert Config Files
-    # revert the properties files to their original template files
-    Remove Files  ${NGC_TESTS_PATH}/resources/*.properties
-    Create File  ${NGC_TESTS_PATH}/resources/browservm.tpl.properties  ${browservm_original}
-    Create File  ${NGC_TESTS_PATH}/resources/commonTestbedProvider.tpl.properties  ${commontestbed_original}
-    Create File  ${NGC_TESTS_PATH}/resources/hostProvider.tpl.properties  ${host_original}
-    Create File  ${NGC_TESTS_PATH}/resources/vicEnvProvider.tpl.properties  ${vicenv_original}
-
-Create And Run Test Container
-    Log To Console  \nCreating a busybox container...
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container_id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -t busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} start ${container_id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container_name}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container_id} | jq '.[0].Name' | sed 's/[\"\/]//g'
-    Should Be Equal As Integers  ${rc}  0
-    ${short_container_id}=  Get container shortID  ${container_id}
-    Set Suite Variable  ${CONTAINER_VM_TRUNCATED_NAME}  ${container_name}-${short_container_id}
-
-Start Ngc Tests
-    # run mvn test and make sure tests are successful. timeout is applied inside the custom library not here
-    [Timeout]  NONE
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Log To Console  Starting Flex tests...  ELSE  Log To Console  Starting HSUIA tests...
-    Log To Console  Selenium server is running at ${SELENIUM_SERVER_IP}
-    ${log_file}=  Set Variable  ngc_tests.log
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60  Run Ngc Tests  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}  ${log_file}  ELSE  Run HSUIA Tests  ${log_file}
-    ${output}=  OperatingSystem.GetFile  ${log_file}
-    ${cond1}=  Run Keyword And Return Status  Should Contain  ${output}  BUILD SUCCESS
-    ${cond2}=  Run Keyword And Return Status  Should Not Contain  ${output}  BUILD FAILURE
-    Run Keyword Unless  ${cond1} and ${cond2}  Move File  ${log_file}  FAIL-${log_file}
-    Log To Console  checking log
-    Log To Console  ${output}
-    Should Be True  ${cond1} and ${cond2}
-
-Skip Ngc Tests
-    Log To Console  Target VC is 5.5 which is not supported by NGC automation test framework. Skipping...
-
-Clean Up Testbed Config Files
-    @{files}=  Run Keyword If  %{TEST_VSPHERE_VER} == 60  OperatingSystem.List Directory  ${NGC_TESTS_PATH}/resources  *tpl.properties
-    ${num_tpl_files}=  Get Length  ${files}
-    Run Keyword If  %{TEST_VSPHERE_VER} == 60 and ${num_tpl_files} == 0  Revert Config Files
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/TestCases.md
deleted file mode 100644
index ffecc2f2b6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/TestCases.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Group 18 - VIC UI
-=======
-
-[Test 18-1 - VIC UI Installation](18-1-VIC-UI-Installer.md)
--
-[Test 18-2 - VIC UI Uninstallation](18-2-VIC-UI-Uninstaller.md)
--
-[Test 18-3 - VIC UI NGC Tests](18-3-VIC-UI-NGC-tests.md)
--
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/VicUiInstallPexpectLibrary.py b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/VicUiInstallPexpectLibrary.py
deleted file mode 100644
index 4ea3018f44..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/VicUiInstallPexpectLibrary.py
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-import os.path
-import pexpect
-import time
-
-
-class VicUiInstallPexpectLibrary(object):
-    TIMEOUT_LIMIT = 180
-    NGC_TESTS_TIMEOUT_LIMIT = 1800
-    with open('testbed-information', 'r') as f:
-        testbed_information = f.read().splitlines()
-
-    IS_TESTING_VSPHERE65 = 'TEST_VSPHERE_VER=65' in testbed_information[0]
-    INSTALLER_PATH = os.path.join(os.path.dirname(
-        __file__), '../../..', 'ui', 'installer', 'VCSA')
-    NGC_TESTS_PATH = os.path.join(os.path.dirname(__file__), '../../..', 'ui', 'vic-ui-h5c/uia/h5-plugin-tests/ui-automation/vic-uia') if IS_TESTING_VSPHERE65 else os.path.join(
-        os.path.dirname(__file__), '../../..', 'ui', 'vic-uia/flex-automation-test/uia/vic-uia')
-
-    def _prepare_and_spawn(self, operation, callback, flags=None):
-        try:
-            executable = os.path.join(
-                VicUiInstallPexpectLibrary.INSTALLER_PATH, operation + '.sh ' + (flags if flags is not None else ''))
-            self._f = open(operation + '.log', 'wb')
-            self._pchild = pexpect.spawn(
-                executable, cwd=VicUiInstallPexpectLibrary.INSTALLER_PATH, timeout=VicUiInstallPexpectLibrary.TIMEOUT_LIMIT)
-            self._pchild.logfile = self._f
-            callback()
-            self._f.close()
-
-        except IOError as e:
-            return 'Error: ' + e.value
-
-    def _common_prompts(
-            self, vcenter_ip, vcenter_user, vcenter_password,
-            trust_fingerprint, manual_entry):
-        self._pchild.expect('Enter IP to target vCenter Server: ')
-        self._pchild.sendline(vcenter_ip)
-        self._pchild.expect('Enter your vCenter Administrator Username: ')
-        self._pchild.sendline(vcenter_user)
-        self._pchild.expect('Enter your vCenter Administrator Password: ')
-        self._pchild.sendline(vcenter_password)
-
-    def install_fails(
-            self, vcenter_ip, vcenter_user, vcenter_password,
-            trust_fingerprint=True, manual_entry=None):
-        def commands():
-            self._common_prompts(
-                vcenter_ip, vcenter_user, vcenter_password, trust_fingerprint, manual_entry)
-            # self._pchild.interact()
-            idx = self._pchild.expect([
-                '.*Are you sure you trust the authenticity of this host (yes/no)?.*', '.*Error.*'])
-            if idx is 1:
-                self._pchild.expect(pexpect.EOF)
-            else:
-                if trust_fingerprint is True:
-                    self._pchild.sendline('yes')
-                else:
-                    self._pchild.sendline('no')
-                    self._pchild.expect(
-                        '.*Enter SHA-1 thumbprint of target VC:.*')
-                    self._pchild.sendline(manual_entry)
-
-                self._pchild.expect('.*Error.*')
-                self._pchild.expect(pexpect.EOF)
-
-        self._prepare_and_spawn('install', commands)
-
-    def install_plugin_successfully(
-            self, vcenter_ip, vcenter_user, vcenter_password,
-            trust_fingerprint=True, manual_entry=None, force=False):
-        def commands():
-            self._common_prompts(
-                vcenter_ip, vcenter_user, vcenter_password, trust_fingerprint, manual_entry)
-            self._pchild.expect(
-                '.*Are you sure you trust the authenticity of this host (yes/no)?.*')
-            self._pchild.sendline('yes')
-            self._pchild.expect('.*exited successfully')
-            self._pchild.expect(pexpect.EOF)
-
-        if force is True:
-            self._prepare_and_spawn('install', commands, '--force')
-        else:
-            self._prepare_and_spawn('install', commands)
-
-    def uninstall_fails(
-            self, vcenter_ip, vcenter_user, vcenter_password,
-            trust_fingerprint=True, manual_entry=None):
-        def commands():
-            self._common_prompts(
-                vcenter_ip, vcenter_user, vcenter_password, trust_fingerprint, manual_entry)
-            # self._pchild.interact()
-            idx = self._pchild.expect([
-                '.*Are you sure you trust the authenticity of this host (yes/no)?.*', '.*Error.*'])
-            if idx is 1:
-                self._pchild.expect(pexpect.EOF)
-            else:
-                if trust_fingerprint is True:
-                    self._pchild.sendline('yes')
-                else:
-                    self._pchild.sendline('no')
-                    self._pchild.expect(
-                        '.*Enter SHA-1 thumbprint of target VC:.*')
-                    self._pchild.sendline(manual_entry)
-
-                self._pchild.expect('.*Error.*')
-                self._pchild.expect(pexpect.EOF)
-
-        self._prepare_and_spawn('uninstall', commands)
-
-    def uninstall_vicui(
-            self, vcenter_ip, vcenter_user, vcenter_password,
-            trust_fingerprint=True, manual_entry=None):
-        def commands():
-            self._common_prompts(
-                vcenter_ip, vcenter_user, vcenter_password, trust_fingerprint, manual_entry)
-            self._pchild.expect(
-                '.*Are you sure you trust the authenticity of this host (yes/no)?.*')
-            self._pchild.sendline('yes')
-            self._pchild.expect(
-                ['.*exited successfully', 'Error! Could not unregister.*'])
-            # self._pchild.interact()
-            self._pchild.expect(pexpect.EOF)
-
-        self._prepare_and_spawn('uninstall', commands)
-
-    def run_ngc_tests(self, vcenter_user, vcenter_password):
-        try:
-            self._f = open('ngc_tests.log', 'wb')
-            self._pchild = pexpect.spawn('mvn test -Denv.VC_ADMIN_USERNAME=' + vcenter_user + ' -Denv.VC_ADMIN_PASSWORD=' + vcenter_password,
-                                         cwd=VicUiInstallPexpectLibrary.NGC_TESTS_PATH, timeout=VicUiInstallPexpectLibrary.NGC_TESTS_TIMEOUT_LIMIT)
-            self._pchild.logfile = self._f
-            self._pchild.expect(pexpect.EOF)
-            self._f.close()
-
-        except IOError as e:
-            return 'Error: ' + e.value
-
-    def run_hsuia_tests(self):
-        try:
-            self._f = open('ngc_tests.log', 'wb')
-            self._pchild = pexpect.spawn('mvn clean compile exec:exec -e -Dhsuia.runlist=work/runlists/default.runlist',
-                                         cwd=VicUiInstallPexpectLibrary.NGC_TESTS_PATH, timeout=VicUiInstallPexpectLibrary.NGC_TESTS_TIMEOUT_LIMIT)
-            self._pchild.logfile = self._f
-            self._pchild.expect(pexpect.EOF)
-            self._f.close()
-
-        except IOError as e:
-            return 'Error: ' + e.value
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/setup-testbed.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/setup-testbed.robot
deleted file mode 100644
index f793e30100..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/setup-testbed.robot
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Set up testbed before running the UI tests
-Resource  ../../resources/Util.robot
-
-*** Variables ***
-${MACOS_SELENIUM_IP}    10.20.121.192
-${UBUNTU_SELENIUM_IP}   10.20.121.145
-
-*** Keywords ***
-Check If Nimbus VMs Exist
-    # remove testbed-information if it exists
-    ${ti_exists}=  Run Keyword And Return Status  OperatingSystem.Should Exist  testbed-information
-    Run Keyword If  ${ti_exists}  Remove File  testbed-information
-
-    ${nimbus_machines}=  Set Variable  %{NIMBUS_USER}-UITEST-*
-    Log To Console  \nFinding Nimbus machines for UI tests
-    Open Connection  %{NIMBUS_GW}
-    Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-
-    ${out}=  Execute Command  nimbus-ctl list | grep -i "${nimbus_machines}"
-    @{out}=  Split To Lines  ${out}
-    ${out_len}=  Get Length  ${out}
-    Close connection
-
-    Run Keyword If  ${out_len} == 0  Setup Testbed  ELSE  Load Testbed  ${out}
-    Create File  testbed-information  TEST_VSPHERE_VER=%{TEST_VSPHERE_VER}\nSELENIUM_SERVER_IP=%{SELENIUM_SERVER_IP}\nTEST_ESX_NAME=%{TEST_ESX_NAME}\nESX_HOST_IP=%{ESX_HOST_IP}\nESX_HOST_PASSWORD=%{ESX_HOST_PASSWORD}\nTEST_VC_NAME=%{TEST_VC_NAME}\nTEST_VC_IP=%{TEST_VC_IP}\nTEST_URL_ARRAY=%{TEST_URL_ARRAY}\nTEST_USERNAME=%{TEST_USERNAME}\nTEST_PASSWORD=%{TEST_PASSWORD}\nTEST_DATASTORE=datastore1\nEXTERNAL_NETWORK=%{EXTERNAL_NETWORK}\nTEST_TIMEOUT=%{TEST_TIMEOUT}\nGOVC_INSECURE=%{GOVC_INSECURE}\nGOVC_USERNAME=%{GOVC_USERNAME}\nGOVC_PASSWORD=%{GOVC_PASSWORD}\nGOVC_URL=%{GOVC_URL}\n
-
-Destroy Testbed
-    [Arguments]  ${name}
-    Log To Console  Destroying VM(s) ${name}
-    Run Keyword And Ignore Error  Kill Nimbus Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${name}
-
-Load Testbed
-    [Arguments]  ${list}
-    Log To Console  Retrieving VMs information for UI testing...\n
-    ${len}=  Get Length  ${list}
-    @{browservm-found}=  Create List
-    @{esx-found}=  Create List
-    @{vcsa-found}=  Create List
-    ${browservm-requested}=  Run Keyword If  '%{TEST_OS}' == 'Ubuntu'  Set Variable  BROWSERVM-UBUNTU  ELSE  Set Variable  BROWSERVM-WINDOWS
-    :FOR  ${vm}  IN  @{list}
-    \  @{vm_items}=  Split String  ${vm}  :
-    \  ${is_esx}=  Run Keyword And Return Status  Should Match Regexp  @{vm_items}[1]  (?i)esx%{TEST_VSPHERE_VER}
-    \  ${is_vcsa}=  Run Keyword And Return Status  Should Match Regexp  @{vm_items}[1]  (?i)vc%{TEST_VSPHERE_VER}
-    \  ${is_browservm}=  Run Keyword And Return Status  Should Match Regexp  @{vm_items}[1]  (?i)${browservm-requested}
-    \  Run Keyword If  ${is_browservm}  Set Test Variable  @{browservm-found}  @{vm_items}  ELSE IF  ${is_esx}  Set Test Variable  @{esx-found}  @{vm_items}  ELSE IF  ${is_vcsa}  Set Test Variable  @{vcsa-found}  @{vm_items}
-    ${browservm_len}=  Get Length  ${browservm-found}
-    ${esx_len}=  Get Length  ${esx-found}
-    ${vcsa_len}=  Get Length  ${vcsa-found}
-    Run Keyword If  ${browservm_len} > 0  Extract BrowserVm Info  @{browservm-found}  ELSE  Deploy BrowserVm
-    Run Keyword If  (${esx_len} == 0 and ${vcsa_len} > 0) or (${esx_len} > 0 and ${vcsa_len} == 0)  Run Keywords  Destroy Testbed  '%{NIMBUS_USER}-UITEST-VC%{TEST_VSPHERE_VER}*'  AND  Destroy Testbed  '%{NIMBUS_USER}-UITEST-ESX%{TEST_VSPHERE_VER}*'  AND  Deploy Esx  AND  Deploy Vcsa
-    Run Keyword If  ${esx_len} == 0 and ${vcsa_len} == 0  Run Keywords  Deploy Esx  AND  Deploy Vcsa
-    Run Keyword If  ${esx_len} > 0 and ${vcsa_len} > 0  Run Keywords  Extract Esx Info  @{esx-found}  AND  Extract Vcsa Info  @{vcsa-found}
-
-Extract BrowserVm Info
-    [Arguments]  @{vm_fields}
-    Open Connection  %{NIMBUS_GW}
-    Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vm_name}=  Evaluate  '@{vm_fields}[1]'.strip()
-    ${out}=  Execute Command  NIMBUS=@{vm_fields}[0] nimbus-ctl ip ${vm_name} | grep -i ".*: %{NIMBUS_USER}-.*"
-    @{out}=  Split String  ${out}  :
-    ${vm_ip}=  Evaluate  '@{out}[2]'.strip()
-    Run Keyword If  '%{TEST_OS}' == 'Mac'  Set Environment Variable  SELENIUM_SERVER_IP  ${MACOS_SELENIUM_IP}  ELSE IF  '%{TEST_OS}' == 'Ubuntu'  Set Environment Variable  SELENIUM_SERVER_IP  ${UBUNTU_SELENIUM_IP}  ELSE  Set Environment Variable  SELENIUM_SERVER_IP  ${vm_ip}
-    Close Connection
-
-Extract Esx Info
-    [Arguments]  @{vm_fields}
-    Open Connection  %{NIMBUS_GW}
-    Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vm_name}=  Evaluate  '@{vm_fields}[1]'.strip()
-    ${out}=  Execute Command  NIMBUS=@{vm_fields}[0] nimbus-ctl ip ${vm_name} | grep -i ".*: %{NIMBUS_USER}-.*"
-    @{out}=  Split String  ${out}  :
-    ${vm_ip}=  Evaluate  '@{out}[2]'.strip()
-    Set Environment Variable  TEST_ESX_NAME  ${vm_name}
-    Set Environment Variable  ESX_HOST_IP  ${vm_ip}
-    Set Environment Variable  ESX_HOST_PASSWORD  e2eFunctionalTest
-    Close Connection
-
-Extract Vcsa Info
-    [Arguments]  @{vm_fields}
-    Open Connection  %{NIMBUS_GW}
-    Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vm_name}=  Evaluate  '@{vm_fields}[1]'.strip()
-    ${out}=  Execute Command  NIMBUS=@{vm_fields}[0] nimbus-ctl ip ${vm_name} | grep -i ".*: %{NIMBUS_USER}-.*"
-    @{out}=  Split String  ${out}  :
-    ${vm_ip}=  Evaluate  '@{out}[2]'.strip()
-    Set Environment Variable  TEST_VC_NAME  ${vm_name}
-    Set Environment Variable  TEST_VC_IP  ${vm_ip}
-    Set Environment Variable  TEST_URL_ARRAY  ${vm_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  EXTERNAL_NETWORK  vm-network
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-    Set Environment Variable  GOVC_URL  ${vm_ip}
-    Close Connection
-
-Deploy BrowserVm
-    # deploy a browser vm
-    ${browservm}  ${browservm-ip}=  Run Keyword If  '%{TEST_OS}' == 'Mac'  No Operation  ELSE IF  '%{TEST_OS}' == 'Ubuntu'  No Operation  ELSE  Deploy Nimbus BrowserVm For NGC Testing  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Run Keyword If  '%{TEST_OS}' == 'Mac'  Set Environment Variable  SELENIUM_SERVER_IP  ${MACOS_SELENIUM_IP}  ELSE IF  '%{TEST_OS}' == 'Ubuntu'  Set Environment Variable  SELENIUM_SERVER_IP  ${UBUNTU_SELENIUM_IP}  ELSE  Set Environment Variable  SELENIUM_SERVER_IP  ${browservm-ip}
-
-Deploy Esx
-    # deploy an esxi server
-    ${name}=  Evaluate  'UITEST-ESX%{TEST_VSPHERE_VER}-' + str(random.randint(1000,9999))  modules=random
-    ${buildnum}=  Run Keyword If  %{TEST_VSPHERE_VER} == 60  Set Variable  3620759  ELSE  Set Variable  5310538
-    ${out}=  Deploy Nimbus ESXi Server Async  ${name}  ${buildnum}
-    ${result}=  Wait For Process  ${out}
-    Log  ${result.stdout}
-    Log  ${result.stderr}
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${esx1-ip}=  Get IP  ${name}
-    Remove Environment Variable  GOVC_PASSWORD
-    Remove Environment Variable  GOVC_USERNAME
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_URL  root:@${esx1-ip}
-    ${out}=  Run  govc host.account.update -id root -password e2eFunctionalTest
-    Should Be Empty  ${out}
-    Log To Console  Successfully deployed %{NIMBUS_USER}-${name}. IP: ${esx1-ip}
-    Close Connection
-
-    Set Environment Variable  TEST_ESX_NAME  %{NIMBUS_USER}-${name}
-    Set Environment Variable  ESX_HOST_IP  ${esx1-ip}
-    Set Environment Variable  ESX_HOST_PASSWORD  e2eFunctionalTest
-
-Deploy Vcsa
-    # deploy a vcsa
-    ${name}=  Evaluate  'UITEST-VC%{TEST_VSPHERE_VER}-' + str(random.randint(1000,9999))  modules=random
-    ${buildnum}=  Run Keyword If  %{TEST_VSPHERE_VER} == 60  Set Variable  3634791  ELSE  Set Variable  5318154
-    ${out}=  Deploy Nimbus vCenter Server Async  ${name} --useQaNgc  ${buildnum}
-    ${result}=  Wait For Process  ${out}
-    Log  ${result.stdout}
-    Log  ${result.stderr}
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc-ip}=  Get IP  ${name}
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Log To Console  Successfully deployed %{NIMBUS_USER}-${name}. IP: ${vc-ip}
-    Close Connection
-
-    # create a datacenter
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create Datacenter
-    Should Be Empty  ${out}
-
-    # make a cluster
-    Log To Console  Create a cluster on the datacenter
-    ${out}=  Run  govc cluster.create -dc=Datacenter Cluster
-    Should Be Empty  ${out}
-    ${out}=  Run  govc cluster.change -dc=Datacenter -drs-enabled=true /Datacenter/host/Cluster
-    Should Be Empty  ${out}
-
-    # add the esx host to the cluster
-    Log To Console  Add ESX host to Cluster
-    ${out}=  Run  govc cluster.add -dc=Datacenter -cluster=/Datacenter/host/Cluster -username=root -password=e2eFunctionalTest -noverify=true -hostname=%{ESX_HOST_IP}
-    Should Contain  ${out}  OK
-
-    # create a distributed switch
-    Log To Console  Create a distributed switch
-    ${out}=  Run  govc dvs.create -dc=Datacenter test-ds
-    Should Contain  ${out}  OK
-
-    # make three port groups
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=Datacenter -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=Datacenter -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=Datacenter -dvs=test-ds network
-    Should Contain  ${out}  OK
-
-    Log To Console  Add the ESXi hosts to the portgroups
-    ${out}=  Run  govc dvs.add -dvs=test-ds -pnic=vmnic1 -host.ip=%{ESX_HOST_IP} %{ESX_HOST_IP}
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_VC_NAME  %{NIMBUS_USER}-${name}
-    Set Environment Variable  TEST_VC_IP  ${vc-ip}
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  EXTERNAL_NETWORK  vm-network
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-
-Setup Testbed
-    Deploy BrowserVm
-    Deploy Esx
-    Deploy Vcsa
-
-Deploy Nimbus BrowserVm For NGC Testing
-    [Arguments]  ${user}  ${password}
-    # for Mac & Ubuntu this keyword will never be called
-    # ${os}=  Run Keyword If  '%{TEST_OS}' == 'Ubuntu'  Set Variable  UBUNTU  ELSE  Set Variable  WINDOWS
-    # ${vm-template}=  Run Keyword If  '%{TEST_OS}' == 'Ubuntu'  Set Variable  hsuia-seleniumNode-ubuntu --memory 2048  ELSE  Set Variable  ngc-testvm-3
-    ${os}=  Set Variable  WINDOWS
-    ${vm-template}=  Set Variable  ngc-testvm-3
-    ${name}=  Evaluate  'UITEST-BROWSERVM-${os}-' + str(random.randint(1000,9999))  modules=random
-    Log To Console  \nDeploying Browser VM: ${name}
-    Open Connection  %{NIMBUS_GW}
-    Login  ${user}  ${password}
-
-    ${out}=  Execute Command  nimbus-genericdeploy --type ${vm-template} ${name} --lease 3
-    # Make sure the deploy actually worked
-    Should Contain  ${out}  To manage this VM use
-    # Now grab the IP address and return the name and ip for later use
-    @{out}=  Split To Lines  ${out}
-    :FOR  ${item}  IN  @{out}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  IP is
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    @{gotIP}=  Split String  ${line}  ${SPACE}
-    ${ip}=  Remove String  @{gotIP}[5]  ,
-
-    Log To Console  Successfully deployed new Browser VM - ${user}-${name}
-    Close connection
-    [Return]  ${user}-${name}  ${ip}
-
-*** Test Cases ***
-Check Variables
-    ${isset_SHELL}=  Run Keyword And Return Status  Environment Variable Should Be Set  SHELL
-    ${isset_DRONE_SERVER}=  Run Keyword And Return Status  Environment Variable Should Be Set  DRONE_SERVER
-    ${isset_DRONE_TOKEN}=  Run Keyword And Return Status  Environment Variable Should Be Set  DRONE_TOKEN
-    ${isset_NIMBUS_USER}=  Run Keyword And Return Status  Environment Variable Should Be Set  NIMBUS_USER
-    ${isset_NIMBUS_PASSWORD}=  Run Keyword And Return Status  Environment Variable Should Be Set  NIMBUS_PASSWORD
-    ${isset_NIMBUS_GW}=  Run Keyword And Return Status  Environment Variable Should Be Set  NIMBUS_GW
-    ${isset_TEST_DATASTORE}=  Run Keyword And Return Status  Environment Variable Should Be Set  TEST_DATASTORE
-    ${isset_TEST_RESOURCE}=  Run Keyword And Return Status  Environment Variable Should Be Set  TEST_RESOURCE
-    ${isset_GOVC_INSECURE}=  Run Keyword And Return Status  Environment Variable Should Be Set  GOVC_INSECURE
-    Log To Console  \nChecking environment variables
-    Log To Console  SHELL ${isset_SHELL}
-    Log To Console  DRONE_SERVER ${isset_DRONE_SERVER}
-    Log To Console  DRONE_TOKEN ${isset_DRONE_TOKEN}
-    Log To Console  NIMBUS_USER ${isset_NIMBUS_USER}
-    Log To Console  NIMBUS_PASSWORD ${isset_NIMBUS_PASSWORD}
-    Log To Console  NIMBUS_GW ${isset_NIMBUS_GW}
-    Log To Console  TEST_DATASTORE ${isset_TEST_DATASTORE}
-    Log To Console  TEST_RESOURCE ${isset_TEST_RESOURCE}
-    Log To Console  GOVC_INSECURE ${isset_GOVC_INSECURE}
-    Log To Console  TEST_VSPHERE_VER %{TEST_VSPHERE_VER}
-    Should Be True  ${isset_SHELL} and ${isset_DRONE_SERVER} and ${isset_DRONE_TOKEN} and ${isset_NIMBUS_USER} and ${isset_NIMBUS_GW} and ${isset_TEST_DATASTORE} and ${isset_TEST_RESOURCE} and ${isset_GOVC_INSECURE} and %{TEST_VSPHERE_VER}
-
-Check Nimbus Machines
-    Check If Nimbus VMs Exist
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/vicui-common.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/vicui-common.robot
deleted file mode 100644
index c8ba78945d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group18-VIC-UI/vicui-common.robot
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Common keywords used by VIC UI installation & uninstallation test suites
-Resource  ../../resources/Util.robot
-Library  VicUiInstallPexpectLibrary.py
-
-*** Variables ***
-${TEST_VC_VERSION}          6.0
-${TEST_VC_ROOT_PASSWORD}    vmware
-${TIMEOUT}                  10 minutes
-
-${SELENIUM_SERVER_PORT}     4444
-${DATACENTER_NAME}          Datacenter
-${CLUSTER_NAME}             Cluster
-${DATASTORE_TYPE}           NFS
-${DATASTORE_NAME}           fake
-${DATASTORE_IP}             1.1.1.1
-${CONTAINER_VM_NAME}        sharp_feynman-d39db0a231f2f639a073814c2affc03e4737d9ad361649069eb424e6c4e09b52
-${TEST_OS}                  %{TEST_OS}
-${vic_macmini_fileserver_url}  https://10.20.121.192:3443/vsphere-plugins/
-${vic_macmini_fileserver_thumbprint}  BE:64:39:8B:BD:98:47:4D:E8:3B:2F:20:A5:21:8B:86:5F:AD:79:CE
-
-*** Keywords ***
-Set Fileserver And Thumbprint In Configs
-    [Arguments]  ${fake}=${FALSE}
-    ${fileserver_url}=  Run Keyword If  ${fake} == ${TRUE}  Set Variable  256.256.256.256  ELSE  Set Variable  ${vic_macmini_fileserver_url}
-    ${fileserver_thumbprint}=  Run Keyword If  ${fake} == ${TRUE}  Set Variable  ab:cd:ef  ELSE  Set Variable  ${vic_macmini_fileserver_thumbprint}
-    ${results}=  Replace String Using Regexp  ${configs}  VIC_UI_HOST_URL=.*  VIC_UI_HOST_URL=\"${fileserver_url}\"
-    ${results}=  Replace String Using Regexp  ${results}  VIC_UI_HOST_THUMBPRINT=.*  VIC_UI_HOST_THUMBPRINT=\"${fileserver_thumbprint}\"
-    Create File  ${UI_INSTALLER_PATH}/configs  ${results}
-
-Load Nimbus Testbed Env
-    Should Exist  testbed-information
-    ${envs}=  OperatingSystem.Get File  testbed-information
-    @{envs}=  Split To Lines  ${envs}
-    :FOR  ${item}  IN  @{envs}
-    \  @{kv}=  Split String  ${item}  =
-    \  Set Environment Variable  @{kv}[0]  @{kv}[1]
-    \  Set Suite Variable  \$@{kv}[0]  @{kv}[1]
-    Set Suite Variable  ${TEST_VC_USERNAME}  %{TEST_USERNAME}
-    Set Suite Variable  ${TEST_VC_PASSWORD}  %{TEST_PASSWORD}
-
-Install VIC Appliance For VIC UI
-    [Arguments]  ${vic-machine}=ui-nightly-run-bin/vic-machine-linux  ${appliance-iso}=ui-nightly-run-bin/appliance.iso  ${bootstrap-iso}=ui-nightly-run-bin/bootstrap.iso  ${certs}=${true}  ${vol}=default
-    Set Test Environment Variables
-    # disable firewall
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.esxcli network firewall set -e false
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On VIC UI Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Run Keyword And Ignore Error  Cleanup Dangling Networks On Test Server
-    Run Keyword And Ignore Error  Cleanup Dangling vSwitches On Test Server
-
-    # Install the VCH now
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run VIC Machine Command  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${certs}  ${vol}  ${EMPTY}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${certs}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-
-Cleanup Dangling VMs On VIC UI Test Server
-    ${out}=  Run  govc ls vm
-    ${vms}=  Split To Lines  ${out}
-    :FOR  ${vm}  IN  @{vms}
-    \   ${vm}=  Fetch From Right  ${vm}  /
-    \   ${build}=  Split String  ${vm}  -
-    \   # Skip any VM that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   # Skip any VM that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   ${uuid}=  Run  govc vm.info -json\=true ${vm} | jq -r '.VirtualMachines[0].Config.Uuid'
-    \   Log To Console  Destroying dangling VCH: ${vm}
-    \   ${rc}  ${output}=  Delete VIC Machine  ${vm}  ../../../ui-nightly-run-bin/vic-machine-linux
-
-Check Config And Install VCH
-    [Arguments]  ${plugin}=noop
-    Run Keyword  Set Absolute Script Paths
-    Load Nimbus Testbed Env
-    Set Environment Variable  DOMAIN  ${EMPTY}
-    Install VIC Appliance For VIC UI  ../../../ui-nightly-run-bin/vic-machine-linux  ../../../ui-nightly-run-bin/appliance.iso  ../../../ui-nightly-run-bin/bootstrap.iso
-    Set Environment Variable  VCH_VM_NAME  %{VCH-NAME}
-    ${vc_fingerprint}=  Run  ../../../ui-nightly-run-bin/vic-ui-linux info --user ${TEST_VC_USERNAME} --password ${TEST_VC_PASSWORD} --target ${TEST_VC_IP} --key com.vmware.vic.noop 2>&1 | grep -o "(thumbprint.*)" | awk -F= '{print $2}' | sed 's/.$//'
-    Set Environment Variable  VC_FINGERPRINT  ${vc_fingerprint}
-    Run Keyword If  '${plugin}' == 'install'  Force Install Vicui Plugin
-    Run Keyword If  '${plugin}' == 'remove'  Force Remove Vicui Plugin
-
-Set Absolute Script Paths
-    ${UI_INSTALLERS_ROOT}=  Run  pwd
-    ${UI_INSTALLERS_ROOT}=  Join Path  ${UI_INSTALLERS_ROOT}  ../../../ui/installer
-    Set Suite Variable  ${UI_INSTALLER_PATH}  ${UI_INSTALLERS_ROOT}/VCSA
-    Should Exist  ${UI_INSTALLER_PATH}
-    ${configs_content}=  OperatingSystem.GetFile  ${UI_INSTALLER_PATH}/configs
-    Set Suite Variable  ${configs}  ${configs_content}
-    Run Keyword If  %{TEST_VSPHERE_VER} == 65  Set Suite Variable  ${plugin_folder}  plugin-packages  ELSE  Set Suite Variable  ${plugin_folder}  vsphere-client-serenity
-
-    # set exact paths for installer and uninstaller scripts
-    Set Script Filename  INSTALLER_SCRIPT_PATH  ./install
-    Set Script Filename  UNINSTALLER_SCRIPT_PATH  ./uninstall
-
-Set Script Filename
-    [Arguments]    ${suite_varname}  ${script_name}
-    ${SCRIPT_FILENAME}=  Set Variable  ${script_name}.sh
-    ${SCRIPT_FILENAME}=  Join Path  ${UI_INSTALLER_PATH}  ${SCRIPT_FILENAME}
-    Set Suite Variable  \$${suite_varname}  ${SCRIPT_FILENAME}
-
-Reset Configs
-    # Revert the configs file back to what it was
-    ${results}=  Replace String Using Regexp  ${configs}  VIC_UI_HOST_URL=.*  VIC_UI_HOST_URL=\"\"
-    ${results}=  Replace String Using Regexp  ${results}  VIC_UI_HOST_THUMBPRINT=.*  VIC_UI_HOST_THUMBPRINT=\"\"
-    Create File  ${UI_INSTALLER_PATH}/configs  ${results}
-    Should Exist  ${UI_INSTALLER_PATH}/configs
-
-Force Install Vicui Plugin
-    Set Fileserver And Thumbprint In Configs
-    Append To File  ${UI_INSTALLER_PATH}/configs  BYPASS_PLUGIN_VERIFICATION=1\n
-    Install Plugin Successfully  ${TEST_VC_IP}  ${TEST_VC_USERNAME}  ${TEST_VC_PASSWORD}  ${TRUE}  None  ${TRUE}
-    Reset Configs
-    ${output}=  OperatingSystem.GetFile  install.log
-    ${passed}=  Run Keyword And Return Status  Should Contain  ${output}  exited successfully
-    Run Keyword Unless  ${passed}  Copy File  install.log  fail-force-install-vicui-plugin.log
-    Remove File  install.log
-    Should Be True  ${passed}
-
-Force Remove Vicui Plugin
-    ${rc}  ${output}=  Run And Return Rc And Output  ../../../ui-nightly-run-bin/vic-ui-linux remove --thumbprint %{VC_FINGERPRINT} --target ${TEST_VC_IP} --user ${TEST_VC_USERNAME} --password ${TEST_VC_PASSWORD} --key com.vmware.vic.ui
-    ${rc}  ${output}=  Run And Return Rc And Output  ../../../ui-nightly-run-bin/vic-ui-linux remove --thumbprint %{VC_FINGERPRINT} --target ${TEST_VC_IP} --user ${TEST_VC_USERNAME} --password ${TEST_VC_PASSWORD} --key com.vmware.vic
-
-Rename Folder
-    [Arguments]  ${old}  ${new}
-    Move Directory  ${old}  ${new}
-    Should Exist  ${new}
-
-Cleanup Installer Environment
-    # Reverts the configs file and make sure the folder containing the UI binaries has its original name that might've been left modified due to a test failure
-    Reset Configs
-    @{folders}=  OperatingSystem.List Directory  ${UI_INSTALLER_PATH}/..  ${plugin_folder}*
-    Run Keyword If  ('@{folders}[0]' != '${plugin_folder}')  Rename Folder  ${UI_INSTALLER_PATH}/../@{folders}[0]  ${UI_INSTALLER_PATH}/../${plugin_folder}
-
-Delete VIC Machine
-    [Tags]  secret
-    [Arguments]  ${vch-name}  ${vic-machine}=ui-nightly-run-bin/vic-machine-linux
-    ${rc}  ${output}=  Run And Return Rc And Output  ${vic-machine} delete --name=${vch-name} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    [Return]  ${rc}  ${output}
-
-Uninstall VCH
-    [Arguments]  ${remove_plugin}=${FALSE}
-    Log To Console  Gathering logs from the test server...
-    Gather Logs From Test Server
-    Log To Console  Deleting the VCH appliance...
-    ${rc}  ${output}=  Delete VIC Machine  %{VCH-NAME}  ../../../ui-nightly-run-bin/vic-machine-linux
-    Check Delete Success  %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  rm -f %{VCH-NAME}-*.pem
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove %{VCH-NAME}-bridge
-    Run Keyword If  ${remove_plugin} == ${TRUE}  Force Remove Vicui Plugin
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.md
deleted file mode 100644
index ac38d3b93a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Test 19-1 - Configuration 1 VC6.5 ESX6.5 VIC Harbor Insecured
-=======
-
-# Purpose:
-To verify the VIC Product (Engine/Harbor) work using insecure registry with a VC6.5 and ESX6.5 server
-
-# References:
-[1 - VIC+Harbor Integration Test Plan](https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=corevc&title=VIC+-+Harbor+Integration+Test+Plan)
-
-# Environment:
-* This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-* Login to Harbor using an LDAP user1 (say admin role)
-* Create a Project named say 'vic-harbor' (publicity off)
-* Login with 2 other LDAP users (say user2, user3) and logout - Limitation (Issue#)
-* Login as user1 and add other users with different roles (developer, guest) under Project 'vic-harbor'
-* Prepare 3 windows client machines (3rd client machine could be a Linux machine as we couldn't figure out the VT-X issue for running docker on Windows 7/10 VM)
-
-# Test Steps:
-###pos001:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Do docker login to harbor using an user with admin role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###pos002:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with developer role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###neg001:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with guest role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-
-###pos003:
-1. Create a VCH2 with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Using VCH1, Do docker login to harbor registry using a developer user
-3. Using VCH2, Do docker login to harbor registry using another developer user
-4. Using VCH1, Pull an image/application into the local docker registry using local docker in the client machine
-5. Using VCH1, Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH host, Pull the image from Harbor registry
-8. Run the application using docker run command
-9. Stop, Start, attach, kill, rm and rmi
-
-###pos004:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80) from any client machine
-2. Using different machines, connect to the same VCH (in parallel)
-3. Do docker login to harbor using different users (in parallel)
-4. Pull an image/application into the local docker registry using local docker in the client machine
-5. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH, Pull same/different images using different users from Harbor registry
-8. Run the applications using different users from Harbor registry (in parallel)
-9. Stop, Start, attach, kill, rm and rmi using different users from Harbor registry (in parallel)
-
-# Expected Outcome:
-###pos001:
-* VCH Creation with Harbor private registry should succeed - Limitation (Issue#)
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos002:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###neg001:
-* Validate that VCH is communicating with Harbor Registry
-* Ensure that the LDAP user with guest role is not able to push images to the Harbor repository but able to pull the image
-
-###pos003:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos004:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-# Possible Problems:
-* Not planning on using LDAP at this time, in all cases where LDAP is specified substitute users manually created within the product
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.robot
deleted file mode 100644
index c047f78908..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-1-Configuration-1-VC6.5-ESX6.5-VIC-Harbor-Insecured.robot
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 19-1 - Configuration 1 VC6.5 ESX6.5 VIC Harbor Insecured
-Resource  ../../resources/Util.robot
-Suite Setup  19-1-Setup
-Suite Teardown  19-1-Teardown
-
-*** Variables ***
-${developer}  test-user-developer
-${guest}  test-user-guest
-${password}  Test-password-1
-${newPassword}  Test-new-password-1
-${project}  vic-harbor
-${image}  busybox
-${container_name}  busy
-${tag}  new
-${developerRole}  Developer
-${guestRole}  Guest
-${developerEmail}  developer@test.com
-${developerEmail2}  develope2@test.com
-${guestEmail}  guest@test.com
-${developerFullName}  Vic Developer
-${guestFullName}  Vic Guest
-${comments}  comments
-${developer2}  test-user-developer2
-
-*** Keywords ***
-19-1-Setup
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc_ip}=  Create a Simple VC Cluster
-    Set Global Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-    Install Harbor To Test Server  name=19-1-harbor
-    Restart Docker With Insecure Registry Option
-    Install VIC Appliance To Test Server  vol=default --insecure-registry %{HARBOR_IP}  certs=${False}
-    Create Project And Three Users For It  developer=${developer}  developer2=${developer2}  developerEmail=${developerEmail}  developerEmail2=${developerEmail2}  developerFullName=${developerFullName}  password=${password}  comments=${comments}  guest=${guest}  developerRole=${developerRole}  guestRole=${guestRole}  project=${project}  public=${False}
-    Remove Environment Variable  DOCKER_HOST
-
-19-1-Teardown
-    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-    ${out}=  Run Keyword And Continue On Failure  Run  govc vm.destroy 19-1-harbor
-    Run Keyword And Continue On Failure  Nimbus Cleanup  ${list}
-
-*** Test Cases ***
-Test Pos001 Admin Operations
-    Basic Docker Command With Harbor  user=admin  password=%{TEST_PASSWORD}  project=${project}  image=${image}  container_name=${container_name}
-
-Test Pos002 Developer Operations
-    Basic Docker Command With Harbor  user=${developer}  password=${password}  project=${project}  image=${image}  container_name=${container_name}
-    
-Test Neg001 Developer Operations
-    # Docker login
-    Log To Console  \nRunning docker login admin...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${guest} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from harbor through VCH, ensure guest could pull
-    Log To Console  docker pull from harbor using VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag %{HARBOR_IP}/${project}/${image} %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image should fail
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  unauthorized: authentication required
-    Should Not Contain  ${output}  digest:
-
-Test Pos003 Two VCH With One Harbor
-    # Add another VC
-    ${VCH1-URL}=  Set Variable  %{VCH-PARAMS}
-
-    Install VIC Appliance To Test Server  vol=default --insecure-registry %{HARBOR_IP}  certs=${false}  cleanup=${false}
-    Remove Environment Variable  DOCKER_HOST
-    ${VCH2-URL}=  Set Variable  %{VCH-PARAMS}
-
-    # Docker login VCH1
-    Log To Console  \nRunning docker login developer VCH1...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH1-URL} login -u ${developer} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker login VCH2
-    Log To Console  \nRunning docker login developer2 VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} login -u ${developer2} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag ${image} %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  digest:
-    Should Contain  ${output}  latest:
-    Should Not Contain  ${output}  No such image:
-
-    # Docker delete image in local registry
-    Log To Console  docker rmi local registry...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-    # Make sure the image pushed by VCH1 could be used by VCH2
-    # Docker pull from harbor using VCH2
-    Log To Console  docker pull from dockerhub VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker run image
-    Log To Console  docker run VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} run --name ${container_name} %{HARBOR_IP}/${project}/${image} /bin/ash -c "dmesg;echo END_OF_THE_TEST" 
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-    # Docker rm container
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker create
-    Log To Console  docker create VCH2...
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker ${VCH2-URL} create --name ${container_name} -i %{HARBOR_IP}/${project}/${image} /bin/top
-    Log  ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker start
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker attach 
-    Log To Console  Starting process Docker attach VCH2...
-    Start Process  docker ${VCH2-URL} attach ${container_name} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Log  ${ret}
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-    # Docker start  
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker stop
-    Log To Console  docker stop VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} stop ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker remove
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container_name}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container_name}
-
-    # Docker delete image
-    Log To Console  docker rmi VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-# Test Pos004 Three Client Machines With One Harbor
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-10-VIC-Vulnerability.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-10-VIC-Vulnerability.md
deleted file mode 100644
index d1284a4260..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-10-VIC-Vulnerability.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Test 19-10 VIC Vulnerability scanning
-=======
-
-# Purpose:
-To verify that the vulnerability scanning feature of VIC product works as expected
-
-# References:
-[1- VIC vulnerability scan](TBD - waiting on official docs to link)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download and install the VIC OVA from here:
-[OVA Releases](https://console.cloud.google.com/storage/browser/vic-product-ova-releases/?project=eminent-nation-87317&authuser=1)
-2. Register Harbor as a registry with Admiral
-3. Do a docker push to the harbor instance and populate the harbor instance with images that can be pulled
-4. Do a docker login/pull from the harbor instance
-5. Login to Admiral UI, Go to ‘Administration->Projects->Repositories tab’ locate the specified repository
-6. Click on the arrow to expand the embedded tag list of the specified repository and then click on the vertical ellipsis to open the popup menu.
-7. Click on 'Scan' to start the vulnerability analysis process
-8. Image 1- Verify different scanning status Not Scanned->Queued->Scanning->Complete -status are indicated in the 'Vulnerability' column (Image1 need to be defined later)
-9. Image 2- Verify different scanning status Not Scanned->Queued->Scanning->Error -status are indicated in the 'Vulnerability' column (Image2 need to be defined later)
-10. Verify that if error occurred, user can click on the 'View Log'
-11. Verify result once the scan has been completed, look for color bar.
-12. Click on the tag name link to open the tag detail page. Check the vulnerability scanning information and the vulnerabilities found in the last scanning.
-13. Scanning all images - In the 'Vulnerability' tab of 'Configuration' section under 'Administration', click on the 'SCAN NOW'
-14. Verify Scheduled Scan by Policy - 'Daily' and 'None'. Once the scheduled job is executed, the completion time of scanning all images will be updated.
-15. Delete the OVA VM
-
-# Expected Outcome:
-Vulnerability scan should work as expected and user can view log and scan results
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.md
deleted file mode 100644
index 1cc299e06d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Test 19-2 - Configuration 2 VC6.5 ESX6.5 VIC Harbor Secured Public CA Cert
-=======
-
-# Purpose:
-To verify the VIC Product (Engine/Harbor) work using public CA certificates with a VC6.5 and ESX6.5 server
-
-# References:
-[1 - VIC+Harbor Integration Test Plan](https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=corevc&title=VIC+-+Harbor+Integration+Test+Plan)
-
-# Environment:
-* This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-* Login to Harbor using an LDAP user1 (say admin role)
-* Create a Project named say 'vic-harbor' (publicity off)
-* Login with 2 other LDAP users (say user2, user3) and logout - Limitation (Issue#)
-* Login as user1 and add other users with different roles (developer, guest) under Project 'vic-harbor'
-* Prepare 3 windows client machines (3rd client machine could be a Linux machine as we couldn't figure out the VT-X issue for running docker on Windows 7/10 VM)
-
-# Test Steps:
-###pos001:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Do docker login to harbor using an user with admin role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###pos002:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with developer role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###neg001:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with guest role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-
-###pos003:
-1. Create a VCH2 with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Using VCH1, Do docker login to harbor registry using a developer user
-3. Using VCH2, Do docker login to harbor registry using another developer user
-4. Using VCH1, Pull an image/application into the local docker registry using local docker in the client machine
-5. Using VCH1, Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH host, Pull the image from Harbor registry
-8. Run the application using docker run command
-9. Stop, Start, attach, kill, rm and rmi
-
-###pos004:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80) from any client machine
-2. Using different machines, connect to the same VCH (in parallel)
-3. Do docker login to harbor using different users (in parallel)
-4. Pull an image/application into the local docker registry using local docker in the client machine
-5. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH, Pull same/different images using different users from Harbor registry
-8. Run the applications using different users from Harbor registry (in parallel)
-9. Stop, Start, attach, kill, rm and rmi using different users from Harbor registry (in parallel)
-
-# Expected Outcome:
-###pos001:
-* VCH Creation with Harbor private registry should succeed - Limitation (Issue#)
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos002:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###neg001:
-* Validate that VCH is communicating with Harbor Registry
-* Ensure that the LDAP user with guest role is not able to push images to the Harbor repository but able to pull the image
-
-###pos003:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos004:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-# Possible Problems:
-* Not planning on using LDAP at this time, in all cases where LDAP is specified substitute users manually created within the product
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.robot
deleted file mode 100644
index b4d589336c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-2-Configuration-2-VC6.5-ESX6.5-VIC-Harbor-Secured-PublicCACert.robot
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md
deleted file mode 100644
index dc1029984e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Test 19-3 - Configuration 3 VC6.0 ESX6.0 VIC Harbor Secured Self Signed CA Cert
-=======
-
-# Purpose:
-To verify the VIC Product (Engine/Harbor) work using self signed certificates with an VC6.0 and ESX6.0 server
-
-# References:
-[1 - VIC+Harbor Integration Test Plan](https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=corevc&title=VIC+-+Harbor+Integration+Test+Plan)
-
-# Environment:
-* This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-* Login to Harbor using an LDAP user1 (say admin role)
-* Create a Project named say 'vic-harbor' (publicity off)
-* Login with 2 other LDAP users (say user2, user3) and logout - Limitation (Issue#)
-* Login as user1 and add other users with different roles (developer, guest) under Project 'vic-harbor'
-* Prepare 3 windows client machines (3rd client machine could be a Linux machine as we couldn't figure out the VT-X issue for running docker on Windows 7/10 VM)
-
-# Test Steps:
-###pos001:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Do docker login to harbor using an user with admin role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###pos002:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with developer role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###neg001:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with guest role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-
-###pos003:
-1. Create a VCH2 with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Using VCH1, Do docker login to harbor registry using a developer user
-3. Using VCH2, Do docker login to harbor registry using another developer user
-4. Using VCH1, Pull an image/application into the local docker registry using local docker in the client machine
-5. Using VCH1, Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH host, Pull the image from Harbor registry
-8. Run the application using docker run command
-9. Stop, Start, attach, kill, rm and rmi
-
-###pos004:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80) from any client machine
-2. Using different machines, connect to the same VCH (in parallel)
-3. Do docker login to harbor using different users (in parallel)
-4. Pull an image/application into the local docker registry using local docker in the client machine
-5. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH, Pull same/different images using different users from Harbor registry
-8. Run the applications using different users from Harbor registry (in parallel)
-9. Stop, Start, attach, kill, rm and rmi using different users from Harbor registry (in parallel)
-
-# Expected Outcome:
-###pos001:
-* VCH Creation with Harbor private registry should succeed - Limitation (Issue#)
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos002:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###neg001:
-* Validate that VCH is communicating with Harbor Registry
-* Ensure that the LDAP user with guest role is not able to push images to the Harbor repository but able to pull the image
-
-###pos003:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos004:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-# Possible Problems:
-* Not planning on using LDAP at this time, in all cases where LDAP is specified substitute users manually created within the product
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot
deleted file mode 100644
index 81249819a9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-3-Configuration-3-VC6.0-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 19-3 - Configuration 3 VC 6.0 ESX 6.0 VIC Harbor Secured Self Signed
-Resource  ../../resources/Util.robot
-Suite Setup  19-3-Setup
-Suite Teardown  19-3-Teardown
-
-*** Variables ***
-${developer}  test-user-developer
-${guest}  test-user-guest
-${password}  Test-password-1
-${newPassword}  Test-new-password-1
-${project}  vic-harbor
-${image}  busybox
-${container_name}  busy
-${tag}  new
-${developerRole}  Developer
-${guestRole}  Guest
-${developerEmail}  developer@test.com
-${developerEmail2}  develope2@test.com
-${guestEmail}  guest@test.com
-${developerFullName}  Vic Developer
-${guestFullName}  Vic Guest
-${comments}  comments
-${developer2}  test-user-developer2
-
-*** Keywords ***
-19-3-Setup
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc_ip}=  Create a Simple VC Cluster
-    Set Global Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-    Install Harbor To Test Server  name=19-3-harbor  protocol=https
-    Install Harbor Self Signed Cert
-    # diable the tls check between dockercli and VCH
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${False}
-    Create Project And Three Users For It  developer=${developer}  developer2=${developer2}  developerEmail=${developerEmail}  developerEmail2=${developerEmail2}  developerFullName=${developerFullName}  password=${password}  comments=${comments}  guest=${guest}  developerRole=${developerRole}  guestRole=${guestRole}  project=${project}  public=${False}
-    Remove Environment Variable  DOCKER_HOST
-
-19-3-Teardown
-    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-    ${out}=  Run Keyword And Continue On Failure  Run  govc vm.destroy 19-3-harbor
-    Run Keyword And Continue On Failure  Nimbus Cleanup  ${list}
-
-*** Test Cases ***
-Test Pos001 Admin Operations
-    Basic Docker Command With Harbor  user=admin  password=%{TEST_PASSWORD}  project=${project}  image=${image}  container_name=${container_name}
-
-Test Pos002 Developer Operations
-    Basic Docker Command With Harbor  user=${developer}  password=${password}  project=${project}  image=${image}  container_name=${container_name}
-    
-Test Neg001 Developer Operations
-    # Docker login
-    Log To Console  \nRunning docker login admin...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${guest} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from harbor through VCH, ensure guest could pull
-    Log To Console  docker pull from harbor using VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag %{HARBOR_IP}/${project}/${image} %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image should fail
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  unauthorized: authentication required
-    Should Not Contain  ${output}  digest:
-
-Test Pos003 Two VCH With One Harbor
-    # Add another VC
-    ${VCH1-URL}=  Set Variable  %{VCH-PARAMS}
-
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${false}  cleanup=${false}
-    Remove Environment Variable  DOCKER_HOST
-    ${VCH2-URL}=  Set Variable  %{VCH-PARAMS}
-
-    # Docker login VCH1
-    Log To Console  \nRunning docker login developer VCH1...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH1-URL} login -u ${developer} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker login VCH2
-    Log To Console  \nRunning docker login developer2 VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} login -u ${developer2} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag ${image} %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  digest:
-    Should Contain  ${output}  latest:
-    Should Not Contain  ${output}  No such image:
-
-    # Docker delete image in local registry
-    Log To Console  docker rmi local registry...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-    # Make sure the image pushed by VCH1 could be used by VCH2
-    # Docker pull from harbor using VCH2
-    Log To Console  docker pull from dockerhub VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker run image
-    Log To Console  docker run VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} run --name ${container_name} %{HARBOR_IP}/${project}/${image} /bin/ash -c "dmesg;echo END_OF_THE_TEST" 
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-    # Docker rm container
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker create
-    Log To Console  docker create VCH2...
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker ${VCH2-URL} create --name ${container_name} -i %{HARBOR_IP}/${project}/${image} /bin/top
-    Log  ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker start
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker attach 
-    Log To Console  Starting process Docker attach VCH2...
-    Start Process  docker ${VCH2-URL} attach ${container_name} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Log  ${ret}
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-    # Docker start  
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker stop
-    Log To Console  docker stop VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} stop ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker remove
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container_name}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container_name}
-
-    # Docker delete image
-    Log To Console  docker rmi VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-# Test Pos004 Three Client Machines With One Harbor
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md
deleted file mode 100644
index e8c363afa0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.md
+++ /dev/null
@@ -1,99 +0,0 @@
-Test 19-4 - Configuration 4 ESX6.0 VIC Harbor Secured Self Signed CA Cert
-=======
-
-# Purpose:
-To verify the VIC Product (Engine/Harbor) work using self signed certificates with an ESX6.0 server
-
-# References:
-[1 - VIC+Harbor Integration Test Plan](https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=corevc&title=VIC+-+Harbor+Integration+Test+Plan)
-
-# Environment:
-* This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-* Login to Harbor using an LDAP user1 (say admin role)
-* Create a Project named say 'vic-harbor' (publicity off)
-* Login with 2 other LDAP users (say user2, user3) and logout - Limitation (Issue#)
-* Login as user1 and add other users with different roles (developer, guest) under Project 'vic-harbor'
-* Prepare 3 windows client machines (3rd client machine could be a Linux machine as we couldn't figure out the VT-X issue for running docker on Windows 7/10 VM)
-
-# Test Steps:
-###pos001:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Do docker login to harbor using an user with admin role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###pos002:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with developer role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-###neg001:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with guest role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-
-###pos003:
-1. Create a VCH2 with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80)
-2. Using VCH1, Do docker login to harbor registry using a developer user
-3. Using VCH2, Do docker login to harbor registry using another developer user
-4. Using VCH1, Pull an image/application into the local docker registry using local docker in the client machine
-5. Using VCH1, Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH host, Pull the image from Harbor registry
-8. Run the application using docker run command
-9. Stop, Start, attach, kill, rm and rmi
-
-###pos004:
-1. Create a VCH with Harbor private registry as an option (using --insecure-registry <harbor-ip>:80) from any client machine
-2. Using different machines, connect to the same VCH (in parallel)
-3. Do docker login to harbor using different users (in parallel)
-4. Pull an image/application into the local docker registry using local docker in the client machine
-5. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH, Pull same/different images using different users from Harbor registry
-8. Run the applications using different users from Harbor registry (in parallel)
-9. Stop, Start, attach, kill, rm and rmi using different users from Harbor registry (in parallel)
-
-# Expected Outcome:
-###pos001:
-* VCH Creation with Harbor private registry should succeed - Limitation (Issue#)
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos002:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###neg001:
-* Validate that VCH is communicating with Harbor Registry
-* Ensure that the LDAP user with guest role is not able to push images to the Harbor repository but able to pull the image
-
-###pos003:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###pos004:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-# Possible Problems:
-* Not planning on using LDAP at this time, in all cases where LDAP is specified substitute users manually created within the product
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot
deleted file mode 100644
index 73a9a7e287..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-4-Configuration-4-ESX6.0-VIC-Harbor-Secured-SelfSignedCACert.robot
+++ /dev/null
@@ -1,234 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 19-4 - Configuration 4 ESX 6.0 VIC Harbor Secured Self Signed
-Resource  ../../resources/Util.robot
-Suite Setup  19-4-Setup
-Suite Teardown  19-4-Teardown
-
-*** Variables ***
-${developer}  test-user-developer
-${guest}  test-user-guest
-${password}  Test-password-1
-${newPassword}  Test-new-password-1
-${project}  vic-harbor
-${image}  busybox
-${container_name}  busy
-${tag}  new
-${developerRole}  Developer
-${guestRole}  Guest
-${developerEmail}  developer@test.com
-${developerEmail2}  developer2@test.com
-${guestEmail}  guest@test.com
-${developerFullName}  Vic Developer
-${guestFullName}  Vic Guest
-${comments}  comments
-${developer2}  test-user-developer2
-
-*** Keywords ***
-19-4-Setup
-    Set Environment Variable  ESX_VERSION  3620759
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Environment Variable  TEST_URL_ARRAY  ${esx1-ip}
-    Set Environment Variable  TEST_USERNAME  root
-    Set Environment Variable  TEST_PASSWORD  e2eFunctionalTest
-    Set Environment Variable  BRIDGE_NETWORK  VM Network
-    Set Environment Variable  PUBLIC_NETWORK  "VM Network"
-    Set Environment Variable  TEST_DATACENTER  ${EMPTY}
-    Set Environment Variable  TEST_RESOURCE  ${EMPTY}
-    Set Environment Variable  TEST_TIMEOUT  30m
-    
-    Set Suite Variable  ${ESX1}  ${esx1}
-    Set Suite Variable  ${ESX1-IP}  ${esx1-ip}
-    Set Global Variable  @{list}  ${esx1}
-
-    Install Harbor To Test Server  name=19-4-harbor  protocol=https
-    Log To Console  Harbor installer completed successfully...
-    
-    Install Harbor Self Signed Cert
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${false}
-    Create Project And Three Users For It  developer=${developer}  developer2=${developer2}  developerEmail=${developerEmail}  developerEmail2=${developerEmail2}  developerFullName=${developerFullName}  password=${password}  comments=${comments}  guest=${guest}  developerRole=${developerRole}  guestRole=${guestRole}  project=${project}  public=${False}
-    Remove Environment Variable  DOCKER_HOST
-
-19-4-Teardown
-    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-    ${out}=  Run Keyword And Continue On Failure  Run  govc vm.destroy 19-4-harbor
-    Run Keyword And Continue On Failure  Nimbus Cleanup  ${list}
-
-*** Test Cases ***
-Test Pos001 Admin Operations
-    Basic Docker Command With Harbor  user=admin  password=%{TEST_PASSWORD}  project=${project}  image=${image}  container_name=${container_name}
-
-Test Pos002 Developer Operations
-    Basic Docker Command With Harbor  user=${developer}  password=${password}  project=${project}  image=${image}  container_name=${container_name}
-    
-Test Neg001 Developer Operations
-    # Docker login
-    Log To Console  \nRunning docker login admin...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${guest} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from harbor through VCH, ensure guest could pull
-    Log To Console  docker pull from harbor using VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag %{HARBOR_IP}/${project}/${image} %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image should fail
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  unauthorized: authentication required
-    Should Not Contain  ${output}  digest:
-
-Test Pos003 Two VCH With One Harbor
-    # Add another VC
-    ${VCH1-URL}=  Set Variable  %{VCH-PARAMS}
-
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${false}  cleanup=${false}
-    Remove Environment Variable  DOCKER_HOST
-    ${VCH2-URL}=  Set Variable  %{VCH-PARAMS}
-
-    # Docker login VCH1
-    Log To Console  \nRunning docker login developer VCH1...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH1-URL} login -u ${developer} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker login VCH2
-    Log To Console  \nRunning docker login developer2 VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} login -u ${developer2} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag ${image} %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  digest:
-    Should Contain  ${output}  latest:
-    Should Not Contain  ${output}  No such image:
-
-    # Docker delete image in local registry
-    Log To Console  docker rmi local registry...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-    # Make sure the image pushed by VCH1 could be used by VCH2
-    # Docker pull from harbor using VCH2
-    Log To Console  docker pull from dockerhub VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker run image
-    Log To Console  docker run VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} run --name ${container_name} %{HARBOR_IP}/${project}/${image} /bin/ash -c "dmesg;echo END_OF_THE_TEST" 
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-    # Docker rm container
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker create
-    Log To Console  docker create VCH2...
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker ${VCH2-URL} create --name ${container_name} -i %{HARBOR_IP}/${project}/${image} /bin/top
-    Log  ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker start
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker attach 
-    Log To Console  Starting process Docker attach VCH2...
-    Start Process  docker ${VCH2-URL} attach ${container_name} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Log  ${ret}
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-    # Docker start  
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker stop
-    Log To Console  docker stop VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} stop ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker remove
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container_name}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container_name}
-
-    # Docker delete image
-    Log To Console  docker rmi VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-# Test Pos004 Three Client Machines With One Harbor
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.md
deleted file mode 100644
index ad6a0a7300..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.md
+++ /dev/null
@@ -1,104 +0,0 @@
-Test 19-5 - Configuration 1 VC6.5 ESX6.5 VIC OVA Secured SelfSigned
-=======
-
-# Purpose:
-To verify the VIC Product (Engine/Harbor) work using secure self-signed registry with a VC6.5 and ESX6.5 server
-
-# References:
-[1 - VIC+Harbor Integration Test Plan](https://confluence.eng.vmware.com/pages/viewpage.action?spaceKey=corevc&title=VIC+-+Harbor+Integration+Test+Plan)
-
-# Environment:
-* This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-* Setup the Unified OVA using the OVFTool on the Nimbus cluster
-* Login to Harbor using an LDAP user1 (say admin role)
-* Create a Project named say 'vic-harbor' (publicity off)
-* Login with 2 other LDAP users (say user2, user3) and logout - Limitation (Issue#)
-* Login as user1 and add other users with different roles (developer, guest) under Project 'vic-harbor'
-* Prepare 3 windows client machines (3rd client machine could be a Linux machine as we couldn't figure out the VT-X issue for running docker on Windows 7/10 VM)
-
-# Test Steps:
-###Test Pos001 Admin Operations:
-1. Create a VCH with Harbor private registry as an option (using --registry-ca <harbor-ip>:80)
-2. Do docker login to harbor using an user with admin role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-# Expected Outcome:
-###Test Pos001 Admin Operations:
-* VCH Creation with Harbor private registry should succeed - Limitation (Issue#)
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###Test Pos002 Developer Operations:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with developer role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-6. From VCH host, Pull the image from Harbor registry
-7. Run the application using docker run command
-8. Stop, Start, attach, kill, rm and rmi
-
-# Expected Outcome:
-###Test Pos002 Developer Operations:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###Test Neg001 Developer Operations:
-1. Reuse the VCH created in test Pos001
-2. Do docker login to harbor using an user with guest role
-3. Pull an image/application into the local docker registry using local docker in the client machine
-4. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-5. Push the image/application from local to Harbor Private registry
-
-# Expected Outcome:
-###Test Neg001 Developer Operations:
-* Validate that VCH is communicating with Harbor Registry
-* Ensure that the LDAP user with guest role is not able to push images to the Harbor repository but able to pull the image
-
-###Test Pos003 Two VCH With One Harbor:
-1. Create a VCH2 with Harbor private registry as an option (using --registry-ca <harbor-ip>:80)
-2. Using VCH1, Do docker login to harbor registry using a developer user
-3. Using VCH2, Do docker login to harbor registry using another developer user
-4. Using VCH1, Pull an image/application into the local docker registry using local docker in the client machine
-5. Using VCH1, Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH host, Pull the image from Harbor registry
-8. Run the application using docker run command
-9. Stop, Start, attach, kill, rm and rmi
-
-# Expected Outcome:
-###Test Pos003 Two VCH With One Harbor:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-###Test Pos004 Three Client Machines With One Harbor:
-1. Create a VCH with Harbor private registry as an option (using --registry-ca <harbor-ip>:80) from any client machine
-2. Using different machines, connect to the same VCH (in parallel)
-3. Do docker login to harbor using different users (in parallel)
-4. Pull an image/application into the local docker registry using local docker in the client machine
-5. Tag the image/application to push it to Harbor private registry using local docker in the client machine
-6. Push the image/application from local to Harbor Private registry
-7. From VCH, Pull same/different images using different users from Harbor registry
-8. Run the applications using different users from Harbor registry (in parallel)
-9. Stop, Start, attach, kill, rm and rmi using different users from Harbor registry (in parallel)
-
-# Expected Outcome:
-###Test Pos004 Three Client Machines With One Harbor:
-* Validate that VCH is communicating with Harbor Registry by doing a docker login (using docker H <vchip>:2375 login <harbor-ip>:80)
-* Ensure that the LDAP user with admin role is able to push and pull images to/from the repository to the local registry
-* Ensure that the application runs in the containerVm and it is functional
-* Ensure that the application tty gets attached and able to delete the ContainerVM and the images
-
-# Possible Problems:
-* Not planning on using LDAP at this time, in all cases where LDAP is specified substitute users manually created within the product
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.robot
deleted file mode 100644
index 092b51c5fe..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-5-Configuration-1-VC6.5-ESX6.5-VIC-OVA-Harbor-Secured-SelfSignedCACert.robot
+++ /dev/null
@@ -1,233 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 19-5 - Configuration 1 VC6.5 ESX6.5 VIC OVA Secured SelfSigned
-Resource  ../../resources/Util.robot
-Suite Setup  19-5-Setup-OVA-Harbor-Secured-SelfSigned
-Suite Teardown  19-5-Teardown-OVA-Harbor-Secured-SelfSigned
-
-*** Variables ***
-${developer}  test-user-developer
-${guest}  test-user-guest
-${password}  harbor-admin-passwd
-${newPassword}  Test-new-password-1
-${project}  vic-harbor
-${image}  busybox
-${container_name}  busy
-${tag}  new
-${developerRole}  Developer
-${guestRole}  Guest
-${developerEmail}  developer@test.com
-${developerEmail2}  develope2@test.com
-${guestEmail}  guest@test.com
-${developerFullName}  Vic Developer
-${guestFullName}  Vic Guest
-${comments}  comments
-${developer2}  test-user-developer2
-
-*** Keywords ***
-19-5-Setup-OVA-Harbor-Secured-SelfSigned
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc_ip}=  Create a Simple VC Cluster
-    Set Global Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /ha-datacenter/host/cls/Resources
-    Set Environment Variable  TEST_DATACENTER  /ha-datacenter
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    
-    Deploy VIC-OVA To Test Server  protocol=https
-    Create Project And Three Users For It  developer=${developer}  developer2=${developer2}  developerEmail=${developerEmail}  developerEmail2=${developerEmail2}  developerFullName=${developerFullName}  password=${password}  userPassword=${newPassword}  comments=${comments}  guest=${guest}  developerRole=${developerRole}  guestRole=${guestRole}  project=${project}  public=${False}
-    Install Harbor Self Signed Cert
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${False} 
-    Remove Environment Variable  DOCKER_HOST
-
-19-5-Teardown-OVA-Harbor-Secured-SelfSigned
-    Run Keyword And Continue On Failure  Cleanup VIC Appliance On Test Server
-    ${out}=  Run Keyword And Continue On Failure  Run  govc vm.destroy 19-1-harbor
-    Run Keyword And Continue On Failure  Nimbus Cleanup  ${list}  ${true}  ${true}
-
-*** Test Cases ***
-Test Pos001 Admin Operations
-    Basic Docker Command With Harbor  user=admin  password=${password}  project=${project}  image=${image}  container_name=${container_name}
-
-Test Pos002 Developer Operations
-    Basic Docker Command With Harbor  user=${developer}  password=${newPassword}  project=${project}  image=${image}  container_name=${container_name}
-    
-Test Neg001 Developer Operations
-    # Docker login
-    Log To Console  \nRunning docker login guest...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker login -u ${guest} -p ${newPassword} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from harbor through VCH, ensure guest could pull
-    Log To Console  docker pull from harbor using VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag %{HARBOR_IP}/${project}/${image} %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image should fail
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}:${tag}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  unauthorized: authentication required
-    Should Not Contain  ${output}  digest:
-
-Test Pos003 Two VCH With One Harbor
-    # Add another VC
-    ${VCH1-URL}=  Set Variable  %{VCH-PARAMS}
-
-    Install VIC Appliance To Test Server  vol=default --registry-ca=/etc/docker/certs.d/%{HARBOR_IP}/ca.crt  certs=${False}
-    Remove Environment Variable  DOCKER_HOST
-    ${VCH2-URL}=  Set Variable  %{VCH-PARAMS}
-
-    # Docker login VCH1
-    Log To Console  \nRunning docker login developer VCH1...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH1-URL} login -u ${developer} -p ${newPassword} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker login VCH2
-    Log To Console  \nRunning docker login developer2 VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} login -u ${developer2} -p ${newPassword} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag ${image} %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  digest:
-    Should Contain  ${output}  latest:
-    Should Not Contain  ${output}  No such image:
-
-    # Docker delete image in local registry
-    Log To Console  docker rmi local registry...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-    # Make sure the image pushed by VCH1 could be used by VCH2
-    # Docker pull from harbor using VCH2
-    Log To Console  docker pull from dockerhub VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker run image
-    Log To Console  docker run VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} run --name ${container_name} %{HARBOR_IP}/${project}/${image} /bin/ash -c "dmesg;echo END_OF_THE_TEST" 
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-    # Docker rm container
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker create
-    Log To Console  docker create VCH2...
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker ${VCH2-URL} create --name ${container_name} -i %{HARBOR_IP}/${project}/${image} /bin/top
-    Log  ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker start
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker attach 
-    Log To Console  Starting process Docker attach VCH2...
-    Start Process  docker ${VCH2-URL} attach ${container_name} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Log  ${ret}
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-    # Docker start  
-    Log To Console  docker start VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker stop
-    Log To Console  docker stop VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} stop ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker remove
-    Log To Console  docker rm VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container_name}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container_name}
-
-    # Docker delete image
-    Log To Console  docker rmi VCH2...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${VCH2-URL} rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-Test Pos004 Three Client Machines With One Harbor
-    Pass execution  Test not implemented WIP
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-6-Trusted-Content.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-6-Trusted-Content.md
deleted file mode 100644
index b382b4eb32..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-6-Trusted-Content.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Test 19-6 Trusted Content
-=======
-
-# Purpose:
-To verify that the trusted content feature of VIC product works across Admiral, Harbor, and Engine
-
-# References:
-[1- VIC Trusted Content Feature](TBD - waiting on official docs to link)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install VIC OVA into the vSphere server
-2. Register Harbor as a registry with Admiral
-3. Populate the harbor instance with images that can be pulled
-4. Install a VCH into the same VC environment via vic-machine with the harbor instance added as a secure registry but only docker hub whitelisted
-5. Do a docker pull from docker hub that should succeed
-6. Do a docker login/pull from the harbor instance that should fail
-7. Add the VCH as a cluster to Admiral in the default project
-8. Enable content trust in the default project of Admiral
-9. Do a docker pull from docker hub that should succeed
-10. Do a docker login/pull from the harbor instance that should now succeed
-11. Disable content trust in the default project of Admiral
-12. Do a docker pull from docker hub that should succeed
-13. Do a docker login/pull from the harbor instance that should now fail again
-14. Create a new project in Admiral called 'definitely-not-default'
-15. Enable content trust in the new project
-16. Remove the VCH cluster from the default project and add it into the new project
-17. Do a docker pull from docker hub that should succeed
-18. Do a docker login/pull from the harbor instance that should now succeed again
-19. Remove the VCH from all projects that it is still in within Admiral
-20. Do a docker pull from docker hub that should fail since whitelist mode is enabled and docker hub is still not explicitly added
-21. Do a docker login/pull from the harbor instance that should still succeed
-
-# Expected Outcome:
-Admiral and Engine should work together to obey the enable content trust feature properly.  When the VCH is within a project that has content trust enabled then users should be able to successfully pull from the Harbor instance
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-7-New-Install-12.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-7-New-Install-12.md
deleted file mode 100644
index 4e766bf37e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-7-New-Install-12.md
+++ /dev/null
@@ -1,35 +0,0 @@
-Test 19-7 New Install of VIC 1.2
-=======
-
-# Purpose:
-To verify that the install process of VIC 1.2 works and provides a properly functioning system
-
-# References:
-[1- VIC 1.2 Install](TBD - waiting on official docs to link)
-
-# Environment:
-This test requires that a vCenter server is running and available
-
-# Test Steps:
-1. Download the VIC 1.2 OVA from:
-[OVA Releases](https://console.cloud.google.com/storage/browser/vic-product-ova-releases/?project=eminent-nation-87317&authuser=1)
-2. Walk through the standard OVA install process - setting the appliance password, registry passwords and engine admin username
-3. Finish the OVA install process and power on the new VM
-4. Log into the admiral portal
-5. Add the harbor instance as a registry within admiral
-6. Download the root certificate from harbor
-7. Navigate to the demo VCH page
-8. Configure and install a basic VCH
-9. Add the harbor and VCH instances into the default cluster within admiral and enable trusted content in order to whitelist the harbor registry
-10. Using a mix of command line and admiral, deploy a variety of containers
-11. Verify the VIC UI portlet is installed by default and works as expected in the vSphere UI
-12. Remove each of the containers created
-13. Delete the VCH
-14. Delete the OVA VM
-
-# Expected Outcome:
-* All steps should succeed without error
-* Step 14 should result in no lingering artifacts in the environment, nothing in the datastore, networks, host, resource pool, etc.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-8-VIC-Upgrade.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-8-VIC-Upgrade.md
deleted file mode 100644
index ccc7ed2677..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-8-VIC-Upgrade.md
+++ /dev/null
@@ -1,226 +0,0 @@
-Test 19-8 VIC Upgrade
-=======
-
-# Purpose:
-To verify VIC upgrade works and provides access to all of the vSphere Integrated Containers components.
-
-# References:
-[Official OVA download](https://my.vmware.com/en/web/vmware/info/slug/datacenter_cloud_infrastructure/vmware_vsphere_integrated_containers/1_2)
-
-[GCP Releases](https://console.cloud.google.com/storage/browser/vic-product-ova-releases?project=eminent-nation-87317&authuser=0)
-
-[VIC Engine Releases](https://console.cloud.google.com/storage/browser/vic-engine-releases?project=eminent-nation-87317&authuser=0)
-
-[OVA Smoke Test](https://confluence.eng.vmware.com/pages/viewpage.action?pageId=242300713)
-
-# Common Environment Setup:
-* These tests requires that a vCenter server is running and available with DRS enabled.
-
-# Test Template
-### Test Steps:
-1. Deploy **[Deploy Old OVA Link]** previous version **[OVA Old Version]** of OVA of the vSphere Integrated Containers appliance
-2. Go to URL http://<appliance_IP> in browser
-3. Login to management portal using the credentials set during OVA deployment
-4. Go to **[Root Cert Path]** and download root certificate file
-5. Get respective version of VIC engine binaries by downloading from the link in the Getting Started page (`https://<appliance_IP>:9443`)
-6. Copy downloaded root cert to the same dir as vic engine binaries
-7. On vic engine binaries dir, run **[VCH Create Command]** to create VCH
-8. Go back to management portal, add newly created VCH as a new host
-9. Add harbor registry to management portal
-    - Go to **[Add Registry Path]**
-    - Provide appliance IP as "Address"
-    - Create new credentials for harbor and use it
-10. Copy root cert to docker dir
-    - `sudo mkdir -p /etc/docker/certs.d/<appliance_ip>`
-    - `sudo mv ca.crt /etc/docker/certs.d/<appliance_ip>/ca.crt`
-11. Tag and Push docker image to harbor registry
-    - `docker pull busybox`
-    - `docker tag busybox <appliance_ip>/<default_harbor_project>/busybox:test`
-    - `docker login <appliance_ip> --username <username_set_during_deployment> --password <password_set_during_deployment>`
-    - `docker push <appliance_ip>/<default_harbor_project>/busybox:test`
-12. Create containers from the image in harbor
-    - Go to **[Create Container Path]**
-    - Search for recently pushed image in harbor "<appliance_ip>/<default_harbor_project>/busybox:test" and create container using it
-    - Make sure container is running
-13. Create container from Docker hub
-    - Go to **[Create Container Path]**
-    - Search for photon image and create container using it
-    - Make sure container is running
-14. Shut down guest OS (don't power off) deployed version **[OVA Old Version]** of OVA
-15. Deploy **[Deploy New OVA Link]** new version **[OVA New Version]** of OVA of the vSphere Integrated Containers appliance (Don't power on yet)
-16. Follow procedure steps in **[Upgrade OVA Link]** to swap disks and upgrade OVA
-17. Power on new version of deployed OVA appliance and note down the IP
-18. Go to URL http://<appliance_IP> in browser
-19. Verify that the VCH added as a host in step 8 should be present in the upgraded OVA.
-20. Verify that harbor registry added in step 9 is available
-21. Verify that the image pushed in step 11 is available in harbor registry
-22. Verify that the containers created in steps 12 and 13 are still available and running
-23. Cleanup
-    - Remove each of the containers created
-    - Delete VCH
-    - Delete new and old OVA VM
-
-### Expected Outcome:
-* All steps should succeed without error
-
-### Possible Problems:
-* None
-
-
-Test - Upgrade from OVA 1.1.1 to 1.2.0
-======================================
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.1.1
-
-**[Root Cert Path]** Admin > Download Root Cert
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Templates > Registries > Add
-
-**[Create Container Path]** Templates > Containers > Create
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA New Version]** 1.2.0
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/upgrade_appliance.html)
-
-
-Test - Upgrade from OVA 1.1.1 to 1.2.1
-======================================
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.1.1
-
-**[Root Cert Path]** Admin > Download Root Cert
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Templates > Registries > Add
-
-**[Create Container Path]** Templates > Containers > Create
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA New Version]** 1.2.1
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/upgrade_appliance.html)
-
-
-Test - Upgrade from OVA 1.2.0 to 1.2.1
-======================================
-
-> Note: Ignore step 9 (do not apply here)
-
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.2.0
-
-**[Root Cert Path]** Administration > Configuration > Registry Root Certificate
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Administration > Registries > +Registry
-
-**[Create Container Path]** Home > Containers > +Container
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA New Version]** 1.2.1
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/upgrade_appliance.html)
-
-
-Test - Upgrade from OVA 1.2.0 to 1.3.0
-======================================
-
-> Note: Ignore step 9 (do not apply here)
-
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.2.0
-
-**[Root Cert Path]** Administration > Configuration > Registry Root Certificate
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Administration > Registries > +Registry
-
-**[Create Container Path]** Home > Containers > +Container
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](TBD - waiting on official docs to link)
-
-**[OVA New Version]** 1.3.0
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](TBD - waiting on official docs to link)
-
-
-Test - Upgrade from OVA 1.2.1 to 1.3.0
-======================================
-
-> Note: Ignore step 9 (do not apply here)
-
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.2.1
-
-**[Root Cert Path]** Administration > Configuration > Registry Root Certificate
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Administration > Registries > +Registry
-
-**[Create Container Path]** Home > Containers > +Container
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](TBD - waiting on official docs to link)
-
-**[OVA New Version]** 1.3.0
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](TBD - waiting on official docs to link)
-
-
-Test - Upgrade from OVA 1.1.1 to 1.2.0 to 1.2.1 to 1.3.0
-========================================================
-
-> Note: Ignore step 23 (do not run it for this test) and continue with additional test steps in this test.
-
-**[Deploy Old OVA Link]** [Deploy Old OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.1/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA Old Version]** 1.1.1
-
-**[Root Cert Path]** Admin > Download Root Cert
-
-**[VCH Create Command]** `./vic-machine-linux create -t <vcenter_IP> -u <vcenter_username> -p <vcenter_password> --image-store <datastore> --bridge-network <bridge_network> --public-network <network> --registry-ca ca.crt --no-tlsverify --force`
-
-**[Add Registry Path]** Templates > Registries > Add
-
-**[Create Container Path]** Templates > Containers > Create
-
-**[Deploy New OVA Link]** [Deploy New OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/deploy_vic_appliance.html)
-
-**[OVA New Version]** 1.2.0
-
-**[Upgrade OVA Link]** [Upgrade OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/upgrade_appliance.html)
-
-### Additional Test Steps:
-a.  Shut down previous version 1.2.0 of OVA appliance
-
-b.  Rerun steps 15 to 22 with the following variables:
-
-- **[Deploy New OVA Link]** [Deploy New OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/deploy_vic_appliance.htm)
-
-- **[OVA New Version]** 1.2.1
-
-- **[Upgrade OVA Link]** [Upgrade OVA Link](https://vmware.github.io/vic-product/assets/files/html/1.2/vic_vsphere_admin/upgrade_appliance.html)
-
-c.  Shut down previous version 1.2.1 of OVA appliance
-
-b.  Rerun steps 15 to 23 with the following variables:
-
-- **[Deploy New OVA Link]** [Deploy New OVA Link](TBD - waiting on official docs to link)
-
-- **[OVA New Version]** 1.3.0
-
-- **[Upgrade OVA Link]** [Upgrade OVA Link](TBD - waiting on official docs to link)
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-9-VIC-SSO.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-9-VIC-SSO.md
deleted file mode 100644
index 168664cc7d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group19-VIC-Product/19-9-VIC-SSO.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Test 19-9 VIC SSO
-=======
-
-# Purpose:
-To verify that the SSO and session management features of VIC product works across Admiral, Harbor, and Engine
-
-# References:
-[1- VIC SSO Feature](TBD - waiting on official docs to link)
-
-# Environment:
-This test requires that a vCenter server with integrated PSC and with a discrete PSC is running and available
-
-# Test Steps:
-1. Download and install the VIC OVA from here:
-[OVA Releases](https://console.cloud.google.com/storage/browser/vic-product-ova-releases/?project=eminent-nation-87317&authuser=1)
-2. Navigate to the getting started page at https://<VIC>:9443
-3. Login into the vCenter using incorrect credentials
-4. Navigate to the admiral and demo VCH pages
-5. Login into the vCenter using correct credentials
-6. Navigate to the admiral and demo VCH pages
-7. Wait 10 minutes
-8. Navigate to the admiral and demo VCH pages
-9. Wait another 50 minutes (60 minutes total)
-10. Navigate to the admiral and demo VCH pages and attempt to make a change in admiral
-
-# Expected Outcome:
-* Steps 1,2,5-8 should all succeed without error
-* Step 3 should result in error and prompt the user for the correct credentials again
-* Step 4 should fail and the user should be redirected to the fileserver page in order to login correctly
-* Step 6 and 8 should succeed and the user should not be prompted for login credentials to any of the pages
-* Step 10 should fail and the user should be prompted for login credentials again
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.md
deleted file mode 100644
index 6719350feb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 20-1 - Appliance OS Security Audit
-======
-
-# Purpose:
-To detect known OS security issues and warnings
-
-# References:
-[1 - Lynis Reference](https://cisofy.com/documentation/lynis/#using_lynis)
-
-# Environment:
-* requires a working VCSA setup with VCH installed
-* Target VCSA has Bash enabled for the root account
-
-# Test Steps:
-1. Provision lynis and its dependencies on appliance over ssh
-2. run lynis audit system # More customizations can be added in future from here
-3. copy lynis log and report under /var/log/ to current directory
-
-# Expected Outcome:
-* Each step should return success
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.robot
deleted file mode 100644
index 07ff49abd7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/20-1-Appliance-Audit.robot
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 20-01 - Appliance-Audit
-Suite Setup  Setup Test Environment
-Suite Teardown  Clean up VIC Appliance And Local Binary
-Resource  ../../resources/Util.robot
-
-*** Keywords ***
-Setup Test Environment
-    [Arguments]  ${version}=${EMPTY}
-    Run Keyword If  '${version}' == '${EMPTY}'  Install VIC Appliance To Test Server
-    Run Keyword Unless  '${version}' == '${EMPTY}'  Install VIC with version to Test Server  ${version}
-    Run Keyword If  '${version}' == '${EMPTY}'  Enable VCH SSH
-    Run Keyword Unless  '${version}' == '${EMPTY}'  Enable VCH SSH  vic/vic-machine-linux
-
-Provision lynis
-    [Arguments]  ${target}=%{VCH-IP}  ${user}=root  ${password}=%{TEST_PASSWORD}
-    Log To Console  \nProvision lynis to vch appliance...
-    Open Connection  ${target}
-    Login  ${user}  ${password}
-    ${output}  ${rc}=  Execute Command  rpm --rebuilddb  return_stdout=True  return_rc=True
-    Should Be Equal As Integers  ${rc}  0
-    ${output}  ${rc}=  Execute Command  tdnf install -y yum  return_stdout=True  return_rc=True
-    Should Be Equal As Integers  ${rc}  0
-    ${output}  ${rc}=  Execute Command  yum install -y awk sed git  return_stdout=True  return_rc=True
-    Should Be Equal As Integers  ${rc}  0
-    ${output}  ${rc}=  Execute Command  cd /usr/local && git clone https://github.com/CISOfy/lynis  return_stdout=True  return_rc=True
-    Should Be Equal As Integers  ${rc}  0
-
-Lynis Audit System
-    [Arguments]  ${target}=%{VCH-IP}  ${user}=root  ${password}=%{TEST_PASSWORD}  ${lynis_path}=/usr/local/lynis
-    Log To Console  \nBegin auditing appliance...
-    Open Connection  ${target}
-    Login  ${user}  ${password}
-    ${output}  ${rc}=  Execute Command  cd ${lynis_path} && ./lynis audit system  return_stdout=True  return_rc=True
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  sshpass -p '${password}' scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${user}@${target}:/var/log/lynis* .
-    Should Be Equal As Integers  ${rc}  0
-    
-*** Test Cases ***
-Appliance Audit
-    Provision lynis
-    Lynis Audit System
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/TestCases.md
deleted file mode 100644
index fcc4603425..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group20-Security/TestCases.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Group 20 - Security
-=======
-
-[Test 20-1 - Appliance Audit](20-1-Appliance-Audit.md)
--
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.md
deleted file mode 100644
index 4bd53f4f5a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.md
+++ /dev/null
@@ -1,159 +0,0 @@
-Test 21-01 - Whitelist Registries
-=======
-
-# Purpose:
-To verify that VIC appliance can whitelist registries
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-Test Case -- Basic whitelisting
-=========
-
-##Test Steps:
-1. Use ovftool to deploy two harbor server, one using HTTP, the other HTTPS
-2. Deploy VIC appliance to vSphere server with vic-machine and --whitelist-registry and --registry-ca options
-3. Issue docker info
-4. Issue docker login against the whitelist registry
-5. Issue docker pull against the whitelist registry
-6. Issue docker login against the whitelist registry:443
-7. Issue docker pull against the whitelist registry:443
-8. Issue docker login against docker.io
-9. Issue docker pull against docker.io
-10. Tear down VCH
-
-##Expected Outcome:
-* Step 2 has no Warning for registry and whitelist registries are listed and were confirmed
-* Step 3 have docker hub for registry and whitelist registries listed
-* Step 4-5 succeeds
-* Step 6-7 succeeds.  VCH should not care if port is added at the end of docker operation or vic-machine creation
-* Step 8-9 fails and return a message containing 'Access denied to unauthorized registry'
-
-Test Case -- Insecure Registry Login With HTTP
-=========
-1. Install VCH w/o specifying the insecure registry
-2. Try to log in / pull with docker -- expect failure 
-3. Destroy the VCH
-4. Install a new VCH and specify insecure registry w/ insecure HTTP
-5. Try to log in / pull with docker -- expect success 
-6. Destroy the VCH
-
-Test Case -- Configure Registry CA
-=========
-This test ensures that we can change the registry CA cert installed on the VCH
-1. Install a new VCH without specifying a registry CA
-2. Try to log in (should fail)
-3. Use vic-machine configure --registry-ca to add the CA to the appliance
-4. Try to log in & pull (should succeed)
-5. Run vic-machine configure without --registry-ca to check that no change occurs in this case
-6. Try to log in and pull (should succeed)
-5. Tear down VCH
-
-
-Test Case -- Basic whitelisting with NO certs
-=========
-1. Deploy VIC appliance to vSphere server with vic-machine and --whitelist-registry and NO --registry-ca options
-2. Issue docker login against the whitelist registry
-3. Issue docker pull against the whitelist registry
-4. Tear down VCH
-
-##Test Steps:
-* Step 1 has a warning the registry cannot be confirmed
-* Step 2-3 fails
-
-##Possible Problems:
-None
-
-
-Test Case -- Whitelist + HTTP Insecure-registry
-=========
-
-##Test Steps:
-1. Deploy VIC appliance to vSphere server with vic-machine and --registry-ca, --whitelist-registry and --insecure-registry options with NON-overlapping whitelist and insecure servers and one fake registry
-2. Issue docker info
-3. Issue docker login against the whitelist registry
-4. Issue docker pull against the whitelist registry
-5. Issue docker login against the insecure registry
-6. Issue docker pull against the insecure registry
-7. Issue docker login against docker.io
-8. Issue docker pull against docker.io
-9. Tear down VCH
-
-##Expected Outcome:
-* Step 1 has no warnings for registry, whitelist registries are listed and includes all whitelist and insecure servers
-* Step 2 have docker hub, whitelist registries and have insecure registries listed
-* Step 3-6 succeeds
-* Step 7-8 fails and return a message containing 'Access denied to unauthorized registry'
-
-##Possible Problems:
-None
-
-
-Test Case -- Whitelist + overlapping HTTP Insecure-registry with certs
-=========
-
-1. Deploy VIC appliance to vSphere server with vic-machine and --registry-ca, --whitelist-registry and --insecure-registry options with the same servers for both
-2. Issue docker info
-3. Issue docker login against the registry
-4. Issue docker pull against a public library on the registry
-5. Tear down VCH
-
-##Expected Outcome:
-* Step 1 has no warnings for registry, whitelist registries are listed, and the registry was confirmed as insecure
-* Step 2 have docker hub, whitelist registries and have insecure registries listed
-* Step 3-4 succeeds
-
-##Possible Problems:
-None
-
-
-Test Case -- Whitelist + overlapping HTTP Insecure-registry with NO certs
-=========
-
-1. Deploy VIC appliance to vSphere server with vic-machine and --whitelist-registry and --insecure-registry options with the same servers for both
-2. Issue docker login against the overlapping registry
-3. Issue docker pull against a public library on the registry
-4. Tear down VCH
-
-##Expected Outcome:
-* Step 1 has no warnings for registry, whitelist registries are listed, and the registry was confirmed as insecure
-* Step 2-3 succeeds as insecure-registry modifies the whitelist-registry server
-
-##Possible Problems:
-None
-
-
-Test Case -- Whitelist registry in CIDR format
-=========
-
-1. Deploy VIC appliance to vSphere server with vic-machine and --registry-ca, --whitelist-registry
-2. Issue docker info
-3. Issue docker login against the registry with IP address
-4. Issue docker pull against a public library on the registry with IP address
-5. Tear down VCH
-
-##Expected Outcome:
-* Step 1 have no warnings for registry, whitelist registries are listed, and a message that the registry confirmation was skipped
-* Step 2 have docker hub and whitelist registries listed
-* Step 3-4 succeeds
-
-##Possible Problems:
-None
-
-
-Test Case -- Whitelist registry in wildcard domain format
-=========
-
-1. Deploy VIC appliance to vSphere server with vic-machine and --registry-ca, --whitelist-registry
-2. Issue docker info
-3. Issue docker login against the registry with IP address
-4. Issue docker pull against a public library on the registry with IP address
-5. Tear down VCH
-
-##Expected Outcome:
-* Step 1 have no warnings for registry, whitelist registries are listed, and a message that the registry confirmation was skipped
-* Step 2 have docker hub and whitelist registries listed
-* Step 3-4 succeeds
-
-##Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot
deleted file mode 100644
index 6060ff8b87..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/21-1-Whitelist.robot
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 21-01 - Whitelist
-Resource  ../../resources/Util.robot
-Resource  ../../resources/Harbor-Util.robot
-Suite Setup  Setup Harbor
-Suite Teardown  Nimbus Cleanup  ${list}
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Simple ESXi Setup
-    ${esx}  ${esx-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  @{list}  ${esx}
-
-    Set Environment Variable  TEST_URL_ARRAY  ${esx-ip}
-    Set Environment Variable  TEST_URL  ${esx-ip}
-    Set Environment Variable  TEST_USERNAME  root
-    Set Environment Variable  TEST_PASSWORD  ${NIMBUS_ESX_PASSWORD}
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  HOST_TYPE  ESXi
-    Remove Environment Variable  TEST_DATACENTER
-    Remove Environment Variable  TEST_RESOURCE
-    Remove Environment Variable  BRIDGE_NETWORK
-    Remove Environment Variable  PUBLIC_NETWORK
-
-Setup Harbor
-    Wait Until Keyword Succeeds  10x  10m  Simple ESXi Setup
-
-    # Install a Harbor server with HTTPS a Harbor server with HTTP
-    Install Harbor To Test Server  protocol=https  name=harbor-https
-    Set Environment Variable  HTTPS_HARBOR_IP  %{HARBOR-IP}
-
-    Install Harbor To Test Server  protocol=http  name=harbor-http
-    Set Environment Variable  HTTP_HARBOR_IP  %{HARBOR-IP}
-
-    Get HTTPS Harbor Certificate
-
-Get HTTPS Harbor Certificate
-    [Arguments]  ${HARBOR_IP}=%{HTTPS_HARBOR_IP}
-    # Get the certificates from the HTTPS server
-    ${out}=  Run  wget --tries=10 --connect-timeout=10 --auth-no-challenge --no-check-certificate --user admin --password %{TEST_PASSWORD} https://${HARBOR_IP}/api/systeminfo/getcert
-    Log  ${out}
-    Move File  getcert  ./ca.crt
-
-*** Test Cases ***
-Basic Whitelisting
-    # Install VCH with registry CA for whitelisted registry
-    ${output}=  Install VIC Appliance To Test Server  vol=default --whitelist-registry=%{HTTPS_HARBOR_IP} --registry-ca=./ca.crt
-    Should Contain  ${output}  Secure registry %{HTTPS_HARBOR_IP} confirmed
-    Should Contain  ${output}  Whitelist registries =
-    Get Docker Params  ${output}  true
-
-    # Check docker info for whitelist info
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Registry Whitelist Mode: enabled
-    Should Contain  ${output}  Whitelisted Registries:
-    Should Contain  ${output}  Registry: registry.hub.docker.com
-
-    # Try to login and pull from the HTTPS whitelisted registry (should succeed)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTPS_HARBOR_IP}
-    Should Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTPS_HARBOR_IP}/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  0
-
-    # Try to login and pull from the HTTPS whitelisted registry with :443 tacked on at the end (should succeed)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTPS_HARBOR_IP}:443
-    Should Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTPS_HARBOR_IP}:443/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  0
-
-    # Try to login and pull from docker hub (should fail)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login --username=victest --password=%{TEST_PASSWORD}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Access denied to unauthorized registry
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull victest/busybox
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Access denied to unauthorized registry
-
-    Cleanup VIC Appliance On Test Server
-
-Check Login to Insecure Registry (http)
-    # Install VCH w/o specifying insecure registry
-    ${output}=  Install VIC Appliance To Test Server  additional-args=--registry-ca=./ca.crt
-    Should Not Contain  ${output}  Insecure registry %{HTTP_HARBOR_IP} confirmed
-    Get Docker Params  ${output}  true
-
-    # Try to login and pull from the HTTP insecure registry (should fail)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTP_HARBOR_IP}
-    Should Not Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTP_HARBOR_IP}/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  1
-
-    Cleanup VIC Appliance On Test Server
-
-    ${output}=  Install VIC Appliance To Test Server  additional-args=--insecure-registry=%{HTTP_HARBOR_IP} --registry-ca=./ca.crt
-    Should Contain  ${output}  Insecure registry %{HTTP_HARBOR_IP} confirmed
-    Get Docker Params  ${output}  true
-
-    # Try to login and pull from the HTTP insecure registry (should succeed)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTP_HARBOR_IP}
-    Should Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTP_HARBOR_IP}/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  0
-
-    Cleanup VIC Appliance On Test Server
-
-Configure Registry CA
-    # Install VCH without registry CA
-    ${output}=  Install VIC Appliance To Test Server
-
-    Should Not Contain  ${output}  Secure registry %{HTTPS_HARBOR_IP} confirmed
-
-    # Try to login to the HTTPS registry (should fail)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTPS_HARBOR_IP}
-    Should Not Contain  ${output}  Succeeded
-
-    # Add the HTTPS registry CA to cert pool with vic-machine configure
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux configure --target %{TEST_URL} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --registry-ca=./ca.crt --thumbprint=%{TEST_THUMBPRINT} --debug=1
-    Should Be Equal As Integers  ${rc}  0
-
-    # Try to login and pull from the HTTPS registry (should succeed)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTPS_HARBOR_IP}
-    Should Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTPS_HARBOR_IP}/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux configure --target %{TEST_URL} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --thumbprint=%{TEST_THUMBPRINT} --debug=1
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Try to login and pull from the HTTPS registry (should succeed)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u admin -p %{TEST_PASSWORD} %{HTTPS_HARBOR_IP}
-    Should Contain  ${output}  Succeeded
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HTTPS_HARBOR_IP}/library/photon:1.0
-    Should Be Equal As Integers  ${rc}  0
-
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/TestCases.md
deleted file mode 100644
index fae0cd74d6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group21-Registries/TestCases.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Group 21 - Registries
-=======
-
-[Test 21-1 - Whitelist](21-1-Whitelist.md)
--
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.md
deleted file mode 100644
index d6682cc517..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Test 5-1 - Distributed Switch
-=======
-
-# Purpose:
-To verify the VIC appliance works in a variety of different vCenter networking configurations
-
-# References:
-[1 - VMware Distributed Switch Feature](https://www.vmware.com/products/vsphere/features/distributed-switch.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter in Nimbus
-2. Deploy three new ESXi hosts with 2 NICs each in Nimbus:
-```nimbus-esxdeploy --nics=2 esx-1 3620759```
-```nimbus-esxdeploy --nics=2 esx-2 3620759```
-```nimbus-esxdeploy --nics=2 esx-3 3620759```
-3. After setting up your govc environment based on the new vCenter deployed, create a new datacenter:
-```govc datacenter.create ha-datacenter```
-4. Add each of the new hosts to the vCenter:
-```govc host.add -hostname=<ESXi IP> -username=<USER> -dc=ha-datacenter -password=<PW> -noverify=true```
-5. Create a new distributed switch:
-```govc dvs.create -dc=ha-datacenter test-ds```
-6. Create three new distributed switch port groups for management and vm network traffic:
-```govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds management```
-```govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds vm-network```
-```govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds bridge```
-7. Add the three ESXi hosts to the portgroups:
-```govc dvs.add -dvs=test-ds -pnic=vmnic1 <ESXi IP1>```
-```govc dvs.add -dvs=test-ds -pnic=vmnic1 <ESXi IP2>```
-```govc dvs.add -dvs=test-ds -pnic=vmnic1 <ESXi IP3>```
-8. Deploy VCH Appliance to the new vCenter:
-```bin/vic-machine-linux create --target=<VC IP> --user=Administrator@vsphere.local --image-store=datastore1 --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --generate-cert=false --password=Admin\!23 --force=true --bridge-network=bridge --compute-resource=/ha-datacenter/host/<ESXi IP 1>/Resources --public-network=vm-network --name=VCH-test```
-9. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-* When you add an ESXi host to the vCenter it will overwrite its datastore name from datastore1 to datastore1 (n)
-* govc requires an actual password so you need to change the default ESXi password before Step 4
-* govc doesn't seem to be able to force a host NIC over to the new distributed switch, thus you need to create the ESXi hosts with 2 NICs in order to use the 2nd NIC for the distributed switch
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.robot
deleted file mode 100644
index bfd4c8382b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-1-Distributed-Switch.robot
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-1 - Distributed Switch
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Distributed Switch Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Variables ***
-${esx_number}=  3
-${datacenter}=  ha-datacenter
-
-*** Keywords ***
-Distributed Switch Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-    Set Suite Variable  ${VC}  ${vc}
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc_ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc_ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ${datacenter}
-    Should Be Empty  ${out}
-
-    Create A Distributed Switch  ${datacenter}
-
-    Create Three Distributed Port Groups  ${datacenter}
-
-    Log To Console  Add ESX host to the VC and Distributed Switch
-    :FOR  ${IDX}  IN RANGE  ${esx_number}
-    \   ${out}=  Run  govc host.add -hostname=@{esx_ips}[${IDX}] -username=root -dc=${datacenter} -password=${NIMBUS_ESX_PASSWORD} -noverify=true
-    \   Should Contain  ${out}  OK
-    \   Wait Until Keyword Succeeds  5x  15 seconds  Add Host To Distributed Switch  @{esx_ips}[${IDX}]
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /ha-datacenter/host/@{esx_ips}[0]/Resources
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  TEST_DATASTORE  datastore1
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.md
deleted file mode 100644
index a601f62c1f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 5-10 - Multiple Datacenter
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter appliance has multiple datacenters
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 different datacenters and a mix of ESX within the datacenters
-2. Install the VIC appliance into one of the datacenters
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.robot
deleted file mode 100644
index 319e90e6f1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-10-Multiple-Datacenter.robot
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-10 - Multiple Datacenters
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple Datacenter Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Multiple Datacenter Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  2
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  ${num_of_esxes} - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 2
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx1-ip}=  Get From List  ${esx-ips}  0
-    ${esx2-ip}=  Get From List  ${esx-ips}  1
-
-    ${esx3}  ${esx4}  ${esx5}  ${vc}  ${esx3-ip}  ${esx4-ip}  ${esx5-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_USER}-${vc}
-
-    Log To Console  Create datacenter2 on the VC
-    ${out}=  Run  govc datacenter.create datacenter2
-    Should Be Empty  ${out}
-    ${out}=  Run  govc host.add -hostname=${esx1-ip} -username=root -dc=datacenter2 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create datacenter3 on the VC
-    ${out}=  Run  govc datacenter.create datacenter3
-    Should Be Empty  ${out}
-    ${out}=  Run  govc host.add -hostname=${esx2-ip} -username=root -dc=datacenter3 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_DATACENTER  /datacenter1
-    Set Environment Variable  GOVC_DATACENTER  /datacenter1
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server  certs=${false}  vol=default
-    Run Regression Tests
-    Remove Environment Variable  TEST_DATACENTER
-    Remove Environment Variable  GOVC_DATACENTER
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.md
deleted file mode 100644
index 830451fbc8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 5-11 - Multiple Cluster
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter appliance has multiple clusters within the datacenter
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 different clusters in a datacenter and a mix of ESX within the clusters
-2. Install the VIC appliance into one of the clusters
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot
deleted file mode 100644
index 8b671da1e6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-11-Multiple-Cluster.robot
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-11 - Multiple Clusters
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple Cluster Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Multiple Cluster Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  2
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  ${num_of_esxes} - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 2
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx1-ip}=  Get From List  ${esx-ips}  0
-    ${esx2-ip}=  Get From List  ${esx-ips}  1
-
-    ${esx3}  ${esx4}  ${esx5}  ${vc}  ${esx3-ip}  ${esx4-ip}  ${esx5-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${esx4}  ${esx5}  %{NIMBUS_USER}-${vc}
-
-    Log To Console  Create cluster2 on the VC
-    ${out}=  Run  govc cluster.create cls2
-    Should Be Empty  ${out}
-    ${out}=  Run  govc cluster.add -hostname=${esx1-ip} -username=root -dc=datacenter1 -cluster=cls2 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create cluster3 on the VC
-    ${out}=  Run  govc cluster.create cls3
-    Should Be Empty  ${out}
-    ${out}=  Run  govc cluster.add -hostname=${esx2-ip} -username=root -dc=datacenter1 -cluster=cls3 -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    
-
-    Install VIC Appliance To Test Server  certs=${false}  vol=default
-
-    Run Regression Tests
-
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.md
deleted file mode 100644
index 3eb044a28b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 5-12 - Multiple VLAN
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter appliance has multiple portgroups on different VLANs within the datacenter
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a distributed virtual switch with 3 portgroups on all different VLANs
-2. Install the VIC appliance into one of the clusters
-3. Run a variety of docker commands on the VCH appliance
-4. Uninstall the VIC appliance
-5. Deploy a new vCenter with a distributed virtual switch with 3 portgroups two on the same VLAN and one on a different VLAN
-6. Install the VIC appliance into one of the clusters
-7. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-Each VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.robot
deleted file mode 100644
index a4a4500e9b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-12-Multiple-VLAN.robot
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-12 - Multiple VLAN
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Multiple VLAN Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-Test Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Multiple VLAN Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  multi-vlan-1  cls
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
-
-*** Test Cases ***
-Test1
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 bridge
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 management
-    Should Contain  ${out}  OK
-
-    Install VIC Appliance To Test Server
-    Run Regression Tests
-
-Test2
-    ${out}=  Run  govc dvs.portgroup.change -vlan 1 bridge
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.change -vlan 2 management
-    Should Contain  ${out}  OK
-
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.md
deleted file mode 100644
index a932448a83..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 5-13 - Invalid ESXi Install
-=======
-
-# Purpose:
-To verify the VIC appliance provides a reasonable error message when you innapropriately target an ESXi inside a VC for the install
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a distributed virtual switch
-2. Attempt to install the VIC appliance into one of the ESXi directly
-
-# Expected Outcome:
-vic-machine create should fail and provide a useful error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.robot
deleted file mode 100644
index eafa7bd652..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-13-Invalid-ESXi-Install.robot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-13 - Invalid ESXi Install
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Invalid ESXi Install Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Invalid ESXi Install Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    Set Suite Variable  ${datacenter}  datacenter1
-    Set Suite Variable  ${cluster}  cls
-
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    Set Suite Variable  ${esx1-ip}  ${esx1-ip}
-    ${esx2}  ${esx2-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX2}  ${esx2}
-    Set Suite Variable  ${esx2-ip}  ${esx2-ip}
-    
-    ${vc}  ${vc-ip}=  Deploy Nimbus vCenter Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${VC}  ${vc}
-    Set Suite Variable  ${vc-ip}  ${vc-ip}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${vc}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ${datacenter}
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create ${cluster}
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Run  govc cluster.add -hostname=${esx1-ip} -username=root -dc=${datacenter} -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc cluster.add -hostname=${esx2-ip} -username=root -dc=${datacenter} -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    
-    Log To Console  Create a distributed switch
-    ${out}=  Run  govc dvs.create -dc=${datacenter} test-ds
-    Should Contain  ${out}  OK
-
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds bridge
-    Should Contain  ${out}  OK
-
-    Log To Console  Add all the hosts to the distributed switch
-    ${out}=  Run  govc dvs.add -dvs=test-ds -pnic=vmnic1 /${datacenter}/host/${cluster}
-    Should Contain  ${out}  OK
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /${datacenter}/host/${cluster}
-    Should Be Empty  ${out}
-
-*** Test Cases ***
-Test
-    ${out}=  Run  bin/vic-machine-linux create --target ${esx1-ip} --user root --password e2eFunctionalTest --no-tls --name VCH-invalid-test --force --timeout 30m
-    Should Contain  ${out}  Target is managed by vCenter server "${vc-ip}", please change --target to vCenter server address or select a standalone ESXi
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.md
deleted file mode 100644
index 03e398a244..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 5-14 - Remove Container OOB
-=======
-
-# Purpose:
-To verify that VIC works properly when a container is removed OOB in VC
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster
-2. Install the VIC appliance into one of the clusters
-3. Run docker run -itd busybox /bin/top
-4. Attempt to remove the container vm OOB
-
-# Expected Outcome:
-Step 4 should result in and error and a message stating that OOB deletion is disabled on VIC
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.robot
deleted file mode 100644
index 765ddde229..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-14-Remove-Container-OOB.robot
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-14 - Remove Container OOB
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Remove Container OOB Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Remove Container OOB Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
-
-*** Test Cases ***
-Docker run an image from a container that was removed OOB
-    Install VIC Appliance To Test Server
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --name removeOOB busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  govc vm.destroy %{VCH-NAME}/removeOOB*
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  govc: ServerFaultCode: The method is disabled by 'VIC'
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.md
deleted file mode 100644
index bc7e7cbbd6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-15 - NFS Datastore
-=======
-
-# Purpose:
-To verify that VIC works properly when a VCH is installed on an NFS based datastore
-
-# References:
-[1 - Best practices for running VMware vSphere on NFS](http://www.vmware.com/content/dam/digitalmarketing/vmware/en/pdf/techpaper/vmware-nfs-bestpractices-white-paper-en.pdf)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster
-2. Deploy an NFS server
-3. Create a new datastore out of a NFS share on the NFS server
-4. Install the VIC appliance into the cluster using the new NFS based datastore
-5. Run a variety of docker operation on the VCH
-
-# Expected Outcome:
-All test steps should complete without error on the NFS based datastore
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.robot
deleted file mode 100644
index b2f36e969a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-15-NFS-Datastore.robot
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-15 - NFS Datastore
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  NFS Datastore Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-NFS Datastore Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx2}  ${esx3}  ${vc}  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}  ${vc-ip}=  Create a Simple VC Cluster  datacenter1  cls1
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  %{NIMBUS_USER}-${vc}
-
-    ${name}  ${ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Append To List  ${list}  ${name}
-
-    ${out}=  Run  govc datastore.create -mode readWrite -type nfs -name nfsDatastore -remote-host ${ip} -remote-path /store /datacenter1/host/cls1
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_DATASTORE  nfsDatastore
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server
-
-    Run Regression Tests
-
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.md
deleted file mode 100644
index 8f40345397..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 5-16 - iSCSI Datastore
-=======
-
-# Purpose:
-To verify that VIC works properly when installed on an iSCSI based datastore
-
-# References:
-[1 - Configuring iSCSI Adapters and Storage](https://pubs.vmware.com/vsphere-55/index.jsp?topic=%2Fcom.vmware.vsphere.storage.doc%2FGUID-C476065E-C02F-47FA-A5F7-3B3F2FD40EA8.html)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster using iSCSI based datastores
-2. Install the VIC appliance into the cluster specifying one of the iSCSI datastores as the image-store
-3. Run a variety of docker commands on the VCH
-
-# Expected Outcome:
-Each step should result in success and each of the docker commands should not return an error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.robot
deleted file mode 100644
index e44f58191c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-16-iSCSI-Datastore.robot
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-16 - iSCSI Datastore
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10s  iSCSI Datastore Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-iSCSI Datastore Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'vic-iscsi-' + str(random.randint(1000,9999))  modules=random
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild ${VC_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-sdrs-iscsi-fullInstall-vcva --runName vic-iscsi
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION}  %{NIMBUS_USER}-vic-iscsi.esx.0  %{NIMBUS_USER}-vic-iscsi.esx.1  %{NIMBUS_USER}-vic-iscsi.iscsi.0
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-vic-iscsi.vcva-${VC_VERSION}
-    ${vc-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.esx.0 | grep %{NIMBUS_USER}-vic-iscsi.esx.0
-    ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-iscsi.esx.1 | grep %{NIMBUS_USER}-vic-iscsi.esx.1
-    ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
-
-    Set Environment Variable  GOVC_URL  ${esx0-ip}
-    Set Environment Variable  GOVC_USERNAME  root
-    Set Environment Variable  GOVC_PASSWORD  e2eFunctionalTest
-    Run  govc host.esxcli network firewall set -e false
-    Set Environment Variable  GOVC_URL  ${esx1-ip}
-    Run  govc host.esxcli network firewall set -e false
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Create A Distributed Switch  vcqaDC
-
-    Create Three Distributed Port Groups  vcqaDC
-
-    Add Host To Distributed Switch  /vcqaDC/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  sharedVmfs-0
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-iSCSI Datastore
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.md
deleted file mode 100644
index 9d4e77a6a5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-17 - FC Datastore
-=======
-
-# Purpose:
-To verify that VIC works properly when a VCH is installed on an Fibre Channel based datastore
-
-# References:
-[1 - Add Fibre Channel Storage](https://pubs.vmware.com/vsphere-4-esx-vcenter/index.jsp?topic=/com.vmware.vsphere.server_configclassic.doc_41/esx_server_config/configuring_storage/t_add_fibre_channel_storage.html)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster
-2. Deploy an FC server
-3. Create a new datastore out of an FC lun on the FC server
-4. Install the VIC appliance into the cluster using the new FC based datastore
-5. Run a variety of docker operation on the VCH
-
-# Expected Outcome:
-All test steps should complete without error on the FC based datastore
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.robot
deleted file mode 100644
index 6709a7cdff..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-17-FC-Datastore.robot
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-17 - FC Datastore
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  FC Datastore Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-FC Datastore Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'vic-fc-' + str(random.randint(1000,9999))  modules=random
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild ${VC_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-sdrs-fc-fullInstall-vcva --runName vic-fc
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION}  %{NIMBUS_USER}-vic-fc.esx.0  %{NIMBUS_USER}-vic-fc.esx.1  %{NIMBUS_USER}-vic-fc.fc.0
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION}
-    ${vc-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.0 | grep %{NIMBUS_USER}-vic-fc.esx.0
-    ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.1 | grep %{NIMBUS_USER}-vic-fc.esx.1
-    ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
-
-    Set Environment Variable  GOVC_URL  ${esx0-ip}
-    Set Environment Variable  GOVC_USERNAME  root
-    Set Environment Variable  GOVC_PASSWORD  e2eFunctionalTest
-    Run  govc host.esxcli network firewall set -e false
-    Set Environment Variable  GOVC_URL  ${esx1-ip}
-    Run  govc host.esxcli network firewall set -e false
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Create A Distributed Switch  vcqaDC
-
-    Create Three Distributed Port Groups  vcqaDC
-
-    Add Host To Distributed Switch  /vcqaDC/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  sharedVmfs-0
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-FC Datastore
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.md
deleted file mode 100644
index 66ac6d5d3e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-18 - Datastore Cluster SDRS
-=======
-
-# Purpose:
-To verify that VIC works properly when a VCH is installed on a datastore cluster
-
-# References:
-[1 - Creating a Datastore Cluster](https://pubs.vmware.com/vsphere-51/index.jsp?topic=%2Fcom.vmware.vsphere.resmgmt.doc%2FGUID-598DF695-107E-406B-9C95-0AF961FC227A.html)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a simple cluster
-2. Create a storage pod or datastore cluster folder
-3. Move several shared datastores into the datastore cluster
-4. Install the VIC appliance into the cluster using the new datastore cluster
-5. Run a variety of docker operation on the VCH
-
-# Expected Outcome:
-All test steps should complete without error on the datastore cluster
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.robot
deleted file mode 100644
index de6cba167d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-18-Datastore-Cluster-SDRS.robot
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-18 - Datastore Cluster SDRS
-Resource  ../../resources/Util.robot
-#Suite Setup  Wait Until Keyword Succeeds  10x  10m  SDRS Datastore Setup
-#Test Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-SDRS Datastore Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    {out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --customizeTestbed '/esx desiredPassword=e2eFunctionalTest' --noSupportBundles --vcvaBuild ${VC_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-sdrs-fc-fullInstall-vcva --runName vic-fc
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION}  %{NIMBUS_USER}-vic-fc.esx.0  %{NIMBUS_USER}-vic-fc.esx.1  %{NIMBUS_USER}-vic-fc.fc.0
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION} | grep %{NIMBUS_USER}-vic-fc.vcva-${VC_VERSION}
-    ${vc-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.0 | grep %{NIMBUS_USER}-vic-fc.esx.0
-    ${esx0-ip}=  Fetch From Right  ${out}  ${SPACE}
-    
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-vic-fc.esx.1 | grep %{NIMBUS_USER}-vic-fc.esx.1
-    ${esx1-ip}=  Fetch From Right  ${out}  ${SPACE}
-
-    Set Environment Variable  GOVC_URL  ${esx0-ip}
-    Set Environment Variable  GOVC_USERNAME  root
-    Set Environment Variable  GOVC_PASSWORD  e2eFunctionalTest
-    Run  govc host.esxcli network firewall set -e false
-    Set Environment Variable  GOVC_URL  ${esx1-ip}
-    Run  govc host.esxcli network firewall set -e false
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Create A Distributed Switch  vcqaDC
-
-    Create Three Distributed Port Groups  vcqaDC
-
-    Add Host To Distributed Switch  /vcqaDC/host/cls
-
-    ${out}=  Run  govc folder.create -pod=true /vcqaDC/datastore/sdrs
-    ${out}=  Run  govc object.mv /vcqaDC/datastore/sharedVmfs-* /vcqaDC/datastore/sdrs
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_DATASTORE  sdrs
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-SDRS Datastore
-    Pass Execution  VIC does not support SDRS yet, see issue #2729
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.md
deleted file mode 100644
index e86d507568..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-19 - ROBO SKU
-=======
-
-# Purpose:
-To verify that VIC works properly when a VCH is installed in a remote office branch office (ROBO) version of vSphere
-
-# References:
-[1 - vSphere Remote Office and Branch Office](http://www.vmware.com/products/vsphere/remote-office-branch-office.html)
-
-# Environment:
-This test requires access to VMware Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with stand alone hosts
-2. Add the ROBO SKU license to the vCenter appliance
-3. Assign the ROBO SKU license to each of the hosts within the vCenter
-4. Install the VIC appliance onto one of the hosts in the vCenter
-5. Run a variety of docker operation on the VCH
-
-# Expected Outcome:
-All test steps should complete without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.robot
deleted file mode 100644
index ba1d71339c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-19-ROBO-SKU.robot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-19 - ROBO SKU
-Resource  ../../resources/Util.robot
-#Suite Setup  Wait Until Keyword Succeeds  10x  10m  ROBO SKU Setup
-#Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-ROBO SKU Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    ${esx2}  ${esx2-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX2}  ${esx2}
-    ${esx3}  ${esx3-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX3}  ${esx3}
-
-    ${vc}  ${vc-ip}=  Deploy Nimbus vCenter Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${VC}  ${vc}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Run  govc host.add -hostname=${esx1-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc host.add -hostname=${esx2-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc host.add -hostname=${esx3-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  ${esx1-ip}
-    Add Host To Distributed Switch  ${esx2-ip}
-    Add Host To Distributed Switch  ${esx3-ip}
-
-    Add Vsphere License  %{ROBO_LICENSE}
-
-    # Assign license to each of the ESX servers
-    Assign Vsphere License  %{ROBO_LICENSE}  ${esx1-ip}
-    Assign Vsphere License  %{ROBO_LICENSE}  ${esx2-ip}
-    Assign Vsphere License  %{ROBO_LICENSE}  ${esx3-ip}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  /ha-datacenter/host/${esx1-ip}/Resources
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  VIC does not support ROBO SKU yet, waiting on a valid license with serial support for this to work
-    #Log To Console  \nStarting test...
-    #Install VIC Appliance To Test Server
-    #Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.md
deleted file mode 100644
index 639b2809b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 5-2 - Cluster
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter appliance is using a cluster
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 ESXi hosts in a cluster:  
-```govc cluster.create cls```
-2. Install the VIC appliance into the cluster using the cluster path as the compute resource:  
-```
---compute-resource /ha-datacenter/host/cls
-```
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.robot
deleted file mode 100644
index 2639d1110b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-2-Cluster.robot
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-2 - Cluster
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Cluster Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Cluster Setup
-    Log To Console  \nWait until Nimbus is at least available...
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Close Connection
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${ESX_VERSION}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc-ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[0] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[1] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[2] -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[0]
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[1]
-    Wait Until Keyword Succeeds  5x  1 minute  Add Host To Distributed Switch  /ha-datacenter/host/cls/@{esx_ips}[2]
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.md
deleted file mode 100644
index e531deb52f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 5-20 - Restore Starting State
-=======
-
-# Purpose:
-To verify that a container that is starting will have it's starting state restored
-during appliance reboot
-
-# Test Steps:
-1. Deploy VCH
-2. Enable ESXi Firewall
-3. Pull busybox
-4. docker run -i busybox
-5. verify run timeout
-6. restart VCH
-7. verify state starting
-
-# Expected Outcome:
-All test steps should complete without error
-
-# Possible Problems:
-Only will work with stand alone esxi
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.robot
deleted file mode 100644
index a3ef638c8c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-20-Restore-Starting-State.robot
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-20 - Restore Starting State
-Resource  ../../resources/Util.robot
-#Suite Setup  Install VIC Appliance To Test Server
-#Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Restore Container Starting State on Restart
-    Pass Execution  Not sure why this test case is here, but it needs to be re-implemented to work in Nimbus
-	# enable firewall
-	Run  govc host.esxcli network firewall set -e true
-	${out}=  Run  docker %{VCH-PARAMS} pull busybox
-	# with enabled firewall this will timeout
-	${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -i busybox
-	#Should Be Equal As Integers  ${rc}  0
-	#${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-	Should Contain  ${container}  deadline
-	${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-	Should Contain  ${out}  Starting
-	# disable firewall
-	Run  govc host.esxcli network firewall set -e false
-	# restart appliance
-	Reboot VM  %{VCH-NAME}
-	# wait for docker info to succeed
-	Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-	# ensure we have a starting container
-	${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-	Should Contain  ${out}  Starting
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.md
deleted file mode 100644
index 49ca6c9e9c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 5-21 - Datastore-Path
-=======
-
-# Purpose:
-To verify that we can specify datastore paths that have spaces.
-Also, to test datastore path with specified DS schemes.
-
-# Environment:
-This test requires an ESX with a deployed VIC Appliance.
-
-# Test Steps:
-1. Deploy Nimbus ESX server and install VCH
-2. Run custom vic-machine create command where we specify an image store with DS scheme included
-3. Rename 'datastore1' to 'datastore (1)'
-4. Install VCH using 'datastore (1)
-5. Run custom vic-machine create command using 'datastore (1)' where we specify an image store with DS scheme
-
-# Expected Outcome:
-1. The VCH should deploy w/o errors
-2. Vic-machine create command should pass when installing using image store with DS scheme included
-3. Renaming of datastore to 'datastore (1)' should succeed
-4. VCH should deploy w/o errors when installing to datastore (1)
-5. Vic-machine create command should pass when installing using image store with DS scheme include and space in path
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.robot
deleted file mode 100644
index 5ba633c000..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-21-Datastore-Path.robot
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation    Test 5-21 - Datastore-Path
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Setup Suite ESX
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Variables ***
-${testDatastoreSpace}=  "datastore (1)"
-${dsScheme}=  ds://
-
-*** Keywords ***
-Setup Suite ESX
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    Set Suite Variable  @{list}  ${esx1}
-
-    Log To Console  Deploy VIC Appliance To ESX
-    Set Environment Variable  TEST_URL_ARRAY  ${esx1-ip}
-    Set Environment Variable  TEST_URL  ${esx1-ip}
-    Set Environment Variable  TEST_USERNAME  root
-    Set Environment Variable  TEST_PASSWORD  ${NIMBUS_ESX_PASSWORD}
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  HOST_TYPE  ESXi
-    Remove Environment Variable  TEST_DATACENTER
-    Remove Environment Variable  TEST_RESOURCE
-    Remove Environment Variable  BRIDGE_NETWORK
-    Remove Environment Variable  PUBLIC_NETWORK
-
-    ${output}=  Install VIC Appliance To Test Server  certs=${false}
-    Should Contain  ${output}  Installer completed successfully
-
-
-*** Test Cases ***
-Datastore - DS Scheme Specified in Volume Store
-    Log To Console  \nStarting DS Scheme in Volume Store Test...
-
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    Log To Console  \nRunning custom vic-machine create - with DS Scheme in Volume Store
-    # Need to run custom vic-machine create to specify volume store with DS scheme
-    ${output}=  Run  bin/vic-machine-linux create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL_ARRAY} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE} --volume-store=${dsScheme}%{TEST_DATASTORE}/images:default --password=%{TEST_PASSWORD} --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --insecure-registry harbor.ci.drone.local --force --kv
-    Should Contain  ${output}  Installer completed successfully
-
-
-Datastore - Space in Path
-    Log To Console  \nStarting Space in Path Test...
-
-    # Rename original TEST_DATASTORE to a datastore with a space in the path
-    ${out}=  Run  govc object.rename /ha-datacenter/datastore/%{TEST_DATASTORE} ${testDatastoreSpace}
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_DATASTORE  ${testDatastoreSpace}
-
-    ${output}=  Install VIC Appliance To Test Server  certs=${false}  vol=default
-    Should Contain  ${output}  Installer completed successfully
-
-
-Datastore - Space in Path with Scheme
-    Log To Console  \nStarting Space in Path with Scheme Test...
-
-    # Rename original TEST_DATASTORE to a datastore with a space in the path: this is a double check
-    ${out}=  Run  govc object.rename /ha-datacenter/datastore/%{TEST_DATASTORE} ${testDatastoreSpace}
-    Should Contain  ${out}  OK
-
-    Set Environment Variable  TEST_DATASTORE  ${testDatastoreSpace}
-
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    Log To Console  \nRunning custom vic-machine create - with DS Scheme in Volume Store with space in path
-    # Need to run custom vic-machine create to specify volume store with DS scheme
-    ${output}=  Run  bin/vic-machine-linux create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL_ARRAY} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE} --volume-store=${dsScheme}%{TEST_DATASTORE}/images:default --password=%{TEST_PASSWORD} --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --insecure-registry harbor.ci.drone.local --force --kv
-    Should Contain  ${output}  Installer completed successfully
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.md
deleted file mode 100644
index cde9807dc7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.md
+++ /dev/null
@@ -1,117 +0,0 @@
-Test 5-22 - NFS Volume
-=======
-
-# Purpose:
-To verify that NFS shared volumes work with currently supported docker commands
-
-# References:
-[1 - Best practices for running VMware vSphere on NFS](http://www.vmware.com/content/dam/digitalmarketing/vmware/en/pdf/techpaper/vmware-nfs-bestpractices-white-paper-en.pdf)
-
-[2 - Docker Command Line Reference - Volume Create](https://docs.docker.com/engine/reference/commandline/volume_create/)
-
-[3 - Docker Command Line Reference - Exec](https://docs.docker.com/engine/reference/commandline/exec/)
-
-[4 - Docker Command Line Reference - Volume Inspect](https://docs.docker.com/engine/reference/commandline/volume_inspect/)
-
-[5 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/volume_ls/)
-
-
-# Environment:
-This test requires access to VMware Nimbus for dynamic ESXi and NFS server creation
-
-# Test Steps:
-1. Deploy VIC appliance to an ESX and use a read only NFS mount point
-2. Issue docker volume create on read only volume
-3. Deploy VIC appliance to an ESX and use fake NFS mount point
-4. Deploy VIC appliance to an ESX and use valid NFS mount point
-5. Issue docker volume create using no name for the volume (unnamed) on VolumeStore=nfsVolumeStore (NFS volume)
-6. Issue docker run -v using unnamed volume and the mount command, run docker wait, then docker rm on container
-7. Issue docker volume create --name=nfs_default_%{VCH-NAME} on VolumeStore=nfsVolumeStore (NFS volume)
-8. Issue docker run -v using unnamed volume and the mount command, run docker wait, then docker rm on container
-9. Issue docker volume create on unnamed volume
-10. Issue docker volume create on named volume
-11. Issue docker volume create --name="test!@\#$%^&*()"
-12. Create container ${createFileContainer} using named nfs volume
-13. Issue docker exec -i ${createFileContainer} echo # --> to write contents to a file (created by this echo command) on NFS volume
-14. Issue docker exec -i ${createFileContainer} ls   # to verify file is created in the correct directory on NFS volume
-15. Issue docker exec -i ${createFileContainer} cat  # to verify contents of the file
-16. Create a container using named nfs volume and echo # to append more contents to the file used by earlier container
-17. Create a container using named nfs volume and echo # to append to the same file
-18. Create a container using named nfs volume and echo # to append to the same file
-19. Create a container using named nfs volume and cat # verify contents of the file
-20. Create a detached container using named nfs volume using named nfs volume to cat the file from last test
-21. Issue docker logs to see the results of the cat command # verify contents of the file
-22. Create a container using named nfs volume and rm the file just used.
-23. Create a container using named nfs volume and cat the file that was just removed
-24. Issue docker start on detached container from earlier
-25. Issue docker logs on detached container
-26. Spin up on container per item in a list to write once a sec to a file the value passed in from the list and save the container ids
-27. Create container using named nfs volume and cat the contents of the file from the previous step
-28. Check output from each container that was writing to the file.
-29. Stop all the running write containers.
-30. Issue docker volume inspect ${nfsNamedVolume}
-31. Issue docker volume ls
-32. Issue docker volume rm ${nfsDefaultVolume}
-33. Issue docker volume rm ${nfsNamedVolume}
-34. Create a container using a standard volume and named NFS volume
-35. Inspect the container to check volume info
-37. Restart the VCH
-38. Inspect the container to check that the volume info is the same as before
-39. Create a detached container using named nfs volume and write to file every second
-40. Create a container using named nfs volume and tail the file from previous step
-41. Kill the NFS Server from Nimbus
-42. Create a container using named nfs volume from killed NFS server and tail the file from previous step
-43. Create a container using named nfs volume from killed NFS server and write to file from previous step
-44. Create a container using named nfs volume from killed NFS server and ls the mydata directory
-
-
-
-# Expected Outcome:
-* Step 1 will pass VCH creation but should fail in mounting the read only NFS mount point
-* Step 2 should result in error with the following error message:
-```
-Error response from daemon: No volume store named (${nfsReadOnlyVolumeStore}) exists
-```
-* Step 3 will pass VCH creation but should fail in mounting the fake NFS mount point
-* Step 4 should complete successfully; VCH should be created/installed
-* Step 5 should complete successfully and return a long string name for the volume created
-* Step 6 should verify that the NFS volume is mounted on a temp container; container rm should succeed
-* Step 7 should complete successfully and return named volume
-* Step 8 same as step 4 but using the named volume instead
-* Step 9 should result in error with the following error message:
-```
-Error response from daemon: A volume named ${nfsDefaultVolume} already exists. Choose a different volume name.
-```
-* Step 10 should result in error with the following error message:
- ```
- Error response from daemon: A volume named ${nfsNamedVolume} already exists. Choose a different volume name.
- ```
-* Step 11 should result in error with the following message:
-```
-Error response from daemon: create test???: "test???" includes invalid characters for a local volume name, only "\[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
-```
-* Steps 12 - 22 should result in success
-* Step 23 should result in error with the following error message:
-```
-cat: can't open 'mydata/test_nfs_file.txt': No such file or directory
-```
-* Step 24 and 25 should succeed, however step 25 will show the same error as above in the logs
-* Steps 26 - 29 should result in success
-* Step 30 should result in a properly formatted JSON response
-* Step 31 should result in each nfs volume being listed with both driver and volume name
-* Step 32 should result in success and the volume should not be listed anymore
-* Step 33 should result in error with the following message:  
-```
-Error response from daemon: volume ${nfsNamedVolume} in use by
-```
-* Steps 34-38 should result in success
-* Steps 39 - 41 should result in success; step 41 should kill/drop the server
-* Step 42 should result in error with the following message:
-```
-Server error from portlayer: unable to wait for process launch status:
-```
-* Steps 43 - 44 should result in error with the rc = 125.
-
-
-# Possible Problems:
-Mount command may be affected by Nimbus's performance returning '' when the volume was successfully created/mounted
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.robot
deleted file mode 100644
index 10c1cb6586..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-22-NFS-Volume.robot
+++ /dev/null
@@ -1,310 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-22 - NFS Volume
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Setup ESX And NFS Suite
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-
-*** Variables ***
-${nfsVolumeStore}=  nfsVolumeStore
-${nfsFakeVolumeStore}=  nfsFakeVolumeStore
-${nfsReadOnlyVolumeStore}=  nfsReadOnlyVolumeStore
-${unnamedNFSVolContainer}  unnamedNFSvolContainer
-${namedNFSVolContainer}  namednfsVolContainer
-${createFileContainer}=  createFileContainer
-${nfs_bogon_ip}=  198.51.100.1
-${mntDataTestContainer}=  mount-data-test
-${mntTest}=  /mnt/test
-${mntNamed}=  /mnt/named
-
-
-*** Keywords ***
-Setup ESX And NFS Suite
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    Log To Console  \nStarting test...
-
-    ${esx1}  ${esx1_ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-
-    ${nfs}  ${nfs_ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-
-    ${nfs_readonly}  ${nfs_readonly_ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  additional-args=--disk 5000000 --disk 5000000 --mountOpt ro --nfsOpt ro --mountPoint=storage1 --mountPoint=storage2
-
-    Set Suite Variable  @{list}  ${esx1}  ${nfs}  ${nfs_readonly}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    Set Suite Variable  ${ESX1_IP}  ${esx1_ip}
-    Set Suite Variable  ${NFS_IP}  ${nfs_ip}
-    Set Suite Variable  ${NFS}  ${nfs}
-    Set Suite Variable  ${NFS_READONLY_IP}  ${nfs_readonly_ip}
-
-Setup ENV Variables for VIC Appliance Install
-    Log To Console  \nSetup Environment Variables for VIC Appliance To ESX\n
-
-    Set Environment Variable  TEST_URL_ARRAY  ${ESX1_IP}
-    Set Environment Variable  TEST_URL  ${ESX1_IP}
-    Set Environment Variable  TEST_USERNAME  root
-    Set Environment Variable  TEST_PASSWORD  ${NIMBUS_ESX_PASSWORD}
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_TIMEOUT  30m
-    Set Environment Variable  HOST_TYPE  ESXi
-    Remove Environment Variable  TEST_DATACENTER
-    Remove Environment Variable  TEST_RESOURCE
-    Remove Environment Variable  BRIDGE_NETWORK
-    Remove Environment Variable  PUBLIC_NETWORK
-
-Verify NFS Volume Basic Setup
-    [Arguments]  ${volumeName}  ${containerName}  ${nfsIP}  ${rwORro}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${containerName} -v ${volumeName}:/mydata ${busybox} mount
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${nfsIP}://store/volumes/${volumeName}
-    Should Contain  ${output}  /mydata type nfs (${rwORro}
-
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${containerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${containerName}
-    Should Be Equal As Integers  ${rc}  0
-
-Verify NFS Volume Already Created
-    [Arguments]  ${containerVolName}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=${containerVolName} --opt VolumeStore=${nfsVolumeStore}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: A volume named ${containerVolName} already exists. Choose a different volume name.
-
-Reboot VM and Verify Basic VCH Info
-    Log To Console  Rebooting VCH\n - %{VCH-NAME}
-    Reboot VM  %{VCH-NAME}
-
-    Log To Console  Getting VCH IP ...
-    ${new_vch_ip}=  Get VM IP  %{VCH-NAME}
-    Log To Console  New VCH IP is ${new_vch_ip}
-    ${updated_vch_ip}=  Replace String  %{VCH-PARAMS}  %{VCH-IP}  ${new_vch_ip}
-    Should Contain  %{VCH-PARAMS}  ${new_vch_ip}
-    Should Be Equal  ${updated_vch_ip}  %{VCH-PARAMS}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${busybox}
-
-
-*** Test Cases ***
-VIC Appliance Install with Read Only NFS Volume
-    Setup ENV Variables for VIC Appliance Install
-
-    # Will only produce a warning in VCH creation output
-    ${output}=  Install VIC Appliance To Test Server  certs=${false}  additional-args=--volume-store="nfs://${NFS_READONLY_IP}/exports/storage1?uid=0&gid=0:${nfsReadOnlyVolumeStore}"
-    Should Contain  ${output}  Installer completed successfully
-    Should Contain  ${output}  VolumeStore (${nfsReadOnlyVolumeStore}) cannot be brought online - check network, nfs server, and --volume-store configurations
-    Should Contain  ${output}  Not all configured volume stores are online - check port layer log via vicadmin
-
-    ${rc}  ${volumeOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --opt VolumeStore=${nfsReadOnlyVolumeStore}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${volumeOutput}  Error response from daemon: No volume store named (${nfsReadOnlyVolumeStore}) exists
-
-VIC Appliance Install With Fake NFS Server
-    Setup ENV Variables for VIC Appliance Install
-
-    # Will only produce a warning in VCH creation output
-    ${output}=  Install VIC Appliance To Test Server  certs=${false}  additional-args=--volume-store="nfs://${nfs_bogon_ip}/store?uid=0&gid=0:${nfsFakeVolumeStore}"
-    Should Contain  ${output}  VolumeStore (${nfsFakeVolumeStore}) cannot be brought online - check network, nfs server, and --volume-store configurations
-
-VIC Appliance Install With Correct NFS Server
-    Setup ENV Variables for VIC Appliance Install
-    Log To Console  \nDeploy VIC Appliance To ESX
-
-    # Should succeed
-    ${output}=  Install VIC Appliance To Test Server  certs=${false}  additional-args=--volume-store="nfs://${NFS_IP}/store?uid=0&gid=0:${nfsVolumeStore}"
-    Should Contain  ${output}  Installer completed successfully
-
-Simple Docker Volume Create
-    #Pull image  ${busybox}
-
-    ${rc}  ${volumeOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --opt VolumeStore=${nfsVolumeStore}
-    Should Be Equal As Integers  ${rc}  0
-
-    Set Suite Variable  ${nfsUnNamedVolume}  ${volumeOutput}
-
-    Verify NFS Volume Basic Setup  ${nfsUnNamedVolume}  ${unnamedNFSVolContainer}  ${NFS_IP}  rw
-
-Docker Volume Create Named Volume
-    ${rc}  ${volumeOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name nfs-volume_%{VCH-NAME} --opt VolumeStore=${nfsVolumeStore}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${volumeOutput}  nfs-volume_%{VCH-NAME}
-
-    Set Suite Variable  ${nfsNamedVolume}  ${volumeOutput}
-
-    Verify NFS Volume Basic Setup  nfs-volume_%{VCH-NAME}  ${namedNFSVolContainer}  ${NFS_IP}  rw
-
-Docker Volume Create Already Named Volume
-    Run Keyword And Ignore Error  Verify NFS Volume Already Created  ${nfsUnNamedVolume}
-
-    Run Keyword And Ignore Error  Verify NFS Volume Already Created  ${nfsNamedVolume}
-
-Docker Volume Create with possibly Invalid Name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name="test!@\#$%^&*()" --opt VolumeStore=${nfsVolumeStore}
-    Should Be Equal As Integers  ${rc}  1
-    Should Be Equal As Strings  ${output}  Error response from daemon: volume name "test!@\#$%^&*()" includes invalid characters, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
-
-Docker Single Write and Read to/from File from one Container using NFS Volume
-    # Done with the same container for this test.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${createFileContainer} -d -v ${nfsNamedVolume}:/mydata ${busybox} /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -i ${createFileContainer} sh -c "echo 'The Texas and Chile flag look similar.\n' > /mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -i ${createFileContainer} sh -c "ls mydata/"
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  test_nfs_file.txt
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -i ${createFileContainer} sh -c "cat mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  The Texas and Chile flag look similar.
-
-Docker Multiple Writes from Multiple Containers (one at a time) and Read from Another
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "echo 'The Chad and Romania flag look the same.\n' >> /mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "echo 'The Luxembourg and the Netherlands flag look exactly the same.\n' >> /mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "echo 'Norway and Iceland have flags that are basically inverses of each other.\n' >> /mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "cat mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  The Texas and Chile flag look similar.
-    Should Contain  ${output}  The Chad and Romania flag look the same.
-    Should Contain  ${output}  The Luxembourg and the Netherlands flag look exactly the same.
-    Should Contain  ${output}  Norway and Iceland have flags that are basically inverses of each other.
-
-Docker Read and Remove File
-    ${rc}  ${catID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "cat mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${catID}
-    Should Contain  ${output}  Norway and Iceland have flags that are basically inverses of each other.
-
-    ${rc}  ${removeID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "rm mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "cat mydata/test_nfs_file.txt"
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  cat: can't open 'mydata/test_nfs_file.txt': No such file or directory
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${catID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${catID}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  cat: can't open 'mydata/test_nfs_file.txt': No such file or directory
-
-Simultaneous Container Write to File
-    @{inputList}=  Create List  These flags also look similar to each other.  Senegal and Mali.  Indonesia and Monaco.  New Zealand and Australia.  Venezuela, Ecuador, and Colombia.  Slovenia, Russia, and Slovakia.
-    ${containers}=  Create List
-
-    Log To Console  \nSpin up Write Containers
-    :FOR  ${item}  IN  @{inputList}
-    \   ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "while true; do echo ${item} >> /mydata/test_nfs_mult_write.txt; sleep 5; done"
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Append To List  ${containers}  ${id}
-
-    ${rc}  ${catOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "tail -40 /mydata/test_nfs_mult_write.txt"
-    Should Be Equal As Integers  ${rc}  0
-
-    Log To Console  \nCheck tail output for write items
-    :FOR  ${item}  IN  @{inputList}
-    \   Should Contain  ${catOutput}  ${item}
-
-    Log To Console  \nStop Write Containers
-    :FOR  ${id}  IN  @{containers}
-    \   ${rc}  ${stopOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${id}
-    \   Should Be Equal As Integers  ${rc}  0
-
-
-Simple Docker Volume Inspect
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume inspect ${nfsNamedVolume}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Name
-    Should Be Equal As Strings  ${id}  ${nfsNamedVolume}
-
-Simple Volume ls Test
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vsphere
-    Should Contain  ${output}  ${nfsNamedVolume}
-    Should Contain  ${output}  ${nfsUnNamedVolume}
-
-    Should Contain  ${output}  DRIVER
-    Should Contain  ${output}  VOLUME NAME
-
-Volume rm Tests
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm ${nfsUnNamedVolume}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  ${nfsUnNamedVolume}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm ${nfsNamedVolume}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: volume ${nfsNamedVolume} in use by
-
-Docker Inspect Mount Data after Reboot
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${mntDataTestContainer} -v ${mntTest} -v ${nfsNamedVolume}:${mntNamed} ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Create check list for Volume Inspect
-    @{checkList}=  Create List  ${mntTest}  ${mntNamed}  ${nfsNamedVolume}
-
-    Verify Volume Inspect Info  Before VM Reboot  ${mntDataTestContainer}  ${checkList}
-
-    # Gather logs before rebooting
-    Run Keyword And Continue On Failure  Gather Logs From Test Server  -before-reboot
-
-    Reboot VM and Verify Basic VCH Info
-
-    Verify Volume Inspect Info  After VM Reboot  ${mntDataTestContainer}  ${checkList}
-
-
-Kill NFS Server
-    ${rc}  ${runningContainer}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "while true; do echo 'Still here...\n' >> /mydata/test_nfs_kill.txt; sleep 2; done"
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${tailOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "tail -5 /mydata/test_nfs_kill.txt"
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${tailOutput}  Still here...
-
-    Kill Nimbus Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${NFS}
-
-    ${status}=  Get State Of Github Issue  5946
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 5-22-NFS-Volume.robot needs to be updated now that Issue #5946 has been resolved
-    # Issue 5946 should provide a better error message for the next three tests
-
-    ${rc}  ${tailOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "tail -5 /mydata/test_nfs_kill.txt"
-    Should Be Equal As Integers  ${rc}  125
-    #Should Contain  ${tailOutput}  Server error from portlayer: unable to wait for process launch status:
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "echo 'Where am I writing to?...\n' >> /mydata/test_nfs_kill.txt"
-    Should Be Equal As Integers  ${rc}  125
-
-    ${rc}  ${lsOutput}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v ${nfsNamedVolume}:/mydata ${busybox} sh -c "ls mydata"
-    Should Be Equal As Integers  ${rc}  125
-    #Should Contain  ${lsOutput}  Server error from portlayer: unable to wait for process launch status:
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.md
deleted file mode 100644
index 7234b3f0bf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Test 5-24 - Non vSphere Local Cluster
-=======
-
-# Purpose:
-To verify that installing a VCH into a VC cluster that does not have vsphere.local domain configured works as expected
-
-# References:
-
-# Environment:
-This test requires access to VMware Nimbus for dynamic vSphere configuration and creation
-
-# Test Steps:
-1. Create a simple vCenter cluster in Nimbus with the domain configured to vic.test instead of vsphere.local
-2. Install a VCH
-3. Run a variety of docker commands
-
-# Expected Outcome:
-* Each step should result in success
-
-# Possible Problems:
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
deleted file mode 100644
index d6ab50cf7b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-24-Non-vSphere-Local-Cluster.robot
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-24 - Non vSphere Local Cluster
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Non vSphere Local Cluster Install Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-Test Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Non vSphere Local Cluster Install Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-
-    Log To Console  \nStarting simple VC cluster deploy...
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc} --dirDomain vic.test
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${ESX_VERSION}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc_ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vic.test
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc_ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create dc1
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${IDX}  IN RANGE  3
-    \   ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[${IDX}] -username=root -dc=dc1 -password=${NIMBUS_ESX_PASSWORD} -noverify=true
-    \   Should Contain  ${out}  OK
-
-    Setup Network For Simple VC Cluster  3  dc1  cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /dc1/host/cls
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_URL_ARRAY  ${vc_ip}
-    Set Environment Variable  TEST_URL  ${vc_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vic.test
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_DATACENTER  /dc1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.md
deleted file mode 100644
index 3c93dab446..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 5-3 - Enhanced Linked Mode
-=======
-
-# Purpose:
-To verify the VIC appliance works in when the vCenter appliance is using enhanced linked mode
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy two new vCenters in Nimbus each with one ESXi host configured
-2. Establish an enhanced link between the two vCenters
-3. Deploy VCH Appliance to the first vCenter cluster, referencing the cluster's own compute resources
-4. Run a variety of docker commands on the VCH appliance
-5. Deploy VCH Appliance to the first vCenter cluster, but reference the second cluster's resources through the enhanced link
-6. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error in both scenarios and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
deleted file mode 100644
index c4f1a55f7d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-3-Enhanced-Linked-Mode.robot
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-3 - Enhanced Linked Mode
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Enhanced Link Mode Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-# Insert elements from dict2 into dict1, overwriting conflicts in dict1 & returning new dict
-Combine Dictionaries
-    [Arguments]  ${dict1}  ${dict2}
-    ${dict2keys}=  Get Dictionary Keys  ${dict2}
-    :FOR  ${key}  IN  @{dict2keys}
-    \    ${elem}=  Get From Dictionary  ${dict2}  ${key}
-    \    Set To Dictionary  ${dict1}  ${key}  ${elem}
-    [Return]  ${dict1}
-
-Enhanced Link Mode Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'els-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
-    Log To Console  \nDeploying Nimbus Testbed: ${name}
-
-    ${pid}=  Run Secret SSHPASS command  %{NIMBUS_USER}  '%{NIMBUS_PASSWORD}'  'nimbus-testbeddeploy --lease=1 --noStatsDump --noSupportBundles --plugin test-vpx --testbedName test-vpx-m2n2-vcva-3esx-pxeBoot-8gbmem --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --runName ${name}'
-
-    &{esxes}=  Create Dictionary
-    ${num_of_esxes}=  Evaluate  3
-    :FOR  ${i}  IN RANGE  3
-    # Deploy some ESXi instances
-    \    &{new_esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${num_of_esxes}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    \    ${esxes}=  Combine Dictionaries  ${esxes}  ${new_esxes}
-
-    # Investigate to see how many were actually deployed
-    \    ${len}=  Get Length  ${esxes}
-    \    ${num_of_esxes}=  Evaluate  3 - ${len}
-
-    # Exit if we've got enough & continue loop if we don't
-    \    Exit For Loop If  ${len} >= 3
-    \    Log To Console  Only got ${len} ESXi instance(s); Trying again
-
-    @{esx-names}=  Get Dictionary Keys  ${esxes}
-    @{esx-ips}=  Get Dictionary Values  ${esxes}
-    ${esx1}=  Get From List  ${esx-names}  0
-    ${esx2}=  Get From List  ${esx-names}  1
-    ${esx3}=  Get From List  ${esx-names}  2
-    ${esx4-ip}=  Get From List  ${esx-ips}  0
-    ${esx5-ip}=  Get From List  ${esx-ips}  1
-    ${esx6-ip}=  Get From List  ${esx-ips}  2
-
-    # Finish test bed deploy
-    ${output}=  Wait For Process  ${pid}
-    Log  ${output.stdout}
-    Log  ${output.stderr}
-    Should Be Equal As Integers  ${output.rc}  0
-    ${output}=  Split To Lines  ${output.stdout}
-    :FOR  ${line}  IN  @{output}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.vc.0' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc1-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.vc.1' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc2-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.0' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx1-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.1' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx2-ip}  ${ip}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  ${name}.esx.2' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${esx3-ip}  ${ip}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${user}-${name}.vc.0  ${user}-${name}.vc.1  ${user}-${name}.vc.2  ${user}-${name}.vc.3  ${user}-${name}.nfs.0  ${user}-${name}.esx.0  ${user}-${name}.esx.1  ${user}-${name}.esx.2
-
-    Remove Environment Variable  GOVC_PASSWORD
-    Remove Environment Variable  GOVC_USERNAME
-    Set Environment Variable  GOVC_INSECURE  1
-    :FOR  ${ip}  IN  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}
-    \   Log To Console  Changing password for ${ip}
-    \   Set Environment Variable  GOVC_URL  root:@${ip}
-    \   Wait Until Keyword Succeeds  10x  3 minutes  Change ESXi Server Password  e2eFunctionalTest
-    \   ${license}=  Run  govc license.ls
-    \   Check License Features
-
-    Set Environment Variable  GOVC_URL  ${vc1-ip}
-    Set Environment Variable  GOVC_USERNAME  administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    
-    ${license}=  Run  govc license.ls
-
-    # First VC cluster
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${ip}  IN  ${esx1-ip}  ${esx2-ip}  ${esx3-ip}
-    \    Log To Console  Adding ${ip} to VC
-    \    ${out}=  Run  govc cluster.add -hostname=${ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    \    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    # Second VC cluster
-    Set Environment Variable  GOVC_URL  ${vc2-ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${ip}  IN  @{esx-ips}
-    \    ${out}=  Run  govc cluster.add -hostname=${ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    \    Should Contain  ${out}  OK
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  GOVC_URL  ${vc1-ip}
-    Set Environment Variable  TEST_URL_ARRAY  ${vc1-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Install VIC Appliance To Test Server
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.md
deleted file mode 100644
index ec04c0be70..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.md
+++ /dev/null
@@ -1,32 +0,0 @@
-Test 5-4 - High Availability
-=======
-
-# Purpose:
-To verify the VIC appliance works in when the vCenter appliance is using high availability
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-[2 - Managing HA Clusters](https://pubs.vmware.com/vsphere-50/index.jsp#com.vmware.wssdk.pg.doc_50/PG_Ch13_Resources.15.9.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 ESXi hosts in a cluster
-2. Enable HA on the cluster:  
-```govc cluster.change -drs-enabled -ha-enabled /ha-datacenter/host/cls```
-3. Deploy a new VCH Appliance to the cluster  
-4. Run a variety of docker commands on the VCH appliance
-5. Create a named volume
-6. Create a container with a mounted anonymous and named volume
-7. Verify that the volumes are still there using inspect before powering off the ESXi
-8. Power off the ESXi host that the VCH is currently running on
-9. Verify that the volumes are still there using inspect after powering off the ESXi
-10. Clean up the created container (docker rm)
-11. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.robot
deleted file mode 100644
index a65f5ecaf2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-4-High-Availability.robot
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-4 - High Availability
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  High Availability Setup
-Suite Teardown  Nimbus Cleanup  ${list}
-Test Teardown  Run Keyword If Test Failed  Gather Logs From Test Server
-
-*** Variables ***
-${esx_number}=  3
-${datacenter}=  ha-datacenter
-${namedVolume}=  named-volume
-${mntDataTestContainer}=  mount-data-test
-${mntTest}=  /mnt/test
-${mntNamed}=  /mnt/named
-
-*** Keywords ***
-Run Regression Test With More Log Information
-    Check ImageStore
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Check ImageStore
-    # Pull an image that has been pulled already
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Check ImageStore
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  busybox
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  /bin/top
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Container Stops  ${container}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Exited
-
-    ${vmName}=  Get VM Display Name  ${container}
-    Wait Until Keyword Succeeds  5x  10s  Check For The Proper Log Files  ${vmName}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  /bin/top
-    Check ImageStore
-
-    # Check for regression for #1265
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${shortname}=  Get Substring  ${container2}  1  12
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    ${lines}=  Get Lines Containing String  ${output}  ${shortname}
-    Should Not Contain  ${lines}  /bin/top
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} rm ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    Check ImageStore
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} rm ${container2}
-    Should Be Equal As Integers  ${rc}  0
-    Check ImageStore
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi busybox
-    Should Be Equal As Integers  ${rc}  0
-    Check ImageStore
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  busybox
-
-    Scrape Logs For The Password
-
-High Availability Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-    Set Suite Variable  ${VC}  ${vc}
-
-    Log To Console  \nStarting test...
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  3  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    Set Suite Variable  @{list}  @{esx_names}[0]  @{esx_names}[1]  @{esx_names}[2]  %{NIMBUS_USER}-${vc}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc_ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc_ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ${datacenter}
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Create A Distributed Switch  ${datacenter}
-
-    Create Three Distributed Port Groups  ${datacenter}
-
-    Log To Console  Add ESX hosts to the cluster
-    :FOR  ${IDX}  IN RANGE  ${esx_number}
-    \   ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[${IDX}] -username=root -dc=${datacenter} -password=${NIMBUS_ESX_PASSWORD} -noverify=true
-    \   Should Contain  ${out}  OK
-
-    Log To Console  Add all the hosts to the distributed switch
-    Wait Until Keyword Succeeds  5x  5min  Add Host To Distributed Switch  /${datacenter}/host/cls
-
-    Log To Console  Enable HA and DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled -ha-enabled /${datacenter}/host/cls
-    Should Be Empty  ${out}
-
-    ${name}  ${ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Append To List  ${list}  ${name}
-
-    ${out}=  Run  govc datastore.create -mode readWrite -type nfs -name nfsDatastore -remote-host ${ip} -remote-path /store /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_RESOURCE  cls
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  nfsDatastore
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Install VIC Appliance To Test Server  certs=${false}  vol=default
-    Run Regression Tests
-
-    # have a few containers running and stopped for when we
-    # shut down the host and HA brings it up again
-    # make sure we have busybox
-    Pull image  busybox
-
-    @{running}=  Create List
-    :FOR  ${index}  IN RANGE  3
-    \     ${rc}  ${c}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd busybox
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Append To List  ${running}  ${c}
-
-    @{stopped}=  Create List
-    :FOR  ${index}  IN RANGE  3
-    \     ${rc}  ${c}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox ls
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Append To List  ${stopped}  ${c}
-
-    Sleep  2 minutes
-
-    ${output}=  Run  govc vm.info %{VCH-NAME}/%{VCH-NAME}
-    @{output}=  Split To Lines  ${output}
-    ${curHost}=  Fetch From Right  @{output}[-1]  ${SPACE}
-
-    ${info}=  Run  govc vm.info \\*
-    Log  ${info}
-
-    Log To Console  \nCreate a named volume and mount it to a container (Mount Inspect Test 1 of 2 - before VCH restart)\n
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=${namedVolume}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${container}  ${namedVolume}
-
-    ${rc}  ${containerMountDataTestID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name=${mntDataTestContainer} -v ${mntTest} -v ${namedVolume}:${mntNamed} busybox
-    Should Be Equal As Integers  ${rc}  0
-
-    # Create check list for Volume Inspect
-    @{checkList}=  Create List  ${mntTest}  ${mntNamed}  ${namedVolume}
-
-    Verify Volume Inspect Info  Before Host Power OFF  ${containerMountDataTestID}  ${checkList}
-
-    # Abruptly power off the host
-    Open Connection  ${curHost}  prompt=:~]
-    Login  root  e2eFunctionalTest
-    ${out}=  Execute Command  poweroff -d 0 -f
-    Close connection
-
-    ${info}=  Run  govc vm.info \\*
-    Log  ${info}
-
-    # Really not sure what better to do here?  Otherwise, vic-machine-inspect returns the old IP address... maybe some sort of power monitoring? Can I pull uptime of the system?
-    Sleep  4 minutes
-    Run VIC Machine Inspect Command
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    ${info}=  Run  govc vm.info \\*
-    Log  ${info}
-
-    Verify Volume Inspect Info  After Host Power OFF  ${containerMountDataTestID}  ${checkList}
-
-    # Remove Mount Data Test Container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${containerMountDataTestID}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${containerMountDataTestID}
-
-    # check running containers are still running
-    :FOR  ${c}  IN  @{running}
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --format '{{.State.Status}}' ${c}
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Should Be Equal  ${output}  running
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${c}
-    \     Should Be Equal As Integers  ${rc}  0
-
-    # check stopped containers are still stopped
-    :FOR  ${c}  IN  @{stopped}
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --format '{{.State.Status}}' ${c}
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Should Be Equal  ${output}  exited
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${c}
-    \     Should Be Equal As Integers  ${rc}  0
-
-Run Regression Tests
-    Run Regression Test With More Log Information
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.md
deleted file mode 100644
index 86583a0f07..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 5-5 - Heterogeneous ESXi
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter appliance is using multiple different ESXi versions
-
-# References:
-[1 - VMware vCenter Server Availability Guide](http://www.vmware.com/files/pdf/techpaper/vmware-vcenter-server-availability-guide.pdf)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with a cluster in Nimbus
-2. Deploy three different ESXi hosts with build numbers(6.0.0u2, 5.5u3, 6.5RC1):
-```3620759``` and ```3029944``` and ```4240417```
-3. Add each host to the cluster
-4. Deploy a VCH appliance to the cluster allowing DRS to manage placement
-5. Run a variety of docker commands on each of the VCH appliances.
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.robot
deleted file mode 100644
index 5984472dfc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-5-Heterogeneous-ESXi.robot
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-1 - Distributed Switch
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Heterogenous ESXi Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Heterogenous ESXi Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid-vc}=  Deploy Nimbus vCenter Server Async  ${vc}
-    Set Suite Variable  @{list}  %{NIMBUS_USER}-${vc}
-
-    Run Keyword And Ignore Error  Cleanup Nimbus PXE folder  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  3029944
-    Append To List  ${list}  ${esx1}
-    
-    Run Keyword And Ignore Error  Cleanup Nimbus PXE folder  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${esx2}  ${esx2-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  5572656
-    Append To List  ${list}  ${esx2}
-
-    Run Keyword And Ignore Error  Cleanup Nimbus PXE folder  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${esx3}  ${esx3-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Append To List  ${list}  ${esx3}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid-vc}  timeout=40 minutes  on_timeout=terminate
-    Log  ${output.stdout}
-    Log  ${output.stderr}
-    ${status}=  Run Keyword And Return Status  Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    # Try again, if the VC failed quickly we might have enough time to try again
-    ${pid-vc}=  Run Keyword Unless  ${status}  Deploy Nimbus vCenter Server Async  ${vc}
-    ${output}=  Run Keyword Unless  ${status}  Wait For Process  ${pid-vc}  timeout=40 minutes  on_timeout=terminate
-    Run Keyword Unless  ${status}  Log  ${output.stdout}
-    Run Keyword Unless  ${status}  Log  ${output.stderr}
-    Run Keyword Unless  ${status}  Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc-ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    Add Host To VCenter  ${esx1-ip}  root  ha-datacenter  e2eFunctionalTest
-    Add Host To VCenter  ${esx2-ip}  root  ha-datacenter  e2eFunctionalTest
-    ${vc-ver}=  Run  govc about | grep Version:
-    ${vc-ver}=  Fetch From Right  ${vc-ver}  ${SPACE}
-    Run Keyword If  '${vc-ver}' == '6.5.0'  Add Host To VCenter  ${esx3-ip}  root  ha-datacenter  e2eFunctionalTest
-
-    Create A Distributed Switch  ha-datacenter
-
-    Create Three Distributed Port Groups  ha-datacenter
-
-    Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-    ${name}  ${ip}=  Deploy Nimbus NFS Datastore  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Append To List  ${list}  ${name}
-
-    ${out}=  Run  govc datastore.create -mode readWrite -type nfs -name nfsDatastore -remote-host ${ip} -remote-path /store /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_DATASTORE  nfsDatastore
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    Install VIC Appliance To Test Server  certs=${false}  vol=default
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.md
deleted file mode 100644
index e2631b3a59..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 5-6-1 - VSAN-Simple
-=======
-
-# Purpose:
-To verify the VIC appliance works with VMware Virtual SAN
-
-# References:
-[1 - VMware Virtual SAN](http://www.vmware.com/products/virtual-san.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter in Nimbus:  
-```--testbedName test-vpx-4esx-virtual-fullInstall-vcva-8gbmem```  
-2. Deploy VCH Appliance to the new vCenter
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-* None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot
deleted file mode 100644
index 45bcb11384..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-1-VSAN-Simple.robot
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-6-1 - VSAN-Simple
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  Simple VSAN Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-Simple VSAN Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'vic-vsan-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --vcfvtBuildPath /dbc/pa-dbc1111/mhagen/ --noSupportBundles --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --esxBuild ${ESX_VERSION} --testbedName vic-vsan-simple-pxeBoot-vcva --runName ${name}
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  .vcva-${VC_VERSION}' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc-ip}  ${ip}
-    \   Exit For Loop If  ${status}
-
-    Set Suite Variable  @{list}  ${user}-${name}.vcva-${VC_VERSION}  ${user}-${name}.esx.0  ${user}-${name}.esx.1  ${user}-${name}.esx.2  ${user}-${name}.esx.3  ${user}-${name}.nfs.0  ${user}-${name}.iscsi.0
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Add Host To Distributed Switch  /vcqaDC/host/cls
-
-    Log To Console  Enable DRS and VSAN on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  vsanDatastore
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  15m
-
-*** Test Cases ***
-Simple VSAN
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
-
-    Install VIC Appliance To Test Server
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.md
deleted file mode 100644
index 21cea492bf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 5-6-2 - VSAN-Complex
-=======
-
-# Purpose:
-To verify the VIC appliance works with VMware Virtual SAN
-
-# References:
-[1 - VMware Virtual SAN](http://www.vmware.com/products/virtual-san.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a complex test bed in Nimbus:  
-```--testbedName test-vpx-4esx-virtual-fullInstall-vcva-8gbmem```  
-2. Deploy VCH Appliance to the new vCenter
-3. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-* None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.robot
deleted file mode 100644
index 7f1cd24654..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-6-2-VSAN-Complex.robot
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-6-2 - VSAN-Complex
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  VSAN Complex Setup
-Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-VSAN Complex Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${name}=  Evaluate  'vic-vsan-complex-' + str(random.randint(1000,9999))  modules=random
-    Set Suite Variable  ${user}  %{NIMBUS_USER}
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --vcfvtBuildPath /dbc/pa-dbc1111/mhagen/ --noSupportBundles --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --esxBuild ${ESX_VERSION} --testbedName vic-vsan-complex-pxeBoot-vcva --runName ${name}
-    Should Contain  ${out}  "deployment_result"=>"PASS"
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  .vcva-${VC_VERSION}' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc-ip}  ${ip}
-    \   Exit For Loop If  ${status}
-
-    Set Suite Variable  @{list}  ${user}-${name}.vcva-${VC_VERSION}  ${user}-${name}.esx.0  ${user}-${name}.esx.1  ${user}-${name}.esx.2  ${user}-${name}.esx.3  ${user}-${name}.esx.4  ${user}-${name}.esx.5  ${user}-${name}.esx.6  ${user}-${name}.esx.7  ${user}-${name}.nfs.0  ${user}-${name}.iscsi.0
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Wait Until Keyword Succeeds  5x  5min  Add Host To Distributed Switch  /vcqaDC/host/cluster-vsan-1
-
-    Log To Console  Enable DRS and VSAN on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cluster-vsan-1
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    ${datastore}=  Run  govc ls -t Datastore host/cluster-vsan-1/* | grep -v local | cut -d '/' -f 6 | sort | uniq | grep vsan
-    Set Environment Variable  TEST_DATASTORE  "${datastore}"
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_RESOURCE  cluster-vsan-1
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Complex VSAN
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
-
-    Install VIC Appliance To Test Server
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-    ${out}=  Run  govc datastore.vsan.dom.ls -ds %{TEST_DATASTORE} -l -o
-    Should Be Empty  ${out}
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.md
deleted file mode 100644
index ad62d70b5d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.md
+++ /dev/null
@@ -1,75 +0,0 @@
-Test 5-7 - NSX
-=======
-
-# Purpose:
-To verify the VIC appliance works when the vCenter is using NSX-v networking
-
-# References:
-[1 - VMware NSX](http://www.vmware.com/products/nsx.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy NSX
-	`/mts/git/bin/nimbus-vsmdeploy --nics 1 --vsmBuild ob-5007049 vic-3-nsxv-mgr`
-
-2. Deploy VC + VSAN
-	`/mts/git/bin/nimbus-testbeddeploy --noSupportBundles --vcvaBuild 4944578 --esxPxeDir 4887370 --esxBuild 4887370 --testbedName vcqa-vsan- simple-pxeBoot-vcva --runName vsan`
-
-3. Register NSX-v to VC from Manage vCenter Registration, to add the VC info (NSX Credential: admin/default).
-
-4. Assign NSXv License in VC from Assets → Solutions → All Actions → Assign License → Add License → Select the new added license → OK
-
-5. Create a Distributed Switch
-   - Edit the new added DVS MTU value of DVS from default 1500 to 9000
-   - Select the new added DVS and Add all hosts in the cluster
-   - Assign vmnic1 for this switch per host (remain vmnic0 with vSwitch0 to get the external IP)
-
-6. Prepare IP of NSX Controller
-   - Select one host which will create NSX controller in.
-   - Login the host via ssh, get host's network info 1). Netmask  2). Gateway.
-     - `esxcli network ip interface ipv4 get`
-
-7. Install a NSX Controller from Networking & Security
-   - Add Name, select dc, cluster, datastore as usual
-   - Modify to VM Network rather than Distributed Port Group. Because Controller need to get an external IP
-   - Go to IP Pool Select New IP Pool
-   - Define Gateway, Prefix Length got from #VC Preparation section
-   - In Static IP Pool part, add <unused-IP>-<unused-IP>. For example: 10.162.57.43-10.162.57.43
-   - Click ok to create the controller.
-
-8. Install NSX components on ESX from Home, Networking & Security, Installation, Host Preparation to all the host in cluster.
-
-9. Configure VXLAN
-   - Click Not Configured in VXLAN column → Keep value as default except 'VMKNic IP Addressing'
-     `Default MTU is 1600, make sure the MTU of DVS is larger than this one (set as 9000 manually previously)`
-   - For 'VMKNic IP Addressing' field, default is 'Use DHCP', change it to 'Use IP Pool'.
-   - Choose 'New IP Pool', add new ip pool info.
-      - `It's recommended to define an internal IP pool in order to isolate from management network`
-      - `Example: Name → internel-vxlan-ip-pool, Gateway → 192.168.0.254, Prefix Legth → 24`
-      - `Static IP Pool → 192.168.0.1-192.168.0.10 (Depends on how many host this VXLAN managed, length of IP pool > num of hosts)`
-   - Check VXLAN is installed on ESX (vmk1 is newly created)
-   - Show the vmknic info of VXLAN from Web Client: ( Installation → Logical Network Preparation → VXLAN Transport)
-   - Check the network settings from the host
-      - `esxcli network ip interface list`
-      - `net-vdl2 -l`
-   - Check vmknic created by VXLAN among all hosts are ping-able
-      - `esxcli network ip interface ipv4 get`
-
-10. Create Logical Switch
-    - Go to Home → Networking & Security → Installation → Logical Network Preparation
-    - Remain info in 'VXLAN Transport' as default
-    - Go to 'Segment ID' → Edit → Add the value of 'Segment ID pool', for example '5001-50000'
-    - Go to 'Transport Zones' → Click Add → Create a Transport Zone → Add Name / Description properly,
-       - `Remain Replication mode as 'Unicast', Select   cluster that will be part of this Transport Zones`
-
-11. Deploy VCH Appliance to the new vCenter
-
-12. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The VCH appliance should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.robot
deleted file mode 100644
index 79da108a05..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-7-NSX.robot
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-7 - NSX
-Resource  ../../resources/Util.robot
-
-*** Keywords ***
-NSX Install VIC Appliance To Test Server
-    [Arguments]  ${vic-machine}=bin/vic-machine-linux  ${appliance-iso}=bin/appliance.iso  ${bootstrap-iso}=bin/bootstrap.iso  ${certs}=${true}  ${vol}=default  ${cleanup}=${true}  ${debug}=1  ${additional-args}=${EMPTY}
-    Set Test Environment Variables
-    # disable firewall
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.esxcli network firewall set -e false
-    # Attempt to cleanup old/canceled tests
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Networks On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling vSwitches On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Containers On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Resource Pools On Test Server
-
-    # Install the VCH now
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  NSX Run VIC Machine Command  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${certs}  ${vol}  ${debug}  ${additional-args}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-
-    Get Docker Params  ${output}  ${certs}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-
-    [Return]  ${output}
-
-NSX Run VIC Machine Command
-    [Tags]  secret
-    [Arguments]  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${certs}  ${vol}  ${debug}  ${additional-args}
-    ${output}=  Run Keyword If  ${certs}  Run  ${vic-machine} create --debug ${debug} --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=${appliance-iso} --bootstrap-iso=${bootstrap-iso} --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --insecure-registry harbor.ci.drone.local --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:${vol} ${vicmachinetls} ${additional-args}
-    Run Keyword If  ${certs}  Should Contain  ${output}  Installer completed successfully
-    Return From Keyword If  ${certs}  ${output}
-
-    ${output}=  Run Keyword Unless  ${certs}  Run  ${vic-machine} create --debug ${debug} --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=${appliance-iso} --bootstrap-iso=${bootstrap-iso} --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --insecure-registry harbor.ci.drone.local --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:${vol} --no-tlsverify ${additional-args}
-    Run Keyword Unless  ${certs}  Should Contain  ${output}  Installer completed successfully
-    [Return]  ${output}
-
-
-*** Test Cases ***
-Test
-    Log To Console  \nWait until Nimbus is at least available...
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  10 min  30 sec  Login  %{NIMBUS2_USER}  %{NIMBUS2_PASSWORD}
-    ${out}=  Execute Command  nimbus-ctl --lease 5 extend_lease '*'
-    Log  ${out}
-    Close Connection    
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  10.160.21.102
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  10.160.21.102
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  vxw-dvs-53-virtualwire-1-sid-5001-nsx-switch
-    Set Environment Variable  PUBLIC_NETWORK  'VM Network'
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  vsanDatastore
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-    NSX Install VIC Appliance To Test Server  certs=${false}  vol=default
-
-    Run Regression Tests
-
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.md
deleted file mode 100644
index 2314dee6bf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 5-8 - DRS
-=======
-
-# Purpose:
-To verify the VIC appliance detects when DRS should be enabled and fuctions properly when used with DRS
-
-# References:
-[1 - Managing DRS Clusters](https://pubs.vmware.com/vsphere-50/index.jsp?topic=%2Fcom.vmware.wssdk.pg.doc_50%2FPG_Ch13_Resources.15.8.html)
-
-# Environment:
-This test requires access to VMWare Nimbus cluster for dynamic ESXi and vCenter creation
-
-# Test Steps:
-1. Deploy a new vCenter with 3 ESXi hosts in a cluster but with DRS disabled
-2. Attempt to install a VCH appliance into the cluster
-3. Enable DRS on the cluster
-4. Re-attempt to install a VCH appliance into the cluster
-5. Run a variety of docker commands on the VCH appliance
-
-# Expected Outcome:
-The first VCH appliance install should provide an error indicating that DRS must be enabled, the second VCH appliance install should deploy without error and each of the docker commands executed against it should return without error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.robot
deleted file mode 100644
index 28235615ce..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-8-DRS.robot
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-8 - DRS
-Resource  ../../resources/Util.robot
-Suite Setup  Wait Until Keyword Succeeds  10x  10m  DRS Setup
-Suite Teardown  Nimbus Cleanup  ${list}
-
-*** Keywords ***
-DRS Setup
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${esx1}  ${esx1-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX1}  ${esx1}
-    ${esx2}  ${esx2-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX2}  ${esx2}
-    ${esx3}  ${esx3-ip}=  Deploy Nimbus ESXi Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${ESX3}  ${esx3}
-
-    ${vc}  ${vc-ip}=  Deploy Nimbus vCenter Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Set Suite Variable  ${VC}  ${vc}
-
-    Set Suite Variable  @{list}  ${esx1}  ${esx2}  ${esx3}  ${vc}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ha-datacenter
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create cls
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx1-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx2-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-    ${out}=  Wait Until Keyword Succeeds  5x  15 seconds  Run  govc cluster.add -hostname=${esx3-ip} -username=root -dc=ha-datacenter -password=e2eFunctionalTest -noverify=true
-    Should Contain  ${out}  OK
-
-    Log To Console  Create a distributed switch
-    ${out}=  Run  govc dvs.create -dc=ha-datacenter test-ds
-    Should Contain  ${out}  OK
-
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=ha-datacenter -dvs=test-ds bridge
-    Should Contain  ${out}  OK
-
-    Log To Console  Add all the hosts to the distributed switch
-    Wait Until Keyword Succeeds  5x  5min  Add Host To Distributed Switch  /ha-datacenter/host/cls
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Remove Environment Variable  TEST_DATACENTER
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  30m
-
-*** Test Cases ***
-Test
-    Log To Console  \nStarting test...
-    ${status}  ${message}=  Run Keyword And Ignore Error  Install VIC Appliance To Test Server  certs=${false}  vol=default
-    Should Contain  ${message}  DRS must be enabled to use VIC
-    Should Be Equal As Strings  ${status}  FAIL
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /ha-datacenter/host/cls
-    Should Be Empty  ${out}
-
-    Install VIC Appliance To Test Server  certs=${false}  vol=default
-
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.md
deleted file mode 100644
index c4d29f9976..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Test 5-9 - Private Registry
-=======
-
-# Purpose:
-To verify the VIC appliance can pull an image from a private registry
-
-# References:
-[1 - Docker Registry](https://hub.docker.com/_/registry/)
-
-# Environment:
-This test requires access to a vSphere Server
-
-# Test Steps:
-1. Install a new VCH appliance into the vSphere Server
-2. Start the docker registry locally:  
-```docker run -d -p 5000:5000 --name registry registry```
-3. Pull an image and tag it for the new local registry:  
-```docker tag busybox localhost:5000/busybox:latest```
-4. Push the tagged image to the registry:  
-```docker push localhost:5000/busybox```
-5. Attempt to pull the local registry image using the VCH appliance:  
-```docker pull %{VCH-PARAMS} 172.17.0.1:5000/busybox```
-
-# Expected Outcome:
-The VCH appliance should be able to successfully pull the image from a local registry without error
-
-# Possible Problems:
-The default network on VCH containers is in the 172.17.0.x space, but this could potentially change. If you are having issues running the tests make sure that the container has an IP address in that network space.
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.robot b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.robot
deleted file mode 100644
index f38f1864bc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/5-9-Private-Registry.robot
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5-9 - Private Registry
-Resource  ../../resources/Util.robot
-#Suite Setup  Private Registry Setup
-#Suite Teardown  Private Registry Cleanup
-
-*** Keywords ***
-Private Registry Setup
-    ${dockerHost}=  Get Environment Variable  DOCKER_HOST  ${SPACE}
-    Remove Environment Variable  DOCKER_HOST
-    ${rc}  ${output}=  Run And Return Rc And Output  docker run -d -p 5000:5000 --name registry registry
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag busybox localhost:5000/busybox:latest
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push localhost:5000/busybox
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  DOCKER_HOST  ${dockerHost}
-
-Private Registry Cleanup
-    ${dockerHost}=  Get Environment Variable  DOCKER_HOST  ${SPACE}
-    Remove Environment Variable  DOCKER_HOST
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rm -f registry
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  DOCKER_HOST  ${dockerHost}
-
-Pull image
-    [Arguments]  ${image}
-    Log To Console  \nRunning docker pull ${image}...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Digest:
-    Should Contain  ${output}  Status:
-    Should Not Contain  ${output}  No such image:
-
-*** Test Cases ***
-Pull an image from non-default repo
-    Pass Execution  This test needs to be re-written
-    Install VIC Appliance To Test Server  vol=default --insecure-registry 172.17.0.1:5000
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  172.17.0.1:5000/busybox
-    Cleanup VIC Appliance On Test Server
-
-Pull image from non-whitelisted repo
-    Pass Execution  This test needs to be re-written
-    Install VIC Appliance To Test Server  vol=default
-    ${rc}  ${output}=  Run And Return Rc And Output  docker ${params} pull 172.17.0.1:5000/busybox
-    Should Contain  ${output}  Error response from daemon: Head https://172.17.0.1:5000/v2/: http: server gave HTTP response to HTTPS client
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/TestCases.md
deleted file mode 100644
index fa870f9c5a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/Group5-Functional-Tests/TestCases.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Group 5 - Functional Tests
-=======
-
-
-[Test 5-1 - Distributed Switch](5-1-Distributed-Switch.md)
--
-[Test 5-2 - Cluster](5-2-Cluster.md)
--
-[Test 5-3 - Enhanced Linked Mode](5-3-Enhanced-Linked-Mode.md)
--
-[Test 5-4 - High Availability](5-4-High-Availability.md)
--
-[Test 5-5 - Heterogeneous ESXi](5-5-Heterogeneous-ESXi.md)
--
-[Test 5-6 - VSAN](5-6-VSAN.md)
--
-[Test 5-7 - NSX](5-7-NSX.md)
--
-[Test 5-8 - DRS](5-8-DRS.md)
--
-[Test 5-9 - Private Registry](5-9-Private-Registry.md)
--
-[Test 5-10 - Multiple Datacenter](5-10-Multiple-Datacenter.md)
--
-[Test 5-11 - Multiple Cluster](5-11-Multiple-Cluster.md)
--
-[Test 5-12 - Multiple VLAN](5-12-Multiple-VLAN.md)
--
-[Test 5-13 - Invalid ESXi Install](5-13-Invalid-ESXi-Install.md)
--
-[Test 5-14 - Remove Container OOB](5-14-Remove-Container-OOB.md)
--
-[Test 5-15 - NFS Datastore](5-15-NFS-Datastore.md)
--
-[Test 5-16 - iSCSI Datastore](5-16-iSCSI-Datastore.md)
--
-[Test 5-17 - FC Datastore](5-17-FC-Datastore.md)
--
-[Test 5-18 - Datastore Cluster SDRS](5-18-Datastore-Cluster-SDRS.md)
--
-[Test 5-19 - ROBO SKU](5-19-ROBO-SKU.md)
--
-[Test 5-21 - Datastore Path](5-21-Datastore-Path.md)
--
-[Test 5-22 - NFS Volume](5-22-NFS-Volume.md)
--
-[Test 5-24 - Non vSphere Local Cluster](5-24-Non-vSphere-Local-Cluster.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/TestGroups.md b/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/TestGroups.md
deleted file mode 100644
index f055768473..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/manual-test-cases/TestGroups.md
+++ /dev/null
@@ -1,27 +0,0 @@
-VIC Manual Test Suite
-=======
-
-
-[Group 5 - Functional Tests](Group5-Functional-Tests/TestCases.md)
--
-[Group 11 - Stress](Group11-Stress/TestCases.md)
--
-[Group 12 - Maintenance Mode](Group12-Maintenance-Mode/TestCases.md)
--
-[Group 13 - vMotion](Group13-vMotion/TestCases.md)
--
-[Group 14 - Longevity](Group14-Longevity/TestCases.md)
--
-[Group 15 - Dogfood](Group15-Dogfood/TestCases.md)
--
-[Group 16 - Windows Client](Group16-WindowsClient/TestCases.md)
--
-[Group 17 - Manual TTY](Group17-ManualTTY/TestCases.md)
--
-[Group 18 - VIC UI](Group18-VIC-UI/TestCases.md)
--
-[Group 19 - VIC Product](Group19-VIC-Product/TestCases.md)
--
-[Group 20 - Security](Group20-Security/TestCases.md)
--
-[Group 21 - Whitelist](Group21-Registries/TestCases.md)
diff --git a/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-autorun.sh b/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-autorun.sh
deleted file mode 100755
index 8d530fcc0c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-autorun.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Get the latest code from vic-internal repo for nightly_secrets.sh file
-cd ~/vic-internal
-git clean -fd
-git fetch
-git pull
-source nightly_secrets.sh
-
-# Get the latest code from vmware/vic repo
-cd ~/vic
-git clean -fd
-git fetch https://github.com/vmware/vic master
-git pull
-
-# Kick off the nightly
-echo "Cleanup logs from previous run"
-sudo rm -rf *.zip *.log bin 60 65
-
-sudo -E ./tests/nightly/nightly-kickoff.sh > ./nightly_console.txt 2>&1
diff --git a/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-kickoff.sh b/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-kickoff.sh
deleted file mode 100755
index 8eb7e27789..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/nightly/nightly-kickoff.sh
+++ /dev/null
@@ -1,297 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-nightly_list_var="5-1-Distributed-Switch \
-5-2-Cluster \
-5-3-Enhanced-Linked-Mode \
-5-4-High-Availability \
-5-5-Heterogeneous-ESXi \
-5-6-1-VSAN-Simple \
-5-6-2-VSAN-Complex \
-5-7-NSX \
-5-8-DRS \
-5-10-Multiple-Datacenter \
-5-11-Multiple-Cluster \
-5-12-Multiple-VLAN \
-5-13-Invalid-ESXi-Install \
-5-14-Remove-Container-OOB \
-5-15-NFS-Datastore \
-5-16-iSCSI-Datastore \
-5-17-FC-Datastore \
-5-21-Datastore-Path \
-5-22-NFS-Volume \
-5-24-Non-vSphere-Local-Cluster \
-13-1-vMotion-VCH-Appliance \
-13-2-vMotion-Container \
-21-1-Whitelist"
-
-numberOfTests=($nightly_list_var)
-numberOfTests=${#numberOfTests[@]}
-
-input=$(gsutil ls -l gs://vic-engine-builds/vic_* | grep -v TOTAL | sort -k2 -r | head -n1 | xargs | cut -d ' ' -f 3 | cut -d '/' -f 4)
-buildNumber=${input:4}
-
-n=0
-   until [ $n -ge 5 ]
-   do
-      echo "Retry.. $n"
-      echo "Downloading gcp file $input"
-      wget https://storage.googleapis.com/vic-engine-builds/$input
-      if [ -f "$input" ]
-      then
-      echo "File found.."
-      break
-      else
-      echo "File NOT found"
-      fi
-      n=$[$n+1]
-      sleep 15
-   done
-
-n=0
-   until [ $n -ge 5 ]
-   do
-      mkdir bin
-      echo "Extracting .tar.gz"
-      tar xvzf $input -C bin/ --strip 1
-      if [ -f "bin/vic-machine-linux" ]
-      then
-      echo "tar extraction complete.."
-      canContinue="Yes"
-      break
-      else
-      echo "tar extraction failed"
-      canContinue="No"
-      rm -rf bin
-      fi
-      n=$[$n+1]
-      sleep 15
-   done
-
-if [ $canContinue = "No" ]
-then
-echo "Tarball extraction failed..quitting the run"
-break
-else
-echo "Tarball extraction passed, Running nightlies test.."
-
-echo "Deleting .tar.gz vic file"
-rm $input
-
-DATE=`date +%m_%d_%H_%M_`
-
-nightlystatus=()
-count=0
-
-# There should not be any VMs existing prior to running this test
-sshpass -p $NIMBUS_PASSWORD ssh -o StrictHostKeyChecking=no $NIMBUS_USER@$NIMBUS_GW nimbus-ctl kill '\*'
-
-for i in $nightly_list_var; do
-    #Clean up any previous runs creds
-    rm -rf VCH-0-*
-    echo "Executing nightly test $i vSphere 6.5"
-    pybot --removekeywords TAG:secret -d 65/$i --suite $i tests/manual-test-cases/
-
-    if [ $? -eq 0 ]
-    then
-    echo "Passed"
-    nightlystatus[$count]="Pass"
-    else
-    echo "Failed"
-    nightlystatus[$count]="FAIL"
-    fi
-
-    mv *.log 65/$i
-    mv *.zip 65/$i
-    ((count++))
-    echo $count
-done
-
-# See if any VMs leaked and clean them up if so
-sshpass -p $NIMBUS_PASSWORD ssh -o StrictHostKeyChecking=no $NIMBUS_USER@$NIMBUS_GW nimbus-ctl list
-sshpass -p $NIMBUS_PASSWORD ssh -o StrictHostKeyChecking=no $NIMBUS_USER@$NIMBUS_GW nimbus-ctl kill '\*'
-
-for i in $nightly_list_var; do
-    #Clean up any previous runs creds
-    rm -rf VCH-0-*
-    echo "Executing nightly test $i on vSphere 6.0"
-    pybot --removekeywords TAG:secret --variable ESX_VERSION:ob-5251623 --variable VC_VERSION:ob-5112509 -d 60/$i --suite $i tests/manual-test-cases/
-
-    if [ $? -eq 0 ]
-    then
-    echo "Passed"
-    nightlystatus[$count]="Pass"
-    else
-    echo "Failed"
-    nightlystatus[$count]="FAIL"
-    fi
-
-    mv *.log 60/$i
-    mv *.zip 60/$i
-    ((count++))
-    echo $count
-done
-
-# See if any VMs leaked
-sshpass -p $NIMBUS_PASSWORD ssh -o StrictHostKeyChecking\=no $NIMBUS_USER@$NIMBUS_GW nimbus-ctl list
-
-# Setting the NSX test status to Not Implemented.
-nightlystatus[7+$numberOfTests]="N/A"
-
-for i in "${nightlystatus[@]}"
-do
-    echo $i
-    if [ $i = "Pass" ]
-    then
-    buildStatus="Passed"
-    echo "Test Passed!"
-    else
-    buildStatus="Failed!"
-    echo "Test failed, setting global test status to Failed!"
-    break
-    fi
-done
-
-echo "Global Nightly Test Status $buildStatus"
-
-sh tests/nightly/upload-logs.sh $DATE$input
-
-rm nightly_mail.html
-
-nightly_list_var=($nightly_list_var)
-cat <<EOT >> nightly_mail.html
-To: mwilliamson-staff-adl@vmware.com
-To: rashok@vmware.com
-Subject: VIC Engine Nightly Build $buildNumber
-From: VIC Nightly
-MIME-Version: 1.0
-Content-Type: text/html
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-  <head>
-    <meta name="viewport" content="width=device-width" />
-    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <style>
-	    tr.d0 td {
-	  background-color:#E0E0E0;
-	  color: black;
-	}
-	tr.d1 td {
-	  background-color:#FFFFFF;
-	  color: black;
-	}
-        tr.d2 td {
-	  background-color:#66c2ff;
-	  color: black;
-	}
-     </style>
-  </head>
-  <body>
-    <table class="body-wrap">
-      <tr>
-        <td></td>
-        <td class="container" width="600">
-          <div class="content">
-            <table class="main" width="100%" cellpadding="0" cellspacing="0">
-              <tr>
-                <td class="content-wrap">
-                  <table width="100%" cellpadding="0" cellspacing="0">
-                    <tr class="d2">
-                      <td>
-                      vSphere v6.5 - VIC Build $buildNumber
-                      </td>
-                      <td>
-                      </td>
-                    </tr>
-                    `for ((i=0; i < ${#nightly_list_var[@]}; ++i)); do echo "<tr class=\"d$(($i%2))\"><td>${nightly_list_var[$i]}: </td><td>${nightlystatus[$i]}</td></tr>"; done`
-                  </table>
-                  <table width="100%" cellpadding="0" cellspacing="0">
-                    <tr>
-                      <td>
-                        <a href='https://storage.cloud.google.com/vic-ci-logs/functional_logs_$DATE$input.zip?authuser=1'>https://storage.cloud.google.com/vic-ci-logs/functional_logs_$DATE$input.zip?authuser=1</a>
-                      </td>
-                    </tr>
-                  </table>
-                  <hr>
-                </td>
-              </tr>
-            </table>
-          </div>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  <table class="body-wrap">
-      <tr>
-        <td></td>
-        <td class="container" width="600">
-          <div class="content">
-            <table class="main" width="100%" cellpadding="0" cellspacing="0">
-              <tr>
-                <td class="content-wrap">
-                  <table width="100%" cellpadding="0" cellspacing="0">
-                    <tr class="d2">
-                      <td>
-                      vSphere v6.0 - VIC Build $buildNumber
-                      </td>
-                      <td>
-                      </td>
-                    </tr>
-                    `for ((i=0; i < ${#nightly_list_var[@]}; ++i)); do echo "<tr class=\"d$(($i%2))\"><td>${nightly_list_var[$i]}: </td><td>${nightlystatus[(($i+${#nightly_list_var[@]}))]}</td></tr>"; done`
-                  </table>
-                  <table width="100%" cellpadding="0" cellspacing="0">
-                    <tr>
-                      <td>
-                        <a href='https://storage.cloud.google.com/vic-ci-logs/functional_logs_$DATE$input.zip?authuser=1'>https://storage.cloud.google.com/vic-ci-logs/functional_logs_$DATE$input.zip?authuser=1</a>
-                      </td>
-                    </tr>
-                  </table>
-                  <hr>
-                </td>
-              </tr>
-            </table>
-          </div>
-        </td>
-        <td></td>
-      </tr>
-    </table>
-  </body>
-</html>
-EOT
-
-# Emails an HTML report of the test run results using SendMail.
-sendmail -t < nightly_mail.html
-fi
-
-# Saves test results to reporting server
-testresultsdb="vic-nightly.db"
-rm $testresultsdb
-scp $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns-db/$testresultsdb .
-
-for i in $nightly_list_var; do
-python -m dbbot.run -k  -b $testresultsdb 65/$i/output.xml
-ssh $REPORTING_USER@$REPORTING_SERVER_URL mkdir -p /export/drone-test-results/testruns/$buildNumber-nightly/65/$i
-scp 65/$i/log.html $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns/$buildNumber-nightly/65/$i
-scp 65/$i/report.html $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns/$buildNumber-nightly/65/$i
-
-python -m dbbot.run -k  -b $testresultsdb 60/$i/output.xml
-ssh $REPORTING_USER@$REPORTING_SERVER_URL mkdir -p /export/drone-test-results/testruns/$buildNumber-nightly/60/$i
-scp 60/$i/log.html $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns/$buildNumber-nightly/60/$i
-scp 60/$i/report.html $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns/$buildNumber-nightly/60/$i
-done
-
-scp $testresultsdb $REPORTING_USER@$REPORTING_SERVER_URL:/export/drone-test-results/testruns-db/$testresultsdb
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/nightly/upload-logs.sh b/installer/vendor/github.com/vmware/vic/tests/nightly/upload-logs.sh
deleted file mode 100755
index 811c117805..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/nightly/upload-logs.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-echo "Upload logs"
-
-set -x
-gsutil version -l
-set +x
-
-outfile="functional_logs_"$1".zip"
-
-echo $Build
-echo $outfile
-
-/usr/bin/zip -9 -r $outfile 60 65 nightly_console.txt
-
-# GC credentials
-keyfile=~/vic-ci-logs.key
-botofile=~/.boto
-if [ ! -f $keyfile ]; then
-    echo -en $GS_PRIVATE_KEY > $keyfile
-    chmod 400 $keyfile
-fi
-if [ ! -f $botofile ]; then
-    echo "[Credentials]" >> $botofile
-    echo "gs_service_key_file = $keyfile" >> $botofile
-    echo "gs_service_client_id = $GS_CLIENT_EMAIL" >> $botofile
-    echo "[GSUtil]" >> $botofile
-    echo "content_language = en" >> $botofile
-    echo "default_project_id = $GS_PROJECT_ID" >> $botofile
-fi
-
-if [ -f "$outfile" ]; then
-  gsutil cp $outfile gs://vic-ci-logs
-  echo "----------------------------------------------"
-  echo "Upload test logs:"
-  echo "https://console.cloud.google.com/m/cloudstorage/b/vic-ci-logs/o/$outfile?authuser=1"
-  echo "----------------------------------------------"
-else
-  echo "No log output file to upload"
-fi
-
-if [ -f "$keyfile" ]; then
-  rm -f $keyfile
-fi
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Admiral-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Admiral-Util.robot
deleted file mode 100644
index cec480f80c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Admiral-Util.robot
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains all keywords related to creating, deleting, maintaining an instance of Admiral
-Library  Selenium2Library  5  5
-Library  OperatingSystem
-
-*** Keywords ***
-Install Admiral
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -p 8282:8282 --name admiral vmware/admiral:vic_v1.1.0
-    Should Be Equal As Integers  0  ${rc}
-    Set Environment Variable  ADMIRAL_IP  %{VCH-IP}:8282
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${out}=  Run  curl %{ADMIRAL_IP}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  <body class="admiral-default">
-    \   Return From Keyword If  ${status}
-    \   Sleep  5
-    Fail  Install Admiral failed: Admiral endpoint failed to respond to curl
-
-Cleanup Admiral
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f admiral
-    Should Be Equal As Integers  0  ${rc}
-
-Login To Admiral
-    [Arguments]  ${url}=localhost:8282  ${browser}=chrome
-    Open Browser  ${url}  ${browser}
-    Maximize Browser Window
-    Wait Until Page Contains  Welcome!
-    Wait Until Page Contains  This is the place for you to create, provision, manage and monitor containerized applications.
-    Wait Until Element Is Visible  css=button.btn.btn-primary.enter-btn
-    Wait Until Element Is Enabled  css=button.btn.btn-primary.enter-btn
-    Click Button  css=button.btn.btn-primary.enter-btn
-    Wait Until Element Is Visible  css=div.query-search-input-controls.form-control
-    Wait Until Element Is Enabled  css=div.query-search-input-controls.form-control
-    Wait Until Element Is Visible  css=a.btn.btn-primary.addHost-btn
-    Wait Until Element Is Enabled  css=a.btn.btn-primary.addHost-btn
-
-Add Host To Admiral
-    [Arguments]  ${address}  ${credentials}=${EMPTY}
-    Wait Until Element Is Visible  css=a[data-cmd="navigation-hosts"]
-    Wait Until Element Is Enabled  css=a[data-cmd="navigation-hosts"]
-    Click Element  css=a[data-cmd="navigation-hosts"]
-
-    Wait Until Element Is Visible  css=div.query-search-input-controls.form-control
-    Wait Until Element Is Enabled  css=div.query-search-input-controls.form-control
-    Wait Until Element Is Visible  css=a.btn.btn-primary.addHost-btn
-    Wait Until Element Is Enabled  css=a.btn.btn-primary.addHost-btn
-    Click Element  css=a.btn.btn-primary.addHost-btn
-
-    Wait Until Page Contains  Add Host
-    Wait Until Element Is Visible  address
-    Wait Until Element Is Enabled  address
-    Wait Until Element Is Visible  credential
-    Wait Until Element Is Enabled  credential
-
-    Input Text  css=#address > input.form-control  ${address}
-
-    Select From List  css=#hostType > div.select > select  VCH
-
-    Run Keyword If  '${credentials}' != '${EMPTY}'  Click Element  css=#credential > div.form-control > div.dropdown > button.dropdown-toggle
-    Run Keyword If  '${credentials}' != '${EMPTY}'  Click Element  css=a[data-name=${credentials}]
-
-    Wait Until Element Is Visible  css=a.btn.verifyHost
-    Wait Until Element Is Enabled  css=a.btn.verifyHost
-    Click Element  css=a.btn.verifyHost
-    
-    Wait Until Page Contains  Verified successfully!
-    Wait Until Element Is Visible  css=button.btn.btn-primary.saveHost
-    Wait Until Element Is Enabled  css=button.btn.btn-primary.saveHost
-    Click Button  css=button.btn.btn-primary.saveHost
-    
-    Wait Until Element Is Visible  css=div.status.ON
-    Wait Until Element Is Enabled  css=div.status.ON
-    
-
-Add Project to Admiral
-    [Arguments]  ${name}
-    Wait Until Element Is Visible  css=a[data-cmd="navigation-placements"]
-    Wait Until Element Is Enabled  css=a[data-cmd="navigation-placements"]
-    Click Element  css=a[data-cmd="navigation-placements"]
-    
-    Wait Until Element Is Visible  css=div.right-context-panel > div.toolbar > div:nth-child(2) > a
-    Wait Until Element Is Enabled  css=div.right-context-panel > div.toolbar > div:nth-child(2) > a
-    Click Element  css=div.right-context-panel > div.toolbar > div:nth-child(2) > a
-
-    Wait Until Page Contains  Project
-    Wait Until Element Is Visible  css=div.right-context-panel > div.content > div > div.list-holder > div.inline-editable-list-holder > div.inline-editable-list > div.toolbar > a.new-item
-    Wait Until Element Is Enabled  css=div.right-context-panel > div.content > div > div.list-holder > div.inline-editable-list-holder > div.inline-editable-list > div.toolbar > a.new-item
-    Click Element  css=div.right-context-panel > div.content > div > div.list-holder > div.inline-editable-list-holder > div.inline-editable-list > div.toolbar > a.new-item
-    Input Text  css=input.name-input  ${name}
-    Click Element  css=button.btn.btn-primary.inline-edit-save
-
-    Table Should Contain  css=div.right-context-panel > div.content > div > div > div > div > table  ${name}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Cert-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Cert-Util.robot
deleted file mode 100644
index 50c96f2c1a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Cert-Util.robot
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains keywords related to creating and using certificates. Requires scripts in infra/integration-image/scripts be available in PATH
-
-*** Keywords ***
-Generate Certificate Authority
-    #  Generates CA (private/ca.key.pem, certs/ca.cert.pem, certs/STARK_ENTERPRISES_ROOT_CA.crt) in OUT_DIR
-    [Arguments]  ${CA_NAME}=STARK_ENTERPRISES_ROOT_CA  ${OUT_DIR}=/root/ca
-    Log To Console  Generating Certificate Authority
-    ${rc}  ${out}=  Run And Return Rc And Output  generate-ca.sh -c ${CA_NAME} -d ${OUT_DIR}
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-
-Generate Wildcard Server Certificate
-    # Generates key and signs with CA for *.DOMAIN (csr/*.DOMAIN.csr.pem,
-    # private/*.DOMAIN.key.pem, certs/*.DOMAIN.cert.pem) in OUT_DIR
-    [Arguments]  ${DOMAIN}=%{DOMAIN}  ${OUT_DIR}=/root/ca  ${CA_NAME}=STARK_ENTERPRISES_ROOT_CA
-    Log To Console  Generating Wildcard Server Certificate
-    Run Keyword  Generate Server Key And CSR  *.${DOMAIN}  ${OUT_DIR}
-    Run Keyword  Sign Server CSR  ${CA_NAME}  *.${DOMAIN}  ${OUT_DIR}
-    Run Keyword  Create Certificate Bundle  CA_NAME=${CA_NAME}  SRC_DIR=${OUT_DIR}  CN=*.${DOMAIN}
-    ${out}=  Run  ls -al ${OUT_DIR}/csr
-    Log  ${out}
-    ${out}=  Run  ls -al ${OUT_DIR}/private
-    Log  ${out}
-    ${out}=  Run  ls -al ${OUT_DIR}/certs
-    Log  ${out}
-
-
-Generate Server Key And CSR
-    # Generates key and CSR (private/DOMAIN.key.pem, csr/DOMAIN.csr.pem) in OUT_DIR
-    [Arguments]  ${CN}=%{DOMAIN}  ${OUT_DIR}=/root/ca
-    Log To Console  Generating Server Key And CSR
-    ${out}=  Run  generate-server-key-csr.sh -d ${OUT_DIR} -n ${CN}
-    Log  ${out}
-
-
-Sign Server CSR
-    # Generates certificate signed by CA (certs/DOMAIN.cert.pem) in OUT_DIR
-    [Arguments]  ${CA_NAME}=STARK_ENTERPRISES_ROOT_CA  ${CN}=%{DOMAIN}  ${OUT_DIR}=/root/ca
-    Log To Console  Signing Server CSR
-    ${out}=  Run  sign-csr.sh -c ${CA_NAME} -d ${OUT_DIR} -n ${CN}
-    Log  ${out}
-
-
-Trust Certificate Authority
-    # Installs root certificate into trust store on Debian based distro
-    [Arguments]  ${CRT_FILE}=/root/ca/certs/STARK_ENTERPRISES_ROOT_CA.crt
-    Log To Console  Installing CA
-    ${rc}  ${out}=  Run And Return Rc And Output  ubuntu-install-ca.sh -f ${CRT_FILE}
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${out}
-
-
-Reload Default Certificate Authorities
-    # Reloads default certificates into trust store on Debian based distro
-    # Removes all user provided CAs
-    Log To Console  Reloading Default CAs
-    ${rc}  ${out}=  Run And Return Rc And Output  ubuntu-reload-cas.sh
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${out}
-
-
-Create Certificate Bundle
-    [Arguments]  ${CA_NAME}=STARK_ENTERPRISES_ROOT_CA  ${SRC_DIR}=/root/ca  ${OUT_FILE}=/root/ca/cert-bundle.tgz  ${CN}=%{DOMAIN}  ${TMP_DIR}=/root/ca/bundle
-    ${rc}  ${out}=  Run And Return Rc And Output  bundle-certs.sh -c ${CA_NAME} -d ${SRC_DIR} -f ${OUT_FILE} -n ${CN} -o ${TMP_DIR}
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${out}
-
-
-Get Certificate Authority CRT
-    # Return ascii armored certificate from file e.g. `-----BEGIN CERTIFICATE-----`
-    [Arguments]  ${CA_CRT}=STARK_ENTERPRISES_ROOT_CA.crt  ${DIR}=/root/ca/certs
-    ${out}=  Run  cat ${DIR}/${CA_CRT}
-    [Return]  ${out}
-
-
-Get Server Certificate
-    # Return ascii armored certificate from file e.g. `-----BEGIN CERTIFICATE-----`
-    # PEM must be provided if using a wildcard cert not specified by DOMAIN
-    [Arguments]  ${PEM}=%{DOMAIN}.cert.pem  ${DIR}=/root/ca/certs
-    ${out}=  Run  cat ${DIR}/${PEM}
-    [Return]  ${out}
-
-
-Get Server Key
-    # Return ascii armored key from file e.g. `-----BEGIN RSA PRIVATE KEY-----`
-    # PEM must be provided if using a wildcard cert not specified by DOMAIN
-    [Arguments]  ${PEM}=%{DOMAIN}.key.pem  ${DIR}=/root/ca/private
-    ${out}=  Run  cat ${DIR}/${PEM}
-    [Return]  ${out}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Docker-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Docker-Util.robot
deleted file mode 100644
index 35ebfc0d42..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Docker-Util.robot
+++ /dev/null
@@ -1,318 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource provides helper functions for docker operations
-Library  OperatingSystem
-Library  Process
-
-*** Keywords ***
-Run Docker Info
-    [Arguments]  ${docker-params}
-    ${rc}=  Run And Return Rc  docker ${docker-params} info
-    Should Be Equal As Integers  ${rc}  0
-
-Pull image
-    [Arguments]  ${image}
-    [Timeout]  10 minutes
-    Log To Console  \nRunning docker pull ${image}...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Digest:
-    Should Contain  ${output}  Status:
-    Should Not Contain  ${output}  No such image:
-
-Wait Until Container Stops
-    [Arguments]  ${container}  ${sleep-time}=1
-    :FOR  ${idx}  IN RANGE  0  60
-    \   ${out}=  Run  docker %{VCH-PARAMS} inspect -f '{{.State.Running}}' ${container}
-    \   Return From Keyword If  '${out}' == 'false'
-    \   Sleep  ${sleep-time}
-    Fail  Container did not stop within 60 seconds
-
-Hit Nginx Endpoint
-    [Arguments]  ${vch-ip}  ${port}
-    ${rc}  ${output}=  Run And Return Rc And Output  wget ${vch-ip}:${port}
-    Should Be Equal As Integers  ${rc}  0
-
-Get Container IP
-    [Arguments]  ${docker-params}  ${id}  ${network}=default  ${dockercmd}=docker
-    ${rc}  ${ip}=  Run And Return Rc And Output  ${dockercmd} ${docker-params} network inspect ${network} | jq '.[0].Containers."${id}".IPv4Address' | cut -d \\" -f 2 | cut -d \\/ -f 1
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${ip}
-
-Get IP Address of Container
-    [Arguments]  ${container}
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect ${container} | jq -r ".[].NetworkSettings.Networks.bridge.IPAddress"
-    [Return]  ${ip}
-
-# The local dind version is embedded in Dockerfile
-# docker:1.13-dind
-# If you are running this keyword in a container, make sure it is run with --privileged turned on
-Start Docker Daemon Locally
-    [Arguments]  ${dockerd-params}  ${dockerd-path}=/usr/local/bin/dockerd-entrypoint.sh  ${log}=./daemon-local.log
-    OperatingSystem.File Should Exist  ${dockerd-path}
-    Log To Console  Starting docker daemon locally
-    ${pid}=  Run  pidof dockerd
-    Run Keyword If  '${pid}' != '${EMPTY}'  Run  kill -9 ${pid}
-    Run Keyword If  '${pid}' != '${EMPTY}'  Log To Console  \nKilling local dangling dockerd process: ${pid}
-    ${handle}=  Start Process  ${dockerd-path} ${dockerd-params} >${log} 2>&1  shell=True
-    Process Should Be Running  ${handle}
-    :FOR  ${IDX}  IN RANGE  5
-    \   ${pid}=  Run  pidof dockerd
-    \   Run Keyword If  '${pid}' != '${EMPTY}'  Set Test Variable  ${dockerd-pid}  ${pid}
-    \   Exit For Loop If  '${pid}' != '${EMPTY}'
-    \   Sleep  1s
-    Should Not Be Equal  '${dockerd-pid}'  '${EMPTY}'
-    :FOR  ${IDX}  IN RANGE  10
-    \   ${rc}=  Run And Return Rc  DOCKER_API_VERSION=1.23 docker -H unix:///var/run/docker-local.sock ps
-    \   Return From Keyword If  '${rc}' == '0'  ${handle}  ${dockerd-pid}
-    \   Sleep  1s
-    Fail  Failed to initialize local dockerd
-    [Return]  ${handle}  ${dockerd-pid}
-
-Kill Local Docker Daemon
-    [Arguments]  ${handle}  ${dockerd-pid}
-    Terminate Process  ${handle}
-    Process Should Be Stopped  ${handle}
-    ${rc}=  Run And Return Rc  kill -9 ${dockerd-pid}
-    Should Be Equal As Integers  ${rc}  0
-
-Get container shortID
-    [Arguments]  ${id}
-    ${shortID}=  Get Substring  ${id}  0  12
-    [Return]  ${shortID}
-
-Get container name
-    [Arguments]  ${id}
-    ${rc}  ${name}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --format='{{.Name}}' ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Get Substring  ${name}  1
-    [Return]  ${name}
-
-Get VM display name
-    [Arguments]  ${id}
-    ${name}=  Get container name  ${id}
-    ${shortID}=  Get container shortID  ${id}
-    [Return]  ${name}-${shortID}
-
-Verify Container Rename
-    [Arguments]  ${oldname}  ${newname}  ${contID}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${newname}
-    Should Not Contain  ${output}  ${oldname}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Name}}' ${newname}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${newname}
-    ${vmName}=  Get VM display name  ${contID}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info ${vmname}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${vmName}
-
-Run Regression Tests
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    # Pull an image that has been pulled already
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  busybox
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  /bin/top
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Container Stops  ${container}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Exited
-
-    ${vmName}=  Get VM Display Name  ${container}
-    Wait Until Keyword Succeeds  5x  10s  Check For The Proper Log Files  ${vmName}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  /bin/top
-
-    # Check for regression for #1265
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${shortname}=  Get Substring  ${container2}  1  12
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    ${lines}=  Get Lines Containing String  ${output}  ${shortname}
-    Should Not Contain  ${lines}  /bin/top
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} rm ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} rm ${container2}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  ${busybox}
-
-    Scrape Logs For The Password
-
-Launch Container
-    [Arguments]  ${name}  ${network}=default  ${dockercmd}=docker
-    ${rc}  ${output}=  Run And Return Rc And Output  ${dockercmd} %{VCH-PARAMS} run --name ${name} --net ${network} -itd busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get Line  ${output}  -1
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  ${id}  ${network}  ${dockercmd}
-    [Return]  ${id}  ${ip}
-
-Start Container and Exec Command
-    [Arguments]  ${containerName}  ${cmd}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerName}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${containerName} ${cmd}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    [Return]  ${output}
-
-Verify Volume Inspect Info
-    [Arguments]  ${inspectedWhen}  ${volTestContainer}  ${checkList}
-    Log To Console  \nContainer Mount Inspected ${inspectedWhen}
-    ${rc}  ${mountInfo}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Mounts}}' ${volTestContainer}
-    Should Be Equal As Integers  ${rc}  0
-
-    :FOR  ${item}  IN  @{checkList}
-    \   Should Contain  ${mountInfo}  ${item}
-
-Log All Containers
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Run Keyword If  ${rc} != 0  Log To Console  Remaining containers - ${out}
-
-Do Images Exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -q
-    ${len}=  Get Length  ${output}
-    Return From Keyword If  ${len} == 0  ${false}
-    [Return]  ${true}
-
-Do Containers Exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -q
-    ${len}=  Get Length  ${output}
-    Return From Keyword If  ${len} == 0  ${false}
-    [Return]  ${true}
-
-Do Volumes Exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -q
-    ${len}=  Get Length  ${output}
-    Return From Keyword If  ${len} == 0  ${false}
-    [Return]  ${true}
-
-Do Networks Exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} networks ls -q
-    ${len}=  Get Length  ${output}
-    Return From Keyword If  ${len} == 0  ${false}
-    [Return]  ${true}
-
-Remove All Containers
-    ${exist}=  Do Containers Exist
-    Run Keyword If  ${exist}  Log To Console  Stopping and removing all containers from %{VCH-NAME}
-    Return From Keyword If  ${exist} == ${false}  0
-
-    # Run Keyword If  ${exist}  Kill All Containers
-    Run Keyword If  ${exist}  Run  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -a -q)
-
-    ${exist}=  Do Containers Exist
-    Return From Keyword If  ${exist} == ${false}  0
-    Run Keyword If  ${exist}  Log All Containers
-    [Return]  1
-
-Stop All Containers
-    Run  docker %{VCH-PARAMS} stop $(docker %{VCH-PARAMS} ps -q)
-
-Kill All Containers
-    Run  docker %{VCH-PARAMS} kill $(docker %{VCH-PARAMS} ps -q)
-
-Remove All Images
-    ${exist}=  Do Images Exist
-    Run Keyword If  ${exist}  Log To Console  Removing all images from %{VCH-NAME}
-    
-    Return From Keyword If  ${exist} == ${false}  0
-    Run Keyword If  ${exist}  Remove All Containers
-    Run Keyword If  ${exist}  Run  docker %{VCH-PARAMS} rmi $(docker %{VCH-PARAMS} images -q)
-
-    ${exist}=  Do Images Exist
-    Return From Keyword If  ${exist} == ${false}  0
-    [Return]  1
-
-Remove All Volumes
-    ${exist}=  Do Volumes Exist
-    Run Keyword If  ${exist}  Log To Console  Removing all volumes from %{VCH-NAME}
-
-    Return From Keyword If  ${exist} == ${false}  0
-    Run Keyword If  ${exist}  Run  docker %{VCH-PARAMS} volume rm $(docker %{VCH-PARAMS} volume ls -q)
-
-    ${exist}=  Do Volumes Exist
-    Return From Keyword If  ${exist} == ${false}  0
-    [Return]  1
-
-Remove All Container Networks
-    ${exist}=  Do Networks Exist
-    Run Keyword If  ${exist}  Log To Console  Removing all container networks from %{VCH-NAME}
-
-    Return From Keyword If  ${exist} == ${false}  0
-    Run Keyword If  ${exist}  Run  docker %{VCH-PARAMS} network rm $(docker %{VCH-PARAMS} network ls -q)
-
-    ${exist}=  Do Networks Exist
-    Return From Keyword If  ${exist} == ${false}  0
-    [Return]  1
-    
-Add List To Dictionary
-    [Arguments]  ${dict}  ${list}
-    : FOR  ${item}  IN  @{list}
-    \    Set To Dictionary  ${dict}  ${item}  1
-
-List Existing Images On VCH
-    # Get list of image IDs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -q
-    ${len}=  Get Length  ${output}
-    Run Keyword If  ${len} != 0  Log To Console  Found images on %{VCH-NAME}:
-    ${image_ids}=  Run Keyword If  ${rc} == 0  Split String  ${output}
-    ${tags_dict}=  Create Dictionary
-    : FOR  ${id}  IN  @{image_ids}
-    \    ${rc}  ${repotags}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --format='{{.RepoTags}}' --type=image ${id}
-    \    ${clean_tags}  Strip String  ${repotags}  characters=[]
-    \    ${tags}=  Split String  ${clean_tags}
-    \    Add List To Dictionary  ${tags_dict}  ${tags}
-
-    : FOR  ${tag}  IN  @{tags_dict.keys()}
-    \    Log To Console  \t${tag}
-
-List Running Containers On VCH    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -q
-    Log To Console  ${EMPTY}
-    ${len}=  Get Length  ${output}
-    Run Keyword If  ${len} != 0  Log To Console  Found running containers on %{VCH-NAME}:
-    ...  ELSE  Log To Console  No running containers on %{VCH-NAME}
-    Return From Keyword If  ${len} == 0
-
-    ${cids}=  Run Keyword If  ${len} != 0  Split String  ${output}
-    : FOR  ${id}  IN  @{cids}
-    \    Log To Console  \t${id}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Drone-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Drone-Util.robot
deleted file mode 100644
index 2fd6638d53..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Drone-Util.robot
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains any keywords related to using the Drone CI Build System
-
-*** Keywords ***
-Get State Of Drone Build
-    [Arguments]  ${num}
-    Return From Keyword If  '${num}' == '0'  local
-	${out}=  Run  drone build info vmware/vic ${num} --format {{.Status}}
-    [Return]  ${out}
-
-Get Title of Drone Build
-    [Arguments]  ${num}
-    Return From Keyword If  '${num}' == '0'  local
-    ${out}=  Run  drone build info vmware/vic ${num} --format {{ .Message }}
-    [Return]  ${out}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Github-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Github-Util.robot
deleted file mode 100644
index ae154d691a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Github-Util.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource provides keywords to interact with Github
-
-*** Keywords ***
-Get State Of Github Issue
-    [Arguments]  ${num}
-    [Tags]  secret
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${status}  ${result}=  Run Keyword And Ignore Error  Get  https://api.github.com/repos/vmware/vic/issues/${num}?access_token\=%{GITHUB_AUTOMATION_API_KEY}
-    \   Exit For Loop If  '${status}'
-    \   Sleep  1
-    Should Be Equal  ${result.status_code}  ${200}
-    ${status}=  Get From Dictionary  ${result.json()}  state
-    [Return]  ${status}
-
-Post Comment To Github Issue
-    [Arguments]  ${num}  ${comment}
-    [Tags]  secret
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${status}  ${result}=  Run Keyword And Ignore Error  Post  https://api.github.com/repos/vmware/vic/issues/${num}/comments?access_token\=%{GITHUB_AUTOMATION_API_KEY}  data={"body": "${comment}"}
-    \   Exit For Loop If  '${status}'
-    \   Sleep  1
-    Should Be Equal  ${result.status_code}  ${201}
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Harbor-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Harbor-Util.robot
deleted file mode 100644
index d98c31a96b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Harbor-Util.robot
+++ /dev/null
@@ -1,643 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource provides any keywords related to the Harbor private registry appliance
-Library  Selenium2Library
-Library  OperatingSystem
-
-*** Variables ***
-${HARBOR_SHORT_VERSION}  0.5.0
-${HARBOR_VERSION}  harbor_0.5.0-9e4c90e
-${MY_PROJECTS_TABLE}  harbor-app > harbor-shell > clr-main-container > div > div > project > div > div > list-project
-${MY_MEMBERS_TABLE}  body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(2) > clr-datagrid > div > div > div > div.datagrid-body
-${harbor_cert}  getcert
-${ova_harbor_admin_password}  harbor-admin-passwd
-
-*** Keywords ***
-Install Harbor To Test Server
-    [Tags]  secret
-    [Arguments]  ${name}=harbor  ${protocol}=http  ${verify}=off  ${db_password}=%{TEST_PASSWORD}  ${user}=%{TEST_USERNAME}  ${password}=%{TEST_PASSWORD}  ${host}=%{TEST_URL_ARRAY}  ${datastore}=%{TEST_DATASTORE}  ${network}=VM Network
-    Log To Console  \nFetching harbor ova...
-    ${status}  ${message}=  Run Keyword And Ignore Error  OperatingSystem.File Should Exist  ${HARBOR_VERSION}.ova
-    ${out}=  Run Keyword If  '${status}' == 'FAIL'  Run  wget https://github.com/vmware/harbor/releases/download/${HARBOR_SHORT_VERSION}/${HARBOR_VERSION}.ova
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  DRONE_BUILD_NUMBER
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  DRONE_BUILD_NUMBER  0
-    @{URLs}=  Split String  %{TEST_URL_ARRAY}
-    ${len}=  Get Length  ${URLs}
-    ${IDX}=  Evaluate  %{DRONE_BUILD_NUMBER} \% ${len}
-
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Suite Variable  ${host}  @{URLs}[${IDX}]
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Suite Variable  ${host}  @{URLs}[${IDX}]%{TEST_DATACENTER}/host/%{TEST_RESOURCE}
-
-    Log To Console  \nDeploying ova...
-    ${out}=  Run  ovftool --noSSLVerify --acceptAllEulas --datastore=${datastore} --name=${name} --net:"Network 1"='${network}' --diskMode=thin --powerOn --X:waitForIp --X:injectOvfEnv --X:enableHiddenProperties --prop:root_pwd=${password} --prop:harbor_admin_password=${password} --prop:db_password=${db_password} --prop:auth_mode=db_auth --prop:verify_remote_cert=${verify} --prop:protocol=${protocol} ${HARBOR_VERSION}.ova 'vi://${user}:${password}@${host}'
-    Should Contain  ${out}  Received IP address:
-    Should Not Contain  ${out}  None
-
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  Received IP address:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Environment Variable  HARBOR-IP  ${ip}
-    \   Exit For Loop If  ${status}
-
-    Log To Console  Waiting for Harbor to Come Up...
-    :FOR  ${i}  IN RANGE  20
-    \  ${out}=  Run  curl -k ${protocol}://%{HARBOR-IP}
-    \  Log  ${out}
-    \  ${status}=  Run Keyword And Return Status  Should Not Contain Any  ${out}  502 Bad Gateway  Connection refused  Connection timed out
-    \  ${status}=  Run Keyword If  ${status}  Run Keyword And Return Status  Should Contain  ${out}  <title>Harbor</title>
-    \  Return From Keyword If  ${status}  %{HARBOR-IP}
-    \  Sleep  30s
-    Fail  Harbor failed to come up properly!
-    [Return]  %{HARBOR-IP}
-
-Restart Docker With Insecure Registry Option
-    # Requires you to edit /etc/systemd/system/docker.service.d/overlay.conf or docker.conf to be:
-    # ExecStart=/bin/bash -c "usr/bin/docker daemon -H fd:// -s overlay $DOCKER_OPTS --insecure-registry='cat /tmp/harbor'"
-    # Requires to be run as root
-    ${out}=  Run  systemctl daemon-reload
-    ${out}=  Run  systemctl restart docker
-    Log  ${out}
-
-Install Harbor Self Signed Cert
-    # Need to provide permissions to /etc/docker folder for your user (sudo chmod -R 777 /etc/docker)
-    ${out}=  Run  wget --tries=10 --connect-timeout=10 --auth-no-challenge --no-check-certificate --user admin --password ${ova_harbor_admin_password} https://%{HARBOR_IP}/api/systeminfo/getcert
-    Log  ${out}
-    ${out}=  Run  mkdir -p /etc/docker/certs.d/%{HARBOR_IP}
-    Move File  getcert  /etc/docker/certs.d/%{HARBOR_IP}/ca.crt
-    ${out}=  Run  systemctl daemon-reload
-    ${out}=  Run  systemctl restart docker
-
-Log Into Harbor
-    [Arguments]  ${user}=%{TEST_USERNAME}  ${pw}=%{TEST_PASSWORD}
-    Maximize Browser Window
-    Input Text  login_username  ${user}
-    Input Text  login_password  ${pw}
-    Click button  LOG IN
-    Wait Until Page Contains  Projects
-    Wait Until Keyword Succeeds  5x  1  Page Should Contain Element  xpath=/html/body/harbor-app/harbor-shell/clr-main-container[@class='main-container']/navigator/clr-header[@class='header-5 header']/div[@class='header-actions']/clr-dropdown[@class='dropdown bottom-right']/button[@class='nav-text dropdown-toggle']/span[contains(., '${user}')]
-
-Create A New Project
-    [Arguments]  ${name}  ${public}=${true}
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > a.nav-link.active
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > a.nav-link.active
-    Click Element  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > a.nav-link.active
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project > div > div > div:nth-child(2) > div.option-left > button
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project > div > div > div:nth-child(2) > div.option-left > button
-    Click Element  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project > div > div > div:nth-child(2) > div.option-left > button
-    Wait Until Page Contains  New Project
-    #Wait Until Element Is Visible  name="Project Name"
-    #Wait Until Element Is Enabled  name="Project Name"
-    Input Text  create_project_name  ${name}
-    #Wait Until Element Is Visible  css=body > div.container-fluid.container-fluid-custom.ng-scope > div > div > div > add-project > div > form > div > div.col-xs-10.col-md-10 > div:nth-child(2) > label > input
-    #Wait Until Element Is Enabled  css=body > div.container-fluid.container-fluid-custom.ng-scope > div > div > div > add-project > div > form > div > div.col-xs-10.col-md-10 > div:nth-child(2) > label > input
-    Sleep  1
-    Run Keyword If  ${public}  Select Checkbox  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project > div > div > div:nth-child(2) > div.option-left > create-project > clr-modal > div > div.modal-dialog > div > div.modal-body > form > section > div:nth-child(2) > div > label
-    Click Button  OK
-    Wait Until Keyword Succeeds  5x  1  Table Should Contain  css=${MY_PROJECTS_TABLE}  ${name}
-
-Create A New User
-    [Arguments]  ${name}  ${email}  ${fullName}  ${password}  ${comments}  
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > section > ul > li:nth-child(1) > a
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > section > ul > li:nth-child(1) > a
-    Click Element  css=body > harbor-app > harbor-shell > clr-main-container > div > nav > section > section > ul > li:nth-child(1) > a
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > div.action-panel-pos > span:nth-child(1) > button
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > div.action-panel-pos > span:nth-child(1) > button
-    Click Element  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > div.action-panel-pos > span:nth-child(1) > button
-
-    Wait Until Element Is Visible  username
-    Wait Until Element Is Enabled  username
-    Wait Until Element Is Visible  email
-    Wait Until Element Is Enabled  email
-    Wait Until Element Is Visible  realname
-    Wait Until Element Is Enabled  realname
-    Wait Until Element Is Visible  newPassword
-    Wait Until Element Is Enabled  newPassword
-    Wait Until Element Is Visible  confirmPassword
-    Wait Until Element Is Enabled  confirmPassword
-    Wait Until Element Is Visible  comment
-    Wait Until Element Is Enabled  comment
-
-    Input Text  username  ${name}
-    Input Text  email  ${email}
-    Input Text  realname  ${fullName}
-    Input Text  newPassword  ${password}
-    Input Text  confirmPassword  ${password}
-    Input Text  comment  ${comments}
-
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > new-user-modal > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > new-user-modal > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-    Click Button  css=body > harbor-app > harbor-shell > clr-main-container > div > div > harbor-user > div > div > new-user-modal > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-
-    Wait Until Page Contains  New user created successfully.
-    Sleep  3
-
-Toggle Admin Priviledges For User
-    [Arguments]  ${user}
-    Wait Until Element Is Visible  //a[@tag='admin_option']
-    Wait Until Element Is Enabled  //a[@tag='admin_option']
-    Click Link  Admin Options
-    Table Should Contain  css=body > div.container-fluid.container-fluid-custom.ng-scope > div > div > div > list-user > div > div > div.pane > div.sub-pane > div.table-body-container > table  ${user}
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()-1]/toggle-admin/button[not(contains(@class, 'ng-hide'))]
-    Wait Until Element Is Enabled  xpath=//td[text()='test-user']/../td[last()-1]/toggle-admin/button[not(contains(@class, 'ng-hide'))]
-    ${oldPublicity}=  Get Text  xpath=//td[text()='test-user']/../td[last()-1]/toggle-admin/button[not(contains(@class, 'ng-hide'))]
-    Click Button  xpath=//td[text()='test-user']/../td[last()-1]/toggle-admin/button[not(contains(@class, 'ng-hide'))]
-    Sleep  1
-    Log to Console  show result
-    ${newPublicity}=  Get Text  xpath=//td[text()='test-user']/../td[last()-1]/toggle-admin/button[not(contains(@class, 'ng-hide'))]
-    Should Not Be Equal  ${oldPublicity}  ${newPublicity}
-    [return]  ${newPublicity}
-
-Delete A User
-    [Arguments]  ${user}
-    Wait Until Element Is Visible  //a[@tag='admin_option']
-    Wait Until Element Is Enabled  //a[@tag='admin_option']
-    Click Link  Admin Options
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a
-    Wait Until Element Is Enabled  xpath=//td[text()='${user}']/../td[last()]/a
-    Click Link  xpath=//td[text()='${user}']/../td[last()]/a
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Are you sure to delete the user "${user}" ?
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Element Should Not Contain  css=div.table-body-container > table  ${user}
-
-Search For A User
-    [Arguments]  ${keyword}
-    Wait Until Element Is Visible  //a[@tag='admin_option']
-    Wait Until Element Is Enabled  //a[@tag='admin_option']
-    Click Link  Admin Options
-    Wait Until Element Is Visible  txtSearchInput
-    Wait Until Element Is Enabled  txtSearchInput
-    Input Text  txtSearchInput  ${keyword}
-    Wait Until Element Is Visible  css=span.input-group-btn > button
-    Wait Until Element Is Enabled  css=span.input-group-btn > button
-    Click Button  css=span.input-group-btn > button
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Table Should Contain  css=div.table-body-container > table  ${keyword}
-    # check all result contains the search keyword
-    Wait Until Element Is Visible  xpath=//tbody/tr/td[1]
-    Wait Until Element Is Enabled  xpath=//tbody/tr/td[1]
-    ${rowNum}=  Get Matching Xpath Count  xpath=//tbody/tr/td[1]
-    ${names}=  Create List
-    ${realRowNum}=  Evaluate  ${rowNum} + 1
-    :FOR  ${idx}  IN RANGE  1  ${realRowNum}
-    \  ${searchName}=  Get Text  xpath=//tbody/tr[${idx}]/td[1]
-    \  Should Match Regexp  ${searchName}  .*${keyword}.*
-    \  Append To List  ${names}  ${searchName}
-    [return]  ${names}
-
-Change User Information
-    [Arguments]  ${email}  ${fullName}  ${comments}
-    Wait Until Element Is Visible  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Enabled  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Click Link  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Visible  xpath=//a[contains(., 'Account Settings')]
-    Wait Until Element Is Enabled  xpath=//a[contains(., 'Account Settings')]
-    Click Link  xpath=//a[contains(., 'Account Settings')]
-    Wait Until Element Is Visible  email
-    Wait Until Element Is Enabled  email
-    Wait Until Element Is Visible  fullName
-    Wait Until Element Is Enabled  fullName
-    Wait Until Element Is Visible  comments
-    Wait Until Element Is Enabled  comments
-    Input Text  email  ${email}
-    Input Text  fullName  ${fullName}
-    Input Text  comments  ${comments}
-
-    Wait Until Element Is Visible  xpath=//input[@value='Save']
-    Wait Until Element Is Enabled  xpath=//input[@value='Save']
-    Click Element  xpath=//input[@value='Save']
-
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  User profile has been changed successfully.
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Wait Until Page Contains  Summary
-    Wait Until Page Contains  My Projects:
-
-Change User Password
-    [Arguments]  ${password}  ${newPassword}
-    Wait Until Element Is Visible  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Enabled  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Click Link  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Visible  xpath=//a[contains(., 'Account Settings')]
-    Wait Until Element Is Enabled  xpath=//a[contains(., 'Account Settings')]
-    Click Link  xpath=//a[contains(., 'Account Settings')]
-    Wait Until Element Is Visible  toggleChangePassword
-    Wait Until Element Is Enabled  toggleChangePassword
-    Click Link  toggleChangePassword
-    Wait Until Element Is Visible  oldPassword
-    Wait Until Element Is Enabled  oldPassword
-    Wait Until Element Is Visible  password
-    Wait Until Element Is Enabled  password
-    Wait Until Element Is Visible  confirmPassword
-    Wait Until Element Is Enabled  confirmPassword
-    Input Text  oldPassword  ${password}
-    Input Text  password  ${newPassword}
-    Input Text  confirmPassword  ${newPassword}
-
-    Wait Until Element Is Visible  xpath=//input[@value='Save']
-    Wait Until Element Is Enabled  xpath=//input[@value='Save']
-    Click Element  xpath=//input[@value='Save']
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Password has been changed successfully.
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Wait Until Page Contains  Summary
-    Wait Until Page Contains  My Projects:
-
-Logout Harbor
-    Wait Until Element Is Visible  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Enabled  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Click Link  css=#bs-harbor-navbar-collapse-1 > optional-menu > div > a
-    Wait Until Element Is Visible  xpath=//a[contains(., 'Log Out')]
-    Wait Until Element Is Enabled  xpath=//a[contains(., 'Log Out')]
-    Click Link  xpath=//a[contains(., 'Log Out')]
-    Wait Until Keyword Succeeds  5x  1  Page Should Contain Element  xpath=//h4[text()='Login Now']
-
-Sign up
-    [Arguments]  ${name}  ${email}  ${fullName}  ${password}  ${comments}
-    Wait Until Element Is Visible  xpath=//button[text()='Sign Up']
-    Wait Until Element Is Enabled  xpath=//button[text()='Sign Up']
-    Click Button  xpath=//button[text()='Sign Up']
-    Wait Until Keyword Succeeds  5x  1  Page Should Contain Element  xpath=//button[text()='Sign Up']
-    Wait Until Element Is Visible  username
-    Wait Until Element Is Enabled  username
-    Wait Until Element Is Visible  email
-    Wait Until Element Is Enabled  email
-    Wait Until Element Is Visible  fullName
-    Wait Until Element Is Enabled  fullName
-    Wait Until Element Is Visible  password
-    Wait Until Element Is Enabled  password
-    Wait Until Element Is Visible  confirmPassword
-    Wait Until Element Is Enabled  confirmPassword
-    Wait Until Element Is Visible  comments
-    Wait Until Element Is Enabled  comments
-
-    Input Text  username  ${name}
-    Input Text  email  ${email}
-    Input Text  fullName  ${fullName}
-    Input Text  password  ${password}
-    Input Text  confirmPassword  ${password}
-    Input Text  comments  ${comments}
-
-    Wait Until Element Is Visible  xpath=//button[text()='Sign Up']
-    Wait Until Element Is Enabled  xpath=//button[text()='Sign Up']
-    Click Button  xpath=//button[text()='Sign Up']
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Signed up successfully.
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-
-    Wait Until Keyword Succeeds  5x  1  Page Should Contain Element  xpath=//h4[text()='Login Now']
-
-Add A User To A Project
-    # role should be one of the strings : 'Project Admin'/'Developer'/'Guest'
-    [Arguments]  ${user}  ${project}  ${role}
-    Click Link  Projects
-    Wait Until Keyword Succeeds  5x  1  Table Should Contain  css=${MY_PROJECTS_TABLE}  ${project}
-    Wait Until Element Is Visible  xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/project/div/div/list-project/clr-datagrid/div/div/div/div[2]/clr-dg-row[2]/clr-dg-cell[2]/a[text()='${project}']
-    Wait Until Element Is Enabled  xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/project/div/div/list-project/clr-datagrid/div/div/div/div[2]/clr-dg-row[2]/clr-dg-cell[2]/a[text()='${project}']
-    Click Link  xpath=/html/body/harbor-app/harbor-shell/clr-main-container/div/div/project/div/div/list-project/clr-datagrid/div/div/div/div[2]/clr-dg-row[2]/clr-dg-cell[2]/a[text()='${project}']
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > nav > ul > li:nth-child(2) > a
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > nav > ul > li:nth-child(2) > a
-    Click Link  Members
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > button
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > button
-    Click Button  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > button
-    Wait Until Element Is Visible  member_name
-    Wait Until Element Is Enabled  member_name
-    Input Text  member_name  ${user}
-    Wait Until Element Is Visible  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > add-member > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-    Wait Until Element Is Enabled  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > add-member > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-    Click Button  css=body > harbor-app > harbor-shell > clr-main-container > div > div > project-detail > ng-component > div > div:nth-child(1) > div > div.flex-xs-middle.option-left > add-member > clr-modal > div > div.modal-dialog > div > div.modal-footer > button.btn.btn-primary
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Table Should Contain  css=${MY_MEMBERS_TABLE}  ${user}
-
-Remove A User From A Project
-    [Arguments]  ${user}  ${project}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Table Should Contain  css=${MY_PROJECTS_TABLE}  ${project}
-    Wait Until Element Is Visible  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Enabled  xpath=//td/a[text()='${project}']
-    Click Link  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Visible  xpath=//a[@tag='users']
-    Wait Until Element Is Enabled  xpath=//a[@tag='users']
-    Click Link  Users
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[last()]
-    Wait Until Element Is Enabled  xpath=//td[text()='${user}']/../td[last()]/a[last()]
-    Click Link  xpath=//td[text()='${user}']/../td[last()]/a[last()]
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Page Should Not Contain  ${user}
-
-Change A User's Role In A Project
-    [Arguments]  ${user}  ${project}  ${role}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Wait Until Element Is Visible  css=${MY_PROJECTS_TABLE}
-    Table Should Contain  css=${MY_PROJECTS_TABLE}  ${project}
-    Click Link  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Visible  xpath=//a[@tag='users']
-    Wait Until Element Is Enabled  xpath=//a[@tag='users']
-    Click Link  Users
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Enabled  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]/span[@title='Edit']
-    Click Link  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Visible  css=select.form-control
-    Wait Until Element Is Enabled  css=select.form-control
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Enabled  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]/span[@title='Confirm']
-    Select From List By Label  css=select  ${role}
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Wait Until Element Is Enabled  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Click Link  xpath=//td[text()='${user}']/../td[last()]/a[1]
-    Sleep  1
-    Wait Until Element Is Visible  xpath=//td[text()='${user}']/../td[last()]/a[1]/span[@title='Edit']
-    Wait Until Keyword Succeeds  5x  1  Page Should Contain Element  //td[text()='${user}']/../td[2]/switch-role/ng-switch/span[text()='${role}']
-
-Delete A Project
-    [Arguments]  ${project}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Wait Until Element Is Visible  xpath=//td/a[text()='${project}']/../../td[last()]/a
-    Wait Until Element Is Enabled  xpath=//td/a[text()='${project}']/../../td[last()]/a
-    Click Link  xpath=//td/a[text()='${project}']/../../td[last()]/a
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Are you sure to delete the project "${project}" ?
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Element Should Not Contain  css=${MY_PROJECTS_TABLE}  ${project}
-
-Search For A Project
-    # search for the project contains the keyword, and return all result as a list
-    [Arguments]  ${keyword}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Wait Until Element Is Visible  xpath=//input[@ng-model='vm.projectName']
-    Wait Until Element Is Enabled  xpath=//input[@ng-model='vm.projectName']
-    Input Text  xpath=//input[@ng-model='vm.projectName']  ${keyword}
-    Wait Until Element Is Visible  css=span.input-group-btn > button
-    Wait Until Element Is Enabled  css=span.input-group-btn > button
-    Click Button  css=span.input-group-btn > button
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Table Should Contain  css=${MY_PROJECTS_TABLE}  ${keyword}
-    # check all result contains the search keyword
-    Wait Until Element Is Visible  xpath=//tbody/tr/td[1]
-    Wait Until Element Is Enabled  xpath=//tbody/tr/td[1]
-    ${rowNum}=  Get Matching Xpath Count  xpath=//tbody/tr/td[1]
-    ${names}=  Create List
-    ${realRowNum}=  Evaluate  ${rowNum} + 2
-    :FOR  ${idx}  IN RANGE  2  ${realRowNum}
-    \  ${searchName}=  Get Text  xpath=//tbody/tr[${idx}]/td[1]
-    \  Should Match Regexp  ${searchName}  .*${keyword}.*
-    \  Append To List  ${names}  ${searchName}
-    [return]  ${names}
-
-Delete Repository From Project
-    [Arguments]  ${image}  ${project}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Table Should Contain  css=${MY_PROJECTS_TABLE}  ${project}
-    Wait Until Element Is Visible  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Enabled  xpath=//td/a[text()='${project}']
-    Click Link  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Visible  xpath=//a[contains(., '${project}/${image}')]/../a[last()]
-    Wait Until Element Is Enabled  xpath=//a[contains(., '${project}/${image}')]/../a[last()]
-    Click Link  xpath=//a[contains(., '${project}/${image}')]/../a[last()]
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Delete repository "${project}/${image}" now?
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Sleep  1
-    Wait Until Keyword Succeeds  5x  1  Element Should Not Contain  css=div.sub-pane  ${project}/${image}
-
-Delete Image From Project
-    [Arguments]  ${image}  ${tag}  ${project}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Table Should Contain  css=${MY_PROJECTS_TABLE}  ${project}
-    Wait Until Element Is Visible  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Enabled  xpath=//td/a[text()='${project}']
-    Click Link  xpath=//td/a[text()='${project}']
-    Wait Until Element Is Visible  xpath=//a[contains(., '${project}/${image}')]
-    Wait Until Element Is Enabled  xpath=//a[contains(., '${project}/${image}')]
-    Click Link  xpath=//a[contains(., '${project}/${image}')]
-    Wait Until Element Is Visible  xpath=//a[contains(., '${project}/${image}')]/../../../div[2]/div/table/tbody/tr/td[text()='${tag}']/../td[last()]/a
-    Wait Until Element Is Enabled  xpath=//a[contains(., '${project}/${image}')]/../../../div[2]/div/table/tbody/tr/td[text()='${tag}']/../td[last()]/a
-    Click Link  xpath=//a[contains(., '${project}/${image}')]/../../../div[2]/div/table/tbody/tr/td[text()='${tag}']/../td[last()]/a
-    Wait Until Element Is Visible  css=div.modal.fade.in > div > div > div:nth-child(2)
-    Wait Until Element Contains  css=div.modal.fade.in > div > div > div:nth-child(2)  Delete tag "${tag}" now?
-    Wait Until Element Is Enabled  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Click Button  css=div.modal.fade.in > div > div > div:nth-child(3) > button:nth-child(1)
-    Sleep  1
-    # if it is last image in this repo, the repo will be deleted
-    ${imageNum}=  Get Text  xpath=//a[contains(., '${project}/${image}')]/span[2]
-    Run Keyword If  '${imageNum}'=='1'  Wait Until Keyword Succeeds  5x  1  Element Should Not Contain  css=div.sub-pane  ${tag}
-    ...  Else  Wait Until Keyword Succeeds  5x  1  Element Should Not Contain  xpath=//a[contains(., '${project}/${image}')]/../../../div[2]/div/table/tbody  ${tag}
-
-Toggle Publicity On Project
-    [Arguments]  ${project}
-    Wait Until Element Is Visible  //a[@tag='project']
-    Wait Until Element Is Enabled  //a[@tag='project']
-    Click Link  Projects
-    Wait Until Element Is Visible  xpath=//td/a[text()='${project}']/../../td[last()-1]/publicity-button/button
-    Wait Until Element Is Enabled  xpath=//td/a[text()='${project}']/../../td[last()-1]/publicity-button/button
-    ${oldPublicity}=  Get Text  xpath=//td/a[text()='${project}']/../../td[last()-1]/publicity-button/button
-    Click Button  //td/a[text()='${project}']/../../td[last()-1]/publicity-button/button
-    Sleep  1
-    ${newPublicity}=  Get Text  xpath=//td/a[text()='${project}']/../../td[last()-1]/publicity-button/button
-    Should Not Be Equal  ${oldPublicity}  ${newPublicity}
-    [return]  ${newPublicity}
-
-Go To HomePage
-    Wait Until Element Is Visible  css=a.navbar-brand
-    Wait Until Element Is Enabled  css=a.navbar-brand
-    Click Link  css=a.navbar-brand
-
-    Wait Until Page Contains  Summary
-    Wait Until Page Contains  My Projects:
-
-Check That VM Is Removed
-    [Arguments]  ${container}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc ls %{VCH-NAME}/vm
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Not Contain  ${output}  ${container}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc ls vm
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Not Contain  ${output}  ${container}
-
-Check That Datastore Is Cleaned
-    [Arguments]  ${container}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  ${container}
-
-Create Project And Three Users For It
-    [Arguments]  ${developer}  ${developer2}  ${developerEmail}  ${developerEmail2}  ${developerFullName}  ${password}  ${userPassword}  ${comments}  ${guest}  ${developerRole}  ${guestRole}  ${project}  ${public}=${False}
-    # 2 developers, 1 guest
-    Log To Console  Create Three Users For Project..
-    Open Browser  https://%{HARBOR_IP}/  chrome
-    Log To Console  Opened
-    Log Into Harbor  user=admin  pw=${password}
-    
-    Create A New Project  name=${project}  public=${False}
-    Log To Console  Create a New User..
-    Create A New User  name=${developer}  email=${developerEmail}  fullName=${developerFullName}  password=${userPassword}  comments=${comments}
-    Create A New User  name=${guest}  email=${guestEmail}  fullName=${guestFullName}  password=${userPassword}  comments=${comments}
-    Create A New User  name=${developer2}  email=${developerEmail2}  fullName=${developerFullName}  password=${userPassword}  comments=${comments}
-    
-    Add A User To A Project  user=${developer}  project=${project}  role=${developerRole}
-    Add A User To A Project  user=${guest}  project=${project}  role=${guestRole}
-    Add A User To A Project  user=${developer2}  project=${project}  role=${developerRole}
-    Log To Console  User Creation Complete..
-    Close All Browsers
-
-Basic Docker Command With Harbor
-    [Arguments]  ${user}  ${password}  ${project}  ${image}  ${container_name}
-    # Docker login
-    Log To Console  \nRunning docker login ${user}...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login -u ${user} -p ${password} %{HARBOR_IP}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Should Not Contain  ${output}  Error response from daemon
-
-    # Docker pull from dockerhub
-    Log To Console  docker pull from dockerhub...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker tag image
-    Log To Console  docker tag...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker tag ${image} %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker push image
-    Log To Console  push image...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker push %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  digest:
-    Should Contain  ${output}  latest:
-    Should Not Contain  ${output}  No such image:
-
-    # Docker delete image in local registry
-    Log To Console  docker rmi...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-    # Docker pull from harbor using VCH
-    Log To Console  docker pull from harbor using VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker run image
-    Log To Console  docker run...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${container_name} %{HARBOR_IP}/${project}/${image} /bin/ash -c "dmesg;echo END_OF_THE_TEST" 
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-    # Docker rm container
-    Log To Console  docker rm...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker create
-    Log To Console  docker create...
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${container_name} -i %{HARBOR_IP}/${project}/${image} /bin/top
-    Log  ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker start
-    Log To Console  docker start...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker attach
-    Log To Console  Starting process Docker attach...
-    Start Process  docker %{VCH-PARAMS} attach ${container_name} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Log  ${ret}
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-    # Docker start
-    Log To Console  docker start...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker stop
-    Log To Console  docker stop...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Docker remove
-    Log To Console  docker rm...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${container_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container_name}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container_name}
-
-    # Docker delete image
-    Log To Console  docker rmi...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi -f %{HARBOR_IP}/${project}/${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Untagged
-
-Fetch Harbor Self Signed Cert
-    [Tags]  secret
-    [Arguments]  ${harbor-ip}  ${user}=admin  ${password}=%{TEST_PASSWORD}
-    Remove File  ${harbor_cert}
-    ${rc}=  Run And Return Rc  wget -q --tries=10 --connect-timeout=10 --auth-no-challenge --no-check-certificate --user ${user} --password ${password} https://${harbor-ip}/api/systeminfo/${harbor_cert}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${harbor_cert}
-
-# Requires vc credential for govc
-Cleanup Harbor
-    [Tags]  secret
-    [Arguments]  ${harbor-name}  ${host}=%{TEST_URL}  ${user}=%{TEST_USERNAME}  ${password}=%{TEST_PASSWORD}
-    Log To Console  \nCleanup Harbor... TEST_URL:%{TEST_URL}
-    Remove File  ${HARBOR_VERSION}.ova
-    Remove File  ${harbor_cert}
-    ${out}=  Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc vm.destroy ${harbor-name}
-    [Return]  ${out}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Nimbus-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Nimbus-Util.robot
deleted file mode 100644
index e60a534c9b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Nimbus-Util.robot
+++ /dev/null
@@ -1,415 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains any keywords related to using the Nimbus cluster
-
-*** Variables ***
-${ESX_VERSION}  ob-5969303  #6.5 RTM vsphere65u1
-${VC_VERSION}  ob-5973321   #6.5 RTM vsphere65u1
-${NIMBUS_ESX_PASSWORD}  e2eFunctionalTest
-
-*** Keywords ***
-Fetch IP
-    [Arguments]  ${name}
-    ${out}=  Execute Command  nimbus-ctl ip %{NIMBUS_USER}-${name} | grep %{NIMBUS_USER}-${name}
-    Should Not Be Empty  ${out}
-    ${len}=  Get Line Count  ${out}
-    Should Be Equal As Integers  ${len}  1
-    [Return]  ${out}
-
-Get IP
-    [Arguments]  ${name}
-    ${out}=  Wait Until Keyword Succeeds  10x  1 minute  Fetch IP  ${name}
-    ${ip}=  Fetch From Right  ${out}  ${SPACE}
-    [Return]  ${ip}
-
-Deploy Nimbus ESXi Server
-    [Arguments]  ${user}  ${password}  ${version}=${ESX_VERSION}  ${tls_disabled}=True
-    ${name}=  Evaluate  'ESX-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    Log To Console  \nDeploying Nimbus ESXi server: ${name}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-
-    :FOR  ${IDX}  IN RANGE  1  5
-    \   ${out}=  Execute Command  nimbus-esxdeploy ${name} --disk=48000000 --ssd=24000000 --memory=8192 --lease=1 --nics 2 ${version}
-    \   # Make sure the deploy actually worked
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  To manage this VM use
-    \   Exit For Loop If  ${status}
-    \   Log To Console  ${out}
-    \   Log To Console  Nimbus deployment ${IDX} failed, trying again in 5 minutes
-    \   Sleep  5 minutes
-
-    # Now grab the IP address and return the name and ip for later use
-    @{out}=  Split To Lines  ${out}
-    :FOR  ${item}  IN  @{out}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  IP is
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    @{gotIP}=  Split String  ${line}  ${SPACE}
-    ${ip}=  Remove String  @{gotIP}[5]  ,
-
-    # Let's set a password so govc doesn't complain
-    Remove Environment Variable  GOVC_PASSWORD
-    Remove Environment Variable  GOVC_USERNAME
-    Remove Environment Variable  GOVC_DATACENTER
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_URL  root:@${ip}
-    ${out}=  Run  govc host.account.update -id root -password ${NIMBUS_ESX_PASSWORD}
-    Should Be Empty  ${out}
-    Run Keyword If  ${tls_disabled}  Disable TLS On ESX Host
-    Log To Console  Successfully deployed new ESXi server - ${user}-${name}
-    Close connection
-    [Return]  ${user}-${name}  ${ip}
-
-Set Host Password
-    [Arguments]  ${ip}  ${NIMBUS_ESX_PASSWORD}
-    Remove Environment Variable  GOVC_PASSWORD
-    Remove Environment Variable  GOVC_USERNAME
-    Remove Environment Variable  GOVC_DATACENTER
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_URL  root:@${ip}
-    ${out}=  Run  govc host.account.update -id root -password ${NIMBUS_ESX_PASSWORD}
-    Should Be Empty  ${out}
-    Disable TLS On ESX Host
-    Log To Console  \nNimbus ESXi server IP: ${ip}
-
-Deploy Multiple Nimbus ESXi Servers in Parallel
-    [Arguments]  ${number}  ${user}=%{NIMBUS_USER}  ${password}=%{NIMBUS_PASSWORD}  ${version}=${ESX_VERSION}
-    @{names}=  Create List
-    ${num}=  Convert To Integer  ${number}
-    :FOR  ${x}  IN RANGE  ${num}
-    \     ${name}=  Evaluate  'ESX-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    \     Append To List  ${names}  ${name}
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-
-    @{processes}=  Create List
-    :FOR  ${name}  IN  @{names}
-    \    ${output}=  Deploy Nimbus ESXi Server Async  ${name}
-    \    Append To List  ${processes}  ${output}
-
-    :FOR  ${process}  IN  @{processes}
-    \    ${pid}=  Convert To Integer  ${process}
-    \    ${result}=  Wait For Process  ${pid}
-    \    Log  ${result.stdout}
-    \    Log  ${result.stderr}
-
-    &{ips}=  Create Dictionary
-    :FOR  ${name}  IN  @{names}
-    \    ${ip}=  Get IP  ${name}
-    \    ${ip}=  Evaluate  $ip if $ip else ''
-    \    Run Keyword If  '${ip}'  Set To Dictionary  ${ips}  ${user}-${name}  ${ip}
-
-    # Let's set a password so govc doesn't complain
-    ${just_ips}=  Get Dictionary Values  ${ips}
-    :FOR  ${ip}  IN  @{just_ips}
-    \    Log To Console  Successfully deployed new ESXi server - ${ip}
-    \    Set Host Password  ${ip}  ${NIMBUS_ESX_PASSWORD}
-
-    Close connection
-    [Return]  ${ips}
-
-Deploy Nimbus vCenter Server
-    [Arguments]  ${user}  ${password}  ${version}=${VC_VERSION}
-    ${name}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    Log To Console  \nDeploying Nimbus vCenter server: ${name}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-
-    :FOR  ${IDX}  IN RANGE  1  5
-    \   ${out}=  Execute Command  nimbus-vcvadeploy --lease=1 --vcvaBuild ${version} ${name}
-    \   # Make sure the deploy actually worked
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  Overall Status: Succeeded
-    \   Exit For Loop If  ${status}
-    \   Log To Console  Nimbus deployment ${IDX} failed, trying again in 5 minutes
-    \   Sleep  5 minutes
-
-    # Now grab the IP address and return the name and ip for later use
-    @{out}=  Split To Lines  ${out}
-    :FOR  ${item}  IN  @{out}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  Cloudvm is running on IP
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    ${ip}=  Fetch From Right  ${line}  ${SPACE}
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${ip}
-    Log To Console  Successfully deployed new vCenter server - ${user}-${name}
-    Close connection
-    [Return]  ${user}-${name}  ${ip}
-
-Deploy Nimbus ESXi Server Async
-    [Tags]  secret
-    [Arguments]  ${name}  ${version}=${ESX_VERSION}
-    Log To Console  \nDeploying Nimbus ESXi server: ${name}
-    ${out}=  Run Secret SSHPASS command  %{NIMBUS_USER}  '%{NIMBUS_PASSWORD}'  'nimbus-esxdeploy ${name} --disk\=48000000 --ssd\=24000000 --memory\=8192 --lease=1 --nics 2 ${version}'
-    [Return]  ${out}
-
-Run Secret SSHPASS command
-    [Tags]  secret
-    [Arguments]  ${user}  ${password}  ${cmd}
-
-    ${out}=  Start Process  sshpass -p ${password} ssh -o StrictHostKeyChecking\=no ${user}@%{NIMBUS_GW} ${cmd}  shell=True
-    [Return]  ${out}
-
-Deploy Nimbus vCenter Server Async
-    [Tags]  secret
-    [Arguments]  ${name}  ${version}=${VC_VERSION}
-    Log To Console  \nDeploying Nimbus VC server: ${name}
-
-    ${out}=  Run Secret SSHPASS command  %{NIMBUS_USER}  '%{NIMBUS_PASSWORD}'  'nimbus-vcvadeploy --lease=1 --vcvaBuild ${version} ${name}'
-    [Return]  ${out}
-
-Deploy Nimbus Testbed
-    [Arguments]  ${user}  ${password}  ${testbed}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-
-    :FOR  ${IDX}  IN RANGE  1  5
-    \   ${out}=  Execute Command  nimbus-testbeddeploy --lease=1 ${testbed}
-    \   Log  ${out}
-    \   # Make sure the deploy actually worked
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  "deployment_result"=>"PASS"
-    \   Return From Keyword If  ${status}  ${out}
-    \   Log To Console  Nimbus deployment ${IDX} failed, trying again in 5 minutes
-    \   Sleep  5 minutes
-    Fail  Deploy Nimbus Testbed Failed 5 times over the course of more than 25 minutes
-
-Kill Nimbus Server
-    [Arguments]  ${user}  ${password}  ${name}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-    ${out}=  Execute Command  nimbus-ctl kill ${name}
-    Log  ${out}
-    Close connection
-
-Cleanup Nimbus PXE folder
-    [Arguments]  ${user}  ${password}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-    ${out}=  Execute Command  rm -rf public_html/pxe/*
-    Close connection
-
-Nimbus Cleanup
-    [Arguments]  ${vm_list}  ${collect_log}=True  ${dontDelete}=${false}
-    Run Keyword If  ${collect_log}  Run Keyword And Continue On Failure  Gather Logs From Test Server
-    Run Keyword And Ignore Error  Cleanup Nimbus PXE folder  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    Return From Keyword If  ${dontDelete}
-    ${list}=  Catenate  @{vm_list}
-    Run Keyword And Ignore Error  Kill Nimbus Server  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${list}
-
-Gather Host IPs
-    ${out}=  Run  govc ls host/cls
-    ${out}=  Split To Lines  ${out}
-    ${idx}=  Set Variable  1
-    :FOR  ${line}  IN  @{out}
-    \   Continue For Loop If  '${line}' == '/vcqaDC/host/cls/Resources'
-    \   ${ip}=  Fetch From Right  ${line}  /
-    \   Set Suite Variable  ${esx${idx}-ip}  ${ip}
-    \   ${idx}=  Evaluate  ${idx}+1
-
-Create a VSAN Cluster
-    [Arguments]  ${name}=vic-vmotion
-    Log To Console  \nStarting basic VSAN cluster deploy...
-    Run Keyword And Ignore Error  Nimbus Cleanup  ${list}  ${false}
-    ${out}=  Deploy Nimbus Testbed  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  --plugin testng --lease 1 --noStatsDump --noSupportBundles --vcvaBuild ${VC_VERSION} --esxPxeDir ${ESX_VERSION} --esxBuild ${ESX_VERSION} --testbedName vcqa-vsan-simple-pxeBoot-vcva --runName ${name}
-    Should Contain  ${out}  .vcva-${VC_VERSION}' is up. IP:
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  .vcva-${VC_VERSION}' is up. IP:
-    \   ${ip}=  Run Keyword If  ${status}  Fetch From Right  ${line}  ${SPACE}
-    \   Run Keyword If  ${status}  Set Suite Variable  ${vc-ip}  ${ip}
-    \   Exit For Loop If  ${status}
-
-    Log To Console  Set environment variables up for GOVC
-    Set Environment Variable  GOVC_URL  ${vc-ip}
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin\!23
-
-    Log To Console  Create a distributed switch
-    ${out}=  Wait Until Keyword Succeeds  10x  3 minutes  Run  govc dvs.create -dc=vcqaDC test-ds
-    Should Contain  ${out}  OK
-
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=vcqaDC -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=vcqaDC -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=vcqaDC -dvs=test-ds bridge
-    Should Contain  ${out}  OK
-
-    Log To Console  Add all the hosts to the distributed switch
-    ${out}=  Run  govc dvs.add -dvs=test-ds -pnic=vmnic1 /vcqaDC/host/cls
-    Should Contain  ${out}  OK
-
-    Log To Console  Enable DRS and VSAN on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /vcqaDC/host/cls
-    Should Be Empty  ${out}
-
-    Log To Console  Deploy VIC to the VC cluster
-    Set Environment Variable  TEST_URL_ARRAY  ${vc-ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-    Set Environment Variable  TEST_DATASTORE  vsanDatastore
-    Set Environment Variable  TEST_RESOURCE  cls
-    Set Environment Variable  TEST_TIMEOUT  15m
-
-    Gather Host IPs
-
-Create a Simple VC Cluster
-    [Arguments]  ${datacenter}=ha-datacenter  ${cluster}=cls  ${esx_number}=3  ${network}=True
-    Log To Console  \nStarting simple VC cluster deploy...
-    ${vc}=  Evaluate  'VC-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    ${pid}=  Deploy Nimbus vCenter Server Async  ${vc}
-
-    &{esxes}=  Deploy Multiple Nimbus ESXi Servers in Parallel  ${esx_number}  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}  ${ESX_VERSION}
-    @{esx_names}=  Get Dictionary Keys  ${esxes}
-    @{esx_ips}=  Get Dictionary Values  ${esxes}
-
-    # Finish vCenter deploy
-    ${output}=  Wait For Process  ${pid}
-    Should Contain  ${output.stdout}  Overall Status: Succeeded
-
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  %{NIMBUS_USER}  %{NIMBUS_PASSWORD}
-    ${vc_ip}=  Get IP  ${vc}
-    Close Connection
-
-    Set Environment Variable  GOVC_INSECURE  1
-    Set Environment Variable  GOVC_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  GOVC_PASSWORD  Admin!23
-    Set Environment Variable  GOVC_URL  ${vc_ip}
-
-    Log To Console  Create a datacenter on the VC
-    ${out}=  Run  govc datacenter.create ${datacenter}
-    Should Be Empty  ${out}
-
-    Log To Console  Create a cluster on the VC
-    ${out}=  Run  govc cluster.create ${cluster}
-    Should Be Empty  ${out}
-
-    Log To Console  Add ESX host to the VC
-    :FOR  ${IDX}  IN RANGE  ${esx_number}
-    \   ${out}=  Run  govc cluster.add -hostname=@{esx_ips}[${IDX}] -username=root -dc=${datacenter} -password=${NIMBUS_ESX_PASSWORD} -noverify=true
-    \   Should Contain  ${out}  OK
-
-    Run Keyword If  ${network}  Setup Network For Simple VC Cluster  ${esx_number}  ${datacenter}  ${cluster}
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /${datacenter}/host/${cluster}
-    Should Be Empty  ${out}
-
-    Set Environment Variable  TEST_URL_ARRAY  ${vc_ip}
-    Set Environment Variable  TEST_URL  ${vc_ip}
-    Set Environment Variable  TEST_USERNAME  Administrator@vsphere.local
-    Set Environment Variable  TEST_PASSWORD  Admin\!23
-    Set Environment Variable  TEST_DATASTORE  datastore1
-    Set Environment Variable  TEST_DATACENTER  /${datacenter}
-    Set Environment Variable  TEST_RESOURCE  ${cluster}
-    Set Environment Variable  TEST_TIMEOUT  30m
-    [Return]  @{esx_names}  ${vc}  @{esx_ips}  ${vc_ip}
-
-Setup Network For Simple VC Cluster
-    [Arguments]  ${esx_number}  ${datacenter}  ${cluster}
-    Log To Console  Create a distributed switch
-    ${out}=  Run  govc dvs.create -dc=${datacenter} test-ds
-    Should Contain  ${out}  OK
-
-    Log To Console  Create three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=test-ds bridge
-    Should Contain  ${out}  OK
-
-    Wait Until Keyword Succeeds  10x  3 minutes  Add Host To Distributed Switch  /${datacenter}/host/${cluster}  test-ds
-
-    Log To Console  Enable DRS on the cluster
-    ${out}=  Run  govc cluster.change -drs-enabled /${datacenter}/host/${cluster}
-    Should Be Empty  ${out}
-
-    Set Environment Variable  BRIDGE_NETWORK  bridge
-    Set Environment Variable  PUBLIC_NETWORK  vm-network
-
-Create A Distributed Switch
-    [Arguments]  ${datacenter}  ${dvs}=test-ds
-    Log To Console  \nCreate a distributed switch
-    ${out}=  Run  govc dvs.create -product-version 5.5.0 -dc=${datacenter} ${dvs}
-    Should Contain  ${out}  OK
-
-Create Three Distributed Port Groups
-    [Arguments]  ${datacenter}  ${dvs}=test-ds
-    Log To Console  \nCreate three new distributed switch port groups for management and vm network traffic
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=${dvs} management
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=${dvs} vm-network
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=${datacenter} -dvs=${dvs} bridge
-    Should Contain  ${out}  OK
-
-Add Host To Distributed Switch
-    [Arguments]  ${host}  ${dvs}=test-ds
-    Log To Console  \nAdd host(s) to the distributed switch
-    ${out}=  Run  govc dvs.add -dvs=${dvs} -pnic=vmnic1 ${host}
-    Should Contain  ${out}  OK
-
-Disable TLS On ESX Host
-    Log To Console  \nDisable TLS on the host
-    ${ver}=  Get Vsphere Version
-    ${out}=  Run Keyword If  '${ver}' != '5.5.0'  Run  govc host.option.set UserVars.ESXiVPsDisabledProtocols sslv3,tlsv1,tlsv1.1
-    Run Keyword If  '${ver}' != '5.5.0'  Should Be Empty  ${out}
-
-Get Vsphere Version
-    ${out}=  Run  govc about
-    ${out}=  Split To Lines  ${out}
-    :FOR  ${line}  IN  @{out}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${line}  Version:
-    \   Run Keyword And Return If  ${status}  Fetch From Right  ${line}  ${SPACE}
-
-Deploy Nimbus NFS Datastore
-    [Arguments]  ${user}  ${password}  ${additional-args}=
-    ${name}=  Evaluate  'NFS-' + str(random.randint(1000,9999)) + str(time.clock())  modules=random,time
-    Log To Console  \nDeploying Nimbus NFS server: ${name}
-    Open Connection  %{NIMBUS_GW}
-    Wait Until Keyword Succeeds  2 min  30 sec  Login  ${user}  ${password}
-
-    ${out}=  Execute Command  nimbus-nfsdeploy ${name} ${additional-args}
-    # Make sure the deploy actually worked
-    Should Contain  ${out}  To manage this VM use
-    # Now grab the IP address and return the name and ip for later use
-    @{out}=  Split To Lines  ${out}
-    :FOR  ${item}  IN  @{out}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  IP is
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    @{gotIP}=  Split String  ${line}  ${SPACE}
-    ${ip}=  Remove String  @{gotIP}[5]  ,
-
-    Log To Console  Successfully deployed new NFS server - ${user}-${name}
-    Close connection
-    [Return]  ${user}-${name}  ${ip}
-
-Change ESXi Server Password
-    [Arguments]  ${password}
-    ${out}=  Run  govc host.account.update -id root -password ${password}
-    Should Be Empty  ${out}
-
-Check License Features
-    ${out}=  Run  govc object.collect -json $(govc object.collect -s - content.licenseManager) licenses | jq '.[].Val.LicenseManagerLicenseInfo[].Properties[] | select(.Key == "feature") | .Value'
-    Should Contain  ${out}  serialuri
-    Should Contain  ${out}  dvs
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/OVA-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/OVA-Util.robot
deleted file mode 100644
index c504465172..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/OVA-Util.robot
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource provides any keywords related to Unified OVA
-
-*** Variables ***
-${ova_root_pwd}  ova-test-root-pwd
-${ova_appliance_options}  --prop:appliance.root_pwd=${ova_root_pwd} --prop:appliance.permit_root_login=True
-
-${ova_target_vm_name}  vic-unified-ova-integration-test
-${ovftool_options}  --noSSLVerify --acceptAllEulas --name=${ova_target_vm_name} --diskMode=thin --powerOn --X:waitForIp --X:injectOvfEnv --X:enableHiddenProperties
-
-${ova_network_ip0}  10.17.109.207
-${ova_network_netmask0}  255.255.255.0
-${ova_network_gateway}  10.17.109.253
-${ova_network_dns}  10.118.81.1
-${ova_network_searchpath}  eng.vmware.com
-${ova_network_domain}  mrburns
-${ova_network_options}  --prop:network.ip0=${ova_network_ip0} --prop:network.netmask0=${ova_network_netmask0} --prop:network.gateway=${ova_network_gateway} --prop:network.DNS=${ova_network_dns} --prop:network.searchpath=${ova_network_searchpath} --prop:network.domain=${ova_network_domain}
-
-${ova_harbor_admin_password}  harbor-admin-passwd
-${ova_harbor_db_password}  harbor-db-passwd
-${ova_service_options}  --prop:registry.admin_password=${ova_harbor_admin_password} --prop:registry.db_password=${ova_harbor_db_password}
-
-${ova_options}  ${ovftool_options} ${ova_appliance_options} ${ova_service_options}
-${ova_options_with_network}  ${ova_options} ${ova_network_options} 
-
-${tls_not_disabled}  False
-
-*** Keywords ***
-# Requires vc credential for govc
-Deploy VIC-OVA To Test Server
-    [Arguments]  ${dhcp}=True  ${protocol}=http  ${build}=False  ${user}=%{TEST_USERNAME}  ${password}=%{TEST_PASSWORD}  ${host}=%{TEST_URL_ARRAY}  ${datastore}=%{TEST_DATASTORE}  ${cluster}=%{TEST_RESOURCE}  ${datacenter}=%{TEST_DATACENTER}   
-    Set Global Variable  ${ova_path}  bin/vic-1.1.1-${rev}.ova
-    Run Keyword if  ${build}  Build Unified OVA
-    ${rev}=  Run  git rev-parse --short HEAD
-
-    Log To Console  \nCleanup environment...
-    Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc vm.destroy ${ova_target_vm_name}
-    Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc object.destroy /${datacenter}/vm/${ova_target_vm_name}
-
-    Log To Console  \nStarting to deploy unified-ova to test server...
-    Run Keyword If  ${dhcp}  Log To Console  ovftool --datastore=${datastore} ${ova_options} ${ova_path} 'vi://${user}:${password}@${host}/${cluster}'
-    ...  ELSE  Log To Console  ovftool --datastore=${datastore} ${ova_options_with_network} ${ova_path} 'vi://${user}:${password}@${host}/${cluster}'
-    ${out}=  Run Keyword If  ${dhcp}  Run  ovftool --datastore=${datastore} ${ova_options} --net:"Network"="vm-network" ${ova_path} 'vi://${user}:${password}@${host}/${cluster}'
-    ...  ELSE  Run  ovftool --datastore=${datastore} ${ova_options_with_network} ${ova_path} 'vi://${user}:${password}@${host}/${cluster}'
-    
-    Should Contain  ${out}  Received IP address:
-    Should Not Contain  ${out}  None
-
-    ${out}=  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc ls /ha-datacenter/host/cls/
-    ${out}=  Split To Lines  ${out}
-    ${idx}=  Set Variable  1
-    :FOR  ${line}  IN  @{out}
-    \   Continue For Loop If  '${line}' == '/ha-datacenter/host/cls/Resources'
-    \   ${ip}=  Fetch From Right  ${line}  /
-    \   Set Suite Variable  ${esx${idx}-ip}  ${ip}
-    \   ${idx}=  Evaluate  ${idx}+1
-
-    Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc host.esxcli -host.ip=${esx1-ip} system settings advanced set -o /Net/GuestIPHack -i 1
-    Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc host.esxcli -host.ip=${esx2-ip} system settings advanced set -o /Net/GuestIPHack -i 1
-    Run Keyword And Ignore Error  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc host.esxcli -host.ip=${esx3-ip} system settings advanced set -o /Net/GuestIPHack -i 1
-
-    ${ip}=  Run  GOVC_URL=${host} GOVC_USERNAME=${user} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc vm.ip -esxcli vic-unified-ova-integration-test
-
-    Set Environment Variable  HARBOR_IP  ${ip}
-    
-    Log To Console  \nHarbor IP: %{HARBOR_IP}
-    
-    Log To Console  Waiting for Harbor to Come Up...
-    :FOR  ${i}  IN RANGE  20
-    \  ${out}=  Run  curl -k ${protocol}://%{HARBOR_IP}
-    \  Log  ${out}
-    \  ${status}=  Run Keyword And Return Status  Should Not Contain  ${out}  502 Bad Gateway
-    \  ${status}=  Run Keyword If  ${status}  Run Keyword And Return Status  Should Not Contain  ${out}  Connection refused
-    \  ${status}=  Run Keyword If  ${status}  Run Keyword And Return Status  Should Contain  ${out}  <title>Harbor</title>
-    \  Return From Keyword If  ${status}  %{HARBOR_IP}
-    \  Sleep  30s
-    Fail  Harbor failed to come up properly!
-    [Return]  %{HARBOR_IP}
-
-# Requires vc credential for govc
-Cleanup VIC-OVA On Test Server  
-    [Arguments]  ${url}=%{GOVC_URL}  ${username}=%{GOVC_USERNAME}  ${password}=%{GOVC_PASSWORD}
-    ${rc}  ${output}=  Run And Return Rc And Output  GOVC_URL=${url} GOVC_USERNAME=${username} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc vm.destroy ${ova_target_vm_name}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Run Keyword And Ignore Error  Run  GOVC_URL=${url} GOVC_USERNAME=${username} GOVC_PASSWORD=${password} GOVC_INSECURE=1 govc object.destroy /%{TEST_DATACENTER}/vm/${ova_target_vm_name}
-    Log To Console  \nUnified-OVA deployment is cleaned up on test server
-
-Build Unified OVA
-    [Arguments]  ${user}=%{TEST_USERNAME}  ${password}=%{TEST_PASSWORD}  ${host}=%{TEST_URL}
-    Log To Console  \nStarting to build Unified OVA... 
-    Log To Console  \nRemove stale local OVA artifacts
-    Run  Remove OVA Artifacts Locally
-    ${out}=  Run   PACKER_ESX_HOST=${host} PACKER_USER=${user} PACKER_PASSWORD=${password} make ova-release 
-    Log  ${out}
-    @{out}=  Split To Lines  ${out}
-    Should Not Contain  @{out}[-1]  Error
-    Log To Console  \nUnified OVA is built successfully
-
-Remove OVA Artifacts Locally
-    ${rev}=  Run  git rev-parse --short HEAD
-    Remove Files  bin/vic-1.1.1-${rev}.ova bin/vic-1.1.1-${rev}.ovf bin/vic-1.1.1-${rev}.mk bin/vic-1.1.1-${rev}-disk*.vmdk
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Slack-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Slack-Util.robot
deleted file mode 100644
index 98f266f3e8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Slack-Util.robot
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains all keywords related to reading, posting to Slack channels
-
-*** Keywords ***
-Post Message To Slack Channel
-    [Arguments]  ${channel}  ${message}
-    ${out}=  Run  curl -s -d "payload={\\"channel\\": \\"#${channel}\\", \\"text\\": \\"${message}\\"}" "%{SLACK_URL}"
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Util.robot
deleted file mode 100644
index 3f127f50a0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Util.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Library  OperatingSystem
-Library  String
-Library  Collections
-Library  requests
-Library  Process
-Library  SSHLibrary  5 minute
-Library  DateTime
-Library  Selenium2Library  3  3
-Resource  Nimbus-Util.robot
-Resource  Vsphere-Util.robot
-Resource  VCH-Util.robot
-Resource  Drone-Util.robot
-Resource  Github-Util.robot
-Resource  Harbor-Util.robot
-Resource  Docker-Util.robot
-Resource  Admiral-Util.robot
-Resource  OVA-Util.robot
-Resource  Cert-Util.robot
-Resource  Slack-Util.robot
-
-Variables  dynamic-vars.py
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/VCH-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/VCH-Util.robot
deleted file mode 100644
index 99ca45b95a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/VCH-Util.robot
+++ /dev/null
@@ -1,615 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains all keywords related to creating, deleting, maintaining VCHs
-
-*** Keywords ***
-Set Test Environment Variables
-    # Finish setting up environment variables
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  DRONE_BUILD_NUMBER
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  DRONE_BUILD_NUMBER  0
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  BRIDGE_NETWORK
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  BRIDGE_NETWORK  network
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  PUBLIC_NETWORK
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  PUBLIC_NETWORK  'VM Network'
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  TEST_DATACENTER
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  TEST_DATACENTER  ${SPACE}
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  DRONE_MACHINE
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  DRONE_MACHINE  'local'
-
-    @{URLs}=  Split String  %{TEST_URL_ARRAY}
-    ${len}=  Get Length  ${URLs}
-    ${IDX}=  Evaluate  %{DRONE_BUILD_NUMBER} \% ${len}
-
-    Set Environment Variable  TEST_URL  @{URLs}[${IDX}]
-    Set Environment Variable  GOVC_URL  %{TEST_URL}
-    Set Environment Variable  GOVC_USERNAME  %{TEST_USERNAME}
-    Set Environment Variable  GOVC_PASSWORD  %{TEST_PASSWORD}
-
-    # TODO: need an integration/vic-test image update to include the about.cert command
-    #${rc}  ${thumbprint}=  Run And Return Rc And Output  govc about.cert -k | jq -r .ThumbprintSHA1
-    ${rc}  ${thumbprint}=  Run And Return Rc And Output  openssl s_client -connect $(govc env -x GOVC_URL_HOST):443 </dev/null 2>/dev/null | openssl x509 -fingerprint -noout | cut -d= -f2
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  TEST_THUMBPRINT  ${thumbprint}
-    Log To Console  \nTEST_URL=%{TEST_URL}
-    Log To Console  \nDRONE_MACHINE=%{DRONE_MACHINE}
-    ${worker_date}=  Run  date
-    Log To Console  \nWorker_Date=${worker_date}
-    ${server_date}=  Run  govc host.date.info
-    Log To Console  \nTest_Server_Date=\n${server_date}\n
-
-    ${host}=  Run  govc ls host
-    ${status}  ${message}=  Run Keyword And Ignore Error  Environment Variable Should Be Set  TEST_RESOURCE
-    Run Keyword If  '${status}' == 'FAIL'  Set Environment Variable  TEST_RESOURCE  ${host}/Resources
-    Set Environment Variable  GOVC_RESOURCE_POOL  %{TEST_RESOURCE}
-    ${noQuotes}=  Strip String  %{TEST_DATASTORE}  characters="
-    #"
-    Set Environment Variable  GOVC_DATASTORE  ${noQuotes}
-
-    ${about}=  Run  govc about
-    ${status}=  Run Keyword And Return Status  Should Contain  ${about}  VMware ESXi
-    Run Keyword If  ${status}  Set Environment Variable  HOST_TYPE  ESXi
-    Run Keyword Unless  ${status}  Set Environment Variable  HOST_TYPE  VC
-
-    ${about}=  Run  govc datastore.info %{TEST_DATASTORE} | grep 'Type'
-    ${status}=  Run Keyword And Return Status  Should Contain  ${about}  vsan
-    Run Keyword If  ${status}  Set Environment Variable  DATASTORE_TYPE  VSAN
-    Run Keyword Unless  ${status}  Set Environment Variable  DATASTORE_TYPE  Non_VSAN
-
-    # set the TLS config options suitable for vic-machine in this env
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  $domain == ''  Set Suite Variable  ${vicmachinetls}  --no-tlsverify
-    Run Keyword If  $domain != ''  Set Suite Variable  ${vicmachinetls}  --tls-cname=*.${domain}
-
-    Set Test VCH Name
-    # cleanup any potential old certs directories
-    Remove Directory  %{VCH-NAME}  recursive=${true}
-    # Set a unique bridge network for each VCH that has a random VLAN ID
-    ${vlan}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Evaluate  str(random.randint(1, 4093))  modules=random
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vlan=${vlan} -vswitch vSwitchLAN %{VCH-NAME}-bridge
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Environment Variable  BRIDGE_NETWORK  %{VCH-NAME}-bridge
-
-Set Test VCH Name
-    ${name}=  Evaluate  'VCH-%{DRONE_BUILD_NUMBER}-' + str(random.randint(1000,9999))  modules=random
-    Set Environment Variable  VCH-NAME  ${name}
-
-Set List Of Env Variables
-    [Arguments]  ${vars}
-    @{vars}=  Split String  ${vars}
-    :FOR  ${var}  IN  @{vars}
-    \   ${varname}  ${varval}=  Split String  ${var}  =
-    \   Set Environment Variable  ${varname}  ${varval}
-
-Parse Environment Variables
-    [Arguments]  ${line}
-    #  If using the old logging format
-    ${status}=  Run Keyword And Return Status  Should Contain  ${line}  mINFO
-    ${logdeco}  ${vars}=  Run Keyword If  ${status}  Split String  ${line}  ${SPACE}  1
-    Run Keyword If  ${status}  Set List Of Env Variables  ${vars}
-    Return From Keyword If  ${status}
-
-    # Split the log log into pieces, discarding the initial log decoration, and assign to env vars
-    ${logmon}  ${logday}  ${logyear}  ${logtime}  ${loglevel}  ${vars}=  Split String  ${line}  max_split=5
-    Set List Of Env Variables  ${vars}
-
-Get Docker Params
-    # Get VCH docker params e.g. "-H 192.168.218.181:2376 --tls"
-    [Arguments]  ${output}  ${certs}
-    @{output}=  Split To Lines  ${output}
-    :FOR  ${item}  IN  @{output}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  DOCKER_HOST=
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-
-    # Ensure we start from a clean slate with docker env vars
-    Remove Environment Variable  DOCKER_HOST  DOCKER_TLS_VERIFY  DOCKER_CERT_PATH  CURL_CA_BUNDLE  COMPOSE_PARAMS  COMPOSE_TLS_VERSION
-
-    Parse Environment Variables  ${line}
-
-    ${dockerHost}=  Get Environment Variable  DOCKER_HOST
-
-    @{hostParts}=  Split String  ${dockerHost}  :
-    ${ip}=  Strip String  @{hostParts}[0]
-    ${port}=  Strip String  @{hostParts}[1]
-    Set Environment Variable  VCH-IP  ${ip}
-    Set Environment Variable  VCH-PORT  ${port}
-
-    :FOR  ${index}  ${item}  IN ENUMERATE  @{output}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  http
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  Published ports can be reached at
-    \   ${idx} =  Evaluate  ${index} + 1
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${ext-ip}  @{output}[${idx}]
-
-    ${rest}  ${ext-ip} =  Split String From Right  ${ext-ip}  ${SPACE}  1
-    ${ext-ip} =  Strip String  ${ext-ip}
-    Set Environment Variable  EXT-IP  ${ext-ip}
-
-    ${rest}  ${vic-admin}=  Split String From Right  ${line}  ${SPACE}  1
-    Set Environment Variable  VIC-ADMIN  ${vic-admin}
-
-    Run Keyword If  ${port} == 2376  Set Environment Variable  VCH-PARAMS  -H ${dockerHost} --tls
-    Run Keyword If  ${port} == 2375  Set Environment Variable  VCH-PARAMS  -H ${dockerHost}
-
-    ### Add environment variables for Compose and TLS
-
-    # Check if tls is enable from vic-machine's output and not trust ${certs} which some tests bypasses
-    ${tls_enabled}=  Get Environment Variable  DOCKER_TLS_VERIFY  ${false}
-
-    ### Compose case for no-tlsverify
-
-    # Set environment variables if certs not used to create the VCH.  This is NOT the recommended
-    # approach to running compose.  There will be security warnings in the logs and some compose
-    # operations may not work properly because certs == false currently means we install with
-    # --no-tlsverify. Add CURL_CA_BUNDLE for a workaround in compose tests.  If we change
-    # certs == false to install with --no-tls, then we need to change this again.
-    Run Keyword If  ${tls_enabled} == ${false}  Set Environment Variable  CURL_CA_BUNDLE  ${EMPTY}
-
-    # Get around quirk in compose if no-tlsverify, then CURL_CA_BUNDLE must exist and compose called with --tls
-    Run Keyword If  ${tls_enabled} == ${false}  Set Environment Variable  COMPOSE-PARAMS  -H ${dockerHost} --tls
-
-    ### Compose case for tlsverify (assumes DOCKER_TLS_VERIFY also set)
-
-    Run Keyword If  ${tls_enabled} == ${true}  Set Environment Variable  COMPOSE_TLS_VERSION  TLSv1_2
-    Run Keyword If  ${tls_enabled} == ${true}  Set Environment Variable  COMPOSE-PARAMS  -H ${dockerHost}
-
-Convert List to String
-    [Arguments]  @{list}
-    Should Not Be Empty  ${list}
-    ${list-string}=  Set Variable  ${EMPTY}
-    :FOR  ${item}  IN  @{list}
-    \   ${list-was-empty}=  Set Variable If  '${list-string}' == '${EMPTY}'  ${True}  ${false}
-    \   ${list-string}=  Run Keyword If  ${list-was-empty}  Set Variable  ${item}
-    \   ...  ELSE  Catenate  SEPARATOR=|  ${list-string}  ${item}
-
-    [Return]  ${list-string}
-
-Add VCH to Removal Exception List
-    [Arguments]  ${vch}=${EMPTY}
-    ${exceptions-string}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    @{exceptions-list}=  Run Keyword If  '${exceptions-string}' == '${EMPTY}'  Create List
-    @{exceptions-list}=  Run Keyword Unless  '${exceptions-string}' == '${EMPTY}'  Split String  ${exceptions-string}  separator=|
-
-    ${set}=  Create Dictionary
-    Add List To Dictionary  ${set}  ${exceptions-list}
-    Set To Dictionary  ${set}  ${vch}  1
-
-    ${exceptions-list}=  Set Variable  ${set.keys()}
-
-    # Append To List  ${exceptions-list}  ${vch}
-    ${list-string}=  Convert List To String  @{exceptions-list}
-    Set Environment Variable  VM_EXCEPTIONS  ${list-string}
-    Log To Console  Saved '${list-string}' to removal exceptions
-
-Remove VCH from Removal Exception List
-    [Arguments]  ${vch}=${EMPTY}
-    ${exceptions-string}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    Return From Keyword If  '${exceptions-string}' == '${EMPTY}'  No Exceptions Found 
-    @{exceptions-list}=  Run Keyword Unless  '${exceptions-string}' == '${EMPTY}'  Split String  ${exceptions-string}  separator=|
-    ${idx}=  Get Index From List  ${exceptions-list}  ${vch}
-    Remove From List  ${exceptions-list}  ${idx}
-    ${len}=  Get Length  ${exceptions-list}
-    ${list-string}=  Run Keyword If  ${len} != 0  Convert List To String  @{exceptions-list}
-    ...  ELSE  Set Variable  ${EMPTY}
-    Set Environment Variable  VM_EXCEPTIONS  ${list-string}
-
-Check If VCH Is In Exception
-    [Arguments]  ${vch}=${EMPTY}  ${exceptions}=${EMPTY}
-    ${exceptions}=  Run Keyword If  '${exceptions}' == '${EMPTY}'  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ...  ELSE  Set Variable  ${exceptions}
-    Return From Keyword If  '${exceptions}' == '${EMPTY}'  ${false}
-    ${excluded}=  Set Variable  ${false}
-    ${exceptions-list}=  Split String  ${exceptions}  separator=|
-    : FOR  ${vm-exclude}  IN  @{exceptions-list}
-    \    Continue For Loop If  '${vm-exclude}' != '${vch}'
-    \    ${excluded}=  Set Variable  ${true}
-    \    Exit For Loop
-
-    [Return]  ${excluded}
-
-Dump Docker Debug Data From VCH
-    Log To Console  **********
-    List Existing Images On VCH
-    List Running Containers On VCH
-    Log To Console  **********
-
-Use Target VIC Appliance
-    # Use a VIC appliance created outside of CI
-    [Arguments]  ${target-vch}=${EMPTY}
-    Return From Keyword If  '${target-vch}' == '${EMPTY}'  ${False}
-
-    ${debug-vch}=  Get Environment Variable  DEBUG_VCH  ${EMPTY}
-    Set Test Environment Variables
-    Set Environment Variable  VCH-NAME  ${target-vch}
-    Log To Console  Reusing existing vch: ${target-vch}
-    Run VIC Machine Inspect Command
-    Add VCH to Removal Exception List  vch=${target-vch}
-    Run Keyword If  '${debug-vch}' != '${EMPTY}'  Dump Docker Debug Data From VCH
-
-    [Return]  ${True}
-
-Conditional Install VIC Appliance To Test Server
-    [Arguments]  ${certs}=${true}  ${init}=${False}
-    ${target-vch}=  Get Environment Variable  TARGET_VCH  ${EMPTY}
-    ${multi-vch}=  Get Environment Variable  MULTI_VCH  ${EMPTY}
-
-    # If TARGET_VCH was defined, use that VCH for tests and exit
-    Run Keyword If  '${target-vch}' != '${EMPTY}'  Use Target VIC Appliance  target-vch=${target-vch}
-    Return From Keyword If  '${target-vch}' != '${EMPTY}'  ${True}
-
-    Install VIC Appliance To Test Server  certs=${certs}
-
-    # If MULT_VCH set to 1, then we are in multi VCH mode, otherwise, we are in single VCH mode
-    ${single-vch-mode}=  Run Keyword If  '${multi-vch}' == '1'  Set Variable  ${False}
-    ...  ELSE  Set Variable  ${True}
-
-    # In single vch mode, save VCH name to TARGET_VCH and add VCH to exception removal list
-    Run Keyword If  ${init}  Set Environment Variable  TARGET_VCH  %{VCH-NAME}
- 
-Install VIC Appliance To Test Server
-    [Arguments]  ${vic-machine}=bin/vic-machine-linux  ${appliance-iso}=bin/appliance.iso  ${bootstrap-iso}=bin/bootstrap.iso  ${certs}=${true}  ${vol}=default  ${cleanup}=${true}  ${debug}=1  ${additional-args}=${EMPTY}
-    Set Test Environment Variables
-    # disable firewall
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.esxcli network firewall set -e false
-    # Attempt to cleanup old/canceled tests
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Networks On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling vSwitches On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Containers On Test Server
-    Run Keyword If  ${cleanup}  Run Keyword And Ignore Error  Cleanup Dangling Resource Pools On Test Server
-
-    # Install the VCH now
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run VIC Machine Command  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${certs}  ${vol}  ${debug}  ${additional-args}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-
-    Get Docker Params  ${output}  ${certs}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-
-    [Return]  ${output}
-
-Run VIC Machine Command
-    [Tags]  secret
-    [Arguments]  ${vic-machine}  ${appliance-iso}  ${bootstrap-iso}  ${certs}  ${vol}  ${debug}  ${additional-args}
-    ${output}=  Run Keyword If  ${certs}  Run  ${vic-machine} create --debug ${debug} --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=${appliance-iso} --bootstrap-iso=${bootstrap-iso} --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --insecure-registry harbor.ci.drone.local --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:${vol} --container-network=%{PUBLIC_NETWORK}:public ${vicmachinetls} ${additional-args}
-    Run Keyword If  ${certs}  Should Contain  ${output}  Installer completed successfully
-    Return From Keyword If  ${certs}  ${output}
-
-    ${output}=  Run Keyword Unless  ${certs}  Run  ${vic-machine} create --debug ${debug} --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=${appliance-iso} --bootstrap-iso=${bootstrap-iso} --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --insecure-registry harbor.ci.drone.local --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:${vol} --container-network=%{PUBLIC_NETWORK}:public --no-tlsverify ${additional-args}
-    Run Keyword Unless  ${certs}  Should Contain  ${output}  Installer completed successfully
-    [Return]  ${output}
-
-Run Secret VIC Machine Delete Command
-    [Tags]  secret
-    [Arguments]  ${vch-name}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux delete --name=${vch-name} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    [Return]  ${rc}  ${output}
-
-Run Secret VIC Machine Inspect Command
-    [Tags]  secret
-    [Arguments]  ${name}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=${name} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --thumbprint=%{TEST_THUMBPRINT}
-
-    [Return]  ${rc}  ${output}
-
-Run VIC Machine Delete Command
-    ${rc}  ${output}=  Run Secret VIC Machine Delete Command  %{VCH-NAME}
-    Wait Until Keyword Succeeds  6x  5s  Check Delete Success  %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  rm -rf %{VCH-NAME}
-    [Return]  ${output}
-
-Run VIC Machine Inspect Command
-    ${rc}  ${output}=  Run Secret VIC Machine Inspect Command  %{VCH-NAME}
-    Get Docker Params  ${output}  ${true}
-
-Inspect VCH
-    [Arguments]  ${expected}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${expected}
-
-Check UpdateInProgress
-    [Arguments]  ${expected}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep UpdateInProgress
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${expected}
-
-Portlayer Log Should Match Regexp
-    [Tags]  secret
-    [Arguments]  ${pattern}
-    ${out}=  Run  curl -k -D /tmp/cookies-%{VCH-NAME} -Fusername=%{TEST_USERNAME} -Fpassword=%{TEST_PASSWORD} %{VIC-ADMIN}/authentication
-    Log  ${out}
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/logs/port-layer.log -b /tmp/cookies-%{VCH-NAME} | grep -q -e \'${pattern}\'
-    Should Be Equal As Integers  ${rc}  0
-
-Gather Logs From Test Server
-    [Tags]  secret
-    [Arguments]  ${name-suffix}=${EMPTY}
-
-    Run Keyword And Continue On Failure  Run  zip %{VCH-NAME}-certs -r %{VCH-NAME}
-    ${out}=  Run  curl -k -D vic-admin-cookies -Fusername=%{TEST_USERNAME} -Fpassword=%{TEST_PASSWORD} %{VIC-ADMIN}/authentication
-    Log  ${out}
-    ${out}=  Run  curl -k -b vic-admin-cookies %{VIC-ADMIN}/container-logs.zip -o ${SUITE NAME}-%{VCH-NAME}-container-logs${name-suffix}.zip
-    Log  ${out}
-    Remove File  vic-admin-cookies
-    ${out}=  Run  govc datastore.download %{VCH-NAME}/vmware.log %{VCH-NAME}-vmware${name-suffix}.log
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc datastore.download %{VCH-NAME}/tether.debug %{VCH-NAME}-tether${name-suffix}.debug
-    Should Contain  ${out}  OK
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc logs -log=vmkernel -n=10000 > vmkernel${name-suffix}.log
-
-Check For The Proper Log Files
-    [Arguments]  ${container}
-    # Ensure container logs are correctly being gathered for debugging purposes
-    ${rc}  ${output}=  Run And Return Rc and Output  curl -sk %{VIC-ADMIN}/authentication -XPOST -F username=%{TEST_USERNAME} -F password=%{TEST_PASSWORD} -D /tmp/cookies-%{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc and Output  curl -sk %{VIC-ADMIN}/container-logs.tar.gz -b /tmp/cookies-%{VCH-NAME} | tar tvzf -
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-    @{words}=  Split String  ${container}  -
-    Should Contain Any  ${output}  @{words}[0]/output.log  @{words}[1]/output.log
-    Should Contain Any  ${output}  @{words}[0]/vmware.log  @{words}[1]/vmware.log
-    Should Contain Any  ${output}  @{words}[0]/tether.debug  @{words}[1]/tether.debug
-
-Scrape Logs For the Password
-    [Tags]  secret
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/authentication -XPOST -F username=%{TEST_USERNAME} -F password=%{TEST_PASSWORD} -D /tmp/cookies-%{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/logs/port-layer.log -b /tmp/cookies-%{VCH-NAME} | grep -q "%{TEST_PASSWORD}"
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/logs/init.log -b /tmp/cookies-%{VCH-NAME} | grep -q "%{TEST_PASSWORD}"
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/logs/docker-personality.log -b /tmp/cookies-%{VCH-NAME} | grep -q "%{TEST_PASSWORD}"
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}=  Run And Return Rc  curl -sk %{VIC-ADMIN}/logs/vicadmin.log -b /tmp/cookies-%{VCH-NAME} | grep -q "%{TEST_PASSWORD}"
-    Should Be Equal As Integers  ${rc}  1
-
-    Remove File  /tmp/cookies-%{VCH-NAME}
-
-Cleanup VIC Appliance On Test Server
-    Log To Console  Gathering logs from the test server %{VCH-NAME}
-    Gather Logs From Test Server
-    Wait Until Keyword Succeeds  3x  5 seconds  Remove All Containers
-    # Exit from Cleanup if VCH-NAME is currently in exception list
-    ${exclude}=  Check If VCH Is In Exception  vch=%{VCH-NAME}
-    Return From Keyword If  ${exclude}
-    Log To Console  Deleting the VCH appliance %{VCH-NAME}
-    ${output}=  Run VIC Machine Delete Command
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-    [Return]  ${output}
-
-Cleanup VCH Bridge Network
-    [Arguments]  ${name}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove ${name}-bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.info
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Not Contain  ${out}  ${name}-bridge
-
-Add VC Distributed Portgroup
-    [Arguments]  ${dvs}  ${pg}
-    ${out}=  Run  govc dvs.portgroup.add -nports 12 -dc=%{TEST_DATACENTER} -dvs=${dvs} ${pg}
-
-Remove VC Distributed Portgroup
-    [Arguments]  ${pg}
-    ${out}=  Run  govc object.destroy %{TEST_DATACENTER}/network/${pg}
-
-Cleanup Datastore On Test Server
-    ${out}=  Run  govc datastore.ls
-    ${exceptions}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ${items}=  Split To Lines  ${out}
-    :FOR  ${item}  IN  @{items}
-    \   ${build}=  Split String  ${item}  -
-    \   # Skip any item that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   # Skip any item in the exception list
-    \   @{name}=  Split String  ${item}  -VOL
-    \   ${skip}=  Check If VCH Is In Exception  vch=@{name}[0]  exceptions=${exceptions}
-    \   Continue For Loop If  ${skip}
-    \   # Skip any item that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   Log To Console  Removing the following item from datastore: ${item}
-    \   ${out}=  Run  govc datastore.rm ${item}
-    \   Wait Until Keyword Succeeds  6x  5s  Check Delete Success  ${item}
-
-Cleanup Dangling VMs On Test Server
-    ${out}=  Run  govc ls vm
-    ${exceptions}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ${vms}=  Split To Lines  ${out}
-    :FOR  ${vm}  IN  @{vms}
-    \   ${vm}=  Fetch From Right  ${vm}  /
-    \   ${build}=  Split String  ${vm}  -
-    \   # Skip any VM that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   ${skip}=  Check If VCH Is In Exception  vch=${vm}  exceptions=${exceptions}
-    \   Continue For Loop If  ${skip}
-    \   # Skip any VM that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   ${uuid}=  Run  govc vm.info -json\=true ${vm} | jq -r '.VirtualMachines[0].Config.Uuid'
-    \   Log To Console  Destroying dangling VCH: ${vm}
-    \   ${rc}  ${output}=  Run Secret VIC Machine Delete Command  ${vm}
-    \   Run Keyword And Continue On Failure  Wait Until Keyword Succeeds  6x  5s  Check Delete Success  ${vm}
-
-Cleanup Dangling Resource Pools On Test Server
-    ${out}=  Run  govc ls host/*/Resources/*
-    ${exceptions}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ${pools}=  Split To Lines  ${out}
-    :FOR  ${pool}  IN  @{pools}
-    \   ${shortPool}=  Fetch From Right  ${pool}  /
-    \   ${build}=  Split String  ${shortPool}  -
-    \   # Skip any pool that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   # Skip Resource Pools belonging to VCHs in the exception list
-    \   ${skip}=  Check If VCH Is In Exception  vch=${shortPool}  exceptions=${exceptions}
-    \   Continue For Loop If  ${skip}
-    \   # Skip any pool that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   Log To Console  Destroying dangling resource pool: ${pool}
-    \   ${output}=  Run  govc pool.destroy ${pool}
-    \   Log  ${output}
-
-Cleanup Dangling Networks On Test Server
-    ${out}=  Run  govc ls network
-    ${exceptions}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ${nets}=  Split To Lines  ${out}
-    :FOR  ${net}  IN  @{nets}
-    \   ${net}=  Fetch From Right  ${net}  /
-    \   ${build}=  Split String  ${net}  -
-    \   # Skip any Network that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   # Skip any Network that is attached to a VCH in the exception list
-    \   @{name}=  Split String  ${net}  -bridge
-    \   ${skip}=  Check If VCH Is In Exception  vch=@{name}[0]  exceptions=${exceptions}
-    \   Continue For Loop If  ${skip}
-    \   # Skip any Network that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   ${uuid}=  Run  govc host.portgroup.remove ${net}
-
-Cleanup Dangling vSwitches On Test Server
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.vswitch.info | grep VCH
-    ${exceptions}=  Get Environment Variable  VM_EXCEPTIONS  ${EMPTY}
-    ${nets}=  Split To Lines  ${out}
-    :FOR  ${net}  IN  @{nets}
-    \   ${net}=  Fetch From Right  ${net}  ${SPACE}
-    \   ${build}=  Split String  ${net}  -
-    \   # Skip any vSwitch that is not associated with integration tests
-    \   Continue For Loop If  '@{build}[0]' != 'VCH'
-    \   # Skip any switch that is attached to a VCH in the exception list
-    \   @{name}=  Split String  ${net}  -bridge
-    \   ${skip}=  Check If VCH Is In Exception  vch=@{name}[0]  exceptions=${exceptions}
-    \   Continue For Loop If  ${skip}
-    \   # Skip any vSwitch that is still running
-    \   ${state}=  Get State Of Drone Build  @{build}[1]
-    \   Continue For Loop If  '${state}' == 'running'
-    \   ${uuid}=  Run  govc host.vswitch.remove ${net}
-
-Get Scratch Disk From VM Info
-    [Arguments]  ${vm}
-    ${disks}=  Run  govc vm.info -json ${vm} | jq -r '.VirtualMachines[].Layout.Disk[].DiskFile[]'
-    ${disks}=  Split To Lines  ${disks}
-    :FOR  ${disk}  IN  @{disks}
-    \   ${disk}=  Fetch From Right  ${disk}  ${SPACE}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${disk}  scratch.vmdk
-    \   Return From Keyword If  ${status}  ${disk}
-
-Cleanup Dangling Containers On Test Server
-    ${vms}=  Run  govc ls vm
-    ${vms}=  Split To Lines  ${vms}
-    :FOR  ${vm}  IN  @{vms}
-    \   # Ignore VCH's, we only care about containers at this point
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${vm}  VCH
-    \   Continue For Loop If  ${status}
-    \   ${disk}=  Get Scratch Disk From VM Info  ${vm}
-    \   ${vch}=  Fetch From Left  ${disk}  /
-    \   ${vch}=  Split String  ${vch}  -
-    \   # Skip any VM that is not associated with integration tests
-    \   Continue For Loop If  '@{vch}[0]' != 'VCH'
-    \   ${state}=  Get State Of Drone Build  @{vch}[1]
-    \   # Skip any VM that is still running
-    \   Continue For Loop If  '${state}' == 'running'
-    \   # Destroy the VM and remove it from datastore because it is a dangling container
-    \   Log To Console  Cleaning up dangling container: ${vm}
-    \   ${out}=  Run  govc vm.destroy ${vm}
-    \   ${name}=  Fetch From Right  ${vm}  /
-    \   ${out}=  Run  govc datastore.rm ${name}
-    \   Wait Until Keyword Succeeds  6x  5s  Check Delete Success  ${name}
-
-Get VCH ID
-    [Arguments]  ${vch-name}
-    ${ret}=  Run  bin/vic-machine-linux ls --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Should Not Contain  ${ret}  Error
-    @{lines}=  Split To Lines  ${ret}
-    :FOR  ${line}  IN  @{lines}
-    \   # Get line with name ${vch-name}
-    \   @{vch}=  Split String  ${line}
-    \   ${len}=  Get Length  ${vch}
-    \   Continue For Loop If  ${len} < 5
-    \   ${name}=  Strip String  @{vch}[2]
-    \   Continue For Loop If  '${name}' != '${vch-name}'
-    \   ${vch-id}=  Strip String  @{vch}[0]
-    \   Log To Console  \nVCH ID: ${vch-id}
-    \   Return From Keyword  ${vch-id}
-
-# VCH upgrade helpers
-Install VIC with version to Test Server
-    [Arguments]  ${version}=7315  ${insecureregistry}=  ${cleanup}=${true}
-    Log To Console  \nDownloading vic ${version} from gcp...
-    ${rc}  ${output}=  Run And Return Rc And Output  wget https://storage.googleapis.com/vic-engine-builds/vic_${version}.tar.gz -O vic.tar.gz
-    ${rc}  ${output}=  Run And Return Rc And Output  tar zxvf vic.tar.gz
-    Set Environment Variable  TEST_TIMEOUT  20m0s
-    Install VIC Appliance To Test Server  vic-machine=./vic/vic-machine-linux  appliance-iso=./vic/appliance.iso  bootstrap-iso=./vic/bootstrap.iso  certs=${false}  cleanup=${cleanup}  vol=default ${insecureregistry}
-
-    Set Environment Variable  VIC-ADMIN  %{VCH-IP}:2378
-    Set Environment Variable  INITIAL-VERSION  ${version}
-    Run  rm -rf vic.tar.gz vic
-
-Clean up VIC Appliance And Local Binary
-    Cleanup VIC Appliance On Test Server
-    Run  rm -rf vic.tar.gz vic
-
-Upgrade
-    Log To Console  \nUpgrading VCH...
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Completed successfully
-    Should Not Contain  ${output}  Rolling back upgrade
-    Should Be Equal As Integers  ${rc}  0
-
-Upgrade with ID
-    Log To Console  \nUpgrading VCH using vch ID...
-    ${vch-id}=  Get VCH ID  %{VCH-NAME}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --id=${vch-id} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Completed successfully
-    Should Not Contain  ${output}  Rolling back upgrade
-    Should Be Equal As Integers  ${rc}  0
-
-Check Upgraded Version
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
-    @{vers}=  Split String  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  Completed successfully
-    Should Contain  ${output}  @{vers}[2]
-    Should Not Contain  ${output}  %{INITIAL-VERSION}
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-    Get Docker Params  ${output}  ${true}
-
-Check Original Version
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
-    @{vers}=  Split String  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  Completed successfully
-    Should Contain  ${output}  %{INITIAL-VERSION}
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-    Get Docker Params  ${output}  ${true}
-
-Rollback
-     Log To Console  \nTesting rollback...
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --rollback
-    Should Contain  ${output}  Completed successfully
-    Should Be Equal As Integers  ${rc}  0
-
-Enable VCH SSH
-    [Arguments]  ${vic-machine}=bin/vic-machine-linux  ${rootpw}=%{TEST_PASSWORD}  ${target}=%{TEST_URL}%{TEST_DATACENTER}  ${password}=%{TEST_PASSWORD}  ${thumbprint}=%{TEST_THUMBPRINT}  ${name}=%{VCH-NAME}  ${user}=%{TEST_USERNAME}  ${resource}=%{TEST_RESOURCE}
-    Log To Console  \nEnable SSH on vch...
-    ${rc}  ${output}=  Run And Return Rc And Output  ${vic-machine} debug --rootpw ${rootpw} --target ${target} --password ${password} --thumbprint ${thumbprint} --name ${name} --user ${user} --compute-resource ${resource} --enable-ssh
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Completed successfully
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/Vsphere-Util.robot b/installer/vendor/github.com/vmware/vic/tests/resources/Vsphere-Util.robot
deleted file mode 100644
index 7ba47c51bb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/Vsphere-Util.robot
+++ /dev/null
@@ -1,238 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  This resource contains any keywords dealing with operations being performed on a Vsphere instance, mostly govc wrappers
-
-*** Keywords ***
-Power On VM OOB
-    [Arguments]  ${vm}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.power -on %{VCH-NAME}/"${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.power -on "${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Log To Console  Waiting for VM to power on ...
-    Wait Until VM Powers On  ${vm}
-
-Power Off VM OOB
-    [Arguments]  ${vm}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.power -off %{VCH-NAME}/"${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.power -off "${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Log To Console  Waiting for VM to power off ...
-    Wait Until VM Powers Off  "${vm}"
-
-Destroy VM OOB
-    [Arguments]  ${vm}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc object.method -name Destroy_Task -enable %{TEST_DATACENTER}/vm/%{VCH-NAME}/${vm}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.destroy %{VCH-NAME}/"${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.destroy "${vm}"
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-
-Put Host Into Maintenance Mode
-    ${rc}  ${output}=  Run And Return Rc And Output  govc host.maintenance.enter -host.ip=%{TEST_URL}
-    Should Contain  ${output}  entering maintenance mode... OK
-
-Remove Host From Maintenance Mode
-    ${rc}  ${output}=  Run And Return Rc And Output  govc host.maintenance.exit -host.ip=%{TEST_URL}
-    Should Contain  ${output}  exiting maintenance mode... OK
-
-Reboot VM
-    [Arguments]  ${vm}
-    Log To Console  Rebooting ${vm} ...
-    Power Off VM OOB  ${vm}
-    Power On VM OOB  ${vm}
-    Log To Console  ${vm} Powered On
-
-Wait Until VM Powers On
-    [Arguments]  ${vm}
-    :FOR  ${idx}  IN RANGE  0  30
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  govc vm.info %{VCH-NAME}/${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Test Variable  ${out}  ${ret}
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc vm.info ${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Test Variable  ${out}  ${ret}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  poweredOn
-    \   Return From Keyword If  ${status}
-    \   Sleep  1
-    Fail  VM did not power on within 30 seconds
-
-Wait Until VM Powers Off
-    [Arguments]  ${vm}
-    :FOR  ${idx}  IN RANGE  0  30
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  govc vm.info %{VCH-NAME}/${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Test Variable  ${out}  ${ret}
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc vm.info ${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Test Variable  ${out}  ${ret}
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  poweredOff
-    \   Return From Keyword If  ${status}
-    \   Sleep  1
-    Fail  VM did not power off within 30 seconds
-
-Wait Until VM Is Destroyed
-    [Arguments]  ${vm}
-    :FOR  ${idx}  IN RANGE  0  30
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  govc ls vm/%{VCH-NAME}/${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Test Variable  ${out}  ${ret}
-    \   ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc ls vm/${vm}
-    \   Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Test Variable  ${out}  ${ret}
-    \   ${status}=  Run Keyword And Return Status  Should Be Empty  ${out}
-    \   Return From Keyword If  ${status}
-    \   Sleep  1
-    Fail  VM was not destroyed within 30 seconds
-
-Get VM IP
-    [Arguments]  ${vm}
-    ${rc}  ${out}=  Run And Return Rc And Output  govc vm.ip ${vm}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${out}
-
-Get VM Host Name
-    [Arguments]  ${vm}
-    ${out}=  Run  govc vm.info ${vm}
-    ${out}=  Split To Lines  ${out}
-    ${host}=  Fetch From Right  @{out}[-1]  ${SPACE}
-    [Return]  ${host}
-
-Get VM Info
-    [Arguments]  ${vm}
-    ${rc}  ${out}=  Run And Return Rc And Output  govc vm.info -r ${vm}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${out}
-
-Check ImageStore
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.ls -R -ds=%{TEST_DATASTORE} %{VCH-NAME}/VIC
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-
-vMotion A VM
-    [Arguments]  ${vm}
-    ${host}=  Get VM Host Name  ${vm}
-    ${status}=  Run Keyword And Return Status  Should Contain  ${host}  ${esx1-ip}
-    Run Keyword If  ${status}  Run  govc vm.migrate -host cls/${esx2-ip} -pool cls/Resources ${vm}
-    Run Keyword Unless  ${status}  Run  govc vm.migrate -host cls/${esx1-ip} -pool cls/Resources ${vm}
-
-Create Test Server Snapshot
-    [Arguments]  ${vm}  ${snapshot}
-    Set Environment Variable  GOVC_URL  %{BUILD_SERVER}
-    ${rc}  ${out}=  Run And Return Rc And Output  govc snapshot.create -vm ${vm} ${snapshot}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${out}
-    Set Environment Variable  GOVC_URL  %{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}
-
-Revert Test Server Snapshot
-    [Arguments]  ${vm}  ${snapshot}
-    Set Environment Variable  GOVC_URL  %{BUILD_SERVER}
-    ${rc}  ${out}=  Run And Return Rc And Output  govc snapshot.revert -vm ${vm} ${snapshot}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${out}
-    Set Environment Variable  GOVC_URL  %{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}
-
-Delete Test Server Snapshot
-    [Arguments]  ${vm}  ${snapshot}
-    Set Environment Variable  GOVC_URL  %{BUILD_SERVER}
-    ${rc}  ${out}=  Run And Return Rc And Output  govc snapshot.remove -vm ${vm} ${snapshot}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${out}
-    Set Environment Variable  GOVC_URL  %{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}
-
-Setup Snapshot
-    ${hostname}=  Get Test Server Hostname
-    Set Environment Variable  TEST_HOSTNAME  ${hostname}
-    Set Environment Variable  SNAPSHOT  vic-ci-test-%{DRONE_BUILD_NUMBER}
-    Create Test Server Snapshot  %{TEST_HOSTNAME}  %{SNAPSHOT}
-
-Get Datacenter Name
-    ${out}=  Run  govc datacenter.info
-    ${out}=  Split To Lines  ${out}
-    ${name}=  Fetch From Right  @{out}[0]  ${SPACE}
-    [Return]  ${name}
-
-Get Test Server Hostname
-    [Tags]  secret
-    ${hostname}=  Run  sshpass -p $TEST_PASSWORD ssh $TEST_USERNAME@$TEST_URL hostname
-    [Return]  ${hostname}
-
-Check Delete Success
-    [Arguments]  ${name}
-    ${out}=  Run  govc ls vm
-    Log  ${out}
-    Should Not Contain  ${out}  ${name}
-    ${out}=  Run  govc datastore.ls
-    Log  ${out}
-    Should Not Contain  ${out}  ${name}
-    ${out}=  Run  govc ls host/*/Resources/*
-    Log  ${out}
-    Should Not Contain  ${out}  ${name}
-
-Gather Logs From ESX Server
-    Environment Variable Should Be Set  TEST_URL
-    ${out}=  Run  govc logs.download
-
-Change Log Level On Server
-    [Arguments]  ${level}
-    ${out}=  Run  govc host.option.set Config.HostAgent.log.level ${level}
-    Should Be Empty  ${out}
-
-Add Vsphere License
-    [Tags]  secret
-    [Arguments]  ${license}
-    ${out}=  Run  govc license.add ${license}
-    Should Contain  ${out}  Key:
-
-Assign Vsphere License
-    [Tags]  secret
-    [Arguments]  ${license}  ${host}
-    ${out}=  Run  govc license.assign -host ${host} ${license}
-    Should Contain  ${out}  Key:
-
-Assign vCenter License
-    [Tags]  secret
-    [Arguments]  ${license}
-    ${out}=  Run  govc license.assign ${license}
-    Should Contain  ${out}  Key:
-
-Add Host To VCenter
-    [Arguments]  ${host}  ${user}  ${dc}  ${pw}
-    :FOR  ${idx}  IN RANGE  1  4
-    \   ${out}=  Run  govc cluster.add -hostname=${host} -username=${user} -dc=${dc} -password=${pw} -noverify=true
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  OK
-    \   Return From Keyword If  ${status}
-    \   Sleep  3 minutes
-    Fail  Failed to add the host to the VC in 3 attempts
-
-Get Host Firewall Enabled
-    ${output}=  Run  govc host.esxcli network firewall get
-    Should Contain  ${output}  Enabled
-    @{output}=  Split To Lines  ${output}
-    :FOR  ${line}  IN  @{output}
-    \   Run Keyword If  "Enabled" in '''${line}'''  Set Test Variable  ${out}  ${line}
-    ${enabled}=  Fetch From Right  ${out}  :
-    ${enabled}=  Strip String  ${enabled}
-    Return From Keyword If  '${enabled}' == 'false'  ${false}
-    Return From Keyword If  '${enabled}' == 'true'  ${true}
-
-Enable Host Firewall
-    Run  govc host.esxcli network firewall set --enabled true
-
-Disable Host Firewall
-    Run  govc host.esxcli network firewall set --enabled false
-
-Check VM Guestinfo
-    [Arguments]  ${vm}  ${str}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e ${vm} | grep ${str}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${output}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-19-Docker-Verify-Volume-Files b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-19-Docker-Verify-Volume-Files
deleted file mode 100644
index de467ed463..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-19-Docker-Verify-Volume-Files
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-# docker build --no-cache -t jakedsouza/group-1-19-docker-verify-volume-files:1.0 -f Dockerfile.1-19-Docker-Verify-Volume-Files .
-# docker push jakedsouza/group-1-19-docker-verify-volume-files:1.0
-
-FROM alpine:latest
-
-RUN mkdir -p /etc/example/thisshouldexist
-RUN echo "TestFile" >> /etc/example/testfile.txt
-
-VOLUME ["/etc/example"]
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-NewUser_NewGroup b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-NewUser_NewGroup
deleted file mode 100644
index bddf33f76e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-NewUser_NewGroup
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM busybox:latest
-RUN addgroup newuser && adduser -H -S newuser -G newuser
-USER newuser
-CMD id
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID-2000 b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID-2000
deleted file mode 100644
index db300e2188..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID-2000
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM busybox:latest
-USER 2000
-CMD id
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID_GID_2000_2000 b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID_GID_2000_2000
deleted file mode 100644
index 1e85d377fb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/Dockerfile.1-37-Docker-USER-UID_GID_2000_2000
+++ /dev/null
@@ -1,3 +0,0 @@
-from busybox:latest
-user 2000:2000
-cmd id
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/command/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/command/docker-compose.yml
deleted file mode 100644
index 47df339bdf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/command/docker-compose.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-simple:
-  image: busybox:latest
-  command: ls
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/container_name/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/container_name/docker-compose.yml
deleted file mode 100644
index 96d587e258..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/container_name/docker-compose.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-simple:
-  image: busybox:latest
-  container_name: my-web-container
-  command: ls
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/Dockerfile b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/Dockerfile
deleted file mode 100644
index 0d376ec484..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM busybox:latest
-LABEL com.docker.compose.test_image=true
-VOLUME /data
-CMD top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/docker-compose.yml
deleted file mode 100644
index 36b3abece3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-version: '2'
-services:
-  web:
-    image: busybox
-    depends_on:
-      - db
-      - redis
-  redis:
-    image: redis
-  db:
-    image: postgres
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/docker-compose.yml
deleted file mode 100644
index d9366ace23..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/docker-compose.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-web:
-  image: busybox
-  command: /bin/true
-  env_file: ./test.env
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/test.env b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/test.env
deleted file mode 100644
index c9604dad5b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/test.env
+++ /dev/null
@@ -1 +0,0 @@
-FOO=1
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/environment-composefile/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/environment-composefile/docker-compose.yml
deleted file mode 100644
index 9d99fee088..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/environment-composefile/docker-compose.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-service:
-  image: busybox:latest
-  command: top
-
-  environment:
-    foo: bar
-    hello: world
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-1.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-1.yml
deleted file mode 100644
index d88ea61d0e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-1.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-foo:
-  image: busybox
-bar:
-  image: busybox
-web:
-  extends:
-    file: circle-2.yml
-    service: other
-baz:
-  image: busybox
-quux:
-  image: busybox
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-2.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-2.yml
deleted file mode 100644
index de05bc8da0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/circle-2.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-foo:
-  image: busybox
-bar:
-  image: busybox
-other:
-  extends:
-    file: circle-1.yml
-    service: web
-baz:
-  image: busybox
-quux:
-  image: busybox
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common-env-labels-ulimits.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common-env-labels-ulimits.yml
deleted file mode 100644
index 09efb4e75d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common-env-labels-ulimits.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-web:
-  extends:
-    file: common.yml
-    service: web
-  environment:
-    - FOO=2
-    - BAZ=3
-  labels: ['label=one']
-  ulimits:
-    nproc: 65535
-    memlock:
-        soft: 1024
-        hard: 2048
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common.yml
deleted file mode 100644
index b2d86aa4ca..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/common.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-web:
-  image: busybox
-  command: /bin/true
-  net: host
-  environment:
-    - FOO=1
-    - BAR=1
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/docker-compose.yml
deleted file mode 100644
index 8e37d404a0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/docker-compose.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-myweb:
-  extends:
-    file: common.yml
-    service: web
-  command: top
-  links:
-    - "mydb:db"
-  environment:
-    # leave FOO alone
-    # override BAR
-    BAR: "2"
-    # add BAZ
-    BAZ: "2"
-  net: bridge
-mydb:
-  image: busybox
-  command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-1.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-1.yml
deleted file mode 100644
index 4c311e62ca..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-1.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '2.1'
-services:
-  demo:
-    image: foobar:latest
-    healthcheck:
-      test: ["CMD", "/health.sh"]
-      interval: 10s
-      timeout: 5s
-      retries: 36
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-2.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-2.yml
deleted file mode 100644
index 11bc9f09da..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/healthcheck-2.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: '2.1'
-services:
-  demo:
-    extends:
-      file: healthcheck-1.yml
-      service: demo
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-links.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-links.yml
deleted file mode 100644
index cea740cb7b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-links.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-mydb:
-  build: '.'
-myweb:
-  build: '.'
-  extends:
-    service: web
-  command: top
-web:
-  build: '.'
-  links:
-    - "mydb:db"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net-v2.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net-v2.yml
deleted file mode 100644
index 7ba714e89d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net-v2.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "2"
-services:
-  myweb:
-    build: '.'
-    extends:
-      service: web
-    command: top
-  web:
-    build: '.'
-    network_mode: "service:net"
-  net:
-    build: '.'
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net.yml
deleted file mode 100644
index fbcd020bcf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-net.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-myweb:
-  build: '.'
-  extends:
-    service: web
-  command: top
-web:
-  build: '.'
-  net: "container:db"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-volumes.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-volumes.yml
deleted file mode 100644
index 3db0118e0e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/invalid-volumes.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-myweb:
-  build: '.'
-  extends:
-    service: web
-  command: top
-web:
-  build: '.'
-  volumes_from:
-    - "db"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested-intermediate.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested-intermediate.yml
deleted file mode 100644
index c2dd8c9432..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested-intermediate.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-webintermediate:
-  extends:
-    file: common.yml
-    service: web
-  environment:
-    - "FOO=2"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested.yml
deleted file mode 100644
index 6025e6d530..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nested.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-myweb:
-  extends:
-    file: nested-intermediate.yml
-    service: webintermediate
-  environment:
-    - "BAR=2"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/no-file-specified.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/no-file-specified.yml
deleted file mode 100644
index 40e43c4bf4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/no-file-specified.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-myweb:
-  extends:
-    service: web
-  environment:
-    - "BAR=1"
-web:
-  image: busybox
-  environment:
-    - "BAZ=3"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-base.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-base.yml
deleted file mode 100644
index 4e6c82b0d7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-base.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-dnebase:
-  build: nonexistent.path
-  command: /bin/true
-  environment:
-    - FOO=1
-    - BAR=1
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-child.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-child.yml
deleted file mode 100644
index d3b732f2a3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-path-child.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-dnechild:
-  extends:
-    file: nonexistent-path-base.yml
-    service: dnebase
-  image: busybox
-  command: /bin/true
-  environment:
-    - BAR=2
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-service.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-service.yml
deleted file mode 100644
index e9e17f1bdc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/nonexistent-service.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-web:
-  image: busybox
-  extends:
-    service: foo
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-invalid-schema.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-invalid-schema.yml
deleted file mode 100644
index 00c36647ef..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-invalid-schema.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-myweb:
-  extends:
-    file: valid-composite-extends.yml
-    service: web
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-valid-composite-extends.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-valid-composite-extends.yml
deleted file mode 100644
index 6c419ed070..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/service-with-valid-composite-extends.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-myweb:
-  build: '.'
-  extends:
-    file: 'valid-composite-extends.yml'
-    service: web
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/specify-file-as-self.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/specify-file-as-self.yml
deleted file mode 100644
index c24f10bc92..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/specify-file-as-self.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-myweb:
-  extends:
-    file: specify-file-as-self.yml
-    service: web
-  environment:
-    - "BAR=1"
-web:
-  extends:
-    file: specify-file-as-self.yml
-    service: otherweb
-  image: busybox
-  environment:
-    - "BAZ=3"
-otherweb:
-  image: busybox
-  environment:
-    - "YEP=1"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common-config.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common-config.yml
deleted file mode 100644
index d8f13e7a86..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common-config.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-myweb:
-  build: '.'
-  extends:
-    file: valid-common.yml
-    service: common-config
-  command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common.yml
deleted file mode 100644
index 07ad68e3e7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-common.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-common-config:
-  environment:
-    - FOO=1
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-composite-extends.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-composite-extends.yml
deleted file mode 100644
index 8816c3f3b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-composite-extends.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-web:
-  command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation-2.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation-2.yml
deleted file mode 100644
index cb7bd93fc2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation-2.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-web:
-  build: '.'
-  hostname: "host-${HOSTNAME_VALUE}"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation.yml
deleted file mode 100644
index 68e8740fb4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/valid-interpolation.yml
+++ /dev/null
@@ -1,5 +0,0 @@
-myweb:
-  extends:
-    service: web
-    file: valid-interpolation-2.yml
-  command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/verbose-and-shorthand.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/verbose-and-shorthand.yml
deleted file mode 100644
index d381630275..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/verbose-and-shorthand.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-base:
-  image: busybox
-  environment:
-    - "BAR=1"
-
-verbose:
-  extends:
-    service: base
-  environment:
-    - "FOO=1"
-
-shorthand:
-  extends: base
-  environment:
-    - "FOO=2"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/group_add/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/group_add/docker-compose.yml
deleted file mode 100644
index fd15160629..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/group_add/docker-compose.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-version: '2'
-services:
-  myservice:
-    image: redis
-    group_add:
-      - mail
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/labels/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/labels/docker-compose.yml
deleted file mode 100644
index 967c16ebdc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/labels/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-simple:
-  image: busybox:latest
-  labels: 
-    com.example.department: "Finance"
-  command: top
-another:
-  image: busybox:latest
-  command: ls
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/links-composefile/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/links-composefile/docker-compose.yml
deleted file mode 100644
index 930fd4c7ad..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/links-composefile/docker-compose.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-db:
-  image: busybox:latest
-  command: top
-web:
-  image: busybox:latest
-  command: top
-  links:
-    - db:db
-console:
-  image: busybox:latest
-  command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/bridge.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/bridge.yml
deleted file mode 100644
index 28665bd9be..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/bridge.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-version: "2"
-networks:
-      default:
-        driver: bridge
-services:
-  web:
-    image: busybox
-    command: top
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/default-network-config.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/default-network-config.yml
deleted file mode 100644
index 4bd0989b74..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/default-network-config.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-services:
-  simple:
-    image: busybox:latest
-    command: top
-  another:
-    image: busybox:latest
-    command: top
-networks:
-  default:
-    driver: bridge
-    driver_opts:
-      "com.docker.network.bridge.enable_icc": "false"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/docker-compose.yml
deleted file mode 100644
index c11fa6821d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/docker-compose.yml
+++ /dev/null
@@ -1,21 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks: ["front"]
-  app:
-    image: busybox
-    command: top
-    networks: ["front", "back"]
-    links:
-      - "db:database"
-  db:
-    image: busybox
-    command: top
-    networks: ["back"]
-
-networks:
-  front: {}
-  back: {}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-default.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-default.yml
deleted file mode 100644
index 5c9426b846..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-default.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-version: "2"
-services:
-  simple:
-    image: busybox:latest
-    command: top
-  another:
-    image: busybox:latest
-    command: top
-networks:
-  default:
-    external:
-      name: composetest_external_network
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-networks.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-networks.yml
deleted file mode 100644
index db75b78066..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-networks.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks:
-      - networks_foo
-      - bar
-
-networks:
-  networks_foo:
-    external: true
-  bar:
-    external:
-      name: networks_bar
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/missing-network.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/missing-network.yml
deleted file mode 100644
index 41012535d1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/missing-network.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks: ["foo"]
-
-networks:
-  bar: {}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-aliases.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-aliases.yml
deleted file mode 100644
index 8cf7d5af94..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-aliases.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks:
-      front:
-        aliases:
-          - forward_facing
-          - ahead
-      back:
-
-networks:
-  front: {}
-  back: {}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-internal.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-internal.yml
deleted file mode 100755
index 1fa339b1f8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-internal.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks:
-      - internal
-
-networks:
-  internal:
-    driver: bridge
-    internal: True
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-label.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-label.yml
deleted file mode 100644
index fdb24f652d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-label.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2.1"
-
-services:
-  web:
-    image: busybox
-    command: top
-    networks:
-      - network_with_label
-
-networks:
-  network_with_label:
-    labels:
-      - "label_key=label_val"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-mode.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-mode.yml
deleted file mode 100644
index f961bd2311..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-mode.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-version: "2"
-
-services:
-  my_container:
-    image: busybox
-    command: top
-  
-  bridge:
-    image: busybox
-    command: top
-    network_mode: bridge
-
-  service:
-    image: busybox
-    command: top
-    network_mode: "service:bridge"
-
-  container:
-    image: busybox
-    command: top
-    network_mode: "container:my_container"
-
-  host:
-    image: busybox
-    command: top
-    network_mode: host
-
-  none:
-    image: busybox
-    command: top
-    network_mode: none
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-static-addresses.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-static-addresses.yml
deleted file mode 100755
index 4d879dc0a6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-static-addresses.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-version: '2.1'
-
-services:
-  app:
-    image: busybox
-    command: /bin/top
-    networks:
-      app_net:
-        ipv4_address: 172.20.238.10
-
-networks:
-  app_net:
-    driver: bridge
-    enable_ipv6: true
-    ipam:
-      driver: default
-      config:
-      - subnet: 172.20.238.0/24
-        gateway: 172.20.238.1
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/docker-compose.yml
deleted file mode 100644
index c213068def..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/docker-compose.yml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-simple:
-  image: busybox:latest
-  command: top
-  ports:
-    - '3000'
-    - '49152:3001'
-    - '49153-49154:3002-3003'
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/expanded-notation.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/expanded-notation.yml
deleted file mode 100644
index 6fbe59176c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/expanded-notation.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-version: '3.2'
-services:
-    simple:
-      image: busybox:latest
-      command: top
-      ports:
-        - target: 3000
-        - target: 3001
-          published: 49152
-        - target: 3002
-          published: 49153
-          protocol: tcp
-        - target: 3003
-          published: 49154
-          protocol: udp
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/stop-signal-composefile/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/stop-signal-composefile/docker-compose.yml
deleted file mode 100644
index 04f58aa98a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/stop-signal-composefile/docker-compose.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-simple:
-  image: busybox:latest
-  command:
-    - sh
-    - '-c'
-    - |
-        trap 'exit 0' SIGINT
-        trap 'exit 1' SIGTERM
-        while true; do :; done
-  stop_signal: SIGINT
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/docker-compose.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/docker-compose.yml
deleted file mode 100644
index da711ac42b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/docker-compose.yml
+++ /dev/null
@@ -1,2 +0,0 @@
-version: '2.1'
-services: {}
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/external-volumes.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/external-volumes.yml
deleted file mode 100644
index 05c6c4844f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/external-volumes.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-version: "2.1"
-
-services:
-  web:
-    image: busybox
-    command: top
-    volumes:
-      - foo:/var/lib/
-      - bar:/etc/
-
-volumes:
-  foo:
-    external: true
-  bar:
-    external:
-      name: some_bar
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/volume-label.yml b/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/volume-label.yml
deleted file mode 100644
index a5f33a5aaa..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/volume-label.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-version: "2.1"
-
-services:
-  web:
-    image: busybox
-    command: top
-    volumes:
-      - volume_with_label:/data
-
-volumes:
-  volume_with_label:
-    labels:
-      - "label_key=label_val"
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/dynamic-vars.py b/installer/vendor/github.com/vmware/vic/tests/resources/dynamic-vars.py
deleted file mode 100644
index 0b743d8025..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/dynamic-vars.py
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-import os
-from enum import Enum
-
-
-class TestEnvironment(Enum):
-    LOCAL = 0
-    DRONE = 1
-    LONGEVITY = 2
-
-
-def getEnvironment():
-    if (os.environ.has_key("DRONE_BUILD_NUMBER") and (int(os.environ['DRONE_BUILD_NUMBER']) != 0)):
-        return TestEnvironment.DRONE
-    elif os.environ.has_key("LONGEVITY"):
-        return TestEnvironment.LONGEVITY
-    else:
-        return TestEnvironment.LOCAL
-
-def getName(image):
-    return {TestEnvironment.DRONE: 'harbor.ci.drone.local/library/{}'.format(image),
-            TestEnvironment.LONGEVITY: 'willie.eng.vmware.com/library/{}'.format(image),
-            TestEnvironment.LOCAL: image}[getEnvironment()]
-
-# this global variable (images) is used by the Longevity scripts. If you change this, change those!
-# and don't inline it!
-images = ['busybox', 'alpine', 'nginx','debian', 'ubuntu', 'redis']
-for image in images:
-    exec("{} = '{}'".format(image.upper().replace(':', '_').replace('.', '_'), getName(image)))
diff --git a/installer/vendor/github.com/vmware/vic/tests/resources/nimbus-testbeds/vic-vsan.rb b/installer/vendor/github.com/vmware/vic/tests/resources/nimbus-testbeds/vic-vsan.rb
deleted file mode 100644
index 6947dc6130..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/resources/nimbus-testbeds/vic-vsan.rb
+++ /dev/null
@@ -1,158 +0,0 @@
-oneGB = 1 * 1000 * 1000 # in KB
-$testbed = Proc.new do |type, esxStyle, vcStyle, dbType, location|
-  esxStyle ||= 'pxeBoot'
-  vcStyle ||= 'vpxInstall'
-
-  esxStyle = esxStyle.to_s
-  vcStyle = vcStyle.to_s
-  sharedStorageStyle = 'iscsi'
-  dbType = dbType.to_s
-
-  nameParts = ['vic', 'vsan', type, esxStyle, vcStyle]
-  if dbType != 'embedded'
-    nameParts << dbType
-  end
-
-  if type == 'complex'
-    numEsx = 8
-    numCPUs = 4
-    vmsPerHost = 1
-    addHosts = 'vsan-complex-vcqafvt'
-  elsif type == 'simple'
-    numEsx = 4
-    numCPUs = 4
-    vmsPerHost = 0
-    addHosts = 'vsan-simple-vcqafvt'
-  elsif type == 'complexCPU'
-    numEsx = 8
-    numCPUs = 2
-    vmsPerHost = 1
-    addHosts = 'vsan-complex-vcqafvt'
-  else
-    numEsx = 4
-    numCPUs = 2
-    vmsPerHost = 0
-    addHosts = 'vsan-simple-vcqafvt'   
-  end
-  testbed = {
-    'name' => nameParts.join('-'),
-    'esx' => (0...numEsx).map do |i|
-      {
-        'name' => "esx.#{i}",
-        'style' => esxStyle,
-        'disks' => [ 30 * oneGB, 30 * oneGB, 30 * oneGB],
-        'freeLocalLuns' => 1,
-        'freeSharedLuns' => 2,
-        'numMem' => 13 * 1024,
-        'numCPUs' => numCPUs,
-        'ssds' => [ 5*oneGB ],
-        'nics' => 2,
-        'staf' => false,
-        'desiredPassword' => 'e2eFunctionalTest',
-        'vmotionNics' => ['vmk0'],
-        'mountNfs' => ['nfs.0'],
-      }
-    end,
-    'vc' => {
-      'type' => vcStyle,
-      'additionalScript' => [], # XXX: Create users
-      'addHosts' => addHosts,
-      'linuxCertFile' => TestngLauncher.vcvaCertFile,
-      'dbType' => dbType,
-    },
-    'vsan' => true,
-    'postBoot' => Proc.new do |runId, testbedSpec, vc, esxList, iscsiList|
-      ovf = NimbusUtils.get_absolute_ovf("CentOS/VM_OVF10.ovf")
-      if location && $nimbusEnv && $nimbusEnv['NIMBUS'] =~ /gamma/
-        ovf = 'http://10.116.111.50/testwareTestCentOS/VM_OVF10.ovf'
-      end
-
-      cloudVc = vc
-      vim = VIM.connect cloudVc.rbvmomiConnectSpec
-      datacenters = vim.serviceInstance.content.rootFolder.childEntity.grep(RbVmomi::VIM::Datacenter)
-      raise "Couldn't find a Datacenter precreated"  if datacenters.length == 0
-      datacenter = datacenters.first
-      Log.info "Found a datacenter successfully in the system, name: #{datacenter.name}"
-      clusters = datacenter.hostFolder.children
-      raise "Couldn't find a cluster precreated"  if clusters.length == 0
-      cluster = clusters.first
-      Log.info "Found a cluster successfully in the system, name: #{cluster.name}"
-
-      dvs = datacenter.networkFolder.CreateDVS_Task(
-        :spec => {
-          :configSpec => {
-            :name => "test-ds"
-          },
-	    }
-      ).wait_for_completion
-      Log.info "Vds DSwitch created"
-
-      dvpg1 = dvs.AddDVPortgroup_Task(
-        :spec => [
-          {
-            :name => "management",
-            :type => :earlyBinding,
-            :numPorts => 12,
-          }
-        ]
-      ).wait_for_completion
-      Log.info "management DPG created"
-
-      dvpg2 = dvs.AddDVPortgroup_Task(
-        :spec => [
-          {
-            :name => "vm-network",
-            :type => :earlyBinding,
-            :numPorts => 12,
-          }
-        ]
-      ).wait_for_completion
-      Log.info "vm-network DPG created"
-
-      dvpg3 = dvs.AddDVPortgroup_Task(
-        :spec => [
-          {
-            :name => "bridge",
-            :type => :earlyBinding,
-            :numPorts => 12,
-          }
-        ]
-      ).wait_for_completion
-      Log.info "bridge DPG created"
-
-      VcQaTestbedCommon.postBoot(
-        vmsPerHost,
-        NimbusUtils.get_absolute_ovf("CentOS/VM_OVF10.ovf"),
-        runId, testbedSpec, vc, esxList, iscsiList)
-    end,
-    'nfs' => [
-      {
-        'name' => "nfs.0"
-      },
-    ],
-  }
-
-  if dbType == 'mssql'
-    testbed['genericVM'] ||= []
-    testbed['genericVM'] << {
-      'name' => 'vc-mssql',
-      'type' => 'mssql2k8',
-    }
-    testbed['vc']['dbHost'] = 'vc-mssql'
-  end
-
-  testbed = VcQaTestbedCommon.addSharedDisks testbed, [10, 2, 10, 2], sharedStorageStyle   # 2 x 10gb shared vmfs, 2 x 2gb free luns as defined by 'freeSharedLuns', DON'T CHANGE THE ORDERING UNLESS YOU KNOW WHAT YOU'RE DOING!
-
-  testbed
-end
-
-[:pxeBoot, :fullInstall].each do |esxStyle|
-  [:vpxInstall, :vcva].each do |vcStyle|
-    [:embedded, :mssql, :oracle].each do |dbType|
-      ['complex', 'simple', 'complexCPU', 'simpleCPU'].each do |type|
-        testbedSpec = $testbed.call(type, esxStyle, vcStyle, dbType)
-        Nimbus::TestbedRegistry.registerTestbed testbedSpec
-      end
-    end
-  end
-end
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/BuiltIn.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/BuiltIn.index
deleted file mode 100644
index af81aac5a3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/BuiltIn.index
+++ /dev/null
@@ -1,101 +0,0 @@
-Call Method
-Catenate
-Comment
-Continue For Loop
-Continue For Loop If
-Convert To Binary
-Convert To Boolean
-Convert To Bytes
-Convert To Hex
-Convert To Integer
-Convert To Number
-Convert To Octal
-Convert To String
-Create Dictionary
-Create List
-Evaluate
-Exit For Loop
-Exit For Loop If
-Fail
-Fatal Error
-Get Count
-Get Length
-Get Library Instance
-Get Time
-Get Variable Value
-Get Variables
-Import Library
-Import Resource
-Import Variables
-Keyword Should Exist
-Length Should Be
-Log
-Log Many
-Log To Console
-Log Variables
-No Operation
-Pass Execution
-Pass Execution If
-Regexp Escape
-Reload Library
-Remove Tags
-Repeat Keyword
-Replace Variables
-Return From Keyword
-Return From Keyword If
-Run Keyword
-Run Keyword And Continue On Failure
-Run Keyword And Expect Error
-Run Keyword And Ignore Error
-Run Keyword And Return
-Run Keyword And Return If
-Run Keyword And Return Status
-Run Keyword If
-Run Keyword If All Critical Tests Passed
-Run Keyword If All Tests Passed
-Run Keyword If Any Critical Tests Failed
-Run Keyword If Any Tests Failed
-Run Keyword If Test Failed
-Run Keyword If Test Passed
-Run Keyword If Timeout Occurred
-Run Keyword Unless
-Run Keywords
-Set Global Variable
-Set Library Search Order
-Set Log Level
-Set Suite Documentation
-Set Suite Metadata
-Set Suite Variable
-Set Tags
-Set Test Documentation
-Set Test Message
-Set Test Variable
-Set Variable
-Set Variable If
-Should Be Empty
-Should Be Equal
-Should Be Equal As Integers
-Should Be Equal As Numbers
-Should Be Equal As Strings
-Should Be True
-Should Contain
-Should Contain X Times
-Should End With
-Should Match
-Should Match Regexp
-Should Not Be Empty
-Should Not Be Equal
-Should Not Be Equal As Integers
-Should Not Be Equal As Numbers
-Should Not Be Equal As Strings
-Should Not Be True
-Should Not Contain
-Should Not End With
-Should Not Match
-Should Not Match Regexp
-Should Not Start With
-Should Start With
-Sleep
-Variable Should Exist
-Variable Should Not Exist
-Wait Until Keyword Succeeds 
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Collections.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/Collections.index
deleted file mode 100644
index 9f287c9362..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Collections.index
+++ /dev/null
@@ -1,43 +0,0 @@
-Append To List
-Combine Lists
-Convert To Dictionary
-Convert To List
-Copy Dictionary
-Copy List
-Count Values In List
-Dictionaries Should Be Equal
-Dictionary Should Contain Item
-Dictionary Should Contain Key
-Dictionary Should Contain Sub Dictionary
-Dictionary Should Contain Value
-Dictionary Should Not Contain Key
-Dictionary Should Not Contain Value
-Get Dictionary Items
-Get Dictionary Keys
-Get Dictionary Values
-Get From Dictionary
-Get From List
-Get Index From List
-Get Match Count
-Get Matches
-Get Slice From List
-Insert Into List
-Keep In Dictionary
-List Should Contain Sub List
-List Should Contain Value
-List Should Not Contain Duplicates
-List Should Not Contain Value
-Lists Should Be Equal
-Log Dictionary
-Log List
-Pop From Dictionary
-Remove Duplicates
-Remove From Dictionary
-Remove From List
-Remove Values From List
-Reverse List
-Set List Value
-Set To Dictionary
-Should Contain Match
-Should Not Contain Match
-Sort List 
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/DateTime.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/DateTime.index
deleted file mode 100644
index 11f8c94e41..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/DateTime.index
+++ /dev/null
@@ -1,8 +0,0 @@
-Add Time To Date
-Add Time To Time
-Convert Date
-Convert Time
-Get Current Date
-Subtract Date From Date
-Subtract Time From Date
-Subtract Time From Time
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/OperatingSystem.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/OperatingSystem.index
deleted file mode 100644
index c5c7e106da..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/OperatingSystem.index
+++ /dev/null
@@ -1,56 +0,0 @@
-Append To Environment Variable
-Append To File
-Copy Directory
-Copy File
-Copy Files
-Count Directories In Directory
-Count Files In Directory
-Count Items In Directory
-Create Binary File
-Create Directory
-Create File
-Directory Should Be Empty
-Directory Should Exist
-Directory Should Not Be Empty
-Directory Should Not Exist
-Empty Directory
-Environment Variable Should Be Set
-Environment Variable Should Not Be Set
-File Should Be Empty
-File Should Exist
-File Should Not Be Empty
-File Should Not Exist
-Get Binary File
-Get Environment Variable
-Get Environment Variables
-Get File
-Get File Size
-Get Modified Time
-Grep File
-Join Path
-Join Paths
-List Directories In Directory
-List Directory
-List Files In Directory
-Log Environment Variables
-Log File
-Move Directory
-Move File
-Move Files
-Normalize Path
-Remove Directory
-Remove Environment Variable
-Remove File
-Remove Files
-Run
-Run And Return Rc
-Run And Return Rc And Output
-Set Environment Variable
-Set Modified Time
-Should Exist
-Should Not Exist
-Split Extension
-Split Path
-Touch
-Wait Until Created
-Wait Until Removed
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Process.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/Process.index
deleted file mode 100644
index d52dc5fd76..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Process.index
+++ /dev/null
@@ -1,15 +0,0 @@
-Get Process Id
-Get Process Object
-Get Process Result
-Is Process Running
-Join Command Line
-Process Should Be Running
-Process Should Be Stopped
-Run Process
-Send Signal To Process
-Split Command Line
-Start Process
-Switch Process
-Terminate All Processes
-Terminate Process
-Wait For Process
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/SSHLibrary.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/SSHLibrary.index
deleted file mode 100644
index e6c0a0bc88..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/SSHLibrary.index
+++ /dev/null
@@ -1,32 +0,0 @@
-Close All Connections
-Close Connection
-Directory Should Exist
-Directory Should Not Exist
-Enable Ssh Logging
-Execute Command
-File Should Exist
-File Should Not Exist
-Get Connection
-Get Connections
-Get Directory
-Get File
-List Directories In Directory
-List Directory
-List Files In Directory
-Login
-Login With Public Key
-Open Connection
-Put Directory
-Put File
-Read
-Read Command Output
-Read Until
-Read Until Prompt
-Read Until Regexp
-Set Client Configuration
-Set Default Configuration
-Start Command
-Switch Connection
-Write
-Write Bare
-Write Until Expected Output
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Selenium2Library.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/Selenium2Library.index
deleted file mode 100644
index 5563d15695..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/Selenium2Library.index
+++ /dev/null
@@ -1,164 +0,0 @@
-Add Cookie
-Add Location Strategy
-Alert Should Be Present
-Assign Id To Element
-Capture Page Screenshot
-Checkbox Should Be Selected
-Checkbox Should Not Be Selected
-Choose Cancel On Next Confirmation
-Choose File
-Choose Ok On Next Confirmation
-Clear Element Text
-Click Button
-Click Element
-Click Element At Coordinates
-Click Image
-Click Link
-Close All Browsers
-Close Browser
-Close Window
-Confirm Action
-Create Webdriver
-Current Frame Contains
-Current Frame Should Not Contain
-Delete All Cookies
-Delete Cookie
-Dismiss Alert
-Double Click Element
-Drag And Drop
-Drag And Drop By Offset
-Element Should Be Disabled
-Element Should Be Enabled
-Element Should Be Visible
-Element Should Contain
-Element Should Not Be Visible
-Element Should Not Contain
-Element Text Should Be
-Execute Async Javascript
-Execute Javascript
-Focus
-Frame Should Contain
-Get Alert Message
-Get All Links
-Get Cookie Value
-Get Cookies
-Get Element Attribute
-Get Element Size
-Get Horizontal Position
-Get List Items
-Get Location
-Get Matching Xpath Count
-Get Selected List Label
-Get Selected List Labels
-Get Selected List Value
-Get Selected List Values
-Get Selenium Implicit Wait
-Get Selenium Speed
-Get Selenium Timeout
-Get Source
-Get Table Cell
-Get Text
-Get Title
-Get Value
-Get Vertical Position
-Get Webelement
-Get Webelements
-Get Window Identifiers
-Get Window Names
-Get Window Position
-Get Window Size
-Get Window Titles
-Go Back
-Go To
-Input Password
-Input Text
-Input Text Into Prompt
-List Selection Should Be
-List Should Have No Selections
-List Windows
-Location Should Be
-Location Should Contain
-Locator Should Match X Times
-Log Location
-Log Source
-Log Title
-Maximize Browser Window
-Mouse Down
-Mouse Down On Image
-Mouse Down On Link
-Mouse Out
-Mouse Over
-Mouse Up
-Open Browser
-Open Context Menu
-Page Should Contain
-Page Should Contain Button
-Page Should Contain Checkbox
-Page Should Contain Element
-Page Should Contain Image
-Page Should Contain Link
-Page Should Contain List
-Page Should Contain Radio Button
-Page Should Contain Textfield
-Page Should Not Contain
-Page Should Not Contain Button
-Page Should Not Contain Checkbox
-Page Should Not Contain Element
-Page Should Not Contain Image
-Page Should Not Contain Link
-Page Should Not Contain List
-Page Should Not Contain Radio Button
-Page Should Not Contain Textfield
-Press Key
-Radio Button Should Be Set To
-Radio Button Should Not Be Selected
-Register Keyword To Run On Failure
-Reload Page
-Remove Location Strategy
-Select All From List
-Select Checkbox
-Select Frame
-Select From List
-Select From List By Index
-Select From List By Label
-Select From List By Value
-Select Radio Button
-Select Window
-Set Browser Implicit Wait
-Set Screenshot Directory
-Set Selenium Implicit Wait
-Set Selenium Speed
-Set Selenium Timeout
-Set Window Position
-Set Window Size
-Simulate
-Submit Form
-Switch Browser
-Table Cell Should Contain
-Table Column Should Contain
-Table Footer Should Contain
-Table Header Should Contain
-Table Row Should Contain
-Table Should Contain
-Textarea Should Contain
-Textarea Value Should Be
-Textfield Should Contain
-Textfield Value Should Be
-Title Should Be
-Unselect Checkbox
-Unselect Frame
-Unselect From List
-Unselect From List By Index
-Unselect From List By Label
-Unselect From List By Value
-Wait For Condition
-Wait Until Element Contains
-Wait Until Element Does Not Contain
-Wait Until Element Is Enabled
-Wait Until Element Is Not Visible
-Wait Until Element Is Visible
-Wait Until Page Contains
-Wait Until Page Contains Element
-Wait Until Page Does Not Contain
-Wait Until Page Does Not Contain Element
-Xpath Should Match X Times
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot-indices/String.index b/installer/vendor/github.com/vmware/vic/tests/robot-indices/String.index
deleted file mode 100644
index a32e0a7b18..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot-indices/String.index
+++ /dev/null
@@ -1,30 +0,0 @@
-Convert To Lowercase
-Convert To Uppercase
-Decode Bytes To String
-Encode String To Bytes
-Fetch From Left
-Fetch From Right
-Generate Random String
-Get Line
-Get Line Count
-Get Lines Containing String
-Get Lines Matching Pattern
-Get Lines Matching Regexp
-Get Regexp Matches
-Get Substring
-Remove String
-Remove String Using Regexp
-Replace String
-Replace String Using Regexp
-Should Be Byte String
-Should Be Lowercase
-Should Be String
-Should Be Titlecase
-Should Be Unicode String
-Should Be Uppercase
-Should Not Be String
-Split String
-Split String From Right
-Split String To Characters
-Split To Lines
-Strip String 
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/robot.sh b/installer/vendor/github.com/vmware/vic/tests/robot.sh
deleted file mode 100755
index 3eba515155..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/robot.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Run a specific robot file (from the project root directory)
-# ./tests/robot.sh tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.robot
-
-export GITHUB_TOKEN=''
-export GOVC_URL=root:password@1.1.1.1
-export GOVC_URL_HOST=1.1.1.1
-export GOVC_USERNAME=root
-export GOVC_PASSWORD=password
-export DOMAIN=''
-
-./tests/local-integration-test.sh $@
diff --git a/installer/vendor/github.com/vmware/vic/tests/save-test-results.sh b/installer/vendor/github.com/vmware/vic/tests/save-test-results.sh
deleted file mode 100755
index 5ff3376123..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/save-test-results.sh
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash -e
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Saves test results to reporting server
-
-echo "rpcbind : $REPORTING_SERVER_URL" >>  /etc/hosts.allow
-mkdir -p /run/sendsigs.omit.d
-service rpcbind restart
-mkdir /drone-test-results
-mount $REPORTING_SERVER_URL:/export/drone-test-results /drone-test-results
-
-testresultsdb="vic-all.db"
-
-if [ $DRONE_BRANCH = "master" ] && [ $DRONE_REPO = "vmware/vic" ]; then
-	testresultsdb="vic-master.db"
-fi
-
-# save test result to db
-testresultspath="/drone-test-results/testruns-db/$testresultsdb"
-echo "Saving integration test results to $testresultspath"
-python -m dbbot.run -k  -b $testresultspath output.xml
-
-# copy test run files to build folder
-mkdir -p /drone-test-results/testruns/$DRONE_BUILD_NUMBER
-cp log.html report.html /drone-test-results/testruns/$DRONE_BUILD_NUMBER/
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.md
deleted file mode 100644
index 7ae6468a68..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Test 3858 - Verify Kernel modules are not compressed
-=======
-
-# Purpose:
-Verify Kernel modules are not compressed
-
-# References:
-* https://github.com/vmware/vic/issues/3858
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create container
-3. Check /lib/modules to make sure there is no ko.xz file
-
-# Expected Outcome:
-* Step 3 should success
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.robot
deleted file mode 100644
index b1257af438..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/3858.robot
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 3858
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Check kernel modules
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t ${ubuntu} find /lib/modules -name "*.ko" -printf "FOUND\n" -quit
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  FOUND
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.md
deleted file mode 100644
index 62786b4ff6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Test 4367 - Running a container twice does not produce output the second time #4367
-
-=======
-
-# Purpose:
-Verify running a container twice does produce output the second time
-
-# References:
-* https://github.com/vmware/vic/issues/4367
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create container and make sure that we get the output
-3. Run container again and make sure that we get the output
-
-# Expected Outcome:
-* Step 3 should succeed and produce the same output as Step 2
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.robot
deleted file mode 100644
index 4a778a5f1f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4367.robot
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 4367
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Check running twice
-    ${name}=  Generate Random String  15
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t --name ${name} ${busybox} ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  proc
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start -a ${name}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  proc
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.md
deleted file mode 100644
index 66afccb1fb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Test 4817 - Verify Kernel supports vsyscall
-=======
-
-# Purpose:
-Verify Kernel supports vsyscall mechanisms
-
-# References:
-* https://github.com/vmware/vic/issues/4817
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create centos:6 container
-3. Run bash -c true
-
-# Expected Outcome:
-* Step 3 should succeed (exit code of 0)
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.robot
deleted file mode 100644
index 5b05985446..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/4817.robot
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 4817
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Check kernel vsyscall
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t centos:6 bash -c true
-    Should Be Equal As Integers  ${rc}  0
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.md
deleted file mode 100644
index 72d47e9628..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 5343 - Confirm event collection after SDK connection re-establishment
-=======
-
-# Purpose:
-Confirm that vSphere event collection occurs correctly after re-establishment of a dropped SDK connection
-
-# References:
-* https://github.com/vmware/vic/issues/5343
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create container
-3. Power on container
-4. Confirm creation and power on events in logs
-5. Delete vSphere SDK session via govc session.rm
-6. Trigger SDK connection re-establishment (via VCH operation)
-7. Power off container VM via govc
-8. Confirm power off event in logs
-9. Confirm container is reported as stopped
-
-# Expected Outcome:
-All steps should succeed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.robot
deleted file mode 100644
index 9d007978f6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/5343.robot
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 5343
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-
-
-*** Test Cases ***
-Check vsphere event stream
-    # basic confirmation of function
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${name}=  Generate Random String  15
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox} sleep 600
-    Should Be Equal As Integers  ${rc}  0
-    ${shortid}=  Get container shortID  ${id}
-
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} start ${name}
-    Should Be Equal As Integers  ${rc}  0
-
-    # ensure that portlayer log contains the powered on event - this string comes in the e.Message portion of the vSphere event
-    # and may be prone to Localization which would cause this test to fail.
-    # for efficiency We assume that if we saw powered on then "${id} Created" would also have matched
-    Portlayer Log Should Match Regexp  ${name}-${shortid} on \\s\\S* in \\S* is powered on
-
-    # delete the session to suppress reception of events
-    ${rc}  ${out}=  Run And Return Rc And Output  govc session.ls
-    Log  ${out}
-    ${matches}=  Get Lines Matching Regexp  ${out}  %{VCH-IP}\\s* vic-engine  partial_match=True
-    @{sessions}=  Split to lines  ${matches}
-    :FOR  ${session}  IN  @{sessions}
-    \  ${key}=  Fetch From Left  ${session}  ${SPACE}
-    \  ${rc}=  Run And Return Rc  govc session.rm ${key}
-    \  Should Be Equal As Integers  ${rc}  0
-
-    # power off the VM directly
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.power --off ${name}-${shortid}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Confirm container reported as stopped by VCH
-    Wait Until Container Stops  ${id}
-
-    # Assert that the power off event is present
-    # Would prefer to do this as a tail on the live log but no idea how to do stream processing in robot
-    Wait Until Keyword Succeeds  1m  10s  Portlayer Log Should Match Regexp  ${name}-${shortid} on \\s*\\S* in \\S* is powered off
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.md
deleted file mode 100644
index 114e84b929..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 6515 - Check that existing /etc/hosts entries are blended with dynamic ones
-=======
-
-# Purpose:
-Check that we do not overwrite or discard explicit static entries in /etc/hosts when generating the dynamic entries
-
-# References:
-* https://github.com/vmware/vic/issues/6515
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create container
-3. Copy a populated /etc/hosts file to the container
-4. Power on the container
-5. Confirm the presence of entries from the copied file
-
-# Expected Outcome:
-All steps should succeed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.resource b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.resource
deleted file mode 100644
index 04c4821167..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.resource
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-127.0.0.1 robot-test-alias
-::1 robot-test-alias
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.robot
deleted file mode 100644
index 07fc9308ad..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/6515.robot
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6515
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-
-*** Test Cases ***
-Check hosts contains base entries
-    # basic confirmation of function
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${name}=  Generate Random String  15
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox} sleep 600
-    Should Be Equal As Integers  ${rc}  0
-    ${shortid}=  Get container shortID  ${id}
-
-    # update the base hosts file with an alias
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/6515.resource ${id}:/etc/hosts
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} start ${name}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${hosts}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${id} cat /etc/hosts
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${hosts}
-    Should Contain  ${hosts}  robot-test-alias
-
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} restart ${id}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${hosts}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${id} cat /etc/hosts
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${hosts}
-    Should Contain  ${hosts}  robot-test-alias
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/TestCases.md
deleted file mode 100644
index 6366d9c21f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group0-Bugs/TestCases.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Group 0 - Bugs
-=======
-
-[Test 3858 - Verify Kernel modules are not compressed](3858.md)
-[Test 4367 - Running a container twice does not produce output the second time](4367.md)
--
-[Test 4817 - Verify Kernel supports vsyscall](4817.md)
--
-[Test 5343 - Confirm event collection after SDK connection re-establishment](5343.md)
-[Test 6515 - Check that existing /etc/hosts entries are blended with dynamic ones](6515.md)
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.md
deleted file mode 100644
index 61320a6bed..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Test 1-01 - Docker Info
-=======
-
-# Purpose:
-To verify that docker info command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/info/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Issue a docker info command to the new VIC appliance
-3. Issue a docker -D info command to the new VIC appliance
-4. Issue docker info command, docker create busybox, docker info, docker start <containerID>, docker info
-5. Issue docker info command, grab the resource pool CPU/mem limits, change values with govc, docker info, check that values are updated, revert to the old values
-6. Issue docker info command, grab the resource pool CPU/mem usage, add a running container to the resource pool, docker info, check the resource pool CPU/mem usage values are updated
-
-# Expected Outcome:
-* In Step 2, the VIC appliance should respond with a properly formatted info response without errors. Supported volume drivers should be present in the Plugins section.
-* Step 3 should result in additional debug information being returned as well.
-* Verify in step 4 that the correct number of containers is reported.
-* Verify in step 5 that docker info reports the latest resource pool CPU and memory limits.
-* Verify in step 6 that docker info reports the latest resource pool CPU and memory usages
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.robot
deleted file mode 100644
index 492914041a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-01-Docker-Info.robot
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-01 - Docker Info
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Get resource pool CPU and mem limits
-    [Arguments]  ${info}
-
-    ${cpuline}=  Get Lines Containing String  ${info}  CPUs:
-    ${memline}=  Get Lines Containing String  ${info}  Total Memory:
-    @{cpuline}=  Split String  ${cpuline}
-    Length Should Be  ${cpuline}  2
-    @{memline}=  Split String  ${memline}
-    Length Should Be  ${memline}  4
-    ${cpuval}=  Set Variable  @{cpuline}[1]
-    ${memunit}=  Set Variable  @{memline}[3]
-    ${memval}=  Set Variable  @{memline}[2]
-    # Since govc accepts a mem value only in MB, convert the value if necessary
-    ${memval}=  Run Keyword If  '${memunit}' == 'GiB'  Evaluate  int(round(${memval} * 1024))  ELSE  Evaluate  ${memval}
-
-    [Return]  ${cpuval}  ${memval}
-
-Get resource pool CPU and mem usages
-    [Arguments]  ${info}
-
-    ${cpuline}=  Get Lines Containing String  ${info}  CPU usage:
-    ${memline}=  Get Lines Containing String  ${info}  memory usage:
-    @{cpuline}=  Split String  ${cpuline}
-    Length Should Be  ${cpuline}  5
-    @{memline}=  Split String  ${memline}
-    Length Should Be  ${memline}  5
-    ${cpuval}=  Set Variable  @{cpuline}[3]
-    ${memunit}=  Set Variable  @{memline}[4]
-    ${memval}=  Set Variable  @{memline}[3]
-    # convert the value to MiB for comparison
-    ${memval}=  Run Keyword If  '${memunit}' == 'GiB'  Evaluate  int(round(${memval} * 1024))  ELSE  Evaluate  int(round(${memval}))
-
-    [Return]  ${cpuval}  ${memval}
-
-Set resource pool CPU and mem limits
-    [Arguments]  ${cpuval}  ${memval}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  govc pool.change -cpu.limit=${cpuval} %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  govc pool.change -mem.limit=${memval} %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-*** Test Cases ***
-Basic Info
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-    Should Contain  ${output}  vSphere
-    ${volpluginline}=  Get Lines Containing String  ${output}  Volume:
-    Should Contain  ${volpluginline}  vsphere
-
-Debug Info
-    ${status}=  Get State Of Github Issue  780
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-1-Docker-Info.robot needs to be updated now that Issue #780 has been resolved
-    #Log To Console  \nRunning docker -D info command...
-    #${output}=  Run  docker %{VCH-PARAMS} -D info
-    #Log  ${output}
-    #Should Contain  ${output}  Debug mode
-
-Correct container count
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  Containers: 0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  Containers: 1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  Containers: 1
-    Should Contain  ${output}  Running: 1
-
-Check modified resource pool CPU and memory limits
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-
-    ${oldcpuval}  ${oldmemval}=  Get resource pool CPU and mem limits  ${output}
-
-    ${newcpuval}=  Evaluate  ${oldcpuval} - 1
-    ${newmemval}=  Evaluate  1000
-    Set resource pool CPU and mem limits  ${newcpuval}  ${newmemval}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-
-    ${cpuval}  ${memval}=  Get resource pool CPU and mem limits  ${output}
-    Should Be Equal As Integers  ${cpuval}  ${newcpuval}
-    Should Be Equal As Integers  ${memval}  ${newmemval}
-
-    Set resource pool CPU and mem limits  ${oldcpuval}  ${oldmemval}
-
-Check updated resource pool CPU and memory usages
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-
-    ${oldcpuval}  ${oldmemval}=  Get resource pool CPU and mem usages  ${output}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    Sleep  60s  wait for vsphere stats update
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-
-    ${cpuval}  ${memval}=  Get resource pool CPU and mem usages  ${output}
-    Should Not Be Equal As Integers  ${oldcpuval}  ${cpuval}
-    Should Not Be Equal As Integers  ${oldmemval}  ${memval}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.md
deleted file mode 100644
index f92986abed..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Test 1-02 - Docker Pull
-=======
-
-# Purpose:
-To verify that docker pull command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/pull/)
-
-# Environment:
-This test requires that an vSphere server is running and available.
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue a docker pull command to the new VIC appliance for each of the top 3 most popular images in hub.docker.com
-    * nginx, busybox, ubuntu
-3. Issue a docker pull command to the new VIC appliance using a tag that isn't the default latest
-    * ubuntu:14.04
-4. Issue a docker pull command to the new VIC appliance using a digest
-    * nginx@sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64
-    * ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-5. Issue a docker pull command to the new VIC appliance using a different repo than the default
-    * myregistry.local:5000/testing/test-image
-6. Issue a docker pull command to the new VIC appliance using all tags option
-    * --all-tags nginx
-7. Issue a docker pull command to the new VIC appliance using an image that doesn't exist
-8. Issue a docker pull command to the new VIC appliance using a non-default repository that doesn't exist
-9. Issue a docker pull command for an image with a tag that doesn't exist
-10. Issue a docker pull command for an image that has already been pulled
-11. Issue a docker pull command multiple times for the same image
-12. Issue a docker pull command for each of two images that share layers
-13. Issue docker images, rmi ubuntu, pull ubuntu, docker images commands
-14. Issue docker pull command for the same image using multiple tags
-18. Issue docker pull on digest outputted by previous pull
-19. Issue docker pull for these gcr.io images:
-    * gcr.io/google_containers/hyperkube:v1.6.2
-    * gcr.io/google_samples/gb-redisslave:v1
-    * gcr.io/google_samples/cassandra:v11
-    * gcr.io/google_samples/cassandra:v12
-
-# Expected Outcome:
-VIC appliance should respond with a properly formatted pull response to each command issued to it. No errors should be seen, except in the case of step 7, 8 and 9. In step 13, the image ID and size for ubuntu should match before and after removing and re-pulling the image.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot
deleted file mode 100644
index b61ca23f54..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-02-Docker-Pull.robot
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-02 - Docker Pull
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Pull nginx
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${nginx}
-
-Pull busybox
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${busybox}
-
-Pull ubuntu
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${ubuntu}
-
-Pull non-default tag
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  nginx:alpine
-
-Pull images based on digest
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull nginx@sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  No such image:
-    Should Contain  ${output}  Digest: sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64
-    Should Contain  ${output}  Status: Downloaded newer image for library/nginx:sha256:7281cf7c854b0dfc7c68a6a4de9a785a973a14f1481bc028e2022bcd6a8d9f64
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  No such image:
-    Should Contain  ${output}  Digest: sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Should Contain  ${output}  Status: Downloaded newer image for library/ubuntu:sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-
-Pull an image with the full docker registry URL
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  registry.hub.docker.com/library/hello-world
-
-Pull an image with all tags
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  --all-tags nginx
-
-Pull non-existent image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull fakebadimage
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should contain  ${output}  image library/fakebadimage not found
-
-Pull image from non-existent repo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull fakebadrepo.com:9999/ubuntu
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  no such host
-
-Pull image with a tag that doesn't exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox:faketag
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Tag faketag not found in repository library/busybox
-
-Pull image that already has been pulled
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${alpine}
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${alpine}
-
-Pull the same image concurrently
-    ${pids}=  Create List
-
-    # Create 5 processes to pull the same image at once
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} pull ${redis}  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    # Wait for them to finish and check their output
-    :FOR  ${pid}  IN  @{pids}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Log  ${res.stderr}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    \   Should Contain  ${res.stdout}  Downloaded newer image for library/redis:latest
-
-Pull two images that share layers concurrently
-     ${pid1}=  Start Process  docker %{VCH-PARAMS} pull golang:1.7  shell=True
-     ${pid2}=  Start Process  docker %{VCH-PARAMS} pull golang:1.6  shell=True
-
-    # Wait for them to finish and check their output
-    ${res1}=  Wait For Process  ${pid1}
-    ${res2}=  Wait For Process  ${pid2}
-    Should Be Equal As Integers  ${res1.rc}  0
-    Should Be Equal As Integers  ${res2.rc}  0
-    Should Contain  ${res1.stdout}  Downloaded newer image for library/golang:1.7
-    Should Contain  ${res2.stdout}  Downloaded newer image for library/golang:1.6
-
-Re-pull a previously rmi'd image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images |grep ${ubuntu}
-    ${words}=  Split String  ${output}
-    ${id}=  Get From List  ${words}  2
-    ${size}=  Get From List  ${words}  -2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ${ubuntu}
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  ${ubuntu}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images |grep ${ubuntu}
-    ${words}=  Split String  ${output}
-    ${newid}=  Get From List  ${words}  2
-    ${newsize}=  Get From List  ${words}  -2
-    Should Be Equal  ${id}  ${newid}
-    Should Be Equal  ${size}  ${newsize}
-
-Pull image by multiple tags
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  busybox:1.25.1
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  busybox:1.25
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images |grep -E busybox.*1.25
-    Should Be Equal As Integers  ${rc}  0
-    ${lines}=  Split To Lines  ${output}
-    # one for 1.25.1 and one for 1.25
-    Length Should Be  ${lines}  2
-    ${line1}=  Get From List  ${lines}  0
-    ${line2}=  Get From List  ${lines}  -1
-    ${words1}=  Split String  ${line1}
-    ${words2}=  Split String  ${line2}
-    ${id1}=  Get From List  ${words1}  2
-    ${id2}=  Get From List  ${words2}  2
-    Should Be Equal  ${id1}  ${id2}
-
-Issue docker pull on digest outputted by previous pull
-    ${status}=  Get State Of Github Issue  5187
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-02-Docker-Pull.robot needs to be updated now that Issue #5187 has been resolved
-
-    # ${rc}  Run And Return Rc  docker %{VCH-PARAMS} rmi busybox
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox | grep Digest | awk '{print $2}'
-    # Log  ${output}
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Not Be Empty  ${output}
-    # ${rc}  Run And Return Rc  docker %{VCH-PARAMS} rmi busybox
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox@${output}
-    # Log  ${output}
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Contain  ${output}  Downloaded
-
-Pull images from gcr.io
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  gcr.io/google_containers/hyperkube:v1.6.2
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  gcr.io/google_samples/gb-redisslave:v1
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  gcr.io/google_samples/cassandra:v11
-    Wait Until Keyword Succeeds  5x  15 seconds  Pull image  gcr.io/google_samples/cassandra:v12
-
-Verify image manifest digest against vanilla docker
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox:1.26
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  sha256:be3c11fdba7cfe299214e46edc642e09514dbb9bbefcd0d3836c05a1e0cd0642
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.md
deleted file mode 100644
index 9534f71629..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Test 1-03 - Docker Images
-=======
-
-# Purpose:
-To verify that docker images command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/images/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Docker pull alpine
-3. Docker pull alpine:3.2
-4. Docker pull alpine:3.1
-5. Issue docker images command to the new VIC appliance
-6. Issue docker images -a command to the new VIC appliance
-7. Issue docker images -q command to the new VIC appliance
-8. Issue docker images --no-trunc command to the new VIC appliance
-9. Issue docker images alpine:3.1
-10. Issue docker pull busybox:uclibc, busybox:glibc, busybox:musl
-11. Issue regular docker busybox:uclibc, busybox:glibc, busybox:musl
-12. Grep VIC docker and regular docker images command output for eacy busybox tag
-
-# Expected Outcome:
-* Each of the commands issued should return error free with a properly formatted response
-* The docker images and docker images -a command should return the 3 alpine images as expected
-* The docker images -q command should return only the short hash of the three images
-* The docker --no-trunc command should return the full non-truncated image ID of the three images
-* The docker images alpine:3.1 command should return only the specific image specified
-* The image IDs in step 12 for all busybox versions in VIC should match those in regular docker
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.robot
deleted file mode 100644
index 0446281bee..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-03-Docker-Images.robot
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-03 - Docker Images
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox:1.27.1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox:1.27.0
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images | cut -d ' ' -f 1 | grep busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${count}=  Get Count  ${output}  busybox
-    Should Be True  ${count} >= 3
-
-All images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -a | cut -d ' ' -f 1 | grep busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${count}=  Get Count  ${output}  busybox
-    Should Be True  ${count} >= 3
-
-Quiet images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -q
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Not Contain  ${output}  busybox
-    @{lines}=  Split To Lines  ${output}
-    ${count}=  Get Length  ${lines}
-    Should Be True  ${count} >= 3
-    Length Should Be  @{lines}[1]  12
-
-No-trunc images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images --no-trunc
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${count}=  Get Count  ${output}  busybox
-    Should Be True  ${count} >= 3
-    @{lines}=  Split To Lines  ${output}
-    @{line}=  Split String  @{lines}[2]
-    Length Should Be  @{line}[2]  64
-
-Filter images before
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -f before=busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    @{lines}=  Split To Lines  ${output}
-    Should Contain  ${output}  1.27.0
-    ${count}=  Get Length  ${lines}
-    Should Be True  ${count} >= 3
-
-Filter images since
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images -f since=busybox:1.27.0
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    @{lines}=  Split To Lines  ${output}
-    ${count}=  Get Length  ${lines}
-    Should Be True  ${count} > 0
-    Should Contain  ${output}  1.27.1
-
-Tag images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} tag busybox busybox:cdg
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  cdg
-
-Specific images
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images busybox:1.27.0
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    @{lines}=  Split To Lines  ${output}
-    Length Should Be  ${lines}  2
-    Should Contain  ${output}  1.27.0
-
-VIC/docker Image ID consistency
-    @{tags}=  Create List  uclibc  glibc  musl
-
-    :FOR  ${tag}  IN  @{tags}
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox:${tag}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker --tls pull busybox:${tag}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error
-    \   ${rc}  ${vic_id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images | grep -E busybox.*.${tag} |awk '{print $3}'
-    \   Should Be Equal As Integers  ${rc}  0
-    \   ${rc}  ${docker_id}=  Run And Return Rc And Output  docker --tls images | grep -E busybox.*.${tag} |awk '{print $3}'
-    \   Should Be Equal  ${vic_id}  ${docker_id}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.md
deleted file mode 100644
index f381b71cc5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.md
+++ /dev/null
@@ -1,68 +0,0 @@
-Test 1-04 - Docker Create
-=======
-
-# Purpose:
-To verify that docker create command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/create/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Docker pull busybox
-3. Issue docker create busybox to the new VIC appliance
-4. Issue docker create -t -i busybox to the new VIC appliance
-5. Issue docker create --name test1 busybox to the new VIC appliance
-6. Issue docker create -v /var/log busybox ls /var/log to the new VIC appliance
-7. Issue docker start <containerID> to the new VIC appliance
-8. Issue docker logs <containerID> to the new VIC appliance
-9. Issue docker create -v test-named-vol:/testdir busybox
-10. Issue docker start <containerID>
-11. Issue docker logs <containerID> to grab the disk size of the volume
-12. Issue docker create -v /dir:/dir busybox
-13. Issue docker create busybox /bin/top to the new VIC appliance
-14. Issue docker create fakeimage to the new VIC appliance
-15. Issue docker create fakeImage to the new VIC appliance
-16. Issue docker create --name busy1 busybox /bin/top to the new VIC appliance
-17. Issue docker start busy1 to the new VIC appliance
-18. Issue docker create --link busy1:busy1 --name busy2 busybox ping -c2 busy1 to the new VIC appliance
-19. Issue docker start busy2 to the new VIC appliance
-20. Issue docker logs busy2 to the new VIC appliance
-21. Create a container, rm the container, then create another container
-22. Create a container directly without pulling the image first for an image that hasn't been pulled yet
-23. Create a container without specifying a command
-24. Create a container with a custom amount of CPUs
-25. Create a container with a custom amount of Memory in GB
-26. Create a container with a custom amount of Memory in MB
-27. Create a container with a custom amount of Memory in KB
-28. Create a container with a custom amount of Memory in Bytes
-29. Create a container using a rest api call without HostConfig in the form data
-30. Create a container, then check the vm display name in vsphere through govc
-31. Create a container, then check the vm Destroy_Task method is disabled in VC through govc
-32. Create two containers with the same name in parallel, then check that only one attempt is successful
-33. Remove the container from Step 32 by name and create another container with the same name
-
-# Expected Outcome:
-* Steps 3-7 should all return without error and printing the container ID on return
-* Step 8 should show that the contents of the containers /var/log matches the contents of the hosts /var/log
-* Steps 9, 10 and 11 should return without errors and should successfully create a new volume called `test-named-vol` with disk size 975.9M
-* Step 12 should return with the error message - Error response from daemon: vSphere Integrated Containers does not support mounting directories as a data volume.
-* Step 14 should return with the error message - Error: image library/fakeimage not found
-* Step 15 should return with the error message - Error parsing reference: "fakeImage" is not a valid repository/tag
-* Step 18 should result in success and the busy2 container should exist
-* Step 20 should show that busy2 was able to successfully ping busy1 just using the linked name
-* Step 21 should result in success for all three parts
-* Step 22 should return without error
-* Step 23 should return with the following error message - Error response from daemon: No command specified
-* Steps 24-28 should return without error.
-* Step 29 should return without error.
-* Step 30 should show that the VM display name equals to containerName-containerShortID and datastore folder name equal to containerID
-* Step 31 should show that the VM Destroy_Task method is disabled in VC
-* Step 32 should have one container create process succeed and the other fail with an error
-* Step 33 should succeed
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot
deleted file mode 100644
index efd69e9a41..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-04-Docker-Create.robot
+++ /dev/null
@@ -1,241 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-04 - Docker Create
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple creates
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -t -i ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name test1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create with anonymous volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v /var/log ${busybox} ls /var/log
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create with named volume
-    ${disk-size}=  Run  docker %{VCH-PARAMS} logs $(docker %{VCH-PARAMS} start $(docker %{VCH-PARAMS} create -v test-named-vol:/testdir ${busybox} /bin/df -Ph) && sleep 10) | grep by-label | awk '{print $2}'
-    Should Contain  ${disk-size}  975.9M
-
-Create with a directory as a volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v /dir:/dir ${busybox}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: Bad request error from portlayer: vSphere Integrated Containers does not support mounting directories as a data volume.
-
-Create simple top example
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create fakeimage image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create fakeimage
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error: image library/fakeimage not found
-
-Create fakeImage repository
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create fakeImage
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error parsing reference: "fakeImage" is not a valid repository/tag
-
-Create and start named container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name busy1 ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start busy1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create linked containers that can ping
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${debian}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --link busy1:busy1 --name busy2 ${debian} ping -c2 busy1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start busy2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait busy2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs busy2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Create a container after the last container is removed
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${cid2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid2}  Error
-
-Create a container from an image that has not been pulled yet
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${alpine} bash
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create a container with no command specified
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull centos:6.6
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create centos:6.6
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: No command specified
-
-Create a container with custom CPU count
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it --cpuset-cpus 3 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${id} |awk '/CPU:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  3
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${id} |awk '/CPU:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  3
-
-Create a container with custom amount of memory in GB
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -m 4G ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  4096MB
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  4096MB
-
-Create a container with custom amount of memory in MB
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -m 2048M ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  2048MB
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  2048MB
-
-Create a container with custom amount of memory in KB
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -m 2097152K ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  2048MB
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  2048MB
-
-Create a container with custom amount of memory in Bytes
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -m 2147483648B ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  2048MB
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${id} |awk '/Memory:/ {print $2}'
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  2048MB
-
-Create a container using rest api call without HostConfig in the form data
-    ${output}=  Run  curl -sk --cert %{DOCKER_CERT_PATH}/cert.pem --key %{DOCKER_CERT_PATH}/key.pem -H "Content-Type: application/json" -d '{"Image": "${busybox}", "Cmd": ["ping", "127.0.0.1"], "NetworkMode": "bridge"}' https://%{VCH-IP}:2376/containers/create
-    Log  ${output}
-    Should contain  ${output}  "Warnings":null
-
-Create a container and check the VM display name and datastore folder name
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it --name busy3 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${vmName}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${vmName}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${vmName}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Run And Return Rc And Output  govc datastore.ls | grep ${vmName}
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Should contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Run And Return Rc And Output  govc datastore.ls | grep ${id}
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Should Contain  ${output}  ${id}
-
-Create disables VC destroy
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get VM display name  ${id}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -json ${id} | jq .VirtualMachines[].DisabledMethod
-    Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  Destroy_Task
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Not Contain  ${output}  Destroy_Task
-
-Parallel creates with same container name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${suffix}=  Evaluate  '%{DRONE_BUILD_NUMBER}-' + str(random.randint(1000,9999))  modules=random
-    Set Test Variable  ${name}  testDuplicates-${suffix}
-    ${pid1}=  Start Process  docker %{VCH-PARAMS} create --name ${name} ${busybox}  shell=True
-    ${pid2}=  Start Process  docker %{VCH-PARAMS} create --name ${name} ${busybox}  shell=True
-    ${res1}=  Wait For Process  ${pid1}
-    ${res2}=  Wait For Process  ${pid2}
-
-    # Only one process should succeed
-    Run Keyword If  ${res1.rc} == 0  Should Not Be Equal As Integers  ${res2.rc}  0
-    Run Keyword If  ${res2.rc} == 0  Should Not Be Equal As Integers  ${res1.rc}  0
-
-    ${status1}  ${out1}=  Run Keyword And Ignore Error  Should Contain  ${res1.stderr}  is already in use
-    ${status2}  ${out2}=  Run Keyword And Ignore Error  Should Contain  ${res2.stderr}  is already in use
-    # Only and only one process's stderr should contain the error message
-    Run Keyword If  '${status1}' == 'PASS'  Should Not Be Equal  '${status2}'  'PASS'
-    Run Keyword If  '${status2}' == 'PASS'  Should Not Be Equal  '${status1}'  'PASS'
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f status=created
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain X Times  ${output}  ${name}  1
-
-    # Verify that remove and re-create works for the same name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${name}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.md
deleted file mode 100644
index d22f18e873..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.md
+++ /dev/null
@@ -1,45 +0,0 @@
-Test 1-05 - Docker Start
-=======
-
-# Purpose:
-To verify that docker start command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/start/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create -it busybox /bin/top to VIC appliance
-3. Issue docker start <containerID>
-4. Issue docker create vmware/photon
-5. Issue docker start vmware/photon <containerID>
-6. Issue docker start fakeContainer
-7. Create a container, remove it's ethernet adapter, then start the container
-8. Create and start 5 busybox containers running /bin/top serially
-9. Create and start 5 ubuntu containers running /bin/top serially
-10. Create and start 5 busybox containers running /bin/top all at once
-11. Run a container with a test-network, stop the container, remove the test-network, then start the container again
-12. Issue docker start -a <containerID> to a busybox ls container
-
-# Expected Outcome:
-* Commands 1-5 should all return without error and respond with the container ID
-* After commands 3 and 5 verify that the containers are running
-* Step 6 should result in the VIC appliance returning the following error:
-```
-Error response from daemon: No such container: fakeContainer
-Error: failed to start containers: fakeContainer
-```
-* Step 7 should result in an error message stating unable to wait for process launch status
-* Steps 8-11 should all result in all containers succeeding and not throwing any errors
-* Step 11 should result in the VIC appliance returning the following error:
-```
-Error response from daemon: Server error from portlayer: network test-network not found
-Error: failed to start containers: containerID
-```
-* Step 12 should succeed and provide the output from the ls command to the screen
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.robot
deleted file mode 100644
index cddfe5facf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-05-Docker-Start.robot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-05 - Docker Start
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple start
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-Start from image that has no PATH
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull vmware/photon
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it vmware/photon
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-Start non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: No such container: fakeContainer
-    Should Contain  ${output}  Error: failed to start containers: fakeContainer
-
-Start with no ethernet card
-    # Testing that port layer doesn't hang forever if tether fails to initialize (see issue #2327)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Generate Random String  15
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox} date
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc device.remove -vm %{VCH-NAME}/${name}-* ethernet-0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc device.remove -vm ${name}-* ethernet-0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${name}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  unable to wait for process launch status
-    Should Not Contain  ${output}  context deadline exceeded
-
-Serially start 5 long running containers
-    # Perf testing reported (see issue #2496)
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -t ${busybox} /bin/top
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error:
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm -f
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${ubuntu}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -t ${ubuntu} top
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error:
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Not Contain  ${output}  Error:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm -f
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Parallel start 5 long running containers
-    ${pids}=  Create List
-    ${containers}=  Create List
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${output}=  Run  docker %{VCH-PARAMS} create -t ${busybox} /bin/top
-    \   Should Not Contain  ${output}  Error
-    \   Append To List  ${containers}  ${output}
-
-    :FOR  ${container}  IN  @{containers}
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} start ${container}  shell=True
-    \   Append To List  ${pids}  ${pid}
-
-    # Wait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Should Be Equal As Integers  ${res.rc}  0
-
-Start a container with removed network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net test-network ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  network test-network not found
-
-Simple start with attach
-    Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start -a ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  bin
-    Should Contain  ${output}  root
-    Should Contain  ${output}  var
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.md
deleted file mode 100644
index db247341f6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.md
+++ /dev/null
@@ -1,65 +0,0 @@
-Test 1-06 - Docker Run
-=======
-
-# Purpose:
-To verify that docker run command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/run/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker run busybox dmesg to the VIC appliance
-3. Issue docker run busybox -i dmesg to the VIC appliance
-4. Issue docker run -it busybox /bin/top to the VIC appliance
-5. Issue 'q' command to the container
-6. Issue docker run busybox /bin/top to the VIC appliance
-7. Issue docker run busybox fakeCommand to the VIC appliance
-8. Issue docker run fakeImage /bin/bash to the VIC appliance
-9. Issue docker run -d --name busy3 busybox /bin/top to the VIC appliance
-10. Issue docker run --link busy3:busy3 busybox ping -c2 busy3 to the VIC appliance
-11. Issue docker run -it busybox /bin/df to the VIC appliance
-12. Issue docker run -d -p 6379 redis:alpine to the VIC appliance
-13. Issue docker run -it busybox /bin/true
-14. Issue docker run -it busybox /bin/false
-15. Issue docker run -it busybox /bin/fakeCommand
-16. Issue docker run busybox date
-17. Create container1 with id1 and then create container2 with name = id1
-18. Run a short lived container with autoremove specified
-19. Issue docker run -d -v vol:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=pw --name test-mysql mysql to the VIC appliance
-20. Issue docker ps to the VIC appliance to verify that test-mysql is running and clean up afterward
-21. Issue docker run -d -e MYSQL_ROOT_PASSWORD=pw --name test-mariadb mariadb to the VIC appliance
-22. Issue docker ps to the VIC appliance to verify that test-mariadb is running and clean up afterward
-23. Issue docker run -d --name test-postgres postgres to the VIC appliance
-24. Issue docker ps to the VIC appliance to verify that test-postgres is running and clean up afterward
-
-# Expected Outcome:
-* Step 2 and 3 should result in success and print the dmesg of the container
-* Step 4 should result in the top command starting and printing it's results to the screen
-* Step 5 should result in top stopping and the container exiting
-* Step 6 should result in the top command starting and printing it's results to the screen, as it is not interactive you will need to issue ctrl-c to stop the container with a KILL signal
-* Step 7 should result in an error and the following message:
-```
-exec: "fakeCommand": executable file not found in $PATH
-docker: Error response from daemon: Container command not found or does not exist..
-```
-* Step 8 should result in an error and the following message:
-```
-docker: Error parsing reference: "fakeImage" is not a valid repository/tag.
-```
-* Step 10 should result in success and the output should indicate that the ping succeeded across containers just using the linked name
-* Step 11 should result in success with exit code 0 and show the output of the df command
-* Step 12 should result in success with exit code 0
-* Step 13 should result in success with exit code 0
-* Step 14 should result in success with exit code 1
-* Step 15 should result in success with exit code 127
-* Step 16 should result in success and the output should contain the current date
-* Step 17 should result in no conflicts
-* Step 18 should result in the same container count at beginning and end
-* Step 19-24 should result in success with exit code 0
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot
deleted file mode 100644
index 9a625c0fae..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-06-Docker-Run.robot
+++ /dev/null
@@ -1,190 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-06 - Docker Run
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Make sure container starts
-    :FOR  ${idx}  IN RANGE  0  60
-    \   ${out}=  Run  docker %{VCH-PARAMS} ps
-    \   ${status}=  Run Keyword And Return Status  Should Contain  ${out}  /bin/top
-    \   Return From Keyword If  ${status}
-    \   Sleep  1
-    Fail  Container failed to start
-
-Verify container is running and remove it
-    [Arguments]  ${containerName}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  ${containerName}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${containerName}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-*** Test Cases ***
-Simple docker run
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} /bin/ash -c "dmesg;echo END_OF_THE_TEST"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-Docker run with -t
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t ${busybox} /bin/ash -c "dmesg;echo END_OF_THE_TEST"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  END_OF_THE_TEST
-
-Simple docker run with app that doesn't exit
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm -f
-    ${result}=  Start Process  docker %{VCH-PARAMS} run -d ${busybox} /bin/top  shell=True  alias=top
-
-    Make sure container starts
-    ${containerID}=  Run  docker %{VCH-PARAMS} ps -q
-    ${out}=  Run  docker %{VCH-PARAMS} logs ${containerID}
-    Should Contain  ${out}  Mem:
-    Should Contain  ${out}  CPU:
-    Should Contain  ${out}  Load average:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm -f
-
-Docker run fake command
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} fakeCommand
-    Should Be True  ${rc} > 0
-    Should Contain  ${output}  docker: Error response from daemon:
-    Should Contain  ${output}  fakeCommand: no such executable in PATH.
-
-Docker run fake image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run fakeImage /bin/bash
-    Should Be True  ${rc} > 0
-    Should Contain  ${output}  docker: Error parsing reference:
-    Should Contain  ${output}  "fakeImage" is not a valid repository/tag
-
-Docker run named container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name busy3 ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-Docker run linked containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${debian}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --link busy3:busy3 ${debian} ping -c2 busy3
-    Should Be Equal As Integers  ${rc}  0
-
-Docker run -d unspecified host port
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -p 6379 redis:alpine
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Docker run check exit codes
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} true
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} false
-    Should Be Equal As Integers  ${rc}  1
-
-Docker run ps password check
-    [Tags]  secret
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} ps auxww
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ps auxww
-    ${output}=  Split To Lines  ${output}
-    :FOR  ${line}  IN  @{output}
-    \   ${line}=  Strip String  ${line}
-    \   ${command}=  Split String  ${line}  max_split=3
-    \   ${len}=  Get Length  ${command}
-    \   Continue For Loop If  ${len} <= 4
-    \   Should Not Contain  @{command}[4]  %{TEST_USERNAME}
-    \   Should Not Contain  @{command}[4]  %{TEST_PASSWORD}
-
-Docker run immediate exit
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${output}
-
-Docker run verify container start and stop time
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${cmdStart}=  Run  date +%s
-    Sleep  3
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name startStop ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${output}
-    ${rc}  ${containerStart}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.State.StartedAt}}' startStop | xargs date +%s -d
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${containerStop}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.State.FinishedAt}}' startStop | xargs date +%s -d
-    Should Be Equal As Integers  ${rc}  0
-    ${startStatus}=  Run Keyword And Return Status  Should Be True  ${cmdStart} <= ${containerStart}
-    Run Keyword Unless  ${startStatus}  Fail  container start time before command start
-    ${stopStatus}=  Run Keyword And Return Status  Should Be True  ${cmdStart} < ${containerStop}
-    Run Keyword Unless  ${stopStatus}  Fail  container stop time before command start
-    ${timeDiff}=  Evaluate  ${containerStop}-${cmdStart}
-    Should Be True  0 < ${timeDiff} < 60000
-
-Docker run verify name and id are not conflated
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${shortID1}=  Get container shortID  ${container1}
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --name ${shortID1} ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${container2}  Conflict
-
-Docker run and auto remove
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${count}=  Get Length  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --rm ${busybox} date
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  ${count}
-
-Docker run mysql container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v vol:/var/lib/mysql -e MYSQL_ROOT_PASSWORD=pw --name test-mysql mysql
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify container is running and remove it  test-mysql
-
-Docker run mariadb container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -e MYSQL_ROOT_PASSWORD=pw --name test-mariadb mariadb
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify container is running and remove it  test-mariadb
-
-Docker run postgres container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name test-postgres postgres
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify container is running and remove it  test-postgres
-
-Docker run --hostname to set hostname and domainname
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --hostname vic.test ${busybox} hostname
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vic.test
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --hostname vic.test ${busybox} hostname -d
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  test
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --hostname vic.test ${busybox} cat /etc/hosts
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vic.test
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.md
deleted file mode 100644
index b7a370a5a6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Test 1-07 - Docker Stop
-=======
-
-# Purpose:
-To verify that docker stop command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/stop/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create busybox sleep 30 to the VIC appliance
-3. Issue docker stop <containerID> to the VIC appliance
-4. Issue docker start <containerID> to the VIC appliance
-5. Issue docker stop <containerID> to the VIC appliance
-6. Issue docker start <containerID> to the VIC appliance
-7. Issue docker stop -t 2 <containerID> to the VIC appliance
-8. Issue docker stop fakeContainer to the VIC appliance
-9. Create a new container, start the container using govc/UI, attempt to stop the container using docker stop
-10. Start a new container, stop it, then attempt to restart it again
-11. Start a new container, stop it with Docker 1.13 CLI
-
-# Expected Outcome:
-* Steps 2-8 should each complete without error, and the response should be the containerID
-* Step 5 should take 10 seconds to complete
-* Step 7 should take 2 seconds to complete
-* Step 8 should respond with the following error message:
-```
-Failed to stop container (fakeContainer): Error response from daemon: No such container: fakeContainer
-```
-* Step 9 should result in the container stopping successfully
-* Step 10 should result in the container starting without error the second time
-* Step 11 should result in the container stopping successfully
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.robot
deleted file mode 100644
index dca6492532..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-07-Docker-Stop.robot
+++ /dev/null
@@ -1,166 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-07 - Docker Stop
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Trap Signal Command
-    # Container command runs an infinite loop, trapping and logging the given signal name
-    [Arguments]  ${sig}
-    [Return]  ${busybox} sh -c "trap 'echo StopSignal${sig}' ${sig}; echo READY; while true; do sleep 1; done"
-
-Assert Ready
-    # Assert the docker stop signal trap has been set
-    [Arguments]  ${id}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  READY
-
-Assert Stop Signal
-    # Assert the docker stop signal was trapped by checking the container output log file
-    [Arguments]  ${id}  ${sig}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  StopSignal${sig}
-
-Assert Kill Signal
-    # Assert SIGKILL was sent or not by checking the tether debug log file
-    [Arguments]  ${id}  ${expect}
-    ${vmName}=  Get VM display name  ${id}
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Set Test Variable  ${id}  ${vmName}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Test Variable  ${vmName}  %{VCH-NAME}/${vmName}*
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -json ${vmName} | jq -r .VirtualMachines[].Runtime.PowerState
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  poweredOff
-
-    ${rc}  ${dir}=  Run And Return Rc And Output  govc datastore.ls ${id}*
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.download ${dir}/tether.debug -
-    Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  ${expect}  Should Contain  ${output}  sending signal KILL
-    Run Keyword Unless  ${expect}  Should Not Contain  ${output}  sending signal KILL
-
-*** Test Cases ***
-Stop an already stopped container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-
-Basic docker container stop
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} sleep 30
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Assert Kill Signal  ${container}  False
-
-Basic docker stop w/ unclean exit from running process
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container} | jq '.[]|.["State"]|.["ExitCode"]'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Integers  ${output}  143
-
-Stop a container with SIGKILL using default grace period
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  HUP
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Ready  ${container}
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Assert Kill Signal  ${container}  False
-
-Stop a container with SIGKILL using specific stop signal
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  USR1
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --stop-signal USR1 ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Ready  ${container}
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Assert Stop Signal  ${container}  USR1
-    Assert Kill Signal  ${container}  True
-
-Stop a container with SIGKILL using specific grace period
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  HUP
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --stop-signal HUP ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Ready  ${container}
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} stop -t 2 ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Assert Stop Signal  ${container}  HUP
-    Assert Kill Signal  ${container}  True
-
-Stop a non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: No such container: fakeContainer
-
-Attempt to stop a container that has been started out of band
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Generate Random String  15
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    Power On VM OOB  ${name}-*
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Assert Kill Signal  ${container}  False
-
-Restart a stopped container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it ${busybox} /bin/ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    ${shortID}=  Get container shortID  ${output}
-    Wait Until VM Powers Off  *-${shortID}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-Stop a container with Docker 1.13 CLI
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  HUP
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.md
deleted file mode 100644
index 6a4ed715bd..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.md
+++ /dev/null
@@ -1,77 +0,0 @@
-Test 1-08 - Docker Logs
-=======
-
-# Purpose:
-To verify that docker logs command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/logs/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC build 7315 to appliance to vSphere server
-2. Issue docker run -d busybox sh -c "echo These pretzels are making me thirsty"
-3. Issue docker logs <ID1>
-4. Issue docker logs --timestamps <ID1>
-5. Upgrade the VCH to current build
-6. Issue docker run -d busybox sh -c "echo Whats the deeeal with Ovaltine"
-7. Issue docker logs --timestamps <ID2>
-8. Issue docker logs --timestamps <ID1>
-9. Issue docker create busybox /bin/sh -c 'seq 1 5000' to the VIC appliance
-10. Issue docker start <containerID> to the VIC appliance
-11. Issue docker logs <containerID> to the VIC appliance
-12. Issue docker logs --tail=all <containerID> to the VIC appliance
-13. Issue docker logs --tail=200 <containerID> to the VIC appliance
-14. Issue docker logs --tail=0 <containerID> to the VIC appliance
-15. Issue docker create -t busybox /bin/sh -c 'for i in $(seq 1 5) ; do sleep 1 && echo line $i; done'
-16. Issue docker start <containerID> to the VIC appliance
-17. Issue docker logs --follow <containerID> to the VIC appliance
-18. Issue docker create busybox /bin/sh -c 'trap "seq 11 20; exit" HUP; seq 1 10; while true; do sleep 1; done'
-19. Issue docker start <containerID> to the VIC appliance
-20. Issue docker logs <containerID> to the VIC appliance, waiting for the first 10 lines
-21. Issue docker kill -s HUP <containerID> to the VIC appliance, generating the next 10 lines
-22. Issue docker logs --tail=5 --follow <containerID> to the VIC appliance
-23. Issue docker pull ubuntu
-24. Issue docker run ubuntu /bin/cat /bin/hostname >/tmp/hostname
-25. Issue docker logs <containerID> >/tmp/hostname-logs
-26. Issue sha256sum on /tmp/hostname and /tmp/hostname-logs
-27. Issue docker run ubuntu /bin/ls >/tmp/ls
-28. Issue docker logs <containerID> >/tmp/ls-logs
-29. Issue sha256sum on /tmp/ls and /tmp/ls-logs
-30. Issue docker logs --since=1s <containerID> to the VIC appliance
-31. Issue docker logs --timestamps <containerID> to the VIC appliance
-32. Issue docker logs
-33. Issue docker logs fakeContainer
-
-# Expected Outcome:
-* Steps 1-3,5-7,9-29 should all complete without error
-* Step 3 should output "These pretzels are making me thirsty"
-* Step 4 should output "vSphere Integrated Containers does not yet support '--timestamps'"
-* Step 7 should output "Whats the deeeal with Ovaltine?" with a timestamps
-* Step 8 should output "container <ID1> does not support '--timestamp'"
-* Step 13 should output 200 lines
-* Step 14 should output 0 lines
-* Step 17 should have last line be
-```
-line 5
-```
-* Step 20 should output 10 lines
-* Step 22 should output 15 lines
-* Steps 26 and 29 should produce matching sha256 hashes for both files
-* Step 30 should output 3 lines
-* Step 31 should result in an error with the following message:
-```
-Error: vSphere Integrated Containers does not yet support timestamped logs.
-```
-* Step 32 should output all lines
-* Step 33 should result in an error with the following message:
-```
-Error: No such container: fakeContainer
-```
-
-# Possible Problems:
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.robot
deleted file mode 100644
index c715fb2721..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-08-Docker-Logs.robot
+++ /dev/null
@@ -1,207 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-08 - Docker Logs
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC with version to Test Server  version=7315
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Grep Logs And Count Lines
-    [Arguments]  ${id}  ${match}  ${total}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${match}
-    ${linecount}=  Get Line Count  ${output}
-    Should Be Equal As Integers  ${linecount}  ${total}
-
-Upgrade
-  ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-  Should Contain  ${output}  Completed successfully
-  Should Not Contain  ${output}  Rolling back upgrade
-  Should Be Equal As Integers  ${rc}  0
-
-Check Upgraded Version
-  ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
-  @{vers}=  Split String  ${output}
-  ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE}
-  Should Contain  ${output}  Completed successfully
-  Should Contain  ${output}  @{vers}[2]
-  Should Not Contain  ${output}  %{INITIAL-VERSION}
-  Should Be Equal As Integers  ${rc}  0
-  Log  ${output}
-  Get Docker Params  ${output}  ${true}
-
-*** Test Cases ***
-# This test happens first because the rest of the tests need the latest VCH after the upgrade step
-Docker logs backward compatibility
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id1}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} run -d busybox sh -c "echo These pretzels are making me thirsty"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} logs ${id1}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  These pretzels are making me thirsty
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} logs --timestamps ${id1}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet support '--timestamps'
-    Upgrade
-    Check Upgraded Version
-    ${rc}  ${id2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox sh -c "echo Whats the deeeal with Ovaltine?"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --timestamps ${id2}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Whats the deeeal with Ovaltine?
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --timestamps ${id1}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  container ${id1} does not support '--timestamps'
-
-Docker logs with tail
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} sh -c 'seq 1 5000'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Grep Logs And Count Lines  ${id}  2500  5000
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --tail=all ${id}
-    ${linecount}=  Get Line Count  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Integers  ${linecount}  5000
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --tail=200 ${id}
-    ${linecount}=  Get Line Count  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Integers  ${linecount}  200
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --tail=0 ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${linecount}=  Get Line Count  ${output}
-    Should Be Equal As Integers  ${linecount}  0
-
-Docker logs with follow
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} sh -c 'for i in $(seq 1 5) ; do sleep 1 && echo line $i; done'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${linecount}=  Get Line Count  ${output}
-    Should Be Equal As Integers  ${linecount}  5
-    ${lastline}=  Get Line  ${output}  4
-    Should Contain  ${lastline}  line 5
-    # Container is stopped at this point, verify that --follow does not block.
-    ${rc}  ${output2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-    Should Be Equal  ${output}  ${output2}
-
-Docker logs with follow and tail
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} sh -c 'trap "seq 11 20; exit" HUP; seq 1 10; while true; do sleep 1; done'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    # Wait for the first 10 lines to be logged
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Grep Logs And Count Lines  ${id}  5  10
-    # kill -HUP will create another 5 lines of log output
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s HUP ${id}
-    Should Be Equal As Integers  ${rc}  0
-    # --tail=5 to skip the first 5 lines and --follow to wait for the rest
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --tail 5 --follow ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${linecount}=  Get Line Count  ${output}
-    Should Be True  ${linecount} >= 5
-
-Docker logs follow shutdown
-    # Test that logs --follow reads all data following a close (shutdown) event.
-    # Keys to this test:
-    # - The container VM shutdown event happens while the (HTTP) log follow poller is asleep.
-    # - The container VM log accumulates > interaction layer buffer size data while log follow poller was alseep.
-    # Note that the interaction layer currently uses an extra super tiny buffer size of 64 bytes.
-    ${rc}  ${buffer}=  Run And Return Rc And Output  bash -c "printf '=%.0s' {1..65}"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} sh -c 'echo ${buffer}; sleep .5; echo ${buffer}'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  ${buffer}\n${buffer}
-
-Docker binary logs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${ubuntu}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${ubuntu} /bin/cat /bin/hostname >/tmp/hostname
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a |grep ${ubuntu} |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id} >/tmp/hostname-log
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${h1}=  Run And Return Rc And Output  sha256sum /tmp/hostname |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${h2}=  Run And Return Rc And Output  sha256sum /tmp/hostname-log |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${h1}  ${h2}
-    ${rc}  ${output}=  Run And Return Rc And Output  rm /tmp/hostname*
-    Should Be Equal As Integers  ${rc}  0
-
-Docker text logs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${ubuntu} /bin/ls >/tmp/ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a |grep /bin/ls |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id} >/tmp/ls-log
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${h1}=  Run And Return Rc And Output  sha256sum /tmp/ls |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${h2}=  Run And Return Rc And Output  sha256sum /tmp/ls-log |awk '{print $1}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${h1}  ${h2}
-    ${rc}  ${output}=  Run And Return Rc And Output  rm /tmp/ls*
-    Should Be Equal As Integers  ${rc}  0
-
-Docker logs with timestamps and since certain time
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} run ${busybox} sh -c 'for i in $(seq 0 9) ; do sleep 1 && echo line $i; done'
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -q |head --lines=1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${lines}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --since=5s ${containerID} |wc -l
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Equal As Integers  ${lines}  10
-    ${rc}  ${lines}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --since=1h ${containerID} |wc -l
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Integers  ${lines}  10
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${containerID} |wc -l
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Integers  ${output}  10
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --timestamps ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${date}=  Fetch From Left  ${output}  ${SPACE}
-    Should Match Regexp  ${date}  \\d{4}-\\d{2}-\\d{2}T\\d{2}:\\d{2}:\\d{2}\\.\\d{9}Z
-
-Docker logs with no flags
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} sh -c "seq 1 128 | xargs -n1 echo"
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Grep Logs And Count Lines  ${id}  42  128
-
-Docker logs non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error: No such container: fakeContainer
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.md
deleted file mode 100644
index f8c397ea89..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Test 1-09 - Docker Attach
-=======
-
-# Purpose:
-To verify that docker attach command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/attach/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases
-
-## Basic attach
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create -it busybox /bin/top to the VIC appliance
-3. Issue docker start <containerID> to the VIC appliance
-4. Issue docker attach <containerID> to the VIC appliance
-5. Issue ctrl-p then ctrl-q to the container
-6. Issue docker create -it busybox /bin/top to the VIC appliance
-7. Issue docker attach <containerID>
-8. Issue docker start <containerID> to the VIC appliance
-9. Issue docker attach --detach-keys="a" <containerID> to the VIC appliance
-10. Issue 'a' to the container
-11. Attempt to reattach to the the same container a second time
-12. Issue docker attach fakeContainer to the VIC appliance
-
-### Expected Outcome:
-* Steps 1-6,8-11 should all return without error
-* Step 7 should result in the following error message:
-```
-You cannot attach to a stopped container, start it first
-```
-* Step 5 and 10 should cause the client to detach from the container gracefully, with the container continuing to run
-* Step 12 should result in the following message:
- ```
- Error: No such container: fakeContainer
- ```
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.robot
deleted file mode 100644
index b027269493..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-09-Docker-Attach.robot
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-09 - Docker Attach
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Basic attach
-    ${rc}  ${output}=  Run And Return Rc And Output  mkfifo /tmp/fifo
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    Start Process  docker %{VCH-PARAMS} attach ${containerID} < /tmp/fifo  shell=True  alias=custom
-    Sleep  3
-    Run  echo q > /tmp/fifo
-    ${ret}=  Wait For Process  custom
-    Should Be Equal As Integers  ${ret.rc}  0
-    Should Be Empty  ${ret.stdout}
-    Should Be Empty  ${ret.stderr}
-
-Attach to stopped container
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} attach ${out}
-    Should Be Equal As Integers  ${rc}  1
-    Should Be Equal  ${out}  You cannot attach to a stopped container, start it first
-
-Attach to fake container
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} attach fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${out}  Error: No such container: fakeContainer
-
-Attach with short input
-    ${rc}  ${tmp}=  Run And Return Rc And Output  mktemp -d -p /tmp
-    Should Be Equal As Integers  ${rc}  0
-    ${fifo}=  Catenate  SEPARATOR=/  ${tmp}  fifo
-    ${rc}  ${output}=  Run And Return Rc And Output  mkfifo ${fifo}
-    Should Be Equal As Integers  ${rc}  0
-    ${out}=  Run  docker %{VCH-PARAMS} pull busybox
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i busybox sort
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \     Start Process  docker %{VCH-PARAMS} start -ai ${containerID} < ${fifo}  shell=True  alias=custom
-    \     Run  echo one > ${fifo}
-    \     ${ret}=  Wait For Process  custom
-    \     Log  ${ret.stderr}
-    \     Should Be Equal  ${ret.stdout}  one
-    \     Should Be Equal As Integers  ${ret.rc}  0
-    \     Should Be Empty  ${ret.stderr}
-    Run  rm -rf ${tmp}
-
-Attach with short output
-    Run  docker %{VCH-PARAMS} pull busybox
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox echo one
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start -a ${containerID}
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Should Be Equal  ${output}  one
-
-Attach with short output with tty
-    Run  docker %{VCH-PARAMS} pull busybox
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -t busybox echo one
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \     ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start -a ${containerID}
-    \     Should Be Equal As Integers  ${rc}  0
-    \     Should Be Equal  ${output}  one
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.md
deleted file mode 100644
index 067a4c813d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.md
+++ /dev/null
@@ -1,107 +0,0 @@
-Test 1-10 - Docker PS
-=======
-
-# Purpose:
-To verify that docker ps command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/ps/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker ps
-3. Issue docker create busybox /bin/top
-4. Issue docker start <containerID>
-5. Issue docker create busybox ls
-6. Issue docker start <containerID>
-7. Issue docker create busybox dmesg
-8. Issue docker ps
-9. Issue docker ps -a
-10. Issue docker create --name jojo busybox /bin/top
-11. PowerOn container jojo-* out of band via govc
-12. Issue docker ps -q
-13. Issue docker create --name koko busybox /bin/top
-14. Issue docker start koko
-15. Issue docker ps -q
-16. PowerOff container koko* out of band via govc
-17. Issue docker ps -q
-18. Issue docker create -p 8000:80 -p 8443:443 nginx
-19. Issue docker ps -a
-20. Issue docker run -d -p 6379 redis:alpine
-21. Issue docker ps
-22. Issue docker create --name lolo busybox /bin/top
-23. Issue docker start lolo
-24. Issue docker stop lolo
-25. Issue docker ps -aq
-26. Destroy container lolo* out of band via govc
-27. Issue docker ps -aq
-28. Issue docker ps -l
-29. Issue docker ps -n=2
-30. Issue docker ps -ls
-31. Issue docker ps -aq
-32. Create 3 containers
-33. Issue docker ps -aq
-34. Issue docker ps -f status=created
-35. Issue docker create --name abe --label prod busybox /bin/top
-36. Issue docker ps -a -f label=prod
-37. Issue docker ps -a -f name=abe
-38. Issue docker create -v foo:/dir --name fooContainer busybox
-39. Issue docker ps -a -f volume=foo
-40. Issue docker ps -a -f volume=foo -f volume=bar
-41. Issue docker ps -a -f volume=fo
-42. Issue docker network create fooNet
-43. Issue docker create --net=fooNet --name fooNetContainer busybox
-44. Issue docker ps -a -f network=fooNet
-45. Issue docker ps -a -f network=fooNet -f network=barNet
-46. Issue docker ps -a -f network=fo
-47. Issue docker ps -a -f volume=foo -f network=bar
-48. Issue docker ps -a -f network=bar -f volume=foo
-49. Issue docker ps -a -f volume=foo -f volume=buz -f network=bar
-50. Issue docker create -v buz:/dir --net=fooNet --name buzFooContainer busybox
-51. Issue docker ps -a -f volume=buz -f network=fooNet
-
-# Expected Outcome:
-* Steps 2-13 should all return without error
-* Step 2 should return with only the printed ps command header and no containers
-* Step 8 should return with only the information for the /bin/top container
-* Step 9 should return with the information for all 3 containers
-* Step 10-11 should return without error
-* Step 12 should include jojo-* containerVM
-* Steps 13-16 should return without error
-* Step 17 should not include koko and have one less container than in Step 15
-* Step 18 should return without error
-* Step 19 should include the port-mappings of Step 18's container
-* Step 20 should return without error
-* Step 21 should include the port-mappings of Step 20's container
-* Steps 22-25 should return without errors
-* Step 26 should succeed on ESXi and fail on vCenter with the error:
-```
-govc: ServerFaultCode: The method is disabled by 'VIC'
-```
-* Step 27 should include one less container than in Step 25
-* Step 28 should include only redis
-* Step 29 should include only redis and nginx
-* Step 30 should include only redis with SIZE present
-* Steps 31-32 should return with error
-* Step 33 should include 3 more containers than in Step 31
-* Step 34 should include 4 created containers
-* Step 35 should return without error
-* Step 36 should include only abe
-* Step 37 should include only abe
-* Step 38 should return without error
-* Step 39 should include only fooContainer
-* Step 40 should include only fooContainer
-* Step 41 should not include any containers
-* Steps 42-43 should return without error
-* Step 44 should include only fooNetContainer
-* Step 45 should include only fooNetContainer
-* Step 46 should not include any containers
-* Steps 47-49 should not include any containers
-* Step 50 should return without error
-* Step 51 should include only buzFooContainer
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.robot
deleted file mode 100644
index 0bfb277f94..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-10-Docker-PS.robot
+++ /dev/null
@@ -1,356 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-10 - Docker PS
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Assert VM Power State
-    [Arguments]  ${name}  ${state}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info -json %{VCH-NAME}/${name}-* | jq -r .VirtualMachines[].Runtime.PowerState
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal  ${output}  ${state}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info -json ${name}-* | jq -r .VirtualMachines[].Runtime.PowerState
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal  ${output}  ${state}
-
-Create several containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container2}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container1}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container3}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} dmesg
-    Should Be Equal As Integers  ${rc}  0
-    ${container2shortID}=  Get container shortID  ${container2}
-    Wait Until VM Powers Off  *-${container2shortID}*
-
-Assert Number Of Containers
-    [Arguments]  ${num}  ${type}=-q
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps ${type}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  ${num}
-
-Check Length Of PS
-    [Arguments]  ${len}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  /bin/top
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  ${len}
-
-*** Test Cases ***
-Empty docker ps command
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  CONTAINER ID
-    Should Contain  ${output}  IMAGE
-    Should Contain  ${output}  COMMAND
-    Should Contain  ${output}  CREATED
-    Should Contain  ${output}  STATUS
-    Should Contain  ${output}  PORTS
-    Should Contain  ${output}  NAMES
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-Docker ps only running containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-    Create several containers
-    Wait Until Keyword Succeeds  5x  5 seconds  Check Length of PS  ${len+1}
-
-Docker ps all containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-    Create several containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  /bin/top
-    Should Contain  ${output}  dmesg
-    Should Contain  ${output}  ls
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  ${len+3}
-
-Docker ps powerOn container OOB
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name jojo ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -q
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-
-    Power On VM OOB  jojo*
-
-    Wait Until Keyword Succeeds  10x  6s  Assert Number Of Containers  ${len+1}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop jojo
-    Should Be Equal As Integers  ${rc}  0
-
-Docker ps powerOff container OOB
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name koko ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start koko
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -q
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-
-    Power Off VM OOB  koko*
-
-    Wait Until Keyword Succeeds  10x  6s  Assert Number Of Containers  ${len-1}
-
-Docker ps ports output
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    # forwarding via the endpointVM
-    ${rc}  ${containerA}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -p 8000:80 -p 8443:443 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    # published via the container-network with no port redirect
-    ${rc}  ${containerB}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -p 8000 --net=public ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    # published via the container-network with port redirect
-    ${rc}  ${containerC}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -p 8001:80 --net=public ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-
-    ## Check that ports are not displayed before start
-    Should Not Contain  ${output}  :8000->80/tcp
-    Should Not Contain  ${output}  :8443->443/tcp
-    Should Not Contain  ${output}  :8000->8000/tcp
-    Should Not Contain  ${output}  :8001->80/tcp
-
-    ## Check ports are displayed once started
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} start ${containerA} ${containerB} ${containerC}
-    Should Be Equal As Integers  ${rc}  0
-    ${ipB}=  Get Container IP  %{VCH-PARAMS}  ${containerB}  public
-    ${ipC}=  Get Container IP  %{VCH-PARAMS}  ${containerC}  public
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-
-    Should Contain  ${output}  %{EXT-IP}:8000->80/tcp
-    Should Contain  ${output}  %{EXT-IP}:8443->443/tcp
-    Should Contain  ${output}  ${ipB}:8000->8000/tcp
-    Should Contain  ${output}  ${ipB}:8000->80/tcp
-
-    ## Stop the containers and ensure ports are not listed
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} stop ${containerA} ${containerB} ${containerC}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-
-    # forwarding via endpointVM.
-    Should Not Contain  ${output}  :8000->80/tcp
-    Should Not Contain  ${output}  :8443->443/tcp
-    Should Not Contain  ${output}  :8000->8000/tcp
-    Should Not Contain  ${output}  :8001->80/tcp
-
-
-Create reference containers for last container and status tests
-    # used as a reference during the status filter test
-    ${rc}  ${containerA}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -p 8000:80 -p 8443:443 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Used as a reference after the OOB test
-    ${rc}  ${containerB}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -p 6379 redis:alpine
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ->6379/tcp
-
-
-Docker ps Remove container OOB
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name lolo ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start lolo
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop lolo
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-
-    # Remove container VM out-of-band
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.destroy "lolo*"
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.destroy %{VCH-NAME}/"lolo*"
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Not Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  govc: ServerFaultCode: The method is disabled by 'VIC'
-
-    # Remove the 'lolo' container on VC so it does not affect subsequent test cases
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f lolo
-    Pass Execution If  '%{HOST_TYPE}' == 'VC'  Remaining steps not applicable on VC - skipping
-
-    Wait Until VM Is Destroyed  "lolo*"
-    Wait Until Keyword Succeeds  10x  6s  Assert Number Of Containers  ${len-1}  -aq
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Run And Return Rc And Output  govc datastore.ls | grep "lolo*" | xargs -n1 govc datastore.rm
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Run And Return Rc And Output  govc datastore.ls | grep ${container} | xargs -n1 govc datastore.rm
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Should Be Equal As Integers  ${rc}  0
-
-Docker ps last container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -l
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  redis
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-Docker ps two containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -n=2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  redis
-    Should Contain  ${output}  nginx
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  3
-
-Docker ps last container with size
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  SIZE
-    Should Contain  ${output}  redis
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-Docker ps all containers with only IDs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq
-    ${output}=  Split To Lines  ${output}
-    ${len}=  Get Length  ${output}
-    Create several containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  CONTAINER ID
-    Should Not Contain  ${output}  /bin/top
-    Should Not Contain  ${output}  dmesg
-    Should Not Contain  ${output}  ls
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  ${len+3}
-
-Docker ps with status filter
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f status=created
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  nginx
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  5
-
-Docker ps with label and name filter
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name abe --label prod ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f label=prod
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  busybox
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f name=abe
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  busybox
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-Docker ps with volume filter
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v foo:/dir --name fooContainer ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=foo
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  fooContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=foo -f volume=bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  fooContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=fo
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-Docker ps with network filter
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create fooNet
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net=fooNet --name fooNetContainer ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f network=fooNet
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f network=fooNet -f network=barNet
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f network=fo
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-Docker ps with volume and network filters
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=foo -f network=bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooContainer
-    Should Not Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f network=bar -f volume=foo
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooContainer
-    Should Not Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=foo -f volume=buz -f network=bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooContainer
-    Should Not Contain  ${output}  fooNetContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v buz:/dir --net=fooNet --name buzFooContainer ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a -f volume=buz -f network=fooNet
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  fooContainer
-    Should Not Contain  ${output}  fooNetContainer
-    Should Contain  ${output}  buzFooContainer
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.md
deleted file mode 100644
index a8dbf4c363..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.md
+++ /dev/null
@@ -1,51 +0,0 @@
-Test 1-11 - Docker RM
-=======
-
-# Purpose:
-To verify that docker rm command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/rm/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create busybox dmesg to the VIC appliance
-3. Issue docker rm <containerID> to the VIC appliance
-4. Issue docker create busybox ls to the VIC appliance
-5. Issue docker start <containerID> to the VIC appliance
-6. Issue docker rm <containerID> to the VIC appliance
-7. Issue docker create busybox /bin/top to the VIC appliance
-8. Issue docker start <containerID> to the VIC appliance
-9. Issue docker rm <containerID> to the VIC appliance
-10. Issue docker rm -f <containerID> to the VIC appliance
-11. Issue docker rm fakeContainer to the VIC appliance
-12. Issue docker create --name test busybox to the VIC appliance
-13. Remove the containerVM out-of-band using govc
-14. Issue docker rm test to the VIC appliance
-15. Issue docker rm to container created with an unknown executable
-
-# Expected Outcome:
-* Steps 2-8,12,15 should complete without error
-* Step 3,6,10 should result in the container being removed from the VIC appliance
-* Step 9 should result in the following error:  
-```
-Error response from daemon: Conflict, You cannot remove a running container. Stop the container before attempting removal or use -f
-```
-* Step 11 should result in the following error:  
-```
-Error response from daemon: No such container: fakeContainer
-```
-* Step 13 should succeed on ESXi and fail on vCenter with the following error:
-```
-govc: ServerFaultCode: The method is disabled by 'VIC'
-```
-* When run on standalone ESXi, step 14 should result in the following error:  
-```
-Error response from daemon: No such container: test
-```
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.robot
deleted file mode 100644
index 7ec38a814a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-11-Docker-RM.robot
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-11 - Docker RM
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Check That VM Is Removed
-    [Arguments]  ${container}
-    ${id}=  Get container shortID  ${container}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc ls %{VCH-NAME}/vm
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Not Contain  ${output}  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc ls vm
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Not Contain  ${output}  ${id}
-
-Check That Datastore Is Cleaned
-    [Arguments]  ${container}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  ${container}
-
-*** Test Cases ***
-Basic docker remove container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} dmesg
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container}
-
-Remove a stopped container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} ls
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Container Stops  ${container}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container}
-
-Remove a running container
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: You cannot remove a running container. Stop the container before attempting removal or use -f
-
-Force remove a running container
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container}
-    Wait Until Keyword Succeeds  10x  6s  Check That Datastore Is Cleaned  ${container}
-
-Remove a fake container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: No such container: fakeContainer
-
-Remove a container deleted out of band
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name testRMOOB -p 80:8080 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    # Remove container VM out-of-band
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.destroy "testRMOOB*"
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.destroy %{VCH-NAME}/"testRMOOB*"
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Not Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  govc: ServerFaultCode: The method is disabled by 'VIC'
-    Pass Execution If  '%{HOST_TYPE}' == 'VC'  Remaining steps not applicable on VC - skipping
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm testRMOOB
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: No such container: testRMOOB
-    # now recreate the same container to ensure it's completely deleted
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name testRMOOB -p 80:8080 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-Remove a container created with unknown executable
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} xxxx
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That VM Is Removed  ${container}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.md
deleted file mode 100644
index 9036432cb1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Test 1-12 - Docker RMI
-=======
-
-# Purpose:
-To verify that docker rmi command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/rmi/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker pull busybox to the VIC appliance
-3. Issue docker rmi busybox to the VIC appliance
-4. Issue docker pull busybox to the VIC appliance
-5. Issue docker create busybox /bin/top to the VIC appliance
-6. Issue docker rm <containerID> to the VIC appliance
-7. Issue docker rmi busybox to the VIC appliance
-8. Issue docker pull busybox to the VIC appliance
-9. Issue docker create busybox /bin/top to the VIC appliance
-10. Issue docker rmi busybox to the VIC appliance
-11. Issue docker rmi -f busybox to the VIC appliance
-12. Issue docker rmi fakeImage to the VIC appliance
-13. Issue a docker pull by digest
-14. Issue a docker rmi by digest
-
-# Expected Outcome:
-* Step 3 and 7 should result in success and the image should be removed from inventory
-* Step 10 should result in failure and the error message below:  
-```
-Failed to remove image (busybox): Error response from daemon: conflict: unable to remove repository reference "busybox" (must force) - container 6a26c7deb9b7 is using its referenced image 47bcc53f74dc
-```
-* Step 11 should result in success and the image should be removed from inventory
-* Step 12 should result in an error with the following message:  
-```
-Failed to remove image (fakeImage): Error response from daemon: No such image: fakeImage:latest
-```
-* Steps 13-14 should result in success and the output of step 14 should contain the digest of the rmi'd image
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.robot
deleted file mode 100644
index de55a5278f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-12-Docker-RMI.robot
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-12 - Docker RMI
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Containers
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Basic docker pull, restart, and remove image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${alpine}
-    Should Be Equal As Integers  ${rc}  0
-
-    Reboot VM  %{VCH-NAME}
-
-    Log To Console  Getting VCH IP ...
-    ${new-vch-ip}=  Get VM IP  %{VCH-NAME}
-    Log To Console  New VCH IP is ${new-vch-ip}
-    Replace String  %{VCH-PARAMS}  %{VCH-IP}  ${new-vch-ip}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images ${busybox}:latest
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  busybox
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images ${alpine}:latest
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  alpine
-
-Remove image with a removed container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images ${busybox}:latest
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  busybox
-
-Remove image with a container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ${busybox}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Failed to remove image "${busybox}"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${busybox}
-
-Remove a fake image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi fakeImage
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: Error parsing reference: "fakeImage" is not a valid repository/tag
-
-Remove an image pulled by digest
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rmi ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ubuntu@sha256:45b23dee08af5e43a7fea6c4cf9c25ccf269ee113168c19722f87876677c5cb2
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.md
deleted file mode 100644
index f71d1c859a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Test 1-13 - Docker Version
-=======
-
-# Purpose:
-To verify that docker version command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/version/)
-
-# Environment:
-This test requires that a vSphere server is running and available.
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Issue a docker version command to the new VIC appliance
-3. Issue a docker version --format '{{.Client.Version}}' command to the new VIC appliance
-4. Issue a docker1.11 version --format '{{.Client.APIVersion}}' command to the new VIC appliance
-5. Issue a docker1.13 version --format '{{.Client.APIVersion}}' command to the new VIC appliance
-6. Issue a docker version --format '{{.Client.GoVersion}}' command to the new VIC appliance
-7. Issue a docker version --format '{{.Server.Version}}' command to the new VIC appliance
-8. Issue a docker1.11 version --format '{{.Server.APIVersion}}' command to the new VIC appliance
-9. Issue a docker1.13 version --format '{{.Server.APIVersion}}' command to the new VIC appliance
-10. Issue a docker1.13 version --format '{{.Server.MinAPIVersion}}' command to the new VIC appliance
-11. Issue a docker version --format '{{.Server.GoVersion}}' command to the new VIC appliance
-12. Issue a docker version --format '{{.fakeItem}}' command to the new VIC appliance
-
-# Expected Outcome:
-* VIC appliance should respond with a properly formatted version response, it should be capable of returning each individual field as well without error.
-* The server version field should indicate that it is VIC.
-* Step 6 should result in an error indicating: fakeItem is not a field of struct type types.VersionResponse
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.robot
deleted file mode 100644
index 45d0523528..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-13-Docker-Version.robot
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-13 - Docker Version
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple Docker Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} version
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Client:
-    Should Contain  ${output}  Server:
-    Should Contain  ${output}  Version:
-    Should Contain  ${output}  Built:
-
-Docker Version Format Client Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.Client.Version}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Empty  ${output}
-
-Docker1.11 Version Format Client API Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} version --format '{{.Client.APIVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.23
-
-Docker1.13 Version Format Client API Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} version --format '{{.Client.APIVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.25
-
-Docker Version Format Client Go Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.Client.GoVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Empty  ${output}
-
-Docker Version Format Server Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.Server.Version}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Empty  ${output}
-
-Docker1.11 Version Format Server API Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} version --format '{{.Server.APIVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.25
-
-Docker1.13 Version Format Server API Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} version --format '{{.Server.APIVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.25
-
-Docker1.13 Version Format Server Minimum API Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} version --format '{{.Server.MinAPIVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  1.19
-
-Docker Version Format Server Go Version
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.Server.GoVersion}}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Empty  ${output}
-
-Docker Version Format Bad Field
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} version --format '{{.fakeItem}}'
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  can't evaluate field fakeItem in type types.VersionResponse
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.md
deleted file mode 100644
index 6b39023162..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Test 1-14 - Docker Kill
-=======
-
-# Purpose:
-To verify that docker kill command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/kill/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create busybox sleep 300 to the VIC appliance
-3. Issue docker start <containerID> to the VIC appliance
-4. Issue docker kill <containerID> to the VIC appliance
-5. Issue docker start <containerID> to the VIC appliance
-6. Issue docker kill -s HUP <containerID> to the VIC appliance
-7. Issue docker kill -s TERM <containerID> to the VIC appliance
-8. Issue docker kill fakeContainer to the VIC appliance
-9. Issue docker create nginx to the VIC appliance
-10. Issue docker start <containerID to the VIC appliance
-11. Issue docker kill <containerID> to the VIC appliance
-
-# Expected Outcome:
-* Steps 2-7 should all return without error and provide the container ID in the response
-* Step 4 should result in the container stopping immediately
-* Step 6 should result in the container continuing to run
-* Step 7 should result in the container stopping immediately
-* Step 8 should result in an error and the following message:
-```
-Failed to kill container (fakeContainer): Error response from daemon: Cannot kill container fakeContainer: No such container: fakeContainer
-```
-* Step 11 should result in the container stopped
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.robot
deleted file mode 100644
index 5d8cd50a8e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-14-Docker-Kill.robot
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-14 - Docker Kill
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Trap Signal Command
-    # Container command runs an infinite loop, trapping and logging the given signal name
-    [Arguments]  ${sig}
-    [Return]  ${busybox} sh -c "trap 'echo KillSignal${sig}' ${sig}; echo READY; while true; do date && sleep 1; done"
-
-Nested Trap Signal Command
-    # Container command runs an infinite loop, trapping and logging the given signal name in a nested shell
-    # This is to test process group behaviours - same command as above, but nested in another shell
-    [Arguments]  ${sig}
-    [Return]  ${busybox} sh -c "trap 'echo KillSignalParent${sig}' ${sig}; sh -c \\"trap 'echo KillSignalChild${sig}' ${sig}; echo READY; while true; do date && sleep 1; done\\""
-
-Assert Container Output
-    [Arguments]  ${id}  ${match}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${match}
-
-Check That Container Was Killed
-    [Arguments]  ${container}
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} ${container}
-    Log  ${out}
-    Should Contain  ${out}  false
-    Should Be Equal As Integers  ${rc}  0
-
-*** Test Cases ***
-Signal a container with default kill signal
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  HUP
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Container Output  ${id}  READY
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill ${id}
-    Should Be Equal As Integers  ${rc}  0
-    # Wait for container VM to stop/powerOff
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-    # Cannot send signal to a powered off container VM
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill ${id}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Cannot kill container ${id}
-
-Signal a container with SIGHUP
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Trap Signal Command  HUP
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Container Output  ${id}  READY
-    # Expect failure with unknown signal name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s NOPE ${id}
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s HUP ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Container Output  ${id}  KillSignalHUP
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s TERM ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-
-Confirm signal delivered to entire process group
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${trap}=  Nested Trap Signal Command  HUP
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${trap}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Container Output  ${id}  READY
-    # Expect failure with unknown signal name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s NOPE ${id}
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s HUP ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  200 milliseconds  Assert Container Output  ${id}  KillSignalChildHUP
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill -s TERM ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${id}
-
-Signal a non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such container: fakeContainer
-
-Signal a tough to kill container - nginx
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} kill ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check That Container Was Killed  ${id}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.md
deleted file mode 100644
index ab18ed7b60..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.md
+++ /dev/null
@@ -1,39 +0,0 @@
-Test 1-15 - Docker Network Create
-=======
-
-# Purpose:
-To verify that docker network create command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/network_create/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker network create test-network to the VIC appliance
-3. Issue docker network create --label=foo=bar label-network to the VIC appliance
-4. Issue docker network inspect -f '{{.Labels}}' label-network to the VIC appliance
-5. Issue docker network create test-network to the VIC appliance
-6. Issue docker network create -d overlay test-network2 to the VIC appliance
-7. Issue docker network create --internal internal-network
-8. Issue docker network inspect -f '{{.Internal}}' internal-network
-
-# Expected Outcome:
-* Step 2 should complete successfully and a new network should be created named test-network
-* Step 3 should complete successfully and a new network should be created named label-network
-* Step 4 should complete successfully and the output should show label-network's label
-* Step 5 should result in an error with the following message:
-```
-Error response from daemon: network with name test-network already exists
-```
-* Step 6 should result in an error with the following message:
-```
-Error response from daemon: failed to parse pool request for address space "GlobalDefault" pool "" subpool "": cannot find address space GlobalDefault (most likely the backing datastore is not configured)
-```
-* Step 7 should return without an error
-* Step 8's output should be equal to 'true'
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.robot
deleted file mode 100644
index deb8d8b339..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-15-Docker-Network-Create.robot
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-15 - Docker Network Create
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Container Networks
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Basic network create
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  test-network
-
-Network create with label
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create --label=foo=bar label-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  label-network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect -f '{{.Labels}}' label-network
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  map[foo:bar]
-
-Create already created network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  already exists
-
-Create overlay network
-    ${status}=  Get State Of Github Issue  1222
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-15-Docker-Network-Create.robot needs to be updated now that Issue #1222 has been resolved
-    Log  Issue \#1222 is blocking implementation  WARN
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create -d overlay test-network2
-    #Should Be Equal As Integers  ${rc}  1
-    #Should Contain  ${output}  Error response from daemon: failed to parse pool request for address space "GlobalDefault" pool "" subpool "": cannot find address space GlobalDefault (most likely the backing datastore is not configured)
-
-Create internal network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create --internal internal-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect -f '{{.Internal}}' internal-network
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  true
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.md
deleted file mode 100644
index 072e5fc7ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Test 1-16 - Docker Network LS
-=======
-
-# Purpose:
-To verify that docker network ls command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/network_ls/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker network ls to the VIC appliance
-3. Issue docker network ls -q to the VIC appliance
-4. Issue docker network ls -f name=bridge to the VIC appliance
-5. Issue docker network ls -f name=fakeName to the VIC appliance
-6. Issue docker network create --label=foo foo-network to the VIC appliance
-7. Issue docker network ls -f label=foo to the VIC appliance
-8. Issue docker network ls --no-trunc to the VIC appliance
-
-# Expected Outcome:
-* Step 2 should return at the least the default networks
-* Step 3 should return the networks ID only
-* Step 4 should return only the bridge network
-* Step 5 should return no networks listed
-* Step 6 should return without errors
-* Step 7 should return only the foo-network network
-* Step 8 should return all of the networks with their full IDs
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.robot
deleted file mode 100644
index 36e5b9c83d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-16-Docker-Network-LS.robot
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-16 - Docker Network LS
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Container Networks
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Basic network ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  bridge
-
-Docker network ls -q
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls -q
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  NAME
-    Should Not Contain  ${output}  DRIVER
-    Should Not Contain  ${output}  bridge
-
-Docker network ls filter by name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls -f name=bridge
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  bridge
-    @{lines}=  Split To Lines  ${output}
-    Length Should Be  ${lines}  2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls -f name=fakeName
-    Should Be Equal As Integers  ${rc}  0
-    @{lines}=  Split To Lines  ${output}
-    Length Should Be  ${lines}  1
-    Should Contain  @{lines}[0]  NAME
-
-Docker network ls filter by label
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create --label=foo foo-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls -f label=foo
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  foo-network
-    @{lines}=  Split To Lines  ${output}
-    Length Should Be  ${lines}  2
-
-Docker network ls --no-trunc
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls --no-trunc
-    Should Be Equal As Integers  ${rc}  0
-    @{lines}=  Split To Lines  ${output}
-    @{line}=  Split String  @{lines}[1]
-    Length Should Be  @{line}[0]  64
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.md
deleted file mode 100644
index 69307fdffa..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.md
+++ /dev/null
@@ -1,87 +0,0 @@
-Test 1-17 - Docker Network Connect
-=======
-
-# Purpose:
-To verify that docker network connect command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/network_connect/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-
-2. Issue docker network create cross1-network
-3. Issue docker network create cross1-network2
-4. Issue docker create --net cross1-network --name cross1-container busybox /bin/top
-5. Issue docker network connect cross1-network2 <containerID>
-6. Issue docker start <containerID>
-7. Issue docker create --net cross1-network --name cross1-container2 debian ping -c2 cross1-container
-8. Issue docker network connect cross1-network2 <containerID>
-9. Issue docker start <containerID>
-10. Issue docker logs --follow cross1-container2
-11. Issue docker create --name cross1-container3 --net cross1-network busybox ping -c2 cross1-container3
-12. Issue docker network connect cross1-network2 cross1-container3
-13. Issue docker start cross1-container3
-14. Issue docker logs --follow cross1-container3
-
-15. Issue docker network create test-network
-16. Issue docker create busybox ifconfig
-17. Issue docker network connect test-network <containerID>
-18. Issue docker start <containerID>
-19. Issue docker logs <containerID>
-20. Issue docker network connect test-network fakeContainer
-21. Issue docker network connect fakeNetwork <containerID>
-
-22. Issue docker network create cross2-network
-23. Issue docker network create cross1-network2
-24. Issue docker run -itd --net cross2-network --name cross2-container busybox /bin/top
-25. Get the above container's IP - ${ip}
-26. Issue docker run --net cross2-network2 --name cross2-container2 debian ping -c2 ${ip}
-27. Issue docker logs --follow cross2-container2
-28. Issue docker run -d --net cross2-network -p 8080:80 nginx
-29. Get the above container's IP - ${ip}
-30. Issue docker run --net cross2-network2 --name cross2-container3 debian ping -c2 ${ip}
-31. Issue docker logs --follow cross2-container3
-
-32. Issue docker network create --internal internal-net
-33. Issue docker run --net internal-net busybox ping -c1 www.google.com
-34. Issue docker network create public-net
-35. Issue docker run --net internal-net --net public-net busybox ping -c2 www.google.com
-36. Issue docker run -itd --net internal-net busybox
-37. Get the above container's IP - ${ip}
-38. Issue docker run --net internal-net busybox ping -c2 ${ip}
-
-# Expected Outcome:
-* Steps 2-9 should return without errors
-* Step 10's output should contain "2 packets transmitted, 2 packets received"
-* Steps 11-13 should return without errors
-* Step 14's output should contain "2 packets transmitted, 2 packets received"
-
-* Step 15-17 should complete successfully
-* Step 19 should print the results of the ifconfig command and there should be two network interfaces in the container(eth0, eth1)
-* Step 20 should result in an error with the following message:
-```
-Error response from daemon: No such container: fakeContainer
-```
-* Step 21 should result in an error with the following message:
-```
-Error response from daemon: network fakeNetwork not found
-```
-
-* Steps 22-26 should return without errors
-* Step 27's output should contain "2 packets transmitted, 0 packets received, 100% packet loss"
-* Steps 28-30 should return without errors
-* Step 31's output should include "2 packets transmitted, 0 packets received, 100% packet loss"
-
-* Step 32 should return without an error
-* Step 33 should return with a non-zero exit code and the output should contain "Network is unreachable"
-* Step 34 should return without an error
-* Step 35's output should contain "2 packets transmitted, 2 packets received"
-* Steps 36-37 should return without errors
-* Step 38's output should contain "2 packets transmitted, 2 packets received"
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot
deleted file mode 100644
index ca00425030..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-17-Docker-Network-Connect.robot
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-17 - Docker Network Connect
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Container Networks
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Connect containers to multiple bridge networks overlapping
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create cross1-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create cross1-network2
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${debian}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net cross1-network --name cross1-container ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect cross1-network2 ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net cross1-network --name cross1-container2 ${debian} ping -c2 cross1-container
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect cross1-network2 ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow cross1-container2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cross1-container3 --net cross1-network ${busybox} ping -c2 cross1-container3
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect cross1-network2 cross1-container3
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start cross1-container3
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow cross1-container3
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Connect container to a new network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} ip -4 addr show eth0
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect test-network ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow ${containerID}
-    Should Be Equal As Integers  ${rc}  0
-    ${ips}=  Get Lines Containing String  ${output}  inet
-    @{lines}=  Split To Lines  ${ips}
-    Length Should Be  ${lines}  2
-
-Connect to non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect test-network fakeContainer
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  not found
-
-Connect to non-existent network
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name connectTest3 ${busybox} ifconfig
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect fakeNetwork connectTest3
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  not found
-
-Connect containers to multiple networks non-overlapping
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create cross2-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create cross2-network2
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${debian}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --net cross2-network --name cross2-container ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  ${containerID}  cross2-network
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net cross2-network2 --name cross2-container2 ${debian} ping -c2 ${ip}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 0 packets received, 100% packet loss
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow cross2-container2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 0 packets received, 100% packet loss
-
-    # verify that an exposed port on the container does not break down bridge isolation
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net cross2-network -p 8080:80 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  ${containerID}  cross2-network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net cross2-network2 --name cross2-container3 ${debian} ping -c2 ${ip}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 0 packets received, 100% packet loss
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow cross2-container3
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 0 packets received, 100% packet loss
-
-Connect containers to an internal network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create --internal internal-net
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net internal-net ${busybox} ping -c1 www.google.com
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Network is unreachable
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create public-net
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net internal-net --net public-net ${busybox} ping -c2 www.google.com
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --net internal-net ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  ${containerID}  internal-net
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net internal-net ${busybox} ping -c2 ${ip}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Check Name Resolution Between Containers On Internal Network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create --internal mynet
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create pubnet
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name foo --net mynet alpine:latest sleep 10000
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i --name baz --net pubnet -p 80 alpine:latest ping -c3 foo
-    Log  ${output}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect mynet baz
-    Log  ${output}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start -i baz
-    Log  ${output}
-
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  PING foo
-    Should Contain  ${output}  3 packets transmitted, 3 packets received
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.md
deleted file mode 100644
index b1d48b25e5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.md
+++ /dev/null
@@ -1,43 +0,0 @@
-Test 1-18 - Docker Network RM
-=======
-
-# Purpose:
-To verify that docker network rm command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/network_rm/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker network create test-network to the VIC appliance
-3. Issue docker network create test-network2 to the VIC appliance
-4. Issue docker network create test-network3 to the VIC appliance
-5. Issue docker rm test-network to the VIC appliance
-6. Issue docker rm test-network2 <ID of test-network3> to the VIC appliance
-7. Issue docker rm test-network to the VIC appliance
-8. Issue docker network create test-network
-9. Issue docker create busybox /bin/top
-10. Issue docker network connect test-network <containerID>
-11. Issue docker start <containerID>
-12. Issue docker network rm test-network
-13. Issue docker stop <containerID>
-14. Issue docker rm <containerID>
-15. Issue docker network rm test-network
-
-# Expected Outcome:
-* Steps 5 and 6 should completely successfully and all three network should be removed
-* Step 7 should result in an error and show the following error message:  
-```
-Error response from daemon: network test-network not found
-```
-* Step 12 should result in an error with the following message:
-```
-Error response from daemon: network test-network has active endpoints
-```
-* Step 15 should result in success and the network should be removed
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.robot
deleted file mode 100644
index eace91d3e1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-18-Docker-Network-RM.robot
+++ /dev/null
@@ -1,86 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-18 - Docker Network RM
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Container Networks
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Basic network remove
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  test-network
-
-Multiple network remove
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network3
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network2 ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  test-network2
-    Should Not Contain  ${output}  test-network3
-
-Remove already removed network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: network test-network not found
-
-Remove network with running container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect test-network ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: test-network has active endpoints
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network rm test-network
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  test-network
-
-Add and remove network multiple times
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-
-    : FOR  ${INDEX}  IN RANGE  1  30
-    \     ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} network create foo
-    \     Should Be Equal As Integers  ${rc}  0
-    \     ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} network rm foo
-    \     Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  ${output2}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.md
deleted file mode 100644
index 7a27af12eb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.md
+++ /dev/null
@@ -1,63 +0,0 @@
-Test 1-19 - Docker Volume Create
-=======
-
-# Purpose:
-To verify that docker volume create command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/volume_create/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker volume create to the VIC appliance
-2. Create container with volume mounted over /etc and ensure that name resolution functions as expected
-3. Issue docker volume create --name=test to the VIC appliance
-4. Issue docker volume create --name=test to the VIC appliance
-5. Issue docker volume create -d fakeDriver --name=test2
-6. Issue docker volume create --name=test3 --opt VolumeStore=fakeStore
-7. Issue docker volume create --name=test4 --opt Capacity=100
-8. Issue docker volume create --name=test5 --opt Capacity=0
-9. Issue docker volume create --name=test6 --opt Capacity=-1
-10. Issue docker volume create --name=test7 --opt Capacity=2147483647
-11. Issue docker volume create --name=test8 --opt Capacity=9999999999
-12. Issue docker volume create --name=test???
-13. Issue docker volume create --name=multipleX --opt Capacity=2MB ten times rapidly
-14. Create container with an anonymous volume in the Dockerfile, and verify that the files in the volume exist
-15. Create container with a named volume and verify that base image files are copied to the named volume
-16. Create container with a named volume. Modify the copied image file. Remount the volume in a new container.
-17. Run container with a volume, and run another container with same volume
-
-# Expected Outcome:
-* Steps 2 and 3 should complete successfully and return the name of the volume created, you should then be able to see the volume has been created
-* Step 4 should result in error with the following error message:
-```
-Error response from daemon: A volume named test already exists. Choose a different volume name.
-```
-* Step 5 should result in error with the following error message:
-```
-error looking up volume plugin fakeDriver: plugin not found
-```
-* Step 6 should result in error with the following message:
-```
-Error looking up volume store fakeStore: datastore not found
-```
-* Step 7 should result in success and the volume created should be 100MB in size
-* Step 8 should result in error and indicate that the capacity suggested is invalid
-* Step 9 should result in error and indicate that the capacity suggested is invalid
-* Step 10 should result in error and indicate that the datastore cannot create that big of a volume
-* Step 11 should result in error and indicate that the capacity suggested in invalid
-* Step 12 should result in error with the following message:
-```
-Error response from daemon: create test???: "test???" includes invalid characters for a local volume name, only "\[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
-```
-* Step 13 should not result in any of the volume create operations failing
-* Step 14 should result in success and print data in the volume
-* Step 15 should result in success and print data in the volume
-* Step 16 should result in success and the second container should contain the modified file contents
-* Step 17 should result in error with message `devices <volume id> in use`
-
-# Possible Problems:
-* VIC requires you to specify storage on creation of the VCH that volumes can be created from, so when installing the VCH make sure to specify this parameter: --volume-store=
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot
deleted file mode 100644
index d4d28157d2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-19-Docker-Volume-Create.robot
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-19 - Docker Volume Create
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple docker volume create
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create
-    Should Be Equal As Integers  ${rc}  0
-    Set Suite Variable  ${ContainerName}  unnamedSpecVolContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  975.9M
-
-Simple volume mounted over managed files
-    ${status}=  Get State Of Github Issue  5731
-    Run Keyword If  '${status}' == 'closed'  Fail  Test should pass now that Issue #5731 has been resolved
-
-    #${rc}  ${target}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit busybox
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v /etc busybox ping -c2 ${target}
-    #Should Be Equal As Integers  ${ContainerRC}  0
-    #Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Docker volume create named volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test
-    Set Suite Variable  ${ContainerName}  specVolContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  975.9M
-
-Docker volume create image volume
-    Set Suite Variable  ${ContainerName}  imageVolContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d mongo /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  976M
-
-Docker volume create anonymous volume
-    Set Suite Variable  ${ContainerName}  anonVolContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v /mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  975.9M
-
-Docker volume create already named volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: A volume named test already exists. Choose a different volume name.
-
-Docker volume create volume with bad driver
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create -d fakeDriver --name=test2
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  error looking up volume plugin fakeDriver: plugin not found
-
-Docker volume create with bad volumestore
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test3 --opt VolumeStore=fakeStore
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No volume store named (fakeStore) exists
-
-Docker volume create with bad driver options
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test3 --opt bogus=foo
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  bogus is not a supported option
-
-Docker volume create with mis-capitalized valid driver option
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test4 --opt cAPACITy=10000
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test4
-    Set Suite Variable  ${ContainerName}  capacityVolContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  9.5G
-
-Docker volume create with specific capacity no units
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test5 --opt Capacity=100000
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test5
-    Set Suite Variable  ${ContainerName}  capacityVolContainer2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${rc}  ${disk-size}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${disk-size}  96.0G
-
-Docker volume create large volume specifying units
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=unitVol1 --opt Capacity=10G
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  unitVol1
-    Set Suite Variable  ${ContainerName}  unitContainer
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${disk-size}=  Run  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Contain  ${disk-size}  9.5G
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=unitVol2 --opt Capacity=10000
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  unitVol2
-    Set Suite Variable  ${ContainerName}  unitContainer2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${ContainerName} -d -v ${output}:/mydata ${busybox} /bin/df -Ph
-    Should Be Equal As Integers  ${rc}  0
-    ${ContainerRC}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} wait ${ContainerName}
-    Should Be Equal As Integers  ${ContainerRC}  0
-    Should Not Contain  ${output}  Error response from daemon
-    ${disk-size}=  Run  docker %{VCH-PARAMS} logs ${ContainerName} | grep by-label | awk '{print $2}'
-    Should Contain  ${disk-size}  9.5G
-
-Docker volume create with zero capacity
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test5 --opt Capacity=0
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: bad driver value - Invalid size: 0
-
-Docker volume create with negative one capacity
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test6 --opt Capacity=-1
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: bad driver value - Invalid size: -1
-
-Docker volume create with capacity too big
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test7 --opt Capacity=9223372036854775808
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: bad driver value - Capacity value too large: 9223372036854775808
-
-Docker volume create with capacity exceeding int size
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test8 --opt Capacity=9999999999999999999
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: bad driver value - Capacity value too large: 9999999999999999999
-
-Docker volume create with possibly invalid name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test???
-    Should Be Equal As Integers  ${rc}  1
-    Should Be Equal As Strings  ${output}  Error response from daemon: volume name "test???" includes invalid characters, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed
-
-Docker volume verify anonymous volume contains base image files
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name verify-anon-1 jakedsouza/group-1-19-docker-verify-volume-files:1.0 ls /etc/example
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  thisshouldexist
-    Should Contain  ${output}  testfile.txt
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name verify-anon-2 jakedsouza/group-1-19-docker-verify-volume-files:1.0 cat /etc/example/testfile.txt
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  TestFile
-
-Docker volume verify named volume contains base image files
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name verify-named-1 -v test15:/etc/example jakedsouza/group-1-19-docker-verify-volume-files:1.0 cat /etc/example/testfile.txt
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  TestFile
-
-	# Verify file is copied to volumeA
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name verify-named-2 -v test15:/mnt/test15 jakedsouza/group-1-19-docker-verify-volume-files:1.0 cat /mnt/test15/testfile.txt
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  TestFile
-
-Docker volume verify files are not copied again in a non empty volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v test16:/etc/example jakedsouza/group-1-19-docker-verify-volume-files:1.0 sh -c "echo test16modified >> /etc/example/testfile.txt"
-    Should Be Equal As Integers  ${rc}  0
-    # Verify modified file remains
-	${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -v test16:/etc/example jakedsouza/group-1-19-docker-verify-volume-files:1.0 cat /etc/example/testfile.txt
-	Should Be Equal As Integers  ${rc}  0
-	Should Contain  ${output}  test16modified
-
-Docker volume conflict in new container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create
-    Should Be Equal As Integers  ${rc}  0
-    Set Suite Variable  ${volID}  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit -v ${volID}:/mydata ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit -v ${volID}:/mydata ${busybox}
-    Should Be Equal As Integers  ${rc}  125
-    Should Contain  ${output}  Error response from daemon
-    Should Contain  ${output}  device ${volID} in use
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.md
deleted file mode 100644
index 68c30a899c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Test 1-20 - Docker Volume Inspect
-=======
-
-# Purpose:
-To verify that docker volume inspect command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/volume_inspect/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker volume create --name=test to the VIC appliance
-3. Issue docker volume inspect test to the VIC appliance
-4. Issue docker volume inspect fakeVolume to the VIC appliance
-
-# Expected Outcome:
-* Step 3 should result in a properly formatted JSON response
-* Step 4 should result in an error with the following message:
-```
-Error: No such volume: fakeVolume
-```
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.robot
deleted file mode 100644
index 140d261e2a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-20-Docker-Volume-Inspect.robot
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-20 - Docker Volume Inspect
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Volumes
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple docker volume inspect
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name test
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume inspect test
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Name
-    Should Be Equal As Strings  ${id}  test
-
-Docker volume inspect invalid object
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume inspect fakeVolume
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error: No such volume: fakeVolume
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.md
deleted file mode 100644
index ec86edc77d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.md
+++ /dev/null
@@ -1,48 +0,0 @@
-Test 1-21 - Docker Volume LS
-=======
-
-# Purpose:
-To verify that docker volume ls command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/volume_ls/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker volume create --name=testVol
-3. Issue docker volume ls
-4. Issue docker volume ls -q
-5. Issue docker volume ls -f bogusfilter=test
-6. Issue docker create --name=danglingVol
-7. Issue docker create -v testVol:/test busybox
-8. Issue docker volume ls -f dangling=true
-9. Issue docker volume ls -f dangling=false
-10. Issue docker volume ls -f name=dang
-11. Issue docker volume ls -f driver=vsphere
-12. Issue docker volume ls -f driver=vsph
-13. Issue docker volume create --name=labelVol --label=labeled
-14. Issue docker volume ls -f label=labeled
-15. Issue docker volume ls -f dangling=true -f name=dang
-16. Issue docker volume ls -f dangling=false -f name=dang
-
-# Expected Outcome:
-* Step 3 should result in each volume being listed with both driver and volume name
-* Step 4 should result in each volume being listed with only the volume name being listed
-* Step 5 should result in the following error:
-```
-Error response from daemon: Invalid filter 'bogusfilter'
-```
-* Step 8 should result in only danglingVol being listed
-* Step 9 should result in only testVol being listed
-* Step 10 should result in only danglingVol being listed
-* Step 11 should result in danglingVol and testVol being listed
-* Step 12 should result in no volumes being listed
-* Step 14 should result in only labelVol being listed
-* Step 15 should result in only danglingVol being listed
-* Step 16 should result in no volumes being listed
-
-# Possible Problems:
-* VIC requires you to specify storage on creation of the VCH that volumes can be created from, so when installing the VCH make sure to specify this parameter: --volume-store=
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.robot
deleted file mode 100644
index 2ccd726ade..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-21-Docker-Volume-LS.robot
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-21 - Docker Volume LS
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Volumes
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple volume ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=testVol
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  testVol
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vsphere
-    Should Contain  ${output}  testVol
-    Should Contain  ${output}  DRIVER
-    Should Contain  ${output}  VOLUME NAME
-    
-Volume ls quiet
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -q
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  vsphere
-    Should Contain  ${output}  testVol
-    Should Not Contain  ${output}  DRIVER
-    Should Not Contain  ${output}  VOLUME NAME
-
-Volume ls invalid filter
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f bogusfilter=test
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: Invalid filter 'bogusfilter'
-
-Volume ls filter by dangling
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=danglingVol
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v testVol:/test busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f dangling=true
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f dangling=false
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  testVol
-    Should Not Contain  ${output}  danglingVol
-
-Volume ls filter by name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f name=dang
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
-
-Volume ls filter by driver
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f driver=vsphere
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  danglingVol
-    Should Contain  ${output}  testVol
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f driver=vsph
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
-
-Volume ls filter by label
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=labelVol --label=labeled
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f label=labeled
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  labelVol
-    Should Not Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
-
-Volume ls multiple filters
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f dangling=true -f name=dang
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls -f dangling=false -f name=dang
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  danglingVol
-    Should Not Contain  ${output}  testVol
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.md
deleted file mode 100644
index a7c01e391b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.md
+++ /dev/null
@@ -1,37 +0,0 @@
-Test 1-22 - Docker Volume RM
-=======
-
-# Purpose:
-To verify that docker volume rm command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/volume_rm/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker volume create --name=test to the VIC appliance
-3. Issue docker volume create --name=test2 to the VIC appliance
-4. Issue docker volume rm test to the VIC appliance
-5. Issue docker create -v test2:/test busybox to the VIC appliance
-6. Issue docker volume rm test2 to the VIC appliance
-7. Issue docker volume rm test3 to the VIC appliance
-8. Issue docker rm <containerID from Step 5> to the VIC appliance
-9. Issue docker volume rm test2 to the VIC appliance
-
-# Expected Outcome:
-* Step 4 should result in success and the volume should not be listed anymore
-* Step 6 should result in error with the following message:  
-```
-Error response from daemon: Conflict: remove test2: volume is in use - [<containerID>]
-```
-* Step 7 should result in error with the following message:  
-```
-Error response from daemon: get test3: no such volume
-```
-* Step 9 should result in success and the volume should no longer be listed
-
-# Possible Problems:
-* VIC requires you to specify storage on creation of the VCH that volumes can be created from, so when installing the VCH make sure to specify this parameter: --volume-store=
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.robot
deleted file mode 100644
index 76e3bf07f3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-22-Docker-Volume-RM.robot
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-22 - Docker Volume RM
-Resource  ../../resources/Util.robot
-Suite Setup  Run Keywords  Conditional Install VIC Appliance To Test Server  Remove All Volumes
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Simple volume rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test2
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm test2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  test2
-
-Volume rm when in use
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v test:/test ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm test
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: volume test in use by
-
-Volume rm invalid volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm test3
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error response from daemon: Get test3: no such volume
-
-Volume rm freed up volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=test4
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal As Strings  ${output}  test4
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -v test4:/test4 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm ${containerID}
-   Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume rm test4
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  test4
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.md
deleted file mode 100644
index 1cf3a14015..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.md
+++ /dev/null
@@ -1,61 +0,0 @@
-Test 1-23 - Docker Inspect
-=======
-
-# Purpose:
-To verify that docker inspect command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/inspect/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker pull busybox to the VIC appliance
-3. Issue docker inspect busybox to the VIC appliance
-4. Issue docker inspect --type=image busybox to the VIC appliance
-5. Issue docker inspect --type=container busybox to the VIC appliance
-6. Issue docker create busybox to the VIC appliance
-7. Issue docker inspect <containerID> to the VIC appliance
-8. Issue docker inspect --type=container <containerID> to the VIC appliance
-9. Issue docker inspect <containerID> to the VIC appliance and verify the Cmd and Image fields
-10. Issue docker inspect --type=image <containerID> to the VIC appliance
-11. Issue docker network create net-one
-12. Issue docker network create net-two
-13. Issue docker create --network net-one --name two-net-test busybox
-14. Issue docker network connect net-two two-net-test
-15. Issue docker start two-net-test
-16. Issue docker inspect -f '{{range $key, $value := .NetworkSettings.Networks}}{{$key}}{{end}}' two-net-test
-17. Issue docker inspect fake to the VIC appliance
-18. Issue docker create -v /var/lib/test busybox
-19. Issue docker inspect -f {{.Config.Volumes}} <containerID>
-20. Issue docker inspect test-with-volume | jq '.[]|.["Config"]|.["Volumes"]|keys[0]' and docker volume ls
-21. Issue docker inspect busybox -f '{{.RepoDigest}}'
-22. Issue docker inspect on container with both an anonymous and named volume bound to mount points
-23. Issue docker inspect container status across container lifecycle (created, running, exited)
-
-# Expected Outcome:
-* Step 3,4,7,8 should result in success and a properly formatted JSON response
-* Step 5 should result in an error with the following message:  
-```
-Error: No such container: busybox
-```
-* Step 9 should result in success with the correct values in the Cmd and Image fields
-* Step 10 should result in an error with the following message:
-```
-Error: No such image: <containerID>
-```
-* Step 16 should result in two networks listed in the inspect data
-* Step 17 should result in an error with the following message:
-```
-Error: No such image or container: fake
-```
-* Step 19 should result in the map returned containing /var/lib/test
-* Step 20 should find matching volume ID matching in docker inspect in volume ls
-* Step 21 should result in a valid digest, previously cached
-* Step 22 should result in valid Mounts data
-* Step 23 should result in correct container status values (created, running, exited)
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.robot
deleted file mode 100644
index ee5184b1ee..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-23-Docker-Inspect.robot
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-23 - Docker Inspect
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Get container inspect status
-    [Arguments]  ${container}
-    ${rc}  ${status}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container} -f '{{.State.Status}}'
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${status}
-
-*** Test Cases ***
-Simple docker inspect of image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Id
-
-Docker inspect image specifying type
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --type=image ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Id
-
-Docker inspect image specifying incorrect type
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --type=container ${busybox}
-    Should Be Equal As Integers  ${rc}  1
-    ${out}=  Run Keyword If  '${busybox}' == 'busybox'  Should Contain  ${output}  Error: No such container: busybox
-    ${out}=  Run Keyword Unless  '${busybox}' == 'busybox'  Should Contain  ${output}  Error: No such container: harbor.ci.drone.local/library/busybox
-
-Simple docker inspect of container
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Id
-
-Docker inspect container specifying type
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --type=container ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${id}=  Get From Dictionary  ${output[0]}  Id
-
-Docker inspect container check cmd and image name
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/bash
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${container}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Evaluate  json.loads(r'''${output}''')  json
-    ${config}=  Get From Dictionary  ${output[0]}  Config
-    ${image}=  Get From Dictionary  ${config}  Image
-    Should Contain  ${image}  busybox
-    ${cmd}=  Get From Dictionary  ${config}  Cmd
-    Should Be Equal As Strings  ${cmd}  [u'/bin/bash']
-
-Docker inspect container specifying incorrect type
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect --type=image ${container}
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error: No such image: ${container}
-
-Docker inspect container with multiple networks
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create net-one
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create net-two
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name=two-net-test --net=net-one busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect net-two two-net-test
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start two-net-test
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range $key, $value := .NetworkSettings.Networks}}{{$key}}{{end}}' two-net-test
-    Should Contain  ${out}  net-two
-    Should Contain  ${out}  net-one
-    Should Be Equal As Integers  ${rc}  0
-
-Docker inspect invalid object
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect fake
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Error: No such object: fake
-
-Docker inspect non-nil volume
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name=test-with-volume -v /var/lib/test busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Config.Volumes}}' test-with-volume
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  /var/lib/test
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect test-with-volume | jq '.[]|.["Config"]|.["Volumes"]|keys[0]'
-    Should Be Equal As Integers  ${rc}  0
-    ${mount}=  Split String  ${out}  :
-	${volID}=  Get Substring  @{mount}[0]  1
-    Log To Console  Find volume ${volID} in container inspect
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  ${volID}
-
-Inspect RepoDigest is valid
-    ${rc}  Run And Return Rc  docker %{VCH-PARAMS} rmi ${busybox}
-    ${rc}  ${busybox_digest}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox} | grep Digest | awk '{print $2}'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Be Empty  ${busybox_digest}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.RepoDigests}}' ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${busybox_digest}
-
-Docker inspect mount data
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=named-volume
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name=mount-data-test -v /mnt/test -v named-volume:/mnt/named busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Mounts}}' mount-data-test
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  /mnt/test
-    Should Contain  ${out}  /mnt/named
-
-Docker inspect container status
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create ${busybox} /bin/sh -c 'a=0; while [ $a -lt 90 ]; do echo "line $a"; a=`expr $a + 1`; sleep 2; done;'
-    Should Be Equal As Integers  ${rc}  0
-    # keyword at top of file
-    ${created}=  Get container inspect status  ${container}
-    Should Contain  ${created}  created
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    # keyword at top of file
-    ${running}=  Get container inspect status  ${container}
-    Should Contain  ${running}  running
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop ${container}
-    Should Be Equal As Integers  ${rc}  0
-    # keyword at top of file
-    ${stopped}=  Get container inspect status  ${container}
-    Should Contain  ${stopped}  exited
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.md
deleted file mode 100644
index 0faea8bfed..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Test 1-24 - Docker Link
-=======
-
-# Purpose:
-To verify that docker --link/--net-alias commands are supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/run/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker network create jedi
-3. Issue docker pull busybox
-4. Issue docker run -it -d --net jedi --name first busybox
-5. Issue docker run -it --net jedi busybox ping -c3 first
-6. Issue docker run -it --net jedi --link first:1st busybox ping -c3 1st
-7. Issue docker run -it -d --net jedi --net-alias 2nd busybox
-8. Issue docker run -it --net jedi busybox ping -c3 2nd
-
-
-# Expected Outcome:
-* Every step should result in success
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.robot
deleted file mode 100644
index bfdf07c7fb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-24-Docker-Link.robot
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-24 - Docker Link
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Link and alias
-    # link support for container on bridge network only
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --name foo busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --link foo:bar busybox ping -c1 bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create jedi
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${debian}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it -d --net jedi --name first busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net jedi debian ping -c1 first
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    # cannot reach first from another network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run debian ping -c1 first
-    Should Not Be Equal As Integers  ${rc}  0
-    Should contain  ${output}  unknown host
-
-    # the link
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net jedi --link first:1st debian ping -c1 1st
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    # cannot reach first using c1 from another container
-    # first run a container that has the alias "c1" for the "first" container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd --net jedi --link first:1st busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    # check if we can use alias "c1" from another container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net jedi debian ping -c1 1st
-    Should Not Be Equal As Integers  ${rc}  0
-    Should contain  ${output}  unknown host
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it -d --net jedi --net-alias 2nd busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    # the alias
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net jedi debian ping -c1 2nd
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    # another container with same network alias
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -it -d --net jedi --net-alias 2nd busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net jedi --name lookup busybox nslookup 2nd
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs lookup
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Address 1
-    Should Contain  ${output}  Address 2
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.md
deleted file mode 100644
index 2fc6980b97..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.md
+++ /dev/null
@@ -1,119 +0,0 @@
-Test 1-25 - Docker Port Mapping
-=======
-
-# Purpose:
-To verify that docker create works with the -p option
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/create/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases
-
-## Create container with port mappings
-1. Deploy VIC appliance to vSphere server
-2. Issue `docker create -it -p 10000:80 -p 10001:80 --name webserver nginx`
-3. Issue `docker start webserver`
-4. Issue `curl vch-ip:10000 --connect-timeout 20`
-5. Issue `curl vch-ip:10001 --connect-timeout 20`
-6. Issue `docker stop webserver`
-7. Issue `curl vch-ip:10000`
-8. Issue `curl vch-ip:10001`
-
-### Expected Outcome:
-* Steps 2-6 should all return without error
-* Steps 7-8 should both return error
-
-
-## Create container with conflicting port mapping
-1. `Issue docker create -it -p 8083:80 --name webserver2 nginx`
-2. `Issue docker create -it -p 8083:80 --name webserver3 nginx`
-3. `Issue docker start webserver2`
-4. `Issue docker start webserver3`
-
-### Expected Outcome:
-* Steps 1-3 should all return without error
-* Step 4 should return error
-
-
-## Create container with port range
-1. Issue `docker create -it -p 8081-8088:80 --name webserver5 nginx`
-
-### Expected Outcome:
-* Step 1 should return error
-
-
-## Create container with host IP
-1. Issue `docker create -it -p 10.10.10.10:8088:80 --name webserver5 nginx`
-
-### Expected Outcome:
-* Step 1 should return error
-
-
-## Create container without specifying host port
-1. Issue `docker create -it -p 6379 --name test-redis redis:alpine`
-2. Issue `docker start test-redis`
-3. Issue `docker stop test-redis`
-
-### Expected Outcome:
-* Steps 1-3 should return without error
-
-
-## Run after exit remapping mapped ports
-1. Deploy VIC appliance to vSphere server
-2. Issue `docker run -i -p 1900:9999 -p 2200:2222 busybox /bin/top`
-3. Issue `q` to the container
-4. Issue `docker run -i -p 1900:9999 -p 3300:3333 busybox /bin/top`
-5. Issue `q` to the container
-
-### Expected Outcome:
-* All steps should return without error
-
-## Remap mapped ports after OOB Stop
-1. Deploy VIC appliance to vSphere server
-2. Issue `docker create -it -p 10000:80 -p 10001:80 busybox`
-3. Issue `docker start <containerID>` to the VIC appliance
-4. Power off the container with govc
-5. Issue `docker create -it -p 10000:80 -p 20000:2222 busybox`
-6. Issue `docker start <containerID>` to the VIC appliance
-
-### Expected Outcome:
-* All steps should return without error
-
-
-## Remap mapped ports after OOB Stop and Remove
-1. Issue `docker run -itd -p 5001:80 --name nginx1 nginx`
-2. Hit Nginx Endpoint at VCH-IP:5001
-3. Power off the container with govc
-4. Issue `docker rm nginx1`
-5. Issue `docker run -itd -p 5001:80 --name nginx2 nginx`
-6. Hit Nginx Endpoint at VCH-IP:5001
-
-### Expected Outcome:
-* All steps should return without error
-
-
-## Container to container traffic via VCH public interface
-1. Deploy VIC appliance to vSphere server
-2. Issue `docker create -p 8080:80 --net bridge nginx`
-3. Issue `docker start <containerID>` to the VIC appliance
-4. Issue `docker run busybox /bin/ash -c wget -O index.html <VCH IP>:8085; md5sum index.html`
-6. Verify the contents of `index.html`
-7. Issue `docker run busybox /bin/ash -c wget -O index.html <server IP>:80; md5sum index.html`
-8. Verify the contents of `index.html`
-
-### Expected Outcome:
-* All steps should return without error
-
-## Remap mapped port after stop container, and then remove stopped container
-1. Issue `docker run -itd -p 6001:80 --name remap1 nginx`
-2. Hit Nginx Endpoint at VCH-IP:6001
-3. Issue `docker stop remap1`
-4. Issue `docker run -itd -p 6001:80 --name remap2 nginx`
-5. Issue `docker rm remap1`
-6. Hit Nginx Endpoint at VCH-IP:6001
-
-### Expected Outcome:
-* All steps should return without error
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot
deleted file mode 100644
index 2eb0b1eceb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-25-Docker-Port-Map.robot
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-25 - Docker Port Map
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Create container with port mappings
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name webserver ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{EXT-IP}  10000
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{EXT-IP}  10001
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop webserver
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  curl %{EXT-IP}:10000 --connect-timeout 5
-    Should Not Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  curl %{EXT-IP}:10001 --connect-timeout 5
-    Should Not Be Equal As Integers  ${rc}  0
-
-Create container with conflicting port mapping
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 8083:80 --name webserver2 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 8083:80 --name webserver3 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver3
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  port 8083 is not available
-
-Create container with port range
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 8081-8088:80 --name webserver5 ${nginx}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  host port ranges are not supported for port bindings
-
-Create container with host ip
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10.10.10.10:8088:80 --name webserver5 ${nginx}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  host IP for port bindings is only supported for 0.0.0.0 and the public interface IP address
-
-Create container with host ip equal to 0.0.0.0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 0.0.0.0:8088:80 --name webserver5 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-Create container with host ip equal to public IP
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p %{EXT-IP}:8089:80 --name webserver6 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-
-Create container without specifying host port
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 6379 --name test-redis redis:alpine
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start test-redis
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop test-redis
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Run after exit remapping mapped ports
-    Pass Execution  Disabled until we can figure out how to do attach in Robot tests
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  mkfifo /tmp/fifo1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -id --name ctr1 -p 1900:9999 -p 2200:2222 busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} attach ctr1 < /tmp/fifo1
-    Should Be Equal As Integers  ${rc}  0
-    Sleep  5
-    ${rc}  ${output}=  Run And Return Rc And Output  echo q > /tmp/fifo1
-    ${result}=  Wait for process  sh1
-    Log  ${result.stdout}
-    Log  ${result.stderr}
-    Should Be Equal As Integers  ${result.rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Log  ${output}
-    Should Not Contain  ${output}  Running
-
-    ${rc}  ${output}=  Run And Return Rc And Output  mkfifo /tmp/fifo2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -id --name ctr2 -p 1900:9999 -p 3300:3333 busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} attach ctr2 < /tmp/fifo2
-    Should Be Equal As Integers  ${rc}  0
-    Sleep  5
-    ${rc}  ${output}=  Run And Return Rc And Output  echo q > /tmp/fifo2
-    ${result}=  Wait for process  sh2
-    Log  ${result.stdout}
-    Log  ${result.stderr}
-    Should Be Equal As Integers  ${result.rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Log  ${output}
-    Should Not Contain  ${output}  Running
-
-Remap mapped ports after OOB Stop
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name ctr3 busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ctr3
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    Power Off VM OOB  ctr3*
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 20000:22222 --name ctr4 busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ctr4
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Remap mapped ports after OOB Stop and Remove
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd -p 5001:80 --name nginx1 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  5001
-
-    Power Off VM OOB  nginx1*
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm nginx1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd -p 5001:80 --name nginx2 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  5001
-
-Container to container traffic via VCH public interface
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${containerID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net bridge -p 8085:80 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${containerID}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    Sleep  10
-
-    ${rc}  ${ip}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect bridge | jq '.[0].Containers."${containerID}".IPv4Address'
-    ${ip}=  Split String  ${ip}  /
-    ${nginx-ip}=  Set Variable  @{ip}[0]
-    ${nginx-ip}=  Strip String  ${nginx-ip}  characters="
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name anjunabeats busybox /bin/ash -c "wget -O index.html %{EXT-IP}:8085; md5sum index.html"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    # Verify hash of nginx default index.html
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs anjunabeats
-    Log  ${output}
-    Should Contain  ${output}  e3eb0a1df437f3f97a64aca5952c8ea0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name abgt250 busybox /bin/ash -c "wget -O index.html ${nginx-ip}:80; md5sum index.html"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    # Verify hash of nginx default index.html
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs abgt250
-    Log  ${output}
-    Should Contain  ${output}  e3eb0a1df437f3f97a64aca5952c8ea0
-
-Remap mapped port after stop container, and then remove stopped container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f $(docker %{VCH-PARAMS} ps -aq)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd -p 6001:80 --name remap1 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  6001
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop remap1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd -p 6001:80 --name remap2 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  6001
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm remap1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  6001
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.md
deleted file mode 100644
index d146823d8a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 1-26 - Docker Hello World
-=======
-
-# Purpose:
-To verify that VIC appliance can work with the most basic docker demonstration
-
-# References:
-[1 - Docker Hello World](https://hub.docker.com/_/hello-world/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker run hello-world to the new VIC appliance
-
-# Expected Outcome:
-* The command should successfully return the hello world message from docker
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.robot
deleted file mode 100644
index 8e01e72113..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-26-Docker-Hello-World.robot
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-26 - Docker Hello World
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Hello world
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run hello-world
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  https://docs.docker.com/engine/userguide/
-
-Hello world with -t
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t hello-world
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  https://docs.docker.com/engine/userguide/
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.md
deleted file mode 100644
index 9cc4a791a8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Test 1-27 - Docker Login
-=======
-
-# Purpose:
-To verify that VIC appliance can log into registries and pull private and public images
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/login/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker pull private image on docker.io
-3. Issue docker pull public image on docker.io
-4. Issue docker login on docker.io with invalid credentials 
-5. Issue docker login on docker.io with valid credentials
-6. Issue docker pull private image on docker.io
-7. Issue docker logout on docker.io
-
-# Expected Outcome:
-* Step 2 should result in an error without login
-* Step 4 should result in an error of invalid credentials
-* Step 3, 5-7 should each succeed
-
-# Possible Problems:
-Test will fail if docker account victest is disabled, or if connection to docker.io cannot be 
-established.
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot
deleted file mode 100644
index 3e6732e4c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-27-Docker-Login.robot
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-27 - Docker Login
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker login and pull from docker.io
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull victest/busybox
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull victest/public-hello-world
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login --username=victest --password=incorrectPassword
-    Should Contain  ${output}  incorrect username or password
-    Should Be Equal As Integers  ${rc}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login --username=victest --password=%{REGISTRY_PASSWORD}
-    Should Contain  ${output}  Login Succeeded
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull victest/busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logout
-    Should Be Equal As Integers  ${rc}  0
-	
-	
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.md
deleted file mode 100644
index 458a872bb5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 1-28 - Docker Secret
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker secrets APIs.
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/secret/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker secret ls
-3. Issue docker secret create
-4. Issue docker secret inspect
-5. Issue docker secret rm
-
-# Expected Outcome:
-* Step 2-5 should result in an error of not supported
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.robot
deleted file mode 100644
index 130f6fecc2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-28-Docker-Secret.robot
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-28 - Docker Secret
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Variables ***
-${fake-secret}  test
-
-*** Test Cases ***
-Docker secret ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} secret ls
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet support Docker Swarm
-
-Docker secret create
-    Run  echo '${fake-secret}' > secret.file
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} secret create mysecret ./secret.file
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet support Docker Swarm
-
-Docker secret inspect
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} secret inspect my_secret
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet support Docker Swarm
-
-Docker secret rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} secret rm my_secret
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet support Docker Swarm
-	
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.md
deleted file mode 100644
index e603d75d9a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 1-29 - Docker Checkpoint
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker checkpoint APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/checkpoint/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker checkpoint create
-3. Issue docker checkpoint ls
-4. Issue docker checkpoint rm
-
-# Expected Outcome:
-* Step 2-4 should result in an error of not supported
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.robot
deleted file mode 100644
index 2f03c2f9b7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-29-Docker-Checkpoint.robot
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-29 - Docker Checkpoint
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker checkpoint create
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} create --name=test-busybox ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} checkpoint create test-busybox new-checkpoint
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet implement checkpointing
-
-Docker checkpoint ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} checkpoint ls test-busybox
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  vSphere Integrated Containers does not yet implement checkpointing
-
-Docker checkpoint rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} checkpoint rm test-busybox new-checkpoint
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such container
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.md
deleted file mode 100644
index 5f9fb81619..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 1-30 - Docker Deploy
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker deploy APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/deploy/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker deploy
-
-# Expected Outcome:
-* Step 2 should result in an error of not supported
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.robot
deleted file mode 100644
index a8b728b21e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-30-Docker-Deploy.robot
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-30 - Docker Deploy
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker deploy
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} deploy %{GOPATH}/src/github.com/vmware/vic/demos/compose/voting-app/votingapp.dab
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  only supported with experimental daemon
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.md
deleted file mode 100644
index f149d5a74f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Test 1-31 - Docker Node
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker node APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/node/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker node demote
-3. Issue docker node ls
-4. Issue docker node promote
-5. Issue docker node rm
-6. Issue docker node update
-7. Issue docker node ps
-8. Issue docker node inspect
-
-# Expected Outcome:
-* Step 2-6 should result in an error that contains does not yet support Docker Swarm
-* Step 7-8 should result in an error that contains No such node
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.robot
deleted file mode 100644
index b64d1fe59e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-31-Docker-Node.robot
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-31 - Docker Node
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker node demote
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node demote self
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such node: self
-
-Docker node ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node ls
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker node promote
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node promote self
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such node: self
-
-Docker node rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node rm self
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker node update
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node update self
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such node: self
-
-Docker node ps
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node ps
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such node
-
-Docker node inspect
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} node inspect self
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such node
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.md
deleted file mode 100644
index 19e89e71c6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Test 1-32 - Docker Plugin
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker plugin APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/plugin_create/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker plugin install
-3. Issue docker plugin create
-4. Issue docker plugin enable
-5. Issue docker plugin disable
-6. Issue docker plugin inspect
-7. Issue docker plugin ls
-8. Issue docker plugin push
-9. Issue docker plugin rm
-10. Issue docker plugin set
-
-# Expected Outcome:
-* Step 2-10 should result in an error that contains does not yet support plugins
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.robot
deleted file mode 100644
index 3f70d9af8d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-32-Docker-Plugin.robot
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-32 - Docker plugin
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker plugin install
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin install vieux/sshfs
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin create
-    Run  echo '{}' > config.json
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin create test-plugin .
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin enable
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin enable test-plugin
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin disable
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin disable test-plugin
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin inspect
-    ${status}=  Get State Of Github Issue  4464
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-32-Docker-Plugin.robot needs to be updated now that Issue #4464 has been resolved
-
-Docker plugin ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin ls
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin push
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin push test-plugin
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin rm test-plugin
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
-
-Docker plugin set
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} plugin set test-plugin test-data
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support plugins
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.md
deleted file mode 100644
index a4106dc25c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Test 1-33 - Docker Service
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker service APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/service/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker service create
-3. Issue docker service inspect
-4. Issue docker service ls
-5. Issue docker service ps
-6. Issue docker service rm
-7. Issue docker service scale
-8. Issue docker service update
-9. Issue docker service logs
-
-# Expected Outcome:
-* Step 2-8 should result in an error that contains does not yet support Docker Swarm
-* Step 9 should result in an error that contains only supported with experimental daemon
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.robot
deleted file mode 100644
index 10a9fc467c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-33-Docker-Service.robot
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-33 - Docker Service
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker service create 
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service create test-service
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker service ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service ls
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker service ps
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service ps test-service
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such service: test-service
-
-Docker serivce rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service rm test-service
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker service scale
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service scale test-service=3
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such service: test-service
-
-Docker service update
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service update test-service
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such service: test-service
-
-Docker service logs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} service logs test
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  only supported with experimental daemon
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.md
deleted file mode 100644
index 63d983683f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 1-34 - Docker Node
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker stack APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/stack/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker stack deploy
-3. Issue docker stack ls
-4. Issue docker stack ps
-5. Issue docker stack rm
-6. Issue docker stack services
-
-# Expected Outcome:
-* Step 2-6 should result in an error that contains does not yet support Docker Swarm
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.robot
deleted file mode 100644
index 72bdf9a698..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-34-Docker-Stack.robot
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-34 - Docker Stack
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-#Docker stack deploy
-    #${rc}  ${output}=  Run And Return Rc And Output  wget #https://raw.githubusercontent.com/vfarcic/docker-flow-proxy/master/docker-compose-stack.yml
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stack deploy -c #./docker-compose-stack.yml proxy
-    #Should Be Equal As Integers  ${rc}  1
-    #Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker stack ls
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stack ls
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker stack ps
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stack ps test-stack
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker stack rm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stack rm test-stack
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker stack services
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} stack services test-stack
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.md
deleted file mode 100644
index 85f6ca8bf3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Test 1-35 - Docker Swarm
-=======
-
-# Purpose:
-To verify that VIC appliance responds appropriately to docker swarm APIs
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/node/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker swarm init
-3. Issue docker swarm join
-4. Issue docker swarm join-token
-5. Issue docker swarm leave
-6. Issue docker swarm unlock
-7. Issue docker swarm unlock-key
-8. Issue docker swarm update
-
-# Expected Outcome:
-* Step 2-8 should result in an error that contains does not yet support Docker Swarm
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.robot
deleted file mode 100644
index aa4f20c8de..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-35-Docker-Swarm.robot
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-35 - Docker Swarm
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Docker swarm init
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm init
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker swarm join
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm join 127.0.0.1:2375
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker swarm join-token
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm join-token worker
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm join-token manager
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker swarm leave
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm leave
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker swarm unlock-key
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm unlock-key
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
-Docker swarm update
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.13 %{VCH-PARAMS} swarm update --autolock
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  does not yet support Docker Swarm
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.md
deleted file mode 100644
index 7a567b324b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.md
+++ /dev/null
@@ -1,79 +0,0 @@
-Test 1-36 - Docker Rename
-=======
-
-# Purpose:
-To verify that the docker rename command is supported by VIC appliance.
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/rename)
-
-# Environment:
-This test requires that a vSphere server is running and available.
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker rename foo bar
-3. Issue docker pull busybox
-4. Issue docker create --name cont1-name1 busybox
-5. Issue docker rename cont1-name1 cont1-name2
-6. Verify that the container was renamed by checking ps, inspect and govc vm.info
-7. Issue docker run -dit --name cont2-name1 busybox
-8. Issue docker rename cont2-name1 cont2-name2
-9. Verify that the container was renamed by checking ps, inspect and govc vm.info
-10. Issue docker run -dit --name cont3-name1 busybox
-11. Issue docker stop cont3-name1
-12. Issue docker rename cont3-name1 cont3-name2
-13. Issue docker start cont3-name2
-14. Verify that the container was renamed by checking ps, inspect and govc vm.info
-15. Issue docker create --name cont4 busybox
-16. Issue docker rename cont4 ""
-17. Issue docker create --name cont5 busybox
-18. Issue docker create --name cont6 busybox
-19. Issue docker rename cont5 cont5
-20. Issue docker rename cont5 cont6
-21. Issue docker create --name cont7-name1 busybox
-22. Issue docker rename cont7-name1 cont7-name2
-23. Issue docker start cont7-name1
-24. Issue docker run --link cont7-name2:cont7alias busybox ping -c2 cont7alias
-25. Issue docker run busybox ping -c2 cont7-name2
-26. Issue docker run -dit --name cont8-name1 busybox
-27. Issue docker rename cont8-name1 cont8-name2
-28. Issue docker stop cont8-name2
-29. Issue docker start cont7-name2
-30. Issue docker run --link cont8-name2:cont8alias busybox ping -c2 cont8alias
-31. Issue docker run busybox ping -c2 cont8-name2
-32. Issue docker run -dit --name cont9-name1 busybox
-33. Issue docker rename cont9-name1 cont9-name2
-34. Issue docker run --link cont9-name2:cont9alias busybox ping -c2 cont9alias
-35. Issue docker run busybox ping -c2 cont9-name2
-
-# Expected Outcome:
-* Step 2 should result in an error with the following message:
-```
-Error: No such container: foo
-```
-* Steps 3-15 should return without errors
-* Step 16 should result in an error containing the following message:
-```
-Neither old nor new names may be empty
-```
-* Steps 17 and 18 should return without errors
-* Step 19 and 20 should return with errors
-* Steps 21-23 should return without errors
-* Steps 24 and 25 should succeed and their output should contain:
-```
-2 packets transmitted, 2 packets received 
-```
-* Steps 25-29 should return without errors
-* Steps 30 and 31 should succeed and their output should contain:
-```
-2 packets transmitted, 2 packets received 
-```
-* Steps 32 and 33 should return without errors
-* Steps 34 and 35 should succeed and their output should contain:
-```
-2 packets transmitted, 2 packets received 
-```
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.robot
deleted file mode 100644
index f736040683..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-36-Docker-Rename.robot
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-36 - Docker Rename
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Rename a non-existent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename foo bar
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  No such container: foo
-
-Rename a created container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${contID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cont1-name1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${contID}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont1-name1 cont1-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify Container Rename  cont1-name1  cont1-name2  ${contID}
-
-Rename a running container
-    ${rc}  ${contID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --name cont2-name1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${contID}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont2-name1 cont2-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify Container Rename  cont2-name1  cont2-name2  ${contID}
-
-Rename a stopped container
-    ${rc}  ${contID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --name cont3-name1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${contID}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop cont3-name1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont3-name1 cont3-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start cont3-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify Container Rename  cont3-name1  cont3-name2  ${contID}
-
-Rename a container with an empty name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cont4 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont4 ""
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Neither old nor new names may be empty
-
-Rename a container with a claimed name
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cont5 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cont6 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont5 cont5
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont5 cont6
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-
-Name resolution for a created container after renaming+starting it
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name cont7-name1 ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont7-name1 cont7-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start cont7-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --link cont7-name2:cont7alias ${busybox} ping -c2 cont7alias
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} ping -c2 cont7-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Name resolution for a running container after renaming+restarting it
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --name cont8-name1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont8-name1 cont8-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop cont8-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start cont8-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --link cont8-name2:cont8alias ${busybox} ping -c2 cont8alias
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} ping -c2 cont8-name2
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  2 packets transmitted, 2 packets received
-
-Name resolution for a running container after renaming it
-    ${status}=  Get State Of Github Issue  4375
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-35-Docker-Rename needs to be updated now that #4375 is closed
-
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --name cont9-name1 busybox
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Not Contain  ${output}  Error
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename cont9-name1 cont9-name2
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Not Contain  ${output}  Error
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --link cont9-name2:cont9alias busybox ping -c2 cont9alias
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Contain  ${output}  2 packets transmitted, 2 packets received
-    # ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run busybox ping -c2 cont9-name2
-    # Should Be Equal As Integers  ${rc}  0
-    # Should Contain  ${output}  2 packets transmitted, 2 packets received
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.md
deleted file mode 100644
index a4b49e3386..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Test 1-37 - Docker USER
-=======
-
-# Purpose:
-To ensure that `docker run -u` and `USER` inside of a Dockerfile are respected on VIC.
-
-# References:
-[1 - Dockerfile Reference -- USER directive]( https://docs.docker.com/engine/reference/builder/#user )
-[2 - Docker command line reference (run options; look for --user)](https://docs.docker.com/engine/reference/commandline/run/#options)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-It also expects 3 Docker images exist, built from the Dockerfiles in vic/tests/resources/dockerfiles and published to a Docker image repository reachable by the machine running tests.
-
-# Test Steps:
-1. Run a container that was built with a `USER` directive using a user created with `RUN adduser`
-2. Run a container that specifies the user should have UID 2000 and doesn't specify GID
-3. Run a container that does not specify a user and set it manually with `docker run -u`
-4. Run a container that specifies UID 2000 and GID 2000
-5. Run a container that does not specify a user or group but set them manually with `docker run -u`
-6. Try to run a container with `-u` specifying a nonexistent user
-7. Try to run a container with `-u` specifying a nonexistent group
-8. Run a container specifying `-u 0:0`
-
-# Expected Outcome:
-1-5 should run successfully with the options specified taking effect inside the container and reflected via `id` or `whoami` output
-6 & 7 will fail with exit code 125 and an error message
-8 will run successfully and `whoami` will report the user `root`
-
-
-
-# Possible Problems:
-Docker image repository downtime or unreachability will cause failure on the tests that pull images from Docker Hub
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.robot
deleted file mode 100644
index 4bfcf1d376..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-37-Docker-USER.robot
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation   Test 1-37 - Docker Run As USER
-Resource        ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Run Image Specifying NewUser in NewGroup
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run gigawhitlocks/1-37-docker-user-newuser-newgroup:latest
-    Should Be Equal As Integers    ${rc}       0
-    Should Match Regexp            ${output}   uid=\\d+\\\(newuser\\\)\\s+gid=\\d+\\\(newuser\\\)\\s+groups=\\d+\\\(newuser\\\)
-
-Run Image Specifying UID 2000
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run gigawhitlocks/1-37-docker-user-uid-2000:latest
-    Should Be Equal As Integers    ${rc}       0
-    Should Contain                 ${output}   uid=2000 gid=0(root)
-
-Run Specifying UID 2000 With -u
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run -u 2000 busybox id
-    Should Be Equal As Integers    ${rc}       0
-    Should Contain                 ${output}   uid=2000 gid=0(root)
-
-Run Image Specifying UID:GID 2000:2000
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run gigawhitlocks/1-37-docker-user-uid-gid-2000-2000:latest
-    Should Be Equal As Integers    ${rc}       0
-    Should Contain                 ${output}   uid=2000 gid=2000
-
-Run Specifying UID:GID 2000:2000 With -u
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run -u 2000:2000 busybox id
-    Should Be Equal As Integers    ${rc}       0
-    Should Contain                 ${output}   uid=2000 gid=2000
-
-Run as Nonexistent User With -u
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run -u nonexistent busybox whoami
-    Should Be Equal As Integers    ${rc}       125
-    Should Contain                 ${output}   Unable to find user nonexistent
-
-Run as Root with Nonexistent User With -u
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run -u root:nonexistent busybox whoami
-    Should Be Equal As Integers    ${rc}       125
-    Should Contain                 ${output}   Unable to find group nonexistent
-
-Run as uid 0 group 0 With -u
-    ${rc}    ${output}=    Run And Return Rc And Output    docker %{VCH-PARAMS} run -u 0:0 busybox whoami
-    Should Be Equal As Integers    ${rc}       0
-    Should Contain                 ${output}   root
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.md
deleted file mode 100644
index bc843b3a2c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.md
+++ /dev/null
@@ -1,27 +0,0 @@
-Test 1-38 - Docker Exec
-=======
-
-# Purpose:
-To verify that docker exec command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/exec/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker run -d busybox /bin/top
-3. Issue docker exec <containerID> /bin/echo ID - 5 times with incrementing ID
-4. Issue docker exec -i <containerID> /bin/echo ID - 5 times with incrementing ID
-5. Issue docker exec -t <containerID> /bin/echo ID - 5 times with incrementing ID
-6. Issue docker exec -it <containerID> /bin/echo ID - 5 times with incrementing ID
-7. Issue docker exec -it <containerID> NON_EXISTING_COMMAND
-
-# Expected Outcome:
-* Step 2-6 should echo the ID given
-* Step 7 should return an error
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.robot
deleted file mode 100644
index 868ea64ade..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-38-Docker-Exec.robot
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-38 - Docker Exec
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Exec -d
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -d ${id} /bin/touch tmp/force
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${id} /bin/ls -al /tmp/force
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  force
-
-Exec Echo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${id} /bin/echo "Help me, Obi-Wan Kenobi. You're my only hope."
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Be Equal As Strings  ${output}  Help me, Obi-Wan Kenobi. You're my only hope.
-
-Exec Echo -i
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -i ${id} /bin/echo "Your eyes can deceive you. Don't trust them."
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Be Equal As Strings  ${output}  Your eyes can deceive you. Don't trust them.
-
-Exec Echo -t
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top -d 600
-    Should Be Equal As Integers  ${rc}  0
-    :FOR  ${idx}  IN RANGE  0  5
-    \   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -t ${id} /bin/echo "Do. Or do not. There is no try."
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Should Be Equal As Strings  ${output}  Do. Or do not. There is no try.
-
-Exec Sort
-    ${status}=  Get State Of Github Issue  5479
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-38-Docker-Exec.robot needs to be updated now that Issue #5479 has been resolved
-    #${rc}  ${tmp}=  Run And Return Rc And Output  mktemp -d -p /tmp
-    #Should Be Equal As Integers  ${rc}  0
-    #${fifo}=  Catenate  SEPARATOR=/  ${tmp}  fifo
-    #${rc}  ${output}=  Run And Return Rc And Output  mkfifo ${fifo}
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    #Should Be Equal As Integers  ${rc}  0
-    #Should Not Contain  ${output}  Error
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    #Should Be Equal As Integers  ${rc}  0
-    #:FOR  ${idx}  IN RANGE  0  5
-    #\     Start Process  docker %{VCH-PARAMS} exec ${output} /bin/sort < ${fifo}  shell=True  alias=custom
-    #\     Run  echo one > ${fifo}
-    #\     ${ret}=  Wait For Process  custom
-    #\     Log  ${ret.stderr}
-    #\     Should Be Empty  ${ret.stdout}
-    #\     Should Be Equal As Integers  ${ret.rc}  0
-    #\     Should Be Empty  ${ret.stderr}
-    #Run  rm -rf ${tmp}
-
-Exec Sort -i
-    ${status}=  Get State Of Github Issue  5479
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-38-Docker-Exec.robot needs to be updated now that Issue #5479 has been resolved
-    #${rc}  ${tmp}=  Run And Return Rc And Output  mktemp -d -p /tmp
-    #Should Be Equal As Integers  ${rc}  0
-    #${fifo}=  Catenate  SEPARATOR=/  ${tmp}  fifo
-    #${rc}  ${output}=  Run And Return Rc And Output  mkfifo ${fifo}
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    #Should Be Equal As Integers  ${rc}  0
-    #Should Not Contain  ${output}  Error
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    #Should Be Equal As Integers  ${rc}  0
-    #:FOR  ${idx}  IN RANGE  0  5
-    #\     Start Process  docker %{VCH-PARAMS} exec -i ${output} /bin/sort < ${fifo}  shell=True  alias=custom
-    #\     Run  echo one > ${fifo}
-    #\     ${ret}=  Wait For Process  custom
-    #\     Log  ${ret.stderr}
-    #\     Should Be Equal  ${ret.stdout}  one
-    #\     Should Be Equal As Integers  ${ret.rc}  0
-    #\     Should Be Empty  ${ret.stderr}
-    #Run  rm -rf ${tmp}
-
-Exec NonExisting
-    ${status}=  Get State Of Github Issue  5479
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-38-Docker-Exec.robot needs to be updated now that Issue #5479 has been resolved
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    #Should Be Equal As Integers  ${rc}  0
-    #Should Not Contain  ${output}  Error
-    #${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top -d 600
-    #Should Be Equal As Integers  ${rc}  0
-    #:FOR  ${idx}  IN RANGE  0  5
-    #\   ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec ${id} /NonExisting
-    #\   Should Be Equal As Integers  ${rc}  0
-    #\   Should Contain  ${output}  no such file or directory
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.md
deleted file mode 100644
index 94d0051843..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Test 1-39 - Docker Stats
-=======
-
-# Purpose:
-To verify that `docker stats` is supported and works as expected.
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-# Test Steps:
-1. Run a busybox container and create a busybox container
-2. Run Stats no-stream for running container
-3. Run Stats with no-stream all which will return stats for running and stopped containers
-4. Verify the API memory output against govc
-5. Verify the API CPU output
-6. Run Stats with no-stream for a non-existent container
-7. Run Stats with no-stream for a stopped container
-8. Verify basic API network and disk output
-
-
-# Expected Outcome:
-1. Fails if two containers are not created
-2. Return stats for a running container and validate memory -- will fail if there is a variation
-   of greater than 5%
-3. Return stats for all containers -- will fail if output is missing either container
-4. Compare API results vs. govc result for memory accuracy -- will fail if variation greater than 1000 bytes
-5. Verify that CPU fields are present - fails if missing
-6. Failure with error message
-7. Output should include the stopped container short id
-8. Fails if either the default network or disk are missing
-
-
-# Possible Problems:
-Stats are created by the ESXi host every 20s -- if there are long pauses between calls
-in a single test the results could be incorrect and a failure could occur.
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.robot
deleted file mode 100644
index 6fa074e3c6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-39-Docker-Stats.robot
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation   Test 1-39 - Docker Stats
-Resource        ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Get Average Active Memory
-    [Arguments]  ${vm}  ${samples}=6
-
-    ${rc}  ${memValues}=  Run And Return Rc And Output  govc metric.sample -n ${samples} -json ${vm} mem.active.average | jq -r .Sample[].Value[].Value[]
-    Should Be Equal As Integers  ${rc}  0
-    @{memList}=  Split To Lines  ${memValues}
-    :FOR  ${mem}  IN  @{memList}
-    \    ${num}=  Convert To Integer  ${mem}
-    \    ${vmomiMemory}=  Set Variable If  ${num} > 0  ${num}  0
-
-    [Return]  ${vmomiMemory}
-
-Create test containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name stresser ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  STRESSED  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name stopper ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  STOPPER  ${output}
-    ${stress}=  Get Container ShortID  %{STRESSED}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Environment Variable  VM-PATH  vm/*${stress}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Environment Variable  VM-PATH  */%{VCH-NAME}/*${stress}
-
-Check Memory Usage
-    ${vmomiMemory}=  Get Average Active Memory  %{VM-PATH}
-    Should Be True  ${vmomiMemory} > 0
-    [Return]  ${vmomiMemory}
-
-Get Memory From Stats
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stats --no-stream %{STRESSED}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Get Line  ${output}  -1
-    ${short}=  Get Container ShortID  %{STRESSED}
-    Should Contain  ${output}  ${short}
-    ${vals}=  Split String  ${output}
-    ${vicMemory}=  Get From List  ${vals}  7
-    # only care about the integer value of memory usage
-    ${vicMemory}=  Fetch From Left  ${vicMemory}  .
-    [Return]  ${vicMemory}
-
-Check Memory From Stats
-    ${vicMemory}=  Get Memory From Stats
-    Should Be True  ${vicMemory} > 0
-    [Return]  ${vicMemory}
-
-*** Test Cases ***
-Stats No Stream
-    Create test containers
-    ${vicMemory}=  Wait Until Keyword Succeeds  5x  20s  Check Memory From Stats
-
-    # get the latest memory value for the "stresser" vm
-    ${vmomiMemory}=  Wait Until Keyword Succeeds  5x  20s  Check Memory Usage
-    # convert to percent and move decimal
-    ${percent}=  Evaluate  ${vmomiMemory}/20480
-    ${diff}=  Evaluate  abs(${percent}-${vicMemory})
-    # due to timing we could see some variation, but shouldn't exceed 5%
-    Should Be True  ${diff} < 5
-
-Stats No Stream All Containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stats --no-stream -a
-    Should Be Equal As Integers  ${rc}  0
-    ${stress}=  Get Container ShortID  %{STRESSED}
-    ${stop}=  Get Container ShortID  %{STOPPER}
-    Should Contain  ${output}  ${stress}
-    Should Contain  ${output}  ${stop}
-
-Stats API Memory Validation
-    ${rc}  ${apiMem}=  Run And Return Rc And Output  curl -sk --cert %{DOCKER_CERT_PATH}/cert.pem --key %{DOCKER_CERT_PATH}/key.pem -H "Accept: application/json" -H "Content-Type: application/json" -X GET https://%{VCH-IP}:%{VCH-PORT}/containers/%{STRESSED}/stats?stream=false | jq -r .memory_stats.usage
-    Should Be Equal As Integers  ${rc}  0
-    ${stress}=  Get Container ShortID  %{STRESSED}
-    ${vmomiMemory}=  Get Average Active Memory  %{VM-PATH}
-    Should Be Equal As Integers  ${rc}  0
-    ${vmomiMemory}=  Evaluate  ${vmomiMemory}*1024
-    ${diff}=  Evaluate  ${apiMem}-${vmomiMemory}
-    ${diff}=  Set Variable  abs(${diff})
-    Should Be True  ${diff} < 1000
-
-Stats API CPU Validation
-    ${rc}  ${apiCPU}=  Run And Return Rc And Output  curl -sk --cert %{DOCKER_CERT_PATH}/cert.pem --key %{DOCKER_CERT_PATH}/key.pem -H "Accept: application/json" -H "Content-Type: application/json" -X GET https://%{VCH-IP}:%{VCH-PORT}/containers/%{STRESSED}/stats?stream=false
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${apiCPU}  cpu_stats
-    Should Contain  ${apiCPU}  cpu_usage
-    Should Contain  ${apiCPU}  total_usage
-
-Stats No Stream Non-Existent Container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stats --no-stream fake
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  No such container: fake
-
-Stats No Stream Specific Stopped Container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stats --no-stream %{STOPPER}
-    Should Be Equal As Integers  ${rc}  0
-    ${stop}=  Get Container ShortID  %{STOPPER}
-    Should Contain  ${output}  ${stop}
-
-Stats API Disk and Network Validation
-    ${rc}  ${api}=  Run And Return Rc And Output  curl -sk --cert %{DOCKER_CERT_PATH}/cert.pem --key %{DOCKER_CERT_PATH}/key.pem -H "Accept: application/json" -H "Content-Type: application/json" -X GET https://%{VCH-IP}:%{VCH-PORT}/containers/%{STRESSED}/stats?stream=false
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${api}  ethernet
-    Should Contain  ${api}  Read
-    Should Contain  ${api}  Write
-    Should Contain  ${api}  op
-    Should Contain  ${api}  major
-    Should Contain  ${api}  minor
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.md
deleted file mode 100644
index 86023cbcbc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 1-40 - Docker Restart
-=======
-
-# Purpose:
-To verify that `docker restart` is supported and works as expected.
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-# Test Steps:
-1. Run a busybox container and create a busybox container
-2. Run restart for running container
-3. Run restart for created container
-4. Run restart for stopped container
-
-
-# Expected Outcome:
-1. Fails if two containers are not created
-2. Successfully stop and restart container - failure on op failure or ip address change
-3. Successfully start created container - failure if container doesn't start
-4. Successfully stop running container and then restart stopped container - failure on op failure or ip address change
-
-# Possible Problems:
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.robot
deleted file mode 100644
index 44c9a6629c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-40-Docker-Restart.robot
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation   Test 1-40 - Docker Restart
-Resource        ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-
-Create test containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  RUNNER  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Set Environment Variable  CREATOR  ${output}
-
-*** Test Cases ***
-Restart Running Container
-    Create test containers
-    # grab the containerVM ip address - will compare after restart to ensure it remains the same
-    ${rc}  ${originalIP}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${originalIP}  172
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} restart %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  %{RUNNER}
-    # verify that IP address didn't chnage during restart
-    ${rc}  ${restartIP}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${originalIP}  ${restartIP}
-    # verify that the containerVM started
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=%{RUNNER} -f status=running
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-Restart Created Container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} restart %{CREATOR}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  %{CREATOR}
-    # verify that the containerVM started
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=%{CREATOR} -f status=running
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-
-Restart Stopped Container
-    # grab the containerVM ip address - will compare after restart to ensure it remains the same
-    ${rc}  ${originalIP}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${originalIP}  172
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    # verify that the containerVM exited
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=%{RUNNER} -f status=exited
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} restart %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  %{RUNNER}
-    # verify that the containerVM started
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=%{RUNNER} -f status=running
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  2
-    # verify that IP address didn't chnage during restart
-    ${rc}  ${restartIP}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' %{RUNNER}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${originalIP}  ${restartIP}
-
-Restart with start-stop stress
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit ${busybox}
-    ${restart-pid}=  Start Process  while true; do docker %{VCH-PARAMS} restart ${container}; done  shell=${true}
-    ${restart-pid2}=  Start Process  while true; do docker %{VCH-PARAMS} restart ${container}; done  shell=${true}
-    ${loopOutput}=  Create List
-    :FOR  ${idx}  IN RANGE  0  150
-    \   ${out}=  Run  (docker %{VCH-PARAMS} start ${container} && docker %{VCH-PARAMS} stop -t1 ${container})
-    \   Append To List  ${loopOutput}  ${out}
-    Terminate Process  ${restart-pid}
-    Terminate Process  ${restart-pid2}
-    Log  ${loopOutput}
-    Should Not Contain Match  ${loopOutput}  *EOF*
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.md
deleted file mode 100644
index 59d293e3c2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Test 1-41 - Docker Commit
-=======
-
-# Purpose:
-To verify that `docker commit` is supported and works as expected.
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/commit/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create a new debian container
-2. Install nano into the container
-3. Stop the container and commit the changes to the image
-4. Start a new container based on the new image, checking that nano is installed already
-5. Start another container then stop the container and commit an environment variable to the image using `docker commit -c ENV TEST 'test string'`
-6. Start a new container based on the new image, checking that the environment variable is set
-7. Attempt to commit an unsupported command into the image like `RUN`
-8. Stop the container and commit another environment variable into the image with the author set and commit message set
-9. Attempt to commit to a container that doesn't exist
-
-# Expected Outcome:
-* Steps 1-3 should succeed
-* Step 4 nano should now be found in the image
-* Step 5-6 TEST should now be an environment variable in the container
-* Step 7 should return an error:
-`Error response from daemon: run is not a valid change command`
-* Step 8 should be able to be verified that the author and message are set when you inspect the image afterwards
-* Step 9 should return error and indicate the container does not exist
-
-# Possible Problems:
-* This test relies on our implementation of docker exec in order to work, if there is a problem in exec then these test results will likely not be valid
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot
deleted file mode 100644
index 5e1ba40853..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-41-Docker-Commit.robot
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-41 - Docker Commit
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Commit nano to image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name commit1 ${debian} tail -f /dev/null
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec commit1 apt-get update
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec commit1 apt-get install nano
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop -t1 commit1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} commit commit1 debian-nano
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run debian-nano whereis nano
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  /usr/bin/nano
-
-Commit env variable to image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name commit2 ${debian} tail -f /dev/null
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop -t1 commit2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} commit -c "ENV TEST commitEnvTest" commit2 debian-env
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run debian-env env
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  TEST\=commitEnvTest
-
-Unsupported commit command
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name commit3 ${debian} tail -f /dev/null
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop -t1 commit3
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} commit -c "RUN apt-get install nginx" commit3 debian-env
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error response from daemon: run is not a valid change command
-
-Commit with author and message
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name commit4 ${debian} tail -f /dev/null
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop -t1 commit4
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} commit -a Robot -m "Robot made a commit" -c "ENV TEST commitEnvTest" commit4 debian-auth
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect debian-auth
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  "Author": "Robot"
-    Should Contain  ${output}  "Comment": "Robot made a commit"
-
-Commit to nonexistent container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} commit -c "ENV TEST commitEnvTest" fakeContainer image-fake
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error response from daemon: No such container: fakeContainer
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.md
deleted file mode 100644
index f8fbc1bb00..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 1-42 - Docker Diff
-=======
-
-# Purpose:
-To verify that docker diff command is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/diff/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server
-2. Issue docker create busybox /bin/sh -c "touch a b c; rm -rf /tmp; adduser -D krusty"
-3. Issue docker start <containerID> to the VIC appliance
-4. Issue docker diff <containerID> to the VIC appliance
-5. Verify a, b, c were created, /tmp was deleted and /etc/hosts was modified
-
-# Expected Outcome:
-* Step 2 should complete without error, and the response should be the containerID
-* Step 3 should run to completion without output
-* Step 4 should produce the expected output reflecting the container filesystem changes
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.robot
deleted file mode 100644
index ffa0421a7a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-42-Docker-Diff.robot
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-42 - Docker Diff
-Resource  ../../resources/Util.robot
-Suite Setup  Conditional Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Make changes to busybox image
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create busybox /bin/sh -c "touch a b c; rm -rf /tmp; adduser -D krusty"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${id}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} diff ${id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  A /a
-    Should Contain  ${output}  A /b
-    Should Contain  ${output}  A /c
-    Should Contain  ${output}  D /tmp
-    Should Contain  ${output}  C /etc/passwd
-    Should Contain  ${output}  C /etc
-    Should Contain  ${output}  C /etc/group
-    Should Contain  ${output}  A /etc/group-
-    Should Contain  ${output}  C /etc/passwd
-    Should Contain  ${output}  A /etc/passwd-
-    Should Contain  ${output}  C /etc/shadow
-    Should Contain  ${output}  A /etc/shadow-
-    Should Contain  ${output}  C /home
-    Should Contain  ${output}  A /home/krusty
-    Should Not Contain  ${output}  hostname
-    Should Not Contain  ${output}  hosts
-    Should Not Contain  ${output}  resolv.conf
-    Should Not Contain  ${output}  .tether
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.md
deleted file mode 100644
index 4a1b16be3d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.md
+++ /dev/null
@@ -1,77 +0,0 @@
-Test 1-43 - Docker CP Offline
-=======
-
-# Purpose:
-To verify that docker cp command for offline containers is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/cp/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server and set up test files, directories and volumes
-2. Pull busybox image and create a container named offline
-3. Issue docker cp foo.txt offline:/ to the new VIC appliance
-4. Start offline and verify that foo.txt exists in the offline:/
-5. Clean up offline:/foo.txt
-6. Create a directory named testdir in offline:/ and create a fakefile in offline:/testdir
-7. Stop offline and issue docker cp offline:/testdir . to the new VIC appliance
-8. Verify that testdir and its content is successfully copied to the host
-9. Issue docker cp bar offline:/bar to the new VIC appliance
-10. Start offline and verify that bar exists in offline:/
-11. Stop offline
-12. Issue docker cp offline:/dne/dne . to the new VIC appliance
-13. Issue docker cp offline:/dne/. . to the new VIC appliance
-14. Issue docker cp dne/ offline:/ to the new VIC appliance
-15. Remove offline container
-16. Create a container with a small volume attached to it
-17. Issue docker cp largefile.txt ${cid}:/small to the new VIC appliance
-18. Remove offline container
-19. Create a container with a single volume attached to it
-20. Issue docker cp foo.txt ${cid}:/vol1 to the new VIC appliance
-21. Start ${cid} and verify that the copy operation succeeded
-22. Remove ${cid} container
-23. Create a container with two volumes attached to it, vol2 nested in vol1
-24. Issue docker cp foo.txt ${cid}:/vol1/vol2 to the new VIC appliance
-25. Start ${cid} and verify that the copy operation succeeded
-26. Remove ${cid} container
-27. Create a container with three volumes attached to it, vol2 nested in vol1, vol3 nested in vol2
-28. Issue docker cp foo.txt ${cid}:/vol1/vol2/vol3 to the new VIC appliance
-29. Start ${cid} and verify that the copy operation succeeded
-30. Remove ${cid} container
-31. Create a container named concurrent with a single volume attached to it
-32. Start 10 background processes that issues docker cp foo.txt concurrent:/foo-${idx} to the new VIC appliance
-33. Wait for these processes to finish
-34. Start and inspect concurrent:/ to verify that copy operation succeeded
-35. Stop concurrent
-36. Start 10 background processes that issues docker cp largefile.txt concurrent:/vol1/lg-${idx} to the new VIC appliance
-37. Wait for these processes to finish
-38. Start and inspect concurrent:/vol1 to verify that copy operation succeeded
-39. Stop concurrent
-40. Start 10 background processes that issues docker cp concurrent:/vol1/lg-${idx} . to the new VIC appliance
-41. Wait for these processes to finish
-42. Verify that the copy operation succeeded and clean up all the files copied to the host
-43. Remove concurrent
-44. Create a container called subVol with 2 volumes attached to it
-45. Issue docker cp ./mnt subVol:/ to the new VIC appliance
-46. Start subVol and inspect its /mnt, /mnt/vol1 and /mnt/vol2 to verify that copy operation succeeded
-47. Stop subVol
-48. Issue docker cp subVol:/mnt ./result to the new VIC appliance
-49. Verify that the files from each sub volumes are copied to host properly
-50. Remove subvol
-51. Clean up created files and directories
-
-# Expected Outcome:
-* Step 1-11 should all succeed
-* Step 12-14 should all fail with no such directory error
-* Step 15-16 should all succeed
-* Step 17 should fail
-* Step 18-30 should all succeed
-* Step 31-43 should all succeed
-* Step 44-51 should all succeed
-
-# Possible Problems:
-* 17 should fail with not enough disk space, but currently returns a broken pipe
-* 31-43 are offline concurrent cp tests and may be unstable
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.robot
deleted file mode 100644
index fa3055f308..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-43-Docker-CP-Offline.robot
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-43 - Docker CP Offline
-Resource  ../../resources/Util.robot
-Suite Setup  Set up test files and install VIC appliance to test server
-Suite Teardown  Clean up test files and VIC appliance to test server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Set up test files and install VIC appliance to test server
-    Conditional Install VIC Appliance To Test Server
-    Remove All Volumes
-    Create File  ${CURDIR}/foo.txt   hello world
-    Create File  ${CURDIR}/content   fake file content for testing only
-    Create Directory  ${CURDIR}/bar
-    Create Directory  ${CURDIR}/mnt
-    Create Directory  ${CURDIR}/mnt/vol1
-    Create Directory  ${CURDIR}/mnt/vol2
-    Create File  ${CURDIR}/mnt/root.txt   rw layer file
-    Create File  ${CURDIR}/mnt/vol1/v1.txt   vol1 file
-    Create File  ${CURDIR}/mnt/vol2/v2.txt   vol2 file
-    ${rc}  ${output}=  Run And Return Rc And Output  dd if=/dev/urandom of=${CURDIR}/largefile.txt count=4096 bs=4096
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create vol2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create vol3
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create smallVol --opt Capacity=1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Clean up test files and VIC appliance to test server
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/foo.txt
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/content
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/largefile.txt
-    Run Keyword and Continue on Failure  Remove Directory  ${CURDIR}/bar  recursive=True
-    Run Keyword and Continue on Failure  Remove Directory  ${CURDIR}/mnt  recursive=True
-    Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Copy a file from host to offline container root dir
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i --name offline ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt offline:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  offline  ls /
-    Should Contain  ${output}  foo.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec offline sh -c 'rm /foo.txt'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a directory from offline container to host cwd
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec offline sh -c 'mkdir testdir && echo "file content" > /testdir/fakefile'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop offline
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp offline:/testdir ${CURDIR}/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/testdir
-    OperatingSystem.File Should Exist  ${CURDIR}/testdir/fakefile
-    Remove Directory  ${CURDIR}/testdir  recursive=True
-
-Copy a directory from host to offline container, dst path doesn't exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/bar offline:/bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  offline  ls /
-    Should Contain  ${output}   bar
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop offline
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a non-existent file out of an offline container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp offline:/dne/dne ${CURDIR}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-
-Copy a non-existent directory out of an offline container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp offline:/dne/. ${CURDIR}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-
-Copy a non-existent directory into an offline container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/dne/ offline:/
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  no such file or directory
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f offline
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a large file that exceeds the container volume into an offline container
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v smallVol:/small ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/largefile.txt ${cid}:/small
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a file from host to offline container, dst is a volume
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v vol1:/vol1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt ${cid}:/vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  ${cid}  ls /vol1
-    Should Contain  ${output}  foo.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a file from host to offline container, dst is a nested volume with 2 levels
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v vol1:/vol1 -v vol2:/vol1/vol2 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt ${cid}:/vol1/vol2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  ${cid}  ls /vol1/vol2
-    Should Contain  ${output}  foo.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a file from host to offline container, dst is a nested volume with 3 levels
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v vol1:/vol1 -v vol2:/vol1/vol2 -v vol3:/vol1/vol2/vol3 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${cid}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt ${cid}:/vol1/vol2/vol3
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  ${cid}  ls /vol1/vol2/vol3
-    Should Contain  ${output}  foo.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Concurrent copy: create processes to copy a small file from host to offline container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i --name concurrent -v vol1:/vol1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for small file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt concurrent:/foo-${idx}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    ${output}=  Start Container and Exec Command  concurrent  ls /
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   Should Contain  ${output}  foo-${idx}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop concurrent
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Concurrent copy: repeat copy a large file from host to offline container several times
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for large file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp ${CURDIR}/largefile.txt concurrent:/vol1/lg-${idx}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    ${output}=  Start Container and Exec Command  concurrent  ls /vol1
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   Should Contain  ${output}  lg-${idx}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop concurrent
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-# NOTE: this test depends on the prior test passing as it uses the copied files from that test as the source files for this test
-Concurrent copy: repeat copy a large file from offline container to host several times
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for large file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp concurrent:/vol1/lg-${idx} ${CURDIR}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   OperatingSystem.File Should Exist  ${CURDIR}/lg-${idx}
-    \   Remove File  ${CURDIR}/lg-${idx}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f concurrent
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Sub volumes: copy from host to offline container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v vol1:/mnt/vol1 -v vol2:/mnt/vol2 --name subVol ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/mnt subVol:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  subVol  find /mnt
-    Should Contain  ${output}  /mnt/root.txt
-    Should Contain  ${output}  /mnt/vol1/v1.txt
-    Should Contain  ${output}  /mnt/vol2/v2.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop subVol
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Sub volumes: copy from offline container to host
-    Operating System.List Directory  ${CURDIR}/
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp subVol:/mnt ${CURDIR}/result
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    # Needed to help diagnose failures
-    ${rc}  ${output}=  Run And Return Rc And Output  find ${CURDIR}/result -ls
-    Log  ${output}
-    Remove Directory  ${CURDIR}/result  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp subVol:/mnt ${CURDIR}/result
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result/vol1
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result/vol2
-    OperatingSystem.File Should Exist  ${CURDIR}/result/root.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result/vol1/v1.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result/vol2/v2.txt
-    Remove Directory  ${CURDIR}/result  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f subVol
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.md
deleted file mode 100644
index 48368be4eb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.md
+++ /dev/null
@@ -1,80 +0,0 @@
-Test 1-44 - Docker CP Online
-=======
-
-# Purpose:
-To verify that docker cp command for online containers is supported by VIC appliance
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/cp/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to vSphere server and set up test files, directories and volumes
-2. Pull busybox image and run a container named online
-3. Create directory online:/newdir and file online:/newdir/test.txt
-4. Issue docker cp online:/newdir newdir to the new VIC appliance
-5. Inspect the host cwd to verify that the copy operation succeeded and clean up copied files
-6. Issue docker cp online:/newdir/. bar to the new VIC appliance
-7. Inspect bar on the host to verify that the copy operation succeeded and clean up copied files
-8. Issue docker cp online:/newdir/test.txt foo.txt to the new VIC appliance
-9. Verify that the copy operation succeeded
-10. Issue docker cp foo.txt online:/doesnotexist/ to the new VIC appliance
-11. Issue docker cp ./foo.txt online:/ to the new VIC appliance
-12. Issue docker cp ./bar online:/ to the new VIC appliance
-13. Inspect online:/ to verify that the copy operations succeeded
-14. Remove online
-15. Run a container called online_vol with a single volume attached to it
-16. Issue docker cp ./bar online_vol:/vol1/ to the new VIC appliance
-17. Inspect online_vol:/vol1 to verify that the copy operation succeeded
-18. Create a container called offline that shares a volume with online
-19. Issue docker cp content offline:/vol1 to the new VIC appliance
-20. Inspect online_vol:/vol1 to verify that the copy operation succeeded
-21. Issue docker cp offline:/vol1 . to the new VIC appliance
-22. Verify that /vol1 and its content are copied over to host successfully and clean up copied files
-23. Remove offline
-24. Issue docker cp largefile.txt online_vol:/vol1/ to the new VIC appliance
-25. Inspect online_vol:/vol1 to verify that the large file is copied successfully
-26. Issue docker cp online_vol:/dne/dne . to the new VIC appliance
-27. Issue docker cp online_vol:/dne/. . to the new VIC appliance
-28. Remove online_vol
-29. Start 10 background processes that issues docker cp foo.txt concurrent:/foo-${idx} to the new VIC appliance
-30. Wait for these processes to finish
-31. Inspect concurrent:/ to verify that copy operation succeeded
-32. Start 10 background processes that issues docker cp largefile.txt concurrent:/vol1/lg-${idx} to the new VIC appliance
-33. Wait for these processes to finish
-34. Inspect concurrent:/vol1 to verify that copy operation succeeded
-35. Start 10 background processes that issues docker cp concurrent:/vol1/lg-${idx} . to the new VIC appliance
-36. Wait for these processes to finish
-37. Verify that the copy operation succeeded and clean up all the files copied to the host
-38. Remove concurrent
-39. Run a container called subVol with 2 volumes attached to it
-40. Issue docker cp ./mnt subVol:/ to the new VIC appliance
-41. Inspect subVol:/mnt, subVol:/mnt/vol1 and subVol:/mnt/vol2 to verify that the copy operation succeeded
-42. Issue docker cp subVol:/mnt ./result1 to the new VIC appliance
-43. Inspect ./result1 on the host to verify that copy succeeded and remove it afterwards
-44. Remove subVol
-45. Run a detached container called subVol_on with one volume attached to it
-46. Create a container called subVol_off with a volume that's shared with the online container subVol_on
-47. Issue docker cp ./mnt subVol_off:/ to the new VIC appliance
-48. Stop subVol_on container
-49. Start subVol_off to inspect subVol_off:/mnt, subVol_off:/mnt/vol1 and subVol_off:/mnt/vol2 to verify the copy operation succeeded
-50. Stop subVol and start subVol_on
-51. Issue docker cp subVol_off:/mnt ./result2 to the new VIC appliance
-52. Inspect ./result2 on the host to verify that copy succeeded and remove it afterwards
-53. Remove subVol_off and subVol_on
-54. Clean up created files, directories and volumes
-
-# Expected Outcome:
-* Step 1-9 should all succeed
-* Step 10 should fail with no such directory
-* Step 11-14 should all succeed
-* Step 15-25 should all succeed
-* Step 26-27 should both fail with no such directory
-* Step 28-38 should all succeed
-* Step 39-54 should all succeed
-
-# Possible Problems:
-* 29-38 are online concurrent tests and are unstable
-* 39-53 are online sub volume cp tests and are unstable
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.robot
deleted file mode 100644
index 3ef11127f0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-44-Docker-CP-Online.robot
+++ /dev/null
@@ -1,298 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-44 - Docker CP Online
-Resource  ../../resources/Util.robot
-Suite Setup  Set up test files and install VIC appliance to test server
-Suite Teardown  Clean up test files and VIC appliance to test server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Set up test files and install VIC appliance to test server
-    Conditional Install VIC Appliance To Test Server
-    Remove All Volumes
-    Create File  ${CURDIR}/foo.txt   hello world
-    Create File  ${CURDIR}/content   fake file content for testing only
-    Create Directory  ${CURDIR}/bar
-    Create Directory  ${CURDIR}/mnt
-    Create Directory  ${CURDIR}/mnt/vol1
-    Create Directory  ${CURDIR}/mnt/vol2
-    Create File  ${CURDIR}/mnt/root.txt   rw layer file
-    Create File  ${CURDIR}/mnt/vol1/v1.txt   vol1 file
-    Create File  ${CURDIR}/mnt/vol2/v2.txt   vol2 file
-    ${rc}  ${output}=  Run And Return Rc And Output  dd if=/dev/urandom of=${CURDIR}/largefile.txt count=1024 bs=1024
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create v1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create v2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Clean up test files and VIC appliance to test server
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/foo.txt
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/content
-    Run Keyword and Continue on Failure  Remove File  ${CURDIR}/largefile.txt
-    Run Keyword and Continue on Failure  Remove Directory  ${CURDIR}/bar  recursive=True
-    Run Keyword and Continue on Failure  Remove Directory  ${CURDIR}/mnt  recursive=True
-    Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Copy a directory from online container to host, dst path doesn't exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -it --name online ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec online sh -c 'mkdir newdir && echo "testing" > /newdir/test.txt'
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp online:/newdir ${CURDIR}/newdir
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/newdir
-    OperatingSystem.File Should Exist  ${CURDIR}/newdir/test.txt
-    Remove Directory  ${CURDIR}/newdir  recursive=True
-
-Copy the content of a directory from online container to host
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp online:/newdir/. ${CURDIR}/bar
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.File Should Exist  ${CURDIR}/bar/test.txt
-    Remove File  ${CURDIR}/bar/test.txt
-
-Copy a file from online container to host, overwrite dst file
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp online:/newdir/test.txt ${CURDIR}/foo.txt
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${content}=  OperatingSystem.Get File  ${CURDIR}/foo.txt
-    Should Contain  ${content}   testing
-
-Copy a file from host to online container, dst directory doesn't exist
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt online:/doesnotexist/
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  no such directory
-
-Copy a file and directory from host to online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt online:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/bar online:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec online ls /
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  foo.txt
-    Should Contain  ${output}  bar
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f online
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a directory from host to online container, dst is a volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -it --name online_vol -v vol1:/vol1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/bar online_vol:/vol1/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec online_vol ls /vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  bar
-
-Copy a file from host to offline container, dst is a volume shared with an online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i --name offline -v vol1:/vol1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/content offline:/vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec online_vol ls /vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  content
-
-Copy a directory from offline container to host, dst is a volume shared with an online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp offline:/vol1 ${CURDIR}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/vol1
-    OperatingSystem.Directory Should Exist  ${CURDIR}/vol1/bar
-    OperatingSystem.File Should Exist  ${CURDIR}/vol1/content
-    Remove Directory  ${CURDIR}/vol1  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f offline
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Copy a large file to an online container, dst is a volume
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/largefile.txt online_vol:/vol1/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec online_vol ls -l /vol1/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  1048576
-    Should Contain  ${output}  largefile.txt
-
-Copy a non-existent file out of an online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp online_vol:/dne/dne ${CURDIR}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-
-Copy a non-existent directory out of an online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp online_vol:/dne/. ${CURDIR}
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f online_vol
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Concurrent copy: create processes to copy a small file from host to online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name concurrent -v v1:/vol1 -d -it ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for small file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp ${CURDIR}/foo.txt concurrent:/foo-${idx}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec concurrent ls /
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   Should Contain  ${output}  foo-${idx}
-
-Concurrent copy: repeat copy a large file from host to online container several times
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for large file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp ${CURDIR}/largefile.txt concurrent:/vol1/lg-${idx}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec concurrent ls /vol1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   Should Contain  ${output}  lg-${idx}
-
-Concurrent copy: repeat copy a large file from online container to host several times
-    ${pids}=  Create List
-    Log To Console  \nIssue 10 docker cp commands for large file
-    :FOR  ${idx}  IN RANGE  0  10
-    \   ${pid}=  Start Process  docker %{VCH-PARAMS} cp concurrent:/vol1/lg-${idx} ${CURDIR}  shell=True
-    \   Append To List  ${pids}  ${pid}
-    Log To Console  \nWait for them to finish and check their RC
-    :FOR  ${pid}  IN  @{pids}
-    \   Log To Console  \nWaiting for ${pid}
-    \   ${res}=  Wait For Process  ${pid}
-    \   Log  ${res.stdout}
-    \   Should Be Equal As Integers  ${res.rc}  0
-    Log To Console  \nCheck if the copy operations succeeded
-    :FOR  ${idx}  IN RANGE  0  10
-    \   OperatingSystem.File Should Exist  ${CURDIR}/lg-${idx}
-    \   Remove File  ${CURDIR}/lg-${idx}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f concurrent
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Sub volumes: copy from host to an online container, dst includes several volumes
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -it -v A:/mnt/vol1 -v B:/mnt/vol2 --name subVol ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/mnt subVol:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec subVol find /mnt
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Should Contain  ${output}  /mnt/root.txt
-    Should Contain  ${output}  /mnt/vol1/v1.txt
-    Should Contain  ${output}  /mnt/vol2/v2.txt
-
-Sub volumes: copy from online container to host, src includes several volumes
-    Remove Directory  ${CURDIR}/result1  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp subVol:/mnt ${CURDIR}/result1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result1/vol1
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result1/vol2
-    OperatingSystem.File Should Exist  ${CURDIR}/result1/root.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result1/vol1/v1.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result1/vol2/v2.txt
-    Remove Directory  ${CURDIR}/result1  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f subVol
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Sub volumes: copy from host to an offline container, dst includes a shared vol with an online container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -it -v vol1:/vol1 --name subVol_on ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -i -v vol1:/mnt/vol1 --name subVol_off ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp ${CURDIR}/mnt subVol_off:/
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop subVol_on
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${output}=  Start Container and Exec Command  subVol_off  find /mnt
-    Should Contain  ${output}  /mnt/root.txt
-    Should Contain  ${output}  /mnt/vol1/v1.txt
-    Should Contain  ${output}  /mnt/vol2/v2.txt
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop subVol_off
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start subVol_on
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Sub volumes: copy from an offline container to host, src includes a shared vol with an online container
-    Remove Directory  ${CURDIR}/result2  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp subVol_off:/mnt ${CURDIR}/result2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result2/vol1
-    OperatingSystem.Directory Should Exist  ${CURDIR}/result2/vol2
-    OperatingSystem.File Should Exist  ${CURDIR}/result2/root.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result2/vol1/v1.txt
-    OperatingSystem.File Should Exist  ${CURDIR}/result2/vol2/v2.txt
-    Remove Directory  ${CURDIR}/result2  recursive=True
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f subVol_off
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f subVol_on
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-999-Cleanup.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-999-Cleanup.robot
deleted file mode 100644
index 6b689db237..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/1-999-Cleanup.robot
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 1-100 - Cleanup
-Resource  ../../resources/Util.robot
-Suite Setup  Cleanup Docker Commands Tests
-Suite Teardown  Finalize Docker Commands Tests
-Test Timeout  20 minutes
-
-*** Keywords ***
-Is Single VCH Mode
-    # If TARGET_VCH not present when running group, track that we're installing a single VCH here.
-    # This allows the cleanup suite to know that it can clean up the VCH
-    ${multi-vch}=  Get Environment Variable  MULTI_VCH  ${EMPTY}
-
-    ${single-vch-mode}=  Run Keyword If  '${multi-vch}' == '1'  Set Variable  ${False}
-    ...  ELSE  Set Variable  ${True}
-
-    [Return]  ${single-vch-mode}
-
-Cleanup Docker Commands Tests
-    Log To Console  Cleaning up docker command tests
-
-    ${single-vch-mode}=  Run Keyword  Is Single VCH Mode
-
-    Run Keyword If  ${single-vch-mode} == ${True}  Conditional Install VIC Appliance To Test Server
-
-Finalize Docker Commands Tests
-    Log To Console  Finalizing up docker command tests
-
-    ${single-vch-mode}=  Run Keyword  Is Single VCH Mode
-
-    Run Keyword If  ${single-vch-mode} == ${True}  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Prepare to Cleanup Group
-    ${single-vch-mode}=  Run Keyword  Is Single VCH Mode
- 
-    # Helps cleans up the Group 1 test suite instead of solely depending on vic-machine
-    Run Keyword If  ${single-vch-mode} == ${True}  Remove All Containers
-    Run Keyword If  ${single-vch-mode} == ${True}  Remove All Images
-
-    # This step allows the teardown to remove the VCH.  This only occurs if CLEANUP_GROUP was set
-    # by an initializer suite.
-    ${cleanup-group}=  Get Environment Variable  CLEANUP_GROUP  ${EMPTY}
-    Run Keyword If  ${single-vch-mode} == ${True}  Run Keyword If  '${cleanup-group}' == '1'  Remove VCH From Removal Exception List  vch=%{VCH-NAME}  
-    
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/TestCases.md
deleted file mode 100644
index 0a3320e999..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/TestCases.md
+++ /dev/null
@@ -1,85 +0,0 @@
-Group 1 - Docker Commands
-=======
-
-
-[Test 1-01 - Docker Info](1-01-Docker-Info.md)
--
-[Test 1-02 - Docker Pull](1-02-Docker-Pull.md)
--
-[Test 1-03 - Docker Images](1-03-Docker-Images.md)
--
-[Test 1-04 - Docker Create](1-04-Docker-Create.md)
--
-[Test 1-05 - Docker Start](1-05-Docker-Start.md)
--
-[Test 1-06 - Docker Run](1-06-Docker-Run.md)
--
-[Test 1-07 - Docker Stop](1-07-Docker-Stop.md)
--
-[Test 1-08 - Docker Logs](1-08-Docker-Logs.md)
--
-[Test 1-09 - Docker Attach](1-09-Docker-Attach.md)
--
-[Test 1-10 - Docker PS](1-10-Docker-PS.md)
--
-[Test 1-11 - Docker RM](1-11-Docker-RM.md)
--
-[Test 1-12 - Docker RMI](1-12-Docker-RMI.md)
--
-[Test 1-13 - Docker Version](1-13-Docker-Version.md)
--
-[Test 1-14 - Docker Kill](1-14-Docker-Kill.md)
--
-[Test 1-15 - Docker Network Create](1-15-Docker-Network-Create.md)
--
-[Test 1-16 - Docker Network LS](1-16-Docker-Network-LS.md)
--
-[Test 1-17 - Docker Network Connect](1-17-Docker-Network-Connect.md)
--
-[Test 1-18 - Docker Network RM](1-18-Docker-Network-RM.md)
--
-[Test 1-19 - Docker Volume Create](1-19-Docker-Volume-Create.md)
--
-[Test 1-20 - Docker Volume Inspect](1-20-Docker-Volume-Inspect.md)
--
-[Test 1-21 - Docker Volume LS](1-21-Docker-Volume-LS.md)
--
-[Test 1-22 - Docker Volume RM](1-22-Docker-Volume-RM.md)
--
-[Test 1-23 - Docker Inspect](1-23-Docker-Inspect.md)
--
-[Test 1-24 - Docker Link](1-24-Docker-Link.md)
--
-[Test 1-27 - Docker Login](1-27-Docker-Login.md)
--
-[Test 1-28 - Docker Secret](1-28-Docker-Secret.md)
--
-[Test 1-29 - Docker Service](1-29-Docker-Service.md)
--
-[Test 1-30 - Docker Deploy](1-30-Docker-Deploy.md)
--
-[Test 1-31 - Docker Node](1-31-Docker-Node.md)
--
-[Test 1-32 - Docker Plugin](1-32-Docker-Plugin.md)
--
-[Test 1-33 - Docker Service](1-33-Docker-Service.md)
--
-[Test 1-34 - Docker Stack](1-34-Docker-Stack.md)
--
-[Test 1-35 - Docker Swarm](1-35-Docker-Swarm.md)
--
-[Test 1-36 - Docker Rename](1-36-Docker-Rename.md)
--
-[Test 1-37 - Docker User](1-37-Docker-USER.md)
--
-[Test 1-38 - Docker Exec](1-38-Docker-Exec.md)
--
-[Test 1-39 - Docker Stats](1-39-Docker-Stats.md)
--
-[Test 1-40 - Docker Restart](1-40-Docker-Restart.md)
--
-[Test 1-41 - Docker Commit](1-41-Docker-Commit.md)
--
-[Test 1-43 - Docker CP Offline](1-43-Docker-CP-Offline.md)
--
-[Test 1-44 - Docker CP Online](1-44-Docker-CP-Online.md)
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/__init__.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/__init__.robot
deleted file mode 100644
index d2b06354ad..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group1-Docker-Commands/__init__.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Group 1 Shared VCH Initializer
-Resource  ../../resources/Util.robot
-Suite Setup  Setup Docker Commands Tests
-Test Timeout  20 minutes
-
-*** Keywords ***
-Setup Docker Commands Tests
-    # If TARGET_VCH not present when running group, track that we're installing a single VCH here.
-    # This allows the cleanup suite to know that it can clean up the VCH
-    ${target-vch}=  Get Environment Variable  TARGET_VCH  ${EMPTY}
-    ${multi-vch}=  Get Environment Variable  MULTI_VCH  ${EMPTY}
-
-    ${single-vch-mode}=  Run Keyword If  '${multi-vch}' == '1'  Set Variable  ${False}
-    ...  ELSE  Set Variable  ${True}
-
-    Set Environment Variable  CLEANUP_GROUP  0
-
-    Run Keyword If  '${target-vch}' == '${EMPTY}'  Run Keyword If  ${single-vch-mode} == ${True}  Set Environment Variable  CLEANUP_GROUP  1
-
-    Run Keyword If  '${target-vch}' == '${EMPTY}'  Run Keyword If  ${single-vch-mode} != ${True}  Log To Console  Bypassing shared VCH install because tests are in multi-VCH mode.
-    Run Keyword If  '${target-vch}' != '${EMPTY}'  Log To Console  Detected Target VCH ${target-vch}
-    Run Keyword If  ${single-vch-mode} == ${True}  Conditional Install VIC Appliance To Test Server  init=${True}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.md
deleted file mode 100644
index a371484447..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Test 10-01 - VCH Restart
-=======
-
-# Purpose:
-To verify that restarting a VCH results in a consistent and correct state
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Issue docker network create bar, creating a new network called "bar"
-3. Create container with port mapping
-4. Reboot VCH
-5. Issue a docker network ls
-6. Issue docker inspect
-7. Issue docker stop, start and ls
-8. Check container service in specified port
-9. Start container with same port
-10. Create container with volume and then reboot VCH
-11. Inspect container to check volume info
-
-# Expected Outcome:
-* VCH should reboot within a reasonable amount of time
-* After VCH restart, network ls should have the previously created network listed
-* Step 6, 7 and 8 should result in success
-* Step 9 should result in false
-* Step 10-11 should result in success
-
-#Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.robot
deleted file mode 100644
index 62fbfadb2d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/10-01-VCH-Restart.robot
+++ /dev/null
@@ -1,188 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 10-01 - VCH Restart
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Default Tags
-
-*** Keywords ***
-Get Container IP
-    [Arguments]  ${id}  ${network}=default
-    ${rc}  ${ip}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect ${network} | jq '.[0].Containers."${id}".IPv4Address'
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${ip}
-
-Launch Container
-    [Arguments]  ${name}  ${network}=default  ${command}=sh
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${name} --net ${network} -itd ${busybox} ${command}
-    Should Be Equal As Integers  ${rc}  0
-    ${id}=  Get Line  ${output}  -1
-    [Return]  ${id}
-
-*** Test Cases ***
-Created Network And Images Persists As Well As Containers Are Discovered With Correct IPs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create foo
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create bar
-    Should Be Equal As Integers  ${rc}  0
-
-    ${bridge-exited}=  Launch Container  vch-restart-bridge-exited  bridge  ls
-    ${bridge-running}=  Launch Container  vch-restart-bridge-running  bridge
-    ${bridge-running-ip}=  Get Container IP  ${bridge-running}  bridge
-    ${bar-exited}=  Launch Container  vch-restart-bar-exited  bar  ls
-    ${bar-running}=  Launch Container  vch-restart-bar-running  bar
-    ${bar-running-ip}=  Get Container IP  ${bar-running}  bar
-
-    Launch Container  foo-c1  foo
-    Launch Container  foo-c2  foo
-    Launch Container  bar-c1  bar
-    Launch Container  bar-c2  bar
-    # name resolution should work on the foo and bar networks
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec foo-c1 ping -c3 foo-c2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec foo-c2 ping -c3 foo-c1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec bar-c1 ping -c3 bar-c2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec bar-c2 ping -c3 bar-c1
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name webserver ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10000
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10001
-
-    Reboot VM  %{VCH-NAME}
-
-    Log To Console  Getting VCH IP ...
-    ${new-vch-ip}=  Get VM IP  %{VCH-NAME}
-    Log To Console  New VCH IP is ${new-vch-ip}
-    Replace String  %{VCH-PARAMS}  %{VCH-IP}  ${new-vch-ip}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    # name resolution should work on the foo and bar networks
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec foo-c1 ping -c3 foo-c2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec foo-c2 ping -c3 foo-c1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec bar-c1 ping -c3 bar-c2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} exec bar-c2 ping -c3 bar-c1
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} images
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  nginx
-    Should Contain  ${output}  busybox
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  foo
-    Should Contain  ${output}  bar
-    Should Contain  ${output}  bridge
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect bridge
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect bar
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect foo
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Get Container IP  ${bridge-running}  bridge
-    Should Be Equal  ${ip}  ${bridge-running-ip}
-    ${ip}=  Get Container IP  ${bar-running}  bar
-    Should Be Equal  ${ip}  ${bar-running-ip}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${bridge-running} | jq '.[0].State.Status'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  \"running\"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${bar-running} | jq '.[0].State.Status'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  \"running\"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${bridge-exited} | jq '.[0].State.Status'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  \"exited\"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect ${bar-exited} | jq '.[0].State.Status'
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  \"exited\"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${bar-exited}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${bridge-exited}
-    Should Be Equal As Integers  ${rc}  0
-
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10000
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10001
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name webserver1 ${nginx}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver1
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  port 10000 is not available
-
-    # docker pull should work
-    # if this fails, very likely the default gateway on the VCH is not set
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${alpine}
-    Should Be Equal As Integers  ${rc}  0
-
-Create VCH attach disk and reboot
-    ${rc}=  Run And Return Rc  govc vm.disk.create -vm=%{VCH-NAME} -name=%{VCH-NAME}/deleteme -size "16M"
-    Should Be Equal As Integers  ${rc}  0
-
-    Reboot VM  %{VCH-NAME}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-    ${rc}=  Run And Return Rc  govc device.ls -vm=%{VCH-NAME} | grep disk
-    Should Be Equal As Integers  ${rc}  1
-
-Docker inspect mount and cmd data after reboot
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=named-volume
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${container}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name=mount-data-test -v /mnt/test -v named-volume:/mnt/named busybox /bin/ls -la /
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Mounts}}' mount-data-test
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  /mnt/test
-    Should Contain  ${out}  /mnt/named
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Config.Cmd}}' mount-data-test
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain X Times  ${out}  /bin/ls  1
-    Should Contain X Times  ${out}  -la  1
-    Should Contain X Times  ${out}  ${SPACE}/  1
-
-    Reboot VM  %{VCH-NAME}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Mounts}}' mount-data-test
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  /mnt/test
-    Should Contain  ${out}  /mnt/named
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{.Config.Cmd}}' mount-data-test
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain X Times  ${out}  /bin/ls  1
-    Should Contain X Times  ${out}  -la  1
-    Should Contain X Times  ${out}  ${SPACE}/  1
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/TestCases.md
deleted file mode 100644
index d8202361b2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group10-VCH-Restart/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 10 - VCH Restart
-=======
-
-
-[Test 10-01 - VCH Restart](10-01-VCH-Restart.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.md
deleted file mode 100644
index ec31a1ba73..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.md
+++ /dev/null
@@ -1,46 +0,0 @@
-Test 11-01 - Upgrade
-=======
-
-# Purpose:
-To verify vic-machine upgrade can upgrade VCH from a certain version
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download vic_7315.tar.gz from gcp
-2. Deploy VIC 7315 to vsphere server
-3. Issue docker network create bar, creating a new network called "bar"
-4. Create container with port mapping
-5. Upgrade VCH to latest version with short timeout 1s
-6. Create a named volume
-7. Create a container with a mounted anonymous and named volume
-8. Upgrade VCH to latest version
-9. Verify that the volumes are still there using inspect
-10. Roll back to the previous version
-11. Upgrade again to the upgraded version
-12. Verify that the volumes are still there using inspect
-13. Check the previous created container and image are still there
-14. Attempt to rename an old container created with a VCH that doesn't support rename.
-15. Rename a new container created with a VCH that supports rename.
-16. Check the previous created container's display name and datastore folder name
-17. Check the display name and datastore folder name of a new container created after VCH upgrade
-
-# Expected Outcome:
-* Step 5 should fail with timeout
-* Step 14 should result in an error containing the following message:
-```
-does not support rename
-```
-* Step 15 should succeed and the container's new name should be present in ps, inspect and govc vm.info output.
-* Step 16 should show that both the container's display name and datastore folder name are containerName-containerID
-* Step 17 should show that (1) on a non-vsan setup, the container's display name is containerName-containerShortID while the datastore folder name is containerID, or (2) on a vsan setup, both the container's display name and datastore folder name are containerName-containerShortID
-* All other steps should result in success
-
-# Possible Problems:
-* Upgrade test will upgrade VCH from build 7315, because that build has VCH restart and configuration restart features done.
-* Before GA, if there is any VCH configuration change, please bump upgrade from version, and be sure to add cases to cover those changes.
-* After GA, the upgrade from version will be GA release version.
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
deleted file mode 100644
index 99682df047..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-01-Upgrade.robot
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-01 - Upgrade
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC with version to Test Server  7315
-Suite Teardown  Clean up VIC Appliance And Local Binary
-Default Tags
-
-*** Variables ***
-${namedVolume}=  named-volume
-${mntDataTestContainer}=  mount-data-test
-${mntTest}=  /mnt/test
-${mntNamed}=  /mnt/named
-
-*** Keywords ***
-Run Docker Checks
-    # wait for docker info to succeed
-    Log To Console  Verify Containers...
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  bar
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network inspect bridge
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  %{ID1}  bridge
-    Should Be Equal  ${ip}  %{IP1}
-    ${ip}=  Get Container IP  %{VCH-PARAMS}  %{ID2}  bridge
-    Should Be Equal  ${ip}  %{IP2}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect vch-restart-test1
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  "Id"
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} stop vch-restart-test1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-
-
-    ${status}=  Get State Of Github Issue  5653
-    Run Keyword If  '${status}' == 'closed'  Should Contain  ${output}  Exited (143)
-    Run Keyword If  '${status}' == 'closed'  Fail  Exit code check below needs to be updated now that Issue #5653 has been resolved
-    # Disabling the precise check for error code until https://github.com/vmware/vic/issues/5653 is fixed - we can get rid of the
-    # conditional around the exit code check once the issue is closed
-    #Should Contain  ${output}  Exited (143)
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start vch-restart-test1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Exited (0)
-
-    # Check that rename doesn't work on a container from a VCH that doesn't support rename
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename vch-restart-test1 vch-test2
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  does not support rename
-
-    # Check that rename works on a container from a VCH that supports rename
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${contID}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name new-vch-cont1 ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${contID}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rename new-vch-cont1 new-vch-cont2
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Verify Container Rename  new-vch-cont1  new-vch-cont2  ${contID}
-
-    # check the display name and datastore folder name of an existing container
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/*-%{ID1}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should contain  ${output}  vch-restart-tes-%{ID1}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info *-%{ID1}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  vch-restart-tes-%{ID1}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.ls | grep vch-restart-tes-%{ID1}
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  vch-restart-tes-%{ID1}
-
-    # check the display name and datastore folder name of a new container
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${vmName}=  Get VM Display Name  ${id}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc vm.info %{VCH-NAME}/${vmName}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc vm.info ${vmName}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Run And Return Rc And Output  govc datastore.ls | grep ${vmName}
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'VSAN'  Should contain  ${output}  ${vmName}
-    ${rc}  ${output}=  Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Run And Return Rc And Output  govc datastore.ls | grep ${id}
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Should Be Equal As Integers  ${rc}  0
-    Run Keyword If  '%{DATASTORE_TYPE}' == 'Non_VSAN'  Should Contain  ${output}  ${id}
-
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10000
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10001
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name webserver1 nginx
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start webserver1
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  port 10000 is not available
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} stop
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -aq | xargs -n1 docker %{VCH-PARAMS} rm
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-
-Create Docker Containers
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} network create bar
-    Should Be Equal As Integers  ${rc}  0
-    Comment  Launch container on bridge network
-    ${id1}  ${ip1}=  Launch Container  vch-restart-test1  bridge  docker1.11
-    ${id2}  ${ip2}=  Launch Container  vch-restart-test2  bridge  docker1.11
-    Set Environment Variable  ID1  ${id1}
-    Set Environment Variable  ID2  ${id2}
-    Set Environment Variable  IP1  ${ip1}
-    Set Environment Variable  IP2  ${ip2}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} create -it -p 10000:80 -p 10001:80 --name webserver nginx
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} start webserver
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10000
-    Wait Until Keyword Succeeds  20x  5 seconds  Hit Nginx Endpoint  %{VCH-IP}  10001
-
-Create Container with Named Volume
-    Log To Console  \nCreate a named volume and mount it to a container\n
-    ${rc}  ${container}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} volume create --name=${namedVolume}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${container}  ${namedVolume}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} create --name=${mntDataTestContainer} -v ${mntTest} -v ${namedVolume}:${mntNamed} busybox
-    Should Be Equal As Integers  ${rc}  0
-    Set Suite Variable  ${TestContainerVolume}  ${output}
-
-
-*** Test Cases ***
-Upgrade Present in vic-machine
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux
-    Should Contain  ${output}  upgrade
-
-Upgrade VCH with unreasonably short timeout and automatic rollback after failure
-    Log To Console  \nUpgrading VCH with 1s timeout ...
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout 1s
-    Should Contain  ${output}  Upgrading VCH exceeded time limit
-    Should Not Contain  ${output}  Completed successfully
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run And Return Rc And Output  govc snapshot.tree -vm=%{VCH-NAME}/%{VCH-NAME}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Not Contain  ${output}  upgrade
-    ${rc}  ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run And Return Rc And Output  govc snapshot.tree -vm=%{VCH-NAME}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Not Contain  ${output}  upgrade
-
-    # confirm that the rollback took effect
-    Check Original Version
-
-Upgrade VCH
-    Create Docker Containers
-
-    Create Container with Named Volume
-
-    # Create check list for Volume Inspect
-    @{checkList}=  Create List  ${mntTest}  ${mntNamed}  ${namedVolume}
-
-    Upgrade
-    Check Upgraded Version
-
-    Verify Volume Inspect Info  After Upgrade and Before Rollback  ${TestContainerVolume}  ${checkList}
-
-    Rollback
-    Check Original Version
-
-    Upgrade with ID
-    Check Upgraded Version
-
-    Verify Volume Inspect Info  After Upgrade with ID  ${TestContainerVolume}  ${checkList}
-
-    Run Docker Checks
-
-
-    Log To Console  Regression Tests...
-    Run Regression Tests
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.md
deleted file mode 100644
index 8541e819f4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 11-02 - Upgrade Exec
-=======
-
-# Purpose:
-To verify that exec does not work in VIC version 0.9.0 and lower
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download vic_8351.tar.gz from gcp
-2. Deploy VIC 8351 to vsphere server
-3. Create a busybox container running the background
-4. Upgrade VCH to latest version
-5. Run docker exec on container created in step (3.)
-6. Create new container
-7. Run docker exec on new container in (6.)
-
-# Expected Outcome:
-* Step 5 should fail
-* All other steps should result in success
-
-# Possible Problems:
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.robot
deleted file mode 100644
index bfa98c99c5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-02-Upgrade-Exec.robot
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-02 - Upgrade Exec
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC with version to Test Server  8351
-Suite Teardown  Clean up VIC Appliance And Local Binary
-Default Tags
-
-*** Test Cases ***
-Exec Not Allowed On Older Containers
-    Launch Container  exec-test
-
-    Upgrade
-    Check Upgraded Version
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -d exec-test ls
-    Should Not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  running tasks not supported for this container
-
-    Launch Container  exec-test2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -d exec-test2 ls
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.md
deleted file mode 100644
index 8324ad4463..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Test 11-03 - Upgrade InsecureRegistry
-=======
-
-# Purpose:
-To verify InsecureRegistries are correctly migrated
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-
-1. Deploy an insecure registry on http
-2. Create a test project on insecure registry
-3. Start a docker daemon with insecure registry configured
-4. Push test image to insecure registry through above docker daemon(VCH docker push not implemented)
-5. Download vic_7315.tar.gz from gcp if it does not exist locally
-6. Deploy VIC 7315 to vsphere server with above insecure registry
-7. Make sure pull given test image through VCH successfully
-8. Upgrade VCH to latest version
-9. Make sure pull given test image through VCH successfully
-
-10. Deploy an insecure registry on https with self-signed certificate
-11. Create a test project on insecure registry
-12. Start a docker daemon with insecure registry configured
-13. Push test image to insecure registry through above docker daemon(VCH docker push not implemented)
-14. Download vic_7315.tar.gz from gcp if it does not exist locally
-15. Deploy VIC 7315 to vsphere server with above insecure registry
-16. Make sure pull given test image through VCH successfully
-17. Upgrade VCH to latest version
-18. Make sure pull given test image through VCH successfully
-
-# Expected Outcome:
-* Able to pull given test image through VCH successfully both before and after upgrade
-
-# Possible Problems:
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.robot
deleted file mode 100644
index 2ff1f4dcab..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-03-Upgrade-InsecureRegistry.robot
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-03 - Upgrade-InsecureRegistry
-Resource  ../../resources/Util.robot
-#Test Teardown  Cleanup Test Environment
-
-*** Variables ***
-${test_vic_version}  7315
-${vic_success}  Installer completed successfully
-${docker_bridge_network}  bridge
-${docker_daemon_default_port}  2375
-${http_harbor_name}  integration-test-harbor-http
-${https_harbor_name}  integration-test-harbor-https
-${default_local_docker_endpoint}  unix:///var/run/docker-local.sock
-
-*** Keywords ***
-Setup Test Environment
-    [arguments]  ${insecure_registry}
-    ${handle}  ${docker_daemon_pid}=  Start Docker Daemon Locally  --insecure-registry ${insecure_registry}
-    Setup VCH And Registry  ${insecure_registry}
-    [Return]  ${handle}  ${docker_daemon_pid}
-
-Run Secret Curl Command
-    [Tags]  secret
-    [Arguments]  ${registry_ip}  ${protocol}  ${curl_option}  ${user}=admin  ${password}=%{TEST_PASSWORD}
-    ${rc}  ${output}=  Run And Return Rc And Output  curl ${curl_option} -u ${user}:${password} -H "Content-Type: application/json" -X POST -d '{"project_name": "test","public": 1}' ${protocol}://${registry_ip}/api/projects
-    [Return]  ${rc}  ${output}
-
-Add Project On Registry
-    [Arguments]  ${registry_ip}  ${protocol}
-    # Harbor API: https://github.com/vmware/harbor/blob/master/docs/swagger.yaml
-    Run Keyword If  '${protocol}' == 'https'  Set Test Variable  ${curl_option}  --insecure
-    Run Keyword If  '${protocol}' == 'http'  Set Test Variable  ${curl_option}  ${EMPTY}
-    :FOR  ${i}  IN RANGE  12
-    \   ${rc}  ${output}=  Run Secret Curl Command  ${registry_ip}  ${protocol}  ${curl_option}
-    \   Log  ${output}
-    \   Return From Keyword If  '${rc}' == '0'
-    \   Sleep  10s
-    Fail  Failed to add project on registry!
-
-Run Secret Docker Login
-    [Tags]  secret
-    [Arguments]    ${registry_ip}  ${registry_user}=admin  ${registry_password}=%{TEST_PASSWORD}  ${docker}=DOCKER_API_VERSION=1.23 docker
-    ${rc}  ${output}=  Run And Return Rc And Output  ${docker} -H ${default_local_docker_endpoint} login --username ${registry_user} --password ${registry_password} ${registry_ip}
-    [Return]  ${rc}  ${output}
-
-Setup VCH And Registry
-    [Arguments]  ${registry_ip}  ${docker}=DOCKER_API_VERSION=1.23 docker
-    ${rc}  ${output}=  Run And Return Rc And Output  echo "From busybox" | ${docker} -H ${default_local_docker_endpoint} build -t ${registry_ip}/test/busybox -
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Successfully built
-    Log To Console  \nbusybox built successfully
-    ${rc}  ${output}=  Run Secret Docker Login  ${registry_ip}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Login Succeeded
-    Log To Console  \nLogin successfully
-    ${rc}=  Run And Return Rc  ${docker} -H ${default_local_docker_endpoint} push ${registry_ip}/test/busybox
-    Should Be Equal As Integers  ${rc}  0
-    Log To Console  \nbusybox pushed successfully
-
-Test VCH And Registry
-    [Arguments]  ${vch_endpoint}  ${registry_ip}  ${docker}=DOCKER_API_VERSION=1.23 docker
-    ${rc}  ${output}=  Run And Return Rc And Output  ${docker} -H ${vch_endpoint} pull ${registry_ip}/test/busybox
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Digest:
-    Should Contain  ${output}  Status:
-    Should Not Contain  ${output}  Error response from daemon
-
-Cleanup Test Environment
-    [Arguments]  ${docker}=DOCKER_API_VERSION=1.23 docker
-    Clean up VIC Appliance And Local Binary
-    ${out}=  Cleanup Harbor  ${harbor_name}
-    Log  ${out}
-    ${rc}=  Run And Return Rc  ${docker} -H ${default_local_docker_endpoint} rmi ${harbor_ip}/test/busybox
-    Should Be Equal As Integers  ${rc}  0
-    Kill Local Docker Daemon  ${handle}  ${docker_daemon_pid}
-
-*** Test Cases *** 
-Upgrade VCH with Harbor On HTTP
-    Pass Execution  Need to use a different insecure registry, because Harbor does not support VIC as insecure and 0.5.0 is too old
-    Set Test Environment Variables
-    ${out}=  Cleanup Harbor  ${http_harbor_name}
-    Log  ${out}
-    ${out}=  Cleanup Harbor  ${https_harbor_name}
-    Log  ${out}
-    Set Test Variable  ${harbor_name}  ${http_harbor_name}
-    ${ip}=  Install Harbor To Test Server  ${harbor_name}
-    Set Test Variable  ${harbor_ip}  ${ip}
-    Add Project On Registry  ${harbor_ip}  http
-    ${hdl}  ${pid}=  Setup Test Environment  ${harbor_ip}
-    Set Test Variable  ${handle}  ${hdl}
-    Set Test Variable  ${docker_daemon_pid}  ${pid}
-
-    Install VIC with version to Test Server  ${test_vic_version}  --insecure-registry ${harbor_ip} --no-tls
-
-    Test VCH And Registry  %{VCH-IP}:%{VCH-PORT}  ${harbor_ip}
-
-    Upgrade
-    Check Upgraded Version
-    Test VCH And Registry  %{VCH-IP}:%{VCH-PORT}  ${harbor_ip}
-
-Upgrade VCH with Harbor On HTTPS
-    Pass Execution  Need to use a different insecure registry, because Harbor does not support VIC as insecure and 0.5.0 is too old
-    ${out}=  Cleanup Harbor  ${http_harbor_name}
-    Log  ${out}
-    ${out}=  Cleanup Harbor  ${https_harbor_name}
-    Log  ${out}
-    Set Test Variable  ${harbor_name}  ${https_harbor_name}
-    ${ip}=  Install Harbor To Test Server  ${harbor_name}  https
-    Set Test Variable  ${harbor_ip}  ${ip}
-    Add Project On Registry  ${harbor_ip}  https
-    ${hdl}  ${pid}=  Setup Test Environment  ${harbor_ip}
-    Set Test Variable  ${handle}  ${hdl}
-    Set Test Variable  ${docker_daemon_pid}  ${pid}
-
-    ${harbor_cert}=  Fetch Harbor Self Signed Cert  ${harbor_ip}
-    Install VIC with version to Test Server  ${test_vic_version}  --insecure-registry ${harbor_ip} --no-tls --registry-ca ${harbor_cert}
-
-    Test VCH And Registry  %{VCH-IP}:%{VCH-PORT}  ${harbor_ip}
-
-    Upgrade
-    Check Upgraded Version
-    Test VCH And Registry  %{VCH-IP}:%{VCH-PORT}  ${harbor_ip}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.md
deleted file mode 100644
index fb9838fe79..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.md
+++ /dev/null
@@ -1,30 +0,0 @@
-Test 11-04 - Upgrade UpdateInProgress
-=======
-
-# Purpose:
-To verify that vic-machine inspect could detect the upgrade status of a VCH
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download vic_7315.tar.gz from gcp
-2. Deploy VIC 7315 to vsphere server
-3. Set UpdateInProgress to true using govc
-4. Upgrade VCH
-5. Run vic-machine upgrade --resetInProgressFlag to reset UpdateInProgress to false
-6. Upgrade VCH
-7. Run vic-machine inspect to check the upgrade status of the VCH (this should run in parallel with step 6)
-8. After step 3 finishes, run step 4 again.
-
-# Expected Outcome:
-* In step 4, output should contain "Upgrade failed: another upgrade/configure operation is in progress"
-* In step 5, output should contain "Reset UpdateInProgress flag successfully"
-* In step 6, output should contain "Completed successfully"
-* In step 7, output should contain "Upgrade/configure in progress"
-* In step 8, output should not contain "Upgrade/configure in progress"
-
-# Possible Problems:
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.robot
deleted file mode 100644
index 73d6f9b7c9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-04-Upgrade-UpdateInProgress.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-04 - Upgrade-UpdateInProgress
-Suite Setup  Install VIC with version to Test Server  7315
-Suite Teardown  Clean up VIC Appliance And Local Binary
-Resource  ../../resources/Util.robot
-
-*** Test Cases ***
-Upgrade VCH with UpdateInProgress
-    Run  govc vm.change -vm=%{VCH-NAME} -e=UpdateInProgress=true
-    Check UpdateInProgress  true
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Upgrade failed: another upgrade/configure operation is in progress
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux upgrade --reset-progress --name=%{VCH-NAME} --target=%{TEST_URL} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --force=true --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Reset UpdateInProgress flag successfully
-    Check UpdateInProgress  false
-
-Upgrade and inspect VCH
-    Start Process  bin/vic-machine-linux upgrade --debug 1 --name %{VCH-NAME} --target %{TEST_URL} --user %{TEST_USERNAME} --password %{TEST_PASSWORD} --force --compute-resource %{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}  shell=True  alias=UpgradeVCH
-    Wait Until Keyword Succeeds  20x  5s  Inspect VCH   Upgrade/configure in progress
-    Wait For Process  UpgradeVCH
-    Inspect VCH  Completed successfully
-    Check UpdateInProgress  false
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.md
deleted file mode 100644
index 841eb72e72..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 11-05 - Configure
-=======
-
-# Purpose:
-To verify vic-machine configure can upgrade with --upgrade specified
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download vic_7315.tar.gz from gcp
-2. Deploy VIC 7315 to vsphere server
-3. Using latest version vic-machine to configure this VCH
-
-# Expected Outcome:
-* Step 3 should get expected error
-
-# Possible Problems:
-* This suite may fail when run locally due to a `vic-machine upgrade` issue. Since `vic-machine` checks the build number of its binary to determine upgrade status and a locally-built `vic-machine` binary may not have the `BUILD_NUMBER` set correctly, `vic-machine upgrade` may fail with the message `foo-VCH has same or newer version x than installer version y. No upgrade is available.` To resolve this, follow these steps:
-  * Set `BUILD_NUMBER` to a high number at the top of the `Makefile` - `BUILD_NUMBER ?= 9999999999`
-  * Re-build binaries - `sudo make distclean && sudo make clean && sudo make all`
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.robot
deleted file mode 100644
index 94f7e69209..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/11-05-Configure.robot
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 11-05 - Configure
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC with version to Test Server  7315
-Suite Teardown  Clean up VIC Appliance And Local Binary
-
-*** Test Cases ***
-Configure VCH with new vic-machine
-    ${ret}=  Run  bin/vic-machine-linux configure --target %{TEST_URL} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --http-proxy http://proxy.vmware.com:3128
-    Should Not Contain  ${ret}  Completed successfully
-    Should Contain  ${ret}  configure failed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/TestCases.md
deleted file mode 100644
index 8ae43e80e5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group11-Upgrade/TestCases.md
+++ /dev/null
@@ -1,9 +0,0 @@
-Group 11 - Upgrade
-=======
-
-
-[Test 11-01 - Upgrade](11-01-Upgrade.md)
--
-[Test 11-02 - Upgrade Exec](11-02-Upgrade-Exec.md)
--
-[Test 11-03 - Upgrade InsecureRegistry](11-03-Upgrade-InsecureRegistry.md)
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.md
deleted file mode 100644
index ee108cbffa..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.md
+++ /dev/null
@@ -1,17 +0,0 @@
-Test 12-01 - Delete
-=======
-
-# Purpose:
-To verify vic-machine delete can delete VCH created by vic 0.6.0
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Download vic_0.6.0.tar.gz from gcp
-2. Deploy VIC 0.6.0 to vsphere server
-3. Create container
-3. Using latest version vic-machine to delete this VCH
-
-# Expected Outcome:
-* All steps should result in success
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.robot
deleted file mode 100644
index 8a581bcc2d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/12-01-Delete.robot
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 12-01 - Delete
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC 0.6.0 to Test Server
-Test Teardown  Run Keyword If Test Failed  Clean up VIC Appliance And Local Binary
-
-*** Keywords ***
-Clean up VIC Appliance And Local Binary
-    Cleanup VIC Appliance On Test Server
-    Run  rm -rf vic.tar.gz vic
-
-Install VIC 0.6.0 to Test Server
-    Log To Console  \nDownloading vic 4890 from gcp...
-    ${rc}  ${output}=  Run And Return Rc And Output  wget https://storage.googleapis.com/vic-engine-builds/vic_4890.tar.gz -O vic.tar.gz
-    ${rc}  ${output}=  Run And Return Rc And Output  tar zxvf vic.tar.gz
-    Set Test Environment Variables
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run  ./vic/vic-machine-linux create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=./vic/appliance.iso --bootstrap-iso=./vic/bootstrap.iso --password=%{TEST_PASSWORD} --bridge-network=%{BRIDGE_NETWORK} --external-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Installer completed successfully
-    Get 0.6.0 VIC Docker Params  ${output}  false
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-Get 0.6.0 VIC Docker Params
-    # Get VCH docker params e.g. "-H 192.168.218.181:2376 --tls"
-    [Arguments]  ${output}  ${certs}
-    @{output}=  Split To Lines  ${output}
-    :FOR  ${item}  IN  @{output}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  DOCKER_HOST=
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-
-    # Ensure we start from a clean slate with docker env vars
-    Remove Environment Variable  DOCKER_HOST  DOCKER_TLS_VERIFY  DOCKER_CERT_PATH
-
-    # Split the log log into pieces, discarding the initial log decoration, and assign to env vars
-    ${logdeco}  ${vars}=  Split String  ${line}  ${SPACE}  1
-    ${vars}=  Split String  ${vars}
-    :FOR  ${var}  IN  @{vars}
-    \   ${varname}  ${varval}=  Split String  ${var}  =
-    \   Set Environment Variable  ${varname}  ${varval}
-
-    ${dockerHost}=  Get Environment Variable  DOCKER_HOST
-
-    @{hostParts}=  Split String  ${dockerHost}  :
-    ${ip}=  Strip String  @{hostParts}[0]
-    ${port}=  Strip String  @{hostParts}[1]
-    Set Environment Variable  VCH-IP  ${ip}
-    Set Environment Variable  VCH-PORT  ${port}
-
-    ${proto}=  Set Variable If  ${port} == 2376  "https"  "http"
-    Set Suite Variable  ${proto}
-
-    Run Keyword If  ${port} == 2376  Set Environment Variable  VCH-PARAMS  -H ${dockerHost} --tls
-    Run Keyword If  ${port} == 2375  Set Environment Variable  VCH-PARAMS  -H ${dockerHost}
-
-
-    :FOR  ${index}  ${item}  IN ENUMERATE  @{output}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  http
-    \   Run Keyword If  '${status}' == 'PASS'  Set Suite Variable  ${line}  ${item}
-    \   ${status}  ${message}=  Run Keyword And Ignore Error  Should Contain  ${item}  Published ports can be reached at
-    \   ${idx} =  Evaluate  ${index} + 1
-    \   Run Keyword If  '${status}' == 'PASS'  Set Environment Variable  EXT-IP  @{output}[${idx}]
-
-*** Test Cases ***
-Delete VCH with new vic-machine
-    Log To Console  \nRunning docker pull busybox...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} pull busybox
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${name}=  Generate Random String  15
-    ${rc}  ${container-id}=  Run And Return Rc And Output  docker1.11 %{VCH-PARAMS} create --name ${name} busybox /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${container-id}  Error
-    Set Suite Variable  ${containerName}  ${name}
-
-    # Get VCH uuid and container VM uuid, to check if resources are removed correctly
-    Run Keyword And Ignore Error  Gather Logs From Test Server
-    ${uuid}=  Run  govc vm.info -json\=true %{VCH-NAME} | jq -r '.VirtualMachines[0].Config.Uuid'
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME}
-    Should Contain  ${ret}  is different than installer version
-
-    # Delete with force
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --force
-    Should Contain  ${ret}  Completed successfully
-    Should Not Contain  ${ret}  delete failed
-
-    # Check VM is removed
-    ${ret}=  Run  govc vm.info -json=true ${containerName}-*
-    Should Contain  ${ret}  {"VirtualMachines":null}
-    ${ret}=  Run  govc vm.info -json=true %{VCH-NAME}
-    Should Contain  ${ret}  {"VirtualMachines":null}
-
-    # Check resource pool is removed
-    ${ret}=  Run  govc pool.info -json=true host/*/Resources/%{VCH-NAME}
-	Should Contain  ${ret}  {"ResourcePools":null}
-    Run  rm -rf vic.tar.gz vic
-
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/TestCases.md
deleted file mode 100644
index d15b1b3543..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group12-VCH-BC/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 12 - vic-machine Backward Compatibility
-=======
-
-
-[Test 12-01 - BC](12-01-Delete.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.md
deleted file mode 100644
index 60fca634eb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.md
+++ /dev/null
@@ -1,21 +0,0 @@
-Test 13-01 - GuestFullName
-=======
-
-#Purpose:
-To verify that VIC-Machine and VIC creates VMs with a custom guest name for OS.
-
-#Environment:
-This test requires that a vSphere server is running and available.
-
-#Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Issue a GOVC command to get the guest name for the VIC appliance VM
-3. Issue a docker create busybox
-4. Issue a GOVC command to get the guest name for the container VM
-
-#Expected Outcome:
-* Step 2 should result in an output where 'Guest name' contains 'Photon - VCH'
-* Step 4 should result in an output where 'Guest name' contains 'Photon - Container'
-
-#Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.robot
deleted file mode 100644
index 504ab472ac..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group13-VAC/13-01-VAC-GuestFullName.robot
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 13-01 - Guest Full Name
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Check VCH VM Guest Operating System
-    ${rc}  ${output}=  Run And return Rc and Output  govc vm.info %{VCH-NAME} | grep 'Guest name'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Photon - VCH
-
-Create a test container and check Guest Operating System
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name test ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${shortID}=  Get container shortID  ${id}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info test-${shortID} | grep 'Guest name'
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Photon - Container
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.md
deleted file mode 100644
index a30a6b3ad5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.md
+++ /dev/null
@@ -1,29 +0,0 @@
-Test 2-01 - Docker Archive
-=======
-
-# Purpose:
-Get image tar file from debug PL and docker hub, and compare each file's digest inside of the tar and also tar file digest, to get exactly same tar file content in VIC with docker.
-
-# References:
-imagec -h
-
-# Environment:
-This test requires that a debug = 3 VIC appliance is available to execute the docker integration tests against
-
-# Test Steps:
-1. Deploy VIC appliance with debug = 3 to a test server
-2. Issue docker pull command to pull image ubuntu to VCH
-3. Issue imagec pull command to download image ubuntu layers tar from docker hub, which will store docker image layers to local file system
-4. Issue imagec save command to download image ubuntu tar files from PL, which will store VIC image layers to local file system
-5. Compare tar file content through tar -tvf
-6. untar tar files, and compare each file digest
-7. compare tar file digest
-
-# Expected Outcome:
-1. Steps 1~4 should succeed
-2. Step 5 should get equal file content
-3. Step 6 should get equal file digest
-4. Step 7 should get equal digest - TODO: add this test after we got tar file digest parity
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.robot
deleted file mode 100644
index 962111a000..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/2-01-Docker-Archive.robot
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 2-01 - Docker Archive
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  debug=3
-Suite Teardown  Cleanup VIC Appliance Together With tmp dir
-
-*** Keywords ***
-Cleanup VIC Appliance Together With tmp dir 
-    Cleanup VIC Appliance On Test Server
-    Run  rm -rf /tmp/compare
-    Run  rm -rf /tmp/pull
-    Run  rm -rf /tmp/save
-
-Compare Tar File Content
-    [Arguments]  ${image}  ${tarA}  ${tarB}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  tar -tvf ${tarA} > /tmp/compare/${image}/a
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${output}
-    ${out}=  Run  cat /tmp/compare/${image}/a
-    Log  ${out}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  tar -tvf ${tarB} > /tmp/compare/${image}/b
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Empty  ${output}
-    ${out}=  Run  cat /tmp/compare/${image}/b
-    Log  ${out}
-
-    ${status}=  Get State Of Github Issue  5997
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 2-01-Docker-Archive.robot needs to be updated now that Issue #5997 has been resolved
-    #${rc}  ${output}=  Run And Return Rc And Output  diff /tmp/compare/${image}/a /tmp/compare/${image}/b
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-    #Should Be Empty  ${output}
-
-Compare Files Digest in Tar
-    [Arguments]  ${image}  ${tarA}  ${tarB}
-
-    Run  mkdir -p /tmp/compare/${image}/fileA
-    Run  mkdir -p /tmp/compare/${image}/fileB
-    ${rc}  ${output}=  Run And Return Rc And Output  tar -xvf ${tarA} -C /tmp/compare/${image}/fileA
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  tar -xvf ${tarB} -C /tmp/compare/${image}/fileB
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${out}=  Run  find /tmp/compare/${image}/fileA -type f
-    ${files}=  Split To Lines  ${out}
-    :FOR  ${fileA}  IN  @{files}
-    \   ${fileB}=  Replace String  ${fileA}  /tmp/compare/${image}/fileA  /tmp/compare/${image}/fileB
-    \   Log  ${fileB}
-    \   ${rc}  ${output}=  Run And Return Rc And Output  sha256sum ${fileA}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   ${digestA}=  Split String  ${output}
-    \   ${rc}  ${output}=  Run And Return Rc And Output  sha256sum ${fileB}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   ${digestB}=  Split String  ${output}
-    \   Should Be Equal As Strings  @{digestA}[0]  @{digestB}[0]
-
-Archive Download
-    [Arguments]  ${image}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${image}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/imagec -insecure-skip-verify -reference ${image} -destination /tmp/pull/${image} -standalone -debug -operation pull
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${imagestore}=  Run  govc datastore.ls %{VCH-NAME}/VIC/
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/imagec -insecure-skip-verify -reference ${image} -destination /tmp/save/${image} -standalone -debug -operation save -host %{VCH-IP}:2380 -image-store ${imagestore}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compare Images 
-    [Arguments]  ${image}
-
-    ${out}=  Run  find /tmp/pull/${image} -name *.tar
-    ${files}=  Split To Lines  ${out}
-    Run  mkdir -p /tmp/compare/${image}
-    :FOR  ${pullfile}  IN  @{files}
-    \   ${pullbase}=  Run  basename ${pullfile}
-    \   ${rc}  ${savefile}=  Run And Return Rc And Output  find /tmp/save/${image} -name ${pullbase}
-    \   Should Be Equal As Integers  ${rc}  0
-    \   Compare Tar File Content  ${image}  ${pullfile}  ${savefile}
-    \   Compare Files Digest in Tar  ${image}  ${pullfile}  ${savefile}
-# TODO: compare tar file digest here
-
-*** Test Cases *** 
-Compare Busybox Image Archive
-    Archive Download  ${busybox}
-    Compare Images  ${busybox}
-
-Compare Ubuntu Image Archive
-    Archive Download  ${ubuntu}
-    Compare Images  ${ubuntu}
-
-Compare Postgres Image Archive
-    ${status}=  Get State Of Github Issue  6059
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 2-01-Docker-Archive.robot needs to be updated now that Issue #6059 has been resolved
-    #Archive Download  postgres:9.4
-    #Compare Images  postgres:9.4
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/TestCases.md
deleted file mode 100644
index 64b65d901c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group2-Docker-Archive/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 2 - Docker Archive
-=======
-
-
-[Test 2-01 - Docker Archive](2-01-Docker-Archive.md)
--
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.md
deleted file mode 100644
index 0ab64364b8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 22-01 - nginx
-=======
-
-# Purpose:
-To verify that the nginx application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub nginx Official Repository](https://hub.docker.com/_/nginx/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run an nginx container in the background and verify the server is up and running:  
-`docker run --name nginx1 -d nginx`
-3. Run an nginx container in the background with a mapped port:  
-`docker run --name nginx2 -d -p 8080:80 nginx`
-4. Run an nginx container in the background with a mapped content folder from a volume:  
-`docker run --name nginx3 -v /some/content:/usr/share/nginx/html:ro -d nginx`
-
-# Expected Outcome:
-* Each step should succeed, nginx should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.robot
deleted file mode 100644
index 0891738471..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-01-nginx.robot
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-01 - nginx
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Curl nginx endpoint
-    [Arguments]  ${endpoint}
-    ${rc}  ${output}=  Run And Return Rc And Output  curl ${endpoint}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${output}
-
-*** Test Cases ***
-Simple background nginx
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name nginx1 -d ${nginx}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  nginx1
-    Remove File  index.html*
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} sh -c "wget ${ip} && cat index.html"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Welcome to nginx!
-
-Nginx with port mapping
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name nginx2 -d -p 8080:80 ${nginx}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl nginx endpoint  %{VCH-IP}:8080
-    Should Contain  ${output}  Welcome to nginx!
-
-Nginx with a mapped volume folder
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=vol1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v vol1:/mydata ${busybox} sh -c "echo '<p>HelloWorld</p>' > /mydata/test.html"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name nginx3 -v vol1:/usr/share/nginx/html:ro -d -p 8081:80 ${nginx}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl nginx endpoint  %{VCH-IP}:8081/test.html
-    Should Contain  ${output}  HelloWorld
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.md
deleted file mode 100644
index aa9ed03df7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 22-02 - redis
-=======
-
-# Purpose:
-To verify that the redis application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub redis Official Repository](https://hub.docker.com/_/redis/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a redis container in the background and verify that it is working:  
-`docker run --name some-redis -d redis`
-3. Run a redis client container that connects to the redis server
-4. Run a redis container in the background with appendonly option and verify that it is working:
-`docker run --name some-redis -d redis redis-server --appendonly yes`
-
-# Expected Outcome:
-* Each step should succeed, redis should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.robot
deleted file mode 100644
index eb166ecc02..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-02-redis.robot
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-02 - redis
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Simple background redis
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name redis1 -d ${redis}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  redis1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${redis} sh -c "redis-cli -h ${ip} -p 6379 ping"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  PONG
-
-Redis with appendonly option
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name redis2 -d ${redis} redis-server --appendonly yes
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  redis2
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${redis} sh -c "redis-cli -h ${ip} -p 6379 info"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  redis_mode:standalone
-    Should Contain  ${output}  executable:/data/redis-server
-    
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.md
deleted file mode 100644
index db8a87f8f0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 22-03 - registry
-=======
-
-# Purpose:
-To verify that the registry application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub registry Official Repository](https://hub.docker.com/_/registry/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a registry container in the background and verify that it is working:  
-`docker run -d -p 5000:5000 --restart always --name registry registry:2`
-
-# Expected Outcome:
-* Each step should succeed, registry should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.robot
deleted file mode 100644
index e3a1eb80c7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-03-registry.robot
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-03 - registry
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check docker logs for terms
-    [Arguments]  ${container}  ${terms}
-    ${output}=  Run  docker %{VCH-PARAMS} logs ${container}
-    Should Contain  ${output}  ${terms}
-
-*** Test Cases ***
-Simple background registry
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -p 5000:5000 --restart always --name registry1 registry:2
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  10s  Check docker logs for terms  registry1  listening on [::]:5000
-    # TODO: need push to really verify this application properly
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.md
deleted file mode 100644
index b21d3e9696..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 22-04 - mysql
-=======
-
-# Purpose:
-To verify that the mysql application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub mysql Official Repository](https://hub.docker.com/_/mysql/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a mysql container in the background and verify that it is working:  
-`docker run --name some-mysql -e MYSQL_ROOT_PASSWORD=my-secret-pw -d mysql`
-
-# Expected Outcome:
-* Each step should succeed, mysql should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.robot
deleted file mode 100644
index 4d069f4db4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-04-mysql.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-04 - mysql
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check mysql container
-    [Arguments]  ${ip}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --rm mysql sh -c 'mysql -h${ip} -P3306 -uroot -ppassword1 -e "show databases;"'
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  information_schema
-    Should Contain  ${output}  performance_schema
-
-*** Test Cases ***
-Simple background mysql
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name mysql1 -e MYSQL_ROOT_PASSWORD=password1 -d mysql
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  mysql1
-    Wait Until Keyword Succeeds  5x  6s  Check mysql container  ${ip}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.md
deleted file mode 100644
index 61f6e41f77..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 22-05 - mongo
-=======
-
-# Purpose:
-To verify that the mongo application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub mongo Official Repository](https://hub.docker.com/_/mongo/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a mongo container in the background and verify that it is working:  
-`docker run --name mongo1 -d mongo`
-
-# Expected Outcome:
-* Each step should succeed, mongo should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot
deleted file mode 100644
index 2fed996400..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-05-mongo.robot
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-05 - mongo
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check mongo container
-    [Arguments]  ${ip}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --rm mongo sh -c 'mongo "${ip}/27017" --quiet --eval "db.adminCommand( { listDatabases: 1 } )"'
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  "name" : "admin"
-    Should Contain  ${output}  "name" : "local"
-
-*** Test Cases ***
-Simple background mongo
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name mongo1 -d mongo
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  mongo1
-    Wait Until Keyword Succeeds  5x  6s  Check mongo container  ${ip}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.md
deleted file mode 100644
index d276c2e0bc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 22-06 - postgres
-=======
-
-# Purpose:
-To verify that the postgres application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub postgres Official Repository](https://hub.docker.com/_/postgres/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a mysql container in the background and verify that it is working:  
-`docker run --name postgres1 -e POSTGRES_PASSWORD=password1 -d postgres`
-
-# Expected Outcome:
-* Each step should succeed, postgres should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.robot
deleted file mode 100644
index 4763e9fe69..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-06-postgres.robot
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-06 - postgres
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check postgres container
-    [Arguments]  ${ip}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --rm postgres sh -c 'PGPASSWORD=password1 psql -h${ip} -Upostgres -c "\\l"'
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  postgres
-    Should Contain  ${output}  template0
-    Should Contain  ${output}  template1
-
-*** Test Cases ***
-Simple background postgres
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name postgres1 -e POSTGRES_PASSWORD=password1 -d postgres
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  postgres1
-    Wait Until Keyword Succeeds  5x  6s  Check postgres container  ${ip}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.md
deleted file mode 100644
index 5ef4cda4d6..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.md
+++ /dev/null
@@ -1,28 +0,0 @@
-Test 22-07 - elasticsearch
-=======
-
-# Purpose:
-To verify that the elasticsearch application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub elasticsearch Official Repository](https://hub.docker.com/_/elasticsearch/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run an elasticsearch container in the background and verify that it is working:  
-`docker run -d elasticsearch`
-3. Run an elasticsearch container in the background with additional flags passed to elasticsearch:  
-`docker run -d elasticsearch -Des.node.name="TestNode"`
-4. Run an elasticsearch container in the background with a custom config folder passed in:   
-`docker run -d -v "$PWD/config":/usr/share/elasticsearch/config elasticsearch`
-5. Run an elasticsearch container in the background with a persisted data volume:  
-`docker run -d -v "$PWD/esdata":/usr/share/elasticsearch/data elasticsearch`
-
-# Expected Outcome:
-* Each step should succeed, elasticsearch should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.robot
deleted file mode 100644
index bd66239a0d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-07-elasticsearch.robot
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-07 - elasticsearch
-Resource  ../../resources/Util.robot
-#Suite Setup  Install VIC Appliance To Test Server
-#Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Simple background elasticsearch
-    ${status}=  Get State Of Github Issue  3624
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-07-elasticsearch.robot needs to be updated now that Issue #3624 has been resolved
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name es1 -d elasticsearch
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-    #${ip}=  Get IP Address of Container  es1
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.md
deleted file mode 100644
index 80a0b45d92..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 22-08 - node
-=======
-
-# Purpose:
-To verify that the node application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub node Official Repository](https://hub.docker.com/_/node/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Create a simple node application with a package.json and server.js file copied into the container
-3. Run the simple node application in the background and verify that it is working:  
-`docker run -p 8080:8080 -d node`
-
-# Expected Outcome:
-* Each step should succeed, node should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.robot
deleted file mode 100644
index a2891268d8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-08-node.robot
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-08 - node
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Variables ***
-${package}  '{"name": "docker_web_app","version": "1.0.0","description": "Node.js on Docker","author": "VMware VIC <vic@vmware.com>","main": "server.js","scripts": {"start": "node server.js"},"dependencies": {"express": "^4.13.3"}}'
-${server}  "'use strict';const express = require('express');const app = express();app.get('/', (req, res) => {res.send('Hello world');});app.listen('8080', '0.0.0.0');console.log('Running on http://0.0.0.0:8080');"
-
-*** Keywords ***
-Check node container
-    [Arguments]  ${ip}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} wget -O- ${ip}:8080
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Hello world
-
-*** Test Cases ***
-Simple background node application
-    Create Directory  app
-    Run  echo ${package} > app/package.json
-    Run  echo ${server} > app/server.js
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=vol1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name copier -v vol1:/mydata ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp app copier:/mydata
-    Should Be Equal As Integers  ${rc}  0
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name node1 -v vol1:/usr/src -d node sh -c "cd /usr/src/app && npm install && npm start"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  node1
-    
-    Wait Until Keyword Succeeds  10x  12s  Check node container  ${ip}
-    
-    [Teardown]  Remove Directory  app  recursive=${true}
-
-Simple background node application on alpine
-    Create Directory  app
-    Run  echo ${package} > app/package.json
-    Run  echo ${server} > app/server.js
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=vol2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name copier2 -v vol2:/mydata ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} cp app copier2:/mydata
-    Should Be Equal As Integers  ${rc}  0
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name node2 -v vol2:/usr/src -d node:alpine sh -c "cd /usr/src/app && npm install && npm start"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${ip}=  Get IP Address of Container  node2
-    
-    Wait Until Keyword Succeeds  10x  12s  Check node container  ${ip}
-    
-    [Teardown]  Remove Directory  app  recursive=${true}
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.md
deleted file mode 100644
index 7cdeaeaa03..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 22-09 - httpd
-=======
-
-# Purpose:
-To verify that the httpd application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub httpd Official Repository](https://hub.docker.com/_/httpd/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run an httpd container in the background and verify the server is up and running:  
-`docker run -dit --name httpd1 -v "$PWD":/usr/local/apache2/htdocs/ httpd:2.4`
-
-# Expected Outcome:
-* Each step should succeed, httpd should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.robot
deleted file mode 100644
index 99ae84fd7b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-09-httpd.robot
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-09 - httpd
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Curl httpd endpoint
-    [Arguments]  ${endpoint}
-    ${rc}  ${output}=  Run And Return Rc And Output  curl ${endpoint}
-    Should Be Equal As Integers  ${rc}  0
-    [Return]  ${output}
-
-*** Test Cases ***
-Httpd with a mapped volume folder
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=vol1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -v vol1:/mydata ${busybox} sh -c "echo '<p>HelloWorld</p>' > /mydata/test.html"
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --name httpd1 -v vol1:/usr/local/apache2/htdocs/ -p 8080:80 httpd:2.4
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Get IP Address of Container  httpd1
-
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl httpd endpoint  %{VCH-IP}:8080/test.html
-    Should Contain  ${output}  HelloWorld
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.md
deleted file mode 100644
index acc23642a0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 22-10 - logstash
-=======
-
-# Purpose:
-To verify that the logstash application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub logstash Official Repository](https://hub.docker.com/_/logstash/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a logstash container in the background with input and output mapped to stdin/stdout:  
-`docker run -dit logstash -e 'input { stdin { } } output { stdout { } }'`
-3. Run a logstash container in the background with input mapped to a log file on a volume:
-`docker run -dit -v vol1:/logs logstash -e 'input { file { path => "/logs/my.log" start_position => "beginning" } } output { stdout { } }'`
-
-# Expected Outcome:
-* Each step should succeed, logstash should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.robot
deleted file mode 100644
index 7186b40ee0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-10-logstash.robot
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-10 - logstash
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check logstash logs
-    [Arguments]  ${container}  ${message}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs ${container} 
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${message}
-
-*** Test Cases ***
-Logstash with stdin and stdout mapped
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name log1 -dit logstash -e 'input { stdin { } } output { stdout { } }'
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  6s  Check logstash logs  log1  Successfully started Logstash API endpoint
-
-Logstash with mapped volume log file
-    ${status}=  Get State Of Github Issue  6386
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-10-logstash.robot needs to be updated now that Issue #6384 has been resolved
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create --name=vol1
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --rm -v vol1:/mydata ${busybox} sh -c "echo 'Initial log message' > /mydata/my.log"
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name log2 -dit -v vol1:/logs logstash -e 'input { file { path => "/logs/my.log" start_position => "beginning" } } output { stdout { } }'
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-    #Wait Until Keyword Succeeds  10x  6s  Check logstash logs  log2  Initial log message
-
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --rm -v vol1:/mydata ${busybox} sh -c "echo 'Another exciting log message' >> /mydata/my.log"
-    #Should Be Equal As Integers  ${rc}  0
-    #Wait Until Keyword Succeeds  10x  6s  Check logstash logs  log2  Another exciting log message
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.md
deleted file mode 100644
index 4d46079ff0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 22-11 - memcached
-=======
-
-# Purpose:
-To verify that the memcached application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub memcached Official Repository](https://hub.docker.com/_/memcached/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a standard memcached container in the background:  
-`docker run --name my-memcache -d memcached`
-3. Run a memcached container in the background with additional memory:
-`docker run --name my-memcache2 -d memcached memcached -m 64`
-
-# Expected Outcome:
-* Each step should succeed, memcached should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.robot
deleted file mode 100644
index 6a657dd048..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-11-memcached.robot
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-11 - memcache
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check memcache status
-    [Arguments]  ${port}
-    ${result}=  Run Process  echo 'stats' | nc -q 3 %{VCH-IP} ${port}  shell=True
-    Should Be Equal As Integers  ${result.rc}  0
-    Should Contain  ${result.stdout}  STAT pid
-    Should Contain  ${result.stdout}  STAT time_in_listen_disabled_us 0
-    Should Contain  ${result.stdout}  STAT lru_bumps_dropped 0
-
-*** Test Cases ***
-Standard memcache container in background
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name my-memcache -d -p 11211:11211 memcached
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    Wait Until Keyword Succeeds  10x  6s  Check memcache status  11211
-
-Memcache container with additional memory
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name my-memcache2 -d -p 11212:11211 memcached memcached -m 64
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    Wait Until Keyword Succeeds  10x  6s  Check memcache status  11212
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.md
deleted file mode 100644
index 8ffa9c94dd..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 22-12 - centos
-=======
-
-# Purpose:
-To verify that the centos application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub centos Official Repository](https://hub.docker.com/_/centos/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Run a latest centos container:  
-`docker run centos:latest yum update`
-3. Run a centos:6 container:  
-`docker run centos:6 yum update`
-
-# Expected Outcome:
-* Each step should succeed, centos should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot
deleted file mode 100644
index f7199fb5aa..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-12-centos.robot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-12 - centos
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Latest centos container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run centos yum list
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Loaded plugins: fastestmirror, ovl
-    Should Contain  ${output}  yum-plugin-versionlock.noarch
-
-Centos:6 container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run centos:6 yum list
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Loaded plugins: fastestmirror, ovl
-    Should Contain  ${output}  yum-plugin-versionlock.noarch
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.md
deleted file mode 100644
index ca9d7f9495..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 22-13 - consul
-=======
-
-# Purpose:
-To verify that the consul application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub consul Official Repository](https://hub.docker.com/_/consul/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Start a basic consul application container:
-`docker run -d --name=dev-consul consul`
-3. Start two consul agent containers linked to the server:
-`docker run -d consul agent -dev -join=172.17.0.2`
-4. Query the server for the members and verify that the agents have joined successfully:
-`docker exec -t dev-consul consul members`
-
-# Expected Outcome:
-* Each step should succeed, consul should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.robot
deleted file mode 100644
index c8a8f9464c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-13-consul.robot
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-13 - consul
-Resource  ../../resources/Util.robot
-#Suite Setup  Install VIC Appliance To Test Server
-#Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check consul members
-    [Arguments]  ${server}  ${count}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} exec -t ${server} consul members
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain X Times  ${output}  alive  ${count}
-
-*** Test Cases ***
-Multi-agent consul topology
-    ${status}=  Get State Of Github Issue  6393
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-13-consul.robot needs to be updated now that Issue #6393 has been resolved
-    ${status}=  Get State Of Github Issue  6394
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-13-consul.robot needs to be updated now that Issue #6394 has been resolved
-    ${status}=  Get State Of Github Issue  6395
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-13-consul.robot needs to be updated now that Issue #6395 has been resolved
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --name=dev-consul -e CONSUL_BIND_INTERFACE=eth0 consul
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-    #${ip}=  Get IP Address of Container  dev-consul
-
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -e CONSUL_BIND_INTERFACE=eth0 consul agent -dev -join=${ip}
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d -e CONSUL_BIND_INTERFACE=eth0 consul agent -dev -join=${ip}
-    #Log  ${output}
-    #Should Be Equal As Integers  ${rc}  0
-
-    #Wait Until Keyword Succeeds  10x  6s  Check consul members  dev-consul  3
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.md
deleted file mode 100644
index d5324f7427..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 22-14 - wordpress
-=======
-
-# Purpose:
-To verify that the wordpress application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub wordpress Official Repository](https://hub.docker.com/_/wordpress/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Start a mysql db container:
-`docker run --name mysql1 -e MYSQL_ROOT_PASSWORD=password1 -d mysql`
-3. Start a wordpress container linked to the mysql container:
-`docker run --name wordpress1 --link mysql1:mysql -d wordpress`
-4. Start a wordpress container linked to the mysql container and with published ports:
-`docker run --name wordpress2 --link mysql1:mysql -p 8080:80 -d wordpress`
-
-# Expected Outcome:
-* Each step should succeed, wordpress should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.robot
deleted file mode 100644
index cba3010cc3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-14-wordpress.robot
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-14 - wordpress
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Check wordpress container
-    [Arguments]  ${url}
-    Remove File  index.html*
-    ${output}=  Run  wget ${url} && cat index.html
-    Should Contain  ${output}  <title>WordPress &rsaquo; Setup Configuration File</title>
-
-*** Test Cases ***
-Simple wordpress container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name mysql1 -e MYSQL_ROOT_PASSWORD=password1 -d mysql
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name wordpress1 --link mysql1:mysql -d wordpress
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Get IP Address of Container  wordpress1
-    Remove File  index.html*
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run ${busybox} sh -c "wget ${ip} && cat index.html"
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  <title>WordPress &rsaquo; Setup Configuration File</title>
-
-Wordpress container with published ports
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name wordpress2 --link mysql1:mysql -p 8080:80 -d wordpress
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    Wait Until Keyword Succeeds  10x  6s  Check wordpress container  %{VCH-IP}:8080
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.md
deleted file mode 100644
index 852d66507e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.md
+++ /dev/null
@@ -1,26 +0,0 @@
-Test 22-15 - swarm
-=======
-
-# Purpose:
-To verify that the swarm application on docker hub works as expected on VIC
-
-# References:
-[1 - Docker Hub swarm Official Repository](https://hub.docker.com/_/wordpress/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Create an initial swarm cluster:
-`docker run --rm swarm create`
-3. Create 2 swarm nodes:
-`docker run -d swarm join --addr=<node_ip:2375> token://<cluster_id>`
-4. Start the swarm manager:
-`docker run -t -p <swarm_port>:2375 -t swarm manage token://<cluster_id>`
-
-# Expected Outcome:
-* Each step should succeed, swarm should be running without error in each case
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.robot
deleted file mode 100644
index 4bb5ed3189..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/22-15-swarm.robot
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 22-15 - swarm
-Resource  ../../resources/Util.robot
-#Suite Setup  Install VIC Appliance To Test Server
-#Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Create a docker swarm
-    ${status}=  Get State Of Github Issue  6396
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 22-15-swarm.robot needs to be updated now that Issue #6396 has been resolved
-
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull swarm
-#    Should Be Equal As Integers  ${rc}  0
-
-#    ${rc}  ${cluster}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --rm swarm create
-#    Log  ${cluster}
-#    Should Be Equal As Integers  ${rc}  0
-
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d swarm join --addr=172.16.0.20:2375 token://${cluster}
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d swarm join --addr=172.16.0.21:2375 token://${cluster}
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d swarm join --addr=172.16.0.22:2375 token://${cluster}
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
-
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -t -p 2380:2375 -d swarm manage token://${cluster}
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
-
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-IP}:2380 info
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
-
-#    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-IP}:2380 run busybox ls
-#    Log  ${output}
-#    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/TestCases.md
deleted file mode 100644
index 2f5bd699e1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group22-Docker-Apps/TestCases.md
+++ /dev/null
@@ -1,34 +0,0 @@
-Group 22 - Docker Apps
-=======
-
-
-[Test 22-01 - nginx](22-01-nginx.md)
--
-[Test 22-02 - redis](22-02-redis.md)
--
-[Test 22-03 - registry](22-03-registry.md)
--
-[Test 22-04 - mysql](22-04-mysql.md)
--
-[Test 22-05 - mongo](22-05-mongo.md)
--
-[Test 22-06 - postgres](22-06-postgres.md)
--
-[Test 22-07 - elasticsearch](22-07-elasticsearch.md)
--
-[Test 22-08 - node](22-08-node.md)
--
-[Test 22-09 - httpd](22-09-httpd.md)
--
-[Test 22-10 - logstash](22-10-logstash.md)
--
-[Test 22-11 - memcached](22-11-memcached.md)
--
-[Test 22-12 - centos](22-12-centos.md)
--
-[Test 22-13 - consul](22-13-consul.md)
--
-[Test 22-14 - wordpress](22-14-wordpress.md)
--
-[Test 22-15 - swarm](22-15-swarm.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md
deleted file mode 100644
index 8cd2c4dfc7..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 3-01 - Docker Compose LEMP Server
-=======
-
-# Purpose:
-To verify that VIC appliance can work when deploying a LEMP (Linux, Nginx, MySQL, PHP) server
-
-# References:
-[1 - Docker Compose Overview](https://docs.docker.com/compose/overview/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create a compose file that includes an Nginx, MySQL and PHP server with network connections between them
-2. Deploy VIC appliance to the vSphere server
-3. Issue:  
-```DOCKER_HOST=<VCH IP> docker-compose up```
-4. wget the index file of the site and verify that it contains the default Nginx message
-
-# Expected Outcome:
-* Docker compose should return with success and the Nginx server should be running.
-* The wget command should successfully return the default Nginx index file.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot
deleted file mode 100644
index 973eb2df80..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-01-Docker-Compose-LEMP.robot
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 3-01 - Docker Compose LEMP
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${True}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Compose LEMP Server
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login --username=victest --password=%{REGISTRY_PASSWORD}
-    Should Be Equal As Integers  ${rc}  0
-
-    Set Environment Variable  COMPOSE_HTTP_TIMEOUT  300
-
-    ${vch_ip}=  Get Environment Variable  VCH_IP  %{VCH-IP}
-    Log To Console  \nThe VCH IP is %{VCH-IP}
-
-    Run  cat ${CURDIR}/../../../demos/compose/webserving-app/docker-compose.yml | sed -e "s/192.168.60.130/${vch_ip}/g" > lemp-compose.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file lemp-compose.yml up -d
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md
deleted file mode 100644
index c6fd7e1559..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.md
+++ /dev/null
@@ -1,25 +0,0 @@
-Test 3-02 - Docker Compose Voting App
-=======
-
-# Purpose:
-To verify that VIC appliance can work when deploying the example docker voting app
-
-# References:
-[1 - Docker Compose Overview](https://docs.docker.com/compose/overview/)  
-[2 - Docker Example Voting App](https://github.com/docker/example-voting-app)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Log into the docker hub
-3. Issue the following command in the docker voting app folder:  
-```cd demos/compose/voting-app; COMPOSE_HTTP_TIMEOUT=300 DOCKER_HOST=<VCH IP> docker-compose up```
-
-# Expected Outcome:
-Docker compose should return with success and all containers in the compose yaml file are up and running.
-Docker inspect data should show networks, alias, and IP address for the container.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot
deleted file mode 100644
index c96281ffdc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-02-Docker-Compose-Voting-App.robot
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 3-02 - Docker Compose Voting App
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${True}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Compose Voting App
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} login --username=victest --password=%{REGISTRY_PASSWORD}
-    Should Be Equal As Integers  ${rc}  0
-
-    Set Environment Variable  COMPOSE_HTTP_TIMEOUT  300
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --skip-hostname-check -f ${CURDIR}/../../../demos/compose/voting-app/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} vote
-    Log  ${out}
-    Should Contain  ${out}  true
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} result
-    Log  ${out}
-    Should Contain  ${out}  true
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} worker
-    Log  ${out}
-    Should Contain  ${out}  true
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} db
-    Log  ${out}
-    Should Contain  ${out}  true
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f {{.State.Running}} redis
-    Log  ${out}
-    Should Contain  ${out}  true
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range $key, $value := .NetworkSettings.Networks}}{{$key}}{{end}}' vote
-    Log  ${out}
-    Should Not Be Empty  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range $key, $value := .NetworkSettings.Networks}}{{index $value "Aliases"}}{{end}}' vote
-    Log  ${out}
-    Should Contain  ${out}  vote
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range $key, $value := .NetworkSettings.Networks}}{{index $value "IPAddress"}}{{end}}' vote
-    Log  ${out}
-    Should Not Be Empty  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  wget %{VCH-IP}:5000
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md
deleted file mode 100644
index 4f3dfca31f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.md
+++ /dev/null
@@ -1,40 +0,0 @@
-Test 3-03 - Docker Compose Basic
-=======
-
-# Purpose:
-To verify that VIC appliance can work when deploying the most basic example from docker documentation
-
-# References:
-[1 - Docker Compose Getting Started](https://docs.docker.com/compose/gettingstarted/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create a compose file that includes a basic python server and redis server
-2. Deploy VIC appliance to the vSphere server
-3. Create a basic compose yml file
-4. Issue DOCKER_HOST=<VCH IP> docker-compose create
-5. Issue DOCKER_HOST=<VCH IP> docker-compose start
-6. Issue DOCKER_HOST=<VCH IP> docker-compose logs
-7. Issue DOCKER_HOST=<VCH IP> docker-compose stop
-8. Issue DOCKER_HOST=<VCH IP> docker-compose up -d
-9. Issue DOCKER_HOST=<VCH IP> docker-compose kill redis
-10. Issue DOCKER_HOST=<VCH IP> docker-compose down
-11. Issue DOCKER_HOST=<VCH IP> docker run -d busybox /bin/top
-12. Issue DOCKER_HOST=<VCH IP> docker-compose up -d
-13. Create compose file with link
-14. Issue DOCKER_HOST=<VCH IP> docker-compose up -d
-15. Issue DOCKER_HOST=<VCH IP> docker-compose bundle
-16. Issue DOCKER_HOST=<VCH IP> docker-compose --file compose-rename.yml up -d
-17. Issue DOCKER_HOST=<VCH IP> docker-compose --file compose-rename.yml up -d --force-recreate
-18. Issue DOCKER_HOST=<VCH IP> docker-compose --file compose-rename.yml up -d
-19. Issue DOCKER_HOST=<VCH IP> docker-compose up (without -d)
-20. Issue DOCKER_HOST=<VCH IP> docker-compose stop on the above container
-21. Issue DOCKER_HOST=<VCH IP> docker-compose up (without -d) again
-
-# Expected Outcome:
-* Step 4-21 should result in no errors
-
-# Possible Problems:
-None
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot
deleted file mode 100644
index 17cc3a1e9e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-03-Docker-Compose-Basic.robot
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 3-03 - Docker Compose Basic
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${true}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Variables ***
-${yml}  version: "2"\nservices:\n${SPACE}web:\n${SPACE}${SPACE}image: python:2.7\n${SPACE}${SPACE}ports:\n${SPACE}${SPACE}- "5000:5000"\n${SPACE}${SPACE}depends_on:\n${SPACE}${SPACE}- redis\n${SPACE}redis:\n${SPACE}${SPACE}image: redis\n${SPACE}${SPACE}ports:\n${SPACE}${SPACE}- "5001:5001"
-${link-yml}  version: "2"\nservices:\n${SPACE}redis1:\n${SPACE}${SPACE}image: redis:alpine\n${SPACE}${SPACE}container_name: redis1\n${SPACE}${SPACE}ports: ["6379"]\n${SPACE}web1:\n${SPACE}${SPACE}image: busybox\n${SPACE}${SPACE}container_name: a.b.c\n${SPACE}${SPACE}links:\n${SPACE}${SPACE}- redis1:aaa\n${SPACE}${SPACE}command: ["ping", "aaa"]
-${rename-yml-1}  version: "2"\nservices:\n${SPACE}web:\n${SPACE}${SPACE}image: busybox\n${SPACE}${SPACE}command: ["/bin/top"]
-${rename-yml-2}  version: "2"\nservices:\n${SPACE}web:\n${SPACE}${SPACE}image: ubuntu\n${SPACE}${SPACE}command: ["date"]
-${hello-yml}  version: "2"\nservices:\n${SPACE}top:\n${SPACE}${SPACE}image: busybox\n${SPACE}${SPACE}container_name: top\n${SPACE}${SPACE}command: ["echo", "hello, world"]
-
-*** Keywords ***
-Check Compose Logs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file link-compose.yml logs
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  PING aaa
-    Should Not Contain  ${output}  bad address 'aaa'
-
-*** Test Cases ***
-Compose basic
-    Set Environment Variable  COMPOSE_HTTP_TIMEOUT  300
-
-    Run  echo '${yml}' > basic-compose.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network create vic_default
-    Log  ${output}
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml create
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml start
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml logs
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml stop
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose kill
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f basic-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f basic-compose.yml kill redis
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f basic-compose.yml down
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose Up while another container is running (ps filtering related)
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d busybox /bin/top
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f basic-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml down
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose Up with link
-    Run  echo '${link-yml}' > link-compose.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file link-compose.yml up -d
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  10x  10s  Check Compose Logs
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file link-compose.yml down
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose bundle creation
-    ${rc}  Run And Return Rc  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml pull
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml bundle
-    Log  ${output}
-    Should Contain  ${output}  Wrote bundle
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file basic-compose.yml down
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose up -d --force-recreate
-    Run  echo '${rename-yml-1}' > compose-rename.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file compose-rename.yml up -d
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file compose-rename.yml up -d --force-recreate
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose up -d with a new image
-    Run  echo '${rename-yml-2}' > compose-rename.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file compose-rename.yml up -d   
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} --file compose-rename.yml down
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-Compose up in foreground (attach path)   
-    Run  echo '${hello-yml}' > hello-compose.yml
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f hello-compose.yml pull
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-
-    # Bring up the compose app and wait till they're up and running
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f hello-compose.yml up
-    Log  ${output}
-    Should Contain  ${output}  hello, world
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f hello-compose.yml down
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot
deleted file mode 100644
index b2c51081a1..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/3-04-Docker-Compose-Fixtures.robot
+++ /dev/null
@@ -1,179 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 3-04 - Compose fixtures
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Command
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/command/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/command/docker-compose.yml down
-
-Container Name
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/container_name/docker-compose.yml up
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${out}  my-web-container exited with code 0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/container_name/docker-compose.yml down
-
-Depends On
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/depends_on/docker-compose.yml down
-
-Env File
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/env-file/docker-compose.yml down
-
-Environment
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/environment-composefile/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/environment-composefile/docker-compose.yml down
-
-Extends
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/extends/docker-compose.yml down
-
-Group Add
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/group_add/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/group_add/docker-compose.yml down
-
-Labels
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/labels/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/labels/docker-compose.yml down
-
-Links
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/links-composefile/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/links-composefile/docker-compose.yml down
-
-Networks
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/docker-compose.yml down
-
-Networks- Default
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/default-network-config.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/default-network-config.yml down
-
-Networks- External Default
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} network create composetest_external_network
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-default.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-default.yml down
-
-Networks-Bridge
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/bridge.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/bridge.yml down
-
-Networks-External
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} network create networks_foo
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} network create networks_bar
-    Should Be Equal As Integers  ${rc}  0    
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-networks.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/external-networks.yml down
-
-Networks-Label
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-label.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-label.yml down
-
-Networks-mode
-    ${status}=  Get State Of Github Issue  4541
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-1-Docker-Info.robot needs to be updated now that Issue #4541 has been resolved
-    
-    #${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-mode.yml up -d
-    #Log  ${out}
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-mode.yml down
-
-Networks-static-address
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-static-addresses.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/networks/network-static-addresses.yml down
-
-Ports
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/ports-composefile/docker-compose.yml down
-
-Stop Signal
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/stop-signal-composefile/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/stop-signal-composefile/docker-compose.yml down
-
-Volumes
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/docker-compose.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/docker-compose.yml down
-
-Volumes - External volumes
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} volume create --name foo
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} volume create --name bar
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${out}=  Run And Return Rc And Output  docker %{COMPOSE-PARAMS} volume create --name some_bar
-    Should Be Equal As Integers  ${rc}  0
-    
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/external-volumes.yml up -d
-    Log  ${out}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/external-volumes.yml down
-
-Volumes - Label
-    ${status}=  Get State Of Github Issue  4540
-    Run Keyword If  '${status}' == 'closed'  Fail  Test 1-1-Docker-Info.robot needs to be updated now that Issue #4540 has been resolved
-
-    #${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/volume-label.yml up -d
-    #Log  ${out}
-    #Should Be Equal As Integers  ${rc}  0
-    #${rc}  ${out}=  Run And Return Rc And Output  docker-compose %{COMPOSE-PARAMS} -f %{GOPATH}/src/github.com/vmware/vic/tests/resources/dockerfiles/configs/volumes/volume-label.yml down
-
-
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/TestCases.md
deleted file mode 100644
index 414287c8f4..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group3-Docker-Compose/TestCases.md
+++ /dev/null
@@ -1,10 +0,0 @@
-Group 3 - Docker Compose
-=======
-
-
-[Test 3-01 - Docker Compose LEMP Server](3-01-Docker-Compose-LEMP.md)
--
-[Test 3-02 - Docker Compose Voting App](3-02-Docker-Compose-Voting-App.md)
--
-[Test 3-03 - Docker Compose Basic](3-03-Docker-Compose-Basic.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.md
deleted file mode 100644
index 93008e61c8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.md
+++ /dev/null
@@ -1,24 +0,0 @@
-Test 4-01 - Docker Integration
-=======
-
-# Purpose:
-To verify that the VIC appliance passes the docker integration tests or at least any failure are characterized and well documented.
-
-# References:
-[1 - Docker Integration Tests](https://docs.docker.com/opensource/project/test-and-docs/)
-
-# Environment:
-This test requires that a VIC appliance is available to execute the docker integration tests against
-
-# Test Steps:
-1. Deploy VIC appliance to a test server
-2. Execute the docker integration tests:  
-```
-DOCKER_HOST=tcp://<VIP IP> go test
-```
-
-# Expected Outcome:
-VIC appliance needs to pass enough of the tests and for any failures, they need to be characterized, agreed that they are acceptable, and well documented.
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.robot
deleted file mode 100644
index 01435aa8cf..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/4-01-Docker-Integration.robot
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 4-01 - Docker Integration
-Resource  ../../resources/Util.robot
-#Suite Setup  Install VIC Appliance To Test Server
-#Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases *** 
-Docker Integration Tests
-    [Tags]  docker
-    Log To Console  \nStarting Docker integration tests... NOT EXECUTING NOW.
-    # Currently blocked on issue https://github.com/vmware/vic/issues/2549
-    #Set Environment Variable  GOPATH  /go:/go/src/github.com/docker/docker/vendor
-    #${ip}=  Remove String  %{VCH-PARAMS}  -H
-    #${ip}=  Strip String  ${ip}
-    #Run  go get github.com/docker/docker
-    #${status}  ${out}=  Run Keyword And Ignore Error  Run Process  DOCKER_HOST\=tcp://${ip} go test  shell=True  cwd=/go/src/github.com/docker/docker/integration-cli  timeout=10min  on_timeout=kill
-    #Log  ${out.stdout}
-    #Log  ${out.stderr}
-    #Should Contain  ${out.stdout}  DockerSuite.Test
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/TestCases.md
deleted file mode 100644
index 77b90d229d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group4-Docker-Integration/TestCases.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Group 4 - Docker Integration
-=======
-
-
-[Test 4-01 - Docker Integration](4-01-Docker-Integration.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.md
deleted file mode 100644
index ae7fc8ecfb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.md
+++ /dev/null
@@ -1,22 +0,0 @@
-Test 6-01 - Verify Help
-=======
-
-# Purpose:
-Verify vic-machine delete help
-
-# References:
-* vic-machine-linux delete -h
-
-# Environment:
-Standalone test requires nothing but vic-machine to be built
-
-# Test Cases
-
-## Delete help basic
-1. Issue the following command:
-```
-* vic-machine-linux delete -h
-```
-
-### Expected Outcome:
-* Command should output Usage of vic-machine delete -h:
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.robot
deleted file mode 100644
index 3748112808..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-01-Help.robot
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-01 - Verify Help
-Resource  ../../resources/Util.robot
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Delete help basic
-    ${ret}=  Run  bin/vic-machine-linux delete -h
-    Should Contain  ${ret}  vic-machine-linux delete - Delete VCH
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.md
deleted file mode 100644
index 3718bbdfae..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Test 6-02 - Verify default parameters
-=======
-
-# Purpose:
-Verify vic-machine delete default parameters of compute-resource and name
-
-# References:
-* vic-machine-linux delete -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases
-
-## Delete with defaults
-1. Delete VCH without compute-resource and name specified
-
-### Expected Outcome:
-* Command should fail for resource pool /Resources/virtual-container-host is not found
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.robot
deleted file mode 100644
index c03965b9f8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-02-Default.robot
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-02 - Verify default parameters
-Resource  ../../resources/Util.robot
-Suite Teardown  Run Keyword And Ignore Error  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Should Not Have VMOMI Session
-    [Arguments]  ${thumbprint}
-    ${output}=  Run  govc session.ls | grep vic-machine | grep ${thumbprint} | wc -l
-    Should Be Equal As Integers  ${output}  0
-
-Get Thumbprint From Log
-    [Arguments]  ${output}
-    ${logline}=  Get Lines Containing String  ${output}  Creating VMOMI session with thumbprint
-    Should Not Be Equal As Strings  ${logline}  ${EMPTY}
-    ${thumbprint}=  Evaluate  "${logline}".split()[-1]
-    [Return]  ${thumbprint}
-
-*** Test Cases ***
-Delete with defaults
-    Set Test Environment Variables
-
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Should Contain  ${ret}  vic-machine-linux delete failed:  resource pool
-    Should Contain  ${ret}  /Resources/virtual-container-host' not found
-
-Wrong Password No Panic
-    Set Test Environment Variables
-    ${ret}=  Run  bin/vic-machine-linux create --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux create failed
-    Should Not Contain  ${ret}  panic:
-
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux delete failed
-    Should Not Contain  ${ret}  panic:
-
-    ${ret}=  Run  bin/vic-machine-linux inspect --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux inspect  failed
-    Should Not Contain  ${ret}  panic:
-
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux ls failed
-    Should Not Contain  ${ret}  panic:
-
-    ${ret}=  Run  bin/vic-machine-linux upgrade --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux upgrade failed
-    Should Not Contain  ${ret}  panic:
-
-    ${ret}=  Run  bin/vic-machine-linux configure --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=INCORRECT
-    Should Contain  ${ret}  vic-machine-linux configure failed
-    Should Not Contain  ${ret}  panic:
-
-Check That VMOMI Sessions Don't Leak From VIC Machine
-    Set Test Environment Variables
-    ${output}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --debug=1 --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    ${output}=  Install VIC Appliance To Test Server
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    ${output}=  Run  bin/vic-machine-linux inspect --target %{TEST_URL} --debug=1 --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME}
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    ${output}=  Run  bin/vic-machine-linux upgrade --target %{TEST_URL} --debug=1 --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    # upgrade fails since but that's ok for this test -- it still creates a session before failing
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    ${output}=  Run  bin/vic-machine-linux configure --target %{TEST_URL} --debug=1 --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME}
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    ${output}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --debug=1 --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME}
-    Log  ${output}
-    ${thumbprint}=  Get Thumbprint From Log  ${output}
-    Should Not Have VMOMI Session  ${thumbprint}
-
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.md
deleted file mode 100644
index 3fffb29637..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Test 6-03 - Verify delete clean up all resources
-=======
-
-# Purpose:
-Verify vic-machine delete can delete vch installed by vic-machine create
-
-# References:
-* vic-machine-linux delete -h
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases
-
-## Delete VCH and verify
-1. Create VCH through vic-machine create
-2. Create container
-3. Make sure container VM is powered on
-4. Delete VCH without --force, to get delete failure
-5. Delete VCH with --force, to get delete success
-6. Check vSphere through govc to make sure all resources are deleted correctly
-
-### Expected Outcome:
-* Step 4 should fail for VM is powered on
-* Step 5 should success
-* Step 6 should not find any resources created by vic-machine and VCH
-
-
-## Attach Disks and Delete VM
-1. Create VCH normally
-2. Pull a moderately sized image (ubuntu)
-3. Check to see that disk images exist via govc
-4. Use govc to attach disk images to appliance VM directly
-5. Delete the VCH
-6. Ensure that VCH folder is entirely gone after delete via govc
-
-### Expected Outcome:
-1. All steps should succeed
-2. govc should return 1 when not finding images in step 6
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.robot
deleted file mode 100644
index f17c90479e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-03-Delete.robot
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-03 - Verify delete clean up all resources
-Resource  ../../resources/Util.robot
-Test Setup  Install VIC Appliance To Test Server
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Initial load
-    # Create container VM first
-    Log To Console  \nRunning docker pull ${busybox}...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${name}=  Generate Random String  15
-    ${rc}  ${container-id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --name ${name} ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${container-id}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start ${container-id}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    Set Suite Variable  ${containerName}  ${name}
-
-*** Test Cases ***
-Delete VCH and verify
-    Initial load
-    # Get VCH uuid and container VM uuid, to check if resources are removed correctly
-    Run Keyword And Ignore Error  Gather Logs From Test Server
-    ${uuid}=  Run  govc vm.info -json\=true %{VCH-NAME} | jq -r '.VirtualMachines[0].Config.Uuid'
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME}
-    Should Contain  ${ret}  is powered on
-
-    # Delete with force
-    ${ret}=  Run  bin/vic-machine-linux delete --target %{TEST_URL} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --force
-    Should Contain  ${ret}  Completed successfully
-    Should Not Contain  ${ret}  Operation failed: Error caused by file
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-
-    # Check VM is removed
-    ${ret}=  Run  govc vm.info -json=true ${containerName}-*
-    Should Contain  ${ret}  {"VirtualMachines":null}
-    ${ret}=  Run  govc vm.info -json=true %{VCH-NAME}
-    Should Contain  ${ret}  {"VirtualMachines":null}
-
-    # Check directories is removed
-    ${ret}=  Run  govc datastore.ls VIC/${uuid}
-    Should Contain  ${ret}   was not found
-    ${ret}=  Run  govc datastore.ls %{VCH-NAME}
-    Should Contain  ${ret}   was not found
-    ${ret}=  Run  govc datastore.ls VIC/${containerName}-*
-    Should Contain  ${ret}   was not found
-
-    # Check resource pool is removed
-    ${ret}=  Run  govc pool.info -json=true host/*/Resources/%{VCH-NAME}
-    Should Contain  ${ret}  {"ResourcePools":null}
-
-Attach Disks and Delete VCH
-    # VCH should delete normally during commit/pull/cp/push operations
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${ubuntu}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  govc datastore.ls %{VCH-NAME}/VIC/
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    # iterate through found images and attach them to the appliance VM
-    ${vm-ip}=  Run  govc vm.ip %{VCH-NAME}
-    ${imagedir}=  Run  govc datastore.ls %{VCH-NAME}/VIC/
-    ${images}=  Run  govc datastore.ls %{VCH-NAME}/VIC/${imagedir}/images/ | tr '${\n}' ' '
-    ${rc}  ${output}=  Run And Return Rc And Output  (set -e; for x in ${images}; do echo $x; govc vm.disk.attach -disk=%{VCH-NAME}/VIC/${imagedir}/images/$x/$x.vmdk -vm.ip=${vm-ip}; done)
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux delete --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  Completed successfully
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-
-    ${rc}=  Run And Return Rc  govc datastore.ls -dc=%{TEST_DATACENTER} %{VCH-NAME}/VIC/
-    Should Be Equal As Integers  ${rc}  1
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.md
deleted file mode 100644
index 78a83fcd85..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.md
+++ /dev/null
@@ -1,317 +0,0 @@
-Test 6-04 - Verify vic-machine create basic function
-=======
-
-# Purpose:
-Verify vic-machine create basic connection variables, certificates, timeout, and all arguments after appliance-iso
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-
-DNS Servers
-=======
-
-### Create VCH - supply DNS server
-1. Create VCH while supplying the `--dns-server` option twice with values `1.1.1.1` and `2.2.2.2`
-2. Enable SSH on the VCH using the `vic-machine debug` command
-3. SSH into the VCH run `cat /etc/resolv.conf`
-
-
-### Expected Outcome
-* The top two lines of the output from `cat /etc/resolv.conf` should contain `1.1.1.1` and `2.2.2.2` in that order.
-
-Image size
-=======
-
-## Create VCH - custom base disk
-1. Issue the following command:
-```
-vic-machine-linux create --name=${vch-name} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --base-image-size=6GB ${vicmachinetls}
-```
-
-### Expected Outcome
-* VCH is deployed successfully
-* Container has correct disk size
-* Regression tests pass
-
-
-
-Connection
-=======
-
-## Create VCH - URL without user and password
-1. Create with vSphere URL in --target parameter, without --user and --password
-
-### Expected Outcome
-* Command should fail for no user password available
-
-
-## Create VCH - URL without password
-1. Create with vSphere URL in --target parameter and --user provided, but without --password
-
-### Expected Outcome
-* Command should promote interactive password input
-
-
-## Create VCH - target URL
-1. Create with vSphere URL and user password encoded in the same --target parameter
-```
-vic-machine-linux create --name=<VCH_NAME> --target="<TEST_USERNAME>:<TEST_PASSWORD>@<TEST_URL>" \
-    --image-store=<TEST_DATASTORE>
-```
-2. Run regression tests
-
-## Create VCH - operations user
-1. Create with an operations user (the same as the administrative user used for deployment in this case)
-```
-vic-machine-linux create --ops-user="<TEST_USERNAME>" --ops-password="<TEST_PASSWORD>"
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeed
-* Regression test pass
-
-
-## Create VCH - specified datacenter
-1. Prepare test env with multiple DC exists
-2. Create with vSphere URL with correct DC appended as <ip>/DC1
-
-### Expected Outcome
-* Verify deployed successfully
-* Verify VCH is in correct DC through govc
-
-
-
-vic-machine create Parameters
-=======
-
-## Create VCH - defaults
-1. Issue the following command:
-```
-vic-machine create --name=<VCH_NAME> --target=<TEST_URL> \
-    --user=<TEST_USERNAME> --image-store=<TEST_DATASTORE> --password=<TEST_PASSWORD> \
-    --bridge-network=<NETWORK> --compute-resource=<TEST_RESOURCE>
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeed
-* Regression test pass
-
-
-## Create VCH - full params
-1. Issue the following command:
-```
-vic-machine-linux create --name=<VCH_NAME> --target=<TEST_URL> \
-    --user=<TEST_USERNAME> --image-store=<TEST_DATASTORE> \
-    --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso \
-    --password=<TEST_PASSWORD> --force=true --bridge-network=network \
-    --compute-resource=<TEST_RESOURCE> --timeout <TEST_TIMEOUT> \
-    --volume-store=<TEST_DATASTORE>/test:default
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeed
-* Regression test pass
-
-## Create VCH - using environment variables
-1. Issue the following command:
-```
-vic-machine-linux create --name=<VCH_NAME> --image-store=<TEST_DATASTORE> \
-    --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso \
-    --force=true --bridge-network=network --public-network=%{PUBLIC_NETWORK} \
-    --compute-resource=<TEST_RESOURCE> --timeout <TEST_TIMEOUT> \
-    --volume-store=<TEST_DATASTORE>/test:default
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeed
-* Regression test pass
-
-
-## Create VCH - custom image store directory
-1. Issue the following command:
-```
-vic-machine-linux create --name=${vch-name} --target=%{TEST_URL} \
-    --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} \
-    --image-store %{TEST_DATASTORE}/vic-machine-test-images \
-    --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso \
-    --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} \
-    --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} \
-    --timeout %{TEST_TIMEOUT} ${vicmachinetls}
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeeds
-* Regression tests pass
-
-
-## Create VCH - long VCH name
-1. Provide long name to create VCH, e.g. 100 characters
-
-### Expected Outcome
-* Command failed for name is too long
-
-
-## Create VCH - Existing VCH name
-1. Create with same name with existing VCH
-
-### Expected Outcome
-* Command failed for VCH is found
-
-
-## Create VCH - Existing VM name
-1. Create with existing VM name
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeeds
-* Regression tests pass
-
-
-## Create VCH - Existing RP on ESX
-1. Create resource pool on ESX
-2. Create VCH with the same (already existing) name
-
-### Expected Outcome
-* Deployment succeeds
-* Regression tests pass
-
-
-## Create VCH - Existing vApp on vCenter
-1. Create vApp on vCenter
-2. Create VCH with the same (already existing) name
-
-### Expected Outcome
-* Command fails
-
-
-
-Image files
-=======
-
-## Create VCH - wrong ISOs
-1. Provide wrong iso files
-
-### Expected Outcome
-* Command failed for no iso files found
-
-
-
-Timeout
-=======
-
-## Basic timeout
-1. Specify short timeout to 2s
-
-### Expected Outcome
-* Command fail for timeout error #1557
-
-
-Short time creation
-===================
-
-# Stop VCH creation immediately
-=============================
-1. Interrupt creation process after 2s,
-2. Delete the VCH
-
-### Expected Outcome
-* Delete should succeed
-
-
-Appliance size
-=======
-
-## Basic VCH resource config
-1. Specify appliance size to 4cpu, 4096MB
-
-### Expected Outcome
-* Deployed successfully
-* Appliance VM size is set correctly in vsphere
-* Regression test pass
-
-
-## Invalid VCH resource config
-1. Specify appliance size to 1cpu, 256MB
-
-### Expected Outcome
-* Deployment failed for no enought resource
-* Should have user-friendly error message
-
-
-## Use resource pool
-1. --use-rp=true
-
-### Expected Outcome
-* Deployed successfully
-* VCH is created under resource pool against VC
-* Regression test pass
-
-
-## CPU reservation shares invalid
-1. Specify VCH CPU size to reservation: 4, limit: 8, shares: wrong
-
-### Expected Outcome
-* Deployment failed for wrong shares format
-
-
-## CPU reservation invalid
-1. Specify VCH CPU size to reservation: 4, limit: 2, shares: normal
-
-### Expected Outcome
-* Deployment failed for user-friendly error message
-
-
-## CPU reservation valid
-1. Specify VCH CPU size to reservation: 4, limit: 8, shares: high
-
-### Expected Outcome
-* Deployed successfully
-* Check vApp or rp resource settings is correct through govc
-* Integration test passed
-
-
-## Memory reservation shares invalid
-1. Specify VCH Memory size to reservation: 4096, limit: 8192, shares: wrong
-
-### Expected Outcome
-* Deployment failed for wrong shares format
-
-
-## Memory reservation invalid 1
-1. Specify VCH Memory size to reservation: 4096, limit: 2048, shares: normal
-
-### Expected Outcome
-* Deployment failed for user-friendly error message
-
-
-## Memory reservation invalid 2
-1. Specify VCH Memory size to reservation: 256, limit: 256, shares: high
-
-### Expected Outcome
-* Deployment failed with user-friendly error message
-
-
-## Memory reservation invalid 3
-1. Specify VCH Memory size to reservation: 200, limit: 200, shares: high
-
-### Expected Outcome
-* Deployment failed with user-friendly error message
-
-
-## Memory reservation valid
-1. Specify VCH Memory size to reservation: 4096, limit: 8192, shares: high
-
-### Expected Outcome
-* Deployed successfully
-* Check vApp or rp resource settings is correct through govc
-* Integration test passed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.robot
deleted file mode 100644
index 322a58dfee..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-04-Create-Basic.robot
+++ /dev/null
@@ -1,311 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-04 - Verify vic-machine create basic use cases
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Create VCH - supply DNS server
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --no-tls --dns-server=1.1.1.1 --dns-server=2.2.2.2
-    Should Contain  ${output}  Installer completed successfully
-    ${output}=  Run  bin/vic-machine-linux debug --target=%{TEST_URL} --name=%{VCH-NAME} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --enable-ssh --pw password --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  Completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-    Open Connection  %{VCH-IP}
-    Login  root  password
-    ${out}=  Execute Command  cat /etc/resolv.conf
-    Log  ${out}
-    ${first}=  Get Line  ${out}  0
-    Should Be Equal  ${first}  nameserver 1.1.1.1
-    ${second}=  Get Line  ${out}  1
-    Should Be Equal  ${second}  nameserver 2.2.2.2
-
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - custom base disk
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --base-image-size=6GB ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    ${output}=  Run  docker %{VCH-PARAMS} logs $(docker %{VCH-PARAMS} start $(docker %{VCH-PARAMS} create --name customDiskContainer ${busybox} /bin/df -h) && sleep 10) | grep /dev/sda | awk '{print $2}'
-    # df shows GiB and vic-machine takes in GB so 6GB on cmd line == 5.5GB in df
-    Should Be Equal As Strings  ${output}  5.5G
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} rm -f customDiskContainer
-    Should Be Equal As Integers  ${rc}  0
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - URL without user and password
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  vSphere user must be specified
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Create VCH - target URL
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - operations user
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --ops-user=%{TEST_USERNAME} --ops-password=%{TEST_PASSWORD} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - specified datacenter
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Pass Execution  Requires vCenter environment
-
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --compute-resource=%{TEST_DATACENTER}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-
-Create VCH - defaults
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  Installer completed successfully
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Get Docker Params  ${output}  ${true}
-    ${output}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  Installer completed successfully
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - full params
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - using environment variables
-    Set Test Environment Variables
-    Set Environment Variable  VIC_MACHINE_TARGET  %{TEST_URL}
-    Set Environment Variable  VIC_MACHINE_USER  %{TEST_USERNAME}
-    Set Environment Variable  VIC_MACHINE_PASSWORD  %{TEST_PASSWORD}
-    Set Environment Variable  VIC_MACHINE_THUMBPRINT  %{TEST_THUMBPRINT}
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --image-store=%{TEST_DATASTORE} --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-    Remove Environment Variable  VIC_MACHINE_TARGET
-    Remove Environment Variable  VIC_MACHINE_USER
-    Remove Environment Variable  VIC_MACHINE_PASSWORD
-    Remove Environment Variable  VIC_MACHINE_THUMBPRINT
-
-Create VCH - custom image store directory
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store %{TEST_DATASTORE}/vic-machine-test-images --appliance-iso=bin/appliance.iso --bootstrap-iso=bin/bootstrap.iso --password=%{TEST_PASSWORD} --force=true --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-    ${output}=  Run  GOVC_DATASTORE=%{TEST_DATASTORE} govc datastore.ls
-    Should Contain  ${output}  vic-machine-test-images
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-    ${output}=  Run  GOVC_DATASTORE=%{TEST_DATASTORE} govc datastore.ls
-    Should Not Contain  ${output}  vic-machine-test-images
-
-Create VCH - long VCH name
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME}-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  exceeds the permitted 31 characters limit
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Create VCH - Existing VCH name
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  already exists. Please delete it before reinstalling.
-
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - Existing VM name
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Create dummy VM
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.create -net=%{PUBLIC_NETWORK} %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Log  ${output}
-
-    # VCH creation should succeed on ESXi
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Get Docker Params  ${output}  ${true}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  Installer completed successfully
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Log To Console  Installer completed successfully: %{VCH-NAME}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run Keyword And Ignore Error  Cleanup VIC Appliance On Test Server
-
-    # VCH creation should fail on VC
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  The name '%{VCH-NAME}' already exists.
-
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.destroy %{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Create VCH - Existing RP on ESX
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Pass Execution  Test skipped on VC
-
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Create dummy RP
-    ${rc}  ${output}=  Run And Return Rc And Output  govc pool.create %{TEST_RESOURCE}/%{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  Installer completed successfully
-    Log  Installer completed successfully: %{VCH-NAME}
-
-    Cleanup VIC Appliance On Test Server
-
-    ${rc}  ${output}=  Run And Return Rc And Output  govc pool.destroy %{TEST_RESOURCE}/%{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-Create VCH - Existing vApp on vCenter
-    Pass execution  Test not implemented
-
-Basic timeout
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --timeout 1s ${vicmachinetls}
-    Should Contain  ${output}  Creating VCH exceeded time limit
-
-    ${ret}=  Run  bin/vic-machine-linux delete --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME}
-    Should Contain  ${ret}  Completed successfully
-    ${out}=  Run  govc ls vm
-    Should Not Contain  ${out}  %{VCH-NAME}
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Basic VCH resource config
-    Pass execution  Test not implemented
-
-Invalid VCH resource config
-    Pass execution  Test not implemented
-
-Use resource pool
-    Pass execution  Test not implemented
-
-CPU reservation shares invalid
-    Pass execution  Test not implemented
-
-CPU reservation invalid
-    Pass execution  Test not implemented
-
-CPU reservation valid
-    Pass execution  Test not implemented
-
-Memory reservation shares invalid
-    Pass execution  Test not implemented
-
-Memory reservation invalid 1
-    Pass execution  Test not implemented
-
-Memory reservation invalid 2
-    Pass execution  Test not implemented
-
-Memory reservation invalid 3
-    Pass execution  Test not implemented
-
-Memory reservation valid
-    Pass execution  Test not implemented
-
-Extension installation
-    Pass execution  Test not implemented
-
-Install existing extension
-    Pass execution  Test not implemented
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.md
deleted file mode 100644
index ad9e86b613..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.md
+++ /dev/null
@@ -1,177 +0,0 @@
-Test 6-05 - Verify vic-machine create validation function
-=======
-
-# Purpose:
-Verify vic-machine create validation functions, this does not include validation for network, datastore, and compute resources
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-Test Cases: - suggest resources
-======
-
-## Invalid datacenter
-1. Prepare vCenter environment with multiple datacenters
-2. Create with --target specifying a datacenter that does not exist
-
-### Expected Outcome:
-* Output contains message indicating datacenter must be specified
-* Output suggests available datacenter values
-* Deployment fails
-
-## Invalid target path
-1. Prepare vCenter environment
-2. Create with --target specifying a datacenter and resource pool
-
-### Expected Outcome:
-* Output contains message indicating that onlydatacenter must be specified in --target
-* Output suggests available datacenter values
-* Deployment fails
-
-## Create VCH - target thumbprint verification
-1. Issue the following command:
-```
-vic-machine-linux create --thumbprint=NOPE --name=${vch-name} \
-    --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --image-store=ENOENT ${vicmachinetls}
-```
-
-### Expected Outcome:
-* Output contains message that thumbprint does not match
-
-## Resource pools
-1. Create with wrong compute-resource: not exist resource pool, not existed vc cluster, not existed datacenter.
-2. Create with wrong compute-resource format
-
-### Expected Outcome:
-* Verify resource suggestion successfully show available values
-* Deployment fails
-
-## Networks
-1. Create with nonexistent bridge network
-2. Create with nonexistent public network
-
-### Expected Outcome:
-* Verify resource suggestion successfully show available values
-* Deployment fails
-
-## Multiple datacenters
-1. Prepare vCenter environment with multiple datacenters
-2. Create with --target not specifying a datacenter
-
-### Expected Outcome:
-* Output contains message indicating datacenter must be specified
-* Output suggests available datacenter values
-* Deployment fails
-
-
-Test Cases: - validate license
-======
-1. Prepare env with different license level
-2. Verify license validation works for different license
-
-### Expected Outcome:
-* If license verification passed, deployment succeeds
-
-
-Test Cases: - firewall
-======
-
-## Firewall disabled
-1. Create with env with firewall disabled
-
-### Expected Outcome:
-* Warn firewall is not enabled with user-friendly message
-* Deployment succeeds
-
-## Firewall enabled
-1. Create with env with firewall enabled, but tether port allowed
-
-### Expected Outcome:
-* Show firewall check passed
-* Deployment succeeds
-
-## Firewall misconfigured
-1. Create env with firewall configured to block tether port
-
-### Expected Outcome:
-* Show error message that firewall is misconfigured
-* Deployment fails
-
-
-Test Cases: - drs
-======
-1. Prepare env with drs disabled
-2. Verify deployment failed for drs disabled with user-friendly error message
-
-
-Test Cases: - resource accessibility
-======
-1. Prepare env with datastore not connected to hosts
-2. Verify deployment failed for host/datastore connectability with user-friendly error message
-
-
-Test Cases: - networking
-======
-## vDS contains all hosts in cluster
-1. Prepare vCenter environment with a vDS that is connected to all hosts in the cluster
-2. Issue the following command:
-```
-vic-machine create --name=<VCH_NAME> --target=<TEST_URL> \
-    --user=<TEST_USERNAME> --image-store=<TEST_DATASTORE> --password=<TEST_PASSWORD> \
-    --bridge-network=<NETWORK> --compute-resource=<TEST_RESOURCE>
-```
-3. Run regression tests
-
-### Expected Outcome:
-* Output contains message indicating vDS configuration OK
-* Deployment succeeds
-* Regression tests pass
-
-## vDS does not contain all hosts in cluster
-1. Prepare vCenter environment with a vDS that is not connected to all hosts in the cluster
-2. Issue the following command:
-```
-vic-machine create --name=<VCH_NAME> --target=<TEST_URL> \
-    --user=<TEST_USERNAME> --image-store=<TEST_DATASTORE> --password=<TEST_PASSWORD> \
-    --bridge-network=<NETWORK> --compute-resource=<TEST_RESOURCE>
-```
-
-### Expected Outcome:
-* Output contains message indicating vDS configuration is incorrect with user-friendly error message
-* Deployment fails
-
-## Bridge network same as public network
-1. Create with bridge network the same as public network
-
-### Expected Outcome:
-* Output contains message indicating invalid network configuration
-* Deployment fails
-
-
-Test Cases: - storage
-======
-## Default image datastore
-1. Prepare env with one datastore
-2. Issue `vic-machine create` without specifying `--image-store`
-3. Run regression tests
-
-### Expected Outcome:
-* Deployment succeeds
-* Regression tests pass
-
-## Custom image datastore
-1. Issue the following command:
-```
-vic-machine-linux create --name=${vch-name} --target=%{TEST_URL} \
-    --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} \
-    --image-store=%{TEST_DATASTORE}/long/weird/path ${vicmachinetls}
-```
-2. Run regression tests
-
-### Expected Outcome:
-* Deployment succeeds
-* Regression tests pass
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.robot
deleted file mode 100644
index 0028da3019..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-05-Create-Validation.robot
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-05 - Verify vic-machine create validation function
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Suggest resources - Invalid datacenter
-    Log To Console  \nRunning vic-machine create
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/WOW --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} ${vicmachinetls}
-    Should Contain  ${output}  Suggested datacenters:
-    Should Contain  ${output}  vic-machine-linux create failed:
-
-Suggest resources - Invalid target path
-    Log To Console  \nRunning vic-machine create
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/MUCH/DATACENTER --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} ${vicmachinetls}
-    Should Contain  ${output}  Suggested datacenters:
-    Should Contain  ${output}  vic-machine-linux create failed:
-
-Create VCH - target thumbprint verification
-    Log To Console  \nRunning vic-machine create - thumbprint verification
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    ${output}=  Run  bin/vic-machine-linux create --thumbprint=NOPE --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --image-store=ENOENT ${vicmachinetls}
-    Should Contain  ${output}  thumbprint does not match
-
-Default image datastore
-    # This test case is dependent on the ESX environment having only one datastore
-    Log To Console  \nRunning vic-machine create - default image datastore
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Log  ${output}
-
-    # VCH creation should succeed on ESXi with one datastore
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  Using default datastore
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Should Contain  ${output}  Installer completed successfully
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Get Docker Params  ${output}  ${true}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Log To Console  Installer completed successfully: %{VCH-NAME}...
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run Regression Tests
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Cleanup VIC Appliance On Test Server
-
-    # VCH creation should fail on VC
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  Suggested values for --image-store
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Should Contain  ${output}  vic-machine-linux create failed
-
-Custom image datastore
-    # This test case is dependent on the ESX environment having only one datastore
-    Log To Console  \nRunning vic-machine create - custom image datastore
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE}/long/weird/path ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE}/long/weird/path ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Trailing slash works as expected
-    Set Test Environment Variables
-    Log To Console  \nInstalling VCH to test server...
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Whitelist registries - blocked registry wildcard domain
-    Set Test Environment Variables
-    Log To Console  \nInstalling VCH to test server...
-    # *.docker.io
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --whitelist-registry *.docker.io
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --whitelist-registry *.docker.io
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    # try a docker pull from docker.io; this should fail
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Not Be Equal As Integers  ${rc}  0
-    Cleanup VIC Appliance On Test Server
-
-Whitelist registries - blocked registry ip address of valid registry fqdn
-    Set Test Environment Variables
-    # ip address of docker.io
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --whitelist-registry 52.200.132.201
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --whitelist-registry 52.200.132.201
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    # try a docker pull from docker.io; this should fail
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Not Be Equal As Integers  ${rc}  0
-    Cleanup VIC Appliance On Test Server
-
-Whitelist registries - allowed registry fqdn
-    Set Test Environment Variables
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --whitelist-registry registry.hub.docker.com
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --whitelist-registry registry.hub.docker.com
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    # try a docker pull from docker.io; this should succeed
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Cleanup VIC Appliance On Test Server
-
-Whitelist registries - allowed registry wildcard domain
-    Set Test Environment Variables
-    ${output-esx}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} ${vicmachinetls} --whitelist-registry *hub.docker.com
-    ${output-vc}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --whitelist-registry *hub.docker.com
-    ${output}=  Set Variable If  '%{HOST_TYPE}' == 'ESXi'  ${output-esx}  ${output-vc}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    # try a docker pull from docker.io; this should succeed
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull busybox
-    Should Be Equal As Integers  ${rc}  0
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.md
deleted file mode 100644
index c4736e2654..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.md
+++ /dev/null
@@ -1,70 +0,0 @@
-Test 6-06 - Verify vic-machine create datastore function
-=======
-
-# Purpose:
-Verify vic-machine create image store, volume store and container store functions
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Cases: - image store
-
-# Test Steps
-1. create with wrong image store format, e.g. wrong separator, wrong schema
-2. Create with not existed image store name
-3. Verify deployment failed with user-friendly error message
-
-# Test Steps
-1. Create with not existed image store path with format: <image store name>:/some/path
-2. Create with existed image store path with formt: <image store name>:/ds://some/path
-3. Create without image store configured
-3. Regression test
-4. Verify deployment and regression test passed
-5. Verify docker images are persisted in the specified path or default path if image store is not provided
-
-# Test Cases: - image store not found
-# Test steps
-1. Delete VCH created image store through govc
-2. Delete VCH
-3. Verify VCH delete succeeds
-
-# Test Cases: - image store delete
-
-# Test steps
-1. Delete above VCH deployed with image store path
-2. Verify image store is deleted successfully
-
-# Test Cases: - volume store
-
-# Test Steps
-1. create with wrong volume store format, e.g. wrong separator, wrong schema
-2. Create with not existed volume store name
-3. Verify deployment failed with user-friendly error message
-
-# Test Steps
-1. Create with not existed voume store path with format: <volume store name>:/some/path
-2. Create with existed image store path with formt: <volume store name>:/ds://some/path
-3. Create with multiple volume store path
-4. Create without volume store parameters
-4. Regression test
-5. Test docker volume commands
-6. Verify deployment and regression test passed
-7. Verify volumes are persisted in the specified path
-8. If volume store is not provided, verify docker volume commands does not work
-
-# Test Cases: - volume store delete
-
-# Test steps
-1. Delete above VCH deployed with volume store path without --force
-2. Verify delete is successful but volume store is not deleted through govc
-3. Verify the configured volume stores are correctly listed in warning message during deletion
-
-# Test steps
-1. Delete VCH deployed with volume store path with --force
-2. Verify volume store is deleted successfully through govc
-
-# Test Cases: - container store
-# FIXME: container store is not implemeted
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.robot
deleted file mode 100644
index 1ba30bfaac..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-06-Create-Datastore.robot
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-06 - Verify vic-machine create image store, volume store and container store functions
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Image Store Delete - Image store not found
-    Log To Console  \nRunning vic-machine create - custom image store path
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-    Set Test VCH Name
-
-    Log To Console  \nInstalling VCH to test server...
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target=%{TEST_URL} --user=%{TEST_USERNAME} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --image-store=%{TEST_DATASTORE}/images --password=%{TEST_PASSWORD} --force --kv
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}...
-
-    Log To Console  \nDeleting image stores...
-    ${out}=  Run  govc datastore.rm -ds=%{TEST_DATASTORE} images
-
-    Log To Console  \nRunning vic-machine delete
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.md
deleted file mode 100644
index 9bef0637ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.md
+++ /dev/null
@@ -1,246 +0,0 @@
-Test 6-07 - Verify vic-machine create network function
-=======
-
-# Purpose:
-Verify vic-machine create public, management, bridge network and container networks functions
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-
-# Public network
-
-## Public network - default
-1. Create without public network provided
-2. Verify "VM Network" is connected in VCH VM
-3. Integration test passed
-
-## Public network - invalid
-1. Create with wrong network name provided for public network
-2. Verify create failed for network is not found
-
-## Public network - invalid vCenter
-1. Create with distribute virtual switch as public network name
-2. Verify create failed for network type is wrong
-
-## Public network - DHCP
-1. Create with network name no DHCP availabile for public network
-2. Verify VCH created but without ip address
-3. Verify VCH can be deleted without anything wrong through vic-machine delete
-
-## Public network - valid
-1. Create with DPG as public network in VC and correct switch in ESXi
-2. Verify create passed
-3. Verify integration test passed
-
-# Management network
-
-## Management network - none
-1. Create without management network provided, but public network correctly set
-2. Verify warning message set for management network and client network sharing the same network
-3. No multiple attachement in VM network to same vSphere virtual switch (or DPG)
-4. Integration test passed
-
-## Management network - invalid
-1. Create with wrong network name provided for management network
-2. Verify create failed for network is not found
-
-## Management network - invalid vCenter
-1. Create with distribute virtual switch as management network name
-2. Verify create failed for network type is wrong
-
-## Management network - unreachable
-1. Create with network unreachable for vSphere or VC as management network
-2. Verify VCH created but VC or vSphere is unreachable
-3. Make sure vic-machine failed with user-friendly error message
-
-## Management network - valid
-1. Create with correct management network (switch for ESX, DPG for vCenter)
-2. Verify create passed
-3. Verify integration test passed
-
-
-
-# Bridge network
-
-## Bridge network - vCenter none
-1. Create without bridge network provided in VC
-2. Create failed for bridge network should be specified in VC
-
-## Bridge network - ESX none
-1. Create without bridge network provided in ESXi
-2. Integration test pass
-
-## Bridge network - create bridge network if it doesn't exist
-1. Create with wrong network name provided for bridge network
-2. Verify create failed for network is not found, create will succeed on ESXi
-
-## Bridge network - invalid vCenter
-3. Create with distribute virtual switch as bridge network name
-4. Verify create failed for network type is wrong
-
-## Bridge network - non-DPG
-1. Create with standard network in VC as bridge network
-2. vic-machine failed for DPG is required for bridge network
-
-## Bridge network - valid
-1. Create with DPG in VC and switch in ESXi
-2. Verify create passed
-3. Verify integration test passed
-
-## Bridge network - reused port group
-1. Create with same network for bridge and public network
-2. Verify create failed for same network with public network
-3. Same case with management network
-4. Same case with container network
-
-## Bridge network - invalid IP settings
-1. Create with bridge network correctly set
-2. Set bridge network IP range with wrong format
-3. Verify create failed with user-friendly error message
-
-## Bridge network - invalid bridge network range
-1. Create with bridge network IP range smaller than /16
-2. Verify create failed with user-friendly error message
-
-## Bridge network - valid with IP range
-1. Create with bridge network correctly set
-2. Set bridge network ip range correctly
-3. Verify create passed
-4. Regression test passed
-5. docker create container, with ip address correctly set in the above ip range
-
-
-# Container network
-
-## Container network - space in network name invalid
-1. Create with container network <Net With Spaces> and <Net With Spaces>: and <Net With Spaces>:<Alias>s
-2. Verify create failed with a network name must be supplied for <Net With Space>
-
-## Container network - space in network name valid
-1. Create with container network: <Net With Spaces>:vmnet
-2. Verify create passed
-3. Regression test passed
-4. Verify docker network ls command to show net1 network
-
-## Container network invalid 1
-1. Create with invalid container network: <WrongNet>:alias
-2. Verify create failed with WrongNet is not found
-
-## Container network invalid 2
-1. Create with container network: <standard switch network name>:alias in VC
-2. Verify create failed with standard network is not supported
-
-## Container network 1
-1. Create with container network: <dpg name>:net1 in VC or <standard switch network name>:net1 in ESXi
-2. Verify create passed
-3. Regression test passed
-4. Verify docker network ls command to show net1 network
-
-## Container network 2
-1. Create with container network: <dpg name> in VC or <standard switch network name> in ESXi
-2. Verify create passed
-3. Regression test passed
-4. Verify docker network ls command to show the <vsphere network name> network
-
-## Network mapping invalid
-1. Create with two container network map to same alias
-2. Verify create failed with two different vsphere network map to same docker network
-
-## Network mapping gateway invalid
-1. Create with container network mapping
-2. Set container network gateway as <dpg name>:1.1.1.1/24
-3. Set container network gateway as <dpg name>:192.168.1.0/24
-4. Set container network gateway as <wrong name>:192.168.1.0/24
-5. Verify create failed for wrong vsphere network name or gateway is not routable
-
-## Network mapping IP invalid
-1. Create with container network mapping
-2. Set container ip range as <wrong name>:192.168.2.1-192.168.2.100
-3. Set container network gateway as <dpg name>:192.168.1.1/24, and container ip range as <dpg name>:192.168.2.1-192.168.2.100
-4. Verify create failed for wrong vsphere network name or ip range is wrong
-
-## DNS format invalid
-1. Create with container network mapping
-2. Set container DNS as <wrong name>:8.8.8.8
-3. Set container DNS as <dpg name>:abcdefg
-4. Verify create failed for wrong vsphere name or wrong dns format
-
-## Network mapping
-1. Create with container network mapping <dpg name>:net1
-2. Set container network gateway as <dpg name>:192.168.1.1/24
-3. Set container ip range as <dpg name>:192.168.1.2-192.168.1.100
-4. Set container DNS as <dpg name>:<correct dns>
-5. Verify create passed
-6. Integration test passed
-7. Docker network ls show net1
-8. Docker container created with network attached with net1, got ip address inside of network range
-9. Docker create another container, and link to previous one, can talk to the the first container successfully
-
-## Container Firewalls
-1. Create an open container and verify another open container can connect to it on arbitrary ports.
-2. a. Try to publish a port on a closed firewall and verify an error is received.
-   b. Create a closed container and verify an open container cannot connect to it on an arbitrary port.
-   c. Create a container connected to a bridge and a closed network. Verify that another container connected
-      to the same bridge can connect to the closed container.
-3. a. Create an outbound container. Verify that an outbound container on the same external network cannot 
-      connect to the first outbound container.
-   b. Verify that the outbound container can initiate a connection with an open network on an arbitrary port.
-   c. Verify that two outbound containers on the same external network and on the same bridge network can
-      talk to one another via hte bridge.
-4. a. Create a published container that publishes port 1337. Verify that an outbound container can connect to port
-      1337 on the published container.
-   b. Verify that an outbound container cannot connect to any other arbitrary port on the published container.
-5. a. Create a peer network `A` with ip range `10.10.10.0/24` and gateway `10.10.10.1/24`.
-   b. Create a peer network `B` with ip range `192.168.0.0/16` and gateway `192.168.0.1/16`.
-   c. Verify that a container on network `B` cannot connect to network `A` through an arbitrary port.
-   d. Verify that a new container on network `A` (a peer) can connect to another container on network `A`
-      on an arbitrary port.
-6. Verify that a closed container can ping localhost
-
-# VCH static IP
-
-## VCH static IP - Static public
-1. Create with static IP address for public network (client and management networks unspecified
-   default to same port group as public network)
-2. Verify debug output shows specified static IP address correctly assigned and copied to client and
-   management networks
-
-## VCH static IP - Static client
-1. Create with static IP address for client network and specify client, public, and management
-   networks to be on same port group
-2. Verify debug output shows specified static IP address correctly assigned and copied to public
-   and management networks
-
-## VCH static IP - Static management
-1. Create with static IP address for management network and specify client, public, and management
-   networks to be on the same port group
-2. Verify debug output shows specified static IP address correctly assigned and copied to client
-   and public management networks
-
-## VCH static IP - different port groups 1
-1. Create with static IP address for public network and specify client and management networks to
-   be on different port group
-2. Verify debug output shows specified static IP address correctly assigned
-3. Verify debug output shows client and management networks set to DHCP
-
-## VCH static IP - different port groups 2
-1. Create with static IP address for public network on `public-network` port group and a static
-   IP address for client network on `client-network` port group
-2. Verify debug output shows correct IP address assigned to each interface
-
-## VCH static IP - same port group
-1. Create with static IP address for each public network and client network and specify both to be
-   on the same port group
-2. Verify output shows configuration error and install does not proceed
-
-## VCH static IP - same subnet for multiple port groups
-1. Create with static IP address for public network and a static IP address for client network.
-   Specify the addresses to be on the same subnet, but assign each network to a different port
-   group
-2. Verify output shows warning that assigning the same subnet to different port groups is
-   unsupported
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.robot
deleted file mode 100644
index e9b437dad9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-07-Create-Network.robot
+++ /dev/null
@@ -1,708 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-07 - Verify vic-machine create network function
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Cleanup Container Firewalls Test Networks
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove open-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove closed-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove outbound-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove peers-net-1
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove peers-net-2
-
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  bridge
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  open-net
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  closed-net
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  published-net
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  outbound-net
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  peers-net-1
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  peers-net-2
-
-Cleanup Container Firewalls Test
-    Cleanup VIC Appliance On Test Server
-    Cleanup Container Firewalls Test Networks
-
-*** Test Cases ***
-Public network - default
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    ${info}=  Get VM Info  %{VCH-NAME}
-    Should Contain  ${info}  VM Network
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Public network - invalid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Guarantee port group doesn't already exist
-    Run  govc host.portgroup.remove 'AAAAAAAAAA'
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove 'AAAAAAAAAA'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  'AAAAAAAAAA'
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --public-network=AAAAAAAAAA ${vicmachinetls}
-    Should Contain  ${output}  --public-network: network 'AAAAAAAAAA' not found
-    Should Contain  ${output}  vic-machine-linux create failed
-
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Public network - invalid vCenter
-    Pass execution  Test not implemented
-
-Public network - DHCP
-    Pass execution  Test not implemented
-
-Public network - valid
-    Pass execution  Test not implemented
-
-Management network - none
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    ${status}=  Run Keyword And Return Status  Should Contain  ${output}  Network role "management" is sharing NIC with "public"
-    ${status2}=  Run Keyword And Return Status  Should Contain  ${output}  Network role "public" is sharing NIC with "management"
-    ${status3}=  Run Keyword And Return Status  Should Contain  ${output}  Network role "public" is sharing NIC with "client"
-    ${status4}=  Run Keyword And Return Status  Should Contain  ${output}  Network role "management" is sharing NIC with "client"
-    Should Be True  ${status} | ${status2} | ${status3} | ${status4}
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Management network - invalid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Guarantee port group doesn't already exist
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove 'AAAAAAAAAA'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  'AAAAAAAAAA'
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --management-network=AAAAAAAAAA ${vicmachinetls}
-    Should Contain  ${output}  --management-network: network 'AAAAAAAAAA' not found
-    Should Contain  ${output}  vic-machine-linux create failed
-
-    Run Keyword And Ignore Error  Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Management network - invalid vCenter
-    Pass execution  Test not implemented
-
-Management network - unreachable
-    Pass execution  Test not implemented
-
-Management network - valid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --management-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Connectivity Bridge to Public
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove vm-network
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  bridge
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  vm-network
-
-    Log To Console  Create a public portgroup.
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN vm-network
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  vm-network
-
-    Log To Console  Create a bridge portgroup.
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  bridge
-
-    ${output}=  Run  bin/vic-machine-linux create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --force=true --bridge-network=bridge --public-network=vm-network --compute-resource=%{TEST_RESOURCE} --container-network vm-network --container-network-firewall vm-network:published --no-tlsverify --insecure-registry harbor.ci.drone.local
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    # this container will listen on :8000 and we're passing the -p option to the VCH so it should be exposed
-    Log To Console  Creating public container.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=vm-network -p 8000 --name p1 ${busybox} nc -l -p 8000
-    Should Be Equal As Integers  ${rc}  0
-
-    Log To Console  Getting IP for public container
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p1
-
-    Log To Console  Connecting to container on external network from container bridged network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net bridge ${busybox} nc ${ip} 8000
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-    # nc is listening, but since we didn't pass the -p flag to docker, the port should not be exposed.
-    Log To Console  Creating public container with no ports exposed.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=vm-network --name p2 ${busybox} nc -l -p 8000
-    Should Be Equal As Integers  ${rc}  0
-
-    Log To Console  Getting IP for public container
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p2
-
-    # we expect this to fail since the port wasn't exposed
-    Log To Console  Connecting to container on external network from container bridged network
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net bridge ${busybox} nc ${ip} 8000
-    Should Not Be Equal As Integers  ${rc}  0
-
-    Log To Console  Port connection test from bridge to public networks succeeded.
-
-    Cleanup VIC Appliance On Test Server
-
-Connectivity Bridge to Management
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove management
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  bridge
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  management
-
-    Log To Console  Create a bridge portgroup.
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  bridge
-
-    Log To Console  Create a management portgroup.
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN management
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  management
-
-    ${output}=  Run  bin/vic-machine-linux create --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD} --force=true --bridge-network=bridge --compute-resource=%{TEST_RESOURCE} --container-network management --container-network vm-network --container-network-ip-range=management:10.10.10.0/24 --container-network-gateway=management:10.10.10.1/24 --no-tlsverify --insecure-registry harbor.ci.drone.local
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Log To Console  Creating management container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=management --name m1 ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    Log To Console  Starting management container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start m1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-    Log To Console  Creating bridge container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=bridge --name b1 ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-
-    Log To Console  Starting bridge container
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start b1
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-    Log To Console  Getting IP for management container
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' m1
-
-    Log To Console  Pinging from bridge to management container.
-    ${id}=  Run  docker %{VCH-PARAMS} run -d ${busybox} ping -c 30 ${ip}
-
-    Log To Console  Attach to running container.
-    ${out}=  Run  docker %{VCH-PARAMS} attach ${id}
-
-    Should Contain  ${out}  100% packet loss
-    Log To Console  Ping test succeeded.
-
-    Cleanup VIC Appliance On Test Server
-
-Bridge network - vCenter none
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Pass Execution  Test skipped on ESXi
-
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} ${vicmachinetls}
-    Should Contain  ${output}  ERROR
-    Should Contain  ${output}  An existing distributed port group must be specified for bridge network on vCenter
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Bridge network - ESX none
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Pass Execution  Test skipped on VC
-
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Bridge network - create bridge network if it doesn't exist
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Pass Execution  Test not applicable on vCenter
-    # ESX should automatically create the bridge switch & port group AAAAAAAAAA, but vCenter would fail with unknown network error
-
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Guarantee port group doesn't already exist
-    Run  govc host.portgroup.remove 'AAAAAAAAAA'
-    Run  govc host.vswitch.remove 'AAAAAAAAAA'
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=AAAAAAAAAA ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-    Run  govc host.portgroup.remove 'AAAAAAAAAA'
-    Run  govc host.vswitch.remove 'AAAAAAAAAA'
-
-Bridge network - invalid vCenter
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Pass Execution  Test skipped on ESXi
-
-    Pass execution  Test not implemented
-
-Bridge network - non-DPG
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Pass Execution  Test skipped on ESXi
-
-    Pass execution  Test not implemented
-
-Bridge network - valid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Bridge network - reused port group
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{BRIDGE_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  the bridge network must not be shared with another network role
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --management-network=%{BRIDGE_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  the bridge network must not be shared with another network role
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --client-network=%{BRIDGE_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  the bridge network must not be shared with another network role
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Bridge network - invalid IP settings
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --bridge-network-range 1.1.1.1 ${vicmachinetls}
-    Should Contain  ${output}  Error parsing bridge network ip range
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Bridge network - invalid bridge network range
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --bridge-network-range 1.1.1.1/17 ${vicmachinetls}
-    Should Contain  ${output}  --bridge-network-range must be /16 or larger network
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Bridge network - valid with IP range
-    Pass execution  Test not implemented
-
-Container network - space in network name invalid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=bridge --container-network 'VM Network With Spaces' ${vicmachinetls}
-    Should Contain  ${output}  A network alias must be supplied when network name "VM Network With Spaces" contains spaces.
-    Should Contain  ${output}  vic-machine-linux create failed
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=bridge --container-network 'VM Network With Spaces': ${vicmachinetls}
-    Should Contain  ${output}  A network alias must be supplied when network name "VM Network With Spaces:" contains spaces.
-    Should Contain  ${output}  vic-machine-linux create failed
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=bridge --container-network 'vm-network':'vm network' ${vicmachinetls}
-    Should Contain  ${output}  The network alias supplied in "vm-network:vm network" cannot contain spaces.
-    Should Contain  ${output}  vic-machine-linux create failed
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-
-Container network - space in network name valid
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    Log To Console  Create a portgroup with a space in its name
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN 'VM Network With Spaces'
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  'VM Network With Spaces'
-
-    Log To Console  Create a bridge portgroup.
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  bridge
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=bridge --container-network 'VM Network With Spaces':vmnet --insecure-registry harbor.ci.drone.local ${vicmachinetls}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-
-    ${output}=  Run  docker %{VCH-PARAMS} network ls
-    Should Contain  ${output}  vmnet
-
-    # Clean up port groups
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove 'VM Network With Spaces'
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove bridge
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  'VM Network With Spaces'
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  bridge
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VCH Bridge Network  %{VCH-NAME}
-    Cleanup VIC Appliance On Test Server
-
-Container Firewalls
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Set the only teardown for this test to cleanup both portgroups and VCH, regardless of test outcome.
-    [Teardown]  Cleanup Container Firewalls Test
-
-    Cleanup Container Firewalls Test Networks
-
-    Log To Console  Create port groups
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN open-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN closed-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN outbound-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN peers-net-1
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN peers-net-2
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  bridge
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  open-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  closed-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  outbound-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  peers-net-1
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  peers-net-2
-
-    ${createcommand}=  catenate  SEPARATOR=\ \ 
-    ...  bin/vic-machine-linux create --debug 1 --name=%{VCH-NAME}
-    ...  --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT}
-    ...  --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --password=%{TEST_PASSWORD}
-    ...  --force=true --bridge-network=bridge --compute-resource=%{TEST_RESOURCE} --no-tlsverify
-    ...  --insecure-registry harbor.ci.drone.local
-    ...  --container-network open-net --container-network-firewall open-net:open
-    ...  --container-network closed-net --container-network-firewall closed-net:closed
-    ...  --container-network outbound-net --container-network-firewall outbound-net:outbound
-    ...  --container-network published-net --container-network-firewall published-net:published
-    ...  --container-network peers-net-1 --container-network-firewall peers-net-1:peers
-    ...  --container-network-ip-range peers-net-1:10.10.10.0/24 --container-network-gateway peers-net-1:10.10.10.1/24
-    ...  --container-network peers-net-2 --container-network-firewall peers-net-2:peers
-    ...  --container-network-ip-range peers-net-2:192.168.0.0/16 --container-network-gateway peers-net-2:192.168.0.1/16
-
-    ${output}=  Run  ${createcommand}
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    ### OPEN FIREWALL ###
-    Log To Console  Checking Open Firewall
-    # Create an open container listening on port 1234
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=open-net --name p1 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p1
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net bridge ${busybox} nc ${ip} 1234
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-    ### CLOSED FIREWALL ###
-    Log To Console  Checking Closed Firewall
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=closed-net --name shouldfail -p 123 ${busybox} nc -l -p 1234
-    Should Contain  ${output}  ports cannot be published via
-    Should Not Be Equal As Integers  ${rc}  0
-
-    # Create a closed container listening on port 1234.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=closed-net --name p2 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p2
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=bridge ${busybox} nc ${ip} 1234
-    Should Not Be Equal As Integers  ${rc}  0
-
-    # Create a container on a bridge and closed network listening on port 1234.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net=bridge --name closedbridge ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect closed-net closedbridge
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start closedbridge
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{.NetworkSettings.Networks.bridge.IPAddress}}' closedbridge
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=bridge ${busybox} nc ${ip} 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ### OUTBOUND FIREWALL ###
-    Log To Console  Checking Outbound Firewall
-    # Create an outbound-only container listening on port 1234.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=outbound-net --name p3 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p3
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=outbound ${busybox} nc ${ip} 1234
-    Should Not Be Equal As Integers  ${rc}  0
-    # The connection should not be established. However, an outbound network should be able to connect to an open network.
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=open-net --name p4 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p4
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=outbound-net ${busybox} nc ${ip} 1234
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net=bridge --name out1 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect outbound-net out1
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start out1
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} create --net=bridge --name out2 ${busybox} nc out1 1234
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network connect outbound-net out2
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} start out2
-
-    ### PUBLISHED FIREWALL ###
-    Log To Console  Checking Published Firewall
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=published-net -p 1337 --name p5 ${busybox} nc -l -p 1337
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p5
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=outbound-net ${busybox} nc ${ip} 1337
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    # Connection should be established on the open port. Let's try a closed one now...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=published-net -p 1337 --name p6 ${busybox} nc -l -p 1337
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p6
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=outbound-net ${busybox} nc ${ip} 404
-    Should Not Be Equal As Integers  ${rc}  0
-
-    ### PEERS FIREWALL ###
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=peers-net-1 --name shouldfail -p 123 ${busybox} nc -l -p 1234
-    Should Contain  ${output}  ports published via container network peers-net-1 must specify a mapping
-    Should Not Be Equal As Integers  ${rc}  0
-    
-    Log To Console  Checking Peers Firewall
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=peers-net-1 --name p7 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p7
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=peers-net-1 ${busybox} nc ${ip} 1234
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error:
-    # Connection should be established on the peer network. Let's try a non-peer now...
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=peers-net-1 --name p8 ${busybox} nc -l -p 1234
-    Should Be Equal As Integers  ${rc}  0
-
-    ${ip}=  Run  docker %{VCH-PARAMS} inspect --format '{{range .NetworkSettings.Networks}}{{.IPAddress }}{{end}}' p8
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --net=peers-net-2 ${busybox} nc ${ip} 1234
-    Should Not Be Equal As Integers  ${rc}  0
-
-    ### Ping localhost ###
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name localping --network=closed-net ${busybox} ping -c1 localhost
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} logs --follow localping
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  1 packets transmitted, 1 packets received
-
-Container network invalid 1
-    Pass execution  Test not implemented
-
-Container network invalid 2
-    Pass execution  Test not implemented
-
-Reset VCH doesn't cause unintentionally exposed ports from container network
-    Set Test Environment Variables
-    # Attempt to cleanup old/canceled tests
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Create bridge portgroup on VC
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  bridge
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=bridge --container-network %{PUBLIC_NETWORK}:vmnet ${vicmachinetls}
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    ${output}=  Run  docker %{VCH-PARAMS} network ls
-    Should Contain  ${output}  vmnet
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull nginx
-    Should Be Equal As Integers  ${rc}  0
-    Log  ${output}
-
-    ${rc}  ${cid}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d --net=vmnet -p 80 nginx
-    Log  ${cid}
-    Should Be Equal As Integers  ${rc}  0
-
-    # get the containerVM direct IP address
-    ${rc}  ${ipaddr}=  Run And Return Rc And Output  docker %{VCH-PARAMS} inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  %{VCH-IP}  ${ipaddr}
-
-    # ensure that we're reporting the containerVM IP in the ps output
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${ipaddr}:80->80/tcp
-
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.power -reset=true %{VCH-NAME}
-    Log To Console  ${output}
-    Should Be Equal As Integers  0  ${rc}
-
-    Reboot VM  %{VCH-NAME}
-
-    Log To Console  Getting VCH IP ...
-    ${new-vch-ip}=  Get VM IP  %{VCH-NAME}
-    Log To Console  New VCH IP is ${new-vch-ip}
-    Replace String  %{VCH-PARAMS}  %{VCH-IP}  ${new-vch-ip}
-
-    # wait for docker info to succeed
-    Wait Until Keyword Succeeds  20x  5 seconds  Run Docker Info  %{VCH-PARAMS}
-
-    
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} ps -f id=${cid}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  %{VCH-IP}:80->80/tcp
-
-    # Delete the portgroup added by env vars keyword
-    Cleanup VIC Appliance On Test Server
-
-Container network 2
-    Pass execution  Test not implemented
-
-Network mapping invalid
-    Pass execution  Test not implemented
-
-Network mapping gateway invalid
-    Pass execution  Test not implemented
-
-Network mapping IP invalid
-    Pass execution  Test not implemented
-
-DNS format invalid
-    Pass execution  Test not implemented
-
-Network mapping
-    Pass execution  Test not implemented
-
-VCH static IP - Static public
-    Pass execution  Test not implemented
-
-VCH static IP - Static client
-    Pass execution  Test not implemented
-
-VCH static IP - Static management
-    Pass execution  Test not implemented
-
-VCH static IP - different port groups 1
-    Pass execution  Test not implemented
-
-VCH static IP - different port groups 2
-    Pass execution  Test not implemented
-
-VCH static IP - same port group
-    Pass execution  Test not implemented
-
-VCH static IP - same subnet for multiple port groups
-    Pass execution  Test not implemented
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-08-Create-Compute.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-08-Create-Compute.md
deleted file mode 100644
index ce6959caa2..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-08-Create-Compute.md
+++ /dev/null
@@ -1,58 +0,0 @@
-Test 6-08 - Verify vic-machine create compute-resource verification
-=======
-
-# Purpose:
-Verify vic-machine create compute resource parsing
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Wrong absolute path
-# Test Steps
-1. Create with compute resource set wrongDC:malformat
-2. Create with compute resource set to /WrongDC/cluster/
-3. Create with compute resource set to /DC/cluster/host/rp
-4. Verify creation failed correctly
-
-# Correct absolute path
-# Test Steps
-1. Create with compute resource set to /DC/host/cluster/Resources/rp
-2. Verify creation passed successfully
-3. Verify VCH is created in the correct place though govc
-
-# Wrong relative path
-# Test Steps
-1. Prepare env with multiple VC clusters and multiple available resource pools
-2. Create with compute resource set to wrongRP1 (wrongRP1 does not exist)
-3. Create with compute resource set to wrongCluster (wrongCluster does not exist)
-4. Create with compute resource set to RP1 (RP1 exists in one cluster)
-5. Create with compute resource set to Cluster1 (Cluster1 exists)
-6. Verify creation failed correctly
-
-# Correct relative path with single VC cluster
-# Test Steps
-1. Prepare env single VC cluster
-2. Create with compute resource set to <cluster name> (real cluster name here)
-3. Create with compute resource set to RP1 (RP1 exists in cluster)
-4. Create with compute resource not set
-5. Verify deployed successfully
-6. Verify VCH is created in the correct place though govc
-
-# Correct relative path with ESXi
-# Test Steps
-1. Test in ESXi
-2. Create with compute resource set to RP1 (RP1 exists in cluster)
-3. Create with compute resource not set
-4. Verify deployed successfully
-5. Verify VCH is created in the correct place though govc
-
-# Correct relative path in multiple VC cluster
-# Test Steps
-1. Prepare env with multiple VC clusters and multiple available resource pools
-2. Create with compute resource set to Cluster (Cluster exists)
-3. Create with compute resource set to Cluster/RP1 (Cluster/RP1 exists in cluster)
-4. Verify deployed successfully
-5. Verify VCH is created in the correct place though govc
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.md
deleted file mode 100644
index c052db80d9..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.md
+++ /dev/null
@@ -1,41 +0,0 @@
-Test 6-09 - Verify vic-machine inspect
-=======
-
-# Purpose:
-Verify vic-machine inspect functionality
-
-# References:
-* vic-machine-linux inspect -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install VCH
-2. Issue vic-machine inspect config command
-3. Issue vic-machine inspect config --format raw command
-4. Create a VCH with tlsverify
-5. Inspect the VCH without specifying --tls-cert-path
-6. Inspect the VCH with a valid --tls-cert-path
-7. Inspect the VCH with an invalid --tls-cert-path
-8. Create a VCH with --no-tls
-9. Inspect the VCH without specifying --tls-cert-path
-10. Create a VCH with --no-tlsverify
-11. Inspect the VCH without specifying --tls-cert-path
-12. Create a VCH with some container-network options
-13. Verify the `inspect config` contains the correct options
-
-# Expected Outcome:
-* Steps 1 should succeed, and output from step 2 and 3 should contain expected flags & values
-* Steps 4-13 should complete successfully, however, step 6 should show a warning in the output (see below)
-* The output of steps 5 and 6 should contain the correct `DOCKER_CERT_PATH`.
-* The output of step 7 should not contain a `DOCKER_CERT_PATH` and should contain:
-```
-Unable to find valid client certs
-DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments
-```
-* The outputs of steps 9 and 11 should not contain a `DOCKER_CERT_PATH` and should not contain:
-```
-Unable to find valid client certs
-DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments
-```
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.robot
deleted file mode 100644
index 18e6c78e74..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-09-Inspect.robot
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-*** Settings ***
-Documentation  Test 6-09 - Verify vic-machine inspect functions
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Cleanup Container Network Test Networks
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.remove peers-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Remove VC Distributed Portgroup  peers-net
-
-Cleanup Container Network Test
-    Cleanup VIC Appliance On Test Server
-    Cleanup Container Network Test Networks
-
-*** Test Cases ***
-Inspect VCH Configuration
-    Install VIC Appliance To Test Server
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME}
-    Should Contain  ${output}  --debug=1
-    Should Contain  ${output}  --name=%{VCH-NAME}
-    Should Contain  ${output}  --target=https://%{TEST_URL}
-    Should Contain  ${output}  --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --image-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --bridge-network=%{BRIDGE_NETWORK}
-    Should Not Contain  ${output}  --cpu
-    Should Not Contain  ${output}  --cpu-shares
-    Should Not Contain  ${output}  --memory
-    Should Not Contain  ${output}  --memory-shares
-    Should Not Contain  ${output}  --base-image-size
-    Should Not Contain  ${output}  --bridge-network-range
-    Should Be Equal As Integers  0  ${rc}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME} --format raw
-    Should Contain  ${output}  --debug=1
-    Should Contain  ${output}  --name=%{VCH-NAME}
-    Should Contain  ${output}  --target=https://%{TEST_URL}
-    Should Contain  ${output}  --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --image-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --bridge-network=%{BRIDGE_NETWORK}
-    Should Not Contain  ${output}  --cpu
-    Should Not Contain  ${output}  --cpu-shares
-    Should Not Contain  ${output}  --memory
-    Should Not Contain  ${output}  --memory-shares
-    Should Not Contain  ${output}  --base-image-size
-    Should Not Contain  ${output}  --bridge-network-range
-    Should Not Contain  ${output}  INFO
-    Should Not Contain  ${output}  WARN
-    Should Be Equal As Integers  0  ${rc}
-
-    Cleanup VIC Appliance On Test Server
-
-Inspect VCH Configuration with Resource Limitation
-    Install VIC Appliance To Test Server  additional-args=--memory 8000 --memory-reservation 512 --memory-shares 6000 --cpu 10000 --cpu-reservation 512 --cpu-shares high --endpoint-cpu 2 --endpoint-memory 4096
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME}
-    Should Contain  ${output}  --debug=1
-    Should Contain  ${output}  --name=%{VCH-NAME}
-    Should Contain  ${output}  --target=https://%{TEST_URL}
-    Should Contain  ${output}  --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --image-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --bridge-network=%{BRIDGE_NETWORK}
-    Should Contain  ${output}  --memory-shares=6000
-    Should Contain  ${output}  --memory-reservation=512
-    Should Contain  ${output}  --memory=8000
-    Should Contain  ${output}  --cpu=10000
-    Should Contain  ${output}  --cpu-reservation=512
-    Should Contain  ${output}  --cpu-shares=high
-    Should Contain  ${output}  --endpoint-memory=4096
-    Should Contain  ${output}  --endpoint-cpu=2
-    Should Be Equal As Integers  0  ${rc}
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME} --format raw
-
-    Should Contain  ${output}  --debug=1
-    Should Contain  ${output}  --name=%{VCH-NAME}
-    Should Contain  ${output}  --target=https://%{TEST_URL}
-    Should Contain  ${output}  --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --image-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --compute-resource=%{TEST_RESOURCE}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}
-    Should Contain  ${output}  --bridge-network=%{BRIDGE_NETWORK}
-    Should Contain  ${output}  --memory-shares=6000
-    Should Contain  ${output}  --memory-reservation=512
-    Should Contain  ${output}  --memory=8000
-    Should Contain  ${output}  --cpu=10000
-    Should Contain  ${output}  --cpu-reservation=512
-    Should Contain  ${output}  --cpu-shares=high
-    Should Contain  ${output}  --endpoint-memory=4096
-    Should Contain  ${output}  --endpoint-cpu=2
-    Should Not Contain  ${output}  INFO
-    Should Not Contain  ${output}  WARN
-    Should Be Equal As Integers  0  ${rc}
-
-    Cleanup VIC Appliance On Test Server
-
-Inspect VCH Configuration with Container Networks
-    # Set the only teardown for this test to cleanup both portgroups and VCH, regardless of test outcome.
-    [Teardown]  Cleanup Container Network Test
-
-    Cleanup Container Network Test Networks
-
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc host.portgroup.add -vswitch vSwitchLAN peers-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  published-net
-    ${out}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Add VC Distributed Portgroup  test-ds  peers-net
-
-    Install VIC Appliance To Test Server  additional-args=-container-network published-net -container-network peers-net -cnf peers-net:peers --container-network-ip-range peers-net:10.10.10.0/24 -cng peers-net:10.10.10.1/24
-
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --name=%{VCH-NAME} --format raw
-
-    Should Contain  ${output}  --container-network=published-net:published-net
-    Should Not Contain  ${output}  --container-network-firewall=published-net:published
-    Should Contain  ${output}  --container-network=peers-net:peers-net
-    Should Contain  ${output}  --container-network-gateway=peers-net:10.10.10.1/24
-    Should Contain  ${output}  --container-network-ip-range=peers-net:10.10.10.0/24
-    Should Contain  ${output}  --container-network-firewall=peers-net:peers
-    Should Be Equal As Integers  0  ${rc}
-
-Verify inspect output for a full tls VCH
-    Install VIC Appliance To Test Server
-
-    ${output}=  Run  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  DOCKER_CERT_PATH=${EXECDIR}/%{VCH-NAME}
-
-    ${output}=  Run  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-cert-path=%{VCH-NAME}
-    Should Contain  ${output}  DOCKER_CERT_PATH=${EXECDIR}/%{VCH-NAME}
-
-    ${output}=  Run  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-cert-path=fakeDir
-    Should Not Contain  ${output}  DOCKER_CERT_PATH=${EXECDIR}/%{VCH-NAME}
-    Should Contain  ${output}  Unable to find valid client certs
-    Should Contain  ${output}  DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments
-
-    Cleanup VIC Appliance On Test Server
-
-Verify inspect output for a --no-tls VCH
-    Set Test Environment Variables
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --no-tls
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-
-    ${output}=  Run  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Not Contain  ${output}  DOCKER_CERT_PATH=${EXECDIR}/%{VCH-NAME}
-    Should Not Contain  ${output}  Unable to find valid client certs
-    Should Not Contain  ${output}  DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments
-
-    Cleanup VIC Appliance On Test Server
-
-Verify inspect output for a --no-tlsverify VCH
-    Set Test Environment Variables
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --no-tlsverify
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-
-    ${output}=  Run  bin/vic-machine-linux inspect --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Not Contain  ${output}  DOCKER_CERT_PATH=${EXECDIR}/%{VCH-NAME}
-    Should Not Contain  ${output}  Unable to find valid client certs
-    Should Not Contain  ${output}  DOCKER_CERT_PATH must be provided in environment or certificates specified individually via CLI arguments
-
-    Cleanup VIC Appliance On Test Server
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.md
deleted file mode 100644
index 944a3811ec..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 6-10 - Verify vic-machine ls
-=======
-
-# Purpose:
-Verify vic-machine ls functions
-
-# References:
-* vic-machine-linux ls -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps
-1. Create VCH
-3. Run ls to query out VCH
-4. Run inspect to verify VCH id is correct
-5. Run inspect to verify VCH compute path and name are correct
-6. Run inspect to verify VCH with a trailing slash in the target
-7. Run inspect with an invalid compute resource
-
-# Expected Results
-* Steps 1-6 should succeed and correctly list any VCHs present in the system
-* Step 7 should fail and suggest a valid compute resource
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.robot
deleted file mode 100644
index 0a1d591ba5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-10-List.robot
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-10 - Verify ls list all VCHs
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Keywords ***
-Verify Listed Machines
-    [Arguments]  ${list}
-    Should Contain  ${list}  ID
-    Should Contain  ${list}  PATH
-    Should Contain  ${list}  NAME
-    Should Not Contain  ${list}  Error
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux version
-    Should Be Equal As Integers  ${rc}  0
-    @{version}=  Split String  ${output}
-    ${machines}=  Get Lines Containing String  ${list}  %{VCH-NAME}
-    @{lines}=  Split To Lines  ${machines}
-    Length Should Be  ${lines}  1
-    # Get VCH ID, PATH and NAME
-    @{vch}=  Split String  @{lines}[-1]
-    ${vch-id}=  Strip String  @{vch}[0]
-    ${vch-path}=  Strip String  @{vch}[1]
-    ${vch-name}=  Strip String  @{vch}[2]
-    ${vch-version}=  Strip String  @{vch}[3]
-    Should Be Equal As Strings  @{version}[-1]  ${vch-version}
-    # Run vic-machine inspect
-    ${ret}=  Run  bin/vic-machine-linux inspect --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --id ${vch-id}
-    Should Contain  ${ret}  Completed successfully
-    ${ret}=  Run  bin/vic-machine-linux inspect --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource ${vch-path} --name ${vch-name}
-    Should Contain  ${ret}  Completed successfully
-
-*** Test Cases ***
-List all VCHs
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Verify Listed Machines  ${ret}
-
-List with compute-resource
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource %{TEST_RESOURCE}
-    Verify Listed Machines  ${ret}
-
-List with trailing slash
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL}/ --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource %{TEST_RESOURCE}
-    Verify Listed Machines  ${ret}
-
-List suggest compute resource
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource fakeComputeResource
-    Should Contain  ${ret}  Suggested values for --compute-resource:
-
-List suggest valid datacenter
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL}/fakeDatacenter --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource %{TEST_RESOURCE}
-    Should Contain  ${ret}  Suggesting valid values for datacenter in --target
-
-List with valid datacenter
-    ${orig}=  Get Environment Variable  TEST_DATACENTER
-    ${dc}=  Run Keyword If  '%{TEST_DATACENTER}' == '${SPACE}'  Get Datacenter Name
-    Run Keyword If  '%{TEST_DATACENTER}' == '${SPACE}'  Set Environment Variable  TEST_DATACENTER  ${dc}
-
-    ${ret}=  Run  bin/vic-machine-linux ls --target %{TEST_URL}/%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Set Environment Variable  TEST_DATACENTER  ${orig}
-    Verify Listed Machines  ${ret}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.md
deleted file mode 100644
index c31b975e99..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Test 6-11 - Verify vic-machine debug
-=======
-
-# Purpose:
-Verify vic-machine debug functions
-
-# References:
-* vic-machine-linux debug -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-# Test Cases
-======
-
-# Enable SSH
-1. Create VCH
-2. Generate ssh keypair with ssh-keygen
-3. Run vic-machine debug to enable SSH, supplying public key for authorized_keys file
-4. ssh to endpointVM and run `/bin/true`, asserting success via exit status
-
-# Expected Results
-* All steps should succeed
-
-# Password Change When Expired
-1. Create VCH
-2. Generate ssh keypair with ssh-keygen
-3. Run vic-machine debug to enable SSH, supplying public key for authorized_keys file
-4. ssh to endpointVM using private key and run `/bin/true`, asserting success via exit status
-5. Change date to +6 years on current time - this is past the support window
-6. ssh to endpointVM using private key and run `/bin/true`, asserting failure via exit status
-7. Run vic-machine debug to enable SSH, supplying a dictionary password that would be rejected by cracklib if change were interactive
-8. ssh to endpointVM using password and run `/bin/true`, asserting success via exit status
-
-# Expected Results
-* Step 6 should fail due to expired password
-* All other steps should succeed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.robot
deleted file mode 100644
index acf3e2275c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-11-Debug.robot
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-11 - Verify enable of ssh in the appliance
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Enable SSH and verify
-    # generate a key to use for the Test
-    ${rc}=  Run And Return Rc  ssh-keygen -t rsa -N "" -f %{VCH-NAME}.key
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  chmod 600 %{VCH-NAME}.key
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}=  Run And Return Rc  bin/vic-machine-linux debug --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --enable-ssh --authorized-key=%{VCH-NAME}.key.pub
-    Should Be Equal As Integers  ${rc}  0
-
-    # check the ssh
-    ${rc}=  Run And Return Rc  ssh -vv -o StrictHostKeyChecking=no -i %{VCH-NAME}.key root@%{VCH-IP} /bin/true
-    Should Be Equal As Integers  ${rc}  0
-
-    # delete the keys
-    Remove Files  %{VCH-NAME}.key  %{VCH-NAME}.key.pub
-
-
-Check Password Change When Expired
-    # generate a key to use for the Test
-    ${rc}=  Run And Return Rc  ssh-keygen -t rsa -N "" -f %{VCH-NAME}.key
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}=  Run And Return Rc  chmod 600 %{VCH-NAME}.key
-    Should Be Equal As Integers  ${rc}  0
-
-    ${rc}=  Run And Return Rc  bin/vic-machine-linux debug --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --enable-ssh --authorized-key=%{VCH-NAME}.key.pub
-    Should Be Equal As Integers  ${rc}  0
-
-    # push the date forward, past the suport duration
-    ${rc}  ${output}=  Run And Return Rc And Output  ssh -o StrictHostKeyChecking=no -i %{VCH-NAME}.key root@%{VCH-IP} 'date -s " +6 year"'
-    Should Be Equal As Integers  ${rc}  0
-
-    # command should fail with expired password
-    ${rc}=  Run And Return Rc  ssh -vv -o StrictHostKeyChecking=no -i %{VCH-NAME}.key root@%{VCH-IP} /bin/true
-    Should Not Be Equal As Integers  ${rc}  0
-
-    # Set the password to a dictionary word - this should not be rejected via this path
-    ${rc}=  Run And Return Rc  bin/vic-machine-linux debug --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --name %{VCH-NAME} --enable-ssh --rootpw=dictionary
-    Should Be Equal As Integers  ${rc}  0
-
-    # check we can now log in cleanly - log in via password
-    ${rc}=  Run And Return Rc  sshpass -p dictionary ssh -o StrictHostKeyChecking=no root@%{VCH-IP} /bin/true
-    Should Be Equal As Integers  ${rc}  0
-
-    # delete the keys
-    Remove Files  %{VCH-NAME}.key  %{VCH-NAME}.key.pub
-
-Check Error From Incorrect ID
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux debug --target %{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user %{TEST_USERNAME} --password=%{TEST_PASSWORD} --id=wrong
-    Should Be Equal As Integers  ${rc}  1
-    Should Contain  ${output}  Failed to get Virtual Container Host 
-    Should Contain  ${output}  id "wrong" could not be found
-    
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.md
deleted file mode 100644
index d8d1d1618c..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.md
+++ /dev/null
@@ -1,15 +0,0 @@
-Test 6-12 - Verify vic-machine version
-=======
-
-# Purpose:
-Verify vic-machine version functions
-
-# References:
-* vic-machine-linux version -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps
-1. Get drone build ID and commit hash
-2. Verify version command show the ID and hash correctly
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.robot
deleted file mode 100644
index 265d2d7a5f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-12-Version.robot
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-12 - Verify vic-machine version command
-Resource  ../../resources/Util.robot
-Test Timeout  20 minutes
-
-*** Test Cases ***
-VIC-machine - Version check
-    Set Test Environment Variables
-
-    ${output}=  Run  bin/vic-machine-linux version
-    @{gotVersion}=  Split String  ${output}  ${SPACE}
-    ${version}=  Remove String  @{gotVersion}[2]
-    Log To Console  VIC machine version: ${version}
-    
-    ${result}=  Run  git rev-parse HEAD
-    @{gotVersion}=  Split String  ${result}  ${SPACE}
-    ${commithash}=  Remove String  @{gotVersion}[0]
-    
-    Log To Console  Last commit hash from git: ${commithash}
-
-    ${hash_result} =    Fetch From Right  ${version}  -
-    Log To Console  Commit Hash from vic-machine version: ${hash_result}
-
-    Should Contain  ${commithash}  ${hash_result}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.md
deleted file mode 100644
index 9f494da9f0..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.md
+++ /dev/null
@@ -1,141 +0,0 @@
-Test 6-13 - Verify vic-machine create TLS function
-=======
-
-# Purpose:
-Verify vic-machine create certificates
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-
-TLS Auth
-=======
-
-## Create VCH - defaults with --no-tls
-1. Issue the following command:
-```
-vic-machine-linux create --name=${vch-name} --target=%{TEST_URL} \
-    --user=%{TEST_USERNAME} --image-store=%{TEST_DATASTORE} --appliance-iso=bin/appliance.iso \
-    --bootstrap-iso=bin/bootstrap.iso --password=%{TEST_PASSWORD} --no-tls --force=true \
-    --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} \
-    --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} \
-    --volume-store=%{TEST_DATASTORE}/test:${vol}
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeeds
-* Regression tests pass
-
-## Create VCH - use custom --tls-cert-path
-1. Issue the following command:
-```
-vic-machine-linux create\
-    ${vicmachinetls}\
-    --name=%{VCH-NAME}\
-    --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}"\
-    --thumbprint=%{TEST_THUMBPRINT}\
-    --image-store=%{TEST_DATASTORE}\
-    --bridge-network=%{BRIDGE_NETWORK}\
-    --public-network=%{PUBLIC_NETWORK}\
-    --tls-cert-path=${EXECDIR}/foo-bar-certs/
-```
-### Expected Outcome
-* Certs are generated and stored in `foo-bar-cert`
-* Environment file in `foo-bar-certs/${VCH-NAME}` contains correct `DOCKER_CERT_PATH` variable definition
-
-## Create VCH - force accept target thumbprint
-1. Issue the following command:
-```
-vic-machine-linux create --name=${vch-name} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" \
-    --force --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} \
-    --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-```
-2. Run regression tests
-
-### Expected Outcome
-* Deployment succeed
-* Regression test pass
-
-
-## Create VCH - Specified keys
-1. Generate key/cert files
-2. Specify key, cert files during creation
-
-### Expected Outcome
-* Command should succeed,
-* Docker is accessed through tls connection, and the key/cert previous generated can be used to access docker
-* Regression test pass
-
-
-## Create VCH - Server certificate with multiple blocks
-1. Generate key/cert files with server-cert.pem containing a block other than CERTIFICATE as the
-   first PEM block
-2. Specify key, cert files during creation
-
-### Expected Outcome
-* vic-machine warns about failure to load x509 leaf
-* Deployment succeeds
-
-
-## Create VCH - Invalid keys
-1. Specify key, cert files with mal-format files
-
-### Expected Outcome
-* Command fail for wrong key/cert file
-
-
-## Create VCH - Reuse keys
-1. Create VCH
-2. Destroy VCH
-3. Create VCH using keys and certificates from previous deployment
-
-### Expected Outcome
-* Deployment succeeds
-
-
-## Create VCH - Server cert with untrusted CA
-1. Generate CA and wildcard server cert for DOMAIN
-2. Issue the following command to create the VCH with server cert and key
-```
-bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.${domain}.key.pem" --tls-server-cert "bundle/*.${domain}.cert.pem" --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --debug 1
-```
-
-### Expected Outcome
-* Client authentication is done with vic-machine generated CA
-* Certificate does not validate
-* Provided certificate is presented on vic-admin interface
-
-
-## Create VCH - Server cert with trusted CA
-0. Generate CA and wildcard server cert for DOMAIN
-1. Add root certificate to the system root CA store
-2. Issue the following command to create the VCH with a static IP, specified hostname, server cert, and key
-```
-bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.${domain}.key.pem" --tls-server-cert "bundle/*.${domain}.cert.pem" --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --debug 1
-```
-
-### Expected Outcome
-* Client authentication is done with vic-machine generated CA
-* Certificate validates
-* Deployment succeeds
-* Provided certificate is presented on vic-admin interface
-
-
-## Create VCH - Server cert with intermediate CA
-0. Generate root CA, intermediate CA, and wildcard server cert for DOMAIN
-1. Add root certificate to the system root CA store
-2. Issue the following command to create the VCH with a static IP, specified hostname, server cert chain including intermediate CA cert, and server key
-```
-bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.${domain}.key.pem" --tls-server-cert "bundle/*.${domain}.cert.pem" --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --debug 1
-```
-
-### Expected Outcome
-* Client authentication is done with vic-machine generated CA
-* Certificate validates
-* Deployment succeeds
-* Provided certificate is presented on vic-admin interface
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.robot
deleted file mode 100644
index efd6e02344..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-13-TLS.robot
+++ /dev/null
@@ -1,242 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-13 - Verify vic-machine create with TLS
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword If Test Failed  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Create VCH - defaults with --no-tls
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --no-tls --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - defaults custom cert path
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create ${vicmachinetls} --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --tls-cert-path=${EXECDIR}/foo-bar-certs/ --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  --tlscacert="${EXECDIR}/foo-bar-certs/ca.pem" --tlscert="${EXECDIR}/foo-bar-certs/cert.pem" --tlskey="${EXECDIR}/foo-bar-certs/key.pem"
-    Should Contain  ${output}  Generating CA certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/ca-key.pem
-    Should Contain  ${output}  Generating server certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/server-key.pem
-    Should Contain  ${output}  Generating client certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/key.pem
-    Should Contain  ${output}  Generated browser friendly PFX client certificate - certificate in ${EXECDIR}/foo-bar-certs/cert.pfx
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-
-    ${save_env}=  Run  cat ${EXECDIR}/foo-bar-certs/%{VCH-NAME}.env
-    Should Contain  ${save_env}  DOCKER_CERT_PATH=${EXECDIR}/foo-bar-certs
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-Create VCH - force accept target thumbprint
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Test that --force without --thumbprint accepts the --target thumbprint
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --force --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --insecure-registry harbor.ci.drone.local
-    Log  ${output}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-    Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Specified keys
-    Pass execution  Test not implemented until vic-machine can poll status correctly
-
-
-
-Create VCH - Server certificate with multiple blocks
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Install first to generate certificates
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    # Remove the installed VCH
-    ${ret}=  Run  bin/vic-machine-linux delete --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --name=%{VCH-NAME} --force
-    Should Contain  ${ret}  Completed successfully
-
-    # Update server-cert.pem with a junk block in the beginning
-    Run  echo "-----BEGIN RSA PRIVATE KEY-----\nJUNK\n-----END RSA PRIVATE KEY-----" | cat - ./%{VCH-NAME}/server-cert.pem > /tmp/%{VCH-NAME}-server-cert.pem && mv /tmp/%{VCH-NAME}-server-cert.pem ./%{VCH-NAME}/server-cert.pem
-
-    # Install VCH
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --no-tlsverify
-    Should Contain  ${output}  Failed to load x509 leaf
-    Should Contain  ${output}  Loaded server certificate
-    Should Contain  ${output}  Installer completed successfully
-
-    Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Invalid keys
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-
-    # Invalid server key
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --tls-ca="./%{VCH-NAME}/ca.pem" --tls-server-cert="./%{VCH-NAME}/server-cert.pem" --tls-server-key="./%{VCH-NAME}/ca.pem"
-    Should Contain  ${output}  found a certificate rather than a key in the PEM for the private key
-
-    # Invalid server cert
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --tls-ca="./%{VCH-NAME}/ca.pem" --tls-server-cert="./%{VCH-NAME}/server-key.pem" --tls-server-key="./%{VCH-NAME}/server-key.pem"
-    Should Contain  ${output}  did find a private key; PEM inputs may have been switched
-
-    # Invalid CA
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --tls-ca="./%{VCH-NAME}/key.pem" --tls-server-cert="./%{VCH-NAME}/server-cert.pem" --tls-server-key="./%{VCH-NAME}/server-key.pem"
-    Should Contain  ${output}  Unable to load certificate authority data
-
-    Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Reuse keys
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    Set Test Environment Variables
-
-    # use one install to generate certificates
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    # remove the initial deployment
-    ${ret}=  Run  bin/vic-machine-linux delete --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --name=%{VCH-NAME} --force
-    Should Contain  ${ret}  Completed successfully
-
-    # deploy using the same name - should reuse certificates
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls}
-    Should Contain  ${output}  Installer completed successfully
-
-    Should Contain  ${output}  Loaded server certificate
-    Should Contain  ${output}  Loaded CA with default name from certificate path
-    Should Contain  ${output}  Loaded client certificate with default name from certificate path
-
-    Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Server cert with untrusted CA
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Generate CA and wildcard cert for *.<DOMAIN>
-    Generate Certificate Authority
-    Generate Wildcard Server Certificate
-
-    ${out}=  Run  cp /root/ca/cert-bundle.tgz .; tar xvf cert-bundle.tgz
-    Log  ${out}
-
-    # Run vic-machine install, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.${domain}.key.pem" --tls-server-cert "bundle/*.${domain}.cert.pem" --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --debug 1
-    Log  ${output}
-    Should Contain  ${output}  Loaded server certificate bundle
-    Should Contain  ${output}  Unable to locate existing CA in cert path
-    Should Contain  ${output}  Failed to find a viable address for Docker API from certificates
-    Should Contain  ${output}  Server certificate hostname doesn't match
-    Should Contain  ${output}  Installer completed successfully
-
-    # Verify that the supplied certificate is presented on web interface
-    Get Docker Params  ${output}  ${true}
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-    Run  rm -rf bundle
-    Run  rm -f cert-bundle.tgz
-    Run  rm -rf /root/ca
-    Run Keyword And Ignore Error  Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Server cert with trusted CA
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Generate CA and wildcard cert for *.<DOMAIN>, install CA into root store
-    Generate Certificate Authority
-    Generate Wildcard Server Certificate
-    Trust Certificate Authority
-
-    ${out}=  Run  cp /root/ca/cert-bundle.tgz .; tar xvf cert-bundle.tgz
-    Log  ${out}
-
-    # Run vic-machine install, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.%{DOMAIN}.key.pem" --tls-server-cert "bundle/*.%{DOMAIN}.cert.pem" --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} ${vicmachinetls} --debug 1
-    Log  ${output}
-    Should Contain  ${output}  Loaded server certificate bundle
-    Should Contain  ${output}  Unable to locate existing CA in cert path
-    Should Contain  ${output}  Installer completed successfully
-
-
-    # Verify that the supplied certificate is presented on web interface
-    Get Docker Params  ${output}  ${true}
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-    Run  rm -rf bundle
-    Run  rm -f cert-bundle.tgz
-    Run  rm -rf /root/ca
-
-    Reload Default Certificate Authorities
-
-    Run Keyword And Ignore Error  Cleanup VIC Appliance On Test Server
-
-
-
-Create VCH - Server cert with intermediate CA
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-    Pass execution  Test not implemented
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.md
deleted file mode 100644
index 86f6faeba8..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.md
+++ /dev/null
@@ -1,54 +0,0 @@
-Test 6-14 - Verify vic-machine update firewall function
-=======
-
-# Purpose:
-Verify vic-machine update firewall
-
-# References:
-* vic-machine-linux update firewall -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-
-
-Update
-=======
-
-## Enable and disable VIC firewall rule
-1. Get state of host firewall
-2. Enable host firewall
-3. Verify host firewall enabled
-4. Enable VIC firewall rule by issuing the following command:
-```
-bin/vic-machine-linux update firewall --target %{TEST_URL} \
-    --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} \
-    --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} \
-    --allow
-```
-
-5. Verify state of rule by issuing the following command:
-```
-govc host.esxcli network firewall ruleset list --ruleset-id=vSPC
-```
-
-6. Create VCH
-7. Run regression tests
-8. Disable VIC firewall rule by issuing the following command:
-```
-bin/vic-machine-linux update firewall --target %{TEST_URL} \
-    --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} \
-    --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} \
-    --deny
-```
-
-9. Verify state of rule by issuing the following command:
-```
-govc host.esxcli network firewall ruleset list --ruleset-id=vSPC
-```
-
-10. Revert state of host firewall
-
-### Expected Outcome
-* Firewall rule state changes as expected
-* Regression tests pass
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.robot
deleted file mode 100644
index 3510cf26fc..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-14-Update-Firewall.robot
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-14 - Verify vic-machine update firewall function
-Resource  ../../resources/Util.robot
-Test Teardown  Run Keyword  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Enable and disable VIC firewall rule
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    # Save firewall state
-    ${fwSetState}=  Get Host Firewall Enabled
-
-    Enable Host Firewall
-    ${fwstatus}=  Get Host Firewall Enabled
-    Should Be True  ${fwstatus}
-
-    ${output}=  Run  bin/vic-machine-linux update firewall --target %{TEST_URL} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --thumbprint=%{TEST_THUMBPRINT} --allow
-    Should Contain  ${output}  enabled on host
-    Should Contain  ${output}  Firewall changes complete
-
-
-    ${output}=  Run  govc host.esxcli network firewall ruleset list --ruleset-id=vSPC
-    Should Contain  ${output}  true
-
-    ${output}=  Run  bin/vic-machine-linux create --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --no-tls --insecure-registry harbor.ci.drone.local
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-    Run Regression Tests
-
-    ${output}=  Run  bin/vic-machine-linux update firewall --target %{TEST_URL} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --compute-resource=%{TEST_RESOURCE} --timeout %{TEST_TIMEOUT} --thumbprint=%{TEST_THUMBPRINT} --deny
-    Should Contain  ${output}  disabled on host
-    Should Contain  ${output}  Firewall changes complete
-
-
-    ${output}=  Run  govc host.esxcli network firewall ruleset list --ruleset-id=vSPC
-    Should Contain  ${output}  false
-
-    # Restore firewall state
-    Run Keyword If  ${fwSetState}  Enable Host Firewall
-    Run Keyword Unless  ${fwSetState}  Disable Host Firewall
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.md
deleted file mode 100644
index 887acb5bef..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.md
+++ /dev/null
@@ -1,31 +0,0 @@
-Test 6-15 - Verify vic-machine syslog-address
-=======
-
-# Purpose:
-Verify remote syslog for VCH
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-This test requires that a syslog server is running and available
-
-# Test Steps
-1. Deploy VIC appliance with debug logs enabled, and syslog server specified
-2. Enable SSH on VIC appliance
-3. Open SSH connection to VIC appliance
-4. Get PIDs of running VIC daemons on VIC appliance
-5. Open SSH connection to syslog server
-6. Get contents of syslog file from syslog server
-7. Verify syslog messages from all daemons exist on the syslog server
-8. Run docker ps -a
-9. Get contents of syslog file from syslog server
-10. Verify messages generated by docker ps -a are on the syslog server
-11. Run a variety of docker commands
-12. Get contents of syslog file from syslog server
-
-# Expected Outcome
-* Step 6 output should have messages of the form <proc-name>[<proc-pid>] for docker-engine-server, port-layer-server, vic-init, and vicadmin
-* Step 9 output should contain output of the form docker-engine-server[<docker-engine-server-pid>]: Calling GET /v1.25/containers/json?all=1
-* Step 12 output should contain the output of the variety of docker commands
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.robot
deleted file mode 100644
index 2861d7530a..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-15-Syslog.robot
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-15 - Verify remote syslog
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  additional-args=--syslog-address tcp://%{SYSLOG_SERVER}:514 --debug 1
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Variables ***
-${SYSLOG_FILE}  /var/log/syslog
-
-*** Keywords ***
-Get Remote PID
-    [Arguments]  ${proc}
-    ${pid}=  Execute Command  ps -C ${proc} -o pid=
-    ${pid}=  Strip String  ${pid}
-    [Return]  ${pid}
-
-*** Test Cases ***
-Verify VCH remote syslog
-    # enable ssh
-    ${output}=  Run  bin/vic-machine-linux debug --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD}
-    Should Contain  ${output}  Completed successfully
-
-    # make sure we use ip address, and not fqdn
-    ${ip}=  Run  dig +short %{VCH-IP}
-    ${vch-ip}=  Set Variable If  '${ip}' == ''  %{VCH-IP}  ${ip}
-
-    @{procs}=  Create List  port-layer-server  docker-engine-server  vic-init  vicadmin
-    &{proc-pids}=  Create Dictionary
-    &{proc-hosts}=  Create Dictionary
-
-    ${vch-conn}=  Open Connection  ${vch-ip}
-    Login  root  password
-    :FOR  ${proc}  IN  @{procs}
-    \     ${pid}=  Get Remote PID  ${proc}
-    \     Set To Dictionary  ${proc-pids}  ${proc}  ${pid}
-    \     Set To Dictionary  ${proc-hosts}  ${proc}  ${vch-ip}
-    Close Connection
-    Set To Dictionary  ${proc-hosts}  vic-init  Photon
-
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} ps -a
-    Should Be Equal As Integers  ${rc}  0
-
-    Run Regression Tests
-
-    ${pull}=  Run  docker %{VCH-PARAMS} pull ${busybox}
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -d ${busybox} ls /
-    Should Be Equal As Integers  ${rc}  0
-    ${shortID}=  Get container shortID  ${id}
-
-    Wait Until Container Stops  ${id}  5
-
-    ${syslog-conn}=  Open Connection  %{SYSLOG_SERVER}
-    Login  %{SYSLOG_USER}  %{SYSLOG_PASSWD}
-    ${out}=  Execute Command  cat ${SYSLOG_FILE}
-    Close Connection
-    Log  ${out}
-
-    ${keys}=  Get Dictionary Keys  ${proc-pids}
-    :FOR  ${proc}  IN  @{keys}
-    \     ${pid}=  Get From Dictionary  ${proc-pids}  ${proc}
-    \     ${host}=  Get From Dictionary  ${proc-hosts}  ${proc}
-    \     Should Contain  ${out}  ${host} ${proc}[${pid}]:
-
-    ${pid}=  Get From Dictionary  ${proc-pids}  docker-engine-server
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling GET /v\\d.\\d{2}/containers/json\\?all\\=1
-
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling POST /v\\d.\\d{2}/containers/create
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling POST /v\\d.\\d{2}/images/create\\?fromImage\\=(\\S+)*busybox\\&tag\\=latest
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling POST /v\\d.\\d{2}/containers/\\w{64}/start
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling POST /v\\d.\\d{2}/containers/\\w{64}/stop
-
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling GET /v\\d.\\d{2}/images/json
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling GET /v\\d.\\d{2}/containers/json
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling GET /info
-
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling DELETE /v\\d.\\d{2}/containers/\\w{64}
-    Should Match Regexp  ${out}  ${vch-ip} docker-engine-server\\[${pid}\\]: Calling DELETE /v\\d.\\d{2}/images/(\\S+)*busybox
-
-    Should Match Regexp  ${out}  ${shortID} ${shortID}\\[1\\]: bin
-    Should Match Regexp  ${out}  ${shortID} ${shortID}\\[1\\]: home
-    Should Match Regexp  ${out}  ${shortID} ${shortID}\\[1\\]: var
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.md
deleted file mode 100644
index 7703d8ad4f..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.md
+++ /dev/null
@@ -1,70 +0,0 @@
-Test 6-16 - Verify vic-machine configure
-=======
-
-# Purpose:
-Verify vic-machine configure
-
-# References:
-* vic-machine-linux create -h
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps
-1. Deploy VCH
-2. Configure VCH
-3. Check the debug state of the VCH
-4. Check the debug state of an existing containerVM
-5. Configure the VCH by setting the debug state to 0
-6. Check the debug state of the VCH
-7. Check the debug state of the existing containerVM
-8. Create a new container and check the debug state of it
-9. Configure the debug state of the VCH again and check whether there is only a single snapshot left
-10. check whether the output of vic-machine inspect contains the desired debug state
-11. Configure the VCH by adding a container network
-12. Run docker network ls
-13. Run vic-machine inspect config
-14. Run a container with the new container network
-15. Configure the VCH by adding a new container network without specifying the previous network
-16. Configure the VCH by adding a new container network while specifying the previous network
-17. Run docker network ls
-18. Run vic-machine inspect config
-19. Run a container with the new container network
-20. Configure the VCH by attempting to change an existing container network
-21. Configure VCH http proxy
-22. Verify http proxy is set correctly through govc
-23. Configure the VCH's operations user credentials
-24. Run vic-machine inspect config
-26. Reset VCH http proxy using VCH ID
-26. Verify http proxy is reset correctly through govc
-27. Run vic-machine inspect config
-28. Configure VCH dns server to 10.118.81.1 and 10.118.81.2
-29. Run vic-machine inspect config
-30. Reset VCH dns server to default
-31. Run vic-machine inspect config
-32. Configure VCH resources
-33. Verify VCH configuration through vic-machine inspect
-34. Configure VCH resources with too small values
-35. Verify VCH configuration is rollback to old value
-35. Configure the VCH by adding a new volume store
-36. Run vic-machine inspect config
-37. Run docker info
-38. Create a volume on the default volume store
-39. Create a volume on the new volume store
-40. Run docker volume ls
-41. Configure the volume stores without specifying an existing volume store
-42. Configure the volume stores by attempting to change an existing volume store
-43. Configure the VCH by adding a new volume store with a URL scheme
-44. Run vic-machine inspect config
-45. Verify configure is in vic-machine dialog
-
-# Expected Outcome
-* Step 15 should fail with an error message saying that the existing container network must be specified
-* Step 20 should fail with an error message saying that changes to existing container networks are not supported
-* Step 24's output should contain the operations user's name and the host thumbprint
-* Step 36 and 37's output should contain both volume stores
-* Step 40's output should contain both volumes
-* Step 41 should fail with an error message saying that existing volume stores must be specified
-* Step 42 should fail with an error message saying that changes to existing volume stores are not supported
-* Step 44's output should contain all three volume stores
-* All other steps should succeed
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.robot
deleted file mode 100644
index 2239ab7788..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-16-Config.robot
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-16 - Verify vic-machine configure
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Configure VCH debug state
-    ${output}=  Run  bin/vic-machine-linux configure --help
-    Should Contain  ${output}  --debug
-    ${output}=  Check VM Guestinfo  %{VCH-NAME}  guestinfo.vice./init/diagnostics/debug
-    Should Contain  ${output}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${id1}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${vm1}=  Get VM display name  ${id1}
-    ${output}=  Check VM Guestinfo  ${vm1}  guestinfo.vice./diagnostics/debug
-    Should Contain  ${output}  1
-    ${output}=  Run  bin/vic-machine-linux configure --debug 0 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Check VM Guestinfo  %{VCH-NAME}  guestinfo.vice./init/diagnostics/debug
-    Should Contain  ${output}  0
-    ${output}=  Check VM Guestinfo  ${vm1}  guestinfo.vice./diagnostics/debug
-    Should Contain  ${output}  1
-    ${rc}  ${id2}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -itd ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${vm2}=  Get VM display name  ${id2}
-    ${output}=  Check VM Guestinfo  ${vm2}  guestinfo.vice./diagnostics/debug
-    Should Contain  ${output}  0
-    ${output}=  Run  bin/vic-machine-linux configure --debug 1 --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  Completed successfully
-    ${rc}  ${output}=  Run And Return Rc And Output  govc snapshot.tree -vm %{VCH-NAME} | grep reconfigure
-    Should Be Equal As Integers  ${rc}  0
-    ${output}=  Split To Lines  ${output}
-    Length Should Be  ${output}  1
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT}
-    Should Be Equal As Integers  0  ${rc}
-    Should Contain  ${output}  --debug=1
-
-Configure VCH Container Networks
-    ${out}=  Run  govc host.portgroup.remove vm-network
-    ${out}=  Run  govc host.portgroup.add -vswitch vSwitchLAN vm-network
-
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet
-    Should Contain  ${output}  Completed successfully
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vmnet
-
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --container-network=vm-network:vmnet
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --net=vmnet ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Test that configure fails if an existing container-network is not specified
-    ${out}=  Run  govc host.portgroup.remove management
-    ${out}=  Run  govc host.portgroup.add -vswitch vSwitchLAN management
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network management:mgmt --container-network-ip-range=management:10.10.10.0/24 --container-network-gateway=management:10.10.10.1/24
-    Should Contain  ${output}  all existing container networks must also be specified
-    Should Not Contain  ${output}  Completed successfully
-
-    # Add another container network while specifying the existing one
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet --container-network management:mgmt --container-network-ip-range=management:10.10.10.0/24 --container-network-gateway=management:10.10.10.1/24 --container-network-firewall=management:open
-    Should Contain  ${output}  Completed successfully
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} network ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  vmnet
-    Should Contain  ${output}  mgmt
-
-    ${stripped}=  Remove String  %{PUBLIC_NETWORK}  '
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --container-network=${stripped}:public
-    Should Contain  ${output}  --container-network=vm-network:vmnet
-    Should Contain  ${output}  --container-network=management:mgmt
-    Should Contain  ${output}  --container-network-ip-range=management:10.10.10.0/24
-    Should Contain  ${output}  --container-network-gateway=management:10.10.10.1/24
-    Should Contain  ${output}  --container-network-firewall=management:open
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run -dit --net=mgmt ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-
-    # Test that changes to existing networks are not supported
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet --container-network management:mgmt --container-network-ip-range=management:10.10.10.0/24 --container-network-gateway=management:10.10.10.2/24
-    Should Contain  ${output}  changes to existing container networks are not supported
-    Should Not Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet --container-network management:mgmt --container-network-ip-range=management:10.10.10.0/16 --container-network-gateway=management:10.10.10.1/24
-    Should Contain  ${output}  changes to existing container networks are not supported
-    Should Not Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet --container-network management:mgmt
-    Should Contain  ${output}  changes to existing container networks are not supported
-    Should Not Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --container-network=%{PUBLIC_NETWORK}:public --container-network vm-network:vmnet --container-network management:mgmt --container-network-firewall=management:closed
-    Should Contain  ${output}  changes to existing container networks are not supported
-    Should Not Contain  ${output}  Completed successfully
-
-
-    # Clean up portgroups
-    ${out}=  Run  govc host.portgroup.remove vm-network
-    ${out}=  Run  govc host.portgroup.remove management
-
-Configure VCH https-proxy
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --http-proxy http://proxy.vmware.com:3128
-    Should Contain  ${output}  Completed successfully
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep HTTP_PROXY
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  http://proxy.vmware.com:3128
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep HTTPS_PROXY
-    Should Be Equal As Integers  ${rc}  1
-    Should Not Contain  ${output}  proxy.vmware.com:3128
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --http-proxy=http://proxy.vmware.com:3128
-    Should Not Contain  ${output}  --https-proxy
-
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --https-proxy https://proxy.vmware.com:3128
-    Should Contain  ${output}  Completed successfully
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep HTTPS_PROXY
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  https://proxy.vmware.com:3128
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep HTTP_PROXY
-    Should Be Equal As Integers  ${rc}  1
-    Should Not Contain  ${output}  proxy.vmware.com:3128
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --https-proxy=https://proxy.vmware.com:3128
-    Should Not Contain  ${output}  --http-proxy
-
-Configure VCH ops user credentials and thumbprint
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --ops-user=%{TEST_USERNAME} --ops-password=%{TEST_PASSWORD}
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --ops-user=%{TEST_USERNAME}
-    Should Contain  ${output}  --thumbprint=%{TEST_THUMBPRINT}
-
-Configure VCH https-proxy through vch id
-    ${vch-id}=  Get VCH ID  %{VCH-NAME}
-    ${output}=  Run  bin/vic-machine-linux configure --id=${vch-id} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --https-proxy ""
-    Should Contain  ${output}  Completed successfully
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep HTTPS_PROXY
-    Should Be Equal As Integers  ${rc}  1
-    Should Not Contain  ${output}  proxy.vmware.com:3128
-
-Configure VCH DNS server
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT}
-    Should Not Contain  ${output}  --dns-server
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --dns-server 10.118.81.1 --dns-server 10.118.81.2
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT}
-    Should Contain  ${output}  --dns-server=10.118.81.1
-    Should Contain  ${output}  --dns-server=10.118.81.2
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep dns
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  network/dns
-    Should Not Contain  ${output}  assigned.dns
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --dns-server ""
-    Should Contain  ${output}  Completed successfully
-    Should Not Contain  ${output}  --dns-server
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -e %{VCH-NAME} | grep dns
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  assigned.dns
-    Should Not Contain  ${output}  network/dns
-
-Configure VCH resources
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --cpu 5129 --cpu-reservation 10 --cpu-shares 8000 --memory 4096 --memory-reservation 10 --memory-shares 163840
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --cpu=5129
-    Should Contain  ${output}  --cpu-reservation=10
-    Should Contain  ${output}  --cpu-shares=8000
-    Should Contain  ${output}  --memory=4096
-    Should Contain  ${output}  --memory-reservation=10
-    Should Contain  ${output}  --memory-shares=163840
-
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL}%{TEST_DATACENTER} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --cpu 1 --cpu-shares 1000 --memory 1 --memory-shares 1000
-    Should Not Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --cpu=5129
-    Should Contain  ${output}  --cpu-reservation=10
-    Should Contain  ${output}  --cpu-shares=8000
-    Should Contain  ${output}  --memory=4096
-    Should Contain  ${output}  --memory-reservation=10
-    Should Contain  ${output}  --memory-shares=163840
-
-Configure VCH volume stores
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-conf:configure
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-conf:configure
-
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} info
-    Should Be Equal As Integers  ${rc}  0
-    ${volstores}=  Get Lines Containing String  ${output}  VolumeStores:
-    Should Contain  ${volstores}  default
-    Should Contain  ${volstores}  configure
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create defaultVol
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume create confVol --opt VolumeStore=configure
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} volume ls
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  defaultVol
-    Should Contain  ${output}  confVol
-
-    # Test that configure fails if an existing volume store is not specified
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-conf:configure
-    Should Contain  ${output}  all existing volume stores must also be specified
-    Should Not Contain  ${output}  Completed successfully
-
-    # Test that changes to existing volume stores are not supported
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-badpath:configure
-    Should Contain  ${output}  changes to existing volume stores are not supported
-    Should Not Contain  ${output}  Completed successfully
-
-    # Add a new volume store while specifying the URL scheme
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target=%{TEST_URL} --thumbprint=%{TEST_THUMBPRINT} --user=%{TEST_USERNAME} --password=%{TEST_PASSWORD} --timeout %{TEST_TIMEOUT} --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default --volume-store=%{TEST_DATASTORE}/%{VCH-NAME}-conf:configure --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-scheme:scheme
-    Should Contain  ${output}  Completed successfully
-    ${output}=  Run  bin/vic-machine-linux inspect config --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT}
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-VOL:default
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-conf:configure
-    Should Contain  ${output}  --volume-store=ds://%{TEST_DATASTORE}/%{VCH-NAME}-scheme:scheme
-
-Configure Present in vic-machine
-    ${rc}  ${output}=  Run And Return Rc And Output  bin/vic-machine-linux
-    Should Contain  ${output}  configure
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.md
deleted file mode 100644
index 00a208843e..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.md
+++ /dev/null
@@ -1,38 +0,0 @@
-Test 6-17 - Verify vic-machine configure TLS function
-=======
-
-# Purpose:
-Verify vic-machine configure certificates
-
-# References:
-* vic-machine-linux configure -h
-
-# Environment:
-This test requires that a vSphere server is running and available. One VCH is created for the suite and used throughout by each test so that we don't have to call create & configure in each test (which would duplicate the work of 6-13-TLS).
-
-Configure VCH w/ own CA
-===
-Performs a similar test to the one in create.
-1) Generates a CA, self-signed
-2) Runs vic-machine configure against the VCH set up in pre-test
-3) Makes sure the installed certificate is the correct one
-
-Configure VCH w/ trusted CA
-===
-1) Generates a CA, adds it to trust pool, just like the test in Create
-2) Runs vic-machine to replace the previous cert with this one
-3) Uses openssl tool to verify correct trusted certificate is in place
-
-
-Configure VCH - Run Configure Without Cert Options & Ensure Certs are Unchanged
-===
-1) Generates a CA, installs it, verifies it's installed, as in the last test
-2) Calls configure again with *no* TLS options
-3) Check to make sure the installed cert from 1) is still presented
-
-
-Configure VCH - Replace certificates with self-signed certificate using --no-tlsverify
-===
-1) Calls configure against the existing VCH with --no-tlsverify and an empty --tls-cert-path
-2) Checks that a self-signed certificate is generated
-3) Checks that the installed certificate is the self-signed one that we just generated
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.robot
deleted file mode 100644
index 20c59eb1bb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-17-Configure-TLS.robot
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-17 - Verify vic-machine configure TLS options
-Resource  ../../resources/Util.robot
-Suite Teardown  Run Keyword  Cleanup VIC Appliance On Test Server
-Suite Setup  Run Keyword  Setup Test Environment
-Test Teardown  Run Keyword  Test Cleanup
-Test Timeout  20 minutes
-
-*** Keywords ***
-Setup Test Environment
-    Set Test Environment Variables
-    Run Keyword And Ignore Error  Test Cleanup
-    Run Keyword And Ignore Error  Cleanup Dangling VMs On Test Server
-    Run Keyword And Ignore Error  Cleanup Datastore On Test Server
-
-    ${output}=  Run  bin/vic-machine-linux create ${vicmachinetls} --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --image-store=%{TEST_DATASTORE} --bridge-network=%{BRIDGE_NETWORK} --public-network=%{PUBLIC_NETWORK} --tls-cert-path=${EXECDIR}/foo-bar-certs/
-    Should Contain  ${output}  --tlscacert="${EXECDIR}/foo-bar-certs/ca.pem" --tlscert="${EXECDIR}/foo-bar-certs/cert.pem" --tlskey="${EXECDIR}/foo-bar-certs/key.pem"
-    Should Contain  ${output}  Generating CA certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/ca-key.pem
-    Should Contain  ${output}  Generating server certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/server-key.pem
-    Should Contain  ${output}  Generating client certificate/key pair - private key in ${EXECDIR}/foo-bar-certs/key.pem
-    Should Contain  ${output}  Generated browser friendly PFX client certificate - certificate in ${EXECDIR}/foo-bar-certs/cert.pfx
-
-    Should Contain  ${output}  Installer completed successfully
-    Get Docker Params  ${output}  ${true}
-
-    ${save_env}=  Run  cat ${EXECDIR}/foo-bar-certs/%{VCH-NAME}.env
-    Should Contain  ${save_env}  DOCKER_CERT_PATH=${EXECDIR}/foo-bar-certs
-    Log To Console  Installer completed successfully: %{VCH-NAME}
-
-Test Cleanup
-    Run  rm -rf bundle cert-bundle.tgz out-bundle /root/ca ${EXECDIR}/foo-bar-certs
-
-*** Test Cases ***
-Configure VCH - Server cert with untrusted CA
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-    # Generate CA and wildcard cert for *.<DOMAIN>
-    Generate Certificate Authority
-    Generate Wildcard Server Certificate
-
-    ${out}=  Run  cp /root/ca/cert-bundle.tgz .; tar xvf cert-bundle.tgz
-    Log  ${out}
-
-    # Run vic-machine configure, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.${domain}.key.pem" --tls-server-cert "bundle/*.${domain}.cert.pem" ${vicmachinetls} --tls-cert-path "out-bundle" --debug 1
-    Log  ${output}
-    Should Contain  ${output}  Completed successfully
-
-    # Verify that the supplied certificate is presented on web interface
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-Configure VCH - Server cert with trusted CA
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    # Generate CA and wildcard cert for *.<DOMAIN>, install CA into root store
-    Generate Certificate Authority
-    Generate Wildcard Server Certificate
-    Trust Certificate Authority
-
-    ${out}=  Run  cp /root/ca/cert-bundle.tgz .; tar xvf cert-bundle.tgz
-    Log  ${out}
-
-    # Run vic-machine install, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.%{DOMAIN}.key.pem" --tls-server-cert "bundle/*.%{DOMAIN}.cert.pem" ${vicmachinetls} --debug 1
-    Log  ${output}
-    Should Contain  ${output}  Loaded server certificate bundle
-    Should Contain  ${output}  Unable to locate existing CA in cert path
-    Should Contain  ${output}  Completed successfully
-
-
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-    Reload Default Certificate Authorities
-
-Configure VCH - Run Configure Without Cert Options & Ensure Certs Are Unchanged
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    # Generate CA and wildcard cert for *.<DOMAIN>, install CA into root store
-    Generate Certificate Authority
-    Generate Wildcard Server Certificate
-    Trust Certificate Authority
-
-    ${out}=  Run  cp /root/ca/cert-bundle.tgz .; tar xvf cert-bundle.tgz
-    Log  ${out}
-
-    Run  rm -rf foo-bar-certs
-    # Run vic-machine configure, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} --tls-server-key "bundle/*.%{DOMAIN}.key.pem" --tls-server-cert "bundle/*.%{DOMAIN}.cert.pem" ${vicmachinetls} --tls-cert-path=foo-bar-certs --debug 1
-    Log  ${output}
-    Should Contain  ${output}  Loaded server certificate bundle
-    Should Contain  ${output}  Unable to locate existing CA in cert path
-    Should Contain  ${output}  Completed successfully
-
-
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-    Run  rm -rf bundle
-    Run  rm -f cert-bundle.tgz
-    Run  rm -rf /root/ca
-
-    Reload Default Certificate Authorities
-
-    # Run vic-machine configure, supply server cert and key
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} ${vicmachinetls} --debug 1
-
-    Log  ${output}
-    Should Contain  ${output}  No certificate regeneration requested. No new certificates provided. Certificates left unchanged
-
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-    Should Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
-
-    Reload Default Certificate Authorities
-
-Configure VCH - Replace certificates with self-signed certificate using --no-tlsverify
-
-    ${domain}=  Get Environment Variable  DOMAIN  ''
-    Run Keyword If  '${domain}' == ''  Pass Execution  Skipping test - domain not set, won't generate keys
-
-    Run  rm -rf foo-bar-certs
-    ${output}=  Run  bin/vic-machine-linux configure --name=%{VCH-NAME} --target="%{TEST_USERNAME}:%{TEST_PASSWORD}@%{TEST_URL}" --thumbprint=%{TEST_THUMBPRINT} ${vicmachinetls} --tls-cert-path "foo-bar-certs" --debug 1 --no-tlsverify
-
-    Should Contain  ${output}  Generating self-signed certificate/key pair - private key in foo-bar-certs/server-key.pem
-
-    Should Contain  ${output}  Completed successfully
-
-    ${output}=  Run  openssl s_client -showcerts -connect %{VCH-IP}:2378
-    Log  ${output}
-
-    Should Contain  ${output}  Verify return code: 21 (unable to verify the first certificate)
-    Should Contain  ${output}  verify error:num=20:unable to get local issuer certificate
-    Should Not Contain  ${output}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.md
deleted file mode 100644
index 972354e980..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.md
+++ /dev/null
@@ -1,23 +0,0 @@
-Test 6-18 - Verify vic-machine create --container-name-convention
-=======
-
-# Purpose:
-Verify vic-machine create --container-name-convention functions
-
-# References:
-* vic-machine-linux create -x
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps
-1. Create a new VCH using the --container-name-convention as 192.168.1.1-{id}
-2. Create a container and verify that the container works and vSphere name is according to the convention
-3. Run a variety of docker operations
-4. Create a new VCH using the --container-name-convention as 192.168.1.1-{name}
-5. Create a container and verify that the container works and vSphere name is according to the convention
-6. Run a variety of docker operations
-7. Create a new VCH using the --container-name-convention as 192.168.1.1-mycontainer
-
-# Expected Results
-* All steps should succeed as expected, except step should fail with an error indicating that {name} or {id} must be included
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.robot
deleted file mode 100644
index 5795729088..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/6-18-Container-Name-Convention.robot
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 6-18 - Container Name Convention
-Resource  ../../resources/Util.robot
-Test Teardown  Cleanup VIC Appliance On Test Server
-Test Timeout  20 minutes
-
-*** Test Cases ***
-Container name convention with id
-    Install VIC Appliance To Test Server  additional-args=--container-name-convention 192.168.1.1-{id}
-    Run  docker %{VCH-PARAMS} pull ${busybox}
-    ${containerID}=  Run  docker %{VCH-PARAMS} run -d ${busybox}
-    ${shortId}=  Get container shortID  ${containerID}
-    ${output}=  Run  govc ls vm
-    Should Contain  ${output}  192.168.1.1-${shortID}
-    Run  docker %{VCH-PARAMS} rm -f ${containerID}
-    Run Regression Tests
-    
-Container name convention with name
-    Install VIC Appliance To Test Server  additional-args=--container-name-convention 192.168.1.1-{name}
-    Run  docker %{VCH-PARAMS} pull ${busybox}
-    ${containerID}=  Run  docker %{VCH-PARAMS} run -d ${busybox}
-    ${name}=  Get container name  ${containerID}
-    ${output}=  Run  govc ls vm
-    Should Contain  ${output}  192.168.1.1-${name}
-    Run  docker %{VCH-PARAMS} rm -f ${containerID}
-    Run Regression Tests
-
-Container name convention with invalid argument
-    ${rc}  ${output}=  Run Keyword And Ignore Error  Install VIC Appliance To Test Server  additional-args=--container-name-convention 192.168.1.1-mycontainer
-    Should Contain  ${output}  Container name convention must include {id} or {name} token
-    [Teardown]  Log To Console  Test passed no need to run cleanup
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/TestCases.md
deleted file mode 100644
index 23cc2f4662..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group6-VIC-Machine/TestCases.md
+++ /dev/null
@@ -1,36 +0,0 @@
-Group 6 - VIC Machine
-=======
-
-
-[Test 6-01 - vic-machine delete --help](6-01-Help.md)
--
-[Test 6-02 - vic-machine delete default value](6-02-Default.md)
--
-[Test 6-03 - vic-machine delete force](6-03-Delete.md)
--
-[Test 6-04 - vic-machine create basic](6-04-Create-Basic.md)
--
-[Test 6-05 - vic-machine create validation](6-05-Create-Validation.md)
--
-[Test 6-06 - vic-machine create datastore](6-06-Create-Datastore.md)
--
-[Test 6-07 - vic-machine create network](6-07-Create-Network.md)
--
-[Test 6-08 - vic-machine create compute](6-08-Create-Compute.md)
--
-[Test 6-09 - vic-machine inspect](6-09-Inspect.md)
--
-[Test 6-10 - vic-machine ls](6-10-List.md)
--
-[Test 6-11 - vic-machine debug](6-11-Debug.md)
--
-[Test 6-12 - vic-machine version](6-12-Version.md)
--
-[Test 6-13 - vic-machine tls](6-13-TLS.md)
--
-[Test 6-14 - vic-machine update firewall](6-14-Update-Firewall.md)
--
-[Test 6-15 - vic-machine syslog-address](6-15-Syslog.md)
--
-[Test 6-16 - vic-machine configure](6-16-Config.md)
--
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.md
deleted file mode 100644
index a4a99948ce..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.md
+++ /dev/null
@@ -1,33 +0,0 @@
-Test 7-01 - Regression test
-=======
-
-# Purpose:
-To verify general functionality of the product in a rapid, repeatable manner for regression testing of all commits
-
-# References:
-[1 - Docker Command Line Reference](https://docs.docker.com/engine/reference/commandline/)
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Issue a docker pull busybox
-3. Issue a docker images, verify that busybox image shows up
-4. Issue a docker create busybox /bin/top
-5. Issue a docker start <containerID>
-6. Issue a docker ps, verify that the container shows up as running
-7. Issue a docker stop <containerID>
-8. Issue a docker ps, verify that the container is stopped
-9. Issue a docker rm <containerID>
-10. Pull container log bundle from VICadmin and ensure that the container's vmware.log is present
-11. Issue a docker ps, verify that the container is removed
-12. Issue a docker rmi busybox
-13. Issue a docker images, verify that busybox image is gone
-14. Remove the VIC appliance with vic-machine delete command, verify that the appliance was removed
-
-# Expected Outcome:
-VIC appliance should respond without error to each of the commands
-
-# Possible Problems:
-None
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.robot
deleted file mode 100644
index e004846cee..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group7-Regression/7-01-Regression.robot
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 7-01 - Regression
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Default Tags  regression
-
-*** Test Cases ***
-Regression test
-    Run Regression Tests
-
-    ${out}=  Run  govc vm.info %{VCH-NAME}
-    ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'VC'  Run  govc vm.info %{VCH-NAME}/%{VCH-NAME}
-    Run Keyword If  '%{HOST_TYPE}' == 'VC'  Set Test Variable  ${out}  ${ret}
-    ${ret}=  Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Run  govc vm.info %{VCH-NAME}
-    Run Keyword If  '%{HOST_TYPE}' == 'ESXi'  Set Test Variable  ${out}  ${ret}
-    Should Contain  ${out}  Photon - VCH
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.md
deleted file mode 100644
index 9868897c42..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Test 8-01 - Verify VM guest tools integration
-=======
-
-# Purpose:
-Verify VM guest tools integration for VCH and container VMs
-
-# References:
-* govc vm.ip
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Create VCH through vic-machine create
-2. Create container
-3. Check vSphere through govc to make sure guest IP addresses are set
-
-# Expected Outcome:
-* Step 3 should success
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.robot
deleted file mode 100644
index dc8f89e6fb..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-01-GuestTools.robot
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 8-01 - Verify VM guest tools integration
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Keywords ***
-Assert VM Power State
-    [Arguments]  ${name}  ${state}
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -json ${name}-* | jq -r .VirtualMachines[].Runtime.PowerState
-    Should Be Equal As Integers  ${rc}  0
-    Should Be Equal  ${output}  ${state}
-
-*** Test Cases ***
-Verify VCH VM guest IP is reported
-    ${ip}=  Run  govc vm.ip %{VCH-NAME}
-    # VCH ip should be the same as docker host param
-    Should Contain  %{VCH-PARAMS}  ${ip}
-
-Verify container VM guest IP is reported
-    ${rc}  ${output}=  Run And Return Rc And Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${name}=  Generate Random String  15
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${name} -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${ip}=  Run And Return Rc And Output  govc vm.ip ${name}-*
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.info -json ${name}-* | jq -r .VirtualMachines[].Guest.Net[].IpAddress[]
-    Should Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  ${ip}
-
-Stop container VM using guest shutdown
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Generate Random String  15
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${name} -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc And Output  govc vm.power -s ${name}-*
-    Should Be Equal As Integers  ${rc}  0
-    Wait Until Keyword Succeeds  20x  500 milliseconds  Assert VM Power State  ${name}  poweredOff
-
-Signal container VM using vix command
-    ${rc}=  Run And Return Rc  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    ${name}=  Generate Random String  15
-    ${rc}  ${id}=  Run And Return Rc And Output  docker %{VCH-PARAMS} run --name ${name} -d ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Run  govc vm.ip ${name}-*
-    # Invalid command
-    ${rc}=  Run And Return Rc  govc guest.start -vm ${name}-* -l ${id} hello world
-    Should Be Equal As Integers  ${rc}  1
-    # Invalid id (via auth user)
-    ${rc}=  Run And Return Rc  govc guest.start -vm ${name}-* kill USR1
-    Should Be Equal As Integers  ${rc}  1
-    # OK
-    ${rc}  ${output}=  Run And Return Rc And Output  govc guest.start -vm ${name}-* -l ${id} kill USR1
-    Should Be Equal As Integers  ${rc}  0
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.md
deleted file mode 100644
index e30fc806be..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Test 8-02 - OOB VM Register
-=======
-
-# Purpose:
-Verify that when a VM is registered OOB, the VIC continues to work
-
-# References:
-
-# Environment:
-This test requires that a vSphere server is running and available
-
-# Test Steps:
-1. Install new VCH appliance
-2. Create a VM out of band
-3. Unregister the created VM
-4. Register the created VM
-5. Issue docker ps -a
-
-# Expected Outcome:
-* The VCH should continue to function properly and docker ps -a should return proper output without error
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.robot
deleted file mode 100644
index 32176fe5a3..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/8-02-OOB-VM-Register.robot
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 8-02 OOB VM Register
-Resource  ../../resources/Util.robot
-Suite Teardown  Extra Cleanup
-
-*** Keywords ***
-Extra Cleanup
-    ${out}=  Run Keyword And Ignore Error  Run  govc vm.destroy ${old-vm}
-    ${out}=  Run Keyword And Ignore Error  Run  govc pool.destroy host/*/Resources/${old-vm}
-    ${out}=  Run Keyword And Ignore Error  Run  govc datastore.rm ${old-vm}
-    ${out}=  Run Keyword And Ignore Error  Run  govc host.portgroup.remove ${old-vm}-bridge
-    Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Verify VIC Still Works When Different VM Is Registered
-    Install VIC Appliance To Test Server
-    Set Suite Variable  ${old-vm}  %{VCH-NAME}
-    Install VIC Appliance To Test Server
-
-    ${out}=  Run  govc vm.power -off ${old-vm}
-    Should Contain  ${out}  OK
-    ${out}=  Run  govc vm.unregister ${old-vm}
-    Should Be Empty  ${out}
-    ${out}=  Run  govc vm.register ${old-vm}/${old-vm}.vmx
-    Should Be Empty  ${out}
-
-    ${out}=  Run  docker %{VCH-PARAMS} ps -a
-    Log  ${out}
-    Should Contain  ${out}  CONTAINER ID
-    Should Contain  ${out}  IMAGE
-    Should Contain  ${out}  COMMAND
-
-    Run Regression Tests
-
-    ${out}=  Run  govc vm.destroy ${old-vm}
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/TestCases.md
deleted file mode 100644
index 06b1533a17..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group8-vSphere-Integration/TestCases.md
+++ /dev/null
@@ -1,8 +0,0 @@
-Group 8 - vSphere Integration
-=======
-
-
-[Test 8-01 - Verify VM guest tools integration](8-01-GuestTools.md)
--
-[Test 8-02 - OOB VM Register](8-02-OOB-VM-Register.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.md
deleted file mode 100644
index b2074c312b..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.md
+++ /dev/null
@@ -1,89 +0,0 @@
-Test 9-01 - VIC Admin ShowHTML
-=======
-
-# Purpose:
-To verify that the VIC Administration appliance can display HTML
-
-# Environment:
-This test requires that a vSphere environment be running and available
-
-# Test Steps:
-1. Deploy VIC appliance to the vSphere server
-2. Pull the VICadmin web page and verify that it contains valid HTML
-3. Pull the Portlayer log file and verify that it contains valid data
-4. Pull the VCH-Init log and verify that it contains valid data
-5. Pull the Docker Personality log and verify that it contains valid data
-6. Create a container via the appliance
-7. Pull the container log bundle from the appliance and verify that it contains the new container's logs
-
-# Expected Outcomes:
-* VICadmin should display a web page that at a minimum includes <title>VIC Admin</title>
-* VICadmin responds with a log file indicating that the portlayer sever has started
-* VICadmin responds with a log file indicating VCH init has begun reaping processes
-* VICadmin responds with log file indicating docker personality service has started
-* VICadmin responds with a ZIP file containing at a minimum the vmware.log file from the new container
-
-# Unauthenticated Test Cases
-
-## Get Login Page
-1. Access the authentication web page
-
-## While Logged Out Fail To Display HTML
-1. Required authentication on restricted pages
-2. Page requests authentication
-
-## While Logged Out Fail To Get Portlayer Log
-1. Portlayer logs are restricted to authenticated users
-2. Page requests authentication
-
-## While Logged Out Fail To Get VCH-Init Log
-1. VCH_Init logs are restricted to authenticated users
-2. Page requests authentication
-
-## While Logged Out Fail To Get Docker Personality Log
-1. Personality logs are restricted to authenticated users
-2. Page requests authentication
-
-## While Logged Out Fail To Get Container Logs
-1. Container logs are restricted to authenticated users
-2. Page requests authentication
-
-## While Logged Out Fail To Get VICAdmin Log
-1. VICAdmin logs are restricted to authenticated users
-2. Page requests authentication
-
-# Authenticated Test Cases
-
-## Display HTML
-1. Log in
-2. Page displays vic-machine name in title
-
-## Get Portlayer Log
-1. Log in
-2. Portlayer Log access is allowed and logs are downloaded
-
-## Get VCH-Init Log
-1. Log in
-2. VCH-Init Log access is allowed and logs are downloaded
-
-## Get Docker Personality Log
-1. Log in
-2. Docker Personality Log access is allowed and logs are downloaded
-
-## Get Container Logs
-1. Log in
-2. Container Log access is allowed and logs are downloaded
-
-## Get VICAdmin Log
-1. Log in
-2. VICAdmin Log access is allowed and logs are downloaded
-
-## Check that VIC logs do not contain sensitive data
-1. Log in
-2. Fetch all logs in /logs/ path
-3. None of the downloaded logs contain the vch or vSphere password
-
-## Wan Routes Through Proxy
-1. Start a vch with a proxy defined at a localhost port. The proxy isn't actually running, so all requests will fail. IF the wan requests fail we know they were routed through the proxy.
-2. Log in to VICAdmin
-3. Verify wan health check is not successful.
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.robot
deleted file mode 100644
index c41f3dd9c5..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-01-VICAdmin-ShowHTML.robot
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 9-01 - VICAdmin ShowHTML
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${false}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Default Tags
-
-*** Keywords ***
-Login And Save Cookies
-    [Tags]  secret
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/authentication -XPOST -F username=%{TEST_USERNAME} -F password=%{TEST_PASSWORD} -D /tmp/cookies-%{VCH-NAME}
-    Should Be Equal As Integers  ${rc}  0
-
-*** Test Cases ***
-Get Login Page
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/authentication
-    Should contain  ${output}  <title>VCH Admin</title>
-
-While Logged Out Fail To Display HTML
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}
-    Should not contain  ${output}  <title>VIC: %{VCH-NAME}</title>
-    Should Contain  ${output}  <a href="/authentication">See Other</a>.
-
-While Logged Out Fail To Get Portlayer Log
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/port-layer.log
-    Should Not Contain  ${output}  Launching portlayer server
-    Should Contain  ${output}  <a href="/authentication">See Other</a>.
-
-While Logged Out Fail To Get VCH-Init Log
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/init.log
-    Should not contain  ${output}  reaping child processes
-    Should Contain  ${output}  <a href="/authentication">See Other</a>.
-
-While Logged Out Fail To Get Docker Personality Log
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/docker-personality.log
-    Should not contain  ${output}  docker personality
-    Should Contain  ${output}  <a href="/authentication">See Other</a>.
-
-While Logged Out Fail To Get Container Logs
-    ${rc}  ${output}=  Run And Return Rc and Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${container}=  Run And Return Rc and Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${container}  Error
-    ${rc}  ${output}=  Run And Return Rc and Output  docker %{VCH-PARAMS} start ${container}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${output}=  Run And Return Rc and Output  curl -sk %{VIC-ADMIN}/container-logs.tar.gz | tar tvzf -
-    Should not Be Equal As Integers  ${rc}  0
-    Should Contain  ${output}  gzip: stdin: not in gzip format
-    Log  ${output}
-    Should not Contain  ${output}  ${container}/vmware.log
-    Should not Contain  ${output}  ${container}/tether.debug
-
-While Logged Out Fail To Get VICAdmin Log
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/vicadmin.log
-    Log  ${output}
-    Should not contain  ${output}  Launching vicadmin pprof server
-    Should Contain  ${output}  <a href="/authentication">See Other</a>.
-
-Display HTML
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN} -b /tmp/cookies-%{VCH-NAME}
-    Should contain  ${output}  <title>VIC: %{VCH-NAME}</title>
-
-Get Portlayer Log
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/port-layer.log -b /tmp/cookies-%{VCH-NAME}
-    Should contain  ${output}  Launching portlayer server
-
-Get VCH-Init Log
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/init.log -b /tmp/cookies-%{VCH-NAME}
-    Should contain  ${output}  reaping child processes
-
-Get Docker Personality Log
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/docker-personality.log -b /tmp/cookies-%{VCH-NAME}
-    Should contain  ${output}  docker personality
-
-Get Container Logs
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc and Output  docker %{VCH-PARAMS} pull ${busybox}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${rc}  ${container}=  Run And Return Rc and Output  docker %{VCH-PARAMS} create ${busybox} /bin/top
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${container}  Error
-    ${rc}  ${output}=  Run And Return Rc and Output  docker %{VCH-PARAMS} start ${container}
-    Log  ${output}
-    Should Be Equal As Integers  ${rc}  0
-    Should Not Contain  ${output}  Error
-    ${vmName}=  Get VM Display Name  ${container}
-    ${rc}  ${output}=  Run And Return Rc and Output  curl -sk %{VIC-ADMIN}/container-logs.tar.gz -b /tmp/cookies-%{VCH-NAME} | (cd /tmp; tar xvzf - ${vmName}/tether.debug ${vmName}/vmware.log)
-    Log  ${output}
-    ${rc}  ${output}=  Run And Return Rc and Output  ls -l /tmp/${vmName}/vmware.log
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc and Output  ls -l /tmp/${vmName}/tether.debug
-    Should Be Equal As Integers  ${rc}  0
-    ${rc}  ${output}=  Run And Return Rc and Output  grep 'prepping for switch to container filesystem' /tmp/${vmName}/tether.debug
-    Should Be Equal As Integers  ${rc}  0
-    Run  rm -f /tmp/${vmName}/tether.debug /tmp/${vmName}/vmware.log
-
-Get VICAdmin Log
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN}/logs/vicadmin.log -b /tmp/cookies-%{VCH-NAME}
-    Log  ${output}
-    Should contain  ${output}  Launching vicadmin pprof server
-
-Check that VIC logs do not contain sensitive data
-    Scrape Logs For The Password
-
-Wan Routes Through Proxy
-    Cleanup VIC Appliance On Test Server
-    Install VIC Appliance To Test Server  certs=${false}  additional-args=--http-proxy=http://0.0.0.0:12345
-
-    Login And Save Cookies
-    ${rc}  ${output}=  Run And Return Rc And Output  curl -sk %{VIC-ADMIN} -b /tmp/cookies-%{VCH-NAME}
-    Should contain  ${output}  <div class="sixty">Registry and Internet Connectivity<span class="error-message">
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-02-VICAdmin-CertAuth.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-02-VICAdmin-CertAuth.robot
deleted file mode 100644
index bbdbf95683..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-02-VICAdmin-CertAuth.robot
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 9-02 - VICAdmin CertAuth
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server  certs=${true}
-Suite Teardown  Cleanup VIC Appliance On Test Server
-Default Tags
-
-*** Keywords ***
-Curl
-    [Arguments]  ${path}
-    ${output}=  Run  curl -sk --cert %{DOCKER_CERT_PATH}/cert.pem --key %{DOCKER_CERT_PATH}/key.pem %{VIC-ADMIN}${path}
-    Should Not Be Equal As Strings  ''  ${output}
-    [Return]  ${output}
-
-*** Test Cases ***
-Display HTML
-     ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl  ${EMPTY}
-     Should contain  ${output}  <title>VIC: %{VCH-NAME}</title>
-
-Get Portlayer Log
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl  /logs/port-layer.log
-    Should contain  ${output}  Launching portlayer server
-
-Get VCH-Init Log
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl  /logs/init.log
-    Should contain  ${output}  reaping child processes
-
-Get Docker Personality Log
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl  /logs/docker-personality.log
-    Should contain  ${output}  docker personality
-
-Get VICAdmin Log
-    ${output}=  Wait Until Keyword Succeeds  10x  10s  Curl  /logs/vicadmin.log
-    Log  ${output}
-    Should contain  ${output}  Launching vicadmin pprof server
-
-Fail to Get VICAdmin Log without cert
-    ${output}=  Run  curl -sk %{VIC-ADMIN}/logs/vicadmin.log
-    Log  ${output}
-    Should Not contain  ${output}  Launching vicadmin pprof server
-
-Fail to Display HTML without cert
-    ${output}=  Run  curl -sk %{VIC-ADMIN}
-    Log  ${output}
-    Should Not contain  ${output}  <title>VCH %{VCH-NAME}</title>
-
-Fail to get Portlayer Log without cert
-    ${output}=  Run  curl -sk %{VIC-ADMIN}/logs/port-layer.log
-    Log  ${output}
-    Should Not contain  ${output}  Launching portlayer server
-
-Fail to get Docker Personality Log without cert
-    ${output}=  Run  curl -sk %{VIC-ADMIN}/logs/docker-personality.log
-    Log  ${output}
-    Should Not contain  ${output}  docker personality
-
-Fail to get VCH init logs without cert
-    ${output}=  Run  curl -sk %{VIC-ADMIN}/logs/init.log
-    Log  ${output}
-    Should Not contain  ${output}  reaping child processes
-
-Check that VIC logs do not contain sensitive data
-    Scrape Logs For The Password
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-03-VICAdmin-Log-Failed-Attempts.robot b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-03-VICAdmin-Log-Failed-Attempts.robot
deleted file mode 100644
index fe00420073..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/9-03-VICAdmin-Log-Failed-Attempts.robot
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#	http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License
-
-*** Settings ***
-Documentation  Test 9-03 - VICAdmin Log Failed Attempts
-Resource  ../../resources/Util.robot
-Suite Setup  Install VIC Appliance To Test Server
-Suite Teardown  Cleanup VIC Appliance On Test Server
-
-*** Test Cases ***
-Verify Unable To Verify
-    ${out}=  Run  wget --tries=3 --connect-timeout=10 %{VIC-ADMIN}/logs/vicadmin.log -O failure.log
-    Should Contain  ${out}  ERROR: cannot verify
-    Should Contain  ${out}  certificate, issued by
-    Should Contain  ${out}  Unable to locally verify the issuer's authority.
-    
-Verify Temporary Redirect
-    ${out}=  Run  wget --tries=3 --connect-timeout=10 --no-check-certificate %{VIC-ADMIN}/logs/vicadmin.log -O failure.log
-    Should Contain  ${out}  HTTP request sent, awaiting response... 303 See Other
-
-Verify Failed Log Attempts
-    #Save the first appliance certs and cleanup the first appliance
-    #${old-certs}=  Set Variable  %{DOCKER_CERT_PATH}
-    Run  cp -r %{DOCKER_CERT_PATH} old-certs
-    Cleanup VIC Appliance On Test Server
-    
-    #Install a second appliance
-    Install VIC Appliance To Test Server
-    OperatingSystem.File Should Exist  old-certs/cert.pem
-    OperatingSystem.File Should Exist  old-certs/key.pem
-    ${out}=  Run  wget -v --tries=3 --connect-timeout=10 --certificate=old-certs/cert.pem --private-key=old-certs/key.pem --no-check-certificate %{VIC-ADMIN}/logs/vicadmin.log -O failure.log
-    Log  ${out}
-    ${out}=  Run  wget -v --tries=3 --connect-timeout=10 --certificate=%{DOCKER_CERT_PATH}/cert.pem --private-key=%{DOCKER_CERT_PATH}/key.pem --no-check-certificate %{VIC-ADMIN}/logs/vicadmin.log -O success.log
-    Log  ${out}
-    ${out}=  Run  cat success.log
-    Log  ${out}
-    ${out}=  Run  grep -i fail success.log
-    Should Contain  ${out}  tls: failed to verify client's certificate: x509: certificate signed by unknown authority
-    Run  rm -r old-certs
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/TestCases.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/TestCases.md
deleted file mode 100644
index b3f5097189..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/Group9-VIC-Admin/TestCases.md
+++ /dev/null
@@ -1,5 +0,0 @@
-Group 9 - VIC Admin
-=======
-
-
-[Test 9-01 - VICAdmin ShowHTML](9-01-VICAdmin-ShowHTML.md)
diff --git a/installer/vendor/github.com/vmware/vic/tests/test-cases/TestGroups.md b/installer/vendor/github.com/vmware/vic/tests/test-cases/TestGroups.md
deleted file mode 100644
index 431109cf2d..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/test-cases/TestGroups.md
+++ /dev/null
@@ -1,26 +0,0 @@
-VIC Integration Test Suite
-=======
-
-
-[Group 1 - Docker Commands](Group1-Docker-Commands/TestCases.md)
--
-[Group 2 - Docker Archive](Group2-Docker-Archive/TestCases.md)
--
-[Group 3 - Docker Compose](Group3-Docker-Compose/TestCases.md)
--
-[Group 4 - Docker Integration](Group4-Docker-Integration/TestCases.md)
--
-[Group 6 - VIC Machine](Group6-VIC-Machine/TestCases.md)
--
-[Group 9 - VIC Admin](Group9-VIC-Admin/TestCases.md)
--
-[Group 10 - VCH Restart](Group10-VCH-Restart/TestCases.md)
--
-[Group 11 - Upgrade](Group11-Upgrade/TestCases.md)
--
-[Group 12 - VCH-BC](Group12-VCH-BC/TestCases.md)
--
-[Group 13 - VAC](Group13-VAC/TestCases.md)
--
-[Group 22 - Docker-Apps](Group22-Docker-Apps/TestCases.md)
--
\ No newline at end of file
diff --git a/installer/vendor/github.com/vmware/vic/tests/wait_until_previous_builds_complete.sh b/installer/vendor/github.com/vmware/vic/tests/wait_until_previous_builds_complete.sh
deleted file mode 100755
index cd34cc8146..0000000000
--- a/installer/vendor/github.com/vmware/vic/tests/wait_until_previous_builds_complete.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-# Copyright 2016 VMware, Inc. All Rights Reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-unit_test_array=($TEST_URL_ARRAY)
-numServers=${#unit_test_array[@]}
-DRONE_BUILD_NUMBER=${DRONE_BUILD_NUMBER:=0}
-prevBuildStatus=`drone build info --format='{{.Status}}' vmware/vic $(( $DRONE_BUILD_NUMBER-$numServers ))`
-echo prevBuildStatus $prevBuildStatus
-
-while [[ $prevBuildStatus == *"running"* ]]; do
-    echo "Waiting 5 minutes for previous build to complete";
-    sleep 300;
-    prevBuildStatus=`drone build info --format='{{.Status}}' vmware/vic $(( $DRONE_BUILD_NUMBER-$numServers ))`
-	echo prevBuildStatus $prevBuildStatus
-done
-set +x;
-exit 0
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/README b/installer/vendor/github.com/vmware/vmw-guestinfo/README
deleted file mode 100644
index 3d8f5535f3..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This package provides access to the guestinfo variables exposed to a VMware virtual machine.
-
-see examples/main.go for an example
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor.go
index 56beb8cfc0..43ee14cf63 100644
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor.go
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,7 +15,6 @@
 package bdoor
 
 const (
-	BackdoorMagic      = uint64(0x564D5868)
 	BackdoorPort       = uint16(0x5658)
 	BackdoorHighBWPort = uint16(0x5659)
 
@@ -26,109 +25,80 @@ const (
 	CommandFlagCookie    = uint32(0x80000000)
 )
 
-type BackdoorProto struct {
-	// typedef union {
-	//   struct {
-	//      DECLARE_REG_NAMED_STRUCT(ax);
-	//      size_t size; /* Register bx. */
-	//      DECLARE_REG_NAMED_STRUCT(cx);
-	//      DECLARE_REG_NAMED_STRUCT(dx);
-	//      DECLARE_REG_NAMED_STRUCT(si);
-	//      DECLARE_REG_NAMED_STRUCT(di);
-	//   } in;
-	//   struct {
-	//      DECLARE_REG_NAMED_STRUCT(ax);
-	//      DECLARE_REG_NAMED_STRUCT(bx);
-	//      DECLARE_REG_NAMED_STRUCT(cx);
-	//      DECLARE_REG_NAMED_STRUCT(dx);
-	//      DECLARE_REG_NAMED_STRUCT(si);
-	//      DECLARE_REG_NAMED_STRUCT(di);
-	//   } out;
-	// } proto;
-
-	AX, BX, CX, DX, SI, DI, BP UInt64
-	size                       uint32
-}
-
-func bdoor_inout(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
-func bdoor_hbout(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
-func bdoor_hbin(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
-func bdoor_inout_test(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
-
 func (p *BackdoorProto) InOut() *BackdoorProto {
-	p.DX.Low.Low = BackdoorPort
-	p.AX.SetQuad(BackdoorMagic)
+	p.DX.AsUInt32().Low = BackdoorPort
+	p.AX.SetValue(BackdoorMagic)
 
 	retax, retbx, retcx, retdx, retsi, retdi, retbp := bdoor_inout(
-		p.AX.Quad(),
-		p.BX.Quad(),
-		p.CX.Quad(),
-		p.DX.Quad(),
-		p.SI.Quad(),
-		p.DI.Quad(),
-		p.BP.Quad(),
+		p.AX.Value(),
+		p.BX.Value(),
+		p.CX.Value(),
+		p.DX.Value(),
+		p.SI.Value(),
+		p.DI.Value(),
+		p.BP.Value(),
 	)
 
 	ret := &BackdoorProto{}
-	ret.AX.SetQuad(retax)
-	ret.BX.SetQuad(retbx)
-	ret.CX.SetQuad(retcx)
-	ret.DX.SetQuad(retdx)
-	ret.SI.SetQuad(retsi)
-	ret.DI.SetQuad(retdi)
-	ret.BP.SetQuad(retbp)
+	ret.AX.SetValue(retax)
+	ret.BX.SetValue(retbx)
+	ret.CX.SetValue(retcx)
+	ret.DX.SetValue(retdx)
+	ret.SI.SetValue(retsi)
+	ret.DI.SetValue(retdi)
+	ret.BP.SetValue(retbp)
 
 	return ret
 }
 
 func (p *BackdoorProto) HighBandwidthOut() *BackdoorProto {
-	p.DX.Low.Low = BackdoorHighBWPort
-	p.AX.SetQuad(BackdoorMagic)
+	p.DX.AsUInt32().Low = BackdoorHighBWPort
+	p.AX.SetValue(BackdoorMagic)
 
 	retax, retbx, retcx, retdx, retsi, retdi, retbp := bdoor_hbout(
-		p.AX.Quad(),
-		p.BX.Quad(),
-		p.CX.Quad(),
-		p.DX.Quad(),
-		p.SI.Quad(),
-		p.DI.Quad(),
-		p.BP.Quad(),
+		p.AX.Value(),
+		p.BX.Value(),
+		p.CX.Value(),
+		p.DX.Value(),
+		p.SI.Value(),
+		p.DI.Value(),
+		p.BP.Value(),
 	)
 
 	ret := &BackdoorProto{}
-	ret.AX.SetQuad(retax)
-	ret.BX.SetQuad(retbx)
-	ret.CX.SetQuad(retcx)
-	ret.DX.SetQuad(retdx)
-	ret.SI.SetQuad(retsi)
-	ret.DI.SetQuad(retdi)
-	ret.BP.SetQuad(retbp)
+	ret.AX.SetValue(retax)
+	ret.BX.SetValue(retbx)
+	ret.CX.SetValue(retcx)
+	ret.DX.SetValue(retdx)
+	ret.SI.SetValue(retsi)
+	ret.DI.SetValue(retdi)
+	ret.BP.SetValue(retbp)
 
 	return ret
 }
 
 func (p *BackdoorProto) HighBandwidthIn() *BackdoorProto {
-	p.DX.Low.Low = BackdoorHighBWPort
-	p.AX.SetQuad(BackdoorMagic)
+	p.DX.AsUInt32().Low = BackdoorHighBWPort
+	p.AX.SetValue(BackdoorMagic)
 
 	retax, retbx, retcx, retdx, retsi, retdi, retbp := bdoor_hbin(
-		p.AX.Quad(),
-		p.BX.Quad(),
-		p.CX.Quad(),
-		p.DX.Quad(),
-		p.SI.Quad(),
-		p.DI.Quad(),
-		p.BP.Quad(),
+		p.AX.Value(),
+		p.BX.Value(),
+		p.CX.Value(),
+		p.DX.Value(),
+		p.SI.Value(),
+		p.DI.Value(),
+		p.BP.Value(),
 	)
 
 	ret := &BackdoorProto{}
-	ret.AX.SetQuad(retax)
-	ret.BX.SetQuad(retbx)
-	ret.CX.SetQuad(retcx)
-	ret.DX.SetQuad(retdx)
-	ret.SI.SetQuad(retsi)
-	ret.DI.SetQuad(retdi)
-	ret.BP.SetQuad(retbp)
+	ret.AX.SetValue(retax)
+	ret.BX.SetValue(retbx)
+	ret.CX.SetValue(retcx)
+	ret.DX.SetValue(retdx)
+	ret.SI.SetValue(retsi)
+	ret.DI.SetValue(retdi)
+	ret.BP.SetValue(retbp)
 
 	return ret
 }
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.go
new file mode 100644
index 0000000000..ea9a2f2597
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.go
@@ -0,0 +1,48 @@
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bdoor
+
+const (
+	BackdoorMagic = uint32(0x564D5868)
+)
+
+type BackdoorProto struct {
+	// typedef union {
+	//   struct {
+	//      DECLARE_REG_NAMED_STRUCT(ax);
+	//      size_t size; /* Register bx. */
+	//      DECLARE_REG_NAMED_STRUCT(cx);
+	//      DECLARE_REG_NAMED_STRUCT(dx);
+	//      DECLARE_REG_NAMED_STRUCT(si);
+	//      DECLARE_REG_NAMED_STRUCT(di);
+	//   } in;
+	//   struct {
+	//      DECLARE_REG_NAMED_STRUCT(ax);
+	//      DECLARE_REG_NAMED_STRUCT(bx);
+	//      DECLARE_REG_NAMED_STRUCT(cx);
+	//      DECLARE_REG_NAMED_STRUCT(dx);
+	//      DECLARE_REG_NAMED_STRUCT(si);
+	//      DECLARE_REG_NAMED_STRUCT(di);
+	//   } out;
+	// } proto;
+
+	AX, BX, CX, DX, SI, DI, BP UInt32
+	size                       uint32
+}
+
+func bdoor_inout(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+func bdoor_hbout(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+func bdoor_hbin(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+func bdoor_inout_test(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.s b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.s
new file mode 100644
index 0000000000..a6e11b113f
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_386.s
@@ -0,0 +1,112 @@
+#include "textflag.h"
+
+// Doc of the golang plan9 assembler
+// http://p9.nyx.link/labs/sys/doc/asm.html
+//
+// A good primer of how to write golang with some plan9 flavored assembly
+// http://www.doxsey.net/blog/go-and-assembly
+//
+// Some x86 references
+// http://www.eecg.toronto.edu/~amza/www.mindsec.com/files/x86regs.html
+// https://cseweb.ucsd.edu/classes/sp10/cse141/pdf/02/S01_x86_64.key.pdf
+// https://en.wikibooks.org/wiki/X86_Assembly/Other_Instructions
+//
+// (This one is invaluable.  Has a working example of how a standard function
+// call looks on the stack with the associated assembly.)
+// https://www.recurse.com/blog/7-understanding-c-by-learning-assembly
+//
+// Reference with raw form of the Opcode
+// http://x86.renejeschke.de/html/file_module_x86_id_139.html
+//
+// Massive x86_64 reference
+// http://ref.x86asm.net/coder64.html#xED
+//
+// Adding instructions to the go assembler
+// https://blog.klauspost.com/adding-unsupported-instructions-in-golang-assembler/
+//
+// Backdoor commands
+// https://sites.google.com/site/chitchatvmback/backdoor
+
+// func bdoor_inout(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+TEXT ·bdoor_inout(SB), NOSPLIT|WRAPPER, $0
+	MOVL ax+0(FP), AX
+	MOVL bx+4(FP), BX
+	MOVL cx+8(FP), CX
+	MOVL dx+12(FP), DX
+	MOVL si+16(FP), SI
+	MOVL di+20(FP), DI
+	MOVL bp+24(FP), BP
+
+	// IN to DX from EAX
+	INL
+
+	MOVL AX, retax+28(FP)
+	MOVL BX, retbx+32(FP)
+	MOVL CX, retcx+36(FP)
+	MOVL DX, retdx+40(FP)
+	MOVL SI, retsi+44(FP)
+	MOVL DI, retdi+48(FP)
+	MOVL BP, retbp+52(FP)
+	RET
+
+// func bdoor_hbout(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+TEXT ·bdoor_hbout(SB), NOSPLIT|WRAPPER, $0
+	MOVL ax+0(FP), AX
+	MOVL bx+4(FP), BX
+	MOVL cx+8(FP), CX
+	MOVL dx+12(FP), DX
+	MOVL si+16(FP), SI
+	MOVL di+20(FP), DI
+	MOVL bp+24(FP), BP
+
+	CLD; REP; OUTSB
+
+	MOVL AX, retax+28(FP)
+	MOVL BX, retbx+32(FP)
+	MOVL CX, retcx+36(FP)
+	MOVL DX, retdx+40(FP)
+	MOVL SI, retsi+44(FP)
+	MOVL DI, retdi+48(FP)
+	MOVL BP, retbp+52(FP)
+	RET
+
+// func bdoor_hbin(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+TEXT ·bdoor_hbin(SB), NOSPLIT|WRAPPER, $0
+	MOVL ax+0(FP), AX
+	MOVL bx+4(FP), BX
+	MOVL cx+8(FP), CX
+	MOVL dx+12(FP), DX
+	MOVL si+16(FP), SI
+	MOVL di+20(FP), DI
+	MOVL bp+24(FP), BP
+
+	CLD; REP; INSB
+
+	MOVL AX, retax+28(FP)
+	MOVL BX, retbx+32(FP)
+	MOVL CX, retcx+40(FP)
+	MOVL DX, retdx+44(FP)
+	MOVL SI, retsi+48(FP)
+	MOVL DI, retdi+52(FP)
+	MOVL BP, retbp+56(FP)
+	RET
+
+// func bdoor_inout_test(ax, bx, cx, dx, si, di, bp uint32) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint32)
+TEXT ·bdoor_inout_test(SB), NOSPLIT|WRAPPER, $0
+	MOVL ax+0(FP), AX
+	MOVL bx+4(FP), BX
+	MOVL cx+8(FP), CX
+	MOVL dx+12(FP), DX
+	MOVL si+16(FP), SI
+	MOVL di+20(FP), DI
+	MOVL bp+24(FP), BP
+
+	MOVL AX, retax+28(FP)
+	MOVL BX, retbx+32(FP)
+	MOVL CX, retcx+36(FP)
+	MOVL DX, retdx+40(FP)
+	MOVL SI, retsi+44(FP)
+	MOVL DI, retdi+48(FP)
+	MOVL BP, retbp+52(FP)
+	RET
+
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_amd64.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_amd64.go
new file mode 100644
index 0000000000..0793c699d3
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_amd64.go
@@ -0,0 +1,48 @@
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package bdoor
+
+const (
+	BackdoorMagic = uint64(0x564D5868)
+)
+
+type BackdoorProto struct {
+	// typedef union {
+	//   struct {
+	//      DECLARE_REG_NAMED_STRUCT(ax);
+	//      size_t size; /* Register bx. */
+	//      DECLARE_REG_NAMED_STRUCT(cx);
+	//      DECLARE_REG_NAMED_STRUCT(dx);
+	//      DECLARE_REG_NAMED_STRUCT(si);
+	//      DECLARE_REG_NAMED_STRUCT(di);
+	//   } in;
+	//   struct {
+	//      DECLARE_REG_NAMED_STRUCT(ax);
+	//      DECLARE_REG_NAMED_STRUCT(bx);
+	//      DECLARE_REG_NAMED_STRUCT(cx);
+	//      DECLARE_REG_NAMED_STRUCT(dx);
+	//      DECLARE_REG_NAMED_STRUCT(si);
+	//      DECLARE_REG_NAMED_STRUCT(di);
+	//   } out;
+	// } proto;
+
+	AX, BX, CX, DX, SI, DI, BP UInt64
+	size                       uint32
+}
+
+func bdoor_inout(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
+func bdoor_hbout(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
+func bdoor_hbin(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
+func bdoor_inout_test(ax, bx, cx, dx, si, di, bp uint64) (retax, retbx, retcx, retdx, retsi, retdi, retbp uint64)
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_test.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_test.go
deleted file mode 100644
index 188684468a..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/bdoor_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package bdoor
-
-import (
-	"testing"
-
-	"github.com/vmware/vmw-guestinfo/util"
-)
-
-func TestBdoorArgAlignment(t *testing.T) {
-	a := uint64(0xFFFFFFFF0000022)
-	b := uint64(33)
-	c := uint64(44)
-	d := uint64(55)
-	si := uint64(0xFFFFFFFF0000066)
-	di := uint64(0xFFFAAFFF0000077)
-	bp := uint64(0xFFFFFFFFAAAAAAA)
-
-	oa, ob, oc, od, osi, odi, obp := bdoor_inout_test(a, b, c, d, si, di, bp)
-
-	if !util.AssertEqual(t, a, oa) ||
-		!util.AssertEqual(t, b, ob) ||
-		!util.AssertEqual(t, c, oc) ||
-		!util.AssertEqual(t, d, od) ||
-		!util.AssertEqual(t, si, osi) ||
-		!util.AssertEqual(t, di, odi) ||
-		!util.AssertEqual(t, bp, obp) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word.go
index c72d8d2006..ec1ee13baa 100644
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word.go
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,6 +14,8 @@
 
 package bdoor
 
+import "unsafe"
+
 type UInt32 struct {
 	High uint16
 	Low  uint16
@@ -28,6 +30,22 @@ func (u *UInt32) SetWord(w uint32) {
 	u.Low = uint16(w)
 }
 
+func (u *UInt32) AsUInt32() *UInt32 {
+	return u
+}
+
+func (u *UInt32) Value() uint32 {
+	return u.Word()
+}
+
+func (u *UInt32) SetValue(val uint32) {
+	u.SetWord(val)
+}
+
+func (u *UInt32) SetPointer(p unsafe.Pointer) {
+	u.SetWord(uint32(uintptr(p)))
+}
+
 type UInt64 struct {
 	High UInt32
 	Low  UInt32
@@ -41,3 +59,19 @@ func (u *UInt64) SetQuad(w uint64) {
 	u.High.SetWord(uint32(w >> 32))
 	u.Low.SetWord(uint32(w))
 }
+
+func (u *UInt64) AsUInt32() *UInt32 {
+	return &u.Low
+}
+
+func (u *UInt64) Value() uint64 {
+	return u.Quad()
+}
+
+func (u *UInt64) SetValue(val uint64) {
+	u.SetQuad(val)
+}
+
+func (u *UInt64) SetPointer(p unsafe.Pointer) {
+	u.SetQuad(uint64(uintptr(p)))
+}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word_test.go b/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word_test.go
deleted file mode 100644
index 3efe2466dc..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/bdoor/word_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package bdoor
-
-import (
-	"testing"
-	"github.com/vmware/vmw-guestinfo/util"
-)
-
-func TestSetWord(t *testing.T) {
-	inLow := uint16(0xEEFF)
-	inHigh := uint16(0xBBBB)
-
-	out := &UInt32{}
-	//out.SetWord(uint32(0xBBBBEEFF))
-	out.Low = inLow
-	out.High = inHigh
-
-	if !util.AssertEqual(t, inLow, out.Low) || !util.AssertEqual(t, inHigh, out.High) {
-		return
-	}
-
-	if !util.AssertEqual(t, uint32(0xBBBBEEFF), out.Word()) {
-		return
-	}
-}
-
-func TestQuadToHighLow(t *testing.T) {
-	in := uint64(0xFFFFFFFF0000000A)
-
-	var u UInt64
-	u.SetQuad(in)
-	if !util.AssertEqual(t, uint32(in), u.Low.Word()) {
-		return
-	}
-
-	if !util.AssertEqual(t, uint32(in>>32), u.High.Word()) {
-		return
-	}
-
-	if !util.AssertEqual(t, in, u.Quad()) {
-		return
-	}
-}
-
-func TestHighLowToQuad(t *testing.T) {
-	inHigh := uint16(0xff)
-	inLow := uint16(0xaa)
-
-	u := UInt64{
-		High: UInt32{High: inHigh},
-		Low:  UInt32{Low: inLow},
-	}
-
-	if !util.AssertEqual(t, (uint64(inHigh)<<48)+uint64(inLow), u.Quad()) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/examples/main.go b/installer/vendor/github.com/vmware/vmw-guestinfo/examples/main.go
deleted file mode 100644
index ebf243de53..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/examples/main.go
+++ /dev/null
@@ -1,47 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/vmware/vmw-guestinfo/rpcvmx"
-	"github.com/vmware/vmw-guestinfo/vmcheck"
-)
-
-func main() {
-	isVM, err := vmcheck.IsVirtualWorld()
-	if err != nil {
-		fmt.Println("error: %s", err.Error())
-		os.Exit(-1)
-	}
-
-	if !isVM {
-		fmt.Println("not in a virtual world... :(")
-	}
-
-	config := rpcvmx.NewConfig()
-
-	fmt.Println(config.SetString("foo", "bar"))
-	fmt.Println(config.String("foo", "foo"))
-
-	fmt.Println(config.SetInt("foo", 3))
-	fmt.Println(config.Int("foo", 0))
-
-	fmt.Println(config.SetBool("foo", false))
-	fmt.Println(config.Bool("foo", true))
-
-}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/message/message.go b/installer/vendor/github.com/vmware/vmw-guestinfo/message/message.go
index 95f27fa3ec..a6261920f7 100644
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/message/message.go
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/message/message.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -66,12 +66,12 @@ func NewChannel(proto uint32) (*Channel, error) {
 retry:
 	bp := &bdoor.BackdoorProto{}
 
-	bp.BX.Low.SetWord(proto | flags)
-	bp.CX.Low.High = messageTypeOpen
-	bp.CX.Low.Low = bdoor.CommandMessage
+	bp.BX.AsUInt32().SetWord(proto | flags)
+	bp.CX.AsUInt32().High = messageTypeOpen
+	bp.CX.AsUInt32().Low = bdoor.CommandMessage
 
 	out := bp.InOut()
-	if (out.CX.Low.High & messageStatusSuccess) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 		if flags != 0 {
 			flags = 0
 			goto retry
@@ -82,9 +82,9 @@ retry:
 	}
 
 	ch := &Channel{}
-	ch.id = out.DX.Low.High
-	ch.cookie.High.SetWord(out.SI.Low.Word())
-	ch.cookie.Low.SetWord(out.DI.Low.Word())
+	ch.id = out.DX.AsUInt32().High
+	ch.cookie.High.SetWord(out.SI.AsUInt32().Word())
+	ch.cookie.Low.SetWord(out.DI.AsUInt32().Word())
 
 	Debugf("Opened channel %d", ch.id)
 	return ch, nil
@@ -93,15 +93,15 @@ retry:
 func (c *Channel) Close() error {
 	bp := &bdoor.BackdoorProto{}
 
-	bp.CX.Low.High = messageTypeClose
-	bp.CX.Low.Low = bdoor.CommandMessage
+	bp.CX.AsUInt32().High = messageTypeClose
+	bp.CX.AsUInt32().Low = bdoor.CommandMessage
 
-	bp.DX.Low.High = c.id
-	bp.SI.Low.SetWord(c.cookie.High.Word())
-	bp.DI.Low.SetWord(c.cookie.Low.Word())
+	bp.DX.AsUInt32().High = c.id
+	bp.SI.AsUInt32().SetWord(c.cookie.High.Word())
+	bp.DI.AsUInt32().SetWord(c.cookie.Low.Word())
 
 	out := bp.InOut()
-	if (out.CX.Low.High & messageStatusSuccess) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 		Errorf("Message: Unable to close communication channel %d", c.id)
 		return ErrChannelClose
 	}
@@ -113,18 +113,18 @@ func (c *Channel) Close() error {
 func (c *Channel) Send(buf []byte) error {
 retry:
 	bp := &bdoor.BackdoorProto{}
-	bp.CX.Low.High = messageTypeSendSize
-	bp.CX.Low.Low = bdoor.CommandMessage
+	bp.CX.AsUInt32().High = messageTypeSendSize
+	bp.CX.AsUInt32().Low = bdoor.CommandMessage
 
-	bp.DX.Low.High = c.id
-	bp.SI.Low.SetWord(c.cookie.High.Word())
-	bp.DI.Low.SetWord(c.cookie.Low.Word())
+	bp.DX.AsUInt32().High = c.id
+	bp.SI.AsUInt32().SetWord(c.cookie.High.Word())
+	bp.DI.AsUInt32().SetWord(c.cookie.Low.Word())
 
-	bp.BX.Low.SetWord(uint32(len(buf)))
+	bp.BX.AsUInt32().SetWord(uint32(len(buf)))
 
 	// send the size
 	out := bp.InOut()
-	if (out.CX.Low.High & messageStatusSuccess) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 		Errorf("Message: Unable to send a message over the communication channel %d", c.id)
 		return ErrRpciSend
 	}
@@ -134,20 +134,20 @@ retry:
 		return nil
 	}
 
-	if !c.forceLowBW && (out.CX.Low.High&messageStatusHighBW) == messageStatusHighBW {
+	if !c.forceLowBW && (out.CX.AsUInt32().High&messageStatusHighBW) == messageStatusHighBW {
 		hbbp := &bdoor.BackdoorProto{}
 
-		hbbp.BX.Low.Low = bdoor.CommandHighBWMessage
-		hbbp.BX.Low.High = messageStatusSuccess
-		hbbp.DX.Low.High = c.id
-		hbbp.BP.Low.SetWord(c.cookie.High.Word())
-		hbbp.DI.Low.SetWord(c.cookie.Low.Word())
-		hbbp.CX.Low.SetWord(uint32(len(buf)))
-		hbbp.SI.SetQuad(uint64(uintptr(unsafe.Pointer(&buf[0]))))
+		hbbp.BX.AsUInt32().Low = bdoor.CommandHighBWMessage
+		hbbp.BX.AsUInt32().High = messageStatusSuccess
+		hbbp.DX.AsUInt32().High = c.id
+		hbbp.BP.AsUInt32().SetWord(c.cookie.High.Word())
+		hbbp.DI.AsUInt32().SetWord(c.cookie.Low.Word())
+		hbbp.CX.AsUInt32().SetWord(uint32(len(buf)))
+		hbbp.SI.SetPointer(unsafe.Pointer(&buf[0]))
 
 		out := hbbp.HighBandwidthOut()
-		if (out.BX.Low.High & messageStatusSuccess) == 0 {
-			if (out.BX.Low.High & messageStatusCheckPoint) != 0 {
+		if (out.BX.AsUInt32().High & messageStatusSuccess) == 0 {
+			if (out.BX.AsUInt32().High & messageStatusCheckPoint) != 0 {
 				Debugf("A checkpoint occurred. Retrying the operation")
 				goto retry
 			}
@@ -156,7 +156,7 @@ retry:
 			return ErrRpciSend
 		}
 	} else {
-		bp.CX.Low.High = messageTypeSendPayload
+		bp.CX.AsUInt32().High = messageTypeSendPayload
 
 		bbuf := bytes.NewBuffer(buf)
 		for {
@@ -169,17 +169,17 @@ retry:
 			Debugf("sending %q over %d", string(words), c.id)
 			switch len(words) {
 			case 3:
-				bp.BX.Low.SetWord(binary.LittleEndian.Uint32([]byte{0x0, words[2], words[1], words[0]}))
+				bp.BX.AsUInt32().SetWord(binary.LittleEndian.Uint32([]byte{0x0, words[2], words[1], words[0]}))
 			case 2:
-				bp.BX.Low.SetWord(uint32(binary.LittleEndian.Uint16(words)))
+				bp.BX.AsUInt32().SetWord(uint32(binary.LittleEndian.Uint16(words)))
 			case 1:
-				bp.BX.Low.SetWord(uint32(words[0]))
+				bp.BX.AsUInt32().SetWord(uint32(words[0]))
 			default:
-				bp.BX.Low.SetWord(binary.LittleEndian.Uint32(words))
+				bp.BX.AsUInt32().SetWord(binary.LittleEndian.Uint32(words))
 			}
 
 			out = bp.InOut()
-			if (out.CX.Low.High & messageStatusSuccess) == 0 {
+			if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 				Errorf("Message: Unable to send a message over the communication channel %d", c.id)
 				return ErrRpciSend
 			}
@@ -193,50 +193,50 @@ func (c *Channel) Receive() ([]byte, error) {
 retry:
 	var err error
 	bp := &bdoor.BackdoorProto{}
-	bp.CX.Low.High = messageTypeReceiveSize
-	bp.CX.Low.Low = bdoor.CommandMessage
+	bp.CX.AsUInt32().High = messageTypeReceiveSize
+	bp.CX.AsUInt32().Low = bdoor.CommandMessage
 
-	bp.DX.Low.High = c.id
-	bp.SI.Low.SetWord(c.cookie.High.Word())
-	bp.DI.Low.SetWord(c.cookie.Low.Word())
+	bp.DX.AsUInt32().High = c.id
+	bp.SI.AsUInt32().SetWord(c.cookie.High.Word())
+	bp.DI.AsUInt32().SetWord(c.cookie.Low.Word())
 
 	out := bp.InOut()
-	if (out.CX.Low.High & messageStatusSuccess) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 		Errorf("Message: Unable to poll for messages over the communication channel %d", c.id)
 		return nil, ErrRpciReceive
 	}
 
-	if (out.CX.Low.High & messageStatusDoRecieve) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusDoRecieve) == 0 {
 		Debugf("No message to retrieve")
 		return nil, nil
 	}
 
 	// Receive the size.
-	if out.DX.Low.High != messageTypeSendSize {
+	if out.DX.AsUInt32().High != messageTypeSendSize {
 		Errorf("Message: Protocol error. Expected a MESSAGE_TYPE_SENDSIZE request from vmware")
 		return nil, ErrRpciReceive
 	}
 
-	size := out.BX.Quad()
+	size := out.BX.Value()
 
 	var buf []byte
 
 	if size != 0 {
-		if !c.forceLowBW && (out.CX.Low.High&messageStatusHighBW == messageStatusHighBW) {
+		if !c.forceLowBW && (out.CX.AsUInt32().High&messageStatusHighBW == messageStatusHighBW) {
 			buf = make([]byte, size)
 
 			hbbp := &bdoor.BackdoorProto{}
 
-			hbbp.BX.Low.Low = bdoor.CommandHighBWMessage
-			hbbp.BX.Low.High = messageStatusSuccess
-			hbbp.DX.Low.High = c.id
-			hbbp.SI.Low.SetWord(c.cookie.High.Word())
-			hbbp.BP.Low.SetWord(c.cookie.Low.Word())
-			hbbp.CX.Low.SetWord(uint32(len(buf)))
-			hbbp.DI.SetQuad(uint64(uintptr(unsafe.Pointer(&buf[0]))))
+			hbbp.BX.AsUInt32().Low = bdoor.CommandHighBWMessage
+			hbbp.BX.AsUInt32().High = messageStatusSuccess
+			hbbp.DX.AsUInt32().High = c.id
+			hbbp.SI.AsUInt32().SetWord(c.cookie.High.Word())
+			hbbp.BP.AsUInt32().SetWord(c.cookie.Low.Word())
+			hbbp.CX.AsUInt32().SetWord(uint32(len(buf)))
+			hbbp.DI.SetPointer(unsafe.Pointer(&buf[0]))
 
 			out := hbbp.HighBandwidthIn()
-			if (out.BX.Low.High & messageStatusSuccess) == 0 {
+			if (out.BX.AsUInt32().High & messageStatusSuccess) == 0 {
 				Errorf("Message: Unable to send a message over the communication channel %d", c.id)
 				c.reply(messageTypeReceivePayload, messageStatusFail)
 				return nil, ErrRpciReceive
@@ -249,12 +249,12 @@ retry:
 					break
 				}
 
-				bp.CX.Low.High = messageTypeReceivePayload
-				bp.BX.Low.Low = messageStatusSuccess
+				bp.CX.AsUInt32().High = messageTypeReceivePayload
+				bp.BX.AsUInt32().Low = messageStatusSuccess
 
 				out = bp.InOut()
-				if (out.CX.Low.High & messageStatusSuccess) == 0 {
-					if (out.CX.Low.High & messageStatusCheckPoint) != 0 {
+				if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
+					if (out.CX.AsUInt32().High & messageStatusCheckPoint) != 0 {
 						Debugf("A checkpoint occurred. Retrying the operation")
 						goto retry
 					}
@@ -264,34 +264,34 @@ retry:
 					return nil, ErrRpciReceive
 				}
 
-				if out.DX.Low.High != messageTypeSendPayload {
+				if out.DX.AsUInt32().High != messageTypeSendPayload {
 					Errorf("Message: Protocol error. Expected a MESSAGE_TYPE_SENDPAYLOAD from vmware")
 					c.reply(messageTypeReceivePayload, messageStatusFail)
 					return nil, ErrRpciReceive
 				}
 
-				Debugf("Received %#v", out.BX.Low.Word())
+				Debugf("Received %#v", out.BX.AsUInt32().Word())
 
 				switch size {
 				case 1:
-					err = binary.Write(b, binary.LittleEndian, uint8(out.BX.Low.Low))
+					err = binary.Write(b, binary.LittleEndian, uint8(out.BX.AsUInt32().Low))
 					size = size - 1
 
 				case 2:
-					err = binary.Write(b, binary.LittleEndian, uint16(out.BX.Low.Low))
+					err = binary.Write(b, binary.LittleEndian, uint16(out.BX.AsUInt32().Low))
 					size = size - 2
 
 				case 3:
-					err = binary.Write(b, binary.LittleEndian, uint16(out.BX.Low.Low))
+					err = binary.Write(b, binary.LittleEndian, uint16(out.BX.AsUInt32().Low))
 					if err != nil {
 						c.reply(messageTypeReceivePayload, messageStatusFail)
 						return nil, ErrRpciReceive
 					}
-					err = binary.Write(b, binary.LittleEndian, uint8(out.BX.Low.High))
+					err = binary.Write(b, binary.LittleEndian, uint8(out.BX.AsUInt32().High))
 					size = size - 3
 
 				default:
-					err = binary.Write(b, binary.LittleEndian, out.BX.Low.Word())
+					err = binary.Write(b, binary.LittleEndian, out.BX.AsUInt32().Word())
 					size = size - 4
 				}
 
@@ -314,17 +314,17 @@ retry:
 func (c *Channel) reply(messageType, messageStatus uint16) {
 	bp := &bdoor.BackdoorProto{}
 
-	bp.BX.Low.Low = messageStatus
-	bp.CX.Low.High = messageType
-	bp.CX.Low.Low = bdoor.CommandMessage
-	bp.DX.Low.High = c.id
-	bp.SI.Low.SetWord(c.cookie.High.Word())
-	bp.DI.Low.SetWord(c.cookie.Low.Word())
+	bp.BX.AsUInt32().Low = messageStatus
+	bp.CX.AsUInt32().High = messageType
+	bp.CX.AsUInt32().Low = bdoor.CommandMessage
+	bp.DX.AsUInt32().High = c.id
+	bp.SI.AsUInt32().SetWord(c.cookie.High.Word())
+	bp.DI.AsUInt32().SetWord(c.cookie.Low.Word())
 
 	out := bp.InOut()
 
 	/* OUT: Status */
-	if (out.CX.Low.High & messageStatusSuccess) == 0 {
+	if (out.CX.AsUInt32().High & messageStatusSuccess) == 0 {
 		if messageStatus == messageStatusSuccess {
 			Errorf("reply Message: Unable to send a message over the communication channel %d", c.id)
 		} else {
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/message/message_test.go b/installer/vendor/github.com/vmware/vmw-guestinfo/message/message_test.go
deleted file mode 100644
index fd7c1bf664..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/message/message_test.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package message
-
-import (
-	"os"
-	"testing"
-
-	"github.com/vmware/vmw-guestinfo/util"
-	"github.com/vmware/vmw-guestinfo/vmcheck"
-)
-
-const rpciProtocolNum uint32 = 0x49435052
-const tcloProtocol uint32 = 0x4f4c4354
-
-func TestOpenClose(t *testing.T) {
-	l := DefaultLogger.(*logger)
-	l.DebugLevel = true
-
-	isVm, err := vmcheck.IsVirtualWorld()
-	if err != nil || !isVm {
-		t.Skip("Not in a virtual world")
-		return
-	}
-
-	ch, err := NewChannel(rpciProtocolNum)
-	if !util.AssertNotNil(t, ch) || !util.AssertNoError(t, err) {
-		return
-	}
-
-	// check low bandwidth
-	ch.forceLowBW = true
-	err = ch.Send([]byte("info-get guestinfo.doesnotexistdoesnotexit"))
-	if !util.AssertNoError(t, err) {
-		return
-	}
-
-	b, err := ch.Receive()
-	if !util.AssertNoError(t, err) || !util.AssertNotNil(t, b) {
-		return
-	}
-
-	if !util.AssertEqual(t, "0 No value found", string(b)) {
-		return
-	}
-
-	if !util.AssertNoError(t, ch.Close()) {
-		return
-	}
-
-	// check high bandwidth
-	ch, err = NewChannel(rpciProtocolNum)
-	if !util.AssertNotNil(t, ch) || !util.AssertNoError(t, err) {
-		return
-	}
-
-	err = ch.Send([]byte("info-get guestinfo.doesnotexistdoesnotexit"))
-	if !util.AssertNoError(t, err) {
-		return
-	}
-
-	b, err = ch.Receive()
-	if !util.AssertNoError(t, err) || !util.AssertNotNil(t, b) {
-		return
-	}
-
-	if !util.AssertEqual(t, "0 No value found", string(b)) {
-		return
-	}
-
-	if !util.AssertNoError(t, ch.Close()) {
-		return
-	}
-}
-
-// Test we can reply to the rpcin
-func TestReset(t *testing.T) {
-	l := DefaultLogger.(*logger)
-	l.DebugLevel = true
-
-	isVm, err := vmcheck.IsVirtualWorld()
-	if err != nil || !isVm {
-		t.Skip("Not in a virtual world")
-		return
-	}
-
-	if os.Getenv("TEST_TOOLBOX") == "" {
-		t.Skip("Skipping toolbox test")
-		return
-	}
-
-	ch, err := NewChannel(tcloProtocol)
-	if !util.AssertNotNil(t, ch) || !util.AssertNoError(t, err) {
-		return
-	}
-	defer ch.Close()
-
-	var buf []byte
-
-	for {
-		_ = ch.Send(buf)
-		request, _ := ch.Receive()
-
-		if len(request) == 0 {
-			continue
-		}
-
-		if string(request) == "reset" {
-			break
-		}
-	}
-
-	reply := "OK ATR toolbox"
-	err = ch.Send([]byte(reply))
-	if !util.AssertNoError(t, err) {
-		return
-	}
-}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/util/util.go b/installer/vendor/github.com/vmware/vmw-guestinfo/util/util.go
deleted file mode 100644
index 7445c0b3ce..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/util/util.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package util
-
-import (
-	"reflect"
-	"runtime"
-	"testing"
-)
-
-// Test utilities.
-
-func AssertEqual(t *testing.T, a interface{}, b interface{}) bool {
-	if !reflect.DeepEqual(a, b) {
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func AssertNoError(t *testing.T, err error) bool {
-	if err != nil {
-		t.Logf("error :%s", err.Error())
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func AssertNotNil(t *testing.T, a interface{}) bool {
-	val := reflect.ValueOf(a)
-	if val.IsNil() {
-		Fail(t)
-		return false
-	}
-
-	return true
-}
-
-func Fail(t *testing.T) {
-	_, file, line, _ := runtime.Caller(2)
-	t.Logf("FAIL on %s:%d", file, line)
-	t.Fail()
-}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go
new file mode 100644
index 0000000000..c46cc5e455
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck.go
@@ -0,0 +1,83 @@
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package vmcheck
+
+import (
+	"encoding/binary"
+
+	"github.com/vmware/vmw-guestinfo/bdoor"
+)
+
+// From https://github.com/intel-go/cpuid/blob/master/cpuidlow_amd64.s
+// Get the CPU ID low level leaf values.
+func cpuid_low(arg1, arg2 uint32) (eax, ebx, ecx, edx uint32)
+
+// IsVirtualWorld returns true if running in a VM and the backdoor is available.
+func IsVirtualWorld() (bool, error) {
+	// Test the HV bit is set
+	if !IsVirtualCPU() {
+		return false, nil
+	}
+
+	// Test if backdoor port is available.
+	if isVM, err := hypervisorPortCheck(); err != nil || !isVM {
+		return isVM, err
+	}
+
+	return true, nil
+}
+
+// hypervisorPortCheck tests the availability of the HV port.
+func hypervisorPortCheck() (bool, error) {
+	// Privilege level 3 to access all ports above 0x3ff
+	if err := openPortsAccess(); err != nil {
+		return false, err
+	}
+
+	p := &bdoor.BackdoorProto{}
+
+	p.CX.AsUInt32().SetWord(bdoor.CommandGetVersion)
+	out := p.InOut()
+	// if there is no device, we get back all 1s
+	return (0xffffffff != out.AX.AsUInt32().Word()) && (0 != out.AX.AsUInt32().Word()), nil
+}
+
+// IsVirtualCPU checks if the cpu is a virtual CPU running on ESX.  It checks for
+// the HV bit in the ECX register of the CPUID leaf 0x1.  Intel and AMD CPUs
+// reserve this bit to indicate if the CPU is running in a HV. See
+// https://en.wikipedia.org/wiki/CPUID#EAX.3D1:_Processor_Info_and_Feature_Bits
+// for details.  If this bit is set, the reserved cpuid levels are used to pass
+// information from the HV to the guest.  In ESX, this is the repeating string
+// "VMwareVMware".
+func IsVirtualCPU() bool {
+	HV := uint32(1 << 31)
+	_, _, c, _ := cpuid_low(0x1, 0)
+	if (c & HV) != HV {
+		return false
+	}
+
+	_, b, c, d := cpuid_low(0x40000000, 0)
+
+	buf := make([]byte, 12)
+	binary.LittleEndian.PutUint32(buf, b)
+	binary.LittleEndian.PutUint32(buf[4:], c)
+	binary.LittleEndian.PutUint32(buf[8:], d)
+
+	if string(buf) != "VMwareVMware" {
+		return false
+	}
+
+	return true
+}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_386.s b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_386.s
new file mode 100644
index 0000000000..c029ece200
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_386.s
@@ -0,0 +1,13 @@
+#include "textflag.h"
+
+// From https://github.com/intel-go/cpuid/blob/master/cpuidlow_amd64.s
+// func cpuid_low(arg1, arg2 uint32) (eax, ebx, ecx, edx uint32)
+TEXT ·cpuid_low(SB), NOSPLIT, $0-24
+	MOVL arg1+0(FP), AX
+	MOVL arg2+4(FP), CX
+	CPUID
+	MOVL AX, eax+8(FP)
+	MOVL BX, ebx+12(FP)
+	MOVL CX, ecx+16(FP)
+	MOVL DX, edx+20(FP)
+	RET
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_general.go b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_general.go
new file mode 100644
index 0000000000..1e9217c963
--- /dev/null
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_general.go
@@ -0,0 +1,23 @@
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+// +build !linux
+
+package vmcheck
+
+// probably not gonna work. Instead, implement a platform-specific variant, and
+// add the platform to above build flags
+func openPortsAccess() error {
+	return nil
+}
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_linux.go b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_linux.go
index 765d1bb6ee..46460f9a04 100644
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_linux.go
+++ b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
+// Copyright 2016-2017 VMware, Inc. All Rights Reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -14,72 +14,9 @@
 
 package vmcheck
 
-import (
-	"encoding/binary"
-	"syscall"
+import "syscall"
 
-	"github.com/vmware/vmw-guestinfo/bdoor"
-)
-
-// From https://github.com/intel-go/cpuid/blob/master/cpuidlow_amd64.s
-// Get the CPU ID low level leaf values.
-func cpuid_low(arg1, arg2 uint32) (eax, ebx, ecx, edx uint32)
-
-// IsVirtualWorld returns true if running in a VM and the backdoor is available.
-func IsVirtualWorld() (bool, error) {
-	// Test the HV bit is set
-	if !IsVirtualCPU() {
-		return false, nil
-	}
-
-	// Test if backdoor port is available.
-	if isVM, err := hypervisorPortCheck(); err != nil || !isVM {
-		return isVM, err
-	}
-
-	return true, nil
-}
-
-// hypervisorPortCheck tests the availability of the HV port.
-func hypervisorPortCheck() (bool, error) {
+func openPortsAccess() error {
 	// Privilege level 3 to access all ports above 0x3ff
-	if err := syscall.Iopl(3); err != nil {
-		return false, err
-	}
-
-	p := &bdoor.BackdoorProto{}
-	p.CX.Low.SetWord(bdoor.CommandGetVersion)
-
-	out := p.InOut()
-
-	// if there is no device, we get back all 1s
-	return (0xffffffff != out.AX.Low.Word()) && (0 != out.AX.Low.Word()), nil
-}
-
-// IsVirtualCPU checks if the cpu is a virtual CPU running on ESX.  It checks for
-// the HV bit in the ECX register of the CPUID leaf 0x1.  Intel and AMD CPUs
-// reserve this bit to indicate if the CPU is running in a HV. See
-// https://en.wikipedia.org/wiki/CPUID#EAX.3D1:_Processor_Info_and_Feature_Bits
-// for details.  If this bit is set, the reserved cpuid levels are used to pass
-// information from the HV to the guest.  In ESX, this is the repeating string
-// "VMwareVMware".
-func IsVirtualCPU() bool {
-	HV := uint32(1 << 31)
-	_, _, c, _ := cpuid_low(0x1, 0)
-	if (c & HV) != HV {
-		return false
-	}
-
-	_, b, c, d := cpuid_low(0x40000000, 0)
-
-	buf := make([]byte, 12)
-	binary.LittleEndian.PutUint32(buf, b)
-	binary.LittleEndian.PutUint32(buf[4:], c)
-	binary.LittleEndian.PutUint32(buf[8:], d)
-
-	if string(buf) != "VMwareVMware" {
-		return false
-	}
-
-	return true
+	return syscall.Iopl(3)
 }
diff --git a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_test.go b/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_test.go
deleted file mode 100644
index f2198ad7e3..0000000000
--- a/installer/vendor/github.com/vmware/vmw-guestinfo/vmcheck/vmcheck_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2016 VMware, Inc. All Rights Reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//    http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-package vmcheck
-
-import (
-	"testing"
-
-	"github.com/vmware/vmw-guestinfo/util"
-)
-
-func TestIsVirtualWorld(t *testing.T) {
-	isBackdoor, err := hypervisorPortCheck()
-	if !util.AssertNoError(t, err) {
-		return
-	}
-
-	t.Log("Backdoor available: ", isBackdoor)
-	t.Log("CPU HV: ", IsVirtualCPU())
-
-	isVM, err := IsVirtualWorld()
-	if !util.AssertNoError(t, err) {
-		return
-	}
-	t.Log("Running in a VM: ", isVM)
-}
diff --git a/installer/vendor/golang.org/x/crypto/.gitattributes b/installer/vendor/golang.org/x/crypto/.gitattributes
deleted file mode 100644
index d2f212e5da..0000000000
--- a/installer/vendor/golang.org/x/crypto/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/installer/vendor/golang.org/x/crypto/.gitignore b/installer/vendor/golang.org/x/crypto/.gitignore
deleted file mode 100644
index 8339fd61d3..0000000000
--- a/installer/vendor/golang.org/x/crypto/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/installer/vendor/golang.org/x/crypto/CONTRIBUTING.md b/installer/vendor/golang.org/x/crypto/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/crypto/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/crypto/README.md b/installer/vendor/golang.org/x/crypto/README.md
deleted file mode 100644
index c9d6fecd1e..0000000000
--- a/installer/vendor/golang.org/x/crypto/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# Go Cryptography
-
-This repository holds supplementary Go cryptography libraries.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/crypto/...`. You
-can also manually git clone the repository to `$GOPATH/src/golang.org/x/crypto`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the crypto repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/crypto:" in the
-subject line, so it is easy to find.
-
-Note that contributions to the cryptography package receive additional scrutiny
-due to their sensitive nature. Patches may take longer than normal to receive
-feedback.
diff --git a/installer/vendor/golang.org/x/crypto/acme/acme.go b/installer/vendor/golang.org/x/crypto/acme/acme.go
deleted file mode 100644
index fa9c4b39e2..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/acme.go
+++ /dev/null
@@ -1,1058 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package acme provides an implementation of the
-// Automatic Certificate Management Environment (ACME) spec.
-// See https://tools.ietf.org/html/draft-ietf-acme-acme-02 for details.
-//
-// Most common scenarios will want to use autocert subdirectory instead,
-// which provides automatic access to certificates from Let's Encrypt
-// and any other ACME-based CA.
-//
-// This package is a work in progress and makes no API stability promises.
-package acme
-
-import (
-	"bytes"
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/sha256"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/json"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/big"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-// LetsEncryptURL is the Directory endpoint of Let's Encrypt CA.
-const LetsEncryptURL = "https://acme-v01.api.letsencrypt.org/directory"
-
-const (
-	maxChainLen = 5       // max depth and breadth of a certificate chain
-	maxCertSize = 1 << 20 // max size of a certificate, in bytes
-
-	// Max number of collected nonces kept in memory.
-	// Expect usual peak of 1 or 2.
-	maxNonces = 100
-)
-
-// Client is an ACME client.
-// The only required field is Key. An example of creating a client with a new key
-// is as follows:
-//
-// 	key, err := rsa.GenerateKey(rand.Reader, 2048)
-// 	if err != nil {
-// 		log.Fatal(err)
-// 	}
-// 	client := &Client{Key: key}
-//
-type Client struct {
-	// Key is the account key used to register with a CA and sign requests.
-	// Key.Public() must return a *rsa.PublicKey or *ecdsa.PublicKey.
-	Key crypto.Signer
-
-	// HTTPClient optionally specifies an HTTP client to use
-	// instead of http.DefaultClient.
-	HTTPClient *http.Client
-
-	// DirectoryURL points to the CA directory endpoint.
-	// If empty, LetsEncryptURL is used.
-	// Mutating this value after a successful call of Client's Discover method
-	// will have no effect.
-	DirectoryURL string
-
-	dirMu sync.Mutex // guards writes to dir
-	dir   *Directory // cached result of Client's Discover method
-
-	noncesMu sync.Mutex
-	nonces   map[string]struct{} // nonces collected from previous responses
-}
-
-// Discover performs ACME server discovery using c.DirectoryURL.
-//
-// It caches successful result. So, subsequent calls will not result in
-// a network round-trip. This also means mutating c.DirectoryURL after successful call
-// of this method will have no effect.
-func (c *Client) Discover(ctx context.Context) (Directory, error) {
-	c.dirMu.Lock()
-	defer c.dirMu.Unlock()
-	if c.dir != nil {
-		return *c.dir, nil
-	}
-
-	dirURL := c.DirectoryURL
-	if dirURL == "" {
-		dirURL = LetsEncryptURL
-	}
-	res, err := c.get(ctx, dirURL)
-	if err != nil {
-		return Directory{}, err
-	}
-	defer res.Body.Close()
-	c.addNonce(res.Header)
-	if res.StatusCode != http.StatusOK {
-		return Directory{}, responseError(res)
-	}
-
-	var v struct {
-		Reg    string `json:"new-reg"`
-		Authz  string `json:"new-authz"`
-		Cert   string `json:"new-cert"`
-		Revoke string `json:"revoke-cert"`
-		Meta   struct {
-			Terms   string   `json:"terms-of-service"`
-			Website string   `json:"website"`
-			CAA     []string `json:"caa-identities"`
-		}
-	}
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return Directory{}, err
-	}
-	c.dir = &Directory{
-		RegURL:    v.Reg,
-		AuthzURL:  v.Authz,
-		CertURL:   v.Cert,
-		RevokeURL: v.Revoke,
-		Terms:     v.Meta.Terms,
-		Website:   v.Meta.Website,
-		CAA:       v.Meta.CAA,
-	}
-	return *c.dir, nil
-}
-
-// CreateCert requests a new certificate using the Certificate Signing Request csr encoded in DER format.
-// The exp argument indicates the desired certificate validity duration. CA may issue a certificate
-// with a different duration.
-// If the bundle argument is true, the returned value will also contain the CA (issuer) certificate chain.
-//
-// In the case where CA server does not provide the issued certificate in the response,
-// CreateCert will poll certURL using c.FetchCert, which will result in additional round-trips.
-// In such a scenario, the caller can cancel the polling with ctx.
-//
-// CreateCert returns an error if the CA's response or chain was unreasonably large.
-// Callers are encouraged to parse the returned value to ensure the certificate is valid and has the expected features.
-func (c *Client) CreateCert(ctx context.Context, csr []byte, exp time.Duration, bundle bool) (der [][]byte, certURL string, err error) {
-	if _, err := c.Discover(ctx); err != nil {
-		return nil, "", err
-	}
-
-	req := struct {
-		Resource  string `json:"resource"`
-		CSR       string `json:"csr"`
-		NotBefore string `json:"notBefore,omitempty"`
-		NotAfter  string `json:"notAfter,omitempty"`
-	}{
-		Resource: "new-cert",
-		CSR:      base64.RawURLEncoding.EncodeToString(csr),
-	}
-	now := timeNow()
-	req.NotBefore = now.Format(time.RFC3339)
-	if exp > 0 {
-		req.NotAfter = now.Add(exp).Format(time.RFC3339)
-	}
-
-	res, err := c.retryPostJWS(ctx, c.Key, c.dir.CertURL, req)
-	if err != nil {
-		return nil, "", err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusCreated {
-		return nil, "", responseError(res)
-	}
-
-	curl := res.Header.Get("Location") // cert permanent URL
-	if res.ContentLength == 0 {
-		// no cert in the body; poll until we get it
-		cert, err := c.FetchCert(ctx, curl, bundle)
-		return cert, curl, err
-	}
-	// slurp issued cert and CA chain, if requested
-	cert, err := c.responseCert(ctx, res, bundle)
-	return cert, curl, err
-}
-
-// FetchCert retrieves already issued certificate from the given url, in DER format.
-// It retries the request until the certificate is successfully retrieved,
-// context is cancelled by the caller or an error response is received.
-//
-// The returned value will also contain the CA (issuer) certificate if the bundle argument is true.
-//
-// FetchCert returns an error if the CA's response or chain was unreasonably large.
-// Callers are encouraged to parse the returned value to ensure the certificate is valid
-// and has expected features.
-func (c *Client) FetchCert(ctx context.Context, url string, bundle bool) ([][]byte, error) {
-	for {
-		res, err := c.get(ctx, url)
-		if err != nil {
-			return nil, err
-		}
-		defer res.Body.Close()
-		if res.StatusCode == http.StatusOK {
-			return c.responseCert(ctx, res, bundle)
-		}
-		if res.StatusCode > 299 {
-			return nil, responseError(res)
-		}
-		d := retryAfter(res.Header.Get("Retry-After"), 3*time.Second)
-		select {
-		case <-time.After(d):
-			// retry
-		case <-ctx.Done():
-			return nil, ctx.Err()
-		}
-	}
-}
-
-// RevokeCert revokes a previously issued certificate cert, provided in DER format.
-//
-// The key argument, used to sign the request, must be authorized
-// to revoke the certificate. It's up to the CA to decide which keys are authorized.
-// For instance, the key pair of the certificate may be authorized.
-// If the key is nil, c.Key is used instead.
-func (c *Client) RevokeCert(ctx context.Context, key crypto.Signer, cert []byte, reason CRLReasonCode) error {
-	if _, err := c.Discover(ctx); err != nil {
-		return err
-	}
-
-	body := &struct {
-		Resource string `json:"resource"`
-		Cert     string `json:"certificate"`
-		Reason   int    `json:"reason"`
-	}{
-		Resource: "revoke-cert",
-		Cert:     base64.RawURLEncoding.EncodeToString(cert),
-		Reason:   int(reason),
-	}
-	if key == nil {
-		key = c.Key
-	}
-	res, err := c.retryPostJWS(ctx, key, c.dir.RevokeURL, body)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		return responseError(res)
-	}
-	return nil
-}
-
-// AcceptTOS always returns true to indicate the acceptance of a CA's Terms of Service
-// during account registration. See Register method of Client for more details.
-func AcceptTOS(tosURL string) bool { return true }
-
-// Register creates a new account registration by following the "new-reg" flow.
-// It returns the registered account. The account is not modified.
-//
-// The registration may require the caller to agree to the CA's Terms of Service (TOS).
-// If so, and the account has not indicated the acceptance of the terms (see Account for details),
-// Register calls prompt with a TOS URL provided by the CA. Prompt should report
-// whether the caller agrees to the terms. To always accept the terms, the caller can use AcceptTOS.
-func (c *Client) Register(ctx context.Context, a *Account, prompt func(tosURL string) bool) (*Account, error) {
-	if _, err := c.Discover(ctx); err != nil {
-		return nil, err
-	}
-
-	var err error
-	if a, err = c.doReg(ctx, c.dir.RegURL, "new-reg", a); err != nil {
-		return nil, err
-	}
-	var accept bool
-	if a.CurrentTerms != "" && a.CurrentTerms != a.AgreedTerms {
-		accept = prompt(a.CurrentTerms)
-	}
-	if accept {
-		a.AgreedTerms = a.CurrentTerms
-		a, err = c.UpdateReg(ctx, a)
-	}
-	return a, err
-}
-
-// GetReg retrieves an existing registration.
-// The url argument is an Account URI.
-func (c *Client) GetReg(ctx context.Context, url string) (*Account, error) {
-	a, err := c.doReg(ctx, url, "reg", nil)
-	if err != nil {
-		return nil, err
-	}
-	a.URI = url
-	return a, nil
-}
-
-// UpdateReg updates an existing registration.
-// It returns an updated account copy. The provided account is not modified.
-func (c *Client) UpdateReg(ctx context.Context, a *Account) (*Account, error) {
-	uri := a.URI
-	a, err := c.doReg(ctx, uri, "reg", a)
-	if err != nil {
-		return nil, err
-	}
-	a.URI = uri
-	return a, nil
-}
-
-// Authorize performs the initial step in an authorization flow.
-// The caller will then need to choose from and perform a set of returned
-// challenges using c.Accept in order to successfully complete authorization.
-//
-// If an authorization has been previously granted, the CA may return
-// a valid authorization (Authorization.Status is StatusValid). If so, the caller
-// need not fulfill any challenge and can proceed to requesting a certificate.
-func (c *Client) Authorize(ctx context.Context, domain string) (*Authorization, error) {
-	if _, err := c.Discover(ctx); err != nil {
-		return nil, err
-	}
-
-	type authzID struct {
-		Type  string `json:"type"`
-		Value string `json:"value"`
-	}
-	req := struct {
-		Resource   string  `json:"resource"`
-		Identifier authzID `json:"identifier"`
-	}{
-		Resource:   "new-authz",
-		Identifier: authzID{Type: "dns", Value: domain},
-	}
-	res, err := c.retryPostJWS(ctx, c.Key, c.dir.AuthzURL, req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusCreated {
-		return nil, responseError(res)
-	}
-
-	var v wireAuthz
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return nil, fmt.Errorf("acme: invalid response: %v", err)
-	}
-	if v.Status != StatusPending && v.Status != StatusValid {
-		return nil, fmt.Errorf("acme: unexpected status: %s", v.Status)
-	}
-	return v.authorization(res.Header.Get("Location")), nil
-}
-
-// GetAuthorization retrieves an authorization identified by the given URL.
-//
-// If a caller needs to poll an authorization until its status is final,
-// see the WaitAuthorization method.
-func (c *Client) GetAuthorization(ctx context.Context, url string) (*Authorization, error) {
-	res, err := c.get(ctx, url)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusAccepted {
-		return nil, responseError(res)
-	}
-	var v wireAuthz
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return nil, fmt.Errorf("acme: invalid response: %v", err)
-	}
-	return v.authorization(url), nil
-}
-
-// RevokeAuthorization relinquishes an existing authorization identified
-// by the given URL.
-// The url argument is an Authorization.URI value.
-//
-// If successful, the caller will be required to obtain a new authorization
-// using the Authorize method before being able to request a new certificate
-// for the domain associated with the authorization.
-//
-// It does not revoke existing certificates.
-func (c *Client) RevokeAuthorization(ctx context.Context, url string) error {
-	req := struct {
-		Resource string `json:"resource"`
-		Status   string `json:"status"`
-		Delete   bool   `json:"delete"`
-	}{
-		Resource: "authz",
-		Status:   "deactivated",
-		Delete:   true,
-	}
-	res, err := c.retryPostJWS(ctx, c.Key, url, req)
-	if err != nil {
-		return err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		return responseError(res)
-	}
-	return nil
-}
-
-// WaitAuthorization polls an authorization at the given URL
-// until it is in one of the final states, StatusValid or StatusInvalid,
-// or the context is done.
-//
-// It returns a non-nil Authorization only if its Status is StatusValid.
-// In all other cases WaitAuthorization returns an error.
-// If the Status is StatusInvalid, the returned error is of type *AuthorizationError.
-func (c *Client) WaitAuthorization(ctx context.Context, url string) (*Authorization, error) {
-	sleep := sleeper(ctx)
-	for {
-		res, err := c.get(ctx, url)
-		if err != nil {
-			return nil, err
-		}
-		retry := res.Header.Get("Retry-After")
-		if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusAccepted {
-			res.Body.Close()
-			if err := sleep(retry, 1); err != nil {
-				return nil, err
-			}
-			continue
-		}
-		var raw wireAuthz
-		err = json.NewDecoder(res.Body).Decode(&raw)
-		res.Body.Close()
-		if err != nil {
-			if err := sleep(retry, 0); err != nil {
-				return nil, err
-			}
-			continue
-		}
-		if raw.Status == StatusValid {
-			return raw.authorization(url), nil
-		}
-		if raw.Status == StatusInvalid {
-			return nil, raw.error(url)
-		}
-		if err := sleep(retry, 0); err != nil {
-			return nil, err
-		}
-	}
-}
-
-// GetChallenge retrieves the current status of an challenge.
-//
-// A client typically polls a challenge status using this method.
-func (c *Client) GetChallenge(ctx context.Context, url string) (*Challenge, error) {
-	res, err := c.get(ctx, url)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusAccepted {
-		return nil, responseError(res)
-	}
-	v := wireChallenge{URI: url}
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return nil, fmt.Errorf("acme: invalid response: %v", err)
-	}
-	return v.challenge(), nil
-}
-
-// Accept informs the server that the client accepts one of its challenges
-// previously obtained with c.Authorize.
-//
-// The server will then perform the validation asynchronously.
-func (c *Client) Accept(ctx context.Context, chal *Challenge) (*Challenge, error) {
-	auth, err := keyAuth(c.Key.Public(), chal.Token)
-	if err != nil {
-		return nil, err
-	}
-
-	req := struct {
-		Resource string `json:"resource"`
-		Type     string `json:"type"`
-		Auth     string `json:"keyAuthorization"`
-	}{
-		Resource: "challenge",
-		Type:     chal.Type,
-		Auth:     auth,
-	}
-	res, err := c.retryPostJWS(ctx, c.Key, chal.URI, req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	// Note: the protocol specifies 200 as the expected response code, but
-	// letsencrypt seems to be returning 202.
-	if res.StatusCode != http.StatusOK && res.StatusCode != http.StatusAccepted {
-		return nil, responseError(res)
-	}
-
-	var v wireChallenge
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return nil, fmt.Errorf("acme: invalid response: %v", err)
-	}
-	return v.challenge(), nil
-}
-
-// DNS01ChallengeRecord returns a DNS record value for a dns-01 challenge response.
-// A TXT record containing the returned value must be provisioned under
-// "_acme-challenge" name of the domain being validated.
-//
-// The token argument is a Challenge.Token value.
-func (c *Client) DNS01ChallengeRecord(token string) (string, error) {
-	ka, err := keyAuth(c.Key.Public(), token)
-	if err != nil {
-		return "", err
-	}
-	b := sha256.Sum256([]byte(ka))
-	return base64.RawURLEncoding.EncodeToString(b[:]), nil
-}
-
-// HTTP01ChallengeResponse returns the response for an http-01 challenge.
-// Servers should respond with the value to HTTP requests at the URL path
-// provided by HTTP01ChallengePath to validate the challenge and prove control
-// over a domain name.
-//
-// The token argument is a Challenge.Token value.
-func (c *Client) HTTP01ChallengeResponse(token string) (string, error) {
-	return keyAuth(c.Key.Public(), token)
-}
-
-// HTTP01ChallengePath returns the URL path at which the response for an http-01 challenge
-// should be provided by the servers.
-// The response value can be obtained with HTTP01ChallengeResponse.
-//
-// The token argument is a Challenge.Token value.
-func (c *Client) HTTP01ChallengePath(token string) string {
-	return "/.well-known/acme-challenge/" + token
-}
-
-// TLSSNI01ChallengeCert creates a certificate for TLS-SNI-01 challenge response.
-// Servers can present the certificate to validate the challenge and prove control
-// over a domain name.
-//
-// The implementation is incomplete in that the returned value is a single certificate,
-// computed only for Z0 of the key authorization. ACME CAs are expected to update
-// their implementations to use the newer version, TLS-SNI-02.
-// For more details on TLS-SNI-01 see https://tools.ietf.org/html/draft-ietf-acme-acme-01#section-7.3.
-//
-// The token argument is a Challenge.Token value.
-// If a WithKey option is provided, its private part signs the returned cert,
-// and the public part is used to specify the signee.
-// If no WithKey option is provided, a new ECDSA key is generated using P-256 curve.
-//
-// The returned certificate is valid for the next 24 hours and must be presented only when
-// the server name of the client hello matches exactly the returned name value.
-func (c *Client) TLSSNI01ChallengeCert(token string, opt ...CertOption) (cert tls.Certificate, name string, err error) {
-	ka, err := keyAuth(c.Key.Public(), token)
-	if err != nil {
-		return tls.Certificate{}, "", err
-	}
-	b := sha256.Sum256([]byte(ka))
-	h := hex.EncodeToString(b[:])
-	name = fmt.Sprintf("%s.%s.acme.invalid", h[:32], h[32:])
-	cert, err = tlsChallengeCert([]string{name}, opt)
-	if err != nil {
-		return tls.Certificate{}, "", err
-	}
-	return cert, name, nil
-}
-
-// TLSSNI02ChallengeCert creates a certificate for TLS-SNI-02 challenge response.
-// Servers can present the certificate to validate the challenge and prove control
-// over a domain name. For more details on TLS-SNI-02 see
-// https://tools.ietf.org/html/draft-ietf-acme-acme-03#section-7.3.
-//
-// The token argument is a Challenge.Token value.
-// If a WithKey option is provided, its private part signs the returned cert,
-// and the public part is used to specify the signee.
-// If no WithKey option is provided, a new ECDSA key is generated using P-256 curve.
-//
-// The returned certificate is valid for the next 24 hours and must be presented only when
-// the server name in the client hello matches exactly the returned name value.
-func (c *Client) TLSSNI02ChallengeCert(token string, opt ...CertOption) (cert tls.Certificate, name string, err error) {
-	b := sha256.Sum256([]byte(token))
-	h := hex.EncodeToString(b[:])
-	sanA := fmt.Sprintf("%s.%s.token.acme.invalid", h[:32], h[32:])
-
-	ka, err := keyAuth(c.Key.Public(), token)
-	if err != nil {
-		return tls.Certificate{}, "", err
-	}
-	b = sha256.Sum256([]byte(ka))
-	h = hex.EncodeToString(b[:])
-	sanB := fmt.Sprintf("%s.%s.ka.acme.invalid", h[:32], h[32:])
-
-	cert, err = tlsChallengeCert([]string{sanA, sanB}, opt)
-	if err != nil {
-		return tls.Certificate{}, "", err
-	}
-	return cert, sanA, nil
-}
-
-// doReg sends all types of registration requests.
-// The type of request is identified by typ argument, which is a "resource"
-// in the ACME spec terms.
-//
-// A non-nil acct argument indicates whether the intention is to mutate data
-// of the Account. Only Contact and Agreement of its fields are used
-// in such cases.
-func (c *Client) doReg(ctx context.Context, url string, typ string, acct *Account) (*Account, error) {
-	req := struct {
-		Resource  string   `json:"resource"`
-		Contact   []string `json:"contact,omitempty"`
-		Agreement string   `json:"agreement,omitempty"`
-	}{
-		Resource: typ,
-	}
-	if acct != nil {
-		req.Contact = acct.Contact
-		req.Agreement = acct.AgreedTerms
-	}
-	res, err := c.retryPostJWS(ctx, c.Key, url, req)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode < 200 || res.StatusCode > 299 {
-		return nil, responseError(res)
-	}
-
-	var v struct {
-		Contact        []string
-		Agreement      string
-		Authorizations string
-		Certificates   string
-	}
-	if err := json.NewDecoder(res.Body).Decode(&v); err != nil {
-		return nil, fmt.Errorf("acme: invalid response: %v", err)
-	}
-	var tos string
-	if v := linkHeader(res.Header, "terms-of-service"); len(v) > 0 {
-		tos = v[0]
-	}
-	var authz string
-	if v := linkHeader(res.Header, "next"); len(v) > 0 {
-		authz = v[0]
-	}
-	return &Account{
-		URI:            res.Header.Get("Location"),
-		Contact:        v.Contact,
-		AgreedTerms:    v.Agreement,
-		CurrentTerms:   tos,
-		Authz:          authz,
-		Authorizations: v.Authorizations,
-		Certificates:   v.Certificates,
-	}, nil
-}
-
-// retryPostJWS will retry calls to postJWS if there is a badNonce error,
-// clearing the stored nonces after each error.
-// If the response was 4XX-5XX, then responseError is called on the body,
-// the body is closed, and the error returned.
-func (c *Client) retryPostJWS(ctx context.Context, key crypto.Signer, url string, body interface{}) (*http.Response, error) {
-	sleep := sleeper(ctx)
-	for {
-		res, err := c.postJWS(ctx, key, url, body)
-		if err != nil {
-			return nil, err
-		}
-		// handle errors 4XX-5XX with responseError
-		if res.StatusCode >= 400 && res.StatusCode <= 599 {
-			err := responseError(res)
-			res.Body.Close()
-			// according to spec badNonce is urn:ietf:params:acme:error:badNonce
-			// however, acme servers in the wild return their version of the error
-			// https://tools.ietf.org/html/draft-ietf-acme-acme-02#section-5.4
-			if ae, ok := err.(*Error); ok && strings.HasSuffix(strings.ToLower(ae.ProblemType), ":badnonce") {
-				// clear any nonces that we might've stored that might now be
-				// considered bad
-				c.clearNonces()
-				retry := res.Header.Get("Retry-After")
-				if err := sleep(retry, 1); err != nil {
-					return nil, err
-				}
-				continue
-			}
-			return nil, err
-		}
-		return res, nil
-	}
-}
-
-// postJWS signs the body with the given key and POSTs it to the provided url.
-// The body argument must be JSON-serializable.
-func (c *Client) postJWS(ctx context.Context, key crypto.Signer, url string, body interface{}) (*http.Response, error) {
-	nonce, err := c.popNonce(ctx, url)
-	if err != nil {
-		return nil, err
-	}
-	b, err := jwsEncodeJSON(body, key, nonce)
-	if err != nil {
-		return nil, err
-	}
-	res, err := c.post(ctx, url, "application/jose+json", bytes.NewReader(b))
-	if err != nil {
-		return nil, err
-	}
-	c.addNonce(res.Header)
-	return res, nil
-}
-
-// popNonce returns a nonce value previously stored with c.addNonce
-// or fetches a fresh one from the given URL.
-func (c *Client) popNonce(ctx context.Context, url string) (string, error) {
-	c.noncesMu.Lock()
-	defer c.noncesMu.Unlock()
-	if len(c.nonces) == 0 {
-		return c.fetchNonce(ctx, url)
-	}
-	var nonce string
-	for nonce = range c.nonces {
-		delete(c.nonces, nonce)
-		break
-	}
-	return nonce, nil
-}
-
-// clearNonces clears any stored nonces
-func (c *Client) clearNonces() {
-	c.noncesMu.Lock()
-	defer c.noncesMu.Unlock()
-	c.nonces = make(map[string]struct{})
-}
-
-// addNonce stores a nonce value found in h (if any) for future use.
-func (c *Client) addNonce(h http.Header) {
-	v := nonceFromHeader(h)
-	if v == "" {
-		return
-	}
-	c.noncesMu.Lock()
-	defer c.noncesMu.Unlock()
-	if len(c.nonces) >= maxNonces {
-		return
-	}
-	if c.nonces == nil {
-		c.nonces = make(map[string]struct{})
-	}
-	c.nonces[v] = struct{}{}
-}
-
-func (c *Client) httpClient() *http.Client {
-	if c.HTTPClient != nil {
-		return c.HTTPClient
-	}
-	return http.DefaultClient
-}
-
-func (c *Client) get(ctx context.Context, urlStr string) (*http.Response, error) {
-	req, err := http.NewRequest("GET", urlStr, nil)
-	if err != nil {
-		return nil, err
-	}
-	return c.do(ctx, req)
-}
-
-func (c *Client) head(ctx context.Context, urlStr string) (*http.Response, error) {
-	req, err := http.NewRequest("HEAD", urlStr, nil)
-	if err != nil {
-		return nil, err
-	}
-	return c.do(ctx, req)
-}
-
-func (c *Client) post(ctx context.Context, urlStr, contentType string, body io.Reader) (*http.Response, error) {
-	req, err := http.NewRequest("POST", urlStr, body)
-	if err != nil {
-		return nil, err
-	}
-	req.Header.Set("Content-Type", contentType)
-	return c.do(ctx, req)
-}
-
-func (c *Client) do(ctx context.Context, req *http.Request) (*http.Response, error) {
-	res, err := c.httpClient().Do(req.WithContext(ctx))
-	if err != nil {
-		select {
-		case <-ctx.Done():
-			// Prefer the unadorned context error.
-			// (The acme package had tests assuming this, previously from ctxhttp's
-			// behavior, predating net/http supporting contexts natively)
-			// TODO(bradfitz): reconsider this in the future. But for now this
-			// requires no test updates.
-			return nil, ctx.Err()
-		default:
-			return nil, err
-		}
-	}
-	return res, nil
-}
-
-func (c *Client) fetchNonce(ctx context.Context, url string) (string, error) {
-	resp, err := c.head(ctx, url)
-	if err != nil {
-		return "", err
-	}
-	defer resp.Body.Close()
-	nonce := nonceFromHeader(resp.Header)
-	if nonce == "" {
-		if resp.StatusCode > 299 {
-			return "", responseError(resp)
-		}
-		return "", errors.New("acme: nonce not found")
-	}
-	return nonce, nil
-}
-
-func nonceFromHeader(h http.Header) string {
-	return h.Get("Replay-Nonce")
-}
-
-func (c *Client) responseCert(ctx context.Context, res *http.Response, bundle bool) ([][]byte, error) {
-	b, err := ioutil.ReadAll(io.LimitReader(res.Body, maxCertSize+1))
-	if err != nil {
-		return nil, fmt.Errorf("acme: response stream: %v", err)
-	}
-	if len(b) > maxCertSize {
-		return nil, errors.New("acme: certificate is too big")
-	}
-	cert := [][]byte{b}
-	if !bundle {
-		return cert, nil
-	}
-
-	// Append CA chain cert(s).
-	// At least one is required according to the spec:
-	// https://tools.ietf.org/html/draft-ietf-acme-acme-03#section-6.3.1
-	up := linkHeader(res.Header, "up")
-	if len(up) == 0 {
-		return nil, errors.New("acme: rel=up link not found")
-	}
-	if len(up) > maxChainLen {
-		return nil, errors.New("acme: rel=up link is too large")
-	}
-	for _, url := range up {
-		cc, err := c.chainCert(ctx, url, 0)
-		if err != nil {
-			return nil, err
-		}
-		cert = append(cert, cc...)
-	}
-	return cert, nil
-}
-
-// responseError creates an error of Error type from resp.
-func responseError(resp *http.Response) error {
-	// don't care if ReadAll returns an error:
-	// json.Unmarshal will fail in that case anyway
-	b, _ := ioutil.ReadAll(resp.Body)
-	e := &wireError{Status: resp.StatusCode}
-	if err := json.Unmarshal(b, e); err != nil {
-		// this is not a regular error response:
-		// populate detail with anything we received,
-		// e.Status will already contain HTTP response code value
-		e.Detail = string(b)
-		if e.Detail == "" {
-			e.Detail = resp.Status
-		}
-	}
-	return e.error(resp.Header)
-}
-
-// chainCert fetches CA certificate chain recursively by following "up" links.
-// Each recursive call increments the depth by 1, resulting in an error
-// if the recursion level reaches maxChainLen.
-//
-// First chainCert call starts with depth of 0.
-func (c *Client) chainCert(ctx context.Context, url string, depth int) ([][]byte, error) {
-	if depth >= maxChainLen {
-		return nil, errors.New("acme: certificate chain is too deep")
-	}
-
-	res, err := c.get(ctx, url)
-	if err != nil {
-		return nil, err
-	}
-	defer res.Body.Close()
-	if res.StatusCode != http.StatusOK {
-		return nil, responseError(res)
-	}
-	b, err := ioutil.ReadAll(io.LimitReader(res.Body, maxCertSize+1))
-	if err != nil {
-		return nil, err
-	}
-	if len(b) > maxCertSize {
-		return nil, errors.New("acme: certificate is too big")
-	}
-	chain := [][]byte{b}
-
-	uplink := linkHeader(res.Header, "up")
-	if len(uplink) > maxChainLen {
-		return nil, errors.New("acme: certificate chain is too large")
-	}
-	for _, up := range uplink {
-		cc, err := c.chainCert(ctx, up, depth+1)
-		if err != nil {
-			return nil, err
-		}
-		chain = append(chain, cc...)
-	}
-
-	return chain, nil
-}
-
-// linkHeader returns URI-Reference values of all Link headers
-// with relation-type rel.
-// See https://tools.ietf.org/html/rfc5988#section-5 for details.
-func linkHeader(h http.Header, rel string) []string {
-	var links []string
-	for _, v := range h["Link"] {
-		parts := strings.Split(v, ";")
-		for _, p := range parts {
-			p = strings.TrimSpace(p)
-			if !strings.HasPrefix(p, "rel=") {
-				continue
-			}
-			if v := strings.Trim(p[4:], `"`); v == rel {
-				links = append(links, strings.Trim(parts[0], "<>"))
-			}
-		}
-	}
-	return links
-}
-
-// sleeper returns a function that accepts the Retry-After HTTP header value
-// and an increment that's used with backoff to increasingly sleep on
-// consecutive calls until the context is done. If the Retry-After header
-// cannot be parsed, then backoff is used with a maximum sleep time of 10
-// seconds.
-func sleeper(ctx context.Context) func(ra string, inc int) error {
-	var count int
-	return func(ra string, inc int) error {
-		count += inc
-		d := backoff(count, 10*time.Second)
-		d = retryAfter(ra, d)
-		wakeup := time.NewTimer(d)
-		defer wakeup.Stop()
-		select {
-		case <-ctx.Done():
-			return ctx.Err()
-		case <-wakeup.C:
-			return nil
-		}
-	}
-}
-
-// retryAfter parses a Retry-After HTTP header value,
-// trying to convert v into an int (seconds) or use http.ParseTime otherwise.
-// It returns d if v cannot be parsed.
-func retryAfter(v string, d time.Duration) time.Duration {
-	if i, err := strconv.Atoi(v); err == nil {
-		return time.Duration(i) * time.Second
-	}
-	t, err := http.ParseTime(v)
-	if err != nil {
-		return d
-	}
-	return t.Sub(timeNow())
-}
-
-// backoff computes a duration after which an n+1 retry iteration should occur
-// using truncated exponential backoff algorithm.
-//
-// The n argument is always bounded between 0 and 30.
-// The max argument defines upper bound for the returned value.
-func backoff(n int, max time.Duration) time.Duration {
-	if n < 0 {
-		n = 0
-	}
-	if n > 30 {
-		n = 30
-	}
-	var d time.Duration
-	if x, err := rand.Int(rand.Reader, big.NewInt(1000)); err == nil {
-		d = time.Duration(x.Int64()) * time.Millisecond
-	}
-	d += time.Duration(1<<uint(n)) * time.Second
-	if d > max {
-		return max
-	}
-	return d
-}
-
-// keyAuth generates a key authorization string for a given token.
-func keyAuth(pub crypto.PublicKey, token string) (string, error) {
-	th, err := JWKThumbprint(pub)
-	if err != nil {
-		return "", err
-	}
-	return fmt.Sprintf("%s.%s", token, th), nil
-}
-
-// tlsChallengeCert creates a temporary certificate for TLS-SNI challenges
-// with the given SANs and auto-generated public/private key pair.
-// The Subject Common Name is set to the first SAN to aid debugging.
-// To create a cert with a custom key pair, specify WithKey option.
-func tlsChallengeCert(san []string, opt []CertOption) (tls.Certificate, error) {
-	var (
-		key  crypto.Signer
-		tmpl *x509.Certificate
-	)
-	for _, o := range opt {
-		switch o := o.(type) {
-		case *certOptKey:
-			if key != nil {
-				return tls.Certificate{}, errors.New("acme: duplicate key option")
-			}
-			key = o.key
-		case *certOptTemplate:
-			var t = *(*x509.Certificate)(o) // shallow copy is ok
-			tmpl = &t
-		default:
-			// package's fault, if we let this happen:
-			panic(fmt.Sprintf("unsupported option type %T", o))
-		}
-	}
-	if key == nil {
-		var err error
-		if key, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader); err != nil {
-			return tls.Certificate{}, err
-		}
-	}
-	if tmpl == nil {
-		tmpl = &x509.Certificate{
-			SerialNumber:          big.NewInt(1),
-			NotBefore:             time.Now(),
-			NotAfter:              time.Now().Add(24 * time.Hour),
-			BasicConstraintsValid: true,
-			KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-		}
-	}
-	tmpl.DNSNames = san
-	if len(san) > 0 {
-		tmpl.Subject.CommonName = san[0]
-	}
-
-	der, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, key.Public(), key)
-	if err != nil {
-		return tls.Certificate{}, err
-	}
-	return tls.Certificate{
-		Certificate: [][]byte{der},
-		PrivateKey:  key,
-	}, nil
-}
-
-// encodePEM returns b encoded as PEM with block of type typ.
-func encodePEM(typ string, b []byte) []byte {
-	pb := &pem.Block{Type: typ, Bytes: b}
-	return pem.EncodeToMemory(pb)
-}
-
-// timeNow is useful for testing for fixed current time.
-var timeNow = time.Now
diff --git a/installer/vendor/golang.org/x/crypto/acme/acme_test.go b/installer/vendor/golang.org/x/crypto/acme/acme_test.go
deleted file mode 100644
index b44af59596..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/acme_test.go
+++ /dev/null
@@ -1,1352 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package acme
-
-import (
-	"bytes"
-	"context"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"math/big"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-	"time"
-)
-
-// Decodes a JWS-encoded request and unmarshals the decoded JSON into a provided
-// interface.
-func decodeJWSRequest(t *testing.T, v interface{}, r *http.Request) {
-	// Decode request
-	var req struct{ Payload string }
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		t.Fatal(err)
-	}
-	payload, err := base64.RawURLEncoding.DecodeString(req.Payload)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = json.Unmarshal(payload, v)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-type jwsHead struct {
-	Alg   string
-	Nonce string
-	JWK   map[string]string `json:"jwk"`
-}
-
-func decodeJWSHead(r *http.Request) (*jwsHead, error) {
-	var req struct{ Protected string }
-	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		return nil, err
-	}
-	b, err := base64.RawURLEncoding.DecodeString(req.Protected)
-	if err != nil {
-		return nil, err
-	}
-	var head jwsHead
-	if err := json.Unmarshal(b, &head); err != nil {
-		return nil, err
-	}
-	return &head, nil
-}
-
-func TestDiscover(t *testing.T) {
-	const (
-		reg    = "https://example.com/acme/new-reg"
-		authz  = "https://example.com/acme/new-authz"
-		cert   = "https://example.com/acme/new-cert"
-		revoke = "https://example.com/acme/revoke-cert"
-	)
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "application/json")
-		fmt.Fprintf(w, `{
-			"new-reg": %q,
-			"new-authz": %q,
-			"new-cert": %q,
-			"revoke-cert": %q
-		}`, reg, authz, cert, revoke)
-	}))
-	defer ts.Close()
-	c := Client{DirectoryURL: ts.URL}
-	dir, err := c.Discover(context.Background())
-	if err != nil {
-		t.Fatal(err)
-	}
-	if dir.RegURL != reg {
-		t.Errorf("dir.RegURL = %q; want %q", dir.RegURL, reg)
-	}
-	if dir.AuthzURL != authz {
-		t.Errorf("dir.AuthzURL = %q; want %q", dir.AuthzURL, authz)
-	}
-	if dir.CertURL != cert {
-		t.Errorf("dir.CertURL = %q; want %q", dir.CertURL, cert)
-	}
-	if dir.RevokeURL != revoke {
-		t.Errorf("dir.RevokeURL = %q; want %q", dir.RevokeURL, revoke)
-	}
-}
-
-func TestRegister(t *testing.T) {
-	contacts := []string{"mailto:admin@example.com"}
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource  string
-			Contact   []string
-			Agreement string
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "new-reg" {
-			t.Errorf("j.Resource = %q; want new-reg", j.Resource)
-		}
-		if !reflect.DeepEqual(j.Contact, contacts) {
-			t.Errorf("j.Contact = %v; want %v", j.Contact, contacts)
-		}
-
-		w.Header().Set("Location", "https://ca.tld/acme/reg/1")
-		w.Header().Set("Link", `<https://ca.tld/acme/new-authz>;rel="next"`)
-		w.Header().Add("Link", `<https://ca.tld/acme/recover-reg>;rel="recover"`)
-		w.Header().Add("Link", `<https://ca.tld/acme/terms>;rel="terms-of-service"`)
-		w.WriteHeader(http.StatusCreated)
-		b, _ := json.Marshal(contacts)
-		fmt.Fprintf(w, `{"contact": %s}`, b)
-	}))
-	defer ts.Close()
-
-	prompt := func(url string) bool {
-		const terms = "https://ca.tld/acme/terms"
-		if url != terms {
-			t.Errorf("prompt url = %q; want %q", url, terms)
-		}
-		return false
-	}
-
-	c := Client{Key: testKeyEC, dir: &Directory{RegURL: ts.URL}}
-	a := &Account{Contact: contacts}
-	var err error
-	if a, err = c.Register(context.Background(), a, prompt); err != nil {
-		t.Fatal(err)
-	}
-	if a.URI != "https://ca.tld/acme/reg/1" {
-		t.Errorf("a.URI = %q; want https://ca.tld/acme/reg/1", a.URI)
-	}
-	if a.Authz != "https://ca.tld/acme/new-authz" {
-		t.Errorf("a.Authz = %q; want https://ca.tld/acme/new-authz", a.Authz)
-	}
-	if a.CurrentTerms != "https://ca.tld/acme/terms" {
-		t.Errorf("a.CurrentTerms = %q; want https://ca.tld/acme/terms", a.CurrentTerms)
-	}
-	if !reflect.DeepEqual(a.Contact, contacts) {
-		t.Errorf("a.Contact = %v; want %v", a.Contact, contacts)
-	}
-}
-
-func TestUpdateReg(t *testing.T) {
-	const terms = "https://ca.tld/acme/terms"
-	contacts := []string{"mailto:admin@example.com"}
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource  string
-			Contact   []string
-			Agreement string
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "reg" {
-			t.Errorf("j.Resource = %q; want reg", j.Resource)
-		}
-		if j.Agreement != terms {
-			t.Errorf("j.Agreement = %q; want %q", j.Agreement, terms)
-		}
-		if !reflect.DeepEqual(j.Contact, contacts) {
-			t.Errorf("j.Contact = %v; want %v", j.Contact, contacts)
-		}
-
-		w.Header().Set("Link", `<https://ca.tld/acme/new-authz>;rel="next"`)
-		w.Header().Add("Link", `<https://ca.tld/acme/recover-reg>;rel="recover"`)
-		w.Header().Add("Link", fmt.Sprintf(`<%s>;rel="terms-of-service"`, terms))
-		w.WriteHeader(http.StatusOK)
-		b, _ := json.Marshal(contacts)
-		fmt.Fprintf(w, `{"contact":%s, "agreement":%q}`, b, terms)
-	}))
-	defer ts.Close()
-
-	c := Client{Key: testKeyEC}
-	a := &Account{URI: ts.URL, Contact: contacts, AgreedTerms: terms}
-	var err error
-	if a, err = c.UpdateReg(context.Background(), a); err != nil {
-		t.Fatal(err)
-	}
-	if a.Authz != "https://ca.tld/acme/new-authz" {
-		t.Errorf("a.Authz = %q; want https://ca.tld/acme/new-authz", a.Authz)
-	}
-	if a.AgreedTerms != terms {
-		t.Errorf("a.AgreedTerms = %q; want %q", a.AgreedTerms, terms)
-	}
-	if a.CurrentTerms != terms {
-		t.Errorf("a.CurrentTerms = %q; want %q", a.CurrentTerms, terms)
-	}
-	if a.URI != ts.URL {
-		t.Errorf("a.URI = %q; want %q", a.URI, ts.URL)
-	}
-}
-
-func TestGetReg(t *testing.T) {
-	const terms = "https://ca.tld/acme/terms"
-	const newTerms = "https://ca.tld/acme/new-terms"
-	contacts := []string{"mailto:admin@example.com"}
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource  string
-			Contact   []string
-			Agreement string
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "reg" {
-			t.Errorf("j.Resource = %q; want reg", j.Resource)
-		}
-		if len(j.Contact) != 0 {
-			t.Errorf("j.Contact = %v", j.Contact)
-		}
-		if j.Agreement != "" {
-			t.Errorf("j.Agreement = %q", j.Agreement)
-		}
-
-		w.Header().Set("Link", `<https://ca.tld/acme/new-authz>;rel="next"`)
-		w.Header().Add("Link", `<https://ca.tld/acme/recover-reg>;rel="recover"`)
-		w.Header().Add("Link", fmt.Sprintf(`<%s>;rel="terms-of-service"`, newTerms))
-		w.WriteHeader(http.StatusOK)
-		b, _ := json.Marshal(contacts)
-		fmt.Fprintf(w, `{"contact":%s, "agreement":%q}`, b, terms)
-	}))
-	defer ts.Close()
-
-	c := Client{Key: testKeyEC}
-	a, err := c.GetReg(context.Background(), ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if a.Authz != "https://ca.tld/acme/new-authz" {
-		t.Errorf("a.AuthzURL = %q; want https://ca.tld/acme/new-authz", a.Authz)
-	}
-	if a.AgreedTerms != terms {
-		t.Errorf("a.AgreedTerms = %q; want %q", a.AgreedTerms, terms)
-	}
-	if a.CurrentTerms != newTerms {
-		t.Errorf("a.CurrentTerms = %q; want %q", a.CurrentTerms, newTerms)
-	}
-	if a.URI != ts.URL {
-		t.Errorf("a.URI = %q; want %q", a.URI, ts.URL)
-	}
-}
-
-func TestAuthorize(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource   string
-			Identifier struct {
-				Type  string
-				Value string
-			}
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "new-authz" {
-			t.Errorf("j.Resource = %q; want new-authz", j.Resource)
-		}
-		if j.Identifier.Type != "dns" {
-			t.Errorf("j.Identifier.Type = %q; want dns", j.Identifier.Type)
-		}
-		if j.Identifier.Value != "example.com" {
-			t.Errorf("j.Identifier.Value = %q; want example.com", j.Identifier.Value)
-		}
-
-		w.Header().Set("Location", "https://ca.tld/acme/auth/1")
-		w.WriteHeader(http.StatusCreated)
-		fmt.Fprintf(w, `{
-			"identifier": {"type":"dns","value":"example.com"},
-			"status":"pending",
-			"challenges":[
-				{
-					"type":"http-01",
-					"status":"pending",
-					"uri":"https://ca.tld/acme/challenge/publickey/id1",
-					"token":"token1"
-				},
-				{
-					"type":"tls-sni-01",
-					"status":"pending",
-					"uri":"https://ca.tld/acme/challenge/publickey/id2",
-					"token":"token2"
-				}
-			],
-			"combinations":[[0],[1]]}`)
-	}))
-	defer ts.Close()
-
-	cl := Client{Key: testKeyEC, dir: &Directory{AuthzURL: ts.URL}}
-	auth, err := cl.Authorize(context.Background(), "example.com")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if auth.URI != "https://ca.tld/acme/auth/1" {
-		t.Errorf("URI = %q; want https://ca.tld/acme/auth/1", auth.URI)
-	}
-	if auth.Status != "pending" {
-		t.Errorf("Status = %q; want pending", auth.Status)
-	}
-	if auth.Identifier.Type != "dns" {
-		t.Errorf("Identifier.Type = %q; want dns", auth.Identifier.Type)
-	}
-	if auth.Identifier.Value != "example.com" {
-		t.Errorf("Identifier.Value = %q; want example.com", auth.Identifier.Value)
-	}
-
-	if n := len(auth.Challenges); n != 2 {
-		t.Fatalf("len(auth.Challenges) = %d; want 2", n)
-	}
-
-	c := auth.Challenges[0]
-	if c.Type != "http-01" {
-		t.Errorf("c.Type = %q; want http-01", c.Type)
-	}
-	if c.URI != "https://ca.tld/acme/challenge/publickey/id1" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id1", c.URI)
-	}
-	if c.Token != "token1" {
-		t.Errorf("c.Token = %q; want token1", c.Token)
-	}
-
-	c = auth.Challenges[1]
-	if c.Type != "tls-sni-01" {
-		t.Errorf("c.Type = %q; want tls-sni-01", c.Type)
-	}
-	if c.URI != "https://ca.tld/acme/challenge/publickey/id2" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id2", c.URI)
-	}
-	if c.Token != "token2" {
-		t.Errorf("c.Token = %q; want token2", c.Token)
-	}
-
-	combs := [][]int{{0}, {1}}
-	if !reflect.DeepEqual(auth.Combinations, combs) {
-		t.Errorf("auth.Combinations: %+v\nwant: %+v\n", auth.Combinations, combs)
-	}
-}
-
-func TestAuthorizeValid(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "nonce")
-			return
-		}
-		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(`{"status":"valid"}`))
-	}))
-	defer ts.Close()
-	client := Client{Key: testKey, dir: &Directory{AuthzURL: ts.URL}}
-	_, err := client.Authorize(context.Background(), "example.com")
-	if err != nil {
-		t.Errorf("err = %v", err)
-	}
-}
-
-func TestGetAuthorization(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "GET" {
-			t.Errorf("r.Method = %q; want GET", r.Method)
-		}
-
-		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
-			"identifier": {"type":"dns","value":"example.com"},
-			"status":"pending",
-			"challenges":[
-				{
-					"type":"http-01",
-					"status":"pending",
-					"uri":"https://ca.tld/acme/challenge/publickey/id1",
-					"token":"token1"
-				},
-				{
-					"type":"tls-sni-01",
-					"status":"pending",
-					"uri":"https://ca.tld/acme/challenge/publickey/id2",
-					"token":"token2"
-				}
-			],
-			"combinations":[[0],[1]]}`)
-	}))
-	defer ts.Close()
-
-	cl := Client{Key: testKeyEC}
-	auth, err := cl.GetAuthorization(context.Background(), ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if auth.Status != "pending" {
-		t.Errorf("Status = %q; want pending", auth.Status)
-	}
-	if auth.Identifier.Type != "dns" {
-		t.Errorf("Identifier.Type = %q; want dns", auth.Identifier.Type)
-	}
-	if auth.Identifier.Value != "example.com" {
-		t.Errorf("Identifier.Value = %q; want example.com", auth.Identifier.Value)
-	}
-
-	if n := len(auth.Challenges); n != 2 {
-		t.Fatalf("len(set.Challenges) = %d; want 2", n)
-	}
-
-	c := auth.Challenges[0]
-	if c.Type != "http-01" {
-		t.Errorf("c.Type = %q; want http-01", c.Type)
-	}
-	if c.URI != "https://ca.tld/acme/challenge/publickey/id1" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id1", c.URI)
-	}
-	if c.Token != "token1" {
-		t.Errorf("c.Token = %q; want token1", c.Token)
-	}
-
-	c = auth.Challenges[1]
-	if c.Type != "tls-sni-01" {
-		t.Errorf("c.Type = %q; want tls-sni-01", c.Type)
-	}
-	if c.URI != "https://ca.tld/acme/challenge/publickey/id2" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id2", c.URI)
-	}
-	if c.Token != "token2" {
-		t.Errorf("c.Token = %q; want token2", c.Token)
-	}
-
-	combs := [][]int{{0}, {1}}
-	if !reflect.DeepEqual(auth.Combinations, combs) {
-		t.Errorf("auth.Combinations: %+v\nwant: %+v\n", auth.Combinations, combs)
-	}
-}
-
-func TestWaitAuthorization(t *testing.T) {
-	var count int
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		w.Header().Set("Retry-After", "0")
-		if count > 1 {
-			fmt.Fprintf(w, `{"status":"valid"}`)
-			return
-		}
-		fmt.Fprintf(w, `{"status":"pending"}`)
-	}))
-	defer ts.Close()
-
-	type res struct {
-		authz *Authorization
-		err   error
-	}
-	done := make(chan res)
-	defer close(done)
-	go func() {
-		var client Client
-		a, err := client.WaitAuthorization(context.Background(), ts.URL)
-		done <- res{a, err}
-	}()
-
-	select {
-	case <-time.After(5 * time.Second):
-		t.Fatal("WaitAuthz took too long to return")
-	case res := <-done:
-		if res.err != nil {
-			t.Fatalf("res.err =  %v", res.err)
-		}
-		if res.authz == nil {
-			t.Fatal("res.authz is nil")
-		}
-	}
-}
-
-func TestWaitAuthorizationInvalid(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, `{"status":"invalid"}`)
-	}))
-	defer ts.Close()
-
-	res := make(chan error)
-	defer close(res)
-	go func() {
-		var client Client
-		_, err := client.WaitAuthorization(context.Background(), ts.URL)
-		res <- err
-	}()
-
-	select {
-	case <-time.After(3 * time.Second):
-		t.Fatal("WaitAuthz took too long to return")
-	case err := <-res:
-		if err == nil {
-			t.Error("err is nil")
-		}
-		if _, ok := err.(*AuthorizationError); !ok {
-			t.Errorf("err is %T; want *AuthorizationError", err)
-		}
-	}
-}
-
-func TestWaitAuthorizationCancel(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Retry-After", "60")
-		fmt.Fprintf(w, `{"status":"pending"}`)
-	}))
-	defer ts.Close()
-
-	res := make(chan error)
-	defer close(res)
-	go func() {
-		var client Client
-		ctx, cancel := context.WithTimeout(context.Background(), 200*time.Millisecond)
-		defer cancel()
-		_, err := client.WaitAuthorization(ctx, ts.URL)
-		res <- err
-	}()
-
-	select {
-	case <-time.After(time.Second):
-		t.Fatal("WaitAuthz took too long to return")
-	case err := <-res:
-		if err == nil {
-			t.Error("err is nil")
-		}
-	}
-}
-
-func TestRevokeAuthorization(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "nonce")
-			return
-		}
-		switch r.URL.Path {
-		case "/1":
-			var req struct {
-				Resource string
-				Status   string
-				Delete   bool
-			}
-			decodeJWSRequest(t, &req, r)
-			if req.Resource != "authz" {
-				t.Errorf("req.Resource = %q; want authz", req.Resource)
-			}
-			if req.Status != "deactivated" {
-				t.Errorf("req.Status = %q; want deactivated", req.Status)
-			}
-			if !req.Delete {
-				t.Errorf("req.Delete is false")
-			}
-		case "/2":
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-	}))
-	defer ts.Close()
-	client := &Client{Key: testKey}
-	ctx := context.Background()
-	if err := client.RevokeAuthorization(ctx, ts.URL+"/1"); err != nil {
-		t.Errorf("err = %v", err)
-	}
-	if client.RevokeAuthorization(ctx, ts.URL+"/2") == nil {
-		t.Error("nil error")
-	}
-}
-
-func TestPollChallenge(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "GET" {
-			t.Errorf("r.Method = %q; want GET", r.Method)
-		}
-
-		w.WriteHeader(http.StatusOK)
-		fmt.Fprintf(w, `{
-			"type":"http-01",
-			"status":"pending",
-			"uri":"https://ca.tld/acme/challenge/publickey/id1",
-			"token":"token1"}`)
-	}))
-	defer ts.Close()
-
-	cl := Client{Key: testKeyEC}
-	chall, err := cl.GetChallenge(context.Background(), ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if chall.Status != "pending" {
-		t.Errorf("Status = %q; want pending", chall.Status)
-	}
-	if chall.Type != "http-01" {
-		t.Errorf("c.Type = %q; want http-01", chall.Type)
-	}
-	if chall.URI != "https://ca.tld/acme/challenge/publickey/id1" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id1", chall.URI)
-	}
-	if chall.Token != "token1" {
-		t.Errorf("c.Token = %q; want token1", chall.Token)
-	}
-}
-
-func TestAcceptChallenge(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource string
-			Type     string
-			Auth     string `json:"keyAuthorization"`
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "challenge" {
-			t.Errorf(`resource = %q; want "challenge"`, j.Resource)
-		}
-		if j.Type != "http-01" {
-			t.Errorf(`type = %q; want "http-01"`, j.Type)
-		}
-		keyAuth := "token1." + testKeyECThumbprint
-		if j.Auth != keyAuth {
-			t.Errorf(`keyAuthorization = %q; want %q`, j.Auth, keyAuth)
-		}
-
-		// Respond to request
-		w.WriteHeader(http.StatusAccepted)
-		fmt.Fprintf(w, `{
-			"type":"http-01",
-			"status":"pending",
-			"uri":"https://ca.tld/acme/challenge/publickey/id1",
-			"token":"token1",
-			"keyAuthorization":%q
-		}`, keyAuth)
-	}))
-	defer ts.Close()
-
-	cl := Client{Key: testKeyEC}
-	c, err := cl.Accept(context.Background(), &Challenge{
-		URI:   ts.URL,
-		Token: "token1",
-		Type:  "http-01",
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if c.Type != "http-01" {
-		t.Errorf("c.Type = %q; want http-01", c.Type)
-	}
-	if c.URI != "https://ca.tld/acme/challenge/publickey/id1" {
-		t.Errorf("c.URI = %q; want https://ca.tld/acme/challenge/publickey/id1", c.URI)
-	}
-	if c.Token != "token1" {
-		t.Errorf("c.Token = %q; want token1", c.Token)
-	}
-}
-
-func TestNewCert(t *testing.T) {
-	notBefore := time.Now()
-	notAfter := notBefore.AddDate(0, 2, 0)
-	timeNow = func() time.Time { return notBefore }
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "test-nonce")
-			return
-		}
-		if r.Method != "POST" {
-			t.Errorf("r.Method = %q; want POST", r.Method)
-		}
-
-		var j struct {
-			Resource  string `json:"resource"`
-			CSR       string `json:"csr"`
-			NotBefore string `json:"notBefore,omitempty"`
-			NotAfter  string `json:"notAfter,omitempty"`
-		}
-		decodeJWSRequest(t, &j, r)
-
-		// Test request
-		if j.Resource != "new-cert" {
-			t.Errorf(`resource = %q; want "new-cert"`, j.Resource)
-		}
-		if j.NotBefore != notBefore.Format(time.RFC3339) {
-			t.Errorf(`notBefore = %q; wanted %q`, j.NotBefore, notBefore.Format(time.RFC3339))
-		}
-		if j.NotAfter != notAfter.Format(time.RFC3339) {
-			t.Errorf(`notAfter = %q; wanted %q`, j.NotAfter, notAfter.Format(time.RFC3339))
-		}
-
-		// Respond to request
-		template := x509.Certificate{
-			SerialNumber: big.NewInt(int64(1)),
-			Subject: pkix.Name{
-				Organization: []string{"goacme"},
-			},
-			NotBefore: notBefore,
-			NotAfter:  notAfter,
-
-			KeyUsage:              x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
-			ExtKeyUsage:           []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth},
-			BasicConstraintsValid: true,
-		}
-
-		sampleCert, err := x509.CreateCertificate(rand.Reader, &template, &template, &testKeyEC.PublicKey, testKeyEC)
-		if err != nil {
-			t.Fatalf("Error creating certificate: %v", err)
-		}
-
-		w.Header().Set("Location", "https://ca.tld/acme/cert/1")
-		w.WriteHeader(http.StatusCreated)
-		w.Write(sampleCert)
-	}))
-	defer ts.Close()
-
-	csr := x509.CertificateRequest{
-		Version: 0,
-		Subject: pkix.Name{
-			CommonName:   "example.com",
-			Organization: []string{"goacme"},
-		},
-	}
-	csrb, err := x509.CreateCertificateRequest(rand.Reader, &csr, testKeyEC)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	c := Client{Key: testKeyEC, dir: &Directory{CertURL: ts.URL}}
-	cert, certURL, err := c.CreateCert(context.Background(), csrb, notAfter.Sub(notBefore), false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if cert == nil {
-		t.Errorf("cert is nil")
-	}
-	if certURL != "https://ca.tld/acme/cert/1" {
-		t.Errorf("certURL = %q; want https://ca.tld/acme/cert/1", certURL)
-	}
-}
-
-func TestFetchCert(t *testing.T) {
-	var count byte
-	var ts *httptest.Server
-	ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		if count < 3 {
-			up := fmt.Sprintf("<%s>;rel=up", ts.URL)
-			w.Header().Set("Link", up)
-		}
-		w.Write([]byte{count})
-	}))
-	defer ts.Close()
-	res, err := (&Client{}).FetchCert(context.Background(), ts.URL, true)
-	if err != nil {
-		t.Fatalf("FetchCert: %v", err)
-	}
-	cert := [][]byte{{1}, {2}, {3}}
-	if !reflect.DeepEqual(res, cert) {
-		t.Errorf("res = %v; want %v", res, cert)
-	}
-}
-
-func TestFetchCertRetry(t *testing.T) {
-	var count int
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if count < 1 {
-			w.Header().Set("Retry-After", "0")
-			w.WriteHeader(http.StatusAccepted)
-			count++
-			return
-		}
-		w.Write([]byte{1})
-	}))
-	defer ts.Close()
-	res, err := (&Client{}).FetchCert(context.Background(), ts.URL, false)
-	if err != nil {
-		t.Fatalf("FetchCert: %v", err)
-	}
-	cert := [][]byte{{1}}
-	if !reflect.DeepEqual(res, cert) {
-		t.Errorf("res = %v; want %v", res, cert)
-	}
-}
-
-func TestFetchCertCancel(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Retry-After", "0")
-		w.WriteHeader(http.StatusAccepted)
-	}))
-	defer ts.Close()
-	ctx, cancel := context.WithCancel(context.Background())
-	done := make(chan struct{})
-	var err error
-	go func() {
-		_, err = (&Client{}).FetchCert(ctx, ts.URL, false)
-		close(done)
-	}()
-	cancel()
-	<-done
-	if err != context.Canceled {
-		t.Errorf("err = %v; want %v", err, context.Canceled)
-	}
-}
-
-func TestFetchCertDepth(t *testing.T) {
-	var count byte
-	var ts *httptest.Server
-	ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		if count > maxChainLen+1 {
-			t.Errorf("count = %d; want at most %d", count, maxChainLen+1)
-			w.WriteHeader(http.StatusInternalServerError)
-		}
-		w.Header().Set("Link", fmt.Sprintf("<%s>;rel=up", ts.URL))
-		w.Write([]byte{count})
-	}))
-	defer ts.Close()
-	_, err := (&Client{}).FetchCert(context.Background(), ts.URL, true)
-	if err == nil {
-		t.Errorf("err is nil")
-	}
-}
-
-func TestFetchCertBreadth(t *testing.T) {
-	var ts *httptest.Server
-	ts = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		for i := 0; i < maxChainLen+1; i++ {
-			w.Header().Add("Link", fmt.Sprintf("<%s>;rel=up", ts.URL))
-		}
-		w.Write([]byte{1})
-	}))
-	defer ts.Close()
-	_, err := (&Client{}).FetchCert(context.Background(), ts.URL, true)
-	if err == nil {
-		t.Errorf("err is nil")
-	}
-}
-
-func TestFetchCertSize(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		b := bytes.Repeat([]byte{1}, maxCertSize+1)
-		w.Write(b)
-	}))
-	defer ts.Close()
-	_, err := (&Client{}).FetchCert(context.Background(), ts.URL, false)
-	if err == nil {
-		t.Errorf("err is nil")
-	}
-}
-
-func TestRevokeCert(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method == "HEAD" {
-			w.Header().Set("Replay-Nonce", "nonce")
-			return
-		}
-
-		var req struct {
-			Resource    string
-			Certificate string
-			Reason      int
-		}
-		decodeJWSRequest(t, &req, r)
-		if req.Resource != "revoke-cert" {
-			t.Errorf("req.Resource = %q; want revoke-cert", req.Resource)
-		}
-		if req.Reason != 1 {
-			t.Errorf("req.Reason = %d; want 1", req.Reason)
-		}
-		// echo -n cert | base64 | tr -d '=' | tr '/+' '_-'
-		cert := "Y2VydA"
-		if req.Certificate != cert {
-			t.Errorf("req.Certificate = %q; want %q", req.Certificate, cert)
-		}
-	}))
-	defer ts.Close()
-	client := &Client{
-		Key: testKeyEC,
-		dir: &Directory{RevokeURL: ts.URL},
-	}
-	ctx := context.Background()
-	if err := client.RevokeCert(ctx, nil, []byte("cert"), CRLReasonKeyCompromise); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestNonce_add(t *testing.T) {
-	var c Client
-	c.addNonce(http.Header{"Replay-Nonce": {"nonce"}})
-	c.addNonce(http.Header{"Replay-Nonce": {}})
-	c.addNonce(http.Header{"Replay-Nonce": {"nonce"}})
-
-	nonces := map[string]struct{}{"nonce": struct{}{}}
-	if !reflect.DeepEqual(c.nonces, nonces) {
-		t.Errorf("c.nonces = %q; want %q", c.nonces, nonces)
-	}
-}
-
-func TestNonce_addMax(t *testing.T) {
-	c := &Client{nonces: make(map[string]struct{})}
-	for i := 0; i < maxNonces; i++ {
-		c.nonces[fmt.Sprintf("%d", i)] = struct{}{}
-	}
-	c.addNonce(http.Header{"Replay-Nonce": {"nonce"}})
-	if n := len(c.nonces); n != maxNonces {
-		t.Errorf("len(c.nonces) = %d; want %d", n, maxNonces)
-	}
-}
-
-func TestNonce_fetch(t *testing.T) {
-	tests := []struct {
-		code  int
-		nonce string
-	}{
-		{http.StatusOK, "nonce1"},
-		{http.StatusBadRequest, "nonce2"},
-		{http.StatusOK, ""},
-	}
-	var i int
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Method != "HEAD" {
-			t.Errorf("%d: r.Method = %q; want HEAD", i, r.Method)
-		}
-		w.Header().Set("Replay-Nonce", tests[i].nonce)
-		w.WriteHeader(tests[i].code)
-	}))
-	defer ts.Close()
-	for ; i < len(tests); i++ {
-		test := tests[i]
-		c := &Client{}
-		n, err := c.fetchNonce(context.Background(), ts.URL)
-		if n != test.nonce {
-			t.Errorf("%d: n=%q; want %q", i, n, test.nonce)
-		}
-		switch {
-		case err == nil && test.nonce == "":
-			t.Errorf("%d: n=%q, err=%v; want non-nil error", i, n, err)
-		case err != nil && test.nonce != "":
-			t.Errorf("%d: n=%q, err=%v; want %q", i, n, err, test.nonce)
-		}
-	}
-}
-
-func TestNonce_fetchError(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusTooManyRequests)
-	}))
-	defer ts.Close()
-	c := &Client{}
-	_, err := c.fetchNonce(context.Background(), ts.URL)
-	e, ok := err.(*Error)
-	if !ok {
-		t.Fatalf("err is %T; want *Error", err)
-	}
-	if e.StatusCode != http.StatusTooManyRequests {
-		t.Errorf("e.StatusCode = %d; want %d", e.StatusCode, http.StatusTooManyRequests)
-	}
-}
-
-func TestNonce_postJWS(t *testing.T) {
-	var count int
-	seen := make(map[string]bool)
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		w.Header().Set("Replay-Nonce", fmt.Sprintf("nonce%d", count))
-		if r.Method == "HEAD" {
-			// We expect the client do a HEAD request
-			// but only to fetch the first nonce.
-			return
-		}
-		// Make client.Authorize happy; we're not testing its result.
-		defer func() {
-			w.WriteHeader(http.StatusCreated)
-			w.Write([]byte(`{"status":"valid"}`))
-		}()
-
-		head, err := decodeJWSHead(r)
-		if err != nil {
-			t.Errorf("decodeJWSHead: %v", err)
-			return
-		}
-		if head.Nonce == "" {
-			t.Error("head.Nonce is empty")
-			return
-		}
-		if seen[head.Nonce] {
-			t.Errorf("nonce is already used: %q", head.Nonce)
-		}
-		seen[head.Nonce] = true
-	}))
-	defer ts.Close()
-
-	client := Client{Key: testKey, dir: &Directory{AuthzURL: ts.URL}}
-	if _, err := client.Authorize(context.Background(), "example.com"); err != nil {
-		t.Errorf("client.Authorize 1: %v", err)
-	}
-	// The second call should not generate another extra HEAD request.
-	if _, err := client.Authorize(context.Background(), "example.com"); err != nil {
-		t.Errorf("client.Authorize 2: %v", err)
-	}
-
-	if count != 3 {
-		t.Errorf("total requests count: %d; want 3", count)
-	}
-	if n := len(client.nonces); n != 1 {
-		t.Errorf("len(client.nonces) = %d; want 1", n)
-	}
-	for k := range seen {
-		if _, exist := client.nonces[k]; exist {
-			t.Errorf("used nonce %q in client.nonces", k)
-		}
-	}
-}
-
-func TestRetryPostJWS(t *testing.T) {
-	var count int
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		count++
-		w.Header().Set("Replay-Nonce", fmt.Sprintf("nonce%d", count))
-		if r.Method == "HEAD" {
-			// We expect the client to do 2 head requests to fetch
-			// nonces, one to start and another after getting badNonce
-			return
-		}
-
-		head, err := decodeJWSHead(r)
-		if err != nil {
-			t.Errorf("decodeJWSHead: %v", err)
-		} else if head.Nonce == "" {
-			t.Error("head.Nonce is empty")
-		} else if head.Nonce == "nonce1" {
-			// return a badNonce error to force the call to retry
-			w.WriteHeader(http.StatusBadRequest)
-			w.Write([]byte(`{"type":"urn:ietf:params:acme:error:badNonce"}`))
-			return
-		}
-		// Make client.Authorize happy; we're not testing its result.
-		w.WriteHeader(http.StatusCreated)
-		w.Write([]byte(`{"status":"valid"}`))
-	}))
-	defer ts.Close()
-
-	client := Client{Key: testKey, dir: &Directory{AuthzURL: ts.URL}}
-	// This call will fail with badNonce, causing a retry
-	if _, err := client.Authorize(context.Background(), "example.com"); err != nil {
-		t.Errorf("client.Authorize 1: %v", err)
-	}
-	if count != 4 {
-		t.Errorf("total requests count: %d; want 4", count)
-	}
-}
-
-func TestLinkHeader(t *testing.T) {
-	h := http.Header{"Link": {
-		`<https://example.com/acme/new-authz>;rel="next"`,
-		`<https://example.com/acme/recover-reg>; rel=recover`,
-		`<https://example.com/acme/terms>; foo=bar; rel="terms-of-service"`,
-		`<dup>;rel="next"`,
-	}}
-	tests := []struct {
-		rel string
-		out []string
-	}{
-		{"next", []string{"https://example.com/acme/new-authz", "dup"}},
-		{"recover", []string{"https://example.com/acme/recover-reg"}},
-		{"terms-of-service", []string{"https://example.com/acme/terms"}},
-		{"empty", nil},
-	}
-	for i, test := range tests {
-		if v := linkHeader(h, test.rel); !reflect.DeepEqual(v, test.out) {
-			t.Errorf("%d: linkHeader(%q): %v; want %v", i, test.rel, v, test.out)
-		}
-	}
-}
-
-func TestErrorResponse(t *testing.T) {
-	s := `{
-		"status": 400,
-		"type": "urn:acme:error:xxx",
-		"detail": "text"
-	}`
-	res := &http.Response{
-		StatusCode: 400,
-		Status:     "400 Bad Request",
-		Body:       ioutil.NopCloser(strings.NewReader(s)),
-		Header:     http.Header{"X-Foo": {"bar"}},
-	}
-	err := responseError(res)
-	v, ok := err.(*Error)
-	if !ok {
-		t.Fatalf("err = %+v (%T); want *Error type", err, err)
-	}
-	if v.StatusCode != 400 {
-		t.Errorf("v.StatusCode = %v; want 400", v.StatusCode)
-	}
-	if v.ProblemType != "urn:acme:error:xxx" {
-		t.Errorf("v.ProblemType = %q; want urn:acme:error:xxx", v.ProblemType)
-	}
-	if v.Detail != "text" {
-		t.Errorf("v.Detail = %q; want text", v.Detail)
-	}
-	if !reflect.DeepEqual(v.Header, res.Header) {
-		t.Errorf("v.Header = %+v; want %+v", v.Header, res.Header)
-	}
-}
-
-func TestTLSSNI01ChallengeCert(t *testing.T) {
-	const (
-		token = "evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA"
-		// echo -n <token.testKeyECThumbprint> | shasum -a 256
-		san = "dbbd5eefe7b4d06eb9d1d9f5acb4c7cd.a27d320e4b30332f0b6cb441734ad7b0.acme.invalid"
-	)
-
-	client := &Client{Key: testKeyEC}
-	tlscert, name, err := client.TLSSNI01ChallengeCert(token)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(tlscert.Certificate); n != 1 {
-		t.Fatalf("len(tlscert.Certificate) = %d; want 1", n)
-	}
-	cert, err := x509.ParseCertificate(tlscert.Certificate[0])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(cert.DNSNames) != 1 || cert.DNSNames[0] != san {
-		t.Fatalf("cert.DNSNames = %v; want %q", cert.DNSNames, san)
-	}
-	if cert.DNSNames[0] != name {
-		t.Errorf("cert.DNSNames[0] != name: %q vs %q", cert.DNSNames[0], name)
-	}
-	if cn := cert.Subject.CommonName; cn != san {
-		t.Errorf("cert.Subject.CommonName = %q; want %q", cn, san)
-	}
-}
-
-func TestTLSSNI02ChallengeCert(t *testing.T) {
-	const (
-		token = "evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA"
-		// echo -n evaGxfADs6pSRb2LAv9IZf17Dt3juxGJ-PCt92wr-oA | shasum -a 256
-		sanA = "7ea0aaa69214e71e02cebb18bb867736.09b730209baabf60e43d4999979ff139.token.acme.invalid"
-		// echo -n <token.testKeyECThumbprint> | shasum -a 256
-		sanB = "dbbd5eefe7b4d06eb9d1d9f5acb4c7cd.a27d320e4b30332f0b6cb441734ad7b0.ka.acme.invalid"
-	)
-
-	client := &Client{Key: testKeyEC}
-	tlscert, name, err := client.TLSSNI02ChallengeCert(token)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if n := len(tlscert.Certificate); n != 1 {
-		t.Fatalf("len(tlscert.Certificate) = %d; want 1", n)
-	}
-	cert, err := x509.ParseCertificate(tlscert.Certificate[0])
-	if err != nil {
-		t.Fatal(err)
-	}
-	names := []string{sanA, sanB}
-	if !reflect.DeepEqual(cert.DNSNames, names) {
-		t.Fatalf("cert.DNSNames = %v;\nwant %v", cert.DNSNames, names)
-	}
-	sort.Strings(cert.DNSNames)
-	i := sort.SearchStrings(cert.DNSNames, name)
-	if i >= len(cert.DNSNames) || cert.DNSNames[i] != name {
-		t.Errorf("%v doesn't have %q", cert.DNSNames, name)
-	}
-	if cn := cert.Subject.CommonName; cn != sanA {
-		t.Errorf("CommonName = %q; want %q", cn, sanA)
-	}
-}
-
-func TestTLSChallengeCertOpt(t *testing.T) {
-	key, err := rsa.GenerateKey(rand.Reader, 512)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tmpl := &x509.Certificate{
-		SerialNumber: big.NewInt(2),
-		Subject:      pkix.Name{Organization: []string{"Test"}},
-		DNSNames:     []string{"should-be-overwritten"},
-	}
-	opts := []CertOption{WithKey(key), WithTemplate(tmpl)}
-
-	client := &Client{Key: testKeyEC}
-	cert1, _, err := client.TLSSNI01ChallengeCert("token", opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cert2, _, err := client.TLSSNI02ChallengeCert("token", opts...)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for i, tlscert := range []tls.Certificate{cert1, cert2} {
-		// verify generated cert private key
-		tlskey, ok := tlscert.PrivateKey.(*rsa.PrivateKey)
-		if !ok {
-			t.Errorf("%d: tlscert.PrivateKey is %T; want *rsa.PrivateKey", i, tlscert.PrivateKey)
-			continue
-		}
-		if tlskey.D.Cmp(key.D) != 0 {
-			t.Errorf("%d: tlskey.D = %v; want %v", i, tlskey.D, key.D)
-		}
-		// verify generated cert public key
-		x509Cert, err := x509.ParseCertificate(tlscert.Certificate[0])
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-			continue
-		}
-		tlspub, ok := x509Cert.PublicKey.(*rsa.PublicKey)
-		if !ok {
-			t.Errorf("%d: x509Cert.PublicKey is %T; want *rsa.PublicKey", i, x509Cert.PublicKey)
-			continue
-		}
-		if tlspub.N.Cmp(key.N) != 0 {
-			t.Errorf("%d: tlspub.N = %v; want %v", i, tlspub.N, key.N)
-		}
-		// verify template option
-		sn := big.NewInt(2)
-		if x509Cert.SerialNumber.Cmp(sn) != 0 {
-			t.Errorf("%d: SerialNumber = %v; want %v", i, x509Cert.SerialNumber, sn)
-		}
-		org := []string{"Test"}
-		if !reflect.DeepEqual(x509Cert.Subject.Organization, org) {
-			t.Errorf("%d: Subject.Organization = %+v; want %+v", i, x509Cert.Subject.Organization, org)
-		}
-		for _, v := range x509Cert.DNSNames {
-			if !strings.HasSuffix(v, ".acme.invalid") {
-				t.Errorf("%d: invalid DNSNames element: %q", i, v)
-			}
-		}
-	}
-}
-
-func TestHTTP01Challenge(t *testing.T) {
-	const (
-		token = "xxx"
-		// thumbprint is precomputed for testKeyEC in jws_test.go
-		value   = token + "." + testKeyECThumbprint
-		urlpath = "/.well-known/acme-challenge/" + token
-	)
-	client := &Client{Key: testKeyEC}
-	val, err := client.HTTP01ChallengeResponse(token)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if val != value {
-		t.Errorf("val = %q; want %q", val, value)
-	}
-	if path := client.HTTP01ChallengePath(token); path != urlpath {
-		t.Errorf("path = %q; want %q", path, urlpath)
-	}
-}
-
-func TestDNS01ChallengeRecord(t *testing.T) {
-	// echo -n xxx.<testKeyECThumbprint> | \
-	//      openssl dgst -binary -sha256 | \
-	//      base64 | tr -d '=' | tr '/+' '_-'
-	const value = "8DERMexQ5VcdJ_prpPiA0mVdp7imgbCgjsG4SqqNMIo"
-
-	client := &Client{Key: testKeyEC}
-	val, err := client.DNS01ChallengeRecord("xxx")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if val != value {
-		t.Errorf("val = %q; want %q", val, value)
-	}
-}
-
-func TestBackoff(t *testing.T) {
-	tt := []struct{ min, max time.Duration }{
-		{time.Second, 2 * time.Second},
-		{2 * time.Second, 3 * time.Second},
-		{4 * time.Second, 5 * time.Second},
-		{8 * time.Second, 9 * time.Second},
-	}
-	for i, test := range tt {
-		d := backoff(i, time.Minute)
-		if d < test.min || test.max < d {
-			t.Errorf("%d: d = %v; want between %v and %v", i, d, test.min, test.max)
-		}
-	}
-
-	min, max := time.Second, 2*time.Second
-	if d := backoff(-1, time.Minute); d < min || max < d {
-		t.Errorf("d = %v; want between %v and %v", d, min, max)
-	}
-
-	bound := 10 * time.Second
-	if d := backoff(100, bound); d != bound {
-		t.Errorf("d = %v; want %v", d, bound)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/autocert.go b/installer/vendor/golang.org/x/crypto/acme/autocert/autocert.go
deleted file mode 100644
index 94edba986d..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/autocert.go
+++ /dev/null
@@ -1,821 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package autocert provides automatic access to certificates from Let's Encrypt
-// and any other ACME-based CA.
-//
-// This package is a work in progress and makes no API stability promises.
-package autocert
-
-import (
-	"bytes"
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	mathrand "math/rand"
-	"net/http"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/crypto/acme"
-)
-
-// createCertRetryAfter is how much time to wait before removing a failed state
-// entry due to an unsuccessful createCert call.
-// This is a variable instead of a const for testing.
-// TODO: Consider making it configurable or an exp backoff?
-var createCertRetryAfter = time.Minute
-
-// pseudoRand is safe for concurrent use.
-var pseudoRand *lockedMathRand
-
-func init() {
-	src := mathrand.NewSource(timeNow().UnixNano())
-	pseudoRand = &lockedMathRand{rnd: mathrand.New(src)}
-}
-
-// AcceptTOS is a Manager.Prompt function that always returns true to
-// indicate acceptance of the CA's Terms of Service during account
-// registration.
-func AcceptTOS(tosURL string) bool { return true }
-
-// HostPolicy specifies which host names the Manager is allowed to respond to.
-// It returns a non-nil error if the host should be rejected.
-// The returned error is accessible via tls.Conn.Handshake and its callers.
-// See Manager's HostPolicy field and GetCertificate method docs for more details.
-type HostPolicy func(ctx context.Context, host string) error
-
-// HostWhitelist returns a policy where only the specified host names are allowed.
-// Only exact matches are currently supported. Subdomains, regexp or wildcard
-// will not match.
-func HostWhitelist(hosts ...string) HostPolicy {
-	whitelist := make(map[string]bool, len(hosts))
-	for _, h := range hosts {
-		whitelist[h] = true
-	}
-	return func(_ context.Context, host string) error {
-		if !whitelist[host] {
-			return errors.New("acme/autocert: host not configured")
-		}
-		return nil
-	}
-}
-
-// defaultHostPolicy is used when Manager.HostPolicy is not set.
-func defaultHostPolicy(context.Context, string) error {
-	return nil
-}
-
-// Manager is a stateful certificate manager built on top of acme.Client.
-// It obtains and refreshes certificates automatically,
-// as well as providing them to a TLS server via tls.Config.
-//
-// You must specify a cache implementation, such as DirCache,
-// to reuse obtained certificates across program restarts.
-// Otherwise your server is very likely to exceed the certificate
-// issuer's request rate limits.
-type Manager struct {
-	// Prompt specifies a callback function to conditionally accept a CA's Terms of Service (TOS).
-	// The registration may require the caller to agree to the CA's TOS.
-	// If so, Manager calls Prompt with a TOS URL provided by the CA. Prompt should report
-	// whether the caller agrees to the terms.
-	//
-	// To always accept the terms, the callers can use AcceptTOS.
-	Prompt func(tosURL string) bool
-
-	// Cache optionally stores and retrieves previously-obtained certificates.
-	// If nil, certs will only be cached for the lifetime of the Manager.
-	//
-	// Manager passes the Cache certificates data encoded in PEM, with private/public
-	// parts combined in a single Cache.Put call, private key first.
-	Cache Cache
-
-	// HostPolicy controls which domains the Manager will attempt
-	// to retrieve new certificates for. It does not affect cached certs.
-	//
-	// If non-nil, HostPolicy is called before requesting a new cert.
-	// If nil, all hosts are currently allowed. This is not recommended,
-	// as it opens a potential attack where clients connect to a server
-	// by IP address and pretend to be asking for an incorrect host name.
-	// Manager will attempt to obtain a certificate for that host, incorrectly,
-	// eventually reaching the CA's rate limit for certificate requests
-	// and making it impossible to obtain actual certificates.
-	//
-	// See GetCertificate for more details.
-	HostPolicy HostPolicy
-
-	// RenewBefore optionally specifies how early certificates should
-	// be renewed before they expire.
-	//
-	// If zero, they're renewed 30 days before expiration.
-	RenewBefore time.Duration
-
-	// Client is used to perform low-level operations, such as account registration
-	// and requesting new certificates.
-	// If Client is nil, a zero-value acme.Client is used with acme.LetsEncryptURL
-	// directory endpoint and a newly-generated ECDSA P-256 key.
-	//
-	// Mutating the field after the first call of GetCertificate method will have no effect.
-	Client *acme.Client
-
-	// Email optionally specifies a contact email address.
-	// This is used by CAs, such as Let's Encrypt, to notify about problems
-	// with issued certificates.
-	//
-	// If the Client's account key is already registered, Email is not used.
-	Email string
-
-	// ForceRSA makes the Manager generate certificates with 2048-bit RSA keys.
-	//
-	// If false, a default is used. Currently the default
-	// is EC-based keys using the P-256 curve.
-	ForceRSA bool
-
-	clientMu sync.Mutex
-	client   *acme.Client // initialized by acmeClient method
-
-	stateMu sync.Mutex
-	state   map[string]*certState // keyed by domain name
-
-	// tokenCert is keyed by token domain name, which matches server name
-	// of ClientHello. Keys always have ".acme.invalid" suffix.
-	tokenCertMu sync.RWMutex
-	tokenCert   map[string]*tls.Certificate
-
-	// renewal tracks the set of domains currently running renewal timers.
-	// It is keyed by domain name.
-	renewalMu sync.Mutex
-	renewal   map[string]*domainRenewal
-}
-
-// GetCertificate implements the tls.Config.GetCertificate hook.
-// It provides a TLS certificate for hello.ServerName host, including answering
-// *.acme.invalid (TLS-SNI) challenges. All other fields of hello are ignored.
-//
-// If m.HostPolicy is non-nil, GetCertificate calls the policy before requesting
-// a new cert. A non-nil error returned from m.HostPolicy halts TLS negotiation.
-// The error is propagated back to the caller of GetCertificate and is user-visible.
-// This does not affect cached certs. See HostPolicy field description for more details.
-func (m *Manager) GetCertificate(hello *tls.ClientHelloInfo) (*tls.Certificate, error) {
-	if m.Prompt == nil {
-		return nil, errors.New("acme/autocert: Manager.Prompt not set")
-	}
-
-	name := hello.ServerName
-	if name == "" {
-		return nil, errors.New("acme/autocert: missing server name")
-	}
-	if !strings.Contains(strings.Trim(name, "."), ".") {
-		return nil, errors.New("acme/autocert: server name component count invalid")
-	}
-	if strings.ContainsAny(name, `/\`) {
-		return nil, errors.New("acme/autocert: server name contains invalid character")
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 5*time.Minute)
-	defer cancel()
-
-	// check whether this is a token cert requested for TLS-SNI challenge
-	if strings.HasSuffix(name, ".acme.invalid") {
-		m.tokenCertMu.RLock()
-		defer m.tokenCertMu.RUnlock()
-		if cert := m.tokenCert[name]; cert != nil {
-			return cert, nil
-		}
-		if cert, err := m.cacheGet(ctx, name); err == nil {
-			return cert, nil
-		}
-		// TODO: cache error results?
-		return nil, fmt.Errorf("acme/autocert: no token cert for %q", name)
-	}
-
-	// regular domain
-	name = strings.TrimSuffix(name, ".") // golang.org/issue/18114
-	cert, err := m.cert(ctx, name)
-	if err == nil {
-		return cert, nil
-	}
-	if err != ErrCacheMiss {
-		return nil, err
-	}
-
-	// first-time
-	if err := m.hostPolicy()(ctx, name); err != nil {
-		return nil, err
-	}
-	cert, err = m.createCert(ctx, name)
-	if err != nil {
-		return nil, err
-	}
-	m.cachePut(ctx, name, cert)
-	return cert, nil
-}
-
-// cert returns an existing certificate either from m.state or cache.
-// If a certificate is found in cache but not in m.state, the latter will be filled
-// with the cached value.
-func (m *Manager) cert(ctx context.Context, name string) (*tls.Certificate, error) {
-	m.stateMu.Lock()
-	if s, ok := m.state[name]; ok {
-		m.stateMu.Unlock()
-		s.RLock()
-		defer s.RUnlock()
-		return s.tlscert()
-	}
-	defer m.stateMu.Unlock()
-	cert, err := m.cacheGet(ctx, name)
-	if err != nil {
-		return nil, err
-	}
-	signer, ok := cert.PrivateKey.(crypto.Signer)
-	if !ok {
-		return nil, errors.New("acme/autocert: private key cannot sign")
-	}
-	if m.state == nil {
-		m.state = make(map[string]*certState)
-	}
-	s := &certState{
-		key:  signer,
-		cert: cert.Certificate,
-		leaf: cert.Leaf,
-	}
-	m.state[name] = s
-	go m.renew(name, s.key, s.leaf.NotAfter)
-	return cert, nil
-}
-
-// cacheGet always returns a valid certificate, or an error otherwise.
-// If a cached certficate exists but is not valid, ErrCacheMiss is returned.
-func (m *Manager) cacheGet(ctx context.Context, domain string) (*tls.Certificate, error) {
-	if m.Cache == nil {
-		return nil, ErrCacheMiss
-	}
-	data, err := m.Cache.Get(ctx, domain)
-	if err != nil {
-		return nil, err
-	}
-
-	// private
-	priv, pub := pem.Decode(data)
-	if priv == nil || !strings.Contains(priv.Type, "PRIVATE") {
-		return nil, ErrCacheMiss
-	}
-	privKey, err := parsePrivateKey(priv.Bytes)
-	if err != nil {
-		return nil, err
-	}
-
-	// public
-	var pubDER [][]byte
-	for len(pub) > 0 {
-		var b *pem.Block
-		b, pub = pem.Decode(pub)
-		if b == nil {
-			break
-		}
-		pubDER = append(pubDER, b.Bytes)
-	}
-	if len(pub) > 0 {
-		// Leftover content not consumed by pem.Decode. Corrupt. Ignore.
-		return nil, ErrCacheMiss
-	}
-
-	// verify and create TLS cert
-	leaf, err := validCert(domain, pubDER, privKey)
-	if err != nil {
-		return nil, ErrCacheMiss
-	}
-	tlscert := &tls.Certificate{
-		Certificate: pubDER,
-		PrivateKey:  privKey,
-		Leaf:        leaf,
-	}
-	return tlscert, nil
-}
-
-func (m *Manager) cachePut(ctx context.Context, domain string, tlscert *tls.Certificate) error {
-	if m.Cache == nil {
-		return nil
-	}
-
-	// contains PEM-encoded data
-	var buf bytes.Buffer
-
-	// private
-	switch key := tlscert.PrivateKey.(type) {
-	case *ecdsa.PrivateKey:
-		if err := encodeECDSAKey(&buf, key); err != nil {
-			return err
-		}
-	case *rsa.PrivateKey:
-		b := x509.MarshalPKCS1PrivateKey(key)
-		pb := &pem.Block{Type: "RSA PRIVATE KEY", Bytes: b}
-		if err := pem.Encode(&buf, pb); err != nil {
-			return err
-		}
-	default:
-		return errors.New("acme/autocert: unknown private key type")
-	}
-
-	// public
-	for _, b := range tlscert.Certificate {
-		pb := &pem.Block{Type: "CERTIFICATE", Bytes: b}
-		if err := pem.Encode(&buf, pb); err != nil {
-			return err
-		}
-	}
-
-	return m.Cache.Put(ctx, domain, buf.Bytes())
-}
-
-func encodeECDSAKey(w io.Writer, key *ecdsa.PrivateKey) error {
-	b, err := x509.MarshalECPrivateKey(key)
-	if err != nil {
-		return err
-	}
-	pb := &pem.Block{Type: "EC PRIVATE KEY", Bytes: b}
-	return pem.Encode(w, pb)
-}
-
-// createCert starts the domain ownership verification and returns a certificate
-// for that domain upon success.
-//
-// If the domain is already being verified, it waits for the existing verification to complete.
-// Either way, createCert blocks for the duration of the whole process.
-func (m *Manager) createCert(ctx context.Context, domain string) (*tls.Certificate, error) {
-	// TODO: maybe rewrite this whole piece using sync.Once
-	state, err := m.certState(domain)
-	if err != nil {
-		return nil, err
-	}
-	// state may exist if another goroutine is already working on it
-	// in which case just wait for it to finish
-	if !state.locked {
-		state.RLock()
-		defer state.RUnlock()
-		return state.tlscert()
-	}
-
-	// We are the first; state is locked.
-	// Unblock the readers when domain ownership is verified
-	// and we got the cert or the process failed.
-	defer state.Unlock()
-	state.locked = false
-
-	der, leaf, err := m.authorizedCert(ctx, state.key, domain)
-	if err != nil {
-		// Remove the failed state after some time,
-		// making the manager call createCert again on the following TLS hello.
-		time.AfterFunc(createCertRetryAfter, func() {
-			defer testDidRemoveState(domain)
-			m.stateMu.Lock()
-			defer m.stateMu.Unlock()
-			// Verify the state hasn't changed and it's still invalid
-			// before deleting.
-			s, ok := m.state[domain]
-			if !ok {
-				return
-			}
-			if _, err := validCert(domain, s.cert, s.key); err == nil {
-				return
-			}
-			delete(m.state, domain)
-		})
-		return nil, err
-	}
-	state.cert = der
-	state.leaf = leaf
-	go m.renew(domain, state.key, state.leaf.NotAfter)
-	return state.tlscert()
-}
-
-// certState returns a new or existing certState.
-// If a new certState is returned, state.exist is false and the state is locked.
-// The returned error is non-nil only in the case where a new state could not be created.
-func (m *Manager) certState(domain string) (*certState, error) {
-	m.stateMu.Lock()
-	defer m.stateMu.Unlock()
-	if m.state == nil {
-		m.state = make(map[string]*certState)
-	}
-	// existing state
-	if state, ok := m.state[domain]; ok {
-		return state, nil
-	}
-
-	// new locked state
-	var (
-		err error
-		key crypto.Signer
-	)
-	if m.ForceRSA {
-		key, err = rsa.GenerateKey(rand.Reader, 2048)
-	} else {
-		key, err = ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	state := &certState{
-		key:    key,
-		locked: true,
-	}
-	state.Lock() // will be unlocked by m.certState caller
-	m.state[domain] = state
-	return state, nil
-}
-
-// authorizedCert starts the domain ownership verification process and requests a new cert upon success.
-// The key argument is the certificate private key.
-func (m *Manager) authorizedCert(ctx context.Context, key crypto.Signer, domain string) (der [][]byte, leaf *x509.Certificate, err error) {
-	if err := m.verify(ctx, domain); err != nil {
-		return nil, nil, err
-	}
-	client, err := m.acmeClient(ctx)
-	if err != nil {
-		return nil, nil, err
-	}
-	csr, err := certRequest(key, domain)
-	if err != nil {
-		return nil, nil, err
-	}
-	der, _, err = client.CreateCert(ctx, csr, 0, true)
-	if err != nil {
-		return nil, nil, err
-	}
-	leaf, err = validCert(domain, der, key)
-	if err != nil {
-		return nil, nil, err
-	}
-	return der, leaf, nil
-}
-
-// verify starts a new identifier (domain) authorization flow.
-// It prepares a challenge response and then blocks until the authorization
-// is marked as "completed" by the CA (either succeeded or failed).
-//
-// verify returns nil iff the verification was successful.
-func (m *Manager) verify(ctx context.Context, domain string) error {
-	client, err := m.acmeClient(ctx)
-	if err != nil {
-		return err
-	}
-
-	// start domain authorization and get the challenge
-	authz, err := client.Authorize(ctx, domain)
-	if err != nil {
-		return err
-	}
-	// maybe don't need to at all
-	if authz.Status == acme.StatusValid {
-		return nil
-	}
-
-	// pick a challenge: prefer tls-sni-02 over tls-sni-01
-	// TODO: consider authz.Combinations
-	var chal *acme.Challenge
-	for _, c := range authz.Challenges {
-		if c.Type == "tls-sni-02" {
-			chal = c
-			break
-		}
-		if c.Type == "tls-sni-01" {
-			chal = c
-		}
-	}
-	if chal == nil {
-		return errors.New("acme/autocert: no supported challenge type found")
-	}
-
-	// create a token cert for the challenge response
-	var (
-		cert tls.Certificate
-		name string
-	)
-	switch chal.Type {
-	case "tls-sni-01":
-		cert, name, err = client.TLSSNI01ChallengeCert(chal.Token)
-	case "tls-sni-02":
-		cert, name, err = client.TLSSNI02ChallengeCert(chal.Token)
-	default:
-		err = fmt.Errorf("acme/autocert: unknown challenge type %q", chal.Type)
-	}
-	if err != nil {
-		return err
-	}
-	m.putTokenCert(ctx, name, &cert)
-	defer func() {
-		// verification has ended at this point
-		// don't need token cert anymore
-		go m.deleteTokenCert(name)
-	}()
-
-	// ready to fulfill the challenge
-	if _, err := client.Accept(ctx, chal); err != nil {
-		return err
-	}
-	// wait for the CA to validate
-	_, err = client.WaitAuthorization(ctx, authz.URI)
-	return err
-}
-
-// putTokenCert stores the cert under the named key in both m.tokenCert map
-// and m.Cache.
-func (m *Manager) putTokenCert(ctx context.Context, name string, cert *tls.Certificate) {
-	m.tokenCertMu.Lock()
-	defer m.tokenCertMu.Unlock()
-	if m.tokenCert == nil {
-		m.tokenCert = make(map[string]*tls.Certificate)
-	}
-	m.tokenCert[name] = cert
-	m.cachePut(ctx, name, cert)
-}
-
-// deleteTokenCert removes the token certificate for the specified domain name
-// from both m.tokenCert map and m.Cache.
-func (m *Manager) deleteTokenCert(name string) {
-	m.tokenCertMu.Lock()
-	defer m.tokenCertMu.Unlock()
-	delete(m.tokenCert, name)
-	if m.Cache != nil {
-		m.Cache.Delete(context.Background(), name)
-	}
-}
-
-// renew starts a cert renewal timer loop, one per domain.
-//
-// The loop is scheduled in two cases:
-// - a cert was fetched from cache for the first time (wasn't in m.state)
-// - a new cert was created by m.createCert
-//
-// The key argument is a certificate private key.
-// The exp argument is the cert expiration time (NotAfter).
-func (m *Manager) renew(domain string, key crypto.Signer, exp time.Time) {
-	m.renewalMu.Lock()
-	defer m.renewalMu.Unlock()
-	if m.renewal[domain] != nil {
-		// another goroutine is already on it
-		return
-	}
-	if m.renewal == nil {
-		m.renewal = make(map[string]*domainRenewal)
-	}
-	dr := &domainRenewal{m: m, domain: domain, key: key}
-	m.renewal[domain] = dr
-	dr.start(exp)
-}
-
-// stopRenew stops all currently running cert renewal timers.
-// The timers are not restarted during the lifetime of the Manager.
-func (m *Manager) stopRenew() {
-	m.renewalMu.Lock()
-	defer m.renewalMu.Unlock()
-	for name, dr := range m.renewal {
-		delete(m.renewal, name)
-		dr.stop()
-	}
-}
-
-func (m *Manager) accountKey(ctx context.Context) (crypto.Signer, error) {
-	const keyName = "acme_account.key"
-
-	genKey := func() (*ecdsa.PrivateKey, error) {
-		return ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	}
-
-	if m.Cache == nil {
-		return genKey()
-	}
-
-	data, err := m.Cache.Get(ctx, keyName)
-	if err == ErrCacheMiss {
-		key, err := genKey()
-		if err != nil {
-			return nil, err
-		}
-		var buf bytes.Buffer
-		if err := encodeECDSAKey(&buf, key); err != nil {
-			return nil, err
-		}
-		if err := m.Cache.Put(ctx, keyName, buf.Bytes()); err != nil {
-			return nil, err
-		}
-		return key, nil
-	}
-	if err != nil {
-		return nil, err
-	}
-
-	priv, _ := pem.Decode(data)
-	if priv == nil || !strings.Contains(priv.Type, "PRIVATE") {
-		return nil, errors.New("acme/autocert: invalid account key found in cache")
-	}
-	return parsePrivateKey(priv.Bytes)
-}
-
-func (m *Manager) acmeClient(ctx context.Context) (*acme.Client, error) {
-	m.clientMu.Lock()
-	defer m.clientMu.Unlock()
-	if m.client != nil {
-		return m.client, nil
-	}
-
-	client := m.Client
-	if client == nil {
-		client = &acme.Client{DirectoryURL: acme.LetsEncryptURL}
-	}
-	if client.Key == nil {
-		var err error
-		client.Key, err = m.accountKey(ctx)
-		if err != nil {
-			return nil, err
-		}
-	}
-	var contact []string
-	if m.Email != "" {
-		contact = []string{"mailto:" + m.Email}
-	}
-	a := &acme.Account{Contact: contact}
-	_, err := client.Register(ctx, a, m.Prompt)
-	if ae, ok := err.(*acme.Error); err == nil || ok && ae.StatusCode == http.StatusConflict {
-		// conflict indicates the key is already registered
-		m.client = client
-		err = nil
-	}
-	return m.client, err
-}
-
-func (m *Manager) hostPolicy() HostPolicy {
-	if m.HostPolicy != nil {
-		return m.HostPolicy
-	}
-	return defaultHostPolicy
-}
-
-func (m *Manager) renewBefore() time.Duration {
-	if m.RenewBefore > renewJitter {
-		return m.RenewBefore
-	}
-	return 720 * time.Hour // 30 days
-}
-
-// certState is ready when its mutex is unlocked for reading.
-type certState struct {
-	sync.RWMutex
-	locked bool              // locked for read/write
-	key    crypto.Signer     // private key for cert
-	cert   [][]byte          // DER encoding
-	leaf   *x509.Certificate // parsed cert[0]; always non-nil if cert != nil
-}
-
-// tlscert creates a tls.Certificate from s.key and s.cert.
-// Callers should wrap it in s.RLock() and s.RUnlock().
-func (s *certState) tlscert() (*tls.Certificate, error) {
-	if s.key == nil {
-		return nil, errors.New("acme/autocert: missing signer")
-	}
-	if len(s.cert) == 0 {
-		return nil, errors.New("acme/autocert: missing certificate")
-	}
-	return &tls.Certificate{
-		PrivateKey:  s.key,
-		Certificate: s.cert,
-		Leaf:        s.leaf,
-	}, nil
-}
-
-// certRequest creates a certificate request for the given common name cn
-// and optional SANs.
-func certRequest(key crypto.Signer, cn string, san ...string) ([]byte, error) {
-	req := &x509.CertificateRequest{
-		Subject:  pkix.Name{CommonName: cn},
-		DNSNames: san,
-	}
-	return x509.CreateCertificateRequest(rand.Reader, req, key)
-}
-
-// Attempt to parse the given private key DER block. OpenSSL 0.9.8 generates
-// PKCS#1 private keys by default, while OpenSSL 1.0.0 generates PKCS#8 keys.
-// OpenSSL ecparam generates SEC1 EC private keys for ECDSA. We try all three.
-//
-// Inspired by parsePrivateKey in crypto/tls/tls.go.
-func parsePrivateKey(der []byte) (crypto.Signer, error) {
-	if key, err := x509.ParsePKCS1PrivateKey(der); err == nil {
-		return key, nil
-	}
-	if key, err := x509.ParsePKCS8PrivateKey(der); err == nil {
-		switch key := key.(type) {
-		case *rsa.PrivateKey:
-			return key, nil
-		case *ecdsa.PrivateKey:
-			return key, nil
-		default:
-			return nil, errors.New("acme/autocert: unknown private key type in PKCS#8 wrapping")
-		}
-	}
-	if key, err := x509.ParseECPrivateKey(der); err == nil {
-		return key, nil
-	}
-
-	return nil, errors.New("acme/autocert: failed to parse private key")
-}
-
-// validCert parses a cert chain provided as der argument and verifies the leaf, der[0],
-// corresponds to the private key, as well as the domain match and expiration dates.
-// It doesn't do any revocation checking.
-//
-// The returned value is the verified leaf cert.
-func validCert(domain string, der [][]byte, key crypto.Signer) (leaf *x509.Certificate, err error) {
-	// parse public part(s)
-	var n int
-	for _, b := range der {
-		n += len(b)
-	}
-	pub := make([]byte, n)
-	n = 0
-	for _, b := range der {
-		n += copy(pub[n:], b)
-	}
-	x509Cert, err := x509.ParseCertificates(pub)
-	if len(x509Cert) == 0 {
-		return nil, errors.New("acme/autocert: no public key found")
-	}
-	// verify the leaf is not expired and matches the domain name
-	leaf = x509Cert[0]
-	now := timeNow()
-	if now.Before(leaf.NotBefore) {
-		return nil, errors.New("acme/autocert: certificate is not valid yet")
-	}
-	if now.After(leaf.NotAfter) {
-		return nil, errors.New("acme/autocert: expired certificate")
-	}
-	if err := leaf.VerifyHostname(domain); err != nil {
-		return nil, err
-	}
-	// ensure the leaf corresponds to the private key
-	switch pub := leaf.PublicKey.(type) {
-	case *rsa.PublicKey:
-		prv, ok := key.(*rsa.PrivateKey)
-		if !ok {
-			return nil, errors.New("acme/autocert: private key type does not match public key type")
-		}
-		if pub.N.Cmp(prv.N) != 0 {
-			return nil, errors.New("acme/autocert: private key does not match public key")
-		}
-	case *ecdsa.PublicKey:
-		prv, ok := key.(*ecdsa.PrivateKey)
-		if !ok {
-			return nil, errors.New("acme/autocert: private key type does not match public key type")
-		}
-		if pub.X.Cmp(prv.X) != 0 || pub.Y.Cmp(prv.Y) != 0 {
-			return nil, errors.New("acme/autocert: private key does not match public key")
-		}
-	default:
-		return nil, errors.New("acme/autocert: unknown public key algorithm")
-	}
-	return leaf, nil
-}
-
-func retryAfter(v string) time.Duration {
-	if i, err := strconv.Atoi(v); err == nil {
-		return time.Duration(i) * time.Second
-	}
-	if t, err := http.ParseTime(v); err == nil {
-		return t.Sub(timeNow())
-	}
-	return time.Second
-}
-
-type lockedMathRand struct {
-	sync.Mutex
-	rnd *mathrand.Rand
-}
-
-func (r *lockedMathRand) int63n(max int64) int64 {
-	r.Lock()
-	n := r.rnd.Int63n(max)
-	r.Unlock()
-	return n
-}
-
-// For easier testing.
-var (
-	timeNow = time.Now
-
-	// Called when a state is removed.
-	testDidRemoveState = func(domain string) {}
-)
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/autocert_test.go b/installer/vendor/golang.org/x/crypto/acme/autocert/autocert_test.go
deleted file mode 100644
index 43a62011ab..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/autocert_test.go
+++ /dev/null
@@ -1,606 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"context"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/tls"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"html/template"
-	"io"
-	"math/big"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"sync"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/acme"
-)
-
-var discoTmpl = template.Must(template.New("disco").Parse(`{
-	"new-reg": "{{.}}/new-reg",
-	"new-authz": "{{.}}/new-authz",
-	"new-cert": "{{.}}/new-cert"
-}`))
-
-var authzTmpl = template.Must(template.New("authz").Parse(`{
-	"status": "pending",
-	"challenges": [
-		{
-			"uri": "{{.}}/challenge/1",
-			"type": "tls-sni-01",
-			"token": "token-01"
-		},
-		{
-			"uri": "{{.}}/challenge/2",
-			"type": "tls-sni-02",
-			"token": "token-02"
-		}
-	]
-}`))
-
-type memCache struct {
-	mu      sync.Mutex
-	keyData map[string][]byte
-}
-
-func (m *memCache) Get(ctx context.Context, key string) ([]byte, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	v, ok := m.keyData[key]
-	if !ok {
-		return nil, ErrCacheMiss
-	}
-	return v, nil
-}
-
-func (m *memCache) Put(ctx context.Context, key string, data []byte) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	m.keyData[key] = data
-	return nil
-}
-
-func (m *memCache) Delete(ctx context.Context, key string) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	delete(m.keyData, key)
-	return nil
-}
-
-func newMemCache() *memCache {
-	return &memCache{
-		keyData: make(map[string][]byte),
-	}
-}
-
-func dummyCert(pub interface{}, san ...string) ([]byte, error) {
-	return dateDummyCert(pub, time.Now(), time.Now().Add(90*24*time.Hour), san...)
-}
-
-func dateDummyCert(pub interface{}, start, end time.Time, san ...string) ([]byte, error) {
-	// use EC key to run faster on 386
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		return nil, err
-	}
-	t := &x509.Certificate{
-		SerialNumber:          big.NewInt(1),
-		NotBefore:             start,
-		NotAfter:              end,
-		BasicConstraintsValid: true,
-		KeyUsage:              x509.KeyUsageKeyEncipherment,
-		DNSNames:              san,
-	}
-	if pub == nil {
-		pub = &key.PublicKey
-	}
-	return x509.CreateCertificate(rand.Reader, t, t, pub, key)
-}
-
-func decodePayload(v interface{}, r io.Reader) error {
-	var req struct{ Payload string }
-	if err := json.NewDecoder(r).Decode(&req); err != nil {
-		return err
-	}
-	payload, err := base64.RawURLEncoding.DecodeString(req.Payload)
-	if err != nil {
-		return err
-	}
-	return json.Unmarshal(payload, v)
-}
-
-func TestGetCertificate(t *testing.T) {
-	man := &Manager{Prompt: AcceptTOS}
-	defer man.stopRenew()
-	hello := &tls.ClientHelloInfo{ServerName: "example.org"}
-	testGetCertificate(t, man, "example.org", hello)
-}
-
-func TestGetCertificate_trailingDot(t *testing.T) {
-	man := &Manager{Prompt: AcceptTOS}
-	defer man.stopRenew()
-	hello := &tls.ClientHelloInfo{ServerName: "example.org."}
-	testGetCertificate(t, man, "example.org", hello)
-}
-
-func TestGetCertificate_ForceRSA(t *testing.T) {
-	man := &Manager{
-		Prompt:   AcceptTOS,
-		Cache:    newMemCache(),
-		ForceRSA: true,
-	}
-	defer man.stopRenew()
-	hello := &tls.ClientHelloInfo{ServerName: "example.org"}
-	testGetCertificate(t, man, "example.org", hello)
-
-	cert, err := man.cacheGet(context.Background(), "example.org")
-	if err != nil {
-		t.Fatalf("man.cacheGet: %v", err)
-	}
-	if _, ok := cert.PrivateKey.(*rsa.PrivateKey); !ok {
-		t.Errorf("cert.PrivateKey is %T; want *rsa.PrivateKey", cert.PrivateKey)
-	}
-}
-
-func TestGetCertificate_nilPrompt(t *testing.T) {
-	man := &Manager{}
-	defer man.stopRenew()
-	url, finish := startACMEServerStub(t, man, "example.org")
-	defer finish()
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	man.Client = &acme.Client{
-		Key:          key,
-		DirectoryURL: url,
-	}
-	hello := &tls.ClientHelloInfo{ServerName: "example.org"}
-	if _, err := man.GetCertificate(hello); err == nil {
-		t.Error("got certificate for example.org; wanted error")
-	}
-}
-
-func TestGetCertificate_expiredCache(t *testing.T) {
-	// Make an expired cert and cache it.
-	pk, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tmpl := &x509.Certificate{
-		SerialNumber: big.NewInt(1),
-		Subject:      pkix.Name{CommonName: "example.org"},
-		NotAfter:     time.Now(),
-	}
-	pub, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &pk.PublicKey, pk)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tlscert := &tls.Certificate{
-		Certificate: [][]byte{pub},
-		PrivateKey:  pk,
-	}
-
-	man := &Manager{Prompt: AcceptTOS, Cache: newMemCache()}
-	defer man.stopRenew()
-	if err := man.cachePut(context.Background(), "example.org", tlscert); err != nil {
-		t.Fatalf("man.cachePut: %v", err)
-	}
-
-	// The expired cached cert should trigger a new cert issuance
-	// and return without an error.
-	hello := &tls.ClientHelloInfo{ServerName: "example.org"}
-	testGetCertificate(t, man, "example.org", hello)
-}
-
-func TestGetCertificate_failedAttempt(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusBadRequest)
-	}))
-	defer ts.Close()
-
-	const example = "example.org"
-	d := createCertRetryAfter
-	f := testDidRemoveState
-	defer func() {
-		createCertRetryAfter = d
-		testDidRemoveState = f
-	}()
-	createCertRetryAfter = 0
-	done := make(chan struct{})
-	testDidRemoveState = func(domain string) {
-		if domain != example {
-			t.Errorf("testDidRemoveState: domain = %q; want %q", domain, example)
-		}
-		close(done)
-	}
-
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	man := &Manager{
-		Prompt: AcceptTOS,
-		Client: &acme.Client{
-			Key:          key,
-			DirectoryURL: ts.URL,
-		},
-	}
-	defer man.stopRenew()
-	hello := &tls.ClientHelloInfo{ServerName: example}
-	if _, err := man.GetCertificate(hello); err == nil {
-		t.Error("GetCertificate: err is nil")
-	}
-	select {
-	case <-time.After(5 * time.Second):
-		t.Errorf("took too long to remove the %q state", example)
-	case <-done:
-		man.stateMu.Lock()
-		defer man.stateMu.Unlock()
-		if v, exist := man.state[example]; exist {
-			t.Errorf("state exists for %q: %+v", example, v)
-		}
-	}
-}
-
-// startACMEServerStub runs an ACME server
-// The domain argument is the expected domain name of a certificate request.
-func startACMEServerStub(t *testing.T, man *Manager, domain string) (url string, finish func()) {
-	// echo token-02 | shasum -a 256
-	// then divide result in 2 parts separated by dot
-	tokenCertName := "4e8eb87631187e9ff2153b56b13a4dec.13a35d002e485d60ff37354b32f665d9.token.acme.invalid"
-	verifyTokenCert := func() {
-		hello := &tls.ClientHelloInfo{ServerName: tokenCertName}
-		_, err := man.GetCertificate(hello)
-		if err != nil {
-			t.Errorf("verifyTokenCert: GetCertificate(%q): %v", tokenCertName, err)
-			return
-		}
-	}
-
-	// ACME CA server stub
-	var ca *httptest.Server
-	ca = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Replay-Nonce", "nonce")
-		if r.Method == "HEAD" {
-			// a nonce request
-			return
-		}
-
-		switch r.URL.Path {
-		// discovery
-		case "/":
-			if err := discoTmpl.Execute(w, ca.URL); err != nil {
-				t.Errorf("discoTmpl: %v", err)
-			}
-		// client key registration
-		case "/new-reg":
-			w.Write([]byte("{}"))
-		// domain authorization
-		case "/new-authz":
-			w.Header().Set("Location", ca.URL+"/authz/1")
-			w.WriteHeader(http.StatusCreated)
-			if err := authzTmpl.Execute(w, ca.URL); err != nil {
-				t.Errorf("authzTmpl: %v", err)
-			}
-		// accept tls-sni-02 challenge
-		case "/challenge/2":
-			verifyTokenCert()
-			w.Write([]byte("{}"))
-		// authorization status
-		case "/authz/1":
-			w.Write([]byte(`{"status": "valid"}`))
-		// cert request
-		case "/new-cert":
-			var req struct {
-				CSR string `json:"csr"`
-			}
-			decodePayload(&req, r.Body)
-			b, _ := base64.RawURLEncoding.DecodeString(req.CSR)
-			csr, err := x509.ParseCertificateRequest(b)
-			if err != nil {
-				t.Errorf("new-cert: CSR: %v", err)
-			}
-			if csr.Subject.CommonName != domain {
-				t.Errorf("CommonName in CSR = %q; want %q", csr.Subject.CommonName, domain)
-			}
-			der, err := dummyCert(csr.PublicKey, domain)
-			if err != nil {
-				t.Errorf("new-cert: dummyCert: %v", err)
-			}
-			chainUp := fmt.Sprintf("<%s/ca-cert>; rel=up", ca.URL)
-			w.Header().Set("Link", chainUp)
-			w.WriteHeader(http.StatusCreated)
-			w.Write(der)
-		// CA chain cert
-		case "/ca-cert":
-			der, err := dummyCert(nil, "ca")
-			if err != nil {
-				t.Errorf("ca-cert: dummyCert: %v", err)
-			}
-			w.Write(der)
-		default:
-			t.Errorf("unrecognized r.URL.Path: %s", r.URL.Path)
-		}
-	}))
-	finish = func() {
-		ca.Close()
-
-		// make sure token cert was removed
-		cancel := make(chan struct{})
-		done := make(chan struct{})
-		go func() {
-			defer close(done)
-			tick := time.NewTicker(100 * time.Millisecond)
-			defer tick.Stop()
-			for {
-				hello := &tls.ClientHelloInfo{ServerName: tokenCertName}
-				if _, err := man.GetCertificate(hello); err != nil {
-					return
-				}
-				select {
-				case <-tick.C:
-				case <-cancel:
-					return
-				}
-			}
-		}()
-		select {
-		case <-done:
-		case <-time.After(5 * time.Second):
-			close(cancel)
-			t.Error("token cert was not removed")
-			<-done
-		}
-	}
-	return ca.URL, finish
-}
-
-// tests man.GetCertificate flow using the provided hello argument.
-// The domain argument is the expected domain name of a certificate request.
-func testGetCertificate(t *testing.T, man *Manager, domain string, hello *tls.ClientHelloInfo) {
-	url, finish := startACMEServerStub(t, man, domain)
-	defer finish()
-
-	// use EC key to run faster on 386
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	man.Client = &acme.Client{
-		Key:          key,
-		DirectoryURL: url,
-	}
-
-	// simulate tls.Config.GetCertificate
-	var tlscert *tls.Certificate
-	done := make(chan struct{})
-	go func() {
-		tlscert, err = man.GetCertificate(hello)
-		close(done)
-	}()
-	select {
-	case <-time.After(time.Minute):
-		t.Fatal("man.GetCertificate took too long to return")
-	case <-done:
-	}
-	if err != nil {
-		t.Fatalf("man.GetCertificate: %v", err)
-	}
-
-	// verify the tlscert is the same we responded with from the CA stub
-	if len(tlscert.Certificate) == 0 {
-		t.Fatal("len(tlscert.Certificate) is 0")
-	}
-	cert, err := x509.ParseCertificate(tlscert.Certificate[0])
-	if err != nil {
-		t.Fatalf("x509.ParseCertificate: %v", err)
-	}
-	if len(cert.DNSNames) == 0 || cert.DNSNames[0] != domain {
-		t.Errorf("cert.DNSNames = %v; want %q", cert.DNSNames, domain)
-	}
-
-}
-
-func TestAccountKeyCache(t *testing.T) {
-	m := Manager{Cache: newMemCache()}
-	ctx := context.Background()
-	k1, err := m.accountKey(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	k2, err := m.accountKey(ctx)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(k1, k2) {
-		t.Errorf("account keys don't match: k1 = %#v; k2 = %#v", k1, k2)
-	}
-}
-
-func TestCache(t *testing.T) {
-	privKey, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tmpl := &x509.Certificate{
-		SerialNumber: big.NewInt(1),
-		Subject:      pkix.Name{CommonName: "example.org"},
-		NotAfter:     time.Now().Add(time.Hour),
-	}
-	pub, err := x509.CreateCertificate(rand.Reader, tmpl, tmpl, &privKey.PublicKey, privKey)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tlscert := &tls.Certificate{
-		Certificate: [][]byte{pub},
-		PrivateKey:  privKey,
-	}
-
-	man := &Manager{Cache: newMemCache()}
-	defer man.stopRenew()
-	ctx := context.Background()
-	if err := man.cachePut(ctx, "example.org", tlscert); err != nil {
-		t.Fatalf("man.cachePut: %v", err)
-	}
-	res, err := man.cacheGet(ctx, "example.org")
-	if err != nil {
-		t.Fatalf("man.cacheGet: %v", err)
-	}
-	if res == nil {
-		t.Fatal("res is nil")
-	}
-}
-
-func TestHostWhitelist(t *testing.T) {
-	policy := HostWhitelist("example.com", "example.org", "*.example.net")
-	tt := []struct {
-		host  string
-		allow bool
-	}{
-		{"example.com", true},
-		{"example.org", true},
-		{"one.example.com", false},
-		{"two.example.org", false},
-		{"three.example.net", false},
-		{"dummy", false},
-	}
-	for i, test := range tt {
-		err := policy(nil, test.host)
-		if err != nil && test.allow {
-			t.Errorf("%d: policy(%q): %v; want nil", i, test.host, err)
-		}
-		if err == nil && !test.allow {
-			t.Errorf("%d: policy(%q): nil; want an error", i, test.host)
-		}
-	}
-}
-
-func TestValidCert(t *testing.T) {
-	key1, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	key2, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	key3, err := rsa.GenerateKey(rand.Reader, 512)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cert1, err := dummyCert(key1.Public(), "example.org")
-	if err != nil {
-		t.Fatal(err)
-	}
-	cert2, err := dummyCert(key2.Public(), "example.org")
-	if err != nil {
-		t.Fatal(err)
-	}
-	cert3, err := dummyCert(key3.Public(), "example.org")
-	if err != nil {
-		t.Fatal(err)
-	}
-	now := time.Now()
-	early, err := dateDummyCert(key1.Public(), now.Add(time.Hour), now.Add(2*time.Hour), "example.org")
-	if err != nil {
-		t.Fatal(err)
-	}
-	expired, err := dateDummyCert(key1.Public(), now.Add(-2*time.Hour), now.Add(-time.Hour), "example.org")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tt := []struct {
-		domain string
-		key    crypto.Signer
-		cert   [][]byte
-		ok     bool
-	}{
-		{"example.org", key1, [][]byte{cert1}, true},
-		{"example.org", key3, [][]byte{cert3}, true},
-		{"example.org", key1, [][]byte{cert1, cert2, cert3}, true},
-		{"example.org", key1, [][]byte{cert1, {1}}, false},
-		{"example.org", key1, [][]byte{{1}}, false},
-		{"example.org", key1, [][]byte{cert2}, false},
-		{"example.org", key2, [][]byte{cert1}, false},
-		{"example.org", key1, [][]byte{cert3}, false},
-		{"example.org", key3, [][]byte{cert1}, false},
-		{"example.net", key1, [][]byte{cert1}, false},
-		{"example.org", key1, [][]byte{early}, false},
-		{"example.org", key1, [][]byte{expired}, false},
-	}
-	for i, test := range tt {
-		leaf, err := validCert(test.domain, test.cert, test.key)
-		if err != nil && test.ok {
-			t.Errorf("%d: err = %v", i, err)
-		}
-		if err == nil && !test.ok {
-			t.Errorf("%d: err is nil", i)
-		}
-		if err == nil && test.ok && leaf == nil {
-			t.Errorf("%d: leaf is nil", i)
-		}
-	}
-}
-
-type cacheGetFunc func(ctx context.Context, key string) ([]byte, error)
-
-func (f cacheGetFunc) Get(ctx context.Context, key string) ([]byte, error) {
-	return f(ctx, key)
-}
-
-func (f cacheGetFunc) Put(ctx context.Context, key string, data []byte) error {
-	return fmt.Errorf("unsupported Put of %q = %q", key, data)
-}
-
-func (f cacheGetFunc) Delete(ctx context.Context, key string) error {
-	return fmt.Errorf("unsupported Delete of %q", key)
-}
-
-func TestManagerGetCertificateBogusSNI(t *testing.T) {
-	m := Manager{
-		Prompt: AcceptTOS,
-		Cache: cacheGetFunc(func(ctx context.Context, key string) ([]byte, error) {
-			return nil, fmt.Errorf("cache.Get of %s", key)
-		}),
-	}
-	tests := []struct {
-		name    string
-		wantErr string
-	}{
-		{"foo.com", "cache.Get of foo.com"},
-		{"foo.com.", "cache.Get of foo.com"},
-		{`a\b.com`, "acme/autocert: server name contains invalid character"},
-		{`a/b.com`, "acme/autocert: server name contains invalid character"},
-		{"", "acme/autocert: missing server name"},
-		{"foo", "acme/autocert: server name component count invalid"},
-		{".foo", "acme/autocert: server name component count invalid"},
-		{"foo.", "acme/autocert: server name component count invalid"},
-		{"fo.o", "cache.Get of fo.o"},
-	}
-	for _, tt := range tests {
-		_, err := m.GetCertificate(&tls.ClientHelloInfo{ServerName: tt.name})
-		got := fmt.Sprint(err)
-		if got != tt.wantErr {
-			t.Errorf("GetCertificate(SNI = %q) = %q; want %q", tt.name, got, tt.wantErr)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/cache.go b/installer/vendor/golang.org/x/crypto/acme/autocert/cache.go
deleted file mode 100644
index 61a5fd239a..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/cache.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"context"
-	"errors"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-)
-
-// ErrCacheMiss is returned when a certificate is not found in cache.
-var ErrCacheMiss = errors.New("acme/autocert: certificate cache miss")
-
-// Cache is used by Manager to store and retrieve previously obtained certificates
-// as opaque data.
-//
-// The key argument of the methods refers to a domain name but need not be an FQDN.
-// Cache implementations should not rely on the key naming pattern.
-type Cache interface {
-	// Get returns a certificate data for the specified key.
-	// If there's no such key, Get returns ErrCacheMiss.
-	Get(ctx context.Context, key string) ([]byte, error)
-
-	// Put stores the data in the cache under the specified key.
-	// Underlying implementations may use any data storage format,
-	// as long as the reverse operation, Get, results in the original data.
-	Put(ctx context.Context, key string, data []byte) error
-
-	// Delete removes a certificate data from the cache under the specified key.
-	// If there's no such key in the cache, Delete returns nil.
-	Delete(ctx context.Context, key string) error
-}
-
-// DirCache implements Cache using a directory on the local filesystem.
-// If the directory does not exist, it will be created with 0700 permissions.
-type DirCache string
-
-// Get reads a certificate data from the specified file name.
-func (d DirCache) Get(ctx context.Context, name string) ([]byte, error) {
-	name = filepath.Join(string(d), name)
-	var (
-		data []byte
-		err  error
-		done = make(chan struct{})
-	)
-	go func() {
-		data, err = ioutil.ReadFile(name)
-		close(done)
-	}()
-	select {
-	case <-ctx.Done():
-		return nil, ctx.Err()
-	case <-done:
-	}
-	if os.IsNotExist(err) {
-		return nil, ErrCacheMiss
-	}
-	return data, err
-}
-
-// Put writes the certificate data to the specified file name.
-// The file will be created with 0600 permissions.
-func (d DirCache) Put(ctx context.Context, name string, data []byte) error {
-	if err := os.MkdirAll(string(d), 0700); err != nil {
-		return err
-	}
-
-	done := make(chan struct{})
-	var err error
-	go func() {
-		defer close(done)
-		var tmp string
-		if tmp, err = d.writeTempFile(name, data); err != nil {
-			return
-		}
-		select {
-		case <-ctx.Done():
-			// Don't overwrite the file if the context was canceled.
-		default:
-			newName := filepath.Join(string(d), name)
-			err = os.Rename(tmp, newName)
-		}
-	}()
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-done:
-	}
-	return err
-}
-
-// Delete removes the specified file name.
-func (d DirCache) Delete(ctx context.Context, name string) error {
-	name = filepath.Join(string(d), name)
-	var (
-		err  error
-		done = make(chan struct{})
-	)
-	go func() {
-		err = os.Remove(name)
-		close(done)
-	}()
-	select {
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-done:
-	}
-	if err != nil && !os.IsNotExist(err) {
-		return err
-	}
-	return nil
-}
-
-// writeTempFile writes b to a temporary file, closes the file and returns its path.
-func (d DirCache) writeTempFile(prefix string, b []byte) (string, error) {
-	// TempFile uses 0600 permissions
-	f, err := ioutil.TempFile(string(d), prefix)
-	if err != nil {
-		return "", err
-	}
-	if _, err := f.Write(b); err != nil {
-		f.Close()
-		return "", err
-	}
-	return f.Name(), f.Close()
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/cache_test.go b/installer/vendor/golang.org/x/crypto/acme/autocert/cache_test.go
deleted file mode 100644
index 653b05bed0..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/cache_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"context"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"testing"
-)
-
-// make sure DirCache satisfies Cache interface
-var _ Cache = DirCache("/")
-
-func TestDirCache(t *testing.T) {
-	dir, err := ioutil.TempDir("", "autocert")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-	dir = filepath.Join(dir, "certs") // a nonexistent dir
-	cache := DirCache(dir)
-	ctx := context.Background()
-
-	// test cache miss
-	if _, err := cache.Get(ctx, "nonexistent"); err != ErrCacheMiss {
-		t.Errorf("get: %v; want ErrCacheMiss", err)
-	}
-
-	// test put/get
-	b1 := []byte{1}
-	if err := cache.Put(ctx, "dummy", b1); err != nil {
-		t.Fatalf("put: %v", err)
-	}
-	b2, err := cache.Get(ctx, "dummy")
-	if err != nil {
-		t.Fatalf("get: %v", err)
-	}
-	if !reflect.DeepEqual(b1, b2) {
-		t.Errorf("b1 = %v; want %v", b1, b2)
-	}
-	name := filepath.Join(dir, "dummy")
-	if _, err := os.Stat(name); err != nil {
-		t.Error(err)
-	}
-
-	// test delete
-	if err := cache.Delete(ctx, "dummy"); err != nil {
-		t.Fatalf("delete: %v", err)
-	}
-	if _, err := cache.Get(ctx, "dummy"); err != ErrCacheMiss {
-		t.Errorf("get: %v; want ErrCacheMiss", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/example_test.go b/installer/vendor/golang.org/x/crypto/acme/autocert/example_test.go
deleted file mode 100644
index 71d61eb1c7..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/example_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert_test
-
-import (
-	"crypto/tls"
-	"fmt"
-	"log"
-	"net/http"
-
-	"golang.org/x/crypto/acme/autocert"
-)
-
-func ExampleNewListener() {
-	mux := http.NewServeMux()
-	mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		fmt.Fprintf(w, "Hello, TLS user! Your config: %+v", r.TLS)
-	})
-	log.Fatal(http.Serve(autocert.NewListener("example.com"), mux))
-}
-
-func ExampleManager() {
-	m := autocert.Manager{
-		Cache:      autocert.DirCache("secret-dir"),
-		Prompt:     autocert.AcceptTOS,
-		HostPolicy: autocert.HostWhitelist("example.org"),
-	}
-	s := &http.Server{
-		Addr:      ":https",
-		TLSConfig: &tls.Config{GetCertificate: m.GetCertificate},
-	}
-	s.ListenAndServeTLS("", "")
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/listener.go b/installer/vendor/golang.org/x/crypto/acme/autocert/listener.go
deleted file mode 100644
index d744df0ed0..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/listener.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"crypto/tls"
-	"log"
-	"net"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
-)
-
-// NewListener returns a net.Listener that listens on the standard TLS
-// port (443) on all interfaces and returns *tls.Conn connections with
-// LetsEncrypt certificates for the provided domain or domains.
-//
-// It enables one-line HTTPS servers:
-//
-//     log.Fatal(http.Serve(autocert.NewListener("example.com"), handler))
-//
-// NewListener is a convenience function for a common configuration.
-// More complex or custom configurations can use the autocert.Manager
-// type instead.
-//
-// Use of this function implies acceptance of the LetsEncrypt Terms of
-// Service. If domains is not empty, the provided domains are passed
-// to HostWhitelist. If domains is empty, the listener will do
-// LetsEncrypt challenges for any requested domain, which is not
-// recommended.
-//
-// Certificates are cached in a "golang-autocert" directory under an
-// operating system-specific cache or temp directory. This may not
-// be suitable for servers spanning multiple machines.
-//
-// The returned listener uses a *tls.Config that enables HTTP/2, and
-// should only be used with servers that support HTTP/2.
-//
-// The returned Listener also enables TCP keep-alives on the accepted
-// connections. The returned *tls.Conn are returned before their TLS
-// handshake has completed.
-func NewListener(domains ...string) net.Listener {
-	m := &Manager{
-		Prompt: AcceptTOS,
-	}
-	if len(domains) > 0 {
-		m.HostPolicy = HostWhitelist(domains...)
-	}
-	dir := cacheDir()
-	if err := os.MkdirAll(dir, 0700); err != nil {
-		log.Printf("warning: autocert.NewListener not using a cache: %v", err)
-	} else {
-		m.Cache = DirCache(dir)
-	}
-	return m.Listener()
-}
-
-// Listener listens on the standard TLS port (443) on all interfaces
-// and returns a net.Listener returning *tls.Conn connections.
-//
-// The returned listener uses a *tls.Config that enables HTTP/2, and
-// should only be used with servers that support HTTP/2.
-//
-// The returned Listener also enables TCP keep-alives on the accepted
-// connections. The returned *tls.Conn are returned before their TLS
-// handshake has completed.
-//
-// Unlike NewListener, it is the caller's responsibility to initialize
-// the Manager m's Prompt, Cache, HostPolicy, and other desired options.
-func (m *Manager) Listener() net.Listener {
-	ln := &listener{
-		m: m,
-		conf: &tls.Config{
-			GetCertificate: m.GetCertificate,           // bonus: panic on nil m
-			NextProtos:     []string{"h2", "http/1.1"}, // Enable HTTP/2
-		},
-	}
-	ln.tcpListener, ln.tcpListenErr = net.Listen("tcp", ":443")
-	return ln
-}
-
-type listener struct {
-	m    *Manager
-	conf *tls.Config
-
-	tcpListener  net.Listener
-	tcpListenErr error
-}
-
-func (ln *listener) Accept() (net.Conn, error) {
-	if ln.tcpListenErr != nil {
-		return nil, ln.tcpListenErr
-	}
-	conn, err := ln.tcpListener.Accept()
-	if err != nil {
-		return nil, err
-	}
-	tcpConn := conn.(*net.TCPConn)
-
-	// Because Listener is a convenience function, help out with
-	// this too.  This is not possible for the caller to set once
-	// we return a *tcp.Conn wrapping an inaccessible net.Conn.
-	// If callers don't want this, they can do things the manual
-	// way and tweak as needed. But this is what net/http does
-	// itself, so copy that. If net/http changes, we can change
-	// here too.
-	tcpConn.SetKeepAlive(true)
-	tcpConn.SetKeepAlivePeriod(3 * time.Minute)
-
-	return tls.Server(tcpConn, ln.conf), nil
-}
-
-func (ln *listener) Addr() net.Addr {
-	if ln.tcpListener != nil {
-		return ln.tcpListener.Addr()
-	}
-	// net.Listen failed. Return something non-nil in case callers
-	// call Addr before Accept:
-	return &net.TCPAddr{IP: net.IP{0, 0, 0, 0}, Port: 443}
-}
-
-func (ln *listener) Close() error {
-	if ln.tcpListenErr != nil {
-		return ln.tcpListenErr
-	}
-	return ln.tcpListener.Close()
-}
-
-func homeDir() string {
-	if runtime.GOOS == "windows" {
-		return os.Getenv("HOMEDRIVE") + os.Getenv("HOMEPATH")
-	}
-	if h := os.Getenv("HOME"); h != "" {
-		return h
-	}
-	return "/"
-}
-
-func cacheDir() string {
-	const base = "golang-autocert"
-	switch runtime.GOOS {
-	case "darwin":
-		return filepath.Join(homeDir(), "Library", "Caches", base)
-	case "windows":
-		for _, ev := range []string{"APPDATA", "CSIDL_APPDATA", "TEMP", "TMP"} {
-			if v := os.Getenv(ev); v != "" {
-				return filepath.Join(v, base)
-			}
-		}
-		// Worst case:
-		return filepath.Join(homeDir(), base)
-	}
-	if xdg := os.Getenv("XDG_CACHE_HOME"); xdg != "" {
-		return filepath.Join(xdg, base)
-	}
-	return filepath.Join(homeDir(), ".cache", base)
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/renewal.go b/installer/vendor/golang.org/x/crypto/acme/autocert/renewal.go
deleted file mode 100644
index 6c5da2bc8c..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/renewal.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"context"
-	"crypto"
-	"sync"
-	"time"
-)
-
-// renewJitter is the maximum deviation from Manager.RenewBefore.
-const renewJitter = time.Hour
-
-// domainRenewal tracks the state used by the periodic timers
-// renewing a single domain's cert.
-type domainRenewal struct {
-	m      *Manager
-	domain string
-	key    crypto.Signer
-
-	timerMu sync.Mutex
-	timer   *time.Timer
-}
-
-// start starts a cert renewal timer at the time
-// defined by the certificate expiration time exp.
-//
-// If the timer is already started, calling start is a noop.
-func (dr *domainRenewal) start(exp time.Time) {
-	dr.timerMu.Lock()
-	defer dr.timerMu.Unlock()
-	if dr.timer != nil {
-		return
-	}
-	dr.timer = time.AfterFunc(dr.next(exp), dr.renew)
-}
-
-// stop stops the cert renewal timer.
-// If the timer is already stopped, calling stop is a noop.
-func (dr *domainRenewal) stop() {
-	dr.timerMu.Lock()
-	defer dr.timerMu.Unlock()
-	if dr.timer == nil {
-		return
-	}
-	dr.timer.Stop()
-	dr.timer = nil
-}
-
-// renew is called periodically by a timer.
-// The first renew call is kicked off by dr.start.
-func (dr *domainRenewal) renew() {
-	dr.timerMu.Lock()
-	defer dr.timerMu.Unlock()
-	if dr.timer == nil {
-		return
-	}
-
-	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
-	defer cancel()
-	// TODO: rotate dr.key at some point?
-	next, err := dr.do(ctx)
-	if err != nil {
-		next = renewJitter / 2
-		next += time.Duration(pseudoRand.int63n(int64(next)))
-	}
-	dr.timer = time.AfterFunc(next, dr.renew)
-	testDidRenewLoop(next, err)
-}
-
-// do is similar to Manager.createCert but it doesn't lock a Manager.state item.
-// Instead, it requests a new certificate independently and, upon success,
-// replaces dr.m.state item with a new one and updates cache for the given domain.
-//
-// It may return immediately if the expiration date of the currently cached cert
-// is far enough in the future.
-//
-// The returned value is a time interval after which the renewal should occur again.
-func (dr *domainRenewal) do(ctx context.Context) (time.Duration, error) {
-	// a race is likely unavoidable in a distributed environment
-	// but we try nonetheless
-	if tlscert, err := dr.m.cacheGet(ctx, dr.domain); err == nil {
-		next := dr.next(tlscert.Leaf.NotAfter)
-		if next > dr.m.renewBefore()+renewJitter {
-			return next, nil
-		}
-	}
-
-	der, leaf, err := dr.m.authorizedCert(ctx, dr.key, dr.domain)
-	if err != nil {
-		return 0, err
-	}
-	state := &certState{
-		key:  dr.key,
-		cert: der,
-		leaf: leaf,
-	}
-	tlscert, err := state.tlscert()
-	if err != nil {
-		return 0, err
-	}
-	dr.m.cachePut(ctx, dr.domain, tlscert)
-	dr.m.stateMu.Lock()
-	defer dr.m.stateMu.Unlock()
-	// m.state is guaranteed to be non-nil at this point
-	dr.m.state[dr.domain] = state
-	return dr.next(leaf.NotAfter), nil
-}
-
-func (dr *domainRenewal) next(expiry time.Time) time.Duration {
-	d := expiry.Sub(timeNow()) - dr.m.renewBefore()
-	// add a bit of randomness to renew deadline
-	n := pseudoRand.int63n(int64(renewJitter))
-	d -= time.Duration(n)
-	if d < 0 {
-		return 0
-	}
-	return d
-}
-
-var testDidRenewLoop = func(next time.Duration, err error) {}
diff --git a/installer/vendor/golang.org/x/crypto/acme/autocert/renewal_test.go b/installer/vendor/golang.org/x/crypto/acme/autocert/renewal_test.go
deleted file mode 100644
index 11d40ff5d2..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/autocert/renewal_test.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package autocert
-
-import (
-	"context"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/tls"
-	"crypto/x509"
-	"encoding/base64"
-	"fmt"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/acme"
-)
-
-func TestRenewalNext(t *testing.T) {
-	now := time.Now()
-	timeNow = func() time.Time { return now }
-	defer func() { timeNow = time.Now }()
-
-	man := &Manager{RenewBefore: 7 * 24 * time.Hour}
-	defer man.stopRenew()
-	tt := []struct {
-		expiry   time.Time
-		min, max time.Duration
-	}{
-		{now.Add(90 * 24 * time.Hour), 83*24*time.Hour - renewJitter, 83 * 24 * time.Hour},
-		{now.Add(time.Hour), 0, 1},
-		{now, 0, 1},
-		{now.Add(-time.Hour), 0, 1},
-	}
-
-	dr := &domainRenewal{m: man}
-	for i, test := range tt {
-		next := dr.next(test.expiry)
-		if next < test.min || test.max < next {
-			t.Errorf("%d: next = %v; want between %v and %v", i, next, test.min, test.max)
-		}
-	}
-}
-
-func TestRenewFromCache(t *testing.T) {
-	const domain = "example.org"
-
-	// ACME CA server stub
-	var ca *httptest.Server
-	ca = httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Replay-Nonce", "nonce")
-		if r.Method == "HEAD" {
-			// a nonce request
-			return
-		}
-
-		switch r.URL.Path {
-		// discovery
-		case "/":
-			if err := discoTmpl.Execute(w, ca.URL); err != nil {
-				t.Fatalf("discoTmpl: %v", err)
-			}
-		// client key registration
-		case "/new-reg":
-			w.Write([]byte("{}"))
-		// domain authorization
-		case "/new-authz":
-			w.Header().Set("Location", ca.URL+"/authz/1")
-			w.WriteHeader(http.StatusCreated)
-			w.Write([]byte(`{"status": "valid"}`))
-		// cert request
-		case "/new-cert":
-			var req struct {
-				CSR string `json:"csr"`
-			}
-			decodePayload(&req, r.Body)
-			b, _ := base64.RawURLEncoding.DecodeString(req.CSR)
-			csr, err := x509.ParseCertificateRequest(b)
-			if err != nil {
-				t.Fatalf("new-cert: CSR: %v", err)
-			}
-			der, err := dummyCert(csr.PublicKey, domain)
-			if err != nil {
-				t.Fatalf("new-cert: dummyCert: %v", err)
-			}
-			chainUp := fmt.Sprintf("<%s/ca-cert>; rel=up", ca.URL)
-			w.Header().Set("Link", chainUp)
-			w.WriteHeader(http.StatusCreated)
-			w.Write(der)
-		// CA chain cert
-		case "/ca-cert":
-			der, err := dummyCert(nil, "ca")
-			if err != nil {
-				t.Fatalf("ca-cert: dummyCert: %v", err)
-			}
-			w.Write(der)
-		default:
-			t.Errorf("unrecognized r.URL.Path: %s", r.URL.Path)
-		}
-	}))
-	defer ca.Close()
-
-	// use EC key to run faster on 386
-	key, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-	man := &Manager{
-		Prompt:      AcceptTOS,
-		Cache:       newMemCache(),
-		RenewBefore: 24 * time.Hour,
-		Client: &acme.Client{
-			Key:          key,
-			DirectoryURL: ca.URL,
-		},
-	}
-	defer man.stopRenew()
-
-	// cache an almost expired cert
-	now := time.Now()
-	cert, err := dateDummyCert(key.Public(), now.Add(-2*time.Hour), now.Add(time.Minute), domain)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tlscert := &tls.Certificate{PrivateKey: key, Certificate: [][]byte{cert}}
-	if err := man.cachePut(context.Background(), domain, tlscert); err != nil {
-		t.Fatal(err)
-	}
-
-	// veriy the renewal happened
-	defer func() {
-		testDidRenewLoop = func(next time.Duration, err error) {}
-	}()
-	done := make(chan struct{})
-	testDidRenewLoop = func(next time.Duration, err error) {
-		defer close(done)
-		if err != nil {
-			t.Errorf("testDidRenewLoop: %v", err)
-		}
-		// Next should be about 90 days:
-		// dummyCert creates 90days expiry + account for man.RenewBefore.
-		// Previous expiration was within 1 min.
-		future := 88 * 24 * time.Hour
-		if next < future {
-			t.Errorf("testDidRenewLoop: next = %v; want >= %v", next, future)
-		}
-
-		// ensure the new cert is cached
-		after := time.Now().Add(future)
-		tlscert, err := man.cacheGet(context.Background(), domain)
-		if err != nil {
-			t.Fatalf("man.cacheGet: %v", err)
-		}
-		if !tlscert.Leaf.NotAfter.After(after) {
-			t.Errorf("cache leaf.NotAfter = %v; want > %v", tlscert.Leaf.NotAfter, after)
-		}
-
-		// verify the old cert is also replaced in memory
-		man.stateMu.Lock()
-		defer man.stateMu.Unlock()
-		s := man.state[domain]
-		if s == nil {
-			t.Fatalf("m.state[%q] is nil", domain)
-		}
-		tlscert, err = s.tlscert()
-		if err != nil {
-			t.Fatalf("s.tlscert: %v", err)
-		}
-		if !tlscert.Leaf.NotAfter.After(after) {
-			t.Errorf("state leaf.NotAfter = %v; want > %v", tlscert.Leaf.NotAfter, after)
-		}
-	}
-
-	// trigger renew
-	hello := &tls.ClientHelloInfo{ServerName: domain}
-	if _, err := man.GetCertificate(hello); err != nil {
-		t.Fatal(err)
-	}
-
-	// wait for renew loop
-	select {
-	case <-time.After(10 * time.Second):
-		t.Fatal("renew took too long to occur")
-	case <-done:
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/jws.go b/installer/vendor/golang.org/x/crypto/acme/jws.go
deleted file mode 100644
index 6cbca25de9..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/jws.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package acme
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/sha256"
-	_ "crypto/sha512" // need for EC keys
-	"encoding/base64"
-	"encoding/json"
-	"fmt"
-	"math/big"
-)
-
-// jwsEncodeJSON signs claimset using provided key and a nonce.
-// The result is serialized in JSON format.
-// See https://tools.ietf.org/html/rfc7515#section-7.
-func jwsEncodeJSON(claimset interface{}, key crypto.Signer, nonce string) ([]byte, error) {
-	jwk, err := jwkEncode(key.Public())
-	if err != nil {
-		return nil, err
-	}
-	alg, sha := jwsHasher(key)
-	if alg == "" || !sha.Available() {
-		return nil, ErrUnsupportedKey
-	}
-	phead := fmt.Sprintf(`{"alg":%q,"jwk":%s,"nonce":%q}`, alg, jwk, nonce)
-	phead = base64.RawURLEncoding.EncodeToString([]byte(phead))
-	cs, err := json.Marshal(claimset)
-	if err != nil {
-		return nil, err
-	}
-	payload := base64.RawURLEncoding.EncodeToString(cs)
-	hash := sha.New()
-	hash.Write([]byte(phead + "." + payload))
-	sig, err := jwsSign(key, sha, hash.Sum(nil))
-	if err != nil {
-		return nil, err
-	}
-
-	enc := struct {
-		Protected string `json:"protected"`
-		Payload   string `json:"payload"`
-		Sig       string `json:"signature"`
-	}{
-		Protected: phead,
-		Payload:   payload,
-		Sig:       base64.RawURLEncoding.EncodeToString(sig),
-	}
-	return json.Marshal(&enc)
-}
-
-// jwkEncode encodes public part of an RSA or ECDSA key into a JWK.
-// The result is also suitable for creating a JWK thumbprint.
-// https://tools.ietf.org/html/rfc7517
-func jwkEncode(pub crypto.PublicKey) (string, error) {
-	switch pub := pub.(type) {
-	case *rsa.PublicKey:
-		// https://tools.ietf.org/html/rfc7518#section-6.3.1
-		n := pub.N
-		e := big.NewInt(int64(pub.E))
-		// Field order is important.
-		// See https://tools.ietf.org/html/rfc7638#section-3.3 for details.
-		return fmt.Sprintf(`{"e":"%s","kty":"RSA","n":"%s"}`,
-			base64.RawURLEncoding.EncodeToString(e.Bytes()),
-			base64.RawURLEncoding.EncodeToString(n.Bytes()),
-		), nil
-	case *ecdsa.PublicKey:
-		// https://tools.ietf.org/html/rfc7518#section-6.2.1
-		p := pub.Curve.Params()
-		n := p.BitSize / 8
-		if p.BitSize%8 != 0 {
-			n++
-		}
-		x := pub.X.Bytes()
-		if n > len(x) {
-			x = append(make([]byte, n-len(x)), x...)
-		}
-		y := pub.Y.Bytes()
-		if n > len(y) {
-			y = append(make([]byte, n-len(y)), y...)
-		}
-		// Field order is important.
-		// See https://tools.ietf.org/html/rfc7638#section-3.3 for details.
-		return fmt.Sprintf(`{"crv":"%s","kty":"EC","x":"%s","y":"%s"}`,
-			p.Name,
-			base64.RawURLEncoding.EncodeToString(x),
-			base64.RawURLEncoding.EncodeToString(y),
-		), nil
-	}
-	return "", ErrUnsupportedKey
-}
-
-// jwsSign signs the digest using the given key.
-// It returns ErrUnsupportedKey if the key type is unknown.
-// The hash is used only for RSA keys.
-func jwsSign(key crypto.Signer, hash crypto.Hash, digest []byte) ([]byte, error) {
-	switch key := key.(type) {
-	case *rsa.PrivateKey:
-		return key.Sign(rand.Reader, digest, hash)
-	case *ecdsa.PrivateKey:
-		r, s, err := ecdsa.Sign(rand.Reader, key, digest)
-		if err != nil {
-			return nil, err
-		}
-		rb, sb := r.Bytes(), s.Bytes()
-		size := key.Params().BitSize / 8
-		if size%8 > 0 {
-			size++
-		}
-		sig := make([]byte, size*2)
-		copy(sig[size-len(rb):], rb)
-		copy(sig[size*2-len(sb):], sb)
-		return sig, nil
-	}
-	return nil, ErrUnsupportedKey
-}
-
-// jwsHasher indicates suitable JWS algorithm name and a hash function
-// to use for signing a digest with the provided key.
-// It returns ("", 0) if the key is not supported.
-func jwsHasher(key crypto.Signer) (string, crypto.Hash) {
-	switch key := key.(type) {
-	case *rsa.PrivateKey:
-		return "RS256", crypto.SHA256
-	case *ecdsa.PrivateKey:
-		switch key.Params().Name {
-		case "P-256":
-			return "ES256", crypto.SHA256
-		case "P-384":
-			return "ES384", crypto.SHA384
-		case "P-521":
-			return "ES512", crypto.SHA512
-		}
-	}
-	return "", 0
-}
-
-// JWKThumbprint creates a JWK thumbprint out of pub
-// as specified in https://tools.ietf.org/html/rfc7638.
-func JWKThumbprint(pub crypto.PublicKey) (string, error) {
-	jwk, err := jwkEncode(pub)
-	if err != nil {
-		return "", err
-	}
-	b := sha256.Sum256([]byte(jwk))
-	return base64.RawURLEncoding.EncodeToString(b[:]), nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/jws_test.go b/installer/vendor/golang.org/x/crypto/acme/jws_test.go
deleted file mode 100644
index 0ff0fb5a31..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/jws_test.go
+++ /dev/null
@@ -1,319 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package acme
-
-import (
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/base64"
-	"encoding/json"
-	"encoding/pem"
-	"fmt"
-	"math/big"
-	"testing"
-)
-
-const (
-	testKeyPEM = `
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEA4xgZ3eRPkwoRvy7qeRUbmMDe0V+xH9eWLdu0iheeLlrmD2mq
-WXfP9IeSKApbn34g8TuAS9g5zhq8ELQ3kmjr+KV86GAMgI6VAcGlq3QrzpTCf/30
-Ab7+zawrfRaFONa1HwEzPY1KHnGVkxJc85gNkwYI9SY2RHXtvln3zs5wITNrdosq
-EXeaIkVYBEhbhNu54pp3kxo6TuWLi9e6pXeWetEwmlBwtWZlPoib2j3TxLBksKZf
-oyFyek380mHgJAumQ/I2fjj98/97mk3ihOY4AgVdCDj1z/GCoZkG5Rq7nbCGyosy
-KWyDX00Zs+nNqVhoLeIvXC4nnWdJMZ6rogxyQQIDAQABAoIBACIEZTOI1Kao9nmV
-9IeIsuaR1Y61b9neOF/MLmIVIZu+AAJFCMB4Iw11FV6sFodwpEyeZhx2WkpWVN+H
-r19eGiLX3zsL0DOdqBJoSIHDWCCMxgnYJ6nvS0nRxX3qVrBp8R2g12Ub+gNPbmFm
-ecf/eeERIVxfifd9VsyRu34eDEvcmKFuLYbElFcPh62xE3x12UZvV/sN7gXbawpP
-G+w255vbE5MoaKdnnO83cTFlcHvhn24M/78qP7Te5OAeelr1R89kYxQLpuGe4fbS
-zc6E3ym5Td6urDetGGrSY1Eu10/8sMusX+KNWkm+RsBRbkyKq72ks/qKpOxOa+c6
-9gm+Y8ECgYEA/iNUyg1ubRdH11p82l8KHtFC1DPE0V1gSZsX29TpM5jS4qv46K+s
-8Ym1zmrORM8x+cynfPx1VQZQ34EYeCMIX212ryJ+zDATl4NE0I4muMvSiH9vx6Xc
-7FmhNnaYzPsBL5Tm9nmtQuP09YEn8poiOJFiDs/4olnD5ogA5O4THGkCgYEA5MIL
-qWYBUuqbEWLRtMruUtpASclrBqNNsJEsMGbeqBJmoMxdHeSZckbLOrqm7GlMyNRJ
-Ne/5uWRGSzaMYuGmwsPpERzqEvYFnSrpjW5YtXZ+JtxFXNVfm9Z1gLLgvGpOUCIU
-RbpoDckDe1vgUuk3y5+DjZihs+rqIJ45XzXTzBkCgYBWuf3segruJZy5rEKhTv+o
-JqeUvRn0jNYYKFpLBeyTVBrbie6GkbUGNIWbrK05pC+c3K9nosvzuRUOQQL1tJbd
-4gA3oiD9U4bMFNr+BRTHyZ7OQBcIXdz3t1qhuHVKtnngIAN1p25uPlbRFUNpshnt
-jgeVoHlsBhApcs5DUc+pyQKBgDzeHPg/+g4z+nrPznjKnktRY1W+0El93kgi+J0Q
-YiJacxBKEGTJ1MKBb8X6sDurcRDm22wMpGfd9I5Cv2v4GsUsF7HD/cx5xdih+G73
-c4clNj/k0Ff5Nm1izPUno4C+0IOl7br39IPmfpSuR6wH/h6iHQDqIeybjxyKvT1G
-N0rRAoGBAKGD+4ZI/E1MoJ5CXB8cDDMHagbE3cq/DtmYzE2v1DFpQYu5I4PCm5c7
-EQeIP6dZtv8IMgtGIb91QX9pXvP0aznzQKwYIA8nZgoENCPfiMTPiEDT9e/0lObO
-9XWsXpbSTsRPj0sv1rB+UzBJ0PgjK4q2zOF0sNo7b1+6nlM3BWPx
------END RSA PRIVATE KEY-----
-`
-
-	// This thumbprint is for the testKey defined above.
-	testKeyThumbprint = "6nicxzh6WETQlrvdchkz-U3e3DOQZ4heJKU63rfqMqQ"
-
-	// openssl ecparam -name secp256k1 -genkey -noout
-	testKeyECPEM = `
------BEGIN EC PRIVATE KEY-----
-MHcCAQEEIK07hGLr0RwyUdYJ8wbIiBS55CjnkMD23DWr+ccnypWLoAoGCCqGSM49
-AwEHoUQDQgAE5lhEug5xK4xBDZ2nAbaxLtaLiv85bxJ7ePd1dkO23HThqIrvawF5
-QAaS/RNouybCiRhRjI3EaxLkQwgrCw0gqQ==
------END EC PRIVATE KEY-----
-`
-	// openssl ecparam -name secp384r1 -genkey -noout
-	testKeyEC384PEM = `
------BEGIN EC PRIVATE KEY-----
-MIGkAgEBBDAQ4lNtXRORWr1bgKR1CGysr9AJ9SyEk4jiVnlUWWUChmSNL+i9SLSD
-Oe/naPqXJ6CgBwYFK4EEACKhZANiAAQzKtj+Ms0vHoTX5dzv3/L5YMXOWuI5UKRj
-JigpahYCqXD2BA1j0E/2xt5vlPf+gm0PL+UHSQsCokGnIGuaHCsJAp3ry0gHQEke
-WYXapUUFdvaK1R2/2hn5O+eiQM8YzCg=
------END EC PRIVATE KEY-----
-`
-	// openssl ecparam -name secp521r1 -genkey -noout
-	testKeyEC512PEM = `
------BEGIN EC PRIVATE KEY-----
-MIHcAgEBBEIBSNZKFcWzXzB/aJClAb305ibalKgtDA7+70eEkdPt28/3LZMM935Z
-KqYHh/COcxuu3Kt8azRAUz3gyr4zZKhlKUSgBwYFK4EEACOhgYkDgYYABAHUNKbx
-7JwC7H6pa2sV0tERWhHhB3JmW+OP6SUgMWryvIKajlx73eS24dy4QPGrWO9/ABsD
-FqcRSkNVTXnIv6+0mAF25knqIBIg5Q8M9BnOu9GGAchcwt3O7RDHmqewnJJDrbjd
-GGnm6rb+NnWR9DIopM0nKNkToWoF/hzopxu4Ae/GsQ==
------END EC PRIVATE KEY-----
-`
-	// 1. openssl ec -in key.pem -noout -text
-	// 2. remove first byte, 04 (the header); the rest is X and Y
-	// 3. convert each with: echo <val> | xxd -r -p | base64 -w 100 | tr -d '=' | tr '/+' '_-'
-	testKeyECPubX    = "5lhEug5xK4xBDZ2nAbaxLtaLiv85bxJ7ePd1dkO23HQ"
-	testKeyECPubY    = "4aiK72sBeUAGkv0TaLsmwokYUYyNxGsS5EMIKwsNIKk"
-	testKeyEC384PubX = "MyrY_jLNLx6E1-Xc79_y-WDFzlriOVCkYyYoKWoWAqlw9gQNY9BP9sbeb5T3_oJt"
-	testKeyEC384PubY = "Dy_lB0kLAqJBpyBrmhwrCQKd68tIB0BJHlmF2qVFBXb2itUdv9oZ-TvnokDPGMwo"
-	testKeyEC512PubX = "AdQ0pvHsnALsfqlraxXS0RFaEeEHcmZb44_pJSAxavK8gpqOXHvd5Lbh3LhA8atY738AGwMWpxFKQ1VNeci_r7SY"
-	testKeyEC512PubY = "AXbmSeogEiDlDwz0Gc670YYByFzC3c7tEMeap7CckkOtuN0Yaebqtv42dZH0MiikzSco2ROhagX-HOinG7gB78ax"
-
-	// echo -n '{"crv":"P-256","kty":"EC","x":"<testKeyECPubX>","y":"<testKeyECPubY>"}' | \
-	// openssl dgst -binary -sha256 | base64 | tr -d '=' | tr '/+' '_-'
-	testKeyECThumbprint = "zedj-Bd1Zshp8KLePv2MB-lJ_Hagp7wAwdkA0NUTniU"
-)
-
-var (
-	testKey      *rsa.PrivateKey
-	testKeyEC    *ecdsa.PrivateKey
-	testKeyEC384 *ecdsa.PrivateKey
-	testKeyEC512 *ecdsa.PrivateKey
-)
-
-func init() {
-	testKey = parseRSA(testKeyPEM, "testKeyPEM")
-	testKeyEC = parseEC(testKeyECPEM, "testKeyECPEM")
-	testKeyEC384 = parseEC(testKeyEC384PEM, "testKeyEC384PEM")
-	testKeyEC512 = parseEC(testKeyEC512PEM, "testKeyEC512PEM")
-}
-
-func decodePEM(s, name string) []byte {
-	d, _ := pem.Decode([]byte(s))
-	if d == nil {
-		panic("no block found in " + name)
-	}
-	return d.Bytes
-}
-
-func parseRSA(s, name string) *rsa.PrivateKey {
-	b := decodePEM(s, name)
-	k, err := x509.ParsePKCS1PrivateKey(b)
-	if err != nil {
-		panic(fmt.Sprintf("%s: %v", name, err))
-	}
-	return k
-}
-
-func parseEC(s, name string) *ecdsa.PrivateKey {
-	b := decodePEM(s, name)
-	k, err := x509.ParseECPrivateKey(b)
-	if err != nil {
-		panic(fmt.Sprintf("%s: %v", name, err))
-	}
-	return k
-}
-
-func TestJWSEncodeJSON(t *testing.T) {
-	claims := struct{ Msg string }{"Hello JWS"}
-	// JWS signed with testKey and "nonce" as the nonce value
-	// JSON-serialized JWS fields are split for easier testing
-	const (
-		// {"alg":"RS256","jwk":{"e":"AQAB","kty":"RSA","n":"..."},"nonce":"nonce"}
-		protected = "eyJhbGciOiJSUzI1NiIsImp3ayI6eyJlIjoiQVFBQiIsImt0eSI6" +
-			"IlJTQSIsIm4iOiI0eGdaM2VSUGt3b1J2eTdxZVJVYm1NRGUwVi14" +
-			"SDllV0xkdTBpaGVlTGxybUQybXFXWGZQOUllU0tBcGJuMzRnOFR1" +
-			"QVM5ZzV6aHE4RUxRM2ttanItS1Y4NkdBTWdJNlZBY0dscTNRcnpw" +
-			"VENmXzMwQWI3LXphd3JmUmFGT05hMUh3RXpQWTFLSG5HVmt4SmM4" +
-			"NWdOa3dZSTlTWTJSSFh0dmxuM3pzNXdJVE5yZG9zcUVYZWFJa1ZZ" +
-			"QkVoYmhOdTU0cHAza3hvNlR1V0xpOWU2cFhlV2V0RXdtbEJ3dFda" +
-			"bFBvaWIyajNUeExCa3NLWmZveUZ5ZWszODBtSGdKQXVtUV9JMmZq" +
-			"ajk4Xzk3bWszaWhPWTRBZ1ZkQ0RqMXpfR0NvWmtHNVJxN25iQ0d5" +
-			"b3N5S1d5RFgwMFpzLW5OcVZob0xlSXZYQzRubldkSk1aNnJvZ3h5" +
-			"UVEifSwibm9uY2UiOiJub25jZSJ9"
-		// {"Msg":"Hello JWS"}
-		payload   = "eyJNc2ciOiJIZWxsbyBKV1MifQ"
-		signature = "eAGUikStX_UxyiFhxSLMyuyBcIB80GeBkFROCpap2sW3EmkU_ggF" +
-			"knaQzxrTfItICSAXsCLIquZ5BbrSWA_4vdEYrwWtdUj7NqFKjHRa" +
-			"zpLHcoR7r1rEHvkoP1xj49lS5fc3Wjjq8JUhffkhGbWZ8ZVkgPdC" +
-			"4tMBWiQDoth-x8jELP_3LYOB_ScUXi2mETBawLgOT2K8rA0Vbbmx" +
-			"hWNlOWuUf-8hL5YX4IOEwsS8JK_TrTq5Zc9My0zHJmaieqDV0UlP" +
-			"k0onFjPFkGm7MrPSgd0MqRG-4vSAg2O4hDo7rKv4n8POjjXlNQvM" +
-			"9IPLr8qZ7usYBKhEGwX3yq_eicAwBw"
-	)
-
-	b, err := jwsEncodeJSON(claims, testKey, "nonce")
-	if err != nil {
-		t.Fatal(err)
-	}
-	var jws struct{ Protected, Payload, Signature string }
-	if err := json.Unmarshal(b, &jws); err != nil {
-		t.Fatal(err)
-	}
-	if jws.Protected != protected {
-		t.Errorf("protected:\n%s\nwant:\n%s", jws.Protected, protected)
-	}
-	if jws.Payload != payload {
-		t.Errorf("payload:\n%s\nwant:\n%s", jws.Payload, payload)
-	}
-	if jws.Signature != signature {
-		t.Errorf("signature:\n%s\nwant:\n%s", jws.Signature, signature)
-	}
-}
-
-func TestJWSEncodeJSONEC(t *testing.T) {
-	tt := []struct {
-		key      *ecdsa.PrivateKey
-		x, y     string
-		alg, crv string
-	}{
-		{testKeyEC, testKeyECPubX, testKeyECPubY, "ES256", "P-256"},
-		{testKeyEC384, testKeyEC384PubX, testKeyEC384PubY, "ES384", "P-384"},
-		{testKeyEC512, testKeyEC512PubX, testKeyEC512PubY, "ES512", "P-521"},
-	}
-	for i, test := range tt {
-		claims := struct{ Msg string }{"Hello JWS"}
-		b, err := jwsEncodeJSON(claims, test.key, "nonce")
-		if err != nil {
-			t.Errorf("%d: %v", i, err)
-			continue
-		}
-		var jws struct{ Protected, Payload, Signature string }
-		if err := json.Unmarshal(b, &jws); err != nil {
-			t.Errorf("%d: %v", i, err)
-			continue
-		}
-
-		b, err = base64.RawURLEncoding.DecodeString(jws.Protected)
-		if err != nil {
-			t.Errorf("%d: jws.Protected: %v", i, err)
-		}
-		var head struct {
-			Alg   string
-			Nonce string
-			JWK   struct {
-				Crv string
-				Kty string
-				X   string
-				Y   string
-			} `json:"jwk"`
-		}
-		if err := json.Unmarshal(b, &head); err != nil {
-			t.Errorf("%d: jws.Protected: %v", i, err)
-		}
-		if head.Alg != test.alg {
-			t.Errorf("%d: head.Alg = %q; want %q", i, head.Alg, test.alg)
-		}
-		if head.Nonce != "nonce" {
-			t.Errorf("%d: head.Nonce = %q; want nonce", i, head.Nonce)
-		}
-		if head.JWK.Crv != test.crv {
-			t.Errorf("%d: head.JWK.Crv = %q; want %q", i, head.JWK.Crv, test.crv)
-		}
-		if head.JWK.Kty != "EC" {
-			t.Errorf("%d: head.JWK.Kty = %q; want EC", i, head.JWK.Kty)
-		}
-		if head.JWK.X != test.x {
-			t.Errorf("%d: head.JWK.X = %q; want %q", i, head.JWK.X, test.x)
-		}
-		if head.JWK.Y != test.y {
-			t.Errorf("%d: head.JWK.Y = %q; want %q", i, head.JWK.Y, test.y)
-		}
-	}
-}
-
-func TestJWKThumbprintRSA(t *testing.T) {
-	// Key example from RFC 7638
-	const base64N = "0vx7agoebGcQSuuPiLJXZptN9nndrQmbXEps2aiAFbWhM78LhWx4cbbfAAt" +
-		"VT86zwu1RK7aPFFxuhDR1L6tSoc_BJECPebWKRXjBZCiFV4n3oknjhMstn6" +
-		"4tZ_2W-5JsGY4Hc5n9yBXArwl93lqt7_RN5w6Cf0h4QyQ5v-65YGjQR0_FD" +
-		"W2QvzqY368QQMicAtaSqzs8KJZgnYb9c7d0zgdAZHzu6qMQvRL5hajrn1n9" +
-		"1CbOpbISD08qNLyrdkt-bFTWhAI4vMQFh6WeZu0fM4lFd2NcRwr3XPksINH" +
-		"aQ-G_xBniIqbw0Ls1jF44-csFCur-kEgU8awapJzKnqDKgw"
-	const base64E = "AQAB"
-	const expected = "NzbLsXh8uDCcd-6MNwXF4W_7noWXFZAfHkxZsRGC9Xs"
-
-	b, err := base64.RawURLEncoding.DecodeString(base64N)
-	if err != nil {
-		t.Fatalf("Error parsing example key N: %v", err)
-	}
-	n := new(big.Int).SetBytes(b)
-
-	b, err = base64.RawURLEncoding.DecodeString(base64E)
-	if err != nil {
-		t.Fatalf("Error parsing example key E: %v", err)
-	}
-	e := new(big.Int).SetBytes(b)
-
-	pub := &rsa.PublicKey{N: n, E: int(e.Uint64())}
-	th, err := JWKThumbprint(pub)
-	if err != nil {
-		t.Error(err)
-	}
-	if th != expected {
-		t.Errorf("thumbprint = %q; want %q", th, expected)
-	}
-}
-
-func TestJWKThumbprintEC(t *testing.T) {
-	// Key example from RFC 7520
-	// expected was computed with
-	// echo -n '{"crv":"P-521","kty":"EC","x":"<base64X>","y":"<base64Y>"}' | \
-	// openssl dgst -binary -sha256 | \
-	// base64 | \
-	// tr -d '=' | tr '/+' '_-'
-	const (
-		base64X = "AHKZLLOsCOzz5cY97ewNUajB957y-C-U88c3v13nmGZx6sYl_oJXu9A5RkT" +
-			"KqjqvjyekWF-7ytDyRXYgCF5cj0Kt"
-		base64Y = "AdymlHvOiLxXkEhayXQnNCvDX4h9htZaCJN34kfmC6pV5OhQHiraVySsUda" +
-			"QkAgDPrwQrJmbnX9cwlGfP-HqHZR1"
-		expected = "dHri3SADZkrush5HU_50AoRhcKFryN-PI6jPBtPL55M"
-	)
-
-	b, err := base64.RawURLEncoding.DecodeString(base64X)
-	if err != nil {
-		t.Fatalf("Error parsing example key X: %v", err)
-	}
-	x := new(big.Int).SetBytes(b)
-
-	b, err = base64.RawURLEncoding.DecodeString(base64Y)
-	if err != nil {
-		t.Fatalf("Error parsing example key Y: %v", err)
-	}
-	y := new(big.Int).SetBytes(b)
-
-	pub := &ecdsa.PublicKey{Curve: elliptic.P521(), X: x, Y: y}
-	th, err := JWKThumbprint(pub)
-	if err != nil {
-		t.Error(err)
-	}
-	if th != expected {
-		t.Errorf("thumbprint = %q; want %q", th, expected)
-	}
-}
-
-func TestJWKThumbprintErrUnsupportedKey(t *testing.T) {
-	_, err := JWKThumbprint(struct{}{})
-	if err != ErrUnsupportedKey {
-		t.Errorf("err = %q; want %q", err, ErrUnsupportedKey)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/acme/types.go b/installer/vendor/golang.org/x/crypto/acme/types.go
deleted file mode 100644
index 3e199749ec..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/types.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package acme
-
-import (
-	"crypto"
-	"crypto/x509"
-	"errors"
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-)
-
-// ACME server response statuses used to describe Authorization and Challenge states.
-const (
-	StatusUnknown    = "unknown"
-	StatusPending    = "pending"
-	StatusProcessing = "processing"
-	StatusValid      = "valid"
-	StatusInvalid    = "invalid"
-	StatusRevoked    = "revoked"
-)
-
-// CRLReasonCode identifies the reason for a certificate revocation.
-type CRLReasonCode int
-
-// CRL reason codes as defined in RFC 5280.
-const (
-	CRLReasonUnspecified          CRLReasonCode = 0
-	CRLReasonKeyCompromise        CRLReasonCode = 1
-	CRLReasonCACompromise         CRLReasonCode = 2
-	CRLReasonAffiliationChanged   CRLReasonCode = 3
-	CRLReasonSuperseded           CRLReasonCode = 4
-	CRLReasonCessationOfOperation CRLReasonCode = 5
-	CRLReasonCertificateHold      CRLReasonCode = 6
-	CRLReasonRemoveFromCRL        CRLReasonCode = 8
-	CRLReasonPrivilegeWithdrawn   CRLReasonCode = 9
-	CRLReasonAACompromise         CRLReasonCode = 10
-)
-
-// ErrUnsupportedKey is returned when an unsupported key type is encountered.
-var ErrUnsupportedKey = errors.New("acme: unknown key type; only RSA and ECDSA are supported")
-
-// Error is an ACME error, defined in Problem Details for HTTP APIs doc
-// http://tools.ietf.org/html/draft-ietf-appsawg-http-problem.
-type Error struct {
-	// StatusCode is The HTTP status code generated by the origin server.
-	StatusCode int
-	// ProblemType is a URI reference that identifies the problem type,
-	// typically in a "urn:acme:error:xxx" form.
-	ProblemType string
-	// Detail is a human-readable explanation specific to this occurrence of the problem.
-	Detail string
-	// Header is the original server error response headers.
-	// It may be nil.
-	Header http.Header
-}
-
-func (e *Error) Error() string {
-	return fmt.Sprintf("%d %s: %s", e.StatusCode, e.ProblemType, e.Detail)
-}
-
-// AuthorizationError indicates that an authorization for an identifier
-// did not succeed.
-// It contains all errors from Challenge items of the failed Authorization.
-type AuthorizationError struct {
-	// URI uniquely identifies the failed Authorization.
-	URI string
-
-	// Identifier is an AuthzID.Value of the failed Authorization.
-	Identifier string
-
-	// Errors is a collection of non-nil error values of Challenge items
-	// of the failed Authorization.
-	Errors []error
-}
-
-func (a *AuthorizationError) Error() string {
-	e := make([]string, len(a.Errors))
-	for i, err := range a.Errors {
-		e[i] = err.Error()
-	}
-	return fmt.Sprintf("acme: authorization error for %s: %s", a.Identifier, strings.Join(e, "; "))
-}
-
-// RateLimit reports whether err represents a rate limit error and
-// any Retry-After duration returned by the server.
-//
-// See the following for more details on rate limiting:
-// https://tools.ietf.org/html/draft-ietf-acme-acme-05#section-5.6
-func RateLimit(err error) (time.Duration, bool) {
-	e, ok := err.(*Error)
-	if !ok {
-		return 0, false
-	}
-	// Some CA implementations may return incorrect values.
-	// Use case-insensitive comparison.
-	if !strings.HasSuffix(strings.ToLower(e.ProblemType), ":ratelimited") {
-		return 0, false
-	}
-	if e.Header == nil {
-		return 0, true
-	}
-	return retryAfter(e.Header.Get("Retry-After"), 0), true
-}
-
-// Account is a user account. It is associated with a private key.
-type Account struct {
-	// URI is the account unique ID, which is also a URL used to retrieve
-	// account data from the CA.
-	URI string
-
-	// Contact is a slice of contact info used during registration.
-	Contact []string
-
-	// The terms user has agreed to.
-	// A value not matching CurrentTerms indicates that the user hasn't agreed
-	// to the actual Terms of Service of the CA.
-	AgreedTerms string
-
-	// Actual terms of a CA.
-	CurrentTerms string
-
-	// Authz is the authorization URL used to initiate a new authz flow.
-	Authz string
-
-	// Authorizations is a URI from which a list of authorizations
-	// granted to this account can be fetched via a GET request.
-	Authorizations string
-
-	// Certificates is a URI from which a list of certificates
-	// issued for this account can be fetched via a GET request.
-	Certificates string
-}
-
-// Directory is ACME server discovery data.
-type Directory struct {
-	// RegURL is an account endpoint URL, allowing for creating new
-	// and modifying existing accounts.
-	RegURL string
-
-	// AuthzURL is used to initiate Identifier Authorization flow.
-	AuthzURL string
-
-	// CertURL is a new certificate issuance endpoint URL.
-	CertURL string
-
-	// RevokeURL is used to initiate a certificate revocation flow.
-	RevokeURL string
-
-	// Term is a URI identifying the current terms of service.
-	Terms string
-
-	// Website is an HTTP or HTTPS URL locating a website
-	// providing more information about the ACME server.
-	Website string
-
-	// CAA consists of lowercase hostname elements, which the ACME server
-	// recognises as referring to itself for the purposes of CAA record validation
-	// as defined in RFC6844.
-	CAA []string
-}
-
-// Challenge encodes a returned CA challenge.
-// Its Error field may be non-nil if the challenge is part of an Authorization
-// with StatusInvalid.
-type Challenge struct {
-	// Type is the challenge type, e.g. "http-01", "tls-sni-02", "dns-01".
-	Type string
-
-	// URI is where a challenge response can be posted to.
-	URI string
-
-	// Token is a random value that uniquely identifies the challenge.
-	Token string
-
-	// Status identifies the status of this challenge.
-	Status string
-
-	// Error indicates the reason for an authorization failure
-	// when this challenge was used.
-	// The type of a non-nil value is *Error.
-	Error error
-}
-
-// Authorization encodes an authorization response.
-type Authorization struct {
-	// URI uniquely identifies a authorization.
-	URI string
-
-	// Status identifies the status of an authorization.
-	Status string
-
-	// Identifier is what the account is authorized to represent.
-	Identifier AuthzID
-
-	// Challenges that the client needs to fulfill in order to prove possession
-	// of the identifier (for pending authorizations).
-	// For final authorizations, the challenges that were used.
-	Challenges []*Challenge
-
-	// A collection of sets of challenges, each of which would be sufficient
-	// to prove possession of the identifier.
-	// Clients must complete a set of challenges that covers at least one set.
-	// Challenges are identified by their indices in the challenges array.
-	// If this field is empty, the client needs to complete all challenges.
-	Combinations [][]int
-}
-
-// AuthzID is an identifier that an account is authorized to represent.
-type AuthzID struct {
-	Type  string // The type of identifier, e.g. "dns".
-	Value string // The identifier itself, e.g. "example.org".
-}
-
-// wireAuthz is ACME JSON representation of Authorization objects.
-type wireAuthz struct {
-	Status       string
-	Challenges   []wireChallenge
-	Combinations [][]int
-	Identifier   struct {
-		Type  string
-		Value string
-	}
-}
-
-func (z *wireAuthz) authorization(uri string) *Authorization {
-	a := &Authorization{
-		URI:          uri,
-		Status:       z.Status,
-		Identifier:   AuthzID{Type: z.Identifier.Type, Value: z.Identifier.Value},
-		Combinations: z.Combinations, // shallow copy
-		Challenges:   make([]*Challenge, len(z.Challenges)),
-	}
-	for i, v := range z.Challenges {
-		a.Challenges[i] = v.challenge()
-	}
-	return a
-}
-
-func (z *wireAuthz) error(uri string) *AuthorizationError {
-	err := &AuthorizationError{
-		URI:        uri,
-		Identifier: z.Identifier.Value,
-	}
-	for _, raw := range z.Challenges {
-		if raw.Error != nil {
-			err.Errors = append(err.Errors, raw.Error.error(nil))
-		}
-	}
-	return err
-}
-
-// wireChallenge is ACME JSON challenge representation.
-type wireChallenge struct {
-	URI    string `json:"uri"`
-	Type   string
-	Token  string
-	Status string
-	Error  *wireError
-}
-
-func (c *wireChallenge) challenge() *Challenge {
-	v := &Challenge{
-		URI:    c.URI,
-		Type:   c.Type,
-		Token:  c.Token,
-		Status: c.Status,
-	}
-	if v.Status == "" {
-		v.Status = StatusPending
-	}
-	if c.Error != nil {
-		v.Error = c.Error.error(nil)
-	}
-	return v
-}
-
-// wireError is a subset of fields of the Problem Details object
-// as described in https://tools.ietf.org/html/rfc7807#section-3.1.
-type wireError struct {
-	Status int
-	Type   string
-	Detail string
-}
-
-func (e *wireError) error(h http.Header) *Error {
-	return &Error{
-		StatusCode:  e.Status,
-		ProblemType: e.Type,
-		Detail:      e.Detail,
-		Header:      h,
-	}
-}
-
-// CertOption is an optional argument type for the TLSSNIxChallengeCert methods for
-// customizing a temporary certificate for TLS-SNI challenges.
-type CertOption interface {
-	privateCertOpt()
-}
-
-// WithKey creates an option holding a private/public key pair.
-// The private part signs a certificate, and the public part represents the signee.
-func WithKey(key crypto.Signer) CertOption {
-	return &certOptKey{key}
-}
-
-type certOptKey struct {
-	key crypto.Signer
-}
-
-func (*certOptKey) privateCertOpt() {}
-
-// WithTemplate creates an option for specifying a certificate template.
-// See x509.CreateCertificate for template usage details.
-//
-// In TLSSNIxChallengeCert methods, the template is also used as parent,
-// resulting in a self-signed certificate.
-// The DNSNames field of t is always overwritten for tls-sni challenge certs.
-func WithTemplate(t *x509.Certificate) CertOption {
-	return (*certOptTemplate)(t)
-}
-
-type certOptTemplate x509.Certificate
-
-func (*certOptTemplate) privateCertOpt() {}
diff --git a/installer/vendor/golang.org/x/crypto/acme/types_test.go b/installer/vendor/golang.org/x/crypto/acme/types_test.go
deleted file mode 100644
index a7553e6b70..0000000000
--- a/installer/vendor/golang.org/x/crypto/acme/types_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package acme
-
-import (
-	"errors"
-	"net/http"
-	"testing"
-	"time"
-)
-
-func TestRateLimit(t *testing.T) {
-	now := time.Date(2017, 04, 27, 10, 0, 0, 0, time.UTC)
-	f := timeNow
-	defer func() { timeNow = f }()
-	timeNow = func() time.Time { return now }
-
-	h120, hTime := http.Header{}, http.Header{}
-	h120.Set("Retry-After", "120")
-	hTime.Set("Retry-After", "Tue Apr 27 11:00:00 2017")
-
-	err1 := &Error{
-		ProblemType: "urn:ietf:params:acme:error:nolimit",
-		Header:      h120,
-	}
-	err2 := &Error{
-		ProblemType: "urn:ietf:params:acme:error:rateLimited",
-		Header:      h120,
-	}
-	err3 := &Error{
-		ProblemType: "urn:ietf:params:acme:error:rateLimited",
-		Header:      nil,
-	}
-	err4 := &Error{
-		ProblemType: "urn:ietf:params:acme:error:rateLimited",
-		Header:      hTime,
-	}
-
-	tt := []struct {
-		err error
-		res time.Duration
-		ok  bool
-	}{
-		{nil, 0, false},
-		{errors.New("dummy"), 0, false},
-		{err1, 0, false},
-		{err2, 2 * time.Minute, true},
-		{err3, 0, true},
-		{err4, time.Hour, true},
-	}
-	for i, test := range tt {
-		res, ok := RateLimit(test.err)
-		if ok != test.ok {
-			t.Errorf("%d: RateLimit(%+v): ok = %v; want %v", i, test.err, ok, test.ok)
-			continue
-		}
-		if res != test.res {
-			t.Errorf("%d: RateLimit(%+v) = %v; want %v", i, test.err, res, test.res)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/bcrypt/base64.go b/installer/vendor/golang.org/x/crypto/bcrypt/base64.go
deleted file mode 100644
index fc31160908..0000000000
--- a/installer/vendor/golang.org/x/crypto/bcrypt/base64.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bcrypt
-
-import "encoding/base64"
-
-const alphabet = "./ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"
-
-var bcEncoding = base64.NewEncoding(alphabet)
-
-func base64Encode(src []byte) []byte {
-	n := bcEncoding.EncodedLen(len(src))
-	dst := make([]byte, n)
-	bcEncoding.Encode(dst, src)
-	for dst[n-1] == '=' {
-		n--
-	}
-	return dst[:n]
-}
-
-func base64Decode(src []byte) ([]byte, error) {
-	numOfEquals := 4 - (len(src) % 4)
-	for i := 0; i < numOfEquals; i++ {
-		src = append(src, '=')
-	}
-
-	dst := make([]byte, bcEncoding.DecodedLen(len(src)))
-	n, err := bcEncoding.Decode(dst, src)
-	if err != nil {
-		return nil, err
-	}
-	return dst[:n], nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt.go b/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
deleted file mode 100644
index 202fa8aff4..0000000000
--- a/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bcrypt implements Provos and Mazières's bcrypt adaptive hashing
-// algorithm. See http://www.usenix.org/event/usenix99/provos/provos.pdf
-package bcrypt // import "golang.org/x/crypto/bcrypt"
-
-// The code is a port of Provos and Mazières's C implementation.
-import (
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/blowfish"
-)
-
-const (
-	MinCost     int = 4  // the minimum allowable cost as passed in to GenerateFromPassword
-	MaxCost     int = 31 // the maximum allowable cost as passed in to GenerateFromPassword
-	DefaultCost int = 10 // the cost that will actually be set if a cost below MinCost is passed into GenerateFromPassword
-)
-
-// The error returned from CompareHashAndPassword when a password and hash do
-// not match.
-var ErrMismatchedHashAndPassword = errors.New("crypto/bcrypt: hashedPassword is not the hash of the given password")
-
-// The error returned from CompareHashAndPassword when a hash is too short to
-// be a bcrypt hash.
-var ErrHashTooShort = errors.New("crypto/bcrypt: hashedSecret too short to be a bcrypted password")
-
-// The error returned from CompareHashAndPassword when a hash was created with
-// a bcrypt algorithm newer than this implementation.
-type HashVersionTooNewError byte
-
-func (hv HashVersionTooNewError) Error() string {
-	return fmt.Sprintf("crypto/bcrypt: bcrypt algorithm version '%c' requested is newer than current version '%c'", byte(hv), majorVersion)
-}
-
-// The error returned from CompareHashAndPassword when a hash starts with something other than '$'
-type InvalidHashPrefixError byte
-
-func (ih InvalidHashPrefixError) Error() string {
-	return fmt.Sprintf("crypto/bcrypt: bcrypt hashes must start with '$', but hashedSecret started with '%c'", byte(ih))
-}
-
-type InvalidCostError int
-
-func (ic InvalidCostError) Error() string {
-	return fmt.Sprintf("crypto/bcrypt: cost %d is outside allowed range (%d,%d)", int(ic), int(MinCost), int(MaxCost))
-}
-
-const (
-	majorVersion       = '2'
-	minorVersion       = 'a'
-	maxSaltSize        = 16
-	maxCryptedHashSize = 23
-	encodedSaltSize    = 22
-	encodedHashSize    = 31
-	minHashSize        = 59
-)
-
-// magicCipherData is an IV for the 64 Blowfish encryption calls in
-// bcrypt(). It's the string "OrpheanBeholderScryDoubt" in big-endian bytes.
-var magicCipherData = []byte{
-	0x4f, 0x72, 0x70, 0x68,
-	0x65, 0x61, 0x6e, 0x42,
-	0x65, 0x68, 0x6f, 0x6c,
-	0x64, 0x65, 0x72, 0x53,
-	0x63, 0x72, 0x79, 0x44,
-	0x6f, 0x75, 0x62, 0x74,
-}
-
-type hashed struct {
-	hash  []byte
-	salt  []byte
-	cost  int // allowed range is MinCost to MaxCost
-	major byte
-	minor byte
-}
-
-// GenerateFromPassword returns the bcrypt hash of the password at the given
-// cost. If the cost given is less than MinCost, the cost will be set to
-// DefaultCost, instead. Use CompareHashAndPassword, as defined in this package,
-// to compare the returned hashed password with its cleartext version.
-func GenerateFromPassword(password []byte, cost int) ([]byte, error) {
-	p, err := newFromPassword(password, cost)
-	if err != nil {
-		return nil, err
-	}
-	return p.Hash(), nil
-}
-
-// CompareHashAndPassword compares a bcrypt hashed password with its possible
-// plaintext equivalent. Returns nil on success, or an error on failure.
-func CompareHashAndPassword(hashedPassword, password []byte) error {
-	p, err := newFromHash(hashedPassword)
-	if err != nil {
-		return err
-	}
-
-	otherHash, err := bcrypt(password, p.cost, p.salt)
-	if err != nil {
-		return err
-	}
-
-	otherP := &hashed{otherHash, p.salt, p.cost, p.major, p.minor}
-	if subtle.ConstantTimeCompare(p.Hash(), otherP.Hash()) == 1 {
-		return nil
-	}
-
-	return ErrMismatchedHashAndPassword
-}
-
-// Cost returns the hashing cost used to create the given hashed
-// password. When, in the future, the hashing cost of a password system needs
-// to be increased in order to adjust for greater computational power, this
-// function allows one to establish which passwords need to be updated.
-func Cost(hashedPassword []byte) (int, error) {
-	p, err := newFromHash(hashedPassword)
-	if err != nil {
-		return 0, err
-	}
-	return p.cost, nil
-}
-
-func newFromPassword(password []byte, cost int) (*hashed, error) {
-	if cost < MinCost {
-		cost = DefaultCost
-	}
-	p := new(hashed)
-	p.major = majorVersion
-	p.minor = minorVersion
-
-	err := checkCost(cost)
-	if err != nil {
-		return nil, err
-	}
-	p.cost = cost
-
-	unencodedSalt := make([]byte, maxSaltSize)
-	_, err = io.ReadFull(rand.Reader, unencodedSalt)
-	if err != nil {
-		return nil, err
-	}
-
-	p.salt = base64Encode(unencodedSalt)
-	hash, err := bcrypt(password, p.cost, p.salt)
-	if err != nil {
-		return nil, err
-	}
-	p.hash = hash
-	return p, err
-}
-
-func newFromHash(hashedSecret []byte) (*hashed, error) {
-	if len(hashedSecret) < minHashSize {
-		return nil, ErrHashTooShort
-	}
-	p := new(hashed)
-	n, err := p.decodeVersion(hashedSecret)
-	if err != nil {
-		return nil, err
-	}
-	hashedSecret = hashedSecret[n:]
-	n, err = p.decodeCost(hashedSecret)
-	if err != nil {
-		return nil, err
-	}
-	hashedSecret = hashedSecret[n:]
-
-	// The "+2" is here because we'll have to append at most 2 '=' to the salt
-	// when base64 decoding it in expensiveBlowfishSetup().
-	p.salt = make([]byte, encodedSaltSize, encodedSaltSize+2)
-	copy(p.salt, hashedSecret[:encodedSaltSize])
-
-	hashedSecret = hashedSecret[encodedSaltSize:]
-	p.hash = make([]byte, len(hashedSecret))
-	copy(p.hash, hashedSecret)
-
-	return p, nil
-}
-
-func bcrypt(password []byte, cost int, salt []byte) ([]byte, error) {
-	cipherData := make([]byte, len(magicCipherData))
-	copy(cipherData, magicCipherData)
-
-	c, err := expensiveBlowfishSetup(password, uint32(cost), salt)
-	if err != nil {
-		return nil, err
-	}
-
-	for i := 0; i < 24; i += 8 {
-		for j := 0; j < 64; j++ {
-			c.Encrypt(cipherData[i:i+8], cipherData[i:i+8])
-		}
-	}
-
-	// Bug compatibility with C bcrypt implementations. We only encode 23 of
-	// the 24 bytes encrypted.
-	hsh := base64Encode(cipherData[:maxCryptedHashSize])
-	return hsh, nil
-}
-
-func expensiveBlowfishSetup(key []byte, cost uint32, salt []byte) (*blowfish.Cipher, error) {
-	csalt, err := base64Decode(salt)
-	if err != nil {
-		return nil, err
-	}
-
-	// Bug compatibility with C bcrypt implementations. They use the trailing
-	// NULL in the key string during expansion.
-	// We copy the key to prevent changing the underlying array.
-	ckey := append(key[:len(key):len(key)], 0)
-
-	c, err := blowfish.NewSaltedCipher(ckey, csalt)
-	if err != nil {
-		return nil, err
-	}
-
-	var i, rounds uint64
-	rounds = 1 << cost
-	for i = 0; i < rounds; i++ {
-		blowfish.ExpandKey(ckey, c)
-		blowfish.ExpandKey(csalt, c)
-	}
-
-	return c, nil
-}
-
-func (p *hashed) Hash() []byte {
-	arr := make([]byte, 60)
-	arr[0] = '$'
-	arr[1] = p.major
-	n := 2
-	if p.minor != 0 {
-		arr[2] = p.minor
-		n = 3
-	}
-	arr[n] = '$'
-	n += 1
-	copy(arr[n:], []byte(fmt.Sprintf("%02d", p.cost)))
-	n += 2
-	arr[n] = '$'
-	n += 1
-	copy(arr[n:], p.salt)
-	n += encodedSaltSize
-	copy(arr[n:], p.hash)
-	n += encodedHashSize
-	return arr[:n]
-}
-
-func (p *hashed) decodeVersion(sbytes []byte) (int, error) {
-	if sbytes[0] != '$' {
-		return -1, InvalidHashPrefixError(sbytes[0])
-	}
-	if sbytes[1] > majorVersion {
-		return -1, HashVersionTooNewError(sbytes[1])
-	}
-	p.major = sbytes[1]
-	n := 3
-	if sbytes[2] != '$' {
-		p.minor = sbytes[2]
-		n++
-	}
-	return n, nil
-}
-
-// sbytes should begin where decodeVersion left off.
-func (p *hashed) decodeCost(sbytes []byte) (int, error) {
-	cost, err := strconv.Atoi(string(sbytes[0:2]))
-	if err != nil {
-		return -1, err
-	}
-	err = checkCost(cost)
-	if err != nil {
-		return -1, err
-	}
-	p.cost = cost
-	return 3, nil
-}
-
-func (p *hashed) String() string {
-	return fmt.Sprintf("&{hash: %#v, salt: %#v, cost: %d, major: %c, minor: %c}", string(p.hash), p.salt, p.cost, p.major, p.minor)
-}
-
-func checkCost(cost int) error {
-	if cost < MinCost || cost > MaxCost {
-		return InvalidCostError(cost)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt_test.go b/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt_test.go
deleted file mode 100644
index aecf759eb1..0000000000
--- a/installer/vendor/golang.org/x/crypto/bcrypt/bcrypt_test.go
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bcrypt
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-)
-
-func TestBcryptingIsEasy(t *testing.T) {
-	pass := []byte("mypassword")
-	hp, err := GenerateFromPassword(pass, 0)
-	if err != nil {
-		t.Fatalf("GenerateFromPassword error: %s", err)
-	}
-
-	if CompareHashAndPassword(hp, pass) != nil {
-		t.Errorf("%v should hash %s correctly", hp, pass)
-	}
-
-	notPass := "notthepass"
-	err = CompareHashAndPassword(hp, []byte(notPass))
-	if err != ErrMismatchedHashAndPassword {
-		t.Errorf("%v and %s should be mismatched", hp, notPass)
-	}
-}
-
-func TestBcryptingIsCorrect(t *testing.T) {
-	pass := []byte("allmine")
-	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
-	expectedHash := []byte("$2a$10$XajjQvNhvvRt5GSeFk1xFeyqRrsxkhBkUiQeg0dt.wU1qD4aFDcga")
-
-	hash, err := bcrypt(pass, 10, salt)
-	if err != nil {
-		t.Fatalf("bcrypt blew up: %v", err)
-	}
-	if !bytes.HasSuffix(expectedHash, hash) {
-		t.Errorf("%v should be the suffix of %v", hash, expectedHash)
-	}
-
-	h, err := newFromHash(expectedHash)
-	if err != nil {
-		t.Errorf("Unable to parse %s: %v", string(expectedHash), err)
-	}
-
-	// This is not the safe way to compare these hashes. We do this only for
-	// testing clarity. Use bcrypt.CompareHashAndPassword()
-	if err == nil && !bytes.Equal(expectedHash, h.Hash()) {
-		t.Errorf("Parsed hash %v should equal %v", h.Hash(), expectedHash)
-	}
-}
-
-func TestVeryShortPasswords(t *testing.T) {
-	key := []byte("k")
-	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
-	_, err := bcrypt(key, 10, salt)
-	if err != nil {
-		t.Errorf("One byte key resulted in error: %s", err)
-	}
-}
-
-func TestTooLongPasswordsWork(t *testing.T) {
-	salt := []byte("XajjQvNhvvRt5GSeFk1xFe")
-	// One byte over the usual 56 byte limit that blowfish has
-	tooLongPass := []byte("012345678901234567890123456789012345678901234567890123456")
-	tooLongExpected := []byte("$2a$10$XajjQvNhvvRt5GSeFk1xFe5l47dONXg781AmZtd869sO8zfsHuw7C")
-	hash, err := bcrypt(tooLongPass, 10, salt)
-	if err != nil {
-		t.Fatalf("bcrypt blew up on long password: %v", err)
-	}
-	if !bytes.HasSuffix(tooLongExpected, hash) {
-		t.Errorf("%v should be the suffix of %v", hash, tooLongExpected)
-	}
-}
-
-type InvalidHashTest struct {
-	err  error
-	hash []byte
-}
-
-var invalidTests = []InvalidHashTest{
-	{ErrHashTooShort, []byte("$2a$10$fooo")},
-	{ErrHashTooShort, []byte("$2a")},
-	{HashVersionTooNewError('3'), []byte("$3a$10$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
-	{InvalidHashPrefixError('%'), []byte("%2a$10$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
-	{InvalidCostError(32), []byte("$2a$32$sssssssssssssssssssssshhhhhhhhhhhhhhhhhhhhhhhhhhhhhhh")},
-}
-
-func TestInvalidHashErrors(t *testing.T) {
-	check := func(name string, expected, err error) {
-		if err == nil {
-			t.Errorf("%s: Should have returned an error", name)
-		}
-		if err != nil && err != expected {
-			t.Errorf("%s gave err %v but should have given %v", name, err, expected)
-		}
-	}
-	for _, iht := range invalidTests {
-		_, err := newFromHash(iht.hash)
-		check("newFromHash", iht.err, err)
-		err = CompareHashAndPassword(iht.hash, []byte("anything"))
-		check("CompareHashAndPassword", iht.err, err)
-	}
-}
-
-func TestUnpaddedBase64Encoding(t *testing.T) {
-	original := []byte{101, 201, 101, 75, 19, 227, 199, 20, 239, 236, 133, 32, 30, 109, 243, 30}
-	encodedOriginal := []byte("XajjQvNhvvRt5GSeFk1xFe")
-
-	encoded := base64Encode(original)
-
-	if !bytes.Equal(encodedOriginal, encoded) {
-		t.Errorf("Encoded %v should have equaled %v", encoded, encodedOriginal)
-	}
-
-	decoded, err := base64Decode(encodedOriginal)
-	if err != nil {
-		t.Fatalf("base64Decode blew up: %s", err)
-	}
-
-	if !bytes.Equal(decoded, original) {
-		t.Errorf("Decoded %v should have equaled %v", decoded, original)
-	}
-}
-
-func TestCost(t *testing.T) {
-	suffix := "XajjQvNhvvRt5GSeFk1xFe5l47dONXg781AmZtd869sO8zfsHuw7C"
-	for _, vers := range []string{"2a", "2"} {
-		for _, cost := range []int{4, 10} {
-			s := fmt.Sprintf("$%s$%02d$%s", vers, cost, suffix)
-			h := []byte(s)
-			actual, err := Cost(h)
-			if err != nil {
-				t.Errorf("Cost, error: %s", err)
-				continue
-			}
-			if actual != cost {
-				t.Errorf("Cost, expected: %d, actual: %d", cost, actual)
-			}
-		}
-	}
-	_, err := Cost([]byte("$a$a$" + suffix))
-	if err == nil {
-		t.Errorf("Cost, malformed but no error returned")
-	}
-}
-
-func TestCostValidationInHash(t *testing.T) {
-	if testing.Short() {
-		return
-	}
-
-	pass := []byte("mypassword")
-
-	for c := 0; c < MinCost; c++ {
-		p, _ := newFromPassword(pass, c)
-		if p.cost != DefaultCost {
-			t.Errorf("newFromPassword should default costs below %d to %d, but was %d", MinCost, DefaultCost, p.cost)
-		}
-	}
-
-	p, _ := newFromPassword(pass, 14)
-	if p.cost != 14 {
-		t.Errorf("newFromPassword should default cost to 14, but was %d", p.cost)
-	}
-
-	hp, _ := newFromHash(p.Hash())
-	if p.cost != hp.cost {
-		t.Errorf("newFromHash should maintain the cost at %d, but was %d", p.cost, hp.cost)
-	}
-
-	_, err := newFromPassword(pass, 32)
-	if err == nil {
-		t.Fatalf("newFromPassword: should return a cost error")
-	}
-	if err != InvalidCostError(32) {
-		t.Errorf("newFromPassword: should return cost error, got %#v", err)
-	}
-}
-
-func TestCostReturnsWithLeadingZeroes(t *testing.T) {
-	hp, _ := newFromPassword([]byte("abcdefgh"), 7)
-	cost := hp.Hash()[4:7]
-	expected := []byte("07$")
-
-	if !bytes.Equal(expected, cost) {
-		t.Errorf("single digit costs in hash should have leading zeros: was %v instead of %v", cost, expected)
-	}
-}
-
-func TestMinorNotRequired(t *testing.T) {
-	noMinorHash := []byte("$2$10$XajjQvNhvvRt5GSeFk1xFeyqRrsxkhBkUiQeg0dt.wU1qD4aFDcga")
-	h, err := newFromHash(noMinorHash)
-	if err != nil {
-		t.Fatalf("No minor hash blew up: %s", err)
-	}
-	if h.minor != 0 {
-		t.Errorf("Should leave minor version at 0, but was %d", h.minor)
-	}
-
-	if !bytes.Equal(noMinorHash, h.Hash()) {
-		t.Errorf("Should generate hash %v, but created %v", noMinorHash, h.Hash())
-	}
-}
-
-func BenchmarkEqual(b *testing.B) {
-	b.StopTimer()
-	passwd := []byte("somepasswordyoulike")
-	hash, _ := GenerateFromPassword(passwd, 10)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		CompareHashAndPassword(hash, passwd)
-	}
-}
-
-func BenchmarkGeneration(b *testing.B) {
-	b.StopTimer()
-	passwd := []byte("mylongpassword1234")
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		GenerateFromPassword(passwd, 10)
-	}
-}
-
-// See Issue https://github.com/golang/go/issues/20425.
-func TestNoSideEffectsFromCompare(t *testing.T) {
-	source := []byte("passw0rd123456")
-	password := source[:len(source)-6]
-	token := source[len(source)-6:]
-	want := make([]byte, len(source))
-	copy(want, source)
-
-	wantHash := []byte("$2a$10$LK9XRuhNxHHCvjX3tdkRKei1QiCDUKrJRhZv7WWZPuQGRUM92rOUa")
-	_ = CompareHashAndPassword(wantHash, password)
-
-	got := bytes.Join([][]byte{password, token}, []byte(""))
-	if !bytes.Equal(got, want) {
-		t.Errorf("got=%q want=%q", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2b.go
deleted file mode 100644
index 7f0a86e44a..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blake2b implements the BLAKE2b hash algorithm defined by RFC 7693
-// and the extendable output function (XOF) BLAKE2Xb.
-//
-// For a detailed specification of BLAKE2b see https://blake2.net/blake2.pdf
-// and for BLAKE2Xb see https://blake2.net/blake2x.pdf
-//
-// If you aren't sure which function you need, use BLAKE2b (Sum512 or New512).
-// If you need a secret-key MAC (message authentication code), use the New512
-// function with a non-nil key.
-//
-// BLAKE2X is a construction to compute hash values larger than 64 bytes. It
-// can produce hash values between 0 and 4 GiB.
-package blake2b
-
-import (
-	"encoding/binary"
-	"errors"
-	"hash"
-)
-
-const (
-	// The blocksize of BLAKE2b in bytes.
-	BlockSize = 128
-	// The hash size of BLAKE2b-512 in bytes.
-	Size = 64
-	// The hash size of BLAKE2b-384 in bytes.
-	Size384 = 48
-	// The hash size of BLAKE2b-256 in bytes.
-	Size256 = 32
-)
-
-var (
-	useAVX2 bool
-	useAVX  bool
-	useSSE4 bool
-)
-
-var errKeySize = errors.New("blake2b: invalid key size")
-
-var iv = [8]uint64{
-	0x6a09e667f3bcc908, 0xbb67ae8584caa73b, 0x3c6ef372fe94f82b, 0xa54ff53a5f1d36f1,
-	0x510e527fade682d1, 0x9b05688c2b3e6c1f, 0x1f83d9abfb41bd6b, 0x5be0cd19137e2179,
-}
-
-// Sum512 returns the BLAKE2b-512 checksum of the data.
-func Sum512(data []byte) [Size]byte {
-	var sum [Size]byte
-	checkSum(&sum, Size, data)
-	return sum
-}
-
-// Sum384 returns the BLAKE2b-384 checksum of the data.
-func Sum384(data []byte) [Size384]byte {
-	var sum [Size]byte
-	var sum384 [Size384]byte
-	checkSum(&sum, Size384, data)
-	copy(sum384[:], sum[:Size384])
-	return sum384
-}
-
-// Sum256 returns the BLAKE2b-256 checksum of the data.
-func Sum256(data []byte) [Size256]byte {
-	var sum [Size]byte
-	var sum256 [Size256]byte
-	checkSum(&sum, Size256, data)
-	copy(sum256[:], sum[:Size256])
-	return sum256
-}
-
-// New512 returns a new hash.Hash computing the BLAKE2b-512 checksum. A non-nil
-// key turns the hash into a MAC. The key must between zero and 64 bytes long.
-func New512(key []byte) (hash.Hash, error) { return newDigest(Size, key) }
-
-// New384 returns a new hash.Hash computing the BLAKE2b-384 checksum. A non-nil
-// key turns the hash into a MAC. The key must between zero and 64 bytes long.
-func New384(key []byte) (hash.Hash, error) { return newDigest(Size384, key) }
-
-// New256 returns a new hash.Hash computing the BLAKE2b-256 checksum. A non-nil
-// key turns the hash into a MAC. The key must between zero and 64 bytes long.
-func New256(key []byte) (hash.Hash, error) { return newDigest(Size256, key) }
-
-func newDigest(hashSize int, key []byte) (*digest, error) {
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	d := &digest{
-		size:   hashSize,
-		keyLen: len(key),
-	}
-	copy(d.key[:], key)
-	d.Reset()
-	return d, nil
-}
-
-func checkSum(sum *[Size]byte, hashSize int, data []byte) {
-	h := iv
-	h[0] ^= uint64(hashSize) | (1 << 16) | (1 << 24)
-	var c [2]uint64
-
-	if length := len(data); length > BlockSize {
-		n := length &^ (BlockSize - 1)
-		if length == n {
-			n -= BlockSize
-		}
-		hashBlocks(&h, &c, 0, data[:n])
-		data = data[n:]
-	}
-
-	var block [BlockSize]byte
-	offset := copy(block[:], data)
-	remaining := uint64(BlockSize - offset)
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	hashBlocks(&h, &c, 0xFFFFFFFFFFFFFFFF, block[:])
-
-	for i, v := range h[:(hashSize+7)/8] {
-		binary.LittleEndian.PutUint64(sum[8*i:], v)
-	}
-}
-
-type digest struct {
-	h      [8]uint64
-	c      [2]uint64
-	size   int
-	block  [BlockSize]byte
-	offset int
-
-	key    [BlockSize]byte
-	keyLen int
-}
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Size() int { return d.size }
-
-func (d *digest) Reset() {
-	d.h = iv
-	d.h[0] ^= uint64(d.size) | (uint64(d.keyLen) << 8) | (1 << 16) | (1 << 24)
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	if d.keyLen > 0 {
-		d.block = d.key
-		d.offset = BlockSize
-	}
-}
-
-func (d *digest) Write(p []byte) (n int, err error) {
-	n = len(p)
-
-	if d.offset > 0 {
-		remaining := BlockSize - d.offset
-		if n <= remaining {
-			d.offset += copy(d.block[d.offset:], p)
-			return
-		}
-		copy(d.block[d.offset:], p[:remaining])
-		hashBlocks(&d.h, &d.c, 0, d.block[:])
-		d.offset = 0
-		p = p[remaining:]
-	}
-
-	if length := len(p); length > BlockSize {
-		nn := length &^ (BlockSize - 1)
-		if length == nn {
-			nn -= BlockSize
-		}
-		hashBlocks(&d.h, &d.c, 0, p[:nn])
-		p = p[nn:]
-	}
-
-	if len(p) > 0 {
-		d.offset += copy(d.block[:], p)
-	}
-
-	return
-}
-
-func (d *digest) Sum(sum []byte) []byte {
-	var hash [Size]byte
-	d.finalize(&hash)
-	return append(sum, hash[:d.size]...)
-}
-
-func (d *digest) finalize(hash *[Size]byte) {
-	var block [BlockSize]byte
-	copy(block[:], d.block[:d.offset])
-	remaining := uint64(BlockSize - d.offset)
-
-	c := d.c
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	h := d.h
-	hashBlocks(&h, &c, 0xFFFFFFFFFFFFFFFF, block[:])
-
-	for i, v := range h {
-		binary.LittleEndian.PutUint64(hash[8*i:], v)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
deleted file mode 100644
index 8c41cf6c79..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7,amd64,!gccgo,!appengine
-
-package blake2b
-
-func init() {
-	useAVX2 = supportsAVX2()
-	useAVX = supportsAVX()
-	useSSE4 = supportsSSE4()
-}
-
-//go:noescape
-func supportsSSE4() bool
-
-//go:noescape
-func supportsAVX() bool
-
-//go:noescape
-func supportsAVX2() bool
-
-//go:noescape
-func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-//go:noescape
-func hashBlocksAVX(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-//go:noescape
-func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-func hashBlocks(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	if useAVX2 {
-		hashBlocksAVX2(h, c, flag, blocks)
-	} else if useAVX {
-		hashBlocksAVX(h, c, flag, blocks)
-	} else if useSSE4 {
-		hashBlocksSSE4(h, c, flag, blocks)
-	} else {
-		hashBlocksGeneric(h, c, flag, blocks)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s b/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
deleted file mode 100644
index 784bce6a9c..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2bAVX2_amd64.s
+++ /dev/null
@@ -1,762 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7,amd64,!gccgo,!appengine
-
-#include "textflag.h"
-
-DATA ·AVX2_iv0<>+0x00(SB)/8, $0x6a09e667f3bcc908
-DATA ·AVX2_iv0<>+0x08(SB)/8, $0xbb67ae8584caa73b
-DATA ·AVX2_iv0<>+0x10(SB)/8, $0x3c6ef372fe94f82b
-DATA ·AVX2_iv0<>+0x18(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·AVX2_iv0<>(SB), (NOPTR+RODATA), $32
-
-DATA ·AVX2_iv1<>+0x00(SB)/8, $0x510e527fade682d1
-DATA ·AVX2_iv1<>+0x08(SB)/8, $0x9b05688c2b3e6c1f
-DATA ·AVX2_iv1<>+0x10(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·AVX2_iv1<>+0x18(SB)/8, $0x5be0cd19137e2179
-GLOBL ·AVX2_iv1<>(SB), (NOPTR+RODATA), $32
-
-DATA ·AVX2_c40<>+0x00(SB)/8, $0x0201000706050403
-DATA ·AVX2_c40<>+0x08(SB)/8, $0x0a09080f0e0d0c0b
-DATA ·AVX2_c40<>+0x10(SB)/8, $0x0201000706050403
-DATA ·AVX2_c40<>+0x18(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·AVX2_c40<>(SB), (NOPTR+RODATA), $32
-
-DATA ·AVX2_c48<>+0x00(SB)/8, $0x0100070605040302
-DATA ·AVX2_c48<>+0x08(SB)/8, $0x09080f0e0d0c0b0a
-DATA ·AVX2_c48<>+0x10(SB)/8, $0x0100070605040302
-DATA ·AVX2_c48<>+0x18(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·AVX2_c48<>(SB), (NOPTR+RODATA), $32
-
-DATA ·AVX_iv0<>+0x00(SB)/8, $0x6a09e667f3bcc908
-DATA ·AVX_iv0<>+0x08(SB)/8, $0xbb67ae8584caa73b
-GLOBL ·AVX_iv0<>(SB), (NOPTR+RODATA), $16
-
-DATA ·AVX_iv1<>+0x00(SB)/8, $0x3c6ef372fe94f82b
-DATA ·AVX_iv1<>+0x08(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·AVX_iv1<>(SB), (NOPTR+RODATA), $16
-
-DATA ·AVX_iv2<>+0x00(SB)/8, $0x510e527fade682d1
-DATA ·AVX_iv2<>+0x08(SB)/8, $0x9b05688c2b3e6c1f
-GLOBL ·AVX_iv2<>(SB), (NOPTR+RODATA), $16
-
-DATA ·AVX_iv3<>+0x00(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·AVX_iv3<>+0x08(SB)/8, $0x5be0cd19137e2179
-GLOBL ·AVX_iv3<>(SB), (NOPTR+RODATA), $16
-
-DATA ·AVX_c40<>+0x00(SB)/8, $0x0201000706050403
-DATA ·AVX_c40<>+0x08(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·AVX_c40<>(SB), (NOPTR+RODATA), $16
-
-DATA ·AVX_c48<>+0x00(SB)/8, $0x0100070605040302
-DATA ·AVX_c48<>+0x08(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·AVX_c48<>(SB), (NOPTR+RODATA), $16
-
-#define VPERMQ_0x39_Y1_Y1 BYTE $0xc4; BYTE $0xe3; BYTE $0xfd; BYTE $0x00; BYTE $0xc9; BYTE $0x39
-#define VPERMQ_0x93_Y1_Y1 BYTE $0xc4; BYTE $0xe3; BYTE $0xfd; BYTE $0x00; BYTE $0xc9; BYTE $0x93
-#define VPERMQ_0x4E_Y2_Y2 BYTE $0xc4; BYTE $0xe3; BYTE $0xfd; BYTE $0x00; BYTE $0xd2; BYTE $0x4e
-#define VPERMQ_0x93_Y3_Y3 BYTE $0xc4; BYTE $0xe3; BYTE $0xfd; BYTE $0x00; BYTE $0xdb; BYTE $0x93
-#define VPERMQ_0x39_Y3_Y3 BYTE $0xc4; BYTE $0xe3; BYTE $0xfd; BYTE $0x00; BYTE $0xdb; BYTE $0x39
-
-#define ROUND_AVX2(m0, m1, m2, m3, t, c40, c48) \
-	VPADDQ  m0, Y0, Y0;   \
-	VPADDQ  Y1, Y0, Y0;   \
-	VPXOR   Y0, Y3, Y3;   \
-	VPSHUFD $-79, Y3, Y3; \
-	VPADDQ  Y3, Y2, Y2;   \
-	VPXOR   Y2, Y1, Y1;   \
-	VPSHUFB c40, Y1, Y1;  \
-	VPADDQ  m1, Y0, Y0;   \
-	VPADDQ  Y1, Y0, Y0;   \
-	VPXOR   Y0, Y3, Y3;   \
-	VPSHUFB c48, Y3, Y3;  \
-	VPADDQ  Y3, Y2, Y2;   \
-	VPXOR   Y2, Y1, Y1;   \
-	VPADDQ  Y1, Y1, t;    \
-	VPSRLQ  $63, Y1, Y1;  \
-	VPXOR   t, Y1, Y1;    \
-	VPERMQ_0x39_Y1_Y1;    \
-	VPERMQ_0x4E_Y2_Y2;    \
-	VPERMQ_0x93_Y3_Y3;    \
-	VPADDQ  m2, Y0, Y0;   \
-	VPADDQ  Y1, Y0, Y0;   \
-	VPXOR   Y0, Y3, Y3;   \
-	VPSHUFD $-79, Y3, Y3; \
-	VPADDQ  Y3, Y2, Y2;   \
-	VPXOR   Y2, Y1, Y1;   \
-	VPSHUFB c40, Y1, Y1;  \
-	VPADDQ  m3, Y0, Y0;   \
-	VPADDQ  Y1, Y0, Y0;   \
-	VPXOR   Y0, Y3, Y3;   \
-	VPSHUFB c48, Y3, Y3;  \
-	VPADDQ  Y3, Y2, Y2;   \
-	VPXOR   Y2, Y1, Y1;   \
-	VPADDQ  Y1, Y1, t;    \
-	VPSRLQ  $63, Y1, Y1;  \
-	VPXOR   t, Y1, Y1;    \
-	VPERMQ_0x39_Y3_Y3;    \
-	VPERMQ_0x4E_Y2_Y2;    \
-	VPERMQ_0x93_Y1_Y1
-
-#define VMOVQ_SI_X11_0 BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x1E
-#define VMOVQ_SI_X12_0 BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x26
-#define VMOVQ_SI_X13_0 BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x2E
-#define VMOVQ_SI_X14_0 BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x36
-#define VMOVQ_SI_X15_0 BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x3E
-
-#define VMOVQ_SI_X11(n) BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x5E; BYTE $n
-#define VMOVQ_SI_X12(n) BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x66; BYTE $n
-#define VMOVQ_SI_X13(n) BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x6E; BYTE $n
-#define VMOVQ_SI_X14(n) BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x76; BYTE $n
-#define VMOVQ_SI_X15(n) BYTE $0xC5; BYTE $0x7A; BYTE $0x7E; BYTE $0x7E; BYTE $n
-
-#define VPINSRQ_1_SI_X11_0 BYTE $0xC4; BYTE $0x63; BYTE $0xA1; BYTE $0x22; BYTE $0x1E; BYTE $0x01
-#define VPINSRQ_1_SI_X12_0 BYTE $0xC4; BYTE $0x63; BYTE $0x99; BYTE $0x22; BYTE $0x26; BYTE $0x01
-#define VPINSRQ_1_SI_X13_0 BYTE $0xC4; BYTE $0x63; BYTE $0x91; BYTE $0x22; BYTE $0x2E; BYTE $0x01
-#define VPINSRQ_1_SI_X14_0 BYTE $0xC4; BYTE $0x63; BYTE $0x89; BYTE $0x22; BYTE $0x36; BYTE $0x01
-#define VPINSRQ_1_SI_X15_0 BYTE $0xC4; BYTE $0x63; BYTE $0x81; BYTE $0x22; BYTE $0x3E; BYTE $0x01
-
-#define VPINSRQ_1_SI_X11(n) BYTE $0xC4; BYTE $0x63; BYTE $0xA1; BYTE $0x22; BYTE $0x5E; BYTE $n; BYTE $0x01
-#define VPINSRQ_1_SI_X12(n) BYTE $0xC4; BYTE $0x63; BYTE $0x99; BYTE $0x22; BYTE $0x66; BYTE $n; BYTE $0x01
-#define VPINSRQ_1_SI_X13(n) BYTE $0xC4; BYTE $0x63; BYTE $0x91; BYTE $0x22; BYTE $0x6E; BYTE $n; BYTE $0x01
-#define VPINSRQ_1_SI_X14(n) BYTE $0xC4; BYTE $0x63; BYTE $0x89; BYTE $0x22; BYTE $0x76; BYTE $n; BYTE $0x01
-#define VPINSRQ_1_SI_X15(n) BYTE $0xC4; BYTE $0x63; BYTE $0x81; BYTE $0x22; BYTE $0x7E; BYTE $n; BYTE $0x01
-
-#define VMOVQ_R8_X15 BYTE $0xC4; BYTE $0x41; BYTE $0xF9; BYTE $0x6E; BYTE $0xF8
-#define VPINSRQ_1_R9_X15 BYTE $0xC4; BYTE $0x43; BYTE $0x81; BYTE $0x22; BYTE $0xF9; BYTE $0x01
-
-// load msg: Y12 = (i0, i1, i2, i3)
-// i0, i1, i2, i3 must not be 0
-#define LOAD_MSG_AVX2_Y12(i0, i1, i2, i3) \
-	VMOVQ_SI_X12(i0*8);           \
-	VMOVQ_SI_X11(i2*8);           \
-	VPINSRQ_1_SI_X12(i1*8);       \
-	VPINSRQ_1_SI_X11(i3*8);       \
-	VINSERTI128 $1, X11, Y12, Y12
-
-// load msg: Y13 = (i0, i1, i2, i3)
-// i0, i1, i2, i3 must not be 0
-#define LOAD_MSG_AVX2_Y13(i0, i1, i2, i3) \
-	VMOVQ_SI_X13(i0*8);           \
-	VMOVQ_SI_X11(i2*8);           \
-	VPINSRQ_1_SI_X13(i1*8);       \
-	VPINSRQ_1_SI_X11(i3*8);       \
-	VINSERTI128 $1, X11, Y13, Y13
-
-// load msg: Y14 = (i0, i1, i2, i3)
-// i0, i1, i2, i3 must not be 0
-#define LOAD_MSG_AVX2_Y14(i0, i1, i2, i3) \
-	VMOVQ_SI_X14(i0*8);           \
-	VMOVQ_SI_X11(i2*8);           \
-	VPINSRQ_1_SI_X14(i1*8);       \
-	VPINSRQ_1_SI_X11(i3*8);       \
-	VINSERTI128 $1, X11, Y14, Y14
-
-// load msg: Y15 = (i0, i1, i2, i3)
-// i0, i1, i2, i3 must not be 0
-#define LOAD_MSG_AVX2_Y15(i0, i1, i2, i3) \
-	VMOVQ_SI_X15(i0*8);           \
-	VMOVQ_SI_X11(i2*8);           \
-	VPINSRQ_1_SI_X15(i1*8);       \
-	VPINSRQ_1_SI_X11(i3*8);       \
-	VINSERTI128 $1, X11, Y15, Y15
-
-#define LOAD_MSG_AVX2_0_2_4_6_1_3_5_7_8_10_12_14_9_11_13_15() \
-	VMOVQ_SI_X12_0;                   \
-	VMOVQ_SI_X11(4*8);                \
-	VPINSRQ_1_SI_X12(2*8);            \
-	VPINSRQ_1_SI_X11(6*8);            \
-	VINSERTI128 $1, X11, Y12, Y12;    \
-	LOAD_MSG_AVX2_Y13(1, 3, 5, 7);    \
-	LOAD_MSG_AVX2_Y14(8, 10, 12, 14); \
-	LOAD_MSG_AVX2_Y15(9, 11, 13, 15)
-
-#define LOAD_MSG_AVX2_14_4_9_13_10_8_15_6_1_0_11_5_12_2_7_3() \
-	LOAD_MSG_AVX2_Y12(14, 4, 9, 13); \
-	LOAD_MSG_AVX2_Y13(10, 8, 15, 6); \
-	VMOVQ_SI_X11(11*8);              \
-	VPSHUFD     $0x4E, 0*8(SI), X14; \
-	VPINSRQ_1_SI_X11(5*8);           \
-	VINSERTI128 $1, X11, Y14, Y14;   \
-	LOAD_MSG_AVX2_Y15(12, 2, 7, 3)
-
-#define LOAD_MSG_AVX2_11_12_5_15_8_0_2_13_10_3_7_9_14_6_1_4() \
-	VMOVQ_SI_X11(5*8);              \
-	VMOVDQU     11*8(SI), X12;      \
-	VPINSRQ_1_SI_X11(15*8);         \
-	VINSERTI128 $1, X11, Y12, Y12;  \
-	VMOVQ_SI_X13(8*8);              \
-	VMOVQ_SI_X11(2*8);              \
-	VPINSRQ_1_SI_X13_0;             \
-	VPINSRQ_1_SI_X11(13*8);         \
-	VINSERTI128 $1, X11, Y13, Y13;  \
-	LOAD_MSG_AVX2_Y14(10, 3, 7, 9); \
-	LOAD_MSG_AVX2_Y15(14, 6, 1, 4)
-
-#define LOAD_MSG_AVX2_7_3_13_11_9_1_12_14_2_5_4_15_6_10_0_8() \
-	LOAD_MSG_AVX2_Y12(7, 3, 13, 11); \
-	LOAD_MSG_AVX2_Y13(9, 1, 12, 14); \
-	LOAD_MSG_AVX2_Y14(2, 5, 4, 15);  \
-	VMOVQ_SI_X15(6*8);               \
-	VMOVQ_SI_X11_0;                  \
-	VPINSRQ_1_SI_X15(10*8);          \
-	VPINSRQ_1_SI_X11(8*8);           \
-	VINSERTI128 $1, X11, Y15, Y15
-
-#define LOAD_MSG_AVX2_9_5_2_10_0_7_4_15_14_11_6_3_1_12_8_13() \
-	LOAD_MSG_AVX2_Y12(9, 5, 2, 10);  \
-	VMOVQ_SI_X13_0;                  \
-	VMOVQ_SI_X11(4*8);               \
-	VPINSRQ_1_SI_X13(7*8);           \
-	VPINSRQ_1_SI_X11(15*8);          \
-	VINSERTI128 $1, X11, Y13, Y13;   \
-	LOAD_MSG_AVX2_Y14(14, 11, 6, 3); \
-	LOAD_MSG_AVX2_Y15(1, 12, 8, 13)
-
-#define LOAD_MSG_AVX2_2_6_0_8_12_10_11_3_4_7_15_1_13_5_14_9() \
-	VMOVQ_SI_X12(2*8);                \
-	VMOVQ_SI_X11_0;                   \
-	VPINSRQ_1_SI_X12(6*8);            \
-	VPINSRQ_1_SI_X11(8*8);            \
-	VINSERTI128 $1, X11, Y12, Y12;    \
-	LOAD_MSG_AVX2_Y13(12, 10, 11, 3); \
-	LOAD_MSG_AVX2_Y14(4, 7, 15, 1);   \
-	LOAD_MSG_AVX2_Y15(13, 5, 14, 9)
-
-#define LOAD_MSG_AVX2_12_1_14_4_5_15_13_10_0_6_9_8_7_3_2_11() \
-	LOAD_MSG_AVX2_Y12(12, 1, 14, 4);  \
-	LOAD_MSG_AVX2_Y13(5, 15, 13, 10); \
-	VMOVQ_SI_X14_0;                   \
-	VPSHUFD     $0x4E, 8*8(SI), X11;  \
-	VPINSRQ_1_SI_X14(6*8);            \
-	VINSERTI128 $1, X11, Y14, Y14;    \
-	LOAD_MSG_AVX2_Y15(7, 3, 2, 11)
-
-#define LOAD_MSG_AVX2_13_7_12_3_11_14_1_9_5_15_8_2_0_4_6_10() \
-	LOAD_MSG_AVX2_Y12(13, 7, 12, 3); \
-	LOAD_MSG_AVX2_Y13(11, 14, 1, 9); \
-	LOAD_MSG_AVX2_Y14(5, 15, 8, 2);  \
-	VMOVQ_SI_X15_0;                  \
-	VMOVQ_SI_X11(6*8);               \
-	VPINSRQ_1_SI_X15(4*8);           \
-	VPINSRQ_1_SI_X11(10*8);          \
-	VINSERTI128 $1, X11, Y15, Y15
-
-#define LOAD_MSG_AVX2_6_14_11_0_15_9_3_8_12_13_1_10_2_7_4_5() \
-	VMOVQ_SI_X12(6*8);              \
-	VMOVQ_SI_X11(11*8);             \
-	VPINSRQ_1_SI_X12(14*8);         \
-	VPINSRQ_1_SI_X11_0;             \
-	VINSERTI128 $1, X11, Y12, Y12;  \
-	LOAD_MSG_AVX2_Y13(15, 9, 3, 8); \
-	VMOVQ_SI_X11(1*8);              \
-	VMOVDQU     12*8(SI), X14;      \
-	VPINSRQ_1_SI_X11(10*8);         \
-	VINSERTI128 $1, X11, Y14, Y14;  \
-	VMOVQ_SI_X15(2*8);              \
-	VMOVDQU     4*8(SI), X11;       \
-	VPINSRQ_1_SI_X15(7*8);          \
-	VINSERTI128 $1, X11, Y15, Y15
-
-#define LOAD_MSG_AVX2_10_8_7_1_2_4_6_5_15_9_3_13_11_14_12_0() \
-	LOAD_MSG_AVX2_Y12(10, 8, 7, 1);  \
-	VMOVQ_SI_X13(2*8);               \
-	VPSHUFD     $0x4E, 5*8(SI), X11; \
-	VPINSRQ_1_SI_X13(4*8);           \
-	VINSERTI128 $1, X11, Y13, Y13;   \
-	LOAD_MSG_AVX2_Y14(15, 9, 3, 13); \
-	VMOVQ_SI_X15(11*8);              \
-	VMOVQ_SI_X11(12*8);              \
-	VPINSRQ_1_SI_X15(14*8);          \
-	VPINSRQ_1_SI_X11_0;              \
-	VINSERTI128 $1, X11, Y15, Y15
-
-// func hashBlocksAVX2(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-TEXT ·hashBlocksAVX2(SB), 4, $320-48 // frame size = 288 + 32 byte alignment
-	MOVQ h+0(FP), AX
-	MOVQ c+8(FP), BX
-	MOVQ flag+16(FP), CX
-	MOVQ blocks_base+24(FP), SI
-	MOVQ blocks_len+32(FP), DI
-
-	MOVQ SP, DX
-	MOVQ SP, R9
-	ADDQ $31, R9
-	ANDQ $~31, R9
-	MOVQ R9, SP
-
-	MOVQ CX, 16(SP)
-	XORQ CX, CX
-	MOVQ CX, 24(SP)
-
-	VMOVDQU ·AVX2_c40<>(SB), Y4
-	VMOVDQU ·AVX2_c48<>(SB), Y5
-
-	VMOVDQU 0(AX), Y8
-	VMOVDQU 32(AX), Y9
-	VMOVDQU ·AVX2_iv0<>(SB), Y6
-	VMOVDQU ·AVX2_iv1<>(SB), Y7
-
-	MOVQ 0(BX), R8
-	MOVQ 8(BX), R9
-	MOVQ R9, 8(SP)
-
-loop:
-	ADDQ $128, R8
-	MOVQ R8, 0(SP)
-	CMPQ R8, $128
-	JGE  noinc
-	INCQ R9
-	MOVQ R9, 8(SP)
-
-noinc:
-	VMOVDQA Y8, Y0
-	VMOVDQA Y9, Y1
-	VMOVDQA Y6, Y2
-	VPXOR   0(SP), Y7, Y3
-
-	LOAD_MSG_AVX2_0_2_4_6_1_3_5_7_8_10_12_14_9_11_13_15()
-	VMOVDQA Y12, 32(SP)
-	VMOVDQA Y13, 64(SP)
-	VMOVDQA Y14, 96(SP)
-	VMOVDQA Y15, 128(SP)
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_14_4_9_13_10_8_15_6_1_0_11_5_12_2_7_3()
-	VMOVDQA Y12, 160(SP)
-	VMOVDQA Y13, 192(SP)
-	VMOVDQA Y14, 224(SP)
-	VMOVDQA Y15, 256(SP)
-
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_11_12_5_15_8_0_2_13_10_3_7_9_14_6_1_4()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_7_3_13_11_9_1_12_14_2_5_4_15_6_10_0_8()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_9_5_2_10_0_7_4_15_14_11_6_3_1_12_8_13()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_2_6_0_8_12_10_11_3_4_7_15_1_13_5_14_9()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_12_1_14_4_5_15_13_10_0_6_9_8_7_3_2_11()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_13_7_12_3_11_14_1_9_5_15_8_2_0_4_6_10()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_6_14_11_0_15_9_3_8_12_13_1_10_2_7_4_5()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-	LOAD_MSG_AVX2_10_8_7_1_2_4_6_5_15_9_3_13_11_14_12_0()
-	ROUND_AVX2(Y12, Y13, Y14, Y15, Y10, Y4, Y5)
-
-	ROUND_AVX2(32(SP), 64(SP), 96(SP), 128(SP), Y10, Y4, Y5)
-	ROUND_AVX2(160(SP), 192(SP), 224(SP), 256(SP), Y10, Y4, Y5)
-
-	VPXOR Y0, Y8, Y8
-	VPXOR Y1, Y9, Y9
-	VPXOR Y2, Y8, Y8
-	VPXOR Y3, Y9, Y9
-
-	LEAQ 128(SI), SI
-	SUBQ $128, DI
-	JNE  loop
-
-	MOVQ R8, 0(BX)
-	MOVQ R9, 8(BX)
-
-	VMOVDQU Y8, 0(AX)
-	VMOVDQU Y9, 32(AX)
-	VZEROUPPER
-
-	MOVQ DX, SP
-	RET
-
-#define VPUNPCKLQDQ_X2_X2_X15 BYTE $0xC5; BYTE $0x69; BYTE $0x6C; BYTE $0xFA
-#define VPUNPCKLQDQ_X3_X3_X15 BYTE $0xC5; BYTE $0x61; BYTE $0x6C; BYTE $0xFB
-#define VPUNPCKLQDQ_X7_X7_X15 BYTE $0xC5; BYTE $0x41; BYTE $0x6C; BYTE $0xFF
-#define VPUNPCKLQDQ_X13_X13_X15 BYTE $0xC4; BYTE $0x41; BYTE $0x11; BYTE $0x6C; BYTE $0xFD
-#define VPUNPCKLQDQ_X14_X14_X15 BYTE $0xC4; BYTE $0x41; BYTE $0x09; BYTE $0x6C; BYTE $0xFE
-
-#define VPUNPCKHQDQ_X15_X2_X2 BYTE $0xC4; BYTE $0xC1; BYTE $0x69; BYTE $0x6D; BYTE $0xD7
-#define VPUNPCKHQDQ_X15_X3_X3 BYTE $0xC4; BYTE $0xC1; BYTE $0x61; BYTE $0x6D; BYTE $0xDF
-#define VPUNPCKHQDQ_X15_X6_X6 BYTE $0xC4; BYTE $0xC1; BYTE $0x49; BYTE $0x6D; BYTE $0xF7
-#define VPUNPCKHQDQ_X15_X7_X7 BYTE $0xC4; BYTE $0xC1; BYTE $0x41; BYTE $0x6D; BYTE $0xFF
-#define VPUNPCKHQDQ_X15_X3_X2 BYTE $0xC4; BYTE $0xC1; BYTE $0x61; BYTE $0x6D; BYTE $0xD7
-#define VPUNPCKHQDQ_X15_X7_X6 BYTE $0xC4; BYTE $0xC1; BYTE $0x41; BYTE $0x6D; BYTE $0xF7
-#define VPUNPCKHQDQ_X15_X13_X3 BYTE $0xC4; BYTE $0xC1; BYTE $0x11; BYTE $0x6D; BYTE $0xDF
-#define VPUNPCKHQDQ_X15_X13_X7 BYTE $0xC4; BYTE $0xC1; BYTE $0x11; BYTE $0x6D; BYTE $0xFF
-
-#define SHUFFLE_AVX() \
-	VMOVDQA X6, X13;         \
-	VMOVDQA X2, X14;         \
-	VMOVDQA X4, X6;          \
-	VPUNPCKLQDQ_X13_X13_X15; \
-	VMOVDQA X5, X4;          \
-	VMOVDQA X6, X5;          \
-	VPUNPCKHQDQ_X15_X7_X6;   \
-	VPUNPCKLQDQ_X7_X7_X15;   \
-	VPUNPCKHQDQ_X15_X13_X7;  \
-	VPUNPCKLQDQ_X3_X3_X15;   \
-	VPUNPCKHQDQ_X15_X2_X2;   \
-	VPUNPCKLQDQ_X14_X14_X15; \
-	VPUNPCKHQDQ_X15_X3_X3;   \
-
-#define SHUFFLE_AVX_INV() \
-	VMOVDQA X2, X13;         \
-	VMOVDQA X4, X14;         \
-	VPUNPCKLQDQ_X2_X2_X15;   \
-	VMOVDQA X5, X4;          \
-	VPUNPCKHQDQ_X15_X3_X2;   \
-	VMOVDQA X14, X5;         \
-	VPUNPCKLQDQ_X3_X3_X15;   \
-	VMOVDQA X6, X14;         \
-	VPUNPCKHQDQ_X15_X13_X3;  \
-	VPUNPCKLQDQ_X7_X7_X15;   \
-	VPUNPCKHQDQ_X15_X6_X6;   \
-	VPUNPCKLQDQ_X14_X14_X15; \
-	VPUNPCKHQDQ_X15_X7_X7;   \
-
-#define HALF_ROUND_AVX(v0, v1, v2, v3, v4, v5, v6, v7, m0, m1, m2, m3, t0, c40, c48) \
-	VPADDQ  m0, v0, v0;   \
-	VPADDQ  v2, v0, v0;   \
-	VPADDQ  m1, v1, v1;   \
-	VPADDQ  v3, v1, v1;   \
-	VPXOR   v0, v6, v6;   \
-	VPXOR   v1, v7, v7;   \
-	VPSHUFD $-79, v6, v6; \
-	VPSHUFD $-79, v7, v7; \
-	VPADDQ  v6, v4, v4;   \
-	VPADDQ  v7, v5, v5;   \
-	VPXOR   v4, v2, v2;   \
-	VPXOR   v5, v3, v3;   \
-	VPSHUFB c40, v2, v2;  \
-	VPSHUFB c40, v3, v3;  \
-	VPADDQ  m2, v0, v0;   \
-	VPADDQ  v2, v0, v0;   \
-	VPADDQ  m3, v1, v1;   \
-	VPADDQ  v3, v1, v1;   \
-	VPXOR   v0, v6, v6;   \
-	VPXOR   v1, v7, v7;   \
-	VPSHUFB c48, v6, v6;  \
-	VPSHUFB c48, v7, v7;  \
-	VPADDQ  v6, v4, v4;   \
-	VPADDQ  v7, v5, v5;   \
-	VPXOR   v4, v2, v2;   \
-	VPXOR   v5, v3, v3;   \
-	VPADDQ  v2, v2, t0;   \
-	VPSRLQ  $63, v2, v2;  \
-	VPXOR   t0, v2, v2;   \
-	VPADDQ  v3, v3, t0;   \
-	VPSRLQ  $63, v3, v3;  \
-	VPXOR   t0, v3, v3
-
-// load msg: X12 = (i0, i1), X13 = (i2, i3), X14 = (i4, i5), X15 = (i6, i7)
-// i0, i1, i2, i3, i4, i5, i6, i7 must not be 0
-#define LOAD_MSG_AVX(i0, i1, i2, i3, i4, i5, i6, i7) \
-	VMOVQ_SI_X12(i0*8);     \
-	VMOVQ_SI_X13(i2*8);     \
-	VMOVQ_SI_X14(i4*8);     \
-	VMOVQ_SI_X15(i6*8);     \
-	VPINSRQ_1_SI_X12(i1*8); \
-	VPINSRQ_1_SI_X13(i3*8); \
-	VPINSRQ_1_SI_X14(i5*8); \
-	VPINSRQ_1_SI_X15(i7*8)
-
-// load msg: X12 = (0, 2), X13 = (4, 6), X14 = (1, 3), X15 = (5, 7)
-#define LOAD_MSG_AVX_0_2_4_6_1_3_5_7() \
-	VMOVQ_SI_X12_0;        \
-	VMOVQ_SI_X13(4*8);     \
-	VMOVQ_SI_X14(1*8);     \
-	VMOVQ_SI_X15(5*8);     \
-	VPINSRQ_1_SI_X12(2*8); \
-	VPINSRQ_1_SI_X13(6*8); \
-	VPINSRQ_1_SI_X14(3*8); \
-	VPINSRQ_1_SI_X15(7*8)
-
-// load msg: X12 = (1, 0), X13 = (11, 5), X14 = (12, 2), X15 = (7, 3)
-#define LOAD_MSG_AVX_1_0_11_5_12_2_7_3() \
-	VPSHUFD $0x4E, 0*8(SI), X12; \
-	VMOVQ_SI_X13(11*8);          \
-	VMOVQ_SI_X14(12*8);          \
-	VMOVQ_SI_X15(7*8);           \
-	VPINSRQ_1_SI_X13(5*8);       \
-	VPINSRQ_1_SI_X14(2*8);       \
-	VPINSRQ_1_SI_X15(3*8)
-
-// load msg: X12 = (11, 12), X13 = (5, 15), X14 = (8, 0), X15 = (2, 13)
-#define LOAD_MSG_AVX_11_12_5_15_8_0_2_13() \
-	VMOVDQU 11*8(SI), X12;  \
-	VMOVQ_SI_X13(5*8);      \
-	VMOVQ_SI_X14(8*8);      \
-	VMOVQ_SI_X15(2*8);      \
-	VPINSRQ_1_SI_X13(15*8); \
-	VPINSRQ_1_SI_X14_0;     \
-	VPINSRQ_1_SI_X15(13*8)
-
-// load msg: X12 = (2, 5), X13 = (4, 15), X14 = (6, 10), X15 = (0, 8)
-#define LOAD_MSG_AVX_2_5_4_15_6_10_0_8() \
-	VMOVQ_SI_X12(2*8);      \
-	VMOVQ_SI_X13(4*8);      \
-	VMOVQ_SI_X14(6*8);      \
-	VMOVQ_SI_X15_0;         \
-	VPINSRQ_1_SI_X12(5*8);  \
-	VPINSRQ_1_SI_X13(15*8); \
-	VPINSRQ_1_SI_X14(10*8); \
-	VPINSRQ_1_SI_X15(8*8)
-
-// load msg: X12 = (9, 5), X13 = (2, 10), X14 = (0, 7), X15 = (4, 15)
-#define LOAD_MSG_AVX_9_5_2_10_0_7_4_15() \
-	VMOVQ_SI_X12(9*8);      \
-	VMOVQ_SI_X13(2*8);      \
-	VMOVQ_SI_X14_0;         \
-	VMOVQ_SI_X15(4*8);      \
-	VPINSRQ_1_SI_X12(5*8);  \
-	VPINSRQ_1_SI_X13(10*8); \
-	VPINSRQ_1_SI_X14(7*8);  \
-	VPINSRQ_1_SI_X15(15*8)
-
-// load msg: X12 = (2, 6), X13 = (0, 8), X14 = (12, 10), X15 = (11, 3)
-#define LOAD_MSG_AVX_2_6_0_8_12_10_11_3() \
-	VMOVQ_SI_X12(2*8);      \
-	VMOVQ_SI_X13_0;         \
-	VMOVQ_SI_X14(12*8);     \
-	VMOVQ_SI_X15(11*8);     \
-	VPINSRQ_1_SI_X12(6*8);  \
-	VPINSRQ_1_SI_X13(8*8);  \
-	VPINSRQ_1_SI_X14(10*8); \
-	VPINSRQ_1_SI_X15(3*8)
-
-// load msg: X12 = (0, 6), X13 = (9, 8), X14 = (7, 3), X15 = (2, 11)
-#define LOAD_MSG_AVX_0_6_9_8_7_3_2_11() \
-	MOVQ    0*8(SI), X12;        \
-	VPSHUFD $0x4E, 8*8(SI), X13; \
-	MOVQ    7*8(SI), X14;        \
-	MOVQ    2*8(SI), X15;        \
-	VPINSRQ_1_SI_X12(6*8);       \
-	VPINSRQ_1_SI_X14(3*8);       \
-	VPINSRQ_1_SI_X15(11*8)
-
-// load msg: X12 = (6, 14), X13 = (11, 0), X14 = (15, 9), X15 = (3, 8)
-#define LOAD_MSG_AVX_6_14_11_0_15_9_3_8() \
-	MOVQ 6*8(SI), X12;      \
-	MOVQ 11*8(SI), X13;     \
-	MOVQ 15*8(SI), X14;     \
-	MOVQ 3*8(SI), X15;      \
-	VPINSRQ_1_SI_X12(14*8); \
-	VPINSRQ_1_SI_X13_0;     \
-	VPINSRQ_1_SI_X14(9*8);  \
-	VPINSRQ_1_SI_X15(8*8)
-
-// load msg: X12 = (5, 15), X13 = (8, 2), X14 = (0, 4), X15 = (6, 10)
-#define LOAD_MSG_AVX_5_15_8_2_0_4_6_10() \
-	MOVQ 5*8(SI), X12;      \
-	MOVQ 8*8(SI), X13;      \
-	MOVQ 0*8(SI), X14;      \
-	MOVQ 6*8(SI), X15;      \
-	VPINSRQ_1_SI_X12(15*8); \
-	VPINSRQ_1_SI_X13(2*8);  \
-	VPINSRQ_1_SI_X14(4*8);  \
-	VPINSRQ_1_SI_X15(10*8)
-
-// load msg: X12 = (12, 13), X13 = (1, 10), X14 = (2, 7), X15 = (4, 5)
-#define LOAD_MSG_AVX_12_13_1_10_2_7_4_5() \
-	VMOVDQU 12*8(SI), X12;  \
-	MOVQ    1*8(SI), X13;   \
-	MOVQ    2*8(SI), X14;   \
-	VPINSRQ_1_SI_X13(10*8); \
-	VPINSRQ_1_SI_X14(7*8);  \
-	VMOVDQU 4*8(SI), X15
-
-// load msg: X12 = (15, 9), X13 = (3, 13), X14 = (11, 14), X15 = (12, 0)
-#define LOAD_MSG_AVX_15_9_3_13_11_14_12_0() \
-	MOVQ 15*8(SI), X12;     \
-	MOVQ 3*8(SI), X13;      \
-	MOVQ 11*8(SI), X14;     \
-	MOVQ 12*8(SI), X15;     \
-	VPINSRQ_1_SI_X12(9*8);  \
-	VPINSRQ_1_SI_X13(13*8); \
-	VPINSRQ_1_SI_X14(14*8); \
-	VPINSRQ_1_SI_X15_0
-
-// func hashBlocksAVX(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-TEXT ·hashBlocksAVX(SB), 4, $288-48 // frame size = 272 + 16 byte alignment
-	MOVQ h+0(FP), AX
-	MOVQ c+8(FP), BX
-	MOVQ flag+16(FP), CX
-	MOVQ blocks_base+24(FP), SI
-	MOVQ blocks_len+32(FP), DI
-
-	MOVQ SP, BP
-	MOVQ SP, R9
-	ADDQ $15, R9
-	ANDQ $~15, R9
-	MOVQ R9, SP
-
-	VMOVDQU ·AVX_c40<>(SB), X0
-	VMOVDQU ·AVX_c48<>(SB), X1
-	VMOVDQA X0, X8
-	VMOVDQA X1, X9
-
-	VMOVDQU ·AVX_iv3<>(SB), X0
-	VMOVDQA X0, 0(SP)
-	XORQ    CX, 0(SP)          // 0(SP) = ·AVX_iv3 ^ (CX || 0)
-
-	VMOVDQU 0(AX), X10
-	VMOVDQU 16(AX), X11
-	VMOVDQU 32(AX), X2
-	VMOVDQU 48(AX), X3
-
-	MOVQ 0(BX), R8
-	MOVQ 8(BX), R9
-
-loop:
-	ADDQ $128, R8
-	CMPQ R8, $128
-	JGE  noinc
-	INCQ R9
-
-noinc:
-	VMOVQ_R8_X15
-	VPINSRQ_1_R9_X15
-
-	VMOVDQA X10, X0
-	VMOVDQA X11, X1
-	VMOVDQU ·AVX_iv0<>(SB), X4
-	VMOVDQU ·AVX_iv1<>(SB), X5
-	VMOVDQU ·AVX_iv2<>(SB), X6
-
-	VPXOR   X15, X6, X6
-	VMOVDQA 0(SP), X7
-
-	LOAD_MSG_AVX_0_2_4_6_1_3_5_7()
-	VMOVDQA X12, 16(SP)
-	VMOVDQA X13, 32(SP)
-	VMOVDQA X14, 48(SP)
-	VMOVDQA X15, 64(SP)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX(8, 10, 12, 14, 9, 11, 13, 15)
-	VMOVDQA X12, 80(SP)
-	VMOVDQA X13, 96(SP)
-	VMOVDQA X14, 112(SP)
-	VMOVDQA X15, 128(SP)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX(14, 4, 9, 13, 10, 8, 15, 6)
-	VMOVDQA X12, 144(SP)
-	VMOVDQA X13, 160(SP)
-	VMOVDQA X14, 176(SP)
-	VMOVDQA X15, 192(SP)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_1_0_11_5_12_2_7_3()
-	VMOVDQA X12, 208(SP)
-	VMOVDQA X13, 224(SP)
-	VMOVDQA X14, 240(SP)
-	VMOVDQA X15, 256(SP)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX_11_12_5_15_8_0_2_13()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX(10, 3, 7, 9, 14, 6, 1, 4)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX(7, 3, 13, 11, 9, 1, 12, 14)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_2_5_4_15_6_10_0_8()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX_9_5_2_10_0_7_4_15()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX(14, 11, 6, 3, 1, 12, 8, 13)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX_2_6_0_8_12_10_11_3()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX(4, 7, 15, 1, 13, 5, 14, 9)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX(12, 1, 14, 4, 5, 15, 13, 10)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_0_6_9_8_7_3_2_11()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX(13, 7, 12, 3, 11, 14, 1, 9)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_5_15_8_2_0_4_6_10()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX_6_14_11_0_15_9_3_8()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_12_13_1_10_2_7_4_5()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	LOAD_MSG_AVX(10, 8, 7, 1, 2, 4, 6, 5)
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX()
-	LOAD_MSG_AVX_15_9_3_13_11_14_12_0()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, X12, X13, X14, X15, X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X15, X8, X9)
-	SHUFFLE_AVX()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, 80(SP), 96(SP), 112(SP), 128(SP), X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, 144(SP), 160(SP), 176(SP), 192(SP), X15, X8, X9)
-	SHUFFLE_AVX()
-	HALF_ROUND_AVX(X0, X1, X2, X3, X4, X5, X6, X7, 208(SP), 224(SP), 240(SP), 256(SP), X15, X8, X9)
-	SHUFFLE_AVX_INV()
-
-	VMOVDQU 32(AX), X14
-	VMOVDQU 48(AX), X15
-	VPXOR   X0, X10, X10
-	VPXOR   X1, X11, X11
-	VPXOR   X2, X14, X14
-	VPXOR   X3, X15, X15
-	VPXOR   X4, X10, X10
-	VPXOR   X5, X11, X11
-	VPXOR   X6, X14, X2
-	VPXOR   X7, X15, X3
-	VMOVDQU X2, 32(AX)
-	VMOVDQU X3, 48(AX)
-
-	LEAQ 128(SI), SI
-	SUBQ $128, DI
-	JNE  loop
-
-	VMOVDQU X10, 0(AX)
-	VMOVDQU X11, 16(AX)
-
-	MOVQ R8, 0(BX)
-	MOVQ R9, 8(BX)
-	VZEROUPPER
-
-	MOVQ BP, SP
-	RET
-
-// func supportsAVX2() bool
-TEXT ·supportsAVX2(SB), 4, $0-1
-	MOVQ runtime·support_avx2(SB), AX
-	MOVB AX, ret+0(FP)
-	RET
-
-// func supportsAVX() bool
-TEXT ·supportsAVX(SB), 4, $0-1
-	MOVQ runtime·support_avx(SB), AX
-	MOVB AX, ret+0(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go
deleted file mode 100644
index 2ab7c30fc2..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7,amd64,!gccgo,!appengine
-
-package blake2b
-
-func init() {
-	useSSE4 = supportsSSE4()
-}
-
-//go:noescape
-func supportsSSE4() bool
-
-//go:noescape
-func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-
-func hashBlocks(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	if useSSE4 {
-		hashBlocksSSE4(h, c, flag, blocks)
-	} else {
-		hashBlocksGeneric(h, c, flag, blocks)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s b/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
deleted file mode 100644
index 64530740b4..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_amd64.s
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!gccgo,!appengine
-
-#include "textflag.h"
-
-DATA ·iv0<>+0x00(SB)/8, $0x6a09e667f3bcc908
-DATA ·iv0<>+0x08(SB)/8, $0xbb67ae8584caa73b
-GLOBL ·iv0<>(SB), (NOPTR+RODATA), $16
-
-DATA ·iv1<>+0x00(SB)/8, $0x3c6ef372fe94f82b
-DATA ·iv1<>+0x08(SB)/8, $0xa54ff53a5f1d36f1
-GLOBL ·iv1<>(SB), (NOPTR+RODATA), $16
-
-DATA ·iv2<>+0x00(SB)/8, $0x510e527fade682d1
-DATA ·iv2<>+0x08(SB)/8, $0x9b05688c2b3e6c1f
-GLOBL ·iv2<>(SB), (NOPTR+RODATA), $16
-
-DATA ·iv3<>+0x00(SB)/8, $0x1f83d9abfb41bd6b
-DATA ·iv3<>+0x08(SB)/8, $0x5be0cd19137e2179
-GLOBL ·iv3<>(SB), (NOPTR+RODATA), $16
-
-DATA ·c40<>+0x00(SB)/8, $0x0201000706050403
-DATA ·c40<>+0x08(SB)/8, $0x0a09080f0e0d0c0b
-GLOBL ·c40<>(SB), (NOPTR+RODATA), $16
-
-DATA ·c48<>+0x00(SB)/8, $0x0100070605040302
-DATA ·c48<>+0x08(SB)/8, $0x09080f0e0d0c0b0a
-GLOBL ·c48<>(SB), (NOPTR+RODATA), $16
-
-#define SHUFFLE(v2, v3, v4, v5, v6, v7, t1, t2) \
-	MOVO       v4, t1; \
-	MOVO       v5, v4; \
-	MOVO       t1, v5; \
-	MOVO       v6, t1; \
-	PUNPCKLQDQ v6, t2; \
-	PUNPCKHQDQ v7, v6; \
-	PUNPCKHQDQ t2, v6; \
-	PUNPCKLQDQ v7, t2; \
-	MOVO       t1, v7; \
-	MOVO       v2, t1; \
-	PUNPCKHQDQ t2, v7; \
-	PUNPCKLQDQ v3, t2; \
-	PUNPCKHQDQ t2, v2; \
-	PUNPCKLQDQ t1, t2; \
-	PUNPCKHQDQ t2, v3
-
-#define SHUFFLE_INV(v2, v3, v4, v5, v6, v7, t1, t2) \
-	MOVO       v4, t1; \
-	MOVO       v5, v4; \
-	MOVO       t1, v5; \
-	MOVO       v2, t1; \
-	PUNPCKLQDQ v2, t2; \
-	PUNPCKHQDQ v3, v2; \
-	PUNPCKHQDQ t2, v2; \
-	PUNPCKLQDQ v3, t2; \
-	MOVO       t1, v3; \
-	MOVO       v6, t1; \
-	PUNPCKHQDQ t2, v3; \
-	PUNPCKLQDQ v7, t2; \
-	PUNPCKHQDQ t2, v6; \
-	PUNPCKLQDQ t1, t2; \
-	PUNPCKHQDQ t2, v7
-
-#define HALF_ROUND(v0, v1, v2, v3, v4, v5, v6, v7, m0, m1, m2, m3, t0, c40, c48) \
-	PADDQ  m0, v0;        \
-	PADDQ  m1, v1;        \
-	PADDQ  v2, v0;        \
-	PADDQ  v3, v1;        \
-	PXOR   v0, v6;        \
-	PXOR   v1, v7;        \
-	PSHUFD $0xB1, v6, v6; \
-	PSHUFD $0xB1, v7, v7; \
-	PADDQ  v6, v4;        \
-	PADDQ  v7, v5;        \
-	PXOR   v4, v2;        \
-	PXOR   v5, v3;        \
-	PSHUFB c40, v2;       \
-	PSHUFB c40, v3;       \
-	PADDQ  m2, v0;        \
-	PADDQ  m3, v1;        \
-	PADDQ  v2, v0;        \
-	PADDQ  v3, v1;        \
-	PXOR   v0, v6;        \
-	PXOR   v1, v7;        \
-	PSHUFB c48, v6;       \
-	PSHUFB c48, v7;       \
-	PADDQ  v6, v4;        \
-	PADDQ  v7, v5;        \
-	PXOR   v4, v2;        \
-	PXOR   v5, v3;        \
-	MOVOU  v2, t0;        \
-	PADDQ  v2, t0;        \
-	PSRLQ  $63, v2;       \
-	PXOR   t0, v2;        \
-	MOVOU  v3, t0;        \
-	PADDQ  v3, t0;        \
-	PSRLQ  $63, v3;       \
-	PXOR   t0, v3
-
-#define LOAD_MSG(m0, m1, m2, m3, src, i0, i1, i2, i3, i4, i5, i6, i7) \
-	MOVQ   i0*8(src), m0;     \
-	PINSRQ $1, i1*8(src), m0; \
-	MOVQ   i2*8(src), m1;     \
-	PINSRQ $1, i3*8(src), m1; \
-	MOVQ   i4*8(src), m2;     \
-	PINSRQ $1, i5*8(src), m2; \
-	MOVQ   i6*8(src), m3;     \
-	PINSRQ $1, i7*8(src), m3
-
-// func hashBlocksSSE4(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte)
-TEXT ·hashBlocksSSE4(SB), 4, $288-48 // frame size = 272 + 16 byte alignment
-	MOVQ h+0(FP), AX
-	MOVQ c+8(FP), BX
-	MOVQ flag+16(FP), CX
-	MOVQ blocks_base+24(FP), SI
-	MOVQ blocks_len+32(FP), DI
-
-	MOVQ SP, BP
-	MOVQ SP, R9
-	ADDQ $15, R9
-	ANDQ $~15, R9
-	MOVQ R9, SP
-
-	MOVOU ·iv3<>(SB), X0
-	MOVO  X0, 0(SP)
-	XORQ  CX, 0(SP)     // 0(SP) = ·iv3 ^ (CX || 0)
-
-	MOVOU ·c40<>(SB), X13
-	MOVOU ·c48<>(SB), X14
-
-	MOVOU 0(AX), X12
-	MOVOU 16(AX), X15
-
-	MOVQ 0(BX), R8
-	MOVQ 8(BX), R9
-
-loop:
-	ADDQ $128, R8
-	CMPQ R8, $128
-	JGE  noinc
-	INCQ R9
-
-noinc:
-	MOVQ R8, X8
-	PINSRQ $1, R9, X8
-
-	MOVO X12, X0
-	MOVO X15, X1
-	MOVOU 32(AX), X2
-	MOVOU 48(AX), X3
-	MOVOU ·iv0<>(SB), X4
-	MOVOU ·iv1<>(SB), X5
-	MOVOU ·iv2<>(SB), X6
-
-	PXOR X8, X6
-	MOVO 0(SP), X7
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 0, 2, 4, 6, 1, 3, 5, 7)
-	MOVO X8, 16(SP)
-	MOVO X9, 32(SP)
-	MOVO X10, 48(SP)
-	MOVO X11, 64(SP)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 8, 10, 12, 14, 9, 11, 13, 15)
-	MOVO X8, 80(SP)
-	MOVO X9, 96(SP)
-	MOVO X10, 112(SP)
-	MOVO X11, 128(SP)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 14, 4, 9, 13, 10, 8, 15, 6)
-	MOVO X8, 144(SP)
-	MOVO X9, 160(SP)
-	MOVO X10, 176(SP)
-	MOVO X11, 192(SP)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 1, 0, 11, 5, 12, 2, 7, 3)
-	MOVO X8, 208(SP)
-	MOVO X9, 224(SP)
-	MOVO X10, 240(SP)
-	MOVO X11, 256(SP)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 11, 12, 5, 15, 8, 0, 2, 13)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 10, 3, 7, 9, 14, 6, 1, 4)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 7, 3, 13, 11, 9, 1, 12, 14)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 2, 5, 4, 15, 6, 10, 0, 8)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 9, 5, 2, 10, 0, 7, 4, 15)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 14, 11, 6, 3, 1, 12, 8, 13)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 2, 6, 0, 8, 12, 10, 11, 3)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 4, 7, 15, 1, 13, 5, 14, 9)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 12, 1, 14, 4, 5, 15, 13, 10)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 0, 6, 9, 8, 7, 3, 2, 11)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 13, 7, 12, 3, 11, 14, 1, 9)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 5, 15, 8, 2, 0, 4, 6, 10)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 6, 14, 11, 0, 15, 9, 3, 8)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 12, 13, 1, 10, 2, 7, 4, 5)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	LOAD_MSG(X8, X9, X10, X11, SI, 10, 8, 7, 1, 2, 4, 6, 5)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	LOAD_MSG(X8, X9, X10, X11, SI, 15, 9, 3, 13, 11, 14, 12, 0)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, X8, X9, X10, X11, X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, 80(SP), 96(SP), 112(SP), 128(SP), X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, 144(SP), 160(SP), 176(SP), 192(SP), X11, X13, X14)
-	SHUFFLE(X2, X3, X4, X5, X6, X7, X8, X9)
-	HALF_ROUND(X0, X1, X2, X3, X4, X5, X6, X7, 208(SP), 224(SP), 240(SP), 256(SP), X11, X13, X14)
-	SHUFFLE_INV(X2, X3, X4, X5, X6, X7, X8, X9)
-
-	MOVOU 32(AX), X10
-	MOVOU 48(AX), X11
-	PXOR  X0, X12
-	PXOR  X1, X15
-	PXOR  X2, X10
-	PXOR  X3, X11
-	PXOR  X4, X12
-	PXOR  X5, X15
-	PXOR  X6, X10
-	PXOR  X7, X11
-	MOVOU X10, 32(AX)
-	MOVOU X11, 48(AX)
-
-	LEAQ 128(SI), SI
-	SUBQ $128, DI
-	JNE  loop
-
-	MOVOU X12, 0(AX)
-	MOVOU X15, 16(AX)
-
-	MOVQ R8, 0(BX)
-	MOVQ R9, 8(BX)
-
-	MOVQ BP, SP
-	RET
-
-// func supportsSSE4() bool
-TEXT ·supportsSSE4(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	SHRL $19, CX  // Bit 19 indicates SSE4 support
-	ANDL $1, CX  // CX != 0 if support SSE4
-	MOVB CX, ret+0(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go
deleted file mode 100644
index 4bd2abc916..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_generic.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import "encoding/binary"
-
-// the precomputed values for BLAKE2b
-// there are 12 16-byte arrays - one for each round
-// the entries are calculated from the sigma constants.
-var precomputed = [12][16]byte{
-	{0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15},
-	{14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3},
-	{11, 12, 5, 15, 8, 0, 2, 13, 10, 3, 7, 9, 14, 6, 1, 4},
-	{7, 3, 13, 11, 9, 1, 12, 14, 2, 5, 4, 15, 6, 10, 0, 8},
-	{9, 5, 2, 10, 0, 7, 4, 15, 14, 11, 6, 3, 1, 12, 8, 13},
-	{2, 6, 0, 8, 12, 10, 11, 3, 4, 7, 15, 1, 13, 5, 14, 9},
-	{12, 1, 14, 4, 5, 15, 13, 10, 0, 6, 9, 8, 7, 3, 2, 11},
-	{13, 7, 12, 3, 11, 14, 1, 9, 5, 15, 8, 2, 0, 4, 6, 10},
-	{6, 14, 11, 0, 15, 9, 3, 8, 12, 13, 1, 10, 2, 7, 4, 5},
-	{10, 8, 7, 1, 2, 4, 6, 5, 15, 9, 3, 13, 11, 14, 12, 0},
-	{0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15}, // equal to the first
-	{14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3}, // equal to the second
-}
-
-func hashBlocksGeneric(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	var m [16]uint64
-	c0, c1 := c[0], c[1]
-
-	for i := 0; i < len(blocks); {
-		c0 += BlockSize
-		if c0 < BlockSize {
-			c1++
-		}
-
-		v0, v1, v2, v3, v4, v5, v6, v7 := h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7]
-		v8, v9, v10, v11, v12, v13, v14, v15 := iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]
-		v12 ^= c0
-		v13 ^= c1
-		v14 ^= flag
-
-		for j := range m {
-			m[j] = binary.LittleEndian.Uint64(blocks[i:])
-			i += 8
-		}
-
-		for j := range precomputed {
-			s := &(precomputed[j])
-
-			v0 += m[s[0]]
-			v0 += v4
-			v12 ^= v0
-			v12 = v12<<(64-32) | v12>>32
-			v8 += v12
-			v4 ^= v8
-			v4 = v4<<(64-24) | v4>>24
-			v1 += m[s[1]]
-			v1 += v5
-			v13 ^= v1
-			v13 = v13<<(64-32) | v13>>32
-			v9 += v13
-			v5 ^= v9
-			v5 = v5<<(64-24) | v5>>24
-			v2 += m[s[2]]
-			v2 += v6
-			v14 ^= v2
-			v14 = v14<<(64-32) | v14>>32
-			v10 += v14
-			v6 ^= v10
-			v6 = v6<<(64-24) | v6>>24
-			v3 += m[s[3]]
-			v3 += v7
-			v15 ^= v3
-			v15 = v15<<(64-32) | v15>>32
-			v11 += v15
-			v7 ^= v11
-			v7 = v7<<(64-24) | v7>>24
-
-			v0 += m[s[4]]
-			v0 += v4
-			v12 ^= v0
-			v12 = v12<<(64-16) | v12>>16
-			v8 += v12
-			v4 ^= v8
-			v4 = v4<<(64-63) | v4>>63
-			v1 += m[s[5]]
-			v1 += v5
-			v13 ^= v1
-			v13 = v13<<(64-16) | v13>>16
-			v9 += v13
-			v5 ^= v9
-			v5 = v5<<(64-63) | v5>>63
-			v2 += m[s[6]]
-			v2 += v6
-			v14 ^= v2
-			v14 = v14<<(64-16) | v14>>16
-			v10 += v14
-			v6 ^= v10
-			v6 = v6<<(64-63) | v6>>63
-			v3 += m[s[7]]
-			v3 += v7
-			v15 ^= v3
-			v15 = v15<<(64-16) | v15>>16
-			v11 += v15
-			v7 ^= v11
-			v7 = v7<<(64-63) | v7>>63
-
-			v0 += m[s[8]]
-			v0 += v5
-			v15 ^= v0
-			v15 = v15<<(64-32) | v15>>32
-			v10 += v15
-			v5 ^= v10
-			v5 = v5<<(64-24) | v5>>24
-			v1 += m[s[9]]
-			v1 += v6
-			v12 ^= v1
-			v12 = v12<<(64-32) | v12>>32
-			v11 += v12
-			v6 ^= v11
-			v6 = v6<<(64-24) | v6>>24
-			v2 += m[s[10]]
-			v2 += v7
-			v13 ^= v2
-			v13 = v13<<(64-32) | v13>>32
-			v8 += v13
-			v7 ^= v8
-			v7 = v7<<(64-24) | v7>>24
-			v3 += m[s[11]]
-			v3 += v4
-			v14 ^= v3
-			v14 = v14<<(64-32) | v14>>32
-			v9 += v14
-			v4 ^= v9
-			v4 = v4<<(64-24) | v4>>24
-
-			v0 += m[s[12]]
-			v0 += v5
-			v15 ^= v0
-			v15 = v15<<(64-16) | v15>>16
-			v10 += v15
-			v5 ^= v10
-			v5 = v5<<(64-63) | v5>>63
-			v1 += m[s[13]]
-			v1 += v6
-			v12 ^= v1
-			v12 = v12<<(64-16) | v12>>16
-			v11 += v12
-			v6 ^= v11
-			v6 = v6<<(64-63) | v6>>63
-			v2 += m[s[14]]
-			v2 += v7
-			v13 ^= v2
-			v13 = v13<<(64-16) | v13>>16
-			v8 += v13
-			v7 ^= v8
-			v7 = v7<<(64-63) | v7>>63
-			v3 += m[s[15]]
-			v3 += v4
-			v14 ^= v3
-			v14 = v14<<(64-16) | v14>>16
-			v9 += v14
-			v4 ^= v9
-			v4 = v4<<(64-63) | v4>>63
-
-		}
-
-		h[0] ^= v0 ^ v8
-		h[1] ^= v1 ^ v9
-		h[2] ^= v2 ^ v10
-		h[3] ^= v3 ^ v11
-		h[4] ^= v4 ^ v12
-		h[5] ^= v5 ^ v13
-		h[6] ^= v6 ^ v14
-		h[7] ^= v7 ^ v15
-	}
-	c[0], c[1] = c0, c1
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go
deleted file mode 100644
index da156a1ba6..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_ref.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64 appengine gccgo
-
-package blake2b
-
-func hashBlocks(h *[8]uint64, c *[2]uint64, flag uint64, blocks []byte) {
-	hashBlocksGeneric(h, c, flag, blocks)
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_test.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2b_test.go
deleted file mode 100644
index 5d68bbf604..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2b_test.go
+++ /dev/null
@@ -1,798 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"hash"
-	"io"
-	"testing"
-)
-
-func fromHex(s string) []byte {
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestHashes(t *testing.T) {
-	defer func(sse4, avx, avx2 bool) {
-		useSSE4, useAVX, useAVX2 = sse4, avx, avx2
-	}(useSSE4, useAVX, useAVX2)
-
-	if useAVX2 {
-		t.Log("AVX2 version")
-		testHashes(t)
-		useAVX2 = false
-	}
-	if useAVX {
-		t.Log("AVX version")
-		testHashes(t)
-		useAVX = false
-	}
-	if useSSE4 {
-		t.Log("SSE4 version")
-		testHashes(t)
-		useSSE4 = false
-	}
-	t.Log("generic version")
-	testHashes(t)
-}
-
-func TestHashes2X(t *testing.T) {
-	defer func(sse4, avx, avx2 bool) {
-		useSSE4, useAVX, useAVX2 = sse4, avx, avx2
-	}(useSSE4, useAVX, useAVX2)
-
-	if useAVX2 {
-		t.Log("AVX2 version")
-		testHashes2X(t)
-		useAVX2 = false
-	}
-	if useAVX {
-		t.Log("AVX version")
-		testHashes2X(t)
-		useAVX = false
-	}
-	if useSSE4 {
-		t.Log("SSE4 version")
-		testHashes2X(t)
-		useSSE4 = false
-	}
-	t.Log("generic version")
-	testHashes2X(t)
-}
-
-func testHashes(t *testing.T) {
-	key, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f")
-
-	input := make([]byte, 255)
-	for i := range input {
-		input[i] = byte(i)
-	}
-
-	for i, expectedHex := range hashes {
-		h, err := New512(key)
-		if err != nil {
-			t.Fatalf("#%d: error from New512: %v", i, err)
-		}
-
-		h.Write(input[:i])
-		sum := h.Sum(nil)
-
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (single write): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(input[j : j+1])
-		}
-
-		sum = h.Sum(sum[:0])
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (byte-by-byte): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-	}
-}
-
-func testHashes2X(t *testing.T) {
-	key, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f")
-
-	input := make([]byte, 256)
-	for i := range input {
-		input[i] = byte(i)
-	}
-
-	for i, expectedHex := range hashes2X {
-		length := uint32(len(expectedHex) / 2)
-		sum := make([]byte, int(length))
-
-		h, err := NewXOF(length, key)
-		if err != nil {
-			t.Fatalf("#%d: error from NewXOF: %v", i, err)
-		}
-
-		if _, err := h.Write(input); err != nil {
-			t.Fatalf("#%d (single write): error from Write: %v", i, err)
-		}
-		if _, err := h.Read(sum); err != nil {
-			t.Fatalf("#%d (single write): error from Read: %v", i, err)
-		}
-		if n, err := h.Read(sum); n != 0 || err != io.EOF {
-			t.Fatalf("#%d (single write): Read did not return (0, io.EOF) after exhaustion, got (%v, %v)", i, n, err)
-		}
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (single write): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-
-		h.Reset()
-		for j := 0; j < len(input); j++ {
-			h.Write(input[j : j+1])
-		}
-		for j := 0; j < len(sum); j++ {
-			h = h.Clone()
-			if _, err := h.Read(sum[j : j+1]); err != nil {
-				t.Fatalf("#%d (byte-by-byte) - Read %d: error from Read: %v", i, j, err)
-			}
-		}
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (byte-by-byte): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-	}
-
-	h, err := NewXOF(OutputLengthUnknown, key)
-	if err != nil {
-		t.Fatalf("#unknown length: error from NewXOF: %v", err)
-	}
-	if _, err := h.Write(input); err != nil {
-		t.Fatalf("#unknown length: error from Write: %v", err)
-	}
-
-	var result [64]byte
-	if n, err := h.Read(result[:]); err != nil {
-		t.Fatalf("#unknown length: error from Read: %v", err)
-	} else if n != len(result) {
-		t.Fatalf("#unknown length: Read returned %d bytes, want %d", n, len(result))
-	}
-
-	const expected = "3dbba8516da76bf7330055c66ea36cf1005e92714262b24d9710f51d9e126406e1bcd6497059f9331f1091c3634b695428d475ed432f987040575520a1c29f5e"
-	if fmt.Sprintf("%x", result) != expected {
-		t.Fatalf("#unknown length: bad result %x, wanted %s", result, expected)
-	}
-}
-
-func generateSequence(out []byte, seed uint32) {
-	a := 0xDEAD4BAD * seed // prime
-	b := uint32(1)
-
-	for i := range out { // fill the buf
-		a, b = b, a+b
-		out[i] = byte(b >> 24)
-	}
-}
-
-func computeMAC(msg []byte, hashSize int, key []byte) (sum []byte) {
-	var h hash.Hash
-	switch hashSize {
-	case Size:
-		h, _ = New512(key)
-	case Size384:
-		h, _ = New384(key)
-	case Size256:
-		h, _ = New256(key)
-	case 20:
-		h, _ = newDigest(20, key)
-	default:
-		panic("unexpected hashSize")
-	}
-
-	h.Write(msg)
-	return h.Sum(sum)
-}
-
-func computeHash(msg []byte, hashSize int) (sum []byte) {
-	switch hashSize {
-	case Size:
-		hash := Sum512(msg)
-		return hash[:]
-	case Size384:
-		hash := Sum384(msg)
-		return hash[:]
-	case Size256:
-		hash := Sum256(msg)
-		return hash[:]
-	case 20:
-		var hash [64]byte
-		checkSum(&hash, 20, msg)
-		return hash[:20]
-	default:
-		panic("unexpected hashSize")
-	}
-}
-
-// Test function from RFC 7693.
-func TestSelfTest(t *testing.T) {
-	hashLens := [4]int{20, 32, 48, 64}
-	msgLens := [6]int{0, 3, 128, 129, 255, 1024}
-
-	msg := make([]byte, 1024)
-	key := make([]byte, 64)
-
-	h, _ := New256(nil)
-	for _, hashSize := range hashLens {
-		for _, msgLength := range msgLens {
-			generateSequence(msg[:msgLength], uint32(msgLength)) // unkeyed hash
-
-			md := computeHash(msg[:msgLength], hashSize)
-			h.Write(md)
-
-			generateSequence(key[:], uint32(hashSize)) // keyed hash
-			md = computeMAC(msg[:msgLength], hashSize, key[:hashSize])
-			h.Write(md)
-		}
-	}
-
-	sum := h.Sum(nil)
-	expected := [32]byte{
-		0xc2, 0x3a, 0x78, 0x00, 0xd9, 0x81, 0x23, 0xbd,
-		0x10, 0xf5, 0x06, 0xc6, 0x1e, 0x29, 0xda, 0x56,
-		0x03, 0xd7, 0x63, 0xb8, 0xbb, 0xad, 0x2e, 0x73,
-		0x7f, 0x5e, 0x76, 0x5a, 0x7b, 0xcc, 0xd4, 0x75,
-	}
-	if !bytes.Equal(sum, expected[:]) {
-		t.Fatalf("got %x, wanted %x", sum, expected)
-	}
-}
-
-// Benchmarks
-
-func benchmarkSum(b *testing.B, size int) {
-	data := make([]byte, size)
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sum512(data)
-	}
-}
-
-func benchmarkWrite(b *testing.B, size int) {
-	data := make([]byte, size)
-	h, _ := New512(nil)
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		h.Write(data)
-	}
-}
-
-func BenchmarkWrite128(b *testing.B) { benchmarkWrite(b, 128) }
-func BenchmarkWrite1K(b *testing.B)  { benchmarkWrite(b, 1024) }
-
-func BenchmarkSum128(b *testing.B) { benchmarkSum(b, 128) }
-func BenchmarkSum1K(b *testing.B)  { benchmarkSum(b, 1024) }
-
-// These values were taken from https://blake2.net/blake2b-test.txt.
-var hashes = []string{
-	"10ebb67700b1868efb4417987acf4690ae9d972fb7a590c2f02871799aaa4786b5e996e8f0f4eb981fc214b005f42d2ff4233499391653df7aefcbc13fc51568",
-	"961f6dd1e4dd30f63901690c512e78e4b45e4742ed197c3c5e45c549fd25f2e4187b0bc9fe30492b16b0d0bc4ef9b0f34c7003fac09a5ef1532e69430234cebd",
-	"da2cfbe2d8409a0f38026113884f84b50156371ae304c4430173d08a99d9fb1b983164a3770706d537f49e0c916d9f32b95cc37a95b99d857436f0232c88a965",
-	"33d0825dddf7ada99b0e7e307104ad07ca9cfd9692214f1561356315e784f3e5a17e364ae9dbb14cb2036df932b77f4b292761365fb328de7afdc6d8998f5fc1",
-	"beaa5a3d08f3807143cf621d95cd690514d0b49efff9c91d24b59241ec0eefa5f60196d407048bba8d2146828ebcb0488d8842fd56bb4f6df8e19c4b4daab8ac",
-	"098084b51fd13deae5f4320de94a688ee07baea2800486689a8636117b46c1f4c1f6af7f74ae7c857600456a58a3af251dc4723a64cc7c0a5ab6d9cac91c20bb",
-	"6044540d560853eb1c57df0077dd381094781cdb9073e5b1b3d3f6c7829e12066bbaca96d989a690de72ca3133a83652ba284a6d62942b271ffa2620c9e75b1f",
-	"7a8cfe9b90f75f7ecb3acc053aaed6193112b6f6a4aeeb3f65d3de541942deb9e2228152a3c4bbbe72fc3b12629528cfbb09fe630f0474339f54abf453e2ed52",
-	"380beaf6ea7cc9365e270ef0e6f3a64fb902acae51dd5512f84259ad2c91f4bc4108db73192a5bbfb0cbcf71e46c3e21aee1c5e860dc96e8eb0b7b8426e6abe9",
-	"60fe3c4535e1b59d9a61ea8500bfac41a69dffb1ceadd9aca323e9a625b64da5763bad7226da02b9c8c4f1a5de140ac5a6c1124e4f718ce0b28ea47393aa6637",
-	"4fe181f54ad63a2983feaaf77d1e7235c2beb17fa328b6d9505bda327df19fc37f02c4b6f0368ce23147313a8e5738b5fa2a95b29de1c7f8264eb77b69f585cd",
-	"f228773ce3f3a42b5f144d63237a72d99693adb8837d0e112a8a0f8ffff2c362857ac49c11ec740d1500749dac9b1f4548108bf3155794dcc9e4082849e2b85b",
-	"962452a8455cc56c8511317e3b1f3b2c37df75f588e94325fdd77070359cf63a9ae6e930936fdf8e1e08ffca440cfb72c28f06d89a2151d1c46cd5b268ef8563",
-	"43d44bfa18768c59896bf7ed1765cb2d14af8c260266039099b25a603e4ddc5039d6ef3a91847d1088d401c0c7e847781a8a590d33a3c6cb4df0fab1c2f22355",
-	"dcffa9d58c2a4ca2cdbb0c7aa4c4c1d45165190089f4e983bb1c2cab4aaeff1fa2b5ee516fecd780540240bf37e56c8bcca7fab980e1e61c9400d8a9a5b14ac6",
-	"6fbf31b45ab0c0b8dad1c0f5f4061379912dde5aa922099a030b725c73346c524291adef89d2f6fd8dfcda6d07dad811a9314536c2915ed45da34947e83de34e",
-	"a0c65bddde8adef57282b04b11e7bc8aab105b99231b750c021f4a735cb1bcfab87553bba3abb0c3e64a0b6955285185a0bd35fb8cfde557329bebb1f629ee93",
-	"f99d815550558e81eca2f96718aed10d86f3f1cfb675cce06b0eff02f617c5a42c5aa760270f2679da2677c5aeb94f1142277f21c7f79f3c4f0cce4ed8ee62b1",
-	"95391da8fc7b917a2044b3d6f5374e1ca072b41454d572c7356c05fd4bc1e0f40b8bb8b4a9f6bce9be2c4623c399b0dca0dab05cb7281b71a21b0ebcd9e55670",
-	"04b9cd3d20d221c09ac86913d3dc63041989a9a1e694f1e639a3ba7e451840f750c2fc191d56ad61f2e7936bc0ac8e094b60caeed878c18799045402d61ceaf9",
-	"ec0e0ef707e4ed6c0c66f9e089e4954b058030d2dd86398fe84059631f9ee591d9d77375355149178c0cf8f8e7c49ed2a5e4f95488a2247067c208510fadc44c",
-	"9a37cce273b79c09913677510eaf7688e89b3314d3532fd2764c39de022a2945b5710d13517af8ddc0316624e73bec1ce67df15228302036f330ab0cb4d218dd",
-	"4cf9bb8fb3d4de8b38b2f262d3c40f46dfe747e8fc0a414c193d9fcf753106ce47a18f172f12e8a2f1c26726545358e5ee28c9e2213a8787aafbc516d2343152",
-	"64e0c63af9c808fd893137129867fd91939d53f2af04be4fa268006100069b2d69daa5c5d8ed7fddcb2a70eeecdf2b105dd46a1e3b7311728f639ab489326bc9",
-	"5e9c93158d659b2def06b0c3c7565045542662d6eee8a96a89b78ade09fe8b3dcc096d4fe48815d88d8f82620156602af541955e1f6ca30dce14e254c326b88f",
-	"7775dff889458dd11aef417276853e21335eb88e4dec9cfb4e9edb49820088551a2ca60339f12066101169f0dfe84b098fddb148d9da6b3d613df263889ad64b",
-	"f0d2805afbb91f743951351a6d024f9353a23c7ce1fc2b051b3a8b968c233f46f50f806ecb1568ffaa0b60661e334b21dde04f8fa155ac740eeb42e20b60d764",
-	"86a2af316e7d7754201b942e275364ac12ea8962ab5bd8d7fb276dc5fbffc8f9a28cae4e4867df6780d9b72524160927c855da5b6078e0b554aa91e31cb9ca1d",
-	"10bdf0caa0802705e706369baf8a3f79d72c0a03a80675a7bbb00be3a45e516424d1ee88efb56f6d5777545ae6e27765c3a8f5e493fc308915638933a1dfee55",
-	"b01781092b1748459e2e4ec178696627bf4ebafebba774ecf018b79a68aeb84917bf0b84bb79d17b743151144cd66b7b33a4b9e52c76c4e112050ff5385b7f0b",
-	"c6dbc61dec6eaeac81e3d5f755203c8e220551534a0b2fd105a91889945a638550204f44093dd998c076205dffad703a0e5cd3c7f438a7e634cd59fededb539e",
-	"eba51acffb4cea31db4b8d87e9bf7dd48fe97b0253ae67aa580f9ac4a9d941f2bea518ee286818cc9f633f2a3b9fb68e594b48cdd6d515bf1d52ba6c85a203a7",
-	"86221f3ada52037b72224f105d7999231c5e5534d03da9d9c0a12acb68460cd375daf8e24386286f9668f72326dbf99ba094392437d398e95bb8161d717f8991",
-	"5595e05c13a7ec4dc8f41fb70cb50a71bce17c024ff6de7af618d0cc4e9c32d9570d6d3ea45b86525491030c0d8f2b1836d5778c1ce735c17707df364d054347",
-	"ce0f4f6aca89590a37fe034dd74dd5fa65eb1cbd0a41508aaddc09351a3cea6d18cb2189c54b700c009f4cbf0521c7ea01be61c5ae09cb54f27bc1b44d658c82",
-	"7ee80b06a215a3bca970c77cda8761822bc103d44fa4b33f4d07dcb997e36d55298bceae12241b3fa07fa63be5576068da387b8d5859aeab701369848b176d42",
-	"940a84b6a84d109aab208c024c6ce9647676ba0aaa11f86dbb7018f9fd2220a6d901a9027f9abcf935372727cbf09ebd61a2a2eeb87653e8ecad1bab85dc8327",
-	"2020b78264a82d9f4151141adba8d44bf20c5ec062eee9b595a11f9e84901bf148f298e0c9f8777dcdbc7cc4670aac356cc2ad8ccb1629f16f6a76bcefbee760",
-	"d1b897b0e075ba68ab572adf9d9c436663e43eb3d8e62d92fc49c9be214e6f27873fe215a65170e6bea902408a25b49506f47babd07cecf7113ec10c5dd31252",
-	"b14d0c62abfa469a357177e594c10c194243ed2025ab8aa5ad2fa41ad318e0ff48cd5e60bec07b13634a711d2326e488a985f31e31153399e73088efc86a5c55",
-	"4169c5cc808d2697dc2a82430dc23e3cd356dc70a94566810502b8d655b39abf9e7f902fe717e0389219859e1945df1af6ada42e4ccda55a197b7100a30c30a1",
-	"258a4edb113d66c839c8b1c91f15f35ade609f11cd7f8681a4045b9fef7b0b24c82cda06a5f2067b368825e3914e53d6948ede92efd6e8387fa2e537239b5bee",
-	"79d2d8696d30f30fb34657761171a11e6c3f1e64cbe7bebee159cb95bfaf812b4f411e2f26d9c421dc2c284a3342d823ec293849e42d1e46b0a4ac1e3c86abaa",
-	"8b9436010dc5dee992ae38aea97f2cd63b946d94fedd2ec9671dcde3bd4ce9564d555c66c15bb2b900df72edb6b891ebcadfeff63c9ea4036a998be7973981e7",
-	"c8f68e696ed28242bf997f5b3b34959508e42d613810f1e2a435c96ed2ff560c7022f361a9234b9837feee90bf47922ee0fd5f8ddf823718d86d1e16c6090071",
-	"b02d3eee4860d5868b2c39ce39bfe81011290564dd678c85e8783f29302dfc1399ba95b6b53cd9ebbf400cca1db0ab67e19a325f2d115812d25d00978ad1bca4",
-	"7693ea73af3ac4dad21ca0d8da85b3118a7d1c6024cfaf557699868217bc0c2f44a199bc6c0edd519798ba05bd5b1b4484346a47c2cadf6bf30b785cc88b2baf",
-	"a0e5c1c0031c02e48b7f09a5e896ee9aef2f17fc9e18e997d7f6cac7ae316422c2b1e77984e5f3a73cb45deed5d3f84600105e6ee38f2d090c7d0442ea34c46d",
-	"41daa6adcfdb69f1440c37b596440165c15ada596813e2e22f060fcd551f24dee8e04ba6890387886ceec4a7a0d7fc6b44506392ec3822c0d8c1acfc7d5aebe8",
-	"14d4d40d5984d84c5cf7523b7798b254e275a3a8cc0a1bd06ebc0bee726856acc3cbf516ff667cda2058ad5c3412254460a82c92187041363cc77a4dc215e487",
-	"d0e7a1e2b9a447fee83e2277e9ff8010c2f375ae12fa7aaa8ca5a6317868a26a367a0b69fbc1cf32a55d34eb370663016f3d2110230eba754028a56f54acf57c",
-	"e771aa8db5a3e043e8178f39a0857ba04a3f18e4aa05743cf8d222b0b095825350ba422f63382a23d92e4149074e816a36c1cd28284d146267940b31f8818ea2",
-	"feb4fd6f9e87a56bef398b3284d2bda5b5b0e166583a66b61e538457ff0584872c21a32962b9928ffab58de4af2edd4e15d8b35570523207ff4e2a5aa7754caa",
-	"462f17bf005fb1c1b9e671779f665209ec2873e3e411f98dabf240a1d5ec3f95ce6796b6fc23fe171903b502023467dec7273ff74879b92967a2a43a5a183d33",
-	"d3338193b64553dbd38d144bea71c5915bb110e2d88180dbc5db364fd6171df317fc7268831b5aef75e4342b2fad8797ba39eddcef80e6ec08159350b1ad696d",
-	"e1590d585a3d39f7cb599abd479070966409a6846d4377acf4471d065d5db94129cc9be92573b05ed226be1e9b7cb0cabe87918589f80dadd4ef5ef25a93d28e",
-	"f8f3726ac5a26cc80132493a6fedcb0e60760c09cfc84cad178175986819665e76842d7b9fedf76dddebf5d3f56faaad4477587af21606d396ae570d8e719af2",
-	"30186055c07949948183c850e9a756cc09937e247d9d928e869e20bafc3cd9721719d34e04a0899b92c736084550186886efba2e790d8be6ebf040b209c439a4",
-	"f3c4276cb863637712c241c444c5cc1e3554e0fddb174d035819dd83eb700b4ce88df3ab3841ba02085e1a99b4e17310c5341075c0458ba376c95a6818fbb3e2",
-	"0aa007c4dd9d5832393040a1583c930bca7dc5e77ea53add7e2b3f7c8e231368043520d4a3ef53c969b6bbfd025946f632bd7f765d53c21003b8f983f75e2a6a",
-	"08e9464720533b23a04ec24f7ae8c103145f765387d738777d3d343477fd1c58db052142cab754ea674378e18766c53542f71970171cc4f81694246b717d7564",
-	"d37ff7ad297993e7ec21e0f1b4b5ae719cdc83c5db687527f27516cbffa822888a6810ee5c1ca7bfe3321119be1ab7bfa0a502671c8329494df7ad6f522d440f",
-	"dd9042f6e464dcf86b1262f6accfafbd8cfd902ed3ed89abf78ffa482dbdeeb6969842394c9a1168ae3d481a017842f660002d42447c6b22f7b72f21aae021c9",
-	"bd965bf31e87d70327536f2a341cebc4768eca275fa05ef98f7f1b71a0351298de006fba73fe6733ed01d75801b4a928e54231b38e38c562b2e33ea1284992fa",
-	"65676d800617972fbd87e4b9514e1c67402b7a331096d3bfac22f1abb95374abc942f16e9ab0ead33b87c91968a6e509e119ff07787b3ef483e1dcdccf6e3022",
-	"939fa189699c5d2c81ddd1ffc1fa207c970b6a3685bb29ce1d3e99d42f2f7442da53e95a72907314f4588399a3ff5b0a92beb3f6be2694f9f86ecf2952d5b41c",
-	"c516541701863f91005f314108ceece3c643e04fc8c42fd2ff556220e616aaa6a48aeb97a84bad74782e8dff96a1a2fa949339d722edcaa32b57067041df88cc",
-	"987fd6e0d6857c553eaebb3d34970a2c2f6e89a3548f492521722b80a1c21a153892346d2cba6444212d56da9a26e324dccbc0dcde85d4d2ee4399eec5a64e8f",
-	"ae56deb1c2328d9c4017706bce6e99d41349053ba9d336d677c4c27d9fd50ae6aee17e853154e1f4fe7672346da2eaa31eea53fcf24a22804f11d03da6abfc2b",
-	"49d6a608c9bde4491870498572ac31aac3fa40938b38a7818f72383eb040ad39532bc06571e13d767e6945ab77c0bdc3b0284253343f9f6c1244ebf2ff0df866",
-	"da582ad8c5370b4469af862aa6467a2293b2b28bd80ae0e91f425ad3d47249fdf98825cc86f14028c3308c9804c78bfeeeee461444ce243687e1a50522456a1d",
-	"d5266aa3331194aef852eed86d7b5b2633a0af1c735906f2e13279f14931a9fc3b0eac5ce9245273bd1aa92905abe16278ef7efd47694789a7283b77da3c70f8",
-	"2962734c28252186a9a1111c732ad4de4506d4b4480916303eb7991d659ccda07a9911914bc75c418ab7a4541757ad054796e26797feaf36e9f6ad43f14b35a4",
-	"e8b79ec5d06e111bdfafd71e9f5760f00ac8ac5d8bf768f9ff6f08b8f026096b1cc3a4c973333019f1e3553e77da3f98cb9f542e0a90e5f8a940cc58e59844b3",
-	"dfb320c44f9d41d1efdcc015f08dd5539e526e39c87d509ae6812a969e5431bf4fa7d91ffd03b981e0d544cf72d7b1c0374f8801482e6dea2ef903877eba675e",
-	"d88675118fdb55a5fb365ac2af1d217bf526ce1ee9c94b2f0090b2c58a06ca58187d7fe57c7bed9d26fca067b4110eefcd9a0a345de872abe20de368001b0745",
-	"b893f2fc41f7b0dd6e2f6aa2e0370c0cff7df09e3acfcc0e920b6e6fad0ef747c40668417d342b80d2351e8c175f20897a062e9765e6c67b539b6ba8b9170545",
-	"6c67ec5697accd235c59b486d7b70baeedcbd4aa64ebd4eef3c7eac189561a726250aec4d48cadcafbbe2ce3c16ce2d691a8cce06e8879556d4483ed7165c063",
-	"f1aa2b044f8f0c638a3f362e677b5d891d6fd2ab0765f6ee1e4987de057ead357883d9b405b9d609eea1b869d97fb16d9b51017c553f3b93c0a1e0f1296fedcd",
-	"cbaa259572d4aebfc1917acddc582b9f8dfaa928a198ca7acd0f2aa76a134a90252e6298a65b08186a350d5b7626699f8cb721a3ea5921b753ae3a2dce24ba3a",
-	"fa1549c9796cd4d303dcf452c1fbd5744fd9b9b47003d920b92de34839d07ef2a29ded68f6fc9e6c45e071a2e48bd50c5084e96b657dd0404045a1ddefe282ed",
-	"5cf2ac897ab444dcb5c8d87c495dbdb34e1838b6b629427caa51702ad0f9688525f13bec503a3c3a2c80a65e0b5715e8afab00ffa56ec455a49a1ad30aa24fcd",
-	"9aaf80207bace17bb7ab145757d5696bde32406ef22b44292ef65d4519c3bb2ad41a59b62cc3e94b6fa96d32a7faadae28af7d35097219aa3fd8cda31e40c275",
-	"af88b163402c86745cb650c2988fb95211b94b03ef290eed9662034241fd51cf398f8073e369354c43eae1052f9b63b08191caa138aa54fea889cc7024236897",
-	"48fa7d64e1ceee27b9864db5ada4b53d00c9bc7626555813d3cd6730ab3cc06ff342d727905e33171bde6e8476e77fb1720861e94b73a2c538d254746285f430",
-	"0e6fd97a85e904f87bfe85bbeb34f69e1f18105cf4ed4f87aec36c6e8b5f68bd2a6f3dc8a9ecb2b61db4eedb6b2ea10bf9cb0251fb0f8b344abf7f366b6de5ab",
-	"06622da5787176287fdc8fed440bad187d830099c94e6d04c8e9c954cda70c8bb9e1fc4a6d0baa831b9b78ef6648681a4867a11da93ee36e5e6a37d87fc63f6f",
-	"1da6772b58fabf9c61f68d412c82f182c0236d7d575ef0b58dd22458d643cd1dfc93b03871c316d8430d312995d4197f0874c99172ba004a01ee295abac24e46",
-	"3cd2d9320b7b1d5fb9aab951a76023fa667be14a9124e394513918a3f44096ae4904ba0ffc150b63bc7ab1eeb9a6e257e5c8f000a70394a5afd842715de15f29",
-	"04cdc14f7434e0b4be70cb41db4c779a88eaef6accebcb41f2d42fffe7f32a8e281b5c103a27021d0d08362250753cdf70292195a53a48728ceb5844c2d98bab",
-	"9071b7a8a075d0095b8fb3ae5113785735ab98e2b52faf91d5b89e44aac5b5d4ebbf91223b0ff4c71905da55342e64655d6ef8c89a4768c3f93a6dc0366b5bc8",
-	"ebb30240dd96c7bc8d0abe49aa4edcbb4afdc51ff9aaf720d3f9e7fbb0f9c6d6571350501769fc4ebd0b2141247ff400d4fd4be414edf37757bb90a32ac5c65a",
-	"8532c58bf3c8015d9d1cbe00eef1f5082f8f3632fbe9f1ed4f9dfb1fa79e8283066d77c44c4af943d76b300364aecbd0648c8a8939bd204123f4b56260422dec",
-	"fe9846d64f7c7708696f840e2d76cb4408b6595c2f81ec6a28a7f2f20cb88cfe6ac0b9e9b8244f08bd7095c350c1d0842f64fb01bb7f532dfcd47371b0aeeb79",
-	"28f17ea6fb6c42092dc264257e29746321fb5bdaea9873c2a7fa9d8f53818e899e161bc77dfe8090afd82bf2266c5c1bc930a8d1547624439e662ef695f26f24",
-	"ec6b7d7f030d4850acae3cb615c21dd25206d63e84d1db8d957370737ba0e98467ea0ce274c66199901eaec18a08525715f53bfdb0aacb613d342ebdceeddc3b",
-	"b403d3691c03b0d3418df327d5860d34bbfcc4519bfbce36bf33b208385fadb9186bc78a76c489d89fd57e7dc75412d23bcd1dae8470ce9274754bb8585b13c5",
-	"31fc79738b8772b3f55cd8178813b3b52d0db5a419d30ba9495c4b9da0219fac6df8e7c23a811551a62b827f256ecdb8124ac8a6792ccfecc3b3012722e94463",
-	"bb2039ec287091bcc9642fc90049e73732e02e577e2862b32216ae9bedcd730c4c284ef3968c368b7d37584f97bd4b4dc6ef6127acfe2e6ae2509124e66c8af4",
-	"f53d68d13f45edfcb9bd415e2831e938350d5380d3432278fc1c0c381fcb7c65c82dafe051d8c8b0d44e0974a0e59ec7bf7ed0459f86e96f329fc79752510fd3",
-	"8d568c7984f0ecdf7640fbc483b5d8c9f86634f6f43291841b309a350ab9c1137d24066b09da9944bac54d5bb6580d836047aac74ab724b887ebf93d4b32eca9",
-	"c0b65ce5a96ff774c456cac3b5f2c4cd359b4ff53ef93a3da0778be4900d1e8da1601e769e8f1b02d2a2f8c5b9fa10b44f1c186985468feeb008730283a6657d",
-	"4900bba6f5fb103ece8ec96ada13a5c3c85488e05551da6b6b33d988e611ec0fe2e3c2aa48ea6ae8986a3a231b223c5d27cec2eadde91ce07981ee652862d1e4",
-	"c7f5c37c7285f927f76443414d4357ff789647d7a005a5a787e03c346b57f49f21b64fa9cf4b7e45573e23049017567121a9c3d4b2b73ec5e9413577525db45a",
-	"ec7096330736fdb2d64b5653e7475da746c23a4613a82687a28062d3236364284ac01720ffb406cfe265c0df626a188c9e5963ace5d3d5bb363e32c38c2190a6",
-	"82e744c75f4649ec52b80771a77d475a3bc091989556960e276a5f9ead92a03f718742cdcfeaee5cb85c44af198adc43a4a428f5f0c2ddb0be36059f06d7df73",
-	"2834b7a7170f1f5b68559ab78c1050ec21c919740b784a9072f6e5d69f828d70c919c5039fb148e39e2c8a52118378b064ca8d5001cd10a5478387b966715ed6",
-	"16b4ada883f72f853bb7ef253efcab0c3e2161687ad61543a0d2824f91c1f81347d86be709b16996e17f2dd486927b0288ad38d13063c4a9672c39397d3789b6",
-	"78d048f3a69d8b54ae0ed63a573ae350d89f7c6cf1f3688930de899afa037697629b314e5cd303aa62feea72a25bf42b304b6c6bcb27fae21c16d925e1fbdac3",
-	"0f746a48749287ada77a82961f05a4da4abdb7d77b1220f836d09ec814359c0ec0239b8c7b9ff9e02f569d1b301ef67c4612d1de4f730f81c12c40cc063c5caa",
-	"f0fc859d3bd195fbdc2d591e4cdac15179ec0f1dc821c11df1f0c1d26e6260aaa65b79fafacafd7d3ad61e600f250905f5878c87452897647a35b995bcadc3a3",
-	"2620f687e8625f6a412460b42e2cef67634208ce10a0cbd4dff7044a41b7880077e9f8dc3b8d1216d3376a21e015b58fb279b521d83f9388c7382c8505590b9b",
-	"227e3aed8d2cb10b918fcb04f9de3e6d0a57e08476d93759cd7b2ed54a1cbf0239c528fb04bbf288253e601d3bc38b21794afef90b17094a182cac557745e75f",
-	"1a929901b09c25f27d6b35be7b2f1c4745131fdebca7f3e2451926720434e0db6e74fd693ad29b777dc3355c592a361c4873b01133a57c2e3b7075cbdb86f4fc",
-	"5fd7968bc2fe34f220b5e3dc5af9571742d73b7d60819f2888b629072b96a9d8ab2d91b82d0a9aaba61bbd39958132fcc4257023d1eca591b3054e2dc81c8200",
-	"dfcce8cf32870cc6a503eadafc87fd6f78918b9b4d0737db6810be996b5497e7e5cc80e312f61e71ff3e9624436073156403f735f56b0b01845c18f6caf772e6",
-	"02f7ef3a9ce0fff960f67032b296efca3061f4934d690749f2d01c35c81c14f39a67fa350bc8a0359bf1724bffc3bca6d7c7bba4791fd522a3ad353c02ec5aa8",
-	"64be5c6aba65d594844ae78bb022e5bebe127fd6b6ffa5a13703855ab63b624dcd1a363f99203f632ec386f3ea767fc992e8ed9686586aa27555a8599d5b808f",
-	"f78585505c4eaa54a8b5be70a61e735e0ff97af944ddb3001e35d86c4e2199d976104b6ae31750a36a726ed285064f5981b503889fef822fcdc2898dddb7889a",
-	"e4b5566033869572edfd87479a5bb73c80e8759b91232879d96b1dda36c012076ee5a2ed7ae2de63ef8406a06aea82c188031b560beafb583fb3de9e57952a7e",
-	"e1b3e7ed867f6c9484a2a97f7715f25e25294e992e41f6a7c161ffc2adc6daaeb7113102d5e6090287fe6ad94ce5d6b739c6ca240b05c76fb73f25dd024bf935",
-	"85fd085fdc12a080983df07bd7012b0d402a0f4043fcb2775adf0bad174f9b08d1676e476985785c0a5dcc41dbff6d95ef4d66a3fbdc4a74b82ba52da0512b74",
-	"aed8fa764b0fbff821e05233d2f7b0900ec44d826f95e93c343c1bc3ba5a24374b1d616e7e7aba453a0ada5e4fab5382409e0d42ce9c2bc7fb39a99c340c20f0",
-	"7ba3b2e297233522eeb343bd3ebcfd835a04007735e87f0ca300cbee6d416565162171581e4020ff4cf176450f1291ea2285cb9ebffe4c56660627685145051c",
-	"de748bcf89ec88084721e16b85f30adb1a6134d664b5843569babc5bbd1a15ca9b61803c901a4fef32965a1749c9f3a4e243e173939dc5a8dc495c671ab52145",
-	"aaf4d2bdf200a919706d9842dce16c98140d34bc433df320aba9bd429e549aa7a3397652a4d768277786cf993cde2338673ed2e6b66c961fefb82cd20c93338f",
-	"c408218968b788bf864f0997e6bc4c3dba68b276e2125a4843296052ff93bf5767b8cdce7131f0876430c1165fec6c4f47adaa4fd8bcfacef463b5d3d0fa61a0",
-	"76d2d819c92bce55fa8e092ab1bf9b9eab237a25267986cacf2b8ee14d214d730dc9a5aa2d7b596e86a1fd8fa0804c77402d2fcd45083688b218b1cdfa0dcbcb",
-	"72065ee4dd91c2d8509fa1fc28a37c7fc9fa7d5b3f8ad3d0d7a25626b57b1b44788d4caf806290425f9890a3a2a35a905ab4b37acfd0da6e4517b2525c9651e4",
-	"64475dfe7600d7171bea0b394e27c9b00d8e74dd1e416a79473682ad3dfdbb706631558055cfc8a40e07bd015a4540dcdea15883cbbf31412df1de1cd4152b91",
-	"12cd1674a4488a5d7c2b3160d2e2c4b58371bedad793418d6f19c6ee385d70b3e06739369d4df910edb0b0a54cbff43d54544cd37ab3a06cfa0a3ddac8b66c89",
-	"60756966479dedc6dd4bcff8ea7d1d4ce4d4af2e7b097e32e3763518441147cc12b3c0ee6d2ecabf1198cec92e86a3616fba4f4e872f5825330adbb4c1dee444",
-	"a7803bcb71bc1d0f4383dde1e0612e04f872b715ad30815c2249cf34abb8b024915cb2fc9f4e7cc4c8cfd45be2d5a91eab0941c7d270e2da4ca4a9f7ac68663a",
-	"b84ef6a7229a34a750d9a98ee2529871816b87fbe3bc45b45fa5ae82d5141540211165c3c5d7a7476ba5a4aa06d66476f0d9dc49a3f1ee72c3acabd498967414",
-	"fae4b6d8efc3f8c8e64d001dabec3a21f544e82714745251b2b4b393f2f43e0da3d403c64db95a2cb6e23ebb7b9e94cdd5ddac54f07c4a61bd3cb10aa6f93b49",
-	"34f7286605a122369540141ded79b8957255da2d4155abbf5a8dbb89c8eb7ede8eeef1daa46dc29d751d045dc3b1d658bb64b80ff8589eddb3824b13da235a6b",
-	"3b3b48434be27b9eababba43bf6b35f14b30f6a88dc2e750c358470d6b3aa3c18e47db4017fa55106d8252f016371a00f5f8b070b74ba5f23cffc5511c9f09f0",
-	"ba289ebd6562c48c3e10a8ad6ce02e73433d1e93d7c9279d4d60a7e879ee11f441a000f48ed9f7c4ed87a45136d7dccdca482109c78a51062b3ba4044ada2469",
-	"022939e2386c5a37049856c850a2bb10a13dfea4212b4c732a8840a9ffa5faf54875c5448816b2785a007da8a8d2bc7d71a54e4e6571f10b600cbdb25d13ede3",
-	"e6fec19d89ce8717b1a087024670fe026f6c7cbda11caef959bb2d351bf856f8055d1c0ebdaaa9d1b17886fc2c562b5e99642fc064710c0d3488a02b5ed7f6fd",
-	"94c96f02a8f576aca32ba61c2b206f907285d9299b83ac175c209a8d43d53bfe683dd1d83e7549cb906c28f59ab7c46f8751366a28c39dd5fe2693c9019666c8",
-	"31a0cd215ebd2cb61de5b9edc91e6195e31c59a5648d5c9f737e125b2605708f2e325ab3381c8dce1a3e958886f1ecdc60318f882cfe20a24191352e617b0f21",
-	"91ab504a522dce78779f4c6c6ba2e6b6db5565c76d3e7e7c920caf7f757ef9db7c8fcf10e57f03379ea9bf75eb59895d96e149800b6aae01db778bb90afbc989",
-	"d85cabc6bd5b1a01a5afd8c6734740da9fd1c1acc6db29bfc8a2e5b668b028b6b3154bfb8703fa3180251d589ad38040ceb707c4bad1b5343cb426b61eaa49c1",
-	"d62efbec2ca9c1f8bd66ce8b3f6a898cb3f7566ba6568c618ad1feb2b65b76c3ce1dd20f7395372faf28427f61c9278049cf0140df434f5633048c86b81e0399",
-	"7c8fdc6175439e2c3db15bafa7fb06143a6a23bc90f449e79deef73c3d492a671715c193b6fea9f036050b946069856b897e08c00768f5ee5ddcf70b7cd6d0e0",
-	"58602ee7468e6bc9df21bd51b23c005f72d6cb013f0a1b48cbec5eca299299f97f09f54a9a01483eaeb315a6478bad37ba47ca1347c7c8fc9e6695592c91d723",
-	"27f5b79ed256b050993d793496edf4807c1d85a7b0a67c9c4fa99860750b0ae66989670a8ffd7856d7ce411599e58c4d77b232a62bef64d15275be46a68235ff",
-	"3957a976b9f1887bf004a8dca942c92d2b37ea52600f25e0c9bc5707d0279c00c6e85a839b0d2d8eb59c51d94788ebe62474a791cadf52cccf20f5070b6573fc",
-	"eaa2376d55380bf772ecca9cb0aa4668c95c707162fa86d518c8ce0ca9bf7362b9f2a0adc3ff59922df921b94567e81e452f6c1a07fc817cebe99604b3505d38",
-	"c1e2c78b6b2734e2480ec550434cb5d613111adcc21d475545c3b1b7e6ff12444476e5c055132e2229dc0f807044bb919b1a5662dd38a9ee65e243a3911aed1a",
-	"8ab48713389dd0fcf9f965d3ce66b1e559a1f8c58741d67683cd971354f452e62d0207a65e436c5d5d8f8ee71c6abfe50e669004c302b31a7ea8311d4a916051",
-	"24ce0addaa4c65038bd1b1c0f1452a0b128777aabc94a29df2fd6c7e2f85f8ab9ac7eff516b0e0a825c84a24cfe492eaad0a6308e46dd42fe8333ab971bb30ca",
-	"5154f929ee03045b6b0c0004fa778edee1d139893267cc84825ad7b36c63de32798e4a166d24686561354f63b00709a1364b3c241de3febf0754045897467cd4",
-	"e74e907920fd87bd5ad636dd11085e50ee70459c443e1ce5809af2bc2eba39f9e6d7128e0e3712c316da06f4705d78a4838e28121d4344a2c79c5e0db307a677",
-	"bf91a22334bac20f3fd80663b3cd06c4e8802f30e6b59f90d3035cc9798a217ed5a31abbda7fa6842827bdf2a7a1c21f6fcfccbb54c6c52926f32da816269be1",
-	"d9d5c74be5121b0bd742f26bffb8c89f89171f3f934913492b0903c271bbe2b3395ef259669bef43b57f7fcc3027db01823f6baee66e4f9fead4d6726c741fce",
-	"50c8b8cf34cd879f80e2faab3230b0c0e1cc3e9dcadeb1b9d97ab923415dd9a1fe38addd5c11756c67990b256e95ad6d8f9fedce10bf1c90679cde0ecf1be347",
-	"0a386e7cd5dd9b77a035e09fe6fee2c8ce61b5383c87ea43205059c5e4cd4f4408319bb0a82360f6a58e6c9ce3f487c446063bf813bc6ba535e17fc1826cfc91",
-	"1f1459cb6b61cbac5f0efe8fc487538f42548987fcd56221cfa7beb22504769e792c45adfb1d6b3d60d7b749c8a75b0bdf14e8ea721b95dca538ca6e25711209",
-	"e58b3836b7d8fedbb50ca5725c6571e74c0785e97821dab8b6298c10e4c079d4a6cdf22f0fedb55032925c16748115f01a105e77e00cee3d07924dc0d8f90659",
-	"b929cc6505f020158672deda56d0db081a2ee34c00c1100029bdf8ea98034fa4bf3e8655ec697fe36f40553c5bb46801644a627d3342f4fc92b61f03290fb381",
-	"72d353994b49d3e03153929a1e4d4f188ee58ab9e72ee8e512f29bc773913819ce057ddd7002c0433ee0a16114e3d156dd2c4a7e80ee53378b8670f23e33ef56",
-	"c70ef9bfd775d408176737a0736d68517ce1aaad7e81a93c8c1ed967ea214f56c8a377b1763e676615b60f3988241eae6eab9685a5124929d28188f29eab06f7",
-	"c230f0802679cb33822ef8b3b21bf7a9a28942092901d7dac3760300831026cf354c9232df3e084d9903130c601f63c1f4a4a4b8106e468cd443bbe5a734f45f",
-	"6f43094cafb5ebf1f7a4937ec50f56a4c9da303cbb55ac1f27f1f1976cd96beda9464f0e7b9c54620b8a9fba983164b8be3578425a024f5fe199c36356b88972",
-	"3745273f4c38225db2337381871a0c6aafd3af9b018c88aa02025850a5dc3a42a1a3e03e56cbf1b0876d63a441f1d2856a39b8801eb5af325201c415d65e97fe",
-	"c50c44cca3ec3edaae779a7e179450ebdda2f97067c690aa6c5a4ac7c30139bb27c0df4db3220e63cb110d64f37ffe078db72653e2daacf93ae3f0a2d1a7eb2e",
-	"8aef263e385cbc61e19b28914243262af5afe8726af3ce39a79c27028cf3ecd3f8d2dfd9cfc9ad91b58f6f20778fd5f02894a3d91c7d57d1e4b866a7f364b6be",
-	"28696141de6e2d9bcb3235578a66166c1448d3e905a1b482d423be4bc5369bc8c74dae0acc9cc123e1d8ddce9f97917e8c019c552da32d39d2219b9abf0fa8c8",
-	"2fb9eb2085830181903a9dafe3db428ee15be7662224efd643371fb25646aee716e531eca69b2bdc8233f1a8081fa43da1500302975a77f42fa592136710e9dc",
-	"66f9a7143f7a3314a669bf2e24bbb35014261d639f495b6c9c1f104fe8e320aca60d4550d69d52edbd5a3cdeb4014ae65b1d87aa770b69ae5c15f4330b0b0ad8",
-	"f4c4dd1d594c3565e3e25ca43dad82f62abea4835ed4cd811bcd975e46279828d44d4c62c3679f1b7f7b9dd4571d7b49557347b8c5460cbdc1bef690fb2a08c0",
-	"8f1dc9649c3a84551f8f6e91cac68242a43b1f8f328ee92280257387fa7559aa6db12e4aeadc2d26099178749c6864b357f3f83b2fb3efa8d2a8db056bed6bcc",
-	"3139c1a7f97afd1675d460ebbc07f2728aa150df849624511ee04b743ba0a833092f18c12dc91b4dd243f333402f59fe28abdbbbae301e7b659c7a26d5c0f979",
-	"06f94a2996158a819fe34c40de3cf0379fd9fb85b3e363ba3926a0e7d960e3f4c2e0c70c7ce0ccb2a64fc29869f6e7ab12bd4d3f14fce943279027e785fb5c29",
-	"c29c399ef3eee8961e87565c1ce263925fc3d0ce267d13e48dd9e732ee67b0f69fad56401b0f10fcaac119201046cca28c5b14abdea3212ae65562f7f138db3d",
-	"4cec4c9df52eef05c3f6faaa9791bc7445937183224ecc37a1e58d0132d35617531d7e795f52af7b1eb9d147de1292d345fe341823f8e6bc1e5badca5c656108",
-	"898bfbae93b3e18d00697eab7d9704fa36ec339d076131cefdf30edbe8d9cc81c3a80b129659b163a323bab9793d4feed92d54dae966c77529764a09be88db45",
-	"ee9bd0469d3aaf4f14035be48a2c3b84d9b4b1fff1d945e1f1c1d38980a951be197b25fe22c731f20aeacc930ba9c4a1f4762227617ad350fdabb4e80273a0f4",
-	"3d4d3113300581cd96acbf091c3d0f3c310138cd6979e6026cde623e2dd1b24d4a8638bed1073344783ad0649cc6305ccec04beb49f31c633088a99b65130267",
-	"95c0591ad91f921ac7be6d9ce37e0663ed8011c1cfd6d0162a5572e94368bac02024485e6a39854aa46fe38e97d6c6b1947cd272d86b06bb5b2f78b9b68d559d",
-	"227b79ded368153bf46c0a3ca978bfdbef31f3024a5665842468490b0ff748ae04e7832ed4c9f49de9b1706709d623e5c8c15e3caecae8d5e433430ff72f20eb",
-	"5d34f3952f0105eef88ae8b64c6ce95ebfade0e02c69b08762a8712d2e4911ad3f941fc4034dc9b2e479fdbcd279b902faf5d838bb2e0c6495d372b5b7029813",
-	"7f939bf8353abce49e77f14f3750af20b7b03902e1a1e7fb6aaf76d0259cd401a83190f15640e74f3e6c5a90e839c7821f6474757f75c7bf9002084ddc7a62dc",
-	"062b61a2f9a33a71d7d0a06119644c70b0716a504de7e5e1be49bd7b86e7ed6817714f9f0fc313d06129597e9a2235ec8521de36f7290a90ccfc1ffa6d0aee29",
-	"f29e01eeae64311eb7f1c6422f946bf7bea36379523e7b2bbaba7d1d34a22d5ea5f1c5a09d5ce1fe682cced9a4798d1a05b46cd72dff5c1b355440b2a2d476bc",
-	"ec38cd3bbab3ef35d7cb6d5c914298351d8a9dc97fcee051a8a02f58e3ed6184d0b7810a5615411ab1b95209c3c810114fdeb22452084e77f3f847c6dbaafe16",
-	"c2aef5e0ca43e82641565b8cb943aa8ba53550caef793b6532fafad94b816082f0113a3ea2f63608ab40437ecc0f0229cb8fa224dcf1c478a67d9b64162b92d1",
-	"15f534efff7105cd1c254d074e27d5898b89313b7d366dc2d7d87113fa7d53aae13f6dba487ad8103d5e854c91fdb6e1e74b2ef6d1431769c30767dde067a35c",
-	"89acbca0b169897a0a2714c2df8c95b5b79cb69390142b7d6018bb3e3076b099b79a964152a9d912b1b86412b7e372e9cecad7f25d4cbab8a317be36492a67d7",
-	"e3c0739190ed849c9c962fd9dbb55e207e624fcac1eb417691515499eea8d8267b7e8f1287a63633af5011fde8c4ddf55bfdf722edf88831414f2cfaed59cb9a",
-	"8d6cf87c08380d2d1506eee46fd4222d21d8c04e585fbfd08269c98f702833a156326a0724656400ee09351d57b440175e2a5de93cc5f80db6daf83576cf75fa",
-	"da24bede383666d563eeed37f6319baf20d5c75d1635a6ba5ef4cfa1ac95487e96f8c08af600aab87c986ebad49fc70a58b4890b9c876e091016daf49e1d322e",
-	"f9d1d1b1e87ea7ae753a029750cc1cf3d0157d41805e245c5617bb934e732f0ae3180b78e05bfe76c7c3051e3e3ac78b9b50c05142657e1e03215d6ec7bfd0fc",
-	"11b7bc1668032048aa43343de476395e814bbbc223678db951a1b03a021efac948cfbe215f97fe9a72a2f6bc039e3956bfa417c1a9f10d6d7ba5d3d32ff323e5",
-	"b8d9000e4fc2b066edb91afee8e7eb0f24e3a201db8b6793c0608581e628ed0bcc4e5aa6787992a4bcc44e288093e63ee83abd0bc3ec6d0934a674a4da13838a",
-	"ce325e294f9b6719d6b61278276ae06a2564c03bb0b783fafe785bdf89c7d5acd83e78756d301b445699024eaeb77b54d477336ec2a4f332f2b3f88765ddb0c3",
-	"29acc30e9603ae2fccf90bf97e6cc463ebe28c1b2f9b4b765e70537c25c702a29dcbfbf14c99c54345ba2b51f17b77b5f15db92bbad8fa95c471f5d070a137cc",
-	"3379cbaae562a87b4c0425550ffdd6bfe1203f0d666cc7ea095be407a5dfe61ee91441cd5154b3e53b4f5fb31ad4c7a9ad5c7af4ae679aa51a54003a54ca6b2d",
-	"3095a349d245708c7cf550118703d7302c27b60af5d4e67fc978f8a4e60953c7a04f92fcf41aee64321ccb707a895851552b1e37b00bc5e6b72fa5bcef9e3fff",
-	"07262d738b09321f4dbccec4bb26f48cb0f0ed246ce0b31b9a6e7bc683049f1f3e5545f28ce932dd985c5ab0f43bd6de0770560af329065ed2e49d34624c2cbb",
-	"b6405eca8ee3316c87061cc6ec18dba53e6c250c63ba1f3bae9e55dd3498036af08cd272aa24d713c6020d77ab2f3919af1a32f307420618ab97e73953994fb4",
-	"7ee682f63148ee45f6e5315da81e5c6e557c2c34641fc509c7a5701088c38a74756168e2cd8d351e88fd1a451f360a01f5b2580f9b5a2e8cfc138f3dd59a3ffc",
-	"1d263c179d6b268f6fa016f3a4f29e943891125ed8593c81256059f5a7b44af2dcb2030d175c00e62ecaf7ee96682aa07ab20a611024a28532b1c25b86657902",
-	"106d132cbdb4cd2597812846e2bc1bf732fec5f0a5f65dbb39ec4e6dc64ab2ce6d24630d0f15a805c3540025d84afa98e36703c3dbee713e72dde8465bc1be7e",
-	"0e79968226650667a8d862ea8da4891af56a4e3a8b6d1750e394f0dea76d640d85077bcec2cc86886e506751b4f6a5838f7f0b5fef765d9dc90dcdcbaf079f08",
-	"521156a82ab0c4e566e5844d5e31ad9aaf144bbd5a464fdca34dbd5717e8ff711d3ffebbfa085d67fe996a34f6d3e4e60b1396bf4b1610c263bdbb834d560816",
-	"1aba88befc55bc25efbce02db8b9933e46f57661baeabeb21cc2574d2a518a3cba5dc5a38e49713440b25f9c744e75f6b85c9d8f4681f676160f6105357b8406",
-	"5a9949fcb2c473cda968ac1b5d08566dc2d816d960f57e63b898fa701cf8ebd3f59b124d95bfbbedc5f1cf0e17d5eaed0c02c50b69d8a402cabcca4433b51fd4",
-	"b0cead09807c672af2eb2b0f06dde46cf5370e15a4096b1a7d7cbb36ec31c205fbefca00b7a4162fa89fb4fb3eb78d79770c23f44e7206664ce3cd931c291e5d",
-	"bb6664931ec97044e45b2ae420ae1c551a8874bc937d08e969399c3964ebdba8346cdd5d09caafe4c28ba7ec788191ceca65ddd6f95f18583e040d0f30d0364d",
-	"65bc770a5faa3792369803683e844b0be7ee96f29f6d6a35568006bd5590f9a4ef639b7a8061c7b0424b66b60ac34af3119905f33a9d8c3ae18382ca9b689900",
-	"ea9b4dca333336aaf839a45c6eaa48b8cb4c7ddabffea4f643d6357ea6628a480a5b45f2b052c1b07d1fedca918b6f1139d80f74c24510dcbaa4be70eacc1b06",
-	"e6342fb4a780ad975d0e24bce149989b91d360557e87994f6b457b895575cc02d0c15bad3ce7577f4c63927ff13f3e381ff7e72bdbe745324844a9d27e3f1c01",
-	"3e209c9b33e8e461178ab46b1c64b49a07fb745f1c8bc95fbfb94c6b87c69516651b264ef980937fad41238b91ddc011a5dd777c7efd4494b4b6ecd3a9c22ac0",
-	"fd6a3d5b1875d80486d6e69694a56dbb04a99a4d051f15db2689776ba1c4882e6d462a603b7015dc9f4b7450f05394303b8652cfb404a266962c41bae6e18a94",
-	"951e27517e6bad9e4195fc8671dee3e7e9be69cee1422cb9fecfce0dba875f7b310b93ee3a3d558f941f635f668ff832d2c1d033c5e2f0997e4c66f147344e02",
-	"8eba2f874f1ae84041903c7c4253c82292530fc8509550bfdc34c95c7e2889d5650b0ad8cb988e5c4894cb87fbfbb19612ea93ccc4c5cad17158b9763464b492",
-	"16f712eaa1b7c6354719a8e7dbdfaf55e4063a4d277d947550019b38dfb564830911057d50506136e2394c3b28945cc964967d54e3000c2181626cfb9b73efd2",
-	"c39639e7d5c7fb8cdd0fd3e6a52096039437122f21c78f1679cea9d78a734c56ecbeb28654b4f18e342c331f6f7229ec4b4bc281b2d80a6eb50043f31796c88c",
-	"72d081af99f8a173dcc9a0ac4eb3557405639a29084b54a40172912a2f8a395129d5536f0918e902f9e8fa6000995f4168ddc5f893011be6a0dbc9b8a1a3f5bb",
-	"c11aa81e5efd24d5fc27ee586cfd8847fbb0e27601ccece5ecca0198e3c7765393bb74457c7e7a27eb9170350e1fb53857177506be3e762cc0f14d8c3afe9077",
-	"c28f2150b452e6c0c424bcde6f8d72007f9310fed7f2f87de0dbb64f4479d6c1441ba66f44b2accee61609177ed340128b407ecec7c64bbe50d63d22d8627727",
-	"f63d88122877ec30b8c8b00d22e89000a966426112bd44166e2f525b769ccbe9b286d437a0129130dde1a86c43e04bedb594e671d98283afe64ce331de9828fd",
-	"348b0532880b88a6614a8d7408c3f913357fbb60e995c60205be9139e74998aede7f4581e42f6b52698f7fa1219708c14498067fd1e09502de83a77dd281150c",
-	"5133dc8bef725359dff59792d85eaf75b7e1dcd1978b01c35b1b85fcebc63388ad99a17b6346a217dc1a9622ebd122ecf6913c4d31a6b52a695b86af00d741a0",
-	"2753c4c0e98ecad806e88780ec27fccd0f5c1ab547f9e4bf1659d192c23aa2cc971b58b6802580baef8adc3b776ef7086b2545c2987f348ee3719cdef258c403",
-	"b1663573ce4b9d8caefc865012f3e39714b9898a5da6ce17c25a6a47931a9ddb9bbe98adaa553beed436e89578455416c2a52a525cf2862b8d1d49a2531b7391",
-	"64f58bd6bfc856f5e873b2a2956ea0eda0d6db0da39c8c7fc67c9f9feefcff3072cdf9e6ea37f69a44f0c61aa0da3693c2db5b54960c0281a088151db42b11e8",
-	"0764c7be28125d9065c4b98a69d60aede703547c66a12e17e1c618994132f5ef82482c1e3fe3146cc65376cc109f0138ed9a80e49f1f3c7d610d2f2432f20605",
-	"f748784398a2ff03ebeb07e155e66116a839741a336e32da71ec696001f0ad1b25cd48c69cfca7265eca1dd71904a0ce748ac4124f3571076dfa7116a9cf00e9",
-	"3f0dbc0186bceb6b785ba78d2a2a013c910be157bdaffae81bb6663b1a73722f7f1228795f3ecada87cf6ef0078474af73f31eca0cc200ed975b6893f761cb6d",
-	"d4762cd4599876ca75b2b8fe249944dbd27ace741fdab93616cbc6e425460feb51d4e7adcc38180e7fc47c89024a7f56191adb878dfde4ead62223f5a2610efe",
-	"cd36b3d5b4c91b90fcbba79513cfee1907d8645a162afd0cd4cf4192d4a5f4c892183a8eacdb2b6b6a9d9aa8c11ac1b261b380dbee24ca468f1bfd043c58eefe",
-	"98593452281661a53c48a9d8cd790826c1a1ce567738053d0bee4a91a3d5bd92eefdbabebe3204f2031ca5f781bda99ef5d8ae56e5b04a9e1ecd21b0eb05d3e1",
-	"771f57dd2775ccdab55921d3e8e30ccf484d61fe1c1b9c2ae819d0fb2a12fab9be70c4a7a138da84e8280435daade5bbe66af0836a154f817fb17f3397e725a3",
-	"c60897c6f828e21f16fbb5f15b323f87b6c8955eabf1d38061f707f608abdd993fac3070633e286cf8339ce295dd352df4b4b40b2f29da1dd50b3a05d079e6bb",
-	"8210cd2c2d3b135c2cf07fa0d1433cd771f325d075c6469d9c7f1ba0943cd4ab09808cabf4acb9ce5bb88b498929b4b847f681ad2c490d042db2aec94214b06b",
-	"1d4edfffd8fd80f7e4107840fa3aa31e32598491e4af7013c197a65b7f36dd3ac4b478456111cd4309d9243510782fa31b7c4c95fa951520d020eb7e5c36e4ef",
-	"af8e6e91fab46ce4873e1a50a8ef448cc29121f7f74deef34a71ef89cc00d9274bc6c2454bbb3230d8b2ec94c62b1dec85f3593bfa30ea6f7a44d7c09465a253",
-	"29fd384ed4906f2d13aa9fe7af905990938bed807f1832454a372ab412eea1f5625a1fcc9ac8343b7c67c5aba6e0b1cc4644654913692c6b39eb9187ceacd3ec",
-	"a268c7885d9874a51c44dffed8ea53e94f78456e0b2ed99ff5a3924760813826d960a15edbedbb5de5226ba4b074e71b05c55b9756bb79e55c02754c2c7b6c8a",
-	"0cf8545488d56a86817cd7ecb10f7116b7ea530a45b6ea497b6c72c997e09e3d0da8698f46bb006fc977c2cd3d1177463ac9057fdd1662c85d0c126443c10473",
-	"b39614268fdd8781515e2cfebf89b4d5402bab10c226e6344e6b9ae000fb0d6c79cb2f3ec80e80eaeb1980d2f8698916bd2e9f747236655116649cd3ca23a837",
-	"74bef092fc6f1e5dba3663a3fb003b2a5ba257496536d99f62b9d73f8f9eb3ce9ff3eec709eb883655ec9eb896b9128f2afc89cf7d1ab58a72f4a3bf034d2b4a",
-	"3a988d38d75611f3ef38b8774980b33e573b6c57bee0469ba5eed9b44f29945e7347967fba2c162e1c3be7f310f2f75ee2381e7bfd6b3f0baea8d95dfb1dafb1",
-	"58aedfce6f67ddc85a28c992f1c0bd0969f041e66f1ee88020a125cbfcfebcd61709c9c4eba192c15e69f020d462486019fa8dea0cd7a42921a19d2fe546d43d",
-	"9347bd291473e6b4e368437b8e561e065f649a6d8ada479ad09b1999a8f26b91cf6120fd3bfe014e83f23acfa4c0ad7b3712b2c3c0733270663112ccd9285cd9",
-	"b32163e7c5dbb5f51fdc11d2eac875efbbcb7e7699090a7e7ff8a8d50795af5d74d9ff98543ef8cdf89ac13d0485278756e0ef00c817745661e1d59fe38e7537",
-	"1085d78307b1c4b008c57a2e7e5b234658a0a82e4ff1e4aaac72b312fda0fe27d233bc5b10e9cc17fdc7697b540c7d95eb215a19a1a0e20e1abfa126efd568c7",
-	"4e5c734c7dde011d83eac2b7347b373594f92d7091b9ca34cb9c6f39bdf5a8d2f134379e16d822f6522170ccf2ddd55c84b9e6c64fc927ac4cf8dfb2a17701f2",
-	"695d83bd990a1117b3d0ce06cc888027d12a054c2677fd82f0d4fbfc93575523e7991a5e35a3752e9b70ce62992e268a877744cdd435f5f130869c9a2074b338",
-	"a6213743568e3b3158b9184301f3690847554c68457cb40fc9a4b8cfd8d4a118c301a07737aeda0f929c68913c5f51c80394f53bff1c3e83b2e40ca97eba9e15",
-	"d444bfa2362a96df213d070e33fa841f51334e4e76866b8139e8af3bb3398be2dfaddcbc56b9146de9f68118dc5829e74b0c28d7711907b121f9161cb92b69a9",
-	"142709d62e28fcccd0af97fad0f8465b971e82201dc51070faa0372aa43e92484be1c1e73ba10906d5d1853db6a4106e0a7bf9800d373d6dee2d46d62ef2a461",
-}
-
-var hashes2X = []string{
-	"64",
-	"f457",
-	"e8c045",
-	"a74c6d0d",
-	"eb02ae482a",
-	"be65b981275e",
-	"8540ccd083a455",
-	"074a02fa58d7c7c0",
-	"da6da05e10db3022b6",
-	"542a5aae2f28f2c3b68c",
-	"ca3af2afc4afe891da78b1",
-	"e0f66b8dcebf4edc85f12c85",
-	"744224d383733b3fa2c53bfcf5",
-	"b09b653e85b72ef5cdf8fcfa95f3",
-	"dd51877f31f1cf7b9f68bbb09064a3",
-	"f5ebf68e7ebed6ad445ffc0c47e82650",
-	"ebdcfe03bcb7e21a9091202c5938c0a1bb",
-	"860fa5a72ff92efafc48a89df1632a4e2809",
-	"0d6d49daa26ae2818041108df3ce0a4db48c8d",
-	"e5d7e1bc5715f5ae991e4043e39533af5d53e47f",
-	"5232028a43b9d4dfa7f37439b49495926481ab8a29",
-	"c118803c922f9ae2397fb676a2ab7603dd9c29c21fe4",
-	"2af924f48b9bd7076bfd68794bba6402e2a7ae048de3ea",
-	"61255ac38231087c79ea1a0fa14538c26be1c851b6f318c0",
-	"f9712b8e42f0532162822f142cb946c40369f2f0e77b6b186e",
-	"76da0b89558df66f9b1e66a61d1e795b178ce77a359087793ff2",
-	"9036fd1eb32061bdecebc4a32aa524b343b8098a16768ee774d93c",
-	"f4ce5a05934e125d159678bea521f585574bcf9572629f155f63efcc",
-	"5e1c0d9fae56393445d3024d6b82692d1339f7b5936f68b062c691d3bf",
-	"538e35f3e11111d7c4bab69f83b30ade4f67addf1f45cdd2ac74bf299509",
-	"17572c4dcbb17faf8785f3bba9f6903895394352eae79b01ebd758377694cc",
-	"29f6bb55de7f8868e053176c878c9fe6c2055c4c5413b51ab0386c277fdbac75",
-	"bad026c8b2bd3d294907f2280a7145253ec2117d76e3800357be6d431b16366e41",
-	"386b7cb6e0fd4b27783125cbe80065af8eb9981fafc3ed18d8120863d972fa7427d9",
-	"06e8e6e26e756fff0b83b226dce974c21f970e44fb5b3e5bbada6e4b12f81cca666f48",
-	"2f9bd300244f5bc093ba6dcdb4a89fa29da22b1de9d2c9762af919b5fedf6998fbda305b",
-	"cf6bdcc46d788074511f9e8f0a4b86704365b2d3f98340b8db53920c385b959a38c8869ae7",
-	"1171e603e5cdeb4cda8fd7890222dd8390ede87b6f3284cac0f0d832d8250c9200715af7913d",
-	"bda7b2ad5d02bd35ffb009bdd72b7d7bc9c28b3a32f32b0ba31d6cbd3ee87c60b7b98c03404621",
-	"2001455324e748503aa08eff2fb2e52ae0170e81a6e9368ada054a36ca340fb779393fb045ac72b3",
-	"45f0761aefafbf87a68f9f1f801148d9bba52616ad5ee8e8ac9207e9846a782f487d5cca8b20355a18",
-	"3a7e05708be62f087f17b41ac9f20e4ef8115c5ab6d08e84d46af8c273fb46d3ce1aabebae5eea14e018",
-	"ea318da9d042ca337ccdfb2bee3e96ecb8f907876c8d143e8e44569178353c2e593e4a82c265931ba1dd79",
-	"e0f7c08f5bd712f87094b04528fadb283d83c9ceb82a3e39ec31c19a42a1a1c3bee5613b5640abe069b0d690",
-	"d35e63fb1f3f52ab8f7c6cd7c8247e9799042e53922fbaea808ab979fa0c096588cfea3009181d2f93002dfc11",
-	"b8b0ab69e3ae55a8699eb481dd665b6a2424c89bc6b7cca02d15fdf1b9854139cab49d34de498b50b2c7e8b910cf",
-	"fb65e3222a2950eae1701d4cdd4736266f65bf2c0d2e77968996eadb60ef74fb786f6234973a2524bdfe32d100aa0e",
-	"f28b4bb3a2e2c4d5c01a23ff134558559a2d3d704b75402983ee4e0f71d273ae056842c4153b18ee5c47e2bfa54313d4",
-	"7bb78794e58a53c3e4b1aeb161e756af051583d14e0a5a3205e094b7c9a8cf62d098fa9ea1db12f330a51ab9852c17f983",
-	"a879a8ebae4d0987789bcc58ec3448e35ba1fa1ee58c668d8295aba4eaeaf2762b053a677e25404f635a53037996974d418a",
-	"695865b353ec701ecc1cb38f3154489eed0d39829fc192bb68db286d20fa0a64235cde5639137819f7e99f86bd89afcef84a0f",
-	"a6ec25f369f71176952fb9b33305dc768589a6070463ee4c35996e1ced4964a865a5c3dc8f0d809eab71366450de702318e4834d",
-	"604749f7bfadb069a036409ffac5ba291fa05be8cba2f141554132f56d9bcb88d1ce12f2004cd3ade1aa66a26e6ef64e327514096d",
-	"daf9fa7dc2464a899533594e7916fc9bc585bd29dd60c930f3bfa78bc47f6c8439448043a45119fc9228c15bce5fd24f46baf9de736b",
-	"943ea5647a8666763084da6a6f15dcf0e8dc24f27fd0d9194805d25180fe3a6d98f4b2b5e0d6a04e9b41869817030f16ae975dd41fc35c",
-	"af4f73cbfc093760dfeb52d57ef45207bbd1a515f5523404e5d95a73c237d97ae65bd195b472de6d514c2c448b12fafc282166da132258e9",
-	"605f4ed72ed7f5046a342fe4cf6808100d4632e610d59f7ebb016e367d0ff0a95cf45b02c727ba71f147e95212f52046804d376c918cadd260",
-	"3750d8ab0a6b13f78e51d321dfd1aa801680e958de45b7b977d05732ee39f856b27cb2bcce8fbf3db6666d35e21244c2881fdcc27fbfea6b1672",
-	"8f1b929e80ab752b58abe9731b7b34eb61369536995abef1c0980d93903c1880da3637d367456895f0cb4769d6de3a979e38ed6f5f6ac4d48e9b32",
-	"d8469b7aa538b36cdc711a591d60dafecca22bd421973a70e2deef72f69d8014a6f0064eabfbebf5383cbb90f452c6e113d2110e4b1092c54a38b857",
-	"7d1f1ad2029f4880e1898af8289c23bc933a40863cc4ab697fead79c58b6b8e25b68cf5324579b0fe879fe7a12e6d03907f0140dfe7b29d33d6109ecf1",
-	"87a77aca6d551642288a0dff66078225ae39d288801607429d6725ca949eed7a6f199dd8a65523b4ee7cfa4187400e96597bfffc3e38ade0ae0ab88536a9",
-	"e101f43179d8e8546e5ce6a96d7556b7e6b9d4a7d00e7aade5579d085d527ce34a9329551ebcaf6ba946949bbe38e30a62ae344c1950b4bde55306b3bac432",
-	"4324561d76c370ef35ac36a4adf8f3773a50d86504bd284f71f7ce9e2bc4c1f1d34a7fb2d67561d101955d448b67577eb30dfee96a95c7f921ef53e20be8bc44",
-	"78f0ed6e220b3da3cc9381563b2f72c8dc830cb0f39a48c6ae479a6a78dcfa94002631dec467e9e9b47cc8f0887eb680e340aec3ec009d4a33d241533c76c8ca8c",
-	"9f6589c31a472e0a736f4eb22b6c70a9d332cc15304ccb66a6b97cd051b6ed82f8990e1d9bee2e4bb1c3c45e550ae0e7b96e93ae23f2fb8f63b309131e72b36cba6a",
-	"c138077ee4ed3d7ffa85ba851dfdf6e9843fc1dc00889d117237bfaad9aa757192f73556b959f98e6d24886ce48869f2a01a48c371785f12b6484eb2078f08c22066e1",
-	"f83e7c9e0954a500576ea1fc90a3db2cbd7994eaef647dab5b34e88ab9dc0b47addbc807b21c8e6dd3d0bd357f008471d4f3e0abb18450e1d4919e03a34545b9643f870e",
-	"3277a11f2628544fc66f50428f1ad56bcba6ee36ba2ca6ecdf7e255effc0c30235c039d13e01f04cf1efe95b5c2033ab72adda30994b62f2851d17c9920eadca9a251752dc",
-	"c2a834281a06fe7b730d3a03f90761daf02714c066e33fc07e1f59ac801ec2f4433486b5a2da8faa51a0cf3c34e29b2960cd0013378938dbd47c3a3d12d70db01d7d06c3e91e",
-	"47680182924a51cabe142a6175c9253e8ba7ea579ece8d9bcb78b1e9ca00db844fa08abcf41702bd758ee2c608d9612fed50e85854469cb4ef3038acf1e35b6ba4390561d8ae82",
-	"cec45830cd71869e83b109a99a3cd7d935f83a95de7c582f3adbd34e4938fa2f3f922f52f14f169c38cc6618d3f306a8a4d607b345b8a9c48017136fbf825aecf7b620e85f837fae",
-	"46fb53c70ab105079d5d78dc60eaa30d938f26e4d0b9df122e21ec85deda94744c1daf8038b8a6652d1ff3e7e15376f5abd30e564784a999f665078340d66b0e939e0c2ef03f9c08bb",
-	"7b0dcb52791a170cc52f2e8b95d8956f325c3751d3ef3b2b83b41d82d4496b46228a750d02b71a96012e56b0720949ca77dc68be9b1ef1ad6d6a5ceb86bf565cb972279039e209dddcdc",
-	"7153fd43e6b05f5e1a4401e0fef954a737ed142ec2f60bc4daeef9ce73ea1b40a0fcaf1a1e03a3513f930dd5335723632f59f7297fe3a98b68e125eadf478eb045ed9fc4ee566d13f537f5",
-	"c7f569c79c801dab50e9d9ca6542f25774b3841e49c83efe0b89109f569509ce7887bc0d2b57b50320eb81fab9017f16c4c870e59edb6c26620d93748500231d70a36f48a7c60747ca2d5986",
-	"0a81e0c547648595adca65623ce783411aac7f7d30c3ad269efafab288e7186f6895261972f5137877669c550f34f5128850ebb50e1884814ea1055ee29a866afd04b2087abed02d9592573428",
-	"6a7b6769e1f1c95314b0c7fe77013567891bd23416374f23e4f43e27bc4c55cfada13b53b1581948e07fb96a50676baa2756db0988077b0f27d36ac088e0ff0fe72eda1e8eb4b8facff3218d9af0",
-	"a399474595cb1ccab6107f18e80f03b1707745c7bf769fc9f260094dc9f8bc6fe09271cb0b131ebb2acd073de4a6521c8368e664278be86be216d1622393f23435fae4fbc6a2e7c961282a777c2d75",
-	"4f0fc590b2755a515ae6b46e9628092369d9c8e589e3239320639aa8f7aa44f8111c7c4b3fdbe6e55e036fbf5ebc9c0aa87a4e66851c11e86f6cbf0bd9eb1c98a378c7a7d3af900f55ee108b59bc9e5c",
-	"ed96a046f08dd675107331d267379c6fce3c352a9f8d7b243008a74cb4e9410836afaabe871dab6038ca94ce5f6d41fa922ce08aba58169f94cfc86d9f688f396abd24c11a6a9b0830572105a477c33e92",
-	"379955f539abf0eb2972ee99ed9546c4bbee363403991833005dc27904c271ef22a799bc32cb39f08d2e4ba6717d55153feb692d7c5efae70890bf29d96df02333c7b05ccc314e4835b018fec9141a82c745",
-	"e16cc8d41b96547ede0d0cf4d908c5fa393399daa4a9696e76a4c1f6a2a9fef70f17fb53551a8145ed88f18db8fe780a079d94732437023f7c1d1849ef69ad536a76204239e8ba5d97e507c36c7d042f87fe0e",
-	"a81de50750ece3f84536728f227208bf01ec5b7721579d007de72c88ee20663318332efe5bc7c09ad1fa8342be51f0609046ccf760a7957a7d8dc88941adb93666a4521ebe76618e5ddc2dd3261493d400b50073",
-	"b72c5fb7c7f60d243928fa41a2d711157b96aef290185c64b4de3dcfa3d644da67a8f37c2ac55caad79ec695a473e8b481f658c497edb8a191526592b11a412282d2a4010c90ef4647bd6ce745ebc9244a71d4876b",
-	"9550703877079c90e200e830f277b605624954c549e729c359ee01ee2b07741ecc4255cb37f96682dafcdbaade1063e2c5ccbd1918fb669926a67744101fb6de3ac016be4c74165a1e5a696b704ba2ebf4a953d44b95",
-	"a17eb44d4de502dc04a80d5a5e9507d17f27c96467f24c79b06bc98a4c410741d4ac2db98ec02c2a976d788531f1a4451b6c6204cef6dae1b6ebbcd0bde23e6fffb02754043c8fd3c783d90a670b16879ce68b5554fe1c",
-	"41d3ea1eaba5be4a206732dbb5b70b79b66a6e5908795ad4fb7cf9e67efb13f06fef8f90acb080ce082aadec6a1b543af759ab63fa6f1d3941186482b0c2b312f1151ea8386253a13ed3708093279b8eb04185636488b226",
-	"5e7cdd8373dc42a243c96013cd29df9283b5f28bb50453a903c85e2ce57f35861bf93f03029072b70dac0804e7d51fd0c578c8d9fa619f1e9ce3d8044f65d55634dba611280c1d5cfb59c836a595c803124f696b07ddfac718",
-	"26a14c4aa168907cb5de0d12a82e1373a128fb21f2ed11feba108b1bebce934ad63ed89f4ed7ea5e0bc8846e4fc10142f82de0bebd39d68f7874f615c3a9c896bab34190e85df05aaa316e14820b5e478d838fa89dfc94a7fc1e",
-	"0211dfc3c35881adc170e4ba6daab1b702dff88933db9a6829a76b8f4a7c2a6d658117132a974f0a0b3a38ceea1efc2488da21905345909e1d859921dc2b5054f09bce8eeb91fa2fc6d048ce00b9cd655e6aafbdaa3a2f19270a16",
-	"ddf015b01b68c4f5f72c3145d54049867d99ee6bef24282abf0eecdb506e295bacf8f23ffa65a4cd891f76a046b9dd82cae43a8d01e18a8dff3b50aeb92672be69d7c087ec1fa2d3b2a39196ea5b49b7baede37a586fea71aded587f",
-	"6ee721f71ca4dd5c9ce7873c5c04c6ce76a2c824b984251c15535afc96adc9a4d48ca314bfeb6b8ee65092f14cf2a7ca9614e1dcf24c2a7f0f0c11207d3d8aed4af92873b56e8b9ba2fbd659c3f4ca90fa24f113f74a37181bf0fdf758",
-	"689bd150e65ac123612524f720f54def78c095eaab8a87b8bcc72b443408e3227f5c8e2bd5af9bcac684d497bc3e41b7a022c28fb5458b95e8dfa2e8caccde0492936ff1902476bb7b4ef2125b19aca2cd3384d922d9f36dddbcd96ae0d6",
-	"3a3c0ef066fa4390ec76ad6be1dc9c31ddf45fef43fbfa1f49b439caa2eb9f3042253a9853e96a9cf86b4f873785a5d2c5d3b05f6501bc876e09031188e05f48937bf3c9b667d14800db62437590b84ce96aa70bb5141ee2ea41b55a6fd944",
-	"741ce384e5e0edaebb136701ce38b3d33215415197758ae81235307a4115777d4dab23891db530c6d28f63a957428391421f742789a0e04c99c828373d9903b64dd57f26b3a38b67df829ae243feef731ead0abfca049924667fdec49d40f665",
-	"a513f450d66cd5a48a115aee862c65b26e836f35a5eb6894a80519e2cd96cc4cad8ed7eb922b4fc9bbc55c973089d627b1da9c3a95f6c019ef1d47143cc545b15e4244424be28199c51a5efc7234dcd94e72d229897c392af85f523c2633427825",
-	"71f1554d2d49bb7bd9e62e71fa049fb54a2c097032f61ebda669b3e1d4593962e47fc62a0ab5d85706aebd6a2f9a192c88aa1ee2f6a46710cf4af6d3c25b7e68ad5c3db23ac009c8f13625ff85dc8e50a9a1b2682d3329330b973ec8cbb7bb73b2bd",
-	"167cc1067bc08a8d2c1a0c10041ebe1fc327b37043f6bd8f1c63569e9d36ded58519e66b162f34b6d8f1107ef1e3de199d97b36b44141a1fc4f49b883f40507ff11f909a017869dc8a2357fc7336ae68703d25f75710b0ff5f9765321c0fa53a51675c",
-	"cb859b35dc70e264efaad2a809fea1e71cd4a3f924be3b5a13f8687a1166b538c40b2ad51d5c3e47b0de482497382673140f547068ff0b3b0fb7501209e1bf36082509ae85f60bb98fd02ac50d883a1a8daa704952d83c1f6da60c9624bc7c99912930bf",
-	"afb1f0c6b7125b04fa2578dd40f60cb411b35ebc7026c702e25b3f0ae3d4695d44cfdf37cb755691dd9c365edadf21ee44245620e6a24d4c2497135b37cd7ac67e3bd0aaee9f63f107746f9b88859ea902bc7d6895406aa2161f480cad56327d0a5bba2836",
-	"13e9c0522587460d90c7cb354604de8f1bf850e75b4b176bda92862d35ec810861f7d5e7ff6ba9302f2c2c8642ff8b7776a2f53665790f570fcef3cac069a90d50db42227331c4affb33d6c040d75b9aeafc9086eb83ced38bb02c759e95ba08c92b17031288",
-	"0549812d62d3ed497307673a4806a21060987a4dbbf43d352b9b170a29240954cf04bc3e1e250476e6800b79e843a8bd8253b7d743de01ab336e978d4bea384eaff700ce020691647411b10a60acacb6f8837fb08ad666b8dcc9eaa87ccb42aef6914a3f3bc30a",
-	"3a263efbe1f2d463f20526e1d0fd735035fd3f808925f058b32c4d8788aeeab9b8ce233b3c34894731cd73361f465bd350395aebcabd2fb63010298ca025d849c1fa3cd573309b74d7f824bbfe383f09db24bcc565f636b877333206a6ad70815c3bef5574c5fc1c",
-	"3c6a7d8a84ef7e3eaa812fc1eb8e85105467230d2c9e4562edbfd808f4d1ac15d16b786cc6a02959c2bc17149c2ce74c6f85ee5ef22a8a96b9be1f197cffd214c1ab02a06a9227f37cd432579f8c28ff2b5ac91cca8ffe6240932739d56788c354e92c591e1dd76499",
-	"b571859294b02af17541a0b5e899a5f67d6f5e36d38255bc417486e69240db56b09cf2607fbf4f95d085a779358a8a8b41f36503438c1860c8f361ce0f2783a08b21bd7232b50ca6d35428335272a5c05b436b2631d8d5c84d60e8040083768ce56a250727fb0579dd5c",
-	"98ee1b7269d2a0dd490ca38d447279870ea55326571a1b430adbb2cf65c492131136f504145df3ab113a13abfb72c33663266b8bc9c458db4bf5d7ef03e1d3b8a99d5de0c024be8fabc8dc4f5dac82a0342d8ed65c329e7018d6997e69e29a01350516c86beaf153da65ac",
-	"41c5c95f088df320d35269e5bf86d10248f17aec6776f0fe653f1c356aae409788c938befeb67c86d1c8870e8099ca0ce61a80fbb5a6654c44529368f70fc9b9c2f912f5092047d0ffc339577d24142300e34948e086f62e23ecaca410d24f8a36b5c8c5a80e0926bc8aa16a",
-	"9f93c41f533b2a82a4df893c78faaaa793c1506974ba2a604cd33101713ca4adfd30819ffd8403402b8d40aff78106f3357f3e2c24312c0d3603a17184d7b999fc9908d14d50192aebabd90d05073da7af4be37dd3d81c90acc80e8333df546f17ab6874f1ec204392d1c0571e",
-	"3da5207245ac270a915fc91cdb314e5a2577c4f8e269c4e701f0d7493ba716de79935918b917a2bd5db98050dbd1eb3894b65fac5abf13e075abebc011e651c03cafb6127147771a5c8418223e1548137a89206635c26ca9c235ccc108dc25cf846e4732444bd0c2782b197b262b",
-	"96011af3965bb941dc8f749932ea484eccb9ba94e34b39f24c1e80410f96ce1d4f6e0aa5be606def4f54301e930493d4b55d484d93ab9dd4dc2c9cfb79345363af31ad42f4bd1aa6c77b8afc9f0d551bef7570b13b927afe3e7ac4de7603a0876d5edb1ad9be05e9ee8b53941e8f59",
-	"51dbbf2a7ca224e524e3454fe82ddc901fafd2120fa8603bc343f129484e9600f688586e040566de0351d1693829045232d04ff31aa6b80125c763faab2a9b233313d931903dcfaba490538b06e4688a35886dc24cdd32a13875e6acf45454a8eb8a315ab95e608ad8b6a49aef0e299a",
-	"5a6a422529e22104681e8b18d64bc0463a45df19ae2633751c7aae412c250f8fb2cd5e1270d3d0cf009c8aa69688ccd4e2b6536f5747a5bc479b20c135bf4e89d33a26118705a614c6be7ecfe766932471ad4ba01c4f045b1abb5070f90ec78439a27a1788db9327d1c32f939e5fb1d5ba",
-	"5d26c983642093cb12ff0afabd87b7c56e211d01844ad6da3f623b9f20a0c968034299f2a65e6673530c5980a532beb831c7d0697d12760445986681076dfb6fae5f3a4d8f17a0db5008ce8619f566d2cfe4cf2a6d6f9c3664e3a48564a351c0b3c945c5ee24587521e4112c57e318be1b6a",
-	"52641dbc6e36be4d905d8d60311e303e8e859cc47901ce30d6f67f152343e3c4030e3a33463793c19effd81fb7c4d631a9479a7505a983a052b1e948ce093b30efa595fab3a00f4cef9a2f664ceeb07ec61719212d58966bca9f00a7d7a8cb4024cf6476bab7fbccee5fd4e7c3f5e2b2975aa2",
-	"a34ce135b37bf3db1c4aaa4878b4499bd2ee17b85578fcaf605d41e1826b45fdaa1b083d8235dc642787f11469a5493e36806504fe2a2063905e821475e2d5ee217057950370492f5024995e77b82aa51b4f5bd8ea24dc71e0a8a640b0592c0d80c24a726169cf0a10b40944747113d03b52708c",
-	"46b3cdf4946e15a5334fc3244d6680f5fc132afa67bf43bfade23d0c9e0ec64e7dab76faaeca1870c05f96b7d019411d8b0873d9fed04fa5057c039d5949a4d592827f619471359d6171691cfa8a5d7cb07ef2804f6ccad4821c56d4988bea7765f660f09ef87405f0a80bcf8559efa111f2a0b419",
-	"8b9fc21691477f11252fca050b121c5334eb4280aa11659e267297de1fec2b2294c7ccee9b59a149b9930b08bd320d3943130930a7d931b71d2f10234f4480c67f1de883d9894ada5ed5071660e221d78ae402f1f05af47761e13fec979f2671e3c63fb0ae7aa1327cf9b8313adab90794a52686bbc4",
-	"cd6598924ce847de7ff45b20ac940aa6292a8a99b56a74eddc24f2cfb45797188614a21d4e8867e23ff75afd7cd324248d58fcf1ddc73fbd115dfa8c09e62022fab540a59f87c989c12a86ded05130939f00cd2f3b512963dfe0289f0e54acad881c1027d2a0292138fdee902d67d9669c0ca1034a9456",
-	"594e1cd7337248704e691854af0fdb021067ddf7832b049ba7b684438c32b029eded2df2c89a6ff5f2f2c311522ae2dc6db5a815afc60637b15ec24ef9541f1550409db2a006da3affffe548a1eaee7bd114e9b805d0756c8e90c4dc33cb05226bc2b393b18d953f8730d4c7ae693159cdba758ad28964e2",
-	"1f0d292453f04406ada8be4c161b82e3cdd69099a8637659e0ee40b8f6da46005cfc6085db9804852decfbe9f7b4dda019a7112612895a144ed430a960c8b2f5458d3d56b7f427cee6358915aee7146278aed2a0296cdd929e4d21ef95a3adf8b7a6beba673cdccdbdcfb2474711732d972ad054b2dc64f38d",
-	"b65a72d4e1f9f9f75911cc46ad0806b9b18c87d105332a3fe183f45f063a746c892dc6c4b9181b1485b3e3a2cc3b453eba2d4c39d6905a774ed3fb755468beb190925ecd8e57ecb0d985125741650c6b6a1b2a3a50e93e3892c21d47ed5884eed83aa94e1602288f2f49fe286624de9d01fcb54433a0dc4ad70b",
-	"705ce0ffa469250782aff725248fc88fe98eb76659e8407edc1c4842c9867d61fe64fb86f74e980598b92bc213d06f337bd5654fc28643c7ba769a4c31563427543c00808b627a19c90d86c322f33566ce020121cc322229c3337943d46f68ef939d613dcef0077269f88151d6398b6b009abb763410b154ad76a3",
-	"7fa881ce87498440ab6af13854f0d851a7e0404de33896999a9b3292a5d2f5b3ad033530c558168fe5d2fdb9b89a2354c46cf32a0e612afc6c6485d789511bfef26800c74bf1a4cfbe30bda310d5f6029c3dccdedb6149e4971274e276dccfabd63bc4b9955e8303feb57f8a688db55ecb4b33d1f9fe1b3a8ba7ac32",
-	"23a98f71c01c0408ae16843dc03be7db0aeaf055f951709d4e0dfdf64fffbffaf900ee592ee10929648e56f6c1e9f5be5793f7df66453eb56502c7c56c0f0c88da77abc8fa371e434104627ef7c663c49f40998dbad63fa6c7aa4fac17ae138d8bbe081f9bd168cd33c1fbc92fa35ed687679f48a64b87db1fe5bae675",
-	"7b8970b6a33237e5a7bcb39272703edb92285c55842b30b9a48834b1b507cc02a6764739f2f7ee6ae02a7b715a1c455e59e8c77a1ae98abb10161853f1234d20da99016588cd8602d6b7ec7e177d4011edfa61e6b3766a3c6f8d6e9eac893c568903eb6e6aba9c4725774f6b4343b7acaa6c031593a36eef6c72806ff309",
-	"f7f4d328ba108b7b1de4443e889a985ed52f485f3ca4e0c246aa5526590cbed344e9f4fe53e4eea0e761c82324649206ca8c2b45152157d4115e68c818644b03b65bb47ad79f94d37cb03c1d953b74c2b8adfa0e1c418bda9c518ddcd7050e0f149044740a2b16479413b63fc13c36144f80c73687513dca761ba8642a8ae0",
-	"2d7dc80c19a1d12d5fe3963569547a5d1d3e821e6f06c5d5e2c09401f946c9f7e13cd019f2f9a878b62dd850453b6294b99ccaa068e542993524b0f63832d48e865be31e8ec1ee103c718340c904b32efb69170b67f038d50a3252794b1b4076c0620621ab3d91215d55ffea99f23d54e161a90d8d4902fda5931d9f6a27146a",
-	"77dff4c7ad30c954338c4b23639dae4b275086cbe654d401a2343528065e4c9f1f2eca22aa025d49ca823e76fdbb35df78b1e5075ff2c82b680bca385c6d57f7ea7d1030bb392527b25dd73e9eeff97bea397cf3b9dda0c817a9c870ed12c006cc054968c64000e0da874e9b7d7d621b0679866912243ea096c7b38a1344e98f74",
-	"83bed0d556798f2b419f7056e6d3ffada06e939b95a688d0ec8c6ac5ea45ab73a4cf01043e0a170766e21395f27ab4b78c435f5f0dfe6e93ab80df38610e41158429ddf20296f53a06a017723359fe22dc08b5da33f0800a4fe50118e8d7eab2f83a85cd764bf8a166903bd0e9dcfeeceba44ff4ca4439846458d31ea2bb564645d1",
-	"ea12cf5a113543e39504123036f15a5bafa9c555562469f99cd29996a4dfaaab2a34b00557ccf15f37fc0cc1b3be427e725f2cd952e50af7970dda9200cd5ce252b1f29c40067fea3027ed686190803b59d834179d1b8f5b55abe55ad174b2a1188f7753ec0ae2fc01316e7d498b68ee3598a0e9baaaa664a60f7fb4f90edbed494ad7",
-	"55266358332d8d9e68bd13432088beadf95833aab67a0eb3b10650414255f299e2670c3e1a5b2976159a46c72a7ce57d59b7be14c15798e09ed50fa312a431b0264d7a1396aa6168bde897e208ece53d2cfc83786113b1e6eac5e9bb98984abb6c8d64eebb991903254abc650c999bb9958a5d7937434b869bc940e21b9dc1cc8982f2ba",
-	"4d6104ded730aefe02873f4c741232c8234a6d66d85393aff57fbf56ba6347666988dfc4d58f3cc895a0da598822edeee4533d24ec0ee292fd5e1ad04898ffbc1ff4bef14dec220babcb0f28fffe32a6e2c28aaaac16442bf4feb02917d18bb3a415d84fa9358d5a9852688d846c92271911f934181c30f82434d915f93f155a1ffbf0b125",
-	"eb5f579a4c476af554aac11e5719d378549497e613b35a929d6f36bb8831d7a466aa76de9be24ebb55543f1c13924f64cfd648a5b3fa90387315c16174dbf1e9a183c196d9bb8f84af65f1f8212429aadc11ef2426d07d4716062b85c8d5d2dff8e21b9e62b7fa7dbd57d72633054b464fb28583a56ca13ccc5ddc74dae942492f31731e7046",
-	"ebddec3dcaf18063e45a76ebeac39af85a1adc2818881ccce48c106288f5988365cca2b4b1d7f037322da46840f42bebdcbc7193838d426e101087d8cea03aaff743d573eb4f4e9a71a2c884390769a6503874125d194bee8d46a3a0d5e4fcf28ff8465887d8e9df771d70157e75df3642b331d2778ceb32ceba868640171ab7a5d22eede1ee44",
-	"26d87ec70b57691e3bb359633d3ddba17f029d62cdfe977f5fd42274d79b444a32494d1c01e9f72d03cce78c806df96e93ea78da3a054209924ed765edc4d570f66168dc25ee3114e4017e387440349c8f0a94804761c3055f88e4fda2a49b860b1486a9609095f6250f268b6a4d1aecc03a505632ebf0b9dc22d0755a736faf7ad7000858b5864b",
-	"3880f5cc2d08fa70ef44b1f263fcf534d062a298c1bd5ee2eee8c3265806c4ce50b004f3a1fc1fa5b024aaac7f528c023c8181f67c6e1c357425dc4d573bd46b93a542afa3a19bdb140a2ce666e1a01f5c4d2dcd681fa9f5839b797813c394738d5ee4971386c12c7c117d17c7bec324b760aa30cda9ab2aa850284ba6fa97946f710f02449d1883c6",
-	"3317d2f452105dd3f4a96f9257af8285a80be58066b50f6f54bd633749b49f6ab9d57d45652d2ae852a2f6940cd5ec3159dd7f333358b12f502325df38843508faf7e246352d201280babd90b14fbf7722641c3601d0e458474439973c611bb5502fd0eb3078f87124ca7e1a016fcb6cfeff65f6a565985aca7122cfa8c5a11da0cb47797c5132333179",
-	"f2c5c955d0224e784a46b9125f8fef8a5e1271e145eb08bbbd07ca8e1cfc848cef14fa3b36221ac62006403dbb7f7d77958ccc54a8566c837858b809f3e310ace8ca682515bc655d2a397cab238a663b464d511f02dc5d033dad4cb5e0e519e94a54b62a3896e460ec70e5716b5921bf8396aa86a60123e6287e34570bb01bdc602e113670bf498af2ff10",
-	"180e275205691a83630cf4b0c7b80e6df8fad6ef1c23ba8013d2f09aef7abade1827f23af230de90676240b4b3b0673f8afdea0327330055041741f65560d90348de696d34ca80dfe8afae582fe4879d4594b80e9408fb53e800e01ca58552b905c365e7f1416e51c080f517d6bbd30e64ae1535d59decdc76c6624d737868f49f2f719da39ba1344d59eab9",
-	"c517a84e4631a7f65ace170d1e5c2fdb259841535d88da323e68c0883e6af7b041cfe05908815a5a9d1b14fa712c2c16fadcf1ca54d3aa954d411240df331b2aebdfb65aced84d0b8aace56ec0aa7c13ec7d75ca883b6bcf6db74c9e98463c484a8262684f29910373430651f90ecffe18b072170e61ee58de20e2a6ff67b3ab00fccbb80af943f20b56b98107",
-	"d1a56a5ee990e02b84b5862fde62f69ec07567be2d7ccb769a461c4989d11fdda6c945d942fb8b2da795ed97e43a5b7dbdde7f8fd2ff7154544336d5c50fb7380341e660d4898c7fbc39b2b782f28defac6873523c7c1de8e52c65e4395c686ba483c35a220b0416d46357a063fa4c33fa9c52d5c207a1304ae141c791e62ba6a7374ed922b8dd94079b72b69302",
-	"4720b88d6bfb1ab43958e26827730d852d9ec30173ebd0fe0d273edcece2e788558984cd9306fe5978086a5cb6d37975755d2a3daeb16f99a8a11544b8247a8b7ed5587afc5bea1daf85dcea5703c5905cf56ae7cc76408ccabb8fcc25cacc5ff456db3f62fa559c45b9c71505eb5073df1f10fc4c9060843f0cd68bbb4e8edfb48d0fd81d9c21e53b28a2aae4f7ba",
-	"f4639b511db9e092823d47d2947efacbaae0e5b912dec3b284d2350b9262f3a51796a0cd9f8bc5a65879d6578ec24a060e293100c2e12ad82d5b2a0e9d22965858030e7cdf2ab3562bfa8ac084c6e8237aa22f54b94c4e92d69f22169ced6c85a293f5e16bfc326153bf629cdd6393675c6627cd949cd367eef02e0f54779f4d5210197698e4754a5fe490a3a7521c1c",
-	"3d9e7a860a718565e3670c29079ce80e381969fea91017cfd5952e0d8a4a79bb08e2cd1e26161f30ee03a24891d1bfa8c212861b51618d07429fb48000ff87ef09c6fca526567777e9c076d58a642d5c521b1caa5fb0fb3a4b8982dc14a444732b72b239b8f01fc8ba8ee86b3013b5d3e98a92b2aeaecd4879fca5d5e9e0bd880dbfffa6f96f94f3998812aac6a714f331",
-	"4d9bf551d7fd531e7482e2ec875c0651b0bcc6caa738f7497befd11e67ae0e036c9d7ae4301cc3c7906f0d0e1ed4738753f414f9b3cd9b8a71176e325c4c74ce020680ecbfb146889597f5b40487e93f974cd866817fb9fb24c7c7c16177e6e120bfe349e83aa82ba40e59e917565788658a2b254f25cf99bc65070b3794cea2259eb10e42bb54852cba3110baa773dcd70c",
-	"b91f65ab5bc059bfa5b43b6ebae243b1c46826f3da061338b5af02b2da76bb5ebad2b426de3c3134a633499c7c36a120369727cb48a0c6cbab0acecdda137057159aa117a5d687c4286868f561a272e0c18966b2fec3e55d75abea818ce2d339e26adc005c2658493fe06271ad0cc33fcb25065e6a2a286af45a518aee5e2532f81ec9256f93ff2d0d41c9b9a2efdb1a2af899",
-	"736f6e387acb9acbee026a6080f8a9eb8dbb5d7c54ac7053ce75dd184b2cb7b942e22a3497419ddb3a04cf9e4eb9340a1a6f9474c06ee1dcfc8513979fee1fc4768087617fd424f4d65f54782c787a1d2de6efc81534343e855f20b3f3589027a5436201eee747d45b9b8375e4294d72ab6a52e04dfbb2914db92ee58f134b026527ed52d4f794459e02a43a17b0d51ea69bd7f3",
-	"9242d3eb31d26d923b99d66954cfade94f25a18912e6356810b63b971ae74bb53bc58b3c01424208ea1e0b1499936daea27e63d904f9ed65fdf69de40780a3027b2e89d94bdf214f585472613ce328f628f4f0d56217dfb53db5f7a07f54c8d71db16e27de7cdb8d23988837b49b65c12f1771d979e8b192c9f4a16b8d9fba917bcf74ce5a82aac2075608ba6c2d485fa59864b9de",
-	"5da68704f4b592d41f08aca08f62d85e2e2466e5f3be010315d11d113db674c4b98764a509a2f5aacc7ae72c9deff2bcc42810b47f64d429b35745b9efff0b18c58653461e968aaa3c2c7fc455bc5771a8f10cd184be831040df767201ab8d32cb9a58c89afbebecb524502c9b940c1b838f8361bbcde90d272715017f67609ea39b20fac985332d82daaa023999e3f8bfa5f3758bb8",
-	"71ea2af9c8ac2e5ae44a176662882e01027ca3cdb41ec2c6785606a07d7231cd4a2bded7155c2feef3d44d8fd42afa73265cef826f6e03aa761c5c51d5b1f129ddc27503ff50d9c2d748322df4b13dd5cdc7d46381528ab22b79b0049011e4d2e57fe2735e0d58d8d56e92c75dbeac8c76c4239d7f3f24fb56697593b3e4afa6671d5bbc96c079a1c154fe20212ade67b05d49ceaa7a84",
-	"1d133170582fa4bff59a21953ebbc01bc202d43cd79c083d1f5c02fa15a43a0f519e36acb710bdabac880f04bc003800641c2487930de9c03c0e0deb347fa815efca0a38c6c5de694db698743bc955581f6a945deec4ae988ef7cdf40498b77796ddea3fae0ea844891ab751c7ee20917c5a4af53cd4ebd82170078f41ada2795e6eea17593fa90cbf5290a1095e299fc7f507f360f187cd",
-	"5ec4ac45d48fc15c72471d795066bdf8e99a483d5fdd599511b9cdc408de7c0616491b73924d0266da34a495331a935c4b8884f57d7ad8cce4cbe586875aa52482215ed39d7626cce55d50349c7767981c8bd6890f132a196184247343566fc972b86fe3c5369d6a6519e9f07942f0522b77ad01c751dcf7defe31e471a0ec00963765dd8518144a3b8c3c978ad108056516a25dbe3092e73c",
-	"0d5e74b78290c689f2b3cfea45fc9b6a84c822639cd438a7f05c07c374adced42cdc12d2a9233a4ffe80307efc1ac13cb04300e165f8d90dd01c0ea955e7657332c6e86ad6b43e78ba4c13c675aed83192d8427866fb6484e6a3071b2369a46fba9005f31232da7ffec7952f831aaaddf63e225263531c2cf387f8cc14fa856c8795137142c3a52ffa69b8e30ebc88ce3bbc227597bcc8dddd89",
-	"a0fe36f983259921dc2fa7d89002b3066241d63bfc2448caf7e10522a35562be0bfedc3dce49cfce2e614a04d4c64cfc0ab898873a7fc26928dc1927c009d12f6f9b7a278205d3d0057604f4ac746f8b9287c3bc6b929832bf253b6586192ac43fdd29ba585dbd9059aab9c6ff6000a7867c67fec1457b733f6b620881166b8fed92bc8d84f0426002e7be7fcd6ee0abf3755e2babfe5636ca0b37",
-	"1d29b6d8eca793bb801becf90b7d7de215b17618ec32340da4bac707cdbb58b951d5036ec02e105d83b5960e2a72002d19b7fa8e1128cc7c5049ed1f76b82a59eac6ed09e56eb73d9ade38a6739f0e07155afa6ec0d9f5cf13c4b30f5f9a465b162a9c3ba04b5a0b3363c2a63f13f2a3b57c590ec6aa7f64f4dcf7f1582d0ca157eb3b3e53b20e306b1f24e9bda87397d413f01b453ceffeca1fb1e7",
-	"6a2860c110cd0fc5a19bcaafcd30762ee10242d34739638e716bd89fd537ea4dc630e6f85d1bd88a25ad3892ca554c232c9830bd56980c9f08d378d28f7fa6fa7df4fcbf6ad98b1adfff3ec1f63310e50f920c99a5200b8e64c2c2ca249399a149942261f737d5d72da949e914c024d57c4b639cb89990fed2b38a37e5bcd24d17ca12dfcd36ce04691fd03c32f6ed5de2a2191ed7c826375ba81f78d0",
-	"7132aa291ddc9210c60dbe7eb3c19f9053f2dd74742cf57fdc5df98312adbf4710a73245de4a0c3b24e21ab8b466a77ae29d15500d5142555ef3088cbccbe685ed9119a10755148f0b9f0dbcf02b2b9bcadc8517c88346ea4e78285e9cbab122f824cc18faf53b742a87c008bb6aa47eed8e1c8709b8c2b9adb4cc4f07fb423e5830a8e503ab4f7945a2a02ab0a019b65d4fd71dc364d07bdc6e637990e3",
-	"3e664da330f2c6007bff0d5101d88288aaacd3c07913c09e871cce16e55a39fde1ce4db6b8379977c46cce08983ca686778afe0a77a41baf447854b9aa286c398c2b83c95a127b053101b6799c1638e5efd67273b2618df6ec0b96d8d040e8c1ee01a99b9b5c8fe63fea2f749e6c90d31f6fae4e1469ac09884c4fe1a8539acb313f42c941224a0e79c059e18affc2bcb6724975c436f7bf949ebdd8aef51c",
-	"7a6ea63a271eb49470f5ce77519ed61ae9b2f1be07a96855726bc3df1d0723af3a703fdfc2e739c9d31d25814daf661a23558b50982e66ee37ad880f5c8f11c8130fac8a5d0250583700d5a324894fae6d61993f6bf9327214f8674649f355b23fd634940b2c467973a839e659169c773119919f5b81ee171edb2e5f6940d7551f9e5a70625d9ea88711ad0ed8ab2da720ad358bef954456cb2d5636425717c2",
-	"c5106bbda114168c449172e49590c7eeb827fa4e1a2a7a87a3c1f721a9047d0c0a50fbf244731be1b7eb1a2ef30f5ae846a9f38f0df44f32af61b68dbdcd0226e741dfb6ef81a2503691af5e4b3171f48c59ba4ef91eba344b5b697f261df7bbbb734ca6e6daebaa4a179feb17002823281b8534d55a6531c59305f6e3fd3fa63b747bcf0deb654c392a02fe687a269effb1238f38bcaea6b208b221c45fe7fbe7",
-	"597716a5ebeebc4bf524c15518816f0b5dcda39cc833c3d66b6368ce39f3fd02ceba8d12072bfe6137c68d3acd50c849873150928b320b4fbc31c1456679ea1d0acaeeabf666d1f1bad3e6b9312c5cbdecf9b799d3e30b0316bed5f41245107b693366accc8b2bcef2a6be54209ffabc0bb6f93377abdcd57d1b25a89e046f16d8fd00f99d1c0cd247aafa72234386ae484510c084ee609f08aad32a005a0a5710cb",
-	"0771ffe789f4135704b6970b617bae41666bc9a6939d47bd04282e140d5a861c44cf05e0aa57190f5b02e298f1431265a365d29e3127d6fccd86ec0df600e26bcdda2d8f487d2e4b38fbb20f1667591f9b5730930788f2691b9ee1564829d1ada15fffc53e785e0c5e5dd11705a5a71e390ca66f4a592785be188fefe89b4bd085b2024b22a210cb7f4a71c2ad215f082ec63746c7367c22aedb5601f513d9f1ffc1f3",
-	"be6556c94313739c115895a7bad2b620c0708e24f0390daa55521c31d2c6782acf41156271238885c367a57c72b4fe999c160e804ad58d8e565edbce14a2dd90e443eb80626b3eab9d7ab75d6f8a062d7ca89b7af8eb292c98eaf87ad1dfd0db103d1bb6188bd7e7a63502153cf3ce23d43b60c5782602bac8ad92fb2324f5a79453898c5de18415639ecc5c7974d3077f76fc1df5b956723bb19a624d7ea3ec13ba3d86",
-	"4bc33729f14cd2f1dc2ff459abee8f6860dda1062845e4adab78b53c835d106bdfa35dd9e77219eaef403d4e80488ca6bd1c93dd76ef9d543fbb7c8904dccc5f71509a6214f73d0f4e467c3e038ea639b29e7fc442ee29f57117740576188ada15a739827c647a46b0271817ab235c023c30c90f2115e5c90cd8501e7b286962fc66ffc3fe7e8978746168314908a41998bd83a1eeffda9d714b864f4d490fdeb9c7a6edfa",
-	"ab12faea205b3d3a803cf6cb32b9698c32301a1e7f7c6c23a20174c95e98b7c3cfe93fffb3c970face8f5751312a261741141b948d777b8a2ea286fe69fc8ac84d34116a4674bb09a1a0b6af90a748e511749de4697908f4acb22be08e96ebc58ab1690acf73914286c198a2b57f1dd70ea8a52325d3045b8bdfe9a09792521526b7564a2a5fcd01e291f1f8894017ce7d3e8a5dba15332fb410fcfc8d62195a48a9e7c86fc4",
-	"7d421e59a567af70594757a49809a9c22e07fe14061090b9a041875bb77933deae36c823a9b47044fa0599187c75426b6b5ed94982ab1af7882d9e952eca399ee80a8903c4bc8ebe7a0fb035b6b26a2a013536e57fa9c94b16f8c2753c9dd79fb568f638966b06da81ce87cd77ac0793b7a36c45b8687c995bf4414d28289dbee977e77bf05d931b4feaa359a397ca41be529910077c8d498e0e8fb06e8e660cc6ebf07b77a02f",
-	"0c18ab727725d62fd3a2714b7185c09faca130438eff1675b38beca7f93a6962d7b98cb300ea33067a2035cdd694348784aa2eda2f16c731eca119a050d3b3ce7d5c0fd6c234354a1da98c0642451922f670984d035f8c6f35031d6188bbeb31a95e99e21b26f6eb5e2af3c7f8eea426357b3b5f83e0029f4c4732bca366c9aa625748297f039327c276cd8d9c9bf692a47af098aa50ca97b99961bef8bc2a7a802e0b8cfdb84319",
-	"92d5909d18a8b2b9971cd1627b461e98a74ba377186a6a9df5bd133635250b300abccb2254cacb775df6d99f7c7d0952653c28e6909b9f9a45adce691f7adc1afffcd9b06e49f775364cc2c62825b9c1a86089080e26b57e732aac98d80d009bfe50df01b95205aa07ed8ec5c873da3b92d00d53af825aa64b3c634c5ece40bff152c331222d3453fd92e0ca17cef19ecb96a6eed4961b627aca48b12fecd091754f770d52ba861546",
-	"802f22e4a388e874927fef24c797408254e03910bab5bf372320207f8067f2b1ea543917d4a27df89f5bf936ba12e04302bde23119533d0976beca9e20cc16b4dbf17a2ddc44b66aba76c61ad59d5e90de02a88327ead0a8b75463a1a68e307a6e2e53ecc1986274b9ee80bc9f3140671d5285bc5fb57b281042a8978a1175900c6073fd7bd740122956602c1aa773dd2896674d0a6beab24454b107f7c847acb31a0d332b4dfc5e3f2f",
-	"3844fe65db11c92fb90bf15e2e0cd216b5b5be91604baf3b84a0ca480e41ecfaca3709b32f8c6e8761406a635b88eec91e075c48799a16ca08f295d9766d74475c47f3f2a274eae8a6ee1d191a7f37ee413a4bf42cad52acd5564a651715ae42ac2cddd52f819c692ecdef52ecb763270322cdca7bd5aef71428fa73e844568b96b43c89bf1ed42a0abf209ffad0eeec286c6f141e8af073ba4adfbbdeda253752ae36c9957dfc905b4c49",
-	"329377f7bf3c8d74991a7d61b0cf39baff5d485d79751b0d5ad017d23bec570fb19810105bab79ab5acb102ab972165224d4ec888ec7de5148077fa9c1bb6820e0d91ae4e2591a21fec2f820606ce4bafc1e377f8dc3a5bd1a9e2772a57abccd0b757164d768872c91d02789545ab5b203f688d71dd08522a3fd2f5bcd7df507aebf1ca27ddff0a82afb7aa9c180008f49d1325adf97d047e77238fc75f56356de4e87d8c961575c9f6362c9",
-	"f7f269929b0d71ea8eef7120e55ccba691c582dd534692abef35c0fe9dec7dae973cd9702e5ad420d278fe0e653fdcb22fdcb63148109ec7e94f2d0750b28157dd1764376ae10fdb0a4aef3b304bd82793e0595f941226a2d72abbc929f53134dc495b0d65ced409914f94c2523f3dfbbdeeac84ae247ab5d1b9ea33dce1a808885a55be1f3683b46f4be73d9b62eec2585f690056858dfc427aabf591cd276724885bcd4c00b93bb51fb7484d",
-	"ac022309aa2c4d7fb628255b8b7fb4c3e3ae64b1cb65e0de711a6def1653d95d8088871cb8905fe8ae76423604988a8f77589f3f776dc1e4b30dbe9dd262b2187db02518a132d219bd1a06ebac13132b5164b6c420b37dd2ccee7d69b3b7fa12e54f0a53b853d490a68379ea1fa2d79762830ffb71bf86aab506b51f85c4b6a41b69325c7d0c7aa85b93b7144489d213e8f33dbb879fce22849865337b620b155cb2d2d36a68832889e30194d36d",
-	"d009c2b78a8f02e5e5dbb586ef71fc324b375092e15913ca1a5bfd22d516baadb96867bee3562e77c4a4852344a1a76c30728be5e22400b4cc41711f66754c246a520498d8c24f0205b9c873748dbeb67fe1ad099ad04cf89f4b517f0aa481136d9f6de2d727df01c6aa4099da59d4382b51e25fd47c33d9842c32b62331e50794bfe8b61b3ba9de1b8b704779c6d65edff3af00f121ab4a7ea384edabe47c6d0098a48991f387ca4444135ec59d46",
-	"c00bab36cce69899817d1425016d222d7303197ed3e3fdcac744705e7f178a1ac745968900f69299163e19b3161f3e0a4cc55aa2e4e71e0ee6ac427d1f4d14e063f68d303ddfbb18118335cfa7a6a90d99c38319ee76f7a884846a9e0b68030bf28e78bfbd56359b9368842814da42b04cb0e307d5d846dc22f049147bae31b9a956d17676a8cc348dafa3cabc2007a30e730e3894dddf9999fb8819086311f0703e141613ed6dcd7af8510e2dc435b0",
-	"c9789152a9fc29698d49ed95f09bd11b75f18a8c5615a73dbe54ae5e550027fd0ae6a8b60667040c1b12de3d1ee3f6bf061c78c951a3210effc912e19f482dd4de152063c588c44903bc11761706fd935afa040df085b08144d83d0dde32b46ab52f4fae98ac116c7ff11d7f553450c2e37b9c5f0b1dd9e0b8640a24cba6f2a5246c41f197f46e3dc8a29131c79bef3351c6e277a0a34442274d546ccd058891277473d668420f121750d19cd684267405",
-	"06a15a0731ce52557e368bcbaa11ef3399299e36fb9f2eda6e5726907c1d29c5c6fc581405ba48c7e2e522206a8f128d7c1c939d1132a00bd7d6366aa82724e968964eb2e373563f607dfa649590dcf5589114df69da5547fef8d1604cc4c6de1ed5783c8746918a4dd31168d6bc8784cd0c769206bd803d6ca8557b66748770402b075ef44b38157d4c0da7c6281725a2065d087b1f7b23455fa673bdeeba45b983311c44eabe9ef4b7bde3420ae9881863",
-	"d08aacef2d7a41aec09473bd8a44f628e15addb7b9e5b77a1e09c8ab4942f379a0bfcb324d580b774666f18ae78dd36710824ff12393f059068fe4b559c53662c2b0e6c69e23785c8f32554e837ec1714bee902e60737b639dd933af4f68cb9d7de77e1f3b28e5b122891afce62b79acd5b1ab4ba411662cc77d806449e69c5a45a143b742d98ac84a0826d68433b9b700ace6cd472ba2d58a90847f42ce9c43f38ffc017db4bf40450b2eee1f4594dc740c0f",
-	"6a6058b0a498b7ea76a93c646eb9b8629f0cba4a0c726420c5f67ba9b0412cade356abdf0a4fb94384bad32ce0d5dd9e23dcaae1d6f28ff8683616b30f1392890c67b3a2c04b360893b801f127e527e4da82e239f4c878da13f4a4f1c76db07190e77ec123995168102fb274434a2d1e12913b9b5cbab4aacaad2bd89d88b3ca2b8e60dacf7c22c9379097ff60880f552e320ca3b571994f52534470feee2b39e0dadb5cd88257a3e459a4cc6f12f17b8d54e1bb",
-	"adeced01fc5671531cbb45679f5ddd42b3a95151677b6125aaf6f5e8f82fbabaa5ecf7c3552c2458587224f0042870f178f5fca5465250e75d71352e652eeed23cdb7f915f5ebb44099b6db116ca1be45530ac8ed32b7f161d60ed4397ad3d7d649ae6bf75ca5bec891d8e595605be9764f3a03965e1fe0eaffbf212e3df4f0fa35e08ff9d0091e6d4ac4748edfe43b611085a6ffec163014655fdd839fd9e81b63b1fa8cae4ec335ec343289758e389a79ceedfae",
-	"d014592f3a83ba40af366f137c674724916c3cdd3f6cf9d4c5c7c8d6d51ebf26e315e2c12b3546be56fb52382904046ecbd2f5b883aa4ff473de6f0c26ab862c3fa34bf3d880cc1911ce39a4088c6617c179dc5faf68a2c488bbde12d67b50f73abcfab0e3b062e68c95363e11f5f1de8ec36ed01ea21442518089045df67d346135283ad5b3fff80cf57f20876849f6db9fa139728358415a90610f69ec720fc92d8234e3e122551e9df2c644c4a2c4e3734d07de8e",
-	"c0d0c37838873ba8757d6e41b409605043bc1635edcd731219587676d94217e9f0ab44b71de25000661ce7303b7015f45e6eaa7b7ebef92b8f4a34c902c908d2172185505fa33aca5a41be83079316cdfdd430fc2c45f505f85d867e6d516f7e1bf19c001d9f43018968aab65ec031b3801399231c83ec9e622dab5629922a6b424cab938c135ff7310501c2c02971bfd2f577e25904d1a618baf0859f77f4e8b1d0cde9544e95ec52ff710c0672fdb3d891feeea2b017",
-	"7022e7f00902219ba97baa0e940e8ac7727f58955aa068c29680fac4a16bcd812c03eeb5adbcfe867a7f7c6b5d89f4641adb9173b76a1a8438866f9b4f640ce2aedf5f1080c890bcf515b4be4e3e512352f1e5323c62ec46cb73f3d71be8235fee55a154763f7c3f9aeb61ffd28f4cd93d3310f608e2133586bf1ab3f102de96f64c68a4668de8acb2a76a7ce0cddddc8fa3df5e9d230823da16ed9ebb402d36e38e6e018795e5a71517ecab5f9ca472b9ced8ff69d2d195",
-	"acaf4baf3681ab865ab9abfae41697141ead9d5e98523c2e0e1eeb6373dd15405242a3393611e19b693cabaa4e45ac866cc66663a6e898dc73095a4132d43fb78ff7166724f06562fc6c546c78f2d5087467fcfb780478ec871ac38d9516c2f62bdb66c00218747e959b24f1f1795fafe39ee4109a1f84e3f82e96436a3f8e2c74ef1a665b0daaa459c7a80757b52c905e2fb4e30c4a3f882e87bce35d70e2925a1671205c28c89886a49e045e31434abaab4a7aed077ff22c",
-	"84cb6ec8a2da4f6c3b15edf77f9af9e44e13d67acc17b24bd4c7a33980f37050c0301ba3aa15ad92efe842cd3ebd3636cf945bb1f199fe0682037b9dacf86f162dadabfa625239c37f8b8db9901df0e618ff56fa62a57499f7ba83baebc085eaf3dda850835520344a67e09419368d81012168e5de5ea45158397af9a5c6a1657b26f319b66f816cd2c28996547d697e8df2bb163ccb9dda4d6691dffd102a13667ab9cde60ffbfb872187d9c425a7f67c1d9fffff9276ed0aeb",
-	"6a52c9bbbba454c14540b2be58230d78ecbeb391646a0c6fcce2f789086a78364b81ae85d5396d7cfa8b46bda41e3083ec5cf7b4c47dc601c8a697df52f557defca248506dbebab25657f5a561d09625b7f4b2f0119a12beeac087efc9d350a735c35d2431c1da7dda99befb17f41a3dc4da0f00bb95366be128538ce27763d81f832fe3c1d4efc07b5b08ad8dc9e65fb5e48546664e18cb2d3bb3fe1f56fa7aae718c5e3bbdeaf70e15023f6a25b72a2d177fcfd04211d40664fe",
-	"c3c4d3b31f1f5f9538923df3478c84fffaef411520a542da9a220ee4132eabb9d718b5076fb2f985485e8ba058330aed27ddfd3afa3db34aa60301088caec3d0053828c0c2bc87e2e61db5ea5a29f62fdad9c8b5fc5063ec4ee865e5b2e35fac0c7a835d5f57a1b1079833c25fc38fcb14311c54f8a3bd251bca19342d69e5785f9c2e43cf189d421c76c8e8db925d70fa0fae5ee3a28c4047c23a2b8a167ce53f35ced33bec822b88b06f41558c47d4fed1bfa3e21eb060df4d8ba1",
-	"8d55e92136992ba23856c1aea109766fc44772477efc932b3194af2265e433ed77d63b44d2a1cff2e8680eff120a430fe012f0f09c6201d546e13ad46fc4ce910eab27bb1569879abed2d9c37fae9f1267c2216ec5debcb20d4de58461a621e6ce8946899de81c0add44d35e27b7982a97f2a5e6314901caebe41dbba35f48bc9244ca6dca2bdde7306435892f287036df088633a070c2e385815ab3e2bfc1a47c05a5b9fe0e80dd6e38e4713a70c8f82bd32475eea8400c7bc67f59cf",
-	"5016284e20362610fa05ca9d789cad25f6d43263787e7e085476764ce4a8908ce99b262b375e9d106170b1bec1f473d5e777e0c1896533040e39c8c1465e07907ef5860e14e4d8310013e35f12090e0bfc687474b1f15f3dd2033a0edac5246102da4deec7e188c3517d84d9c2a0a4497a4c5f82a30f1ba009e45ee6eb3ab4368c720ea6feee428ffd2c4cc52debb8d634a64176572c72368f94a66689f23f8a01218f532117af5a8060d140e7ca435a92882fcb5630ebe14a4805f1dc83",
-	"05456ec59b8d41bbd736727976b96b38c43827f9e16169be673ff37870c2ecd5f0d1ea1a136be4cc7b047a02a4421d484fd2a12ece418e42ee391a13a0b1df5a0162b29ab70d3fe3e04ba6ab26b37d62b7cf05a5e2f033611bf970b8e1f30e198e483e740fa9618c1e8677e07b61296b94a9787a68fba622d7653b5568f4a8628025939b0f74389ea8fced6098c065bf2a869fd8e07d705eadb53006be2abb716a3114ceb0236d7e916f037cb954cf977720855d12be76d900ca124a2a66bb",
-	"eb6f60b83fcee77060ff346aaf6ec34d82a8af469947d3b5074cde8eb26566eb1fa039bcc707738df1e95869bd827c246e88436f0614d9834ead5392ef376105c4a9f370071cdeaaff6ca0f18b74c3a48d19a717253c49bd9009ccbfdd5728a08b7d112a2ed8dbafbbb46d7a75dc9a05e09bfde1a0a92d74a51887f9d123d7896e9f9d0057b660ed7d55454c069d3c5260411db4cdc67e7b74f680d7ac4b9dcc2f8baf72e15e6b3cafebcdf449a6436ed2c398b675f79c644747c57553bf7ea2",
-	"187a88e88514f6c4157c1ba40b442baae1ae563a6c989277443b12a219aa484cb9fa8adbb9a29d429f50155321b15664926317477079c7060dfdaa84c1d74bba78892c34e6f21ad35208d2ae622012401696bff5cd57b6485944b3db7b9071fa5f57fbfb1085d91bb9cff5808d662cdc6c8157249478262c44b7fbc397ed42a4977b202e817717bfccc9f0467294062313f7705251ed09573f16d23429361fada259dfb300369c4198f07341b38e84d02cdb74af5de6aab1fc2026208ea7c418c0",
-	"be31bc96606d0fab007e5caeded2f1c9f747c759777e9b6eef962bed49e45a1d4fc993e279d024915e600865ecb087b960584be18c41114d3c43f92169b9e0e1f85a0ebcd4e196376ccdc920e66103cd3b1c58407d0aafd0e003c4e341a1daddb9f4faba974362a32f35db83384b05ae8e3322d728893861afd8b1c940de5a17f691e763ce4969b6d94f67fb4a0235d100225bd8602f291388f0ca4a568748ad0d6040f1262eac2aede6cd27419bb78a394c1ffad72c262be8c3f9d9619d633e51d0",
-	"4d83d85ca838b4518588f2a90228a4dd18f14dd5b4c012d26298a97d848abbd825d221d02cceb6e8c701b4ad00e1dee4889b5c533e4bb60f1f41a4a61ee5478be2c1b1016c30345afd7a5253668260515e70751f22c8b4022d7fe4877d7bbce90b46531507dd3e89549e7fd58ea28f4cb23d33662bd003c1345ba94cc4b06867f778957901a8c441bee0f3b12e16463a51f7e50690356971dd73a686a49fda1eae46c9d54fba262811d698025d0ee053f1c58591c3bb3cbde69de0b31549ef5b69cf10",
-	"cdeb07d36dc5f9a1cd717a9e9cca37a2ce93caa298eee63571f7d6c5fde2a11c666cf53cf2dcb41ca2ea2319e7230ca68e38c647905928713a13982bf47fe33d7095ebd50b2df976208920a43eb2e29b942f32467403c45cea18bf44e0f6aeb155b48a8e5c471fec972a9d62f7ae093d2758f0aaec7ca50cb4725bfa219f1a3a46ad6bde7361f445f86b94d66b8ece080e56c510250693a5d0ea0ae87b4421860b853bcf0381eae4f1bf7c5c0472a93ad18407bc88475ab8560d344a921d3e86a02da397",
-	"a598fad52852c5d51ae3b10528fc1f722e21d44fbd42ae5acdf20e85a28532e646a223d27fd907bfd38eb8bb75175636892f8242877aab89e8c0824d368f3339ce7a82aa4e5af6db1f3b588a4d667a00f67bee37cfd2724dde06d2909fb9e58d892f4cfd2c4ca85acdf8256f5458b030a6bda151154ff2e6d7a8da90b54a2884c8a99fab5a4ac211ff23dc0975f4f592fd1b6b9dc7783bdcd2d4ca4e68d2902f2013e122cb62e2bff6b0a98ec55ba25837e21f1cfe67739b568d43e6413dab2bd1dc471e5a",
-	"17b68c74c9fe4926e8102070916a4e381b9fe25f5973c9bd4b04ce25749fc18931f37a65a356d3f5e5a1ef125d546f4f0ea797c15fb2efea6fbfcc5739c564693d47adeb12dcb3d98a2830719b13247792cb2491dca159a28138c6cff925aca42f4fdb02e73fbd508ec49b25c60703a7595a3e8f44b155b371d525e48e7e5dc84ac7b17c52bf5e526a67e7187234a2f19f57c548c70fc0b27183df73ffa53fa58b658034c896fa791ae9a7fd2620f5e46ce84c842a6e60e9324ae4db224ffc87d9617cb85ca2",
-	"b9e4267ea39e1de1fed0579f93bb351007c9f8fcdd811053fae33f09e2753d7428f04e1a9efcd45ea701a5d87a35b3afb2e6b65365dee6ead0bbb611b7797b212ac688653f542e604a39df277f12514ddfee3b4e27b98395c2cd97a203f1f1153c50327965770802ec2c9783edc428271762b275471e7ac65ac36523df28b0d7e6e6ccc7674268a132a63411fc82c0738dbb68af003b769a0bf9e6587b36476cb465350fee13f88ea355d47ffac7b0f964f4139db11b7642cb8d75fe1bc74d859b6d9e884f75ac",
-	"8ca704fe7208fe5f9c23110c0b3b4eee0ef632cae82bda68d8db2436ad409aa05cf159223586e1e6d8bdae9f316ea786809fbe7fe81ec61c61552d3a83cd6beaf652d1263862664df6aae321d0323440430f400f291c3efbe5d5c690b0cc6b0bf871b3933befb40bc870e2ee1ebb68025a2dcc11b68daadef6be29b5f21e440374301bde1e80dcfade4c9d681480e65ec494a6af48df232c3d51447b9d06be714949249c44c43cf73ed13ef0d533e770284e51369d94ae241a5fb2f163893071b2b4c118aeaf9eae",
-	"4fd8dd01012bb4df82bf42e0683f998e6f52dd9c5617bae33f867d6c0b69798cead8179346d70acc941abbbdd26e3229d5651361d2252c72ff22db2938d06ff6fc29a42fdf800ae967d06479bc7bbb8e71f40b1190a4b7189ffc9a7096cdb76d40aec424e1388e1eb7ef4ac3b34f3f089da8fda7d1927f5d775c0b2801d22dd1265c973158f640cec93edfed06dc80b20ef8c496b98289d54d46ccd205951cbb0f4e7daeb866b60bacb483411e4382b6f04d472843186bd0e31fbaa93e5c901ec028efafeb45fc551a",
-	"e9ee1b22b04b321a5fdd8301627011f583887d77560fb0f35552e207561f81e38ac58a0d0aeaf832d1ee72d913720d01f75574e9a321864fe95f4d0d8f0b8db97649a53e71e940aede5c40b4b9105daa42a6fb2811b61209247534cbaf830b07abe338d75d2f5f4eb1c3cf151e9edabe2c8d5f6fff08fac1495ef48160b100d30dcb0676700bcceb28723a29980ab0766a93abb8cb3d1963007db8458ed99b689d2a7c28c788743c80e8c1239b20982c81dadd0eed6740c65fbc4ef15c7b5569cb9fc997c6550a34b3b2",
-	"ec01e3a60964360f7f23ab0b22e021815765ad706f242265ebc19a2bb9e4eac94393952dcf61aae47682671a10f9165f0b20adf83a6706bfbdcf04c6faba6114653a35584267267873291c6fe7ff5f7695243143421509502c8875aafa9e9afe5be5ef2c851c7f35d69be5d3896000ccdbbfab5c238bb34d607cfe2d55d748880545b4aa7ca61137992925189025c62654b1f20d49c3ccd75aa73ce99cd7258dabedd6480a9f5185531fc0118beb68cc0a9cd182f6973287cf9252e12be5b619f15c25b65c71b7a316ebfd",
-	"db51a2f84704b78414093aa93708ec5e78573595c6e3a16c9e15744fa0f98ec78a1b3ed1e16f9717c01f6cab1bff0d56367ffc516c2e33261074935e0735ccf0d018744b4d28450f9a4db0dcf7ff504d3183aa967f76a507357948da9018fc38f150db53e2df6cea14466f03792f8bc11bdb5266dd6d508cde9e12ff04305c0295de29de19d491ad86e766774bb517e7e65befb1c5e2c267f013e235d8483e177214f89978b4cdc81aa7eff8b39f2825ad3a1b6ac1424e30edd49b067d770f16e74dd7a9c3af2ad74289a676",
-	"00e40f30ae3746edad0f5dd03d0e640933cf3d1694804c1e1ed6399ac36611d405196ee48f129344a8512feda16a354517871322bd5d9c6a1b592933eab531923efb393ffb23d9109cbe1075cebfa5fb917b40df028a621460ff6783c798792cb1d9635b5a6f84ec13918fa302924649b5c7fcb1f7007f0d2f06e9cfd7c27491e565a96c68a0c3644f92cd8f38857258c33801c5d537a83dfe583cba59d7eec7e394199c0a2660a62fabe3ed2099d57f315a6cd8de1a4ade29d977f15d65759cff433e5ac0c182aef3761163e1",
-	"3c5ea24d0d9b618294a263f062b2414a722be4eb10dfc346a6ec3b821d7396eba61cd6ef33618b04cd087a811f299d4606820227f16000d7c839062b96d3e3f59cd1a082448d13fc8f56b3fa7fb5f66d0350aa3b72dd7c165d590282f7da2e12cfe9e60e1796122bb8c2d40fdc2997af634b9c6b127a893dfb3467909378300db3da911be1d7b616bb8e0572433e65527e15d936500a2c60e9f9909dcf22ab5e4b6700f0238c205b4a813626fac3d945bab2637fb08203044a73d20c9a3fcf7c3fc4eb7807c3276dd5f73ce89597",
-	"9271aeeebfac46f4de85df78f1bfd36136aa8905e15835c9e1941176f71e3aa5b1b131843d40479735e23e182a2bd71f66f6149dccb7ed8c16469079dc8590bbf165374951785f4531f7e7361de62f936cfb23a2b5bdf186632e7042a0dd451fdc9b7208f923f3a5f250ae590ec348c63a16c3aacaf7379f53b5dd4152dcd40d23e683e2156e64c592ffc07e2cd6bbeebef4dd590b2f6b2bcbf08fcd111c079f5c4033adb6c17574f8756ecd87be27eff1d7c8e8d0324438d59ae171d5a17128fbcb5533d921bd044a2038a5046b33",
-	"4e3e533d5bcb15793d1b9d0468aaee801f32fdb486b11027183553a09ddbee8213924296f2815dc61577297459e834bf1c7a53f87d43782209e589b8295219ba7073a8fff18ad647fdb474fa39e1faa69911bf83438d5f64fe52f38ce6a991f25812c8f548de7bf2fdea7e9b4782beb4011d3567184c817521a2ba0ebad75b892f7f8e35d68b099827a1b08a84ec5e8125651d6f260295684d0ab1011a9209d2bdeb75128bf5364774d7df91e0746b7b08bda9185035f4f226e7d0a1946fcaa9c607a66b185d8546aac2800e85b74e67",
-	"b5d89fa2d94531093365d1259cc6fe8827fea48e6374c8b9a8c4d2209c280fa5c44958a1847222a692a59e6aa2696e6cdc8a543dd89b0ce03bc293b4e78d6ef48e1839694ccd5c65661143095c705b07e3ced84a0f5959114dd89deb956ab3fac8130eb4a878278205b801ae41a29e34146192308c4e759b374757b0c3b00319bce92a1b95a4d2ee179fd6714ff96155d26f693a5bc973f84ac8b3b91e3926276297532d98b46992a3f104c08100bf1671c43134bac280c617da711e90a0100137525375ebb12802a428885ae7fce6514a",
-	"40e3d8048fc10650cb8a7fc2e7113e26dec34f9ca2d5129cd10a8e8e44d113d61ee48c7d003e19fd307fc6debd70feb30243f298c510ccc4418355ce143066f067ad7c6de7288c3080e7ad46a23c8d34deb55a43e652fe90444ad3c57d3ec1e1c489d63ef915a24bc74a7925a0a7b1e1523f21ca8fee78df24e3d0a68d0013423db97c280799a0618229c0f2c167289a891e5c8d6661ab21285951c31710e3b5fe55f6347fe16d9b40507948a59252efeb616df83e5c098b07d0a7247cd371daff0e50491c582503fd89f79ba94d6af9ed76",
-	"1fa444de01dd3901e2b4684e3d7a799ffa02d85afd35fb30fe4c9d672837bee6dd8a3b8608b4bb5e589220ad5a854f46b46e41c6d57ad124a46beab4169ff69fee7e3838a6165e19dad8eb5d7bf53d4edd3cd2769daf219510a02fdd2afe0c0e1da3cd30fcd1aa88b68965586f07a25a1720fbd90a096ea30fc8e945e3637d7857c8a9c0ab4154ffb2000e57b5f9adfa4e4eaf8065bc3c2b2e75f495963325588785a6ce417dcddffd299873b15dcccca128d63cd4eeeadb64cda28099a9ad7c80d34844901f26b88b00b9aafeb2f90286d29d",
-	"fde0a0d9d813983bd1f55cf778a003a2023b34a555322ab280584537bc6bdd844d22a7d6066c18da83ec09f3d8d5a1aab4be0d5ce19b436052f6e259a4b49017a1f47f1fe2bf115d5bc8599fb216351c60dd6b1bedb2e6f4dcadf424b833501b6f099cbfad9e2290680fb69c25032b42a6274f7cb9b5c5950401354838a45f7cb77b95bf54718e2f3d3d9fb91eb2311903980277396398d9736d8e92fd838594ac8a537c6c529db5a8a4f89290e6ba6f20ac0e5ed6fef40901d0e0e8e3e502990811f9acaae555dd54eb1bcd96b513e2fe751bec",
-	"9f8e0caec87858599f5ab29bff86da78a841a918a023a111098687ecdf2747612d3f3809d9ca400b878bd4f92c43a1004f1c17c7f19a3cd1ce449bd2b23aff551623c37dd8c0be56bf3fd857b500c2b9f9ccea62481944090a3cf3b6ee81d9af8eeb60f65ef150f9fa4d3ed6ce4762d3d4f174ee8ccd460c25cafac0ea5ec8a6a4b2f9e8c0520cb7061155e532cb65f188b01e4b9086db951f504b060c296b326b3fc1c590498ecce594f828f4a10ea416675720ae505295d38a791bd0e93f428448a8f4c1fc0af53604a9e8255384d29ae5c334e2",
-	"33d1e683a4c97ee6bbaa5f9df1a88cb53b7f3c157b6045d70a56fda0ccbd3a1fa1f049cd564da072b53f415bf5fb843771c1d2551fd075d33377362b2f7c0645f9723123d11975991db8a2b518f02e2c7c30342a044754290bae2c77496d755e5981f12e6b0a0174280b958bf11ed628a9062775993ced04bf752ea8d165e3ac2177d7cd1b9371c44efa98f0b3e68602a839d384eec007979f46429dafb138cbc231ad928a9f65f7d66fac77416395e8f1debaaf76ec2e4e03e8674102cd26f614739f3ec9f949033df1fb97e87c2326d65aef94ed5f",
-	"180048f09d0b480887af7fd548a85abf605440c1ddde6afe4c30c30670233f7bf928f43b4681f59279ebbda5e8f8f2a1abefdee129e18ac60f9224e90b38b0aabd01308e0a27f41b6fb2ee07ee176ec9048c5fe33c3f7c791469c81f30e28170585b9f3e7e3c8c2e9d74370cb4518f13bf2dee048cbd98ffa32d85e43bcc64a626b40efb51ce712925fdd6fee006dc68b88004a81549d2121986dd1966084cd654a7c6686b3bae32afbd9625e09344e85cf9611ea08dfce835a2e5b3726e69ae8a76a97db60fcc539944ba4b1e8449e4d9802ae99fae86",
-	"13c0bc2f5eb887cd90eae426143764cf82b3545998c386007cca871890912217aa143ac4ed4ddb5a7495b704aa4de18419b8664b15bc26cfc6596a4d2ae408f98b47a566476d5802d594ba84c2f538def9d016661f6404bb2337a3932a24f6e30073a6c9c274b940c62c727242e24466084a3ea336365d71ea8fa6499c0ea8d59eea505f1126b99c795023c4963aa0d99323d0391e8701110edf551b2d3799e1063ca443f1add162156e445502ca1a052fe70c289838593b58839fc63de128a03e2bbf389e22ae0cf957fd03315ee407b096cc1cfd92dee6",
-	"6f1eb607d679efef065df08987a1174aab41bdac8aece7726dfa65805d6fff5b3d17a672d96b770dc32165f144f0f7324822a5c87563b7cd9e37a742ae83ef245d09006d91576f435a03476f509ea2936636232f66aa7f6cdf1ac187bbd1fcb8e20f8791866e60ed96c73374c12ac16795e999b891c64507d2dbd97e5fc29fac750ad27f2937cbcd29fdafccf27ab22453834d475f6186eaf975a36fad5c8bd61c21da554e1ded46c4c39765dcf5c8f5ccfb49b6a4dc562c919d0c7d8940ec536ab2448ec3c9a9c8b0e8fd4870cad9de2577c7b0c38563f355",
-	"dcdd993c94d3acbc555f464871a32c5da6f13b3d5bbc3e34429705e8ad2e76393fdd96a69a94acb652f5dc3c120d41187e9aa919669f727c4868013b0cb6acc165c1b7706c52248e15c3bf81eb6c147619467945c7c48fa14a73e7c3d5bec91706c567145342a026c9d97eff97ec672c5debb9df1a998083b0b0081d65c517b3e5634c95e347e781aa30ca1c8af815e2e494d844e847fdcb41622894a518dc36571123a40bfdbe8c4f4cff44d83c61dd9dcd24c464c53b395edb31efee9f3aa080e87cdc3d22d613ae84a53c9249c32c96f9a3bc4629bb126a70",
-	"49971f9823e63c3a72574d977953329e813b22a8387cd13f56d8ea77a5d1a8a20012632d1d8732bbcb9f756b9675aab5db927beacab7ca263e5718b8dfa7b2eed9a91bf5ed163b16139d45f7b8cc7e3f7bdda6202106f67dfb23b7c315ee3e17a09d466b1e6b13e7c7428184a979f5358667b4fa8bd40bcc8ea46058db44587a85377ac46bf155136c09ac58cb6c27f28e17028c91e7e8f74d5b500e56293b316974f02b9d9ea205d9b6ac4cfb74eb8eb0c944577fd2f41316368307beab3e327bf7dbaa0a4428836ec4e895dea635234abeaf113ceeadac33c7a3",
-	"c57a9cc958cee983599b04fe694f15fb470fcbc53e4bfcc00a27351b12d5d2434444253ad4184e87b81b738922ffd7ff1dc1e54f39c5518b49fb8fe50d63e3935f99e4bd125e8dc0ba8a17fd62de709339a43fabe15cf86d96a54010112170c340cfac4132182eed7301402bc7c8276089dec38488af145cb6222525894658f03501204b7a66aba0be1b557b28a2f652d66f7313ed825ecc4d8596c1be7420d4425b86a1a90a5b7f30d0f24e0d1aae0eb619ca457a71699e44be612a4011c597ee80b94d5507e429d7fc6af22579cd6ad642723b05ef169fade526fb",
-	"0568a672cd1ecbaa947045b712e2ac27995392fbef8f9488f79803cbee561c212287f080eca95adb5ba42739d78e3ba667f06045d87850d3a0499358649caa257ad29f1a9c511e7054db20554d15cbb55ff854afa45cae475c729cea72ede953522031865bc02b95589ed4d9841c552a8cc94904a93ed09ed77222f6c178195056be59bc4e96a815adf534e6b466fb47e262ff79c803c157a21b6e2269c2e0abeb494113cd868d8466e82d4b2f6a28b73645853d96bc9242515d803e33294848d3fe42fdff68da53c03491636beede47ff1399dd3d54a5e914d55d7adf",
-	"3f19f61a4cd085796731ac9f85a75a8bce77031932c31762d87d8b8d07b8bd19ff78d6b7d1bd1e87f3a4f41aad03b6c4d17a6cbc86be55f7c8b88ada047bb04f8d49f1c34bcf81cc0f3389ad01a758fc7eeb0072aa9ad1481992bfdde82e438e75590a4423832dfbe3756e2229ea873bc3606e6d72174cb2163bf40b5d49c81009dab85ecc03e311351bbf96e32c030a2b276a7698cb25bc2c967acb3213161a1fdde7d912cd6a804490f8056c47da1333f6e35c41e749c2c23919cb9af5eec5652e6e072b034fb1682e9aaa194a9c0bd456ea0b008d14dbce37967a7a8e",
-	"705f98f632d99d3651793825c38dc4deda56c59eac539da6a0159c83131cf8ab6f2ee0c3b74111fde351f7aa1a8c500a0cecab17c212d2c58ca09eae608c8eefc922b9902ef8d6832f799ba48c3c28aa702b3242107edeba01daafe424406a3822965056cfe8783455a671e93b1e2eae2321364f1871471c82124df33bc09e1b52882bd7e1c4c7d0b2f3dd4a28c2a002a43246768af0700f9659de99d62167be93177aabf19d678e79e9c726ac510d94e74873eda99620a3961930cd91937c88a06d8153d64fd60da7ca38cf26d1d4f04a0df273f52127c53fdc593f0f8df9",
-	"ea6f8e977c954657b45f25480ff42c36c7a10c77caa26eb1c907062e24fbca5aebc65cacca0de10abea8c78322f08672e13d8ac16996eca1aa17402eaea4c1cc6c800b22dc18cb8d620192d74bac02c07b5cfa61e513c7f28b7e29b9700e0e442720bf4c669d4995da19d19f841d9eb68cc74153592591e3bf059ef616b95305aa453b32fe99a91afb35bd482cf2b7aa42702837a53be3c38883d2963020e347556f841254ec6b85854485fe8c520b05f2ea67a9bf3981555c20991e2bacd4db5b418228b6002d8d41c025cb472bf5443aaa885974a408ea7f2e3f932c600deb",
-	"408190134ed06556811b1af808ab2d986aff152a28de2c41a2207c0ccc18125ac20f48384de89ea7c80cda1da14e60cc1599943646b4c0082bbcda2d9fa55a13e9df2934edf15eb4fd41f25fa3dd706ab6de522ed351b106321e494e7a27d5f7caf44ec6fadf1122d227eefc0f57aefc140d2c63d07dcbfd65790b1099745ed042cfd1548242076b98e616b76ff0d53db5179df8dd62c06a36a8b9e95a671e2a9b9dd3fb187a31ae5828d218ec5851913e0b52e2532bd4bf9e7b349f32de2b6d5d3cdf9f372d49617b6220c93c05962327e99a0480488443349f0fd54c1860f7c8",
-	"5f9e5c6f38573a85010a9d84d33f29c057003b2645e3ea6f72cbc7af95d197ce6a06b13fea81722853e6991791b8b15091cd066f5ed913592ed3d3af5370d39ba22beeb2a582a414b16824b77e194a094c2afdcc09aa73ce36f4943cca5ae32c5017dc398801dd92a47382d9327c9f6cffd38ca4167cd836f7855fc5ff048d8efba378cdde224905a0425e6b1de061fc951c5e624a5153b008ad41160a710b3ff2081748d5e02deb9f841f4fc6cf4a15153dd4fe874fd447482696283e79ee0e6bc8c1c0409baa5ab02c5209c319e3169b2476149c0c6e541c6197ca46e004eef533",
-	"218c6b3508aec69574f2b5039b30b942b72a8349d05f48ff945bbbe5c8957d5a6199492a6bf54bab821c9377e2edfa4c908384664d2c80112d5e805d66e0a551b941021be17dd20bd825bea9a3b6afb1b8c605805b3bda58750f03ea5c953a698494b425d8980c69f34d1c3f6b5866e8717031152a127215c256e08873c21b0f5cc85875d0f7c94601659150c04cd5fe5d381ba29983a2d94fcd3a65a94c53c7279cd000dddd4253d8cff8d7f6ace10247fe3bc30d63ba4bb54f557b3d22a3924369430d71ab37b701e9500bda70b5a643704858beed4726a889b6c9c91584194c68f1",
-	"dac26aa7273fc25d6e044c79fc2bfa46e59892a42bbca59a86826c91e76ab03e4bd9f7c0b5f08d1931d88b36ea77d94f7ba67cd4f1d3086e529427201119096ae066ae6f170940830ed7900de7bb9d66e09788287403a4ecc93c6da975d2fb08e918840a236c15f5d3a8f7375c2eeebbf6f01a6e7f29ca2b8d42df158414c320777433663c59fdcd1f39ca68e3473db721be7ce8c6dba5fddc024f94fedb286b0477581d451313ca8c737484daf60d67f9b2d56d4bcc271f7e9ae958c7f258efbc74d25753e0516f28282461941bf2dcc7dd8c7df6173b89760cefcac07190243ff863fb",
-	"c46e6512e6797cc7a54254a1b26b2de29aa83d6c4b1ea5a2786fbcec388270625b12635eae39e1fba013f8a65219421bca8b52a8ddfd431cda60299bdf160734d5a7450ec79620058522702174ae451b9bfa7c4a455fbbee3e1d048c7d4bac5131018228f137c8e130440c7059b4f15eaa34ce872a851a16ce86f982df78a00be4d564da2003a450ddee9ab43ea876b8b4b65c84f0b39265fd5456417afb5bc54997c986e66fc222f2123ba5e719c4d6b9a177b188277df384f1125821cf19d5248cef0be183ccdc84ac194506f740ed2188b2689ea4c9236a9e9e3a2fff85b6af4e9b49a3",
-	"1ccd4d278d67b65cf2564ecd4de1b55fe07adc80e1f735fe2f08ea53fd3977323689122c29c798957abaff6aba09bdcbf661d77f4dc8913ab1fe2bef38846166e3834785e7105d746484eff8c656af5d8c7854abc1c62b7fadb65521dc6f793d978bda9838eb3800417d32e8a24d8c8cb1d18a5de6ca79d9e1b0ff9aa25e6218fe944cf18666fecc1e31334b390260dbe0997539e1b02f6366b2aea4f4a21efe04f4b97568fcb39e59919d5ebac6543d5d0f48fc66b923c34aac377dc95c20329b837b6ed5e8d9a3d2089cd0d8f025658006ff41cbdaccca618822ca590ab155253f8bc1c7f5",
-	"9875209588395ee3c9fdd793fd48717cc84c8c3ea622b2ccc4a1be4448e6034b7810569855255031f10be5ffd714b05f9ce01972d712d40abf03d4d0ce175813a7a668f761324996093fc2aa5912f7fc2abdadd8775d2b4d9ad492216293381460ed8f6db3d641d1525f4242c348bbfe504c704f215dc461de51b5c75c1aae967936963848f16c673eca5e78dfd47eb19001d52d1bcf96c98956dad5ddf594a5da757e7ca35f2f69803b784e66ac5a58b75c228b8266ec592505e5d1ca87d81225738855f15bc0914677e81593fd409e77d159f8a908f67788de9eb06c5561547aada96c47c535",
-	"40c90e375e366f3756d89091eb3eed9fe0fbfc5638700af4617d358812bac53124a2205dd6756456787d49cd6a35e302479a0992288f47532e4ea7ab62fc5ad5adc690a5d9a446f7e035ad4641bd8dae83946aee3338ec984ccb5cc633e1409f2531eeffe05532a8b0062ba99454c9aeabf8ecb94db195af7032bfebc22912f49d39330add47ff8fa5720612d697f0b602738930e060a1bb214efc5e292224cf34e29deaea6b1b1ff847e94ecc997325ac38df61db45d82bf0e74a664d2fe085c20b04c39e90d6a170b68d2f1d373f00c731c524456ada73d659aaac9df3191a7a3865083343fc13",
-	"e8800d82e072210ca6d7fa2472028974780b76aad4bcb9ad362422dd05ae3232668251d164daa375a43b26a38cce28dbeb3dee1a4a579f70d0fe7febb29b5ece8aa836e050fb3d188c63aa9c3c0da6c717d86458a6096b5effceb964efdec7035960c09ccd10dea3c5f1c7f9f478d5887ebbe2e15c5ff85dbacbc444bb951c4eec7abecb89ed80187e409e2972ffe1a5f01562af109f2cf09471cf72cf83a3bb8f4e2ef38ed0e326b698296394e5b2718a5000c01425708e8ad0461e62462d8819c2377f13ab1be2c7c9f33dc06fe23cad27b87569f2ce2e56e4b2c60c7b1b3d370841d89ebdc1f192",
-	"796d6d1447d5b7e8c55cd8b2f8b7010db39f27565f907e3fc0e464ea2d4bb52b37f10e7c6dcfc59231b9cdee12c32aeb4adbc42b86e86eb6defb5b69e6ca75e1f4d0dae3e124e5a1b8b6697f7e10b0403f1f0a5ff848eef3752837a9ba17780f16a9a709188a8d5b89a2fa74adb2e651163b1c2b3d261e225c9158dcd9eb7ac3d6704cee290cdff6bcb3cb90cee030aa0d19d4693655c3c30ac6fc06d2ae37787c47126d57ed9a6bef5f8a6c56859aefc08755739a95aac57a4dd916a92ba9f3afbf969df8085949615033365c751a9a3e1a18cee98a69d22e64009bebf8307169b6c61de0617ecfafdf",
-	"4f9057183566153cf337b07c3f5556006de54c56b2a1e5326c07aaeabd1886ec6f1641358925db232b2f0dbf75229c796a7395b2f934c1f99090bec1123f3c841b1cb3c5b1ec42ed5408f2940f0c48a9470b852c46d6557853d459cecd2c32bbcd8ee21fa11e385eef0857cba4d8545a61b52a484cdd779db4739fbc7aa9860dcabe0488b98fa0b60c3f7d6153db279000a52ffb573dab37d2ab1896a90e5deb7ac6bbe56239085c325d83a917dc6e8a448425b718c2356b9f3066163555ec444f372e184e02c8c4c69b1c1c2ae2b51e45b98f73d933d18750968945ca85d6bbb22014b4c4015262e3c40d",
-	"79dcca7d8b81a61359e4aece21f3df7b99518ce70bd2f57a18bab5e7114af2add0a0cea7f319d69f231f060e0a539d9a23fb3e95451ce8c6340cfb09edf931df84203a39226dd9eb278f11b691ef612585b973daab373e65d11325898badf6732100371fd759960fa8fec373268421d28bffdb9b12a430b92fe4b07566ca0c89e616e49f8fc75ccd9cdc66db820d7c02e109aa5ed86b89770262918a518f90a2292f6b68d68ae03992e4259a17a23c84ec2a417f082b5abf3a26e44d2278ecb8ba9456965303a75f25394d1aaf5544590e74b14d8a4cc4050be2b0ebcfe4d2db6b12a02c68a3bcdda70301f3",
-	"848755dc31e25e9a42f9ec12d847d19f292c14c162c9aba49e972cb123b58b8e57bb263a923929833373858594ff52dbc298dbbc078599194e4c07b0e5fc1e10808bbacdb6e93c72b333685cf961f28eb0d5a395c63266b01f130d25db384b356e5da6d01042fc2359581b89c63b3bb2d1ce897fbc9e83fe85d9666cb60e6a8c657f70caad5387b8a045bf91095606802c8424ea8ac52ef29386dc46183378a5fcb2cb927428b8c070f1c42aafd3bc70ca25437807696a46873cfeb7b80ba2ebc3c4272443d445e46343a1465253a9eebd532a0d1d2c18264b91ff45159f245404ae9335f2af55c802772426b4",
-	"ecaa6e999ef355a0768730edb835db411829a3764f79d764bb5682af6d00f51b313e017b83fffe2e332cd4a3de0a81d6a52084d5748346a1f81eb9b183ff6d93d05edc00e938d001c90872dfe234e8dd085f639af168af4a07e18f1c56ca6c7c1addffc4a70eb4660666dda0321636c3f83479ad3b64e23d749620413a2ecdcc52ad4e6e63f2b817ce99c15b5d2da3792721d7158297cce65e0c04fe810d7e2434b969e4c7892b3840623e153576356e9a696fd9e7a801c25de621a7849da3f99158d3d09bf039f43c510c8ffb00fa3e9a3c12d2c8062dd25b8dabe53d8581e30427e81c3dfc2d455352487e1255",
-	"23a3fe80e3636313fdf922a1359514d9f31775e1adf24285e8001c04dbce866df055edf25b506e18953492a173ba5aa0c1ec758123406a97025ba9b6b7a97eb14734424d1a7841ec0eaeba0051d6e9734263bea1af9895a3b8c83d8c854da2ae7832bdd7c285b73f8113c3821cced38b3656b4e6369a9f8327cd368f04128f1d78b6b4260f55995277feffa15e34532cd0306c1f47354667c17018ee012a791af2dbbc7afc92c388008c601740cccbbe66f1eb06ea657e9d478066c2bd2093ab62cd94abadc002722f50968e8acf361658fc64f50685a5b1b004888b3b4f64a4ddb67bec7e4ac64c9ee8deeda896b9",
-	"758f3567cd992228386a1c01930f7c52a9dcce28fdc1aaa54b0fed97d9a54f1df805f31bac12d559e90a2063cd7df8311a148f6904f78c5440f75e49877c0c0855d59c7f7ee52837e6ef3e54a568a7b38a0d5b896e298c8e46a56d24d8cabda8aeff85a622a3e7c87483ba921f34156defd185f608e2241224286e38121a162c2ba7604f68484717196f6628861a948180e8f06c6cc1ec66d032cf8d16da039cd74277cde31e535bc1692a44046e16881c954af3cd91dc49b443a3680e4bc42a954a46ebd1368b1398edd7580f935514b15c7fbfa9b40048a35122283af731f5e460aa85b66e65f49a9d158699bd2870",
-	"fe511e86971cea2b6af91b2afa898d9b067fa71780790bb409189f5debe719f405e16acf7c4306a6e6ac5cd535290efe088943b9e6c5d25bfc508023c1b105d20d57252fee8cdbddb4d34a6ec2f72e8d55be55afcafd2e922ab8c31888bec4e816d04f0b2cd23df6e04720969c5152b3563c6da37e4608554cc7b8715bc10aba6a2e3b6fbcd35408df0dd73a9076bfad32b741fcdb0edfb563b3f753508b9b26f0a91673255f9bcda2b9a120f6bfa0632b6551ca517d846a747b66ebda1b2170891ece94c19ce8bf682cc94afdf0053fba4e4f0530935c07cdd6f879c999a8c4328ef6d3e0a37974a230ada83910604337",
-	"a6024f5b959698c0de45f4f29e1803f99dc8112989c536e5a1337e281bc856ff721e986de183d7b0ea9eb61166830ae5d6d6bc857dc833ff189b52889b8e2bd3f35b4937624d9b36dc5f19db44f0772508029784c7dac9568d28609058bc437e2f79f95b12307d8a8fb042d7fd6ee910a9e8df609ede3283f958ba918a9925a0b1d0f9f9f232062315f28a52cbd60e71c09d83e0f6600f508f0ae8ad7642c080ffc618fcd2314e26f67f1529342569f6df37017f7e3b2dac32ad88d56d175ab22205ee7e3ee94720d76933a21132e110fefbb0689a3adbaa4c685f43652136d09b3a359b5c671e38f11915cb5612db2ae294",
-	"af6de0e227bd78494acb559ddf34d8a7d55a03912384831be21c38376f39cda8a864aff7a48aed758f6bdf777779a669068a75ce82a06f6b3325c855ed83daf5513a078a61f7dc6c1622a633367e5f3a33e765c8ec5d8d54f48494006fdbf8922063e5340013e312871b7f8f8e5ea439c0d4cb78e2f19dd11f010729b692c65dd0d347f0ce53de9d849224666ea2f6487f1c6f953e8f9dbfd3d6de291c3e9d045e633cfd83c89d2f2327d0b2f31f72ac1604a3db1febc5f22cad08153278047210cc2894582c251a014c652e3951593e70e52a5d7451be8924b64f85c8247dab6268d24710b39fc1c07b4ac829fbda34ed79b5",
-	"d7314e8b1ff82100b8f5870da62b61c31ab37ace9e6a7b6f7d294571523783c1fdedcbc00dd487dd6f848c34aab493507d07071b5eb59d1a2346068c7f356755fbde3d2cab67514f8c3a12d6ff9f96a977a9ac9263491bd33122a904da5386b943d35a6ba383932df07f259b6b45f69e9b27b4ca124fb3ae143d709853eed86690bc2754d5f8865c355a44b5279d8eb31cdc00f7407fb5f5b34edc57fc7ace943565da2222dc80632ccf42f2f125ceb19714ea964c2e50603c9f8960c3f27c2ed0e18a559931c4352bd7422109a28c5e145003f55c9b7c664fdc985168868950396eaf6fefc7b73d815c1aca721d7c67da632925",
-	"2928b55c0e4d0f5cb4b60af59e9a702e3d616a8cf427c8bb03981fb8c29026d8f7d89161f36c11654f9a5e8ccb703595a58d671ecdc22c6a784abe363158682be4643002a7da5c9d268a30ea9a8d4cc24f562ab59f55c2b43af7dbcecc7e5ebe7494e82d74145a1e7d442125eb0431c5ea0939b27afa47f8ca97849f341f707660c7fbe49b7a0712fbcb6f7562ae2961425f27c7779c7534ecdeb8047ff3cb89a25159f3e1cefe42f9ef16426241f2c4d62c11d7ac43c4500dfcd184436bb4ef33260366f875230f26d81613c334dbda4736ba9d1d2966502914ec01bbe72d885606ec11da7a2cb01b29d35eebedbb0ecc73ed6c35",
-	"fd993f50e8a68c7b2c7f87511ce65b93c0aa94dcbdf2c9cca93816f0f3b2ab34c62c586fc507b4900a34cf9d0517e0fe10a89d154c5419c1f5e38de00e8834fe3dc1032abdeb10729a81655a69a12856a78ca6e12110580de879b086fd6608726541cfa9616326bdd36064bc0d1e5f9c93b41278bff6a13b2494b81e238c0c45aea1b07d855e8f3fe1478e373bd9d3957cf8a5e5b9003386793d994c7c575cff2322e2428cbbaa4f47560316ae3354a7478842ff7cc5dcbacb6e871e72b36f06d63a9aaeb9044cfb7974afdc238a5816f537dcf33ee40b4e1a5eb3cff2402b46d548264e133008d284f11b7e4e450bc3c5ff9f79b9c4",
-	"8df21892f5fc303b0de4adef1970186db6fe71bb3ea3094922e13afcfabf1d0be009f36d6f6310c5f9fda51f1a946507a055b645c296370440e5e83d8e906a2fb51f2b42de8856a81a4f28a73a8825c68ea08e5e366730bce8047011cb7d6d9be8c6f4211308fad21856284d5bc47d199988e0abf5badf8693ceeed0a2d98e8ae94b7775a42925edb1f697ffbd8e806af23145054a85e071819cca4cd48875290ca65e5ee72a9a54ff9f19c10ef4adaf8d04c9a9afcc73853fc128bbebc61f78702787c966ca6e1b1a0e4dab646acdfcd3c6bf3e5cfbec5ebe3e06c8abaa1de56e48421d87c46b5c78030afcafd91f27e7d7c85eb4872b",
-	"48ec6ec520f8e593d7b3f653eb15553de246723b81a6d0c3221aaa42a37420fba98a23796338dff5f845dce6d5a449be5ecc1887356619270461087e08d05fb60433a83d7bd00c002b09ea210b428965124b9b27d9105a71c826c1a2491cfd60e4cfa86c2da0c7100a8dc1c3f2f94b280d54e01e043acf0e966200d9fa8a41daf3b9382820786c75cadbb8841a1b2be5b6cbeb64878e4a231ae063a99b4e2308960ef0c8e2a16bb3545cc43bdf171493fb89a84f47e7973dc60cf75aeeca71e0a7ebe17d161d4fb9fe009941cc438f16a5bae6c99fcad08cac486eb2a48060b023d8730bf1d82fe60a2f036e6f52a5bff95f43bbe088933f",
-	"f4d84ed3e564c102600a795eaa9b1eaf4ad12f1a4deca1d042a0a2750ddf6201db03073d8bf553cb9dde48a1b0083827a609f7242b86584cc180964ae794b12ce55661e00e36a6ba4dbc389e6a5a85f1b45df9af7ead1b0a54db56e68639b9d438a91504e82c35d40c7bc7e048a53ac0b04accd0dadf4ac9884b0ca0e3cb5ba4336e3581be4c4760a553823ffa283a1120d4e145af56a59f2533903650f0b9e9ad9fe2e8a3c3c3dd03a1fcb709032c8835324839c735b0c051d0cbd8b5d867617c11023432e4bd275d3d0eb98a0b6cf58071a5b712922f2bc751ac7c2588c447444cde2f37a8ea5ec126425bf517e0d17c9e2999f52fee14b3",
-	"2ccea21bac9c2b70d3923309cbf2d7cb7abd1fcc8b8b002688870a80029c62397350c3c898194e5deea360bb963d26d485cb7963f8167586976ec0556950b2e86135f4a2800991ce8473bfd44a3c5e937a48b5e355ba5141bccf2131a83988d9d2a9e8e7635a956105b3512c05ef708139ced51d7a4e204c12d8a49a21e8dc6de2629a2fd092326885d9f218745fe09f6d91fb6afce250a30a63689534b6be1f26899ffa3767d835cf586aa47776700f94241bc999b1e3deefe188f37ff734f5f16ee6a00914323dc7b8a143c9137cdcc5cd08ae9566f04bb2941532674c97dff6ffa5ce3405ef8e5d27ec403114253dd6394c0167d72a0044c5",
-	"2b681c6398aee63bf862770341648bbcd31d7de7903c5903fe3d9469311320bb24d914f2af0cdca199c97214c7c679dc32a2800ba484a03c010ea6be3bb9f2c87e30a98b606050b8a3f297f12b8f92caaeceb3e844652115934874e0a1ab093a73d759b53f6a6c3096940dd22c2bb96ce6820a7b9c6d71a208de9892aa6a7209b0fff56a0cafea52b952cdd6f5752cff3309d448800b4e4c878aa595595b56b12b83fcd6ca89520c7da664e449d7b4438fc455888aad5de0fad9a06eed14afd3513b5ebbffe01775549b701181bd26370764f56eba52fdb24286ad1ac0f5418a7c429f7dfc7f3168437fa8eed7a2ed7c723a485e4c3ed14dea2e07",
-	"aadfd505a89f4aade2c3018258a7e039401b1fc6a7f3d87910dddbb880d372ec8a13c70d92245de5b8e5f9a285c33b99dc82fa2b22decee72b93a72211656ad7a52696c8e570f78be28c0e427a371dafde856e8d5ed24f83b0660b51e7fac05d93a8666dfde6def59af863f80f3e5f6801182c87422203df390dcb736b8f830052a8832eeeb0b4e27e732aaf793d166b5a3ec7745aeef3766937c2b75a276bddd145f6010c29d035e343e267cb2d828436876ec3a7ebe3b6347d4172f7a99d6821ce152e039e53deb33340b324c7f068ffb94b3cde35a8eaa12d15c3806a7ad0acec3e8c7078c1d32a28fd3eec9f32cb86e4c22166ff69e83785e851",
-	"1605b8cce529a9d6262fd4390d9e4ae5e14e0adc0ec89b028ef68dd0f373ea259aaa96f2967091dd0874c0105385e9e6da9ca68297c31afa44ef834535fb302ce5b4e49edacbbdf359fe1228a8172495b3e57014c27edd58b685110980056c50c398a64f4923f2d720b4df16d75cb36b4233660694182099c35028a972519c24764fc94e18e582b24deb3491535fc06b83837c7958522800e822201d694af0bd0aa3834e17d4b1ba36f470905ae5f8bbeeb6c4c8604d8af02baa347b07086d6989867ddd5e8e8ed7740c3469bfa2810519c55c6add1332c4c54ee9097961d6741cb12a09713a0d07645f784f42f5ad94b48b836b34263130b0483f15e3",
-	"ff9c6125b2f60bfd6c2427b279df070e430075096647599bdc68c531152c58e13858b82385d78c856092d6c74106e87ccf51ac7e673936332d9b223444eaa0e762ee258d8a733d3a515ec68ed73285e5ca183ae3278b4820b0ab2797feb1e7d8cc864df585dfb5ebe02a993325a9ad5e2d7d49d3132cf66013898351d044e0fe908ccdfeeebf651983601e3673a1f92d36510c0cc19b2e75856db8e4a41f92a51efa66d6cc22e414944c2c34a5a89ccde0be76f51410824e330d8e7c613194338c93732e8aea651fca18bcf1ac1824340c5553aff1e58d4ab8d7c8842b4712021e517cd6c140f6743c69c7bee05b10a8f24050a8caa4f96d1664909c5a06",
-	"6e85c2f8e1fdc3aaeb969da1258cb504bbf0070cd03d23b3fb5ee08feea5ee2e0ee1c71a5d0f4f701b351f4e4b4d74cb1e2ae6184814f77b62d2f08134b7236ebf6b67d8a6c9f01b4248b30667c555f5d8646dbfe291151b23c9c9857e33a4d5c847be29a5ee7b402e03bac02d1a4319acc0dd8f25e9c7a266f5e5c896cc11b5b238df96a0963ae806cb277abc515c298a3e61a3036b177acf87a56ca4478c4c6d0d468913de602ec891318bbaf52c97a77c35c5b7d164816cf24e4c4b0b5f45853882f716d61eb947a45ce2efa78f1c70a918512af1ad536cbe6148083385b34e207f5f690d7a954021e4b5f4258a385fd8a87809a481f34202af4caccb82",
-	"1e9b2c454e9de3a2d723d850331037dbf54133dbe27488ff757dd255833a27d8eb8a128ad12d0978b6884e25737086a704fb289aaaccf930d5b582ab4df1f55f0c429b6875edec3fe45464fa74164be056a55e243c4222c586bec5b18f39036aa903d98180f24f83d09a454dfa1e03a60e6a3ba4613e99c35f874d790174ee48a557f4f021ade4d1b278d7997ef094569b37b3db0505951e9ee8400adaea275c6db51b325ee730c69df97745b556ae41cd98741e28aa3a49544541eeb3da1b1e8fa4e8e9100d66dd0c7f5e2c271b1ecc077de79c462b9fe4c273543ecd82a5bea63c5acc01eca5fb780c7d7c8c9fe208ae8bd50cad1769693d92c6c8649d20d8",
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/blake2x.go b/installer/vendor/golang.org/x/crypto/blake2b/blake2x.go
deleted file mode 100644
index c814496a76..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/blake2x.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2b
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-// XOF defines the interface to hash functions that
-// support arbitrary-length output.
-type XOF interface {
-	// Write absorbs more data into the hash's state. It panics if called
-	// after Read.
-	io.Writer
-
-	// Read reads more output from the hash. It returns io.EOF if the limit
-	// has been reached.
-	io.Reader
-
-	// Clone returns a copy of the XOF in its current state.
-	Clone() XOF
-
-	// Reset resets the XOF to its initial state.
-	Reset()
-}
-
-// OutputLengthUnknown can be used as the size argument to NewXOF to indicate
-// the the length of the output is not known in advance.
-const OutputLengthUnknown = 0
-
-// magicUnknownOutputLength is a magic value for the output size that indicates
-// an unknown number of output bytes.
-const magicUnknownOutputLength = (1 << 32) - 1
-
-// maxOutputLength is the absolute maximum number of bytes to produce when the
-// number of output bytes is unknown.
-const maxOutputLength = (1 << 32) * 64
-
-// NewXOF creates a new variable-output-length hash. The hash either produce a
-// known number of bytes (1 <= size < 2**32-1), or an unknown number of bytes
-// (size == OutputLengthUnknown). In the latter case, an absolute limit of
-// 256GiB applies.
-//
-// A non-nil key turns the hash into a MAC. The key must between
-// zero and 32 bytes long.
-func NewXOF(size uint32, key []byte) (XOF, error) {
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	if size == magicUnknownOutputLength {
-		// 2^32-1 indicates an unknown number of bytes and thus isn't a
-		// valid length.
-		return nil, errors.New("blake2b: XOF length too large")
-	}
-	if size == OutputLengthUnknown {
-		size = magicUnknownOutputLength
-	}
-	x := &xof{
-		d: digest{
-			size:   Size,
-			keyLen: len(key),
-		},
-		length: size,
-	}
-	copy(x.d.key[:], key)
-	x.Reset()
-	return x, nil
-}
-
-type xof struct {
-	d                digest
-	length           uint32
-	remaining        uint64
-	cfg, root, block [Size]byte
-	offset           int
-	nodeOffset       uint32
-	readMode         bool
-}
-
-func (x *xof) Write(p []byte) (n int, err error) {
-	if x.readMode {
-		panic("blake2b: write to XOF after read")
-	}
-	return x.d.Write(p)
-}
-
-func (x *xof) Clone() XOF {
-	clone := *x
-	return &clone
-}
-
-func (x *xof) Reset() {
-	x.cfg[0] = byte(Size)
-	binary.LittleEndian.PutUint32(x.cfg[4:], uint32(Size)) // leaf length
-	binary.LittleEndian.PutUint32(x.cfg[12:], x.length)    // XOF length
-	x.cfg[17] = byte(Size)                                 // inner hash size
-
-	x.d.Reset()
-	x.d.h[1] ^= uint64(x.length) << 32
-
-	x.remaining = uint64(x.length)
-	if x.remaining == magicUnknownOutputLength {
-		x.remaining = maxOutputLength
-	}
-	x.offset, x.nodeOffset = 0, 0
-	x.readMode = false
-}
-
-func (x *xof) Read(p []byte) (n int, err error) {
-	if !x.readMode {
-		x.d.finalize(&x.root)
-		x.readMode = true
-	}
-
-	if x.remaining == 0 {
-		return 0, io.EOF
-	}
-
-	n = len(p)
-	if uint64(n) > x.remaining {
-		n = int(x.remaining)
-		p = p[:n]
-	}
-
-	if x.offset > 0 {
-		blockRemaining := Size - x.offset
-		if n < blockRemaining {
-			x.offset += copy(p, x.block[x.offset:])
-			x.remaining -= uint64(n)
-			return
-		}
-		copy(p, x.block[x.offset:])
-		p = p[blockRemaining:]
-		x.offset = 0
-		x.remaining -= uint64(blockRemaining)
-	}
-
-	for len(p) >= Size {
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		copy(p, x.block[:])
-		p = p[Size:]
-		x.remaining -= uint64(Size)
-	}
-
-	if todo := len(p); todo > 0 {
-		if x.remaining < uint64(Size) {
-			x.cfg[0] = byte(x.remaining)
-		}
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		x.offset = copy(p, x.block[:todo])
-		x.remaining -= uint64(todo)
-	}
-	return
-}
-
-func (d *digest) initConfig(cfg *[Size]byte) {
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	for i := range d.h {
-		d.h[i] = iv[i] ^ binary.LittleEndian.Uint64(cfg[i*8:])
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2b/register.go b/installer/vendor/golang.org/x/crypto/blake2b/register.go
deleted file mode 100644
index efd689af4b..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2b/register.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package blake2b
-
-import (
-	"crypto"
-	"hash"
-)
-
-func init() {
-	newHash256 := func() hash.Hash {
-		h, _ := New256(nil)
-		return h
-	}
-	newHash384 := func() hash.Hash {
-		h, _ := New384(nil)
-		return h
-	}
-
-	newHash512 := func() hash.Hash {
-		h, _ := New512(nil)
-		return h
-	}
-
-	crypto.RegisterHash(crypto.BLAKE2b_256, newHash256)
-	crypto.RegisterHash(crypto.BLAKE2b_384, newHash384)
-	crypto.RegisterHash(crypto.BLAKE2b_512, newHash512)
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s.go
deleted file mode 100644
index ae0dc922b9..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blake2s implements the BLAKE2s hash algorithm defined by RFC 7693
-// and the extendable output function (XOF) BLAKE2Xs.
-//
-// For a detailed specification of BLAKE2s see https://blake2.net/blake2.pdf
-// and for BLAKE2Xs see https://blake2.net/blake2x.pdf
-//
-// If you aren't sure which function you need, use BLAKE2s (Sum256 or New256).
-// If you need a secret-key MAC (message authentication code), use the New256
-// function with a non-nil key.
-//
-// BLAKE2X is a construction to compute hash values larger than 32 bytes. It
-// can produce hash values between 0 and 65535 bytes.
-package blake2s // import "golang.org/x/crypto/blake2s"
-
-import (
-	"encoding/binary"
-	"errors"
-	"hash"
-)
-
-const (
-	// The blocksize of BLAKE2s in bytes.
-	BlockSize = 64
-
-	// The hash size of BLAKE2s-256 in bytes.
-	Size = 32
-
-	// The hash size of BLAKE2s-128 in bytes.
-	Size128 = 16
-)
-
-var errKeySize = errors.New("blake2s: invalid key size")
-
-var iv = [8]uint32{
-	0x6a09e667, 0xbb67ae85, 0x3c6ef372, 0xa54ff53a,
-	0x510e527f, 0x9b05688c, 0x1f83d9ab, 0x5be0cd19,
-}
-
-// Sum256 returns the BLAKE2s-256 checksum of the data.
-func Sum256(data []byte) [Size]byte {
-	var sum [Size]byte
-	checkSum(&sum, Size, data)
-	return sum
-}
-
-// New256 returns a new hash.Hash computing the BLAKE2s-256 checksum. A non-nil
-// key turns the hash into a MAC. The key must between zero and 32 bytes long.
-func New256(key []byte) (hash.Hash, error) { return newDigest(Size, key) }
-
-// New128 returns a new hash.Hash computing the BLAKE2s-128 checksum given a
-// non-empty key. Note that a 128-bit digest is too small to be secure as a
-// cryptographic hash and should only be used as a MAC, thus the key argument
-// is not optional.
-func New128(key []byte) (hash.Hash, error) {
-	if len(key) == 0 {
-		return nil, errors.New("blake2s: a key is required for a 128-bit hash")
-	}
-	return newDigest(Size128, key)
-}
-
-func newDigest(hashSize int, key []byte) (*digest, error) {
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	d := &digest{
-		size:   hashSize,
-		keyLen: len(key),
-	}
-	copy(d.key[:], key)
-	d.Reset()
-	return d, nil
-}
-
-func checkSum(sum *[Size]byte, hashSize int, data []byte) {
-	var (
-		h [8]uint32
-		c [2]uint32
-	)
-
-	h = iv
-	h[0] ^= uint32(hashSize) | (1 << 16) | (1 << 24)
-
-	if length := len(data); length > BlockSize {
-		n := length &^ (BlockSize - 1)
-		if length == n {
-			n -= BlockSize
-		}
-		hashBlocks(&h, &c, 0, data[:n])
-		data = data[n:]
-	}
-
-	var block [BlockSize]byte
-	offset := copy(block[:], data)
-	remaining := uint32(BlockSize - offset)
-
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	hashBlocks(&h, &c, 0xFFFFFFFF, block[:])
-
-	for i, v := range h {
-		binary.LittleEndian.PutUint32(sum[4*i:], v)
-	}
-}
-
-type digest struct {
-	h      [8]uint32
-	c      [2]uint32
-	size   int
-	block  [BlockSize]byte
-	offset int
-
-	key    [BlockSize]byte
-	keyLen int
-}
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Size() int { return d.size }
-
-func (d *digest) Reset() {
-	d.h = iv
-	d.h[0] ^= uint32(d.size) | (uint32(d.keyLen) << 8) | (1 << 16) | (1 << 24)
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	if d.keyLen > 0 {
-		d.block = d.key
-		d.offset = BlockSize
-	}
-}
-
-func (d *digest) Write(p []byte) (n int, err error) {
-	n = len(p)
-
-	if d.offset > 0 {
-		remaining := BlockSize - d.offset
-		if n <= remaining {
-			d.offset += copy(d.block[d.offset:], p)
-			return
-		}
-		copy(d.block[d.offset:], p[:remaining])
-		hashBlocks(&d.h, &d.c, 0, d.block[:])
-		d.offset = 0
-		p = p[remaining:]
-	}
-
-	if length := len(p); length > BlockSize {
-		nn := length &^ (BlockSize - 1)
-		if length == nn {
-			nn -= BlockSize
-		}
-		hashBlocks(&d.h, &d.c, 0, p[:nn])
-		p = p[nn:]
-	}
-
-	d.offset += copy(d.block[:], p)
-	return
-}
-
-func (d *digest) Sum(sum []byte) []byte {
-	var hash [Size]byte
-	d.finalize(&hash)
-	return append(sum, hash[:d.size]...)
-}
-
-func (d *digest) finalize(hash *[Size]byte) {
-	var block [BlockSize]byte
-	h := d.h
-	c := d.c
-
-	copy(block[:], d.block[:d.offset])
-	remaining := uint32(BlockSize - d.offset)
-	if c[0] < remaining {
-		c[1]--
-	}
-	c[0] -= remaining
-
-	hashBlocks(&h, &c, 0xFFFFFFFF, block[:])
-	for i, v := range h {
-		binary.LittleEndian.PutUint32(hash[4*i:], v)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.go
deleted file mode 100644
index 45ae54614b..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,!gccgo,!appengine
-
-package blake2s
-
-var (
-	useSSE4  = false
-	useSSSE3 = supportSSSE3()
-	useSSE2  = supportSSE2()
-)
-
-//go:noescape
-func supportSSE2() bool
-
-//go:noescape
-func supportSSSE3() bool
-
-//go:noescape
-func hashBlocksSSE2(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-
-//go:noescape
-func hashBlocksSSSE3(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-
-func hashBlocks(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte) {
-	if useSSSE3 {
-		hashBlocksSSSE3(h, c, flag, blocks)
-	} else if useSSE2 {
-		hashBlocksSSE2(h, c, flag, blocks)
-	} else {
-		hashBlocksGeneric(h, c, flag, blocks)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.s b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.s
deleted file mode 100644
index 0bb65c70f4..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_386.s
+++ /dev/null
@@ -1,460 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build 386,!gccgo,!appengine
-
-#include "textflag.h"
-
-DATA iv0<>+0x00(SB)/4, $0x6a09e667
-DATA iv0<>+0x04(SB)/4, $0xbb67ae85
-DATA iv0<>+0x08(SB)/4, $0x3c6ef372
-DATA iv0<>+0x0c(SB)/4, $0xa54ff53a
-GLOBL iv0<>(SB), (NOPTR+RODATA), $16
-
-DATA iv1<>+0x00(SB)/4, $0x510e527f
-DATA iv1<>+0x04(SB)/4, $0x9b05688c
-DATA iv1<>+0x08(SB)/4, $0x1f83d9ab
-DATA iv1<>+0x0c(SB)/4, $0x5be0cd19
-GLOBL iv1<>(SB), (NOPTR+RODATA), $16
-
-DATA rol16<>+0x00(SB)/8, $0x0504070601000302
-DATA rol16<>+0x08(SB)/8, $0x0D0C0F0E09080B0A
-GLOBL rol16<>(SB), (NOPTR+RODATA), $16
-
-DATA rol8<>+0x00(SB)/8, $0x0407060500030201
-DATA rol8<>+0x08(SB)/8, $0x0C0F0E0D080B0A09
-GLOBL rol8<>(SB), (NOPTR+RODATA), $16
-
-DATA counter<>+0x00(SB)/8, $0x40
-DATA counter<>+0x08(SB)/8, $0x0
-GLOBL counter<>(SB), (NOPTR+RODATA), $16
-
-#define ROTL_SSE2(n, t, v) \
-	MOVO  v, t;       \
-	PSLLL $n, t;      \
-	PSRLL $(32-n), v; \
-	PXOR  t, v
-
-#define ROTL_SSSE3(c, v) \
-	PSHUFB c, v
-
-#define ROUND_SSE2(v0, v1, v2, v3, m0, m1, m2, m3, t) \
-	PADDL  m0, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(16, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m1, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(24, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v1, v1; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v3, v3; \
-	PADDL  m2, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(16, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m3, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(24, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v3, v3; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v1, v1
-
-#define ROUND_SSSE3(v0, v1, v2, v3, m0, m1, m2, m3, t, c16, c8) \
-	PADDL  m0, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c16, v3);  \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m1, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c8, v3);   \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v1, v1; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v3, v3; \
-	PADDL  m2, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c16, v3);  \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m3, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c8, v3);   \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v3, v3; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v1, v1
-
-#define PRECOMPUTE(dst, off, src, t) \
-	MOVL 0*4(src), t;          \
-	MOVL t, 0*4+off+0(dst);    \
-	MOVL t, 9*4+off+64(dst);   \
-	MOVL t, 5*4+off+128(dst);  \
-	MOVL t, 14*4+off+192(dst); \
-	MOVL t, 4*4+off+256(dst);  \
-	MOVL t, 2*4+off+320(dst);  \
-	MOVL t, 8*4+off+384(dst);  \
-	MOVL t, 12*4+off+448(dst); \
-	MOVL t, 3*4+off+512(dst);  \
-	MOVL t, 15*4+off+576(dst); \
-	MOVL 1*4(src), t;          \
-	MOVL t, 4*4+off+0(dst);    \
-	MOVL t, 8*4+off+64(dst);   \
-	MOVL t, 14*4+off+128(dst); \
-	MOVL t, 5*4+off+192(dst);  \
-	MOVL t, 12*4+off+256(dst); \
-	MOVL t, 11*4+off+320(dst); \
-	MOVL t, 1*4+off+384(dst);  \
-	MOVL t, 6*4+off+448(dst);  \
-	MOVL t, 10*4+off+512(dst); \
-	MOVL t, 3*4+off+576(dst);  \
-	MOVL 2*4(src), t;          \
-	MOVL t, 1*4+off+0(dst);    \
-	MOVL t, 13*4+off+64(dst);  \
-	MOVL t, 6*4+off+128(dst);  \
-	MOVL t, 8*4+off+192(dst);  \
-	MOVL t, 2*4+off+256(dst);  \
-	MOVL t, 0*4+off+320(dst);  \
-	MOVL t, 14*4+off+384(dst); \
-	MOVL t, 11*4+off+448(dst); \
-	MOVL t, 12*4+off+512(dst); \
-	MOVL t, 4*4+off+576(dst);  \
-	MOVL 3*4(src), t;          \
-	MOVL t, 5*4+off+0(dst);    \
-	MOVL t, 15*4+off+64(dst);  \
-	MOVL t, 9*4+off+128(dst);  \
-	MOVL t, 1*4+off+192(dst);  \
-	MOVL t, 11*4+off+256(dst); \
-	MOVL t, 7*4+off+320(dst);  \
-	MOVL t, 13*4+off+384(dst); \
-	MOVL t, 3*4+off+448(dst);  \
-	MOVL t, 6*4+off+512(dst);  \
-	MOVL t, 10*4+off+576(dst); \
-	MOVL 4*4(src), t;          \
-	MOVL t, 2*4+off+0(dst);    \
-	MOVL t, 1*4+off+64(dst);   \
-	MOVL t, 15*4+off+128(dst); \
-	MOVL t, 10*4+off+192(dst); \
-	MOVL t, 6*4+off+256(dst);  \
-	MOVL t, 8*4+off+320(dst);  \
-	MOVL t, 3*4+off+384(dst);  \
-	MOVL t, 13*4+off+448(dst); \
-	MOVL t, 14*4+off+512(dst); \
-	MOVL t, 5*4+off+576(dst);  \
-	MOVL 5*4(src), t;          \
-	MOVL t, 6*4+off+0(dst);    \
-	MOVL t, 11*4+off+64(dst);  \
-	MOVL t, 2*4+off+128(dst);  \
-	MOVL t, 9*4+off+192(dst);  \
-	MOVL t, 1*4+off+256(dst);  \
-	MOVL t, 13*4+off+320(dst); \
-	MOVL t, 4*4+off+384(dst);  \
-	MOVL t, 8*4+off+448(dst);  \
-	MOVL t, 15*4+off+512(dst); \
-	MOVL t, 7*4+off+576(dst);  \
-	MOVL 6*4(src), t;          \
-	MOVL t, 3*4+off+0(dst);    \
-	MOVL t, 7*4+off+64(dst);   \
-	MOVL t, 13*4+off+128(dst); \
-	MOVL t, 12*4+off+192(dst); \
-	MOVL t, 10*4+off+256(dst); \
-	MOVL t, 1*4+off+320(dst);  \
-	MOVL t, 9*4+off+384(dst);  \
-	MOVL t, 14*4+off+448(dst); \
-	MOVL t, 0*4+off+512(dst);  \
-	MOVL t, 6*4+off+576(dst);  \
-	MOVL 7*4(src), t;          \
-	MOVL t, 7*4+off+0(dst);    \
-	MOVL t, 14*4+off+64(dst);  \
-	MOVL t, 10*4+off+128(dst); \
-	MOVL t, 0*4+off+192(dst);  \
-	MOVL t, 5*4+off+256(dst);  \
-	MOVL t, 9*4+off+320(dst);  \
-	MOVL t, 12*4+off+384(dst); \
-	MOVL t, 1*4+off+448(dst);  \
-	MOVL t, 13*4+off+512(dst); \
-	MOVL t, 2*4+off+576(dst);  \
-	MOVL 8*4(src), t;          \
-	MOVL t, 8*4+off+0(dst);    \
-	MOVL t, 5*4+off+64(dst);   \
-	MOVL t, 4*4+off+128(dst);  \
-	MOVL t, 15*4+off+192(dst); \
-	MOVL t, 14*4+off+256(dst); \
-	MOVL t, 3*4+off+320(dst);  \
-	MOVL t, 11*4+off+384(dst); \
-	MOVL t, 10*4+off+448(dst); \
-	MOVL t, 7*4+off+512(dst);  \
-	MOVL t, 1*4+off+576(dst);  \
-	MOVL 9*4(src), t;          \
-	MOVL t, 12*4+off+0(dst);   \
-	MOVL t, 2*4+off+64(dst);   \
-	MOVL t, 11*4+off+128(dst); \
-	MOVL t, 4*4+off+192(dst);  \
-	MOVL t, 0*4+off+256(dst);  \
-	MOVL t, 15*4+off+320(dst); \
-	MOVL t, 10*4+off+384(dst); \
-	MOVL t, 7*4+off+448(dst);  \
-	MOVL t, 5*4+off+512(dst);  \
-	MOVL t, 9*4+off+576(dst);  \
-	MOVL 10*4(src), t;         \
-	MOVL t, 9*4+off+0(dst);    \
-	MOVL t, 4*4+off+64(dst);   \
-	MOVL t, 8*4+off+128(dst);  \
-	MOVL t, 13*4+off+192(dst); \
-	MOVL t, 3*4+off+256(dst);  \
-	MOVL t, 5*4+off+320(dst);  \
-	MOVL t, 7*4+off+384(dst);  \
-	MOVL t, 15*4+off+448(dst); \
-	MOVL t, 11*4+off+512(dst); \
-	MOVL t, 0*4+off+576(dst);  \
-	MOVL 11*4(src), t;         \
-	MOVL t, 13*4+off+0(dst);   \
-	MOVL t, 10*4+off+64(dst);  \
-	MOVL t, 0*4+off+128(dst);  \
-	MOVL t, 3*4+off+192(dst);  \
-	MOVL t, 9*4+off+256(dst);  \
-	MOVL t, 6*4+off+320(dst);  \
-	MOVL t, 15*4+off+384(dst); \
-	MOVL t, 4*4+off+448(dst);  \
-	MOVL t, 2*4+off+512(dst);  \
-	MOVL t, 12*4+off+576(dst); \
-	MOVL 12*4(src), t;         \
-	MOVL t, 10*4+off+0(dst);   \
-	MOVL t, 12*4+off+64(dst);  \
-	MOVL t, 1*4+off+128(dst);  \
-	MOVL t, 6*4+off+192(dst);  \
-	MOVL t, 13*4+off+256(dst); \
-	MOVL t, 4*4+off+320(dst);  \
-	MOVL t, 0*4+off+384(dst);  \
-	MOVL t, 2*4+off+448(dst);  \
-	MOVL t, 8*4+off+512(dst);  \
-	MOVL t, 14*4+off+576(dst); \
-	MOVL 13*4(src), t;         \
-	MOVL t, 14*4+off+0(dst);   \
-	MOVL t, 3*4+off+64(dst);   \
-	MOVL t, 7*4+off+128(dst);  \
-	MOVL t, 2*4+off+192(dst);  \
-	MOVL t, 15*4+off+256(dst); \
-	MOVL t, 12*4+off+320(dst); \
-	MOVL t, 6*4+off+384(dst);  \
-	MOVL t, 0*4+off+448(dst);  \
-	MOVL t, 9*4+off+512(dst);  \
-	MOVL t, 11*4+off+576(dst); \
-	MOVL 14*4(src), t;         \
-	MOVL t, 11*4+off+0(dst);   \
-	MOVL t, 0*4+off+64(dst);   \
-	MOVL t, 12*4+off+128(dst); \
-	MOVL t, 7*4+off+192(dst);  \
-	MOVL t, 8*4+off+256(dst);  \
-	MOVL t, 14*4+off+320(dst); \
-	MOVL t, 2*4+off+384(dst);  \
-	MOVL t, 5*4+off+448(dst);  \
-	MOVL t, 1*4+off+512(dst);  \
-	MOVL t, 13*4+off+576(dst); \
-	MOVL 15*4(src), t;         \
-	MOVL t, 15*4+off+0(dst);   \
-	MOVL t, 6*4+off+64(dst);   \
-	MOVL t, 3*4+off+128(dst);  \
-	MOVL t, 11*4+off+192(dst); \
-	MOVL t, 7*4+off+256(dst);  \
-	MOVL t, 10*4+off+320(dst); \
-	MOVL t, 5*4+off+384(dst);  \
-	MOVL t, 9*4+off+448(dst);  \
-	MOVL t, 4*4+off+512(dst);  \
-	MOVL t, 8*4+off+576(dst)
-
-// func hashBlocksSSE2(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-TEXT ·hashBlocksSSE2(SB), 0, $672-24 // frame = 656 + 16 byte alignment
-	MOVL h+0(FP), AX
-	MOVL c+4(FP), BX
-	MOVL flag+8(FP), CX
-	MOVL blocks_base+12(FP), SI
-	MOVL blocks_len+16(FP), DX
-
-	MOVL SP, BP
-	MOVL SP, DI
-	ADDL $15, DI
-	ANDL $~15, DI
-	MOVL DI, SP
-
-	MOVL CX, 8(SP)
-	MOVL 0(BX), CX
-	MOVL CX, 0(SP)
-	MOVL 4(BX), CX
-	MOVL CX, 4(SP)
-	XORL CX, CX
-	MOVL CX, 12(SP)
-
-	MOVOU 0(AX), X0
-	MOVOU 16(AX), X1
-	MOVOU counter<>(SB), X2
-
-loop:
-	MOVO  X0, X4
-	MOVO  X1, X5
-	MOVOU iv0<>(SB), X6
-	MOVOU iv1<>(SB), X7
-
-	MOVO  0(SP), X3
-	PADDQ X2, X3
-	PXOR  X3, X7
-	MOVO  X3, 0(SP)
-
-	PRECOMPUTE(SP, 16, SI, CX)
-	ROUND_SSE2(X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+64(SP), 32+64(SP), 48+64(SP), 64+64(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+128(SP), 32+128(SP), 48+128(SP), 64+128(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+192(SP), 32+192(SP), 48+192(SP), 64+192(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+256(SP), 32+256(SP), 48+256(SP), 64+256(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+320(SP), 32+320(SP), 48+320(SP), 64+320(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+384(SP), 32+384(SP), 48+384(SP), 64+384(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+448(SP), 32+448(SP), 48+448(SP), 64+448(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+512(SP), 32+512(SP), 48+512(SP), 64+512(SP), X3)
-	ROUND_SSE2(X4, X5, X6, X7, 16+576(SP), 32+576(SP), 48+576(SP), 64+576(SP), X3)
-
-	PXOR X4, X0
-	PXOR X5, X1
-	PXOR X6, X0
-	PXOR X7, X1
-
-	LEAL 64(SI), SI
-	SUBL $64, DX
-	JNE  loop
-
-	MOVL 0(SP), CX
-	MOVL CX, 0(BX)
-	MOVL 4(SP), CX
-	MOVL CX, 4(BX)
-
-	MOVOU X0, 0(AX)
-	MOVOU X1, 16(AX)
-
-	MOVL BP, SP
-	RET
-
-// func hashBlocksSSSE3(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-TEXT ·hashBlocksSSSE3(SB), 0, $704-24 // frame = 688 + 16 byte alignment
-	MOVL h+0(FP), AX
-	MOVL c+4(FP), BX
-	MOVL flag+8(FP), CX
-	MOVL blocks_base+12(FP), SI
-	MOVL blocks_len+16(FP), DX
-
-	MOVL SP, BP
-	MOVL SP, DI
-	ADDL $15, DI
-	ANDL $~15, DI
-	MOVL DI, SP
-
-	MOVL CX, 8(SP)
-	MOVL 0(BX), CX
-	MOVL CX, 0(SP)
-	MOVL 4(BX), CX
-	MOVL CX, 4(SP)
-	XORL CX, CX
-	MOVL CX, 12(SP)
-
-	MOVOU 0(AX), X0
-	MOVOU 16(AX), X1
-	MOVOU counter<>(SB), X2
-
-loop:
-	MOVO  X0, 656(SP)
-	MOVO  X1, 672(SP)
-	MOVO  X0, X4
-	MOVO  X1, X5
-	MOVOU iv0<>(SB), X6
-	MOVOU iv1<>(SB), X7
-
-	MOVO  0(SP), X3
-	PADDQ X2, X3
-	PXOR  X3, X7
-	MOVO  X3, 0(SP)
-
-	MOVOU rol16<>(SB), X0
-	MOVOU rol8<>(SB), X1
-
-	PRECOMPUTE(SP, 16, SI, CX)
-	ROUND_SSSE3(X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+64(SP), 32+64(SP), 48+64(SP), 64+64(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+128(SP), 32+128(SP), 48+128(SP), 64+128(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+192(SP), 32+192(SP), 48+192(SP), 64+192(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+256(SP), 32+256(SP), 48+256(SP), 64+256(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+320(SP), 32+320(SP), 48+320(SP), 64+320(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+384(SP), 32+384(SP), 48+384(SP), 64+384(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+448(SP), 32+448(SP), 48+448(SP), 64+448(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+512(SP), 32+512(SP), 48+512(SP), 64+512(SP), X3, X0, X1)
-	ROUND_SSSE3(X4, X5, X6, X7, 16+576(SP), 32+576(SP), 48+576(SP), 64+576(SP), X3, X0, X1)
-
-	MOVO 656(SP), X0
-	MOVO 672(SP), X1
-	PXOR X4, X0
-	PXOR X5, X1
-	PXOR X6, X0
-	PXOR X7, X1
-
-	LEAL 64(SI), SI
-	SUBL $64, DX
-	JNE  loop
-
-	MOVL 0(SP), CX
-	MOVL CX, 0(BX)
-	MOVL 4(SP), CX
-	MOVL CX, 4(BX)
-
-	MOVOU X0, 0(AX)
-	MOVOU X1, 16(AX)
-
-	MOVL BP, SP
-	RET
-
-// func supportSSSE3() bool
-TEXT ·supportSSSE3(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	MOVL CX, BX
-	ANDL $0x1, BX      // supports SSE3
-	JZ   FALSE
-	ANDL $0x200, CX    // supports SSSE3
-	JZ   FALSE
-	MOVB $1, ret+0(FP)
-	RET
-
-FALSE:
-	MOVB $0, ret+0(FP)
-	RET
-
-// func supportSSE2() bool
-TEXT ·supportSSE2(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	SHRL $26, DX
-	ANDL $1, DX        // DX != 0 if support SSE2
-	MOVB DX, ret+0(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.go
deleted file mode 100644
index a925e6b207..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!gccgo,!appengine
-
-package blake2s
-
-var (
-	useSSE4  = supportSSE4()
-	useSSSE3 = supportSSSE3()
-	useSSE2  = true // Always available on amd64
-)
-
-//go:noescape
-func supportSSSE3() bool
-
-//go:noescape
-func supportSSE4() bool
-
-//go:noescape
-func hashBlocksSSE2(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-
-//go:noescape
-func hashBlocksSSSE3(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-
-//go:noescape
-func hashBlocksSSE4(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-
-func hashBlocks(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte) {
-	if useSSE4 {
-		hashBlocksSSE4(h, c, flag, blocks)
-	} else if useSSSE3 {
-		hashBlocksSSSE3(h, c, flag, blocks)
-	} else if useSSE2 {
-		hashBlocksSSE2(h, c, flag, blocks)
-	} else {
-		hashBlocksGeneric(h, c, flag, blocks)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.s b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.s
deleted file mode 100644
index 6cdf5a94cb..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_amd64.s
+++ /dev/null
@@ -1,463 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!gccgo,!appengine
-
-#include "textflag.h"
-
-DATA iv0<>+0x00(SB)/4, $0x6a09e667
-DATA iv0<>+0x04(SB)/4, $0xbb67ae85
-DATA iv0<>+0x08(SB)/4, $0x3c6ef372
-DATA iv0<>+0x0c(SB)/4, $0xa54ff53a
-GLOBL iv0<>(SB), (NOPTR+RODATA), $16
-
-DATA iv1<>+0x00(SB)/4, $0x510e527f
-DATA iv1<>+0x04(SB)/4, $0x9b05688c
-DATA iv1<>+0x08(SB)/4, $0x1f83d9ab
-DATA iv1<>+0x0c(SB)/4, $0x5be0cd19
-GLOBL iv1<>(SB), (NOPTR+RODATA), $16
-
-DATA rol16<>+0x00(SB)/8, $0x0504070601000302
-DATA rol16<>+0x08(SB)/8, $0x0D0C0F0E09080B0A
-GLOBL rol16<>(SB), (NOPTR+RODATA), $16
-
-DATA rol8<>+0x00(SB)/8, $0x0407060500030201
-DATA rol8<>+0x08(SB)/8, $0x0C0F0E0D080B0A09
-GLOBL rol8<>(SB), (NOPTR+RODATA), $16
-
-DATA counter<>+0x00(SB)/8, $0x40
-DATA counter<>+0x08(SB)/8, $0x0
-GLOBL counter<>(SB), (NOPTR+RODATA), $16
-
-#define ROTL_SSE2(n, t, v) \
-	MOVO  v, t;       \
-	PSLLL $n, t;      \
-	PSRLL $(32-n), v; \
-	PXOR  t, v
-
-#define ROTL_SSSE3(c, v) \
-	PSHUFB c, v
-
-#define ROUND_SSE2(v0, v1, v2, v3, m0, m1, m2, m3, t) \
-	PADDL  m0, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(16, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m1, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(24, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v1, v1; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v3, v3; \
-	PADDL  m2, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(16, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m3, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSE2(24, t, v3); \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v3, v3; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v1, v1
-
-#define ROUND_SSSE3(v0, v1, v2, v3, m0, m1, m2, m3, t, c16, c8) \
-	PADDL  m0, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c16, v3);  \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m1, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c8, v3);   \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v1, v1; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v3, v3; \
-	PADDL  m2, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c16, v3);  \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(20, t, v1); \
-	PADDL  m3, v0;        \
-	PADDL  v1, v0;        \
-	PXOR   v0, v3;        \
-	ROTL_SSSE3(c8, v3);   \
-	PADDL  v3, v2;        \
-	PXOR   v2, v1;        \
-	ROTL_SSE2(25, t, v1); \
-	PSHUFL $0x39, v3, v3; \
-	PSHUFL $0x4E, v2, v2; \
-	PSHUFL $0x93, v1, v1
-
-
-#define LOAD_MSG_SSE4(m0, m1, m2, m3, src, i0, i1, i2, i3, i4, i5, i6, i7, i8, i9, i10, i11, i12, i13, i14, i15) \
-	MOVL   i0*4(src), m0;      \
-	PINSRD $1, i1*4(src), m0;  \
-	PINSRD $2, i2*4(src), m0;  \
-	PINSRD $3, i3*4(src), m0;  \
-	MOVL   i4*4(src), m1;      \
-	PINSRD $1, i5*4(src), m1;  \
-	PINSRD $2, i6*4(src), m1;  \
-	PINSRD $3, i7*4(src), m1;  \
-	MOVL   i8*4(src), m2;      \
-	PINSRD $1, i9*4(src), m2;  \
-	PINSRD $2, i10*4(src), m2; \
-	PINSRD $3, i11*4(src), m2; \
-	MOVL   i12*4(src), m3;     \
-	PINSRD $1, i13*4(src), m3; \
-	PINSRD $2, i14*4(src), m3; \
-	PINSRD $3, i15*4(src), m3
-
-#define PRECOMPUTE_MSG(dst, off, src, R8, R9, R10, R11, R12, R13, R14, R15) \
-	MOVQ 0*4(src), R8;           \
-	MOVQ 2*4(src), R9;           \
-	MOVQ 4*4(src), R10;          \
-	MOVQ 6*4(src), R11;          \
-	MOVQ 8*4(src), R12;          \
-	MOVQ 10*4(src), R13;         \
-	MOVQ 12*4(src), R14;         \
-	MOVQ 14*4(src), R15;         \
-	                             \
-	MOVL R8, 0*4+off+0(dst);     \
-	MOVL R8, 9*4+off+64(dst);    \
-	MOVL R8, 5*4+off+128(dst);   \
-	MOVL R8, 14*4+off+192(dst);  \
-	MOVL R8, 4*4+off+256(dst);   \
-	MOVL R8, 2*4+off+320(dst);   \
-	MOVL R8, 8*4+off+384(dst);   \
-	MOVL R8, 12*4+off+448(dst);  \
-	MOVL R8, 3*4+off+512(dst);   \
-	MOVL R8, 15*4+off+576(dst);  \
-	SHRQ $32, R8;                \
-	MOVL R8, 4*4+off+0(dst);     \
-	MOVL R8, 8*4+off+64(dst);    \
-	MOVL R8, 14*4+off+128(dst);  \
-	MOVL R8, 5*4+off+192(dst);   \
-	MOVL R8, 12*4+off+256(dst);  \
-	MOVL R8, 11*4+off+320(dst);  \
-	MOVL R8, 1*4+off+384(dst);   \
-	MOVL R8, 6*4+off+448(dst);   \
-	MOVL R8, 10*4+off+512(dst);  \
-	MOVL R8, 3*4+off+576(dst);   \
-	                             \
-	MOVL R9, 1*4+off+0(dst);     \
-	MOVL R9, 13*4+off+64(dst);   \
-	MOVL R9, 6*4+off+128(dst);   \
-	MOVL R9, 8*4+off+192(dst);   \
-	MOVL R9, 2*4+off+256(dst);   \
-	MOVL R9, 0*4+off+320(dst);   \
-	MOVL R9, 14*4+off+384(dst);  \
-	MOVL R9, 11*4+off+448(dst);  \
-	MOVL R9, 12*4+off+512(dst);  \
-	MOVL R9, 4*4+off+576(dst);   \
-	SHRQ $32, R9;                \
-	MOVL R9, 5*4+off+0(dst);     \
-	MOVL R9, 15*4+off+64(dst);   \
-	MOVL R9, 9*4+off+128(dst);   \
-	MOVL R9, 1*4+off+192(dst);   \
-	MOVL R9, 11*4+off+256(dst);  \
-	MOVL R9, 7*4+off+320(dst);   \
-	MOVL R9, 13*4+off+384(dst);  \
-	MOVL R9, 3*4+off+448(dst);   \
-	MOVL R9, 6*4+off+512(dst);   \
-	MOVL R9, 10*4+off+576(dst);  \
-	                             \
-	MOVL R10, 2*4+off+0(dst);    \
-	MOVL R10, 1*4+off+64(dst);   \
-	MOVL R10, 15*4+off+128(dst); \
-	MOVL R10, 10*4+off+192(dst); \
-	MOVL R10, 6*4+off+256(dst);  \
-	MOVL R10, 8*4+off+320(dst);  \
-	MOVL R10, 3*4+off+384(dst);  \
-	MOVL R10, 13*4+off+448(dst); \
-	MOVL R10, 14*4+off+512(dst); \
-	MOVL R10, 5*4+off+576(dst);  \
-	SHRQ $32, R10;               \
-	MOVL R10, 6*4+off+0(dst);    \
-	MOVL R10, 11*4+off+64(dst);  \
-	MOVL R10, 2*4+off+128(dst);  \
-	MOVL R10, 9*4+off+192(dst);  \
-	MOVL R10, 1*4+off+256(dst);  \
-	MOVL R10, 13*4+off+320(dst); \
-	MOVL R10, 4*4+off+384(dst);  \
-	MOVL R10, 8*4+off+448(dst);  \
-	MOVL R10, 15*4+off+512(dst); \
-	MOVL R10, 7*4+off+576(dst);  \
-	                             \
-	MOVL R11, 3*4+off+0(dst);    \
-	MOVL R11, 7*4+off+64(dst);   \
-	MOVL R11, 13*4+off+128(dst); \
-	MOVL R11, 12*4+off+192(dst); \
-	MOVL R11, 10*4+off+256(dst); \
-	MOVL R11, 1*4+off+320(dst);  \
-	MOVL R11, 9*4+off+384(dst);  \
-	MOVL R11, 14*4+off+448(dst); \
-	MOVL R11, 0*4+off+512(dst);  \
-	MOVL R11, 6*4+off+576(dst);  \
-	SHRQ $32, R11;               \
-	MOVL R11, 7*4+off+0(dst);    \
-	MOVL R11, 14*4+off+64(dst);  \
-	MOVL R11, 10*4+off+128(dst); \
-	MOVL R11, 0*4+off+192(dst);  \
-	MOVL R11, 5*4+off+256(dst);  \
-	MOVL R11, 9*4+off+320(dst);  \
-	MOVL R11, 12*4+off+384(dst); \
-	MOVL R11, 1*4+off+448(dst);  \
-	MOVL R11, 13*4+off+512(dst); \
-	MOVL R11, 2*4+off+576(dst);  \
-	                             \
-	MOVL R12, 8*4+off+0(dst);    \
-	MOVL R12, 5*4+off+64(dst);   \
-	MOVL R12, 4*4+off+128(dst);  \
-	MOVL R12, 15*4+off+192(dst); \
-	MOVL R12, 14*4+off+256(dst); \
-	MOVL R12, 3*4+off+320(dst);  \
-	MOVL R12, 11*4+off+384(dst); \
-	MOVL R12, 10*4+off+448(dst); \
-	MOVL R12, 7*4+off+512(dst);  \
-	MOVL R12, 1*4+off+576(dst);  \
-	SHRQ $32, R12;               \
-	MOVL R12, 12*4+off+0(dst);   \
-	MOVL R12, 2*4+off+64(dst);   \
-	MOVL R12, 11*4+off+128(dst); \
-	MOVL R12, 4*4+off+192(dst);  \
-	MOVL R12, 0*4+off+256(dst);  \
-	MOVL R12, 15*4+off+320(dst); \
-	MOVL R12, 10*4+off+384(dst); \
-	MOVL R12, 7*4+off+448(dst);  \
-	MOVL R12, 5*4+off+512(dst);  \
-	MOVL R12, 9*4+off+576(dst);  \
-	                             \
-	MOVL R13, 9*4+off+0(dst);    \
-	MOVL R13, 4*4+off+64(dst);   \
-	MOVL R13, 8*4+off+128(dst);  \
-	MOVL R13, 13*4+off+192(dst); \
-	MOVL R13, 3*4+off+256(dst);  \
-	MOVL R13, 5*4+off+320(dst);  \
-	MOVL R13, 7*4+off+384(dst);  \
-	MOVL R13, 15*4+off+448(dst); \
-	MOVL R13, 11*4+off+512(dst); \
-	MOVL R13, 0*4+off+576(dst);  \
-	SHRQ $32, R13;               \
-	MOVL R13, 13*4+off+0(dst);   \
-	MOVL R13, 10*4+off+64(dst);  \
-	MOVL R13, 0*4+off+128(dst);  \
-	MOVL R13, 3*4+off+192(dst);  \
-	MOVL R13, 9*4+off+256(dst);  \
-	MOVL R13, 6*4+off+320(dst);  \
-	MOVL R13, 15*4+off+384(dst); \
-	MOVL R13, 4*4+off+448(dst);  \
-	MOVL R13, 2*4+off+512(dst);  \
-	MOVL R13, 12*4+off+576(dst); \
-	                             \
-	MOVL R14, 10*4+off+0(dst);   \
-	MOVL R14, 12*4+off+64(dst);  \
-	MOVL R14, 1*4+off+128(dst);  \
-	MOVL R14, 6*4+off+192(dst);  \
-	MOVL R14, 13*4+off+256(dst); \
-	MOVL R14, 4*4+off+320(dst);  \
-	MOVL R14, 0*4+off+384(dst);  \
-	MOVL R14, 2*4+off+448(dst);  \
-	MOVL R14, 8*4+off+512(dst);  \
-	MOVL R14, 14*4+off+576(dst); \
-	SHRQ $32, R14;               \
-	MOVL R14, 14*4+off+0(dst);   \
-	MOVL R14, 3*4+off+64(dst);   \
-	MOVL R14, 7*4+off+128(dst);  \
-	MOVL R14, 2*4+off+192(dst);  \
-	MOVL R14, 15*4+off+256(dst); \
-	MOVL R14, 12*4+off+320(dst); \
-	MOVL R14, 6*4+off+384(dst);  \
-	MOVL R14, 0*4+off+448(dst);  \
-	MOVL R14, 9*4+off+512(dst);  \
-	MOVL R14, 11*4+off+576(dst); \
-	                             \
-	MOVL R15, 11*4+off+0(dst);   \
-	MOVL R15, 0*4+off+64(dst);   \
-	MOVL R15, 12*4+off+128(dst); \
-	MOVL R15, 7*4+off+192(dst);  \
-	MOVL R15, 8*4+off+256(dst);  \
-	MOVL R15, 14*4+off+320(dst); \
-	MOVL R15, 2*4+off+384(dst);  \
-	MOVL R15, 5*4+off+448(dst);  \
-	MOVL R15, 1*4+off+512(dst);  \
-	MOVL R15, 13*4+off+576(dst); \
-	SHRQ $32, R15;               \
-	MOVL R15, 15*4+off+0(dst);   \
-	MOVL R15, 6*4+off+64(dst);   \
-	MOVL R15, 3*4+off+128(dst);  \
-	MOVL R15, 11*4+off+192(dst); \
-	MOVL R15, 7*4+off+256(dst);  \
-	MOVL R15, 10*4+off+320(dst); \
-	MOVL R15, 5*4+off+384(dst);  \
-	MOVL R15, 9*4+off+448(dst);  \
-	MOVL R15, 4*4+off+512(dst);  \
-	MOVL R15, 8*4+off+576(dst)
-
-#define BLAKE2s_SSE2() \
-	PRECOMPUTE_MSG(SP, 16, SI, R8, R9, R10, R11, R12, R13, R14, R15);               \
-	ROUND_SSE2(X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X8);                 \
-	ROUND_SSE2(X4, X5, X6, X7, 16+64(SP), 32+64(SP), 48+64(SP), 64+64(SP), X8);     \
-	ROUND_SSE2(X4, X5, X6, X7, 16+128(SP), 32+128(SP), 48+128(SP), 64+128(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+192(SP), 32+192(SP), 48+192(SP), 64+192(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+256(SP), 32+256(SP), 48+256(SP), 64+256(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+320(SP), 32+320(SP), 48+320(SP), 64+320(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+384(SP), 32+384(SP), 48+384(SP), 64+384(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+448(SP), 32+448(SP), 48+448(SP), 64+448(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+512(SP), 32+512(SP), 48+512(SP), 64+512(SP), X8); \
-	ROUND_SSE2(X4, X5, X6, X7, 16+576(SP), 32+576(SP), 48+576(SP), 64+576(SP), X8)
-
-#define BLAKE2s_SSSE3() \
-	PRECOMPUTE_MSG(SP, 16, SI, R8, R9, R10, R11, R12, R13, R14, R15);                          \
-	ROUND_SSSE3(X4, X5, X6, X7, 16(SP), 32(SP), 48(SP), 64(SP), X8, X13, X14);                 \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+64(SP), 32+64(SP), 48+64(SP), 64+64(SP), X8, X13, X14);     \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+128(SP), 32+128(SP), 48+128(SP), 64+128(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+192(SP), 32+192(SP), 48+192(SP), 64+192(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+256(SP), 32+256(SP), 48+256(SP), 64+256(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+320(SP), 32+320(SP), 48+320(SP), 64+320(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+384(SP), 32+384(SP), 48+384(SP), 64+384(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+448(SP), 32+448(SP), 48+448(SP), 64+448(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+512(SP), 32+512(SP), 48+512(SP), 64+512(SP), X8, X13, X14); \
-	ROUND_SSSE3(X4, X5, X6, X7, 16+576(SP), 32+576(SP), 48+576(SP), 64+576(SP), X8, X13, X14)
-
-#define BLAKE2s_SSE4() \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 11, 12, 5, 15, 8, 0, 2, 13, 10, 3, 7, 9, 14, 6, 1, 4); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 7, 3, 13, 11, 9, 1, 12, 14, 2, 5, 4, 15, 6, 10, 0, 8); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 9, 5, 2, 10, 0, 7, 4, 15, 14, 11, 6, 3, 1, 12, 8, 13); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 2, 6, 0, 8, 12, 10, 11, 3, 4, 7, 15, 1, 13, 5, 14, 9); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 12, 1, 14, 4, 5, 15, 13, 10, 0, 6, 9, 8, 7, 3, 2, 11); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 13, 7, 12, 3, 11, 14, 1, 9, 5, 15, 8, 2, 0, 4, 6, 10); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 6, 14, 11, 0, 15, 9, 3, 8, 12, 13, 1, 10, 2, 7, 4, 5); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14);                               \
-	LOAD_MSG_SSE4(X8, X9, X10, X11, SI, 10, 8, 7, 1, 2, 4, 6, 5, 15, 9, 3, 13, 11, 14, 12, 0); \
-	ROUND_SSSE3(X4, X5, X6, X7, X8, X9, X10, X11, X8, X13, X14)
-
-#define HASH_BLOCKS(h, c, flag, blocks_base, blocks_len, BLAKE2s_FUNC) \
-	MOVQ  h, AX;                   \
-	MOVQ  c, BX;                   \
-	MOVL  flag, CX;                \
-	MOVQ  blocks_base, SI;         \
-	MOVQ  blocks_len, DX;          \
-	                               \
-	MOVQ  SP, BP;                  \
-	MOVQ  SP, R9;                  \
-	ADDQ  $15, R9;                 \
-	ANDQ  $~15, R9;                \
-	MOVQ  R9, SP;                  \
-	                               \
-	MOVQ  0(BX), R9;               \
-	MOVQ  R9, 0(SP);               \
-	XORQ  R9, R9;                  \
-	MOVQ  R9, 8(SP);               \
-	MOVL  CX, 8(SP);               \
-	                               \
-	MOVOU 0(AX), X0;               \
-	MOVOU 16(AX), X1;              \
-	MOVOU iv0<>(SB), X2;           \
-	MOVOU iv1<>(SB), X3            \
-	                               \
-	MOVOU counter<>(SB), X12;      \
-	MOVOU rol16<>(SB), X13;        \
-	MOVOU rol8<>(SB), X14;         \
-	MOVO  0(SP), X15;              \
-	                               \
-	loop:                          \
-	MOVO  X0, X4;                  \
-	MOVO  X1, X5;                  \
-	MOVO  X2, X6;                  \
-	MOVO  X3, X7;                  \
-	                               \
-	PADDQ X12, X15;                \
-	PXOR  X15, X7;                 \
-	                               \
-	BLAKE2s_FUNC();                \
-	                               \
-	PXOR  X4, X0;                  \
-	PXOR  X5, X1;                  \
-	PXOR  X6, X0;                  \
-	PXOR  X7, X1;                  \
-	                               \
-	LEAQ  64(SI), SI;              \
-	SUBQ  $64, DX;                 \
-	JNE   loop;                    \
-	                               \
-	MOVO  X15, 0(SP);              \
-	MOVQ  0(SP), R9;               \
-	MOVQ  R9, 0(BX);               \
-	                               \
-	MOVOU X0, 0(AX);               \
-	MOVOU X1, 16(AX);              \
-	                               \
-	MOVQ  BP, SP
-
-// func hashBlocksSSE2(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-TEXT ·hashBlocksSSE2(SB), 0, $672-48 // frame = 656 + 16 byte alignment
-	HASH_BLOCKS(h+0(FP), c+8(FP), flag+16(FP), blocks_base+24(FP), blocks_len+32(FP), BLAKE2s_SSE2)
-	RET
-
-// func hashBlocksSSSE3(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-TEXT ·hashBlocksSSSE3(SB), 0, $672-48 // frame = 656 + 16 byte alignment
-	HASH_BLOCKS(h+0(FP), c+8(FP), flag+16(FP), blocks_base+24(FP), blocks_len+32(FP), BLAKE2s_SSSE3)
-	RET
-
-// func hashBlocksSSE4(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte)
-TEXT ·hashBlocksSSE4(SB), 0, $32-48 // frame = 16 + 16 byte alignment
-	HASH_BLOCKS(h+0(FP), c+8(FP), flag+16(FP), blocks_base+24(FP), blocks_len+32(FP), BLAKE2s_SSE4)
-	RET
-
-// func supportSSE4() bool
-TEXT ·supportSSE4(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	SHRL $19, CX       // Bit 19 indicates SSE4.1.
-	ANDL $1, CX
-	MOVB CX, ret+0(FP)
-	RET
-
-// func supportSSSE3() bool
-TEXT ·supportSSSE3(SB), 4, $0-1
-	MOVL $1, AX
-	CPUID
-	MOVL CX, BX
-	ANDL $0x1, BX      // Bit zero indicates SSE3 support.
-	JZ   FALSE
-	ANDL $0x200, CX    // Bit nine indicates SSSE3 support.
-	JZ   FALSE
-	MOVB $1, ret+0(FP)
-	RET
-
-FALSE:
-	MOVB $0, ret+0(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_generic.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_generic.go
deleted file mode 100644
index f7e065378a..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_generic.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2s
-
-// the precomputed values for BLAKE2s
-// there are 10 16-byte arrays - one for each round
-// the entries are calculated from the sigma constants.
-var precomputed = [10][16]byte{
-	{0, 2, 4, 6, 1, 3, 5, 7, 8, 10, 12, 14, 9, 11, 13, 15},
-	{14, 4, 9, 13, 10, 8, 15, 6, 1, 0, 11, 5, 12, 2, 7, 3},
-	{11, 12, 5, 15, 8, 0, 2, 13, 10, 3, 7, 9, 14, 6, 1, 4},
-	{7, 3, 13, 11, 9, 1, 12, 14, 2, 5, 4, 15, 6, 10, 0, 8},
-	{9, 5, 2, 10, 0, 7, 4, 15, 14, 11, 6, 3, 1, 12, 8, 13},
-	{2, 6, 0, 8, 12, 10, 11, 3, 4, 7, 15, 1, 13, 5, 14, 9},
-	{12, 1, 14, 4, 5, 15, 13, 10, 0, 6, 9, 8, 7, 3, 2, 11},
-	{13, 7, 12, 3, 11, 14, 1, 9, 5, 15, 8, 2, 0, 4, 6, 10},
-	{6, 14, 11, 0, 15, 9, 3, 8, 12, 13, 1, 10, 2, 7, 4, 5},
-	{10, 8, 7, 1, 2, 4, 6, 5, 15, 9, 3, 13, 11, 14, 12, 0},
-}
-
-func hashBlocksGeneric(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte) {
-	var m [16]uint32
-	c0, c1 := c[0], c[1]
-
-	for i := 0; i < len(blocks); {
-		c0 += BlockSize
-		if c0 < BlockSize {
-			c1++
-		}
-
-		v0, v1, v2, v3, v4, v5, v6, v7 := h[0], h[1], h[2], h[3], h[4], h[5], h[6], h[7]
-		v8, v9, v10, v11, v12, v13, v14, v15 := iv[0], iv[1], iv[2], iv[3], iv[4], iv[5], iv[6], iv[7]
-		v12 ^= c0
-		v13 ^= c1
-		v14 ^= flag
-
-		for j := range m {
-			m[j] = uint32(blocks[i]) | uint32(blocks[i+1])<<8 | uint32(blocks[i+2])<<16 | uint32(blocks[i+3])<<24
-			i += 4
-		}
-
-		for k := range precomputed {
-			s := &(precomputed[k])
-
-			v0 += m[s[0]]
-			v0 += v4
-			v12 ^= v0
-			v12 = v12<<(32-16) | v12>>16
-			v8 += v12
-			v4 ^= v8
-			v4 = v4<<(32-12) | v4>>12
-			v1 += m[s[1]]
-			v1 += v5
-			v13 ^= v1
-			v13 = v13<<(32-16) | v13>>16
-			v9 += v13
-			v5 ^= v9
-			v5 = v5<<(32-12) | v5>>12
-			v2 += m[s[2]]
-			v2 += v6
-			v14 ^= v2
-			v14 = v14<<(32-16) | v14>>16
-			v10 += v14
-			v6 ^= v10
-			v6 = v6<<(32-12) | v6>>12
-			v3 += m[s[3]]
-			v3 += v7
-			v15 ^= v3
-			v15 = v15<<(32-16) | v15>>16
-			v11 += v15
-			v7 ^= v11
-			v7 = v7<<(32-12) | v7>>12
-
-			v0 += m[s[4]]
-			v0 += v4
-			v12 ^= v0
-			v12 = v12<<(32-8) | v12>>8
-			v8 += v12
-			v4 ^= v8
-			v4 = v4<<(32-7) | v4>>7
-			v1 += m[s[5]]
-			v1 += v5
-			v13 ^= v1
-			v13 = v13<<(32-8) | v13>>8
-			v9 += v13
-			v5 ^= v9
-			v5 = v5<<(32-7) | v5>>7
-			v2 += m[s[6]]
-			v2 += v6
-			v14 ^= v2
-			v14 = v14<<(32-8) | v14>>8
-			v10 += v14
-			v6 ^= v10
-			v6 = v6<<(32-7) | v6>>7
-			v3 += m[s[7]]
-			v3 += v7
-			v15 ^= v3
-			v15 = v15<<(32-8) | v15>>8
-			v11 += v15
-			v7 ^= v11
-			v7 = v7<<(32-7) | v7>>7
-
-			v0 += m[s[8]]
-			v0 += v5
-			v15 ^= v0
-			v15 = v15<<(32-16) | v15>>16
-			v10 += v15
-			v5 ^= v10
-			v5 = v5<<(32-12) | v5>>12
-			v1 += m[s[9]]
-			v1 += v6
-			v12 ^= v1
-			v12 = v12<<(32-16) | v12>>16
-			v11 += v12
-			v6 ^= v11
-			v6 = v6<<(32-12) | v6>>12
-			v2 += m[s[10]]
-			v2 += v7
-			v13 ^= v2
-			v13 = v13<<(32-16) | v13>>16
-			v8 += v13
-			v7 ^= v8
-			v7 = v7<<(32-12) | v7>>12
-			v3 += m[s[11]]
-			v3 += v4
-			v14 ^= v3
-			v14 = v14<<(32-16) | v14>>16
-			v9 += v14
-			v4 ^= v9
-			v4 = v4<<(32-12) | v4>>12
-
-			v0 += m[s[12]]
-			v0 += v5
-			v15 ^= v0
-			v15 = v15<<(32-8) | v15>>8
-			v10 += v15
-			v5 ^= v10
-			v5 = v5<<(32-7) | v5>>7
-			v1 += m[s[13]]
-			v1 += v6
-			v12 ^= v1
-			v12 = v12<<(32-8) | v12>>8
-			v11 += v12
-			v6 ^= v11
-			v6 = v6<<(32-7) | v6>>7
-			v2 += m[s[14]]
-			v2 += v7
-			v13 ^= v2
-			v13 = v13<<(32-8) | v13>>8
-			v8 += v13
-			v7 ^= v8
-			v7 = v7<<(32-7) | v7>>7
-			v3 += m[s[15]]
-			v3 += v4
-			v14 ^= v3
-			v14 = v14<<(32-8) | v14>>8
-			v9 += v14
-			v4 ^= v9
-			v4 = v4<<(32-7) | v4>>7
-		}
-
-		h[0] ^= v0 ^ v8
-		h[1] ^= v1 ^ v9
-		h[2] ^= v2 ^ v10
-		h[3] ^= v3 ^ v11
-		h[4] ^= v4 ^ v12
-		h[5] ^= v5 ^ v13
-		h[6] ^= v6 ^ v14
-		h[7] ^= v7 ^ v15
-	}
-	c[0], c[1] = c0, c1
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_ref.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_ref.go
deleted file mode 100644
index a311273454..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_ref.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64,!386 gccgo appengine
-
-package blake2s
-
-var (
-	useSSE4  = false
-	useSSSE3 = false
-	useSSE2  = false
-)
-
-func hashBlocks(h *[8]uint32, c *[2]uint32, flag uint32, blocks []byte) {
-	hashBlocksGeneric(h, c, flag, blocks)
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_test.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2s_test.go
deleted file mode 100644
index 938fef375c..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2s_test.go
+++ /dev/null
@@ -1,1002 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2s
-
-import (
-	"encoding/hex"
-	"fmt"
-	"testing"
-)
-
-func TestHashes(t *testing.T) {
-	defer func(sse2, ssse3, sse4 bool) {
-		useSSE2, useSSSE3, useSSE4 = sse2, ssse3, sse4
-	}(useSSE2, useSSSE3, useSSE4)
-
-	if useSSE4 {
-		t.Log("SSE4 version")
-		testHashes(t)
-		testHashes128(t)
-		useSSE4 = false
-	}
-	if useSSSE3 {
-		t.Log("SSSE3 version")
-		testHashes(t)
-		testHashes128(t)
-		useSSSE3 = false
-	}
-	if useSSE2 {
-		t.Log("SSE2 version")
-		testHashes(t)
-		testHashes128(t)
-		useSSE2 = false
-	}
-
-	t.Log("generic version")
-	testHashes(t)
-	testHashes128(t)
-}
-
-func TestHashes2X(t *testing.T) {
-	defer func(sse2, ssse3, sse4 bool) {
-		useSSE2, useSSSE3, useSSE4 = sse2, ssse3, sse4
-	}(useSSE2, useSSSE3, useSSE4)
-
-	if useSSE4 {
-		t.Log("SSE4 version")
-		testHashes2X(t)
-		useSSE4 = false
-	}
-	if useSSSE3 {
-		t.Log("SSSE3 version")
-		testHashes2X(t)
-		useSSSE3 = false
-	}
-	if useSSE2 {
-		t.Log("SSE2 version")
-		testHashes2X(t)
-		useSSE2 = false
-	}
-
-	t.Log("generic version")
-	testHashes2X(t)
-}
-
-func testHashes(t *testing.T) {
-	key, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")
-
-	input := make([]byte, 255)
-	for i := range input {
-		input[i] = byte(i)
-	}
-
-	for i, expectedHex := range hashes {
-		h, err := New256(key)
-		if err != nil {
-			t.Fatalf("#%d: error from New256: %v", i, err)
-		}
-
-		h.Write(input[:i])
-		sum := h.Sum(nil)
-
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (single write): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(input[j : j+1])
-		}
-
-		sum = h.Sum(sum[:0])
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (byte-by-byte): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-	}
-}
-
-func testHashes128(t *testing.T) {
-	key, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")
-
-	input := make([]byte, 255)
-	for i := range input {
-		input[i] = byte(i)
-	}
-
-	for i, expectedHex := range hashes128 {
-		h, err := New128(key)
-		if err != nil {
-			t.Fatalf("#%d: error from New128: %v", i, err)
-		}
-
-		h.Write(input[:i])
-		sum := h.Sum(nil)
-
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (single write): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(input[j : j+1])
-		}
-
-		sum = h.Sum(sum[:0])
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (byte-by-byte): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-	}
-}
-
-func testHashes2X(t *testing.T) {
-	key, _ := hex.DecodeString("000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f")
-
-	input := make([]byte, 256)
-	for i := range input {
-		input[i] = byte(i)
-	}
-
-	for i, expectedHex := range hashes2X {
-		length := uint16(len(expectedHex) / 2)
-		sum := make([]byte, int(length))
-
-		h, err := NewXOF(length, key)
-		if err != nil {
-			t.Fatalf("#%d: error from NewXOF: %v", i, err)
-		}
-
-		if _, err := h.Write(input); err != nil {
-			t.Fatalf("#%d (single write): error from Write: %v", i, err)
-		}
-		if _, err := h.Read(sum); err != nil {
-			t.Fatalf("#%d (single write): error from Read: %v", i, err)
-		}
-
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (single write): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-
-		h.Reset()
-		for j := 0; j < len(input); j++ {
-			h.Write(input[j : j+1])
-		}
-		for j := 0; j < len(sum); j++ {
-			h = h.Clone()
-			if _, err := h.Read(sum[j : j+1]); err != nil {
-				t.Fatalf("#%d (byte-by-byte) - Read %d: error from Read: %v", i, j, err)
-			}
-		}
-		if gotHex := fmt.Sprintf("%x", sum); gotHex != expectedHex {
-			t.Fatalf("#%d (byte-by-byte): got %s, wanted %s", i, gotHex, expectedHex)
-		}
-	}
-
-	h, err := NewXOF(OutputLengthUnknown, key)
-	if err != nil {
-		t.Fatalf("#unknown length: error from NewXOF: %v", err)
-	}
-	if _, err := h.Write(input); err != nil {
-		t.Fatalf("#unknown length: error from Write: %v", err)
-	}
-
-	var result [64]byte
-	if n, err := h.Read(result[:]); err != nil {
-		t.Fatalf("#unknown length: error from Read: %v", err)
-	} else if n != len(result) {
-		t.Fatalf("#unknown length: Read returned %d bytes, want %d: %v", n, len(result))
-	}
-
-	const expected = "2a9a6977d915a2c4dd07dbcafe1918bf1682e56d9c8e567ecd19bfd7cd93528833c764d12b34a5e2a219c9fd463dab45e972c5574d73f45de5b2e23af72530d8"
-	if fmt.Sprintf("%x", result) != expected {
-		t.Fatalf("#unknown length: bad result %x, wanted %s", result, expected)
-	}
-}
-
-// Benchmarks
-
-func benchmarkSum(b *testing.B, size int) {
-	data := make([]byte, size)
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sum256(data)
-	}
-}
-
-func benchmarkWrite(b *testing.B, size int) {
-	data := make([]byte, size)
-	h, _ := New256(nil)
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		h.Write(data)
-	}
-}
-
-func BenchmarkWrite64(b *testing.B) { benchmarkWrite(b, 64) }
-func BenchmarkWrite1K(b *testing.B) { benchmarkWrite(b, 1024) }
-
-func BenchmarkSum64(b *testing.B) { benchmarkSum(b, 64) }
-func BenchmarkSum1K(b *testing.B) { benchmarkSum(b, 1024) }
-
-// hashes is taken from https://blake2.net/blake2s-test.txt
-var hashes = []string{
-	"48a8997da407876b3d79c0d92325ad3b89cbb754d86ab71aee047ad345fd2c49",
-	"40d15fee7c328830166ac3f918650f807e7e01e177258cdc0a39b11f598066f1",
-	"6bb71300644cd3991b26ccd4d274acd1adeab8b1d7914546c1198bbe9fc9d803",
-	"1d220dbe2ee134661fdf6d9e74b41704710556f2f6e5a091b227697445dbea6b",
-	"f6c3fbadb4cc687a0064a5be6e791bec63b868ad62fba61b3757ef9ca52e05b2",
-	"49c1f21188dfd769aea0e911dd6b41f14dab109d2b85977aa3088b5c707e8598",
-	"fdd8993dcd43f696d44f3cea0ff35345234ec8ee083eb3cada017c7f78c17143",
-	"e6c8125637438d0905b749f46560ac89fd471cf8692e28fab982f73f019b83a9",
-	"19fc8ca6979d60e6edd3b4541e2f967ced740df6ec1eaebbfe813832e96b2974",
-	"a6ad777ce881b52bb5a4421ab6cdd2dfba13e963652d4d6d122aee46548c14a7",
-	"f5c4b2ba1a00781b13aba0425242c69cb1552f3f71a9a3bb22b4a6b4277b46dd",
-	"e33c4c9bd0cc7e45c80e65c77fa5997fec7002738541509e68a9423891e822a3",
-	"fba16169b2c3ee105be6e1e650e5cbf40746b6753d036ab55179014ad7ef6651",
-	"f5c4bec6d62fc608bf41cc115f16d61c7efd3ff6c65692bbe0afffb1fede7475",
-	"a4862e76db847f05ba17ede5da4e7f91b5925cf1ad4ba12732c3995742a5cd6e",
-	"65f4b860cd15b38ef814a1a804314a55be953caa65fd758ad989ff34a41c1eea",
-	"19ba234f0a4f38637d1839f9d9f76ad91c8522307143c97d5f93f69274cec9a7",
-	"1a67186ca4a5cb8e65fca0e2ecbc5ddc14ae381bb8bffeb9e0a103449e3ef03c",
-	"afbea317b5a2e89c0bd90ccf5d7fd0ed57fe585e4be3271b0a6bf0f5786b0f26",
-	"f1b01558ce541262f5ec34299d6fb4090009e3434be2f49105cf46af4d2d4124",
-	"13a0a0c86335635eaa74ca2d5d488c797bbb4f47dc07105015ed6a1f3309efce",
-	"1580afeebebb346f94d59fe62da0b79237ead7b1491f5667a90e45edf6ca8b03",
-	"20be1a875b38c573dd7faaa0de489d655c11efb6a552698e07a2d331b5f655c3",
-	"be1fe3c4c04018c54c4a0f6b9a2ed3c53abe3a9f76b4d26de56fc9ae95059a99",
-	"e3e3ace537eb3edd8463d9ad3582e13cf86533ffde43d668dd2e93bbdbd7195a",
-	"110c50c0bf2c6e7aeb7e435d92d132ab6655168e78a2decdec3330777684d9c1",
-	"e9ba8f505c9c80c08666a701f3367e6cc665f34b22e73c3c0417eb1c2206082f",
-	"26cd66fca02379c76df12317052bcafd6cd8c3a7b890d805f36c49989782433a",
-	"213f3596d6e3a5d0e9932cd2159146015e2abc949f4729ee2632fe1edb78d337",
-	"1015d70108e03be1c702fe97253607d14aee591f2413ea6787427b6459ff219a",
-	"3ca989de10cfe609909472c8d35610805b2f977734cf652cc64b3bfc882d5d89",
-	"b6156f72d380ee9ea6acd190464f2307a5c179ef01fd71f99f2d0f7a57360aea",
-	"c03bc642b20959cbe133a0303e0c1abff3e31ec8e1a328ec8565c36decff5265",
-	"2c3e08176f760c6264c3a2cd66fec6c3d78de43fc192457b2a4a660a1e0eb22b",
-	"f738c02f3c1b190c512b1a32deabf353728e0e9ab034490e3c3409946a97aeec",
-	"8b1880df301cc963418811088964839287ff7fe31c49ea6ebd9e48bdeee497c5",
-	"1e75cb21c60989020375f1a7a242839f0b0b68973a4c2a05cf7555ed5aaec4c1",
-	"62bf8a9c32a5bccf290b6c474d75b2a2a4093f1a9e27139433a8f2b3bce7b8d7",
-	"166c8350d3173b5e702b783dfd33c66ee0432742e9b92b997fd23c60dc6756ca",
-	"044a14d822a90cacf2f5a101428adc8f4109386ccb158bf905c8618b8ee24ec3",
-	"387d397ea43a994be84d2d544afbe481a2000f55252696bba2c50c8ebd101347",
-	"56f8ccf1f86409b46ce36166ae9165138441577589db08cbc5f66ca29743b9fd",
-	"9706c092b04d91f53dff91fa37b7493d28b576b5d710469df79401662236fc03",
-	"877968686c068ce2f7e2adcff68bf8748edf3cf862cfb4d3947a3106958054e3",
-	"8817e5719879acf7024787eccdb271035566cfa333e049407c0178ccc57a5b9f",
-	"8938249e4b50cadaccdf5b18621326cbb15253e33a20f5636e995d72478de472",
-	"f164abba4963a44d107257e3232d90aca5e66a1408248c51741e991db5227756",
-	"d05563e2b1cba0c4a2a1e8bde3a1a0d9f5b40c85a070d6f5fb21066ead5d0601",
-	"03fbb16384f0a3866f4c3117877666efbf124597564b293d4aab0d269fabddfa",
-	"5fa8486ac0e52964d1881bbe338eb54be2f719549224892057b4da04ba8b3475",
-	"cdfabcee46911111236a31708b2539d71fc211d9b09c0d8530a11e1dbf6eed01",
-	"4f82de03b9504793b82a07a0bdcdff314d759e7b62d26b784946b0d36f916f52",
-	"259ec7f173bcc76a0994c967b4f5f024c56057fb79c965c4fae41875f06a0e4c",
-	"193cc8e7c3e08bb30f5437aa27ade1f142369b246a675b2383e6da9b49a9809e",
-	"5c10896f0e2856b2a2eee0fe4a2c1633565d18f0e93e1fab26c373e8f829654d",
-	"f16012d93f28851a1eb989f5d0b43f3f39ca73c9a62d5181bff237536bd348c3",
-	"2966b3cfae1e44ea996dc5d686cf25fa053fb6f67201b9e46eade85d0ad6b806",
-	"ddb8782485e900bc60bcf4c33a6fd585680cc683d516efa03eb9985fad8715fb",
-	"4c4d6e71aea05786413148fc7a786b0ecaf582cff1209f5a809fba8504ce662c",
-	"fb4c5e86d7b2229b99b8ba6d94c247ef964aa3a2bae8edc77569f28dbbff2d4e",
-	"e94f526de9019633ecd54ac6120f23958d7718f1e7717bf329211a4faeed4e6d",
-	"cbd6660a10db3f23f7a03d4b9d4044c7932b2801ac89d60bc9eb92d65a46c2a0",
-	"8818bbd3db4dc123b25cbba5f54c2bc4b3fcf9bf7d7a7709f4ae588b267c4ece",
-	"c65382513f07460da39833cb666c5ed82e61b9e998f4b0c4287cee56c3cc9bcd",
-	"8975b0577fd35566d750b362b0897a26c399136df07bababbde6203ff2954ed4",
-	"21fe0ceb0052be7fb0f004187cacd7de67fa6eb0938d927677f2398c132317a8",
-	"2ef73f3c26f12d93889f3c78b6a66c1d52b649dc9e856e2c172ea7c58ac2b5e3",
-	"388a3cd56d73867abb5f8401492b6e2681eb69851e767fd84210a56076fb3dd3",
-	"af533e022fc9439e4e3cb838ecd18692232adf6fe9839526d3c3dd1b71910b1a",
-	"751c09d41a9343882a81cd13ee40818d12eb44c6c7f40df16e4aea8fab91972a",
-	"5b73ddb68d9d2b0aa265a07988d6b88ae9aac582af83032f8a9b21a2e1b7bf18",
-	"3da29126c7c5d7f43e64242a79feaa4ef3459cdeccc898ed59a97f6ec93b9dab",
-	"566dc920293da5cb4fe0aa8abda8bbf56f552313bff19046641e3615c1e3ed3f",
-	"4115bea02f73f97f629e5c5590720c01e7e449ae2a6697d4d2783321303692f9",
-	"4ce08f4762468a7670012164878d68340c52a35e66c1884d5c864889abc96677",
-	"81ea0b7804124e0c22ea5fc71104a2afcb52a1fa816f3ecb7dcb5d9dea1786d0",
-	"fe362733b05f6bedaf9379d7f7936ede209b1f8323c3922549d9e73681b5db7b",
-	"eff37d30dfd20359be4e73fdf40d27734b3df90a97a55ed745297294ca85d09f",
-	"172ffc67153d12e0ca76a8b6cd5d4731885b39ce0cac93a8972a18006c8b8baf",
-	"c47957f1cc88e83ef9445839709a480a036bed5f88ac0fcc8e1e703ffaac132c",
-	"30f3548370cfdceda5c37b569b6175e799eef1a62aaa943245ae7669c227a7b5",
-	"c95dcb3cf1f27d0eef2f25d2413870904a877c4a56c2de1e83e2bc2ae2e46821",
-	"d5d0b5d705434cd46b185749f66bfb5836dcdf6ee549a2b7a4aee7f58007caaf",
-	"bbc124a712f15d07c300e05b668389a439c91777f721f8320c1c9078066d2c7e",
-	"a451b48c35a6c7854cfaae60262e76990816382ac0667e5a5c9e1b46c4342ddf",
-	"b0d150fb55e778d01147f0b5d89d99ecb20ff07e5e6760d6b645eb5b654c622b",
-	"34f737c0ab219951eee89a9f8dac299c9d4c38f33fa494c5c6eefc92b6db08bc",
-	"1a62cc3a00800dcbd99891080c1e098458193a8cc9f970ea99fbeff00318c289",
-	"cfce55ebafc840d7ae48281c7fd57ec8b482d4b704437495495ac414cf4a374b",
-	"6746facf71146d999dabd05d093ae586648d1ee28e72617b99d0f0086e1e45bf",
-	"571ced283b3f23b4e750bf12a2caf1781847bd890e43603cdc5976102b7bb11b",
-	"cfcb765b048e35022c5d089d26e85a36b005a2b80493d03a144e09f409b6afd1",
-	"4050c7a27705bb27f42089b299f3cbe5054ead68727e8ef9318ce6f25cd6f31d",
-	"184070bd5d265fbdc142cd1c5cd0d7e414e70369a266d627c8fba84fa5e84c34",
-	"9edda9a4443902a9588c0d0ccc62b930218479a6841e6fe7d43003f04b1fd643",
-	"e412feef7908324a6da1841629f35d3d358642019310ec57c614836b63d30763",
-	"1a2b8edff3f9acc1554fcbae3cf1d6298c6462e22e5eb0259684f835012bd13f",
-	"288c4ad9b9409762ea07c24a41f04f69a7d74bee2d95435374bde946d7241c7b",
-	"805691bb286748cfb591d3aebe7e6f4e4dc6e2808c65143cc004e4eb6fd09d43",
-	"d4ac8d3a0afc6cfa7b460ae3001baeb36dadb37da07d2e8ac91822df348aed3d",
-	"c376617014d20158bced3d3ba552b6eccf84e62aa3eb650e90029c84d13eea69",
-	"c41f09f43cecae7293d6007ca0a357087d5ae59be500c1cd5b289ee810c7b082",
-	"03d1ced1fba5c39155c44b7765cb760c78708dcfc80b0bd8ade3a56da8830b29",
-	"09bde6f152218dc92c41d7f45387e63e5869d807ec70b821405dbd884b7fcf4b",
-	"71c9036e18179b90b37d39e9f05eb89cc5fc341fd7c477d0d7493285faca08a4",
-	"5916833ebb05cd919ca7fe83b692d3205bef72392b2cf6bb0a6d43f994f95f11",
-	"f63aab3ec641b3b024964c2b437c04f6043c4c7e0279239995401958f86bbe54",
-	"f172b180bfb09740493120b6326cbdc561e477def9bbcfd28cc8c1c5e3379a31",
-	"cb9b89cc18381dd9141ade588654d4e6a231d5bf49d4d59ac27d869cbe100cf3",
-	"7bd8815046fdd810a923e1984aaebdcdf84d87c8992d68b5eeb460f93eb3c8d7",
-	"607be66862fd08ee5b19facac09dfdbcd40c312101d66e6ebd2b841f1b9a9325",
-	"9fe03bbe69ab1834f5219b0da88a08b30a66c5913f0151963c360560db0387b3",
-	"90a83585717b75f0e9b725e055eeeeb9e7a028ea7e6cbc07b20917ec0363e38c",
-	"336ea0530f4a7469126e0218587ebbde3358a0b31c29d200f7dc7eb15c6aadd8",
-	"a79e76dc0abca4396f0747cd7b748df913007626b1d659da0c1f78b9303d01a3",
-	"44e78a773756e0951519504d7038d28d0213a37e0ce375371757bc996311e3b8",
-	"77ac012a3f754dcfeab5eb996be9cd2d1f96111b6e49f3994df181f28569d825",
-	"ce5a10db6fccdaf140aaa4ded6250a9c06e9222bc9f9f3658a4aff935f2b9f3a",
-	"ecc203a7fe2be4abd55bb53e6e673572e0078da8cd375ef430cc97f9f80083af",
-	"14a5186de9d7a18b0412b8563e51cc5433840b4a129a8ff963b33a3c4afe8ebb",
-	"13f8ef95cb86e6a638931c8e107673eb76ba10d7c2cd70b9d9920bbeed929409",
-	"0b338f4ee12f2dfcb78713377941e0b0632152581d1332516e4a2cab1942cca4",
-	"eaab0ec37b3b8ab796e9f57238de14a264a076f3887d86e29bb5906db5a00e02",
-	"23cb68b8c0e6dc26dc27766ddc0a13a99438fd55617aa4095d8f969720c872df",
-	"091d8ee30d6f2968d46b687dd65292665742de0bb83dcc0004c72ce10007a549",
-	"7f507abc6d19ba00c065a876ec5657868882d18a221bc46c7a6912541f5bc7ba",
-	"a0607c24e14e8c223db0d70b4d30ee88014d603f437e9e02aa7dafa3cdfbad94",
-	"ddbfea75cc467882eb3483ce5e2e756a4f4701b76b445519e89f22d60fa86e06",
-	"0c311f38c35a4fb90d651c289d486856cd1413df9b0677f53ece2cd9e477c60a",
-	"46a73a8dd3e70f59d3942c01df599def783c9da82fd83222cd662b53dce7dbdf",
-	"ad038ff9b14de84a801e4e621ce5df029dd93520d0c2fa38bff176a8b1d1698c",
-	"ab70c5dfbd1ea817fed0cd067293abf319e5d7901c2141d5d99b23f03a38e748",
-	"1fffda67932b73c8ecaf009a3491a026953babfe1f663b0697c3c4ae8b2e7dcb",
-	"b0d2cc19472dd57f2b17efc03c8d58c2283dbb19da572f7755855aa9794317a0",
-	"a0d19a6ee33979c325510e276622df41f71583d07501b87071129a0ad94732a5",
-	"724642a7032d1062b89e52bea34b75df7d8fe772d9fe3c93ddf3c4545ab5a99b",
-	"ade5eaa7e61f672d587ea03dae7d7b55229c01d06bc0a5701436cbd18366a626",
-	"013b31ebd228fcdda51fabb03bb02d60ac20ca215aafa83bdd855e3755a35f0b",
-	"332ed40bb10dde3c954a75d7b8999d4b26a1c063c1dc6e32c1d91bab7bbb7d16",
-	"c7a197b3a05b566bcc9facd20e441d6f6c2860ac9651cd51d6b9d2cdeeea0390",
-	"bd9cf64ea8953c037108e6f654914f3958b68e29c16700dc184d94a21708ff60",
-	"8835b0ac021151df716474ce27ce4d3c15f0b2dab48003cf3f3efd0945106b9a",
-	"3bfefa3301aa55c080190cffda8eae51d9af488b4c1f24c3d9a75242fd8ea01d",
-	"08284d14993cd47d53ebaecf0df0478cc182c89c00e1859c84851686ddf2c1b7",
-	"1ed7ef9f04c2ac8db6a864db131087f27065098e69c3fe78718d9b947f4a39d0",
-	"c161f2dcd57e9c1439b31a9dd43d8f3d7dd8f0eb7cfac6fb25a0f28e306f0661",
-	"c01969ad34c52caf3dc4d80d19735c29731ac6e7a92085ab9250c48dea48a3fc",
-	"1720b3655619d2a52b3521ae0e49e345cb3389ebd6208acaf9f13fdacca8be49",
-	"756288361c83e24c617cf95c905b22d017cdc86f0bf1d658f4756c7379873b7f",
-	"e7d0eda3452693b752abcda1b55e276f82698f5f1605403eff830bea0071a394",
-	"2c82ecaa6b84803e044af63118afe544687cb6e6c7df49ed762dfd7c8693a1bc",
-	"6136cbf4b441056fa1e2722498125d6ded45e17b52143959c7f4d4e395218ac2",
-	"721d3245aafef27f6a624f47954b6c255079526ffa25e9ff77e5dcff473b1597",
-	"9dd2fbd8cef16c353c0ac21191d509eb28dd9e3e0d8cea5d26ca839393851c3a",
-	"b2394ceacdebf21bf9df2ced98e58f1c3a4bbbff660dd900f62202d6785cc46e",
-	"57089f222749ad7871765f062b114f43ba20ec56422a8b1e3f87192c0ea718c6",
-	"e49a9459961cd33cdf4aae1b1078a5dea7c040e0fea340c93a724872fc4af806",
-	"ede67f720effd2ca9c88994152d0201dee6b0a2d2c077aca6dae29f73f8b6309",
-	"e0f434bf22e3088039c21f719ffc67f0f2cb5e98a7a0194c76e96bf4e8e17e61",
-	"277c04e2853484a4eba910ad336d01b477b67cc200c59f3c8d77eef8494f29cd",
-	"156d5747d0c99c7f27097d7b7e002b2e185cb72d8dd7eb424a0321528161219f",
-	"20ddd1ed9b1ca803946d64a83ae4659da67fba7a1a3eddb1e103c0f5e03e3a2c",
-	"f0af604d3dabbf9a0f2a7d3dda6bd38bba72c6d09be494fcef713ff10189b6e6",
-	"9802bb87def4cc10c4a5fd49aa58dfe2f3fddb46b4708814ead81d23ba95139b",
-	"4f8ce1e51d2fe7f24043a904d898ebfc91975418753413aa099b795ecb35cedb",
-	"bddc6514d7ee6ace0a4ac1d0e068112288cbcf560454642705630177cba608bd",
-	"d635994f6291517b0281ffdd496afa862712e5b3c4e52e4cd5fdae8c0e72fb08",
-	"878d9ca600cf87e769cc305c1b35255186615a73a0da613b5f1c98dbf81283ea",
-	"a64ebe5dc185de9fdde7607b6998702eb23456184957307d2fa72e87a47702d6",
-	"ce50eab7b5eb52bdc9ad8e5a480ab780ca9320e44360b1fe37e03f2f7ad7de01",
-	"eeddb7c0db6e30abe66d79e327511e61fcebbc29f159b40a86b046ecf0513823",
-	"787fc93440c1ec96b5ad01c16cf77916a1405f9426356ec921d8dff3ea63b7e0",
-	"7f0d5eab47eefda696c0bf0fbf86ab216fce461e9303aba6ac374120e890e8df",
-	"b68004b42f14ad029f4c2e03b1d5eb76d57160e26476d21131bef20ada7d27f4",
-	"b0c4eb18ae250b51a41382ead92d0dc7455f9379fc9884428e4770608db0faec",
-	"f92b7a870c059f4d46464c824ec96355140bdce681322cc3a992ff103e3fea52",
-	"5364312614813398cc525d4c4e146edeb371265fba19133a2c3d2159298a1742",
-	"f6620e68d37fb2af5000fc28e23b832297ecd8bce99e8be4d04e85309e3d3374",
-	"5316a27969d7fe04ff27b283961bffc3bf5dfb32fb6a89d101c6c3b1937c2871",
-	"81d1664fdf3cb33c24eebac0bd64244b77c4abea90bbe8b5ee0b2aafcf2d6a53",
-	"345782f295b0880352e924a0467b5fbc3e8f3bfbc3c7e48b67091fb5e80a9442",
-	"794111ea6cd65e311f74ee41d476cb632ce1e4b051dc1d9e9d061a19e1d0bb49",
-	"2a85daf6138816b99bf8d08ba2114b7ab07975a78420c1a3b06a777c22dd8bcb",
-	"89b0d5f289ec16401a069a960d0b093e625da3cf41ee29b59b930c5820145455",
-	"d0fdcb543943fc27d20864f52181471b942cc77ca675bcb30df31d358ef7b1eb",
-	"b17ea8d77063c709d4dc6b879413c343e3790e9e62ca85b7900b086f6b75c672",
-	"e71a3e2c274db842d92114f217e2c0eac8b45093fdfd9df4ca7162394862d501",
-	"c0476759ab7aa333234f6b44f5fd858390ec23694c622cb986e769c78edd733e",
-	"9ab8eabb1416434d85391341d56993c55458167d4418b19a0f2ad8b79a83a75b",
-	"7992d0bbb15e23826f443e00505d68d3ed7372995a5c3e498654102fbcd0964e",
-	"c021b30085151435df33b007ccecc69df1269f39ba25092bed59d932ac0fdc28",
-	"91a25ec0ec0d9a567f89c4bfe1a65a0e432d07064b4190e27dfb81901fd3139b",
-	"5950d39a23e1545f301270aa1a12f2e6c453776e4d6355de425cc153f9818867",
-	"d79f14720c610af179a3765d4b7c0968f977962dbf655b521272b6f1e194488e",
-	"e9531bfc8b02995aeaa75ba27031fadbcbf4a0dab8961d9296cd7e84d25d6006",
-	"34e9c26a01d7f16181b454a9d1623c233cb99d31c694656e9413aca3e918692f",
-	"d9d7422f437bd439ddd4d883dae2a08350173414be78155133fff1964c3d7972",
-	"4aee0c7aaf075414ff1793ead7eaca601775c615dbd60b640b0a9f0ce505d435",
-	"6bfdd15459c83b99f096bfb49ee87b063d69c1974c6928acfcfb4099f8c4ef67",
-	"9fd1c408fd75c336193a2a14d94f6af5adf050b80387b4b010fb29f4cc72707c",
-	"13c88480a5d00d6c8c7ad2110d76a82d9b70f4fa6696d4e5dd42a066dcaf9920",
-	"820e725ee25fe8fd3a8d5abe4c46c3ba889de6fa9191aa22ba67d5705421542b",
-	"32d93a0eb02f42fbbcaf2bad0085b282e46046a4df7ad10657c9d6476375b93e",
-	"adc5187905b1669cd8ec9c721e1953786b9d89a9bae30780f1e1eab24a00523c",
-	"e90756ff7f9ad810b239a10ced2cf9b2284354c1f8c7e0accc2461dc796d6e89",
-	"1251f76e56978481875359801db589a0b22f86d8d634dc04506f322ed78f17e8",
-	"3afa899fd980e73ecb7f4d8b8f291dc9af796bc65d27f974c6f193c9191a09fd",
-	"aa305be26e5deddc3c1010cbc213f95f051c785c5b431e6a7cd048f161787528",
-	"8ea1884ff32e9d10f039b407d0d44e7e670abd884aeee0fb757ae94eaa97373d",
-	"d482b2155d4dec6b4736a1f1617b53aaa37310277d3fef0c37ad41768fc235b4",
-	"4d413971387e7a8898a8dc2a27500778539ea214a2dfe9b3d7e8ebdce5cf3db3",
-	"696e5d46e6c57e8796e4735d08916e0b7929b3cf298c296d22e9d3019653371c",
-	"1f5647c1d3b088228885865c8940908bf40d1a8272821973b160008e7a3ce2eb",
-	"b6e76c330f021a5bda65875010b0edf09126c0f510ea849048192003aef4c61c",
-	"3cd952a0beada41abb424ce47f94b42be64e1ffb0fd0782276807946d0d0bc55",
-	"98d92677439b41b7bb513312afb92bcc8ee968b2e3b238cecb9b0f34c9bb63d0",
-	"ecbca2cf08ae57d517ad16158a32bfa7dc0382eaeda128e91886734c24a0b29d",
-	"942cc7c0b52e2b16a4b89fa4fc7e0bf609e29a08c1a8543452b77c7bfd11bb28",
-	"8a065d8b61a0dffb170d5627735a76b0e9506037808cba16c345007c9f79cf8f",
-	"1b9fa19714659c78ff413871849215361029ac802b1cbcd54e408bd87287f81f",
-	"8dab071bcd6c7292a9ef727b4ae0d86713301da8618d9a48adce55f303a869a1",
-	"8253e3e7c7b684b9cb2beb014ce330ff3d99d17abbdbabe4f4d674ded53ffc6b",
-	"f195f321e9e3d6bd7d074504dd2ab0e6241f92e784b1aa271ff648b1cab6d7f6",
-	"27e4cc72090f241266476a7c09495f2db153d5bcbd761903ef79275ec56b2ed8",
-	"899c2405788e25b99a1846355e646d77cf400083415f7dc5afe69d6e17c00023",
-	"a59b78c4905744076bfee894de707d4f120b5c6893ea0400297d0bb834727632",
-	"59dc78b105649707a2bb4419c48f005400d3973de3736610230435b10424b24f",
-	"c0149d1d7e7a6353a6d906efe728f2f329fe14a4149a3ea77609bc42b975ddfa",
-	"a32f241474a6c16932e9243be0cf09bcdc7e0ca0e7a6a1b9b1a0f01e41502377",
-	"b239b2e4f81841361c1339f68e2c359f929af9ad9f34e01aab4631ad6d5500b0",
-	"85fb419c7002a3e0b4b6ea093b4c1ac6936645b65dac5ac15a8528b7b94c1754",
-	"9619720625f190b93a3fad186ab314189633c0d3a01e6f9bc8c4a8f82f383dbf",
-	"7d620d90fe69fa469a6538388970a1aa09bb48a2d59b347b97e8ce71f48c7f46",
-	"294383568596fb37c75bbacd979c5ff6f20a556bf8879cc72924855df9b8240e",
-	"16b18ab314359c2b833c1c6986d48c55a9fc97cde9a3c1f10a3177140f73f738",
-	"8cbbdd14bc33f04cf45813e4a153a273d36adad5ce71f499eeb87fb8ac63b729",
-	"69c9a498db174ecaefcc5a3ac9fdedf0f813a5bec727f1e775babdec7718816e",
-	"b462c3be40448f1d4f80626254e535b08bc9cdcff599a768578d4b2881a8e3f0",
-	"553e9d9c5f360ac0b74a7d44e5a391dad4ced03e0c24183b7e8ecabdf1715a64",
-	"7a7c55a56fa9ae51e655e01975d8a6ff4ae9e4b486fcbe4eac044588f245ebea",
-	"2afdf3c82abc4867f5de111286c2b3be7d6e48657ba923cfbf101a6dfcf9db9a",
-	"41037d2edcdce0c49b7fb4a6aa0999ca66976c7483afe631d4eda283144f6dfc",
-	"c4466f8497ca2eeb4583a0b08e9d9ac74395709fda109d24f2e4462196779c5d",
-	"75f609338aa67d969a2ae2a2362b2da9d77c695dfd1df7224a6901db932c3364",
-	"68606ceb989d5488fc7cf649f3d7c272ef055da1a93faecd55fe06f6967098ca",
-	"44346bdeb7e052f6255048f0d9b42c425bab9c3dd24168212c3ecf1ebf34e6ae",
-	"8e9cf6e1f366471f2ac7d2ee9b5e6266fda71f8f2e4109f2237ed5f8813fc718",
-	"84bbeb8406d250951f8c1b3e86a7c010082921833dfd9555a2f909b1086eb4b8",
-	"ee666f3eef0f7e2a9c222958c97eaf35f51ced393d714485ab09a069340fdf88",
-	"c153d34a65c47b4a62c5cacf24010975d0356b2f32c8f5da530d338816ad5de6",
-	"9fc5450109e1b779f6c7ae79d56c27635c8dd426c5a9d54e2578db989b8c3b4e",
-	"d12bf3732ef4af5c22fa90356af8fc50fcb40f8f2ea5c8594737a3b3d5abdbd7",
-	"11030b9289bba5af65260672ab6fee88b87420acef4a1789a2073b7ec2f2a09e",
-	"69cb192b8444005c8c0ceb12c846860768188cda0aec27a9c8a55cdee2123632",
-	"db444c15597b5f1a03d1f9edd16e4a9f43a667cc275175dfa2b704e3bb1a9b83",
-	"3fb735061abc519dfe979e54c1ee5bfad0a9d858b3315bad34bde999efd724dd",
-}
-
-var hashes128 = []string{
-	"9536f9b267655743dee97b8a670f9f53",
-	"13bacfb85b48a1223c595f8c1e7e82cb",
-	"d47a9b1645e2feae501cd5fe44ce6333",
-	"1e2a79436a7796a3e9826bfedf07659f",
-	"7640360ed3c4f3054dba79a21dda66b7",
-	"d1207ac2bf5ac84fc9ef016da5a46a86",
-	"3123987871e59305ece3125abfc0099a",
-	"cf9e072ad522f2cda2d825218086731c",
-	"95d22870392efe2846b12b6e8e84efbb",
-	"7d63c30e2d51333f245601b038c0b93b",
-	"ed608b98e13976bdf4bedc63fa35e443",
-	"ed704b5cd1abf8e0dd67a6ac667a3fa5",
-	"77dc70109827dc74c70fd26cba379ae5",
-	"d2bf34508b07825ee934f33958f4560e",
-	"a340baa7b8a93a6e658adef42e78eeb7",
-	"b85c5ceaecbe9a251eac76f6932ba395",
-	"246519722001f6e8e97a2183f5985e53",
-	"5bce5aa0b7c6cac2ecf6406183cd779a",
-	"13408f1647c02f6efd0047ad8344f695",
-	"a63970f196760aa36cb965ab62f0e0fa",
-	"bc26f48421dd99fd45e15e736d3e7dac",
-	"4c6f70f9e3237cde918afb52d26f1823",
-	"45ed610cfbc37db80c4bf0eef14ae8d6",
-	"87c4c150705ea5078209ec008200539c",
-	"54de21f5e0e6f2afe04daeb822b6931e",
-	"9732a04e505064e19de3d542e7e71631",
-	"d2bd27e95531d6957eef511c4ba64ad4",
-	"7a36c9f70dcc7c3063b547101a5f6c35",
-	"322007d1a44c4257bc7903b183305529",
-	"dbcc9a09f412290ca2e0d53dfd142ddb",
-	"df12ed43b8e53a56db20e0f83764002c",
-	"d114cc11e7d5b33a360c45f18d4c7c6e",
-	"c43b5e836af88620a8a71b1652cb8640",
-	"9491c653e8867ed73c1b4ac6b5a9bb4d",
-	"06d0e988df94ada6c6f9f36f588ab7c5",
-	"561efad2480e93262c8eeaa3677615c4",
-	"ba8ffc702e5adc93503045eca8702312",
-	"5782be6ccdc78c8425285e85de8ccdc6",
-	"aa1c4393e4c07b53ea6e2b5b1e970771",
-	"42a229dc50e52271c51e8666023ebc1e",
-	"53706110e919f84de7f8d6c7f0e7b831",
-	"fc5ac8ee39cc1dd1424391323e2901bd",
-	"bed27b62ff66cac2fbb68193c727106a",
-	"cd5e689b96d0b9ea7e08dac36f7b211e",
-	"0b4c7f604eba058d18e322c6e1baf173",
-	"eb838227fdfad09a27f0f8413120675d",
-	"3149cf9d19a7fd529e6154a8b4c3b3ad",
-	"ca1e20126df930fd5fb7afe4422191e5",
-	"b23398f910599f3c09b6549fa81bcb46",
-	"27fb17c11b34fa5d8b5afe5ee3321ead",
-	"0f665f5f04cf2d46b7fead1a1f328158",
-	"8f068be73b3681f99f3b282e3c02bba5",
-	"ba189bbd13808dcf4e002a4dd21660d5",
-	"2732dcd1b16668ae6ab6a61595d0d62a",
-	"d410ccdd059f0e02b472ec9ec54bdd3c",
-	"b2eaa07b055b3a03a399971327f7e8c2",
-	"2e8a225655e9f99b69c60dc8b4d8e566",
-	"4eb55416c853f2152e67f8a224133cec",
-	"49552403790d8de0505a8e317a443687",
-	"7f2747cd41f56942752e868212c7d5ac",
-	"02a28f10e193b430df7112d2d98cf759",
-	"d4213404a9f1cf759017747cf5958270",
-	"faa34884344f9c65e944882db8476d34",
-	"ece382a8bd5018f1de5da44b72cea75b",
-	"f1efa90d2547036841ecd3627fafbc36",
-	"811ff8686d23a435ecbd0bdafcd27b1b",
-	"b21beea9c7385f657a76558530438721",
-	"9cb969da4f1b4fc5b13bf78fe366f0c4",
-	"8850d16d7b614d3268ccfa009d33c7fc",
-	"aa98a2b6176ea86415b9aff3268c6f6d",
-	"ec3e1efa5ed195eff667e16b1af1e39e",
-	"e40787dca57411d2630db2de699beb08",
-	"554835890735babd06318de23d31e78a",
-	"493957feecddc302ee2bb2086b6ebfd3",
-	"f6069709ad5b0139163717e9ce1114ab",
-	"ba5ed386098da284484b211555505a01",
-	"9244c8dfad8cbb68c118fa51465b3ae4",
-	"51e309a5008eb1f5185e5cc007cfb36f",
-	"6ce9ff712121b4f6087955f4911eafd4",
-	"59b51d8dcda031218ccdd7c760828155",
-	"0012878767a3d4f1c8194458cf1f8832",
-	"82900708afd5b6582dc16f008c655edd",
-	"21302c7e39b5a4cdf1d6f86b4f00c9b4",
-	"e894c7431591eab8d1ce0fe2aa1f01df",
-	"b67e1c40ee9d988226d605621854d955",
-	"6237bdafa34137cbbec6be43ea9bd22c",
-	"4172a8e19b0dcb09b978bb9eff7af52b",
-	"5714abb55bd4448a5a6ad09fbd872fdf",
-	"7ce1700bef423e1f958a94a77a94d44a",
-	"3742ec50cded528527775833453e0b26",
-	"5d41b135724c7c9c689495324b162f18",
-	"85c523333c6442c202e9e6e0f1185f93",
-	"5c71f5222d40ff5d90e7570e71ab2d30",
-	"6e18912e83d012efb4c66250ced6f0d9",
-	"4add4448c2e35e0b138a0bac7b4b1775",
-	"c0376c6bc5e7b8b9d2108ec25d2aab53",
-	"f72261d5ed156765c977751c8a13fcc1",
-	"cff4156c48614b6ceed3dd6b9058f17e",
-	"36bfb513f76c15f514bcb593419835aa",
-	"166bf48c6bffaf8291e6fdf63854bef4",
-	"0b67d33f8b859c3157fbabd9e6e47ed0",
-	"e4da659ca76c88e73a9f9f10f3d51789",
-	"33c1ae2a86b3f51c0642e6ed5b5aa1f1",
-	"27469b56aca2334449c1cf4970dcd969",
-	"b7117b2e363378aa0901b0d6a9f6ddc0",
-	"a9578233b09e5cd5231943fdb12cd90d",
-	"486d7d75253598b716a068243c1c3e89",
-	"66f6b02d682b78ffdc85e9ec86852489",
-	"38a07b9a4b228fbcc305476e4d2e05d2",
-	"aedb61c7970e7d05bf9002dae3c6858c",
-	"c03ef441f7dd30fdb61ad2d4d8e4c7da",
-	"7f45cc1eea9a00cb6aeb2dd748361190",
-	"a59538b358459132e55160899e47bd65",
-	"137010fef72364411820c3fbed15c8df",
-	"d8362b93fc504500dbd33ac74e1b4d70",
-	"a7e49f12c8f47e3b29cf8c0889b0a9c8",
-	"072e94ffbfc684bd8ab2a1b9dade2fd5",
-	"5ab438584bd2229e452052e002631a5f",
-	"f233d14221097baef57d3ec205c9e086",
-	"3a95db000c4a8ff98dc5c89631a7f162",
-	"0544f18c2994ab4ddf1728f66041ff16",
-	"0bc02116c60a3cc331928d6c9d3ba37e",
-	"b189dca6cb5b813c74200834fba97f29",
-	"ac8aaab075b4a5bc24419da239212650",
-	"1e9f19323dc71c29ae99c479dc7e8df9",
-	"12d944c3fa7caa1b3d62adfc492274dd",
-	"b4c68f1fffe8f0030e9b18aad8c9dc96",
-	"25887fab1422700d7fa3edc0b20206e2",
-	"8c09f698d03eaf88abf69f8147865ef6",
-	"5c363ae42a5bec26fbc5e996428d9bd7",
-	"7fdfc2e854fbb3928150d5e3abcf56d6",
-	"f0c944023f714df115f9e4f25bcdb89b",
-	"6d19534b4c332741c8ddd79a9644de2d",
-	"32595eb23764fbfc2ee7822649f74a12",
-	"5a51391aab33c8d575019b6e76ae052a",
-	"98b861ce2c620f10f913af5d704a5afd",
-	"b7fe2fc8b77fb1ce434f8465c7ddf793",
-	"0e8406e0cf8e9cc840668ece2a0fc64e",
-	"b89922db99c58f6a128ccffe19b6ce60",
-	"e1be9af665f0932b77d7f5631a511db7",
-	"74b96f20f58de8dc9ff5e31f91828523",
-	"36a4cfef5a2a7d8548db6710e50b3009",
-	"007e95e8d3b91948a1dedb91f75de76b",
-	"a87a702ce08f5745edf765bfcd5fbe0d",
-	"847e69a388a749a9c507354d0dddfe09",
-	"07176eefbc107a78f058f3d424ca6a54",
-	"ad7e80682333b68296f6cb2b4a8e446d",
-	"53c4aba43896ae422e5de5b9edbd46bf",
-	"33bd6c20ca2a7ab916d6e98003c6c5f8",
-	"060d088ea94aa093f9981a79df1dfcc8",
-	"5617b214b9df08d4f11e58f5e76d9a56",
-	"ca3a60ee85bd971e1daf9f7db059d909",
-	"cd2b7754505d8c884eddf736f1ec613e",
-	"f496163b252f1439e7e113ba2ecabd8e",
-	"5719c7dcf9d9f756d6213354acb7d5cf",
-	"6f7dd40b245c54411e7a9be83ae5701c",
-	"c8994dd9fdeb077a45ea04a30358b637",
-	"4b1184f1e35458c1c747817d527a252f",
-	"fc7df674afeac7a3fd994183f4c67a74",
-	"4f68e05ce4dcc533acf9c7c01d95711e",
-	"d4ebc59e918400720035dfc88e0c486a",
-	"d3105dd6fa123e543b0b3a6e0eeaea9e",
-	"874196128ed443f5bdb2800ca048fcad",
-	"01645f134978dc8f9cf0abc93b53780e",
-	"5b8b64caa257873a0ffd47c981ef6c3f",
-	"4ee208fc50ba0a6e65c5b58cec44c923",
-	"53f409a52427b3b7ffabb057ca088428",
-	"c1d6cd616f5341a93d921e356e5887a9",
-	"e85c20fea67fa7320dc23379181183c8",
-	"7912b6409489df001b7372bc94aebde7",
-	"e559f761ec866a87f1f331767fafc60f",
-	"20a6f5a36bc37043d977ed7708465ef8",
-	"6a72f526965ab120826640dd784c6cc4",
-	"bf486d92ad68e87c613689dd370d001b",
-	"d339fd0eb35edf3abd6419c8d857acaf",
-	"9521cd7f32306d969ddabc4e6a617f52",
-	"a1cd9f3e81520842f3cf6cc301cb0021",
-	"18e879b6f154492d593edd3f4554e237",
-	"66e2329c1f5137589e051592587e521e",
-	"e899566dd6c3e82cbc83958e69feb590",
-	"8a4b41d7c47e4e80659d77b4e4bfc9ae",
-	"f1944f6fcfc17803405a1101998c57dd",
-	"f6bcec07567b4f72851b307139656b18",
-	"22e7bb256918fe9924dce9093e2d8a27",
-	"dd25b925815fe7b50b7079f5f65a3970",
-	"0457f10f299acf0c230dd4007612e58f",
-	"ecb420c19efd93814fae2964d69b54af",
-	"14eb47b06dff685d88751c6e32789db4",
-	"e8f072dbb50d1ab6654aa162604a892d",
-	"69cff9c62092332f03a166c7b0034469",
-	"d3619f98970b798ca32c6c14cd25af91",
-	"2246d423774ee9d51a551e89c0539d9e",
-	"75e5d1a1e374a04a699247dad827b6cf",
-	"6d087dd1d4cd15bf47db07c7a96b1db8",
-	"967e4c055ac51b4b2a3e506cebd5826f",
-	"7417aa79247e473401bfa92a25b62e2a",
-	"24f3f4956da34b5c533d9a551ccd7b16",
-	"0c40382de693a5304e2331eb951cc962",
-	"9436f949d51b347db5c8e6258dafaaac",
-	"d2084297fe84c4ba6e04e4fb73d734fe",
-	"42a6f8ff590af21b512e9e088257aa34",
-	"c484ad06b1cdb3a54f3f6464a7a2a6fd",
-	"1b8ac860f5ceb4365400a201ed2917aa",
-	"c43eadabbe7b7473f3f837fc52650f54",
-	"0e5d3205406126b1f838875deb150d6a",
-	"6bf4946f8ec8a9c417f50cd1e67565be",
-	"42f09a2522314799c95b3fc121a0e3e8",
-	"06b8f1487f691a3f7c3f74e133d55870",
-	"1a70a65fb4f314dcf6a31451a9d2704f",
-	"7d4acdd0823279fd28a1e48b49a04669",
-	"09545cc8822a5dfc93bbab708fd69174",
-	"efc063db625013a83c9a426d39a9bddb",
-	"213bbf89b3f5be0ffdb14854bbcb2588",
-	"b69624d89fe2774df9a6f43695d755d4",
-	"c0f9ff9ded82bd73c512e365a894774d",
-	"d1b68507ed89c17ead6f69012982db71",
-	"14cf16db04648978e35c44850855d1b0",
-	"9f254d4eccab74cd91d694df863650a8",
-	"8f8946e2967baa4a814d36ff01d20813",
-	"6b9dc4d24ecba166cb2915d7a6cba43b",
-	"eb35a80418a0042b850e294db7898d4d",
-	"f55f925d280c637d54055c9df088ef5f",
-	"f48427a04f67e33f3ba0a17f7c9704a7",
-	"4a9f5bfcc0321aea2eced896cee65894",
-	"8723a67d1a1df90f1cef96e6fe81e702",
-	"c166c343ee25998f80bad4067960d3fd",
-	"dab67288d16702e676a040fd42344d73",
-	"c8e9e0d80841eb2c116dd14c180e006c",
-	"92294f546bacf0dea9042c93ecba8b34",
-	"013705b1502b37369ad22fe8237d444e",
-	"9b97f8837d5f2ebab0768fc9a6446b93",
-	"7e7e5236b05ec35f89edf8bf655498e7",
-	"7be8f2362c174c776fb9432fe93bf259",
-	"2422e80420276d2df5702c6470879b01",
-	"df645795db778bcce23bbe819a76ba48",
-	"3f97a4ac87dfc58761cda1782d749074",
-	"50e3f45df21ebfa1b706b9c0a1c245a8",
-	"7879541c7ff612c7ddf17cb8f7260183",
-	"67f6542b903b7ba1945eba1a85ee6b1c",
-	"b34b73d36ab6234b8d3f5494d251138e",
-	"0aea139641fdba59ab1103479a96e05f",
-	"02776815a87b8ba878453666d42afe3c",
-	"5929ab0a90459ebac5a16e2fb37c847e",
-	"c244def5b20ce0468f2b5012d04ac7fd",
-	"12116add6fefce36ed8a0aeccce9b6d3",
-	"3cd743841e9d8b878f34d91b793b4fad",
-	"45e87510cf5705262185f46905fae35f",
-	"276047016b0bfb501b2d4fc748165793",
-	"ddd245df5a799417d350bd7f4e0b0b7e",
-	"d34d917a54a2983f3fdbc4b14caae382",
-	"7730fbc09d0c1fb1939a8fc436f6b995",
-	"eb4899ef257a1711cc9270a19702e5b5",
-	"8a30932014bce35bba620895d374df7a",
-	"1924aabf9c50aa00bee5e1f95b5d9e12",
-	"1758d6f8b982aec9fbe50f20e3082b46",
-	"cd075928ab7e6883e697fe7fd3ac43ee",
-}
-
-// hashes2X is taken from
-// https://github.com/BLAKE2/BLAKE2/blob/master/testvectors/blake2-kat.json
-var hashes2X = []string{
-	"0e",
-	"5196",
-	"ad6bad",
-	"d8e4b32f",
-	"8eb89056f3",
-	"410497c2ed72",
-	"f0de771b375c90",
-	"8662db8685033611",
-	"9ef9f1eed88a3f52ca",
-	"08225082df0d2b0a815e",
-	"0f6e84a17439f1bc97c299",
-	"895ec39c78d3556cefdbfabc",
-	"2b396b3fa90ab556079a79b44d",
-	"abae26501c4c1d6123c0f2289111",
-	"bca098df9099b3f785a37ba40fce5f",
-	"19b827f054b67a120f11efb0d690be70",
-	"b88d32a338fd60b58570fda228a121113b",
-	"3f30143af1cad33f9b794576e078cc79062e",
-	"ffddb58d9aa8d38086fcdae07e6653e8f31dfc",
-	"abb99c2e74a74556919040ca0cd857c95ec985e9",
-	"71f13f89af55ba936f8a7188ee93d2e8fb0cf2a720",
-	"99734fdf0eef4838a7515426f4c59b800854e2fcdc1c",
-	"579b1652aa1f5779d2b0e61868af856855020bdd44d7a7",
-	"1383d4ab4a6d8672b4075d421a159f69380ff47e4bb518d5",
-	"d3fa1412712dbbab71d4c6265dc1585c8dcc73380cf807f76a",
-	"1d57868a71e7245667780455d9aaa9e0683baf08fbaf946091c2",
-	"ef80418fe7049c6251ed7960a6b0e9def0da2749781994b24593a0",
-	"ef91cb81e4bfb50231e89475e251e2ef2fde59357551cd227588b63f",
-	"d7f398a5d21c3139cff0562a84f154b6953c7bc18a5f4b60491c196b6d",
-	"0a2abc6d38f30aef253579a4088c5b9aec64391f37d576eb06a300c193a5",
-	"02dd758fa23113a14fd94830e50e0f6b86faec4e551e808b0ca8d00fef2a15",
-	"a4fe2bd0f96a215fa7164ae1a405f4030a586c12b0c29806a099d7d7fdd8dd72",
-	"7dce710a20f42ab687ec6ea83b53faaa418229ce0d5a2ff2a5e66defb0b65c03c9",
-	"0320c40b5eea641d0bc25420b7545ac1d796b61563728a4dc451207f1addeedcf860",
-	"460539415f2baeb626fad748dee0eb3e9f27221661160e13edf39d1b5d476ee0672400",
-	"02de8ffa5b9c748164f99ed9d678b02e53f4ae88fb26c6d94a8cefc328725a692eae78c2",
-	"348a61a0136436136910262ad67ef20644b32c15456d5fad6b1679386d0bea87cc1a2e2b5e",
-	"24c32966c803434d48d2283482ee8f404f598cf7a17961748125d2ed1da987039b1ce00f2ba7",
-	"bd07cb16121d3b47adf03b96c41c947beadc01e40548e0d0773e61780d48d33a0e2a675ca681a6",
-	"a35844e34c20b4b9371b6c52fac412afe5d80a4c1e40aa3a0e5a729dc3d41c2c3719d096f616f0ba",
-	"6df1efbb4567747fe98d218935612f8835852dde2ce3dec767792d7f1d876cdae0056fef085245449d",
-	"48d6094af78bd38d8f4b39c54279b80ef617bc6ad21def0b2c62113b656c5d6a55aea2e3fde94a254b92",
-	"cd6e684759d2f19083164712c2aca0038442efb5b646594396b1fccdbd21203290f44cfdecca0373b3801b",
-	"155dfbf26103c8354362663677fa27d0e1ce3487a821a2a7171014c1bd5dd071f4974df272b1374765b8f2e1",
-	"15b11067f311efa4ee813dbca48d690dc92780656bc4d4c56510523190a240180867c829a8b8b9844175a8aa23",
-	"9bc27953a17fb84d5eabe95b4ea6bc03ea450274abccfb6f3938ded8560fb59662459a11a86b0e0f32fbea6bb1f8",
-	"03b78fb0b34fb8662accdf350a6be75ace9789653ee4375d351e871f6a98ac5e782ca4b4a717665d25e49a5ae25d81",
-	"687e9a6fda6e2ce0e40e4d30fef38c31e3513d2892bbe85c991fc3715947e42bc49bcd079a40ed061c2c3665efe555ab",
-	"f3886027d2049a8909e26545bd202d6a6fa2a6f815d31c7d520f705a81fa606dd695369c37aee4fa77dc645e9b05813ceb",
-	"e4a412ccd20b97797d91ccc286904fcd17c5afe8bed0618f1af333c052c473cd327637d951c32e4af047106036a3bc8c1c45",
-	"92f4b8c240a28b6238bc2eabadaf2ff3c4bfe0e6c61268ace6aebdeb0691450caea4287db8b329bde96af8cdb8a0fe2f57ef2d",
-	"e506834b3445e1a9a9b7bae844e91e0834512a06c0dc75fa4604e3b903c4e23616f2e0c78b5cc496660b4a13064bb1138edef4ff",
-	"27031955a40d8dbd1591f26e3c26e367a3c68f8204a396c6a4ba34b89672896d11276966a42bd516716f35ed63e442e116dbcf35da",
-	"646b1635c68d2328dddd5ac26eb9877c24c28390a45753a65044c3136ae2fe4fb40d09bf555271646d3dceb1ab1b7c8d8e421f553f94",
-	"f6171f8d833743bdee7cc8f8b29c38614e1d2d8d6a5fff68bec2c0f4dd463d7941ff5c368e2683d8f1dc97119bde2b73ca412718bc8cb1",
-	"45db1c478b040aa2e23fb4427017079810775c62abe737e82ec0ef8dcd0fc51f521f29fe6412fff7eac9beb7bcf75f483f3f8b971e42454b",
-	"500dab14687db3ca3dde9304af5f54194b37bdf475628af46b07bfbf6bc2b64ecef284b17f9d1d9be41794699bc0e76c2878b3a55730f7142d",
-	"31bba2efc7b3f415c3f031d4c06bb590ae40085ad157370af30238e03e25a359c9e133212ed34b7a006f839173b577e7015a87fdff2270fafddb",
-	"0600b3fb4b5e1ed0c8b2698ac1d9905e67e027390764821f963ad8d2b33cbc378b9c25c3ee422992d22b760222ed5697be0576d73938ae9d634ed7",
-	"4c0ca4f177d132594a4c613bad68da24c564efa3b4da0d0a903f26534a2e09f8d799d10e78f48ccdb0203954a36c5cf1bf24c076632c2b022b041200",
-	"97aacf2e1b013677b2e14084f097cb1e64d7b3fa36f097e189d86dc4a263bcc46817cd1ee6ff0c7ccd9acef63201cdc0e36254e19204a7388643bb571f",
-	"71fd6846ce7adb0843d6063546a16b79b54ad6c0f018a479a45817624fa221f63525084860559d1a0679c8d89a80701c62743ec2da8419d503f8f0cd7946",
-	"f73dfb046def3362d6de36077dae2cee2587fe95fe0800548bb7d99737897096ba59052e0dadcc1fb0ccb5535391875328637a0376a43a4d89366758dfe3e2",
-	"ec470d0aa932c78c5bcf86203ec0014314114765fa679c3daef214f883a17e1b4ca12f44433772a6e4ef685c904b2fc35586c6bd88f325b965968b06d808d73f",
-	"cf601753ffa09fe48a8a84c37769991e96290e200bbaf1910c57760f989bd0c72e6128e294528ee861ad7eee70d589de3cf4a0c35f7197e1925a64d0133628d87d",
-	"f15413f7d6fc54bb55829f698da92ee42fcf58dde1aa1bd07d438ecdc32ad6bf2bcdbecc99f18ed43e81b33065af5a4ca29960ae50553e610c0bbf4153d580e73dbb",
-	"84b1738adb9757fb9402ef7113581291136184d7ae35fe0b6a738da6acb0889d4d5bac7a957024e3709fa80c77d3859871ed1aa25cf488e438a2d24cfadce6008761dd",
-	"e02814bb81f250c1835a05108396b74c7878e737654bb83155e241774d04e639bbc571b413cd9349092f926c8a149a53cd33e9b63f370b6d460e504199d2e7d849db6cbe",
-	"aeee4a789956ec0913592c30ce4f9c544894da77ba447c84df3be2c869100e4df8f7e316445d844b31c3209abcc912f647735fd4a7136c2f35c6fda5b2e6708f5ca951b2b0",
-	"8cfd11ca385de3c843de84c830d59278fe79b70fb5ddbfbfc1ddefeb22c329ef2f607d1d1abbd1cd0d0cc7c5d3ed922add76aadca0d2f57b66cb16c582b6f18f60aee2f7509b",
-	"852e5ce2047d8d8b42b4c7e4987b95d23e8026a202d4567951bbbd23111e389fe33a736318546a914d2bddedfbf53846036ad9e35f29318b1f96e33eba08f071d6dc665149feb6",
-	"f225c23164979d0d13874a90ee291627e4f61a672a5578506fd3d65a12cb48a182f78350dc24c637b2f3950dc4882a5c1d5d5bad551c6f3e0093aa87e962bea51566af3791d52d65",
-	"5f33864d882455f8ef046aed64e2d1691e5c1555e333b0852750592e6f00d3b5ec941d0c00e99629612795d5870cf93c984b45e4464ba072a34903b400a42824ac13da28c7c1cb1959",
-	"7baaee7c3eb68c18c5ae1d45ba381803de34e36a52e2d7ccc9d48a297273c4d8644b473195bc23005f7a4f5ca790b1fa11f6a96e585e635513f11745dd97a69c1222204ab28d3c7735df",
-	"d0a2a3fc450ef9af7ae982041feb2842901026467d87839c33b4a9e081ea63d5be60ae99ca6e42393ded45255b8f42886f87ba0310572d9f0d8b5a07ff4b6bae1f30559a844983cc568560",
-	"3aa4164462b3e7044c35b08b047b924790f6d5c520b1df4305b5d41f4717e81f0cd4bccb9a5a6594773832b8707443adde4047caaed2293f92234df257df54ed275a9658fab483d0576d33a9",
-	"c8b4239fd7f1b893d978268f77f6505b5775d89090374322d40083b0f4c437423f670ca213f7fe05c61069725da2561646eefaea597ac48e293fbad44c2872046857e56d04a426a84008cefd71",
-	"f94839a7024c0a16971271b6727c081770110c957b1f2e03be03d2200b565cf8240f2873b0426042aaea996a1784fadb2b27f23bc1a521b4f7320dfbed86cd38d75141365ba9b443defc0a3b4078",
-	"8af934fdc8b3376ca09bdd89f9057ed38b656bff96a8f8a3038d456a265689ca32036670cb01469cc6e958cc4a46f1e80d700ae56659828a65c0456b8e55f28f255bc86ce48e44377bf1f9970b617d",
-	"ada572989e42f0e38c1f7c22b46bb52a84df8f7b3b773c9f17a5823e59a9725248d703efb4cb011abc9474e8e711666ed3cfa60db48480a8160615dfabad761bc0eb843d2e46299c59b61a15b4422fdf",
-	"b11f1ea52a7e4bd2a5cf1e234b7c9eb909fb45860080f0a6bdb5517a37b5b7cd90f3a9e2297f995e96c293189b807a7bf6e7633bebbc36674544db5f18dd33020aeaf50ee832efe4d3d053873fd31ce3b9",
-	"e54b006cd96c43d19787c1ab1e08ea0f8922bdb7142e748212e7912a1f2c0a4fad1b9f5209c30960b8b83ef4960e929b155a8a48c8fb7ce4326915950cede6b98a96b6f1ecb12715b713985dacd1c1180413",
-	"ee2c2f31a414ccd8f6a790f55e09155fd50aac2a878f9014f6c6035cae9186f90cdef0b7adf3e207c3d24ddfba8cd321b2e9228b02a1182b6973da6698071fce8cc0a23a7bf0d5aefd21ab1b8dc7818549bba3",
-	"6d6810793bad6c7efe8fd56cac04a0fb8717a44c09cbfaebce196a80ac318c79ca5c2db54fee8191ee2d305b690a92bd9e2c947a3c29342a93ac05796484638787a184e4525e82aeb9afa2f9480caebb91014c51",
-	"91e4694366cff84854872667fd168d2d42eca9070cdc92fca9936e8361e7266931f418450d098a42686241d08024dd72f0024d22ba644bd414245e78608942321ff61860ba1245f83c88592dc7995c49c0c53aa8a9",
-	"608aa620a5cf145f4477694407ccd8faa3182465b29ae98d96a42f7409434c21e4671bcae079f6871a09d8f2965e4926a9b08277d32f9dd6a474e3a9fb232f27fc4235df9c02abf67f7e540ca9ddc270ee91b23a5b57",
-	"c14f75e92f75f4356ab01c8792af13383e7fef2ffb3064de55e8da0a50511fea364ccd8140134872adccad197228319260a7b77b67a39677a0dcdcadfb750333ac8e032121e278bdcdbed5e452dae0416011186d9ebf29",
-	"03fcb9f6e1f058091b11351e775184ff2cd1f31ee846c6ea8efd49dd344f4af473f92eb44eba8a019776f77bb24e294aa9f962b39feecf7c59d46f1a606f89b1e81c2715ac9aa252e9ce941d091ffb99bb52404961794cf8",
-	"11e189b1d90fcfe8111c79c5351d826f5ec15a602af3b71d50bc7ed813f36c9a682520984ae911669d3c3036223a53176794c7e17929efab2b1c5b500f24f8c83d3db5d1029c5714c6fd34eb800a913985c218071677b9885c",
-	"69f8f5db3ab0321a708ab2f4234645dade6bfda495851dbe7257f2b72e3e8378b9fa8120bc836b737a675271e519b4712d2b56b359e0f2234ba7552dd4828b939e0542e729878ac1f81b6ce14cb573e76af3a6aa227f95b2350e",
-	"be734d78fae92cacb009cc400e023086bc3a3a10e8ca7cb4d553ea85314f51383660b8508e8477af60baf7e07c04cc9e094690ae12c73e5f089763201b4b48d664b94b4f5820bd1540f4a84100fdf8fce7f6466aa5d5c34fcbab45",
-	"d61b77032403f9b6ea5ad2b760eb0157545e37f1712ec44d7926ccf130e8fc0fe8e9b15570a6214c3899a074811486182b250dc97ebdd3b61403614d935cd0a61c0899f31b0e49b81c8a9a4fe8409822c470aacfde229d965dd62f51",
-	"c31bd548e36d5fae95ed8fa6e807642711c897f0fcc3b0d00bd317ed2bca73412064618c6a84a61c71bce3e963333b0266a5656571dcc4ba8a8c9d84af4bdb445c34a7aef445b15d77698e0b13c436c928cc7fa7acd5f68867e8132993",
-	"9903b8adab803d085b634bfae2e109dd247a7d6249f203403216d9f7410c36142df8fa56fb4d6f78136eef5817bad5ea3608439bb19336628c37d42db16ab2df8018b773baedafb77278a50926370b48bd81710203c7abc7b4043f9a1751",
-	"4dadaf0d6a96022c8ce40d48f460526d9956da33260e1770315ead420da75b122c762762aa3ddc1aef9070ff2298b2304cf90443318b17183b60778f3859b141053e5827decfff27ff106a48cfdb0371d0ef614fc7400e860b676df3176d1a",
-	"314dda800f2f494ca9c9678f178940d2284cb29c51cb01ca2019a9bede0cdc50f8ecf2a77e238b884867e78e691461a66100b38f374c4ccac80309641533a3217eca7e6b9a9af01c026201f0afaec5a61629a59eb530c3cb81934b0cb5b45eae",
-	"4658b7500951f75c84e4509d74047ca621009835c0152f03c9f96ca73beb29608c44390ba4473323e621284be872bdb72175628780113e470036265d11dfcb284ac04604e667f1e4c1d357a411d3100d4d9f84a14a6fabd1e3f4de0ac81af50179",
-	"491f877592837e7912f16b73ee1fb06f4633d854a5723e156978f48ec48fbd8b5e863c24d838ff95fa865155d07e5513df42c8bb7706f8e3806b705866475c0ac04bbe5aa4b91b7dc373e82153483b1b03304a1a791b058926c1becd069509cbf46e",
-	"231034720c719ab31f7c146a702a971f5943b70086b80a2a3eb928fa9380b7a1ad8773bfd0739142d2ad6e19819765ca54f92db5f16c1df5fa4b445c266215a92527bd4ef50ed277b9a21aee3fb7a8128c14ce084f53eac878a7a660b7c011eb1a33c5",
-	"3366860c77804fe0b4f368b02bb5b0d150821d957e3ba37842da9fc8d336e9d702c8446ecafbd19d79b868702f32405853bc17695873a7306e0ce4573cd9ac0b7fc7dd35534d7635198d152a1802f7d8d6a4bb07600fcdaacfaa1c3f40a09bc02e974c99",
-	"ccbbbe621f910a95835f5f8d74b21e13f8a4b03f72f91f37b5c7e995aa3cd5539508d5e234e77a4668a42c239b2d13ef0e55ecf85142055e3f8a7e46320e21324a6b88e6c823ac04b485125c2aa59b61476481208f92ea4dd330cb18777c1cf0df7cd07893",
-	"87faf0e49e7e5ab66ee3147921f8817867fe637d4ab694c33ee8009c759e7d707f44c69c1b9754e2b4f8f47b25f51cd01de7273f548f4952e8efc4d9044c6ea72d1d5857e0ffeb3f44b0c88cb67683401cfb2f1d17f0ca5696641bef28d7579f68d9d066d968",
-	"38c876a007ec727c92e2503990c4d9407cea2271026aee88cd7b16c4396f00cc4b760576adf2d683713a3f6063cc13ecd7e4f3b6148ad914ca89f34d1375aa4c8e2033f1315153189507bfd116b07fc4bc14f751bbbb0e752f621153ae8df4d68491a22430b309",
-	"87d636a33dbd9ad81ecd6f3569e418bf8a972f97c5644787b99c361195231a72455a121dd7b3254d6ff80101a0a1e2b1eb1ca4866bd23063fe007310c88c4a2ab3b49f14755cd0ee0e5ffa2fd0d2c0ea41d89e67a27a8f6c94b134ba8d361491b3c20bacac3d226b",
-	"b021af793badbb857f9a353e320450c44c1030fce3885e6b271bcc02e6af65fdc5be4dc483ff44bd5d539ed1e7eb7efe3001252e92a87df8227ace601047e101c871d29302b3cb6c6f4639078afc81c4c0f4c2e04688612ecf3f7be1d58ea92894a5dab49b949f2089",
-	"c5c1f2fbf2c8504a686b615278fc6221858d401b7fe790b75fb6bca6885cdd128e9142bf925471ee126f9e62d984de1c30c9c677eff5fdbd5eb0fa4ef3bff6a831056cea20fd61cf44d56ffc5bda0e8472ecdc67946d63c40db4ba882bc4dfa16d8ddac600570b9b6bf3",
-	"88f8cc0daeaeaea7ab0520a311dff91b1fd9a7a3ec778c333422c9f3eb0bc183acc80dfefb17a5ac5f95c490693c45666ec69234919b83244003191bad837aa2a237daeb427e07b9e7aa6ca94b1db03d54ee8f4fe8d0802cb14a6599005eb6326eefe5008d9098d40aa851",
-	"2eb6b1a58e7fe39ff915ac84c2f21a22432c4f0d260380a3f993310af048b11647f95d23adf8a746500833ee4e467fb52ea9f1039519fa58bcb0f1d0151558147b3c92b83730aba0e20eeeea2b75f3ff3ad79f2f8a46cbbadb114a52e32f018342aeeaf827e03ad6d583bbce",
-	"3ba7dcd16a98be1df6b904457709b906cbf8d39516ef107006c0bf363db79f91aaae033466624d30858e61c2c368599963e49f22446e4473aa0df06e9c734e183a941510d540536377072334910e9cef56bc66c12df310ecd4b9dc14207439c1da0ac08bdd9be9f2c840df207e",
-	"a34a7926324ea96867dac6f0dba51d753268e497b1c4f272918c7eb0e34120be65b7b5ba044d583141ec3ea16fcedae6197116b16562fb0706a89dc8efd3ba173ccd0fd7d84d480e0a3dda3b580c326aa1caca623879b0fb91e7d173998889da704eda6495023b5ad4c9ad406298",
-	"5ef97d80b90d5c716322d9ba645a0e1b7a403968258a7d43d310320f60f96235f50e9f22cac0ad239636521fa0607d2f471051b505b371d88778c46fe6787d47a91a5bec4e3900fe6ed22918226fc9fbb3f70ee733c369420612b76b5f55988d757c891d7005d17ee55783fe506202",
-	"140d2c08dae0553f6a49585fd5c217796279152b2e100ebde6812d6e5f6b862b2a3a484aed4d6226197e511be2d7f05f55a916e32534ddcb81bdcf499c3f44f526eb515cc3b6fa4c4039ad251253241f541558bba7413ca29318a414179048a054104e433c674ca2d4b3a4c181878727",
-	"29fdfc1e859b001ee104d107216b5299a792d26b2418e823e0381fa390380d654e4a0a0720ba5ff59b2ff22d8c4e013284f980911dcfec7f0dca2f89867f311ced1ac8a14d669ef1114504a5b7626f67b22ecd86469800f1575543b72ab1d4c5c10ee08f06159a4a3e1ae09937f12aa173",
-	"52dfb643832a598a10786a430fc484d6370a05356ee61c80a101dbbcfac75847fba78e27e537cc4eb918eb5ab40b968d0fb23506fee2ad37e12fb7534fb55a9e50902b69ceb78d51db449cbe2d1fc0a8c0022d8a82e2182b0a059035e5f6c4f4cc90278518e178becfbea814f317f9e7c051",
-	"d32f69c6a8ee00ca83b82eaf82e312fbb00d9b2f6202412a1ffc6890b4509bbbeda4c4a90e8f7bca37e7fd82bd23307e2342d27aa10039a83da55e84ce273822740510e4ec239d73c52b0cbc245ad523af961994f19db225212bf4cc160f68a84760233952a8e09f2c963be9bb1d71ca4bb265",
-	"d1e603a46aa49ee1a9ded63918f80feca5fc22fb45f659fd837ff79be5ad7faf0bbd9c4ba91628ee293b478a7e6a7bd433fa265c20e5941b9ea7edc906055ce9799cbb06d0b33ae7ed7f4b918cc082c3d4a1ac317a4acec175a73cc3eeb7cb97d96d24133a29c19375c57f3a4105519846dd14d4",
-	"b45ac88fac2e8d8f5a4a90930cd7523730733369af9e39bf1ffb833c01108952198301f4619f04b9c399fef04c214bad3358999967c474b67a7c06457a1d61f9466489ed5c0c64c6cdc83027386d6263491d18e81ae8d68ca4e396a71207adaaa60997d0dca867065e68852e6dba9669b62dc7672b",
-	"d5f2893edd67f8a4b5245a616039ffe459d50e3d103ad4675102028f2c497ea69bf52fa62cd9e84f30ae2ea40449302932bbb0a5e426a054f166fdbe92c744314cc0a0aa58bbc3a8739f7e099961219ec208a8d01c1ae8a2a2b06534bf822aaa00ca96218e430f0389c69c7f3fd195e128c38d484ff6",
-	"37279a76e79f33f8b52f29358841db9ec2e03cc86d09a335f5a35c0a31a1db3e9c4eb7b1d1b978332f47f8c3e5409d4e443e1d15342a316f442e3bfa151f6a0d216df2443d80cbcf12c101c51f2946d81161583218584640f4f9c10de3bb3f4772bd3a0f4a365f444777456b913592719818afb26472b6",
-	"a46d252a0addf504ad2541e7d992cbed58a22ea5679980fb0df072d37540a77dd0a1448bdb7f172da7da19d6e4180a29356ecb2a8b5199b59a24e7028bb4521f3281313d2c00da9e1d284972ab6527066e9d508d68094c6aa03537226ef19c28d47f91dddebfcc796ec4221642ddf9de5b80b3b90c22d9e7",
-	"060c18d8b57b5e6572dee194c69e265c2743a48d4185a802eaa8d4dbd4c66c9ff725c93667f1fb816418f18c5f9be55e38b7718a9250bc06284bd834c7bd6dfcd11a97c14779ac539629bcd6e15b5fca3466d14fe60d8671af0fb8b080218703bc1c21563b8f640fde0304a3f4aeb9ec0482f880b5be0daa74",
-	"8f2f42bc01acca20d36054ec81272da60580a9a5414697e0bdb4e44a4ab18b8e690c8056d32f6eaaf9ee08f3448f1f23b9844cf33fb4a93cba5e8157b00b2179d18b6aa7215ae4e9dc9ad52484ad4bfb3688fc80565ddb246dd6db8f0937e01b0d2f2e2a64ad87e03c2a4ad74af5ab97976379445b96404f1d71",
-	"ccb9e524051cca0578aa1cb437116a01c400338f371f9e57525214ad5143b9c3416897eae8e584ce79347297071f67041f921cbc381c2be0b310b8004d039c7cc08cb8ff30ef83c3db413f3fb9c799e31cd930f64da1592ec980cc19830b2a448594cb12a61fc7a229e9c59fe1d66179772865894afd068f0942e5",
-	"3eb5dc42172022ab7d0bc465a3c725b2d82ee8d9844b396913ceb8a885323dbbbf9ef4ed549724cc96d451ea1d1d44a8175a75f2a7d44bb8bfc2c2dffed00db0328cfde52bf9171f4025770abbe59b3aefd8151c480bafa09f613955fd571e5d8c0d4936c670d182cf119c068d420ded12af694d63cd5aef2f4f6f71",
-	"20ea77e58e41337ad63f149ed962a8210b6efa3747fe9bea317c4b48f9641f7145b7906ed020a7ae7d2ee59435392edc32aee7eff978a661375af723fbd440dd84e4a152f2e6ef66f4ab1046b22c77ac52717de721dfe39aa8ba8cd5da27baca00cc1fffe12c52382f0ee83ad1418f4c6a122effaf7471e1e125d7e7ba",
-	"95c662b835171fa23f948c3c3ed27bab9b3c367bbfe267fe65f8037a35b50cd7fc6030bfce4000425ef646c34793f0762635ae70487a0216ef7428da622be895d1b6040423246511c2370d6876a5c5d2df8bbd48fb14f787b632ad2c1f5a927fdf36bc493c1c8606accfa52de33258669f7d2d73c9c81119591c8ea2b0ef",
-	"f708a230675d83299cc43167a771602d52fa37cbc068ef9128ef60d186e5d98efb8c98798da619d2011bf4673214f4a4c82e4b11156f6292f6e676d5b84dc1b81e7cc811b0d37310ac58da1bfcb339f6ba689d80dd876b82d131e03f450c6c9f15c3a3b3d4db43c273c94ed1d1bd6d369c4d30256ff80ea626bda56a6b94ea",
-	"f8417766ce86b275f2b7fec49da832ab9bf9cb6fdfe1b916979ae5b69176d7e0293f8d34cb55cf2b4264a8d671370cb595c419c1a3ce5b8afa642208481333522005fbe48cdc700e47b29254b79f685e1e91e7e34121784f53bd6a7d9fb6369571bba992c54316a54e309bbc2d488e9f4233d51d72a0dd8845772377f2c0feb9",
-	"3479e04efa2318afc441931a7d0134abc2f04227239fa5a6ae40f25189da1f1f313732026631969d3761aea0c478528b129808955be429136eeff003779dd0b8757e3b802bdff0f5f957e19278eabad72764aa74d469231e935f4c80040462ab56094e4a69a82346b3aeb075e73a8e30318e46fdaec0a42f17ccf5b592fb800613",
-	"03df0e061fa2ae63b42f94a1ba387661760deaab3ec8ffabcaff20eeed8d0717d8d09a0eafd9bde04e97b9501ac0c6f4255331f787d16054873f0673a3b42ce23b75a3b38c1ebcc04306d086c57a79d6095d8ce78e082a66c9efca7c2650c1046c6e0bbce0b2cba27c3824333e50e046e2a7703d3328ab3b82c9d6a51bc99b9516ff",
-	"76b488b801932932beefffdd8c19cf5b4632306e69e37e6a837e9a20c8e073bcadd5640549faa4972ebd7ee55cb2425b74cb041a52dd401b1a531beb6dfb23c4cfe74bc84f034156c8f55050ca93236eb73c4e2595d9fbf93dc49e1ec9a31705359732dda73f737ec4274e5c82626dc4ec929e5e2c7a2f5f5fb666181922bd8be575e3",
-	"ff17f6ef13abc0426b03d309dc6e8eeb822300f7b87eff4f9c44140a424098fd2aef860e5646066d22f5e8ed1e82a459c9b9ad7b9d5978c29718e17bff4eeefd1a80ba48108b551e62cd8be919e29edea8fbd5a96dfc97d01058d226105cfcdec0fba5d70769039c77be10bd182bd67f431e4b48b3345f534f08a4beb49628515d3e0b67",
-	"95b9d7b5b88431445ec80df511d4d106db2da75a2ba201484f90699157e5954d31a19f34d8f11524c1dabd88b9c3adcdba0520b2bdc8485def670409d1cd3707ff5f3e9dffe1bca56a23f254bf24770e2e636755f215814c8e897a062fd84c9f3f3fd62d16c6672a2578db26f65851b2c9f50e0f42685733a12dd9828cee198eb7c835b066",
-	"010e2192db21f3d49f96ba542b9977588025d823fc941c1c02d982eae87fb58c200b70b88d41bbe8ab0b0e8d6e0f14f7da03fde25e10148887d698289d2f686fa1408501422e1250af6b63e8bb30aac23dcdec4bba9c517361dff6dff5e6c6d9adcf42e1606e451b0004de10d90f0aed30dd853a7143e9e3f9256a1e638793713013ebee79d5",
-	"02aaf6b569e8e5b703ff5f28ccb6b89bf879b7311ea7f1a25edd372db62de8e000219afc1ad67e7909cc2f7c714c6fc63ba341062cebf24780980899950afc35cef38086ee88991e3002ae17c07fd8a16a49a8a90fc5540be0956dff95390c3d37629949de99920d93096eb35cf0427f75a6561cf68326e129dbeffb8772bfdce245d320f922ae",
-	"70752b3f18713e2f533246a2a46e38a83cc36dfccec07c1030b5204cba4432700735a8cee538b078d281a2d0262110381c5815a112bb84404f55af91652bd17502dd75e4910e062943d8a736ae3eecdfdd8e3f83e0a5e2ddeeff0ccbdadaddc95391310fc657a59724f7e6560c37dc1d5bb5db40170190f04a274c864ade9687c0f6a2a48283177a",
-	"01f3c1333b44077c518cc594d0fb90c37651fb7b2442e71fc0a5611097f1cf7bcfaf11c8e0ac1b1cab54afba15bb9332df6bc64d8032368e3f686c8324b0114e0979dad78a5ccd3fff88bbe89eef89c4be586ca092addef552ed33224e85d8c2f4fba85ac7735f34b6aa5ae5299154f861a9fb83046b0e8fca4db32c1343e02676f283975f43c086cf",
-	"509283ebc99ff8d87902fa00e2d2a6fa239e335fb840dbd0fdbab6ed2d95e8275402523f7ce9a2fabd4b6c9b533288fbe914bde84365a204711d0977a7d698f4614385984dd4c137e4820035dd6737da364edff1bb62283e87a8c7ae8637314fe9b5777ec4ec21276dafedb2ad5ee1aa0ac99e34a6c01c055c8a239fd28681607f65143082cd4553c529",
-	"c17e417e876db4e123c631f7136b8a85bfd6ce66a69180d0cd5ecfd6f037bb1c7bd7908d51f2c485bf9e92c0e1799ee5f6ab834ee481f5eb1a8020205adb4d0f90126d4e7c2c859c5a5f644bdfa9c649ff4f168e834de6f9769429732099d46d0af506ab86c6fd92175159bbc05c75db8e1fa867e6030d64250008d64c857c47caec3dc8b2ffb384d0193e",
-	"950988fbe9d62a66f5f2c492bc8dc944a78eb3796ec37ba94b6a81a9d402ccad03cd8497fff74c5f4a03081c5fecec48574fecb21c1de261332c23108195d3f6a96ff8e433a1a30eda53dd5bb414973334f8cde5510ff759f7c17046cbb5acd8e8c4a6eecf2a9121ec3fc4b22c4daa72678194ce809024cd45c4ebb9ccdb6f854205cdb624f0787480d8034d",
-	"552a212c403b473741da8e9c7b916d5e5e9bcc9949021ae1ca1ed46b7d4a98addbb604d9fff56175b7e0367db26c9635fa7813653dc8d610befdd09ec41e99b192a716106f4299eec8b940863e5a59cf26cdc2cd0c3017f9b4f215812bed15f69e77edf672178e13c55580982f01fcc2fa131ec3d736a55d56504c545f4be50fee83f1263e4d3f3c877cc6242c",
-	"b00c4283dd3d9cd26e44bd97cede6c771cb14f2571b51cfdaae4309560ffd165da025a1bbd31096c3aa8286e2d6dcc3e681b8d01f2c5064ea26dfd0b5156b7a7f5d1e046c5bd1628f8fdae24b03bdf7cf7366900cc013a8cbed9d7f5937c914b08f8c27683b956e1279812d04288515333fc6aba3684dde2292951f0610649d90fe61606630fc6a4cd383649252c",
-	"f6e79457bb6d0884dd223be2cf5ae412a1ed425f1e4012f75951b096aea3b9f3581f9013bcae1aff2d3fc1e5c7e06f24af6d53c2c5c238b71c71cc670b05a7ee5204400026a5c4e5ddec3ad96771e49fae4b0f75ec58049ad9d972e5749a32d90f847f1ed2a1bab83db181e541cf5c8adb6b29ecc64dc25add491d408d3eb3ddcb013de7f5ffb6de9dd7ff300a5fc6",
-	"fe1d71e1d5efa3f712d23216ee8ee9139e66bd648b83efc02cdb4d45a28cf36759ff190a84d14d9471477abefb5aea4111110336143dd80cf81e02f268120cc07d746538f968e9876bff8358d390f5b8e7eafa61ecd236cedaf276bd61865fdd3424988201dcdeda2e3e0c33c9e3b3670125dd1049106cc6df5695fb2dca443233ff440f265bbff055483bac1e859b83",
-	"4c80163562872a965dedd8725652906156ada6e9d999027d96f49289edb92f9ef043e9d7c3377e091b27f85275499454af32317535997fb4aaeaf93565ad481ff7d45d2abddd4df4b60f71a6923ec30496c6ae534dc5427107ab4c5e656a322c7ab058d4c13ec0ebafa76576560697ac98f84aa4a554f98ec87134c0d7dca9184cf70412a324aac91823c0aca02537d197",
-	"fdd58c5ffe88665beb7073c8f4c22472f4bc9390cdd27a42622ca55978b000ab7579f795d4de0dfcaf521b8268980ef1d20277b07567985c0fd5030784ad6c32541ac24e99ab706105a2255fc32935c0fce6fdad9bb224d94ae4eae2a3ff08836618a3adf193630647bce1952b69da4de360f59da303519278bfd39b733cf66820a5e9e971b702f45998b69a0889f4bec8ec",
-	"ff38b15aba3794e2c81d88003e045ac6cbfc9f4833cdf896cefd8ac0c88674727ad9a9fcb9ef36574deea480e6f6e8691c8390ad73b8ea0eb3665c914b0d886546948e67d7987eea248b5feb52346ffdd965d5c835144c3bc63daf325e74b11267e32e58a914ae4521a668839d9445fececa49c5fba41f9e171698bbc7c6c97fa163a377a96456958d6e1d74f91ada56a30df8",
-	"f048c19328d60b4e59ed76940415b2c84c23883198bba5699efb0a1774ad5da6d15390c7b55d77d66f37448fe08107f42a5336408d5322f4b630e3275865fc66dccab39f6e13fabc133e5a441fe352d81c7cd9a25f145a6e2e2417d3b0bbc79eafcd7ad688c02011fd268dd44ac3f4f87b37a84a46fd9e9975962fba92c9a3486deb0c45f6a2e044df4bb79f0feeea432c5008b0",
-	"1b3e5fe6f113cce28a6f8d6f7809d3cec398cabffe9ff2ff10a7fec29a4ee4b54186063fd5307a2be393c9ecd75a37620bdb94c9c18da69b658579676ec90351d10dc33a7cb3b75798b1234f9f684d4a73a0fab2df3d5d6fdb1c1b1514d0935c1f2dd21486f91c2595b2f8f8a500ff443b9305270fb6f3da7961d9316d4ed6a135a31c4a3611d40e6585bbb34f498cd5b9a5d92676",
-	"740db337baa12b16897f17a85fa5685acc85e48338867f8ac9c0198dd650f5dfa7c17725c1262c72207e365c8aa45ffaab6470a0e5afefbfc3bb702a9766064f28cc8b796878dfdd3ca9d0216c14941438fc541fb5be0a13d29a996c5c985db4f630df067a5626db5dcd8df3a2bff17dc446e46e4079b8815da4318cb228c7722684e2a795a0ca56f500ea51951a6a385385d886f678",
-	"1465f2d578d167faa017fe8f763ce3cc8dc1e8371d774ed2a8803f12585296ee71a1f2253dd16b717a81f91f0f3641018a0111182b4e65d884b0a3d0292631ad807cdccc88bdeecb476e76f72b5246a630aff6e2401fa9570f85acb73ccb4e19ef04a932a03d7b7985dbe1e5bb410df517fe362321469e6f8b0e0cef6c31d7aa8ec06aa220620d66cc0e133fdee963589b12320fc9678e",
-	"80c051952fa6f3ef6af0f1759ec3e83c8eb91abee1de360bfa09e74b05af2475a0dbf8f9135aa25892919bbe0515898cfb6f88abc9e1891f2b2180bb97370f578973d55c13c35edb22ed80647c2a7e2884d1ccb2dc2f92d7b6ec5843ade13a608a31190ce965bde97161c4d4af1d91ca9962053f9aa51865bdf04fc23fa35a6fc3c8e888941263a26ed66c2dd0b29b2325dfbd1227c5091c",
-	"9c1e2a1aed6406052eed12b4495365f2f80e9c9645473f3549b607f20910bcd16dc3a4b173ac8d128129cdb7c76ebbc8e9a2a1ba0d822c66b367e790a69ac71f0a60ed4bff0e979148e3f3ee6607c76dbc572ee5ff17c27e4b52adebb4bedddff517f591a1977299c7cb01106f1453b098d29848ba3751c816215bb0d090c50f9e445b41b2c49d4eec83b92ce6c269ce835fd279e7cbbb5e47",
-	"466abda8944d0329d2975c0f2e2afc901f117887af301881f63b714f49a2f692fa63a8871fc0b301fe8573dc9b2689880cd8969e5072c57671e0633b041481dab25e65c9de404af033a11a8070c8ab70ca6d465318501afdd9940c7efbe1bb6d49581c222fad251dba4ee0a98efe22a3c4f74da05844523b30bbad6b080ac8df70a02da80bc9d477dfb869adb211e209a316d5dd1fd89a6b8f8e",
-	"0e89a873e07799ba9372fc95d483193bd91a1ee6cc186374b51c8e4d1f40dd3d30e08f7feecfffbea5395d480ee588a294b96304b04f1ee7bbf6200cc8876395d1db3ac813e1019bb68d27204e514fe4a61ad2cbd1782dca0e38b5538c5390bca626c5895b745cfca5dac636fd4f37fed9014ab46ae1156c7789bbcbb956ff7ee5ce9effa560731d26783dc6ae8bddd53a5d28133614d0ddeddd9c",
-	"fdde2b80bc7a577ef0a6c03e59512bd5b62c265d860b75416ef0ce374d544cbb4e3a5dbd31e3b43e82975090c28bc77d1bdec907aeceb5d1c8b71375b6d631b84a46153f5f1d195bfcb2af6f597a9cdc83782c5bbbb58c5188a87ebf375eee5212fa52523820a83106e8ecd52bedd60d95cd646159774389c07e1adcaa6b6f649408f33399ec6e507d61659696b3dd249996892d5986b654d94ff337",
-	"f5d7d66929afcdff04de30e83f248e69e89604daea782e1d82d8032e91a95c1d6fb2f5578f79b51be4397e4cd7cbc608ce143fdddbc6fb6c43ffdd394a7df0124353b919aeeac025f3eb11ff246c3b9657c1a947fc534ce48e18feffada8797037c6bc7e2d9a9e2e019fe65627b3feb28e446473e3bd413047a2587f0be6a103403cb3c33fdc212dca14d8e386aa511c22308e632f5f9528dbabaf2deb",
-	"332990a8dba55f977bc814436cf386ebbf10cb487a5f6ce83e13741bac670c6810284fbbe4e303547ef411e964fae82854e8c13cf56979b89ecfedd337aad78260060122d13dfbbf8497acb2066ed89e30a1d5c11008bd4d145b5ec353956310536304d8b8bba0793baec6d8f3ff49718a56e6694f8122078265cf5731d9ba61292c1219a1affb3679576d4998290aba3684a205c3469d40761a5c4e96b2",
-	"efbdff285027610f03182009c89b953f19721cfcdb8accd74bab6ec4bdf3f555ab902cb0dd91284269d140638aaabd211748aa4da3b18cddc653b57e461b9ad8491807c535c08fe97d89eb587c6af19ca152e72479626ab764e8b62da89fefc8354c75a44851f985746d78715a5a92798dac1a4222be27897b3f0aa63d596aa7378545f49b259aa8518c3def8a2ec8f7aa956c43668c8717052035a7c36b47",
-	"0eea9bb83bdc324fd21b03669aa922fbebc448e7d25e210294c07862cfa6e061731dfb67b4810633f4dbe2130d90fa1c65843af436e74219d213c4458dcac1c48ec4541fc6e3b7918ab2bc621aedda53658050900c3865ca57cd5dfa1d28576827401956d2dd8b861fa90ab11bb0b544ded9bd3d62e3278ed484e17db8f2d5dc5ea4d19a0e15134ba6986714c2b22c59c2f0e517b74eb92ce40d2f5b89e6d79f",
-	"25da9f90d2d3f81b420ea5b03be69df8ccf05f91cc46d9ace62c7f56ead9de4af576fbeee747b906aad69e59104523fe03e1a0a4d5d902352df18d18dc8225855c46fefeec9bd09c508c916995ed4161ee633f6e6291cb16e8cac7edcce213417d34a2c1edea84a0e613278b1e853e25fb4d66ff4c7ee4584e7f9b681c319c874d43502534e8c16a57b1ae7cc0723783807738a55b661e617ee285bdb8b845607f",
-	"a76b6f81372df09322098868d469fb3fb9beafc5edb32c674974ca7032966aaca5b5c9bffef87bfe626bd8e33d1c5f054f7d5acd3b91ff95324d1ae39eb905b9f2694fe5cb03486cee86d2f661a751b0e6c716a61d1d405494c2d4e32bf803803dc02dba2c06eecf6f97fb1f6c5fd10cfc4215c06d627c46b6a16da0854e4c7c873d50aa1bd396b35961b5fa31ac962575230c07c369f8fbc1ff2256b47383a3df2a",
-	"f9db613812f2259972d91b1598ffb166031b339913925ee385f03b3b35dc4b2f1ae78a3c3d99c6ff6a07be129ce1f4b8d994d24988d7fbd31f20535d36ab6bd0592cfb4f8c1ed9244c7fa8a3c46e91272a1a40c6cfcf261c5658476c59793bf1a3775086e41a0492f88a31e2d9d1ce75cf1c6b4b928b3545d838d1de6b61b735d921bcf72e4e0615e9ff969ef76b4b947026cb016e2660ba39b0c4c953369a52c210de",
-	"e601c7e75f80b10a2d15b06c521618ddc1836fe9b024458385c53cbfcedd79f3b4239598cd7b9f72c42dec0b29dda9d4fa842173558ed16c2c0969f7117157317b57266990855b9acbf510e76310ebe4b96c0de47d7f6b00bb88d06fad2c2f01610b9a686079f3ed84613ba477922502bc2305681cd8dd465e70e357534503b7cbc68070ad16d9c51de96ccf0aae1599299331c5655b801fd1dd48dddf6902d0e9579f0c",
-	"ee5ff4ca16d1bde59ffaf2d064eac9141c1d8f120ea2bda942b7956ba3effc5f1e725a3b40b0b9223a14d7a50df1681d14ca0e0eda7bb09c428fa3b2701f83a7a3e139485a118f6287d266dbc7fe68c87b35becabc7782537c79cb8165bdc40cc103d7b6d4b627fafa0e4113f92341ab90ceab594bfae20dadbfafd401684584598941f1ffb8e23dc8a04ecd15376cda6d849fe0dfd177538c62413622d172d9d46e05c450",
-	"1daca80db6ed9cb162ae24aae07c02f4126f07cd09ecee8e798fa1bc25c26c644333b63731b4ebc3f287f2318a820c32a3a55fc976576bc936f7384e2553d2891e3771ff24dd4c7f0256906460a8f12d30ed2b23583a0259cb00a9065a757d654d6e4603e7c7eb4a8426b527ae8a849d9350e9094b890367df3e8b23ad2df4d7dcce416bd8ea3badd037f53f7b07c02e5926515f196d62aeb9b8b14c863f067fc12c5dfc90db",
-	"27ff4e58a34ff1fcd66855d014ea17889a3cf0021a9fea3fabfd5b270ae770f40b5439e00c0d26bd9766f6fb0b4f23c5fcc195edf6d04bf708e5b0bced4f5c256e5ae47cc5651e51cd9fe9dc5d101439b9bc5cc24f76a8e8847c72686e2af1ce7098ad7bc104dad00c096a6d48b6453322e9cd6773fb91fb1eabd05dc5185a9aea07a2f64c6fea9897681b4428aaffe1fe5fd3e8ceb890b12169ec9d51eaabf0ca3d5ba415770d",
-	"75e2fb56327983b04f640717be8cba6fef3655b4d8e5539587d6478356ec397efaed818b8425d052778eb30ef0dee656c52c2aeab079ed496ae4441a365f2130432c87ba757e25b4511656ad15e2eff84d342331fd2814d1f1d11af65d98a424c115ba183437c0d0aa55f5c44b8685028a47d89d0d36a0f20aed510c366ab338f074a941b404fb349caaec821e0850a627777cc8f5abce6b509290027a2a28ff1db62a5ed2f95fc6",
-	"c6ae8b6a060917cd498aa7874ad44baff73efc89a023d9f3e9d12c03d0b7f5bcb5e24e1bc2ab2f2c67b9a9d36ff8beb51b5affd4a3510361001c80642955b22ea4bf28b81a5affe5ecdbabd8d17960a6af3825a4522fe76b3d720b5d06e66bff5379d7a8de1f5cc3e7bb75163a854d77d9b3949bf904b6c4e568682f0dab7f217f80da7303cfdc9a53c17b6b51d8ddff0ce49541e0c7d7b2eed82a9d6be4aec73274c30895f5f0f5fa",
-	"606c9a15a89cd66a00f26122e33ab0a08c4f73f073d843e0f6a4c1618271cfd64e52a055327deaaea8841bdd5b778ebbbd46fbc5f43362326208fdb0d0f93153c57072e2e84cecfe3b45accae7cf9dd1b3eaf9d8250d8174b3dade2256ecc8c3acc77f79d1bf9795a53c46c0f04196d8b492608a9f2a0f0b80294e2abe012dc01e60af94323c467f44c536bf375cddbb068c78432843703dd00544f4fff3eaa1a5a1467afaae7815f80d",
-	"88b383cb266937c4259fc65b9005a8c190ee6cc4b7d3575900e6f3f091d0a2cefa26e601259ffb3fd03083270eb63db1ffb8b4515ec454d12f0944f8f9f6869eedc2c5f1689766a748d74e79ad83ff6a1639aefdec6109342dead31e9cead50bcc00c5b2206e8aaa47fdd01397b141880490174141a1e6e19268378c1b54a84aba60ca711fd72f7df88e120dfea2caa140085a0cf73342f3c588b7edfb5b5e5ccabd68a32364746d92d536",
-	"dc0b293f1ba02a326743509f41efdfeeac1efc45137ac03e397a3273a1f586a0190cfb4ea96d6c13ca692a4de6de905c8338c3e29a04cbae76272f568b9d795cea5d758106b9d9cff6f80ef650d6b7c428ea3946c3acc594907fe4227ed68faf31f2f6775f1be5139dc0b4d73ed6308fa226b9077561c9e4c7a4df68cc6b819b0f463a11b9a09682ba99752c4db7aea9beac1d9279f2c2675d42b551d27aa2c1c34125e32f2f6f45c35bca45",
-	"5d801a7413311e1d1b19b3c321542b22e2a4ccbe340545d272abede9223741d9835a0fc80cc9da97a13f8bb4110eb4ad71093efba165b1edad0da01da89d86726e0d8e42ae003b4b50297d233c87da08406f0e7fc58ba6da5ee5ba3d2d7142cbe6632734eb2e7b7863c15cc82198ee8f9a0ae0b7f93bdbda1ed269b3824d5d3c8e78513815b17a4c0cc8c9706b9c77423a309ae3fd98e1e05cdbe9e2577834fd71f964301b10b66c316a2d8f2c",
-	"2fd32a2bc15a9e96a100624404fd0a4e54ba9f8c0543d8ccf7c5c2e35f5e8c3c11dfd497320aa903900a4ca55a2b323b3ac4a7cfcd01bf0b448db8829072bee6b77c3d7bec2e1d8b414d907288d4a804d2379546ef2e2dc628269589164b13fceb32dba6fd5d48a956ce0b5c3eb28d894a95af58bf52f0d6d6cbe51317152744b4ccfc918ed17fa6856478d580b389016b772e1d02e57d2217a204e25361d91d4845a3fa20fefe2c5004f1f89ff7",
-	"f537b437662759bef8bd64368536b9c64fffbddc5e2cbdad465c3966b7f2c4bc5b96767ef40a1c144a4f1cd49edc4cc5b57e7eb30d9b90108f6fd3c0dc8a8808b9e0bd13aa3d661c4863637c5e4ba286553694a60bef18801299ae349df53a355051dcc46a7d003c4aa613808f430e9db8ca7dfe0b3f0a4c5ab6eb306aeb53e11a01f910064fbe6ca78b2a94fac34a2602f73de3f275953e13ff5c6bb5c39b82321ead17ec0f8ecc479e6afbc926e1",
-	"1dd9fb7d5b5d5074971e69300720014deba6fbdb942bd29704cdfcd40fa5281d2a1b9f5b776183e03ff99c29587f10e8d325cb49c5c93e94f5132741b92c4086eec1374dea5c1e772cbb230c7b31f3e962eb572be810076bdb926b63732522cdf815c3ab99bbc164a1036aab103cac7b823dd21a911aec9bc794028f07b7f839bae0e68211286441f1c8d3a35b281fd321312577bbda04f643ecb2a74ec4527bb5148dbccbeba749f5ea19b6072366ba",
-	"5bd63737449de2d20ca63943953338ecf4cdd6cd0a726241adb04376385a809cc6ba0f3482a310746fbc2cd5eb214f03a14cdc548777fb0d048d659cd75a962e490c4fe47affc2430a34b10275e4c76752a115aae3a24d4fb4fad89ce4d79d65de10292f3490bfdaeabfae08ed51bda6ec8230e66cb07ddbeec26e3ef68dd71c852900659fcf0c963f4574ffe4626a33db9abf0873dde68b21138498b81e8cc44d354be4073615889a7ddff633b5447d38",
-	"a683ec8250506571f9c640fb1837e1ebb06f123e745f95e521e4ea7a0b2b08a514bbe5bdfd316903d1d6a05f5a143d94dab61d8a3a146ab40b2d6b72df2f0e945875a8aa7051ed115975f6f1567cfcbf04c5e11e3a7027b8e179ba00739181ba10b028e3df7259d0712f4a6cef96469ff737865b85fee2c2db02a6423e32505381e18a1e0b4ce3c7998b8d6b1b5e09c3a280b85486d0984c9e193b0ad2043c2bc4ad04f5b00a73956715937eebf6b3e27afc",
-	"4df9d160b8e81c42930c48956fcb46b20b6656ee30e5a51dd6317876dc33e0160d31280fc185e58479f994991d575a917073b4439919c9ac49b6a7c3f985211d084c82c9d5c5b9a2d29c5699a22e79de3958d7b0e856b9aa97493cd4563aaa04fa3977a9bb89e0bc06a82296bdc76d20c8d393770176d648712454305fdfcf4e117d05acb5a5b006a9f8d0dc66dca708c4e4103ca825d2331750685c44ce3d9b3e753455580f4d6ac4533edeeb02cebec7cc84",
-	"67bb59c3ef5ee8bc79b89a673e331e581215076cc36b68f517ca0a74f74efafe9dcc240e6d8ca4b21019c27d6c9289f4419b4f218eeb39eb741c5ebebfe0ed2f6faeec5e8c477acf71907990e8e288f4d4049111779b0635c7bbec16b76493f1c22f645745fdac2b383679fee573e4f47af45ee08d84f63a5ace4ee1c06fa41e2e6e14b7bc392e38426813087a3a461efc62ed1941dc8f1728a2bdc04fde72a0b786558783c84abd4bd100e4926979a0a5e707b1",
-	"d341147169d2937ff2373bd0a9aefa77968ec8f0d993c6f9881eb174a1911e05cdc45993cb86d149a754bbe321ae38363f9518c50dd3faf087ffeeeb6a058b226ccab7858c00ba6de0e8f4d034b1d27508da5cc473f3a413189ee6fd912d7750486912944d4dc34405ce5ccc3885fb0aabcb922bcfa9081d0ab84c288022bd501235a835eb2e1124ed1d48fd4f8682da8e7919321031326502273375625c4e3a7282b9f53452195e53c6b4b57cd5c66f621bed1814",
-	"27e7872a54dfff359ea7f0fca256983f7600236e716e111be15a1fe72eb66923ea60038ca2953b0286447dfe4fe853ca13c4d1ddc7a578f1fc5fc8598b05809ad0c64a4363c0228f8d15e28280837a16a5c4dadab681e28968ae17934639fbc124bc59212138e494eecad48f6546c38366f1b7b2a0f56f579f41fb3aef75dc5a0958b25deaa50cb7fd1c69816aa9a51874a98e57911a33daf773c6e6166cecfeec7a0cf54df01ab4b931984f54424e92e08cd92d5e43",
-	"13dcc9c2783b3fbf6711d02505b924e72ec6736131159017b966dda90986b97522bf52fd15fc0560ecb91e2175322334aaaa0097e1f3777c0be6d5d3de18ed6fa3444133486068a777443a8d0fa212ca46994944555c87ad1fb3a367db711c7ebd8f7a7a6dbb3a0207de85851d1b0ad2f4149bdd5a5ba0e1a81ff742df95edee850c0de20e90dd01753137cb8f2c64e5e4638ceb893a3879ae2c049aa5bce44d56bf3f325b6c5029b2b8e1b2da8de7d4e48ca7d8f6fbdc",
-	"9ca875115b109eab538d4ec7023600ad953cacdb49b5abe263e68b48eafac89a15e803e838d048d9625972f271cc8f36344bed7bab69abf0bf05979a4cfff273b82f9961626509765fcb4b4e7fa48212bcb3ab2b1f2dd5e2af768cba6300a813514dd13e4d269e3d36548af0cacdb18bb2439ec9459f6d847d39f5598304ec46a26d75de1f9f0c2a88db915bd26e45e1f1e68c5b5b50d1890e97a3803c36755f026863d14176b8b57f42e91d3ff37787f9b38e333e9f0433",
-	"ec006ac11e6d62b6d9b32ebe2e18c002353a9ffd5dfbc5161ab887770ddd9b8c0e19e5321e5bc105add22e473050b71f0399327c7eba1ef809f8667c1f4e2c7172e10e753705e9a083f5bce88d77521225ecd9e89f1e1caed367fb0275dc28f620fbd67e6b176c9ae5d2659e6ec662116c9f2bbca3a93043233a4861e0688db6dc1800f752c5d58aa5033c250c891d9126e534ed921a9026eb333333fa8292059b8b446f336ca6a0cb4c7946b6aea3831653122f154a4ea1d7",
-	"23deadc94481ce28188f3a0ca3e85431964cb31b60fabf381e6bd45ef0332bd4dde774b0281d317dc2e7d0c298fcf8625fa734126968df8b68ef8a35c325d84ba4fc53936ff3ffdd8838d2a8cabf8a9cac54aa444ed9875944e55994a22f7fa8538b1e983b57d9215fac5c0052029644044e790ce2f5044655608c1d7ad3bb862203ba3aba3b526606f273d342ed5721648e3f600942d3f7546f679161436389d879dd8094e1bd1b1e12cde15cd3cda4c30a40835665e4e5cf94",
-	"94701e06340114f9cf715a1fb659988d33db59e87bc4844b1500448960af757b5282f6d52967a6ae11aa4ecfc6818c962b084c811a57724f5d401191567f24ce917e4f8c3963474fdc9d2c8613c16f62446448b6da6eeae54d672825ed7606a90e4611d0e318ff00566862c955b636b5e81fec3362e8672ad2a6d222a515cf410482836deba092a51a4d464dfbbab35c50a33437ac16a88256e9e23ddd3c827cc58d3e5000ee90b12e4c5175c5733662d4848ae0d406c2f0a4f498",
-	"735b0758d5a331b2304f01081172eb95ae4115de651b1a6693c5b9543de33df25d9f421dbaeca033fc8bff57313b482778005aa9fdcbca65c643da2f3320e34197868eec3848ff3c70d7ac7d910fc332e9a359f892ae01641be253013b554a0d3f249b3586b1857e5a0f9482ebd91432a852b221f4287a6e81ed24e8064645d5b28ab9a13b26cc1420ce73dbc47b31acf8a871601022ce23bc443b1222ce9a037a2fe5226295feb4efd4fd671338f459ae146032697cf82fc55c8fbf",
-	"c48d94f14549352790079fee69e3e72ebaa380510e3581a0824066413e7044a36ad08affbf9b52b21963d2f8e092ff0ac1c973c423ade3ece5d3bca852b894675e8173290529226939c24109f50b8b0d5c9f762ff10388833d99bea99c5ef3ebb2a9d19d2231e67ca6c9056d8834730605897426cd069cbeb6a46b9f5332be73ab45c03fcc35c2d91f22bf3861b2b2549f9ec8798aeff83ceaf707325c77e7389b388de8dab7c7c63a4110ec156c5145e42203c4a8e3d071a7cb83b4cd",
-	"553e9e0de274167ecdd7b5fc85f9c0e665be7c22c93ddc6ec840ce171cf5d1d1a476743eb7ea0c9492eac5a4c9837c62a91dd1a6ea9e6fff1f1470b22cc62359474a6ba0b0334b2739528454470f4e14b9c4eeb6fd2cdd7e7c6f97668eebd1000bef4388015630a8332de7b17c2004060ecb11e58029b3f9575040a5dd4e294e7c78e4fc99e4390c56534a4e933d9a45460f62ffaaba25da293f7765cd7a4ce78c28a85013b893a0099c1c128b01ee66a76f051dc1409bf4176e5afec90e",
-	"dea8f97c66a3e375d0a3412105ed4f0784f3973ec8c57b4f553d3da40fd4cfd39761de563ec96a9178804641f7ebbee48caf9dec17a14bc8246618b22e683c0090259e3db19dc5b6175710df80cdc735a92a990a3cfb166461ae713adda7d9fa3c4cf9f409b1467f3cf85d2141ef3f119d1c53f23c0380b1ebd728d7e932c535965bca41a414b6ea5bf0f9a381e098d282a554a25ce41980d7c7be75ff5ce4b1e54cc61e683f1dd817b8e2c1a430d7f895e5e7af13912cc110f0bbb95372fb",
-	"9dfda2e2f732867e60ed2b5fa99ab88eb82dc7a54334d02031258beef75fa4bd6962a1083b9c29e4eeb3e5ab8065f3e2fc732675b8d7705c16cfb4ef7305eb58120f1af5ddc55872a2cbde3a48661a0598f48f63e2e9aadc603545e2b6001748e3af9e86e1830af7b84ffd3e8f16679213d37cac91f07af0af02b37f5ed946ef5c955b60d488acc6ae736b10459ca7dabeacd7dabcfd656511ac913174f6d99327be59befe3e463a49afbb5235f0ce2840588c6edfbaaba00a4211c0764dd638",
-	"ddcd23e8b9dc8889b8599c721e7f8ecc2cbdca03e5a8fd5105f7f2941daec4e2906c654210bdd478374ddee43ee749a920ee91872e057a1157d384dcd111266221b3c79774476b4862fe450704ff2c5353e9a936cac87c96515c28ed4c830335a55d084cb5873c5fd2dd907f3266d8eb7bf13b6dd7cd4966982a0949efd8e428dae13daee549e01cc3c226211d6307823f742c5ef2155601a4644c46eddd603d4abd959c6d242e427768df3b1e22d87971df58a1564b38311a897c85b497a72556",
-	"39016647acfbc63fe55a74598bc1956eaf4e0cb49d532c5d8323fc6a3f15a0231597f06eafd74ad245e672bf6b21e4da503cb5bf9d15e9038ef354b38807564d91f38b4258378ccd9b9420a1562d7136196822a1291c913d83c4cd99fd8d420990c72cdc47607124de21da8d9c7f472fdcc780379f186a04da93cd87628abf323c8dadcd7fb8fbade37d7d2b5c9f9fc524ff77494c98f42f2158a6f68c906105ca9e8bb2df463863cfc1e9008d8344f55c4e3203dde6699b59812d49ce1279fa1c86",
-	"02cff7567067cbca5911664c6bd7daaf484181edd2a771d0b64566c3ab08d382e83932cdd7b4dbf86c9cdd1a4c353a511e68afb6746a507a9cd385c198246f4543d606c6149a5384e4ff54c1b90d663dc7a4b91aeac3cf716db7ca6f9a1914e3a33efe82e7ccc4215999c0b012782402db4726db1d7d1c73571d45739aa6fcb5a20eeb54a84d5f99902a8d356cbf95f34c9c28c8f2badfbc08c69233514493c0c04963268c88bc54039ab2999c7b06cba405936dfc43b48cb53f62e18e7ff8ff3f6eb9",
-	"5764812ae6ab9491d8d295a0299228ec7146148ff373241a510faee7db7080706a8dada87938bf726c754e416c8c63c0ac617266a0a4863c2582412bf0f53b827e9a3465949a03dc2db3cb10b8c75e45cb9bf65410a0f6e6410b7f71f3a7e229e647cbbd5a54904bb96f8358adea1aaa0e845ac2838f6dd16936baa15a7c755af8029ef50aed3066d375d3265eaaa38822d11b173f4a1de39461d17d1629c8df7334d8da1b6401daaf7f34b2b48d6556ae99cd29ed1073926bcda867421832a4c36c7095",
-	"4df3043cf0f90462b37d9106e67366d112e4938c4f06abae97869531af89e9feebce0812dffe71a226de5dc36be652e26ef6a4be47d9b2db5cdd43809a565e4fc0988bfe82037c505dd276b757b785203249fd083fb474a25acccc9f38dc5164ff9097e05989aa6e280739a755231f93670e7226e22046914c155bf33d135b3f736ccca84cc47ae643215a054b54b7e13ffcd7ad73cced9279dc3210b80700fcc757acfb64c68e0bc4da05aac2b6a99d5582e79b303c88a7ac4dd8ed4289516bba0e243527",
-	"bf041a11622715426c3a755c637d5f478dd7da949e50f05377bf333f1c62c671ebdbf9467d37b780c25f7af9d453fc67fafb2f065a3f9f15d4c3561eeaa73fa6c813bf96dcf02430a2e6b65da8d174d2558110dc1208bdcb7898e2670894c0b9e2c894da3b130f57a90ec8ea1bffd27a37b4da4645c546b2b141db4e2c919154dac00e78dd3eb6e4445974e3bb07905982da35e4069ee8f8c5acd0efcfa5c981b4fd5d42da83c633e3e35ebdc959bd14c8bacb52212b4334f94aa64d2ee183861db35d2d8a94",
-	"a170ceda0613adc9c3a1e427f07beacf3b16ed69fb42b6bc09a38d803f632ad2929dba215b85683b74e2feb1d18fe17d0ea0db84d1be4e2e73476917a2a4cff51d6eca7c5e82232afde00dd2286a4c20eb09800b4d5d80e7ea35b6965b9792d99e399abda8cf32174ae2b7414b9bdb9d63e148f7357635a7310b130c939593cd3479164724011966c4232142df9966f09422f34f20b30af4b640a2c6d3dd985fe0ba3dfa9083cbb9b8dfe540ff9f6c608d18481213040768ef33300d773f9890c724ead320a1e7",
-	"929477e9c2d0bbad3429a0e0de776695255013108261dc6404cb09828770e274d8bb650a50e490dfe917fc2047b0f8ee72e105927d9fa70523c727778cbf6ae876d641ad562938c870d12f2e047bb78920739dba0c3f8ce1fb77589623a5f1625f5d6ab81940c7dfc3dc3a641d82b2813629bab8282999317d6b93842334f123fb4693a9c2c9d8ba9bfc746642dfbd045cd2021b272eab7358aa954d453da53fc5392dfa7eb881f6f53809b692d27f3366595ff403289efcc691e118b4744a1147071d8909bef1e8",
-	"3e98bb14fff5bdf7db38a3960dc55ca7d02333daed8712cca13dd5bffd114636559279db72554cc0a0ee1f7e15557d77cab0f2f1131f94fe698db81be38300a856a5eca85e5cf915fb7b6f38ccd2f27350e62cc30ce10ffe835118be3d435d2342ed3d06199b7e20c8e34d68902f0ab8745bd8b7d5b863d525c1f5906d2dca598db8a0f1e67736182cac15677579c58b8c670cae1be3e3c882153b2aa2988933e579ec2d6dbb00c671da64443dfc027dee6dfc3233c99758304570a982bf9b2eb59ccd70d0b54c4b54",
-	"aa12c7fa50ffdc2811c1872e4bee15f43e6909212385c872eb489f7e06dc1787043f56126f8373bdfa4b3f61405c73dd4dfd3f40aa5cd207e8520849c26f67716a46c0989a99efff42f24e0736e327af8e607c401a1bac77341e9a78c91e35d55b2457bdd5317a405a1fcf7a2a23de68ef92b65819e8aa3807c545361dfc9fe89125123492da958dc313cb5d03cb4b192c54ac6b27fcbc498652f5ed36b587bb74942b3ad453a8d79e5ddc06ebf806dad5046b73251064582ef5777dc530f8701701761884783fdf197f",
-	"83e615cf6e17a29e63945710b548a6d9935850eec69830841e26cb6071e908bf72c87cf079ffb34c5eb1a390def72d004a9488224a18e189aa1092a0f1135712834d257a53dc1d0e2c6417d8f472ff13b181910f4c93a307420d44beec8875d5219a3160b8e921434ddf3f71d68db1c1d5c39d68edb7a604792f8b4e31ecda7895c99fc7031a5b98a22009c1da005ac8fd2da0b5d742743f5712d12fd76d11a18e487776ce21ca0d6e5ab9ca6d8c394c321b91c14e291399a642721361811a73b7392e8603a3004e7060bf",
-	"ae1a8f7bfe4b1a0fa94708921dadb2c20b938239d7b9a2c7c598528f20f49764d322ebe85a5b2ea15563cf2f2304baf55d6607c52e2e1160859dcb7af6d7856899eada0e9128a180d3de6fed9334ba52b80c5c362d5591a0ec30f86d37a399927eb1c53076a12d26775522c511c83eb5b7abc2a00bd2dfd5627a8febba53d85f9b74c4b7f0c862ddb0d9298899b646b774d6cc23e4e23ab47174fccd34499253996d5e0917210e2f6daa1685f89f2f1fdfd5509ebc38191d539ecfb54ff0f5bbe6ef36ea35d425af6462f518",
-	"1d033e06be253ab800c8176d3a9650ab2a5bcaa03e11ea95fb9ab3834b41eb0d1b2bcecfe219364c3104ef65a8d692bd77c798548b7d9a8faf7f5172db24ec7c93006d6e9839368291b8277a82c034a3731f1b2e298d6e0282ec8a7902e4f844d132f1d261d171375c646065e201849f2df73e3748d853a3122c2206aac92fea448500c5418ecfb3d80e0e6c0d51f85831ce74f6c659cc291f5348a1ef8b949f1b2a753633e382f40c1bd1b2f44748ea61127b6f568255ae25e1da9f52c8c53cd62cd482788ae430388a92694c",
-	"104bc838b16a641749dcf73c57b207ea3bcc84381170e4ca362065a3d492e892b426a1f4fd82f69461d1ce1f3aaf8fc291ea30d6667e7e1aea4c44f7d52a5fa6d34709e6658483260ff5da76bfb74e7d194ad40dcac00daf0e45e74db4bc2248100a8b256b257278c3c98f1f2e3a80cdb812352aaf4155b3a4033999fb9fe7f506994fcf3a8db31e9e5ca8ef8c2e9c6326ca5b0803724ba641950eca877fe6ed6afc2e014651c56d0e6a61eaff7c5ed0b861d4bebe42904c0a568c26aa8abb2e97da2bfb40f14eafb6bf16cd208f",
-	"5b92e4a175437d0a53eb10de2c56401720b11715a034459ebf506c3fd6534b5e817a0f09deac4bcfd353301d8d031b1331582ac09189b48e6ccea444655866c4bbd123d45ebabb774f877cf12d33b84cfca4a6a94f3f98869fcf2bbb6cc1b964c2438c2f348bcdf9001dce60a4706d20c169a040baa61cbeb0b8e58d505e6e3739ab03e110ae7efdf91347474033defbd1e86af322ec6456d3394699ca7ca6a29a70d9b10a38fe666eab2858bfe12dacb31568549c826c15af5b6fddf779954351be1872f04e53db7b3b5fbf61fd18",
-	"401cc7bd9f8227efaed70dad83fc8db3bd38efc166f0f11ab142c565c68ba9db680423a3d698b6f3476ef440051fd20b93f6a2ed045825567df5a65e3f62e4442ec396ad260a16a13a1dee46c7e8d88bdd7edf223ab76a9a787c1f4fe9925c051a4ca0e77a0e78baa29f36d193c862fd3a60653f544ea9e3f75f2f553891be8c1fb882f6a6aad118f576f3c2793efc67221b37a45ab6137434f6228cb002fc137b91fb8572c757f00736879453d64a8a868c131810ffdad9e9d028d132157ecb1da675d54047d19b27d3258c9b1bca0a",
-	"c20cf0354982ca6a19d9a4dbf78f810934db2373941a12c263adefa61a5f385c859bc47028829c531dc25ccc0004c7510e707175a102ec3c4b4c933e3f52033e67476ff5f864c446c042a21e6037f7798363d20267891b965879fde80af6b59d77862e3a229af01b7ac78b578e94bd9f9b073c38a627c1864df0083aabb17024bdab6c3c0f0f73d31d59480523a2f23b78baa0385c15f290114305d7f98786b7dbc17a8c2aad97448e8ea389e68ef71091a6a9735ac12ca5497b9171da11a93c28d3273f58b74e2e46279d3ce9d0b20d19",
-	"e2365c2754073b511f16a1881ff8a537541ca7362ae7b84223d3c7d1d49d03a37d6d05dd2b819af9705c015dacc9dda83474eb14b7d5fce6e8a8f8c58e870149338d320e5ae476da6749af45e65ffed550d225a39dc74ffd93ba7da476985d6f44e90fc8e82454496260458431804d802fe804d825f611772f9710667377adfb1a11e4275bcecb42175c515f6a9439a359824f82cc9d480954364e6693099a821ace362e6c7ecbe68be8823bb5b49b4f23ad81b64139e3b63d9d4d298a842f013ef0d91ce7915ee8f816c70ba2aa3994216f",
-	"9c43944676fe859327096f82049cf69e48b98715878400fdf2805e0d5ee642e6cc9c43739f418b701348a033c5cb96bf8702fcd2fac9be58262a843c1e4155ed8a1724b6ebf7cce659d88a95a0c54deb2d7d9574a45219b6419ee173d1d8fad3ace47c962b349abe1048565df85bbd0eb9b11698258c23598023a00fdd26573e41951452027125c6e894a97736ecd63fd15b29a55d8dd9dab7e2e18f541a2e341890a61b7c896e7dc67aa82f3479dacd4a8ec7558d40c34d9ae4060e13718d676c2450258d83de8a86e012813693098c165b4e",
-	"1c707c29582d98a0e99639211102f3f041660ca03ad0939fe3855b8c1b22d6a9b8673c93e3eabc0ab231509b2b0d73c76a290a363943d12d2ff0ea30c6dd54eda753767effe04cabb4c3966388fa4c83a1906a0f48519a5fba9aeb585e0f8c45d6123a75ebe98fd1d0272f733a3925119481a321fe7509346c05128302851ba17a137f956f184e057a305e79a148727a5926de6854eb0314d5492fd735fa773d99ea34c95ca7546bd3a3aa8e66bcc6d860cec3d35d0e2165d5fbe8be99b6e7967df6693e5a6243e94c9c4a2528ae6305cbeca209",
-	"8f1e88103ffa378f062cade0ec509bec99a5c73fb273e79dbef24abf718ac26ac23dfd2b8932038ed3cb9637b71643c161142019f45b25b4fa4c52356737a27027e805ec635154327a66bfe64efc6285cca98c34edc7fb6c0766970a545342cf840aec0a5ba1dd3c6949be4fe97b0f8c8186de07536fd9074db34d09b2f08af9dcf9424d6edbf9cd044102c0e5dc35aff78c36d079dbd2c500e19c8c985ae2abaf6b2a20716bb719754a8840ce97632116c4d0b0e3c83ccca27f11c4204b76b5d6cfe6348a9615d8e4af53500dc4c2cabf12ec8c76",
-	"b9a0c28f1a6156992c103a84655fc6e654fa6e45e45819513afa797024717c00cc195994512fd53ecd1e12dac4d2448e0c40308382312084d2111f7db147b2e6589ce6d977f6115f629508167df8f45bac98abd49f6b272bcc4fd874dd5e29fb6daceb2d727a2a892194cfb9269eda00626ac89b4e74bd29b21e9f6ef18cb69889a02d4f0a06a2e5718899c1dc3b051c2cfa29653e782f87fefa478e6465bf5ff27f8b6abdb500077aac97100bd955ec535a587d66f23354be51cd8170289344bac9451f74e8aee3639f7c09981f4885e018912324d7",
-	"456844a34ae1074246f8f71eeef2010ec8733265bed7c1cc60043d770edfa320cbd4284a94be2574337e16d27f125074ebd7e99031f7abb4547b9540a7b0b5148ef501b550dd929f3dfe39ac65519f563e9254424aaafa05b1d37c16c771882e9e25d4906ac58603da749adf686932cd73d81e2658134fe69294c7a521d257eaf2110c667fc9d6f09b52d24b93910e532184eeb96eae9d9c9750ac3c39e79367431ac1af7011172d0a8be46a31010219a0310a733068c589bfc4748f3626aa4ff8d355cc893d05111c287c9992e95ad47481a6c42d6eca",
-	"c5c4b9900b9727bdc24baa544cad5faf8340be6b3759361f53889f71f5f4b224aa0090d875a00ea7116772117dbefc3a81c6950ca7ceeae71e4ba975c50d61fec82e6d9448d3a0dfd10bb087bdf0673e3e19fa2aaa7e97eebf71f11b86034fcf5a61240c71444ac3da15ef09b27b3523d37d309e8722380f835c1aee4a767bb027ec0674040853e5b53d6a31657f51acff6d2487860becd5ce695696cfe5937f4a0217b69e01cc6facc24dfe5f5230b8692a0b718e3b3c789d682db36101795a9a5f8bbb838c3679be72f7941a1db180135347d0a884ab7c",
-	"1781df2fedd2c39137854737d054cd3ed16b0ade411e41d97888ac900fdb46d9ae26b3d2dd07e118fd57eabd0dfd03a55793c76420666444865371adffc9b2f35068a0d70f9cfda1ac27ccb4beff4ffa5b8bb8bddac843386675c38a181fd0d935d6d51b25d78e7ff4ecef27a9853c0f0d2879c395ed1c4883987d123890d04f851c3e042e1164c68c0d503de16816f4b0e554236e5f4c339ea11d01ce652f6208f78f457a2417a97c0a6a240f443262def4b6763abf53e597bf1a28f907dc7cbdc751a234ea7d75710ad5ab0c37e8e9805102a375abd44011",
-	"8963552ad1e729ead07750df599d734157aaa4bcdcac17e8eb19b4f99cdb162686ff433137aa4e8a0cc8df0053999196262115aec326cf37567d9ba4760e0ad21d5763977f1ab9b35c0fc667890fa87fc946ceb776a811b5adc69446bfb8f5d9908029dc5aa38db816e4a4e8f98e5a48cf0a01627031c5bd1ced8bc1940dcafe4ae2f1199b186468eafc07e96a89d95dc18ef0fed3eda5b58ce58f221a47ba5311313cc680367eeb058fafc7bcadce5f520b6371489d9e529278ae6ee2650a85aed82896879038bbd9aa8d685fc9528943ccf2235cdf69a86464",
-	"23ceae3008085134433f5de4b47bafe0f443d443491e6cd47b216dd2dcc3da65239515a6e6b9beb9a939ae9f1f1f5e11f88326475e0962f319d9bf75ddfb4a46e7cc3f799d7547f3c0b2e089018b75787b82ea1a7295e7411f4852f94c94170e98bb0647923b8eb7d184038e56560da46085540cbfef82b6b577c445d038f6c93fbfdfc96ab3a0191d20a57b8610efb4cc45cd95198198e6f80ac46b0601511885f650eb00992605be903bcb46cd53c360c6f86e476c4c9ca4ad052eb572bbf26eb81dd9c73bcbec137aea6ee27aa97dadf7bef733fa1555019dab",
-	"c0fd31e82c996d7edef095cccfcf669accb85a483ea9c59f368cc980f73da7202a95c5156c34192ae4ebf773c1a683c079b17ac9d08b4265b4054fcddaf6666ca50f38f1a2ef2497459a68c06837363a526e850ecfbd223f55dba67db017eadb7a9139abb5bf3854834478b838aafa16c5ee90ea52fb2f7b8db2bcefb85b06fc455c2b6c27d0af9a49dbf2f313bf2599370637393e7972b31d8bf6759f3e6115c618e672831f84d76ba1879c754144e1df4d56b1e264b1797dcb8ab165040c8d20b931071081d7f74fbff590bdc8e888e71acc6a720270da8db7c821",
-	"936fdab91fba396e4a8754a97a04ba333daadc29885c9d0c8fea3387165278f4974e468fea57f2bfd8428c4d0f010833283db73735d39de0c0cb5898d0c06c0ecd05f61098935cb6130a8da60d1a6c2ecfe420f972263fff5a631b09e81c837183c5528bb1c740b36fc39cb082f3383c2b4afb25d04ad1d1f4af63dcf26a0bf5a647cd2e35a51cc119c4dc5031f5715b3bfa1f2b92de06bdac0d670fdd30980f32c51f3936b51e5db6b95a8d36279da5faa4c4e454f2b7e54e9f488071011c7f6f9b63da260a2e46d796d36c9a9dcae88085806a10a77bbb670d475778",
-	"a55fe162b287bd6eebd6cf7e7aeea8672322d924ae42c7404ff89aedb98943f3755d2889bca488cc7000e6e9b8e7a0ef289273cd29c44cc600e330d1775e3cb767f12150e1615dca8c3f67466463a3ca993a1b788cf67a7a35b95dfff954206eb5ea1e1bf7fb06482a551625b5c9fd9a86e8414c8cf79d3a14104a153cbe04aac5172aa4c4a89349f5856c4262dd1d7317a7544c9afbbed449e7dcc2b58d9df6c9c9ed3883e42e80f5c2433550f30e73c7bce0fccdd880adc19282a392dae26a0108e7faf168cfc15937aeb046d60712603286b8ddfb27916b79242d56f1",
-	"2bd6976592408cdbc4e41dcd3ecfbb786775ddedef914d9058e6753f839fdfe15b17d549dbc084aa6cdf3befa0158aa84c5d58c5876144fd7e6c41ab7d42419d0dd353732e0e6d3fafc4f5626c07433390a4fd467197e85b5de7e2cf1c26cc575356adedcc0740008523b503df12ff571387726c5ccb280376d19cbacb1d7ce7aab8b13292c6a8b8881e949cbf6d4610d16ebba1d46cdb8d0459596e0aa683d0307bd926e14de19b9bfeaefa29d91b82248604673a455520cbb64eef3f38cfad8e126a3b1cfa1aaba53a784c8ae0c50279c0ecdab54095d36f67ace9b8ebbb",
-	"71913ae2b1c8729ed6da003c24a1d4f96e28d7faf55ca14ee0b2865282b9b61103ce6ee0b00b00aacf2081adedea5616f9dfd22c6d6d4f5907bcc02eb33edf92de0bd479794f51246d9b612b4543f6ff633c4fc83bfa6144c9d26721cdc690a3d5a8db54d8bc7873bfd32924eeb502810732b5ac2f1852bb021c401d26c39aa3b7eb09083093a9e89bf889b53383b5af61110aca1b9fdf38908c7d5a184fc5f46b3423a66a2749feb8de2c541c563987278dbd0513d99b732411012b5b75e385510de5f6839c3797dc094c9501d5f0504b06b43efb6e746f2129ca189c1da424",
-	"9d048a83294de08d3063d2ee4b4f3106641d9b340a3785c076233686dd3382d9064a349c9eaa78028d35652078b583e3f708e036eb2ced3f7f0e936c0fd98f5d0f8aa91b8d9badef298bd0c06843831279e7c0c67ca7e572f552cfdd984c12e924c08c13aeec6f7e13d161785546ebfd794b5d6a92a4744e52c4cab1d0df93b9468be6e264e8cfcc488f9c3c1817cbe501f4b9cc5999483b7433aea777226b25273a6ef2331b5f3b6db8091591e8e276015da3ef78bb2ee0526ffe23def2d8d193cbe594e8ced1f3d216fcedae2a1eb288da82e34cf98aebc28def658ee0849ae7",
-	"3251c96cbf82ee2e5264528c0b6cdfc23d20e1eb2d6441b5d62f0fd24c692a0d45a8bc8aac32884b7141ac0f4f113ec9fc7f6b4db3d696374177f9a42d602ca471275b928f639105a55b846da9ac7274cc37de8c38541f6895f94d72a81e117844b46601c201f7189b935a96e42505f2098ac985d92dfe86349a706ef6325b3c2e4060ced3c453e68ed09e043bcc75846b80118dc53530248da250fb57922d0afa53a7b2c89161aa4fa372a46b2a8e1307741cecedf585d2f998a9d496763800b6965c38a5d8aa566c709f13699c8185ab4fd8fdc8b824f4dd6d1c255b4788f50574",
-	"2de31dbc8a012254586f3229d3524fc529554e98850d30acdfc11406bba6a142029126ac165ee90b2de7509fc3571a8ee12e16b05054eb8baea879d135b39627f0d8331be3e66bc720c2096ce74e437daebf3bc53d8f2ccc228c3256d3edb6e9ae7c354a0c9350e6d663a9a30630bf9da3d96b96608a2a171ae28105714058b6c4b38a36c56561c4612c32aad25c65b7fb6faa4e4ecd44ebf9b2fad42ff9a807cda2581614fd30d41a7436069399b8d4f062a37a5bd4066a93d541fa5797a7d3e7dc9c4c40f0bbf5256f71613240f9ef128b3423eacaf428ada06b6a531f835281e4f3",
-	"07dadee629a08223dcd7ec441287b4c5e26347451d9c003e3a8496b4ea313b51126283a6720d7851e24423d9c9c818b4601247178f38a61f45fd4c8596d79529d416834226666a2c8552bbc901cc5cc3406a18fc88077fea52e1b620748553052ab7788c0d025b095b736fbe714cb3a968ec16b5917652eba2d7cf32ef3140d6c27b25d053e9786d24cd09a5306a0ef55e46201faa6196a91084267d7a7b5ca57c2efdeb2cb97d682d2a191b915553c8933f1d1b7faf0b4a1d83ef611f1e44438bc1c3d860fbfd12b5f26e5a6889a31ce26ae6a55c7a563b5816d113423ef3f25fa9befc",
-	"1d94166bb387526d519c4ce150221954da8930f66765fe6a5504e30a69962d595cfdd07a82c003843598864261f053bdb6f5086d516c261e089caa89990f0967605768ae9200bdfe4dcd7b77a93265cb33d9851a2a1036113c732bf3f37534530641300f0620de5c16101e16f4baf39d9fcbfcb01c52afce0992c329d8dbb438c314eee995c5020611d6f889e06b8a032785cba9a415580dbf752b5e510523c89f478cc6f047bd926f51e4a965c9749d1e76379c0e7e5b56803893bafaa4d2892b4c52f143b2fa777cd1035ea418684b8019df084f9a3f1f768753096621f342895c510d01",
-	"fc0073f199ed8a1d6edc8e7bdf182670003108d82b283aba82326e856f8de378987a03d0fe8d2041440fd29d51c63796aab44090d2b14ee00859b3a08cbe88f724badcd3c401226c5db8b307b8deea5be305412b080e9f99cf79d6d08d3646f347a7afebb62912e3e246e2e726f9aec5c101d916e47f984507b1d65d313697256c77da7eca3bc5811c87bee02a2826cefff0d92bae989609aaf95d70561b40d98474c37277c884aed887a1606d206b11e8a8a71d1f1d19319557b57351228ff0404be700a6cc56c0a30f3d4b7a0a046463fdaf19e7d5f59e155f378e35baa33db1e881f2207f",
-	"f42a6a91278d6a076feba985b1cf4ce0af1fa9d6d039c136e8971e665ff088a10b6b9a379a6f5526fc5957773a0ccb8972a4a19be0745ac13937030a54b18dee4f4c5df47a58a33a7516b90e646e5da999166ab0e52f457f7c9b7e391836a687eaae37b377e59a4c995ab0c57162c307ab951a9ba6590f429cd27250e7010eb794ec1b1ec35f8aad189b2fd3e8aff24d93601d91a4884e6f84b02757ce7620a02901519fccfda52f68ad6df709d112a9c25d66bcbb9622806427ca8b8d346b6db05874bde800cde9cf17df4b05baab0f133febd1ebbb053b49c109a7f5b1f864a304d10288e2f0",
-	"bbcefaf4a0739509f8a2f831c954071aac52e60cfa882a867b8b910dcf7edf92e1c0692bb027bc378c460a01cb6ecc8f2a012dd84ee5a678cd497b1457b6d393421fbee98ff544fc7eba24cbc3aae506254d9a2d74dde74437ce4c8a69010718506bf4c5943342a942e5e2d3406a3016280b6e37954c5d5e763346251afb0b746cad68cac757f9df765e092518729cfb9a5e76300c124e708ca33591a369767ffb63933cb72fba67beb2223d98984d0b75eb5d1a38615913747b520b3d613c715c0c77d2987bb88f3c419bcc5d38573cf4a8a4f550b2d876f05ca252d88c70a561d869a5018b32f7",
-	"dc2437010cb05d9cab2af5c275e1d2acd627ce19fb86355df91fb8d059e60d591663c8eb077d48388c9a321057a98136f49f0098348d9f29d808936f98bb1787c7ac75fb14f6076dfd2de5b59b1fa4848cabaa9a99a091dc24b561911c392ecdbe53f4adae82b852d830adea3a10490c908e337ce0a6d12354ce05a37ad3a06696b66820af8a1f67e6287533fd6f38a5f6ad1c6b078c08baf2c37d2683af01e6a5b33796c8ae48935a888f9bd265f4f11a4e27c433b8b1c9afd140bcd21a07e24378ad6badde8e47c57e3340f49e2406e8d49afadd65eaaa4c3d078c27d7e42118cb86cd248100a356",
-	"6c290db326dd3152e6fa9b9c0cd7d49e50a0221b96e32f5f34a8cb7d0c2edd3e937a7d025d6999b7b468add4d6894d8f7aceaabc18f4d9c171f1fe95ea1ae8570382a8450fbc595d95b1f51d24e1abc2970b0e1d20ca40aa21bdfb3656adf2f19882eda606f5ef1c03174e1d94c8d12f0fee8dce6852f42a364eeafa27a7971d4379405db8e46baac4d685b969238e5df06292a6c790bf1994a051b038e1d8db91e1bc4804f32443781c34a552ed2e8100cea374e77af56ba0e11c45990d3ba68df9087b1f4968cbcbb1c42f99b7267c76af926ff3134e093df28fab039cad420c6b70f2d9b5e678c155",
-	"ac724a22ebabaedbbb052953e3c264a4b6440f313bad501cdc1484b64f33402a2230898776db5c818c28035ffae6ea24abd04b7159e42159833903a0c23a7c564f7645e49ddedb748fd9e51bd6cbf2eced98caaa35226970f003ce1fd260ac5795e096f1c04aebf8fd36e5e2adeea929b5e963a3cb71d6b55c85bb7d3a2b03a7e74b4416de8fa68950168d7c3ae8ed2e29bad1e8a182a7c5418e5d564373163778cd3c34e9d320eb1a60480a8f98b12e0026cbd7752e6079812e3767d9f55f3f10b8c214a6eceb2a58954091a06b33862af171a9b60bf2c6a44e8766e6c56e98092c56f2a8510f6d05c103",
-	"8c70114f7cffb375c2b9a06e27297a5c32418b2daf68af5bbedcc7106edbc070e764bf40c1f8eb15079e2ab77f898afff3490108ed9afb7ea9cb05df41d263be0e42d2321d3d2656622d7bd232bf68d37375fe7314b09cba66f19c8b59424198ee69e7a9f3de0ecce0685127807ce336fa479ccaf7aa1ebc4e406271ce6c4923ec36093516498cc227f9218869346c80ba5ae83e023aca0ae2bc86b5bf5d115a4616b6587cb869d92f8c780ab70d5766de07a204af5e1c8dbba622516d2e911b36c82e4687e4d258ea616c07f76ff0baa376c8d5975cffac0b25817f779ae3ce88b72eb47e378484ce999bf0",
-	"0733d59f041036398233fd47a84b93f6778ae5259ef5d62aa3b9faedec34c7edb570c18b2a5d2c4c55cf656d98a1ae396d45a3b746b7ad6f07312c3d05d1a50ffa90bcdcdba105e25b7b0c52664223f8c2476925d46dc6ea2406ded7d0b0b292f6656cebcc7616cfa4b82aec68b35d1da67f6ed2bf0171849d6bb65128d8a140ea5cf97f1003f8d7093bee077be78def4f7bd2caccbf0644f26b26285225142c40038484c3bb9ba9597744f4389e76dca3eb695c33ccc621cab1fb603cb3535a0ad318d220385d5e94f8674f3d55e97e097f8d5c049e911946afbfce783819951d65d6bff4567dc951390d1aaa",
-	"398ddbba3dcb5642c102efa841c1fcdaf067062e7eef8e2ee0cd73d7f77e57372d6ee1a9b7b6f86ad12d575001ae71f593449cb5a476c6bfeddaa2af0f9239c1d7effdedf66ceaf413707b5ab9661a7cc0ef8cfe4d1651579c4f0f64e2d12a52653c54f2dd60864e769eab8a627c89c56ee93365d031f0d2523cb95664b1575d51b122f33c9e94de75432a690658c977b68aa5b721a393f9b9b3b612c10e920a7d510c6d8460b35f8614c42f5d2c241a01b28105aa7c1b521ac63ebbedafac6d5a38c898e8590f918a1927bc53aecc2b1c8b18d7df9107c6997d9b3fa4b0bdb1c603da619d9e75670b97a5b40f06",
-	"ef07bbc7c4150dd47f8c69a7989948fe831dc798b0424dcd6551bfa8e88216095a7e5d720909bf3d23526b9ba464b66ff6b63a7337c31451ab9a15f04ead809a62bb52206237de77597a730106d02d227dd6099ea9ee2a92cdc446ac3b9d024e32255adb3e9b56b561c431e0b5a721f0336f19568a5335d0ebc6c73ed8ff2c15e219477d9e4b67f2928e251f8a61a2848857e037d010806c718ab062967fd8e85f3722252957923f5f9005aae47b4b1b3fa464e3ba9df573a56055f17e903126fbbcb6cb96de92fe617c97f84ef3ba0d8f2651dc4aa80c157f372ae1bc02e5067ad076f3fe48bb72c0f3c99273f82b",
-	"c7076986d2333f3a6752adf11f1a9e5c6bc4755f341073cc86a9c7519c8db029d5ae833fdf3fee826ff4692c57880c5074620ea97c00f1dde1e8a0f18501627984ded4d1b5c4af35be5cc1bcc868060a49a968dc0547acde490b4c68d79924a93a986aa0ad060c7de706e8a99ce8f84a4f8707b52a8ee122b763ba580d6b1f35f6af25094c69f49247da96c836991851ad36f60bf577863d7471608a012afa7a56656abeee7cd9b4f1f4d9d13a8526c0f33cd251caf7486639e787250390e7e488e9ec311fc3d847a7266cc59bcc2bc34192554aa57cf25db10ce04bdabef3fde6db85f55195ecc2ff892b2e268ebea6",
-	"01789f40d42d8d3e4a416fd9ae7de78c3a30507809eda200e1afaaf8d7020cd1fad18eba62d821946f220506cf105ff0e2069a771a2c233714afa6b2f695497e4b95c9693dbb93ec4c9a14720676aa87ee31dd34e4e081756477032b4a57b328285f2cdec1b269754c474936927e93acc26012aff1bb36f30c2402aca0a9b9ce9568f5000e2c934263933b436c94f8d6589c89db7edabc5d03a8fe795fe50c5166beab64ed7c22662b984ae2c66dbe4c090b0df603b27c759278f8d66859afea3f6a8f02c2c2a2202b9fc29132256f164b5050a803b43688dc4c9ba86374a3522afba5d1a19bb3820b883aebc267627095",
-	"2c61944bd6a50da00ebb951d2b67d79fc6b6fb5aca83b1de3dbd7690ab756bb1e1a21051ccf1e24136ac8ccb42a2ee10be94d2cb9289d5f52b6f90e9d07a3478f36a1eb7d08c3dec52ca154fd1427ba92a4ecbe73a71bceafbd26e9a39d50821e2876d3a0c0e6e373b9795dbf72ea29cc439ff42706be798c90d4617b39c90ec84bf9fb699dc8a9a34e25d81759d6c57df45efb1d0d68aa51278564b99633ed5dc464bb7d53c5c21f798f33bcd868657ecfe75a1ed8149d394b398969ef624831b30f1458465bfd2fdf3f284f2ffc54bf2817b5fab2e02056e864f78bb6fd870c64f3609dab218f25da8060f756e45121e79",
-	"942fa0c68cc72f69518a3a7aac0cde45bab0e928b5cb2bd24d049fc313f74b6afa87c4e34150484f3b5200163f8a6472d04777928ecc49319539fc17d71a38090f55a74f757fe45781a3c09f08dcd3dd4c73c8533a5e00cf8a86ebe77fe45be2848574f7c5d25e9a0632a60d2dd41febdbf987d2a0487e4a4ce6ed5f49f2d741a88ecac232b1498253fa4ee8147bbd0f600abdf295e81f7570015aac5fe6ca7bb4a99bb3fc54287106d7fc1132a574af49db82a7b9a5f33e193cde527ca2176c52cdab672165e0fe5720f71ada57ee90060aa069ae2a0bfe67c1b71b17c601c3c2224bf9891bc11ba216e3ebcb51fd95b8d7cb",
-	"0d68cfe9c087ec116fe7572042385159cc705960f842aabad1ed1387ec1697f4413a23c6090041328fedd4b626c6eeaac5b5a71acc1fd1bb8fbd228857ac5bd045c364be7a5a26338ff04c99c4c473cf445a891db6422d1bdef4533442df171643fc36a092fabb464298e4194c9e2950884de13d113ee24160a416404c16ddc5d2476cb3fb80da543e6ed9105f6003977acb34e1fdd2cbdf7a00d5ff84350b74ac231418c0d88269d02d824802791ff42a51cc835deb9869a6023f867f82ef6dc0bfb03e6dfa835646bb18a4074773486e308aa39e532aaea4e6fb35dcada7e060f8282c371ed26d22302323d4fd142a85534671",
-	"45e24b167a0bbef1bd8f79dd047763d0754f36a7b623f298059d177e8ac994945c37d2c4af06f01318960301595941124592f2995af1459d854339998d3ae17534df2d9793d6e203857d02c98a0cd88991e641b3e640090ba303f87b907dca8ca462fac19ad079b2c82ea5b521ab891b10138b083b3d9fa214a8fe60d1cb3599c5d199c61a2cfb7ee2f39e5a5abad5ac4998b707545f73e92128d21803420526d2598a53bb314adf29a0ef56b94bd2221601eb53ecb8540e8fffd38fba7bd827ef255e4ef55491475c0f383a241f81c72af4e1dbf2a65cd4d18a497615aa0de2791a3511a7977a8d4d41492bfa4085f2fd4e8f751d",
-	"1c1bb695ae90e6e33fc1e8b2a62ab98bf835ac7193440f2351c8cdd830472b637d2fd9c9013cb83caef506abc1c4f7567706db6046b1d184579c7a9223ab1b35e32898c70a3c27628123ffcfa518612f080a2c4a9f8e0a927a47dc98307d2b48de9d5dddcb5c82f0b0e4e610d44f1baa9bbbf7f5a727134680bb7d1327b73b52d8e5e36dbb53971e99e699d79f75a3fc01316bd7012947d119d6aeb7f75b8fbf0479c03002148553fa0da450fd59d4f1bebc252caa11ed9bec5b6ef54279b5f8382b61cffc67ec03f4baa7ea476c31364b86aa8ccad9fd0818717f0ced2dd49477874b4341c602d7a1beab860eb476c7e3ce597e6926",
-	"7a3cd9bb2277e2c7f1134fe7233f0f7883c2db9fba80aa5742b03041de0fe589d9e5ea84470dabf41bb66816f3e33ebf19a0ca5aba1004cf971249b258ff26a98dbd0c37ec6cd574854109433357720040bafed4531e0079186b1e853e0ced35d08d27f6d732ed6e2c6651b51cc15c420a24f2dc36c16ef4b3896df1bb03b3963f9aaeb02a48eac5772abd5948c2fd0db2bb74e3351e5eabd681c4f413655bd94dec96b1544c1d5d2d1df4bdc26020d25fe81d5238de824687a5505e1fbe08d11b3924b3ccc070fd225bf01eb79e3d21f7b62a836cd3bcc11c931669c37613470e356143df87c48848a829f5e018973a5db88eb6c60203",
-	"3f158afd0733fcc5dfe1efc2dd4eada732f942af734ee664955bb1ba613eafd0f349e7554a14d68200c62d8f2dca2ec8b81c8350735eaf437041f78b452598825b6899560963ade66a0fc74ad01f8343d1d19c7bb327a8dc14ffdb1c42fa72b2970d9155e2da6a2e6419d4117842d826ff38ffab9617307a0283d3ea28c8104ad9a6e087bb750ed1d10fd8f7100b1663682e979d80e43968c33d9eff66f4d1344e583ee521e78d0a2193c0577516b978339c143bfc689bc744bbc4a9163063de82c9706384b6b385e54666c86b34f23c1e25be293af06092ca31d857e11e5b2caf0d19dd3afbe85380878eda76d718b4bb869c67e044e242",
-	"a177af4387b9bfa3d59e97ee7b0ff5f4ae4a326fd9204c8d28831a67fcc385ee6c4828247b16d11aea9bb8cd9e6c4d2876c6b2fa6d5041ad39e1b04039071e29c4d86417e7eac4fc7d3823958a021823e2c880a757dfbcd0c8196371db5bbfac15e4d1a0596508b6d26f8c4a664924c95082d173f817995b44c4285d625d9b2f56c86632fe1295c5a8a7a3760028072bcb07bc245a705e7174d06b9d5c0c8ca495b9ac218f1921fa63f2db3fd148f07545366d008fb5aead7497d902b91fbaa39669929d4ae9d07df8557f1f0aed7b51252f10c6606e5ff3ede1327530ca356b4896ecf14bf7322d77fddfbe28d52f6de7f66eeb81704c87e2",
-	"01a15b9018e35cc342c926b01d03ad9db4993a6bf92e0555969fee90033f28f3ec234c1268b11b040dfa0770d4ceb39edfeb8ee6a589f4eebcc08d2d1b0a1a52953aa26eb44fdf4a2743c3dacb212a0c0f325572f645f53027b6f3c0c55abaeb1b0918c89bedcb5028f094d743ea354f8ff553c45f111a8fd5a14a4e5c835164747d302472e19a67da04b4c8e39756a9d248ce14d1ed43de75aca86850f2455eccd4639b2af035bb3f504cc9065d091c1c47e036083cb3fc50bf39292b11737c7ce0b49673ba93981de304dc65a671775b6ff927e3ff93850b214fffb5792105a4bdc81354d5b09e84afbdd1792b8fb4e9d0ae3dad2492b03282",
-	"24f07ae31279ceed18ec6d35990f21200934ad6b132c6c62e82fe92a40a0e60a5bed10720eff5a1f728971888682772b2d9060d4fee88f37d0824e7384dddcc549475f0e1a44eda4804778b62febe46e04657a20577ee70acb3425e334881eebd8ddf714ae8c527ea747e3367de384e595a43b299b6bb3f6b0a4716cf90038e0f75a47d5057d7fcc3c8a8f9224992c67f8ae0d3251ea09a24aed9ce57ab637f6b3cbb7083df62b6287f64d0877984c4249d113bdb2b07865082aa24cd7ec07061b17de320f51f29f25b82d7073d369cf2dbf96310c0c311997911b2cc02f606f9cd99663c57e78499192a2a78f9c9fa67013e0f9817287faa69b22",
-	"4aeb32bf9d050f10bea18d9f71b4afea7bd08550e574e7d50df234c7413668b297b6721d7a0f0bdcdcceb2f55adddea28cd59bd44be0c5ec067039e428706caae11f565d961ad6e7f4c51b0aed6d05cc5b8d826c4b9c39daefb6c7da46dce619a359dc9ce215a215218fa8d54ee0b4f301b6c201c7c2c5f7cb1c6e0cb76ba6c6e8f63ef7a5213d550b0d0857fa0ff9e3e38e497161617413ac066e2fa539520233193a5cb7baa0c2cb20b45e56bfed2c40a9544d1f230dd0cd6d4976e7cf51da8a13200c3957c0154c8237b2931ce19b824963ac576ea49b548cc6aa85c47796b470fb2c6308d88f390bb13607e294c84a838b2713b14ca6a5e8bcee",
-	"77e607478be5502432230c913d9ec82f967d87c0ee169a74076f989648853eca693277287f8a5b306bc94dfdbf64ca5cb5dfc0bc498589d51a691b8d57d4b0a9ee247d038fe1b5571183be3e75c37045bf1235863ff1b84b208c10e7f1a5ba54ff36af5b2870129867164d013e0a6d2cc067a3509bba2f46390302c80b651cf590ef69aad8effd94cab28a9b44be6a38b58cfc47c9c725d6fa467894163383b6873d10d263b1cbbad932ded59ab503920267ac026726f794a335a88f6ef564f8968c6fa6f5d3ea161eb6062ca349b9a0e4038273399cfa297a6b07ceda1ebaa99c9de2d935ee230a08c5a488ad46f3393243371d40916b8063cac9da63",
-	"50957c407519951bd32e45d21129d6b83436e520b0801ec8292d79a828106a41583a0d607f853dc4410e0a1427f7e873455a75df065cfc6eef970f7e49d123b346976460aadd91cf513c140c356442a84656904a8b1d708dc6089db371c36f4fe059c62302eaab3c06c0cb3b429961f899dcf99798464b8571a440cac7a52b495f32417af6bc8f58adc63647531f804b4e96273b29b42434c1236bde80ba3744fef7b1d11c2f9db332b35bc25123338ac9a0796aac213c9709b3c514ea7ecd80e22d3d8a74f28c8194418a6e1ff30714d0f5a61c068b73b2ba6cad14e05569b4a5a100da3f91429d6e3ffee10ceea057845ec6fc47a6c5125b22e598b2dc",
-	"f2273ec31e03cf42d9ca953f8b87e78c291cb538098e0f2436194b308ce30583f553fccb21ae6c2d58f3a5a2ca6037c1b8b7afb291009e4310a0c518e75314c5bb1e813bf521f56d0a4891d0772ad84f09a00634815029a3f9ad4e41eafb4a745e409ef3d4f0b1cf6232b70a5ce262b9432f096e834201a0992db5d09ffa5cbc5471460519a4bc7cdc33ae6dfe6ffc1e80ea5d29813136406499c3514186ced71854a340701519ef33b6c82ca67049ab58578ff49c4c4fbf7d97bfec2ecd8fbefec1b6d6467503fea9d26e134e8c35739a422647aaf4db29c9a32e3df36e5845791fdd75a70903e0ce808313a3327431b7772567f779bbaee2e134c109a387",
-	"5784e614d538f7f26c803191deb464a884817002988c36448dcbecfad1997fe51ab0b3853c51ed49ce9f4e477522fb3f32cc50515b753c18fb89a8d965afcf1ed5e099b22c4225732baeb986f5c5bc88e4582d27915e2a19126d3d4555fab4f6516a6a156dbfeed9e982fc589e33ce2b9e1ba2b416e11852ddeab93025974267ac82c84f071c3d07f215f47e3565fd1d962c76e0d635892ea71488273765887d31f250a26c4ddc377ed89b17326e259f6cc1de0e63158e83aebb7f5a7c08c63c767876c8203639958a407acca096d1f606c04b4f4b3fd771781a5901b1c3cee7c04c3b6870226eee309b74f51edbf70a3817cc8da87875301e04d0416a65dc5d",
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/blake2x.go b/installer/vendor/golang.org/x/crypto/blake2s/blake2x.go
deleted file mode 100644
index eaff2a7f8d..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/blake2x.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blake2s
-
-import (
-	"encoding/binary"
-	"errors"
-	"io"
-)
-
-// XOF defines the interface to hash functions that
-// support arbitrary-length output.
-type XOF interface {
-	// Write absorbs more data into the hash's state. It panics if called
-	// after Read.
-	io.Writer
-
-	// Read reads more output from the hash. It returns io.EOF if the limit
-	// has been reached.
-	io.Reader
-
-	// Clone returns a copy of the XOF in its current state.
-	Clone() XOF
-
-	// Reset resets the XOF to its initial state.
-	Reset()
-}
-
-// OutputLengthUnknown can be used as the size argument to NewXOF to indicate
-// the the length of the output is not known in advance.
-const OutputLengthUnknown = 0
-
-// magicUnknownOutputLength is a magic value for the output size that indicates
-// an unknown number of output bytes.
-const magicUnknownOutputLength = 65535
-
-// maxOutputLength is the absolute maximum number of bytes to produce when the
-// number of output bytes is unknown.
-const maxOutputLength = (1 << 32) * 32
-
-// NewXOF creates a new variable-output-length hash. The hash either produce a
-// known number of bytes (1 <= size < 65535), or an unknown number of bytes
-// (size == OutputLengthUnknown). In the latter case, an absolute limit of
-// 128GiB applies.
-//
-// A non-nil key turns the hash into a MAC. The key must between
-// zero and 32 bytes long.
-func NewXOF(size uint16, key []byte) (XOF, error) {
-	if len(key) > Size {
-		return nil, errKeySize
-	}
-	if size == magicUnknownOutputLength {
-		// 2^16-1 indicates an unknown number of bytes and thus isn't a
-		// valid length.
-		return nil, errors.New("blake2s: XOF length too large")
-	}
-	if size == OutputLengthUnknown {
-		size = magicUnknownOutputLength
-	}
-	x := &xof{
-		d: digest{
-			size:   Size,
-			keyLen: len(key),
-		},
-		length: size,
-	}
-	copy(x.d.key[:], key)
-	x.Reset()
-	return x, nil
-}
-
-type xof struct {
-	d                digest
-	length           uint16
-	remaining        uint64
-	cfg, root, block [Size]byte
-	offset           int
-	nodeOffset       uint32
-	readMode         bool
-}
-
-func (x *xof) Write(p []byte) (n int, err error) {
-	if x.readMode {
-		panic("blake2s: write to XOF after read")
-	}
-	return x.d.Write(p)
-}
-
-func (x *xof) Clone() XOF {
-	clone := *x
-	return &clone
-}
-
-func (x *xof) Reset() {
-	x.cfg[0] = byte(Size)
-	binary.LittleEndian.PutUint32(x.cfg[4:], uint32(Size)) // leaf length
-	binary.LittleEndian.PutUint16(x.cfg[12:], x.length)    // XOF length
-	x.cfg[15] = byte(Size)                                 // inner hash size
-
-	x.d.Reset()
-	x.d.h[3] ^= uint32(x.length)
-
-	x.remaining = uint64(x.length)
-	if x.remaining == magicUnknownOutputLength {
-		x.remaining = maxOutputLength
-	}
-	x.offset, x.nodeOffset = 0, 0
-	x.readMode = false
-}
-
-func (x *xof) Read(p []byte) (n int, err error) {
-	if !x.readMode {
-		x.d.finalize(&x.root)
-		x.readMode = true
-	}
-
-	if x.remaining == 0 {
-		return 0, io.EOF
-	}
-
-	n = len(p)
-	if uint64(n) > x.remaining {
-		n = int(x.remaining)
-		p = p[:n]
-	}
-
-	if x.offset > 0 {
-		blockRemaining := Size - x.offset
-		if n < blockRemaining {
-			x.offset += copy(p, x.block[x.offset:])
-			x.remaining -= uint64(n)
-			return
-		}
-		copy(p, x.block[x.offset:])
-		p = p[blockRemaining:]
-		x.offset = 0
-		x.remaining -= uint64(blockRemaining)
-	}
-
-	for len(p) >= Size {
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		copy(p, x.block[:])
-		p = p[Size:]
-		x.remaining -= uint64(Size)
-	}
-
-	if todo := len(p); todo > 0 {
-		if x.remaining < uint64(Size) {
-			x.cfg[0] = byte(x.remaining)
-		}
-		binary.LittleEndian.PutUint32(x.cfg[8:], x.nodeOffset)
-		x.nodeOffset++
-
-		x.d.initConfig(&x.cfg)
-		x.d.Write(x.root[:])
-		x.d.finalize(&x.block)
-
-		x.offset = copy(p, x.block[:todo])
-		x.remaining -= uint64(todo)
-	}
-
-	return
-}
-
-func (d *digest) initConfig(cfg *[Size]byte) {
-	d.offset, d.c[0], d.c[1] = 0, 0, 0
-	for i := range d.h {
-		d.h[i] = iv[i] ^ binary.LittleEndian.Uint32(cfg[i*4:])
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blake2s/register.go b/installer/vendor/golang.org/x/crypto/blake2s/register.go
deleted file mode 100644
index d277459a1c..0000000000
--- a/installer/vendor/golang.org/x/crypto/blake2s/register.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package blake2s
-
-import (
-	"crypto"
-	"hash"
-)
-
-func init() {
-	newHash256 := func() hash.Hash {
-		h, _ := New256(nil)
-		return h
-	}
-
-	crypto.RegisterHash(crypto.BLAKE2s_256, newHash256)
-}
diff --git a/installer/vendor/golang.org/x/crypto/blowfish/block.go b/installer/vendor/golang.org/x/crypto/blowfish/block.go
deleted file mode 100644
index 9d80f19521..0000000000
--- a/installer/vendor/golang.org/x/crypto/blowfish/block.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blowfish
-
-// getNextWord returns the next big-endian uint32 value from the byte slice
-// at the given position in a circular manner, updating the position.
-func getNextWord(b []byte, pos *int) uint32 {
-	var w uint32
-	j := *pos
-	for i := 0; i < 4; i++ {
-		w = w<<8 | uint32(b[j])
-		j++
-		if j >= len(b) {
-			j = 0
-		}
-	}
-	*pos = j
-	return w
-}
-
-// ExpandKey performs a key expansion on the given *Cipher. Specifically, it
-// performs the Blowfish algorithm's key schedule which sets up the *Cipher's
-// pi and substitution tables for calls to Encrypt. This is used, primarily,
-// by the bcrypt package to reuse the Blowfish key schedule during its
-// set up. It's unlikely that you need to use this directly.
-func ExpandKey(key []byte, c *Cipher) {
-	j := 0
-	for i := 0; i < 18; i++ {
-		// Using inlined getNextWord for performance.
-		var d uint32
-		for k := 0; k < 4; k++ {
-			d = d<<8 | uint32(key[j])
-			j++
-			if j >= len(key) {
-				j = 0
-			}
-		}
-		c.p[i] ^= d
-	}
-
-	var l, r uint32
-	for i := 0; i < 18; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.p[i], c.p[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s0[i], c.s0[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s1[i], c.s1[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s2[i], c.s2[i+1] = l, r
-	}
-	for i := 0; i < 256; i += 2 {
-		l, r = encryptBlock(l, r, c)
-		c.s3[i], c.s3[i+1] = l, r
-	}
-}
-
-// This is similar to ExpandKey, but folds the salt during the key
-// schedule. While ExpandKey is essentially expandKeyWithSalt with an all-zero
-// salt passed in, reusing ExpandKey turns out to be a place of inefficiency
-// and specializing it here is useful.
-func expandKeyWithSalt(key []byte, salt []byte, c *Cipher) {
-	j := 0
-	for i := 0; i < 18; i++ {
-		c.p[i] ^= getNextWord(key, &j)
-	}
-
-	j = 0
-	var l, r uint32
-	for i := 0; i < 18; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.p[i], c.p[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s0[i], c.s0[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s1[i], c.s1[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s2[i], c.s2[i+1] = l, r
-	}
-
-	for i := 0; i < 256; i += 2 {
-		l ^= getNextWord(salt, &j)
-		r ^= getNextWord(salt, &j)
-		l, r = encryptBlock(l, r, c)
-		c.s3[i], c.s3[i+1] = l, r
-	}
-}
-
-func encryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
-	xl, xr := l, r
-	xl ^= c.p[0]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[1]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[2]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[3]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[4]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[5]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[6]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[7]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[8]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[9]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[10]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[11]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[12]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[13]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[14]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[15]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[16]
-	xr ^= c.p[17]
-	return xr, xl
-}
-
-func decryptBlock(l, r uint32, c *Cipher) (uint32, uint32) {
-	xl, xr := l, r
-	xl ^= c.p[17]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[16]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[15]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[14]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[13]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[12]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[11]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[10]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[9]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[8]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[7]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[6]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[5]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[4]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[3]
-	xr ^= ((c.s0[byte(xl>>24)] + c.s1[byte(xl>>16)]) ^ c.s2[byte(xl>>8)]) + c.s3[byte(xl)] ^ c.p[2]
-	xl ^= ((c.s0[byte(xr>>24)] + c.s1[byte(xr>>16)]) ^ c.s2[byte(xr>>8)]) + c.s3[byte(xr)] ^ c.p[1]
-	xr ^= c.p[0]
-	return xr, xl
-}
diff --git a/installer/vendor/golang.org/x/crypto/blowfish/blowfish_test.go b/installer/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
deleted file mode 100644
index 368ba872bf..0000000000
--- a/installer/vendor/golang.org/x/crypto/blowfish/blowfish_test.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package blowfish
-
-import "testing"
-
-type CryptTest struct {
-	key []byte
-	in  []byte
-	out []byte
-}
-
-// Test vector values are from https://www.schneier.com/code/vectors.txt.
-var encryptTests = []CryptTest{
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
-	{
-		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		[]byte{0x51, 0x86, 0x6F, 0xD5, 0xB8, 0x5E, 0xCB, 0x8A}},
-	{
-		[]byte{0x30, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x10, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01},
-		[]byte{0x7D, 0x85, 0x6F, 0x9A, 0x61, 0x30, 0x63, 0xF2}},
-	{
-		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-		[]byte{0x24, 0x66, 0xDD, 0x87, 0x8B, 0x96, 0x3C, 0x9D}},
-
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-		[]byte{0x61, 0xF9, 0xC3, 0x80, 0x22, 0x81, 0xB0, 0x96}},
-	{
-		[]byte{0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11, 0x11},
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0x7D, 0x0C, 0xC6, 0x30, 0xAF, 0xDA, 0x1E, 0xC7}},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x4E, 0xF9, 0x97, 0x45, 0x61, 0x98, 0xDD, 0x78}},
-	{
-		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0x0A, 0xCE, 0xAB, 0x0F, 0xC6, 0xA0, 0xA2, 0x8D}},
-	{
-		[]byte{0x7C, 0xA1, 0x10, 0x45, 0x4A, 0x1A, 0x6E, 0x57},
-		[]byte{0x01, 0xA1, 0xD6, 0xD0, 0x39, 0x77, 0x67, 0x42},
-		[]byte{0x59, 0xC6, 0x82, 0x45, 0xEB, 0x05, 0x28, 0x2B}},
-	{
-		[]byte{0x01, 0x31, 0xD9, 0x61, 0x9D, 0xC1, 0x37, 0x6E},
-		[]byte{0x5C, 0xD5, 0x4C, 0xA8, 0x3D, 0xEF, 0x57, 0xDA},
-		[]byte{0xB1, 0xB8, 0xCC, 0x0B, 0x25, 0x0F, 0x09, 0xA0}},
-	{
-		[]byte{0x07, 0xA1, 0x13, 0x3E, 0x4A, 0x0B, 0x26, 0x86},
-		[]byte{0x02, 0x48, 0xD4, 0x38, 0x06, 0xF6, 0x71, 0x72},
-		[]byte{0x17, 0x30, 0xE5, 0x77, 0x8B, 0xEA, 0x1D, 0xA4}},
-	{
-		[]byte{0x38, 0x49, 0x67, 0x4C, 0x26, 0x02, 0x31, 0x9E},
-		[]byte{0x51, 0x45, 0x4B, 0x58, 0x2D, 0xDF, 0x44, 0x0A},
-		[]byte{0xA2, 0x5E, 0x78, 0x56, 0xCF, 0x26, 0x51, 0xEB}},
-	{
-		[]byte{0x04, 0xB9, 0x15, 0xBA, 0x43, 0xFE, 0xB5, 0xB6},
-		[]byte{0x42, 0xFD, 0x44, 0x30, 0x59, 0x57, 0x7F, 0xA2},
-		[]byte{0x35, 0x38, 0x82, 0xB1, 0x09, 0xCE, 0x8F, 0x1A}},
-	{
-		[]byte{0x01, 0x13, 0xB9, 0x70, 0xFD, 0x34, 0xF2, 0xCE},
-		[]byte{0x05, 0x9B, 0x5E, 0x08, 0x51, 0xCF, 0x14, 0x3A},
-		[]byte{0x48, 0xF4, 0xD0, 0x88, 0x4C, 0x37, 0x99, 0x18}},
-	{
-		[]byte{0x01, 0x70, 0xF1, 0x75, 0x46, 0x8F, 0xB5, 0xE6},
-		[]byte{0x07, 0x56, 0xD8, 0xE0, 0x77, 0x47, 0x61, 0xD2},
-		[]byte{0x43, 0x21, 0x93, 0xB7, 0x89, 0x51, 0xFC, 0x98}},
-	{
-		[]byte{0x43, 0x29, 0x7F, 0xAD, 0x38, 0xE3, 0x73, 0xFE},
-		[]byte{0x76, 0x25, 0x14, 0xB8, 0x29, 0xBF, 0x48, 0x6A},
-		[]byte{0x13, 0xF0, 0x41, 0x54, 0xD6, 0x9D, 0x1A, 0xE5}},
-	{
-		[]byte{0x07, 0xA7, 0x13, 0x70, 0x45, 0xDA, 0x2A, 0x16},
-		[]byte{0x3B, 0xDD, 0x11, 0x90, 0x49, 0x37, 0x28, 0x02},
-		[]byte{0x2E, 0xED, 0xDA, 0x93, 0xFF, 0xD3, 0x9C, 0x79}},
-	{
-		[]byte{0x04, 0x68, 0x91, 0x04, 0xC2, 0xFD, 0x3B, 0x2F},
-		[]byte{0x26, 0x95, 0x5F, 0x68, 0x35, 0xAF, 0x60, 0x9A},
-		[]byte{0xD8, 0x87, 0xE0, 0x39, 0x3C, 0x2D, 0xA6, 0xE3}},
-	{
-		[]byte{0x37, 0xD0, 0x6B, 0xB5, 0x16, 0xCB, 0x75, 0x46},
-		[]byte{0x16, 0x4D, 0x5E, 0x40, 0x4F, 0x27, 0x52, 0x32},
-		[]byte{0x5F, 0x99, 0xD0, 0x4F, 0x5B, 0x16, 0x39, 0x69}},
-	{
-		[]byte{0x1F, 0x08, 0x26, 0x0D, 0x1A, 0xC2, 0x46, 0x5E},
-		[]byte{0x6B, 0x05, 0x6E, 0x18, 0x75, 0x9F, 0x5C, 0xCA},
-		[]byte{0x4A, 0x05, 0x7A, 0x3B, 0x24, 0xD3, 0x97, 0x7B}},
-	{
-		[]byte{0x58, 0x40, 0x23, 0x64, 0x1A, 0xBA, 0x61, 0x76},
-		[]byte{0x00, 0x4B, 0xD6, 0xEF, 0x09, 0x17, 0x60, 0x62},
-		[]byte{0x45, 0x20, 0x31, 0xC1, 0xE4, 0xFA, 0xDA, 0x8E}},
-	{
-		[]byte{0x02, 0x58, 0x16, 0x16, 0x46, 0x29, 0xB0, 0x07},
-		[]byte{0x48, 0x0D, 0x39, 0x00, 0x6E, 0xE7, 0x62, 0xF2},
-		[]byte{0x75, 0x55, 0xAE, 0x39, 0xF5, 0x9B, 0x87, 0xBD}},
-	{
-		[]byte{0x49, 0x79, 0x3E, 0xBC, 0x79, 0xB3, 0x25, 0x8F},
-		[]byte{0x43, 0x75, 0x40, 0xC8, 0x69, 0x8F, 0x3C, 0xFA},
-		[]byte{0x53, 0xC5, 0x5F, 0x9C, 0xB4, 0x9F, 0xC0, 0x19}},
-	{
-		[]byte{0x4F, 0xB0, 0x5E, 0x15, 0x15, 0xAB, 0x73, 0xA7},
-		[]byte{0x07, 0x2D, 0x43, 0xA0, 0x77, 0x07, 0x52, 0x92},
-		[]byte{0x7A, 0x8E, 0x7B, 0xFA, 0x93, 0x7E, 0x89, 0xA3}},
-	{
-		[]byte{0x49, 0xE9, 0x5D, 0x6D, 0x4C, 0xA2, 0x29, 0xBF},
-		[]byte{0x02, 0xFE, 0x55, 0x77, 0x81, 0x17, 0xF1, 0x2A},
-		[]byte{0xCF, 0x9C, 0x5D, 0x7A, 0x49, 0x86, 0xAD, 0xB5}},
-	{
-		[]byte{0x01, 0x83, 0x10, 0xDC, 0x40, 0x9B, 0x26, 0xD6},
-		[]byte{0x1D, 0x9D, 0x5C, 0x50, 0x18, 0xF7, 0x28, 0xC2},
-		[]byte{0xD1, 0xAB, 0xB2, 0x90, 0x65, 0x8B, 0xC7, 0x78}},
-	{
-		[]byte{0x1C, 0x58, 0x7F, 0x1C, 0x13, 0x92, 0x4F, 0xEF},
-		[]byte{0x30, 0x55, 0x32, 0x28, 0x6D, 0x6F, 0x29, 0x5A},
-		[]byte{0x55, 0xCB, 0x37, 0x74, 0xD1, 0x3E, 0xF2, 0x01}},
-	{
-		[]byte{0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01},
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0xFA, 0x34, 0xEC, 0x48, 0x47, 0xB2, 0x68, 0xB2}},
-	{
-		[]byte{0x1F, 0x1F, 0x1F, 0x1F, 0x0E, 0x0E, 0x0E, 0x0E},
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0xA7, 0x90, 0x79, 0x51, 0x08, 0xEA, 0x3C, 0xAE}},
-	{
-		[]byte{0xE0, 0xFE, 0xE0, 0xFE, 0xF1, 0xFE, 0xF1, 0xFE},
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0xC3, 0x9E, 0x07, 0x2D, 0x9F, 0xAC, 0x63, 0x1D}},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		[]byte{0x01, 0x49, 0x33, 0xE0, 0xCD, 0xAF, 0xF6, 0xE4}},
-	{
-		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0xF2, 0x1E, 0x9A, 0x77, 0xB7, 0x1C, 0x49, 0xBC}},
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x24, 0x59, 0x46, 0x88, 0x57, 0x54, 0x36, 0x9A}},
-	{
-		[]byte{0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10},
-		[]byte{0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
-		[]byte{0x6B, 0x5C, 0x5A, 0x9C, 0x5D, 0x9E, 0x0A, 0x5A}},
-}
-
-func TestCipherEncrypt(t *testing.T) {
-	for i, tt := range encryptTests {
-		c, err := NewCipher(tt.key)
-		if err != nil {
-			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
-			continue
-		}
-		ct := make([]byte, len(tt.out))
-		c.Encrypt(ct, tt.in)
-		for j, v := range ct {
-			if v != tt.out[j] {
-				t.Errorf("Cipher.Encrypt, test vector #%d: cipher-text[%d] = %#x, expected %#x", i, j, v, tt.out[j])
-				break
-			}
-		}
-	}
-}
-
-func TestCipherDecrypt(t *testing.T) {
-	for i, tt := range encryptTests {
-		c, err := NewCipher(tt.key)
-		if err != nil {
-			t.Errorf("NewCipher(%d bytes) = %s", len(tt.key), err)
-			continue
-		}
-		pt := make([]byte, len(tt.in))
-		c.Decrypt(pt, tt.out)
-		for j, v := range pt {
-			if v != tt.in[j] {
-				t.Errorf("Cipher.Decrypt, test vector #%d: plain-text[%d] = %#x, expected %#x", i, j, v, tt.in[j])
-				break
-			}
-		}
-	}
-}
-
-func TestSaltedCipherKeyLength(t *testing.T) {
-	if _, err := NewSaltedCipher(nil, []byte{'a'}); err != KeySizeError(0) {
-		t.Errorf("NewSaltedCipher with short key, gave error %#v, expected %#v", err, KeySizeError(0))
-	}
-
-	// A 57-byte key. One over the typical blowfish restriction.
-	key := []byte("012345678901234567890123456789012345678901234567890123456")
-	if _, err := NewSaltedCipher(key, []byte{'a'}); err != nil {
-		t.Errorf("NewSaltedCipher with long key, gave error %#v", err)
-	}
-}
-
-// Test vectors generated with Blowfish from OpenSSH.
-var saltedVectors = [][8]byte{
-	{0x0c, 0x82, 0x3b, 0x7b, 0x8d, 0x01, 0x4b, 0x7e},
-	{0xd1, 0xe1, 0x93, 0xf0, 0x70, 0xa6, 0xdb, 0x12},
-	{0xfc, 0x5e, 0xba, 0xde, 0xcb, 0xf8, 0x59, 0xad},
-	{0x8a, 0x0c, 0x76, 0xe7, 0xdd, 0x2c, 0xd3, 0xa8},
-	{0x2c, 0xcb, 0x7b, 0xee, 0xac, 0x7b, 0x7f, 0xf8},
-	{0xbb, 0xf6, 0x30, 0x6f, 0xe1, 0x5d, 0x62, 0xbf},
-	{0x97, 0x1e, 0xc1, 0x3d, 0x3d, 0xe0, 0x11, 0xe9},
-	{0x06, 0xd7, 0x4d, 0xb1, 0x80, 0xa3, 0xb1, 0x38},
-	{0x67, 0xa1, 0xa9, 0x75, 0x0e, 0x5b, 0xc6, 0xb4},
-	{0x51, 0x0f, 0x33, 0x0e, 0x4f, 0x67, 0xd2, 0x0c},
-	{0xf1, 0x73, 0x7e, 0xd8, 0x44, 0xea, 0xdb, 0xe5},
-	{0x14, 0x0e, 0x16, 0xce, 0x7f, 0x4a, 0x9c, 0x7b},
-	{0x4b, 0xfe, 0x43, 0xfd, 0xbf, 0x36, 0x04, 0x47},
-	{0xb1, 0xeb, 0x3e, 0x15, 0x36, 0xa7, 0xbb, 0xe2},
-	{0x6d, 0x0b, 0x41, 0xdd, 0x00, 0x98, 0x0b, 0x19},
-	{0xd3, 0xce, 0x45, 0xce, 0x1d, 0x56, 0xb7, 0xfc},
-	{0xd9, 0xf0, 0xfd, 0xda, 0xc0, 0x23, 0xb7, 0x93},
-	{0x4c, 0x6f, 0xa1, 0xe4, 0x0c, 0xa8, 0xca, 0x57},
-	{0xe6, 0x2f, 0x28, 0xa7, 0x0c, 0x94, 0x0d, 0x08},
-	{0x8f, 0xe3, 0xf0, 0xb6, 0x29, 0xe3, 0x44, 0x03},
-	{0xff, 0x98, 0xdd, 0x04, 0x45, 0xb4, 0x6d, 0x1f},
-	{0x9e, 0x45, 0x4d, 0x18, 0x40, 0x53, 0xdb, 0xef},
-	{0xb7, 0x3b, 0xef, 0x29, 0xbe, 0xa8, 0x13, 0x71},
-	{0x02, 0x54, 0x55, 0x41, 0x8e, 0x04, 0xfc, 0xad},
-	{0x6a, 0x0a, 0xee, 0x7c, 0x10, 0xd9, 0x19, 0xfe},
-	{0x0a, 0x22, 0xd9, 0x41, 0xcc, 0x23, 0x87, 0x13},
-	{0x6e, 0xff, 0x1f, 0xff, 0x36, 0x17, 0x9c, 0xbe},
-	{0x79, 0xad, 0xb7, 0x40, 0xf4, 0x9f, 0x51, 0xa6},
-	{0x97, 0x81, 0x99, 0xa4, 0xde, 0x9e, 0x9f, 0xb6},
-	{0x12, 0x19, 0x7a, 0x28, 0xd0, 0xdc, 0xcc, 0x92},
-	{0x81, 0xda, 0x60, 0x1e, 0x0e, 0xdd, 0x65, 0x56},
-	{0x7d, 0x76, 0x20, 0xb2, 0x73, 0xc9, 0x9e, 0xee},
-}
-
-func TestSaltedCipher(t *testing.T) {
-	var key, salt [32]byte
-	for i := range key {
-		key[i] = byte(i)
-		salt[i] = byte(i + 32)
-	}
-	for i, v := range saltedVectors {
-		c, err := NewSaltedCipher(key[:], salt[:i])
-		if err != nil {
-			t.Fatal(err)
-		}
-		var buf [8]byte
-		c.Encrypt(buf[:], buf[:])
-		if v != buf {
-			t.Errorf("%d: expected %x, got %x", i, v, buf)
-		}
-	}
-}
-
-func BenchmarkExpandKeyWithSalt(b *testing.B) {
-	key := make([]byte, 32)
-	salt := make([]byte, 16)
-	c, _ := NewCipher(key)
-	for i := 0; i < b.N; i++ {
-		expandKeyWithSalt(key, salt, c)
-	}
-}
-
-func BenchmarkExpandKey(b *testing.B) {
-	key := make([]byte, 32)
-	c, _ := NewCipher(key)
-	for i := 0; i < b.N; i++ {
-		ExpandKey(key, c)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/blowfish/cipher.go b/installer/vendor/golang.org/x/crypto/blowfish/cipher.go
deleted file mode 100644
index 2641dadd64..0000000000
--- a/installer/vendor/golang.org/x/crypto/blowfish/cipher.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blowfish implements Bruce Schneier's Blowfish encryption algorithm.
-package blowfish // import "golang.org/x/crypto/blowfish"
-
-// The code is a port of Bruce Schneier's C implementation.
-// See https://www.schneier.com/blowfish.html.
-
-import "strconv"
-
-// The Blowfish block size in bytes.
-const BlockSize = 8
-
-// A Cipher is an instance of Blowfish encryption using a particular key.
-type Cipher struct {
-	p              [18]uint32
-	s0, s1, s2, s3 [256]uint32
-}
-
-type KeySizeError int
-
-func (k KeySizeError) Error() string {
-	return "crypto/blowfish: invalid key size " + strconv.Itoa(int(k))
-}
-
-// NewCipher creates and returns a Cipher.
-// The key argument should be the Blowfish key, from 1 to 56 bytes.
-func NewCipher(key []byte) (*Cipher, error) {
-	var result Cipher
-	if k := len(key); k < 1 || k > 56 {
-		return nil, KeySizeError(k)
-	}
-	initCipher(&result)
-	ExpandKey(key, &result)
-	return &result, nil
-}
-
-// NewSaltedCipher creates a returns a Cipher that folds a salt into its key
-// schedule. For most purposes, NewCipher, instead of NewSaltedCipher, is
-// sufficient and desirable. For bcrypt compatibility, the key can be over 56
-// bytes.
-func NewSaltedCipher(key, salt []byte) (*Cipher, error) {
-	if len(salt) == 0 {
-		return NewCipher(key)
-	}
-	var result Cipher
-	if k := len(key); k < 1 {
-		return nil, KeySizeError(k)
-	}
-	initCipher(&result)
-	expandKeyWithSalt(key, salt, &result)
-	return &result, nil
-}
-
-// BlockSize returns the Blowfish block size, 8 bytes.
-// It is necessary to satisfy the Block interface in the
-// package "crypto/cipher".
-func (c *Cipher) BlockSize() int { return BlockSize }
-
-// Encrypt encrypts the 8-byte buffer src using the key k
-// and stores the result in dst.
-// Note that for amounts of data larger than a block,
-// it is not safe to just call Encrypt on successive blocks;
-// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
-func (c *Cipher) Encrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-	l, r = encryptBlock(l, r, c)
-	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
-	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
-}
-
-// Decrypt decrypts the 8-byte buffer src using the key k
-// and stores the result in dst.
-func (c *Cipher) Decrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-	l, r = decryptBlock(l, r, c)
-	dst[0], dst[1], dst[2], dst[3] = byte(l>>24), byte(l>>16), byte(l>>8), byte(l)
-	dst[4], dst[5], dst[6], dst[7] = byte(r>>24), byte(r>>16), byte(r>>8), byte(r)
-}
-
-func initCipher(c *Cipher) {
-	copy(c.p[0:], p[0:])
-	copy(c.s0[0:], s0[0:])
-	copy(c.s1[0:], s1[0:])
-	copy(c.s2[0:], s2[0:])
-	copy(c.s3[0:], s3[0:])
-}
diff --git a/installer/vendor/golang.org/x/crypto/blowfish/const.go b/installer/vendor/golang.org/x/crypto/blowfish/const.go
deleted file mode 100644
index d04077595a..0000000000
--- a/installer/vendor/golang.org/x/crypto/blowfish/const.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The startup permutation array and substitution boxes.
-// They are the hexadecimal digits of PI; see:
-// https://www.schneier.com/code/constants.txt.
-
-package blowfish
-
-var s0 = [256]uint32{
-	0xd1310ba6, 0x98dfb5ac, 0x2ffd72db, 0xd01adfb7, 0xb8e1afed, 0x6a267e96,
-	0xba7c9045, 0xf12c7f99, 0x24a19947, 0xb3916cf7, 0x0801f2e2, 0x858efc16,
-	0x636920d8, 0x71574e69, 0xa458fea3, 0xf4933d7e, 0x0d95748f, 0x728eb658,
-	0x718bcd58, 0x82154aee, 0x7b54a41d, 0xc25a59b5, 0x9c30d539, 0x2af26013,
-	0xc5d1b023, 0x286085f0, 0xca417918, 0xb8db38ef, 0x8e79dcb0, 0x603a180e,
-	0x6c9e0e8b, 0xb01e8a3e, 0xd71577c1, 0xbd314b27, 0x78af2fda, 0x55605c60,
-	0xe65525f3, 0xaa55ab94, 0x57489862, 0x63e81440, 0x55ca396a, 0x2aab10b6,
-	0xb4cc5c34, 0x1141e8ce, 0xa15486af, 0x7c72e993, 0xb3ee1411, 0x636fbc2a,
-	0x2ba9c55d, 0x741831f6, 0xce5c3e16, 0x9b87931e, 0xafd6ba33, 0x6c24cf5c,
-	0x7a325381, 0x28958677, 0x3b8f4898, 0x6b4bb9af, 0xc4bfe81b, 0x66282193,
-	0x61d809cc, 0xfb21a991, 0x487cac60, 0x5dec8032, 0xef845d5d, 0xe98575b1,
-	0xdc262302, 0xeb651b88, 0x23893e81, 0xd396acc5, 0x0f6d6ff3, 0x83f44239,
-	0x2e0b4482, 0xa4842004, 0x69c8f04a, 0x9e1f9b5e, 0x21c66842, 0xf6e96c9a,
-	0x670c9c61, 0xabd388f0, 0x6a51a0d2, 0xd8542f68, 0x960fa728, 0xab5133a3,
-	0x6eef0b6c, 0x137a3be4, 0xba3bf050, 0x7efb2a98, 0xa1f1651d, 0x39af0176,
-	0x66ca593e, 0x82430e88, 0x8cee8619, 0x456f9fb4, 0x7d84a5c3, 0x3b8b5ebe,
-	0xe06f75d8, 0x85c12073, 0x401a449f, 0x56c16aa6, 0x4ed3aa62, 0x363f7706,
-	0x1bfedf72, 0x429b023d, 0x37d0d724, 0xd00a1248, 0xdb0fead3, 0x49f1c09b,
-	0x075372c9, 0x80991b7b, 0x25d479d8, 0xf6e8def7, 0xe3fe501a, 0xb6794c3b,
-	0x976ce0bd, 0x04c006ba, 0xc1a94fb6, 0x409f60c4, 0x5e5c9ec2, 0x196a2463,
-	0x68fb6faf, 0x3e6c53b5, 0x1339b2eb, 0x3b52ec6f, 0x6dfc511f, 0x9b30952c,
-	0xcc814544, 0xaf5ebd09, 0xbee3d004, 0xde334afd, 0x660f2807, 0x192e4bb3,
-	0xc0cba857, 0x45c8740f, 0xd20b5f39, 0xb9d3fbdb, 0x5579c0bd, 0x1a60320a,
-	0xd6a100c6, 0x402c7279, 0x679f25fe, 0xfb1fa3cc, 0x8ea5e9f8, 0xdb3222f8,
-	0x3c7516df, 0xfd616b15, 0x2f501ec8, 0xad0552ab, 0x323db5fa, 0xfd238760,
-	0x53317b48, 0x3e00df82, 0x9e5c57bb, 0xca6f8ca0, 0x1a87562e, 0xdf1769db,
-	0xd542a8f6, 0x287effc3, 0xac6732c6, 0x8c4f5573, 0x695b27b0, 0xbbca58c8,
-	0xe1ffa35d, 0xb8f011a0, 0x10fa3d98, 0xfd2183b8, 0x4afcb56c, 0x2dd1d35b,
-	0x9a53e479, 0xb6f84565, 0xd28e49bc, 0x4bfb9790, 0xe1ddf2da, 0xa4cb7e33,
-	0x62fb1341, 0xcee4c6e8, 0xef20cada, 0x36774c01, 0xd07e9efe, 0x2bf11fb4,
-	0x95dbda4d, 0xae909198, 0xeaad8e71, 0x6b93d5a0, 0xd08ed1d0, 0xafc725e0,
-	0x8e3c5b2f, 0x8e7594b7, 0x8ff6e2fb, 0xf2122b64, 0x8888b812, 0x900df01c,
-	0x4fad5ea0, 0x688fc31c, 0xd1cff191, 0xb3a8c1ad, 0x2f2f2218, 0xbe0e1777,
-	0xea752dfe, 0x8b021fa1, 0xe5a0cc0f, 0xb56f74e8, 0x18acf3d6, 0xce89e299,
-	0xb4a84fe0, 0xfd13e0b7, 0x7cc43b81, 0xd2ada8d9, 0x165fa266, 0x80957705,
-	0x93cc7314, 0x211a1477, 0xe6ad2065, 0x77b5fa86, 0xc75442f5, 0xfb9d35cf,
-	0xebcdaf0c, 0x7b3e89a0, 0xd6411bd3, 0xae1e7e49, 0x00250e2d, 0x2071b35e,
-	0x226800bb, 0x57b8e0af, 0x2464369b, 0xf009b91e, 0x5563911d, 0x59dfa6aa,
-	0x78c14389, 0xd95a537f, 0x207d5ba2, 0x02e5b9c5, 0x83260376, 0x6295cfa9,
-	0x11c81968, 0x4e734a41, 0xb3472dca, 0x7b14a94a, 0x1b510052, 0x9a532915,
-	0xd60f573f, 0xbc9bc6e4, 0x2b60a476, 0x81e67400, 0x08ba6fb5, 0x571be91f,
-	0xf296ec6b, 0x2a0dd915, 0xb6636521, 0xe7b9f9b6, 0xff34052e, 0xc5855664,
-	0x53b02d5d, 0xa99f8fa1, 0x08ba4799, 0x6e85076a,
-}
-
-var s1 = [256]uint32{
-	0x4b7a70e9, 0xb5b32944, 0xdb75092e, 0xc4192623, 0xad6ea6b0, 0x49a7df7d,
-	0x9cee60b8, 0x8fedb266, 0xecaa8c71, 0x699a17ff, 0x5664526c, 0xc2b19ee1,
-	0x193602a5, 0x75094c29, 0xa0591340, 0xe4183a3e, 0x3f54989a, 0x5b429d65,
-	0x6b8fe4d6, 0x99f73fd6, 0xa1d29c07, 0xefe830f5, 0x4d2d38e6, 0xf0255dc1,
-	0x4cdd2086, 0x8470eb26, 0x6382e9c6, 0x021ecc5e, 0x09686b3f, 0x3ebaefc9,
-	0x3c971814, 0x6b6a70a1, 0x687f3584, 0x52a0e286, 0xb79c5305, 0xaa500737,
-	0x3e07841c, 0x7fdeae5c, 0x8e7d44ec, 0x5716f2b8, 0xb03ada37, 0xf0500c0d,
-	0xf01c1f04, 0x0200b3ff, 0xae0cf51a, 0x3cb574b2, 0x25837a58, 0xdc0921bd,
-	0xd19113f9, 0x7ca92ff6, 0x94324773, 0x22f54701, 0x3ae5e581, 0x37c2dadc,
-	0xc8b57634, 0x9af3dda7, 0xa9446146, 0x0fd0030e, 0xecc8c73e, 0xa4751e41,
-	0xe238cd99, 0x3bea0e2f, 0x3280bba1, 0x183eb331, 0x4e548b38, 0x4f6db908,
-	0x6f420d03, 0xf60a04bf, 0x2cb81290, 0x24977c79, 0x5679b072, 0xbcaf89af,
-	0xde9a771f, 0xd9930810, 0xb38bae12, 0xdccf3f2e, 0x5512721f, 0x2e6b7124,
-	0x501adde6, 0x9f84cd87, 0x7a584718, 0x7408da17, 0xbc9f9abc, 0xe94b7d8c,
-	0xec7aec3a, 0xdb851dfa, 0x63094366, 0xc464c3d2, 0xef1c1847, 0x3215d908,
-	0xdd433b37, 0x24c2ba16, 0x12a14d43, 0x2a65c451, 0x50940002, 0x133ae4dd,
-	0x71dff89e, 0x10314e55, 0x81ac77d6, 0x5f11199b, 0x043556f1, 0xd7a3c76b,
-	0x3c11183b, 0x5924a509, 0xf28fe6ed, 0x97f1fbfa, 0x9ebabf2c, 0x1e153c6e,
-	0x86e34570, 0xeae96fb1, 0x860e5e0a, 0x5a3e2ab3, 0x771fe71c, 0x4e3d06fa,
-	0x2965dcb9, 0x99e71d0f, 0x803e89d6, 0x5266c825, 0x2e4cc978, 0x9c10b36a,
-	0xc6150eba, 0x94e2ea78, 0xa5fc3c53, 0x1e0a2df4, 0xf2f74ea7, 0x361d2b3d,
-	0x1939260f, 0x19c27960, 0x5223a708, 0xf71312b6, 0xebadfe6e, 0xeac31f66,
-	0xe3bc4595, 0xa67bc883, 0xb17f37d1, 0x018cff28, 0xc332ddef, 0xbe6c5aa5,
-	0x65582185, 0x68ab9802, 0xeecea50f, 0xdb2f953b, 0x2aef7dad, 0x5b6e2f84,
-	0x1521b628, 0x29076170, 0xecdd4775, 0x619f1510, 0x13cca830, 0xeb61bd96,
-	0x0334fe1e, 0xaa0363cf, 0xb5735c90, 0x4c70a239, 0xd59e9e0b, 0xcbaade14,
-	0xeecc86bc, 0x60622ca7, 0x9cab5cab, 0xb2f3846e, 0x648b1eaf, 0x19bdf0ca,
-	0xa02369b9, 0x655abb50, 0x40685a32, 0x3c2ab4b3, 0x319ee9d5, 0xc021b8f7,
-	0x9b540b19, 0x875fa099, 0x95f7997e, 0x623d7da8, 0xf837889a, 0x97e32d77,
-	0x11ed935f, 0x16681281, 0x0e358829, 0xc7e61fd6, 0x96dedfa1, 0x7858ba99,
-	0x57f584a5, 0x1b227263, 0x9b83c3ff, 0x1ac24696, 0xcdb30aeb, 0x532e3054,
-	0x8fd948e4, 0x6dbc3128, 0x58ebf2ef, 0x34c6ffea, 0xfe28ed61, 0xee7c3c73,
-	0x5d4a14d9, 0xe864b7e3, 0x42105d14, 0x203e13e0, 0x45eee2b6, 0xa3aaabea,
-	0xdb6c4f15, 0xfacb4fd0, 0xc742f442, 0xef6abbb5, 0x654f3b1d, 0x41cd2105,
-	0xd81e799e, 0x86854dc7, 0xe44b476a, 0x3d816250, 0xcf62a1f2, 0x5b8d2646,
-	0xfc8883a0, 0xc1c7b6a3, 0x7f1524c3, 0x69cb7492, 0x47848a0b, 0x5692b285,
-	0x095bbf00, 0xad19489d, 0x1462b174, 0x23820e00, 0x58428d2a, 0x0c55f5ea,
-	0x1dadf43e, 0x233f7061, 0x3372f092, 0x8d937e41, 0xd65fecf1, 0x6c223bdb,
-	0x7cde3759, 0xcbee7460, 0x4085f2a7, 0xce77326e, 0xa6078084, 0x19f8509e,
-	0xe8efd855, 0x61d99735, 0xa969a7aa, 0xc50c06c2, 0x5a04abfc, 0x800bcadc,
-	0x9e447a2e, 0xc3453484, 0xfdd56705, 0x0e1e9ec9, 0xdb73dbd3, 0x105588cd,
-	0x675fda79, 0xe3674340, 0xc5c43465, 0x713e38d8, 0x3d28f89e, 0xf16dff20,
-	0x153e21e7, 0x8fb03d4a, 0xe6e39f2b, 0xdb83adf7,
-}
-
-var s2 = [256]uint32{
-	0xe93d5a68, 0x948140f7, 0xf64c261c, 0x94692934, 0x411520f7, 0x7602d4f7,
-	0xbcf46b2e, 0xd4a20068, 0xd4082471, 0x3320f46a, 0x43b7d4b7, 0x500061af,
-	0x1e39f62e, 0x97244546, 0x14214f74, 0xbf8b8840, 0x4d95fc1d, 0x96b591af,
-	0x70f4ddd3, 0x66a02f45, 0xbfbc09ec, 0x03bd9785, 0x7fac6dd0, 0x31cb8504,
-	0x96eb27b3, 0x55fd3941, 0xda2547e6, 0xabca0a9a, 0x28507825, 0x530429f4,
-	0x0a2c86da, 0xe9b66dfb, 0x68dc1462, 0xd7486900, 0x680ec0a4, 0x27a18dee,
-	0x4f3ffea2, 0xe887ad8c, 0xb58ce006, 0x7af4d6b6, 0xaace1e7c, 0xd3375fec,
-	0xce78a399, 0x406b2a42, 0x20fe9e35, 0xd9f385b9, 0xee39d7ab, 0x3b124e8b,
-	0x1dc9faf7, 0x4b6d1856, 0x26a36631, 0xeae397b2, 0x3a6efa74, 0xdd5b4332,
-	0x6841e7f7, 0xca7820fb, 0xfb0af54e, 0xd8feb397, 0x454056ac, 0xba489527,
-	0x55533a3a, 0x20838d87, 0xfe6ba9b7, 0xd096954b, 0x55a867bc, 0xa1159a58,
-	0xcca92963, 0x99e1db33, 0xa62a4a56, 0x3f3125f9, 0x5ef47e1c, 0x9029317c,
-	0xfdf8e802, 0x04272f70, 0x80bb155c, 0x05282ce3, 0x95c11548, 0xe4c66d22,
-	0x48c1133f, 0xc70f86dc, 0x07f9c9ee, 0x41041f0f, 0x404779a4, 0x5d886e17,
-	0x325f51eb, 0xd59bc0d1, 0xf2bcc18f, 0x41113564, 0x257b7834, 0x602a9c60,
-	0xdff8e8a3, 0x1f636c1b, 0x0e12b4c2, 0x02e1329e, 0xaf664fd1, 0xcad18115,
-	0x6b2395e0, 0x333e92e1, 0x3b240b62, 0xeebeb922, 0x85b2a20e, 0xe6ba0d99,
-	0xde720c8c, 0x2da2f728, 0xd0127845, 0x95b794fd, 0x647d0862, 0xe7ccf5f0,
-	0x5449a36f, 0x877d48fa, 0xc39dfd27, 0xf33e8d1e, 0x0a476341, 0x992eff74,
-	0x3a6f6eab, 0xf4f8fd37, 0xa812dc60, 0xa1ebddf8, 0x991be14c, 0xdb6e6b0d,
-	0xc67b5510, 0x6d672c37, 0x2765d43b, 0xdcd0e804, 0xf1290dc7, 0xcc00ffa3,
-	0xb5390f92, 0x690fed0b, 0x667b9ffb, 0xcedb7d9c, 0xa091cf0b, 0xd9155ea3,
-	0xbb132f88, 0x515bad24, 0x7b9479bf, 0x763bd6eb, 0x37392eb3, 0xcc115979,
-	0x8026e297, 0xf42e312d, 0x6842ada7, 0xc66a2b3b, 0x12754ccc, 0x782ef11c,
-	0x6a124237, 0xb79251e7, 0x06a1bbe6, 0x4bfb6350, 0x1a6b1018, 0x11caedfa,
-	0x3d25bdd8, 0xe2e1c3c9, 0x44421659, 0x0a121386, 0xd90cec6e, 0xd5abea2a,
-	0x64af674e, 0xda86a85f, 0xbebfe988, 0x64e4c3fe, 0x9dbc8057, 0xf0f7c086,
-	0x60787bf8, 0x6003604d, 0xd1fd8346, 0xf6381fb0, 0x7745ae04, 0xd736fccc,
-	0x83426b33, 0xf01eab71, 0xb0804187, 0x3c005e5f, 0x77a057be, 0xbde8ae24,
-	0x55464299, 0xbf582e61, 0x4e58f48f, 0xf2ddfda2, 0xf474ef38, 0x8789bdc2,
-	0x5366f9c3, 0xc8b38e74, 0xb475f255, 0x46fcd9b9, 0x7aeb2661, 0x8b1ddf84,
-	0x846a0e79, 0x915f95e2, 0x466e598e, 0x20b45770, 0x8cd55591, 0xc902de4c,
-	0xb90bace1, 0xbb8205d0, 0x11a86248, 0x7574a99e, 0xb77f19b6, 0xe0a9dc09,
-	0x662d09a1, 0xc4324633, 0xe85a1f02, 0x09f0be8c, 0x4a99a025, 0x1d6efe10,
-	0x1ab93d1d, 0x0ba5a4df, 0xa186f20f, 0x2868f169, 0xdcb7da83, 0x573906fe,
-	0xa1e2ce9b, 0x4fcd7f52, 0x50115e01, 0xa70683fa, 0xa002b5c4, 0x0de6d027,
-	0x9af88c27, 0x773f8641, 0xc3604c06, 0x61a806b5, 0xf0177a28, 0xc0f586e0,
-	0x006058aa, 0x30dc7d62, 0x11e69ed7, 0x2338ea63, 0x53c2dd94, 0xc2c21634,
-	0xbbcbee56, 0x90bcb6de, 0xebfc7da1, 0xce591d76, 0x6f05e409, 0x4b7c0188,
-	0x39720a3d, 0x7c927c24, 0x86e3725f, 0x724d9db9, 0x1ac15bb4, 0xd39eb8fc,
-	0xed545578, 0x08fca5b5, 0xd83d7cd3, 0x4dad0fc4, 0x1e50ef5e, 0xb161e6f8,
-	0xa28514d9, 0x6c51133c, 0x6fd5c7e7, 0x56e14ec4, 0x362abfce, 0xddc6c837,
-	0xd79a3234, 0x92638212, 0x670efa8e, 0x406000e0,
-}
-
-var s3 = [256]uint32{
-	0x3a39ce37, 0xd3faf5cf, 0xabc27737, 0x5ac52d1b, 0x5cb0679e, 0x4fa33742,
-	0xd3822740, 0x99bc9bbe, 0xd5118e9d, 0xbf0f7315, 0xd62d1c7e, 0xc700c47b,
-	0xb78c1b6b, 0x21a19045, 0xb26eb1be, 0x6a366eb4, 0x5748ab2f, 0xbc946e79,
-	0xc6a376d2, 0x6549c2c8, 0x530ff8ee, 0x468dde7d, 0xd5730a1d, 0x4cd04dc6,
-	0x2939bbdb, 0xa9ba4650, 0xac9526e8, 0xbe5ee304, 0xa1fad5f0, 0x6a2d519a,
-	0x63ef8ce2, 0x9a86ee22, 0xc089c2b8, 0x43242ef6, 0xa51e03aa, 0x9cf2d0a4,
-	0x83c061ba, 0x9be96a4d, 0x8fe51550, 0xba645bd6, 0x2826a2f9, 0xa73a3ae1,
-	0x4ba99586, 0xef5562e9, 0xc72fefd3, 0xf752f7da, 0x3f046f69, 0x77fa0a59,
-	0x80e4a915, 0x87b08601, 0x9b09e6ad, 0x3b3ee593, 0xe990fd5a, 0x9e34d797,
-	0x2cf0b7d9, 0x022b8b51, 0x96d5ac3a, 0x017da67d, 0xd1cf3ed6, 0x7c7d2d28,
-	0x1f9f25cf, 0xadf2b89b, 0x5ad6b472, 0x5a88f54c, 0xe029ac71, 0xe019a5e6,
-	0x47b0acfd, 0xed93fa9b, 0xe8d3c48d, 0x283b57cc, 0xf8d56629, 0x79132e28,
-	0x785f0191, 0xed756055, 0xf7960e44, 0xe3d35e8c, 0x15056dd4, 0x88f46dba,
-	0x03a16125, 0x0564f0bd, 0xc3eb9e15, 0x3c9057a2, 0x97271aec, 0xa93a072a,
-	0x1b3f6d9b, 0x1e6321f5, 0xf59c66fb, 0x26dcf319, 0x7533d928, 0xb155fdf5,
-	0x03563482, 0x8aba3cbb, 0x28517711, 0xc20ad9f8, 0xabcc5167, 0xccad925f,
-	0x4de81751, 0x3830dc8e, 0x379d5862, 0x9320f991, 0xea7a90c2, 0xfb3e7bce,
-	0x5121ce64, 0x774fbe32, 0xa8b6e37e, 0xc3293d46, 0x48de5369, 0x6413e680,
-	0xa2ae0810, 0xdd6db224, 0x69852dfd, 0x09072166, 0xb39a460a, 0x6445c0dd,
-	0x586cdecf, 0x1c20c8ae, 0x5bbef7dd, 0x1b588d40, 0xccd2017f, 0x6bb4e3bb,
-	0xdda26a7e, 0x3a59ff45, 0x3e350a44, 0xbcb4cdd5, 0x72eacea8, 0xfa6484bb,
-	0x8d6612ae, 0xbf3c6f47, 0xd29be463, 0x542f5d9e, 0xaec2771b, 0xf64e6370,
-	0x740e0d8d, 0xe75b1357, 0xf8721671, 0xaf537d5d, 0x4040cb08, 0x4eb4e2cc,
-	0x34d2466a, 0x0115af84, 0xe1b00428, 0x95983a1d, 0x06b89fb4, 0xce6ea048,
-	0x6f3f3b82, 0x3520ab82, 0x011a1d4b, 0x277227f8, 0x611560b1, 0xe7933fdc,
-	0xbb3a792b, 0x344525bd, 0xa08839e1, 0x51ce794b, 0x2f32c9b7, 0xa01fbac9,
-	0xe01cc87e, 0xbcc7d1f6, 0xcf0111c3, 0xa1e8aac7, 0x1a908749, 0xd44fbd9a,
-	0xd0dadecb, 0xd50ada38, 0x0339c32a, 0xc6913667, 0x8df9317c, 0xe0b12b4f,
-	0xf79e59b7, 0x43f5bb3a, 0xf2d519ff, 0x27d9459c, 0xbf97222c, 0x15e6fc2a,
-	0x0f91fc71, 0x9b941525, 0xfae59361, 0xceb69ceb, 0xc2a86459, 0x12baa8d1,
-	0xb6c1075e, 0xe3056a0c, 0x10d25065, 0xcb03a442, 0xe0ec6e0e, 0x1698db3b,
-	0x4c98a0be, 0x3278e964, 0x9f1f9532, 0xe0d392df, 0xd3a0342b, 0x8971f21e,
-	0x1b0a7441, 0x4ba3348c, 0xc5be7120, 0xc37632d8, 0xdf359f8d, 0x9b992f2e,
-	0xe60b6f47, 0x0fe3f11d, 0xe54cda54, 0x1edad891, 0xce6279cf, 0xcd3e7e6f,
-	0x1618b166, 0xfd2c1d05, 0x848fd2c5, 0xf6fb2299, 0xf523f357, 0xa6327623,
-	0x93a83531, 0x56cccd02, 0xacf08162, 0x5a75ebb5, 0x6e163697, 0x88d273cc,
-	0xde966292, 0x81b949d0, 0x4c50901b, 0x71c65614, 0xe6c6c7bd, 0x327a140a,
-	0x45e1d006, 0xc3f27b9a, 0xc9aa53fd, 0x62a80f00, 0xbb25bfe2, 0x35bdd2f6,
-	0x71126905, 0xb2040222, 0xb6cbcf7c, 0xcd769c2b, 0x53113ec0, 0x1640e3d3,
-	0x38abbd60, 0x2547adf0, 0xba38209c, 0xf746ce76, 0x77afa1c5, 0x20756060,
-	0x85cbfe4e, 0x8ae88dd8, 0x7aaaf9b0, 0x4cf9aa7e, 0x1948c25c, 0x02fb8a8c,
-	0x01c36ae4, 0xd6ebe1f9, 0x90d4f869, 0xa65cdea0, 0x3f09252d, 0xc208e69f,
-	0xb74e6132, 0xce77e25b, 0x578fdfe3, 0x3ac372e6,
-}
-
-var p = [18]uint32{
-	0x243f6a88, 0x85a308d3, 0x13198a2e, 0x03707344, 0xa4093822, 0x299f31d0,
-	0x082efa98, 0xec4e6c89, 0x452821e6, 0x38d01377, 0xbe5466cf, 0x34e90c6c,
-	0xc0ac29b7, 0xc97c50dd, 0x3f84d5b5, 0xb5470917, 0x9216d5d9, 0x8979fb1b,
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/bn256.go b/installer/vendor/golang.org/x/crypto/bn256/bn256.go
deleted file mode 100644
index 014f8b3557..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/bn256.go
+++ /dev/null
@@ -1,404 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package bn256 implements a particular bilinear group at the 128-bit security level.
-//
-// Bilinear groups are the basis of many of the new cryptographic protocols
-// that have been proposed over the past decade. They consist of a triplet of
-// groups (G₁, G₂ and GT) such that there exists a function e(g₁ˣ,g₂ʸ)=gTˣʸ
-// (where gₓ is a generator of the respective group). That function is called
-// a pairing function.
-//
-// This package specifically implements the Optimal Ate pairing over a 256-bit
-// Barreto-Naehrig curve as described in
-// http://cryptojedi.org/papers/dclxvi-20100714.pdf. Its output is compatible
-// with the implementation described in that paper.
-package bn256 // import "golang.org/x/crypto/bn256"
-
-import (
-	"crypto/rand"
-	"io"
-	"math/big"
-)
-
-// BUG(agl): this implementation is not constant time.
-// TODO(agl): keep GF(p²) elements in Mongomery form.
-
-// G1 is an abstract cyclic group. The zero value is suitable for use as the
-// output of an operation, but cannot be used as an input.
-type G1 struct {
-	p *curvePoint
-}
-
-// RandomG1 returns x and g₁ˣ where x is a random, non-zero number read from r.
-func RandomG1(r io.Reader) (*big.Int, *G1, error) {
-	var k *big.Int
-	var err error
-
-	for {
-		k, err = rand.Int(r, Order)
-		if err != nil {
-			return nil, nil, err
-		}
-		if k.Sign() > 0 {
-			break
-		}
-	}
-
-	return k, new(G1).ScalarBaseMult(k), nil
-}
-
-func (g *G1) String() string {
-	return "bn256.G1" + g.p.String()
-}
-
-// ScalarBaseMult sets e to g*k where g is the generator of the group and
-// then returns e.
-func (e *G1) ScalarBaseMult(k *big.Int) *G1 {
-	if e.p == nil {
-		e.p = newCurvePoint(nil)
-	}
-	e.p.Mul(curveGen, k, new(bnPool))
-	return e
-}
-
-// ScalarMult sets e to a*k and then returns e.
-func (e *G1) ScalarMult(a *G1, k *big.Int) *G1 {
-	if e.p == nil {
-		e.p = newCurvePoint(nil)
-	}
-	e.p.Mul(a.p, k, new(bnPool))
-	return e
-}
-
-// Add sets e to a+b and then returns e.
-// BUG(agl): this function is not complete: a==b fails.
-func (e *G1) Add(a, b *G1) *G1 {
-	if e.p == nil {
-		e.p = newCurvePoint(nil)
-	}
-	e.p.Add(a.p, b.p, new(bnPool))
-	return e
-}
-
-// Neg sets e to -a and then returns e.
-func (e *G1) Neg(a *G1) *G1 {
-	if e.p == nil {
-		e.p = newCurvePoint(nil)
-	}
-	e.p.Negative(a.p)
-	return e
-}
-
-// Marshal converts n to a byte slice.
-func (n *G1) Marshal() []byte {
-	n.p.MakeAffine(nil)
-
-	xBytes := new(big.Int).Mod(n.p.x, p).Bytes()
-	yBytes := new(big.Int).Mod(n.p.y, p).Bytes()
-
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	ret := make([]byte, numBytes*2)
-	copy(ret[1*numBytes-len(xBytes):], xBytes)
-	copy(ret[2*numBytes-len(yBytes):], yBytes)
-
-	return ret
-}
-
-// Unmarshal sets e to the result of converting the output of Marshal back into
-// a group element and then returns e.
-func (e *G1) Unmarshal(m []byte) (*G1, bool) {
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	if len(m) != 2*numBytes {
-		return nil, false
-	}
-
-	if e.p == nil {
-		e.p = newCurvePoint(nil)
-	}
-
-	e.p.x.SetBytes(m[0*numBytes : 1*numBytes])
-	e.p.y.SetBytes(m[1*numBytes : 2*numBytes])
-
-	if e.p.x.Sign() == 0 && e.p.y.Sign() == 0 {
-		// This is the point at infinity.
-		e.p.y.SetInt64(1)
-		e.p.z.SetInt64(0)
-		e.p.t.SetInt64(0)
-	} else {
-		e.p.z.SetInt64(1)
-		e.p.t.SetInt64(1)
-
-		if !e.p.IsOnCurve() {
-			return nil, false
-		}
-	}
-
-	return e, true
-}
-
-// G2 is an abstract cyclic group. The zero value is suitable for use as the
-// output of an operation, but cannot be used as an input.
-type G2 struct {
-	p *twistPoint
-}
-
-// RandomG1 returns x and g₂ˣ where x is a random, non-zero number read from r.
-func RandomG2(r io.Reader) (*big.Int, *G2, error) {
-	var k *big.Int
-	var err error
-
-	for {
-		k, err = rand.Int(r, Order)
-		if err != nil {
-			return nil, nil, err
-		}
-		if k.Sign() > 0 {
-			break
-		}
-	}
-
-	return k, new(G2).ScalarBaseMult(k), nil
-}
-
-func (g *G2) String() string {
-	return "bn256.G2" + g.p.String()
-}
-
-// ScalarBaseMult sets e to g*k where g is the generator of the group and
-// then returns out.
-func (e *G2) ScalarBaseMult(k *big.Int) *G2 {
-	if e.p == nil {
-		e.p = newTwistPoint(nil)
-	}
-	e.p.Mul(twistGen, k, new(bnPool))
-	return e
-}
-
-// ScalarMult sets e to a*k and then returns e.
-func (e *G2) ScalarMult(a *G2, k *big.Int) *G2 {
-	if e.p == nil {
-		e.p = newTwistPoint(nil)
-	}
-	e.p.Mul(a.p, k, new(bnPool))
-	return e
-}
-
-// Add sets e to a+b and then returns e.
-// BUG(agl): this function is not complete: a==b fails.
-func (e *G2) Add(a, b *G2) *G2 {
-	if e.p == nil {
-		e.p = newTwistPoint(nil)
-	}
-	e.p.Add(a.p, b.p, new(bnPool))
-	return e
-}
-
-// Marshal converts n into a byte slice.
-func (n *G2) Marshal() []byte {
-	n.p.MakeAffine(nil)
-
-	xxBytes := new(big.Int).Mod(n.p.x.x, p).Bytes()
-	xyBytes := new(big.Int).Mod(n.p.x.y, p).Bytes()
-	yxBytes := new(big.Int).Mod(n.p.y.x, p).Bytes()
-	yyBytes := new(big.Int).Mod(n.p.y.y, p).Bytes()
-
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	ret := make([]byte, numBytes*4)
-	copy(ret[1*numBytes-len(xxBytes):], xxBytes)
-	copy(ret[2*numBytes-len(xyBytes):], xyBytes)
-	copy(ret[3*numBytes-len(yxBytes):], yxBytes)
-	copy(ret[4*numBytes-len(yyBytes):], yyBytes)
-
-	return ret
-}
-
-// Unmarshal sets e to the result of converting the output of Marshal back into
-// a group element and then returns e.
-func (e *G2) Unmarshal(m []byte) (*G2, bool) {
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	if len(m) != 4*numBytes {
-		return nil, false
-	}
-
-	if e.p == nil {
-		e.p = newTwistPoint(nil)
-	}
-
-	e.p.x.x.SetBytes(m[0*numBytes : 1*numBytes])
-	e.p.x.y.SetBytes(m[1*numBytes : 2*numBytes])
-	e.p.y.x.SetBytes(m[2*numBytes : 3*numBytes])
-	e.p.y.y.SetBytes(m[3*numBytes : 4*numBytes])
-
-	if e.p.x.x.Sign() == 0 &&
-		e.p.x.y.Sign() == 0 &&
-		e.p.y.x.Sign() == 0 &&
-		e.p.y.y.Sign() == 0 {
-		// This is the point at infinity.
-		e.p.y.SetOne()
-		e.p.z.SetZero()
-		e.p.t.SetZero()
-	} else {
-		e.p.z.SetOne()
-		e.p.t.SetOne()
-
-		if !e.p.IsOnCurve() {
-			return nil, false
-		}
-	}
-
-	return e, true
-}
-
-// GT is an abstract cyclic group. The zero value is suitable for use as the
-// output of an operation, but cannot be used as an input.
-type GT struct {
-	p *gfP12
-}
-
-func (g *GT) String() string {
-	return "bn256.GT" + g.p.String()
-}
-
-// ScalarMult sets e to a*k and then returns e.
-func (e *GT) ScalarMult(a *GT, k *big.Int) *GT {
-	if e.p == nil {
-		e.p = newGFp12(nil)
-	}
-	e.p.Exp(a.p, k, new(bnPool))
-	return e
-}
-
-// Add sets e to a+b and then returns e.
-func (e *GT) Add(a, b *GT) *GT {
-	if e.p == nil {
-		e.p = newGFp12(nil)
-	}
-	e.p.Mul(a.p, b.p, new(bnPool))
-	return e
-}
-
-// Neg sets e to -a and then returns e.
-func (e *GT) Neg(a *GT) *GT {
-	if e.p == nil {
-		e.p = newGFp12(nil)
-	}
-	e.p.Invert(a.p, new(bnPool))
-	return e
-}
-
-// Marshal converts n into a byte slice.
-func (n *GT) Marshal() []byte {
-	n.p.Minimal()
-
-	xxxBytes := n.p.x.x.x.Bytes()
-	xxyBytes := n.p.x.x.y.Bytes()
-	xyxBytes := n.p.x.y.x.Bytes()
-	xyyBytes := n.p.x.y.y.Bytes()
-	xzxBytes := n.p.x.z.x.Bytes()
-	xzyBytes := n.p.x.z.y.Bytes()
-	yxxBytes := n.p.y.x.x.Bytes()
-	yxyBytes := n.p.y.x.y.Bytes()
-	yyxBytes := n.p.y.y.x.Bytes()
-	yyyBytes := n.p.y.y.y.Bytes()
-	yzxBytes := n.p.y.z.x.Bytes()
-	yzyBytes := n.p.y.z.y.Bytes()
-
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	ret := make([]byte, numBytes*12)
-	copy(ret[1*numBytes-len(xxxBytes):], xxxBytes)
-	copy(ret[2*numBytes-len(xxyBytes):], xxyBytes)
-	copy(ret[3*numBytes-len(xyxBytes):], xyxBytes)
-	copy(ret[4*numBytes-len(xyyBytes):], xyyBytes)
-	copy(ret[5*numBytes-len(xzxBytes):], xzxBytes)
-	copy(ret[6*numBytes-len(xzyBytes):], xzyBytes)
-	copy(ret[7*numBytes-len(yxxBytes):], yxxBytes)
-	copy(ret[8*numBytes-len(yxyBytes):], yxyBytes)
-	copy(ret[9*numBytes-len(yyxBytes):], yyxBytes)
-	copy(ret[10*numBytes-len(yyyBytes):], yyyBytes)
-	copy(ret[11*numBytes-len(yzxBytes):], yzxBytes)
-	copy(ret[12*numBytes-len(yzyBytes):], yzyBytes)
-
-	return ret
-}
-
-// Unmarshal sets e to the result of converting the output of Marshal back into
-// a group element and then returns e.
-func (e *GT) Unmarshal(m []byte) (*GT, bool) {
-	// Each value is a 256-bit number.
-	const numBytes = 256 / 8
-
-	if len(m) != 12*numBytes {
-		return nil, false
-	}
-
-	if e.p == nil {
-		e.p = newGFp12(nil)
-	}
-
-	e.p.x.x.x.SetBytes(m[0*numBytes : 1*numBytes])
-	e.p.x.x.y.SetBytes(m[1*numBytes : 2*numBytes])
-	e.p.x.y.x.SetBytes(m[2*numBytes : 3*numBytes])
-	e.p.x.y.y.SetBytes(m[3*numBytes : 4*numBytes])
-	e.p.x.z.x.SetBytes(m[4*numBytes : 5*numBytes])
-	e.p.x.z.y.SetBytes(m[5*numBytes : 6*numBytes])
-	e.p.y.x.x.SetBytes(m[6*numBytes : 7*numBytes])
-	e.p.y.x.y.SetBytes(m[7*numBytes : 8*numBytes])
-	e.p.y.y.x.SetBytes(m[8*numBytes : 9*numBytes])
-	e.p.y.y.y.SetBytes(m[9*numBytes : 10*numBytes])
-	e.p.y.z.x.SetBytes(m[10*numBytes : 11*numBytes])
-	e.p.y.z.y.SetBytes(m[11*numBytes : 12*numBytes])
-
-	return e, true
-}
-
-// Pair calculates an Optimal Ate pairing.
-func Pair(g1 *G1, g2 *G2) *GT {
-	return &GT{optimalAte(g2.p, g1.p, new(bnPool))}
-}
-
-// bnPool implements a tiny cache of *big.Int objects that's used to reduce the
-// number of allocations made during processing.
-type bnPool struct {
-	bns   []*big.Int
-	count int
-}
-
-func (pool *bnPool) Get() *big.Int {
-	if pool == nil {
-		return new(big.Int)
-	}
-
-	pool.count++
-	l := len(pool.bns)
-	if l == 0 {
-		return new(big.Int)
-	}
-
-	bn := pool.bns[l-1]
-	pool.bns = pool.bns[:l-1]
-	return bn
-}
-
-func (pool *bnPool) Put(bn *big.Int) {
-	if pool == nil {
-		return
-	}
-	pool.bns = append(pool.bns, bn)
-	pool.count--
-}
-
-func (pool *bnPool) Count() int {
-	return pool.count
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/bn256_test.go b/installer/vendor/golang.org/x/crypto/bn256/bn256_test.go
deleted file mode 100644
index 1cec3884ec..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/bn256_test.go
+++ /dev/null
@@ -1,304 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-import (
-	"bytes"
-	"crypto/rand"
-	"math/big"
-	"testing"
-)
-
-func TestGFp2Invert(t *testing.T) {
-	pool := new(bnPool)
-
-	a := newGFp2(pool)
-	a.x.SetString("23423492374", 10)
-	a.y.SetString("12934872398472394827398470", 10)
-
-	inv := newGFp2(pool)
-	inv.Invert(a, pool)
-
-	b := newGFp2(pool).Mul(inv, a, pool)
-	if b.x.Int64() != 0 || b.y.Int64() != 1 {
-		t.Fatalf("bad result for a^-1*a: %s %s", b.x, b.y)
-	}
-
-	a.Put(pool)
-	b.Put(pool)
-	inv.Put(pool)
-
-	if c := pool.Count(); c > 0 {
-		t.Errorf("Pool count non-zero: %d\n", c)
-	}
-}
-
-func isZero(n *big.Int) bool {
-	return new(big.Int).Mod(n, p).Int64() == 0
-}
-
-func isOne(n *big.Int) bool {
-	return new(big.Int).Mod(n, p).Int64() == 1
-}
-
-func TestGFp6Invert(t *testing.T) {
-	pool := new(bnPool)
-
-	a := newGFp6(pool)
-	a.x.x.SetString("239487238491", 10)
-	a.x.y.SetString("2356249827341", 10)
-	a.y.x.SetString("082659782", 10)
-	a.y.y.SetString("182703523765", 10)
-	a.z.x.SetString("978236549263", 10)
-	a.z.y.SetString("64893242", 10)
-
-	inv := newGFp6(pool)
-	inv.Invert(a, pool)
-
-	b := newGFp6(pool).Mul(inv, a, pool)
-	if !isZero(b.x.x) ||
-		!isZero(b.x.y) ||
-		!isZero(b.y.x) ||
-		!isZero(b.y.y) ||
-		!isZero(b.z.x) ||
-		!isOne(b.z.y) {
-		t.Fatalf("bad result for a^-1*a: %s", b)
-	}
-
-	a.Put(pool)
-	b.Put(pool)
-	inv.Put(pool)
-
-	if c := pool.Count(); c > 0 {
-		t.Errorf("Pool count non-zero: %d\n", c)
-	}
-}
-
-func TestGFp12Invert(t *testing.T) {
-	pool := new(bnPool)
-
-	a := newGFp12(pool)
-	a.x.x.x.SetString("239846234862342323958623", 10)
-	a.x.x.y.SetString("2359862352529835623", 10)
-	a.x.y.x.SetString("928836523", 10)
-	a.x.y.y.SetString("9856234", 10)
-	a.x.z.x.SetString("235635286", 10)
-	a.x.z.y.SetString("5628392833", 10)
-	a.y.x.x.SetString("252936598265329856238956532167968", 10)
-	a.y.x.y.SetString("23596239865236954178968", 10)
-	a.y.y.x.SetString("95421692834", 10)
-	a.y.y.y.SetString("236548", 10)
-	a.y.z.x.SetString("924523", 10)
-	a.y.z.y.SetString("12954623", 10)
-
-	inv := newGFp12(pool)
-	inv.Invert(a, pool)
-
-	b := newGFp12(pool).Mul(inv, a, pool)
-	if !isZero(b.x.x.x) ||
-		!isZero(b.x.x.y) ||
-		!isZero(b.x.y.x) ||
-		!isZero(b.x.y.y) ||
-		!isZero(b.x.z.x) ||
-		!isZero(b.x.z.y) ||
-		!isZero(b.y.x.x) ||
-		!isZero(b.y.x.y) ||
-		!isZero(b.y.y.x) ||
-		!isZero(b.y.y.y) ||
-		!isZero(b.y.z.x) ||
-		!isOne(b.y.z.y) {
-		t.Fatalf("bad result for a^-1*a: %s", b)
-	}
-
-	a.Put(pool)
-	b.Put(pool)
-	inv.Put(pool)
-
-	if c := pool.Count(); c > 0 {
-		t.Errorf("Pool count non-zero: %d\n", c)
-	}
-}
-
-func TestCurveImpl(t *testing.T) {
-	pool := new(bnPool)
-
-	g := &curvePoint{
-		pool.Get().SetInt64(1),
-		pool.Get().SetInt64(-2),
-		pool.Get().SetInt64(1),
-		pool.Get().SetInt64(0),
-	}
-
-	x := pool.Get().SetInt64(32498273234)
-	X := newCurvePoint(pool).Mul(g, x, pool)
-
-	y := pool.Get().SetInt64(98732423523)
-	Y := newCurvePoint(pool).Mul(g, y, pool)
-
-	s1 := newCurvePoint(pool).Mul(X, y, pool).MakeAffine(pool)
-	s2 := newCurvePoint(pool).Mul(Y, x, pool).MakeAffine(pool)
-
-	if s1.x.Cmp(s2.x) != 0 ||
-		s2.x.Cmp(s1.x) != 0 {
-		t.Errorf("DH points don't match: (%s, %s) (%s, %s)", s1.x, s1.y, s2.x, s2.y)
-	}
-
-	pool.Put(x)
-	X.Put(pool)
-	pool.Put(y)
-	Y.Put(pool)
-	s1.Put(pool)
-	s2.Put(pool)
-	g.Put(pool)
-
-	if c := pool.Count(); c > 0 {
-		t.Errorf("Pool count non-zero: %d\n", c)
-	}
-}
-
-func TestOrderG1(t *testing.T) {
-	g := new(G1).ScalarBaseMult(Order)
-	if !g.p.IsInfinity() {
-		t.Error("G1 has incorrect order")
-	}
-
-	one := new(G1).ScalarBaseMult(new(big.Int).SetInt64(1))
-	g.Add(g, one)
-	g.p.MakeAffine(nil)
-	if g.p.x.Cmp(one.p.x) != 0 || g.p.y.Cmp(one.p.y) != 0 {
-		t.Errorf("1+0 != 1 in G1")
-	}
-}
-
-func TestOrderG2(t *testing.T) {
-	g := new(G2).ScalarBaseMult(Order)
-	if !g.p.IsInfinity() {
-		t.Error("G2 has incorrect order")
-	}
-
-	one := new(G2).ScalarBaseMult(new(big.Int).SetInt64(1))
-	g.Add(g, one)
-	g.p.MakeAffine(nil)
-	if g.p.x.x.Cmp(one.p.x.x) != 0 ||
-		g.p.x.y.Cmp(one.p.x.y) != 0 ||
-		g.p.y.x.Cmp(one.p.y.x) != 0 ||
-		g.p.y.y.Cmp(one.p.y.y) != 0 {
-		t.Errorf("1+0 != 1 in G2")
-	}
-}
-
-func TestOrderGT(t *testing.T) {
-	gt := Pair(&G1{curveGen}, &G2{twistGen})
-	g := new(GT).ScalarMult(gt, Order)
-	if !g.p.IsOne() {
-		t.Error("GT has incorrect order")
-	}
-}
-
-func TestBilinearity(t *testing.T) {
-	for i := 0; i < 2; i++ {
-		a, p1, _ := RandomG1(rand.Reader)
-		b, p2, _ := RandomG2(rand.Reader)
-		e1 := Pair(p1, p2)
-
-		e2 := Pair(&G1{curveGen}, &G2{twistGen})
-		e2.ScalarMult(e2, a)
-		e2.ScalarMult(e2, b)
-
-		minusE2 := new(GT).Neg(e2)
-		e1.Add(e1, minusE2)
-
-		if !e1.p.IsOne() {
-			t.Fatalf("bad pairing result: %s", e1)
-		}
-	}
-}
-
-func TestG1Marshal(t *testing.T) {
-	g := new(G1).ScalarBaseMult(new(big.Int).SetInt64(1))
-	form := g.Marshal()
-	_, ok := new(G1).Unmarshal(form)
-	if !ok {
-		t.Fatalf("failed to unmarshal")
-	}
-
-	g.ScalarBaseMult(Order)
-	form = g.Marshal()
-	g2, ok := new(G1).Unmarshal(form)
-	if !ok {
-		t.Fatalf("failed to unmarshal ∞")
-	}
-	if !g2.p.IsInfinity() {
-		t.Fatalf("∞ unmarshaled incorrectly")
-	}
-}
-
-func TestG2Marshal(t *testing.T) {
-	g := new(G2).ScalarBaseMult(new(big.Int).SetInt64(1))
-	form := g.Marshal()
-	_, ok := new(G2).Unmarshal(form)
-	if !ok {
-		t.Fatalf("failed to unmarshal")
-	}
-
-	g.ScalarBaseMult(Order)
-	form = g.Marshal()
-	g2, ok := new(G2).Unmarshal(form)
-	if !ok {
-		t.Fatalf("failed to unmarshal ∞")
-	}
-	if !g2.p.IsInfinity() {
-		t.Fatalf("∞ unmarshaled incorrectly")
-	}
-}
-
-func TestG1Identity(t *testing.T) {
-	g := new(G1).ScalarBaseMult(new(big.Int).SetInt64(0))
-	if !g.p.IsInfinity() {
-		t.Error("failure")
-	}
-}
-
-func TestG2Identity(t *testing.T) {
-	g := new(G2).ScalarBaseMult(new(big.Int).SetInt64(0))
-	if !g.p.IsInfinity() {
-		t.Error("failure")
-	}
-}
-
-func TestTripartiteDiffieHellman(t *testing.T) {
-	a, _ := rand.Int(rand.Reader, Order)
-	b, _ := rand.Int(rand.Reader, Order)
-	c, _ := rand.Int(rand.Reader, Order)
-
-	pa, _ := new(G1).Unmarshal(new(G1).ScalarBaseMult(a).Marshal())
-	qa, _ := new(G2).Unmarshal(new(G2).ScalarBaseMult(a).Marshal())
-	pb, _ := new(G1).Unmarshal(new(G1).ScalarBaseMult(b).Marshal())
-	qb, _ := new(G2).Unmarshal(new(G2).ScalarBaseMult(b).Marshal())
-	pc, _ := new(G1).Unmarshal(new(G1).ScalarBaseMult(c).Marshal())
-	qc, _ := new(G2).Unmarshal(new(G2).ScalarBaseMult(c).Marshal())
-
-	k1 := Pair(pb, qc)
-	k1.ScalarMult(k1, a)
-	k1Bytes := k1.Marshal()
-
-	k2 := Pair(pc, qa)
-	k2.ScalarMult(k2, b)
-	k2Bytes := k2.Marshal()
-
-	k3 := Pair(pa, qb)
-	k3.ScalarMult(k3, c)
-	k3Bytes := k3.Marshal()
-
-	if !bytes.Equal(k1Bytes, k2Bytes) || !bytes.Equal(k2Bytes, k3Bytes) {
-		t.Errorf("keys didn't agree")
-	}
-}
-
-func BenchmarkPairing(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Pair(&G1{curveGen}, &G2{twistGen})
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/constants.go b/installer/vendor/golang.org/x/crypto/bn256/constants.go
deleted file mode 100644
index 1ccefc4982..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/constants.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-import (
-	"math/big"
-)
-
-func bigFromBase10(s string) *big.Int {
-	n, _ := new(big.Int).SetString(s, 10)
-	return n
-}
-
-// u is the BN parameter that determines the prime: 1868033³.
-var u = bigFromBase10("6518589491078791937")
-
-// p is a prime over which we form a basic field: 36u⁴+36u³+24u²+6u+1.
-var p = bigFromBase10("65000549695646603732796438742359905742825358107623003571877145026864184071783")
-
-// Order is the number of elements in both G₁ and G₂: 36u⁴+36u³+18u²+6u+1.
-var Order = bigFromBase10("65000549695646603732796438742359905742570406053903786389881062969044166799969")
-
-// xiToPMinus1Over6 is ξ^((p-1)/6) where ξ = i+3.
-var xiToPMinus1Over6 = &gfP2{bigFromBase10("8669379979083712429711189836753509758585994370025260553045152614783263110636"), bigFromBase10("19998038925833620163537568958541907098007303196759855091367510456613536016040")}
-
-// xiToPMinus1Over3 is ξ^((p-1)/3) where ξ = i+3.
-var xiToPMinus1Over3 = &gfP2{bigFromBase10("26098034838977895781559542626833399156321265654106457577426020397262786167059"), bigFromBase10("15931493369629630809226283458085260090334794394361662678240713231519278691715")}
-
-// xiToPMinus1Over2 is ξ^((p-1)/2) where ξ = i+3.
-var xiToPMinus1Over2 = &gfP2{bigFromBase10("50997318142241922852281555961173165965672272825141804376761836765206060036244"), bigFromBase10("38665955945962842195025998234511023902832543644254935982879660597356748036009")}
-
-// xiToPSquaredMinus1Over3 is ξ^((p²-1)/3) where ξ = i+3.
-var xiToPSquaredMinus1Over3 = bigFromBase10("65000549695646603727810655408050771481677621702948236658134783353303381437752")
-
-// xiTo2PSquaredMinus2Over3 is ξ^((2p²-2)/3) where ξ = i+3 (a cubic root of unity, mod p).
-var xiTo2PSquaredMinus2Over3 = bigFromBase10("4985783334309134261147736404674766913742361673560802634030")
-
-// xiToPSquaredMinus1Over6 is ξ^((1p²-1)/6) where ξ = i+3 (a cubic root of -1, mod p).
-var xiToPSquaredMinus1Over6 = bigFromBase10("65000549695646603727810655408050771481677621702948236658134783353303381437753")
-
-// xiTo2PMinus2Over3 is ξ^((2p-2)/3) where ξ = i+3.
-var xiTo2PMinus2Over3 = &gfP2{bigFromBase10("19885131339612776214803633203834694332692106372356013117629940868870585019582"), bigFromBase10("21645619881471562101905880913352894726728173167203616652430647841922248593627")}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/curve.go b/installer/vendor/golang.org/x/crypto/bn256/curve.go
deleted file mode 100644
index 55b7063f16..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/curve.go
+++ /dev/null
@@ -1,278 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-import (
-	"math/big"
-)
-
-// curvePoint implements the elliptic curve y²=x³+3. Points are kept in
-// Jacobian form and t=z² when valid. G₁ is the set of points of this curve on
-// GF(p).
-type curvePoint struct {
-	x, y, z, t *big.Int
-}
-
-var curveB = new(big.Int).SetInt64(3)
-
-// curveGen is the generator of G₁.
-var curveGen = &curvePoint{
-	new(big.Int).SetInt64(1),
-	new(big.Int).SetInt64(-2),
-	new(big.Int).SetInt64(1),
-	new(big.Int).SetInt64(1),
-}
-
-func newCurvePoint(pool *bnPool) *curvePoint {
-	return &curvePoint{
-		pool.Get(),
-		pool.Get(),
-		pool.Get(),
-		pool.Get(),
-	}
-}
-
-func (c *curvePoint) String() string {
-	c.MakeAffine(new(bnPool))
-	return "(" + c.x.String() + ", " + c.y.String() + ")"
-}
-
-func (c *curvePoint) Put(pool *bnPool) {
-	pool.Put(c.x)
-	pool.Put(c.y)
-	pool.Put(c.z)
-	pool.Put(c.t)
-}
-
-func (c *curvePoint) Set(a *curvePoint) {
-	c.x.Set(a.x)
-	c.y.Set(a.y)
-	c.z.Set(a.z)
-	c.t.Set(a.t)
-}
-
-// IsOnCurve returns true iff c is on the curve where c must be in affine form.
-func (c *curvePoint) IsOnCurve() bool {
-	yy := new(big.Int).Mul(c.y, c.y)
-	xxx := new(big.Int).Mul(c.x, c.x)
-	xxx.Mul(xxx, c.x)
-	yy.Sub(yy, xxx)
-	yy.Sub(yy, curveB)
-	if yy.Sign() < 0 || yy.Cmp(p) >= 0 {
-		yy.Mod(yy, p)
-	}
-	return yy.Sign() == 0
-}
-
-func (c *curvePoint) SetInfinity() {
-	c.z.SetInt64(0)
-}
-
-func (c *curvePoint) IsInfinity() bool {
-	return c.z.Sign() == 0
-}
-
-func (c *curvePoint) Add(a, b *curvePoint, pool *bnPool) {
-	if a.IsInfinity() {
-		c.Set(b)
-		return
-	}
-	if b.IsInfinity() {
-		c.Set(a)
-		return
-	}
-
-	// See http://hyperelliptic.org/EFD/g1p/auto-code/shortw/jacobian-0/addition/add-2007-bl.op3
-
-	// Normalize the points by replacing a = [x1:y1:z1] and b = [x2:y2:z2]
-	// by [u1:s1:z1·z2] and [u2:s2:z1·z2]
-	// where u1 = x1·z2², s1 = y1·z2³ and u1 = x2·z1², s2 = y2·z1³
-	z1z1 := pool.Get().Mul(a.z, a.z)
-	z1z1.Mod(z1z1, p)
-	z2z2 := pool.Get().Mul(b.z, b.z)
-	z2z2.Mod(z2z2, p)
-	u1 := pool.Get().Mul(a.x, z2z2)
-	u1.Mod(u1, p)
-	u2 := pool.Get().Mul(b.x, z1z1)
-	u2.Mod(u2, p)
-
-	t := pool.Get().Mul(b.z, z2z2)
-	t.Mod(t, p)
-	s1 := pool.Get().Mul(a.y, t)
-	s1.Mod(s1, p)
-
-	t.Mul(a.z, z1z1)
-	t.Mod(t, p)
-	s2 := pool.Get().Mul(b.y, t)
-	s2.Mod(s2, p)
-
-	// Compute x = (2h)²(s²-u1-u2)
-	// where s = (s2-s1)/(u2-u1) is the slope of the line through
-	// (u1,s1) and (u2,s2). The extra factor 2h = 2(u2-u1) comes from the value of z below.
-	// This is also:
-	// 4(s2-s1)² - 4h²(u1+u2) = 4(s2-s1)² - 4h³ - 4h²(2u1)
-	//                        = r² - j - 2v
-	// with the notations below.
-	h := pool.Get().Sub(u2, u1)
-	xEqual := h.Sign() == 0
-
-	t.Add(h, h)
-	// i = 4h²
-	i := pool.Get().Mul(t, t)
-	i.Mod(i, p)
-	// j = 4h³
-	j := pool.Get().Mul(h, i)
-	j.Mod(j, p)
-
-	t.Sub(s2, s1)
-	yEqual := t.Sign() == 0
-	if xEqual && yEqual {
-		c.Double(a, pool)
-		return
-	}
-	r := pool.Get().Add(t, t)
-
-	v := pool.Get().Mul(u1, i)
-	v.Mod(v, p)
-
-	// t4 = 4(s2-s1)²
-	t4 := pool.Get().Mul(r, r)
-	t4.Mod(t4, p)
-	t.Add(v, v)
-	t6 := pool.Get().Sub(t4, j)
-	c.x.Sub(t6, t)
-
-	// Set y = -(2h)³(s1 + s*(x/4h²-u1))
-	// This is also
-	// y = - 2·s1·j - (s2-s1)(2x - 2i·u1) = r(v-x) - 2·s1·j
-	t.Sub(v, c.x) // t7
-	t4.Mul(s1, j) // t8
-	t4.Mod(t4, p)
-	t6.Add(t4, t4) // t9
-	t4.Mul(r, t)   // t10
-	t4.Mod(t4, p)
-	c.y.Sub(t4, t6)
-
-	// Set z = 2(u2-u1)·z1·z2 = 2h·z1·z2
-	t.Add(a.z, b.z) // t11
-	t4.Mul(t, t)    // t12
-	t4.Mod(t4, p)
-	t.Sub(t4, z1z1) // t13
-	t4.Sub(t, z2z2) // t14
-	c.z.Mul(t4, h)
-	c.z.Mod(c.z, p)
-
-	pool.Put(z1z1)
-	pool.Put(z2z2)
-	pool.Put(u1)
-	pool.Put(u2)
-	pool.Put(t)
-	pool.Put(s1)
-	pool.Put(s2)
-	pool.Put(h)
-	pool.Put(i)
-	pool.Put(j)
-	pool.Put(r)
-	pool.Put(v)
-	pool.Put(t4)
-	pool.Put(t6)
-}
-
-func (c *curvePoint) Double(a *curvePoint, pool *bnPool) {
-	// See http://hyperelliptic.org/EFD/g1p/auto-code/shortw/jacobian-0/doubling/dbl-2009-l.op3
-	A := pool.Get().Mul(a.x, a.x)
-	A.Mod(A, p)
-	B := pool.Get().Mul(a.y, a.y)
-	B.Mod(B, p)
-	C := pool.Get().Mul(B, B)
-	C.Mod(C, p)
-
-	t := pool.Get().Add(a.x, B)
-	t2 := pool.Get().Mul(t, t)
-	t2.Mod(t2, p)
-	t.Sub(t2, A)
-	t2.Sub(t, C)
-	d := pool.Get().Add(t2, t2)
-	t.Add(A, A)
-	e := pool.Get().Add(t, A)
-	f := pool.Get().Mul(e, e)
-	f.Mod(f, p)
-
-	t.Add(d, d)
-	c.x.Sub(f, t)
-
-	t.Add(C, C)
-	t2.Add(t, t)
-	t.Add(t2, t2)
-	c.y.Sub(d, c.x)
-	t2.Mul(e, c.y)
-	t2.Mod(t2, p)
-	c.y.Sub(t2, t)
-
-	t.Mul(a.y, a.z)
-	t.Mod(t, p)
-	c.z.Add(t, t)
-
-	pool.Put(A)
-	pool.Put(B)
-	pool.Put(C)
-	pool.Put(t)
-	pool.Put(t2)
-	pool.Put(d)
-	pool.Put(e)
-	pool.Put(f)
-}
-
-func (c *curvePoint) Mul(a *curvePoint, scalar *big.Int, pool *bnPool) *curvePoint {
-	sum := newCurvePoint(pool)
-	sum.SetInfinity()
-	t := newCurvePoint(pool)
-
-	for i := scalar.BitLen(); i >= 0; i-- {
-		t.Double(sum, pool)
-		if scalar.Bit(i) != 0 {
-			sum.Add(t, a, pool)
-		} else {
-			sum.Set(t)
-		}
-	}
-
-	c.Set(sum)
-	sum.Put(pool)
-	t.Put(pool)
-	return c
-}
-
-func (c *curvePoint) MakeAffine(pool *bnPool) *curvePoint {
-	if words := c.z.Bits(); len(words) == 1 && words[0] == 1 {
-		return c
-	}
-
-	zInv := pool.Get().ModInverse(c.z, p)
-	t := pool.Get().Mul(c.y, zInv)
-	t.Mod(t, p)
-	zInv2 := pool.Get().Mul(zInv, zInv)
-	zInv2.Mod(zInv2, p)
-	c.y.Mul(t, zInv2)
-	c.y.Mod(c.y, p)
-	t.Mul(c.x, zInv2)
-	t.Mod(t, p)
-	c.x.Set(t)
-	c.z.SetInt64(1)
-	c.t.SetInt64(1)
-
-	pool.Put(zInv)
-	pool.Put(t)
-	pool.Put(zInv2)
-
-	return c
-}
-
-func (c *curvePoint) Negative(a *curvePoint) {
-	c.x.Set(a.x)
-	c.y.Neg(a.y)
-	c.z.Set(a.z)
-	c.t.SetInt64(0)
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/example_test.go b/installer/vendor/golang.org/x/crypto/bn256/example_test.go
deleted file mode 100644
index b2d19807a2..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/example_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-import (
-	"crypto/rand"
-)
-
-func ExamplePair() {
-	// This implements the tripartite Diffie-Hellman algorithm from "A One
-	// Round Protocol for Tripartite Diffie-Hellman", A. Joux.
-	// http://www.springerlink.com/content/cddc57yyva0hburb/fulltext.pdf
-
-	// Each of three parties, a, b and c, generate a private value.
-	a, _ := rand.Int(rand.Reader, Order)
-	b, _ := rand.Int(rand.Reader, Order)
-	c, _ := rand.Int(rand.Reader, Order)
-
-	// Then each party calculates g₁ and g₂ times their private value.
-	pa := new(G1).ScalarBaseMult(a)
-	qa := new(G2).ScalarBaseMult(a)
-
-	pb := new(G1).ScalarBaseMult(b)
-	qb := new(G2).ScalarBaseMult(b)
-
-	pc := new(G1).ScalarBaseMult(c)
-	qc := new(G2).ScalarBaseMult(c)
-
-	// Now each party exchanges its public values with the other two and
-	// all parties can calculate the shared key.
-	k1 := Pair(pb, qc)
-	k1.ScalarMult(k1, a)
-
-	k2 := Pair(pc, qa)
-	k2.ScalarMult(k2, b)
-
-	k3 := Pair(pa, qb)
-	k3.ScalarMult(k3, c)
-
-	// k1, k2 and k3 will all be equal.
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/gfp12.go b/installer/vendor/golang.org/x/crypto/bn256/gfp12.go
deleted file mode 100644
index f084eddf21..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/gfp12.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-// For details of the algorithms used, see "Multiplication and Squaring on
-// Pairing-Friendly Fields, Devegili et al.
-// http://eprint.iacr.org/2006/471.pdf.
-
-import (
-	"math/big"
-)
-
-// gfP12 implements the field of size p¹² as a quadratic extension of gfP6
-// where ω²=τ.
-type gfP12 struct {
-	x, y *gfP6 // value is xω + y
-}
-
-func newGFp12(pool *bnPool) *gfP12 {
-	return &gfP12{newGFp6(pool), newGFp6(pool)}
-}
-
-func (e *gfP12) String() string {
-	return "(" + e.x.String() + "," + e.y.String() + ")"
-}
-
-func (e *gfP12) Put(pool *bnPool) {
-	e.x.Put(pool)
-	e.y.Put(pool)
-}
-
-func (e *gfP12) Set(a *gfP12) *gfP12 {
-	e.x.Set(a.x)
-	e.y.Set(a.y)
-	return e
-}
-
-func (e *gfP12) SetZero() *gfP12 {
-	e.x.SetZero()
-	e.y.SetZero()
-	return e
-}
-
-func (e *gfP12) SetOne() *gfP12 {
-	e.x.SetZero()
-	e.y.SetOne()
-	return e
-}
-
-func (e *gfP12) Minimal() {
-	e.x.Minimal()
-	e.y.Minimal()
-}
-
-func (e *gfP12) IsZero() bool {
-	e.Minimal()
-	return e.x.IsZero() && e.y.IsZero()
-}
-
-func (e *gfP12) IsOne() bool {
-	e.Minimal()
-	return e.x.IsZero() && e.y.IsOne()
-}
-
-func (e *gfP12) Conjugate(a *gfP12) *gfP12 {
-	e.x.Negative(a.x)
-	e.y.Set(a.y)
-	return a
-}
-
-func (e *gfP12) Negative(a *gfP12) *gfP12 {
-	e.x.Negative(a.x)
-	e.y.Negative(a.y)
-	return e
-}
-
-// Frobenius computes (xω+y)^p = x^p ω·ξ^((p-1)/6) + y^p
-func (e *gfP12) Frobenius(a *gfP12, pool *bnPool) *gfP12 {
-	e.x.Frobenius(a.x, pool)
-	e.y.Frobenius(a.y, pool)
-	e.x.MulScalar(e.x, xiToPMinus1Over6, pool)
-	return e
-}
-
-// FrobeniusP2 computes (xω+y)^p² = x^p² ω·ξ^((p²-1)/6) + y^p²
-func (e *gfP12) FrobeniusP2(a *gfP12, pool *bnPool) *gfP12 {
-	e.x.FrobeniusP2(a.x)
-	e.x.MulGFP(e.x, xiToPSquaredMinus1Over6)
-	e.y.FrobeniusP2(a.y)
-	return e
-}
-
-func (e *gfP12) Add(a, b *gfP12) *gfP12 {
-	e.x.Add(a.x, b.x)
-	e.y.Add(a.y, b.y)
-	return e
-}
-
-func (e *gfP12) Sub(a, b *gfP12) *gfP12 {
-	e.x.Sub(a.x, b.x)
-	e.y.Sub(a.y, b.y)
-	return e
-}
-
-func (e *gfP12) Mul(a, b *gfP12, pool *bnPool) *gfP12 {
-	tx := newGFp6(pool)
-	tx.Mul(a.x, b.y, pool)
-	t := newGFp6(pool)
-	t.Mul(b.x, a.y, pool)
-	tx.Add(tx, t)
-
-	ty := newGFp6(pool)
-	ty.Mul(a.y, b.y, pool)
-	t.Mul(a.x, b.x, pool)
-	t.MulTau(t, pool)
-	e.y.Add(ty, t)
-	e.x.Set(tx)
-
-	tx.Put(pool)
-	ty.Put(pool)
-	t.Put(pool)
-	return e
-}
-
-func (e *gfP12) MulScalar(a *gfP12, b *gfP6, pool *bnPool) *gfP12 {
-	e.x.Mul(e.x, b, pool)
-	e.y.Mul(e.y, b, pool)
-	return e
-}
-
-func (c *gfP12) Exp(a *gfP12, power *big.Int, pool *bnPool) *gfP12 {
-	sum := newGFp12(pool)
-	sum.SetOne()
-	t := newGFp12(pool)
-
-	for i := power.BitLen() - 1; i >= 0; i-- {
-		t.Square(sum, pool)
-		if power.Bit(i) != 0 {
-			sum.Mul(t, a, pool)
-		} else {
-			sum.Set(t)
-		}
-	}
-
-	c.Set(sum)
-
-	sum.Put(pool)
-	t.Put(pool)
-
-	return c
-}
-
-func (e *gfP12) Square(a *gfP12, pool *bnPool) *gfP12 {
-	// Complex squaring algorithm
-	v0 := newGFp6(pool)
-	v0.Mul(a.x, a.y, pool)
-
-	t := newGFp6(pool)
-	t.MulTau(a.x, pool)
-	t.Add(a.y, t)
-	ty := newGFp6(pool)
-	ty.Add(a.x, a.y)
-	ty.Mul(ty, t, pool)
-	ty.Sub(ty, v0)
-	t.MulTau(v0, pool)
-	ty.Sub(ty, t)
-
-	e.y.Set(ty)
-	e.x.Double(v0)
-
-	v0.Put(pool)
-	t.Put(pool)
-	ty.Put(pool)
-
-	return e
-}
-
-func (e *gfP12) Invert(a *gfP12, pool *bnPool) *gfP12 {
-	// See "Implementing cryptographic pairings", M. Scott, section 3.2.
-	// ftp://136.206.11.249/pub/crypto/pairings.pdf
-	t1 := newGFp6(pool)
-	t2 := newGFp6(pool)
-
-	t1.Square(a.x, pool)
-	t2.Square(a.y, pool)
-	t1.MulTau(t1, pool)
-	t1.Sub(t2, t1)
-	t2.Invert(t1, pool)
-
-	e.x.Negative(a.x)
-	e.y.Set(a.y)
-	e.MulScalar(e, t2, pool)
-
-	t1.Put(pool)
-	t2.Put(pool)
-
-	return e
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/gfp2.go b/installer/vendor/golang.org/x/crypto/bn256/gfp2.go
deleted file mode 100644
index 97f3f1f3fa..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/gfp2.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-// For details of the algorithms used, see "Multiplication and Squaring on
-// Pairing-Friendly Fields, Devegili et al.
-// http://eprint.iacr.org/2006/471.pdf.
-
-import (
-	"math/big"
-)
-
-// gfP2 implements a field of size p² as a quadratic extension of the base
-// field where i²=-1.
-type gfP2 struct {
-	x, y *big.Int // value is xi+y.
-}
-
-func newGFp2(pool *bnPool) *gfP2 {
-	return &gfP2{pool.Get(), pool.Get()}
-}
-
-func (e *gfP2) String() string {
-	x := new(big.Int).Mod(e.x, p)
-	y := new(big.Int).Mod(e.y, p)
-	return "(" + x.String() + "," + y.String() + ")"
-}
-
-func (e *gfP2) Put(pool *bnPool) {
-	pool.Put(e.x)
-	pool.Put(e.y)
-}
-
-func (e *gfP2) Set(a *gfP2) *gfP2 {
-	e.x.Set(a.x)
-	e.y.Set(a.y)
-	return e
-}
-
-func (e *gfP2) SetZero() *gfP2 {
-	e.x.SetInt64(0)
-	e.y.SetInt64(0)
-	return e
-}
-
-func (e *gfP2) SetOne() *gfP2 {
-	e.x.SetInt64(0)
-	e.y.SetInt64(1)
-	return e
-}
-
-func (e *gfP2) Minimal() {
-	if e.x.Sign() < 0 || e.x.Cmp(p) >= 0 {
-		e.x.Mod(e.x, p)
-	}
-	if e.y.Sign() < 0 || e.y.Cmp(p) >= 0 {
-		e.y.Mod(e.y, p)
-	}
-}
-
-func (e *gfP2) IsZero() bool {
-	return e.x.Sign() == 0 && e.y.Sign() == 0
-}
-
-func (e *gfP2) IsOne() bool {
-	if e.x.Sign() != 0 {
-		return false
-	}
-	words := e.y.Bits()
-	return len(words) == 1 && words[0] == 1
-}
-
-func (e *gfP2) Conjugate(a *gfP2) *gfP2 {
-	e.y.Set(a.y)
-	e.x.Neg(a.x)
-	return e
-}
-
-func (e *gfP2) Negative(a *gfP2) *gfP2 {
-	e.x.Neg(a.x)
-	e.y.Neg(a.y)
-	return e
-}
-
-func (e *gfP2) Add(a, b *gfP2) *gfP2 {
-	e.x.Add(a.x, b.x)
-	e.y.Add(a.y, b.y)
-	return e
-}
-
-func (e *gfP2) Sub(a, b *gfP2) *gfP2 {
-	e.x.Sub(a.x, b.x)
-	e.y.Sub(a.y, b.y)
-	return e
-}
-
-func (e *gfP2) Double(a *gfP2) *gfP2 {
-	e.x.Lsh(a.x, 1)
-	e.y.Lsh(a.y, 1)
-	return e
-}
-
-func (c *gfP2) Exp(a *gfP2, power *big.Int, pool *bnPool) *gfP2 {
-	sum := newGFp2(pool)
-	sum.SetOne()
-	t := newGFp2(pool)
-
-	for i := power.BitLen() - 1; i >= 0; i-- {
-		t.Square(sum, pool)
-		if power.Bit(i) != 0 {
-			sum.Mul(t, a, pool)
-		} else {
-			sum.Set(t)
-		}
-	}
-
-	c.Set(sum)
-
-	sum.Put(pool)
-	t.Put(pool)
-
-	return c
-}
-
-// See "Multiplication and Squaring in Pairing-Friendly Fields",
-// http://eprint.iacr.org/2006/471.pdf
-func (e *gfP2) Mul(a, b *gfP2, pool *bnPool) *gfP2 {
-	tx := pool.Get().Mul(a.x, b.y)
-	t := pool.Get().Mul(b.x, a.y)
-	tx.Add(tx, t)
-	tx.Mod(tx, p)
-
-	ty := pool.Get().Mul(a.y, b.y)
-	t.Mul(a.x, b.x)
-	ty.Sub(ty, t)
-	e.y.Mod(ty, p)
-	e.x.Set(tx)
-
-	pool.Put(tx)
-	pool.Put(ty)
-	pool.Put(t)
-
-	return e
-}
-
-func (e *gfP2) MulScalar(a *gfP2, b *big.Int) *gfP2 {
-	e.x.Mul(a.x, b)
-	e.y.Mul(a.y, b)
-	return e
-}
-
-// MulXi sets e=ξa where ξ=i+3 and then returns e.
-func (e *gfP2) MulXi(a *gfP2, pool *bnPool) *gfP2 {
-	// (xi+y)(i+3) = (3x+y)i+(3y-x)
-	tx := pool.Get().Lsh(a.x, 1)
-	tx.Add(tx, a.x)
-	tx.Add(tx, a.y)
-
-	ty := pool.Get().Lsh(a.y, 1)
-	ty.Add(ty, a.y)
-	ty.Sub(ty, a.x)
-
-	e.x.Set(tx)
-	e.y.Set(ty)
-
-	pool.Put(tx)
-	pool.Put(ty)
-
-	return e
-}
-
-func (e *gfP2) Square(a *gfP2, pool *bnPool) *gfP2 {
-	// Complex squaring algorithm:
-	// (xi+b)² = (x+y)(y-x) + 2*i*x*y
-	t1 := pool.Get().Sub(a.y, a.x)
-	t2 := pool.Get().Add(a.x, a.y)
-	ty := pool.Get().Mul(t1, t2)
-	ty.Mod(ty, p)
-
-	t1.Mul(a.x, a.y)
-	t1.Lsh(t1, 1)
-
-	e.x.Mod(t1, p)
-	e.y.Set(ty)
-
-	pool.Put(t1)
-	pool.Put(t2)
-	pool.Put(ty)
-
-	return e
-}
-
-func (e *gfP2) Invert(a *gfP2, pool *bnPool) *gfP2 {
-	// See "Implementing cryptographic pairings", M. Scott, section 3.2.
-	// ftp://136.206.11.249/pub/crypto/pairings.pdf
-	t := pool.Get()
-	t.Mul(a.y, a.y)
-	t2 := pool.Get()
-	t2.Mul(a.x, a.x)
-	t.Add(t, t2)
-
-	inv := pool.Get()
-	inv.ModInverse(t, p)
-
-	e.x.Neg(a.x)
-	e.x.Mul(e.x, inv)
-	e.x.Mod(e.x, p)
-
-	e.y.Mul(a.y, inv)
-	e.y.Mod(e.y, p)
-
-	pool.Put(t)
-	pool.Put(t2)
-	pool.Put(inv)
-
-	return e
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/gfp6.go b/installer/vendor/golang.org/x/crypto/bn256/gfp6.go
deleted file mode 100644
index f98ae782cc..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/gfp6.go
+++ /dev/null
@@ -1,296 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-// For details of the algorithms used, see "Multiplication and Squaring on
-// Pairing-Friendly Fields, Devegili et al.
-// http://eprint.iacr.org/2006/471.pdf.
-
-import (
-	"math/big"
-)
-
-// gfP6 implements the field of size p⁶ as a cubic extension of gfP2 where τ³=ξ
-// and ξ=i+3.
-type gfP6 struct {
-	x, y, z *gfP2 // value is xτ² + yτ + z
-}
-
-func newGFp6(pool *bnPool) *gfP6 {
-	return &gfP6{newGFp2(pool), newGFp2(pool), newGFp2(pool)}
-}
-
-func (e *gfP6) String() string {
-	return "(" + e.x.String() + "," + e.y.String() + "," + e.z.String() + ")"
-}
-
-func (e *gfP6) Put(pool *bnPool) {
-	e.x.Put(pool)
-	e.y.Put(pool)
-	e.z.Put(pool)
-}
-
-func (e *gfP6) Set(a *gfP6) *gfP6 {
-	e.x.Set(a.x)
-	e.y.Set(a.y)
-	e.z.Set(a.z)
-	return e
-}
-
-func (e *gfP6) SetZero() *gfP6 {
-	e.x.SetZero()
-	e.y.SetZero()
-	e.z.SetZero()
-	return e
-}
-
-func (e *gfP6) SetOne() *gfP6 {
-	e.x.SetZero()
-	e.y.SetZero()
-	e.z.SetOne()
-	return e
-}
-
-func (e *gfP6) Minimal() {
-	e.x.Minimal()
-	e.y.Minimal()
-	e.z.Minimal()
-}
-
-func (e *gfP6) IsZero() bool {
-	return e.x.IsZero() && e.y.IsZero() && e.z.IsZero()
-}
-
-func (e *gfP6) IsOne() bool {
-	return e.x.IsZero() && e.y.IsZero() && e.z.IsOne()
-}
-
-func (e *gfP6) Negative(a *gfP6) *gfP6 {
-	e.x.Negative(a.x)
-	e.y.Negative(a.y)
-	e.z.Negative(a.z)
-	return e
-}
-
-func (e *gfP6) Frobenius(a *gfP6, pool *bnPool) *gfP6 {
-	e.x.Conjugate(a.x)
-	e.y.Conjugate(a.y)
-	e.z.Conjugate(a.z)
-
-	e.x.Mul(e.x, xiTo2PMinus2Over3, pool)
-	e.y.Mul(e.y, xiToPMinus1Over3, pool)
-	return e
-}
-
-// FrobeniusP2 computes (xτ²+yτ+z)^(p²) = xτ^(2p²) + yτ^(p²) + z
-func (e *gfP6) FrobeniusP2(a *gfP6) *gfP6 {
-	// τ^(2p²) = τ²τ^(2p²-2) = τ²ξ^((2p²-2)/3)
-	e.x.MulScalar(a.x, xiTo2PSquaredMinus2Over3)
-	// τ^(p²) = ττ^(p²-1) = τξ^((p²-1)/3)
-	e.y.MulScalar(a.y, xiToPSquaredMinus1Over3)
-	e.z.Set(a.z)
-	return e
-}
-
-func (e *gfP6) Add(a, b *gfP6) *gfP6 {
-	e.x.Add(a.x, b.x)
-	e.y.Add(a.y, b.y)
-	e.z.Add(a.z, b.z)
-	return e
-}
-
-func (e *gfP6) Sub(a, b *gfP6) *gfP6 {
-	e.x.Sub(a.x, b.x)
-	e.y.Sub(a.y, b.y)
-	e.z.Sub(a.z, b.z)
-	return e
-}
-
-func (e *gfP6) Double(a *gfP6) *gfP6 {
-	e.x.Double(a.x)
-	e.y.Double(a.y)
-	e.z.Double(a.z)
-	return e
-}
-
-func (e *gfP6) Mul(a, b *gfP6, pool *bnPool) *gfP6 {
-	// "Multiplication and Squaring on Pairing-Friendly Fields"
-	// Section 4, Karatsuba method.
-	// http://eprint.iacr.org/2006/471.pdf
-
-	v0 := newGFp2(pool)
-	v0.Mul(a.z, b.z, pool)
-	v1 := newGFp2(pool)
-	v1.Mul(a.y, b.y, pool)
-	v2 := newGFp2(pool)
-	v2.Mul(a.x, b.x, pool)
-
-	t0 := newGFp2(pool)
-	t0.Add(a.x, a.y)
-	t1 := newGFp2(pool)
-	t1.Add(b.x, b.y)
-	tz := newGFp2(pool)
-	tz.Mul(t0, t1, pool)
-
-	tz.Sub(tz, v1)
-	tz.Sub(tz, v2)
-	tz.MulXi(tz, pool)
-	tz.Add(tz, v0)
-
-	t0.Add(a.y, a.z)
-	t1.Add(b.y, b.z)
-	ty := newGFp2(pool)
-	ty.Mul(t0, t1, pool)
-	ty.Sub(ty, v0)
-	ty.Sub(ty, v1)
-	t0.MulXi(v2, pool)
-	ty.Add(ty, t0)
-
-	t0.Add(a.x, a.z)
-	t1.Add(b.x, b.z)
-	tx := newGFp2(pool)
-	tx.Mul(t0, t1, pool)
-	tx.Sub(tx, v0)
-	tx.Add(tx, v1)
-	tx.Sub(tx, v2)
-
-	e.x.Set(tx)
-	e.y.Set(ty)
-	e.z.Set(tz)
-
-	t0.Put(pool)
-	t1.Put(pool)
-	tx.Put(pool)
-	ty.Put(pool)
-	tz.Put(pool)
-	v0.Put(pool)
-	v1.Put(pool)
-	v2.Put(pool)
-	return e
-}
-
-func (e *gfP6) MulScalar(a *gfP6, b *gfP2, pool *bnPool) *gfP6 {
-	e.x.Mul(a.x, b, pool)
-	e.y.Mul(a.y, b, pool)
-	e.z.Mul(a.z, b, pool)
-	return e
-}
-
-func (e *gfP6) MulGFP(a *gfP6, b *big.Int) *gfP6 {
-	e.x.MulScalar(a.x, b)
-	e.y.MulScalar(a.y, b)
-	e.z.MulScalar(a.z, b)
-	return e
-}
-
-// MulTau computes τ·(aτ²+bτ+c) = bτ²+cτ+aξ
-func (e *gfP6) MulTau(a *gfP6, pool *bnPool) {
-	tz := newGFp2(pool)
-	tz.MulXi(a.x, pool)
-	ty := newGFp2(pool)
-	ty.Set(a.y)
-	e.y.Set(a.z)
-	e.x.Set(ty)
-	e.z.Set(tz)
-	tz.Put(pool)
-	ty.Put(pool)
-}
-
-func (e *gfP6) Square(a *gfP6, pool *bnPool) *gfP6 {
-	v0 := newGFp2(pool).Square(a.z, pool)
-	v1 := newGFp2(pool).Square(a.y, pool)
-	v2 := newGFp2(pool).Square(a.x, pool)
-
-	c0 := newGFp2(pool).Add(a.x, a.y)
-	c0.Square(c0, pool)
-	c0.Sub(c0, v1)
-	c0.Sub(c0, v2)
-	c0.MulXi(c0, pool)
-	c0.Add(c0, v0)
-
-	c1 := newGFp2(pool).Add(a.y, a.z)
-	c1.Square(c1, pool)
-	c1.Sub(c1, v0)
-	c1.Sub(c1, v1)
-	xiV2 := newGFp2(pool).MulXi(v2, pool)
-	c1.Add(c1, xiV2)
-
-	c2 := newGFp2(pool).Add(a.x, a.z)
-	c2.Square(c2, pool)
-	c2.Sub(c2, v0)
-	c2.Add(c2, v1)
-	c2.Sub(c2, v2)
-
-	e.x.Set(c2)
-	e.y.Set(c1)
-	e.z.Set(c0)
-
-	v0.Put(pool)
-	v1.Put(pool)
-	v2.Put(pool)
-	c0.Put(pool)
-	c1.Put(pool)
-	c2.Put(pool)
-	xiV2.Put(pool)
-
-	return e
-}
-
-func (e *gfP6) Invert(a *gfP6, pool *bnPool) *gfP6 {
-	// See "Implementing cryptographic pairings", M. Scott, section 3.2.
-	// ftp://136.206.11.249/pub/crypto/pairings.pdf
-
-	// Here we can give a short explanation of how it works: let j be a cubic root of
-	// unity in GF(p²) so that 1+j+j²=0.
-	// Then (xτ² + yτ + z)(xj²τ² + yjτ + z)(xjτ² + yj²τ + z)
-	// = (xτ² + yτ + z)(Cτ²+Bτ+A)
-	// = (x³ξ²+y³ξ+z³-3ξxyz) = F is an element of the base field (the norm).
-	//
-	// On the other hand (xj²τ² + yjτ + z)(xjτ² + yj²τ + z)
-	// = τ²(y²-ξxz) + τ(ξx²-yz) + (z²-ξxy)
-	//
-	// So that's why A = (z²-ξxy), B = (ξx²-yz), C = (y²-ξxz)
-	t1 := newGFp2(pool)
-
-	A := newGFp2(pool)
-	A.Square(a.z, pool)
-	t1.Mul(a.x, a.y, pool)
-	t1.MulXi(t1, pool)
-	A.Sub(A, t1)
-
-	B := newGFp2(pool)
-	B.Square(a.x, pool)
-	B.MulXi(B, pool)
-	t1.Mul(a.y, a.z, pool)
-	B.Sub(B, t1)
-
-	C := newGFp2(pool)
-	C.Square(a.y, pool)
-	t1.Mul(a.x, a.z, pool)
-	C.Sub(C, t1)
-
-	F := newGFp2(pool)
-	F.Mul(C, a.y, pool)
-	F.MulXi(F, pool)
-	t1.Mul(A, a.z, pool)
-	F.Add(F, t1)
-	t1.Mul(B, a.x, pool)
-	t1.MulXi(t1, pool)
-	F.Add(F, t1)
-
-	F.Invert(F, pool)
-
-	e.x.Mul(C, F, pool)
-	e.y.Mul(B, F, pool)
-	e.z.Mul(A, F, pool)
-
-	t1.Put(pool)
-	A.Put(pool)
-	B.Put(pool)
-	C.Put(pool)
-	F.Put(pool)
-
-	return e
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/optate.go b/installer/vendor/golang.org/x/crypto/bn256/optate.go
deleted file mode 100644
index 7ae0746eb1..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/optate.go
+++ /dev/null
@@ -1,395 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-func lineFunctionAdd(r, p *twistPoint, q *curvePoint, r2 *gfP2, pool *bnPool) (a, b, c *gfP2, rOut *twistPoint) {
-	// See the mixed addition algorithm from "Faster Computation of the
-	// Tate Pairing", http://arxiv.org/pdf/0904.0854v3.pdf
-
-	B := newGFp2(pool).Mul(p.x, r.t, pool)
-
-	D := newGFp2(pool).Add(p.y, r.z)
-	D.Square(D, pool)
-	D.Sub(D, r2)
-	D.Sub(D, r.t)
-	D.Mul(D, r.t, pool)
-
-	H := newGFp2(pool).Sub(B, r.x)
-	I := newGFp2(pool).Square(H, pool)
-
-	E := newGFp2(pool).Add(I, I)
-	E.Add(E, E)
-
-	J := newGFp2(pool).Mul(H, E, pool)
-
-	L1 := newGFp2(pool).Sub(D, r.y)
-	L1.Sub(L1, r.y)
-
-	V := newGFp2(pool).Mul(r.x, E, pool)
-
-	rOut = newTwistPoint(pool)
-	rOut.x.Square(L1, pool)
-	rOut.x.Sub(rOut.x, J)
-	rOut.x.Sub(rOut.x, V)
-	rOut.x.Sub(rOut.x, V)
-
-	rOut.z.Add(r.z, H)
-	rOut.z.Square(rOut.z, pool)
-	rOut.z.Sub(rOut.z, r.t)
-	rOut.z.Sub(rOut.z, I)
-
-	t := newGFp2(pool).Sub(V, rOut.x)
-	t.Mul(t, L1, pool)
-	t2 := newGFp2(pool).Mul(r.y, J, pool)
-	t2.Add(t2, t2)
-	rOut.y.Sub(t, t2)
-
-	rOut.t.Square(rOut.z, pool)
-
-	t.Add(p.y, rOut.z)
-	t.Square(t, pool)
-	t.Sub(t, r2)
-	t.Sub(t, rOut.t)
-
-	t2.Mul(L1, p.x, pool)
-	t2.Add(t2, t2)
-	a = newGFp2(pool)
-	a.Sub(t2, t)
-
-	c = newGFp2(pool)
-	c.MulScalar(rOut.z, q.y)
-	c.Add(c, c)
-
-	b = newGFp2(pool)
-	b.SetZero()
-	b.Sub(b, L1)
-	b.MulScalar(b, q.x)
-	b.Add(b, b)
-
-	B.Put(pool)
-	D.Put(pool)
-	H.Put(pool)
-	I.Put(pool)
-	E.Put(pool)
-	J.Put(pool)
-	L1.Put(pool)
-	V.Put(pool)
-	t.Put(pool)
-	t2.Put(pool)
-
-	return
-}
-
-func lineFunctionDouble(r *twistPoint, q *curvePoint, pool *bnPool) (a, b, c *gfP2, rOut *twistPoint) {
-	// See the doubling algorithm for a=0 from "Faster Computation of the
-	// Tate Pairing", http://arxiv.org/pdf/0904.0854v3.pdf
-
-	A := newGFp2(pool).Square(r.x, pool)
-	B := newGFp2(pool).Square(r.y, pool)
-	C := newGFp2(pool).Square(B, pool)
-
-	D := newGFp2(pool).Add(r.x, B)
-	D.Square(D, pool)
-	D.Sub(D, A)
-	D.Sub(D, C)
-	D.Add(D, D)
-
-	E := newGFp2(pool).Add(A, A)
-	E.Add(E, A)
-
-	G := newGFp2(pool).Square(E, pool)
-
-	rOut = newTwistPoint(pool)
-	rOut.x.Sub(G, D)
-	rOut.x.Sub(rOut.x, D)
-
-	rOut.z.Add(r.y, r.z)
-	rOut.z.Square(rOut.z, pool)
-	rOut.z.Sub(rOut.z, B)
-	rOut.z.Sub(rOut.z, r.t)
-
-	rOut.y.Sub(D, rOut.x)
-	rOut.y.Mul(rOut.y, E, pool)
-	t := newGFp2(pool).Add(C, C)
-	t.Add(t, t)
-	t.Add(t, t)
-	rOut.y.Sub(rOut.y, t)
-
-	rOut.t.Square(rOut.z, pool)
-
-	t.Mul(E, r.t, pool)
-	t.Add(t, t)
-	b = newGFp2(pool)
-	b.SetZero()
-	b.Sub(b, t)
-	b.MulScalar(b, q.x)
-
-	a = newGFp2(pool)
-	a.Add(r.x, E)
-	a.Square(a, pool)
-	a.Sub(a, A)
-	a.Sub(a, G)
-	t.Add(B, B)
-	t.Add(t, t)
-	a.Sub(a, t)
-
-	c = newGFp2(pool)
-	c.Mul(rOut.z, r.t, pool)
-	c.Add(c, c)
-	c.MulScalar(c, q.y)
-
-	A.Put(pool)
-	B.Put(pool)
-	C.Put(pool)
-	D.Put(pool)
-	E.Put(pool)
-	G.Put(pool)
-	t.Put(pool)
-
-	return
-}
-
-func mulLine(ret *gfP12, a, b, c *gfP2, pool *bnPool) {
-	a2 := newGFp6(pool)
-	a2.x.SetZero()
-	a2.y.Set(a)
-	a2.z.Set(b)
-	a2.Mul(a2, ret.x, pool)
-	t3 := newGFp6(pool).MulScalar(ret.y, c, pool)
-
-	t := newGFp2(pool)
-	t.Add(b, c)
-	t2 := newGFp6(pool)
-	t2.x.SetZero()
-	t2.y.Set(a)
-	t2.z.Set(t)
-	ret.x.Add(ret.x, ret.y)
-
-	ret.y.Set(t3)
-
-	ret.x.Mul(ret.x, t2, pool)
-	ret.x.Sub(ret.x, a2)
-	ret.x.Sub(ret.x, ret.y)
-	a2.MulTau(a2, pool)
-	ret.y.Add(ret.y, a2)
-
-	a2.Put(pool)
-	t3.Put(pool)
-	t2.Put(pool)
-	t.Put(pool)
-}
-
-// sixuPlus2NAF is 6u+2 in non-adjacent form.
-var sixuPlus2NAF = []int8{0, 0, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 0, -1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 1, 0, 0, 0, -1, 0, 1, 0, 0, 0, 1, 0, -1, 0, 0, 0, -1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 0, -1, 0, -1, 0, 0, 0, 0, 1, 0, 0, 0, 1}
-
-// miller implements the Miller loop for calculating the Optimal Ate pairing.
-// See algorithm 1 from http://cryptojedi.org/papers/dclxvi-20100714.pdf
-func miller(q *twistPoint, p *curvePoint, pool *bnPool) *gfP12 {
-	ret := newGFp12(pool)
-	ret.SetOne()
-
-	aAffine := newTwistPoint(pool)
-	aAffine.Set(q)
-	aAffine.MakeAffine(pool)
-
-	bAffine := newCurvePoint(pool)
-	bAffine.Set(p)
-	bAffine.MakeAffine(pool)
-
-	minusA := newTwistPoint(pool)
-	minusA.Negative(aAffine, pool)
-
-	r := newTwistPoint(pool)
-	r.Set(aAffine)
-
-	r2 := newGFp2(pool)
-	r2.Square(aAffine.y, pool)
-
-	for i := len(sixuPlus2NAF) - 1; i > 0; i-- {
-		a, b, c, newR := lineFunctionDouble(r, bAffine, pool)
-		if i != len(sixuPlus2NAF)-1 {
-			ret.Square(ret, pool)
-		}
-
-		mulLine(ret, a, b, c, pool)
-		a.Put(pool)
-		b.Put(pool)
-		c.Put(pool)
-		r.Put(pool)
-		r = newR
-
-		switch sixuPlus2NAF[i-1] {
-		case 1:
-			a, b, c, newR = lineFunctionAdd(r, aAffine, bAffine, r2, pool)
-		case -1:
-			a, b, c, newR = lineFunctionAdd(r, minusA, bAffine, r2, pool)
-		default:
-			continue
-		}
-
-		mulLine(ret, a, b, c, pool)
-		a.Put(pool)
-		b.Put(pool)
-		c.Put(pool)
-		r.Put(pool)
-		r = newR
-	}
-
-	// In order to calculate Q1 we have to convert q from the sextic twist
-	// to the full GF(p^12) group, apply the Frobenius there, and convert
-	// back.
-	//
-	// The twist isomorphism is (x', y') -> (xω², yω³). If we consider just
-	// x for a moment, then after applying the Frobenius, we have x̄ω^(2p)
-	// where x̄ is the conjugate of x. If we are going to apply the inverse
-	// isomorphism we need a value with a single coefficient of ω² so we
-	// rewrite this as x̄ω^(2p-2)ω². ξ⁶ = ω and, due to the construction of
-	// p, 2p-2 is a multiple of six. Therefore we can rewrite as
-	// x̄ξ^((p-1)/3)ω² and applying the inverse isomorphism eliminates the
-	// ω².
-	//
-	// A similar argument can be made for the y value.
-
-	q1 := newTwistPoint(pool)
-	q1.x.Conjugate(aAffine.x)
-	q1.x.Mul(q1.x, xiToPMinus1Over3, pool)
-	q1.y.Conjugate(aAffine.y)
-	q1.y.Mul(q1.y, xiToPMinus1Over2, pool)
-	q1.z.SetOne()
-	q1.t.SetOne()
-
-	// For Q2 we are applying the p² Frobenius. The two conjugations cancel
-	// out and we are left only with the factors from the isomorphism. In
-	// the case of x, we end up with a pure number which is why
-	// xiToPSquaredMinus1Over3 is ∈ GF(p). With y we get a factor of -1. We
-	// ignore this to end up with -Q2.
-
-	minusQ2 := newTwistPoint(pool)
-	minusQ2.x.MulScalar(aAffine.x, xiToPSquaredMinus1Over3)
-	minusQ2.y.Set(aAffine.y)
-	minusQ2.z.SetOne()
-	minusQ2.t.SetOne()
-
-	r2.Square(q1.y, pool)
-	a, b, c, newR := lineFunctionAdd(r, q1, bAffine, r2, pool)
-	mulLine(ret, a, b, c, pool)
-	a.Put(pool)
-	b.Put(pool)
-	c.Put(pool)
-	r.Put(pool)
-	r = newR
-
-	r2.Square(minusQ2.y, pool)
-	a, b, c, newR = lineFunctionAdd(r, minusQ2, bAffine, r2, pool)
-	mulLine(ret, a, b, c, pool)
-	a.Put(pool)
-	b.Put(pool)
-	c.Put(pool)
-	r.Put(pool)
-	r = newR
-
-	aAffine.Put(pool)
-	bAffine.Put(pool)
-	minusA.Put(pool)
-	r.Put(pool)
-	r2.Put(pool)
-
-	return ret
-}
-
-// finalExponentiation computes the (p¹²-1)/Order-th power of an element of
-// GF(p¹²) to obtain an element of GT (steps 13-15 of algorithm 1 from
-// http://cryptojedi.org/papers/dclxvi-20100714.pdf)
-func finalExponentiation(in *gfP12, pool *bnPool) *gfP12 {
-	t1 := newGFp12(pool)
-
-	// This is the p^6-Frobenius
-	t1.x.Negative(in.x)
-	t1.y.Set(in.y)
-
-	inv := newGFp12(pool)
-	inv.Invert(in, pool)
-	t1.Mul(t1, inv, pool)
-
-	t2 := newGFp12(pool).FrobeniusP2(t1, pool)
-	t1.Mul(t1, t2, pool)
-
-	fp := newGFp12(pool).Frobenius(t1, pool)
-	fp2 := newGFp12(pool).FrobeniusP2(t1, pool)
-	fp3 := newGFp12(pool).Frobenius(fp2, pool)
-
-	fu, fu2, fu3 := newGFp12(pool), newGFp12(pool), newGFp12(pool)
-	fu.Exp(t1, u, pool)
-	fu2.Exp(fu, u, pool)
-	fu3.Exp(fu2, u, pool)
-
-	y3 := newGFp12(pool).Frobenius(fu, pool)
-	fu2p := newGFp12(pool).Frobenius(fu2, pool)
-	fu3p := newGFp12(pool).Frobenius(fu3, pool)
-	y2 := newGFp12(pool).FrobeniusP2(fu2, pool)
-
-	y0 := newGFp12(pool)
-	y0.Mul(fp, fp2, pool)
-	y0.Mul(y0, fp3, pool)
-
-	y1, y4, y5 := newGFp12(pool), newGFp12(pool), newGFp12(pool)
-	y1.Conjugate(t1)
-	y5.Conjugate(fu2)
-	y3.Conjugate(y3)
-	y4.Mul(fu, fu2p, pool)
-	y4.Conjugate(y4)
-
-	y6 := newGFp12(pool)
-	y6.Mul(fu3, fu3p, pool)
-	y6.Conjugate(y6)
-
-	t0 := newGFp12(pool)
-	t0.Square(y6, pool)
-	t0.Mul(t0, y4, pool)
-	t0.Mul(t0, y5, pool)
-	t1.Mul(y3, y5, pool)
-	t1.Mul(t1, t0, pool)
-	t0.Mul(t0, y2, pool)
-	t1.Square(t1, pool)
-	t1.Mul(t1, t0, pool)
-	t1.Square(t1, pool)
-	t0.Mul(t1, y1, pool)
-	t1.Mul(t1, y0, pool)
-	t0.Square(t0, pool)
-	t0.Mul(t0, t1, pool)
-
-	inv.Put(pool)
-	t1.Put(pool)
-	t2.Put(pool)
-	fp.Put(pool)
-	fp2.Put(pool)
-	fp3.Put(pool)
-	fu.Put(pool)
-	fu2.Put(pool)
-	fu3.Put(pool)
-	fu2p.Put(pool)
-	fu3p.Put(pool)
-	y0.Put(pool)
-	y1.Put(pool)
-	y2.Put(pool)
-	y3.Put(pool)
-	y4.Put(pool)
-	y5.Put(pool)
-	y6.Put(pool)
-
-	return t0
-}
-
-func optimalAte(a *twistPoint, b *curvePoint, pool *bnPool) *gfP12 {
-	e := miller(a, b, pool)
-	ret := finalExponentiation(e, pool)
-	e.Put(pool)
-
-	if a.IsInfinity() || b.IsInfinity() {
-		ret.SetOne()
-	}
-
-	return ret
-}
diff --git a/installer/vendor/golang.org/x/crypto/bn256/twist.go b/installer/vendor/golang.org/x/crypto/bn256/twist.go
deleted file mode 100644
index 4f8b3fede4..0000000000
--- a/installer/vendor/golang.org/x/crypto/bn256/twist.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bn256
-
-import (
-	"math/big"
-)
-
-// twistPoint implements the elliptic curve y²=x³+3/ξ over GF(p²). Points are
-// kept in Jacobian form and t=z² when valid. The group G₂ is the set of
-// n-torsion points of this curve over GF(p²) (where n = Order)
-type twistPoint struct {
-	x, y, z, t *gfP2
-}
-
-var twistB = &gfP2{
-	bigFromBase10("6500054969564660373279643874235990574282535810762300357187714502686418407178"),
-	bigFromBase10("45500384786952622612957507119651934019977750675336102500314001518804928850249"),
-}
-
-// twistGen is the generator of group G₂.
-var twistGen = &twistPoint{
-	&gfP2{
-		bigFromBase10("21167961636542580255011770066570541300993051739349375019639421053990175267184"),
-		bigFromBase10("64746500191241794695844075326670126197795977525365406531717464316923369116492"),
-	},
-	&gfP2{
-		bigFromBase10("20666913350058776956210519119118544732556678129809273996262322366050359951122"),
-		bigFromBase10("17778617556404439934652658462602675281523610326338642107814333856843981424549"),
-	},
-	&gfP2{
-		bigFromBase10("0"),
-		bigFromBase10("1"),
-	},
-	&gfP2{
-		bigFromBase10("0"),
-		bigFromBase10("1"),
-	},
-}
-
-func newTwistPoint(pool *bnPool) *twistPoint {
-	return &twistPoint{
-		newGFp2(pool),
-		newGFp2(pool),
-		newGFp2(pool),
-		newGFp2(pool),
-	}
-}
-
-func (c *twistPoint) String() string {
-	return "(" + c.x.String() + ", " + c.y.String() + ", " + c.z.String() + ")"
-}
-
-func (c *twistPoint) Put(pool *bnPool) {
-	c.x.Put(pool)
-	c.y.Put(pool)
-	c.z.Put(pool)
-	c.t.Put(pool)
-}
-
-func (c *twistPoint) Set(a *twistPoint) {
-	c.x.Set(a.x)
-	c.y.Set(a.y)
-	c.z.Set(a.z)
-	c.t.Set(a.t)
-}
-
-// IsOnCurve returns true iff c is on the curve where c must be in affine form.
-func (c *twistPoint) IsOnCurve() bool {
-	pool := new(bnPool)
-	yy := newGFp2(pool).Square(c.y, pool)
-	xxx := newGFp2(pool).Square(c.x, pool)
-	xxx.Mul(xxx, c.x, pool)
-	yy.Sub(yy, xxx)
-	yy.Sub(yy, twistB)
-	yy.Minimal()
-	return yy.x.Sign() == 0 && yy.y.Sign() == 0
-}
-
-func (c *twistPoint) SetInfinity() {
-	c.z.SetZero()
-}
-
-func (c *twistPoint) IsInfinity() bool {
-	return c.z.IsZero()
-}
-
-func (c *twistPoint) Add(a, b *twistPoint, pool *bnPool) {
-	// For additional comments, see the same function in curve.go.
-
-	if a.IsInfinity() {
-		c.Set(b)
-		return
-	}
-	if b.IsInfinity() {
-		c.Set(a)
-		return
-	}
-
-	// See http://hyperelliptic.org/EFD/g1p/auto-code/shortw/jacobian-0/addition/add-2007-bl.op3
-	z1z1 := newGFp2(pool).Square(a.z, pool)
-	z2z2 := newGFp2(pool).Square(b.z, pool)
-	u1 := newGFp2(pool).Mul(a.x, z2z2, pool)
-	u2 := newGFp2(pool).Mul(b.x, z1z1, pool)
-
-	t := newGFp2(pool).Mul(b.z, z2z2, pool)
-	s1 := newGFp2(pool).Mul(a.y, t, pool)
-
-	t.Mul(a.z, z1z1, pool)
-	s2 := newGFp2(pool).Mul(b.y, t, pool)
-
-	h := newGFp2(pool).Sub(u2, u1)
-	xEqual := h.IsZero()
-
-	t.Add(h, h)
-	i := newGFp2(pool).Square(t, pool)
-	j := newGFp2(pool).Mul(h, i, pool)
-
-	t.Sub(s2, s1)
-	yEqual := t.IsZero()
-	if xEqual && yEqual {
-		c.Double(a, pool)
-		return
-	}
-	r := newGFp2(pool).Add(t, t)
-
-	v := newGFp2(pool).Mul(u1, i, pool)
-
-	t4 := newGFp2(pool).Square(r, pool)
-	t.Add(v, v)
-	t6 := newGFp2(pool).Sub(t4, j)
-	c.x.Sub(t6, t)
-
-	t.Sub(v, c.x)       // t7
-	t4.Mul(s1, j, pool) // t8
-	t6.Add(t4, t4)      // t9
-	t4.Mul(r, t, pool)  // t10
-	c.y.Sub(t4, t6)
-
-	t.Add(a.z, b.z)    // t11
-	t4.Square(t, pool) // t12
-	t.Sub(t4, z1z1)    // t13
-	t4.Sub(t, z2z2)    // t14
-	c.z.Mul(t4, h, pool)
-
-	z1z1.Put(pool)
-	z2z2.Put(pool)
-	u1.Put(pool)
-	u2.Put(pool)
-	t.Put(pool)
-	s1.Put(pool)
-	s2.Put(pool)
-	h.Put(pool)
-	i.Put(pool)
-	j.Put(pool)
-	r.Put(pool)
-	v.Put(pool)
-	t4.Put(pool)
-	t6.Put(pool)
-}
-
-func (c *twistPoint) Double(a *twistPoint, pool *bnPool) {
-	// See http://hyperelliptic.org/EFD/g1p/auto-code/shortw/jacobian-0/doubling/dbl-2009-l.op3
-	A := newGFp2(pool).Square(a.x, pool)
-	B := newGFp2(pool).Square(a.y, pool)
-	C := newGFp2(pool).Square(B, pool)
-
-	t := newGFp2(pool).Add(a.x, B)
-	t2 := newGFp2(pool).Square(t, pool)
-	t.Sub(t2, A)
-	t2.Sub(t, C)
-	d := newGFp2(pool).Add(t2, t2)
-	t.Add(A, A)
-	e := newGFp2(pool).Add(t, A)
-	f := newGFp2(pool).Square(e, pool)
-
-	t.Add(d, d)
-	c.x.Sub(f, t)
-
-	t.Add(C, C)
-	t2.Add(t, t)
-	t.Add(t2, t2)
-	c.y.Sub(d, c.x)
-	t2.Mul(e, c.y, pool)
-	c.y.Sub(t2, t)
-
-	t.Mul(a.y, a.z, pool)
-	c.z.Add(t, t)
-
-	A.Put(pool)
-	B.Put(pool)
-	C.Put(pool)
-	t.Put(pool)
-	t2.Put(pool)
-	d.Put(pool)
-	e.Put(pool)
-	f.Put(pool)
-}
-
-func (c *twistPoint) Mul(a *twistPoint, scalar *big.Int, pool *bnPool) *twistPoint {
-	sum := newTwistPoint(pool)
-	sum.SetInfinity()
-	t := newTwistPoint(pool)
-
-	for i := scalar.BitLen(); i >= 0; i-- {
-		t.Double(sum, pool)
-		if scalar.Bit(i) != 0 {
-			sum.Add(t, a, pool)
-		} else {
-			sum.Set(t)
-		}
-	}
-
-	c.Set(sum)
-	sum.Put(pool)
-	t.Put(pool)
-	return c
-}
-
-func (c *twistPoint) MakeAffine(pool *bnPool) *twistPoint {
-	if c.z.IsOne() {
-		return c
-	}
-
-	zInv := newGFp2(pool).Invert(c.z, pool)
-	t := newGFp2(pool).Mul(c.y, zInv, pool)
-	zInv2 := newGFp2(pool).Square(zInv, pool)
-	c.y.Mul(t, zInv2, pool)
-	t.Mul(c.x, zInv2, pool)
-	c.x.Set(t)
-	c.z.SetOne()
-	c.t.SetOne()
-
-	zInv.Put(pool)
-	t.Put(pool)
-	zInv2.Put(pool)
-
-	return c
-}
-
-func (c *twistPoint) Negative(a *twistPoint, pool *bnPool) {
-	c.x.Set(a.x)
-	c.y.SetZero()
-	c.y.Sub(c.y, a.y)
-	c.z.Set(a.z)
-	c.t.SetZero()
-}
diff --git a/installer/vendor/golang.org/x/crypto/cast5/cast5.go b/installer/vendor/golang.org/x/crypto/cast5/cast5.go
deleted file mode 100644
index 0b4af37bdc..0000000000
--- a/installer/vendor/golang.org/x/crypto/cast5/cast5.go
+++ /dev/null
@@ -1,526 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cast5 implements CAST5, as defined in RFC 2144. CAST5 is a common
-// OpenPGP cipher.
-package cast5 // import "golang.org/x/crypto/cast5"
-
-import "errors"
-
-const BlockSize = 8
-const KeySize = 16
-
-type Cipher struct {
-	masking [16]uint32
-	rotate  [16]uint8
-}
-
-func NewCipher(key []byte) (c *Cipher, err error) {
-	if len(key) != KeySize {
-		return nil, errors.New("CAST5: keys must be 16 bytes")
-	}
-
-	c = new(Cipher)
-	c.keySchedule(key)
-	return
-}
-
-func (c *Cipher) BlockSize() int {
-	return BlockSize
-}
-
-func (c *Cipher) Encrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-func (c *Cipher) Decrypt(dst, src []byte) {
-	l := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-
-	l, r = r, l^f1(r, c.masking[15], c.rotate[15])
-	l, r = r, l^f3(r, c.masking[14], c.rotate[14])
-	l, r = r, l^f2(r, c.masking[13], c.rotate[13])
-	l, r = r, l^f1(r, c.masking[12], c.rotate[12])
-
-	l, r = r, l^f3(r, c.masking[11], c.rotate[11])
-	l, r = r, l^f2(r, c.masking[10], c.rotate[10])
-	l, r = r, l^f1(r, c.masking[9], c.rotate[9])
-	l, r = r, l^f3(r, c.masking[8], c.rotate[8])
-
-	l, r = r, l^f2(r, c.masking[7], c.rotate[7])
-	l, r = r, l^f1(r, c.masking[6], c.rotate[6])
-	l, r = r, l^f3(r, c.masking[5], c.rotate[5])
-	l, r = r, l^f2(r, c.masking[4], c.rotate[4])
-
-	l, r = r, l^f1(r, c.masking[3], c.rotate[3])
-	l, r = r, l^f3(r, c.masking[2], c.rotate[2])
-	l, r = r, l^f2(r, c.masking[1], c.rotate[1])
-	l, r = r, l^f1(r, c.masking[0], c.rotate[0])
-
-	dst[0] = uint8(r >> 24)
-	dst[1] = uint8(r >> 16)
-	dst[2] = uint8(r >> 8)
-	dst[3] = uint8(r)
-	dst[4] = uint8(l >> 24)
-	dst[5] = uint8(l >> 16)
-	dst[6] = uint8(l >> 8)
-	dst[7] = uint8(l)
-}
-
-type keyScheduleA [4][7]uint8
-type keyScheduleB [4][5]uint8
-
-// keyScheduleRound contains the magic values for a round of the key schedule.
-// The keyScheduleA deals with the lines like:
-//   z0z1z2z3 = x0x1x2x3 ^ S5[xD] ^ S6[xF] ^ S7[xC] ^ S8[xE] ^ S7[x8]
-// Conceptually, both x and z are in the same array, x first. The first
-// element describes which word of this array gets written to and the
-// second, which word gets read. So, for the line above, it's "4, 0", because
-// it's writing to the first word of z, which, being after x, is word 4, and
-// reading from the first word of x: word 0.
-//
-// Next are the indexes into the S-boxes. Now the array is treated as bytes. So
-// "xD" is 0xd. The first byte of z is written as "16 + 0", just to be clear
-// that it's z that we're indexing.
-//
-// keyScheduleB deals with lines like:
-//   K1 = S5[z8] ^ S6[z9] ^ S7[z7] ^ S8[z6] ^ S5[z2]
-// "K1" is ignored because key words are always written in order. So the five
-// elements are the S-box indexes. They use the same form as in keyScheduleA,
-// above.
-
-type keyScheduleRound struct{}
-type keySchedule []keyScheduleRound
-
-var schedule = []struct {
-	a keyScheduleA
-	b keyScheduleB
-}{
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 0x8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 8, 16 + 9, 16 + 7, 16 + 6, 16 + 2},
-			{16 + 0xa, 16 + 0xb, 16 + 5, 16 + 4, 16 + 6},
-			{16 + 0xc, 16 + 0xd, 16 + 3, 16 + 2, 16 + 9},
-			{16 + 0xe, 16 + 0xf, 16 + 1, 16 + 0, 16 + 0xc},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{3, 2, 0xc, 0xd, 8},
-			{1, 0, 0xe, 0xf, 0xd},
-			{7, 6, 8, 9, 3},
-			{5, 4, 0xa, 0xb, 7},
-		},
-	},
-	{
-		keyScheduleA{
-			{4, 0, 0xd, 0xf, 0xc, 0xe, 8},
-			{5, 2, 16 + 0, 16 + 2, 16 + 1, 16 + 3, 0xa},
-			{6, 3, 16 + 7, 16 + 6, 16 + 5, 16 + 4, 9},
-			{7, 1, 16 + 0xa, 16 + 9, 16 + 0xb, 16 + 8, 0xb},
-		},
-		keyScheduleB{
-			{16 + 3, 16 + 2, 16 + 0xc, 16 + 0xd, 16 + 9},
-			{16 + 1, 16 + 0, 16 + 0xe, 16 + 0xf, 16 + 0xc},
-			{16 + 7, 16 + 6, 16 + 8, 16 + 9, 16 + 2},
-			{16 + 5, 16 + 4, 16 + 0xa, 16 + 0xb, 16 + 6},
-		},
-	},
-	{
-		keyScheduleA{
-			{0, 6, 16 + 5, 16 + 7, 16 + 4, 16 + 6, 16 + 0},
-			{1, 4, 0, 2, 1, 3, 16 + 2},
-			{2, 5, 7, 6, 5, 4, 16 + 1},
-			{3, 7, 0xa, 9, 0xb, 8, 16 + 3},
-		},
-		keyScheduleB{
-			{8, 9, 7, 6, 3},
-			{0xa, 0xb, 5, 4, 7},
-			{0xc, 0xd, 3, 2, 8},
-			{0xe, 0xf, 1, 0, 0xd},
-		},
-	},
-}
-
-func (c *Cipher) keySchedule(in []byte) {
-	var t [8]uint32
-	var k [32]uint32
-
-	for i := 0; i < 4; i++ {
-		j := i * 4
-		t[i] = uint32(in[j])<<24 | uint32(in[j+1])<<16 | uint32(in[j+2])<<8 | uint32(in[j+3])
-	}
-
-	x := []byte{6, 7, 4, 5}
-	ki := 0
-
-	for half := 0; half < 2; half++ {
-		for _, round := range schedule {
-			for j := 0; j < 4; j++ {
-				var a [7]uint8
-				copy(a[:], round.a[j][:])
-				w := t[a[1]]
-				w ^= sBox[4][(t[a[2]>>2]>>(24-8*(a[2]&3)))&0xff]
-				w ^= sBox[5][(t[a[3]>>2]>>(24-8*(a[3]&3)))&0xff]
-				w ^= sBox[6][(t[a[4]>>2]>>(24-8*(a[4]&3)))&0xff]
-				w ^= sBox[7][(t[a[5]>>2]>>(24-8*(a[5]&3)))&0xff]
-				w ^= sBox[x[j]][(t[a[6]>>2]>>(24-8*(a[6]&3)))&0xff]
-				t[a[0]] = w
-			}
-
-			for j := 0; j < 4; j++ {
-				var b [5]uint8
-				copy(b[:], round.b[j][:])
-				w := sBox[4][(t[b[0]>>2]>>(24-8*(b[0]&3)))&0xff]
-				w ^= sBox[5][(t[b[1]>>2]>>(24-8*(b[1]&3)))&0xff]
-				w ^= sBox[6][(t[b[2]>>2]>>(24-8*(b[2]&3)))&0xff]
-				w ^= sBox[7][(t[b[3]>>2]>>(24-8*(b[3]&3)))&0xff]
-				w ^= sBox[4+j][(t[b[4]>>2]>>(24-8*(b[4]&3)))&0xff]
-				k[ki] = w
-				ki++
-			}
-		}
-	}
-
-	for i := 0; i < 16; i++ {
-		c.masking[i] = k[i]
-		c.rotate[i] = uint8(k[16+i] & 0x1f)
-	}
-}
-
-// These are the three 'f' functions. See RFC 2144, section 2.2.
-func f1(d, m uint32, r uint8) uint32 {
-	t := m + d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] ^ sBox[1][(I>>16)&0xff]) - sBox[2][(I>>8)&0xff]) + sBox[3][I&0xff]
-}
-
-func f2(d, m uint32, r uint8) uint32 {
-	t := m ^ d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] - sBox[1][(I>>16)&0xff]) + sBox[2][(I>>8)&0xff]) ^ sBox[3][I&0xff]
-}
-
-func f3(d, m uint32, r uint8) uint32 {
-	t := m - d
-	I := (t << r) | (t >> (32 - r))
-	return ((sBox[0][I>>24] + sBox[1][(I>>16)&0xff]) ^ sBox[2][(I>>8)&0xff]) - sBox[3][I&0xff]
-}
-
-var sBox = [8][256]uint32{
-	{
-		0x30fb40d4, 0x9fa0ff0b, 0x6beccd2f, 0x3f258c7a, 0x1e213f2f, 0x9c004dd3, 0x6003e540, 0xcf9fc949,
-		0xbfd4af27, 0x88bbbdb5, 0xe2034090, 0x98d09675, 0x6e63a0e0, 0x15c361d2, 0xc2e7661d, 0x22d4ff8e,
-		0x28683b6f, 0xc07fd059, 0xff2379c8, 0x775f50e2, 0x43c340d3, 0xdf2f8656, 0x887ca41a, 0xa2d2bd2d,
-		0xa1c9e0d6, 0x346c4819, 0x61b76d87, 0x22540f2f, 0x2abe32e1, 0xaa54166b, 0x22568e3a, 0xa2d341d0,
-		0x66db40c8, 0xa784392f, 0x004dff2f, 0x2db9d2de, 0x97943fac, 0x4a97c1d8, 0x527644b7, 0xb5f437a7,
-		0xb82cbaef, 0xd751d159, 0x6ff7f0ed, 0x5a097a1f, 0x827b68d0, 0x90ecf52e, 0x22b0c054, 0xbc8e5935,
-		0x4b6d2f7f, 0x50bb64a2, 0xd2664910, 0xbee5812d, 0xb7332290, 0xe93b159f, 0xb48ee411, 0x4bff345d,
-		0xfd45c240, 0xad31973f, 0xc4f6d02e, 0x55fc8165, 0xd5b1caad, 0xa1ac2dae, 0xa2d4b76d, 0xc19b0c50,
-		0x882240f2, 0x0c6e4f38, 0xa4e4bfd7, 0x4f5ba272, 0x564c1d2f, 0xc59c5319, 0xb949e354, 0xb04669fe,
-		0xb1b6ab8a, 0xc71358dd, 0x6385c545, 0x110f935d, 0x57538ad5, 0x6a390493, 0xe63d37e0, 0x2a54f6b3,
-		0x3a787d5f, 0x6276a0b5, 0x19a6fcdf, 0x7a42206a, 0x29f9d4d5, 0xf61b1891, 0xbb72275e, 0xaa508167,
-		0x38901091, 0xc6b505eb, 0x84c7cb8c, 0x2ad75a0f, 0x874a1427, 0xa2d1936b, 0x2ad286af, 0xaa56d291,
-		0xd7894360, 0x425c750d, 0x93b39e26, 0x187184c9, 0x6c00b32d, 0x73e2bb14, 0xa0bebc3c, 0x54623779,
-		0x64459eab, 0x3f328b82, 0x7718cf82, 0x59a2cea6, 0x04ee002e, 0x89fe78e6, 0x3fab0950, 0x325ff6c2,
-		0x81383f05, 0x6963c5c8, 0x76cb5ad6, 0xd49974c9, 0xca180dcf, 0x380782d5, 0xc7fa5cf6, 0x8ac31511,
-		0x35e79e13, 0x47da91d0, 0xf40f9086, 0xa7e2419e, 0x31366241, 0x051ef495, 0xaa573b04, 0x4a805d8d,
-		0x548300d0, 0x00322a3c, 0xbf64cddf, 0xba57a68e, 0x75c6372b, 0x50afd341, 0xa7c13275, 0x915a0bf5,
-		0x6b54bfab, 0x2b0b1426, 0xab4cc9d7, 0x449ccd82, 0xf7fbf265, 0xab85c5f3, 0x1b55db94, 0xaad4e324,
-		0xcfa4bd3f, 0x2deaa3e2, 0x9e204d02, 0xc8bd25ac, 0xeadf55b3, 0xd5bd9e98, 0xe31231b2, 0x2ad5ad6c,
-		0x954329de, 0xadbe4528, 0xd8710f69, 0xaa51c90f, 0xaa786bf6, 0x22513f1e, 0xaa51a79b, 0x2ad344cc,
-		0x7b5a41f0, 0xd37cfbad, 0x1b069505, 0x41ece491, 0xb4c332e6, 0x032268d4, 0xc9600acc, 0xce387e6d,
-		0xbf6bb16c, 0x6a70fb78, 0x0d03d9c9, 0xd4df39de, 0xe01063da, 0x4736f464, 0x5ad328d8, 0xb347cc96,
-		0x75bb0fc3, 0x98511bfb, 0x4ffbcc35, 0xb58bcf6a, 0xe11f0abc, 0xbfc5fe4a, 0xa70aec10, 0xac39570a,
-		0x3f04442f, 0x6188b153, 0xe0397a2e, 0x5727cb79, 0x9ceb418f, 0x1cacd68d, 0x2ad37c96, 0x0175cb9d,
-		0xc69dff09, 0xc75b65f0, 0xd9db40d8, 0xec0e7779, 0x4744ead4, 0xb11c3274, 0xdd24cb9e, 0x7e1c54bd,
-		0xf01144f9, 0xd2240eb1, 0x9675b3fd, 0xa3ac3755, 0xd47c27af, 0x51c85f4d, 0x56907596, 0xa5bb15e6,
-		0x580304f0, 0xca042cf1, 0x011a37ea, 0x8dbfaadb, 0x35ba3e4a, 0x3526ffa0, 0xc37b4d09, 0xbc306ed9,
-		0x98a52666, 0x5648f725, 0xff5e569d, 0x0ced63d0, 0x7c63b2cf, 0x700b45e1, 0xd5ea50f1, 0x85a92872,
-		0xaf1fbda7, 0xd4234870, 0xa7870bf3, 0x2d3b4d79, 0x42e04198, 0x0cd0ede7, 0x26470db8, 0xf881814c,
-		0x474d6ad7, 0x7c0c5e5c, 0xd1231959, 0x381b7298, 0xf5d2f4db, 0xab838653, 0x6e2f1e23, 0x83719c9e,
-		0xbd91e046, 0x9a56456e, 0xdc39200c, 0x20c8c571, 0x962bda1c, 0xe1e696ff, 0xb141ab08, 0x7cca89b9,
-		0x1a69e783, 0x02cc4843, 0xa2f7c579, 0x429ef47d, 0x427b169c, 0x5ac9f049, 0xdd8f0f00, 0x5c8165bf,
-	},
-	{
-		0x1f201094, 0xef0ba75b, 0x69e3cf7e, 0x393f4380, 0xfe61cf7a, 0xeec5207a, 0x55889c94, 0x72fc0651,
-		0xada7ef79, 0x4e1d7235, 0xd55a63ce, 0xde0436ba, 0x99c430ef, 0x5f0c0794, 0x18dcdb7d, 0xa1d6eff3,
-		0xa0b52f7b, 0x59e83605, 0xee15b094, 0xe9ffd909, 0xdc440086, 0xef944459, 0xba83ccb3, 0xe0c3cdfb,
-		0xd1da4181, 0x3b092ab1, 0xf997f1c1, 0xa5e6cf7b, 0x01420ddb, 0xe4e7ef5b, 0x25a1ff41, 0xe180f806,
-		0x1fc41080, 0x179bee7a, 0xd37ac6a9, 0xfe5830a4, 0x98de8b7f, 0x77e83f4e, 0x79929269, 0x24fa9f7b,
-		0xe113c85b, 0xacc40083, 0xd7503525, 0xf7ea615f, 0x62143154, 0x0d554b63, 0x5d681121, 0xc866c359,
-		0x3d63cf73, 0xcee234c0, 0xd4d87e87, 0x5c672b21, 0x071f6181, 0x39f7627f, 0x361e3084, 0xe4eb573b,
-		0x602f64a4, 0xd63acd9c, 0x1bbc4635, 0x9e81032d, 0x2701f50c, 0x99847ab4, 0xa0e3df79, 0xba6cf38c,
-		0x10843094, 0x2537a95e, 0xf46f6ffe, 0xa1ff3b1f, 0x208cfb6a, 0x8f458c74, 0xd9e0a227, 0x4ec73a34,
-		0xfc884f69, 0x3e4de8df, 0xef0e0088, 0x3559648d, 0x8a45388c, 0x1d804366, 0x721d9bfd, 0xa58684bb,
-		0xe8256333, 0x844e8212, 0x128d8098, 0xfed33fb4, 0xce280ae1, 0x27e19ba5, 0xd5a6c252, 0xe49754bd,
-		0xc5d655dd, 0xeb667064, 0x77840b4d, 0xa1b6a801, 0x84db26a9, 0xe0b56714, 0x21f043b7, 0xe5d05860,
-		0x54f03084, 0x066ff472, 0xa31aa153, 0xdadc4755, 0xb5625dbf, 0x68561be6, 0x83ca6b94, 0x2d6ed23b,
-		0xeccf01db, 0xa6d3d0ba, 0xb6803d5c, 0xaf77a709, 0x33b4a34c, 0x397bc8d6, 0x5ee22b95, 0x5f0e5304,
-		0x81ed6f61, 0x20e74364, 0xb45e1378, 0xde18639b, 0x881ca122, 0xb96726d1, 0x8049a7e8, 0x22b7da7b,
-		0x5e552d25, 0x5272d237, 0x79d2951c, 0xc60d894c, 0x488cb402, 0x1ba4fe5b, 0xa4b09f6b, 0x1ca815cf,
-		0xa20c3005, 0x8871df63, 0xb9de2fcb, 0x0cc6c9e9, 0x0beeff53, 0xe3214517, 0xb4542835, 0x9f63293c,
-		0xee41e729, 0x6e1d2d7c, 0x50045286, 0x1e6685f3, 0xf33401c6, 0x30a22c95, 0x31a70850, 0x60930f13,
-		0x73f98417, 0xa1269859, 0xec645c44, 0x52c877a9, 0xcdff33a6, 0xa02b1741, 0x7cbad9a2, 0x2180036f,
-		0x50d99c08, 0xcb3f4861, 0xc26bd765, 0x64a3f6ab, 0x80342676, 0x25a75e7b, 0xe4e6d1fc, 0x20c710e6,
-		0xcdf0b680, 0x17844d3b, 0x31eef84d, 0x7e0824e4, 0x2ccb49eb, 0x846a3bae, 0x8ff77888, 0xee5d60f6,
-		0x7af75673, 0x2fdd5cdb, 0xa11631c1, 0x30f66f43, 0xb3faec54, 0x157fd7fa, 0xef8579cc, 0xd152de58,
-		0xdb2ffd5e, 0x8f32ce19, 0x306af97a, 0x02f03ef8, 0x99319ad5, 0xc242fa0f, 0xa7e3ebb0, 0xc68e4906,
-		0xb8da230c, 0x80823028, 0xdcdef3c8, 0xd35fb171, 0x088a1bc8, 0xbec0c560, 0x61a3c9e8, 0xbca8f54d,
-		0xc72feffa, 0x22822e99, 0x82c570b4, 0xd8d94e89, 0x8b1c34bc, 0x301e16e6, 0x273be979, 0xb0ffeaa6,
-		0x61d9b8c6, 0x00b24869, 0xb7ffce3f, 0x08dc283b, 0x43daf65a, 0xf7e19798, 0x7619b72f, 0x8f1c9ba4,
-		0xdc8637a0, 0x16a7d3b1, 0x9fc393b7, 0xa7136eeb, 0xc6bcc63e, 0x1a513742, 0xef6828bc, 0x520365d6,
-		0x2d6a77ab, 0x3527ed4b, 0x821fd216, 0x095c6e2e, 0xdb92f2fb, 0x5eea29cb, 0x145892f5, 0x91584f7f,
-		0x5483697b, 0x2667a8cc, 0x85196048, 0x8c4bacea, 0x833860d4, 0x0d23e0f9, 0x6c387e8a, 0x0ae6d249,
-		0xb284600c, 0xd835731d, 0xdcb1c647, 0xac4c56ea, 0x3ebd81b3, 0x230eabb0, 0x6438bc87, 0xf0b5b1fa,
-		0x8f5ea2b3, 0xfc184642, 0x0a036b7a, 0x4fb089bd, 0x649da589, 0xa345415e, 0x5c038323, 0x3e5d3bb9,
-		0x43d79572, 0x7e6dd07c, 0x06dfdf1e, 0x6c6cc4ef, 0x7160a539, 0x73bfbe70, 0x83877605, 0x4523ecf1,
-	},
-	{
-		0x8defc240, 0x25fa5d9f, 0xeb903dbf, 0xe810c907, 0x47607fff, 0x369fe44b, 0x8c1fc644, 0xaececa90,
-		0xbeb1f9bf, 0xeefbcaea, 0xe8cf1950, 0x51df07ae, 0x920e8806, 0xf0ad0548, 0xe13c8d83, 0x927010d5,
-		0x11107d9f, 0x07647db9, 0xb2e3e4d4, 0x3d4f285e, 0xb9afa820, 0xfade82e0, 0xa067268b, 0x8272792e,
-		0x553fb2c0, 0x489ae22b, 0xd4ef9794, 0x125e3fbc, 0x21fffcee, 0x825b1bfd, 0x9255c5ed, 0x1257a240,
-		0x4e1a8302, 0xbae07fff, 0x528246e7, 0x8e57140e, 0x3373f7bf, 0x8c9f8188, 0xa6fc4ee8, 0xc982b5a5,
-		0xa8c01db7, 0x579fc264, 0x67094f31, 0xf2bd3f5f, 0x40fff7c1, 0x1fb78dfc, 0x8e6bd2c1, 0x437be59b,
-		0x99b03dbf, 0xb5dbc64b, 0x638dc0e6, 0x55819d99, 0xa197c81c, 0x4a012d6e, 0xc5884a28, 0xccc36f71,
-		0xb843c213, 0x6c0743f1, 0x8309893c, 0x0feddd5f, 0x2f7fe850, 0xd7c07f7e, 0x02507fbf, 0x5afb9a04,
-		0xa747d2d0, 0x1651192e, 0xaf70bf3e, 0x58c31380, 0x5f98302e, 0x727cc3c4, 0x0a0fb402, 0x0f7fef82,
-		0x8c96fdad, 0x5d2c2aae, 0x8ee99a49, 0x50da88b8, 0x8427f4a0, 0x1eac5790, 0x796fb449, 0x8252dc15,
-		0xefbd7d9b, 0xa672597d, 0xada840d8, 0x45f54504, 0xfa5d7403, 0xe83ec305, 0x4f91751a, 0x925669c2,
-		0x23efe941, 0xa903f12e, 0x60270df2, 0x0276e4b6, 0x94fd6574, 0x927985b2, 0x8276dbcb, 0x02778176,
-		0xf8af918d, 0x4e48f79e, 0x8f616ddf, 0xe29d840e, 0x842f7d83, 0x340ce5c8, 0x96bbb682, 0x93b4b148,
-		0xef303cab, 0x984faf28, 0x779faf9b, 0x92dc560d, 0x224d1e20, 0x8437aa88, 0x7d29dc96, 0x2756d3dc,
-		0x8b907cee, 0xb51fd240, 0xe7c07ce3, 0xe566b4a1, 0xc3e9615e, 0x3cf8209d, 0x6094d1e3, 0xcd9ca341,
-		0x5c76460e, 0x00ea983b, 0xd4d67881, 0xfd47572c, 0xf76cedd9, 0xbda8229c, 0x127dadaa, 0x438a074e,
-		0x1f97c090, 0x081bdb8a, 0x93a07ebe, 0xb938ca15, 0x97b03cff, 0x3dc2c0f8, 0x8d1ab2ec, 0x64380e51,
-		0x68cc7bfb, 0xd90f2788, 0x12490181, 0x5de5ffd4, 0xdd7ef86a, 0x76a2e214, 0xb9a40368, 0x925d958f,
-		0x4b39fffa, 0xba39aee9, 0xa4ffd30b, 0xfaf7933b, 0x6d498623, 0x193cbcfa, 0x27627545, 0x825cf47a,
-		0x61bd8ba0, 0xd11e42d1, 0xcead04f4, 0x127ea392, 0x10428db7, 0x8272a972, 0x9270c4a8, 0x127de50b,
-		0x285ba1c8, 0x3c62f44f, 0x35c0eaa5, 0xe805d231, 0x428929fb, 0xb4fcdf82, 0x4fb66a53, 0x0e7dc15b,
-		0x1f081fab, 0x108618ae, 0xfcfd086d, 0xf9ff2889, 0x694bcc11, 0x236a5cae, 0x12deca4d, 0x2c3f8cc5,
-		0xd2d02dfe, 0xf8ef5896, 0xe4cf52da, 0x95155b67, 0x494a488c, 0xb9b6a80c, 0x5c8f82bc, 0x89d36b45,
-		0x3a609437, 0xec00c9a9, 0x44715253, 0x0a874b49, 0xd773bc40, 0x7c34671c, 0x02717ef6, 0x4feb5536,
-		0xa2d02fff, 0xd2bf60c4, 0xd43f03c0, 0x50b4ef6d, 0x07478cd1, 0x006e1888, 0xa2e53f55, 0xb9e6d4bc,
-		0xa2048016, 0x97573833, 0xd7207d67, 0xde0f8f3d, 0x72f87b33, 0xabcc4f33, 0x7688c55d, 0x7b00a6b0,
-		0x947b0001, 0x570075d2, 0xf9bb88f8, 0x8942019e, 0x4264a5ff, 0x856302e0, 0x72dbd92b, 0xee971b69,
-		0x6ea22fde, 0x5f08ae2b, 0xaf7a616d, 0xe5c98767, 0xcf1febd2, 0x61efc8c2, 0xf1ac2571, 0xcc8239c2,
-		0x67214cb8, 0xb1e583d1, 0xb7dc3e62, 0x7f10bdce, 0xf90a5c38, 0x0ff0443d, 0x606e6dc6, 0x60543a49,
-		0x5727c148, 0x2be98a1d, 0x8ab41738, 0x20e1be24, 0xaf96da0f, 0x68458425, 0x99833be5, 0x600d457d,
-		0x282f9350, 0x8334b362, 0xd91d1120, 0x2b6d8da0, 0x642b1e31, 0x9c305a00, 0x52bce688, 0x1b03588a,
-		0xf7baefd5, 0x4142ed9c, 0xa4315c11, 0x83323ec5, 0xdfef4636, 0xa133c501, 0xe9d3531c, 0xee353783,
-	},
-	{
-		0x9db30420, 0x1fb6e9de, 0xa7be7bef, 0xd273a298, 0x4a4f7bdb, 0x64ad8c57, 0x85510443, 0xfa020ed1,
-		0x7e287aff, 0xe60fb663, 0x095f35a1, 0x79ebf120, 0xfd059d43, 0x6497b7b1, 0xf3641f63, 0x241e4adf,
-		0x28147f5f, 0x4fa2b8cd, 0xc9430040, 0x0cc32220, 0xfdd30b30, 0xc0a5374f, 0x1d2d00d9, 0x24147b15,
-		0xee4d111a, 0x0fca5167, 0x71ff904c, 0x2d195ffe, 0x1a05645f, 0x0c13fefe, 0x081b08ca, 0x05170121,
-		0x80530100, 0xe83e5efe, 0xac9af4f8, 0x7fe72701, 0xd2b8ee5f, 0x06df4261, 0xbb9e9b8a, 0x7293ea25,
-		0xce84ffdf, 0xf5718801, 0x3dd64b04, 0xa26f263b, 0x7ed48400, 0x547eebe6, 0x446d4ca0, 0x6cf3d6f5,
-		0x2649abdf, 0xaea0c7f5, 0x36338cc1, 0x503f7e93, 0xd3772061, 0x11b638e1, 0x72500e03, 0xf80eb2bb,
-		0xabe0502e, 0xec8d77de, 0x57971e81, 0xe14f6746, 0xc9335400, 0x6920318f, 0x081dbb99, 0xffc304a5,
-		0x4d351805, 0x7f3d5ce3, 0xa6c866c6, 0x5d5bcca9, 0xdaec6fea, 0x9f926f91, 0x9f46222f, 0x3991467d,
-		0xa5bf6d8e, 0x1143c44f, 0x43958302, 0xd0214eeb, 0x022083b8, 0x3fb6180c, 0x18f8931e, 0x281658e6,
-		0x26486e3e, 0x8bd78a70, 0x7477e4c1, 0xb506e07c, 0xf32d0a25, 0x79098b02, 0xe4eabb81, 0x28123b23,
-		0x69dead38, 0x1574ca16, 0xdf871b62, 0x211c40b7, 0xa51a9ef9, 0x0014377b, 0x041e8ac8, 0x09114003,
-		0xbd59e4d2, 0xe3d156d5, 0x4fe876d5, 0x2f91a340, 0x557be8de, 0x00eae4a7, 0x0ce5c2ec, 0x4db4bba6,
-		0xe756bdff, 0xdd3369ac, 0xec17b035, 0x06572327, 0x99afc8b0, 0x56c8c391, 0x6b65811c, 0x5e146119,
-		0x6e85cb75, 0xbe07c002, 0xc2325577, 0x893ff4ec, 0x5bbfc92d, 0xd0ec3b25, 0xb7801ab7, 0x8d6d3b24,
-		0x20c763ef, 0xc366a5fc, 0x9c382880, 0x0ace3205, 0xaac9548a, 0xeca1d7c7, 0x041afa32, 0x1d16625a,
-		0x6701902c, 0x9b757a54, 0x31d477f7, 0x9126b031, 0x36cc6fdb, 0xc70b8b46, 0xd9e66a48, 0x56e55a79,
-		0x026a4ceb, 0x52437eff, 0x2f8f76b4, 0x0df980a5, 0x8674cde3, 0xedda04eb, 0x17a9be04, 0x2c18f4df,
-		0xb7747f9d, 0xab2af7b4, 0xefc34d20, 0x2e096b7c, 0x1741a254, 0xe5b6a035, 0x213d42f6, 0x2c1c7c26,
-		0x61c2f50f, 0x6552daf9, 0xd2c231f8, 0x25130f69, 0xd8167fa2, 0x0418f2c8, 0x001a96a6, 0x0d1526ab,
-		0x63315c21, 0x5e0a72ec, 0x49bafefd, 0x187908d9, 0x8d0dbd86, 0x311170a7, 0x3e9b640c, 0xcc3e10d7,
-		0xd5cad3b6, 0x0caec388, 0xf73001e1, 0x6c728aff, 0x71eae2a1, 0x1f9af36e, 0xcfcbd12f, 0xc1de8417,
-		0xac07be6b, 0xcb44a1d8, 0x8b9b0f56, 0x013988c3, 0xb1c52fca, 0xb4be31cd, 0xd8782806, 0x12a3a4e2,
-		0x6f7de532, 0x58fd7eb6, 0xd01ee900, 0x24adffc2, 0xf4990fc5, 0x9711aac5, 0x001d7b95, 0x82e5e7d2,
-		0x109873f6, 0x00613096, 0xc32d9521, 0xada121ff, 0x29908415, 0x7fbb977f, 0xaf9eb3db, 0x29c9ed2a,
-		0x5ce2a465, 0xa730f32c, 0xd0aa3fe8, 0x8a5cc091, 0xd49e2ce7, 0x0ce454a9, 0xd60acd86, 0x015f1919,
-		0x77079103, 0xdea03af6, 0x78a8565e, 0xdee356df, 0x21f05cbe, 0x8b75e387, 0xb3c50651, 0xb8a5c3ef,
-		0xd8eeb6d2, 0xe523be77, 0xc2154529, 0x2f69efdf, 0xafe67afb, 0xf470c4b2, 0xf3e0eb5b, 0xd6cc9876,
-		0x39e4460c, 0x1fda8538, 0x1987832f, 0xca007367, 0xa99144f8, 0x296b299e, 0x492fc295, 0x9266beab,
-		0xb5676e69, 0x9bd3ddda, 0xdf7e052f, 0xdb25701c, 0x1b5e51ee, 0xf65324e6, 0x6afce36c, 0x0316cc04,
-		0x8644213e, 0xb7dc59d0, 0x7965291f, 0xccd6fd43, 0x41823979, 0x932bcdf6, 0xb657c34d, 0x4edfd282,
-		0x7ae5290c, 0x3cb9536b, 0x851e20fe, 0x9833557e, 0x13ecf0b0, 0xd3ffb372, 0x3f85c5c1, 0x0aef7ed2,
-	},
-	{
-		0x7ec90c04, 0x2c6e74b9, 0x9b0e66df, 0xa6337911, 0xb86a7fff, 0x1dd358f5, 0x44dd9d44, 0x1731167f,
-		0x08fbf1fa, 0xe7f511cc, 0xd2051b00, 0x735aba00, 0x2ab722d8, 0x386381cb, 0xacf6243a, 0x69befd7a,
-		0xe6a2e77f, 0xf0c720cd, 0xc4494816, 0xccf5c180, 0x38851640, 0x15b0a848, 0xe68b18cb, 0x4caadeff,
-		0x5f480a01, 0x0412b2aa, 0x259814fc, 0x41d0efe2, 0x4e40b48d, 0x248eb6fb, 0x8dba1cfe, 0x41a99b02,
-		0x1a550a04, 0xba8f65cb, 0x7251f4e7, 0x95a51725, 0xc106ecd7, 0x97a5980a, 0xc539b9aa, 0x4d79fe6a,
-		0xf2f3f763, 0x68af8040, 0xed0c9e56, 0x11b4958b, 0xe1eb5a88, 0x8709e6b0, 0xd7e07156, 0x4e29fea7,
-		0x6366e52d, 0x02d1c000, 0xc4ac8e05, 0x9377f571, 0x0c05372a, 0x578535f2, 0x2261be02, 0xd642a0c9,
-		0xdf13a280, 0x74b55bd2, 0x682199c0, 0xd421e5ec, 0x53fb3ce8, 0xc8adedb3, 0x28a87fc9, 0x3d959981,
-		0x5c1ff900, 0xfe38d399, 0x0c4eff0b, 0x062407ea, 0xaa2f4fb1, 0x4fb96976, 0x90c79505, 0xb0a8a774,
-		0xef55a1ff, 0xe59ca2c2, 0xa6b62d27, 0xe66a4263, 0xdf65001f, 0x0ec50966, 0xdfdd55bc, 0x29de0655,
-		0x911e739a, 0x17af8975, 0x32c7911c, 0x89f89468, 0x0d01e980, 0x524755f4, 0x03b63cc9, 0x0cc844b2,
-		0xbcf3f0aa, 0x87ac36e9, 0xe53a7426, 0x01b3d82b, 0x1a9e7449, 0x64ee2d7e, 0xcddbb1da, 0x01c94910,
-		0xb868bf80, 0x0d26f3fd, 0x9342ede7, 0x04a5c284, 0x636737b6, 0x50f5b616, 0xf24766e3, 0x8eca36c1,
-		0x136e05db, 0xfef18391, 0xfb887a37, 0xd6e7f7d4, 0xc7fb7dc9, 0x3063fcdf, 0xb6f589de, 0xec2941da,
-		0x26e46695, 0xb7566419, 0xf654efc5, 0xd08d58b7, 0x48925401, 0xc1bacb7f, 0xe5ff550f, 0xb6083049,
-		0x5bb5d0e8, 0x87d72e5a, 0xab6a6ee1, 0x223a66ce, 0xc62bf3cd, 0x9e0885f9, 0x68cb3e47, 0x086c010f,
-		0xa21de820, 0xd18b69de, 0xf3f65777, 0xfa02c3f6, 0x407edac3, 0xcbb3d550, 0x1793084d, 0xb0d70eba,
-		0x0ab378d5, 0xd951fb0c, 0xded7da56, 0x4124bbe4, 0x94ca0b56, 0x0f5755d1, 0xe0e1e56e, 0x6184b5be,
-		0x580a249f, 0x94f74bc0, 0xe327888e, 0x9f7b5561, 0xc3dc0280, 0x05687715, 0x646c6bd7, 0x44904db3,
-		0x66b4f0a3, 0xc0f1648a, 0x697ed5af, 0x49e92ff6, 0x309e374f, 0x2cb6356a, 0x85808573, 0x4991f840,
-		0x76f0ae02, 0x083be84d, 0x28421c9a, 0x44489406, 0x736e4cb8, 0xc1092910, 0x8bc95fc6, 0x7d869cf4,
-		0x134f616f, 0x2e77118d, 0xb31b2be1, 0xaa90b472, 0x3ca5d717, 0x7d161bba, 0x9cad9010, 0xaf462ba2,
-		0x9fe459d2, 0x45d34559, 0xd9f2da13, 0xdbc65487, 0xf3e4f94e, 0x176d486f, 0x097c13ea, 0x631da5c7,
-		0x445f7382, 0x175683f4, 0xcdc66a97, 0x70be0288, 0xb3cdcf72, 0x6e5dd2f3, 0x20936079, 0x459b80a5,
-		0xbe60e2db, 0xa9c23101, 0xeba5315c, 0x224e42f2, 0x1c5c1572, 0xf6721b2c, 0x1ad2fff3, 0x8c25404e,
-		0x324ed72f, 0x4067b7fd, 0x0523138e, 0x5ca3bc78, 0xdc0fd66e, 0x75922283, 0x784d6b17, 0x58ebb16e,
-		0x44094f85, 0x3f481d87, 0xfcfeae7b, 0x77b5ff76, 0x8c2302bf, 0xaaf47556, 0x5f46b02a, 0x2b092801,
-		0x3d38f5f7, 0x0ca81f36, 0x52af4a8a, 0x66d5e7c0, 0xdf3b0874, 0x95055110, 0x1b5ad7a8, 0xf61ed5ad,
-		0x6cf6e479, 0x20758184, 0xd0cefa65, 0x88f7be58, 0x4a046826, 0x0ff6f8f3, 0xa09c7f70, 0x5346aba0,
-		0x5ce96c28, 0xe176eda3, 0x6bac307f, 0x376829d2, 0x85360fa9, 0x17e3fe2a, 0x24b79767, 0xf5a96b20,
-		0xd6cd2595, 0x68ff1ebf, 0x7555442c, 0xf19f06be, 0xf9e0659a, 0xeeb9491d, 0x34010718, 0xbb30cab8,
-		0xe822fe15, 0x88570983, 0x750e6249, 0xda627e55, 0x5e76ffa8, 0xb1534546, 0x6d47de08, 0xefe9e7d4,
-	},
-	{
-		0xf6fa8f9d, 0x2cac6ce1, 0x4ca34867, 0xe2337f7c, 0x95db08e7, 0x016843b4, 0xeced5cbc, 0x325553ac,
-		0xbf9f0960, 0xdfa1e2ed, 0x83f0579d, 0x63ed86b9, 0x1ab6a6b8, 0xde5ebe39, 0xf38ff732, 0x8989b138,
-		0x33f14961, 0xc01937bd, 0xf506c6da, 0xe4625e7e, 0xa308ea99, 0x4e23e33c, 0x79cbd7cc, 0x48a14367,
-		0xa3149619, 0xfec94bd5, 0xa114174a, 0xeaa01866, 0xa084db2d, 0x09a8486f, 0xa888614a, 0x2900af98,
-		0x01665991, 0xe1992863, 0xc8f30c60, 0x2e78ef3c, 0xd0d51932, 0xcf0fec14, 0xf7ca07d2, 0xd0a82072,
-		0xfd41197e, 0x9305a6b0, 0xe86be3da, 0x74bed3cd, 0x372da53c, 0x4c7f4448, 0xdab5d440, 0x6dba0ec3,
-		0x083919a7, 0x9fbaeed9, 0x49dbcfb0, 0x4e670c53, 0x5c3d9c01, 0x64bdb941, 0x2c0e636a, 0xba7dd9cd,
-		0xea6f7388, 0xe70bc762, 0x35f29adb, 0x5c4cdd8d, 0xf0d48d8c, 0xb88153e2, 0x08a19866, 0x1ae2eac8,
-		0x284caf89, 0xaa928223, 0x9334be53, 0x3b3a21bf, 0x16434be3, 0x9aea3906, 0xefe8c36e, 0xf890cdd9,
-		0x80226dae, 0xc340a4a3, 0xdf7e9c09, 0xa694a807, 0x5b7c5ecc, 0x221db3a6, 0x9a69a02f, 0x68818a54,
-		0xceb2296f, 0x53c0843a, 0xfe893655, 0x25bfe68a, 0xb4628abc, 0xcf222ebf, 0x25ac6f48, 0xa9a99387,
-		0x53bddb65, 0xe76ffbe7, 0xe967fd78, 0x0ba93563, 0x8e342bc1, 0xe8a11be9, 0x4980740d, 0xc8087dfc,
-		0x8de4bf99, 0xa11101a0, 0x7fd37975, 0xda5a26c0, 0xe81f994f, 0x9528cd89, 0xfd339fed, 0xb87834bf,
-		0x5f04456d, 0x22258698, 0xc9c4c83b, 0x2dc156be, 0x4f628daa, 0x57f55ec5, 0xe2220abe, 0xd2916ebf,
-		0x4ec75b95, 0x24f2c3c0, 0x42d15d99, 0xcd0d7fa0, 0x7b6e27ff, 0xa8dc8af0, 0x7345c106, 0xf41e232f,
-		0x35162386, 0xe6ea8926, 0x3333b094, 0x157ec6f2, 0x372b74af, 0x692573e4, 0xe9a9d848, 0xf3160289,
-		0x3a62ef1d, 0xa787e238, 0xf3a5f676, 0x74364853, 0x20951063, 0x4576698d, 0xb6fad407, 0x592af950,
-		0x36f73523, 0x4cfb6e87, 0x7da4cec0, 0x6c152daa, 0xcb0396a8, 0xc50dfe5d, 0xfcd707ab, 0x0921c42f,
-		0x89dff0bb, 0x5fe2be78, 0x448f4f33, 0x754613c9, 0x2b05d08d, 0x48b9d585, 0xdc049441, 0xc8098f9b,
-		0x7dede786, 0xc39a3373, 0x42410005, 0x6a091751, 0x0ef3c8a6, 0x890072d6, 0x28207682, 0xa9a9f7be,
-		0xbf32679d, 0xd45b5b75, 0xb353fd00, 0xcbb0e358, 0x830f220a, 0x1f8fb214, 0xd372cf08, 0xcc3c4a13,
-		0x8cf63166, 0x061c87be, 0x88c98f88, 0x6062e397, 0x47cf8e7a, 0xb6c85283, 0x3cc2acfb, 0x3fc06976,
-		0x4e8f0252, 0x64d8314d, 0xda3870e3, 0x1e665459, 0xc10908f0, 0x513021a5, 0x6c5b68b7, 0x822f8aa0,
-		0x3007cd3e, 0x74719eef, 0xdc872681, 0x073340d4, 0x7e432fd9, 0x0c5ec241, 0x8809286c, 0xf592d891,
-		0x08a930f6, 0x957ef305, 0xb7fbffbd, 0xc266e96f, 0x6fe4ac98, 0xb173ecc0, 0xbc60b42a, 0x953498da,
-		0xfba1ae12, 0x2d4bd736, 0x0f25faab, 0xa4f3fceb, 0xe2969123, 0x257f0c3d, 0x9348af49, 0x361400bc,
-		0xe8816f4a, 0x3814f200, 0xa3f94043, 0x9c7a54c2, 0xbc704f57, 0xda41e7f9, 0xc25ad33a, 0x54f4a084,
-		0xb17f5505, 0x59357cbe, 0xedbd15c8, 0x7f97c5ab, 0xba5ac7b5, 0xb6f6deaf, 0x3a479c3a, 0x5302da25,
-		0x653d7e6a, 0x54268d49, 0x51a477ea, 0x5017d55b, 0xd7d25d88, 0x44136c76, 0x0404a8c8, 0xb8e5a121,
-		0xb81a928a, 0x60ed5869, 0x97c55b96, 0xeaec991b, 0x29935913, 0x01fdb7f1, 0x088e8dfa, 0x9ab6f6f5,
-		0x3b4cbf9f, 0x4a5de3ab, 0xe6051d35, 0xa0e1d855, 0xd36b4cf1, 0xf544edeb, 0xb0e93524, 0xbebb8fbd,
-		0xa2d762cf, 0x49c92f54, 0x38b5f331, 0x7128a454, 0x48392905, 0xa65b1db8, 0x851c97bd, 0xd675cf2f,
-	},
-	{
-		0x85e04019, 0x332bf567, 0x662dbfff, 0xcfc65693, 0x2a8d7f6f, 0xab9bc912, 0xde6008a1, 0x2028da1f,
-		0x0227bce7, 0x4d642916, 0x18fac300, 0x50f18b82, 0x2cb2cb11, 0xb232e75c, 0x4b3695f2, 0xb28707de,
-		0xa05fbcf6, 0xcd4181e9, 0xe150210c, 0xe24ef1bd, 0xb168c381, 0xfde4e789, 0x5c79b0d8, 0x1e8bfd43,
-		0x4d495001, 0x38be4341, 0x913cee1d, 0x92a79c3f, 0x089766be, 0xbaeeadf4, 0x1286becf, 0xb6eacb19,
-		0x2660c200, 0x7565bde4, 0x64241f7a, 0x8248dca9, 0xc3b3ad66, 0x28136086, 0x0bd8dfa8, 0x356d1cf2,
-		0x107789be, 0xb3b2e9ce, 0x0502aa8f, 0x0bc0351e, 0x166bf52a, 0xeb12ff82, 0xe3486911, 0xd34d7516,
-		0x4e7b3aff, 0x5f43671b, 0x9cf6e037, 0x4981ac83, 0x334266ce, 0x8c9341b7, 0xd0d854c0, 0xcb3a6c88,
-		0x47bc2829, 0x4725ba37, 0xa66ad22b, 0x7ad61f1e, 0x0c5cbafa, 0x4437f107, 0xb6e79962, 0x42d2d816,
-		0x0a961288, 0xe1a5c06e, 0x13749e67, 0x72fc081a, 0xb1d139f7, 0xf9583745, 0xcf19df58, 0xbec3f756,
-		0xc06eba30, 0x07211b24, 0x45c28829, 0xc95e317f, 0xbc8ec511, 0x38bc46e9, 0xc6e6fa14, 0xbae8584a,
-		0xad4ebc46, 0x468f508b, 0x7829435f, 0xf124183b, 0x821dba9f, 0xaff60ff4, 0xea2c4e6d, 0x16e39264,
-		0x92544a8b, 0x009b4fc3, 0xaba68ced, 0x9ac96f78, 0x06a5b79a, 0xb2856e6e, 0x1aec3ca9, 0xbe838688,
-		0x0e0804e9, 0x55f1be56, 0xe7e5363b, 0xb3a1f25d, 0xf7debb85, 0x61fe033c, 0x16746233, 0x3c034c28,
-		0xda6d0c74, 0x79aac56c, 0x3ce4e1ad, 0x51f0c802, 0x98f8f35a, 0x1626a49f, 0xeed82b29, 0x1d382fe3,
-		0x0c4fb99a, 0xbb325778, 0x3ec6d97b, 0x6e77a6a9, 0xcb658b5c, 0xd45230c7, 0x2bd1408b, 0x60c03eb7,
-		0xb9068d78, 0xa33754f4, 0xf430c87d, 0xc8a71302, 0xb96d8c32, 0xebd4e7be, 0xbe8b9d2d, 0x7979fb06,
-		0xe7225308, 0x8b75cf77, 0x11ef8da4, 0xe083c858, 0x8d6b786f, 0x5a6317a6, 0xfa5cf7a0, 0x5dda0033,
-		0xf28ebfb0, 0xf5b9c310, 0xa0eac280, 0x08b9767a, 0xa3d9d2b0, 0x79d34217, 0x021a718d, 0x9ac6336a,
-		0x2711fd60, 0x438050e3, 0x069908a8, 0x3d7fedc4, 0x826d2bef, 0x4eeb8476, 0x488dcf25, 0x36c9d566,
-		0x28e74e41, 0xc2610aca, 0x3d49a9cf, 0xbae3b9df, 0xb65f8de6, 0x92aeaf64, 0x3ac7d5e6, 0x9ea80509,
-		0xf22b017d, 0xa4173f70, 0xdd1e16c3, 0x15e0d7f9, 0x50b1b887, 0x2b9f4fd5, 0x625aba82, 0x6a017962,
-		0x2ec01b9c, 0x15488aa9, 0xd716e740, 0x40055a2c, 0x93d29a22, 0xe32dbf9a, 0x058745b9, 0x3453dc1e,
-		0xd699296e, 0x496cff6f, 0x1c9f4986, 0xdfe2ed07, 0xb87242d1, 0x19de7eae, 0x053e561a, 0x15ad6f8c,
-		0x66626c1c, 0x7154c24c, 0xea082b2a, 0x93eb2939, 0x17dcb0f0, 0x58d4f2ae, 0x9ea294fb, 0x52cf564c,
-		0x9883fe66, 0x2ec40581, 0x763953c3, 0x01d6692e, 0xd3a0c108, 0xa1e7160e, 0xe4f2dfa6, 0x693ed285,
-		0x74904698, 0x4c2b0edd, 0x4f757656, 0x5d393378, 0xa132234f, 0x3d321c5d, 0xc3f5e194, 0x4b269301,
-		0xc79f022f, 0x3c997e7e, 0x5e4f9504, 0x3ffafbbd, 0x76f7ad0e, 0x296693f4, 0x3d1fce6f, 0xc61e45be,
-		0xd3b5ab34, 0xf72bf9b7, 0x1b0434c0, 0x4e72b567, 0x5592a33d, 0xb5229301, 0xcfd2a87f, 0x60aeb767,
-		0x1814386b, 0x30bcc33d, 0x38a0c07d, 0xfd1606f2, 0xc363519b, 0x589dd390, 0x5479f8e6, 0x1cb8d647,
-		0x97fd61a9, 0xea7759f4, 0x2d57539d, 0x569a58cf, 0xe84e63ad, 0x462e1b78, 0x6580f87e, 0xf3817914,
-		0x91da55f4, 0x40a230f3, 0xd1988f35, 0xb6e318d2, 0x3ffa50bc, 0x3d40f021, 0xc3c0bdae, 0x4958c24c,
-		0x518f36b2, 0x84b1d370, 0x0fedce83, 0x878ddada, 0xf2a279c7, 0x94e01be8, 0x90716f4b, 0x954b8aa3,
-	},
-	{
-		0xe216300d, 0xbbddfffc, 0xa7ebdabd, 0x35648095, 0x7789f8b7, 0xe6c1121b, 0x0e241600, 0x052ce8b5,
-		0x11a9cfb0, 0xe5952f11, 0xece7990a, 0x9386d174, 0x2a42931c, 0x76e38111, 0xb12def3a, 0x37ddddfc,
-		0xde9adeb1, 0x0a0cc32c, 0xbe197029, 0x84a00940, 0xbb243a0f, 0xb4d137cf, 0xb44e79f0, 0x049eedfd,
-		0x0b15a15d, 0x480d3168, 0x8bbbde5a, 0x669ded42, 0xc7ece831, 0x3f8f95e7, 0x72df191b, 0x7580330d,
-		0x94074251, 0x5c7dcdfa, 0xabbe6d63, 0xaa402164, 0xb301d40a, 0x02e7d1ca, 0x53571dae, 0x7a3182a2,
-		0x12a8ddec, 0xfdaa335d, 0x176f43e8, 0x71fb46d4, 0x38129022, 0xce949ad4, 0xb84769ad, 0x965bd862,
-		0x82f3d055, 0x66fb9767, 0x15b80b4e, 0x1d5b47a0, 0x4cfde06f, 0xc28ec4b8, 0x57e8726e, 0x647a78fc,
-		0x99865d44, 0x608bd593, 0x6c200e03, 0x39dc5ff6, 0x5d0b00a3, 0xae63aff2, 0x7e8bd632, 0x70108c0c,
-		0xbbd35049, 0x2998df04, 0x980cf42a, 0x9b6df491, 0x9e7edd53, 0x06918548, 0x58cb7e07, 0x3b74ef2e,
-		0x522fffb1, 0xd24708cc, 0x1c7e27cd, 0xa4eb215b, 0x3cf1d2e2, 0x19b47a38, 0x424f7618, 0x35856039,
-		0x9d17dee7, 0x27eb35e6, 0xc9aff67b, 0x36baf5b8, 0x09c467cd, 0xc18910b1, 0xe11dbf7b, 0x06cd1af8,
-		0x7170c608, 0x2d5e3354, 0xd4de495a, 0x64c6d006, 0xbcc0c62c, 0x3dd00db3, 0x708f8f34, 0x77d51b42,
-		0x264f620f, 0x24b8d2bf, 0x15c1b79e, 0x46a52564, 0xf8d7e54e, 0x3e378160, 0x7895cda5, 0x859c15a5,
-		0xe6459788, 0xc37bc75f, 0xdb07ba0c, 0x0676a3ab, 0x7f229b1e, 0x31842e7b, 0x24259fd7, 0xf8bef472,
-		0x835ffcb8, 0x6df4c1f2, 0x96f5b195, 0xfd0af0fc, 0xb0fe134c, 0xe2506d3d, 0x4f9b12ea, 0xf215f225,
-		0xa223736f, 0x9fb4c428, 0x25d04979, 0x34c713f8, 0xc4618187, 0xea7a6e98, 0x7cd16efc, 0x1436876c,
-		0xf1544107, 0xbedeee14, 0x56e9af27, 0xa04aa441, 0x3cf7c899, 0x92ecbae6, 0xdd67016d, 0x151682eb,
-		0xa842eedf, 0xfdba60b4, 0xf1907b75, 0x20e3030f, 0x24d8c29e, 0xe139673b, 0xefa63fb8, 0x71873054,
-		0xb6f2cf3b, 0x9f326442, 0xcb15a4cc, 0xb01a4504, 0xf1e47d8d, 0x844a1be5, 0xbae7dfdc, 0x42cbda70,
-		0xcd7dae0a, 0x57e85b7a, 0xd53f5af6, 0x20cf4d8c, 0xcea4d428, 0x79d130a4, 0x3486ebfb, 0x33d3cddc,
-		0x77853b53, 0x37effcb5, 0xc5068778, 0xe580b3e6, 0x4e68b8f4, 0xc5c8b37e, 0x0d809ea2, 0x398feb7c,
-		0x132a4f94, 0x43b7950e, 0x2fee7d1c, 0x223613bd, 0xdd06caa2, 0x37df932b, 0xc4248289, 0xacf3ebc3,
-		0x5715f6b7, 0xef3478dd, 0xf267616f, 0xc148cbe4, 0x9052815e, 0x5e410fab, 0xb48a2465, 0x2eda7fa4,
-		0xe87b40e4, 0xe98ea084, 0x5889e9e1, 0xefd390fc, 0xdd07d35b, 0xdb485694, 0x38d7e5b2, 0x57720101,
-		0x730edebc, 0x5b643113, 0x94917e4f, 0x503c2fba, 0x646f1282, 0x7523d24a, 0xe0779695, 0xf9c17a8f,
-		0x7a5b2121, 0xd187b896, 0x29263a4d, 0xba510cdf, 0x81f47c9f, 0xad1163ed, 0xea7b5965, 0x1a00726e,
-		0x11403092, 0x00da6d77, 0x4a0cdd61, 0xad1f4603, 0x605bdfb0, 0x9eedc364, 0x22ebe6a8, 0xcee7d28a,
-		0xa0e736a0, 0x5564a6b9, 0x10853209, 0xc7eb8f37, 0x2de705ca, 0x8951570f, 0xdf09822b, 0xbd691a6c,
-		0xaa12e4f2, 0x87451c0f, 0xe0f6a27a, 0x3ada4819, 0x4cf1764f, 0x0d771c2b, 0x67cdb156, 0x350d8384,
-		0x5938fa0f, 0x42399ef3, 0x36997b07, 0x0e84093d, 0x4aa93e61, 0x8360d87b, 0x1fa98b0c, 0x1149382c,
-		0xe97625a5, 0x0614d1b7, 0x0e25244b, 0x0c768347, 0x589e8d82, 0x0d2059d1, 0xa466bb1e, 0xf8da0a82,
-		0x04f19130, 0xba6e4ec0, 0x99265164, 0x1ee7230d, 0x50b2ad80, 0xeaee6801, 0x8db2a283, 0xea8bf59e,
-	},
-}
diff --git a/installer/vendor/golang.org/x/crypto/cast5/cast5_test.go b/installer/vendor/golang.org/x/crypto/cast5/cast5_test.go
deleted file mode 100644
index 778b272a63..0000000000
--- a/installer/vendor/golang.org/x/crypto/cast5/cast5_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cast5
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-// This test vector is taken from RFC 2144, App B.1.
-// Since the other two test vectors are for reduced-round variants, we can't
-// use them.
-var basicTests = []struct {
-	key, plainText, cipherText string
-}{
-	{
-		"0123456712345678234567893456789a",
-		"0123456789abcdef",
-		"238b4fe5847e44b2",
-	},
-}
-
-func TestBasic(t *testing.T) {
-	for i, test := range basicTests {
-		key, _ := hex.DecodeString(test.key)
-		plainText, _ := hex.DecodeString(test.plainText)
-		expected, _ := hex.DecodeString(test.cipherText)
-
-		c, err := NewCipher(key)
-		if err != nil {
-			t.Errorf("#%d: failed to create Cipher: %s", i, err)
-			continue
-		}
-		var cipherText [BlockSize]byte
-		c.Encrypt(cipherText[:], plainText)
-		if !bytes.Equal(cipherText[:], expected) {
-			t.Errorf("#%d: got:%x want:%x", i, cipherText, expected)
-		}
-
-		var plainTextAgain [BlockSize]byte
-		c.Decrypt(plainTextAgain[:], cipherText[:])
-		if !bytes.Equal(plainTextAgain[:], plainText) {
-			t.Errorf("#%d: got:%x want:%x", i, plainTextAgain, plainText)
-		}
-	}
-}
-
-// TestFull performs the test specified in RFC 2144, App B.2.
-// However, due to the length of time taken, it's disabled here and a more
-// limited version is included, below.
-func TestFull(t *testing.T) {
-	if testing.Short() {
-		// This is too slow for normal testing
-		return
-	}
-
-	a, b := iterate(1000000)
-
-	const expectedA = "eea9d0a249fd3ba6b3436fb89d6dca92"
-	const expectedB = "b2c95eb00c31ad7180ac05b8e83d696e"
-
-	if hex.EncodeToString(a) != expectedA {
-		t.Errorf("a: got:%x want:%s", a, expectedA)
-	}
-	if hex.EncodeToString(b) != expectedB {
-		t.Errorf("b: got:%x want:%s", b, expectedB)
-	}
-}
-
-func iterate(iterations int) ([]byte, []byte) {
-	const initValueHex = "0123456712345678234567893456789a"
-
-	initValue, _ := hex.DecodeString(initValueHex)
-
-	var a, b [16]byte
-	copy(a[:], initValue)
-	copy(b[:], initValue)
-
-	for i := 0; i < iterations; i++ {
-		c, _ := NewCipher(b[:])
-		c.Encrypt(a[:8], a[:8])
-		c.Encrypt(a[8:], a[8:])
-		c, _ = NewCipher(a[:])
-		c.Encrypt(b[:8], b[:8])
-		c.Encrypt(b[8:], b[8:])
-	}
-
-	return a[:], b[:]
-}
-
-func TestLimited(t *testing.T) {
-	a, b := iterate(1000)
-
-	const expectedA = "23f73b14b02a2ad7dfb9f2c35644798d"
-	const expectedB = "e5bf37eff14c456a40b21ce369370a9f"
-
-	if hex.EncodeToString(a) != expectedA {
-		t.Errorf("a: got:%x want:%s", a, expectedA)
-	}
-	if hex.EncodeToString(b) != expectedB {
-		t.Errorf("b: got:%x want:%s", b, expectedB)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305.go
deleted file mode 100644
index 3f0dcb9d8c..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package chacha20poly1305 implements the ChaCha20-Poly1305 AEAD as specified in RFC 7539.
-package chacha20poly1305 // import "golang.org/x/crypto/chacha20poly1305"
-
-import (
-	"crypto/cipher"
-	"errors"
-)
-
-const (
-	// KeySize is the size of the key used by this AEAD, in bytes.
-	KeySize = 32
-	// NonceSize is the size of the nonce used with this AEAD, in bytes.
-	NonceSize = 12
-)
-
-type chacha20poly1305 struct {
-	key [32]byte
-}
-
-// New returns a ChaCha20-Poly1305 AEAD that uses the given, 256-bit key.
-func New(key []byte) (cipher.AEAD, error) {
-	if len(key) != KeySize {
-		return nil, errors.New("chacha20poly1305: bad key length")
-	}
-	ret := new(chacha20poly1305)
-	copy(ret.key[:], key)
-	return ret, nil
-}
-
-func (c *chacha20poly1305) NonceSize() int {
-	return NonceSize
-}
-
-func (c *chacha20poly1305) Overhead() int {
-	return 16
-}
-
-func (c *chacha20poly1305) Seal(dst, nonce, plaintext, additionalData []byte) []byte {
-	if len(nonce) != NonceSize {
-		panic("chacha20poly1305: bad nonce length passed to Seal")
-	}
-
-	if uint64(len(plaintext)) > (1<<38)-64 {
-		panic("chacha20poly1305: plaintext too large")
-	}
-
-	return c.seal(dst, nonce, plaintext, additionalData)
-}
-
-var errOpen = errors.New("chacha20poly1305: message authentication failed")
-
-func (c *chacha20poly1305) Open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
-	if len(nonce) != NonceSize {
-		panic("chacha20poly1305: bad nonce length passed to Open")
-	}
-	if len(ciphertext) < 16 {
-		return nil, errOpen
-	}
-	if uint64(len(ciphertext)) > (1<<38)-48 {
-		panic("chacha20poly1305: ciphertext too large")
-	}
-
-	return c.open(dst, nonce, ciphertext, additionalData)
-}
-
-// sliceForAppend takes a slice and a requested number of bytes. It returns a
-// slice with the contents of the given slice followed by that many bytes and a
-// second slice that aliases into it and contains only the extra bytes. If the
-// original slice has sufficient capacity then no allocation is performed.
-func sliceForAppend(in []byte, n int) (head, tail []byte) {
-	if total := len(in) + n; cap(in) >= total {
-		head = in[:total]
-	} else {
-		head = make([]byte, total)
-		copy(head, in)
-	}
-	tail = head[len(in):]
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.go
deleted file mode 100644
index 7cd7ad834f..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7,amd64,!gccgo,!appengine
-
-package chacha20poly1305
-
-import "encoding/binary"
-
-//go:noescape
-func chacha20Poly1305Open(dst []byte, key []uint32, src, ad []byte) bool
-
-//go:noescape
-func chacha20Poly1305Seal(dst []byte, key []uint32, src, ad []byte)
-
-// cpuid is implemented in chacha20poly1305_amd64.s.
-func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
-
-// xgetbv with ecx = 0 is implemented in chacha20poly1305_amd64.s.
-func xgetbv() (eax, edx uint32)
-
-var (
-	useASM  bool
-	useAVX2 bool
-)
-
-func init() {
-	detectCPUFeatures()
-}
-
-// detectCPUFeatures is used to detect if cpu instructions
-// used by the functions implemented in assembler in
-// chacha20poly1305_amd64.s are supported.
-func detectCPUFeatures() {
-	maxID, _, _, _ := cpuid(0, 0)
-	if maxID < 1 {
-		return
-	}
-
-	_, _, ecx1, _ := cpuid(1, 0)
-
-	haveSSSE3 := isSet(9, ecx1)
-	useASM = haveSSSE3
-
-	haveOSXSAVE := isSet(27, ecx1)
-
-	osSupportsAVX := false
-	// For XGETBV, OSXSAVE bit is required and sufficient.
-	if haveOSXSAVE {
-		eax, _ := xgetbv()
-		// Check if XMM and YMM registers have OS support.
-		osSupportsAVX = isSet(1, eax) && isSet(2, eax)
-	}
-	haveAVX := isSet(28, ecx1) && osSupportsAVX
-
-	if maxID < 7 {
-		return
-	}
-
-	_, ebx7, _, _ := cpuid(7, 0)
-	haveAVX2 := isSet(5, ebx7) && haveAVX
-	haveBMI2 := isSet(8, ebx7)
-
-	useAVX2 = haveAVX2 && haveBMI2
-}
-
-// isSet checks if bit at bitpos is set in value.
-func isSet(bitpos uint, value uint32) bool {
-	return value&(1<<bitpos) != 0
-}
-
-// setupState writes a ChaCha20 input matrix to state. See
-// https://tools.ietf.org/html/rfc7539#section-2.3.
-func setupState(state *[16]uint32, key *[32]byte, nonce []byte) {
-	state[0] = 0x61707865
-	state[1] = 0x3320646e
-	state[2] = 0x79622d32
-	state[3] = 0x6b206574
-
-	state[4] = binary.LittleEndian.Uint32(key[:4])
-	state[5] = binary.LittleEndian.Uint32(key[4:8])
-	state[6] = binary.LittleEndian.Uint32(key[8:12])
-	state[7] = binary.LittleEndian.Uint32(key[12:16])
-	state[8] = binary.LittleEndian.Uint32(key[16:20])
-	state[9] = binary.LittleEndian.Uint32(key[20:24])
-	state[10] = binary.LittleEndian.Uint32(key[24:28])
-	state[11] = binary.LittleEndian.Uint32(key[28:32])
-
-	state[12] = 0
-	state[13] = binary.LittleEndian.Uint32(nonce[:4])
-	state[14] = binary.LittleEndian.Uint32(nonce[4:8])
-	state[15] = binary.LittleEndian.Uint32(nonce[8:12])
-}
-
-func (c *chacha20poly1305) seal(dst, nonce, plaintext, additionalData []byte) []byte {
-	if !useASM {
-		return c.sealGeneric(dst, nonce, plaintext, additionalData)
-	}
-
-	var state [16]uint32
-	setupState(&state, &c.key, nonce)
-
-	ret, out := sliceForAppend(dst, len(plaintext)+16)
-	chacha20Poly1305Seal(out[:], state[:], plaintext, additionalData)
-	return ret
-}
-
-func (c *chacha20poly1305) open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
-	if !useASM {
-		return c.openGeneric(dst, nonce, ciphertext, additionalData)
-	}
-
-	var state [16]uint32
-	setupState(&state, &c.key, nonce)
-
-	ciphertext = ciphertext[:len(ciphertext)-16]
-	ret, out := sliceForAppend(dst, len(ciphertext))
-	if !chacha20Poly1305Open(out, state[:], ciphertext, additionalData) {
-		for i := range out {
-			out[i] = 0
-		}
-		return nil, errOpen
-	}
-
-	return ret, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s
deleted file mode 100644
index 1c57e3894c..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_amd64.s
+++ /dev/null
@@ -1,2714 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file was originally from https://golang.org/cl/24717 by Vlad Krasnov of CloudFlare.
-
-// +build go1.7,amd64,!gccgo,!appengine
-
-#include "textflag.h"
-// General register allocation
-#define oup DI
-#define inp SI
-#define inl BX
-#define adp CX // free to reuse, after we hash the additional data
-#define keyp R8 // free to reuse, when we copy the key to stack
-#define itr2 R9 // general iterator
-#define itr1 CX // general iterator
-#define acc0 R10
-#define acc1 R11
-#define acc2 R12
-#define t0 R13
-#define t1 R14
-#define t2 R15
-#define t3 R8
-// Register and stack allocation for the SSE code
-#define rStore (0*16)(BP)
-#define sStore (1*16)(BP)
-#define state1Store (2*16)(BP)
-#define state2Store (3*16)(BP)
-#define tmpStore (4*16)(BP)
-#define ctr0Store (5*16)(BP)
-#define ctr1Store (6*16)(BP)
-#define ctr2Store (7*16)(BP)
-#define ctr3Store (8*16)(BP)
-#define A0 X0
-#define A1 X1
-#define A2 X2
-#define B0 X3
-#define B1 X4
-#define B2 X5
-#define C0 X6
-#define C1 X7
-#define C2 X8
-#define D0 X9
-#define D1 X10
-#define D2 X11
-#define T0 X12
-#define T1 X13
-#define T2 X14
-#define T3 X15
-#define A3 T0
-#define B3 T1
-#define C3 T2
-#define D3 T3
-// Register and stack allocation for the AVX2 code
-#define rsStoreAVX2 (0*32)(BP)
-#define state1StoreAVX2 (1*32)(BP)
-#define state2StoreAVX2 (2*32)(BP)
-#define ctr0StoreAVX2 (3*32)(BP)
-#define ctr1StoreAVX2 (4*32)(BP)
-#define ctr2StoreAVX2 (5*32)(BP)
-#define ctr3StoreAVX2 (6*32)(BP)
-#define tmpStoreAVX2 (7*32)(BP) // 256 bytes on stack
-#define AA0 Y0
-#define AA1 Y5
-#define AA2 Y6
-#define AA3 Y7
-#define BB0 Y14
-#define BB1 Y9
-#define BB2 Y10
-#define BB3 Y11
-#define CC0 Y12
-#define CC1 Y13
-#define CC2 Y8
-#define CC3 Y15
-#define DD0 Y4
-#define DD1 Y1
-#define DD2 Y2
-#define DD3 Y3
-#define TT0 DD3
-#define TT1 AA3
-#define TT2 BB3
-#define TT3 CC3
-// ChaCha20 constants
-DATA ·chacha20Constants<>+0x00(SB)/4, $0x61707865
-DATA ·chacha20Constants<>+0x04(SB)/4, $0x3320646e
-DATA ·chacha20Constants<>+0x08(SB)/4, $0x79622d32
-DATA ·chacha20Constants<>+0x0c(SB)/4, $0x6b206574
-DATA ·chacha20Constants<>+0x10(SB)/4, $0x61707865
-DATA ·chacha20Constants<>+0x14(SB)/4, $0x3320646e
-DATA ·chacha20Constants<>+0x18(SB)/4, $0x79622d32
-DATA ·chacha20Constants<>+0x1c(SB)/4, $0x6b206574
-// <<< 16 with PSHUFB
-DATA ·rol16<>+0x00(SB)/8, $0x0504070601000302
-DATA ·rol16<>+0x08(SB)/8, $0x0D0C0F0E09080B0A
-DATA ·rol16<>+0x10(SB)/8, $0x0504070601000302
-DATA ·rol16<>+0x18(SB)/8, $0x0D0C0F0E09080B0A
-// <<< 8 with PSHUFB
-DATA ·rol8<>+0x00(SB)/8, $0x0605040702010003
-DATA ·rol8<>+0x08(SB)/8, $0x0E0D0C0F0A09080B
-DATA ·rol8<>+0x10(SB)/8, $0x0605040702010003
-DATA ·rol8<>+0x18(SB)/8, $0x0E0D0C0F0A09080B
-
-DATA ·avx2InitMask<>+0x00(SB)/8, $0x0
-DATA ·avx2InitMask<>+0x08(SB)/8, $0x0
-DATA ·avx2InitMask<>+0x10(SB)/8, $0x1
-DATA ·avx2InitMask<>+0x18(SB)/8, $0x0
-
-DATA ·avx2IncMask<>+0x00(SB)/8, $0x2
-DATA ·avx2IncMask<>+0x08(SB)/8, $0x0
-DATA ·avx2IncMask<>+0x10(SB)/8, $0x2
-DATA ·avx2IncMask<>+0x18(SB)/8, $0x0
-// Poly1305 key clamp
-DATA ·polyClampMask<>+0x00(SB)/8, $0x0FFFFFFC0FFFFFFF
-DATA ·polyClampMask<>+0x08(SB)/8, $0x0FFFFFFC0FFFFFFC
-DATA ·polyClampMask<>+0x10(SB)/8, $0xFFFFFFFFFFFFFFFF
-DATA ·polyClampMask<>+0x18(SB)/8, $0xFFFFFFFFFFFFFFFF
-
-DATA ·sseIncMask<>+0x00(SB)/8, $0x1
-DATA ·sseIncMask<>+0x08(SB)/8, $0x0
-// To load/store the last < 16 bytes in a buffer
-DATA ·andMask<>+0x00(SB)/8, $0x00000000000000ff
-DATA ·andMask<>+0x08(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x10(SB)/8, $0x000000000000ffff
-DATA ·andMask<>+0x18(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x20(SB)/8, $0x0000000000ffffff
-DATA ·andMask<>+0x28(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x30(SB)/8, $0x00000000ffffffff
-DATA ·andMask<>+0x38(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x40(SB)/8, $0x000000ffffffffff
-DATA ·andMask<>+0x48(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x50(SB)/8, $0x0000ffffffffffff
-DATA ·andMask<>+0x58(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x60(SB)/8, $0x00ffffffffffffff
-DATA ·andMask<>+0x68(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x70(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0x78(SB)/8, $0x0000000000000000
-DATA ·andMask<>+0x80(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0x88(SB)/8, $0x00000000000000ff
-DATA ·andMask<>+0x90(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0x98(SB)/8, $0x000000000000ffff
-DATA ·andMask<>+0xa0(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0xa8(SB)/8, $0x0000000000ffffff
-DATA ·andMask<>+0xb0(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0xb8(SB)/8, $0x00000000ffffffff
-DATA ·andMask<>+0xc0(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0xc8(SB)/8, $0x000000ffffffffff
-DATA ·andMask<>+0xd0(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0xd8(SB)/8, $0x0000ffffffffffff
-DATA ·andMask<>+0xe0(SB)/8, $0xffffffffffffffff
-DATA ·andMask<>+0xe8(SB)/8, $0x00ffffffffffffff
-
-GLOBL ·chacha20Constants<>(SB), (NOPTR+RODATA), $32
-GLOBL ·rol16<>(SB), (NOPTR+RODATA), $32
-GLOBL ·rol8<>(SB), (NOPTR+RODATA), $32
-GLOBL ·sseIncMask<>(SB), (NOPTR+RODATA), $16
-GLOBL ·avx2IncMask<>(SB), (NOPTR+RODATA), $32
-GLOBL ·avx2InitMask<>(SB), (NOPTR+RODATA), $32
-GLOBL ·polyClampMask<>(SB), (NOPTR+RODATA), $32
-GLOBL ·andMask<>(SB), (NOPTR+RODATA), $240
-// No PALIGNR in Go ASM yet (but VPALIGNR is present).
-#define shiftB0Left BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xdb; BYTE $0x04 // PALIGNR $4, X3, X3
-#define shiftB1Left BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xe4; BYTE $0x04 // PALIGNR $4, X4, X4
-#define shiftB2Left BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xed; BYTE $0x04 // PALIGNR $4, X5, X5
-#define shiftB3Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xed; BYTE $0x04 // PALIGNR $4, X13, X13
-#define shiftC0Left BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xf6; BYTE $0x08 // PALIGNR $8, X6, X6
-#define shiftC1Left BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xff; BYTE $0x08 // PALIGNR $8, X7, X7
-#define shiftC2Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xc0; BYTE $0x08 // PALIGNR $8, X8, X8
-#define shiftC3Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xf6; BYTE $0x08 // PALIGNR $8, X14, X14
-#define shiftD0Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xc9; BYTE $0x0c // PALIGNR $12, X9, X9
-#define shiftD1Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xd2; BYTE $0x0c // PALIGNR $12, X10, X10
-#define shiftD2Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xdb; BYTE $0x0c // PALIGNR $12, X11, X11
-#define shiftD3Left BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xff; BYTE $0x0c // PALIGNR $12, X15, X15
-#define shiftB0Right BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xdb; BYTE $0x0c // PALIGNR $12, X3, X3
-#define shiftB1Right BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xe4; BYTE $0x0c // PALIGNR $12, X4, X4
-#define shiftB2Right BYTE $0x66; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xed; BYTE $0x0c // PALIGNR $12, X5, X5
-#define shiftB3Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xed; BYTE $0x0c // PALIGNR $12, X13, X13
-#define shiftC0Right shiftC0Left
-#define shiftC1Right shiftC1Left
-#define shiftC2Right shiftC2Left
-#define shiftC3Right shiftC3Left
-#define shiftD0Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xc9; BYTE $0x04 // PALIGNR $4, X9, X9
-#define shiftD1Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xd2; BYTE $0x04 // PALIGNR $4, X10, X10
-#define shiftD2Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xdb; BYTE $0x04 // PALIGNR $4, X11, X11
-#define shiftD3Right BYTE $0x66; BYTE $0x45; BYTE $0x0f; BYTE $0x3a; BYTE $0x0f; BYTE $0xff; BYTE $0x04 // PALIGNR $4, X15, X15
-// Some macros
-#define chachaQR(A, B, C, D, T) \
-	PADDD B, A; PXOR A, D; PSHUFB ·rol16<>(SB), D                            \
-	PADDD D, C; PXOR C, B; MOVO B, T; PSLLL $12, T; PSRLL $20, B; PXOR T, B \
-	PADDD B, A; PXOR A, D; PSHUFB ·rol8<>(SB), D                             \
-	PADDD D, C; PXOR C, B; MOVO B, T; PSLLL $7, T; PSRLL $25, B; PXOR T, B
-
-#define chachaQR_AVX2(A, B, C, D, T) \
-	VPADDD B, A, A; VPXOR A, D, D; VPSHUFB ·rol16<>(SB), D, D                         \
-	VPADDD D, C, C; VPXOR C, B, B; VPSLLD $12, B, T; VPSRLD $20, B, B; VPXOR T, B, B \
-	VPADDD B, A, A; VPXOR A, D, D; VPSHUFB ·rol8<>(SB), D, D                          \
-	VPADDD D, C, C; VPXOR C, B, B; VPSLLD $7, B, T; VPSRLD $25, B, B; VPXOR T, B, B
-
-#define polyAdd(S) ADDQ S, acc0; ADCQ 8+S, acc1; ADCQ $1, acc2
-#define polyMulStage1 MOVQ (0*8)(BP), AX; MOVQ AX, t2; MULQ acc0; MOVQ AX, t0; MOVQ DX, t1; MOVQ (0*8)(BP), AX; MULQ acc1; IMULQ acc2, t2; ADDQ AX, t1; ADCQ DX, t2
-#define polyMulStage2 MOVQ (1*8)(BP), AX; MOVQ AX, t3; MULQ acc0; ADDQ AX, t1; ADCQ $0, DX; MOVQ DX, acc0; MOVQ (1*8)(BP), AX; MULQ acc1; ADDQ AX, t2; ADCQ $0, DX
-#define polyMulStage3 IMULQ acc2, t3; ADDQ acc0, t2; ADCQ DX, t3
-#define polyMulReduceStage MOVQ t0, acc0; MOVQ t1, acc1; MOVQ t2, acc2; ANDQ $3, acc2; MOVQ t2, t0; ANDQ $-4, t0; MOVQ t3, t1; SHRQ $2, t2:t3; SHRQ $2, t3; ADDQ t0, acc0; ADCQ t1, acc1; ADCQ $0, acc2; ADDQ t2, acc0; ADCQ t3, acc1; ADCQ $0, acc2
-
-#define polyMulStage1_AVX2 MOVQ (0*8)(BP), DX; MOVQ DX, t2; MULXQ acc0, t0, t1; IMULQ acc2, t2; MULXQ acc1, AX, DX; ADDQ AX, t1; ADCQ DX, t2
-#define polyMulStage2_AVX2 MOVQ (1*8)(BP), DX; MULXQ acc0, acc0, AX; ADDQ acc0, t1; MULXQ acc1, acc1, t3; ADCQ acc1, t2; ADCQ $0, t3
-#define polyMulStage3_AVX2 IMULQ acc2, DX; ADDQ AX, t2; ADCQ DX, t3
-
-#define polyMul polyMulStage1; polyMulStage2; polyMulStage3; polyMulReduceStage
-#define polyMulAVX2 polyMulStage1_AVX2; polyMulStage2_AVX2; polyMulStage3_AVX2; polyMulReduceStage
-// ----------------------------------------------------------------------------
-TEXT polyHashADInternal<>(SB), NOSPLIT, $0
-	// adp points to beginning of additional data
-	// itr2 holds ad length
-	XORQ acc0, acc0
-	XORQ acc1, acc1
-	XORQ acc2, acc2
-	CMPQ itr2, $13
-	JNE  hashADLoop
-
-openFastTLSAD:
-	// Special treatment for the TLS case of 13 bytes
-	MOVQ (adp), acc0
-	MOVQ 5(adp), acc1
-	SHRQ $24, acc1
-	MOVQ $1, acc2
-	polyMul
-	RET
-
-hashADLoop:
-	// Hash in 16 byte chunks
-	CMPQ itr2, $16
-	JB   hashADTail
-	polyAdd(0(adp))
-	LEAQ (1*16)(adp), adp
-	SUBQ $16, itr2
-	polyMul
-	JMP  hashADLoop
-
-hashADTail:
-	CMPQ itr2, $0
-	JE   hashADDone
-
-	// Hash last < 16 byte tail
-	XORQ t0, t0
-	XORQ t1, t1
-	XORQ t2, t2
-	ADDQ itr2, adp
-
-hashADTailLoop:
-	SHLQ $8, t1:t0
-	SHLQ $8, t0
-	MOVB -1(adp), t2
-	XORQ t2, t0
-	DECQ adp
-	DECQ itr2
-	JNE  hashADTailLoop
-
-hashADTailFinish:
-	ADDQ t0, acc0; ADCQ t1, acc1; ADCQ $1, acc2
-	polyMul
-
-	// Finished AD
-hashADDone:
-	RET
-
-// ----------------------------------------------------------------------------
-// func chacha20Poly1305Open(dst, key, src, ad []byte) bool
-TEXT ·chacha20Poly1305Open(SB), 0, $288-97
-	// For aligned stack access
-	MOVQ SP, BP
-	ADDQ $32, BP
-	ANDQ $-32, BP
-	MOVQ dst+0(FP), oup
-	MOVQ key+24(FP), keyp
-	MOVQ src+48(FP), inp
-	MOVQ src_len+56(FP), inl
-	MOVQ ad+72(FP), adp
-
-	// Check for AVX2 support
-	CMPB ·useAVX2(SB), $1
-	JE   chacha20Poly1305Open_AVX2
-
-	// Special optimization, for very short buffers
-	CMPQ inl, $128
-	JBE  openSSE128 // About 16% faster
-
-	// For long buffers, prepare the poly key first
-	MOVOU ·chacha20Constants<>(SB), A0
-	MOVOU (1*16)(keyp), B0
-	MOVOU (2*16)(keyp), C0
-	MOVOU (3*16)(keyp), D0
-	MOVO  D0, T1
-
-	// Store state on stack for future use
-	MOVO B0, state1Store
-	MOVO C0, state2Store
-	MOVO D0, ctr3Store
-	MOVQ $10, itr2
-
-openSSEPreparePolyKey:
-	chachaQR(A0, B0, C0, D0, T0)
-	shiftB0Left;  shiftC0Left; shiftD0Left
-	chachaQR(A0, B0, C0, D0, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-	DECQ          itr2
-	JNE           openSSEPreparePolyKey
-
-	// A0|B0 hold the Poly1305 32-byte key, C0,D0 can be discarded
-	PADDL ·chacha20Constants<>(SB), A0; PADDL state1Store, B0
-
-	// Clamp and store the key
-	PAND ·polyClampMask<>(SB), A0
-	MOVO A0, rStore; MOVO B0, sStore
-
-	// Hash AAD
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-
-openSSEMainLoop:
-	CMPQ inl, $256
-	JB   openSSEMainLoopDone
-
-	// Load state, increment counter blocks
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO A2, A3; MOVO B2, B3; MOVO C2, C3; MOVO D2, D3; PADDL ·sseIncMask<>(SB), D3
-
-	// Store counters
-	MOVO D0, ctr0Store; MOVO D1, ctr1Store; MOVO D2, ctr2Store; MOVO D3, ctr3Store
-
-	// There are 10 ChaCha20 iterations of 2QR each, so for 6 iterations we hash 2 blocks, and for the remaining 4 only 1 block - for a total of 16
-	MOVQ $4, itr1
-	MOVQ inp, itr2
-
-openSSEInternalLoop:
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	polyAdd(0(itr2))
-	shiftB0Left;  shiftB1Left; shiftB2Left; shiftB3Left
-	shiftC0Left;  shiftC1Left; shiftC2Left; shiftC3Left
-	shiftD0Left;  shiftD1Left; shiftD2Left; shiftD3Left
-	polyMulStage1
-	polyMulStage2
-	LEAQ          (2*8)(itr2), itr2
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	polyMulStage3
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	polyMulReduceStage
-	shiftB0Right; shiftB1Right; shiftB2Right; shiftB3Right
-	shiftC0Right; shiftC1Right; shiftC2Right; shiftC3Right
-	shiftD0Right; shiftD1Right; shiftD2Right; shiftD3Right
-	DECQ          itr1
-	JGE           openSSEInternalLoop
-
-	polyAdd(0(itr2))
-	polyMul
-	LEAQ (2*8)(itr2), itr2
-
-	CMPQ itr1, $-6
-	JG   openSSEInternalLoop
-
-	// Add in the state
-	PADDD ·chacha20Constants<>(SB), A0; PADDD ·chacha20Constants<>(SB), A1; PADDD ·chacha20Constants<>(SB), A2; PADDD ·chacha20Constants<>(SB), A3
-	PADDD state1Store, B0; PADDD state1Store, B1; PADDD state1Store, B2; PADDD state1Store, B3
-	PADDD state2Store, C0; PADDD state2Store, C1; PADDD state2Store, C2; PADDD state2Store, C3
-	PADDD ctr0Store, D0; PADDD ctr1Store, D1; PADDD ctr2Store, D2; PADDD ctr3Store, D3
-
-	// Load - xor - store
-	MOVO  D3, tmpStore
-	MOVOU (0*16)(inp), D3; PXOR D3, A0; MOVOU A0, (0*16)(oup)
-	MOVOU (1*16)(inp), D3; PXOR D3, B0; MOVOU B0, (1*16)(oup)
-	MOVOU (2*16)(inp), D3; PXOR D3, C0; MOVOU C0, (2*16)(oup)
-	MOVOU (3*16)(inp), D3; PXOR D3, D0; MOVOU D0, (3*16)(oup)
-	MOVOU (4*16)(inp), D0; PXOR D0, A1; MOVOU A1, (4*16)(oup)
-	MOVOU (5*16)(inp), D0; PXOR D0, B1; MOVOU B1, (5*16)(oup)
-	MOVOU (6*16)(inp), D0; PXOR D0, C1; MOVOU C1, (6*16)(oup)
-	MOVOU (7*16)(inp), D0; PXOR D0, D1; MOVOU D1, (7*16)(oup)
-	MOVOU (8*16)(inp), D0; PXOR D0, A2; MOVOU A2, (8*16)(oup)
-	MOVOU (9*16)(inp), D0; PXOR D0, B2; MOVOU B2, (9*16)(oup)
-	MOVOU (10*16)(inp), D0; PXOR D0, C2; MOVOU C2, (10*16)(oup)
-	MOVOU (11*16)(inp), D0; PXOR D0, D2; MOVOU D2, (11*16)(oup)
-	MOVOU (12*16)(inp), D0; PXOR D0, A3; MOVOU A3, (12*16)(oup)
-	MOVOU (13*16)(inp), D0; PXOR D0, B3; MOVOU B3, (13*16)(oup)
-	MOVOU (14*16)(inp), D0; PXOR D0, C3; MOVOU C3, (14*16)(oup)
-	MOVOU (15*16)(inp), D0; PXOR tmpStore, D0; MOVOU D0, (15*16)(oup)
-	LEAQ  256(inp), inp
-	LEAQ  256(oup), oup
-	SUBQ  $256, inl
-	JMP   openSSEMainLoop
-
-openSSEMainLoopDone:
-	// Handle the various tail sizes efficiently
-	TESTQ inl, inl
-	JE    openSSEFinalize
-	CMPQ  inl, $64
-	JBE   openSSETail64
-	CMPQ  inl, $128
-	JBE   openSSETail128
-	CMPQ  inl, $192
-	JBE   openSSETail192
-	JMP   openSSETail256
-
-openSSEFinalize:
-	// Hash in the PT, AAD lengths
-	ADDQ ad_len+80(FP), acc0; ADCQ src_len+56(FP), acc1; ADCQ $1, acc2
-	polyMul
-
-	// Final reduce
-	MOVQ    acc0, t0
-	MOVQ    acc1, t1
-	MOVQ    acc2, t2
-	SUBQ    $-5, acc0
-	SBBQ    $-1, acc1
-	SBBQ    $3, acc2
-	CMOVQCS t0, acc0
-	CMOVQCS t1, acc1
-	CMOVQCS t2, acc2
-
-	// Add in the "s" part of the key
-	ADDQ 0+sStore, acc0
-	ADCQ 8+sStore, acc1
-
-	// Finally, constant time compare to the tag at the end of the message
-	XORQ    AX, AX
-	MOVQ    $1, DX
-	XORQ    (0*8)(inp), acc0
-	XORQ    (1*8)(inp), acc1
-	ORQ     acc1, acc0
-	CMOVQEQ DX, AX
-
-	// Return true iff tags are equal
-	MOVB AX, ret+96(FP)
-	RET
-
-// ----------------------------------------------------------------------------
-// Special optimization for buffers smaller than 129 bytes
-openSSE128:
-	// For up to 128 bytes of ciphertext and 64 bytes for the poly key, we require to process three blocks
-	MOVOU ·chacha20Constants<>(SB), A0; MOVOU (1*16)(keyp), B0; MOVOU (2*16)(keyp), C0; MOVOU (3*16)(keyp), D0
-	MOVO  A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO  A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO  B0, T1; MOVO C0, T2; MOVO D1, T3
-	MOVQ  $10, itr2
-
-openSSE128InnerCipherLoop:
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Left;  shiftB1Left; shiftB2Left
-	shiftC0Left;  shiftC1Left; shiftC2Left
-	shiftD0Left;  shiftD1Left; shiftD2Left
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Right; shiftB1Right; shiftB2Right
-	shiftC0Right; shiftC1Right; shiftC2Right
-	shiftD0Right; shiftD1Right; shiftD2Right
-	DECQ          itr2
-	JNE           openSSE128InnerCipherLoop
-
-	// A0|B0 hold the Poly1305 32-byte key, C0,D0 can be discarded
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1; PADDL ·chacha20Constants<>(SB), A2
-	PADDL T1, B0; PADDL T1, B1; PADDL T1, B2
-	PADDL T2, C1; PADDL T2, C2
-	PADDL T3, D1; PADDL ·sseIncMask<>(SB), T3; PADDL T3, D2
-
-	// Clamp and store the key
-	PAND  ·polyClampMask<>(SB), A0
-	MOVOU A0, rStore; MOVOU B0, sStore
-
-	// Hash
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-
-openSSE128Open:
-	CMPQ inl, $16
-	JB   openSSETail16
-	SUBQ $16, inl
-
-	// Load for hashing
-	polyAdd(0(inp))
-
-	// Load for decryption
-	MOVOU (inp), T0; PXOR T0, A1; MOVOU A1, (oup)
-	LEAQ  (1*16)(inp), inp
-	LEAQ  (1*16)(oup), oup
-	polyMul
-
-	// Shift the stream "left"
-	MOVO B1, A1
-	MOVO C1, B1
-	MOVO D1, C1
-	MOVO A2, D1
-	MOVO B2, A2
-	MOVO C2, B2
-	MOVO D2, C2
-	JMP  openSSE128Open
-
-openSSETail16:
-	TESTQ inl, inl
-	JE    openSSEFinalize
-
-	// We can safely load the CT from the end, because it is padded with the MAC
-	MOVQ   inl, itr2
-	SHLQ   $4, itr2
-	LEAQ   ·andMask<>(SB), t0
-	MOVOU  (inp), T0
-	ADDQ   inl, inp
-	PAND   -16(t0)(itr2*1), T0
-	MOVO   T0, 0+tmpStore
-	MOVQ   T0, t0
-	MOVQ   8+tmpStore, t1
-	PXOR   A1, T0
-
-	// We can only store one byte at a time, since plaintext can be shorter than 16 bytes
-openSSETail16Store:
-	MOVQ T0, t3
-	MOVB t3, (oup)
-	PSRLDQ $1, T0
-	INCQ   oup
-	DECQ   inl
-	JNE    openSSETail16Store
-	ADDQ   t0, acc0; ADCQ t1, acc1; ADCQ $1, acc2
-	polyMul
-	JMP    openSSEFinalize
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 64 bytes of ciphertext
-openSSETail64:
-	// Need to decrypt up to 64 bytes - prepare single block
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0; MOVO D0, ctr0Store
-	XORQ itr2, itr2
-	MOVQ inl, itr1
-	CMPQ itr1, $16
-	JB   openSSETail64LoopB
-
-openSSETail64LoopA:
-	// Perform ChaCha rounds, while hashing the remaining input
-	polyAdd(0(inp)(itr2*1))
-	polyMul
-	SUBQ $16, itr1
-
-openSSETail64LoopB:
-	ADDQ          $16, itr2
-	chachaQR(A0, B0, C0, D0, T0)
-	shiftB0Left;  shiftC0Left; shiftD0Left
-	chachaQR(A0, B0, C0, D0, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-
-	CMPQ itr1, $16
-	JAE  openSSETail64LoopA
-
-	CMPQ itr2, $160
-	JNE  openSSETail64LoopB
-
-	PADDL ·chacha20Constants<>(SB), A0; PADDL state1Store, B0; PADDL state2Store, C0; PADDL ctr0Store, D0
-
-openSSETail64DecLoop:
-	CMPQ  inl, $16
-	JB    openSSETail64DecLoopDone
-	SUBQ  $16, inl
-	MOVOU (inp), T0
-	PXOR  T0, A0
-	MOVOU A0, (oup)
-	LEAQ  16(inp), inp
-	LEAQ  16(oup), oup
-	MOVO  B0, A0
-	MOVO  C0, B0
-	MOVO  D0, C0
-	JMP   openSSETail64DecLoop
-
-openSSETail64DecLoopDone:
-	MOVO A0, A1
-	JMP  openSSETail16
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 128 bytes of ciphertext
-openSSETail128:
-	// Need to decrypt up to 128 bytes - prepare two blocks
-	MOVO ·chacha20Constants<>(SB), A1; MOVO state1Store, B1; MOVO state2Store, C1; MOVO ctr3Store, D1; PADDL ·sseIncMask<>(SB), D1; MOVO D1, ctr0Store
-	MOVO A1, A0; MOVO B1, B0; MOVO C1, C0; MOVO D1, D0; PADDL ·sseIncMask<>(SB), D0; MOVO D0, ctr1Store
-	XORQ itr2, itr2
-	MOVQ inl, itr1
-	ANDQ $-16, itr1
-
-openSSETail128LoopA:
-	// Perform ChaCha rounds, while hashing the remaining input
-	polyAdd(0(inp)(itr2*1))
-	polyMul
-
-openSSETail128LoopB:
-	ADDQ          $16, itr2
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0)
-	shiftB0Left;  shiftC0Left; shiftD0Left
-	shiftB1Left;  shiftC1Left; shiftD1Left
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-	shiftB1Right; shiftC1Right; shiftD1Right
-
-	CMPQ itr2, itr1
-	JB   openSSETail128LoopA
-
-	CMPQ itr2, $160
-	JNE  openSSETail128LoopB
-
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1
-	PADDL state1Store, B0; PADDL state1Store, B1
-	PADDL state2Store, C0; PADDL state2Store, C1
-	PADDL ctr1Store, D0; PADDL ctr0Store, D1
-
-	MOVOU (0*16)(inp), T0; MOVOU (1*16)(inp), T1; MOVOU (2*16)(inp), T2; MOVOU (3*16)(inp), T3
-	PXOR  T0, A1; PXOR T1, B1; PXOR T2, C1; PXOR T3, D1
-	MOVOU A1, (0*16)(oup); MOVOU B1, (1*16)(oup); MOVOU C1, (2*16)(oup); MOVOU D1, (3*16)(oup)
-
-	SUBQ $64, inl
-	LEAQ 64(inp), inp
-	LEAQ 64(oup), oup
-	JMP  openSSETail64DecLoop
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 192 bytes of ciphertext
-openSSETail192:
-	// Need to decrypt up to 192 bytes - prepare three blocks
-	MOVO ·chacha20Constants<>(SB), A2; MOVO state1Store, B2; MOVO state2Store, C2; MOVO ctr3Store, D2; PADDL ·sseIncMask<>(SB), D2; MOVO D2, ctr0Store
-	MOVO A2, A1; MOVO B2, B1; MOVO C2, C1; MOVO D2, D1; PADDL ·sseIncMask<>(SB), D1; MOVO D1, ctr1Store
-	MOVO A1, A0; MOVO B1, B0; MOVO C1, C0; MOVO D1, D0; PADDL ·sseIncMask<>(SB), D0; MOVO D0, ctr2Store
-
-	MOVQ    inl, itr1
-	MOVQ    $160, itr2
-	CMPQ    itr1, $160
-	CMOVQGT itr2, itr1
-	ANDQ    $-16, itr1
-	XORQ    itr2, itr2
-
-openSSLTail192LoopA:
-	// Perform ChaCha rounds, while hashing the remaining input
-	polyAdd(0(inp)(itr2*1))
-	polyMul
-
-openSSLTail192LoopB:
-	ADDQ         $16, itr2
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Left; shiftC0Left; shiftD0Left
-	shiftB1Left; shiftC1Left; shiftD1Left
-	shiftB2Left; shiftC2Left; shiftD2Left
-
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-	shiftB1Right; shiftC1Right; shiftD1Right
-	shiftB2Right; shiftC2Right; shiftD2Right
-
-	CMPQ itr2, itr1
-	JB   openSSLTail192LoopA
-
-	CMPQ itr2, $160
-	JNE  openSSLTail192LoopB
-
-	CMPQ inl, $176
-	JB   openSSLTail192Store
-
-	polyAdd(160(inp))
-	polyMul
-
-	CMPQ inl, $192
-	JB   openSSLTail192Store
-
-	polyAdd(176(inp))
-	polyMul
-
-openSSLTail192Store:
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1; PADDL ·chacha20Constants<>(SB), A2
-	PADDL state1Store, B0; PADDL state1Store, B1; PADDL state1Store, B2
-	PADDL state2Store, C0; PADDL state2Store, C1; PADDL state2Store, C2
-	PADDL ctr2Store, D0; PADDL ctr1Store, D1; PADDL ctr0Store, D2
-
-	MOVOU (0*16)(inp), T0; MOVOU (1*16)(inp), T1; MOVOU (2*16)(inp), T2; MOVOU (3*16)(inp), T3
-	PXOR  T0, A2; PXOR T1, B2; PXOR T2, C2; PXOR T3, D2
-	MOVOU A2, (0*16)(oup); MOVOU B2, (1*16)(oup); MOVOU C2, (2*16)(oup); MOVOU D2, (3*16)(oup)
-
-	MOVOU (4*16)(inp), T0; MOVOU (5*16)(inp), T1; MOVOU (6*16)(inp), T2; MOVOU (7*16)(inp), T3
-	PXOR  T0, A1; PXOR T1, B1; PXOR T2, C1; PXOR T3, D1
-	MOVOU A1, (4*16)(oup); MOVOU B1, (5*16)(oup); MOVOU C1, (6*16)(oup); MOVOU D1, (7*16)(oup)
-
-	SUBQ $128, inl
-	LEAQ 128(inp), inp
-	LEAQ 128(oup), oup
-	JMP  openSSETail64DecLoop
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 256 bytes of ciphertext
-openSSETail256:
-	// Need to decrypt up to 256 bytes - prepare four blocks
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO A2, A3; MOVO B2, B3; MOVO C2, C3; MOVO D2, D3; PADDL ·sseIncMask<>(SB), D3
-
-	// Store counters
-	MOVO D0, ctr0Store; MOVO D1, ctr1Store; MOVO D2, ctr2Store; MOVO D3, ctr3Store
-	XORQ itr2, itr2
-
-openSSETail256Loop:
-	// This loop inteleaves 8 ChaCha quarter rounds with 1 poly multiplication
-	polyAdd(0(inp)(itr2*1))
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	shiftB0Left;  shiftB1Left; shiftB2Left; shiftB3Left
-	shiftC0Left;  shiftC1Left; shiftC2Left; shiftC3Left
-	shiftD0Left;  shiftD1Left; shiftD2Left; shiftD3Left
-	polyMulStage1
-	polyMulStage2
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	polyMulStage3
-	polyMulReduceStage
-	shiftB0Right; shiftB1Right; shiftB2Right; shiftB3Right
-	shiftC0Right; shiftC1Right; shiftC2Right; shiftC3Right
-	shiftD0Right; shiftD1Right; shiftD2Right; shiftD3Right
-	ADDQ          $2*8, itr2
-	CMPQ          itr2, $160
-	JB            openSSETail256Loop
-	MOVQ          inl, itr1
-	ANDQ          $-16, itr1
-
-openSSETail256HashLoop:
-	polyAdd(0(inp)(itr2*1))
-	polyMul
-	ADDQ $2*8, itr2
-	CMPQ itr2, itr1
-	JB   openSSETail256HashLoop
-
-	// Add in the state
-	PADDD ·chacha20Constants<>(SB), A0; PADDD ·chacha20Constants<>(SB), A1; PADDD ·chacha20Constants<>(SB), A2; PADDD ·chacha20Constants<>(SB), A3
-	PADDD state1Store, B0; PADDD state1Store, B1; PADDD state1Store, B2; PADDD state1Store, B3
-	PADDD state2Store, C0; PADDD state2Store, C1; PADDD state2Store, C2; PADDD state2Store, C3
-	PADDD ctr0Store, D0; PADDD ctr1Store, D1; PADDD ctr2Store, D2; PADDD ctr3Store, D3
-	MOVO  D3, tmpStore
-
-	// Load - xor - store
-	MOVOU (0*16)(inp), D3; PXOR D3, A0
-	MOVOU (1*16)(inp), D3; PXOR D3, B0
-	MOVOU (2*16)(inp), D3; PXOR D3, C0
-	MOVOU (3*16)(inp), D3; PXOR D3, D0
-	MOVOU A0, (0*16)(oup)
-	MOVOU B0, (1*16)(oup)
-	MOVOU C0, (2*16)(oup)
-	MOVOU D0, (3*16)(oup)
-	MOVOU (4*16)(inp), A0; MOVOU (5*16)(inp), B0; MOVOU (6*16)(inp), C0; MOVOU (7*16)(inp), D0
-	PXOR  A0, A1; PXOR B0, B1; PXOR C0, C1; PXOR D0, D1
-	MOVOU A1, (4*16)(oup); MOVOU B1, (5*16)(oup); MOVOU C1, (6*16)(oup); MOVOU D1, (7*16)(oup)
-	MOVOU (8*16)(inp), A0; MOVOU (9*16)(inp), B0; MOVOU (10*16)(inp), C0; MOVOU (11*16)(inp), D0
-	PXOR  A0, A2; PXOR B0, B2; PXOR C0, C2; PXOR D0, D2
-	MOVOU A2, (8*16)(oup); MOVOU B2, (9*16)(oup); MOVOU C2, (10*16)(oup); MOVOU D2, (11*16)(oup)
-	LEAQ  192(inp), inp
-	LEAQ  192(oup), oup
-	SUBQ  $192, inl
-	MOVO  A3, A0
-	MOVO  B3, B0
-	MOVO  C3, C0
-	MOVO  tmpStore, D0
-
-	JMP openSSETail64DecLoop
-
-// ----------------------------------------------------------------------------
-// ------------------------- AVX2 Code ----------------------------------------
-chacha20Poly1305Open_AVX2:
-	VZEROUPPER
-	VMOVDQU ·chacha20Constants<>(SB), AA0
-	BYTE    $0xc4; BYTE $0x42; BYTE $0x7d; BYTE $0x5a; BYTE $0x70; BYTE $0x10 // broadcasti128 16(r8), ymm14
-	BYTE    $0xc4; BYTE $0x42; BYTE $0x7d; BYTE $0x5a; BYTE $0x60; BYTE $0x20 // broadcasti128 32(r8), ymm12
-	BYTE    $0xc4; BYTE $0xc2; BYTE $0x7d; BYTE $0x5a; BYTE $0x60; BYTE $0x30 // broadcasti128 48(r8), ymm4
-	VPADDD  ·avx2InitMask<>(SB), DD0, DD0
-
-	// Special optimization, for very short buffers
-	CMPQ inl, $192
-	JBE  openAVX2192
-	CMPQ inl, $320
-	JBE  openAVX2320
-
-	// For the general key prepare the key first - as a byproduct we have 64 bytes of cipher stream
-	VMOVDQA BB0, state1StoreAVX2
-	VMOVDQA CC0, state2StoreAVX2
-	VMOVDQA DD0, ctr3StoreAVX2
-	MOVQ    $10, itr2
-
-openAVX2PreparePolyKey:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0)
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $12, DD0, DD0, DD0
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0)
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $4, DD0, DD0, DD0
-	DECQ     itr2
-	JNE      openAVX2PreparePolyKey
-
-	VPADDD ·chacha20Constants<>(SB), AA0, AA0
-	VPADDD state1StoreAVX2, BB0, BB0
-	VPADDD state2StoreAVX2, CC0, CC0
-	VPADDD ctr3StoreAVX2, DD0, DD0
-
-	VPERM2I128 $0x02, AA0, BB0, TT0
-
-	// Clamp and store poly key
-	VPAND   ·polyClampMask<>(SB), TT0, TT0
-	VMOVDQA TT0, rsStoreAVX2
-
-	// Stream for the first 64 bytes
-	VPERM2I128 $0x13, AA0, BB0, AA0
-	VPERM2I128 $0x13, CC0, DD0, BB0
-
-	// Hash AD + first 64 bytes
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-	XORQ itr1, itr1
-
-openAVX2InitialHash64:
-	polyAdd(0(inp)(itr1*1))
-	polyMulAVX2
-	ADDQ $16, itr1
-	CMPQ itr1, $64
-	JNE  openAVX2InitialHash64
-
-	// Decrypt the first 64 bytes
-	VPXOR   (0*32)(inp), AA0, AA0
-	VPXOR   (1*32)(inp), BB0, BB0
-	VMOVDQU AA0, (0*32)(oup)
-	VMOVDQU BB0, (1*32)(oup)
-	LEAQ    (2*32)(inp), inp
-	LEAQ    (2*32)(oup), oup
-	SUBQ    $64, inl
-
-openAVX2MainLoop:
-	CMPQ inl, $512
-	JB   openAVX2MainLoopDone
-
-	// Load state, increment counter blocks, store the incremented counters
-	VMOVDQU ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3
-	VMOVDQA ctr3StoreAVX2, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2; VPADDD ·avx2IncMask<>(SB), DD2, DD3
-	VMOVDQA DD0, ctr0StoreAVX2; VMOVDQA DD1, ctr1StoreAVX2; VMOVDQA DD2, ctr2StoreAVX2; VMOVDQA DD3, ctr3StoreAVX2
-	XORQ    itr1, itr1
-
-openAVX2InternalLoop:
-	// Lets just say this spaghetti loop interleaves 2 quarter rounds with 3 poly multiplications
-	// Effectively per 512 bytes of stream we hash 480 bytes of ciphertext
-	polyAdd(0*8(inp)(itr1*1))
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	polyMulStage1_AVX2
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	polyMulStage2_AVX2
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyMulStage3_AVX2
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulReduceStage
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	polyAdd(2*8(inp)(itr1*1))
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	polyMulStage1_AVX2
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulStage2_AVX2
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $4, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2; VPALIGNR $12, DD3, DD3, DD3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	polyMulStage3_AVX2
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	polyMulReduceStage
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyAdd(4*8(inp)(itr1*1))
-	LEAQ     (6*8)(itr1), itr1
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulStage1_AVX2
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	polyMulStage2_AVX2
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	polyMulStage3_AVX2
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulReduceStage
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $12, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2; VPALIGNR $4, DD3, DD3, DD3
-	CMPQ     itr1, $480
-	JNE      openAVX2InternalLoop
-
-	VPADDD  ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2; VPADDD ·chacha20Constants<>(SB), AA3, AA3
-	VPADDD  state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2; VPADDD state1StoreAVX2, BB3, BB3
-	VPADDD  state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2; VPADDD state2StoreAVX2, CC3, CC3
-	VPADDD  ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2; VPADDD ctr3StoreAVX2, DD3, DD3
-	VMOVDQA CC3, tmpStoreAVX2
-
-	// We only hashed 480 of the 512 bytes available - hash the remaining 32 here
-	polyAdd(480(inp))
-	polyMulAVX2
-	VPERM2I128 $0x02, AA0, BB0, CC3; VPERM2I128 $0x13, AA0, BB0, BB0; VPERM2I128 $0x02, CC0, DD0, AA0; VPERM2I128 $0x13, CC0, DD0, CC0
-	VPXOR      (0*32)(inp), CC3, CC3; VPXOR (1*32)(inp), AA0, AA0; VPXOR (2*32)(inp), BB0, BB0; VPXOR (3*32)(inp), CC0, CC0
-	VMOVDQU    CC3, (0*32)(oup); VMOVDQU AA0, (1*32)(oup); VMOVDQU BB0, (2*32)(oup); VMOVDQU CC0, (3*32)(oup)
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-	VPXOR      (4*32)(inp), AA0, AA0; VPXOR (5*32)(inp), BB0, BB0; VPXOR (6*32)(inp), CC0, CC0; VPXOR (7*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (4*32)(oup); VMOVDQU BB0, (5*32)(oup); VMOVDQU CC0, (6*32)(oup); VMOVDQU DD0, (7*32)(oup)
-
-	// and here
-	polyAdd(496(inp))
-	polyMulAVX2
-	VPERM2I128 $0x02, AA2, BB2, AA0; VPERM2I128 $0x02, CC2, DD2, BB0; VPERM2I128 $0x13, AA2, BB2, CC0; VPERM2I128 $0x13, CC2, DD2, DD0
-	VPXOR      (8*32)(inp), AA0, AA0; VPXOR (9*32)(inp), BB0, BB0; VPXOR (10*32)(inp), CC0, CC0; VPXOR (11*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (8*32)(oup); VMOVDQU BB0, (9*32)(oup); VMOVDQU CC0, (10*32)(oup); VMOVDQU DD0, (11*32)(oup)
-	VPERM2I128 $0x02, AA3, BB3, AA0; VPERM2I128 $0x02, tmpStoreAVX2, DD3, BB0; VPERM2I128 $0x13, AA3, BB3, CC0; VPERM2I128 $0x13, tmpStoreAVX2, DD3, DD0
-	VPXOR      (12*32)(inp), AA0, AA0; VPXOR (13*32)(inp), BB0, BB0; VPXOR (14*32)(inp), CC0, CC0; VPXOR (15*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (12*32)(oup); VMOVDQU BB0, (13*32)(oup); VMOVDQU CC0, (14*32)(oup); VMOVDQU DD0, (15*32)(oup)
-	LEAQ       (32*16)(inp), inp
-	LEAQ       (32*16)(oup), oup
-	SUBQ       $(32*16), inl
-	JMP        openAVX2MainLoop
-
-openAVX2MainLoopDone:
-	// Handle the various tail sizes efficiently
-	TESTQ inl, inl
-	JE    openSSEFinalize
-	CMPQ  inl, $128
-	JBE   openAVX2Tail128
-	CMPQ  inl, $256
-	JBE   openAVX2Tail256
-	CMPQ  inl, $384
-	JBE   openAVX2Tail384
-	JMP   openAVX2Tail512
-
-// ----------------------------------------------------------------------------
-// Special optimization for buffers smaller than 193 bytes
-openAVX2192:
-	// For up to 192 bytes of ciphertext and 64 bytes for the poly key, we process four blocks
-	VMOVDQA AA0, AA1
-	VMOVDQA BB0, BB1
-	VMOVDQA CC0, CC1
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA AA0, AA2
-	VMOVDQA BB0, BB2
-	VMOVDQA CC0, CC2
-	VMOVDQA DD0, DD2
-	VMOVDQA DD1, TT3
-	MOVQ    $10, itr2
-
-openAVX2192InnerCipherLoop:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR   $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1
-	VPALIGNR   $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR   $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR   $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1
-	VPALIGNR   $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR   $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1
-	DECQ       itr2
-	JNE        openAVX2192InnerCipherLoop
-	VPADDD     AA2, AA0, AA0; VPADDD AA2, AA1, AA1
-	VPADDD     BB2, BB0, BB0; VPADDD BB2, BB1, BB1
-	VPADDD     CC2, CC0, CC0; VPADDD CC2, CC1, CC1
-	VPADDD     DD2, DD0, DD0; VPADDD TT3, DD1, DD1
-	VPERM2I128 $0x02, AA0, BB0, TT0
-
-	// Clamp and store poly key
-	VPAND   ·polyClampMask<>(SB), TT0, TT0
-	VMOVDQA TT0, rsStoreAVX2
-
-	// Stream for up to 192 bytes
-	VPERM2I128 $0x13, AA0, BB0, AA0
-	VPERM2I128 $0x13, CC0, DD0, BB0
-	VPERM2I128 $0x02, AA1, BB1, CC0
-	VPERM2I128 $0x02, CC1, DD1, DD0
-	VPERM2I128 $0x13, AA1, BB1, AA1
-	VPERM2I128 $0x13, CC1, DD1, BB1
-
-openAVX2ShortOpen:
-	// Hash
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-
-openAVX2ShortOpenLoop:
-	CMPQ inl, $32
-	JB   openAVX2ShortTail32
-	SUBQ $32, inl
-
-	// Load for hashing
-	polyAdd(0*8(inp))
-	polyMulAVX2
-	polyAdd(2*8(inp))
-	polyMulAVX2
-
-	// Load for decryption
-	VPXOR   (inp), AA0, AA0
-	VMOVDQU AA0, (oup)
-	LEAQ    (1*32)(inp), inp
-	LEAQ    (1*32)(oup), oup
-
-	// Shift stream left
-	VMOVDQA BB0, AA0
-	VMOVDQA CC0, BB0
-	VMOVDQA DD0, CC0
-	VMOVDQA AA1, DD0
-	VMOVDQA BB1, AA1
-	VMOVDQA CC1, BB1
-	VMOVDQA DD1, CC1
-	VMOVDQA AA2, DD1
-	VMOVDQA BB2, AA2
-	JMP     openAVX2ShortOpenLoop
-
-openAVX2ShortTail32:
-	CMPQ    inl, $16
-	VMOVDQA A0, A1
-	JB      openAVX2ShortDone
-
-	SUBQ $16, inl
-
-	// Load for hashing
-	polyAdd(0*8(inp))
-	polyMulAVX2
-
-	// Load for decryption
-	VPXOR      (inp), A0, T0
-	VMOVDQU    T0, (oup)
-	LEAQ       (1*16)(inp), inp
-	LEAQ       (1*16)(oup), oup
-	VPERM2I128 $0x11, AA0, AA0, AA0
-	VMOVDQA    A0, A1
-
-openAVX2ShortDone:
-	VZEROUPPER
-	JMP openSSETail16
-
-// ----------------------------------------------------------------------------
-// Special optimization for buffers smaller than 321 bytes
-openAVX2320:
-	// For up to 320 bytes of ciphertext and 64 bytes for the poly key, we process six blocks
-	VMOVDQA AA0, AA1; VMOVDQA BB0, BB1; VMOVDQA CC0, CC1; VPADDD ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA AA0, AA2; VMOVDQA BB0, BB2; VMOVDQA CC0, CC2; VPADDD ·avx2IncMask<>(SB), DD1, DD2
-	VMOVDQA BB0, TT1; VMOVDQA CC0, TT2; VMOVDQA DD0, TT3
-	MOVQ    $10, itr2
-
-openAVX2320InnerCipherLoop:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2
-	DECQ     itr2
-	JNE      openAVX2320InnerCipherLoop
-
-	VMOVDQA ·chacha20Constants<>(SB), TT0
-	VPADDD  TT0, AA0, AA0; VPADDD TT0, AA1, AA1; VPADDD TT0, AA2, AA2
-	VPADDD  TT1, BB0, BB0; VPADDD TT1, BB1, BB1; VPADDD TT1, BB2, BB2
-	VPADDD  TT2, CC0, CC0; VPADDD TT2, CC1, CC1; VPADDD TT2, CC2, CC2
-	VMOVDQA ·avx2IncMask<>(SB), TT0
-	VPADDD  TT3, DD0, DD0; VPADDD TT0, TT3, TT3
-	VPADDD  TT3, DD1, DD1; VPADDD TT0, TT3, TT3
-	VPADDD  TT3, DD2, DD2
-
-	// Clamp and store poly key
-	VPERM2I128 $0x02, AA0, BB0, TT0
-	VPAND      ·polyClampMask<>(SB), TT0, TT0
-	VMOVDQA    TT0, rsStoreAVX2
-
-	// Stream for up to 320 bytes
-	VPERM2I128 $0x13, AA0, BB0, AA0
-	VPERM2I128 $0x13, CC0, DD0, BB0
-	VPERM2I128 $0x02, AA1, BB1, CC0
-	VPERM2I128 $0x02, CC1, DD1, DD0
-	VPERM2I128 $0x13, AA1, BB1, AA1
-	VPERM2I128 $0x13, CC1, DD1, BB1
-	VPERM2I128 $0x02, AA2, BB2, CC1
-	VPERM2I128 $0x02, CC2, DD2, DD1
-	VPERM2I128 $0x13, AA2, BB2, AA2
-	VPERM2I128 $0x13, CC2, DD2, BB2
-	JMP        openAVX2ShortOpen
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 128 bytes of ciphertext
-openAVX2Tail128:
-	// Need to decrypt up to 128 bytes - prepare two blocks
-	VMOVDQA ·chacha20Constants<>(SB), AA1
-	VMOVDQA state1StoreAVX2, BB1
-	VMOVDQA state2StoreAVX2, CC1
-	VMOVDQA ctr3StoreAVX2, DD1
-	VPADDD  ·avx2IncMask<>(SB), DD1, DD1
-	VMOVDQA DD1, DD0
-
-	XORQ  itr2, itr2
-	MOVQ  inl, itr1
-	ANDQ  $-16, itr1
-	TESTQ itr1, itr1
-	JE    openAVX2Tail128LoopB
-
-openAVX2Tail128LoopA:
-	// Perform ChaCha rounds, while hashing the remaining input
-	polyAdd(0(inp)(itr2*1))
-	polyMulAVX2
-
-openAVX2Tail128LoopB:
-	ADDQ     $16, itr2
-	chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR $4, BB1, BB1, BB1
-	VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $12, DD1, DD1, DD1
-	chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR $12, BB1, BB1, BB1
-	VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $4, DD1, DD1, DD1
-	CMPQ     itr2, itr1
-	JB       openAVX2Tail128LoopA
-	CMPQ     itr2, $160
-	JNE      openAVX2Tail128LoopB
-
-	VPADDD     ·chacha20Constants<>(SB), AA1, AA1
-	VPADDD     state1StoreAVX2, BB1, BB1
-	VPADDD     state2StoreAVX2, CC1, CC1
-	VPADDD     DD0, DD1, DD1
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-
-openAVX2TailLoop:
-	CMPQ inl, $32
-	JB   openAVX2Tail
-	SUBQ $32, inl
-
-	// Load for decryption
-	VPXOR   (inp), AA0, AA0
-	VMOVDQU AA0, (oup)
-	LEAQ    (1*32)(inp), inp
-	LEAQ    (1*32)(oup), oup
-	VMOVDQA BB0, AA0
-	VMOVDQA CC0, BB0
-	VMOVDQA DD0, CC0
-	JMP     openAVX2TailLoop
-
-openAVX2Tail:
-	CMPQ    inl, $16
-	VMOVDQA A0, A1
-	JB      openAVX2TailDone
-	SUBQ    $16, inl
-
-	// Load for decryption
-	VPXOR      (inp), A0, T0
-	VMOVDQU    T0, (oup)
-	LEAQ       (1*16)(inp), inp
-	LEAQ       (1*16)(oup), oup
-	VPERM2I128 $0x11, AA0, AA0, AA0
-	VMOVDQA    A0, A1
-
-openAVX2TailDone:
-	VZEROUPPER
-	JMP openSSETail16
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 256 bytes of ciphertext
-openAVX2Tail256:
-	// Need to decrypt up to 256 bytes - prepare four blocks
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA DD0, TT1
-	VMOVDQA DD1, TT2
-
-	// Compute the number of iterations that will hash data
-	MOVQ    inl, tmpStoreAVX2
-	MOVQ    inl, itr1
-	SUBQ    $128, itr1
-	SHRQ    $4, itr1
-	MOVQ    $10, itr2
-	CMPQ    itr1, $10
-	CMOVQGT itr2, itr1
-	MOVQ    inp, inl
-	XORQ    itr2, itr2
-
-openAVX2Tail256LoopA:
-	polyAdd(0(inl))
-	polyMulAVX2
-	LEAQ 16(inl), inl
-
-	// Perform ChaCha rounds, while hashing the remaining input
-openAVX2Tail256LoopB:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1
-	INCQ     itr2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1
-	CMPQ     itr2, itr1
-	JB       openAVX2Tail256LoopA
-
-	CMPQ itr2, $10
-	JNE  openAVX2Tail256LoopB
-
-	MOVQ inl, itr2
-	SUBQ inp, inl
-	MOVQ inl, itr1
-	MOVQ tmpStoreAVX2, inl
-
-	// Hash the remainder of data (if any)
-openAVX2Tail256Hash:
-	ADDQ $16, itr1
-	CMPQ itr1, inl
-	JGT  openAVX2Tail256HashEnd
-	polyAdd (0(itr2))
-	polyMulAVX2
-	LEAQ 16(itr2), itr2
-	JMP  openAVX2Tail256Hash
-
-// Store 128 bytes safely, then go to store loop
-openAVX2Tail256HashEnd:
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1
-	VPADDD     TT1, DD0, DD0; VPADDD TT2, DD1, DD1
-	VPERM2I128 $0x02, AA0, BB0, AA2; VPERM2I128 $0x02, CC0, DD0, BB2; VPERM2I128 $0x13, AA0, BB0, CC2; VPERM2I128 $0x13, CC0, DD0, DD2
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-
-	VPXOR   (0*32)(inp), AA2, AA2; VPXOR (1*32)(inp), BB2, BB2; VPXOR (2*32)(inp), CC2, CC2; VPXOR (3*32)(inp), DD2, DD2
-	VMOVDQU AA2, (0*32)(oup); VMOVDQU BB2, (1*32)(oup); VMOVDQU CC2, (2*32)(oup); VMOVDQU DD2, (3*32)(oup)
-	LEAQ    (4*32)(inp), inp
-	LEAQ    (4*32)(oup), oup
-	SUBQ    $4*32, inl
-
-	JMP openAVX2TailLoop
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 384 bytes of ciphertext
-openAVX2Tail384:
-	// Need to decrypt up to 384 bytes - prepare six blocks
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1
-	VPADDD  ·avx2IncMask<>(SB), DD1, DD2
-	VMOVDQA DD0, ctr0StoreAVX2
-	VMOVDQA DD1, ctr1StoreAVX2
-	VMOVDQA DD2, ctr2StoreAVX2
-
-	// Compute the number of iterations that will hash two blocks of data
-	MOVQ    inl, tmpStoreAVX2
-	MOVQ    inl, itr1
-	SUBQ    $256, itr1
-	SHRQ    $4, itr1
-	ADDQ    $6, itr1
-	MOVQ    $10, itr2
-	CMPQ    itr1, $10
-	CMOVQGT itr2, itr1
-	MOVQ    inp, inl
-	XORQ    itr2, itr2
-
-	// Perform ChaCha rounds, while hashing the remaining input
-openAVX2Tail384LoopB:
-	polyAdd(0(inl))
-	polyMulAVX2
-	LEAQ 16(inl), inl
-
-openAVX2Tail384LoopA:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2
-	polyAdd(0(inl))
-	polyMulAVX2
-	LEAQ     16(inl), inl
-	INCQ     itr2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2
-
-	CMPQ itr2, itr1
-	JB   openAVX2Tail384LoopB
-
-	CMPQ itr2, $10
-	JNE  openAVX2Tail384LoopA
-
-	MOVQ inl, itr2
-	SUBQ inp, inl
-	MOVQ inl, itr1
-	MOVQ tmpStoreAVX2, inl
-
-openAVX2Tail384Hash:
-	ADDQ $16, itr1
-	CMPQ itr1, inl
-	JGT  openAVX2Tail384HashEnd
-	polyAdd(0(itr2))
-	polyMulAVX2
-	LEAQ 16(itr2), itr2
-	JMP  openAVX2Tail384Hash
-
-// Store 256 bytes safely, then go to store loop
-openAVX2Tail384HashEnd:
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2
-	VPADDD     ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2
-	VPERM2I128 $0x02, AA0, BB0, TT0; VPERM2I128 $0x02, CC0, DD0, TT1; VPERM2I128 $0x13, AA0, BB0, TT2; VPERM2I128 $0x13, CC0, DD0, TT3
-	VPXOR      (0*32)(inp), TT0, TT0; VPXOR (1*32)(inp), TT1, TT1; VPXOR (2*32)(inp), TT2, TT2; VPXOR (3*32)(inp), TT3, TT3
-	VMOVDQU    TT0, (0*32)(oup); VMOVDQU TT1, (1*32)(oup); VMOVDQU TT2, (2*32)(oup); VMOVDQU TT3, (3*32)(oup)
-	VPERM2I128 $0x02, AA1, BB1, TT0; VPERM2I128 $0x02, CC1, DD1, TT1; VPERM2I128 $0x13, AA1, BB1, TT2; VPERM2I128 $0x13, CC1, DD1, TT3
-	VPXOR      (4*32)(inp), TT0, TT0; VPXOR (5*32)(inp), TT1, TT1; VPXOR (6*32)(inp), TT2, TT2; VPXOR (7*32)(inp), TT3, TT3
-	VMOVDQU    TT0, (4*32)(oup); VMOVDQU TT1, (5*32)(oup); VMOVDQU TT2, (6*32)(oup); VMOVDQU TT3, (7*32)(oup)
-	VPERM2I128 $0x02, AA2, BB2, AA0; VPERM2I128 $0x02, CC2, DD2, BB0; VPERM2I128 $0x13, AA2, BB2, CC0; VPERM2I128 $0x13, CC2, DD2, DD0
-	LEAQ       (8*32)(inp), inp
-	LEAQ       (8*32)(oup), oup
-	SUBQ       $8*32, inl
-	JMP        openAVX2TailLoop
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 512 bytes of ciphertext
-openAVX2Tail512:
-	VMOVDQU ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3
-	VMOVDQA ctr3StoreAVX2, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2; VPADDD ·avx2IncMask<>(SB), DD2, DD3
-	VMOVDQA DD0, ctr0StoreAVX2; VMOVDQA DD1, ctr1StoreAVX2; VMOVDQA DD2, ctr2StoreAVX2; VMOVDQA DD3, ctr3StoreAVX2
-	XORQ    itr1, itr1
-	MOVQ    inp, itr2
-
-openAVX2Tail512LoopB:
-	polyAdd(0(itr2))
-	polyMulAVX2
-	LEAQ (2*8)(itr2), itr2
-
-openAVX2Tail512LoopA:
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyAdd(0*8(itr2))
-	polyMulAVX2
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $4, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2; VPALIGNR $12, DD3, DD3, DD3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyAdd(2*8(itr2))
-	polyMulAVX2
-	LEAQ     (4*8)(itr2), itr2
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $12, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2; VPALIGNR $4, DD3, DD3, DD3
-	INCQ     itr1
-	CMPQ     itr1, $4
-	JLT      openAVX2Tail512LoopB
-
-	CMPQ itr1, $10
-	JNE  openAVX2Tail512LoopA
-
-	MOVQ inl, itr1
-	SUBQ $384, itr1
-	ANDQ $-16, itr1
-
-openAVX2Tail512HashLoop:
-	TESTQ itr1, itr1
-	JE    openAVX2Tail512HashEnd
-	polyAdd(0(itr2))
-	polyMulAVX2
-	LEAQ  16(itr2), itr2
-	SUBQ  $16, itr1
-	JMP   openAVX2Tail512HashLoop
-
-openAVX2Tail512HashEnd:
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2; VPADDD ·chacha20Constants<>(SB), AA3, AA3
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2; VPADDD state1StoreAVX2, BB3, BB3
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2; VPADDD state2StoreAVX2, CC3, CC3
-	VPADDD     ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2; VPADDD ctr3StoreAVX2, DD3, DD3
-	VMOVDQA    CC3, tmpStoreAVX2
-	VPERM2I128 $0x02, AA0, BB0, CC3; VPERM2I128 $0x13, AA0, BB0, BB0; VPERM2I128 $0x02, CC0, DD0, AA0; VPERM2I128 $0x13, CC0, DD0, CC0
-	VPXOR      (0*32)(inp), CC3, CC3; VPXOR (1*32)(inp), AA0, AA0; VPXOR (2*32)(inp), BB0, BB0; VPXOR (3*32)(inp), CC0, CC0
-	VMOVDQU    CC3, (0*32)(oup); VMOVDQU AA0, (1*32)(oup); VMOVDQU BB0, (2*32)(oup); VMOVDQU CC0, (3*32)(oup)
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-	VPXOR      (4*32)(inp), AA0, AA0; VPXOR (5*32)(inp), BB0, BB0; VPXOR (6*32)(inp), CC0, CC0; VPXOR (7*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (4*32)(oup); VMOVDQU BB0, (5*32)(oup); VMOVDQU CC0, (6*32)(oup); VMOVDQU DD0, (7*32)(oup)
-	VPERM2I128 $0x02, AA2, BB2, AA0; VPERM2I128 $0x02, CC2, DD2, BB0; VPERM2I128 $0x13, AA2, BB2, CC0; VPERM2I128 $0x13, CC2, DD2, DD0
-	VPXOR      (8*32)(inp), AA0, AA0; VPXOR (9*32)(inp), BB0, BB0; VPXOR (10*32)(inp), CC0, CC0; VPXOR (11*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (8*32)(oup); VMOVDQU BB0, (9*32)(oup); VMOVDQU CC0, (10*32)(oup); VMOVDQU DD0, (11*32)(oup)
-	VPERM2I128 $0x02, AA3, BB3, AA0; VPERM2I128 $0x02, tmpStoreAVX2, DD3, BB0; VPERM2I128 $0x13, AA3, BB3, CC0; VPERM2I128 $0x13, tmpStoreAVX2, DD3, DD0
-
-	LEAQ (12*32)(inp), inp
-	LEAQ (12*32)(oup), oup
-	SUBQ $12*32, inl
-
-	JMP openAVX2TailLoop
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// func chacha20Poly1305Seal(dst, key, src, ad []byte)
-TEXT ·chacha20Poly1305Seal(SB), 0, $288-96
-	// For aligned stack access
-	MOVQ SP, BP
-	ADDQ $32, BP
-	ANDQ $-32, BP
-	MOVQ dst+0(FP), oup
-	MOVQ key+24(FP), keyp
-	MOVQ src+48(FP), inp
-	MOVQ src_len+56(FP), inl
-	MOVQ ad+72(FP), adp
-
-	CMPB ·useAVX2(SB), $1
-	JE   chacha20Poly1305Seal_AVX2
-
-	// Special optimization, for very short buffers
-	CMPQ inl, $128
-	JBE  sealSSE128 // About 15% faster
-
-	// In the seal case - prepare the poly key + 3 blocks of stream in the first iteration
-	MOVOU ·chacha20Constants<>(SB), A0
-	MOVOU (1*16)(keyp), B0
-	MOVOU (2*16)(keyp), C0
-	MOVOU (3*16)(keyp), D0
-
-	// Store state on stack for future use
-	MOVO B0, state1Store
-	MOVO C0, state2Store
-
-	// Load state, increment counter blocks
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO A2, A3; MOVO B2, B3; MOVO C2, C3; MOVO D2, D3; PADDL ·sseIncMask<>(SB), D3
-
-	// Store counters
-	MOVO D0, ctr0Store; MOVO D1, ctr1Store; MOVO D2, ctr2Store; MOVO D3, ctr3Store
-	MOVQ $10, itr2
-
-sealSSEIntroLoop:
-	MOVO         C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO         tmpStore, C3
-	MOVO         C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO         tmpStore, C1
-	shiftB0Left; shiftB1Left; shiftB2Left; shiftB3Left
-	shiftC0Left; shiftC1Left; shiftC2Left; shiftC3Left
-	shiftD0Left; shiftD1Left; shiftD2Left; shiftD3Left
-
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	shiftB0Right; shiftB1Right; shiftB2Right; shiftB3Right
-	shiftC0Right; shiftC1Right; shiftC2Right; shiftC3Right
-	shiftD0Right; shiftD1Right; shiftD2Right; shiftD3Right
-	DECQ          itr2
-	JNE           sealSSEIntroLoop
-
-	// Add in the state
-	PADDD ·chacha20Constants<>(SB), A0; PADDD ·chacha20Constants<>(SB), A1; PADDD ·chacha20Constants<>(SB), A2; PADDD ·chacha20Constants<>(SB), A3
-	PADDD state1Store, B0; PADDD state1Store, B1; PADDD state1Store, B2; PADDD state1Store, B3
-	PADDD state2Store, C1; PADDD state2Store, C2; PADDD state2Store, C3
-	PADDD ctr1Store, D1; PADDD ctr2Store, D2; PADDD ctr3Store, D3
-
-	// Clamp and store the key
-	PAND ·polyClampMask<>(SB), A0
-	MOVO A0, rStore
-	MOVO B0, sStore
-
-	// Hash AAD
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-
-	MOVOU (0*16)(inp), A0; MOVOU (1*16)(inp), B0; MOVOU (2*16)(inp), C0; MOVOU (3*16)(inp), D0
-	PXOR  A0, A1; PXOR B0, B1; PXOR C0, C1; PXOR D0, D1
-	MOVOU A1, (0*16)(oup); MOVOU B1, (1*16)(oup); MOVOU C1, (2*16)(oup); MOVOU D1, (3*16)(oup)
-	MOVOU (4*16)(inp), A0; MOVOU (5*16)(inp), B0; MOVOU (6*16)(inp), C0; MOVOU (7*16)(inp), D0
-	PXOR  A0, A2; PXOR B0, B2; PXOR C0, C2; PXOR D0, D2
-	MOVOU A2, (4*16)(oup); MOVOU B2, (5*16)(oup); MOVOU C2, (6*16)(oup); MOVOU D2, (7*16)(oup)
-
-	MOVQ $128, itr1
-	SUBQ $128, inl
-	LEAQ 128(inp), inp
-
-	MOVO A3, A1; MOVO B3, B1; MOVO C3, C1; MOVO D3, D1
-
-	CMPQ inl, $64
-	JBE  sealSSE128SealHash
-
-	MOVOU (0*16)(inp), A0; MOVOU (1*16)(inp), B0; MOVOU (2*16)(inp), C0; MOVOU (3*16)(inp), D0
-	PXOR  A0, A3; PXOR B0, B3; PXOR C0, C3; PXOR D0, D3
-	MOVOU A3, (8*16)(oup); MOVOU B3, (9*16)(oup); MOVOU C3, (10*16)(oup); MOVOU D3, (11*16)(oup)
-
-	ADDQ $64, itr1
-	SUBQ $64, inl
-	LEAQ 64(inp), inp
-
-	MOVQ $2, itr1
-	MOVQ $8, itr2
-
-	CMPQ inl, $64
-	JBE  sealSSETail64
-	CMPQ inl, $128
-	JBE  sealSSETail128
-	CMPQ inl, $192
-	JBE  sealSSETail192
-
-sealSSEMainLoop:
-	// Load state, increment counter blocks
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO A2, A3; MOVO B2, B3; MOVO C2, C3; MOVO D2, D3; PADDL ·sseIncMask<>(SB), D3
-
-	// Store counters
-	MOVO D0, ctr0Store; MOVO D1, ctr1Store; MOVO D2, ctr2Store; MOVO D3, ctr3Store
-
-sealSSEInnerLoop:
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	polyAdd(0(oup))
-	shiftB0Left;  shiftB1Left; shiftB2Left; shiftB3Left
-	shiftC0Left;  shiftC1Left; shiftC2Left; shiftC3Left
-	shiftD0Left;  shiftD1Left; shiftD2Left; shiftD3Left
-	polyMulStage1
-	polyMulStage2
-	LEAQ          (2*8)(oup), oup
-	MOVO          C3, tmpStore
-	chachaQR(A0, B0, C0, D0, C3); chachaQR(A1, B1, C1, D1, C3); chachaQR(A2, B2, C2, D2, C3)
-	MOVO          tmpStore, C3
-	MOVO          C1, tmpStore
-	polyMulStage3
-	chachaQR(A3, B3, C3, D3, C1)
-	MOVO          tmpStore, C1
-	polyMulReduceStage
-	shiftB0Right; shiftB1Right; shiftB2Right; shiftB3Right
-	shiftC0Right; shiftC1Right; shiftC2Right; shiftC3Right
-	shiftD0Right; shiftD1Right; shiftD2Right; shiftD3Right
-	DECQ          itr2
-	JGE           sealSSEInnerLoop
-	polyAdd(0(oup))
-	polyMul
-	LEAQ          (2*8)(oup), oup
-	DECQ          itr1
-	JG            sealSSEInnerLoop
-
-	// Add in the state
-	PADDD ·chacha20Constants<>(SB), A0; PADDD ·chacha20Constants<>(SB), A1; PADDD ·chacha20Constants<>(SB), A2; PADDD ·chacha20Constants<>(SB), A3
-	PADDD state1Store, B0; PADDD state1Store, B1; PADDD state1Store, B2; PADDD state1Store, B3
-	PADDD state2Store, C0; PADDD state2Store, C1; PADDD state2Store, C2; PADDD state2Store, C3
-	PADDD ctr0Store, D0; PADDD ctr1Store, D1; PADDD ctr2Store, D2; PADDD ctr3Store, D3
-	MOVO  D3, tmpStore
-
-	// Load - xor - store
-	MOVOU (0*16)(inp), D3; PXOR D3, A0
-	MOVOU (1*16)(inp), D3; PXOR D3, B0
-	MOVOU (2*16)(inp), D3; PXOR D3, C0
-	MOVOU (3*16)(inp), D3; PXOR D3, D0
-	MOVOU A0, (0*16)(oup)
-	MOVOU B0, (1*16)(oup)
-	MOVOU C0, (2*16)(oup)
-	MOVOU D0, (3*16)(oup)
-	MOVO  tmpStore, D3
-
-	MOVOU (4*16)(inp), A0; MOVOU (5*16)(inp), B0; MOVOU (6*16)(inp), C0; MOVOU (7*16)(inp), D0
-	PXOR  A0, A1; PXOR B0, B1; PXOR C0, C1; PXOR D0, D1
-	MOVOU A1, (4*16)(oup); MOVOU B1, (5*16)(oup); MOVOU C1, (6*16)(oup); MOVOU D1, (7*16)(oup)
-	MOVOU (8*16)(inp), A0; MOVOU (9*16)(inp), B0; MOVOU (10*16)(inp), C0; MOVOU (11*16)(inp), D0
-	PXOR  A0, A2; PXOR B0, B2; PXOR C0, C2; PXOR D0, D2
-	MOVOU A2, (8*16)(oup); MOVOU B2, (9*16)(oup); MOVOU C2, (10*16)(oup); MOVOU D2, (11*16)(oup)
-	ADDQ  $192, inp
-	MOVQ  $192, itr1
-	SUBQ  $192, inl
-	MOVO  A3, A1
-	MOVO  B3, B1
-	MOVO  C3, C1
-	MOVO  D3, D1
-	CMPQ  inl, $64
-	JBE   sealSSE128SealHash
-	MOVOU (0*16)(inp), A0; MOVOU (1*16)(inp), B0; MOVOU (2*16)(inp), C0; MOVOU (3*16)(inp), D0
-	PXOR  A0, A3; PXOR B0, B3; PXOR C0, C3; PXOR D0, D3
-	MOVOU A3, (12*16)(oup); MOVOU B3, (13*16)(oup); MOVOU C3, (14*16)(oup); MOVOU D3, (15*16)(oup)
-	LEAQ  64(inp), inp
-	SUBQ  $64, inl
-	MOVQ  $6, itr1
-	MOVQ  $4, itr2
-	CMPQ  inl, $192
-	JG    sealSSEMainLoop
-
-	MOVQ  inl, itr1
-	TESTQ inl, inl
-	JE    sealSSE128SealHash
-	MOVQ  $6, itr1
-	CMPQ  inl, $64
-	JBE   sealSSETail64
-	CMPQ  inl, $128
-	JBE   sealSSETail128
-	JMP   sealSSETail192
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 64 bytes of plaintext
-sealSSETail64:
-	// Need to encrypt up to 64 bytes - prepare single block, hash 192 or 256 bytes
-	MOVO  ·chacha20Constants<>(SB), A1
-	MOVO  state1Store, B1
-	MOVO  state2Store, C1
-	MOVO  ctr3Store, D1
-	PADDL ·sseIncMask<>(SB), D1
-	MOVO  D1, ctr0Store
-
-sealSSETail64LoopA:
-	// Perform ChaCha rounds, while hashing the previously encrypted ciphertext
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealSSETail64LoopB:
-	chachaQR(A1, B1, C1, D1, T1)
-	shiftB1Left;  shiftC1Left; shiftD1Left
-	chachaQR(A1, B1, C1, D1, T1)
-	shiftB1Right; shiftC1Right; shiftD1Right
-	polyAdd(0(oup))
-	polyMul
-	LEAQ          16(oup), oup
-
-	DECQ itr1
-	JG   sealSSETail64LoopA
-
-	DECQ  itr2
-	JGE   sealSSETail64LoopB
-	PADDL ·chacha20Constants<>(SB), A1
-	PADDL state1Store, B1
-	PADDL state2Store, C1
-	PADDL ctr0Store, D1
-
-	JMP sealSSE128Seal
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 128 bytes of plaintext
-sealSSETail128:
-	// Need to encrypt up to 128 bytes - prepare two blocks, hash 192 or 256 bytes
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0; MOVO D0, ctr0Store
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1; MOVO D1, ctr1Store
-
-sealSSETail128LoopA:
-	// Perform ChaCha rounds, while hashing the previously encrypted ciphertext
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealSSETail128LoopB:
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0)
-	shiftB0Left;  shiftC0Left; shiftD0Left
-	shiftB1Left;  shiftC1Left; shiftD1Left
-	polyAdd(0(oup))
-	polyMul
-	LEAQ          16(oup), oup
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-	shiftB1Right; shiftC1Right; shiftD1Right
-
-	DECQ itr1
-	JG   sealSSETail128LoopA
-
-	DECQ itr2
-	JGE  sealSSETail128LoopB
-
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1
-	PADDL state1Store, B0; PADDL state1Store, B1
-	PADDL state2Store, C0; PADDL state2Store, C1
-	PADDL ctr0Store, D0; PADDL ctr1Store, D1
-
-	MOVOU (0*16)(inp), T0; MOVOU (1*16)(inp), T1; MOVOU (2*16)(inp), T2; MOVOU (3*16)(inp), T3
-	PXOR  T0, A0; PXOR T1, B0; PXOR T2, C0; PXOR T3, D0
-	MOVOU A0, (0*16)(oup); MOVOU B0, (1*16)(oup); MOVOU C0, (2*16)(oup); MOVOU D0, (3*16)(oup)
-
-	MOVQ $64, itr1
-	LEAQ 64(inp), inp
-	SUBQ $64, inl
-
-	JMP sealSSE128SealHash
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 192 bytes of plaintext
-sealSSETail192:
-	// Need to encrypt up to 192 bytes - prepare three blocks, hash 192 or 256 bytes
-	MOVO ·chacha20Constants<>(SB), A0; MOVO state1Store, B0; MOVO state2Store, C0; MOVO ctr3Store, D0; PADDL ·sseIncMask<>(SB), D0; MOVO D0, ctr0Store
-	MOVO A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1; MOVO D1, ctr1Store
-	MOVO A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2; MOVO D2, ctr2Store
-
-sealSSETail192LoopA:
-	// Perform ChaCha rounds, while hashing the previously encrypted ciphertext
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealSSETail192LoopB:
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Left; shiftC0Left; shiftD0Left
-	shiftB1Left; shiftC1Left; shiftD1Left
-	shiftB2Left; shiftC2Left; shiftD2Left
-
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Right; shiftC0Right; shiftD0Right
-	shiftB1Right; shiftC1Right; shiftD1Right
-	shiftB2Right; shiftC2Right; shiftD2Right
-
-	DECQ itr1
-	JG   sealSSETail192LoopA
-
-	DECQ itr2
-	JGE  sealSSETail192LoopB
-
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1; PADDL ·chacha20Constants<>(SB), A2
-	PADDL state1Store, B0; PADDL state1Store, B1; PADDL state1Store, B2
-	PADDL state2Store, C0; PADDL state2Store, C1; PADDL state2Store, C2
-	PADDL ctr0Store, D0; PADDL ctr1Store, D1; PADDL ctr2Store, D2
-
-	MOVOU (0*16)(inp), T0; MOVOU (1*16)(inp), T1; MOVOU (2*16)(inp), T2; MOVOU (3*16)(inp), T3
-	PXOR  T0, A0; PXOR T1, B0; PXOR T2, C0; PXOR T3, D0
-	MOVOU A0, (0*16)(oup); MOVOU B0, (1*16)(oup); MOVOU C0, (2*16)(oup); MOVOU D0, (3*16)(oup)
-	MOVOU (4*16)(inp), T0; MOVOU (5*16)(inp), T1; MOVOU (6*16)(inp), T2; MOVOU (7*16)(inp), T3
-	PXOR  T0, A1; PXOR T1, B1; PXOR T2, C1; PXOR T3, D1
-	MOVOU A1, (4*16)(oup); MOVOU B1, (5*16)(oup); MOVOU C1, (6*16)(oup); MOVOU D1, (7*16)(oup)
-
-	MOVO A2, A1
-	MOVO B2, B1
-	MOVO C2, C1
-	MOVO D2, D1
-	MOVQ $128, itr1
-	LEAQ 128(inp), inp
-	SUBQ $128, inl
-
-	JMP sealSSE128SealHash
-
-// ----------------------------------------------------------------------------
-// Special seal optimization for buffers smaller than 129 bytes
-sealSSE128:
-	// For up to 128 bytes of ciphertext and 64 bytes for the poly key, we require to process three blocks
-	MOVOU ·chacha20Constants<>(SB), A0; MOVOU (1*16)(keyp), B0; MOVOU (2*16)(keyp), C0; MOVOU (3*16)(keyp), D0
-	MOVO  A0, A1; MOVO B0, B1; MOVO C0, C1; MOVO D0, D1; PADDL ·sseIncMask<>(SB), D1
-	MOVO  A1, A2; MOVO B1, B2; MOVO C1, C2; MOVO D1, D2; PADDL ·sseIncMask<>(SB), D2
-	MOVO  B0, T1; MOVO C0, T2; MOVO D1, T3
-	MOVQ  $10, itr2
-
-sealSSE128InnerCipherLoop:
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Left;  shiftB1Left; shiftB2Left
-	shiftC0Left;  shiftC1Left; shiftC2Left
-	shiftD0Left;  shiftD1Left; shiftD2Left
-	chachaQR(A0, B0, C0, D0, T0); chachaQR(A1, B1, C1, D1, T0); chachaQR(A2, B2, C2, D2, T0)
-	shiftB0Right; shiftB1Right; shiftB2Right
-	shiftC0Right; shiftC1Right; shiftC2Right
-	shiftD0Right; shiftD1Right; shiftD2Right
-	DECQ          itr2
-	JNE           sealSSE128InnerCipherLoop
-
-	// A0|B0 hold the Poly1305 32-byte key, C0,D0 can be discarded
-	PADDL ·chacha20Constants<>(SB), A0; PADDL ·chacha20Constants<>(SB), A1; PADDL ·chacha20Constants<>(SB), A2
-	PADDL T1, B0; PADDL T1, B1; PADDL T1, B2
-	PADDL T2, C1; PADDL T2, C2
-	PADDL T3, D1; PADDL ·sseIncMask<>(SB), T3; PADDL T3, D2
-	PAND  ·polyClampMask<>(SB), A0
-	MOVOU A0, rStore
-	MOVOU B0, sStore
-
-	// Hash
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-	XORQ itr1, itr1
-
-sealSSE128SealHash:
-	// itr1 holds the number of bytes encrypted but not yet hashed
-	CMPQ itr1, $16
-	JB   sealSSE128Seal
-	polyAdd(0(oup))
-	polyMul
-
-	SUBQ $16, itr1
-	ADDQ $16, oup
-
-	JMP sealSSE128SealHash
-
-sealSSE128Seal:
-	CMPQ inl, $16
-	JB   sealSSETail
-	SUBQ $16, inl
-
-	// Load for decryption
-	MOVOU (inp), T0
-	PXOR  T0, A1
-	MOVOU A1, (oup)
-	LEAQ  (1*16)(inp), inp
-	LEAQ  (1*16)(oup), oup
-
-	// Extract for hashing
-	MOVQ   A1, t0
-	PSRLDQ $8, A1
-	MOVQ A1, t1
-	ADDQ   t0, acc0; ADCQ t1, acc1; ADCQ $1, acc2
-	polyMul
-
-	// Shift the stream "left"
-	MOVO B1, A1
-	MOVO C1, B1
-	MOVO D1, C1
-	MOVO A2, D1
-	MOVO B2, A2
-	MOVO C2, B2
-	MOVO D2, C2
-	JMP  sealSSE128Seal
-
-sealSSETail:
-	TESTQ inl, inl
-	JE    sealSSEFinalize
-
-	// We can only load the PT one byte at a time to avoid read after end of buffer
-	MOVQ inl, itr2
-	SHLQ $4, itr2
-	LEAQ ·andMask<>(SB), t0
-	MOVQ inl, itr1
-	LEAQ -1(inp)(inl*1), inp
-	XORQ t2, t2
-	XORQ t3, t3
-	XORQ AX, AX
-
-sealSSETailLoadLoop:
-	SHLQ $8, t2, t3
-	SHLQ $8, t2
-	MOVB (inp), AX
-	XORQ AX, t2
-	LEAQ   -1(inp), inp
-	DECQ   itr1
-	JNE    sealSSETailLoadLoop
-	MOVQ t2, 0+tmpStore
-	MOVQ t3, 8+tmpStore
-	PXOR 0+tmpStore, A1
-	MOVOU  A1, (oup)
-	MOVOU  -16(t0)(itr2*1), T0
-	PAND   T0, A1
-	MOVQ   A1, t0
-	PSRLDQ $8, A1
-	MOVQ   A1, t1
-	ADDQ   t0, acc0; ADCQ t1, acc1; ADCQ $1, acc2
-	polyMul
-
-	ADDQ inl, oup
-
-sealSSEFinalize:
-	// Hash in the buffer lengths
-	ADDQ ad_len+80(FP), acc0
-	ADCQ src_len+56(FP), acc1
-	ADCQ $1, acc2
-	polyMul
-
-	// Final reduce
-	MOVQ    acc0, t0
-	MOVQ    acc1, t1
-	MOVQ    acc2, t2
-	SUBQ    $-5, acc0
-	SBBQ    $-1, acc1
-	SBBQ    $3, acc2
-	CMOVQCS t0, acc0
-	CMOVQCS t1, acc1
-	CMOVQCS t2, acc2
-
-	// Add in the "s" part of the key
-	ADDQ 0+sStore, acc0
-	ADCQ 8+sStore, acc1
-
-	// Finally store the tag at the end of the message
-	MOVQ acc0, (0*8)(oup)
-	MOVQ acc1, (1*8)(oup)
-	RET
-
-// ----------------------------------------------------------------------------
-// ------------------------- AVX2 Code ----------------------------------------
-chacha20Poly1305Seal_AVX2:
-	VZEROUPPER
-	VMOVDQU ·chacha20Constants<>(SB), AA0
-	BYTE    $0xc4; BYTE $0x42; BYTE $0x7d; BYTE $0x5a; BYTE $0x70; BYTE $0x10 // broadcasti128 16(r8), ymm14
-	BYTE    $0xc4; BYTE $0x42; BYTE $0x7d; BYTE $0x5a; BYTE $0x60; BYTE $0x20 // broadcasti128 32(r8), ymm12
-	BYTE    $0xc4; BYTE $0xc2; BYTE $0x7d; BYTE $0x5a; BYTE $0x60; BYTE $0x30 // broadcasti128 48(r8), ymm4
-	VPADDD  ·avx2InitMask<>(SB), DD0, DD0
-
-	// Special optimizations, for very short buffers
-	CMPQ inl, $192
-	JBE  seal192AVX2 // 33% faster
-	CMPQ inl, $320
-	JBE  seal320AVX2 // 17% faster
-
-	// For the general key prepare the key first - as a byproduct we have 64 bytes of cipher stream
-	VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3; VMOVDQA BB0, state1StoreAVX2
-	VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3; VMOVDQA CC0, state2StoreAVX2
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1; VMOVDQA DD0, ctr0StoreAVX2
-	VPADDD  ·avx2IncMask<>(SB), DD1, DD2; VMOVDQA DD1, ctr1StoreAVX2
-	VPADDD  ·avx2IncMask<>(SB), DD2, DD3; VMOVDQA DD2, ctr2StoreAVX2
-	VMOVDQA DD3, ctr3StoreAVX2
-	MOVQ    $10, itr2
-
-sealAVX2IntroLoop:
-	VMOVDQA CC3, tmpStoreAVX2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, CC3); chachaQR_AVX2(AA1, BB1, CC1, DD1, CC3); chachaQR_AVX2(AA2, BB2, CC2, DD2, CC3)
-	VMOVDQA tmpStoreAVX2, CC3
-	VMOVDQA CC1, tmpStoreAVX2
-	chachaQR_AVX2(AA3, BB3, CC3, DD3, CC1)
-	VMOVDQA tmpStoreAVX2, CC1
-
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $12, DD0, DD0, DD0
-	VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $12, DD1, DD1, DD1
-	VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $12, DD2, DD2, DD2
-	VPALIGNR $4, BB3, BB3, BB3; VPALIGNR $8, CC3, CC3, CC3; VPALIGNR $12, DD3, DD3, DD3
-
-	VMOVDQA CC3, tmpStoreAVX2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, CC3); chachaQR_AVX2(AA1, BB1, CC1, DD1, CC3); chachaQR_AVX2(AA2, BB2, CC2, DD2, CC3)
-	VMOVDQA tmpStoreAVX2, CC3
-	VMOVDQA CC1, tmpStoreAVX2
-	chachaQR_AVX2(AA3, BB3, CC3, DD3, CC1)
-	VMOVDQA tmpStoreAVX2, CC1
-
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $4, DD0, DD0, DD0
-	VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $4, DD1, DD1, DD1
-	VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $4, DD2, DD2, DD2
-	VPALIGNR $12, BB3, BB3, BB3; VPALIGNR $8, CC3, CC3, CC3; VPALIGNR $4, DD3, DD3, DD3
-	DECQ     itr2
-	JNE      sealAVX2IntroLoop
-
-	VPADDD ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2; VPADDD ·chacha20Constants<>(SB), AA3, AA3
-	VPADDD state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2; VPADDD state1StoreAVX2, BB3, BB3
-	VPADDD state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2; VPADDD state2StoreAVX2, CC3, CC3
-	VPADDD ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2; VPADDD ctr3StoreAVX2, DD3, DD3
-
-	VPERM2I128 $0x13, CC0, DD0, CC0 // Stream bytes 96 - 127
-	VPERM2I128 $0x02, AA0, BB0, DD0 // The Poly1305 key
-	VPERM2I128 $0x13, AA0, BB0, AA0 // Stream bytes 64 - 95
-
-	// Clamp and store poly key
-	VPAND   ·polyClampMask<>(SB), DD0, DD0
-	VMOVDQA DD0, rsStoreAVX2
-
-	// Hash AD
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-
-	// Can store at least 320 bytes
-	VPXOR   (0*32)(inp), AA0, AA0
-	VPXOR   (1*32)(inp), CC0, CC0
-	VMOVDQU AA0, (0*32)(oup)
-	VMOVDQU CC0, (1*32)(oup)
-
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-	VPXOR      (2*32)(inp), AA0, AA0; VPXOR (3*32)(inp), BB0, BB0; VPXOR (4*32)(inp), CC0, CC0; VPXOR (5*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (2*32)(oup); VMOVDQU BB0, (3*32)(oup); VMOVDQU CC0, (4*32)(oup); VMOVDQU DD0, (5*32)(oup)
-	VPERM2I128 $0x02, AA2, BB2, AA0; VPERM2I128 $0x02, CC2, DD2, BB0; VPERM2I128 $0x13, AA2, BB2, CC0; VPERM2I128 $0x13, CC2, DD2, DD0
-	VPXOR      (6*32)(inp), AA0, AA0; VPXOR (7*32)(inp), BB0, BB0; VPXOR (8*32)(inp), CC0, CC0; VPXOR (9*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (6*32)(oup); VMOVDQU BB0, (7*32)(oup); VMOVDQU CC0, (8*32)(oup); VMOVDQU DD0, (9*32)(oup)
-
-	MOVQ $320, itr1
-	SUBQ $320, inl
-	LEAQ 320(inp), inp
-
-	VPERM2I128 $0x02, AA3, BB3, AA0; VPERM2I128 $0x02, CC3, DD3, BB0; VPERM2I128 $0x13, AA3, BB3, CC0; VPERM2I128 $0x13, CC3, DD3, DD0
-	CMPQ       inl, $128
-	JBE        sealAVX2SealHash
-
-	VPXOR   (0*32)(inp), AA0, AA0; VPXOR (1*32)(inp), BB0, BB0; VPXOR (2*32)(inp), CC0, CC0; VPXOR (3*32)(inp), DD0, DD0
-	VMOVDQU AA0, (10*32)(oup); VMOVDQU BB0, (11*32)(oup); VMOVDQU CC0, (12*32)(oup); VMOVDQU DD0, (13*32)(oup)
-	SUBQ    $128, inl
-	LEAQ    128(inp), inp
-
-	MOVQ $8, itr1
-	MOVQ $2, itr2
-
-	CMPQ inl, $128
-	JBE  sealAVX2Tail128
-	CMPQ inl, $256
-	JBE  sealAVX2Tail256
-	CMPQ inl, $384
-	JBE  sealAVX2Tail384
-	CMPQ inl, $512
-	JBE  sealAVX2Tail512
-
-	// We have 448 bytes to hash, but main loop hashes 512 bytes at a time - perform some rounds, before the main loop
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2; VPADDD ·avx2IncMask<>(SB), DD2, DD3
-	VMOVDQA DD0, ctr0StoreAVX2; VMOVDQA DD1, ctr1StoreAVX2; VMOVDQA DD2, ctr2StoreAVX2; VMOVDQA DD3, ctr3StoreAVX2
-
-	VMOVDQA CC3, tmpStoreAVX2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, CC3); chachaQR_AVX2(AA1, BB1, CC1, DD1, CC3); chachaQR_AVX2(AA2, BB2, CC2, DD2, CC3)
-	VMOVDQA tmpStoreAVX2, CC3
-	VMOVDQA CC1, tmpStoreAVX2
-	chachaQR_AVX2(AA3, BB3, CC3, DD3, CC1)
-	VMOVDQA tmpStoreAVX2, CC1
-
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $12, DD0, DD0, DD0
-	VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $12, DD1, DD1, DD1
-	VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $12, DD2, DD2, DD2
-	VPALIGNR $4, BB3, BB3, BB3; VPALIGNR $8, CC3, CC3, CC3; VPALIGNR $12, DD3, DD3, DD3
-
-	VMOVDQA CC3, tmpStoreAVX2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, CC3); chachaQR_AVX2(AA1, BB1, CC1, DD1, CC3); chachaQR_AVX2(AA2, BB2, CC2, DD2, CC3)
-	VMOVDQA tmpStoreAVX2, CC3
-	VMOVDQA CC1, tmpStoreAVX2
-	chachaQR_AVX2(AA3, BB3, CC3, DD3, CC1)
-	VMOVDQA tmpStoreAVX2, CC1
-
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $4, DD0, DD0, DD0
-	VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $4, DD1, DD1, DD1
-	VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $4, DD2, DD2, DD2
-	VPALIGNR $12, BB3, BB3, BB3; VPALIGNR $8, CC3, CC3, CC3; VPALIGNR $4, DD3, DD3, DD3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-
-	SUBQ $16, oup                  // Adjust the pointer
-	MOVQ $9, itr1
-	JMP  sealAVX2InternalLoopStart
-
-sealAVX2MainLoop:
-	// Load state, increment counter blocks, store the incremented counters
-	VMOVDQU ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3
-	VMOVDQA ctr3StoreAVX2, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2; VPADDD ·avx2IncMask<>(SB), DD2, DD3
-	VMOVDQA DD0, ctr0StoreAVX2; VMOVDQA DD1, ctr1StoreAVX2; VMOVDQA DD2, ctr2StoreAVX2; VMOVDQA DD3, ctr3StoreAVX2
-	MOVQ    $10, itr1
-
-sealAVX2InternalLoop:
-	polyAdd(0*8(oup))
-	VPADDD  BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	polyMulStage1_AVX2
-	VPXOR   AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	polyMulStage2_AVX2
-	VPADDD  DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR   CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyMulStage3_AVX2
-	VMOVDQA CC3, tmpStoreAVX2
-	VPSLLD  $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD  $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD  $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD  $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA tmpStoreAVX2, CC3
-	polyMulReduceStage
-
-sealAVX2InternalLoopStart:
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	polyAdd(2*8(oup))
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	polyMulStage1_AVX2
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulStage2_AVX2
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $4, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2; VPALIGNR $12, DD3, DD3, DD3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	polyMulStage3_AVX2
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	polyMulReduceStage
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyAdd(4*8(oup))
-	LEAQ     (6*8)(oup), oup
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulStage1_AVX2
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	polyMulStage2_AVX2
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	polyMulStage3_AVX2
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyMulReduceStage
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $12, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2; VPALIGNR $4, DD3, DD3, DD3
-	DECQ     itr1
-	JNE      sealAVX2InternalLoop
-
-	VPADDD  ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2; VPADDD ·chacha20Constants<>(SB), AA3, AA3
-	VPADDD  state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2; VPADDD state1StoreAVX2, BB3, BB3
-	VPADDD  state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2; VPADDD state2StoreAVX2, CC3, CC3
-	VPADDD  ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2; VPADDD ctr3StoreAVX2, DD3, DD3
-	VMOVDQA CC3, tmpStoreAVX2
-
-	// We only hashed 480 of the 512 bytes available - hash the remaining 32 here
-	polyAdd(0*8(oup))
-	polyMulAVX2
-	LEAQ       (4*8)(oup), oup
-	VPERM2I128 $0x02, AA0, BB0, CC3; VPERM2I128 $0x13, AA0, BB0, BB0; VPERM2I128 $0x02, CC0, DD0, AA0; VPERM2I128 $0x13, CC0, DD0, CC0
-	VPXOR      (0*32)(inp), CC3, CC3; VPXOR (1*32)(inp), AA0, AA0; VPXOR (2*32)(inp), BB0, BB0; VPXOR (3*32)(inp), CC0, CC0
-	VMOVDQU    CC3, (0*32)(oup); VMOVDQU AA0, (1*32)(oup); VMOVDQU BB0, (2*32)(oup); VMOVDQU CC0, (3*32)(oup)
-	VPERM2I128 $0x02, AA1, BB1, AA0; VPERM2I128 $0x02, CC1, DD1, BB0; VPERM2I128 $0x13, AA1, BB1, CC0; VPERM2I128 $0x13, CC1, DD1, DD0
-	VPXOR      (4*32)(inp), AA0, AA0; VPXOR (5*32)(inp), BB0, BB0; VPXOR (6*32)(inp), CC0, CC0; VPXOR (7*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (4*32)(oup); VMOVDQU BB0, (5*32)(oup); VMOVDQU CC0, (6*32)(oup); VMOVDQU DD0, (7*32)(oup)
-
-	// and here
-	polyAdd(-2*8(oup))
-	polyMulAVX2
-	VPERM2I128 $0x02, AA2, BB2, AA0; VPERM2I128 $0x02, CC2, DD2, BB0; VPERM2I128 $0x13, AA2, BB2, CC0; VPERM2I128 $0x13, CC2, DD2, DD0
-	VPXOR      (8*32)(inp), AA0, AA0; VPXOR (9*32)(inp), BB0, BB0; VPXOR (10*32)(inp), CC0, CC0; VPXOR (11*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (8*32)(oup); VMOVDQU BB0, (9*32)(oup); VMOVDQU CC0, (10*32)(oup); VMOVDQU DD0, (11*32)(oup)
-	VPERM2I128 $0x02, AA3, BB3, AA0; VPERM2I128 $0x02, tmpStoreAVX2, DD3, BB0; VPERM2I128 $0x13, AA3, BB3, CC0; VPERM2I128 $0x13, tmpStoreAVX2, DD3, DD0
-	VPXOR      (12*32)(inp), AA0, AA0; VPXOR (13*32)(inp), BB0, BB0; VPXOR (14*32)(inp), CC0, CC0; VPXOR (15*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (12*32)(oup); VMOVDQU BB0, (13*32)(oup); VMOVDQU CC0, (14*32)(oup); VMOVDQU DD0, (15*32)(oup)
-	LEAQ       (32*16)(inp), inp
-	SUBQ       $(32*16), inl
-	CMPQ       inl, $512
-	JG         sealAVX2MainLoop
-
-	// Tail can only hash 480 bytes
-	polyAdd(0*8(oup))
-	polyMulAVX2
-	polyAdd(2*8(oup))
-	polyMulAVX2
-	LEAQ 32(oup), oup
-
-	MOVQ $10, itr1
-	MOVQ $0, itr2
-	CMPQ inl, $128
-	JBE  sealAVX2Tail128
-	CMPQ inl, $256
-	JBE  sealAVX2Tail256
-	CMPQ inl, $384
-	JBE  sealAVX2Tail384
-	JMP  sealAVX2Tail512
-
-// ----------------------------------------------------------------------------
-// Special optimization for buffers smaller than 193 bytes
-seal192AVX2:
-	// For up to 192 bytes of ciphertext and 64 bytes for the poly key, we process four blocks
-	VMOVDQA AA0, AA1
-	VMOVDQA BB0, BB1
-	VMOVDQA CC0, CC1
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA AA0, AA2
-	VMOVDQA BB0, BB2
-	VMOVDQA CC0, CC2
-	VMOVDQA DD0, DD2
-	VMOVDQA DD1, TT3
-	MOVQ    $10, itr2
-
-sealAVX2192InnerCipherLoop:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR   $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1
-	VPALIGNR   $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR   $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	VPALIGNR   $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1
-	VPALIGNR   $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR   $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1
-	DECQ       itr2
-	JNE        sealAVX2192InnerCipherLoop
-	VPADDD     AA2, AA0, AA0; VPADDD AA2, AA1, AA1
-	VPADDD     BB2, BB0, BB0; VPADDD BB2, BB1, BB1
-	VPADDD     CC2, CC0, CC0; VPADDD CC2, CC1, CC1
-	VPADDD     DD2, DD0, DD0; VPADDD TT3, DD1, DD1
-	VPERM2I128 $0x02, AA0, BB0, TT0
-
-	// Clamp and store poly key
-	VPAND   ·polyClampMask<>(SB), TT0, TT0
-	VMOVDQA TT0, rsStoreAVX2
-
-	// Stream for up to 192 bytes
-	VPERM2I128 $0x13, AA0, BB0, AA0
-	VPERM2I128 $0x13, CC0, DD0, BB0
-	VPERM2I128 $0x02, AA1, BB1, CC0
-	VPERM2I128 $0x02, CC1, DD1, DD0
-	VPERM2I128 $0x13, AA1, BB1, AA1
-	VPERM2I128 $0x13, CC1, DD1, BB1
-
-sealAVX2ShortSeal:
-	// Hash aad
-	MOVQ ad_len+80(FP), itr2
-	CALL polyHashADInternal<>(SB)
-	XORQ itr1, itr1
-
-sealAVX2SealHash:
-	// itr1 holds the number of bytes encrypted but not yet hashed
-	CMPQ itr1, $16
-	JB   sealAVX2ShortSealLoop
-	polyAdd(0(oup))
-	polyMul
-	SUBQ $16, itr1
-	ADDQ $16, oup
-	JMP  sealAVX2SealHash
-
-sealAVX2ShortSealLoop:
-	CMPQ inl, $32
-	JB   sealAVX2ShortTail32
-	SUBQ $32, inl
-
-	// Load for encryption
-	VPXOR   (inp), AA0, AA0
-	VMOVDQU AA0, (oup)
-	LEAQ    (1*32)(inp), inp
-
-	// Now can hash
-	polyAdd(0*8(oup))
-	polyMulAVX2
-	polyAdd(2*8(oup))
-	polyMulAVX2
-	LEAQ (1*32)(oup), oup
-
-	// Shift stream left
-	VMOVDQA BB0, AA0
-	VMOVDQA CC0, BB0
-	VMOVDQA DD0, CC0
-	VMOVDQA AA1, DD0
-	VMOVDQA BB1, AA1
-	VMOVDQA CC1, BB1
-	VMOVDQA DD1, CC1
-	VMOVDQA AA2, DD1
-	VMOVDQA BB2, AA2
-	JMP     sealAVX2ShortSealLoop
-
-sealAVX2ShortTail32:
-	CMPQ    inl, $16
-	VMOVDQA A0, A1
-	JB      sealAVX2ShortDone
-
-	SUBQ $16, inl
-
-	// Load for encryption
-	VPXOR   (inp), A0, T0
-	VMOVDQU T0, (oup)
-	LEAQ    (1*16)(inp), inp
-
-	// Hash
-	polyAdd(0*8(oup))
-	polyMulAVX2
-	LEAQ       (1*16)(oup), oup
-	VPERM2I128 $0x11, AA0, AA0, AA0
-	VMOVDQA    A0, A1
-
-sealAVX2ShortDone:
-	VZEROUPPER
-	JMP sealSSETail
-
-// ----------------------------------------------------------------------------
-// Special optimization for buffers smaller than 321 bytes
-seal320AVX2:
-	// For up to 320 bytes of ciphertext and 64 bytes for the poly key, we process six blocks
-	VMOVDQA AA0, AA1; VMOVDQA BB0, BB1; VMOVDQA CC0, CC1; VPADDD ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA AA0, AA2; VMOVDQA BB0, BB2; VMOVDQA CC0, CC2; VPADDD ·avx2IncMask<>(SB), DD1, DD2
-	VMOVDQA BB0, TT1; VMOVDQA CC0, TT2; VMOVDQA DD0, TT3
-	MOVQ    $10, itr2
-
-sealAVX2320InnerCipherLoop:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2
-	DECQ     itr2
-	JNE      sealAVX2320InnerCipherLoop
-
-	VMOVDQA ·chacha20Constants<>(SB), TT0
-	VPADDD  TT0, AA0, AA0; VPADDD TT0, AA1, AA1; VPADDD TT0, AA2, AA2
-	VPADDD  TT1, BB0, BB0; VPADDD TT1, BB1, BB1; VPADDD TT1, BB2, BB2
-	VPADDD  TT2, CC0, CC0; VPADDD TT2, CC1, CC1; VPADDD TT2, CC2, CC2
-	VMOVDQA ·avx2IncMask<>(SB), TT0
-	VPADDD  TT3, DD0, DD0; VPADDD TT0, TT3, TT3
-	VPADDD  TT3, DD1, DD1; VPADDD TT0, TT3, TT3
-	VPADDD  TT3, DD2, DD2
-
-	// Clamp and store poly key
-	VPERM2I128 $0x02, AA0, BB0, TT0
-	VPAND      ·polyClampMask<>(SB), TT0, TT0
-	VMOVDQA    TT0, rsStoreAVX2
-
-	// Stream for up to 320 bytes
-	VPERM2I128 $0x13, AA0, BB0, AA0
-	VPERM2I128 $0x13, CC0, DD0, BB0
-	VPERM2I128 $0x02, AA1, BB1, CC0
-	VPERM2I128 $0x02, CC1, DD1, DD0
-	VPERM2I128 $0x13, AA1, BB1, AA1
-	VPERM2I128 $0x13, CC1, DD1, BB1
-	VPERM2I128 $0x02, AA2, BB2, CC1
-	VPERM2I128 $0x02, CC2, DD2, DD1
-	VPERM2I128 $0x13, AA2, BB2, AA2
-	VPERM2I128 $0x13, CC2, DD2, BB2
-	JMP        sealAVX2ShortSeal
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 128 bytes of ciphertext
-sealAVX2Tail128:
-	// Need to decrypt up to 128 bytes - prepare two blocks
-	// If we got here after the main loop - there are 512 encrypted bytes waiting to be hashed
-	// If we got here before the main loop - there are 448 encrpyred bytes waiting to be hashed
-	VMOVDQA ·chacha20Constants<>(SB), AA0
-	VMOVDQA state1StoreAVX2, BB0
-	VMOVDQA state2StoreAVX2, CC0
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0
-	VMOVDQA DD0, DD1
-
-sealAVX2Tail128LoopA:
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealAVX2Tail128LoopB:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0)
-	polyAdd(0(oup))
-	polyMul
-	VPALIGNR $4, BB0, BB0, BB0
-	VPALIGNR $8, CC0, CC0, CC0
-	VPALIGNR $12, DD0, DD0, DD0
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0)
-	polyAdd(16(oup))
-	polyMul
-	LEAQ     32(oup), oup
-	VPALIGNR $12, BB0, BB0, BB0
-	VPALIGNR $8, CC0, CC0, CC0
-	VPALIGNR $4, DD0, DD0, DD0
-	DECQ     itr1
-	JG       sealAVX2Tail128LoopA
-	DECQ     itr2
-	JGE      sealAVX2Tail128LoopB
-
-	VPADDD ·chacha20Constants<>(SB), AA0, AA1
-	VPADDD state1StoreAVX2, BB0, BB1
-	VPADDD state2StoreAVX2, CC0, CC1
-	VPADDD DD1, DD0, DD1
-
-	VPERM2I128 $0x02, AA1, BB1, AA0
-	VPERM2I128 $0x02, CC1, DD1, BB0
-	VPERM2I128 $0x13, AA1, BB1, CC0
-	VPERM2I128 $0x13, CC1, DD1, DD0
-	JMP        sealAVX2ShortSealLoop
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 256 bytes of ciphertext
-sealAVX2Tail256:
-	// Need to decrypt up to 256 bytes - prepare two blocks
-	// If we got here after the main loop - there are 512 encrypted bytes waiting to be hashed
-	// If we got here before the main loop - there are 448 encrpyred bytes waiting to be hashed
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA ·chacha20Constants<>(SB), AA1
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA state1StoreAVX2, BB1
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA state2StoreAVX2, CC1
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD1
-	VMOVDQA DD0, TT1
-	VMOVDQA DD1, TT2
-
-sealAVX2Tail256LoopA:
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealAVX2Tail256LoopB:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	polyAdd(0(oup))
-	polyMul
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0)
-	polyAdd(16(oup))
-	polyMul
-	LEAQ     32(oup), oup
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1
-	DECQ     itr1
-	JG       sealAVX2Tail256LoopA
-	DECQ     itr2
-	JGE      sealAVX2Tail256LoopB
-
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1
-	VPADDD     TT1, DD0, DD0; VPADDD TT2, DD1, DD1
-	VPERM2I128 $0x02, AA0, BB0, TT0
-	VPERM2I128 $0x02, CC0, DD0, TT1
-	VPERM2I128 $0x13, AA0, BB0, TT2
-	VPERM2I128 $0x13, CC0, DD0, TT3
-	VPXOR      (0*32)(inp), TT0, TT0; VPXOR (1*32)(inp), TT1, TT1; VPXOR (2*32)(inp), TT2, TT2; VPXOR (3*32)(inp), TT3, TT3
-	VMOVDQU    TT0, (0*32)(oup); VMOVDQU TT1, (1*32)(oup); VMOVDQU TT2, (2*32)(oup); VMOVDQU TT3, (3*32)(oup)
-	MOVQ       $128, itr1
-	LEAQ       128(inp), inp
-	SUBQ       $128, inl
-	VPERM2I128 $0x02, AA1, BB1, AA0
-	VPERM2I128 $0x02, CC1, DD1, BB0
-	VPERM2I128 $0x13, AA1, BB1, CC0
-	VPERM2I128 $0x13, CC1, DD1, DD0
-
-	JMP sealAVX2SealHash
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 384 bytes of ciphertext
-sealAVX2Tail384:
-	// Need to decrypt up to 384 bytes - prepare two blocks
-	// If we got here after the main loop - there are 512 encrypted bytes waiting to be hashed
-	// If we got here before the main loop - there are 448 encrpyred bytes waiting to be hashed
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2
-	VMOVDQA DD0, TT1; VMOVDQA DD1, TT2; VMOVDQA DD2, TT3
-
-sealAVX2Tail384LoopA:
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealAVX2Tail384LoopB:
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	polyAdd(0(oup))
-	polyMul
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2
-	chachaQR_AVX2(AA0, BB0, CC0, DD0, TT0); chachaQR_AVX2(AA1, BB1, CC1, DD1, TT0); chachaQR_AVX2(AA2, BB2, CC2, DD2, TT0)
-	polyAdd(16(oup))
-	polyMul
-	LEAQ     32(oup), oup
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2
-	DECQ     itr1
-	JG       sealAVX2Tail384LoopA
-	DECQ     itr2
-	JGE      sealAVX2Tail384LoopB
-
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2
-	VPADDD     TT1, DD0, DD0; VPADDD TT2, DD1, DD1; VPADDD TT3, DD2, DD2
-	VPERM2I128 $0x02, AA0, BB0, TT0
-	VPERM2I128 $0x02, CC0, DD0, TT1
-	VPERM2I128 $0x13, AA0, BB0, TT2
-	VPERM2I128 $0x13, CC0, DD0, TT3
-	VPXOR      (0*32)(inp), TT0, TT0; VPXOR (1*32)(inp), TT1, TT1; VPXOR (2*32)(inp), TT2, TT2; VPXOR (3*32)(inp), TT3, TT3
-	VMOVDQU    TT0, (0*32)(oup); VMOVDQU TT1, (1*32)(oup); VMOVDQU TT2, (2*32)(oup); VMOVDQU TT3, (3*32)(oup)
-	VPERM2I128 $0x02, AA1, BB1, TT0
-	VPERM2I128 $0x02, CC1, DD1, TT1
-	VPERM2I128 $0x13, AA1, BB1, TT2
-	VPERM2I128 $0x13, CC1, DD1, TT3
-	VPXOR      (4*32)(inp), TT0, TT0; VPXOR (5*32)(inp), TT1, TT1; VPXOR (6*32)(inp), TT2, TT2; VPXOR (7*32)(inp), TT3, TT3
-	VMOVDQU    TT0, (4*32)(oup); VMOVDQU TT1, (5*32)(oup); VMOVDQU TT2, (6*32)(oup); VMOVDQU TT3, (7*32)(oup)
-	MOVQ       $256, itr1
-	LEAQ       256(inp), inp
-	SUBQ       $256, inl
-	VPERM2I128 $0x02, AA2, BB2, AA0
-	VPERM2I128 $0x02, CC2, DD2, BB0
-	VPERM2I128 $0x13, AA2, BB2, CC0
-	VPERM2I128 $0x13, CC2, DD2, DD0
-
-	JMP sealAVX2SealHash
-
-// ----------------------------------------------------------------------------
-// Special optimization for the last 512 bytes of ciphertext
-sealAVX2Tail512:
-	// Need to decrypt up to 512 bytes - prepare two blocks
-	// If we got here after the main loop - there are 512 encrypted bytes waiting to be hashed
-	// If we got here before the main loop - there are 448 encrpyred bytes waiting to be hashed
-	VMOVDQA ·chacha20Constants<>(SB), AA0; VMOVDQA AA0, AA1; VMOVDQA AA0, AA2; VMOVDQA AA0, AA3
-	VMOVDQA state1StoreAVX2, BB0; VMOVDQA BB0, BB1; VMOVDQA BB0, BB2; VMOVDQA BB0, BB3
-	VMOVDQA state2StoreAVX2, CC0; VMOVDQA CC0, CC1; VMOVDQA CC0, CC2; VMOVDQA CC0, CC3
-	VMOVDQA ctr3StoreAVX2, DD0
-	VPADDD  ·avx2IncMask<>(SB), DD0, DD0; VPADDD ·avx2IncMask<>(SB), DD0, DD1; VPADDD ·avx2IncMask<>(SB), DD1, DD2; VPADDD ·avx2IncMask<>(SB), DD2, DD3
-	VMOVDQA DD0, ctr0StoreAVX2; VMOVDQA DD1, ctr1StoreAVX2; VMOVDQA DD2, ctr2StoreAVX2; VMOVDQA DD3, ctr3StoreAVX2
-
-sealAVX2Tail512LoopA:
-	polyAdd(0(oup))
-	polyMul
-	LEAQ 16(oup), oup
-
-sealAVX2Tail512LoopB:
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	polyAdd(0*8(oup))
-	polyMulAVX2
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPALIGNR $4, BB0, BB0, BB0; VPALIGNR $4, BB1, BB1, BB1; VPALIGNR $4, BB2, BB2, BB2; VPALIGNR $4, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $12, DD0, DD0, DD0; VPALIGNR $12, DD1, DD1, DD1; VPALIGNR $12, DD2, DD2, DD2; VPALIGNR $12, DD3, DD3, DD3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol16<>(SB), DD0, DD0; VPSHUFB ·rol16<>(SB), DD1, DD1; VPSHUFB ·rol16<>(SB), DD2, DD2; VPSHUFB ·rol16<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	polyAdd(2*8(oup))
-	polyMulAVX2
-	LEAQ     (4*8)(oup), oup
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $12, BB0, CC3; VPSRLD $20, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $12, BB1, CC3; VPSRLD $20, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $12, BB2, CC3; VPSRLD $20, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $12, BB3, CC3; VPSRLD $20, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPADDD   BB0, AA0, AA0; VPADDD BB1, AA1, AA1; VPADDD BB2, AA2, AA2; VPADDD BB3, AA3, AA3
-	VPXOR    AA0, DD0, DD0; VPXOR AA1, DD1, DD1; VPXOR AA2, DD2, DD2; VPXOR AA3, DD3, DD3
-	VPSHUFB  ·rol8<>(SB), DD0, DD0; VPSHUFB ·rol8<>(SB), DD1, DD1; VPSHUFB ·rol8<>(SB), DD2, DD2; VPSHUFB ·rol8<>(SB), DD3, DD3
-	VPADDD   DD0, CC0, CC0; VPADDD DD1, CC1, CC1; VPADDD DD2, CC2, CC2; VPADDD DD3, CC3, CC3
-	VPXOR    CC0, BB0, BB0; VPXOR CC1, BB1, BB1; VPXOR CC2, BB2, BB2; VPXOR CC3, BB3, BB3
-	VMOVDQA  CC3, tmpStoreAVX2
-	VPSLLD   $7, BB0, CC3; VPSRLD $25, BB0, BB0; VPXOR CC3, BB0, BB0
-	VPSLLD   $7, BB1, CC3; VPSRLD $25, BB1, BB1; VPXOR CC3, BB1, BB1
-	VPSLLD   $7, BB2, CC3; VPSRLD $25, BB2, BB2; VPXOR CC3, BB2, BB2
-	VPSLLD   $7, BB3, CC3; VPSRLD $25, BB3, BB3; VPXOR CC3, BB3, BB3
-	VMOVDQA  tmpStoreAVX2, CC3
-	VPALIGNR $12, BB0, BB0, BB0; VPALIGNR $12, BB1, BB1, BB1; VPALIGNR $12, BB2, BB2, BB2; VPALIGNR $12, BB3, BB3, BB3
-	VPALIGNR $8, CC0, CC0, CC0; VPALIGNR $8, CC1, CC1, CC1; VPALIGNR $8, CC2, CC2, CC2; VPALIGNR $8, CC3, CC3, CC3
-	VPALIGNR $4, DD0, DD0, DD0; VPALIGNR $4, DD1, DD1, DD1; VPALIGNR $4, DD2, DD2, DD2; VPALIGNR $4, DD3, DD3, DD3
-
-	DECQ itr1
-	JG   sealAVX2Tail512LoopA
-	DECQ itr2
-	JGE  sealAVX2Tail512LoopB
-
-	VPADDD     ·chacha20Constants<>(SB), AA0, AA0; VPADDD ·chacha20Constants<>(SB), AA1, AA1; VPADDD ·chacha20Constants<>(SB), AA2, AA2; VPADDD ·chacha20Constants<>(SB), AA3, AA3
-	VPADDD     state1StoreAVX2, BB0, BB0; VPADDD state1StoreAVX2, BB1, BB1; VPADDD state1StoreAVX2, BB2, BB2; VPADDD state1StoreAVX2, BB3, BB3
-	VPADDD     state2StoreAVX2, CC0, CC0; VPADDD state2StoreAVX2, CC1, CC1; VPADDD state2StoreAVX2, CC2, CC2; VPADDD state2StoreAVX2, CC3, CC3
-	VPADDD     ctr0StoreAVX2, DD0, DD0; VPADDD ctr1StoreAVX2, DD1, DD1; VPADDD ctr2StoreAVX2, DD2, DD2; VPADDD ctr3StoreAVX2, DD3, DD3
-	VMOVDQA    CC3, tmpStoreAVX2
-	VPERM2I128 $0x02, AA0, BB0, CC3
-	VPXOR      (0*32)(inp), CC3, CC3
-	VMOVDQU    CC3, (0*32)(oup)
-	VPERM2I128 $0x02, CC0, DD0, CC3
-	VPXOR      (1*32)(inp), CC3, CC3
-	VMOVDQU    CC3, (1*32)(oup)
-	VPERM2I128 $0x13, AA0, BB0, CC3
-	VPXOR      (2*32)(inp), CC3, CC3
-	VMOVDQU    CC3, (2*32)(oup)
-	VPERM2I128 $0x13, CC0, DD0, CC3
-	VPXOR      (3*32)(inp), CC3, CC3
-	VMOVDQU    CC3, (3*32)(oup)
-
-	VPERM2I128 $0x02, AA1, BB1, AA0
-	VPERM2I128 $0x02, CC1, DD1, BB0
-	VPERM2I128 $0x13, AA1, BB1, CC0
-	VPERM2I128 $0x13, CC1, DD1, DD0
-	VPXOR      (4*32)(inp), AA0, AA0; VPXOR (5*32)(inp), BB0, BB0; VPXOR (6*32)(inp), CC0, CC0; VPXOR (7*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (4*32)(oup); VMOVDQU BB0, (5*32)(oup); VMOVDQU CC0, (6*32)(oup); VMOVDQU DD0, (7*32)(oup)
-
-	VPERM2I128 $0x02, AA2, BB2, AA0
-	VPERM2I128 $0x02, CC2, DD2, BB0
-	VPERM2I128 $0x13, AA2, BB2, CC0
-	VPERM2I128 $0x13, CC2, DD2, DD0
-	VPXOR      (8*32)(inp), AA0, AA0; VPXOR (9*32)(inp), BB0, BB0; VPXOR (10*32)(inp), CC0, CC0; VPXOR (11*32)(inp), DD0, DD0
-	VMOVDQU    AA0, (8*32)(oup); VMOVDQU BB0, (9*32)(oup); VMOVDQU CC0, (10*32)(oup); VMOVDQU DD0, (11*32)(oup)
-
-	MOVQ       $384, itr1
-	LEAQ       384(inp), inp
-	SUBQ       $384, inl
-	VPERM2I128 $0x02, AA3, BB3, AA0
-	VPERM2I128 $0x02, tmpStoreAVX2, DD3, BB0
-	VPERM2I128 $0x13, AA3, BB3, CC0
-	VPERM2I128 $0x13, tmpStoreAVX2, DD3, DD0
-
-	JMP sealAVX2SealHash
-
-// func cpuid(eaxArg, ecxArg uint32) (eax, ebx, ecx, edx uint32)
-TEXT ·cpuid(SB), NOSPLIT, $0-24
-	MOVL eaxArg+0(FP), AX
-	MOVL ecxArg+4(FP), CX
-	CPUID
-	MOVL AX, eax+8(FP)
-	MOVL BX, ebx+12(FP)
-	MOVL CX, ecx+16(FP)
-	MOVL DX, edx+20(FP)
-	RET
-
-// func xgetbv() (eax, edx uint32)
-TEXT ·xgetbv(SB),NOSPLIT,$0-8
-	MOVL $0, CX
-	XGETBV
-	MOVL AX, eax+0(FP)
-	MOVL DX, edx+4(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go
deleted file mode 100644
index f7e4bfb1cf..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_generic.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package chacha20poly1305
-
-import (
-	"encoding/binary"
-
-	"golang.org/x/crypto/chacha20poly1305/internal/chacha20"
-	"golang.org/x/crypto/poly1305"
-)
-
-func roundTo16(n int) int {
-	return 16 * ((n + 15) / 16)
-}
-
-func (c *chacha20poly1305) sealGeneric(dst, nonce, plaintext, additionalData []byte) []byte {
-	var counter [16]byte
-	copy(counter[4:], nonce)
-
-	var polyKey [32]byte
-	chacha20.XORKeyStream(polyKey[:], polyKey[:], &counter, &c.key)
-
-	ret, out := sliceForAppend(dst, len(plaintext)+poly1305.TagSize)
-	counter[0] = 1
-	chacha20.XORKeyStream(out, plaintext, &counter, &c.key)
-
-	polyInput := make([]byte, roundTo16(len(additionalData))+roundTo16(len(plaintext))+8+8)
-	copy(polyInput, additionalData)
-	copy(polyInput[roundTo16(len(additionalData)):], out[:len(plaintext)])
-	binary.LittleEndian.PutUint64(polyInput[len(polyInput)-16:], uint64(len(additionalData)))
-	binary.LittleEndian.PutUint64(polyInput[len(polyInput)-8:], uint64(len(plaintext)))
-
-	var tag [poly1305.TagSize]byte
-	poly1305.Sum(&tag, polyInput, &polyKey)
-	copy(out[len(plaintext):], tag[:])
-
-	return ret
-}
-
-func (c *chacha20poly1305) openGeneric(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
-	var tag [poly1305.TagSize]byte
-	copy(tag[:], ciphertext[len(ciphertext)-16:])
-	ciphertext = ciphertext[:len(ciphertext)-16]
-
-	var counter [16]byte
-	copy(counter[4:], nonce)
-
-	var polyKey [32]byte
-	chacha20.XORKeyStream(polyKey[:], polyKey[:], &counter, &c.key)
-
-	polyInput := make([]byte, roundTo16(len(additionalData))+roundTo16(len(ciphertext))+8+8)
-	copy(polyInput, additionalData)
-	copy(polyInput[roundTo16(len(additionalData)):], ciphertext)
-	binary.LittleEndian.PutUint64(polyInput[len(polyInput)-16:], uint64(len(additionalData)))
-	binary.LittleEndian.PutUint64(polyInput[len(polyInput)-8:], uint64(len(ciphertext)))
-
-	ret, out := sliceForAppend(dst, len(ciphertext))
-	if !poly1305.Verify(&tag, polyInput, &polyKey) {
-		for i := range out {
-			out[i] = 0
-		}
-		return nil, errOpen
-	}
-
-	counter[0] = 1
-	chacha20.XORKeyStream(out, ciphertext, &counter, &c.key)
-	return ret, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go
deleted file mode 100644
index 4c2eb703c3..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_noasm.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64 !go1.7 gccgo appengine
-
-package chacha20poly1305
-
-func (c *chacha20poly1305) seal(dst, nonce, plaintext, additionalData []byte) []byte {
-	return c.sealGeneric(dst, nonce, plaintext, additionalData)
-}
-
-func (c *chacha20poly1305) open(dst, nonce, ciphertext, additionalData []byte) ([]byte, error) {
-	return c.openGeneric(dst, nonce, ciphertext, additionalData)
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_test.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_test.go
deleted file mode 100644
index 78f981a74f..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_test.go
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package chacha20poly1305
-
-import (
-	"bytes"
-	cr "crypto/rand"
-	"encoding/hex"
-	mr "math/rand"
-	"testing"
-)
-
-func TestVectors(t *testing.T) {
-	for i, test := range chacha20Poly1305Tests {
-		key, _ := hex.DecodeString(test.key)
-		nonce, _ := hex.DecodeString(test.nonce)
-		ad, _ := hex.DecodeString(test.aad)
-		plaintext, _ := hex.DecodeString(test.plaintext)
-
-		aead, err := New(key)
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		ct := aead.Seal(nil, nonce, plaintext, ad)
-		if ctHex := hex.EncodeToString(ct); ctHex != test.out {
-			t.Errorf("#%d: got %s, want %s", i, ctHex, test.out)
-			continue
-		}
-
-		plaintext2, err := aead.Open(nil, nonce, ct, ad)
-		if err != nil {
-			t.Errorf("#%d: Open failed", i)
-			continue
-		}
-
-		if !bytes.Equal(plaintext, plaintext2) {
-			t.Errorf("#%d: plaintext's don't match: got %x vs %x", i, plaintext2, plaintext)
-			continue
-		}
-
-		if len(ad) > 0 {
-			alterAdIdx := mr.Intn(len(ad))
-			ad[alterAdIdx] ^= 0x80
-			if _, err := aead.Open(nil, nonce, ct, ad); err == nil {
-				t.Errorf("#%d: Open was successful after altering additional data", i)
-			}
-			ad[alterAdIdx] ^= 0x80
-		}
-
-		alterNonceIdx := mr.Intn(aead.NonceSize())
-		nonce[alterNonceIdx] ^= 0x80
-		if _, err := aead.Open(nil, nonce, ct, ad); err == nil {
-			t.Errorf("#%d: Open was successful after altering nonce", i)
-		}
-		nonce[alterNonceIdx] ^= 0x80
-
-		alterCtIdx := mr.Intn(len(ct))
-		ct[alterCtIdx] ^= 0x80
-		if _, err := aead.Open(nil, nonce, ct, ad); err == nil {
-			t.Errorf("#%d: Open was successful after altering ciphertext", i)
-		}
-		ct[alterCtIdx] ^= 0x80
-	}
-}
-
-func TestRandom(t *testing.T) {
-	// Some random tests to verify Open(Seal) == Plaintext
-	for i := 0; i < 256; i++ {
-		var nonce [12]byte
-		var key [32]byte
-
-		al := mr.Intn(128)
-		pl := mr.Intn(16384)
-		ad := make([]byte, al)
-		plaintext := make([]byte, pl)
-		cr.Read(key[:])
-		cr.Read(nonce[:])
-		cr.Read(ad)
-		cr.Read(plaintext)
-
-		aead, err := New(key[:])
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		ct := aead.Seal(nil, nonce[:], plaintext, ad)
-
-		plaintext2, err := aead.Open(nil, nonce[:], ct, ad)
-		if err != nil {
-			t.Errorf("Random #%d: Open failed", i)
-			continue
-		}
-
-		if !bytes.Equal(plaintext, plaintext2) {
-			t.Errorf("Random #%d: plaintext's don't match: got %x vs %x", i, plaintext2, plaintext)
-			continue
-		}
-
-		if len(ad) > 0 {
-			alterAdIdx := mr.Intn(len(ad))
-			ad[alterAdIdx] ^= 0x80
-			if _, err := aead.Open(nil, nonce[:], ct, ad); err == nil {
-				t.Errorf("Random #%d: Open was successful after altering additional data", i)
-			}
-			ad[alterAdIdx] ^= 0x80
-		}
-
-		alterNonceIdx := mr.Intn(aead.NonceSize())
-		nonce[alterNonceIdx] ^= 0x80
-		if _, err := aead.Open(nil, nonce[:], ct, ad); err == nil {
-			t.Errorf("Random #%d: Open was successful after altering nonce", i)
-		}
-		nonce[alterNonceIdx] ^= 0x80
-
-		alterCtIdx := mr.Intn(len(ct))
-		ct[alterCtIdx] ^= 0x80
-		if _, err := aead.Open(nil, nonce[:], ct, ad); err == nil {
-			t.Errorf("Random #%d: Open was successful after altering ciphertext", i)
-		}
-		ct[alterCtIdx] ^= 0x80
-	}
-}
-
-func benchamarkChaCha20Poly1305Seal(b *testing.B, buf []byte) {
-	b.SetBytes(int64(len(buf)))
-
-	var key [32]byte
-	var nonce [12]byte
-	var ad [13]byte
-	var out []byte
-
-	aead, _ := New(key[:])
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		out = aead.Seal(out[:0], nonce[:], buf[:], ad[:])
-	}
-}
-
-func benchamarkChaCha20Poly1305Open(b *testing.B, buf []byte) {
-	b.SetBytes(int64(len(buf)))
-
-	var key [32]byte
-	var nonce [12]byte
-	var ad [13]byte
-	var ct []byte
-	var out []byte
-
-	aead, _ := New(key[:])
-	ct = aead.Seal(ct[:0], nonce[:], buf[:], ad[:])
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		out, _ = aead.Open(out[:0], nonce[:], ct[:], ad[:])
-	}
-}
-
-func BenchmarkChacha20Poly1305Open_64(b *testing.B) {
-	benchamarkChaCha20Poly1305Open(b, make([]byte, 64))
-}
-
-func BenchmarkChacha20Poly1305Seal_64(b *testing.B) {
-	benchamarkChaCha20Poly1305Seal(b, make([]byte, 64))
-}
-
-func BenchmarkChacha20Poly1305Open_1350(b *testing.B) {
-	benchamarkChaCha20Poly1305Open(b, make([]byte, 1350))
-}
-
-func BenchmarkChacha20Poly1305Seal_1350(b *testing.B) {
-	benchamarkChaCha20Poly1305Seal(b, make([]byte, 1350))
-}
-
-func BenchmarkChacha20Poly1305Open_8K(b *testing.B) {
-	benchamarkChaCha20Poly1305Open(b, make([]byte, 8*1024))
-}
-
-func BenchmarkChacha20Poly1305Seal_8K(b *testing.B) {
-	benchamarkChaCha20Poly1305Seal(b, make([]byte, 8*1024))
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go
deleted file mode 100644
index 49f0da6b73..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/chacha20poly1305_vectors_test.go
+++ /dev/null
@@ -1,332 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package chacha20poly1305
-
-var chacha20Poly1305Tests = []struct {
-	plaintext, aad, key, nonce, out string
-}{
-	{
-		"4c616469657320616e642047656e746c656d656e206f662074686520636c617373206f66202739393a204966204920636f756c64206f6666657220796f75206f6e6c79206f6e652074697020666f7220746865206675747572652c2073756e73637265656e20776f756c642062652069742e",
-		"50515253c0c1c2c3c4c5c6c7",
-		"808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9f",
-		"070000004041424344454647",
-		"d31a8d34648e60db7b86afbc53ef7ec2a4aded51296e08fea9e2b5a736ee62d63dbea45e8ca9671282fafb69da92728b1a71de0a9e060b2905d6a5b67ecd3b3692ddbd7f2d778b8c9803aee328091b58fab324e4fad675945585808b4831d7bc3ff4def08e4b7a9de576d26586cec64b61161ae10b594f09e26a7e902ecbd0600691",
-	},
-	{
-		"1400000cebccee3bf561b292340fec60",
-		"00000000000000001603030010",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"2b487a2941bc07f3cc76d1a531662588ee7c2598e59778c24d5b27559a80d163",
-	},
-	{
-		"0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000",
-		"00000000000000000000000000",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"3f487a25aa70e9c8391763370569c9e83b7650dd1921c8b78869f241f25d2096c910b180930c5b8747fd90959fe8ca2dcadb4fa50fa1439f916b2301e1cc0810d6725775d3ab86721700f96e22709b0a7a8bef32627dd929b2dd3ba15772b669062bb558bc92e6c241a1d60d9f0035e80c335f854815fe1138ab8af653eab3e122135feeec7dfaba1cc24af82a2b7acccdd824899a7e03cc29c25be8a4f56a66673845b93bae1556f09dafc89a0d22af207718e2a6bb022e9d917597295992ea3b750cc0e7a7c3d33b23c5a8aeab45f5bb542f6c9e6c1747ae5a344aff483ba38577ad534b33b3abc7d284776ea33ed488c2a2475648a4fcda561745ea7787ed60f2368deb27c75adce6ff9b6cc6de1f5e72a741e2d59f64751b3ae482d714e0c90e83c671ff98ed611823afb39e6e5019a6ba548a2a72e829c7b7b4a101ac9deb90a25d3e0c50d22e1fc26c7c02296fa13c6d9c14767f68aaf46450a8d0fd5feb60d9d73c6e68623425b4984a79d619dd6bf896459aa77a681ec9c1a97f645e121f47779b051f8948a817f84d1f55da170d5bbbaf2f64e18b97ed3fd822db2819f523314f1e5ac72e8f69bbe6c87c22daddb0e1ac6790f8534071de2f258064b99789bfb165b065b8fe96f9127cd7dca9f7cb0368420f1e802faa3ca23792f2a5b93773dd405e71c320b211b54f7a26626b03c060e1ab87f32ac588abfa056ce090bd7c69913a700c80f325bfe824fa",
-	},
-	{
-		"0967de57eefe1aaa999b9b746d88a1a248000d8734e0e938c6aa87",
-		"e4f0a3a4f90a8250f8806aa319053e8d73c62f150e2f239563037e9cc92823ad18c65111d0d462c954cc6c6ed2aafb45702a5a7e597d13bd8091594ab97cf7d1",
-		"f2db28620582e05f00f31c808475ca3df1c20e340bf14828352499466d79295f",
-		"4349e2131d44dc711148dfe3",
-		"bd06cc144fdc0d8b735fa4452eabbf78fd4ad2966ea41a84f68da40ca2da439777bc2ba6c4ec2de0d003eb",
-	},
-	{
-		"c4c920fb52a56fe66eaa8aa3fa187c543e3db8e5c8094c4313dc4ed35dfc5821c5791d171e8cfe8d37883031a0ad",
-		"85deea3dc4",
-		"05ff881d1e151bab4ca3db7d44880222733fe62686f71ce1e4610f2ea19599a7",
-		"b34710f65aed442e4a40866b",
-		"b154452fb7e85d175dd0b0db08591565c5587a725cf22386922f5d27a01015aba778975510b38754b2182e24352f019b7ad493e1ed255906715644aec6e0",
-	},
-	{
-		"c4b337df5e83823900c6c202e93541cf5bc8c677a9aad8b8d87a4d7221e294e595cbc4f34e462d4e0def50f62491c57f598cf60236cfba0f4908816aea154f80e013732e59a07c668fcc5cb35d2232b7ae29b9e4f874f3417c74ab6689fae6690d5a9766fa13cd8adf293d3d4b70f4f999adde9121d1d29d467d04cf77ea398444d0ea3fe4b7c9c3e106002c76f4260fa204a0c3d5",
-		"72611bef65eb664f24ea94f4d5d3d88c9c9c6da29c9a1991c02833c4c9f6993b57b5",
-		"dd0f2d4bb1c9e5ca5aa5f38d69bc8402f7dbb7229857b4a41b3044d481b7655e",
-		"2bbca0910cc47ca0b8517391",
-		"83aa28d6d98901e2981d21d3758ae4db8cce07fe08d82ca6f036a68daa88a7dda56eeb38040c942bdda0fd2d369eec44bd070e2c9314992f68dc16989a6ac0c3912c378cf3254f4bae74a66b075e828df6f855c0d8a827ffed3c03582c12a9112eeb7be43dfe8bd78beb2d1e56678b99a0372531727cb7f2b98d2f917ec10de93fe86267100c20356e80528c5066688c8b7acba76e591449952343f663993d5b642e59eb0f",
-	},
-	{
-		"a9775b8e42b63335439cf1c79fe8a3560b3baebfdfc9ef239d70da02cea0947817f00659a63a8ee9d67fb1756854cc738f7a326e432191e1916be35f0b78d72268de7c0e180af7ee8aa864f2fc30658baa97f9edb88ace49f5b2a8002a8023925e9fa076a997643340c8253cf88ac8a221c190d94c5e224110cb423a4b65cca9046c1fad0483e1444c0680449148e7b20a778c56d5ae97e679d920c43eed6d42598cf05d10d1a15cd722a0686a871b74fea7cad45562bacf3bda937ac701bc218dac7e9d7d20f955429abdac21d821207febf4d54daea4898837035038bf71c66cef63e90f5d3e51f7fcfe18d41f38540a2c2958dacde16304e4b33da324030f1366f923c337",
-		"74ba3372d308910b5c9c3885f41252d57556",
-		"9cf77bd06a4ed8fb59349791b98ba40b6019611942f5768e8be2ee88477149e3",
-		"b928935c4c966c60fd6583c0",
-		"ec7fd64fd75b254961a2b7fc942470d8620f439258b871d0d00f58028b5e0bee5e139e8108ac439391465d6658f559b1df57aa21cf826ede1a28bc11af885e13eebfc009870928fae8abfdd943a60c54fca93f0502dc23d29c2fd5340f9bc0e6ef2a18b66ef627af95f796d5bbca50de22c8ec802da9397089b25c6ba5262468e3977b45dc112e51896c70731b0a52d7efec7c93b41995823436bf4b0c477ae79684407c9831b487928b2b8303caca752b3edf1f0598e15831155462706f94ef3fa3a9e5f937f37085afa9b4bbf939d275796a61b78f70597acfd25cd87f967021cd99328fc371b5eb5739869520657b30e4a5b0db7c8715cbe275dee78e719b357d3a9731f9eaba95986479bb2004a77822fc115a3d",
-	},
-	{
-		"b3d3128bce6bbf66fd78f1a18352bae56bfcdae18b65c379ee0aeb37ee54fba1270d2df578ec5b75654d16e89fd1cd0acda7ec580dafd2fbbabd32a8112d49383a762db2638928c8d63eb0750f7e7fdd256b35321b072dd5c45f7dd58cc60dc63d3b79a0c4a1689adf180fef968eccbcfa01ee15091ceacd7b67a3082db0ce6aeb470aafe87249c88b58b721e783dde184ccf68de8e05b6347fe6b74ae3adf9a81e9496a5c9332e7ebe908d26ce6b3f0b2a97e9a89d9fdd0d7694585a3241f240d698e69fcc050e7a959ba153f6d06f117848ba05d887134f1b6b994dad9b9e74247513e08a125b1fadfc7394dcd2a6451b504ae3e75e22f2b9bc405747dedb6c43ef4ccdf1a7edaf9451346123eaa63f3af113124f361508e255503a242b96680ae3360c8b13ac1f64d08088bb26b7f617cb0866f11d6fd362b00d86eba3fee68724e302388f119d6f92161ac8ce00d08919377a26974d99575b1032ff0f1976240c785c8b89e9eb2bf005e4be06b5371ffca14683fedfdb49e00e38ff27af1324177faf91599abd5990920797574eb743effdc7decda318ada1419cc8e0bfecf82f9c99792746c2b",
-		"7e8da4f3018f673f8e43bd7a1dee05f8031ec49129c361abbc2a434e9eaf791c3c1d0f3dad767d3bba3ab6d728bbcf2bd994bd03571eae1348f161e6a1da03ddf7121ba4",
-		"7ee32dd501dce849cd492f6e23324c1a4567bfceff9f11d1352bcb8615f1b093",
-		"8998e043d2961afa51ea262a",
-		"ba85e72af18cb5ba85a4a0d6c28b4ac1e5509a3a2fdb0e3255cbc559df5e6a661fc560c756a0264dd99b72c61c51a4b7ad56ca4c8ccb7e8edfc48ff3cceac5d1e8ac5fc87096adc4d0e9a27492857b17604c3a694cfe0e70b22df106c8f3c61f840bcd634964cdb571840e125e381e7dd3a0d97972e965f16f775fa4ce555124318290bf508beb7bd77e633042deb0e863631478fc3dc9122862b3c31264471bcce54e0b74040c8bafd481cf798f332e8940f1134d3027d6f28e771d15e154fc89c6c25fe18a5d312807cc2e623bb1bbb4f0b6ec71d009407eb54bb0759f03682f65d0da8812f84d8e97483f6a8d76a8417efcd9526444abba24288647609791578887ef49780b0b89f51b072cae81c5b5014463da3633dda105b82add0f9c2f065dca46eedd2928be2570493c79a996fa78ea6aec0996497fe2dc444432ade4eaa662ee2255f0f4b92d593288a8e3ffe7a15a10e9d33b0203af23f4c9fd2cfcb6160db63b52810869ff1e65423dbe2c4415884b9f8dec3c968e14cd74f323c89053a96111bc9ce59ec483832c49c53a648e5f0f797f53642ac60170c94b473f1f2e7d8a38e46460b81219b52081263027f74cbf63a75af3a7",
-	},
-	{
-		"68d5ba501e87994ef6bc8042d7c5a99693a835a4796ad044f0e536a0790a7ee1e03832fec0cb4cb688cdf85f92a1f526492acac2949a0684803c24f947a3da27db0c259bd87251603f49bfd1eab4f733dec2f5725cfcf6dc381ad57fbdb0a699bccc34943e86f47dcfb34eba6746ed4508e3b764dfad4117c8169785c63d1e8309531747d90cc4a8bf13622759506c613324c512d10629991dc01fe3fe3d6607907e4f698a1312492674707fc4dde0f701a609d2ac336cc9f38badf1c813f9599148c21b5bd4658249d5010db2e205b3880e863441f2fe357dab2645be1f9e5067616bc335d0457ea6468c5828910cb09f92e5e184e316018e3c464c5ce59cc34608867bd8cbfa7e1286d73a17e3ebb675d097f9b3adfa41ea408d46252a096b3290e70a5be1896d6760a87e439334b863ccb11679ab5763ebe4a9110eb37c4043634b9e44d40cab34b42977475e2faa2ae0c0a38b170776fbb0870a63044aa6679545ac6951579d0581144cdf43f60923b6acaecdb325c864acd2c7b01d6e18b2b3c41c041bb9099cce557b114b84350131e3cee4089648b5691065867e7d38314154355d0e3ef9dc9375eddef922df2a06ad0f0e4357c3ac672932e5a66b16e8bf4b45cd893ea91cb397faadb9d9d7bf86e6ceca3e9176a5baa98b6114a149d3ed8ea176cc4a9380e18d2d9b67045aedeb28b729ba2ece74d759d5ebfb1ebee8ac5f5e79aaf1f98b7f2626e62a81d315a98b3e",
-		"63b90dd89066ad7b61cc39497899a8f14399eace1810f5fe3b76d2501f5d8f83169c5ba602082164d45aad4df3553e36ef29050739fa067470d8c58f3554124bf06df1f27612564a6c04976059d69648ff9b50389556ad052e729563c6a7",
-		"7d5c4314a542aff57a454b274a7999dfdc5f878a159c29be27dabdfcf7c06975",
-		"aeb6159fa88bb1ffd51d036d",
-		"7597f7f44191e815a409754db7fea688e0105c987fa065e621823ea6dea617aed613092ad566c487cfa1a93f556615d2a575fb30ac34b11e19cd908d74545906f929dc9e59f6f1e1e6eaaabe182748ef87057ef7820ffcf254c40237d3ea9ff004472db783ed54b5a294a46cf90519bf89367b04fc01ce544c5bcdd3197eb1237923ce2c0c99921ca959c53b54176d292e97f6d9696ded6054711721aebda543e3e077c90e6f216cdc275b86d45603521c5aab24f08fd06833b0743c388382f941e19e0283ac7c4ef22383e1b9b08572882769c1382bab9ad127e7f3e09b5330b82d3e0c7d6f0df46edc93265999eef8e7afa0cb1db77df7accf5bff8631a320d146a5c751a637a80f627b0c9a41b44f09212f38c154226de02f4906ef34139bbeacc3f06739c8540e37334392d38ba1cbf4bc7debe77c09b35d2200216db15ed4389f43bfd8ae9bf76fd8243c3d869546e16b8e44a6cd1edbd2c58ef890b5a84cda889131e5cd9402ca4d8271052c6b4fe3f2dff54fb77bcb575c315b9109f90b14bc8e109919808a581c1809e2a188d29fd34ce639088a6683f641925f5b4b3529baa34e080bb47fb7ad9b43d0d67c9e6ae7cacb50527fa74e56d0c8b20149f5d332d686d48ebbe634c2b5d35fc84c69a5bcc93b93dedcf9fdf19a1fb9b75f6df9692d16f6c3490377a06294499e4b8ebeaa0cfd840bfa05fde21c0b5e94d13063b3f5da7b537caefe89069cfa9de9eb8f06e4d30125de64716f821bcc8279c0c7ea2e",
-	},
-	{
-		"89c1ee38b6697d0190c87a2aa756892ee09fca095df1e31aeedbda5750f604d9b8f2116e5b8f70ec57ea16fe419f2d213ef72b9be90eb5d7e98f2e398632123e2524ac80b31c6c0a07820848223569602d94fc16a3b1ed8c411bc6c74ed80573fcb1f3afce60b9d5e2c21d04f78665241b613abe12274a5343101a91e91f04e5d1f7959f574e743a10913e0817a32c320467f0178e3b6ad14b856234a4661a755eaf14b5fd88ef0e192e1631d14263d6a954ed388f5709dadc6c0f81d229f630d80be6d593d5e3ad03f9ded53c41abe595981d24ef27ffcc930e4d653743960f4e7ce4e251c88f55c16d2afdaed5e3446d00685c276728ba757520acb9b6bb0732a0e9836878d829e5022794d70ad8440a40a132a8c9ec1d3f0ccaf8c285fff425e9788d6150b74753dedb2ae8b36ff2f310249bd911b9181d8310e00810d42ef94cbb5a9d72a1f0507c1a382f892b23994fbe7360778b7efa9c5e03ac3231a57fecff1c5fa10caf1d26e84db0137049622ebcc3a64841a0e49fa390d1d43550c1346c20d578cff39fb7404fcab0982dde55f0849d312581d0c811a19d46f25e7a5e7e50d74d43760583c5cf335dfc11b2ec964f1dbbd0ed83e18f2027817ea2dffcf2b64a352c4fb8f11eeb4f1bfc01079251254d2112d103a1f12a2270cc026cbeb8b6f3e505abd62496253f93274625786b73997e449c1f35c742a593441252fcc845e1cef1b8f287dd311a0477407ce3b31661f7b2802c79c2d20d06e45f03aca4e47a959c6c1d7a9d377e1577fbf82a115921c3d94e3d9c204aa204a9a5b04d8a2be3269700a035371f4aaf1a42d92b9bfbee74492b106975b36d1e581d6ce2484f09e04fa91586c85f35e2a10f0d3c0afcb05327c1bc9d7429bbcc4627af8f76b86fc561844c2ae3810c84901ac09a1670ed3d31a9daa5d296",
-		"7219bd21a834d917f93a9b45647ec77102578bc2f2a132dfde6489b9095b4f7b740c9c1c4075333ab0ce7f14",
-		"a7f849b054982cc8a4c8e5e53e181feee79e0233e58882839892134ad582da7c",
-		"4c46854e9e101090b1436f90",
-		"ab2e189baf60886bed88eb751bf3560a8bd3cdb6ee621d8c18b5fb3aa418f350048ecf359a7d542daf7090ec8688c3b0fe85914aa49d83be4ae3396f7bdc48051afae6a97fca7b42c0bf612a42d3c79ef6aadceb57f5cfe8d67f89d49add0ea1ffd423da058297239e72a85fa6cd1d82e243a503b1b0e12d7510a9ee98d7921dae2754d7581e52acb8ab9e7f9df3c73410789115cef6ce7c937a5441ad4edf2b7a8c0c6d152d5a5909c4ce839d59594a6163364038c4c71a1507389717f61e2bda1ea66a83ef477762e7834ebcfaa8f2ee61ced1605ba1380108236e1763bf40af5259da07dd3e3d0fb2801868c2e7c839e318678687cbe33384e2ef5750a0a0e2d2e19e869a4277e32a315ed4de79357f6a12a8a25d5b18291316d9bf40dad2d05d1b523ade76650669c700a1c2965f4e51337aa5d45ec7b4981072779401d6d30ed69034053334bccb18425ac68460becf2aeccc75aacd3d6709f07ee10366ed848c8a54904af4ea71fc2117de133f01e1cc031f2a4d0779b997b82682433ee615202d5dfffba6c916f11a00551d56ffde8c36b303263e14adaf45b6eab0bedf344e5214ce52f071d2f40154d788c6870020791a03d2fd4ec5879d9026241954ed45cfddef4937ea3d0d45647f252be31411237983a1be340fc65ebab9a5620abb0e8d475af4e89e842e895eda0cbd283bb5d0bf20236c62d956de733d60ebceb42fc0c9adbf9b69f8d66551b0aca0e260625ad41cad75d752a234af7caf7902c2c5b62f04b6a8e019a6179d44feeb2ad5859ef1c45371e66f1af1fe0de63997266c290e27f0dd62185c53f81e0a50c296a51ace7c90d9cf0dda8b2d7e72a347f64c44262e2a544d1acc7bb05734dc1783bbc1903279092fe7fe434610aa95fc2ce5fc5ee45858f5e8337d8fcb0a468464becb1cef6b7e5ea48ba383ad8a406df9c581f1cac057d8711fcb",
-	},
-	{
-		"2dcfbb59975f217c445f95634d7c0250afe7d8316a70c47dba99ff94167ab74349729ce1d2bd5d161df27a6a6e7cba1e63924fcd03134abdad4952c3c409060d7ca2ee4e5f4c647c3edee7ad5aa1cbbd341a8a372ed4f4db1e469ee250a4efcc46de1aa52a7e22685d0915b7aae075defbff1529d40a04f250a2d4a046c36c8ca18631cb055334625c4919072a8ee5258efb4e6205525455f428f63aeb62c68de9f758ee4b8c50a7d669ae00f89425868f73e894c53ce9b964dff34f42b9dc2bb03519fbc169a397d25197cae5bc50742f3808f474f2add8d1a0281359043e0a395705fbc0a89293fa2a5ddfe6ae5416e65c0a5b4eb83320585b33b26072bc99c9c1948a6a271d64517a433728974d0ff4586a42109d6268f9961a5908d6f2d198875b02ae7866fff3a9361b41842a35dc9477ec32da542b706f8478457649ddfda5dfab1d45aa10efe12c3065566541ebdc2d1db6814826f0cc9e3642e813408df3ebaa3896bb2777e757dc3dbc1d28994a454fcb8d76bc5914f29cfc05dc89f8c734315def58d4d6b0b0136ccd3c05178155e30fcb9f68df9104dc96e0658fa899c0058818da5ec88a723558ae3a6f2f8f523e5af1a73a82ab16198c7ba8341568399d8013fc499e6e7ef61cb8654b48b88aa2a931dc2cdcf245686eed9c8355d620d5e91c1e878a9c7da655e3f29d9b7c3f44ad1c70890eb5f27ca28efff76420cd4e3cebd5c788536ddd365f7ad1dbb91588d58612e43b0460de9260d5f780a245bc8e1a83166df1f3a3506d742c268ab4fc10c6e04bca40295da0ff5420a199dd2fb36045215138c4a2a539ceccc382c8d349a81e13e848708947c4a9e85d861811e75d323896f6da3b2fa807f22bcfc57477e487602cf8e973bc925b1a19732b00d15d38675313a283bbaa75e6793b5af11fe2514bda3abe96cc19b0e58ddbe55e381ec58c31670fec1184d38bbf2d7cde0fcd29e907e780d30130b98e0c9eec44bcb1d0ed18dfda2a64adb523da3102eafe2bd3051353d8148491a290308ed4ec3fa5da5784b481e861360c3b670e256539f96a4c4c4360d0d40260049035f1cfdacb275e7fa847e0df531b466141ac9a3a16e7865947572e4ab732daec23aac6eed1256d796c4d58bf699f20aa4bbae461a16abbe9c1e9",
-		"33791b0d653fb72c2d88519b02bde85a7c51f99cfb4456dfa6f84a61e10b4a14846521",
-		"a0a7b73ca2fc9282a28acc036bd74d7f5cb2a146577a5c29dbc3963fe7ebfd87",
-		"eaa4d916d261676d632455be",
-		"c9a631de470fd04dcbf8ea9f4d8ac37c3988878b6381707ac2c91d3720edbb31576ba90731f433a5e13582aca2b3c76ae75ca8881a463ecfa789910d3a776a9ad4800521c6baa120b2f1afd10f32ef8da63f5b69f5e5fd88ee84bf66b0666b15d05c4050f5358a050b9d5cf1503719f56cd48ceba78f29efe2ae8092e37f5134df526831532f86ccb9339637e2c9e9b9036f83cc058fda23e826a188456e7fd3f4ee20f4e4a3221883fe3232b49db607b90a8956133ab95051c9ec33a908ea7e81a1bfa7bd06c09f0143d07bb23a3feeac7f0d7720269c93e2df19d03605828c8713b84d183c9a50954c12fe3b047511ad15ef03a63355520cbd224d06a34de67a671368e6a8f9feeefe48fc273764a8c69c00314e5d693f159cb5270544f3c4e1760b0529e3303ab308e9a6d03835a3a42aef2df5f7643696f707a574d1dcc676aeecdd9947ebe8c13bcf15d30b2d10d2cd95445a307c1d22d39450615ad38f9302c6eb9dc05764b0503d6a7eaff9feb94834853b47bc25660207be3e7c0e27cb3127b5402cb016396e5ff07ddc3df29861dd68a17f53bf660b23352b739d6da72381b8d19a9fc95da7efb79330a2b360dce4309860af429e3fd10cab235c4acc1d80d9e20d67019375bd161ab65648400f308815afe63cfc717f7d0eea150e687caac25b6603287d44dca4a7cc2f67c3bdd54450bd3170340253b03ba054ec003070eddf9c14fb9dc595e228e4968524900cb5d85af6d1e658a42d744e0e7eb6995023823a8dc33528c6715b2e1aa607782c8e1ddddad72026d657bf122ece8685f6e92236e809139325e4a3c069facf94c10b7896995bba01eb22c7b3a87ea2114a7649d7ed3e83d223e5e785c66a75119beab0968d3eaf0cbcc2d7ede95d024041e6db39a880ce3e19efea32fb89a40a2aae22f407e5fd615e51e48dbd50a8b4ec27ce95e2ba1928bf699d0418705482ed0ed7acc858dfbd690403c74667a88dd5221bb79940c6c4a268379c10343aaefb635982c14f33ad83d47ced9682961540bd4f75804d3d48ba8aa67fb2e3a1db83fbcbe57fec9e4ffb1b575e947f8bd8263c680357960e3a39382974774b5a013f2f8514b3c63c21dbfd314fd5d927d82ba616d76629ac018879f54ff84b5808e94af4fcfe1cf8845b65208ca5510b5b593ce6c109611652cd",
-	},
-	{
-		"c335b055b752e083554b5aa2cbb6556cfcace658d5c11b6b000256fd89e9b24c1e62a2d5b582580acdb2ad9869020465aeeabe83acd9eeacdc44aa652d5cb24bbe542073d6787ea32b2b3c942d40f9db2bb75ed7914c836d902dd2be89840948d82abbaea23952cd648e6191ce5b6cf912cad0a3165410a781e3650b676e5340980eee3b484008acce6a3e9dc5aa96d775677b8bbb8b323c6e9747d6069a169ea904d9f145e29d134cdbb0118647e8fbae638669efb9a55d50ed33568749f5304ece2193b0bfa6fc9a570d209ef61b4c59a2b5485b5aa6ab47d902cf23f7ff71c5210476e0aa727a01809b9f76b6ebcf58a018b3fbbe5f42976111ba58112b1d322f9312da068cdb86277bfcde66cb3607e3ea02a1494439aa56f302671f1f994eb3ab28b937043f5f7f3b3de50673ecea5dee8ba633c45089b852f0d772892525344ede6b521dcad15807b65e7ba348d891d47fc498cf4d50223d2794c64db9fa9b9766edb430be0c38746ab317b38ba9870a6d1fdabb70fcf89790bfe449b97fe01f6c94502aa0889f0a3bb6bdc65f44d1cd64ab88d4a7806b373f5080f9cf60183cf4686694f0059e2bbc5cf21ba0c3e8046e70d815f1444c3094cc29632c429f20aa06b49b0b52c6c7aeb8e34f7bcb53e93c2cfe2d704a5d0416876742c90762730d160e1869d5e0178dc366098ebaf2cae6f1f7563b555a52dcc194a5c8f718d50d27ee76fcce8e8991f4921fae85ea9476e1eab1364403120698b7ce8fd0a49cf79213f360a17cf1950f104494fad80adcc3bb1207bf250d57dcdce6ac8082a312959672361363cc227310b66ee8c04aab7b5cb33a81c0915e9c770a1cfaae2e8f44a0c65703927977a22fe58aef2f366b8be9a50da9376b46ae7562a82391386831febf359039ac326891bc58c0f2c34bdb6858859fc3cb4e392df65cbe2ec4f02c8425bcbdd1ee2562ab7d229d406d79a9c6fe4889c996c2f68d1fb5bbe3a5e867caa4249b934afd3ec71fdb088c54b15252f9dc1b909e121dbdc7d8a16cc00836652dd1f877ce363eed11467966f7ccb8f1a8d48146e69e04ad76a51937ad4f9cda209451eeca90dbdbd65441ce20fabfc8ce400fb4de136154b87a8b65c92740e9bb91d78521b261f806a2c6279c85ef6ac5fe1ea3117ff7c9f9832fc2aa6fab660082eb22344c1a3befe0628b6551f62a5014cd6194c42b8d475a50f2c9fb58c97e43ebb29005ed7fe54f0a4aa10074f1154152a9067d364dd7863fa082976a00db55b26b5ba0ea40eff48b90",
-		"f5ff810a41d4b34751e9942970d4c9f26b33f24689a4b1e4449b243490afc485af468ff01a42376b2bcb949b9f5e8d0b917f511a",
-		"a74271c184a82cb074c14b131fd91eb05870cb7c73c9e511ec8140bfe2f34089",
-		"2403fe689e239c2ed261b381",
-		"af9be893d5fd23aab42e6a2e59a8e7cb13d4f543db02af87cb0802bc1af7c717cd0093cc8244994cf21189146922b69927ffd5745e57118bea07a6afe7c21d952c13ab636b3c2e461dc9ffb3ae701175360156338be94b1fa7115799831019455cfaf5114010fe45f8fb9c77ec50fe06f2c5a32423edccb3b2210ee1200a78e1a3130c567542377827586ca8cf0c14c19fa1449a2cce9c039bb441b04e9c0a3f9a743b31c828032174fcdb7c894349aa68f5adf97dfe9294d24e6b5fed95eb994397883f58487bf5c57b0aea5268be7cee9efeab370f89805ebe5373ab2e93658fc078955ccf68b554dd5605005751ee8531c35ca5336a5d0ce273370c0dc9307779b86e96d2d1daf2620d67d43e1fb7800ccf250ca3c02eb74047c1d2a2bc7f29fff8320301694b80d0fd975f834337d00d5f0e4215044d52aa4ca21e6a9d7e03f186d7cdd5c48e3765dc926fb0a46bb0f05c50d9f69c9c507527a60366b7dc251aae1d6bb0d9c73735dcfab959f6fd4382fe2a1f6ad07affb0601bb9040f81b55a48f6a6c5f8ac4a2acc2b0c9a6c439198f7926460695fa11e0b0b017e39de5cf0d5d5f84d972b5eee7b5d1e0343b5485cd84b92ad892e5b23f3e803f5b363f2398c11c15be9f13e59922b0d49902dc8483fb142850b4226da2fb84e9b434a34f6bb67f575a9e57fde3354bc3077a876e260311bb2481bb139aa9af55df5074749fe532d7b8a554218a90cc7e7ac69db280bae5d55a174dfc8d325b9909a8da1016d4e162fe5ba70cf8726cdf291f5e47083d9929cd5e32021cbfd982fd0975f6f9baf4322b553cb3174b11c007559879f308419ff9e4e18eee8d3640cec8aea082b90f69cf3c7676c28af0265c24c91cd58a06513198892ce6ce1ab3ee9ac0a2e937b973a9cac06a039a54f8d994c13d42c59187f677352e5feb32a417aebec4d852b2595e7e67450e06dbd183279e3b63022a3813b37257b085bf8454d6890875a2950d20210a8df4f9da746722f62687e92f0e9efc3e5d526d65ccfbcc042fcac7964dbe147932c73924bdcdf62f9eae58d29e8567ffed90048bcf0566b952e986efeae4c477944af18bd243c3eccf8d88c06d07279adad037450cb8547a8aa0a74223f4851747c803cb21a2dd027e7080aed75038cdcecbc4639d87763cdd41829a1b72cedf0d722b180d0d492a5740ea7607b95f3201df352fb1ab28149124d2df5d5ec106867897b537302c3431402348f94d28eebc701ae1b49d10adedea38f1654fbc48885e59e6e6dfd413c6b5a97d8c35dfb07a6cdefe317bf61cf91",
-	},
-	{
-		"4aba5a776ace38b6e2578f0007e770d264e39c49f588ca3547ad2888365e3a811994f8836330394587c8458eb0b6611499fd5d8e8527c3cdd4ec550b4a8f8c632384e786b420cb3be911c999c72aad60270aefad31b27a069ecf11e95e9d4c81213308d554d3103de4d9d6ab04830c2b8dfbd8bead52c44c21d5357f72810193b5096809dc7846c1521c6c569f78812c735aea21acaf6dce84a24df7234e8ad857f3e1346b27f5bd436113e2da950e4deff96e9ba8db692c7db723a105ae795da15b910c8286cac6e7dda8c172b70f61b07dfd58596684d61da8772356f180f74c1103ce97cd947eab3d401df44f7fa4cc7cfc25e280fc002873237e64a375b0b4797f4b4613c9f150090f44588ee8250ae44aec6546ec8dba0f0c1eb281cf66fa4eb141617b32b28441f6ddcfdf02d9c34cc62893b2b64dc2c26b74433adb3e888c7fea07b19c8cf39269c2716b9c35b7625d4a141397d6d5034b193d2657c6b2d6b0ba874c467adeaf3d501ad985d13be21c4ff6b326cbb671e4f4973bba49116a0399b6491394f850e4122969e4644c00b442b3da0d6a4bf25ee22d182b3f822fd83878ebcc713cb183651a67ca66677ea81b58b685a3a8e385d5fbb0147ddfecb558d881c914324c794db443b31bc15c361912bbbcba9e418f99f2a416d190cb29684df27c7f3ff6ccf339800efbdc4514ee00d1a89f12373804db4fd66c1affd467f251e73147b3248033327b0f7790fd7861a51773dd4f78b89e4e24b94df9203f4a077091bb9411eec78dfe3e1dfbb67ea1cdf17e1d6936bbb75b74055495449e9cb52f5749404610cd444fea3f0568e0d35a5ef0c395ab7bf0208044b5c4e2517911a9c351efd31f33220972287253fbccb1eb8f46960a36b68a7a6b4f5cbdc86d668bbf555fde8881e7faa9594da425ff8fb54526bf7cdc4af64899530561c06bed7fc04c5d48cd4542779e901bc48fab79d4d13850ad8247f51b9afa7d5a656ada25b6376d837cb0fa1b4016dfcfc158a39290f43f133b352ed52fab2f951509bacb41284fbdd849d8185fb7e7200f8ab2a07ef2b3b927e18e568dbeeba2c7a66e08cebdc6a6069ebe6656a586652f3905ae2bb867529af6a827b494c97b3a378408f44aaefbe86c613e11e7a44020a9ee4b62569dfc4c462300daec7b1424ff1c1849ca1332367470475c14877cbe76c820cc651c18ab3f18852b93994f93b568dc7f7b0eb5f07ffc4c9384c851fa9071c6f68ddea1ccf627f889c0471c76aff9f52b07ab1b86a7671a2b2f6b25c0ddebb66ac95737bf7e2f493f7665b5265eaa5166556cecfdd3062802724ec24f3978b903d0f0c24e1f0b8d967142bccfed0d354279223f4c28684e9ab611e9ef89a3f25993b5a8b3c0354931780501651236a78b58e7d7814f251b053605f4c0a8e7193b9cc1ee5cf7378e6f3c8fd44ec57bd91e62b09fb1d6bab60cbfabcc6792e6a32ea7918a9ec9180d05a7e1546d5d2d8bbfde2a71b4e427c0a4d28d0b6473ae",
-		"921a401db90935c60edda8624a0590d5c46eff3522e35de2872f6f9394e24126fd8143b68a797c995624fba0298b75eef974",
-		"6a4d35ae03bf277f587da4541dcddf92bbd906dff45d5ff23c0f60ae53b062be",
-		"231b5780fedfb06d724450b3",
-		"ba40968282d98849b19d867f8b564ea5a81d657516099362926bca4cb6e9ae02719d10c8061f53008c727a0eeea5e1e36c9e55c117e9434e213316c96840231a1e356b254a9981d4a6ca3c66cfc61018bcaade1a4486506559e6aa3a86bac980d391d835fd5ded98d10f1394d84bf1bbf2cd3397890d704154802f7864ecc753db782fd3d19213ae65ace4770e1bacf32d61c6730aa5adcab4d7e2e437888c11c29abba4890a17a00f67a53b660becd94092df0598df5ac57326f6860593a519e28bd4a39f6481e1a4748881fd5f0456a3cd9f28d1d1e78dc64030cbd8fdb2c5abdab3f13d6ccccd187e71e989f8c486929efcdbf2a763effa95af62db5cef95e9081b818275c69267022fda4b7fdb8c650b491a785b03d4d0186625962b6326ec3f4e176373da4dc1f83a14815adf82c6bffa7c6967d77528d0249754bb4d17656bc4a89449b16152a4a1aea7eb0054a8892f271138971507d2f3b237ba5b620f444544e4a8c2b1ab4f9168762c27478c9f776c47ee2e9ff05bfa35ed127f0cabe7cc053640bb8aa01f8359b74bf89ef43ca94c48fcd201eae39d1835957eeccd6b3a852f4e1bbfef9a469f42c764481ff8408fe5871afeeae7676b58f4202199aad50a596626dff97c8e60d750cc59da9f595ce12ce9afdce14481cb1e39994de8fe4cce07845110d6703dc59d34734e93e9e57e1c52d61f44143a2d290220a4bad5098d098ee65ea4b6757d8a9bf5485aa3d697a7826d4a285186f5da10eff707566c23c6a15033365bcb498c44487c72d96402d1834753fdbf86770239761f03e0dc8963766441da99c0813e4f1df5a1d018c8799861a396562eb24ce305ca15f4022d83ea3c56b68d9a7ceac4742ec0ce50f4d36273df26005ec2b051fa071b319be2d8a5ed26eb75bc1ea83761b8454db234d15d84d6706cd178981c1f156e6d28f774aee3e9a4fade022e71b52b50aa532b8bc7fe464f22d6eb169c69671875d614e987658820c2f584a4fea3008afdcbb646dba3d69020fbf503f121be3480344db23efdda0d255aa058c3ff66abd3a5fe35db977521608bba7eddae72ae801f4fbb12a1de4133039e046ceb8db87e465e5ede1d79a08c857d59076d7ff858942c31e15cbbdae6fc15c3f9545a0825d6ff8583c0aba8a7d143d27b93f6caefb98c0d83bd8715abcab2a49087f55a9daf9090eacdf45be08ad80b5df5070e1719f68c4cc8f8711083f0f7823a09ec092f22df95fe9e95114fdf82a3f6eed0bfc9c0aa65222609442776154a474dbc9e662cd5dce66846572e52417ee5d7eb59287d07ef60a9537fe1f85c7fa74fe84dea0da235ac7574335e6649b54a6bd33397df4bf4a7976c4ab868aa702766d2bc8d2c82c2d1c2653fc8428b8d1e61852ac185a3a0b416dbcf8eb54c44967ff43c44f2b32c6d4a9dbf2c2f3a587b430aef50f0375cdb4c1b319ac9aca486d9bb321141b065f52f7b6decaf1985531ca7bbc3772a561eb1efb8a6297075920bc432131a5b211bf25e35fa31e12833bc77a9de14c7",
-	},
-	{
-		"6c0056937faf1023032df1e2bfacbbc58bb022eba25ffa020d4eb26f0caf0678af5d0b2f0c1b520f4843f107f0adcc7b5dee66ff4d61025bafb4cabb64d133132e3e423a599549a1d83aa8c8e774444462aa44b00b460bbafad5755ea6a872d4e6b40e3f4957e0229288ea79fc2ebe5fd9020fe4481a9f42ef14a196bd136aa3c779e311d0c333624c1ddc484c9aa7259cb609e4d0a826c0bdc7567adac01da23900b30ac4e66c100348584fe200747eb67e6287268947e3509d5d2b5d7bcd977b80a13f660d4f6956a8b938a82db75eab19e5d2a22cb5f3c9131e278eebbe096b5f49d16c983ac240f3fbe821b247cccb2c9e6e59546122677f49f56a07fed56647a6d3e0e09520d49009f54250c10e7c607cd5b4ddf81b5c4110c6490e9baf56418236211856f5a85feaebafacf92c0c7501c052f9dbae3beb7484f90f334f50b68571cedc67763b5161ebfd5a1709cf18c92112a4cf4d8f43d1895204d8a2ba5e14883a7bff75cc6060cabb77d38a909daca2417befd1bfc05a11c432b47f90c807ca4306400f67a0d92218adaca84a584a8bd4395c93f9b6a4bde9583c79204444634a8473b1244cd33cf980e443d82ecfac672b3f60e2e41ecb3c5a445d9e88c0e90c339a31806e6d79ee52bdc6808c73e8b7b24899966664d3c1a9305f31f0483e24e36fa451dc1d3f2eda05af6678971e2bdfb7c1461c9407c5c466f6b5af34d992a37de3809a22ae75275ddba0f4f9cbd4b18c1acd212192e587889a36bd73c860f0abe08bcd8f00f5ecdb95e1d560b586eccf530df0e5f3776d8dae2a01768bf1226b7ceffa7ce4e75879c82dd97db3c64c06d33cebc6b35854618355d80e46fa79c3e9743fce5b974723c421a077e7ec7dba286881dbc1d53d442a1552700fcb33f83f73c69a0a0ebdcf2f5d461649c4d0712c514ded268a31509f83c1ae4ff4a68e676d29727be641aa4487c08d4b90ff78e24c6508d69759751a1a23690ec9f8763621e8b107295b4bb01bd9fcacd8748e24d996fa70ef6f8b0992f4185bec8e920d7643159f9f604fba394b6611bff435998b2f097a9e948430899c8c752a1e83a061983f00f88ebb32da214399167932a1a83c1b47d09f77593b03cf6521520583ea4483e2d33e14ad60584676d1791779b532c085d238df0d3bae735d0078e0eabd63cc90a2e13d023983780afc8f83b1c14437937c16a1b7c41414c48cf4ae49587ad9fa5b16fc949a749e96032248c4667f58e295f999590dae1d99a2cbe3fa45bcf4a1d3f0356d64d40367f64b2c5cca843e5f7dd7b88a85d52328a00622e6c317879607bc036c9006d38652ffe21c83207c00f8348a7d0aaea5aab4c89077df170de6d41052641726eb6925cd85a9ee01a9e636346340e209ea96d17b0eb0921b96662ce9cb430fb6ac348331dd7133875769bbbba99dc49333950e4145a15ddb0789c4d2ccd38878080ca9e57ddc6cd5452790eec45482f8e990392e319609391fce0beba19463a9a00d8f1de9fbf22f23821de7d69fdfbf3019ed61aff79acfc5a6ba663a1e10da2b9ff7149aea43bd6c61a543008402309df0924de72c1cacd2d6120cf422e61fc1de345cc8771934d8be77d9437a09e06a9b2d51c849fd9a200fa714328d34f36b684f33df6968b827df916a599a4bc3367814fec21198e2213ff653cd2a463892966c72ffd42a26b3bb91",
-		"0d55dcd08b54e58916f622f81761ef6a2e19b167ac47d3",
-		"e42e1d6d44138f3d2bf12c951f454686f18d590fd30057405b5a3dc2b317fa97",
-		"1e46a7486c5a03fd6758d938",
-		"fd3c1fac10cc82e49235fd57f5aea0ee7a7bd6d539b138d4b3fb623aee591615c1a61228ef9673113a3a90a3687a12d4c6367d5f7bc67d422fdc4106455084d79c2c42c5e86368dd164bcbce7925bfffe7d96c13a2f49aac8e9d1ada3554e3fdc21aab00455a0f33b0c1fdea91b3588e7ad301bfccf9940027332fbdf966463491f7a33c093e0a13831ea9d2183294f89f414cf7b5876af04fa68d594430194429df74fa5915394427259e832bc545c13400aef6cf16620d48280798a6e49773c9316d79fa1dc758e54cde2e2cdb856092d83f4e9b698385cb976fd6cc2538abe055273a5b34a784182ea5e7d3ac9019a05de5e5afe4308a7ed2d363cd50ed6a52df1c616e4a82f607ced768445d13ae4884f2ae1f9fd8313924e8a1a8a23905c92eb231f638dfa6f4cb27bbb9844e05afbbe2ca4d1a3b3a5b371bf33c9ab6f82a7387d61cf8bf662097624145a983839b0cb9f4bd07556800b4054fb3d0bac94f44bcc9b4ac49c39f5571fac4e02ff09f08b3ed5add4bf8bba934e9feb773c0590b45c45fa036382f3fe9782ad19107d4630321e414b7b442b64f18fdd5219039e5740f34b3ce8925d1afe8a39e35ce8db086060bab63b9720700499f82db19a62897c6d845389461260303f9cf2bc7235a898b4620c2191ef05604a5c8c783d58009533a86b27c12b0772635d34ac53993ccf174c9087073e5e69b26c0c3d9f768507ac4d4e2af847b65e3a6e1b7a6dafb0aefc190871cdae6c60f0b1d6137c351d4cb211870791cf4cb8af2ea446f6401eb9ec8a5bcebccce898d1dfb13454df6b35b81ed6d7637e6e261e004080c60944f3a08e8e5fc7e2e4939e7c2607c8cf07d1d10883ba3ad43e2611826f245df571857ae0a7a867df9659f2082c19f94ce400132e48c7f8de2b102c7f83ba5cd1e785597a0ba0d73bb81bba0c00300d4bcd6ec25fb73105a46122873bfa729c0979d8d314ab7ea52391aabab513dbfd1cf01c2990c0a3612f4511c2bcf0f5a07e659a881a7f99c3f1fc4a46e66904427fe26a4a80a904c047d090c861a075c0ae4e29bfbc18b9620aaa42237f4c6fa76ee7491ee638ab5f1cf0b440759828e1ec519679efc776eb1468999a00f667e87199ad6891e98b95fb682e02517b024a6bb803ed23c944010cb7bad0733eccc12d6ab6030c6e88d510ce92e2f98fdcfaa1e37e41fbfb4e99589c0e8efbefd40473db42b3a73b57b22a2f8c9bdaab16831f1b117dd83a77dd01ee8d0c2e92203adb670f4fd65e618823ad196220d70e014c1aafd8863797c61c16382c2600062683ed3a180c70891717c52da15191b02f25d1715ebf33a5e6037092421989c942082f4b836423cc3e976c9bcda185de36f06265dfc250a27d2de0bc48c73b3bff704f3b386f962522f572108458bdb283c6ab3fd33b3ac13a406268fd5d97e17db9c0f780b4b2a8f761d15a4d8b3a0cd73357ecf4d26a6492ee069f19325823ef50bcb2f73326719a57b67eeef506fe8915a1b1ba1a637592268257b91e9c7c5d33cdd947967efc1952005d82ccef9a3ad7ef8ffbb6b658983d64c51242ba53f8f8963245b87a25aa9324c527e53f8c11d55f30aab598401589acd13f090541b3b057b162190f27910718b02a6b8ddbb8ca6cf40bf0d2848f4b76341bd5e78f476862bcdbe2d1bac84c0566fb45b21388221ecd8483d99fe603646b1a9f38a49230cf4dbe5d7883d73eece01bf",
-	},
-	{
-		"04892b94c65685f2eba438322b29bf8439938590d3e0eb10a29e279d356cb439f6dfcdbc3552af21f7e753221012a649a52bda780bc589ae63b04b981dffd113df9fcf14f17e35e865880a769bb1bf40dc99b9e85e4296c1f2e1590fe02b22bfcaf2d4bb7009a4d692ae4c2d5f0b6d3ca526240368bac55b9b1e6a7b498d3b137f0fcfef1873c5aa2111d7811d45bdc26be1c5d49b8a2f36a999b1f226ec06a5fbd59514485abe696c96ea89dba74b4688101a239b495944e30b3609f73caff3114407599ec5c30a5bad933655de7dddef97018ae15acec46504cd5d417c5052c057ac5f1c6f69781cfdae71db2b4fcac35054a4aa22681027356d68b2bdba721466d130d53ba8f23857631382b2de450232e9ad5551bd7c872ae439e79eabfb057d2bdab8d4ccf02b3003ade2e1f3e514dc92692e4fe5b579c9ee6067995b6c168647ce5a13be8543c23326a3260bb7029d2030ec05e565ced3c5366d20a283a6e95201fd108640d2b96676df712de20e4e12fa53f85f22cb24583844fabcebe40eece11e7221f12c88670bf994ed08e2000236f86258c386b0fccbaab8b68ec6a26fe41491d540193c4c12d1391ab3391de9317f41f505f1f1d09ca9862a6f289a533d2b297d4465c956360371ea3c8ed36e0d1563120654e3a2fd69cd6c9267bfcf92e84cd64e162c84199d6e552b42c33857264b5d7a2e007797cde32934a3f8c68b459cd95bc85e7466ccc9910e8dca65b315c32e43c3a5da908904c42cfc8ab74126919ceeef1054bbdae6ca67b02f1ac5f24808b5eee24577e609a3e3935a24b9ebc1a8dad1fc96abe26012928f2d5782755f3763427dda28867d0b1ad830d3c3f17b9ec278346e5a9480ed23ad44a523a4dd86e65a610ee0de1afab64ace7a3b4918fdc14c6b1ce0ec0903994da9bcf18643d7e0a4e6c08200bb394a89b385d2cb829417eeb0f7dab9fa7306a330f82973cf0917b5ca99b585d2ff0e8584e050077467f5245ecfdd5942e4fc72dc26e5ab2ffc61f996167e68168cee9a6d3ea1e1a696060465e35da8c75a1aa380004faffcb0a992c627fbdcb4e97721271802cdaf08d214ec2fbcb389d75709d7a6b9d35662661c8961f93d4a705e7188613f3769114c55400809cadf60d3b6068c8a5ceef078785171b59be1140c6a754ba1de5ced349df63d67d59d3a8ca3c716ffb506772d57e9e3f2caf7fe346c4ad64aa6c37e43b9bbaa8f58e51bfbac31fa6137728f8e5b728025697e5ad5c8301f6ff39eb2ad595d3cb24257adee88a84fbf1ade4d7550cd9ab94bf48e1424ae83184c35c5a5920157d45805c2e0ad129fc7f0ec3c41b9d6fa04cb8918ef379b0783d1cc2863cd80382585fa05320ca4f9fd90353e490b384ed6c166c6f802cd7bd39aa43667246e8da96992db7537d472c709b01114e95febaac5b1a3c77e1e9a18c2d180e63f0d8fa89f6a1ed63e909e4741af5c2a0e47d4d3f8779b7696358f58060f3f461cceeebb390c92779d30bfdedf1b08ed62dcc05a545bd0ea915f42976e81dd8a50cc4689d8d8007508bf53e7da5bd43c3894968cf0677681c6b818353af6bf8ac205139add1310e5d363ccadbfa0eaf735808325e7f9a6aeb1bee3ebb4a27576a88811859c216b6f84371c43d8063a0d87bd326eb6d81c6896ff534ba2c9c14a51d2cfedf33a5c787279bb4a7ff65706b389756a6191d2f791254233ee047d40d64c2dca878a42f903fd4382f39a89a723fe11848fe37b2008be53f7c2d037981d6462a4eea49df1a2e074957afd3c9dfb4d218a309cab395afe301ccf",
-		"67b5eccb1790babc2dab5e0d1ff3871c3024177d45a2ae",
-		"259603e1c3af3fd0ce3257eb627b02e0c0a48ea2f175de3d8c36570a445e5369",
-		"e14de73c4b17581a7e0d0649",
-		"33522e67ef932da5fa8abe628b51f3abd5049951dbc982ea95b7769652d4830c588fa45e3fcff094c8602b9008d7b2f9bf6c1c4a8cfb515401c7c44a7ec42ccb967722a710199e121a41160b1ec581507e9bd2e2e506b10c4b5a8d6977435aa08e27504957cd49e756e1574c4ccbbdde937de35128b7ee3455d2e665c596c2e97c253c94e405f85eb5de84874c099b4a97eb8f492d28f2e4bc64b228dd5984e76ca08376d7f1355ba8e0fa60fca96635075417d8b436278e0fb91e3bfc7d61ca8c7407086933c061b2d318f46f352099e1d317d6c44098539d1d2c1b7894db668e7a82ff991864fae236570cc420a4229883f1e2242d05aa07e175bc6abe11cc643cf1786a4456a2de8c066fb1a70fe387f149ffbe8cca7b110e256fd0c09b1d3bd7381cfa82fa700c8db1e79809ccf75ea52d0b349264557046e8703a191ddaace00ccfc513db5e78810eaac0a99d7bb1a5725e722d4e595216a0e12f3a7aab2e623ea9e1dad06169914bcd51b643016fea7dc3f2743b1e65877f1fd5581bee5ef206d86494a587ec8462a170746fcedb2c9f99090674ee687382711b4610ddac599732453dc063518aa36f5b4129098fb9fddc02eb8f8cfc2fdf0d904ef4d6d06014f977b29d0e9aab4044ce9c662a18b1a8db1ceea97854e90704430fe9b1046b221b27ac79054fcc68c3abd6fab7da66e255ff0cbd0506c852e961e619615c944cd9a05c25abb63742f5da7bd9939feb0f2f2208c8ce82f551a9d4d70e935dad018e3e4e6998e39670221601c3e34716ba75eb4e2fdf53c4d471c444330514986de45cf44d77f793c17e36a271fc65e6bf08943aef4c66547dc310c7a430e3fe7a54898de48f69f282f52bbdc4daabdb325cec7ab66fce1aea4e2fd932dc1a316c821f5220ea437447feae2fa478adade7cd515a27d8c132d0299b3ca1bc8516c9d9e7c65c38c238c69f03e104eb42a29cacc8d79b808ea6fb233a5056201e3697f81a2d49ccd8b8efd1ab0fd407c16a210767d1d3ca798ee53a4bbf1ce5090d321b1a64fc2c5f013c23829f5b0d2737936ca71595a1d02711c8a7b0e74654e5d76376ae26977dd49c68e3c0a7b36e047d44be42d732c31f681bd7b1b4b339f004ecd847960377acd005debfab13d0fb88355025877630aff753a7cfddf6851e8bcc8ec37b8f9149830f47e6b601098b2ba19a4c0808e31e8927b2525cb82bfddc9b4bcba2b46bbe768ee278fb89010243d16f9679f5ba4f13cfe76b5beb16c7b28daf99b0873098115c2233ee3402ac0f6c899a2cfcc83b2ccc06676999ad48017c4ace507080a26501993327ebdcbd1e2eaaaa99f4998b716cd9e36eb26b4573a03fd1d18047198fdf675ef4f979864ac85d230a011c69d8b6c45e9efbdc2a03f195c9731b4cefa60208ba845c0978e73d082bf6d6a513b93dc805a4f5973f4158f60a200167ca88704a15ac5ab1f38ed455a426f7c6a96b6bfea2ebc1ae1247cfe5ff29ee81bdbcb53b03b89568bae9a6f311d2b20e31c2d91bd18fd93a37be266d0de8015d52e325f78356dea0b77cc76f28e0f06e4ec705d1328340013a77b0b6196f44b7712fff4ae0ac7f6afab9456a95012b7c6d387285487476d189977e28f6c9d1a3f736320d61302c2d627d5a7ac8cde4988056b55eeba27efe7e640f94c115762ad5849423ae138c76f15b47bd2a2bde2c492489b7980aaf1c4e32a155f858d7be4fcd0f8a18e7b5d97c5a08d7885d6d56222ef49542c7f80498a14a8eed1c092543aac3439966d5b5d0cb9e602f4fd795c09d652b64f9ab67e38f48c88d18e30a9774f37e9c77b7a94cc7310d",
-	},
-	{
-		"4ab8068988d4bbe0bf1e5bc2fe1c668cbe58019c958dd2ec97164aea7f3f41c9f747527f1c0e5fdb2cbb9d2ad704b6955cb731f14403dddb1a28c5996707635e4eb5dd6ac33d46eff8e319cfe7cf6443869534ca9812a5b23a6b4ca172afffc064dc2b28197117115431e03c00447f87d9b45172c6f724006270a1d41fa094847cbfac9630c3a785f488c1f5cc407ca6f4cd18bac43cba26ad5bfaccfb8f50784efc0e7fc0b504b43dc5a90a0525b0faf3c8b4b7046fdeb1cad87ec667ce3eb6cb4c358b01393f3ffee949030ef9fd01c1b2b9c5219777eb6ff5b1d7c3ef8d8e3bc2193dfb597cf942c5fc50befa527fac0b44cda2bbb811b06ae87459750295371cd232754e2bb7132807d1225950ce64949b0650531800bd0074177677acad937ee008cc0bbfdf33c6b0552000238494be8be412a3e5cfa359e619d092c76310a76bdcb22abbe6f16b3b116b5f95001d20e42fc3c9ff6723e580f378475788eec265a1ed2087de8cc2eff72184f73fa5dc6e68a56dcfc85350bccb97135386d5b827c2d9aea065708f5c921454d1b9303f21d5adf19e00415acbd86d1e5e42d78505b033a515a435713649c50702f54623cbf31469f355c3be2e30dd8c72b4127764451d79e952ea1f9bb0269da56dc07060d5d9542a9c1258ccefe53fa3f7b6073cd38026256b45c01b6c5dc0d91e3139f30a8d1da7a076738f5bb23352693a8e3cbbb46226fa22416680013f9e3278913d06aee4a62457357f0a68d173a360af5e1411840e34c574b4c6b352f92ce33632911ad8b6710d357b7607ee19679e777baffb8ae3c0fe9786b2e97fdeccb5105ecfe81441f549bc6b50ab84b749fb33f8f6bddcb6bb733d6d5dbc4b29725b8741439b8239e53fa435ea29ed3324202b1bdd07d1987b0e06d8cb51013dad897ef02401290940ce3f2af72c5d1b4c8836299008c10b16c7e3e119e41ec66d9db6929ee09bdeaeda08a50665c052edf77b7dff3d8815046bf71d5015e3bdb29a4f507aeb2e28c536cdcc9b8d1e89849a0683d78f99dbfa90f94aa5dc08587657a8f042d718080de5d4a973f232f78c387b63c7143fc2a4380c491414a18b6c4a7bae2194b62e798ad7ec7d09e409425f6d0973accb17e4d860f8ec0283584cff076d93bd9b0c4873f9c57cddcebe3c3bc8afe793c6cb6b26c4582847b07446b7e1d9757de6bdf0df826cbc502bf88cf3a773866d3ff293034abc4afa3091b2126a278f50e47f2f66ebebb616e342098ab690f7f5828bf8cc4742c677d378893e9f188e8397bee983a9a0998de2a31798330f8db59a8581e1c847589bc0e2d95ffa68e39226cc15cf6cae5c4f5174e7848375391dfabafec202565ec2383721339f04c5c5d1da953d88f18cda65745ee8e99805e35203a6545a0416923b38c5db3c8aa00d64354bed27d7c78c4b257534bd7a18107ebe64d8c27b6afdb330d8efba79fd1fae480cd51fd3626bf8d79fb651b7c6cf752aa737a5123558420d48fc86451b358d270aacfa6c17f343b7a9956e6f64e4990c1b3f1e5097605edf5ce4247819b19f245e9a90758dd42c36699ba5cd7f3ed99a7df7eb155749f4b42d192c47cacb6b2865fb9ef2cfca283865cd06e40cdf7f89d76a9e2eb393e2e0ac0e2776da929f3f8e3d325d075a966d289c51347bd0bd523a5c81edef63ce9b72f5114c88b08b16edbd73f518096240a5b37421843173be8df4ac7c587a17ca6f2916f7d9a10dc75f81bc778a1eb730d12b51555cc414eab9c066113a7edba9a7f1a18092ae47f12f0368ba211feaf34a3b48a7ff5c91b81cf7c95675a4001c95a19d284fe4197fe8823909a123fcec5e45935da12416be1bdf14918414ad19b54a41052f5b8417ddbd207ee01d6a3e62fd9b0321b1c13d91d6ce15ea7b2ea0c670a5f5cb290ca8e62c26c6499104ab8e9fafb05170ede246bbf7313625d1fc9576f1609ffd08852a2f4b73c04f1f4eeecefe3f3eeb2185a618b6dd3e87d9d3fdcb349cc83c21f26b6c662bbb857aa95378e991640a160a23cce76153c134508c68ec54a5",
-		"0d471079ad3c3432b6de852ec71692d12d9df4f984554d458a9dd1f28a2697976da8111ae4454c9a23d1c8eae75bbc14f8b00e7c065bc290f8938282b91a1a26c22b40a6708c40945d087e45633a595beb67d8f1c29a81",
-		"f3dac58738ce057d3140d68d2b3e651c00ff9dbb2ca0f913be50219dd36f23c6",
-		"bb2d033de71d570ddf824e85",
-		"238c4e6be84bfb151557327095c88f6dc2889bce2d6f0329e0c42a5cd7554ab16c8b5a4db26eab30f519c24766b1085e11d40823053ca77adfe2af387b4dcde12bc38502229510606ff086265f45b1087375dc4a022eb0b641101c74ad566ab6f230133b7aa61861aa8202b67beddc30dda506691a42032357010d45adc7ee633b536a2fefb3b2143837bb46db04f66a6e2bc628d6041b3d306ff78e96205ab66847036efa1fb6e6a387cf8d5a105738be7163df9da0db48e3d8fd6a786f0f887968e180ad6888e110fb3d7919c42a7f8c92491d795c813f30ea645fafcddf877f5035f133f864fd0ba1415b3d698f2349ebe03d9e76610355e7fc23221c5c72b1b2628a40b14badf93288fc4abeaff5306d274f21938650ab236a39496d3f8a6e9086eac058e365d4335b51eafac813f9175bb7bebb75605909ec3fde6515694e119f7b6e96aa1d6d6454c3a7dddeacc83bf0c1f5f6c2a9dd2f460f3e5b074a33b8d7904e6988ae43a22a87f0933f812e45c4c518bf83e606bad4c3c55422ab2207e9d3cfcbc5819049f55e35b9663273d9d3a6f8a897fa38b0dca77eb6c344290cc007b68d913187f2cd480a40262623a4e95d90d5701ac2b9d858d70a27f0672f919c2ded1fb89134ac9a8ba6ac62931c832372abb70e811dc50cce264ece65e87338231f18ac007c5f68f3b1c5904ffbb2e1dc361d53914917770d66afe28c547d8cd5896d892cbdadc34cd6af348c93bdb8b072f38b085361e62ded7a38b4368824c759ec7d2cf4caddb9191e5deedc8b8388bc4ba2c0672321bcda3a7343c9ea71ef03750912f35624d81da5fa8a6ee676c4efd99d0c7258b844ded7b35d8c8233a316b508d79c7c0b3edabad5db9543615179b1c111bfd78b79327ac5b4155336d670baa592d441c810cb1b7c07f3d35473a45b57e780b7d997782aeecfc0363976fb608d6967844ed00b63ba75996054d090aeb605c195b1ff86f9d9ab5892d27632cbb59c06b3ccd69d33ed5dea9398f00b7c6404fcfe2fcb5924e4cb75cbcae0a1b084ea8b15eaa5847431e9ab70e4afe15b4c82239f6165e243e3b76d6c91d23b16edecad8bcb16898641f8e323671452034a8ec9b42b29cec0db210bad0444f1c5bf3505cc41d514d5a270d556f0a34333bd06cd6509ba253a6ba7a6db8f1a60c99f0c3d566a038a72f1271a178cc3ff890b0df1e7438c0c1a12d9873643e2d7bfeb92379545de50834abe2a345faf7ca49beeab87ee516dd8598b71196b8cdb15e7200cb5bd814338babd74c565faaf33d9a8ed4209b417345a1ae611880ea22ab2e894d5d14a28fe3835d3b2718125f0e6daabd85327455646290ceab89e579ed5e1d72a0172e4a6d8da70290b5022c941f3866f96cc4218de5d2622d13af6dab15760a1ec5d10918267f9585284058aba611ba07b1d5711cef505869831699bedc2b190fe1d578814065c91d87a8c8dc9b0d4dae0c80cd241f0bda3a6d5e714c894b7a48b1e5eed4555f103eb03c9db30efcb855df422d7451a6d70f28174c7ebff536dd2cd2891f6c3f264d632ca924c4e0d84b37cf8e06e6f2e29efac6cf008cc27f062441278dbc9f09cf44987e0e9ca088a48437b0b89efb9cf00d3d0c5fb449fd4b64e21dc48cf300c2d80a502cb583219f1881e78e647783d91dd2f3b389a1594eefd8ea07d4786f983d13e33cf7a34e4c9a0ec4b791f1666a4eef4e63bde7a241f49b5cf615888bd8130743bc8a6d502bfc73ab64d1184ead9a611832b7e24483a1a0fc475d9ff6166b86a18a3dc96910ff182cf326456c4461ce8acb3467f801890eaf1ce0b24791da9c650876e718c0bf43c475174f9712dd4a228695e8f8b2b23fc4a06358b4a6a8e1afa87a0280c3e098f218f7a6d6bd716f8c105a7eb799ba0220837fa5a96c8a22a826a6f7ea9d7216a24acbc7b0133210cc17c8190507badb421bc54997ff9340cdc1ee415126ac46a4fec9fee12d40f06300f7e397b228250f36d6f0d2ddad5fe1898ea690e4c7cc3a116a70bfaf6d2dc996753fffae40ba5280b8356b7ab4ffbc914ec74eaa070581fdd1d9e5aa2",
-	},
-	{
-		"4d81b652fee892d575bd13dad913d976cf0517c819d5183a72eba995b1f27efe743451721ce34791a15a6b7a6e44f13d4a080563dd1d9d4f0946e5ba3863b9ac970a1fb4ed66458ec1b1092ff5fa6c3f0271a2df8e3f2e97851352be760b6a0e1589c202f00791b1b89ae0ae944ced96bd90754bcfa3e355b735132d407d3b5507fd57f705e8a8bd82886b16d459ac91e921dcb8c5bf0d7cf420a9349ee589a5e2e19ce7c944a54ccc1062a0690f3152300d0bf5cd1871c1391bf6d7007f7ce26018ca2a5c6f76287fd8c8e9e7f93b1806460dd35f7f95989a8b6f9a0aeb7c6b0346955fb50b8735e34f1ecb4859e34ea0f022ff6fb797094206a34cf120b7f4664c531c57da513b296f0671c8e9bf68d9e1674998fe52da04f627f516dee97c2b3c988216e9bd3f58c3b021ac70898651f1cfeaef21c4f417ebe92dcad3aaf50f4277262c356584f816a5a5862f2bd720fac10f1b86033371ed603bc00a30cf4da8f579dd5bfdd571a37af7d2a5cef29f9001bb1605ee87f24ec3b259f381a69b771f78d21c4e43bfc83a916e08830d9885c8ae8ab6367c05f92e5eecaf0488262300f83f4e3bff177590857e149216995bc52311fb9f16f4cd74e07c7868a39b699bdbb7d7dace4c6a53ca7ee6e11741a63a52a1d96995a6dd752356dec6f14761ccfe38a6cd8511204f8f0630a747d6e19a77bb030c61e0828436604a28a7acf4a5e49b7269ac93b93b99e9e2e1c0c47b377f7e44e05ec6659526afbdcd5bb172404ce5a9f8786234114c16f20cda6d4359eb873a4a4d9fdf734e9c40aa4db3ea9a98939210f6c62142dd144eb78191116d194bb766ea96da38321ae27fcdcc196560ac75567297984fabe6072c771899906350f74de6d18518eb6898b934b11e945d94ead02b821fd6682602e03e9c70a1ec67eed33874eb24dc83dd1035fba5928f8f62ba1282907aa8935ae72fcb881b3277ee6bebda8fc75d6cd792677c25f70c87b11e094298b2d5f39904be211ff0980e5b83e8ea4a455622d8be9efdb5aa8466c88ea861407d54d98112faa10293af5e16974861dc9f83b45d21b112cc367894c421f5049e49dd205bd7c15e6a70bc810704e2e3a3659800864912527f8be743acdc474a26246a81fc2bdf669b9be7a2a0c986432e1e44b5675607e7e1ee2a8dcb72d8f1964272926e52f909ede0ac8daa32d1d850158db76b959e4d83c9da4e3bb23fd1f5b26463045d6cf13d187fe74a50c09a654d52d0e2f01d66b9f8b4f4aaf4c69fa62a02aa876f9bc4871aacd26a6c6ccfb9bea09cafbd0268b5b65d60aa23ff504d02fad4719698f8b044ca1bb037ea6af58a06a448080dfdbe6a5d698d5db9da5fb4aed04a46c8fa8b93153bca00a5bf8aab64d2b371d072db2ddb688a9442e948f0b99236828dc115a2fddfa2a29e2d4e02ff0173cf734efd4eb687e3f8712be82abe1fac4be0c1eddda090803fbdce41bccfb58c43038991ba1074b281a09bac5eba58a99a1a9678ba26f8f9e3c63ba095f02cd8f3b56aadc5de60477efbf3dcb54b854f651cc72042bf19268554c61b44f2f338a75de56c3c45b3ba40a697f5f21c4557380c777bcc91a151e5676c2a59606200bd476cf98d20b4cdc64bc3b8670810a014871be018bc32fe239e287cfe8a7cbcd1e8b55e08692ccfb4ef871cf797bc0b1fd7ec37931e35b6bc5d32bbe7ae77b9962c179f96436e4a32f566298d2235acf921e38c3f1942fb7674b65e222d17b95a2e58f072c63aa4bba1ce48c303f4bd24d84963f18c5e670015c52342dcdc9c0b348c7dfac721b568effe2bf2f2e816ca3279bbbed823beede8e12fc5bdccd0f1584deb1f6ea1875e9fb350919b675ccde0178bb83a4aa5232bd5e8e9a1b8daf905c6197367a0d106532297ef89f3bc690b48224592c768bd9c50a63d0881370d475081aef052b444744b33fd3fef674a37898fc950f887ed482d2a51ae615ef5b1dfa3a23257e6a6a319a4e2080b2c4094bb09e4b390d1fcbefc4d6c5dab620f8b05b1bd5d976300b007e2b8120ef8a6c9028b7d925c795058c6bdb6711fc5fc2476b9810d1d81bd24637537716edd3b7068b802c531531df710d3682f9865530e1ed51b3b56d860ba4e972bbc74662cdd1e2ea24f81bf469193afc02b14143a32e9556e3f2ecef97c65",
-		"2538d98b64b6aa9258f9141840a5abef66d6037a10356366a3a294719c10d6c148b04cac66f63ebff052d730f8821f5e5822d869573bcffbdd636c7973433abbf38767597da5186df8ef9df071bc4ecade2633366102313e659db8d8e0f293d379fa2df79f456497",
-		"a5049b0aa153e282457555bf6f82b60fc81aa6fd1c2ea3db031478ffb74b5b5d",
-		"350287a6bed5709dfba3d35c",
-		"849670914f5fe318eb01e8849e536374ec11e813acdbbe6a5e82a506f6aef4f916a3a7fb2e41db3adf990175e21f2386d1805af9bbc32a6ac156b13b1a9505958f68599019c4b7297314229c467114754277b10e9f49a4d12837ef24184629c8902ebe2a23f740dc826b01f8963d47100bf617b314835e436104eb207fa9a1079b8feba06d9369b9aa8222d38d87096b73678bc5db9a1add59394530e678b6ec93a80efc6e8320f2909e3e891306d69b016ade0d30cde64c2c903b401f9d01a29b5cb8619dc68ad6c21900b365a6b657f7d9ca4c145fe598a94eeea741e20a9329996b17aba5d7115c93623f2f5d6927068d0f190b49eb885429d771bbbb3980e9293e4d664a71c3cb629d869dc97e58fc3d328331b11df19a38d61e1705ec4c3d779168abe049e9d675337ff658e00d2d610c8f227d1341d1c41f1c01d8b5d83c4b1b30ae4318da9822f46402ee8cd5cfe9f3f22d90a5ec2d0aaa0baa85e10f5295cc6005c5a0887287b0c867a23da1a4c2196f91fe0bd4f0db1ab324c26fe6088d7583f3cd052b7f6fca38e8b21f98fd07fe78b7657da1f586f1fbd3d2b4079e20f21dccc0d269d53a29deb7c7fb63cc291d1d2c50ff163e08ce612310d3bd622f2416e193078ce4e1463f8a3490578af96ca98e665468281f1af9117a2ed23367df19b570885de9d6594f09aaba4090bdd1079720b08d54311793c97bbe14433b031c865b059cb4f75db74779b82c4f83eb4bd829c62eab995027b548063d7cab7d1a6f9642da6cf7181c0ac71594b97fc2c84b1768f81eb287091f63c76623c61e7ba90c922c74d46b9ae5d8094d9752bc1e8020a82601c356a201e0473d540053c707a88f4baad37826152dd245c4cee6b0019583c61e4327fdf6bdcae53584cdba8a503b835bfb5df9d649705fcc1f09376eec96c3da1e105accc1cbc21d90f527041a9beb85f8cbb1ee8db798838bb45374b741618f83b5d0801a3af2f640abdbe74ec3dc15d6711b4c1480aa8d6084defba82ed221ba359c9744705c4feee0955c27ef468cbb816694516f73fb541e0ad4ccf99ec8b67ef090505d1f7c4c3a8ed7e291c820261f12d92bbc6609da6c275349819848c9112826674f243acb9a29ab73f17c8f8af12c7437c11972c824f00db7ad284e51b9b508a925f0664bb259b4443d56463bffc9e5d845c9b9f79b24c1f457088fadd281f48238866e0b92d6253638eb188bbaa8bf6a81d2b1087904974752697cffb00b4ba05e5b7b842a3d2c0a743e4bd691625788fbe9df14600643b1d161bb2916176b6ee40aee38dbb594ec2735d41369ed3a0c6dd9073f1eb51d1b77eb9a967b53670a8ed755f3b2b73a6cb50a9e1ea7549346646dbe4b801c8aa642779d8761b6c2d2e1a9995e758ab92f07c4eb4a23c042171a4b354f434ced5f6d9ccd26cd6c2506e5023dc076ced15566fdabc7364f4a8594cd6ec404e1a9470f52a83052390e4f7789ade9179b069d9f84ca2c7ac9eea51035db817845aded7405bee90cbe92364c8c7cf8a366cbebd7a972438f2a9881395a8610a2cd0c06c46b60cdae5b1f473f4fd6ec48479cf35101656f05485198a470cd36af22838e7ba3e28863cd8ba7bbba7e3c2625c1106a6be44c9e3d9b9938679b26f0713c62c3757a2dc8b2d9eed5e652220a7711cd220bc91a9afd7c940dd8be71616ebb8b2cb0686dfa161c6ef56994a3cafaec5e79bd0a2531fd1c1a42771acb101a38988bcba51ad85bffcd8c67aebec5b37d526b29f7b9d31388e1e7ad7154f8e65516f0d80a30b88c2b868be2541d19ea1d2bcbadd30e2fbb1b4678bfef7f200e0f8309ac0701000c52ebbcd6fa00cb85c8d3ea9c5aceeb3adcf3773cfb3bfc9ac764d031d7c63ab888e9b03eb9fa74554dab4719d426d0875a508c8c86b22cabfeeb70b0f1461db4e5f639d2a2d28a089dbcc48e3f34394ff1acb887b89f75d3236c8143bb9b06273c3878744340ea1858a9f383f8bbdc259250e23a3c3992bf8b7ca7e1a66913547710402bb538a8866772d11cf4214060ed091d403e1c9ca3af75859259f88656a1cfecfdb49d57c193e60a2223627c681a2fbc7390140aeddc19df035a5207adde4f5736bc542bfdc943ae8b094f4a8701618688fadc2284fb423f602c41ad8ee11e5d9fdfa67fb7dc7d4dce7847d4875b3af667168ebb6082f6911c95",
-	},
-	{
-		"67f0494a728fbfc84e2f4a043e121ee40f3b12b31616c78e157ed970db28674318b08d8b3f4c538d7b9d91b9b0b09ebfebb07201c6398fdbb8684c9390b3d6a8636333a3b086302b24c2e5d47283935d33065efa3fedd5f755218be5d4618d38c5c1db75470ba06bcd853f3f08d39c3cd9fa3618e70b103c2d9b2101fcaf39c1701436b720d723ed5c622d6535c9a10ec4d727abe237e80fd20911ceb84a90285fc6e07f9d036cfa65995f9b6300a927d7d0d2b907bac9d9c4daa87c2438a583fe85029c886f96ed08f5886bf53292cc0265850a1f4ee3e3288b604dc305d0c28ad35e1242f4ff4ae988b6deba48aabcad2fc6cd7eaab0a63510f3f915c4bb9f9719b1d90db123f639d9d4f3227eafcfad769c2b204dd2555dc54e738909122022c4f92f751d25aef6f9a1187750e825c68450e6d1223c2fe88aa27194b492b6788be6eda80b9b9f053cb77c8d9fa15324f23af5147624fc00c66e947b004bf38b31e1343c7cd341b98abe462a5f994e51d343664968624a2ed0dea9d0299d5c5a7e9097fa63d8b3ed96f917f693654766a9adb01110fa3fe0d8e9b102860d5c049df3fe00ccb2ed62ab05583e6aa0a5134d55245d4f643e274def29d3fc86d79979d599458786a8338b0071f6a01609ee6b2e4bba9289e2df780bb27491890d0b5ea650e62df819b8f98aae99a1b8870ce6d3c7785ca957d5b4094946925751f0fda1d62a9aefe3937a912c1b49b4272f87eea7e397feb84c0702929959e38a568460811e5064b1caf5dee53f920c6e19fb16fc9214b5de1cb770b510533f66d8a0e7f6f04ba8ba41869f8018abee31a6042d3919e217359988eaa9db2a10b3caf7aaba43527484d81304f0bef22165f74e9e1031b545ca3d2f74195984cc237b76ddbec85142a06446902339b1883000264031db85fb19b46f320ef3fe316f750f2d3d6070dec5b66ee8ef20701f20965f5171e44c8a99bcbca7afbbd81e30e74c6d48bc4b0d72baf562da6581fafbe14b6cc597f75e53b305036ede219ec56d0c0d29571a9c110ffeeb747fe56f6030dc26c8d3841b868a1ef56840932dad9f3bd7f75573086571f4d9f0d949510a2577d2f8fbed7e850c73ed4c071bf9a656d09dab43a610b49aeaa57333f67d586d4f50683dceee4942db9549f68eef4c5f8df8a2330857cdf2fc4025f2be7d5f0dcdc74a9cb593de91282787b716d416a3ccb8d6d40fa3c70be4ecfda26a5caf3724fad3d98db16ab6d8f26defc68392923b69664b0c2d56f01a549284b042bbd43c8faec940187f190aec08d06f9a62ab03c9f610f64c0010a0939451d5502511dfd3da1fec5a38f64640c7b6db2961def257eee9a3eff944828e9557deba68bd8e42dc7a9c1570e35537993061fa0f5351fd3cf4ec36386ec4cdc5a2882d5f16703b900c5000efa63888d69982e5ecd3e329c8cf5f003e23ce03c55631246ca15ffcadb0fc9d5634252ccda812ba7bf5e343c44244026512062a68374ed4d8add0855dcc22b30148e0cef0f2886be76bafabadf3ae1205b43c6deb8a41c338114895dd6b49deb329ada31b350e02a1bdad4eb05b61b50f9d22fa2863bd607406f552713e302467ddc78213d584b4933202438d63f99d011b97297f5589f35b7e45ccbd76f02453b7a7668c2b1a1f5d1d63eb805c8881771faaf67433eacfb22f9b6fa58b93f9423a5fcf667aeec39751ae17ad36992556431bca77059a29353598dac12bd3036633d2ccadc18f44123e5bc074f4e5ca380095af062fd83b647015259be929011cfbcdc9bc5d0dcf9b688f0f5d74da95746f447a9e1cb5028ccb2827b45129d04cf6990953a6d8ee0e67fe6bdbd8004f4744cae5607fe7ec4a0f14fe603dcead3367b6870d8e751cf57387d04b881f92cce9772d695f19b36e2db2cf6a807c9ee83225f5c09a11b50e99855921a4eced8e631af7c234aa31615c00ccdd7c6ac5ae8fba6e29cc233765a891864c7d73dae08ed1a3c27cd423d8d4efb550597afee8356c12018f496637daec83575f5e38ed2fdbafabafd38483c239d31cb4d104e93d16eacc6050033a3c86929be4ca8914a538bf540b43d7ce7daaea317bee1ab80504846554879f900d312bf2fbb406a0edc5f4f809cbc68675b0b7f09fd1a8a4d52c0929b3a8b9c1dae4b3d599b976867e6a7e8736450dabf5c49c949544386a71419324ea4ce5c4319899ca510f50d07ace57b013655b0929f79dbf3cd629ad17bdd10109b7c53a4f5f04a16e5471e823c898362df43f57ebdd1627b33fd4cafca6cc065d9140acf0454d5f99be47bc87e0f3b4d4320bbf0f21e7c261bb8d5d615963beeaa46bdbe9b83a8277813ffe6132b23564bef5",
-		"74dfdc364097c39ef91c01b707a522e28edb1c11529d5050ff820234e6c0295aa00591e09d547e9671804d7825705ab44b76c59d1315ed1297ef477db070d85076693013bdafa92e2ff6a654660008b176cd4e8ae23b9c792be3f7db54cf2bca385bddf50a8624397cca8ee3cb96944164e3cb461e68",
-		"b3b5ccd7ef49a27d2c6d13c0ae77a37abec2e27e0b2d3530cdbb7f36792a7d2c",
-		"c0494bb7249f864f69beab46",
-		"ed8d6e964bcde1df68e7f362243073941fd68ac77929c8e480c89f519f748b3dc337b1af6231632c975167a8425b174b42c2c60dfc0ec85a0a212bf5c9aada818a83f9664c8712d96de1036b5e5d8c8298786b753638de3a8da958549f16eb9c723355cdf7b999aac464ec39df7d6c1607e81b88b63043d1c847dab618f1b19336911b4b0145c2a694e61db71e021282006d48e37f10f3b6314dd012a07618228532c28ca84a936e0eff83723d117b2f2db857d14af5bbd5948a0e53018b31e57cc2a81f36aa013a844990753ccb347fe98fab294cbd252a8b8f7246276275d2780511fd3cb7baa2fd1548184f968c422230f7ad73ae9dde91295f79f6b799e7d234dfd6573fee6d6ae748b0a8cd7ed4862ebd957390826f276c2afb01fbb4b64b61a1bfc138508efd630e77580867bdc1e96a48a694cf0db6c2a11f05dd0bc8769e7200bb0749f5798b6f3559de55d0c281eb5df22b731fbbc109da9c68f209b888e61240c4c0ca006d105c0a7f43144021547d3316e5a99f6c429f9ea2f17d77dc68bc9d5125b6260f79bc8b3b8061972e6757d87b6544f21645c0b4debe5224f7c48142c09f35b8e144c0c1e6521f04c170519ff744d61abd59a56d25a26c5ed5972191b25e78e2140f3ce68fe17be9e59a79f6c69619a79b83614c670c7736d19c27fd22515fb5b896a6418cc0b4850e85c07b38b995cffafd9f69763cbbcfa9d1bbea6868244a66a5cc82e815fae09f5775d28437634926d571c2b0d200855e09cbdc67d10f85bd4cc334ded4c83aeea57f8e373a950f135997666b653e8de47a3bc0059525720045996bff500a47baeec97808fe971d7693dfde339e8beca3598fbc053121536c30d0af10f8f5d8e5eeaaaa9586d7abb563fd69e88351f93bcc46520f6d97c1a49ba9f8f6a25cdcfc11b2a722910aabe7435ac8f0dcda9f824fdde80850f21a2d4bcbfd2e9fcbd14dec05c117a9796db49e2f0dc55e74c7f0f615bd049fa7d0bfcf197dcda3ef3de90762e6f6f9f8a8936bd04fcf2a97cf18ecc8f2f118ffbf02b67f252097e4289d02f264161f6f90f79e1e1ef8414b01a9e1a77b88c039ad6eda6df1e28fcfe9370f0d574aa9e857dcebb19eb7ce8af9b19b4481c9fb3e1f0db3b02af483f737ce3ea824b2165e7c0fca8585383d4b0a16eab2c7e3ee5c038f939a97bc8e1c093cc5372ee45d81836c988f3ab3e6ee0e5f9549e4b7bc381a2afac2074cf75ed56b0e757e7966cb253d549fb0902da98294c6dd4de3c2e166b7e45098d2729b1393deb68471d4d3218dea3dfd0183b654ae4092a79357945eea4b28cfd06b40d30d1b4b8f19827895f6f908f0fe511f74ec84cbab2483ca4bdfc6ef50178eabad79b18b58529c9328c13c52c2869858cc20ec36ef7717e1c743d13f9607bbdb0b701d9df6aca7366814e883d23e51ee5b0f20ef70e2c4134ab037d213315fddc89009260981329a1872e541767adbd5ee9501e7df4ef0cdfae9769961f8716ee7dfbab0ec89b3f62e987387d5842e124a69b07245d359052ada50cfd67472d27ce2c4eacb5421b62dd7331da54ebf0989803797f4c8c781d0e2e6477b421c7d5cefc8146aacc0012af3f1f7cd71ce2b1045d86bf48c9a13fe469a1865294e160b4975023d0eb24ed26837afefc250a914f86f8b1f5d67d65e9737e841519148d4dd5dbf2b5a8b073861288ec9793d4b113d71c01727f67d791852fc3946dc912d60fc66bffccf4c45d859eed9f0bfc7f89086df5d5cd830ac919aa7cdb4504018052d67f6a3ca012ed69187cd5fbe91875cfade381bff1e804ba59cd59f0f75cb46dcfba234ab9832c3fb9aa8dde19fc1fb30677ac1793a38d94aefd9ffcd4e777e9e4f6d49e0cdac6c16a36bc2f3ed8e23b80350e3be6d866aaafbc8cbf7c69fe44c2aa80651164803150c23ebe262aa669c77ca94d215895d2ee9c3e325a0bf2c61e419a41e0f7b1ba8ee0508307d49301abccd5b74c054b6c7bd1aa67cffeafee033761d8226d9dbd7214b130a867764062cf4da685deefa23693b8549d5ef5e53df85c19bfb3c43c6bd073e7a836f849587a4747e1a9a3c7194f6d5472d2e3e4c81784a3061fc9bd3b94862c4784974d859134369486f2651f1db94f511c6f59f41da0d75307191602730b88e4e6101fc8d392c87687f3be454dd92fb8ec380715bcd88aadb63717cbce4db91a36821a572c363759d8d0a2ab007e5981b78731dfdea20d900b14f0c5ee6a4a9b532ed2134e6edb4dc267f001cb88dbe43aac4aad453b839d035697df7de98ca7a9ee7601228a79004b89796e9ab971aeb8e62c789bb21f38b77b492c57db402bf6a42ad0cee169e9251d865ea3e5f79b1801ef1e53797aa6c7060d6f9486081",
-	},
-	{
-		"04cf92a64cbe135f7fc1d7223b95e41d13f04b482018039f4e7ccacba8aa15ac79a752c5666524e527fb076290ec80a3dccbebfce3ee9b316a65fd130f12bf88b9124d1f7772049e6d0c01fef881a1d44c8dd02f7b6b60e6d15df9e06fb86929cab64842284de09659e19451623525aec2f5dd3e603e24319b1d120bd57b34a0317ce25ac9c2f022a4847306b998b57c8d92baeed0de1f6cfb3177d0acab70de275238f1152813b9ac87bf651f74e1ad079b9bd779ba4374ecba459865b5768d08ae7e1dd691d6821895e8380ac9e5116580e8de3a2c5326e698bf4c4d35d955e45772bae8483d01de2539e8ee1ef9539ee132d80d85fff41dbe406af319c0d7703292587bcf5959f49241e2b03a364e1b682729ed261d0ae45d74d77634afe667413ee210983b042a7ce6dbb61c29d18450fa7176177b5a74f032ea24e1d08b220f6d32a7a836d1241cacda39d6acbd26a62f9dbeaaf7329a291dbf0aed4a2cfcb85ea360947585b1215feaf70ba71eb2d6bb7081b2a21bdcbfdae6ad2513a9dd714d3d06c2c2b7e322a1db2d48f9df1fb44fa066f2bb42b196295ebb3c0898ad55d5b317986afaba0bd5e754cec773821613e908ce2bba6454181f9020b73e758df18c255c87df675cc6bb2b8d2eada44196ac10c26674167f94a79f4be515d8d6a1fd3228dc9a85a355b030845dd4c5f481d5b6e74acc66de730629581b022fbcff61e5dcfb6a7f511aafd577849a6b057021ecbaee53986159c1ba74c3e930c34a159f467f1e9799cd6c1151067c56769e43308c96c8edef8aa7634d909310dba9af2128cdb8c29b24d3ec2a4f43a1ed86d1791c9a670b240e6e719f01827aaa319bd3ff53959a776886a1b7c942a54f141e6bae8576d294e44333e6c5ad90f74863f69bf890126016b318e0f6bd2f0adb9bb861118af5f6cd28dc93d56c8a1dd080b8c810ca29267d410673fe367dd9d1353ae2bf2fd88d57b4202c21aa49f12a01b93acbe260492367bc219d3afb6e6f35502f6529bcbcdddce9fe8632efb034a9eaff8b4a48afb105d04e3fcbbcae010ddd6636992213750b12fb3e01ab72aa957136e0bae591bfb5e0fe819cac82a98ae8df230af399160594540640c6b1d537e7b5f1cc47b08127ae02c35b846de56c4c08773fa18d4436e14b76a7fc4bdee301d0af4880306f2f33328ab79f6f24ec779b2b1928704f09bbc5b0b7108e9a115e4959df79c80eacfb98649a0788867e23b2974b22e654ddab0494bc922ecdf17727d0f0efde9dea7601857d890bfbacbd93f7df794bbc254f50e1e17eaed2f5d5a2e6c58083aff68434730d406fb9fd02b0dd7bfb99a04aea812b6830fe5e05a044ca21c77a174bae8b58eefa11ecfcc1c977bc6218064c9931b5c92f13cfd05799f11e130869c293c1b08dd29c899365014fc8195514b286c97cb6dc4b8633e47751f87fbaba137b6aa04d072ae06c2b2f34448449f60b1272c1efbd4722a2be749a3d2e5450aabef1f7c51bd8324607668a8caf8097c2f358b1b09fd3525d47ec9a7640eb20ffdc17c4f7eff63df75dc7830c471ace3a727feb11533d6e9a2a08106af33069cf482ec63724032e81cab18e12cb5c4c3ddc374e2f75bcc99fc5da09b80a738852a14e8ac552b8471c6ad52e35317b730db2c13c277e06c643e0d0fbea43833de4d2c7a9247ff040e9c56f1ff7ea92049c5341c4d1478a14275a10119d934e8165152b89951bca7ee1399dd8232fdcbf831d8354640e698b68799d060ceb877201b2fb96cec514affeb28721e163e1648164b9e5722271db9b0ee1a7f96819fa1b1590e9daa598d9571ffa3882db9d034056e9b2785a8d13686eba61d7d45cf2e9ecdbc391739ce89297211472be18b21401658c5bf29fc3615924382d802a166d05dafe7876e70a0d081e80c63632da379766928a0555eb5e7a238cfa4da267527c66caf34dd40055f2801b29b3f5604a5bf3d46048bfbec2e24abd2fed2481698a4b5cd71f5d2c12dd473b903c9bdb978eaff7d76fb69951005681ed7b0257054eb3dd6d10097fee51ba7e8d565925e4091cbb78d255c9d3ab4ac0264d172c9bcb0908db1288c9634248f198a1167daa323822058decd83936985f83b08b1e7b942756a7af200af168fb8a091107b4443fd649cdc22106f9b9657c69f19be485c23b2c715b3762c332eccc44f380883357d10019f20612ab6b8f155c2af9e2ec340e5d8f45bf5278ac1fbc9f9f44d2f615d21007d822b244b1c7a0dbc182c7f5912485d6e4d74e90f60a2f964e028c63d49c6aadbf1df170e4914ca514139ba538207b1cf7caaceed4db8423dd1086b2adf15f6c0e50dcf2e12898f53c339a745316904ae03c38b417bcd7f5cd5ea77a4f06e65d56c24f37ebe72d271ac79b6ddd2bb8bd67f0727ead49737aa71af4f620da53769ca3ae878adbaea5a249128074ca3ddbbbaf5a68f9cde2a0e8d69708b0ea7f4c8d2dd4180882bdaacccf2a409a681c551776bd10439fb12b7548342532b371c0e045d8e8c895929464bdd4fe25f0533c66104daaaffed52446094978bcbb389c",
-		"001084c8a5175c0ad43108f9215c35886c82321c800740c6118a3fcd45776a4588ee0e2d056a37d99b40d2bd9c0845088a77240b7e65d18fef105d3488c77910b5873dbbf275948db5",
-		"d614d2e671066e387f7eee07bca9f9313d86e6a4d1371360900d670e11ecf1e7",
-		"674a516f8f59f9067e0485e3",
-		"1ee376e9e3c89b2147bcf75480ff0dec1d0e8cd45ba812f34c84124871d484b4ca87bfc8cf99f85ad452c482933801426e2737a97468809fa36caebebe8eed07a626b3bc3614ef1ceb54f9221ecb16f413f0bd9ed4b3010c40632f05223484af7bf5948c2fb8a3d2ce04c53e3f2682494f3969a0f8eb738cf93c0141799c9e6b68924433f0326991e19626bb19e6fbb5dd46baf39f92e830f9b1ff465a007f031891fb1f1799cc122d3ae7a55624356b5297bd5d948d9ff2e414cd8adf00a53524df43f398938d33c93b2c06bcde2679566c0a7b0177b4a873f35874739d550712d5cfe3d25c19292ba97c01d84224738bb25546e5c252fe5e5f260ca881aaf176a271a6fca2edbb2cf23ae6d4c56c20daadadb8205c2e33881867cd67ae6e59132edccc3601f014b744ff8eb6aef5e09b358607695d3af42ab8fa30e9fdf99ce54427ba9da3699de19f7a8f9be368df47ff0607601a91e7a5fa6e72be50bb32b825427cdeda3972a18a23af290986cde14f5fb9cbddad336f5efcd2d7a0cf3d5b23e54b702352fd5ee52d7e3479441497d56e17d5868574c56cfc421ee47bb00e9c75b84262a1b9e2cbfcccfed9c4c386ef0d2c1be9a7b7556909b5d72a38b7258acdd624de2396c75386e077c34f005f92a2203c82d1072c8998f03b1df22de832ac733977705453b1d72336b8d371cf1ed3923f462ecd22075de5df68c83ab1e6648ede7fd5ee5794a744abcb32af73bcb182cf97d36f37c15535c4107b7c8f2321f9fe0e2b6ccbe74204df3d748c05bc1e0e2c55ae1aee2d4aa4a52e98ca7229d6d06576196ac8e4b14a9ce807075cdc876aaf904c9962741efa8c6caf41e6b87b2ecd6636e2e58f3ecf576e5d8b895162545e618960ff6e336ff17eacd5a1eb335001633fa78c41ed05466d904ef9b81b643a043298c0e291a085e4e67da72e329adfccc407f800709865147db49cbdf4232073b7bc7ad89b3dd901d927ee08ae6497e0f2f9d052ca8d7444d2e2ae2197f930a7b1c8af38d8739ad298464169823684612cb628c484f710cf9c552551b6837b575a43275100bf800b7a3d777adc44d07f67cee5000422b9049dcfbedfccded0f2aa4d189621579b01e3fdaedc4d772dcc593316ca85e7aa248d219dac21c561d318a4936ac0d3bd5c75311486c174e0e2182affdf69bdd6a086534e4a602efba2b9363beeb5346539b45336cbaf479da6b15b226a9ac026482216dedb84ae3443b306820d9f05f78dca7090d727c7481d82c6e5df80e189e24e46f5758e453e542bd91a58eb51a89e07c50afb543c6b998704432e863dc4c0d0236e0672835a7b0b64e14f5ced2904e54da4287597f920bb4d542c35d3b0271cf0eec055656d523d7d2cbd667445d3e8634854f8616b7d7a7f3e14fd32651e9df40e1daedfdff1371f16d5549ed5646adf2d417e4b3a4d145bbe0974ab388c2716861a08296b862e4fd035163281457877eff89dadb160eb2b780414435784804bf4fd36602699d8c2f6a8cbcb509198c38e2df2edaae7bd7c93313ca98a9c2d24419a12ce35b0b3d68c18840e3ff8739d70969927c7db9a6569787bdedf5c99948a9e79b2302a83a71159f4c789b3b3f05f1e574f8a24c899ae3457f8e73f9bd86976fbddd83b1af337eb8da4c0dbac3792921597e18a2fd3a0ac89a270794529d370d36bb6dc7452e754e903781cbf57c8646b92d5d02842e7df229b3d721f9b981f9d61a48f00e53948a5dbc4f739849609d94aba3e3f5f8163d40321576cb8eb8e89953b608a01184d41aafc13f40c47b12240e3ad49413473c26b6843f4514be221c2af632d1a54cba230457f23f00b2608485c381ae03b389ad0a1671fb416de4659cc7f7a9c4b6d9807789c307d061fcf613b96a2d79e5e3e20b863c8b1b75f35c982b40ac8dcb7d2712ef7df94901facef783e8015a9a48574aa6f0cfb0bf6c1a3409028f8d62137c347f5a35ad6a3cd60d71aeb29bae56bb4590f69226fb4e08fab7a9f41e58f4d5784540a70e7a97720c549c8440b089eabd0eb3e4d37a2e54b1160572ce568f4256dd244decec31fec555017ebf488e878945383750eff26a8a1cca73e7d6f52d8cb229d5603360a3bffec23029ee34145c4aade82d486758e0aea9e1b7bf0b4bfbd4fcc96aab66a27fb463b48c6a6c5c5a60253e2fbc5716ef55629277a5f3b89c300e21bf1226241ce0d587fe3f5b11e47f35614169dcfaa375ee1aa589be33a4363765368f5666d155cf72e851d426fa67b982aac4dbbc29356d71deb0715b34e00b9fd8876bbb09ca0701b15615f05cc45e128b3864b26003e6ffe801c4e27402f37b8997e0c29ebc273dc03358cd22fdb68d9cd3b56ff8248a727c2d4ac65acda4d0e0f511bc07ab06cefcf444f1002c151b953d7f7b19695668a86683497c2a2d2e69f19a4997148d2e8d158da859c8f44437d9ce9db92f84a88e89cbffc74c0ef4295088e2543a4f7c6ae9c908bd987bcfd7a074f83ffaf3888bd7f430dc5a5bb70d223c21b1bcd8bff2103408460df864dcc168486f6a66d67ded366c6e10f50bcddada93627cda711764a57ec36035ebc",
-	},
-	{
-		"ce72c93caa49bb9850774149a87fcf8e23a0c53701554468645554553d54190bc6e247712b02097b794bc421ca94afed34742435ca689d2ebef183fb469c060c7f4d7daa508726c9d2eaeb9c7e9a89b30faee8d9168607d4778acfbd27d5caa623475073ce763ca061273cdfc2c692d1747baa8a01b15f783b2e36620400082747599a16cfd6b630fef310c0b9a2912d1d3bb71eec16972745cd8a49cd927014eb0a2abbe0e1ebded4fb9e8d9e2fbabb6a71da5688717ecd3e08160b9a861f86904a41702b2c4fff28ed8cc61d468187b75bde3fcc5c0c0a642215fea83584387fc5a9aaf2f8a91ae535e0027b618a32bd687289c47e9428a1a92649deab825d702b076223b07c08e55c0b60be95937bfd0504c18398e924420f6e20baf07e2b1b858d3e360a461b66517c24e60f9fe314a4a4973c8dbc7e9d2a9f571a1d8235a21073d81ab9f4800b70a5f17f44d593e8792a2507e6a3a41042fb2a5f7e5f028ed2daa88cce28973ecd88bd125d50fad77b1fde61c38272057d9c65fbfc6789ce41315a105af14e277a0c39d75c34aed7538c39160eab1c8c47818743e8111229426c399c5e88c4d894fdaff0315ec885ea019bf9acb785f3380c37201d494a60b583fc130bc0eb9fbe9b90eff95874e35910dc05c761f8006e2f208b786aeb2eeee841f9a82d9966c82956c181caa4dada81dfa2e2d7a25007c2dc7f2dc7ad1bafef14581cadbee4d614a557df4931b9ca105bade8fdfdefc0d96eeda11c08500b1ca827ca670ba07bb0f85af92914c43a6f71226d6e112d487f1ae99b2239a63ee2cd0849d8a9c488a11f82ca334604a2b7260f25373c6db75656527890f9b772c6bfbb9f687f27099ea9d4d1efd874a6ff83cc36c039ed1690408f20394692ff054d9e6eccc6776b6f4b3c5f24b0052334d159f40b470a9b8799bbc0df4dbfe59a5e536624cad193160ef23abef85df2c9b6e6d4fdf16f848a2a446a77044f1162a278866c491982570cbc16041908cdd0efa2cde011526a3c96d4b39a23c5fcc53d8232869cb4dea871f4ac8afc795aeb1b28cb2d7a3669100a1cab2ee1a7f31e2a25a5c6da836e4b771ad57393305faf582adcd26045e26b618d9943358c615fb206258c8993d700adac7440dcd3ef34fdcb065e10e9c9727662b5abee160aa01d2f2ca6c203a76fb01bb08cee9fc1eb6bc7497bb012ed2774a2d263b9dd03d60c307ccf33233ee33eee702c8e3118f9f86174a97462d0e804a24bbd7f4f938c7f105bb23399967288069e1637b60f2f1883d88ce5a874ea4bc0a7ca0f3b568e4bb1407e4bd6f0d3dc8fe91345f8435d7b1be961c45e4b0f1ef2d92d2d30bb78e1fbf72cd2e7ffae76e8c2bce005195c2003bde46108f37ffacdac28fd67a0de62970b347f0ae3f5f3a5b1d3aacb2fcaceecaf2ff4a2aeef6f5a176cc1b74b234f5658ce603bc353e075278a4056540e43033d37a6eb2615453d8206f5cd294423811283bcd5d79c4afe268a547b98977ed5cf24c0f53a0533bc0b2889356cacb67e2f7353060f9e04362859b1c1f02f96bf5457b58e5ce84a6810d39d7c7f53faaec64db5d6ebb90c1412bdd503ec6bc240c277ce1f5f18876feb24eb6a77e5193e33ce141e8720329add079dc9735f0a35d7d85436f1dba6dcff9147777760b5aa2ec9c8b5e9fb4fc602ec8f754c99ab2372ff5963dbff3fda91865108e606b214cf7acab875197e78060eed52a798751998ce7c73cebc4d5f429f6729a5193d7593072d0921ac8127ba6e796107ee7b9fbcf7128ab35fe9f6fe501fa4695c19fd64460685f287acacf5250efc13899bcf80ad5a340d432a0b9449affda5c8fa090f008e01873aae7d5fbc7972451542c5c29cf9cfdf23db736c8a7112536b1b626caa63f3e4117044cdeab612fff8d8c194d19174f56ce761f6587349c48fab30390f231d209461ee7e18007d10d83ea5aacf199f3b00003259747b1d03274d3c3670595604bb4482d345ffe31d3e88c70da16649a2677bfbdbf618de1d651a53d573aada2eee5c01335ce5519a6d18a70f7ff0b1e66bacc162c49f7f29b9d3fe2c7dd85b6b355c9f9141f02baf08d2be87c36f6d2e1b2e90dfcd100886e306b360df0ecb146a6aa5ac5ad05b63a219ea65885894a386248254348ada17908d776f9b438306ad28b208f80d6b9b265500aead945134b9d388ed5d6205edf07c5d8bbfe0916d0943750150e09c76359d24e3317517ea489fd8a501dd93f159f07d19d00e86d952fbdba2db771910143df346b30a30fba908a1abe5349c3f241958f428dece7ad9a91cb42035c43573b87b26c2ab216cb4c21799f6b3d81acd300ff50edd6fe7868b9ba6c160db3418565ada027b46b63e5d4f3411284fde585ed3673b424ec1cdea678e4a43c262991c3c9b988351d6e0a10af1c959cf21b7a288f2e4d7b3b2c11b400b5e036df71fa993b72ce48d0d8598fe4ef1ce70a970f89b55cf4f07906a479bc84a08bf6ab25221de37afebbc47ea0b38b87be128737d7d43cc84d336cc6ffe1677bd802910a2084751f30398dd0ed09589b2befd2f3b40fbc013318c822fa2faec2323fcc52b43161f47aefc557e92df3050dc5f8b1c5a4b2f8bd7b2ba7aaca79dcfa362fbe7781a2e261683a4a862d5f83e34845a8fcf8a1aa73cd521e87cbeb71f20b20698cc34bee3b8628b1a3784596c",
-		"08b3fbd73d157e79ea9f61665d19867dcb8c1598c1d37b793606936d8aecd992a0d46addeae857d488b83be5d1c1639d4d78350e4cb08782b61bef4107c9d3a79d3d85",
-		"a56f38b4bbe83b3d9e562cdf5ef5b30593f08a1a166676c4fb0d5861654e640b",
-		"8726dc5cae9497936658f603",
-		"88420357d1ad70e7c7bfd55b3cfd4bf06cd4e9b4ed5cba681045199a06985956d35fe86b28b9a4599964930d05d230a23c55a6a152f67082a453fc31f68489df05c553f9ae5cdb3f611445db384d79af865e52440a876fc4153d896b7a2318dbc2a4495ecdbb2e9dc68022326d35289e82aa55197aedc266dd91ba3018c7b474ba22b4e773773f3e9890ea84bc16a6b235e4bb69e785c40c1adc15b0e0ef03aa147b0d14e62341e27398b84a53f72c9199cc1c94cbcad2bd31aa69c96b06d01775b8c0f80278a43f526664bdd430164863c9c9140ad87798a5b8f38dfe90d37f54d1137709d5311136b728e6c799da244294daa4c8b44bfb0acc603a16c088a081129a0d2cff55ce1c4ccb486fa0ecc3098ef2196f47c49f9d253112bd5746fd99df5d2be577617dc2519c0ad04ee49ee1d7be3d50492017108fffc9a414ea227af39fe49fb2c895fcf00d927bf4a2d78c466fd44df4768e6775d39fa5c834b60979ca27ee9f00faf37a090838f56275a894ddadd265a8d2de74265e4d8d286639ce8f01eccd4f551cf6b4429eae3f08902b6ce6ef422cf91ce8946d9403fe8064784895b62a7f5df76ea294132c59da6b9f53d4195c1e9000bec499c14cf8bad460aebb024a76ac50616f0dcda71c0f56dd3239b11764f3ed6ed06c049b2ad673e4beea391dbb854fde1f01b1900858b9809259f3906b34f95a1c6ce8d24fdf0cf7c2ab7bde2202a7f1482baa6e51caaccef9f541c377da620bfbc63955cae0e6644ec8ed6878f704f1dea30d6b50d4291892bad19b0234582d50c6cc0b4165322cff24a9dc2ce1be35be0fdb3bb7abb777ff0b2f4cf16277388af5a89220d59f1f45ee9cc2a0fd7af9aa8e9e8d548fd65be4e47e7f8ef58f7701f93a42e7ff78f70e807fb63513157fcba96ad9731b2e8f80da85ef407d5c368ad16f0657620bfc122ba1b10d7ac2bf46d8133a9c6fec1fe04882f3d5765da8f825e1984a4313f72b67d806ed45c000dd3ddedd524d474b9b5788547d0712e8edb4c6c586d0cdf8f2384f1e093a7f6dffea6e79df9cb9398f5d0b9a7cbd63d489430fbfa397a0d03ef916b7702f33a54ebab84a7055b7ec6179b0ab7722f03e126ed343b1cdf2af3763df7e3a070162535514b01ad86c6cb051859aba1cc4766b12c8cd57b73fdd3c65af6961c45395aa7b885dd59e115db885f644e1c94bfa26b3804f767601c86e2c7dcecd4daa59955e6a40991a4b4701e63fc82b46dc0ccf59af40a8583171375551c868436ede535705f2e6380c5899cddfcaf9e94314794bab98846cd5ba9e9afbdbe1ea7fec5e22e7b2aae59fa598f4d6c0cc6f936a616e11bf01a2acc891cbfa2bc53c511a8a3a3da2e3aa5907d123ab2a4a3c0009fdb5235a3c33718fe4c504e1539abac6370e06150c402b5fc2f8c32608db4ce2eca9d1e4b96371ee195f6cd632f5b972385f9d5d357b87c78cb4e2c27aa9851534de14de923543f5fd9d55e34d6e8b7e1f3f2735df80046de01f79d0321066f9bbd76299c7386d285f7bf4ac15e033e89a040710c90f87aacc09fb8159f93c8b4860247eef079e32d05707e88aac734a2eadaa853f528d9986e0af3435b5c5f44ddfdab9b0c9ab3eea97676e920f80d1794740067f9b229fb018c804e595aa997533a5e967cb79ee58eea18995a90ac08333f1c69600b17ef4f454f540dbfa8b502457761bc4daa876d9053ae1f55001b6916ce559dc6268d01841255990e56614e6f4ee4ce04472dff0657360d75da4e83a71c852a2585110e53137e91bd89d64d99b5614ab2a5691c876f15d9931b092fc6729c0732db5cc40f966fe440ff99d7d05b24a872f552c27fb0cf2af443340b153214b407fb9ca3750d9c157aa75763b0b7600959663889d00f392d6ebc12835bd2f03ad802a21d0228f1d2e9731d0f0051eb2d5369ab790d1134c38e28d2bc2d5d57d6d897244742c176559961a1e40c84ee5c8225c8d72b92352a011e3785c262aac115cafccc2fe1b5e81a677a0220f207ebadd786b93f58e40eb6ade68ddda5b66c5f0f6b4b95cdb8241156110ba3303beb79acbd54423315768bb43b4fe8c4a465e50c4e63bce272c4d731ea4c797e14b2de31ce4264e2479179b906f67af4a23c56e817abafedc2c7a65aa45f0c89fcd0baba60561a8d013e2d5e0bdf9fbcc1346d3edb20e6e9f9c410982e1ac43039ad8fd0ebd453a6788376951fc20374b59946a6803498929d9fdf2e0f5e58c441329a79d1232e957b3a9ed17231c663b4819dcb6b4e33d205edaeb7d7ec466930bd84a064b40aa67fd76f6ca005408062b45b5aed6f8161836c7160a8c8313dc9aa1c6d42c2c16972a1065e41aea9c58db7916e1670cb42a8b54d85498561b4401761506860b19b446655f8988101fb4c45067e30edc3f00df8d88ee34111dd6626d605d993ff207be09704fd8dc242ce514bae77cecd20f10d4a38435a3f5e545882fdc224586a04ca6a162e118d23716240fa67892b78faf98a17916471f7f121fb9f85497a0b34bf5aaa4ee1ed8a4681bec55d1b4973d4368600115bea70f20a37c9e942b87f6cd1e2ab70fd401e703e3c8334c75fc338508e06d6370779578fbe737a75954b4701bfd92028ec32d3d7ae606caaf9f049d9774f70efa707c1c1174d9fcb5b0a0ae2a961c6f58e48ba82c2db14ebbbdc24288e42879f547b855c86dea9a3b9877e4b105515bd78cc43465",
-	},
-	{
-		"bf7884fab52251e202afd7b5b46aa53f85bca5fb80a009d8016e276579e401385d853312a884f4aa33cc5fe7360426bbc0ccb7416cc0196e2e40d3a825d5e0825a1394029789acca550bb28b10d847d0a4fe1111be2b7fec6b5294902775128288a784203031ea853c9c104c75571d19552e2a1359a900c5fc9455230968a5920f2ab23f5b9cc49739d4e4ae2c01c7812ff295899b954e9729a3bb330b60c51a8a7759e5131d7d4cf261fa1e62c29f91b4341a4fc968e7f30ca2261702eb328d628b7275a9efc29b50bcb9b27e5844328d5e8256c76949d30b6fea0d5a1c9abca80d3251fcf4ec4db0a5ff2ffd43618aa2e3e1694c2a3c579a2665f443ffb1eb0ce33c09d7285687cd55b6ca9918553bfb36a44860e09ffa0604ef4904a034108370195a986fe165c598305eb08599abbb3df31b1d93162397056d9ba5a1ac2812c582aa356310fafb4058abc5f157802e4a9b4bddb16e75b6db105b7dbc838f820539b76949b1648909104efa67ce28b16a738f1be104d2bd142d3ad1b1c953b6020a1f4cbb84d5c49424befbf2e6ac5c593b783a3f4af75477312528fa78dffd82fe493d821e011642bf1135a5be91fef909383953308dcb61b2f35c2ad259acd1a2e953c0ea6a03a97b384e39c94c33d3846c26b4f9f116abe572d5b7cb81886d6adc2d544630fdc1684bfb32972e051b9a2bd0931de63e025813b923944290fe1ebd5264ee4f25569a2088314e8d4ce8b91c7bd602b9d85acc917d60d30d5ef1cbb055b9ff7b0f999b98caea2517d2de334eb436078c90d41e0e34f11b93e3e643389f43b3afdc4f47a7396cbe0b4bf159ff27618cb835aac6699be1fc7ec840b767836a165fb95d06f2cac4fe15b65714ddb8a095ed4a5b57e63d536405931b6c168683763fe07c32aa4130bff787d4d440746a2dbfc584a502d809076b257482abf7f8ead7741c82b54c41acd41581148aeb4149b0c6eeb39ef7ba091c2e8bc72583b2fdf8ce7fad1bc05aefd6db0360c644a9760a9729a88ee4b2ab123d7238c12435b9f3b4660e74c0fd4a9b00aa614453d84fea01f779e5a924f8e79630a8bb6561ae19c7bc8d88b9d823b98285fdd65d4cc05e443944ed5d3cd4f46c7cafd1dd5deaa519772dd24f508bd2d588a832d5689119a2d506ff11dbf37d57a24e35ff38da18af07eaff5775d12dfe795fd3e1f0ec83c5f283d6cd76532519a15a18d93431893b1b88929159bf8fd21f62b30f4e37d540baab0e30ff3349a08d627ac19303fcae8b8e3fe44eceb66d30697c7ea051bf5afdcd8bfc00d49c8d36164ec9194a78a4d8b78826863e93b6a810354861f4a35ec12e5ac102f74e390d9c0227e67acbbe3254e5b892786e3a88a383ea9726485854a319569a678fa70392cee90c9aa83eee8df6800565bb8e083e78a064c0f8b863120efd799ea57d3073663c0d0e7bfb9b717ca1d6372fdf75a77fd9677791cb899fc8033d6d806de1e6aaeef525ea909666316d9d604c1207cbeb6f427c3acc1b02cf59704fc65135703f2a9529bb2c8fec992c4de53e54b029c3f2a5fdbec1008d1a70dce0c11251003ce62af712b9e4abe631902485404e4933f346f1b4467fceb65baf776d0078aae6a2a1f95b85a441b635663c75b485a8a7cb9a5c12192ac874d940e2d9b88cc05a2db9b5b35df769925da508112ab0b8f64a1408633fd0d81810baf2c846b222736bd826c8cf905b2c35633d6013f5565e0a5ec1492e99613f53530799052a0d70023339d1c394fdf9f73a590a2faf68390d2a823bc3e47a173782b03dacbdadaef1e67fb47a7cad71b6067ce5b5e41fc20ea1fed28578e9bdfa99faa657a754488ed3fc084faa7a05b0f6eb66da0a28e9ab26bb319fa4ee993de840948f94dc1d68d926b783a0bd3396a89970b2c2595de8148e87b87c21f664618af4f567115d403715c3d7d2f66d7a90de2c5237893a4c18c20494e3faf94485ed39ecfe972c36acef0d7ee57bf8755924c790ad02dcc5c4e15aa7db53eb6040244c3ebb7874676782e54dfdddc256018ae6af8cc37450a4cef77f21e2e061062ca0c2a514290c960f5993ec1ce9eea6d09d3293118237e079b6015b966361c3032368174d74ae5cce4148ea2b3690fbd3c28ee544c5c5bd7bc618122979d52c9d3d44eab1f2467f338e695ec5f95998bbe77dffac42bc2809d43a324e0f5feb4ca3d5fd951b7dc8a9e6276ee080079b68849b14c7573cd02c76027a856165d1043acf99554c62fe32896d120974ae71f84986bfa0c28fcc399246bef3ab90f8e55f913aabf339dd7ca6f0861a9ef712e77dd28740615479f39a37e746c7df2b267066d1649fafe0459f665f3d5e7124db43ab1ba5ff94989acc7fe0935e0bbacf718b33103a1355d97ab416d8263ab369e6cf0ee563a77f2f265fc3856b7d54dc0887ed439a421c14f733ec1d6da086536f9539d23cb8026218c5e783423b5f4ac24c8d5d8faa7186dd5ea34afe299e6dbed73ffa8f415da706442a48808a9342d6209f65ca11eba76f8ef26db890da76671971f65bce9e6112c8aa92523dd5295d748e28857acff408c161c0513b37b855a8afb0764d118815bb1b68f8f09156641f7eea994ddea20f4062607b9919d041c880b71592402a4d5b92464b239caf431a99dc67787e76b8e1d7337af004bcb88473cd16b3f7640e8aaa59ad4609f060a2cdc71a4b3ed22c1506a7050a63bd8ed68aa58a8109980bb3f2b9f9fba9599d7620b8c25e8aee739095789af83529cfbfce5941d7f14c8ae30583deafdc7c25fc34e75bbed6ce4f6b47e9647c12333ce08c7db77dc94161cfc43f7ea0bba39def8bf8ae61c6fdcc0de6308af963c6d9ef43916d0cd2cedb970d5937c9fdd4b888cc66e99363b5a04ae62a4349f01c3933ada64080741b1781754e4a722303faef69e382cd9823177e4d5ac83e76017124a7b1a41bcdbb9c4209e7b42c",
-		"eaae1c53919e2029c137a80f91704d0871be2c1870d0333d8bcf7f94",
-		"4c434cddb399e52457113cc7e16f046c3f8301f5b6c296979f8a091a9ea557ea",
-		"b633c1a0e1ddf4727b149b3d",
-		"f1de487001a580cee6edadb1ef6b700c861a70c6ef16274447b8c61bb10d2d1efbf104d5f7d7172c6a5cf9c06d886165a2919ee9418e2e8f803d47832dae5ef232ee300d1f973a6298c22d777a1b16264353cc731a7a683cfe31e0abc704460788c555c0c24f281b81d7761235a955c736f17f213a896b40a034609ca8456ec3cf5906d01121b7580ce19d89347b6a59c81add318df487b2442a7a8b5e30df78467abbf46bcd5ee5b994a39ca5bd8846caba6f02f4f1335b73d4e20be0b6ad85966f86d1bb857713ebf947ae936782f1f4929498bbd66bdd5ad6fa252364a5a6b46180e93b54cc321b3cf63cf23d55392475c6b8c8c9dc707924b55544151c7c55ae0bf391f793e52bed70829fcd32b2926600f65be0943d6a9a96547675426b0dca9cc7b0f5dbc9d5439d0281014c6c159d055d6bd89d67828ba7fd2a0570ba82996037f7dcce297fe6518331270f6fd5ee63d406cc5081472bc5f2298a9208dba9398ccf807ce9af982885897715b3c5742456f756d79c70434a9baf7b4b6664c9d9f5696c5256b74099e593f97a2d4a469cb3430d0c3eb06083398cabd58af598945a85c9235a3fdd9ba7686e54d0de9afb594b1bb030be8e6bb839f6b45699dbcd2f771db64b0c62bbf6c8672fb412d60c00b3d87f82ffff6512e8308877573323c5a2d6a216ce3e2ce07c9763835ae59d44d7958fd873e3995b62b1b347e489ce86e023ae27a6cb03ddec27a38fb233499a714acd89232a91d38abce30299f38f437f7a46df647f2be862c1e7bcc1e4263c2147b13ee5b345b7fcb973f3ac71db8bc12309f67ddb62659bd73fbd20664eadcd23a79233386aeec1a6fcc8c592053954ee53826cb9b6bba22400648887311cdfa5414c96d5956fe193a3729be1434d923a3f9849f6c419f77ea05fb72f3c4f75ccec03b7f7aef8c8e55c8c5480ee505ae1a7594e6a911dfbc39dbb0ae8656f5972eb644c64203a920fe0078f3d050cc5666ed9747c23df7853d6913005d0156e741a5ead3bb1b22e5bd802c303a73a961f0b60d0fa698041c22577b44eba5d6071de4b545d9f5de24944c151de6a189bfdc223e0507c74ff929f06a2e7497e8c63073294b4aba110a006a6e9510a9617405d9ee711831e085940006761822672549d1d1c70e50002c2227f6f304b9a7f11dc05751be2dfd297087044d2e20ecfa0c091478d62c1bf5f0aacd25bb0384853762a51144b77d30418b633c4c10a6eda7b2eac46905641da0b685f85349749a91cdbaa4027fc50eb97a7dea9e8cbb5b5f386ace0363803ba579cd16ef80dc40ba1044b4ecd0e81e382635d7855e2341b18e0ca705ff46990282fe25093a248ca04a1fff64ebee25065350ea4b9e5990da4dd2e28688ab08b6d6fcb54d70f6d74fd7e5e05d21c12f5b140839aa966aea9ee094a923ee5ec704b5b709ff009c20ed89a75468c48b505d07c7a5ba1ad54ed610886c9d84468eaa598c71b017578404c909dbca431703e0cb1cfb975a696a1677bc015a75db007eccdcb21b9e5e119c48f148c2cffcf29e245e52156ba5ba0a8b0031570e4cbe7b3ac4646353594f0c4a9424c9d97845c5e1a4b4016df9be8df3013e5269484cf32258849afbdd733189ea11783f0f64d3aba9b4f48818011e868cc03ecaa44ff0ab83ed12981a6df445294ff672f3a16d6e0d19b90007d4646e967e0fb1763b3c879f548e1103a75c94f3a7f72be78555eafc086c1c58d1761aac60b843704f234c55b951a1303a12705f2120f784c2bc1494432a94c835d908f0edd5cbb169afd2d38087ca5bc5e5df9c3bd970dd2da4fb2a00933538148ebf669a20b5beef0402e53dbfc3a0f289b33b41ca27eb2f036a22f0d02e0617bd01e8c74be264515c9b46b9ab6fc67403a35837844580794088a9d3c14ad9309435daa0396f48017be524856ab6c191350529962ead64bab33171a01bb3c144b23bed406cb05102c693ce5df36eb541c47e871acf56f2b47de687eb9b3511ae83d06b1f69fbcef3225c3469c304741437fcd0ff4ae3484c117f51d24b6ae1363beb7d85d9b61e01e3dee901b90f2d3272eedb384ddb4d3b9594b9c0926595e500f8ce2e5cd407bd7a4e2c8e6f4315bf693e8c961ba5b8a6c7f5030c68a6b995e9d3f9eaee9eebc9d679eaf72a5f1cb6b2fc66edc7dffa2370dd778ea7ff446121999afba7bb35ceabf626c6269bc466d65f7f812c663bcb2fd87d3e09ab7d71e727f66d20ec48a5d2bf0aaf0aca05d1546d6e974f90df85c1393e3d45731f71ec7b5cb6cfb4e5c29976ead6944a99df2045056e198b19905362d4e9b765adb65eb089233a8b3777352665489c9456cceed593c6590d9f3cc4024d0bb92e1a0dc619bf8ae65be77456c18f8171e4d2d846073cf5c57ba93adbc0db9799e3d98934aa6899372acfa4d7d2ea32e20164b79c71d7bd33c94f9a781a25cbcafe563462eeacaec0e8d9d6c0199de85558a3a05d1ee3483351915d8a4e65ca0ab129a2386a9e26aff9b912c588babbcf25f8c467145061b9b8fbbff19d8c6ded8527d457be7c926c8f490bbcd627b3002044b7729a52e94147f95772591616f6074047e758597f410b3100f9efafaa4137dedfd0edfa85b0927804f0b4fcea1a174622116222004d42b36c2c73d04781f2f49d080f351e57154a3980005bcfb0ea34288e2fafec5bfd01e1f7901b3efc71ae58bf8df4cd7c045856103b77bd78073f0174aaaef4a3c0e8b5b46dc92db55478f012dc1b7d513e215e735573257f105d2390b5366f49b61809033c13ed4e1ebe19ab89313c947f2585f0788a0c5de90b41ad0dbbfc604a0d414d0e5390a0f3c9616cfce4097e38e05888b8bc6e55e40368bacdba7e5b76f4bd8fe619746155c30b38807a1ad325b00ecc3dbcf23014e79f1c39af7cdd0dc7ea58ce733e6611b7eae069deb047aeadfc21960e614db19d2e7e0905a9873268b9a24f856c28059321a742cd6cb3d1527",
-	},
-	{
-		"c89c3cadc094bffd5ba06c600dabe30ea19ad037316fc13b895fe0e14ac8841264c1bf25557e22b01f8e102c3af43adb8e0a12bf79d3fa0232dae37ca3688e07294e2c7ecc4e2eebdd3f17173351f2c15b0480d4d77bd70955ba86f82214004b622cc92f7bf81a5837326f6a83612bdf65abb33c268a457c45cb7467e074b342a17c711c748c74abbee31541444020a9ecd4e5125e2a8ea3f6030bd677be18183a8a34af16a85ad48b7015cfb036789c0a5daf68883d0c7e401754b8d56cd00ff605be0cad19e03989f608392c81d636de859e66c2aae403c138bb96a58ba69b9064a83e7d8877067e7f40aa0016e0df9b7f455d292a60eb621b8107a727a3378c4b7509d3ec10526c50fc6c66dd4b015c915e85bbbf701ddaf2258119c8b9a5132eafe61bbf38870f35f375123f766ed0d4f38b9364a86e56cdef6f95a815a8d7c48ff283c77992fc6c070eab7d7c7b517006e5d4af532a7c429912ebaebac27249b4f5112d870d998e1c450b98c05d08c742dc769506f2d7a004c24ebf84c10838b619653e27ffcc4344d8db0435e4cb77c0410cc734e36738a6b5f72a7600632d19c86b40c737830b0f5f104443dbbb031dc7ca51ab318951e7817b5d81de8a9aa7f5db6e2d5e7a3cbd8a8100653c048204ced3af005d00e7de7b445f5acff901c4d46ff133e92ef073aff1d9ebf55befc32f9ec38c9eaa6a1aefc974bec2758297e474cacea2ba4151ab1a3ca0762c64a5ca273169d29b83c164f77f266c01bd5075871e17426068ed7aa58ef0d1f2959b19c604eb6187acc57e2becea2da93ba23159ba73b9226034c7ee2498e0ba34fa8038e5e2c092a73ebd9329ea3d648d6ebd47e1776941ab3130cfc91089fd0a0a36f0ecf68293343f275d2a64c1b7d27ffeb3f667f4a19824706235fa5f3f04952ff08bb183c0f1aa1d1b0edfd2e05ed093543788f5d0ac6532e15f912163275053b202d772f381900e906fe070cdb00421e78c16b7387be91adb7b3b3ea28b92548d69c780ea578e7ac66eeb931eefb4067bcabdb345a7cd2022085fc494f118215adfa2443630bffc9faa8fbd9943c3140d81c7532895734a9dd20e31c326531d06f5623c252139c4cbc882640c457819c63f6ceed4e03872b246a3766df69373ebf5af1116e8d5e1b15745bd9dbdd663fd4352d1238a43d5d1e74b3edddfb1c9d460daeb49afccfa0712b7a4cf8d07ccd0599ef3e4e1c9b5c814f3a6f3a46fc80449b34df87f47ff91fea3618cab2d5c04cb50e8ad199d752d901b21348ae939d39c86cc1bcecbadcc6f0e581a3bb51e070507b41ea4294b35456c69cf55a2a3f1296f0df73abac3a9c81cc303d1e20ad6e9bef48de83fc22dac2cfc01ce9ff3f70e00ee49bab2f282ceb6859f989075814e690e36a8d16354fd6056cbff49c30e49b1570363498531ff0ad0979a4518e9ae271f57f883abf5e301c0e24a83f09335479698911bca90269a28c0e040a98e67c9e55f4c91542f921511dd980270cd490766da22306b48ca9309aad3b2393b7b1e9ac7afeff64204081f9c0a8f6a5396d02eb9009901ca2c0a75ffbdae3a38ccd5007cc4f6bec8fedd64086cce5c039e8abc9e23bd694fc8de4e858c89bd585ebdd422b492eab26f4ebbdc1d17dfbba19b5ac458c31320a161a52dea638548205a6ad4ec54875ca34238c059177bfab2d5be0a98d12b3932d0661d33ec655446d0283224af8ec7f1c6874add03448fd8029a71d3c5aa06951123c9fd881d435845757df50444e6cacc31a8cf7537a778d1184b96c3512cd474f5d1fd1214555789d24c8d173358e36400b2d937595109729d9f35eecb0963c0da60d2eeb52a778876059fa95d820d5d34e7948d389dffd53d34c4083d27c917879b053cc57dc43c8263e5dfe5f33c19dad0a7126ea6e8abdbacb318d37c305a183596ddb25b1934beff13a4f24fbdcc2064de8e0bc639e672ecfe45692e9f8164365e1691784b4f775ef369aeb135ce15135c20da95064c810592ea33316b9767caaef842f948b9573b2205ec57d3026a2f2244c42991462e233061549cf9bc66a7b4a8a0fc61f73883fd24dad02644004989c4721a0aa03d3b0191d7fa4d3da102e541fe463936c9365ba30681e706ca70cb3c8ad5dcc710de59e7d8a6247aa809bba74ff4dd182a38bb31baa337841302c19ed89d65e87bbed05465f4ce0dfe89b44d7e9266a8ca21d984c41109d813ca76eb67dbd4e39aa437ff98050c968ec1e40c534ab51d6b8ea2309fab08b3757e9edc5972bff316f6f2affbff458ac0299613734b30dfdad20f797d172cf295cbcfee3d8ee25485d40380d3480a9372a1a6e5ecd7c4c6a9d34027ea6c197f37e86e757750c9fc24cc7cf814878b8628326c140930dbb2041bd9ee87f36ebfdbdc34522cfd4e50c9cb48dd52d4647a06d08e0f0069c104849bf30c8e61cb693dffbc69fc0ab9c5d502a227d606a1dcd630ebd799acdb1e47ce2ad52ff53f6cf4fbd5f0058fb5db915702675ea44334d42e0b6ddae78b22b5b5f7e5aa36519e31278e37b64312479b14aef9b8f12d8c1f39faf920851bd53b13bae5490c847b3312b2e956c430f1d8deea91cf171dee5017e7709d0346d81600bd5f0c41da3f548c28aa50589b293685ba059cd7f3edefdb5d8cdea364f4a42153b0632ef0b7ba18610b71fc34a781eead1dc5a00ab47b6840590ba44dafc6a16029cf50e089684194d93dc881beb62edb7ccee6304a4e71a35915f109db92690461b9e4ea21257ffb62477c20feaafc7a78e2aac2301b66893157920ce9fb114ab4f534d61bb3d17dfb4d9ef9f79a736f7c1d32ac3998356aefc876d8c38722787d564e980a1f15056cb3fe634d71d2c98e0475c79cab318b73a863362f85aeacdcfc44e61b5aeb870de9ea5b5abd24e8c19ab05e45e1e9b8894deeb9d29d65ae99aa94b5047f3c1168276cc2e491aba52b5b03703ced28c63a167f0cb3e4bb4d8e4f0292cf3ea4376510fa49a1a5efcc00f23c3cdf6402197b81262e66e17bf4307d87ffbc2b37213b316bddd65aa9d64ce6122c4a1545c5966bf4fc4c6ff17ded787ca9a3b3cadee435bbba8f6590dc4ba30895b84d5b4eb94f4b05be3c",
-		"82abb4ff5457b21f359754f151e456e2c0a185c8363d15918bcee0d6d49f12564ac655",
-		"b63b577e719494032062e3f63682098dcdcfe26cedea2a40893c847a331e4ce9",
-		"9f1d08be539f1244f0f69ad2",
-		"88dcdb0309f8c4a96ad5560f8210eda1f5afb31b85b7a8b15525777748967d4ed77c063f65d64ef19b31044f2adc690f5e457faa1abe2e127b38c626eaa94053c9ae1b6b4d0db1f02c8404b50f58210cc9fcc6fa4ecc615631da631031cd6253b4a13a3e88295ffdc775fd4bdf29655d9780dbe02b0a82aad4c4088e90b51f170909c0f98ff93ca3926067ec94be05841603db4f913b7025a9ee34b8d8bc629ed827a2a9857e0814d36b83cba21e670f8f94ceb4be5757e0b8782895b5d8605868e4f584b5bb6a5f3a94edd9b23fc2b6fa06914aec970c260fc370aa245ca68888c90c43eecb68474c9e45c53a7da055f5bfe39b56769fa56264dc8bf4c1616e30262bd501ff9fc5cd78f73ad89e093feba0393a11c6b2cbca765ba025c40dd0417dfa644fce96db5a0362235ad37a317145e7b5f3c7213c7fb3c393be57a1cb55035f06da1f0bf665653c5fe8a0f3ca67dbcbfc59852694d34819d0978cd09b508d103017168f6848258493be737cc24c2112f2afeabf41038bea1f74bc8656d9910b77d33cc691a0d9b12f7c518ecef93423cb4871949a518d2f06e5427823324275b97110f8f88b0d14788741e617f4b194e679a1627da50376a08d4f23b005c0446b46d4f534ed85e4692e7946ec818437089425ee30e47de995e8774b61003801de67939d9fed7bf0cdaf625798d0d0d04a61a2482217b890168e36f20cf1d6b81f9daf1a49a781567c4363ac2f3ebf0252d5adfbed17f98cc264ed2765aa279b7437410ee8b4cf42932e5055f4884deefd2a979ab1328f97cb750b3b7e4615b9c1c61659c90a5ff6d1c736e785587ec85040fb2c6decf789c2707974bfcbd0c7f699627b31e0762321d55bcc6acf1aabbd44abd7766d397bfbb68c424b311611d9eeb6598ca3126f569f688455da8d5ab86eb01f9c96186858c4b5e447aa2b9ca11aa5453f731beed4e09f95bb7376e200212e2f03551b8b09a19d6910f25898d692bc20bf6ed3ac9a0276db560de5c9e264f4db8fec6577042fbbd4510bb7070086508ac451a1fda26582c259412fbf1bd60cd5e921160c2604fde559b5ed4df52b805010b225f999450adadc6e108b70f169a3d8da6efbe1cce1c4908b004e928e3cdfdd0b4c5f742fd72a11c9585aa3517486201b6d9a98739b77970a88072750d29d005a291546f13b576b4249d71f04a9abf8f653ca206d98f738af2a1203bf0975f0a40138df054ee834ab73a3b1d7036567369a7ae15f808904e08adfc84b34a0e1356009d8a82e51c3e8f2170908179bfe47be8ad819cb12e85b6b76bba7c9b9398dfc00f550e32c171b4d5f2d9676063efee0b0b49660c10260ce052dd00addc3359e35c25dc33066d4b05bec7d93f71e0ad7d5ab83d844c7f33137894327f464260688ea4ce9847046e7dd0bfa48d4e15277a9586b4742daf0c5ecc59aceea6867068b03c20aad38d04a814472287d809a9285cd4dcdbf68f3f4ffb794701f4c265b2dff4aee55c9815938689162e08309df150538e60dccc03d495adcc560fb831444b922a6375845cef5dec56eff2910b5bde5f25f0e550ab5a13205de91d20896fe04a8ecc2c83d1371cf381424f8c43d2a5ced374878405f52bb92f4fa3c15d29ec151508488f9b4e42527921e245a8ee4b5d6ee95797f6ec4374d79acd7b467454a1d7eda05a8ae104534b23c46b27581abed6afc3ca555202dda94fc2b93501fe78867730a84f6f726dfd7364bc240b65d6c3022a04e09c89e36a809fbf244cc5522315110e9e33c8a4e1f1396e3e51fcdd53d9ae94fe7bf6c6ccef0ce02048a11441de3c25aa9787c577501977e486f8dfaa4c81e3183e648311148ce5cf3de56878847a9d14c0645777022c158670377dd9553eb63eb17e19ebb06202be8fd9bc2b24878cc86f9938e5996751ad9ca04b636497199f7f27dfa0f5ba2a01c3a491bec6dc5113d127f6aae38fa07ce7539a0c1817f7f0de0da538f4d85ffa394784a42eb50994e28530e3997e3345db28bafbb836fa463d34146d9f46d8d2b28b3954b9bc7f84046828e9b55e2fd663e562aa95caa97873f48f0a003d2251fb3ddbce0b6072fc17e0d3f99b655b8f41e8e6986ef7526544222e2d402489eabed4c219540605b9f5dd321ad902708601e85bc874c11efedd072aab7e10272c87b08b9457223de9fbc3abc2d1346656a524e9c67d79d4053c4257e886d6b430f5b7f57b2e5e92ae69273c1705a3074d5066def69fadea1af8fa9b3bf4890f9cda4b1833e5ed27f22bc4fe4cf452880c7b53320bc7cb748c0af6e7550ffa84e4714ec18d208131ae9e3edc6cd6fa2c60ab8ebc1ee56eafc01fbfba061e55014b9711eb58fdd01f8936d29dd081565de0b175b02989c5ff374e6f58c3383e9bc00d8a93903e6a221c7475e15aaef77594849af877f3807a76e03bdd54ff0b192bf34385d24d858d6f454810ee48141d73e3acf1aa3d19cd4c723a634cd8e25b4fb604c744e408dfd82961e46e8444f001d0991af24b3b6ec57ba41fb45122afc73ec6b25f501f1abd46181247945729337bf5083e5821968502a5a696043ee696c290095feac000957f968ac61ccb572ab2f37008830ab9a81d02456190af99873450b52df1888c3d8b6b13df65a9bb36a4b6d0538a0f179daebca2bed6f94b4670560fc5471c3770f2d004b6a138b8243068d754fd246e9881242638c6675f1611f237146f6e0f72ff2fba96f479fe0a662a81f40928f5400a0bbfb5ed07a87f457d5febdbdd6f323e2a59f749e6fc8a51d08b023734c762a91cc517401be57ffdf6a52b9174ea153abf2190ae2642955c3c02b4a15d72456c9d2f323de6fabbf56dfa3b566f1aa688c86b662bd34cf2511cc4a30621b6f1f1ac382bc1c4fa4c0d4d5a30ae90a5e54a9fb4afc1475e7c612eeb7f0e09e894c2004cd04126df9359d525d7f090e4b531916207c38c3512341c84218c86fc50061043ba1b89ddfb21cd756b391cb53e8c1cd55352be05efe562669e3986c022e30c79a97bdf087889a392e6da0d72cc7ea208aaf23408df23f3a9ea9bf9a935e49c9994a37a5dd0faf1267d5f7db47cf64ae1d3ec166466b2f882eb21698aa375cb50146c0e660e9bbb38d7bbc1c1c6d8333f7031d6a",
-	},
-	{
-		"68ca38fccd585eb14f953358220027046c14ef965478d3d8f206f63fef4fe3571a1b53e774b298c347cc1b69cc426d39575ccfabd5a284c7a87a0698cae9efe40543cb79f5643c3c3057a5fc991235f06f059c44a7200b509a12e864fbd748001a14790f78b54ba80cf0a4a603da9672df32b68652c1d6edd3be51cf969acfb0ae49c026fe0bce0bfc72b1ff4c47712b7a27b2cce888b9bc470b8bdda55a8d53a34d79a25947ad55b95e5406a5c5311fece3ecd46ca590b3b01b9055761da8196b21bbc468681922c66d286c32598b1e3d77f2a91d835ccd9eec231409cb2e74ede9385552517718be9f84f0f9100e368701dfa4843b7222279537306065a54d4edda3a02f1ab9edba3ddeb34dece9d5edc8797103eb942a80cb5ae130ff2e7eddd11f0cecd8f9a615d75963c44238b10ab1230d9db7371d8291feb2912d306efe4f7aea2773903d4be9a00f2bd8c03589e342269a79441c0b42ce9c6fff0a6e4e845876f7e9b342d25351fe2b1233b4f576db90ef1facfa617b96d17aa03fc824973e1c80f15e5344b0516fc28424b7faff47ea1ef4e47f6f7b50e91b8fb14027f05ca7e1bafa266a4b952cd0b9e4cab82bb4d61f99568e14a6772f36296f5d19cb04fa86ff20f04ab61d1a6f01e5282c99fe4c3254da46fb5276317be58e94b1928e3791af27dc6544f6d445dbfc7275fbbea74f98ee4aea647b654909f9fa9c88312d3759099c9d0070e3db6d55506813f8b7abe602964a7dfb9387f58e237dbf50b4185a50b65ac099352dee8695017e4dac644f42aecc3e415333cf76b08fc764a721b45d7b74f6b0a2e43637e5b4849218d3d4c6a01208f345d76af56631590e520d6bcd82627d2446b45b2c68e0be81b3924753a54f47ea27b1e08de2399b34470701c9697eedaf3248db9b28991cdc2c632fd1b376bbda279b6709d5033d1c0a3ee573bdd222ef1afe8a4397a61fc30a4e94bdc55097ecebfef6c00133dc0b72c17e2f93a11eae9fa9f1364f10fa595e8e1623dead10caac068aad3967b9ab2837dabcd8f96a77a25baef16ba84bc93661ed150ffddfbb0369683cd021e8f959c2b531bb1fa95d7a574fe5ff9aae35fb9b4a0a9829c59b932ed8634fc05ca88211da3e30839baadaea8fd9843e0e80d9598a7282500d157ee579cda5d57628e7506617d301c2adec5186708f94f069ed7bdb70cbe88549cefe1673d48c9bbbdc01d2af03945cefe6e25f757750de64cbb9d496a25adf7058f5e32c827fe75e80ba0e834e6a72344dd2aac4228828ed42fd83e4576254af5737dcd9b6c338377d46baccb02d00fdffaac12133ea0e75e791593ef3aded4ae4c9249b8d5cd20aa28cd652b9d750b88111d9b4fbe729e27882206b2f0eb614d7daaf6436816fd80d452ac71c7a7f9e8c595287407c6ab9fe8a242e98da4270b4f1d4ea7243c27f89ed46a567c643f31f967b5f12e518106f3d3e08178078cc714cb6e39079631966a9becd6f02c18e983ceeaa2106ba9043f9985b791027eb5dddceed563106bcdbc48a4ac64bd95e87c708a8cdc33811bcd16c35e193203e70ef2bc7203183fbf60d46bc581f1bdfe62387b3e6c0c4a29130d872c3f8b134e7dcfb080e7e03048c49c0e468dbc44eff4b02e50bc6889cf7600fba58c0ee409ce948aa684baef4956fd8fd4a9c4c49e84e2ff314b7900b179fc66f5fb4affb9ef7a6064354fad8c3d2d50e6f2157576f864a843dda8f547955c4d80a73d4a86b7aaeaecea886927a5ba0e97df740ec7e8b70bb650010df55d4b75f478b07b205b560d45de666d84206c1bffd02ab7b8d1c37f21c47d1711b89d16214d8151a8e75eeeb5c54c39e5a855d578708d314240a064051d8b26c6183ce755be38fe9597dd5b5d198532b1db083a4b856b8dd60bf1db197cf1df852eb6daecffd97287a6cdd4c05307722e0fac798507f75b03e9361d5627ecdb56a3b633938fa61b2673efe6c6e768e4e7055e6c1d55c7113efd3e95151b606bbf169f4296455dccb93da370150c54fc11b3682f092f30381c6ecd218a3d9d39442c8bea61d9a71b174a8b2c56e028689380879cafb7c4bc2691dda0cf6ada039755edf93f851446df9f63267f8b8f030c069fabbe6457d4f63575b5905fb927a5a720d52c351bfbc48f12440a91471697e6b2564b1a2b314fa0e6dff090079637287b635d875f120671561102ad27aa83d9f0cee41bf023bcd703ad670b43ae23bf01713650834cc1e95dd486757f0a4f6fc9337bb95738805ad5e756198579c886eb0ee77e4ba957997dde0eecd84e4c9171c84ad8f0cb23c6a289e037f3a8beeea7965ce34fa47cbd727baa4ac9e6dc3baf17049fd2386674b246aca5ef6b8496f1d17a3175f6fee86299232c7fff682f066cbed895155d475bf9fd4b5571d257534c88c93377b1a600d4c280d42aafda975eb32c740073cffa610b5fd2dda7262a2fff5da7a0f3a875c62949e0c9247827d7a49bd8185bc27967124c34b9725ee961bc8102a029786652c2571be6cf33be63cf867c2b48e5826b31b714a415fe05c27f0862a870d8fb33200719ef4ac8530a4ecf2597b4a7f2e66f078a7505803774889a1cf963083c831f46725a1ec5545d8489e53921d81f80ef99f5e51a2d5992c7769c2a7ec8bd8e0f2fd81de53c7b69b650a2d838b269185c5efd668c470943bd956e3c5e1bba5d3b927b10cee68a75372d4d6fdfa6782c05659281bc9bc56a2123967f4f50cc7ae3379ba21e1617553354b5030b3d3f0092c1824f5d47b97e6b4fedaa90aa2573e1b115ffc72d44fa8209fd8d372c8dc9ee00193b47c2a9a302875da331731713243d02eb5a57d5dc51c35988ffd742ddd75c191f1eb2c2214a1fc47b82db8ea708818262d9583f2b1b98a40b6ff6e94742f25661a51882ef28475aab12d9422b6ac48e341cbd6f38460333b5fa1cfd4d0f43aeb46c21938468fe3f7bc771972246156652d2c58b18c8cecec2dbbc0feb0fae9f6bc022e029111f94e8913c0ad741612a1426b53cff73fbb24fb7b22ab750ba1310ecf339fe12ced6a3fae17b4c429550794a8d68be891b0e30cd28e81de2fb2ecfee58bdf11794951276005eb8a5af21e03c8aaeb595ace652c5ce60a8b98f6897d82698ffbb2e02213e50d9d3f00bb42c8652d22bffb87ec576ef6e206ed6c846fd5136a87f38c9ad899371799f35a6258878418830b04da79fabd80e7290456fe17c0850a4c20e2e657f97f4a53e1a3db65bb5e71bf38eab9f56aa11e6ef71c85b8a28f04c271",
-		"ea196b6a64be4b0799b1c2f72281300c3a2577db44e5d3606b8b02fa8fc46c7aded7e442",
-		"7c86a2c06b7520d60023d18fe73d09c514ed07a91d50d8fd5bff00e7550faed1",
-		"952f492fe00b26028c560fc6",
-		"b3f3294815ce461c8843172efe93f73a8254e58a0e71953e35c15aa89a7bd9dfee967853dcbfba73d3b87fa60449cbcabf13b1206d0cb27d2c3fedcfa695b6d41efda37bb6db35449bd470a23787619ee48f981d3f0b1c8e121725b2289b6d67858a4f9ab41683bdaec8a913ca2cc292a9640efe50fb85a1d1f7b286f45d4448f85b3242f45ab44e3281d759db24dfabbae4259f127d6546ecb914d7e93e2c19230c67fba8a6cba6069023ff7ea3d8a170289c2b4391bb97a7b899228d032b36186dfbb29ae8f0e6c06d753f4c6b21982d49ee682bef50a5c2c8434510c5fa2b9c0349592f33f8d7ad6f7243d42b292aee6d210c61e3f898875b91a17a89148275031b74cb34e628d7b701775dbfcf87c79ab279a73dad14d8eed365eb9f29a007b7d2ccc07ceb8cdcdaece67fa0166e135c9a4b939426882eeca98ab887ed2e4888bbebd5afc9f2da3e9162527262b0fa85903246bc8b80df3060c890ebaa516781a2b2a138b98001287e12a9c68471912dd297bc0beadccdc31a27b7c726baf31510cd355a28e4ef786b30084af66ef135909795aa73814cbbc6552270d5e11d46e9497ba30d6d8cecf343d16e7e3357bc9bbfbc7c1dcaa5fafd8a9b07056129da02e6228886463474c5af1d670bc14cf2868b816cc71578ad807a37477341c8192bfc2e8b1f7bfd58827e041f70384f92bb4c6acc415dde5099a1c2b27b709f9e53d1dab07c87a042ca4af7a2a6ee57b37bf2bb42259d372ecfeaf1dc55ac3a9f211f16fef3b2d5f11dc19fd1f425c14779580b2501ec6e0a84220e7e12baf9e0fee3e8cf499a7fba6721a746f598f04ee8ab4df31fb8fa5ce2d2419d5551155c009f2780cdd225ec2c19f94fb9c8b785ad4574b4da766eabfa696a1994e64a2518d1bcade6390cc683a6e80cf8b163c3e58cfa1134ee743079347f08a89c81478668df32ce9cdd7b853db5cf7af13436f3bbb11bcfa8f6b6d727a1df84f99fb3a5c248b8fd5baf669b68fd9af45298030f3251bf0351fa9b58b0b9fba53ecfd838300790ebd689744c1b7b333fbed76c8fb96fc669ecc6695ff5bf8379dd2a3c270af858cc60894be8922d69fb9707bd2a7825f2eec4a5056e5e91714f4dcfa86974259fcbfd5f20d55923a0a9936fb20e5ae9670e2019336e15f530c0be449fe355a7a02c0938d60720d5b8f4f59d2e4213ad5251c6058312b43d47c44ffc8946a98797f5ace279d3e126da63633c0eff1c412febdd47817aaee466c639e43637c1e179f606780ab490d3f0b3c2d79709f1262305fc87c02f68da2dc32f8c544e7b358c3a5d2c27986a19d13fe736c60a3524e94caa55e853eedeece985d16bfa6c487bed6583436cf82077fcdcf90a05f49db50588f46550f7a0c3a1cfca902d66d25dba8d2c53bb5557cc1d87c8a407898b3c30c4f0852df92d839859c191228d0a47324ea9ec2e0ae84513cbe4ff4aff85e77b8587f1044bcb9775099ebc2f28fbcd1cad58a8ce1f072f2228f559fbfdd8405d86f8262c27c3d95e01016b343c6a4e59dec81b59bb6e3c6109a4cffffa85e9752ed2149b5624417c0dfd1a27bd2630bf59814f15820c43bfa317be59ef6f433c95e8be154a8ae94765bcedadebb717f0d8c24e01e1952bd104ba9620f067554ae0faeb78f13c622c45d97b2b5774a3e30cb07f2cf0e8b19d1266d8a8861f3772305e24ec5c9cb714806c7d705a3bed6385f8be4e12562e17ec3df01afb4ef6f7427c48a1bc0e64fc65eb1c3d3ff2d6687e4c275a019f5ab5c63bbe47e3680fb1802d5835c4d494f0f394de1ae47f81eef005127d0971c4589c456ae6a69855f35635c28b590c1b93f155fabcab59b6c7cd8ea1c4ed1f67093aa782c54329cdcf9bf84a40400de707b894587d6e08cf7fd72fa45b6709a26e97ff5ec1269b8042358f872a79e8c2db1c7ebffac014d6b6f71b0c1c1945ddedaf5b6911668059b61b55eea4737aa307c829309c9ea548fba2bede023849bd61b5a467cd1ab1c61205ce64301e2531e5d58d03c74ecdafe1f5b74627be8716cad0d0a0be60984c9f9dfeae24a6c4949170ce2f589326e0a76c447a578ea3a5e4bd9f18884f18843eb1a78aa2fae06a7569a97551b227c34d429c8e1c8c5417ced93c30dcc607cb32a365d87328aaecb4ce57ab8e74f0d9099e267cfb747a3bca9f76b5f6dfb543bc4b5c06c3646062ec14f511058eb2939601913f8a0f1785249cb72b0bb1c12a9508b23caf490537eec53f614f3e06592eb61f75c1cecfa514cf7b500b0375095d5db74556220131390b77d0db72711c0c7229a5769b1d2b3f5105f3a4370beb1cacbd93ce32f89f1fc833c7949211dd204616c013a3399a22f5325f1a00008f4c8ee7dc5bd7476848721fef843123a6213cb0c0b6ae84233ed01a77a115d06e08990b8e60cfa4f41dbc9505cfae76463278b6c6b5ac7c3b83284caaba4a6a1d739c392528ff5b06bc3b82e98060e3001279a44aabaacc661fb14e7581d1235940cbe067c6b386da09454e0467c785ed0b65d41ff4cf36ba5f63d3ff2b45c11c6c22d3ea8ebbf1d52d770e0ebf2ba0c67c7d3641c145cab474a88119335990137fa82a340c2cc8c453752a3aa801127a47aeefe66d1af1a26ee1cd0e6d935bd548f6ce33a9c204be02ba08f9fa03c685665375db7c0c656ddf3e441ddd96b0d2018beff5086cc63339f26bc8332a5e6a1422bfedb69187a3443c23b630a28b02f8075faf3ff2fbeef6cdf02ba4af47a765003de2254b69f487bb5d038759a33ce6885611198b81b0b6fc5d7a531a7a90dbc3556aa758db1657698cb3698b8207b1c1b589efe5d52790667ac483dde9543953c6392d5eb8afdafa205d325e314f810e9c7722cbf5bb76fd6502733149bf21c60717ff5bc366b85ee9f206bb1f330ea72f61a9766090eabde747b1eb9c046cc8713d5a4f8d4b7dcd7c61f2496c5b467608cd9260382b8f11b04c318a5ebb6411a4c7fa060e08c295c6062ac644bd3d10bcbfcfe2e3748eba66f65d904ff21147faa8475f508f21238d42f62b697249b9fceb905127f7684c8130cb8663f09cd25ea038078e1980237389337d1446c3a77bce41b37b50b9c3a020526e7b7b3bef370cd7af71b225700627060eb65693899d277ed130ec5ed9eee75d4886f31aa93bbf302e0c69c9c4499396b43dceb67c02fafaff8b56698308393a03f60babde883f00de2c66831f024fafaf98b2fcf37a9ce01d4f34e95c9408395716dcf83fe86c7a0f5e3e6741c3b63b6ebe9964f1d5005eeb732ce66402007beb3e6a087053",
-	},
-	{
-		"9100c5b2d7c5d5a854bce55e82f94b89a268da7b66357a661dcf75cba10a1b320ae0e4e1a5b989f9766e57f867a3810a0b5b857191ffd7aece4c796f5694a2617486421940cc12b63a6aaea20d2fac188b318a1c3061cafeae436e04d710654b96a864d674768caee03a50ed6afc06f52d90115df1db5c9f1ecaa4f5da094070b1a447251ad3d4fb0e24e87821ee6d4e7e7eac7059080f77d2b36cacbdac1c6e5063946a376865458c4ebdad3c2afcbba8a82b01b03a7882eee42eab904a19e0aead4ae515b02aa2fee74f3a114bf5b9f320baa35b3225491653f4a69e0d864cbbd031d0805b727e42c2b9530dae0c01cfc6a42af8ca730e1d67b4bb743a072f0a38008b937209d534c2284271344340fae76af2b1dd00cf44b48ab8ee92e8f9cae8845e5a8d338f505cd1c19014018bfb6b7dad487e7c8c32064421982c1a63149ec16f2bf4fe7b50cf3ce1e33d6cdea8e98bf067077c9a0ec1bba6edd5090273ca719ebf6f1a0f3e56f021945cff3c468b2dad92a947a06a024758d7505a4a1bcbe9da3a03e97859da99ed36982a7c23572ab60071566b749dc34bee1d9609e87fe32282cc9adba633c9ddcbf359ef4a83a54af5fbb5699978b487954a907dc9739f4b3f3927e66cf0c338e31c272da0cc7795c72dfe60a5b2e73bfd77b8c6ea58122a913910fe29d3360cef5d398f29b024f0dd225183d538bed2b076989aceaac460e3d45e0ca7941897f151261a024b0adf6d5b62429420144497adde6557a3c53b7723471fb760b6a8b1dcc2b327cd939528f5d7bc16ec00ad99df12f082d82bf9fb7318b3d3ce5b84ab1e38d2ebcb6713c03fd0d62bd083c4af96b4316ee02b6953431c261278aabd96e28f81adf7946e3664446135c825e45ed916ccb941350c84523296cadd5360bfe3e16dda75db10da1f710fe796f3456f0911294a4735cf9968656345b9c3049ca47176194c86f36cf702538df699fcffaa254af15b198ac37eed0837b00cd3547e496ecacf6136c6648a535a235059cd75a3bfd0bc49933b379b72e7a8463c268faaf05f0b27256fb179c9d4c923a13ec6600f83aaa2bee13e30c8e676040c06aefc65ba238a29d403f3a8cc164a0bdcaa1a5f54bc1d35fa4efee0c402eccab1e92f6b0cba94e1bd87898a9dd3957a7eafd9d26bf70866450646090833d4b91c032428bdb9097b409305de669a58e44931b7b428bf1a6dc56177cd944b87b04eabd80c64e287a5758c83db26dbc06f0c772335363ea2fb9f19c833644fe3b3fbbbbf5f9d460412d287eef862ae676f258aa45bc8465667601e9ac46e7d77693936c8d67ccde94e54d746b785ad26aa38ca0500105b6870790235e780ac50b9e3198f5fe678ae3a4ff4f1d4a2177edae183daf2de42625845973fc544907e27a90d868f8634c9d529bbaacbd228a5b4ac7fa68ac208e207a022cce4b24a0b5b5791eaddc6b3b3ef6e5dba41855ff531de9bbca0a39ea743c0732772bd32cd15c4b7f28a6ba579d902331a88920fb970aa75114e14b891d42cb947e9eb14feafccf1393796b21099e52b21773adae8e550f93364b1c438dd7d7fc76994c51860b652974d04a7e6ead207610de149f231422595f4e9ced1674d98d0e15ee841143ad8613f804729524e8a5f30d451611676f70a60c5dcc7127497f4d27f35e7ba0e48f98e9022e0deac400e809170970867a1682c7d2f3ef2c632c44568abff76f4f804841ae462c7247147b6e1debe48802674fd55b2ef1be5b4604d5f60c35358c7d773ab3a3ad0ab81868c6044d4e06a48ddbffacddadf813a2ce09aef34f3b60b666245a032f021b87c81fc506166983f25930cff728d399f6dd48ea1c745ad2da7f2cdd9e3ee915f708db0d1f3481018db1c174ea950ed17247bb8ebc065186758e5403bd4d19a445e4a15519326696e4280bcecd1a903f525bbe1e521f94d79df8db4b35f4ef7bd990c0f2c32789a75f95761ca0064bf251fa00b409a58b979e56d2c44bc2302552f118162891bd78272384c739c0c98bbaca3fc46fbb5bfe123eb25df0e27343e38b5a0c2d0774443af91b64b9d4e0649f20290edb84fcedb3bf4ba491bee8754a32716739e5ab64deb6c9888bb9fd2ada1629a59b16934ec5dee3678dcbdcc7fe5e2f3833da9d1281669b1d108837eaae5180396813883de26b957037623825b0675df431fb06b35191c06229f84cc849ccf1b1e079efc2e575331cd77b3297d2908c048b82b7dd14883f3e707bf6ca38f87c19625bec47c11f54988a97205d27ac51a32f19704391af72021b78cc4461386dc3844a1b45596fede3f70e311eba92b1d9ac221d3dc19f3fdd080c2169348f2cc8c9380e12a7ebf69efa37bda4ca6f7e66919b94532ac43022c0518c04d0a8cd99e0cbac88b7a317a1dac5469534b4fbc64080196b44498e149b0a196bb2d6f59392a21c4a4523ec1ff922a52de790e42810fd9355471169d22b734dde4a3361ecd57e271a92132a8b35cfa91d508d45618ad8c6c1ea209405a3d1d3ee1535caeaa3f20546052fc13aff7a584ff79db1726678344098d8563caa2a2abf6fe5aa03d7af49dccf1b17be85600e7cfdbfff54282394b0fbeafda615185574fdff78d59ec2a26dddba1c531a1ac007cabf5be2e2f0a3dedb9174e0a9da5597c9de6d68911fc66ec9d2b1e3fd71ebb83147ab14384ee303d067f47a324a01fc187f54a98f1b0848fdba2ceb3c18936d503e71887d548c4dbc70b7eecac9ead3393f8cb85a84f1484f2e237b36b6d886f54a0f629e8bb05b0c6839c722149a5b541703aeac04e6eb230a5659b12ed0a668d018f75bc94258218c1f5390b9aee4c0b2836cb76a47da649e2425bcf4cc15c4d51d109e5f78cfdb88137c31b2510264e46f1c4eb6e6b3450ad901ff9517b47a24d508844dc85fc5dbcc079e2d09f301691f401ff5f36500cc66f0617eb4dba389d427c7ac778d78438506608f0961f818a2080ea56d0f61c40fc342b49ee63e730df61f757387b9089e1987977b7fa02d87aec2e4be24b8bdf7fb6286d190f9df870944fa910df32f178ab692fa56b071f57366a3981f51800ab416dc4500abcc19e0c6aaeeb9ca063470993ec749a0bcbd07604516b1d51175ebedbaec8986f67a4d9158f75b5f3bcbe86a83220b4fdf12a0242951f94ac7d52882b1b209b82c4749753ea4d46a60bcc4f3eed033bde2d3d20c25cb46fd907f7052217a0a4db143b2efe8875a59441f4d22ef70d0c244b2de6a7e15581e84c860a6326ae3e3aea6d3972e2de0623d2d852c9e65eed318bd3d86d29595575df60d9050e1740f884796b6657718a294adcf2303adf61c6b23933db93885172e82a78f741b8efc6315a2c88ccb6b11692a346cd82a79334e0c610734e61e6378b5e2ecc161d924778bfcf4475805a0823a0d5a54768d9272ee99b7c4a81b3d5dfe1a2f5ff34",
-		"3c77f30bbb698b1571aeb54653fcae2c23dc16be58603f0c361eedd813ec0c4f63005a1e69e533da93e820e6e4ce1308aa29c60289060ebf24fc9738e8a4874ca4e26a0dc79ee75b8607416bd554737f",
-		"0223c0a6052bb3cdc99a284fa169ba76be2df53b677642a606090a9267a60769",
-		"7d3981073f90c6648c5e9c74",
-		"61ec5230306b70113f67b340575b77ef76d521ff75b754d551e4177591a02351ad382b2a4067f2b3af7e8e15431c7133e98be9d8293d17ef40161dbad9a4f1a4f30cdd557bb9a8b03b5f1b277c850e23ecfa0fc2ab1102e4b1d5e836a606883c3d43527fc3aa26955964b144a9a56cafa7b174d72a0635b80e7b4f871ead3838a955a14c4b8c5c3c66fd86a5e4ff10dfaa92105378bbc5f76ad29727e5bc4779ba3e6dc19bf45020f6ce4dfb3400df05cac51577d58eec21b22839b8f055226b204e641783bb3305b4461172f1c1d48eec56fe6f82aae564ac6688d7b0994747d9b23a24418e69f8a4fc548f854f86baacbdec78b7597b138c453349034c8cad2ff272781e0e6799ef2f8addaf18528736aef21ef8c2d213161e36b2c7815fcfc40747626e0165684e46a9a2275c533d548e52a9952a556168195d602ead86f6bd699e97ca59f4cb2050ff148f5bdfec358dc4542ff2f700db9861dfe5ba377ec7fdc0fcb2501e72fe6873c7cc76b95b4f300857f76e6e6e370119f403b556115b19fee7009f4f6675ad2d174f44002e35ddc360f309f20a3a1dbf39d90d7e5fa2106c53afb0bf445e4cede59cb50b8a7a2c0961d00b2c251f2d815309f74a46a424838ee87f1229273ff3b66dfb79e3b1ce11bd60e061e60e3f37bd7ac896b618cd78388590f44b1a276b965a4b95f2e3a7a175b30fb45dc7a71d4b3a1a33e98af30dbb46a217c50046ac21b8bbe9537c02f05a5780c8a5d796bd6424fd9e9f3ed5932069bc050bf4a1898a0ef0ca756aa2e2269b709cc92e0c5192ab49d692143388ede2bde4923c85eae8f59db5c7711dabeb33743c692be6dfebd815456958b5e1384a109f891f433e7b4a1031d4f30478b05766dd97eb964a28f2f7b55aa6c27c7f4ebf4d47ee8709bf99915426b3896412a855798e392e111789213af537cff7a976b4509e0eb6ffbb8e886a3596a242d16d95109b0ff562c624e06636a3611f804f9b2e252afe8a4e5e868b48e9e734f688f2da2012d7fdfe2d3aca75fd74730a85aae90353417fd52b92d28a5098b6af358a096b859859916bcd5a8f779676c6e04ea461fe62872050af92d08cdf1124bde1e889ace3c923457ecfe0a635ec757907a131ad7c2ca3f60e1317880f843c5e63f4ba59ab2882a492dd1e070b070af6f60e18cca29541206a7b267c3f75a5327fd9b8ffc9b36b57b73b36e586541d15c85253e17a2581e8f8a1518f275cc79afcf2b5c88a16e9bf553e757df089b5db90a9dcdc1867b788fe75abb5161dd7ee1cf37d3f0faa793ddb1bbf1eca13f4220ea63af8ef7c0e7144d999ba1c5a983e74d48cef708c1d28d3c0a168ab87d0ef70f381693f0d438ce013ffa2cba65a8cf6b498a7120209564535b7372690329cdbd74eaa76765962720f06aae58338a10064ad80f5a67395db2c31d36b1f5eb777306395f192599d2f737327afdcd9f14b3f24155a3f974915d3302427494fad756703b13afcd1764ef9735e7dbff920f1253cb668e9f40632aea1e0b4620db162138e4a97e6f0729b14be4a7c3256250d5e7423ba1238c704503c51cfc9cb68db7001b2f597a15e77138beea02e11e0bb98a72f2a77b7260e9172fe7e60483114ddd836addd966b69570db5eb26a0cfc4f8a8b80d26357ed51a70165bc0dd11ad7467688025bdb532e7222ea12f23c44d08d111b0ad4acb2f5b3d6b45c387d541ffc84466ed57acacefb1436ef00bcb5b6211dfd0650113ac369b9f3e4891acb2693c377467b1e9c949cc0ea6c4a72ef9292964275ed397cd2b1ed25fe1aa8f47e90cde362392da5e53893eef6e4f61decae1a75e3b726f0596f09c3cba62aa08bea89984b484d5768296a5afa8b0759dceba530a169d22b81979212b3343db35ce4e4766dd251ea6a47f5033cc090d6577efbed441bb4f8944937e812f12ef17ede76df621bd4cfa31567ade18b74583a2b783279150d584ca13c0d4784b70156afdf9be8ae96666b82def888465cd3df349de427d5f5b3572e4f963d33f968e6780e381ca196bc04a6664fe93fdc8558b21b84130dfa2a646950eb2e927885925af46d7a28d1507bcc3c02ba98318bfebe5b9eea1bd47935ad869eb701cbc35a9aef5efad88ff54eb350a34ccef2e159de8e16135b81105bf799fbd86aa11653b5ef93a1ab1c367231d61b42b8bdb4f04d8d05396d53247d51890be9b56c51cb19eec0fd1e6b8cdc98376b6c6b30963ac7ab02656ff94dec0e3a0eb3f3ffb8bebd99d5889df98e6c77093c370373dd5f17871fb334c7eb12c6ca22deb75bdac9eaf24281c965dffe03da9c940e13fb382fb6be332797813710a7cd2e7720f5b9e53fc0d98fcceeea4a8e9f787e670d60bfc4a849f34571e5d09b9e9c28cdf2b2d888eca9bb31ea8b9239bd19dca86880ad3e12b1583acc3a6d1f0a438ce3b5a337487279dc4ead1b214272d455e6a2c8cce4ae3bb29abfdbe77a67ababeaff5dd9c96b17f589cd4615c0209eba5e4b1c7167b4b739ca4b9957185961529d1082226f85068890c94aa1f1c244259ef7b120e40114926a49c4412b67b4caef1ff3ce6f3aea3c6107b830cd34df9f4d73d7d978b6b9d5c481e9d76e83d649e742b098334838fe50d80975fb567642d3b72c461ef3072ebb1d03c0099e97575bae6a12cd2352d9d296351df6965d736d7568c2911394a73d199743526ba54dd62c56c598f4e78495c0172739274c0b8c96755e489765723a24a8704093a94544f6c8764dcd1ce6b4bf2917cfad27d85e4442b4e5bd577ea1a88c2b79d61cc1be01ee9028235b36444483b4e45da1087bf6d45ca540620de5aacc644a0d5c4b807b582c7b058e140eebca539947502bf73c9abc81a0e3a618b39d3a38c4ff7f94767fd7e6b9eb61e629806bc3d183bdade7e369d180dd2f57fef677e22ce41be7224f11723a85a3f1d14d7b72dc98ccb2816b77e625ce3db3e2c5753af8b079e0d63939079a01910ee4699cb405d4d9c60e4ac86a7fda3a4c9c290662afbdb7678c3a84c87ff83470fa8a416511a06d3216a1445699d7ad7e6980491fd596d39762d576b08fcbf0825243c1fc01ec8300780857c429c607113160a8354f6699b368a87983464472a5754fd58943fca6f6779764fbe6cbb510d5280292df02c4a7ed9acec8c95ad67ebcda71d0f519ac18db9b43b28244cd34fe02c5d694df57410eb54c5e1ca0f8501e7776a811d7ee81eb9d8c80b2ca50a012b5eecd5428af965b217e7fdac80be88a01f76d473105b027eb557a523f13c55e1670ff34627667649573e0f19dda41c525a8c96c2866a88bd73e66c786767e1657960f6676d8a22be1c6024158a0f0e4ec761148b5a3d8ea481d8fed94855be82479ba23213190054f937838f0e35e00aa74c89b294c29ea25ad7e96b4b6fa952ea8f1cbe5397b7c86d0b74ccc25e22c88736b045fe86110bffa0679f28a1f27162b51410498cb7",
-	},
-	{
-		"0fcff2c29cbb5cc40bfd2ec573ecf368275ade6a00e5730b77dab17e437b46524b3814e7f470acff6ddac4e0c6b748ed112657120bca1d83a4ce01e74a473995804d7c74bd28732a02370ac8ef52b600790d1284d82f077cfe096448509dddd0eb5944a882b7d384efdd4dde3003dea910f12de82035651e3ec9668e66435f519da3fa1f5bcda34aaaf028daf3068304f7b1ec18e65136241a9db281e011d27db5cc9c1099405a4430821e2488a228805314983966ce5d806b0f014c21d4c9d6a066e63aa6407ed6c29cfa4a3e22ca913762ca9d31271d9c371fe858f3b22e931814cdbe544b9416e88f6026b12bb8e88d8285beaaa35be1c24339b5f567480d7b16cbcf6160e549ef4570a0702889feaa0ebc54b11735735b6e2850d5715e5087291fe8890432784aa219bacaa2b874b075c9628cfed5e76dfe38426f9693f6bfb2de49b710c101b2dabb7c7c74f12de9ba8f75b8645d25629568d12bfbc7eaada63364b6f56569cf21e54c95d6797e9008f3496c506ecfe5d6a010d168fb7f0e2ee3c423492df36a133fffe9b87d7ac070c32cc131fba6089cb7d904b25812e03cd6048504f7ef1736ee00ee6b7aaedb3dda9c6fd6437772fa5076aca9888ce55e906a62875979bd477aabb2f4598d32342aa10a6d187c6768f213117a9ff6d830603bb7b9b475002e20b2237a4055ae6af6b8d70e343e76265188a0f07e7820dfb3d898684d99966d4bb9e78b0e95f5044dcc12810a89a75b11474c8fc06c6e734407db91a072ffeb2be6773a7c6c3ec939514b43daf29feb3aeb7afa57e96d9cf0492d90bb2c7be613f2208f5f5f5898b0a3db8a967a75d065efcabdd83759c88086583bb3d422c6c6425525a1adbd515199dbe71350b77940813618b88fe139153974c80d968ed4d9e3f97a91b7cce250a7c963f880dc38011250b9a131f2b76b677f78fd0e4cd6f1465182fd1d644dc42db0bcad8df4ae9f456841765af8e1c1775abf85a69577ece6f9e9035e36c88be784397479e713be4f5434aa4c166bc4702a4916c0c003a6baecaa182372a30af6dc7e6fc4912d13e662bd327829f6e85340fe130001babaee64d211d6761bcc52993c162a692a10cbe7434310392b64792a777a2b31341995072a6b7d4538cfde74e609dd1019a9f75cec0896186c0f42e3896d15be87aac5b11642f74e11d5c2f7de9f07f848ff543507ea4d73fa8f5683fc6b41831606352c482c7a5a013c51e0db59d824582c595f17a6d2113528943194d6b5aadcead62516507f178cd0f76729cf8b81fce4e0138ab224bfdbb8f16f8ea6196b90ef90a63f0fbdcbdfb5320984be8a80a26b932d1db7ecf870dd67fe838069136ff9b9ae087779e82cacf1b06a7b310ce6c439047c26fcec0364ea87e4549a544d540256cb7c3ef7282fa792aad89e919dd89519fe910501f5ef88da43232e917730e742ac2539d454e066feb9058f56dd246fdbb674dcab636585a788b338ffe41f4190447a65985acb9613d02669ad4ad888004c65acb0ca315752e58f51c9ae9259f20cbe8a668a207a5a46e30891bc909108f53db8bf6f0f11549e621d4cf4763e0035c867bfe9e1192fc421c080b25289a78f4167fe517852efdb6f3ccfe67ad01b4337da2c18f35bdc151c5dc76ee66efd27d5fc784e4e6829bea4f8a41ec8bf61ff998d178ce9f4a10551687337d7705eac6cd7fabb3f2379e31c1d01e4dc63e475f0fb01d9efa3de400b5177e2c2d68f2ead89e9ecad62cfc97fd0ad5b3391d0248dd2fd7c75dcbd802d3463ef0af21eb77b07a3286a72f1e9439f457630159abde7983a5c74f7dda12b40913632afedadb691d62003c70a46664fbd976457544cef8ea863858505b1c596e7f745d4a5fb657b1c694226afa9756c40d9c49425b323ce17a8531c5919b24010f715b5f27a300ee37334931ca9ff5c83c3f0a87713768ebccaaa15e35c56f3536ba945e5d954c94c885c68325bc4b51fb55d96c8d424849ece9a812af0747d5b1dc240f71609439f65acd1c17086e025e376eeb79a7255680cd692fc4b0f5768d1985fe8a1a387074f58c8bfdea8e5c11ed379b845ce2052a5b24ef0c1a658923eb87adf5b01e6aa59ae6937564ef97421722c67404cb9e5fe07d5bfad2e52ebe6cccb41ceb1eb2760545fb6a3582bc4ca572b0aa4e4f0a2ecc56299f3b485d980501a4e010576615ad518fd2d43c1f79aed013ed1f1e1bdb74357aaf7dc84772c9ec62da43c8ffe11a7fb3eeabc3584a936c37b28a438dfe78f89de6b0d5597ac1bc55057544e68fb49a6e505db69af122c2a3ad06219b7f2a2955db0ebf55c06baac5e0efac609436dee484857f75a8421945484ad0c7650a1d3008cc85c938208f19002b7994524878d6ddf85c763a65cb72a09c3a059657459f13cb584bfbd754fbf2de904517092be4f1786b2bde26ae8eb2d884592fc9e84395408f8117e47d1ab30d5fca167bbf07e41a33c230d240e3aac53cda9f251e24659da57d721288252fe7ff3653ae3e47b86209e9344accef0009b99f2ec7b3845558f1d77b89fc9b61ebc1b589fffd3261f71b9631e87541e22ed100e694854bed771358f10fe452fba61875a605b8080cc39e3eac13708e32518f28e60464c38b782c7c7800df63b6e7e95ced9154ea54e32900f6998f38eb1e51c112b6949e2eb11a96b1ea0a68c1e3b5af750a99c9fdb2cae44c5a1d37686ef87b158d19343e23daf00dd558cfb91e6f2e18f8e806abb2faf80d082f657717d08ca4e9c0d30d9bc30b612bcb1a3a3a3843231059dec344c6c04ce625b3fe064092e00175fd9d38f8fe54c4088efe30d211412be01460a6d4ad8d0a618b00a21de0a383de30ccd72f119b27a08958729a999e8aadff21829cbe8cfe398d90476e33db4c64981383a9aeab4a27f3bcb29d4b3d3b3a6ebdd71d3ac546b8658e269959630de176819b153cd53d2091efbddd2cf9178ba6ee98e1a3df9a095db0a2b713a0988a22239f5f08cc8f9abc3d67d9267f54dd5dedbf01bd490b0b09adb21d4e5aa7707e36cf77034f01bf8c7988a2e8dd7046bb2f486878436371f1258f3f7026afee6d7f6560be67103ad098edc9665e00118d4879f58bdd677cf2e6bc631d5c517acbb6db8a1debb4fe7492b7daf0b7ec7df056637c23caf926a1a589bef1db29cd81f547afd0fc9e459f46108ffdfcfdee43515a771c439dbde9177ceaf296a8749be0146cdca2b26be8c2ebd6cfd9b5032b1f7a375307f54c2f622711f8cf8684afaaf17c4da3e83666c40d26adc239c8d1a40024bbf560db5787ed404763d4e70ec6635c6a4b82c10f8ff7ad42217613c57648716ba94cb33129f3789dc86f9c8ec2e8e90e6bba0dfba1bb3dc3215188979a09f33346a6647099ed0e624c9ae10f83da0def840bdb25b718e8d86a616ff46b5327b1f99c22937920f5b5bbd6b53fa0b32f24befa4a7603234e6d94be51f00189a20b15c49e8ee58434a15ae9d10b9cf0204bfa7ab1fd9e006b22bebd22b036c4bb4c9949cb7ecdf01028d9f12466e144b2dbbf64d95d65347013e192d428678f64f0d9306f97208fb00a70d4615229143dd8890725ee3ba6021d38d6359055aa812edaf",
-		"0c5fb7075f5e15a6733737b614bf46871e29417e4b140bae6e10081623f5c52f557c36b4da4b5a4e82920497514b1e6f745fedbf73f86ee10976f82c6cbd5bc13a917514ddd062",
-		"e70954c812cac03e367e99f7b82a6dcc073d2f679f965d524872756ee58654cc",
-		"5f6267f6b3b21423267310e6",
-		"c53868c0fdc14e891ae1bc257fbb13be210a5d9cdbd9d18fe1b474f9a1929dbba3f25222d8fe8c1be3eef22352100064b922fd9642ad128a202b6382ae0a67c8affb0c5bfa1a80e55c1084cc372485243df872d677a80a3ef1ca3589908bca621f6f50133eb762cb9c05775d13db7dd3eb65ffd3eef96e8dd42928facc68390f6bbc50b17e1ef5ea6310d8756dd177be2cceb63a97bcceaa046794915589ca022d90756b02c22e8634c0ed44192abc3b8b1e2814c855ab27aaae3bdd801a73e6209fdd559ceb59a94fd98a66d12a31a643ca2f4b07ed910bc390f77ab89395d5cd1d783d8940dad4447f0452991b209cfcd998b0c814cebd08f9ff15052818bab0bf51c3b72ac1020d3b0974fbdf4ff941b1ab9c01f284fe82f2fd89c0aeb4b9fbb0a74ece08b3debc7b65e7263e2922fd4aba15ae3cba7885d04127c8e06a67f244e7aa4556f8694a5db6653f6e48d6de54f9e4024d25d3236d4f933205b6a358aa1506f832ef7d556c6a1bfe4aabfce51f3b5ac64bf6ab1e665bddb12fe13db9f07a55db3da3886df36ddb89f3a4939b1e9e5b701301570e3d01c0b947f498dcc6af438cc15e6038cb78a78986da0316cab67bca3e28c95e6b7e6b36cae9202cf4a77a0e15d3c3291d267aeee172dd587a944719b9fbe077603b4d39d4302b9a6415aa07af309a5e1cf7a9379552becdb4bc6a0b5c85d2e63bb141c405afc58a8b2b4188b3883a24eedf98dd50fc54725c440ccdb03514a6f37cab49296b6826b6bc7d7ad8cac0a3425eeb6866d94119acdad468cefe162a29e8831c77aa83321e8ae3e20e968cfe51dbf2b63f4e26c61536e6be4f63d61bbd06af38023b15f4fccb8ae0356d924dbf646bff69d1ac0d6e1c7f40b12d6d16e52d1c15958add5708bd38c514e47fe623a67c9ec211cd625b398fa7fd67a23e6e9f65d42dda2bae94524372fbc1a7e0ab3f1c451c126135536e73c573749aa60177dfb68843752b010e2cb9c1afaf51c94a48cf8ac7aab3fb200aaebcedefc6cccb581848da0121af92d9f4be002f0c2beffdfa65c36bec80e7f62d7009b1eb719d24b96e97059e6b50a52662c2c833738849f342391514349305228b29bfa9c7cf2a931558ca8e704c600148a28bd871465b23af499c11784aa45acd051f276d82789c58b14f12619372be4bc3a285f6cee21d65648d18e61752d6e7957736d3385f8ad36702c451c61ed475997d6d9f11c8be5257d8febce329aa701028aa2b5644b8515a95b5e866780e32754ac2e6f2e31b2c04a4ad35cbcbc25b23e9bf49cb1a5d877ca30880741757c29303af8676546760016f1538991b37cf0cd24ad3b1d877e5e1bd083e4b990af6ff5c0b28e530db3f463d21e76c928c8e1ffaa6c045937ea171a9071827a173e231f50e95430ae4895932c88ce048058ce6d0a50ca5c1842506158e98bb2912a61c7991a2256c97cb9050a4bb3ca32594622756291340561e9e584dd2e096263b6ff8eb898ae86f5f24500320d2d0ebb30d84cb4ef876a877dad23a611b39bf0cba5e22f2850e11c298fa23fed40691b83acc87136f8fa540b1dc40d1b0d0bd489ee9dad785c121955a094a2c6bd3353e142c04f7b88b2eb3305fd00d5eddb391b73fa2b16a6357aaa2abf2059ec979bd3ce06d5fff1c325bbe5c833a101615750613047d8155ac0c3a0734cc6aaeae7cb65d7501cb95f9d6d1161d09c961c0681547faf7983ed2efaf4e0fbb87a06169ecff1d0ee540a9223a73f75584441d4669cac09c2dbdb8aa2aed74eb9a2870f2021eb16e5f5c3e79a24d7110af4bece22a1086d27642550cadfa4f0e03f2c032a2745e1c9277a4f67fa4dc74ba056110fed3a63f643567d079c9430b8d5b3bf57a9b3f02d486d870229fee5462043b6bda8d265c745ddc1b8952bf91828d6db2edcfca7051e74df9dd456dca5e04ba469b9ff6a8130aab3903c05659b8f31cf4ba4c22511493a36541ff9d88c708dfb714d52a3c0356543e6efad37530b598bb63c3724772907abe4cad39c896c62daf5b30cd7d37eb36a7be2494353028c76e8d148b018c7bb755c45d2a33f61944071bae8316881e9aa37e4ec2374aac4f8436ed3c7db2092326538f07fc6644e0239899e3335f73c1e3c4602b12d19d7b639d4968974b6b2703ec1add8cd930cbafff4158f68f06aaac83bb4a2e31466e2ddc247ad71c5f4c49af7defd1394e21819cc24c78380caefb2ce87c0d1050680313037def12ca21cf67bb6692d6e4a9e90a9c9a0b7118ac300c6c6f636337aa25bc59cf1d9749dc183803cc0ccd1ff53210352795c6edb49ff1e5e8ebaee7b3eda6e3c0c340fa60594115e37fab60133b8a3b39d2e63db0bc6a03973e236fca801553912f93feafd8b96766049dd2066f3c5ac9222121ee9d36cbcd8f713adc8779949941f8a8dcc92ade62e46e9f1b292d5f7eced14c3bff50a811cb762ced1f103652773ef946e18569eb5892626627e085d4ffb3102c1586ddf88acbaeed903b22d3e7ccd8b8ddcdfddb872403240bc8e0e46a068f55bbddaf90fffb9a914187aac2ceedf21fefa1fe32fc7bdbb9fd76dcda1fca7b39107d308d11a118e47499dc4092ef0cd28d0d9af84440f095b4feb7adcba198894cd89a324c60ed0b996c520d4b33391bbbef1997256af7ba7ec1069244359066af81543ca23105742fee3480f890373d3205236bed566cd22a62bf69f8c0f27b714f84a203bca1605865e2cc2f9211389e0df7a4b3aab9d10826639357efe1f5fe64a1bd6d06d0b5605658c4d2d12e1bec77e70ea393b0a09043dd7d6684bd53f4c883f2f6928d99ba91873d063d43600f9105d503b11d8dc2b05e34b4fcf18e78b2b6c97d3b2c9249a2f6566ddab2a8a67fed6c9f8af2f4ef98dd579f2d4fb572e178489c503df5d5f03bee9920db347a6e734ed72ec7233387f1579c13725599a33a90915ddf03725dce20fd3806abc1029a20732380596057830ed63b6edcaa4d4418871bbfd58de1d1f2800588ed207f2016e11abd1baf1895f6096e2c75cc5916836a9ddc09cab4c28e53fadbd7d3080088131cc270095315b61011b0cea5b4d64b647bbcea54d20be1eec0992c72fc9c9771cae19191cf6a6f1840acec1deff605626d0a0d79ea8fe0af63ea75e80f8141fa8d7ca6f4c99dc7e78aeacc67762ed0134f1a0b053debfb9ccb145800b9818c2deb46f7124e8655f37c3291af107ed75384afcedb44518ca14cdea341c9657ec638531011cb957ed6b3434b736ae8c8199684cc58862638c5f6c07e1cbe8ae68c5582b1697ca9dbdd01e97023138a9173d6b1294cd99514a28102e6912b1c87ef22cdc611133bcc111e95c355a26b20a3d6f0ead66e932c5e1229b0fc17a7d6f78134c69beb362ca75017b1bf1105ac8970fad48acb8313cb3ff10e9d72c4ff11f95c2dab59575525c98653a9c7d31585a3742267c062d6ffc7a4303a3e81a45bf39e1ce2097623bba70f216aa612c64ba06ed6d596ad6abbdde69d56ab45e25ebcd4e485824449550232be26f987c14008f67c9db9d0f709f567fa44502b9e0839457e5f0aadec0395bf5c38ed8de7529708e58c0a895198fc8b2570fb6e68547630ca7f313526d392ac4776be973205f971854c300454d5",
-	},
-	{
-		"95a17355dfa9d378a18ba20e58aa4b8711ea1d6e3c65e0b2d3c6382892c7d02768437d47ed50bf8edc619c340be7bb1cd1d88b0d3d6bbf1031f738c4be09eb264c686d39b92cc7958e63c9994a84b61b5c412999ace8a9dee0e2a29eeb8dc537f63271af5f3844ed9c0d86e6913c02ed7d2b862a132f08f311aa92fc3757342d89a5dce8dd20d5792d5c60be9862ab168d3140a061489472f2266f297da357064833ef2554c49f8120ff40b961ebcfee1d0f8e7e5722f049485f72c502c9cc4afdbb70517f0fd2a00e12596ffe285d1b37eb998e0e89d756e9491ceb13e83610a3a66122b533c2c3461b3244438f5f7a7af8088881dfdf6a29fb563ce38c4c8632ada8e7e06baa2686dc6aca6bc944e5c14d6e432c4dad554803912b8fddb1c18a59a86bc452914b2efc1599c5597f87a6edcad33a7728827bbaad0a975ecc22b7748d7cc71ec7f51adc8fe0350e67dcfb31af35a8d7b72391642e29c2fa4b796ed8f535f6bc2b1198baf1cec858aac38959f83130af55c21383ebd57d364eeb0e442104004c1599060667ce5e1191e76a89199a386e5c4bf147206e7d6e598bb27a90b3c6a54cccacb39a0ac42bf22eb40bc8ec7925376a6c57d8eac6317578ac052b72ab773f572ad961ee05531cb95ee5a6d70add4176351960fb4bd673f7db9f698616a8dd41823f2f87924c40f131e6c83bc40ab1f92312f46ee86765c306cf4a1d77275ef9668d80f9d9c1ea0aa7b2456bbcf764e009584ef1c0b4b4c683fee3fa2641f48ccf7485a8356fb3dd22f848deefadbef8050de9c5c19e8c449c6f3ec2b1324f80a7d428dc44dbb966d40244c3af03bcb410a57ad1430615e07553a22686f1a62dc6cf090aaac3707ec5b44274b7fe28c7a3a298e7a8adc71e016944875bebb421babd2b64809be3454f25b90723e2cec68467ad2d14744b15de8f9c397a505a340e85998e207cd46fa18d76c46f458af4ac3821c0ac6cd68afb72c376c31daad1a2435fc2bf333260c1a82430edaf2499e7455a93b1301eada2e12365ffcd36a1119664d0c996318a3e55bb2c04dfc5eb251f7fd64f9d83f27ea6577d748e1f85248355ed19867857dc3383e01249cc37684b0eb8e891aa663801e4ac8f0331b38686a19f0d19f6e94c7ac95ec395962be0a4e3c8358d2f6d8f13191e164ad29cd1733bde8c31c7d8ab90366e26cc9a06707dcfa60bfe139a112db827778ac348fdfe26892fed61db7e9849a464e3aad561797b6c778e0688bbbeaf3349727b4670a2d0a08f317b0dc9c4b12ea85c0309d57e754d0c7bd5c83985fb82f776c968189908a8ca83b5944767c2efc3c5f898436de54fe8bb17224012a437896d9fa106a749d12aff657266276129ec5ac12fc7a77eb06296d2a2a876d931e479d3ea201cbb4b1b20bd81471eaa33786c624013e1f07577c2171f38f0511c6924078a40c2d55ce392dd2ab0885e29f4c06907a1597c181b933853838970edad7777ed394c491cde27478eafa5b7a36520aa0779261f94b957e83ce058298dcfa07b08ecc425caeb6c599a11103d7631e77daa0d9d3fc6f42703d57f2c624ecddd56b9a27b848de7dd28f8ed656f1e4decc95a8908217e2f2453ae50b5fc1d9352d735ce5bc2b538eaae25501d449d090df793151811443c64f28d19eeaaac4081e10edca4c4148e723ade8f7e7b988b732ba08b3ce4c8a0d655bac4ff66048148135decd7727a49ac59d82ad470b5479c55d3d8399b790ff033d3ef99d770e1eacecdc140480aeca1e2167553cbbdef2090c7592b40681b733b0a0d127beefd49bcbe8904c975a5ab8b1afe56d7ed7667b5cf92f537ad6972b876843364817c20400524097ac9b405e4b35bbba0d12355a0b54bd763b4491b2acd4e8e4fcaaf8fcfd398499d4c4e81ffa93ca07a5ff51a1540f178f43a931e07e1ad56ab5ce57a2f7dc3ccca114dc9ba8a6934e95f4efe9f3f76947909b280ea5fd795bbbc0feb3ad2b704e305cd9d8f37d178961f77355eedc9d7f77c58e1db2f7797eb8682255939293c3ef7dacd2eab46c4cbbdf929aac301a13f59831a88fab173803399d96dc216abb9f079e79bbfab667ca590266891c8a7ea4bc1724573e5c5a67e9f1341b5bffaa538e240f78da7733237999ac86141b2ac0324f17609b71c885630c90befc3b027a5f01e33979165ce2a00968c414838446c2aba76e1d7fe3707c742f68af21d30e23b637accc848f6c8df820a27bb4e94e5090ac6e008fde7cf3fdd5931fa891335ec8d01b5d6f77db57a87dc35d6701adf7ae0bf82dda6511c83ab4d7d3460b221eeb3d6c4aa537924db5559b1c6739040534fc330f5144c78bf99f5f4faa715e85aebac043e2529197a82ca40f65a8149a9447a9e58c61618600b0c5ab221420c0cee114a133a648dbc2eceb2894ffc329376d1eb3ce7039cf30ff6a53038b23c26c38739fdebc7b919956ca2e468d577dea6621a8d66b78075ad26a6e6d8e20c9b694698540d516ea2bd108625e5fd038b5f1e19c5d5993b82bfe16897c375322dbbca81c81cef6ad900f0ffe5ed02714c208a12f5234d78e32ee07af155ad1e1077a0d8938f426d8f326c751f6ee66c8f707e8493cbfc76f9ddf1ea329e094315a91ba9385e16c890823db0f0231c7f939a042665009d5edd8e48102c515341fa6eea33cc00fb5d82380d735b29f2eec3f61428f7b186d43fcee46b2037ad1aa6974d729848cf1a80dc8ddb0580c9c876def06d8f7642cf45263a655ee77f047fcd76171546319622bf71283f3bf0b519e123a85765779c8bb201e99981ed184e642f63aa61f9cc206bf45fa6e514bfc637671d9cdfba2891bb112a3cff438a6372ee0dd3e7d9f352ce52f8b367b7799e1f963bfe50638f0c74b94873fcd3d66fc1e342a8bd36fb8b88f33eefabb78eca4dc9c89e2c57aaa010f2140dc5ea7c86cebe2f8bf42a167d1d546cc80bfa9258c35af6efb1a090c293a4cf588e4bdf5c090ee7fe38fd7b5551e71e5ce2b0b5a50bab95bc4c257edfc94d37579816b4a2249ba05c991bb2ea02d047e480fc8a8ba71f48f344c6d20d140a64ac20184e45b4eea14d0953370c237ef0a47a7a2f22997715dd3ee8ea52f24ffe12674d571b3bf968454ca051701e411499bc43bb55bbd033f9b81d4baa6c49bdd49614efd20d58175af868ca16a9deaf65216abbdc3beed5f30b209e786a5b4c006f3bd27d93e9d78b51a1a2fb7f5160a0bc1b7df70952ea1573888ddde3d9dd5314b0d0a899a733eb48d5e6c7274667e362e4da6b37c480aa4d0d8730e66483fb1453a3aefad69942ac7f09d3c571b6275590938c541336a121bdd20722550236a9a5e4a37c7de628fceffbc260b1e9b6417c4295907937b13609b8585ebb8f076073abdcf19104ed80ffafe1b09997f115d987a552be5689c70fe125ca702d2ae4d807d5690bc2e90b72cabb0b61ad203b34c68df21c16b92bf8def5680b204ce327214c32e4363d5600f96162a6819dda472acc6441858f396385a16fa5ee52cc0f9ffef3d53c49d535aa37db2cd4b573ff81d74006677969ec1ad891082b5d18ca5b0b9f975574ccffaca72b805c9f7fdd76bfe3dd384dc953255a5b50b7731a137fb9aad42e77d3da1eff5a7b9eda5814993cf2d289bb25ae1680ffcdf419e073d38b4701021adb2019359bb70ff4cca930be7bb979a0678f20665d14803d8753c8ce54cae92feb026486ba747a861daa449863bd38cb4d5831aa6db1e7f404b0c3587aac8765aeecec686066ee7d11321574f04d3f3da571e71222ce07277eca7ff97607",
-		"5e24f34a8d53b17bd0c2aee5369e3276dbd7e7c2ea0990f1300fbbb00831b76655aab1e2fd625ecd",
-		"c1d796f1e651a1ee825855d80206baff6818cc8c247ee6ce62b7531e6e9ac32f",
-		"240cb25aaae4d085bbb747a5",
-		"319e968ad291ea5d4a057c38f7afa4ddb9c9565962fa1a7b231e397a268ad8e0c5030a2df09dc4f99402ddf2e0d06e753bf55e1b318b3e5ff0108de2328d3b8d53e23e08bf7d84d59fededd60d47bbb52736b0491f82c616eb5f779c496abd6499555035e4513c8613e7204e6bff8d06dfecd9ce38c6b83efd8d0e41f84f7cfc9ae07113237987a4b2eaa87f7e0a310155e282e57858244e9071712fa026cb781e5a4bfe6fa1bc480e534096394459a3d1354e2d9a54aac6926a60b388410fd0b53f7a3a9116292f37406369c22ea674418c4deeead171e00f74f5cabae5d24a0686a4bcd8ba99aea613a23edd0a019a319daa3779c212fbdca9d772fc3fe612cf178c2aca2aeaf6bce2433494027a474eff699bba95fc7dcf79ca1d77b1e097439a9050a5cc78e0b78bf2e7f50f959ea2986a59be3880519cd84d0a673acb0432feb1945c603e70748445c74600ccfec60efcf9e4d02a7df5f967de4b473f63b0b0499ff4ba350ec1182f3a0ac17ef9ae28945fc9bc714c49909a7c1e2f311aa6ad7652e22e1f48bb51cf53814a2125152813752d86c7f9468a991d0ac84b1a2f3969b8081c228b7f5760718036e26a10e211ff04ea323acdaaddf9b06a08c92ed663d0fdf13fa601cda45c416c2d3803dd9b5ca29cba57e59cf4ad93176c65c64507b1995d638541c90b381ff758833a2ad67b0de44c280fdfd82b3c6d4353ae30b33768863cd3169a2032f26e37ddd57e7da1673cfc7375bf6e6792495a2b434155d684f2a6f2b919f944469d47be5aa7da74eed69d871e6f65c3ae08904a9ad042ba39905188f0b9158fd14094bd6a408fba6ef57566d69eccda86bb54cd3ca7381f51bffeaf8bcc1ae8df91d22c359888e21b70f640d6f3726a34e6100ee269124747f0ca05110f63deee07e3628bd6aacf926036ccec02c0b6bd7259db52ea8b7a686b36ba1d0296c85e43e25d72ce46c66a1e646301dafd2f4c502281e6f949011cea69459c026c65bd130d6ef06be17b23a9c9a84746e39d017b144135025ac527c1e653f233770cd68e9f232c3b623ceda836843b3e9ea313cc6a57d28ce71ccfb7265ce73b06bce1447220645e6f66caeb06b55129b97c8dd8db54c94d771504d24cedc86a8ec706a9f7dcbbcd7fc7cf38005b2913b1cfb77370bd23183ac7b5ca5135a2738cc91d05b2b22640469e3daeb6a7b0f14fc6652563663520f7754aba624a35e5d24529a6ee9f5ef0d019d83c04f5a93a38b68cbce0cecd42a11aae305475806326aebb4f673791f50c9f90894add51a0fd7c02807efd8c1bd21fa717a860e224bc9fa3f40975fd8d558e4844a09f8920256528450d77e546604e2ce2d38efadaf39a0ea3ea12156174aa8a20481e6c1190e448564675f9ca60bcef37cacec5aa218122e7bd25b571ff10f54979d62018b779a2a3d5d7d6cd56ae31efef2c844ba50ff9da88eba7a8e0d9fc5388a805ba4ad35eaa4798e395d2fe112083cce2f11cc850d25ca5c6e60a9996cee4789ca99d519daedb62f4fb1e535b742a35d71d7390117e93821ff18948a78c1fcdcb90a5f1211327d7ee0663ef16ff446e0e22d8cb7b2d3d05469b1c02864f4a87e2d9715f60c9e7be841e308d0a5f6c50161a4a0464aebafb88e0d2df8cefcead93c9623106d5518a9852f320235594be10c45bc0cf06c9daa007100ff97959357f9be8e49c870d0a11c884213e266c35e9131439fb3654fd5f1abd1e778ccb02b8c262753a22653a09272a0c33b6b2683c9045e8f967af756b98dc1797ff605c64ac5bda8252e9ebfe0e4d8d7ca754fcca5e3de3c4b63678da095281d76d60fa12ff4ca818825f346b9c4e426cee16db5818d78a527a901cd088bc2983f9b83430b50683018996996717a1738439680b68e3f61cbdcd0f0e1a6b436af8fa05d3ce2228054e319bad1dc6ac970c75313c552fc1136fabc302fcd1d09ef1b9138d18133a772cbd9cb197ff58c6e898f9e83e4e27206f3b15b6bf2778aaf9fb38e0d50152f8dbf5763816132a04b4b2e9639584b3dc8ea6d95ade024f9497944200ab0aeab206ef099859b9240aaa15f737c1e0fe6d015d04f47261ade4928e3c2ca21d1f5ab4a3f571f2ed92ebeeebf2493e6e39f0063ba931e165384ee1b5081f5f8d26ec24716757037f5158d35effbe67009080ad7b0381292a513f312eb28328cf5ff47a6599e36c14277c3eb5053c5aca530ff5954c21c03fb3fd5fc0facdac36dd819b0495fde421411e0440991da0cc4a20d294446115c0b79045037fbfacfeac574da3bf192fec4bf38c27cef71d03787430223b6069ba6d9273ec8679736a832277c657862ca791b559a5054ee8c7c07618083f75480c8aa01cb086c7317315911802e6cefb15bbe20494b14d97e3a885806db775c216dc15949e3b724f7cbb30bd2c46bd5a2fd6132352c2b21cc2b47891dd9794975f70a6fa7a0791ee761ccf4c263f27f64790826c1aa656c39483e029baef0855935e7e6c133a4035a3699925fbde131ca62948879373346af35bd7fa52b8d6c3338f213bbd9c79977c0d710028d1d386df614c5faf4a1f8fe5506a9af7059370893ff6d07d91383baba67a617b5d829e0e2eb20e541ed5c34be7ef0eaf6c6f6f52d7ca01933a2a4e8de46e422dc95161ba8ad354f6bc7c8e4cf8ab5e08607530147fcd7c9481afc621c5a3230a05e2c4db79db9e1e73f43556a8e8f0dff7ffe420282212f23d4c5f6f8d2febe129b9fe5ba7ddf27f72ae898a4eba270b5d2bb3b6b06e38c546ba80a9b2bc46097d0b47db5ae72485ef2c6419e856c33c2d66a861b9d474699e730eb8a8992e3ea9c1ed74316687d5d9fc611189eba2aa31af5ba8e81179866dc016bda977c59c595e40001c8ab3a4a44cec00ff84c6dbd9ad4be30bcc080e69b9398089d6ea464a70f536ace3b447693301c94850606d0de1299770b5f45e6d28f8ab83e3ffe52178522eb91fdaa9e4a696674ba0f52ee18e960b04415782f018d67479081b1bf9b4c9b90de026cbb66bf7d9d12cddccdd9b2c8ee2f010892571c6f0c0feac9555c71bf61f9cd69553cf7fc2be8d058e0c3430e134adb1ba28985fdc4f0cf71bd3cd09f5f82f303cded0de62f98404477bdd0a846c6c51e3e82ebf72f475afc8e6388aec57206018ba2528ede194345cc1ee95cb2023793f692f708aac3c9e8a682af36b078f5d6c7a3ed07475e9fe73b95d1eee048ab898edfee3fac4beda45f03eeb64b2128f6df9453ed77c6010e13c0270c068f704f49e62fb7410be90ffee47584ca2efc5287dae1f63bcc1819e7548eb9f0d8a3182f9ed00da3817255a2ff735876b75cd21cb25e86aa4b2893f9e5089dfac76194563f9a14335dd37ef06a501c89623caaf6feb4afb792092dfed515ba7518e278c341834a9dd17b50a0fc860b62ec621b69408cb3fbf7d4ab88a3e367fda84c82357376fa9b1161b739361c313b99dcbf4122f3870c8175093298cf432174217398928983ab6cea4759f18e7a21d71fe1b0f3cda05d241e12db0818b8763bd23d958d6e52981ce8d84cd6d82640d2000874a53c0bd14949ec99e48ce6c954ef0d08e6e319de5ebf7e142f25c0f50ff13f6acecde6a270c8d8de05ef4c310ce9e92f40f6f2b77d6e7aa3f056d4a20f7faa7cd0b93d82e3972343a50a26ff462caada10621bc953b73913944246d2a4da25fa52cc6ee1293c436ab9031ee2dc79cce39f139f44d473c236731257c6f65ca4d383e39cf8d33923afea3c80244021d36e0ed43230c44e7d1a1297d35464861f9149d869f26cc51879027169803e43c898d1b4a2a2480197500",
-	},
-	{
-		"2158abc2472e1b9c061da2c01d0ad9e996fd687cccca331fe8a2baacd12c06f284b1b5cbdfd067e5ed09a60a137ff4a97c5c26482659680ffb22bbcd4ec1bfd272749e52440537320fdd3c225c30ccd98cf221b34b89c247ab7d14f93ed3ccb0486a028c6f3abe7e17fba1742b6d4db85f6e6baaf82df1a3aa059de8d9699821d39bad42d56cc1ec67626092cfad4a2e1cb5d814e2cab78ccf5474a8bd0dc990a877d37de394694af6cadcc57727f393dccba7bf955f4b65b3c00d71cdd701754ed4f231685b7b5e2557239d7e16305be2d81a773765dcea25ea5bf2c15d670f3159409ab5bbf8da121c779132a8ec1480068cb76b68a19152fd83135aeb228b446225f91d1ed4303a4bc16cf3ad8173b30d2a1e75ccafc8c933db231efeae6260d45c7ef230ae2c7b6f986f1c19e2cf260ded9cd99d64a2d03fc5ee3d73509e47ac1c39dcca655839fec75517a9243eb611da8fae3e317e7df66cbb6abd59b16975eb463f509e784e65cd660ef1a4c5027e54b1bc862f397c9cf4e6594d98c2c2830801d3a679220b46881a372cdf3aaa33eb66b91a9f36b6941c0fe1b4d2a437daa50b811f2d8c65b5a69de185d78bb9c2f172dc90a89324c5a2067974aab14f4fbcd06ee95cd49e03717f88480a410afbb4e68b5c79b0211cb69b90604cdfaf08af1ef10cf28f0f630e97ab18d9b5138d9b9ee9154e0b3104a6c164f2a114fa5032eb5c247a6b87880332a0dce7b36982515297a05dc8a4038a09f52b1def7b4fdad8735443fadc462c7c22132f8b9581de2d213bf5c53f7fce34aaeb24263afefead5341a72f88d3acaae6db367c5c14a97d4f9e438e1e11c3c8fde7ee37e5ece5382e8c68b660146046ef96c24caa6bc9fa0a0c88281e4bf01b32df5218cb3750f9c4b8af24cc106abca62d085198d14ba2ded3cafc1fbb17519a696965a1ba5f65720e893f1ef3fbc5200316b9d4615bb23426ae53e1c5a57b2f0ee0d0c83f353b4ebe7a6cb17531d278478b4ca8e6ffdd0cad30ed73d568a2e44972ac88a7e7d665614316d674e84ebc739b645a9a4166477254ba47bc5c2b05ced88e75bf64da21a7f1f71cd946d84de13ca77b7e0dc2f0617d371ed96323a83bb11dfa16f81bbde913d9c259b10f3aeeb6b56cc4775c25f49343cef667763118932c2e8b47ec745ac537b37746ed65fda2d1c11a2de60ec02adcb79152e8a9e614d8715cc4e6b6891d6a0063576560fa3621146308222432ffdbc351c36c37d844a934088fea92ac54920facf870a62e91ba9299dcb6cbdb918e2d54fb642c3f0d60489c4bda489f6c584b64c8f19359ab25f388dbbe636c4d90c048f5ed87024dcf9f98a9e738163f837a07750d61203254a80d120c795f9c3aa791272f9474fe330da81a45be5ac838613d46c25e781606862912ff88af393040605fd4d55d07e2052227c37ceffcdd2d42a08bbab69140dfa4406853799893daf768af546f915a91b81d0da719ebd45b8b5f1641f15621959689e810217bea18e3996c532ac6e4e2e4f289fddd5e5968bd6fa9aec5ca435c532b6c74a7568c8aeff9dd19bfc2fba3b484a191e2faf9a069a24e2e6d928ac0bdf635644cc1ef3bbacc547a8e4f1d42d4bed3b6b8cc56216fa550dc37da9cf4d1d1591d9348594d14adc7a3fde5e5d1a3b9875c85de7df483cdd0baa86dae793e0796d14fef1f649de6079acbec6b6fa5f2cb2bd0481f5316f00dbe5dbc379bc3cd6d13bd8c775a727ef43e6a5fad1051783b22c05a75d64a8394a73fcb430299b015563c8cb0ae0aa4ec750399855411c076d21aeca8656f3d0cae084fb0a1ffc6f73b52a7ea5d4bd6d24e7057a3811719533105fc967439a32241f2d3e3f299da2deb821748cdee1a1c5e71bfdf88d833bade2f505268f375a9e6488cd8e16705cce91d15b60b2fd269a19148296a7be348aa349a12270fbc0d5748e538afeb0598081a4f1349217ceab3c4141d40f765ea2bfffd530fb9606601469fb131a44939be984c07bac8f26d8c068accfdefb729eeb47cfd6ddc646e22031f53a7698c6501d86cbba05e282d64b2f962a1b08b9064078dd1e3f14006f45f599bc8e600cabe6d855fcbae8c3060859202361d929a241f6c0711ac0d050b67a1d44da19e0b0e236adad1f60a327c9c34b2b9c64cdde5b8e4f664f2fc70599d44a63ee2b14d051c27d71231098ecd3d4086038d63e84547dfaa39db1a92785e38b640ea0345062a1c185b25a72862e7ae6574114eba592d6492087e2580dc5d361c473a614d647e66c0a30de806f4976b69a8b92301e68794ee05b96ee116a5fd5edf5eab43dc1103801eec861383f17c2bab9f2d9126c1802b7aee0c909309ee72679ab644abb9c4caa54add283b5954e6f881781e42f849bce6554c7a5e3becc5d5a209805ccd4a0117272a53807e3978ffb19641a9dffd9034490a9284f658599961daf52f24f6464c2099cc9ed3459d84dbde2ebbdbbeef25c882a9beda03573bdd4c6a0143b14d634a1a021d5f9fa23a7ed0f5598ee57e56672814412b6c7c08b8e709fb98575fe2716100d000a20a7e7200d800e556564c7e6a8da9d609b18ff0bb8a8812e96b834a6b534b0d5dc97f5da17f42f8d58e763f1b201625d1a5158c2f9e9e190921637474ae81d278002f197f7211540088931ca8a941794e56067ef4a497fdc6fa713aa9f20c21f23c3a71ae4cc5aed459ca7c020bf55162fbcf56a066546660c5a009b8ad2aaae9651c97b1e145853a10013d1bf68e7df25dd492c328f823ed982da54557502ebc6cc56d4d0bf2881bf3c536ea53b4dcb0886e73b066969dfec343441b9372d7ff38454c4337d45e2b999415ec48f19cd05f0f80c5a61ec369610784f47a5cf3b2a13ff5d8145303ade7189a300936006846812dec9ff15500f8daf47236e724d72619af3a6cb3e854cb8284d5b8843dfe056beaa45c40a4541a98c7507feb27a605d6e07189c8c5554a492a03ce6701d3d2ec782e2c1c8346b54a963435bdda3a93bbac1d837172cebb9cd18903d25cd6bed404eaf18730a6d1c6da0783b5411770ed34f35fa6c11a4292a34565ff1b23d4200ec5a73e6b7905458088fac19f6aafd35e0e791f28bbb2cb0117ca1c3a9e3c4863e487ce5d8c14dd140e9eb4794d87d75b01f683bca84ebdbf19dafab716421bfac9e95755fd346a0cd31e8520a55c7ca652ff63fb4e20ba67fab41e11f7390bc02363162097802c6a9eb18b430d07ea60064d5b546d15bb68cada79c113848136e797577f1783e9b53574f9427be3a28230fdd69d139205dd6c7e9e7f031fb6eab70d69ce905384c5c77d084360aac590a89b2dbb2d339899b13619b455cf9f0cdc08db6c5b5f3223dc3a663ce42bcc8cc6f947f42cdf8dde15a6926b753177513a52be95b1f0b88d2a1ec90e49959b108fe204bbc29199d7382c42ad5dbaff970cbd2dbeade54bd70415e54daa805d396361f525f38efc2bba3fd818f9d7af0594dcc341c20f18c624fe13ce7e7108e1d2fd06c58b03f04642c95e3ba00d4035ea0476ac138f72378d85050bf60dedc90af38e96f67fdc38483a73e847b41d31b894ddcb234f02b0d507bbcb15a8941f9c23b592a291cbeacb3ed213f2f044aa842275a7717757467f121294bba6b357c969e96bfab455c6f328d9e5181d909c3f0543b17d9af7fcac099067b043be79aca8e5a75c3a6d4f6246357a63c516a3ca595447f34b43a055d3070517c67ec36e636aca9ed71a001d4f7b81149124deeb7826dec3697e183d861d544c9c17baff82849d599e9e77ed19f801aa1ce095940674576ff270ac788d00c429187e299a03c6f3a1646a8f7d6290287e70bd1276316ae624da929c67936191abdfba45e2803884e5a3136205a38a841448968a7900709dda033a42969bd3417a8d865d0dbee1f261f4556797dfebab278136a182a63e5ca9789e3f1371808efe06eb0cc5ccfe26c0538d573378035afa39fb7cdf3ad889b277c8c6e84954e74f3ff3140bf13bcb45c822784125d23b5eceb73e",
-		"088fc7ba068f80efd8d4d62813c93c1eba77e9ff400c7781314abc901873ce200295da09245bf8fd2fce254397616151d94b511957c89a881256182ac9e64acb7b25d4a080cc9daf9ac2f231235483fc9fd415f69caf7eaf0597",
-		"78d5f86b071bbf8a185e5e2d54faddd2a9e26983b1e7a74be0f0b979b9f4af31",
-		"d9ce7d249af9496e99c93b36",
-		"ad542824b49fc520f0b7ff8ce2bff8b3d47baacb4a1c95ed56a306483aac551fffba48e8a8f5e4cc536e9266182f6811d070fb9282f5c542cefb4993ccc7044b42cfd6fc71793dc8dd2de23c630f9ceaeddba45efed9d7fca25fcb07d193c000822478b19c2ee9fb31760cfe01475ba8a003db469d1130318a79345a29d054a9f9412dca1edf6d8f1498af5bb6fdbbd3d5f9a244ff176f62742c53779291ef6294df6540d841f4ee8c7c58fc8497ba74d9cf7947add5373427d81ae928305b93dd26cfc65e63b0ed0812ce759511bfbb10aca98f2abdbc9055c4e5ab82637f6a965bb74f592bdf11118b8eb79d50331e76cb4d10c6b4428cd4ec2ef4cb727bdba2b5375f5184d77772d0f9fd3a3c579a4a548b9c2dadc22c805ae959617af49a514b43f47af834313ed2e4d1fcec2c4b9ea87f328fa3d23129a36e6c54bcd08f7e30645de86e98ebb11bcaf99543503eb1e024bc9fd51fe6bd5e6d749033f2452cdf28b3d0f8a304111bdd26dbde641c02fcb15dc21b1a9baac5e86d35b4126ed1cc8a2c3c2a5b94c99fb9b2008daf1a0c090633bf9e31326428c75a50e821b1e72a6504c9d7bcfcaabecd929163d365832e8971f5efebff99ee3f5b95f957e8904d05b410936d8a81c60b4947f8605c58e5b727d491995c76fbe06e556c8ab5cc661a0c09ebc98d61010050f68b31fbe1f9de8f6481b2704204b0164d8433ba4dc1076908c782826e9b555e8d608463581099a466f92bfd6ac9796eacc0ab771a3f11d03806b0f33ec04c69cef6b87d58c11acb5d1374450ce61ba159456b915043c5c17cb03f0ba66d027105bb6fff41e6422f13e2a466f073358bf68149a3b577cfba7ea08b42f83fbc5a2aff17c5ee7dbdac3ff97389f5b8d1f3750e5c9be651209eeb9574127ea81bd7619da16d1cfab85754883543f6474c8c0cc9d5b80e34bf8262d2b4798f9917bcab4b880339397907a5bafe7d149247fd735523df3cbb17ae5e298846ad3bfb7d4f902aa549b7667d3ea945b002e7b209bc83842a7b120d6d27ce80631404371f31d1f61efc5423e1822032a1cbf4fa1a6b6fe79934a202d5add8c6e3595e49be3dd9553a569521c50e9653bc684ef2b73c3526ff7a0843fcac9cc9ecf46e63df5b9328a54c576bd299a366bbdc0f83a9de67b03f1da16244bd6d52e7e4b52c4ed693827735554b05b3a260cd01a41d7c944d0b7b58ae4b0eb052da34bc22b779d7ad46f90f3d4049c097e0adeaf71bbb30ed24b32ff5c7a65177db77492c2571e9cd99f15e613797e319ea7377038d53b28a4cd66a697e5e8f84cf16bd0f0430b34826114b4e1d1ebaaf2939dff7f9f4ce7c0861e51701c42d9cc9e871018b447ccaf4e402e3d63be164dcdf6799314a389ada8bf5e51a35148acf627e51481b9b0e4bec09c9e6d59229721b151fa9adf8323001fcf33afbc9a949643172f39b0d10ef57b37973683fdd9b9eb46e63054fd05ffbef889ff8fc8f251b0ab41fb00757ec1964ef373fceb8f6d148a7f7c89944b3cfc240d091601b23046188ba70a7cdf7b6f96eb93dcd3d24d4aebdc4a29a749bfe3cf5f6e1a025b62982ce188e6b57245d829c9fc1dcaaa5309a8b9557b8824a78eceef6e977721de4065b474ae008642b974001a5565ef5fe4250194e8b861cc45a8691c461817f10b646fb526bf0fe7790bb0db29d1356e8c7a197ec78df8310431d632a032b5490c2a458eb8d4327a9679d7e8ef8739797b0e820e2c567ce3562592e862a1dfcecd50bf77fcfcd00518db65ee0effb9eb3655d5d401a4a47808faa596d17b316f828cbbc14a7e018a0593da9320140a752f3824b5fcb66aa4c3cb94366ee8b821b09e7bea2c04ece15e8a7be1f58463b525e8cfcfc3fdd395ec5b0575094313557e632d0a65e3099e3c653111a5fb4f0eb2aa710229fc055a2bfd8a7147cbecc10823f1244fbb6894af1408ff9047d6483ef83573b5421b9798ee387dc38f166b11de6c33e9785e9b3d9d28bc24c37890e4f8f8ff24cca298b44d6fb1c6aad28cc634a67dd427205285521a172c2a4884ac5b038e261e38faf0086a02aa29195713cea335c47d03d67fa0dec7a8cb21db741519f5f0ba0143f14d71e33d82c75d6a19b3f7a42e6c16d762354daa2670ffa55bd400637de9cddf9e7964a03b4c8956f36bf54d89cf16de23e8c52957b52eb4572a11d1398be72bdb129e2c1abb58c65cc291bb7b0d2dc326c6125a441863a6c92de0f47a355222d58bf10af0d297a86a98b4e933a8f844fc7f1bbc8ba77919dfc50c41219e3db309b92ba056349faa758daf360b8ac05e43fc2069cd46e63fec399cd7764b111467fc65407ac06f5f84a3179930f6215ac5ec906146c19e0d3e162e77a2bca3582128284282b251cdcac03ecc204266ac3a9cfe8d8854008baf89c0ea0096a400d6a0d2f7c681c99462cf0105f7a3dde690ece0438fbb820b9c73c6cdf6208c336831101b904526cf8ac331d879d71615d8b1f750ac7f0ec692d97a5e21e17e194a98c10172b5c4bc1049a8743188ae7c4d70384a7e68c1353aab7882bb91aa383821046ed0ebabb4b2dd126ccb935f48646b299095cdb71ecd5cc402e4635a3f7a3c8a6f54f4076ba028dedb402bcc92f5668dec3d91dda7319f58382017e306237e42480ee2c1f5930564cf16fdf37a3434585336b8e4535bba87311cd47722b9da727250560624a5dde48a2090ee44592d2fc06edda634b600fad9f843c6b2eaa0697b42858afee8191dd2a31e5685bd104188e2ccb057dd0a8d4d1205d7c846f5b8ec0f06bff61c7f47ac4da30e1bc80a4e95af79b14a83e9af2e0f195cb92d14f752a5f12ff90a05765be453075d799694848fcddb07859336ec101c8052bdc273d4abc313cfb351b543fa340dcd01bf32fea59881ddb8f33c6023ccea70532814ce4a2d0c66c846347b86c29dfc34f6fa4db298911d4367c59939020a3d078194e6a3a3c5126c24ed182398468e77fd61a5b1271f5cb2a97868876954c3f7179d6a045f4bd770f681cd82216cd2b1ceeb4e724b3fddeb74481e662fbd7f5dd45bed6d4f89d21b8dd9c1009ad2b0b16954e97993ab8f3fdd9d61f8db102a945591b4552f419971a9e46a792dd8392c8d9502767c82d9b4f69e66071eb579859e9ca070cad5fe3b7fcb77b8474926ea991ce7ad201421f8a79c051b762a066027ab2b9595a1c97ad57f3149f5872ed4d8e99195d47bd3c03bbee590a50a99d8048e912aaeed797977b52f0240a6cf2c865b108456881adbfda60cf701454da17bae879cf098df808f34e50bccaada2d3edeb1aa73cfe3c512d814eb33897b6ff9d67d3d682517cc333c3c2552adc99860b1f0d1076390de9f84fcc9e802581f77e14f5254da01831c70cb8581630dadb44209377d90447a1a21cc8a2d6d897db62d8420afbcc6ed85ce42f3281255bd43e0afd3e86b27d3b957104ef54959282b0e1b381a26f16057246704c7888126055af5a1f494540f01897e8781e1a5c0193b7bef4b5588d0e9b9c8de74dcdb63f03f7b15cf48fbb71c7c3bbe9329e3d326988bad7d0cb85537c1e0b3cd88f37a3c7765f548f99e495ddc29daed8c7f15dadf2e5b79def91dbbea277c51a5da250e66c305604bcce4789ca2df9a10614d72824ba8e4f179f35ccae7119fd962cce13b282f0f970ca6c4776374c4bc438f0de98aa04fb3cf23d2c6800a4a666c15bd20c486e88e688ff9e5fce906b4ae96ec7c3388d7567ce6c8bc61f6d2373b93f9ddbb02b384084b3f28f54c9ddda232d3084daa5fac5ca356ac0059f2fd3fde5d6a9516d0954653b699aa986f70733538e19721daa41329abb95058450e602eb5726ad5a8b81aa474650659c6f7f6f53f8a6e635bf35f4b1191e0dbefad3be756c6141c7d55f007f4fd131e5d5eaa120ba31cc32b8d4c69d4fa784fe0af7dc272898789c774e7995cb252eb6c8e8053c9e7adb59c27f675952d161dba78bdfb15859fdfe4fe4a44c01efd394bf51d43c600aa9a527d9c490971e188e28b980e77a9c6ea0a4ef6bd38d11b47f5745ecdb",
-	},
-	{
-		"9cd1c25b5bdab9b9080db3e5e05dc749e0783087c310777d89307138613bdffe0ca259677c13208420d4690031314a11a97a986d8b0fea143f5b4da0972c9ea3cef80b4b0b2bcf2bff392c306a764113f0d9807be86a9027c6ddc85d096600d85e0b236937f295362bc1679537a8a9278229a36a9433925a105ab719c0b7f11fc31488fa071d3032de97c81540713dc29ae02c2e13be8823183f3cd9f72ef8ba4280b4499ee47c7c7c4492bcb5cf7e4fafaa7ec26906e58146215a3d4f52f792d3abdb718f57ed0b9b7fc7504e45a0fdf01ebf5924a4da6ac635a715879ea75a4983cbd9dab9e47638acc687f16684e184443aa9e81513ae4abbc4d1596b2ca3eef77cc9b0603fe90c0570fe6cf4dff0381a99212fadcf7968934ac1ff7664ed6ee0b61e41f5074dfb774b676c2b57a445f1c5749e95ed062837c727ae2c151c0ccb3a4dc1429bbcb9e62325117aca566b8fca0924b70f4defd7749d0389b90f55f35d1635f8d2efdef514f06fde46db6e11e492c8f4dfb7cb5454cedd0ddd32013a4836321a25110f3a017f18475a86583e192132f8d8fd4c2dcb2a3aa95c3be3a57216bf9727cfd1284eea6fa870c8e689e91982c116ceeee2f8298b55646efad684b96eab883fd3d629437e9a0b6523f47ea5b59474a4766ccd01c13170bb08f47576a0fdb573d4dfb65279c1b79cb535426bcab60f4022dc42e40db29f15a6148b461241bae62070389932f035e7257752ef2d6130503d72344b24d360cae8ec11fa2dcbe04d3b18e66d081b552e93a71dc0094d1046bf4491e318f2ae00debffa0b8ada58c5f23e33fb598829ec2f46ad3894bd7f530210371a02e51ae0a414eb2eee43f3e08126dbdbae04c7de4b7416df32953234a6694ea84e6889f27c74206ab8144a393a2614e92adcc77550dd54827387b619f004c13f6c4a31e8bf525277669db0a0c3c589eda15063f12eb774a13e2aba2f2f7b6e9bc69f8485f1d6fc5773acf83671812412d28704003e78a17da25bacd1d61a6d9cb9f121abc71d023bcafa713b7c954e4e1c524e5bcaefd86c4a843e209eabbd579cde0263fc059ec6ff10017ba54fc9c2a1171d6b06f5d85079167117c12e6e5d0c71c008765fce756fd0f1141fbad6c1d2f32cd8e80429611a9a78dbc8e738d458f9ddce58ab43c77b34db9befb25cc1a588998e8dc2efa75c6883244fbbf9a7b4d6750c81b8d3fdedaf98dc61f49d067c369409f984b155ec347a3bef73e2a44957b0ca0f84c7fc335fd89453759ad0ac2fd9a5b38afa9fbe74daaee7bc52301302fb2286c21fb922f74d756de84519171fbecaa9b869682d431614ff6845126a4034f10253aa244bf89ab8e0dfd1f7fe8fc1a8472a10746d26896c8ece7ef80eb2e910069435518ccf096caeda63ad692455b04e6525bb8bae27197ca5118a57fb9a5d8fcfae1b9eb7874d91eafafa0e4fab5cb4d0173f7e3e58fae369843a641e98f3ee460e8cfe95d98f7fd38a8d2235e9d6050015833e6d7d21d7015c3b1ff42f0d3a3d9a38d373c8524752e06987c9408cca550f08c38c2a9a8d86d5ac7a04bab44254ed15c7b5670e0747788e11b81adb0d29e3d0b50d6a429340ee0d44a8c286fcaf9bc46403d26b4a4af95b021336103c1ae0f1274b33bb8b21c8cfca8a56c639f18a9df45d083fa7019aaa14d1ba50eb9a4112e574cd70969640602096265a87b1f77c0e00bbb501555f1626196611b4a824991cf10ab2874a12a8e0390267eaf9e3f8f99eadfbf40d111a26772cda1f50743c417eeec9c80171a83a730f246cf31c6691c96185d672a0fde9ccd7091c4b455dc93326913497396e0a4992773caeddcd783e534eb0f34b99bf23a2db6ee738381b5fc94ff603be014c507888ff55557793a8c5439b11dc5a347f35a2666eda81cda4d1c3a78fc4f3df3c7bde91d05524791b67142c446f60c3a4022912ddabdf817ca3280b671beaa496c935661e5adf39c1f4650563c5c807c8f21aa59df926199c4e2404690ea8ffd7dd65f637452ff93995fe9c5ac7a322b9bdc756b7ed6f533b9357a4a1ffa379dd096f144e9e0d87330c238ed3c6b08c8478e23b65518ea1e4e64585e5e9fec2f26dd7400ce4c73ff0eacdc3b07e4f34f6316f5b82fefc66e442ecc92bea8c1d58635d644724a3380e71fbbeef4bf3e57c6240ff603d65447f510eaa3c9ac794fd24f844489b7c560c7814fbc307e03f6a213eca5ea40fddf51d8731b74ec5b472bdf8ba59751065ed2461b02c41ef96622e60c0d26f9dc78c24f94372bef7e47cf09ed565ae3a52d39b02ffddf1953f1ff500f1659db9f1c2b23534702c19ec1cb7c18166fcd33997d53874c7cdb4e6c2b4d82751911913434e48b37a61a0971861187e5decb7f5c1ef6988bc1d6f7fd147a623d8bf361b0d7ece88df6e1ff8d037762d232e22e51d8c6ddaa9dc597b23ff9efbbfd416cc53e5543253732a23aba151cecf73b3ecff21c6a9fd1f24211fc21cde9633aae918ff1c6b72468f1de7e0ecb6539fa353c069fcbe8920dfa8e2fb86782e3062462f7eb2a2c441bfac21ab62744b05c70b6fc3c9f8e3a8a0c5a4263ed256a019861ecb28e20ce78e2d93f1a1def669e9652cb35d105bfdd5ff2313d27ab3eb00d1b628b4c20f42efa23390802af96a8f261ded3678ea0b780e1f4a88d23588a4ebb058adbf9a9c62ce2ce2f8264c874c697482e25f8d5a6daca4f57fd97d23c42d7b71ec150d4ee33931db5f7d63abe7d72dc936bb23a367c798e6a01509644284d52f9ae27d7d1bae597b2cbc26139354dcca0fff6d76c6065d661b66ca5eeb9f8d85810a029cb95b17e5173ef8ab92d475a1d3e21799e874ff04dbc962c668ef4be9f94d85b2a99d97c0db8f6b6d63e00e36c325cfab9aceaf7597113bff0086e8fad36eac7c0b443de6d3a8533789616d4c863df7200ba795a3b8d0a2b9568bb32af95fa604a3e3ea778c3dae159e1b612458584564ffda07b8aba9710134242b2d83d23127b51b9e41584c56f667b71bc01060240f3a2bc7e5d438e7095c1236e0e468079a83a5dbdcf132d258e9ed18f94d3c098867d06d3c09544565677b454be34ce567f1c143e2f3153bdc0353d65090dfd8f7af4633b89a781e01f4634dd7b0323ea1f38184e697bfc39a1299eaa278c39a2709cde0a346fea53a61f211112450b318d137fe68f6c102085aedabd2b045fab912da5c58d8019239f3a44b18f4fe30c5352e2e2bf030334a1dde1dcd23178636f1e38ec9e42102d8c54df0b94b207e804eacab3edddf89fabda6c8e1bd4e17ae31a57716c679ee8bc7de4412fec3934c6f3e8b4c1d1447dbba0fbc775dd3258f789ca53f1593cadc710fef6fd282bb41c0468ede5ad5b914e4758b4148b0d0c04c75ff6208ca3e79d92de8abafa4ec70ea7a4e454f0759337ce575c4954584e2bb8444c34e823d27b025d25fc9becfb4391df9882452bca0373164cd76e9af316df3f5bb7532e22557b485217254d5ab72ce349620f03758219b259784d4c9f1c7beac3cf08e624742e768b53b3d60ad0b94442c847b84a516a93d9b7d068c44c43980b4c7e2fb0ac964bf05a11fb2adb4f6d938715dde88061b238321afc7e5e84799b02a94baf3f879f89a98ab474ca12085137d639b837ebe069f6dcd8456141d063eb1c032aa392a44d1d58b1e77aba38a280625ab84e3b123507ea7a692c4acd1756c031fa52d637703ee957a993804c13e296cc20c1de55c9b8c032e50afffc51c02e5c12f48383237cdacd005b09243d9fe05e51cea42b77645e5c6f4e48c10e671d216b90a48f0d8f5c1dda553217f5126646d11a62587eb0a4ee0efdaf0d54bc2eb04cd34f5a529b682ce09a34d5acab2c8db58ed6244f7b024e68a14bcd5d7a7daa4dbcf490485cbd38e6f20e839d2b0142b9d766f9527937bb1a737877edf6122ba306bbfb5379243a6b22bdf85dcf3b079691f0e90b28a4259c1c9d8a02afa5b5a661a0f9dac52435e7d22e3591593d37eb2e10f646b51be2d1a96cd4490289ef642ad93eeffd64d7cf830d60dc4a98c768a9bdbf6ec9923062ff04abf19e8b65b95494a9420971018c7e6268b8fb2021a4ddd103976333fa52389643c711a980664e29a8479aa9c4091c2cc2074ce3ac1ab4afa217d39c6a1",
-		"c22add33457539a957d32dd07ec9110f8cdd2f00ab6ac256b4bc7732f63dd3b867b0ecac262555",
-		"e71f9a3dd457b4064df1d9055889f105af175a2d10dd7b8729da0d0116c2d9fd",
-		"7df9824e774c5f86d83cb5d8",
-		"689683c9e7aa9c48b9fda0cfffea0458ea0c3dedccd21efeb06126f1194780917c9f4f2f44b1daceec3f6b1f75506f4169bdacf12c1f65958784851056fe0b4b42a22aeb043ab35ca73747346ac58c550324c4b849a404c94b8860967b6fc58aff25dad0556f1952c045b91f56ec8eebf6f552c18b2a0641c037e6c6538b289601e1fd5a7bbe7b6e0b224124fec341bf77615183abafb52b3e30082a0abfc2cf224324338c132426011d9f800b382e6b834896ea48a8247f149d92ded7e69c7800096076cd2a729a1fe41c70dafb1f855ffa2ffc27b93e2f5f6827ade7118af60730033675d84de9cde6c260d3d615a945dfe0ed25f33b6cbd2c0e204ee919219d85c7536f4700f06fa61937f8dbbe9bda88db1f4ba8a8d195cd385eec62edd9ce673880800be9aa4430e5c10a5908f6dd349af70f32b32d8db38a7d73821af47b993b622bf168565082d07e88fc48231a440469adeca59263302438ece96d89de11cf8057454d1bfe8e4e36965a4d82618834a0847af39dd8776866d9558a5cff79a1cc9d1e3c22e050677e54ead68b3cf0094daa01330d41bb66708a8bbb8a196fae5c77dc6774629d38905e81d97c5b16d755182f687a8046e55d148419cf9c12139fee50c0533b0f04a805723ce1ea5595fca5b668e58f6b3b396f438308372489b640317cfa3a79392cf6d1afdd8c3359557a83790021a4eb418fa189ad15ba9be0f74182ac76076f102ec171117a3d16ca20b4d200e03e54f1f0ee6308e463a148c0c85aac3ccbe5781cf45b53a313f7c9975a45d1853ed9104a860c08634a8211b87500b5ffa3d8d9d56f22256d485b9b45b24d3873159adb8ae25966cc40f164f342519e88d1ead1e711e1b2bbd4be64c7e83f056f797c2d3a5cf7c5025f92be5637fa7738a1bbba55f761dcd1451ce4b1e85a6628b629a2f7917a86363b01516472c0f8614abe2ad1c9d5501b2a44a68e3eeeb34a64541125bf49138bcd15b7c82dfd40708414b85107d8b982c4f99783a03c707a37787a91a7198063f0e8a2d52dca61755105faaa09c063c7a0849570cba1aa7ddb3600eeba602c7e7c9b90ed00ec731d4d1d8e4bb42f9e9db21616c4aca48dc27b939428834404331288f03c2b5e887103c51748d0257519c3988f6492eb70cabbc2dd8a8a910d737a678d0970ec48bef3b81673bd10b687b37e11d49e7cf90c03c54826ecd833bfd9dbb8174274dd45b139d08371d5d248ee33298193194734c5863adf4bca92bc282bae2f47da5201fc240dd0710a22a8d922faf92c2071a7eede7ee17232d3b6ee5f3ebb1a8b230600b243c860968ab427a5f540912e5e7bfa0271201f288727f2bd5173539d5318e5c1c0a71cba4d9501b91c3bffa7bb61b3713f1751efe94a66e17d2b42da51d13c3df40f4db988dace42a6a1b9d138c4f590b7227990711afbf8f56fa63f2800cc019bbd4a7b3a0983c9b9e5f77562dcad6de96e3b2eb85cd99d28a021a10d6734400a91369236b48ed68528afc68f247d45c79318fc5d634ecb0f3ef8536d8ec2e877adc3308be906c5b96777d0e05970023e5c5dffed12310cc97249e4b95e32451c9acca8394fde699deda57e938bed7167e62e2cb62357f82fbe821ee73b4e09c6e2f512515412c2f27805762a8493e74a3d30bb409e499002a97354381318af28311ce484bdf7c39db53f08f73ca5793945e13fc8c66d503fa95506b37ce134ce2945d75b424ca6367ef4ed47b9cb8ba7de80e773279bf23ac888eb105385ea958b1b49b27c8db6b1e14a5c8ed5d28808a7d0b6bff1a58f24f9c57fd8b8f477a9d1365f89c698b8ba923896181299d474b93e05d3c915b10a69e61910761a6d8644933c593661b0828afeca590ca18e702322d9140d98fcf836c2f7a4f72b59eb529823a52ab05d919c3eee4db2cae1067213c5070450a160fd52fa44bc9bacc5c136701cd7adb1faf484da376477da08f6a4dcaa37af47c7b026c2da9d5fd0b30741357104cb2bc0d3cebd132b5fc7c873ebeceec5492aecab95ab393f35b93b923d2ca071e6bd8522c3ad8598a05e96646504f1620c045aa5734d665acbdda0ef73612be4ca4d95ba069041e042497f7b10445869989ce30f55206a1feb4e64890b7d1f7e9df2e88a352674a52ae4267c06592d425ed1d88101cf94588135892218ac11f3976ab2b47a27f02eb887696c94b13d48b4370eb11222274b5513a0fef905c66d0c1893832ffdb9b333178b65338fd8b81094d8f86f2e4e96a47e72032cd6fd47af87eec295c6e980f595b57f79abeb4654c4039fa03ade732b1e579551898b801ecd6e0fb1c5fd198335834b51673d074a8222640d2a969998f5b878bf897fdcf3426c4e24a7c599e5567643fa79ea5d20e7de581a873ee0181e3632a4e304f9dae09a81f882d4061ec17e588793b160c93a926874d5a8b78727f88de9bc125589a9562db5bb1c01012bbea1b2eeab68877871ce83455db43cc48455effbc71c436aebe362af22c6a319d134f65681c4d0d51f9aa42fb20f48ae3f7065664aeff5d8349624a5d79eb0bef3cbb2a1244ee445f560a6bf7a796b2c950a37dfb85ed5be11e8e305e835c9e077e676aa5ce23edb1f74806278548e3fa35059abc2f032289f9bd76043c8dd1352b6131cf34f66bcd0e7f1d13081f5b08ed0c69136f3b7ad8e05e9fe99a9b73624095f96740c1f40074e5d92ffeccdc0f15502082fdfcfc97a800be511c22b875f2832b2b891cb1aad2a17c7bd0be4427a4549404172f7c14d5e425e14498237c26a7813cd8612d048703cb180f1a6194f688b4644304950b078692faec7a2a5c5bbc482f3a7e8ef2825c4c19032a7a79a2908ca9774c6403e6b15625c485f2dd078902aff769dfee2dca9373704bf63ad981b51f61253910fd48c49ef10e3938f35ca8dd491a8e569baef675df30367b093f1088ebe8f876191dc32055481d074e5e47a4bd728efaea9fee3e83d8556255ffb2fa08194bdc66897d97d1557186d5f873169461494a83368ed8065b9a033fa4c2f07f7c60f945b60479e3c89233d58f674c0c6fa5918150bae0c6de2b65a09ccd490e2ad8571745bc37e70982411af667f3e8e9b9f7f75d863e5fef05c1f0d2acc7c86585a83ee32e0a64a9e67e75b80def5bfeb7cffe6e6822efa7a9cf049689b58336b081c039696e0fd3b2a2a6b0d177c9b3f8fe5cbb1c69ea93c1235b2c5b6934f603127eeafc4ed0728161612acdb2ba894a5ac376c4ef1fa8d49b4722379e5cb39752837395c413dd29a2a88c03849b6fb2221fd85ba6d5a50ba7ee9c09ecc5e6dc66afdaa1b021282cadc68f19529eadab809341187d57cfdfe01d0798ab8a94277b9b868612e575bd98f70de80ebe5f57637c511800373262eb5ac3836b03808ca5d5f732f286a5f18a7b7fb8cd8f60e4debe54731c9c524b84694c5469975443964ed28ccff2f4e8e0cf4c60c1c8a092e986cf12fa90a994e4f26ac89fabe8a0d1e27fdc00f1d3d3fdb73bb76809f93ea113e336cb0a5438147e454e262fbb7d656aa1be1288839bc342b48ba7d0e72c85a2e24be1a97dfb2db85b5d850481e62f3b11a28c6407686e73d550b9f1d0f010602e82af26813d2484a8db2da0814782c8404b2865abfbe3c98a07ffb37eea6de7992cad73a9b81ae96a9acb13ba213eb4111d868cc73b0432d2b6c2d7e0e0ca7ccbdce86d01576e1136871a07c76498eae53fb7ebf2e85fb8561d10dfba740400ef4495ece7eb33ce3bce26344eddd88cf1ed8028ec5fe8e71edda54dbdae08f50f8df6295f6d7ef1163f62262a200456a7777d0565d7f5832fcc7ac144b5c3e0ce3e5c9b7f880a54ed5e80662e96b356ff58f2e372b1dc0d73cb8b96c72caa9e5dd312841a8be23f838bc706d893e1a8a48b2c069874c293c41d00226f73f987aec8686046ac4c0c972c991c38b98cabce30e7255dbf16039b95dc7d103fde630b03441b15bd2c214763fece9d6778d1c6354d2c9478c226175c02cb006006715fffc879a6a2b4111f6234ee330d6c84d453c9ffac08efda1f380110a8ef8c2fe44e2ed644cc3e0146b4d02f76586fbb6d69b827be38b9add444e2bac4d7165007cdbf2ea8c4b967fc1bb70c68b229f19bc3f79cb13ee6265264885f04c09a96583f331ed46de3e5dcaf08313ba6053f3d0c1916a0f",
-	},
-	{
-		"3ab6cbeebc18df951d371e0f3cce2697fb367476bd9d50ca9e668c77636eeb9d24b68be0ce6a75eca194fbde6221755d57e9d3148623de24896a9becd98789fd3d14de0c7e53f81fe7f3fd491472a66b5b797fe19c5d0525c7a111a0289a9e65ae7c712ccf694cb75c490070bca7db17205af9bdb7fee27f9ff41fc78ebd2d3d399e690908b5c064ffc0d5bb67b0d2880bcb45c2ca2741691b6131aa1e5ee758fc50610406216905e13ec049ee92d1f95e16bc283dfd91595ec2037d20ead51d3a362140578a4538c80581b79852b0f6686c1ea66aafffc872024592ec1aaf2650d167a75bace024b261db4ab48b401cf85ec2620dc12a7fc37012af8ac1d6db923d82eee962129bc4ede578782594708357d29118fd10dc6d228bf7e461d2769e556488b776237b6309f3dc2e884cb2df1f43f71c53d389765f805ac053d05fa835e75fab0adb0f13ceeb425637f43556372d728a00fb005f7c5a20cf2b7f776066d60b70b11a848005c6d63dba0c93f139067b39017c997dd6b94c0138c3619e9a6d0e4b8792cb8d58a2ca12ae5d03e7637f2065fbb9e2d1722fd3aaf234488ca157d829e9a3b642458054f3dd58da41d7fba6d2b488a327b776d1aaab1a364c710e755ab22b9cf7abf1eb8949c5ca20c070f275f8959cb00c6d5ab7879003f89f795351a4ef4850e033d929f9a349b9133b2e0bd1cabbdd381594bfa697b845100b96b5fade05db12de040b814ec49489f39f5abd5b37f570cbb516636d5b7378f12872d02d4de20b52ed8ca0b12029a4c084621bbb578b870ca2ea79fd5df1ef8664bfb3b1a1bf038e4ba33f6ccde42c5146470c9dd293aa747d2372db1561617920142ac1d32e4f1fd18e8b9e72b7efb8fefc56d08f00450d23b7e8381849b1385ddcf9310a4850dbd6db7a4992690190655760f557a5027b5ceab3743365ac9041a5c14bed1126c4eca00d7e0a0e0e6f666f64bd1466387150ece5835192149237d5dd25e703e9d3a4f652ae04601d6acf8228e4e86055394c3abc9dccd02f04a60c298d101260b408b2620c137f77e2019fc6eaff1b234c56dfe922b0192656254fe3356143e969f64b7609cbedebcc8cb2b68bcdd9d723b9c14669da6cbfffbca2351de51e87db6afde435ead0017682b8014f91d9734a9ab9b374257273e114a8fffac786d53183ba666d8a67e30c1fe45bb1bdcefb5787afcbad213f8e36e78d30ae1305df96bf450349ade655cccbb17d887f79e00728abb449ea427fd2d0af80e3b5607a74a57dbe5264131f2fc49cb74415974b3d43ff872d4106ff11b680f56be06fdf85ec9dd850b1f77f759337b9a9ce04e611036d3f45743e562abe4b959eba7424a712fcf7c3f3773886aef22f7cf6168efa83cd3ff70b9521cae1b6689b2b8c423d883a007bb138025f2a31db2147691bcb365ac242efe40cd09a746cc501ae0289e80205993b07f86538d486803da14b74fb0db6ebf1c2bb8c36275137d654c1be56c65891cd50f705247d85621fd0d61ade8c05cf4ec15b84e8adbcbe017d7d5743d5e91025e0154a5d9bac7c6b8297490e9c195c5d74e046219c042219817a5c56636c7c4382c6a01d721d88f4b4d20250eb5eae5f3ef481dbf8a3f47a1d51d080bd4cc33f12645c8481e57835b77a85a2d83301172782f22026e69a43376ac4f5b78734c9eb914e6c76c6a12d4127cf195ad030825322a279093cbc40a680355d086a27f3fb7560713b019e7c286d96833dc60590e9a709f2e3c632894668e74ed20e42cd83a23ebea3dc3bcc49d14f8697541780fb2072dee6a5672d0d4e7bdf5cbdacdf5fea9e03c6d9cf0faa1e954172acc26dcd344bb3d9b2e0e6015cc55d19713d795bdb7c21b44b305e69c69fdb7261483f9693f36f45d356462f1ba4498de1c2e8bc3e0a70893acef2006dcd73cf15b265a8a5d4ed792a34a846d8f1d3b9b3bb75f1c5e57a00b36c00203973ef4e2654f6cb29e4445318ed99f0de6ca992281e83ed03feedb66aeed6a461c6f2871ae95343cd9797e58430d5639d7ef5c59c78b29f76a055e18e2b85eff177770c60ca4f2d61e612e617e749b4653e7901b62ba02dcbf50e59219349120ac01e6b8a6e98eb54abd16b921a1ff85898f90fc49a3c8f8f4ae9b0dd32c3e7f2e1527c4feb67a496390f28532f20acc71abb8bb4f71b434104f41e36b705289858a4e8430b8cd9449b0198ca2244923cff1df0f63833373c275572de5a9a77b23e5ff54aebce8e86d02651f26ae32e69001e5f3951967579ebe8574682cef8c12dee0b18bc999f8cc0f07e2ad3ac94d3caf30c1c8a8295756aecbbecbbb4ade8a2b8015e52a0eb1290693c6316d036e0c443fc4ec591c32f7e7f1b3933c921d5812233d3c21ee5528822b59ef2ec7eb62f7b04f40cc8238a473ec37a07e54f8907825ccaa1421c2964d2c756be450dedc011e1cdd9045720421b9a4a00e9d3076c2fd10d71ee36d5c0fd2c7e42396b034a4cd0245027449242dfdc42c8af4a34df1b4150097726c9745247b78bb2bad5fe8af94eb13ee1f41dbd36e56d801a4c9c5b9ca5d3c26f4714b6fe9f69b87567426eb6f4ac97e8c9541eafc19fc90d3b24aae0f76c4f3f81063d206ff695d638048c2cb023147a78332939d2f2470d16f1ed0e5d3d4dde438affb2809488b99815e54938fac3b02deceaffde310cf422f9027f364f5e79da5d2b5af1b4138ac9f9d301f396b220829c1f60cd2b54ef24576e5ba6ccd4802900db1bb4eea57de7787eda0e30fa90cc19f099444488699bf7c442c398c2ed989d084c8cadc97325484e337848c34562b3dea6f7670f935ed3d5216c970e04351651c1c31a34e862821bdbcbde202d91fed38965e31cc3b6f1e52288f327bd0a787ecd92b3b6f535d1d000b0f02d41ee01ca54e4e6179ad7fcbd60f0e41dfa5c9cc7ee4f7de3844fb385ffa3b24092b30be697f1fd32c9faef29ead346e42fe2ab1d312901b678b43b7758edb7eaa1c2d038b4cd6a7dc759a6b12cec955bcf4179006a7ab6e22ef15986df107080d340b8870e2304d57caa87a9961c04655d7d66c7f71ca9260e02aced131d6de65d256d6b487141c51bc86eb1e4721742f07d09e799b30da7b5ba94c8d701ae34271ba06f8ce134a7a9a2598d1570cf05edd9ec868cfa2e41b4c20a8bc4b8bfebd45f5a60408f08e931617746d1464bbe1f3844ab3272ede635f771f9af30e483903ee4d0cdecbaff4d31451e7791dc97c92042fb932fe1c82652c1d682a55912e33de3b1299db076cef594458670dc4f911f4a244e2bec757dad4b0052a41235e2f5e60b929682608c16a61287826218a1ac3cf0d8286555d5b0552754685c365d4342f0d9c45065daf6786179da791a86b50a5edd6fb4b21f09d9747136aacf79ecbf52b00fb88b0630ec7f0a6699901ba4eff913a3ab33ac85a71ebb51ed343eac86eebb3e79c16e664078ccda09e77ef8e0919b8cc447116b65ccbd5200fbfe86e9bac5637b33c9bcac9596b57c14ad5da548e96a8ffad5f5c69247c68d464c770011da7b45a337f138cda6b4e15311879bfaf12af4c61fba596780e6adcd5dadde372823da6014122dbac70f0dd896a8d387d3c74df282a659028d06cfeab3ae22dcd1fc3ce60f69a0d678aeae0e5681952949e31ccb8975cd167c9d012f4b230b1c1f47022eb1a3042951b338a734cdd17db0ed483a621650deb3510efe74191a94611dc212c0c73b117a73b8ae41892cf176742bd98a7cb73dcdc53b42df56d640739852335f8d44d901fc884286b433fc285fd5b3db8df0a8522cea3182c071f559c328b8516c9252681a94eecec7ebf626c0a9014d9aaaa0c694d14855433dae06656657d1f8a939123d28e00513d72bd3802d211ad7c1e06b9228c0d5656edccad5339bcdddd5e01afdc01f10974be3187804324fc513ba583b7b2da1e9096bbe3d078c1adc6c34d92c54e9c49fccdc17d10e66962120ee5d9b1cfe852569436270cf7c4c3bb12568050e2ca4db08bbac16214238413195dd4d936272fca5d56d7551b9b002df1807ed44abc84c66746387b79bc9e830a635c308a7bfad7c2c22cee6d3d0c5ebd8b230837b7ceaefdf71a67a3a8eaae0c36de86b2d96e759b8b53f8b8604775eb7a7e13223cb21033dc87d775628581a954085c2d66c1c8f225b1aa86091061738e7495cb36a5ff032dc678904bfa39a00285cd6947865b6d4805e3411644b4a4c94a6fffe05ef31e156bae6165d801685dcec195552d029d22e5de393a82ddf3cd3de3ad8cd6bba2325a03982204f07fc3c21518ef17a601fd743b27f7191bb446ff61d3c61d7608777990997e911932532e5b3235f13423756f5b6c786720cf6682932c90092",
-		"50772c5a0e156ba13a9d86edc0e600021d56f7d31e7e452a74ad53a6775339c7ca6521d87a8c79b42900a1e9e6a1ec03f7e3d615611c3fd5c9927c40e5b508af1a298794b60148df01e9c9e78ab5ea8198c097fadcd6cfa6694be64e00eefe1a1885aece86f6ad87df766e692b58ebc41982bef5",
-		"93a2561a9904a1787a10e2a668cd6a814f2877a7b512698e94796805875c8d1a",
-		"588d9bc1d98210d9700ef488",
-		"165d8c9eabcd5e93e6eff7be122c8c242e1a7f284790c93324f924efabcec4a4ce48262011b7360c2833143d645ff295453853c92f0c48c6dfc2af7ec58d9bec0d13239c7e5593cdb39d49376c6341263df80c0ed2ed79fe9899d0c07de93f6ea95a5dfd307e49bdb5672b158a4df623ee86d54cd1a0fa9a60ce39d1f5f4b6b0ce9daf2a61a907cff3bdd3f29156ac439638e0910d728843ae17ea7368814ad7734732e7c023d4954e1cd5fd19fc9b76e9bb84b61dd4371478917757b14b366b4bfab4eab0d9de746088ad43d8742e2b9e58faff15c2eff084df5f4316111d5dd7d23cc0b1ee1000253f26cd260aa636f03f64a8342e531ca1515b3beecc3ee07a29184988325322d5c09754c278231f92c0d980adc919d4fccf4a1da1d37f1ddb58ca997d6d700946199fa007c43853b6caf5f8049233584087fb23c3952414ac487e452f0c3898486d04e5b008b843122501f9c8a294da9159a04119ad5c8e9f5c211411e34559d3a7bcf2ac10e0174f94f3f2968c80ebdf4498de172884dbdad0acc3a887f9bfe896a6004d54cc424567d53f1198ba33c56aa460edc6af0e437b34322c1144854bafb2434f00703c1992dbad0ceaa0616aec60a380676ca11558cece57a936959d6c2ffe0647eeffd37524fbafa9691f31499701b202d9dc9980e79ea517089eced779aa45b522c9ad193e63ea8b64e8a942f630d44370f23b7e9acfedac51dd9f139f8806b09a8fbbabc76fec3c3721fad5087a6d41f93973af8d787d8bc74a3122d99ea14e2f30a3c90be4b695c8b269784eefafa52d6a79e785eb47a23d72f037ca572b7029d2f37baabce57658119fb02c5b659e3aadfe0052f1cc3c0afc6fe4624533d9700388713945c20c1d175da53738fc73f48fe57fef8305e796b474b6f8d3fc5040042373a13384237d95bb045ce0c20934a964a8372acedfd6e559aa84180a86311a3996cc17bf7f73e5d85d4db2529989e5836edad490aaa5f56d17326825aa20608fd209903335de4b36b79f68b6a52194f6ea8ce42570533df650e65b50c367f69b9f08c32b3ce3e75318106b8b2c6b6d09369c781fbf2aaa35053af215b621f833814ec4778ac683de0dc22c418b077a917a6e405ccbde9f72ed523aa696be1a6f247b096b9235217bcf19b88d43178cce5a7d82335fccb4c079e00280bfd272b9f16ffefa7fea38d09dfb2e4874553b135052595812aed3fa15096abf1eebf9abd598289e0d156974de4c2654c60825d42b662ca7439816d9d3a0255f40a4965504f643f029da535d4b109e8658ec570e99859382ca0ede0b0495d508c63c7f1eff3f648c60e9b773590cc663a751178ba7603a11985ff519056661b9460c1aabc30e83bb0073a927682a06d1b8050c345f7920c1a37546d79587fae2a92c803a986248f90547f0b6c0ad0552d8260d2a0dc3cc76d092ab76b8c12f05dcf141167a6ea300bc23227933396ef6fe9d51a1ba5a754485950f06cfa6964db2d0fd1d4393cc36f0592fca25ac1a6aacda2a32f548ed20287e3d291661848a62d41504e4fcb1cd1785617fa5786712b3005f1a1041733df6cf838ea3ea0b93685889bc6b2857d80a9bc0e7a66f7fb3d805770402f049889311fc112dccc72a25bd127777fd87bf5ab56d39bfe6be2b45a8301c2f324dcc50b27540200d522c24941701f7293b8877ac84cf35638507c7d912a3a94e4384b68c507412df65d0c4ca8ec2da704bd4483eb2e0d13b68c0c2b68c106a55b9710ad0a1436d655a3cf3c419d5e6f027ddf5dcfc896a5b316a7dae9290a7bf81aed539a647c8c98e24e7ed6a4f7f00a11134ca715e5826625c250500f8f16b40de048b095b5dd08268407f58a91c86c36ca5a2bf4f8fc682adf1bf601da24414c74956e1a8fd2888b5260e980c32f6678a4dc4ff73220c22593d23144b84c2ff56920342248876d15ea54fc100c09a81b802dd15f030bda9aa08727ea49e34f0ca8693e0a06d0af06ea7ceddbf0584adfdebeb20510bbac683451d9f84cf0f4e85c34d979e550e07e7f414d6f1011cb3dc28d0df6d4aac113f2d5b04e4486ee2cdcd4157dafcbbd55e8330a7176d1b231d9f47a63da9ee30fec6cc2c5aba3a8c6154f79997af89d972743255355647235ee939f4f305ec655271e0cd562ff6f401b86dd5826c769298445108ad0d9e13c504551f74c507436911331db60ef0ea99dc259b13cfcb0596fa9b3c95cd7fc3b1611e3b012b6719afbcee7548939676dffc372276aecd08e6a14251407cf995266545427d49ae5ab245cd5d534c52542fc71b3973f0b766f3d234c8baaec8b74eaa8ba90abe160b4504769d02e08d7af4e7ecc167780c619cefa58865169b674b2b1e10d82f6560ba0be41a781f4afa46bd722566d941a8e6f87e4a5c03d89685a22a3470354f2922e2915f9d46288a5e8896ed13617dce694a595e379f25fe621dde8ba73d865976950954e5bd07db147a0fb74f87cb06aba49b073942b82fab33a878651df73df2721ef800b658bdc6c359d396f684598e93f38e79639b8736b02dfcc124fb9fc199c35f2fa1d0dc39939c57286e58a7deed7b6c76e02b99a14d9bbf11f65d8eb7fa096fe4baf0f78cb34736499a0ca550f10d7edc8909dc34b039e3abdf1aa67a51d37a2eaf4c07022897d4d8355d3325bcf392d91d02d462488ead90b366e9645b956c3802e4249d34b5b2b2484a1dec15a9477821df6bef5e1626ec5ee9832fc3bd0b63a3c4100d32fac3e9085f0b5ba43123f54beaa7ccbe6ba68231649f35a28acfcbbf97dea2d6cfd96025032b3950ec8437108d0f07baf1bc89e3afbc2cdbb5031d3cd9e20b19018adda466382059229e4c8c54b455eda4280bde43b36afa96e146e408c7104523d5f565d22ef86d4c7cbf9c6e0d0b30e37b37feb9332939c642eacfe19d0dae1259d3267635051ea5f9b518dd74786e45fb8bdf72cbe3753bd50bea2a961b49cc0e2d589e77fd25ebd962463fc728b1d288c38a79a182b124d345872afbcfe792d259e7e5334311244edc75d05f9a12eadb61fd3ff79fe8c097eb01a4ac1f0c339d3be74be3d96b0b6a15e8868d043a0f2007ee8aa51756d78b7a78ad90fd9a26afbcb51fdc20ed7a3947f715c833e363bb87504d8efc9f8b93a993e2e26430f79f3cce203b09093c9b456b1967212eb0db4f7688d4dccd4a523866f75c9d9e7ce07825ae34399c5607a60b771866a647b6d5e1e20795ca906e451f367d8c40ffe79a2cecfe7aa47a402f8d49be9084661c96ebb11f1b48e7e8abd2978ee626f962e98f99db4eb3c6a52aa2bb2e62194120ce1e773b9db784e8c9b5adcfb70e3bd5717293eebf014e9872c5c1bdf3fb296cb88eab5e97a5ac320092033b49f37d840dac23021c19ab2a89190f3c8dde927f6e6b41874bf71ba7747a616682bd5b3f17a1dad40f4993a1b186ce4f44afb4e36af7715450bac62cb1527eb8db1d87bbc4d9c99415d16660e48efd911e02f5777a77e72733af3c3f5315dd0c785d5212b79c46c3bccd74582c57cfac0d50fc0c85370476913f9d8e8e10d0f6602f2271994972de49ab1a91728713c3cfcedb0e61c270b5fb331a980965bcfe10b41251a0f7915d5943f49fb139626f1c424524f2fba3a407e77dd7513669894fd09fff4185fbb997b4e4677f6ea0b52892f013f1691bdb38eee9307a565e396bab484d91cea9268f49aed29e319b0add900b6a75f7461db5486aaf5366f98df05674361308931de753c70777de73337a996f6d4b0e06d63a69849ba7533bb0e446f062edbd6250e61a49f4120f84efc1cf74c1bd30cc61a2d719fa76991dab119fc814a7c56f48bd584c7935679c53bb0ac78905b5d961fcd89a4b567d17a5182651cb07146aa9a94972ce613e8ff9c878a8433c0244052f09980a52d800e97ba65e8ac186862def58c72b9feec91266e26aa5075b3337c7bb8716b3acafe666ffe2df32b78f9995661d3ba28f8a8780436aae1da2a3e6a0a16dc562b8d5df6f68391aab73a10508e0f55208f974a0505f0fc0d8a55049a7b631fc94fab91459ae1f199527362695b41972e50faee34c5cca9e35e8682099f5e9652f88cfe9fa990ff2154c89c1c2a4ed6bb8a889fecfdf048ee0aae7798c55d6cdfd062cbca97ca289578c832d658ceaf26faba54c9c3ee9eb5bac80698c1441b9cba287f749a5e30d5cc715a01c89353ceab0974ae77fecc1d2dfb31a5101783cbc002c73cd155dfd14685c2f9acc170dc437c649b6b4720b676848a7f9b56cc4787eabe72f6e3f2aed776f9bb1432fba93a63bfa44fbcfcb6eaa9ef4b79b32bdbd68cddbb9897cf5a02c6f99fc765790092edf0d5bca7c55cf232a03fbb6f3eae09b12e09a9b49a538e0589394700d16ebd3",
-	},
-	{
-		"3497e8d61062e6f2084ebf72d00e9a47b550591edeee9746f31ea28039a1646d384c4348af293ab778f92a4807c48fbd14e8dbf3d67339c991dc4aca7dae38b5fb7bfeaaa538611d328b653950f4f664dcd257b345917cd66dc6a1ea75d99f70549d1af9d67b1608077b41576f38bb4c0a13ff4fa47b251142c6fbb79f9a27f43841ed0ebc0416c37f571aef8fd63b99e93ae88db50e9ef7d499ae7433d5686b165579d3598f96d9e7b1c876870310703df8fdf2069beadb34984f676eb7d3840c4c5766dcee3fc39f0739260a499647429339482e232362bc72c92a299cae36e9069cc5f4db8893e2c1b9ec0b4f334de26c951090b9724c2b3b7655d8248bc12a27861e020eb1e4cf6ad0dab903279b6fbdabff761d4ba159c1f631e681f210a8782faa86e08e554b5e30046157a0d1144bd08a691c2cc2dd22f3c3a4e5d44c5d03f7e3e385382ee4683345c0d316d41ee75f87038b49e0ad3ca45121789e7e7b95615e1a9a8dfe02c044c2935a97b141f639448182252ebfc980e0411e5fbcb3c01acd5aa7cc5d67101ffa6ab6acacace5f02d67155c26dedc071ffa66dbad26f67a819d46de0556fdffc1b4ab6d60905d8ef873ea1e51c62571c08b4c6db242e733e02e11e5840ee445c290b2232010b118839b37d4615c4521e8928e9ad475cdb4a3de9928ec7e6daf0e20d22e308347b31e7e877fdacda0c25f2e5c33a329e84707816ff4ffdca30dfc753c2cf883df16016795db34359e9363fac60624ae4d2b30bc1f2f99c23d953779c22ffca145fd08dad83c0f76cf727196799544c6c07483e0a41ca2e1b1da5a730956154f531d292b5a39a229ab13bf24a804eb68786e481c8aebfd3bc557afceadc41d00e1472c3b80ce652be1245089283bf1a1a93abd3325bb6eea121db8c0e1d6c0c31decfe9dba63c89b881824b0531651fc500f2f75ca9e5fdcbb179c9ded5d600a495ea704c2709f4a88c4fadcda4cd82a5b089f25a6fe0161159efe03fb5e0d44bdb5487f25e8c9adacc389860f62b06a6a4f8f104d9171622f70652ace736e8b28b70a4d9fd3fa4b9784d1a6e6811150d0a0601d31d17f6041e58a1058f99b80b0a6cd4f79c79a104b6bb731ecc881bc68e1d99ab358faf43d8504957ea0152e46e27dbfaa17d0f58287276e4fa82ab78a03513d5b4c3199d1362e4fd6447d1c26fadbd011abc69332ed0181952b391f2e8a5c89d68e22a7c451f69a9573b6bb6d918c7e3d52116f3f12f1d43d2af46bb450f58bde1732a268293cfd9cf2b90a844588c1979a30d6ac21aaea4b9e5500ef4a8bcd62bd70cae6acc8839f818d23c615e45daf14335c36dd46817c9b816be60c3848caa812b055da33f45bc01721d6fb7e850fb1e1458f27c70bc34876a955aef11f5703cfacde03a039c3b75b99b2d91fc18b00071a28ce25eb169b946b49858aa0885a4c665deca020a3fbba55d4d9175fd91e7901ec9eec0239806e8305f8238e5270f4af5c94d0008f8a5564636cc33c8a3d3e76db2a7915abe798b0dfbb3e322b33e188c7b188573bddbb9e4a7edbd4bb194b9743c4aceeab449f8affddbc2b109eb3d84f3b2f8b18ea2962680437241d82bb6146674ff1abee7baacc38d5dcd688b425c3e3b0dccdda3e36de755afcf7155d3d7cac2e279baad167e2a743b82ff8ddf3db8ecfa9680ddf468339427a4e9fb8ca4ce6f1e790c24e7269912a9989088c65965b0efe68ed44eb26876674261e3e72042f5995f1a7075b3932f4c23a8027d0db35ce4322122f489995bcc0b3fa32b7298c4c1b3354766c866a2fc0ea5690c58c5e08ae7037f70accb3ca7faefc37d78883f2bcd768285dd2571dbcaead813a0b8ae87cc1df868e93500d414c4418d5c80b919f73b9fd46111a02bfc884f9d30ee14fcfc1d55d54256b9572afad4777b8d8172c911472a22e7461f6f85aca063c19d6fdef3351149ee6864e93cdc54ca5dc7837f0ead91f5e3b155795df5dd1f933cee8671ffc05058353995019e5f6f55d2de6470605a5411afcd7fa5aa8f38d77dbf496d7fa9c5a4d35ab661aa15c77ce42bed44763166160ed5bba954e470c293ca301363f5b837406ea8ea746057588c34acf266030864d8c40e2da88ef04c49205fad1607d456767d30eadd884359bce04c12e35487bc1885d9b104c9fd4dea4ceaf054cf46cb3c77a619ffe963acc9bfcfad0447591ccd32cdd1fccb1fe7080ad75cca2e17f695ce0095a774327123f21e2839773506a9f2d896bde87dc5e35512ad733aa408f8a49e9018d1013cc32f550c968a03308cdbc73ab444f0a79a13450d4de906369da4c6a675d7e338f738358dc238be4f047579c8ba7a60448da541cb9e57f22bfcb8c26280a59b77edd0f5a009a3ef1e2958d6d3c3372840dc6a0c6ab1fe86aeb7590137feacbfdc7da57c77595b8572b45c4677836ec86fd8c4ca8ac351397aaa3aa298d752754507e1cc514d41c3f1ae0a692179218141f65bccb9acf6244730c6d00829455d21371972745b3665f930cf2aa9f0abebe6f7b89094aeb4dbdf7bbbe794f134b6284e289c995ef2929fc1bd39b259259950de29e57cdec15c4a7d33ef6e689596a6ce23301d25c2ace77fe699d90c2329da4d0f471bc093563dc735ac2fdb32c6995606a67bc953534939ed1236003c004d3b47590beabf39a1e4d5d1b00898496e9effda68433da17d1ab3a32aefa3681aeac116c5705077552649153ed15e9d704e67d8819579feb02d91db0d3533182ff43ee5648f5cc9a595ded4772d61e77bd9bffd6f29fc1f478dea44c32d5ce3118bc8860b254fb0bb1e85223bf709a7c0b9a52fd3914f1b1f295fd246bcb568388dee43a32df45e3c798068608a102143b5511746903255b98238003eed68776b46bb0e64af6c9118ecf9896709aaaabefbc1f58bf45b45768345b560ae2cdbe4d7da497736da8013c4098addb4258cafe7823bdbdd715250b707b155248d39fc6773639e4de3b201fd3cdfa1526c4149ee7d15bbee680c956fbdea844b1470a287d430c5c7e2d7b51fa756720397bbe214c19df3399a989958732d93979e361f7266e53a59bcef695435db67cd8749d258e7d582726e1bcad1395e68d7848849fb6d74451a53ae6e8989c64701102959f7fedc6a5cf8352e218396f9181f33037ca74886fae6e57460bbcb71cbe4cbb3d3a81e2090434eb1d6d5baeee4ede251952ad88001ce047279cfe435a4afe97847f798d84ad79a11bd44f09222d2f3b7fdcc47ff8a4c61f40c4629a0f603193e0aa2164579a05726e547c9081abcc0087907f8034469f740a020e19623fad42e9cea64068abb3d6ff2f6680da328061c200e1f646816a5083786ae5b71728a0e5cee14d7a942379c389fa9dbc7afe7e7ae075c061df11e4587bc90f92f1b077c091c43a25e7b3e870ad852c2883aba2632063c4ff74a857ef7267816317f823a8bc5dcda311b513be3a40e6bdeb89210bece50a608e624f00c9d063e0c8878884e45527f50a3ab4447a9a01652322700f087b6f96ddbe96a68ef98656800eda6563015a6d3c0eb1b6a9b21cccd58cdcdd074b73e40a098a980210ef831ec9e881cb42ee07519fbdfa52d9c62766a2046dee7752f880dc9082ed7f050b49ed8d14307b1b811bd87b6db2419418e49885d20fd7ca8fb45a11a1da17ac2304393734b552b5d02a303ddc72d1f456697a287851f207054c18a6262f5349348c806841d21e11fd4e4ed9c01fce1688483e009930079f7d2045a34f98ed83256dec66400a783d58c61619e6e42f6e2c6e6fc69e76651b96aabfe643ac69681955ce595f4696b80dadd1f3910061be6ed0840d47e928dd93e7c3d6932d3ead820d06e2539d9a604a6b53db6bb599da851de7cc060faa9af76d708a9aaf371dbc3eff0fdb99702504c3006f789a49feb730cabe40745837e2c8c17c77f999333798431231b337357637a5efd1eeed891fb7475f2c9f960e67578adf50241287bc5599ee08d0237f08c86ed9b75b62d612a9353e48cb4cb022d78f73fba1fab7f794a5ff64c97e6c91ec464847a81e5a5253989a1ee54a41bcd9b4b77bae6e72421471a7ddf0136edc59b72402d57e542916ee47fb3988b7123c6e8debddff2df171d4ce61e83c3d41f36143c9df97f2f68639f1bfc2a9d1fe175fe9f45e17e5cfebb330d3f06e15e3cf58acaff09ea576d896359a3f06985765824bc499319384e4c458d4326db801c564b0b503552bdbec60752b670d82cc8fce9028ff24ade3e805b81a72701b37d4ccedd72118b20d792739e035bbacc4893ded88619a6c499f246311947e48684a35406c4ef279c71ab2a74f6e5313f7900080f19aec3a39109d4aa41c930c66c84cd2163f4cdd59fe84a86cd8bb6468bce45a56d09490e032da844e6d90b436dd874c1cd32a75d1ae1d3e86d8a2ef948649eb56dd7b360f55ba5dc34a12f9279945436c6fb83d1ed57ba4ae1d9342a3dc2df9baa82fc9fee927c13439ba5bd2ff9f3e6f577b8d2df731db14c51db8a14bb15bf3e125f1ca4cb2fe856c5a576cf995db5010687d0799581c5e76d400c1855bb46680a631cc582f51c589a831",
-		"823d0cd34e7450550da9716c1f456ce0cbc79431483a6214939266581b0e899e4c95719a09c1ef166a618289a6ee6971b6fea3fe380512cb977823b387ac51d341c26d4a835c61eebde37764d2e1d588df7886177e98e3151106c898b3196bf4dbd83f5f",
-		"a4639c22fc7f370d8500a53819102df5e86c541c0ca10e8f6564e50b90c28f34",
-		"34a04df283c45655a52bdd84",
-		"cd8d1b2e5f65ddb3c0da8f12096134da22ad4d541444964077610aafc1f77f8da5ffc75bee807541cb6eb0526e78d57fd88fa9d9608914cf391ae7ccb8eedb0aa711889f9b6192601163b271c90df5d69fef487b6c05a24fc667469cf16cbd5afd58fc830119fc9f61b26dd50a96ed84c96825a615a3aee84ea4c950152323b20884346b25c9e2a6be3a93505ba059fbb114c224bed8f05f54eab76b2c9c23a0fd942eef9696ff67484b542c8347f1b1fd7df7242872b3528c9e45030447b2bc85eaf191963291e4223b75778335e5f1256618ff87bbd68b5a9e5cbd2ca1dc8aff4625c834edf8fb0d879b1f75ba9b85895a6bb4d7569a41bb3be6cdd020065bcc69b44a8fa335d9418ea2d090d8061e042e8e1a6ac03a6d5525079f14274079734ed42c5c9ab9986f0fee6bc9ee6c485e233e9b4d6de70664902529a135a5675ae129353eb2c00b73f226e84fe8c594272d6eceaca28b6da30492c92074250ec80beddb7208f9b5418944305b0864009b3bbb3dfbfb4cc2bba3313f8f7c6c19860f1dc0f5d7aa06e3b551adfc63dddac980a79d72bd2225d54a87a93717291c7b78bdfc5521f7f3239d5564fe9c9559dfefe76b77efc2e75991f31a0134529a6611ab9ef076491f2d2d81ffc5774ba8f8009dd7e5881e09ddf5116fcb5a44e576aef6cea91ebf52c56c742049639392cfb8b280dc2229252e04d8d394ffafa539290acdd8118656e7e1a4f7bfc0bb689448379e8cedff7590a09a3f5a29bf819fd87297b96ca07431a29a07ae126eb9d65e21824c16707db89868e127f17614a536de6ed268b1600a8b02aac2bca54a09b7cccf8e184448df334f95b9f0221187d56da7bd422f09b4d94228098b563df53414a5a86728962a2ea63023d8c3f03847b36db7cd189ccfef3e623b14842b8cccb18b4f80f01b32a4cec48f3009b98ffa25dbad76089c8700e90848da74aeca81d01f4dab2b7e844a3e48bef21f33c92734b821ab382bdf6d0b1048a9866e676b78ac9398678ff626d5c173a15a0a7514b2544405dd54eccaa2791605c87d7117bc9f8c0ad84623a9d3a2b1733304b492d4dec38f7981db9361b03a2837a95fe937976c7f4341a802dbf583366fbe368a3af3f92618046bb55696cf7af1f465a5a57ec5908621f431ffc762f35abe892f772a60a3f75ad8401321f67981e90083fdd1cce40903ce56a629120d6e13c8871523c4d848664331966298c8b31a5bc8174a8c14f61cbe98ae7ee3e90bc832b04318864d19a9b8b6d49a260f42bb120cef9afbe704faecf0f428d917ead9f020f5e9d772bc8f29600f8a7623d8971c1e3c5f1a3b094191e497bd70f85de124137cc4b9fe0617cb73cd44b89aada072625e25976e7aaa5a8fe9d9e3f32db47d1565aaef0e84d256bfce6aedfa1a2dce5a94976a2bb9a0da95941fb7ed444990b0e0e87627e35f3235a998019650a5e5cae804ecab8cf729a5c712f1e7d17486082dd50cbeb2ee1b0be6a7bf08a66ab3cf1fe9f49c7083f5b8ad183f32fb35fb8a41230e4041bcf0e5ef54bc3d21ecc1fceb08d95d745a997e8f2fc3c0f6b1b6c1c02e03ff02ae0d879d13eedd42d9f9949ca7ebb785764162ceb6c6f9944dcb3927b2f4eab23ab566b2b2bcc0c7d77b82579e88203602264064ce98b5b1ed992c1bb13edce579ae7f5e11697b493749f308b33e47512533350df5c07c3dadff656197884f359cdfcb736d29231aea1524b56e06c92f5a98ea663543f67e44003f5b41907a951dd792468c84c5e0e1b46149a5c9751295e153990b78c0cc712889a21b299b0315150dc50aa3b4f7fb0079ddd39d263a754b1dcc595c76ea9fea6c120384afb38d4bd40491c4689b1afc9dd096dd0327c84802bda6bb6b7a8830bc6c06b308ae9665a8666a5551ec954eb72adb827ef38f036c51698a28c92dc1c9e25c267532da2c04c1bf27f5b683ac750c3ef53a8460dc186331549bf82868f9327422c09afe1cd15e161bc41a70cab2f973efcfc8f01a380b86a432e1ae540e09d404d93d22a20dd5f685a52f0acb863dadea236288b1714700f23d1c19e40e219e8ed21f6a393e541abba850ffbbd4030e5f6567b7202fb66d86cc2a0beabd495814f6a50690e8d74cb8b093e4d43261fff80e7a67ca06dfe808899cbef84c09ece01414baac740cbe4c656b17991868e2a136f4785a0de311aeb18cc95ed33fbece22aaed8cc1e47f58cf6c09a6f92c96f37d2d2485b369093506f5e9f8534f8569655277d0399ddd3d33861bd40c71ac53a44d1981cd744d79202322d47a0228356c0e27efa2ff1009cf2a416fb6e8844eb76b8077a4a3961ff193e1c95b222e72688ba48be82ec5da498e58861ea613782ed1ab50a95b5cc236834af98e61528ab18453c20ff978551b81e1bcc0ff4b7092bdd9ab0b946b7324b7361ef05e1f7d7f6a336281b4bb2c671a95a6ab84be6bef1b9c8c3d2536edb8d79b40637e16d7281ec5243016232d7c9fc07ed9dfcf555055d8ae65f12ad150da81f62f2e1e82b3adacf6d623ee4759ad61a09038905bcf1dbbab671dd28fc1d10a0b7eaaef73a5862ab449bd84c8698d061e79fbe52a86739ba945a01353e0f3916667bd7b4356cc65451c7003927f2aa738d98245760550156dda529be741ce3ae1afdea0de35ada26ac241fcb5d518e6ee7f9930baf88bacf8bdaccbecfdb920f3b26285439912a8902ae029b07f28c1dbcfde780cd2bee6c6e5f4520c5c7ff3ab5448ec86cfb270c39586f80041f3764b5dc77dc5ced0695c89671cf90ed34c4067b4bd938b1493c7902dd94be824810a00bbde4915d138fcc7584790bb0b6682fc0799cd415441ac90c1caa008c7fde3ab4a3aae478c64991ebe07e6c4587d3046c9ebb8e125e795f0be9266bcee5a4e4355a2830c5b34e583b0355b34b89c08011db6f6b8371de003074704e8cdda37ce42c7e395b6a37bae3dfbe67bcfd1f125c9a262d56883ddc028773988270aa30c6dd326cbffee589f38286533e1d5c9486011170be591beab5e0ce98837cf91f0a58d69d872e364aa88daf9cfa71bad167129420282d99ed5884a1276dfffb2c4100c74a8b863b063c07937f2e9c12523deac4ea16178863d975e3a5be5efb5ffbea994d07f7ddc5326bed1f5c9415c1d4ee1667e3a581499bb573595158636ad94d84f7c6e4b8efc2b141f2bfab7932a050fd88a8c7b21877cddd488543db5b11138cc808e1248b6e2ef492faa8a32f9d93e3c060b5cec10f03794248f9662ed8c283a8e0eb493824e2750ec75b3b1292d80ce002083a3c64cc487afc31b20f84a778f386b012ef7bef46e638d0f1cd75487ea46e05621d608482637b3e642a9a2c5371bead4386eff968b3e007fc263086d8a930dc76a8431a4e6907ae35c7b3291075d1c723f02e4895714803c0e97d65b04c0f27d01d5d68001bdb3bbd44dfee1eff1754fe8c182cd9bc6ee273beb2a444ca1766f747d86f36cd8cef6eb1dafe0c38b9327a8cac6e83e076099188f02721cc4de3d940c3ef19d9b067be07b890c798a79ee8c44d96c5e05ee5d5202d941a674378386233a83bc85134dc8c46a7531b2b952fb277d8089cfb13e882bcf7545f0605271fe38bf4754f98dfa13fe6b635a62bcf962553882a8f28a9a5fc0b3f85509b702d4a7555d40c4f7d10fbe80d48b4826995fda7d15f14aa9b95fc6526101cf09c97fd74baca6bd26b4fce8a57b0726e0f68118969ec067e9ca39b2ba59fb0d78eb5cec5b872613b1b76763b3217d859bd6d991bbb5448bd4e49dd6597ddec9e46afb3f71d254aba828c91de51904139ab19138e36e6996a207da80323d96077c97a3e8994296376d4dcb602f1e77371efe8b020b7b6f6f7bd2bd733ad9c06c45b77a2893d73b4a8a57707969af74ba06b2fe7d4079bcad1cfeb3689ab95c8b1215fe0a855eb431f67df4ea589dadbf055086924e42cb142c9031e25b81e8e1167a54008ba1ad7fec6794f203b27f3092dd72bb766c9653a72b2e25c965f53487cf3baf74eb7742702380303af8c0a61cca3eec78d4b709e35e2cc5bd586263d9f56fc12454547bc6165e3f070ce7b2bcace5c8cbf52f987568dd90237cf190dabd4ee7a80494692a5379b013611f4eebeef8e1ab9a9c5ba61926095545e19c3dd61b7b404230729aff7d82b6bbbed6b4a926f6e49189e3bccb578fcb3537951fe9c78ac842350ddd80133275ac0bce3a669183776fee8288f874d29190b452d65bb7d8edfedc6fa0ae147102b92041af6dd8a566932e016763b60a5b9b1e3667f228cab075f966d1c525ac19d12046c6409345799adfd7154b6d8b51eeb1eab3a132ac6a2e08acd1a34bbbbdd019195af9f8a93c6ed5463765173e669cb0d42b6cffee1a4b45987853d43c02f920819f45a4fe0905d8c65aca182b4bf56fa0dc51cb53c642fef003d92c13ef4bc1bac571cbe2ba3673a49694f6311b7dfc17a4069759177930b179748d4403c7259e10a5d221cd0a6b745966e598f894e607b779dd5289fbdae0b4348141ad373a62c76aa454b35b39a7be875598bb30007fc300606ee2537cfcd7c22b6149880fb3cd8eb53054d698a0d20f26a5c3ce468255737a68706784",
-	},
-	{
-		"5622aa8d2f308dd468a7e4959ccc01f0e80d91f79df65b8201eb44911f6abc758c6703bb97908fff377395d33f96c328a4541f414b7ac34c6607dd85729afbfe01feba988e4997c6bd2c99fcc35d2467b143a8fcbe6b49247226a9e4c0a4e3c1a29d5931e6f1f7a31d90a0e0edc4479f08ef9bc65ae4eacd0b93b1cb38948dda31e60b18d702bbf5935bd580201d1f280cbbee679fd834aa6be576a37a037eabe989c3c18c7fb61fda8b9ffaa8bf22b57a101c19e850c454353af7af3d755b26ff1ee78b9d9daa78294972d108958682a5a29c8ef260e2289ad9d7d74f32fd4e51e5d9ee828366abccd97dd56e035713a6f3a1985383c0ed5d98c4accac2fa1ba7d30a295670d5224952f7b7554fcbfb426c9496f054834dec48f9b70af3d2b1c6dcda1c4daf3e9601364e57851952c785e65d753be1c22729bbde33aeb1e4748dbe90da6ecf716f05bfc68ad819515dffafd33a909562b95140ecfff1d0747f8e0459fcd3ca6cd8893262614bb4bf4b639285f327e7ac782898781968ec98f6f0f2f3c4bc5f9c4691ffa7ddb3662816f8ad092095b598bd4d10d6b5fc6fabed619eb11dfd4d638f4c0b6cff7194156a411e8ad6d3229320336ad52fd9811c3a1fcd571d1bbbac67c6186737ac7ca1ed9b2bc46e4e578f81c164b09ae5cdd4059a2c22b5e7ce1dade684e49200867f9bb1430aff9b99805cfd31f7e3fecbe898f70a4eded86b8bbeef7050eff6cf8ba71395a7ae2e270a2b58010e56cdf6efc4003da3d8a82e96979ee68694b6113cc9a6e377d40a810063830eb95005a81405e5b7de8de67424845bab1911bc55da6338513742d237a555465fa54b07ba50ed712e7a57a39fdcfe4af50f064ae969823aa1c40cd86a621ec90769d0c1babd33e8388a8bd76689215b9827a5819127bb32ecc80a562a291f3192eff34cad2635e5b0c0bc174add72e2041864953f1fc72be7d28111fba0438d9036da3d5c0f220ccfde2319bb96fcbfae6055ed7f1c1967ee9a78e93bbb77cbf151084d602a5a2f087d49c3134582c1a5d7af24f4c88be26204cc9dbf4368b19470fef49a5823a2d66c65e9b1e8ab56bf5a7bb3220696840a6222caa58a7b39fb792d95d25038a8bd9d916e853cc5459640f8b8468e3d51f05f1b95e996cee40ffb7ae14cb289094f1b77d5573c1aee7c12a6c3a1e31491422f272cc5f510d4f18ab63d3c3f468c5abd61b2fa7ba0768d46392e2a4dc06c7ce79841dca916cd33cc0a700b50fc660e5d1808d8b87e65feb89428055495823b2dc317d6d9e50aa5ef7ab14076174ed32f56abe7d410e58ca40e92f8a31433d0d74ba7b130b1561f2b075fa11ead744d031f34d82f1a64d428f6cccb0a009be24b42937bf3e99a1ef1fabf0fa7335dab52918382abe756d3de229ee8223aca6d7c5de87047838e387d4e472481a4cfd4365256e13aacb518ce5300f18dcb5e0a28477a6fca08a74756ef6bd8933bacc98d02abc7ae60df7cb3e06d41abcc4bd313c543ddcdea2424d98ffc6dcaa83658aae11f5841ffd4f5df42368a0e815d2146a0fe138b223764b133d17cdb08d485e9f3dd2bf2b220d1f4565b02d7b9231d592130e4436849f49b1a70772244fc0c38da372a8c57fc80ad57828410a5a16ac6d14e093997fdd5b26e4cd4b248e0ea221715ae6e112e1b68b09f795540e31b1231244bc922207b906c4f42b5302dd7474286b653b4d1bb657134bab117d6c349fa0f121c2f8dac9cdcef510c1c28545eae0ab163db6cc84ca182feb858c10153d0136f00a01c9c7d0bed892715dd85c4e73627c3a2ef0f43710dfccacffd1d9f118c9fb1a83b2eb328b8da3e955f027d95294038184f7b895d77532c7570cb86fd6b37a5a66659cf1e330db3930f302838706050c0dcd91d532d49c89d144e9a7f864026ec99f50acc02bd5f11ee88495ee8991ec4723b189f84e03d992fd718b5173ea1b033ab7d3568dc4656648fb54d28d3119b0f293a930a772c394f45ee66838f17b73a94eca27033f9d5c2ae22eb813386905dc024673850a087958eed191d04d05798bcf909eff2deb2a0009d223323b290e3d6f71b2797a2bc2590d54294a5992d629336518514032614a04847c3fad8a7d1cfc2f86765b48cf58acf892f68b691fbece38100e6a71487ef5c4ae934f1ba03b4b26a1967f70ef1c697202e4eb22a3a95ab3b7b524f0241ab4d2adf3ee5e3f2974d0bfe4419ef0ab11039ffc26339570e74d260c4d5a16f22cb4f60b03253487f5e46c47836ce29460728086a615f78d631d89a06790928455889f58adc3d0a3a84ceb2ba9cdb00a403080e6567873b985fd59fd9dec71e375013c12c51cb67d599198f36f58fdaf897e85dfe6f9896cf6d35a84cfdc6834dd9447a2a10e1ffa9fa8edfef1db9e8b4a245b211de49e04b7e88977b4e1ac9285f43526f2452181ee0f80efeb1f6b2533b656519ae45652ccefca81c17714476b497e5d8e9fdf6c9f504c7a7fa7afa36df5f4f8da5b4b973b1618fc8d2d43e866b235e5420551d1659e5bd545fb78a3e17d9cbbc8e842f3fe6be07b892453ffd689d5188f26f9e4c545ba0b3132af12a03bce6914015d026d3d7df661c1e6384bbb50dae24abfa78079a2b1ac41c44c7d82a59183f293f12011e781d3cdca2f791afa5b55a9f2d6139587bfd74bfc54ce91e642847a33b48c1b366fd8f08f520b79ad5113a0273735aee71ceae361a97547fc09b22fbe4e4ae4ae13e52d65e0971341aab368d1e917c8f5f2ac57ac119f981b51b7c99ff2be3e16935b7c73e28fb58d332e6f2c36281228c479c4d6095cf15b14baeb0769191dfc649a70471a25d45d4433797a5b8ba31ff567e60ec4d759d99244d0fb5dfef7c2896809938ddde0d2015a4c5ce5ef6cdb5752da1c2a33e5bc78b6b7c6a5af892f0792c28560a357720da3cee3833bbeda8e98e6a8cccc6535831cfc28bc8557b4181a3978bd90eabb34b99eb7e55d9263e6790ca34561d8c87ec4e12b4a38df524318db00a9b5bbde6f5a8644a818a88e91b521d716fa9f95bf70b109b9905bfca926fd42ecb9114c039790abb0392a41ee4c190536a89ae6194befc2dc4bcf7562bcb84f65c99b69612c0511552f53436b6c489204d3881e1f67e0fba3a061165d2955c2e2e12c440d31556250a8a5cc04ee5e09b1d627c14e08bce1a92df7f6475db92a3ee57e4c16c3ae677c44237122818ad457a29595ab528744707f3ab7ccf3d20bd94047e013e647802a7af14cfc7c11441ea6e9b9f960fe69d03911ad2cf3a8f633e0d647c71dc7e188c92e75353fc953d6a30dd0040c39d4355b71524f1a4872fb1ecab22c8293b54bb22a80e1e3d4c886d2988adec26f041dd0565cfa9edfe5ad9aa7da1d3b8f68fda9e9df9dbe98148120af6ff30e6400deca6dc9593dbf06c856d0d582503e7ffa185f87c6e7ac58184bb80b4a1c0c18d669e23f9791365fe807356a5763ea418c39d94311759b29b14324fb6f3104359ae66532779b825f92b7c9ea2ba43ba7de04eaef7a86192bc93e17286f1b6e0a01c33c796ebed8f17692eb9237173a051c14e4869afda2643bb98c9ac4ea94c6bdc1401c80190df6abe988d2f0b2d80cc7bc8362ba25c6e5df4370a43e156aebd6aaf856b3f64d5fefc622d078faed40b760a361966a4765adb809dbcd74b7a41faffad3a64823860e5656874133c7f8a46b5a3ac591906359aa4f171ef6bb2ea6b5f24cfe25c2fc7c1973bd5d3bb5f197002c5ca1bccffb570f0265f5cd949c7386d961ac9c5e18b5d1d6030d8bf4a48c10f12dcdb11924b02b8ab5e91f425ca62bbe42b80c6b6dde3160ebbd55803966716734327058e29bd39874f2eac199067fdbbe8c372c5a688d3615e2b65f4937b67d6a26c64cc2a9e5379cc00925c678f174f538915f912e85b7014c064a73bcc7ddd38e1a9627ffddb4bfd6da764fdbfb45048c9495ab1a4cac5642f6c9ffbe97d33cb26964a23719620df3d85dcfc392c4502759fb31a6a797e99e51e94cf9bc79ac15de4e5cf7a05aeb88a8ab4c3b6f9c52b99794503f2c49cd7e230a67df7403e552523249f29d257b35c0c7712053c3d9eb583a1a7473d7f296d25a66566e4ba8b08de2a31b082e40c8e5b1e93985b324dded3f52511744e7e99f4e3ffd99d8ae17bb5122b37f637c5525558eab18a378f5e2cb56fa003ed3af8d139d16ec4b2ea79c415b0ba4d750ca2cdf653582ee3b65a9825fb9b123593e36e645232163cabda515b959ed0a1419e9894f6c677ac200fd11babe3503ec7bfa319f1b9559d94a6f82945c9ca8667621a5d28920949a1da644cbdb58b84742e9d65e7f2027b99fba4dec46f642bd17e88fa109143b26ba7fe285c89add0b74a369f3d381ad633bfb4f72e1822ff96aaf9a73b3c59a6e457cf40e17c1198c64737037f52d9b3118daa3fa5cd3e3c7738e3b3743c595893289974a4aa0d6bf1446e70964823a7d5cee67b9b25b7125d9ac5d1d61f2a6947c3deec6deb575e2fc5cec60df26de3c0545e5b79156dd6af33a78552d1ee9994cc8501b7dc5fe7a22eadaf201a92e06ef03be705a8bdb4db65392d3628c7cbf44cccac292c93cb5a407a7a5a0d5ac9fd95b0033d6eb719d3f14609190dd40d5aa1b983cd4c4e278cc8a1e7d5fbb0d39060d6cdce8de6a17e2dab973a7fa594205e17edab6514372eb51e03b0ced6402fac0efd3af49fb8214a505cc9f5f0ea5308d7fe6dec369ba154",
-		"9f522375925222a04f5c95ee14b6386412025903ecad0bc3ab78afe1145136b3a3592835ab4ad6faa66be9",
-		"d1ba82b3ced3e9817642aaacedf482e79bedd0560ef2754215ee792514bbf8e6",
-		"bb21211f342379370f2642d3",
-		"1a6683805d3f478ca1c1512b9846468378f83be27393db63956e151ec408368b47334afe610249182f54c4d0a01b704db2aa90a9755b8feb67ef9301f0715d7d6bdfa5cc4497cef1142a43eeb42f7c413e8f489af30d742a706d05a40a0c4a5991f9e2cc5d9fbca6ad3767682e20c146ac35aef38dfb2a77388b738fa022158d5c802e5f0761096bb45b50815ebf09172759521b5c5d459703ebe9ff669ee4d14a86e5d0650b597f4a082ba0aef366a924ea378b91c3262d99f48189eea19c76c0f644079f8415c11033cf24d30d6c149ab13ca5c29deafdc816e457257361c1af4b915da312d2e6c7fc712faa27be3e67c893f9005a0e2c28369991c1dab22d38961d1abd6d94c4d549cf491aa1f8d522be3ffa6d214825a5fde3c94c4e35c29b8d05b2627eb12c9d94f450a85eec6bc963a279a37c2344ca36eb604c4bd11c2bf2ecc0dc16c2c365bbbcad3541bd54f8d0bdbb3ca4a087b62fc19fcc1c13984eab807d2a6a1386643d90d412d027bcd0a638765498cdbb1f4cc1b91b69bd241eab3645f225ece85a56e5008d6094041f8cca6b9a0ae3b15585de6fe0695d79d348f8619431ece40e736957a7627224fe92bbe30df5124f476d97e36b5b08b3787e8e00f0c10013068eb156f82f3494a35d6edd5f7048d1e91954f1013ede22eca8b4ba41699ee08decedde87139180a567c6d169b672af0f12aa09ce20e9cac4e78b8067d31ba4f63606c00d1d787b868cf7643fbb170f8074667c9f7584d36af80b4e6557724013618c28d0dd40bfe9d4b25761b3c99558af528c2d290d04b09821bd7f992c044dd61dde9395bd0c9ddec6d0bf6e044ddf0b4b2d6753f5acf2e9c904caa4e9f310578527b85e6738803758da646919989f735b09c9a5744e63fed2c3982e59fd29d2baeb9771316bf8d29213a4956b66c78d5654436ffdd82d0d572530fd09507b988d13fd743f35333237681f8abbb301a8ea870159f802a57760659094d0e4902036c5a62c563f1fc86c4238e1ce89f5176ecaea194ca112fbdeefbef4fa7c203678cafd34486fe58b2af04f84a1cb620c6e123bfd96301e0a5e5e5abcc95d28b852d0cee2f51faa73e42f22fc335f50de4c3812ee14038633a195083f3944284c1086c34995832c3cceb7d385b4ce86af10685c16005495121105272d1d739c584a07ec7801c3667bb280987a8aa41f9537e9d1812a5dba5b385a0b71d2e9573c6f3e9ebf0bf7267528946a6aa6f43efce908d32525cdc3b825bb11c7239f1de412704d24c17455b9382fd6a873180f0d5d44dc449320973d5cd0d4e67e83946b6ef47e5fc3dabadd80751f1421404e56b1bce748b7bde63c6975ca81f3eaf52586a55242c9745dee3f7c796d4508e818eaa4fa50490c1a79624561b98d2e1139a328806414c905372356a22393ea0da51c83957029edd8c2dfcf46d9564264d74c1c0497034ec018b1dd4c14acebc34b6d2c1a616937c37b8b4a0ee5dcdf787a0de1173798ab929b72e0fa83a6c9b9a99d8024328d9c236a8f57550a4f83e8071eac76adb55939f85f5b5f514174b670a3e8dc2b54656f6201940a81fe4953d2680ae4ec58635ba74d15efab3e06dca6ac269711ef2d4dd49f731e24a92a3b935ebbb3fe8d001cd4062669ae4baa62c2947033afcfaca227d88a11769f87456d5cd1bb6606891e71d63aff9cd5a7d23263a78768ac2ac54ece1441fd37d096cd27e916e68891137fc3cca427febd1947cfb4d7ccfad75b2ec5e809c132111eadf25a73043d68333139bd2435de9941bbc61c5c509897cfc19a21645019eaaccb6d06371e3d0570c09c7556e41a727e44d9bd672fccd1f89cc7d58761c16df8fb75fb8a1dde2caaf088f02dad91b6489114398740e6798f3ea8c7b0cfd974e160a0106d703d9589ab09aae79108e3212f19cb950ea9c0798a1532bc2a065d5900a12054395c0545b0878ac0b1d461f553dccfc2a22bf254ced88dcb538e3889549960b77ba6237ab1458e158f4f46606372e797ec9d9ecc6534acaa1218e7540eef11030bb9c3e5a7816f3b33a590d970619bdd2dc04d5c6f4ec38b7cb4d525234b836eab57f65dd045e02367eede9049e219b8712b8d6fe178080c5f77b821f1a475259ae571a5578eb3b48863162d45486f71a28ecbcedb35b320e5b6401f9e7870aa5418449bf47502626e1f42abf481b48d5a6819c640bfdb64f873d583fc4e40187940a6c3373ea7b47195270a8657898f55568985018abcea9bce1c155d95b426f91a734b2a14ec2c7ca2011a4d30019fd9b3ef63a804e9c30c3de2651c4213e90285a4ba100b31ee402e8a7f23cf9d4dba003bbf982526bc63be5af102dca34e7d362d6fbf6f56046160d7af33b364f2a86074d1c0fdd54aae89b19480efde2a9caef9de7c0f9491e1cf43a48752cef405a0ff16b0fc67bbe433a3c1b9661406c3726092efdc076febd60c436476f24dab1b0b8f8893986d951ed72282990e8b1526f4dcf539b22c01c6a7eb5577cd540a16a81296ebeeb7ddda72e60fcf2840c5b42c5cba30eaea5402f267d1d04bc80da5ef0dd2bf3c7a2be986507617c9bdbc96c6273a0c9e586a0c48c98b4552113149c6f79557fc8ace0b1a512fec3aa09ef191f95c2163113ac5cdd940f0c2120509bc53c3ea493c54703effb902ef752c830c61e85636ca95429bf16937bf6786b3eae1b277bf08dcd69f521a0078d633beb33c9aa0cb33b238e1021ca67df122a403a3698452740bdcac81d22ccfe4ab5f835d1961708d1faf6d40f115f16c6094ea37a7ff15e0534f62c19a6f4ded0967be337cdbdd2a7c58ba16ba2e4c3686e9d075c6fa7d29b2a0335ab4940d2a95c4500295f4db84ae65e46c54b7300909cc5411c725a31fd962d239aa0e2007c285586b4c778e2ac7afec42cd8409a63d7cd9c677031f43f4aaf04258dcf1270c02a4764177aa66db2d8f860eeb1fd06d0b27587537410bcb641f90aaa7bfc6f12bd143f66e7c933a0f3ce6b5048913e1b2d79eaa6c19e7255d5eabd24d5f12426339541a22d600cdfd1781a1a3894740887840aa82e5a461fc324285b0223ac9b95c3eb88160353f168b3d4ae8a2e87b7715b5fd2671f66e6eaaf9365b3d9e3acd9a749faefba6009783771177aa4dc91f72fed7a5bf6b1b7738b84ac0a07b4a5a3f0a9134a39e1e7e3e2f9a92d5644295f31c5a356092bf07c709b4c34305ebf50e857a4f593dd1cce0439d3fd125c1ede1a48f583bbbe0eec7058345129ef78868a96f8a76ba7fbfd1c5eebf75f3e0eeeb9db87474b96f321b87fffc02433513fb467fb74e2fc8feb498d51530c753e9a173e95e0edc5ba9802641a45db281b2e2d87d409057b4fb1925e834e90fa5619ae3a9237d5b104e7ac67c2bdc31001eedb4ec7064b2f72e0379bf8780f67ec4b195db014a2d130e77b1778efe3dc703f1310a566a6d3b5c9b12b1d4e25815493ed1510a516a31ced3b64ca49a783ad63ea71a57290727fa31386d2fbfe41f12d36a618c6c28d8f10405eb3e0a33e8ac2e4133ba75c688c8c9a2bb33c8fa032eaf3ea0d2c27bf89269c4aec55f8232b292e7fa9fc24527184f19187d9d8a3f52335e2feb5dc6d997b9b773a79a31db832b752e5738963ee5d61a1b426414975693f986e165e52d46cb059fdd4f48f008e96d4c1a48306b7c002fd0c861721656074cf11173ca65cbdb694c79f58a3f3365e872b24670b691682c10261eb1ffb2b65da031d070e31542f49704b77970a78bcfb4c4ca517b4c966a4e8e27664704f633e90cb7d7917dc1d3a8b8b7fcf59ea3a8a81305761923cb182cebdd59255803a14ca8a75fd007670d79a25eacda1138d67a0fd1da981529dbf182fc4d7a700ba498e4476a1d415381c9e2ffa3bd46201cf2e454c4aaedbbe3893bb4121a6de02cbecc1f319155eb8c99d1030103bb6194bee51e74fa01f28dbe16092955b9599d5c1f1c3f356e26d48fcad7c4cdf0eef25c25273dd62171785c9d2c5a01b1f3da9b4786b1b399d890e2049b73c12de2fb7177f2bc3d9c645398111ebcfd83b73119897bb994f998f4a6fae1b3d6361e171059dba0bf9de9af7a5a1b21641790baf82a36278945d649cf5d310f3792fdefe8c58986a48118fd94647b786e47733ae703701e18992bc1b143b1da6110a98030bb9895c14d7b8eae1a155a550e219a5b6301b6d26d7956ecfe4c7023eec1ff62538b3606ebc7906a1243bf8357f593b6cfff32e3fc6b51f6a0ffaecb658d526f7a5e9faa6294e4808b779f4832318cc184e49e8957b72bea0d67366e040cf76a85889fc6b04e84afab0d02947d0d83e0de19f12966fa8372f6e82ff402bd7a69195eb1a7864a3375aa9e23736fa4d4b0224647e416474c01f72b7d4af240d7f43395b5b04c8fdef1165ce1d56ee8ba0e350e6ada893e0594facbfb5f0d8829ae203929525951584c21371b86deb0f76ef5daad5e847135a6488b35ea33e3a165fea502975d6421d4567a229bf3ce94605885453610eb9c82f9ea743bee9e14776bc3076a29af268cc72d9092a492d9ff08c345dc2eb2f8003b561d9912ae1198c58107f8b37a08b35075af9863110e6770425e9d59c2dfff9d9942c8bc3bf7904c2a952bcd573706caf1ee14420564ffc433c0f5871c4bda916f2530ac75819ade49fa1de21edacbbf6b7075dba21a84989411c566b7c356b81803c7215ab0f326a6b8910dbc62c1bee3af51f105fcdebc0dbc56a50b22cf81eda563bf8c2eff98b476e8",
-	},
-	{
-		"99444e82c6c4c47070b164f298ffdf6955ee5bcb3070b9aa95ce658db4db084d2056cfe61a93568b44ba7ddcba5d450f4ba0da7b119425a6628b3416663c638692326cacc5c237097db5e537122b465dcb21d8dcb5fe831789b72deff3907685c2e23187a56990221e755930a09f8d6cc065487563cb8cec82b9dc754952fa0b342c92d99522fbb39854e338f470a4b4d5ed2a39b8b6253b7001b0b953abc588d757616c7a5d1f12b1024aa572ef5a47dc8480943aa6cfaaa78064fb2b29830280e46efa418d0cf38f57980146f2482276c9b6b16f865b1606bf1131e894336979a163ba2e70adbdc746be0d38062fafcfe5603e6bbb55717b66a263fbd5cc7476302ea4a0dc6167221f745a26a309f5886934f4258965a0ef0803eaddd05e54008df8a0695a078b797be59f1eef95a658c99a7d52001d4108212ce5f18a39f1173291808c980b0513f1a531e03ad7380372b65572d3967af4c25fe54d99d664cb67e557fff05c12e10143c13b1bfa3e8db093ff832a7978ecd85d3971349e3c9b83939b73f0ad55f1f1162d0c106b99c0ff98442911bc15e9194f5b4ded97e9702b84e31b31380c224f392e5fa5c720a45f64cd7020e25a3931b5871e4c708e77f4729225aa9f48f9d876597d3e79219dddee0efdd16836021dbd21692dafe121217347cc128fc5eb051e6843978ae17478ef714957a84c74656ddd931cbeb43e32fb0a448acf2f90ee98d38522b4fa9aa36be4fa13306e799d4c0cb90ac0f73cbc018146d1b0d6bf48aa446a5e3e0502aae9fcbd196b36b6b7426fc10367febf687f05392fdcf878863de2e47be7e625d0e3e3e94e199f055c0fc65f76c41ede43231873ff10eb854dcd6ac9b550ee8533d16f81eb0e86471d4da69311c47255e78ac8e79ab36ce880d6b135279fbb5a712adc5c3862a356af49e9c10d5b16f4e5dedb80914868111e194745b802a0292c7c8564de28ba8e71a44f7eff6573e5434e65d496cde5b5e62cfa9e2e9ac85a164dbff5767983e71dd2661d37d9027a27674ebe3433731a606db88e0880e91ecea8134421962b3f68915c9f6a5e1992c56750f99bc313fb30cb89384c72571a1a6a5e3c01897b691bd70985352217fa8a67f3252a06205bd1a9931d1cea3736559572561fedbf3ac4c8bff9ebd7f3753ee69a69ecbac4be6357db7f4213b697a828edc716ac01da75c1d46098c7d5d6ae6f3f9a2903588c5b340c9d47c234efea21b700cdb8db4279afa2117677e824e627bf0f2b179c864ba823926a57825478395545f130886bdf2a7c55a2647a888c3998b750343d9cdc602e46b7b09a2fe9ef74db1ffc46fe27c254c927ce51b307e96a571da7f3f907223fbed2daedbcc96197e95edde7859f3b4ec6099f791089e368a68a5ba0917ddf4f50b93c0c839ea36cfc8053811f8fcfe6986e5fa9f743119ecd6c3e5fea1dae3ad7eb465a89e9c68569190688a8d56e4143ceea3b11fbd9de67173d5134ec8b0bd7d16560ba2be52345ebacedc01a2e03e8183ef91317d87b2e15cc6301586ed829d438e4ff1d074408b332c8ce60ccb6790ab08c228807509dd4b39f2c227755f6b039f5cd413ad6f46c9ec2cc6a79457529d297b1d9e74ead9bedd9bd652fb31568a8e2a9e2b89e4e57601bc1d960360232cdb30cb502b950ef930d54c2c0692a684cd44b0472995bd2b41dac1553ae47216253d6640d2653a033a862f3118c5b5d60a662d240bda5f4da51092eff514f61a425c5b14b19517ec1b371d240cc30a0739273b34f18a72a69b1586802a7caa6cc8f5817a8a995695d063c9dd26c3d45feb0f84dc8a0773151cf9a537664f942f351599cfbee0558f441f5c7ad320cabe305f9aba570ddf6407749b6db42f9ce94526a8f4170e735b1dcfc5f0e090af10e039db3747aa9b4f1f26acc34639ac8b60557f7753e2c261a29852932901a4093b7f307319cbb228e26eec289898b3f8ee236032163293b8caf64be3f7ffed236f1da688d958a1bbb79dd45026884904bbb936c1ebca7aa6b0c68aa8b667dc1575729e4ecb4ffa82ddced2f4571bf902c52fc4a0ea3f47aaf5c243ac2a1fc19f825fde5d9fc8d06d97a351eebf4ae1846aa62554d57cffdb3f3377695338f8d598d723289ff3962796e8065632e7da9d8dffe2636cd23eac15a60568eefe3e77c561906555268cfc1e9342417b1cdf090cc16c79939b15a9311b0210094087dea22833f74eb0e35d44259ecf327dc84f3f24b8c2bfce7be0d97e00d2be88a150a0d557ff963b4cda60eb99935951d288768b4b2649b717133517f5e3909744417c9c3102c77ddd285976cba2c89e2b4f297665632d7c8652847c4625038a6670169772de0550066ec6c2018f503cce79a333ecc0a0632334df6959d2e3b052fa47c5c84d15ceabdc80bd6be0ea2a5a8d5e374e0e9a613369ca8d4cae3d9f98755560b27b2f6e47b01ba390f5ddeb732c22b12abd225e26ecdb639b08f3237e488430b3b39f0b63aaaef4907cd003a8f2b4c3bfd721d6c3fd3a5f062d72746606a529ba34251ddec4026f40d262e9d527ad84fecf5bb2cc8601c2a38437098aec2335104842ff1c455e5d17c136ece8d461d7a3bd9a60339c22d71059e09b3603c0565c0345684893b56054ec4d3db0bf15546cafb4a03bd7775c3157e7676bb7bdb7baf3100396c563eba1a12952503eb6ccde6b6d0a42d456743c4ddb97f5994fa08c5fa41315080eb6b928090956bfc6252b232f6e0785d233c3adcbb9370b59c35b0dd66005d516befd1fc843df8e68fab19858b91e2aecd1c8a88b0fa3d4c2fed2995ee87e65976b755fbf44ee183f9fa08848bea325807bce0b7b61e03e50b2c7af9b360532a17a8250cf6068fef0198738c82a5e58961c54017e343fcef7076e823d63b4deee472fada7989ca7a213d06a4e3eb2d44b16e5c94b1588321cf6c45a5a792938b058d667e1730f8386dfedc50ea0a959b78f12f2949b34b181f90bec622515227dfb8a5f6e89d2e559c0ba686153b218d2c50b67503018e22914ce9b49d3bdb7cf38172db1ea130baacd640c111614e3db204b3b50641d8978dc14b2afc27a7efa819cac6bafa8166d1c127e2237520d57ad38a80146217a12363cb1f8a720e328cd8f846d379ada43bd4865e4aa633c479bd448d205b2e43befa63486c717af84a733f1dececc127c047850aeeb8ce677612f5966e23d92c1d3c758aaeef82f862c1154fadd6766e1dfc780bb447732a5968c0c78b9af4a9d669338458b57cbb77910a24678092857c0b903152035bab6b1c73f7b667a08cd0d31128888de3ff1fed24866eb60beac19c1b139f77bf0b9332024999a2d56975e691fd7475fd93622119d0d725bb99c1d6ac604d6b6be09d6d29360fff9f84e5318259a67fec08a006d9772b9410ec6abd4cb828b898c625c2fc35c19cb9a6cd3b0073baec7b5af254d21de8e209539f560bc80ea38e33658a68262622cdf35dcd6618b9e272ac3644c91f27d372c6297d8e37201c6a86a7d3accdf579c15246276a0009ddac4021755f4848d10f714e9da86eba13f461e6a12edb1aef2d6117986120750d609682bfdfcb90ee3cde8be54d45f841a6dee2d5b9fdc4e65edb7ebffcf3cc5c8a4e1c6919ac57568be23bd8283319ce11fca3caf968b057432f163f22e29cac30b8154a646ca0ef4fdbc7770ee1451fdde9e9d651992d94c843d4eb2570975528ad9f8c193f7c681a43df28242547010e30d75fca04f39247c77d6c3715c25fc261ecdba16844bbab23e4d0482bd1565ca9b526ada9b8f5703661a84b23070d85f3e8265b2ce10750c5d798f1a8ef4d51a473ff4d2bf4be615566ac796db9fe61a224bcce05c31ecb9ab7bc43a609944a7c9398a7875609ddbcb556296f548a117847df7d0afe48a5b504e85b0d7ca589103d3197933a744fefca795e1e036f964a4f14554d5cfa0261e25d6e5e02f86e402906d3637a2352459cb1639f20faea6f0e3fbc6a39becb1b1b3a791e32e85e5bee31be685410adf0c11190e20b7a5119b90e83f2cc4f0de8898606bb6e64165c95d4c5eae472daa6836a888ee4d9a79de72b8fb47a9c9c0323a2be9106d4ee9ba8b3858c256032a9caba37af94df4c7b0adc2f8478cb879b6d452d73191b0fc1ce944df3f4809cbf3ad46eceb3ba4abd9679410f45c8aab20dd72626f235e7c0c934b4beb4507def24ebbdd7a507943c81d54bc69df578aacd9ed0bfd3b7809dec345ba084d88fa9c34d80685415a4d5eaef9b88e51432b2b2037186baf123a6257e47aa56d6531923d38178e8264dd315e95bfafd8dacaf901e354b0f58f135d638df2c0f32453205c7aaeeedf8c102e11cfddea9a98d3ac7c385d71b760cf2afeb1ebe1d64f0222b9b101893d11a74ed175297c1dfd188a2565fbecc6bb07b56ce3973322a965dc5a675587890cc65a71efc68fdcdf1a023505ef0bc0e6b12dca5860fcf1c6c94c2e2ec3a72b8a019d69c82d36a73738dc3d17d7fdfe992bc8e18cb5d3437f1f619dd318b95d1a56b6d273ed79ab2655d83e2dd63cb6f1f5987eab6bb21a7b13b84e2c619b36b842192c3f82c755d8af840675b0bd67a655d641b1886c3c9c147ac87615ff3e58085a879b21dd63c1616a3712279ec87d650a2eed665b797ad631f0ec312f343979cbc49b99385cfa92841cba12d52777df565545a1deb07800a15431c0987b4a543fd5ed6832e80ab6f4b4d9c9ec419932a6ded4759f5c7630a0b80139234b8d53117acb4452c60b477ad50157169a89bd796e2308baa9395b513a94747611c7978c82dbdf48d716c3ac181ac2b2a4702c02a324bd4c5e089d989d020ebec9963b5c721a95492158f54973b7fc1828181acb3cc8078ac095136d97221c60b847bd2a52427383ab68cd1f10b92738c13203fdfa0b78baa09c1837be2498667c459",
-		"0ce980442336d0f427db869a6799baa6785b5e030567c588e2a7d2680e96c11b7f415fa27730969e0b1c3973b5f3192d4e773153def6dcc09dae29ac44eac7c42c2666a356fd4262197bd5cf6eeefcbd662d104423ec05c19a2e6ddf1834a3445a09e8b1062a1320a5e8ef13d6ebd03c19e1813ccd86fd68b46a",
-		"1ac8a509db7bf4acb80d8d394a5abf47c273b2093f50f35049e749f3e16cb0fb",
-		"47cc9eea11f9f3f9aafa23bd",
-		"088888333340b3a057b05491fb2402301c8654948aa6d5ee1ec75eb045858c22056fef0873d6675f897126052923a47a30675b266ffb6181cbd29ce2da3720e36a227e4c6e53328d789913c0d9cd149a6e49293996b1be7d6c513b24d876445a950e723ade3efc36907c840b9b8cfdb1503811b4044d931a0009b381fd60a5bf1e73d16348cb57eea672709875fb9d56908dbc729d5d7d322a17a41d0f62c9af9a013ab1e19fb7b6c6e7fa0c0b18bec5e3d3e92546c77e3753193389e5fcdb6a6a1896cba461343e71ef7a156b136b27ae6f45be9368301cfade203e9b53824d70f07de9abfea1968b8ff8489b9804422ba05ac3c3adf23ba0848817fa51febab5e9b5500100310479e710b663f064c1ef101c9a5320367cd8bc6e52081a32f070e7d3fd6f4210cdffdb9fcab1de4af5b06a7c6d191dcc12b25b3053e58952bfd1f723afbf570796946c1df9579ad14ea9c8c30389c1de4d1e845c764fec5eb8faaf4c558c5eb5113018c6a21ef653ac7d7f5b6c7e1a8fd48c6f423e9913436202da176a86731287db7331db055508acc94168888040ee37b3c119c8a0d88360241d68745825fe480324a944d56e7cd0375d4d33a5fe7a3863c2aaa899b2d24f65b70bd804039116fe959c32442c9f0b5470463523eb4336985b71125fe5235cbca0c88a6f92416d038e144de5ff8ef6ca749a9e239f02db505bff8e16fad1cba8b1500445f067a674142b6413e9dc0f432242d8301879bfc11fa86d1ac9992ab12319fea8b703e10a13bfd4b017496222be26b56af3ef67610f904f0ca8a3e7cc249ca8122735a542b289f13922904ff23dd197f8883c7ac77150d7331316ef94e0cf13b6ad95070420513599100b0a6d117640b781c622ed7ef7ead29476b3c835bd9dbda2203930bcee7ac01c3b9c89da405ee436ee652ddcc3e96c7f1a94e200eec9a4a226f3cf7ae5725068916e73b61149497d11dd85157f895669f51978d1bea8fd2afabb18d082365daba2682ef623109988b7d0e27ae57bc14d86603f93b5ac040ae52d8db404ee27e6c34cd4246f40eccf9d3f8637a4615a4006918b01d34709bcbebd02ea72958d54db3e87d69e6d783de2f1841029d6975eb11f9b076c247108797d5368c656f888092b82aa81aa26e164e038b359bd68801c22fc107e4083a9d85fc254b002ece9d4545310b0cb22ec1af04a7ee31d210ede4b605dbdbcb70e4301989422ef46edf63f9c96de9cb3f70638b51df5c0abe79b7af8cd97148f2b7bf394bea0f7bbbf6925f83b901b87a6079f2c3b38a98fe1a86dc7f48bf97553701834f557451df4b41e7db984a34432823585380b45c1b84813d6aa21107cae252923fb4673cf660a541e65610ac0127d238285f53bf329b62169f3e42d5efe268dea62578e97da59a58a1314a1bd46cf7a7cae772814130b51411082e30062fdbda1c9e14d6b2bfff89d0379d32461f3b8e833b105f6a89532ae748b5fb43f283fc86450404e8befb8442b65e338aa0408303a70e9c27a1d923d9f2a06e7c6159c50bf2e3ba5b035420ecbd9d0b5fae478eb1ab72fa714f99d00188bb10e60380fa3a3a318c2d359ea3805c2fa0dde17ee52a504f70d6b466bd38d1dd4196be336a9ab4a9e573d1bc6404018a119f688c1dc2a8ed1433e8a8ebf455ce3808c245f0220f0c12d28c771757763bd111ab829294e2429a6f7a59858dfa1fe0b806e986d40aaff934589fefd75ab91097a979f26bc9352267efb2d82c4738e4e6c451b0d5adc398f546c646b9e6b8fc84e91651a1252d5b805a857c7798d102d1e6f90749252bc53588348ecec0897c79f514442fe3b27608c95d0cba999a7e0fbd7f601689b4dc63ecb9ff553ff12eca3e9b26e3eccbde28770bb6aff7c864ad6be77fc09f81f90df6efd0c4025d0916ab5197ab846dfe6121c462761d9cc87112ebbca197b0a222fd34a15b824b7eda06a56a6ffda760fae5f0b527e2798f01e205a3f47947a4bd190f6abfb1dab2e3a53131af95d593bb57e4f4af506440cf20636d9fccc449d9565bf43dec8b6877337ca5a43900c1dc600c877b290342914e909aad8c5f0755bc25652781535c057ed5ab2ff8ad4322a8edf3fc1b5311dae6361a7395919725f4cd87ce0ccba37c64eb3618f9c5a53644ada569b90cd07184fc048f1b589eb29852909e75e7116ef96a268ea85c2bd257cefdde9222d7eda875a2a3abcd3a02a1fb470ba967b20beb54914b8b0c6ed464ba978088d7f8b30d098966b0bde82a8f1210f5d0c3405c9bc73f703134d0b6ee13326f65fa0b8154f4e30808997d4afbd060285942ca1dededc3410a099881492b5730ab7bdc2a4cfd0068f67766d60b5d4945f121459d2083334ac878d067bef644b9ee427bbbd6c9351d7b019bfc051c05ac301ff3792a1c687546dbf6a07a0cf56717374bfa1191c22b7753f6ae02392f8aac9207d1ad0fcd57c5c8b35817574b7dd90a00cab75f508f8a234eabce6618305f94746cb6a8573389d336bb67e1b0d2b6e9bd3959ef344e1eb245b522c35222813b8c6e82df48987436b5592025e9786ca63b6d1a064223bfacf59ada713c2a3116611393aa8446ea79b3cb21e96d13b659ada2d6524686fd46ec66c1b4d8f5ae7831840c9e3db64d528f83a1cef1e0a586a783f8306cb261ed9c2905493e74d35883fcb39cfc5745c282104cc3ce804999231d13e1bc6f2c022f05999fb57575bbdaf00d7a990e17dd2f8b9dfe66a637b42f58ee49ba60f2dd9718d09d7025b6061b2087bc35f0a8c884f5b67a5e18c2b4e857d3b48b79dc7cab6b72f572d22987566238a7153ed6264578424f1ce091fd05b7f14563fe12c76104d3373367af3ed3aca694a21127b5912c0b7eb1ddf9d4a9f03f660d49f7a7f0fb42797fd112414c3eba2b75a04282dcb9645191fd3dbe376e7f60ab40bb7ca1e991053a1912854a68d7dcf854201d1f2c26c6cfaea32e29d80847e6288274713d2ca973b91dab97884326b280c6f06c65b8fd25d314be29139961051a1d8699467d02b67991baabc9b05629660c243ca3b0477362d5e6bf9eaa33beeb52cf399846c77fcae11a89cbfdb2058e443ddd44fe202a3ba5c2efce937d78b9639781b8b2b99077b433189cf3b0733ed73b59bb194c9a98c5aa0cba6e71d1c5522f193defb9e31fd2cd60f22bedaf7008c2fb0b55a8dd52731dfa2bc69b40f835ae95db040cda6a4a1588a5ba4769edfeb7369c1e9a3b1cda293255b4942881d94d771b7b82460004875e71be64c582f2830c5e80dd6de421a311c5852f4912bea1451b0328d01c7029867cf9af99284cdfc1e1f0aa0d8c19ba9bc035dc270b45724247137da5d3fc4daa09e7014fe1439889968eb23fe124f067825d5f7b304f17a983580e009e0e51630ea0006dbc74a30b512cd9eb4d0b315a0ffdbfb581609ea9661b0007cd234ce43c17c92269a7519bfe99c2ca94b5cd3e7654946e67b37d4270a369266db6804336a446022677a024d44cc02cb04108292dc12f790578a0d61cb6fada738902eed3afdf1850bafcb279f18b5798d7466752c6368a594533baff5dbd17974638ecc41753b184845206c79bbab84dfef148eb7f1390f8cb7346a14c88caf540c241cad11ce8869be3bec85d029ef490fc5edacf94fa962be39a33c8efefcbb6b43960d5bc35f8fb72038af3801466aed141b50e9ac7dcf1921f7a6abaf320ff02ac34bbfac265e05e27495e6e027e673a48a874e6f0c33827a050fa21c2efa789c1e3df2ecda95fc52ca7be35dbf17ff6c73f37cb236e5131542e002913d177ffb21ac450e2542e24b894650007c36c52d90f83731009a7c3239ccf11829cf0fb6510d9924e927f14d6a06f8dc772fc9b028a8bbd2d3388985f3e2609abbd08434c46642b97240c9380a831bbafdc5db77be63a1400cc9a4f7362a689b07a77162022c6ba7a1bb9f0446a0b6b460ebdd9111132694fa5f1b29da39be66c5179849ae9720b2da0a012d4bdfd1b18b8fbef0d5c32b92c351dcf2c599f069c3b53f622fc8e904f27584b2d97d43f779abcde6dc1413c0a677dd187b28cfbcf7fa6316f0967b53977432d45944ce8ebd2e265c0bf6b2870c75ae808fed52aa35421ef55667ecd6f9d279c9b91c9314bd9411bce267d6ad52b1d910b3e65147c3eb6021a0af98707408e66bb11ca5abf5e34b2bc85b144fd06ea56f5d7f8939fe0cfa4862e7f306de069cf85f4aa7aa97c6848594f5a6dbcc718d2af77497f4b9d5ffa217fc301127071e9bc9c2c9222ba90e286506e384f321e622f05d81c114953d0f7e9626b74f4a6bea8cfb86ceb4575e5cf4fb84e9efac8291d1f4153ad3cd9a34ce0ffcfbe30b6829c0f986a4f85d63b602ab99ff3934b1e0c46e55d56eb479b79ca0729beb59aed783e9a3ccd55db8d884733dbd93f9fd7a7209fb92fcc49826b2d4356ca676f01b0981637897b3d2f90f37bfd73b214a398a8e4e2f9e5abec01d8192ca690191255dd8304a2d95a69331288bce00385f462e942f4d694dc3560a263c8ac2b5cd1d2c63b90ec67c32eaf5bd947bd8ac730da9c09ebc6888b0b4f3bead157aa9d31c2802df8ff0e4d69b7abfed6f184bf35a16ffb5677ddfc4682322128932d57fe4c32f21e190e1147d8e673ae407b1dbbca31331310b299e9f3db08ebfd2dad3158562c2e47addcbcc831cef0194ac8ba9778d0103c2955c886d439967bf788eae688f2a7459b0ef3bd16808e8d768b8962a24588d918ceb2cd1cd611b504019f65216beca212f44600cb7fac77216b7645c49f18064a3acdc01399315084dc9ea151ee28534fb31628d190bc540ac6b6aba572ba51aee89544015e6fbca2b3c2330f2ac1f68849e99e1a1f7f523599eaee22720392ea52259e26f1101614d4edae481b3783af4e99082d75dcca549049290731bbadd1ec0a93789ad5c9afe8bae44e35b3e59e562362964",
-	},
-	{
-		"0410d1f8bc890649c250a3819766f4496f339a6384e34acdd72b3a87266edd2a7eae223a372883f978277a108d6e59fca1f35f25d7a9f3aed42d35fa9b12241ac04754f76fd8f0e8ff6af88cd851887a45e89f1c9192ca66bfff605b128575d2ccc9ca3ba1ba23a0251b2cfd6db577b29d17ce2ea998946997f5c4a97a397c46024681a400a54425c071232d269adfc3b1adf15b4586c4dd7b8886f5c1023bc348bc674961ac6e221d914f432c2f06dddcf738227dfcfff88485ed45882809d0e57019461c88683919b87c45e78223c37a5be5f758e4f0dc6add22f2062bc2eb9bdc31b8649af17d526ec339f0e6fc6a41e26299c65276302f982235c3e5205ec1521625ec08a23e766577664b73d18d5533261c859c4cb4346feaf7540a56155c6c3a4874dc86ea42fd518d71221ac65541e2dadd2f8e129e7809f2835f07dfcc4128401dae2b5fac7ced1d9e07e3f348c6cd26f55b3893d4418557a18c366dcd5eadea0dd84ab95437d6f23eb9e5877fb2ad740ee507e2268c39c7186f34e5cee2d0dbba1a940f516a018f23e716a399c317a7a81f89cfabc296c432cba900ad79db67936f76e4d97874fc5f8a9ff84eb7a0f6d629c581ec5c451e27ef1ed468f93bfc68b2e0412a543d89dfdd812d9421236a4be9eb374531556c207340886c7b84d42d651557b952e0982f62c5c383e92dced21905174a5a836acdc3f2393e770d6cdc22c39575a42ea406f36889dc9558aeae5dc5f8b84862850b55bf4accccb6a8ef793d641d6b08235f70ad3b0605eab462afad1af80fa003645f4d302b03d81a7d167e9a8187bee0f76b1cfd7006b2d2b55fedad6e8db1d3ecfe031702dc327ff2b0197337d7542f42702cb276de852b3d72d9acff8a7feb8882028a5e340950e523c41cfa184b3d8878effe56742994e60240e58cbfd01541d39fa007a9f0ecccb409c6cc540354ccf35223677cb74e7ef7330bb60420f7d7bf97de6888cb343cd4fb0928fe5df5f1b018592ccfa7aac6dab57cded573b5950b94fd935f32cf332dd85b2b36501de6687612371dbcfdf77279d647ed8bdcf81fda8b7e0c5ab139330d64695d814fc6f761fd141dfb0c8f74e2d7616db3598d8de40b993fbdd272ca37db27b82aedb08bebc4a8e6d0385ab20fbc20c215ad50fab8e93975bcab3ff38667abb0545b3b3f20e325f01b80a32a3cc3ed51703d4b2826849ee22fddd5b544816599dca0d8fc84feed9f7e90caba53b70bc3f457eb1adb89fd0b67d2c0ab53264430c61d2c4a1b19ea99a9b453fc6b5ebf5fb5ab799134769c9b495c479c828bcc49a8f993c3127d5cbc31afb89c0e78fbc323755457ebf0f3344d3ad1cfc59d186e96ac31a9298e655b3d1df74b95f30fb868631053540388a13d597002f689708d35a2365e309bb96db8b1b94ea4c8060c2b165f7f19e72056409159371ac9c44f6bfaad9b9567094d18c29bbc8aa2c8b5b82735d20f55284fe68186004b4a4fb644fd52d9645b277c1dc238a764005c1d2791ef36e71786cd990ccee4571d9a9b1aec757e479cfa645e320bc33268e05af9cf90e0e616ae7f237c637a99fe15b4ea8a3232262d96855fa248920a28ec03f77ce4dd93925db60ec030a7be455ba9d08edbf6bb717b1a13c3ac1deb9821e21505c0a8971d5ea5dd8e4c9cd3a845a336209af191150ba5d9b8c2c450e3a765e8670d7f846b2461f971fdcd1942704f620a40f4204b99f9035bbd543f64b927cbc7a74f32cbb12c3caef955f169a45374e4479430e08d333c4a877baf41a27a0849ca3a157b6651295fa71ac94b6e3d30b5d160965e93d2a81b4d575cefd264399c9e4e17059f4064465b2d92c96ac27e3b221499b5e642d033992c236b905c072faa1e34495f9890bac6228330e4016c061605bbfc478c30e1b8534c49af54785972aca2d144328b0a540e3b3810a73e26acfa22f48652d53ea521875475ffade8ab50b9f08245fad753350f63dc4e898948ac7dcefe520ca47394f8e993a6d13ff68a2f78cf294f235f5f863bad10c4f5bc41c3ba93cf5e076357f0f7fdc136f34b656b1b8ebb3eed1ac429c7d4edbc902f7f4bc24ea9c9b200b9a9fd7adff0c6445ce1d2171fc031e3e9f8b8d6b448053393c8813d91333d4bdc3bc5bb2b8bff876cd29e8b92cf6f7bc727517b6f57ae031f3040b0637dfb40b8c1fbe44cfb6bb9cd0a445fd9b3daa1da2b1c4a82cb4da1fb8d525e0a4d9ec30e9aa75b951214621c58c1f60c9b97e6c6b330497e7dea790a3cd8158a76d898107ff3a5910707ae60c8a46c633b522aee83736d005de60b9abe202435f8bc4577b0eb08b7f2b617bb5a831e95d6488459bbf15919d764b39684d7cb7c9310f343fbfcfbeeb212a90d96c7a26c1026c5cb171ee4ef839785076e5084026077455c73404a2653f333e9bad555cafc1a9613387a02bb1287c380d7478238bec8943208de585bd18b448b6099565cb3ec70ec6672a778fa6af9d1b17b0970439da24c7bfaa74c85ecd8e5852e42391ab2258024ccf91e37f2f0e86df958b197fafd12f4a45f7990375f1665a14f7f5374ff7740f89677ea8660587fb80916b30629a7aa88213bbf80512421a0a37414a2eb549b81cc85072cdd87e4e69d97ecc63f974e60d20de0233101c3d475d777602b12e2f797e9237570085b0e9f48d4dedf233eb1301ed4621f9736946eadf599bfd79157c0b4cc31bc273f5c6f133a4e3679ff6797d3c9b76aff4bd8ad40726c1703c3d8b78f0974b748d0265b0a75928374f91b48c2d2b2c11d8b6e5efddb75009e4db72e562be59efb0bfa06808c89f585a43d4776ef08947a77f277526777f0b52f1e0b5a03aa560fa45c8f30e584b58ac1fc00b104942b7b86a3cdee1abea349dcaea4e058faeffc567e2c3b03e1c5c4ddc675e25aa15de1442bcf5ee972a8c5204ca5794694759c13a2d716839dda61635043bdf1a09e35cb6d93b4df3b7a00871f79cdb4ee69c79041dd14deb7754107b8fef8589d2d240ac1d8eafc52ea847263512651bbede2fccaf6da816b1b892319817bb6af9fc17078ab6cca95f03cf8426249fd4f2bf91921d39b8cee24af07a52bbe54ca7fc4422a310dbf2149b763ac0060fb2c59154d2cb0da1ad4892279b4e0ce7f5f92c189c3ce48e518ff48c4ffa9bf2b02d4792f84534958dc6bd2914ba010aa32d133f6a07bdbb87a237c7acc3ba5cf101efe947147ed4eb3bfdffe5fefa991c0dc8760586218d286944c52d0f221e0101f74826761d01a20af187f9ec1115e9e98bff6fbd7c8816c15d33c07f51c171490997bf269951218ae92b66fa3150d3bd40336abccb717e18b53e8806fff94009910f202a5041b5396d1c339e6d075bad4ab66a0637d81eed1696e4068024001123204b8371f0bcdf0ce07d79f7c917327f7138a75947846fde68665e9c767fbf96bb3308abffe7a8d05512c81e39fa8dab2334f46ab9543921ca97be31076dc7b2a0d05e90b7f7610d1a391b442398ef56cde3b18737faa8f282572389b4fb3c55cb8ae6737257708c808bc0a414bffae293bc69cba702ce2959e1a30edcdf64985a4b0bcc927c5912f819c71cc9b1ff5d6e5929055be72ea5c8c1a4a591093deb5449b7e6b60109be1ac0cae472ba31e1035ae65f3214f50ad699a077a2de52f7180addde0bd78c2698470b1af13cfbf497d243c9e738c4cdc265356543885c5b933a299f01a5b5a9ecb0b4ddfda0c28573064f6a3f142801795d66bcd5c31868fd3207fee7bd98c47e4da26bee64e1617b20cbaa34e3abbe31126b06d5737fc2b577b19d255a519397f3ff8668d0e7d401a37e368729e4b83c5fbf01c32ec478967605cbc0675f685b5eeeb42fc688216a0667e1204c995c9c485e6f7712d80d88edc9594528b1907790549756dcc8b0d32091f36d2b4009639e68daa130e83a1ea18353ca34f431c548d91c1591ccf8b25eec1f7a3c18ddca71b87bb290a5c13229250c5e193e1352072f6798ec504b3b4c6aa578737332f52baea7bc4468fe6d8dfabb9728cee93fee50c8caa113f5ed7e9b55e21e98d73a377ef68be7e4e965dfa50cf863e6285236f11ce80512c573ae2b55bcb43cf6ebabed6783c250f991f5f68a59dcb2ac13a3c8fba8dbb11c79dc6236809f2d7c4b0ad3cecd24b85f1aaed9748b8c109f2fd98ac8a53bd52f18475598d67305117de8e03b0d988a2847539cc2efad520f86dcd82c08ad4b10e490b9cb03bedc7197bcaca55526cd9c8a5a5f69f7a1697e7e31aa76eee597c386418e89f06b0b9817a83d6cdefaf9594548b33cea1cbb585e55df3d3b66f0b1a88f4b98ea4720f1ef5e6ebe4958078ea0bacb8ad776e325ccb252f81943b9b1c2f54aad3c7baf1bca0dda1355d191f69c5d8163c464898116dc89201032d1e3281c8054882f60522d3a65831bf779a854fb0c195f85aa66522386625658457e74d5c2fcf5234f226da4a579ac1f11f11a1e0a6993a4dfe5c856481ebe9d8d2363401058736f7ad104104aa03f5c91496aaba2fe4072d418d91c2787a9b4ab0cf4bb65681ad0392ef073cf2fc060692b0c0c194c8eed5558098cdfa3317ab02626159e40e5c76fd64b2ef60b8f5f368b6b4fd7ea3d2d3236aa01d9db7c8a01929f9fd38557335b926251ade1a0d47d0c1444e6416218781c1a51e786dbe9297b78fcf0d0304c62929e00744ed4e14af926313a9849b2a464048bead075044bee013cbe318920c4172138560629a0ff4fd229d81bdc7c7fd1086ab17d6efd5b603a1991b33a55ca5b9e2051b7c140f7937adfaf474c2f284489d9b1e8c71d58f126eaa451407eacde9f0e86504f7de3ba4d830199a229de2bf39014baad6dbbc448501588ceb2575db0ddae005b81ba9914bc22b6d600e2c990f7843e553ff29d8008265eba7dac7b5b5a7ba6dc263fe0e262a7b8638a81f4720622c7361554b61d7b04c7f8b133440baeead7d51ac8b77d606fd0eae1c55ce7e8141dfd68d40ae3d8d2dc8a061085b4fb6d8a06263183869154618329be6b01c2890f2b5d0a0f25dcdbbfe2ec3597d79311edb943613fd4b59157df4fc2e1024be03d98ea3cbec7186ea9f4a431dc3743b9f0871b205bc0c1b3a001768",
-		"113b261414b4b7dfa028668ac8b0cde5734120124991c54f4dd16a87d181efe2bc15f6d0caaeaf6ad615f59ec5c2833904a34b4d34109c82e10609b387f995430e8c13d83ac34310d838af9efa32d7fed6224c0a33",
-		"cd762390b93369f1e207eb15deeaeb0036f5331e82480d180f84a76c3e44550b",
-		"e88c14ef96c7768f5dba9de9",
-		"8d6aaa27892a76fb05a2e96cef9a9b4b7ae0670a12cff95f7b076372456889fbd3b9b4fb5fd98b3bd85b247f15009be2f4e7a0329dd118b6872199b314e159618ede0381dd97db28743461ace1a694c0383d8458150a501d6c45f4b50d5b1bd47e61a51f9ed4929bf2e564f201ed0e6825170027d93e482c1ce268459d2f81cab41f0e7ff281430c16b34a29b5c76630dba72ab9e751bae41122b26121d91f2af271a23e818263f46e05fdd52f319d58330bcabf66637a368c0a8aeeb20cad1916d966e5e0b0de74cc67ebe57e3d1fe01e9743d42a931cb4b98bb762ea43ab937d1e5c42eb08fd56e70e911bdcc1ca4ca0604a329c5364b262ce2de282b4732ea657b89300cc7b7127ba4a2d08c13f581f024fd093ac09c2bc245be60c80e102405597fa8082f4d28cc954a93217edffaba3d2a397bb59ee89c8cc0f33eded78f21183bd1acdce64a923dd609a0620d2911f61e81fb2c8ccad8ad9d81157223253a121ea2bc60d6a3670c563fe06bd75688572b3be83cd31dfeac6b17cf8455267b481219c42034b2252977f32b8e6588fb05166498fa37d17c2b002a655b5711bbc21175348225fdcca041b1f97fae48fb1e222c5bb46b5202191c00666b7e1b2d84aca3edbee7a97dc0f6d1330e929226f8a76c155e973c1ab62c867e1f87be37788754e51825ba31af9f4722b5782ef782fbb70c391a664f252d14e49a805e94790135ff6bd881a687f98b42da96fd34bf240eae4914488af739ec15f13f048a7eb5fa94af14e8b6ac5fae714cbef6268b114813ca2a3920a7a9d5eb506a2ca211758de292047eefdb5a97e18530dcd8410495fc42abed91b1204d9b8ba9d6aed11d2d0fa0d931d46f93f2c1a560ef9f5f7cee1497be770d3cb07c534215cec12c1458bb57aab4d95cf4a15a5e3a3bf8e650206d5cac4af3193d169f1a57638d9a50f6b7c6985d42f7138b9226451670d7359351c2affbca65680557693d03458341198b8e13d0ea6abb7496edea3cd4dee2eb93695e668c7c0901c6809b8ef434e88b85a8b22cab6508b9560fae62900056b7c5c29a8c899bed45a2b5159a1d4929476ef350101317f77f02d48a039cf4cf01c56319cbba16fe908c49ed6f3face88867c0ad3703452baa7b86fe58a00ab8f740b4e8055164b0385dd3fa44502ffbb99cdd843bc3287ea468aafe4cc298a3fc180f284dbf78aa09e0a2f7d8593356eab016ad8dc505420edd376b66598a3d0aaa848fd68c4e07419b8b50e40febe2b6b17ad07726fae1f87e86abd01490a0ce24fb57b533c765504ee0a9ca154187bcf5e6828e3addc7597532643cfd992558d63b1acd00e7aa41b9765094217480c08c43f4f0b3f0127120699b7f2a5ac07c655b6143e467777cdad4bc21d4b57da4d8f9b9a7e4523d8c6fba3614b7f7281e80ff0f9004577adcff1b79fe443c80ca9655ecc102d5df6aab2ff6c3401f344b77666c59ac7d5b92bf4f1e2322f74b75e6ef2bf43ad9e018f164ae76a91451e5221bdf5b65a4fbbaa8dc31e6063b451edbbf4965307f8e65bfae87b15f2453083bea8484017228a9cdc6edab1a28834eed8ce07430f776b916b3bdd2340798955ce9ffcf114c3f6a88bcc4c7b6f2e3842426488c340d00f2c4d2d6fd3b6263dcf7a57f5cea6c77efba7013297bd3320accf033acc0833aaa8e8f95cecba469704214f54a1ed581349878a591f9993371f1daf92e55b2a4faf8f952cf785c687a59b3c258daef1b6d7bf9f904123c7384a859933c3ac31e33edf648a1be4d6264ffade860915bd118f0b9aaec2eb8e16b2015fc25e68caac77a3accea53b9b178f6cf48d15029fac12963b4277df037b7a494cb29b1d9e6d2148531a1f7360519cba5657c080254f130a1cc3ccaadb4298d7ea0223897e63d798b4f4909577cf9b491a82de0275a246bb1211bc4144574c8ef176b382262c0e087975cbef33cc616d32e0131a9efdbe8ad3d9cb5f935d3f4f409852acca22ae2a6e7450e9a426ec3b9183f93b4b7f89d850e1c7053c661936e0cde23e831a261b319b430da45772f0fc0113679d06f025983bbf37ecfba35eeca28de5ff4815a490570491266e92faaf8d0ad4ac8df106faff8fe3c8d050ae9dfc03a01ad177c21d7b653509a80369a668a97eaa532dc9867c32aebaf89ed36586e1ebbe1045347766a354a86ec1e8b2f30c8fdfbb6c5d549e7a84db81b73fb828499c5c4be0d4b2b7ffb197133a0ee18abb5a4e371be0ec0a6535507029316f8decde30833ca47493ffcab781d028edfb91c138609baf1054ad52a5d8ccb98b3ca5b138f253d99bd556afd80f71b39f36e0d96fba4e0cbdb18926894968aa825392f12d98b6497ff85a0e4a91c97f37ba1dcad30fe688b54008b925805104a61dc22b712685202ecdb073fad9b10b5b9ee2ff781f23fd41ecdec87f85b369a304b85bd2af126d08f79d8a9e2bff0b18607a95c4efe35941c5493c94e3f2f3902e79f4cfe84c138b83c7f32d7c5a125b28c6107921e8ac92f1af7da015b46a2f9169369cede770292eee8a5f40d080ea1c267c33cb7d4187093d486dc3911bb2d6cae036cb508e81ca783ab5e95cec751e39f3038003081a252eefa7cd913baf136d4e27076251da9cbf0c7d2586fe02b62ec786790ef08fb3ff3d79bd06868eb1abd9875920e14fccf6dc144e898f578b7295fb5f4e84cbf683722ce3597aafe3195e194736fc317ed03ebbb00d956ce89f7a41a334020e1a88da355d3b47d5bd3965a290f6fbf5dfdc8c8e6347b4eb85151e53a960311582235f3b546ca80a670dcb628fef572dfae0c101bc08c80f78d5630a793bdfe402592c316227f2333b386839a67e6ee8d9396fabc9648ea656a407670efaf80966034958f4a70fe7b920c79dea3d5a0ff05f3ed0516537d51a686efcb258520936fdd415345251c9ac1143a41be295cf12da5d4319e78e1c57ce20507490e5213ca7be92afca8ec8b6a07b33571afe6940daa2afb0dd4dcc1c329474ff8e13d740488e5ced552074fff695a04fc1b70755245895a1e9c387fd9514261dbb0f600ae03f4896e795d1e72f421d8572543243d662f6811eb9402b6a3b8dbb0f32de95bb1ac01b1287663d3b6a3f52339a4f6b27789e15519b2b59f2f4fc8fd33ad1a6e4d02cf0ddf8499f45746da424ee78e72847e3cd3833551b6e6fd6b1aa98c688252b57a1d97660ff006ea1b970a0b8fc7d2e313ffd0b0b85299ded47b60cd2fe9bdd7ebace4b0c1072cdf67231a475045990b35ec761e1dc1dfbd0c402296566eb4b9462979d33c9d652a9295ae70943f38adb212b48bd8ebe82722b1712ab6a3be6060297e2aa54e7d0158e4aba6975237e7c7a1e22b29560b8d262125ff2a6e5c1332acd0f6b5ba15b4a82d3631891a01530321830aa8f2e8ab6b41bc5b5356957a4d0c3bc3eab04df7700305a95d0f9cd18d486c675c963876b25b1a0f78e245deb40dedd14dafdaa9d614fb06eb2538c5411e13be116c76fbd3377ff212eb07c5c035612e4cd7a1de2ceafe95832eff88a9bdb3595cc19287fa40b8d244afe9bd24dca40db49893602a59640d7a1b8e7475825b09cb0cee111864deba9d3d1beac03664279910accb9fac534ef099e398d7f6e3235cef7685fd1ae46e47da093135741894273c0c3486197c26057044b10faa57244721328b47e611633d16d3e4776d90309d68ce4a60d3ecda26c9f39c1c6da67ff79fde4977efc5653d79ad86c3b53090003bb72e78aeedcf4c8107185d9aa65221df4e2104640a1a083845c01000370371fea2a6bc8ae43fbe290949da4e559d3867c16df16b143fdc807616f51ebce8d05bb03c2b0bd587b95e3f6a15d907aa9a5b11622ddf4c81ff9fda4bb49d3e9577551bae649cf64ac0cfd646b02f6f16cdefde09a55e77afd16c74e8a3d777d80b7cc42c51f618a3c467968631119f11ca4385f0f5713e37ab1133b692de475db1d44fbfe9d274b9a09e673dac88aea74ba88cde8db3c831e9b5a0f1e40261281e5aea9d4dfd48c5d9e173f4d9cd56fe7fd610909c838bcbe1d6c729e151ecb4caef511a36a14b03cca7ec5d0feacb4647ea5212a11d18cbcbedf78443127680ac0b1bb65120b4197570288226830e2a92b380e32387bbcd3be2c77d6c7722054d849be9de459cc1832ec3ac8e7f60fba9c81cf5fbad37d228eba137a23227d56cd24970340f2b7599aada9d2424cdba8b50c2b97244dc83f7391e2ceba5bc0a11ba547c142126c791265b33a3db6238321a5f3273ffb01e42adee17b898153e41818b91413ec4f6386ab3dd48db875afe659db9eac94d16f850ac179d087d93784d607349e8711f5f96fd514e8d096de8b4a74122ba914520e93a11fa4adf006700e122e2531e1f39340cccbab4862708d69c117d3efbebabc14a0231916ae1ee8285727c9fc980051360346d53dfc76aa5a11fb1fc8f36f95f741e913bd2cd1031e508b320abd2d3a62baa400dc439969eb44e6abf8223b29d4025c3d1ca08d2dbdbbf9927c625270543e8c0cb5ac5bb5d504d224e66a1895719e4f975d819a95e54cecfa59ec8e385aaacbb023772fdddbe093afaf5a75e63a62d51926254e5b47da1e9b05851196644b9180734d05810dcf3502747c4ece652b67674c02aae74f20d07de2ad5993b3a68d10207eab6be5be34e52ada655aa96c1d82df9b24c2acec35e8f0bec9131c20d0ad8936880af87215611b80d07d7a741a12d8145bd05066c6ac171afd8684b92f72237bb0e4ca4aec1ec280e39f36928852d5d8d02fe463acbad8ecefc103083fd4298f399bb254e7bfa166638460b760ccf2b0f5fec0e3875206bdc8ce096274643824acfad71ba06441c74788356caebdd2208f6f077b056fa9d85aa4357e93bf064a776f5f3b0f288d0afdc51558c8f25cbee17247364c2bb24637dd69017f92bbb43024d9c773439626a02bd0cd44136a642c9c5ae593f32eada790c31a6704030f2e07f1173cbc0dabc410bf9864214c298a6283b3631acbf94b8371681ba81eed1aa81ccf258252d7f90fe733ac770b9744d0170cb554b39e6c72e05919cc237f8f4d7f3545f4d2732f4c9473c77401dcba04c0fd33efc73219f31c08dfab26abee9a7cd4ad3584730768fae899fc",
-	},
-	{
-		"9c73ac05648e0c50a3ea3a8eea70841e8e06669c1e7520c5e25e093769c4b005375c0a9cea16ec8e00261ceb96a00924a66fc0c4e4e089c63e93fea857aead8e0ab82af4ce1682cf3c9fbad23fc3f7e632b7aa169834ddd6c7db7e1e892cac93e4d787b2ed0a812aa93bfce8fef3ce30ab794743ad241974ff989288c43e1ba815a25a03acdc2d5517293e161d0c46c8858d0b32b124a6b0bc3838807753288cf6838fa25fbcf876e6368c0342d3cbc860d6fa12faa1c2b7d9fb37504e60dd44e36ce74229dfb80f1545125718dd1f78b31a8aadbb4d6494489ce596fcc2dbdf2ec22157a1d966b61e780d36552daf084739b602861a96ceb67b65b23d40916c02b2c3a38c2a59aaa266e1f8939000dac9b6dc50d1731e87ee833a2cc3cb98c57e5b680a85c1b428289520bb252096efd7723fa8e55d2fd4e16900a435986ab3f3d2bd799471a1bc07c1772ce10d1bb8805a6065b8903999f9393d2ed1a7e1c57a9e3e0e10dfca17a04143814f5f3acfb99a34712a6e0a24a7485279ef343e69d27c77e25b41f9fb833d7cd29cb6a15551d5c77b43d19feb19f2640926a272f81eeadb792bd474ae11f080ada72103f8f7ca733a9b1325b50589be2b2b3023491afec246d336f4e4277592ce9695c68d5f39c8fa4cedaf51776d7ca29ea0ecb89eaefe71e5f3560c68e8dafe7da08cdcd954d626418677b8f3f45b9194474a32f548a4da3bfae6a3e2c0a25f602e3b3a821160c397d77c8bcbd71c5f1e669213af36eeea30d48e12953071f55eac2fe0bd8fa355671fe032f6fc9214632428125a16fc8aea8a9c7fba0d7518b9a4f876349ccb9bbbabcdb2a85fc60b83ee1ddd041967efa4036e5e10e377c9886f40bc0b0b57c7b724795f843f6a072e87e532a04c21445090a360731a2afb896ab795750e5c2c33d58bb714f5be427ca3751df09661402604a09a1eca95a8344d3daa5b99d68e6e6245825704c5d4a73af197d052d7f75778917542261d77735a21cff3f75d6159a3e4b1a7a9854ee376e6b3c8bdaa1f353b957862b2efd50d10a40007026261a546124cef979ad20d8085d53e30f5736b8aebcd3cdaa349ea474af249ac53eef2653ae1fcd5b3095538de9368d307d45df2a19acd44e3b78c2da9d5d9fcc4cb61feac5dd35f66299845bc0018c3d476b6761083baf33a4621e41cfae0e0c642de729fb2d206db6a4b976a635b3fd911b5e9946fddceb6feb2d2f893b2bed590317442037a1d6dc5b5d72910160221cbecb53bc983f1c736c3bfc9757e9e05af1248b28d651f521af67b2a0d7e4bd86a0013338404fabac7b9833c372142e6338a98c0efb7130aae8e34bb0c80937680a7a904aba3be735d41af9462f17b967b13566bcb697579f8a9340429c77baa6e24ae1ac86d8d25ae3cb9112e34a7a948fd141367898c5f33c0635c87de06f603b510cb229df0d0d9a9e107de88b12686c539ed4fc54c8285afde0c8ee502919a125cbcaf4c8c89f56e90d3f641f97c07326956f7b5d87c65b689f39b8b84359ee0f14d2c7ed621ec67f5e2a8ee5faf21c805187edd95e3941ed62fa95a65473a569566d46b87c0d27ca37b6b022a8cca30a4480d392ba15701d1015b3648958cddfb614983211bffc4966ac6c1f691f19bd9fed405a02c06712d62a775f73353f3949c76b6b7757a4ee0410fd6d20071abfe46b09e72b70f9f19b61410ea67037e037934bbefaf09cff018a5c218176d165d1eb5cfd5c46eee7b82fe65ea02e3ed7b18a86ac7b139b7c9df79e1f6e6f85304ad22d97190c7ec12c651fcc835ea434d92ae1444e7cb0dc644efbc2ae70f2f94310805c1d0f2d49643d05e78baa1c54d4fd99137a49efde88dba1374c94208fb4a0ebc1a0090b043610ebc1bb08168ff5bf936ff9834e825eefb9ab73da2b287b06fa2b0ff52f46061b07c1131e4108cde478c767b749b696f3520acd8d3338842d53941282da289dd1e9a0e02aa9be0f127566c9bf2d50a27f6b6ffc9e9880bbfc14ce7eeee70cb0c0ad90fb474efa69b46123638e8405fdef65fa7e0e7b29fa8fe8696edf661f9003a08b4aff85a4a3e6d817655c1d533b834da981b8c37c38abd5977b3ba71b3f57967a471c2eeaf2f6f258431fbb7e92f91814b1db80ea775681f282290db170942bb7b04aa2a331950b74a4b6e337affb4c51c6cd4c4e13ce3095e73e4767c2731f72bdb225ff572163fbd8573378427fda194d165750d487f6bbb63e1378a132fb6ee5115e3c32b2380b096b735bdb4d651853bc7928346fe3ea9df7534f2a4eae1f5ffc4b82ae738db7df0103ba4e68c2a2153bca499bae2439a57778cfc616df16032aa8a19e26597d275d2775b5ea17cb25d204b18028eb25a053e5666ac47c6def151f7d4b68ea62c601d87bfbe04711c24bc34274be6815024d7b7d01e7dae10cea6e485348ab195a83854663cc5826181b688cc9c091dc1e0d491fe51400e20e6f2a51a7d56af258e038bcbc80e2c4ac4b41661bd33229d07b39b59f3aa79d99c1ef41974a33e02a7cacd6fd8f9b99cadd0fd6a031f070bd3a364c64ddda0e9fb94036f374171de0b3f4ee3380780e6d77d50db9d58e670fb4a364827d631226a3491a27602808141ce657ad6e560ad62b088ff086e6f03b8a64bdf7c7d01e7b19289279509a9d6d80e50aef3b05b5561e4556952c46d0b6ab8eae735eccee77e570e1360b7ea38c53ae6b8eb420e4c2663b57827228392db6e79105a47f7d89e06ecfebdd63783101d3bfb5f494785acfdfed41f8166faefdf0b49260222c4080ec2c6e4f949f41784f076ce37fc7a34fa4e547bb44e6b9359b4b95cd67d64e4402ac83973bd50f8adc7c6e4c34019bd8f6d3843bba3d7155890712e0ed5134e00db877398d86b459f312a6272431f01b057446bfb1b8053acf181bac79408c7708f3a0867a64e06d7786849bb874a6bdf8fd6daaa572d5648ae100f4318d6b3a811bb0fb709168e817ed83c0622a7e5b17ebf5cd5ecb21d9ac32ddddb039083144c93cb55a95ad72732132d54bb120639d1620ebd142b58d75835b35cc6367012c93c6772963e9ac852c71c0dda2246ab845469997fc170d8f62334bc5aa4ce23e036967674303ec6f75bd3d17d197d026de69beda70bc59d2ff95a899d28ac7e5e42f4d37233996a8e6d3b0b86b80df49ea8e145b4a6e3e39f3d6c3c6518bac45baf97cde23037709d737b242b8918ca31f90fe59ff2c83e2f347a954d3559a8e4f075c620ad36be20b1e24b3afa156cf3255192171ad0474e4adc9b7f35436325b92945665f038611e5d14bdfe7b7d20c09642323346a717f460dfe7b5062a0098be66febe9f5fccfc747aeaeff81ba08e5dd2b1a489c998ea9970afaf9aa03859073707a686c492fb3f7ddb27897ba5e75e578bd82114b2ba85525a2002927909c970a04035334b64b1169c3a923211e0999db8baa26b6537cdcf57c051c0ca1b317a5b66ad96cb5ebd57994f99ab202348d8ddeb343312f1f26ab2442b8c5f5cf6bab394418ef2fed68c3e60275e836027515b6b946e5d86d91fdaf49c2a5182d5051726840a156a8653cabda25e1dd9af693533d782caa09295952ebfe6a194fbc8bb7fc2c0da5914a506c6f31490928dc5d6554890f5eb268b09d671bb6b6d7416dd36e7b78ffc5c86b34fab43d22909a87e5239643d5fef373650e291be56b89b9d90431d8c9fa44fdf4f83a1689d59d6ef833b1ce31a44197b36ab298d53b51ae3f8387087dcb0571c340874c1524ba0d576bdb88101c1fc387d25b5c0dad0b4d309255ad5d5b1e209ba56db0c927bd209399a8a3b5c8663c9ac199a76ea4f49e364a4b93a569b3400e20f0d748adf7db46a07efc68e43802a5d1a914759eb2abe8fe3e8d67f2cd7612bd4d5a6a4535b1e5b3ad4d97e54f3db7f8512c9603d87e01160b6908d8df1b952c750071abb1565e5ea3f643f233faeb84278187ff0089150bf21ee4d13979fdae796f592ac5b88869aecc5be1c64665edc8ececc87502d36720b73859313607aaa561d56a195dd3c7292fa8f0750ddd3df9ca056fccd9d6ec900f45c1454c6ceaad4154c69e288dc85735b8cc42950a3c5f0fab2be8811779905c3ad5a9a6bf56e7141d863caa4e93e0065f229b695efb790926618b3eda1b9a15f143bbb09aa3c4b72900617793417df364185cc213d5cc3a375778117212266356e214f085d8a7aed908256c4aa25faebabc70ce913c08c89380da06920069e8e27dd867567f152f883a9bd2dcfb8097b7f065482d6d11c0edebc67feb3068cead403503c04b324885ce1a62c99af9808a5ec8b7cbd978b8c43e37b06e9f7e1ce0b31fa0fe52e8842002e6e99cdf69263d31de080b56c0cf94f77f0397fd1f77b13e17af90ff33b00119999df802c33534a13d3ff7fd0e8cf58e8f8c8bae033cec1aec7d191f2d1a39c7b731c97a67fd1ca43c13a24b9f97d92e2364dc26a1c9408d4659ac7373e53a2a1704a47e01c0223ed4c489735b62a27ec67ea46747e4f48d3da101b0863bda9d3f7f1b413f3e7f130208875e6a29dc30a78198ef658c7ca32d7d53b4b92e51f8ad6d39ecabb800adc0870b2ab0e85b5769f346ce7fc371ad40c561f9f3b2f2a01f2b8ccae48c78a41383cfc36b2a1bd41d61a39c24144965d9aa5ecc5d506c7c7cf9476085bf049942d35caefd77821ad925b7fd3a006213abc1e008114c848d45cbedcb8af264cdc5c07bc338fddd1123940e5d95717040325048439dccd1e298bead22b011ef76d26a390a68161b8bab29e8409a5880cca9c8104694e1282c9fd64f50e73ec6b9a9ffc31115de9cc0088400a2dc806f85487fcbdd60f409ffca584fb197156b40142e512a0dedea1571ebb74d6b26d3b4a59e9105929a055cf3540e8a6a79ca7ea71ba8b40893c9797e81c6e9a7999d4d382e52cac95727bcac354616ae1094552b3d0a33d0d3ac4e547237fc0cd54944039b0eccf335889f6aceb518de496e0986783c564be8a4a05bdc9c67b1e5abb480b98173ef091259d8c772b611e0c09758fceea3e59243406edfa71fc452d4450b55b8fa5ecb543692c6eda3a6ad3bfea929a18ebbe5ce2ac4754989c71dced37286cdd1512107e4e7f4878da1c28b4beb2dd9a712a8d1d61d1a5fe5382db8aab4857b05a783e98e77711c1933a7641fd43dc6e6e597bd03b11ce8e94aa094fe250f03cc92ed5b0a5e7723911e87b0f3c476d9aa0d96adbfb395a8fd353cfb5a4cfe27deeb82e849f90bdb17928b0a5702e4010f7aaece2d43772a78b325d2ff24f9de0f7bc65974d2348c64",
-		"bf96bbc17abcd1f56a9f22ad164d25ca72f8c996f1a7a66d6effe140336da4f20460b47e1c8573872496343be35a055552ceec437692b0e4919224c4ffc8b603286a8245eff5cc148b004f6e5a54c4ac22b0f09842a07cd332a09732694d3591b8b7d6a7ada2bb38a30aa7fd5e6baa811b9a195d3a96306d",
-		"aa2f714d3a184a9883f4199e8e33fbc9c92b36fff2d59f07a9d0d335d7476e81",
-		"36c79f9f14d431cc8c077439",
-		"873d0617c986dc9d83e9cdfc50b1f916626a9d9e1c595dc7ccd99d1e993d25d89b04a893c89e205952eef8f1733054bbb55fa5e1b07135787d4fcfae226737b50cafa2c11276e8708451be9b4d7f662e98ef6b705c5c4fc64588728eab1dfee22a0a92bae61828a7394977b0ae8a3b6d0126a23583fec025becf0a72a28891391ac1495732a7a4a1d43a63ed8eb37b280b6d886096fbc4f77aadbc5e441e996334d0e10cd7f3dbba9bb7efb147297986509a07735385c681e0543186dc166291edc3b4664f5c8ffb0965c85bc30ff5e7769a69609c69ebb68f35d104bafe3dbd3e2a40e13865f19bca3612e48592aa930eaee29440b4ebc1c0a59f1c54519857c929709b086bfddd6d4a30940b592be48e0067976099efe71f45f956182dbb300e8076e1207baa32d59c1afef7f34171bd66099d2d7f07b39d16d0f8b085185bf2554c6ad66bcd656f07979e8f19575a116f5c4fb9700ec3b46a3254f28afa1ed51348c1af6dba26fd398098a76d7bfa2ff195eebab41330ef290bf75205a2ee570a2fa46bbaa74aa6ba68a0e63e2731dc1974eb44794f3c89ba58cf96f7a070fcca678185711d97cd9d7d8202351ed589e0b05a7a190e60ae4aa109254a7bcf7013f8addd07a64145e21226795ff7c7b1c225f40ed7c3552da8eb18b9bc9bc70c2e7ecb10c8b20c54f04b6e27b5044a7a67b558407eb330f2083444375c022565c45fe817dc00c7d24c23db320d15949b0b64fbbaedd310e73e423fcebe6e1e98a5cd232d97e6466642e5e3b23f06525ac1cdf8688650cd366b1b7ba2a9033e62d836b14bb73717757b76b9673671bd3d3b2a56628f5a309f3b86ad32abac0590c50f7c5a22e0a920d88dc9fbcb3add08b900a2a2fae4178aa100a0e645ab428e0e79bd90baf4af2755e48262b64838a6fbc21226e323c0a1ba5703e30738fc7b5a7df9eabec6199df5ff6ad58f9df5a734ccd6509e53ecb3de1c881732e26e52ab848a0335b04b25f2254aaf8c130c78b0c9a40b60d402673ac7ec7311d0b00c45bd176bc73ad81c2478611804f59e3c145110aacce922e473ef346f8acaabdbb9f313dd3f8d0a937d0c048e5af789e2e09a816146f9ea28170909caf2572a2f6e2d0d511242909de2815e9ec586b2d12183ddbeb7dd70f32424097e2ec28b4ba62cf78f547e2057a4c050cccdf6b582172343742ec8c85e2847efb1595bccf89ece3b3ebba824d2f097b1987ec26c6e5710544739d54a714060fa91b7995cff0161415eaf55758078772c0271d9d282354e47a25b673eb11497a6ed8db82267d65ad47412300ed525af96f943c5336b1de88676dc346e7339230032463d305b0442f934018bdf0242768511d20474c6ecc82fd752c0c0ca5cee1f3e06e679fa5835540f97870d47ccc6bab233290be7a3bbd4a73f1dc7682049bf7b3cbfb6687479c18d246e3c07161df5c889ee95d39cccd989625a8c9e80f951f8b1832f6378e05daa8566477d7fe547e49ae6e822a68de4df9fc4d6500d5219c3d3bd8887bd7f695151ba378da17c2e750399f7482973510a386721c59683a86003edb9f0ce1ea89bd7bb8a25c222df7ebedcc1b56c8ce18f367b2cae720e0591b477f6ffb498c3d7ce59cabb1b01d7cba84d7180b4b2a165d4b889a6ac361720e768f2913aa50b0b5c88e55c35bb4df4fbc4460338809605f1fd445a2bcd97ec1d2f269b5e779a18c8f215bbc5555c745424484ee5436119eb8754f5e9e91f51fe715353596baa1fbb0a690e99691636e6027cbd4b7be752bc278661e2677070ddc12dccc262d3dd47160345de51359ee8dcf2f61044f95dfdaf323881b2bbff68af6572348f786f6e52d1309cff871ad58148307d7eaedc93ef037922b6092ac62171433adc4934884efdee3052ebd60ee115f76f9dbd0eab7c4c0a77b4ce8078209d23d81d957335f331965b556ebd54732327b5aacc899f9ed0edacad9eb98cb845867f249efb0e1a5fa2483227f78decbf7f1f32d060ab0c01eb985d83920b2cc24b5f9a0d5d869e980129d3b78277fb87e5cda61e340a729d86b6617b8828dffc7c37d4c38080ef3515c2784935973dd184e0a8160f84bb78bcd8a5e691760be4a4d41ed6512ee436ce24650c0e17e7d74b5e01cc39b21e21514a84db262d673f24a82cfd5dfe2a162976171c538b24af16429bf8ed5fa8e37f89ec6e7d63ea1d83ac1087cf89e8f43161f225108889e922493d973e36b510074533cb1cb22174d21c4076959e4191a5df880a8b868b95a9cb5151a7ad47375fcd87725660cc0b59c88ceb86984941268493c49b8aa2baa8c531ecf497853ffc3d26b926a379e72188e246d42073041fbca453bd558f328881c8f8d9e099e898a912530c4be499f2b32229c359ea10e0befe6d94cba5ddafe51d164898166e890b22fd1eebd5724451511dce1f8f7431d712a3f1e50fa5f609da686253311af255b84b2106b09b803e94b51729cfa0826869945d46b9606547e7e33fd9961cf15b400d0f5e01d8fd4d92a83ae526934059d4514b9e0005317a70466aa0b6086d5fcfed201d958a0de55fd23f0919ea29b8aa02440031a9fc206b9feef362a73430a4204869354ec81b6fff92eca97e7f1bb12d25228eae466b8137b4806895ce34b57dc14bdcd107fe160776b0e5daab150ba06976eb884eaa574da393af4de355381c7caa4f611a2ee70a0c78df93a4276f55e6281997b4aeb36888a6d9638cc95444047e5202f41f8bdd787f1ff44a648cc7d39f05e49e5d6989fedb194c526780709763da81a780db0d1534a466cce57e11dd3a4c0e273d9873af1040d52a90e20101e1f80ef296d45769d204cd5417a84e022b6b336675d36d9cbdb16b0cbb08f5e240012967c8067c92f97f981cd19d449084400d76adfb7c610abb73bf21e161db04debe6665fca79d71c8cc50adc3ecf0e52d07773478ca97b8e9821a5704dc58acc647a5bc618d2b681f17942c46c266c73ec211ca403a7d47e42e12c775b370cd500d70a4aac7124f5f6d2d4ca78e1c17a96426c326bb60379ceb0c84a86200f3b450e5e9aaa11f45440f5260eee7675a8b9c47fbc58cf18a651a1dc7b39a911442504f12c103054bb50f15381e512dc6e3af7b414b3db26fe767d83a2a53d7181fec8f6b196c7874befd6628b31797ee3c9260c7b7853b137893e36696e2a47277add98462ea9a0edeb7d2d3c0f2805fd7db64c2c7eff353ff2b36f4de862a42779ffd4dbe77b6a79bc9f4ea3e909474ead915fa3fa990bc82b83a670b163e79300b627fb91c4502e96bb9dde00f716ae6ad14dac647c9f7c2e5b2e505708b5fee996b8e9113a8f4f2caaf414061ee72e76b8bf47ec4f781bd7c589adebc2c267448247e30d659998d8037783494a1fdadcc819d7ad7ea2674f75e10639c3d3055046a00814ddda0e463185454a4455d60b9780250183d591c3db6f27373cd2ce4f02f206ae10a8c32d71226e7cb8d5b05909445977164983c0073434d6c0f2bb62bda66a16792d6e53a49ccb5ac3e285a6baba935f30e9d1ddb812a018ce04f29e2009ad678ba72b6a7112d6e7cfcd3ee7b058ec954a6fd7fd01018a6eba6209687c3130de58147b07bcfa02ec1caf30b59daf87db4618b4a5fad34cbc8014a7529b9458e05eccb9a77ef1621aa95513c6fa4003b0877ffa6d48805e7867dcf53447caf348228ce926233f65d553146584d6ff3dc3ed3296db9bfe69dec6a07add13037b3aade118b2ac3c52350b9691a6cb32356ad93377059fb8ceab68de38d96876d6d383db01f3cf620e47cbfd471bf6dd1f601210482f7c3bdd4c3bd37dd0a7507e1f0fe515151634813dd4ecefe97b52eda28e7a7129993b0af311abd3a07bc463f3cbbcb4fb0eb265a5835663fdbab0d8b8b5a73837ac98ced6582348fdeb41ac8ea9e36f9818ab9c0a41bac1389a6b518ea17df043dd50550f32471645791bf59855ed695b84919aa5cb688e569122786660f06e3a919ef9cf18c355bb397b86710c367362cddb0239aa1d32d489328e4bf92b3abdc3d0dacd76ef1a1efa28fdb848e708aed6780e2d8efb19a2e26fea56b4440dc3eafd796896d73fd150bbd967871f5e6ee5db58995f2f85cc2a15077d7d472bec2e30430af6891193ef03dfc7761e2b3b3b54a72d4f1084a8fc541526fdeb0633dcba14e9485b43065aee8750397ea88d9ff13417149e0fa145be666e6f4afdabe7ad8e4864e777c20ee7a2842db44dedee22f3ce2f97d72919b9ff6059352083be816a7515c48c5140a99af8e81b9e18b10074dc73dab55fae66261421629c8e323d8134f08beefbda555660a51e4b55a9ba4573bdf0396cc413145a941c4175aa672586f7676027f9fe211db87fe07a23962f5b1ad8f566f0d5b13c5146457276f307a02e1e13d00c5032a06d225248215e4bc4be1b672f1eaff16ca95da42513fc4315c7a6663f9101aba80224acbf0c87fd3a2ee9dedd1808c1247c5bebf3cb8d77377a508ddb484ed91203a438ef5ed3ca14e087102bc5f3828d8c3437ecf5c92eeec0331ed93ae33520740abae9b7bfc45f097da70adbb9b9b879e46a7d655dbf75d89773f737b66fd8a8c13506cff7b44bd85dee279ea7053f3ed8447fe79c400cf23726fae800449d27af5e342ecf776378e2eb449a3af27a40fe4a9806487b81c942bfe1a4b0fc146c971a13f83669e0189e337cc9fa2024864436189a9165ade6b864698ecb797ea05fed0d60f0ab4b92cbae36c72ccb5aa45337cc02dd086afed9e5522ecdb75ccf389fcd63c5a4abbf60908e39cb3268c76a08687588be67a856a841eeaaee8ed016f6640ef0f5acce12ab8bb58dda380696e3fb22d0bae0788c4fb79d00cfa5ae3e479dcf7d08b45f4592c2d2a7f8081d5a9398659613ba4932ebfd7382d516b2648ec4ff4477648069b9b2e4decc89547c16ab82a0ad9cf293fee5adb17cea4c95ab7b8e386dcae6acac63ad0d1d13656dfd97d5623dbe45230de597751321bbe5a03c879c303fd7a0d837d48141decb6df4f0865717628c85dbfda29df9a8a69b2c956c75fc66e45c08960c23bbbc706e48395057f989dfe675305067b3ed8d046db339e504d5b2bc978ab4dc261d8afb325c5e794ec79d63d8db53f9dd24b623fbcc202679fae8f7d39f7f7e0667b142c714b6a723996e5254ad2ebafd63c3577f8909981ce6b3eb1a6ad67a4e93c45ac3b34587d153ec5ab67a2697a9741610d5a176cb9b5856bdccb98f69421061c84811dd6660495d9f30548efaa69e36ead246d997c95bad0ca3fdc1a08b4be31b12daf211d3e29d585cdac48af8f2268ec304bb35d",
-	},
-	{
-		"ceb1f819497c0d631a9c9616655f419b5e3470fd3b19cd0e4fa556bd26cd9df57e960ec7121b2a2cb7c0421c1f84b77eb8277bf341490190ee574d1424eb09a281176a933394bfea5502077486bef23ee66e3127b732b7a58a04b9aeefc35170dabb030d4fc3f8a4c5ff194bbd0b89a379baca30ec81d576868f25755276e62c31e93a80ac322571313ebcee494592c3ff5cf3ecdec962645887d9aafdbfd62ea910af5542d4c7731283625bc9f41ec85012b42edb1792339e6cdd9c2bb3cad4c4792a064df17a5f74dcbb3dd0d90620ebba4fc6d1e1f9704dd60c798ad64d4e5077549d68cefdddaab81a7a91209b7ddbea43accb3d1c191328929dffdfeb4f5740ecbf0ee99cb9a1b73333d7ceb0b2b8f35f84307b9d44a42fe1a30ecdf2650dde251bc8c1d46978089c50d64c028f40611370ddb0b481df9624ed63165370f4788bbc396026b268c2023e0f04cd4f66e0bf439074c46f0ae85d6dfeb0ddf22868af61c8d5133097156fa61a3cf5801db5c3ad29871d336f7aa06d2a7d5f52e50eb3aee3c7de7bdc4d21f68a1776a7cc3954f5c071282febc89c1545fc672a0a1bd8eee2b769be048ab58ea12b356d658a6225fb8a55e752f1fc97ed64c2f87f9ae661514f1f56d9d4e47b001ae865a44b8a9fd5df8628d183bfbee781b6661c9cc76debe6c3c5bba840bbc228206673aa05498a8c715b0f3019f6b2d05cce6c233b5809ff1dc4a75d7f69859fcff94ad442d460b32f6fe348659518c16385e49fddee9efab2455732aedcd17dd51b5117efb2ca1e21ae6787437f48a7042d46e11be4dbcd2932ffd70fd154e4eca5fcdc57c6fa79746100b8e1485fe575a5c79089a25eb2d55d89e42eddc81b82c4f7da8bf153ff5353b7349b161911bbe0a14483fff6585d7f3c8b5c04a6dfc99db9548f0c53e25f0b16fa212f0bdd10ad2193ac18eb09972795f42b3bd3f4d98c4868989c4af7a760f1c88ffda59faac73256df1d607644f56a70303d6409c9ad716149bb58f01b4ab8ab475e4af1257d47049aa77adf9ce54fcd22b3d6ec60484da903a6991ff052ca37b01428d5916fd92c17530bb3385a805b0d57476e9f9417a23ab1c12a038b61b3a0898831f9615d10b468c3edc24448d09b8f3e3a2355dc5e069e880929eabcc97344fb6ca5587c5ac1404783848f531f1e915941e7359fedd328f7fd12b3c685f8c1f29d1a6ef7dbae3e5e32cdb251eb43aa2d2ae0cc18b3f40fb006c2778cba387e5852ec4f2d9b8e8ccd5b3e1f4781c974aca940c45d35d30d3b9584c750bd45a80f32f73dcd85c99ae107b92888839c342cdcf88911cb974d611b14b1d85a59e88c502559d6eef3b7f5addf7d307bb25c57aae669767db6d798ca887124e159b0317e09076cfdbe61aa9ddeda189036703b1cd9b1998f88325910a37ef1fc2e227a382ae635e847df8625b99eb6ef0ef10ce7a2a5762ad7d03a7a4e2b767c4df0b477d6e9601dc8e6438184f97193ea7d7a8c22f1b6fac1f0740f1beb8b68db40e0b22940cff2261273aa0be43df561b88184a9377e6a27f27942dd04abb9448b6b6ecb3a60f14dd39b58b8d94e1991cf9d3a071ba42e0e1d71eb211ca466a70fd4724a34639707feefbfd73dd9680d76a214924642a063b38b85cf30eb763fbfe889f34b20fa4a10ba214d938a5a092c6e9b73b13bd664c75b34f746aa360593c0f8dee0f328f0ad4a3e40d498490007e573b8204a1ce7a550deecfb15f18ed5ea6cb5dd95a68adfe4cab37c13b383f8273b1971580016a8df02a3f4f431c9de9e7ebb33244512080fc5852278081b9f4434109c3427441329e8071d19d0fbb74fb6ea73fbfc7c0ac1012d3a0948d94d7ceae9b0112ec43a16cb582f9c53e7eb0ad15e05ceda108fdb3dc9e585a332018d1cb19e4a75d86041308fdd8476c88e4826931601a3a5dce06fc16512f4669f10183d5a8d15bace4649abcac07358089aeb1e9b8fc3776f3239d5442d3be33d532097e13651af7c9a5b465ace9e626889800318447b8876b45dbbe1989e1eecbfb5cdf5067c71a0d7b7fba6555d0edede12f7228d7f9841dc532274f24060b1f52da6fbaa179b81ce962723f43601d248f8f4d5778c1653e038c8d27828836d562968004003810e9aa9318edf3260272b54fca2e012f6c04abe92c2e6152f3c3e973c7e9abe8c3467bdc246f0226d1b7669bd577bb317c571aa8758bfb694fe4dd17ce78f091cf6c6de3cb601a9d177128fce8d42e652b490d90c4f8fa04ddc71cac300d3dff699be3250bfdb2136edb0057af3ebcca77ba5b3ca34531810c5e2d4c5b5b3bc4e71ee9e30cac067b7706c326357fe0ad2a4bd9cd811b4e9d696bd9b4b70579ae246381210f879c769e5f9cc3cf8d70e9c94ab74a55f5d7bf61a17418b6edb6db4147fc40cf98c75de85421b7d192919add48e5334ebce2a06e56b915447fe085b7dcd677659dd55de1f705c389975e56e0338a2ef07ccf5ec3786407e8449d9011641786f1ecd4d3d3da975d61f5a442293e6119ab20686ea8cc7681010421226838a95a157e2de948c536aabadafcd4095dfda48e5613272289a8238dc945e5f1ef30075d5de096131740cdf23da1fb8b9fa009e5b321083cd93bba9271909460c09bbe1e8c54319394ff85c291814e21215816d4791f01424abbe4cc4c792d0d04db1b812f4d24b44caa76de2bc50f4d1d1611862512d87fcebd3c0b2659082b2423bc5360d107ad7b8e8ba7438ae4509105d6b618af25e75c51e272aafaaddf1e5a227f2b2a2c96a8a83dec23223cb428136a30b290181ee20a819cf52f6c03798e7294a89f3b5137693d5a8b7a0ea38d78e43008fc4eeaf6d077ebffd3ef7952620e0af1395c38a289832df391d1710ab5b103a1ffeea8c06684c03a74399cd63797c770e3f0136d8331611502d21fb883136a82f2034358880392fc3d2fc274b799e59b89f8f90d2a5a123d3c21e5bf3540323743858fdb8912c7c6329a3aea241075ae097ebb23c8cd50f4ff46b42486e65bda6beba5f4fe6dbb30f7e61b1bf690c9f00f7513c83274cd21bb71563257a20cc38da2b88c1063bd0849c8243058ee205853342085a8edb7545f0d96a6af936a3d4612b95676665eb02e72e0875100dfa444f039eddde1422ceed8d38e6c3dbba25064f8c6cb5786f9ca67712b7840cfbd40f99b1edadd4bb9a61f48124cf3b49d68bd642404eb1dcf428eeabadfba6810a4032f8ed06b38867a7098c7744d54dcfab8f0ff941ecee69da9916d54097e080cad86dd08bf53833fec4aa4399f7124586223ec70e2c31e8c647be06df9e86a976f37901e9b134e775de2a0fd53d545c5f92236dbf5455859c138b7bb1112427049d29ed4f5dd5c43cffd3113c276d9bba910879e55efe817189fc239a204a9ebe738c0dd161d10d60a51e9dcc8c38861d41ff029ffd841086803320a17ebf5ff14b6cc2ac3dcf0ce2eea9af7ae23597233599c2321dd2b99e06d93f84989e75e30a388f47079c2af545d96f270e064a43a00c76bddf2f5be5089a69a138de844216148a1eb0b413f58d831d9b8967df297455e7538442388cdda12d157fb25896c6e2b47696c76b234a88bed4f09dfd64f2e4b77627ef03049030190fe271a5a853591ee9218a0c6b12cb3f02683d665b211dd1480cd44c9c0566ace7d751902babae14cc3821374bec774d54b4b4afd5d1811ede556a7a5ad02642a878d2d32380e7efb9082604f49d51495105f827d77945b5cfaf2f2980566b28ce3dfbf1bee2e077eb067bdfa4cc28f5d2211ca99a615e69118d9391e3feb9b13cb4a2fa9682718189ec612db889228aaa3f3345a091aeb11f41420240fbb47caf567646d9e7c762d3288f8bb2b1165cf049a191db5042fa9185fcd180b04d3007c376e0aa3d427d66d10918821f74736816044366463df7cb3ac94cea167cf1daf2d1842f130295e40bad672a22da9238ded69e241395f04d5e3c3875b8294faafbd3d90ed56ff3e01c5a0a3e349d761273143686aa26d408620c7d1a35ccc430a09e3f750d3256298c6068c0fdded270f308f79d2fcba591d723ac0cef703d8f0e7c051bae5b453abbadfab98bcc297ed4201b03ebc195c2e441cfd3b10c63c08868db36c320707ecd6a37593661d70a81f30e6db4a32f98e4fe6b950ace55923631c8f95138781fa2af78d8104fe39242f1fff6942e8e782dfa0d37c863caff9492f8e5cb70046d207c4630cc29c20e1ac105aef093261d8d335456961e552ab14d107cbe14e9de912f0e5d58d16b729270208204469f917af4e710123c3bc38a4b3f485f2926f058344db105b9239829441a2d8ababf04aea615c0e350846d9bc3b5faecdbeb450f38f615f119ad1b5dc748e88107ec2fae01f0915174feec37b3e7248ed2699d0a5fb2fc785f17d6275fbea867aad815acc8a6fd3ca4ea7357d197e5a30082ad5f35a9d894c0aebb206c6487163c9cc20442c040e6aab33d7b4b221e4ba4cbabd975836e353129559d8ddcb3c97876cdba360da0e0c1dd5b0cff7957a444027db985ebefb6154453a221076c997d3954b347f49308d2ee14d1676b75ab6ef365f3de54aaf398fd96b9040253813ba734829bc78a6db59e3f1c0ab4c878a72d6b8681157919130fd3171126994dcdcdcf68955ad64af8156702c92f7a715ce6f7ddfb70f60e80c92691efbfdebc8cae252108fb6c0010d303d9027d4a5e63413b5fb2316d32fb93c3ea52a2a7df50cc0058c76c58d73f5bb041d9fb9f3c3cda9bee0c0920079ce4f1ef8698ced664ce2e2b3b86027ae2b3bcbbae5bf7ea3693d9429cf94938dd3a2763d3f53937c46763ffee6579d018358bc69182b1c7158a09b18352ea618c11c45f07fe97cb65faca535f43237879ae3e0a31efd14679daf8fd2ce25eb8f32218fa20afc586a98fd908d3fd804cabbf56dcae272328011b252dfd83e5f0a5fdebc6acb04c5540255e1322de5fce9db5aa4cdccd74dde8990ae51cefd6c1edc1879971d3efb1f94dc41b2b23e9c9d89415b46189914a229b2f3e8b05ff78c68711385a00e9534dae6f79d15842aaec575e4ee0f098028bc74016cd3f8e93c6a0cb21a0b574ee63e367343ca9de28003d76e02d0ee2b8d622cfa3615d3628fd02499eb7bd8c1aa1f34edd9c2d059c6a7c7c978a5e4f60801e03e17c3a09793c5217f310a30db1965b8e328893cef20f4a899aa8d9fa28f7fe0a733813ed7466046776a874273ecfb57158483f4a588ad4f232adec5ba4ea651822780596de09fd54b1717bf04130619979a0e3d12ab7c35d64afb8099a1d21bc952653742f50c8e1c244d10374329cedd27fbefd37815a9b3112a4cb2fc587c4ebda381b2b01fced45cdf0b9ff8ca7d10b65ce42e728de183a82e369486a2e3345664e70674a5dac174d6616d90de8e472b62759df057119875483cfbfb103041751747f9cd12bb31e91caf79eb2db1168026a4707dc618f30",
-		"e45eef9561f3acb3672b4f38570256e8cc4d877e2998e72b022e33de8fc20f7320fe0882f2b53559e084923786e8205336a7d15f3fb88a41e7bd20767f2feaa02df2221fa7577988db0bbf61f3dfb429868688c53e130725d0279c505686f083",
-		"475a44cde0cc931edf9a44b0c1e0001766f09ade023dfe6b59a6af800e549b55",
-		"7812a320691ca8442767a51a",
-		"eaa577bd67fe79ce4586f43355c94528e306c1678946e4f7a907d2a8ee7f4281270502522119a8b09b6f05d864921cb515fddf6a1000fc2f67b52d0627998591e2acf5b6faf71c278e5754b2703662ce670dd049da8d6e280c2b84d6a9b29ce28980563c40e03381a49c54608b72faec9b272ef05cfa41957d9eaf3e944b22610c725d8efea90aaac6e782848d368ffc08784d7fe37ea1effbbbb34952def29fc511fb10a1282bb0b6334328e4d00529a44de3259b522553a07d524dc75f431cc9670127c15670c0df419826617cfb5ebdd8788d5f528a9eb1e61324eac5c1746f339aae2e2e2fae598642a389da671482128acf2d69814258d83de98f186468136868b729aa5f0874fef2ff2575a1f87439d64e049e4d0637e9c99ecb7275417af654541306615f30b75a6caaa563e4790dfb28fe9f0e7881ea2d885eefdba99efa7f878925ce7d33e86d888154a1b03189429fe20af8fa3a68d65ced9b690a709031121425cfcd7e1890ed9614f9dc3ecbd0e38c6c84e453e3204978ddc1ef8d7fc6cae28c61a472d8e089e23209f0c36e80c994af771e6505e72ba90e5543f6bad6dcd31fdd468b13533a0254e44797825764ac1f63747d8d6ca019ff16fa732068ee94be382c46b168050ba725379df31a98ab81ec8eb266a3c3f2e1cd95e5f12b3bc79b8b435e4d94098c6184631cec57e9d8913458889223a2a4541f34d2f9df380f34c3e541fc587f0a6cf08c82e99476060eb84709a292f4c7a8551bda3a9eb6735787dbb9d7f1e83937c2e0e49f2cf6e0ab0ad84c40fbafc3c7e61886a8629bea816972fa0afd0f617b6340b1af19e341875e97565c8eb0b25fcf68696ee674d2abdc29396bfd0f282543d2b72a239c6470f76d3b5bff6d1d064e6e2d06f9deef2aae8a259c034373efc820f9a2fdbce36cc27f35dd6386de3b49509d0c305757257f8674d958c580a09e768c0f6ef237416fd53c31511badb2e7cdfee636508482f01899e72052b46b5d844799cf94708520178cfec2b61c8980fa7dfaad8915b0b75ce6eb57ed4a01edcb4a35c1dfcdf8d60f3191bbcdfd522a0e321ea41c2cd87a303522d0f98b82dcbe53232ecbf0e2528de7e1be75569584bf2ec574687fde67ffe9827ebbe78f2e5bc4fb368f3c9b0f588c97f7a139bd82fe86eb605b8e29cee75d07b510da1b24fd62cd2fb366f1621e7dbf268b15937f7f7ea4acf6e615775a32c90733769996dd2c5aebe08ecba73e0bc4781d33971992b2764c1b08aa972859cb61b003406479423254a01ea85a348ef249d408157cc0962d1e24cd9c426e6e6a3784dec6fe935be1f6730b01e8683d97e21d8774b2e2655f85db7149e930a44524d4f86004cd687d8a528b6ceadd890707458cab62809110ee28f61a7277ed79dc41e573fd4a59fabf15393ed4c21bf4d5138ac843e80bbf5e1c39ac2d7f2147f35996eb51a9e835db63faaa196b8aef1823ad72523fbfcb35b5560582a48a25ab770e7528e4b3ef291e6f62f5fac916e2162b3b56304287e46839858daf322b0de083d1691d6bda44d66d085ef0d0ad364eebacdd0a43a4456035e58910d0b2dacce45b1c0beabc784f3620a3e4390c345df6117b86d4fc386523b7ceeaecc21233a2865ec6b63bffba6689fb3323402119db8f0665a4730b2e26ca6411db04f1bcc78ce6272159ed2665a286f1ad7758d6d90090a6fd320e697dafbdfef575077e282b825bd64a4dbcf92d1fc0c6f795154e8466ee4b318f2d44b6f81c52523ab68ff8367e01090c2623e00b4008e784049df873a35c29e0abcfae7acbf27236adba0b913d19a15b4af4996669aba4c656c317084347ca962ac8df15cd2f849f522016eb92de4de62944b917d88200ef9aa2def0d13e5f4ae09d2eb4a2d0800af1d704cb01975f6d59768a2b50e39e78116147fd6dcdfbc08354c1b4033bf6772fa127856a4072556a9f07bd7516d01ef41bcb519005c0a3b2a04400427ec033f1b52fe5fdc1aed8e2521fd0fff663e203defc39d7546281a98a502b8a470af16cc62a6581c9985d7ca516864b799fcc55a803ce80711484f6b81591d2402bb1499c95dfb1dee9846679c22853be87c84b4547138dc4fd46b4e79ad12773a5392540a595954112f0cb1d9be4d4eb3aaa4286b6c01520558d58587d9d7f0df3a0282011ce01c9c17111d10ad61b3675b1826c1ad37fc562bdde951b43f890555d6f74ac4fbdb9abbe8bc1e80bb6d52c13de8960a3ff8f65201265e82981dbe39e0d65cf3f1fb6c56e11f9786210383d0150a5e0cbbdb52ca8b2bc45c12fb572657380df369082685b3de9847d5014beaeef815d63e203cc911061eb53d89a312d187f9f02760bfa71083fb643f5d8c324c410070b7ebde250a185e7359837899bb1568a43fa3418f39c12feb03b148b924bfb98b99352b1fbad3f07ac8e4302f85d1fe9ee4bf7507972670ff8beca105cdeb037f1cc4f944d6ca869d0281653de5ee93a7362420fdba8b01a375ff08fe27873655953ec1c00f53613c6ab8b244e2fc1b6babdca5311428d06f57aa4882dc870165deff75ba877dd2a04d1799f26ebfac97a1be53a83ab77dbc2cd4aa45bd779f61b1283eae1a1866ec8a9c150dd0a4deceb2ddea1bc0f4206cd435600a8f190b999b952337d9eb2bdeb3aba2cb2e7000319056629dc1f00901f0880278509417223a3ea0919fcdcf12bff0771c7cc725bdca292068478ccb2e1f35ae8964e0601789a73e7e7c1769ba53f865910fc3d0085c922d7f7849d27b6e7503d521371351f9d7dfd5afc5df0effdf6ac49617fa228501ad72154a73e07781dc4b07765dbfa721d95cf1dc41e161cbd34fc7883a25e3ba6b03e504b2c3b98c8b12ff629b965c2aefc26d74faff7f784baf09c3fc38c487a9d1f5818261162f97e9dff70cf42eb5dbcd7bebb66d68f26d917ddf2a3efc0db1e3372b170b4cd18da507e44c467943f73648dba74db1053b53f989e481c3054bac22c6342fca2c26d30a859a1312e9c353bf921f68136de2b1589747bc765153927c31ebe749dcdff98b5da84c4b66085451b4c87fe1ba2142f98636bcb268c33f7b8c2b96a6525298814578377aa189dd73d5bb27ec5cd2110d8751c18a3110273df2595d4c3a00809bdeda70d86c4a8169b7010c9cdeabfbc3dd3266518226d0ade9bcc4825f18198c854de329fb8fe456dd3bf35d89bd9d2384f3f3282f6872351a18a2f852bf173ea4426de6d01b3ef4b4685aa82df7dc45b99617a8b8c8a0c65a2237b3eaae8267e1f6c453f485432529d973924a080f6a1cc2cc18f804f53209383ce3601ad9361afc331707be1c88b4370404cb7fe0bc538df04adc5c8d9ced94b4c474b19619a53dca3fddb434cac09ce10c0293fea04e8e1b19fd3ff3d174baa988d91cb604fadc59ac0b61f4f87bfd07eee20f7f3ffd96766dd6f3555cd48da7ecd71d2fef34ab082678bfc4dd007669b3fc7a937a5a46269baa7e4e4e43eff1b2b847ea70b6c6c23905d6fb2fbccd944251087ac00c35c2eedba30641797d36ef9d3cb1afc0e3e8930f5b605a847ee77106995bd44047294d04350194369c5a7bf246d1108e1d18d9a638be0c051f695ce86579db613cd8922e86c683c91800b9a34fe6339e0dd79472daa662f78f04f0151a3acd18f11faa4e1216222843b521fb998c8490ab8bab27fde36395b456501307d07b484b453b189fa339282a634af30fea99c9af8f877e61871fe743238b2cee6cb69dbd17d574b5106ebe4b0fde4ef42fab469a5ba7d62c23b67d857f1af6ac981c320db70cdbb6be41bbca60bb7a159ee1c85cb82e0a220064359c06c660b75de6b49839eea68c80283b75d9d627aa4500c0c0f21edafe4a2cf7ee079d5310479da06ba58b142614fe69cb236c51447d63db31cdff91485b46325c26d40dc6d608d46a5e2fb01df06064a022ddf6d5cce0147d5b2a5aba5f9fadc5e778010a924e00a13e21daeea2cd330f45536ef4f42c2e77be00bb53b3f9a93d3eb327dbf30baccee5d26849cfad654ff3ef2b035b78dd3ef42de3302e5514551a968a205b823dffb040ac9452ae3efb43219b02436d0761ca11470405510e534d56caeaacc40eaf9c47a39475adad266f5ddc813e71223800dd46fa7c02b078353f870049806ed7ba57b40b7c3c6272296667500c4b97dd2d7026698b6bc4985bc01be99e0097013a2632c71740888ffaf902a02bf644b38cf9a42528880d9dd142de967cc2ad3e1f1737f0cb8dc5c59c252496e8cfe4e53c82f4a28d9ba2bfa62b6415ba3e5e09040d7f3e3abfeba53e46575e8817ac5eca806ec8a84c7cf77c9fa86c9dd2940f5b96b25a92d4a8f894d4717c8f80a62a35a51d8511f1e822fd79e6fc27cc3f3097d9e3272447de6f223971657ded9e660ee4f8836359742ce7616fd0ca2de6656c71b212b34b8edc71ff36bc84ac4af58eb1adcba4b2c0cb31468dbd2c2b7ee6752981ee1d152c4e4a9b25b2ce87796820def34b662381806d2e4fc77f0b69d7a87de43d94d62a6a6526a7f8c588392890e96f9c51bb58b4f438eb5d197477ce9b160d1c898c89ab408b3c1d648be93b531a5bb4988592c5a8999ae3acbe586d947fe6dd507cddb92dff4974ae17ab99aad5aec9d07b96bd29489876f51afa67570e86b69321d9e565d86001514638403f86666dbf93f18e0a62bf65db333bb85a3ae12d8411aa3c2a423a29bacbbfeebb8a5bafd90436bfded16f992232360211086a3084d9fd1980dd96631820a2cf25c3ac5c19d164cf5ab9a852399491962100ca4fd640146b7ea5460b4fb9e46bf8d23d508a4eeb8a3e9fad8249ece3648c2ec7705a7414eb8e8d602549204cb437f589161fe40de1447d14efa4d738b775d0333526c845cef5ffcbaf5c957df1d8022176b56eeb198e7ad2dfc3d7ea46b125ed432cd04c77efc011a2dad8573345080d7c3cdf5cc160fbc86c4ee1959ee1b8258056b0f3d9343c22dbb2f7858c5f162f08cffdca1acc866aa68e5f1c00b74f66544e8a61e429335adf6f73e32fa87e48e1adf15bb6c7aeacc93713dbc31cdccc9b0e52f922842679494039c395cc1d95eb97ae4df3bb8aba9a2584d97a236f87cb22f00c0a078b045044a5c456e22b2b94a76a559de2672c880660f9785b76bcc2aaed780e05212415c6e73880ca110654ed155a1004af45d5f15ae8e5bfd4817440c5d3d5589eea2c6c344ca0d85d91460638b37f877ea4cbbed35ea75678ef2335a5922cc8541987cc256c8f58045028d33a1c4899cc32265c619ac782ff998a478996be6a0c5b102a664831b395a884f18e77885d860d6b236c52a8066d2ced25432bce79a31b23117f405ef4ebdf3517de98d288f8c3baf04b63b6817c46c14b646308e9f97170b7dbbf9d1a36480338d8eb7466df56feb6baef42cba75512954fd7e33961d247b7393726e46c6e94e156d5776a89ad3e288554470ca0bc4cf4d2d2b0c01ae4fcafcb65ccd6ead03df1d4d6577bb",
-	},
-	{
-		"228eabb5ad8b4ff13b10d13b27372bc2152dff149859ba47d9c89b741d4a5340d8fff5858a4576c55547007d7e2b3f94583ea8f0976237712bd2e5481c3988f5387e7ac2c3f18718388795b7b2d44b0a13f3faaa55311b800301c9203a511572cf8f349280bbabb9424070f415bbfe28aef8d20329ee842cef4d4c299e619b6ef1cf00718aab2accec9ac00155be2903b6fb07dfe98b0bd8d8580176b99ce4aa6be51cf59046c17ce1817d363fa63af5a241d48bcce064a438651af102ff9c6de4b86374fe24f1dfa66e16e51550dbb791af425d8fa601c70c1bb90e1a557bfe0dde730b0364eba9d2018ee751699ee219e13fa8874070935b29a1767e1d748bfbe796fe4b81a71e823605d39fa4b5b885f4610c34d1a090fa4106785e7a035a629958ad1b00cb9d36d171d575268efa1bef064fc0a6dfbae8e532466035a0c2cef96fe9f93b872f0cf804811e927b39818189412868fb104e2d56ae62f77031f0df1ae91aa11826991ca7b8af22f130a47a72cce36ddc319b32dffd294f2e192e490249ea1a6f8437173ce6392d16dda888a98bf685bc91b89b8ee1eabdfb1806fd61f018d1744fe8b03521de4bff86d4a811ca2ecd5be668e9c752a6c26aacc0cc9dd89d112785c25ca6a0a7a5267b4e37457c04a0626c8a29be30ec28ddacf47a84918bab164d07bdedae62132ab04a6f2c4e108eba9ab878caa4a1a7509521d427ad7f3dfa86fae8345dfb5e0d46ce3a94dec84f7880c7422468ea74fe0b4825b8c762b34d5d9b82ba96e0c7dcae01718ccac0044a87476ff031e3ee3c2c13f5f375a841d243c38cd9a354b6525527de1fe7e36a6e2ad95e5bbc4c97e85f8cdcd5341da777e03451838807d5dd2eb4fd15976783c140e21cfc2eb3e58e40c16374de0aecbe3e3d41c64417a472cba18762080a2348ec3f441bf229a932ea0ca7c816938655d0c81b14dfbf86aa600d0c68172fb0046ef51f601ec89309d43ad1eacd583f9d205bb1ff1a37a97b44b5e35be4945f52897eb2a74645b01a7f82054cda44e9fa9f9af9bad1a235155718713bacd08d354f3fdd95858db0040fb551e9f93ae399d5dc53a67e88bcd5a02d104dfd9d824cdd5fe262ed9266fc47b7e640f2c9d9c7a62c6d24b429fa55560aa254a824a0858482e771144d6d5b05539cf71d75bec3a22be75655e1ababec4dff9472a019f6220067374dd49252282e4945a407084633ef9c88d14833bd95335107d36afdf56a642cb739bf0a61ed53a6915baed78e9d74166ebc492b517c7c594fe6564550bb7108f43012551e65fbafc0a9874e46fb64b5b7aee0082a5d617a43b8bf9473309c6761aebc7f13b72ed460b522a6b0875b67353c705f99d1d9dc899870fcc90c632aba1fa9ced6d7a2368dc4dd3d4b38a5807415e00de6b9ea70525a6c1b67d04521efeeefc6c591fc5256d990a1123522864a029430bb7ea00dd80d283fdd6d61cc5b509221e28f73386803d97a38fb0182fd95b3b91353c6eb60ef2b3d5c8c0ab8dc9cd9be2b4cf69450d00e88cb0f0bc9a4be82b71148a37237ceaf945ab94c365625f58171eb15c1bb244a87335550d813d28f241a3296520046e65aff3291555786d7c871ec8a2d10d4b44429041c3cd6ab60f0def742de3d28393c5aca92b150697ac15504ee66d8a2aa01a6c63d7c719d6d4f94af2ed1d8670e3231a0e481095e425e6231c43ad36e3b7a3478f6a61563f5aa13237beb8a891dbb29013c325f7f91c1b055fb83c436fdf8aef49ec457946e6ab7e955427373fd9c743acfd4b9609569b591ec79c7ea7276de103a35a4a8a05c91f59e04689ba1ddd570b18ed046f785d7e4ff9fce7115ac814fe126f781828877208ddfbb2ebc919e6d1f6eb417f38bfbf22ac9633f75e58e560b85d88d0e4fad9b2e68c9ebf9675819d50c30c8982bbbc2f41e02690390bf0e16979b24e648bf15b18800aaef58c3c465f38cfd1e47bf1266c17b69523b7868d2138cb95c4bce0dd3ceb7c2267b868b6e12888d5a489fc0091b295b56a1c328b54fe1119aaf1e6d7dd52fa450b52fbfc8b84c2200ebe209060b655cad288562786673121691809366af37b76567762d1fc24f1fad3128b43c8d10e9b6954b2efcbe40124fc0a5b670dd6dd544e30263a551825282aa06be3817a8eeacf31ca8b25cba011d60b78d3d2462810764e4acb566ff371005f5481c9d36c991527143af2c44cc8cfc59c920bb4a281f2ed4d494d30ba4d900edf59e23be2f763072255cb6f1e8b24ab1d305fbfb2429cff8bda303617c034e71a17230d0e860420dbcf9fea4ab48557e4d50797179496936ec6c97686fe6d9115809e14069244d251d4bc9c8931e47e06ec051e709ba1df526b55d959b37a6f3408833aaac80cfc9cb99915eb7d83e26998f0da2492b986fe0f5047b2cab6e6d33a117df21e6a8ec7f394a3712885dab176a4d6095e5cf75dbd3f0077e5e74b1ff8b902072380cf172562884de852ff5f07c55856224fb3df8eb44764ab9284944b86ab6f176a863cdd0e7ab5616a14692f6cbf41bc63113b27689fc2fb145736aaf2a5b26d2bef3a2a59ef8bb3f3e4d360a4251d0736482e9ed7e189fc48c0973b6649988228c2ac72b23826a61cfa06b11f13c8555be6e433d87e20113eb74c94f0e51719a7b38c59eba300089d06b9bc2a72017668e5aa3153ca4282718f1762642e7c1be1f865cd9b65c6387c8fe496f1e60d5acbb78c2f71cea1f35dc955b1e7d1cdc9ca339765995d9e05dd729cdf58aa2a1451b633c374e5b6c2af1c8486ee4250a875e80e1f359c15130eb1e2575c0c7badb2af61378527fa24347ebb12c10bbb36e3c94619556b2c641d0ebb691b2706cdd667f55b8fff8fb46e3ac72f3682661a4bac2391075ff5145eb07d69d77437adec2d096c1c89208ab3e7a9ea6a0ff4a5bc1846b3683bd7c6ec4520c3c95861a5856b0191e4221c9819c67273c66729728f6035e79c0dae8842df4c0c27ada1ad18b34efcd55b94ef120762e87e8c5afdec80d5788e83f0d1533cdd7aea8f27f33266e007b274f6d48c59bcfad607e8b298be2b17322be88558c60033452826778f167f318b660607bfb2f285cadb385399636acb8f5350d819511b5e7931c5f8483529d3ab3fdb5ae2dde0ada918f1327c6c0dfbbf5ed3c8afef171910dd0169022b3cad5b08084dd5e8eb8ef1ecb17e48bf69f80e3db0ae1cc7b73d94b89696e3c3443ecb4c7ca12568201744d1858d90ff759f2d264d49edf47772bd0e0990c14dcf8c8a4c2dafa44dc6e92f4c66b03bdc4f68f28ca2d0811a433e184cced99a8e5614ca83c46ec18b47e0c7ae91037ae06c6d6d0f3dee19711c21cddafb5869416d23c5219296acda7774891877f3f8d46155d39f43ed10500ede3afa26943b83b800b54a9752250ec6ae173e920002f365d692a9b3a2f9b27124ac97b8e81b70e8c0bb7022d07ee97e962810962b03fc019695b5399f77aab414327cfc5dedd51e99453179c42ae85a42f8e06e0cec6f937224dd019c77c5a0ba32ad08107216a9c758138b730bd5b5f4b613f192839514a8621634d9dbd5840e728c1ef4a2c8bbfadc376dd80d13dcb327ce55ab536a43b570789f5c5e135ac0af79b54232613d0e989ae695aeb358c671ae71d508b58a793e19c58c3d204cdc9a021ecc634bcb0bd6a1917554ea3bd688adab8163260a914fc01d7ce05a497a5c5836cf9401cb6aa35cd008470bdecfb97a511c905badd01bbb4d0c05867661debd2162beeccd52399d5a70a929405293916f33ed0d03f8b850f4bdd77b1fb6283118d71de629577383c81cad086f4099ce7476cb787f73c96431a0df4156f7826fce9045f7e7c97bbfd618b845595203cdc8df4638430fac74a07bc5f773486731d8ad29c06695704cbe2882077a85d543551b7ba81b181ccb93d2b3071b1a38f3c762b42df8246aa64cecbdc772830ac79e766fa99e8c65225f28297a32526df9b51227bd368253737f013ae18435a912bc18cc4a95216ce449865e8bd8bc759dce9d4af52f9e789eafa37023e91946952202dfb7243cab7db2f9f98bb66f19750c547a2bf2e2ba92862ab66f33fcf465ffc41d23f0b891a3b28b3f68ea48dde6ad4802902abd22b0d7d9101bd61471c5d88ee9d9477b7cf9f6ac52e0f520c79278da22938745446f1e647ae478ecba416b941aa31f979d0633efe72910bebb8988de1d0013616f31c5da163eb6c07022649ac57422627a5642618f53103adc9918f9992c5b085e10d2744f9934bfbb994a710d6cd387c325e94278f97d5582864f1bb29a1400aaf674ea8fb99a3b42e4ac50418fd804a5b1471eaac4642d4aa338fd3d5d0dd84372b2c32c5cfe7f319acf731a9787b048cedee3833300dde639cb1386c8fbca4bae8d67fb7bd72d1696a0212e27e166e6b04a79e34b47c98502ed0bdbd8d61777537f72df569fe5ed30071b57e8724e98ccb88c07f0458cf32298cefb6ed672b255e581ac756789b57e950d57174bffd3f47bdbe4b168e7e3f1a6df508d4202d327947facfbf9526a9e5fc1a5abb179902d4584deae6cb2900391e080d3f3540b87c3a873ccfaee5b4aaff0e6516a867ea00b4d5e680fee6b91defc65c240614a1409bdd0f49c2c4f3c1d258d77abfc17a749660f49547adb236730e5a7a22fbbabdd8ca079a8efa5b605332db12f455868ab67a1ffd27d1339bdf8d150189cfbf6199c6fc27c05788138a63267eb8ac086e27286b4ef99ee9d92cfedab5ce9916675f128f206a1733f47a597232067aa12da20c7b9cab6575d7634f8c31e9a29948b528681f3f9c13b9f585ebfbff8c28a299a43e4409b31b6c02a79eeb493734fe5f9c1d9e3830572eb54229b5cf525768f695acff48c76b4a6e0936b7406ab69f06d33d3f04946db9d7966ea6e8c50ede5abadda28149edef5223a6938d5c32933070d234043feddbd65c81be218f9d7c497a1ecac30bb9162e60a9bbbcdb4fec4b212050610e2b376aadf58b3c9207860d2650d0310ae6606a8f1b266b6a13b68c3306ed413224abdf19371bac3ea1b964f28996fc70f666ff118c6a7c9f2108d327f5145919c03832f754de35f5979ae72130e39126499037d6fbb3751cbb4843b05d9dc91dd5fc1429da491f72e3069313ea243933b47109af247fcbe0c70f9024ac5a41815655ab309fcaa282d03596ba59cfee0e40f7bd657689453e98d562442fa4c585f970b6983a581b0b8eb1c5e780b3f5c1abb326213c6b5fd440c2187066ddf55f4eabf88804139392c45979440c6f05b7222bd95e963832d7fa4a4760273cc075e8b8feeccb917e8feaf7d3f766d9ae880487e69bc01872ba62b91b8af5dbffdd93fdc95e8f47ed793fc070a5991f2e9ea61439662dab218f643c1959171937aa160008a548f51f87b58f2c4fae5aed556f26bb9cd1dc2b3518458e2f5ec5d974c6e11a0ed639958cc8c1db771cc8cc8bee8727bf6452f47c9782acf548856a0e67841c3dbdb1c98572a4fc8e6cc8195a504019b4930d302a90dc20d8628ae6c90e0206cbb3d05025744db4e115cd3b650e5519a1624acbf226ebca8875b05183b2584e65289f8b9cec3f7d010cb9671a0e80bb70ca8763f1722d79e8decb6b9023baf64b5981e745c06546cc1e",
-		"ade72c2ea29cf829ffe99c2d63840b2eef9b51a9919c02128347d2e88e9f063b86326928cf6252ce4beefbae7206dc61a22d0b33c90d464d551835e3b73c1e3d6e88663deab80c35a607e4180ec079b0ee84e3b7922904e7423acaf976e837",
-		"43348cf32211d7daa300de8a4218543c8e3c7373ad10950765c39760f80b733c",
-		"e4709d225a552e90fb357413",
-		"562050bfb40451f27b1181c389508550a0f46b53d14ca73143da9dae3d3d2b466e9618db39e3219675d2b6eadded7dd9c741d7c9bf3c5619a521189607acbcf6b3964d469d966fa134444aa06d80749c873f0f976e0c5efc5be8d00a2729f03eda6a7b8630575df8b3a19388ff88daf0d00bb3e7c35a525ded90a4511ce815fe6c8904406cf72d7bfa14ca533566f7b54268835285c5402e22a63f98b5d90c86dae0a76d65eacc1ba85b3f5a1499d5f3432dd5455fab9e8bfbd266e99283c2bddf9b556410956b2f061603d1fc91194766f90da841699ba7da3d53ed5abdd8e98034f8fe734446d92b458a731aa4c578552ec1ac5d1baaccc4153a67b48a290602d5f955d61a08436b27cfb0786a80afef76e1266310a42d90feeb3bcc40ae5c4506432dcc92f7e5758ceaf277255401f5c5f4b10df93a249e38edd9effe7bacdf7fecc451d3b2cea77c9bab0403450c41929775b8c0ace46f6928f4d9cf3adf86832d298ea32b236d3201464e2ff506ef01da0e1e389e26e2b3ddc553b369b48d1aa5dd43edd5cab065e276aeff72a4c43206063fc7eea3bcc783ba2221f5b615a7a43a75cecda6bca5aa159e9208bf66af61e2e465c2daee630c4c62077ea6ef0e8b4b4e272d4e93a5f5284f9da463e1a60f815a8a31698ecdc09dff2b62f00e37aea5fd4b07a110cef27e12466c1814d3b10017cb9b8e12f2f38f10cbe31296de2570d5662b16639fcdc05db81e0d48178d055ef873501148d00903ec771400fa4873c5579dc3265028f531538f6dab1e5607a15c8b90cbfa4835107cba6f453bbdc71d08c7e423f58b44be38a9c8a610469f2551ee6177edf639cde35fe8e02f76b7ed106d691a876a4fda3b42d8ace3e0d3d4e026206c5d7d4d56fdda9dcd30fd7b74217fab3c617903f1aeffb8363443ed128af94c391810e327704d6f655e57dece97658d41e074029823850ddf7c5937af41c64465046d8544bba65c691ac69121bd272107f7eef8cfdb6a25da5da16d1033cede09129d51f6abfe63905a6fba9a64d7832fa35825447150595a60163af848eea878fb31a5fb97b1859efbfcc8586eebce8cfe64386461a9b88aa5efc1db43c64dfd5d4a45aa74803fd178f9e16a3f59acfb6e13a564d645cedd73890d0a82fb6dffeef527694a7cf2a89aed9750c3675a67505bff77de8d046087bd39a85c90aedb085e99baf04c7e3bf92e350b332da1b8af85550a00d68904ca426da61add864496d6ff442bb0b848e9aa463bb0c2085cff1a83a47d6f702bd184cfb5c139752754c8978d27b58d364bd88722b9097ee3a6ae28eabb14ca7c31e40461101e92448dbbc63b55cfe56efd078d0058c5e6146c73bcd949c4b3ec9f881b9a5f7b41ca83301261e0c674f2d35d96761baa00ce0675c082bf73dc52dc726a3e605067569a372d2bb47fc8fe1e74f00078ce6f352a6d9d97fd2834670ba3a45aa6751eafc7ed6694e1e07542860c8ea516f296ee901a3ee16b00b40419c74bf6db12c7230325e85a918f412bc2f6469c1a13a5aa77f028e327749efd05b91053f49d9f1edf49aa552c58c68257233a168db60ac55b4086ddaea275b078869cda7b69493c4b371b4e9c8361357a7ac7d3d3bbb464c960addfa8df2b208b21b090d540c440241598212d33273203d484e0930e22469c2a8e866579a4a2b3db8f8344dbf8baa1b97be0c4d976f6aaf14cc09ec52630139b894b2b6f4dad3a205a7b286253f1522b1d6e43bfa37beaf06f831c6f0945cefb2593b9b298da13b0d910582086c5d7e256ed4067bfb476dbe01bcddb437d46ba716d6ace2ff9912c8e460ad33ab3d8f97b7b08dd4ba9e01968d1949ff85b4b9d5b8da291fc0f90ab1eab1d246f67d76092b7a37528ceb388dd76f8a8f0aabb7490f02a2c8bc6498cb26350d859c466dd611bf0ceb81a8b7899c67742c22697ccee21c4963acb003d15c1a2078112bab05595917584e417db3872a0ff0a29138bbca7314449b19827525340370d7e48fdf9f7c6b4a280e78d00775a291081a5e78e7a00ff915015dd5af5f0a45690baba8b1b503bf85f326c23136f4424be4a559aed03fbc81400ac27a33dadb2155d1704950d98043dcd86df1eee78f3f266c4d14deb8126708f74b59aa15e8b497c6a52924a473f999aaf0abd3d148fee8503a1568efec7bfb0bd463402f563e4019cc9c9e1eb498aa54dcb659f43b86df0a34de4e51ec558bbbade3d69511d3fea2baf44f67e85ada7398d7f72ecadcd9e981f82b0743ed74bd33088ba4cbc85b0c99dc5382c599706dd2d51aa9f470c25a98e7e8248dec216a155495630662bf6ba0b7a4baa2cdad30e9ce3e1a65e3c23d69d5f946606ee8504dd70830aa5a8ddd84f10e064695469727d2efeb46186c9d3b7a170057636f05b9ec4c2de7d935fba504a1e7eddf7a5a95226b253b0b9eccec976ca3c57599850db40c27a51ae755c1f30d392467cb74e5c8235861d11d0f8461b0e1d84f5718d64ea92da62f4de184a6499dba473e82b3d197305de0e494f118a263237c7b4c0652327977edb427ccded35552c00a5804b9557ccf2bca2484d9da2c33f6c1bbf2c666ea10b4644a21e3905e5c4eb417ac3572e783428d23dd7222e75c356b99e8183d033034e29e618c90e66ec2f1e9fca47d82c1cffda8ad14c96045159d9437e91ecef41d24cff89009ff57e18c1a422860aa9cd31dd2a85b07422c72a5decc614a9742e62a4988f394421b6918e51c2412d749bb53b1e8fed7b2ef0873ffe14fa77bc366bbd5fa1432be465f5e25266c6c12b55df1f19b1a491acfc5c9019f122c422243d751d8eaa8ff721397915171556e999b34425f7d3ad6f6c3323b8133b4618c65ac16cb5941edc979472734bdccafc73c08939c0b1e306ae3015faa9cfa09ed6560269a1dc54c2c046a12a178144f4381f7b6fd3fd2d28f778d444d9f7a0dae00ea96c6969b78ef326a962d23275f1518f0e6a2469440612f3710b53538fe99a6179471be8c5b2d682ab3e9a5126e41ed6de000cd9e92fec3974e0f4cb2d2245d03d6ee80d6a793b16efa829d75c796f34d4e918250f457703559bb48ff78f0896be1bda403b7f1fd6a319d68478ff70d88238f2b8afc7d20e51757bb9db3bffb35a8040fc0db913c4f03d48619af7fd24cb8986b3e139058be3cc253b3de9b3bb3f8dab7b8818638279b2e6a0c29cfe16fa7250d3c74362ffa07e2977cf562140fe28afba8f61d81f7c73bdd4a2faddb00752bb049d0a57d05c6475c7387e6716ee31974169930c9fd830cef138659cf56f2212de185186c3d683fc6b7fd36e7821f69d0de041a569765066dc4a1934870a7b80f174e8f9e484942e62404a42b21658467873865ef94fc262c231527f39e82dfec91215947b99567daf75c6a28073ee4e67d4307e4b35b46f85433abd9812f35438b34598ff3b6dbd60b60747ad64565391df45ac80b272d0141702ab807fa27c6a6ba2f42c3facfae0c773940cb2943bb1353b41298258bc0d07542b69483e17ab9ce709e4160b80a0968dae9af8fc7c0324c753ca4a11a6df32dfa79a87b445c988154bb3c503e6884cf6d8f5e062a16b4ff230fbda109a6127d35e3bf2b29bfd3b18ba275af773b1981d603300035e046ef023d51874aa105d136bfcc9c7323bd0513a6b2b397ffea71afb7a8d4695411d86164917099eef504f6cff3c5cefb88f23f56c4ae3e2b09a3f353fa55630f45f06c29e8912e8c3c4f493f25eda781680585580595bba43dca9cfd400d9eaf5081d2c6697da59e012dfd0b875336b88fe16609c2e9876737b9afb868ed52417ed0c6b359d582d585ff82d98edd4e63c6b65cf43d4f69eee2af4819157b8a433966953862d1ff2c6d0cba382644a1b0033ddb7be3d1fa9a204042d7b821b293bd659dca980c108ad1db740800b9bd2fc1a163f9b4066f7604f160a7910bd947cb48ce6c81e680fc6571ff0cd12a3ded9c8cd560970ca5cb480a70a8322d5072edcd257604eba8dcf55f9ec97ea2b14fdcc72fbf615131836fb14e42b8d7171d0a06d2fb3caec2e0759e86b0d8f21e312d9211ed7fe0b48669934ffb892baf1db9aa457c07820723e5446420334bf6479f2099e01ef8adf273adfdd9ed0b741931284515d69c211cc2efead8339e450b13be71b35c36c1f00c2b8ed0cfa9792e422912e14b5b1455ef6abdbbec0035480c6cb69d21321d12ee19d528dd48f43b142cf0502eae5304ce52b7fb827552db9ab885b93e83d56a33346135aef11b7e48efca7cd52e2499a7edab0bd0562862187ff4599b2446bff11c37181092fbb05d0e05220ca6bc37f529d6599e8c29acb9f25616c27df291d4fb07430188e6470df7002f73cfe5fe6907dab0b4f90bb58130fe90241c29c6063a22c9f45d032b282eb92c93736692bd5cbde2a17552e942b595b08e6ba0c91a03b9079e9117fbba8f26ce6c5d0500c69bb6e22e3562a50baece49109c2d42b6714250665afd0f0a7e951182012f21aef4b917cd434d9ca22661437608e32666497516be34652500def6c28ef8f56f2273de5416142ce9606faf7df92ab779ed6aa74cb99bb1bfe758ffd344e1d31f479807326d1a7b98f6811e275545d69198707b0fbf027dc6a5e4815d62ef191535569a452c27c4e25ecf139df949d70dd5935bddc04f33b2f0bcf5073c51fc51c15067963a20569b5659f0e7413b347d6d5ee38a92b7e6e656c199149f07ebafe5281db6b1b2ecd9e0384b6f5a8e27ecea9a0249c61b16564964054f5f9621471a98de132e102f518c1419829e2ae2c8c5fffd1270f0a0b33a383437b0034783d50bce8bd7420c059d16364eecbd55b6ac8df8a70382734d8127f4f5895cc9e508b13c000ea053ab59b87ee639745418ffc566ceebad37a17b842d24d3423ac3f086142c622eceaadc4106f8c90c5dae1f52f407fa0bf1e6bf9385cbcbf3b61006ea3b1e66b693ce704577ca9598587f41e05d36d1de424e0e51290a5f2e2f99f1960c0253a046a49b19eef249ca2dda2af1e8dd78411088eff1e9c23c31bd20abd4fc9e7eab19500827d202f76270fe9f90e95309516343e0fca48e5a12182e91c78ebf2cdd4644629afdc90bbccb77546cd765135910ba1cd8a3e3c00fa77e585865e898bfecd06c01a0a4d7be483801099c61941c4967154af5620b171b426cf229df59d2944ba50754140c3f305c16956953be376fe6e7cf31a2e9c276bb09cc24c4b86b2b26f039b0d8511853adcb7feb8502e7641a34e3242bf2c538006bb1983345ec3cacbf219ef10efc1681d52e6e1b1c60bb556b6b8a63d1d1f6869077841d1b816f3165a35833e33d39a8c6e62a2f7c482c395768fc6a0e3cbfc7a1a6d64da53adad66c8016f76eaa73df1b8ef83012ecbe75c92a8e39b48169433f951a539b28a034d5fdd00639a5e3e17ef14dafe869064d130c90c68be4d5ceddabed1bc94e97e2cdf7313f780cd6e175a9e3eba3eaed896fe464073fcf07ae7b5bd41d58c3160f66ac95a76fdaa7a8cbaebb304fe3c8f03cef927a1182ac2281c3b32378813b24bb99e42cb0774331ad78b74d46b8ce48bbf4ef8431a82d4240edfd61b910c38570ba0bfbd4a41665117e6d5f5a97908462e62d0b76160d06aa56cc6e17aaf4607ba8263648f2a0077e306c25486f5f39a75",
-	},
-	{
-		"2f6210063cb3071b3d49339185c2cef8357b08ca826d8d1acd852540c16540f1c850f70404fe1f414853d3cd15a1c64a1cce149e3ca1b80926de4ae8438ad90bdad010decf2f201782f3e49794aae1b079f54eb59607bebde508a528927e346d4e444b1d736b34f65e198df2c36fa23c64f1f1fbf8b0b8ddb85d054bdb39b8297d0347f16f7be7cd9474c058e36294485386434b36fb28ee582e393367f15ce5f5a3d6641fbd31b331f10b1554a05da726a0f35c9b1b4af3498426b17582966a266cce452900f85af1046f45a4ccedca6ce02607fb70fa45f420f66aa38cd4c9f8a30e21a3067b940aebdaaeb7c77824a79e2ba20f26e70346dd6de96942b261e5c08288c7fe1cd1e9f680a0bdf8c46497f007a616eea95ccc17463559f8973eb919c68017e25100d9d1a196ca65fb615502076bf0b0c8bcc70ef22006895ebfa2243fba0791bae0625b762cc1718d1673948264454a200c58122d5e9b8b1e3eb05df8b7eeb297510e0d7dcf7f0be5f29f6756e4b177f109891e6825a9866359e35b10d20da7231bb5a0ea34abd0264b377d2fe9f420f27d3e5aa2e8e00541c46052966ef9b989ae5974e2054409507b867f647aa057f7deb19ac6929f0856005aec6e53a5f702fe6be403afed532b73d38fed73e6e551987f182a1e20801e7a6c8ccd1184cf0fefb4139fa166ca15395902ac40e7fed8661602853682a3b0ee307dffb44d0ea3012142a2880cb7c166ba6ea6a16c7e0882808db8023068f060e5ef1432fdb8331ffad6a7078d686d47d613e94291f1c4117e7c13aee4030fcaf223fcefdb300ed606b5dd931e4adbf45dc437eeb5fbff337812e15c15f026071423f6ef5305c559baa2ecd8ecc7cd498b043740ff3673774855d45d45fa64591d5b4970600ec91ab1b6f39d7dc0e709c41e49c355bd3b9d120ffb57095fb127bafa971a086135b917285794e83e9dac5ce76fb1a4aa4fb6b94a0dc3a9beea64b8817ec1e2b37af9dbd18ec30f2b6f6c12df1db6896c6c43b67a066038f0c4f17142b254f62c4dd1fedb950d07047919e397d06d033cb0bab6b61aefa6dee01720926b16beb9e8bc947dca9b8143b565da85d2dec182987838b267de9047f5b0d961c7971aaf54ae2c1e4aad61ff123c84e41a4566b2bd9e64247cf46b72a444d36bdced1a309b464ee5f4afe406eb68eb05ae51b76bf01b906c0ffbdeb440b11f1c9e3a4c3a809a1f7449047b356c663a1ab7f286a70d16141d11f2d151a4f06d422ab97cab539c1f9da09ad20c000c27b8fead5f0cc37329d466fa260aea934c154dc9c0a065df3d057a0f117a1c38321ae59226a8054f7d6b49a3753436c249838b0924f0e861f5627106dd8d3f0fa724a1cecda71d4a1267ed889b234ae4a7d5edcbc5d52cba389dc0152aff24d224c6a0f16dbd3b7f242807bf4b51a3f22690bdeb66eaa59e8766b3b265d784899d247a0ae1b58a06dd91c529e3691b09f9d9f55fc39afd4a00b0fc668880ef25a46a30861fba8cfd4b51262eba4138b41a2d13ddc71128c8c1242e49a51d6f49879fcfa7595ba4a4adcad3670b0b1b26382f03ff402bc70150f54bf513ba3e9a590e41b269e55616af297ebb3499e16cc8e46c0810330a602955553c0f93d668a1181a0bfd7021ad9a9f68ce39493b012da70a3dda149d0369f23f788616e0272efa322b6a54d804f340d32c890e2eb7b538f48f4c9293b584d22d0ae80d321607644271b81a76ac5b49d8e457069b0c3e909b8a222e3fa6016cb1e979e300804742f2005c68acb7b1849c088b3714c9c7af54e9de9390df0041c87924c8fa6b0aec6b6754171e059cba0d27f221f0b9d044a3aed8338dd8745651981e4b0329376f908b86ae9022699d495bbe3a148f7eb73d56eacb2e5e2180f63fcbfa680369f88eefa71f1210bc5b6b7b957f0a1437476a2112998033197673e470dbe7d9d476c97b95db8b5136f6cccc75d6e0ac1e4ace30e34e64fcc4d7e135b2c80e863ed701d3b28c25e982f1b5f8c895a4e6df7216c3c07abf8551a0ba0469c88aa7a08c7b5218a03b9b91f0935985373f65aa56286ad0e7ef2288a926f172b098123c136455b3a0f04590839e16bade7b6434a3cf048abe2612684c03dafd9cec39af508e63f07ea881014697bc24122058b5ef5d3fae835216d055f0cdf1dc06a12c95041d13ac9e15f235d11747f16ffce1cc3b8f508da520e395edd471f3759d8879ba9c2558b1188d822fd4739ed0546b0ce3bb9988db7c1dc8518ebbc62c4440e6e0653f917dcc13aca1864b71dbb67dbe7117474c936414e4f3cfab1f13eb05f3504484ce11977ab21ec523f97ba1b7ecb8fe384b634c30561cdb752fc67a2316bfa7e4d03f5f825d24a556a0460d8cfe0cc54a6f117ac52d553a5d1bb48031732716436675c5c3996b1939b127c6b0338bfaa29c7467cac9a127e455a715c9ce2b0c35a0d2f83a3d1273ee39399e6cc4980e610c752bd51652b96bf9cf34c7fa41fc9b13f5d55007483e4082ddac4675baa7822fd257452411b01de0e5e5da26e17539d64a89dd93c71d15a4c95b1a83039cb2d5f3f7fa04a817e48dfcbfb3de34ecb47f7592123caf27e17982fbfc8597af5b8aa6558f4e6c73db69328e47677afbe6ef8df82c3d1f0db6a108b2279f61822908d7b856432c32ac5ec0f3c53befab2a7ca356b9c2636f646b228b0a830d348be4ece2271814d477d4c73c0fb6e83a338b90ec4ef45cb25f7e3d6a014a9e8d2e8a6f55a383291a57f15667a73ea1daca31c7182523ca85a107efa2518d2f7f179ed4ba21fed479ef2be09669817133b2384bd85b155dfc1c4c9e6dd9ceecf06cc1ab8ebf7f07aeaae7441468b5471aed93f248a84f44c59be33274b11f651de010ab9f8fb24d3a99914e0147951c34280e7dd15ec196f9a4c86e55e7d373c7e31e6672d1b3ac6a45fa6c8c9088c0b8963d89f4ff1feea3e85cf9cf2f6c97128afd845bb131c6f62b3282bbba42745080fd457f1d3322058f1bd4be876bd01269546d1a853310b165926c1fd4e07054deb5d3fbe8f6007711d435994005aba95918c3df4cd390b165fcd139dd418ebbf661b6de57b655698a8a02ca8fad73e8c536c7110957c36e5494a831d536eccb97a2a9ef58fe58e2885aad170720ffcc57c7de601ea1cf723577a30aad8fd544317e33897c8b6c04e5191bec391ab990e197f10038c0726d371677e4a54c28d7ca5c6046e7cc4acde565b91f7f72af6109a0614160d3ae97e9257b8f71a4663b00c681e793cbb478306e97b0e04711eae7722b4845dadf2fff5bbe71ff24acffea2ee67df99bf62a098ddae9d4ebd3bc5dff04a2d9e3d1d83e8f493db3f63c9e24231b1dbe1147c79f21b0730c842f6983330c5c17dd34556d7e932074cfbe98f2dab5b0ebfd778a1e28fe2bac2d942f61a08b787ebfcdeb3d600bb130ca4922a4ffd38ffc4a1a1a7218451e45da4da67ad81ef898ece3d54cef877cb9d09f5dcf72eccbbc06e62f1e2b4d64059b0a807329780b155ce1614b68de04387d6108ef4dd3ab54b9da72e528d6eac3e16a360ae3421f3f23808a8b5e8ec3dbefcbca3c9f76905850033d78d9283bba9272c475b4e3b4d7643e62c2cc259ebbf168f890de88e82f8b26a7654ee31fe055e45609c70ae02b4942ee15678cd158f4c9e8d351d102ddf7a942458c6125e1457bea0d86ca38cf0c26e474b2b5cca77eb57ad0867cad7d25efc2b250e79396637ea3e948dbb855029cc9b452955bd04ad5a0d0514d4d773c0f298df7bc235a3ac64383a1fbd8a397a158e936b3ba81895a51daa89f51e4ae7a71a53794ff715a42f4fc3dcc9fd56df7bea4ab782534d3760e7b15605fc4dad16911656983c0ab77bce9445bbeb1537c55fef57a32c8f1404306a0a2ca7b73348cd99d0f9948875531cbb0ef7c036cd201614c33293d746c44140e0e8f82421c5bdf2bf428b249597df949fafdb5ccfe1618323f56a6ab9abab9a84a3beb6696ca918af244d34cc1cd95bbca4a87c860a0fa9ff6a04a905b0338a53f230bd5ee9c60e0e0332ca200c15dca0be5936b858d0a7b2e540b8958432e9767396c55d5cc35b60062580023b5cb2f9a5e9a1feba59a19f9a5a251e9d0e8500955a5df21da95213ced2260a2ed8f3d4b295c36cef750c89cf21985c302d5cc577aab7855409a912dbcf1d0a9800df4aa692a78607a40fd6d5a82305c58fcb3d2a82b27e8c5b91681aae62a2bf31ed55c494dbdc38eba30e83c6044945df76705228eede8470369f2e9941ddcb2f239fb3ff6bfcdb0efb5ec50f981adf0e8b213769ffbbea364b08cf8cd69abbfa2a6fe9865cc48558134a57bb5526b9d047e14a379d246de82d3d64f3c810ede280c768dd8bee25af287d5a8d94045ddbf5981382bc716ad9aedfcd66e0ab496172a24efe80649db8e1e83675fc8451e22c6564d8d6dfb285af7fec802b35f19dd8308c68952a11770247fcfecc4ed0e8a445c17b1573f0b4e3ed350f13269ceb572943fc435563459d5044699f1542335b03be6077af156b8c5a6a9f71078ad820cec4642427a9b187ee1b17036d5a5e6108cee8a7d444342eaec3afa64e77c71d3c2b3153d4e2dbb30df2b66b4d14cc45d3a4eda7e911d697e5763e23ee05311a20626df55549b8533c6ebe79737abf472f9cff08bec590943bdeb819d3f923f45b81f9a0cba1f3f800a261842d10cb4cbdba456c7fe5f0abb4a8b58891d97cfd6b669e2708922f1934809d51a1589e5f12e3bb82c9ac3e7e44e3f6e6cd63d428da624fd2f46eec38ff798a90d228efe50c9b67c63796347c8a2b53478f27605999a03c8e1f18b70e92419f646a7f49670aa12d324751aec17d0208fc296955b3098241189af8172d39a6819415cafb107c1842b369f174d6f37dd31cd728dfd0ab10f93609006342b6e4d6ccbfd1ed2bea2fdf5411442b04b1fe218916f159b20242f80b535b4e0a3024c6eff6a40bd0d3db24e51f5ff9c14e1b4a650ca4170ee70f0a3a5a58349a7d0b7a63af86347351696870b95231f76d8c5c6a20736907726341dcbb76672871d18c2157c094b929fd29d34f5bcaacd82706f89a60000cd341d98eb830b73a12335b69f3e0131ded3ce12c98bbd960d2d0696d40696a13ab43925374498d868cd8f070c9039ea6407fc2d92b9c39fe7c935bbcfcc5c0980952fb7dac79042951f49a1af828b138a87401c4104bc28cdf1e39dbd3fa63dd4d5f5ae9d85f032a43ad353bc5e6746e5a76326ab1f4e79103116ce70bc0b459200f32f85e461291e347dda92e421778b849e37a3ecb0b31ec6818e828dd3148dc74313aba43cc9d8b9a36a9dc4e229488060eb6c109f8ad6201958adec6d3bb3b04e5e558a272d44cb98e18f7a0ad8fa6ac3667a62f150830aa930f6166baac6b9081b44304988fbe1698a5b746255de26bb5988aca90bb6523cad68a7572f615f4aa58f932d8a749615cf0a7724e99de042268ceb31433e6df0a61547d576a6201b36b348c028ded5f7e94d1cd2eafc141088ff42cb3dafbbe4c402b93aa9d955df8d9d9fb57c75ac65c2c837acc44bbd4d4aff1888aed46c73d625ad7fff035e8ca0fe411c73ed8135b6b8e17a039ec74e9de0d64cb442bf8a676c0a666f68f21066332cd921ae0ed766f0516a8e19b82cf98e78add0373737a3419e13aa902310c44feae5fdf8bc64e80dce772686a31f141bcce452041bf545b908ef4a2b000e7beaf378e2afdccbbcaa42e330e5024400cf2852d3444718",
-		"fd5008477b0855f6f2486fd4f74b9fb4f6e19726c6996bc66893183bd76054d5b05c1c2b64722256ba912ab2dcca66d2abfdf972966438fff7513acfb18ea461eac08c4e32aea4ed3fcf9f1c9905ee4402e7b6984bef974340d212f160b6524b76de99a98d3e96cc0d35e8a63ad7ea3cbea1d40a906c4dd03e5fc19e1513e9",
-		"390a5e75c9ff4ad38fb6205ff47f209294337c1f25ff54a3c01eee8e1e220257",
-		"8bf183347ec1ca4bceff3374",
-		"19fa2641519e21293094e9d767ee1237f9e0715dc57172794867c3bbe2cb647f9b28a8d3f85c0ff557b91bad66f5ea16e0107757b0277fdd3ca05bf47c19bcb92a958a57e8c142a51af29bddb20af84377b6db65f77494e0dc4d2634a776b3a5d777319873bc0dacbbd4b9ebccfae849fa7e9769cdf54660ecca0d5cf4fa5190713726d54d02b3a3f21857125b8a808c0ca2f99d11dc430ed5113ee49ff8f00bcc08f0370dd510e8100e1285659a7b2c7457a6049f2af7786c4db1471ce5bd164e11c7a2165e83e03a135ae2b3429f82f677de044a067e99e0bda2d65a7270d629c00e1d528212d3aeb2896e58ee5145a93ed06a9c00705ad5c5988d3a192304c1d17661d45257c5d16799ef70771964435b12e3b2ee9d5b467c3b1992f45b7a59871b40d8daa1c280747ecb3d170257b91df1f549ce6d66455b5b6f60b7c6e95c92a67e20cffe8599ceb183de53f1dedfe19bae836447af8e053ba419660e0912cad064d6125b9e978e8d0d5f28f8a4e43ca3cdf2d4c0e9a11221d8184e9eb6c90761b0beac82d0d22793279aedb1c7db3632adbee323bc3bbde4801152694831abf5676979af26af7dcbadfba1cad1306b635840cbca76c558b37db0803b4c12befa27d16f21506b07ade4a838d6beba1816eb29ed5e3c4f132a752fc747bd9ba879156e87e6c1584e911da9f796e1fa4a055e427272559e4bd6d0f54b8257100f8a55d84c27b702bb1fe2f995425c85fd48b0a0610db5b39f7a5031407a12dae9f508b21b1378f14952d1beb2dea81d016b2d9b7f1a67b814569b69c0e619adea02a8683242d63a11d3317d060e5b4d85df5ad73127541ba5314715d187990735aa81f438f8b94070ec506ba536274d98b766c1694e54367891a602b99e370425b47a70b819277a249fa429c5bbd0530267f987e6022f25030c30f3baeedc0d13c95f3d5e4b2b87465d179a3a23b9f9e76a42ceea55226ce072f9488392f40621289124d786109d2498e74fb37e2ef466fe8bf3016d96e34204c32978775765aa80461cac48518157f86d59f6187bad4ee62fba1ddbe166b29452f4a59af1e057300c353440644a8e40ae8171ea028be2fa315804abf518847c7945e8228b7766cfdb08d3a3116b59aab8e94b6d8c8c9ef442c2dc7f923bc2cd3e5c663baca7dded976bf191fe36da16948c89c385fe71434f4aa5dd15fe0e925d2459e3b068b9d82a9cc8b8f9786bd9f5fef9baaaf2d67027d9bfd58bb2c58ec7c746b747ab62f9242e4b53ed14d6fc75f5280eca0de23717c97a2293826e19cc8eb47f946421516c349dc4ba49225b91e4e868874bdebd373700df1f3792aaa140597e58b88f90e163397dbad3941705b53d754e3e0c9003df836a7fb8d23f40362fcb5f3947a4281b24240be4ee89aa8e917b194f94345eeca224df0adc15f22a617b6427f29410bc48ea3f92216163785723efc36301d23ed52780c6fd7924bcfaa03269b13582b7c7ea9c0e4a451f38a469fbdb585dcb7c81452da77945ebe27eb26ff6e8c7b2decea289aac5af74746dc257c9bea44a0847f02c4f586e1d76f39d5bf952355a0875f177a666d1d354ad86ce5ec0aba2c2b20cab050eaffd31095395132f5af80a2d2d53b77bda49f948bbb37bdf31c8a690476488e14e542ff6841e7fbfc2eb84795696562d079dc1612274b6dff362567084f793f0bc2dd8de23392d05aeeeeac6991c9f74387153a4b7da94790375e336a00c8293bad0fcef2dd1880e7094e2e53f738247c860780ebe308410ca02ae409ae720e841f48c9677acc6e7d4ccd18c219c400f8b7e1257f692e09eaef96802b17a1cb7d93eb81d3bfcbc7af4cdf05b98e22556b3d1a8b56d6d83bb5f5724696f8f329839dbe477483ec3c09fa2e0628faeba1bf285c224bea3f6cdc7bbd768133c6ef1da14f248cc3b819b196588811b073a7291817bd1e89c65760435d8d17cbf9423744a92143e0f956e2977b39c54fdead5a57f3a04a0facca01bbf44d3b1fb9c4fa83ae1046985e3f26aa0a437999004dd8adc04c5111759849f919b93558dbc559173a23b069b59f800096d9fcf077c7640f59170bb9a6fffe64778bac272365d27ea62aa956559e90edd3f6393cc8775597bcf7d91990ab9511973d948324a27261059e93f4b5dd2f70caf12e1a08e0493cb05588618764391f355379578cf94dd33e616136eea997ec11c0d4ff064ff51a767e5558433a2e3a9a74c232d8e187f47b8cca010709eb9fea0dac8f1ea53bf18822e154ecd929c83b0eac366e30fffbd5ba6a46d734f58d26e7f5df538e18b3d827884aa857a680823131bcf30a76f1a555bcabb17b02b53aefad96fe76f7312da69719434c580d3ff1bcdcd594e6375935003d5d732cc577e11ea2abb1d04259f50aed4c3af9866e8c4a52a09809046ee330f05c4403acbc297a9416c5208fadb31ed4eb7a3b01b87bf08c75cf44c2b0df84df30872d021d6567ea649859268e5e1b5b6405e1b41e350a32c1af13722959c17c01b52c42241313b26b25995a1c89a53e248488724d280647226195746901929501df36d1e94815d7fe6c4ca2731f3181293217f71b9d7f59c2474856972013924ae4796db4cbd22d8905a6043c959941ca6b556c53d1688c439036c715d33a47a7dfc2fe40e53424c5093020d2e85e4b04aa4c704ea5bfe5a2384878da38319c59d41d66b6add2a443d9ea11edd8d18fa41004251653857733b388b453943eb33df93dcd5d549757fa2967ef0f9a5105836c48826c47fcccb2d9bc349032b286962136b848632bdcf186a08cbeaa52d195efcfc3a440bac154971d11ff4994f293b14fb8c3214ebe7ab8b3d0f2fe0b03ed7b145fafd7730a173e3cc1847f0cdf2cf629f5ea81a07bef716b1a67dd9e3b7a52fea1aaa7a393f53b5bdb5988df78a57a9dad19a8253316835acab8a6b9a9fb42d97bf29b2443322f46de386fd82bd3453ed68e2370c6eac4497b1bde7b42d569c452f377bd38bd50fa5a6792ef5c9ec6c647001149b86fedb3e2f18d4271e9cc4801aa16ecddb31b6a795fecabc613bfbc8e4f5636d71e74595c841fd11b6a6bc7f169317c1added56b82a71fc36d774bb4d661685363e9da5fd2e1f357006dc5b5bbf8b42ee3f869e75a541586fba558a8f490d641b78c27368b9b4c2db046354e9358ae9140e91cd95ebeffc6c0d2676a3ff4ab10d463bf32bed97023a80a79df191ab9858c43537a03072a17c30b1bd99efbd361590ed6b7d5b0ec4e2326fa35904ab9a48596f44491cbbc0112890f9386ed04dec30126be359a05e99b2b77fa2c8f6b7460a6cd590d71c73b2a1b23312ff89306b6e41c76ddc0a099bfa79498e36ae5cf0c560b8854dff32d2b690ce0ac4aabfa723ac6f2e97ad1083235196b464ad67fdd649aec01695d55c8b4bb198f30630ca635aa5a1915f3718341bcfd8b522f764015fa5479004d28eceea7fe67df7ee24a97a9708d528b89589f1899f13242a0d00f7464c3cdfce213699340e754533b934f4a8410224e111f31cf8e54d7b5e90cd8c68bf96edbc8d183894deefdf4fcc1a83162a3f6341dcd9a9aecf171c0df28257a68b1af1b67c54c43c3cff27fed89cc64bc46e23a49ec74a9efbab7981d9f0a018247441e4f0f5b5f68ba9325582f92de4cca4a5f878a0c5c387581e64324e3246d8f3205c838a29f1abeea24446e496421f0e742d411adb55f70272ae4a992e825a3d327e44b8b3762b25aa451d07eb4eac0322b431fa676462632daba2aba7bdeee1b438f051d21d4b1897e2ac2f95ee7c23f9996a805de8fffb3b30b855cd6c5b84c011accf4bf94d304d944079f04b5cadf8fcd6751c22a0f9165ab98998b2d89e6514641f1f3b91b8c0bf057d69c3d893fc4e041e06a2229e2ee58082ffb58cb920972ede58483287d0ace94c1becef26a410b93e4ff402e61dcc574b790d49679f18f4e2004f8b7cc357faba34a80e56821bb5b883d1a8b49c6605002152f270bbc36bc79095644e29ab08cc988deda765d67e4fff12b726d5de135ff9d0cbd9d5f9d440e548836633b93a38330d638468b59a32642da3375cdf70b062d14b46a78569c24a706e179baa2058dcae5c61fb6cadd9e015b017f26e9dbe3e6366cf5f1ec839aa3bbb21dd6c9b8e910245fa95b09b7d6cbf08a4c6c84bef257a70389be962dad14d97a893c128b73bf6580689e540d004f21edf8403f36b1ad7c9a2e83ffceb141af59700c316c8c1e3347187f24819c2ff0c9f9a2360dce354f3374374eab1643d2d8831310a8e3ca6768200ea7759822b82f7027cd450479fcc7f6d04802b15735a137ad489f1e1ee78434a253a9dd16684ad58fc91960cde6754f82e8b38edd5e798fdbbbf8fc2e2380a4e21dd94f8c1c063b18f29d8cd8d89f65deac5640799d4ca2caa29c1e72ad8bc417490d11e4051d94956fbc74289857e5f8e9e87b9a2d83074a994de0b10bc7782f6650cfbdb8c835c81cd88bdce5f04ca939b3c5cd010d4dc5d51224fcacbca9851694b8bf55b22dead859d023eee5a7ad3436a912c3fc0284456d5d72ea5f1afa8545c856676ac2dd9a057028bd3ca0f50e7070fa74152f13997c95c1834c3e67504f1a4165d2b49a96919b88f72caed60f56ca7ab5a3204fb12ad3592c725fdebb048732fc189c7dfed185c6c184a626e07d7356860d00389862d5b9701eaa4e5f7889e6db0f54633369b8d26805c08471de8fc3f8fa1fb0b0711d9e015add5373f7f8b64abaddbac3399c756244b1b07c579d33e4967e5e0cf16de29cb8a7efad07ff9039ca305772a6e45c76bd9b77e24949556766a8b8425c5e595efb431bde4ee222f9eb3fc2d002a1e2d14db2b23135266c942eea33bffd30eb0218405373240e0cd3040436ca895093bf056fd001c00ba59d90502042e6e6c0167105051628895c8164c9ab959400898309cabafdef12be53604fa57df44e0a90a81bd63c331291a93bffefe809e80db0679568f6e94e0d8e2edec0087c35bcb3c4f4725e6013bcf197156cd9d90612423348123383e45c14d27d8833f56ddb04083c069fd6e282fe69c940840f5f747dfb72ad72fd8cf9f3ded15c9e2f4727fd60b4f40e95dbe77a89b47dde7d5326942600554905d9dade9d145ab6da802643f2081678392609c2fdd1b79dd8caec137cbed315374c6f05c0758070f3bb17e23d81ccc39c6aa89913897e487fde889c5aacd422278f8571641cc4f0a93d9768aef9e45d6bd187d1ba637ce0fbd3c573d6778cf7bf5188c00dcdf13be3fd599143952b376220283e34e014e83b214bd5f64eb0ecb098ae8bef883949907cc36e22ece60b893b963cfa73d120513e285aaf70ce5add34edbdac60b3aa7b385b90e339058fb9b3cf984b06f79788016035c5ce490f2de7995b98a8c1c9c80f29603ae2b7fc41886663163e604275cb085f8453b27f4d795b9bad19ade2f98a1c99b43a7581bd991e5d0e5e1a6e713acc522ba9fe8302658a9782558e35436e714ac6bc85ad1d3cd008f24106901fa954f5fefb61210d6f8dc9ff35c480f1d14e59c0e501917a31ee9d00c6bdb06a00af5a8b08c3928cc5f37476248223627cb77eaf0e96213cb0a13e97d3fe9b9814d462690e8d68d02655a32fc271ee73db4f88a33386ea88a5857e15a28d9b3e3a96f00c7cd85aa53f9282ab8c8ca6d6a8afed43aa87fe7fc1ad59b0f0db2dd25c20af96e8c282c19fc883ef01a4060398926a1c82f07bcd3bc314580d7636b623b7bad8ddba05850291a6344df0f346fa4a321a85ee3e9c",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b",
-		"0942e506c433afcda3847f2dad",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff4b4086fbbd1b6cec23e45481eac5a25d",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b0942e506c433afcda3847f2dadd47647de321cec4ac430f62023856cfbb20704f4ec0bb920ba86c33e05f1ecd96733b79950a3e314",
-		"d3d934f75ea0f210a8f6059401",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff7c59dfe246e4bb2d6a8afcebdc2beeaabf2a3f43f95a5ea639853f38719875ecdd2bbc0d81bb2a5ed59553b1e76b6365b74f618f685eb7731024bbf6794c3f4c7c5a1cf925",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b0942e506c433afcda3847f2dadd47647de321cec4ac430f62023856cfbb20704f4ec0bb920ba86c33e05f1ecd96733b79950a3e314",
-		"d3d934f75ea0f210a8f6059401beb4bc4478fa4969e623d01ada696a7e4c7e5125b34884533a94fb319990325744ee9bbce9e525cf08f5e9e25e5360aad2b2d085fa54d835e8d466826498d9a8877565705a8a3f62802944de7ca5894e5759d351adac869580ec17e485f18c0c66f17cc07cbb",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff7c59dfe246e4bb2d6a8afcebdc2beeaabf2a3f43f95a5ea639853f38719875ecdd2bbc0d81bb2a5ed59553b1e76b6365b74f618f68a12d0f1cc99e132db9014100d9668c91",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b0942e506c433afcda3847f2dadd47647de321cec4ac430f62023856cfbb20704f4ec0bb920ba86c33e05f1ecd96733b79950a3e314d3d934f75ea0f210a8f6059401beb4bc4478fa4969e623d01ada696a7e4c7e5125b34884533a94fb319990325744ee9b",
-		"bc",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff7c59dfe246e4bb2d6a8afcebdc2beeaabf2a3f43f95a5ea639853f38719875ecdd2bbc0d81bb2a5ed59553b1e76b6365b74f618f68d1f05b5662cd6e04de896d3ef5dae4149485a5a2093ff4ec74b20b5e5bf8e61b5c65515938c202beab3eea5a498d2f32d4d00a24b826b6efb16013ef54cbe170",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b0942e506c433afcda3847f2dadd47647de321cec4ac430f62023856cfbb20704f4ec0bb920ba86c33e05f1ecd96733b79950a3e314d3d934f75ea0f210a8f6059401beb4bc4478fa4969e623d01ada696a7e4c7e5125b34884533a94fb319990325744ee9bbce9e525cf08f5e9e25e5360aad2b2d085fa54d835e8d466826498d9a8877565705a8a3f62802944de7ca5894e5759d351adac869580ec17e485f18c0c66f17cc0",
-		"7cbb22fce466da610b63af62bc83b4692f3affaf271693ac071fb86d11342d",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff7c59dfe246e4bb2d6a8afcebdc2beeaabf2a3f43f95a5ea639853f38719875ecdd2bbc0d81bb2a5ed59553b1e76b6365b74f618f68d1f05b5662cd6e04de896d3ef5dae4149485a5a2093ff4ec74b20b5e5bf8e61b5c65515938c202beab3eea5a498d2f32c38dbb37d04f8272e741da2802c54a9d9aaf8ecf38b36fc9ad0079523f6a4abd5281a22697a3180bc02662a7c13ee23599d18e5c48300dbb831509df4c172f53e524b3c15124a87ac73e5028cde6c94d8d",
-	},
-	{
-		"67c6697351ff4aec29cdbaabf2fbe3467cc254f81be8e78d765a2e63339fc99a66320db73158a35a255d051758e95ed4abb2cdc69bb454110e827441213ddc8770e93ea141e1fc673e017e97eadc6b968f385c2aecb03bfb32af3c54ec18db5c021afe43fbfaaa3afb29d1e6053c7c9475d8be6189f95cbba8990f95b1ebf1b305eff700e9a13ae5ca0bcbd0484764bd1f231ea81c7b64c514735ac55e4b79633b706424119e09dcaad4acf21b10af3b33cde3504847155cbb6f2219ba9b7df50be11a1c7f23f829f8a41b13b5ca4ee8983238e0794d3d34bc5f4e77facb6c05ac86212baa1a55a2be70b5733b045cd33694b3afe2f0e49e4f321549fd824ea90870d4b28a2954489a0abcd50e18a844ac5bf38e4cd72d9b0942e506c433afcda3847f2dadd47647de321cec4ac430f62023856cfbb20704f4ec0bb920ba86c33e05f1ecd96733b79950a3e314d3d934f75ea0f210a8f6059401beb4bc4478fa4969e623d01ada696a7e4c7e5125b34884533a94fb319990325744ee9bbce9e525",
-		"",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"588e1356fb8fa32410dad99cf7922aae47b4042502c92f3afe33dc22c1c2e90caf22bc37a254f8dd62a09582c70194f9616982639415178e9fe95740c0f1d497a69b69d4924a7a15290187f9c8acf09cf5b3b3188ecde2d2807207f5bb6a6d3504314b1b47684cf8ba8807eb9a3c497c79ebe1e4c1eca2aa90328563e201425227fca8ee05dcc05fd6c98128626c1e71d2fb3a21860567093db1012dfabe13055c48219d2a301c8a5a49033a811d8d9413bafbb2eefc177226fe578e93c2ef1f309416dc98843bfac387debb1b610b1d2366178ce7212a7312057a3d058357a629f18c78e129e60979a2310455a76207be5611e8b4b840629564020c17f5c9446882e23f610e931246ec434e62de765bf22954cfae02b2ff7c59dfe246e4bb2d6a8afcebdc2beeaabf2a3f43f95a5ea639853f38719875ecdd2bbc0d81bb2a5ed59553b1e76b6365b74f618f68d1f05b5662cd6e04de896d3ef5dae4149485a5a2093ff4ec74b20b5e5bf8e61b5c65515938c202beab3eea5a498d2f32c38dbb370a9bbc3187cc260ddac991f94ce4f0d5",
-	},
-	{
-		"0fb826ddb2eb5e708de203d0438be12cf708d635ebdbae56278be09077009586b9bc646ba7c2db35a5de05e86ae71461efea96dac64430edcf117d461113cccacf303576f310ab98efb180599894ba877e50614494923163a3afa9b4c2757f91a6b40799c5b331b464b10dfc45c783c317e408ab76390e19e8b7ceaa2c4d3bd201436bc6f69c7a5a4d8756924ed95665bd5e1034971e4d80d51b2a",
-		"026866d46aa940309fdcabf92a324fbc",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"30f05cf8189bb7b8b4f560e746e228c4cc7e86e8f2fa66e1afe212d1855db51070acd5eb34ce80b2e223957df50fde4c2531d97fc9e573725e7a5e47f0dfc4da1942620320bb2deaf8b17937bae4218d04db8e76f6efe84a117292159507c9f8a09fb2c17921d7762510dbf1dac7b62b1bd7572e3e2cf008d01c445c7fa78833235034281ae180e051451c6a64f22ca9708634bd0d604e4cfcd971b13742efa5b6363e662a875daccb2b00",
-	},
-	{
-		"c7d4f8790e4c47d4daecbddf5939973521ddbf3b832e564afc66f03b5583c41c58bd956609dc3ae3c8f7c2213059575236168dba44e3044049f47c9e7840bbd0fd5036062d70e9f567ac1797056ee93c8476f6c959fa09a3ee854166c6fc36c34d6cca7adcb36f435f86db65f4c4a1793b974294914b377fd179e697751c5ac289243c65d8aca93732849c27483da083d4e218652d4fe5fec8cb953ee7f00070143dd6ece97f241b03c0424bfee2cfd2c4e738f2361df0ffe8863dcf763d408a7a167763959b7f985bc1e359a4b22c6899645ad0814bcf69d10c38474978d1c48e482723e3a6bb3f689f980c51c474eb28cfbba91a8a12eb964b32dfc303a3524ccb752f71316ed9d007e521cb5a0cf429c79d4351b02ee7fb60c7be636a10af3586dfa7b74d80875466a820c0b514e97cb12cce615ab55cba7c1b1de72bcd1cb1acc368f944ef4eaa986e6a4d8253c9337f9795d94df193c90cb0b0387dcde929905223d441717ed9dfe826613bf094ba872993d41b269e27d74e5f541b497eac9ba180dc12ffb6f1e7dc5223cce6dd541071282b97c6526e15b2c330fb41dc96e25d72f45c28e543053766d11d44252db54e584c14abbb295d7e5a58bf36eea1936095ef897a338eb1995fcedd85fc92d354dfe7ff9a115c186bb4d7a1a27835030d248c87571a38f17906cefe0261d15740b9",
-		"56",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"f89c825ca43cae1ce3fbdee85c505edd1aabefe69a0f9efd740f027aa7dee48a91ad24e69ad061648f0a52b4afb19d7ffccdc21f4b4247dfd89f5f9f998cb3c02b226173fedb6f8770aceef9271e7236fefd19fb3b87d08a5c587ac7918e80aa4b477f22602189811e270d686bc4949137a41d11d95ec96ee9d26c6126f6e923ab37638b34d1538d2e46d6df6216da4f193a3cecb731e632e109ced643056a1673059355d2d1314df35ded8364efed7de490201090a6f2d1751748585f64d26041637ba3723cbc4b60e226f10a19699d223075bc1f27d82e7f560c0db630ea670b3f8a70a8950894af4d1c7b3f674a3fa00d19ee4cc2b6174c1d259a297424bf2c3943a29a16a9830ce11abaa79cd2eb77b53a02b365b1838e7bfd5ae1bd044ffc885c61c6b2186a357e8b8f732b7ab96517969aeb70c7b493bbaca9462a61815a3c6135c748bf9c8487ac0631807aa69243fa09cd3b8efb63f8d4e090ad30b6c2f08bf4e82f191cedfa5cbe2b42268d67ecd105918181e44fc9879efd642d20be84e6f74717e03fb94fcbaa6ed3b307431d2a9384b8a2b3e5825ffce8d99af48f177e43bb4272226d8a5edd37d53807f768feb9e0733b437a1d0f84779ab68a1804e92a5eecca56364f0fa6dca152203b249fdc8fbd950fdc37c1887596308a90ba3a5751c7096bfbd1cb177bb17847b33c4379b43938a67674459cd9a06e3017ccac5b",
-	},
-	{
-		"135a28170fe89066da7bcff3a9ccc1b27dfe942a6f47b23835ef746aaea63dc10066d90f4e697528e5451b8e11dd408fdbd4b94a1c6c82515bf7bc099df9cb9d5fa4acad0d22d5f267f18078cec107a995c1f3b12d7603886dbf910ab85ca7180053c50e759b00dc8c81555a425c03d71df6894a6c8cd2d94b64e303c08a1bc1dee1cf537ccf300850856292e1656aff5bf349c87f1ca1ca8085cd400fe901edcad04146a0714ef0f6b083d715edd670e020385f3cda29bc5ff6fc6edffe5ca9ce9def6e0e3d5f04ede2db02cfb2",
-		"73afd2ab0e0e8537cae42dc6530dc4afb6934ca6",
-		"a5117e70953568bf750862df9e6f92af81677c3a188e847917a4a915bda7792e",
-		"129039b5572e8a7a8131f76a",
-		"2c125232a59879aee36cacc4aca5085a4688c4f776667a8fbd86862b5cfb1d57c976688fdd652eafa2b88b1b8e358aa2110ff6ef13cdc1ceca9c9f087c35c38d89d6fbd8de89538070f17916ecb19ca3ef4a1c834f0bdaa1df62aaabef2e117106787056c909e61ecd208357dd5c363f11c5d6cf24992cc873cf69f59360a820fcf290bd90b2cab24c47286acb4e1033962b6d41e562a206a94796a8ab1c6b8bade804ff9bdf5ba6062d2c1f8fe0f4dfc05720bd9a612b92c26789f9f6a7ce43f5e8e3aee99a9cd7d6c11eaa611983c36935b0dda57d898a60a0ab7c4b54",
-	},
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_generic.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_generic.go
deleted file mode 100644
index 0f8efdbaa4..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_generic.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ChaCha20 implements the core ChaCha20 function as specified in https://tools.ietf.org/html/rfc7539#section-2.3.
-package chacha20
-
-import "encoding/binary"
-
-const rounds = 20
-
-// core applies the ChaCha20 core function to 16-byte input in, 32-byte key k,
-// and 16-byte constant c, and puts the result into 64-byte array out.
-func core(out *[64]byte, in *[16]byte, k *[32]byte) {
-	j0 := uint32(0x61707865)
-	j1 := uint32(0x3320646e)
-	j2 := uint32(0x79622d32)
-	j3 := uint32(0x6b206574)
-	j4 := binary.LittleEndian.Uint32(k[0:4])
-	j5 := binary.LittleEndian.Uint32(k[4:8])
-	j6 := binary.LittleEndian.Uint32(k[8:12])
-	j7 := binary.LittleEndian.Uint32(k[12:16])
-	j8 := binary.LittleEndian.Uint32(k[16:20])
-	j9 := binary.LittleEndian.Uint32(k[20:24])
-	j10 := binary.LittleEndian.Uint32(k[24:28])
-	j11 := binary.LittleEndian.Uint32(k[28:32])
-	j12 := binary.LittleEndian.Uint32(in[0:4])
-	j13 := binary.LittleEndian.Uint32(in[4:8])
-	j14 := binary.LittleEndian.Uint32(in[8:12])
-	j15 := binary.LittleEndian.Uint32(in[12:16])
-
-	x0, x1, x2, x3, x4, x5, x6, x7 := j0, j1, j2, j3, j4, j5, j6, j7
-	x8, x9, x10, x11, x12, x13, x14, x15 := j8, j9, j10, j11, j12, j13, j14, j15
-
-	for i := 0; i < rounds; i += 2 {
-		x0 += x4
-		x12 ^= x0
-		x12 = (x12 << 16) | (x12 >> (16))
-		x8 += x12
-		x4 ^= x8
-		x4 = (x4 << 12) | (x4 >> (20))
-		x0 += x4
-		x12 ^= x0
-		x12 = (x12 << 8) | (x12 >> (24))
-		x8 += x12
-		x4 ^= x8
-		x4 = (x4 << 7) | (x4 >> (25))
-		x1 += x5
-		x13 ^= x1
-		x13 = (x13 << 16) | (x13 >> 16)
-		x9 += x13
-		x5 ^= x9
-		x5 = (x5 << 12) | (x5 >> 20)
-		x1 += x5
-		x13 ^= x1
-		x13 = (x13 << 8) | (x13 >> 24)
-		x9 += x13
-		x5 ^= x9
-		x5 = (x5 << 7) | (x5 >> 25)
-		x2 += x6
-		x14 ^= x2
-		x14 = (x14 << 16) | (x14 >> 16)
-		x10 += x14
-		x6 ^= x10
-		x6 = (x6 << 12) | (x6 >> 20)
-		x2 += x6
-		x14 ^= x2
-		x14 = (x14 << 8) | (x14 >> 24)
-		x10 += x14
-		x6 ^= x10
-		x6 = (x6 << 7) | (x6 >> 25)
-		x3 += x7
-		x15 ^= x3
-		x15 = (x15 << 16) | (x15 >> 16)
-		x11 += x15
-		x7 ^= x11
-		x7 = (x7 << 12) | (x7 >> 20)
-		x3 += x7
-		x15 ^= x3
-		x15 = (x15 << 8) | (x15 >> 24)
-		x11 += x15
-		x7 ^= x11
-		x7 = (x7 << 7) | (x7 >> 25)
-		x0 += x5
-		x15 ^= x0
-		x15 = (x15 << 16) | (x15 >> 16)
-		x10 += x15
-		x5 ^= x10
-		x5 = (x5 << 12) | (x5 >> 20)
-		x0 += x5
-		x15 ^= x0
-		x15 = (x15 << 8) | (x15 >> 24)
-		x10 += x15
-		x5 ^= x10
-		x5 = (x5 << 7) | (x5 >> 25)
-		x1 += x6
-		x12 ^= x1
-		x12 = (x12 << 16) | (x12 >> 16)
-		x11 += x12
-		x6 ^= x11
-		x6 = (x6 << 12) | (x6 >> 20)
-		x1 += x6
-		x12 ^= x1
-		x12 = (x12 << 8) | (x12 >> 24)
-		x11 += x12
-		x6 ^= x11
-		x6 = (x6 << 7) | (x6 >> 25)
-		x2 += x7
-		x13 ^= x2
-		x13 = (x13 << 16) | (x13 >> 16)
-		x8 += x13
-		x7 ^= x8
-		x7 = (x7 << 12) | (x7 >> 20)
-		x2 += x7
-		x13 ^= x2
-		x13 = (x13 << 8) | (x13 >> 24)
-		x8 += x13
-		x7 ^= x8
-		x7 = (x7 << 7) | (x7 >> 25)
-		x3 += x4
-		x14 ^= x3
-		x14 = (x14 << 16) | (x14 >> 16)
-		x9 += x14
-		x4 ^= x9
-		x4 = (x4 << 12) | (x4 >> 20)
-		x3 += x4
-		x14 ^= x3
-		x14 = (x14 << 8) | (x14 >> 24)
-		x9 += x14
-		x4 ^= x9
-		x4 = (x4 << 7) | (x4 >> 25)
-	}
-
-	x0 += j0
-	x1 += j1
-	x2 += j2
-	x3 += j3
-	x4 += j4
-	x5 += j5
-	x6 += j6
-	x7 += j7
-	x8 += j8
-	x9 += j9
-	x10 += j10
-	x11 += j11
-	x12 += j12
-	x13 += j13
-	x14 += j14
-	x15 += j15
-
-	binary.LittleEndian.PutUint32(out[0:4], x0)
-	binary.LittleEndian.PutUint32(out[4:8], x1)
-	binary.LittleEndian.PutUint32(out[8:12], x2)
-	binary.LittleEndian.PutUint32(out[12:16], x3)
-	binary.LittleEndian.PutUint32(out[16:20], x4)
-	binary.LittleEndian.PutUint32(out[20:24], x5)
-	binary.LittleEndian.PutUint32(out[24:28], x6)
-	binary.LittleEndian.PutUint32(out[28:32], x7)
-	binary.LittleEndian.PutUint32(out[32:36], x8)
-	binary.LittleEndian.PutUint32(out[36:40], x9)
-	binary.LittleEndian.PutUint32(out[40:44], x10)
-	binary.LittleEndian.PutUint32(out[44:48], x11)
-	binary.LittleEndian.PutUint32(out[48:52], x12)
-	binary.LittleEndian.PutUint32(out[52:56], x13)
-	binary.LittleEndian.PutUint32(out[56:60], x14)
-	binary.LittleEndian.PutUint32(out[60:64], x15)
-}
-
-// XORKeyStream crypts bytes from in to out using the given key and counters.
-// In and out must overlap entirely or not at all. Counter contains the raw
-// ChaCha20 counter bytes (i.e. block counter followed by nonce).
-func XORKeyStream(out, in []byte, counter *[16]byte, key *[32]byte) {
-	var block [64]byte
-	var counterCopy [16]byte
-	copy(counterCopy[:], counter[:])
-
-	for len(in) >= 64 {
-		core(&block, &counterCopy, key)
-		for i, x := range block {
-			out[i] = in[i] ^ x
-		}
-		u := uint32(1)
-		for i := 0; i < 4; i++ {
-			u += uint32(counterCopy[i])
-			counterCopy[i] = byte(u)
-			u >>= 8
-		}
-		in = in[64:]
-		out = out[64:]
-	}
-
-	if len(in) > 0 {
-		core(&block, &counterCopy, key)
-		for i, v := range in {
-			out[i] = v ^ block[i]
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_test.go b/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_test.go
deleted file mode 100644
index b80d34cdd7..0000000000
--- a/installer/vendor/golang.org/x/crypto/chacha20poly1305/internal/chacha20/chacha_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package chacha20
-
-import (
-	"encoding/hex"
-	"testing"
-)
-
-func TestCore(t *testing.T) {
-	// This is just a smoke test that checks the example from
-	// https://tools.ietf.org/html/rfc7539#section-2.3.2. The
-	// chacha20poly1305 package contains much more extensive tests of this
-	// code.
-	var key [32]byte
-	for i := range key {
-		key[i] = byte(i)
-	}
-
-	var input [16]byte
-	input[0] = 1
-	input[7] = 9
-	input[11] = 0x4a
-
-	var out [64]byte
-	XORKeyStream(out[:], out[:], &input, &key)
-	const expected = "10f1e7e4d13b5915500fdd1fa32071c4c7d1f4c733c068030422aa9ac3d46c4ed2826446079faa0914c2d705d98b02a2b5129cd1de164eb9cbd083e8a2503c4e"
-	if result := hex.EncodeToString(out[:]); result != expected {
-		t.Errorf("wanted %x but got %x", expected, result)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/codereview.cfg b/installer/vendor/golang.org/x/crypto/codereview.cfg
deleted file mode 100644
index 3f8b14b64e..0000000000
--- a/installer/vendor/golang.org/x/crypto/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1.go b/installer/vendor/golang.org/x/crypto/cryptobyte/asn1.go
deleted file mode 100644
index 88ec8b4fbf..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1.go
+++ /dev/null
@@ -1,732 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	encoding_asn1 "encoding/asn1"
-	"fmt"
-	"math/big"
-	"reflect"
-	"time"
-
-	"golang.org/x/crypto/cryptobyte/asn1"
-)
-
-// This file contains ASN.1-related methods for String and Builder.
-
-// Builder
-
-// AddASN1Int64 appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1Int64(v int64) {
-	b.addASN1Signed(asn1.INTEGER, v)
-}
-
-// AddASN1Enum appends a DER-encoded ASN.1 ENUMERATION.
-func (b *Builder) AddASN1Enum(v int64) {
-	b.addASN1Signed(asn1.ENUM, v)
-}
-
-func (b *Builder) addASN1Signed(tag asn1.Tag, v int64) {
-	b.AddASN1(tag, func(c *Builder) {
-		length := 1
-		for i := v; i >= 0x80 || i < -0x80; i >>= 8 {
-			length++
-		}
-
-		for ; length > 0; length-- {
-			i := v >> uint((length-1)*8) & 0xff
-			c.AddUint8(uint8(i))
-		}
-	})
-}
-
-// AddASN1Uint64 appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1Uint64(v uint64) {
-	b.AddASN1(asn1.INTEGER, func(c *Builder) {
-		length := 1
-		for i := v; i >= 0x80; i >>= 8 {
-			length++
-		}
-
-		for ; length > 0; length-- {
-			i := v >> uint((length-1)*8) & 0xff
-			c.AddUint8(uint8(i))
-		}
-	})
-}
-
-// AddASN1BigInt appends a DER-encoded ASN.1 INTEGER.
-func (b *Builder) AddASN1BigInt(n *big.Int) {
-	if b.err != nil {
-		return
-	}
-
-	b.AddASN1(asn1.INTEGER, func(c *Builder) {
-		if n.Sign() < 0 {
-			// A negative number has to be converted to two's-complement form. So we
-			// invert and subtract 1. If the most-significant-bit isn't set then
-			// we'll need to pad the beginning with 0xff in order to keep the number
-			// negative.
-			nMinus1 := new(big.Int).Neg(n)
-			nMinus1.Sub(nMinus1, bigOne)
-			bytes := nMinus1.Bytes()
-			for i := range bytes {
-				bytes[i] ^= 0xff
-			}
-			if bytes[0]&0x80 == 0 {
-				c.add(0xff)
-			}
-			c.add(bytes...)
-		} else if n.Sign() == 0 {
-			c.add(0)
-		} else {
-			bytes := n.Bytes()
-			if bytes[0]&0x80 != 0 {
-				c.add(0)
-			}
-			c.add(bytes...)
-		}
-	})
-}
-
-// AddASN1OctetString appends a DER-encoded ASN.1 OCTET STRING.
-func (b *Builder) AddASN1OctetString(bytes []byte) {
-	b.AddASN1(asn1.OCTET_STRING, func(c *Builder) {
-		c.AddBytes(bytes)
-	})
-}
-
-const generalizedTimeFormatStr = "20060102150405Z0700"
-
-// AddASN1GeneralizedTime appends a DER-encoded ASN.1 GENERALIZEDTIME.
-func (b *Builder) AddASN1GeneralizedTime(t time.Time) {
-	if t.Year() < 0 || t.Year() > 9999 {
-		b.err = fmt.Errorf("cryptobyte: cannot represent %v as a GeneralizedTime", t)
-		return
-	}
-	b.AddASN1(asn1.GeneralizedTime, func(c *Builder) {
-		c.AddBytes([]byte(t.Format(generalizedTimeFormatStr)))
-	})
-}
-
-// AddASN1BitString appends a DER-encoded ASN.1 BIT STRING. This does not
-// support BIT STRINGs that are not a whole number of bytes.
-func (b *Builder) AddASN1BitString(data []byte) {
-	b.AddASN1(asn1.BIT_STRING, func(b *Builder) {
-		b.AddUint8(0)
-		b.AddBytes(data)
-	})
-}
-
-func (b *Builder) addBase128Int(n int64) {
-	var length int
-	if n == 0 {
-		length = 1
-	} else {
-		for i := n; i > 0; i >>= 7 {
-			length++
-		}
-	}
-
-	for i := length - 1; i >= 0; i-- {
-		o := byte(n >> uint(i*7))
-		o &= 0x7f
-		if i != 0 {
-			o |= 0x80
-		}
-
-		b.add(o)
-	}
-}
-
-func isValidOID(oid encoding_asn1.ObjectIdentifier) bool {
-	if len(oid) < 2 {
-		return false
-	}
-
-	if oid[0] > 2 || (oid[0] <= 1 && oid[1] >= 40) {
-		return false
-	}
-
-	for _, v := range oid {
-		if v < 0 {
-			return false
-		}
-	}
-
-	return true
-}
-
-func (b *Builder) AddASN1ObjectIdentifier(oid encoding_asn1.ObjectIdentifier) {
-	b.AddASN1(asn1.OBJECT_IDENTIFIER, func(b *Builder) {
-		if !isValidOID(oid) {
-			b.err = fmt.Errorf("cryptobyte: invalid OID: %v", oid)
-			return
-		}
-
-		b.addBase128Int(int64(oid[0])*40 + int64(oid[1]))
-		for _, v := range oid[2:] {
-			b.addBase128Int(int64(v))
-		}
-	})
-}
-
-func (b *Builder) AddASN1Boolean(v bool) {
-	b.AddASN1(asn1.BOOLEAN, func(b *Builder) {
-		if v {
-			b.AddUint8(0xff)
-		} else {
-			b.AddUint8(0)
-		}
-	})
-}
-
-func (b *Builder) AddASN1NULL() {
-	b.add(uint8(asn1.NULL), 0)
-}
-
-// MarshalASN1 calls encoding_asn1.Marshal on its input and appends the result if
-// successful or records an error if one occurred.
-func (b *Builder) MarshalASN1(v interface{}) {
-	// NOTE(martinkr): This is somewhat of a hack to allow propagation of
-	// encoding_asn1.Marshal errors into Builder.err. N.B. if you call MarshalASN1 with a
-	// value embedded into a struct, its tag information is lost.
-	if b.err != nil {
-		return
-	}
-	bytes, err := encoding_asn1.Marshal(v)
-	if err != nil {
-		b.err = err
-		return
-	}
-	b.AddBytes(bytes)
-}
-
-// AddASN1 appends an ASN.1 object. The object is prefixed with the given tag.
-// Tags greater than 30 are not supported and result in an error (i.e.
-// low-tag-number form only). The child builder passed to the
-// BuilderContinuation can be used to build the content of the ASN.1 object.
-func (b *Builder) AddASN1(tag asn1.Tag, f BuilderContinuation) {
-	if b.err != nil {
-		return
-	}
-	// Identifiers with the low five bits set indicate high-tag-number format
-	// (two or more octets), which we don't support.
-	if tag&0x1f == 0x1f {
-		b.err = fmt.Errorf("cryptobyte: high-tag number identifier octects not supported: 0x%x", tag)
-		return
-	}
-	b.AddUint8(uint8(tag))
-	b.addLengthPrefixed(1, true, f)
-}
-
-// String
-
-func (s *String) ReadASN1Boolean(out *bool) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || len(bytes) != 1 {
-		return false
-	}
-
-	switch bytes[0] {
-	case 0:
-		*out = false
-	case 0xff:
-		*out = true
-	default:
-		return false
-	}
-
-	return true
-}
-
-var bigIntType = reflect.TypeOf((*big.Int)(nil)).Elem()
-
-// ReadASN1Integer decodes an ASN.1 INTEGER into out and advances. If out does
-// not point to an integer or to a big.Int, it panics. It returns true on
-// success and false on error.
-func (s *String) ReadASN1Integer(out interface{}) bool {
-	if reflect.TypeOf(out).Kind() != reflect.Ptr {
-		panic("out is not a pointer")
-	}
-	switch reflect.ValueOf(out).Elem().Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		var i int64
-		if !s.readASN1Int64(&i) || reflect.ValueOf(out).Elem().OverflowInt(i) {
-			return false
-		}
-		reflect.ValueOf(out).Elem().SetInt(i)
-		return true
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-		var u uint64
-		if !s.readASN1Uint64(&u) || reflect.ValueOf(out).Elem().OverflowUint(u) {
-			return false
-		}
-		reflect.ValueOf(out).Elem().SetUint(u)
-		return true
-	case reflect.Struct:
-		if reflect.TypeOf(out).Elem() == bigIntType {
-			return s.readASN1BigInt(out.(*big.Int))
-		}
-	}
-	panic("out does not point to an integer type")
-}
-
-func checkASN1Integer(bytes []byte) bool {
-	if len(bytes) == 0 {
-		// An INTEGER is encoded with at least one octet.
-		return false
-	}
-	if len(bytes) == 1 {
-		return true
-	}
-	if bytes[0] == 0 && bytes[1]&0x80 == 0 || bytes[0] == 0xff && bytes[1]&0x80 == 0x80 {
-		// Value is not minimally encoded.
-		return false
-	}
-	return true
-}
-
-var bigOne = big.NewInt(1)
-
-func (s *String) readASN1BigInt(out *big.Int) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) {
-		return false
-	}
-	if bytes[0]&0x80 == 0x80 {
-		// Negative number.
-		neg := make([]byte, len(bytes))
-		for i, b := range bytes {
-			neg[i] = ^b
-		}
-		out.SetBytes(neg)
-		out.Add(out, bigOne)
-		out.Neg(out)
-	} else {
-		out.SetBytes(bytes)
-	}
-	return true
-}
-
-func (s *String) readASN1Int64(out *int64) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) || !asn1Signed(out, bytes) {
-		return false
-	}
-	return true
-}
-
-func asn1Signed(out *int64, n []byte) bool {
-	length := len(n)
-	if length > 8 {
-		return false
-	}
-	for i := 0; i < length; i++ {
-		*out <<= 8
-		*out |= int64(n[i])
-	}
-	// Shift up and down in order to sign extend the result.
-	*out <<= 64 - uint8(length)*8
-	*out >>= 64 - uint8(length)*8
-	return true
-}
-
-func (s *String) readASN1Uint64(out *uint64) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.INTEGER) || !checkASN1Integer(bytes) || !asn1Unsigned(out, bytes) {
-		return false
-	}
-	return true
-}
-
-func asn1Unsigned(out *uint64, n []byte) bool {
-	length := len(n)
-	if length > 9 || length == 9 && n[0] != 0 {
-		// Too large for uint64.
-		return false
-	}
-	if n[0]&0x80 != 0 {
-		// Negative number.
-		return false
-	}
-	for i := 0; i < length; i++ {
-		*out <<= 8
-		*out |= uint64(n[i])
-	}
-	return true
-}
-
-// ReadASN1Enum decodes an ASN.1 ENUMERATION into out and advances. It returns
-// true on success and false on error.
-func (s *String) ReadASN1Enum(out *int) bool {
-	var bytes String
-	var i int64
-	if !s.ReadASN1(&bytes, asn1.ENUM) || !checkASN1Integer(bytes) || !asn1Signed(&i, bytes) {
-		return false
-	}
-	if int64(int(i)) != i {
-		return false
-	}
-	*out = int(i)
-	return true
-}
-
-func (s *String) readBase128Int(out *int) bool {
-	ret := 0
-	for i := 0; len(*s) > 0; i++ {
-		if i == 4 {
-			return false
-		}
-		ret <<= 7
-		b := s.read(1)[0]
-		ret |= int(b & 0x7f)
-		if b&0x80 == 0 {
-			*out = ret
-			return true
-		}
-	}
-	return false // truncated
-}
-
-// ReadASN1ObjectIdentifier decodes an ASN.1 OBJECT IDENTIFIER into out and
-// advances. It returns true on success and false on error.
-func (s *String) ReadASN1ObjectIdentifier(out *encoding_asn1.ObjectIdentifier) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.OBJECT_IDENTIFIER) || len(bytes) == 0 {
-		return false
-	}
-
-	// In the worst case, we get two elements from the first byte (which is
-	// encoded differently) and then every varint is a single byte long.
-	components := make([]int, len(bytes)+1)
-
-	// The first varint is 40*value1 + value2:
-	// According to this packing, value1 can take the values 0, 1 and 2 only.
-	// When value1 = 0 or value1 = 1, then value2 is <= 39. When value1 = 2,
-	// then there are no restrictions on value2.
-	var v int
-	if !bytes.readBase128Int(&v) {
-		return false
-	}
-	if v < 80 {
-		components[0] = v / 40
-		components[1] = v % 40
-	} else {
-		components[0] = 2
-		components[1] = v - 80
-	}
-
-	i := 2
-	for ; len(bytes) > 0; i++ {
-		if !bytes.readBase128Int(&v) {
-			return false
-		}
-		components[i] = v
-	}
-	*out = components[:i]
-	return true
-}
-
-// ReadASN1GeneralizedTime decodes an ASN.1 GENERALIZEDTIME into out and
-// advances. It returns true on success and false on error.
-func (s *String) ReadASN1GeneralizedTime(out *time.Time) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.GeneralizedTime) {
-		return false
-	}
-	t := string(bytes)
-	res, err := time.Parse(generalizedTimeFormatStr, t)
-	if err != nil {
-		return false
-	}
-	if serialized := res.Format(generalizedTimeFormatStr); serialized != t {
-		return false
-	}
-	*out = res
-	return true
-}
-
-// ReadASN1BitString decodes an ASN.1 BIT STRING into out and advances. It
-// returns true on success and false on error.
-func (s *String) ReadASN1BitString(out *encoding_asn1.BitString) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.BIT_STRING) || len(bytes) == 0 {
-		return false
-	}
-
-	paddingBits := uint8(bytes[0])
-	bytes = bytes[1:]
-	if paddingBits > 7 ||
-		len(bytes) == 0 && paddingBits != 0 ||
-		len(bytes) > 0 && bytes[len(bytes)-1]&(1<<paddingBits-1) != 0 {
-		return false
-	}
-
-	out.BitLength = len(bytes)*8 - int(paddingBits)
-	out.Bytes = bytes
-	return true
-}
-
-// ReadASN1BitString decodes an ASN.1 BIT STRING into out and advances. It is
-// an error if the BIT STRING is not a whole number of bytes. This function
-// returns true on success and false on error.
-func (s *String) ReadASN1BitStringAsBytes(out *[]byte) bool {
-	var bytes String
-	if !s.ReadASN1(&bytes, asn1.BIT_STRING) || len(bytes) == 0 {
-		return false
-	}
-
-	paddingBits := uint8(bytes[0])
-	if paddingBits != 0 {
-		return false
-	}
-	*out = bytes[1:]
-	return true
-}
-
-// ReadASN1Bytes reads the contents of a DER-encoded ASN.1 element (not including
-// tag and length bytes) into out, and advances. The element must match the
-// given tag. It returns true on success and false on error.
-func (s *String) ReadASN1Bytes(out *[]byte, tag asn1.Tag) bool {
-	return s.ReadASN1((*String)(out), tag)
-}
-
-// ReadASN1 reads the contents of a DER-encoded ASN.1 element (not including
-// tag and length bytes) into out, and advances. The element must match the
-// given tag. It returns true on success and false on error.
-//
-// Tags greater than 30 are not supported (i.e. low-tag-number format only).
-func (s *String) ReadASN1(out *String, tag asn1.Tag) bool {
-	var t asn1.Tag
-	if !s.ReadAnyASN1(out, &t) || t != tag {
-		return false
-	}
-	return true
-}
-
-// ReadASN1Element reads the contents of a DER-encoded ASN.1 element (including
-// tag and length bytes) into out, and advances. The element must match the
-// given tag. It returns true on success and false on error.
-//
-// Tags greater than 30 are not supported (i.e. low-tag-number format only).
-func (s *String) ReadASN1Element(out *String, tag asn1.Tag) bool {
-	var t asn1.Tag
-	if !s.ReadAnyASN1Element(out, &t) || t != tag {
-		return false
-	}
-	return true
-}
-
-// ReadAnyASN1 reads the contents of a DER-encoded ASN.1 element (not including
-// tag and length bytes) into out, sets outTag to its tag, and advances. It
-// returns true on success and false on error.
-//
-// Tags greater than 30 are not supported (i.e. low-tag-number format only).
-func (s *String) ReadAnyASN1(out *String, outTag *asn1.Tag) bool {
-	return s.readASN1(out, outTag, true /* skip header */)
-}
-
-// ReadAnyASN1Element reads the contents of a DER-encoded ASN.1 element
-// (including tag and length bytes) into out, sets outTag to is tag, and
-// advances. It returns true on success and false on error.
-//
-// Tags greater than 30 are not supported (i.e. low-tag-number format only).
-func (s *String) ReadAnyASN1Element(out *String, outTag *asn1.Tag) bool {
-	return s.readASN1(out, outTag, false /* include header */)
-}
-
-// PeekASN1Tag returns true if the next ASN.1 value on the string starts with
-// the given tag.
-func (s String) PeekASN1Tag(tag asn1.Tag) bool {
-	if len(s) == 0 {
-		return false
-	}
-	return asn1.Tag(s[0]) == tag
-}
-
-// SkipASN1 reads and discards an ASN.1 element with the given tag.
-func (s *String) SkipASN1(tag asn1.Tag) bool {
-	var unused String
-	return s.ReadASN1(&unused, tag)
-}
-
-// ReadOptionalASN1 attempts to read the contents of a DER-encoded ASN.1
-// element (not including tag and length bytes) tagged with the given tag into
-// out. It stores whether an element with the tag was found in outPresent,
-// unless outPresent is nil. It returns true on success and false on error.
-func (s *String) ReadOptionalASN1(out *String, outPresent *bool, tag asn1.Tag) bool {
-	present := s.PeekASN1Tag(tag)
-	if outPresent != nil {
-		*outPresent = present
-	}
-	if present && !s.ReadASN1(out, tag) {
-		return false
-	}
-	return true
-}
-
-// SkipOptionalASN1 advances s over an ASN.1 element with the given tag, or
-// else leaves s unchanged.
-func (s *String) SkipOptionalASN1(tag asn1.Tag) bool {
-	if !s.PeekASN1Tag(tag) {
-		return true
-	}
-	var unused String
-	return s.ReadASN1(&unused, tag)
-}
-
-// ReadOptionalASN1Integer attempts to read an optional ASN.1 INTEGER
-// explicitly tagged with tag into out and advances. If no element with a
-// matching tag is present, it writes defaultValue into out instead. If out
-// does not point to an integer or to a big.Int, it panics. It returns true on
-// success and false on error.
-func (s *String) ReadOptionalASN1Integer(out interface{}, tag asn1.Tag, defaultValue interface{}) bool {
-	if reflect.TypeOf(out).Kind() != reflect.Ptr {
-		panic("out is not a pointer")
-	}
-	var present bool
-	var i String
-	if !s.ReadOptionalASN1(&i, &present, tag) {
-		return false
-	}
-	if !present {
-		switch reflect.ValueOf(out).Elem().Kind() {
-		case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64,
-			reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
-			reflect.ValueOf(out).Elem().Set(reflect.ValueOf(defaultValue))
-		case reflect.Struct:
-			if reflect.TypeOf(out).Elem() != bigIntType {
-				panic("invalid integer type")
-			}
-			if reflect.TypeOf(defaultValue).Kind() != reflect.Ptr ||
-				reflect.TypeOf(defaultValue).Elem() != bigIntType {
-				panic("out points to big.Int, but defaultValue does not")
-			}
-			out.(*big.Int).Set(defaultValue.(*big.Int))
-		default:
-			panic("invalid integer type")
-		}
-		return true
-	}
-	if !i.ReadASN1Integer(out) || !i.Empty() {
-		return false
-	}
-	return true
-}
-
-// ReadOptionalASN1OctetString attempts to read an optional ASN.1 OCTET STRING
-// explicitly tagged with tag into out and advances. If no element with a
-// matching tag is present, it writes defaultValue into out instead. It returns
-// true on success and false on error.
-func (s *String) ReadOptionalASN1OctetString(out *[]byte, outPresent *bool, tag asn1.Tag) bool {
-	var present bool
-	var child String
-	if !s.ReadOptionalASN1(&child, &present, tag) {
-		return false
-	}
-	if outPresent != nil {
-		*outPresent = present
-	}
-	if present {
-		var oct String
-		if !child.ReadASN1(&oct, asn1.OCTET_STRING) || !child.Empty() {
-			return false
-		}
-		*out = oct
-	} else {
-		*out = nil
-	}
-	return true
-}
-
-// ReadOptionalASN1Boolean sets *out to the value of the next ASN.1 BOOLEAN or,
-// if the next bytes are not an ASN.1 BOOLEAN, to the value of defaultValue.
-func (s *String) ReadOptionalASN1Boolean(out *bool, defaultValue bool) bool {
-	var present bool
-	var child String
-	if !s.ReadOptionalASN1(&child, &present, asn1.BOOLEAN) {
-		return false
-	}
-
-	if !present {
-		*out = defaultValue
-		return true
-	}
-
-	return s.ReadASN1Boolean(out)
-}
-
-func (s *String) readASN1(out *String, outTag *asn1.Tag, skipHeader bool) bool {
-	if len(*s) < 2 {
-		return false
-	}
-	tag, lenByte := (*s)[0], (*s)[1]
-
-	if tag&0x1f == 0x1f {
-		// ITU-T X.690 section 8.1.2
-		//
-		// An identifier octet with a tag part of 0x1f indicates a high-tag-number
-		// form identifier with two or more octets. We only support tags less than
-		// 31 (i.e. low-tag-number form, single octet identifier).
-		return false
-	}
-
-	if outTag != nil {
-		*outTag = asn1.Tag(tag)
-	}
-
-	// ITU-T X.690 section 8.1.3
-	//
-	// Bit 8 of the first length byte indicates whether the length is short- or
-	// long-form.
-	var length, headerLen uint32 // length includes headerLen
-	if lenByte&0x80 == 0 {
-		// Short-form length (section 8.1.3.4), encoded in bits 1-7.
-		length = uint32(lenByte) + 2
-		headerLen = 2
-	} else {
-		// Long-form length (section 8.1.3.5). Bits 1-7 encode the number of octets
-		// used to encode the length.
-		lenLen := lenByte & 0x7f
-		var len32 uint32
-
-		if lenLen == 0 || lenLen > 4 || len(*s) < int(2+lenLen) {
-			return false
-		}
-
-		lenBytes := String((*s)[2 : 2+lenLen])
-		if !lenBytes.readUnsigned(&len32, int(lenLen)) {
-			return false
-		}
-
-		// ITU-T X.690 section 10.1 (DER length forms) requires encoding the length
-		// with the minimum number of octets.
-		if len32 < 128 {
-			// Length should have used short-form encoding.
-			return false
-		}
-		if len32>>((lenLen-1)*8) == 0 {
-			// Leading octet is 0. Length should have been at least one byte shorter.
-			return false
-		}
-
-		headerLen = 2 + uint32(lenLen)
-		if headerLen+len32 < len32 {
-			// Overflow.
-			return false
-		}
-		length = headerLen + len32
-	}
-
-	if uint32(int(length)) != length || !s.ReadBytes((*[]byte)(out), int(length)) {
-		return false
-	}
-	if skipHeader && !out.Skip(int(headerLen)) {
-		panic("cryptobyte: internal error")
-	}
-
-	return true
-}
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go b/installer/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go
deleted file mode 100644
index cda8e3edfd..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1/asn1.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package asn1 contains supporting types for parsing and building ASN.1
-// messages with the cryptobyte package.
-package asn1 // import "golang.org/x/crypto/cryptobyte/asn1"
-
-// Tag represents an ASN.1 identifier octet, consisting of a tag number
-// (indicating a type) and class (such as context-specific or constructed).
-//
-// Methods in the cryptobyte package only support the low-tag-number form, i.e.
-// a single identifier octet with bits 7-8 encoding the class and bits 1-6
-// encoding the tag number.
-type Tag uint8
-
-const (
-	classConstructed     = 0x20
-	classContextSpecific = 0x80
-)
-
-// Constructed returns t with the constructed class bit set.
-func (t Tag) Constructed() Tag { return t | classConstructed }
-
-// ContextSpecific returns t with the context-specific class bit set.
-func (t Tag) ContextSpecific() Tag { return t | classContextSpecific }
-
-// The following is a list of standard tag and class combinations.
-const (
-	BOOLEAN           = Tag(1)
-	INTEGER           = Tag(2)
-	BIT_STRING        = Tag(3)
-	OCTET_STRING      = Tag(4)
-	NULL              = Tag(5)
-	OBJECT_IDENTIFIER = Tag(6)
-	ENUM              = Tag(10)
-	UTF8String        = Tag(12)
-	SEQUENCE          = Tag(16 | classConstructed)
-	SET               = Tag(17 | classConstructed)
-	PrintableString   = Tag(19)
-	T61String         = Tag(20)
-	IA5String         = Tag(22)
-	UTCTime           = Tag(23)
-	GeneralizedTime   = Tag(24)
-	GeneralString     = Tag(27)
-)
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1_test.go b/installer/vendor/golang.org/x/crypto/cryptobyte/asn1_test.go
deleted file mode 100644
index ee6674a2ff..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/asn1_test.go
+++ /dev/null
@@ -1,300 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	"bytes"
-	encoding_asn1 "encoding/asn1"
-	"math/big"
-	"reflect"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/cryptobyte/asn1"
-)
-
-type readASN1Test struct {
-	name string
-	in   []byte
-	tag  asn1.Tag
-	ok   bool
-	out  interface{}
-}
-
-var readASN1TestData = []readASN1Test{
-	{"valid", []byte{0x30, 2, 1, 2}, 0x30, true, []byte{1, 2}},
-	{"truncated", []byte{0x30, 3, 1, 2}, 0x30, false, nil},
-	{"zero length of length", []byte{0x30, 0x80}, 0x30, false, nil},
-	{"invalid long form length", []byte{0x30, 0x81, 1, 1}, 0x30, false, nil},
-	{"non-minimal length", append([]byte{0x30, 0x82, 0, 0x80}, make([]byte, 0x80)...), 0x30, false, nil},
-	{"invalid tag", []byte{0xa1, 3, 0x4, 1, 1}, 31, false, nil},
-	{"high tag", []byte{0x1f, 0x81, 0x80, 0x01, 2, 1, 2}, 0xff /* actually 0x4001, but tag is uint8 */, false, nil},
-}
-
-func TestReadASN1(t *testing.T) {
-	for _, test := range readASN1TestData {
-		t.Run(test.name, func(t *testing.T) {
-			var in, out String = test.in, nil
-			ok := in.ReadASN1(&out, test.tag)
-			if ok != test.ok || ok && !bytes.Equal(out, test.out.([]byte)) {
-				t.Errorf("in.ReadASN1() = %v, want %v; out = %v, want %v", ok, test.ok, out, test.out)
-			}
-		})
-	}
-}
-
-func TestReadASN1Optional(t *testing.T) {
-	var empty String
-	var present bool
-	ok := empty.ReadOptionalASN1(nil, &present, 0xa0)
-	if !ok || present {
-		t.Errorf("empty.ReadOptionalASN1() = %v, want true; present = %v want false", ok, present)
-	}
-
-	var in, out String = []byte{0xa1, 3, 0x4, 1, 1}, nil
-	ok = in.ReadOptionalASN1(&out, &present, 0xa0)
-	if !ok || present {
-		t.Errorf("in.ReadOptionalASN1() = %v, want true, present = %v, want false", ok, present)
-	}
-	ok = in.ReadOptionalASN1(&out, &present, 0xa1)
-	wantBytes := []byte{4, 1, 1}
-	if !ok || !present || !bytes.Equal(out, wantBytes) {
-		t.Errorf("in.ReadOptionalASN1() = %v, want true; present = %v, want true; out = %v, want = %v", ok, present, out, wantBytes)
-	}
-}
-
-var optionalOctetStringTestData = []struct {
-	readASN1Test
-	present bool
-}{
-	{readASN1Test{"empty", []byte{}, 0xa0, true, []byte{}}, false},
-	{readASN1Test{"invalid", []byte{0xa1, 3, 0x4, 2, 1}, 0xa1, false, []byte{}}, true},
-	{readASN1Test{"missing", []byte{0xa1, 3, 0x4, 1, 1}, 0xa0, true, []byte{}}, false},
-	{readASN1Test{"present", []byte{0xa1, 3, 0x4, 1, 1}, 0xa1, true, []byte{1}}, true},
-}
-
-func TestReadASN1OptionalOctetString(t *testing.T) {
-	for _, test := range optionalOctetStringTestData {
-		t.Run(test.name, func(t *testing.T) {
-			in := String(test.in)
-			var out []byte
-			var present bool
-			ok := in.ReadOptionalASN1OctetString(&out, &present, test.tag)
-			if ok != test.ok || present != test.present || !bytes.Equal(out, test.out.([]byte)) {
-				t.Errorf("in.ReadOptionalASN1OctetString() = %v, want %v; present = %v want %v; out = %v, want %v", ok, test.ok, present, test.present, out, test.out)
-			}
-		})
-	}
-}
-
-const defaultInt = -1
-
-var optionalIntTestData = []readASN1Test{
-	{"empty", []byte{}, 0xa0, true, defaultInt},
-	{"invalid", []byte{0xa1, 3, 0x2, 2, 127}, 0xa1, false, 0},
-	{"missing", []byte{0xa1, 3, 0x2, 1, 127}, 0xa0, true, defaultInt},
-	{"present", []byte{0xa1, 3, 0x2, 1, 42}, 0xa1, true, 42},
-}
-
-func TestReadASN1OptionalInteger(t *testing.T) {
-	for _, test := range optionalIntTestData {
-		t.Run(test.name, func(t *testing.T) {
-			in := String(test.in)
-			var out int
-			ok := in.ReadOptionalASN1Integer(&out, test.tag, defaultInt)
-			if ok != test.ok || ok && out != test.out.(int) {
-				t.Errorf("in.ReadOptionalASN1Integer() = %v, want %v; out = %v, want %v", ok, test.ok, out, test.out)
-			}
-		})
-	}
-}
-
-func TestReadASN1IntegerSigned(t *testing.T) {
-	testData64 := []struct {
-		in  []byte
-		out int64
-	}{
-		{[]byte{2, 3, 128, 0, 0}, -0x800000},
-		{[]byte{2, 2, 255, 0}, -256},
-		{[]byte{2, 2, 255, 127}, -129},
-		{[]byte{2, 1, 128}, -128},
-		{[]byte{2, 1, 255}, -1},
-		{[]byte{2, 1, 0}, 0},
-		{[]byte{2, 1, 1}, 1},
-		{[]byte{2, 1, 2}, 2},
-		{[]byte{2, 1, 127}, 127},
-		{[]byte{2, 2, 0, 128}, 128},
-		{[]byte{2, 2, 1, 0}, 256},
-		{[]byte{2, 4, 0, 128, 0, 0}, 0x800000},
-	}
-	for i, test := range testData64 {
-		in := String(test.in)
-		var out int64
-		ok := in.ReadASN1Integer(&out)
-		if !ok || out != test.out {
-			t.Errorf("#%d: in.ReadASN1Integer() = %v, want true; out = %d, want %d", i, ok, out, test.out)
-		}
-	}
-
-	// Repeat the same cases, reading into a big.Int.
-	t.Run("big.Int", func(t *testing.T) {
-		for i, test := range testData64 {
-			in := String(test.in)
-			var out big.Int
-			ok := in.ReadASN1Integer(&out)
-			if !ok || out.Int64() != test.out {
-				t.Errorf("#%d: in.ReadASN1Integer() = %v, want true; out = %d, want %d", i, ok, out.Int64(), test.out)
-			}
-		}
-	})
-}
-
-func TestReadASN1IntegerUnsigned(t *testing.T) {
-	testData := []struct {
-		in  []byte
-		out uint64
-	}{
-		{[]byte{2, 1, 0}, 0},
-		{[]byte{2, 1, 1}, 1},
-		{[]byte{2, 1, 2}, 2},
-		{[]byte{2, 1, 127}, 127},
-		{[]byte{2, 2, 0, 128}, 128},
-		{[]byte{2, 2, 1, 0}, 256},
-		{[]byte{2, 4, 0, 128, 0, 0}, 0x800000},
-		{[]byte{2, 8, 127, 255, 255, 255, 255, 255, 255, 255}, 0x7fffffffffffffff},
-		{[]byte{2, 9, 0, 128, 0, 0, 0, 0, 0, 0, 0}, 0x8000000000000000},
-		{[]byte{2, 9, 0, 255, 255, 255, 255, 255, 255, 255, 255}, 0xffffffffffffffff},
-	}
-	for i, test := range testData {
-		in := String(test.in)
-		var out uint64
-		ok := in.ReadASN1Integer(&out)
-		if !ok || out != test.out {
-			t.Errorf("#%d: in.ReadASN1Integer() = %v, want true; out = %d, want %d", i, ok, out, test.out)
-		}
-	}
-}
-
-func TestReadASN1IntegerInvalid(t *testing.T) {
-	testData := []String{
-		[]byte{3, 1, 0}, // invalid tag
-		// truncated
-		[]byte{2, 1},
-		[]byte{2, 2, 0},
-		// not minimally encoded
-		[]byte{2, 2, 0, 1},
-		[]byte{2, 2, 0xff, 0xff},
-	}
-
-	for i, test := range testData {
-		var out int64
-		if test.ReadASN1Integer(&out) {
-			t.Errorf("#%d: in.ReadASN1Integer() = true, want false (out = %d)", i, out)
-		}
-	}
-}
-
-func TestASN1ObjectIdentifier(t *testing.T) {
-	testData := []struct {
-		in  []byte
-		ok  bool
-		out []int
-	}{
-		{[]byte{}, false, []int{}},
-		{[]byte{6, 0}, false, []int{}},
-		{[]byte{5, 1, 85}, false, []int{2, 5}},
-		{[]byte{6, 1, 85}, true, []int{2, 5}},
-		{[]byte{6, 2, 85, 0x02}, true, []int{2, 5, 2}},
-		{[]byte{6, 4, 85, 0x02, 0xc0, 0x00}, true, []int{2, 5, 2, 0x2000}},
-		{[]byte{6, 3, 0x81, 0x34, 0x03}, true, []int{2, 100, 3}},
-		{[]byte{6, 7, 85, 0x02, 0xc0, 0x80, 0x80, 0x80, 0x80}, false, []int{}},
-	}
-
-	for i, test := range testData {
-		in := String(test.in)
-		var out encoding_asn1.ObjectIdentifier
-		ok := in.ReadASN1ObjectIdentifier(&out)
-		if ok != test.ok || ok && !out.Equal(test.out) {
-			t.Errorf("#%d: in.ReadASN1ObjectIdentifier() = %v, want %v; out = %v, want %v", i, ok, test.ok, out, test.out)
-			continue
-		}
-
-		var b Builder
-		b.AddASN1ObjectIdentifier(out)
-		result, err := b.Bytes()
-		if builderOk := err == nil; test.ok != builderOk {
-			t.Errorf("#%d: error from Builder.Bytes: %s", i, err)
-			continue
-		}
-		if test.ok && !bytes.Equal(result, test.in) {
-			t.Errorf("#%d: reserialisation didn't match, got %x, want %x", i, result, test.in)
-			continue
-		}
-	}
-}
-
-func TestReadASN1GeneralizedTime(t *testing.T) {
-	testData := []struct {
-		in  string
-		ok  bool
-		out time.Time
-	}{
-		{"20100102030405Z", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.UTC)},
-		{"20100102030405", false, time.Time{}},
-		{"20100102030405+0607", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.FixedZone("", 6*60*60+7*60))},
-		{"20100102030405-0607", true, time.Date(2010, 01, 02, 03, 04, 05, 0, time.FixedZone("", -6*60*60-7*60))},
-		/* These are invalid times. However, the time package normalises times
-		 * and they were accepted in some versions. See #11134. */
-		{"00000100000000Z", false, time.Time{}},
-		{"20101302030405Z", false, time.Time{}},
-		{"20100002030405Z", false, time.Time{}},
-		{"20100100030405Z", false, time.Time{}},
-		{"20100132030405Z", false, time.Time{}},
-		{"20100231030405Z", false, time.Time{}},
-		{"20100102240405Z", false, time.Time{}},
-		{"20100102036005Z", false, time.Time{}},
-		{"20100102030460Z", false, time.Time{}},
-		{"-20100102030410Z", false, time.Time{}},
-		{"2010-0102030410Z", false, time.Time{}},
-		{"2010-0002030410Z", false, time.Time{}},
-		{"201001-02030410Z", false, time.Time{}},
-		{"20100102-030410Z", false, time.Time{}},
-		{"2010010203-0410Z", false, time.Time{}},
-		{"201001020304-10Z", false, time.Time{}},
-	}
-	for i, test := range testData {
-		in := String(append([]byte{byte(asn1.GeneralizedTime), byte(len(test.in))}, test.in...))
-		var out time.Time
-		ok := in.ReadASN1GeneralizedTime(&out)
-		if ok != test.ok || ok && !reflect.DeepEqual(out, test.out) {
-			t.Errorf("#%d: in.ReadASN1GeneralizedTime() = %v, want %v; out = %q, want %q", i, ok, test.ok, out, test.out)
-		}
-	}
-}
-
-func TestReadASN1BitString(t *testing.T) {
-	testData := []struct {
-		in  []byte
-		ok  bool
-		out encoding_asn1.BitString
-	}{
-		{[]byte{}, false, encoding_asn1.BitString{}},
-		{[]byte{0x00}, true, encoding_asn1.BitString{}},
-		{[]byte{0x07, 0x00}, true, encoding_asn1.BitString{Bytes: []byte{0}, BitLength: 1}},
-		{[]byte{0x07, 0x01}, false, encoding_asn1.BitString{}},
-		{[]byte{0x07, 0x40}, false, encoding_asn1.BitString{}},
-		{[]byte{0x08, 0x00}, false, encoding_asn1.BitString{}},
-		{[]byte{0xff}, false, encoding_asn1.BitString{}},
-		{[]byte{0xfe, 0x00}, false, encoding_asn1.BitString{}},
-	}
-	for i, test := range testData {
-		in := String(append([]byte{3, byte(len(test.in))}, test.in...))
-		var out encoding_asn1.BitString
-		ok := in.ReadASN1BitString(&out)
-		if ok != test.ok || ok && (!bytes.Equal(out.Bytes, test.out.Bytes) || out.BitLength != test.out.BitLength) {
-			t.Errorf("#%d: in.ReadASN1BitString() = %v, want %v; out = %v, want %v", i, ok, test.ok, out, test.out)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/builder.go b/installer/vendor/golang.org/x/crypto/cryptobyte/builder.go
deleted file mode 100644
index 29b4c76412..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/builder.go
+++ /dev/null
@@ -1,309 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	"errors"
-	"fmt"
-)
-
-// A Builder builds byte strings from fixed-length and length-prefixed values.
-// Builders either allocate space as needed, or are ‘fixed’, which means that
-// they write into a given buffer and produce an error if it's exhausted.
-//
-// The zero value is a usable Builder that allocates space as needed.
-//
-// Simple values are marshaled and appended to a Builder using methods on the
-// Builder. Length-prefixed values are marshaled by providing a
-// BuilderContinuation, which is a function that writes the inner contents of
-// the value to a given Builder. See the documentation for BuilderContinuation
-// for details.
-type Builder struct {
-	err            error
-	result         []byte
-	fixedSize      bool
-	child          *Builder
-	offset         int
-	pendingLenLen  int
-	pendingIsASN1  bool
-	inContinuation *bool
-}
-
-// NewBuilder creates a Builder that appends its output to the given buffer.
-// Like append(), the slice will be reallocated if its capacity is exceeded.
-// Use Bytes to get the final buffer.
-func NewBuilder(buffer []byte) *Builder {
-	return &Builder{
-		result: buffer,
-	}
-}
-
-// NewFixedBuilder creates a Builder that appends its output into the given
-// buffer. This builder does not reallocate the output buffer. Writes that
-// would exceed the buffer's capacity are treated as an error.
-func NewFixedBuilder(buffer []byte) *Builder {
-	return &Builder{
-		result:    buffer,
-		fixedSize: true,
-	}
-}
-
-// Bytes returns the bytes written by the builder or an error if one has
-// occurred during during building.
-func (b *Builder) Bytes() ([]byte, error) {
-	if b.err != nil {
-		return nil, b.err
-	}
-	return b.result[b.offset:], nil
-}
-
-// BytesOrPanic returns the bytes written by the builder or panics if an error
-// has occurred during building.
-func (b *Builder) BytesOrPanic() []byte {
-	if b.err != nil {
-		panic(b.err)
-	}
-	return b.result[b.offset:]
-}
-
-// AddUint8 appends an 8-bit value to the byte string.
-func (b *Builder) AddUint8(v uint8) {
-	b.add(byte(v))
-}
-
-// AddUint16 appends a big-endian, 16-bit value to the byte string.
-func (b *Builder) AddUint16(v uint16) {
-	b.add(byte(v>>8), byte(v))
-}
-
-// AddUint24 appends a big-endian, 24-bit value to the byte string. The highest
-// byte of the 32-bit input value is silently truncated.
-func (b *Builder) AddUint24(v uint32) {
-	b.add(byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddUint32 appends a big-endian, 32-bit value to the byte string.
-func (b *Builder) AddUint32(v uint32) {
-	b.add(byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-// AddBytes appends a sequence of bytes to the byte string.
-func (b *Builder) AddBytes(v []byte) {
-	b.add(v...)
-}
-
-// BuilderContinuation is continuation-passing interface for building
-// length-prefixed byte sequences. Builder methods for length-prefixed
-// sequences (AddUint8LengthPrefixed etc) will invoke the BuilderContinuation
-// supplied to them. The child builder passed to the continuation can be used
-// to build the content of the length-prefixed sequence. For example:
-//
-//   parent := cryptobyte.NewBuilder()
-//   parent.AddUint8LengthPrefixed(func (child *Builder) {
-//     child.AddUint8(42)
-//     child.AddUint8LengthPrefixed(func (grandchild *Builder) {
-//       grandchild.AddUint8(5)
-//     })
-//   })
-//
-// It is an error to write more bytes to the child than allowed by the reserved
-// length prefix. After the continuation returns, the child must be considered
-// invalid, i.e. users must not store any copies or references of the child
-// that outlive the continuation.
-//
-// If the continuation panics with a value of type BuildError then the inner
-// error will be returned as the error from Bytes. If the child panics
-// otherwise then Bytes will repanic with the same value.
-type BuilderContinuation func(child *Builder)
-
-// BuildError wraps an error. If a BuilderContinuation panics with this value,
-// the panic will be recovered and the inner error will be returned from
-// Builder.Bytes.
-type BuildError struct {
-	Err error
-}
-
-// AddUint8LengthPrefixed adds a 8-bit length-prefixed byte sequence.
-func (b *Builder) AddUint8LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(1, false, f)
-}
-
-// AddUint16LengthPrefixed adds a big-endian, 16-bit length-prefixed byte sequence.
-func (b *Builder) AddUint16LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(2, false, f)
-}
-
-// AddUint24LengthPrefixed adds a big-endian, 24-bit length-prefixed byte sequence.
-func (b *Builder) AddUint24LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(3, false, f)
-}
-
-// AddUint32LengthPrefixed adds a big-endian, 32-bit length-prefixed byte sequence.
-func (b *Builder) AddUint32LengthPrefixed(f BuilderContinuation) {
-	b.addLengthPrefixed(4, false, f)
-}
-
-func (b *Builder) callContinuation(f BuilderContinuation, arg *Builder) {
-	if !*b.inContinuation {
-		*b.inContinuation = true
-
-		defer func() {
-			*b.inContinuation = false
-
-			r := recover()
-			if r == nil {
-				return
-			}
-
-			if buildError, ok := r.(BuildError); ok {
-				b.err = buildError.Err
-			} else {
-				panic(r)
-			}
-		}()
-	}
-
-	f(arg)
-}
-
-func (b *Builder) addLengthPrefixed(lenLen int, isASN1 bool, f BuilderContinuation) {
-	// Subsequent writes can be ignored if the builder has encountered an error.
-	if b.err != nil {
-		return
-	}
-
-	offset := len(b.result)
-	b.add(make([]byte, lenLen)...)
-
-	if b.inContinuation == nil {
-		b.inContinuation = new(bool)
-	}
-
-	b.child = &Builder{
-		result:         b.result,
-		fixedSize:      b.fixedSize,
-		offset:         offset,
-		pendingLenLen:  lenLen,
-		pendingIsASN1:  isASN1,
-		inContinuation: b.inContinuation,
-	}
-
-	b.callContinuation(f, b.child)
-	b.flushChild()
-	if b.child != nil {
-		panic("cryptobyte: internal error")
-	}
-}
-
-func (b *Builder) flushChild() {
-	if b.child == nil {
-		return
-	}
-	b.child.flushChild()
-	child := b.child
-	b.child = nil
-
-	if child.err != nil {
-		b.err = child.err
-		return
-	}
-
-	length := len(child.result) - child.pendingLenLen - child.offset
-
-	if length < 0 {
-		panic("cryptobyte: internal error") // result unexpectedly shrunk
-	}
-
-	if child.pendingIsASN1 {
-		// For ASN.1, we reserved a single byte for the length. If that turned out
-		// to be incorrect, we have to move the contents along in order to make
-		// space.
-		if child.pendingLenLen != 1 {
-			panic("cryptobyte: internal error")
-		}
-		var lenLen, lenByte uint8
-		if int64(length) > 0xfffffffe {
-			b.err = errors.New("pending ASN.1 child too long")
-			return
-		} else if length > 0xffffff {
-			lenLen = 5
-			lenByte = 0x80 | 4
-		} else if length > 0xffff {
-			lenLen = 4
-			lenByte = 0x80 | 3
-		} else if length > 0xff {
-			lenLen = 3
-			lenByte = 0x80 | 2
-		} else if length > 0x7f {
-			lenLen = 2
-			lenByte = 0x80 | 1
-		} else {
-			lenLen = 1
-			lenByte = uint8(length)
-			length = 0
-		}
-
-		// Insert the initial length byte, make space for successive length bytes,
-		// and adjust the offset.
-		child.result[child.offset] = lenByte
-		extraBytes := int(lenLen - 1)
-		if extraBytes != 0 {
-			child.add(make([]byte, extraBytes)...)
-			childStart := child.offset + child.pendingLenLen
-			copy(child.result[childStart+extraBytes:], child.result[childStart:])
-		}
-		child.offset++
-		child.pendingLenLen = extraBytes
-	}
-
-	l := length
-	for i := child.pendingLenLen - 1; i >= 0; i-- {
-		child.result[child.offset+i] = uint8(l)
-		l >>= 8
-	}
-	if l != 0 {
-		b.err = fmt.Errorf("cryptobyte: pending child length %d exceeds %d-byte length prefix", length, child.pendingLenLen)
-		return
-	}
-
-	if !b.fixedSize {
-		b.result = child.result // In case child reallocated result.
-	}
-}
-
-func (b *Builder) add(bytes ...byte) {
-	if b.err != nil {
-		return
-	}
-	if b.child != nil {
-		panic("attempted write while child is pending")
-	}
-	if len(b.result)+len(bytes) < len(bytes) {
-		b.err = errors.New("cryptobyte: length overflow")
-	}
-	if b.fixedSize && len(b.result)+len(bytes) > cap(b.result) {
-		b.err = errors.New("cryptobyte: Builder is exceeding its fixed-size buffer")
-		return
-	}
-	b.result = append(b.result, bytes...)
-}
-
-// A MarshalingValue marshals itself into a Builder.
-type MarshalingValue interface {
-	// Marshal is called by Builder.AddValue. It receives a pointer to a builder
-	// to marshal itself into. It may return an error that occurred during
-	// marshaling, such as unset or invalid values.
-	Marshal(b *Builder) error
-}
-
-// AddValue calls Marshal on v, passing a pointer to the builder to append to.
-// If Marshal returns an error, it is set on the Builder so that subsequent
-// appends don't have an effect.
-func (b *Builder) AddValue(v MarshalingValue) {
-	err := v.Marshal(b)
-	if err != nil {
-		b.err = err
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/cryptobyte_test.go b/installer/vendor/golang.org/x/crypto/cryptobyte/cryptobyte_test.go
deleted file mode 100644
index f294dd552b..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/cryptobyte_test.go
+++ /dev/null
@@ -1,428 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"testing"
-)
-
-func builderBytesEq(b *Builder, want ...byte) error {
-	got := b.BytesOrPanic()
-	if !bytes.Equal(got, want) {
-		return fmt.Errorf("Bytes() = %v, want %v", got, want)
-	}
-	return nil
-}
-
-func TestContinuationError(t *testing.T) {
-	const errorStr = "TestContinuationError"
-	var b Builder
-	b.AddUint8LengthPrefixed(func(b *Builder) {
-		b.AddUint8(1)
-		panic(BuildError{Err: errors.New(errorStr)})
-	})
-
-	ret, err := b.Bytes()
-	if ret != nil {
-		t.Error("expected nil result")
-	}
-	if err == nil {
-		t.Fatal("unexpected nil error")
-	}
-	if s := err.Error(); s != errorStr {
-		t.Errorf("expected error %q, got %v", errorStr, s)
-	}
-}
-
-func TestContinuationNonError(t *testing.T) {
-	defer func() {
-		recover()
-	}()
-
-	var b Builder
-	b.AddUint8LengthPrefixed(func(b *Builder) {
-		b.AddUint8(1)
-		panic(1)
-	})
-
-	t.Error("Builder did not panic")
-}
-
-func TestGeneratedPanic(t *testing.T) {
-	defer func() {
-		recover()
-	}()
-
-	var b Builder
-	b.AddUint8LengthPrefixed(func(b *Builder) {
-		var p *byte
-		*p = 0
-	})
-
-	t.Error("Builder did not panic")
-}
-
-func TestBytes(t *testing.T) {
-	var b Builder
-	v := []byte("foobarbaz")
-	b.AddBytes(v[0:3])
-	b.AddBytes(v[3:4])
-	b.AddBytes(v[4:9])
-	if err := builderBytesEq(&b, v...); err != nil {
-		t.Error(err)
-	}
-	s := String(b.BytesOrPanic())
-	for _, w := range []string{"foo", "bar", "baz"} {
-		var got []byte
-		if !s.ReadBytes(&got, 3) {
-			t.Errorf("ReadBytes() = false, want true (w = %v)", w)
-		}
-		want := []byte(w)
-		if !bytes.Equal(got, want) {
-			t.Errorf("ReadBytes(): got = %v, want %v", got, want)
-		}
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUint8(t *testing.T) {
-	var b Builder
-	b.AddUint8(42)
-	if err := builderBytesEq(&b, 42); err != nil {
-		t.Error(err)
-	}
-
-	var s String = b.BytesOrPanic()
-	var v uint8
-	if !s.ReadUint8(&v) {
-		t.Error("ReadUint8() = false, want true")
-	}
-	if v != 42 {
-		t.Errorf("v = %d, want 42", v)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUint16(t *testing.T) {
-	var b Builder
-	b.AddUint16(65534)
-	if err := builderBytesEq(&b, 255, 254); err != nil {
-		t.Error(err)
-	}
-	var s String = b.BytesOrPanic()
-	var v uint16
-	if !s.ReadUint16(&v) {
-		t.Error("ReadUint16() == false, want true")
-	}
-	if v != 65534 {
-		t.Errorf("v = %d, want 65534", v)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUint24(t *testing.T) {
-	var b Builder
-	b.AddUint24(0xfffefd)
-	if err := builderBytesEq(&b, 255, 254, 253); err != nil {
-		t.Error(err)
-	}
-
-	var s String = b.BytesOrPanic()
-	var v uint32
-	if !s.ReadUint24(&v) {
-		t.Error("ReadUint8() = false, want true")
-	}
-	if v != 0xfffefd {
-		t.Errorf("v = %d, want fffefd", v)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUint24Truncation(t *testing.T) {
-	var b Builder
-	b.AddUint24(0x10111213)
-	if err := builderBytesEq(&b, 0x11, 0x12, 0x13); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestUint32(t *testing.T) {
-	var b Builder
-	b.AddUint32(0xfffefdfc)
-	if err := builderBytesEq(&b, 255, 254, 253, 252); err != nil {
-		t.Error(err)
-	}
-
-	var s String = b.BytesOrPanic()
-	var v uint32
-	if !s.ReadUint32(&v) {
-		t.Error("ReadUint8() = false, want true")
-	}
-	if v != 0xfffefdfc {
-		t.Errorf("v = %x, want fffefdfc", v)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUMultiple(t *testing.T) {
-	var b Builder
-	b.AddUint8(23)
-	b.AddUint32(0xfffefdfc)
-	b.AddUint16(42)
-	if err := builderBytesEq(&b, 23, 255, 254, 253, 252, 0, 42); err != nil {
-		t.Error(err)
-	}
-
-	var s String = b.BytesOrPanic()
-	var (
-		x uint8
-		y uint32
-		z uint16
-	)
-	if !s.ReadUint8(&x) || !s.ReadUint32(&y) || !s.ReadUint16(&z) {
-		t.Error("ReadUint8() = false, want true")
-	}
-	if x != 23 || y != 0xfffefdfc || z != 42 {
-		t.Errorf("x, y, z = %d, %d, %d; want 23, 4294901244, 5", x, y, z)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-}
-
-func TestUint8LengthPrefixedSimple(t *testing.T) {
-	var b Builder
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8(23)
-		c.AddUint8(42)
-	})
-	if err := builderBytesEq(&b, 2, 23, 42); err != nil {
-		t.Error(err)
-	}
-
-	var base, child String = b.BytesOrPanic(), nil
-	var x, y uint8
-	if !base.ReadUint8LengthPrefixed(&child) || !child.ReadUint8(&x) ||
-		!child.ReadUint8(&y) {
-		t.Error("parsing failed")
-	}
-	if x != 23 || y != 42 {
-		t.Errorf("want x, y == 23, 42; got %d, %d", x, y)
-	}
-	if len(base) != 0 {
-		t.Errorf("len(base) = %d, want 0", len(base))
-	}
-	if len(child) != 0 {
-		t.Errorf("len(child) = %d, want 0", len(child))
-	}
-}
-
-func TestUint8LengthPrefixedMulti(t *testing.T) {
-	var b Builder
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8(23)
-		c.AddUint8(42)
-	})
-	b.AddUint8(5)
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8(123)
-		c.AddUint8(234)
-	})
-	if err := builderBytesEq(&b, 2, 23, 42, 5, 2, 123, 234); err != nil {
-		t.Error(err)
-	}
-
-	var s, child String = b.BytesOrPanic(), nil
-	var u, v, w, x, y uint8
-	if !s.ReadUint8LengthPrefixed(&child) || !child.ReadUint8(&u) || !child.ReadUint8(&v) ||
-		!s.ReadUint8(&w) || !s.ReadUint8LengthPrefixed(&child) || !child.ReadUint8(&x) || !child.ReadUint8(&y) {
-		t.Error("parsing failed")
-	}
-	if u != 23 || v != 42 || w != 5 || x != 123 || y != 234 {
-		t.Errorf("u, v, w, x, y = %d, %d, %d, %d, %d; want 23, 42, 5, 123, 234",
-			u, v, w, x, y)
-	}
-	if len(s) != 0 {
-		t.Errorf("len(s) = %d, want 0", len(s))
-	}
-	if len(child) != 0 {
-		t.Errorf("len(child) = %d, want 0", len(child))
-	}
-}
-
-func TestUint8LengthPrefixedNested(t *testing.T) {
-	var b Builder
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8(5)
-		c.AddUint8LengthPrefixed(func(d *Builder) {
-			d.AddUint8(23)
-			d.AddUint8(42)
-		})
-		c.AddUint8(123)
-	})
-	if err := builderBytesEq(&b, 5, 5, 2, 23, 42, 123); err != nil {
-		t.Error(err)
-	}
-
-	var base, child1, child2 String = b.BytesOrPanic(), nil, nil
-	var u, v, w, x uint8
-	if !base.ReadUint8LengthPrefixed(&child1) {
-		t.Error("parsing base failed")
-	}
-	if !child1.ReadUint8(&u) || !child1.ReadUint8LengthPrefixed(&child2) || !child1.ReadUint8(&x) {
-		t.Error("parsing child1 failed")
-	}
-	if !child2.ReadUint8(&v) || !child2.ReadUint8(&w) {
-		t.Error("parsing child2 failed")
-	}
-	if u != 5 || v != 23 || w != 42 || x != 123 {
-		t.Errorf("u, v, w, x = %d, %d, %d, %d, want 5, 23, 42, 123",
-			u, v, w, x)
-	}
-	if len(base) != 0 {
-		t.Errorf("len(base) = %d, want 0", len(base))
-	}
-	if len(child1) != 0 {
-		t.Errorf("len(child1) = %d, want 0", len(child1))
-	}
-	if len(base) != 0 {
-		t.Errorf("len(child2) = %d, want 0", len(child2))
-	}
-}
-
-func TestPreallocatedBuffer(t *testing.T) {
-	var buf [5]byte
-	b := NewBuilder(buf[0:0])
-	b.AddUint8(1)
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8(3)
-		c.AddUint8(4)
-	})
-	b.AddUint16(1286) // Outgrow buf by one byte.
-	want := []byte{1, 2, 3, 4, 0}
-	if !bytes.Equal(buf[:], want) {
-		t.Errorf("buf = %v want %v", buf, want)
-	}
-	if err := builderBytesEq(b, 1, 2, 3, 4, 5, 6); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestWriteWithPendingChild(t *testing.T) {
-	var b Builder
-	b.AddUint8LengthPrefixed(func(c *Builder) {
-		c.AddUint8LengthPrefixed(func(d *Builder) {
-			defer func() {
-				if recover() == nil {
-					t.Errorf("recover() = nil, want error; c.AddUint8() did not panic")
-				}
-			}()
-			c.AddUint8(2) // panics
-
-			defer func() {
-				if recover() == nil {
-					t.Errorf("recover() = nil, want error; b.AddUint8() did not panic")
-				}
-			}()
-			b.AddUint8(2) // panics
-		})
-
-		defer func() {
-			if recover() == nil {
-				t.Errorf("recover() = nil, want error; b.AddUint8() did not panic")
-			}
-		}()
-		b.AddUint8(2) // panics
-	})
-}
-
-// ASN.1
-
-func TestASN1Int64(t *testing.T) {
-	tests := []struct {
-		in   int64
-		want []byte
-	}{
-		{-0x800000, []byte{2, 3, 128, 0, 0}},
-		{-256, []byte{2, 2, 255, 0}},
-		{-129, []byte{2, 2, 255, 127}},
-		{-128, []byte{2, 1, 128}},
-		{-1, []byte{2, 1, 255}},
-		{0, []byte{2, 1, 0}},
-		{1, []byte{2, 1, 1}},
-		{2, []byte{2, 1, 2}},
-		{127, []byte{2, 1, 127}},
-		{128, []byte{2, 2, 0, 128}},
-		{256, []byte{2, 2, 1, 0}},
-		{0x800000, []byte{2, 4, 0, 128, 0, 0}},
-	}
-	for i, tt := range tests {
-		var b Builder
-		b.AddASN1Int64(tt.in)
-		if err := builderBytesEq(&b, tt.want...); err != nil {
-			t.Errorf("%v, (i = %d; in = %v)", err, i, tt.in)
-		}
-
-		var n int64
-		s := String(b.BytesOrPanic())
-		ok := s.ReadASN1Integer(&n)
-		if !ok || n != tt.in {
-			t.Errorf("s.ReadASN1Integer(&n) = %v, n = %d; want true, n = %d (i = %d)",
-				ok, n, tt.in, i)
-		}
-		if len(s) != 0 {
-			t.Errorf("len(s) = %d, want 0", len(s))
-		}
-	}
-}
-
-func TestASN1Uint64(t *testing.T) {
-	tests := []struct {
-		in   uint64
-		want []byte
-	}{
-		{0, []byte{2, 1, 0}},
-		{1, []byte{2, 1, 1}},
-		{2, []byte{2, 1, 2}},
-		{127, []byte{2, 1, 127}},
-		{128, []byte{2, 2, 0, 128}},
-		{256, []byte{2, 2, 1, 0}},
-		{0x800000, []byte{2, 4, 0, 128, 0, 0}},
-		{0x7fffffffffffffff, []byte{2, 8, 127, 255, 255, 255, 255, 255, 255, 255}},
-		{0x8000000000000000, []byte{2, 9, 0, 128, 0, 0, 0, 0, 0, 0, 0}},
-		{0xffffffffffffffff, []byte{2, 9, 0, 255, 255, 255, 255, 255, 255, 255, 255}},
-	}
-	for i, tt := range tests {
-		var b Builder
-		b.AddASN1Uint64(tt.in)
-		if err := builderBytesEq(&b, tt.want...); err != nil {
-			t.Errorf("%v, (i = %d; in = %v)", err, i, tt.in)
-		}
-
-		var n uint64
-		s := String(b.BytesOrPanic())
-		ok := s.ReadASN1Integer(&n)
-		if !ok || n != tt.in {
-			t.Errorf("s.ReadASN1Integer(&n) = %v, n = %d; want true, n = %d (i = %d)",
-				ok, n, tt.in, i)
-		}
-		if len(s) != 0 {
-			t.Errorf("len(s) = %d, want 0", len(s))
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/example_test.go b/installer/vendor/golang.org/x/crypto/cryptobyte/example_test.go
deleted file mode 100644
index 86c098adf6..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/example_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package cryptobyte_test
-
-import (
-	"errors"
-	"fmt"
-
-	"golang.org/x/crypto/cryptobyte"
-	"golang.org/x/crypto/cryptobyte/asn1"
-)
-
-func ExampleString_lengthPrefixed() {
-	// This is an example of parsing length-prefixed data (as found in, for
-	// example, TLS). Imagine a 16-bit prefixed series of 8-bit prefixed
-	// strings.
-
-	input := cryptobyte.String([]byte{0, 12, 5, 'h', 'e', 'l', 'l', 'o', 5, 'w', 'o', 'r', 'l', 'd'})
-	var result []string
-
-	var values cryptobyte.String
-	if !input.ReadUint16LengthPrefixed(&values) ||
-		!input.Empty() {
-		panic("bad format")
-	}
-
-	for !values.Empty() {
-		var value cryptobyte.String
-		if !values.ReadUint8LengthPrefixed(&value) {
-			panic("bad format")
-		}
-
-		result = append(result, string(value))
-	}
-
-	// Output: []string{"hello", "world"}
-	fmt.Printf("%#v\n", result)
-}
-
-func ExampleString_aSN1() {
-	// This is an example of parsing ASN.1 data that looks like:
-	//    Foo ::= SEQUENCE {
-	//      version [6] INTEGER DEFAULT 0
-	//      data OCTET STRING
-	//    }
-
-	input := cryptobyte.String([]byte{0x30, 12, 0xa6, 3, 2, 1, 2, 4, 5, 'h', 'e', 'l', 'l', 'o'})
-
-	var (
-		version                   int64
-		data, inner, versionBytes cryptobyte.String
-		haveVersion               bool
-	)
-	if !input.ReadASN1(&inner, asn1.SEQUENCE) ||
-		!input.Empty() ||
-		!inner.ReadOptionalASN1(&versionBytes, &haveVersion, asn1.Tag(6).Constructed().ContextSpecific()) ||
-		(haveVersion && !versionBytes.ReadASN1Integer(&version)) ||
-		(haveVersion && !versionBytes.Empty()) ||
-		!inner.ReadASN1(&data, asn1.OCTET_STRING) ||
-		!inner.Empty() {
-		panic("bad format")
-	}
-
-	// Output: haveVersion: true, version: 2, data: hello
-	fmt.Printf("haveVersion: %t, version: %d, data: %s\n", haveVersion, version, string(data))
-}
-
-func ExampleBuilder_aSN1() {
-	// This is an example of building ASN.1 data that looks like:
-	//    Foo ::= SEQUENCE {
-	//      version [6] INTEGER DEFAULT 0
-	//      data OCTET STRING
-	//    }
-
-	version := int64(2)
-	data := []byte("hello")
-	const defaultVersion = 0
-
-	var b cryptobyte.Builder
-	b.AddASN1(asn1.SEQUENCE, func(b *cryptobyte.Builder) {
-		if version != defaultVersion {
-			b.AddASN1(asn1.Tag(6).Constructed().ContextSpecific(), func(b *cryptobyte.Builder) {
-				b.AddASN1Int64(version)
-			})
-		}
-		b.AddASN1OctetString(data)
-	})
-
-	result, err := b.Bytes()
-	if err != nil {
-		panic(err)
-	}
-
-	// Output: 300ca603020102040568656c6c6f
-	fmt.Printf("%x\n", result)
-}
-
-func ExampleBuilder_lengthPrefixed() {
-	// This is an example of building length-prefixed data (as found in,
-	// for example, TLS). Imagine a 16-bit prefixed series of 8-bit
-	// prefixed strings.
-	input := []string{"hello", "world"}
-
-	var b cryptobyte.Builder
-	b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
-		for _, value := range input {
-			b.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
-				b.AddBytes([]byte(value))
-			})
-		}
-	})
-
-	result, err := b.Bytes()
-	if err != nil {
-		panic(err)
-	}
-
-	// Output: 000c0568656c6c6f05776f726c64
-	fmt.Printf("%x\n", result)
-}
-
-func ExampleBuilder_lengthPrefixOverflow() {
-	// Writing more data that can be expressed by the length prefix results
-	// in an error from Bytes().
-
-	tooLarge := make([]byte, 256)
-
-	var b cryptobyte.Builder
-	b.AddUint8LengthPrefixed(func(b *cryptobyte.Builder) {
-		b.AddBytes(tooLarge)
-	})
-
-	result, err := b.Bytes()
-	fmt.Printf("len=%d err=%s\n", len(result), err)
-
-	// Output: len=0 err=cryptobyte: pending child length 256 exceeds 1-byte length prefix
-}
-
-func ExampleBuilderContinuation_errorHandling() {
-	var b cryptobyte.Builder
-	// Continuations that panic with a BuildError will cause Bytes to
-	// return the inner error.
-	b.AddUint16LengthPrefixed(func(b *cryptobyte.Builder) {
-		b.AddUint32(0)
-		panic(cryptobyte.BuildError{Err: errors.New("example error")})
-	})
-
-	result, err := b.Bytes()
-	fmt.Printf("len=%d err=%s\n", len(result), err)
-
-	// Output: len=0 err=example error
-}
diff --git a/installer/vendor/golang.org/x/crypto/cryptobyte/string.go b/installer/vendor/golang.org/x/crypto/cryptobyte/string.go
deleted file mode 100644
index 7636fb9c8a..0000000000
--- a/installer/vendor/golang.org/x/crypto/cryptobyte/string.go
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cryptobyte contains types that help with parsing and constructing
-// length-prefixed, binary messages, including ASN.1 DER. (The asn1 subpackage
-// contains useful ASN.1 constants.)
-//
-// The String type is for parsing. It wraps a []byte slice and provides helper
-// functions for consuming structures, value by value.
-//
-// The Builder type is for constructing messages. It providers helper functions
-// for appending values and also for appending length-prefixed submessages –
-// without having to worry about calculating the length prefix ahead of time.
-//
-// See the documentation and examples for the Builder and String types to get
-// started.
-package cryptobyte // import "golang.org/x/crypto/cryptobyte"
-
-// String represents a string of bytes. It provides methods for parsing
-// fixed-length and length-prefixed values from it.
-type String []byte
-
-// read advances a String by n bytes and returns them. If less than n bytes
-// remain, it returns nil.
-func (s *String) read(n int) []byte {
-	if len(*s) < n {
-		return nil
-	}
-	v := (*s)[:n]
-	*s = (*s)[n:]
-	return v
-}
-
-// Skip advances the String by n byte and reports whether it was successful.
-func (s *String) Skip(n int) bool {
-	return s.read(n) != nil
-}
-
-// ReadUint8 decodes an 8-bit value into out and advances over it. It
-// returns true on success and false on error.
-func (s *String) ReadUint8(out *uint8) bool {
-	v := s.read(1)
-	if v == nil {
-		return false
-	}
-	*out = uint8(v[0])
-	return true
-}
-
-// ReadUint16 decodes a big-endian, 16-bit value into out and advances over it.
-// It returns true on success and false on error.
-func (s *String) ReadUint16(out *uint16) bool {
-	v := s.read(2)
-	if v == nil {
-		return false
-	}
-	*out = uint16(v[0])<<8 | uint16(v[1])
-	return true
-}
-
-// ReadUint24 decodes a big-endian, 24-bit value into out and advances over it.
-// It returns true on success and false on error.
-func (s *String) ReadUint24(out *uint32) bool {
-	v := s.read(3)
-	if v == nil {
-		return false
-	}
-	*out = uint32(v[0])<<16 | uint32(v[1])<<8 | uint32(v[2])
-	return true
-}
-
-// ReadUint32 decodes a big-endian, 32-bit value into out and advances over it.
-// It returns true on success and false on error.
-func (s *String) ReadUint32(out *uint32) bool {
-	v := s.read(4)
-	if v == nil {
-		return false
-	}
-	*out = uint32(v[0])<<24 | uint32(v[1])<<16 | uint32(v[2])<<8 | uint32(v[3])
-	return true
-}
-
-func (s *String) readUnsigned(out *uint32, length int) bool {
-	v := s.read(length)
-	if v == nil {
-		return false
-	}
-	var result uint32
-	for i := 0; i < length; i++ {
-		result <<= 8
-		result |= uint32(v[i])
-	}
-	*out = result
-	return true
-}
-
-func (s *String) readLengthPrefixed(lenLen int, outChild *String) bool {
-	lenBytes := s.read(lenLen)
-	if lenBytes == nil {
-		return false
-	}
-	var length uint32
-	for _, b := range lenBytes {
-		length = length << 8
-		length = length | uint32(b)
-	}
-	if int(length) < 0 {
-		// This currently cannot overflow because we read uint24 at most, but check
-		// anyway in case that changes in the future.
-		return false
-	}
-	v := s.read(int(length))
-	if v == nil {
-		return false
-	}
-	*outChild = v
-	return true
-}
-
-// ReadUint8LengthPrefixed reads the content of an 8-bit length-prefixed value
-// into out and advances over it. It returns true on success and false on
-// error.
-func (s *String) ReadUint8LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(1, out)
-}
-
-// ReadUint16LengthPrefixed reads the content of a big-endian, 16-bit
-// length-prefixed value into out and advances over it. It returns true on
-// success and false on error.
-func (s *String) ReadUint16LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(2, out)
-}
-
-// ReadUint24LengthPrefixed reads the content of a big-endian, 24-bit
-// length-prefixed value into out and advances over it. It returns true on
-// success and false on error.
-func (s *String) ReadUint24LengthPrefixed(out *String) bool {
-	return s.readLengthPrefixed(3, out)
-}
-
-// ReadBytes reads n bytes into out and advances over them. It returns true on
-// success and false and error.
-func (s *String) ReadBytes(out *[]byte, n int) bool {
-	v := s.read(n)
-	if v == nil {
-		return false
-	}
-	*out = v
-	return true
-}
-
-// CopyBytes copies len(out) bytes into out and advances over them. It returns
-// true on success and false on error.
-func (s *String) CopyBytes(out []byte) bool {
-	n := len(out)
-	v := s.read(n)
-	if v == nil {
-		return false
-	}
-	return copy(out, v) == n
-}
-
-// Empty reports whether the string does not contain any bytes.
-func (s String) Empty() bool {
-	return len(s) == 0
-}
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.h b/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.h
deleted file mode 100644
index b3f74162f6..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.h
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-#define REDMASK51     0x0007FFFFFFFFFFFF
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.s
deleted file mode 100644
index ee7b4bd5f8..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/const_amd64.s
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-// These constants cannot be encoded in non-MOVQ immediates.
-// We access them directly from memory instead.
-
-DATA ·_121666_213(SB)/8, $996687872
-GLOBL ·_121666_213(SB), 8, $8
-
-DATA ·_2P0(SB)/8, $0xFFFFFFFFFFFDA
-GLOBL ·_2P0(SB), 8, $8
-
-DATA ·_2P1234(SB)/8, $0xFFFFFFFFFFFFE
-GLOBL ·_2P1234(SB), 8, $8
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s
deleted file mode 100644
index cd793a5b5f..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/cswap_amd64.s
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!gccgo,!appengine
-
-// func cswap(inout *[4][5]uint64, v uint64)
-TEXT ·cswap(SB),7,$0
-	MOVQ inout+0(FP),DI
-	MOVQ v+8(FP),SI
-
-	SUBQ $1, SI
-	NOTQ SI
-	MOVQ SI, X15
-	PSHUFD $0x44, X15, X15
-
-	MOVOU 0(DI), X0
-	MOVOU 16(DI), X2
-	MOVOU 32(DI), X4
-	MOVOU 48(DI), X6
-	MOVOU 64(DI), X8
-	MOVOU 80(DI), X1
-	MOVOU 96(DI), X3
-	MOVOU 112(DI), X5
-	MOVOU 128(DI), X7
-	MOVOU 144(DI), X9
-
-	MOVO X1, X10
-	MOVO X3, X11
-	MOVO X5, X12
-	MOVO X7, X13
-	MOVO X9, X14
-
-	PXOR X0, X10
-	PXOR X2, X11
-	PXOR X4, X12
-	PXOR X6, X13
-	PXOR X8, X14
-	PAND X15, X10
-	PAND X15, X11
-	PAND X15, X12
-	PAND X15, X13
-	PAND X15, X14
-	PXOR X10, X0
-	PXOR X10, X1
-	PXOR X11, X2
-	PXOR X11, X3
-	PXOR X12, X4
-	PXOR X12, X5
-	PXOR X13, X6
-	PXOR X13, X7
-	PXOR X14, X8
-	PXOR X14, X9
-
-	MOVOU X0, 0(DI)
-	MOVOU X2, 16(DI)
-	MOVOU X4, 32(DI)
-	MOVOU X6, 48(DI)
-	MOVOU X8, 64(DI)
-	MOVOU X1, 80(DI)
-	MOVOU X3, 96(DI)
-	MOVOU X5, 112(DI)
-	MOVOU X7, 128(DI)
-	MOVOU X9, 144(DI)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/curve25519.go b/installer/vendor/golang.org/x/crypto/curve25519/curve25519.go
deleted file mode 100644
index cb8fbc57b9..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/curve25519.go
+++ /dev/null
@@ -1,834 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// We have an implementation in amd64 assembly so this code is only run on
-// non-amd64 platforms. The amd64 assembly does not support gccgo.
-// +build !amd64 gccgo appengine
-
-package curve25519
-
-import (
-	"encoding/binary"
-)
-
-// This code is a port of the public domain, "ref10" implementation of
-// curve25519 from SUPERCOP 20130419 by D. J. Bernstein.
-
-// fieldElement represents an element of the field GF(2^255 - 19). An element
-// t, entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
-// t[3]+2^102 t[4]+...+2^230 t[9]. Bounds on each t[i] vary depending on
-// context.
-type fieldElement [10]int32
-
-func feZero(fe *fieldElement) {
-	for i := range fe {
-		fe[i] = 0
-	}
-}
-
-func feOne(fe *fieldElement) {
-	feZero(fe)
-	fe[0] = 1
-}
-
-func feAdd(dst, a, b *fieldElement) {
-	for i := range dst {
-		dst[i] = a[i] + b[i]
-	}
-}
-
-func feSub(dst, a, b *fieldElement) {
-	for i := range dst {
-		dst[i] = a[i] - b[i]
-	}
-}
-
-func feCopy(dst, src *fieldElement) {
-	for i := range dst {
-		dst[i] = src[i]
-	}
-}
-
-// feCSwap replaces (f,g) with (g,f) if b == 1; replaces (f,g) with (f,g) if b == 0.
-//
-// Preconditions: b in {0,1}.
-func feCSwap(f, g *fieldElement, b int32) {
-	b = -b
-	for i := range f {
-		t := b & (f[i] ^ g[i])
-		f[i] ^= t
-		g[i] ^= t
-	}
-}
-
-// load3 reads a 24-bit, little-endian value from in.
-func load3(in []byte) int64 {
-	var r int64
-	r = int64(in[0])
-	r |= int64(in[1]) << 8
-	r |= int64(in[2]) << 16
-	return r
-}
-
-// load4 reads a 32-bit, little-endian value from in.
-func load4(in []byte) int64 {
-	return int64(binary.LittleEndian.Uint32(in))
-}
-
-func feFromBytes(dst *fieldElement, src *[32]byte) {
-	h0 := load4(src[:])
-	h1 := load3(src[4:]) << 6
-	h2 := load3(src[7:]) << 5
-	h3 := load3(src[10:]) << 3
-	h4 := load3(src[13:]) << 2
-	h5 := load4(src[16:])
-	h6 := load3(src[20:]) << 7
-	h7 := load3(src[23:]) << 5
-	h8 := load3(src[26:]) << 4
-	h9 := load3(src[29:]) << 2
-
-	var carry [10]int64
-	carry[9] = (h9 + 1<<24) >> 25
-	h0 += carry[9] * 19
-	h9 -= carry[9] << 25
-	carry[1] = (h1 + 1<<24) >> 25
-	h2 += carry[1]
-	h1 -= carry[1] << 25
-	carry[3] = (h3 + 1<<24) >> 25
-	h4 += carry[3]
-	h3 -= carry[3] << 25
-	carry[5] = (h5 + 1<<24) >> 25
-	h6 += carry[5]
-	h5 -= carry[5] << 25
-	carry[7] = (h7 + 1<<24) >> 25
-	h8 += carry[7]
-	h7 -= carry[7] << 25
-
-	carry[0] = (h0 + 1<<25) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-	carry[2] = (h2 + 1<<25) >> 26
-	h3 += carry[2]
-	h2 -= carry[2] << 26
-	carry[4] = (h4 + 1<<25) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-	carry[6] = (h6 + 1<<25) >> 26
-	h7 += carry[6]
-	h6 -= carry[6] << 26
-	carry[8] = (h8 + 1<<25) >> 26
-	h9 += carry[8]
-	h8 -= carry[8] << 26
-
-	dst[0] = int32(h0)
-	dst[1] = int32(h1)
-	dst[2] = int32(h2)
-	dst[3] = int32(h3)
-	dst[4] = int32(h4)
-	dst[5] = int32(h5)
-	dst[6] = int32(h6)
-	dst[7] = int32(h7)
-	dst[8] = int32(h8)
-	dst[9] = int32(h9)
-}
-
-// feToBytes marshals h to s.
-// Preconditions:
-//   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Write p=2^255-19; q=floor(h/p).
-// Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
-//
-// Proof:
-//   Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
-//   Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4.
-//
-//   Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
-//   Then 0<y<1.
-//
-//   Write r=h-pq.
-//   Have 0<=r<=p-1=2^255-20.
-//   Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
-//
-//   Write x=r+19(2^-255)r+y.
-//   Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
-//
-//   Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
-//   so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
-func feToBytes(s *[32]byte, h *fieldElement) {
-	var carry [10]int32
-
-	q := (19*h[9] + (1 << 24)) >> 25
-	q = (h[0] + q) >> 26
-	q = (h[1] + q) >> 25
-	q = (h[2] + q) >> 26
-	q = (h[3] + q) >> 25
-	q = (h[4] + q) >> 26
-	q = (h[5] + q) >> 25
-	q = (h[6] + q) >> 26
-	q = (h[7] + q) >> 25
-	q = (h[8] + q) >> 26
-	q = (h[9] + q) >> 25
-
-	// Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20.
-	h[0] += 19 * q
-	// Goal: Output h-2^255 q, which is between 0 and 2^255-20.
-
-	carry[0] = h[0] >> 26
-	h[1] += carry[0]
-	h[0] -= carry[0] << 26
-	carry[1] = h[1] >> 25
-	h[2] += carry[1]
-	h[1] -= carry[1] << 25
-	carry[2] = h[2] >> 26
-	h[3] += carry[2]
-	h[2] -= carry[2] << 26
-	carry[3] = h[3] >> 25
-	h[4] += carry[3]
-	h[3] -= carry[3] << 25
-	carry[4] = h[4] >> 26
-	h[5] += carry[4]
-	h[4] -= carry[4] << 26
-	carry[5] = h[5] >> 25
-	h[6] += carry[5]
-	h[5] -= carry[5] << 25
-	carry[6] = h[6] >> 26
-	h[7] += carry[6]
-	h[6] -= carry[6] << 26
-	carry[7] = h[7] >> 25
-	h[8] += carry[7]
-	h[7] -= carry[7] << 25
-	carry[8] = h[8] >> 26
-	h[9] += carry[8]
-	h[8] -= carry[8] << 26
-	carry[9] = h[9] >> 25
-	h[9] -= carry[9] << 25
-	// h10 = carry9
-
-	// Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
-	// Have h[0]+...+2^230 h[9] between 0 and 2^255-1;
-	// evidently 2^255 h10-2^255 q = 0.
-	// Goal: Output h[0]+...+2^230 h[9].
-
-	s[0] = byte(h[0] >> 0)
-	s[1] = byte(h[0] >> 8)
-	s[2] = byte(h[0] >> 16)
-	s[3] = byte((h[0] >> 24) | (h[1] << 2))
-	s[4] = byte(h[1] >> 6)
-	s[5] = byte(h[1] >> 14)
-	s[6] = byte((h[1] >> 22) | (h[2] << 3))
-	s[7] = byte(h[2] >> 5)
-	s[8] = byte(h[2] >> 13)
-	s[9] = byte((h[2] >> 21) | (h[3] << 5))
-	s[10] = byte(h[3] >> 3)
-	s[11] = byte(h[3] >> 11)
-	s[12] = byte((h[3] >> 19) | (h[4] << 6))
-	s[13] = byte(h[4] >> 2)
-	s[14] = byte(h[4] >> 10)
-	s[15] = byte(h[4] >> 18)
-	s[16] = byte(h[5] >> 0)
-	s[17] = byte(h[5] >> 8)
-	s[18] = byte(h[5] >> 16)
-	s[19] = byte((h[5] >> 24) | (h[6] << 1))
-	s[20] = byte(h[6] >> 7)
-	s[21] = byte(h[6] >> 15)
-	s[22] = byte((h[6] >> 23) | (h[7] << 3))
-	s[23] = byte(h[7] >> 5)
-	s[24] = byte(h[7] >> 13)
-	s[25] = byte((h[7] >> 21) | (h[8] << 4))
-	s[26] = byte(h[8] >> 4)
-	s[27] = byte(h[8] >> 12)
-	s[28] = byte((h[8] >> 20) | (h[9] << 6))
-	s[29] = byte(h[9] >> 2)
-	s[30] = byte(h[9] >> 10)
-	s[31] = byte(h[9] >> 18)
-}
-
-// feMul calculates h = f * g
-// Can overlap h with f or g.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//    |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Notes on implementation strategy:
-//
-// Using schoolbook multiplication.
-// Karatsuba would save a little in some cost models.
-//
-// Most multiplications by 2 and 19 are 32-bit precomputations;
-// cheaper than 64-bit postcomputations.
-//
-// There is one remaining multiplication by 19 in the carry chain;
-// one *19 precomputation can be merged into this,
-// but the resulting data flow is considerably less clean.
-//
-// There are 12 carries below.
-// 10 of them are 2-way parallelizable and vectorizable.
-// Can get away with 11 carries, but then data flow is much deeper.
-//
-// With tighter constraints on inputs can squeeze carries into int32.
-func feMul(h, f, g *fieldElement) {
-	f0 := f[0]
-	f1 := f[1]
-	f2 := f[2]
-	f3 := f[3]
-	f4 := f[4]
-	f5 := f[5]
-	f6 := f[6]
-	f7 := f[7]
-	f8 := f[8]
-	f9 := f[9]
-	g0 := g[0]
-	g1 := g[1]
-	g2 := g[2]
-	g3 := g[3]
-	g4 := g[4]
-	g5 := g[5]
-	g6 := g[6]
-	g7 := g[7]
-	g8 := g[8]
-	g9 := g[9]
-	g1_19 := 19 * g1 // 1.4*2^29
-	g2_19 := 19 * g2 // 1.4*2^30; still ok
-	g3_19 := 19 * g3
-	g4_19 := 19 * g4
-	g5_19 := 19 * g5
-	g6_19 := 19 * g6
-	g7_19 := 19 * g7
-	g8_19 := 19 * g8
-	g9_19 := 19 * g9
-	f1_2 := 2 * f1
-	f3_2 := 2 * f3
-	f5_2 := 2 * f5
-	f7_2 := 2 * f7
-	f9_2 := 2 * f9
-	f0g0 := int64(f0) * int64(g0)
-	f0g1 := int64(f0) * int64(g1)
-	f0g2 := int64(f0) * int64(g2)
-	f0g3 := int64(f0) * int64(g3)
-	f0g4 := int64(f0) * int64(g4)
-	f0g5 := int64(f0) * int64(g5)
-	f0g6 := int64(f0) * int64(g6)
-	f0g7 := int64(f0) * int64(g7)
-	f0g8 := int64(f0) * int64(g8)
-	f0g9 := int64(f0) * int64(g9)
-	f1g0 := int64(f1) * int64(g0)
-	f1g1_2 := int64(f1_2) * int64(g1)
-	f1g2 := int64(f1) * int64(g2)
-	f1g3_2 := int64(f1_2) * int64(g3)
-	f1g4 := int64(f1) * int64(g4)
-	f1g5_2 := int64(f1_2) * int64(g5)
-	f1g6 := int64(f1) * int64(g6)
-	f1g7_2 := int64(f1_2) * int64(g7)
-	f1g8 := int64(f1) * int64(g8)
-	f1g9_38 := int64(f1_2) * int64(g9_19)
-	f2g0 := int64(f2) * int64(g0)
-	f2g1 := int64(f2) * int64(g1)
-	f2g2 := int64(f2) * int64(g2)
-	f2g3 := int64(f2) * int64(g3)
-	f2g4 := int64(f2) * int64(g4)
-	f2g5 := int64(f2) * int64(g5)
-	f2g6 := int64(f2) * int64(g6)
-	f2g7 := int64(f2) * int64(g7)
-	f2g8_19 := int64(f2) * int64(g8_19)
-	f2g9_19 := int64(f2) * int64(g9_19)
-	f3g0 := int64(f3) * int64(g0)
-	f3g1_2 := int64(f3_2) * int64(g1)
-	f3g2 := int64(f3) * int64(g2)
-	f3g3_2 := int64(f3_2) * int64(g3)
-	f3g4 := int64(f3) * int64(g4)
-	f3g5_2 := int64(f3_2) * int64(g5)
-	f3g6 := int64(f3) * int64(g6)
-	f3g7_38 := int64(f3_2) * int64(g7_19)
-	f3g8_19 := int64(f3) * int64(g8_19)
-	f3g9_38 := int64(f3_2) * int64(g9_19)
-	f4g0 := int64(f4) * int64(g0)
-	f4g1 := int64(f4) * int64(g1)
-	f4g2 := int64(f4) * int64(g2)
-	f4g3 := int64(f4) * int64(g3)
-	f4g4 := int64(f4) * int64(g4)
-	f4g5 := int64(f4) * int64(g5)
-	f4g6_19 := int64(f4) * int64(g6_19)
-	f4g7_19 := int64(f4) * int64(g7_19)
-	f4g8_19 := int64(f4) * int64(g8_19)
-	f4g9_19 := int64(f4) * int64(g9_19)
-	f5g0 := int64(f5) * int64(g0)
-	f5g1_2 := int64(f5_2) * int64(g1)
-	f5g2 := int64(f5) * int64(g2)
-	f5g3_2 := int64(f5_2) * int64(g3)
-	f5g4 := int64(f5) * int64(g4)
-	f5g5_38 := int64(f5_2) * int64(g5_19)
-	f5g6_19 := int64(f5) * int64(g6_19)
-	f5g7_38 := int64(f5_2) * int64(g7_19)
-	f5g8_19 := int64(f5) * int64(g8_19)
-	f5g9_38 := int64(f5_2) * int64(g9_19)
-	f6g0 := int64(f6) * int64(g0)
-	f6g1 := int64(f6) * int64(g1)
-	f6g2 := int64(f6) * int64(g2)
-	f6g3 := int64(f6) * int64(g3)
-	f6g4_19 := int64(f6) * int64(g4_19)
-	f6g5_19 := int64(f6) * int64(g5_19)
-	f6g6_19 := int64(f6) * int64(g6_19)
-	f6g7_19 := int64(f6) * int64(g7_19)
-	f6g8_19 := int64(f6) * int64(g8_19)
-	f6g9_19 := int64(f6) * int64(g9_19)
-	f7g0 := int64(f7) * int64(g0)
-	f7g1_2 := int64(f7_2) * int64(g1)
-	f7g2 := int64(f7) * int64(g2)
-	f7g3_38 := int64(f7_2) * int64(g3_19)
-	f7g4_19 := int64(f7) * int64(g4_19)
-	f7g5_38 := int64(f7_2) * int64(g5_19)
-	f7g6_19 := int64(f7) * int64(g6_19)
-	f7g7_38 := int64(f7_2) * int64(g7_19)
-	f7g8_19 := int64(f7) * int64(g8_19)
-	f7g9_38 := int64(f7_2) * int64(g9_19)
-	f8g0 := int64(f8) * int64(g0)
-	f8g1 := int64(f8) * int64(g1)
-	f8g2_19 := int64(f8) * int64(g2_19)
-	f8g3_19 := int64(f8) * int64(g3_19)
-	f8g4_19 := int64(f8) * int64(g4_19)
-	f8g5_19 := int64(f8) * int64(g5_19)
-	f8g6_19 := int64(f8) * int64(g6_19)
-	f8g7_19 := int64(f8) * int64(g7_19)
-	f8g8_19 := int64(f8) * int64(g8_19)
-	f8g9_19 := int64(f8) * int64(g9_19)
-	f9g0 := int64(f9) * int64(g0)
-	f9g1_38 := int64(f9_2) * int64(g1_19)
-	f9g2_19 := int64(f9) * int64(g2_19)
-	f9g3_38 := int64(f9_2) * int64(g3_19)
-	f9g4_19 := int64(f9) * int64(g4_19)
-	f9g5_38 := int64(f9_2) * int64(g5_19)
-	f9g6_19 := int64(f9) * int64(g6_19)
-	f9g7_38 := int64(f9_2) * int64(g7_19)
-	f9g8_19 := int64(f9) * int64(g8_19)
-	f9g9_38 := int64(f9_2) * int64(g9_19)
-	h0 := f0g0 + f1g9_38 + f2g8_19 + f3g7_38 + f4g6_19 + f5g5_38 + f6g4_19 + f7g3_38 + f8g2_19 + f9g1_38
-	h1 := f0g1 + f1g0 + f2g9_19 + f3g8_19 + f4g7_19 + f5g6_19 + f6g5_19 + f7g4_19 + f8g3_19 + f9g2_19
-	h2 := f0g2 + f1g1_2 + f2g0 + f3g9_38 + f4g8_19 + f5g7_38 + f6g6_19 + f7g5_38 + f8g4_19 + f9g3_38
-	h3 := f0g3 + f1g2 + f2g1 + f3g0 + f4g9_19 + f5g8_19 + f6g7_19 + f7g6_19 + f8g5_19 + f9g4_19
-	h4 := f0g4 + f1g3_2 + f2g2 + f3g1_2 + f4g0 + f5g9_38 + f6g8_19 + f7g7_38 + f8g6_19 + f9g5_38
-	h5 := f0g5 + f1g4 + f2g3 + f3g2 + f4g1 + f5g0 + f6g9_19 + f7g8_19 + f8g7_19 + f9g6_19
-	h6 := f0g6 + f1g5_2 + f2g4 + f3g3_2 + f4g2 + f5g1_2 + f6g0 + f7g9_38 + f8g8_19 + f9g7_38
-	h7 := f0g7 + f1g6 + f2g5 + f3g4 + f4g3 + f5g2 + f6g1 + f7g0 + f8g9_19 + f9g8_19
-	h8 := f0g8 + f1g7_2 + f2g6 + f3g5_2 + f4g4 + f5g3_2 + f6g2 + f7g1_2 + f8g0 + f9g9_38
-	h9 := f0g9 + f1g8 + f2g7 + f3g6 + f4g5 + f5g4 + f6g3 + f7g2 + f8g1 + f9g0
-	var carry [10]int64
-
-	// |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38))
-	//   i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8
-	// |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19))
-	//   i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9
-
-	carry[0] = (h0 + (1 << 25)) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-	carry[4] = (h4 + (1 << 25)) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-	// |h0| <= 2^25
-	// |h4| <= 2^25
-	// |h1| <= 1.51*2^58
-	// |h5| <= 1.51*2^58
-
-	carry[1] = (h1 + (1 << 24)) >> 25
-	h2 += carry[1]
-	h1 -= carry[1] << 25
-	carry[5] = (h5 + (1 << 24)) >> 25
-	h6 += carry[5]
-	h5 -= carry[5] << 25
-	// |h1| <= 2^24; from now on fits into int32
-	// |h5| <= 2^24; from now on fits into int32
-	// |h2| <= 1.21*2^59
-	// |h6| <= 1.21*2^59
-
-	carry[2] = (h2 + (1 << 25)) >> 26
-	h3 += carry[2]
-	h2 -= carry[2] << 26
-	carry[6] = (h6 + (1 << 25)) >> 26
-	h7 += carry[6]
-	h6 -= carry[6] << 26
-	// |h2| <= 2^25; from now on fits into int32 unchanged
-	// |h6| <= 2^25; from now on fits into int32 unchanged
-	// |h3| <= 1.51*2^58
-	// |h7| <= 1.51*2^58
-
-	carry[3] = (h3 + (1 << 24)) >> 25
-	h4 += carry[3]
-	h3 -= carry[3] << 25
-	carry[7] = (h7 + (1 << 24)) >> 25
-	h8 += carry[7]
-	h7 -= carry[7] << 25
-	// |h3| <= 2^24; from now on fits into int32 unchanged
-	// |h7| <= 2^24; from now on fits into int32 unchanged
-	// |h4| <= 1.52*2^33
-	// |h8| <= 1.52*2^33
-
-	carry[4] = (h4 + (1 << 25)) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-	carry[8] = (h8 + (1 << 25)) >> 26
-	h9 += carry[8]
-	h8 -= carry[8] << 26
-	// |h4| <= 2^25; from now on fits into int32 unchanged
-	// |h8| <= 2^25; from now on fits into int32 unchanged
-	// |h5| <= 1.01*2^24
-	// |h9| <= 1.51*2^58
-
-	carry[9] = (h9 + (1 << 24)) >> 25
-	h0 += carry[9] * 19
-	h9 -= carry[9] << 25
-	// |h9| <= 2^24; from now on fits into int32 unchanged
-	// |h0| <= 1.8*2^37
-
-	carry[0] = (h0 + (1 << 25)) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-	// |h0| <= 2^25; from now on fits into int32 unchanged
-	// |h1| <= 1.01*2^24
-
-	h[0] = int32(h0)
-	h[1] = int32(h1)
-	h[2] = int32(h2)
-	h[3] = int32(h3)
-	h[4] = int32(h4)
-	h[5] = int32(h5)
-	h[6] = int32(h6)
-	h[7] = int32(h7)
-	h[8] = int32(h8)
-	h[9] = int32(h9)
-}
-
-// feSquare calculates h = f*f. Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func feSquare(h, f *fieldElement) {
-	f0 := f[0]
-	f1 := f[1]
-	f2 := f[2]
-	f3 := f[3]
-	f4 := f[4]
-	f5 := f[5]
-	f6 := f[6]
-	f7 := f[7]
-	f8 := f[8]
-	f9 := f[9]
-	f0_2 := 2 * f0
-	f1_2 := 2 * f1
-	f2_2 := 2 * f2
-	f3_2 := 2 * f3
-	f4_2 := 2 * f4
-	f5_2 := 2 * f5
-	f6_2 := 2 * f6
-	f7_2 := 2 * f7
-	f5_38 := 38 * f5 // 1.31*2^30
-	f6_19 := 19 * f6 // 1.31*2^30
-	f7_38 := 38 * f7 // 1.31*2^30
-	f8_19 := 19 * f8 // 1.31*2^30
-	f9_38 := 38 * f9 // 1.31*2^30
-	f0f0 := int64(f0) * int64(f0)
-	f0f1_2 := int64(f0_2) * int64(f1)
-	f0f2_2 := int64(f0_2) * int64(f2)
-	f0f3_2 := int64(f0_2) * int64(f3)
-	f0f4_2 := int64(f0_2) * int64(f4)
-	f0f5_2 := int64(f0_2) * int64(f5)
-	f0f6_2 := int64(f0_2) * int64(f6)
-	f0f7_2 := int64(f0_2) * int64(f7)
-	f0f8_2 := int64(f0_2) * int64(f8)
-	f0f9_2 := int64(f0_2) * int64(f9)
-	f1f1_2 := int64(f1_2) * int64(f1)
-	f1f2_2 := int64(f1_2) * int64(f2)
-	f1f3_4 := int64(f1_2) * int64(f3_2)
-	f1f4_2 := int64(f1_2) * int64(f4)
-	f1f5_4 := int64(f1_2) * int64(f5_2)
-	f1f6_2 := int64(f1_2) * int64(f6)
-	f1f7_4 := int64(f1_2) * int64(f7_2)
-	f1f8_2 := int64(f1_2) * int64(f8)
-	f1f9_76 := int64(f1_2) * int64(f9_38)
-	f2f2 := int64(f2) * int64(f2)
-	f2f3_2 := int64(f2_2) * int64(f3)
-	f2f4_2 := int64(f2_2) * int64(f4)
-	f2f5_2 := int64(f2_2) * int64(f5)
-	f2f6_2 := int64(f2_2) * int64(f6)
-	f2f7_2 := int64(f2_2) * int64(f7)
-	f2f8_38 := int64(f2_2) * int64(f8_19)
-	f2f9_38 := int64(f2) * int64(f9_38)
-	f3f3_2 := int64(f3_2) * int64(f3)
-	f3f4_2 := int64(f3_2) * int64(f4)
-	f3f5_4 := int64(f3_2) * int64(f5_2)
-	f3f6_2 := int64(f3_2) * int64(f6)
-	f3f7_76 := int64(f3_2) * int64(f7_38)
-	f3f8_38 := int64(f3_2) * int64(f8_19)
-	f3f9_76 := int64(f3_2) * int64(f9_38)
-	f4f4 := int64(f4) * int64(f4)
-	f4f5_2 := int64(f4_2) * int64(f5)
-	f4f6_38 := int64(f4_2) * int64(f6_19)
-	f4f7_38 := int64(f4) * int64(f7_38)
-	f4f8_38 := int64(f4_2) * int64(f8_19)
-	f4f9_38 := int64(f4) * int64(f9_38)
-	f5f5_38 := int64(f5) * int64(f5_38)
-	f5f6_38 := int64(f5_2) * int64(f6_19)
-	f5f7_76 := int64(f5_2) * int64(f7_38)
-	f5f8_38 := int64(f5_2) * int64(f8_19)
-	f5f9_76 := int64(f5_2) * int64(f9_38)
-	f6f6_19 := int64(f6) * int64(f6_19)
-	f6f7_38 := int64(f6) * int64(f7_38)
-	f6f8_38 := int64(f6_2) * int64(f8_19)
-	f6f9_38 := int64(f6) * int64(f9_38)
-	f7f7_38 := int64(f7) * int64(f7_38)
-	f7f8_38 := int64(f7_2) * int64(f8_19)
-	f7f9_76 := int64(f7_2) * int64(f9_38)
-	f8f8_19 := int64(f8) * int64(f8_19)
-	f8f9_38 := int64(f8) * int64(f9_38)
-	f9f9_38 := int64(f9) * int64(f9_38)
-	h0 := f0f0 + f1f9_76 + f2f8_38 + f3f7_76 + f4f6_38 + f5f5_38
-	h1 := f0f1_2 + f2f9_38 + f3f8_38 + f4f7_38 + f5f6_38
-	h2 := f0f2_2 + f1f1_2 + f3f9_76 + f4f8_38 + f5f7_76 + f6f6_19
-	h3 := f0f3_2 + f1f2_2 + f4f9_38 + f5f8_38 + f6f7_38
-	h4 := f0f4_2 + f1f3_4 + f2f2 + f5f9_76 + f6f8_38 + f7f7_38
-	h5 := f0f5_2 + f1f4_2 + f2f3_2 + f6f9_38 + f7f8_38
-	h6 := f0f6_2 + f1f5_4 + f2f4_2 + f3f3_2 + f7f9_76 + f8f8_19
-	h7 := f0f7_2 + f1f6_2 + f2f5_2 + f3f4_2 + f8f9_38
-	h8 := f0f8_2 + f1f7_4 + f2f6_2 + f3f5_4 + f4f4 + f9f9_38
-	h9 := f0f9_2 + f1f8_2 + f2f7_2 + f3f6_2 + f4f5_2
-	var carry [10]int64
-
-	carry[0] = (h0 + (1 << 25)) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-	carry[4] = (h4 + (1 << 25)) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-
-	carry[1] = (h1 + (1 << 24)) >> 25
-	h2 += carry[1]
-	h1 -= carry[1] << 25
-	carry[5] = (h5 + (1 << 24)) >> 25
-	h6 += carry[5]
-	h5 -= carry[5] << 25
-
-	carry[2] = (h2 + (1 << 25)) >> 26
-	h3 += carry[2]
-	h2 -= carry[2] << 26
-	carry[6] = (h6 + (1 << 25)) >> 26
-	h7 += carry[6]
-	h6 -= carry[6] << 26
-
-	carry[3] = (h3 + (1 << 24)) >> 25
-	h4 += carry[3]
-	h3 -= carry[3] << 25
-	carry[7] = (h7 + (1 << 24)) >> 25
-	h8 += carry[7]
-	h7 -= carry[7] << 25
-
-	carry[4] = (h4 + (1 << 25)) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-	carry[8] = (h8 + (1 << 25)) >> 26
-	h9 += carry[8]
-	h8 -= carry[8] << 26
-
-	carry[9] = (h9 + (1 << 24)) >> 25
-	h0 += carry[9] * 19
-	h9 -= carry[9] << 25
-
-	carry[0] = (h0 + (1 << 25)) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-
-	h[0] = int32(h0)
-	h[1] = int32(h1)
-	h[2] = int32(h2)
-	h[3] = int32(h3)
-	h[4] = int32(h4)
-	h[5] = int32(h5)
-	h[6] = int32(h6)
-	h[7] = int32(h7)
-	h[8] = int32(h8)
-	h[9] = int32(h9)
-}
-
-// feMul121666 calculates h = f * 121666. Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func feMul121666(h, f *fieldElement) {
-	h0 := int64(f[0]) * 121666
-	h1 := int64(f[1]) * 121666
-	h2 := int64(f[2]) * 121666
-	h3 := int64(f[3]) * 121666
-	h4 := int64(f[4]) * 121666
-	h5 := int64(f[5]) * 121666
-	h6 := int64(f[6]) * 121666
-	h7 := int64(f[7]) * 121666
-	h8 := int64(f[8]) * 121666
-	h9 := int64(f[9]) * 121666
-	var carry [10]int64
-
-	carry[9] = (h9 + (1 << 24)) >> 25
-	h0 += carry[9] * 19
-	h9 -= carry[9] << 25
-	carry[1] = (h1 + (1 << 24)) >> 25
-	h2 += carry[1]
-	h1 -= carry[1] << 25
-	carry[3] = (h3 + (1 << 24)) >> 25
-	h4 += carry[3]
-	h3 -= carry[3] << 25
-	carry[5] = (h5 + (1 << 24)) >> 25
-	h6 += carry[5]
-	h5 -= carry[5] << 25
-	carry[7] = (h7 + (1 << 24)) >> 25
-	h8 += carry[7]
-	h7 -= carry[7] << 25
-
-	carry[0] = (h0 + (1 << 25)) >> 26
-	h1 += carry[0]
-	h0 -= carry[0] << 26
-	carry[2] = (h2 + (1 << 25)) >> 26
-	h3 += carry[2]
-	h2 -= carry[2] << 26
-	carry[4] = (h4 + (1 << 25)) >> 26
-	h5 += carry[4]
-	h4 -= carry[4] << 26
-	carry[6] = (h6 + (1 << 25)) >> 26
-	h7 += carry[6]
-	h6 -= carry[6] << 26
-	carry[8] = (h8 + (1 << 25)) >> 26
-	h9 += carry[8]
-	h8 -= carry[8] << 26
-
-	h[0] = int32(h0)
-	h[1] = int32(h1)
-	h[2] = int32(h2)
-	h[3] = int32(h3)
-	h[4] = int32(h4)
-	h[5] = int32(h5)
-	h[6] = int32(h6)
-	h[7] = int32(h7)
-	h[8] = int32(h8)
-	h[9] = int32(h9)
-}
-
-// feInvert sets out = z^-1.
-func feInvert(out, z *fieldElement) {
-	var t0, t1, t2, t3 fieldElement
-	var i int
-
-	feSquare(&t0, z)
-	for i = 1; i < 1; i++ {
-		feSquare(&t0, &t0)
-	}
-	feSquare(&t1, &t0)
-	for i = 1; i < 2; i++ {
-		feSquare(&t1, &t1)
-	}
-	feMul(&t1, z, &t1)
-	feMul(&t0, &t0, &t1)
-	feSquare(&t2, &t0)
-	for i = 1; i < 1; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t1, &t1, &t2)
-	feSquare(&t2, &t1)
-	for i = 1; i < 5; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t1, &t2, &t1)
-	feSquare(&t2, &t1)
-	for i = 1; i < 10; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t2, &t2, &t1)
-	feSquare(&t3, &t2)
-	for i = 1; i < 20; i++ {
-		feSquare(&t3, &t3)
-	}
-	feMul(&t2, &t3, &t2)
-	feSquare(&t2, &t2)
-	for i = 1; i < 10; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t1, &t2, &t1)
-	feSquare(&t2, &t1)
-	for i = 1; i < 50; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t2, &t2, &t1)
-	feSquare(&t3, &t2)
-	for i = 1; i < 100; i++ {
-		feSquare(&t3, &t3)
-	}
-	feMul(&t2, &t3, &t2)
-	feSquare(&t2, &t2)
-	for i = 1; i < 50; i++ {
-		feSquare(&t2, &t2)
-	}
-	feMul(&t1, &t2, &t1)
-	feSquare(&t1, &t1)
-	for i = 1; i < 5; i++ {
-		feSquare(&t1, &t1)
-	}
-	feMul(out, &t1, &t0)
-}
-
-func scalarMult(out, in, base *[32]byte) {
-	var e [32]byte
-
-	copy(e[:], in[:])
-	e[0] &= 248
-	e[31] &= 127
-	e[31] |= 64
-
-	var x1, x2, z2, x3, z3, tmp0, tmp1 fieldElement
-	feFromBytes(&x1, base)
-	feOne(&x2)
-	feCopy(&x3, &x1)
-	feOne(&z3)
-
-	swap := int32(0)
-	for pos := 254; pos >= 0; pos-- {
-		b := e[pos/8] >> uint(pos&7)
-		b &= 1
-		swap ^= int32(b)
-		feCSwap(&x2, &x3, swap)
-		feCSwap(&z2, &z3, swap)
-		swap = int32(b)
-
-		feSub(&tmp0, &x3, &z3)
-		feSub(&tmp1, &x2, &z2)
-		feAdd(&x2, &x2, &z2)
-		feAdd(&z2, &x3, &z3)
-		feMul(&z3, &tmp0, &x2)
-		feMul(&z2, &z2, &tmp1)
-		feSquare(&tmp0, &tmp1)
-		feSquare(&tmp1, &x2)
-		feAdd(&x3, &z3, &z2)
-		feSub(&z2, &z3, &z2)
-		feMul(&x2, &tmp1, &tmp0)
-		feSub(&tmp1, &tmp1, &tmp0)
-		feSquare(&z2, &z2)
-		feMul121666(&z3, &tmp1)
-		feSquare(&x3, &x3)
-		feAdd(&tmp0, &tmp0, &z3)
-		feMul(&z3, &x1, &z2)
-		feMul(&z2, &tmp1, &tmp0)
-	}
-
-	feCSwap(&x2, &x3, swap)
-	feCSwap(&z2, &z3, swap)
-
-	feInvert(&z2, &z2)
-	feMul(&x2, &x2, &z2)
-	feToBytes(out, &x2)
-}
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/curve25519_test.go b/installer/vendor/golang.org/x/crypto/curve25519/curve25519_test.go
deleted file mode 100644
index 051a8301f0..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/curve25519_test.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package curve25519
-
-import (
-	"fmt"
-	"testing"
-)
-
-const expectedHex = "89161fde887b2b53de549af483940106ecc114d6982daa98256de23bdf77661a"
-
-func TestBaseScalarMult(t *testing.T) {
-	var a, b [32]byte
-	in := &a
-	out := &b
-	a[0] = 1
-
-	for i := 0; i < 200; i++ {
-		ScalarBaseMult(out, in)
-		in, out = out, in
-	}
-
-	result := fmt.Sprintf("%x", in[:])
-	if result != expectedHex {
-		t.Errorf("incorrect result: got %s, want %s", result, expectedHex)
-	}
-}
-
-func BenchmarkScalarBaseMult(b *testing.B) {
-	var in, out [32]byte
-	in[0] = 1
-
-	b.SetBytes(32)
-	for i := 0; i < b.N; i++ {
-		ScalarBaseMult(&out, &in)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/doc.go b/installer/vendor/golang.org/x/crypto/curve25519/doc.go
deleted file mode 100644
index da9b10d9c1..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/doc.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package curve25519 provides an implementation of scalar multiplication on
-// the elliptic curve known as curve25519. See https://cr.yp.to/ecdh.html
-package curve25519 // import "golang.org/x/crypto/curve25519"
-
-// basePoint is the x coordinate of the generator of the curve.
-var basePoint = [32]byte{9, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
-
-// ScalarMult sets dst to the product in*base where dst and base are the x
-// coordinates of group points and all values are in little-endian form.
-func ScalarMult(dst, in, base *[32]byte) {
-	scalarMult(dst, in, base)
-}
-
-// ScalarBaseMult sets dst to the product in*base where dst and base are the x
-// coordinates of group points, base is the standard generator and all values
-// are in little-endian form.
-func ScalarBaseMult(dst, in *[32]byte) {
-	ScalarMult(dst, in, &basePoint)
-}
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/freeze_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/freeze_amd64.s
deleted file mode 100644
index 390816106e..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/freeze_amd64.s
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-#include "const_amd64.h"
-
-// func freeze(inout *[5]uint64)
-TEXT ·freeze(SB),7,$0-8
-	MOVQ inout+0(FP), DI
-
-	MOVQ 0(DI),SI
-	MOVQ 8(DI),DX
-	MOVQ 16(DI),CX
-	MOVQ 24(DI),R8
-	MOVQ 32(DI),R9
-	MOVQ $REDMASK51,AX
-	MOVQ AX,R10
-	SUBQ $18,R10
-	MOVQ $3,R11
-REDUCELOOP:
-	MOVQ SI,R12
-	SHRQ $51,R12
-	ANDQ AX,SI
-	ADDQ R12,DX
-	MOVQ DX,R12
-	SHRQ $51,R12
-	ANDQ AX,DX
-	ADDQ R12,CX
-	MOVQ CX,R12
-	SHRQ $51,R12
-	ANDQ AX,CX
-	ADDQ R12,R8
-	MOVQ R8,R12
-	SHRQ $51,R12
-	ANDQ AX,R8
-	ADDQ R12,R9
-	MOVQ R9,R12
-	SHRQ $51,R12
-	ANDQ AX,R9
-	IMUL3Q $19,R12,R12
-	ADDQ R12,SI
-	SUBQ $1,R11
-	JA REDUCELOOP
-	MOVQ $1,R12
-	CMPQ R10,SI
-	CMOVQLT R11,R12
-	CMPQ AX,DX
-	CMOVQNE R11,R12
-	CMPQ AX,CX
-	CMOVQNE R11,R12
-	CMPQ AX,R8
-	CMOVQNE R11,R12
-	CMPQ AX,R9
-	CMOVQNE R11,R12
-	NEGQ R12
-	ANDQ R12,AX
-	ANDQ R12,R10
-	SUBQ R10,SI
-	SUBQ AX,DX
-	SUBQ AX,CX
-	SUBQ AX,R8
-	SUBQ AX,R9
-	MOVQ SI,0(DI)
-	MOVQ DX,8(DI)
-	MOVQ CX,16(DI)
-	MOVQ R8,24(DI)
-	MOVQ R9,32(DI)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
deleted file mode 100644
index 9e9040b250..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/ladderstep_amd64.s
+++ /dev/null
@@ -1,1377 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-#include "const_amd64.h"
-
-// func ladderstep(inout *[5][5]uint64)
-TEXT ·ladderstep(SB),0,$296-8
-	MOVQ inout+0(FP),DI
-
-	MOVQ 40(DI),SI
-	MOVQ 48(DI),DX
-	MOVQ 56(DI),CX
-	MOVQ 64(DI),R8
-	MOVQ 72(DI),R9
-	MOVQ SI,AX
-	MOVQ DX,R10
-	MOVQ CX,R11
-	MOVQ R8,R12
-	MOVQ R9,R13
-	ADDQ ·_2P0(SB),AX
-	ADDQ ·_2P1234(SB),R10
-	ADDQ ·_2P1234(SB),R11
-	ADDQ ·_2P1234(SB),R12
-	ADDQ ·_2P1234(SB),R13
-	ADDQ 80(DI),SI
-	ADDQ 88(DI),DX
-	ADDQ 96(DI),CX
-	ADDQ 104(DI),R8
-	ADDQ 112(DI),R9
-	SUBQ 80(DI),AX
-	SUBQ 88(DI),R10
-	SUBQ 96(DI),R11
-	SUBQ 104(DI),R12
-	SUBQ 112(DI),R13
-	MOVQ SI,0(SP)
-	MOVQ DX,8(SP)
-	MOVQ CX,16(SP)
-	MOVQ R8,24(SP)
-	MOVQ R9,32(SP)
-	MOVQ AX,40(SP)
-	MOVQ R10,48(SP)
-	MOVQ R11,56(SP)
-	MOVQ R12,64(SP)
-	MOVQ R13,72(SP)
-	MOVQ 40(SP),AX
-	MULQ 40(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 40(SP),AX
-	SHLQ $1,AX
-	MULQ 48(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 40(SP),AX
-	SHLQ $1,AX
-	MULQ 56(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 40(SP),AX
-	SHLQ $1,AX
-	MULQ 64(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 40(SP),AX
-	SHLQ $1,AX
-	MULQ 72(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 48(SP),AX
-	MULQ 48(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 48(SP),AX
-	SHLQ $1,AX
-	MULQ 56(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 48(SP),AX
-	SHLQ $1,AX
-	MULQ 64(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 48(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 56(SP),AX
-	MULQ 56(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 56(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 64(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 56(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 64(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 64(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 64(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 72(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	ANDQ DX,SI
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ADDQ R10,CX
-	ANDQ DX,R8
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ADDQ R12,CX
-	ANDQ DX,R9
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ADDQ R14,CX
-	ANDQ DX,AX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,80(SP)
-	MOVQ R8,88(SP)
-	MOVQ R9,96(SP)
-	MOVQ AX,104(SP)
-	MOVQ R10,112(SP)
-	MOVQ 0(SP),AX
-	MULQ 0(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 0(SP),AX
-	SHLQ $1,AX
-	MULQ 8(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 0(SP),AX
-	SHLQ $1,AX
-	MULQ 16(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 0(SP),AX
-	SHLQ $1,AX
-	MULQ 24(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 0(SP),AX
-	SHLQ $1,AX
-	MULQ 32(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 8(SP),AX
-	MULQ 8(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SP),AX
-	SHLQ $1,AX
-	MULQ 16(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 8(SP),AX
-	SHLQ $1,AX
-	MULQ 24(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 8(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 16(SP),AX
-	MULQ 16(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 16(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 24(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 16(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 24(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 24(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 24(SP),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 32(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	ANDQ DX,SI
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ADDQ R10,CX
-	ANDQ DX,R8
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ADDQ R12,CX
-	ANDQ DX,R9
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ADDQ R14,CX
-	ANDQ DX,AX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,120(SP)
-	MOVQ R8,128(SP)
-	MOVQ R9,136(SP)
-	MOVQ AX,144(SP)
-	MOVQ R10,152(SP)
-	MOVQ SI,SI
-	MOVQ R8,DX
-	MOVQ R9,CX
-	MOVQ AX,R8
-	MOVQ R10,R9
-	ADDQ ·_2P0(SB),SI
-	ADDQ ·_2P1234(SB),DX
-	ADDQ ·_2P1234(SB),CX
-	ADDQ ·_2P1234(SB),R8
-	ADDQ ·_2P1234(SB),R9
-	SUBQ 80(SP),SI
-	SUBQ 88(SP),DX
-	SUBQ 96(SP),CX
-	SUBQ 104(SP),R8
-	SUBQ 112(SP),R9
-	MOVQ SI,160(SP)
-	MOVQ DX,168(SP)
-	MOVQ CX,176(SP)
-	MOVQ R8,184(SP)
-	MOVQ R9,192(SP)
-	MOVQ 120(DI),SI
-	MOVQ 128(DI),DX
-	MOVQ 136(DI),CX
-	MOVQ 144(DI),R8
-	MOVQ 152(DI),R9
-	MOVQ SI,AX
-	MOVQ DX,R10
-	MOVQ CX,R11
-	MOVQ R8,R12
-	MOVQ R9,R13
-	ADDQ ·_2P0(SB),AX
-	ADDQ ·_2P1234(SB),R10
-	ADDQ ·_2P1234(SB),R11
-	ADDQ ·_2P1234(SB),R12
-	ADDQ ·_2P1234(SB),R13
-	ADDQ 160(DI),SI
-	ADDQ 168(DI),DX
-	ADDQ 176(DI),CX
-	ADDQ 184(DI),R8
-	ADDQ 192(DI),R9
-	SUBQ 160(DI),AX
-	SUBQ 168(DI),R10
-	SUBQ 176(DI),R11
-	SUBQ 184(DI),R12
-	SUBQ 192(DI),R13
-	MOVQ SI,200(SP)
-	MOVQ DX,208(SP)
-	MOVQ CX,216(SP)
-	MOVQ R8,224(SP)
-	MOVQ R9,232(SP)
-	MOVQ AX,240(SP)
-	MOVQ R10,248(SP)
-	MOVQ R11,256(SP)
-	MOVQ R12,264(SP)
-	MOVQ R13,272(SP)
-	MOVQ 224(SP),SI
-	IMUL3Q $19,SI,AX
-	MOVQ AX,280(SP)
-	MULQ 56(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 232(SP),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,288(SP)
-	MULQ 48(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 200(SP),AX
-	MULQ 40(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 200(SP),AX
-	MULQ 48(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 200(SP),AX
-	MULQ 56(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 200(SP),AX
-	MULQ 64(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 200(SP),AX
-	MULQ 72(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 208(SP),AX
-	MULQ 40(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 208(SP),AX
-	MULQ 48(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 208(SP),AX
-	MULQ 56(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 208(SP),AX
-	MULQ 64(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 208(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 216(SP),AX
-	MULQ 40(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 216(SP),AX
-	MULQ 48(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 216(SP),AX
-	MULQ 56(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 216(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 64(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 216(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 72(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 224(SP),AX
-	MULQ 40(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 224(SP),AX
-	MULQ 48(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 280(SP),AX
-	MULQ 64(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 280(SP),AX
-	MULQ 72(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 232(SP),AX
-	MULQ 40(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 288(SP),AX
-	MULQ 56(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 288(SP),AX
-	MULQ 64(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 288(SP),AX
-	MULQ 72(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ANDQ DX,SI
-	ADDQ R10,CX
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ANDQ DX,R8
-	ADDQ R12,CX
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ANDQ DX,R9
-	ADDQ R14,CX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	ANDQ DX,AX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,40(SP)
-	MOVQ R8,48(SP)
-	MOVQ R9,56(SP)
-	MOVQ AX,64(SP)
-	MOVQ R10,72(SP)
-	MOVQ 264(SP),SI
-	IMUL3Q $19,SI,AX
-	MOVQ AX,200(SP)
-	MULQ 16(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 272(SP),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,208(SP)
-	MULQ 8(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 240(SP),AX
-	MULQ 0(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 240(SP),AX
-	MULQ 8(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 240(SP),AX
-	MULQ 16(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 240(SP),AX
-	MULQ 24(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 240(SP),AX
-	MULQ 32(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 248(SP),AX
-	MULQ 0(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 248(SP),AX
-	MULQ 8(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 248(SP),AX
-	MULQ 16(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 248(SP),AX
-	MULQ 24(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 248(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 256(SP),AX
-	MULQ 0(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 256(SP),AX
-	MULQ 8(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 256(SP),AX
-	MULQ 16(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 256(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 24(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 256(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 264(SP),AX
-	MULQ 0(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 264(SP),AX
-	MULQ 8(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 200(SP),AX
-	MULQ 24(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 200(SP),AX
-	MULQ 32(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 272(SP),AX
-	MULQ 0(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 208(SP),AX
-	MULQ 16(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 208(SP),AX
-	MULQ 24(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 208(SP),AX
-	MULQ 32(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ANDQ DX,SI
-	ADDQ R10,CX
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ANDQ DX,R8
-	ADDQ R12,CX
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ANDQ DX,R9
-	ADDQ R14,CX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	ANDQ DX,AX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,DX
-	MOVQ R8,CX
-	MOVQ R9,R11
-	MOVQ AX,R12
-	MOVQ R10,R13
-	ADDQ ·_2P0(SB),DX
-	ADDQ ·_2P1234(SB),CX
-	ADDQ ·_2P1234(SB),R11
-	ADDQ ·_2P1234(SB),R12
-	ADDQ ·_2P1234(SB),R13
-	ADDQ 40(SP),SI
-	ADDQ 48(SP),R8
-	ADDQ 56(SP),R9
-	ADDQ 64(SP),AX
-	ADDQ 72(SP),R10
-	SUBQ 40(SP),DX
-	SUBQ 48(SP),CX
-	SUBQ 56(SP),R11
-	SUBQ 64(SP),R12
-	SUBQ 72(SP),R13
-	MOVQ SI,120(DI)
-	MOVQ R8,128(DI)
-	MOVQ R9,136(DI)
-	MOVQ AX,144(DI)
-	MOVQ R10,152(DI)
-	MOVQ DX,160(DI)
-	MOVQ CX,168(DI)
-	MOVQ R11,176(DI)
-	MOVQ R12,184(DI)
-	MOVQ R13,192(DI)
-	MOVQ 120(DI),AX
-	MULQ 120(DI)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 120(DI),AX
-	SHLQ $1,AX
-	MULQ 128(DI)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 120(DI),AX
-	SHLQ $1,AX
-	MULQ 136(DI)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 120(DI),AX
-	SHLQ $1,AX
-	MULQ 144(DI)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 120(DI),AX
-	SHLQ $1,AX
-	MULQ 152(DI)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 128(DI),AX
-	MULQ 128(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 128(DI),AX
-	SHLQ $1,AX
-	MULQ 136(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 128(DI),AX
-	SHLQ $1,AX
-	MULQ 144(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 128(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 152(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 136(DI),AX
-	MULQ 136(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 136(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 144(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 136(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 152(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 144(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 144(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 144(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 152(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 152(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 152(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	ANDQ DX,SI
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ADDQ R10,CX
-	ANDQ DX,R8
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ADDQ R12,CX
-	ANDQ DX,R9
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ADDQ R14,CX
-	ANDQ DX,AX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,120(DI)
-	MOVQ R8,128(DI)
-	MOVQ R9,136(DI)
-	MOVQ AX,144(DI)
-	MOVQ R10,152(DI)
-	MOVQ 160(DI),AX
-	MULQ 160(DI)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 160(DI),AX
-	SHLQ $1,AX
-	MULQ 168(DI)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 160(DI),AX
-	SHLQ $1,AX
-	MULQ 176(DI)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 160(DI),AX
-	SHLQ $1,AX
-	MULQ 184(DI)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 160(DI),AX
-	SHLQ $1,AX
-	MULQ 192(DI)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 168(DI),AX
-	MULQ 168(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 168(DI),AX
-	SHLQ $1,AX
-	MULQ 176(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 168(DI),AX
-	SHLQ $1,AX
-	MULQ 184(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 168(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 192(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 176(DI),AX
-	MULQ 176(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 176(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 184(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 176(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 192(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 184(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 184(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 184(DI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 192(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 192(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 192(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	ANDQ DX,SI
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ADDQ R10,CX
-	ANDQ DX,R8
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ADDQ R12,CX
-	ANDQ DX,R9
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ADDQ R14,CX
-	ANDQ DX,AX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,160(DI)
-	MOVQ R8,168(DI)
-	MOVQ R9,176(DI)
-	MOVQ AX,184(DI)
-	MOVQ R10,192(DI)
-	MOVQ 184(DI),SI
-	IMUL3Q $19,SI,AX
-	MOVQ AX,0(SP)
-	MULQ 16(DI)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 192(DI),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,8(SP)
-	MULQ 8(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 160(DI),AX
-	MULQ 0(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 160(DI),AX
-	MULQ 8(DI)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 160(DI),AX
-	MULQ 16(DI)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 160(DI),AX
-	MULQ 24(DI)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 160(DI),AX
-	MULQ 32(DI)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 168(DI),AX
-	MULQ 0(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 168(DI),AX
-	MULQ 8(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 168(DI),AX
-	MULQ 16(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 168(DI),AX
-	MULQ 24(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 168(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 176(DI),AX
-	MULQ 0(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 176(DI),AX
-	MULQ 8(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 176(DI),AX
-	MULQ 16(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 176(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 24(DI)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 176(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 184(DI),AX
-	MULQ 0(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 184(DI),AX
-	MULQ 8(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 0(SP),AX
-	MULQ 24(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 0(SP),AX
-	MULQ 32(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 192(DI),AX
-	MULQ 0(DI)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 8(SP),AX
-	MULQ 16(DI)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 8(SP),AX
-	MULQ 24(DI)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SP),AX
-	MULQ 32(DI)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ANDQ DX,SI
-	ADDQ R10,CX
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ANDQ DX,R8
-	ADDQ R12,CX
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ANDQ DX,R9
-	ADDQ R14,CX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	ANDQ DX,AX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,160(DI)
-	MOVQ R8,168(DI)
-	MOVQ R9,176(DI)
-	MOVQ AX,184(DI)
-	MOVQ R10,192(DI)
-	MOVQ 144(SP),SI
-	IMUL3Q $19,SI,AX
-	MOVQ AX,0(SP)
-	MULQ 96(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 152(SP),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,8(SP)
-	MULQ 88(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 120(SP),AX
-	MULQ 80(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 120(SP),AX
-	MULQ 88(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 120(SP),AX
-	MULQ 96(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 120(SP),AX
-	MULQ 104(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 120(SP),AX
-	MULQ 112(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 128(SP),AX
-	MULQ 80(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 128(SP),AX
-	MULQ 88(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 128(SP),AX
-	MULQ 96(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 128(SP),AX
-	MULQ 104(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 128(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 112(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 136(SP),AX
-	MULQ 80(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 136(SP),AX
-	MULQ 88(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 136(SP),AX
-	MULQ 96(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 136(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 104(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 136(SP),DX
-	IMUL3Q $19,DX,AX
-	MULQ 112(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 144(SP),AX
-	MULQ 80(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 144(SP),AX
-	MULQ 88(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 0(SP),AX
-	MULQ 104(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 0(SP),AX
-	MULQ 112(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 152(SP),AX
-	MULQ 80(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 8(SP),AX
-	MULQ 96(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 8(SP),AX
-	MULQ 104(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SP),AX
-	MULQ 112(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ANDQ DX,SI
-	ADDQ R10,CX
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ANDQ DX,R8
-	ADDQ R12,CX
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ANDQ DX,R9
-	ADDQ R14,CX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	ANDQ DX,AX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,40(DI)
-	MOVQ R8,48(DI)
-	MOVQ R9,56(DI)
-	MOVQ AX,64(DI)
-	MOVQ R10,72(DI)
-	MOVQ 160(SP),AX
-	MULQ ·_121666_213(SB)
-	SHRQ $13,AX
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 168(SP),AX
-	MULQ ·_121666_213(SB)
-	SHRQ $13,AX
-	ADDQ AX,CX
-	MOVQ DX,R8
-	MOVQ 176(SP),AX
-	MULQ ·_121666_213(SB)
-	SHRQ $13,AX
-	ADDQ AX,R8
-	MOVQ DX,R9
-	MOVQ 184(SP),AX
-	MULQ ·_121666_213(SB)
-	SHRQ $13,AX
-	ADDQ AX,R9
-	MOVQ DX,R10
-	MOVQ 192(SP),AX
-	MULQ ·_121666_213(SB)
-	SHRQ $13,AX
-	ADDQ AX,R10
-	IMUL3Q $19,DX,DX
-	ADDQ DX,SI
-	ADDQ 80(SP),SI
-	ADDQ 88(SP),CX
-	ADDQ 96(SP),R8
-	ADDQ 104(SP),R9
-	ADDQ 112(SP),R10
-	MOVQ SI,80(DI)
-	MOVQ CX,88(DI)
-	MOVQ R8,96(DI)
-	MOVQ R9,104(DI)
-	MOVQ R10,112(DI)
-	MOVQ 104(DI),SI
-	IMUL3Q $19,SI,AX
-	MOVQ AX,0(SP)
-	MULQ 176(SP)
-	MOVQ AX,SI
-	MOVQ DX,CX
-	MOVQ 112(DI),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,8(SP)
-	MULQ 168(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 80(DI),AX
-	MULQ 160(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 80(DI),AX
-	MULQ 168(SP)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 80(DI),AX
-	MULQ 176(SP)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 80(DI),AX
-	MULQ 184(SP)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 80(DI),AX
-	MULQ 192(SP)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 88(DI),AX
-	MULQ 160(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 88(DI),AX
-	MULQ 168(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 88(DI),AX
-	MULQ 176(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 88(DI),AX
-	MULQ 184(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 88(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 192(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 96(DI),AX
-	MULQ 160(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 96(DI),AX
-	MULQ 168(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 96(DI),AX
-	MULQ 176(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 96(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 184(SP)
-	ADDQ AX,SI
-	ADCQ DX,CX
-	MOVQ 96(DI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 192(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 104(DI),AX
-	MULQ 160(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 104(DI),AX
-	MULQ 168(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 0(SP),AX
-	MULQ 184(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 0(SP),AX
-	MULQ 192(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 112(DI),AX
-	MULQ 160(SP)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 8(SP),AX
-	MULQ 176(SP)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 8(SP),AX
-	MULQ 184(SP)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SP),AX
-	MULQ 192(SP)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ $REDMASK51,DX
-	SHLQ $13,CX:SI
-	ANDQ DX,SI
-	SHLQ $13,R9:R8
-	ANDQ DX,R8
-	ADDQ CX,R8
-	SHLQ $13,R11:R10
-	ANDQ DX,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ DX,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ DX,R14
-	ADDQ R13,R14
-	IMUL3Q $19,R15,CX
-	ADDQ CX,SI
-	MOVQ SI,CX
-	SHRQ $51,CX
-	ADDQ R8,CX
-	MOVQ CX,R8
-	SHRQ $51,CX
-	ANDQ DX,SI
-	ADDQ R10,CX
-	MOVQ CX,R9
-	SHRQ $51,CX
-	ANDQ DX,R8
-	ADDQ R12,CX
-	MOVQ CX,AX
-	SHRQ $51,CX
-	ANDQ DX,R9
-	ADDQ R14,CX
-	MOVQ CX,R10
-	SHRQ $51,CX
-	ANDQ DX,AX
-	IMUL3Q $19,CX,CX
-	ADDQ CX,SI
-	ANDQ DX,R10
-	MOVQ SI,80(DI)
-	MOVQ R8,88(DI)
-	MOVQ R9,96(DI)
-	MOVQ AX,104(DI)
-	MOVQ R10,112(DI)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go b/installer/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
deleted file mode 100644
index 5822bd5338..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/mont25519_amd64.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!gccgo,!appengine
-
-package curve25519
-
-// These functions are implemented in the .s files. The names of the functions
-// in the rest of the file are also taken from the SUPERCOP sources to help
-// people following along.
-
-//go:noescape
-
-func cswap(inout *[5]uint64, v uint64)
-
-//go:noescape
-
-func ladderstep(inout *[5][5]uint64)
-
-//go:noescape
-
-func freeze(inout *[5]uint64)
-
-//go:noescape
-
-func mul(dest, a, b *[5]uint64)
-
-//go:noescape
-
-func square(out, in *[5]uint64)
-
-// mladder uses a Montgomery ladder to calculate (xr/zr) *= s.
-func mladder(xr, zr *[5]uint64, s *[32]byte) {
-	var work [5][5]uint64
-
-	work[0] = *xr
-	setint(&work[1], 1)
-	setint(&work[2], 0)
-	work[3] = *xr
-	setint(&work[4], 1)
-
-	j := uint(6)
-	var prevbit byte
-
-	for i := 31; i >= 0; i-- {
-		for j < 8 {
-			bit := ((*s)[i] >> j) & 1
-			swap := bit ^ prevbit
-			prevbit = bit
-			cswap(&work[1], uint64(swap))
-			ladderstep(&work)
-			j--
-		}
-		j = 7
-	}
-
-	*xr = work[1]
-	*zr = work[2]
-}
-
-func scalarMult(out, in, base *[32]byte) {
-	var e [32]byte
-	copy(e[:], (*in)[:])
-	e[0] &= 248
-	e[31] &= 127
-	e[31] |= 64
-
-	var t, z [5]uint64
-	unpack(&t, base)
-	mladder(&t, &z, &e)
-	invert(&z, &z)
-	mul(&t, &t, &z)
-	pack(out, &t)
-}
-
-func setint(r *[5]uint64, v uint64) {
-	r[0] = v
-	r[1] = 0
-	r[2] = 0
-	r[3] = 0
-	r[4] = 0
-}
-
-// unpack sets r = x where r consists of 5, 51-bit limbs in little-endian
-// order.
-func unpack(r *[5]uint64, x *[32]byte) {
-	r[0] = uint64(x[0]) |
-		uint64(x[1])<<8 |
-		uint64(x[2])<<16 |
-		uint64(x[3])<<24 |
-		uint64(x[4])<<32 |
-		uint64(x[5])<<40 |
-		uint64(x[6]&7)<<48
-
-	r[1] = uint64(x[6])>>3 |
-		uint64(x[7])<<5 |
-		uint64(x[8])<<13 |
-		uint64(x[9])<<21 |
-		uint64(x[10])<<29 |
-		uint64(x[11])<<37 |
-		uint64(x[12]&63)<<45
-
-	r[2] = uint64(x[12])>>6 |
-		uint64(x[13])<<2 |
-		uint64(x[14])<<10 |
-		uint64(x[15])<<18 |
-		uint64(x[16])<<26 |
-		uint64(x[17])<<34 |
-		uint64(x[18])<<42 |
-		uint64(x[19]&1)<<50
-
-	r[3] = uint64(x[19])>>1 |
-		uint64(x[20])<<7 |
-		uint64(x[21])<<15 |
-		uint64(x[22])<<23 |
-		uint64(x[23])<<31 |
-		uint64(x[24])<<39 |
-		uint64(x[25]&15)<<47
-
-	r[4] = uint64(x[25])>>4 |
-		uint64(x[26])<<4 |
-		uint64(x[27])<<12 |
-		uint64(x[28])<<20 |
-		uint64(x[29])<<28 |
-		uint64(x[30])<<36 |
-		uint64(x[31]&127)<<44
-}
-
-// pack sets out = x where out is the usual, little-endian form of the 5,
-// 51-bit limbs in x.
-func pack(out *[32]byte, x *[5]uint64) {
-	t := *x
-	freeze(&t)
-
-	out[0] = byte(t[0])
-	out[1] = byte(t[0] >> 8)
-	out[2] = byte(t[0] >> 16)
-	out[3] = byte(t[0] >> 24)
-	out[4] = byte(t[0] >> 32)
-	out[5] = byte(t[0] >> 40)
-	out[6] = byte(t[0] >> 48)
-
-	out[6] ^= byte(t[1]<<3) & 0xf8
-	out[7] = byte(t[1] >> 5)
-	out[8] = byte(t[1] >> 13)
-	out[9] = byte(t[1] >> 21)
-	out[10] = byte(t[1] >> 29)
-	out[11] = byte(t[1] >> 37)
-	out[12] = byte(t[1] >> 45)
-
-	out[12] ^= byte(t[2]<<6) & 0xc0
-	out[13] = byte(t[2] >> 2)
-	out[14] = byte(t[2] >> 10)
-	out[15] = byte(t[2] >> 18)
-	out[16] = byte(t[2] >> 26)
-	out[17] = byte(t[2] >> 34)
-	out[18] = byte(t[2] >> 42)
-	out[19] = byte(t[2] >> 50)
-
-	out[19] ^= byte(t[3]<<1) & 0xfe
-	out[20] = byte(t[3] >> 7)
-	out[21] = byte(t[3] >> 15)
-	out[22] = byte(t[3] >> 23)
-	out[23] = byte(t[3] >> 31)
-	out[24] = byte(t[3] >> 39)
-	out[25] = byte(t[3] >> 47)
-
-	out[25] ^= byte(t[4]<<4) & 0xf0
-	out[26] = byte(t[4] >> 4)
-	out[27] = byte(t[4] >> 12)
-	out[28] = byte(t[4] >> 20)
-	out[29] = byte(t[4] >> 28)
-	out[30] = byte(t[4] >> 36)
-	out[31] = byte(t[4] >> 44)
-}
-
-// invert calculates r = x^-1 mod p using Fermat's little theorem.
-func invert(r *[5]uint64, x *[5]uint64) {
-	var z2, z9, z11, z2_5_0, z2_10_0, z2_20_0, z2_50_0, z2_100_0, t [5]uint64
-
-	square(&z2, x)        /* 2 */
-	square(&t, &z2)       /* 4 */
-	square(&t, &t)        /* 8 */
-	mul(&z9, &t, x)       /* 9 */
-	mul(&z11, &z9, &z2)   /* 11 */
-	square(&t, &z11)      /* 22 */
-	mul(&z2_5_0, &t, &z9) /* 2^5 - 2^0 = 31 */
-
-	square(&t, &z2_5_0)      /* 2^6 - 2^1 */
-	for i := 1; i < 5; i++ { /* 2^20 - 2^10 */
-		square(&t, &t)
-	}
-	mul(&z2_10_0, &t, &z2_5_0) /* 2^10 - 2^0 */
-
-	square(&t, &z2_10_0)      /* 2^11 - 2^1 */
-	for i := 1; i < 10; i++ { /* 2^20 - 2^10 */
-		square(&t, &t)
-	}
-	mul(&z2_20_0, &t, &z2_10_0) /* 2^20 - 2^0 */
-
-	square(&t, &z2_20_0)      /* 2^21 - 2^1 */
-	for i := 1; i < 20; i++ { /* 2^40 - 2^20 */
-		square(&t, &t)
-	}
-	mul(&t, &t, &z2_20_0) /* 2^40 - 2^0 */
-
-	square(&t, &t)            /* 2^41 - 2^1 */
-	for i := 1; i < 10; i++ { /* 2^50 - 2^10 */
-		square(&t, &t)
-	}
-	mul(&z2_50_0, &t, &z2_10_0) /* 2^50 - 2^0 */
-
-	square(&t, &z2_50_0)      /* 2^51 - 2^1 */
-	for i := 1; i < 50; i++ { /* 2^100 - 2^50 */
-		square(&t, &t)
-	}
-	mul(&z2_100_0, &t, &z2_50_0) /* 2^100 - 2^0 */
-
-	square(&t, &z2_100_0)      /* 2^101 - 2^1 */
-	for i := 1; i < 100; i++ { /* 2^200 - 2^100 */
-		square(&t, &t)
-	}
-	mul(&t, &t, &z2_100_0) /* 2^200 - 2^0 */
-
-	square(&t, &t)            /* 2^201 - 2^1 */
-	for i := 1; i < 50; i++ { /* 2^250 - 2^50 */
-		square(&t, &t)
-	}
-	mul(&t, &t, &z2_50_0) /* 2^250 - 2^0 */
-
-	square(&t, &t) /* 2^251 - 2^1 */
-	square(&t, &t) /* 2^252 - 2^2 */
-	square(&t, &t) /* 2^253 - 2^3 */
-
-	square(&t, &t) /* 2^254 - 2^4 */
-
-	square(&t, &t)   /* 2^255 - 2^5 */
-	mul(r, &t, &z11) /* 2^255 - 21 */
-}
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/mul_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
deleted file mode 100644
index 5ce80a2e56..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/mul_amd64.s
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-#include "const_amd64.h"
-
-// func mul(dest, a, b *[5]uint64)
-TEXT ·mul(SB),0,$16-24
-	MOVQ dest+0(FP), DI
-	MOVQ a+8(FP), SI
-	MOVQ b+16(FP), DX
-
-	MOVQ DX,CX
-	MOVQ 24(SI),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,0(SP)
-	MULQ 16(CX)
-	MOVQ AX,R8
-	MOVQ DX,R9
-	MOVQ 32(SI),DX
-	IMUL3Q $19,DX,AX
-	MOVQ AX,8(SP)
-	MULQ 8(CX)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 0(SI),AX
-	MULQ 0(CX)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 0(SI),AX
-	MULQ 8(CX)
-	MOVQ AX,R10
-	MOVQ DX,R11
-	MOVQ 0(SI),AX
-	MULQ 16(CX)
-	MOVQ AX,R12
-	MOVQ DX,R13
-	MOVQ 0(SI),AX
-	MULQ 24(CX)
-	MOVQ AX,R14
-	MOVQ DX,R15
-	MOVQ 0(SI),AX
-	MULQ 32(CX)
-	MOVQ AX,BX
-	MOVQ DX,BP
-	MOVQ 8(SI),AX
-	MULQ 0(CX)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SI),AX
-	MULQ 8(CX)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 8(SI),AX
-	MULQ 16(CX)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 8(SI),AX
-	MULQ 24(CX)
-	ADDQ AX,BX
-	ADCQ DX,BP
-	MOVQ 8(SI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(CX)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 16(SI),AX
-	MULQ 0(CX)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 16(SI),AX
-	MULQ 8(CX)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 16(SI),AX
-	MULQ 16(CX)
-	ADDQ AX,BX
-	ADCQ DX,BP
-	MOVQ 16(SI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 24(CX)
-	ADDQ AX,R8
-	ADCQ DX,R9
-	MOVQ 16(SI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(CX)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 24(SI),AX
-	MULQ 0(CX)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ 24(SI),AX
-	MULQ 8(CX)
-	ADDQ AX,BX
-	ADCQ DX,BP
-	MOVQ 0(SP),AX
-	MULQ 24(CX)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 0(SP),AX
-	MULQ 32(CX)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 32(SI),AX
-	MULQ 0(CX)
-	ADDQ AX,BX
-	ADCQ DX,BP
-	MOVQ 8(SP),AX
-	MULQ 16(CX)
-	ADDQ AX,R10
-	ADCQ DX,R11
-	MOVQ 8(SP),AX
-	MULQ 24(CX)
-	ADDQ AX,R12
-	ADCQ DX,R13
-	MOVQ 8(SP),AX
-	MULQ 32(CX)
-	ADDQ AX,R14
-	ADCQ DX,R15
-	MOVQ $REDMASK51,SI
-	SHLQ $13,R9:R8
-	ANDQ SI,R8
-	SHLQ $13,R11:R10
-	ANDQ SI,R10
-	ADDQ R9,R10
-	SHLQ $13,R13:R12
-	ANDQ SI,R12
-	ADDQ R11,R12
-	SHLQ $13,R15:R14
-	ANDQ SI,R14
-	ADDQ R13,R14
-	SHLQ $13,BP:BX
-	ANDQ SI,BX
-	ADDQ R15,BX
-	IMUL3Q $19,BP,DX
-	ADDQ DX,R8
-	MOVQ R8,DX
-	SHRQ $51,DX
-	ADDQ R10,DX
-	MOVQ DX,CX
-	SHRQ $51,DX
-	ANDQ SI,R8
-	ADDQ R12,DX
-	MOVQ DX,R9
-	SHRQ $51,DX
-	ANDQ SI,CX
-	ADDQ R14,DX
-	MOVQ DX,AX
-	SHRQ $51,DX
-	ANDQ SI,R9
-	ADDQ BX,DX
-	MOVQ DX,R10
-	SHRQ $51,DX
-	ANDQ SI,AX
-	IMUL3Q $19,DX,DX
-	ADDQ DX,R8
-	ANDQ SI,R10
-	MOVQ R8,0(DI)
-	MOVQ CX,8(DI)
-	MOVQ R9,16(DI)
-	MOVQ AX,24(DI)
-	MOVQ R10,32(DI)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/curve25519/square_amd64.s b/installer/vendor/golang.org/x/crypto/curve25519/square_amd64.s
deleted file mode 100644
index 12f73734ff..0000000000
--- a/installer/vendor/golang.org/x/crypto/curve25519/square_amd64.s
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources in SUPERCOP: https://bench.cr.yp.to/supercop.html
-
-// +build amd64,!gccgo,!appengine
-
-#include "const_amd64.h"
-
-// func square(out, in *[5]uint64)
-TEXT ·square(SB),7,$0-16
-	MOVQ out+0(FP), DI
-	MOVQ in+8(FP), SI
-
-	MOVQ 0(SI),AX
-	MULQ 0(SI)
-	MOVQ AX,CX
-	MOVQ DX,R8
-	MOVQ 0(SI),AX
-	SHLQ $1,AX
-	MULQ 8(SI)
-	MOVQ AX,R9
-	MOVQ DX,R10
-	MOVQ 0(SI),AX
-	SHLQ $1,AX
-	MULQ 16(SI)
-	MOVQ AX,R11
-	MOVQ DX,R12
-	MOVQ 0(SI),AX
-	SHLQ $1,AX
-	MULQ 24(SI)
-	MOVQ AX,R13
-	MOVQ DX,R14
-	MOVQ 0(SI),AX
-	SHLQ $1,AX
-	MULQ 32(SI)
-	MOVQ AX,R15
-	MOVQ DX,BX
-	MOVQ 8(SI),AX
-	MULQ 8(SI)
-	ADDQ AX,R11
-	ADCQ DX,R12
-	MOVQ 8(SI),AX
-	SHLQ $1,AX
-	MULQ 16(SI)
-	ADDQ AX,R13
-	ADCQ DX,R14
-	MOVQ 8(SI),AX
-	SHLQ $1,AX
-	MULQ 24(SI)
-	ADDQ AX,R15
-	ADCQ DX,BX
-	MOVQ 8(SI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SI)
-	ADDQ AX,CX
-	ADCQ DX,R8
-	MOVQ 16(SI),AX
-	MULQ 16(SI)
-	ADDQ AX,R15
-	ADCQ DX,BX
-	MOVQ 16(SI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 24(SI)
-	ADDQ AX,CX
-	ADCQ DX,R8
-	MOVQ 16(SI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SI)
-	ADDQ AX,R9
-	ADCQ DX,R10
-	MOVQ 24(SI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 24(SI)
-	ADDQ AX,R9
-	ADCQ DX,R10
-	MOVQ 24(SI),DX
-	IMUL3Q $38,DX,AX
-	MULQ 32(SI)
-	ADDQ AX,R11
-	ADCQ DX,R12
-	MOVQ 32(SI),DX
-	IMUL3Q $19,DX,AX
-	MULQ 32(SI)
-	ADDQ AX,R13
-	ADCQ DX,R14
-	MOVQ $REDMASK51,SI
-	SHLQ $13,R8:CX
-	ANDQ SI,CX
-	SHLQ $13,R10:R9
-	ANDQ SI,R9
-	ADDQ R8,R9
-	SHLQ $13,R12:R11
-	ANDQ SI,R11
-	ADDQ R10,R11
-	SHLQ $13,R14:R13
-	ANDQ SI,R13
-	ADDQ R12,R13
-	SHLQ $13,BX:R15
-	ANDQ SI,R15
-	ADDQ R14,R15
-	IMUL3Q $19,BX,DX
-	ADDQ DX,CX
-	MOVQ CX,DX
-	SHRQ $51,DX
-	ADDQ R9,DX
-	ANDQ SI,CX
-	MOVQ DX,R8
-	SHRQ $51,DX
-	ADDQ R11,DX
-	ANDQ SI,R8
-	MOVQ DX,R9
-	SHRQ $51,DX
-	ADDQ R13,DX
-	ANDQ SI,R9
-	MOVQ DX,AX
-	SHRQ $51,DX
-	ADDQ R15,DX
-	ANDQ SI,AX
-	MOVQ DX,R10
-	SHRQ $51,DX
-	IMUL3Q $19,DX,DX
-	ADDQ DX,CX
-	ANDQ SI,R10
-	MOVQ CX,0(DI)
-	MOVQ R8,8(DI)
-	MOVQ R9,16(DI)
-	MOVQ AX,24(DI)
-	MOVQ R10,32(DI)
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/ed25519/ed25519.go b/installer/vendor/golang.org/x/crypto/ed25519/ed25519.go
deleted file mode 100644
index 4f26b49b6a..0000000000
--- a/installer/vendor/golang.org/x/crypto/ed25519/ed25519.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ed25519 implements the Ed25519 signature algorithm. See
-// https://ed25519.cr.yp.to/.
-//
-// These functions are also compatible with the “Ed25519” function defined in
-// RFC 8032.
-package ed25519
-
-// This code is a port of the public domain, “ref10” implementation of ed25519
-// from SUPERCOP.
-
-import (
-	"bytes"
-	"crypto"
-	cryptorand "crypto/rand"
-	"crypto/sha512"
-	"errors"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/ed25519/internal/edwards25519"
-)
-
-const (
-	// PublicKeySize is the size, in bytes, of public keys as used in this package.
-	PublicKeySize = 32
-	// PrivateKeySize is the size, in bytes, of private keys as used in this package.
-	PrivateKeySize = 64
-	// SignatureSize is the size, in bytes, of signatures generated and verified by this package.
-	SignatureSize = 64
-)
-
-// PublicKey is the type of Ed25519 public keys.
-type PublicKey []byte
-
-// PrivateKey is the type of Ed25519 private keys. It implements crypto.Signer.
-type PrivateKey []byte
-
-// Public returns the PublicKey corresponding to priv.
-func (priv PrivateKey) Public() crypto.PublicKey {
-	publicKey := make([]byte, PublicKeySize)
-	copy(publicKey, priv[32:])
-	return PublicKey(publicKey)
-}
-
-// Sign signs the given message with priv.
-// Ed25519 performs two passes over messages to be signed and therefore cannot
-// handle pre-hashed messages. Thus opts.HashFunc() must return zero to
-// indicate the message hasn't been hashed. This can be achieved by passing
-// crypto.Hash(0) as the value for opts.
-func (priv PrivateKey) Sign(rand io.Reader, message []byte, opts crypto.SignerOpts) (signature []byte, err error) {
-	if opts.HashFunc() != crypto.Hash(0) {
-		return nil, errors.New("ed25519: cannot sign hashed message")
-	}
-
-	return Sign(priv, message), nil
-}
-
-// GenerateKey generates a public/private key pair using entropy from rand.
-// If rand is nil, crypto/rand.Reader will be used.
-func GenerateKey(rand io.Reader) (publicKey PublicKey, privateKey PrivateKey, err error) {
-	if rand == nil {
-		rand = cryptorand.Reader
-	}
-
-	privateKey = make([]byte, PrivateKeySize)
-	publicKey = make([]byte, PublicKeySize)
-	_, err = io.ReadFull(rand, privateKey[:32])
-	if err != nil {
-		return nil, nil, err
-	}
-
-	digest := sha512.Sum512(privateKey[:32])
-	digest[0] &= 248
-	digest[31] &= 127
-	digest[31] |= 64
-
-	var A edwards25519.ExtendedGroupElement
-	var hBytes [32]byte
-	copy(hBytes[:], digest[:])
-	edwards25519.GeScalarMultBase(&A, &hBytes)
-	var publicKeyBytes [32]byte
-	A.ToBytes(&publicKeyBytes)
-
-	copy(privateKey[32:], publicKeyBytes[:])
-	copy(publicKey, publicKeyBytes[:])
-
-	return publicKey, privateKey, nil
-}
-
-// Sign signs the message with privateKey and returns a signature. It will
-// panic if len(privateKey) is not PrivateKeySize.
-func Sign(privateKey PrivateKey, message []byte) []byte {
-	if l := len(privateKey); l != PrivateKeySize {
-		panic("ed25519: bad private key length: " + strconv.Itoa(l))
-	}
-
-	h := sha512.New()
-	h.Write(privateKey[:32])
-
-	var digest1, messageDigest, hramDigest [64]byte
-	var expandedSecretKey [32]byte
-	h.Sum(digest1[:0])
-	copy(expandedSecretKey[:], digest1[:])
-	expandedSecretKey[0] &= 248
-	expandedSecretKey[31] &= 63
-	expandedSecretKey[31] |= 64
-
-	h.Reset()
-	h.Write(digest1[32:])
-	h.Write(message)
-	h.Sum(messageDigest[:0])
-
-	var messageDigestReduced [32]byte
-	edwards25519.ScReduce(&messageDigestReduced, &messageDigest)
-	var R edwards25519.ExtendedGroupElement
-	edwards25519.GeScalarMultBase(&R, &messageDigestReduced)
-
-	var encodedR [32]byte
-	R.ToBytes(&encodedR)
-
-	h.Reset()
-	h.Write(encodedR[:])
-	h.Write(privateKey[32:])
-	h.Write(message)
-	h.Sum(hramDigest[:0])
-	var hramDigestReduced [32]byte
-	edwards25519.ScReduce(&hramDigestReduced, &hramDigest)
-
-	var s [32]byte
-	edwards25519.ScMulAdd(&s, &hramDigestReduced, &expandedSecretKey, &messageDigestReduced)
-
-	signature := make([]byte, SignatureSize)
-	copy(signature[:], encodedR[:])
-	copy(signature[32:], s[:])
-
-	return signature
-}
-
-// Verify reports whether sig is a valid signature of message by publicKey. It
-// will panic if len(publicKey) is not PublicKeySize.
-func Verify(publicKey PublicKey, message, sig []byte) bool {
-	if l := len(publicKey); l != PublicKeySize {
-		panic("ed25519: bad public key length: " + strconv.Itoa(l))
-	}
-
-	if len(sig) != SignatureSize || sig[63]&224 != 0 {
-		return false
-	}
-
-	var A edwards25519.ExtendedGroupElement
-	var publicKeyBytes [32]byte
-	copy(publicKeyBytes[:], publicKey)
-	if !A.FromBytes(&publicKeyBytes) {
-		return false
-	}
-	edwards25519.FeNeg(&A.X, &A.X)
-	edwards25519.FeNeg(&A.T, &A.T)
-
-	h := sha512.New()
-	h.Write(sig[:32])
-	h.Write(publicKey[:])
-	h.Write(message)
-	var digest [64]byte
-	h.Sum(digest[:0])
-
-	var hReduced [32]byte
-	edwards25519.ScReduce(&hReduced, &digest)
-
-	var R edwards25519.ProjectiveGroupElement
-	var b [32]byte
-	copy(b[:], sig[32:])
-	edwards25519.GeDoubleScalarMultVartime(&R, &hReduced, &A, &b)
-
-	var checkR [32]byte
-	R.ToBytes(&checkR)
-	return bytes.Equal(sig[:32], checkR[:])
-}
diff --git a/installer/vendor/golang.org/x/crypto/ed25519/ed25519_test.go b/installer/vendor/golang.org/x/crypto/ed25519/ed25519_test.go
deleted file mode 100644
index e272f8a557..0000000000
--- a/installer/vendor/golang.org/x/crypto/ed25519/ed25519_test.go
+++ /dev/null
@@ -1,183 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ed25519
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto"
-	"crypto/rand"
-	"encoding/hex"
-	"os"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/ed25519/internal/edwards25519"
-)
-
-type zeroReader struct{}
-
-func (zeroReader) Read(buf []byte) (int, error) {
-	for i := range buf {
-		buf[i] = 0
-	}
-	return len(buf), nil
-}
-
-func TestUnmarshalMarshal(t *testing.T) {
-	pub, _, _ := GenerateKey(rand.Reader)
-
-	var A edwards25519.ExtendedGroupElement
-	var pubBytes [32]byte
-	copy(pubBytes[:], pub)
-	if !A.FromBytes(&pubBytes) {
-		t.Fatalf("ExtendedGroupElement.FromBytes failed")
-	}
-
-	var pub2 [32]byte
-	A.ToBytes(&pub2)
-
-	if pubBytes != pub2 {
-		t.Errorf("FromBytes(%v)->ToBytes does not round-trip, got %x\n", pubBytes, pub2)
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	var zero zeroReader
-	public, private, _ := GenerateKey(zero)
-
-	message := []byte("test message")
-	sig := Sign(private, message)
-	if !Verify(public, message, sig) {
-		t.Errorf("valid signature rejected")
-	}
-
-	wrongMessage := []byte("wrong message")
-	if Verify(public, wrongMessage, sig) {
-		t.Errorf("signature of different message accepted")
-	}
-}
-
-func TestCryptoSigner(t *testing.T) {
-	var zero zeroReader
-	public, private, _ := GenerateKey(zero)
-
-	signer := crypto.Signer(private)
-
-	publicInterface := signer.Public()
-	public2, ok := publicInterface.(PublicKey)
-	if !ok {
-		t.Fatalf("expected PublicKey from Public() but got %T", publicInterface)
-	}
-
-	if !bytes.Equal(public, public2) {
-		t.Errorf("public keys do not match: original:%x vs Public():%x", public, public2)
-	}
-
-	message := []byte("message")
-	var noHash crypto.Hash
-	signature, err := signer.Sign(zero, message, noHash)
-	if err != nil {
-		t.Fatalf("error from Sign(): %s", err)
-	}
-
-	if !Verify(public, message, signature) {
-		t.Errorf("Verify failed on signature from Sign()")
-	}
-}
-
-func TestGolden(t *testing.T) {
-	// sign.input.gz is a selection of test cases from
-	// https://ed25519.cr.yp.to/python/sign.input
-	testDataZ, err := os.Open("testdata/sign.input.gz")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testDataZ.Close()
-	testData, err := gzip.NewReader(testDataZ)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testData.Close()
-
-	scanner := bufio.NewScanner(testData)
-	lineNo := 0
-
-	for scanner.Scan() {
-		lineNo++
-
-		line := scanner.Text()
-		parts := strings.Split(line, ":")
-		if len(parts) != 5 {
-			t.Fatalf("bad number of parts on line %d", lineNo)
-		}
-
-		privBytes, _ := hex.DecodeString(parts[0])
-		pubKey, _ := hex.DecodeString(parts[1])
-		msg, _ := hex.DecodeString(parts[2])
-		sig, _ := hex.DecodeString(parts[3])
-		// The signatures in the test vectors also include the message
-		// at the end, but we just want R and S.
-		sig = sig[:SignatureSize]
-
-		if l := len(pubKey); l != PublicKeySize {
-			t.Fatalf("bad public key length on line %d: got %d bytes", lineNo, l)
-		}
-
-		var priv [PrivateKeySize]byte
-		copy(priv[:], privBytes)
-		copy(priv[32:], pubKey)
-
-		sig2 := Sign(priv[:], msg)
-		if !bytes.Equal(sig, sig2[:]) {
-			t.Errorf("different signature result on line %d: %x vs %x", lineNo, sig, sig2)
-		}
-
-		if !Verify(pubKey, msg, sig2) {
-			t.Errorf("signature failed to verify on line %d", lineNo)
-		}
-	}
-
-	if err := scanner.Err(); err != nil {
-		t.Fatalf("error reading test data: %s", err)
-	}
-}
-
-func BenchmarkKeyGeneration(b *testing.B) {
-	var zero zeroReader
-	for i := 0; i < b.N; i++ {
-		if _, _, err := GenerateKey(zero); err != nil {
-			b.Fatal(err)
-		}
-	}
-}
-
-func BenchmarkSigning(b *testing.B) {
-	var zero zeroReader
-	_, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sign(priv, message)
-	}
-}
-
-func BenchmarkVerification(b *testing.B) {
-	var zero zeroReader
-	pub, priv, err := GenerateKey(zero)
-	if err != nil {
-		b.Fatal(err)
-	}
-	message := []byte("Hello, world!")
-	signature := Sign(priv, message)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Verify(pub, message, signature)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go b/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
deleted file mode 100644
index e39f086c1d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/const.go
+++ /dev/null
@@ -1,1422 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package edwards25519
-
-// These values are from the public domain, “ref10” implementation of ed25519
-// from SUPERCOP.
-
-// d is a constant in the Edwards curve equation.
-var d = FieldElement{
-	-10913610, 13857413, -15372611, 6949391, 114729, -8787816, -6275908, -3247719, -18696448, -12055116,
-}
-
-// d2 is 2*d.
-var d2 = FieldElement{
-	-21827239, -5839606, -30745221, 13898782, 229458, 15978800, -12551817, -6495438, 29715968, 9444199,
-}
-
-// SqrtM1 is the square-root of -1 in the field.
-var SqrtM1 = FieldElement{
-	-32595792, -7943725, 9377950, 3500415, 12389472, -272473, -25146209, -2005654, 326686, 11406482,
-}
-
-// A is a constant in the Montgomery-form of curve25519.
-var A = FieldElement{
-	486662, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-}
-
-// bi contains precomputed multiples of the base-point. See the Ed25519 paper
-// for a discussion about how these values are used.
-var bi = [8]PreComputedGroupElement{
-	{
-		FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
-		FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
-		FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
-	},
-	{
-		FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
-		FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
-		FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
-	},
-	{
-		FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
-		FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
-		FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
-	},
-	{
-		FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
-		FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
-		FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
-	},
-	{
-		FieldElement{-22518993, -6692182, 14201702, -8745502, -23510406, 8844726, 18474211, -1361450, -13062696, 13821877},
-		FieldElement{-6455177, -7839871, 3374702, -4740862, -27098617, -10571707, 31655028, -7212327, 18853322, -14220951},
-		FieldElement{4566830, -12963868, -28974889, -12240689, -7602672, -2830569, -8514358, -10431137, 2207753, -3209784},
-	},
-	{
-		FieldElement{-25154831, -4185821, 29681144, 7868801, -6854661, -9423865, -12437364, -663000, -31111463, -16132436},
-		FieldElement{25576264, -2703214, 7349804, -11814844, 16472782, 9300885, 3844789, 15725684, 171356, 6466918},
-		FieldElement{23103977, 13316479, 9739013, -16149481, 817875, -15038942, 8965339, -14088058, -30714912, 16193877},
-	},
-	{
-		FieldElement{-33521811, 3180713, -2394130, 14003687, -16903474, -16270840, 17238398, 4729455, -18074513, 9256800},
-		FieldElement{-25182317, -4174131, 32336398, 5036987, -21236817, 11360617, 22616405, 9761698, -19827198, 630305},
-		FieldElement{-13720693, 2639453, -24237460, -7406481, 9494427, -5774029, -6554551, -15960994, -2449256, -14291300},
-	},
-	{
-		FieldElement{-3151181, -5046075, 9282714, 6866145, -31907062, -863023, -18940575, 15033784, 25105118, -7894876},
-		FieldElement{-24326370, 15950226, -31801215, -14592823, -11662737, -5090925, 1573892, -2625887, 2198790, -15804619},
-		FieldElement{-3099351, 10324967, -2241613, 7453183, -5446979, -2735503, -13812022, -16236442, -32461234, -12290683},
-	},
-}
-
-// base contains precomputed multiples of the base-point. See the Ed25519 paper
-// for a discussion about how these values are used.
-var base = [32][8]PreComputedGroupElement{
-	{
-		{
-			FieldElement{25967493, -14356035, 29566456, 3660896, -12694345, 4014787, 27544626, -11754271, -6079156, 2047605},
-			FieldElement{-12545711, 934262, -2722910, 3049990, -727428, 9406986, 12720692, 5043384, 19500929, -15469378},
-			FieldElement{-8738181, 4489570, 9688441, -14785194, 10184609, -12363380, 29287919, 11864899, -24514362, -4438546},
-		},
-		{
-			FieldElement{-12815894, -12976347, -21581243, 11784320, -25355658, -2750717, -11717903, -3814571, -358445, -10211303},
-			FieldElement{-21703237, 6903825, 27185491, 6451973, -29577724, -9554005, -15616551, 11189268, -26829678, -5319081},
-			FieldElement{26966642, 11152617, 32442495, 15396054, 14353839, -12752335, -3128826, -9541118, -15472047, -4166697},
-		},
-		{
-			FieldElement{15636291, -9688557, 24204773, -7912398, 616977, -16685262, 27787600, -14772189, 28944400, -1550024},
-			FieldElement{16568933, 4717097, -11556148, -1102322, 15682896, -11807043, 16354577, -11775962, 7689662, 11199574},
-			FieldElement{30464156, -5976125, -11779434, -15670865, 23220365, 15915852, 7512774, 10017326, -17749093, -9920357},
-		},
-		{
-			FieldElement{-17036878, 13921892, 10945806, -6033431, 27105052, -16084379, -28926210, 15006023, 3284568, -6276540},
-			FieldElement{23599295, -8306047, -11193664, -7687416, 13236774, 10506355, 7464579, 9656445, 13059162, 10374397},
-			FieldElement{7798556, 16710257, 3033922, 2874086, 28997861, 2835604, 32406664, -3839045, -641708, -101325},
-		},
-		{
-			FieldElement{10861363, 11473154, 27284546, 1981175, -30064349, 12577861, 32867885, 14515107, -15438304, 10819380},
-			FieldElement{4708026, 6336745, 20377586, 9066809, -11272109, 6594696, -25653668, 12483688, -12668491, 5581306},
-			FieldElement{19563160, 16186464, -29386857, 4097519, 10237984, -4348115, 28542350, 13850243, -23678021, -15815942},
-		},
-		{
-			FieldElement{-15371964, -12862754, 32573250, 4720197, -26436522, 5875511, -19188627, -15224819, -9818940, -12085777},
-			FieldElement{-8549212, 109983, 15149363, 2178705, 22900618, 4543417, 3044240, -15689887, 1762328, 14866737},
-			FieldElement{-18199695, -15951423, -10473290, 1707278, -17185920, 3916101, -28236412, 3959421, 27914454, 4383652},
-		},
-		{
-			FieldElement{5153746, 9909285, 1723747, -2777874, 30523605, 5516873, 19480852, 5230134, -23952439, -15175766},
-			FieldElement{-30269007, -3463509, 7665486, 10083793, 28475525, 1649722, 20654025, 16520125, 30598449, 7715701},
-			FieldElement{28881845, 14381568, 9657904, 3680757, -20181635, 7843316, -31400660, 1370708, 29794553, -1409300},
-		},
-		{
-			FieldElement{14499471, -2729599, -33191113, -4254652, 28494862, 14271267, 30290735, 10876454, -33154098, 2381726},
-			FieldElement{-7195431, -2655363, -14730155, 462251, -27724326, 3941372, -6236617, 3696005, -32300832, 15351955},
-			FieldElement{27431194, 8222322, 16448760, -3907995, -18707002, 11938355, -32961401, -2970515, 29551813, 10109425},
-		},
-	},
-	{
-		{
-			FieldElement{-13657040, -13155431, -31283750, 11777098, 21447386, 6519384, -2378284, -1627556, 10092783, -4764171},
-			FieldElement{27939166, 14210322, 4677035, 16277044, -22964462, -12398139, -32508754, 12005538, -17810127, 12803510},
-			FieldElement{17228999, -15661624, -1233527, 300140, -1224870, -11714777, 30364213, -9038194, 18016357, 4397660},
-		},
-		{
-			FieldElement{-10958843, -7690207, 4776341, -14954238, 27850028, -15602212, -26619106, 14544525, -17477504, 982639},
-			FieldElement{29253598, 15796703, -2863982, -9908884, 10057023, 3163536, 7332899, -4120128, -21047696, 9934963},
-			FieldElement{5793303, 16271923, -24131614, -10116404, 29188560, 1206517, -14747930, 4559895, -30123922, -10897950},
-		},
-		{
-			FieldElement{-27643952, -11493006, 16282657, -11036493, 28414021, -15012264, 24191034, 4541697, -13338309, 5500568},
-			FieldElement{12650548, -1497113, 9052871, 11355358, -17680037, -8400164, -17430592, 12264343, 10874051, 13524335},
-			FieldElement{25556948, -3045990, 714651, 2510400, 23394682, -10415330, 33119038, 5080568, -22528059, 5376628},
-		},
-		{
-			FieldElement{-26088264, -4011052, -17013699, -3537628, -6726793, 1920897, -22321305, -9447443, 4535768, 1569007},
-			FieldElement{-2255422, 14606630, -21692440, -8039818, 28430649, 8775819, -30494562, 3044290, 31848280, 12543772},
-			FieldElement{-22028579, 2943893, -31857513, 6777306, 13784462, -4292203, -27377195, -2062731, 7718482, 14474653},
-		},
-		{
-			FieldElement{2385315, 2454213, -22631320, 46603, -4437935, -15680415, 656965, -7236665, 24316168, -5253567},
-			FieldElement{13741529, 10911568, -33233417, -8603737, -20177830, -1033297, 33040651, -13424532, -20729456, 8321686},
-			FieldElement{21060490, -2212744, 15712757, -4336099, 1639040, 10656336, 23845965, -11874838, -9984458, 608372},
-		},
-		{
-			FieldElement{-13672732, -15087586, -10889693, -7557059, -6036909, 11305547, 1123968, -6780577, 27229399, 23887},
-			FieldElement{-23244140, -294205, -11744728, 14712571, -29465699, -2029617, 12797024, -6440308, -1633405, 16678954},
-			FieldElement{-29500620, 4770662, -16054387, 14001338, 7830047, 9564805, -1508144, -4795045, -17169265, 4904953},
-		},
-		{
-			FieldElement{24059557, 14617003, 19037157, -15039908, 19766093, -14906429, 5169211, 16191880, 2128236, -4326833},
-			FieldElement{-16981152, 4124966, -8540610, -10653797, 30336522, -14105247, -29806336, 916033, -6882542, -2986532},
-			FieldElement{-22630907, 12419372, -7134229, -7473371, -16478904, 16739175, 285431, 2763829, 15736322, 4143876},
-		},
-		{
-			FieldElement{2379352, 11839345, -4110402, -5988665, 11274298, 794957, 212801, -14594663, 23527084, -16458268},
-			FieldElement{33431127, -11130478, -17838966, -15626900, 8909499, 8376530, -32625340, 4087881, -15188911, -14416214},
-			FieldElement{1767683, 7197987, -13205226, -2022635, -13091350, 448826, 5799055, 4357868, -4774191, -16323038},
-		},
-	},
-	{
-		{
-			FieldElement{6721966, 13833823, -23523388, -1551314, 26354293, -11863321, 23365147, -3949732, 7390890, 2759800},
-			FieldElement{4409041, 2052381, 23373853, 10530217, 7676779, -12885954, 21302353, -4264057, 1244380, -12919645},
-			FieldElement{-4421239, 7169619, 4982368, -2957590, 30256825, -2777540, 14086413, 9208236, 15886429, 16489664},
-		},
-		{
-			FieldElement{1996075, 10375649, 14346367, 13311202, -6874135, -16438411, -13693198, 398369, -30606455, -712933},
-			FieldElement{-25307465, 9795880, -2777414, 14878809, -33531835, 14780363, 13348553, 12076947, -30836462, 5113182},
-			FieldElement{-17770784, 11797796, 31950843, 13929123, -25888302, 12288344, -30341101, -7336386, 13847711, 5387222},
-		},
-		{
-			FieldElement{-18582163, -3416217, 17824843, -2340966, 22744343, -10442611, 8763061, 3617786, -19600662, 10370991},
-			FieldElement{20246567, -14369378, 22358229, -543712, 18507283, -10413996, 14554437, -8746092, 32232924, 16763880},
-			FieldElement{9648505, 10094563, 26416693, 14745928, -30374318, -6472621, 11094161, 15689506, 3140038, -16510092},
-		},
-		{
-			FieldElement{-16160072, 5472695, 31895588, 4744994, 8823515, 10365685, -27224800, 9448613, -28774454, 366295},
-			FieldElement{19153450, 11523972, -11096490, -6503142, -24647631, 5420647, 28344573, 8041113, 719605, 11671788},
-			FieldElement{8678025, 2694440, -6808014, 2517372, 4964326, 11152271, -15432916, -15266516, 27000813, -10195553},
-		},
-		{
-			FieldElement{-15157904, 7134312, 8639287, -2814877, -7235688, 10421742, 564065, 5336097, 6750977, -14521026},
-			FieldElement{11836410, -3979488, 26297894, 16080799, 23455045, 15735944, 1695823, -8819122, 8169720, 16220347},
-			FieldElement{-18115838, 8653647, 17578566, -6092619, -8025777, -16012763, -11144307, -2627664, -5990708, -14166033},
-		},
-		{
-			FieldElement{-23308498, -10968312, 15213228, -10081214, -30853605, -11050004, 27884329, 2847284, 2655861, 1738395},
-			FieldElement{-27537433, -14253021, -25336301, -8002780, -9370762, 8129821, 21651608, -3239336, -19087449, -11005278},
-			FieldElement{1533110, 3437855, 23735889, 459276, 29970501, 11335377, 26030092, 5821408, 10478196, 8544890},
-		},
-		{
-			FieldElement{32173121, -16129311, 24896207, 3921497, 22579056, -3410854, 19270449, 12217473, 17789017, -3395995},
-			FieldElement{-30552961, -2228401, -15578829, -10147201, 13243889, 517024, 15479401, -3853233, 30460520, 1052596},
-			FieldElement{-11614875, 13323618, 32618793, 8175907, -15230173, 12596687, 27491595, -4612359, 3179268, -9478891},
-		},
-		{
-			FieldElement{31947069, -14366651, -4640583, -15339921, -15125977, -6039709, -14756777, -16411740, 19072640, -9511060},
-			FieldElement{11685058, 11822410, 3158003, -13952594, 33402194, -4165066, 5977896, -5215017, 473099, 5040608},
-			FieldElement{-20290863, 8198642, -27410132, 11602123, 1290375, -2799760, 28326862, 1721092, -19558642, -3131606},
-		},
-	},
-	{
-		{
-			FieldElement{7881532, 10687937, 7578723, 7738378, -18951012, -2553952, 21820786, 8076149, -27868496, 11538389},
-			FieldElement{-19935666, 3899861, 18283497, -6801568, -15728660, -11249211, 8754525, 7446702, -5676054, 5797016},
-			FieldElement{-11295600, -3793569, -15782110, -7964573, 12708869, -8456199, 2014099, -9050574, -2369172, -5877341},
-		},
-		{
-			FieldElement{-22472376, -11568741, -27682020, 1146375, 18956691, 16640559, 1192730, -3714199, 15123619, 10811505},
-			FieldElement{14352098, -3419715, -18942044, 10822655, 32750596, 4699007, -70363, 15776356, -28886779, -11974553},
-			FieldElement{-28241164, -8072475, -4978962, -5315317, 29416931, 1847569, -20654173, -16484855, 4714547, -9600655},
-		},
-		{
-			FieldElement{15200332, 8368572, 19679101, 15970074, -31872674, 1959451, 24611599, -4543832, -11745876, 12340220},
-			FieldElement{12876937, -10480056, 33134381, 6590940, -6307776, 14872440, 9613953, 8241152, 15370987, 9608631},
-			FieldElement{-4143277, -12014408, 8446281, -391603, 4407738, 13629032, -7724868, 15866074, -28210621, -8814099},
-		},
-		{
-			FieldElement{26660628, -15677655, 8393734, 358047, -7401291, 992988, -23904233, 858697, 20571223, 8420556},
-			FieldElement{14620715, 13067227, -15447274, 8264467, 14106269, 15080814, 33531827, 12516406, -21574435, -12476749},
-			FieldElement{236881, 10476226, 57258, -14677024, 6472998, 2466984, 17258519, 7256740, 8791136, 15069930},
-		},
-		{
-			FieldElement{1276410, -9371918, 22949635, -16322807, -23493039, -5702186, 14711875, 4874229, -30663140, -2331391},
-			FieldElement{5855666, 4990204, -13711848, 7294284, -7804282, 1924647, -1423175, -7912378, -33069337, 9234253},
-			FieldElement{20590503, -9018988, 31529744, -7352666, -2706834, 10650548, 31559055, -11609587, 18979186, 13396066},
-		},
-		{
-			FieldElement{24474287, 4968103, 22267082, 4407354, 24063882, -8325180, -18816887, 13594782, 33514650, 7021958},
-			FieldElement{-11566906, -6565505, -21365085, 15928892, -26158305, 4315421, -25948728, -3916677, -21480480, 12868082},
-			FieldElement{-28635013, 13504661, 19988037, -2132761, 21078225, 6443208, -21446107, 2244500, -12455797, -8089383},
-		},
-		{
-			FieldElement{-30595528, 13793479, -5852820, 319136, -25723172, -6263899, 33086546, 8957937, -15233648, 5540521},
-			FieldElement{-11630176, -11503902, -8119500, -7643073, 2620056, 1022908, -23710744, -1568984, -16128528, -14962807},
-			FieldElement{23152971, 775386, 27395463, 14006635, -9701118, 4649512, 1689819, 892185, -11513277, -15205948},
-		},
-		{
-			FieldElement{9770129, 9586738, 26496094, 4324120, 1556511, -3550024, 27453819, 4763127, -19179614, 5867134},
-			FieldElement{-32765025, 1927590, 31726409, -4753295, 23962434, -16019500, 27846559, 5931263, -29749703, -16108455},
-			FieldElement{27461885, -2977536, 22380810, 1815854, -23033753, -3031938, 7283490, -15148073, -19526700, 7734629},
-		},
-	},
-	{
-		{
-			FieldElement{-8010264, -9590817, -11120403, 6196038, 29344158, -13430885, 7585295, -3176626, 18549497, 15302069},
-			FieldElement{-32658337, -6171222, -7672793, -11051681, 6258878, 13504381, 10458790, -6418461, -8872242, 8424746},
-			FieldElement{24687205, 8613276, -30667046, -3233545, 1863892, -1830544, 19206234, 7134917, -11284482, -828919},
-		},
-		{
-			FieldElement{11334899, -9218022, 8025293, 12707519, 17523892, -10476071, 10243738, -14685461, -5066034, 16498837},
-			FieldElement{8911542, 6887158, -9584260, -6958590, 11145641, -9543680, 17303925, -14124238, 6536641, 10543906},
-			FieldElement{-28946384, 15479763, -17466835, 568876, -1497683, 11223454, -2669190, -16625574, -27235709, 8876771},
-		},
-		{
-			FieldElement{-25742899, -12566864, -15649966, -846607, -33026686, -796288, -33481822, 15824474, -604426, -9039817},
-			FieldElement{10330056, 70051, 7957388, -9002667, 9764902, 15609756, 27698697, -4890037, 1657394, 3084098},
-			FieldElement{10477963, -7470260, 12119566, -13250805, 29016247, -5365589, 31280319, 14396151, -30233575, 15272409},
-		},
-		{
-			FieldElement{-12288309, 3169463, 28813183, 16658753, 25116432, -5630466, -25173957, -12636138, -25014757, 1950504},
-			FieldElement{-26180358, 9489187, 11053416, -14746161, -31053720, 5825630, -8384306, -8767532, 15341279, 8373727},
-			FieldElement{28685821, 7759505, -14378516, -12002860, -31971820, 4079242, 298136, -10232602, -2878207, 15190420},
-		},
-		{
-			FieldElement{-32932876, 13806336, -14337485, -15794431, -24004620, 10940928, 8669718, 2742393, -26033313, -6875003},
-			FieldElement{-1580388, -11729417, -25979658, -11445023, -17411874, -10912854, 9291594, -16247779, -12154742, 6048605},
-			FieldElement{-30305315, 14843444, 1539301, 11864366, 20201677, 1900163, 13934231, 5128323, 11213262, 9168384},
-		},
-		{
-			FieldElement{-26280513, 11007847, 19408960, -940758, -18592965, -4328580, -5088060, -11105150, 20470157, -16398701},
-			FieldElement{-23136053, 9282192, 14855179, -15390078, -7362815, -14408560, -22783952, 14461608, 14042978, 5230683},
-			FieldElement{29969567, -2741594, -16711867, -8552442, 9175486, -2468974, 21556951, 3506042, -5933891, -12449708},
-		},
-		{
-			FieldElement{-3144746, 8744661, 19704003, 4581278, -20430686, 6830683, -21284170, 8971513, -28539189, 15326563},
-			FieldElement{-19464629, 10110288, -17262528, -3503892, -23500387, 1355669, -15523050, 15300988, -20514118, 9168260},
-			FieldElement{-5353335, 4488613, -23803248, 16314347, 7780487, -15638939, -28948358, 9601605, 33087103, -9011387},
-		},
-		{
-			FieldElement{-19443170, -15512900, -20797467, -12445323, -29824447, 10229461, -27444329, -15000531, -5996870, 15664672},
-			FieldElement{23294591, -16632613, -22650781, -8470978, 27844204, 11461195, 13099750, -2460356, 18151676, 13417686},
-			FieldElement{-24722913, -4176517, -31150679, 5988919, -26858785, 6685065, 1661597, -12551441, 15271676, -15452665},
-		},
-	},
-	{
-		{
-			FieldElement{11433042, -13228665, 8239631, -5279517, -1985436, -725718, -18698764, 2167544, -6921301, -13440182},
-			FieldElement{-31436171, 15575146, 30436815, 12192228, -22463353, 9395379, -9917708, -8638997, 12215110, 12028277},
-			FieldElement{14098400, 6555944, 23007258, 5757252, -15427832, -12950502, 30123440, 4617780, -16900089, -655628},
-		},
-		{
-			FieldElement{-4026201, -15240835, 11893168, 13718664, -14809462, 1847385, -15819999, 10154009, 23973261, -12684474},
-			FieldElement{-26531820, -3695990, -1908898, 2534301, -31870557, -16550355, 18341390, -11419951, 32013174, -10103539},
-			FieldElement{-25479301, 10876443, -11771086, -14625140, -12369567, 1838104, 21911214, 6354752, 4425632, -837822},
-		},
-		{
-			FieldElement{-10433389, -14612966, 22229858, -3091047, -13191166, 776729, -17415375, -12020462, 4725005, 14044970},
-			FieldElement{19268650, -7304421, 1555349, 8692754, -21474059, -9910664, 6347390, -1411784, -19522291, -16109756},
-			FieldElement{-24864089, 12986008, -10898878, -5558584, -11312371, -148526, 19541418, 8180106, 9282262, 10282508},
-		},
-		{
-			FieldElement{-26205082, 4428547, -8661196, -13194263, 4098402, -14165257, 15522535, 8372215, 5542595, -10702683},
-			FieldElement{-10562541, 14895633, 26814552, -16673850, -17480754, -2489360, -2781891, 6993761, -18093885, 10114655},
-			FieldElement{-20107055, -929418, 31422704, 10427861, -7110749, 6150669, -29091755, -11529146, 25953725, -106158},
-		},
-		{
-			FieldElement{-4234397, -8039292, -9119125, 3046000, 2101609, -12607294, 19390020, 6094296, -3315279, 12831125},
-			FieldElement{-15998678, 7578152, 5310217, 14408357, -33548620, -224739, 31575954, 6326196, 7381791, -2421839},
-			FieldElement{-20902779, 3296811, 24736065, -16328389, 18374254, 7318640, 6295303, 8082724, -15362489, 12339664},
-		},
-		{
-			FieldElement{27724736, 2291157, 6088201, -14184798, 1792727, 5857634, 13848414, 15768922, 25091167, 14856294},
-			FieldElement{-18866652, 8331043, 24373479, 8541013, -701998, -9269457, 12927300, -12695493, -22182473, -9012899},
-			FieldElement{-11423429, -5421590, 11632845, 3405020, 30536730, -11674039, -27260765, 13866390, 30146206, 9142070},
-		},
-		{
-			FieldElement{3924129, -15307516, -13817122, -10054960, 12291820, -668366, -27702774, 9326384, -8237858, 4171294},
-			FieldElement{-15921940, 16037937, 6713787, 16606682, -21612135, 2790944, 26396185, 3731949, 345228, -5462949},
-			FieldElement{-21327538, 13448259, 25284571, 1143661, 20614966, -8849387, 2031539, -12391231, -16253183, -13582083},
-		},
-		{
-			FieldElement{31016211, -16722429, 26371392, -14451233, -5027349, 14854137, 17477601, 3842657, 28012650, -16405420},
-			FieldElement{-5075835, 9368966, -8562079, -4600902, -15249953, 6970560, -9189873, 16292057, -8867157, 3507940},
-			FieldElement{29439664, 3537914, 23333589, 6997794, -17555561, -11018068, -15209202, -15051267, -9164929, 6580396},
-		},
-	},
-	{
-		{
-			FieldElement{-12185861, -7679788, 16438269, 10826160, -8696817, -6235611, 17860444, -9273846, -2095802, 9304567},
-			FieldElement{20714564, -4336911, 29088195, 7406487, 11426967, -5095705, 14792667, -14608617, 5289421, -477127},
-			FieldElement{-16665533, -10650790, -6160345, -13305760, 9192020, -1802462, 17271490, 12349094, 26939669, -3752294},
-		},
-		{
-			FieldElement{-12889898, 9373458, 31595848, 16374215, 21471720, 13221525, -27283495, -12348559, -3698806, 117887},
-			FieldElement{22263325, -6560050, 3984570, -11174646, -15114008, -566785, 28311253, 5358056, -23319780, 541964},
-			FieldElement{16259219, 3261970, 2309254, -15534474, -16885711, -4581916, 24134070, -16705829, -13337066, -13552195},
-		},
-		{
-			FieldElement{9378160, -13140186, -22845982, -12745264, 28198281, -7244098, -2399684, -717351, 690426, 14876244},
-			FieldElement{24977353, -314384, -8223969, -13465086, 28432343, -1176353, -13068804, -12297348, -22380984, 6618999},
-			FieldElement{-1538174, 11685646, 12944378, 13682314, -24389511, -14413193, 8044829, -13817328, 32239829, -5652762},
-		},
-		{
-			FieldElement{-18603066, 4762990, -926250, 8885304, -28412480, -3187315, 9781647, -10350059, 32779359, 5095274},
-			FieldElement{-33008130, -5214506, -32264887, -3685216, 9460461, -9327423, -24601656, 14506724, 21639561, -2630236},
-			FieldElement{-16400943, -13112215, 25239338, 15531969, 3987758, -4499318, -1289502, -6863535, 17874574, 558605},
-		},
-		{
-			FieldElement{-13600129, 10240081, 9171883, 16131053, -20869254, 9599700, 33499487, 5080151, 2085892, 5119761},
-			FieldElement{-22205145, -2519528, -16381601, 414691, -25019550, 2170430, 30634760, -8363614, -31999993, -5759884},
-			FieldElement{-6845704, 15791202, 8550074, -1312654, 29928809, -12092256, 27534430, -7192145, -22351378, 12961482},
-		},
-		{
-			FieldElement{-24492060, -9570771, 10368194, 11582341, -23397293, -2245287, 16533930, 8206996, -30194652, -5159638},
-			FieldElement{-11121496, -3382234, 2307366, 6362031, -135455, 8868177, -16835630, 7031275, 7589640, 8945490},
-			FieldElement{-32152748, 8917967, 6661220, -11677616, -1192060, -15793393, 7251489, -11182180, 24099109, -14456170},
-		},
-		{
-			FieldElement{5019558, -7907470, 4244127, -14714356, -26933272, 6453165, -19118182, -13289025, -6231896, -10280736},
-			FieldElement{10853594, 10721687, 26480089, 5861829, -22995819, 1972175, -1866647, -10557898, -3363451, -6441124},
-			FieldElement{-17002408, 5906790, 221599, -6563147, 7828208, -13248918, 24362661, -2008168, -13866408, 7421392},
-		},
-		{
-			FieldElement{8139927, -6546497, 32257646, -5890546, 30375719, 1886181, -21175108, 15441252, 28826358, -4123029},
-			FieldElement{6267086, 9695052, 7709135, -16603597, -32869068, -1886135, 14795160, -7840124, 13746021, -1742048},
-			FieldElement{28584902, 7787108, -6732942, -15050729, 22846041, -7571236, -3181936, -363524, 4771362, -8419958},
-		},
-	},
-	{
-		{
-			FieldElement{24949256, 6376279, -27466481, -8174608, -18646154, -9930606, 33543569, -12141695, 3569627, 11342593},
-			FieldElement{26514989, 4740088, 27912651, 3697550, 19331575, -11472339, 6809886, 4608608, 7325975, -14801071},
-			FieldElement{-11618399, -14554430, -24321212, 7655128, -1369274, 5214312, -27400540, 10258390, -17646694, -8186692},
-		},
-		{
-			FieldElement{11431204, 15823007, 26570245, 14329124, 18029990, 4796082, -31446179, 15580664, 9280358, -3973687},
-			FieldElement{-160783, -10326257, -22855316, -4304997, -20861367, -13621002, -32810901, -11181622, -15545091, 4387441},
-			FieldElement{-20799378, 12194512, 3937617, -5805892, -27154820, 9340370, -24513992, 8548137, 20617071, -7482001},
-		},
-		{
-			FieldElement{-938825, -3930586, -8714311, 16124718, 24603125, -6225393, -13775352, -11875822, 24345683, 10325460},
-			FieldElement{-19855277, -1568885, -22202708, 8714034, 14007766, 6928528, 16318175, -1010689, 4766743, 3552007},
-			FieldElement{-21751364, -16730916, 1351763, -803421, -4009670, 3950935, 3217514, 14481909, 10988822, -3994762},
-		},
-		{
-			FieldElement{15564307, -14311570, 3101243, 5684148, 30446780, -8051356, 12677127, -6505343, -8295852, 13296005},
-			FieldElement{-9442290, 6624296, -30298964, -11913677, -4670981, -2057379, 31521204, 9614054, -30000824, 12074674},
-			FieldElement{4771191, -135239, 14290749, -13089852, 27992298, 14998318, -1413936, -1556716, 29832613, -16391035},
-		},
-		{
-			FieldElement{7064884, -7541174, -19161962, -5067537, -18891269, -2912736, 25825242, 5293297, -27122660, 13101590},
-			FieldElement{-2298563, 2439670, -7466610, 1719965, -27267541, -16328445, 32512469, -5317593, -30356070, -4190957},
-			FieldElement{-30006540, 10162316, -33180176, 3981723, -16482138, -13070044, 14413974, 9515896, 19568978, 9628812},
-		},
-		{
-			FieldElement{33053803, 199357, 15894591, 1583059, 27380243, -4580435, -17838894, -6106839, -6291786, 3437740},
-			FieldElement{-18978877, 3884493, 19469877, 12726490, 15913552, 13614290, -22961733, 70104, 7463304, 4176122},
-			FieldElement{-27124001, 10659917, 11482427, -16070381, 12771467, -6635117, -32719404, -5322751, 24216882, 5944158},
-		},
-		{
-			FieldElement{8894125, 7450974, -2664149, -9765752, -28080517, -12389115, 19345746, 14680796, 11632993, 5847885},
-			FieldElement{26942781, -2315317, 9129564, -4906607, 26024105, 11769399, -11518837, 6367194, -9727230, 4782140},
-			FieldElement{19916461, -4828410, -22910704, -11414391, 25606324, -5972441, 33253853, 8220911, 6358847, -1873857},
-		},
-		{
-			FieldElement{801428, -2081702, 16569428, 11065167, 29875704, 96627, 7908388, -4480480, -13538503, 1387155},
-			FieldElement{19646058, 5720633, -11416706, 12814209, 11607948, 12749789, 14147075, 15156355, -21866831, 11835260},
-			FieldElement{19299512, 1155910, 28703737, 14890794, 2925026, 7269399, 26121523, 15467869, -26560550, 5052483},
-		},
-	},
-	{
-		{
-			FieldElement{-3017432, 10058206, 1980837, 3964243, 22160966, 12322533, -6431123, -12618185, 12228557, -7003677},
-			FieldElement{32944382, 14922211, -22844894, 5188528, 21913450, -8719943, 4001465, 13238564, -6114803, 8653815},
-			FieldElement{22865569, -4652735, 27603668, -12545395, 14348958, 8234005, 24808405, 5719875, 28483275, 2841751},
-		},
-		{
-			FieldElement{-16420968, -1113305, -327719, -12107856, 21886282, -15552774, -1887966, -315658, 19932058, -12739203},
-			FieldElement{-11656086, 10087521, -8864888, -5536143, -19278573, -3055912, 3999228, 13239134, -4777469, -13910208},
-			FieldElement{1382174, -11694719, 17266790, 9194690, -13324356, 9720081, 20403944, 11284705, -14013818, 3093230},
-		},
-		{
-			FieldElement{16650921, -11037932, -1064178, 1570629, -8329746, 7352753, -302424, 16271225, -24049421, -6691850},
-			FieldElement{-21911077, -5927941, -4611316, -5560156, -31744103, -10785293, 24123614, 15193618, -21652117, -16739389},
-			FieldElement{-9935934, -4289447, -25279823, 4372842, 2087473, 10399484, 31870908, 14690798, 17361620, 11864968},
-		},
-		{
-			FieldElement{-11307610, 6210372, 13206574, 5806320, -29017692, -13967200, -12331205, -7486601, -25578460, -16240689},
-			FieldElement{14668462, -12270235, 26039039, 15305210, 25515617, 4542480, 10453892, 6577524, 9145645, -6443880},
-			FieldElement{5974874, 3053895, -9433049, -10385191, -31865124, 3225009, -7972642, 3936128, -5652273, -3050304},
-		},
-		{
-			FieldElement{30625386, -4729400, -25555961, -12792866, -20484575, 7695099, 17097188, -16303496, -27999779, 1803632},
-			FieldElement{-3553091, 9865099, -5228566, 4272701, -5673832, -16689700, 14911344, 12196514, -21405489, 7047412},
-			FieldElement{20093277, 9920966, -11138194, -5343857, 13161587, 12044805, -32856851, 4124601, -32343828, -10257566},
-		},
-		{
-			FieldElement{-20788824, 14084654, -13531713, 7842147, 19119038, -13822605, 4752377, -8714640, -21679658, 2288038},
-			FieldElement{-26819236, -3283715, 29965059, 3039786, -14473765, 2540457, 29457502, 14625692, -24819617, 12570232},
-			FieldElement{-1063558, -11551823, 16920318, 12494842, 1278292, -5869109, -21159943, -3498680, -11974704, 4724943},
-		},
-		{
-			FieldElement{17960970, -11775534, -4140968, -9702530, -8876562, -1410617, -12907383, -8659932, -29576300, 1903856},
-			FieldElement{23134274, -14279132, -10681997, -1611936, 20684485, 15770816, -12989750, 3190296, 26955097, 14109738},
-			FieldElement{15308788, 5320727, -30113809, -14318877, 22902008, 7767164, 29425325, -11277562, 31960942, 11934971},
-		},
-		{
-			FieldElement{-27395711, 8435796, 4109644, 12222639, -24627868, 14818669, 20638173, 4875028, 10491392, 1379718},
-			FieldElement{-13159415, 9197841, 3875503, -8936108, -1383712, -5879801, 33518459, 16176658, 21432314, 12180697},
-			FieldElement{-11787308, 11500838, 13787581, -13832590, -22430679, 10140205, 1465425, 12689540, -10301319, -13872883},
-		},
-	},
-	{
-		{
-			FieldElement{5414091, -15386041, -21007664, 9643570, 12834970, 1186149, -2622916, -1342231, 26128231, 6032912},
-			FieldElement{-26337395, -13766162, 32496025, -13653919, 17847801, -12669156, 3604025, 8316894, -25875034, -10437358},
-			FieldElement{3296484, 6223048, 24680646, -12246460, -23052020, 5903205, -8862297, -4639164, 12376617, 3188849},
-		},
-		{
-			FieldElement{29190488, -14659046, 27549113, -1183516, 3520066, -10697301, 32049515, -7309113, -16109234, -9852307},
-			FieldElement{-14744486, -9309156, 735818, -598978, -20407687, -5057904, 25246078, -15795669, 18640741, -960977},
-			FieldElement{-6928835, -16430795, 10361374, 5642961, 4910474, 12345252, -31638386, -494430, 10530747, 1053335},
-		},
-		{
-			FieldElement{-29265967, -14186805, -13538216, -12117373, -19457059, -10655384, -31462369, -2948985, 24018831, 15026644},
-			FieldElement{-22592535, -3145277, -2289276, 5953843, -13440189, 9425631, 25310643, 13003497, -2314791, -15145616},
-			FieldElement{-27419985, -603321, -8043984, -1669117, -26092265, 13987819, -27297622, 187899, -23166419, -2531735},
-		},
-		{
-			FieldElement{-21744398, -13810475, 1844840, 5021428, -10434399, -15911473, 9716667, 16266922, -5070217, 726099},
-			FieldElement{29370922, -6053998, 7334071, -15342259, 9385287, 2247707, -13661962, -4839461, 30007388, -15823341},
-			FieldElement{-936379, 16086691, 23751945, -543318, -1167538, -5189036, 9137109, 730663, 9835848, 4555336},
-		},
-		{
-			FieldElement{-23376435, 1410446, -22253753, -12899614, 30867635, 15826977, 17693930, 544696, -11985298, 12422646},
-			FieldElement{31117226, -12215734, -13502838, 6561947, -9876867, -12757670, -5118685, -4096706, 29120153, 13924425},
-			FieldElement{-17400879, -14233209, 19675799, -2734756, -11006962, -5858820, -9383939, -11317700, 7240931, -237388},
-		},
-		{
-			FieldElement{-31361739, -11346780, -15007447, -5856218, -22453340, -12152771, 1222336, 4389483, 3293637, -15551743},
-			FieldElement{-16684801, -14444245, 11038544, 11054958, -13801175, -3338533, -24319580, 7733547, 12796905, -6335822},
-			FieldElement{-8759414, -10817836, -25418864, 10783769, -30615557, -9746811, -28253339, 3647836, 3222231, -11160462},
-		},
-		{
-			FieldElement{18606113, 1693100, -25448386, -15170272, 4112353, 10045021, 23603893, -2048234, -7550776, 2484985},
-			FieldElement{9255317, -3131197, -12156162, -1004256, 13098013, -9214866, 16377220, -2102812, -19802075, -3034702},
-			FieldElement{-22729289, 7496160, -5742199, 11329249, 19991973, -3347502, -31718148, 9936966, -30097688, -10618797},
-		},
-		{
-			FieldElement{21878590, -5001297, 4338336, 13643897, -3036865, 13160960, 19708896, 5415497, -7360503, -4109293},
-			FieldElement{27736861, 10103576, 12500508, 8502413, -3413016, -9633558, 10436918, -1550276, -23659143, -8132100},
-			FieldElement{19492550, -12104365, -29681976, -852630, -3208171, 12403437, 30066266, 8367329, 13243957, 8709688},
-		},
-	},
-	{
-		{
-			FieldElement{12015105, 2801261, 28198131, 10151021, 24818120, -4743133, -11194191, -5645734, 5150968, 7274186},
-			FieldElement{2831366, -12492146, 1478975, 6122054, 23825128, -12733586, 31097299, 6083058, 31021603, -9793610},
-			FieldElement{-2529932, -2229646, 445613, 10720828, -13849527, -11505937, -23507731, 16354465, 15067285, -14147707},
-		},
-		{
-			FieldElement{7840942, 14037873, -33364863, 15934016, -728213, -3642706, 21403988, 1057586, -19379462, -12403220},
-			FieldElement{915865, -16469274, 15608285, -8789130, -24357026, 6060030, -17371319, 8410997, -7220461, 16527025},
-			FieldElement{32922597, -556987, 20336074, -16184568, 10903705, -5384487, 16957574, 52992, 23834301, 6588044},
-		},
-		{
-			FieldElement{32752030, 11232950, 3381995, -8714866, 22652988, -10744103, 17159699, 16689107, -20314580, -1305992},
-			FieldElement{-4689649, 9166776, -25710296, -10847306, 11576752, 12733943, 7924251, -2752281, 1976123, -7249027},
-			FieldElement{21251222, 16309901, -2983015, -6783122, 30810597, 12967303, 156041, -3371252, 12331345, -8237197},
-		},
-		{
-			FieldElement{8651614, -4477032, -16085636, -4996994, 13002507, 2950805, 29054427, -5106970, 10008136, -4667901},
-			FieldElement{31486080, 15114593, -14261250, 12951354, 14369431, -7387845, 16347321, -13662089, 8684155, -10532952},
-			FieldElement{19443825, 11385320, 24468943, -9659068, -23919258, 2187569, -26263207, -6086921, 31316348, 14219878},
-		},
-		{
-			FieldElement{-28594490, 1193785, 32245219, 11392485, 31092169, 15722801, 27146014, 6992409, 29126555, 9207390},
-			FieldElement{32382935, 1110093, 18477781, 11028262, -27411763, -7548111, -4980517, 10843782, -7957600, -14435730},
-			FieldElement{2814918, 7836403, 27519878, -7868156, -20894015, -11553689, -21494559, 8550130, 28346258, 1994730},
-		},
-		{
-			FieldElement{-19578299, 8085545, -14000519, -3948622, 2785838, -16231307, -19516951, 7174894, 22628102, 8115180},
-			FieldElement{-30405132, 955511, -11133838, -15078069, -32447087, -13278079, -25651578, 3317160, -9943017, 930272},
-			FieldElement{-15303681, -6833769, 28856490, 1357446, 23421993, 1057177, 24091212, -1388970, -22765376, -10650715},
-		},
-		{
-			FieldElement{-22751231, -5303997, -12907607, -12768866, -15811511, -7797053, -14839018, -16554220, -1867018, 8398970},
-			FieldElement{-31969310, 2106403, -4736360, 1362501, 12813763, 16200670, 22981545, -6291273, 18009408, -15772772},
-			FieldElement{-17220923, -9545221, -27784654, 14166835, 29815394, 7444469, 29551787, -3727419, 19288549, 1325865},
-		},
-		{
-			FieldElement{15100157, -15835752, -23923978, -1005098, -26450192, 15509408, 12376730, -3479146, 33166107, -8042750},
-			FieldElement{20909231, 13023121, -9209752, 16251778, -5778415, -8094914, 12412151, 10018715, 2213263, -13878373},
-			FieldElement{32529814, -11074689, 30361439, -16689753, -9135940, 1513226, 22922121, 6382134, -5766928, 8371348},
-		},
-	},
-	{
-		{
-			FieldElement{9923462, 11271500, 12616794, 3544722, -29998368, -1721626, 12891687, -8193132, -26442943, 10486144},
-			FieldElement{-22597207, -7012665, 8587003, -8257861, 4084309, -12970062, 361726, 2610596, -23921530, -11455195},
-			FieldElement{5408411, -1136691, -4969122, 10561668, 24145918, 14240566, 31319731, -4235541, 19985175, -3436086},
-		},
-		{
-			FieldElement{-13994457, 16616821, 14549246, 3341099, 32155958, 13648976, -17577068, 8849297, 65030, 8370684},
-			FieldElement{-8320926, -12049626, 31204563, 5839400, -20627288, -1057277, -19442942, 6922164, 12743482, -9800518},
-			FieldElement{-2361371, 12678785, 28815050, 4759974, -23893047, 4884717, 23783145, 11038569, 18800704, 255233},
-		},
-		{
-			FieldElement{-5269658, -1773886, 13957886, 7990715, 23132995, 728773, 13393847, 9066957, 19258688, -14753793},
-			FieldElement{-2936654, -10827535, -10432089, 14516793, -3640786, 4372541, -31934921, 2209390, -1524053, 2055794},
-			FieldElement{580882, 16705327, 5468415, -2683018, -30926419, -14696000, -7203346, -8994389, -30021019, 7394435},
-		},
-		{
-			FieldElement{23838809, 1822728, -15738443, 15242727, 8318092, -3733104, -21672180, -3492205, -4821741, 14799921},
-			FieldElement{13345610, 9759151, 3371034, -16137791, 16353039, 8577942, 31129804, 13496856, -9056018, 7402518},
-			FieldElement{2286874, -4435931, -20042458, -2008336, -13696227, 5038122, 11006906, -15760352, 8205061, 1607563},
-		},
-		{
-			FieldElement{14414086, -8002132, 3331830, -3208217, 22249151, -5594188, 18364661, -2906958, 30019587, -9029278},
-			FieldElement{-27688051, 1585953, -10775053, 931069, -29120221, -11002319, -14410829, 12029093, 9944378, 8024},
-			FieldElement{4368715, -3709630, 29874200, -15022983, -20230386, -11410704, -16114594, -999085, -8142388, 5640030},
-		},
-		{
-			FieldElement{10299610, 13746483, 11661824, 16234854, 7630238, 5998374, 9809887, -16694564, 15219798, -14327783},
-			FieldElement{27425505, -5719081, 3055006, 10660664, 23458024, 595578, -15398605, -1173195, -18342183, 9742717},
-			FieldElement{6744077, 2427284, 26042789, 2720740, -847906, 1118974, 32324614, 7406442, 12420155, 1994844},
-		},
-		{
-			FieldElement{14012521, -5024720, -18384453, -9578469, -26485342, -3936439, -13033478, -10909803, 24319929, -6446333},
-			FieldElement{16412690, -4507367, 10772641, 15929391, -17068788, -4658621, 10555945, -10484049, -30102368, -4739048},
-			FieldElement{22397382, -7767684, -9293161, -12792868, 17166287, -9755136, -27333065, 6199366, 21880021, -12250760},
-		},
-		{
-			FieldElement{-4283307, 5368523, -31117018, 8163389, -30323063, 3209128, 16557151, 8890729, 8840445, 4957760},
-			FieldElement{-15447727, 709327, -6919446, -10870178, -29777922, 6522332, -21720181, 12130072, -14796503, 5005757},
-			FieldElement{-2114751, -14308128, 23019042, 15765735, -25269683, 6002752, 10183197, -13239326, -16395286, -2176112},
-		},
-	},
-	{
-		{
-			FieldElement{-19025756, 1632005, 13466291, -7995100, -23640451, 16573537, -32013908, -3057104, 22208662, 2000468},
-			FieldElement{3065073, -1412761, -25598674, -361432, -17683065, -5703415, -8164212, 11248527, -3691214, -7414184},
-			FieldElement{10379208, -6045554, 8877319, 1473647, -29291284, -12507580, 16690915, 2553332, -3132688, 16400289},
-		},
-		{
-			FieldElement{15716668, 1254266, -18472690, 7446274, -8448918, 6344164, -22097271, -7285580, 26894937, 9132066},
-			FieldElement{24158887, 12938817, 11085297, -8177598, -28063478, -4457083, -30576463, 64452, -6817084, -2692882},
-			FieldElement{13488534, 7794716, 22236231, 5989356, 25426474, -12578208, 2350710, -3418511, -4688006, 2364226},
-		},
-		{
-			FieldElement{16335052, 9132434, 25640582, 6678888, 1725628, 8517937, -11807024, -11697457, 15445875, -7798101},
-			FieldElement{29004207, -7867081, 28661402, -640412, -12794003, -7943086, 31863255, -4135540, -278050, -15759279},
-			FieldElement{-6122061, -14866665, -28614905, 14569919, -10857999, -3591829, 10343412, -6976290, -29828287, -10815811},
-		},
-		{
-			FieldElement{27081650, 3463984, 14099042, -4517604, 1616303, -6205604, 29542636, 15372179, 17293797, 960709},
-			FieldElement{20263915, 11434237, -5765435, 11236810, 13505955, -10857102, -16111345, 6493122, -19384511, 7639714},
-			FieldElement{-2830798, -14839232, 25403038, -8215196, -8317012, -16173699, 18006287, -16043750, 29994677, -15808121},
-		},
-		{
-			FieldElement{9769828, 5202651, -24157398, -13631392, -28051003, -11561624, -24613141, -13860782, -31184575, 709464},
-			FieldElement{12286395, 13076066, -21775189, -1176622, -25003198, 4057652, -32018128, -8890874, 16102007, 13205847},
-			FieldElement{13733362, 5599946, 10557076, 3195751, -5557991, 8536970, -25540170, 8525972, 10151379, 10394400},
-		},
-		{
-			FieldElement{4024660, -16137551, 22436262, 12276534, -9099015, -2686099, 19698229, 11743039, -33302334, 8934414},
-			FieldElement{-15879800, -4525240, -8580747, -2934061, 14634845, -698278, -9449077, 3137094, -11536886, 11721158},
-			FieldElement{17555939, -5013938, 8268606, 2331751, -22738815, 9761013, 9319229, 8835153, -9205489, -1280045},
-		},
-		{
-			FieldElement{-461409, -7830014, 20614118, 16688288, -7514766, -4807119, 22300304, 505429, 6108462, -6183415},
-			FieldElement{-5070281, 12367917, -30663534, 3234473, 32617080, -8422642, 29880583, -13483331, -26898490, -7867459},
-			FieldElement{-31975283, 5726539, 26934134, 10237677, -3173717, -605053, 24199304, 3795095, 7592688, -14992079},
-		},
-		{
-			FieldElement{21594432, -14964228, 17466408, -4077222, 32537084, 2739898, 6407723, 12018833, -28256052, 4298412},
-			FieldElement{-20650503, -11961496, -27236275, 570498, 3767144, -1717540, 13891942, -1569194, 13717174, 10805743},
-			FieldElement{-14676630, -15644296, 15287174, 11927123, 24177847, -8175568, -796431, 14860609, -26938930, -5863836},
-		},
-	},
-	{
-		{
-			FieldElement{12962541, 5311799, -10060768, 11658280, 18855286, -7954201, 13286263, -12808704, -4381056, 9882022},
-			FieldElement{18512079, 11319350, -20123124, 15090309, 18818594, 5271736, -22727904, 3666879, -23967430, -3299429},
-			FieldElement{-6789020, -3146043, 16192429, 13241070, 15898607, -14206114, -10084880, -6661110, -2403099, 5276065},
-		},
-		{
-			FieldElement{30169808, -5317648, 26306206, -11750859, 27814964, 7069267, 7152851, 3684982, 1449224, 13082861},
-			FieldElement{10342826, 3098505, 2119311, 193222, 25702612, 12233820, 23697382, 15056736, -21016438, -8202000},
-			FieldElement{-33150110, 3261608, 22745853, 7948688, 19370557, -15177665, -26171976, 6482814, -10300080, -11060101},
-		},
-		{
-			FieldElement{32869458, -5408545, 25609743, 15678670, -10687769, -15471071, 26112421, 2521008, -22664288, 6904815},
-			FieldElement{29506923, 4457497, 3377935, -9796444, -30510046, 12935080, 1561737, 3841096, -29003639, -6657642},
-			FieldElement{10340844, -6630377, -18656632, -2278430, 12621151, -13339055, 30878497, -11824370, -25584551, 5181966},
-		},
-		{
-			FieldElement{25940115, -12658025, 17324188, -10307374, -8671468, 15029094, 24396252, -16450922, -2322852, -12388574},
-			FieldElement{-21765684, 9916823, -1300409, 4079498, -1028346, 11909559, 1782390, 12641087, 20603771, -6561742},
-			FieldElement{-18882287, -11673380, 24849422, 11501709, 13161720, -4768874, 1925523, 11914390, 4662781, 7820689},
-		},
-		{
-			FieldElement{12241050, -425982, 8132691, 9393934, 32846760, -1599620, 29749456, 12172924, 16136752, 15264020},
-			FieldElement{-10349955, -14680563, -8211979, 2330220, -17662549, -14545780, 10658213, 6671822, 19012087, 3772772},
-			FieldElement{3753511, -3421066, 10617074, 2028709, 14841030, -6721664, 28718732, -15762884, 20527771, 12988982},
-		},
-		{
-			FieldElement{-14822485, -5797269, -3707987, 12689773, -898983, -10914866, -24183046, -10564943, 3299665, -12424953},
-			FieldElement{-16777703, -15253301, -9642417, 4978983, 3308785, 8755439, 6943197, 6461331, -25583147, 8991218},
-			FieldElement{-17226263, 1816362, -1673288, -6086439, 31783888, -8175991, -32948145, 7417950, -30242287, 1507265},
-		},
-		{
-			FieldElement{29692663, 6829891, -10498800, 4334896, 20945975, -11906496, -28887608, 8209391, 14606362, -10647073},
-			FieldElement{-3481570, 8707081, 32188102, 5672294, 22096700, 1711240, -33020695, 9761487, 4170404, -2085325},
-			FieldElement{-11587470, 14855945, -4127778, -1531857, -26649089, 15084046, 22186522, 16002000, -14276837, -8400798},
-		},
-		{
-			FieldElement{-4811456, 13761029, -31703877, -2483919, -3312471, 7869047, -7113572, -9620092, 13240845, 10965870},
-			FieldElement{-7742563, -8256762, -14768334, -13656260, -23232383, 12387166, 4498947, 14147411, 29514390, 4302863},
-			FieldElement{-13413405, -12407859, 20757302, -13801832, 14785143, 8976368, -5061276, -2144373, 17846988, -13971927},
-		},
-	},
-	{
-		{
-			FieldElement{-2244452, -754728, -4597030, -1066309, -6247172, 1455299, -21647728, -9214789, -5222701, 12650267},
-			FieldElement{-9906797, -16070310, 21134160, 12198166, -27064575, 708126, 387813, 13770293, -19134326, 10958663},
-			FieldElement{22470984, 12369526, 23446014, -5441109, -21520802, -9698723, -11772496, -11574455, -25083830, 4271862},
-		},
-		{
-			FieldElement{-25169565, -10053642, -19909332, 15361595, -5984358, 2159192, 75375, -4278529, -32526221, 8469673},
-			FieldElement{15854970, 4148314, -8893890, 7259002, 11666551, 13824734, -30531198, 2697372, 24154791, -9460943},
-			FieldElement{15446137, -15806644, 29759747, 14019369, 30811221, -9610191, -31582008, 12840104, 24913809, 9815020},
-		},
-		{
-			FieldElement{-4709286, -5614269, -31841498, -12288893, -14443537, 10799414, -9103676, 13438769, 18735128, 9466238},
-			FieldElement{11933045, 9281483, 5081055, -5183824, -2628162, -4905629, -7727821, -10896103, -22728655, 16199064},
-			FieldElement{14576810, 379472, -26786533, -8317236, -29426508, -10812974, -102766, 1876699, 30801119, 2164795},
-		},
-		{
-			FieldElement{15995086, 3199873, 13672555, 13712240, -19378835, -4647646, -13081610, -15496269, -13492807, 1268052},
-			FieldElement{-10290614, -3659039, -3286592, 10948818, 23037027, 3794475, -3470338, -12600221, -17055369, 3565904},
-			FieldElement{29210088, -9419337, -5919792, -4952785, 10834811, -13327726, -16512102, -10820713, -27162222, -14030531},
-		},
-		{
-			FieldElement{-13161890, 15508588, 16663704, -8156150, -28349942, 9019123, -29183421, -3769423, 2244111, -14001979},
-			FieldElement{-5152875, -3800936, -9306475, -6071583, 16243069, 14684434, -25673088, -16180800, 13491506, 4641841},
-			FieldElement{10813417, 643330, -19188515, -728916, 30292062, -16600078, 27548447, -7721242, 14476989, -12767431},
-		},
-		{
-			FieldElement{10292079, 9984945, 6481436, 8279905, -7251514, 7032743, 27282937, -1644259, -27912810, 12651324},
-			FieldElement{-31185513, -813383, 22271204, 11835308, 10201545, 15351028, 17099662, 3988035, 21721536, -3148940},
-			FieldElement{10202177, -6545839, -31373232, -9574638, -32150642, -8119683, -12906320, 3852694, 13216206, 14842320},
-		},
-		{
-			FieldElement{-15815640, -10601066, -6538952, -7258995, -6984659, -6581778, -31500847, 13765824, -27434397, 9900184},
-			FieldElement{14465505, -13833331, -32133984, -14738873, -27443187, 12990492, 33046193, 15796406, -7051866, -8040114},
-			FieldElement{30924417, -8279620, 6359016, -12816335, 16508377, 9071735, -25488601, 15413635, 9524356, -7018878},
-		},
-		{
-			FieldElement{12274201, -13175547, 32627641, -1785326, 6736625, 13267305, 5237659, -5109483, 15663516, 4035784},
-			FieldElement{-2951309, 8903985, 17349946, 601635, -16432815, -4612556, -13732739, -15889334, -22258478, 4659091},
-			FieldElement{-16916263, -4952973, -30393711, -15158821, 20774812, 15897498, 5736189, 15026997, -2178256, -13455585},
-		},
-	},
-	{
-		{
-			FieldElement{-8858980, -2219056, 28571666, -10155518, -474467, -10105698, -3801496, 278095, 23440562, -290208},
-			FieldElement{10226241, -5928702, 15139956, 120818, -14867693, 5218603, 32937275, 11551483, -16571960, -7442864},
-			FieldElement{17932739, -12437276, -24039557, 10749060, 11316803, 7535897, 22503767, 5561594, -3646624, 3898661},
-		},
-		{
-			FieldElement{7749907, -969567, -16339731, -16464, -25018111, 15122143, -1573531, 7152530, 21831162, 1245233},
-			FieldElement{26958459, -14658026, 4314586, 8346991, -5677764, 11960072, -32589295, -620035, -30402091, -16716212},
-			FieldElement{-12165896, 9166947, 33491384, 13673479, 29787085, 13096535, 6280834, 14587357, -22338025, 13987525},
-		},
-		{
-			FieldElement{-24349909, 7778775, 21116000, 15572597, -4833266, -5357778, -4300898, -5124639, -7469781, -2858068},
-			FieldElement{9681908, -6737123, -31951644, 13591838, -6883821, 386950, 31622781, 6439245, -14581012, 4091397},
-			FieldElement{-8426427, 1470727, -28109679, -1596990, 3978627, -5123623, -19622683, 12092163, 29077877, -14741988},
-		},
-		{
-			FieldElement{5269168, -6859726, -13230211, -8020715, 25932563, 1763552, -5606110, -5505881, -20017847, 2357889},
-			FieldElement{32264008, -15407652, -5387735, -1160093, -2091322, -3946900, 23104804, -12869908, 5727338, 189038},
-			FieldElement{14609123, -8954470, -6000566, -16622781, -14577387, -7743898, -26745169, 10942115, -25888931, -14884697},
-		},
-		{
-			FieldElement{20513500, 5557931, -15604613, 7829531, 26413943, -2019404, -21378968, 7471781, 13913677, -5137875},
-			FieldElement{-25574376, 11967826, 29233242, 12948236, -6754465, 4713227, -8940970, 14059180, 12878652, 8511905},
-			FieldElement{-25656801, 3393631, -2955415, -7075526, -2250709, 9366908, -30223418, 6812974, 5568676, -3127656},
-		},
-		{
-			FieldElement{11630004, 12144454, 2116339, 13606037, 27378885, 15676917, -17408753, -13504373, -14395196, 8070818},
-			FieldElement{27117696, -10007378, -31282771, -5570088, 1127282, 12772488, -29845906, 10483306, -11552749, -1028714},
-			FieldElement{10637467, -5688064, 5674781, 1072708, -26343588, -6982302, -1683975, 9177853, -27493162, 15431203},
-		},
-		{
-			FieldElement{20525145, 10892566, -12742472, 12779443, -29493034, 16150075, -28240519, 14943142, -15056790, -7935931},
-			FieldElement{-30024462, 5626926, -551567, -9981087, 753598, 11981191, 25244767, -3239766, -3356550, 9594024},
-			FieldElement{-23752644, 2636870, -5163910, -10103818, 585134, 7877383, 11345683, -6492290, 13352335, -10977084},
-		},
-		{
-			FieldElement{-1931799, -5407458, 3304649, -12884869, 17015806, -4877091, -29783850, -7752482, -13215537, -319204},
-			FieldElement{20239939, 6607058, 6203985, 3483793, -18386976, -779229, -20723742, 15077870, -22750759, 14523817},
-			FieldElement{27406042, -6041657, 27423596, -4497394, 4996214, 10002360, -28842031, -4545494, -30172742, -4805667},
-		},
-	},
-	{
-		{
-			FieldElement{11374242, 12660715, 17861383, -12540833, 10935568, 1099227, -13886076, -9091740, -27727044, 11358504},
-			FieldElement{-12730809, 10311867, 1510375, 10778093, -2119455, -9145702, 32676003, 11149336, -26123651, 4985768},
-			FieldElement{-19096303, 341147, -6197485, -239033, 15756973, -8796662, -983043, 13794114, -19414307, -15621255},
-		},
-		{
-			FieldElement{6490081, 11940286, 25495923, -7726360, 8668373, -8751316, 3367603, 6970005, -1691065, -9004790},
-			FieldElement{1656497, 13457317, 15370807, 6364910, 13605745, 8362338, -19174622, -5475723, -16796596, -5031438},
-			FieldElement{-22273315, -13524424, -64685, -4334223, -18605636, -10921968, -20571065, -7007978, -99853, -10237333},
-		},
-		{
-			FieldElement{17747465, 10039260, 19368299, -4050591, -20630635, -16041286, 31992683, -15857976, -29260363, -5511971},
-			FieldElement{31932027, -4986141, -19612382, 16366580, 22023614, 88450, 11371999, -3744247, 4882242, -10626905},
-			FieldElement{29796507, 37186, 19818052, 10115756, -11829032, 3352736, 18551198, 3272828, -5190932, -4162409},
-		},
-		{
-			FieldElement{12501286, 4044383, -8612957, -13392385, -32430052, 5136599, -19230378, -3529697, 330070, -3659409},
-			FieldElement{6384877, 2899513, 17807477, 7663917, -2358888, 12363165, 25366522, -8573892, -271295, 12071499},
-			FieldElement{-8365515, -4042521, 25133448, -4517355, -6211027, 2265927, -32769618, 1936675, -5159697, 3829363},
-		},
-		{
-			FieldElement{28425966, -5835433, -577090, -4697198, -14217555, 6870930, 7921550, -6567787, 26333140, 14267664},
-			FieldElement{-11067219, 11871231, 27385719, -10559544, -4585914, -11189312, 10004786, -8709488, -21761224, 8930324},
-			FieldElement{-21197785, -16396035, 25654216, -1725397, 12282012, 11008919, 1541940, 4757911, -26491501, -16408940},
-		},
-		{
-			FieldElement{13537262, -7759490, -20604840, 10961927, -5922820, -13218065, -13156584, 6217254, -15943699, 13814990},
-			FieldElement{-17422573, 15157790, 18705543, 29619, 24409717, -260476, 27361681, 9257833, -1956526, -1776914},
-			FieldElement{-25045300, -10191966, 15366585, 15166509, -13105086, 8423556, -29171540, 12361135, -18685978, 4578290},
-		},
-		{
-			FieldElement{24579768, 3711570, 1342322, -11180126, -27005135, 14124956, -22544529, 14074919, 21964432, 8235257},
-			FieldElement{-6528613, -2411497, 9442966, -5925588, 12025640, -1487420, -2981514, -1669206, 13006806, 2355433},
-			FieldElement{-16304899, -13605259, -6632427, -5142349, 16974359, -10911083, 27202044, 1719366, 1141648, -12796236},
-		},
-		{
-			FieldElement{-12863944, -13219986, -8318266, -11018091, -6810145, -4843894, 13475066, -3133972, 32674895, 13715045},
-			FieldElement{11423335, -5468059, 32344216, 8962751, 24989809, 9241752, -13265253, 16086212, -28740881, -15642093},
-			FieldElement{-1409668, 12530728, -6368726, 10847387, 19531186, -14132160, -11709148, 7791794, -27245943, 4383347},
-		},
-	},
-	{
-		{
-			FieldElement{-28970898, 5271447, -1266009, -9736989, -12455236, 16732599, -4862407, -4906449, 27193557, 6245191},
-			FieldElement{-15193956, 5362278, -1783893, 2695834, 4960227, 12840725, 23061898, 3260492, 22510453, 8577507},
-			FieldElement{-12632451, 11257346, -32692994, 13548177, -721004, 10879011, 31168030, 13952092, -29571492, -3635906},
-		},
-		{
-			FieldElement{3877321, -9572739, 32416692, 5405324, -11004407, -13656635, 3759769, 11935320, 5611860, 8164018},
-			FieldElement{-16275802, 14667797, 15906460, 12155291, -22111149, -9039718, 32003002, -8832289, 5773085, -8422109},
-			FieldElement{-23788118, -8254300, 1950875, 8937633, 18686727, 16459170, -905725, 12376320, 31632953, 190926},
-		},
-		{
-			FieldElement{-24593607, -16138885, -8423991, 13378746, 14162407, 6901328, -8288749, 4508564, -25341555, -3627528},
-			FieldElement{8884438, -5884009, 6023974, 10104341, -6881569, -4941533, 18722941, -14786005, -1672488, 827625},
-			FieldElement{-32720583, -16289296, -32503547, 7101210, 13354605, 2659080, -1800575, -14108036, -24878478, 1541286},
-		},
-		{
-			FieldElement{2901347, -1117687, 3880376, -10059388, -17620940, -3612781, -21802117, -3567481, 20456845, -1885033},
-			FieldElement{27019610, 12299467, -13658288, -1603234, -12861660, -4861471, -19540150, -5016058, 29439641, 15138866},
-			FieldElement{21536104, -6626420, -32447818, -10690208, -22408077, 5175814, -5420040, -16361163, 7779328, 109896},
-		},
-		{
-			FieldElement{30279744, 14648750, -8044871, 6425558, 13639621, -743509, 28698390, 12180118, 23177719, -554075},
-			FieldElement{26572847, 3405927, -31701700, 12890905, -19265668, 5335866, -6493768, 2378492, 4439158, -13279347},
-			FieldElement{-22716706, 3489070, -9225266, -332753, 18875722, -1140095, 14819434, -12731527, -17717757, -5461437},
-		},
-		{
-			FieldElement{-5056483, 16566551, 15953661, 3767752, -10436499, 15627060, -820954, 2177225, 8550082, -15114165},
-			FieldElement{-18473302, 16596775, -381660, 15663611, 22860960, 15585581, -27844109, -3582739, -23260460, -8428588},
-			FieldElement{-32480551, 15707275, -8205912, -5652081, 29464558, 2713815, -22725137, 15860482, -21902570, 1494193},
-		},
-		{
-			FieldElement{-19562091, -14087393, -25583872, -9299552, 13127842, 759709, 21923482, 16529112, 8742704, 12967017},
-			FieldElement{-28464899, 1553205, 32536856, -10473729, -24691605, -406174, -8914625, -2933896, -29903758, 15553883},
-			FieldElement{21877909, 3230008, 9881174, 10539357, -4797115, 2841332, 11543572, 14513274, 19375923, -12647961},
-		},
-		{
-			FieldElement{8832269, -14495485, 13253511, 5137575, 5037871, 4078777, 24880818, -6222716, 2862653, 9455043},
-			FieldElement{29306751, 5123106, 20245049, -14149889, 9592566, 8447059, -2077124, -2990080, 15511449, 4789663},
-			FieldElement{-20679756, 7004547, 8824831, -9434977, -4045704, -3750736, -5754762, 108893, 23513200, 16652362},
-		},
-	},
-	{
-		{
-			FieldElement{-33256173, 4144782, -4476029, -6579123, 10770039, -7155542, -6650416, -12936300, -18319198, 10212860},
-			FieldElement{2756081, 8598110, 7383731, -6859892, 22312759, -1105012, 21179801, 2600940, -9988298, -12506466},
-			FieldElement{-24645692, 13317462, -30449259, -15653928, 21365574, -10869657, 11344424, 864440, -2499677, -16710063},
-		},
-		{
-			FieldElement{-26432803, 6148329, -17184412, -14474154, 18782929, -275997, -22561534, 211300, 2719757, 4940997},
-			FieldElement{-1323882, 3911313, -6948744, 14759765, -30027150, 7851207, 21690126, 8518463, 26699843, 5276295},
-			FieldElement{-13149873, -6429067, 9396249, 365013, 24703301, -10488939, 1321586, 149635, -15452774, 7159369},
-		},
-		{
-			FieldElement{9987780, -3404759, 17507962, 9505530, 9731535, -2165514, 22356009, 8312176, 22477218, -8403385},
-			FieldElement{18155857, -16504990, 19744716, 9006923, 15154154, -10538976, 24256460, -4864995, -22548173, 9334109},
-			FieldElement{2986088, -4911893, 10776628, -3473844, 10620590, -7083203, -21413845, 14253545, -22587149, 536906},
-		},
-		{
-			FieldElement{4377756, 8115836, 24567078, 15495314, 11625074, 13064599, 7390551, 10589625, 10838060, -15420424},
-			FieldElement{-19342404, 867880, 9277171, -3218459, -14431572, -1986443, 19295826, -15796950, 6378260, 699185},
-			FieldElement{7895026, 4057113, -7081772, -13077756, -17886831, -323126, -716039, 15693155, -5045064, -13373962},
-		},
-		{
-			FieldElement{-7737563, -5869402, -14566319, -7406919, 11385654, 13201616, 31730678, -10962840, -3918636, -9669325},
-			FieldElement{10188286, -15770834, -7336361, 13427543, 22223443, 14896287, 30743455, 7116568, -21786507, 5427593},
-			FieldElement{696102, 13206899, 27047647, -10632082, 15285305, -9853179, 10798490, -4578720, 19236243, 12477404},
-		},
-		{
-			FieldElement{-11229439, 11243796, -17054270, -8040865, -788228, -8167967, -3897669, 11180504, -23169516, 7733644},
-			FieldElement{17800790, -14036179, -27000429, -11766671, 23887827, 3149671, 23466177, -10538171, 10322027, 15313801},
-			FieldElement{26246234, 11968874, 32263343, -5468728, 6830755, -13323031, -15794704, -101982, -24449242, 10890804},
-		},
-		{
-			FieldElement{-31365647, 10271363, -12660625, -6267268, 16690207, -13062544, -14982212, 16484931, 25180797, -5334884},
-			FieldElement{-586574, 10376444, -32586414, -11286356, 19801893, 10997610, 2276632, 9482883, 316878, 13820577},
-			FieldElement{-9882808, -4510367, -2115506, 16457136, -11100081, 11674996, 30756178, -7515054, 30696930, -3712849},
-		},
-		{
-			FieldElement{32988917, -9603412, 12499366, 7910787, -10617257, -11931514, -7342816, -9985397, -32349517, 7392473},
-			FieldElement{-8855661, 15927861, 9866406, -3649411, -2396914, -16655781, -30409476, -9134995, 25112947, -2926644},
-			FieldElement{-2504044, -436966, 25621774, -5678772, 15085042, -5479877, -24884878, -13526194, 5537438, -13914319},
-		},
-	},
-	{
-		{
-			FieldElement{-11225584, 2320285, -9584280, 10149187, -33444663, 5808648, -14876251, -1729667, 31234590, 6090599},
-			FieldElement{-9633316, 116426, 26083934, 2897444, -6364437, -2688086, 609721, 15878753, -6970405, -9034768},
-			FieldElement{-27757857, 247744, -15194774, -9002551, 23288161, -10011936, -23869595, 6503646, 20650474, 1804084},
-		},
-		{
-			FieldElement{-27589786, 15456424, 8972517, 8469608, 15640622, 4439847, 3121995, -10329713, 27842616, -202328},
-			FieldElement{-15306973, 2839644, 22530074, 10026331, 4602058, 5048462, 28248656, 5031932, -11375082, 12714369},
-			FieldElement{20807691, -7270825, 29286141, 11421711, -27876523, -13868230, -21227475, 1035546, -19733229, 12796920},
-		},
-		{
-			FieldElement{12076899, -14301286, -8785001, -11848922, -25012791, 16400684, -17591495, -12899438, 3480665, -15182815},
-			FieldElement{-32361549, 5457597, 28548107, 7833186, 7303070, -11953545, -24363064, -15921875, -33374054, 2771025},
-			FieldElement{-21389266, 421932, 26597266, 6860826, 22486084, -6737172, -17137485, -4210226, -24552282, 15673397},
-		},
-		{
-			FieldElement{-20184622, 2338216, 19788685, -9620956, -4001265, -8740893, -20271184, 4733254, 3727144, -12934448},
-			FieldElement{6120119, 814863, -11794402, -622716, 6812205, -15747771, 2019594, 7975683, 31123697, -10958981},
-			FieldElement{30069250, -11435332, 30434654, 2958439, 18399564, -976289, 12296869, 9204260, -16432438, 9648165},
-		},
-		{
-			FieldElement{32705432, -1550977, 30705658, 7451065, -11805606, 9631813, 3305266, 5248604, -26008332, -11377501},
-			FieldElement{17219865, 2375039, -31570947, -5575615, -19459679, 9219903, 294711, 15298639, 2662509, -16297073},
-			FieldElement{-1172927, -7558695, -4366770, -4287744, -21346413, -8434326, 32087529, -1222777, 32247248, -14389861},
-		},
-		{
-			FieldElement{14312628, 1221556, 17395390, -8700143, -4945741, -8684635, -28197744, -9637817, -16027623, -13378845},
-			FieldElement{-1428825, -9678990, -9235681, 6549687, -7383069, -468664, 23046502, 9803137, 17597934, 2346211},
-			FieldElement{18510800, 15337574, 26171504, 981392, -22241552, 7827556, -23491134, -11323352, 3059833, -11782870},
-		},
-		{
-			FieldElement{10141598, 6082907, 17829293, -1947643, 9830092, 13613136, -25556636, -5544586, -33502212, 3592096},
-			FieldElement{33114168, -15889352, -26525686, -13343397, 33076705, 8716171, 1151462, 1521897, -982665, -6837803},
-			FieldElement{-32939165, -4255815, 23947181, -324178, -33072974, -12305637, -16637686, 3891704, 26353178, 693168},
-		},
-		{
-			FieldElement{30374239, 1595580, -16884039, 13186931, 4600344, 406904, 9585294, -400668, 31375464, 14369965},
-			FieldElement{-14370654, -7772529, 1510301, 6434173, -18784789, -6262728, 32732230, -13108839, 17901441, 16011505},
-			FieldElement{18171223, -11934626, -12500402, 15197122, -11038147, -15230035, -19172240, -16046376, 8764035, 12309598},
-		},
-	},
-	{
-		{
-			FieldElement{5975908, -5243188, -19459362, -9681747, -11541277, 14015782, -23665757, 1228319, 17544096, -10593782},
-			FieldElement{5811932, -1715293, 3442887, -2269310, -18367348, -8359541, -18044043, -15410127, -5565381, 12348900},
-			FieldElement{-31399660, 11407555, 25755363, 6891399, -3256938, 14872274, -24849353, 8141295, -10632534, -585479},
-		},
-		{
-			FieldElement{-12675304, 694026, -5076145, 13300344, 14015258, -14451394, -9698672, -11329050, 30944593, 1130208},
-			FieldElement{8247766, -6710942, -26562381, -7709309, -14401939, -14648910, 4652152, 2488540, 23550156, -271232},
-			FieldElement{17294316, -3788438, 7026748, 15626851, 22990044, 113481, 2267737, -5908146, -408818, -137719},
-		},
-		{
-			FieldElement{16091085, -16253926, 18599252, 7340678, 2137637, -1221657, -3364161, 14550936, 3260525, -7166271},
-			FieldElement{-4910104, -13332887, 18550887, 10864893, -16459325, -7291596, -23028869, -13204905, -12748722, 2701326},
-			FieldElement{-8574695, 16099415, 4629974, -16340524, -20786213, -6005432, -10018363, 9276971, 11329923, 1862132},
-		},
-		{
-			FieldElement{14763076, -15903608, -30918270, 3689867, 3511892, 10313526, -21951088, 12219231, -9037963, -940300},
-			FieldElement{8894987, -3446094, 6150753, 3013931, 301220, 15693451, -31981216, -2909717, -15438168, 11595570},
-			FieldElement{15214962, 3537601, -26238722, -14058872, 4418657, -15230761, 13947276, 10730794, -13489462, -4363670},
-		},
-		{
-			FieldElement{-2538306, 7682793, 32759013, 263109, -29984731, -7955452, -22332124, -10188635, 977108, 699994},
-			FieldElement{-12466472, 4195084, -9211532, 550904, -15565337, 12917920, 19118110, -439841, -30534533, -14337913},
-			FieldElement{31788461, -14507657, 4799989, 7372237, 8808585, -14747943, 9408237, -10051775, 12493932, -5409317},
-		},
-		{
-			FieldElement{-25680606, 5260744, -19235809, -6284470, -3695942, 16566087, 27218280, 2607121, 29375955, 6024730},
-			FieldElement{842132, -2794693, -4763381, -8722815, 26332018, -12405641, 11831880, 6985184, -9940361, 2854096},
-			FieldElement{-4847262, -7969331, 2516242, -5847713, 9695691, -7221186, 16512645, 960770, 12121869, 16648078},
-		},
-		{
-			FieldElement{-15218652, 14667096, -13336229, 2013717, 30598287, -464137, -31504922, -7882064, 20237806, 2838411},
-			FieldElement{-19288047, 4453152, 15298546, -16178388, 22115043, -15972604, 12544294, -13470457, 1068881, -12499905},
-			FieldElement{-9558883, -16518835, 33238498, 13506958, 30505848, -1114596, -8486907, -2630053, 12521378, 4845654},
-		},
-		{
-			FieldElement{-28198521, 10744108, -2958380, 10199664, 7759311, -13088600, 3409348, -873400, -6482306, -12885870},
-			FieldElement{-23561822, 6230156, -20382013, 10655314, -24040585, -11621172, 10477734, -1240216, -3113227, 13974498},
-			FieldElement{12966261, 15550616, -32038948, -1615346, 21025980, -629444, 5642325, 7188737, 18895762, 12629579},
-		},
-	},
-	{
-		{
-			FieldElement{14741879, -14946887, 22177208, -11721237, 1279741, 8058600, 11758140, 789443, 32195181, 3895677},
-			FieldElement{10758205, 15755439, -4509950, 9243698, -4879422, 6879879, -2204575, -3566119, -8982069, 4429647},
-			FieldElement{-2453894, 15725973, -20436342, -10410672, -5803908, -11040220, -7135870, -11642895, 18047436, -15281743},
-		},
-		{
-			FieldElement{-25173001, -11307165, 29759956, 11776784, -22262383, -15820455, 10993114, -12850837, -17620701, -9408468},
-			FieldElement{21987233, 700364, -24505048, 14972008, -7774265, -5718395, 32155026, 2581431, -29958985, 8773375},
-			FieldElement{-25568350, 454463, -13211935, 16126715, 25240068, 8594567, 20656846, 12017935, -7874389, -13920155},
-		},
-		{
-			FieldElement{6028182, 6263078, -31011806, -11301710, -818919, 2461772, -31841174, -5468042, -1721788, -2776725},
-			FieldElement{-12278994, 16624277, 987579, -5922598, 32908203, 1248608, 7719845, -4166698, 28408820, 6816612},
-			FieldElement{-10358094, -8237829, 19549651, -12169222, 22082623, 16147817, 20613181, 13982702, -10339570, 5067943},
-		},
-		{
-			FieldElement{-30505967, -3821767, 12074681, 13582412, -19877972, 2443951, -19719286, 12746132, 5331210, -10105944},
-			FieldElement{30528811, 3601899, -1957090, 4619785, -27361822, -15436388, 24180793, -12570394, 27679908, -1648928},
-			FieldElement{9402404, -13957065, 32834043, 10838634, -26580150, -13237195, 26653274, -8685565, 22611444, -12715406},
-		},
-		{
-			FieldElement{22190590, 1118029, 22736441, 15130463, -30460692, -5991321, 19189625, -4648942, 4854859, 6622139},
-			FieldElement{-8310738, -2953450, -8262579, -3388049, -10401731, -271929, 13424426, -3567227, 26404409, 13001963},
-			FieldElement{-31241838, -15415700, -2994250, 8939346, 11562230, -12840670, -26064365, -11621720, -15405155, 11020693},
-		},
-		{
-			FieldElement{1866042, -7949489, -7898649, -10301010, 12483315, 13477547, 3175636, -12424163, 28761762, 1406734},
-			FieldElement{-448555, -1777666, 13018551, 3194501, -9580420, -11161737, 24760585, -4347088, 25577411, -13378680},
-			FieldElement{-24290378, 4759345, -690653, -1852816, 2066747, 10693769, -29595790, 9884936, -9368926, 4745410},
-		},
-		{
-			FieldElement{-9141284, 6049714, -19531061, -4341411, -31260798, 9944276, -15462008, -11311852, 10931924, -11931931},
-			FieldElement{-16561513, 14112680, -8012645, 4817318, -8040464, -11414606, -22853429, 10856641, -20470770, 13434654},
-			FieldElement{22759489, -10073434, -16766264, -1871422, 13637442, -10168091, 1765144, -12654326, 28445307, -5364710},
-		},
-		{
-			FieldElement{29875063, 12493613, 2795536, -3786330, 1710620, 15181182, -10195717, -8788675, 9074234, 1167180},
-			FieldElement{-26205683, 11014233, -9842651, -2635485, -26908120, 7532294, -18716888, -9535498, 3843903, 9367684},
-			FieldElement{-10969595, -6403711, 9591134, 9582310, 11349256, 108879, 16235123, 8601684, -139197, 4242895},
-		},
-	},
-	{
-		{
-			FieldElement{22092954, -13191123, -2042793, -11968512, 32186753, -11517388, -6574341, 2470660, -27417366, 16625501},
-			FieldElement{-11057722, 3042016, 13770083, -9257922, 584236, -544855, -7770857, 2602725, -27351616, 14247413},
-			FieldElement{6314175, -10264892, -32772502, 15957557, -10157730, 168750, -8618807, 14290061, 27108877, -1180880},
-		},
-		{
-			FieldElement{-8586597, -7170966, 13241782, 10960156, -32991015, -13794596, 33547976, -11058889, -27148451, 981874},
-			FieldElement{22833440, 9293594, -32649448, -13618667, -9136966, 14756819, -22928859, -13970780, -10479804, -16197962},
-			FieldElement{-7768587, 3326786, -28111797, 10783824, 19178761, 14905060, 22680049, 13906969, -15933690, 3797899},
-		},
-		{
-			FieldElement{21721356, -4212746, -12206123, 9310182, -3882239, -13653110, 23740224, -2709232, 20491983, -8042152},
-			FieldElement{9209270, -15135055, -13256557, -6167798, -731016, 15289673, 25947805, 15286587, 30997318, -6703063},
-			FieldElement{7392032, 16618386, 23946583, -8039892, -13265164, -1533858, -14197445, -2321576, 17649998, -250080},
-		},
-		{
-			FieldElement{-9301088, -14193827, 30609526, -3049543, -25175069, -1283752, -15241566, -9525724, -2233253, 7662146},
-			FieldElement{-17558673, 1763594, -33114336, 15908610, -30040870, -12174295, 7335080, -8472199, -3174674, 3440183},
-			FieldElement{-19889700, -5977008, -24111293, -9688870, 10799743, -16571957, 40450, -4431835, 4862400, 1133},
-		},
-		{
-			FieldElement{-32856209, -7873957, -5422389, 14860950, -16319031, 7956142, 7258061, 311861, -30594991, -7379421},
-			FieldElement{-3773428, -1565936, 28985340, 7499440, 24445838, 9325937, 29727763, 16527196, 18278453, 15405622},
-			FieldElement{-4381906, 8508652, -19898366, -3674424, -5984453, 15149970, -13313598, 843523, -21875062, 13626197},
-		},
-		{
-			FieldElement{2281448, -13487055, -10915418, -2609910, 1879358, 16164207, -10783882, 3953792, 13340839, 15928663},
-			FieldElement{31727126, -7179855, -18437503, -8283652, 2875793, -16390330, -25269894, -7014826, -23452306, 5964753},
-			FieldElement{4100420, -5959452, -17179337, 6017714, -18705837, 12227141, -26684835, 11344144, 2538215, -7570755},
-		},
-		{
-			FieldElement{-9433605, 6123113, 11159803, -2156608, 30016280, 14966241, -20474983, 1485421, -629256, -15958862},
-			FieldElement{-26804558, 4260919, 11851389, 9658551, -32017107, 16367492, -20205425, -13191288, 11659922, -11115118},
-			FieldElement{26180396, 10015009, -30844224, -8581293, 5418197, 9480663, 2231568, -10170080, 33100372, -1306171},
-		},
-		{
-			FieldElement{15121113, -5201871, -10389905, 15427821, -27509937, -15992507, 21670947, 4486675, -5931810, -14466380},
-			FieldElement{16166486, -9483733, -11104130, 6023908, -31926798, -1364923, 2340060, -16254968, -10735770, -10039824},
-			FieldElement{28042865, -3557089, -12126526, 12259706, -3717498, -6945899, 6766453, -8689599, 18036436, 5803270},
-		},
-	},
-	{
-		{
-			FieldElement{-817581, 6763912, 11803561, 1585585, 10958447, -2671165, 23855391, 4598332, -6159431, -14117438},
-			FieldElement{-31031306, -14256194, 17332029, -2383520, 31312682, -5967183, 696309, 50292, -20095739, 11763584},
-			FieldElement{-594563, -2514283, -32234153, 12643980, 12650761, 14811489, 665117, -12613632, -19773211, -10713562},
-		},
-		{
-			FieldElement{30464590, -11262872, -4127476, -12734478, 19835327, -7105613, -24396175, 2075773, -17020157, 992471},
-			FieldElement{18357185, -6994433, 7766382, 16342475, -29324918, 411174, 14578841, 8080033, -11574335, -10601610},
-			FieldElement{19598397, 10334610, 12555054, 2555664, 18821899, -10339780, 21873263, 16014234, 26224780, 16452269},
-		},
-		{
-			FieldElement{-30223925, 5145196, 5944548, 16385966, 3976735, 2009897, -11377804, -7618186, -20533829, 3698650},
-			FieldElement{14187449, 3448569, -10636236, -10810935, -22663880, -3433596, 7268410, -10890444, 27394301, 12015369},
-			FieldElement{19695761, 16087646, 28032085, 12999827, 6817792, 11427614, 20244189, -1312777, -13259127, -3402461},
-		},
-		{
-			FieldElement{30860103, 12735208, -1888245, -4699734, -16974906, 2256940, -8166013, 12298312, -8550524, -10393462},
-			FieldElement{-5719826, -11245325, -1910649, 15569035, 26642876, -7587760, -5789354, -15118654, -4976164, 12651793},
-			FieldElement{-2848395, 9953421, 11531313, -5282879, 26895123, -12697089, -13118820, -16517902, 9768698, -2533218},
-		},
-		{
-			FieldElement{-24719459, 1894651, -287698, -4704085, 15348719, -8156530, 32767513, 12765450, 4940095, 10678226},
-			FieldElement{18860224, 15980149, -18987240, -1562570, -26233012, -11071856, -7843882, 13944024, -24372348, 16582019},
-			FieldElement{-15504260, 4970268, -29893044, 4175593, -20993212, -2199756, -11704054, 15444560, -11003761, 7989037},
-		},
-		{
-			FieldElement{31490452, 5568061, -2412803, 2182383, -32336847, 4531686, -32078269, 6200206, -19686113, -14800171},
-			FieldElement{-17308668, -15879940, -31522777, -2831, -32887382, 16375549, 8680158, -16371713, 28550068, -6857132},
-			FieldElement{-28126887, -5688091, 16837845, -1820458, -6850681, 12700016, -30039981, 4364038, 1155602, 5988841},
-		},
-		{
-			FieldElement{21890435, -13272907, -12624011, 12154349, -7831873, 15300496, 23148983, -4470481, 24618407, 8283181},
-			FieldElement{-33136107, -10512751, 9975416, 6841041, -31559793, 16356536, 3070187, -7025928, 1466169, 10740210},
-			FieldElement{-1509399, -15488185, -13503385, -10655916, 32799044, 909394, -13938903, -5779719, -32164649, -15327040},
-		},
-		{
-			FieldElement{3960823, -14267803, -28026090, -15918051, -19404858, 13146868, 15567327, 951507, -3260321, -573935},
-			FieldElement{24740841, 5052253, -30094131, 8961361, 25877428, 6165135, -24368180, 14397372, -7380369, -6144105},
-			FieldElement{-28888365, 3510803, -28103278, -1158478, -11238128, -10631454, -15441463, -14453128, -1625486, -6494814},
-		},
-	},
-	{
-		{
-			FieldElement{793299, -9230478, 8836302, -6235707, -27360908, -2369593, 33152843, -4885251, -9906200, -621852},
-			FieldElement{5666233, 525582, 20782575, -8038419, -24538499, 14657740, 16099374, 1468826, -6171428, -15186581},
-			FieldElement{-4859255, -3779343, -2917758, -6748019, 7778750, 11688288, -30404353, -9871238, -1558923, -9863646},
-		},
-		{
-			FieldElement{10896332, -7719704, 824275, 472601, -19460308, 3009587, 25248958, 14783338, -30581476, -15757844},
-			FieldElement{10566929, 12612572, -31944212, 11118703, -12633376, 12362879, 21752402, 8822496, 24003793, 14264025},
-			FieldElement{27713862, -7355973, -11008240, 9227530, 27050101, 2504721, 23886875, -13117525, 13958495, -5732453},
-		},
-		{
-			FieldElement{-23481610, 4867226, -27247128, 3900521, 29838369, -8212291, -31889399, -10041781, 7340521, -15410068},
-			FieldElement{4646514, -8011124, -22766023, -11532654, 23184553, 8566613, 31366726, -1381061, -15066784, -10375192},
-			FieldElement{-17270517, 12723032, -16993061, 14878794, 21619651, -6197576, 27584817, 3093888, -8843694, 3849921},
-		},
-		{
-			FieldElement{-9064912, 2103172, 25561640, -15125738, -5239824, 9582958, 32477045, -9017955, 5002294, -15550259},
-			FieldElement{-12057553, -11177906, 21115585, -13365155, 8808712, -12030708, 16489530, 13378448, -25845716, 12741426},
-			FieldElement{-5946367, 10645103, -30911586, 15390284, -3286982, -7118677, 24306472, 15852464, 28834118, -7646072},
-		},
-		{
-			FieldElement{-17335748, -9107057, -24531279, 9434953, -8472084, -583362, -13090771, 455841, 20461858, 5491305},
-			FieldElement{13669248, -16095482, -12481974, -10203039, -14569770, -11893198, -24995986, 11293807, -28588204, -9421832},
-			FieldElement{28497928, 6272777, -33022994, 14470570, 8906179, -1225630, 18504674, -14165166, 29867745, -8795943},
-		},
-		{
-			FieldElement{-16207023, 13517196, -27799630, -13697798, 24009064, -6373891, -6367600, -13175392, 22853429, -4012011},
-			FieldElement{24191378, 16712145, -13931797, 15217831, 14542237, 1646131, 18603514, -11037887, 12876623, -2112447},
-			FieldElement{17902668, 4518229, -411702, -2829247, 26878217, 5258055, -12860753, 608397, 16031844, 3723494},
-		},
-		{
-			FieldElement{-28632773, 12763728, -20446446, 7577504, 33001348, -13017745, 17558842, -7872890, 23896954, -4314245},
-			FieldElement{-20005381, -12011952, 31520464, 605201, 2543521, 5991821, -2945064, 7229064, -9919646, -8826859},
-			FieldElement{28816045, 298879, -28165016, -15920938, 19000928, -1665890, -12680833, -2949325, -18051778, -2082915},
-		},
-		{
-			FieldElement{16000882, -344896, 3493092, -11447198, -29504595, -13159789, 12577740, 16041268, -19715240, 7847707},
-			FieldElement{10151868, 10572098, 27312476, 7922682, 14825339, 4723128, -32855931, -6519018, -10020567, 3852848},
-			FieldElement{-11430470, 15697596, -21121557, -4420647, 5386314, 15063598, 16514493, -15932110, 29330899, -15076224},
-		},
-	},
-	{
-		{
-			FieldElement{-25499735, -4378794, -15222908, -6901211, 16615731, 2051784, 3303702, 15490, -27548796, 12314391},
-			FieldElement{15683520, -6003043, 18109120, -9980648, 15337968, -5997823, -16717435, 15921866, 16103996, -3731215},
-			FieldElement{-23169824, -10781249, 13588192, -1628807, -3798557, -1074929, -19273607, 5402699, -29815713, -9841101},
-		},
-		{
-			FieldElement{23190676, 2384583, -32714340, 3462154, -29903655, -1529132, -11266856, 8911517, -25205859, 2739713},
-			FieldElement{21374101, -3554250, -33524649, 9874411, 15377179, 11831242, -33529904, 6134907, 4931255, 11987849},
-			FieldElement{-7732, -2978858, -16223486, 7277597, 105524, -322051, -31480539, 13861388, -30076310, 10117930},
-		},
-		{
-			FieldElement{-29501170, -10744872, -26163768, 13051539, -25625564, 5089643, -6325503, 6704079, 12890019, 15728940},
-			FieldElement{-21972360, -11771379, -951059, -4418840, 14704840, 2695116, 903376, -10428139, 12885167, 8311031},
-			FieldElement{-17516482, 5352194, 10384213, -13811658, 7506451, 13453191, 26423267, 4384730, 1888765, -5435404},
-		},
-		{
-			FieldElement{-25817338, -3107312, -13494599, -3182506, 30896459, -13921729, -32251644, -12707869, -19464434, -3340243},
-			FieldElement{-23607977, -2665774, -526091, 4651136, 5765089, 4618330, 6092245, 14845197, 17151279, -9854116},
-			FieldElement{-24830458, -12733720, -15165978, 10367250, -29530908, -265356, 22825805, -7087279, -16866484, 16176525},
-		},
-		{
-			FieldElement{-23583256, 6564961, 20063689, 3798228, -4740178, 7359225, 2006182, -10363426, -28746253, -10197509},
-			FieldElement{-10626600, -4486402, -13320562, -5125317, 3432136, -6393229, 23632037, -1940610, 32808310, 1099883},
-			FieldElement{15030977, 5768825, -27451236, -2887299, -6427378, -15361371, -15277896, -6809350, 2051441, -15225865},
-		},
-		{
-			FieldElement{-3362323, -7239372, 7517890, 9824992, 23555850, 295369, 5148398, -14154188, -22686354, 16633660},
-			FieldElement{4577086, -16752288, 13249841, -15304328, 19958763, -14537274, 18559670, -10759549, 8402478, -9864273},
-			FieldElement{-28406330, -1051581, -26790155, -907698, -17212414, -11030789, 9453451, -14980072, 17983010, 9967138},
-		},
-		{
-			FieldElement{-25762494, 6524722, 26585488, 9969270, 24709298, 1220360, -1677990, 7806337, 17507396, 3651560},
-			FieldElement{-10420457, -4118111, 14584639, 15971087, -15768321, 8861010, 26556809, -5574557, -18553322, -11357135},
-			FieldElement{2839101, 14284142, 4029895, 3472686, 14402957, 12689363, -26642121, 8459447, -5605463, -7621941},
-		},
-		{
-			FieldElement{-4839289, -3535444, 9744961, 2871048, 25113978, 3187018, -25110813, -849066, 17258084, -7977739},
-			FieldElement{18164541, -10595176, -17154882, -1542417, 19237078, -9745295, 23357533, -15217008, 26908270, 12150756},
-			FieldElement{-30264870, -7647865, 5112249, -7036672, -1499807, -6974257, 43168, -5537701, -32302074, 16215819},
-		},
-	},
-	{
-		{
-			FieldElement{-6898905, 9824394, -12304779, -4401089, -31397141, -6276835, 32574489, 12532905, -7503072, -8675347},
-			FieldElement{-27343522, -16515468, -27151524, -10722951, 946346, 16291093, 254968, 7168080, 21676107, -1943028},
-			FieldElement{21260961, -8424752, -16831886, -11920822, -23677961, 3968121, -3651949, -6215466, -3556191, -7913075},
-		},
-		{
-			FieldElement{16544754, 13250366, -16804428, 15546242, -4583003, 12757258, -2462308, -8680336, -18907032, -9662799},
-			FieldElement{-2415239, -15577728, 18312303, 4964443, -15272530, -12653564, 26820651, 16690659, 25459437, -4564609},
-			FieldElement{-25144690, 11425020, 28423002, -11020557, -6144921, -15826224, 9142795, -2391602, -6432418, -1644817},
-		},
-		{
-			FieldElement{-23104652, 6253476, 16964147, -3768872, -25113972, -12296437, -27457225, -16344658, 6335692, 7249989},
-			FieldElement{-30333227, 13979675, 7503222, -12368314, -11956721, -4621693, -30272269, 2682242, 25993170, -12478523},
-			FieldElement{4364628, 5930691, 32304656, -10044554, -8054781, 15091131, 22857016, -10598955, 31820368, 15075278},
-		},
-		{
-			FieldElement{31879134, -8918693, 17258761, 90626, -8041836, -4917709, 24162788, -9650886, -17970238, 12833045},
-			FieldElement{19073683, 14851414, -24403169, -11860168, 7625278, 11091125, -19619190, 2074449, -9413939, 14905377},
-			FieldElement{24483667, -11935567, -2518866, -11547418, -1553130, 15355506, -25282080, 9253129, 27628530, -7555480},
-		},
-		{
-			FieldElement{17597607, 8340603, 19355617, 552187, 26198470, -3176583, 4593324, -9157582, -14110875, 15297016},
-			FieldElement{510886, 14337390, -31785257, 16638632, 6328095, 2713355, -20217417, -11864220, 8683221, 2921426},
-			FieldElement{18606791, 11874196, 27155355, -5281482, -24031742, 6265446, -25178240, -1278924, 4674690, 13890525},
-		},
-		{
-			FieldElement{13609624, 13069022, -27372361, -13055908, 24360586, 9592974, 14977157, 9835105, 4389687, 288396},
-			FieldElement{9922506, -519394, 13613107, 5883594, -18758345, -434263, -12304062, 8317628, 23388070, 16052080},
-			FieldElement{12720016, 11937594, -31970060, -5028689, 26900120, 8561328, -20155687, -11632979, -14754271, -10812892},
-		},
-		{
-			FieldElement{15961858, 14150409, 26716931, -665832, -22794328, 13603569, 11829573, 7467844, -28822128, 929275},
-			FieldElement{11038231, -11582396, -27310482, -7316562, -10498527, -16307831, -23479533, -9371869, -21393143, 2465074},
-			FieldElement{20017163, -4323226, 27915242, 1529148, 12396362, 15675764, 13817261, -9658066, 2463391, -4622140},
-		},
-		{
-			FieldElement{-16358878, -12663911, -12065183, 4996454, -1256422, 1073572, 9583558, 12851107, 4003896, 12673717},
-			FieldElement{-1731589, -15155870, -3262930, 16143082, 19294135, 13385325, 14741514, -9103726, 7903886, 2348101},
-			FieldElement{24536016, -16515207, 12715592, -3862155, 1511293, 10047386, -3842346, -7129159, -28377538, 10048127},
-		},
-	},
-	{
-		{
-			FieldElement{-12622226, -6204820, 30718825, 2591312, -10617028, 12192840, 18873298, -7297090, -32297756, 15221632},
-			FieldElement{-26478122, -11103864, 11546244, -1852483, 9180880, 7656409, -21343950, 2095755, 29769758, 6593415},
-			FieldElement{-31994208, -2907461, 4176912, 3264766, 12538965, -868111, 26312345, -6118678, 30958054, 8292160},
-		},
-		{
-			FieldElement{31429822, -13959116, 29173532, 15632448, 12174511, -2760094, 32808831, 3977186, 26143136, -3148876},
-			FieldElement{22648901, 1402143, -22799984, 13746059, 7936347, 365344, -8668633, -1674433, -3758243, -2304625},
-			FieldElement{-15491917, 8012313, -2514730, -12702462, -23965846, -10254029, -1612713, -1535569, -16664475, 8194478},
-		},
-		{
-			FieldElement{27338066, -7507420, -7414224, 10140405, -19026427, -6589889, 27277191, 8855376, 28572286, 3005164},
-			FieldElement{26287124, 4821776, 25476601, -4145903, -3764513, -15788984, -18008582, 1182479, -26094821, -13079595},
-			FieldElement{-7171154, 3178080, 23970071, 6201893, -17195577, -4489192, -21876275, -13982627, 32208683, -1198248},
-		},
-		{
-			FieldElement{-16657702, 2817643, -10286362, 14811298, 6024667, 13349505, -27315504, -10497842, -27672585, -11539858},
-			FieldElement{15941029, -9405932, -21367050, 8062055, 31876073, -238629, -15278393, -1444429, 15397331, -4130193},
-			FieldElement{8934485, -13485467, -23286397, -13423241, -32446090, 14047986, 31170398, -1441021, -27505566, 15087184},
-		},
-		{
-			FieldElement{-18357243, -2156491, 24524913, -16677868, 15520427, -6360776, -15502406, 11461896, 16788528, -5868942},
-			FieldElement{-1947386, 16013773, 21750665, 3714552, -17401782, -16055433, -3770287, -10323320, 31322514, -11615635},
-			FieldElement{21426655, -5650218, -13648287, -5347537, -28812189, -4920970, -18275391, -14621414, 13040862, -12112948},
-		},
-		{
-			FieldElement{11293895, 12478086, -27136401, 15083750, -29307421, 14748872, 14555558, -13417103, 1613711, 4896935},
-			FieldElement{-25894883, 15323294, -8489791, -8057900, 25967126, -13425460, 2825960, -4897045, -23971776, -11267415},
-			FieldElement{-15924766, -5229880, -17443532, 6410664, 3622847, 10243618, 20615400, 12405433, -23753030, -8436416},
-		},
-		{
-			FieldElement{-7091295, 12556208, -20191352, 9025187, -17072479, 4333801, 4378436, 2432030, 23097949, -566018},
-			FieldElement{4565804, -16025654, 20084412, -7842817, 1724999, 189254, 24767264, 10103221, -18512313, 2424778},
-			FieldElement{366633, -11976806, 8173090, -6890119, 30788634, 5745705, -7168678, 1344109, -3642553, 12412659},
-		},
-		{
-			FieldElement{-24001791, 7690286, 14929416, -168257, -32210835, -13412986, 24162697, -15326504, -3141501, 11179385},
-			FieldElement{18289522, -14724954, 8056945, 16430056, -21729724, 7842514, -6001441, -1486897, -18684645, -11443503},
-			FieldElement{476239, 6601091, -6152790, -9723375, 17503545, -4863900, 27672959, 13403813, 11052904, 5219329},
-		},
-	},
-	{
-		{
-			FieldElement{20678546, -8375738, -32671898, 8849123, -5009758, 14574752, 31186971, -3973730, 9014762, -8579056},
-			FieldElement{-13644050, -10350239, -15962508, 5075808, -1514661, -11534600, -33102500, 9160280, 8473550, -3256838},
-			FieldElement{24900749, 14435722, 17209120, -15292541, -22592275, 9878983, -7689309, -16335821, -24568481, 11788948},
-		},
-		{
-			FieldElement{-3118155, -11395194, -13802089, 14797441, 9652448, -6845904, -20037437, 10410733, -24568470, -1458691},
-			FieldElement{-15659161, 16736706, -22467150, 10215878, -9097177, 7563911, 11871841, -12505194, -18513325, 8464118},
-			FieldElement{-23400612, 8348507, -14585951, -861714, -3950205, -6373419, 14325289, 8628612, 33313881, -8370517},
-		},
-		{
-			FieldElement{-20186973, -4967935, 22367356, 5271547, -1097117, -4788838, -24805667, -10236854, -8940735, -5818269},
-			FieldElement{-6948785, -1795212, -32625683, -16021179, 32635414, -7374245, 15989197, -12838188, 28358192, -4253904},
-			FieldElement{-23561781, -2799059, -32351682, -1661963, -9147719, 10429267, -16637684, 4072016, -5351664, 5596589},
-		},
-		{
-			FieldElement{-28236598, -3390048, 12312896, 6213178, 3117142, 16078565, 29266239, 2557221, 1768301, 15373193},
-			FieldElement{-7243358, -3246960, -4593467, -7553353, -127927, -912245, -1090902, -4504991, -24660491, 3442910},
-			FieldElement{-30210571, 5124043, 14181784, 8197961, 18964734, -11939093, 22597931, 7176455, -18585478, 13365930},
-		},
-		{
-			FieldElement{-7877390, -1499958, 8324673, 4690079, 6261860, 890446, 24538107, -8570186, -9689599, -3031667},
-			FieldElement{25008904, -10771599, -4305031, -9638010, 16265036, 15721635, 683793, -11823784, 15723479, -15163481},
-			FieldElement{-9660625, 12374379, -27006999, -7026148, -7724114, -12314514, 11879682, 5400171, 519526, -1235876},
-		},
-		{
-			FieldElement{22258397, -16332233, -7869817, 14613016, -22520255, -2950923, -20353881, 7315967, 16648397, 7605640},
-			FieldElement{-8081308, -8464597, -8223311, 9719710, 19259459, -15348212, 23994942, -5281555, -9468848, 4763278},
-			FieldElement{-21699244, 9220969, -15730624, 1084137, -25476107, -2852390, 31088447, -7764523, -11356529, 728112},
-		},
-		{
-			FieldElement{26047220, -11751471, -6900323, -16521798, 24092068, 9158119, -4273545, -12555558, -29365436, -5498272},
-			FieldElement{17510331, -322857, 5854289, 8403524, 17133918, -3112612, -28111007, 12327945, 10750447, 10014012},
-			FieldElement{-10312768, 3936952, 9156313, -8897683, 16498692, -994647, -27481051, -666732, 3424691, 7540221},
-		},
-		{
-			FieldElement{30322361, -6964110, 11361005, -4143317, 7433304, 4989748, -7071422, -16317219, -9244265, 15258046},
-			FieldElement{13054562, -2779497, 19155474, 469045, -12482797, 4566042, 5631406, 2711395, 1062915, -5136345},
-			FieldElement{-19240248, -11254599, -29509029, -7499965, -5835763, 13005411, -6066489, 12194497, 32960380, 1459310},
-		},
-	},
-	{
-		{
-			FieldElement{19852034, 7027924, 23669353, 10020366, 8586503, -6657907, 394197, -6101885, 18638003, -11174937},
-			FieldElement{31395534, 15098109, 26581030, 8030562, -16527914, -5007134, 9012486, -7584354, -6643087, -5442636},
-			FieldElement{-9192165, -2347377, -1997099, 4529534, 25766844, 607986, -13222, 9677543, -32294889, -6456008},
-		},
-		{
-			FieldElement{-2444496, -149937, 29348902, 8186665, 1873760, 12489863, -30934579, -7839692, -7852844, -8138429},
-			FieldElement{-15236356, -15433509, 7766470, 746860, 26346930, -10221762, -27333451, 10754588, -9431476, 5203576},
-			FieldElement{31834314, 14135496, -770007, 5159118, 20917671, -16768096, -7467973, -7337524, 31809243, 7347066},
-		},
-		{
-			FieldElement{-9606723, -11874240, 20414459, 13033986, 13716524, -11691881, 19797970, -12211255, 15192876, -2087490},
-			FieldElement{-12663563, -2181719, 1168162, -3804809, 26747877, -14138091, 10609330, 12694420, 33473243, -13382104},
-			FieldElement{33184999, 11180355, 15832085, -11385430, -1633671, 225884, 15089336, -11023903, -6135662, 14480053},
-		},
-		{
-			FieldElement{31308717, -5619998, 31030840, -1897099, 15674547, -6582883, 5496208, 13685227, 27595050, 8737275},
-			FieldElement{-20318852, -15150239, 10933843, -16178022, 8335352, -7546022, -31008351, -12610604, 26498114, 66511},
-			FieldElement{22644454, -8761729, -16671776, 4884562, -3105614, -13559366, 30540766, -4286747, -13327787, -7515095},
-		},
-		{
-			FieldElement{-28017847, 9834845, 18617207, -2681312, -3401956, -13307506, 8205540, 13585437, -17127465, 15115439},
-			FieldElement{23711543, -672915, 31206561, -8362711, 6164647, -9709987, -33535882, -1426096, 8236921, 16492939},
-			FieldElement{-23910559, -13515526, -26299483, -4503841, 25005590, -7687270, 19574902, 10071562, 6708380, -6222424},
-		},
-		{
-			FieldElement{2101391, -4930054, 19702731, 2367575, -15427167, 1047675, 5301017, 9328700, 29955601, -11678310},
-			FieldElement{3096359, 9271816, -21620864, -15521844, -14847996, -7592937, -25892142, -12635595, -9917575, 6216608},
-			FieldElement{-32615849, 338663, -25195611, 2510422, -29213566, -13820213, 24822830, -6146567, -26767480, 7525079},
-		},
-		{
-			FieldElement{-23066649, -13985623, 16133487, -7896178, -3389565, 778788, -910336, -2782495, -19386633, 11994101},
-			FieldElement{21691500, -13624626, -641331, -14367021, 3285881, -3483596, -25064666, 9718258, -7477437, 13381418},
-			FieldElement{18445390, -4202236, 14979846, 11622458, -1727110, -3582980, 23111648, -6375247, 28535282, 15779576},
-		},
-		{
-			FieldElement{30098053, 3089662, -9234387, 16662135, -21306940, 11308411, -14068454, 12021730, 9955285, -16303356},
-			FieldElement{9734894, -14576830, -7473633, -9138735, 2060392, 11313496, -18426029, 9924399, 20194861, 13380996},
-			FieldElement{-26378102, -7965207, -22167821, 15789297, -18055342, -6168792, -1984914, 15707771, 26342023, 10146099},
-		},
-	},
-	{
-		{
-			FieldElement{-26016874, -219943, 21339191, -41388, 19745256, -2878700, -29637280, 2227040, 21612326, -545728},
-			FieldElement{-13077387, 1184228, 23562814, -5970442, -20351244, -6348714, 25764461, 12243797, -20856566, 11649658},
-			FieldElement{-10031494, 11262626, 27384172, 2271902, 26947504, -15997771, 39944, 6114064, 33514190, 2333242},
-		},
-		{
-			FieldElement{-21433588, -12421821, 8119782, 7219913, -21830522, -9016134, -6679750, -12670638, 24350578, -13450001},
-			FieldElement{-4116307, -11271533, -23886186, 4843615, -30088339, 690623, -31536088, -10406836, 8317860, 12352766},
-			FieldElement{18200138, -14475911, -33087759, -2696619, -23702521, -9102511, -23552096, -2287550, 20712163, 6719373},
-		},
-		{
-			FieldElement{26656208, 6075253, -7858556, 1886072, -28344043, 4262326, 11117530, -3763210, 26224235, -3297458},
-			FieldElement{-17168938, -14854097, -3395676, -16369877, -19954045, 14050420, 21728352, 9493610, 18620611, -16428628},
-			FieldElement{-13323321, 13325349, 11432106, 5964811, 18609221, 6062965, -5269471, -9725556, -30701573, -16479657},
-		},
-		{
-			FieldElement{-23860538, -11233159, 26961357, 1640861, -32413112, -16737940, 12248509, -5240639, 13735342, 1934062},
-			FieldElement{25089769, 6742589, 17081145, -13406266, 21909293, -16067981, -15136294, -3765346, -21277997, 5473616},
-			FieldElement{31883677, -7961101, 1083432, -11572403, 22828471, 13290673, -7125085, 12469656, 29111212, -5451014},
-		},
-		{
-			FieldElement{24244947, -15050407, -26262976, 2791540, -14997599, 16666678, 24367466, 6388839, -10295587, 452383},
-			FieldElement{-25640782, -3417841, 5217916, 16224624, 19987036, -4082269, -24236251, -5915248, 15766062, 8407814},
-			FieldElement{-20406999, 13990231, 15495425, 16395525, 5377168, 15166495, -8917023, -4388953, -8067909, 2276718},
-		},
-		{
-			FieldElement{30157918, 12924066, -17712050, 9245753, 19895028, 3368142, -23827587, 5096219, 22740376, -7303417},
-			FieldElement{2041139, -14256350, 7783687, 13876377, -25946985, -13352459, 24051124, 13742383, -15637599, 13295222},
-			FieldElement{33338237, -8505733, 12532113, 7977527, 9106186, -1715251, -17720195, -4612972, -4451357, -14669444},
-		},
-		{
-			FieldElement{-20045281, 5454097, -14346548, 6447146, 28862071, 1883651, -2469266, -4141880, 7770569, 9620597},
-			FieldElement{23208068, 7979712, 33071466, 8149229, 1758231, -10834995, 30945528, -1694323, -33502340, -14767970},
-			FieldElement{1439958, -16270480, -1079989, -793782, 4625402, 10647766, -5043801, 1220118, 30494170, -11440799},
-		},
-		{
-			FieldElement{-5037580, -13028295, -2970559, -3061767, 15640974, -6701666, -26739026, 926050, -1684339, -13333647},
-			FieldElement{13908495, -3549272, 30919928, -6273825, -21521863, 7989039, 9021034, 9078865, 3353509, 4033511},
-			FieldElement{-29663431, -15113610, 32259991, -344482, 24295849, -12912123, 23161163, 8839127, 27485041, 7356032},
-		},
-	},
-	{
-		{
-			FieldElement{9661027, 705443, 11980065, -5370154, -1628543, 14661173, -6346142, 2625015, 28431036, -16771834},
-			FieldElement{-23839233, -8311415, -25945511, 7480958, -17681669, -8354183, -22545972, 14150565, 15970762, 4099461},
-			FieldElement{29262576, 16756590, 26350592, -8793563, 8529671, -11208050, 13617293, -9937143, 11465739, 8317062},
-		},
-		{
-			FieldElement{-25493081, -6962928, 32500200, -9419051, -23038724, -2302222, 14898637, 3848455, 20969334, -5157516},
-			FieldElement{-20384450, -14347713, -18336405, 13884722, -33039454, 2842114, -21610826, -3649888, 11177095, 14989547},
-			FieldElement{-24496721, -11716016, 16959896, 2278463, 12066309, 10137771, 13515641, 2581286, -28487508, 9930240},
-		},
-		{
-			FieldElement{-17751622, -2097826, 16544300, -13009300, -15914807, -14949081, 18345767, -13403753, 16291481, -5314038},
-			FieldElement{-33229194, 2553288, 32678213, 9875984, 8534129, 6889387, -9676774, 6957617, 4368891, 9788741},
-			FieldElement{16660756, 7281060, -10830758, 12911820, 20108584, -8101676, -21722536, -8613148, 16250552, -11111103},
-		},
-		{
-			FieldElement{-19765507, 2390526, -16551031, 14161980, 1905286, 6414907, 4689584, 10604807, -30190403, 4782747},
-			FieldElement{-1354539, 14736941, -7367442, -13292886, 7710542, -14155590, -9981571, 4383045, 22546403, 437323},
-			FieldElement{31665577, -12180464, -16186830, 1491339, -18368625, 3294682, 27343084, 2786261, -30633590, -14097016},
-		},
-		{
-			FieldElement{-14467279, -683715, -33374107, 7448552, 19294360, 14334329, -19690631, 2355319, -19284671, -6114373},
-			FieldElement{15121312, -15796162, 6377020, -6031361, -10798111, -12957845, 18952177, 15496498, -29380133, 11754228},
-			FieldElement{-2637277, -13483075, 8488727, -14303896, 12728761, -1622493, 7141596, 11724556, 22761615, -10134141},
-		},
-		{
-			FieldElement{16918416, 11729663, -18083579, 3022987, -31015732, -13339659, -28741185, -12227393, 32851222, 11717399},
-			FieldElement{11166634, 7338049, -6722523, 4531520, -29468672, -7302055, 31474879, 3483633, -1193175, -4030831},
-			FieldElement{-185635, 9921305, 31456609, -13536438, -12013818, 13348923, 33142652, 6546660, -19985279, -3948376},
-		},
-		{
-			FieldElement{-32460596, 11266712, -11197107, -7899103, 31703694, 3855903, -8537131, -12833048, -30772034, -15486313},
-			FieldElement{-18006477, 12709068, 3991746, -6479188, -21491523, -10550425, -31135347, -16049879, 10928917, 3011958},
-			FieldElement{-6957757, -15594337, 31696059, 334240, 29576716, 14796075, -30831056, -12805180, 18008031, 10258577},
-		},
-		{
-			FieldElement{-22448644, 15655569, 7018479, -4410003, -30314266, -1201591, -1853465, 1367120, 25127874, 6671743},
-			FieldElement{29701166, -14373934, -10878120, 9279288, -17568, 13127210, 21382910, 11042292, 25838796, 4642684},
-			FieldElement{-20430234, 14955537, -24126347, 8124619, -5369288, -5990470, 30468147, -13900640, 18423289, 4177476},
-		},
-	},
-}
diff --git a/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go b/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
deleted file mode 100644
index 5f8b994787..0000000000
--- a/installer/vendor/golang.org/x/crypto/ed25519/internal/edwards25519/edwards25519.go
+++ /dev/null
@@ -1,1771 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package edwards25519
-
-// This code is a port of the public domain, “ref10” implementation of ed25519
-// from SUPERCOP.
-
-// FieldElement represents an element of the field GF(2^255 - 19).  An element
-// t, entries t[0]...t[9], represents the integer t[0]+2^26 t[1]+2^51 t[2]+2^77
-// t[3]+2^102 t[4]+...+2^230 t[9].  Bounds on each t[i] vary depending on
-// context.
-type FieldElement [10]int32
-
-var zero FieldElement
-
-func FeZero(fe *FieldElement) {
-	copy(fe[:], zero[:])
-}
-
-func FeOne(fe *FieldElement) {
-	FeZero(fe)
-	fe[0] = 1
-}
-
-func FeAdd(dst, a, b *FieldElement) {
-	dst[0] = a[0] + b[0]
-	dst[1] = a[1] + b[1]
-	dst[2] = a[2] + b[2]
-	dst[3] = a[3] + b[3]
-	dst[4] = a[4] + b[4]
-	dst[5] = a[5] + b[5]
-	dst[6] = a[6] + b[6]
-	dst[7] = a[7] + b[7]
-	dst[8] = a[8] + b[8]
-	dst[9] = a[9] + b[9]
-}
-
-func FeSub(dst, a, b *FieldElement) {
-	dst[0] = a[0] - b[0]
-	dst[1] = a[1] - b[1]
-	dst[2] = a[2] - b[2]
-	dst[3] = a[3] - b[3]
-	dst[4] = a[4] - b[4]
-	dst[5] = a[5] - b[5]
-	dst[6] = a[6] - b[6]
-	dst[7] = a[7] - b[7]
-	dst[8] = a[8] - b[8]
-	dst[9] = a[9] - b[9]
-}
-
-func FeCopy(dst, src *FieldElement) {
-	copy(dst[:], src[:])
-}
-
-// Replace (f,g) with (g,g) if b == 1;
-// replace (f,g) with (f,g) if b == 0.
-//
-// Preconditions: b in {0,1}.
-func FeCMove(f, g *FieldElement, b int32) {
-	b = -b
-	f[0] ^= b & (f[0] ^ g[0])
-	f[1] ^= b & (f[1] ^ g[1])
-	f[2] ^= b & (f[2] ^ g[2])
-	f[3] ^= b & (f[3] ^ g[3])
-	f[4] ^= b & (f[4] ^ g[4])
-	f[5] ^= b & (f[5] ^ g[5])
-	f[6] ^= b & (f[6] ^ g[6])
-	f[7] ^= b & (f[7] ^ g[7])
-	f[8] ^= b & (f[8] ^ g[8])
-	f[9] ^= b & (f[9] ^ g[9])
-}
-
-func load3(in []byte) int64 {
-	var r int64
-	r = int64(in[0])
-	r |= int64(in[1]) << 8
-	r |= int64(in[2]) << 16
-	return r
-}
-
-func load4(in []byte) int64 {
-	var r int64
-	r = int64(in[0])
-	r |= int64(in[1]) << 8
-	r |= int64(in[2]) << 16
-	r |= int64(in[3]) << 24
-	return r
-}
-
-func FeFromBytes(dst *FieldElement, src *[32]byte) {
-	h0 := load4(src[:])
-	h1 := load3(src[4:]) << 6
-	h2 := load3(src[7:]) << 5
-	h3 := load3(src[10:]) << 3
-	h4 := load3(src[13:]) << 2
-	h5 := load4(src[16:])
-	h6 := load3(src[20:]) << 7
-	h7 := load3(src[23:]) << 5
-	h8 := load3(src[26:]) << 4
-	h9 := (load3(src[29:]) & 8388607) << 2
-
-	FeCombine(dst, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-// FeToBytes marshals h to s.
-// Preconditions:
-//   |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Write p=2^255-19; q=floor(h/p).
-// Basic claim: q = floor(2^(-255)(h + 19 2^(-25)h9 + 2^(-1))).
-//
-// Proof:
-//   Have |h|<=p so |q|<=1 so |19^2 2^(-255) q|<1/4.
-//   Also have |h-2^230 h9|<2^230 so |19 2^(-255)(h-2^230 h9)|<1/4.
-//
-//   Write y=2^(-1)-19^2 2^(-255)q-19 2^(-255)(h-2^230 h9).
-//   Then 0<y<1.
-//
-//   Write r=h-pq.
-//   Have 0<=r<=p-1=2^255-20.
-//   Thus 0<=r+19(2^-255)r<r+19(2^-255)2^255<=2^255-1.
-//
-//   Write x=r+19(2^-255)r+y.
-//   Then 0<x<2^255 so floor(2^(-255)x) = 0 so floor(q+2^(-255)x) = q.
-//
-//   Have q+2^(-255)x = 2^(-255)(h + 19 2^(-25) h9 + 2^(-1))
-//   so floor(2^(-255)(h + 19 2^(-25) h9 + 2^(-1))) = q.
-func FeToBytes(s *[32]byte, h *FieldElement) {
-	var carry [10]int32
-
-	q := (19*h[9] + (1 << 24)) >> 25
-	q = (h[0] + q) >> 26
-	q = (h[1] + q) >> 25
-	q = (h[2] + q) >> 26
-	q = (h[3] + q) >> 25
-	q = (h[4] + q) >> 26
-	q = (h[5] + q) >> 25
-	q = (h[6] + q) >> 26
-	q = (h[7] + q) >> 25
-	q = (h[8] + q) >> 26
-	q = (h[9] + q) >> 25
-
-	// Goal: Output h-(2^255-19)q, which is between 0 and 2^255-20.
-	h[0] += 19 * q
-	// Goal: Output h-2^255 q, which is between 0 and 2^255-20.
-
-	carry[0] = h[0] >> 26
-	h[1] += carry[0]
-	h[0] -= carry[0] << 26
-	carry[1] = h[1] >> 25
-	h[2] += carry[1]
-	h[1] -= carry[1] << 25
-	carry[2] = h[2] >> 26
-	h[3] += carry[2]
-	h[2] -= carry[2] << 26
-	carry[3] = h[3] >> 25
-	h[4] += carry[3]
-	h[3] -= carry[3] << 25
-	carry[4] = h[4] >> 26
-	h[5] += carry[4]
-	h[4] -= carry[4] << 26
-	carry[5] = h[5] >> 25
-	h[6] += carry[5]
-	h[5] -= carry[5] << 25
-	carry[6] = h[6] >> 26
-	h[7] += carry[6]
-	h[6] -= carry[6] << 26
-	carry[7] = h[7] >> 25
-	h[8] += carry[7]
-	h[7] -= carry[7] << 25
-	carry[8] = h[8] >> 26
-	h[9] += carry[8]
-	h[8] -= carry[8] << 26
-	carry[9] = h[9] >> 25
-	h[9] -= carry[9] << 25
-	// h10 = carry9
-
-	// Goal: Output h[0]+...+2^255 h10-2^255 q, which is between 0 and 2^255-20.
-	// Have h[0]+...+2^230 h[9] between 0 and 2^255-1;
-	// evidently 2^255 h10-2^255 q = 0.
-	// Goal: Output h[0]+...+2^230 h[9].
-
-	s[0] = byte(h[0] >> 0)
-	s[1] = byte(h[0] >> 8)
-	s[2] = byte(h[0] >> 16)
-	s[3] = byte((h[0] >> 24) | (h[1] << 2))
-	s[4] = byte(h[1] >> 6)
-	s[5] = byte(h[1] >> 14)
-	s[6] = byte((h[1] >> 22) | (h[2] << 3))
-	s[7] = byte(h[2] >> 5)
-	s[8] = byte(h[2] >> 13)
-	s[9] = byte((h[2] >> 21) | (h[3] << 5))
-	s[10] = byte(h[3] >> 3)
-	s[11] = byte(h[3] >> 11)
-	s[12] = byte((h[3] >> 19) | (h[4] << 6))
-	s[13] = byte(h[4] >> 2)
-	s[14] = byte(h[4] >> 10)
-	s[15] = byte(h[4] >> 18)
-	s[16] = byte(h[5] >> 0)
-	s[17] = byte(h[5] >> 8)
-	s[18] = byte(h[5] >> 16)
-	s[19] = byte((h[5] >> 24) | (h[6] << 1))
-	s[20] = byte(h[6] >> 7)
-	s[21] = byte(h[6] >> 15)
-	s[22] = byte((h[6] >> 23) | (h[7] << 3))
-	s[23] = byte(h[7] >> 5)
-	s[24] = byte(h[7] >> 13)
-	s[25] = byte((h[7] >> 21) | (h[8] << 4))
-	s[26] = byte(h[8] >> 4)
-	s[27] = byte(h[8] >> 12)
-	s[28] = byte((h[8] >> 20) | (h[9] << 6))
-	s[29] = byte(h[9] >> 2)
-	s[30] = byte(h[9] >> 10)
-	s[31] = byte(h[9] >> 18)
-}
-
-func FeIsNegative(f *FieldElement) byte {
-	var s [32]byte
-	FeToBytes(&s, f)
-	return s[0] & 1
-}
-
-func FeIsNonZero(f *FieldElement) int32 {
-	var s [32]byte
-	FeToBytes(&s, f)
-	var x uint8
-	for _, b := range s {
-		x |= b
-	}
-	x |= x >> 4
-	x |= x >> 2
-	x |= x >> 1
-	return int32(x & 1)
-}
-
-// FeNeg sets h = -f
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func FeNeg(h, f *FieldElement) {
-	h[0] = -f[0]
-	h[1] = -f[1]
-	h[2] = -f[2]
-	h[3] = -f[3]
-	h[4] = -f[4]
-	h[5] = -f[5]
-	h[6] = -f[6]
-	h[7] = -f[7]
-	h[8] = -f[8]
-	h[9] = -f[9]
-}
-
-func FeCombine(h *FieldElement, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
-	var c0, c1, c2, c3, c4, c5, c6, c7, c8, c9 int64
-
-	/*
-	  |h0| <= (1.1*1.1*2^52*(1+19+19+19+19)+1.1*1.1*2^50*(38+38+38+38+38))
-	    i.e. |h0| <= 1.2*2^59; narrower ranges for h2, h4, h6, h8
-	  |h1| <= (1.1*1.1*2^51*(1+1+19+19+19+19+19+19+19+19))
-	    i.e. |h1| <= 1.5*2^58; narrower ranges for h3, h5, h7, h9
-	*/
-
-	c0 = (h0 + (1 << 25)) >> 26
-	h1 += c0
-	h0 -= c0 << 26
-	c4 = (h4 + (1 << 25)) >> 26
-	h5 += c4
-	h4 -= c4 << 26
-	/* |h0| <= 2^25 */
-	/* |h4| <= 2^25 */
-	/* |h1| <= 1.51*2^58 */
-	/* |h5| <= 1.51*2^58 */
-
-	c1 = (h1 + (1 << 24)) >> 25
-	h2 += c1
-	h1 -= c1 << 25
-	c5 = (h5 + (1 << 24)) >> 25
-	h6 += c5
-	h5 -= c5 << 25
-	/* |h1| <= 2^24; from now on fits into int32 */
-	/* |h5| <= 2^24; from now on fits into int32 */
-	/* |h2| <= 1.21*2^59 */
-	/* |h6| <= 1.21*2^59 */
-
-	c2 = (h2 + (1 << 25)) >> 26
-	h3 += c2
-	h2 -= c2 << 26
-	c6 = (h6 + (1 << 25)) >> 26
-	h7 += c6
-	h6 -= c6 << 26
-	/* |h2| <= 2^25; from now on fits into int32 unchanged */
-	/* |h6| <= 2^25; from now on fits into int32 unchanged */
-	/* |h3| <= 1.51*2^58 */
-	/* |h7| <= 1.51*2^58 */
-
-	c3 = (h3 + (1 << 24)) >> 25
-	h4 += c3
-	h3 -= c3 << 25
-	c7 = (h7 + (1 << 24)) >> 25
-	h8 += c7
-	h7 -= c7 << 25
-	/* |h3| <= 2^24; from now on fits into int32 unchanged */
-	/* |h7| <= 2^24; from now on fits into int32 unchanged */
-	/* |h4| <= 1.52*2^33 */
-	/* |h8| <= 1.52*2^33 */
-
-	c4 = (h4 + (1 << 25)) >> 26
-	h5 += c4
-	h4 -= c4 << 26
-	c8 = (h8 + (1 << 25)) >> 26
-	h9 += c8
-	h8 -= c8 << 26
-	/* |h4| <= 2^25; from now on fits into int32 unchanged */
-	/* |h8| <= 2^25; from now on fits into int32 unchanged */
-	/* |h5| <= 1.01*2^24 */
-	/* |h9| <= 1.51*2^58 */
-
-	c9 = (h9 + (1 << 24)) >> 25
-	h0 += c9 * 19
-	h9 -= c9 << 25
-	/* |h9| <= 2^24; from now on fits into int32 unchanged */
-	/* |h0| <= 1.8*2^37 */
-
-	c0 = (h0 + (1 << 25)) >> 26
-	h1 += c0
-	h0 -= c0 << 26
-	/* |h0| <= 2^25; from now on fits into int32 unchanged */
-	/* |h1| <= 1.01*2^24 */
-
-	h[0] = int32(h0)
-	h[1] = int32(h1)
-	h[2] = int32(h2)
-	h[3] = int32(h3)
-	h[4] = int32(h4)
-	h[5] = int32(h5)
-	h[6] = int32(h6)
-	h[7] = int32(h7)
-	h[8] = int32(h8)
-	h[9] = int32(h9)
-}
-
-// FeMul calculates h = f * g
-// Can overlap h with f or g.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//    |g| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-//
-// Notes on implementation strategy:
-//
-// Using schoolbook multiplication.
-// Karatsuba would save a little in some cost models.
-//
-// Most multiplications by 2 and 19 are 32-bit precomputations;
-// cheaper than 64-bit postcomputations.
-//
-// There is one remaining multiplication by 19 in the carry chain;
-// one *19 precomputation can be merged into this,
-// but the resulting data flow is considerably less clean.
-//
-// There are 12 carries below.
-// 10 of them are 2-way parallelizable and vectorizable.
-// Can get away with 11 carries, but then data flow is much deeper.
-//
-// With tighter constraints on inputs, can squeeze carries into int32.
-func FeMul(h, f, g *FieldElement) {
-	f0 := int64(f[0])
-	f1 := int64(f[1])
-	f2 := int64(f[2])
-	f3 := int64(f[3])
-	f4 := int64(f[4])
-	f5 := int64(f[5])
-	f6 := int64(f[6])
-	f7 := int64(f[7])
-	f8 := int64(f[8])
-	f9 := int64(f[9])
-
-	f1_2 := int64(2 * f[1])
-	f3_2 := int64(2 * f[3])
-	f5_2 := int64(2 * f[5])
-	f7_2 := int64(2 * f[7])
-	f9_2 := int64(2 * f[9])
-
-	g0 := int64(g[0])
-	g1 := int64(g[1])
-	g2 := int64(g[2])
-	g3 := int64(g[3])
-	g4 := int64(g[4])
-	g5 := int64(g[5])
-	g6 := int64(g[6])
-	g7 := int64(g[7])
-	g8 := int64(g[8])
-	g9 := int64(g[9])
-
-	g1_19 := int64(19 * g[1]) /* 1.4*2^29 */
-	g2_19 := int64(19 * g[2]) /* 1.4*2^30; still ok */
-	g3_19 := int64(19 * g[3])
-	g4_19 := int64(19 * g[4])
-	g5_19 := int64(19 * g[5])
-	g6_19 := int64(19 * g[6])
-	g7_19 := int64(19 * g[7])
-	g8_19 := int64(19 * g[8])
-	g9_19 := int64(19 * g[9])
-
-	h0 := f0*g0 + f1_2*g9_19 + f2*g8_19 + f3_2*g7_19 + f4*g6_19 + f5_2*g5_19 + f6*g4_19 + f7_2*g3_19 + f8*g2_19 + f9_2*g1_19
-	h1 := f0*g1 + f1*g0 + f2*g9_19 + f3*g8_19 + f4*g7_19 + f5*g6_19 + f6*g5_19 + f7*g4_19 + f8*g3_19 + f9*g2_19
-	h2 := f0*g2 + f1_2*g1 + f2*g0 + f3_2*g9_19 + f4*g8_19 + f5_2*g7_19 + f6*g6_19 + f7_2*g5_19 + f8*g4_19 + f9_2*g3_19
-	h3 := f0*g3 + f1*g2 + f2*g1 + f3*g0 + f4*g9_19 + f5*g8_19 + f6*g7_19 + f7*g6_19 + f8*g5_19 + f9*g4_19
-	h4 := f0*g4 + f1_2*g3 + f2*g2 + f3_2*g1 + f4*g0 + f5_2*g9_19 + f6*g8_19 + f7_2*g7_19 + f8*g6_19 + f9_2*g5_19
-	h5 := f0*g5 + f1*g4 + f2*g3 + f3*g2 + f4*g1 + f5*g0 + f6*g9_19 + f7*g8_19 + f8*g7_19 + f9*g6_19
-	h6 := f0*g6 + f1_2*g5 + f2*g4 + f3_2*g3 + f4*g2 + f5_2*g1 + f6*g0 + f7_2*g9_19 + f8*g8_19 + f9_2*g7_19
-	h7 := f0*g7 + f1*g6 + f2*g5 + f3*g4 + f4*g3 + f5*g2 + f6*g1 + f7*g0 + f8*g9_19 + f9*g8_19
-	h8 := f0*g8 + f1_2*g7 + f2*g6 + f3_2*g5 + f4*g4 + f5_2*g3 + f6*g2 + f7_2*g1 + f8*g0 + f9_2*g9_19
-	h9 := f0*g9 + f1*g8 + f2*g7 + f3*g6 + f4*g5 + f5*g4 + f6*g3 + f7*g2 + f8*g1 + f9*g0
-
-	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-func feSquare(f *FieldElement) (h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 int64) {
-	f0 := int64(f[0])
-	f1 := int64(f[1])
-	f2 := int64(f[2])
-	f3 := int64(f[3])
-	f4 := int64(f[4])
-	f5 := int64(f[5])
-	f6 := int64(f[6])
-	f7 := int64(f[7])
-	f8 := int64(f[8])
-	f9 := int64(f[9])
-	f0_2 := int64(2 * f[0])
-	f1_2 := int64(2 * f[1])
-	f2_2 := int64(2 * f[2])
-	f3_2 := int64(2 * f[3])
-	f4_2 := int64(2 * f[4])
-	f5_2 := int64(2 * f[5])
-	f6_2 := int64(2 * f[6])
-	f7_2 := int64(2 * f[7])
-	f5_38 := 38 * f5 // 1.31*2^30
-	f6_19 := 19 * f6 // 1.31*2^30
-	f7_38 := 38 * f7 // 1.31*2^30
-	f8_19 := 19 * f8 // 1.31*2^30
-	f9_38 := 38 * f9 // 1.31*2^30
-
-	h0 = f0*f0 + f1_2*f9_38 + f2_2*f8_19 + f3_2*f7_38 + f4_2*f6_19 + f5*f5_38
-	h1 = f0_2*f1 + f2*f9_38 + f3_2*f8_19 + f4*f7_38 + f5_2*f6_19
-	h2 = f0_2*f2 + f1_2*f1 + f3_2*f9_38 + f4_2*f8_19 + f5_2*f7_38 + f6*f6_19
-	h3 = f0_2*f3 + f1_2*f2 + f4*f9_38 + f5_2*f8_19 + f6*f7_38
-	h4 = f0_2*f4 + f1_2*f3_2 + f2*f2 + f5_2*f9_38 + f6_2*f8_19 + f7*f7_38
-	h5 = f0_2*f5 + f1_2*f4 + f2_2*f3 + f6*f9_38 + f7_2*f8_19
-	h6 = f0_2*f6 + f1_2*f5_2 + f2_2*f4 + f3_2*f3 + f7_2*f9_38 + f8*f8_19
-	h7 = f0_2*f7 + f1_2*f6 + f2_2*f5 + f3_2*f4 + f8*f9_38
-	h8 = f0_2*f8 + f1_2*f7_2 + f2_2*f6 + f3_2*f5_2 + f4*f4 + f9*f9_38
-	h9 = f0_2*f9 + f1_2*f8 + f2_2*f7 + f3_2*f6 + f4_2*f5
-
-	return
-}
-
-// FeSquare calculates h = f*f. Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.1*2^26,1.1*2^25,1.1*2^26,1.1*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.1*2^25,1.1*2^24,1.1*2^25,1.1*2^24,etc.
-func FeSquare(h, f *FieldElement) {
-	h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
-	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-// FeSquare2 sets h = 2 * f * f
-//
-// Can overlap h with f.
-//
-// Preconditions:
-//    |f| bounded by 1.65*2^26,1.65*2^25,1.65*2^26,1.65*2^25,etc.
-//
-// Postconditions:
-//    |h| bounded by 1.01*2^25,1.01*2^24,1.01*2^25,1.01*2^24,etc.
-// See fe_mul.c for discussion of implementation strategy.
-func FeSquare2(h, f *FieldElement) {
-	h0, h1, h2, h3, h4, h5, h6, h7, h8, h9 := feSquare(f)
-
-	h0 += h0
-	h1 += h1
-	h2 += h2
-	h3 += h3
-	h4 += h4
-	h5 += h5
-	h6 += h6
-	h7 += h7
-	h8 += h8
-	h9 += h9
-
-	FeCombine(h, h0, h1, h2, h3, h4, h5, h6, h7, h8, h9)
-}
-
-func FeInvert(out, z *FieldElement) {
-	var t0, t1, t2, t3 FieldElement
-	var i int
-
-	FeSquare(&t0, z)        // 2^1
-	FeSquare(&t1, &t0)      // 2^2
-	for i = 1; i < 2; i++ { // 2^3
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t1, z, &t1)      // 2^3 + 2^0
-	FeMul(&t0, &t0, &t1)    // 2^3 + 2^1 + 2^0
-	FeSquare(&t2, &t0)      // 2^4 + 2^2 + 2^1
-	FeMul(&t1, &t1, &t2)    // 2^4 + 2^3 + 2^2 + 2^1 + 2^0
-	FeSquare(&t2, &t1)      // 5,4,3,2,1
-	for i = 1; i < 5; i++ { // 9,8,7,6,5
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t1, &t2, &t1)     // 9,8,7,6,5,4,3,2,1,0
-	FeSquare(&t2, &t1)       // 10..1
-	for i = 1; i < 10; i++ { // 19..10
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t2, &t2, &t1)     // 19..0
-	FeSquare(&t3, &t2)       // 20..1
-	for i = 1; i < 20; i++ { // 39..20
-		FeSquare(&t3, &t3)
-	}
-	FeMul(&t2, &t3, &t2)     // 39..0
-	FeSquare(&t2, &t2)       // 40..1
-	for i = 1; i < 10; i++ { // 49..10
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t1, &t2, &t1)     // 49..0
-	FeSquare(&t2, &t1)       // 50..1
-	for i = 1; i < 50; i++ { // 99..50
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t2, &t2, &t1)      // 99..0
-	FeSquare(&t3, &t2)        // 100..1
-	for i = 1; i < 100; i++ { // 199..100
-		FeSquare(&t3, &t3)
-	}
-	FeMul(&t2, &t3, &t2)     // 199..0
-	FeSquare(&t2, &t2)       // 200..1
-	for i = 1; i < 50; i++ { // 249..50
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t1, &t2, &t1)    // 249..0
-	FeSquare(&t1, &t1)      // 250..1
-	for i = 1; i < 5; i++ { // 254..5
-		FeSquare(&t1, &t1)
-	}
-	FeMul(out, &t1, &t0) // 254..5,3,1,0
-}
-
-func fePow22523(out, z *FieldElement) {
-	var t0, t1, t2 FieldElement
-	var i int
-
-	FeSquare(&t0, z)
-	for i = 1; i < 1; i++ {
-		FeSquare(&t0, &t0)
-	}
-	FeSquare(&t1, &t0)
-	for i = 1; i < 2; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t1, z, &t1)
-	FeMul(&t0, &t0, &t1)
-	FeSquare(&t0, &t0)
-	for i = 1; i < 1; i++ {
-		FeSquare(&t0, &t0)
-	}
-	FeMul(&t0, &t1, &t0)
-	FeSquare(&t1, &t0)
-	for i = 1; i < 5; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t0, &t1, &t0)
-	FeSquare(&t1, &t0)
-	for i = 1; i < 10; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t1, &t1, &t0)
-	FeSquare(&t2, &t1)
-	for i = 1; i < 20; i++ {
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t1, &t2, &t1)
-	FeSquare(&t1, &t1)
-	for i = 1; i < 10; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t0, &t1, &t0)
-	FeSquare(&t1, &t0)
-	for i = 1; i < 50; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t1, &t1, &t0)
-	FeSquare(&t2, &t1)
-	for i = 1; i < 100; i++ {
-		FeSquare(&t2, &t2)
-	}
-	FeMul(&t1, &t2, &t1)
-	FeSquare(&t1, &t1)
-	for i = 1; i < 50; i++ {
-		FeSquare(&t1, &t1)
-	}
-	FeMul(&t0, &t1, &t0)
-	FeSquare(&t0, &t0)
-	for i = 1; i < 2; i++ {
-		FeSquare(&t0, &t0)
-	}
-	FeMul(out, &t0, z)
-}
-
-// Group elements are members of the elliptic curve -x^2 + y^2 = 1 + d * x^2 *
-// y^2 where d = -121665/121666.
-//
-// Several representations are used:
-//   ProjectiveGroupElement: (X:Y:Z) satisfying x=X/Z, y=Y/Z
-//   ExtendedGroupElement: (X:Y:Z:T) satisfying x=X/Z, y=Y/Z, XY=ZT
-//   CompletedGroupElement: ((X:Z),(Y:T)) satisfying x=X/Z, y=Y/T
-//   PreComputedGroupElement: (y+x,y-x,2dxy)
-
-type ProjectiveGroupElement struct {
-	X, Y, Z FieldElement
-}
-
-type ExtendedGroupElement struct {
-	X, Y, Z, T FieldElement
-}
-
-type CompletedGroupElement struct {
-	X, Y, Z, T FieldElement
-}
-
-type PreComputedGroupElement struct {
-	yPlusX, yMinusX, xy2d FieldElement
-}
-
-type CachedGroupElement struct {
-	yPlusX, yMinusX, Z, T2d FieldElement
-}
-
-func (p *ProjectiveGroupElement) Zero() {
-	FeZero(&p.X)
-	FeOne(&p.Y)
-	FeOne(&p.Z)
-}
-
-func (p *ProjectiveGroupElement) Double(r *CompletedGroupElement) {
-	var t0 FieldElement
-
-	FeSquare(&r.X, &p.X)
-	FeSquare(&r.Z, &p.Y)
-	FeSquare2(&r.T, &p.Z)
-	FeAdd(&r.Y, &p.X, &p.Y)
-	FeSquare(&t0, &r.Y)
-	FeAdd(&r.Y, &r.Z, &r.X)
-	FeSub(&r.Z, &r.Z, &r.X)
-	FeSub(&r.X, &t0, &r.Y)
-	FeSub(&r.T, &r.T, &r.Z)
-}
-
-func (p *ProjectiveGroupElement) ToBytes(s *[32]byte) {
-	var recip, x, y FieldElement
-
-	FeInvert(&recip, &p.Z)
-	FeMul(&x, &p.X, &recip)
-	FeMul(&y, &p.Y, &recip)
-	FeToBytes(s, &y)
-	s[31] ^= FeIsNegative(&x) << 7
-}
-
-func (p *ExtendedGroupElement) Zero() {
-	FeZero(&p.X)
-	FeOne(&p.Y)
-	FeOne(&p.Z)
-	FeZero(&p.T)
-}
-
-func (p *ExtendedGroupElement) Double(r *CompletedGroupElement) {
-	var q ProjectiveGroupElement
-	p.ToProjective(&q)
-	q.Double(r)
-}
-
-func (p *ExtendedGroupElement) ToCached(r *CachedGroupElement) {
-	FeAdd(&r.yPlusX, &p.Y, &p.X)
-	FeSub(&r.yMinusX, &p.Y, &p.X)
-	FeCopy(&r.Z, &p.Z)
-	FeMul(&r.T2d, &p.T, &d2)
-}
-
-func (p *ExtendedGroupElement) ToProjective(r *ProjectiveGroupElement) {
-	FeCopy(&r.X, &p.X)
-	FeCopy(&r.Y, &p.Y)
-	FeCopy(&r.Z, &p.Z)
-}
-
-func (p *ExtendedGroupElement) ToBytes(s *[32]byte) {
-	var recip, x, y FieldElement
-
-	FeInvert(&recip, &p.Z)
-	FeMul(&x, &p.X, &recip)
-	FeMul(&y, &p.Y, &recip)
-	FeToBytes(s, &y)
-	s[31] ^= FeIsNegative(&x) << 7
-}
-
-func (p *ExtendedGroupElement) FromBytes(s *[32]byte) bool {
-	var u, v, v3, vxx, check FieldElement
-
-	FeFromBytes(&p.Y, s)
-	FeOne(&p.Z)
-	FeSquare(&u, &p.Y)
-	FeMul(&v, &u, &d)
-	FeSub(&u, &u, &p.Z) // y = y^2-1
-	FeAdd(&v, &v, &p.Z) // v = dy^2+1
-
-	FeSquare(&v3, &v)
-	FeMul(&v3, &v3, &v) // v3 = v^3
-	FeSquare(&p.X, &v3)
-	FeMul(&p.X, &p.X, &v)
-	FeMul(&p.X, &p.X, &u) // x = uv^7
-
-	fePow22523(&p.X, &p.X) // x = (uv^7)^((q-5)/8)
-	FeMul(&p.X, &p.X, &v3)
-	FeMul(&p.X, &p.X, &u) // x = uv^3(uv^7)^((q-5)/8)
-
-	var tmpX, tmp2 [32]byte
-
-	FeSquare(&vxx, &p.X)
-	FeMul(&vxx, &vxx, &v)
-	FeSub(&check, &vxx, &u) // vx^2-u
-	if FeIsNonZero(&check) == 1 {
-		FeAdd(&check, &vxx, &u) // vx^2+u
-		if FeIsNonZero(&check) == 1 {
-			return false
-		}
-		FeMul(&p.X, &p.X, &SqrtM1)
-
-		FeToBytes(&tmpX, &p.X)
-		for i, v := range tmpX {
-			tmp2[31-i] = v
-		}
-	}
-
-	if FeIsNegative(&p.X) != (s[31] >> 7) {
-		FeNeg(&p.X, &p.X)
-	}
-
-	FeMul(&p.T, &p.X, &p.Y)
-	return true
-}
-
-func (p *CompletedGroupElement) ToProjective(r *ProjectiveGroupElement) {
-	FeMul(&r.X, &p.X, &p.T)
-	FeMul(&r.Y, &p.Y, &p.Z)
-	FeMul(&r.Z, &p.Z, &p.T)
-}
-
-func (p *CompletedGroupElement) ToExtended(r *ExtendedGroupElement) {
-	FeMul(&r.X, &p.X, &p.T)
-	FeMul(&r.Y, &p.Y, &p.Z)
-	FeMul(&r.Z, &p.Z, &p.T)
-	FeMul(&r.T, &p.X, &p.Y)
-}
-
-func (p *PreComputedGroupElement) Zero() {
-	FeOne(&p.yPlusX)
-	FeOne(&p.yMinusX)
-	FeZero(&p.xy2d)
-}
-
-func geAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
-	var t0 FieldElement
-
-	FeAdd(&r.X, &p.Y, &p.X)
-	FeSub(&r.Y, &p.Y, &p.X)
-	FeMul(&r.Z, &r.X, &q.yPlusX)
-	FeMul(&r.Y, &r.Y, &q.yMinusX)
-	FeMul(&r.T, &q.T2d, &p.T)
-	FeMul(&r.X, &p.Z, &q.Z)
-	FeAdd(&t0, &r.X, &r.X)
-	FeSub(&r.X, &r.Z, &r.Y)
-	FeAdd(&r.Y, &r.Z, &r.Y)
-	FeAdd(&r.Z, &t0, &r.T)
-	FeSub(&r.T, &t0, &r.T)
-}
-
-func geSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *CachedGroupElement) {
-	var t0 FieldElement
-
-	FeAdd(&r.X, &p.Y, &p.X)
-	FeSub(&r.Y, &p.Y, &p.X)
-	FeMul(&r.Z, &r.X, &q.yMinusX)
-	FeMul(&r.Y, &r.Y, &q.yPlusX)
-	FeMul(&r.T, &q.T2d, &p.T)
-	FeMul(&r.X, &p.Z, &q.Z)
-	FeAdd(&t0, &r.X, &r.X)
-	FeSub(&r.X, &r.Z, &r.Y)
-	FeAdd(&r.Y, &r.Z, &r.Y)
-	FeSub(&r.Z, &t0, &r.T)
-	FeAdd(&r.T, &t0, &r.T)
-}
-
-func geMixedAdd(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
-	var t0 FieldElement
-
-	FeAdd(&r.X, &p.Y, &p.X)
-	FeSub(&r.Y, &p.Y, &p.X)
-	FeMul(&r.Z, &r.X, &q.yPlusX)
-	FeMul(&r.Y, &r.Y, &q.yMinusX)
-	FeMul(&r.T, &q.xy2d, &p.T)
-	FeAdd(&t0, &p.Z, &p.Z)
-	FeSub(&r.X, &r.Z, &r.Y)
-	FeAdd(&r.Y, &r.Z, &r.Y)
-	FeAdd(&r.Z, &t0, &r.T)
-	FeSub(&r.T, &t0, &r.T)
-}
-
-func geMixedSub(r *CompletedGroupElement, p *ExtendedGroupElement, q *PreComputedGroupElement) {
-	var t0 FieldElement
-
-	FeAdd(&r.X, &p.Y, &p.X)
-	FeSub(&r.Y, &p.Y, &p.X)
-	FeMul(&r.Z, &r.X, &q.yMinusX)
-	FeMul(&r.Y, &r.Y, &q.yPlusX)
-	FeMul(&r.T, &q.xy2d, &p.T)
-	FeAdd(&t0, &p.Z, &p.Z)
-	FeSub(&r.X, &r.Z, &r.Y)
-	FeAdd(&r.Y, &r.Z, &r.Y)
-	FeSub(&r.Z, &t0, &r.T)
-	FeAdd(&r.T, &t0, &r.T)
-}
-
-func slide(r *[256]int8, a *[32]byte) {
-	for i := range r {
-		r[i] = int8(1 & (a[i>>3] >> uint(i&7)))
-	}
-
-	for i := range r {
-		if r[i] != 0 {
-			for b := 1; b <= 6 && i+b < 256; b++ {
-				if r[i+b] != 0 {
-					if r[i]+(r[i+b]<<uint(b)) <= 15 {
-						r[i] += r[i+b] << uint(b)
-						r[i+b] = 0
-					} else if r[i]-(r[i+b]<<uint(b)) >= -15 {
-						r[i] -= r[i+b] << uint(b)
-						for k := i + b; k < 256; k++ {
-							if r[k] == 0 {
-								r[k] = 1
-								break
-							}
-							r[k] = 0
-						}
-					} else {
-						break
-					}
-				}
-			}
-		}
-	}
-}
-
-// GeDoubleScalarMultVartime sets r = a*A + b*B
-// where a = a[0]+256*a[1]+...+256^31 a[31].
-// and b = b[0]+256*b[1]+...+256^31 b[31].
-// B is the Ed25519 base point (x,4/5) with x positive.
-func GeDoubleScalarMultVartime(r *ProjectiveGroupElement, a *[32]byte, A *ExtendedGroupElement, b *[32]byte) {
-	var aSlide, bSlide [256]int8
-	var Ai [8]CachedGroupElement // A,3A,5A,7A,9A,11A,13A,15A
-	var t CompletedGroupElement
-	var u, A2 ExtendedGroupElement
-	var i int
-
-	slide(&aSlide, a)
-	slide(&bSlide, b)
-
-	A.ToCached(&Ai[0])
-	A.Double(&t)
-	t.ToExtended(&A2)
-
-	for i := 0; i < 7; i++ {
-		geAdd(&t, &A2, &Ai[i])
-		t.ToExtended(&u)
-		u.ToCached(&Ai[i+1])
-	}
-
-	r.Zero()
-
-	for i = 255; i >= 0; i-- {
-		if aSlide[i] != 0 || bSlide[i] != 0 {
-			break
-		}
-	}
-
-	for ; i >= 0; i-- {
-		r.Double(&t)
-
-		if aSlide[i] > 0 {
-			t.ToExtended(&u)
-			geAdd(&t, &u, &Ai[aSlide[i]/2])
-		} else if aSlide[i] < 0 {
-			t.ToExtended(&u)
-			geSub(&t, &u, &Ai[(-aSlide[i])/2])
-		}
-
-		if bSlide[i] > 0 {
-			t.ToExtended(&u)
-			geMixedAdd(&t, &u, &bi[bSlide[i]/2])
-		} else if bSlide[i] < 0 {
-			t.ToExtended(&u)
-			geMixedSub(&t, &u, &bi[(-bSlide[i])/2])
-		}
-
-		t.ToProjective(r)
-	}
-}
-
-// equal returns 1 if b == c and 0 otherwise, assuming that b and c are
-// non-negative.
-func equal(b, c int32) int32 {
-	x := uint32(b ^ c)
-	x--
-	return int32(x >> 31)
-}
-
-// negative returns 1 if b < 0 and 0 otherwise.
-func negative(b int32) int32 {
-	return (b >> 31) & 1
-}
-
-func PreComputedGroupElementCMove(t, u *PreComputedGroupElement, b int32) {
-	FeCMove(&t.yPlusX, &u.yPlusX, b)
-	FeCMove(&t.yMinusX, &u.yMinusX, b)
-	FeCMove(&t.xy2d, &u.xy2d, b)
-}
-
-func selectPoint(t *PreComputedGroupElement, pos int32, b int32) {
-	var minusT PreComputedGroupElement
-	bNegative := negative(b)
-	bAbs := b - (((-bNegative) & b) << 1)
-
-	t.Zero()
-	for i := int32(0); i < 8; i++ {
-		PreComputedGroupElementCMove(t, &base[pos][i], equal(bAbs, i+1))
-	}
-	FeCopy(&minusT.yPlusX, &t.yMinusX)
-	FeCopy(&minusT.yMinusX, &t.yPlusX)
-	FeNeg(&minusT.xy2d, &t.xy2d)
-	PreComputedGroupElementCMove(t, &minusT, bNegative)
-}
-
-// GeScalarMultBase computes h = a*B, where
-//   a = a[0]+256*a[1]+...+256^31 a[31]
-//   B is the Ed25519 base point (x,4/5) with x positive.
-//
-// Preconditions:
-//   a[31] <= 127
-func GeScalarMultBase(h *ExtendedGroupElement, a *[32]byte) {
-	var e [64]int8
-
-	for i, v := range a {
-		e[2*i] = int8(v & 15)
-		e[2*i+1] = int8((v >> 4) & 15)
-	}
-
-	// each e[i] is between 0 and 15 and e[63] is between 0 and 7.
-
-	carry := int8(0)
-	for i := 0; i < 63; i++ {
-		e[i] += carry
-		carry = (e[i] + 8) >> 4
-		e[i] -= carry << 4
-	}
-	e[63] += carry
-	// each e[i] is between -8 and 8.
-
-	h.Zero()
-	var t PreComputedGroupElement
-	var r CompletedGroupElement
-	for i := int32(1); i < 64; i += 2 {
-		selectPoint(&t, i/2, int32(e[i]))
-		geMixedAdd(&r, h, &t)
-		r.ToExtended(h)
-	}
-
-	var s ProjectiveGroupElement
-
-	h.Double(&r)
-	r.ToProjective(&s)
-	s.Double(&r)
-	r.ToProjective(&s)
-	s.Double(&r)
-	r.ToProjective(&s)
-	s.Double(&r)
-	r.ToExtended(h)
-
-	for i := int32(0); i < 64; i += 2 {
-		selectPoint(&t, i/2, int32(e[i]))
-		geMixedAdd(&r, h, &t)
-		r.ToExtended(h)
-	}
-}
-
-// The scalars are GF(2^252 + 27742317777372353535851937790883648493).
-
-// Input:
-//   a[0]+256*a[1]+...+256^31*a[31] = a
-//   b[0]+256*b[1]+...+256^31*b[31] = b
-//   c[0]+256*c[1]+...+256^31*c[31] = c
-//
-// Output:
-//   s[0]+256*s[1]+...+256^31*s[31] = (ab+c) mod l
-//   where l = 2^252 + 27742317777372353535851937790883648493.
-func ScMulAdd(s, a, b, c *[32]byte) {
-	a0 := 2097151 & load3(a[:])
-	a1 := 2097151 & (load4(a[2:]) >> 5)
-	a2 := 2097151 & (load3(a[5:]) >> 2)
-	a3 := 2097151 & (load4(a[7:]) >> 7)
-	a4 := 2097151 & (load4(a[10:]) >> 4)
-	a5 := 2097151 & (load3(a[13:]) >> 1)
-	a6 := 2097151 & (load4(a[15:]) >> 6)
-	a7 := 2097151 & (load3(a[18:]) >> 3)
-	a8 := 2097151 & load3(a[21:])
-	a9 := 2097151 & (load4(a[23:]) >> 5)
-	a10 := 2097151 & (load3(a[26:]) >> 2)
-	a11 := (load4(a[28:]) >> 7)
-	b0 := 2097151 & load3(b[:])
-	b1 := 2097151 & (load4(b[2:]) >> 5)
-	b2 := 2097151 & (load3(b[5:]) >> 2)
-	b3 := 2097151 & (load4(b[7:]) >> 7)
-	b4 := 2097151 & (load4(b[10:]) >> 4)
-	b5 := 2097151 & (load3(b[13:]) >> 1)
-	b6 := 2097151 & (load4(b[15:]) >> 6)
-	b7 := 2097151 & (load3(b[18:]) >> 3)
-	b8 := 2097151 & load3(b[21:])
-	b9 := 2097151 & (load4(b[23:]) >> 5)
-	b10 := 2097151 & (load3(b[26:]) >> 2)
-	b11 := (load4(b[28:]) >> 7)
-	c0 := 2097151 & load3(c[:])
-	c1 := 2097151 & (load4(c[2:]) >> 5)
-	c2 := 2097151 & (load3(c[5:]) >> 2)
-	c3 := 2097151 & (load4(c[7:]) >> 7)
-	c4 := 2097151 & (load4(c[10:]) >> 4)
-	c5 := 2097151 & (load3(c[13:]) >> 1)
-	c6 := 2097151 & (load4(c[15:]) >> 6)
-	c7 := 2097151 & (load3(c[18:]) >> 3)
-	c8 := 2097151 & load3(c[21:])
-	c9 := 2097151 & (load4(c[23:]) >> 5)
-	c10 := 2097151 & (load3(c[26:]) >> 2)
-	c11 := (load4(c[28:]) >> 7)
-	var carry [23]int64
-
-	s0 := c0 + a0*b0
-	s1 := c1 + a0*b1 + a1*b0
-	s2 := c2 + a0*b2 + a1*b1 + a2*b0
-	s3 := c3 + a0*b3 + a1*b2 + a2*b1 + a3*b0
-	s4 := c4 + a0*b4 + a1*b3 + a2*b2 + a3*b1 + a4*b0
-	s5 := c5 + a0*b5 + a1*b4 + a2*b3 + a3*b2 + a4*b1 + a5*b0
-	s6 := c6 + a0*b6 + a1*b5 + a2*b4 + a3*b3 + a4*b2 + a5*b1 + a6*b0
-	s7 := c7 + a0*b7 + a1*b6 + a2*b5 + a3*b4 + a4*b3 + a5*b2 + a6*b1 + a7*b0
-	s8 := c8 + a0*b8 + a1*b7 + a2*b6 + a3*b5 + a4*b4 + a5*b3 + a6*b2 + a7*b1 + a8*b0
-	s9 := c9 + a0*b9 + a1*b8 + a2*b7 + a3*b6 + a4*b5 + a5*b4 + a6*b3 + a7*b2 + a8*b1 + a9*b0
-	s10 := c10 + a0*b10 + a1*b9 + a2*b8 + a3*b7 + a4*b6 + a5*b5 + a6*b4 + a7*b3 + a8*b2 + a9*b1 + a10*b0
-	s11 := c11 + a0*b11 + a1*b10 + a2*b9 + a3*b8 + a4*b7 + a5*b6 + a6*b5 + a7*b4 + a8*b3 + a9*b2 + a10*b1 + a11*b0
-	s12 := a1*b11 + a2*b10 + a3*b9 + a4*b8 + a5*b7 + a6*b6 + a7*b5 + a8*b4 + a9*b3 + a10*b2 + a11*b1
-	s13 := a2*b11 + a3*b10 + a4*b9 + a5*b8 + a6*b7 + a7*b6 + a8*b5 + a9*b4 + a10*b3 + a11*b2
-	s14 := a3*b11 + a4*b10 + a5*b9 + a6*b8 + a7*b7 + a8*b6 + a9*b5 + a10*b4 + a11*b3
-	s15 := a4*b11 + a5*b10 + a6*b9 + a7*b8 + a8*b7 + a9*b6 + a10*b5 + a11*b4
-	s16 := a5*b11 + a6*b10 + a7*b9 + a8*b8 + a9*b7 + a10*b6 + a11*b5
-	s17 := a6*b11 + a7*b10 + a8*b9 + a9*b8 + a10*b7 + a11*b6
-	s18 := a7*b11 + a8*b10 + a9*b9 + a10*b8 + a11*b7
-	s19 := a8*b11 + a9*b10 + a10*b9 + a11*b8
-	s20 := a9*b11 + a10*b10 + a11*b9
-	s21 := a10*b11 + a11*b10
-	s22 := a11 * b11
-	s23 := int64(0)
-
-	carry[0] = (s0 + (1 << 20)) >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[2] = (s2 + (1 << 20)) >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[4] = (s4 + (1 << 20)) >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[6] = (s6 + (1 << 20)) >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[8] = (s8 + (1 << 20)) >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[10] = (s10 + (1 << 20)) >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-	carry[12] = (s12 + (1 << 20)) >> 21
-	s13 += carry[12]
-	s12 -= carry[12] << 21
-	carry[14] = (s14 + (1 << 20)) >> 21
-	s15 += carry[14]
-	s14 -= carry[14] << 21
-	carry[16] = (s16 + (1 << 20)) >> 21
-	s17 += carry[16]
-	s16 -= carry[16] << 21
-	carry[18] = (s18 + (1 << 20)) >> 21
-	s19 += carry[18]
-	s18 -= carry[18] << 21
-	carry[20] = (s20 + (1 << 20)) >> 21
-	s21 += carry[20]
-	s20 -= carry[20] << 21
-	carry[22] = (s22 + (1 << 20)) >> 21
-	s23 += carry[22]
-	s22 -= carry[22] << 21
-
-	carry[1] = (s1 + (1 << 20)) >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[3] = (s3 + (1 << 20)) >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[5] = (s5 + (1 << 20)) >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[7] = (s7 + (1 << 20)) >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[9] = (s9 + (1 << 20)) >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[11] = (s11 + (1 << 20)) >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-	carry[13] = (s13 + (1 << 20)) >> 21
-	s14 += carry[13]
-	s13 -= carry[13] << 21
-	carry[15] = (s15 + (1 << 20)) >> 21
-	s16 += carry[15]
-	s15 -= carry[15] << 21
-	carry[17] = (s17 + (1 << 20)) >> 21
-	s18 += carry[17]
-	s17 -= carry[17] << 21
-	carry[19] = (s19 + (1 << 20)) >> 21
-	s20 += carry[19]
-	s19 -= carry[19] << 21
-	carry[21] = (s21 + (1 << 20)) >> 21
-	s22 += carry[21]
-	s21 -= carry[21] << 21
-
-	s11 += s23 * 666643
-	s12 += s23 * 470296
-	s13 += s23 * 654183
-	s14 -= s23 * 997805
-	s15 += s23 * 136657
-	s16 -= s23 * 683901
-	s23 = 0
-
-	s10 += s22 * 666643
-	s11 += s22 * 470296
-	s12 += s22 * 654183
-	s13 -= s22 * 997805
-	s14 += s22 * 136657
-	s15 -= s22 * 683901
-	s22 = 0
-
-	s9 += s21 * 666643
-	s10 += s21 * 470296
-	s11 += s21 * 654183
-	s12 -= s21 * 997805
-	s13 += s21 * 136657
-	s14 -= s21 * 683901
-	s21 = 0
-
-	s8 += s20 * 666643
-	s9 += s20 * 470296
-	s10 += s20 * 654183
-	s11 -= s20 * 997805
-	s12 += s20 * 136657
-	s13 -= s20 * 683901
-	s20 = 0
-
-	s7 += s19 * 666643
-	s8 += s19 * 470296
-	s9 += s19 * 654183
-	s10 -= s19 * 997805
-	s11 += s19 * 136657
-	s12 -= s19 * 683901
-	s19 = 0
-
-	s6 += s18 * 666643
-	s7 += s18 * 470296
-	s8 += s18 * 654183
-	s9 -= s18 * 997805
-	s10 += s18 * 136657
-	s11 -= s18 * 683901
-	s18 = 0
-
-	carry[6] = (s6 + (1 << 20)) >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[8] = (s8 + (1 << 20)) >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[10] = (s10 + (1 << 20)) >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-	carry[12] = (s12 + (1 << 20)) >> 21
-	s13 += carry[12]
-	s12 -= carry[12] << 21
-	carry[14] = (s14 + (1 << 20)) >> 21
-	s15 += carry[14]
-	s14 -= carry[14] << 21
-	carry[16] = (s16 + (1 << 20)) >> 21
-	s17 += carry[16]
-	s16 -= carry[16] << 21
-
-	carry[7] = (s7 + (1 << 20)) >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[9] = (s9 + (1 << 20)) >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[11] = (s11 + (1 << 20)) >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-	carry[13] = (s13 + (1 << 20)) >> 21
-	s14 += carry[13]
-	s13 -= carry[13] << 21
-	carry[15] = (s15 + (1 << 20)) >> 21
-	s16 += carry[15]
-	s15 -= carry[15] << 21
-
-	s5 += s17 * 666643
-	s6 += s17 * 470296
-	s7 += s17 * 654183
-	s8 -= s17 * 997805
-	s9 += s17 * 136657
-	s10 -= s17 * 683901
-	s17 = 0
-
-	s4 += s16 * 666643
-	s5 += s16 * 470296
-	s6 += s16 * 654183
-	s7 -= s16 * 997805
-	s8 += s16 * 136657
-	s9 -= s16 * 683901
-	s16 = 0
-
-	s3 += s15 * 666643
-	s4 += s15 * 470296
-	s5 += s15 * 654183
-	s6 -= s15 * 997805
-	s7 += s15 * 136657
-	s8 -= s15 * 683901
-	s15 = 0
-
-	s2 += s14 * 666643
-	s3 += s14 * 470296
-	s4 += s14 * 654183
-	s5 -= s14 * 997805
-	s6 += s14 * 136657
-	s7 -= s14 * 683901
-	s14 = 0
-
-	s1 += s13 * 666643
-	s2 += s13 * 470296
-	s3 += s13 * 654183
-	s4 -= s13 * 997805
-	s5 += s13 * 136657
-	s6 -= s13 * 683901
-	s13 = 0
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = (s0 + (1 << 20)) >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[2] = (s2 + (1 << 20)) >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[4] = (s4 + (1 << 20)) >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[6] = (s6 + (1 << 20)) >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[8] = (s8 + (1 << 20)) >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[10] = (s10 + (1 << 20)) >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-
-	carry[1] = (s1 + (1 << 20)) >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[3] = (s3 + (1 << 20)) >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[5] = (s5 + (1 << 20)) >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[7] = (s7 + (1 << 20)) >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[9] = (s9 + (1 << 20)) >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[11] = (s11 + (1 << 20)) >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = s0 >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[1] = s1 >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[2] = s2 >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[3] = s3 >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[4] = s4 >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[5] = s5 >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[6] = s6 >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[7] = s7 >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[8] = s8 >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[9] = s9 >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[10] = s10 >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-	carry[11] = s11 >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = s0 >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[1] = s1 >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[2] = s2 >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[3] = s3 >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[4] = s4 >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[5] = s5 >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[6] = s6 >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[7] = s7 >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[8] = s8 >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[9] = s9 >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[10] = s10 >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-
-	s[0] = byte(s0 >> 0)
-	s[1] = byte(s0 >> 8)
-	s[2] = byte((s0 >> 16) | (s1 << 5))
-	s[3] = byte(s1 >> 3)
-	s[4] = byte(s1 >> 11)
-	s[5] = byte((s1 >> 19) | (s2 << 2))
-	s[6] = byte(s2 >> 6)
-	s[7] = byte((s2 >> 14) | (s3 << 7))
-	s[8] = byte(s3 >> 1)
-	s[9] = byte(s3 >> 9)
-	s[10] = byte((s3 >> 17) | (s4 << 4))
-	s[11] = byte(s4 >> 4)
-	s[12] = byte(s4 >> 12)
-	s[13] = byte((s4 >> 20) | (s5 << 1))
-	s[14] = byte(s5 >> 7)
-	s[15] = byte((s5 >> 15) | (s6 << 6))
-	s[16] = byte(s6 >> 2)
-	s[17] = byte(s6 >> 10)
-	s[18] = byte((s6 >> 18) | (s7 << 3))
-	s[19] = byte(s7 >> 5)
-	s[20] = byte(s7 >> 13)
-	s[21] = byte(s8 >> 0)
-	s[22] = byte(s8 >> 8)
-	s[23] = byte((s8 >> 16) | (s9 << 5))
-	s[24] = byte(s9 >> 3)
-	s[25] = byte(s9 >> 11)
-	s[26] = byte((s9 >> 19) | (s10 << 2))
-	s[27] = byte(s10 >> 6)
-	s[28] = byte((s10 >> 14) | (s11 << 7))
-	s[29] = byte(s11 >> 1)
-	s[30] = byte(s11 >> 9)
-	s[31] = byte(s11 >> 17)
-}
-
-// Input:
-//   s[0]+256*s[1]+...+256^63*s[63] = s
-//
-// Output:
-//   s[0]+256*s[1]+...+256^31*s[31] = s mod l
-//   where l = 2^252 + 27742317777372353535851937790883648493.
-func ScReduce(out *[32]byte, s *[64]byte) {
-	s0 := 2097151 & load3(s[:])
-	s1 := 2097151 & (load4(s[2:]) >> 5)
-	s2 := 2097151 & (load3(s[5:]) >> 2)
-	s3 := 2097151 & (load4(s[7:]) >> 7)
-	s4 := 2097151 & (load4(s[10:]) >> 4)
-	s5 := 2097151 & (load3(s[13:]) >> 1)
-	s6 := 2097151 & (load4(s[15:]) >> 6)
-	s7 := 2097151 & (load3(s[18:]) >> 3)
-	s8 := 2097151 & load3(s[21:])
-	s9 := 2097151 & (load4(s[23:]) >> 5)
-	s10 := 2097151 & (load3(s[26:]) >> 2)
-	s11 := 2097151 & (load4(s[28:]) >> 7)
-	s12 := 2097151 & (load4(s[31:]) >> 4)
-	s13 := 2097151 & (load3(s[34:]) >> 1)
-	s14 := 2097151 & (load4(s[36:]) >> 6)
-	s15 := 2097151 & (load3(s[39:]) >> 3)
-	s16 := 2097151 & load3(s[42:])
-	s17 := 2097151 & (load4(s[44:]) >> 5)
-	s18 := 2097151 & (load3(s[47:]) >> 2)
-	s19 := 2097151 & (load4(s[49:]) >> 7)
-	s20 := 2097151 & (load4(s[52:]) >> 4)
-	s21 := 2097151 & (load3(s[55:]) >> 1)
-	s22 := 2097151 & (load4(s[57:]) >> 6)
-	s23 := (load4(s[60:]) >> 3)
-
-	s11 += s23 * 666643
-	s12 += s23 * 470296
-	s13 += s23 * 654183
-	s14 -= s23 * 997805
-	s15 += s23 * 136657
-	s16 -= s23 * 683901
-	s23 = 0
-
-	s10 += s22 * 666643
-	s11 += s22 * 470296
-	s12 += s22 * 654183
-	s13 -= s22 * 997805
-	s14 += s22 * 136657
-	s15 -= s22 * 683901
-	s22 = 0
-
-	s9 += s21 * 666643
-	s10 += s21 * 470296
-	s11 += s21 * 654183
-	s12 -= s21 * 997805
-	s13 += s21 * 136657
-	s14 -= s21 * 683901
-	s21 = 0
-
-	s8 += s20 * 666643
-	s9 += s20 * 470296
-	s10 += s20 * 654183
-	s11 -= s20 * 997805
-	s12 += s20 * 136657
-	s13 -= s20 * 683901
-	s20 = 0
-
-	s7 += s19 * 666643
-	s8 += s19 * 470296
-	s9 += s19 * 654183
-	s10 -= s19 * 997805
-	s11 += s19 * 136657
-	s12 -= s19 * 683901
-	s19 = 0
-
-	s6 += s18 * 666643
-	s7 += s18 * 470296
-	s8 += s18 * 654183
-	s9 -= s18 * 997805
-	s10 += s18 * 136657
-	s11 -= s18 * 683901
-	s18 = 0
-
-	var carry [17]int64
-
-	carry[6] = (s6 + (1 << 20)) >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[8] = (s8 + (1 << 20)) >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[10] = (s10 + (1 << 20)) >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-	carry[12] = (s12 + (1 << 20)) >> 21
-	s13 += carry[12]
-	s12 -= carry[12] << 21
-	carry[14] = (s14 + (1 << 20)) >> 21
-	s15 += carry[14]
-	s14 -= carry[14] << 21
-	carry[16] = (s16 + (1 << 20)) >> 21
-	s17 += carry[16]
-	s16 -= carry[16] << 21
-
-	carry[7] = (s7 + (1 << 20)) >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[9] = (s9 + (1 << 20)) >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[11] = (s11 + (1 << 20)) >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-	carry[13] = (s13 + (1 << 20)) >> 21
-	s14 += carry[13]
-	s13 -= carry[13] << 21
-	carry[15] = (s15 + (1 << 20)) >> 21
-	s16 += carry[15]
-	s15 -= carry[15] << 21
-
-	s5 += s17 * 666643
-	s6 += s17 * 470296
-	s7 += s17 * 654183
-	s8 -= s17 * 997805
-	s9 += s17 * 136657
-	s10 -= s17 * 683901
-	s17 = 0
-
-	s4 += s16 * 666643
-	s5 += s16 * 470296
-	s6 += s16 * 654183
-	s7 -= s16 * 997805
-	s8 += s16 * 136657
-	s9 -= s16 * 683901
-	s16 = 0
-
-	s3 += s15 * 666643
-	s4 += s15 * 470296
-	s5 += s15 * 654183
-	s6 -= s15 * 997805
-	s7 += s15 * 136657
-	s8 -= s15 * 683901
-	s15 = 0
-
-	s2 += s14 * 666643
-	s3 += s14 * 470296
-	s4 += s14 * 654183
-	s5 -= s14 * 997805
-	s6 += s14 * 136657
-	s7 -= s14 * 683901
-	s14 = 0
-
-	s1 += s13 * 666643
-	s2 += s13 * 470296
-	s3 += s13 * 654183
-	s4 -= s13 * 997805
-	s5 += s13 * 136657
-	s6 -= s13 * 683901
-	s13 = 0
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = (s0 + (1 << 20)) >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[2] = (s2 + (1 << 20)) >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[4] = (s4 + (1 << 20)) >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[6] = (s6 + (1 << 20)) >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[8] = (s8 + (1 << 20)) >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[10] = (s10 + (1 << 20)) >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-
-	carry[1] = (s1 + (1 << 20)) >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[3] = (s3 + (1 << 20)) >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[5] = (s5 + (1 << 20)) >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[7] = (s7 + (1 << 20)) >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[9] = (s9 + (1 << 20)) >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[11] = (s11 + (1 << 20)) >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = s0 >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[1] = s1 >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[2] = s2 >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[3] = s3 >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[4] = s4 >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[5] = s5 >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[6] = s6 >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[7] = s7 >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[8] = s8 >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[9] = s9 >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[10] = s10 >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-	carry[11] = s11 >> 21
-	s12 += carry[11]
-	s11 -= carry[11] << 21
-
-	s0 += s12 * 666643
-	s1 += s12 * 470296
-	s2 += s12 * 654183
-	s3 -= s12 * 997805
-	s4 += s12 * 136657
-	s5 -= s12 * 683901
-	s12 = 0
-
-	carry[0] = s0 >> 21
-	s1 += carry[0]
-	s0 -= carry[0] << 21
-	carry[1] = s1 >> 21
-	s2 += carry[1]
-	s1 -= carry[1] << 21
-	carry[2] = s2 >> 21
-	s3 += carry[2]
-	s2 -= carry[2] << 21
-	carry[3] = s3 >> 21
-	s4 += carry[3]
-	s3 -= carry[3] << 21
-	carry[4] = s4 >> 21
-	s5 += carry[4]
-	s4 -= carry[4] << 21
-	carry[5] = s5 >> 21
-	s6 += carry[5]
-	s5 -= carry[5] << 21
-	carry[6] = s6 >> 21
-	s7 += carry[6]
-	s6 -= carry[6] << 21
-	carry[7] = s7 >> 21
-	s8 += carry[7]
-	s7 -= carry[7] << 21
-	carry[8] = s8 >> 21
-	s9 += carry[8]
-	s8 -= carry[8] << 21
-	carry[9] = s9 >> 21
-	s10 += carry[9]
-	s9 -= carry[9] << 21
-	carry[10] = s10 >> 21
-	s11 += carry[10]
-	s10 -= carry[10] << 21
-
-	out[0] = byte(s0 >> 0)
-	out[1] = byte(s0 >> 8)
-	out[2] = byte((s0 >> 16) | (s1 << 5))
-	out[3] = byte(s1 >> 3)
-	out[4] = byte(s1 >> 11)
-	out[5] = byte((s1 >> 19) | (s2 << 2))
-	out[6] = byte(s2 >> 6)
-	out[7] = byte((s2 >> 14) | (s3 << 7))
-	out[8] = byte(s3 >> 1)
-	out[9] = byte(s3 >> 9)
-	out[10] = byte((s3 >> 17) | (s4 << 4))
-	out[11] = byte(s4 >> 4)
-	out[12] = byte(s4 >> 12)
-	out[13] = byte((s4 >> 20) | (s5 << 1))
-	out[14] = byte(s5 >> 7)
-	out[15] = byte((s5 >> 15) | (s6 << 6))
-	out[16] = byte(s6 >> 2)
-	out[17] = byte(s6 >> 10)
-	out[18] = byte((s6 >> 18) | (s7 << 3))
-	out[19] = byte(s7 >> 5)
-	out[20] = byte(s7 >> 13)
-	out[21] = byte(s8 >> 0)
-	out[22] = byte(s8 >> 8)
-	out[23] = byte((s8 >> 16) | (s9 << 5))
-	out[24] = byte(s9 >> 3)
-	out[25] = byte(s9 >> 11)
-	out[26] = byte((s9 >> 19) | (s10 << 2))
-	out[27] = byte(s10 >> 6)
-	out[28] = byte((s10 >> 14) | (s11 << 7))
-	out[29] = byte(s11 >> 1)
-	out[30] = byte(s11 >> 9)
-	out[31] = byte(s11 >> 17)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ed25519/testdata/sign.input.gz b/installer/vendor/golang.org/x/crypto/ed25519/testdata/sign.input.gz
deleted file mode 100644
index 41030690c0..0000000000
Binary files a/installer/vendor/golang.org/x/crypto/ed25519/testdata/sign.input.gz and /dev/null differ
diff --git a/installer/vendor/golang.org/x/crypto/hkdf/example_test.go b/installer/vendor/golang.org/x/crypto/hkdf/example_test.go
deleted file mode 100644
index df84395129..0000000000
--- a/installer/vendor/golang.org/x/crypto/hkdf/example_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hkdf_test
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/sha256"
-	"fmt"
-	"golang.org/x/crypto/hkdf"
-	"io"
-)
-
-// Usage example that expands one master key into three other cryptographically
-// secure keys.
-func Example_usage() {
-	// Underlying hash function to use
-	hash := sha256.New
-
-	// Cryptographically secure master key.
-	master := []byte{0x00, 0x01, 0x02, 0x03} // i.e. NOT this.
-
-	// Non secret salt, optional (can be nil)
-	// Recommended: hash-length sized random
-	salt := make([]byte, hash().Size())
-	n, err := io.ReadFull(rand.Reader, salt)
-	if n != len(salt) || err != nil {
-		fmt.Println("error:", err)
-		return
-	}
-
-	// Non secret context specific info, optional (can be nil).
-	// Note, independent from the master key.
-	info := []byte{0x03, 0x14, 0x15, 0x92, 0x65}
-
-	// Create the key derivation function
-	hkdf := hkdf.New(hash, master, salt, info)
-
-	// Generate the required keys
-	keys := make([][]byte, 3)
-	for i := 0; i < len(keys); i++ {
-		keys[i] = make([]byte, 24)
-		n, err := io.ReadFull(hkdf, keys[i])
-		if n != len(keys[i]) || err != nil {
-			fmt.Println("error:", err)
-			return
-		}
-	}
-
-	// Keys should contain 192 bit random keys
-	for i := 1; i <= len(keys); i++ {
-		fmt.Printf("Key #%d: %v\n", i, !bytes.Equal(keys[i-1], make([]byte, 24)))
-	}
-
-	// Output:
-	// Key #1: true
-	// Key #2: true
-	// Key #3: true
-}
diff --git a/installer/vendor/golang.org/x/crypto/hkdf/hkdf.go b/installer/vendor/golang.org/x/crypto/hkdf/hkdf.go
deleted file mode 100644
index 5bc246355a..0000000000
--- a/installer/vendor/golang.org/x/crypto/hkdf/hkdf.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package hkdf implements the HMAC-based Extract-and-Expand Key Derivation
-// Function (HKDF) as defined in RFC 5869.
-//
-// HKDF is a cryptographic key derivation function (KDF) with the goal of
-// expanding limited input keying material into one or more cryptographically
-// strong secret keys.
-//
-// RFC 5869: https://tools.ietf.org/html/rfc5869
-package hkdf // import "golang.org/x/crypto/hkdf"
-
-import (
-	"crypto/hmac"
-	"errors"
-	"hash"
-	"io"
-)
-
-type hkdf struct {
-	expander hash.Hash
-	size     int
-
-	info    []byte
-	counter byte
-
-	prev  []byte
-	cache []byte
-}
-
-func (f *hkdf) Read(p []byte) (int, error) {
-	// Check whether enough data can be generated
-	need := len(p)
-	remains := len(f.cache) + int(255-f.counter+1)*f.size
-	if remains < need {
-		return 0, errors.New("hkdf: entropy limit reached")
-	}
-	// Read from the cache, if enough data is present
-	n := copy(p, f.cache)
-	p = p[n:]
-
-	// Fill the buffer
-	for len(p) > 0 {
-		f.expander.Reset()
-		f.expander.Write(f.prev)
-		f.expander.Write(f.info)
-		f.expander.Write([]byte{f.counter})
-		f.prev = f.expander.Sum(f.prev[:0])
-		f.counter++
-
-		// Copy the new batch into p
-		f.cache = f.prev
-		n = copy(p, f.cache)
-		p = p[n:]
-	}
-	// Save leftovers for next run
-	f.cache = f.cache[n:]
-
-	return need, nil
-}
-
-// New returns a new HKDF using the given hash, the secret keying material to expand
-// and optional salt and info fields.
-func New(hash func() hash.Hash, secret, salt, info []byte) io.Reader {
-	if salt == nil {
-		salt = make([]byte, hash().Size())
-	}
-	extractor := hmac.New(hash, salt)
-	extractor.Write(secret)
-	prk := extractor.Sum(nil)
-
-	return &hkdf{hmac.New(hash, prk), extractor.Size(), info, 1, nil, nil}
-}
diff --git a/installer/vendor/golang.org/x/crypto/hkdf/hkdf_test.go b/installer/vendor/golang.org/x/crypto/hkdf/hkdf_test.go
deleted file mode 100644
index cee659bcdb..0000000000
--- a/installer/vendor/golang.org/x/crypto/hkdf/hkdf_test.go
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-package hkdf
-
-import (
-	"bytes"
-	"crypto/md5"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/sha512"
-	"hash"
-	"io"
-	"testing"
-)
-
-type hkdfTest struct {
-	hash   func() hash.Hash
-	master []byte
-	salt   []byte
-	info   []byte
-	out    []byte
-}
-
-var hkdfTests = []hkdfTest{
-	// Tests from RFC 5869
-	{
-		sha256.New,
-		[]byte{
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-		},
-		[]byte{
-			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-			0x08, 0x09, 0x0a, 0x0b, 0x0c,
-		},
-		[]byte{
-			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-			0xf8, 0xf9,
-		},
-		[]byte{
-			0x3c, 0xb2, 0x5f, 0x25, 0xfa, 0xac, 0xd5, 0x7a,
-			0x90, 0x43, 0x4f, 0x64, 0xd0, 0x36, 0x2f, 0x2a,
-			0x2d, 0x2d, 0x0a, 0x90, 0xcf, 0x1a, 0x5a, 0x4c,
-			0x5d, 0xb0, 0x2d, 0x56, 0xec, 0xc4, 0xc5, 0xbf,
-			0x34, 0x00, 0x72, 0x08, 0xd5, 0xb8, 0x87, 0x18,
-			0x58, 0x65,
-		},
-	},
-	{
-		sha256.New,
-		[]byte{
-			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-			0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-			0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-			0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-			0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-			0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-			0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-			0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-		},
-		[]byte{
-			0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-			0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-			0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-			0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-			0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-			0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-			0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-			0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-			0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-			0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-		},
-		[]byte{
-			0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-			0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-			0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-			0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-			0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-			0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-			0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-			0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-		},
-		[]byte{
-			0xb1, 0x1e, 0x39, 0x8d, 0xc8, 0x03, 0x27, 0xa1,
-			0xc8, 0xe7, 0xf7, 0x8c, 0x59, 0x6a, 0x49, 0x34,
-			0x4f, 0x01, 0x2e, 0xda, 0x2d, 0x4e, 0xfa, 0xd8,
-			0xa0, 0x50, 0xcc, 0x4c, 0x19, 0xaf, 0xa9, 0x7c,
-			0x59, 0x04, 0x5a, 0x99, 0xca, 0xc7, 0x82, 0x72,
-			0x71, 0xcb, 0x41, 0xc6, 0x5e, 0x59, 0x0e, 0x09,
-			0xda, 0x32, 0x75, 0x60, 0x0c, 0x2f, 0x09, 0xb8,
-			0x36, 0x77, 0x93, 0xa9, 0xac, 0xa3, 0xdb, 0x71,
-			0xcc, 0x30, 0xc5, 0x81, 0x79, 0xec, 0x3e, 0x87,
-			0xc1, 0x4c, 0x01, 0xd5, 0xc1, 0xf3, 0x43, 0x4f,
-			0x1d, 0x87,
-		},
-	},
-	{
-		sha256.New,
-		[]byte{
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-		},
-		[]byte{},
-		[]byte{},
-		[]byte{
-			0x8d, 0xa4, 0xe7, 0x75, 0xa5, 0x63, 0xc1, 0x8f,
-			0x71, 0x5f, 0x80, 0x2a, 0x06, 0x3c, 0x5a, 0x31,
-			0xb8, 0xa1, 0x1f, 0x5c, 0x5e, 0xe1, 0x87, 0x9e,
-			0xc3, 0x45, 0x4e, 0x5f, 0x3c, 0x73, 0x8d, 0x2d,
-			0x9d, 0x20, 0x13, 0x95, 0xfa, 0xa4, 0xb6, 0x1a,
-			0x96, 0xc8,
-		},
-	},
-	{
-		sha1.New,
-		[]byte{
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b,
-		},
-		[]byte{
-			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-			0x08, 0x09, 0x0a, 0x0b, 0x0c,
-		},
-		[]byte{
-			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-			0xf8, 0xf9,
-		},
-		[]byte{
-			0x08, 0x5a, 0x01, 0xea, 0x1b, 0x10, 0xf3, 0x69,
-			0x33, 0x06, 0x8b, 0x56, 0xef, 0xa5, 0xad, 0x81,
-			0xa4, 0xf1, 0x4b, 0x82, 0x2f, 0x5b, 0x09, 0x15,
-			0x68, 0xa9, 0xcd, 0xd4, 0xf1, 0x55, 0xfd, 0xa2,
-			0xc2, 0x2e, 0x42, 0x24, 0x78, 0xd3, 0x05, 0xf3,
-			0xf8, 0x96,
-		},
-	},
-	{
-		sha1.New,
-		[]byte{
-			0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
-			0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f,
-			0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17,
-			0x18, 0x19, 0x1a, 0x1b, 0x1c, 0x1d, 0x1e, 0x1f,
-			0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27,
-			0x28, 0x29, 0x2a, 0x2b, 0x2c, 0x2d, 0x2e, 0x2f,
-			0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,
-			0x38, 0x39, 0x3a, 0x3b, 0x3c, 0x3d, 0x3e, 0x3f,
-			0x40, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47,
-			0x48, 0x49, 0x4a, 0x4b, 0x4c, 0x4d, 0x4e, 0x4f,
-		},
-		[]byte{
-			0x60, 0x61, 0x62, 0x63, 0x64, 0x65, 0x66, 0x67,
-			0x68, 0x69, 0x6a, 0x6b, 0x6c, 0x6d, 0x6e, 0x6f,
-			0x70, 0x71, 0x72, 0x73, 0x74, 0x75, 0x76, 0x77,
-			0x78, 0x79, 0x7a, 0x7b, 0x7c, 0x7d, 0x7e, 0x7f,
-			0x80, 0x81, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-			0x88, 0x89, 0x8a, 0x8b, 0x8c, 0x8d, 0x8e, 0x8f,
-			0x90, 0x91, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97,
-			0x98, 0x99, 0x9a, 0x9b, 0x9c, 0x9d, 0x9e, 0x9f,
-			0xa0, 0xa1, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-			0xa8, 0xa9, 0xaa, 0xab, 0xac, 0xad, 0xae, 0xaf,
-		},
-		[]byte{
-			0xb0, 0xb1, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6, 0xb7,
-			0xb8, 0xb9, 0xba, 0xbb, 0xbc, 0xbd, 0xbe, 0xbf,
-			0xc0, 0xc1, 0xc2, 0xc3, 0xc4, 0xc5, 0xc6, 0xc7,
-			0xc8, 0xc9, 0xca, 0xcb, 0xcc, 0xcd, 0xce, 0xcf,
-			0xd0, 0xd1, 0xd2, 0xd3, 0xd4, 0xd5, 0xd6, 0xd7,
-			0xd8, 0xd9, 0xda, 0xdb, 0xdc, 0xdd, 0xde, 0xdf,
-			0xe0, 0xe1, 0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7,
-			0xe8, 0xe9, 0xea, 0xeb, 0xec, 0xed, 0xee, 0xef,
-			0xf0, 0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7,
-			0xf8, 0xf9, 0xfa, 0xfb, 0xfc, 0xfd, 0xfe, 0xff,
-		},
-		[]byte{
-			0x0b, 0xd7, 0x70, 0xa7, 0x4d, 0x11, 0x60, 0xf7,
-			0xc9, 0xf1, 0x2c, 0xd5, 0x91, 0x2a, 0x06, 0xeb,
-			0xff, 0x6a, 0xdc, 0xae, 0x89, 0x9d, 0x92, 0x19,
-			0x1f, 0xe4, 0x30, 0x56, 0x73, 0xba, 0x2f, 0xfe,
-			0x8f, 0xa3, 0xf1, 0xa4, 0xe5, 0xad, 0x79, 0xf3,
-			0xf3, 0x34, 0xb3, 0xb2, 0x02, 0xb2, 0x17, 0x3c,
-			0x48, 0x6e, 0xa3, 0x7c, 0xe3, 0xd3, 0x97, 0xed,
-			0x03, 0x4c, 0x7f, 0x9d, 0xfe, 0xb1, 0x5c, 0x5e,
-			0x92, 0x73, 0x36, 0xd0, 0x44, 0x1f, 0x4c, 0x43,
-			0x00, 0xe2, 0xcf, 0xf0, 0xd0, 0x90, 0x0b, 0x52,
-			0xd3, 0xb4,
-		},
-	},
-	{
-		sha1.New,
-		[]byte{
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-		},
-		[]byte{},
-		[]byte{},
-		[]byte{
-			0x0a, 0xc1, 0xaf, 0x70, 0x02, 0xb3, 0xd7, 0x61,
-			0xd1, 0xe5, 0x52, 0x98, 0xda, 0x9d, 0x05, 0x06,
-			0xb9, 0xae, 0x52, 0x05, 0x72, 0x20, 0xa3, 0x06,
-			0xe0, 0x7b, 0x6b, 0x87, 0xe8, 0xdf, 0x21, 0xd0,
-			0xea, 0x00, 0x03, 0x3d, 0xe0, 0x39, 0x84, 0xd3,
-			0x49, 0x18,
-		},
-	},
-	{
-		sha1.New,
-		[]byte{
-			0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-			0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-			0x0c, 0x0c, 0x0c, 0x0c, 0x0c, 0x0c,
-		},
-		nil,
-		[]byte{},
-		[]byte{
-			0x2c, 0x91, 0x11, 0x72, 0x04, 0xd7, 0x45, 0xf3,
-			0x50, 0x0d, 0x63, 0x6a, 0x62, 0xf6, 0x4f, 0x0a,
-			0xb3, 0xba, 0xe5, 0x48, 0xaa, 0x53, 0xd4, 0x23,
-			0xb0, 0xd1, 0xf2, 0x7e, 0xbb, 0xa6, 0xf5, 0xe5,
-			0x67, 0x3a, 0x08, 0x1d, 0x70, 0xcc, 0xe7, 0xac,
-			0xfc, 0x48,
-		},
-	},
-}
-
-func TestHKDF(t *testing.T) {
-	for i, tt := range hkdfTests {
-		hkdf := New(tt.hash, tt.master, tt.salt, tt.info)
-		out := make([]byte, len(tt.out))
-
-		n, err := io.ReadFull(hkdf, out)
-		if n != len(tt.out) || err != nil {
-			t.Errorf("test %d: not enough output bytes: %d.", i, n)
-		}
-
-		if !bytes.Equal(out, tt.out) {
-			t.Errorf("test %d: incorrect output: have %v, need %v.", i, out, tt.out)
-		}
-	}
-}
-
-func TestHKDFMultiRead(t *testing.T) {
-	for i, tt := range hkdfTests {
-		hkdf := New(tt.hash, tt.master, tt.salt, tt.info)
-		out := make([]byte, len(tt.out))
-
-		for b := 0; b < len(tt.out); b++ {
-			n, err := io.ReadFull(hkdf, out[b:b+1])
-			if n != 1 || err != nil {
-				t.Errorf("test %d.%d: not enough output bytes: have %d, need %d .", i, b, n, len(tt.out))
-			}
-		}
-
-		if !bytes.Equal(out, tt.out) {
-			t.Errorf("test %d: incorrect output: have %v, need %v.", i, out, tt.out)
-		}
-	}
-}
-
-func TestHKDFLimit(t *testing.T) {
-	hash := sha1.New
-	master := []byte{0x00, 0x01, 0x02, 0x03}
-	info := []byte{}
-
-	hkdf := New(hash, master, nil, info)
-	limit := hash().Size() * 255
-	out := make([]byte, limit)
-
-	// The maximum output bytes should be extractable
-	n, err := io.ReadFull(hkdf, out)
-	if n != limit || err != nil {
-		t.Errorf("not enough output bytes: %d, %v.", n, err)
-	}
-
-	// Reading one more should fail
-	n, err = io.ReadFull(hkdf, make([]byte, 1))
-	if n > 0 || err == nil {
-		t.Errorf("key expansion overflowed: n = %d, err = %v", n, err)
-	}
-}
-
-func Benchmark16ByteMD5Single(b *testing.B) {
-	benchmarkHKDFSingle(md5.New, 16, b)
-}
-
-func Benchmark20ByteSHA1Single(b *testing.B) {
-	benchmarkHKDFSingle(sha1.New, 20, b)
-}
-
-func Benchmark32ByteSHA256Single(b *testing.B) {
-	benchmarkHKDFSingle(sha256.New, 32, b)
-}
-
-func Benchmark64ByteSHA512Single(b *testing.B) {
-	benchmarkHKDFSingle(sha512.New, 64, b)
-}
-
-func Benchmark8ByteMD5Stream(b *testing.B) {
-	benchmarkHKDFStream(md5.New, 8, b)
-}
-
-func Benchmark16ByteMD5Stream(b *testing.B) {
-	benchmarkHKDFStream(md5.New, 16, b)
-}
-
-func Benchmark8ByteSHA1Stream(b *testing.B) {
-	benchmarkHKDFStream(sha1.New, 8, b)
-}
-
-func Benchmark20ByteSHA1Stream(b *testing.B) {
-	benchmarkHKDFStream(sha1.New, 20, b)
-}
-
-func Benchmark8ByteSHA256Stream(b *testing.B) {
-	benchmarkHKDFStream(sha256.New, 8, b)
-}
-
-func Benchmark32ByteSHA256Stream(b *testing.B) {
-	benchmarkHKDFStream(sha256.New, 32, b)
-}
-
-func Benchmark8ByteSHA512Stream(b *testing.B) {
-	benchmarkHKDFStream(sha512.New, 8, b)
-}
-
-func Benchmark64ByteSHA512Stream(b *testing.B) {
-	benchmarkHKDFStream(sha512.New, 64, b)
-}
-
-func benchmarkHKDFSingle(hasher func() hash.Hash, block int, b *testing.B) {
-	master := []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}
-	salt := []byte{0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}
-	info := []byte{0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27}
-	out := make([]byte, block)
-
-	b.SetBytes(int64(block))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		hkdf := New(hasher, master, salt, info)
-		io.ReadFull(hkdf, out)
-	}
-}
-
-func benchmarkHKDFStream(hasher func() hash.Hash, block int, b *testing.B) {
-	master := []byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07}
-	salt := []byte{0x10, 0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17}
-	info := []byte{0x20, 0x21, 0x22, 0x23, 0x24, 0x25, 0x26, 0x27}
-	out := make([]byte, block)
-
-	b.SetBytes(int64(block))
-	b.ResetTimer()
-
-	hkdf := New(hasher, master, salt, info)
-	for i := 0; i < b.N; i++ {
-		_, err := io.ReadFull(hkdf, out)
-		if err != nil {
-			hkdf = New(hasher, master, salt, info)
-			i--
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/md4/example_test.go b/installer/vendor/golang.org/x/crypto/md4/example_test.go
deleted file mode 100644
index db3f59b19b..0000000000
--- a/installer/vendor/golang.org/x/crypto/md4/example_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package md4_test
-
-import (
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/md4"
-)
-
-func ExampleNew() {
-	h := md4.New()
-	data := "These pretzels are making me thirsty."
-	io.WriteString(h, data)
-	fmt.Printf("%x", h.Sum(nil))
-	// Output: 48c4e365090b30a32f084c4888deceaa
-}
diff --git a/installer/vendor/golang.org/x/crypto/md4/md4.go b/installer/vendor/golang.org/x/crypto/md4/md4.go
deleted file mode 100644
index 6d9ba9e5f3..0000000000
--- a/installer/vendor/golang.org/x/crypto/md4/md4.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package md4 implements the MD4 hash algorithm as defined in RFC 1320.
-package md4 // import "golang.org/x/crypto/md4"
-
-import (
-	"crypto"
-	"hash"
-)
-
-func init() {
-	crypto.RegisterHash(crypto.MD4, New)
-}
-
-// The size of an MD4 checksum in bytes.
-const Size = 16
-
-// The blocksize of MD4 in bytes.
-const BlockSize = 64
-
-const (
-	_Chunk = 64
-	_Init0 = 0x67452301
-	_Init1 = 0xEFCDAB89
-	_Init2 = 0x98BADCFE
-	_Init3 = 0x10325476
-)
-
-// digest represents the partial evaluation of a checksum.
-type digest struct {
-	s   [4]uint32
-	x   [_Chunk]byte
-	nx  int
-	len uint64
-}
-
-func (d *digest) Reset() {
-	d.s[0] = _Init0
-	d.s[1] = _Init1
-	d.s[2] = _Init2
-	d.s[3] = _Init3
-	d.nx = 0
-	d.len = 0
-}
-
-// New returns a new hash.Hash computing the MD4 checksum.
-func New() hash.Hash {
-	d := new(digest)
-	d.Reset()
-	return d
-}
-
-func (d *digest) Size() int { return Size }
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Write(p []byte) (nn int, err error) {
-	nn = len(p)
-	d.len += uint64(nn)
-	if d.nx > 0 {
-		n := len(p)
-		if n > _Chunk-d.nx {
-			n = _Chunk - d.nx
-		}
-		for i := 0; i < n; i++ {
-			d.x[d.nx+i] = p[i]
-		}
-		d.nx += n
-		if d.nx == _Chunk {
-			_Block(d, d.x[0:])
-			d.nx = 0
-		}
-		p = p[n:]
-	}
-	n := _Block(d, p)
-	p = p[n:]
-	if len(p) > 0 {
-		d.nx = copy(d.x[:], p)
-	}
-	return
-}
-
-func (d0 *digest) Sum(in []byte) []byte {
-	// Make a copy of d0, so that caller can keep writing and summing.
-	d := new(digest)
-	*d = *d0
-
-	// Padding.  Add a 1 bit and 0 bits until 56 bytes mod 64.
-	len := d.len
-	var tmp [64]byte
-	tmp[0] = 0x80
-	if len%64 < 56 {
-		d.Write(tmp[0 : 56-len%64])
-	} else {
-		d.Write(tmp[0 : 64+56-len%64])
-	}
-
-	// Length in bits.
-	len <<= 3
-	for i := uint(0); i < 8; i++ {
-		tmp[i] = byte(len >> (8 * i))
-	}
-	d.Write(tmp[0:8])
-
-	if d.nx != 0 {
-		panic("d.nx != 0")
-	}
-
-	for _, s := range d.s {
-		in = append(in, byte(s>>0))
-		in = append(in, byte(s>>8))
-		in = append(in, byte(s>>16))
-		in = append(in, byte(s>>24))
-	}
-	return in
-}
diff --git a/installer/vendor/golang.org/x/crypto/md4/md4_test.go b/installer/vendor/golang.org/x/crypto/md4/md4_test.go
deleted file mode 100644
index b56edd7875..0000000000
--- a/installer/vendor/golang.org/x/crypto/md4/md4_test.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package md4
-
-import (
-	"fmt"
-	"io"
-	"testing"
-)
-
-type md4Test struct {
-	out string
-	in  string
-}
-
-var golden = []md4Test{
-	{"31d6cfe0d16ae931b73c59d7e0c089c0", ""},
-	{"bde52cb31de33e46245e05fbdbd6fb24", "a"},
-	{"ec388dd78999dfc7cf4632465693b6bf", "ab"},
-	{"a448017aaf21d8525fc10ae87aa6729d", "abc"},
-	{"41decd8f579255c5200f86a4bb3ba740", "abcd"},
-	{"9803f4a34e8eb14f96adba49064a0c41", "abcde"},
-	{"804e7f1c2586e50b49ac65db5b645131", "abcdef"},
-	{"752f4adfe53d1da0241b5bc216d098fc", "abcdefg"},
-	{"ad9daf8d49d81988590a6f0e745d15dd", "abcdefgh"},
-	{"1e4e28b05464316b56402b3815ed2dfd", "abcdefghi"},
-	{"dc959c6f5d6f9e04e4380777cc964b3d", "abcdefghij"},
-	{"1b5701e265778898ef7de5623bbe7cc0", "Discard medicine more than two years old."},
-	{"d7f087e090fe7ad4a01cb59dacc9a572", "He who has a shady past knows that nice guys finish last."},
-	{"a6f8fd6df617c72837592fc3570595c9", "I wouldn't marry him with a ten foot pole."},
-	{"c92a84a9526da8abc240c05d6b1a1ce0", "Free! Free!/A trip/to Mars/for 900/empty jars/Burma Shave"},
-	{"f6013160c4dcb00847069fee3bb09803", "The days of the digital watch are numbered.  -Tom Stoppard"},
-	{"2c3bb64f50b9107ed57640fe94bec09f", "Nepal premier won't resign."},
-	{"45b7d8a32c7806f2f7f897332774d6e4", "For every action there is an equal and opposite government program."},
-	{"b5b4f9026b175c62d7654bdc3a1cd438", "His money is twice tainted: 'taint yours and 'taint mine."},
-	{"caf44e80f2c20ce19b5ba1cab766e7bd", "There is no reason for any individual to have a computer in their home. -Ken Olsen, 1977"},
-	{"191fae6707f496aa54a6bce9f2ecf74d", "It's a tiny change to the code and not completely disgusting. - Bob Manchek"},
-	{"9ddc753e7a4ccee6081cd1b45b23a834", "size:  a.out:  bad magic"},
-	{"8d050f55b1cadb9323474564be08a521", "The major problem is with sendmail.  -Mark Horton"},
-	{"ad6e2587f74c3e3cc19146f6127fa2e3", "Give me a rock, paper and scissors and I will move the world.  CCFestoon"},
-	{"1d616d60a5fabe85589c3f1566ca7fca", "If the enemy is within range, then so are you."},
-	{"aec3326a4f496a2ced65a1963f84577f", "It's well we cannot hear the screams/That we create in others' dreams."},
-	{"77b4fd762d6b9245e61c50bf6ebf118b", "You remind me of a TV show, but that's all right: I watch it anyway."},
-	{"e8f48c726bae5e516f6ddb1a4fe62438", "C is as portable as Stonehedge!!"},
-	{"a3a84366e7219e887423b01f9be7166e", "Even if I could be Shakespeare, I think I should still choose to be Faraday. - A. Huxley"},
-	{"a6b7aa35157e984ef5d9b7f32e5fbb52", "The fugacity of a constituent in a mixture of gases at a given temperature is proportional to its mole fraction.  Lewis-Randall Rule"},
-	{"75661f0545955f8f9abeeb17845f3fd6", "How can you write a big system without C++?  -Paul Glick"},
-}
-
-func TestGolden(t *testing.T) {
-	for i := 0; i < len(golden); i++ {
-		g := golden[i]
-		c := New()
-		for j := 0; j < 3; j++ {
-			if j < 2 {
-				io.WriteString(c, g.in)
-			} else {
-				io.WriteString(c, g.in[0:len(g.in)/2])
-				c.Sum(nil)
-				io.WriteString(c, g.in[len(g.in)/2:])
-			}
-			s := fmt.Sprintf("%x", c.Sum(nil))
-			if s != g.out {
-				t.Fatalf("md4[%d](%s) = %s want %s", j, g.in, s, g.out)
-			}
-			c.Reset()
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/md4/md4block.go b/installer/vendor/golang.org/x/crypto/md4/md4block.go
deleted file mode 100644
index 3fed475f3f..0000000000
--- a/installer/vendor/golang.org/x/crypto/md4/md4block.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// MD4 block step.
-// In its own file so that a faster assembly or C version
-// can be substituted easily.
-
-package md4
-
-var shift1 = []uint{3, 7, 11, 19}
-var shift2 = []uint{3, 5, 9, 13}
-var shift3 = []uint{3, 9, 11, 15}
-
-var xIndex2 = []uint{0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15}
-var xIndex3 = []uint{0, 8, 4, 12, 2, 10, 6, 14, 1, 9, 5, 13, 3, 11, 7, 15}
-
-func _Block(dig *digest, p []byte) int {
-	a := dig.s[0]
-	b := dig.s[1]
-	c := dig.s[2]
-	d := dig.s[3]
-	n := 0
-	var X [16]uint32
-	for len(p) >= _Chunk {
-		aa, bb, cc, dd := a, b, c, d
-
-		j := 0
-		for i := 0; i < 16; i++ {
-			X[i] = uint32(p[j]) | uint32(p[j+1])<<8 | uint32(p[j+2])<<16 | uint32(p[j+3])<<24
-			j += 4
-		}
-
-		// If this needs to be made faster in the future,
-		// the usual trick is to unroll each of these
-		// loops by a factor of 4; that lets you replace
-		// the shift[] lookups with constants and,
-		// with suitable variable renaming in each
-		// unrolled body, delete the a, b, c, d = d, a, b, c
-		// (or you can let the optimizer do the renaming).
-		//
-		// The index variables are uint so that % by a power
-		// of two can be optimized easily by a compiler.
-
-		// Round 1.
-		for i := uint(0); i < 16; i++ {
-			x := i
-			s := shift1[i%4]
-			f := ((c ^ d) & b) ^ d
-			a += f + X[x]
-			a = a<<s | a>>(32-s)
-			a, b, c, d = d, a, b, c
-		}
-
-		// Round 2.
-		for i := uint(0); i < 16; i++ {
-			x := xIndex2[i]
-			s := shift2[i%4]
-			g := (b & c) | (b & d) | (c & d)
-			a += g + X[x] + 0x5a827999
-			a = a<<s | a>>(32-s)
-			a, b, c, d = d, a, b, c
-		}
-
-		// Round 3.
-		for i := uint(0); i < 16; i++ {
-			x := xIndex3[i]
-			s := shift3[i%4]
-			h := b ^ c ^ d
-			a += h + X[x] + 0x6ed9eba1
-			a = a<<s | a>>(32-s)
-			a, b, c, d = d, a, b, c
-		}
-
-		a += aa
-		b += bb
-		c += cc
-		d += dd
-
-		p = p[_Chunk:]
-		n += _Chunk
-	}
-
-	dig.s[0] = a
-	dig.s[1] = b
-	dig.s[2] = c
-	dig.s[3] = d
-	return n
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/auth/auth.go b/installer/vendor/golang.org/x/crypto/nacl/auth/auth.go
deleted file mode 100644
index 0835d3bf96..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/auth/auth.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package auth authenticates a message using a secret key.
-
-The Sum function, viewed as a function of the message for a uniform random
-key, is designed to meet the standard notion of unforgeability. This means
-that an attacker cannot find authenticators for any messages not authenticated
-by the sender, even if the attacker has adaptively influenced the messages
-authenticated by the sender. For a formal definition see, e.g., Section 2.4
-of Bellare, Kilian, and Rogaway, "The security of the cipher block chaining
-message authentication code," Journal of Computer and System Sciences 61 (2000),
-362–399; http://www-cse.ucsd.edu/~mihir/papers/cbc.html.
-
-auth does not make any promises regarding "strong" unforgeability; perhaps
-one valid authenticator can be converted into another valid authenticator for
-the same message. NaCl also does not make any promises regarding "truncated
-unforgeability."
-
-This package is interoperable with NaCl: https://nacl.cr.yp.to/auth.html.
-*/
-package auth
-
-import (
-	"crypto/hmac"
-	"crypto/sha512"
-)
-
-const (
-	// Size is the size, in bytes, of an authenticated digest.
-	Size = 32
-	// KeySize is the size, in bytes, of an authentication key.
-	KeySize = 32
-)
-
-// Sum generates an authenticator for m using a secret key and returns the
-// 32-byte digest.
-func Sum(m []byte, key *[KeySize]byte) *[Size]byte {
-	mac := hmac.New(sha512.New, key[:])
-	mac.Write(m)
-	out := new([KeySize]byte)
-	copy(out[:], mac.Sum(nil)[:Size])
-	return out
-}
-
-// Verify checks that digest is a valid authenticator of message m under the
-// given secret key. Verify does not leak timing information.
-func Verify(digest []byte, m []byte, key *[32]byte) bool {
-	if len(digest) != Size {
-		return false
-	}
-	mac := hmac.New(sha512.New, key[:])
-	mac.Write(m)
-	expectedMAC := mac.Sum(nil) // first 256 bits of 512-bit sum
-	return hmac.Equal(digest, expectedMAC[:Size])
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/auth/auth_test.go b/installer/vendor/golang.org/x/crypto/nacl/auth/auth_test.go
deleted file mode 100644
index 92074b50b6..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/auth/auth_test.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package auth
-
-import (
-	"bytes"
-	rand "crypto/rand"
-	mrand "math/rand"
-	"testing"
-)
-
-// Test cases are from RFC 4231, and match those present in the tests directory
-// of the download here: https://nacl.cr.yp.to/install.html
-var testCases = []struct {
-	key [32]byte
-	msg []byte
-	out [32]byte
-}{
-	{
-		key: [32]byte{
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b, 0x0b,
-			0x0b, 0x0b, 0x0b, 0x0b,
-		},
-		msg: []byte("Hi There"),
-		out: [32]byte{
-			0x87, 0xaa, 0x7c, 0xde, 0xa5, 0xef, 0x61, 0x9d,
-			0x4f, 0xf0, 0xb4, 0x24, 0x1a, 0x1d, 0x6c, 0xb0,
-			0x23, 0x79, 0xf4, 0xe2, 0xce, 0x4e, 0xc2, 0x78,
-			0x7a, 0xd0, 0xb3, 0x05, 0x45, 0xe1, 0x7c, 0xde,
-		},
-	},
-	{
-		key: [32]byte{'J', 'e', 'f', 'e'},
-		msg: []byte("what do ya want for nothing?"),
-		out: [32]byte{
-			0x16, 0x4b, 0x7a, 0x7b, 0xfc, 0xf8, 0x19, 0xe2,
-			0xe3, 0x95, 0xfb, 0xe7, 0x3b, 0x56, 0xe0, 0xa3,
-			0x87, 0xbd, 0x64, 0x22, 0x2e, 0x83, 0x1f, 0xd6,
-			0x10, 0x27, 0x0c, 0xd7, 0xea, 0x25, 0x05, 0x54,
-		},
-	},
-	{
-		key: [32]byte{
-			0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-			0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa, 0xaa,
-			0xaa, 0xaa, 0xaa, 0xaa,
-		},
-		msg: []byte{ // 50 bytes of 0xdd
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd, 0xdd,
-			0xdd, 0xdd,
-		},
-		out: [32]byte{
-			0xfa, 0x73, 0xb0, 0x08, 0x9d, 0x56, 0xa2, 0x84,
-			0xef, 0xb0, 0xf0, 0x75, 0x6c, 0x89, 0x0b, 0xe9,
-			0xb1, 0xb5, 0xdb, 0xdd, 0x8e, 0xe8, 0x1a, 0x36,
-			0x55, 0xf8, 0x3e, 0x33, 0xb2, 0x27, 0x9d, 0x39,
-		},
-	},
-	{
-		key: [32]byte{
-			0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08,
-			0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f, 0x10,
-			0x11, 0x12, 0x13, 0x14, 0x15, 0x16, 0x17, 0x18,
-			0x19,
-		},
-		msg: []byte{
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd, 0xcd,
-			0xcd, 0xcd,
-		},
-		out: [32]byte{
-			0xb0, 0xba, 0x46, 0x56, 0x37, 0x45, 0x8c, 0x69,
-			0x90, 0xe5, 0xa8, 0xc5, 0xf6, 0x1d, 0x4a, 0xf7,
-			0xe5, 0x76, 0xd9, 0x7f, 0xf9, 0x4b, 0x87, 0x2d,
-			0xe7, 0x6f, 0x80, 0x50, 0x36, 0x1e, 0xe3, 0xdb,
-		},
-	},
-}
-
-func TestSum(t *testing.T) {
-	for i, test := range testCases {
-		tag := Sum(test.msg, &test.key)
-		if !bytes.Equal(tag[:], test.out[:]) {
-			t.Errorf("#%d: Sum: got\n%x\nwant\n%x", i, tag, test.out)
-		}
-	}
-}
-
-func TestVerify(t *testing.T) {
-	wrongMsg := []byte("unknown msg")
-
-	for i, test := range testCases {
-		if !Verify(test.out[:], test.msg, &test.key) {
-			t.Errorf("#%d: Verify(%x, %q, %x) failed", i, test.out, test.msg, test.key)
-		}
-		if Verify(test.out[:], wrongMsg, &test.key) {
-			t.Errorf("#%d: Verify(%x, %q, %x) unexpectedly passed", i, test.out, wrongMsg, test.key)
-		}
-	}
-}
-
-func TestStress(t *testing.T) {
-	if testing.Short() {
-		t.Skip("exhaustiveness test")
-	}
-
-	var key [32]byte
-	msg := make([]byte, 10000)
-	prng := mrand.New(mrand.NewSource(0))
-
-	// copied from tests/auth5.c in nacl
-	for i := 0; i < 10000; i++ {
-		if _, err := rand.Read(key[:]); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := rand.Read(msg[:i]); err != nil {
-			t.Fatal(err)
-		}
-		tag := Sum(msg[:i], &key)
-		if !Verify(tag[:], msg[:i], &key) {
-			t.Errorf("#%d: unexpected failure from Verify", i)
-		}
-		if i > 0 {
-			msgIndex := prng.Intn(i)
-			oldMsgByte := msg[msgIndex]
-			msg[msgIndex] += byte(1 + prng.Intn(255))
-			if Verify(tag[:], msg[:i], &key) {
-				t.Errorf("#%d: unexpected success from Verify after corrupting message", i)
-			}
-			msg[msgIndex] = oldMsgByte
-
-			tag[prng.Intn(len(tag))] += byte(1 + prng.Intn(255))
-			if Verify(tag[:], msg[:i], &key) {
-				t.Errorf("#%d: unexpected success from Verify after corrupting authenticator", i)
-			}
-		}
-	}
-}
-
-func BenchmarkAuth(b *testing.B) {
-	var key [32]byte
-	if _, err := rand.Read(key[:]); err != nil {
-		b.Fatal(err)
-	}
-	buf := make([]byte, 1024)
-	if _, err := rand.Read(buf[:]); err != nil {
-		b.Fatal(err)
-	}
-
-	b.SetBytes(int64(len(buf)))
-	b.ReportAllocs()
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		tag := Sum(buf, &key)
-		if Verify(tag[:], buf, &key) == false {
-			b.Fatal("unexpected failure from Verify")
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/auth/example_test.go b/installer/vendor/golang.org/x/crypto/nacl/auth/example_test.go
deleted file mode 100644
index 02a2cd6c46..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/auth/example_test.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package auth_test
-
-import (
-	"encoding/hex"
-	"fmt"
-
-	"golang.org/x/crypto/nacl/auth"
-)
-
-func Example() {
-	// Load your secret key from a safe place and reuse it across multiple
-	// Sum calls. (Obviously don't use this example key for anything
-	// real.) If you want to convert a passphrase to a key, use a suitable
-	// package like bcrypt or scrypt.
-	secretKeyBytes, err := hex.DecodeString("6368616e676520746869732070617373776f726420746f206120736563726574")
-	if err != nil {
-		panic(err)
-	}
-
-	var secretKey [32]byte
-	copy(secretKey[:], secretKeyBytes)
-
-	mac := auth.Sum([]byte("hello world"), &secretKey)
-	fmt.Printf("%x\n", *mac)
-	result := auth.Verify(mac[:], []byte("hello world"), &secretKey)
-	fmt.Println(result)
-	badResult := auth.Verify(mac[:], []byte("different message"), &secretKey)
-	fmt.Println(badResult)
-	// Output: eca5a521f3d77b63f567fb0cb6f5f2d200641bc8dada42f60c5f881260c30317
-	// true
-	// false
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/box/box.go b/installer/vendor/golang.org/x/crypto/nacl/box/box.go
deleted file mode 100644
index 31b697be44..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/box/box.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package box authenticates and encrypts small messages using public-key cryptography.
-
-Box uses Curve25519, XSalsa20 and Poly1305 to encrypt and authenticate
-messages. The length of messages is not hidden.
-
-It is the caller's responsibility to ensure the uniqueness of nonces—for
-example, by using nonce 1 for the first message, nonce 2 for the second
-message, etc. Nonces are long enough that randomly generated nonces have
-negligible risk of collision.
-
-Messages should be small because:
-
-1. The whole message needs to be held in memory to be processed.
-
-2. Using large messages pressures implementations on small machines to decrypt
-and process plaintext before authenticating it. This is very dangerous, and
-this API does not allow it, but a protocol that uses excessive message sizes
-might present some implementations with no other choice.
-
-3. Fixed overheads will be sufficiently amortised by messages as small as 8KB.
-
-4. Performance may be improved by working with messages that fit into data caches.
-
-Thus large amounts of data should be chunked so that each message is small.
-(Each message still needs a unique nonce.) If in doubt, 16KB is a reasonable
-chunk size.
-
-This package is interoperable with NaCl: https://nacl.cr.yp.to/box.html.
-*/
-package box // import "golang.org/x/crypto/nacl/box"
-
-import (
-	"io"
-
-	"golang.org/x/crypto/curve25519"
-	"golang.org/x/crypto/nacl/secretbox"
-	"golang.org/x/crypto/salsa20/salsa"
-)
-
-// Overhead is the number of bytes of overhead when boxing a message.
-const Overhead = secretbox.Overhead
-
-// GenerateKey generates a new public/private key pair suitable for use with
-// Seal and Open.
-func GenerateKey(rand io.Reader) (publicKey, privateKey *[32]byte, err error) {
-	publicKey = new([32]byte)
-	privateKey = new([32]byte)
-	_, err = io.ReadFull(rand, privateKey[:])
-	if err != nil {
-		publicKey = nil
-		privateKey = nil
-		return
-	}
-
-	curve25519.ScalarBaseMult(publicKey, privateKey)
-	return
-}
-
-var zeros [16]byte
-
-// Precompute calculates the shared key between peersPublicKey and privateKey
-// and writes it to sharedKey. The shared key can be used with
-// OpenAfterPrecomputation and SealAfterPrecomputation to speed up processing
-// when using the same pair of keys repeatedly.
-func Precompute(sharedKey, peersPublicKey, privateKey *[32]byte) {
-	curve25519.ScalarMult(sharedKey, privateKey, peersPublicKey)
-	salsa.HSalsa20(sharedKey, &zeros, sharedKey, &salsa.Sigma)
-}
-
-// Seal appends an encrypted and authenticated copy of message to out, which
-// will be Overhead bytes longer than the original and must not overlap it. The
-// nonce must be unique for each distinct message for a given pair of keys.
-func Seal(out, message []byte, nonce *[24]byte, peersPublicKey, privateKey *[32]byte) []byte {
-	var sharedKey [32]byte
-	Precompute(&sharedKey, peersPublicKey, privateKey)
-	return secretbox.Seal(out, message, nonce, &sharedKey)
-}
-
-// SealAfterPrecomputation performs the same actions as Seal, but takes a
-// shared key as generated by Precompute.
-func SealAfterPrecomputation(out, message []byte, nonce *[24]byte, sharedKey *[32]byte) []byte {
-	return secretbox.Seal(out, message, nonce, sharedKey)
-}
-
-// Open authenticates and decrypts a box produced by Seal and appends the
-// message to out, which must not overlap box. The output will be Overhead
-// bytes smaller than box.
-func Open(out, box []byte, nonce *[24]byte, peersPublicKey, privateKey *[32]byte) ([]byte, bool) {
-	var sharedKey [32]byte
-	Precompute(&sharedKey, peersPublicKey, privateKey)
-	return secretbox.Open(out, box, nonce, &sharedKey)
-}
-
-// OpenAfterPrecomputation performs the same actions as Open, but takes a
-// shared key as generated by Precompute.
-func OpenAfterPrecomputation(out, box []byte, nonce *[24]byte, sharedKey *[32]byte) ([]byte, bool) {
-	return secretbox.Open(out, box, nonce, sharedKey)
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/box/box_test.go b/installer/vendor/golang.org/x/crypto/nacl/box/box_test.go
deleted file mode 100644
index 481ade28ae..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/box/box_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package box
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/hex"
-	"testing"
-
-	"golang.org/x/crypto/curve25519"
-)
-
-func TestSealOpen(t *testing.T) {
-	publicKey1, privateKey1, _ := GenerateKey(rand.Reader)
-	publicKey2, privateKey2, _ := GenerateKey(rand.Reader)
-
-	if *privateKey1 == *privateKey2 {
-		t.Fatalf("private keys are equal!")
-	}
-	if *publicKey1 == *publicKey2 {
-		t.Fatalf("public keys are equal!")
-	}
-	message := []byte("test message")
-	var nonce [24]byte
-
-	box := Seal(nil, message, &nonce, publicKey1, privateKey2)
-	opened, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-	if !ok {
-		t.Fatalf("failed to open box")
-	}
-
-	if !bytes.Equal(opened, message) {
-		t.Fatalf("got %x, want %x", opened, message)
-	}
-
-	for i := range box {
-		box[i] ^= 0x40
-		_, ok := Open(nil, box, &nonce, publicKey2, privateKey1)
-		if ok {
-			t.Fatalf("opened box with byte %d corrupted", i)
-		}
-		box[i] ^= 0x40
-	}
-}
-
-func TestBox(t *testing.T) {
-	var privateKey1, privateKey2 [32]byte
-	for i := range privateKey1[:] {
-		privateKey1[i] = 1
-	}
-	for i := range privateKey2[:] {
-		privateKey2[i] = 2
-	}
-
-	var publicKey1 [32]byte
-	curve25519.ScalarBaseMult(&publicKey1, &privateKey1)
-	var message [64]byte
-	for i := range message[:] {
-		message[i] = 3
-	}
-
-	var nonce [24]byte
-	for i := range nonce[:] {
-		nonce[i] = 4
-	}
-
-	box := Seal(nil, message[:], &nonce, &publicKey1, &privateKey2)
-
-	// expected was generated using the C implementation of NaCl.
-	expected, _ := hex.DecodeString("78ea30b19d2341ebbdba54180f821eec265cf86312549bea8a37652a8bb94f07b78a73ed1708085e6ddd0e943bbdeb8755079a37eb31d86163ce241164a47629c0539f330b4914cd135b3855bc2a2dfc")
-
-	if !bytes.Equal(box, expected) {
-		t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, expected)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/box/example_test.go b/installer/vendor/golang.org/x/crypto/nacl/box/example_test.go
deleted file mode 100644
index 25e42d2be9..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/box/example_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package box_test
-
-import (
-	crypto_rand "crypto/rand" // Custom so it's clear which rand we're using.
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/nacl/box"
-)
-
-func Example() {
-	senderPublicKey, senderPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	recipientPublicKey, recipientPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(crypto_rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	msg := []byte("Alas, poor Yorick! I knew him, Horatio")
-	// This encrypts msg and appends the result to the nonce.
-	encrypted := box.Seal(nonce[:], msg, &nonce, recipientPublicKey, senderPrivateKey)
-
-	// The recipient can decrypt the message using their private key and the
-	// sender's public key. When you decrypt, you must use the same nonce you
-	// used to encrypt the message. One way to achieve this is to store the
-	// nonce alongside the encrypted message. Above, we stored the nonce in the
-	// first 24 bytes of the encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := box.Open(nil, encrypted[24:], &decryptNonce, senderPublicKey, recipientPrivateKey)
-	if !ok {
-		panic("decryption error")
-	}
-	fmt.Println(string(decrypted))
-	// Output: Alas, poor Yorick! I knew him, Horatio
-}
-
-func Example_precompute() {
-	senderPublicKey, senderPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	recipientPublicKey, recipientPrivateKey, err := box.GenerateKey(crypto_rand.Reader)
-	if err != nil {
-		panic(err)
-	}
-
-	// The shared key can be used to speed up processing when using the same
-	// pair of keys repeatedly.
-	sharedEncryptKey := new([32]byte)
-	box.Precompute(sharedEncryptKey, recipientPublicKey, senderPrivateKey)
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(crypto_rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	msg := []byte("A fellow of infinite jest, of most excellent fancy")
-	// This encrypts msg and appends the result to the nonce.
-	encrypted := box.SealAfterPrecomputation(nonce[:], msg, &nonce, sharedEncryptKey)
-
-	// The shared key can be used to speed up processing when using the same
-	// pair of keys repeatedly.
-	var sharedDecryptKey [32]byte
-	box.Precompute(&sharedDecryptKey, senderPublicKey, recipientPrivateKey)
-
-	// The recipient can decrypt the message using the shared key. When you
-	// decrypt, you must use the same nonce you used to encrypt the message.
-	// One way to achieve this is to store the nonce alongside the encrypted
-	// message. Above, we stored the nonce in the first 24 bytes of the
-	// encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := box.OpenAfterPrecomputation(nil, encrypted[24:], &decryptNonce, &sharedDecryptKey)
-	if !ok {
-		panic("decryption error")
-	}
-	fmt.Println(string(decrypted))
-	// Output: A fellow of infinite jest, of most excellent fancy
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go b/installer/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go
deleted file mode 100644
index 789f4ff03f..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/secretbox/example_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package secretbox_test
-
-import (
-	"crypto/rand"
-	"encoding/hex"
-	"fmt"
-	"io"
-
-	"golang.org/x/crypto/nacl/secretbox"
-)
-
-func Example() {
-	// Load your secret key from a safe place and reuse it across multiple
-	// Seal calls. (Obviously don't use this example key for anything
-	// real.) If you want to convert a passphrase to a key, use a suitable
-	// package like bcrypt or scrypt.
-	secretKeyBytes, err := hex.DecodeString("6368616e676520746869732070617373776f726420746f206120736563726574")
-	if err != nil {
-		panic(err)
-	}
-
-	var secretKey [32]byte
-	copy(secretKey[:], secretKeyBytes)
-
-	// You must use a different nonce for each message you encrypt with the
-	// same key. Since the nonce here is 192 bits long, a random value
-	// provides a sufficiently small probability of repeats.
-	var nonce [24]byte
-	if _, err := io.ReadFull(rand.Reader, nonce[:]); err != nil {
-		panic(err)
-	}
-
-	// This encrypts "hello world" and appends the result to the nonce.
-	encrypted := secretbox.Seal(nonce[:], []byte("hello world"), &nonce, &secretKey)
-
-	// When you decrypt, you must use the same nonce and key you used to
-	// encrypt the message. One way to achieve this is to store the nonce
-	// alongside the encrypted message. Above, we stored the nonce in the first
-	// 24 bytes of the encrypted text.
-	var decryptNonce [24]byte
-	copy(decryptNonce[:], encrypted[:24])
-	decrypted, ok := secretbox.Open(nil, encrypted[24:], &decryptNonce, &secretKey)
-	if !ok {
-		panic("decryption error")
-	}
-
-	fmt.Println(string(decrypted))
-	// Output: hello world
-}
diff --git a/installer/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go b/installer/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
deleted file mode 100644
index 3c70b0f4b3..0000000000
--- a/installer/vendor/golang.org/x/crypto/nacl/secretbox/secretbox_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package secretbox
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/hex"
-	"testing"
-)
-
-func TestSealOpen(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-
-	rand.Reader.Read(key[:])
-	rand.Reader.Read(nonce[:])
-
-	var box, opened []byte
-
-	for msgLen := 0; msgLen < 128; msgLen += 17 {
-		message := make([]byte, msgLen)
-		rand.Reader.Read(message)
-
-		box = Seal(box[:0], message, &nonce, &key)
-		var ok bool
-		opened, ok = Open(opened[:0], box, &nonce, &key)
-		if !ok {
-			t.Errorf("%d: failed to open box", msgLen)
-			continue
-		}
-
-		if !bytes.Equal(opened, message) {
-			t.Errorf("%d: got %x, expected %x", msgLen, opened, message)
-			continue
-		}
-	}
-
-	for i := range box {
-		box[i] ^= 0x20
-		_, ok := Open(opened[:0], box, &nonce, &key)
-		if ok {
-			t.Errorf("box was opened after corrupting byte %d", i)
-		}
-		box[i] ^= 0x20
-	}
-}
-
-func TestSecretBox(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-	var message [64]byte
-
-	for i := range key[:] {
-		key[i] = 1
-	}
-	for i := range nonce[:] {
-		nonce[i] = 2
-	}
-	for i := range message[:] {
-		message[i] = 3
-	}
-
-	box := Seal(nil, message[:], &nonce, &key)
-	// expected was generated using the C implementation of NaCl.
-	expected, _ := hex.DecodeString("8442bc313f4626f1359e3b50122b6ce6fe66ddfe7d39d14e637eb4fd5b45beadab55198df6ab5368439792a23c87db70acb6156dc5ef957ac04f6276cf6093b84be77ff0849cc33e34b7254d5a8f65ad")
-
-	if !bytes.Equal(box, expected) {
-		t.Fatalf("box didn't match, got\n%x\n, expected\n%x", box, expected)
-	}
-}
-
-func TestAppend(t *testing.T) {
-	var key [32]byte
-	var nonce [24]byte
-	var message [8]byte
-
-	out := make([]byte, 4)
-	box := Seal(out, message[:], &nonce, &key)
-	if !bytes.Equal(box[:4], out[:4]) {
-		t.Fatalf("Seal didn't correctly append")
-	}
-
-	out = make([]byte, 4, 100)
-	box = Seal(out, message[:], &nonce, &key)
-	if !bytes.Equal(box[:4], out[:4]) {
-		t.Fatalf("Seal didn't correctly append with sufficient capacity.")
-	}
-}
-
-func benchmarkSealSize(b *testing.B, size int) {
-	message := make([]byte, size)
-	out := make([]byte, size+Overhead)
-	var nonce [24]byte
-	var key [32]byte
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		out = Seal(out[:0], message, &nonce, &key)
-	}
-}
-
-func BenchmarkSeal8Bytes(b *testing.B) {
-	benchmarkSealSize(b, 8)
-}
-
-func BenchmarkSeal100Bytes(b *testing.B) {
-	benchmarkSealSize(b, 100)
-}
-
-func BenchmarkSeal1K(b *testing.B) {
-	benchmarkSealSize(b, 1024)
-}
-
-func BenchmarkSeal8K(b *testing.B) {
-	benchmarkSealSize(b, 8192)
-}
-
-func benchmarkOpenSize(b *testing.B, size int) {
-	msg := make([]byte, size)
-	result := make([]byte, size)
-	var nonce [24]byte
-	var key [32]byte
-	box := Seal(nil, msg, &nonce, &key)
-
-	b.SetBytes(int64(size))
-	b.ResetTimer()
-
-	for i := 0; i < b.N; i++ {
-		if _, ok := Open(result[:0], box, &nonce, &key); !ok {
-			panic("Open failed")
-		}
-	}
-}
-
-func BenchmarkOpen8Bytes(b *testing.B) {
-	benchmarkOpenSize(b, 8)
-}
-
-func BenchmarkOpen100Bytes(b *testing.B) {
-	benchmarkOpenSize(b, 100)
-}
-
-func BenchmarkOpen1K(b *testing.B) {
-	benchmarkOpenSize(b, 1024)
-}
-
-func BenchmarkOpen8K(b *testing.B) {
-	benchmarkOpenSize(b, 8192)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ocsp/ocsp.go b/installer/vendor/golang.org/x/crypto/ocsp/ocsp.go
deleted file mode 100644
index 5e73146d7f..0000000000
--- a/installer/vendor/golang.org/x/crypto/ocsp/ocsp.go
+++ /dev/null
@@ -1,778 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ocsp parses OCSP responses as specified in RFC 2560. OCSP responses
-// are signed messages attesting to the validity of a certificate for a small
-// period of time. This is used to manage revocation for X.509 certificates.
-package ocsp // import "golang.org/x/crypto/ocsp"
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	_ "crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"errors"
-	"fmt"
-	"math/big"
-	"strconv"
-	"time"
-)
-
-var idPKIXOCSPBasic = asn1.ObjectIdentifier([]int{1, 3, 6, 1, 5, 5, 7, 48, 1, 1})
-
-// ResponseStatus contains the result of an OCSP request. See
-// https://tools.ietf.org/html/rfc6960#section-2.3
-type ResponseStatus int
-
-const (
-	Success       ResponseStatus = 0
-	Malformed     ResponseStatus = 1
-	InternalError ResponseStatus = 2
-	TryLater      ResponseStatus = 3
-	// Status code four is unused in OCSP. See
-	// https://tools.ietf.org/html/rfc6960#section-4.2.1
-	SignatureRequired ResponseStatus = 5
-	Unauthorized      ResponseStatus = 6
-)
-
-func (r ResponseStatus) String() string {
-	switch r {
-	case Success:
-		return "success"
-	case Malformed:
-		return "malformed"
-	case InternalError:
-		return "internal error"
-	case TryLater:
-		return "try later"
-	case SignatureRequired:
-		return "signature required"
-	case Unauthorized:
-		return "unauthorized"
-	default:
-		return "unknown OCSP status: " + strconv.Itoa(int(r))
-	}
-}
-
-// ResponseError is an error that may be returned by ParseResponse to indicate
-// that the response itself is an error, not just that its indicating that a
-// certificate is revoked, unknown, etc.
-type ResponseError struct {
-	Status ResponseStatus
-}
-
-func (r ResponseError) Error() string {
-	return "ocsp: error from server: " + r.Status.String()
-}
-
-// These are internal structures that reflect the ASN.1 structure of an OCSP
-// response. See RFC 2560, section 4.2.
-
-type certID struct {
-	HashAlgorithm pkix.AlgorithmIdentifier
-	NameHash      []byte
-	IssuerKeyHash []byte
-	SerialNumber  *big.Int
-}
-
-// https://tools.ietf.org/html/rfc2560#section-4.1.1
-type ocspRequest struct {
-	TBSRequest tbsRequest
-}
-
-type tbsRequest struct {
-	Version       int              `asn1:"explicit,tag:0,default:0,optional"`
-	RequestorName pkix.RDNSequence `asn1:"explicit,tag:1,optional"`
-	RequestList   []request
-}
-
-type request struct {
-	Cert certID
-}
-
-type responseASN1 struct {
-	Status   asn1.Enumerated
-	Response responseBytes `asn1:"explicit,tag:0,optional"`
-}
-
-type responseBytes struct {
-	ResponseType asn1.ObjectIdentifier
-	Response     []byte
-}
-
-type basicResponse struct {
-	TBSResponseData    responseData
-	SignatureAlgorithm pkix.AlgorithmIdentifier
-	Signature          asn1.BitString
-	Certificates       []asn1.RawValue `asn1:"explicit,tag:0,optional"`
-}
-
-type responseData struct {
-	Raw            asn1.RawContent
-	Version        int `asn1:"optional,default:0,explicit,tag:0"`
-	RawResponderID asn1.RawValue
-	ProducedAt     time.Time `asn1:"generalized"`
-	Responses      []singleResponse
-}
-
-type singleResponse struct {
-	CertID           certID
-	Good             asn1.Flag        `asn1:"tag:0,optional"`
-	Revoked          revokedInfo      `asn1:"tag:1,optional"`
-	Unknown          asn1.Flag        `asn1:"tag:2,optional"`
-	ThisUpdate       time.Time        `asn1:"generalized"`
-	NextUpdate       time.Time        `asn1:"generalized,explicit,tag:0,optional"`
-	SingleExtensions []pkix.Extension `asn1:"explicit,tag:1,optional"`
-}
-
-type revokedInfo struct {
-	RevocationTime time.Time       `asn1:"generalized"`
-	Reason         asn1.Enumerated `asn1:"explicit,tag:0,optional"`
-}
-
-var (
-	oidSignatureMD2WithRSA      = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 2}
-	oidSignatureMD5WithRSA      = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 4}
-	oidSignatureSHA1WithRSA     = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 5}
-	oidSignatureSHA256WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 11}
-	oidSignatureSHA384WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 12}
-	oidSignatureSHA512WithRSA   = asn1.ObjectIdentifier{1, 2, 840, 113549, 1, 1, 13}
-	oidSignatureDSAWithSHA1     = asn1.ObjectIdentifier{1, 2, 840, 10040, 4, 3}
-	oidSignatureDSAWithSHA256   = asn1.ObjectIdentifier{2, 16, 840, 1, 101, 3, 4, 3, 2}
-	oidSignatureECDSAWithSHA1   = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 1}
-	oidSignatureECDSAWithSHA256 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 2}
-	oidSignatureECDSAWithSHA384 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 3}
-	oidSignatureECDSAWithSHA512 = asn1.ObjectIdentifier{1, 2, 840, 10045, 4, 3, 4}
-)
-
-var hashOIDs = map[crypto.Hash]asn1.ObjectIdentifier{
-	crypto.SHA1:   asn1.ObjectIdentifier([]int{1, 3, 14, 3, 2, 26}),
-	crypto.SHA256: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 1}),
-	crypto.SHA384: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 2}),
-	crypto.SHA512: asn1.ObjectIdentifier([]int{2, 16, 840, 1, 101, 3, 4, 2, 3}),
-}
-
-// TODO(rlb): This is also from crypto/x509, so same comment as AGL's below
-var signatureAlgorithmDetails = []struct {
-	algo       x509.SignatureAlgorithm
-	oid        asn1.ObjectIdentifier
-	pubKeyAlgo x509.PublicKeyAlgorithm
-	hash       crypto.Hash
-}{
-	{x509.MD2WithRSA, oidSignatureMD2WithRSA, x509.RSA, crypto.Hash(0) /* no value for MD2 */},
-	{x509.MD5WithRSA, oidSignatureMD5WithRSA, x509.RSA, crypto.MD5},
-	{x509.SHA1WithRSA, oidSignatureSHA1WithRSA, x509.RSA, crypto.SHA1},
-	{x509.SHA256WithRSA, oidSignatureSHA256WithRSA, x509.RSA, crypto.SHA256},
-	{x509.SHA384WithRSA, oidSignatureSHA384WithRSA, x509.RSA, crypto.SHA384},
-	{x509.SHA512WithRSA, oidSignatureSHA512WithRSA, x509.RSA, crypto.SHA512},
-	{x509.DSAWithSHA1, oidSignatureDSAWithSHA1, x509.DSA, crypto.SHA1},
-	{x509.DSAWithSHA256, oidSignatureDSAWithSHA256, x509.DSA, crypto.SHA256},
-	{x509.ECDSAWithSHA1, oidSignatureECDSAWithSHA1, x509.ECDSA, crypto.SHA1},
-	{x509.ECDSAWithSHA256, oidSignatureECDSAWithSHA256, x509.ECDSA, crypto.SHA256},
-	{x509.ECDSAWithSHA384, oidSignatureECDSAWithSHA384, x509.ECDSA, crypto.SHA384},
-	{x509.ECDSAWithSHA512, oidSignatureECDSAWithSHA512, x509.ECDSA, crypto.SHA512},
-}
-
-// TODO(rlb): This is also from crypto/x509, so same comment as AGL's below
-func signingParamsForPublicKey(pub interface{}, requestedSigAlgo x509.SignatureAlgorithm) (hashFunc crypto.Hash, sigAlgo pkix.AlgorithmIdentifier, err error) {
-	var pubType x509.PublicKeyAlgorithm
-
-	switch pub := pub.(type) {
-	case *rsa.PublicKey:
-		pubType = x509.RSA
-		hashFunc = crypto.SHA256
-		sigAlgo.Algorithm = oidSignatureSHA256WithRSA
-		sigAlgo.Parameters = asn1.RawValue{
-			Tag: 5,
-		}
-
-	case *ecdsa.PublicKey:
-		pubType = x509.ECDSA
-
-		switch pub.Curve {
-		case elliptic.P224(), elliptic.P256():
-			hashFunc = crypto.SHA256
-			sigAlgo.Algorithm = oidSignatureECDSAWithSHA256
-		case elliptic.P384():
-			hashFunc = crypto.SHA384
-			sigAlgo.Algorithm = oidSignatureECDSAWithSHA384
-		case elliptic.P521():
-			hashFunc = crypto.SHA512
-			sigAlgo.Algorithm = oidSignatureECDSAWithSHA512
-		default:
-			err = errors.New("x509: unknown elliptic curve")
-		}
-
-	default:
-		err = errors.New("x509: only RSA and ECDSA keys supported")
-	}
-
-	if err != nil {
-		return
-	}
-
-	if requestedSigAlgo == 0 {
-		return
-	}
-
-	found := false
-	for _, details := range signatureAlgorithmDetails {
-		if details.algo == requestedSigAlgo {
-			if details.pubKeyAlgo != pubType {
-				err = errors.New("x509: requested SignatureAlgorithm does not match private key type")
-				return
-			}
-			sigAlgo.Algorithm, hashFunc = details.oid, details.hash
-			if hashFunc == 0 {
-				err = errors.New("x509: cannot sign with hash function requested")
-				return
-			}
-			found = true
-			break
-		}
-	}
-
-	if !found {
-		err = errors.New("x509: unknown SignatureAlgorithm")
-	}
-
-	return
-}
-
-// TODO(agl): this is taken from crypto/x509 and so should probably be exported
-// from crypto/x509 or crypto/x509/pkix.
-func getSignatureAlgorithmFromOID(oid asn1.ObjectIdentifier) x509.SignatureAlgorithm {
-	for _, details := range signatureAlgorithmDetails {
-		if oid.Equal(details.oid) {
-			return details.algo
-		}
-	}
-	return x509.UnknownSignatureAlgorithm
-}
-
-// TODO(rlb): This is not taken from crypto/x509, but it's of the same general form.
-func getHashAlgorithmFromOID(target asn1.ObjectIdentifier) crypto.Hash {
-	for hash, oid := range hashOIDs {
-		if oid.Equal(target) {
-			return hash
-		}
-	}
-	return crypto.Hash(0)
-}
-
-func getOIDFromHashAlgorithm(target crypto.Hash) asn1.ObjectIdentifier {
-	for hash, oid := range hashOIDs {
-		if hash == target {
-			return oid
-		}
-	}
-	return nil
-}
-
-// This is the exposed reflection of the internal OCSP structures.
-
-// The status values that can be expressed in OCSP.  See RFC 6960.
-const (
-	// Good means that the certificate is valid.
-	Good = iota
-	// Revoked means that the certificate has been deliberately revoked.
-	Revoked
-	// Unknown means that the OCSP responder doesn't know about the certificate.
-	Unknown
-	// ServerFailed is unused and was never used (see
-	// https://go-review.googlesource.com/#/c/18944). ParseResponse will
-	// return a ResponseError when an error response is parsed.
-	ServerFailed
-)
-
-// The enumerated reasons for revoking a certificate.  See RFC 5280.
-const (
-	Unspecified          = 0
-	KeyCompromise        = 1
-	CACompromise         = 2
-	AffiliationChanged   = 3
-	Superseded           = 4
-	CessationOfOperation = 5
-	CertificateHold      = 6
-
-	RemoveFromCRL      = 8
-	PrivilegeWithdrawn = 9
-	AACompromise       = 10
-)
-
-// Request represents an OCSP request. See RFC 6960.
-type Request struct {
-	HashAlgorithm  crypto.Hash
-	IssuerNameHash []byte
-	IssuerKeyHash  []byte
-	SerialNumber   *big.Int
-}
-
-// Marshal marshals the OCSP request to ASN.1 DER encoded form.
-func (req *Request) Marshal() ([]byte, error) {
-	hashAlg := getOIDFromHashAlgorithm(req.HashAlgorithm)
-	if hashAlg == nil {
-		return nil, errors.New("Unknown hash algorithm")
-	}
-	return asn1.Marshal(ocspRequest{
-		tbsRequest{
-			Version: 0,
-			RequestList: []request{
-				{
-					Cert: certID{
-						pkix.AlgorithmIdentifier{
-							Algorithm:  hashAlg,
-							Parameters: asn1.RawValue{Tag: 5 /* ASN.1 NULL */},
-						},
-						req.IssuerNameHash,
-						req.IssuerKeyHash,
-						req.SerialNumber,
-					},
-				},
-			},
-		},
-	})
-}
-
-// Response represents an OCSP response containing a single SingleResponse. See
-// RFC 6960.
-type Response struct {
-	// Status is one of {Good, Revoked, Unknown}
-	Status                                        int
-	SerialNumber                                  *big.Int
-	ProducedAt, ThisUpdate, NextUpdate, RevokedAt time.Time
-	RevocationReason                              int
-	Certificate                                   *x509.Certificate
-	// TBSResponseData contains the raw bytes of the signed response. If
-	// Certificate is nil then this can be used to verify Signature.
-	TBSResponseData    []byte
-	Signature          []byte
-	SignatureAlgorithm x509.SignatureAlgorithm
-
-	// IssuerHash is the hash used to compute the IssuerNameHash and IssuerKeyHash.
-	// Valid values are crypto.SHA1, crypto.SHA256, crypto.SHA384, and crypto.SHA512.
-	// If zero, the default is crypto.SHA1.
-	IssuerHash crypto.Hash
-
-	// RawResponderName optionally contains the DER-encoded subject of the
-	// responder certificate. Exactly one of RawResponderName and
-	// ResponderKeyHash is set.
-	RawResponderName []byte
-	// ResponderKeyHash optionally contains the SHA-1 hash of the
-	// responder's public key. Exactly one of RawResponderName and
-	// ResponderKeyHash is set.
-	ResponderKeyHash []byte
-
-	// Extensions contains raw X.509 extensions from the singleExtensions field
-	// of the OCSP response. When parsing certificates, this can be used to
-	// extract non-critical extensions that are not parsed by this package. When
-	// marshaling OCSP responses, the Extensions field is ignored, see
-	// ExtraExtensions.
-	Extensions []pkix.Extension
-
-	// ExtraExtensions contains extensions to be copied, raw, into any marshaled
-	// OCSP response (in the singleExtensions field). Values override any
-	// extensions that would otherwise be produced based on the other fields. The
-	// ExtraExtensions field is not populated when parsing certificates, see
-	// Extensions.
-	ExtraExtensions []pkix.Extension
-}
-
-// These are pre-serialized error responses for the various non-success codes
-// defined by OCSP. The Unauthorized code in particular can be used by an OCSP
-// responder that supports only pre-signed responses as a response to requests
-// for certificates with unknown status. See RFC 5019.
-var (
-	MalformedRequestErrorResponse = []byte{0x30, 0x03, 0x0A, 0x01, 0x01}
-	InternalErrorErrorResponse    = []byte{0x30, 0x03, 0x0A, 0x01, 0x02}
-	TryLaterErrorResponse         = []byte{0x30, 0x03, 0x0A, 0x01, 0x03}
-	SigRequredErrorResponse       = []byte{0x30, 0x03, 0x0A, 0x01, 0x05}
-	UnauthorizedErrorResponse     = []byte{0x30, 0x03, 0x0A, 0x01, 0x06}
-)
-
-// CheckSignatureFrom checks that the signature in resp is a valid signature
-// from issuer. This should only be used if resp.Certificate is nil. Otherwise,
-// the OCSP response contained an intermediate certificate that created the
-// signature. That signature is checked by ParseResponse and only
-// resp.Certificate remains to be validated.
-func (resp *Response) CheckSignatureFrom(issuer *x509.Certificate) error {
-	return issuer.CheckSignature(resp.SignatureAlgorithm, resp.TBSResponseData, resp.Signature)
-}
-
-// ParseError results from an invalid OCSP response.
-type ParseError string
-
-func (p ParseError) Error() string {
-	return string(p)
-}
-
-// ParseRequest parses an OCSP request in DER form. It only supports
-// requests for a single certificate. Signed requests are not supported.
-// If a request includes a signature, it will result in a ParseError.
-func ParseRequest(bytes []byte) (*Request, error) {
-	var req ocspRequest
-	rest, err := asn1.Unmarshal(bytes, &req)
-	if err != nil {
-		return nil, err
-	}
-	if len(rest) > 0 {
-		return nil, ParseError("trailing data in OCSP request")
-	}
-
-	if len(req.TBSRequest.RequestList) == 0 {
-		return nil, ParseError("OCSP request contains no request body")
-	}
-	innerRequest := req.TBSRequest.RequestList[0]
-
-	hashFunc := getHashAlgorithmFromOID(innerRequest.Cert.HashAlgorithm.Algorithm)
-	if hashFunc == crypto.Hash(0) {
-		return nil, ParseError("OCSP request uses unknown hash function")
-	}
-
-	return &Request{
-		HashAlgorithm:  hashFunc,
-		IssuerNameHash: innerRequest.Cert.NameHash,
-		IssuerKeyHash:  innerRequest.Cert.IssuerKeyHash,
-		SerialNumber:   innerRequest.Cert.SerialNumber,
-	}, nil
-}
-
-// ParseResponse parses an OCSP response in DER form. It only supports
-// responses for a single certificate. If the response contains a certificate
-// then the signature over the response is checked. If issuer is not nil then
-// it will be used to validate the signature or embedded certificate.
-//
-// Invalid responses and parse failures will result in a ParseError.
-// Error responses will result in a ResponseError.
-func ParseResponse(bytes []byte, issuer *x509.Certificate) (*Response, error) {
-	return ParseResponseForCert(bytes, nil, issuer)
-}
-
-// ParseResponseForCert parses an OCSP response in DER form and searches for a
-// Response relating to cert. If such a Response is found and the OCSP response
-// contains a certificate then the signature over the response is checked. If
-// issuer is not nil then it will be used to validate the signature or embedded
-// certificate.
-//
-// Invalid responses and parse failures will result in a ParseError.
-// Error responses will result in a ResponseError.
-func ParseResponseForCert(bytes []byte, cert, issuer *x509.Certificate) (*Response, error) {
-	var resp responseASN1
-	rest, err := asn1.Unmarshal(bytes, &resp)
-	if err != nil {
-		return nil, err
-	}
-	if len(rest) > 0 {
-		return nil, ParseError("trailing data in OCSP response")
-	}
-
-	if status := ResponseStatus(resp.Status); status != Success {
-		return nil, ResponseError{status}
-	}
-
-	if !resp.Response.ResponseType.Equal(idPKIXOCSPBasic) {
-		return nil, ParseError("bad OCSP response type")
-	}
-
-	var basicResp basicResponse
-	rest, err = asn1.Unmarshal(resp.Response.Response, &basicResp)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(basicResp.Certificates) > 1 {
-		return nil, ParseError("OCSP response contains bad number of certificates")
-	}
-
-	if n := len(basicResp.TBSResponseData.Responses); n == 0 || cert == nil && n > 1 {
-		return nil, ParseError("OCSP response contains bad number of responses")
-	}
-
-	var singleResp singleResponse
-	if cert == nil {
-		singleResp = basicResp.TBSResponseData.Responses[0]
-	} else {
-		match := false
-		for _, resp := range basicResp.TBSResponseData.Responses {
-			if cert.SerialNumber.Cmp(resp.CertID.SerialNumber) == 0 {
-				singleResp = resp
-				match = true
-				break
-			}
-		}
-		if !match {
-			return nil, ParseError("no response matching the supplied certificate")
-		}
-	}
-
-	ret := &Response{
-		TBSResponseData:    basicResp.TBSResponseData.Raw,
-		Signature:          basicResp.Signature.RightAlign(),
-		SignatureAlgorithm: getSignatureAlgorithmFromOID(basicResp.SignatureAlgorithm.Algorithm),
-		Extensions:         singleResp.SingleExtensions,
-		SerialNumber:       singleResp.CertID.SerialNumber,
-		ProducedAt:         basicResp.TBSResponseData.ProducedAt,
-		ThisUpdate:         singleResp.ThisUpdate,
-		NextUpdate:         singleResp.NextUpdate,
-	}
-
-	// Handle the ResponderID CHOICE tag. ResponderID can be flattened into
-	// TBSResponseData once https://go-review.googlesource.com/34503 has been
-	// released.
-	rawResponderID := basicResp.TBSResponseData.RawResponderID
-	switch rawResponderID.Tag {
-	case 1: // Name
-		var rdn pkix.RDNSequence
-		if rest, err := asn1.Unmarshal(rawResponderID.Bytes, &rdn); err != nil || len(rest) != 0 {
-			return nil, ParseError("invalid responder name")
-		}
-		ret.RawResponderName = rawResponderID.Bytes
-	case 2: // KeyHash
-		if rest, err := asn1.Unmarshal(rawResponderID.Bytes, &ret.ResponderKeyHash); err != nil || len(rest) != 0 {
-			return nil, ParseError("invalid responder key hash")
-		}
-	default:
-		return nil, ParseError("invalid responder id tag")
-	}
-
-	if len(basicResp.Certificates) > 0 {
-		ret.Certificate, err = x509.ParseCertificate(basicResp.Certificates[0].FullBytes)
-		if err != nil {
-			return nil, err
-		}
-
-		if err := ret.CheckSignatureFrom(ret.Certificate); err != nil {
-			return nil, ParseError("bad signature on embedded certificate: " + err.Error())
-		}
-
-		if issuer != nil {
-			if err := issuer.CheckSignature(ret.Certificate.SignatureAlgorithm, ret.Certificate.RawTBSCertificate, ret.Certificate.Signature); err != nil {
-				return nil, ParseError("bad OCSP signature: " + err.Error())
-			}
-		}
-	} else if issuer != nil {
-		if err := ret.CheckSignatureFrom(issuer); err != nil {
-			return nil, ParseError("bad OCSP signature: " + err.Error())
-		}
-	}
-
-	for _, ext := range singleResp.SingleExtensions {
-		if ext.Critical {
-			return nil, ParseError("unsupported critical extension")
-		}
-	}
-
-	for h, oid := range hashOIDs {
-		if singleResp.CertID.HashAlgorithm.Algorithm.Equal(oid) {
-			ret.IssuerHash = h
-			break
-		}
-	}
-	if ret.IssuerHash == 0 {
-		return nil, ParseError("unsupported issuer hash algorithm")
-	}
-
-	switch {
-	case bool(singleResp.Good):
-		ret.Status = Good
-	case bool(singleResp.Unknown):
-		ret.Status = Unknown
-	default:
-		ret.Status = Revoked
-		ret.RevokedAt = singleResp.Revoked.RevocationTime
-		ret.RevocationReason = int(singleResp.Revoked.Reason)
-	}
-
-	return ret, nil
-}
-
-// RequestOptions contains options for constructing OCSP requests.
-type RequestOptions struct {
-	// Hash contains the hash function that should be used when
-	// constructing the OCSP request. If zero, SHA-1 will be used.
-	Hash crypto.Hash
-}
-
-func (opts *RequestOptions) hash() crypto.Hash {
-	if opts == nil || opts.Hash == 0 {
-		// SHA-1 is nearly universally used in OCSP.
-		return crypto.SHA1
-	}
-	return opts.Hash
-}
-
-// CreateRequest returns a DER-encoded, OCSP request for the status of cert. If
-// opts is nil then sensible defaults are used.
-func CreateRequest(cert, issuer *x509.Certificate, opts *RequestOptions) ([]byte, error) {
-	hashFunc := opts.hash()
-
-	// OCSP seems to be the only place where these raw hash identifiers are
-	// used. I took the following from
-	// http://msdn.microsoft.com/en-us/library/ff635603.aspx
-	_, ok := hashOIDs[hashFunc]
-	if !ok {
-		return nil, x509.ErrUnsupportedAlgorithm
-	}
-
-	if !hashFunc.Available() {
-		return nil, x509.ErrUnsupportedAlgorithm
-	}
-	h := opts.hash().New()
-
-	var publicKeyInfo struct {
-		Algorithm pkix.AlgorithmIdentifier
-		PublicKey asn1.BitString
-	}
-	if _, err := asn1.Unmarshal(issuer.RawSubjectPublicKeyInfo, &publicKeyInfo); err != nil {
-		return nil, err
-	}
-
-	h.Write(publicKeyInfo.PublicKey.RightAlign())
-	issuerKeyHash := h.Sum(nil)
-
-	h.Reset()
-	h.Write(issuer.RawSubject)
-	issuerNameHash := h.Sum(nil)
-
-	req := &Request{
-		HashAlgorithm:  hashFunc,
-		IssuerNameHash: issuerNameHash,
-		IssuerKeyHash:  issuerKeyHash,
-		SerialNumber:   cert.SerialNumber,
-	}
-	return req.Marshal()
-}
-
-// CreateResponse returns a DER-encoded OCSP response with the specified contents.
-// The fields in the response are populated as follows:
-//
-// The responder cert is used to populate the responder's name field, and the
-// certificate itself is provided alongside the OCSP response signature.
-//
-// The issuer cert is used to puplate the IssuerNameHash and IssuerKeyHash fields.
-//
-// The template is used to populate the SerialNumber, Status, RevokedAt,
-// RevocationReason, ThisUpdate, and NextUpdate fields.
-//
-// If template.IssuerHash is not set, SHA1 will be used.
-//
-// The ProducedAt date is automatically set to the current date, to the nearest minute.
-func CreateResponse(issuer, responderCert *x509.Certificate, template Response, priv crypto.Signer) ([]byte, error) {
-	var publicKeyInfo struct {
-		Algorithm pkix.AlgorithmIdentifier
-		PublicKey asn1.BitString
-	}
-	if _, err := asn1.Unmarshal(issuer.RawSubjectPublicKeyInfo, &publicKeyInfo); err != nil {
-		return nil, err
-	}
-
-	if template.IssuerHash == 0 {
-		template.IssuerHash = crypto.SHA1
-	}
-	hashOID := getOIDFromHashAlgorithm(template.IssuerHash)
-	if hashOID == nil {
-		return nil, errors.New("unsupported issuer hash algorithm")
-	}
-
-	if !template.IssuerHash.Available() {
-		return nil, fmt.Errorf("issuer hash algorithm %v not linked into binary", template.IssuerHash)
-	}
-	h := template.IssuerHash.New()
-	h.Write(publicKeyInfo.PublicKey.RightAlign())
-	issuerKeyHash := h.Sum(nil)
-
-	h.Reset()
-	h.Write(issuer.RawSubject)
-	issuerNameHash := h.Sum(nil)
-
-	innerResponse := singleResponse{
-		CertID: certID{
-			HashAlgorithm: pkix.AlgorithmIdentifier{
-				Algorithm:  hashOID,
-				Parameters: asn1.RawValue{Tag: 5 /* ASN.1 NULL */},
-			},
-			NameHash:      issuerNameHash,
-			IssuerKeyHash: issuerKeyHash,
-			SerialNumber:  template.SerialNumber,
-		},
-		ThisUpdate:       template.ThisUpdate.UTC(),
-		NextUpdate:       template.NextUpdate.UTC(),
-		SingleExtensions: template.ExtraExtensions,
-	}
-
-	switch template.Status {
-	case Good:
-		innerResponse.Good = true
-	case Unknown:
-		innerResponse.Unknown = true
-	case Revoked:
-		innerResponse.Revoked = revokedInfo{
-			RevocationTime: template.RevokedAt.UTC(),
-			Reason:         asn1.Enumerated(template.RevocationReason),
-		}
-	}
-
-	rawResponderID := asn1.RawValue{
-		Class:      2, // context-specific
-		Tag:        1, // Name (explicit tag)
-		IsCompound: true,
-		Bytes:      responderCert.RawSubject,
-	}
-	tbsResponseData := responseData{
-		Version:        0,
-		RawResponderID: rawResponderID,
-		ProducedAt:     time.Now().Truncate(time.Minute).UTC(),
-		Responses:      []singleResponse{innerResponse},
-	}
-
-	tbsResponseDataDER, err := asn1.Marshal(tbsResponseData)
-	if err != nil {
-		return nil, err
-	}
-
-	hashFunc, signatureAlgorithm, err := signingParamsForPublicKey(priv.Public(), template.SignatureAlgorithm)
-	if err != nil {
-		return nil, err
-	}
-
-	responseHash := hashFunc.New()
-	responseHash.Write(tbsResponseDataDER)
-	signature, err := priv.Sign(rand.Reader, responseHash.Sum(nil), hashFunc)
-	if err != nil {
-		return nil, err
-	}
-
-	response := basicResponse{
-		TBSResponseData:    tbsResponseData,
-		SignatureAlgorithm: signatureAlgorithm,
-		Signature: asn1.BitString{
-			Bytes:     signature,
-			BitLength: 8 * len(signature),
-		},
-	}
-	if template.Certificate != nil {
-		response.Certificates = []asn1.RawValue{
-			asn1.RawValue{FullBytes: template.Certificate.Raw},
-		}
-	}
-	responseDER, err := asn1.Marshal(response)
-	if err != nil {
-		return nil, err
-	}
-
-	return asn1.Marshal(responseASN1{
-		Status: asn1.Enumerated(Success),
-		Response: responseBytes{
-			ResponseType: idPKIXOCSPBasic,
-			Response:     responseDER,
-		},
-	})
-}
diff --git a/installer/vendor/golang.org/x/crypto/ocsp/ocsp_test.go b/installer/vendor/golang.org/x/crypto/ocsp/ocsp_test.go
deleted file mode 100644
index df674b3747..0000000000
--- a/installer/vendor/golang.org/x/crypto/ocsp/ocsp_test.go
+++ /dev/null
@@ -1,875 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package ocsp
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/sha1"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/hex"
-	"math/big"
-	"reflect"
-	"testing"
-	"time"
-)
-
-func TestOCSPDecode(t *testing.T) {
-	responseBytes, _ := hex.DecodeString(ocspResponseHex)
-	resp, err := ParseResponse(responseBytes, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	responderCert, _ := hex.DecodeString(startComResponderCertHex)
-	responder, err := x509.ParseCertificate(responderCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := Response{
-		Status:           Good,
-		SerialNumber:     big.NewInt(0x1d0fa),
-		RevocationReason: Unspecified,
-		ThisUpdate:       time.Date(2010, 7, 7, 15, 1, 5, 0, time.UTC),
-		NextUpdate:       time.Date(2010, 7, 7, 18, 35, 17, 0, time.UTC),
-		RawResponderName: responder.RawSubject,
-	}
-
-	if !reflect.DeepEqual(resp.ThisUpdate, expected.ThisUpdate) {
-		t.Errorf("resp.ThisUpdate: got %d, want %d", resp.ThisUpdate, expected.ThisUpdate)
-	}
-
-	if !reflect.DeepEqual(resp.NextUpdate, expected.NextUpdate) {
-		t.Errorf("resp.NextUpdate: got %d, want %d", resp.NextUpdate, expected.NextUpdate)
-	}
-
-	if resp.Status != expected.Status {
-		t.Errorf("resp.Status: got %d, want %d", resp.Status, expected.Status)
-	}
-
-	if resp.SerialNumber.Cmp(expected.SerialNumber) != 0 {
-		t.Errorf("resp.SerialNumber: got %x, want %x", resp.SerialNumber, expected.SerialNumber)
-	}
-
-	if resp.RevocationReason != expected.RevocationReason {
-		t.Errorf("resp.RevocationReason: got %d, want %d", resp.RevocationReason, expected.RevocationReason)
-	}
-
-	if !bytes.Equal(resp.RawResponderName, expected.RawResponderName) {
-		t.Errorf("resp.RawResponderName: got %x, want %x", resp.RawResponderName, expected.RawResponderName)
-	}
-
-	if !bytes.Equal(resp.ResponderKeyHash, expected.ResponderKeyHash) {
-		t.Errorf("resp.ResponderKeyHash: got %x, want %x", resp.ResponderKeyHash, expected.ResponderKeyHash)
-	}
-}
-
-func TestOCSPDecodeWithoutCert(t *testing.T) {
-	responseBytes, _ := hex.DecodeString(ocspResponseWithoutCertHex)
-	_, err := ParseResponse(responseBytes, nil)
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestOCSPDecodeWithExtensions(t *testing.T) {
-	responseBytes, _ := hex.DecodeString(ocspResponseWithCriticalExtensionHex)
-	_, err := ParseResponse(responseBytes, nil)
-	if err == nil {
-		t.Error(err)
-	}
-
-	responseBytes, _ = hex.DecodeString(ocspResponseWithExtensionHex)
-	response, err := ParseResponse(responseBytes, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(response.Extensions) != 1 {
-		t.Errorf("len(response.Extensions): got %v, want %v", len(response.Extensions), 1)
-	}
-
-	extensionBytes := response.Extensions[0].Value
-	expectedBytes, _ := hex.DecodeString(ocspExtensionValueHex)
-	if !bytes.Equal(extensionBytes, expectedBytes) {
-		t.Errorf("response.Extensions[0]: got %x, want %x", extensionBytes, expectedBytes)
-	}
-}
-
-func TestOCSPSignature(t *testing.T) {
-	issuerCert, _ := hex.DecodeString(startComHex)
-	issuer, err := x509.ParseCertificate(issuerCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	response, _ := hex.DecodeString(ocspResponseHex)
-	if _, err := ParseResponse(response, issuer); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestOCSPRequest(t *testing.T) {
-	leafCert, _ := hex.DecodeString(leafCertHex)
-	cert, err := x509.ParseCertificate(leafCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	issuerCert, _ := hex.DecodeString(issuerCertHex)
-	issuer, err := x509.ParseCertificate(issuerCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	request, err := CreateRequest(cert, issuer, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expectedBytes, _ := hex.DecodeString(ocspRequestHex)
-	if !bytes.Equal(request, expectedBytes) {
-		t.Errorf("request: got %x, wanted %x", request, expectedBytes)
-	}
-
-	decodedRequest, err := ParseRequest(expectedBytes)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if decodedRequest.HashAlgorithm != crypto.SHA1 {
-		t.Errorf("request.HashAlgorithm: got %v, want %v", decodedRequest.HashAlgorithm, crypto.SHA1)
-	}
-
-	var publicKeyInfo struct {
-		Algorithm pkix.AlgorithmIdentifier
-		PublicKey asn1.BitString
-	}
-	_, err = asn1.Unmarshal(issuer.RawSubjectPublicKeyInfo, &publicKeyInfo)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	h := sha1.New()
-	h.Write(publicKeyInfo.PublicKey.RightAlign())
-	issuerKeyHash := h.Sum(nil)
-
-	h.Reset()
-	h.Write(issuer.RawSubject)
-	issuerNameHash := h.Sum(nil)
-
-	if got := decodedRequest.IssuerKeyHash; !bytes.Equal(got, issuerKeyHash) {
-		t.Errorf("request.IssuerKeyHash: got %x, want %x", got, issuerKeyHash)
-	}
-
-	if got := decodedRequest.IssuerNameHash; !bytes.Equal(got, issuerNameHash) {
-		t.Errorf("request.IssuerKeyHash: got %x, want %x", got, issuerNameHash)
-	}
-
-	if got := decodedRequest.SerialNumber; got.Cmp(cert.SerialNumber) != 0 {
-		t.Errorf("request.SerialNumber: got %x, want %x", got, cert.SerialNumber)
-	}
-
-	marshaledRequest, err := decodedRequest.Marshal()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if bytes.Compare(expectedBytes, marshaledRequest) != 0 {
-		t.Errorf(
-			"Marshaled request doesn't match expected: wanted %x, got %x",
-			expectedBytes,
-			marshaledRequest,
-		)
-	}
-}
-
-func TestOCSPResponse(t *testing.T) {
-	leafCert, _ := hex.DecodeString(leafCertHex)
-	leaf, err := x509.ParseCertificate(leafCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	issuerCert, _ := hex.DecodeString(issuerCertHex)
-	issuer, err := x509.ParseCertificate(issuerCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	responderCert, _ := hex.DecodeString(responderCertHex)
-	responder, err := x509.ParseCertificate(responderCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	responderPrivateKeyDER, _ := hex.DecodeString(responderPrivateKeyHex)
-	responderPrivateKey, err := x509.ParsePKCS1PrivateKey(responderPrivateKeyDER)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	extensionBytes, _ := hex.DecodeString(ocspExtensionValueHex)
-	extensions := []pkix.Extension{
-		pkix.Extension{
-			Id:       ocspExtensionOID,
-			Critical: false,
-			Value:    extensionBytes,
-		},
-	}
-
-	thisUpdate := time.Date(2010, 7, 7, 15, 1, 5, 0, time.UTC)
-	nextUpdate := time.Date(2010, 7, 7, 18, 35, 17, 0, time.UTC)
-	template := Response{
-		Status:           Revoked,
-		SerialNumber:     leaf.SerialNumber,
-		ThisUpdate:       thisUpdate,
-		NextUpdate:       nextUpdate,
-		RevokedAt:        thisUpdate,
-		RevocationReason: KeyCompromise,
-		Certificate:      responder,
-		ExtraExtensions:  extensions,
-	}
-
-	template.IssuerHash = crypto.MD5
-	_, err = CreateResponse(issuer, responder, template, responderPrivateKey)
-	if err == nil {
-		t.Fatal("CreateResponse didn't fail with non-valid template.IssuerHash value crypto.MD5")
-	}
-
-	testCases := []struct {
-		name       string
-		issuerHash crypto.Hash
-	}{
-		{"Zero value", 0},
-		{"crypto.SHA1", crypto.SHA1},
-		{"crypto.SHA256", crypto.SHA256},
-		{"crypto.SHA384", crypto.SHA384},
-		{"crypto.SHA512", crypto.SHA512},
-	}
-	for _, tc := range testCases {
-		t.Run(tc.name, func(t *testing.T) {
-			template.IssuerHash = tc.issuerHash
-			responseBytes, err := CreateResponse(issuer, responder, template, responderPrivateKey)
-			if err != nil {
-				t.Fatalf("CreateResponse failed: %s", err)
-			}
-
-			resp, err := ParseResponse(responseBytes, nil)
-			if err != nil {
-				t.Fatalf("ParseResponse failed: %s", err)
-			}
-
-			if !reflect.DeepEqual(resp.ThisUpdate, template.ThisUpdate) {
-				t.Errorf("resp.ThisUpdate: got %d, want %d", resp.ThisUpdate, template.ThisUpdate)
-			}
-
-			if !reflect.DeepEqual(resp.NextUpdate, template.NextUpdate) {
-				t.Errorf("resp.NextUpdate: got %d, want %d", resp.NextUpdate, template.NextUpdate)
-			}
-
-			if !reflect.DeepEqual(resp.RevokedAt, template.RevokedAt) {
-				t.Errorf("resp.RevokedAt: got %d, want %d", resp.RevokedAt, template.RevokedAt)
-			}
-
-			if !reflect.DeepEqual(resp.Extensions, template.ExtraExtensions) {
-				t.Errorf("resp.Extensions: got %v, want %v", resp.Extensions, template.ExtraExtensions)
-			}
-
-			delay := time.Since(resp.ProducedAt)
-			if delay < -time.Hour || delay > time.Hour {
-				t.Errorf("resp.ProducedAt: got %s, want close to current time (%s)", resp.ProducedAt, time.Now())
-			}
-
-			if resp.Status != template.Status {
-				t.Errorf("resp.Status: got %d, want %d", resp.Status, template.Status)
-			}
-
-			if resp.SerialNumber.Cmp(template.SerialNumber) != 0 {
-				t.Errorf("resp.SerialNumber: got %x, want %x", resp.SerialNumber, template.SerialNumber)
-			}
-
-			if resp.RevocationReason != template.RevocationReason {
-				t.Errorf("resp.RevocationReason: got %d, want %d", resp.RevocationReason, template.RevocationReason)
-			}
-
-			expectedHash := tc.issuerHash
-			if tc.issuerHash == 0 {
-				expectedHash = crypto.SHA1
-			}
-
-			if resp.IssuerHash != expectedHash {
-				t.Errorf("resp.IssuerHash: got %d, want %d", resp.IssuerHash, expectedHash)
-			}
-		})
-	}
-}
-
-func TestErrorResponse(t *testing.T) {
-	responseBytes, _ := hex.DecodeString(errorResponseHex)
-	_, err := ParseResponse(responseBytes, nil)
-
-	respErr, ok := err.(ResponseError)
-	if !ok {
-		t.Fatalf("expected ResponseError from ParseResponse but got %#v", err)
-	}
-	if respErr.Status != Malformed {
-		t.Fatalf("expected Malformed status from ParseResponse but got %d", respErr.Status)
-	}
-}
-
-func TestOCSPDecodeMultiResponse(t *testing.T) {
-	inclCert, _ := hex.DecodeString(ocspMultiResponseCertHex)
-	cert, err := x509.ParseCertificate(inclCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	responseBytes, _ := hex.DecodeString(ocspMultiResponseHex)
-	resp, err := ParseResponseForCert(responseBytes, cert, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if resp.SerialNumber.Cmp(cert.SerialNumber) != 0 {
-		t.Errorf("resp.SerialNumber: got %x, want %x", resp.SerialNumber, cert.SerialNumber)
-	}
-}
-
-func TestOCSPDecodeMultiResponseWithoutMatchingCert(t *testing.T) {
-	wrongCert, _ := hex.DecodeString(startComHex)
-	cert, err := x509.ParseCertificate(wrongCert)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	responseBytes, _ := hex.DecodeString(ocspMultiResponseHex)
-	_, err = ParseResponseForCert(responseBytes, cert, nil)
-	want := ParseError("no response matching the supplied certificate")
-	if err != want {
-		t.Errorf("err: got %q, want %q", err, want)
-	}
-}
-
-// This OCSP response was taken from Thawte's public OCSP responder.
-// To recreate:
-//   $ openssl s_client -tls1 -showcerts -servername www.google.com -connect www.google.com:443
-// Copy and paste the first certificate into /tmp/cert.crt and the second into
-// /tmp/intermediate.crt
-//   $ openssl ocsp -issuer /tmp/intermediate.crt -cert /tmp/cert.crt -url http://ocsp.thawte.com -resp_text -respout /tmp/ocsp.der
-// Then hex encode the result:
-//   $ python -c 'print file("/tmp/ocsp.der", "r").read().encode("hex")'
-
-const ocspResponseHex = "308206bc0a0100a08206b5308206b106092b0601050507300101048206a23082069e3081" +
-	"c9a14e304c310b300906035504061302494c31163014060355040a130d5374617274436f" +
-	"6d204c74642e312530230603550403131c5374617274436f6d20436c6173732031204f43" +
-	"5350205369676e6572180f32303130303730373137333531375a30663064303c30090605" +
-	"2b0e03021a050004146568874f40750f016a3475625e1f5c93e5a26d580414eb4234d098" +
-	"b0ab9ff41b6b08f7cc642eef0e2c45020301d0fa8000180f323031303037303731353031" +
-	"30355aa011180f32303130303730373138333531375a300d06092a864886f70d01010505" +
-	"000382010100ab557ff070d1d7cebbb5f0ec91a15c3fed22eb2e1b8244f1b84545f013a4" +
-	"fb46214c5e3fbfbebb8a56acc2b9db19f68fd3c3201046b3824d5ba689f99864328710cb" +
-	"467195eb37d84f539e49f859316b32964dc3e47e36814ce94d6c56dd02733b1d0802f7ff" +
-	"4eebdbbd2927dcf580f16cbc290f91e81b53cb365e7223f1d6e20a88ea064104875e0145" +
-	"672b20fc14829d51ca122f5f5d77d3ad6c83889c55c7dc43680ba2fe3cef8b05dbcabdc0" +
-	"d3e09aaf9725597f8c858c2fa38c0d6aed2e6318194420dd1a1137445d13e1c97ab47896" +
-	"17a4e08925f46f867b72e3a4dc1f08cb870b2b0717f7207faa0ac512e628a029aba7457a" +
-	"e63dcf3281e2162d9349a08204ba308204b6308204b23082039aa003020102020101300d" +
-	"06092a864886f70d010105050030818c310b300906035504061302494c31163014060355" +
-	"040a130d5374617274436f6d204c74642e312b3029060355040b13225365637572652044" +
-	"69676974616c204365727469666963617465205369676e696e6731383036060355040313" +
-	"2f5374617274436f6d20436c6173732031205072696d61727920496e7465726d65646961" +
-	"746520536572766572204341301e170d3037313032353030323330365a170d3132313032" +
-	"333030323330365a304c310b300906035504061302494c31163014060355040a130d5374" +
-	"617274436f6d204c74642e312530230603550403131c5374617274436f6d20436c617373" +
-	"2031204f435350205369676e657230820122300d06092a864886f70d0101010500038201" +
-	"0f003082010a0282010100b9561b4c45318717178084e96e178df2255e18ed8d8ecc7c2b" +
-	"7b51a6c1c2e6bf0aa3603066f132fe10ae97b50e99fa24b83fc53dd2777496387d14e1c3" +
-	"a9b6a4933e2ac12413d085570a95b8147414a0bc007c7bcf222446ef7f1a156d7ea1c577" +
-	"fc5f0facdfd42eb0f5974990cb2f5cefebceef4d1bdc7ae5c1075c5a99a93171f2b0845b" +
-	"4ff0864e973fcfe32f9d7511ff87a3e943410c90a4493a306b6944359340a9ca96f02b66" +
-	"ce67f028df2980a6aaee8d5d5d452b8b0eb93f923cc1e23fcccbdbe7ffcb114d08fa7a6a" +
-	"3c404f825d1a0e715935cf623a8c7b59670014ed0622f6089a9447a7a19010f7fe58f841" +
-	"29a2765ea367824d1c3bb2fda308530203010001a382015c30820158300c0603551d1301" +
-	"01ff04023000300b0603551d0f0404030203a8301e0603551d250417301506082b060105" +
-	"0507030906092b0601050507300105301d0603551d0e0416041445e0a36695414c5dd449" +
-	"bc00e33cdcdbd2343e173081a80603551d230481a030819d8014eb4234d098b0ab9ff41b" +
-	"6b08f7cc642eef0e2c45a18181a47f307d310b300906035504061302494c311630140603" +
-	"55040a130d5374617274436f6d204c74642e312b3029060355040b132253656375726520" +
-	"4469676974616c204365727469666963617465205369676e696e67312930270603550403" +
-	"13205374617274436f6d2043657274696669636174696f6e20417574686f726974798201" +
-	"0a30230603551d12041c301a8618687474703a2f2f7777772e737461727473736c2e636f" +
-	"6d2f302c06096086480186f842010d041f161d5374617274436f6d205265766f63617469" +
-	"6f6e20417574686f72697479300d06092a864886f70d01010505000382010100182d2215" +
-	"8f0fc0291324fa8574c49bb8ff2835085adcbf7b7fc4191c397ab6951328253fffe1e5ec" +
-	"2a7da0d50fca1a404e6968481366939e666c0a6209073eca57973e2fefa9ed1718e8176f" +
-	"1d85527ff522c08db702e3b2b180f1cbff05d98128252cf0f450f7dd2772f4188047f19d" +
-	"c85317366f94bc52d60f453a550af58e308aaab00ced33040b62bf37f5b1ab2a4f7f0f80" +
-	"f763bf4d707bc8841d7ad9385ee2a4244469260b6f2bf085977af9074796048ecc2f9d48" +
-	"a1d24ce16e41a9941568fec5b42771e118f16c106a54ccc339a4b02166445a167902e75e" +
-	"6d8620b0825dcd18a069b90fd851d10fa8effd409deec02860d26d8d833f304b10669b42"
-
-const startComResponderCertHex = "308204b23082039aa003020102020101300d06092a864886f70d010105050030818c310b" +
-	"300906035504061302494c31163014060355040a130d5374617274436f6d204c74642e31" +
-	"2b3029060355040b1322536563757265204469676974616c204365727469666963617465" +
-	"205369676e696e67313830360603550403132f5374617274436f6d20436c617373203120" +
-	"5072696d61727920496e7465726d65646961746520536572766572204341301e170d3037" +
-	"313032353030323330365a170d3132313032333030323330365a304c310b300906035504" +
-	"061302494c31163014060355040a130d5374617274436f6d204c74642e31253023060355" +
-	"0403131c5374617274436f6d20436c6173732031204f435350205369676e657230820122" +
-	"300d06092a864886f70d01010105000382010f003082010a0282010100b9561b4c453187" +
-	"17178084e96e178df2255e18ed8d8ecc7c2b7b51a6c1c2e6bf0aa3603066f132fe10ae97" +
-	"b50e99fa24b83fc53dd2777496387d14e1c3a9b6a4933e2ac12413d085570a95b8147414" +
-	"a0bc007c7bcf222446ef7f1a156d7ea1c577fc5f0facdfd42eb0f5974990cb2f5cefebce" +
-	"ef4d1bdc7ae5c1075c5a99a93171f2b0845b4ff0864e973fcfe32f9d7511ff87a3e94341" +
-	"0c90a4493a306b6944359340a9ca96f02b66ce67f028df2980a6aaee8d5d5d452b8b0eb9" +
-	"3f923cc1e23fcccbdbe7ffcb114d08fa7a6a3c404f825d1a0e715935cf623a8c7b596700" +
-	"14ed0622f6089a9447a7a19010f7fe58f84129a2765ea367824d1c3bb2fda30853020301" +
-	"0001a382015c30820158300c0603551d130101ff04023000300b0603551d0f0404030203" +
-	"a8301e0603551d250417301506082b0601050507030906092b0601050507300105301d06" +
-	"03551d0e0416041445e0a36695414c5dd449bc00e33cdcdbd2343e173081a80603551d23" +
-	"0481a030819d8014eb4234d098b0ab9ff41b6b08f7cc642eef0e2c45a18181a47f307d31" +
-	"0b300906035504061302494c31163014060355040a130d5374617274436f6d204c74642e" +
-	"312b3029060355040b1322536563757265204469676974616c2043657274696669636174" +
-	"65205369676e696e6731293027060355040313205374617274436f6d2043657274696669" +
-	"636174696f6e20417574686f7269747982010a30230603551d12041c301a861868747470" +
-	"3a2f2f7777772e737461727473736c2e636f6d2f302c06096086480186f842010d041f16" +
-	"1d5374617274436f6d205265766f636174696f6e20417574686f72697479300d06092a86" +
-	"4886f70d01010505000382010100182d22158f0fc0291324fa8574c49bb8ff2835085adc" +
-	"bf7b7fc4191c397ab6951328253fffe1e5ec2a7da0d50fca1a404e6968481366939e666c" +
-	"0a6209073eca57973e2fefa9ed1718e8176f1d85527ff522c08db702e3b2b180f1cbff05" +
-	"d98128252cf0f450f7dd2772f4188047f19dc85317366f94bc52d60f453a550af58e308a" +
-	"aab00ced33040b62bf37f5b1ab2a4f7f0f80f763bf4d707bc8841d7ad9385ee2a4244469" +
-	"260b6f2bf085977af9074796048ecc2f9d48a1d24ce16e41a9941568fec5b42771e118f1" +
-	"6c106a54ccc339a4b02166445a167902e75e6d8620b0825dcd18a069b90fd851d10fa8ef" +
-	"fd409deec02860d26d8d833f304b10669b42"
-
-const startComHex = "308206343082041ca003020102020118300d06092a864886f70d0101050500307d310b30" +
-	"0906035504061302494c31163014060355040a130d5374617274436f6d204c74642e312b" +
-	"3029060355040b1322536563757265204469676974616c20436572746966696361746520" +
-	"5369676e696e6731293027060355040313205374617274436f6d20436572746966696361" +
-	"74696f6e20417574686f72697479301e170d3037313032343230353431375a170d313731" +
-	"3032343230353431375a30818c310b300906035504061302494c31163014060355040a13" +
-	"0d5374617274436f6d204c74642e312b3029060355040b13225365637572652044696769" +
-	"74616c204365727469666963617465205369676e696e67313830360603550403132f5374" +
-	"617274436f6d20436c6173732031205072696d61727920496e7465726d65646961746520" +
-	"53657276657220434130820122300d06092a864886f70d01010105000382010f00308201" +
-	"0a0282010100b689c6acef09527807ac9263d0f44418188480561f91aee187fa3250b4d3" +
-	"4706f0e6075f700e10f71dc0ce103634855a0f92ac83c6ac58523fba38e8fce7a724e240" +
-	"a60876c0926e9e2a6d4d3f6e61200adb59ded27d63b33e46fefa215118d7cd30a6ed076e" +
-	"3b7087b4f9faebee823c056f92f7a4dc0a301e9373fe07cad75f809d225852ae06da8b87" +
-	"2369b0e42ad8ea83d2bdf371db705a280faf5a387045123f304dcd3baf17e50fcba0a95d" +
-	"48aab16150cb34cd3c5cc30be810c08c9bf0030362feb26c3e720eee1c432ac9480e5739" +
-	"c43121c810c12c87fe5495521f523c31129b7fe7c0a0a559d5e28f3ef0d5a8e1d77031a9" +
-	"c4b3cfaf6d532f06f4a70203010001a38201ad308201a9300f0603551d130101ff040530" +
-	"030101ff300e0603551d0f0101ff040403020106301d0603551d0e04160414eb4234d098" +
-	"b0ab9ff41b6b08f7cc642eef0e2c45301f0603551d230418301680144e0bef1aa4405ba5" +
-	"17698730ca346843d041aef2306606082b06010505070101045a3058302706082b060105" +
-	"05073001861b687474703a2f2f6f6373702e737461727473736c2e636f6d2f6361302d06" +
-	"082b060105050730028621687474703a2f2f7777772e737461727473736c2e636f6d2f73" +
-	"667363612e637274305b0603551d1f045430523027a025a0238621687474703a2f2f7777" +
-	"772e737461727473736c2e636f6d2f73667363612e63726c3027a025a023862168747470" +
-	"3a2f2f63726c2e737461727473736c2e636f6d2f73667363612e63726c3081800603551d" +
-	"20047930773075060b2b0601040181b5370102013066302e06082b060105050702011622" +
-	"687474703a2f2f7777772e737461727473736c2e636f6d2f706f6c6963792e7064663034" +
-	"06082b060105050702011628687474703a2f2f7777772e737461727473736c2e636f6d2f" +
-	"696e7465726d6564696174652e706466300d06092a864886f70d01010505000382020100" +
-	"2109493ea5886ee00b8b48da314d8ff75657a2e1d36257e9b556f38545753be5501f048b" +
-	"e6a05a3ee700ae85d0fbff200364cbad02e1c69172f8a34dd6dee8cc3fa18aa2e37c37a7" +
-	"c64f8f35d6f4d66e067bdd21d9cf56ffcb302249fe8904f385e5aaf1e71fe875904dddf9" +
-	"46f74234f745580c110d84b0c6da5d3ef9019ee7e1da5595be741c7bfc4d144fac7e5547" +
-	"7d7bf4a50d491e95e8f712c1ccff76a62547d0f37535be97b75816ebaa5c786fec5330af" +
-	"ea044dcca902e3f0b60412f630b1113d904e5664d7dc3c435f7339ef4baf87ebf6fe6888" +
-	"4472ead207c669b0c1a18bef1749d761b145485f3b2021e95bb2ccf4d7e931f50b15613b" +
-	"7a94e3ebd9bc7f94ae6ae3626296a8647cb887f399327e92a252bebbf865cfc9f230fc8b" +
-	"c1c2a696d75f89e15c3480f58f47072fb491bfb1a27e5f4b5ad05b9f248605515a690365" +
-	"434971c5e06f94346bf61bd8a9b04c7e53eb8f48dfca33b548fa364a1a53a6330cd089cd" +
-	"4915cd89313c90c072d7654b52358a461144b93d8e2865a63e799e5c084429adb035112e" +
-	"214eb8d2e7103e5d8483b3c3c2e4d2c6fd094b7409ddf1b3d3193e800da20b19f038e7c5" +
-	"c2afe223db61e29d5c6e2089492e236ab262c145b49faf8ba7f1223bf87de290d07a19fb" +
-	"4a4ce3d27d5f4a8303ed27d6239e6b8db459a2d9ef6c8229dd75193c3f4c108defbb7527" +
-	"d2ae83a7a8ce5ba7"
-
-const ocspResponseWithoutCertHex = "308201d40a0100a08201cd308201c906092b0601050507300101048201ba3082" +
-	"01b630819fa2160414884451ff502a695e2d88f421bad90cf2cecbea7c180f3230313330" +
-	"3631383037323434335a30743072304a300906052b0e03021a0500041448b60d38238df8" +
-	"456e4ee5843ea394111802979f0414884451ff502a695e2d88f421bad90cf2cecbea7c02" +
-	"1100f78b13b946fc9635d8ab49de9d2148218000180f3230313330363138303732343433" +
-	"5aa011180f32303133303632323037323434335a300d06092a864886f70d010105050003" +
-	"82010100103e18b3d297a5e7a6c07a4fc52ac46a15c0eba96f3be17f0ffe84de5b8c8e05" +
-	"5a8f577586a849dc4abd6440eb6fedde4622451e2823c1cbf3558b4e8184959c9fe96eff" +
-	"8bc5f95866c58c6d087519faabfdae37e11d9874f1bc0db292208f645dd848185e4dd38b" +
-	"6a8547dfa7b74d514a8470015719064d35476b95bebb03d4d2845c5ca15202d2784878f2" +
-	"0f904c24f09736f044609e9c271381713400e563023d212db422236440c6f377bbf24b2b" +
-	"9e7dec8698e36a8df68b7592ad3489fb2937afb90eb85d2aa96b81c94c25057dbd4759d9" +
-	"20a1a65c7f0b6427a224b3c98edd96b9b61f706099951188b0289555ad30a216fb774651" +
-	"5a35fca2e054dfa8"
-
-// PKIX nonce extension
-var ocspExtensionOID = asn1.ObjectIdentifier{1, 3, 6, 1, 5, 5, 7, 48, 1, 2}
-var ocspExtensionValueHex = "0403000000"
-
-const ocspResponseWithCriticalExtensionHex = "308204fe0a0100a08204f7308204f306092b0601050507300101048204e4308204e03081" +
-	"dba003020100a11b3019311730150603550403130e4f43535020526573706f6e64657218" +
-	"0f32303136303130343137303130305a3081a53081a23049300906052b0e03021a050004" +
-	"14c0fe0278fc99188891b3f212e9c7e1b21ab7bfc004140dfc1df0a9e0f01ce7f2b21317" +
-	"7e6f8d157cd4f60210017f77deb3bcbb235d44ccc7dba62e72a116180f32303130303730" +
-	"373135303130355aa0030a0101180f32303130303730373135303130355aa011180f3230" +
-	"3130303730373138333531375aa1193017301506092b06010505073001020101ff040504" +
-	"03000000300d06092a864886f70d01010b0500038201010031c730ca60a7a0d92d8e4010" +
-	"911b469de95b4d27e89de6537552436237967694f76f701cf6b45c932bd308bca4a8d092" +
-	"5c604ba94796903091d9e6c000178e72c1f0a24a277dd262835af5d17d3f9d7869606c9f" +
-	"e7c8e708a41645699895beee38bfa63bb46296683761c5d1d65439b8ab868dc3017c9eeb" +
-	"b70b82dbf3a31c55b457d48bb9e82b335ed49f445042eaf606b06a3e0639824924c89c63" +
-	"eccddfe85e6694314138b2536f5e15e07085d0f6e26d4b2f8244bab0d70de07283ac6384" +
-	"a0501fc3dea7cf0adfd4c7f34871080900e252ddc403e3f0265f2a704af905d3727504ed" +
-	"28f3214a219d898a022463c78439799ca81c8cbafdbcec34ea937cd6a08202ea308202e6" +
-	"308202e2308201caa003020102020101300d06092a864886f70d01010b05003019311730" +
-	"150603550403130e4f43535020526573706f6e646572301e170d31353031333031353530" +
-	"33335a170d3136303133303135353033335a3019311730150603550403130e4f43535020" +
-	"526573706f6e64657230820122300d06092a864886f70d01010105000382010f00308201" +
-	"0a0282010100e8155f2d3e6f2e8d14c62a788bd462f9f844e7a6977c83ef1099f0f6616e" +
-	"c5265b56f356e62c5400f0b06a2e7945a82752c636df32a895152d6074df1701dc6ccfbc" +
-	"bec75a70bd2b55ae2be7e6cad3b5fd4cd5b7790ab401a436d3f5f346074ffde8a99d5b72" +
-	"3350f0a112076614b12ef79c78991b119453445acf2416ab0046b540db14c9fc0f27b898" +
-	"9ad0f63aa4b8aefc91aa8a72160c36307c60fec78a93d3fddf4259902aa77e7332971c7d" +
-	"285b6a04f648993c6922a3e9da9adf5f81508c3228791843e5d49f24db2f1290bafd97e6" +
-	"55b1049a199f652cd603c4fafa330c390b0da78fbbc67e8fa021cbd74eb96222b12ace31" +
-	"a77dcf920334dc94581b0203010001a3353033300e0603551d0f0101ff04040302078030" +
-	"130603551d25040c300a06082b06010505070309300c0603551d130101ff04023000300d" +
-	"06092a864886f70d01010b05000382010100718012761b5063e18f0dc44644d8e6ab8612" +
-	"31c15fd5357805425d82aec1de85bf6d3e30fce205e3e3b8b795bbe52e40a439286d2288" +
-	"9064f4aeeb150359b9425f1da51b3a5c939018555d13ac42c565a0603786a919328f3267" +
-	"09dce52c22ad958ecb7873b9771d1148b1c4be2efe80ba868919fc9f68b6090c2f33c156" +
-	"d67156e42766a50b5d51e79637b7e58af74c2a951b1e642fa7741fec982cc937de37eff5" +
-	"9e2005d5939bfc031589ca143e6e8ab83f40ee08cc20a6b4a95a318352c28d18528dcaf9" +
-	"66705de17afa19d6e8ae91ddf33179d16ebb6ac2c69cae8373d408ebf8c55308be6c04d9" +
-	"3a25439a94299a65a709756c7a3e568be049d5c38839"
-
-const ocspResponseWithExtensionHex = "308204fb0a0100a08204f4308204f006092b0601050507300101048204e1308204dd3081" +
-	"d8a003020100a11b3019311730150603550403130e4f43535020526573706f6e64657218" +
-	"0f32303136303130343136353930305a3081a230819f3049300906052b0e03021a050004" +
-	"14c0fe0278fc99188891b3f212e9c7e1b21ab7bfc004140dfc1df0a9e0f01ce7f2b21317" +
-	"7e6f8d157cd4f60210017f77deb3bcbb235d44ccc7dba62e72a116180f32303130303730" +
-	"373135303130355aa0030a0101180f32303130303730373135303130355aa011180f3230" +
-	"3130303730373138333531375aa1163014301206092b0601050507300102040504030000" +
-	"00300d06092a864886f70d01010b05000382010100c09a33e0b2324c852421bb83f85ac9" +
-	"9113f5426012bd2d2279a8166e9241d18a33c870894250622ffc7ed0c4601b16d624f90b" +
-	"779265442cdb6868cf40ab304ab4b66e7315ed02cf663b1601d1d4751772b31bc299db23" +
-	"9aebac78ed6797c06ed815a7a8d18d63cfbb609cafb47ec2e89e37db255216eb09307848" +
-	"d01be0a3e943653c78212b96ff524b74c9ec456b17cdfb950cc97645c577b2e09ff41dde" +
-	"b03afb3adaa381cc0f7c1d95663ef22a0f72f2c45613ae8e2b2d1efc96e8463c7d1d8a1d" +
-	"7e3b35df8fe73a301fc3f804b942b2b3afa337ff105fc1462b7b1c1d75eb4566c8665e59" +
-	"f80393b0adbf8004ff6c3327ed34f007cb4a3348a7d55e06e3a08202ea308202e6308202" +
-	"e2308201caa003020102020101300d06092a864886f70d01010b05003019311730150603" +
-	"550403130e4f43535020526573706f6e646572301e170d3135303133303135353033335a" +
-	"170d3136303133303135353033335a3019311730150603550403130e4f43535020526573" +
-	"706f6e64657230820122300d06092a864886f70d01010105000382010f003082010a0282" +
-	"010100e8155f2d3e6f2e8d14c62a788bd462f9f844e7a6977c83ef1099f0f6616ec5265b" +
-	"56f356e62c5400f0b06a2e7945a82752c636df32a895152d6074df1701dc6ccfbcbec75a" +
-	"70bd2b55ae2be7e6cad3b5fd4cd5b7790ab401a436d3f5f346074ffde8a99d5b723350f0" +
-	"a112076614b12ef79c78991b119453445acf2416ab0046b540db14c9fc0f27b8989ad0f6" +
-	"3aa4b8aefc91aa8a72160c36307c60fec78a93d3fddf4259902aa77e7332971c7d285b6a" +
-	"04f648993c6922a3e9da9adf5f81508c3228791843e5d49f24db2f1290bafd97e655b104" +
-	"9a199f652cd603c4fafa330c390b0da78fbbc67e8fa021cbd74eb96222b12ace31a77dcf" +
-	"920334dc94581b0203010001a3353033300e0603551d0f0101ff04040302078030130603" +
-	"551d25040c300a06082b06010505070309300c0603551d130101ff04023000300d06092a" +
-	"864886f70d01010b05000382010100718012761b5063e18f0dc44644d8e6ab861231c15f" +
-	"d5357805425d82aec1de85bf6d3e30fce205e3e3b8b795bbe52e40a439286d22889064f4" +
-	"aeeb150359b9425f1da51b3a5c939018555d13ac42c565a0603786a919328f326709dce5" +
-	"2c22ad958ecb7873b9771d1148b1c4be2efe80ba868919fc9f68b6090c2f33c156d67156" +
-	"e42766a50b5d51e79637b7e58af74c2a951b1e642fa7741fec982cc937de37eff59e2005" +
-	"d5939bfc031589ca143e6e8ab83f40ee08cc20a6b4a95a318352c28d18528dcaf966705d" +
-	"e17afa19d6e8ae91ddf33179d16ebb6ac2c69cae8373d408ebf8c55308be6c04d93a2543" +
-	"9a94299a65a709756c7a3e568be049d5c38839"
-
-const ocspMultiResponseHex = "30820ee60a0100a0820edf30820edb06092b060105050730010104820ecc30820ec83082" +
-	"0839a216041445ac2ecd75f53f1cf6e4c51d3de0047ad0aa7465180f3230313530363032" +
-	"3130303033305a3082080c3065303d300906052b0e03021a05000414f7452a0080601527" +
-	"72e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f0204" +
-	"5456656a8000180f32303135303630323039303230375aa011180f323031353036303331" +
-	"30303033305a3065303d300906052b0e03021a05000414f7452a008060152772e4a135e7" +
-	"6e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f02045456656b80" +
-	"00180f32303135303630323039303230375aa011180f3230313530363033313030303330" +
-	"5a3065303d300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0" +
-	"f1580414edd8f2ee977252853a330b297a18f5c993853b3f02045456656c8000180f3230" +
-	"3135303630323039303230375aa011180f32303135303630333130303033305a3065303d" +
-	"300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f1580414ed" +
-	"d8f2ee977252853a330b297a18f5c993853b3f02045456656d8000180f32303135303630" +
-	"323039303230375aa011180f32303135303630333130303033305a3065303d300906052b" +
-	"0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee9772" +
-	"52853a330b297a18f5c993853b3f02045456656e8000180f323031353036303230393032" +
-	"30375aa011180f32303135303630333130303033305a3065303d300906052b0e03021a05" +
-	"000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b" +
-	"297a18f5c993853b3f02045456656f8000180f32303135303630323039303230375aa011" +
-	"180f32303135303630333130303033305a3065303d300906052b0e03021a05000414f745" +
-	"2a008060152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c9" +
-	"93853b3f0204545665708000180f32303135303630323039303230375aa011180f323031" +
-	"35303630333130303033305a3065303d300906052b0e03021a05000414f7452a00806015" +
-	"2772e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f02" +
-	"04545665718000180f32303135303630323039303230375aa011180f3230313530363033" +
-	"3130303033305a3065303d300906052b0e03021a05000414f7452a008060152772e4a135" +
-	"e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f020454566572" +
-	"8000180f32303135303630323039303230375aa011180f32303135303630333130303033" +
-	"305a3065303d300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52fd" +
-	"e0f1580414edd8f2ee977252853a330b297a18f5c993853b3f0204545665738000180f32" +
-	"303135303630323039303230375aa011180f32303135303630333130303033305a306530" +
-	"3d300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f1580414" +
-	"edd8f2ee977252853a330b297a18f5c993853b3f0204545665748000180f323031353036" +
-	"30323039303230375aa011180f32303135303630333130303033305a3065303d30090605" +
-	"2b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee97" +
-	"7252853a330b297a18f5c993853b3f0204545665758000180f3230313530363032303930" +
-	"3230375aa011180f32303135303630333130303033305a3065303d300906052b0e03021a" +
-	"05000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a33" +
-	"0b297a18f5c993853b3f0204545665768000180f32303135303630323039303230375aa0" +
-	"11180f32303135303630333130303033305a3065303d300906052b0e03021a05000414f7" +
-	"452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5" +
-	"c993853b3f0204545665778000180f32303135303630323039303230375aa011180f3230" +
-	"3135303630333130303033305a3065303d300906052b0e03021a05000414f7452a008060" +
-	"152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f" +
-	"0204545665788000180f32303135303630323039303230375aa011180f32303135303630" +
-	"333130303033305a3065303d300906052b0e03021a05000414f7452a008060152772e4a1" +
-	"35e76e9e52fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f0204545665" +
-	"798000180f32303135303630323039303230375aa011180f323031353036303331303030" +
-	"33305a3065303d300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52" +
-	"fde0f1580414edd8f2ee977252853a330b297a18f5c993853b3f02045456657a8000180f" +
-	"32303135303630323039303230375aa011180f32303135303630333130303033305a3065" +
-	"303d300906052b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f15804" +
-	"14edd8f2ee977252853a330b297a18f5c993853b3f02045456657b8000180f3230313530" +
-	"3630323039303230375aa011180f32303135303630333130303033305a3065303d300906" +
-	"052b0e03021a05000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee" +
-	"977252853a330b297a18f5c993853b3f02045456657c8000180f32303135303630323039" +
-	"303230375aa011180f32303135303630333130303033305a3065303d300906052b0e0302" +
-	"1a05000414f7452a008060152772e4a135e76e9e52fde0f1580414edd8f2ee977252853a" +
-	"330b297a18f5c993853b3f02045456657d8000180f32303135303630323039303230375a" +
-	"a011180f32303135303630333130303033305a300d06092a864886f70d01010505000382" +
-	"01010016b73b92859979f27d15eb018cf069eed39c3d280213565f3026de11ba15bdb94d" +
-	"764cf2d0fdd204ef926c588d7b183483c8a2b1995079c7ed04dcefcc650c1965be4b6832" +
-	"a8839e832f7f60f638425eccdf9bc3a81fbe700fda426ddf4f06c29bee431bbbe81effda" +
-	"a60b7da5b378f199af2f3c8380be7ba6c21c8e27124f8a4d8989926aea19055700848d33" +
-	"799e833512945fd75364edbd2dd18b783c1e96e332266b17979a0b88c35b43f47c87c493" +
-	"19155056ad8dbbae5ff2afad3c0e1c69ed111206ffda49875e8e4efc0926264823bc4423" +
-	"c8a002f34288c4bc22516f98f54fc609943721f590ddd8d24f989457526b599b0eb75cb5" +
-	"a80da1ad93a621a08205733082056f3082056b30820453a0030201020204545638c4300d" +
-	"06092a864886f70d01010b0500308182310b300906035504061302555331183016060355" +
-	"040a130f552e532e20476f7665726e6d656e7431233021060355040b131a446570617274" +
-	"6d656e74206f662074686520547265617375727931223020060355040b13194365727469" +
-	"6669636174696f6e20417574686f7269746965733110300e060355040b13074f43494f20" +
-	"4341301e170d3135303332303131353531335a170d3135303633303034303030305a3081" +
-	"98310b300906035504061302555331183016060355040a130f552e532e20476f7665726e" +
-	"6d656e7431233021060355040b131a4465706172746d656e74206f662074686520547265" +
-	"617375727931223020060355040b131943657274696669636174696f6e20417574686f72" +
-	"69746965733110300e060355040b13074f43494f204341311430120603550403130b4f43" +
-	"5350205369676e657230820122300d06092a864886f70d01010105000382010f00308201" +
-	"0a0282010100c1b6fe1ba1ad50bb98c855811acbd67fe68057f48b8e08d3800e7f2c51b7" +
-	"9e20551934971fd92b9c9e6c49453097927cba83a94c0b2fea7124ba5ac442b38e37dba6" +
-	"7303d4962dd7d92b22a04b0e0e182e9ea67620b1c6ce09ee607c19e0e6e3adae81151db1" +
-	"2bb7f706149349a292e21c1eb28565b6839df055e1a838a772ff34b5a1452618e2c26042" +
-	"705d53f0af4b57aae6163f58216af12f3887813fe44b0321827b3a0c52b0e47d0aab94a2" +
-	"f768ab0ba3901d22f8bb263823090b0e37a7f8856db4b0d165c42f3aa7e94f5f6ce1855e" +
-	"98dc57adea0ae98ad39f67ecdec00b88685566e9e8d69f6cefb6ddced53015d0d3b862bc" +
-	"be21f3d72251eefcec730203010001a38201cf308201cb300e0603551d0f0101ff040403" +
-	"020780306b0603551d2004643062300c060a60864801650302010502300c060a60864801" +
-	"650302010503300c060a60864801650302010504300c060a60864801650302010507300c" +
-	"060a60864801650302010508300c060a6086480165030201030d300c060a608648016503" +
-	"020103113081e506082b060105050701010481d83081d5303006082b0601050507300286" +
-	"24687474703a2f2f706b692e74726561732e676f762f746f63615f65655f6169612e7037" +
-	"633081a006082b060105050730028681936c6461703a2f2f6c6461702e74726561732e67" +
-	"6f762f6f753d4f43494f25323043412c6f753d43657274696669636174696f6e25323041" +
-	"7574686f7269746965732c6f753d4465706172746d656e742532306f6625323074686525" +
-	"323054726561737572792c6f3d552e532e253230476f7665726e6d656e742c633d55533f" +
-	"634143657274696669636174653b62696e61727930130603551d25040c300a06082b0601" +
-	"0505070309300f06092b060105050730010504020500301f0603551d23041830168014a2" +
-	"13a8e5c607546c243d4eb72b27a2a7711ab5af301d0603551d0e0416041451f98046818a" +
-	"e46d953ac90c210ccfaa1a06980c300d06092a864886f70d01010b050003820101003a37" +
-	"0b301d14ffdeb370883639bec5ae6f572dcbddadd672af16ee2a8303316b14e1fbdca8c2" +
-	"8f4bad9c7b1410250e149c14e9830ca6f17370a8d13151205d956e28c141cc0500379596" +
-	"c5b9239fcfa3d2de8f1d4f1a2b1bf2d1851bed1c86012ee8135bdc395cd4496ce69fadd0" +
-	"3b682b90350ca7b4f458190b7a0ab5c33a04cf1347a77d541877a380a4c94988c5658908" +
-	"44fdc22637a72b9fa410333e2caf969477f9fe07f50e3681c204fb3bf073b9da01cd8d91" +
-	"8044c40b1159955af12a3263ab1d34119d7f59bfa6cae88ed058addc4e08250263f8f836" +
-	"2f5bdffd45636fea7474c60a55c535954477b2f286e1b2535f0dd12c162f1b353c370e08" +
-	"be67"
-
-const ocspMultiResponseCertHex = "308207943082067ca003020102020454566573300d06092a864886f70d01010b05003081" +
-	"82310b300906035504061302555331183016060355040a130f552e532e20476f7665726e" +
-	"6d656e7431233021060355040b131a4465706172746d656e74206f662074686520547265" +
-	"617375727931223020060355040b131943657274696669636174696f6e20417574686f72" +
-	"69746965733110300e060355040b13074f43494f204341301e170d313530343130313535" +
-	"3733385a170d3138303431303136323733385a30819d310b300906035504061302555331" +
-	"183016060355040a130f552e532e20476f7665726e6d656e7431233021060355040b131a" +
-	"4465706172746d656e74206f662074686520547265617375727931253023060355040b13" +
-	"1c427572656175206f66207468652046697363616c20536572766963653110300e060355" +
-	"040b130744657669636573311630140603550403130d706b692e74726561732e676f7630" +
-	"820122300d06092a864886f70d01010105000382010f003082010a0282010100c7273623" +
-	"8c49c48bf501515a2490ef6e5ae0c06e0ad2aa9a6bb77f3d0370d846b2571581ebf38fd3" +
-	"1948daad3dec7a4da095f1dcbe9654e65bcf7acdfd4ee802421dad9b90536c721d2bca58" +
-	"8413e6bfd739a72470560bb7d64f9a09284f90ff8af1d5a3c5c84d0f95a00f9c6d988dd0" +
-	"d87f1d0d3344580901c955139f54d09de0acdbd3322b758cb0c58881bf04913243401f44" +
-	"013fd9f6d8348044cc8bb0a71978ad93366b2a4687a5274b2ee07d0fb40225453eb244ed" +
-	"b20152251ac77c59455260ff07eeceb3cb3c60fb8121cf92afd3daa2a4650e1942ccb555" +
-	"de10b3d481feb299838ef05d0fd1810b146753472ae80da65dd34da25ca1f89971f10039" +
-	"0203010001a38203f3308203ef300e0603551d0f0101ff0404030205a030170603551d20" +
-	"0410300e300c060a60864801650302010503301106096086480186f84201010404030206" +
-	"4030130603551d25040c300a06082b060105050703013082010806082b06010505070101" +
-	"0481fb3081f8303006082b060105050730028624687474703a2f2f706b692e7472656173" +
-	"2e676f762f746f63615f65655f6169612e7037633081a006082b06010505073002868193" +
-	"6c6461703a2f2f6c6461702e74726561732e676f762f6f753d4f43494f25323043412c6f" +
-	"753d43657274696669636174696f6e253230417574686f7269746965732c6f753d446570" +
-	"6172746d656e742532306f6625323074686525323054726561737572792c6f3d552e532e" +
-	"253230476f7665726e6d656e742c633d55533f634143657274696669636174653b62696e" +
-	"617279302106082b060105050730018615687474703a2f2f6f6373702e74726561732e67" +
-	"6f76307b0603551d1104743072811c6373612d7465616d4066697363616c2e7472656173" +
-	"7572792e676f768210706b692e74726561737572792e676f768210706b692e64696d632e" +
-	"6468732e676f76820d706b692e74726561732e676f76811f6563622d686f7374696e6740" +
-	"66697363616c2e74726561737572792e676f76308201890603551d1f048201803082017c" +
-	"3027a025a0238621687474703a2f2f706b692e74726561732e676f762f4f43494f5f4341" +
-	"332e63726c3082014fa082014ba0820147a48197308194310b3009060355040613025553" +
-	"31183016060355040a130f552e532e20476f7665726e6d656e7431233021060355040b13" +
-	"1a4465706172746d656e74206f662074686520547265617375727931223020060355040b" +
-	"131943657274696669636174696f6e20417574686f7269746965733110300e060355040b" +
-	"13074f43494f2043413110300e0603550403130743524c313430398681aa6c6461703a2f" +
-	"2f6c6461702e74726561732e676f762f636e3d43524c313430392c6f753d4f43494f2532" +
-	"3043412c6f753d43657274696669636174696f6e253230417574686f7269746965732c6f" +
-	"753d4465706172746d656e742532306f6625323074686525323054726561737572792c6f" +
-	"3d552e532e253230476f7665726e6d656e742c633d55533f636572746966696361746552" +
-	"65766f636174696f6e4c6973743b62696e617279302b0603551d1004243022800f323031" +
-	"35303431303135353733385a810f32303138303431303136323733385a301f0603551d23" +
-	"041830168014a213a8e5c607546c243d4eb72b27a2a7711ab5af301d0603551d0e041604" +
-	"14b0869c12c293914cd460e33ed43e6c5a26e0d68f301906092a864886f67d074100040c" +
-	"300a1b0456382e31030203a8300d06092a864886f70d01010b050003820101004968d182" +
-	"8f9efdc147e747bb5dda15536a42a079b32d3d7f87e619b483aeee70b7e26bda393c6028" +
-	"7c733ecb468fe8b8b11bf809ff76add6b90eb25ad8d3a1052e43ee281e48a3a1ebe7efb5" +
-	"9e2c4a48765dedeb23f5346242145786cc988c762d230d28dd33bf4c2405d80cbb2cb1d6" +
-	"4c8f10ba130d50cb174f6ffb9cfc12808297a2cefba385f4fad170f39b51ebd87c12abf9" +
-	"3c51fc000af90d8aaba78f48923908804a5eb35f617ccf71d201e3708a559e6d16f9f13e" +
-	"074361eb9007e28d86bb4e0bfa13aad0e9ddd9124e84519de60e2fc6040b18d9fd602b02" +
-	"684b4c071c3019fc842197d00c120c41654bcbfbc4a096a1c637b79112b81ce1fa3899f9"
-
-const ocspRequestHex = "3051304f304d304b3049300906052b0e03021a05000414c0fe0278fc99188891b3f212e9" +
-	"c7e1b21ab7bfc004140dfc1df0a9e0f01ce7f2b213177e6f8d157cd4f60210017f77deb3" +
-	"bcbb235d44ccc7dba62e72"
-
-const leafCertHex = "308203c830820331a0030201020210017f77deb3bcbb235d44ccc7dba62e72300d06092a" +
-	"864886f70d01010505003081ba311f301d060355040a1316566572695369676e20547275" +
-	"7374204e6574776f726b31173015060355040b130e566572695369676e2c20496e632e31" +
-	"333031060355040b132a566572695369676e20496e7465726e6174696f6e616c20536572" +
-	"766572204341202d20436c617373203331493047060355040b13407777772e7665726973" +
-	"69676e2e636f6d2f43505320496e636f72702e6279205265662e204c494142494c495459" +
-	"204c54442e286329393720566572695369676e301e170d3132303632313030303030305a" +
-	"170d3133313233313233353935395a3068310b3009060355040613025553311330110603" +
-	"550408130a43616c69666f726e6961311230100603550407130950616c6f20416c746f31" +
-	"173015060355040a130e46616365626f6f6b2c20496e632e311730150603550403140e2a" +
-	"2e66616365626f6f6b2e636f6d30819f300d06092a864886f70d010101050003818d0030" +
-	"818902818100ae94b171e2deccc1693e051063240102e0689ae83c39b6b3e74b97d48d7b" +
-	"23689100b0b496ee62f0e6d356bcf4aa0f50643402f5d1766aa972835a7564723f39bbef" +
-	"5290ded9bcdbf9d3d55dfad23aa03dc604c54d29cf1d4b3bdbd1a809cfae47b44c7eae17" +
-	"c5109bee24a9cf4a8d911bb0fd0415ae4c3f430aa12a557e2ae10203010001a382011e30" +
-	"82011a30090603551d130402300030440603551d20043d303b3039060b6086480186f845" +
-	"01071703302a302806082b06010505070201161c68747470733a2f2f7777772e76657269" +
-	"7369676e2e636f6d2f727061303c0603551d1f043530333031a02fa02d862b687474703a" +
-	"2f2f535652496e746c2d63726c2e766572697369676e2e636f6d2f535652496e746c2e63" +
-	"726c301d0603551d250416301406082b0601050507030106082b06010505070302300b06" +
-	"03551d0f0404030205a0303406082b0601050507010104283026302406082b0601050507" +
-	"30018618687474703a2f2f6f6373702e766572697369676e2e636f6d30270603551d1104" +
-	"20301e820e2a2e66616365626f6f6b2e636f6d820c66616365626f6f6b2e636f6d300d06" +
-	"092a864886f70d0101050500038181005b6c2b75f8ed30aa51aad36aba595e555141951f" +
-	"81a53b447910ac1f76ff78fc2781616b58f3122afc1c87010425e9ed43df1a7ba6498060" +
-	"67e2688af03db58c7df4ee03309a6afc247ccb134dc33e54c6bc1d5133a532a73273b1d7" +
-	"9cadc08e7e1a83116d34523340b0305427a21742827c98916698ee7eaf8c3bdd71700817"
-
-const issuerCertHex = "30820383308202eca003020102021046fcebbab4d02f0f926098233f93078f300d06092a" +
-	"864886f70d0101050500305f310b300906035504061302555331173015060355040a130e" +
-	"566572695369676e2c20496e632e31373035060355040b132e436c617373203320507562" +
-	"6c6963205072696d6172792043657274696669636174696f6e20417574686f7269747930" +
-	"1e170d3937303431373030303030305a170d3136313032343233353935395a3081ba311f" +
-	"301d060355040a1316566572695369676e205472757374204e6574776f726b3117301506" +
-	"0355040b130e566572695369676e2c20496e632e31333031060355040b132a5665726953" +
-	"69676e20496e7465726e6174696f6e616c20536572766572204341202d20436c61737320" +
-	"3331493047060355040b13407777772e766572697369676e2e636f6d2f43505320496e63" +
-	"6f72702e6279205265662e204c494142494c495459204c54442e28632939372056657269" +
-	"5369676e30819f300d06092a864886f70d010101050003818d0030818902818100d88280" +
-	"e8d619027d1f85183925a2652be1bfd405d3bce6363baaf04c6c5bb6e7aa3c734555b2f1" +
-	"bdea9742ed9a340a15d4a95cf54025ddd907c132b2756cc4cabba3fe56277143aa63f530" +
-	"3e9328e5faf1093bf3b74d4e39f75c495ab8c11dd3b28afe70309542cbfe2b518b5a3c3a" +
-	"f9224f90b202a7539c4f34e7ab04b27b6f0203010001a381e33081e0300f0603551d1304" +
-	"0830060101ff02010030440603551d20043d303b3039060b6086480186f8450107010130" +
-	"2a302806082b06010505070201161c68747470733a2f2f7777772e766572697369676e2e" +
-	"636f6d2f43505330340603551d25042d302b06082b0601050507030106082b0601050507" +
-	"030206096086480186f8420401060a6086480186f845010801300b0603551d0f04040302" +
-	"0106301106096086480186f842010104040302010630310603551d1f042a30283026a024" +
-	"a0228620687474703a2f2f63726c2e766572697369676e2e636f6d2f706361332e63726c" +
-	"300d06092a864886f70d010105050003818100408e4997968a73dd8e4def3e61b7caa062" +
-	"adf40e0abb753de26ed82cc7bff4b98c369bcaa2d09c724639f6a682036511c4bcbf2da6" +
-	"f5d93b0ab598fab378b91ef22b4c62d5fdb27a1ddf33fd73f9a5d82d8c2aead1fcb028b6" +
-	"e94948134b838a1b487b24f738de6f4154b8ab576b06dfc7a2d4a9f6f136628088f28b75" +
-	"d68071"
-
-// Key and certificate for the OCSP responder were not taken from the Thawte
-// responder, since CreateResponse requires that we have the private key.
-// Instead, they were generated randomly.
-const responderPrivateKeyHex = "308204a40201000282010100e8155f2d3e6f2e8d14c62a788bd462f9f844e7a6977c83ef" +
-	"1099f0f6616ec5265b56f356e62c5400f0b06a2e7945a82752c636df32a895152d6074df" +
-	"1701dc6ccfbcbec75a70bd2b55ae2be7e6cad3b5fd4cd5b7790ab401a436d3f5f346074f" +
-	"fde8a99d5b723350f0a112076614b12ef79c78991b119453445acf2416ab0046b540db14" +
-	"c9fc0f27b8989ad0f63aa4b8aefc91aa8a72160c36307c60fec78a93d3fddf4259902aa7" +
-	"7e7332971c7d285b6a04f648993c6922a3e9da9adf5f81508c3228791843e5d49f24db2f" +
-	"1290bafd97e655b1049a199f652cd603c4fafa330c390b0da78fbbc67e8fa021cbd74eb9" +
-	"6222b12ace31a77dcf920334dc94581b02030100010282010100bcf0b93d7238bda329a8" +
-	"72e7149f61bcb37c154330ccb3f42a85c9002c2e2bdea039d77d8581cd19bed94078794e" +
-	"56293d601547fc4bf6a2f9002fe5772b92b21b254403b403585e3130cc99ccf08f0ef81a" +
-	"575b38f597ba4660448b54f44bfbb97072b5a2bf043bfeca828cf7741d13698e3f38162b" +
-	"679faa646b82abd9a72c5c7d722c5fc577a76d2c2daac588accad18516d1bbad10b0dfa2" +
-	"05cfe246b59e28608a43942e1b71b0c80498075121de5b900d727c31c42c78cf1db5c0aa" +
-	"5b491e10ea4ed5c0962aaf2ae025dd81fa4ce490d9d6b4a4465411d8e542fc88617e5695" +
-	"1aa4fc8ea166f2b4d0eb89ef17f2b206bd5f1014bf8fe0e71fe62f2cccf102818100f2dc" +
-	"ddf878d553286daad68bac4070a82ffec3dc4666a2750f47879eec913f91836f1d976b60" +
-	"daf9356e078446dafab5bd2e489e5d64f8572ba24a4ba4f3729b5e106c4dd831cc2497a7" +
-	"e6c7507df05cb64aeb1bbc81c1e340d58b5964cf39cff84ea30c29ec5d3f005ee1362698" +
-	"07395037955955655292c3e85f6187fa1f9502818100f4a33c102630840705f8c778a47b" +
-	"87e8da31e68809af981ac5e5999cf1551685d761cdf0d6520361b99aebd5777a940fa64d" +
-	"327c09fa63746fbb3247ec73a86edf115f1fe5c83598db803881ade71c33c6e956118345" +
-	"497b98b5e07bb5be75971465ec78f2f9467e1b74956ca9d4c7c3e314e742a72d8b33889c" +
-	"6c093a466cef0281801d3df0d02124766dd0be98349b19eb36a508c4e679e793ba0a8bef" +
-	"4d786888c1e9947078b1ea28938716677b4ad8c5052af12eb73ac194915264a913709a0b" +
-	"7b9f98d4a18edd781a13d49899f91c20dbd8eb2e61d991ba19b5cdc08893f5cb9d39e5a6" +
-	"0629ea16d426244673b1b3ee72bd30e41fac8395acac40077403de5efd028180050731dd" +
-	"d71b1a2b96c8d538ba90bb6b62c8b1c74c03aae9a9f59d21a7a82b0d572ef06fa9c807bf" +
-	"c373d6b30d809c7871df96510c577421d9860c7383fda0919ece19996b3ca13562159193" +
-	"c0c246471e287f975e8e57034e5136aaf44254e2650def3d51292474c515b1588969112e" +
-	"0a85cc77073e9d64d2c2fc497844284b02818100d71d63eabf416cf677401ebf965f8314" +
-	"120b568a57dd3bd9116c629c40dc0c6948bab3a13cc544c31c7da40e76132ef5dd3f7534" +
-	"45a635930c74326ae3df0edd1bfb1523e3aa259873ac7cf1ac31151ec8f37b528c275622" +
-	"48f99b8bed59fd4da2576aa6ee20d93a684900bf907e80c66d6e2261ae15e55284b4ed9d" +
-	"6bdaa059"
-
-const responderCertHex = "308202e2308201caa003020102020101300d06092a864886f70d01010b05003019311730" +
-	"150603550403130e4f43535020526573706f6e646572301e170d31353031333031353530" +
-	"33335a170d3136303133303135353033335a3019311730150603550403130e4f43535020" +
-	"526573706f6e64657230820122300d06092a864886f70d01010105000382010f00308201" +
-	"0a0282010100e8155f2d3e6f2e8d14c62a788bd462f9f844e7a6977c83ef1099f0f6616e" +
-	"c5265b56f356e62c5400f0b06a2e7945a82752c636df32a895152d6074df1701dc6ccfbc" +
-	"bec75a70bd2b55ae2be7e6cad3b5fd4cd5b7790ab401a436d3f5f346074ffde8a99d5b72" +
-	"3350f0a112076614b12ef79c78991b119453445acf2416ab0046b540db14c9fc0f27b898" +
-	"9ad0f63aa4b8aefc91aa8a72160c36307c60fec78a93d3fddf4259902aa77e7332971c7d" +
-	"285b6a04f648993c6922a3e9da9adf5f81508c3228791843e5d49f24db2f1290bafd97e6" +
-	"55b1049a199f652cd603c4fafa330c390b0da78fbbc67e8fa021cbd74eb96222b12ace31" +
-	"a77dcf920334dc94581b0203010001a3353033300e0603551d0f0101ff04040302078030" +
-	"130603551d25040c300a06082b06010505070309300c0603551d130101ff04023000300d" +
-	"06092a864886f70d01010b05000382010100718012761b5063e18f0dc44644d8e6ab8612" +
-	"31c15fd5357805425d82aec1de85bf6d3e30fce205e3e3b8b795bbe52e40a439286d2288" +
-	"9064f4aeeb150359b9425f1da51b3a5c939018555d13ac42c565a0603786a919328f3267" +
-	"09dce52c22ad958ecb7873b9771d1148b1c4be2efe80ba868919fc9f68b6090c2f33c156" +
-	"d67156e42766a50b5d51e79637b7e58af74c2a951b1e642fa7741fec982cc937de37eff5" +
-	"9e2005d5939bfc031589ca143e6e8ab83f40ee08cc20a6b4a95a318352c28d18528dcaf9" +
-	"66705de17afa19d6e8ae91ddf33179d16ebb6ac2c69cae8373d408ebf8c55308be6c04d9" +
-	"3a25439a94299a65a709756c7a3e568be049d5c38839"
-
-const errorResponseHex = "30030a0101"
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/armor/armor.go b/installer/vendor/golang.org/x/crypto/openpgp/armor/armor.go
deleted file mode 100644
index 592d186436..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/armor/armor.go
+++ /dev/null
@@ -1,219 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package armor implements OpenPGP ASCII Armor, see RFC 4880. OpenPGP Armor is
-// very similar to PEM except that it has an additional CRC checksum.
-package armor // import "golang.org/x/crypto/openpgp/armor"
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/base64"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-)
-
-// A Block represents an OpenPGP armored structure.
-//
-// The encoded form is:
-//    -----BEGIN Type-----
-//    Headers
-//
-//    base64-encoded Bytes
-//    '=' base64 encoded checksum
-//    -----END Type-----
-// where Headers is a possibly empty sequence of Key: Value lines.
-//
-// Since the armored data can be very large, this package presents a streaming
-// interface.
-type Block struct {
-	Type    string            // The type, taken from the preamble (i.e. "PGP SIGNATURE").
-	Header  map[string]string // Optional headers.
-	Body    io.Reader         // A Reader from which the contents can be read
-	lReader lineReader
-	oReader openpgpReader
-}
-
-var ArmorCorrupt error = errors.StructuralError("armor invalid")
-
-const crc24Init = 0xb704ce
-const crc24Poly = 0x1864cfb
-const crc24Mask = 0xffffff
-
-// crc24 calculates the OpenPGP checksum as specified in RFC 4880, section 6.1
-func crc24(crc uint32, d []byte) uint32 {
-	for _, b := range d {
-		crc ^= uint32(b) << 16
-		for i := 0; i < 8; i++ {
-			crc <<= 1
-			if crc&0x1000000 != 0 {
-				crc ^= crc24Poly
-			}
-		}
-	}
-	return crc
-}
-
-var armorStart = []byte("-----BEGIN ")
-var armorEnd = []byte("-----END ")
-var armorEndOfLine = []byte("-----")
-
-// lineReader wraps a line based reader. It watches for the end of an armor
-// block and records the expected CRC value.
-type lineReader struct {
-	in  *bufio.Reader
-	buf []byte
-	eof bool
-	crc uint32
-}
-
-func (l *lineReader) Read(p []byte) (n int, err error) {
-	if l.eof {
-		return 0, io.EOF
-	}
-
-	if len(l.buf) > 0 {
-		n = copy(p, l.buf)
-		l.buf = l.buf[n:]
-		return
-	}
-
-	line, isPrefix, err := l.in.ReadLine()
-	if err != nil {
-		return
-	}
-	if isPrefix {
-		return 0, ArmorCorrupt
-	}
-
-	if len(line) == 5 && line[0] == '=' {
-		// This is the checksum line
-		var expectedBytes [3]byte
-		var m int
-		m, err = base64.StdEncoding.Decode(expectedBytes[0:], line[1:])
-		if m != 3 || err != nil {
-			return
-		}
-		l.crc = uint32(expectedBytes[0])<<16 |
-			uint32(expectedBytes[1])<<8 |
-			uint32(expectedBytes[2])
-
-		line, _, err = l.in.ReadLine()
-		if err != nil && err != io.EOF {
-			return
-		}
-		if !bytes.HasPrefix(line, armorEnd) {
-			return 0, ArmorCorrupt
-		}
-
-		l.eof = true
-		return 0, io.EOF
-	}
-
-	if len(line) > 96 {
-		return 0, ArmorCorrupt
-	}
-
-	n = copy(p, line)
-	bytesToSave := len(line) - n
-	if bytesToSave > 0 {
-		if cap(l.buf) < bytesToSave {
-			l.buf = make([]byte, 0, bytesToSave)
-		}
-		l.buf = l.buf[0:bytesToSave]
-		copy(l.buf, line[n:])
-	}
-
-	return
-}
-
-// openpgpReader passes Read calls to the underlying base64 decoder, but keeps
-// a running CRC of the resulting data and checks the CRC against the value
-// found by the lineReader at EOF.
-type openpgpReader struct {
-	lReader    *lineReader
-	b64Reader  io.Reader
-	currentCRC uint32
-}
-
-func (r *openpgpReader) Read(p []byte) (n int, err error) {
-	n, err = r.b64Reader.Read(p)
-	r.currentCRC = crc24(r.currentCRC, p[:n])
-
-	if err == io.EOF {
-		if r.lReader.crc != uint32(r.currentCRC&crc24Mask) {
-			return 0, ArmorCorrupt
-		}
-	}
-
-	return
-}
-
-// Decode reads a PGP armored block from the given Reader. It will ignore
-// leading garbage. If it doesn't find a block, it will return nil, io.EOF. The
-// given Reader is not usable after calling this function: an arbitrary amount
-// of data may have been read past the end of the block.
-func Decode(in io.Reader) (p *Block, err error) {
-	r := bufio.NewReaderSize(in, 100)
-	var line []byte
-	ignoreNext := false
-
-TryNextBlock:
-	p = nil
-
-	// Skip leading garbage
-	for {
-		ignoreThis := ignoreNext
-		line, ignoreNext, err = r.ReadLine()
-		if err != nil {
-			return
-		}
-		if ignoreNext || ignoreThis {
-			continue
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) > len(armorStart)+len(armorEndOfLine) && bytes.HasPrefix(line, armorStart) {
-			break
-		}
-	}
-
-	p = new(Block)
-	p.Type = string(line[len(armorStart) : len(line)-len(armorEndOfLine)])
-	p.Header = make(map[string]string)
-	nextIsContinuation := false
-	var lastKey string
-
-	// Read headers
-	for {
-		isContinuation := nextIsContinuation
-		line, nextIsContinuation, err = r.ReadLine()
-		if err != nil {
-			p = nil
-			return
-		}
-		if isContinuation {
-			p.Header[lastKey] += string(line)
-			continue
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 {
-			break
-		}
-
-		i := bytes.Index(line, []byte(": "))
-		if i == -1 {
-			goto TryNextBlock
-		}
-		lastKey = string(line[:i])
-		p.Header[lastKey] = string(line[i+2:])
-	}
-
-	p.lReader.in = r
-	p.oReader.currentCRC = crc24Init
-	p.oReader.lReader = &p.lReader
-	p.oReader.b64Reader = base64.NewDecoder(base64.StdEncoding, &p.lReader)
-	p.Body = &p.oReader
-
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/armor/armor_test.go b/installer/vendor/golang.org/x/crypto/openpgp/armor/armor_test.go
deleted file mode 100644
index 9334e94e96..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/armor/armor_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package armor
-
-import (
-	"bytes"
-	"hash/adler32"
-	"io/ioutil"
-	"testing"
-)
-
-func TestDecodeEncode(t *testing.T) {
-	buf := bytes.NewBuffer([]byte(armorExample1))
-	result, err := Decode(buf)
-	if err != nil {
-		t.Error(err)
-	}
-	expectedType := "PGP SIGNATURE"
-	if result.Type != expectedType {
-		t.Errorf("result.Type: got:%s want:%s", result.Type, expectedType)
-	}
-	if len(result.Header) != 1 {
-		t.Errorf("len(result.Header): got:%d want:1", len(result.Header))
-	}
-	v, ok := result.Header["Version"]
-	if !ok || v != "GnuPG v1.4.10 (GNU/Linux)" {
-		t.Errorf("result.Header: got:%#v", result.Header)
-	}
-
-	contents, err := ioutil.ReadAll(result.Body)
-	if err != nil {
-		t.Error(err)
-	}
-
-	if adler32.Checksum(contents) != 0x27b144be {
-		t.Errorf("contents: got: %x", contents)
-	}
-
-	buf = bytes.NewBuffer(nil)
-	w, err := Encode(buf, result.Type, result.Header)
-	if err != nil {
-		t.Error(err)
-	}
-	_, err = w.Write(contents)
-	if err != nil {
-		t.Error(err)
-	}
-	w.Close()
-
-	if !bytes.Equal(buf.Bytes(), []byte(armorExample1)) {
-		t.Errorf("got: %s\nwant: %s", string(buf.Bytes()), armorExample1)
-	}
-}
-
-func TestLongHeader(t *testing.T) {
-	buf := bytes.NewBuffer([]byte(armorLongLine))
-	result, err := Decode(buf)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	value, ok := result.Header["Version"]
-	if !ok {
-		t.Errorf("missing Version header")
-	}
-	if value != longValueExpected {
-		t.Errorf("got: %s want: %s", value, longValueExpected)
-	}
-}
-
-const armorExample1 = `-----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iJwEAAECAAYFAk1Fv/0ACgkQo01+GMIMMbsYTwQAiAw+QAaNfY6WBdplZ/uMAccm
-4g+81QPmTSGHnetSb6WBiY13kVzK4HQiZH8JSkmmroMLuGeJwsRTEL4wbjRyUKEt
-p1xwUZDECs234F1xiG5enc5SGlRtP7foLBz9lOsjx+LEcA4sTl5/2eZR9zyFZqWW
-TxRjs+fJCIFuo71xb1g=
-=/teI
------END PGP SIGNATURE-----`
-
-const armorLongLine = `-----BEGIN PGP SIGNATURE-----
-Version: 0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz
-
-iQEcBAABAgAGBQJMtFESAAoJEKsQXJGvOPsVj40H/1WW6jaMXv4BW+1ueDSMDwM8
-kx1fLOXbVM5/Kn5LStZNt1jWWnpxdz7eq3uiqeCQjmqUoRde3YbB2EMnnwRbAhpp
-cacnAvy9ZQ78OTxUdNW1mhX5bS6q1MTEJnl+DcyigD70HG/yNNQD7sOPMdYQw0TA
-byQBwmLwmTsuZsrYqB68QyLHI+DUugn+kX6Hd2WDB62DKa2suoIUIHQQCd/ofwB3
-WfCYInXQKKOSxu2YOg2Eb4kLNhSMc1i9uKUWAH+sdgJh7NBgdoE4MaNtBFkHXRvv
-okWuf3+xA9ksp1npSY/mDvgHijmjvtpRDe6iUeqfCn8N9u9CBg8geANgaG8+QA4=
-=wfQG
------END PGP SIGNATURE-----`
-
-const longValueExpected = "0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz0123456789abcdefghijklmnopqrstuvwxyz"
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/armor/encode.go b/installer/vendor/golang.org/x/crypto/openpgp/armor/encode.go
deleted file mode 100644
index 6f07582c37..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/armor/encode.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package armor
-
-import (
-	"encoding/base64"
-	"io"
-)
-
-var armorHeaderSep = []byte(": ")
-var blockEnd = []byte("\n=")
-var newline = []byte("\n")
-var armorEndOfLineOut = []byte("-----\n")
-
-// writeSlices writes its arguments to the given Writer.
-func writeSlices(out io.Writer, slices ...[]byte) (err error) {
-	for _, s := range slices {
-		_, err = out.Write(s)
-		if err != nil {
-			return err
-		}
-	}
-	return
-}
-
-// lineBreaker breaks data across several lines, all of the same byte length
-// (except possibly the last). Lines are broken with a single '\n'.
-type lineBreaker struct {
-	lineLength  int
-	line        []byte
-	used        int
-	out         io.Writer
-	haveWritten bool
-}
-
-func newLineBreaker(out io.Writer, lineLength int) *lineBreaker {
-	return &lineBreaker{
-		lineLength: lineLength,
-		line:       make([]byte, lineLength),
-		used:       0,
-		out:        out,
-	}
-}
-
-func (l *lineBreaker) Write(b []byte) (n int, err error) {
-	n = len(b)
-
-	if n == 0 {
-		return
-	}
-
-	if l.used == 0 && l.haveWritten {
-		_, err = l.out.Write([]byte{'\n'})
-		if err != nil {
-			return
-		}
-	}
-
-	if l.used+len(b) < l.lineLength {
-		l.used += copy(l.line[l.used:], b)
-		return
-	}
-
-	l.haveWritten = true
-	_, err = l.out.Write(l.line[0:l.used])
-	if err != nil {
-		return
-	}
-	excess := l.lineLength - l.used
-	l.used = 0
-
-	_, err = l.out.Write(b[0:excess])
-	if err != nil {
-		return
-	}
-
-	_, err = l.Write(b[excess:])
-	return
-}
-
-func (l *lineBreaker) Close() (err error) {
-	if l.used > 0 {
-		_, err = l.out.Write(l.line[0:l.used])
-		if err != nil {
-			return
-		}
-	}
-
-	return
-}
-
-// encoding keeps track of a running CRC24 over the data which has been written
-// to it and outputs a OpenPGP checksum when closed, followed by an armor
-// trailer.
-//
-// It's built into a stack of io.Writers:
-//    encoding -> base64 encoder -> lineBreaker -> out
-type encoding struct {
-	out       io.Writer
-	breaker   *lineBreaker
-	b64       io.WriteCloser
-	crc       uint32
-	blockType []byte
-}
-
-func (e *encoding) Write(data []byte) (n int, err error) {
-	e.crc = crc24(e.crc, data)
-	return e.b64.Write(data)
-}
-
-func (e *encoding) Close() (err error) {
-	err = e.b64.Close()
-	if err != nil {
-		return
-	}
-	e.breaker.Close()
-
-	var checksumBytes [3]byte
-	checksumBytes[0] = byte(e.crc >> 16)
-	checksumBytes[1] = byte(e.crc >> 8)
-	checksumBytes[2] = byte(e.crc)
-
-	var b64ChecksumBytes [4]byte
-	base64.StdEncoding.Encode(b64ChecksumBytes[:], checksumBytes[:])
-
-	return writeSlices(e.out, blockEnd, b64ChecksumBytes[:], newline, armorEnd, e.blockType, armorEndOfLine)
-}
-
-// Encode returns a WriteCloser which will encode the data written to it in
-// OpenPGP armor.
-func Encode(out io.Writer, blockType string, headers map[string]string) (w io.WriteCloser, err error) {
-	bType := []byte(blockType)
-	err = writeSlices(out, armorStart, bType, armorEndOfLineOut)
-	if err != nil {
-		return
-	}
-
-	for k, v := range headers {
-		err = writeSlices(out, []byte(k), armorHeaderSep, []byte(v), newline)
-		if err != nil {
-			return
-		}
-	}
-
-	_, err = out.Write(newline)
-	if err != nil {
-		return
-	}
-
-	e := &encoding{
-		out:       out,
-		breaker:   newLineBreaker(out, 64),
-		crc:       crc24Init,
-		blockType: bType,
-	}
-	e.b64 = base64.NewEncoder(base64.StdEncoding, e.breaker)
-	return e, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/canonical_text.go b/installer/vendor/golang.org/x/crypto/openpgp/canonical_text.go
deleted file mode 100644
index e601e389f1..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/canonical_text.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import "hash"
-
-// NewCanonicalTextHash reformats text written to it into the canonical
-// form and then applies the hash h.  See RFC 4880, section 5.2.1.
-func NewCanonicalTextHash(h hash.Hash) hash.Hash {
-	return &canonicalTextHash{h, 0}
-}
-
-type canonicalTextHash struct {
-	h hash.Hash
-	s int
-}
-
-var newline = []byte{'\r', '\n'}
-
-func (cth *canonicalTextHash) Write(buf []byte) (int, error) {
-	start := 0
-
-	for i, c := range buf {
-		switch cth.s {
-		case 0:
-			if c == '\r' {
-				cth.s = 1
-			} else if c == '\n' {
-				cth.h.Write(buf[start:i])
-				cth.h.Write(newline)
-				start = i + 1
-			}
-		case 1:
-			cth.s = 0
-		}
-	}
-
-	cth.h.Write(buf[start:])
-	return len(buf), nil
-}
-
-func (cth *canonicalTextHash) Sum(in []byte) []byte {
-	return cth.h.Sum(in)
-}
-
-func (cth *canonicalTextHash) Reset() {
-	cth.h.Reset()
-	cth.s = 0
-}
-
-func (cth *canonicalTextHash) Size() int {
-	return cth.h.Size()
-}
-
-func (cth *canonicalTextHash) BlockSize() int {
-	return cth.h.BlockSize()
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/canonical_text_test.go b/installer/vendor/golang.org/x/crypto/openpgp/canonical_text_test.go
deleted file mode 100644
index 8f3ba2a881..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/canonical_text_test.go
+++ /dev/null
@@ -1,52 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"bytes"
-	"testing"
-)
-
-type recordingHash struct {
-	buf *bytes.Buffer
-}
-
-func (r recordingHash) Write(b []byte) (n int, err error) {
-	return r.buf.Write(b)
-}
-
-func (r recordingHash) Sum(in []byte) []byte {
-	return append(in, r.buf.Bytes()...)
-}
-
-func (r recordingHash) Reset() {
-	panic("shouldn't be called")
-}
-
-func (r recordingHash) Size() int {
-	panic("shouldn't be called")
-}
-
-func (r recordingHash) BlockSize() int {
-	panic("shouldn't be called")
-}
-
-func testCanonicalText(t *testing.T, input, expected string) {
-	r := recordingHash{bytes.NewBuffer(nil)}
-	c := NewCanonicalTextHash(r)
-	c.Write([]byte(input))
-	result := c.Sum(nil)
-	if expected != string(result) {
-		t.Errorf("input: %x got: %x want: %x", input, result, expected)
-	}
-}
-
-func TestCanonicalText(t *testing.T) {
-	testCanonicalText(t, "foo\n", "foo\r\n")
-	testCanonicalText(t, "foo", "foo")
-	testCanonicalText(t, "foo\r\n", "foo\r\n")
-	testCanonicalText(t, "foo\r\nbar", "foo\r\nbar")
-	testCanonicalText(t, "foo\r\nbar\n\n", "foo\r\nbar\r\n\r\n")
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign.go b/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign.go
deleted file mode 100644
index def4cabaff..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign.go
+++ /dev/null
@@ -1,376 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package clearsign generates and processes OpenPGP, clear-signed data. See
-// RFC 4880, section 7.
-//
-// Clearsigned messages are cryptographically signed, but the contents of the
-// message are kept in plaintext so that it can be read without special tools.
-package clearsign // import "golang.org/x/crypto/openpgp/clearsign"
-
-import (
-	"bufio"
-	"bytes"
-	"crypto"
-	"hash"
-	"io"
-	"net/textproto"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-// A Block represents a clearsigned message. A signature on a Block can
-// be checked by passing Bytes into openpgp.CheckDetachedSignature.
-type Block struct {
-	Headers          textproto.MIMEHeader // Optional message headers
-	Plaintext        []byte               // The original message text
-	Bytes            []byte               // The signed message
-	ArmoredSignature *armor.Block         // The signature block
-}
-
-// start is the marker which denotes the beginning of a clearsigned message.
-var start = []byte("\n-----BEGIN PGP SIGNED MESSAGE-----")
-
-// dashEscape is prefixed to any lines that begin with a hyphen so that they
-// can't be confused with endText.
-var dashEscape = []byte("- ")
-
-// endText is a marker which denotes the end of the message and the start of
-// an armored signature.
-var endText = []byte("-----BEGIN PGP SIGNATURE-----")
-
-// end is a marker which denotes the end of the armored signature.
-var end = []byte("\n-----END PGP SIGNATURE-----")
-
-var crlf = []byte("\r\n")
-var lf = byte('\n')
-
-// getLine returns the first \r\n or \n delineated line from the given byte
-// array. The line does not include the \r\n or \n. The remainder of the byte
-// array (also not including the new line bytes) is also returned and this will
-// always be smaller than the original argument.
-func getLine(data []byte) (line, rest []byte) {
-	i := bytes.Index(data, []byte{'\n'})
-	var j int
-	if i < 0 {
-		i = len(data)
-		j = i
-	} else {
-		j = i + 1
-		if i > 0 && data[i-1] == '\r' {
-			i--
-		}
-	}
-	return data[0:i], data[j:]
-}
-
-// Decode finds the first clearsigned message in data and returns it, as well
-// as the suffix of data which remains after the message.
-func Decode(data []byte) (b *Block, rest []byte) {
-	// start begins with a newline. However, at the very beginning of
-	// the byte array, we'll accept the start string without it.
-	rest = data
-	if bytes.HasPrefix(data, start[1:]) {
-		rest = rest[len(start)-1:]
-	} else if i := bytes.Index(data, start); i >= 0 {
-		rest = rest[i+len(start):]
-	} else {
-		return nil, data
-	}
-
-	// Consume the start line.
-	_, rest = getLine(rest)
-
-	var line []byte
-	b = &Block{
-		Headers: make(textproto.MIMEHeader),
-	}
-
-	// Next come a series of header lines.
-	for {
-		// This loop terminates because getLine's second result is
-		// always smaller than its argument.
-		if len(rest) == 0 {
-			return nil, data
-		}
-		// An empty line marks the end of the headers.
-		if line, rest = getLine(rest); len(line) == 0 {
-			break
-		}
-
-		i := bytes.Index(line, []byte{':'})
-		if i == -1 {
-			return nil, data
-		}
-
-		key, val := line[0:i], line[i+1:]
-		key = bytes.TrimSpace(key)
-		val = bytes.TrimSpace(val)
-		b.Headers.Add(string(key), string(val))
-	}
-
-	firstLine := true
-	for {
-		start := rest
-
-		line, rest = getLine(rest)
-		if len(line) == 0 && len(rest) == 0 {
-			// No armored data was found, so this isn't a complete message.
-			return nil, data
-		}
-		if bytes.Equal(line, endText) {
-			// Back up to the start of the line because armor expects to see the
-			// header line.
-			rest = start
-			break
-		}
-
-		// The final CRLF isn't included in the hash so we don't write it until
-		// we've seen the next line.
-		if firstLine {
-			firstLine = false
-		} else {
-			b.Bytes = append(b.Bytes, crlf...)
-		}
-
-		if bytes.HasPrefix(line, dashEscape) {
-			line = line[2:]
-		}
-		line = bytes.TrimRight(line, " \t")
-		b.Bytes = append(b.Bytes, line...)
-
-		b.Plaintext = append(b.Plaintext, line...)
-		b.Plaintext = append(b.Plaintext, lf)
-	}
-
-	// We want to find the extent of the armored data (including any newlines at
-	// the end).
-	i := bytes.Index(rest, end)
-	if i == -1 {
-		return nil, data
-	}
-	i += len(end)
-	for i < len(rest) && (rest[i] == '\r' || rest[i] == '\n') {
-		i++
-	}
-	armored := rest[:i]
-	rest = rest[i:]
-
-	var err error
-	b.ArmoredSignature, err = armor.Decode(bytes.NewBuffer(armored))
-	if err != nil {
-		return nil, data
-	}
-
-	return b, rest
-}
-
-// A dashEscaper is an io.WriteCloser which processes the body of a clear-signed
-// message. The clear-signed message is written to buffered and a hash, suitable
-// for signing, is maintained in h.
-//
-// When closed, an armored signature is created and written to complete the
-// message.
-type dashEscaper struct {
-	buffered *bufio.Writer
-	h        hash.Hash
-	hashType crypto.Hash
-
-	atBeginningOfLine bool
-	isFirstLine       bool
-
-	whitespace []byte
-	byteBuf    []byte // a one byte buffer to save allocations
-
-	privateKey *packet.PrivateKey
-	config     *packet.Config
-}
-
-func (d *dashEscaper) Write(data []byte) (n int, err error) {
-	for _, b := range data {
-		d.byteBuf[0] = b
-
-		if d.atBeginningOfLine {
-			// The final CRLF isn't included in the hash so we have to wait
-			// until this point (the start of the next line) before writing it.
-			if !d.isFirstLine {
-				d.h.Write(crlf)
-			}
-			d.isFirstLine = false
-		}
-
-		// Any whitespace at the end of the line has to be removed so we
-		// buffer it until we find out whether there's more on this line.
-		if b == ' ' || b == '\t' || b == '\r' {
-			d.whitespace = append(d.whitespace, b)
-			d.atBeginningOfLine = false
-			continue
-		}
-
-		if d.atBeginningOfLine {
-			// At the beginning of a line, hyphens have to be escaped.
-			if b == '-' {
-				// The signature isn't calculated over the dash-escaped text so
-				// the escape is only written to buffered.
-				if _, err = d.buffered.Write(dashEscape); err != nil {
-					return
-				}
-				d.h.Write(d.byteBuf)
-				d.atBeginningOfLine = false
-			} else if b == '\n' {
-				// Nothing to do because we delay writing CRLF to the hash.
-			} else {
-				d.h.Write(d.byteBuf)
-				d.atBeginningOfLine = false
-			}
-			if err = d.buffered.WriteByte(b); err != nil {
-				return
-			}
-		} else {
-			if b == '\n' {
-				// We got a raw \n. Drop any trailing whitespace and write a
-				// CRLF.
-				d.whitespace = d.whitespace[:0]
-				// We delay writing CRLF to the hash until the start of the
-				// next line.
-				if err = d.buffered.WriteByte(b); err != nil {
-					return
-				}
-				d.atBeginningOfLine = true
-			} else {
-				// Any buffered whitespace wasn't at the end of the line so
-				// we need to write it out.
-				if len(d.whitespace) > 0 {
-					d.h.Write(d.whitespace)
-					if _, err = d.buffered.Write(d.whitespace); err != nil {
-						return
-					}
-					d.whitespace = d.whitespace[:0]
-				}
-				d.h.Write(d.byteBuf)
-				if err = d.buffered.WriteByte(b); err != nil {
-					return
-				}
-			}
-		}
-	}
-
-	n = len(data)
-	return
-}
-
-func (d *dashEscaper) Close() (err error) {
-	if !d.atBeginningOfLine {
-		if err = d.buffered.WriteByte(lf); err != nil {
-			return
-		}
-	}
-	sig := new(packet.Signature)
-	sig.SigType = packet.SigTypeText
-	sig.PubKeyAlgo = d.privateKey.PubKeyAlgo
-	sig.Hash = d.hashType
-	sig.CreationTime = d.config.Now()
-	sig.IssuerKeyId = &d.privateKey.KeyId
-
-	if err = sig.Sign(d.h, d.privateKey, d.config); err != nil {
-		return
-	}
-
-	out, err := armor.Encode(d.buffered, "PGP SIGNATURE", nil)
-	if err != nil {
-		return
-	}
-
-	if err = sig.Serialize(out); err != nil {
-		return
-	}
-	if err = out.Close(); err != nil {
-		return
-	}
-	if err = d.buffered.Flush(); err != nil {
-		return
-	}
-	return
-}
-
-// Encode returns a WriteCloser which will clear-sign a message with privateKey
-// and write it to w. If config is nil, sensible defaults are used.
-func Encode(w io.Writer, privateKey *packet.PrivateKey, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	if privateKey.Encrypted {
-		return nil, errors.InvalidArgumentError("signing key is encrypted")
-	}
-
-	hashType := config.Hash()
-	name := nameOfHash(hashType)
-	if len(name) == 0 {
-		return nil, errors.UnsupportedError("unknown hash type: " + strconv.Itoa(int(hashType)))
-	}
-
-	if !hashType.Available() {
-		return nil, errors.UnsupportedError("unsupported hash type: " + strconv.Itoa(int(hashType)))
-	}
-	h := hashType.New()
-
-	buffered := bufio.NewWriter(w)
-	// start has a \n at the beginning that we don't want here.
-	if _, err = buffered.Write(start[1:]); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-	if _, err = buffered.WriteString("Hash: "); err != nil {
-		return
-	}
-	if _, err = buffered.WriteString(name); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-	if err = buffered.WriteByte(lf); err != nil {
-		return
-	}
-
-	plaintext = &dashEscaper{
-		buffered: buffered,
-		h:        h,
-		hashType: hashType,
-
-		atBeginningOfLine: true,
-		isFirstLine:       true,
-
-		byteBuf: make([]byte, 1),
-
-		privateKey: privateKey,
-		config:     config,
-	}
-
-	return
-}
-
-// nameOfHash returns the OpenPGP name for the given hash, or the empty string
-// if the name isn't known. See RFC 4880, section 9.4.
-func nameOfHash(h crypto.Hash) string {
-	switch h {
-	case crypto.MD5:
-		return "MD5"
-	case crypto.SHA1:
-		return "SHA1"
-	case crypto.RIPEMD160:
-		return "RIPEMD160"
-	case crypto.SHA224:
-		return "SHA224"
-	case crypto.SHA256:
-		return "SHA256"
-	case crypto.SHA384:
-		return "SHA384"
-	case crypto.SHA512:
-		return "SHA512"
-	}
-	return ""
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go b/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go
deleted file mode 100644
index 2c09480789..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/clearsign/clearsign_test.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package clearsign
-
-import (
-	"bytes"
-	"golang.org/x/crypto/openpgp"
-	"testing"
-)
-
-func testParse(t *testing.T, input []byte, expected, expectedPlaintext string) {
-	b, rest := Decode(input)
-	if b == nil {
-		t.Fatal("failed to decode clearsign message")
-	}
-	if !bytes.Equal(rest, []byte("trailing")) {
-		t.Errorf("unexpected remaining bytes returned: %s", string(rest))
-	}
-	if b.ArmoredSignature.Type != "PGP SIGNATURE" {
-		t.Errorf("bad armor type, got:%s, want:PGP SIGNATURE", b.ArmoredSignature.Type)
-	}
-	if !bytes.Equal(b.Bytes, []byte(expected)) {
-		t.Errorf("bad body, got:%x want:%x", b.Bytes, expected)
-	}
-
-	if !bytes.Equal(b.Plaintext, []byte(expectedPlaintext)) {
-		t.Errorf("bad plaintext, got:%x want:%x", b.Plaintext, expectedPlaintext)
-	}
-
-	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(signingKey))
-	if err != nil {
-		t.Errorf("failed to parse public key: %s", err)
-	}
-
-	if _, err := openpgp.CheckDetachedSignature(keyring, bytes.NewBuffer(b.Bytes), b.ArmoredSignature.Body); err != nil {
-		t.Errorf("failed to check signature: %s", err)
-	}
-}
-
-func TestParse(t *testing.T) {
-	testParse(t, clearsignInput, "Hello world\r\nline 2", "Hello world\nline 2\n")
-	testParse(t, clearsignInput2, "\r\n\r\n(This message has a couple of blank lines at the start and end.)\r\n\r\n", "\n\n(This message has a couple of blank lines at the start and end.)\n\n\n")
-}
-
-func TestParseInvalid(t *testing.T) {
-	if b, _ := Decode(clearsignInput3); b != nil {
-		t.Fatal("decoded a bad clearsigned message without any error")
-	}
-}
-
-func TestParseWithNoNewlineAtEnd(t *testing.T) {
-	input := clearsignInput
-	input = input[:len(input)-len("trailing")-1]
-	b, rest := Decode(input)
-	if b == nil {
-		t.Fatal("failed to decode clearsign message")
-	}
-	if len(rest) > 0 {
-		t.Errorf("unexpected remaining bytes returned: %s", string(rest))
-	}
-}
-
-var signingTests = []struct {
-	in, signed, plaintext string
-}{
-	{"", "", ""},
-	{"a", "a", "a\n"},
-	{"a\n", "a", "a\n"},
-	{"-a\n", "-a", "-a\n"},
-	{"--a\nb", "--a\r\nb", "--a\nb\n"},
-	// leading whitespace
-	{" a\n", " a", " a\n"},
-	{"  a\n", "  a", "  a\n"},
-	// trailing whitespace (should be stripped)
-	{"a \n", "a", "a\n"},
-	{"a ", "a", "a\n"},
-	// whitespace-only lines (should be stripped)
-	{"  \n", "", "\n"},
-	{"  ", "", "\n"},
-	{"a\n  \n  \nb\n", "a\r\n\r\n\r\nb", "a\n\n\nb\n"},
-}
-
-func TestSigning(t *testing.T) {
-	keyring, err := openpgp.ReadArmoredKeyRing(bytes.NewBufferString(signingKey))
-	if err != nil {
-		t.Errorf("failed to parse public key: %s", err)
-	}
-
-	for i, test := range signingTests {
-		var buf bytes.Buffer
-
-		plaintext, err := Encode(&buf, keyring[0].PrivateKey, nil)
-		if err != nil {
-			t.Errorf("#%d: error from Encode: %s", i, err)
-			continue
-		}
-		if _, err := plaintext.Write([]byte(test.in)); err != nil {
-			t.Errorf("#%d: error from Write: %s", i, err)
-			continue
-		}
-		if err := plaintext.Close(); err != nil {
-			t.Fatalf("#%d: error from Close: %s", i, err)
-			continue
-		}
-
-		b, _ := Decode(buf.Bytes())
-		if b == nil {
-			t.Errorf("#%d: failed to decode clearsign message", i)
-			continue
-		}
-		if !bytes.Equal(b.Bytes, []byte(test.signed)) {
-			t.Errorf("#%d: bad result, got:%x, want:%x", i, b.Bytes, test.signed)
-			continue
-		}
-		if !bytes.Equal(b.Plaintext, []byte(test.plaintext)) {
-			t.Errorf("#%d: bad result, got:%x, want:%x", i, b.Plaintext, test.plaintext)
-			continue
-		}
-
-		if _, err := openpgp.CheckDetachedSignature(keyring, bytes.NewBuffer(b.Bytes), b.ArmoredSignature.Body); err != nil {
-			t.Errorf("#%d: failed to check signature: %s", i, err)
-		}
-	}
-}
-
-var clearsignInput = []byte(`
-;lasjlkfdsa
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-Hello world
-line 2
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-iJwEAQECAAYFAk8kMuEACgkQO9o98PRieSpMsAQAhmY/vwmNpflrPgmfWsYhk5O8
-pjnBUzZwqTDoDeINjZEoPDSpQAHGhjFjgaDx/Gj4fAl0dM4D0wuUEBb6QOrwflog
-2A2k9kfSOMOtk0IH/H5VuFN1Mie9L/erYXjTQIptv9t9J7NoRBMU0QOOaFU0JaO9
-MyTpno24AjIAGb+mH1U=
-=hIJ6
------END PGP SIGNATURE-----
-trailing`)
-
-var clearsignInput2 = []byte(`
-asdlfkjasdlkfjsadf
-
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-
-
-(This message has a couple of blank lines at the start and end.)
-
-
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.11 (GNU/Linux)
-
-iJwEAQEIAAYFAlPpSREACgkQO9o98PRieSpZTAP+M8QUoCt/7Rf3YbXPcdzIL32v
-pt1I+cMNeopzfLy0u4ioEFi8s5VkwpL1AFmirvgViCwlf82inoRxzZRiW05JQ5LI
-ESEzeCoy2LIdRCQ2hcrG8pIUPzUO4TqO5D/dMbdHwNH4h5nNmGJUAEG6FpURlPm+
-qZg6BaTvOxepqOxnhVU=
-=e+C6
------END PGP SIGNATURE-----
-
-trailing`)
-
-var clearsignInput3 = []byte(`
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
-(This message was truncated.)
-`)
-
-var signingKey = `-----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-lQHYBE2rFNoBBADFwqWQIW/DSqcB4yCQqnAFTJ27qS5AnB46ccAdw3u4Greeu3Bp
-idpoHdjULy7zSKlwR1EA873dO/k/e11Ml3dlAFUinWeejWaK2ugFP6JjiieSsrKn
-vWNicdCS4HTWn0X4sjl0ZiAygw6GNhqEQ3cpLeL0g8E9hnYzJKQ0LWJa0QARAQAB
-AAP/TB81EIo2VYNmTq0pK1ZXwUpxCrvAAIG3hwKjEzHcbQznsjNvPUihZ+NZQ6+X
-0HCfPAdPkGDCLCb6NavcSW+iNnLTrdDnSI6+3BbIONqWWdRDYJhqZCkqmG6zqSfL
-IdkJgCw94taUg5BWP/AAeQrhzjChvpMQTVKQL5mnuZbUCeMCAN5qrYMP2S9iKdnk
-VANIFj7656ARKt/nf4CBzxcpHTyB8+d2CtPDKCmlJP6vL8t58Jmih+kHJMvC0dzn
-gr5f5+sCAOOe5gt9e0am7AvQWhdbHVfJU0TQJx+m2OiCJAqGTB1nvtBLHdJnfdC9
-TnXXQ6ZXibqLyBies/xeY2sCKL5qtTMCAKnX9+9d/5yQxRyrQUHt1NYhaXZnJbHx
-q4ytu0eWz+5i68IYUSK69jJ1NWPM0T6SkqpB3KCAIv68VFm9PxqG1KmhSrQIVGVz
-dCBLZXmIuAQTAQIAIgUCTasU2gIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
-CgkQO9o98PRieSoLhgQAkLEZex02Qt7vGhZzMwuN0R22w3VwyYyjBx+fM3JFETy1
-ut4xcLJoJfIaF5ZS38UplgakHG0FQ+b49i8dMij0aZmDqGxrew1m4kBfjXw9B/v+
-eIqpODryb6cOSwyQFH0lQkXC040pjq9YqDsO5w0WYNXYKDnzRV0p4H1pweo2VDid
-AdgETasU2gEEAN46UPeWRqKHvA99arOxee38fBt2CI08iiWyI8T3J6ivtFGixSqV
-bRcPxYO/qLpVe5l84Nb3X71GfVXlc9hyv7CD6tcowL59hg1E/DC5ydI8K8iEpUmK
-/UnHdIY5h8/kqgGxkY/T/hgp5fRQgW1ZoZxLajVlMRZ8W4tFtT0DeA+JABEBAAEA
-A/0bE1jaaZKj6ndqcw86jd+QtD1SF+Cf21CWRNeLKnUds4FRRvclzTyUMuWPkUeX
-TaNNsUOFqBsf6QQ2oHUBBK4VCHffHCW4ZEX2cd6umz7mpHW6XzN4DECEzOVksXtc
-lUC1j4UB91DC/RNQqwX1IV2QLSwssVotPMPqhOi0ZLNY7wIA3n7DWKInxYZZ4K+6
-rQ+POsz6brEoRHwr8x6XlHenq1Oki855pSa1yXIARoTrSJkBtn5oI+f8AzrnN0BN
-oyeQAwIA/7E++3HDi5aweWrViiul9cd3rcsS0dEnksPhvS0ozCJiHsq/6GFmy7J8
-QSHZPteedBnZyNp5jR+H7cIfVN3KgwH/Skq4PsuPhDq5TKK6i8Pc1WW8MA6DXTdU
-nLkX7RGmMwjC0DBf7KWAlPjFaONAX3a8ndnz//fy1q7u2l9AZwrj1qa1iJ8EGAEC
-AAkFAk2rFNoCGwwACgkQO9o98PRieSo2/QP/WTzr4ioINVsvN1akKuekmEMI3LAp
-BfHwatufxxP1U+3Si/6YIk7kuPB9Hs+pRqCXzbvPRrI8NHZBmc8qIGthishdCYad
-AHcVnXjtxrULkQFGbGvhKURLvS9WnzD/m1K2zzwxzkPTzT9/Yf06O6Mal5AdugPL
-VrM0m72/jnpKo04=
-=zNCn
------END PGP PRIVATE KEY BLOCK-----
-`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go b/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
deleted file mode 100644
index 73f4fe3785..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package elgamal implements ElGamal encryption, suitable for OpenPGP,
-// as specified in "A Public-Key Cryptosystem and a Signature Scheme Based on
-// Discrete Logarithms," IEEE Transactions on Information Theory, v. IT-31,
-// n. 4, 1985, pp. 469-472.
-//
-// This form of ElGamal embeds PKCS#1 v1.5 padding, which may make it
-// unsuitable for other protocols. RSA should be used in preference in any
-// case.
-package elgamal // import "golang.org/x/crypto/openpgp/elgamal"
-
-import (
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"io"
-	"math/big"
-)
-
-// PublicKey represents an ElGamal public key.
-type PublicKey struct {
-	G, P, Y *big.Int
-}
-
-// PrivateKey represents an ElGamal private key.
-type PrivateKey struct {
-	PublicKey
-	X *big.Int
-}
-
-// Encrypt encrypts the given message to the given public key. The result is a
-// pair of integers. Errors can result from reading random, or because msg is
-// too large to be encrypted to the public key.
-func Encrypt(random io.Reader, pub *PublicKey, msg []byte) (c1, c2 *big.Int, err error) {
-	pLen := (pub.P.BitLen() + 7) / 8
-	if len(msg) > pLen-11 {
-		err = errors.New("elgamal: message too long")
-		return
-	}
-
-	// EM = 0x02 || PS || 0x00 || M
-	em := make([]byte, pLen-1)
-	em[0] = 2
-	ps, mm := em[1:len(em)-len(msg)-1], em[len(em)-len(msg):]
-	err = nonZeroRandomBytes(ps, random)
-	if err != nil {
-		return
-	}
-	em[len(em)-len(msg)-1] = 0
-	copy(mm, msg)
-
-	m := new(big.Int).SetBytes(em)
-
-	k, err := rand.Int(random, pub.P)
-	if err != nil {
-		return
-	}
-
-	c1 = new(big.Int).Exp(pub.G, k, pub.P)
-	s := new(big.Int).Exp(pub.Y, k, pub.P)
-	c2 = s.Mul(s, m)
-	c2.Mod(c2, pub.P)
-
-	return
-}
-
-// Decrypt takes two integers, resulting from an ElGamal encryption, and
-// returns the plaintext of the message. An error can result only if the
-// ciphertext is invalid. Users should keep in mind that this is a padding
-// oracle and thus, if exposed to an adaptive chosen ciphertext attack, can
-// be used to break the cryptosystem.  See ``Chosen Ciphertext Attacks
-// Against Protocols Based on the RSA Encryption Standard PKCS #1'', Daniel
-// Bleichenbacher, Advances in Cryptology (Crypto '98),
-func Decrypt(priv *PrivateKey, c1, c2 *big.Int) (msg []byte, err error) {
-	s := new(big.Int).Exp(c1, priv.X, priv.P)
-	s.ModInverse(s, priv.P)
-	s.Mul(s, c2)
-	s.Mod(s, priv.P)
-	em := s.Bytes()
-
-	firstByteIsTwo := subtle.ConstantTimeByteEq(em[0], 2)
-
-	// The remainder of the plaintext must be a string of non-zero random
-	// octets, followed by a 0, followed by the message.
-	//   lookingForIndex: 1 iff we are still looking for the zero.
-	//   index: the offset of the first zero byte.
-	var lookingForIndex, index int
-	lookingForIndex = 1
-
-	for i := 1; i < len(em); i++ {
-		equals0 := subtle.ConstantTimeByteEq(em[i], 0)
-		index = subtle.ConstantTimeSelect(lookingForIndex&equals0, i, index)
-		lookingForIndex = subtle.ConstantTimeSelect(equals0, 0, lookingForIndex)
-	}
-
-	if firstByteIsTwo != 1 || lookingForIndex != 0 || index < 9 {
-		return nil, errors.New("elgamal: decryption error")
-	}
-	return em[index+1:], nil
-}
-
-// nonZeroRandomBytes fills the given slice with non-zero random octets.
-func nonZeroRandomBytes(s []byte, rand io.Reader) (err error) {
-	_, err = io.ReadFull(rand, s)
-	if err != nil {
-		return
-	}
-
-	for i := 0; i < len(s); i++ {
-		for s[i] == 0 {
-			_, err = io.ReadFull(rand, s[i:i+1])
-			if err != nil {
-				return
-			}
-		}
-	}
-
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal_test.go b/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal_test.go
deleted file mode 100644
index c4f99f5c48..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/elgamal/elgamal_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package elgamal
-
-import (
-	"bytes"
-	"crypto/rand"
-	"math/big"
-	"testing"
-)
-
-// This is the 1024-bit MODP group from RFC 5114, section 2.1:
-const primeHex = "B10B8F96A080E01DDE92DE5EAE5D54EC52C99FBCFB06A3C69A6A9DCA52D23B616073E28675A23D189838EF1E2EE652C013ECB4AEA906112324975C3CD49B83BFACCBDD7D90C4BD7098488E9C219A73724EFFD6FAE5644738FAA31A4FF55BCCC0A151AF5F0DC8B4BD45BF37DF365C1A65E68CFDA76D4DA708DF1FB2BC2E4A4371"
-
-const generatorHex = "A4D1CBD5C3FD34126765A442EFB99905F8104DD258AC507FD6406CFF14266D31266FEA1E5C41564B777E690F5504F213160217B4B01B886A5E91547F9E2749F4D7FBD7D3B9A92EE1909D0D2263F80A76A6A24C087A091F531DBF0A0169B6A28AD662A4D18E73AFA32D779D5918D08BC8858F4DCEF97C2A24855E6EEB22B3B2E5"
-
-func fromHex(hex string) *big.Int {
-	n, ok := new(big.Int).SetString(hex, 16)
-	if !ok {
-		panic("failed to parse hex number")
-	}
-	return n
-}
-
-func TestEncryptDecrypt(t *testing.T) {
-	priv := &PrivateKey{
-		PublicKey: PublicKey{
-			G: fromHex(generatorHex),
-			P: fromHex(primeHex),
-		},
-		X: fromHex("42"),
-	}
-	priv.Y = new(big.Int).Exp(priv.G, priv.X, priv.P)
-
-	message := []byte("hello world")
-	c1, c2, err := Encrypt(rand.Reader, &priv.PublicKey, message)
-	if err != nil {
-		t.Errorf("error encrypting: %s", err)
-	}
-	message2, err := Decrypt(priv, c1, c2)
-	if err != nil {
-		t.Errorf("error decrypting: %s", err)
-	}
-	if !bytes.Equal(message2, message) {
-		t.Errorf("decryption failed, got: %x, want: %x", message2, message)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/errors/errors.go b/installer/vendor/golang.org/x/crypto/openpgp/errors/errors.go
deleted file mode 100644
index eb0550b2d0..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/errors/errors.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package errors contains common error types for the OpenPGP packages.
-package errors // import "golang.org/x/crypto/openpgp/errors"
-
-import (
-	"strconv"
-)
-
-// A StructuralError is returned when OpenPGP data is found to be syntactically
-// invalid.
-type StructuralError string
-
-func (s StructuralError) Error() string {
-	return "openpgp: invalid data: " + string(s)
-}
-
-// UnsupportedError indicates that, although the OpenPGP data is valid, it
-// makes use of currently unimplemented features.
-type UnsupportedError string
-
-func (s UnsupportedError) Error() string {
-	return "openpgp: unsupported feature: " + string(s)
-}
-
-// InvalidArgumentError indicates that the caller is in error and passed an
-// incorrect value.
-type InvalidArgumentError string
-
-func (i InvalidArgumentError) Error() string {
-	return "openpgp: invalid argument: " + string(i)
-}
-
-// SignatureError indicates that a syntactically valid signature failed to
-// validate.
-type SignatureError string
-
-func (b SignatureError) Error() string {
-	return "openpgp: invalid signature: " + string(b)
-}
-
-type keyIncorrectError int
-
-func (ki keyIncorrectError) Error() string {
-	return "openpgp: incorrect key"
-}
-
-var ErrKeyIncorrect error = keyIncorrectError(0)
-
-type unknownIssuerError int
-
-func (unknownIssuerError) Error() string {
-	return "openpgp: signature made by unknown entity"
-}
-
-var ErrUnknownIssuer error = unknownIssuerError(0)
-
-type keyRevokedError int
-
-func (keyRevokedError) Error() string {
-	return "openpgp: signature made by revoked key"
-}
-
-var ErrKeyRevoked error = keyRevokedError(0)
-
-type UnknownPacketTypeError uint8
-
-func (upte UnknownPacketTypeError) Error() string {
-	return "openpgp: unknown packet type: " + strconv.Itoa(int(upte))
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/keys.go b/installer/vendor/golang.org/x/crypto/openpgp/keys.go
deleted file mode 100644
index 68b14c6ae6..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/keys.go
+++ /dev/null
@@ -1,637 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"crypto/rsa"
-	"io"
-	"time"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-// PublicKeyType is the armor type for a PGP public key.
-var PublicKeyType = "PGP PUBLIC KEY BLOCK"
-
-// PrivateKeyType is the armor type for a PGP private key.
-var PrivateKeyType = "PGP PRIVATE KEY BLOCK"
-
-// An Entity represents the components of an OpenPGP key: a primary public key
-// (which must be a signing key), one or more identities claimed by that key,
-// and zero or more subkeys, which may be encryption keys.
-type Entity struct {
-	PrimaryKey  *packet.PublicKey
-	PrivateKey  *packet.PrivateKey
-	Identities  map[string]*Identity // indexed by Identity.Name
-	Revocations []*packet.Signature
-	Subkeys     []Subkey
-}
-
-// An Identity represents an identity claimed by an Entity and zero or more
-// assertions by other entities about that claim.
-type Identity struct {
-	Name          string // by convention, has the form "Full Name (comment) <email@example.com>"
-	UserId        *packet.UserId
-	SelfSignature *packet.Signature
-	Signatures    []*packet.Signature
-}
-
-// A Subkey is an additional public key in an Entity. Subkeys can be used for
-// encryption.
-type Subkey struct {
-	PublicKey  *packet.PublicKey
-	PrivateKey *packet.PrivateKey
-	Sig        *packet.Signature
-}
-
-// A Key identifies a specific public key in an Entity. This is either the
-// Entity's primary key or a subkey.
-type Key struct {
-	Entity        *Entity
-	PublicKey     *packet.PublicKey
-	PrivateKey    *packet.PrivateKey
-	SelfSignature *packet.Signature
-}
-
-// A KeyRing provides access to public and private keys.
-type KeyRing interface {
-	// KeysById returns the set of keys that have the given key id.
-	KeysById(id uint64) []Key
-	// KeysByIdAndUsage returns the set of keys with the given id
-	// that also meet the key usage given by requiredUsage.
-	// The requiredUsage is expressed as the bitwise-OR of
-	// packet.KeyFlag* values.
-	KeysByIdUsage(id uint64, requiredUsage byte) []Key
-	// DecryptionKeys returns all private keys that are valid for
-	// decryption.
-	DecryptionKeys() []Key
-}
-
-// primaryIdentity returns the Identity marked as primary or the first identity
-// if none are so marked.
-func (e *Entity) primaryIdentity() *Identity {
-	var firstIdentity *Identity
-	for _, ident := range e.Identities {
-		if firstIdentity == nil {
-			firstIdentity = ident
-		}
-		if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-			return ident
-		}
-	}
-	return firstIdentity
-}
-
-// encryptionKey returns the best candidate Key for encrypting a message to the
-// given Entity.
-func (e *Entity) encryptionKey(now time.Time) (Key, bool) {
-	candidateSubkey := -1
-
-	// Iterate the keys to find the newest key
-	var maxTime time.Time
-	for i, subkey := range e.Subkeys {
-		if subkey.Sig.FlagsValid &&
-			subkey.Sig.FlagEncryptCommunications &&
-			subkey.PublicKey.PubKeyAlgo.CanEncrypt() &&
-			!subkey.Sig.KeyExpired(now) &&
-			(maxTime.IsZero() || subkey.Sig.CreationTime.After(maxTime)) {
-			candidateSubkey = i
-			maxTime = subkey.Sig.CreationTime
-		}
-	}
-
-	if candidateSubkey != -1 {
-		subkey := e.Subkeys[candidateSubkey]
-		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
-	}
-
-	// If we don't have any candidate subkeys for encryption and
-	// the primary key doesn't have any usage metadata then we
-	// assume that the primary key is ok. Or, if the primary key is
-	// marked as ok to encrypt to, then we can obviously use it.
-	i := e.primaryIdentity()
-	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagEncryptCommunications &&
-		e.PrimaryKey.PubKeyAlgo.CanEncrypt() &&
-		!i.SelfSignature.KeyExpired(now) {
-		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
-	}
-
-	// This Entity appears to be signing only.
-	return Key{}, false
-}
-
-// signingKey return the best candidate Key for signing a message with this
-// Entity.
-func (e *Entity) signingKey(now time.Time) (Key, bool) {
-	candidateSubkey := -1
-
-	for i, subkey := range e.Subkeys {
-		if subkey.Sig.FlagsValid &&
-			subkey.Sig.FlagSign &&
-			subkey.PublicKey.PubKeyAlgo.CanSign() &&
-			!subkey.Sig.KeyExpired(now) {
-			candidateSubkey = i
-			break
-		}
-	}
-
-	if candidateSubkey != -1 {
-		subkey := e.Subkeys[candidateSubkey]
-		return Key{e, subkey.PublicKey, subkey.PrivateKey, subkey.Sig}, true
-	}
-
-	// If we have no candidate subkey then we assume that it's ok to sign
-	// with the primary key.
-	i := e.primaryIdentity()
-	if !i.SelfSignature.FlagsValid || i.SelfSignature.FlagSign &&
-		!i.SelfSignature.KeyExpired(now) {
-		return Key{e, e.PrimaryKey, e.PrivateKey, i.SelfSignature}, true
-	}
-
-	return Key{}, false
-}
-
-// An EntityList contains one or more Entities.
-type EntityList []*Entity
-
-// KeysById returns the set of keys that have the given key id.
-func (el EntityList) KeysById(id uint64) (keys []Key) {
-	for _, e := range el {
-		if e.PrimaryKey.KeyId == id {
-			var selfSig *packet.Signature
-			for _, ident := range e.Identities {
-				if selfSig == nil {
-					selfSig = ident.SelfSignature
-				} else if ident.SelfSignature.IsPrimaryId != nil && *ident.SelfSignature.IsPrimaryId {
-					selfSig = ident.SelfSignature
-					break
-				}
-			}
-			keys = append(keys, Key{e, e.PrimaryKey, e.PrivateKey, selfSig})
-		}
-
-		for _, subKey := range e.Subkeys {
-			if subKey.PublicKey.KeyId == id {
-				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
-			}
-		}
-	}
-	return
-}
-
-// KeysByIdAndUsage returns the set of keys with the given id that also meet
-// the key usage given by requiredUsage.  The requiredUsage is expressed as
-// the bitwise-OR of packet.KeyFlag* values.
-func (el EntityList) KeysByIdUsage(id uint64, requiredUsage byte) (keys []Key) {
-	for _, key := range el.KeysById(id) {
-		if len(key.Entity.Revocations) > 0 {
-			continue
-		}
-
-		if key.SelfSignature.RevocationReason != nil {
-			continue
-		}
-
-		if key.SelfSignature.FlagsValid && requiredUsage != 0 {
-			var usage byte
-			if key.SelfSignature.FlagCertify {
-				usage |= packet.KeyFlagCertify
-			}
-			if key.SelfSignature.FlagSign {
-				usage |= packet.KeyFlagSign
-			}
-			if key.SelfSignature.FlagEncryptCommunications {
-				usage |= packet.KeyFlagEncryptCommunications
-			}
-			if key.SelfSignature.FlagEncryptStorage {
-				usage |= packet.KeyFlagEncryptStorage
-			}
-			if usage&requiredUsage != requiredUsage {
-				continue
-			}
-		}
-
-		keys = append(keys, key)
-	}
-	return
-}
-
-// DecryptionKeys returns all private keys that are valid for decryption.
-func (el EntityList) DecryptionKeys() (keys []Key) {
-	for _, e := range el {
-		for _, subKey := range e.Subkeys {
-			if subKey.PrivateKey != nil && (!subKey.Sig.FlagsValid || subKey.Sig.FlagEncryptStorage || subKey.Sig.FlagEncryptCommunications) {
-				keys = append(keys, Key{e, subKey.PublicKey, subKey.PrivateKey, subKey.Sig})
-			}
-		}
-	}
-	return
-}
-
-// ReadArmoredKeyRing reads one or more public/private keys from an armor keyring file.
-func ReadArmoredKeyRing(r io.Reader) (EntityList, error) {
-	block, err := armor.Decode(r)
-	if err == io.EOF {
-		return nil, errors.InvalidArgumentError("no armored data found")
-	}
-	if err != nil {
-		return nil, err
-	}
-	if block.Type != PublicKeyType && block.Type != PrivateKeyType {
-		return nil, errors.InvalidArgumentError("expected public or private key block, got: " + block.Type)
-	}
-
-	return ReadKeyRing(block.Body)
-}
-
-// ReadKeyRing reads one or more public/private keys. Unsupported keys are
-// ignored as long as at least a single valid key is found.
-func ReadKeyRing(r io.Reader) (el EntityList, err error) {
-	packets := packet.NewReader(r)
-	var lastUnsupportedError error
-
-	for {
-		var e *Entity
-		e, err = ReadEntity(packets)
-		if err != nil {
-			// TODO: warn about skipped unsupported/unreadable keys
-			if _, ok := err.(errors.UnsupportedError); ok {
-				lastUnsupportedError = err
-				err = readToNextPublicKey(packets)
-			} else if _, ok := err.(errors.StructuralError); ok {
-				// Skip unreadable, badly-formatted keys
-				lastUnsupportedError = err
-				err = readToNextPublicKey(packets)
-			}
-			if err == io.EOF {
-				err = nil
-				break
-			}
-			if err != nil {
-				el = nil
-				break
-			}
-		} else {
-			el = append(el, e)
-		}
-	}
-
-	if len(el) == 0 && err == nil {
-		err = lastUnsupportedError
-	}
-	return
-}
-
-// readToNextPublicKey reads packets until the start of the entity and leaves
-// the first packet of the new entity in the Reader.
-func readToNextPublicKey(packets *packet.Reader) (err error) {
-	var p packet.Packet
-	for {
-		p, err = packets.Next()
-		if err == io.EOF {
-			return
-		} else if err != nil {
-			if _, ok := err.(errors.UnsupportedError); ok {
-				err = nil
-				continue
-			}
-			return
-		}
-
-		if pk, ok := p.(*packet.PublicKey); ok && !pk.IsSubkey {
-			packets.Unread(p)
-			return
-		}
-	}
-}
-
-// ReadEntity reads an entity (public key, identities, subkeys etc) from the
-// given Reader.
-func ReadEntity(packets *packet.Reader) (*Entity, error) {
-	e := new(Entity)
-	e.Identities = make(map[string]*Identity)
-
-	p, err := packets.Next()
-	if err != nil {
-		return nil, err
-	}
-
-	var ok bool
-	if e.PrimaryKey, ok = p.(*packet.PublicKey); !ok {
-		if e.PrivateKey, ok = p.(*packet.PrivateKey); !ok {
-			packets.Unread(p)
-			return nil, errors.StructuralError("first packet was not a public/private key")
-		} else {
-			e.PrimaryKey = &e.PrivateKey.PublicKey
-		}
-	}
-
-	if !e.PrimaryKey.PubKeyAlgo.CanSign() {
-		return nil, errors.StructuralError("primary key cannot be used for signatures")
-	}
-
-	var current *Identity
-	var revocations []*packet.Signature
-EachPacket:
-	for {
-		p, err := packets.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return nil, err
-		}
-
-		switch pkt := p.(type) {
-		case *packet.UserId:
-			current = new(Identity)
-			current.Name = pkt.Id
-			current.UserId = pkt
-			e.Identities[pkt.Id] = current
-
-			for {
-				p, err = packets.Next()
-				if err == io.EOF {
-					return nil, io.ErrUnexpectedEOF
-				} else if err != nil {
-					return nil, err
-				}
-
-				sig, ok := p.(*packet.Signature)
-				if !ok {
-					return nil, errors.StructuralError("user ID packet not followed by self-signature")
-				}
-
-				if (sig.SigType == packet.SigTypePositiveCert || sig.SigType == packet.SigTypeGenericCert) && sig.IssuerKeyId != nil && *sig.IssuerKeyId == e.PrimaryKey.KeyId {
-					if err = e.PrimaryKey.VerifyUserIdSignature(pkt.Id, e.PrimaryKey, sig); err != nil {
-						return nil, errors.StructuralError("user ID self-signature invalid: " + err.Error())
-					}
-					current.SelfSignature = sig
-					break
-				}
-				current.Signatures = append(current.Signatures, sig)
-			}
-		case *packet.Signature:
-			if pkt.SigType == packet.SigTypeKeyRevocation {
-				revocations = append(revocations, pkt)
-			} else if pkt.SigType == packet.SigTypeDirectSignature {
-				// TODO: RFC4880 5.2.1 permits signatures
-				// directly on keys (eg. to bind additional
-				// revocation keys).
-			} else if current == nil {
-				return nil, errors.StructuralError("signature packet found before user id packet")
-			} else {
-				current.Signatures = append(current.Signatures, pkt)
-			}
-		case *packet.PrivateKey:
-			if pkt.IsSubkey == false {
-				packets.Unread(p)
-				break EachPacket
-			}
-			err = addSubkey(e, packets, &pkt.PublicKey, pkt)
-			if err != nil {
-				return nil, err
-			}
-		case *packet.PublicKey:
-			if pkt.IsSubkey == false {
-				packets.Unread(p)
-				break EachPacket
-			}
-			err = addSubkey(e, packets, pkt, nil)
-			if err != nil {
-				return nil, err
-			}
-		default:
-			// we ignore unknown packets
-		}
-	}
-
-	if len(e.Identities) == 0 {
-		return nil, errors.StructuralError("entity without any identities")
-	}
-
-	for _, revocation := range revocations {
-		err = e.PrimaryKey.VerifyRevocationSignature(revocation)
-		if err == nil {
-			e.Revocations = append(e.Revocations, revocation)
-		} else {
-			// TODO: RFC 4880 5.2.3.15 defines revocation keys.
-			return nil, errors.StructuralError("revocation signature signed by alternate key")
-		}
-	}
-
-	return e, nil
-}
-
-func addSubkey(e *Entity, packets *packet.Reader, pub *packet.PublicKey, priv *packet.PrivateKey) error {
-	var subKey Subkey
-	subKey.PublicKey = pub
-	subKey.PrivateKey = priv
-	p, err := packets.Next()
-	if err == io.EOF {
-		return io.ErrUnexpectedEOF
-	}
-	if err != nil {
-		return errors.StructuralError("subkey signature invalid: " + err.Error())
-	}
-	var ok bool
-	subKey.Sig, ok = p.(*packet.Signature)
-	if !ok {
-		return errors.StructuralError("subkey packet not followed by signature")
-	}
-	if subKey.Sig.SigType != packet.SigTypeSubkeyBinding && subKey.Sig.SigType != packet.SigTypeSubkeyRevocation {
-		return errors.StructuralError("subkey signature with wrong type")
-	}
-	err = e.PrimaryKey.VerifyKeySignature(subKey.PublicKey, subKey.Sig)
-	if err != nil {
-		return errors.StructuralError("subkey signature invalid: " + err.Error())
-	}
-	e.Subkeys = append(e.Subkeys, subKey)
-	return nil
-}
-
-const defaultRSAKeyBits = 2048
-
-// NewEntity returns an Entity that contains a fresh RSA/RSA keypair with a
-// single identity composed of the given full name, comment and email, any of
-// which may be empty but must not contain any of "()<>\x00".
-// If config is nil, sensible defaults will be used.
-func NewEntity(name, comment, email string, config *packet.Config) (*Entity, error) {
-	currentTime := config.Now()
-
-	bits := defaultRSAKeyBits
-	if config != nil && config.RSABits != 0 {
-		bits = config.RSABits
-	}
-
-	uid := packet.NewUserId(name, comment, email)
-	if uid == nil {
-		return nil, errors.InvalidArgumentError("user id field contained invalid characters")
-	}
-	signingPriv, err := rsa.GenerateKey(config.Random(), bits)
-	if err != nil {
-		return nil, err
-	}
-	encryptingPriv, err := rsa.GenerateKey(config.Random(), bits)
-	if err != nil {
-		return nil, err
-	}
-
-	e := &Entity{
-		PrimaryKey: packet.NewRSAPublicKey(currentTime, &signingPriv.PublicKey),
-		PrivateKey: packet.NewRSAPrivateKey(currentTime, signingPriv),
-		Identities: make(map[string]*Identity),
-	}
-	isPrimaryId := true
-	e.Identities[uid.Id] = &Identity{
-		Name:   uid.Name,
-		UserId: uid,
-		SelfSignature: &packet.Signature{
-			CreationTime: currentTime,
-			SigType:      packet.SigTypePositiveCert,
-			PubKeyAlgo:   packet.PubKeyAlgoRSA,
-			Hash:         config.Hash(),
-			IsPrimaryId:  &isPrimaryId,
-			FlagsValid:   true,
-			FlagSign:     true,
-			FlagCertify:  true,
-			IssuerKeyId:  &e.PrimaryKey.KeyId,
-		},
-	}
-
-	// If the user passes in a DefaultHash via packet.Config,
-	// set the PreferredHash for the SelfSignature.
-	if config != nil && config.DefaultHash != 0 {
-		e.Identities[uid.Id].SelfSignature.PreferredHash = []uint8{hashToHashId(config.DefaultHash)}
-	}
-
-	e.Subkeys = make([]Subkey, 1)
-	e.Subkeys[0] = Subkey{
-		PublicKey:  packet.NewRSAPublicKey(currentTime, &encryptingPriv.PublicKey),
-		PrivateKey: packet.NewRSAPrivateKey(currentTime, encryptingPriv),
-		Sig: &packet.Signature{
-			CreationTime:              currentTime,
-			SigType:                   packet.SigTypeSubkeyBinding,
-			PubKeyAlgo:                packet.PubKeyAlgoRSA,
-			Hash:                      config.Hash(),
-			FlagsValid:                true,
-			FlagEncryptStorage:        true,
-			FlagEncryptCommunications: true,
-			IssuerKeyId:               &e.PrimaryKey.KeyId,
-		},
-	}
-	e.Subkeys[0].PublicKey.IsSubkey = true
-	e.Subkeys[0].PrivateKey.IsSubkey = true
-
-	return e, nil
-}
-
-// SerializePrivate serializes an Entity, including private key material, to
-// the given Writer. For now, it must only be used on an Entity returned from
-// NewEntity.
-// If config is nil, sensible defaults will be used.
-func (e *Entity) SerializePrivate(w io.Writer, config *packet.Config) (err error) {
-	err = e.PrivateKey.Serialize(w)
-	if err != nil {
-		return
-	}
-	for _, ident := range e.Identities {
-		err = ident.UserId.Serialize(w)
-		if err != nil {
-			return
-		}
-		err = ident.SelfSignature.SignUserId(ident.UserId.Id, e.PrimaryKey, e.PrivateKey, config)
-		if err != nil {
-			return
-		}
-		err = ident.SelfSignature.Serialize(w)
-		if err != nil {
-			return
-		}
-	}
-	for _, subkey := range e.Subkeys {
-		err = subkey.PrivateKey.Serialize(w)
-		if err != nil {
-			return
-		}
-		err = subkey.Sig.SignKey(subkey.PublicKey, e.PrivateKey, config)
-		if err != nil {
-			return
-		}
-		err = subkey.Sig.Serialize(w)
-		if err != nil {
-			return
-		}
-	}
-	return nil
-}
-
-// Serialize writes the public part of the given Entity to w. (No private
-// key material will be output).
-func (e *Entity) Serialize(w io.Writer) error {
-	err := e.PrimaryKey.Serialize(w)
-	if err != nil {
-		return err
-	}
-	for _, ident := range e.Identities {
-		err = ident.UserId.Serialize(w)
-		if err != nil {
-			return err
-		}
-		err = ident.SelfSignature.Serialize(w)
-		if err != nil {
-			return err
-		}
-		for _, sig := range ident.Signatures {
-			err = sig.Serialize(w)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	for _, subkey := range e.Subkeys {
-		err = subkey.PublicKey.Serialize(w)
-		if err != nil {
-			return err
-		}
-		err = subkey.Sig.Serialize(w)
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// SignIdentity adds a signature to e, from signer, attesting that identity is
-// associated with e. The provided identity must already be an element of
-// e.Identities and the private key of signer must have been decrypted if
-// necessary.
-// If config is nil, sensible defaults will be used.
-func (e *Entity) SignIdentity(identity string, signer *Entity, config *packet.Config) error {
-	if signer.PrivateKey == nil {
-		return errors.InvalidArgumentError("signing Entity must have a private key")
-	}
-	if signer.PrivateKey.Encrypted {
-		return errors.InvalidArgumentError("signing Entity's private key must be decrypted")
-	}
-	ident, ok := e.Identities[identity]
-	if !ok {
-		return errors.InvalidArgumentError("given identity string not found in Entity")
-	}
-
-	sig := &packet.Signature{
-		SigType:      packet.SigTypeGenericCert,
-		PubKeyAlgo:   signer.PrivateKey.PubKeyAlgo,
-		Hash:         config.Hash(),
-		CreationTime: config.Now(),
-		IssuerKeyId:  &signer.PrivateKey.KeyId,
-	}
-	if err := sig.SignUserId(identity, e.PrimaryKey, signer.PrivateKey, config); err != nil {
-		return err
-	}
-	ident.Signatures = append(ident.Signatures, sig)
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/keys_test.go b/installer/vendor/golang.org/x/crypto/openpgp/keys_test.go
deleted file mode 100644
index 76ba13ed11..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/keys_test.go
+++ /dev/null
@@ -1,419 +0,0 @@
-package openpgp
-
-import (
-	"bytes"
-	"crypto"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-func TestKeyExpiry(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(expiringKeyHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-	entity := kring[0]
-
-	const timeFormat = "2006-01-02"
-	time1, _ := time.Parse(timeFormat, "2013-07-01")
-
-	// The expiringKeyHex key is structured as:
-	//
-	// pub  1024R/5E237D8C  created: 2013-07-01                      expires: 2013-07-31  usage: SC
-	// sub  1024R/1ABB25A0  created: 2013-07-01 23:11:07 +0200 CEST  expires: 2013-07-08  usage: E
-	// sub  1024R/96A672F5  created: 2013-07-01 23:11:23 +0200 CEST  expires: 2013-07-31  usage: E
-	//
-	// So this should select the newest, non-expired encryption key.
-	key, _ := entity.encryptionKey(time1)
-	if id := key.PublicKey.KeyIdShortString(); id != "96A672F5" {
-		t.Errorf("Expected key 1ABB25A0 at time %s, but got key %s", time1.Format(timeFormat), id)
-	}
-
-	// Once the first encryption subkey has expired, the second should be
-	// selected.
-	time2, _ := time.Parse(timeFormat, "2013-07-09")
-	key, _ = entity.encryptionKey(time2)
-	if id := key.PublicKey.KeyIdShortString(); id != "96A672F5" {
-		t.Errorf("Expected key 96A672F5 at time %s, but got key %s", time2.Format(timeFormat), id)
-	}
-
-	// Once all the keys have expired, nothing should be returned.
-	time3, _ := time.Parse(timeFormat, "2013-08-01")
-	if key, ok := entity.encryptionKey(time3); ok {
-		t.Errorf("Expected no key at time %s, but got key %s", time3.Format(timeFormat), key.PublicKey.KeyIdShortString())
-	}
-}
-
-func TestMissingCrossSignature(t *testing.T) {
-	// This public key has a signing subkey, but the subkey does not
-	// contain a cross-signature.
-	keys, err := ReadArmoredKeyRing(bytes.NewBufferString(missingCrossSignatureKey))
-	if len(keys) != 0 {
-		t.Errorf("Accepted key with missing cross signature")
-	}
-	if err == nil {
-		t.Fatal("Failed to detect error in keyring with missing cross signature")
-	}
-	structural, ok := err.(errors.StructuralError)
-	if !ok {
-		t.Fatalf("Unexpected class of error: %T. Wanted StructuralError", err)
-	}
-	const expectedMsg = "signing subkey is missing cross-signature"
-	if !strings.Contains(string(structural), expectedMsg) {
-		t.Fatalf("Unexpected error: %q. Expected it to contain %q", err, expectedMsg)
-	}
-}
-
-func TestInvalidCrossSignature(t *testing.T) {
-	// This public key has a signing subkey, and the subkey has an
-	// embedded cross-signature. However, the cross-signature does
-	// not correctly validate over the primary and subkey.
-	keys, err := ReadArmoredKeyRing(bytes.NewBufferString(invalidCrossSignatureKey))
-	if len(keys) != 0 {
-		t.Errorf("Accepted key with invalid cross signature")
-	}
-	if err == nil {
-		t.Fatal("Failed to detect error in keyring with an invalid cross signature")
-	}
-	structural, ok := err.(errors.StructuralError)
-	if !ok {
-		t.Fatalf("Unexpected class of error: %T. Wanted StructuralError", err)
-	}
-	const expectedMsg = "subkey signature invalid"
-	if !strings.Contains(string(structural), expectedMsg) {
-		t.Fatalf("Unexpected error: %q. Expected it to contain %q", err, expectedMsg)
-	}
-}
-
-func TestGoodCrossSignature(t *testing.T) {
-	// This public key has a signing subkey, and the subkey has an
-	// embedded cross-signature which correctly validates over the
-	// primary and subkey.
-	keys, err := ReadArmoredKeyRing(bytes.NewBufferString(goodCrossSignatureKey))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(keys) != 1 {
-		t.Errorf("Failed to accept key with good cross signature, %d", len(keys))
-	}
-	if len(keys[0].Subkeys) != 1 {
-		t.Errorf("Failed to accept good subkey, %d", len(keys[0].Subkeys))
-	}
-}
-
-// TestExternallyRevokableKey attempts to load and parse a key with a third party revocation permission.
-func TestExternallyRevocableKey(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(subkeyUsageHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// The 0xA42704B92866382A key can be revoked by 0xBE3893CB843D0FE70C
-	// according to this signature that appears within the key:
-	// :signature packet: algo 1, keyid A42704B92866382A
-	//    version 4, created 1396409682, md5len 0, sigclass 0x1f
-	//    digest algo 2, begin of digest a9 84
-	//    hashed subpkt 2 len 4 (sig created 2014-04-02)
-	//    hashed subpkt 12 len 22 (revocation key: c=80 a=1 f=CE094AA433F7040BB2DDF0BE3893CB843D0FE70C)
-	//    hashed subpkt 7 len 1 (not revocable)
-	//    subpkt 16 len 8 (issuer key ID A42704B92866382A)
-	//    data: [1024 bits]
-
-	id := uint64(0xA42704B92866382A)
-	keys := kring.KeysById(id)
-	if len(keys) != 1 {
-		t.Errorf("Expected to find key id %X, but got %d matches", id, len(keys))
-	}
-}
-
-func TestKeyRevocation(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(revokedKeyHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// revokedKeyHex contains these keys:
-	// pub   1024R/9A34F7C0 2014-03-25 [revoked: 2014-03-25]
-	// sub   1024R/1BA3CD60 2014-03-25 [revoked: 2014-03-25]
-	ids := []uint64{0xA401D9F09A34F7C0, 0x5CD3BE0A1BA3CD60}
-
-	for _, id := range ids {
-		keys := kring.KeysById(id)
-		if len(keys) != 1 {
-			t.Errorf("Expected KeysById to find revoked key %X, but got %d matches", id, len(keys))
-		}
-		keys = kring.KeysByIdUsage(id, 0)
-		if len(keys) != 0 {
-			t.Errorf("Expected KeysByIdUsage to filter out revoked key %X, but got %d matches", id, len(keys))
-		}
-	}
-}
-
-func TestSubkeyRevocation(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(revokedSubkeyHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// revokedSubkeyHex contains these keys:
-	// pub   1024R/4EF7E4BECCDE97F0 2014-03-25
-	// sub   1024R/D63636E2B96AE423 2014-03-25
-	// sub   1024D/DBCE4EE19529437F 2014-03-25
-	// sub   1024R/677815E371C2FD23 2014-03-25 [revoked: 2014-03-25]
-	validKeys := []uint64{0x4EF7E4BECCDE97F0, 0xD63636E2B96AE423, 0xDBCE4EE19529437F}
-	revokedKey := uint64(0x677815E371C2FD23)
-
-	for _, id := range validKeys {
-		keys := kring.KeysById(id)
-		if len(keys) != 1 {
-			t.Errorf("Expected KeysById to find key %X, but got %d matches", id, len(keys))
-		}
-		keys = kring.KeysByIdUsage(id, 0)
-		if len(keys) != 1 {
-			t.Errorf("Expected KeysByIdUsage to find key %X, but got %d matches", id, len(keys))
-		}
-	}
-
-	keys := kring.KeysById(revokedKey)
-	if len(keys) != 1 {
-		t.Errorf("Expected KeysById to find key %X, but got %d matches", revokedKey, len(keys))
-	}
-
-	keys = kring.KeysByIdUsage(revokedKey, 0)
-	if len(keys) != 0 {
-		t.Errorf("Expected KeysByIdUsage to filter out revoked key %X, but got %d matches", revokedKey, len(keys))
-	}
-}
-
-func TestKeyUsage(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(subkeyUsageHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// subkeyUsageHex contains these keys:
-	// pub  1024R/2866382A  created: 2014-04-01  expires: never       usage: SC
-	// sub  1024R/936C9153  created: 2014-04-01  expires: never       usage: E
-	// sub  1024R/64D5F5BB  created: 2014-04-02  expires: never       usage: E
-	// sub  1024D/BC0BA992  created: 2014-04-02  expires: never       usage: S
-	certifiers := []uint64{0xA42704B92866382A}
-	signers := []uint64{0xA42704B92866382A, 0x42CE2C64BC0BA992}
-	encrypters := []uint64{0x09C0C7D9936C9153, 0xC104E98664D5F5BB}
-
-	for _, id := range certifiers {
-		keys := kring.KeysByIdUsage(id, packet.KeyFlagCertify)
-		if len(keys) == 1 {
-			if keys[0].PublicKey.KeyId != id {
-				t.Errorf("Expected to find certifier key id %X, but got %X", id, keys[0].PublicKey.KeyId)
-			}
-		} else {
-			t.Errorf("Expected one match for certifier key id %X, but got %d matches", id, len(keys))
-		}
-	}
-
-	for _, id := range signers {
-		keys := kring.KeysByIdUsage(id, packet.KeyFlagSign)
-		if len(keys) == 1 {
-			if keys[0].PublicKey.KeyId != id {
-				t.Errorf("Expected to find signing key id %X, but got %X", id, keys[0].PublicKey.KeyId)
-			}
-		} else {
-			t.Errorf("Expected one match for signing key id %X, but got %d matches", id, len(keys))
-		}
-
-		// This keyring contains no encryption keys that are also good for signing.
-		keys = kring.KeysByIdUsage(id, packet.KeyFlagEncryptStorage|packet.KeyFlagEncryptCommunications)
-		if len(keys) != 0 {
-			t.Errorf("Unexpected match for encryption key id %X", id)
-		}
-	}
-
-	for _, id := range encrypters {
-		keys := kring.KeysByIdUsage(id, packet.KeyFlagEncryptStorage|packet.KeyFlagEncryptCommunications)
-		if len(keys) == 1 {
-			if keys[0].PublicKey.KeyId != id {
-				t.Errorf("Expected to find encryption key id %X, but got %X", id, keys[0].PublicKey.KeyId)
-			}
-		} else {
-			t.Errorf("Expected one match for encryption key id %X, but got %d matches", id, len(keys))
-		}
-
-		// This keyring contains no encryption keys that are also good for signing.
-		keys = kring.KeysByIdUsage(id, packet.KeyFlagSign)
-		if len(keys) != 0 {
-			t.Errorf("Unexpected match for signing key id %X", id)
-		}
-	}
-}
-
-func TestIdVerification(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := kring[1].PrivateKey.Decrypt([]byte("passphrase")); err != nil {
-		t.Fatal(err)
-	}
-
-	const identity = "Test Key 1 (RSA)"
-	if err := kring[0].SignIdentity(identity, kring[1], nil); err != nil {
-		t.Fatal(err)
-	}
-
-	ident, ok := kring[0].Identities[identity]
-	if !ok {
-		t.Fatal("identity missing from key after signing")
-	}
-
-	checked := false
-	for _, sig := range ident.Signatures {
-		if sig.IssuerKeyId == nil || *sig.IssuerKeyId != kring[1].PrimaryKey.KeyId {
-			continue
-		}
-
-		if err := kring[1].PrimaryKey.VerifyUserIdSignature(identity, kring[0].PrimaryKey, sig); err != nil {
-			t.Fatalf("error verifying new identity signature: %s", err)
-		}
-		checked = true
-		break
-	}
-
-	if !checked {
-		t.Fatal("didn't find identity signature in Entity")
-	}
-}
-
-func TestNewEntityWithPreferredHash(t *testing.T) {
-	c := &packet.Config{
-		DefaultHash: crypto.SHA256,
-	}
-	entity, err := NewEntity("Golang Gopher", "Test Key", "no-reply@golang.com", c)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, identity := range entity.Identities {
-		if len(identity.SelfSignature.PreferredHash) == 0 {
-			t.Fatal("didn't find a preferred hash in self signature")
-		}
-		ph := hashToHashId(c.DefaultHash)
-		if identity.SelfSignature.PreferredHash[0] != ph {
-			t.Fatalf("Expected preferred hash to be %d, got %d", ph, identity.SelfSignature.PreferredHash[0])
-		}
-	}
-}
-
-func TestNewEntityWithoutPreferredHash(t *testing.T) {
-	entity, err := NewEntity("Golang Gopher", "Test Key", "no-reply@golang.com", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, identity := range entity.Identities {
-		if len(identity.SelfSignature.PreferredHash) != 0 {
-			t.Fatalf("Expected preferred hash to be empty but got length %d", len(identity.SelfSignature.PreferredHash))
-		}
-	}
-}
-
-const expiringKeyHex = "988d0451d1ec5d010400ba3385721f2dc3f4ab096b2ee867ab77213f0a27a8538441c35d2fa225b08798a1439a66a5150e6bdc3f40f5d28d588c712394c632b6299f77db8c0d48d37903fb72ebd794d61be6aa774688839e5fdecfe06b2684cc115d240c98c66cb1ef22ae84e3aa0c2b0c28665c1e7d4d044e7f270706193f5223c8d44e0d70b7b8da830011010001b40f4578706972792074657374206b657988be041301020028050251d1ec5d021b03050900278d00060b090807030206150802090a0b0416020301021e01021780000a091072589ad75e237d8c033503fd10506d72837834eb7f994117740723adc39227104b0d326a1161871c0b415d25b4aedef946ca77ea4c05af9c22b32cf98be86ab890111fced1ee3f75e87b7cc3c00dc63bbc85dfab91c0dc2ad9de2c4d13a34659333a85c6acc1a669c5e1d6cecb0cf1e56c10e72d855ae177ddc9e766f9b2dda57ccbb75f57156438bbdb4e42b88d0451d1ec5d0104009c64906559866c5cb61578f5846a94fcee142a489c9b41e67b12bb54cfe86eb9bc8566460f9a720cb00d6526fbccfd4f552071a8e3f7744b1882d01036d811ee5a3fb91a1c568055758f43ba5d2c6a9676b012f3a1a89e47bbf624f1ad571b208f3cc6224eb378f1645dd3d47584463f9eadeacfd1ce6f813064fbfdcc4b5a53001101000188a504180102000f021b0c050251d1f06b050900093e89000a091072589ad75e237d8c20e00400ab8310a41461425b37889c4da28129b5fae6084fafbc0a47dd1adc74a264c6e9c9cc125f40462ee1433072a58384daef88c961c390ed06426a81b464a53194c4e291ddd7e2e2ba3efced01537d713bd111f48437bde2363446200995e8e0d4e528dda377fd1e8f8ede9c8e2198b393bd86852ce7457a7e3daf74d510461a5b77b88d0451d1ece8010400b3a519f83ab0010307e83bca895170acce8964a044190a2b368892f7a244758d9fc193482648acb1fb9780d28cc22d171931f38bb40279389fc9bf2110876d4f3db4fcfb13f22f7083877fe56592b3b65251312c36f83ffcb6d313c6a17f197dd471f0712aad15a8537b435a92471ba2e5b0c72a6c72536c3b567c558d7b6051001101000188a504180102000f021b0c050251d1f07b050900279091000a091072589ad75e237d8ce69e03fe286026afacf7c97ee20673864d4459a2240b5655219950643c7dba0ac384b1d4359c67805b21d98211f7b09c2a0ccf6410c8c04d4ff4a51293725d8d6570d9d8bb0e10c07d22357caeb49626df99c180be02d77d1fe8ed25e7a54481237646083a9f89a11566cd20b9e995b1487c5f9e02aeb434f3a1897cd416dd0a87861838da3e9e"
-const subkeyUsageHex = "988d04533a52bc010400d26af43085558f65b9e7dbc90cb9238015259aed5e954637adcfa2181548b2d0b60c65f1f42ec5081cbf1bc0a8aa4900acfb77070837c58f26012fbce297d70afe96e759ad63531f0037538e70dbf8e384569b9720d99d8eb39d8d0a2947233ed242436cb6ac7dfe74123354b3d0119b5c235d3dd9c9d6c004f8ffaf67ad8583001101000188b7041f010200210502533b8552170c8001ce094aa433f7040bb2ddf0be3893cb843d0fe70c020700000a0910a42704b92866382aa98404009d63d916a27543da4221c60087c33f1c44bec9998c5438018ed370cca4962876c748e94b73eb39c58eb698063f3fd6346d58dd2a11c0247934c4a9d71f24754f7468f96fb24c3e791dd2392b62f626148ad724189498cbf993db2df7c0cdc2d677c35da0f16cb16c9ce7c33b4de65a4a91b1d21a130ae9cc26067718910ef8e2b417556d627261203c756d627261407379642e65642e61753e88b80413010200220502533a52bc021b03060b090807030206150802090a0b0416020301021e01021780000a0910a42704b92866382a47840400c0c2bd04f5fca586de408b395b3c280a278259c93eaaa8b79a53b97003f8ed502a8a00446dd9947fb462677e4fcac0dac2f0701847d15130aadb6cd9e0705ea0cf5f92f129136c7be21a718d46c8e641eb7f044f2adae573e11ae423a0a9ca51324f03a8a2f34b91fa40c3cc764bee4dccadedb54c768ba0469b683ea53f1c29b88d04533a52bc01040099c92a5d6f8b744224da27bc2369127c35269b58bec179de6bbc038f749344222f85a31933224f26b70243c4e4b2d242f0c4777eaef7b5502f9dad6d8bf3aaeb471210674b74de2d7078af497d55f5cdad97c7bedfbc1b41e8065a97c9c3d344b21fc81d27723af8e374bc595da26ea242dccb6ae497be26eea57e563ed517e90011010001889f0418010200090502533a52bc021b0c000a0910a42704b92866382afa1403ff70284c2de8a043ff51d8d29772602fa98009b7861c540535f874f2c230af8caf5638151a636b21f8255003997ccd29747fdd06777bb24f9593bd7d98a3e887689bf902f999915fcc94625ae487e5d13e6616f89090ebc4fdc7eb5cad8943e4056995bb61c6af37f8043016876a958ec7ebf39c43d20d53b7f546cfa83e8d2604b88d04533b8283010400c0b529316dbdf58b4c54461e7e669dc11c09eb7f73819f178ccd4177b9182b91d138605fcf1e463262fabefa73f94a52b5e15d1904635541c7ea540f07050ce0fb51b73e6f88644cec86e91107c957a114f69554548a85295d2b70bd0b203992f76eb5d493d86d9eabcaa7ef3fc7db7e458438db3fcdb0ca1cc97c638439a9170011010001889f0418010200090502533b8283021b0c000a0910a42704b92866382adc6d0400cfff6258485a21675adb7a811c3e19ebca18851533f75a7ba317950b9997fda8d1a4c8c76505c08c04b6c2cc31dc704d33da36a21273f2b388a1a706f7c3378b66d887197a525936ed9a69acb57fe7f718133da85ec742001c5d1864e9c6c8ea1b94f1c3759cebfd93b18606066c063a63be86085b7e37bdbc65f9a915bf084bb901a204533b85cd110400aed3d2c52af2b38b5b67904b0ef73d6dd7aef86adb770e2b153cd22489654dcc91730892087bb9856ae2d9f7ed1eb48f214243fe86bfe87b349ebd7c30e630e49c07b21fdabf78b7a95c8b7f969e97e3d33f2e074c63552ba64a2ded7badc05ce0ea2be6d53485f6900c7860c7aa76560376ce963d7271b9b54638a4028b573f00a0d8854bfcdb04986141568046202192263b9b67350400aaa1049dbc7943141ef590a70dcb028d730371d92ea4863de715f7f0f16d168bd3dc266c2450457d46dcbbf0b071547e5fbee7700a820c3750b236335d8d5848adb3c0da010e998908dfd93d961480084f3aea20b247034f8988eccb5546efaa35a92d0451df3aaf1aee5aa36a4c4d462c760ecd9cebcabfbe1412b1f21450f203fd126687cd486496e971a87fd9e1a8a765fe654baa219a6871ab97768596ab05c26c1aeea8f1a2c72395a58dbc12ef9640d2b95784e974a4d2d5a9b17c25fedacfe551bda52602de8f6d2e48443f5dd1a2a2a8e6a5e70ecdb88cd6e766ad9745c7ee91d78cc55c3d06536b49c3fee6c3d0b6ff0fb2bf13a314f57c953b8f4d93bf88e70418010200090502533b85cd021b0200520910a42704b92866382a47200419110200060502533b85cd000a091042ce2c64bc0ba99214b2009e26b26852c8b13b10c35768e40e78fbbb48bd084100a0c79d9ea0844fa5853dd3c85ff3ecae6f2c9dd6c557aa04008bbbc964cd65b9b8299d4ebf31f41cc7264b8cf33a00e82c5af022331fac79efc9563a822497ba012953cefe2629f1242fcdcb911dbb2315985bab060bfd58261ace3c654bdbbe2e8ed27a46e836490145c86dc7bae15c011f7e1ffc33730109b9338cd9f483e7cef3d2f396aab5bd80efb6646d7e778270ee99d934d187dd98"
-const revokedKeyHex = "988d045331ce82010400c4fdf7b40a5477f206e6ee278eaef888ca73bf9128a9eef9f2f1ddb8b7b71a4c07cfa241f028a04edb405e4d916c61d6beabc333813dc7b484d2b3c52ee233c6a79b1eea4e9cc51596ba9cd5ac5aeb9df62d86ea051055b79d03f8a4fa9f38386f5bd17529138f3325d46801514ea9047977e0829ed728e68636802796801be10011010001889f04200102000905025331d0e3021d03000a0910a401d9f09a34f7c042aa040086631196405b7e6af71026b88e98012eab44aa9849f6ef3fa930c7c9f23deaedba9db1538830f8652fb7648ec3fcade8dbcbf9eaf428e83c6cbcc272201bfe2fbb90d41963397a7c0637a1a9d9448ce695d9790db2dc95433ad7be19eb3de72dacf1d6db82c3644c13eae2a3d072b99bb341debba012c5ce4006a7d34a1f4b94b444526567205265766f6b657220283c52656727732022424d204261726973746122204b657920262530305c303e5c29203c72656740626d626172697374612e636f2e61753e88b704130102002205025331ce82021b03060b090807030206150802090a0b0416020301021e01021780000a0910a401d9f09a34f7c0019c03f75edfbeb6a73e7225ad3cc52724e2872e04260d7daf0d693c170d8c4b243b8767bc7785763533febc62ec2600c30603c433c095453ede59ff2fcabeb84ce32e0ed9d5cf15ffcbc816202b64370d4d77c1e9077d74e94a16fb4fa2e5bec23a56d7a73cf275f91691ae1801a976fcde09e981a2f6327ac27ea1fecf3185df0d56889c04100102000605025331cfb5000a0910fe9645554e8266b64b4303fc084075396674fb6f778d302ac07cef6bc0b5d07b66b2004c44aef711cbac79617ef06d836b4957522d8772dd94bf41a2f4ac8b1ee6d70c57503f837445a74765a076d07b829b8111fc2a918423ddb817ead7ca2a613ef0bfb9c6b3562aec6c3cf3c75ef3031d81d95f6563e4cdcc9960bcb386c5d757b104fcca5fe11fc709df884604101102000605025331cfe7000a09107b15a67f0b3ddc0317f6009e360beea58f29c1d963a22b962b80788c3fa6c84e009d148cfde6b351469b8eae91187eff07ad9d08fcaab88d045331ce820104009f25e20a42b904f3fa555530fe5c46737cf7bd076c35a2a0d22b11f7e0b61a69320b768f4a80fe13980ce380d1cfc4a0cd8fbe2d2e2ef85416668b77208baa65bf973fe8e500e78cc310d7c8705cdb34328bf80e24f0385fce5845c33bc7943cf6b11b02348a23da0bf6428e57c05135f2dc6bd7c1ce325d666d5a5fd2fd5e410011010001889f04180102000905025331ce82021b0c000a0910a401d9f09a34f7c0418003fe34feafcbeaef348a800a0d908a7a6809cc7304017d820f70f0474d5e23cb17e38b67dc6dca282c6ca00961f4ec9edf2738d0f087b1d81e4871ef08e1798010863afb4eac4c44a376cb343be929c5be66a78cfd4456ae9ec6a99d97f4e1c3ff3583351db2147a65c0acef5c003fb544ab3a2e2dc4d43646f58b811a6c3a369d1f"
-const revokedSubkeyHex = "988d04533121f6010400aefc803a3e4bb1a61c86e8a86d2726c6a43e0079e9f2713f1fa017e9854c83877f4aced8e331d675c67ea83ddab80aacbfa0b9040bb12d96f5a3d6be09455e2a76546cbd21677537db941cab710216b6d24ec277ee0bd65b910f416737ed120f6b93a9d3b306245c8cfd8394606fdb462e5cf43c551438d2864506c63367fc890011010001b41d416c696365203c616c69636540626d626172697374612e636f2e61753e88bb041301020025021b03060b090807030206150802090a0b0416020301021e01021780050253312798021901000a09104ef7e4beccde97f015a803ff5448437780f63263b0df8442a995e7f76c221351a51edd06f2063d8166cf3157aada4923dfc44aa0f2a6a4da5cf83b7fe722ba8ab416c976e77c6b5682e7f1069026673bd0de56ba06fd5d7a9f177607f277d9b55ff940a638c3e68525c67517e2b3d976899b93ca267f705b3e5efad7d61220e96b618a4497eab8d04403d23f8846041011020006050253312910000a09107b15a67f0b3ddc03d96e009f50b6365d86c4be5d5e9d0ea42d5e56f5794c617700a0ab274e19c2827780016d23417ce89e0a2c0d987d889c04100102000605025331cf7a000a0910a401d9f09a34f7c0ee970400aca292f213041c9f3b3fc49148cbda9d84afee6183c8dd6c5ff2600b29482db5fecd4303797be1ee6d544a20a858080fec43412061c9a71fae4039fd58013b4ae341273e6c66ad4c7cdd9e68245bedb260562e7b166f2461a1032f2b38c0e0e5715fb3d1656979e052b55ca827a76f872b78a9fdae64bc298170bfcebedc1271b41a416c696365203c616c696365407379646973702e6f722e61753e88b804130102002205025331278b021b03060b090807030206150802090a0b0416020301021e01021780000a09104ef7e4beccde97f06a7003fa03c3af68d272ebc1fa08aa72a03b02189c26496a2833d90450801c4e42c5b5f51ad96ce2d2c9cef4b7c02a6a2fcf1412d6a2d486098eb762f5010a201819c17fd2888aec8eda20c65a3b75744de7ee5cc8ac7bfc470cbe3cb982720405a27a3c6a8c229cfe36905f881b02ed5680f6a8f05866efb9d6c5844897e631deb949ca8846041011020006050253312910000a09107b15a67f0b3ddc0347bc009f7fa35db59147469eb6f2c5aaf6428accb138b22800a0caa2f5f0874bacc5909c652a57a31beda65eddd5889c04100102000605025331cf7a000a0910a401d9f09a34f7c0316403ff46f2a5c101256627f16384d34a38fb47a6c88ba60506843e532d91614339fccae5f884a5741e7582ffaf292ba38ee10a270a05f139bde3814b6a077e8cd2db0f105ebea2a83af70d385f13b507fac2ad93ff79d84950328bb86f3074745a8b7f9b64990fb142e2a12976e27e8d09a28dc5621f957ac49091116da410ac3cbde1b88d04533121f6010400cbd785b56905e4192e2fb62a720727d43c4fa487821203cf72138b884b78b701093243e1d8c92a0248a6c0203a5a88693da34af357499abacaf4b3309c640797d03093870a323b4b6f37865f6eaa2838148a67df4735d43a90ca87942554cdf1c4a751b1e75f9fd4ce4e97e278d6c1c7ed59d33441df7d084f3f02beb68896c70011010001889f0418010200090502533121f6021b0c000a09104ef7e4beccde97f0b98b03fc0a5ccf6a372995835a2f5da33b282a7d612c0ab2a97f59cf9fff73e9110981aac2858c41399afa29624a7fd8a0add11654e3d882c0fd199e161bdad65e5e2548f7b68a437ea64293db1246e3011cbb94dc1bcdeaf0f2539bd88ff16d95547144d97cead6a8c5927660a91e6db0d16eb36b7b49a3525b54d1644e65599b032b7eb901a204533127a0110400bd3edaa09eff9809c4edc2c2a0ebe52e53c50a19c1e49ab78e6167bf61473bb08f2050d78a5cbbc6ed66aff7b42cd503f16b4a0b99fa1609681fca9b7ce2bbb1a5b3864d6cdda4d7ef7849d156d534dea30fb0efb9e4cf8959a2b2ce623905882d5430b995a15c3b9fe92906086788b891002924f94abe139b42cbbfaaabe42f00a0b65dc1a1ad27d798adbcb5b5ad02d2688c89477b03ff4eebb6f7b15a73b96a96bed201c0e5e4ea27e4c6e2dd1005b94d4b90137a5b1cf5e01c6226c070c4cc999938101578877ee76d296b9aab8246d57049caacf489e80a3f40589cade790a020b1ac146d6f7a6241184b8c7fcde680eae3188f5dcbe846d7f7bdad34f6fcfca08413e19c1d5df83fc7c7c627d493492e009c2f52a80400a2fe82de87136fd2e8845888c4431b032ba29d9a29a804277e31002a8201fb8591a3e55c7a0d0881496caf8b9fb07544a5a4879291d0dc026a0ea9e5bd88eb4aa4947bbd694b25012e208a250d65ddc6f1eea59d3aed3b4ec15fcab85e2afaa23a40ab1ef9ce3e11e1bc1c34a0e758e7aa64deb8739276df0af7d4121f834a9b88e70418010200090502533127a0021b02005209104ef7e4beccde97f047200419110200060502533127a0000a0910dbce4ee19529437fe045009c0b32f5ead48ee8a7e98fac0dea3d3e6c0e2c552500a0ad71fadc5007cfaf842d9b7db3335a8cdad15d3d1a6404009b08e2c68fe8f3b45c1bb72a4b3278cdf3012aa0f229883ad74aa1f6000bb90b18301b2f85372ca5d6b9bf478d235b733b1b197d19ccca48e9daf8e890cb64546b4ce1b178faccfff07003c172a2d4f5ebaba9f57153955f3f61a9b80a4f5cb959908f8b211b03b7026a8a82fc612bfedd3794969bcf458c4ce92be215a1176ab88d045331d144010400a5063000c5aaf34953c1aa3bfc95045b3aab9882b9a8027fecfe2142dc6b47ba8aca667399990244d513dd0504716908c17d92c65e74219e004f7b83fc125e575dd58efec3ab6dd22e3580106998523dea42ec75bf9aa111734c82df54630bebdff20fe981cfc36c76f865eb1c2fb62c9e85bc3a6e5015a361a2eb1c8431578d0011010001889f04280102000905025331d433021d03000a09104ef7e4beccde97f02e5503ff5e0630d1b65291f4882b6d40a29da4616bb5088717d469fbcc3648b8276de04a04988b1f1b9f3e18f52265c1f8b6c85861691c1a6b8a3a25a1809a0b32ad330aec5667cb4262f4450649184e8113849b05e5ad06a316ea80c001e8e71838190339a6e48bbde30647bcf245134b9a97fa875c1d83a9862cae87ffd7e2c4ce3a1b89013d04180102000905025331d144021b0200a809104ef7e4beccde97f09d2004190102000605025331d144000a0910677815e371c2fd23522203fe22ab62b8e7a151383cea3edd3a12995693911426f8ccf125e1f6426388c0010f88d9ca7da2224aee8d1c12135998640c5e1813d55a93df472faae75bef858457248db41b4505827590aeccf6f9eb646da7f980655dd3050c6897feddddaca90676dee856d66db8923477d251712bb9b3186b4d0114daf7d6b59272b53218dd1da94a03ff64006fcbe71211e5daecd9961fba66cdb6de3f914882c58ba5beddeba7dcb950c1156d7fba18c19ea880dccc800eae335deec34e3b84ac75ffa24864f782f87815cda1c0f634b3dd2fa67cea30811d21723d21d9551fa12ccbcfa62b6d3a15d01307b99925707992556d50065505b090aadb8579083a20fe65bd2a270da9b011"
-const missingCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Charset: UTF-8
-
-mQENBFMYynYBCACVOZ3/e8Bm2b9KH9QyIlHGo/i1bnkpqsgXj8tpJ2MIUOnXMMAY
-ztW7kKFLCmgVdLIC0vSoLA4yhaLcMojznh/2CcUglZeb6Ao8Gtelr//Rd5DRfPpG
-zqcfUo+m+eO1co2Orabw0tZDfGpg5p3AYl0hmxhUyYSc/xUq93xL1UJzBFgYXY54
-QsM8dgeQgFseSk/YvdP5SMx1ev+eraUyiiUtWzWrWC1TdyRa5p4UZg6Rkoppf+WJ
-QrW6BWrhAtqATHc8ozV7uJjeONjUEq24roRc/OFZdmQQGK6yrzKnnbA6MdHhqpdo
-9kWDcXYb7pSE63Lc+OBa5X2GUVvXJLS/3nrtABEBAAG0F2ludmFsaWQtc2lnbmlu
-Zy1zdWJrZXlziQEoBBMBAgASBQJTnKB5AhsBAgsHAhUIAh4BAAoJEO3UDQUIHpI/
-dN4H/idX4FQ1LIZCnpHS/oxoWQWfpRgdKAEM0qCqjMgiipJeEwSQbqjTCynuh5/R
-JlODDz85ABR06aoF4l5ebGLQWFCYifPnJZ/Yf5OYcMGtb7dIbqxWVFL9iLMO/oDL
-ioI3dotjPui5e+2hI9pVH1UHB/bZ/GvMGo6Zg0XxLPolKQODMVjpjLAQ0YJ3spew
-RAmOGre6tIvbDsMBnm8qREt7a07cBJ6XK7xjxYaZHQBiHVxyEWDa6gyANONx8duW
-/fhQ/zDTnyVM/ik6VO0Ty9BhPpcEYLFwh5c1ilFari1ta3e6qKo6ZGa9YMk/REhu
-yBHd9nTkI+0CiQUmbckUiVjDKKe5AQ0EUxjKdgEIAJcXQeP+NmuciE99YcJoffxv
-2gVLU4ZXBNHEaP0mgaJ1+tmMD089vUQAcyGRvw8jfsNsVZQIOAuRxY94aHQhIRHR
-bUzBN28ofo/AJJtfx62C15xt6fDKRV6HXYqAiygrHIpEoRLyiN69iScUsjIJeyFL
-C8wa72e8pSL6dkHoaV1N9ZH/xmrJ+k0vsgkQaAh9CzYufncDxcwkoP+aOlGtX1gP
-WwWoIbz0JwLEMPHBWvDDXQcQPQTYQyj+LGC9U6f9VZHN25E94subM1MjuT9OhN9Y
-MLfWaaIc5WyhLFyQKW2Upofn9wSFi8ubyBnv640Dfd0rVmaWv7LNTZpoZ/GbJAMA
-EQEAAYkBHwQYAQIACQUCU5ygeQIbAgAKCRDt1A0FCB6SP0zCB/sEzaVR38vpx+OQ
-MMynCBJrakiqDmUZv9xtplY7zsHSQjpd6xGflbU2n+iX99Q+nav0ETQZifNUEd4N
-1ljDGQejcTyKD6Pkg6wBL3x9/RJye7Zszazm4+toJXZ8xJ3800+BtaPoI39akYJm
-+ijzbskvN0v/j5GOFJwQO0pPRAFtdHqRs9Kf4YanxhedB4dIUblzlIJuKsxFit6N
-lgGRblagG3Vv2eBszbxzPbJjHCgVLR3RmrVezKOsZjr/2i7X+xLWIR0uD3IN1qOW
-CXQxLBizEEmSNVNxsp7KPGTLnqO3bPtqFirxS9PJLIMPTPLNBY7ZYuPNTMqVIUWF
-4artDmrG
-=7FfJ
------END PGP PUBLIC KEY BLOCK-----`
-
-const invalidCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-
-mQENBFMYynYBCACVOZ3/e8Bm2b9KH9QyIlHGo/i1bnkpqsgXj8tpJ2MIUOnXMMAY
-ztW7kKFLCmgVdLIC0vSoLA4yhaLcMojznh/2CcUglZeb6Ao8Gtelr//Rd5DRfPpG
-zqcfUo+m+eO1co2Orabw0tZDfGpg5p3AYl0hmxhUyYSc/xUq93xL1UJzBFgYXY54
-QsM8dgeQgFseSk/YvdP5SMx1ev+eraUyiiUtWzWrWC1TdyRa5p4UZg6Rkoppf+WJ
-QrW6BWrhAtqATHc8ozV7uJjeONjUEq24roRc/OFZdmQQGK6yrzKnnbA6MdHhqpdo
-9kWDcXYb7pSE63Lc+OBa5X2GUVvXJLS/3nrtABEBAAG0F2ludmFsaWQtc2lnbmlu
-Zy1zdWJrZXlziQEoBBMBAgASBQJTnKB5AhsBAgsHAhUIAh4BAAoJEO3UDQUIHpI/
-dN4H/idX4FQ1LIZCnpHS/oxoWQWfpRgdKAEM0qCqjMgiipJeEwSQbqjTCynuh5/R
-JlODDz85ABR06aoF4l5ebGLQWFCYifPnJZ/Yf5OYcMGtb7dIbqxWVFL9iLMO/oDL
-ioI3dotjPui5e+2hI9pVH1UHB/bZ/GvMGo6Zg0XxLPolKQODMVjpjLAQ0YJ3spew
-RAmOGre6tIvbDsMBnm8qREt7a07cBJ6XK7xjxYaZHQBiHVxyEWDa6gyANONx8duW
-/fhQ/zDTnyVM/ik6VO0Ty9BhPpcEYLFwh5c1ilFari1ta3e6qKo6ZGa9YMk/REhu
-yBHd9nTkI+0CiQUmbckUiVjDKKe5AQ0EUxjKdgEIAIINDqlj7X6jYKc6DjwrOkjQ
-UIRWbQQar0LwmNilehmt70g5DCL1SYm9q4LcgJJ2Nhxj0/5qqsYib50OSWMcKeEe
-iRXpXzv1ObpcQtI5ithp0gR53YPXBib80t3bUzomQ5UyZqAAHzMp3BKC54/vUrSK
-FeRaxDzNLrCeyI00+LHNUtwghAqHvdNcsIf8VRumK8oTm3RmDh0TyjASWYbrt9c8
-R1Um3zuoACOVy+mEIgIzsfHq0u7dwYwJB5+KeM7ZLx+HGIYdUYzHuUE1sLwVoELh
-+SHIGHI1HDicOjzqgajShuIjj5hZTyQySVprrsLKiXS6NEwHAP20+XjayJ/R3tEA
-EQEAAYkCPgQYAQIBKAUCU5ygeQIbAsBdIAQZAQIABgUCU5ygeQAKCRCpVlnFZmhO
-52RJB/9uD1MSa0wjY6tHOIgquZcP3bHBvHmrHNMw9HR2wRCMO91ZkhrpdS3ZHtgb
-u3/55etj0FdvDo1tb8P8FGSVtO5Vcwf5APM8sbbqoi8L951Q3i7qt847lfhu6sMl
-w0LWFvPTOLHrliZHItPRjOltS1WAWfr2jUYhsU9ytaDAJmvf9DujxEOsN5G1YJep
-54JCKVCkM/y585Zcnn+yxk/XwqoNQ0/iJUT9qRrZWvoeasxhl1PQcwihCwss44A+
-YXaAt3hbk+6LEQuZoYS73yR3WHj+42tfm7YxRGeubXfgCEz/brETEWXMh4pe0vCL
-bfWrmfSPq2rDegYcAybxRQz0lF8PAAoJEO3UDQUIHpI/exkH/0vQfdHA8g/N4T6E
-i6b1CUVBAkvtdJpCATZjWPhXmShOw62gkDw306vHPilL4SCvEEi4KzG72zkp6VsB
-DSRcpxCwT4mHue+duiy53/aRMtSJ+vDfiV1Vhq+3sWAck/yUtfDU9/u4eFaiNok1
-8/Gd7reyuZt5CiJnpdPpjCwelK21l2w7sHAnJF55ITXdOxI8oG3BRKufz0z5lyDY
-s2tXYmhhQIggdgelN8LbcMhWs/PBbtUr6uZlNJG2lW1yscD4aI529VjwJlCeo745
-U7pO4eF05VViUJ2mmfoivL3tkhoTUWhx8xs8xCUcCg8DoEoSIhxtOmoTPR22Z9BL
-6LCg2mg=
-=Dhm4
------END PGP PUBLIC KEY BLOCK-----`
-
-const goodCrossSignatureKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1
-
-mI0EVUqeVwEEAMufHRrMPWK3gyvi0O0tABCs/oON9zV9KDZlr1a1M91ShCSFwCPo
-7r80PxdWVWcj0V5h50/CJYtpN3eE/mUIgW2z1uDYQF1OzrQ8ubrksfsJvpAhENom
-lTQEppv9mV8qhcM278teb7TX0pgrUHLYF5CfPdp1L957JLLXoQR/lwLVABEBAAG0
-E2dvb2Qtc2lnbmluZy1zdWJrZXmIuAQTAQIAIgUCVUqeVwIbAwYLCQgHAwIGFQgC
-CQoLBBYCAwECHgECF4AACgkQNRjL95IRWP69XQQAlH6+eyXJN4DZTLX78KGjHrsw
-6FCvxxClEPtPUjcJy/1KCRQmtLAt9PbbA78dvgzjDeZMZqRAwdjyJhjyg/fkU2OH
-7wq4ktjUu+dLcOBb+BFMEY+YjKZhf6EJuVfxoTVr5f82XNPbYHfTho9/OABKH6kv
-X70PaKZhbwnwij8Nts65AaIEVUqftREEAJ3WxZfqAX0bTDbQPf2CMT2IVMGDfhK7
-GyubOZgDFFjwUJQvHNvsrbeGLZ0xOBumLINyPO1amIfTgJNm1iiWFWfmnHReGcDl
-y5mpYG60Mb79Whdcer7CMm3AqYh/dW4g6IB02NwZMKoUHo3PXmFLxMKXnWyJ0clw
-R0LI/Qn509yXAKDh1SO20rqrBM+EAP2c5bfI98kyNwQAi3buu94qo3RR1ZbvfxgW
-CKXDVm6N99jdZGNK7FbRifXqzJJDLcXZKLnstnC4Sd3uyfyf1uFhmDLIQRryn5m+
-LBYHfDBPN3kdm7bsZDDq9GbTHiFZUfm/tChVKXWxkhpAmHhU/tH6GGzNSMXuIWSO
-aOz3Rqq0ED4NXyNKjdF9MiwD/i83S0ZBc0LmJYt4Z10jtH2B6tYdqnAK29uQaadx
-yZCX2scE09UIm32/w7pV77CKr1Cp/4OzAXS1tmFzQ+bX7DR+Gl8t4wxr57VeEMvl
-BGw4Vjh3X8//m3xynxycQU18Q1zJ6PkiMyPw2owZ/nss3hpSRKFJsxMLhW3fKmKr
-Ey2KiOcEGAECAAkFAlVKn7UCGwIAUgkQNRjL95IRWP5HIAQZEQIABgUCVUqftQAK
-CRD98VjDN10SqkWrAKDTpEY8D8HC02E/KVC5YUI01B30wgCgurpILm20kXEDCeHp
-C5pygfXw1DJrhAP+NyPJ4um/bU1I+rXaHHJYroYJs8YSweiNcwiHDQn0Engh/mVZ
-SqLHvbKh2dL/RXymC3+rjPvQf5cup9bPxNMa6WagdYBNAfzWGtkVISeaQW+cTEp/
-MtgVijRGXR/lGLGETPg2X3Afwn9N9bLMBkBprKgbBqU7lpaoPupxT61bL70=
-=vtbN
------END PGP PUBLIC KEY BLOCK-----`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed.go
deleted file mode 100644
index e8f0b5caa7..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"compress/bzip2"
-	"compress/flate"
-	"compress/zlib"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"strconv"
-)
-
-// Compressed represents a compressed OpenPGP packet. The decompressed contents
-// will contain more OpenPGP packets. See RFC 4880, section 5.6.
-type Compressed struct {
-	Body io.Reader
-}
-
-const (
-	NoCompression      = flate.NoCompression
-	BestSpeed          = flate.BestSpeed
-	BestCompression    = flate.BestCompression
-	DefaultCompression = flate.DefaultCompression
-)
-
-// CompressionConfig contains compressor configuration settings.
-type CompressionConfig struct {
-	// Level is the compression level to use. It must be set to
-	// between -1 and 9, with -1 causing the compressor to use the
-	// default compression level, 0 causing the compressor to use
-	// no compression and 1 to 9 representing increasing (better,
-	// slower) compression levels. If Level is less than -1 or
-	// more then 9, a non-nil error will be returned during
-	// encryption. See the constants above for convenient common
-	// settings for Level.
-	Level int
-}
-
-func (c *Compressed) parse(r io.Reader) error {
-	var buf [1]byte
-	_, err := readFull(r, buf[:])
-	if err != nil {
-		return err
-	}
-
-	switch buf[0] {
-	case 1:
-		c.Body = flate.NewReader(r)
-	case 2:
-		c.Body, err = zlib.NewReader(r)
-	case 3:
-		c.Body = bzip2.NewReader(r)
-	default:
-		err = errors.UnsupportedError("unknown compression algorithm: " + strconv.Itoa(int(buf[0])))
-	}
-
-	return err
-}
-
-// compressedWriterCloser represents the serialized compression stream
-// header and the compressor. Its Close() method ensures that both the
-// compressor and serialized stream header are closed. Its Write()
-// method writes to the compressor.
-type compressedWriteCloser struct {
-	sh io.Closer      // Stream Header
-	c  io.WriteCloser // Compressor
-}
-
-func (cwc compressedWriteCloser) Write(p []byte) (int, error) {
-	return cwc.c.Write(p)
-}
-
-func (cwc compressedWriteCloser) Close() (err error) {
-	err = cwc.c.Close()
-	if err != nil {
-		return err
-	}
-
-	return cwc.sh.Close()
-}
-
-// SerializeCompressed serializes a compressed data packet to w and
-// returns a WriteCloser to which the literal data packets themselves
-// can be written and which MUST be closed on completion. If cc is
-// nil, sensible defaults will be used to configure the compression
-// algorithm.
-func SerializeCompressed(w io.WriteCloser, algo CompressionAlgo, cc *CompressionConfig) (literaldata io.WriteCloser, err error) {
-	compressed, err := serializeStreamHeader(w, packetTypeCompressed)
-	if err != nil {
-		return
-	}
-
-	_, err = compressed.Write([]byte{uint8(algo)})
-	if err != nil {
-		return
-	}
-
-	level := DefaultCompression
-	if cc != nil {
-		level = cc.Level
-	}
-
-	var compressor io.WriteCloser
-	switch algo {
-	case CompressionZIP:
-		compressor, err = flate.NewWriter(compressed, level)
-	case CompressionZLIB:
-		compressor, err = zlib.NewWriterLevel(compressed, level)
-	default:
-		s := strconv.Itoa(int(algo))
-		err = errors.UnsupportedError("Unsupported compression algorithm: " + s)
-	}
-	if err != nil {
-		return
-	}
-
-	literaldata = compressedWriteCloser{compressed, compressor}
-
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed_test.go
deleted file mode 100644
index cb2d70bd41..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/compressed_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestCompressed(t *testing.T) {
-	packet, err := Read(readerFromHex(compressedHex))
-	if err != nil {
-		t.Errorf("failed to read Compressed: %s", err)
-		return
-	}
-
-	c, ok := packet.(*Compressed)
-	if !ok {
-		t.Error("didn't find Compressed packet")
-		return
-	}
-
-	contents, err := ioutil.ReadAll(c.Body)
-	if err != nil && err != io.EOF {
-		t.Error(err)
-		return
-	}
-
-	expected, _ := hex.DecodeString(compressedExpectedHex)
-	if !bytes.Equal(expected, contents) {
-		t.Errorf("got:%x want:%x", contents, expected)
-	}
-}
-
-const compressedHex = "a3013b2d90c4e02b72e25f727e5e496a5e49b11e1700"
-const compressedExpectedHex = "cb1062004d14c8fe636f6e74656e74732e0a"
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/config.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/config.go
deleted file mode 100644
index c76eecc963..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/config.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"crypto/rand"
-	"io"
-	"time"
-)
-
-// Config collects a number of parameters along with sensible defaults.
-// A nil *Config is valid and results in all default values.
-type Config struct {
-	// Rand provides the source of entropy.
-	// If nil, the crypto/rand Reader is used.
-	Rand io.Reader
-	// DefaultHash is the default hash function to be used.
-	// If zero, SHA-256 is used.
-	DefaultHash crypto.Hash
-	// DefaultCipher is the cipher to be used.
-	// If zero, AES-128 is used.
-	DefaultCipher CipherFunction
-	// Time returns the current time as the number of seconds since the
-	// epoch. If Time is nil, time.Now is used.
-	Time func() time.Time
-	// DefaultCompressionAlgo is the compression algorithm to be
-	// applied to the plaintext before encryption. If zero, no
-	// compression is done.
-	DefaultCompressionAlgo CompressionAlgo
-	// CompressionConfig configures the compression settings.
-	CompressionConfig *CompressionConfig
-	// S2KCount is only used for symmetric encryption. It
-	// determines the strength of the passphrase stretching when
-	// the said passphrase is hashed to produce a key. S2KCount
-	// should be between 1024 and 65011712, inclusive. If Config
-	// is nil or S2KCount is 0, the value 65536 used. Not all
-	// values in the above range can be represented. S2KCount will
-	// be rounded up to the next representable value if it cannot
-	// be encoded exactly. When set, it is strongly encrouraged to
-	// use a value that is at least 65536. See RFC 4880 Section
-	// 3.7.1.3.
-	S2KCount int
-	// RSABits is the number of bits in new RSA keys made with NewEntity.
-	// If zero, then 2048 bit keys are created.
-	RSABits int
-}
-
-func (c *Config) Random() io.Reader {
-	if c == nil || c.Rand == nil {
-		return rand.Reader
-	}
-	return c.Rand
-}
-
-func (c *Config) Hash() crypto.Hash {
-	if c == nil || uint(c.DefaultHash) == 0 {
-		return crypto.SHA256
-	}
-	return c.DefaultHash
-}
-
-func (c *Config) Cipher() CipherFunction {
-	if c == nil || uint8(c.DefaultCipher) == 0 {
-		return CipherAES128
-	}
-	return c.DefaultCipher
-}
-
-func (c *Config) Now() time.Time {
-	if c == nil || c.Time == nil {
-		return time.Now()
-	}
-	return c.Time()
-}
-
-func (c *Config) Compression() CompressionAlgo {
-	if c == nil {
-		return CompressionNone
-	}
-	return c.DefaultCompressionAlgo
-}
-
-func (c *Config) PasswordHashIterations() int {
-	if c == nil || c.S2KCount == 0 {
-		return 0
-	}
-	return c.S2KCount
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go
deleted file mode 100644
index 266840d05a..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto/rsa"
-	"encoding/binary"
-	"io"
-	"math/big"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-const encryptedKeyVersion = 3
-
-// EncryptedKey represents a public-key encrypted session key. See RFC 4880,
-// section 5.1.
-type EncryptedKey struct {
-	KeyId      uint64
-	Algo       PublicKeyAlgorithm
-	CipherFunc CipherFunction // only valid after a successful Decrypt
-	Key        []byte         // only valid after a successful Decrypt
-
-	encryptedMPI1, encryptedMPI2 parsedMPI
-}
-
-func (e *EncryptedKey) parse(r io.Reader) (err error) {
-	var buf [10]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != encryptedKeyVersion {
-		return errors.UnsupportedError("unknown EncryptedKey version " + strconv.Itoa(int(buf[0])))
-	}
-	e.KeyId = binary.BigEndian.Uint64(buf[1:9])
-	e.Algo = PublicKeyAlgorithm(buf[9])
-	switch e.Algo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		e.encryptedMPI1.bytes, e.encryptedMPI1.bitLength, err = readMPI(r)
-	case PubKeyAlgoElGamal:
-		e.encryptedMPI1.bytes, e.encryptedMPI1.bitLength, err = readMPI(r)
-		if err != nil {
-			return
-		}
-		e.encryptedMPI2.bytes, e.encryptedMPI2.bitLength, err = readMPI(r)
-	}
-	_, err = consumeAll(r)
-	return
-}
-
-func checksumKeyMaterial(key []byte) uint16 {
-	var checksum uint16
-	for _, v := range key {
-		checksum += uint16(v)
-	}
-	return checksum
-}
-
-// Decrypt decrypts an encrypted session key with the given private key. The
-// private key must have been decrypted first.
-// If config is nil, sensible defaults will be used.
-func (e *EncryptedKey) Decrypt(priv *PrivateKey, config *Config) error {
-	var err error
-	var b []byte
-
-	// TODO(agl): use session key decryption routines here to avoid
-	// padding oracle attacks.
-	switch priv.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		b, err = rsa.DecryptPKCS1v15(config.Random(), priv.PrivateKey.(*rsa.PrivateKey), e.encryptedMPI1.bytes)
-	case PubKeyAlgoElGamal:
-		c1 := new(big.Int).SetBytes(e.encryptedMPI1.bytes)
-		c2 := new(big.Int).SetBytes(e.encryptedMPI2.bytes)
-		b, err = elgamal.Decrypt(priv.PrivateKey.(*elgamal.PrivateKey), c1, c2)
-	default:
-		err = errors.InvalidArgumentError("cannot decrypted encrypted session key with private key of type " + strconv.Itoa(int(priv.PubKeyAlgo)))
-	}
-
-	if err != nil {
-		return err
-	}
-
-	e.CipherFunc = CipherFunction(b[0])
-	e.Key = b[1 : len(b)-2]
-	expectedChecksum := uint16(b[len(b)-2])<<8 | uint16(b[len(b)-1])
-	checksum := checksumKeyMaterial(e.Key)
-	if checksum != expectedChecksum {
-		return errors.StructuralError("EncryptedKey checksum incorrect")
-	}
-
-	return nil
-}
-
-// Serialize writes the encrypted key packet, e, to w.
-func (e *EncryptedKey) Serialize(w io.Writer) error {
-	var mpiLen int
-	switch e.Algo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		mpiLen = 2 + len(e.encryptedMPI1.bytes)
-	case PubKeyAlgoElGamal:
-		mpiLen = 2 + len(e.encryptedMPI1.bytes) + 2 + len(e.encryptedMPI2.bytes)
-	default:
-		return errors.InvalidArgumentError("don't know how to serialize encrypted key type " + strconv.Itoa(int(e.Algo)))
-	}
-
-	serializeHeader(w, packetTypeEncryptedKey, 1 /* version */ +8 /* key id */ +1 /* algo */ +mpiLen)
-
-	w.Write([]byte{encryptedKeyVersion})
-	binary.Write(w, binary.BigEndian, e.KeyId)
-	w.Write([]byte{byte(e.Algo)})
-
-	switch e.Algo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		writeMPIs(w, e.encryptedMPI1)
-	case PubKeyAlgoElGamal:
-		writeMPIs(w, e.encryptedMPI1, e.encryptedMPI2)
-	default:
-		panic("internal error")
-	}
-
-	return nil
-}
-
-// SerializeEncryptedKey serializes an encrypted key packet to w that contains
-// key, encrypted to pub.
-// If config is nil, sensible defaults will be used.
-func SerializeEncryptedKey(w io.Writer, pub *PublicKey, cipherFunc CipherFunction, key []byte, config *Config) error {
-	var buf [10]byte
-	buf[0] = encryptedKeyVersion
-	binary.BigEndian.PutUint64(buf[1:9], pub.KeyId)
-	buf[9] = byte(pub.PubKeyAlgo)
-
-	keyBlock := make([]byte, 1 /* cipher type */ +len(key)+2 /* checksum */)
-	keyBlock[0] = byte(cipherFunc)
-	copy(keyBlock[1:], key)
-	checksum := checksumKeyMaterial(key)
-	keyBlock[1+len(key)] = byte(checksum >> 8)
-	keyBlock[1+len(key)+1] = byte(checksum)
-
-	switch pub.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly:
-		return serializeEncryptedKeyRSA(w, config.Random(), buf, pub.PublicKey.(*rsa.PublicKey), keyBlock)
-	case PubKeyAlgoElGamal:
-		return serializeEncryptedKeyElGamal(w, config.Random(), buf, pub.PublicKey.(*elgamal.PublicKey), keyBlock)
-	case PubKeyAlgoDSA, PubKeyAlgoRSASignOnly:
-		return errors.InvalidArgumentError("cannot encrypt to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
-	}
-
-	return errors.UnsupportedError("encrypting a key to public key of type " + strconv.Itoa(int(pub.PubKeyAlgo)))
-}
-
-func serializeEncryptedKeyRSA(w io.Writer, rand io.Reader, header [10]byte, pub *rsa.PublicKey, keyBlock []byte) error {
-	cipherText, err := rsa.EncryptPKCS1v15(rand, pub, keyBlock)
-	if err != nil {
-		return errors.InvalidArgumentError("RSA encryption failed: " + err.Error())
-	}
-
-	packetLen := 10 /* header length */ + 2 /* mpi size */ + len(cipherText)
-
-	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(header[:])
-	if err != nil {
-		return err
-	}
-	return writeMPI(w, 8*uint16(len(cipherText)), cipherText)
-}
-
-func serializeEncryptedKeyElGamal(w io.Writer, rand io.Reader, header [10]byte, pub *elgamal.PublicKey, keyBlock []byte) error {
-	c1, c2, err := elgamal.Encrypt(rand, pub, keyBlock)
-	if err != nil {
-		return errors.InvalidArgumentError("ElGamal encryption failed: " + err.Error())
-	}
-
-	packetLen := 10 /* header length */
-	packetLen += 2 /* mpi size */ + (c1.BitLen()+7)/8
-	packetLen += 2 /* mpi size */ + (c2.BitLen()+7)/8
-
-	err = serializeHeader(w, packetTypeEncryptedKey, packetLen)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(header[:])
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, c1)
-	if err != nil {
-		return err
-	}
-	return writeBig(w, c2)
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key_test.go
deleted file mode 100644
index fee14cf3cf..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/encrypted_key_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/rsa"
-	"encoding/hex"
-	"fmt"
-	"math/big"
-	"testing"
-)
-
-func bigFromBase10(s string) *big.Int {
-	b, ok := new(big.Int).SetString(s, 10)
-	if !ok {
-		panic("bigFromBase10 failed")
-	}
-	return b
-}
-
-var encryptedKeyPub = rsa.PublicKey{
-	E: 65537,
-	N: bigFromBase10("115804063926007623305902631768113868327816898845124614648849934718568541074358183759250136204762053879858102352159854352727097033322663029387610959884180306668628526686121021235757016368038585212410610742029286439607686208110250133174279811431933746643015923132833417396844716207301518956640020862630546868823"),
-}
-
-var encryptedKeyRSAPriv = &rsa.PrivateKey{
-	PublicKey: encryptedKeyPub,
-	D:         bigFromBase10("32355588668219869544751561565313228297765464314098552250409557267371233892496951383426602439009993875125222579159850054973310859166139474359774543943714622292329487391199285040721944491839695981199720170366763547754915493640685849961780092241140181198779299712578774460837139360803883139311171713302987058393"),
-}
-
-var encryptedKeyPriv = &PrivateKey{
-	PublicKey: PublicKey{
-		PubKeyAlgo: PubKeyAlgoRSA,
-	},
-	PrivateKey: encryptedKeyRSAPriv,
-}
-
-func TestDecryptingEncryptedKey(t *testing.T) {
-	const encryptedKeyHex = "c18c032a67d68660df41c70104005789d0de26b6a50c985a02a13131ca829c413a35d0e6fa8d6842599252162808ac7439c72151c8c6183e76923fe3299301414d0c25a2f06a2257db3839e7df0ec964773f6e4c4ac7ff3b48c444237166dd46ba8ff443a5410dc670cb486672fdbe7c9dfafb75b4fea83af3a204fe2a7dfa86bd20122b4f3d2646cbeecb8f7be8"
-	const expectedKeyHex = "d930363f7e0308c333b9618617ea728963d8df993665ae7be1092d4926fd864b"
-
-	p, err := Read(readerFromHex(encryptedKeyHex))
-	if err != nil {
-		t.Errorf("error from Read: %s", err)
-		return
-	}
-	ek, ok := p.(*EncryptedKey)
-	if !ok {
-		t.Errorf("didn't parse an EncryptedKey, got %#v", p)
-		return
-	}
-
-	if ek.KeyId != 0x2a67d68660df41c7 || ek.Algo != PubKeyAlgoRSA {
-		t.Errorf("unexpected EncryptedKey contents: %#v", ek)
-		return
-	}
-
-	err = ek.Decrypt(encryptedKeyPriv, nil)
-	if err != nil {
-		t.Errorf("error from Decrypt: %s", err)
-		return
-	}
-
-	if ek.CipherFunc != CipherAES256 {
-		t.Errorf("unexpected EncryptedKey contents: %#v", ek)
-		return
-	}
-
-	keyHex := fmt.Sprintf("%x", ek.Key)
-	if keyHex != expectedKeyHex {
-		t.Errorf("bad key, got %s want %x", keyHex, expectedKeyHex)
-	}
-}
-
-func TestEncryptingEncryptedKey(t *testing.T) {
-	key := []byte{1, 2, 3, 4}
-	const expectedKeyHex = "01020304"
-	const keyId = 42
-
-	pub := &PublicKey{
-		PublicKey:  &encryptedKeyPub,
-		KeyId:      keyId,
-		PubKeyAlgo: PubKeyAlgoRSAEncryptOnly,
-	}
-
-	buf := new(bytes.Buffer)
-	err := SerializeEncryptedKey(buf, pub, CipherAES128, key, nil)
-	if err != nil {
-		t.Errorf("error writing encrypted key packet: %s", err)
-	}
-
-	p, err := Read(buf)
-	if err != nil {
-		t.Errorf("error from Read: %s", err)
-		return
-	}
-	ek, ok := p.(*EncryptedKey)
-	if !ok {
-		t.Errorf("didn't parse an EncryptedKey, got %#v", p)
-		return
-	}
-
-	if ek.KeyId != keyId || ek.Algo != PubKeyAlgoRSAEncryptOnly {
-		t.Errorf("unexpected EncryptedKey contents: %#v", ek)
-		return
-	}
-
-	err = ek.Decrypt(encryptedKeyPriv, nil)
-	if err != nil {
-		t.Errorf("error from Decrypt: %s", err)
-		return
-	}
-
-	if ek.CipherFunc != CipherAES128 {
-		t.Errorf("unexpected EncryptedKey contents: %#v", ek)
-		return
-	}
-
-	keyHex := fmt.Sprintf("%x", ek.Key)
-	if keyHex != expectedKeyHex {
-		t.Errorf("bad key, got %s want %x", keyHex, expectedKeyHex)
-	}
-}
-
-func TestSerializingEncryptedKey(t *testing.T) {
-	const encryptedKeyHex = "c18c032a67d68660df41c70104005789d0de26b6a50c985a02a13131ca829c413a35d0e6fa8d6842599252162808ac7439c72151c8c6183e76923fe3299301414d0c25a2f06a2257db3839e7df0ec964773f6e4c4ac7ff3b48c444237166dd46ba8ff443a5410dc670cb486672fdbe7c9dfafb75b4fea83af3a204fe2a7dfa86bd20122b4f3d2646cbeecb8f7be8"
-
-	p, err := Read(readerFromHex(encryptedKeyHex))
-	if err != nil {
-		t.Fatalf("error from Read: %s", err)
-	}
-	ek, ok := p.(*EncryptedKey)
-	if !ok {
-		t.Fatalf("didn't parse an EncryptedKey, got %#v", p)
-	}
-
-	var buf bytes.Buffer
-	ek.Serialize(&buf)
-
-	if bufHex := hex.EncodeToString(buf.Bytes()); bufHex != encryptedKeyHex {
-		t.Fatalf("serialization of encrypted key differed from original. Original was %s, but reserialized as %s", encryptedKeyHex, bufHex)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/literal.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/literal.go
deleted file mode 100644
index 1a9ec6e51e..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/literal.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"encoding/binary"
-	"io"
-)
-
-// LiteralData represents an encrypted file. See RFC 4880, section 5.9.
-type LiteralData struct {
-	IsBinary bool
-	FileName string
-	Time     uint32 // Unix epoch time. Either creation time or modification time. 0 means undefined.
-	Body     io.Reader
-}
-
-// ForEyesOnly returns whether the contents of the LiteralData have been marked
-// as especially sensitive.
-func (l *LiteralData) ForEyesOnly() bool {
-	return l.FileName == "_CONSOLE"
-}
-
-func (l *LiteralData) parse(r io.Reader) (err error) {
-	var buf [256]byte
-
-	_, err = readFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-
-	l.IsBinary = buf[0] == 'b'
-	fileNameLen := int(buf[1])
-
-	_, err = readFull(r, buf[:fileNameLen])
-	if err != nil {
-		return
-	}
-
-	l.FileName = string(buf[:fileNameLen])
-
-	_, err = readFull(r, buf[:4])
-	if err != nil {
-		return
-	}
-
-	l.Time = binary.BigEndian.Uint32(buf[:4])
-	l.Body = r
-	return
-}
-
-// SerializeLiteral serializes a literal data packet to w and returns a
-// WriteCloser to which the data itself can be written and which MUST be closed
-// on completion. The fileName is truncated to 255 bytes.
-func SerializeLiteral(w io.WriteCloser, isBinary bool, fileName string, time uint32) (plaintext io.WriteCloser, err error) {
-	var buf [4]byte
-	buf[0] = 't'
-	if isBinary {
-		buf[0] = 'b'
-	}
-	if len(fileName) > 255 {
-		fileName = fileName[:255]
-	}
-	buf[1] = byte(len(fileName))
-
-	inner, err := serializeStreamHeader(w, packetTypeLiteralData)
-	if err != nil {
-		return
-	}
-
-	_, err = inner.Write(buf[:2])
-	if err != nil {
-		return
-	}
-	_, err = inner.Write([]byte(fileName))
-	if err != nil {
-		return
-	}
-	binary.BigEndian.PutUint32(buf[:], time)
-	_, err = inner.Write(buf[:])
-	if err != nil {
-		return
-	}
-
-	plaintext = inner
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
deleted file mode 100644
index ce2a33a547..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// OpenPGP CFB Mode. http://tools.ietf.org/html/rfc4880#section-13.9
-
-package packet
-
-import (
-	"crypto/cipher"
-)
-
-type ocfbEncrypter struct {
-	b       cipher.Block
-	fre     []byte
-	outUsed int
-}
-
-// An OCFBResyncOption determines if the "resynchronization step" of OCFB is
-// performed.
-type OCFBResyncOption bool
-
-const (
-	OCFBResync   OCFBResyncOption = true
-	OCFBNoResync OCFBResyncOption = false
-)
-
-// NewOCFBEncrypter returns a cipher.Stream which encrypts data with OpenPGP's
-// cipher feedback mode using the given cipher.Block, and an initial amount of
-// ciphertext.  randData must be random bytes and be the same length as the
-// cipher.Block's block size. Resync determines if the "resynchronization step"
-// from RFC 4880, 13.9 step 7 is performed. Different parts of OpenPGP vary on
-// this point.
-func NewOCFBEncrypter(block cipher.Block, randData []byte, resync OCFBResyncOption) (cipher.Stream, []byte) {
-	blockSize := block.BlockSize()
-	if len(randData) != blockSize {
-		return nil, nil
-	}
-
-	x := &ocfbEncrypter{
-		b:       block,
-		fre:     make([]byte, blockSize),
-		outUsed: 0,
-	}
-	prefix := make([]byte, blockSize+2)
-
-	block.Encrypt(x.fre, x.fre)
-	for i := 0; i < blockSize; i++ {
-		prefix[i] = randData[i] ^ x.fre[i]
-	}
-
-	block.Encrypt(x.fre, prefix[:blockSize])
-	prefix[blockSize] = x.fre[0] ^ randData[blockSize-2]
-	prefix[blockSize+1] = x.fre[1] ^ randData[blockSize-1]
-
-	if resync {
-		block.Encrypt(x.fre, prefix[2:])
-	} else {
-		x.fre[0] = prefix[blockSize]
-		x.fre[1] = prefix[blockSize+1]
-		x.outUsed = 2
-	}
-	return x, prefix
-}
-
-func (x *ocfbEncrypter) XORKeyStream(dst, src []byte) {
-	for i := 0; i < len(src); i++ {
-		if x.outUsed == len(x.fre) {
-			x.b.Encrypt(x.fre, x.fre)
-			x.outUsed = 0
-		}
-
-		x.fre[x.outUsed] ^= src[i]
-		dst[i] = x.fre[x.outUsed]
-		x.outUsed++
-	}
-}
-
-type ocfbDecrypter struct {
-	b       cipher.Block
-	fre     []byte
-	outUsed int
-}
-
-// NewOCFBDecrypter returns a cipher.Stream which decrypts data with OpenPGP's
-// cipher feedback mode using the given cipher.Block. Prefix must be the first
-// blockSize + 2 bytes of the ciphertext, where blockSize is the cipher.Block's
-// block size. If an incorrect key is detected then nil is returned. On
-// successful exit, blockSize+2 bytes of decrypted data are written into
-// prefix. Resync determines if the "resynchronization step" from RFC 4880,
-// 13.9 step 7 is performed. Different parts of OpenPGP vary on this point.
-func NewOCFBDecrypter(block cipher.Block, prefix []byte, resync OCFBResyncOption) cipher.Stream {
-	blockSize := block.BlockSize()
-	if len(prefix) != blockSize+2 {
-		return nil
-	}
-
-	x := &ocfbDecrypter{
-		b:       block,
-		fre:     make([]byte, blockSize),
-		outUsed: 0,
-	}
-	prefixCopy := make([]byte, len(prefix))
-	copy(prefixCopy, prefix)
-
-	block.Encrypt(x.fre, x.fre)
-	for i := 0; i < blockSize; i++ {
-		prefixCopy[i] ^= x.fre[i]
-	}
-
-	block.Encrypt(x.fre, prefix[:blockSize])
-	prefixCopy[blockSize] ^= x.fre[0]
-	prefixCopy[blockSize+1] ^= x.fre[1]
-
-	if prefixCopy[blockSize-2] != prefixCopy[blockSize] ||
-		prefixCopy[blockSize-1] != prefixCopy[blockSize+1] {
-		return nil
-	}
-
-	if resync {
-		block.Encrypt(x.fre, prefix[2:])
-	} else {
-		x.fre[0] = prefix[blockSize]
-		x.fre[1] = prefix[blockSize+1]
-		x.outUsed = 2
-	}
-	copy(prefix, prefixCopy)
-	return x
-}
-
-func (x *ocfbDecrypter) XORKeyStream(dst, src []byte) {
-	for i := 0; i < len(src); i++ {
-		if x.outUsed == len(x.fre) {
-			x.b.Encrypt(x.fre, x.fre)
-			x.outUsed = 0
-		}
-
-		c := src[i]
-		dst[i] = x.fre[x.outUsed] ^ src[i]
-		x.fre[x.outUsed] = c
-		x.outUsed++
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb_test.go
deleted file mode 100644
index 91022c042d..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/ocfb_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/rand"
-	"testing"
-)
-
-var commonKey128 = []byte{0x2b, 0x7e, 0x15, 0x16, 0x28, 0xae, 0xd2, 0xa6, 0xab, 0xf7, 0x15, 0x88, 0x09, 0xcf, 0x4f, 0x3c}
-
-func testOCFB(t *testing.T, resync OCFBResyncOption) {
-	block, err := aes.NewCipher(commonKey128)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	plaintext := []byte("this is the plaintext, which is long enough to span several blocks.")
-	randData := make([]byte, block.BlockSize())
-	rand.Reader.Read(randData)
-	ocfb, prefix := NewOCFBEncrypter(block, randData, resync)
-	ciphertext := make([]byte, len(plaintext))
-	ocfb.XORKeyStream(ciphertext, plaintext)
-
-	ocfbdec := NewOCFBDecrypter(block, prefix, resync)
-	if ocfbdec == nil {
-		t.Errorf("NewOCFBDecrypter failed (resync: %t)", resync)
-		return
-	}
-	plaintextCopy := make([]byte, len(plaintext))
-	ocfbdec.XORKeyStream(plaintextCopy, ciphertext)
-
-	if !bytes.Equal(plaintextCopy, plaintext) {
-		t.Errorf("got: %x, want: %x (resync: %t)", plaintextCopy, plaintext, resync)
-	}
-}
-
-func TestOCFB(t *testing.T) {
-	testOCFB(t, OCFBNoResync)
-	testOCFB(t, OCFBResync)
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
deleted file mode 100644
index 1713503395..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/one_pass_signature.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"encoding/binary"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-	"io"
-	"strconv"
-)
-
-// OnePassSignature represents a one-pass signature packet. See RFC 4880,
-// section 5.4.
-type OnePassSignature struct {
-	SigType    SignatureType
-	Hash       crypto.Hash
-	PubKeyAlgo PublicKeyAlgorithm
-	KeyId      uint64
-	IsLast     bool
-}
-
-const onePassSignatureVersion = 3
-
-func (ops *OnePassSignature) parse(r io.Reader) (err error) {
-	var buf [13]byte
-
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != onePassSignatureVersion {
-		err = errors.UnsupportedError("one-pass-signature packet version " + strconv.Itoa(int(buf[0])))
-	}
-
-	var ok bool
-	ops.Hash, ok = s2k.HashIdToHash(buf[2])
-	if !ok {
-		return errors.UnsupportedError("hash function: " + strconv.Itoa(int(buf[2])))
-	}
-
-	ops.SigType = SignatureType(buf[1])
-	ops.PubKeyAlgo = PublicKeyAlgorithm(buf[3])
-	ops.KeyId = binary.BigEndian.Uint64(buf[4:12])
-	ops.IsLast = buf[12] != 0
-	return
-}
-
-// Serialize marshals the given OnePassSignature to w.
-func (ops *OnePassSignature) Serialize(w io.Writer) error {
-	var buf [13]byte
-	buf[0] = onePassSignatureVersion
-	buf[1] = uint8(ops.SigType)
-	var ok bool
-	buf[2], ok = s2k.HashToHashId(ops.Hash)
-	if !ok {
-		return errors.UnsupportedError("hash type: " + strconv.Itoa(int(ops.Hash)))
-	}
-	buf[3] = uint8(ops.PubKeyAlgo)
-	binary.BigEndian.PutUint64(buf[4:12], ops.KeyId)
-	if ops.IsLast {
-		buf[12] = 1
-	}
-
-	if err := serializeHeader(w, packetTypeOnePassSignature, len(buf)); err != nil {
-		return err
-	}
-	_, err := w.Write(buf[:])
-	return err
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
deleted file mode 100644
index 456d807f25..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-// OpaquePacket represents an OpenPGP packet as raw, unparsed data. This is
-// useful for splitting and storing the original packet contents separately,
-// handling unsupported packet types or accessing parts of the packet not yet
-// implemented by this package.
-type OpaquePacket struct {
-	// Packet type
-	Tag uint8
-	// Reason why the packet was parsed opaquely
-	Reason error
-	// Binary contents of the packet data
-	Contents []byte
-}
-
-func (op *OpaquePacket) parse(r io.Reader) (err error) {
-	op.Contents, err = ioutil.ReadAll(r)
-	return
-}
-
-// Serialize marshals the packet to a writer in its original form, including
-// the packet header.
-func (op *OpaquePacket) Serialize(w io.Writer) (err error) {
-	err = serializeHeader(w, packetType(op.Tag), len(op.Contents))
-	if err == nil {
-		_, err = w.Write(op.Contents)
-	}
-	return
-}
-
-// Parse attempts to parse the opaque contents into a structure supported by
-// this package. If the packet is not known then the result will be another
-// OpaquePacket.
-func (op *OpaquePacket) Parse() (p Packet, err error) {
-	hdr := bytes.NewBuffer(nil)
-	err = serializeHeader(hdr, packetType(op.Tag), len(op.Contents))
-	if err != nil {
-		op.Reason = err
-		return op, err
-	}
-	p, err = Read(io.MultiReader(hdr, bytes.NewBuffer(op.Contents)))
-	if err != nil {
-		op.Reason = err
-		p = op
-	}
-	return
-}
-
-// OpaqueReader reads OpaquePackets from an io.Reader.
-type OpaqueReader struct {
-	r io.Reader
-}
-
-func NewOpaqueReader(r io.Reader) *OpaqueReader {
-	return &OpaqueReader{r: r}
-}
-
-// Read the next OpaquePacket.
-func (or *OpaqueReader) Next() (op *OpaquePacket, err error) {
-	tag, _, contents, err := readHeader(or.r)
-	if err != nil {
-		return
-	}
-	op = &OpaquePacket{Tag: uint8(tag), Reason: err}
-	err = op.parse(contents)
-	if err != nil {
-		consumeAll(contents)
-	}
-	return
-}
-
-// OpaqueSubpacket represents an unparsed OpenPGP subpacket,
-// as found in signature and user attribute packets.
-type OpaqueSubpacket struct {
-	SubType  uint8
-	Contents []byte
-}
-
-// OpaqueSubpackets extracts opaque, unparsed OpenPGP subpackets from
-// their byte representation.
-func OpaqueSubpackets(contents []byte) (result []*OpaqueSubpacket, err error) {
-	var (
-		subHeaderLen int
-		subPacket    *OpaqueSubpacket
-	)
-	for len(contents) > 0 {
-		subHeaderLen, subPacket, err = nextSubpacket(contents)
-		if err != nil {
-			break
-		}
-		result = append(result, subPacket)
-		contents = contents[subHeaderLen+len(subPacket.Contents):]
-	}
-	return
-}
-
-func nextSubpacket(contents []byte) (subHeaderLen int, subPacket *OpaqueSubpacket, err error) {
-	// RFC 4880, section 5.2.3.1
-	var subLen uint32
-	if len(contents) < 1 {
-		goto Truncated
-	}
-	subPacket = &OpaqueSubpacket{}
-	switch {
-	case contents[0] < 192:
-		subHeaderLen = 2 // 1 length byte, 1 subtype byte
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[0])
-		contents = contents[1:]
-	case contents[0] < 255:
-		subHeaderLen = 3 // 2 length bytes, 1 subtype
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[0]-192)<<8 + uint32(contents[1]) + 192
-		contents = contents[2:]
-	default:
-		subHeaderLen = 6 // 5 length bytes, 1 subtype
-		if len(contents) < subHeaderLen {
-			goto Truncated
-		}
-		subLen = uint32(contents[1])<<24 |
-			uint32(contents[2])<<16 |
-			uint32(contents[3])<<8 |
-			uint32(contents[4])
-		contents = contents[5:]
-	}
-	if subLen > uint32(len(contents)) || subLen == 0 {
-		goto Truncated
-	}
-	subPacket.SubType = contents[0]
-	subPacket.Contents = contents[1:subLen]
-	return
-Truncated:
-	err = errors.StructuralError("subpacket truncated")
-	return
-}
-
-func (osp *OpaqueSubpacket) Serialize(w io.Writer) (err error) {
-	buf := make([]byte, 6)
-	n := serializeSubpacketLength(buf, len(osp.Contents)+1)
-	buf[n] = osp.SubType
-	if _, err = w.Write(buf[:n+1]); err != nil {
-		return
-	}
-	_, err = w.Write(osp.Contents)
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque_test.go
deleted file mode 100644
index f27bbfe090..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/opaque_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"io"
-	"testing"
-)
-
-// Test packet.Read error handling in OpaquePacket.Parse,
-// which attempts to re-read an OpaquePacket as a supported
-// Packet type.
-func TestOpaqueParseReason(t *testing.T) {
-	buf, err := hex.DecodeString(UnsupportedKeyHex)
-	if err != nil {
-		t.Fatal(err)
-	}
-	or := NewOpaqueReader(bytes.NewBuffer(buf))
-	count := 0
-	badPackets := 0
-	var uid *UserId
-	for {
-		op, err := or.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			t.Errorf("#%d: opaque read error: %v", count, err)
-			break
-		}
-		// try to parse opaque packet
-		p, err := op.Parse()
-		switch pkt := p.(type) {
-		case *UserId:
-			uid = pkt
-		case *OpaquePacket:
-			// If an OpaquePacket can't re-parse, packet.Read
-			// certainly had its reasons.
-			if pkt.Reason == nil {
-				t.Errorf("#%d: opaque packet, no reason", count)
-			} else {
-				badPackets++
-			}
-		}
-		count++
-	}
-
-	const expectedBad = 3
-	// Test post-conditions, make sure we actually parsed packets as expected.
-	if badPackets != expectedBad {
-		t.Errorf("unexpected # unparseable packets: %d (want %d)", badPackets, expectedBad)
-	}
-	if uid == nil {
-		t.Errorf("failed to find expected UID in unsupported keyring")
-	} else if uid.Id != "Armin M. Warda <warda@nephilim.ruhr.de>" {
-		t.Errorf("unexpected UID: %v", uid.Id)
-	}
-}
-
-// This key material has public key and signature packet versions modified to
-// an unsupported value (1), so that trying to parse the OpaquePacket to
-// a typed packet will get an error. It also contains a GnuPG trust packet.
-// (Created with: od -An -t x1 pubring.gpg | xargs | sed 's/ //g')
-const UnsupportedKeyHex = `988d012e7a18a20000010400d6ac00d92b89c1f4396c243abb9b76d2e9673ad63483291fed88e22b82e255e441c078c6abbbf7d2d195e50b62eeaa915b85b0ec20c225ce2c64c167cacb6e711daf2e45da4a8356a059b8160e3b3628ac0dd8437b31f06d53d6e8ea4214d4a26406a6b63e1001406ef23e0bb3069fac9a99a91f77dfafd5de0f188a5da5e3c9000511b42741726d696e204d2e205761726461203c7761726461406e657068696c696d2e727568722e64653e8900950105102e8936c705d1eb399e58489901013f0e03ff5a0c4f421e34fcfa388129166420c08cd76987bcdec6f01bd0271459a85cc22048820dd4e44ac2c7d23908d540f54facf1b36b0d9c20488781ce9dca856531e76e2e846826e9951338020a03a09b57aa5faa82e9267458bd76105399885ac35af7dc1cbb6aaed7c39e1039f3b5beda2c0e916bd38560509bab81235d1a0ead83b0020000`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/packet.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/packet.go
deleted file mode 100644
index 3eded93f04..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/packet.go
+++ /dev/null
@@ -1,537 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package packet implements parsing and serialization of OpenPGP packets, as
-// specified in RFC 4880.
-package packet // import "golang.org/x/crypto/openpgp/packet"
-
-import (
-	"bufio"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/des"
-	"golang.org/x/crypto/cast5"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"math/big"
-)
-
-// readFull is the same as io.ReadFull except that reading zero bytes returns
-// ErrUnexpectedEOF rather than EOF.
-func readFull(r io.Reader, buf []byte) (n int, err error) {
-	n, err = io.ReadFull(r, buf)
-	if err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// readLength reads an OpenPGP length from r. See RFC 4880, section 4.2.2.
-func readLength(r io.Reader) (length int64, isPartial bool, err error) {
-	var buf [4]byte
-	_, err = readFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	switch {
-	case buf[0] < 192:
-		length = int64(buf[0])
-	case buf[0] < 224:
-		length = int64(buf[0]-192) << 8
-		_, err = readFull(r, buf[0:1])
-		if err != nil {
-			return
-		}
-		length += int64(buf[0]) + 192
-	case buf[0] < 255:
-		length = int64(1) << (buf[0] & 0x1f)
-		isPartial = true
-	default:
-		_, err = readFull(r, buf[0:4])
-		if err != nil {
-			return
-		}
-		length = int64(buf[0])<<24 |
-			int64(buf[1])<<16 |
-			int64(buf[2])<<8 |
-			int64(buf[3])
-	}
-	return
-}
-
-// partialLengthReader wraps an io.Reader and handles OpenPGP partial lengths.
-// The continuation lengths are parsed and removed from the stream and EOF is
-// returned at the end of the packet. See RFC 4880, section 4.2.2.4.
-type partialLengthReader struct {
-	r         io.Reader
-	remaining int64
-	isPartial bool
-}
-
-func (r *partialLengthReader) Read(p []byte) (n int, err error) {
-	for r.remaining == 0 {
-		if !r.isPartial {
-			return 0, io.EOF
-		}
-		r.remaining, r.isPartial, err = readLength(r.r)
-		if err != nil {
-			return 0, err
-		}
-	}
-
-	toRead := int64(len(p))
-	if toRead > r.remaining {
-		toRead = r.remaining
-	}
-
-	n, err = r.r.Read(p[:int(toRead)])
-	r.remaining -= int64(n)
-	if n < int(toRead) && err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// partialLengthWriter writes a stream of data using OpenPGP partial lengths.
-// See RFC 4880, section 4.2.2.4.
-type partialLengthWriter struct {
-	w          io.WriteCloser
-	lengthByte [1]byte
-}
-
-func (w *partialLengthWriter) Write(p []byte) (n int, err error) {
-	for len(p) > 0 {
-		for power := uint(14); power < 32; power-- {
-			l := 1 << power
-			if len(p) >= l {
-				w.lengthByte[0] = 224 + uint8(power)
-				_, err = w.w.Write(w.lengthByte[:])
-				if err != nil {
-					return
-				}
-				var m int
-				m, err = w.w.Write(p[:l])
-				n += m
-				if err != nil {
-					return
-				}
-				p = p[l:]
-				break
-			}
-		}
-	}
-	return
-}
-
-func (w *partialLengthWriter) Close() error {
-	w.lengthByte[0] = 0
-	_, err := w.w.Write(w.lengthByte[:])
-	if err != nil {
-		return err
-	}
-	return w.w.Close()
-}
-
-// A spanReader is an io.LimitReader, but it returns ErrUnexpectedEOF if the
-// underlying Reader returns EOF before the limit has been reached.
-type spanReader struct {
-	r io.Reader
-	n int64
-}
-
-func (l *spanReader) Read(p []byte) (n int, err error) {
-	if l.n <= 0 {
-		return 0, io.EOF
-	}
-	if int64(len(p)) > l.n {
-		p = p[0:l.n]
-	}
-	n, err = l.r.Read(p)
-	l.n -= int64(n)
-	if l.n > 0 && err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	return
-}
-
-// readHeader parses a packet header and returns an io.Reader which will return
-// the contents of the packet. See RFC 4880, section 4.2.
-func readHeader(r io.Reader) (tag packetType, length int64, contents io.Reader, err error) {
-	var buf [4]byte
-	_, err = io.ReadFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	if buf[0]&0x80 == 0 {
-		err = errors.StructuralError("tag byte does not have MSB set")
-		return
-	}
-	if buf[0]&0x40 == 0 {
-		// Old format packet
-		tag = packetType((buf[0] & 0x3f) >> 2)
-		lengthType := buf[0] & 3
-		if lengthType == 3 {
-			length = -1
-			contents = r
-			return
-		}
-		lengthBytes := 1 << lengthType
-		_, err = readFull(r, buf[0:lengthBytes])
-		if err != nil {
-			return
-		}
-		for i := 0; i < lengthBytes; i++ {
-			length <<= 8
-			length |= int64(buf[i])
-		}
-		contents = &spanReader{r, length}
-		return
-	}
-
-	// New format packet
-	tag = packetType(buf[0] & 0x3f)
-	length, isPartial, err := readLength(r)
-	if err != nil {
-		return
-	}
-	if isPartial {
-		contents = &partialLengthReader{
-			remaining: length,
-			isPartial: true,
-			r:         r,
-		}
-		length = -1
-	} else {
-		contents = &spanReader{r, length}
-	}
-	return
-}
-
-// serializeHeader writes an OpenPGP packet header to w. See RFC 4880, section
-// 4.2.
-func serializeHeader(w io.Writer, ptype packetType, length int) (err error) {
-	var buf [6]byte
-	var n int
-
-	buf[0] = 0x80 | 0x40 | byte(ptype)
-	if length < 192 {
-		buf[1] = byte(length)
-		n = 2
-	} else if length < 8384 {
-		length -= 192
-		buf[1] = 192 + byte(length>>8)
-		buf[2] = byte(length)
-		n = 3
-	} else {
-		buf[1] = 255
-		buf[2] = byte(length >> 24)
-		buf[3] = byte(length >> 16)
-		buf[4] = byte(length >> 8)
-		buf[5] = byte(length)
-		n = 6
-	}
-
-	_, err = w.Write(buf[:n])
-	return
-}
-
-// serializeStreamHeader writes an OpenPGP packet header to w where the
-// length of the packet is unknown. It returns a io.WriteCloser which can be
-// used to write the contents of the packet. See RFC 4880, section 4.2.
-func serializeStreamHeader(w io.WriteCloser, ptype packetType) (out io.WriteCloser, err error) {
-	var buf [1]byte
-	buf[0] = 0x80 | 0x40 | byte(ptype)
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	out = &partialLengthWriter{w: w}
-	return
-}
-
-// Packet represents an OpenPGP packet. Users are expected to try casting
-// instances of this interface to specific packet types.
-type Packet interface {
-	parse(io.Reader) error
-}
-
-// consumeAll reads from the given Reader until error, returning the number of
-// bytes read.
-func consumeAll(r io.Reader) (n int64, err error) {
-	var m int
-	var buf [1024]byte
-
-	for {
-		m, err = r.Read(buf[:])
-		n += int64(m)
-		if err == io.EOF {
-			err = nil
-			return
-		}
-		if err != nil {
-			return
-		}
-	}
-}
-
-// packetType represents the numeric ids of the different OpenPGP packet types. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-2
-type packetType uint8
-
-const (
-	packetTypeEncryptedKey              packetType = 1
-	packetTypeSignature                 packetType = 2
-	packetTypeSymmetricKeyEncrypted     packetType = 3
-	packetTypeOnePassSignature          packetType = 4
-	packetTypePrivateKey                packetType = 5
-	packetTypePublicKey                 packetType = 6
-	packetTypePrivateSubkey             packetType = 7
-	packetTypeCompressed                packetType = 8
-	packetTypeSymmetricallyEncrypted    packetType = 9
-	packetTypeLiteralData               packetType = 11
-	packetTypeUserId                    packetType = 13
-	packetTypePublicSubkey              packetType = 14
-	packetTypeUserAttribute             packetType = 17
-	packetTypeSymmetricallyEncryptedMDC packetType = 18
-)
-
-// peekVersion detects the version of a public key packet about to
-// be read. A bufio.Reader at the original position of the io.Reader
-// is returned.
-func peekVersion(r io.Reader) (bufr *bufio.Reader, ver byte, err error) {
-	bufr = bufio.NewReader(r)
-	var verBuf []byte
-	if verBuf, err = bufr.Peek(1); err != nil {
-		return
-	}
-	ver = verBuf[0]
-	return
-}
-
-// Read reads a single OpenPGP packet from the given io.Reader. If there is an
-// error parsing a packet, the whole packet is consumed from the input.
-func Read(r io.Reader) (p Packet, err error) {
-	tag, _, contents, err := readHeader(r)
-	if err != nil {
-		return
-	}
-
-	switch tag {
-	case packetTypeEncryptedKey:
-		p = new(EncryptedKey)
-	case packetTypeSignature:
-		var version byte
-		// Detect signature version
-		if contents, version, err = peekVersion(contents); err != nil {
-			return
-		}
-		if version < 4 {
-			p = new(SignatureV3)
-		} else {
-			p = new(Signature)
-		}
-	case packetTypeSymmetricKeyEncrypted:
-		p = new(SymmetricKeyEncrypted)
-	case packetTypeOnePassSignature:
-		p = new(OnePassSignature)
-	case packetTypePrivateKey, packetTypePrivateSubkey:
-		pk := new(PrivateKey)
-		if tag == packetTypePrivateSubkey {
-			pk.IsSubkey = true
-		}
-		p = pk
-	case packetTypePublicKey, packetTypePublicSubkey:
-		var version byte
-		if contents, version, err = peekVersion(contents); err != nil {
-			return
-		}
-		isSubkey := tag == packetTypePublicSubkey
-		if version < 4 {
-			p = &PublicKeyV3{IsSubkey: isSubkey}
-		} else {
-			p = &PublicKey{IsSubkey: isSubkey}
-		}
-	case packetTypeCompressed:
-		p = new(Compressed)
-	case packetTypeSymmetricallyEncrypted:
-		p = new(SymmetricallyEncrypted)
-	case packetTypeLiteralData:
-		p = new(LiteralData)
-	case packetTypeUserId:
-		p = new(UserId)
-	case packetTypeUserAttribute:
-		p = new(UserAttribute)
-	case packetTypeSymmetricallyEncryptedMDC:
-		se := new(SymmetricallyEncrypted)
-		se.MDC = true
-		p = se
-	default:
-		err = errors.UnknownPacketTypeError(tag)
-	}
-	if p != nil {
-		err = p.parse(contents)
-	}
-	if err != nil {
-		consumeAll(contents)
-	}
-	return
-}
-
-// SignatureType represents the different semantic meanings of an OpenPGP
-// signature. See RFC 4880, section 5.2.1.
-type SignatureType uint8
-
-const (
-	SigTypeBinary            SignatureType = 0
-	SigTypeText                            = 1
-	SigTypeGenericCert                     = 0x10
-	SigTypePersonaCert                     = 0x11
-	SigTypeCasualCert                      = 0x12
-	SigTypePositiveCert                    = 0x13
-	SigTypeSubkeyBinding                   = 0x18
-	SigTypePrimaryKeyBinding               = 0x19
-	SigTypeDirectSignature                 = 0x1F
-	SigTypeKeyRevocation                   = 0x20
-	SigTypeSubkeyRevocation                = 0x28
-)
-
-// PublicKeyAlgorithm represents the different public key system specified for
-// OpenPGP. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-12
-type PublicKeyAlgorithm uint8
-
-const (
-	PubKeyAlgoRSA            PublicKeyAlgorithm = 1
-	PubKeyAlgoRSAEncryptOnly PublicKeyAlgorithm = 2
-	PubKeyAlgoRSASignOnly    PublicKeyAlgorithm = 3
-	PubKeyAlgoElGamal        PublicKeyAlgorithm = 16
-	PubKeyAlgoDSA            PublicKeyAlgorithm = 17
-	// RFC 6637, Section 5.
-	PubKeyAlgoECDH  PublicKeyAlgorithm = 18
-	PubKeyAlgoECDSA PublicKeyAlgorithm = 19
-)
-
-// CanEncrypt returns true if it's possible to encrypt a message to a public
-// key of the given type.
-func (pka PublicKeyAlgorithm) CanEncrypt() bool {
-	switch pka {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoElGamal:
-		return true
-	}
-	return false
-}
-
-// CanSign returns true if it's possible for a public key of the given type to
-// sign a message.
-func (pka PublicKeyAlgorithm) CanSign() bool {
-	switch pka {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA:
-		return true
-	}
-	return false
-}
-
-// CipherFunction represents the different block ciphers specified for OpenPGP. See
-// http://www.iana.org/assignments/pgp-parameters/pgp-parameters.xhtml#pgp-parameters-13
-type CipherFunction uint8
-
-const (
-	Cipher3DES   CipherFunction = 2
-	CipherCAST5  CipherFunction = 3
-	CipherAES128 CipherFunction = 7
-	CipherAES192 CipherFunction = 8
-	CipherAES256 CipherFunction = 9
-)
-
-// KeySize returns the key size, in bytes, of cipher.
-func (cipher CipherFunction) KeySize() int {
-	switch cipher {
-	case Cipher3DES:
-		return 24
-	case CipherCAST5:
-		return cast5.KeySize
-	case CipherAES128:
-		return 16
-	case CipherAES192:
-		return 24
-	case CipherAES256:
-		return 32
-	}
-	return 0
-}
-
-// blockSize returns the block size, in bytes, of cipher.
-func (cipher CipherFunction) blockSize() int {
-	switch cipher {
-	case Cipher3DES:
-		return des.BlockSize
-	case CipherCAST5:
-		return 8
-	case CipherAES128, CipherAES192, CipherAES256:
-		return 16
-	}
-	return 0
-}
-
-// new returns a fresh instance of the given cipher.
-func (cipher CipherFunction) new(key []byte) (block cipher.Block) {
-	switch cipher {
-	case Cipher3DES:
-		block, _ = des.NewTripleDESCipher(key)
-	case CipherCAST5:
-		block, _ = cast5.NewCipher(key)
-	case CipherAES128, CipherAES192, CipherAES256:
-		block, _ = aes.NewCipher(key)
-	}
-	return
-}
-
-// readMPI reads a big integer from r. The bit length returned is the bit
-// length that was specified in r. This is preserved so that the integer can be
-// reserialized exactly.
-func readMPI(r io.Reader) (mpi []byte, bitLength uint16, err error) {
-	var buf [2]byte
-	_, err = readFull(r, buf[0:])
-	if err != nil {
-		return
-	}
-	bitLength = uint16(buf[0])<<8 | uint16(buf[1])
-	numBytes := (int(bitLength) + 7) / 8
-	mpi = make([]byte, numBytes)
-	_, err = readFull(r, mpi)
-	return
-}
-
-// mpiLength returns the length of the given *big.Int when serialized as an
-// MPI.
-func mpiLength(n *big.Int) (mpiLengthInBytes int) {
-	mpiLengthInBytes = 2 /* MPI length */
-	mpiLengthInBytes += (n.BitLen() + 7) / 8
-	return
-}
-
-// writeMPI serializes a big integer to w.
-func writeMPI(w io.Writer, bitLength uint16, mpiBytes []byte) (err error) {
-	_, err = w.Write([]byte{byte(bitLength >> 8), byte(bitLength)})
-	if err == nil {
-		_, err = w.Write(mpiBytes)
-	}
-	return
-}
-
-// writeBig serializes a *big.Int to w.
-func writeBig(w io.Writer, i *big.Int) error {
-	return writeMPI(w, uint16(i.BitLen()), i.Bytes())
-}
-
-// CompressionAlgo Represents the different compression algorithms
-// supported by OpenPGP (except for BZIP2, which is not currently
-// supported). See Section 9.3 of RFC 4880.
-type CompressionAlgo uint8
-
-const (
-	CompressionNone CompressionAlgo = 0
-	CompressionZIP  CompressionAlgo = 1
-	CompressionZLIB CompressionAlgo = 2
-)
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/packet_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/packet_test.go
deleted file mode 100644
index 1dab5c3d58..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/packet_test.go
+++ /dev/null
@@ -1,255 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestReadFull(t *testing.T) {
-	var out [4]byte
-
-	b := bytes.NewBufferString("foo")
-	n, err := readFull(b, out[:3])
-	if n != 3 || err != nil {
-		t.Errorf("full read failed n:%d err:%s", n, err)
-	}
-
-	b = bytes.NewBufferString("foo")
-	n, err = readFull(b, out[:4])
-	if n != 3 || err != io.ErrUnexpectedEOF {
-		t.Errorf("partial read failed n:%d err:%s", n, err)
-	}
-
-	b = bytes.NewBuffer(nil)
-	n, err = readFull(b, out[:3])
-	if n != 0 || err != io.ErrUnexpectedEOF {
-		t.Errorf("empty read failed n:%d err:%s", n, err)
-	}
-}
-
-func readerFromHex(s string) io.Reader {
-	data, err := hex.DecodeString(s)
-	if err != nil {
-		panic("readerFromHex: bad input")
-	}
-	return bytes.NewBuffer(data)
-}
-
-var readLengthTests = []struct {
-	hexInput  string
-	length    int64
-	isPartial bool
-	err       error
-}{
-	{"", 0, false, io.ErrUnexpectedEOF},
-	{"1f", 31, false, nil},
-	{"c0", 0, false, io.ErrUnexpectedEOF},
-	{"c101", 256 + 1 + 192, false, nil},
-	{"e0", 1, true, nil},
-	{"e1", 2, true, nil},
-	{"e2", 4, true, nil},
-	{"ff", 0, false, io.ErrUnexpectedEOF},
-	{"ff00", 0, false, io.ErrUnexpectedEOF},
-	{"ff0000", 0, false, io.ErrUnexpectedEOF},
-	{"ff000000", 0, false, io.ErrUnexpectedEOF},
-	{"ff00000000", 0, false, nil},
-	{"ff01020304", 16909060, false, nil},
-}
-
-func TestReadLength(t *testing.T) {
-	for i, test := range readLengthTests {
-		length, isPartial, err := readLength(readerFromHex(test.hexInput))
-		if test.err != nil {
-			if err != test.err {
-				t.Errorf("%d: expected different error got:%s want:%s", i, err, test.err)
-			}
-			continue
-		}
-		if err != nil {
-			t.Errorf("%d: unexpected error: %s", i, err)
-			continue
-		}
-		if length != test.length || isPartial != test.isPartial {
-			t.Errorf("%d: bad result got:(%d,%t) want:(%d,%t)", i, length, isPartial, test.length, test.isPartial)
-		}
-	}
-}
-
-var partialLengthReaderTests = []struct {
-	hexInput  string
-	err       error
-	hexOutput string
-}{
-	{"e0", io.ErrUnexpectedEOF, ""},
-	{"e001", io.ErrUnexpectedEOF, ""},
-	{"e0010102", nil, "0102"},
-	{"ff00000000", nil, ""},
-	{"e10102e1030400", nil, "01020304"},
-	{"e101", io.ErrUnexpectedEOF, ""},
-}
-
-func TestPartialLengthReader(t *testing.T) {
-	for i, test := range partialLengthReaderTests {
-		r := &partialLengthReader{readerFromHex(test.hexInput), 0, true}
-		out, err := ioutil.ReadAll(r)
-		if test.err != nil {
-			if err != test.err {
-				t.Errorf("%d: expected different error got:%s want:%s", i, err, test.err)
-			}
-			continue
-		}
-		if err != nil {
-			t.Errorf("%d: unexpected error: %s", i, err)
-			continue
-		}
-
-		got := fmt.Sprintf("%x", out)
-		if got != test.hexOutput {
-			t.Errorf("%d: got:%s want:%s", i, test.hexOutput, got)
-		}
-	}
-}
-
-var readHeaderTests = []struct {
-	hexInput        string
-	structuralError bool
-	unexpectedEOF   bool
-	tag             int
-	length          int64
-	hexOutput       string
-}{
-	{"", false, false, 0, 0, ""},
-	{"7f", true, false, 0, 0, ""},
-
-	// Old format headers
-	{"80", false, true, 0, 0, ""},
-	{"8001", false, true, 0, 1, ""},
-	{"800102", false, false, 0, 1, "02"},
-	{"81000102", false, false, 0, 1, "02"},
-	{"820000000102", false, false, 0, 1, "02"},
-	{"860000000102", false, false, 1, 1, "02"},
-	{"83010203", false, false, 0, -1, "010203"},
-
-	// New format headers
-	{"c0", false, true, 0, 0, ""},
-	{"c000", false, false, 0, 0, ""},
-	{"c00102", false, false, 0, 1, "02"},
-	{"c0020203", false, false, 0, 2, "0203"},
-	{"c00202", false, true, 0, 2, ""},
-	{"c3020203", false, false, 3, 2, "0203"},
-}
-
-func TestReadHeader(t *testing.T) {
-	for i, test := range readHeaderTests {
-		tag, length, contents, err := readHeader(readerFromHex(test.hexInput))
-		if test.structuralError {
-			if _, ok := err.(errors.StructuralError); ok {
-				continue
-			}
-			t.Errorf("%d: expected StructuralError, got:%s", i, err)
-			continue
-		}
-		if err != nil {
-			if len(test.hexInput) == 0 && err == io.EOF {
-				continue
-			}
-			if !test.unexpectedEOF || err != io.ErrUnexpectedEOF {
-				t.Errorf("%d: unexpected error from readHeader: %s", i, err)
-			}
-			continue
-		}
-		if int(tag) != test.tag || length != test.length {
-			t.Errorf("%d: got:(%d,%d) want:(%d,%d)", i, int(tag), length, test.tag, test.length)
-			continue
-		}
-
-		body, err := ioutil.ReadAll(contents)
-		if err != nil {
-			if !test.unexpectedEOF || err != io.ErrUnexpectedEOF {
-				t.Errorf("%d: unexpected error from contents: %s", i, err)
-			}
-			continue
-		}
-		if test.unexpectedEOF {
-			t.Errorf("%d: expected ErrUnexpectedEOF from contents but got no error", i)
-			continue
-		}
-		got := fmt.Sprintf("%x", body)
-		if got != test.hexOutput {
-			t.Errorf("%d: got:%s want:%s", i, got, test.hexOutput)
-		}
-	}
-}
-
-func TestSerializeHeader(t *testing.T) {
-	tag := packetTypePublicKey
-	lengths := []int{0, 1, 2, 64, 192, 193, 8000, 8384, 8385, 10000}
-
-	for _, length := range lengths {
-		buf := bytes.NewBuffer(nil)
-		serializeHeader(buf, tag, length)
-		tag2, length2, _, err := readHeader(buf)
-		if err != nil {
-			t.Errorf("length %d, err: %s", length, err)
-		}
-		if tag2 != tag {
-			t.Errorf("length %d, tag incorrect (got %d, want %d)", length, tag2, tag)
-		}
-		if int(length2) != length {
-			t.Errorf("length %d, length incorrect (got %d)", length, length2)
-		}
-	}
-}
-
-func TestPartialLengths(t *testing.T) {
-	buf := bytes.NewBuffer(nil)
-	w := new(partialLengthWriter)
-	w.w = noOpCloser{buf}
-
-	const maxChunkSize = 64
-
-	var b [maxChunkSize]byte
-	var n uint8
-	for l := 1; l <= maxChunkSize; l++ {
-		for i := 0; i < l; i++ {
-			b[i] = n
-			n++
-		}
-		m, err := w.Write(b[:l])
-		if m != l {
-			t.Errorf("short write got: %d want: %d", m, l)
-		}
-		if err != nil {
-			t.Errorf("error from write: %s", err)
-		}
-	}
-	w.Close()
-
-	want := (maxChunkSize * (maxChunkSize + 1)) / 2
-	copyBuf := bytes.NewBuffer(nil)
-	r := &partialLengthReader{buf, 0, true}
-	m, err := io.Copy(copyBuf, r)
-	if m != int64(want) {
-		t.Errorf("short copy got: %d want: %d", m, want)
-	}
-	if err != nil {
-		t.Errorf("error from copy: %s", err)
-	}
-
-	copyBytes := copyBuf.Bytes()
-	for i := 0; i < want; i++ {
-		if copyBytes[i] != uint8(i) {
-			t.Errorf("bad pattern in copy at %d", i)
-			break
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
deleted file mode 100644
index 34734cc63d..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key.go
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/cipher"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/rsa"
-	"crypto/sha1"
-	"io"
-	"io/ioutil"
-	"math/big"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// PrivateKey represents a possibly encrypted private key. See RFC 4880,
-// section 5.5.3.
-type PrivateKey struct {
-	PublicKey
-	Encrypted     bool // if true then the private key is unavailable until Decrypt has been called.
-	encryptedData []byte
-	cipher        CipherFunction
-	s2k           func(out, in []byte)
-	PrivateKey    interface{} // An *{rsa|dsa|ecdsa}.PrivateKey or a crypto.Signer.
-	sha1Checksum  bool
-	iv            []byte
-}
-
-func NewRSAPrivateKey(currentTime time.Time, priv *rsa.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewRSAPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-func NewDSAPrivateKey(currentTime time.Time, priv *dsa.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewDSAPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-func NewElGamalPrivateKey(currentTime time.Time, priv *elgamal.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewElGamalPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-func NewECDSAPrivateKey(currentTime time.Time, priv *ecdsa.PrivateKey) *PrivateKey {
-	pk := new(PrivateKey)
-	pk.PublicKey = *NewECDSAPublicKey(currentTime, &priv.PublicKey)
-	pk.PrivateKey = priv
-	return pk
-}
-
-// NewSignerPrivateKey creates a sign-only PrivateKey from a crypto.Signer that
-// implements RSA or ECDSA.
-func NewSignerPrivateKey(currentTime time.Time, signer crypto.Signer) *PrivateKey {
-	pk := new(PrivateKey)
-	switch pubkey := signer.Public().(type) {
-	case rsa.PublicKey:
-		pk.PublicKey = *NewRSAPublicKey(currentTime, &pubkey)
-		pk.PubKeyAlgo = PubKeyAlgoRSASignOnly
-	case ecdsa.PublicKey:
-		pk.PublicKey = *NewECDSAPublicKey(currentTime, &pubkey)
-	default:
-		panic("openpgp: unknown crypto.Signer type in NewSignerPrivateKey")
-	}
-	pk.PrivateKey = signer
-	return pk
-}
-
-func (pk *PrivateKey) parse(r io.Reader) (err error) {
-	err = (&pk.PublicKey).parse(r)
-	if err != nil {
-		return
-	}
-	var buf [1]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-
-	s2kType := buf[0]
-
-	switch s2kType {
-	case 0:
-		pk.s2k = nil
-		pk.Encrypted = false
-	case 254, 255:
-		_, err = readFull(r, buf[:])
-		if err != nil {
-			return
-		}
-		pk.cipher = CipherFunction(buf[0])
-		pk.Encrypted = true
-		pk.s2k, err = s2k.Parse(r)
-		if err != nil {
-			return
-		}
-		if s2kType == 254 {
-			pk.sha1Checksum = true
-		}
-	default:
-		return errors.UnsupportedError("deprecated s2k function in private key")
-	}
-
-	if pk.Encrypted {
-		blockSize := pk.cipher.blockSize()
-		if blockSize == 0 {
-			return errors.UnsupportedError("unsupported cipher in private key: " + strconv.Itoa(int(pk.cipher)))
-		}
-		pk.iv = make([]byte, blockSize)
-		_, err = readFull(r, pk.iv)
-		if err != nil {
-			return
-		}
-	}
-
-	pk.encryptedData, err = ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-
-	if !pk.Encrypted {
-		return pk.parsePrivateKey(pk.encryptedData)
-	}
-
-	return
-}
-
-func mod64kHash(d []byte) uint16 {
-	var h uint16
-	for _, b := range d {
-		h += uint16(b)
-	}
-	return h
-}
-
-func (pk *PrivateKey) Serialize(w io.Writer) (err error) {
-	// TODO(agl): support encrypted private keys
-	buf := bytes.NewBuffer(nil)
-	err = pk.PublicKey.serializeWithoutHeaders(buf)
-	if err != nil {
-		return
-	}
-	buf.WriteByte(0 /* no encryption */)
-
-	privateKeyBuf := bytes.NewBuffer(nil)
-
-	switch priv := pk.PrivateKey.(type) {
-	case *rsa.PrivateKey:
-		err = serializeRSAPrivateKey(privateKeyBuf, priv)
-	case *dsa.PrivateKey:
-		err = serializeDSAPrivateKey(privateKeyBuf, priv)
-	case *elgamal.PrivateKey:
-		err = serializeElGamalPrivateKey(privateKeyBuf, priv)
-	case *ecdsa.PrivateKey:
-		err = serializeECDSAPrivateKey(privateKeyBuf, priv)
-	default:
-		err = errors.InvalidArgumentError("unknown private key type")
-	}
-	if err != nil {
-		return
-	}
-
-	ptype := packetTypePrivateKey
-	contents := buf.Bytes()
-	privateKeyBytes := privateKeyBuf.Bytes()
-	if pk.IsSubkey {
-		ptype = packetTypePrivateSubkey
-	}
-	err = serializeHeader(w, ptype, len(contents)+len(privateKeyBytes)+2)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(contents)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(privateKeyBytes)
-	if err != nil {
-		return
-	}
-
-	checksum := mod64kHash(privateKeyBytes)
-	var checksumBytes [2]byte
-	checksumBytes[0] = byte(checksum >> 8)
-	checksumBytes[1] = byte(checksum)
-	_, err = w.Write(checksumBytes[:])
-
-	return
-}
-
-func serializeRSAPrivateKey(w io.Writer, priv *rsa.PrivateKey) error {
-	err := writeBig(w, priv.D)
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, priv.Primes[1])
-	if err != nil {
-		return err
-	}
-	err = writeBig(w, priv.Primes[0])
-	if err != nil {
-		return err
-	}
-	return writeBig(w, priv.Precomputed.Qinv)
-}
-
-func serializeDSAPrivateKey(w io.Writer, priv *dsa.PrivateKey) error {
-	return writeBig(w, priv.X)
-}
-
-func serializeElGamalPrivateKey(w io.Writer, priv *elgamal.PrivateKey) error {
-	return writeBig(w, priv.X)
-}
-
-func serializeECDSAPrivateKey(w io.Writer, priv *ecdsa.PrivateKey) error {
-	return writeBig(w, priv.D)
-}
-
-// Decrypt decrypts an encrypted private key using a passphrase.
-func (pk *PrivateKey) Decrypt(passphrase []byte) error {
-	if !pk.Encrypted {
-		return nil
-	}
-
-	key := make([]byte, pk.cipher.KeySize())
-	pk.s2k(key, passphrase)
-	block := pk.cipher.new(key)
-	cfb := cipher.NewCFBDecrypter(block, pk.iv)
-
-	data := make([]byte, len(pk.encryptedData))
-	cfb.XORKeyStream(data, pk.encryptedData)
-
-	if pk.sha1Checksum {
-		if len(data) < sha1.Size {
-			return errors.StructuralError("truncated private key data")
-		}
-		h := sha1.New()
-		h.Write(data[:len(data)-sha1.Size])
-		sum := h.Sum(nil)
-		if !bytes.Equal(sum, data[len(data)-sha1.Size:]) {
-			return errors.StructuralError("private key checksum failure")
-		}
-		data = data[:len(data)-sha1.Size]
-	} else {
-		if len(data) < 2 {
-			return errors.StructuralError("truncated private key data")
-		}
-		var sum uint16
-		for i := 0; i < len(data)-2; i++ {
-			sum += uint16(data[i])
-		}
-		if data[len(data)-2] != uint8(sum>>8) ||
-			data[len(data)-1] != uint8(sum) {
-			return errors.StructuralError("private key checksum failure")
-		}
-		data = data[:len(data)-2]
-	}
-
-	return pk.parsePrivateKey(data)
-}
-
-func (pk *PrivateKey) parsePrivateKey(data []byte) (err error) {
-	switch pk.PublicKey.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoRSAEncryptOnly:
-		return pk.parseRSAPrivateKey(data)
-	case PubKeyAlgoDSA:
-		return pk.parseDSAPrivateKey(data)
-	case PubKeyAlgoElGamal:
-		return pk.parseElGamalPrivateKey(data)
-	case PubKeyAlgoECDSA:
-		return pk.parseECDSAPrivateKey(data)
-	}
-	panic("impossible")
-}
-
-func (pk *PrivateKey) parseRSAPrivateKey(data []byte) (err error) {
-	rsaPub := pk.PublicKey.PublicKey.(*rsa.PublicKey)
-	rsaPriv := new(rsa.PrivateKey)
-	rsaPriv.PublicKey = *rsaPub
-
-	buf := bytes.NewBuffer(data)
-	d, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-	p, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-	q, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	rsaPriv.D = new(big.Int).SetBytes(d)
-	rsaPriv.Primes = make([]*big.Int, 2)
-	rsaPriv.Primes[0] = new(big.Int).SetBytes(p)
-	rsaPriv.Primes[1] = new(big.Int).SetBytes(q)
-	if err := rsaPriv.Validate(); err != nil {
-		return err
-	}
-	rsaPriv.Precompute()
-	pk.PrivateKey = rsaPriv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
-
-func (pk *PrivateKey) parseDSAPrivateKey(data []byte) (err error) {
-	dsaPub := pk.PublicKey.PublicKey.(*dsa.PublicKey)
-	dsaPriv := new(dsa.PrivateKey)
-	dsaPriv.PublicKey = *dsaPub
-
-	buf := bytes.NewBuffer(data)
-	x, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	dsaPriv.X = new(big.Int).SetBytes(x)
-	pk.PrivateKey = dsaPriv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
-
-func (pk *PrivateKey) parseElGamalPrivateKey(data []byte) (err error) {
-	pub := pk.PublicKey.PublicKey.(*elgamal.PublicKey)
-	priv := new(elgamal.PrivateKey)
-	priv.PublicKey = *pub
-
-	buf := bytes.NewBuffer(data)
-	x, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	priv.X = new(big.Int).SetBytes(x)
-	pk.PrivateKey = priv
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
-
-func (pk *PrivateKey) parseECDSAPrivateKey(data []byte) (err error) {
-	ecdsaPub := pk.PublicKey.PublicKey.(*ecdsa.PublicKey)
-
-	buf := bytes.NewBuffer(data)
-	d, _, err := readMPI(buf)
-	if err != nil {
-		return
-	}
-
-	pk.PrivateKey = &ecdsa.PrivateKey{
-		PublicKey: *ecdsaPub,
-		D:         new(big.Int).SetBytes(d),
-	}
-	pk.Encrypted = false
-	pk.encryptedData = nil
-
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key_test.go
deleted file mode 100644
index ac651d917d..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/private_key_test.go
+++ /dev/null
@@ -1,270 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/hex"
-	"hash"
-	"io"
-	"testing"
-	"time"
-)
-
-var privateKeyTests = []struct {
-	privateKeyHex string
-	creationTime  time.Time
-}{
-	{
-		privKeyRSAHex,
-		time.Unix(0x4cc349a8, 0),
-	},
-	{
-		privKeyElGamalHex,
-		time.Unix(0x4df9ee1a, 0),
-	},
-}
-
-func TestPrivateKeyRead(t *testing.T) {
-	for i, test := range privateKeyTests {
-		packet, err := Read(readerFromHex(test.privateKeyHex))
-		if err != nil {
-			t.Errorf("#%d: failed to parse: %s", i, err)
-			continue
-		}
-
-		privKey := packet.(*PrivateKey)
-
-		if !privKey.Encrypted {
-			t.Errorf("#%d: private key isn't encrypted", i)
-			continue
-		}
-
-		err = privKey.Decrypt([]byte("wrong password"))
-		if err == nil {
-			t.Errorf("#%d: decrypted with incorrect key", i)
-			continue
-		}
-
-		err = privKey.Decrypt([]byte("testing"))
-		if err != nil {
-			t.Errorf("#%d: failed to decrypt: %s", i, err)
-			continue
-		}
-
-		if !privKey.CreationTime.Equal(test.creationTime) || privKey.Encrypted {
-			t.Errorf("#%d: bad result, got: %#v", i, privKey)
-		}
-	}
-}
-
-func populateHash(hashFunc crypto.Hash, msg []byte) (hash.Hash, error) {
-	h := hashFunc.New()
-	if _, err := h.Write(msg); err != nil {
-		return nil, err
-	}
-	return h, nil
-}
-
-func TestRSAPrivateKey(t *testing.T) {
-	privKeyDER, _ := hex.DecodeString(pkcs1PrivKeyHex)
-	rsaPriv, err := x509.ParsePKCS1PrivateKey(privKeyDER)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	if err := NewRSAPrivateKey(time.Now(), rsaPriv).Serialize(&buf); err != nil {
-		t.Fatal(err)
-	}
-
-	p, err := Read(&buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	priv, ok := p.(*PrivateKey)
-	if !ok {
-		t.Fatal("didn't parse private key")
-	}
-
-	sig := &Signature{
-		PubKeyAlgo: PubKeyAlgoRSA,
-		Hash:       crypto.SHA256,
-	}
-	msg := []byte("Hello World!")
-
-	h, err := populateHash(sig.Hash, msg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := sig.Sign(h, priv, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if h, err = populateHash(sig.Hash, msg); err != nil {
-		t.Fatal(err)
-	}
-	if err := priv.VerifySignature(h, sig); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestECDSAPrivateKey(t *testing.T) {
-	ecdsaPriv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var buf bytes.Buffer
-	if err := NewECDSAPrivateKey(time.Now(), ecdsaPriv).Serialize(&buf); err != nil {
-		t.Fatal(err)
-	}
-
-	p, err := Read(&buf)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	priv, ok := p.(*PrivateKey)
-	if !ok {
-		t.Fatal("didn't parse private key")
-	}
-
-	sig := &Signature{
-		PubKeyAlgo: PubKeyAlgoECDSA,
-		Hash:       crypto.SHA256,
-	}
-	msg := []byte("Hello World!")
-
-	h, err := populateHash(sig.Hash, msg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := sig.Sign(h, priv, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if h, err = populateHash(sig.Hash, msg); err != nil {
-		t.Fatal(err)
-	}
-	if err := priv.VerifySignature(h, sig); err != nil {
-		t.Fatal(err)
-	}
-}
-
-type rsaSigner struct {
-	priv *rsa.PrivateKey
-}
-
-func (s *rsaSigner) Public() crypto.PublicKey {
-	return s.priv.PublicKey
-}
-
-func (s *rsaSigner) Sign(rand io.Reader, msg []byte, opts crypto.SignerOpts) ([]byte, error) {
-	return s.priv.Sign(rand, msg, opts)
-}
-
-func TestRSASignerPrivateKey(t *testing.T) {
-	rsaPriv, err := rsa.GenerateKey(rand.Reader, 1024)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	priv := NewSignerPrivateKey(time.Now(), &rsaSigner{rsaPriv})
-
-	if priv.PubKeyAlgo != PubKeyAlgoRSASignOnly {
-		t.Fatal("NewSignerPrivateKey should have made a sign-only RSA private key")
-	}
-
-	sig := &Signature{
-		PubKeyAlgo: PubKeyAlgoRSASignOnly,
-		Hash:       crypto.SHA256,
-	}
-	msg := []byte("Hello World!")
-
-	h, err := populateHash(sig.Hash, msg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := sig.Sign(h, priv, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if h, err = populateHash(sig.Hash, msg); err != nil {
-		t.Fatal(err)
-	}
-	if err := priv.VerifySignature(h, sig); err != nil {
-		t.Fatal(err)
-	}
-}
-
-type ecdsaSigner struct {
-	priv *ecdsa.PrivateKey
-}
-
-func (s *ecdsaSigner) Public() crypto.PublicKey {
-	return s.priv.PublicKey
-}
-
-func (s *ecdsaSigner) Sign(rand io.Reader, msg []byte, opts crypto.SignerOpts) ([]byte, error) {
-	return s.priv.Sign(rand, msg, opts)
-}
-
-func TestECDSASignerPrivateKey(t *testing.T) {
-	ecdsaPriv, err := ecdsa.GenerateKey(elliptic.P256(), rand.Reader)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	priv := NewSignerPrivateKey(time.Now(), &ecdsaSigner{ecdsaPriv})
-
-	if priv.PubKeyAlgo != PubKeyAlgoECDSA {
-		t.Fatal("NewSignerPrivateKey should have made an ECSDA private key")
-	}
-
-	sig := &Signature{
-		PubKeyAlgo: PubKeyAlgoECDSA,
-		Hash:       crypto.SHA256,
-	}
-	msg := []byte("Hello World!")
-
-	h, err := populateHash(sig.Hash, msg)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := sig.Sign(h, priv, nil); err != nil {
-		t.Fatal(err)
-	}
-
-	if h, err = populateHash(sig.Hash, msg); err != nil {
-		t.Fatal(err)
-	}
-	if err := priv.VerifySignature(h, sig); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestIssue11505(t *testing.T) {
-	// parsing a rsa private key with p or q == 1 used to panic due to a divide by zero
-	_, _ = Read(readerFromHex("9c3004303030300100000011303030000000000000010130303030303030303030303030303030303030303030303030303030303030303030303030303030303030"))
-}
-
-// Generated with `gpg --export-secret-keys "Test Key 2"`
-const privKeyRSAHex = "9501fe044cc349a8010400b70ca0010e98c090008d45d1ee8f9113bd5861fd57b88bacb7c68658747663f1e1a3b5a98f32fda6472373c024b97359cd2efc88ff60f77751adfbf6af5e615e6a1408cfad8bf0cea30b0d5f53aa27ad59089ba9b15b7ebc2777a25d7b436144027e3bcd203909f147d0e332b240cf63d3395f5dfe0df0a6c04e8655af7eacdf0011010001fe0303024a252e7d475fd445607de39a265472aa74a9320ba2dac395faa687e9e0336aeb7e9a7397e511b5afd9dc84557c80ac0f3d4d7bfec5ae16f20d41c8c84a04552a33870b930420e230e179564f6d19bb153145e76c33ae993886c388832b0fa042ddda7f133924f3854481533e0ede31d51278c0519b29abc3bf53da673e13e3e1214b52413d179d7f66deee35cac8eacb060f78379d70ef4af8607e68131ff529439668fc39c9ce6dfef8a5ac234d234802cbfb749a26107db26406213ae5c06d4673253a3cbee1fcbae58d6ab77e38d6e2c0e7c6317c48e054edadb5a40d0d48acb44643d998139a8a66bb820be1f3f80185bc777d14b5954b60effe2448a036d565c6bc0b915fcea518acdd20ab07bc1529f561c58cd044f723109b93f6fd99f876ff891d64306b5d08f48bab59f38695e9109c4dec34013ba3153488ce070268381ba923ee1eb77125b36afcb4347ec3478c8f2735b06ef17351d872e577fa95d0c397c88c71b59629a36aec"
-
-// Generated by `gpg --export-secret-keys` followed by a manual extraction of
-// the ElGamal subkey from the packets.
-const privKeyElGamalHex = "9d0157044df9ee1a100400eb8e136a58ec39b582629cdadf830bc64e0a94ed8103ca8bb247b27b11b46d1d25297ef4bcc3071785ba0c0bedfe89eabc5287fcc0edf81ab5896c1c8e4b20d27d79813c7aede75320b33eaeeaa586edc00fd1036c10133e6ba0ff277245d0d59d04b2b3421b7244aca5f4a8d870c6f1c1fbff9e1c26699a860b9504f35ca1d700030503fd1ededd3b840795be6d9ccbe3c51ee42e2f39233c432b831ddd9c4e72b7025a819317e47bf94f9ee316d7273b05d5fcf2999c3a681f519b1234bbfa6d359b4752bd9c3f77d6b6456cde152464763414ca130f4e91d91041432f90620fec0e6d6b5116076c2985d5aeaae13be492b9b329efcaf7ee25120159a0a30cd976b42d7afe030302dae7eb80db744d4960c4df930d57e87fe81412eaace9f900e6c839817a614ddb75ba6603b9417c33ea7b6c93967dfa2bcff3fa3c74a5ce2c962db65b03aece14c96cbd0038fc"
-
-// pkcs1PrivKeyHex is a PKCS#1, RSA private key.
-// Generated by `openssl genrsa 1024 | openssl rsa -outform DER  | xxd -p`
-const pkcs1PrivKeyHex = "3082025d02010002818100e98edfa1c3b35884a54d0b36a6a603b0290fa85e49e30fa23fc94fef9c6790bc4849928607aa48d809da326fb42a969d06ad756b98b9c1a90f5d4a2b6d0ac05953c97f4da3120164a21a679793ce181c906dc01d235cc085ddcdf6ea06c389b6ab8885dfd685959e693138856a68a7e5db263337ff82a088d583a897cf2d59e9020301000102818100b6d5c9eb70b02d5369b3ee5b520a14490b5bde8a317d36f7e4c74b7460141311d1e5067735f8f01d6f5908b2b96fbd881f7a1ab9a84d82753e39e19e2d36856be960d05ac9ef8e8782ea1b6d65aee28fdfe1d61451e8cff0adfe84322f12cf455028b581cf60eb9e0e140ba5d21aeba6c2634d7c65318b9a665fc01c3191ca21024100fa5e818da3705b0fa33278bb28d4b6f6050388af2d4b75ec9375dd91ccf2e7d7068086a8b82a8f6282e4fbbdb8a7f2622eb97295249d87acea7f5f816f54d347024100eecf9406d7dc49cdfb95ab1eff4064de84c7a30f64b2798936a0d2018ba9eb52e4b636f82e96c49cc63b80b675e91e40d1b2e4017d4b9adaf33ab3d9cf1c214f024100c173704ace742c082323066226a4655226819a85304c542b9dacbeacbf5d1881ee863485fcf6f59f3a604f9b42289282067447f2b13dfeed3eab7851fc81e0550240741fc41f3fc002b382eed8730e33c5d8de40256e4accee846667f536832f711ab1d4590e7db91a8a116ac5bff3be13d3f9243ff2e976662aa9b395d907f8e9c9024046a5696c9ef882363e06c9fa4e2f5b580906452befba03f4a99d0f873697ef1f851d2226ca7934b30b7c3e80cb634a67172bbbf4781735fe3e09263e2dd723e7"
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
deleted file mode 100644
index ead26233dd..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key.go
+++ /dev/null
@@ -1,748 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-	"encoding/binary"
-	"fmt"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/elgamal"
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-var (
-	// NIST curve P-256
-	oidCurveP256 []byte = []byte{0x2A, 0x86, 0x48, 0xCE, 0x3D, 0x03, 0x01, 0x07}
-	// NIST curve P-384
-	oidCurveP384 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x22}
-	// NIST curve P-521
-	oidCurveP521 []byte = []byte{0x2B, 0x81, 0x04, 0x00, 0x23}
-)
-
-const maxOIDLength = 8
-
-// ecdsaKey stores the algorithm-specific fields for ECDSA keys.
-// as defined in RFC 6637, Section 9.
-type ecdsaKey struct {
-	// oid contains the OID byte sequence identifying the elliptic curve used
-	oid []byte
-	// p contains the elliptic curve point that represents the public key
-	p parsedMPI
-}
-
-// parseOID reads the OID for the curve as defined in RFC 6637, Section 9.
-func parseOID(r io.Reader) (oid []byte, err error) {
-	buf := make([]byte, maxOIDLength)
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	oidLen := buf[0]
-	if int(oidLen) > len(buf) {
-		err = errors.UnsupportedError("invalid oid length: " + strconv.Itoa(int(oidLen)))
-		return
-	}
-	oid = buf[:oidLen]
-	_, err = readFull(r, oid)
-	return
-}
-
-func (f *ecdsaKey) parse(r io.Reader) (err error) {
-	if f.oid, err = parseOID(r); err != nil {
-		return err
-	}
-	f.p.bytes, f.p.bitLength, err = readMPI(r)
-	return
-}
-
-func (f *ecdsaKey) serialize(w io.Writer) (err error) {
-	buf := make([]byte, maxOIDLength+1)
-	buf[0] = byte(len(f.oid))
-	copy(buf[1:], f.oid)
-	if _, err = w.Write(buf[:len(f.oid)+1]); err != nil {
-		return
-	}
-	return writeMPIs(w, f.p)
-}
-
-func (f *ecdsaKey) newECDSA() (*ecdsa.PublicKey, error) {
-	var c elliptic.Curve
-	if bytes.Equal(f.oid, oidCurveP256) {
-		c = elliptic.P256()
-	} else if bytes.Equal(f.oid, oidCurveP384) {
-		c = elliptic.P384()
-	} else if bytes.Equal(f.oid, oidCurveP521) {
-		c = elliptic.P521()
-	} else {
-		return nil, errors.UnsupportedError(fmt.Sprintf("unsupported oid: %x", f.oid))
-	}
-	x, y := elliptic.Unmarshal(c, f.p.bytes)
-	if x == nil {
-		return nil, errors.UnsupportedError("failed to parse EC point")
-	}
-	return &ecdsa.PublicKey{Curve: c, X: x, Y: y}, nil
-}
-
-func (f *ecdsaKey) byteLen() int {
-	return 1 + len(f.oid) + 2 + len(f.p.bytes)
-}
-
-type kdfHashFunction byte
-type kdfAlgorithm byte
-
-// ecdhKdf stores key derivation function parameters
-// used for ECDH encryption. See RFC 6637, Section 9.
-type ecdhKdf struct {
-	KdfHash kdfHashFunction
-	KdfAlgo kdfAlgorithm
-}
-
-func (f *ecdhKdf) parse(r io.Reader) (err error) {
-	buf := make([]byte, 1)
-	if _, err = readFull(r, buf); err != nil {
-		return
-	}
-	kdfLen := int(buf[0])
-	if kdfLen < 3 {
-		return errors.UnsupportedError("Unsupported ECDH KDF length: " + strconv.Itoa(kdfLen))
-	}
-	buf = make([]byte, kdfLen)
-	if _, err = readFull(r, buf); err != nil {
-		return
-	}
-	reserved := int(buf[0])
-	f.KdfHash = kdfHashFunction(buf[1])
-	f.KdfAlgo = kdfAlgorithm(buf[2])
-	if reserved != 0x01 {
-		return errors.UnsupportedError("Unsupported KDF reserved field: " + strconv.Itoa(reserved))
-	}
-	return
-}
-
-func (f *ecdhKdf) serialize(w io.Writer) (err error) {
-	buf := make([]byte, 4)
-	// See RFC 6637, Section 9, Algorithm-Specific Fields for ECDH keys.
-	buf[0] = byte(0x03) // Length of the following fields
-	buf[1] = byte(0x01) // Reserved for future extensions, must be 1 for now
-	buf[2] = byte(f.KdfHash)
-	buf[3] = byte(f.KdfAlgo)
-	_, err = w.Write(buf[:])
-	return
-}
-
-func (f *ecdhKdf) byteLen() int {
-	return 4
-}
-
-// PublicKey represents an OpenPGP public key. See RFC 4880, section 5.5.2.
-type PublicKey struct {
-	CreationTime time.Time
-	PubKeyAlgo   PublicKeyAlgorithm
-	PublicKey    interface{} // *rsa.PublicKey, *dsa.PublicKey or *ecdsa.PublicKey
-	Fingerprint  [20]byte
-	KeyId        uint64
-	IsSubkey     bool
-
-	n, e, p, q, g, y parsedMPI
-
-	// RFC 6637 fields
-	ec   *ecdsaKey
-	ecdh *ecdhKdf
-}
-
-// signingKey provides a convenient abstraction over signature verification
-// for v3 and v4 public keys.
-type signingKey interface {
-	SerializeSignaturePrefix(io.Writer)
-	serializeWithoutHeaders(io.Writer) error
-}
-
-func fromBig(n *big.Int) parsedMPI {
-	return parsedMPI{
-		bytes:     n.Bytes(),
-		bitLength: uint16(n.BitLen()),
-	}
-}
-
-// NewRSAPublicKey returns a PublicKey that wraps the given rsa.PublicKey.
-func NewRSAPublicKey(creationTime time.Time, pub *rsa.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoRSA,
-		PublicKey:    pub,
-		n:            fromBig(pub.N),
-		e:            fromBig(big.NewInt(int64(pub.E))),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-// NewDSAPublicKey returns a PublicKey that wraps the given dsa.PublicKey.
-func NewDSAPublicKey(creationTime time.Time, pub *dsa.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoDSA,
-		PublicKey:    pub,
-		p:            fromBig(pub.P),
-		q:            fromBig(pub.Q),
-		g:            fromBig(pub.G),
-		y:            fromBig(pub.Y),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-// NewElGamalPublicKey returns a PublicKey that wraps the given elgamal.PublicKey.
-func NewElGamalPublicKey(creationTime time.Time, pub *elgamal.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoElGamal,
-		PublicKey:    pub,
-		p:            fromBig(pub.P),
-		g:            fromBig(pub.G),
-		y:            fromBig(pub.Y),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-func NewECDSAPublicKey(creationTime time.Time, pub *ecdsa.PublicKey) *PublicKey {
-	pk := &PublicKey{
-		CreationTime: creationTime,
-		PubKeyAlgo:   PubKeyAlgoECDSA,
-		PublicKey:    pub,
-		ec:           new(ecdsaKey),
-	}
-
-	switch pub.Curve {
-	case elliptic.P256():
-		pk.ec.oid = oidCurveP256
-	case elliptic.P384():
-		pk.ec.oid = oidCurveP384
-	case elliptic.P521():
-		pk.ec.oid = oidCurveP521
-	default:
-		panic("unknown elliptic curve")
-	}
-
-	pk.ec.p.bytes = elliptic.Marshal(pub.Curve, pub.X, pub.Y)
-	pk.ec.p.bitLength = uint16(8 * len(pk.ec.p.bytes))
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-func (pk *PublicKey) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.5.2
-	var buf [6]byte
-	_, err = readFull(r, buf[:])
-	if err != nil {
-		return
-	}
-	if buf[0] != 4 {
-		return errors.UnsupportedError("public key version")
-	}
-	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
-	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[5])
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		err = pk.parseRSA(r)
-	case PubKeyAlgoDSA:
-		err = pk.parseDSA(r)
-	case PubKeyAlgoElGamal:
-		err = pk.parseElGamal(r)
-	case PubKeyAlgoECDSA:
-		pk.ec = new(ecdsaKey)
-		if err = pk.ec.parse(r); err != nil {
-			return err
-		}
-		pk.PublicKey, err = pk.ec.newECDSA()
-	case PubKeyAlgoECDH:
-		pk.ec = new(ecdsaKey)
-		if err = pk.ec.parse(r); err != nil {
-			return
-		}
-		pk.ecdh = new(ecdhKdf)
-		if err = pk.ecdh.parse(r); err != nil {
-			return
-		}
-		// The ECDH key is stored in an ecdsa.PublicKey for convenience.
-		pk.PublicKey, err = pk.ec.newECDSA()
-	default:
-		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
-	}
-	if err != nil {
-		return
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return
-}
-
-func (pk *PublicKey) setFingerPrintAndKeyId() {
-	// RFC 4880, section 12.2
-	fingerPrint := sha1.New()
-	pk.SerializeSignaturePrefix(fingerPrint)
-	pk.serializeWithoutHeaders(fingerPrint)
-	copy(pk.Fingerprint[:], fingerPrint.Sum(nil))
-	pk.KeyId = binary.BigEndian.Uint64(pk.Fingerprint[12:20])
-}
-
-// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKey) parseRSA(r io.Reader) (err error) {
-	pk.n.bytes, pk.n.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.e.bytes, pk.e.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	if len(pk.e.bytes) > 3 {
-		err = errors.UnsupportedError("large public exponent")
-		return
-	}
-	rsa := &rsa.PublicKey{
-		N: new(big.Int).SetBytes(pk.n.bytes),
-		E: 0,
-	}
-	for i := 0; i < len(pk.e.bytes); i++ {
-		rsa.E <<= 8
-		rsa.E |= int(pk.e.bytes[i])
-	}
-	pk.PublicKey = rsa
-	return
-}
-
-// parseDSA parses DSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKey) parseDSA(r io.Reader) (err error) {
-	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.q.bytes, pk.q.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	dsa := new(dsa.PublicKey)
-	dsa.P = new(big.Int).SetBytes(pk.p.bytes)
-	dsa.Q = new(big.Int).SetBytes(pk.q.bytes)
-	dsa.G = new(big.Int).SetBytes(pk.g.bytes)
-	dsa.Y = new(big.Int).SetBytes(pk.y.bytes)
-	pk.PublicKey = dsa
-	return
-}
-
-// parseElGamal parses ElGamal public key material from the given Reader. See
-// RFC 4880, section 5.5.2.
-func (pk *PublicKey) parseElGamal(r io.Reader) (err error) {
-	pk.p.bytes, pk.p.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.g.bytes, pk.g.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-	pk.y.bytes, pk.y.bitLength, err = readMPI(r)
-	if err != nil {
-		return
-	}
-
-	elgamal := new(elgamal.PublicKey)
-	elgamal.P = new(big.Int).SetBytes(pk.p.bytes)
-	elgamal.G = new(big.Int).SetBytes(pk.g.bytes)
-	elgamal.Y = new(big.Int).SetBytes(pk.y.bytes)
-	pk.PublicKey = elgamal
-	return
-}
-
-// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
-// The prefix is used when calculating a signature over this public key. See
-// RFC 4880, section 5.2.4.
-func (pk *PublicKey) SerializeSignaturePrefix(h io.Writer) {
-	var pLength uint16
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		pLength += 2 + uint16(len(pk.n.bytes))
-		pLength += 2 + uint16(len(pk.e.bytes))
-	case PubKeyAlgoDSA:
-		pLength += 2 + uint16(len(pk.p.bytes))
-		pLength += 2 + uint16(len(pk.q.bytes))
-		pLength += 2 + uint16(len(pk.g.bytes))
-		pLength += 2 + uint16(len(pk.y.bytes))
-	case PubKeyAlgoElGamal:
-		pLength += 2 + uint16(len(pk.p.bytes))
-		pLength += 2 + uint16(len(pk.g.bytes))
-		pLength += 2 + uint16(len(pk.y.bytes))
-	case PubKeyAlgoECDSA:
-		pLength += uint16(pk.ec.byteLen())
-	case PubKeyAlgoECDH:
-		pLength += uint16(pk.ec.byteLen())
-		pLength += uint16(pk.ecdh.byteLen())
-	default:
-		panic("unknown public key algorithm")
-	}
-	pLength += 6
-	h.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
-	return
-}
-
-func (pk *PublicKey) Serialize(w io.Writer) (err error) {
-	length := 6 // 6 byte header
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		length += 2 + len(pk.n.bytes)
-		length += 2 + len(pk.e.bytes)
-	case PubKeyAlgoDSA:
-		length += 2 + len(pk.p.bytes)
-		length += 2 + len(pk.q.bytes)
-		length += 2 + len(pk.g.bytes)
-		length += 2 + len(pk.y.bytes)
-	case PubKeyAlgoElGamal:
-		length += 2 + len(pk.p.bytes)
-		length += 2 + len(pk.g.bytes)
-		length += 2 + len(pk.y.bytes)
-	case PubKeyAlgoECDSA:
-		length += pk.ec.byteLen()
-	case PubKeyAlgoECDH:
-		length += pk.ec.byteLen()
-		length += pk.ecdh.byteLen()
-	default:
-		panic("unknown public key algorithm")
-	}
-
-	packetType := packetTypePublicKey
-	if pk.IsSubkey {
-		packetType = packetTypePublicSubkey
-	}
-	err = serializeHeader(w, packetType, length)
-	if err != nil {
-		return
-	}
-	return pk.serializeWithoutHeaders(w)
-}
-
-// serializeWithoutHeaders marshals the PublicKey to w in the form of an
-// OpenPGP public key packet, not including the packet header.
-func (pk *PublicKey) serializeWithoutHeaders(w io.Writer) (err error) {
-	var buf [6]byte
-	buf[0] = 4
-	t := uint32(pk.CreationTime.Unix())
-	buf[1] = byte(t >> 24)
-	buf[2] = byte(t >> 16)
-	buf[3] = byte(t >> 8)
-	buf[4] = byte(t)
-	buf[5] = byte(pk.PubKeyAlgo)
-
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		return writeMPIs(w, pk.n, pk.e)
-	case PubKeyAlgoDSA:
-		return writeMPIs(w, pk.p, pk.q, pk.g, pk.y)
-	case PubKeyAlgoElGamal:
-		return writeMPIs(w, pk.p, pk.g, pk.y)
-	case PubKeyAlgoECDSA:
-		return pk.ec.serialize(w)
-	case PubKeyAlgoECDH:
-		if err = pk.ec.serialize(w); err != nil {
-			return
-		}
-		return pk.ecdh.serialize(w)
-	}
-	return errors.InvalidArgumentError("bad public-key algorithm")
-}
-
-// CanSign returns true iff this public key can generate signatures
-func (pk *PublicKey) CanSign() bool {
-	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly && pk.PubKeyAlgo != PubKeyAlgoElGamal
-}
-
-// VerifySignature returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKey) VerifySignature(signed hash.Hash, sig *Signature) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	signed.Write(sig.HashSuffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		rsaPublicKey, _ := pk.PublicKey.(*rsa.PublicKey)
-		err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes)
-		if err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return nil
-	case PubKeyAlgoDSA:
-		dsaPublicKey, _ := pk.PublicKey.(*dsa.PublicKey)
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
-		if len(hashBytes) > subgroupSize {
-			hashBytes = hashBytes[:subgroupSize]
-		}
-		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
-			return errors.SignatureError("DSA verification failure")
-		}
-		return nil
-	case PubKeyAlgoECDSA:
-		ecdsaPublicKey := pk.PublicKey.(*ecdsa.PublicKey)
-		if !ecdsa.Verify(ecdsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.ECDSASigR.bytes), new(big.Int).SetBytes(sig.ECDSASigS.bytes)) {
-			return errors.SignatureError("ECDSA verification failure")
-		}
-		return nil
-	default:
-		return errors.SignatureError("Unsupported public key algorithm used in signature")
-	}
-}
-
-// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKey) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	suffix := make([]byte, 5)
-	suffix[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
-	signed.Write(suffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		rsaPublicKey := pk.PublicKey.(*rsa.PublicKey)
-		if err = rsa.VerifyPKCS1v15(rsaPublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return
-	case PubKeyAlgoDSA:
-		dsaPublicKey := pk.PublicKey.(*dsa.PublicKey)
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPublicKey.Q.BitLen() + 7) / 8
-		if len(hashBytes) > subgroupSize {
-			hashBytes = hashBytes[:subgroupSize]
-		}
-		if !dsa.Verify(dsaPublicKey, hashBytes, new(big.Int).SetBytes(sig.DSASigR.bytes), new(big.Int).SetBytes(sig.DSASigS.bytes)) {
-			return errors.SignatureError("DSA verification failure")
-		}
-		return nil
-	default:
-		panic("shouldn't happen")
-	}
-}
-
-// keySignatureHash returns a Hash of the message that needs to be signed for
-// pk to assert a subkey relationship to signed.
-func keySignatureHash(pk, signed signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-	signed.SerializeSignaturePrefix(h)
-	signed.serializeWithoutHeaders(h)
-	return
-}
-
-// VerifyKeySignature returns nil iff sig is a valid signature, made by this
-// public key, of signed.
-func (pk *PublicKey) VerifyKeySignature(signed *PublicKey, sig *Signature) error {
-	h, err := keySignatureHash(pk, signed, sig.Hash)
-	if err != nil {
-		return err
-	}
-	if err = pk.VerifySignature(h, sig); err != nil {
-		return err
-	}
-
-	if sig.FlagSign {
-		// Signing subkeys must be cross-signed. See
-		// https://www.gnupg.org/faq/subkey-cross-certify.html.
-		if sig.EmbeddedSignature == nil {
-			return errors.StructuralError("signing subkey is missing cross-signature")
-		}
-		// Verify the cross-signature. This is calculated over the same
-		// data as the main signature, so we cannot just recursively
-		// call signed.VerifyKeySignature(...)
-		if h, err = keySignatureHash(pk, signed, sig.EmbeddedSignature.Hash); err != nil {
-			return errors.StructuralError("error while hashing for cross-signature: " + err.Error())
-		}
-		if err := signed.VerifySignature(h, sig.EmbeddedSignature); err != nil {
-			return errors.StructuralError("error while verifying cross-signature: " + err.Error())
-		}
-	}
-
-	return nil
-}
-
-func keyRevocationHash(pk signingKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	return
-}
-
-// VerifyRevocationSignature returns nil iff sig is a valid signature, made by this
-// public key.
-func (pk *PublicKey) VerifyRevocationSignature(sig *Signature) (err error) {
-	h, err := keyRevocationHash(pk, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignature(h, sig)
-}
-
-// userIdSignatureHash returns a Hash of the message that needs to be signed
-// to assert that pk is a valid key for id.
-func userIdSignatureHash(id string, pk *PublicKey, hashFunc crypto.Hash) (h hash.Hash, err error) {
-	if !hashFunc.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hashFunc.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	var buf [5]byte
-	buf[0] = 0xb4
-	buf[1] = byte(len(id) >> 24)
-	buf[2] = byte(len(id) >> 16)
-	buf[3] = byte(len(id) >> 8)
-	buf[4] = byte(len(id))
-	h.Write(buf[:])
-	h.Write([]byte(id))
-
-	return
-}
-
-// VerifyUserIdSignature returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKey) VerifyUserIdSignature(id string, pub *PublicKey, sig *Signature) (err error) {
-	h, err := userIdSignatureHash(id, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignature(h, sig)
-}
-
-// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKey) VerifyUserIdSignatureV3(id string, pub *PublicKey, sig *SignatureV3) (err error) {
-	h, err := userIdSignatureV3Hash(id, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// KeyIdString returns the public key's fingerprint in capital hex
-// (e.g. "6C7EE1B8621CC013").
-func (pk *PublicKey) KeyIdString() string {
-	return fmt.Sprintf("%X", pk.Fingerprint[12:20])
-}
-
-// KeyIdShortString returns the short form of public key's fingerprint
-// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
-func (pk *PublicKey) KeyIdShortString() string {
-	return fmt.Sprintf("%X", pk.Fingerprint[16:20])
-}
-
-// A parsedMPI is used to store the contents of a big integer, along with the
-// bit length that was specified in the original input. This allows the MPI to
-// be reserialized exactly.
-type parsedMPI struct {
-	bytes     []byte
-	bitLength uint16
-}
-
-// writeMPIs is a utility function for serializing several big integers to the
-// given Writer.
-func writeMPIs(w io.Writer, mpis ...parsedMPI) (err error) {
-	for _, mpi := range mpis {
-		err = writeMPI(w, mpi.bitLength, mpi.bytes)
-		if err != nil {
-			return
-		}
-	}
-	return
-}
-
-// BitLength returns the bit length for the given public key.
-func (pk *PublicKey) BitLength() (bitLength uint16, err error) {
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		bitLength = pk.n.bitLength
-	case PubKeyAlgoDSA:
-		bitLength = pk.p.bitLength
-	case PubKeyAlgoElGamal:
-		bitLength = pk.p.bitLength
-	default:
-		err = errors.InvalidArgumentError("bad public-key algorithm")
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_test.go
deleted file mode 100644
index 7ad7d91856..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_test.go
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-	"time"
-)
-
-var pubKeyTests = []struct {
-	hexData        string
-	hexFingerprint string
-	creationTime   time.Time
-	pubKeyAlgo     PublicKeyAlgorithm
-	keyId          uint64
-	keyIdString    string
-	keyIdShort     string
-}{
-	{rsaPkDataHex, rsaFingerprintHex, time.Unix(0x4d3c5c10, 0), PubKeyAlgoRSA, 0xa34d7e18c20c31bb, "A34D7E18C20C31BB", "C20C31BB"},
-	{dsaPkDataHex, dsaFingerprintHex, time.Unix(0x4d432f89, 0), PubKeyAlgoDSA, 0x8e8fbe54062f19ed, "8E8FBE54062F19ED", "062F19ED"},
-	{ecdsaPkDataHex, ecdsaFingerprintHex, time.Unix(0x5071c294, 0), PubKeyAlgoECDSA, 0x43fe956c542ca00b, "43FE956C542CA00B", "542CA00B"},
-}
-
-func TestPublicKeyRead(t *testing.T) {
-	for i, test := range pubKeyTests {
-		packet, err := Read(readerFromHex(test.hexData))
-		if err != nil {
-			t.Errorf("#%d: Read error: %s", i, err)
-			continue
-		}
-		pk, ok := packet.(*PublicKey)
-		if !ok {
-			t.Errorf("#%d: failed to parse, got: %#v", i, packet)
-			continue
-		}
-		if pk.PubKeyAlgo != test.pubKeyAlgo {
-			t.Errorf("#%d: bad public key algorithm got:%x want:%x", i, pk.PubKeyAlgo, test.pubKeyAlgo)
-		}
-		if !pk.CreationTime.Equal(test.creationTime) {
-			t.Errorf("#%d: bad creation time got:%v want:%v", i, pk.CreationTime, test.creationTime)
-		}
-		expectedFingerprint, _ := hex.DecodeString(test.hexFingerprint)
-		if !bytes.Equal(expectedFingerprint, pk.Fingerprint[:]) {
-			t.Errorf("#%d: bad fingerprint got:%x want:%x", i, pk.Fingerprint[:], expectedFingerprint)
-		}
-		if pk.KeyId != test.keyId {
-			t.Errorf("#%d: bad keyid got:%x want:%x", i, pk.KeyId, test.keyId)
-		}
-		if g, e := pk.KeyIdString(), test.keyIdString; g != e {
-			t.Errorf("#%d: bad KeyIdString got:%q want:%q", i, g, e)
-		}
-		if g, e := pk.KeyIdShortString(), test.keyIdShort; g != e {
-			t.Errorf("#%d: bad KeyIdShortString got:%q want:%q", i, g, e)
-		}
-	}
-}
-
-func TestPublicKeySerialize(t *testing.T) {
-	for i, test := range pubKeyTests {
-		packet, err := Read(readerFromHex(test.hexData))
-		if err != nil {
-			t.Errorf("#%d: Read error: %s", i, err)
-			continue
-		}
-		pk, ok := packet.(*PublicKey)
-		if !ok {
-			t.Errorf("#%d: failed to parse, got: %#v", i, packet)
-			continue
-		}
-		serializeBuf := bytes.NewBuffer(nil)
-		err = pk.Serialize(serializeBuf)
-		if err != nil {
-			t.Errorf("#%d: failed to serialize: %s", i, err)
-			continue
-		}
-
-		packet, err = Read(serializeBuf)
-		if err != nil {
-			t.Errorf("#%d: Read error (from serialized data): %s", i, err)
-			continue
-		}
-		pk, ok = packet.(*PublicKey)
-		if !ok {
-			t.Errorf("#%d: failed to parse serialized data, got: %#v", i, packet)
-			continue
-		}
-	}
-}
-
-func TestEcc384Serialize(t *testing.T) {
-	r := readerFromHex(ecc384PubHex)
-	var w bytes.Buffer
-	for i := 0; i < 2; i++ {
-		// Public key
-		p, err := Read(r)
-		if err != nil {
-			t.Error(err)
-		}
-		pubkey := p.(*PublicKey)
-		if !bytes.Equal(pubkey.ec.oid, []byte{0x2b, 0x81, 0x04, 0x00, 0x22}) {
-			t.Errorf("Unexpected pubkey OID: %x", pubkey.ec.oid)
-		}
-		if !bytes.Equal(pubkey.ec.p.bytes[:5], []byte{0x04, 0xf6, 0xb8, 0xc5, 0xac}) {
-			t.Errorf("Unexpected pubkey P[:5]: %x", pubkey.ec.p.bytes)
-		}
-		if pubkey.KeyId != 0x098033880F54719F {
-			t.Errorf("Unexpected pubkey ID: %x", pubkey.KeyId)
-		}
-		err = pubkey.Serialize(&w)
-		if err != nil {
-			t.Error(err)
-		}
-		// User ID
-		p, err = Read(r)
-		if err != nil {
-			t.Error(err)
-		}
-		uid := p.(*UserId)
-		if uid.Id != "ec_dsa_dh_384 <openpgp@brainhub.org>" {
-			t.Error("Unexpected UID:", uid.Id)
-		}
-		err = uid.Serialize(&w)
-		if err != nil {
-			t.Error(err)
-		}
-		// User ID Sig
-		p, err = Read(r)
-		if err != nil {
-			t.Error(err)
-		}
-		uidSig := p.(*Signature)
-		err = pubkey.VerifyUserIdSignature(uid.Id, pubkey, uidSig)
-		if err != nil {
-			t.Error(err, ": UID")
-		}
-		err = uidSig.Serialize(&w)
-		if err != nil {
-			t.Error(err)
-		}
-		// Subkey
-		p, err = Read(r)
-		if err != nil {
-			t.Error(err)
-		}
-		subkey := p.(*PublicKey)
-		if !bytes.Equal(subkey.ec.oid, []byte{0x2b, 0x81, 0x04, 0x00, 0x22}) {
-			t.Errorf("Unexpected subkey OID: %x", subkey.ec.oid)
-		}
-		if !bytes.Equal(subkey.ec.p.bytes[:5], []byte{0x04, 0x2f, 0xaa, 0x84, 0x02}) {
-			t.Errorf("Unexpected subkey P[:5]: %x", subkey.ec.p.bytes)
-		}
-		if subkey.ecdh.KdfHash != 0x09 {
-			t.Error("Expected KDF hash function SHA384 (0x09), got", subkey.ecdh.KdfHash)
-		}
-		if subkey.ecdh.KdfAlgo != 0x09 {
-			t.Error("Expected KDF symmetric alg AES256 (0x09), got", subkey.ecdh.KdfAlgo)
-		}
-		if subkey.KeyId != 0xAA8B938F9A201946 {
-			t.Errorf("Unexpected subkey ID: %x", subkey.KeyId)
-		}
-		err = subkey.Serialize(&w)
-		if err != nil {
-			t.Error(err)
-		}
-		// Subkey Sig
-		p, err = Read(r)
-		if err != nil {
-			t.Error(err)
-		}
-		subkeySig := p.(*Signature)
-		err = pubkey.VerifyKeySignature(subkey, subkeySig)
-		if err != nil {
-			t.Error(err)
-		}
-		err = subkeySig.Serialize(&w)
-		if err != nil {
-			t.Error(err)
-		}
-		// Now read back what we've written again
-		r = bytes.NewBuffer(w.Bytes())
-		w.Reset()
-	}
-}
-
-const rsaFingerprintHex = "5fb74b1d03b1e3cb31bc2f8aa34d7e18c20c31bb"
-
-const rsaPkDataHex = "988d044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd0011010001"
-
-const dsaFingerprintHex = "eece4c094db002103714c63c8e8fbe54062f19ed"
-
-const dsaPkDataHex = "9901a2044d432f89110400cd581334f0d7a1e1bdc8b9d6d8c0baf68793632735d2bb0903224cbaa1dfbf35a60ee7a13b92643421e1eb41aa8d79bea19a115a677f6b8ba3c7818ce53a6c2a24a1608bd8b8d6e55c5090cbde09dd26e356267465ae25e69ec8bdd57c7bbb2623e4d73336f73a0a9098f7f16da2e25252130fd694c0e8070c55a812a423ae7f00a0ebf50e70c2f19c3520a551bd4b08d30f23530d3d03ff7d0bf4a53a64a09dc5e6e6e35854b7d70c882b0c60293401958b1bd9e40abec3ea05ba87cf64899299d4bd6aa7f459c201d3fbbd6c82004bdc5e8a9eb8082d12054cc90fa9d4ec251a843236a588bf49552441817436c4f43326966fe85447d4e6d0acf8fa1ef0f014730770603ad7634c3088dc52501c237328417c31c89ed70400b2f1a98b0bf42f11fefc430704bebbaa41d9f355600c3facee1e490f64208e0e094ea55e3a598a219a58500bf78ac677b670a14f4e47e9cf8eab4f368cc1ddcaa18cc59309d4cc62dd4f680e73e6cc3e1ce87a84d0925efbcb26c575c093fc42eecf45135fabf6403a25c2016e1774c0484e440a18319072c617cc97ac0a3bb0"
-
-const ecdsaFingerprintHex = "9892270b38b8980b05c8d56d43fe956c542ca00b"
-
-const ecdsaPkDataHex = "9893045071c29413052b8104002304230401f4867769cedfa52c325018896245443968e52e51d0c2df8d939949cb5b330f2921711fbee1c9b9dddb95d15cb0255e99badeddda7cc23d9ddcaacbc290969b9f24019375d61c2e4e3b36953a28d8b2bc95f78c3f1d592fb24499be348656a7b17e3963187b4361afe497bc5f9f81213f04069f8e1fb9e6a6290ae295ca1a92b894396cb4"
-
-// Source: https://sites.google.com/site/brainhub/pgpecckeys#TOC-ECC-NIST-P-384-key
-const ecc384PubHex = `99006f044d53059213052b81040022030304f6b8c5aced5b84ef9f4a209db2e4a9dfb70d28cb8c10ecd57674a9fa5a67389942b62d5e51367df4c7bfd3f8e500feecf07ed265a621a8ebbbe53e947ec78c677eba143bd1533c2b350e1c29f82313e1e1108eba063be1e64b10e6950e799c2db42465635f6473615f64685f333834203c6f70656e70677040627261696e6875622e6f72673e8900cb04101309005305024d530592301480000000002000077072656665727265642d656d61696c2d656e636f64696e67407067702e636f6d7067706d696d65040b090807021901051b03000000021602051e010000000415090a08000a0910098033880f54719fca2b0180aa37350968bd5f115afd8ce7bc7b103822152dbff06d0afcda835329510905b98cb469ba208faab87c7412b799e7b633017f58364ea480e8a1a3f253a0c5f22c446e8be9a9fce6210136ee30811abbd49139de28b5bdf8dc36d06ae748579e9ff503b90073044d53059212052b810400220303042faa84024a20b6735c4897efa5bfb41bf85b7eefeab5ca0cb9ffc8ea04a46acb25534a577694f9e25340a4ab5223a9dd1eda530c8aa2e6718db10d7e672558c7736fe09369ea5739a2a3554bf16d41faa50562f11c6d39bbd5dffb6b9a9ec9180301090989008404181309000c05024d530592051b0c000000000a0910098033880f54719f80970180eee7a6d8fcee41ee4f9289df17f9bcf9d955dca25c583b94336f3a2b2d4986dc5cf417b8d2dc86f741a9e1a6d236c0e3017d1c76575458a0cfb93ae8a2b274fcc65ceecd7a91eec83656ba13219969f06945b48c56bd04152c3a0553c5f2f4bd1267`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go
deleted file mode 100644
index 5daf7b6cfd..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3.go
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"crypto/md5"
-	"crypto/rsa"
-	"encoding/binary"
-	"fmt"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-// PublicKeyV3 represents older, version 3 public keys. These keys are less secure and
-// should not be used for signing or encrypting. They are supported here only for
-// parsing version 3 key material and validating signatures.
-// See RFC 4880, section 5.5.2.
-type PublicKeyV3 struct {
-	CreationTime time.Time
-	DaysToExpire uint16
-	PubKeyAlgo   PublicKeyAlgorithm
-	PublicKey    *rsa.PublicKey
-	Fingerprint  [16]byte
-	KeyId        uint64
-	IsSubkey     bool
-
-	n, e parsedMPI
-}
-
-// newRSAPublicKeyV3 returns a PublicKey that wraps the given rsa.PublicKey.
-// Included here for testing purposes only. RFC 4880, section 5.5.2:
-// "an implementation MUST NOT generate a V3 key, but MAY accept it."
-func newRSAPublicKeyV3(creationTime time.Time, pub *rsa.PublicKey) *PublicKeyV3 {
-	pk := &PublicKeyV3{
-		CreationTime: creationTime,
-		PublicKey:    pub,
-		n:            fromBig(pub.N),
-		e:            fromBig(big.NewInt(int64(pub.E))),
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return pk
-}
-
-func (pk *PublicKeyV3) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.5.2
-	var buf [8]byte
-	if _, err = readFull(r, buf[:]); err != nil {
-		return
-	}
-	if buf[0] < 2 || buf[0] > 3 {
-		return errors.UnsupportedError("public key version")
-	}
-	pk.CreationTime = time.Unix(int64(uint32(buf[1])<<24|uint32(buf[2])<<16|uint32(buf[3])<<8|uint32(buf[4])), 0)
-	pk.DaysToExpire = binary.BigEndian.Uint16(buf[5:7])
-	pk.PubKeyAlgo = PublicKeyAlgorithm(buf[7])
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		err = pk.parseRSA(r)
-	default:
-		err = errors.UnsupportedError("public key type: " + strconv.Itoa(int(pk.PubKeyAlgo)))
-	}
-	if err != nil {
-		return
-	}
-
-	pk.setFingerPrintAndKeyId()
-	return
-}
-
-func (pk *PublicKeyV3) setFingerPrintAndKeyId() {
-	// RFC 4880, section 12.2
-	fingerPrint := md5.New()
-	fingerPrint.Write(pk.n.bytes)
-	fingerPrint.Write(pk.e.bytes)
-	fingerPrint.Sum(pk.Fingerprint[:0])
-	pk.KeyId = binary.BigEndian.Uint64(pk.n.bytes[len(pk.n.bytes)-8:])
-}
-
-// parseRSA parses RSA public key material from the given Reader. See RFC 4880,
-// section 5.5.2.
-func (pk *PublicKeyV3) parseRSA(r io.Reader) (err error) {
-	if pk.n.bytes, pk.n.bitLength, err = readMPI(r); err != nil {
-		return
-	}
-	if pk.e.bytes, pk.e.bitLength, err = readMPI(r); err != nil {
-		return
-	}
-
-	// RFC 4880 Section 12.2 requires the low 8 bytes of the
-	// modulus to form the key id.
-	if len(pk.n.bytes) < 8 {
-		return errors.StructuralError("v3 public key modulus is too short")
-	}
-	if len(pk.e.bytes) > 3 {
-		err = errors.UnsupportedError("large public exponent")
-		return
-	}
-	rsa := &rsa.PublicKey{N: new(big.Int).SetBytes(pk.n.bytes)}
-	for i := 0; i < len(pk.e.bytes); i++ {
-		rsa.E <<= 8
-		rsa.E |= int(pk.e.bytes[i])
-	}
-	pk.PublicKey = rsa
-	return
-}
-
-// SerializeSignaturePrefix writes the prefix for this public key to the given Writer.
-// The prefix is used when calculating a signature over this public key. See
-// RFC 4880, section 5.2.4.
-func (pk *PublicKeyV3) SerializeSignaturePrefix(w io.Writer) {
-	var pLength uint16
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		pLength += 2 + uint16(len(pk.n.bytes))
-		pLength += 2 + uint16(len(pk.e.bytes))
-	default:
-		panic("unknown public key algorithm")
-	}
-	pLength += 6
-	w.Write([]byte{0x99, byte(pLength >> 8), byte(pLength)})
-	return
-}
-
-func (pk *PublicKeyV3) Serialize(w io.Writer) (err error) {
-	length := 8 // 8 byte header
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		length += 2 + len(pk.n.bytes)
-		length += 2 + len(pk.e.bytes)
-	default:
-		panic("unknown public key algorithm")
-	}
-
-	packetType := packetTypePublicKey
-	if pk.IsSubkey {
-		packetType = packetTypePublicSubkey
-	}
-	if err = serializeHeader(w, packetType, length); err != nil {
-		return
-	}
-	return pk.serializeWithoutHeaders(w)
-}
-
-// serializeWithoutHeaders marshals the PublicKey to w in the form of an
-// OpenPGP public key packet, not including the packet header.
-func (pk *PublicKeyV3) serializeWithoutHeaders(w io.Writer) (err error) {
-	var buf [8]byte
-	// Version 3
-	buf[0] = 3
-	// Creation time
-	t := uint32(pk.CreationTime.Unix())
-	buf[1] = byte(t >> 24)
-	buf[2] = byte(t >> 16)
-	buf[3] = byte(t >> 8)
-	buf[4] = byte(t)
-	// Days to expire
-	buf[5] = byte(pk.DaysToExpire >> 8)
-	buf[6] = byte(pk.DaysToExpire)
-	// Public key algorithm
-	buf[7] = byte(pk.PubKeyAlgo)
-
-	if _, err = w.Write(buf[:]); err != nil {
-		return
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		return writeMPIs(w, pk.n, pk.e)
-	}
-	return errors.InvalidArgumentError("bad public-key algorithm")
-}
-
-// CanSign returns true iff this public key can generate signatures
-func (pk *PublicKeyV3) CanSign() bool {
-	return pk.PubKeyAlgo != PubKeyAlgoRSAEncryptOnly
-}
-
-// VerifySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of the data hashed into signed. signed is mutated by this call.
-func (pk *PublicKeyV3) VerifySignatureV3(signed hash.Hash, sig *SignatureV3) (err error) {
-	if !pk.CanSign() {
-		return errors.InvalidArgumentError("public key cannot generate signatures")
-	}
-
-	suffix := make([]byte, 5)
-	suffix[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(suffix[1:], uint32(sig.CreationTime.Unix()))
-	signed.Write(suffix)
-	hashBytes := signed.Sum(nil)
-
-	if hashBytes[0] != sig.HashTag[0] || hashBytes[1] != sig.HashTag[1] {
-		return errors.SignatureError("hash tag doesn't match")
-	}
-
-	if pk.PubKeyAlgo != sig.PubKeyAlgo {
-		return errors.InvalidArgumentError("public key and signature use different algorithms")
-	}
-
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		if err = rsa.VerifyPKCS1v15(pk.PublicKey, sig.Hash, hashBytes, sig.RSASignature.bytes); err != nil {
-			return errors.SignatureError("RSA verification failure")
-		}
-		return
-	default:
-		// V3 public keys only support RSA.
-		panic("shouldn't happen")
-	}
-}
-
-// VerifyUserIdSignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, that id is the identity of pub.
-func (pk *PublicKeyV3) VerifyUserIdSignatureV3(id string, pub *PublicKeyV3, sig *SignatureV3) (err error) {
-	h, err := userIdSignatureV3Hash(id, pk, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// VerifyKeySignatureV3 returns nil iff sig is a valid signature, made by this
-// public key, of signed.
-func (pk *PublicKeyV3) VerifyKeySignatureV3(signed *PublicKeyV3, sig *SignatureV3) (err error) {
-	h, err := keySignatureHash(pk, signed, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return pk.VerifySignatureV3(h, sig)
-}
-
-// userIdSignatureV3Hash returns a Hash of the message that needs to be signed
-// to assert that pk is a valid key for id.
-func userIdSignatureV3Hash(id string, pk signingKey, hfn crypto.Hash) (h hash.Hash, err error) {
-	if !hfn.Available() {
-		return nil, errors.UnsupportedError("hash function")
-	}
-	h = hfn.New()
-
-	// RFC 4880, section 5.2.4
-	pk.SerializeSignaturePrefix(h)
-	pk.serializeWithoutHeaders(h)
-
-	h.Write([]byte(id))
-
-	return
-}
-
-// KeyIdString returns the public key's fingerprint in capital hex
-// (e.g. "6C7EE1B8621CC013").
-func (pk *PublicKeyV3) KeyIdString() string {
-	return fmt.Sprintf("%X", pk.KeyId)
-}
-
-// KeyIdShortString returns the short form of public key's fingerprint
-// in capital hex, as shown by gpg --list-keys (e.g. "621CC013").
-func (pk *PublicKeyV3) KeyIdShortString() string {
-	return fmt.Sprintf("%X", pk.KeyId&0xFFFFFFFF)
-}
-
-// BitLength returns the bit length for the given public key.
-func (pk *PublicKeyV3) BitLength() (bitLength uint16, err error) {
-	switch pk.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSAEncryptOnly, PubKeyAlgoRSASignOnly:
-		bitLength = pk.n.bitLength
-	default:
-		err = errors.InvalidArgumentError("bad public-key algorithm")
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3_test.go
deleted file mode 100644
index e06405904b..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/public_key_v3_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-	"time"
-)
-
-var pubKeyV3Test = struct {
-	hexFingerprint string
-	creationTime   time.Time
-	pubKeyAlgo     PublicKeyAlgorithm
-	keyId          uint64
-	keyIdString    string
-	keyIdShort     string
-}{
-	"103BECF5BD1E837C89D19E98487767F7",
-	time.Unix(779753634, 0),
-	PubKeyAlgoRSA,
-	0xDE0F188A5DA5E3C9,
-	"DE0F188A5DA5E3C9",
-	"5DA5E3C9"}
-
-func TestPublicKeyV3Read(t *testing.T) {
-	i, test := 0, pubKeyV3Test
-	packet, err := Read(v3KeyReader(t))
-	if err != nil {
-		t.Fatalf("#%d: Read error: %s", i, err)
-	}
-	pk, ok := packet.(*PublicKeyV3)
-	if !ok {
-		t.Fatalf("#%d: failed to parse, got: %#v", i, packet)
-	}
-	if pk.PubKeyAlgo != test.pubKeyAlgo {
-		t.Errorf("#%d: bad public key algorithm got:%x want:%x", i, pk.PubKeyAlgo, test.pubKeyAlgo)
-	}
-	if !pk.CreationTime.Equal(test.creationTime) {
-		t.Errorf("#%d: bad creation time got:%v want:%v", i, pk.CreationTime, test.creationTime)
-	}
-	expectedFingerprint, _ := hex.DecodeString(test.hexFingerprint)
-	if !bytes.Equal(expectedFingerprint, pk.Fingerprint[:]) {
-		t.Errorf("#%d: bad fingerprint got:%x want:%x", i, pk.Fingerprint[:], expectedFingerprint)
-	}
-	if pk.KeyId != test.keyId {
-		t.Errorf("#%d: bad keyid got:%x want:%x", i, pk.KeyId, test.keyId)
-	}
-	if g, e := pk.KeyIdString(), test.keyIdString; g != e {
-		t.Errorf("#%d: bad KeyIdString got:%q want:%q", i, g, e)
-	}
-	if g, e := pk.KeyIdShortString(), test.keyIdShort; g != e {
-		t.Errorf("#%d: bad KeyIdShortString got:%q want:%q", i, g, e)
-	}
-}
-
-func TestPublicKeyV3Serialize(t *testing.T) {
-	//for i, test := range pubKeyV3Tests {
-	i := 0
-	packet, err := Read(v3KeyReader(t))
-	if err != nil {
-		t.Fatalf("#%d: Read error: %s", i, err)
-	}
-	pk, ok := packet.(*PublicKeyV3)
-	if !ok {
-		t.Fatalf("#%d: failed to parse, got: %#v", i, packet)
-	}
-	var serializeBuf bytes.Buffer
-	if err = pk.Serialize(&serializeBuf); err != nil {
-		t.Fatalf("#%d: failed to serialize: %s", i, err)
-	}
-
-	if packet, err = Read(bytes.NewBuffer(serializeBuf.Bytes())); err != nil {
-		t.Fatalf("#%d: Read error (from serialized data): %s", i, err)
-	}
-	if pk, ok = packet.(*PublicKeyV3); !ok {
-		t.Fatalf("#%d: failed to parse serialized data, got: %#v", i, packet)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/reader.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/reader.go
deleted file mode 100644
index 34bc7c613e..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/reader.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-)
-
-// Reader reads packets from an io.Reader and allows packets to be 'unread' so
-// that they result from the next call to Next.
-type Reader struct {
-	q       []Packet
-	readers []io.Reader
-}
-
-// New io.Readers are pushed when a compressed or encrypted packet is processed
-// and recursively treated as a new source of packets. However, a carefully
-// crafted packet can trigger an infinite recursive sequence of packets. See
-// http://mumble.net/~campbell/misc/pgp-quine
-// https://web.nvd.nist.gov/view/vuln/detail?vulnId=CVE-2013-4402
-// This constant limits the number of recursive packets that may be pushed.
-const maxReaders = 32
-
-// Next returns the most recently unread Packet, or reads another packet from
-// the top-most io.Reader. Unknown packet types are skipped.
-func (r *Reader) Next() (p Packet, err error) {
-	if len(r.q) > 0 {
-		p = r.q[len(r.q)-1]
-		r.q = r.q[:len(r.q)-1]
-		return
-	}
-
-	for len(r.readers) > 0 {
-		p, err = Read(r.readers[len(r.readers)-1])
-		if err == nil {
-			return
-		}
-		if err == io.EOF {
-			r.readers = r.readers[:len(r.readers)-1]
-			continue
-		}
-		if _, ok := err.(errors.UnknownPacketTypeError); !ok {
-			return nil, err
-		}
-	}
-
-	return nil, io.EOF
-}
-
-// Push causes the Reader to start reading from a new io.Reader. When an EOF
-// error is seen from the new io.Reader, it is popped and the Reader continues
-// to read from the next most recent io.Reader. Push returns a StructuralError
-// if pushing the reader would exceed the maximum recursion level, otherwise it
-// returns nil.
-func (r *Reader) Push(reader io.Reader) (err error) {
-	if len(r.readers) >= maxReaders {
-		return errors.StructuralError("too many layers of packets")
-	}
-	r.readers = append(r.readers, reader)
-	return nil
-}
-
-// Unread causes the given Packet to be returned from the next call to Next.
-func (r *Reader) Unread(p Packet) {
-	r.q = append(r.q, p)
-}
-
-func NewReader(r io.Reader) *Reader {
-	return &Reader{
-		q:       nil,
-		readers: []io.Reader{r},
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/signature.go
deleted file mode 100644
index 6ce0cbedbe..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature.go
+++ /dev/null
@@ -1,731 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"encoding/asn1"
-	"encoding/binary"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-const (
-	// See RFC 4880, section 5.2.3.21 for details.
-	KeyFlagCertify = 1 << iota
-	KeyFlagSign
-	KeyFlagEncryptCommunications
-	KeyFlagEncryptStorage
-)
-
-// Signature represents a signature. See RFC 4880, section 5.2.
-type Signature struct {
-	SigType    SignatureType
-	PubKeyAlgo PublicKeyAlgorithm
-	Hash       crypto.Hash
-
-	// HashSuffix is extra data that is hashed in after the signed data.
-	HashSuffix []byte
-	// HashTag contains the first two bytes of the hash for fast rejection
-	// of bad signed data.
-	HashTag      [2]byte
-	CreationTime time.Time
-
-	RSASignature         parsedMPI
-	DSASigR, DSASigS     parsedMPI
-	ECDSASigR, ECDSASigS parsedMPI
-
-	// rawSubpackets contains the unparsed subpackets, in order.
-	rawSubpackets []outputSubpacket
-
-	// The following are optional so are nil when not included in the
-	// signature.
-
-	SigLifetimeSecs, KeyLifetimeSecs                        *uint32
-	PreferredSymmetric, PreferredHash, PreferredCompression []uint8
-	IssuerKeyId                                             *uint64
-	IsPrimaryId                                             *bool
-
-	// FlagsValid is set if any flags were given. See RFC 4880, section
-	// 5.2.3.21 for details.
-	FlagsValid                                                           bool
-	FlagCertify, FlagSign, FlagEncryptCommunications, FlagEncryptStorage bool
-
-	// RevocationReason is set if this signature has been revoked.
-	// See RFC 4880, section 5.2.3.23 for details.
-	RevocationReason     *uint8
-	RevocationReasonText string
-
-	// MDC is set if this signature has a feature packet that indicates
-	// support for MDC subpackets.
-	MDC bool
-
-	// EmbeddedSignature, if non-nil, is a signature of the parent key, by
-	// this key. This prevents an attacker from claiming another's signing
-	// subkey as their own.
-	EmbeddedSignature *Signature
-
-	outSubpackets []outputSubpacket
-}
-
-func (sig *Signature) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.2.3
-	var buf [5]byte
-	_, err = readFull(r, buf[:1])
-	if err != nil {
-		return
-	}
-	if buf[0] != 4 {
-		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
-		return
-	}
-
-	_, err = readFull(r, buf[:5])
-	if err != nil {
-		return
-	}
-	sig.SigType = SignatureType(buf[0])
-	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[1])
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA, PubKeyAlgoECDSA:
-	default:
-		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
-		return
-	}
-
-	var ok bool
-	sig.Hash, ok = s2k.HashIdToHash(buf[2])
-	if !ok {
-		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
-	}
-
-	hashedSubpacketsLength := int(buf[3])<<8 | int(buf[4])
-	l := 6 + hashedSubpacketsLength
-	sig.HashSuffix = make([]byte, l+6)
-	sig.HashSuffix[0] = 4
-	copy(sig.HashSuffix[1:], buf[:5])
-	hashedSubpackets := sig.HashSuffix[6:l]
-	_, err = readFull(r, hashedSubpackets)
-	if err != nil {
-		return
-	}
-	// See RFC 4880, section 5.2.4
-	trailer := sig.HashSuffix[l:]
-	trailer[0] = 4
-	trailer[1] = 0xff
-	trailer[2] = uint8(l >> 24)
-	trailer[3] = uint8(l >> 16)
-	trailer[4] = uint8(l >> 8)
-	trailer[5] = uint8(l)
-
-	err = parseSignatureSubpackets(sig, hashedSubpackets, true)
-	if err != nil {
-		return
-	}
-
-	_, err = readFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-	unhashedSubpacketsLength := int(buf[0])<<8 | int(buf[1])
-	unhashedSubpackets := make([]byte, unhashedSubpacketsLength)
-	_, err = readFull(r, unhashedSubpackets)
-	if err != nil {
-		return
-	}
-	err = parseSignatureSubpackets(sig, unhashedSubpackets, false)
-	if err != nil {
-		return
-	}
-
-	_, err = readFull(r, sig.HashTag[:2])
-	if err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
-	case PubKeyAlgoDSA:
-		sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r)
-		if err == nil {
-			sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
-		}
-	case PubKeyAlgoECDSA:
-		sig.ECDSASigR.bytes, sig.ECDSASigR.bitLength, err = readMPI(r)
-		if err == nil {
-			sig.ECDSASigS.bytes, sig.ECDSASigS.bitLength, err = readMPI(r)
-		}
-	default:
-		panic("unreachable")
-	}
-	return
-}
-
-// parseSignatureSubpackets parses subpackets of the main signature packet. See
-// RFC 4880, section 5.2.3.1.
-func parseSignatureSubpackets(sig *Signature, subpackets []byte, isHashed bool) (err error) {
-	for len(subpackets) > 0 {
-		subpackets, err = parseSignatureSubpacket(sig, subpackets, isHashed)
-		if err != nil {
-			return
-		}
-	}
-
-	if sig.CreationTime.IsZero() {
-		err = errors.StructuralError("no creation time in signature")
-	}
-
-	return
-}
-
-type signatureSubpacketType uint8
-
-const (
-	creationTimeSubpacket        signatureSubpacketType = 2
-	signatureExpirationSubpacket signatureSubpacketType = 3
-	keyExpirationSubpacket       signatureSubpacketType = 9
-	prefSymmetricAlgosSubpacket  signatureSubpacketType = 11
-	issuerSubpacket              signatureSubpacketType = 16
-	prefHashAlgosSubpacket       signatureSubpacketType = 21
-	prefCompressionSubpacket     signatureSubpacketType = 22
-	primaryUserIdSubpacket       signatureSubpacketType = 25
-	keyFlagsSubpacket            signatureSubpacketType = 27
-	reasonForRevocationSubpacket signatureSubpacketType = 29
-	featuresSubpacket            signatureSubpacketType = 30
-	embeddedSignatureSubpacket   signatureSubpacketType = 32
-)
-
-// parseSignatureSubpacket parses a single subpacket. len(subpacket) is >= 1.
-func parseSignatureSubpacket(sig *Signature, subpacket []byte, isHashed bool) (rest []byte, err error) {
-	// RFC 4880, section 5.2.3.1
-	var (
-		length     uint32
-		packetType signatureSubpacketType
-		isCritical bool
-	)
-	switch {
-	case subpacket[0] < 192:
-		length = uint32(subpacket[0])
-		subpacket = subpacket[1:]
-	case subpacket[0] < 255:
-		if len(subpacket) < 2 {
-			goto Truncated
-		}
-		length = uint32(subpacket[0]-192)<<8 + uint32(subpacket[1]) + 192
-		subpacket = subpacket[2:]
-	default:
-		if len(subpacket) < 5 {
-			goto Truncated
-		}
-		length = uint32(subpacket[1])<<24 |
-			uint32(subpacket[2])<<16 |
-			uint32(subpacket[3])<<8 |
-			uint32(subpacket[4])
-		subpacket = subpacket[5:]
-	}
-	if length > uint32(len(subpacket)) {
-		goto Truncated
-	}
-	rest = subpacket[length:]
-	subpacket = subpacket[:length]
-	if len(subpacket) == 0 {
-		err = errors.StructuralError("zero length signature subpacket")
-		return
-	}
-	packetType = signatureSubpacketType(subpacket[0] & 0x7f)
-	isCritical = subpacket[0]&0x80 == 0x80
-	subpacket = subpacket[1:]
-	sig.rawSubpackets = append(sig.rawSubpackets, outputSubpacket{isHashed, packetType, isCritical, subpacket})
-	switch packetType {
-	case creationTimeSubpacket:
-		if !isHashed {
-			err = errors.StructuralError("signature creation time in non-hashed area")
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("signature creation time not four bytes")
-			return
-		}
-		t := binary.BigEndian.Uint32(subpacket)
-		sig.CreationTime = time.Unix(int64(t), 0)
-	case signatureExpirationSubpacket:
-		// Signature expiration time, section 5.2.3.10
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("expiration subpacket with bad length")
-			return
-		}
-		sig.SigLifetimeSecs = new(uint32)
-		*sig.SigLifetimeSecs = binary.BigEndian.Uint32(subpacket)
-	case keyExpirationSubpacket:
-		// Key expiration time, section 5.2.3.6
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 4 {
-			err = errors.StructuralError("key expiration subpacket with bad length")
-			return
-		}
-		sig.KeyLifetimeSecs = new(uint32)
-		*sig.KeyLifetimeSecs = binary.BigEndian.Uint32(subpacket)
-	case prefSymmetricAlgosSubpacket:
-		// Preferred symmetric algorithms, section 5.2.3.7
-		if !isHashed {
-			return
-		}
-		sig.PreferredSymmetric = make([]byte, len(subpacket))
-		copy(sig.PreferredSymmetric, subpacket)
-	case issuerSubpacket:
-		// Issuer, section 5.2.3.5
-		if len(subpacket) != 8 {
-			err = errors.StructuralError("issuer subpacket with bad length")
-			return
-		}
-		sig.IssuerKeyId = new(uint64)
-		*sig.IssuerKeyId = binary.BigEndian.Uint64(subpacket)
-	case prefHashAlgosSubpacket:
-		// Preferred hash algorithms, section 5.2.3.8
-		if !isHashed {
-			return
-		}
-		sig.PreferredHash = make([]byte, len(subpacket))
-		copy(sig.PreferredHash, subpacket)
-	case prefCompressionSubpacket:
-		// Preferred compression algorithms, section 5.2.3.9
-		if !isHashed {
-			return
-		}
-		sig.PreferredCompression = make([]byte, len(subpacket))
-		copy(sig.PreferredCompression, subpacket)
-	case primaryUserIdSubpacket:
-		// Primary User ID, section 5.2.3.19
-		if !isHashed {
-			return
-		}
-		if len(subpacket) != 1 {
-			err = errors.StructuralError("primary user id subpacket with bad length")
-			return
-		}
-		sig.IsPrimaryId = new(bool)
-		if subpacket[0] > 0 {
-			*sig.IsPrimaryId = true
-		}
-	case keyFlagsSubpacket:
-		// Key flags, section 5.2.3.21
-		if !isHashed {
-			return
-		}
-		if len(subpacket) == 0 {
-			err = errors.StructuralError("empty key flags subpacket")
-			return
-		}
-		sig.FlagsValid = true
-		if subpacket[0]&KeyFlagCertify != 0 {
-			sig.FlagCertify = true
-		}
-		if subpacket[0]&KeyFlagSign != 0 {
-			sig.FlagSign = true
-		}
-		if subpacket[0]&KeyFlagEncryptCommunications != 0 {
-			sig.FlagEncryptCommunications = true
-		}
-		if subpacket[0]&KeyFlagEncryptStorage != 0 {
-			sig.FlagEncryptStorage = true
-		}
-	case reasonForRevocationSubpacket:
-		// Reason For Revocation, section 5.2.3.23
-		if !isHashed {
-			return
-		}
-		if len(subpacket) == 0 {
-			err = errors.StructuralError("empty revocation reason subpacket")
-			return
-		}
-		sig.RevocationReason = new(uint8)
-		*sig.RevocationReason = subpacket[0]
-		sig.RevocationReasonText = string(subpacket[1:])
-	case featuresSubpacket:
-		// Features subpacket, section 5.2.3.24 specifies a very general
-		// mechanism for OpenPGP implementations to signal support for new
-		// features. In practice, the subpacket is used exclusively to
-		// indicate support for MDC-protected encryption.
-		sig.MDC = len(subpacket) >= 1 && subpacket[0]&1 == 1
-	case embeddedSignatureSubpacket:
-		// Only usage is in signatures that cross-certify
-		// signing subkeys. section 5.2.3.26 describes the
-		// format, with its usage described in section 11.1
-		if sig.EmbeddedSignature != nil {
-			err = errors.StructuralError("Cannot have multiple embedded signatures")
-			return
-		}
-		sig.EmbeddedSignature = new(Signature)
-		// Embedded signatures are required to be v4 signatures see
-		// section 12.1. However, we only parse v4 signatures in this
-		// file anyway.
-		if err := sig.EmbeddedSignature.parse(bytes.NewBuffer(subpacket)); err != nil {
-			return nil, err
-		}
-		if sigType := sig.EmbeddedSignature.SigType; sigType != SigTypePrimaryKeyBinding {
-			return nil, errors.StructuralError("cross-signature has unexpected type " + strconv.Itoa(int(sigType)))
-		}
-	default:
-		if isCritical {
-			err = errors.UnsupportedError("unknown critical signature subpacket type " + strconv.Itoa(int(packetType)))
-			return
-		}
-	}
-	return
-
-Truncated:
-	err = errors.StructuralError("signature subpacket truncated")
-	return
-}
-
-// subpacketLengthLength returns the length, in bytes, of an encoded length value.
-func subpacketLengthLength(length int) int {
-	if length < 192 {
-		return 1
-	}
-	if length < 16320 {
-		return 2
-	}
-	return 5
-}
-
-// serializeSubpacketLength marshals the given length into to.
-func serializeSubpacketLength(to []byte, length int) int {
-	// RFC 4880, Section 4.2.2.
-	if length < 192 {
-		to[0] = byte(length)
-		return 1
-	}
-	if length < 16320 {
-		length -= 192
-		to[0] = byte((length >> 8) + 192)
-		to[1] = byte(length)
-		return 2
-	}
-	to[0] = 255
-	to[1] = byte(length >> 24)
-	to[2] = byte(length >> 16)
-	to[3] = byte(length >> 8)
-	to[4] = byte(length)
-	return 5
-}
-
-// subpacketsLength returns the serialized length, in bytes, of the given
-// subpackets.
-func subpacketsLength(subpackets []outputSubpacket, hashed bool) (length int) {
-	for _, subpacket := range subpackets {
-		if subpacket.hashed == hashed {
-			length += subpacketLengthLength(len(subpacket.contents) + 1)
-			length += 1 // type byte
-			length += len(subpacket.contents)
-		}
-	}
-	return
-}
-
-// serializeSubpackets marshals the given subpackets into to.
-func serializeSubpackets(to []byte, subpackets []outputSubpacket, hashed bool) {
-	for _, subpacket := range subpackets {
-		if subpacket.hashed == hashed {
-			n := serializeSubpacketLength(to, len(subpacket.contents)+1)
-			to[n] = byte(subpacket.subpacketType)
-			to = to[1+n:]
-			n = copy(to, subpacket.contents)
-			to = to[n:]
-		}
-	}
-	return
-}
-
-// KeyExpired returns whether sig is a self-signature of a key that has
-// expired.
-func (sig *Signature) KeyExpired(currentTime time.Time) bool {
-	if sig.KeyLifetimeSecs == nil {
-		return false
-	}
-	expiry := sig.CreationTime.Add(time.Duration(*sig.KeyLifetimeSecs) * time.Second)
-	return currentTime.After(expiry)
-}
-
-// buildHashSuffix constructs the HashSuffix member of sig in preparation for signing.
-func (sig *Signature) buildHashSuffix() (err error) {
-	hashedSubpacketsLen := subpacketsLength(sig.outSubpackets, true)
-
-	var ok bool
-	l := 6 + hashedSubpacketsLen
-	sig.HashSuffix = make([]byte, l+6)
-	sig.HashSuffix[0] = 4
-	sig.HashSuffix[1] = uint8(sig.SigType)
-	sig.HashSuffix[2] = uint8(sig.PubKeyAlgo)
-	sig.HashSuffix[3], ok = s2k.HashToHashId(sig.Hash)
-	if !ok {
-		sig.HashSuffix = nil
-		return errors.InvalidArgumentError("hash cannot be represented in OpenPGP: " + strconv.Itoa(int(sig.Hash)))
-	}
-	sig.HashSuffix[4] = byte(hashedSubpacketsLen >> 8)
-	sig.HashSuffix[5] = byte(hashedSubpacketsLen)
-	serializeSubpackets(sig.HashSuffix[6:l], sig.outSubpackets, true)
-	trailer := sig.HashSuffix[l:]
-	trailer[0] = 4
-	trailer[1] = 0xff
-	trailer[2] = byte(l >> 24)
-	trailer[3] = byte(l >> 16)
-	trailer[4] = byte(l >> 8)
-	trailer[5] = byte(l)
-	return
-}
-
-func (sig *Signature) signPrepareHash(h hash.Hash) (digest []byte, err error) {
-	err = sig.buildHashSuffix()
-	if err != nil {
-		return
-	}
-
-	h.Write(sig.HashSuffix)
-	digest = h.Sum(nil)
-	copy(sig.HashTag[:], digest)
-	return
-}
-
-// Sign signs a message with a private key. The hash, h, must contain
-// the hash of the message to be signed and will be mutated by this function.
-// On success, the signature is stored in sig. Call Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) Sign(h hash.Hash, priv *PrivateKey, config *Config) (err error) {
-	sig.outSubpackets = sig.buildSubpackets()
-	digest, err := sig.signPrepareHash(h)
-	if err != nil {
-		return
-	}
-
-	switch priv.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		// supports both *rsa.PrivateKey and crypto.Signer
-		sig.RSASignature.bytes, err = priv.PrivateKey.(crypto.Signer).Sign(config.Random(), digest, sig.Hash)
-		sig.RSASignature.bitLength = uint16(8 * len(sig.RSASignature.bytes))
-	case PubKeyAlgoDSA:
-		dsaPriv := priv.PrivateKey.(*dsa.PrivateKey)
-
-		// Need to truncate hashBytes to match FIPS 186-3 section 4.6.
-		subgroupSize := (dsaPriv.Q.BitLen() + 7) / 8
-		if len(digest) > subgroupSize {
-			digest = digest[:subgroupSize]
-		}
-		r, s, err := dsa.Sign(config.Random(), dsaPriv, digest)
-		if err == nil {
-			sig.DSASigR.bytes = r.Bytes()
-			sig.DSASigR.bitLength = uint16(8 * len(sig.DSASigR.bytes))
-			sig.DSASigS.bytes = s.Bytes()
-			sig.DSASigS.bitLength = uint16(8 * len(sig.DSASigS.bytes))
-		}
-	case PubKeyAlgoECDSA:
-		var r, s *big.Int
-		if pk, ok := priv.PrivateKey.(*ecdsa.PrivateKey); ok {
-			// direct support, avoid asn1 wrapping/unwrapping
-			r, s, err = ecdsa.Sign(config.Random(), pk, digest)
-		} else {
-			var b []byte
-			b, err = priv.PrivateKey.(crypto.Signer).Sign(config.Random(), digest, nil)
-			if err == nil {
-				r, s, err = unwrapECDSASig(b)
-			}
-		}
-		if err == nil {
-			sig.ECDSASigR = fromBig(r)
-			sig.ECDSASigS = fromBig(s)
-		}
-	default:
-		err = errors.UnsupportedError("public key algorithm: " + strconv.Itoa(int(sig.PubKeyAlgo)))
-	}
-
-	return
-}
-
-// unwrapECDSASig parses the two integer components of an ASN.1-encoded ECDSA
-// signature.
-func unwrapECDSASig(b []byte) (r, s *big.Int, err error) {
-	var ecsdaSig struct {
-		R, S *big.Int
-	}
-	_, err = asn1.Unmarshal(b, &ecsdaSig)
-	if err != nil {
-		return
-	}
-	return ecsdaSig.R, ecsdaSig.S, nil
-}
-
-// SignUserId computes a signature from priv, asserting that pub is a valid
-// key for the identity id.  On success, the signature is stored in sig. Call
-// Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) SignUserId(id string, pub *PublicKey, priv *PrivateKey, config *Config) error {
-	h, err := userIdSignatureHash(id, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return sig.Sign(h, priv, config)
-}
-
-// SignKey computes a signature from priv, asserting that pub is a subkey. On
-// success, the signature is stored in sig. Call Serialize to write it out.
-// If config is nil, sensible defaults will be used.
-func (sig *Signature) SignKey(pub *PublicKey, priv *PrivateKey, config *Config) error {
-	h, err := keySignatureHash(&priv.PublicKey, pub, sig.Hash)
-	if err != nil {
-		return err
-	}
-	return sig.Sign(h, priv, config)
-}
-
-// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
-// called first.
-func (sig *Signature) Serialize(w io.Writer) (err error) {
-	if len(sig.outSubpackets) == 0 {
-		sig.outSubpackets = sig.rawSubpackets
-	}
-	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil && sig.ECDSASigR.bytes == nil {
-		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
-	}
-
-	sigLength := 0
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sigLength = 2 + len(sig.RSASignature.bytes)
-	case PubKeyAlgoDSA:
-		sigLength = 2 + len(sig.DSASigR.bytes)
-		sigLength += 2 + len(sig.DSASigS.bytes)
-	case PubKeyAlgoECDSA:
-		sigLength = 2 + len(sig.ECDSASigR.bytes)
-		sigLength += 2 + len(sig.ECDSASigS.bytes)
-	default:
-		panic("impossible")
-	}
-
-	unhashedSubpacketsLen := subpacketsLength(sig.outSubpackets, false)
-	length := len(sig.HashSuffix) - 6 /* trailer not included */ +
-		2 /* length of unhashed subpackets */ + unhashedSubpacketsLen +
-		2 /* hash tag */ + sigLength
-	err = serializeHeader(w, packetTypeSignature, length)
-	if err != nil {
-		return
-	}
-
-	_, err = w.Write(sig.HashSuffix[:len(sig.HashSuffix)-6])
-	if err != nil {
-		return
-	}
-
-	unhashedSubpackets := make([]byte, 2+unhashedSubpacketsLen)
-	unhashedSubpackets[0] = byte(unhashedSubpacketsLen >> 8)
-	unhashedSubpackets[1] = byte(unhashedSubpacketsLen)
-	serializeSubpackets(unhashedSubpackets[2:], sig.outSubpackets, false)
-
-	_, err = w.Write(unhashedSubpackets)
-	if err != nil {
-		return
-	}
-	_, err = w.Write(sig.HashTag[:])
-	if err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		err = writeMPIs(w, sig.RSASignature)
-	case PubKeyAlgoDSA:
-		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
-	case PubKeyAlgoECDSA:
-		err = writeMPIs(w, sig.ECDSASigR, sig.ECDSASigS)
-	default:
-		panic("impossible")
-	}
-	return
-}
-
-// outputSubpacket represents a subpacket to be marshaled.
-type outputSubpacket struct {
-	hashed        bool // true if this subpacket is in the hashed area.
-	subpacketType signatureSubpacketType
-	isCritical    bool
-	contents      []byte
-}
-
-func (sig *Signature) buildSubpackets() (subpackets []outputSubpacket) {
-	creationTime := make([]byte, 4)
-	binary.BigEndian.PutUint32(creationTime, uint32(sig.CreationTime.Unix()))
-	subpackets = append(subpackets, outputSubpacket{true, creationTimeSubpacket, false, creationTime})
-
-	if sig.IssuerKeyId != nil {
-		keyId := make([]byte, 8)
-		binary.BigEndian.PutUint64(keyId, *sig.IssuerKeyId)
-		subpackets = append(subpackets, outputSubpacket{true, issuerSubpacket, false, keyId})
-	}
-
-	if sig.SigLifetimeSecs != nil && *sig.SigLifetimeSecs != 0 {
-		sigLifetime := make([]byte, 4)
-		binary.BigEndian.PutUint32(sigLifetime, *sig.SigLifetimeSecs)
-		subpackets = append(subpackets, outputSubpacket{true, signatureExpirationSubpacket, true, sigLifetime})
-	}
-
-	// Key flags may only appear in self-signatures or certification signatures.
-
-	if sig.FlagsValid {
-		var flags byte
-		if sig.FlagCertify {
-			flags |= KeyFlagCertify
-		}
-		if sig.FlagSign {
-			flags |= KeyFlagSign
-		}
-		if sig.FlagEncryptCommunications {
-			flags |= KeyFlagEncryptCommunications
-		}
-		if sig.FlagEncryptStorage {
-			flags |= KeyFlagEncryptStorage
-		}
-		subpackets = append(subpackets, outputSubpacket{true, keyFlagsSubpacket, false, []byte{flags}})
-	}
-
-	// The following subpackets may only appear in self-signatures
-
-	if sig.KeyLifetimeSecs != nil && *sig.KeyLifetimeSecs != 0 {
-		keyLifetime := make([]byte, 4)
-		binary.BigEndian.PutUint32(keyLifetime, *sig.KeyLifetimeSecs)
-		subpackets = append(subpackets, outputSubpacket{true, keyExpirationSubpacket, true, keyLifetime})
-	}
-
-	if sig.IsPrimaryId != nil && *sig.IsPrimaryId {
-		subpackets = append(subpackets, outputSubpacket{true, primaryUserIdSubpacket, false, []byte{1}})
-	}
-
-	if len(sig.PreferredSymmetric) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefSymmetricAlgosSubpacket, false, sig.PreferredSymmetric})
-	}
-
-	if len(sig.PreferredHash) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefHashAlgosSubpacket, false, sig.PreferredHash})
-	}
-
-	if len(sig.PreferredCompression) > 0 {
-		subpackets = append(subpackets, outputSubpacket{true, prefCompressionSubpacket, false, sig.PreferredCompression})
-	}
-
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_test.go
deleted file mode 100644
index 56e761179d..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"encoding/hex"
-	"testing"
-)
-
-func TestSignatureRead(t *testing.T) {
-	packet, err := Read(readerFromHex(signatureDataHex))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	sig, ok := packet.(*Signature)
-	if !ok || sig.SigType != SigTypeBinary || sig.PubKeyAlgo != PubKeyAlgoRSA || sig.Hash != crypto.SHA1 {
-		t.Errorf("failed to parse, got: %#v", packet)
-	}
-}
-
-func TestSignatureReserialize(t *testing.T) {
-	packet, _ := Read(readerFromHex(signatureDataHex))
-	sig := packet.(*Signature)
-	out := new(bytes.Buffer)
-	err := sig.Serialize(out)
-	if err != nil {
-		t.Errorf("error reserializing: %s", err)
-		return
-	}
-
-	expected, _ := hex.DecodeString(signatureDataHex)
-	if !bytes.Equal(expected, out.Bytes()) {
-		t.Errorf("output doesn't match input (got vs expected):\n%s\n%s", hex.Dump(out.Bytes()), hex.Dump(expected))
-	}
-}
-
-func TestSignUserId(t *testing.T) {
-	sig := &Signature{
-		SigType:    SigTypeGenericCert,
-		PubKeyAlgo: PubKeyAlgoRSA,
-		Hash:       0, // invalid hash function
-	}
-
-	packet, err := Read(readerFromHex(rsaPkDataHex))
-	if err != nil {
-		t.Fatalf("failed to deserialize public key: %v", err)
-	}
-	pubKey := packet.(*PublicKey)
-
-	packet, err = Read(readerFromHex(privKeyRSAHex))
-	if err != nil {
-		t.Fatalf("failed to deserialize private key: %v", err)
-	}
-	privKey := packet.(*PrivateKey)
-
-	err = sig.SignUserId("", pubKey, privKey, nil)
-	if err == nil {
-		t.Errorf("did not receive an error when expected")
-	}
-
-	sig.Hash = crypto.SHA256
-	err = privKey.Decrypt([]byte("testing"))
-	if err != nil {
-		t.Fatalf("failed to decrypt private key: %v", err)
-	}
-
-	err = sig.SignUserId("", pubKey, privKey, nil)
-	if err != nil {
-		t.Errorf("failed to sign user id: %v", err)
-	}
-}
-
-const signatureDataHex = "c2c05c04000102000605024cb45112000a0910ab105c91af38fb158f8d07ff5596ea368c5efe015bed6e78348c0f033c931d5f2ce5db54ce7f2a7e4b4ad64db758d65a7a71773edeab7ba2a9e0908e6a94a1175edd86c1d843279f045b021a6971a72702fcbd650efc393c5474d5b59a15f96d2eaad4c4c426797e0dcca2803ef41c6ff234d403eec38f31d610c344c06f2401c262f0993b2e66cad8a81ebc4322c723e0d4ba09fe917e8777658307ad8329adacba821420741009dfe87f007759f0982275d028a392c6ed983a0d846f890b36148c7358bdb8a516007fac760261ecd06076813831a36d0459075d1befa245ae7f7fb103d92ca759e9498fe60ef8078a39a3beda510deea251ea9f0a7f0df6ef42060f20780360686f3e400e"
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go
deleted file mode 100644
index 6edff88934..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// SignatureV3 represents older version 3 signatures. These signatures are less secure
-// than version 4 and should not be used to create new signatures. They are included
-// here for backwards compatibility to read and validate with older key material.
-// See RFC 4880, section 5.2.2.
-type SignatureV3 struct {
-	SigType      SignatureType
-	CreationTime time.Time
-	IssuerKeyId  uint64
-	PubKeyAlgo   PublicKeyAlgorithm
-	Hash         crypto.Hash
-	HashTag      [2]byte
-
-	RSASignature     parsedMPI
-	DSASigR, DSASigS parsedMPI
-}
-
-func (sig *SignatureV3) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.2.2
-	var buf [8]byte
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	if buf[0] < 2 || buf[0] > 3 {
-		err = errors.UnsupportedError("signature packet version " + strconv.Itoa(int(buf[0])))
-		return
-	}
-	if _, err = readFull(r, buf[:1]); err != nil {
-		return
-	}
-	if buf[0] != 5 {
-		err = errors.UnsupportedError(
-			"invalid hashed material length " + strconv.Itoa(int(buf[0])))
-		return
-	}
-
-	// Read hashed material: signature type + creation time
-	if _, err = readFull(r, buf[:5]); err != nil {
-		return
-	}
-	sig.SigType = SignatureType(buf[0])
-	t := binary.BigEndian.Uint32(buf[1:5])
-	sig.CreationTime = time.Unix(int64(t), 0)
-
-	// Eight-octet Key ID of signer.
-	if _, err = readFull(r, buf[:8]); err != nil {
-		return
-	}
-	sig.IssuerKeyId = binary.BigEndian.Uint64(buf[:])
-
-	// Public-key and hash algorithm
-	if _, err = readFull(r, buf[:2]); err != nil {
-		return
-	}
-	sig.PubKeyAlgo = PublicKeyAlgorithm(buf[0])
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly, PubKeyAlgoDSA:
-	default:
-		err = errors.UnsupportedError("public key algorithm " + strconv.Itoa(int(sig.PubKeyAlgo)))
-		return
-	}
-	var ok bool
-	if sig.Hash, ok = s2k.HashIdToHash(buf[1]); !ok {
-		return errors.UnsupportedError("hash function " + strconv.Itoa(int(buf[2])))
-	}
-
-	// Two-octet field holding left 16 bits of signed hash value.
-	if _, err = readFull(r, sig.HashTag[:2]); err != nil {
-		return
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		sig.RSASignature.bytes, sig.RSASignature.bitLength, err = readMPI(r)
-	case PubKeyAlgoDSA:
-		if sig.DSASigR.bytes, sig.DSASigR.bitLength, err = readMPI(r); err != nil {
-			return
-		}
-		sig.DSASigS.bytes, sig.DSASigS.bitLength, err = readMPI(r)
-	default:
-		panic("unreachable")
-	}
-	return
-}
-
-// Serialize marshals sig to w. Sign, SignUserId or SignKey must have been
-// called first.
-func (sig *SignatureV3) Serialize(w io.Writer) (err error) {
-	buf := make([]byte, 8)
-
-	// Write the sig type and creation time
-	buf[0] = byte(sig.SigType)
-	binary.BigEndian.PutUint32(buf[1:5], uint32(sig.CreationTime.Unix()))
-	if _, err = w.Write(buf[:5]); err != nil {
-		return
-	}
-
-	// Write the issuer long key ID
-	binary.BigEndian.PutUint64(buf[:8], sig.IssuerKeyId)
-	if _, err = w.Write(buf[:8]); err != nil {
-		return
-	}
-
-	// Write public key algorithm, hash ID, and hash value
-	buf[0] = byte(sig.PubKeyAlgo)
-	hashId, ok := s2k.HashToHashId(sig.Hash)
-	if !ok {
-		return errors.UnsupportedError(fmt.Sprintf("hash function %v", sig.Hash))
-	}
-	buf[1] = hashId
-	copy(buf[2:4], sig.HashTag[:])
-	if _, err = w.Write(buf[:4]); err != nil {
-		return
-	}
-
-	if sig.RSASignature.bytes == nil && sig.DSASigR.bytes == nil {
-		return errors.InvalidArgumentError("Signature: need to call Sign, SignUserId or SignKey before Serialize")
-	}
-
-	switch sig.PubKeyAlgo {
-	case PubKeyAlgoRSA, PubKeyAlgoRSASignOnly:
-		err = writeMPIs(w, sig.RSASignature)
-	case PubKeyAlgoDSA:
-		err = writeMPIs(w, sig.DSASigR, sig.DSASigS)
-	default:
-		panic("impossible")
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3_test.go
deleted file mode 100644
index ad7b62ac19..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/signature_v3_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto"
-	"encoding/hex"
-	"io"
-	"io/ioutil"
-	"testing"
-
-	"golang.org/x/crypto/openpgp/armor"
-)
-
-func TestSignatureV3Read(t *testing.T) {
-	r := v3KeyReader(t)
-	Read(r)                // Skip public key
-	Read(r)                // Skip uid
-	packet, err := Read(r) // Signature
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	sig, ok := packet.(*SignatureV3)
-	if !ok || sig.SigType != SigTypeGenericCert || sig.PubKeyAlgo != PubKeyAlgoRSA || sig.Hash != crypto.MD5 {
-		t.Errorf("failed to parse, got: %#v", packet)
-	}
-}
-
-func TestSignatureV3Reserialize(t *testing.T) {
-	r := v3KeyReader(t)
-	Read(r) // Skip public key
-	Read(r) // Skip uid
-	packet, err := Read(r)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	sig := packet.(*SignatureV3)
-	out := new(bytes.Buffer)
-	if err = sig.Serialize(out); err != nil {
-		t.Errorf("error reserializing: %s", err)
-		return
-	}
-	expected, err := ioutil.ReadAll(v3KeyReader(t))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	expected = expected[4+141+4+39:] // See pgpdump offsets below, this is where the sig starts
-	if !bytes.Equal(expected, out.Bytes()) {
-		t.Errorf("output doesn't match input (got vs expected):\n%s\n%s", hex.Dump(out.Bytes()), hex.Dump(expected))
-	}
-}
-
-func v3KeyReader(t *testing.T) io.Reader {
-	armorBlock, err := armor.Decode(bytes.NewBufferString(keySigV3Armor))
-	if err != nil {
-		t.Fatalf("armor Decode failed: %v", err)
-	}
-	return armorBlock.Body
-}
-
-// keySigV3Armor is some V3 public key I found in an SKS dump.
-// Old: Public Key Packet(tag 6)(141 bytes)
-//      Ver 4 - new
-//      Public key creation time - Fri Sep 16 17:13:54 CDT 1994
-//      Pub alg - unknown(pub 0)
-//      Unknown public key(pub 0)
-// Old: User ID Packet(tag 13)(39 bytes)
-//      User ID - Armin M. Warda <warda@nephilim.ruhr.de>
-// Old: Signature Packet(tag 2)(149 bytes)
-//      Ver 4 - new
-//      Sig type - unknown(05)
-//      Pub alg - ElGamal Encrypt-Only(pub 16)
-//      Hash alg - unknown(hash 46)
-//      Hashed Sub: unknown(sub 81, critical)(1988 bytes)
-const keySigV3Armor = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: SKS 1.0.10
-
-mI0CLnoYogAAAQQA1qwA2SuJwfQ5bCQ6u5t20ulnOtY0gykf7YjiK4LiVeRBwHjGq7v30tGV
-5Qti7qqRW4Ww7CDCJc4sZMFnystucR2vLkXaSoNWoFm4Fg47NiisDdhDezHwbVPW6OpCFNSi
-ZAamtj4QAUBu8j4LswafrJqZqR9336/V3g8Yil2l48kABRG0J0FybWluIE0uIFdhcmRhIDx3
-YXJkYUBuZXBoaWxpbS5ydWhyLmRlPoiVAgUQLok2xwXR6zmeWEiZAQE/DgP/WgxPQh40/Po4
-gSkWZCDAjNdph7zexvAb0CcUWahcwiBIgg3U5ErCx9I5CNVA9U+s8bNrDZwgSIeBzp3KhWUx
-524uhGgm6ZUTOAIKA6CbV6pfqoLpJnRYvXYQU5mIWsNa99wcu2qu18OeEDnztb7aLA6Ra9OF
-YFCbq4EjXRoOrYM=
-=LPjs
------END PGP PUBLIC KEY BLOCK-----`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
deleted file mode 100644
index 744c2d2c42..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/cipher"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// This is the largest session key that we'll support. Since no 512-bit cipher
-// has even been seriously used, this is comfortably large.
-const maxSessionKeySizeInBytes = 64
-
-// SymmetricKeyEncrypted represents a passphrase protected session key. See RFC
-// 4880, section 5.3.
-type SymmetricKeyEncrypted struct {
-	CipherFunc   CipherFunction
-	s2k          func(out, in []byte)
-	encryptedKey []byte
-}
-
-const symmetricKeyEncryptedVersion = 4
-
-func (ske *SymmetricKeyEncrypted) parse(r io.Reader) error {
-	// RFC 4880, section 5.3.
-	var buf [2]byte
-	if _, err := readFull(r, buf[:]); err != nil {
-		return err
-	}
-	if buf[0] != symmetricKeyEncryptedVersion {
-		return errors.UnsupportedError("SymmetricKeyEncrypted version")
-	}
-	ske.CipherFunc = CipherFunction(buf[1])
-
-	if ske.CipherFunc.KeySize() == 0 {
-		return errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(buf[1])))
-	}
-
-	var err error
-	ske.s2k, err = s2k.Parse(r)
-	if err != nil {
-		return err
-	}
-
-	encryptedKey := make([]byte, maxSessionKeySizeInBytes)
-	// The session key may follow. We just have to try and read to find
-	// out. If it exists then we limit it to maxSessionKeySizeInBytes.
-	n, err := readFull(r, encryptedKey)
-	if err != nil && err != io.ErrUnexpectedEOF {
-		return err
-	}
-
-	if n != 0 {
-		if n == maxSessionKeySizeInBytes {
-			return errors.UnsupportedError("oversized encrypted session key")
-		}
-		ske.encryptedKey = encryptedKey[:n]
-	}
-
-	return nil
-}
-
-// Decrypt attempts to decrypt an encrypted session key and returns the key and
-// the cipher to use when decrypting a subsequent Symmetrically Encrypted Data
-// packet.
-func (ske *SymmetricKeyEncrypted) Decrypt(passphrase []byte) ([]byte, CipherFunction, error) {
-	key := make([]byte, ske.CipherFunc.KeySize())
-	ske.s2k(key, passphrase)
-
-	if len(ske.encryptedKey) == 0 {
-		return key, ske.CipherFunc, nil
-	}
-
-	// the IV is all zeros
-	iv := make([]byte, ske.CipherFunc.blockSize())
-	c := cipher.NewCFBDecrypter(ske.CipherFunc.new(key), iv)
-	plaintextKey := make([]byte, len(ske.encryptedKey))
-	c.XORKeyStream(plaintextKey, ske.encryptedKey)
-	cipherFunc := CipherFunction(plaintextKey[0])
-	if cipherFunc.blockSize() == 0 {
-		return nil, ske.CipherFunc, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(cipherFunc)))
-	}
-	plaintextKey = plaintextKey[1:]
-	if l, cipherKeySize := len(plaintextKey), cipherFunc.KeySize(); l != cipherFunc.KeySize() {
-		return nil, cipherFunc, errors.StructuralError("length of decrypted key (" + strconv.Itoa(l) + ") " +
-			"not equal to cipher keysize (" + strconv.Itoa(cipherKeySize) + ")")
-	}
-	return plaintextKey, cipherFunc, nil
-}
-
-// SerializeSymmetricKeyEncrypted serializes a symmetric key packet to w. The
-// packet contains a random session key, encrypted by a key derived from the
-// given passphrase. The session key is returned and must be passed to
-// SerializeSymmetricallyEncrypted.
-// If config is nil, sensible defaults will be used.
-func SerializeSymmetricKeyEncrypted(w io.Writer, passphrase []byte, config *Config) (key []byte, err error) {
-	cipherFunc := config.Cipher()
-	keySize := cipherFunc.KeySize()
-	if keySize == 0 {
-		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(cipherFunc)))
-	}
-
-	s2kBuf := new(bytes.Buffer)
-	keyEncryptingKey := make([]byte, keySize)
-	// s2k.Serialize salts and stretches the passphrase, and writes the
-	// resulting key to keyEncryptingKey and the s2k descriptor to s2kBuf.
-	err = s2k.Serialize(s2kBuf, keyEncryptingKey, config.Random(), passphrase, &s2k.Config{Hash: config.Hash(), S2KCount: config.PasswordHashIterations()})
-	if err != nil {
-		return
-	}
-	s2kBytes := s2kBuf.Bytes()
-
-	packetLength := 2 /* header */ + len(s2kBytes) + 1 /* cipher type */ + keySize
-	err = serializeHeader(w, packetTypeSymmetricKeyEncrypted, packetLength)
-	if err != nil {
-		return
-	}
-
-	var buf [2]byte
-	buf[0] = symmetricKeyEncryptedVersion
-	buf[1] = byte(cipherFunc)
-	_, err = w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	_, err = w.Write(s2kBytes)
-	if err != nil {
-		return
-	}
-
-	sessionKey := make([]byte, keySize)
-	_, err = io.ReadFull(config.Random(), sessionKey)
-	if err != nil {
-		return
-	}
-	iv := make([]byte, cipherFunc.blockSize())
-	c := cipher.NewCFBEncrypter(cipherFunc.new(keyEncryptingKey), iv)
-	encryptedCipherAndKey := make([]byte, keySize+1)
-	c.XORKeyStream(encryptedCipherAndKey, buf[1:])
-	c.XORKeyStream(encryptedCipherAndKey[1:], sessionKey)
-	_, err = w.Write(encryptedCipherAndKey)
-	if err != nil {
-		return
-	}
-
-	key = sessionKey
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted_test.go
deleted file mode 100644
index e1d52c122e..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetric_key_encrypted_test.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/hex"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestSymmetricKeyEncrypted(t *testing.T) {
-	buf := readerFromHex(symmetricallyEncryptedHex)
-	packet, err := Read(buf)
-	if err != nil {
-		t.Errorf("failed to read SymmetricKeyEncrypted: %s", err)
-		return
-	}
-	ske, ok := packet.(*SymmetricKeyEncrypted)
-	if !ok {
-		t.Error("didn't find SymmetricKeyEncrypted packet")
-		return
-	}
-	key, cipherFunc, err := ske.Decrypt([]byte("password"))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	packet, err = Read(buf)
-	if err != nil {
-		t.Errorf("failed to read SymmetricallyEncrypted: %s", err)
-		return
-	}
-	se, ok := packet.(*SymmetricallyEncrypted)
-	if !ok {
-		t.Error("didn't find SymmetricallyEncrypted packet")
-		return
-	}
-	r, err := se.Decrypt(cipherFunc, key)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	contents, err := ioutil.ReadAll(r)
-	if err != nil && err != io.EOF {
-		t.Error(err)
-		return
-	}
-
-	expectedContents, _ := hex.DecodeString(symmetricallyEncryptedContentsHex)
-	if !bytes.Equal(expectedContents, contents) {
-		t.Errorf("bad contents got:%x want:%x", contents, expectedContents)
-	}
-}
-
-const symmetricallyEncryptedHex = "8c0d04030302371a0b38d884f02060c91cf97c9973b8e58e028e9501708ccfe618fb92afef7fa2d80ddadd93cf"
-const symmetricallyEncryptedContentsHex = "cb1062004d14c4df636f6e74656e74732e0a"
-
-func TestSerializeSymmetricKeyEncryptedCiphers(t *testing.T) {
-	tests := [...]struct {
-		cipherFunc CipherFunction
-		name       string
-	}{
-		{Cipher3DES, "Cipher3DES"},
-		{CipherCAST5, "CipherCAST5"},
-		{CipherAES128, "CipherAES128"},
-		{CipherAES192, "CipherAES192"},
-		{CipherAES256, "CipherAES256"},
-	}
-
-	for _, test := range tests {
-		var buf bytes.Buffer
-		passphrase := []byte("testing")
-		config := &Config{
-			DefaultCipher: test.cipherFunc,
-		}
-
-		key, err := SerializeSymmetricKeyEncrypted(&buf, passphrase, config)
-		if err != nil {
-			t.Errorf("cipher(%s) failed to serialize: %s", test.name, err)
-			continue
-		}
-
-		p, err := Read(&buf)
-		if err != nil {
-			t.Errorf("cipher(%s) failed to reparse: %s", test.name, err)
-			continue
-		}
-
-		ske, ok := p.(*SymmetricKeyEncrypted)
-		if !ok {
-			t.Errorf("cipher(%s) parsed a different packet type: %#v", test.name, p)
-			continue
-		}
-
-		if ske.CipherFunc != config.DefaultCipher {
-			t.Errorf("cipher(%s) SKE cipher function is %d (expected %d)", test.name, ske.CipherFunc, config.DefaultCipher)
-		}
-		parsedKey, parsedCipherFunc, err := ske.Decrypt(passphrase)
-		if err != nil {
-			t.Errorf("cipher(%s) failed to decrypt reparsed SKE: %s", test.name, err)
-			continue
-		}
-		if !bytes.Equal(key, parsedKey) {
-			t.Errorf("cipher(%s) keys don't match after Decrypt: %x (original) vs %x (parsed)", test.name, key, parsedKey)
-		}
-		if parsedCipherFunc != test.cipherFunc {
-			t.Errorf("cipher(%s) cipher function doesn't match after Decrypt: %d (original) vs %d (parsed)",
-				test.name, test.cipherFunc, parsedCipherFunc)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
deleted file mode 100644
index 6126030eb9..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"crypto/cipher"
-	"crypto/sha1"
-	"crypto/subtle"
-	"golang.org/x/crypto/openpgp/errors"
-	"hash"
-	"io"
-	"strconv"
-)
-
-// SymmetricallyEncrypted represents a symmetrically encrypted byte string. The
-// encrypted contents will consist of more OpenPGP packets. See RFC 4880,
-// sections 5.7 and 5.13.
-type SymmetricallyEncrypted struct {
-	MDC      bool // true iff this is a type 18 packet and thus has an embedded MAC.
-	contents io.Reader
-	prefix   []byte
-}
-
-const symmetricallyEncryptedVersion = 1
-
-func (se *SymmetricallyEncrypted) parse(r io.Reader) error {
-	if se.MDC {
-		// See RFC 4880, section 5.13.
-		var buf [1]byte
-		_, err := readFull(r, buf[:])
-		if err != nil {
-			return err
-		}
-		if buf[0] != symmetricallyEncryptedVersion {
-			return errors.UnsupportedError("unknown SymmetricallyEncrypted version")
-		}
-	}
-	se.contents = r
-	return nil
-}
-
-// Decrypt returns a ReadCloser, from which the decrypted contents of the
-// packet can be read. An incorrect key can, with high probability, be detected
-// immediately and this will result in a KeyIncorrect error being returned.
-func (se *SymmetricallyEncrypted) Decrypt(c CipherFunction, key []byte) (io.ReadCloser, error) {
-	keySize := c.KeySize()
-	if keySize == 0 {
-		return nil, errors.UnsupportedError("unknown cipher: " + strconv.Itoa(int(c)))
-	}
-	if len(key) != keySize {
-		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted: incorrect key length")
-	}
-
-	if se.prefix == nil {
-		se.prefix = make([]byte, c.blockSize()+2)
-		_, err := readFull(se.contents, se.prefix)
-		if err != nil {
-			return nil, err
-		}
-	} else if len(se.prefix) != c.blockSize()+2 {
-		return nil, errors.InvalidArgumentError("can't try ciphers with different block lengths")
-	}
-
-	ocfbResync := OCFBResync
-	if se.MDC {
-		// MDC packets use a different form of OCFB mode.
-		ocfbResync = OCFBNoResync
-	}
-
-	s := NewOCFBDecrypter(c.new(key), se.prefix, ocfbResync)
-	if s == nil {
-		return nil, errors.ErrKeyIncorrect
-	}
-
-	plaintext := cipher.StreamReader{S: s, R: se.contents}
-
-	if se.MDC {
-		// MDC packets have an embedded hash that we need to check.
-		h := sha1.New()
-		h.Write(se.prefix)
-		return &seMDCReader{in: plaintext, h: h}, nil
-	}
-
-	// Otherwise, we just need to wrap plaintext so that it's a valid ReadCloser.
-	return seReader{plaintext}, nil
-}
-
-// seReader wraps an io.Reader with a no-op Close method.
-type seReader struct {
-	in io.Reader
-}
-
-func (ser seReader) Read(buf []byte) (int, error) {
-	return ser.in.Read(buf)
-}
-
-func (ser seReader) Close() error {
-	return nil
-}
-
-const mdcTrailerSize = 1 /* tag byte */ + 1 /* length byte */ + sha1.Size
-
-// An seMDCReader wraps an io.Reader, maintains a running hash and keeps hold
-// of the most recent 22 bytes (mdcTrailerSize). Upon EOF, those bytes form an
-// MDC packet containing a hash of the previous contents which is checked
-// against the running hash. See RFC 4880, section 5.13.
-type seMDCReader struct {
-	in          io.Reader
-	h           hash.Hash
-	trailer     [mdcTrailerSize]byte
-	scratch     [mdcTrailerSize]byte
-	trailerUsed int
-	error       bool
-	eof         bool
-}
-
-func (ser *seMDCReader) Read(buf []byte) (n int, err error) {
-	if ser.error {
-		err = io.ErrUnexpectedEOF
-		return
-	}
-	if ser.eof {
-		err = io.EOF
-		return
-	}
-
-	// If we haven't yet filled the trailer buffer then we must do that
-	// first.
-	for ser.trailerUsed < mdcTrailerSize {
-		n, err = ser.in.Read(ser.trailer[ser.trailerUsed:])
-		ser.trailerUsed += n
-		if err == io.EOF {
-			if ser.trailerUsed != mdcTrailerSize {
-				n = 0
-				err = io.ErrUnexpectedEOF
-				ser.error = true
-				return
-			}
-			ser.eof = true
-			n = 0
-			return
-		}
-
-		if err != nil {
-			n = 0
-			return
-		}
-	}
-
-	// If it's a short read then we read into a temporary buffer and shift
-	// the data into the caller's buffer.
-	if len(buf) <= mdcTrailerSize {
-		n, err = readFull(ser.in, ser.scratch[:len(buf)])
-		copy(buf, ser.trailer[:n])
-		ser.h.Write(buf[:n])
-		copy(ser.trailer[:], ser.trailer[n:])
-		copy(ser.trailer[mdcTrailerSize-n:], ser.scratch[:])
-		if n < len(buf) {
-			ser.eof = true
-			err = io.EOF
-		}
-		return
-	}
-
-	n, err = ser.in.Read(buf[mdcTrailerSize:])
-	copy(buf, ser.trailer[:])
-	ser.h.Write(buf[:n])
-	copy(ser.trailer[:], buf[n:])
-
-	if err == io.EOF {
-		ser.eof = true
-	}
-	return
-}
-
-// This is a new-format packet tag byte for a type 19 (MDC) packet.
-const mdcPacketTagByte = byte(0x80) | 0x40 | 19
-
-func (ser *seMDCReader) Close() error {
-	if ser.error {
-		return errors.SignatureError("error during reading")
-	}
-
-	for !ser.eof {
-		// We haven't seen EOF so we need to read to the end
-		var buf [1024]byte
-		_, err := ser.Read(buf[:])
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return errors.SignatureError("error during reading")
-		}
-	}
-
-	if ser.trailer[0] != mdcPacketTagByte || ser.trailer[1] != sha1.Size {
-		return errors.SignatureError("MDC packet not found")
-	}
-	ser.h.Write(ser.trailer[:2])
-
-	final := ser.h.Sum(nil)
-	if subtle.ConstantTimeCompare(final, ser.trailer[2:]) != 1 {
-		return errors.SignatureError("hash mismatch")
-	}
-	return nil
-}
-
-// An seMDCWriter writes through to an io.WriteCloser while maintains a running
-// hash of the data written. On close, it emits an MDC packet containing the
-// running hash.
-type seMDCWriter struct {
-	w io.WriteCloser
-	h hash.Hash
-}
-
-func (w *seMDCWriter) Write(buf []byte) (n int, err error) {
-	w.h.Write(buf)
-	return w.w.Write(buf)
-}
-
-func (w *seMDCWriter) Close() (err error) {
-	var buf [mdcTrailerSize]byte
-
-	buf[0] = mdcPacketTagByte
-	buf[1] = sha1.Size
-	w.h.Write(buf[:2])
-	digest := w.h.Sum(nil)
-	copy(buf[2:], digest)
-
-	_, err = w.w.Write(buf[:])
-	if err != nil {
-		return
-	}
-	return w.w.Close()
-}
-
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
-type noOpCloser struct {
-	w io.Writer
-}
-
-func (c noOpCloser) Write(data []byte) (n int, err error) {
-	return c.w.Write(data)
-}
-
-func (c noOpCloser) Close() error {
-	return nil
-}
-
-// SerializeSymmetricallyEncrypted serializes a symmetrically encrypted packet
-// to w and returns a WriteCloser to which the to-be-encrypted packets can be
-// written.
-// If config is nil, sensible defaults will be used.
-func SerializeSymmetricallyEncrypted(w io.Writer, c CipherFunction, key []byte, config *Config) (contents io.WriteCloser, err error) {
-	if c.KeySize() != len(key) {
-		return nil, errors.InvalidArgumentError("SymmetricallyEncrypted.Serialize: bad key length")
-	}
-	writeCloser := noOpCloser{w}
-	ciphertext, err := serializeStreamHeader(writeCloser, packetTypeSymmetricallyEncryptedMDC)
-	if err != nil {
-		return
-	}
-
-	_, err = ciphertext.Write([]byte{symmetricallyEncryptedVersion})
-	if err != nil {
-		return
-	}
-
-	block := c.new(key)
-	blockSize := block.BlockSize()
-	iv := make([]byte, blockSize)
-	_, err = config.Random().Read(iv)
-	if err != nil {
-		return
-	}
-	s, prefix := NewOCFBEncrypter(block, iv, OCFBNoResync)
-	_, err = ciphertext.Write(prefix)
-	if err != nil {
-		return
-	}
-	plaintext := cipher.StreamWriter{S: s, W: ciphertext}
-
-	h := sha1.New()
-	h.Write(iv)
-	h.Write(iv[blockSize-2:])
-	contents = &seMDCWriter{w: plaintext, h: h}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go
deleted file mode 100644
index c5c00f7b9c..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/symmetrically_encrypted_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"crypto/sha1"
-	"encoding/hex"
-	"golang.org/x/crypto/openpgp/errors"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-// TestReader wraps a []byte and returns reads of a specific length.
-type testReader struct {
-	data   []byte
-	stride int
-}
-
-func (t *testReader) Read(buf []byte) (n int, err error) {
-	n = t.stride
-	if n > len(t.data) {
-		n = len(t.data)
-	}
-	if n > len(buf) {
-		n = len(buf)
-	}
-	copy(buf, t.data)
-	t.data = t.data[n:]
-	if len(t.data) == 0 {
-		err = io.EOF
-	}
-	return
-}
-
-func testMDCReader(t *testing.T) {
-	mdcPlaintext, _ := hex.DecodeString(mdcPlaintextHex)
-
-	for stride := 1; stride < len(mdcPlaintext)/2; stride++ {
-		r := &testReader{data: mdcPlaintext, stride: stride}
-		mdcReader := &seMDCReader{in: r, h: sha1.New()}
-		body, err := ioutil.ReadAll(mdcReader)
-		if err != nil {
-			t.Errorf("stride: %d, error: %s", stride, err)
-			continue
-		}
-		if !bytes.Equal(body, mdcPlaintext[:len(mdcPlaintext)-22]) {
-			t.Errorf("stride: %d: bad contents %x", stride, body)
-			continue
-		}
-
-		err = mdcReader.Close()
-		if err != nil {
-			t.Errorf("stride: %d, error on Close: %s", stride, err)
-		}
-	}
-
-	mdcPlaintext[15] ^= 80
-
-	r := &testReader{data: mdcPlaintext, stride: 2}
-	mdcReader := &seMDCReader{in: r, h: sha1.New()}
-	_, err := ioutil.ReadAll(mdcReader)
-	if err != nil {
-		t.Errorf("corruption test, error: %s", err)
-		return
-	}
-	err = mdcReader.Close()
-	if err == nil {
-		t.Error("corruption: no error")
-	} else if _, ok := err.(*errors.SignatureError); !ok {
-		t.Errorf("corruption: expected SignatureError, got: %s", err)
-	}
-}
-
-const mdcPlaintextHex = "a302789c3b2d93c4e0eb9aba22283539b3203335af44a134afb800c849cb4c4de10200aff40b45d31432c80cb384299a0655966d6939dfdeed1dddf980"
-
-func TestSerialize(t *testing.T) {
-	buf := bytes.NewBuffer(nil)
-	c := CipherAES128
-	key := make([]byte, c.KeySize())
-
-	w, err := SerializeSymmetricallyEncrypted(buf, c, key, nil)
-	if err != nil {
-		t.Errorf("error from SerializeSymmetricallyEncrypted: %s", err)
-		return
-	}
-
-	contents := []byte("hello world\n")
-
-	w.Write(contents)
-	w.Close()
-
-	p, err := Read(buf)
-	if err != nil {
-		t.Errorf("error from Read: %s", err)
-		return
-	}
-
-	se, ok := p.(*SymmetricallyEncrypted)
-	if !ok {
-		t.Errorf("didn't read a *SymmetricallyEncrypted")
-		return
-	}
-
-	r, err := se.Decrypt(c, key)
-	if err != nil {
-		t.Errorf("error from Decrypt: %s", err)
-		return
-	}
-
-	contentsCopy := bytes.NewBuffer(nil)
-	_, err = io.Copy(contentsCopy, r)
-	if err != nil {
-		t.Errorf("error from io.Copy: %s", err)
-		return
-	}
-	if !bytes.Equal(contentsCopy.Bytes(), contents) {
-		t.Errorf("contents not equal got: %x want: %x", contentsCopy.Bytes(), contents)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go
deleted file mode 100644
index 96a2b382a1..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"image"
-	"image/jpeg"
-	"io"
-	"io/ioutil"
-)
-
-const UserAttrImageSubpacket = 1
-
-// UserAttribute is capable of storing other types of data about a user
-// beyond name, email and a text comment. In practice, user attributes are typically used
-// to store a signed thumbnail photo JPEG image of the user.
-// See RFC 4880, section 5.12.
-type UserAttribute struct {
-	Contents []*OpaqueSubpacket
-}
-
-// NewUserAttributePhoto creates a user attribute packet
-// containing the given images.
-func NewUserAttributePhoto(photos ...image.Image) (uat *UserAttribute, err error) {
-	uat = new(UserAttribute)
-	for _, photo := range photos {
-		var buf bytes.Buffer
-		// RFC 4880, Section 5.12.1.
-		data := []byte{
-			0x10, 0x00, // Little-endian image header length (16 bytes)
-			0x01,       // Image header version 1
-			0x01,       // JPEG
-			0, 0, 0, 0, // 12 reserved octets, must be all zero.
-			0, 0, 0, 0,
-			0, 0, 0, 0}
-		if _, err = buf.Write(data); err != nil {
-			return
-		}
-		if err = jpeg.Encode(&buf, photo, nil); err != nil {
-			return
-		}
-		uat.Contents = append(uat.Contents, &OpaqueSubpacket{
-			SubType:  UserAttrImageSubpacket,
-			Contents: buf.Bytes()})
-	}
-	return
-}
-
-// NewUserAttribute creates a new user attribute packet containing the given subpackets.
-func NewUserAttribute(contents ...*OpaqueSubpacket) *UserAttribute {
-	return &UserAttribute{Contents: contents}
-}
-
-func (uat *UserAttribute) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.13
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-	uat.Contents, err = OpaqueSubpackets(b)
-	return
-}
-
-// Serialize marshals the user attribute to w in the form of an OpenPGP packet, including
-// header.
-func (uat *UserAttribute) Serialize(w io.Writer) (err error) {
-	var buf bytes.Buffer
-	for _, sp := range uat.Contents {
-		sp.Serialize(&buf)
-	}
-	if err = serializeHeader(w, packetTypeUserAttribute, buf.Len()); err != nil {
-		return err
-	}
-	_, err = w.Write(buf.Bytes())
-	return
-}
-
-// ImageData returns zero or more byte slices, each containing
-// JPEG File Interchange Format (JFIF), for each photo in the
-// the user attribute packet.
-func (uat *UserAttribute) ImageData() (imageData [][]byte) {
-	for _, sp := range uat.Contents {
-		if sp.SubType == UserAttrImageSubpacket && len(sp.Contents) > 16 {
-			imageData = append(imageData, sp.Contents[16:])
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute_test.go
deleted file mode 100644
index 13ca5143ce..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/userattribute_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"bytes"
-	"encoding/base64"
-	"image/color"
-	"image/jpeg"
-	"testing"
-)
-
-func TestParseUserAttribute(t *testing.T) {
-	r := base64.NewDecoder(base64.StdEncoding, bytes.NewBufferString(userAttributePacket))
-	for i := 0; i < 2; i++ {
-		p, err := Read(r)
-		if err != nil {
-			t.Fatal(err)
-		}
-		uat := p.(*UserAttribute)
-		imgs := uat.ImageData()
-		if len(imgs) != 1 {
-			t.Errorf("Unexpected number of images in user attribute packet: %d", len(imgs))
-		}
-		if len(imgs[0]) != 3395 {
-			t.Errorf("Unexpected JPEG image size: %d", len(imgs[0]))
-		}
-		img, err := jpeg.Decode(bytes.NewBuffer(imgs[0]))
-		if err != nil {
-			t.Errorf("Error decoding JPEG image: %v", err)
-		}
-		// A pixel in my right eye.
-		pixel := color.NRGBAModel.Convert(img.At(56, 36))
-		ref := color.NRGBA{R: 157, G: 128, B: 124, A: 255}
-		if pixel != ref {
-			t.Errorf("Unexpected pixel color: %v", pixel)
-		}
-		w := bytes.NewBuffer(nil)
-		err = uat.Serialize(w)
-		if err != nil {
-			t.Errorf("Error writing user attribute: %v", err)
-		}
-		r = bytes.NewBuffer(w.Bytes())
-	}
-}
-
-const userAttributePacket = `
-0cyWzJQBEAABAQAAAAAAAAAAAAAAAP/Y/+AAEEpGSUYAAQIAAAEAAQAA/9sAQwAFAwQEBAMFBAQE
-BQUFBgcMCAcHBwcPCgsJDBEPEhIRDxEQExYcFxMUGhUQERghGBocHR8fHxMXIiQiHiQcHh8e/9sA
-QwEFBQUHBgcOCAgOHhQRFB4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4e
-Hh4eHh4eHh4e/8AAEQgAZABkAwEiAAIRAQMRAf/EAB8AAAEFAQEBAQEBAAAAAAAAAAABAgMEBQYH
-CAkKC//EALUQAAIBAwMCBAMFBQQEAAABfQECAwAEEQUSITFBBhNRYQcicRQygZGhCCNCscEVUtHw
-JDNicoIJChYXGBkaJSYnKCkqNDU2Nzg5OkNERUZHSElKU1RVVldYWVpjZGVmZ2hpanN0dXZ3eHl6
-g4SFhoeIiYqSk5SVlpeYmZqio6Slpqeoqaqys7S1tre4ubrCw8TFxsfIycrS09TV1tfY2drh4uPk
-5ebn6Onq8fLz9PX29/j5+v/EAB8BAAMBAQEBAQEBAQEAAAAAAAABAgMEBQYHCAkKC//EALURAAIB
-AgQEAwQHBQQEAAECdwABAgMRBAUhMQYSQVEHYXETIjKBCBRCkaGxwQkjM1LwFWJy0QoWJDThJfEX
-GBkaJicoKSo1Njc4OTpDREVGR0hJSlNUVVZXWFlaY2RlZmdoaWpzdHV2d3h5eoKDhIWGh4iJipKT
-lJWWl5iZmqKjpKWmp6ipqrKztLW2t7i5usLDxMXGx8jJytLT1NXW19jZ2uLj5OXm5+jp6vLz9PX2
-9/j5+v/aAAwDAQACEQMRAD8A5uGP06VehQ4pIox04q5EnHSvAep+hIIl4zVuMHGPWmRrUWtalaaN
-pU2oXsgSGJSxPr6ClvoitErs0Itqjc7BQOpPAFYmrfEnwjojtHNqaXEynBjtx5hH4jj9a8B8d+Od
-W8UXZjWR4LJT+7t0Jwfc+prnIdO1CWZEW2mZ3HyDactXXDB3V5s8evm1namj6r0H4weCLtxG+ova
-ueP30RA/MV6not1bX0Ed1ZzxzwyDKvGwZSPqK+Ff+ES8R8t/ZV2oHUmM10Hgbxp4m8BatEfNnWBH
-/eWshOxx9Kmpg4te49RUM1kn+8Wh9zQ4P1FaMC7l465rjPh14y0fxnoseoaXOpfaPOgJ+eI98j09
-67W19M15bi4uzPSqTU480WXkjZkAyAR61DPE6OCSOalWRRgZxjvTb598sfU4FBwx5uY4T4feIm8P
-TeJbAgc65NIM+8cX+FFeLfF3Vr3SfiNrMFrMypJMJcDPUqP8KK+kpVFyLU+ar037SXqX4hxVpMY7
-1UhPpVlT2rybKx9smWYz3NeH/EDVLzxt40j8O6bITaQybPlbKkjq39K9O8fasdH8IahfKxWQRFIy
-Ou9uB/OuE/Z/0y3j1d9TuyoZCMs5xjuea1pLli5nn46q240l13PcfhN8EvDNtpcEl/CklyVBLuMk
-mvU/Dfwo0BL/AO13FjEDD/qyV7Vn+CvGPg8zRpJrVm8ikLtEg6+1ew2dxZ3EQaJgysuQPasH7eXW
-1zzsbVhT92kk/PsYieEND+zlPs6c/wCyAPyryH4wfCPRtW0u6j+xRLOxLxSoADkDpXY+MPjJ4c0S
-9k082d3O8ZKkxw5XI96ytK+IGk+IpFjRpod+Qq3C7QT6A1E6NenaXbqRg6rlLlqS0fRnxjpd1r/w
-w8afa7GWRPKbZLGeBKmeVNfZngLxNaeKfDdprVjxHcLlkJ5Vh1H5185/tDad9h8XOsqAw3Cb0cjq
-CfX61P8AsveKf7L8T3fhe5nxa3g324YniQdh9R/KuivTdSmp9TXB1/Z1nRlsfU249QBx1pWfcwI7
-Cq6u2Ovamb9rYz16V5x7Psz5q/aJhZfibcupIElvE3H+7j+lFbXx9szP45jlUfeso8/99OKK9elL
-3EeNVopzZVharCtxVRGGMk02S5JyFOB69zWTieypnL/GksfB+0cr9oQt69awPhPpD69Y3Ky3DWth
-CWluGU4LAdq3vibGs/g68BJygVxjrwRW5+ztoRv/AAs8EeCZnO/J/hzz/Kumi4wp3kePjlOdZKPY
-ml8Mvo6WM9ppi7J0EkQYMzkb1X0wW+bJHGACa+ivg14huZPCkjXUO6SImIYOQAP6UQ2sGneHmiWF
-CYoSAAuM8etXfhBpMr+EZ3SSNRcMx6ZxWdes6ytBGSwkMNFuo7pnP614Ut9Zn1C4uLySKcwObGFA
-Qnm4+XcR71h+CfDHiKCQWuv2YWFtw+bBZQD8rcE8n2Ney+GbGGQSM6I7xvtI681rXdp8hKRRp6t3
-FYPE1VDlsY1nQjWdl+J8w/tOeDZZ/AMd/EGefTHyxxyYjwfyODXg3waRh8UtEcFh+8Jb8FNfZPxh
-Ak8J6nbPIsiyW7LnseK+Ofh99ptPHFnf2lu0y2twGcKuSEPB/Q1WHk50miq1o14TXU+xop+On61H
-NMC6Nis1LgsAcUTSt1APFcXJZn0EqmhyvxA037friTYziBV6f7Tf40Vr3k4aXLx5OMZIzRXZB2ik
-efJXbPHJJcnaD9aN2R1qoGO8/WkuLlIV+YjdjpXSonQ5lTxfiTwzqCnkeQxx9BWx+zPrQsrBFYja
-zEfrXL6lfie3khcjY6lSPUGud+G3iA6FrY0uQ/KJsA9gCa0jSvFpnBi6tpKSPu++nsIfDFxeXciR
-qIicscY4rxTwB8RUkn1axsPEf2LTYx85kTGzqCUP8VcJ47+JOs+I0Hhq1njjt/ufIeSvq1VtE+Gs
-eoaUbSHUrkHdu3WtuX5Ix81XRh7OL5jirVpV5Whdn0F8C/iX4auVn0i612T7bASoe8wjTAd89K9g
-vtSt5NMa4t5lkRhgOh3Dn6V8aaz8KZrIR3OlQ6r56LySmSxxz06Vo/CHx34h0rxBP4XvJ5AjK2RP
-nEbAEj6ZxjPrWM6fMmoswqJxqJ1VZnqHxn1NLPwveqWHmNC2BnnNcD8DfDkGi+CH1m+ijN1qMzNA
-4GSIiAMf+hVxPxU8Tapc3c0F9MGCn5GU5BX0Pau3+HmrT3XgXSIJCBHDGdgAx1NYSpezha52Yauq
-1dya2Wh2onAIwTj1p0lxxWWLkhRyCKWa5O3ORXOos9KVQluZm83j0oqi84JyWH50Vdmc7ep43d3I
-t1Z2Iz2FYdxeSTsxyRnvTdVuDNcNluM9KrKcg817NOnZGNbEXdkNckjrXGeIIprPxFFdRHAlIwem
-COtdmxrG8Q2cd/ZNExw45RvQ1bVjim+dWNzw7eaTD4mN3dndCQCo6hmI5zXpj/Ea/wBHjkh0kwRW
-xXEfl4yTxXzXZalJDL9nuWKMmRnHcV2Hh3WreCyYXW2SWQhd5P3F6n+lS43d2cTm6d7Ox9EWPxH1
-ODQxPqWpCaSU/ukUc4z3/WvKW8UhviAdaMewYZG98gj9c1ymoa8LyWOJHwkTDaVPb0qpr+q2m6Nb
-cfvNo349az9mou9iZVXNWbub3jm98/Vza2ReV7lsJg/e3dsV654UR9N0K0sZP9ZDGFbHr3rzL4P+
-H7rXfEEWr3I3W1qf3IYdW9fwqDxf4k8UeH/G95p08kscHmk25dPlZT0we9YTj7SXKjpw1aNG8mj3
-FLv5ccU959ycnmvKPDnxB82YQarGsZPAlTp+IrvIr1ZIgySKwIyCOhFYTpyg9T0qWIhVV4svzPvf
-IdhgY4orPachj81FRdmtzxqdiZmJ9aQEgdqZcPtmbJ71DJcAZ5r20kkeXJtsfPIQDwPzrG1a+S3i
-LyHAHvmp7y7HOD1rlNdm+1T7Acovf3o+J2RMpezjzMvrob67pX9o2ShZlYgg/wAWKxZLLWLZ/Ke3
-mVh14yK9M+BMC3dre2ko3LHKCB7EV7EngeGQJdQ7HyBkMKS0djgq1W3c+XtK03U522RwzsTwNiEk
-ntXoHgf4calql9El/G8UZbLfLyfr7V9FeGvh+s+0Lbxxcglu2K1NW1nwN4Gk/wBLuI57tV5jjwzE
-/QVNS+0dWYRqNvXRFv4eeCodKsY1ggVIY1G3K4z714h+1Jqul3GpwaXYeXJLbzgyyrg4b+6D+HNb
-vjz436zq9m+naHF/ZdkeGfOZXH17V4Vqt2b29K+ZuOc5bnce5zWdPBShL2lTfojSeJhy+zp/NjVz
-1Bwa6DSfFGq6fbJFDKrov8DjPFcu97ZxsUe4jVhwVJ5Bpp1mwQiLewJPXacVq6fNpYyjOUXdHoKf
-EG8VQHsInbuVcgflRXnt5fIs2FYHgcgUVi8LG+xusdW/mN7U2KgEVkTzPt60UVfQ9eHxGHrV1MGi
-iD4V25x1qvdgLAMd6KK0pbHm4x++dp8FtUubLxJ5EIjMc+A4Za+qfD8pe1JZVOBmiinW3RyRPMfi
-R8QPE638+k2l6LK0Hylbddhb6nOa80mlkcmWR2kcnlnOSaKK7qCXKcNdu5narcSrAoBxvODWJIga
-VckjDdqKKwq/EaQ0gUdbjQ6mr7QGBUcd6tPBC6gtGpOOuKKKie5qn7qIpEXd0HSiiimSf//Z`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/userid.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/userid.go
deleted file mode 100644
index d6bea7d4ac..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/userid.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"io"
-	"io/ioutil"
-	"strings"
-)
-
-// UserId contains text that is intended to represent the name and email
-// address of the key holder. See RFC 4880, section 5.11. By convention, this
-// takes the form "Full Name (Comment) <email@example.com>"
-type UserId struct {
-	Id string // By convention, this takes the form "Full Name (Comment) <email@example.com>" which is split out in the fields below.
-
-	Name, Comment, Email string
-}
-
-func hasInvalidCharacters(s string) bool {
-	for _, c := range s {
-		switch c {
-		case '(', ')', '<', '>', 0:
-			return true
-		}
-	}
-	return false
-}
-
-// NewUserId returns a UserId or nil if any of the arguments contain invalid
-// characters. The invalid characters are '\x00', '(', ')', '<' and '>'
-func NewUserId(name, comment, email string) *UserId {
-	// RFC 4880 doesn't deal with the structure of userid strings; the
-	// name, comment and email form is just a convention. However, there's
-	// no convention about escaping the metacharacters and GPG just refuses
-	// to create user ids where, say, the name contains a '('. We mirror
-	// this behaviour.
-
-	if hasInvalidCharacters(name) || hasInvalidCharacters(comment) || hasInvalidCharacters(email) {
-		return nil
-	}
-
-	uid := new(UserId)
-	uid.Name, uid.Comment, uid.Email = name, comment, email
-	uid.Id = name
-	if len(comment) > 0 {
-		if len(uid.Id) > 0 {
-			uid.Id += " "
-		}
-		uid.Id += "("
-		uid.Id += comment
-		uid.Id += ")"
-	}
-	if len(email) > 0 {
-		if len(uid.Id) > 0 {
-			uid.Id += " "
-		}
-		uid.Id += "<"
-		uid.Id += email
-		uid.Id += ">"
-	}
-	return uid
-}
-
-func (uid *UserId) parse(r io.Reader) (err error) {
-	// RFC 4880, section 5.11
-	b, err := ioutil.ReadAll(r)
-	if err != nil {
-		return
-	}
-	uid.Id = string(b)
-	uid.Name, uid.Comment, uid.Email = parseUserId(uid.Id)
-	return
-}
-
-// Serialize marshals uid to w in the form of an OpenPGP packet, including
-// header.
-func (uid *UserId) Serialize(w io.Writer) error {
-	err := serializeHeader(w, packetTypeUserId, len(uid.Id))
-	if err != nil {
-		return err
-	}
-	_, err = w.Write([]byte(uid.Id))
-	return err
-}
-
-// parseUserId extracts the name, comment and email from a user id string that
-// is formatted as "Full Name (Comment) <email@example.com>".
-func parseUserId(id string) (name, comment, email string) {
-	var n, c, e struct {
-		start, end int
-	}
-	var state int
-
-	for offset, rune := range id {
-		switch state {
-		case 0:
-			// Entering name
-			n.start = offset
-			state = 1
-			fallthrough
-		case 1:
-			// In name
-			if rune == '(' {
-				state = 2
-				n.end = offset
-			} else if rune == '<' {
-				state = 5
-				n.end = offset
-			}
-		case 2:
-			// Entering comment
-			c.start = offset
-			state = 3
-			fallthrough
-		case 3:
-			// In comment
-			if rune == ')' {
-				state = 4
-				c.end = offset
-			}
-		case 4:
-			// Between comment and email
-			if rune == '<' {
-				state = 5
-			}
-		case 5:
-			// Entering email
-			e.start = offset
-			state = 6
-			fallthrough
-		case 6:
-			// In email
-			if rune == '>' {
-				state = 7
-				e.end = offset
-			}
-		default:
-			// After email
-		}
-	}
-	switch state {
-	case 1:
-		// ended in the name
-		n.end = len(id)
-	case 3:
-		// ended in comment
-		c.end = len(id)
-	case 6:
-		// ended in email
-		e.end = len(id)
-	}
-
-	name = strings.TrimSpace(id[n.start:n.end])
-	comment = strings.TrimSpace(id[c.start:c.end])
-	email = strings.TrimSpace(id[e.start:e.end])
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/packet/userid_test.go b/installer/vendor/golang.org/x/crypto/openpgp/packet/userid_test.go
deleted file mode 100644
index 2968193893..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/packet/userid_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package packet
-
-import (
-	"testing"
-)
-
-var userIdTests = []struct {
-	id                   string
-	name, comment, email string
-}{
-	{"", "", "", ""},
-	{"John Smith", "John Smith", "", ""},
-	{"John Smith ()", "John Smith", "", ""},
-	{"John Smith () <>", "John Smith", "", ""},
-	{"(comment", "", "comment", ""},
-	{"(comment)", "", "comment", ""},
-	{"<email", "", "", "email"},
-	{"<email>   sdfk", "", "", "email"},
-	{"  John Smith  (  Comment ) asdkflj < email > lksdfj", "John Smith", "Comment", "email"},
-	{"  John Smith  < email > lksdfj", "John Smith", "", "email"},
-	{"(<foo", "", "<foo", ""},
-	{"René Descartes (العربي)", "René Descartes", "العربي", ""},
-}
-
-func TestParseUserId(t *testing.T) {
-	for i, test := range userIdTests {
-		name, comment, email := parseUserId(test.id)
-		if name != test.name {
-			t.Errorf("%d: name mismatch got:%s want:%s", i, name, test.name)
-		}
-		if comment != test.comment {
-			t.Errorf("%d: comment mismatch got:%s want:%s", i, comment, test.comment)
-		}
-		if email != test.email {
-			t.Errorf("%d: email mismatch got:%s want:%s", i, email, test.email)
-		}
-	}
-}
-
-var newUserIdTests = []struct {
-	name, comment, email, id string
-}{
-	{"foo", "", "", "foo"},
-	{"", "bar", "", "(bar)"},
-	{"", "", "baz", "<baz>"},
-	{"foo", "bar", "", "foo (bar)"},
-	{"foo", "", "baz", "foo <baz>"},
-	{"", "bar", "baz", "(bar) <baz>"},
-	{"foo", "bar", "baz", "foo (bar) <baz>"},
-}
-
-func TestNewUserId(t *testing.T) {
-	for i, test := range newUserIdTests {
-		uid := NewUserId(test.name, test.comment, test.email)
-		if uid == nil {
-			t.Errorf("#%d: returned nil", i)
-			continue
-		}
-		if uid.Id != test.id {
-			t.Errorf("#%d: got '%s', want '%s'", i, uid.Id, test.id)
-		}
-	}
-}
-
-var invalidNewUserIdTests = []struct {
-	name, comment, email string
-}{
-	{"foo(", "", ""},
-	{"foo<", "", ""},
-	{"", "bar)", ""},
-	{"", "bar<", ""},
-	{"", "", "baz>"},
-	{"", "", "baz)"},
-	{"", "", "baz\x00"},
-}
-
-func TestNewUserIdWithInvalidInput(t *testing.T) {
-	for i, test := range invalidNewUserIdTests {
-		if uid := NewUserId(test.name, test.comment, test.email); uid != nil {
-			t.Errorf("#%d: returned non-nil value: %#v", i, uid)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/read.go b/installer/vendor/golang.org/x/crypto/openpgp/read.go
deleted file mode 100644
index 6ec664f44a..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/read.go
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package openpgp implements high level operations on OpenPGP messages.
-package openpgp // import "golang.org/x/crypto/openpgp"
-
-import (
-	"crypto"
-	_ "crypto/sha256"
-	"hash"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-// SignatureType is the armor type for a PGP signature.
-var SignatureType = "PGP SIGNATURE"
-
-// readArmored reads an armored block with the given type.
-func readArmored(r io.Reader, expectedType string) (body io.Reader, err error) {
-	block, err := armor.Decode(r)
-	if err != nil {
-		return
-	}
-
-	if block.Type != expectedType {
-		return nil, errors.InvalidArgumentError("expected '" + expectedType + "', got: " + block.Type)
-	}
-
-	return block.Body, nil
-}
-
-// MessageDetails contains the result of parsing an OpenPGP encrypted and/or
-// signed message.
-type MessageDetails struct {
-	IsEncrypted              bool                // true if the message was encrypted.
-	EncryptedToKeyIds        []uint64            // the list of recipient key ids.
-	IsSymmetricallyEncrypted bool                // true if a passphrase could have decrypted the message.
-	DecryptedWith            Key                 // the private key used to decrypt the message, if any.
-	IsSigned                 bool                // true if the message is signed.
-	SignedByKeyId            uint64              // the key id of the signer, if any.
-	SignedBy                 *Key                // the key of the signer, if available.
-	LiteralData              *packet.LiteralData // the metadata of the contents
-	UnverifiedBody           io.Reader           // the contents of the message.
-
-	// If IsSigned is true and SignedBy is non-zero then the signature will
-	// be verified as UnverifiedBody is read. The signature cannot be
-	// checked until the whole of UnverifiedBody is read so UnverifiedBody
-	// must be consumed until EOF before the data can be trusted. Even if a
-	// message isn't signed (or the signer is unknown) the data may contain
-	// an authentication code that is only checked once UnverifiedBody has
-	// been consumed. Once EOF has been seen, the following fields are
-	// valid. (An authentication code failure is reported as a
-	// SignatureError error when reading from UnverifiedBody.)
-	SignatureError error               // nil if the signature is good.
-	Signature      *packet.Signature   // the signature packet itself, if v4 (default)
-	SignatureV3    *packet.SignatureV3 // the signature packet if it is a v2 or v3 signature
-
-	decrypted io.ReadCloser
-}
-
-// A PromptFunction is used as a callback by functions that may need to decrypt
-// a private key, or prompt for a passphrase. It is called with a list of
-// acceptable, encrypted private keys and a boolean that indicates whether a
-// passphrase is usable. It should either decrypt a private key or return a
-// passphrase to try. If the decrypted private key or given passphrase isn't
-// correct, the function will be called again, forever. Any error returned will
-// be passed up.
-type PromptFunction func(keys []Key, symmetric bool) ([]byte, error)
-
-// A keyEnvelopePair is used to store a private key with the envelope that
-// contains a symmetric key, encrypted with that key.
-type keyEnvelopePair struct {
-	key          Key
-	encryptedKey *packet.EncryptedKey
-}
-
-// ReadMessage parses an OpenPGP message that may be signed and/or encrypted.
-// The given KeyRing should contain both public keys (for signature
-// verification) and, possibly encrypted, private keys for decrypting.
-// If config is nil, sensible defaults will be used.
-func ReadMessage(r io.Reader, keyring KeyRing, prompt PromptFunction, config *packet.Config) (md *MessageDetails, err error) {
-	var p packet.Packet
-
-	var symKeys []*packet.SymmetricKeyEncrypted
-	var pubKeys []keyEnvelopePair
-	var se *packet.SymmetricallyEncrypted
-
-	packets := packet.NewReader(r)
-	md = new(MessageDetails)
-	md.IsEncrypted = true
-
-	// The message, if encrypted, starts with a number of packets
-	// containing an encrypted decryption key. The decryption key is either
-	// encrypted to a public key, or with a passphrase. This loop
-	// collects these packets.
-ParsePackets:
-	for {
-		p, err = packets.Next()
-		if err != nil {
-			return nil, err
-		}
-		switch p := p.(type) {
-		case *packet.SymmetricKeyEncrypted:
-			// This packet contains the decryption key encrypted with a passphrase.
-			md.IsSymmetricallyEncrypted = true
-			symKeys = append(symKeys, p)
-		case *packet.EncryptedKey:
-			// This packet contains the decryption key encrypted to a public key.
-			md.EncryptedToKeyIds = append(md.EncryptedToKeyIds, p.KeyId)
-			switch p.Algo {
-			case packet.PubKeyAlgoRSA, packet.PubKeyAlgoRSAEncryptOnly, packet.PubKeyAlgoElGamal:
-				break
-			default:
-				continue
-			}
-			var keys []Key
-			if p.KeyId == 0 {
-				keys = keyring.DecryptionKeys()
-			} else {
-				keys = keyring.KeysById(p.KeyId)
-			}
-			for _, k := range keys {
-				pubKeys = append(pubKeys, keyEnvelopePair{k, p})
-			}
-		case *packet.SymmetricallyEncrypted:
-			se = p
-			break ParsePackets
-		case *packet.Compressed, *packet.LiteralData, *packet.OnePassSignature:
-			// This message isn't encrypted.
-			if len(symKeys) != 0 || len(pubKeys) != 0 {
-				return nil, errors.StructuralError("key material not followed by encrypted message")
-			}
-			packets.Unread(p)
-			return readSignedMessage(packets, nil, keyring)
-		}
-	}
-
-	var candidates []Key
-	var decrypted io.ReadCloser
-
-	// Now that we have the list of encrypted keys we need to decrypt at
-	// least one of them or, if we cannot, we need to call the prompt
-	// function so that it can decrypt a key or give us a passphrase.
-FindKey:
-	for {
-		// See if any of the keys already have a private key available
-		candidates = candidates[:0]
-		candidateFingerprints := make(map[string]bool)
-
-		for _, pk := range pubKeys {
-			if pk.key.PrivateKey == nil {
-				continue
-			}
-			if !pk.key.PrivateKey.Encrypted {
-				if len(pk.encryptedKey.Key) == 0 {
-					pk.encryptedKey.Decrypt(pk.key.PrivateKey, config)
-				}
-				if len(pk.encryptedKey.Key) == 0 {
-					continue
-				}
-				decrypted, err = se.Decrypt(pk.encryptedKey.CipherFunc, pk.encryptedKey.Key)
-				if err != nil && err != errors.ErrKeyIncorrect {
-					return nil, err
-				}
-				if decrypted != nil {
-					md.DecryptedWith = pk.key
-					break FindKey
-				}
-			} else {
-				fpr := string(pk.key.PublicKey.Fingerprint[:])
-				if v := candidateFingerprints[fpr]; v {
-					continue
-				}
-				candidates = append(candidates, pk.key)
-				candidateFingerprints[fpr] = true
-			}
-		}
-
-		if len(candidates) == 0 && len(symKeys) == 0 {
-			return nil, errors.ErrKeyIncorrect
-		}
-
-		if prompt == nil {
-			return nil, errors.ErrKeyIncorrect
-		}
-
-		passphrase, err := prompt(candidates, len(symKeys) != 0)
-		if err != nil {
-			return nil, err
-		}
-
-		// Try the symmetric passphrase first
-		if len(symKeys) != 0 && passphrase != nil {
-			for _, s := range symKeys {
-				key, cipherFunc, err := s.Decrypt(passphrase)
-				if err == nil {
-					decrypted, err = se.Decrypt(cipherFunc, key)
-					if err != nil && err != errors.ErrKeyIncorrect {
-						return nil, err
-					}
-					if decrypted != nil {
-						break FindKey
-					}
-				}
-
-			}
-		}
-	}
-
-	md.decrypted = decrypted
-	if err := packets.Push(decrypted); err != nil {
-		return nil, err
-	}
-	return readSignedMessage(packets, md, keyring)
-}
-
-// readSignedMessage reads a possibly signed message if mdin is non-zero then
-// that structure is updated and returned. Otherwise a fresh MessageDetails is
-// used.
-func readSignedMessage(packets *packet.Reader, mdin *MessageDetails, keyring KeyRing) (md *MessageDetails, err error) {
-	if mdin == nil {
-		mdin = new(MessageDetails)
-	}
-	md = mdin
-
-	var p packet.Packet
-	var h hash.Hash
-	var wrappedHash hash.Hash
-FindLiteralData:
-	for {
-		p, err = packets.Next()
-		if err != nil {
-			return nil, err
-		}
-		switch p := p.(type) {
-		case *packet.Compressed:
-			if err := packets.Push(p.Body); err != nil {
-				return nil, err
-			}
-		case *packet.OnePassSignature:
-			if !p.IsLast {
-				return nil, errors.UnsupportedError("nested signatures")
-			}
-
-			h, wrappedHash, err = hashForSignature(p.Hash, p.SigType)
-			if err != nil {
-				md = nil
-				return
-			}
-
-			md.IsSigned = true
-			md.SignedByKeyId = p.KeyId
-			keys := keyring.KeysByIdUsage(p.KeyId, packet.KeyFlagSign)
-			if len(keys) > 0 {
-				md.SignedBy = &keys[0]
-			}
-		case *packet.LiteralData:
-			md.LiteralData = p
-			break FindLiteralData
-		}
-	}
-
-	if md.SignedBy != nil {
-		md.UnverifiedBody = &signatureCheckReader{packets, h, wrappedHash, md}
-	} else if md.decrypted != nil {
-		md.UnverifiedBody = checkReader{md}
-	} else {
-		md.UnverifiedBody = md.LiteralData.Body
-	}
-
-	return md, nil
-}
-
-// hashForSignature returns a pair of hashes that can be used to verify a
-// signature. The signature may specify that the contents of the signed message
-// should be preprocessed (i.e. to normalize line endings). Thus this function
-// returns two hashes. The second should be used to hash the message itself and
-// performs any needed preprocessing.
-func hashForSignature(hashId crypto.Hash, sigType packet.SignatureType) (hash.Hash, hash.Hash, error) {
-	if !hashId.Available() {
-		return nil, nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hashId)))
-	}
-	h := hashId.New()
-
-	switch sigType {
-	case packet.SigTypeBinary:
-		return h, h, nil
-	case packet.SigTypeText:
-		return h, NewCanonicalTextHash(h), nil
-	}
-
-	return nil, nil, errors.UnsupportedError("unsupported signature type: " + strconv.Itoa(int(sigType)))
-}
-
-// checkReader wraps an io.Reader from a LiteralData packet. When it sees EOF
-// it closes the ReadCloser from any SymmetricallyEncrypted packet to trigger
-// MDC checks.
-type checkReader struct {
-	md *MessageDetails
-}
-
-func (cr checkReader) Read(buf []byte) (n int, err error) {
-	n, err = cr.md.LiteralData.Body.Read(buf)
-	if err == io.EOF {
-		mdcErr := cr.md.decrypted.Close()
-		if mdcErr != nil {
-			err = mdcErr
-		}
-	}
-	return
-}
-
-// signatureCheckReader wraps an io.Reader from a LiteralData packet and hashes
-// the data as it is read. When it sees an EOF from the underlying io.Reader
-// it parses and checks a trailing Signature packet and triggers any MDC checks.
-type signatureCheckReader struct {
-	packets        *packet.Reader
-	h, wrappedHash hash.Hash
-	md             *MessageDetails
-}
-
-func (scr *signatureCheckReader) Read(buf []byte) (n int, err error) {
-	n, err = scr.md.LiteralData.Body.Read(buf)
-	scr.wrappedHash.Write(buf[:n])
-	if err == io.EOF {
-		var p packet.Packet
-		p, scr.md.SignatureError = scr.packets.Next()
-		if scr.md.SignatureError != nil {
-			return
-		}
-
-		var ok bool
-		if scr.md.Signature, ok = p.(*packet.Signature); ok {
-			scr.md.SignatureError = scr.md.SignedBy.PublicKey.VerifySignature(scr.h, scr.md.Signature)
-		} else if scr.md.SignatureV3, ok = p.(*packet.SignatureV3); ok {
-			scr.md.SignatureError = scr.md.SignedBy.PublicKey.VerifySignatureV3(scr.h, scr.md.SignatureV3)
-		} else {
-			scr.md.SignatureError = errors.StructuralError("LiteralData not followed by Signature")
-			return
-		}
-
-		// The SymmetricallyEncrypted packet, if any, might have an
-		// unsigned hash of its own. In order to check this we need to
-		// close that Reader.
-		if scr.md.decrypted != nil {
-			mdcErr := scr.md.decrypted.Close()
-			if mdcErr != nil {
-				err = mdcErr
-			}
-		}
-	}
-	return
-}
-
-// CheckDetachedSignature takes a signed file and a detached signature and
-// returns the signer if the signature is valid. If the signer isn't known,
-// ErrUnknownIssuer is returned.
-func CheckDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
-	var issuerKeyId uint64
-	var hashFunc crypto.Hash
-	var sigType packet.SignatureType
-	var keys []Key
-	var p packet.Packet
-
-	packets := packet.NewReader(signature)
-	for {
-		p, err = packets.Next()
-		if err == io.EOF {
-			return nil, errors.ErrUnknownIssuer
-		}
-		if err != nil {
-			return nil, err
-		}
-
-		switch sig := p.(type) {
-		case *packet.Signature:
-			if sig.IssuerKeyId == nil {
-				return nil, errors.StructuralError("signature doesn't have an issuer")
-			}
-			issuerKeyId = *sig.IssuerKeyId
-			hashFunc = sig.Hash
-			sigType = sig.SigType
-		case *packet.SignatureV3:
-			issuerKeyId = sig.IssuerKeyId
-			hashFunc = sig.Hash
-			sigType = sig.SigType
-		default:
-			return nil, errors.StructuralError("non signature packet found")
-		}
-
-		keys = keyring.KeysByIdUsage(issuerKeyId, packet.KeyFlagSign)
-		if len(keys) > 0 {
-			break
-		}
-	}
-
-	if len(keys) == 0 {
-		panic("unreachable")
-	}
-
-	h, wrappedHash, err := hashForSignature(hashFunc, sigType)
-	if err != nil {
-		return nil, err
-	}
-
-	if _, err := io.Copy(wrappedHash, signed); err != nil && err != io.EOF {
-		return nil, err
-	}
-
-	for _, key := range keys {
-		switch sig := p.(type) {
-		case *packet.Signature:
-			err = key.PublicKey.VerifySignature(h, sig)
-		case *packet.SignatureV3:
-			err = key.PublicKey.VerifySignatureV3(h, sig)
-		default:
-			panic("unreachable")
-		}
-
-		if err == nil {
-			return key.Entity, nil
-		}
-	}
-
-	return nil, err
-}
-
-// CheckArmoredDetachedSignature performs the same actions as
-// CheckDetachedSignature but expects the signature to be armored.
-func CheckArmoredDetachedSignature(keyring KeyRing, signed, signature io.Reader) (signer *Entity, err error) {
-	body, err := readArmored(signature, SignatureType)
-	if err != nil {
-		return
-	}
-
-	return CheckDetachedSignature(keyring, signed, body)
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/read_test.go b/installer/vendor/golang.org/x/crypto/openpgp/read_test.go
deleted file mode 100644
index 1fbfbac4ce..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/read_test.go
+++ /dev/null
@@ -1,613 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"bytes"
-	_ "crypto/sha512"
-	"encoding/hex"
-	"io"
-	"io/ioutil"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-func readerFromHex(s string) io.Reader {
-	data, err := hex.DecodeString(s)
-	if err != nil {
-		panic("readerFromHex: bad input")
-	}
-	return bytes.NewBuffer(data)
-}
-
-func TestReadKeyRing(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(kring) != 2 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB || uint32(kring[1].PrimaryKey.KeyId) != 0x1E35246B {
-		t.Errorf("bad keyring: %#v", kring)
-	}
-}
-
-func TestRereadKeyRing(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-	if err != nil {
-		t.Errorf("error in initial parse: %s", err)
-		return
-	}
-	out := new(bytes.Buffer)
-	err = kring[0].Serialize(out)
-	if err != nil {
-		t.Errorf("error in serialization: %s", err)
-		return
-	}
-	kring, err = ReadKeyRing(out)
-	if err != nil {
-		t.Errorf("error in second parse: %s", err)
-		return
-	}
-
-	if len(kring) != 1 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB {
-		t.Errorf("bad keyring: %#v", kring)
-	}
-}
-
-func TestReadPrivateKeyRing(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(kring) != 2 || uint32(kring[0].PrimaryKey.KeyId) != 0xC20C31BB || uint32(kring[1].PrimaryKey.KeyId) != 0x1E35246B || kring[0].PrimaryKey == nil {
-		t.Errorf("bad keyring: %#v", kring)
-	}
-}
-
-func TestReadDSAKey(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(dsaTestKeyHex))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(kring) != 1 || uint32(kring[0].PrimaryKey.KeyId) != 0x0CCC0360 {
-		t.Errorf("bad parse: %#v", kring)
-	}
-}
-
-func TestReadP256Key(t *testing.T) {
-	kring, err := ReadKeyRing(readerFromHex(p256TestKeyHex))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(kring) != 1 || uint32(kring[0].PrimaryKey.KeyId) != 0x5918513E {
-		t.Errorf("bad parse: %#v", kring)
-	}
-}
-
-func TestDSAHashTruncatation(t *testing.T) {
-	// dsaKeyWithSHA512 was generated with GnuPG and --cert-digest-algo
-	// SHA512 in order to require DSA hash truncation to verify correctly.
-	_, err := ReadKeyRing(readerFromHex(dsaKeyWithSHA512))
-	if err != nil {
-		t.Error(err)
-	}
-}
-
-func TestGetKeyById(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-
-	keys := kring.KeysById(0xa34d7e18c20c31bb)
-	if len(keys) != 1 || keys[0].Entity != kring[0] {
-		t.Errorf("bad result for 0xa34d7e18c20c31bb: %#v", keys)
-	}
-
-	keys = kring.KeysById(0xfd94408d4543314f)
-	if len(keys) != 1 || keys[0].Entity != kring[0] {
-		t.Errorf("bad result for 0xa34d7e18c20c31bb: %#v", keys)
-	}
-}
-
-func checkSignedMessage(t *testing.T, signedHex, expected string) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-
-	md, err := ReadMessage(readerFromHex(signedHex), kring, nil, nil)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if !md.IsSigned || md.SignedByKeyId != 0xa34d7e18c20c31bb || md.SignedBy == nil || md.IsEncrypted || md.IsSymmetricallyEncrypted || len(md.EncryptedToKeyIds) != 0 || md.IsSymmetricallyEncrypted {
-		t.Errorf("bad MessageDetails: %#v", md)
-	}
-
-	contents, err := ioutil.ReadAll(md.UnverifiedBody)
-	if err != nil {
-		t.Errorf("error reading UnverifiedBody: %s", err)
-	}
-	if string(contents) != expected {
-		t.Errorf("bad UnverifiedBody got:%s want:%s", string(contents), expected)
-	}
-	if md.SignatureError != nil || md.Signature == nil {
-		t.Errorf("failed to validate: %s", md.SignatureError)
-	}
-}
-
-func TestSignedMessage(t *testing.T) {
-	checkSignedMessage(t, signedMessageHex, signedInput)
-}
-
-func TestTextSignedMessage(t *testing.T) {
-	checkSignedMessage(t, signedTextMessageHex, signedTextInput)
-}
-
-// The reader should detect "compressed quines", which are compressed
-// packets that expand into themselves and cause an infinite recursive
-// parsing loop.
-// The packet in this test case comes from Taylor R. Campbell at
-// http://mumble.net/~campbell/misc/pgp-quine/
-func TestCampbellQuine(t *testing.T) {
-	md, err := ReadMessage(readerFromHex(campbellQuine), nil, nil, nil)
-	if md != nil {
-		t.Errorf("Reading a compressed quine should not return any data: %#v", md)
-	}
-	structural, ok := err.(errors.StructuralError)
-	if !ok {
-		t.Fatalf("Unexpected class of error: %T", err)
-	}
-	if !strings.Contains(string(structural), "too many layers of packets") {
-		t.Fatalf("Unexpected error: %s", err)
-	}
-}
-
-var signedEncryptedMessageTests = []struct {
-	keyRingHex       string
-	messageHex       string
-	signedByKeyId    uint64
-	encryptedToKeyId uint64
-}{
-	{
-		testKeys1And2PrivateHex,
-		signedEncryptedMessageHex,
-		0xa34d7e18c20c31bb,
-		0x2a67d68660df41c7,
-	},
-	{
-		dsaElGamalTestKeysHex,
-		signedEncryptedMessage2Hex,
-		0x33af447ccd759b09,
-		0xcf6a7abcd43e3673,
-	},
-}
-
-func TestSignedEncryptedMessage(t *testing.T) {
-	for i, test := range signedEncryptedMessageTests {
-		expected := "Signed and encrypted message\n"
-		kring, _ := ReadKeyRing(readerFromHex(test.keyRingHex))
-		prompt := func(keys []Key, symmetric bool) ([]byte, error) {
-			if symmetric {
-				t.Errorf("prompt: message was marked as symmetrically encrypted")
-				return nil, errors.ErrKeyIncorrect
-			}
-
-			if len(keys) == 0 {
-				t.Error("prompt: no keys requested")
-				return nil, errors.ErrKeyIncorrect
-			}
-
-			err := keys[0].PrivateKey.Decrypt([]byte("passphrase"))
-			if err != nil {
-				t.Errorf("prompt: error decrypting key: %s", err)
-				return nil, errors.ErrKeyIncorrect
-			}
-
-			return nil, nil
-		}
-
-		md, err := ReadMessage(readerFromHex(test.messageHex), kring, prompt, nil)
-		if err != nil {
-			t.Errorf("#%d: error reading message: %s", i, err)
-			return
-		}
-
-		if !md.IsSigned || md.SignedByKeyId != test.signedByKeyId || md.SignedBy == nil || !md.IsEncrypted || md.IsSymmetricallyEncrypted || len(md.EncryptedToKeyIds) == 0 || md.EncryptedToKeyIds[0] != test.encryptedToKeyId {
-			t.Errorf("#%d: bad MessageDetails: %#v", i, md)
-		}
-
-		contents, err := ioutil.ReadAll(md.UnverifiedBody)
-		if err != nil {
-			t.Errorf("#%d: error reading UnverifiedBody: %s", i, err)
-		}
-		if string(contents) != expected {
-			t.Errorf("#%d: bad UnverifiedBody got:%s want:%s", i, string(contents), expected)
-		}
-
-		if md.SignatureError != nil || md.Signature == nil {
-			t.Errorf("#%d: failed to validate: %s", i, md.SignatureError)
-		}
-	}
-}
-
-func TestUnspecifiedRecipient(t *testing.T) {
-	expected := "Recipient unspecified\n"
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
-
-	md, err := ReadMessage(readerFromHex(recipientUnspecifiedHex), kring, nil, nil)
-	if err != nil {
-		t.Errorf("error reading message: %s", err)
-		return
-	}
-
-	contents, err := ioutil.ReadAll(md.UnverifiedBody)
-	if err != nil {
-		t.Errorf("error reading UnverifiedBody: %s", err)
-	}
-	if string(contents) != expected {
-		t.Errorf("bad UnverifiedBody got:%s want:%s", string(contents), expected)
-	}
-}
-
-func TestSymmetricallyEncrypted(t *testing.T) {
-	firstTimeCalled := true
-
-	prompt := func(keys []Key, symmetric bool) ([]byte, error) {
-		if len(keys) != 0 {
-			t.Errorf("prompt: len(keys) = %d (want 0)", len(keys))
-		}
-
-		if !symmetric {
-			t.Errorf("symmetric is not set")
-		}
-
-		if firstTimeCalled {
-			firstTimeCalled = false
-			return []byte("wrongpassword"), nil
-		}
-
-		return []byte("password"), nil
-	}
-
-	md, err := ReadMessage(readerFromHex(symmetricallyEncryptedCompressedHex), nil, prompt, nil)
-	if err != nil {
-		t.Errorf("ReadMessage: %s", err)
-		return
-	}
-
-	contents, err := ioutil.ReadAll(md.UnverifiedBody)
-	if err != nil {
-		t.Errorf("ReadAll: %s", err)
-	}
-
-	expectedCreationTime := uint32(1295992998)
-	if md.LiteralData.Time != expectedCreationTime {
-		t.Errorf("LiteralData.Time is %d, want %d", md.LiteralData.Time, expectedCreationTime)
-	}
-
-	const expected = "Symmetrically encrypted.\n"
-	if string(contents) != expected {
-		t.Errorf("contents got: %s want: %s", string(contents), expected)
-	}
-}
-
-func testDetachedSignature(t *testing.T, kring KeyRing, signature io.Reader, sigInput, tag string, expectedSignerKeyId uint64) {
-	signed := bytes.NewBufferString(sigInput)
-	signer, err := CheckDetachedSignature(kring, signed, signature)
-	if err != nil {
-		t.Errorf("%s: signature error: %s", tag, err)
-		return
-	}
-	if signer == nil {
-		t.Errorf("%s: signer is nil", tag)
-		return
-	}
-	if signer.PrimaryKey.KeyId != expectedSignerKeyId {
-		t.Errorf("%s: wrong signer got:%x want:%x", tag, signer.PrimaryKey.KeyId, expectedSignerKeyId)
-	}
-}
-
-func TestDetachedSignature(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-	testDetachedSignature(t, kring, readerFromHex(detachedSignatureHex), signedInput, "binary", testKey1KeyId)
-	testDetachedSignature(t, kring, readerFromHex(detachedSignatureTextHex), signedInput, "text", testKey1KeyId)
-	testDetachedSignature(t, kring, readerFromHex(detachedSignatureV3TextHex), signedInput, "v3", testKey1KeyId)
-
-	incorrectSignedInput := signedInput + "X"
-	_, err := CheckDetachedSignature(kring, bytes.NewBufferString(incorrectSignedInput), readerFromHex(detachedSignatureHex))
-	if err == nil {
-		t.Fatal("CheckDetachedSignature returned without error for bad signature")
-	}
-	if err == errors.ErrUnknownIssuer {
-		t.Fatal("CheckDetachedSignature returned ErrUnknownIssuer when the signer was known, but the signature invalid")
-	}
-}
-
-func TestDetachedSignatureDSA(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(dsaTestKeyHex))
-	testDetachedSignature(t, kring, readerFromHex(detachedSignatureDSAHex), signedInput, "binary", testKey3KeyId)
-}
-
-func TestMultipleSignaturePacketsDSA(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(dsaTestKeyHex))
-	testDetachedSignature(t, kring, readerFromHex(missingHashFunctionHex+detachedSignatureDSAHex), signedInput, "binary", testKey3KeyId)
-}
-
-func TestDetachedSignatureP256(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(p256TestKeyHex))
-	testDetachedSignature(t, kring, readerFromHex(detachedSignatureP256Hex), signedInput, "binary", testKeyP256KeyId)
-}
-
-func testHashFunctionError(t *testing.T, signatureHex string) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-	_, err := CheckDetachedSignature(kring, nil, readerFromHex(signatureHex))
-	if err == nil {
-		t.Fatal("Packet with bad hash type was correctly parsed")
-	}
-	unsupported, ok := err.(errors.UnsupportedError)
-	if !ok {
-		t.Fatalf("Unexpected class of error: %s", err)
-	}
-	if !strings.Contains(string(unsupported), "hash ") {
-		t.Fatalf("Unexpected error: %s", err)
-	}
-}
-
-func TestUnknownHashFunction(t *testing.T) {
-	// unknownHashFunctionHex contains a signature packet with hash
-	// function type 153 (which isn't a real hash function id).
-	testHashFunctionError(t, unknownHashFunctionHex)
-}
-
-func TestMissingHashFunction(t *testing.T) {
-	// missingHashFunctionHex contains a signature packet that uses
-	// RIPEMD160, which isn't compiled in.  Since that's the only signature
-	// packet we don't find any suitable packets and end up with ErrUnknownIssuer
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2Hex))
-	_, err := CheckDetachedSignature(kring, nil, readerFromHex(missingHashFunctionHex))
-	if err == nil {
-		t.Fatal("Packet with missing hash type was correctly parsed")
-	}
-	if err != errors.ErrUnknownIssuer {
-		t.Fatalf("Unexpected class of error: %s", err)
-	}
-}
-
-func TestReadingArmoredPrivateKey(t *testing.T) {
-	el, err := ReadArmoredKeyRing(bytes.NewBufferString(armoredPrivateKeyBlock))
-	if err != nil {
-		t.Error(err)
-	}
-	if len(el) != 1 {
-		t.Errorf("got %d entities, wanted 1\n", len(el))
-	}
-}
-
-func TestReadingArmoredPublicKey(t *testing.T) {
-	el, err := ReadArmoredKeyRing(bytes.NewBufferString(e2ePublicKey))
-	if err != nil {
-		t.Error(err)
-	}
-	if len(el) != 1 {
-		t.Errorf("didn't get a valid entity")
-	}
-}
-
-func TestNoArmoredData(t *testing.T) {
-	_, err := ReadArmoredKeyRing(bytes.NewBufferString("foo"))
-	if _, ok := err.(errors.InvalidArgumentError); !ok {
-		t.Errorf("error was not an InvalidArgumentError: %s", err)
-	}
-}
-
-func testReadMessageError(t *testing.T, messageHex string) {
-	buf, err := hex.DecodeString(messageHex)
-	if err != nil {
-		t.Errorf("hex.DecodeString(): %v", err)
-	}
-
-	kr, err := ReadKeyRing(new(bytes.Buffer))
-	if err != nil {
-		t.Errorf("ReadKeyring(): %v", err)
-	}
-
-	_, err = ReadMessage(bytes.NewBuffer(buf), kr,
-		func([]Key, bool) ([]byte, error) {
-			return []byte("insecure"), nil
-		}, nil)
-
-	if err == nil {
-		t.Errorf("ReadMessage(): Unexpected nil error")
-	}
-}
-
-func TestIssue11503(t *testing.T) {
-	testReadMessageError(t, "8c040402000aa430aa8228b9248b01fc899a91197130303030")
-}
-
-func TestIssue11504(t *testing.T) {
-	testReadMessageError(t, "9303000130303030303030303030983002303030303030030000000130")
-}
-
-// TestSignatureV3Message tests the verification of V3 signature, generated
-// with a modern V4-style key.  Some people have their clients set to generate
-// V3 signatures, so it's useful to be able to verify them.
-func TestSignatureV3Message(t *testing.T) {
-	sig, err := armor.Decode(strings.NewReader(signedMessageV3))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	key, err := ReadArmoredKeyRing(strings.NewReader(keyV4forVerifyingSignedMessageV3))
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	md, err := ReadMessage(sig.Body, key, nil, nil)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	_, err = ioutil.ReadAll(md.UnverifiedBody)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	// We'll see a sig error here after reading in the UnverifiedBody above,
-	// if there was one to see.
-	if err = md.SignatureError; err != nil {
-		t.Error(err)
-		return
-	}
-
-	if md.SignatureV3 == nil {
-		t.Errorf("No available signature after checking signature")
-		return
-	}
-	if md.Signature != nil {
-		t.Errorf("Did not expect a signature V4 back")
-		return
-	}
-	return
-}
-
-const testKey1KeyId = 0xA34D7E18C20C31BB
-const testKey3KeyId = 0x338934250CCC0360
-const testKeyP256KeyId = 0xd44a2c495918513e
-
-const signedInput = "Signed message\nline 2\nline 3\n"
-const signedTextInput = "Signed message\r\nline 2\r\nline 3\r\n"
-
-const recipientUnspecifiedHex = "848c0300000000000000000103ff62d4d578d03cf40c3da998dfe216c074fa6ddec5e31c197c9666ba292830d91d18716a80f699f9d897389a90e6d62d0238f5f07a5248073c0f24920e4bc4a30c2d17ee4e0cae7c3d4aaa4e8dced50e3010a80ee692175fa0385f62ecca4b56ee6e9980aa3ec51b61b077096ac9e800edaf161268593eedb6cc7027ff5cb32745d250010d407a6221ae22ef18469b444f2822478c4d190b24d36371a95cb40087cdd42d9399c3d06a53c0673349bfb607927f20d1e122bde1e2bf3aa6cae6edf489629bcaa0689539ae3b718914d88ededc3b"
-
-const detachedSignatureHex = "889c04000102000605024d449cd1000a0910a34d7e18c20c31bb167603ff57718d09f28a519fdc7b5a68b6a3336da04df85e38c5cd5d5bd2092fa4629848a33d85b1729402a2aab39c3ac19f9d573f773cc62c264dc924c067a79dfd8a863ae06c7c8686120760749f5fd9b1e03a64d20a7df3446ddc8f0aeadeaeba7cbaee5c1e366d65b6a0c6cc749bcb912d2f15013f812795c2e29eb7f7b77f39ce77"
-
-const detachedSignatureTextHex = "889c04010102000605024d449d21000a0910a34d7e18c20c31bbc8c60400a24fbef7342603a41cb1165767bd18985d015fb72fe05db42db36cfb2f1d455967f1e491194fbf6cf88146222b23bf6ffbd50d17598d976a0417d3192ff9cc0034fd00f287b02e90418bbefe609484b09231e4e7a5f3562e199bf39909ab5276c4d37382fe088f6b5c3426fc1052865da8b3ab158672d58b6264b10823dc4b39"
-
-const detachedSignatureV3TextHex = "8900950305005255c25ca34d7e18c20c31bb0102bb3f04009f6589ef8a028d6e54f6eaf25432e590d31c3a41f4710897585e10c31e5e332c7f9f409af8512adceaff24d0da1474ab07aa7bce4f674610b010fccc5b579ae5eb00a127f272fb799f988ab8e4574c141da6dbfecfef7e6b2c478d9a3d2551ba741f260ee22bec762812f0053e05380bfdd55ad0f22d8cdf71b233fe51ae8a24"
-
-const detachedSignatureDSAHex = "884604001102000605024d6c4eac000a0910338934250ccc0360f18d00a087d743d6405ed7b87755476629600b8b694a39e900a0abff8126f46faf1547c1743c37b21b4ea15b8f83"
-
-const detachedSignatureP256Hex = "885e0400130a0006050256e5bb00000a0910d44a2c495918513edef001009841a4f792beb0befccb35c8838a6a87d9b936beaa86db6745ddc7b045eee0cf00fd1ac1f78306b17e965935dd3f8bae4587a76587e4af231efe19cc4011a8434817"
-
-const testKeys1And2Hex = "988d044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd0011010001b41054657374204b6579203120285253412988b804130102002205024d3c5c10021b03060b090807030206150802090a0b0416020301021e01021780000a0910a34d7e18c20c31bbb5b304009cc45fe610b641a2c146331be94dade0a396e73ca725e1b25c21708d9cab46ecca5ccebc23055879df8f99eea39b377962a400f2ebdc36a7c99c333d74aeba346315137c3ff9d0a09b0273299090343048afb8107cf94cbd1400e3026f0ccac7ecebbc4d78588eb3e478fe2754d3ca664bcf3eac96ca4a6b0c8d7df5102f60f6b0020003b88d044d3c5c10010400b201df61d67487301f11879d514f4248ade90c8f68c7af1284c161098de4c28c2850f1ec7b8e30f959793e571542ffc6532189409cb51c3d30dad78c4ad5165eda18b20d9826d8707d0f742e2ab492103a85bbd9ddf4f5720f6de7064feb0d39ee002219765bb07bcfb8b877f47abe270ddeda4f676108cecb6b9bb2ad484a4f0011010001889f04180102000905024d3c5c10021b0c000a0910a34d7e18c20c31bb1a03040085c8d62e16d05dc4e9dad64953c8a2eed8b6c12f92b1575eeaa6dcf7be9473dd5b24b37b6dffbb4e7c99ed1bd3cb11634be19b3e6e207bed7505c7ca111ccf47cb323bf1f8851eb6360e8034cbff8dd149993c959de89f8f77f38e7e98b8e3076323aa719328e2b408db5ec0d03936efd57422ba04f925cdc7b4c1af7590e40ab0020003988d044d3c5c33010400b488c3e5f83f4d561f317817538d9d0397981e9aef1321ca68ebfae1cf8b7d388e19f4b5a24a82e2fbbf1c6c26557a6c5845307a03d815756f564ac7325b02bc83e87d5480a8fae848f07cb891f2d51ce7df83dcafdc12324517c86d472cc0ee10d47a68fd1d9ae49a6c19bbd36d82af597a0d88cc9c49de9df4e696fc1f0b5d0011010001b42754657374204b6579203220285253412c20656e637279707465642070726976617465206b65792988b804130102002205024d3c5c33021b03060b090807030206150802090a0b0416020301021e01021780000a0910d4984f961e35246b98940400908a73b6a6169f700434f076c6c79015a49bee37130eaf23aaa3cfa9ce60bfe4acaa7bc95f1146ada5867e0079babb38804891f4f0b8ebca57a86b249dee786161a755b7a342e68ccf3f78ed6440a93a6626beb9a37aa66afcd4f888790cb4bb46d94a4ae3eb3d7d3e6b00f6bfec940303e89ec5b32a1eaaacce66497d539328b0020003b88d044d3c5c33010400a4e913f9442abcc7f1804ccab27d2f787ffa592077ca935a8bb23165bd8d57576acac647cc596b2c3f814518cc8c82953c7a4478f32e0cf645630a5ba38d9618ef2bc3add69d459ae3dece5cab778938d988239f8c5ae437807075e06c828019959c644ff05ef6a5a1dab72227c98e3a040b0cf219026640698d7a13d8538a570011010001889f04180102000905024d3c5c33021b0c000a0910d4984f961e35246b26c703ff7ee29ef53bc1ae1ead533c408fa136db508434e233d6e62be621e031e5940bbd4c08142aed0f82217e7c3e1ec8de574bc06ccf3c36633be41ad78a9eacd209f861cae7b064100758545cc9dd83db71806dc1cfd5fb9ae5c7474bba0c19c44034ae61bae5eca379383339dece94ff56ff7aa44a582f3e5c38f45763af577c0934b0020003"
-
-const testKeys1And2PrivateHex = "9501d8044d3c5c10010400b1d13382944bd5aba23a4312968b5095d14f947f600eb478e14a6fcb16b0e0cac764884909c020bc495cfcc39a935387c661507bdb236a0612fb582cac3af9b29cc2c8c70090616c41b662f4da4c1201e195472eb7f4ae1ccbcbf9940fe21d985e379a5563dde5b9a23d35f1cfaa5790da3b79db26f23695107bfaca8e7b5bcd00110100010003ff4d91393b9a8e3430b14d6209df42f98dc927425b881f1209f319220841273a802a97c7bdb8b3a7740b3ab5866c4d1d308ad0d3a79bd1e883aacf1ac92dfe720285d10d08752a7efe3c609b1d00f17f2805b217be53999a7da7e493bfc3e9618fd17018991b8128aea70a05dbce30e4fbe626aa45775fa255dd9177aabf4df7cf0200c1ded12566e4bc2bb590455e5becfb2e2c9796482270a943343a7835de41080582c2be3caf5981aa838140e97afa40ad652a0b544f83eb1833b0957dce26e47b0200eacd6046741e9ce2ec5beb6fb5e6335457844fb09477f83b050a96be7da043e17f3a9523567ed40e7a521f818813a8b8a72209f1442844843ccc7eb9805442570200bdafe0438d97ac36e773c7162028d65844c4d463e2420aa2228c6e50dc2743c3d6c72d0d782a5173fe7be2169c8a9f4ef8a7cf3e37165e8c61b89c346cdc6c1799d2b41054657374204b6579203120285253412988b804130102002205024d3c5c10021b03060b090807030206150802090a0b0416020301021e01021780000a0910a34d7e18c20c31bbb5b304009cc45fe610b641a2c146331be94dade0a396e73ca725e1b25c21708d9cab46ecca5ccebc23055879df8f99eea39b377962a400f2ebdc36a7c99c333d74aeba346315137c3ff9d0a09b0273299090343048afb8107cf94cbd1400e3026f0ccac7ecebbc4d78588eb3e478fe2754d3ca664bcf3eac96ca4a6b0c8d7df5102f60f6b00200009d01d8044d3c5c10010400b201df61d67487301f11879d514f4248ade90c8f68c7af1284c161098de4c28c2850f1ec7b8e30f959793e571542ffc6532189409cb51c3d30dad78c4ad5165eda18b20d9826d8707d0f742e2ab492103a85bbd9ddf4f5720f6de7064feb0d39ee002219765bb07bcfb8b877f47abe270ddeda4f676108cecb6b9bb2ad484a4f00110100010003fd17a7490c22a79c59281fb7b20f5e6553ec0c1637ae382e8adaea295f50241037f8997cf42c1ce26417e015091451b15424b2c59eb8d4161b0975630408e394d3b00f88d4b4e18e2cc85e8251d4753a27c639c83f5ad4a571c4f19d7cd460b9b73c25ade730c99df09637bd173d8e3e981ac64432078263bb6dc30d3e974150dd0200d0ee05be3d4604d2146fb0457f31ba17c057560785aa804e8ca5530a7cd81d3440d0f4ba6851efcfd3954b7e68908fc0ba47f7ac37bf559c6c168b70d3a7c8cd0200da1c677c4bce06a068070f2b3733b0a714e88d62aa3f9a26c6f5216d48d5c2b5624144f3807c0df30be66b3268eeeca4df1fbded58faf49fc95dc3c35f134f8b01fd1396b6c0fc1b6c4f0eb8f5e44b8eace1e6073e20d0b8bc5385f86f1cf3f050f66af789f3ef1fc107b7f4421e19e0349c730c68f0a226981f4e889054fdb4dc149e8e889f04180102000905024d3c5c10021b0c000a0910a34d7e18c20c31bb1a03040085c8d62e16d05dc4e9dad64953c8a2eed8b6c12f92b1575eeaa6dcf7be9473dd5b24b37b6dffbb4e7c99ed1bd3cb11634be19b3e6e207bed7505c7ca111ccf47cb323bf1f8851eb6360e8034cbff8dd149993c959de89f8f77f38e7e98b8e3076323aa719328e2b408db5ec0d03936efd57422ba04f925cdc7b4c1af7590e40ab00200009501fe044d3c5c33010400b488c3e5f83f4d561f317817538d9d0397981e9aef1321ca68ebfae1cf8b7d388e19f4b5a24a82e2fbbf1c6c26557a6c5845307a03d815756f564ac7325b02bc83e87d5480a8fae848f07cb891f2d51ce7df83dcafdc12324517c86d472cc0ee10d47a68fd1d9ae49a6c19bbd36d82af597a0d88cc9c49de9df4e696fc1f0b5d0011010001fe030302e9030f3c783e14856063f16938530e148bc57a7aa3f3e4f90df9dceccdc779bc0835e1ad3d006e4a8d7b36d08b8e0de5a0d947254ecfbd22037e6572b426bcfdc517796b224b0036ff90bc574b5509bede85512f2eefb520fb4b02aa523ba739bff424a6fe81c5041f253f8d757e69a503d3563a104d0d49e9e890b9d0c26f96b55b743883b472caa7050c4acfd4a21f875bdf1258d88bd61224d303dc9df77f743137d51e6d5246b88c406780528fd9a3e15bab5452e5b93970d9dcc79f48b38651b9f15bfbcf6da452837e9cc70683d1bdca94507870f743e4ad902005812488dd342f836e72869afd00ce1850eea4cfa53ce10e3608e13d3c149394ee3cbd0e23d018fcbcb6e2ec5a1a22972d1d462ca05355d0d290dd2751e550d5efb38c6c89686344df64852bf4ff86638708f644e8ec6bd4af9b50d8541cb91891a431326ab2e332faa7ae86cfb6e0540aa63160c1e5cdd5a4add518b303fff0a20117c6bc77f7cfbaf36b04c865c6c2b42754657374204b6579203220285253412c20656e637279707465642070726976617465206b65792988b804130102002205024d3c5c33021b03060b090807030206150802090a0b0416020301021e01021780000a0910d4984f961e35246b98940400908a73b6a6169f700434f076c6c79015a49bee37130eaf23aaa3cfa9ce60bfe4acaa7bc95f1146ada5867e0079babb38804891f4f0b8ebca57a86b249dee786161a755b7a342e68ccf3f78ed6440a93a6626beb9a37aa66afcd4f888790cb4bb46d94a4ae3eb3d7d3e6b00f6bfec940303e89ec5b32a1eaaacce66497d539328b00200009d01fe044d3c5c33010400a4e913f9442abcc7f1804ccab27d2f787ffa592077ca935a8bb23165bd8d57576acac647cc596b2c3f814518cc8c82953c7a4478f32e0cf645630a5ba38d9618ef2bc3add69d459ae3dece5cab778938d988239f8c5ae437807075e06c828019959c644ff05ef6a5a1dab72227c98e3a040b0cf219026640698d7a13d8538a570011010001fe030302e9030f3c783e148560f936097339ae381d63116efcf802ff8b1c9360767db5219cc987375702a4123fd8657d3e22700f23f95020d1b261eda5257e9a72f9a918e8ef22dd5b3323ae03bbc1923dd224db988cadc16acc04b120a9f8b7e84da9716c53e0334d7b66586ddb9014df604b41be1e960dcfcbc96f4ed150a1a0dd070b9eb14276b9b6be413a769a75b519a53d3ecc0c220e85cd91ca354d57e7344517e64b43b6e29823cbd87eae26e2b2e78e6dedfbb76e3e9f77bcb844f9a8932eb3db2c3f9e44316e6f5d60e9e2a56e46b72abe6b06dc9a31cc63f10023d1f5e12d2a3ee93b675c96f504af0001220991c88db759e231b3320dcedf814dcf723fd9857e3d72d66a0f2af26950b915abdf56c1596f46a325bf17ad4810d3535fb02a259b247ac3dbd4cc3ecf9c51b6c07cebb009c1506fba0a89321ec8683e3fd009a6e551d50243e2d5092fefb3321083a4bad91320dc624bd6b5dddf93553e3d53924c05bfebec1fb4bd47e89a1a889f04180102000905024d3c5c33021b0c000a0910d4984f961e35246b26c703ff7ee29ef53bc1ae1ead533c408fa136db508434e233d6e62be621e031e5940bbd4c08142aed0f82217e7c3e1ec8de574bc06ccf3c36633be41ad78a9eacd209f861cae7b064100758545cc9dd83db71806dc1cfd5fb9ae5c7474bba0c19c44034ae61bae5eca379383339dece94ff56ff7aa44a582f3e5c38f45763af577c0934b0020000"
-
-const dsaElGamalTestKeysHex = "9501e1044dfcb16a110400aa3e5c1a1f43dd28c2ffae8abf5cfce555ee874134d8ba0a0f7b868ce2214beddc74e5e1e21ded354a95d18acdaf69e5e342371a71fbb9093162e0c5f3427de413a7f2c157d83f5cd2f9d791256dc4f6f0e13f13c3302af27f2384075ab3021dff7a050e14854bbde0a1094174855fc02f0bae8e00a340d94a1f22b32e48485700a0cec672ac21258fb95f61de2ce1af74b2c4fa3e6703ff698edc9be22c02ae4d916e4fa223f819d46582c0516235848a77b577ea49018dcd5e9e15cff9dbb4663a1ae6dd7580fa40946d40c05f72814b0f88481207e6c0832c3bded4853ebba0a7e3bd8e8c66df33d5a537cd4acf946d1080e7a3dcea679cb2b11a72a33a2b6a9dc85f466ad2ddf4c3db6283fa645343286971e3dd700703fc0c4e290d45767f370831a90187e74e9972aae5bff488eeff7d620af0362bfb95c1a6c3413ab5d15a2e4139e5d07a54d72583914661ed6a87cce810be28a0aa8879a2dd39e52fb6fe800f4f181ac7e328f740cde3d09a05cecf9483e4cca4253e60d4429ffd679d9996a520012aad119878c941e3cf151459873bdfc2a9563472fe0303027a728f9feb3b864260a1babe83925ce794710cfd642ee4ae0e5b9d74cee49e9c67b6cd0ea5dfbb582132195a121356a1513e1bca73e5b80c58c7ccb4164453412f456c47616d616c2054657374204b65792031886204131102002205024dfcb16a021b03060b090807030206150802090a0b0416020301021e01021780000a091033af447ccd759b09fadd00a0b8fd6f5a790bad7e9f2dbb7632046dc4493588db009c087c6a9ba9f7f49fab221587a74788c00db4889ab00200009d0157044dfcb16a1004008dec3f9291205255ccff8c532318133a6840739dd68b03ba942676f9038612071447bf07d00d559c5c0875724ea16a4c774f80d8338b55fca691a0522e530e604215b467bbc9ccfd483a1da99d7bc2648b4318fdbd27766fc8bfad3fddb37c62b8ae7ccfe9577e9b8d1e77c1d417ed2c2ef02d52f4da11600d85d3229607943700030503ff506c94c87c8cab778e963b76cf63770f0a79bf48fb49d3b4e52234620fc9f7657f9f8d56c96a2b7c7826ae6b57ebb2221a3fe154b03b6637cea7e6d98e3e45d87cf8dc432f723d3d71f89c5192ac8d7290684d2c25ce55846a80c9a7823f6acd9bb29fa6cd71f20bc90eccfca20451d0c976e460e672b000df49466408d527affe0303027a728f9feb3b864260abd761730327bca2aaa4ea0525c175e92bf240682a0e83b226f97ecb2e935b62c9a133858ce31b271fa8eb41f6a1b3cd72a63025ce1a75ee4180dcc284884904181102000905024dfcb16a021b0c000a091033af447ccd759b09dd0b009e3c3e7296092c81bee5a19929462caaf2fff3ae26009e218c437a2340e7ea628149af1ec98ec091a43992b00200009501e1044dfcb1be1104009f61faa61aa43df75d128cbe53de528c4aec49ce9360c992e70c77072ad5623de0a3a6212771b66b39a30dad6781799e92608316900518ec01184a85d872365b7d2ba4bacfb5882ea3c2473d3750dc6178cc1cf82147fb58caa28b28e9f12f6d1efcb0534abed644156c91cca4ab78834268495160b2400bc422beb37d237c2300a0cac94911b6d493bda1e1fbc6feeca7cb7421d34b03fe22cec6ccb39675bb7b94a335c2b7be888fd3906a1125f33301d8aa6ec6ee6878f46f73961c8d57a3e9544d8ef2a2cbfd4d52da665b1266928cfe4cb347a58c412815f3b2d2369dec04b41ac9a71cc9547426d5ab941cccf3b18575637ccfb42df1a802df3cfe0a999f9e7109331170e3a221991bf868543960f8c816c28097e503fe319db10fb98049f3a57d7c80c420da66d56f3644371631fad3f0ff4040a19a4fedc2d07727a1b27576f75a4d28c47d8246f27071e12d7a8de62aad216ddbae6aa02efd6b8a3e2818cda48526549791ab277e447b3a36c57cefe9b592f5eab73959743fcc8e83cbefec03a329b55018b53eec196765ae40ef9e20521a603c551efe0303020950d53a146bf9c66034d00c23130cce95576a2ff78016ca471276e8227fb30b1ffbd92e61804fb0c3eff9e30b1a826ee8f3e4730b4d86273ca977b4164453412f456c47616d616c2054657374204b65792032886204131102002205024dfcb1be021b03060b090807030206150802090a0b0416020301021e01021780000a0910a86bf526325b21b22bd9009e34511620415c974750a20df5cb56b182f3b48e6600a0a9466cb1a1305a84953445f77d461593f1d42bc1b00200009d0157044dfcb1be1004009565a951da1ee87119d600c077198f1c1bceb0f7aa54552489298e41ff788fa8f0d43a69871f0f6f77ebdfb14a4260cf9fbeb65d5844b4272a1904dd95136d06c3da745dc46327dd44a0f16f60135914368c8039a34033862261806bb2c5ce1152e2840254697872c85441ccb7321431d75a747a4bfb1d2c66362b51ce76311700030503fc0ea76601c196768070b7365a200e6ddb09307f262d5f39eec467b5f5784e22abdf1aa49226f59ab37cb49969d8f5230ea65caf56015abda62604544ed526c5c522bf92bed178a078789f6c807b6d34885688024a5bed9e9f8c58d11d4b82487b44c5f470c5606806a0443b79cadb45e0f897a561a53f724e5349b9267c75ca17fe0303020950d53a146bf9c660bc5f4ce8f072465e2d2466434320c1e712272fafc20e342fe7608101580fa1a1a367e60486a7cd1246b7ef5586cf5e10b32762b710a30144f12dd17dd4884904181102000905024dfcb1be021b0c000a0910a86bf526325b21b2904c00a0b2b66b4b39ccffda1d10f3ea8d58f827e30a8b8e009f4255b2d8112a184e40cde43a34e8655ca7809370b0020000"
-
-const signedMessageHex = "a3019bc0cbccc0c4b8d8b74ee2108fe16ec6d3ca490cbe362d3f8333d3f352531472538b8b13d353b97232f352158c20943157c71c16064626063656269052062e4e01987e9b6fccff4b7df3a34c534b23e679cbec3bc0f8f6e64dfb4b55fe3f8efa9ce110ddb5cd79faf1d753c51aecfa669f7e7aa043436596cccc3359cb7dd6bbe9ecaa69e5989d9e57209571edc0b2fa7f57b9b79a64ee6e99ce1371395fee92fec2796f7b15a77c386ff668ee27f6d38f0baa6c438b561657377bf6acff3c5947befd7bf4c196252f1d6e5c524d0300"
-
-const signedTextMessageHex = "a3019bc0cbccc8c4b8d8b74ee2108fe16ec6d36a250cbece0c178233d3f352531472538b8b13d35379b97232f352158ca0b4312f57c71c1646462606365626906a062e4e019811591798ff99bf8afee860b0d8a8c2a85c3387e3bcf0bb3b17987f2bbcfab2aa526d930cbfd3d98757184df3995c9f3e7790e36e3e9779f06089d4c64e9e47dd6202cb6e9bc73c5d11bb59fbaf89d22d8dc7cf199ddf17af96e77c5f65f9bbed56f427bd8db7af37f6c9984bf9385efaf5f184f986fb3e6adb0ecfe35bbf92d16a7aa2a344fb0bc52fb7624f0200"
-
-const signedEncryptedMessageHex = "848c032a67d68660df41c70103ff5789d0de26b6a50c985a02a13131ca829c413a35d0e6fa8d6842599252162808ac7439c72151c8c6183e76923fe3299301414d0c25a2f06a2257db3839e7df0ec964773f6e4c4ac7ff3b48c444237166dd46ba8ff443a5410dc670cb486672fdbe7c9dfafb75b4fea83af3a204fe2a7dfa86bd20122b4f3d2646cbeecb8f7be8d2c03b018bd210b1d3791e1aba74b0f1034e122ab72e760492c192383cf5e20b5628bd043272d63df9b923f147eb6091cd897553204832aba48fec54aa447547bb16305a1024713b90e77fd0065f1918271947549205af3c74891af22ee0b56cd29bfec6d6e351901cd4ab3ece7c486f1e32a792d4e474aed98ee84b3f591c7dff37b64e0ecd68fd036d517e412dcadf85840ce184ad7921ad446c4ee28db80447aea1ca8d4f574db4d4e37688158ddd19e14ee2eab4873d46947d65d14a23e788d912cf9a19624ca7352469b72a83866b7c23cb5ace3deab3c7018061b0ba0f39ed2befe27163e5083cf9b8271e3e3d52cc7ad6e2a3bd81d4c3d7022f8d"
-
-const signedEncryptedMessage2Hex = "85010e03cf6a7abcd43e36731003fb057f5495b79db367e277cdbe4ab90d924ddee0c0381494112ff8c1238fb0184af35d1731573b01bc4c55ecacd2aafbe2003d36310487d1ecc9ac994f3fada7f9f7f5c3a64248ab7782906c82c6ff1303b69a84d9a9529c31ecafbcdb9ba87e05439897d87e8a2a3dec55e14df19bba7f7bd316291c002ae2efd24f83f9e3441203fc081c0c23dc3092a454ca8a082b27f631abf73aca341686982e8fbda7e0e7d863941d68f3de4a755c2964407f4b5e0477b3196b8c93d551dd23c8beef7d0f03fbb1b6066f78907faf4bf1677d8fcec72651124080e0b7feae6b476e72ab207d38d90b958759fdedfc3c6c35717c9dbfc979b3cfbbff0a76d24a5e57056bb88acbd2a901ef64bc6e4db02adc05b6250ff378de81dca18c1910ab257dff1b9771b85bb9bbe0a69f5989e6d1710a35e6dfcceb7d8fb5ccea8db3932b3d9ff3fe0d327597c68b3622aec8e3716c83a6c93f497543b459b58ba504ed6bcaa747d37d2ca746fe49ae0a6ce4a8b694234e941b5159ff8bd34b9023da2814076163b86f40eed7c9472f81b551452d5ab87004a373c0172ec87ea6ce42ccfa7dbdad66b745496c4873d8019e8c28d6b3"
-
-const symmetricallyEncryptedCompressedHex = "8c0d04030302eb4a03808145d0d260c92f714339e13de5a79881216431925bf67ee2898ea61815f07894cd0703c50d0a76ef64d482196f47a8bc729af9b80bb6"
-
-const dsaTestKeyHex = "9901a2044d6c49de110400cb5ce438cf9250907ac2ba5bf6547931270b89f7c4b53d9d09f4d0213a5ef2ec1f26806d3d259960f872a4a102ef1581ea3f6d6882d15134f21ef6a84de933cc34c47cc9106efe3bd84c6aec12e78523661e29bc1a61f0aab17fa58a627fd5fd33f5149153fbe8cd70edf3d963bc287ef875270ff14b5bfdd1bca4483793923b00a0fe46d76cb6e4cbdc568435cd5480af3266d610d303fe33ae8273f30a96d4d34f42fa28ce1112d425b2e3bf7ea553d526e2db6b9255e9dc7419045ce817214d1a0056dbc8d5289956a4b1b69f20f1105124096e6a438f41f2e2495923b0f34b70642607d45559595c7fe94d7fa85fc41bf7d68c1fd509ebeaa5f315f6059a446b9369c277597e4f474a9591535354c7e7f4fd98a08aa60400b130c24ff20bdfbf683313f5daebf1c9b34b3bdadfc77f2ddd72ee1fb17e56c473664bc21d66467655dd74b9005e3a2bacce446f1920cd7017231ae447b67036c9b431b8179deacd5120262d894c26bc015bffe3d827ba7087ad9b700d2ca1f6d16cc1786581e5dd065f293c31209300f9b0afcc3f7c08dd26d0a22d87580b4db41054657374204b65792033202844534129886204131102002205024d6c49de021b03060b090807030206150802090a0b0416020301021e01021780000a0910338934250ccc03607e0400a0bdb9193e8a6b96fc2dfc108ae848914b504481f100a09c4dc148cb693293a67af24dd40d2b13a9e36794"
-
-const dsaTestKeyPrivateHex = "9501bb044d6c49de110400cb5ce438cf9250907ac2ba5bf6547931270b89f7c4b53d9d09f4d0213a5ef2ec1f26806d3d259960f872a4a102ef1581ea3f6d6882d15134f21ef6a84de933cc34c47cc9106efe3bd84c6aec12e78523661e29bc1a61f0aab17fa58a627fd5fd33f5149153fbe8cd70edf3d963bc287ef875270ff14b5bfdd1bca4483793923b00a0fe46d76cb6e4cbdc568435cd5480af3266d610d303fe33ae8273f30a96d4d34f42fa28ce1112d425b2e3bf7ea553d526e2db6b9255e9dc7419045ce817214d1a0056dbc8d5289956a4b1b69f20f1105124096e6a438f41f2e2495923b0f34b70642607d45559595c7fe94d7fa85fc41bf7d68c1fd509ebeaa5f315f6059a446b9369c277597e4f474a9591535354c7e7f4fd98a08aa60400b130c24ff20bdfbf683313f5daebf1c9b34b3bdadfc77f2ddd72ee1fb17e56c473664bc21d66467655dd74b9005e3a2bacce446f1920cd7017231ae447b67036c9b431b8179deacd5120262d894c26bc015bffe3d827ba7087ad9b700d2ca1f6d16cc1786581e5dd065f293c31209300f9b0afcc3f7c08dd26d0a22d87580b4d00009f592e0619d823953577d4503061706843317e4fee083db41054657374204b65792033202844534129886204131102002205024d6c49de021b03060b090807030206150802090a0b0416020301021e01021780000a0910338934250ccc03607e0400a0bdb9193e8a6b96fc2dfc108ae848914b504481f100a09c4dc148cb693293a67af24dd40d2b13a9e36794"
-
-const p256TestKeyHex = "98520456e5b83813082a8648ce3d030107020304a2072cd6d21321266c758cc5b83fab0510f751cb8d91897cddb7047d8d6f185546e2107111b0a95cb8ef063c33245502af7a65f004d5919d93ee74eb71a66253b424502d3235362054657374204b6579203c696e76616c6964406578616d706c652e636f6d3e8879041313080021050256e5b838021b03050b09080702061508090a0b020416020301021e01021780000a0910d44a2c495918513e54e50100dfa64f97d9b47766fc1943c6314ba3f2b2a103d71ad286dc5b1efb96a345b0c80100dbc8150b54241f559da6ef4baacea6d31902b4f4b1bdc09b34bf0502334b7754b8560456e5b83812082a8648ce3d030107020304bfe3cea9cee13486f8d518aa487fecab451f25467d2bf08e58f63e5fa525d5482133e6a79299c274b068ef0be448152ad65cf11cf764348588ca4f6a0bcf22b6030108078861041813080009050256e5b838021b0c000a0910d44a2c495918513e4a4800ff49d589fa64024ad30be363a032e3a0e0e6f5db56ba4c73db850518bf0121b8f20100fd78e065f4c70ea5be9df319ea67e493b936fc78da834a71828043d3154af56e"
-
-const p256TestKeyPrivateHex = "94a50456e5b83813082a8648ce3d030107020304a2072cd6d21321266c758cc5b83fab0510f751cb8d91897cddb7047d8d6f185546e2107111b0a95cb8ef063c33245502af7a65f004d5919d93ee74eb71a66253fe070302f0c2bfb0b6c30f87ee1599472b8636477eab23ced13b271886a4b50ed34c9d8436af5af5b8f88921f0efba6ef8c37c459bbb88bc1c6a13bbd25c4ce9b1e97679569ee77645d469bf4b43de637f5561b424502d3235362054657374204b6579203c696e76616c6964406578616d706c652e636f6d3e8879041313080021050256e5b838021b03050b09080702061508090a0b020416020301021e01021780000a0910d44a2c495918513e54e50100dfa64f97d9b47766fc1943c6314ba3f2b2a103d71ad286dc5b1efb96a345b0c80100dbc8150b54241f559da6ef4baacea6d31902b4f4b1bdc09b34bf0502334b77549ca90456e5b83812082a8648ce3d030107020304bfe3cea9cee13486f8d518aa487fecab451f25467d2bf08e58f63e5fa525d5482133e6a79299c274b068ef0be448152ad65cf11cf764348588ca4f6a0bcf22b603010807fe0703027510012471a603cfee2968dce19f732721ddf03e966fd133b4e3c7a685b788705cbc46fb026dc94724b830c9edbaecd2fb2c662f23169516cacd1fe423f0475c364ecc10abcabcfd4bbbda1a36a1bd8861041813080009050256e5b838021b0c000a0910d44a2c495918513e4a4800ff49d589fa64024ad30be363a032e3a0e0e6f5db56ba4c73db850518bf0121b8f20100fd78e065f4c70ea5be9df319ea67e493b936fc78da834a71828043d3154af56e"
-
-const armoredPrivateKeyBlock = `-----BEGIN PGP PRIVATE KEY BLOCK-----
-Version: GnuPG v1.4.10 (GNU/Linux)
-
-lQHYBE2rFNoBBADFwqWQIW/DSqcB4yCQqnAFTJ27qS5AnB46ccAdw3u4Greeu3Bp
-idpoHdjULy7zSKlwR1EA873dO/k/e11Ml3dlAFUinWeejWaK2ugFP6JjiieSsrKn
-vWNicdCS4HTWn0X4sjl0ZiAygw6GNhqEQ3cpLeL0g8E9hnYzJKQ0LWJa0QARAQAB
-AAP/TB81EIo2VYNmTq0pK1ZXwUpxCrvAAIG3hwKjEzHcbQznsjNvPUihZ+NZQ6+X
-0HCfPAdPkGDCLCb6NavcSW+iNnLTrdDnSI6+3BbIONqWWdRDYJhqZCkqmG6zqSfL
-IdkJgCw94taUg5BWP/AAeQrhzjChvpMQTVKQL5mnuZbUCeMCAN5qrYMP2S9iKdnk
-VANIFj7656ARKt/nf4CBzxcpHTyB8+d2CtPDKCmlJP6vL8t58Jmih+kHJMvC0dzn
-gr5f5+sCAOOe5gt9e0am7AvQWhdbHVfJU0TQJx+m2OiCJAqGTB1nvtBLHdJnfdC9
-TnXXQ6ZXibqLyBies/xeY2sCKL5qtTMCAKnX9+9d/5yQxRyrQUHt1NYhaXZnJbHx
-q4ytu0eWz+5i68IYUSK69jJ1NWPM0T6SkqpB3KCAIv68VFm9PxqG1KmhSrQIVGVz
-dCBLZXmIuAQTAQIAIgUCTasU2gIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA
-CgkQO9o98PRieSoLhgQAkLEZex02Qt7vGhZzMwuN0R22w3VwyYyjBx+fM3JFETy1
-ut4xcLJoJfIaF5ZS38UplgakHG0FQ+b49i8dMij0aZmDqGxrew1m4kBfjXw9B/v+
-eIqpODryb6cOSwyQFH0lQkXC040pjq9YqDsO5w0WYNXYKDnzRV0p4H1pweo2VDid
-AdgETasU2gEEAN46UPeWRqKHvA99arOxee38fBt2CI08iiWyI8T3J6ivtFGixSqV
-bRcPxYO/qLpVe5l84Nb3X71GfVXlc9hyv7CD6tcowL59hg1E/DC5ydI8K8iEpUmK
-/UnHdIY5h8/kqgGxkY/T/hgp5fRQgW1ZoZxLajVlMRZ8W4tFtT0DeA+JABEBAAEA
-A/0bE1jaaZKj6ndqcw86jd+QtD1SF+Cf21CWRNeLKnUds4FRRvclzTyUMuWPkUeX
-TaNNsUOFqBsf6QQ2oHUBBK4VCHffHCW4ZEX2cd6umz7mpHW6XzN4DECEzOVksXtc
-lUC1j4UB91DC/RNQqwX1IV2QLSwssVotPMPqhOi0ZLNY7wIA3n7DWKInxYZZ4K+6
-rQ+POsz6brEoRHwr8x6XlHenq1Oki855pSa1yXIARoTrSJkBtn5oI+f8AzrnN0BN
-oyeQAwIA/7E++3HDi5aweWrViiul9cd3rcsS0dEnksPhvS0ozCJiHsq/6GFmy7J8
-QSHZPteedBnZyNp5jR+H7cIfVN3KgwH/Skq4PsuPhDq5TKK6i8Pc1WW8MA6DXTdU
-nLkX7RGmMwjC0DBf7KWAlPjFaONAX3a8ndnz//fy1q7u2l9AZwrj1qa1iJ8EGAEC
-AAkFAk2rFNoCGwwACgkQO9o98PRieSo2/QP/WTzr4ioINVsvN1akKuekmEMI3LAp
-BfHwatufxxP1U+3Si/6YIk7kuPB9Hs+pRqCXzbvPRrI8NHZBmc8qIGthishdCYad
-AHcVnXjtxrULkQFGbGvhKURLvS9WnzD/m1K2zzwxzkPTzT9/Yf06O6Mal5AdugPL
-VrM0m72/jnpKo04=
-=zNCn
------END PGP PRIVATE KEY BLOCK-----`
-
-const e2ePublicKey = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Charset: UTF-8
-
-xv8AAABSBAAAAAATCCqGSM49AwEHAgME1LRoXSpOxtHXDUdmuvzchyg6005qIBJ4
-sfaSxX7QgH9RV2ONUhC+WiayCNADq+UMzuR/vunSr4aQffXvuGnR383/AAAAFDxk
-Z2lsQHlhaG9vLWluYy5jb20+wv8AAACGBBATCAA4/wAAAAWCVGvAG/8AAAACiwn/
-AAAACZC2VkQCOjdvYf8AAAAFlQgJCgv/AAAAA5YBAv8AAAACngEAAE1BAP0X8veD
-24IjmI5/C6ZAfVNXxgZZFhTAACFX75jUA3oD6AEAzoSwKf1aqH6oq62qhCN/pekX
-+WAsVMBhNwzLpqtCRjLO/wAAAFYEAAAAABIIKoZIzj0DAQcCAwT50ain7vXiIRv8
-B1DO3x3cE/aattZ5sHNixJzRCXi2vQIA5QmOxZ6b5jjUekNbdHG3SZi1a2Ak5mfX
-fRxC/5VGAwEIB8L/AAAAZQQYEwgAGP8AAAAFglRrwBz/AAAACZC2VkQCOjdvYQAA
-FJAA9isX3xtGyMLYwp2F3nXm7QEdY5bq5VUcD/RJlj792VwA/1wH0pCzVLl4Q9F9
-ex7En5r7rHR5xwX82Msc+Rq9dSyO
-=7MrZ
------END PGP PUBLIC KEY BLOCK-----`
-
-const dsaKeyWithSHA512 = `9901a2044f04b07f110400db244efecc7316553ee08d179972aab87bb1214de7692593fcf5b6feb1c80fba268722dd464748539b85b81d574cd2d7ad0ca2444de4d849b8756bad7768c486c83a824f9bba4af773d11742bdfb4ac3b89ef8cc9452d4aad31a37e4b630d33927bff68e879284a1672659b8b298222fc68f370f3e24dccacc4a862442b9438b00a0ea444a24088dc23e26df7daf8f43cba3bffc4fe703fe3d6cd7fdca199d54ed8ae501c30e3ec7871ea9cdd4cf63cfe6fc82281d70a5b8bb493f922cd99fba5f088935596af087c8d818d5ec4d0b9afa7f070b3d7c1dd32a84fca08d8280b4890c8da1dde334de8e3cad8450eed2a4a4fcc2db7b8e5528b869a74a7f0189e11ef097ef1253582348de072bb07a9fa8ab838e993cef0ee203ff49298723e2d1f549b00559f886cd417a41692ce58d0ac1307dc71d85a8af21b0cf6eaa14baf2922d3a70389bedf17cc514ba0febbd107675a372fe84b90162a9e88b14d4b1c6be855b96b33fb198c46f058568817780435b6936167ebb3724b680f32bf27382ada2e37a879b3d9de2abe0c3f399350afd1ad438883f4791e2e3b4184453412068617368207472756e636174696f6e207465737488620413110a002205024f04b07f021b03060b090807030206150802090a0b0416020301021e01021780000a0910ef20e0cefca131581318009e2bf3bf047a44d75a9bacd00161ee04d435522397009a03a60d51bd8a568c6c021c8d7cf1be8d990d6417b0020003`
-
-const unknownHashFunctionHex = `8a00000040040001990006050253863c24000a09103b4fe6acc0b21f32ffff01010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101010101`
-
-const missingHashFunctionHex = `8a00000040040001030006050253863c24000a09103b4fe6acc0b21f32ffff0101010101010101010101010101010101010101010101010101010101010101010101010101`
-
-const campbellQuine = `a0b001000300fcffa0b001000d00f2ff000300fcffa0b001000d00f2ff8270a01c00000500faff8270a01c00000500faff000500faff001400ebff8270a01c00000500faff000500faff001400ebff428821c400001400ebff428821c400001400ebff428821c400001400ebff428821c400001400ebff428821c400000000ffff000000ffff000b00f4ff428821c400000000ffff000000ffff000b00f4ff0233214c40000100feff000233214c40000100feff0000`
-
-const keyV4forVerifyingSignedMessageV3 = `-----BEGIN PGP PUBLIC KEY BLOCK-----
-Comment: GPGTools - https://gpgtools.org
-
-mI0EVfxoFQEEAMBIqmbDfYygcvP6Phr1wr1XI41IF7Qixqybs/foBF8qqblD9gIY
-BKpXjnBOtbkcVOJ0nljd3/sQIfH4E0vQwK5/4YRQSI59eKOqd6Fx+fWQOLG+uu6z
-tewpeCj9LLHvibx/Sc7VWRnrznia6ftrXxJ/wHMezSab3tnGC0YPVdGNABEBAAG0
-JEdvY3J5cHRvIFRlc3QgS2V5IDx0aGVtYXhAZ21haWwuY29tPoi5BBMBCgAjBQJV
-/GgVAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AACgkQeXnQmhdGW9PFVAP+
-K7TU0qX5ArvIONIxh/WAweyOk884c5cE8f+3NOPOOCRGyVy0FId5A7MmD5GOQh4H
-JseOZVEVCqlmngEvtHZb3U1VYtVGE5WZ+6rQhGsMcWP5qaT4soYwMBlSYxgYwQcx
-YhN9qOr292f9j2Y//TTIJmZT4Oa+lMxhWdqTfX+qMgG4jQRV/GgVAQQArhFSiij1
-b+hT3dnapbEU+23Z1yTu1DfF6zsxQ4XQWEV3eR8v+8mEDDNcz8oyyF56k6UQ3rXi
-UMTIwRDg4V6SbZmaFbZYCOwp/EmXJ3rfhm7z7yzXj2OFN22luuqbyVhuL7LRdB0M
-pxgmjXb4tTvfgKd26x34S+QqUJ7W6uprY4sAEQEAAYifBBgBCgAJBQJV/GgVAhsM
-AAoJEHl50JoXRlvT7y8D/02ckx4OMkKBZo7viyrBw0MLG92i+DC2bs35PooHR6zz
-786mitjOp5z2QWNLBvxC70S0qVfCIz8jKupO1J6rq6Z8CcbLF3qjm6h1omUBf8Nd
-EfXKD2/2HV6zMKVknnKzIEzauh+eCKS2CeJUSSSryap/QLVAjRnckaES/OsEWhNB
-=RZia
------END PGP PUBLIC KEY BLOCK-----
-`
-
-const signedMessageV3 = `-----BEGIN PGP MESSAGE-----
-Comment: GPGTools - https://gpgtools.org
-
-owGbwMvMwMVYWXlhlrhb9GXG03JJDKF/MtxDMjKLFYAoUaEktbhEITe1uDgxPVWP
-q5NhKjMrWAVcC9evD8z/bF/uWNjqtk/X3y5/38XGRQHm/57rrDRYuGnTw597Xqka
-uM3137/hH3Os+Jf2dc0fXOITKwJvXJvecPVs0ta+Vg7ZO1MLn8w58Xx+6L58mbka
-DGHyU9yTueZE8D+QF/Tz28Y78dqtF56R1VPn9Xw4uJqrWYdd7b3vIZ1V6R4Nh05d
-iT57d/OhWwA=
-=hG7R
------END PGP MESSAGE-----
-`
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go b/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go
deleted file mode 100644
index 4b9a44ca26..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package s2k implements the various OpenPGP string-to-key transforms as
-// specified in RFC 4800 section 3.7.1.
-package s2k // import "golang.org/x/crypto/openpgp/s2k"
-
-import (
-	"crypto"
-	"hash"
-	"io"
-	"strconv"
-
-	"golang.org/x/crypto/openpgp/errors"
-)
-
-// Config collects configuration parameters for s2k key-stretching
-// transformatioms. A nil *Config is valid and results in all default
-// values. Currently, Config is used only by the Serialize function in
-// this package.
-type Config struct {
-	// Hash is the default hash function to be used. If
-	// nil, SHA1 is used.
-	Hash crypto.Hash
-	// S2KCount is only used for symmetric encryption. It
-	// determines the strength of the passphrase stretching when
-	// the said passphrase is hashed to produce a key. S2KCount
-	// should be between 1024 and 65011712, inclusive. If Config
-	// is nil or S2KCount is 0, the value 65536 used. Not all
-	// values in the above range can be represented. S2KCount will
-	// be rounded up to the next representable value if it cannot
-	// be encoded exactly. When set, it is strongly encrouraged to
-	// use a value that is at least 65536. See RFC 4880 Section
-	// 3.7.1.3.
-	S2KCount int
-}
-
-func (c *Config) hash() crypto.Hash {
-	if c == nil || uint(c.Hash) == 0 {
-		// SHA1 is the historical default in this package.
-		return crypto.SHA1
-	}
-
-	return c.Hash
-}
-
-func (c *Config) encodedCount() uint8 {
-	if c == nil || c.S2KCount == 0 {
-		return 96 // The common case. Correspoding to 65536
-	}
-
-	i := c.S2KCount
-	switch {
-	// Behave like GPG. Should we make 65536 the lowest value used?
-	case i < 1024:
-		i = 1024
-	case i > 65011712:
-		i = 65011712
-	}
-
-	return encodeCount(i)
-}
-
-// encodeCount converts an iterative "count" in the range 1024 to
-// 65011712, inclusive, to an encoded count. The return value is the
-// octet that is actually stored in the GPG file. encodeCount panics
-// if i is not in the above range (encodedCount above takes care to
-// pass i in the correct range). See RFC 4880 Section 3.7.7.1.
-func encodeCount(i int) uint8 {
-	if i < 1024 || i > 65011712 {
-		panic("count arg i outside the required range")
-	}
-
-	for encoded := 0; encoded < 256; encoded++ {
-		count := decodeCount(uint8(encoded))
-		if count >= i {
-			return uint8(encoded)
-		}
-	}
-
-	return 255
-}
-
-// decodeCount returns the s2k mode 3 iterative "count" corresponding to
-// the encoded octet c.
-func decodeCount(c uint8) int {
-	return (16 + int(c&15)) << (uint32(c>>4) + 6)
-}
-
-// Simple writes to out the result of computing the Simple S2K function (RFC
-// 4880, section 3.7.1.1) using the given hash and input passphrase.
-func Simple(out []byte, h hash.Hash, in []byte) {
-	Salted(out, h, in, nil)
-}
-
-var zero [1]byte
-
-// Salted writes to out the result of computing the Salted S2K function (RFC
-// 4880, section 3.7.1.2) using the given hash, input passphrase and salt.
-func Salted(out []byte, h hash.Hash, in []byte, salt []byte) {
-	done := 0
-	var digest []byte
-
-	for i := 0; done < len(out); i++ {
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(zero[:])
-		}
-		h.Write(salt)
-		h.Write(in)
-		digest = h.Sum(digest[:0])
-		n := copy(out[done:], digest)
-		done += n
-	}
-}
-
-// Iterated writes to out the result of computing the Iterated and Salted S2K
-// function (RFC 4880, section 3.7.1.3) using the given hash, input passphrase,
-// salt and iteration count.
-func Iterated(out []byte, h hash.Hash, in []byte, salt []byte, count int) {
-	combined := make([]byte, len(in)+len(salt))
-	copy(combined, salt)
-	copy(combined[len(salt):], in)
-
-	if count < len(combined) {
-		count = len(combined)
-	}
-
-	done := 0
-	var digest []byte
-	for i := 0; done < len(out); i++ {
-		h.Reset()
-		for j := 0; j < i; j++ {
-			h.Write(zero[:])
-		}
-		written := 0
-		for written < count {
-			if written+len(combined) > count {
-				todo := count - written
-				h.Write(combined[:todo])
-				written = count
-			} else {
-				h.Write(combined)
-				written += len(combined)
-			}
-		}
-		digest = h.Sum(digest[:0])
-		n := copy(out[done:], digest)
-		done += n
-	}
-}
-
-// Parse reads a binary specification for a string-to-key transformation from r
-// and returns a function which performs that transform.
-func Parse(r io.Reader) (f func(out, in []byte), err error) {
-	var buf [9]byte
-
-	_, err = io.ReadFull(r, buf[:2])
-	if err != nil {
-		return
-	}
-
-	hash, ok := HashIdToHash(buf[1])
-	if !ok {
-		return nil, errors.UnsupportedError("hash for S2K function: " + strconv.Itoa(int(buf[1])))
-	}
-	if !hash.Available() {
-		return nil, errors.UnsupportedError("hash not available: " + strconv.Itoa(int(hash)))
-	}
-	h := hash.New()
-
-	switch buf[0] {
-	case 0:
-		f := func(out, in []byte) {
-			Simple(out, h, in)
-		}
-		return f, nil
-	case 1:
-		_, err = io.ReadFull(r, buf[:8])
-		if err != nil {
-			return
-		}
-		f := func(out, in []byte) {
-			Salted(out, h, in, buf[:8])
-		}
-		return f, nil
-	case 3:
-		_, err = io.ReadFull(r, buf[:9])
-		if err != nil {
-			return
-		}
-		count := decodeCount(buf[8])
-		f := func(out, in []byte) {
-			Iterated(out, h, in, buf[:8], count)
-		}
-		return f, nil
-	}
-
-	return nil, errors.UnsupportedError("S2K function")
-}
-
-// Serialize salts and stretches the given passphrase and writes the
-// resulting key into key. It also serializes an S2K descriptor to
-// w. The key stretching can be configured with c, which may be
-// nil. In that case, sensible defaults will be used.
-func Serialize(w io.Writer, key []byte, rand io.Reader, passphrase []byte, c *Config) error {
-	var buf [11]byte
-	buf[0] = 3 /* iterated and salted */
-	buf[1], _ = HashToHashId(c.hash())
-	salt := buf[2:10]
-	if _, err := io.ReadFull(rand, salt); err != nil {
-		return err
-	}
-	encodedCount := c.encodedCount()
-	count := decodeCount(encodedCount)
-	buf[10] = encodedCount
-	if _, err := w.Write(buf[:]); err != nil {
-		return err
-	}
-
-	Iterated(key, c.hash().New(), passphrase, salt, count)
-	return nil
-}
-
-// hashToHashIdMapping contains pairs relating OpenPGP's hash identifier with
-// Go's crypto.Hash type. See RFC 4880, section 9.4.
-var hashToHashIdMapping = []struct {
-	id   byte
-	hash crypto.Hash
-	name string
-}{
-	{1, crypto.MD5, "MD5"},
-	{2, crypto.SHA1, "SHA1"},
-	{3, crypto.RIPEMD160, "RIPEMD160"},
-	{8, crypto.SHA256, "SHA256"},
-	{9, crypto.SHA384, "SHA384"},
-	{10, crypto.SHA512, "SHA512"},
-	{11, crypto.SHA224, "SHA224"},
-}
-
-// HashIdToHash returns a crypto.Hash which corresponds to the given OpenPGP
-// hash id.
-func HashIdToHash(id byte) (h crypto.Hash, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.id == id {
-			return m.hash, true
-		}
-	}
-	return 0, false
-}
-
-// HashIdToString returns the name of the hash function corresponding to the
-// given OpenPGP hash id.
-func HashIdToString(id byte) (name string, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.id == id {
-			return m.name, true
-		}
-	}
-
-	return "", false
-}
-
-// HashIdToHash returns an OpenPGP hash id which corresponds the given Hash.
-func HashToHashId(h crypto.Hash) (id byte, ok bool) {
-	for _, m := range hashToHashIdMapping {
-		if m.hash == h {
-			return m.id, true
-		}
-	}
-	return 0, false
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k_test.go b/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k_test.go
deleted file mode 100644
index 183d26056b..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/s2k/s2k_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package s2k
-
-import (
-	"bytes"
-	"crypto"
-	_ "crypto/md5"
-	"crypto/rand"
-	"crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-	"encoding/hex"
-	"testing"
-
-	_ "golang.org/x/crypto/ripemd160"
-)
-
-var saltedTests = []struct {
-	in, out string
-}{
-	{"hello", "10295ac1"},
-	{"world", "ac587a5e"},
-	{"foo", "4dda8077"},
-	{"bar", "bd8aac6b9ea9cae04eae6a91c6133b58b5d9a61c14f355516ed9370456"},
-	{"x", "f1d3f289"},
-	{"xxxxxxxxxxxxxxxxxxxxxxx", "e00d7b45"},
-}
-
-func TestSalted(t *testing.T) {
-	h := sha1.New()
-	salt := [4]byte{1, 2, 3, 4}
-
-	for i, test := range saltedTests {
-		expected, _ := hex.DecodeString(test.out)
-		out := make([]byte, len(expected))
-		Salted(out, h, []byte(test.in), salt[:])
-		if !bytes.Equal(expected, out) {
-			t.Errorf("#%d, got: %x want: %x", i, out, expected)
-		}
-	}
-}
-
-var iteratedTests = []struct {
-	in, out string
-}{
-	{"hello", "83126105"},
-	{"world", "6fa317f9"},
-	{"foo", "8fbc35b9"},
-	{"bar", "2af5a99b54f093789fd657f19bd245af7604d0f6ae06f66602a46a08ae"},
-	{"x", "5a684dfe"},
-	{"xxxxxxxxxxxxxxxxxxxxxxx", "18955174"},
-}
-
-func TestIterated(t *testing.T) {
-	h := sha1.New()
-	salt := [4]byte{4, 3, 2, 1}
-
-	for i, test := range iteratedTests {
-		expected, _ := hex.DecodeString(test.out)
-		out := make([]byte, len(expected))
-		Iterated(out, h, []byte(test.in), salt[:], 31)
-		if !bytes.Equal(expected, out) {
-			t.Errorf("#%d, got: %x want: %x", i, out, expected)
-		}
-	}
-}
-
-var parseTests = []struct {
-	spec, in, out string
-}{
-	/* Simple with SHA1 */
-	{"0002", "hello", "aaf4c61d"},
-	/* Salted with SHA1 */
-	{"01020102030405060708", "hello", "f4f7d67e"},
-	/* Iterated with SHA1 */
-	{"03020102030405060708f1", "hello", "f2a57b7c"},
-}
-
-func TestParse(t *testing.T) {
-	for i, test := range parseTests {
-		spec, _ := hex.DecodeString(test.spec)
-		buf := bytes.NewBuffer(spec)
-		f, err := Parse(buf)
-		if err != nil {
-			t.Errorf("%d: Parse returned error: %s", i, err)
-			continue
-		}
-
-		expected, _ := hex.DecodeString(test.out)
-		out := make([]byte, len(expected))
-		f(out, []byte(test.in))
-		if !bytes.Equal(out, expected) {
-			t.Errorf("%d: output got: %x want: %x", i, out, expected)
-		}
-		if testing.Short() {
-			break
-		}
-	}
-}
-
-func TestSerialize(t *testing.T) {
-	hashes := []crypto.Hash{crypto.MD5, crypto.SHA1, crypto.RIPEMD160,
-		crypto.SHA256, crypto.SHA384, crypto.SHA512, crypto.SHA224}
-	testCounts := []int{-1, 0, 1024, 65536, 4063232, 65011712}
-	for _, h := range hashes {
-		for _, c := range testCounts {
-			testSerializeConfig(t, &Config{Hash: h, S2KCount: c})
-		}
-	}
-}
-
-func testSerializeConfig(t *testing.T, c *Config) {
-	t.Logf("Running testSerializeConfig() with config: %+v", c)
-
-	buf := bytes.NewBuffer(nil)
-	key := make([]byte, 16)
-	passphrase := []byte("testing")
-	err := Serialize(buf, key, rand.Reader, passphrase, c)
-	if err != nil {
-		t.Errorf("failed to serialize: %s", err)
-		return
-	}
-
-	f, err := Parse(buf)
-	if err != nil {
-		t.Errorf("failed to reparse: %s", err)
-		return
-	}
-	key2 := make([]byte, len(key))
-	f(key2, passphrase)
-	if !bytes.Equal(key2, key) {
-		t.Errorf("keys don't match: %x (serialied) vs %x (parsed)", key, key2)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/write.go b/installer/vendor/golang.org/x/crypto/openpgp/write.go
deleted file mode 100644
index 65a304cc86..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/write.go
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"crypto"
-	"hash"
-	"io"
-	"strconv"
-	"time"
-
-	"golang.org/x/crypto/openpgp/armor"
-	"golang.org/x/crypto/openpgp/errors"
-	"golang.org/x/crypto/openpgp/packet"
-	"golang.org/x/crypto/openpgp/s2k"
-)
-
-// DetachSign signs message with the private key from signer (which must
-// already have been decrypted) and writes the signature to w.
-// If config is nil, sensible defaults will be used.
-func DetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return detachSign(w, signer, message, packet.SigTypeBinary, config)
-}
-
-// ArmoredDetachSign signs message with the private key from signer (which
-// must already have been decrypted) and writes an armored signature to w.
-// If config is nil, sensible defaults will be used.
-func ArmoredDetachSign(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) (err error) {
-	return armoredDetachSign(w, signer, message, packet.SigTypeBinary, config)
-}
-
-// DetachSignText signs message (after canonicalising the line endings) with
-// the private key from signer (which must already have been decrypted) and
-// writes the signature to w.
-// If config is nil, sensible defaults will be used.
-func DetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return detachSign(w, signer, message, packet.SigTypeText, config)
-}
-
-// ArmoredDetachSignText signs message (after canonicalising the line endings)
-// with the private key from signer (which must already have been decrypted)
-// and writes an armored signature to w.
-// If config is nil, sensible defaults will be used.
-func ArmoredDetachSignText(w io.Writer, signer *Entity, message io.Reader, config *packet.Config) error {
-	return armoredDetachSign(w, signer, message, packet.SigTypeText, config)
-}
-
-func armoredDetachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
-	out, err := armor.Encode(w, SignatureType, nil)
-	if err != nil {
-		return
-	}
-	err = detachSign(out, signer, message, sigType, config)
-	if err != nil {
-		return
-	}
-	return out.Close()
-}
-
-func detachSign(w io.Writer, signer *Entity, message io.Reader, sigType packet.SignatureType, config *packet.Config) (err error) {
-	if signer.PrivateKey == nil {
-		return errors.InvalidArgumentError("signing key doesn't have a private key")
-	}
-	if signer.PrivateKey.Encrypted {
-		return errors.InvalidArgumentError("signing key is encrypted")
-	}
-
-	sig := new(packet.Signature)
-	sig.SigType = sigType
-	sig.PubKeyAlgo = signer.PrivateKey.PubKeyAlgo
-	sig.Hash = config.Hash()
-	sig.CreationTime = config.Now()
-	sig.IssuerKeyId = &signer.PrivateKey.KeyId
-
-	h, wrappedHash, err := hashForSignature(sig.Hash, sig.SigType)
-	if err != nil {
-		return
-	}
-	io.Copy(wrappedHash, message)
-
-	err = sig.Sign(h, signer.PrivateKey, config)
-	if err != nil {
-		return
-	}
-
-	return sig.Serialize(w)
-}
-
-// FileHints contains metadata about encrypted files. This metadata is, itself,
-// encrypted.
-type FileHints struct {
-	// IsBinary can be set to hint that the contents are binary data.
-	IsBinary bool
-	// FileName hints at the name of the file that should be written. It's
-	// truncated to 255 bytes if longer. It may be empty to suggest that the
-	// file should not be written to disk. It may be equal to "_CONSOLE" to
-	// suggest the data should not be written to disk.
-	FileName string
-	// ModTime contains the modification time of the file, or the zero time if not applicable.
-	ModTime time.Time
-}
-
-// SymmetricallyEncrypt acts like gpg -c: it encrypts a file with a passphrase.
-// The resulting WriteCloser must be closed after the contents of the file have
-// been written.
-// If config is nil, sensible defaults will be used.
-func SymmetricallyEncrypt(ciphertext io.Writer, passphrase []byte, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	if hints == nil {
-		hints = &FileHints{}
-	}
-
-	key, err := packet.SerializeSymmetricKeyEncrypted(ciphertext, passphrase, config)
-	if err != nil {
-		return
-	}
-	w, err := packet.SerializeSymmetricallyEncrypted(ciphertext, config.Cipher(), key, config)
-	if err != nil {
-		return
-	}
-
-	literaldata := w
-	if algo := config.Compression(); algo != packet.CompressionNone {
-		var compConfig *packet.CompressionConfig
-		if config != nil {
-			compConfig = config.CompressionConfig
-		}
-		literaldata, err = packet.SerializeCompressed(w, algo, compConfig)
-		if err != nil {
-			return
-		}
-	}
-
-	var epochSeconds uint32
-	if !hints.ModTime.IsZero() {
-		epochSeconds = uint32(hints.ModTime.Unix())
-	}
-	return packet.SerializeLiteral(literaldata, hints.IsBinary, hints.FileName, epochSeconds)
-}
-
-// intersectPreferences mutates and returns a prefix of a that contains only
-// the values in the intersection of a and b. The order of a is preserved.
-func intersectPreferences(a []uint8, b []uint8) (intersection []uint8) {
-	var j int
-	for _, v := range a {
-		for _, v2 := range b {
-			if v == v2 {
-				a[j] = v
-				j++
-				break
-			}
-		}
-	}
-
-	return a[:j]
-}
-
-func hashToHashId(h crypto.Hash) uint8 {
-	v, ok := s2k.HashToHashId(h)
-	if !ok {
-		panic("tried to convert unknown hash")
-	}
-	return v
-}
-
-// Encrypt encrypts a message to a number of recipients and, optionally, signs
-// it. hints contains optional information, that is also encrypted, that aids
-// the recipients in processing the message. The resulting WriteCloser must
-// be closed after the contents of the file have been written.
-// If config is nil, sensible defaults will be used.
-func Encrypt(ciphertext io.Writer, to []*Entity, signed *Entity, hints *FileHints, config *packet.Config) (plaintext io.WriteCloser, err error) {
-	var signer *packet.PrivateKey
-	if signed != nil {
-		signKey, ok := signed.signingKey(config.Now())
-		if !ok {
-			return nil, errors.InvalidArgumentError("no valid signing keys")
-		}
-		signer = signKey.PrivateKey
-		if signer == nil {
-			return nil, errors.InvalidArgumentError("no private key in signing key")
-		}
-		if signer.Encrypted {
-			return nil, errors.InvalidArgumentError("signing key must be decrypted")
-		}
-	}
-
-	// These are the possible ciphers that we'll use for the message.
-	candidateCiphers := []uint8{
-		uint8(packet.CipherAES128),
-		uint8(packet.CipherAES256),
-		uint8(packet.CipherCAST5),
-	}
-	// These are the possible hash functions that we'll use for the signature.
-	candidateHashes := []uint8{
-		hashToHashId(crypto.SHA256),
-		hashToHashId(crypto.SHA512),
-		hashToHashId(crypto.SHA1),
-		hashToHashId(crypto.RIPEMD160),
-	}
-	// In the event that a recipient doesn't specify any supported ciphers
-	// or hash functions, these are the ones that we assume that every
-	// implementation supports.
-	defaultCiphers := candidateCiphers[len(candidateCiphers)-1:]
-	defaultHashes := candidateHashes[len(candidateHashes)-1:]
-
-	encryptKeys := make([]Key, len(to))
-	for i := range to {
-		var ok bool
-		encryptKeys[i], ok = to[i].encryptionKey(config.Now())
-		if !ok {
-			return nil, errors.InvalidArgumentError("cannot encrypt a message to key id " + strconv.FormatUint(to[i].PrimaryKey.KeyId, 16) + " because it has no encryption keys")
-		}
-
-		sig := to[i].primaryIdentity().SelfSignature
-
-		preferredSymmetric := sig.PreferredSymmetric
-		if len(preferredSymmetric) == 0 {
-			preferredSymmetric = defaultCiphers
-		}
-		preferredHashes := sig.PreferredHash
-		if len(preferredHashes) == 0 {
-			preferredHashes = defaultHashes
-		}
-		candidateCiphers = intersectPreferences(candidateCiphers, preferredSymmetric)
-		candidateHashes = intersectPreferences(candidateHashes, preferredHashes)
-	}
-
-	if len(candidateCiphers) == 0 || len(candidateHashes) == 0 {
-		return nil, errors.InvalidArgumentError("cannot encrypt because recipient set shares no common algorithms")
-	}
-
-	cipher := packet.CipherFunction(candidateCiphers[0])
-	// If the cipher specified by config is a candidate, we'll use that.
-	configuredCipher := config.Cipher()
-	for _, c := range candidateCiphers {
-		cipherFunc := packet.CipherFunction(c)
-		if cipherFunc == configuredCipher {
-			cipher = cipherFunc
-			break
-		}
-	}
-
-	var hash crypto.Hash
-	for _, hashId := range candidateHashes {
-		if h, ok := s2k.HashIdToHash(hashId); ok && h.Available() {
-			hash = h
-			break
-		}
-	}
-
-	// If the hash specified by config is a candidate, we'll use that.
-	if configuredHash := config.Hash(); configuredHash.Available() {
-		for _, hashId := range candidateHashes {
-			if h, ok := s2k.HashIdToHash(hashId); ok && h == configuredHash {
-				hash = h
-				break
-			}
-		}
-	}
-
-	if hash == 0 {
-		hashId := candidateHashes[0]
-		name, ok := s2k.HashIdToString(hashId)
-		if !ok {
-			name = "#" + strconv.Itoa(int(hashId))
-		}
-		return nil, errors.InvalidArgumentError("cannot encrypt because no candidate hash functions are compiled in. (Wanted " + name + " in this case.)")
-	}
-
-	symKey := make([]byte, cipher.KeySize())
-	if _, err := io.ReadFull(config.Random(), symKey); err != nil {
-		return nil, err
-	}
-
-	for _, key := range encryptKeys {
-		if err := packet.SerializeEncryptedKey(ciphertext, key.PublicKey, cipher, symKey, config); err != nil {
-			return nil, err
-		}
-	}
-
-	encryptedData, err := packet.SerializeSymmetricallyEncrypted(ciphertext, cipher, symKey, config)
-	if err != nil {
-		return
-	}
-
-	if signer != nil {
-		ops := &packet.OnePassSignature{
-			SigType:    packet.SigTypeBinary,
-			Hash:       hash,
-			PubKeyAlgo: signer.PubKeyAlgo,
-			KeyId:      signer.KeyId,
-			IsLast:     true,
-		}
-		if err := ops.Serialize(encryptedData); err != nil {
-			return nil, err
-		}
-	}
-
-	if hints == nil {
-		hints = &FileHints{}
-	}
-
-	w := encryptedData
-	if signer != nil {
-		// If we need to write a signature packet after the literal
-		// data then we need to stop literalData from closing
-		// encryptedData.
-		w = noOpCloser{encryptedData}
-
-	}
-	var epochSeconds uint32
-	if !hints.ModTime.IsZero() {
-		epochSeconds = uint32(hints.ModTime.Unix())
-	}
-	literalData, err := packet.SerializeLiteral(w, hints.IsBinary, hints.FileName, epochSeconds)
-	if err != nil {
-		return nil, err
-	}
-
-	if signer != nil {
-		return signatureWriter{encryptedData, literalData, hash, hash.New(), signer, config}, nil
-	}
-	return literalData, nil
-}
-
-// signatureWriter hashes the contents of a message while passing it along to
-// literalData. When closed, it closes literalData, writes a signature packet
-// to encryptedData and then also closes encryptedData.
-type signatureWriter struct {
-	encryptedData io.WriteCloser
-	literalData   io.WriteCloser
-	hashType      crypto.Hash
-	h             hash.Hash
-	signer        *packet.PrivateKey
-	config        *packet.Config
-}
-
-func (s signatureWriter) Write(data []byte) (int, error) {
-	s.h.Write(data)
-	return s.literalData.Write(data)
-}
-
-func (s signatureWriter) Close() error {
-	sig := &packet.Signature{
-		SigType:      packet.SigTypeBinary,
-		PubKeyAlgo:   s.signer.PubKeyAlgo,
-		Hash:         s.hashType,
-		CreationTime: s.config.Now(),
-		IssuerKeyId:  &s.signer.KeyId,
-	}
-
-	if err := sig.Sign(s.h, s.signer, s.config); err != nil {
-		return err
-	}
-	if err := s.literalData.Close(); err != nil {
-		return err
-	}
-	if err := sig.Serialize(s.encryptedData); err != nil {
-		return err
-	}
-	return s.encryptedData.Close()
-}
-
-// noOpCloser is like an ioutil.NopCloser, but for an io.Writer.
-// TODO: we have two of these in OpenPGP packages alone. This probably needs
-// to be promoted somewhere more common.
-type noOpCloser struct {
-	w io.Writer
-}
-
-func (c noOpCloser) Write(data []byte) (n int, err error) {
-	return c.w.Write(data)
-}
-
-func (c noOpCloser) Close() error {
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/openpgp/write_test.go b/installer/vendor/golang.org/x/crypto/openpgp/write_test.go
deleted file mode 100644
index f2d50a0cff..0000000000
--- a/installer/vendor/golang.org/x/crypto/openpgp/write_test.go
+++ /dev/null
@@ -1,273 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package openpgp
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/openpgp/packet"
-)
-
-func TestSignDetached(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
-	out := bytes.NewBuffer(nil)
-	message := bytes.NewBufferString(signedInput)
-	err := DetachSign(out, kring[0], message, nil)
-	if err != nil {
-		t.Error(err)
-	}
-
-	testDetachedSignature(t, kring, out, signedInput, "check", testKey1KeyId)
-}
-
-func TestSignTextDetached(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(testKeys1And2PrivateHex))
-	out := bytes.NewBuffer(nil)
-	message := bytes.NewBufferString(signedInput)
-	err := DetachSignText(out, kring[0], message, nil)
-	if err != nil {
-		t.Error(err)
-	}
-
-	testDetachedSignature(t, kring, out, signedInput, "check", testKey1KeyId)
-}
-
-func TestSignDetachedDSA(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(dsaTestKeyPrivateHex))
-	out := bytes.NewBuffer(nil)
-	message := bytes.NewBufferString(signedInput)
-	err := DetachSign(out, kring[0], message, nil)
-	if err != nil {
-		t.Error(err)
-	}
-
-	testDetachedSignature(t, kring, out, signedInput, "check", testKey3KeyId)
-}
-
-func TestSignDetachedP256(t *testing.T) {
-	kring, _ := ReadKeyRing(readerFromHex(p256TestKeyPrivateHex))
-	kring[0].PrivateKey.Decrypt([]byte("passphrase"))
-
-	out := bytes.NewBuffer(nil)
-	message := bytes.NewBufferString(signedInput)
-	err := DetachSign(out, kring[0], message, nil)
-	if err != nil {
-		t.Error(err)
-	}
-
-	testDetachedSignature(t, kring, out, signedInput, "check", testKeyP256KeyId)
-}
-
-func TestNewEntity(t *testing.T) {
-	if testing.Short() {
-		return
-	}
-
-	// Check bit-length with no config.
-	e, err := NewEntity("Test User", "test", "test@example.com", nil)
-	if err != nil {
-		t.Errorf("failed to create entity: %s", err)
-		return
-	}
-	bl, err := e.PrimaryKey.BitLength()
-	if err != nil {
-		t.Errorf("failed to find bit length: %s", err)
-	}
-	if int(bl) != defaultRSAKeyBits {
-		t.Errorf("BitLength %v, expected %v", int(bl), defaultRSAKeyBits)
-	}
-
-	// Check bit-length with a config.
-	cfg := &packet.Config{RSABits: 1024}
-	e, err = NewEntity("Test User", "test", "test@example.com", cfg)
-	if err != nil {
-		t.Errorf("failed to create entity: %s", err)
-		return
-	}
-	bl, err = e.PrimaryKey.BitLength()
-	if err != nil {
-		t.Errorf("failed to find bit length: %s", err)
-	}
-	if int(bl) != cfg.RSABits {
-		t.Errorf("BitLength %v, expected %v", bl, cfg.RSABits)
-	}
-
-	w := bytes.NewBuffer(nil)
-	if err := e.SerializePrivate(w, nil); err != nil {
-		t.Errorf("failed to serialize entity: %s", err)
-		return
-	}
-	serialized := w.Bytes()
-
-	el, err := ReadKeyRing(w)
-	if err != nil {
-		t.Errorf("failed to reparse entity: %s", err)
-		return
-	}
-
-	if len(el) != 1 {
-		t.Errorf("wrong number of entities found, got %d, want 1", len(el))
-	}
-
-	w = bytes.NewBuffer(nil)
-	if err := e.SerializePrivate(w, nil); err != nil {
-		t.Errorf("failed to serialize entity second time: %s", err)
-		return
-	}
-
-	if !bytes.Equal(w.Bytes(), serialized) {
-		t.Errorf("results differed")
-	}
-}
-
-func TestSymmetricEncryption(t *testing.T) {
-	buf := new(bytes.Buffer)
-	plaintext, err := SymmetricallyEncrypt(buf, []byte("testing"), nil, nil)
-	if err != nil {
-		t.Errorf("error writing headers: %s", err)
-		return
-	}
-	message := []byte("hello world\n")
-	_, err = plaintext.Write(message)
-	if err != nil {
-		t.Errorf("error writing to plaintext writer: %s", err)
-	}
-	err = plaintext.Close()
-	if err != nil {
-		t.Errorf("error closing plaintext writer: %s", err)
-	}
-
-	md, err := ReadMessage(buf, nil, func(keys []Key, symmetric bool) ([]byte, error) {
-		return []byte("testing"), nil
-	}, nil)
-	if err != nil {
-		t.Errorf("error rereading message: %s", err)
-	}
-	messageBuf := bytes.NewBuffer(nil)
-	_, err = io.Copy(messageBuf, md.UnverifiedBody)
-	if err != nil {
-		t.Errorf("error rereading message: %s", err)
-	}
-	if !bytes.Equal(message, messageBuf.Bytes()) {
-		t.Errorf("recovered message incorrect got '%s', want '%s'", messageBuf.Bytes(), message)
-	}
-}
-
-var testEncryptionTests = []struct {
-	keyRingHex string
-	isSigned   bool
-}{
-	{
-		testKeys1And2PrivateHex,
-		false,
-	},
-	{
-		testKeys1And2PrivateHex,
-		true,
-	},
-	{
-		dsaElGamalTestKeysHex,
-		false,
-	},
-	{
-		dsaElGamalTestKeysHex,
-		true,
-	},
-}
-
-func TestEncryption(t *testing.T) {
-	for i, test := range testEncryptionTests {
-		kring, _ := ReadKeyRing(readerFromHex(test.keyRingHex))
-
-		passphrase := []byte("passphrase")
-		for _, entity := range kring {
-			if entity.PrivateKey != nil && entity.PrivateKey.Encrypted {
-				err := entity.PrivateKey.Decrypt(passphrase)
-				if err != nil {
-					t.Errorf("#%d: failed to decrypt key", i)
-				}
-			}
-			for _, subkey := range entity.Subkeys {
-				if subkey.PrivateKey != nil && subkey.PrivateKey.Encrypted {
-					err := subkey.PrivateKey.Decrypt(passphrase)
-					if err != nil {
-						t.Errorf("#%d: failed to decrypt subkey", i)
-					}
-				}
-			}
-		}
-
-		var signed *Entity
-		if test.isSigned {
-			signed = kring[0]
-		}
-
-		buf := new(bytes.Buffer)
-		w, err := Encrypt(buf, kring[:1], signed, nil /* no hints */, nil)
-		if err != nil {
-			t.Errorf("#%d: error in Encrypt: %s", i, err)
-			continue
-		}
-
-		const message = "testing"
-		_, err = w.Write([]byte(message))
-		if err != nil {
-			t.Errorf("#%d: error writing plaintext: %s", i, err)
-			continue
-		}
-		err = w.Close()
-		if err != nil {
-			t.Errorf("#%d: error closing WriteCloser: %s", i, err)
-			continue
-		}
-
-		md, err := ReadMessage(buf, kring, nil /* no prompt */, nil)
-		if err != nil {
-			t.Errorf("#%d: error reading message: %s", i, err)
-			continue
-		}
-
-		testTime, _ := time.Parse("2006-01-02", "2013-07-01")
-		if test.isSigned {
-			signKey, _ := kring[0].signingKey(testTime)
-			expectedKeyId := signKey.PublicKey.KeyId
-			if md.SignedByKeyId != expectedKeyId {
-				t.Errorf("#%d: message signed by wrong key id, got: %v, want: %v", i, *md.SignedBy, expectedKeyId)
-			}
-			if md.SignedBy == nil {
-				t.Errorf("#%d: failed to find the signing Entity", i)
-			}
-		}
-
-		plaintext, err := ioutil.ReadAll(md.UnverifiedBody)
-		if err != nil {
-			t.Errorf("#%d: error reading encrypted contents: %s", i, err)
-			continue
-		}
-
-		encryptKey, _ := kring[0].encryptionKey(testTime)
-		expectedKeyId := encryptKey.PublicKey.KeyId
-		if len(md.EncryptedToKeyIds) != 1 || md.EncryptedToKeyIds[0] != expectedKeyId {
-			t.Errorf("#%d: expected message to be encrypted to %v, but got %#v", i, expectedKeyId, md.EncryptedToKeyIds)
-		}
-
-		if string(plaintext) != message {
-			t.Errorf("#%d: got: %s, want: %s", i, string(plaintext), message)
-		}
-
-		if test.isSigned {
-			if md.SignatureError != nil {
-				t.Errorf("#%d: signature error: %s", i, md.SignatureError)
-			}
-			if md.Signature == nil {
-				t.Error("signature missing")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/otr/libotr_test_helper.c b/installer/vendor/golang.org/x/crypto/otr/libotr_test_helper.c
deleted file mode 100644
index b3ca072d48..0000000000
--- a/installer/vendor/golang.org/x/crypto/otr/libotr_test_helper.c
+++ /dev/null
@@ -1,197 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This code can be compiled and used to test the otr package against libotr.
-// See otr_test.go.
-
-// +build ignore
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <unistd.h>
-
-#include <proto.h>
-#include <message.h>
-#include <privkey.h>
-
-static int g_session_established = 0;
-
-OtrlPolicy policy(void *opdata, ConnContext *context) {
-  return OTRL_POLICY_ALWAYS;
-}
-
-int is_logged_in(void *opdata, const char *accountname, const char *protocol,
-                 const char *recipient) {
-  return 1;
-}
-
-void inject_message(void *opdata, const char *accountname, const char *protocol,
-                    const char *recipient, const char *message) {
-  printf("%s\n", message);
-  fflush(stdout);
-  fprintf(stderr, "libotr helper sent: %s\n", message);
-}
-
-void update_context_list(void *opdata) {}
-
-void new_fingerprint(void *opdata, OtrlUserState us, const char *accountname,
-                     const char *protocol, const char *username,
-                     unsigned char fingerprint[20]) {
-  fprintf(stderr, "NEW FINGERPRINT\n");
-  g_session_established = 1;
-}
-
-void write_fingerprints(void *opdata) {}
-
-void gone_secure(void *opdata, ConnContext *context) {}
-
-void gone_insecure(void *opdata, ConnContext *context) {}
-
-void still_secure(void *opdata, ConnContext *context, int is_reply) {}
-
-int max_message_size(void *opdata, ConnContext *context) { return 99999; }
-
-const char *account_name(void *opdata, const char *account,
-                         const char *protocol) {
-  return "ACCOUNT";
-}
-
-void account_name_free(void *opdata, const char *account_name) {}
-
-const char *error_message(void *opdata, ConnContext *context,
-                          OtrlErrorCode err_code) {
-  return "ERR";
-}
-
-void error_message_free(void *opdata, const char *msg) {}
-
-void resent_msg_prefix_free(void *opdata, const char *prefix) {}
-
-void handle_smp_event(void *opdata, OtrlSMPEvent smp_event,
-                      ConnContext *context, unsigned short progress_event,
-                      char *question) {}
-
-void handle_msg_event(void *opdata, OtrlMessageEvent msg_event,
-                      ConnContext *context, const char *message,
-                      gcry_error_t err) {
-  fprintf(stderr, "msg event: %d %s\n", msg_event, message);
-}
-
-OtrlMessageAppOps uiops = {
-    policy,
-    NULL,
-    is_logged_in,
-    inject_message,
-    update_context_list,
-    new_fingerprint,
-    write_fingerprints,
-    gone_secure,
-    gone_insecure,
-    still_secure,
-    max_message_size,
-    account_name,
-    account_name_free,
-    NULL, /* received_symkey */
-    error_message,
-    error_message_free,
-    NULL, /* resent_msg_prefix */
-    resent_msg_prefix_free,
-    handle_smp_event,
-    handle_msg_event,
-    NULL /* create_instag */,
-    NULL /* convert_msg */,
-    NULL /* convert_free */,
-    NULL /* timer_control */,
-};
-
-static const char kPrivateKeyData[] =
-    "(privkeys (account (name \"account\") (protocol proto) (private-key (dsa "
-    "(p "
-    "#00FC07ABCF0DC916AFF6E9AE47BEF60C7AB9B4D6B2469E436630E36F8A489BE812486A09F"
-    "30B71224508654940A835301ACC525A4FF133FC152CC53DCC59D65C30A54F1993FE13FE63E"
-    "5823D4C746DB21B90F9B9C00B49EC7404AB1D929BA7FBA12F2E45C6E0A651689750E8528AB"
-    "8C031D3561FECEE72EBB4A090D450A9B7A857#) (q "
-    "#00997BD266EF7B1F60A5C23F3A741F2AEFD07A2081#) (g "
-    "#535E360E8A95EBA46A4F7DE50AD6E9B2A6DB785A66B64EB9F20338D2A3E8FB0E94725848F"
-    "1AA6CC567CB83A1CC517EC806F2E92EAE71457E80B2210A189B91250779434B41FC8A8873F"
-    "6DB94BEA7D177F5D59E7E114EE10A49CFD9CEF88AE43387023B672927BA74B04EB6BBB5E57"
-    "597766A2F9CE3857D7ACE3E1E3BC1FC6F26#) (y "
-    "#0AC8670AD767D7A8D9D14CC1AC6744CD7D76F993B77FFD9E39DF01E5A6536EF65E775FCEF"
-    "2A983E2A19BD6415500F6979715D9FD1257E1FE2B6F5E1E74B333079E7C880D39868462A93"
-    "454B41877BE62E5EF0A041C2EE9C9E76BD1E12AE25D9628DECB097025DD625EF49C3258A1A"
-    "3C0FF501E3DC673B76D7BABF349009B6ECF#) (x "
-    "#14D0345A3562C480A039E3C72764F72D79043216#)))))\n";
-
-int main() {
-  OTRL_INIT;
-
-  // We have to write the private key information to a file because the libotr
-  // API demands a filename to read from.
-  const char *tmpdir = "/tmp";
-  if (getenv("TMP")) {
-    tmpdir = getenv("TMP");
-  }
-
-  char private_key_file[256];
-  snprintf(private_key_file, sizeof(private_key_file),
-           "%s/libotr_test_helper_privatekeys-XXXXXX", tmpdir);
-  int fd = mkstemp(private_key_file);
-  if (fd == -1) {
-    perror("creating temp file");
-  }
-  write(fd, kPrivateKeyData, sizeof(kPrivateKeyData) - 1);
-  close(fd);
-
-  OtrlUserState userstate = otrl_userstate_create();
-  otrl_privkey_read(userstate, private_key_file);
-  unlink(private_key_file);
-
-  fprintf(stderr, "libotr helper started\n");
-
-  char buf[4096];
-
-  for (;;) {
-    char *message = fgets(buf, sizeof(buf), stdin);
-    if (strlen(message) == 0) {
-      break;
-    }
-    message[strlen(message) - 1] = 0;
-    fprintf(stderr, "libotr helper got: %s\n", message);
-
-    char *newmessage = NULL;
-    OtrlTLV *tlvs;
-    int ignore_message = otrl_message_receiving(
-        userstate, &uiops, NULL, "account", "proto", "peer", message,
-        &newmessage, &tlvs, NULL, NULL, NULL);
-    if (tlvs) {
-      otrl_tlv_free(tlvs);
-    }
-
-    if (newmessage != NULL) {
-      fprintf(stderr, "libotr got: %s\n", newmessage);
-      otrl_message_free(newmessage);
-
-      gcry_error_t err;
-      char *newmessage = NULL;
-
-      err = otrl_message_sending(userstate, &uiops, NULL, "account", "proto",
-                                 "peer", 0, "test message", NULL, &newmessage,
-                                 OTRL_FRAGMENT_SEND_SKIP, NULL, NULL, NULL);
-      if (newmessage == NULL) {
-        fprintf(stderr, "libotr didn't encrypt message\n");
-        return 1;
-      }
-      write(1, newmessage, strlen(newmessage));
-      write(1, "\n", 1);
-      fprintf(stderr, "libotr sent: %s\n", newmessage);
-      otrl_message_free(newmessage);
-
-      g_session_established = 0;
-      write(1, "?OTRv2?\n", 8);
-      fprintf(stderr, "libotr sent: ?OTRv2\n");
-    }
-  }
-
-  return 0;
-}
diff --git a/installer/vendor/golang.org/x/crypto/otr/otr.go b/installer/vendor/golang.org/x/crypto/otr/otr.go
deleted file mode 100644
index 173b753dbd..0000000000
--- a/installer/vendor/golang.org/x/crypto/otr/otr.go
+++ /dev/null
@@ -1,1415 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package otr implements the Off The Record protocol as specified in
-// http://www.cypherpunks.ca/otr/Protocol-v2-3.1.0.html
-package otr // import "golang.org/x/crypto/otr"
-
-import (
-	"bytes"
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/dsa"
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/sha1"
-	"crypto/sha256"
-	"crypto/subtle"
-	"encoding/base64"
-	"encoding/hex"
-	"errors"
-	"hash"
-	"io"
-	"math/big"
-	"strconv"
-)
-
-// SecurityChange describes a change in the security state of a Conversation.
-type SecurityChange int
-
-const (
-	NoChange SecurityChange = iota
-	// NewKeys indicates that a key exchange has completed. This occurs
-	// when a conversation first becomes encrypted, and when the keys are
-	// renegotiated within an encrypted conversation.
-	NewKeys
-	// SMPSecretNeeded indicates that the peer has started an
-	// authentication and that we need to supply a secret. Call SMPQuestion
-	// to get the optional, human readable challenge and then Authenticate
-	// to supply the matching secret.
-	SMPSecretNeeded
-	// SMPComplete indicates that an authentication completed. The identity
-	// of the peer has now been confirmed.
-	SMPComplete
-	// SMPFailed indicates that an authentication failed.
-	SMPFailed
-	// ConversationEnded indicates that the peer ended the secure
-	// conversation.
-	ConversationEnded
-)
-
-// QueryMessage can be sent to a peer to start an OTR conversation.
-var QueryMessage = "?OTRv2?"
-
-// ErrorPrefix can be used to make an OTR error by appending an error message
-// to it.
-var ErrorPrefix = "?OTR Error:"
-
-var (
-	fragmentPartSeparator = []byte(",")
-	fragmentPrefix        = []byte("?OTR,")
-	msgPrefix             = []byte("?OTR:")
-	queryMarker           = []byte("?OTR")
-)
-
-// isQuery attempts to parse an OTR query from msg and returns the greatest
-// common version, or 0 if msg is not an OTR query.
-func isQuery(msg []byte) (greatestCommonVersion int) {
-	pos := bytes.Index(msg, queryMarker)
-	if pos == -1 {
-		return 0
-	}
-	for i, c := range msg[pos+len(queryMarker):] {
-		if i == 0 {
-			if c == '?' {
-				// Indicates support for version 1, but we don't
-				// implement that.
-				continue
-			}
-
-			if c != 'v' {
-				// Invalid message
-				return 0
-			}
-
-			continue
-		}
-
-		if c == '?' {
-			// End of message
-			return
-		}
-
-		if c == ' ' || c == '\t' {
-			// Probably an invalid message
-			return 0
-		}
-
-		if c == '2' {
-			greatestCommonVersion = 2
-		}
-	}
-
-	return 0
-}
-
-const (
-	statePlaintext = iota
-	stateEncrypted
-	stateFinished
-)
-
-const (
-	authStateNone = iota
-	authStateAwaitingDHKey
-	authStateAwaitingRevealSig
-	authStateAwaitingSig
-)
-
-const (
-	msgTypeDHCommit  = 2
-	msgTypeData      = 3
-	msgTypeDHKey     = 10
-	msgTypeRevealSig = 17
-	msgTypeSig       = 18
-)
-
-const (
-	// If the requested fragment size is less than this, it will be ignored.
-	minFragmentSize = 18
-	// Messages are padded to a multiple of this number of bytes.
-	paddingGranularity = 256
-	// The number of bytes in a Diffie-Hellman private value (320-bits).
-	dhPrivateBytes = 40
-	// The number of bytes needed to represent an element of the DSA
-	// subgroup (160-bits).
-	dsaSubgroupBytes = 20
-	// The number of bytes of the MAC that are sent on the wire (160-bits).
-	macPrefixBytes = 20
-)
-
-// These are the global, common group parameters for OTR.
-var (
-	p       *big.Int // group prime
-	g       *big.Int // group generator
-	q       *big.Int // group order
-	pMinus2 *big.Int
-)
-
-func init() {
-	p, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA237327FFFFFFFFFFFFFFFF", 16)
-	q, _ = new(big.Int).SetString("7FFFFFFFFFFFFFFFE487ED5110B4611A62633145C06E0E68948127044533E63A0105DF531D89CD9128A5043CC71A026EF7CA8CD9E69D218D98158536F92F8A1BA7F09AB6B6A8E122F242DABB312F3F637A262174D31BF6B585FFAE5B7A035BF6F71C35FDAD44CFD2D74F9208BE258FF324943328F6722D9EE1003E5C50B1DF82CC6D241B0E2AE9CD348B1FD47E9267AFC1B2AE91EE51D6CB0E3179AB1042A95DCF6A9483B84B4B36B3861AA7255E4C0278BA36046511B993FFFFFFFFFFFFFFFF", 16)
-	g = new(big.Int).SetInt64(2)
-	pMinus2 = new(big.Int).Sub(p, g)
-}
-
-// Conversation represents a relation with a peer. The zero value is a valid
-// Conversation, although PrivateKey must be set.
-//
-// When communicating with a peer, all inbound messages should be passed to
-// Conversation.Receive and all outbound messages to Conversation.Send. The
-// Conversation will take care of maintaining the encryption state and
-// negotiating encryption as needed.
-type Conversation struct {
-	// PrivateKey contains the private key to use to sign key exchanges.
-	PrivateKey *PrivateKey
-
-	// Rand can be set to override the entropy source. Otherwise,
-	// crypto/rand will be used.
-	Rand io.Reader
-	// If FragmentSize is set, all messages produced by Receive and Send
-	// will be fragmented into messages of, at most, this number of bytes.
-	FragmentSize int
-
-	// Once Receive has returned NewKeys once, the following fields are
-	// valid.
-	SSID           [8]byte
-	TheirPublicKey PublicKey
-
-	state, authState int
-
-	r       [16]byte
-	x, y    *big.Int
-	gx, gy  *big.Int
-	gxBytes []byte
-	digest  [sha256.Size]byte
-
-	revealKeys, sigKeys akeKeys
-
-	myKeyId         uint32
-	myCurrentDHPub  *big.Int
-	myCurrentDHPriv *big.Int
-	myLastDHPub     *big.Int
-	myLastDHPriv    *big.Int
-
-	theirKeyId        uint32
-	theirCurrentDHPub *big.Int
-	theirLastDHPub    *big.Int
-
-	keySlots [4]keySlot
-
-	myCounter    [8]byte
-	theirLastCtr [8]byte
-	oldMACs      []byte
-
-	k, n int // fragment state
-	frag []byte
-
-	smp smpState
-}
-
-// A keySlot contains key material for a specific (their keyid, my keyid) pair.
-type keySlot struct {
-	// used is true if this slot is valid. If false, it's free for reuse.
-	used                   bool
-	theirKeyId             uint32
-	myKeyId                uint32
-	sendAESKey, recvAESKey []byte
-	sendMACKey, recvMACKey []byte
-	theirLastCtr           [8]byte
-}
-
-// akeKeys are generated during key exchange. There's one set for the reveal
-// signature message and another for the signature message. In the protocol
-// spec the latter are indicated with a prime mark.
-type akeKeys struct {
-	c      [16]byte
-	m1, m2 [32]byte
-}
-
-func (c *Conversation) rand() io.Reader {
-	if c.Rand != nil {
-		return c.Rand
-	}
-	return rand.Reader
-}
-
-func (c *Conversation) randMPI(buf []byte) *big.Int {
-	_, err := io.ReadFull(c.rand(), buf)
-	if err != nil {
-		panic("otr: short read from random source")
-	}
-
-	return new(big.Int).SetBytes(buf)
-}
-
-// tlv represents the type-length value from the protocol.
-type tlv struct {
-	typ, length uint16
-	data        []byte
-}
-
-const (
-	tlvTypePadding          = 0
-	tlvTypeDisconnected     = 1
-	tlvTypeSMP1             = 2
-	tlvTypeSMP2             = 3
-	tlvTypeSMP3             = 4
-	tlvTypeSMP4             = 5
-	tlvTypeSMPAbort         = 6
-	tlvTypeSMP1WithQuestion = 7
-)
-
-// Receive handles a message from a peer. It returns a human readable message,
-// an indicator of whether that message was encrypted, a hint about the
-// encryption state and zero or more messages to send back to the peer.
-// These messages do not need to be passed to Send before transmission.
-func (c *Conversation) Receive(in []byte) (out []byte, encrypted bool, change SecurityChange, toSend [][]byte, err error) {
-	if bytes.HasPrefix(in, fragmentPrefix) {
-		in, err = c.processFragment(in)
-		if in == nil || err != nil {
-			return
-		}
-	}
-
-	if bytes.HasPrefix(in, msgPrefix) && in[len(in)-1] == '.' {
-		in = in[len(msgPrefix) : len(in)-1]
-	} else if version := isQuery(in); version > 0 {
-		c.authState = authStateAwaitingDHKey
-		c.reset()
-		toSend = c.encode(c.generateDHCommit())
-		return
-	} else {
-		// plaintext message
-		out = in
-		return
-	}
-
-	msg := make([]byte, base64.StdEncoding.DecodedLen(len(in)))
-	msgLen, err := base64.StdEncoding.Decode(msg, in)
-	if err != nil {
-		err = errors.New("otr: invalid base64 encoding in message")
-		return
-	}
-	msg = msg[:msgLen]
-
-	// The first two bytes are the protocol version (2)
-	if len(msg) < 3 || msg[0] != 0 || msg[1] != 2 {
-		err = errors.New("otr: invalid OTR message")
-		return
-	}
-
-	msgType := int(msg[2])
-	msg = msg[3:]
-
-	switch msgType {
-	case msgTypeDHCommit:
-		switch c.authState {
-		case authStateNone:
-			c.authState = authStateAwaitingRevealSig
-			if err = c.processDHCommit(msg); err != nil {
-				return
-			}
-			c.reset()
-			toSend = c.encode(c.generateDHKey())
-			return
-		case authStateAwaitingDHKey:
-			// This is a 'SYN-crossing'. The greater digest wins.
-			var cmp int
-			if cmp, err = c.compareToDHCommit(msg); err != nil {
-				return
-			}
-			if cmp > 0 {
-				// We win. Retransmit DH commit.
-				toSend = c.encode(c.serializeDHCommit())
-				return
-			} else {
-				// They win. We forget about our DH commit.
-				c.authState = authStateAwaitingRevealSig
-				if err = c.processDHCommit(msg); err != nil {
-					return
-				}
-				c.reset()
-				toSend = c.encode(c.generateDHKey())
-				return
-			}
-		case authStateAwaitingRevealSig:
-			if err = c.processDHCommit(msg); err != nil {
-				return
-			}
-			toSend = c.encode(c.serializeDHKey())
-		case authStateAwaitingSig:
-			if err = c.processDHCommit(msg); err != nil {
-				return
-			}
-			c.reset()
-			toSend = c.encode(c.generateDHKey())
-			c.authState = authStateAwaitingRevealSig
-		default:
-			panic("bad state")
-		}
-	case msgTypeDHKey:
-		switch c.authState {
-		case authStateAwaitingDHKey:
-			var isSame bool
-			if isSame, err = c.processDHKey(msg); err != nil {
-				return
-			}
-			if isSame {
-				err = errors.New("otr: unexpected duplicate DH key")
-				return
-			}
-			toSend = c.encode(c.generateRevealSig())
-			c.authState = authStateAwaitingSig
-		case authStateAwaitingSig:
-			var isSame bool
-			if isSame, err = c.processDHKey(msg); err != nil {
-				return
-			}
-			if isSame {
-				toSend = c.encode(c.serializeDHKey())
-			}
-		}
-	case msgTypeRevealSig:
-		if c.authState != authStateAwaitingRevealSig {
-			return
-		}
-		if err = c.processRevealSig(msg); err != nil {
-			return
-		}
-		toSend = c.encode(c.generateSig())
-		c.authState = authStateNone
-		c.state = stateEncrypted
-		change = NewKeys
-	case msgTypeSig:
-		if c.authState != authStateAwaitingSig {
-			return
-		}
-		if err = c.processSig(msg); err != nil {
-			return
-		}
-		c.authState = authStateNone
-		c.state = stateEncrypted
-		change = NewKeys
-	case msgTypeData:
-		if c.state != stateEncrypted {
-			err = errors.New("otr: encrypted message received without encrypted session established")
-			return
-		}
-		var tlvs []tlv
-		out, tlvs, err = c.processData(msg)
-		encrypted = true
-
-	EachTLV:
-		for _, inTLV := range tlvs {
-			switch inTLV.typ {
-			case tlvTypeDisconnected:
-				change = ConversationEnded
-				c.state = stateFinished
-				break EachTLV
-			case tlvTypeSMP1, tlvTypeSMP2, tlvTypeSMP3, tlvTypeSMP4, tlvTypeSMPAbort, tlvTypeSMP1WithQuestion:
-				var reply tlv
-				var complete bool
-				reply, complete, err = c.processSMP(inTLV)
-				if err == smpSecretMissingError {
-					err = nil
-					change = SMPSecretNeeded
-					c.smp.saved = &inTLV
-					return
-				}
-				if err == smpFailureError {
-					err = nil
-					change = SMPFailed
-				} else if complete {
-					change = SMPComplete
-				}
-				if reply.typ != 0 {
-					toSend = c.encode(c.generateData(nil, &reply))
-				}
-				break EachTLV
-			default:
-				// skip unknown TLVs
-			}
-		}
-	default:
-		err = errors.New("otr: unknown message type " + strconv.Itoa(msgType))
-	}
-
-	return
-}
-
-// Send takes a human readable message from the local user, possibly encrypts
-// it and returns zero one or more messages to send to the peer.
-func (c *Conversation) Send(msg []byte) ([][]byte, error) {
-	switch c.state {
-	case statePlaintext:
-		return [][]byte{msg}, nil
-	case stateEncrypted:
-		return c.encode(c.generateData(msg, nil)), nil
-	case stateFinished:
-		return nil, errors.New("otr: cannot send message because secure conversation has finished")
-	}
-
-	return nil, errors.New("otr: cannot send message in current state")
-}
-
-// SMPQuestion returns the human readable challenge question from the peer.
-// It's only valid after Receive has returned SMPSecretNeeded.
-func (c *Conversation) SMPQuestion() string {
-	return c.smp.question
-}
-
-// Authenticate begins an authentication with the peer. Authentication involves
-// an optional challenge message and a shared secret. The authentication
-// proceeds until either Receive returns SMPComplete, SMPSecretNeeded (which
-// indicates that a new authentication is happening and thus this one was
-// aborted) or SMPFailed.
-func (c *Conversation) Authenticate(question string, mutualSecret []byte) (toSend [][]byte, err error) {
-	if c.state != stateEncrypted {
-		err = errors.New("otr: can't authenticate a peer without a secure conversation established")
-		return
-	}
-
-	if c.smp.saved != nil {
-		c.calcSMPSecret(mutualSecret, false /* they started it */)
-
-		var out tlv
-		var complete bool
-		out, complete, err = c.processSMP(*c.smp.saved)
-		if complete {
-			panic("SMP completed on the first message")
-		}
-		c.smp.saved = nil
-		if out.typ != 0 {
-			toSend = c.encode(c.generateData(nil, &out))
-		}
-		return
-	}
-
-	c.calcSMPSecret(mutualSecret, true /* we started it */)
-	outs := c.startSMP(question)
-	for _, out := range outs {
-		toSend = append(toSend, c.encode(c.generateData(nil, &out))...)
-	}
-	return
-}
-
-// End ends a secure conversation by generating a termination message for
-// the peer and switches to unencrypted communication.
-func (c *Conversation) End() (toSend [][]byte) {
-	switch c.state {
-	case statePlaintext:
-		return nil
-	case stateEncrypted:
-		c.state = statePlaintext
-		return c.encode(c.generateData(nil, &tlv{typ: tlvTypeDisconnected}))
-	case stateFinished:
-		c.state = statePlaintext
-		return nil
-	}
-	panic("unreachable")
-}
-
-// IsEncrypted returns true if a message passed to Send would be encrypted
-// before transmission. This result remains valid until the next call to
-// Receive or End, which may change the state of the Conversation.
-func (c *Conversation) IsEncrypted() bool {
-	return c.state == stateEncrypted
-}
-
-var fragmentError = errors.New("otr: invalid OTR fragment")
-
-// processFragment processes a fragmented OTR message and possibly returns a
-// complete message. Fragmented messages look like "?OTR,k,n,msg," where k is
-// the fragment number (starting from 1), n is the number of fragments in this
-// message and msg is a substring of the base64 encoded message.
-func (c *Conversation) processFragment(in []byte) (out []byte, err error) {
-	in = in[len(fragmentPrefix):] // remove "?OTR,"
-	parts := bytes.Split(in, fragmentPartSeparator)
-	if len(parts) != 4 || len(parts[3]) != 0 {
-		return nil, fragmentError
-	}
-
-	k, err := strconv.Atoi(string(parts[0]))
-	if err != nil {
-		return nil, fragmentError
-	}
-
-	n, err := strconv.Atoi(string(parts[1]))
-	if err != nil {
-		return nil, fragmentError
-	}
-
-	if k < 1 || n < 1 || k > n {
-		return nil, fragmentError
-	}
-
-	if k == 1 {
-		c.frag = append(c.frag[:0], parts[2]...)
-		c.k, c.n = k, n
-	} else if n == c.n && k == c.k+1 {
-		c.frag = append(c.frag, parts[2]...)
-		c.k++
-	} else {
-		c.frag = c.frag[:0]
-		c.n, c.k = 0, 0
-	}
-
-	if c.n > 0 && c.k == c.n {
-		c.n, c.k = 0, 0
-		return c.frag, nil
-	}
-
-	return nil, nil
-}
-
-func (c *Conversation) generateDHCommit() []byte {
-	_, err := io.ReadFull(c.rand(), c.r[:])
-	if err != nil {
-		panic("otr: short read from random source")
-	}
-
-	var xBytes [dhPrivateBytes]byte
-	c.x = c.randMPI(xBytes[:])
-	c.gx = new(big.Int).Exp(g, c.x, p)
-	c.gy = nil
-	c.gxBytes = appendMPI(nil, c.gx)
-
-	h := sha256.New()
-	h.Write(c.gxBytes)
-	h.Sum(c.digest[:0])
-
-	aesCipher, err := aes.NewCipher(c.r[:])
-	if err != nil {
-		panic(err.Error())
-	}
-
-	var iv [aes.BlockSize]byte
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(c.gxBytes, c.gxBytes)
-
-	return c.serializeDHCommit()
-}
-
-func (c *Conversation) serializeDHCommit() []byte {
-	var ret []byte
-	ret = appendU16(ret, 2) // protocol version
-	ret = append(ret, msgTypeDHCommit)
-	ret = appendData(ret, c.gxBytes)
-	ret = appendData(ret, c.digest[:])
-	return ret
-}
-
-func (c *Conversation) processDHCommit(in []byte) error {
-	var ok1, ok2 bool
-	c.gxBytes, in, ok1 = getData(in)
-	digest, in, ok2 := getData(in)
-	if !ok1 || !ok2 || len(in) > 0 {
-		return errors.New("otr: corrupt DH commit message")
-	}
-	copy(c.digest[:], digest)
-	return nil
-}
-
-func (c *Conversation) compareToDHCommit(in []byte) (int, error) {
-	_, in, ok1 := getData(in)
-	digest, in, ok2 := getData(in)
-	if !ok1 || !ok2 || len(in) > 0 {
-		return 0, errors.New("otr: corrupt DH commit message")
-	}
-	return bytes.Compare(c.digest[:], digest), nil
-}
-
-func (c *Conversation) generateDHKey() []byte {
-	var yBytes [dhPrivateBytes]byte
-	c.y = c.randMPI(yBytes[:])
-	c.gy = new(big.Int).Exp(g, c.y, p)
-	return c.serializeDHKey()
-}
-
-func (c *Conversation) serializeDHKey() []byte {
-	var ret []byte
-	ret = appendU16(ret, 2) // protocol version
-	ret = append(ret, msgTypeDHKey)
-	ret = appendMPI(ret, c.gy)
-	return ret
-}
-
-func (c *Conversation) processDHKey(in []byte) (isSame bool, err error) {
-	gy, in, ok := getMPI(in)
-	if !ok {
-		err = errors.New("otr: corrupt DH key message")
-		return
-	}
-	if gy.Cmp(g) < 0 || gy.Cmp(pMinus2) > 0 {
-		err = errors.New("otr: DH value out of range")
-		return
-	}
-	if c.gy != nil {
-		isSame = c.gy.Cmp(gy) == 0
-		return
-	}
-	c.gy = gy
-	return
-}
-
-func (c *Conversation) generateEncryptedSignature(keys *akeKeys, xFirst bool) ([]byte, []byte) {
-	var xb []byte
-	xb = c.PrivateKey.PublicKey.Serialize(xb)
-
-	var verifyData []byte
-	if xFirst {
-		verifyData = appendMPI(verifyData, c.gx)
-		verifyData = appendMPI(verifyData, c.gy)
-	} else {
-		verifyData = appendMPI(verifyData, c.gy)
-		verifyData = appendMPI(verifyData, c.gx)
-	}
-	verifyData = append(verifyData, xb...)
-	verifyData = appendU32(verifyData, c.myKeyId)
-
-	mac := hmac.New(sha256.New, keys.m1[:])
-	mac.Write(verifyData)
-	mb := mac.Sum(nil)
-
-	xb = appendU32(xb, c.myKeyId)
-	xb = append(xb, c.PrivateKey.Sign(c.rand(), mb)...)
-
-	aesCipher, err := aes.NewCipher(keys.c[:])
-	if err != nil {
-		panic(err.Error())
-	}
-	var iv [aes.BlockSize]byte
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(xb, xb)
-
-	mac = hmac.New(sha256.New, keys.m2[:])
-	encryptedSig := appendData(nil, xb)
-	mac.Write(encryptedSig)
-
-	return encryptedSig, mac.Sum(nil)
-}
-
-func (c *Conversation) generateRevealSig() []byte {
-	s := new(big.Int).Exp(c.gy, c.x, p)
-	c.calcAKEKeys(s)
-	c.myKeyId++
-
-	encryptedSig, mac := c.generateEncryptedSignature(&c.revealKeys, true /* gx comes first */)
-
-	c.myCurrentDHPub = c.gx
-	c.myCurrentDHPriv = c.x
-	c.rotateDHKeys()
-	incCounter(&c.myCounter)
-
-	var ret []byte
-	ret = appendU16(ret, 2)
-	ret = append(ret, msgTypeRevealSig)
-	ret = appendData(ret, c.r[:])
-	ret = append(ret, encryptedSig...)
-	ret = append(ret, mac[:20]...)
-	return ret
-}
-
-func (c *Conversation) processEncryptedSig(encryptedSig, theirMAC []byte, keys *akeKeys, xFirst bool) error {
-	mac := hmac.New(sha256.New, keys.m2[:])
-	mac.Write(appendData(nil, encryptedSig))
-	myMAC := mac.Sum(nil)[:20]
-
-	if len(myMAC) != len(theirMAC) || subtle.ConstantTimeCompare(myMAC, theirMAC) == 0 {
-		return errors.New("bad signature MAC in encrypted signature")
-	}
-
-	aesCipher, err := aes.NewCipher(keys.c[:])
-	if err != nil {
-		panic(err.Error())
-	}
-	var iv [aes.BlockSize]byte
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(encryptedSig, encryptedSig)
-
-	sig := encryptedSig
-	sig, ok1 := c.TheirPublicKey.Parse(sig)
-	keyId, sig, ok2 := getU32(sig)
-	if !ok1 || !ok2 {
-		return errors.New("otr: corrupt encrypted signature")
-	}
-
-	var verifyData []byte
-	if xFirst {
-		verifyData = appendMPI(verifyData, c.gx)
-		verifyData = appendMPI(verifyData, c.gy)
-	} else {
-		verifyData = appendMPI(verifyData, c.gy)
-		verifyData = appendMPI(verifyData, c.gx)
-	}
-	verifyData = c.TheirPublicKey.Serialize(verifyData)
-	verifyData = appendU32(verifyData, keyId)
-
-	mac = hmac.New(sha256.New, keys.m1[:])
-	mac.Write(verifyData)
-	mb := mac.Sum(nil)
-
-	sig, ok1 = c.TheirPublicKey.Verify(mb, sig)
-	if !ok1 {
-		return errors.New("bad signature in encrypted signature")
-	}
-	if len(sig) > 0 {
-		return errors.New("corrupt encrypted signature")
-	}
-
-	c.theirKeyId = keyId
-	zero(c.theirLastCtr[:])
-	return nil
-}
-
-func (c *Conversation) processRevealSig(in []byte) error {
-	r, in, ok1 := getData(in)
-	encryptedSig, in, ok2 := getData(in)
-	theirMAC := in
-	if !ok1 || !ok2 || len(theirMAC) != 20 {
-		return errors.New("otr: corrupt reveal signature message")
-	}
-
-	aesCipher, err := aes.NewCipher(r)
-	if err != nil {
-		return errors.New("otr: cannot create AES cipher from reveal signature message: " + err.Error())
-	}
-	var iv [aes.BlockSize]byte
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(c.gxBytes, c.gxBytes)
-	h := sha256.New()
-	h.Write(c.gxBytes)
-	digest := h.Sum(nil)
-	if len(digest) != len(c.digest) || subtle.ConstantTimeCompare(digest, c.digest[:]) == 0 {
-		return errors.New("otr: bad commit MAC in reveal signature message")
-	}
-	var rest []byte
-	c.gx, rest, ok1 = getMPI(c.gxBytes)
-	if !ok1 || len(rest) > 0 {
-		return errors.New("otr: gx corrupt after decryption")
-	}
-	if c.gx.Cmp(g) < 0 || c.gx.Cmp(pMinus2) > 0 {
-		return errors.New("otr: DH value out of range")
-	}
-	s := new(big.Int).Exp(c.gx, c.y, p)
-	c.calcAKEKeys(s)
-
-	if err := c.processEncryptedSig(encryptedSig, theirMAC, &c.revealKeys, true /* gx comes first */); err != nil {
-		return errors.New("otr: in reveal signature message: " + err.Error())
-	}
-
-	c.theirCurrentDHPub = c.gx
-	c.theirLastDHPub = nil
-
-	return nil
-}
-
-func (c *Conversation) generateSig() []byte {
-	c.myKeyId++
-
-	encryptedSig, mac := c.generateEncryptedSignature(&c.sigKeys, false /* gy comes first */)
-
-	c.myCurrentDHPub = c.gy
-	c.myCurrentDHPriv = c.y
-	c.rotateDHKeys()
-	incCounter(&c.myCounter)
-
-	var ret []byte
-	ret = appendU16(ret, 2)
-	ret = append(ret, msgTypeSig)
-	ret = append(ret, encryptedSig...)
-	ret = append(ret, mac[:macPrefixBytes]...)
-	return ret
-}
-
-func (c *Conversation) processSig(in []byte) error {
-	encryptedSig, in, ok1 := getData(in)
-	theirMAC := in
-	if !ok1 || len(theirMAC) != macPrefixBytes {
-		return errors.New("otr: corrupt signature message")
-	}
-
-	if err := c.processEncryptedSig(encryptedSig, theirMAC, &c.sigKeys, false /* gy comes first */); err != nil {
-		return errors.New("otr: in signature message: " + err.Error())
-	}
-
-	c.theirCurrentDHPub = c.gy
-	c.theirLastDHPub = nil
-
-	return nil
-}
-
-func (c *Conversation) rotateDHKeys() {
-	// evict slots using our retired key id
-	for i := range c.keySlots {
-		slot := &c.keySlots[i]
-		if slot.used && slot.myKeyId == c.myKeyId-1 {
-			slot.used = false
-			c.oldMACs = append(c.oldMACs, slot.recvMACKey...)
-		}
-	}
-
-	c.myLastDHPriv = c.myCurrentDHPriv
-	c.myLastDHPub = c.myCurrentDHPub
-
-	var xBytes [dhPrivateBytes]byte
-	c.myCurrentDHPriv = c.randMPI(xBytes[:])
-	c.myCurrentDHPub = new(big.Int).Exp(g, c.myCurrentDHPriv, p)
-	c.myKeyId++
-}
-
-func (c *Conversation) processData(in []byte) (out []byte, tlvs []tlv, err error) {
-	origIn := in
-	flags, in, ok1 := getU8(in)
-	theirKeyId, in, ok2 := getU32(in)
-	myKeyId, in, ok3 := getU32(in)
-	y, in, ok4 := getMPI(in)
-	counter, in, ok5 := getNBytes(in, 8)
-	encrypted, in, ok6 := getData(in)
-	macedData := origIn[:len(origIn)-len(in)]
-	theirMAC, in, ok7 := getNBytes(in, macPrefixBytes)
-	_, in, ok8 := getData(in)
-	if !ok1 || !ok2 || !ok3 || !ok4 || !ok5 || !ok6 || !ok7 || !ok8 || len(in) > 0 {
-		err = errors.New("otr: corrupt data message")
-		return
-	}
-
-	ignoreErrors := flags&1 != 0
-
-	slot, err := c.calcDataKeys(myKeyId, theirKeyId)
-	if err != nil {
-		if ignoreErrors {
-			err = nil
-		}
-		return
-	}
-
-	mac := hmac.New(sha1.New, slot.recvMACKey)
-	mac.Write([]byte{0, 2, 3})
-	mac.Write(macedData)
-	myMAC := mac.Sum(nil)
-	if len(myMAC) != len(theirMAC) || subtle.ConstantTimeCompare(myMAC, theirMAC) == 0 {
-		if !ignoreErrors {
-			err = errors.New("otr: bad MAC on data message")
-		}
-		return
-	}
-
-	if bytes.Compare(counter, slot.theirLastCtr[:]) <= 0 {
-		err = errors.New("otr: counter regressed")
-		return
-	}
-	copy(slot.theirLastCtr[:], counter)
-
-	var iv [aes.BlockSize]byte
-	copy(iv[:], counter)
-	aesCipher, err := aes.NewCipher(slot.recvAESKey)
-	if err != nil {
-		panic(err.Error())
-	}
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(encrypted, encrypted)
-	decrypted := encrypted
-
-	if myKeyId == c.myKeyId {
-		c.rotateDHKeys()
-	}
-	if theirKeyId == c.theirKeyId {
-		// evict slots using their retired key id
-		for i := range c.keySlots {
-			slot := &c.keySlots[i]
-			if slot.used && slot.theirKeyId == theirKeyId-1 {
-				slot.used = false
-				c.oldMACs = append(c.oldMACs, slot.recvMACKey...)
-			}
-		}
-
-		c.theirLastDHPub = c.theirCurrentDHPub
-		c.theirKeyId++
-		c.theirCurrentDHPub = y
-	}
-
-	if nulPos := bytes.IndexByte(decrypted, 0); nulPos >= 0 {
-		out = decrypted[:nulPos]
-		tlvData := decrypted[nulPos+1:]
-		for len(tlvData) > 0 {
-			var t tlv
-			var ok1, ok2, ok3 bool
-
-			t.typ, tlvData, ok1 = getU16(tlvData)
-			t.length, tlvData, ok2 = getU16(tlvData)
-			t.data, tlvData, ok3 = getNBytes(tlvData, int(t.length))
-			if !ok1 || !ok2 || !ok3 {
-				err = errors.New("otr: corrupt tlv data")
-				return
-			}
-			tlvs = append(tlvs, t)
-		}
-	} else {
-		out = decrypted
-	}
-
-	return
-}
-
-func (c *Conversation) generateData(msg []byte, extra *tlv) []byte {
-	slot, err := c.calcDataKeys(c.myKeyId-1, c.theirKeyId)
-	if err != nil {
-		panic("otr: failed to generate sending keys: " + err.Error())
-	}
-
-	var plaintext []byte
-	plaintext = append(plaintext, msg...)
-	plaintext = append(plaintext, 0)
-
-	padding := paddingGranularity - ((len(plaintext) + 4) % paddingGranularity)
-	plaintext = appendU16(plaintext, tlvTypePadding)
-	plaintext = appendU16(plaintext, uint16(padding))
-	for i := 0; i < padding; i++ {
-		plaintext = append(plaintext, 0)
-	}
-
-	if extra != nil {
-		plaintext = appendU16(plaintext, extra.typ)
-		plaintext = appendU16(plaintext, uint16(len(extra.data)))
-		plaintext = append(plaintext, extra.data...)
-	}
-
-	encrypted := make([]byte, len(plaintext))
-
-	var iv [aes.BlockSize]byte
-	copy(iv[:], c.myCounter[:])
-	aesCipher, err := aes.NewCipher(slot.sendAESKey)
-	if err != nil {
-		panic(err.Error())
-	}
-	ctr := cipher.NewCTR(aesCipher, iv[:])
-	ctr.XORKeyStream(encrypted, plaintext)
-
-	var ret []byte
-	ret = appendU16(ret, 2)
-	ret = append(ret, msgTypeData)
-	ret = append(ret, 0 /* flags */)
-	ret = appendU32(ret, c.myKeyId-1)
-	ret = appendU32(ret, c.theirKeyId)
-	ret = appendMPI(ret, c.myCurrentDHPub)
-	ret = append(ret, c.myCounter[:]...)
-	ret = appendData(ret, encrypted)
-
-	mac := hmac.New(sha1.New, slot.sendMACKey)
-	mac.Write(ret)
-	ret = append(ret, mac.Sum(nil)[:macPrefixBytes]...)
-	ret = appendData(ret, c.oldMACs)
-	c.oldMACs = nil
-	incCounter(&c.myCounter)
-
-	return ret
-}
-
-func incCounter(counter *[8]byte) {
-	for i := 7; i >= 0; i-- {
-		counter[i]++
-		if counter[i] > 0 {
-			break
-		}
-	}
-}
-
-// calcDataKeys computes the keys used to encrypt a data message given the key
-// IDs.
-func (c *Conversation) calcDataKeys(myKeyId, theirKeyId uint32) (slot *keySlot, err error) {
-	// Check for a cache hit.
-	for i := range c.keySlots {
-		slot = &c.keySlots[i]
-		if slot.used && slot.theirKeyId == theirKeyId && slot.myKeyId == myKeyId {
-			return
-		}
-	}
-
-	// Find an empty slot to write into.
-	slot = nil
-	for i := range c.keySlots {
-		if !c.keySlots[i].used {
-			slot = &c.keySlots[i]
-			break
-		}
-	}
-	if slot == nil {
-		return nil, errors.New("otr: internal error: no more key slots")
-	}
-
-	var myPriv, myPub, theirPub *big.Int
-
-	if myKeyId == c.myKeyId {
-		myPriv = c.myCurrentDHPriv
-		myPub = c.myCurrentDHPub
-	} else if myKeyId == c.myKeyId-1 {
-		myPriv = c.myLastDHPriv
-		myPub = c.myLastDHPub
-	} else {
-		err = errors.New("otr: peer requested keyid " + strconv.FormatUint(uint64(myKeyId), 10) + " when I'm on " + strconv.FormatUint(uint64(c.myKeyId), 10))
-		return
-	}
-
-	if theirKeyId == c.theirKeyId {
-		theirPub = c.theirCurrentDHPub
-	} else if theirKeyId == c.theirKeyId-1 && c.theirLastDHPub != nil {
-		theirPub = c.theirLastDHPub
-	} else {
-		err = errors.New("otr: peer requested keyid " + strconv.FormatUint(uint64(myKeyId), 10) + " when they're on " + strconv.FormatUint(uint64(c.myKeyId), 10))
-		return
-	}
-
-	var sendPrefixByte, recvPrefixByte [1]byte
-
-	if myPub.Cmp(theirPub) > 0 {
-		// we're the high end
-		sendPrefixByte[0], recvPrefixByte[0] = 1, 2
-	} else {
-		// we're the low end
-		sendPrefixByte[0], recvPrefixByte[0] = 2, 1
-	}
-
-	s := new(big.Int).Exp(theirPub, myPriv, p)
-	sBytes := appendMPI(nil, s)
-
-	h := sha1.New()
-	h.Write(sendPrefixByte[:])
-	h.Write(sBytes)
-	slot.sendAESKey = h.Sum(slot.sendAESKey[:0])[:16]
-
-	h.Reset()
-	h.Write(slot.sendAESKey)
-	slot.sendMACKey = h.Sum(slot.sendMACKey[:0])
-
-	h.Reset()
-	h.Write(recvPrefixByte[:])
-	h.Write(sBytes)
-	slot.recvAESKey = h.Sum(slot.recvAESKey[:0])[:16]
-
-	h.Reset()
-	h.Write(slot.recvAESKey)
-	slot.recvMACKey = h.Sum(slot.recvMACKey[:0])
-
-	slot.theirKeyId = theirKeyId
-	slot.myKeyId = myKeyId
-	slot.used = true
-
-	zero(slot.theirLastCtr[:])
-	return
-}
-
-func (c *Conversation) calcAKEKeys(s *big.Int) {
-	mpi := appendMPI(nil, s)
-	h := sha256.New()
-
-	var cBytes [32]byte
-	hashWithPrefix(c.SSID[:], 0, mpi, h)
-
-	hashWithPrefix(cBytes[:], 1, mpi, h)
-	copy(c.revealKeys.c[:], cBytes[:16])
-	copy(c.sigKeys.c[:], cBytes[16:])
-
-	hashWithPrefix(c.revealKeys.m1[:], 2, mpi, h)
-	hashWithPrefix(c.revealKeys.m2[:], 3, mpi, h)
-	hashWithPrefix(c.sigKeys.m1[:], 4, mpi, h)
-	hashWithPrefix(c.sigKeys.m2[:], 5, mpi, h)
-}
-
-func hashWithPrefix(out []byte, prefix byte, in []byte, h hash.Hash) {
-	h.Reset()
-	var p [1]byte
-	p[0] = prefix
-	h.Write(p[:])
-	h.Write(in)
-	if len(out) == h.Size() {
-		h.Sum(out[:0])
-	} else {
-		digest := h.Sum(nil)
-		copy(out, digest)
-	}
-}
-
-func (c *Conversation) encode(msg []byte) [][]byte {
-	b64 := make([]byte, base64.StdEncoding.EncodedLen(len(msg))+len(msgPrefix)+1)
-	base64.StdEncoding.Encode(b64[len(msgPrefix):], msg)
-	copy(b64, msgPrefix)
-	b64[len(b64)-1] = '.'
-
-	if c.FragmentSize < minFragmentSize || len(b64) <= c.FragmentSize {
-		// We can encode this in a single fragment.
-		return [][]byte{b64}
-	}
-
-	// We have to fragment this message.
-	var ret [][]byte
-	bytesPerFragment := c.FragmentSize - minFragmentSize
-	numFragments := (len(b64) + bytesPerFragment) / bytesPerFragment
-
-	for i := 0; i < numFragments; i++ {
-		frag := []byte("?OTR," + strconv.Itoa(i+1) + "," + strconv.Itoa(numFragments) + ",")
-		todo := bytesPerFragment
-		if todo > len(b64) {
-			todo = len(b64)
-		}
-		frag = append(frag, b64[:todo]...)
-		b64 = b64[todo:]
-		frag = append(frag, ',')
-		ret = append(ret, frag)
-	}
-
-	return ret
-}
-
-func (c *Conversation) reset() {
-	c.myKeyId = 0
-
-	for i := range c.keySlots {
-		c.keySlots[i].used = false
-	}
-}
-
-type PublicKey struct {
-	dsa.PublicKey
-}
-
-func (pk *PublicKey) Parse(in []byte) ([]byte, bool) {
-	var ok bool
-	var pubKeyType uint16
-
-	if pubKeyType, in, ok = getU16(in); !ok || pubKeyType != 0 {
-		return nil, false
-	}
-	if pk.P, in, ok = getMPI(in); !ok {
-		return nil, false
-	}
-	if pk.Q, in, ok = getMPI(in); !ok {
-		return nil, false
-	}
-	if pk.G, in, ok = getMPI(in); !ok {
-		return nil, false
-	}
-	if pk.Y, in, ok = getMPI(in); !ok {
-		return nil, false
-	}
-
-	return in, true
-}
-
-func (pk *PublicKey) Serialize(in []byte) []byte {
-	in = appendU16(in, 0)
-	in = appendMPI(in, pk.P)
-	in = appendMPI(in, pk.Q)
-	in = appendMPI(in, pk.G)
-	in = appendMPI(in, pk.Y)
-	return in
-}
-
-// Fingerprint returns the 20-byte, binary fingerprint of the PublicKey.
-func (pk *PublicKey) Fingerprint() []byte {
-	b := pk.Serialize(nil)
-	h := sha1.New()
-	h.Write(b[2:])
-	return h.Sum(nil)
-}
-
-func (pk *PublicKey) Verify(hashed, sig []byte) ([]byte, bool) {
-	if len(sig) != 2*dsaSubgroupBytes {
-		return nil, false
-	}
-	r := new(big.Int).SetBytes(sig[:dsaSubgroupBytes])
-	s := new(big.Int).SetBytes(sig[dsaSubgroupBytes:])
-	ok := dsa.Verify(&pk.PublicKey, hashed, r, s)
-	return sig[dsaSubgroupBytes*2:], ok
-}
-
-type PrivateKey struct {
-	PublicKey
-	dsa.PrivateKey
-}
-
-func (priv *PrivateKey) Sign(rand io.Reader, hashed []byte) []byte {
-	r, s, err := dsa.Sign(rand, &priv.PrivateKey, hashed)
-	if err != nil {
-		panic(err.Error())
-	}
-	rBytes := r.Bytes()
-	sBytes := s.Bytes()
-	if len(rBytes) > dsaSubgroupBytes || len(sBytes) > dsaSubgroupBytes {
-		panic("DSA signature too large")
-	}
-
-	out := make([]byte, 2*dsaSubgroupBytes)
-	copy(out[dsaSubgroupBytes-len(rBytes):], rBytes)
-	copy(out[len(out)-len(sBytes):], sBytes)
-	return out
-}
-
-func (priv *PrivateKey) Serialize(in []byte) []byte {
-	in = priv.PublicKey.Serialize(in)
-	in = appendMPI(in, priv.PrivateKey.X)
-	return in
-}
-
-func (priv *PrivateKey) Parse(in []byte) ([]byte, bool) {
-	in, ok := priv.PublicKey.Parse(in)
-	if !ok {
-		return in, ok
-	}
-	priv.PrivateKey.PublicKey = priv.PublicKey.PublicKey
-	priv.PrivateKey.X, in, ok = getMPI(in)
-	return in, ok
-}
-
-func (priv *PrivateKey) Generate(rand io.Reader) {
-	if err := dsa.GenerateParameters(&priv.PrivateKey.PublicKey.Parameters, rand, dsa.L1024N160); err != nil {
-		panic(err.Error())
-	}
-	if err := dsa.GenerateKey(&priv.PrivateKey, rand); err != nil {
-		panic(err.Error())
-	}
-	priv.PublicKey.PublicKey = priv.PrivateKey.PublicKey
-}
-
-func notHex(r rune) bool {
-	if r >= '0' && r <= '9' ||
-		r >= 'a' && r <= 'f' ||
-		r >= 'A' && r <= 'F' {
-		return false
-	}
-
-	return true
-}
-
-// Import parses the contents of a libotr private key file.
-func (priv *PrivateKey) Import(in []byte) bool {
-	mpiStart := []byte(" #")
-
-	mpis := make([]*big.Int, 5)
-
-	for i := 0; i < len(mpis); i++ {
-		start := bytes.Index(in, mpiStart)
-		if start == -1 {
-			return false
-		}
-		in = in[start+len(mpiStart):]
-		end := bytes.IndexFunc(in, notHex)
-		if end == -1 {
-			return false
-		}
-		hexBytes := in[:end]
-		in = in[end:]
-
-		if len(hexBytes)&1 != 0 {
-			return false
-		}
-
-		mpiBytes := make([]byte, len(hexBytes)/2)
-		if _, err := hex.Decode(mpiBytes, hexBytes); err != nil {
-			return false
-		}
-
-		mpis[i] = new(big.Int).SetBytes(mpiBytes)
-	}
-
-	for _, mpi := range mpis {
-		if mpi.Sign() <= 0 {
-			return false
-		}
-	}
-
-	priv.PrivateKey.P = mpis[0]
-	priv.PrivateKey.Q = mpis[1]
-	priv.PrivateKey.G = mpis[2]
-	priv.PrivateKey.Y = mpis[3]
-	priv.PrivateKey.X = mpis[4]
-	priv.PublicKey.PublicKey = priv.PrivateKey.PublicKey
-
-	a := new(big.Int).Exp(priv.PrivateKey.G, priv.PrivateKey.X, priv.PrivateKey.P)
-	return a.Cmp(priv.PrivateKey.Y) == 0
-}
-
-func getU8(in []byte) (uint8, []byte, bool) {
-	if len(in) < 1 {
-		return 0, in, false
-	}
-	return in[0], in[1:], true
-}
-
-func getU16(in []byte) (uint16, []byte, bool) {
-	if len(in) < 2 {
-		return 0, in, false
-	}
-	r := uint16(in[0])<<8 | uint16(in[1])
-	return r, in[2:], true
-}
-
-func getU32(in []byte) (uint32, []byte, bool) {
-	if len(in) < 4 {
-		return 0, in, false
-	}
-	r := uint32(in[0])<<24 | uint32(in[1])<<16 | uint32(in[2])<<8 | uint32(in[3])
-	return r, in[4:], true
-}
-
-func getMPI(in []byte) (*big.Int, []byte, bool) {
-	l, in, ok := getU32(in)
-	if !ok || uint32(len(in)) < l {
-		return nil, in, false
-	}
-	r := new(big.Int).SetBytes(in[:l])
-	return r, in[l:], true
-}
-
-func getData(in []byte) ([]byte, []byte, bool) {
-	l, in, ok := getU32(in)
-	if !ok || uint32(len(in)) < l {
-		return nil, in, false
-	}
-	return in[:l], in[l:], true
-}
-
-func getNBytes(in []byte, n int) ([]byte, []byte, bool) {
-	if len(in) < n {
-		return nil, in, false
-	}
-	return in[:n], in[n:], true
-}
-
-func appendU16(out []byte, v uint16) []byte {
-	out = append(out, byte(v>>8), byte(v))
-	return out
-}
-
-func appendU32(out []byte, v uint32) []byte {
-	out = append(out, byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-	return out
-}
-
-func appendData(out, v []byte) []byte {
-	out = appendU32(out, uint32(len(v)))
-	out = append(out, v...)
-	return out
-}
-
-func appendMPI(out []byte, v *big.Int) []byte {
-	vBytes := v.Bytes()
-	out = appendU32(out, uint32(len(vBytes)))
-	out = append(out, vBytes...)
-	return out
-}
-
-func appendMPIs(out []byte, mpis ...*big.Int) []byte {
-	for _, mpi := range mpis {
-		out = appendMPI(out, mpi)
-	}
-	return out
-}
-
-func zero(b []byte) {
-	for i := range b {
-		b[i] = 0
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/otr/otr_test.go b/installer/vendor/golang.org/x/crypto/otr/otr_test.go
deleted file mode 100644
index cfcd062b27..0000000000
--- a/installer/vendor/golang.org/x/crypto/otr/otr_test.go
+++ /dev/null
@@ -1,470 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package otr
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/rand"
-	"encoding/hex"
-	"math/big"
-	"os"
-	"os/exec"
-	"testing"
-)
-
-var isQueryTests = []struct {
-	msg             string
-	expectedVersion int
-}{
-	{"foo", 0},
-	{"?OtR", 0},
-	{"?OtR?", 0},
-	{"?OTR?", 0},
-	{"?OTRv?", 0},
-	{"?OTRv1?", 0},
-	{"?OTR?v1?", 0},
-	{"?OTR?v?", 0},
-	{"?OTR?v2?", 2},
-	{"?OTRv2?", 2},
-	{"?OTRv23?", 2},
-	{"?OTRv23 ?", 0},
-}
-
-func TestIsQuery(t *testing.T) {
-	for i, test := range isQueryTests {
-		version := isQuery([]byte(test.msg))
-		if version != test.expectedVersion {
-			t.Errorf("#%d: got %d, want %d", i, version, test.expectedVersion)
-		}
-	}
-}
-
-var alicePrivateKeyHex = "000000000080c81c2cb2eb729b7e6fd48e975a932c638b3a9055478583afa46755683e30102447f6da2d8bec9f386bbb5da6403b0040fee8650b6ab2d7f32c55ab017ae9b6aec8c324ab5844784e9a80e194830d548fb7f09a0410df2c4d5c8bc2b3e9ad484e65412be689cf0834694e0839fb2954021521ffdffb8f5c32c14dbf2020b3ce7500000014da4591d58def96de61aea7b04a8405fe1609308d000000808ddd5cb0b9d66956e3dea5a915d9aba9d8a6e7053b74dadb2fc52f9fe4e5bcc487d2305485ed95fed026ad93f06ebb8c9e8baf693b7887132c7ffdd3b0f72f4002ff4ed56583ca7c54458f8c068ca3e8a4dfa309d1dd5d34e2a4b68e6f4338835e5e0fb4317c9e4c7e4806dafda3ef459cd563775a586dd91b1319f72621bf3f00000080b8147e74d8c45e6318c37731b8b33b984a795b3653c2cd1d65cc99efe097cb7eb2fa49569bab5aab6e8a1c261a27d0f7840a5e80b317e6683042b59b6dceca2879c6ffc877a465be690c15e4a42f9a7588e79b10faac11b1ce3741fcef7aba8ce05327a2c16d279ee1b3d77eb783fb10e3356caa25635331e26dd42b8396c4d00000001420bec691fea37ecea58a5c717142f0b804452f57"
-
-var aliceFingerprintHex = "0bb01c360424522e94ee9c346ce877a1a4288b2f"
-
-var bobPrivateKeyHex = "000000000080a5138eb3d3eb9c1d85716faecadb718f87d31aaed1157671d7fee7e488f95e8e0ba60ad449ec732710a7dec5190f7182af2e2f98312d98497221dff160fd68033dd4f3a33b7c078d0d9f66e26847e76ca7447d4bab35486045090572863d9e4454777f24d6706f63e02548dfec2d0a620af37bbc1d24f884708a212c343b480d00000014e9c58f0ea21a5e4dfd9f44b6a9f7f6a9961a8fa9000000803c4d111aebd62d3c50c2889d420a32cdf1e98b70affcc1fcf44d59cca2eb019f6b774ef88153fb9b9615441a5fe25ea2d11b74ce922ca0232bd81b3c0fcac2a95b20cb6e6c0c5c1ace2e26f65dc43c751af0edbb10d669890e8ab6beea91410b8b2187af1a8347627a06ecea7e0f772c28aae9461301e83884860c9b656c722f0000008065af8625a555ea0e008cd04743671a3cda21162e83af045725db2eb2bb52712708dc0cc1a84c08b3649b88a966974bde27d8612c2861792ec9f08786a246fcadd6d8d3a81a32287745f309238f47618c2bd7612cb8b02d940571e0f30b96420bcd462ff542901b46109b1e5ad6423744448d20a57818a8cbb1647d0fea3b664e0000001440f9f2eb554cb00d45a5826b54bfa419b6980e48"
-
-func TestKeySerialization(t *testing.T) {
-	var priv PrivateKey
-	alicePrivateKey, _ := hex.DecodeString(alicePrivateKeyHex)
-	rest, ok := priv.Parse(alicePrivateKey)
-	if !ok {
-		t.Error("failed to parse private key")
-	}
-	if len(rest) > 0 {
-		t.Error("data remaining after parsing private key")
-	}
-
-	out := priv.Serialize(nil)
-	if !bytes.Equal(alicePrivateKey, out) {
-		t.Errorf("serialization (%x) is not equal to original (%x)", out, alicePrivateKey)
-	}
-
-	aliceFingerprint, _ := hex.DecodeString(aliceFingerprintHex)
-	fingerprint := priv.PublicKey.Fingerprint()
-	if !bytes.Equal(aliceFingerprint, fingerprint) {
-		t.Errorf("fingerprint (%x) is not equal to expected value (%x)", fingerprint, aliceFingerprint)
-	}
-}
-
-const libOTRPrivateKey = `(privkeys
- (account
-(name "foo@example.com")
-(protocol prpl-jabber)
-(private-key 
- (dsa 
-  (p #00FC07ABCF0DC916AFF6E9AE47BEF60C7AB9B4D6B2469E436630E36F8A489BE812486A09F30B71224508654940A835301ACC525A4FF133FC152CC53DCC59D65C30A54F1993FE13FE63E5823D4C746DB21B90F9B9C00B49EC7404AB1D929BA7FBA12F2E45C6E0A651689750E8528AB8C031D3561FECEE72EBB4A090D450A9B7A857#)
-  (q #00997BD266EF7B1F60A5C23F3A741F2AEFD07A2081#)
-  (g #535E360E8A95EBA46A4F7DE50AD6E9B2A6DB785A66B64EB9F20338D2A3E8FB0E94725848F1AA6CC567CB83A1CC517EC806F2E92EAE71457E80B2210A189B91250779434B41FC8A8873F6DB94BEA7D177F5D59E7E114EE10A49CFD9CEF88AE43387023B672927BA74B04EB6BBB5E57597766A2F9CE3857D7ACE3E1E3BC1FC6F26#)
-  (y #0AC8670AD767D7A8D9D14CC1AC6744CD7D76F993B77FFD9E39DF01E5A6536EF65E775FCEF2A983E2A19BD6415500F6979715D9FD1257E1FE2B6F5E1E74B333079E7C880D39868462A93454B41877BE62E5EF0A041C2EE9C9E76BD1E12AE25D9628DECB097025DD625EF49C3258A1A3C0FF501E3DC673B76D7BABF349009B6ECF#)
-  (x #14D0345A3562C480A039E3C72764F72D79043216#)
-  )
- )
- )
-)`
-
-func TestParseLibOTRPrivateKey(t *testing.T) {
-	var priv PrivateKey
-
-	if !priv.Import([]byte(libOTRPrivateKey)) {
-		t.Fatalf("Failed to import sample private key")
-	}
-}
-
-func TestSignVerify(t *testing.T) {
-	var priv PrivateKey
-	alicePrivateKey, _ := hex.DecodeString(alicePrivateKeyHex)
-	_, ok := priv.Parse(alicePrivateKey)
-	if !ok {
-		t.Error("failed to parse private key")
-	}
-
-	var msg [32]byte
-	rand.Reader.Read(msg[:])
-
-	sig := priv.Sign(rand.Reader, msg[:])
-	rest, ok := priv.PublicKey.Verify(msg[:], sig)
-	if !ok {
-		t.Errorf("signature (%x) of %x failed to verify", sig, msg[:])
-	} else if len(rest) > 0 {
-		t.Error("signature data remains after verification")
-	}
-
-	sig[10] ^= 80
-	_, ok = priv.PublicKey.Verify(msg[:], sig)
-	if ok {
-		t.Errorf("corrupted signature (%x) of %x verified", sig, msg[:])
-	}
-}
-
-func setupConversation(t *testing.T) (alice, bob *Conversation) {
-	alicePrivateKey, _ := hex.DecodeString(alicePrivateKeyHex)
-	bobPrivateKey, _ := hex.DecodeString(bobPrivateKeyHex)
-
-	alice, bob = new(Conversation), new(Conversation)
-
-	alice.PrivateKey = new(PrivateKey)
-	bob.PrivateKey = new(PrivateKey)
-	alice.PrivateKey.Parse(alicePrivateKey)
-	bob.PrivateKey.Parse(bobPrivateKey)
-	alice.FragmentSize = 100
-	bob.FragmentSize = 100
-
-	if alice.IsEncrypted() {
-		t.Error("Alice believes that the conversation is secure before we've started")
-	}
-	if bob.IsEncrypted() {
-		t.Error("Bob believes that the conversation is secure before we've started")
-	}
-
-	performHandshake(t, alice, bob)
-	return alice, bob
-}
-
-func performHandshake(t *testing.T, alice, bob *Conversation) {
-	var alicesMessage, bobsMessage [][]byte
-	var out []byte
-	var aliceChange, bobChange SecurityChange
-	var err error
-	alicesMessage = append(alicesMessage, []byte(QueryMessage))
-
-	for round := 0; len(alicesMessage) > 0 || len(bobsMessage) > 0; round++ {
-		bobsMessage = nil
-		for i, msg := range alicesMessage {
-			out, _, bobChange, bobsMessage, err = bob.Receive(msg)
-			if len(out) > 0 {
-				t.Errorf("Bob generated output during key exchange, round %d, message %d", round, i)
-			}
-			if err != nil {
-				t.Fatalf("Bob returned an error, round %d, message %d (%x): %s", round, i, msg, err)
-			}
-			if len(bobsMessage) > 0 && i != len(alicesMessage)-1 {
-				t.Errorf("Bob produced output while processing a fragment, round %d, message %d", round, i)
-			}
-		}
-
-		alicesMessage = nil
-		for i, msg := range bobsMessage {
-			out, _, aliceChange, alicesMessage, err = alice.Receive(msg)
-			if len(out) > 0 {
-				t.Errorf("Alice generated output during key exchange, round %d, message %d", round, i)
-			}
-			if err != nil {
-				t.Fatalf("Alice returned an error, round %d, message %d (%x): %s", round, i, msg, err)
-			}
-			if len(alicesMessage) > 0 && i != len(bobsMessage)-1 {
-				t.Errorf("Alice produced output while processing a fragment, round %d, message %d", round, i)
-			}
-		}
-	}
-
-	if aliceChange != NewKeys {
-		t.Errorf("Alice terminated without signaling new keys")
-	}
-	if bobChange != NewKeys {
-		t.Errorf("Bob terminated without signaling new keys")
-	}
-
-	if !bytes.Equal(alice.SSID[:], bob.SSID[:]) {
-		t.Errorf("Session identifiers don't match. Alice has %x, Bob has %x", alice.SSID[:], bob.SSID[:])
-	}
-
-	if !alice.IsEncrypted() {
-		t.Error("Alice doesn't believe that the conversation is secure")
-	}
-	if !bob.IsEncrypted() {
-		t.Error("Bob doesn't believe that the conversation is secure")
-	}
-}
-
-const (
-	firstRoundTrip = iota
-	subsequentRoundTrip
-	noMACKeyCheck
-)
-
-func roundTrip(t *testing.T, alice, bob *Conversation, message []byte, macKeyCheck int) {
-	alicesMessage, err := alice.Send(message)
-	if err != nil {
-		t.Errorf("Error from Alice sending message: %s", err)
-	}
-
-	if len(alice.oldMACs) != 0 {
-		t.Errorf("Alice has not revealed all MAC keys")
-	}
-
-	for i, msg := range alicesMessage {
-		out, encrypted, _, _, err := bob.Receive(msg)
-
-		if err != nil {
-			t.Errorf("Error generated while processing test message: %s", err.Error())
-		}
-		if len(out) > 0 {
-			if i != len(alicesMessage)-1 {
-				t.Fatal("Bob produced a message while processing a fragment of Alice's")
-			}
-			if !encrypted {
-				t.Errorf("Message was not marked as encrypted")
-			}
-			if !bytes.Equal(out, message) {
-				t.Errorf("Message corrupted: got %x, want %x", out, message)
-			}
-		}
-	}
-
-	switch macKeyCheck {
-	case firstRoundTrip:
-		if len(bob.oldMACs) != 0 {
-			t.Errorf("Bob should not have MAC keys to reveal")
-		}
-	case subsequentRoundTrip:
-		if len(bob.oldMACs) != 40 {
-			t.Errorf("Bob has %d bytes of MAC keys to reveal, but should have 40", len(bob.oldMACs))
-		}
-	}
-
-	bobsMessage, err := bob.Send(message)
-	if err != nil {
-		t.Errorf("Error from Bob sending message: %s", err)
-	}
-
-	if len(bob.oldMACs) != 0 {
-		t.Errorf("Bob has not revealed all MAC keys")
-	}
-
-	for i, msg := range bobsMessage {
-		out, encrypted, _, _, err := alice.Receive(msg)
-
-		if err != nil {
-			t.Errorf("Error generated while processing test message: %s", err.Error())
-		}
-		if len(out) > 0 {
-			if i != len(bobsMessage)-1 {
-				t.Fatal("Alice produced a message while processing a fragment of Bob's")
-			}
-			if !encrypted {
-				t.Errorf("Message was not marked as encrypted")
-			}
-			if !bytes.Equal(out, message) {
-				t.Errorf("Message corrupted: got %x, want %x", out, message)
-			}
-		}
-	}
-
-	switch macKeyCheck {
-	case firstRoundTrip:
-		if len(alice.oldMACs) != 20 {
-			t.Errorf("Alice has %d bytes of MAC keys to reveal, but should have 20", len(alice.oldMACs))
-		}
-	case subsequentRoundTrip:
-		if len(alice.oldMACs) != 40 {
-			t.Errorf("Alice has %d bytes of MAC keys to reveal, but should have 40", len(alice.oldMACs))
-		}
-	}
-}
-
-func TestConversation(t *testing.T) {
-	alice, bob := setupConversation(t)
-
-	var testMessages = [][]byte{
-		[]byte("hello"), []byte("bye"),
-	}
-
-	roundTripType := firstRoundTrip
-
-	for _, testMessage := range testMessages {
-		roundTrip(t, alice, bob, testMessage, roundTripType)
-		roundTripType = subsequentRoundTrip
-	}
-}
-
-func TestGoodSMP(t *testing.T) {
-	var alice, bob Conversation
-
-	alice.smp.secret = new(big.Int).SetInt64(42)
-	bob.smp.secret = alice.smp.secret
-
-	var alicesMessages, bobsMessages []tlv
-	var aliceComplete, bobComplete bool
-	var err error
-	var out tlv
-
-	alicesMessages = alice.startSMP("")
-	for round := 0; len(alicesMessages) > 0 || len(bobsMessages) > 0; round++ {
-		bobsMessages = bobsMessages[:0]
-		for i, msg := range alicesMessages {
-			out, bobComplete, err = bob.processSMP(msg)
-			if err != nil {
-				t.Errorf("Error from Bob in round %d: %s", round, err)
-			}
-			if bobComplete && i != len(alicesMessages)-1 {
-				t.Errorf("Bob returned a completed signal before processing all of Alice's messages in round %d", round)
-			}
-			if out.typ != 0 {
-				bobsMessages = append(bobsMessages, out)
-			}
-		}
-
-		alicesMessages = alicesMessages[:0]
-		for i, msg := range bobsMessages {
-			out, aliceComplete, err = alice.processSMP(msg)
-			if err != nil {
-				t.Errorf("Error from Alice in round %d: %s", round, err)
-			}
-			if aliceComplete && i != len(bobsMessages)-1 {
-				t.Errorf("Alice returned a completed signal before processing all of Bob's messages in round %d", round)
-			}
-			if out.typ != 0 {
-				alicesMessages = append(alicesMessages, out)
-			}
-		}
-	}
-
-	if !aliceComplete || !bobComplete {
-		t.Errorf("SMP completed without both sides reporting success: alice: %v, bob: %v\n", aliceComplete, bobComplete)
-	}
-}
-
-func TestBadSMP(t *testing.T) {
-	var alice, bob Conversation
-
-	alice.smp.secret = new(big.Int).SetInt64(42)
-	bob.smp.secret = new(big.Int).SetInt64(43)
-
-	var alicesMessages, bobsMessages []tlv
-
-	alicesMessages = alice.startSMP("")
-	for round := 0; len(alicesMessages) > 0 || len(bobsMessages) > 0; round++ {
-		bobsMessages = bobsMessages[:0]
-		for _, msg := range alicesMessages {
-			out, complete, _ := bob.processSMP(msg)
-			if complete {
-				t.Errorf("Bob signaled completion in round %d", round)
-			}
-			if out.typ != 0 {
-				bobsMessages = append(bobsMessages, out)
-			}
-		}
-
-		alicesMessages = alicesMessages[:0]
-		for _, msg := range bobsMessages {
-			out, complete, _ := alice.processSMP(msg)
-			if complete {
-				t.Errorf("Alice signaled completion in round %d", round)
-			}
-			if out.typ != 0 {
-				alicesMessages = append(alicesMessages, out)
-			}
-		}
-	}
-}
-
-func TestRehandshaking(t *testing.T) {
-	alice, bob := setupConversation(t)
-	roundTrip(t, alice, bob, []byte("test"), firstRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 2"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 3"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 4"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 5"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 6"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 7"), subsequentRoundTrip)
-	roundTrip(t, alice, bob, []byte("test 8"), subsequentRoundTrip)
-	performHandshake(t, alice, bob)
-	roundTrip(t, alice, bob, []byte("test"), noMACKeyCheck)
-	roundTrip(t, alice, bob, []byte("test 2"), noMACKeyCheck)
-}
-
-func TestAgainstLibOTR(t *testing.T) {
-	// This test requires otr.c.test to be built as /tmp/a.out.
-	// If enabled, this tests runs forever performing OTR handshakes in a
-	// loop.
-	return
-
-	alicePrivateKey, _ := hex.DecodeString(alicePrivateKeyHex)
-	var alice Conversation
-	alice.PrivateKey = new(PrivateKey)
-	alice.PrivateKey.Parse(alicePrivateKey)
-
-	cmd := exec.Command("/tmp/a.out")
-	cmd.Stderr = os.Stderr
-
-	out, err := cmd.StdinPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer out.Close()
-	stdout, err := cmd.StdoutPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	in := bufio.NewReader(stdout)
-
-	if err := cmd.Start(); err != nil {
-		t.Fatal(err)
-	}
-
-	out.Write([]byte(QueryMessage))
-	out.Write([]byte("\n"))
-	var expectedText = []byte("test message")
-
-	for {
-		line, isPrefix, err := in.ReadLine()
-		if isPrefix {
-			t.Fatal("line from subprocess too long")
-		}
-		if err != nil {
-			t.Fatal(err)
-		}
-		text, encrypted, change, alicesMessage, err := alice.Receive(line)
-		if err != nil {
-			t.Fatal(err)
-		}
-		for _, msg := range alicesMessage {
-			out.Write(msg)
-			out.Write([]byte("\n"))
-		}
-		if change == NewKeys {
-			alicesMessage, err := alice.Send([]byte("Go -> libotr test message"))
-			if err != nil {
-				t.Fatalf("error sending message: %s", err.Error())
-			} else {
-				for _, msg := range alicesMessage {
-					out.Write(msg)
-					out.Write([]byte("\n"))
-				}
-			}
-		}
-		if len(text) > 0 {
-			if !bytes.Equal(text, expectedText) {
-				t.Fatalf("expected %x, but got %x", expectedText, text)
-			}
-			if !encrypted {
-				t.Fatal("message wasn't encrypted")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/otr/smp.go b/installer/vendor/golang.org/x/crypto/otr/smp.go
deleted file mode 100644
index dc6de4ee0e..0000000000
--- a/installer/vendor/golang.org/x/crypto/otr/smp.go
+++ /dev/null
@@ -1,572 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements the Socialist Millionaires Protocol as described in
-// http://www.cypherpunks.ca/otr/Protocol-v2-3.1.0.html. The protocol
-// specification is required in order to understand this code and, where
-// possible, the variable names in the code match up with the spec.
-
-package otr
-
-import (
-	"bytes"
-	"crypto/sha256"
-	"errors"
-	"hash"
-	"math/big"
-)
-
-type smpFailure string
-
-func (s smpFailure) Error() string {
-	return string(s)
-}
-
-var smpFailureError = smpFailure("otr: SMP protocol failed")
-var smpSecretMissingError = smpFailure("otr: mutual secret needed")
-
-const smpVersion = 1
-
-const (
-	smpState1 = iota
-	smpState2
-	smpState3
-	smpState4
-)
-
-type smpState struct {
-	state                  int
-	a2, a3, b2, b3, pb, qb *big.Int
-	g2a, g3a               *big.Int
-	g2, g3                 *big.Int
-	g3b, papb, qaqb, ra    *big.Int
-	saved                  *tlv
-	secret                 *big.Int
-	question               string
-}
-
-func (c *Conversation) startSMP(question string) (tlvs []tlv) {
-	if c.smp.state != smpState1 {
-		tlvs = append(tlvs, c.generateSMPAbort())
-	}
-	tlvs = append(tlvs, c.generateSMP1(question))
-	c.smp.question = ""
-	c.smp.state = smpState2
-	return
-}
-
-func (c *Conversation) resetSMP() {
-	c.smp.state = smpState1
-	c.smp.secret = nil
-	c.smp.question = ""
-}
-
-func (c *Conversation) processSMP(in tlv) (out tlv, complete bool, err error) {
-	data := in.data
-
-	switch in.typ {
-	case tlvTypeSMPAbort:
-		if c.smp.state != smpState1 {
-			err = smpFailureError
-		}
-		c.resetSMP()
-		return
-	case tlvTypeSMP1WithQuestion:
-		// We preprocess this into a SMP1 message.
-		nulPos := bytes.IndexByte(data, 0)
-		if nulPos == -1 {
-			err = errors.New("otr: SMP message with question didn't contain a NUL byte")
-			return
-		}
-		c.smp.question = string(data[:nulPos])
-		data = data[nulPos+1:]
-	}
-
-	numMPIs, data, ok := getU32(data)
-	if !ok || numMPIs > 20 {
-		err = errors.New("otr: corrupt SMP message")
-		return
-	}
-
-	mpis := make([]*big.Int, numMPIs)
-	for i := range mpis {
-		var ok bool
-		mpis[i], data, ok = getMPI(data)
-		if !ok {
-			err = errors.New("otr: corrupt SMP message")
-			return
-		}
-	}
-
-	switch in.typ {
-	case tlvTypeSMP1, tlvTypeSMP1WithQuestion:
-		if c.smp.state != smpState1 {
-			c.resetSMP()
-			out = c.generateSMPAbort()
-			return
-		}
-		if c.smp.secret == nil {
-			err = smpSecretMissingError
-			return
-		}
-		if err = c.processSMP1(mpis); err != nil {
-			return
-		}
-		c.smp.state = smpState3
-		out = c.generateSMP2()
-	case tlvTypeSMP2:
-		if c.smp.state != smpState2 {
-			c.resetSMP()
-			out = c.generateSMPAbort()
-			return
-		}
-		if out, err = c.processSMP2(mpis); err != nil {
-			out = c.generateSMPAbort()
-			return
-		}
-		c.smp.state = smpState4
-	case tlvTypeSMP3:
-		if c.smp.state != smpState3 {
-			c.resetSMP()
-			out = c.generateSMPAbort()
-			return
-		}
-		if out, err = c.processSMP3(mpis); err != nil {
-			return
-		}
-		c.smp.state = smpState1
-		c.smp.secret = nil
-		complete = true
-	case tlvTypeSMP4:
-		if c.smp.state != smpState4 {
-			c.resetSMP()
-			out = c.generateSMPAbort()
-			return
-		}
-		if err = c.processSMP4(mpis); err != nil {
-			out = c.generateSMPAbort()
-			return
-		}
-		c.smp.state = smpState1
-		c.smp.secret = nil
-		complete = true
-	default:
-		panic("unknown SMP message")
-	}
-
-	return
-}
-
-func (c *Conversation) calcSMPSecret(mutualSecret []byte, weStarted bool) {
-	h := sha256.New()
-	h.Write([]byte{smpVersion})
-	if weStarted {
-		h.Write(c.PrivateKey.PublicKey.Fingerprint())
-		h.Write(c.TheirPublicKey.Fingerprint())
-	} else {
-		h.Write(c.TheirPublicKey.Fingerprint())
-		h.Write(c.PrivateKey.PublicKey.Fingerprint())
-	}
-	h.Write(c.SSID[:])
-	h.Write(mutualSecret)
-	c.smp.secret = new(big.Int).SetBytes(h.Sum(nil))
-}
-
-func (c *Conversation) generateSMP1(question string) tlv {
-	var randBuf [16]byte
-	c.smp.a2 = c.randMPI(randBuf[:])
-	c.smp.a3 = c.randMPI(randBuf[:])
-	g2a := new(big.Int).Exp(g, c.smp.a2, p)
-	g3a := new(big.Int).Exp(g, c.smp.a3, p)
-	h := sha256.New()
-
-	r2 := c.randMPI(randBuf[:])
-	r := new(big.Int).Exp(g, r2, p)
-	c2 := new(big.Int).SetBytes(hashMPIs(h, 1, r))
-	d2 := new(big.Int).Mul(c.smp.a2, c2)
-	d2.Sub(r2, d2)
-	d2.Mod(d2, q)
-	if d2.Sign() < 0 {
-		d2.Add(d2, q)
-	}
-
-	r3 := c.randMPI(randBuf[:])
-	r.Exp(g, r3, p)
-	c3 := new(big.Int).SetBytes(hashMPIs(h, 2, r))
-	d3 := new(big.Int).Mul(c.smp.a3, c3)
-	d3.Sub(r3, d3)
-	d3.Mod(d3, q)
-	if d3.Sign() < 0 {
-		d3.Add(d3, q)
-	}
-
-	var ret tlv
-	if len(question) > 0 {
-		ret.typ = tlvTypeSMP1WithQuestion
-		ret.data = append(ret.data, question...)
-		ret.data = append(ret.data, 0)
-	} else {
-		ret.typ = tlvTypeSMP1
-	}
-	ret.data = appendU32(ret.data, 6)
-	ret.data = appendMPIs(ret.data, g2a, c2, d2, g3a, c3, d3)
-	return ret
-}
-
-func (c *Conversation) processSMP1(mpis []*big.Int) error {
-	if len(mpis) != 6 {
-		return errors.New("otr: incorrect number of arguments in SMP1 message")
-	}
-	g2a := mpis[0]
-	c2 := mpis[1]
-	d2 := mpis[2]
-	g3a := mpis[3]
-	c3 := mpis[4]
-	d3 := mpis[5]
-	h := sha256.New()
-
-	r := new(big.Int).Exp(g, d2, p)
-	s := new(big.Int).Exp(g2a, c2, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-	t := new(big.Int).SetBytes(hashMPIs(h, 1, r))
-	if c2.Cmp(t) != 0 {
-		return errors.New("otr: ZKP c2 incorrect in SMP1 message")
-	}
-	r.Exp(g, d3, p)
-	s.Exp(g3a, c3, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-	t.SetBytes(hashMPIs(h, 2, r))
-	if c3.Cmp(t) != 0 {
-		return errors.New("otr: ZKP c3 incorrect in SMP1 message")
-	}
-
-	c.smp.g2a = g2a
-	c.smp.g3a = g3a
-	return nil
-}
-
-func (c *Conversation) generateSMP2() tlv {
-	var randBuf [16]byte
-	b2 := c.randMPI(randBuf[:])
-	c.smp.b3 = c.randMPI(randBuf[:])
-	r2 := c.randMPI(randBuf[:])
-	r3 := c.randMPI(randBuf[:])
-	r4 := c.randMPI(randBuf[:])
-	r5 := c.randMPI(randBuf[:])
-	r6 := c.randMPI(randBuf[:])
-
-	g2b := new(big.Int).Exp(g, b2, p)
-	g3b := new(big.Int).Exp(g, c.smp.b3, p)
-
-	r := new(big.Int).Exp(g, r2, p)
-	h := sha256.New()
-	c2 := new(big.Int).SetBytes(hashMPIs(h, 3, r))
-	d2 := new(big.Int).Mul(b2, c2)
-	d2.Sub(r2, d2)
-	d2.Mod(d2, q)
-	if d2.Sign() < 0 {
-		d2.Add(d2, q)
-	}
-
-	r.Exp(g, r3, p)
-	c3 := new(big.Int).SetBytes(hashMPIs(h, 4, r))
-	d3 := new(big.Int).Mul(c.smp.b3, c3)
-	d3.Sub(r3, d3)
-	d3.Mod(d3, q)
-	if d3.Sign() < 0 {
-		d3.Add(d3, q)
-	}
-
-	c.smp.g2 = new(big.Int).Exp(c.smp.g2a, b2, p)
-	c.smp.g3 = new(big.Int).Exp(c.smp.g3a, c.smp.b3, p)
-	c.smp.pb = new(big.Int).Exp(c.smp.g3, r4, p)
-	c.smp.qb = new(big.Int).Exp(g, r4, p)
-	r.Exp(c.smp.g2, c.smp.secret, p)
-	c.smp.qb.Mul(c.smp.qb, r)
-	c.smp.qb.Mod(c.smp.qb, p)
-
-	s := new(big.Int)
-	s.Exp(c.smp.g2, r6, p)
-	r.Exp(g, r5, p)
-	s.Mul(r, s)
-	s.Mod(s, p)
-	r.Exp(c.smp.g3, r5, p)
-	cp := new(big.Int).SetBytes(hashMPIs(h, 5, r, s))
-
-	// D5 = r5 - r4 cP mod q and D6 = r6 - y cP mod q
-
-	s.Mul(r4, cp)
-	r.Sub(r5, s)
-	d5 := new(big.Int).Mod(r, q)
-	if d5.Sign() < 0 {
-		d5.Add(d5, q)
-	}
-
-	s.Mul(c.smp.secret, cp)
-	r.Sub(r6, s)
-	d6 := new(big.Int).Mod(r, q)
-	if d6.Sign() < 0 {
-		d6.Add(d6, q)
-	}
-
-	var ret tlv
-	ret.typ = tlvTypeSMP2
-	ret.data = appendU32(ret.data, 11)
-	ret.data = appendMPIs(ret.data, g2b, c2, d2, g3b, c3, d3, c.smp.pb, c.smp.qb, cp, d5, d6)
-	return ret
-}
-
-func (c *Conversation) processSMP2(mpis []*big.Int) (out tlv, err error) {
-	if len(mpis) != 11 {
-		err = errors.New("otr: incorrect number of arguments in SMP2 message")
-		return
-	}
-	g2b := mpis[0]
-	c2 := mpis[1]
-	d2 := mpis[2]
-	g3b := mpis[3]
-	c3 := mpis[4]
-	d3 := mpis[5]
-	pb := mpis[6]
-	qb := mpis[7]
-	cp := mpis[8]
-	d5 := mpis[9]
-	d6 := mpis[10]
-	h := sha256.New()
-
-	r := new(big.Int).Exp(g, d2, p)
-	s := new(big.Int).Exp(g2b, c2, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-	s.SetBytes(hashMPIs(h, 3, r))
-	if c2.Cmp(s) != 0 {
-		err = errors.New("otr: ZKP c2 failed in SMP2 message")
-		return
-	}
-
-	r.Exp(g, d3, p)
-	s.Exp(g3b, c3, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-	s.SetBytes(hashMPIs(h, 4, r))
-	if c3.Cmp(s) != 0 {
-		err = errors.New("otr: ZKP c3 failed in SMP2 message")
-		return
-	}
-
-	c.smp.g2 = new(big.Int).Exp(g2b, c.smp.a2, p)
-	c.smp.g3 = new(big.Int).Exp(g3b, c.smp.a3, p)
-
-	r.Exp(g, d5, p)
-	s.Exp(c.smp.g2, d6, p)
-	r.Mul(r, s)
-	s.Exp(qb, cp, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-
-	s.Exp(c.smp.g3, d5, p)
-	t := new(big.Int).Exp(pb, cp, p)
-	s.Mul(s, t)
-	s.Mod(s, p)
-	t.SetBytes(hashMPIs(h, 5, s, r))
-	if cp.Cmp(t) != 0 {
-		err = errors.New("otr: ZKP cP failed in SMP2 message")
-		return
-	}
-
-	var randBuf [16]byte
-	r4 := c.randMPI(randBuf[:])
-	r5 := c.randMPI(randBuf[:])
-	r6 := c.randMPI(randBuf[:])
-	r7 := c.randMPI(randBuf[:])
-
-	pa := new(big.Int).Exp(c.smp.g3, r4, p)
-	r.Exp(c.smp.g2, c.smp.secret, p)
-	qa := new(big.Int).Exp(g, r4, p)
-	qa.Mul(qa, r)
-	qa.Mod(qa, p)
-
-	r.Exp(g, r5, p)
-	s.Exp(c.smp.g2, r6, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-
-	s.Exp(c.smp.g3, r5, p)
-	cp.SetBytes(hashMPIs(h, 6, s, r))
-
-	r.Mul(r4, cp)
-	d5 = new(big.Int).Sub(r5, r)
-	d5.Mod(d5, q)
-	if d5.Sign() < 0 {
-		d5.Add(d5, q)
-	}
-
-	r.Mul(c.smp.secret, cp)
-	d6 = new(big.Int).Sub(r6, r)
-	d6.Mod(d6, q)
-	if d6.Sign() < 0 {
-		d6.Add(d6, q)
-	}
-
-	r.ModInverse(qb, p)
-	qaqb := new(big.Int).Mul(qa, r)
-	qaqb.Mod(qaqb, p)
-
-	ra := new(big.Int).Exp(qaqb, c.smp.a3, p)
-	r.Exp(qaqb, r7, p)
-	s.Exp(g, r7, p)
-	cr := new(big.Int).SetBytes(hashMPIs(h, 7, s, r))
-
-	r.Mul(c.smp.a3, cr)
-	d7 := new(big.Int).Sub(r7, r)
-	d7.Mod(d7, q)
-	if d7.Sign() < 0 {
-		d7.Add(d7, q)
-	}
-
-	c.smp.g3b = g3b
-	c.smp.qaqb = qaqb
-
-	r.ModInverse(pb, p)
-	c.smp.papb = new(big.Int).Mul(pa, r)
-	c.smp.papb.Mod(c.smp.papb, p)
-	c.smp.ra = ra
-
-	out.typ = tlvTypeSMP3
-	out.data = appendU32(out.data, 8)
-	out.data = appendMPIs(out.data, pa, qa, cp, d5, d6, ra, cr, d7)
-	return
-}
-
-func (c *Conversation) processSMP3(mpis []*big.Int) (out tlv, err error) {
-	if len(mpis) != 8 {
-		err = errors.New("otr: incorrect number of arguments in SMP3 message")
-		return
-	}
-	pa := mpis[0]
-	qa := mpis[1]
-	cp := mpis[2]
-	d5 := mpis[3]
-	d6 := mpis[4]
-	ra := mpis[5]
-	cr := mpis[6]
-	d7 := mpis[7]
-	h := sha256.New()
-
-	r := new(big.Int).Exp(g, d5, p)
-	s := new(big.Int).Exp(c.smp.g2, d6, p)
-	r.Mul(r, s)
-	s.Exp(qa, cp, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-
-	s.Exp(c.smp.g3, d5, p)
-	t := new(big.Int).Exp(pa, cp, p)
-	s.Mul(s, t)
-	s.Mod(s, p)
-	t.SetBytes(hashMPIs(h, 6, s, r))
-	if t.Cmp(cp) != 0 {
-		err = errors.New("otr: ZKP cP failed in SMP3 message")
-		return
-	}
-
-	r.ModInverse(c.smp.qb, p)
-	qaqb := new(big.Int).Mul(qa, r)
-	qaqb.Mod(qaqb, p)
-
-	r.Exp(qaqb, d7, p)
-	s.Exp(ra, cr, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-
-	s.Exp(g, d7, p)
-	t.Exp(c.smp.g3a, cr, p)
-	s.Mul(s, t)
-	s.Mod(s, p)
-	t.SetBytes(hashMPIs(h, 7, s, r))
-	if t.Cmp(cr) != 0 {
-		err = errors.New("otr: ZKP cR failed in SMP3 message")
-		return
-	}
-
-	var randBuf [16]byte
-	r7 := c.randMPI(randBuf[:])
-	rb := new(big.Int).Exp(qaqb, c.smp.b3, p)
-
-	r.Exp(qaqb, r7, p)
-	s.Exp(g, r7, p)
-	cr = new(big.Int).SetBytes(hashMPIs(h, 8, s, r))
-
-	r.Mul(c.smp.b3, cr)
-	d7 = new(big.Int).Sub(r7, r)
-	d7.Mod(d7, q)
-	if d7.Sign() < 0 {
-		d7.Add(d7, q)
-	}
-
-	out.typ = tlvTypeSMP4
-	out.data = appendU32(out.data, 3)
-	out.data = appendMPIs(out.data, rb, cr, d7)
-
-	r.ModInverse(c.smp.pb, p)
-	r.Mul(pa, r)
-	r.Mod(r, p)
-	s.Exp(ra, c.smp.b3, p)
-	if r.Cmp(s) != 0 {
-		err = smpFailureError
-	}
-
-	return
-}
-
-func (c *Conversation) processSMP4(mpis []*big.Int) error {
-	if len(mpis) != 3 {
-		return errors.New("otr: incorrect number of arguments in SMP4 message")
-	}
-	rb := mpis[0]
-	cr := mpis[1]
-	d7 := mpis[2]
-	h := sha256.New()
-
-	r := new(big.Int).Exp(c.smp.qaqb, d7, p)
-	s := new(big.Int).Exp(rb, cr, p)
-	r.Mul(r, s)
-	r.Mod(r, p)
-
-	s.Exp(g, d7, p)
-	t := new(big.Int).Exp(c.smp.g3b, cr, p)
-	s.Mul(s, t)
-	s.Mod(s, p)
-	t.SetBytes(hashMPIs(h, 8, s, r))
-	if t.Cmp(cr) != 0 {
-		return errors.New("otr: ZKP cR failed in SMP4 message")
-	}
-
-	r.Exp(rb, c.smp.a3, p)
-	if r.Cmp(c.smp.papb) != 0 {
-		return smpFailureError
-	}
-
-	return nil
-}
-
-func (c *Conversation) generateSMPAbort() tlv {
-	return tlv{typ: tlvTypeSMPAbort}
-}
-
-func hashMPIs(h hash.Hash, magic byte, mpis ...*big.Int) []byte {
-	if h != nil {
-		h.Reset()
-	} else {
-		h = sha256.New()
-	}
-
-	h.Write([]byte{magic})
-	for _, mpi := range mpis {
-		h.Write(appendMPI(nil, mpi))
-	}
-	return h.Sum(nil)
-}
diff --git a/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go b/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
deleted file mode 100644
index 593f653008..0000000000
--- a/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package pbkdf2 implements the key derivation function PBKDF2 as defined in RFC
-2898 / PKCS #5 v2.0.
-
-A key derivation function is useful when encrypting data based on a password
-or any other not-fully-random data. It uses a pseudorandom function to derive
-a secure encryption key based on the password.
-
-While v2.0 of the standard defines only one pseudorandom function to use,
-HMAC-SHA1, the drafted v2.1 specification allows use of all five FIPS Approved
-Hash Functions SHA-1, SHA-224, SHA-256, SHA-384 and SHA-512 for HMAC. To
-choose, you can pass the `New` functions from the different SHA packages to
-pbkdf2.Key.
-*/
-package pbkdf2 // import "golang.org/x/crypto/pbkdf2"
-
-import (
-	"crypto/hmac"
-	"hash"
-)
-
-// Key derives a key from the password, salt and iteration count, returning a
-// []byte of length keylen that can be used as cryptographic key. The key is
-// derived based on the method described as PBKDF2 with the HMAC variant using
-// the supplied hash function.
-//
-// For example, to use a HMAC-SHA-1 based PBKDF2 key derivation function, you
-// can get a derived key for e.g. AES-256 (which needs a 32-byte key) by
-// doing:
-//
-// 	dk := pbkdf2.Key([]byte("some password"), salt, 4096, 32, sha1.New)
-//
-// Remember to get a good random salt. At least 8 bytes is recommended by the
-// RFC.
-//
-// Using a higher iteration count will increase the cost of an exhaustive
-// search but will also make derivation proportionally slower.
-func Key(password, salt []byte, iter, keyLen int, h func() hash.Hash) []byte {
-	prf := hmac.New(h, password)
-	hashLen := prf.Size()
-	numBlocks := (keyLen + hashLen - 1) / hashLen
-
-	var buf [4]byte
-	dk := make([]byte, 0, numBlocks*hashLen)
-	U := make([]byte, hashLen)
-	for block := 1; block <= numBlocks; block++ {
-		// N.B.: || means concatenation, ^ means XOR
-		// for each block T_i = U_1 ^ U_2 ^ ... ^ U_iter
-		// U_1 = PRF(password, salt || uint(i))
-		prf.Reset()
-		prf.Write(salt)
-		buf[0] = byte(block >> 24)
-		buf[1] = byte(block >> 16)
-		buf[2] = byte(block >> 8)
-		buf[3] = byte(block)
-		prf.Write(buf[:4])
-		dk = prf.Sum(dk)
-		T := dk[len(dk)-hashLen:]
-		copy(U, T)
-
-		// U_n = PRF(password, U_(n-1))
-		for n := 2; n <= iter; n++ {
-			prf.Reset()
-			prf.Write(U)
-			U = U[:0]
-			U = prf.Sum(U)
-			for x := range U {
-				T[x] ^= U[x]
-			}
-		}
-	}
-	return dk[:keyLen]
-}
diff --git a/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2_test.go b/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2_test.go
deleted file mode 100644
index 1379240610..0000000000
--- a/installer/vendor/golang.org/x/crypto/pbkdf2/pbkdf2_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pbkdf2
-
-import (
-	"bytes"
-	"crypto/sha1"
-	"crypto/sha256"
-	"hash"
-	"testing"
-)
-
-type testVector struct {
-	password string
-	salt     string
-	iter     int
-	output   []byte
-}
-
-// Test vectors from RFC 6070, http://tools.ietf.org/html/rfc6070
-var sha1TestVectors = []testVector{
-	{
-		"password",
-		"salt",
-		1,
-		[]byte{
-			0x0c, 0x60, 0xc8, 0x0f, 0x96, 0x1f, 0x0e, 0x71,
-			0xf3, 0xa9, 0xb5, 0x24, 0xaf, 0x60, 0x12, 0x06,
-			0x2f, 0xe0, 0x37, 0xa6,
-		},
-	},
-	{
-		"password",
-		"salt",
-		2,
-		[]byte{
-			0xea, 0x6c, 0x01, 0x4d, 0xc7, 0x2d, 0x6f, 0x8c,
-			0xcd, 0x1e, 0xd9, 0x2a, 0xce, 0x1d, 0x41, 0xf0,
-			0xd8, 0xde, 0x89, 0x57,
-		},
-	},
-	{
-		"password",
-		"salt",
-		4096,
-		[]byte{
-			0x4b, 0x00, 0x79, 0x01, 0xb7, 0x65, 0x48, 0x9a,
-			0xbe, 0xad, 0x49, 0xd9, 0x26, 0xf7, 0x21, 0xd0,
-			0x65, 0xa4, 0x29, 0xc1,
-		},
-	},
-	// // This one takes too long
-	// {
-	// 	"password",
-	// 	"salt",
-	// 	16777216,
-	// 	[]byte{
-	// 		0xee, 0xfe, 0x3d, 0x61, 0xcd, 0x4d, 0xa4, 0xe4,
-	// 		0xe9, 0x94, 0x5b, 0x3d, 0x6b, 0xa2, 0x15, 0x8c,
-	// 		0x26, 0x34, 0xe9, 0x84,
-	// 	},
-	// },
-	{
-		"passwordPASSWORDpassword",
-		"saltSALTsaltSALTsaltSALTsaltSALTsalt",
-		4096,
-		[]byte{
-			0x3d, 0x2e, 0xec, 0x4f, 0xe4, 0x1c, 0x84, 0x9b,
-			0x80, 0xc8, 0xd8, 0x36, 0x62, 0xc0, 0xe4, 0x4a,
-			0x8b, 0x29, 0x1a, 0x96, 0x4c, 0xf2, 0xf0, 0x70,
-			0x38,
-		},
-	},
-	{
-		"pass\000word",
-		"sa\000lt",
-		4096,
-		[]byte{
-			0x56, 0xfa, 0x6a, 0xa7, 0x55, 0x48, 0x09, 0x9d,
-			0xcc, 0x37, 0xd7, 0xf0, 0x34, 0x25, 0xe0, 0xc3,
-		},
-	},
-}
-
-// Test vectors from
-// http://stackoverflow.com/questions/5130513/pbkdf2-hmac-sha2-test-vectors
-var sha256TestVectors = []testVector{
-	{
-		"password",
-		"salt",
-		1,
-		[]byte{
-			0x12, 0x0f, 0xb6, 0xcf, 0xfc, 0xf8, 0xb3, 0x2c,
-			0x43, 0xe7, 0x22, 0x52, 0x56, 0xc4, 0xf8, 0x37,
-			0xa8, 0x65, 0x48, 0xc9,
-		},
-	},
-	{
-		"password",
-		"salt",
-		2,
-		[]byte{
-			0xae, 0x4d, 0x0c, 0x95, 0xaf, 0x6b, 0x46, 0xd3,
-			0x2d, 0x0a, 0xdf, 0xf9, 0x28, 0xf0, 0x6d, 0xd0,
-			0x2a, 0x30, 0x3f, 0x8e,
-		},
-	},
-	{
-		"password",
-		"salt",
-		4096,
-		[]byte{
-			0xc5, 0xe4, 0x78, 0xd5, 0x92, 0x88, 0xc8, 0x41,
-			0xaa, 0x53, 0x0d, 0xb6, 0x84, 0x5c, 0x4c, 0x8d,
-			0x96, 0x28, 0x93, 0xa0,
-		},
-	},
-	{
-		"passwordPASSWORDpassword",
-		"saltSALTsaltSALTsaltSALTsaltSALTsalt",
-		4096,
-		[]byte{
-			0x34, 0x8c, 0x89, 0xdb, 0xcb, 0xd3, 0x2b, 0x2f,
-			0x32, 0xd8, 0x14, 0xb8, 0x11, 0x6e, 0x84, 0xcf,
-			0x2b, 0x17, 0x34, 0x7e, 0xbc, 0x18, 0x00, 0x18,
-			0x1c,
-		},
-	},
-	{
-		"pass\000word",
-		"sa\000lt",
-		4096,
-		[]byte{
-			0x89, 0xb6, 0x9d, 0x05, 0x16, 0xf8, 0x29, 0x89,
-			0x3c, 0x69, 0x62, 0x26, 0x65, 0x0a, 0x86, 0x87,
-		},
-	},
-}
-
-func testHash(t *testing.T, h func() hash.Hash, hashName string, vectors []testVector) {
-	for i, v := range vectors {
-		o := Key([]byte(v.password), []byte(v.salt), v.iter, len(v.output), h)
-		if !bytes.Equal(o, v.output) {
-			t.Errorf("%s %d: expected %x, got %x", hashName, i, v.output, o)
-		}
-	}
-}
-
-func TestWithHMACSHA1(t *testing.T) {
-	testHash(t, sha1.New, "SHA1", sha1TestVectors)
-}
-
-func TestWithHMACSHA256(t *testing.T) {
-	testHash(t, sha256.New, "SHA256", sha256TestVectors)
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string.go b/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string.go
deleted file mode 100644
index 233b8b62cc..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"errors"
-	"unicode/utf16"
-)
-
-// bmpString returns s encoded in UCS-2 with a zero terminator.
-func bmpString(s string) ([]byte, error) {
-	// References:
-	// https://tools.ietf.org/html/rfc7292#appendix-B.1
-	// https://en.wikipedia.org/wiki/Plane_(Unicode)#Basic_Multilingual_Plane
-	//  - non-BMP characters are encoded in UTF 16 by using a surrogate pair of 16-bit codes
-	//	  EncodeRune returns 0xfffd if the rune does not need special encoding
-	//  - the above RFC provides the info that BMPStrings are NULL terminated.
-
-	ret := make([]byte, 0, 2*len(s)+2)
-
-	for _, r := range s {
-		if t, _ := utf16.EncodeRune(r); t != 0xfffd {
-			return nil, errors.New("pkcs12: string contains characters that cannot be encoded in UCS-2")
-		}
-		ret = append(ret, byte(r/256), byte(r%256))
-	}
-
-	return append(ret, 0, 0), nil
-}
-
-func decodeBMPString(bmpString []byte) (string, error) {
-	if len(bmpString)%2 != 0 {
-		return "", errors.New("pkcs12: odd-length BMP string")
-	}
-
-	// strip terminator if present
-	if l := len(bmpString); l >= 2 && bmpString[l-1] == 0 && bmpString[l-2] == 0 {
-		bmpString = bmpString[:l-2]
-	}
-
-	s := make([]uint16, 0, len(bmpString)/2)
-	for len(bmpString) > 0 {
-		s = append(s, uint16(bmpString[0])<<8+uint16(bmpString[1]))
-		bmpString = bmpString[2:]
-	}
-
-	return string(utf16.Decode(s)), nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string_test.go
deleted file mode 100644
index 7fca55f4e8..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/bmp-string_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-var bmpStringTests = []struct {
-	in          string
-	expectedHex string
-	shouldFail  bool
-}{
-	{"", "0000", false},
-	// Example from https://tools.ietf.org/html/rfc7292#appendix-B.
-	{"Beavis", "0042006500610076006900730000", false},
-	// Some characters from the "Letterlike Symbols Unicode block".
-	{"\u2115 - Double-struck N", "21150020002d00200044006f00750062006c0065002d00730074007200750063006b0020004e0000", false},
-	// any character outside the BMP should trigger an error.
-	{"\U0001f000 East wind (Mahjong)", "", true},
-}
-
-func TestBMPString(t *testing.T) {
-	for i, test := range bmpStringTests {
-		expected, err := hex.DecodeString(test.expectedHex)
-		if err != nil {
-			t.Fatalf("#%d: failed to decode expectation", i)
-		}
-
-		out, err := bmpString(test.in)
-		if err == nil && test.shouldFail {
-			t.Errorf("#%d: expected to fail, but produced %x", i, out)
-			continue
-		}
-
-		if err != nil && !test.shouldFail {
-			t.Errorf("#%d: failed unexpectedly: %s", i, err)
-			continue
-		}
-
-		if !test.shouldFail {
-			if !bytes.Equal(out, expected) {
-				t.Errorf("#%d: expected %s, got %x", i, test.expectedHex, out)
-				continue
-			}
-
-			roundTrip, err := decodeBMPString(out)
-			if err != nil {
-				t.Errorf("#%d: decoding output gave an error: %s", i, err)
-				continue
-			}
-
-			if roundTrip != test.in {
-				t.Errorf("#%d: decoding output resulted in %q, but it should have been %q", i, roundTrip, test.in)
-				continue
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/crypto.go b/installer/vendor/golang.org/x/crypto/pkcs12/crypto.go
deleted file mode 100644
index 484ca51b71..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/crypto.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"bytes"
-	"crypto/cipher"
-	"crypto/des"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"errors"
-
-	"golang.org/x/crypto/pkcs12/internal/rc2"
-)
-
-var (
-	oidPBEWithSHAAnd3KeyTripleDESCBC = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 1, 3})
-	oidPBEWithSHAAnd40BitRC2CBC      = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 1, 6})
-)
-
-// pbeCipher is an abstraction of a PKCS#12 cipher.
-type pbeCipher interface {
-	// create returns a cipher.Block given a key.
-	create(key []byte) (cipher.Block, error)
-	// deriveKey returns a key derived from the given password and salt.
-	deriveKey(salt, password []byte, iterations int) []byte
-	// deriveKey returns an IV derived from the given password and salt.
-	deriveIV(salt, password []byte, iterations int) []byte
-}
-
-type shaWithTripleDESCBC struct{}
-
-func (shaWithTripleDESCBC) create(key []byte) (cipher.Block, error) {
-	return des.NewTripleDESCipher(key)
-}
-
-func (shaWithTripleDESCBC) deriveKey(salt, password []byte, iterations int) []byte {
-	return pbkdf(sha1Sum, 20, 64, salt, password, iterations, 1, 24)
-}
-
-func (shaWithTripleDESCBC) deriveIV(salt, password []byte, iterations int) []byte {
-	return pbkdf(sha1Sum, 20, 64, salt, password, iterations, 2, 8)
-}
-
-type shaWith40BitRC2CBC struct{}
-
-func (shaWith40BitRC2CBC) create(key []byte) (cipher.Block, error) {
-	return rc2.New(key, len(key)*8)
-}
-
-func (shaWith40BitRC2CBC) deriveKey(salt, password []byte, iterations int) []byte {
-	return pbkdf(sha1Sum, 20, 64, salt, password, iterations, 1, 5)
-}
-
-func (shaWith40BitRC2CBC) deriveIV(salt, password []byte, iterations int) []byte {
-	return pbkdf(sha1Sum, 20, 64, salt, password, iterations, 2, 8)
-}
-
-type pbeParams struct {
-	Salt       []byte
-	Iterations int
-}
-
-func pbDecrypterFor(algorithm pkix.AlgorithmIdentifier, password []byte) (cipher.BlockMode, int, error) {
-	var cipherType pbeCipher
-
-	switch {
-	case algorithm.Algorithm.Equal(oidPBEWithSHAAnd3KeyTripleDESCBC):
-		cipherType = shaWithTripleDESCBC{}
-	case algorithm.Algorithm.Equal(oidPBEWithSHAAnd40BitRC2CBC):
-		cipherType = shaWith40BitRC2CBC{}
-	default:
-		return nil, 0, NotImplementedError("algorithm " + algorithm.Algorithm.String() + " is not supported")
-	}
-
-	var params pbeParams
-	if err := unmarshal(algorithm.Parameters.FullBytes, &params); err != nil {
-		return nil, 0, err
-	}
-
-	key := cipherType.deriveKey(params.Salt, password, params.Iterations)
-	iv := cipherType.deriveIV(params.Salt, password, params.Iterations)
-
-	block, err := cipherType.create(key)
-	if err != nil {
-		return nil, 0, err
-	}
-
-	return cipher.NewCBCDecrypter(block, iv), block.BlockSize(), nil
-}
-
-func pbDecrypt(info decryptable, password []byte) (decrypted []byte, err error) {
-	cbc, blockSize, err := pbDecrypterFor(info.Algorithm(), password)
-	if err != nil {
-		return nil, err
-	}
-
-	encrypted := info.Data()
-	if len(encrypted) == 0 {
-		return nil, errors.New("pkcs12: empty encrypted data")
-	}
-	if len(encrypted)%blockSize != 0 {
-		return nil, errors.New("pkcs12: input is not a multiple of the block size")
-	}
-	decrypted = make([]byte, len(encrypted))
-	cbc.CryptBlocks(decrypted, encrypted)
-
-	psLen := int(decrypted[len(decrypted)-1])
-	if psLen == 0 || psLen > blockSize {
-		return nil, ErrDecryption
-	}
-
-	if len(decrypted) < psLen {
-		return nil, ErrDecryption
-	}
-	ps := decrypted[len(decrypted)-psLen:]
-	decrypted = decrypted[:len(decrypted)-psLen]
-	if bytes.Compare(ps, bytes.Repeat([]byte{byte(psLen)}, psLen)) != 0 {
-		return nil, ErrDecryption
-	}
-
-	return
-}
-
-// decryptable abstracts an object that contains ciphertext.
-type decryptable interface {
-	Algorithm() pkix.AlgorithmIdentifier
-	Data() []byte
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/crypto_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/crypto_test.go
deleted file mode 100644
index eb4dae8fce..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/crypto_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"bytes"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"testing"
-)
-
-var sha1WithTripleDES = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 1, 3})
-
-func TestPbDecrypterFor(t *testing.T) {
-	params, _ := asn1.Marshal(pbeParams{
-		Salt:       []byte{1, 2, 3, 4, 5, 6, 7, 8},
-		Iterations: 2048,
-	})
-	alg := pkix.AlgorithmIdentifier{
-		Algorithm: asn1.ObjectIdentifier([]int{1, 2, 3}),
-		Parameters: asn1.RawValue{
-			FullBytes: params,
-		},
-	}
-
-	pass, _ := bmpString("Sesame open")
-
-	_, _, err := pbDecrypterFor(alg, pass)
-	if _, ok := err.(NotImplementedError); !ok {
-		t.Errorf("expected not implemented error, got: %T %s", err, err)
-	}
-
-	alg.Algorithm = sha1WithTripleDES
-	cbc, blockSize, err := pbDecrypterFor(alg, pass)
-	if err != nil {
-		t.Errorf("unexpected error from pbDecrypterFor %v", err)
-	}
-	if blockSize != 8 {
-		t.Errorf("unexpected block size %d, wanted 8", blockSize)
-	}
-
-	plaintext := []byte{1, 2, 3, 4, 5, 6, 7, 8}
-	expectedCiphertext := []byte{185, 73, 135, 249, 137, 1, 122, 247}
-	ciphertext := make([]byte, len(plaintext))
-	cbc.CryptBlocks(ciphertext, plaintext)
-
-	if bytes.Compare(ciphertext, expectedCiphertext) != 0 {
-		t.Errorf("bad ciphertext, got %x but wanted %x", ciphertext, expectedCiphertext)
-	}
-}
-
-var pbDecryptTests = []struct {
-	in            []byte
-	expected      []byte
-	expectedError error
-}{
-	{
-		[]byte("\x33\x73\xf3\x9f\xda\x49\xae\xfc\xa0\x9a\xdf\x5a\x58\xa0\xea\x46"), // 7 padding bytes
-		[]byte("A secret!"),
-		nil,
-	},
-	{
-		[]byte("\x33\x73\xf3\x9f\xda\x49\xae\xfc\x96\x24\x2f\x71\x7e\x32\x3f\xe7"), // 8 padding bytes
-		[]byte("A secret"),
-		nil,
-	},
-	{
-		[]byte("\x35\x0c\xc0\x8d\xab\xa9\x5d\x30\x7f\x9a\xec\x6a\xd8\x9b\x9c\xd9"), // 9 padding bytes, incorrect
-		nil,
-		ErrDecryption,
-	},
-	{
-		[]byte("\xb2\xf9\x6e\x06\x60\xae\x20\xcf\x08\xa0\x7b\xd9\x6b\x20\xef\x41"), // incorrect padding bytes: [ ... 0x04 0x02 ]
-		nil,
-		ErrDecryption,
-	},
-}
-
-func TestPbDecrypt(t *testing.T) {
-	for i, test := range pbDecryptTests {
-		decryptable := testDecryptable{
-			data: test.in,
-			algorithm: pkix.AlgorithmIdentifier{
-				Algorithm: sha1WithTripleDES,
-				Parameters: pbeParams{
-					Salt:       []byte("\xf1\xf2\xf3\xf4\xf5\xf6\xf7\xf8"),
-					Iterations: 4096,
-				}.RawASN1(),
-			},
-		}
-		password, _ := bmpString("sesame")
-
-		plaintext, err := pbDecrypt(decryptable, password)
-		if err != test.expectedError {
-			t.Errorf("#%d: got error %q, but wanted %q", i, err, test.expectedError)
-			continue
-		}
-
-		if !bytes.Equal(plaintext, test.expected) {
-			t.Errorf("#%d: got %x, but wanted %x", i, plaintext, test.expected)
-		}
-	}
-}
-
-type testDecryptable struct {
-	data      []byte
-	algorithm pkix.AlgorithmIdentifier
-}
-
-func (d testDecryptable) Algorithm() pkix.AlgorithmIdentifier { return d.algorithm }
-func (d testDecryptable) Data() []byte                        { return d.data }
-
-func (params pbeParams) RawASN1() (raw asn1.RawValue) {
-	asn1Bytes, err := asn1.Marshal(params)
-	if err != nil {
-		panic(err)
-	}
-	_, err = asn1.Unmarshal(asn1Bytes, &raw)
-	if err != nil {
-		panic(err)
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/errors.go b/installer/vendor/golang.org/x/crypto/pkcs12/errors.go
deleted file mode 100644
index 7377ce6fb2..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/errors.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import "errors"
-
-var (
-	// ErrDecryption represents a failure to decrypt the input.
-	ErrDecryption = errors.New("pkcs12: decryption error, incorrect padding")
-
-	// ErrIncorrectPassword is returned when an incorrect password is detected.
-	// Usually, P12/PFX data is signed to be able to verify the password.
-	ErrIncorrectPassword = errors.New("pkcs12: decryption password incorrect")
-)
-
-// NotImplementedError indicates that the input is not currently supported.
-type NotImplementedError string
-
-func (e NotImplementedError) Error() string {
-	return "pkcs12: " + string(e)
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/bench_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/bench_test.go
deleted file mode 100644
index 3347f338c1..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/bench_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rc2
-
-import (
-	"testing"
-)
-
-func BenchmarkEncrypt(b *testing.B) {
-	r, _ := New([]byte{0, 0, 0, 0, 0, 0, 0, 0}, 64)
-	b.ResetTimer()
-	var src [8]byte
-	for i := 0; i < b.N; i++ {
-		r.Encrypt(src[:], src[:])
-	}
-}
-
-func BenchmarkDecrypt(b *testing.B) {
-	r, _ := New([]byte{0, 0, 0, 0, 0, 0, 0, 0}, 64)
-	b.ResetTimer()
-	var src [8]byte
-	for i := 0; i < b.N; i++ {
-		r.Decrypt(src[:], src[:])
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go b/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
deleted file mode 100644
index 8c7090258c..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2.go
+++ /dev/null
@@ -1,274 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package rc2 implements the RC2 cipher
-/*
-https://www.ietf.org/rfc/rfc2268.txt
-http://people.csail.mit.edu/rivest/pubs/KRRR98.pdf
-
-This code is licensed under the MIT license.
-*/
-package rc2
-
-import (
-	"crypto/cipher"
-	"encoding/binary"
-)
-
-// The rc2 block size in bytes
-const BlockSize = 8
-
-type rc2Cipher struct {
-	k [64]uint16
-}
-
-// New returns a new rc2 cipher with the given key and effective key length t1
-func New(key []byte, t1 int) (cipher.Block, error) {
-	// TODO(dgryski): error checking for key length
-	return &rc2Cipher{
-		k: expandKey(key, t1),
-	}, nil
-}
-
-func (*rc2Cipher) BlockSize() int { return BlockSize }
-
-var piTable = [256]byte{
-	0xd9, 0x78, 0xf9, 0xc4, 0x19, 0xdd, 0xb5, 0xed, 0x28, 0xe9, 0xfd, 0x79, 0x4a, 0xa0, 0xd8, 0x9d,
-	0xc6, 0x7e, 0x37, 0x83, 0x2b, 0x76, 0x53, 0x8e, 0x62, 0x4c, 0x64, 0x88, 0x44, 0x8b, 0xfb, 0xa2,
-	0x17, 0x9a, 0x59, 0xf5, 0x87, 0xb3, 0x4f, 0x13, 0x61, 0x45, 0x6d, 0x8d, 0x09, 0x81, 0x7d, 0x32,
-	0xbd, 0x8f, 0x40, 0xeb, 0x86, 0xb7, 0x7b, 0x0b, 0xf0, 0x95, 0x21, 0x22, 0x5c, 0x6b, 0x4e, 0x82,
-	0x54, 0xd6, 0x65, 0x93, 0xce, 0x60, 0xb2, 0x1c, 0x73, 0x56, 0xc0, 0x14, 0xa7, 0x8c, 0xf1, 0xdc,
-	0x12, 0x75, 0xca, 0x1f, 0x3b, 0xbe, 0xe4, 0xd1, 0x42, 0x3d, 0xd4, 0x30, 0xa3, 0x3c, 0xb6, 0x26,
-	0x6f, 0xbf, 0x0e, 0xda, 0x46, 0x69, 0x07, 0x57, 0x27, 0xf2, 0x1d, 0x9b, 0xbc, 0x94, 0x43, 0x03,
-	0xf8, 0x11, 0xc7, 0xf6, 0x90, 0xef, 0x3e, 0xe7, 0x06, 0xc3, 0xd5, 0x2f, 0xc8, 0x66, 0x1e, 0xd7,
-	0x08, 0xe8, 0xea, 0xde, 0x80, 0x52, 0xee, 0xf7, 0x84, 0xaa, 0x72, 0xac, 0x35, 0x4d, 0x6a, 0x2a,
-	0x96, 0x1a, 0xd2, 0x71, 0x5a, 0x15, 0x49, 0x74, 0x4b, 0x9f, 0xd0, 0x5e, 0x04, 0x18, 0xa4, 0xec,
-	0xc2, 0xe0, 0x41, 0x6e, 0x0f, 0x51, 0xcb, 0xcc, 0x24, 0x91, 0xaf, 0x50, 0xa1, 0xf4, 0x70, 0x39,
-	0x99, 0x7c, 0x3a, 0x85, 0x23, 0xb8, 0xb4, 0x7a, 0xfc, 0x02, 0x36, 0x5b, 0x25, 0x55, 0x97, 0x31,
-	0x2d, 0x5d, 0xfa, 0x98, 0xe3, 0x8a, 0x92, 0xae, 0x05, 0xdf, 0x29, 0x10, 0x67, 0x6c, 0xba, 0xc9,
-	0xd3, 0x00, 0xe6, 0xcf, 0xe1, 0x9e, 0xa8, 0x2c, 0x63, 0x16, 0x01, 0x3f, 0x58, 0xe2, 0x89, 0xa9,
-	0x0d, 0x38, 0x34, 0x1b, 0xab, 0x33, 0xff, 0xb0, 0xbb, 0x48, 0x0c, 0x5f, 0xb9, 0xb1, 0xcd, 0x2e,
-	0xc5, 0xf3, 0xdb, 0x47, 0xe5, 0xa5, 0x9c, 0x77, 0x0a, 0xa6, 0x20, 0x68, 0xfe, 0x7f, 0xc1, 0xad,
-}
-
-func expandKey(key []byte, t1 int) [64]uint16 {
-
-	l := make([]byte, 128)
-	copy(l, key)
-
-	var t = len(key)
-	var t8 = (t1 + 7) / 8
-	var tm = byte(255 % uint(1<<(8+uint(t1)-8*uint(t8))))
-
-	for i := len(key); i < 128; i++ {
-		l[i] = piTable[l[i-1]+l[uint8(i-t)]]
-	}
-
-	l[128-t8] = piTable[l[128-t8]&tm]
-
-	for i := 127 - t8; i >= 0; i-- {
-		l[i] = piTable[l[i+1]^l[i+t8]]
-	}
-
-	var k [64]uint16
-
-	for i := range k {
-		k[i] = uint16(l[2*i]) + uint16(l[2*i+1])*256
-	}
-
-	return k
-}
-
-func rotl16(x uint16, b uint) uint16 {
-	return (x >> (16 - b)) | (x << b)
-}
-
-func (c *rc2Cipher) Encrypt(dst, src []byte) {
-
-	r0 := binary.LittleEndian.Uint16(src[0:])
-	r1 := binary.LittleEndian.Uint16(src[2:])
-	r2 := binary.LittleEndian.Uint16(src[4:])
-	r3 := binary.LittleEndian.Uint16(src[6:])
-
-	var j int
-
-	for j <= 16 {
-		// mix r0
-		r0 = r0 + c.k[j] + (r3 & r2) + ((^r3) & r1)
-		r0 = rotl16(r0, 1)
-		j++
-
-		// mix r1
-		r1 = r1 + c.k[j] + (r0 & r3) + ((^r0) & r2)
-		r1 = rotl16(r1, 2)
-		j++
-
-		// mix r2
-		r2 = r2 + c.k[j] + (r1 & r0) + ((^r1) & r3)
-		r2 = rotl16(r2, 3)
-		j++
-
-		// mix r3
-		r3 = r3 + c.k[j] + (r2 & r1) + ((^r2) & r0)
-		r3 = rotl16(r3, 5)
-		j++
-
-	}
-
-	r0 = r0 + c.k[r3&63]
-	r1 = r1 + c.k[r0&63]
-	r2 = r2 + c.k[r1&63]
-	r3 = r3 + c.k[r2&63]
-
-	for j <= 40 {
-
-		// mix r0
-		r0 = r0 + c.k[j] + (r3 & r2) + ((^r3) & r1)
-		r0 = rotl16(r0, 1)
-		j++
-
-		// mix r1
-		r1 = r1 + c.k[j] + (r0 & r3) + ((^r0) & r2)
-		r1 = rotl16(r1, 2)
-		j++
-
-		// mix r2
-		r2 = r2 + c.k[j] + (r1 & r0) + ((^r1) & r3)
-		r2 = rotl16(r2, 3)
-		j++
-
-		// mix r3
-		r3 = r3 + c.k[j] + (r2 & r1) + ((^r2) & r0)
-		r3 = rotl16(r3, 5)
-		j++
-
-	}
-
-	r0 = r0 + c.k[r3&63]
-	r1 = r1 + c.k[r0&63]
-	r2 = r2 + c.k[r1&63]
-	r3 = r3 + c.k[r2&63]
-
-	for j <= 60 {
-
-		// mix r0
-		r0 = r0 + c.k[j] + (r3 & r2) + ((^r3) & r1)
-		r0 = rotl16(r0, 1)
-		j++
-
-		// mix r1
-		r1 = r1 + c.k[j] + (r0 & r3) + ((^r0) & r2)
-		r1 = rotl16(r1, 2)
-		j++
-
-		// mix r2
-		r2 = r2 + c.k[j] + (r1 & r0) + ((^r1) & r3)
-		r2 = rotl16(r2, 3)
-		j++
-
-		// mix r3
-		r3 = r3 + c.k[j] + (r2 & r1) + ((^r2) & r0)
-		r3 = rotl16(r3, 5)
-		j++
-	}
-
-	binary.LittleEndian.PutUint16(dst[0:], r0)
-	binary.LittleEndian.PutUint16(dst[2:], r1)
-	binary.LittleEndian.PutUint16(dst[4:], r2)
-	binary.LittleEndian.PutUint16(dst[6:], r3)
-}
-
-func (c *rc2Cipher) Decrypt(dst, src []byte) {
-
-	r0 := binary.LittleEndian.Uint16(src[0:])
-	r1 := binary.LittleEndian.Uint16(src[2:])
-	r2 := binary.LittleEndian.Uint16(src[4:])
-	r3 := binary.LittleEndian.Uint16(src[6:])
-
-	j := 63
-
-	for j >= 44 {
-		// unmix r3
-		r3 = rotl16(r3, 16-5)
-		r3 = r3 - c.k[j] - (r2 & r1) - ((^r2) & r0)
-		j--
-
-		// unmix r2
-		r2 = rotl16(r2, 16-3)
-		r2 = r2 - c.k[j] - (r1 & r0) - ((^r1) & r3)
-		j--
-
-		// unmix r1
-		r1 = rotl16(r1, 16-2)
-		r1 = r1 - c.k[j] - (r0 & r3) - ((^r0) & r2)
-		j--
-
-		// unmix r0
-		r0 = rotl16(r0, 16-1)
-		r0 = r0 - c.k[j] - (r3 & r2) - ((^r3) & r1)
-		j--
-	}
-
-	r3 = r3 - c.k[r2&63]
-	r2 = r2 - c.k[r1&63]
-	r1 = r1 - c.k[r0&63]
-	r0 = r0 - c.k[r3&63]
-
-	for j >= 20 {
-		// unmix r3
-		r3 = rotl16(r3, 16-5)
-		r3 = r3 - c.k[j] - (r2 & r1) - ((^r2) & r0)
-		j--
-
-		// unmix r2
-		r2 = rotl16(r2, 16-3)
-		r2 = r2 - c.k[j] - (r1 & r0) - ((^r1) & r3)
-		j--
-
-		// unmix r1
-		r1 = rotl16(r1, 16-2)
-		r1 = r1 - c.k[j] - (r0 & r3) - ((^r0) & r2)
-		j--
-
-		// unmix r0
-		r0 = rotl16(r0, 16-1)
-		r0 = r0 - c.k[j] - (r3 & r2) - ((^r3) & r1)
-		j--
-
-	}
-
-	r3 = r3 - c.k[r2&63]
-	r2 = r2 - c.k[r1&63]
-	r1 = r1 - c.k[r0&63]
-	r0 = r0 - c.k[r3&63]
-
-	for j >= 0 {
-
-		// unmix r3
-		r3 = rotl16(r3, 16-5)
-		r3 = r3 - c.k[j] - (r2 & r1) - ((^r2) & r0)
-		j--
-
-		// unmix r2
-		r2 = rotl16(r2, 16-3)
-		r2 = r2 - c.k[j] - (r1 & r0) - ((^r1) & r3)
-		j--
-
-		// unmix r1
-		r1 = rotl16(r1, 16-2)
-		r1 = r1 - c.k[j] - (r0 & r3) - ((^r0) & r2)
-		j--
-
-		// unmix r0
-		r0 = rotl16(r0, 16-1)
-		r0 = r0 - c.k[j] - (r3 & r2) - ((^r3) & r1)
-		j--
-
-	}
-
-	binary.LittleEndian.PutUint16(dst[0:], r0)
-	binary.LittleEndian.PutUint16(dst[2:], r1)
-	binary.LittleEndian.PutUint16(dst[4:], r2)
-	binary.LittleEndian.PutUint16(dst[6:], r3)
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2_test.go
deleted file mode 100644
index 8a49dfaf3c..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/internal/rc2/rc2_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rc2
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func TestEncryptDecrypt(t *testing.T) {
-
-	// TODO(dgryski): add the rest of the test vectors from the RFC
-	var tests = []struct {
-		key    string
-		plain  string
-		cipher string
-		t1     int
-	}{
-		{
-			"0000000000000000",
-			"0000000000000000",
-			"ebb773f993278eff",
-			63,
-		},
-		{
-			"ffffffffffffffff",
-			"ffffffffffffffff",
-			"278b27e42e2f0d49",
-			64,
-		},
-		{
-			"3000000000000000",
-			"1000000000000001",
-			"30649edf9be7d2c2",
-			64,
-		},
-		{
-			"88",
-			"0000000000000000",
-			"61a8a244adacccf0",
-			64,
-		},
-		{
-			"88bca90e90875a",
-			"0000000000000000",
-			"6ccf4308974c267f",
-			64,
-		},
-		{
-			"88bca90e90875a7f0f79c384627bafb2",
-			"0000000000000000",
-			"1a807d272bbe5db1",
-			64,
-		},
-		{
-			"88bca90e90875a7f0f79c384627bafb2",
-			"0000000000000000",
-			"2269552ab0f85ca6",
-			128,
-		},
-		{
-			"88bca90e90875a7f0f79c384627bafb216f80a6f85920584c42fceb0be255daf1e",
-			"0000000000000000",
-			"5b78d3a43dfff1f1",
-			129,
-		},
-	}
-
-	for _, tt := range tests {
-		k, _ := hex.DecodeString(tt.key)
-		p, _ := hex.DecodeString(tt.plain)
-		c, _ := hex.DecodeString(tt.cipher)
-
-		b, _ := New(k, tt.t1)
-
-		var dst [8]byte
-
-		b.Encrypt(dst[:], p)
-
-		if !bytes.Equal(dst[:], c) {
-			t.Errorf("encrypt failed: got % 2x wanted % 2x\n", dst, c)
-		}
-
-		b.Decrypt(dst[:], c)
-
-		if !bytes.Equal(dst[:], p) {
-			t.Errorf("decrypt failed: got % 2x wanted % 2x\n", dst, p)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/mac.go b/installer/vendor/golang.org/x/crypto/pkcs12/mac.go
deleted file mode 100644
index 5f38aa7de8..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/mac.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-)
-
-type macData struct {
-	Mac        digestInfo
-	MacSalt    []byte
-	Iterations int `asn1:"optional,default:1"`
-}
-
-// from PKCS#7:
-type digestInfo struct {
-	Algorithm pkix.AlgorithmIdentifier
-	Digest    []byte
-}
-
-var (
-	oidSHA1 = asn1.ObjectIdentifier([]int{1, 3, 14, 3, 2, 26})
-)
-
-func verifyMac(macData *macData, message, password []byte) error {
-	if !macData.Mac.Algorithm.Algorithm.Equal(oidSHA1) {
-		return NotImplementedError("unknown digest algorithm: " + macData.Mac.Algorithm.Algorithm.String())
-	}
-
-	key := pbkdf(sha1Sum, 20, 64, macData.MacSalt, password, macData.Iterations, 3, 20)
-
-	mac := hmac.New(sha1.New, key)
-	mac.Write(message)
-	expectedMAC := mac.Sum(nil)
-
-	if !hmac.Equal(macData.Mac.Digest, expectedMAC) {
-		return ErrIncorrectPassword
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/mac_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/mac_test.go
deleted file mode 100644
index 1ed4ff21e1..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/mac_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"encoding/asn1"
-	"testing"
-)
-
-func TestVerifyMac(t *testing.T) {
-	td := macData{
-		Mac: digestInfo{
-			Digest: []byte{0x18, 0x20, 0x3d, 0xff, 0x1e, 0x16, 0xf4, 0x92, 0xf2, 0xaf, 0xc8, 0x91, 0xa9, 0xba, 0xd6, 0xca, 0x9d, 0xee, 0x51, 0x93},
-		},
-		MacSalt:    []byte{1, 2, 3, 4, 5, 6, 7, 8},
-		Iterations: 2048,
-	}
-
-	message := []byte{11, 12, 13, 14, 15}
-	password, _ := bmpString("")
-
-	td.Mac.Algorithm.Algorithm = asn1.ObjectIdentifier([]int{1, 2, 3})
-	err := verifyMac(&td, message, password)
-	if _, ok := err.(NotImplementedError); !ok {
-		t.Errorf("err: %v", err)
-	}
-
-	td.Mac.Algorithm.Algorithm = asn1.ObjectIdentifier([]int{1, 3, 14, 3, 2, 26})
-	err = verifyMac(&td, message, password)
-	if err != ErrIncorrectPassword {
-		t.Errorf("Expected incorrect password, got err: %v", err)
-	}
-
-	password, _ = bmpString("Sesame open")
-	err = verifyMac(&td, message, password)
-	if err != nil {
-		t.Errorf("err: %v", err)
-	}
-
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf.go b/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf.go
deleted file mode 100644
index 5c419d41e3..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"bytes"
-	"crypto/sha1"
-	"math/big"
-)
-
-var (
-	one = big.NewInt(1)
-)
-
-// sha1Sum returns the SHA-1 hash of in.
-func sha1Sum(in []byte) []byte {
-	sum := sha1.Sum(in)
-	return sum[:]
-}
-
-// fillWithRepeats returns v*ceiling(len(pattern) / v) bytes consisting of
-// repeats of pattern.
-func fillWithRepeats(pattern []byte, v int) []byte {
-	if len(pattern) == 0 {
-		return nil
-	}
-	outputLen := v * ((len(pattern) + v - 1) / v)
-	return bytes.Repeat(pattern, (outputLen+len(pattern)-1)/len(pattern))[:outputLen]
-}
-
-func pbkdf(hash func([]byte) []byte, u, v int, salt, password []byte, r int, ID byte, size int) (key []byte) {
-	// implementation of https://tools.ietf.org/html/rfc7292#appendix-B.2 , RFC text verbatim in comments
-
-	//    Let H be a hash function built around a compression function f:
-
-	//       Z_2^u x Z_2^v -> Z_2^u
-
-	//    (that is, H has a chaining variable and output of length u bits, and
-	//    the message input to the compression function of H is v bits).  The
-	//    values for u and v are as follows:
-
-	//            HASH FUNCTION     VALUE u        VALUE v
-	//              MD2, MD5          128            512
-	//                SHA-1           160            512
-	//               SHA-224          224            512
-	//               SHA-256          256            512
-	//               SHA-384          384            1024
-	//               SHA-512          512            1024
-	//             SHA-512/224        224            1024
-	//             SHA-512/256        256            1024
-
-	//    Furthermore, let r be the iteration count.
-
-	//    We assume here that u and v are both multiples of 8, as are the
-	//    lengths of the password and salt strings (which we denote by p and s,
-	//    respectively) and the number n of pseudorandom bits required.  In
-	//    addition, u and v are of course non-zero.
-
-	//    For information on security considerations for MD5 [19], see [25] and
-	//    [1], and on those for MD2, see [18].
-
-	//    The following procedure can be used to produce pseudorandom bits for
-	//    a particular "purpose" that is identified by a byte called "ID".
-	//    This standard specifies 3 different values for the ID byte:
-
-	//    1.  If ID=1, then the pseudorandom bits being produced are to be used
-	//        as key material for performing encryption or decryption.
-
-	//    2.  If ID=2, then the pseudorandom bits being produced are to be used
-	//        as an IV (Initial Value) for encryption or decryption.
-
-	//    3.  If ID=3, then the pseudorandom bits being produced are to be used
-	//        as an integrity key for MACing.
-
-	//    1.  Construct a string, D (the "diversifier"), by concatenating v/8
-	//        copies of ID.
-	var D []byte
-	for i := 0; i < v; i++ {
-		D = append(D, ID)
-	}
-
-	//    2.  Concatenate copies of the salt together to create a string S of
-	//        length v(ceiling(s/v)) bits (the final copy of the salt may be
-	//        truncated to create S).  Note that if the salt is the empty
-	//        string, then so is S.
-
-	S := fillWithRepeats(salt, v)
-
-	//    3.  Concatenate copies of the password together to create a string P
-	//        of length v(ceiling(p/v)) bits (the final copy of the password
-	//        may be truncated to create P).  Note that if the password is the
-	//        empty string, then so is P.
-
-	P := fillWithRepeats(password, v)
-
-	//    4.  Set I=S||P to be the concatenation of S and P.
-	I := append(S, P...)
-
-	//    5.  Set c=ceiling(n/u).
-	c := (size + u - 1) / u
-
-	//    6.  For i=1, 2, ..., c, do the following:
-	A := make([]byte, c*20)
-	var IjBuf []byte
-	for i := 0; i < c; i++ {
-		//        A.  Set A2=H^r(D||I). (i.e., the r-th hash of D||1,
-		//            H(H(H(... H(D||I))))
-		Ai := hash(append(D, I...))
-		for j := 1; j < r; j++ {
-			Ai = hash(Ai)
-		}
-		copy(A[i*20:], Ai[:])
-
-		if i < c-1 { // skip on last iteration
-			// B.  Concatenate copies of Ai to create a string B of length v
-			//     bits (the final copy of Ai may be truncated to create B).
-			var B []byte
-			for len(B) < v {
-				B = append(B, Ai[:]...)
-			}
-			B = B[:v]
-
-			// C.  Treating I as a concatenation I_0, I_1, ..., I_(k-1) of v-bit
-			//     blocks, where k=ceiling(s/v)+ceiling(p/v), modify I by
-			//     setting I_j=(I_j+B+1) mod 2^v for each j.
-			{
-				Bbi := new(big.Int).SetBytes(B)
-				Ij := new(big.Int)
-
-				for j := 0; j < len(I)/v; j++ {
-					Ij.SetBytes(I[j*v : (j+1)*v])
-					Ij.Add(Ij, Bbi)
-					Ij.Add(Ij, one)
-					Ijb := Ij.Bytes()
-					// We expect Ijb to be exactly v bytes,
-					// if it is longer or shorter we must
-					// adjust it accordingly.
-					if len(Ijb) > v {
-						Ijb = Ijb[len(Ijb)-v:]
-					}
-					if len(Ijb) < v {
-						if IjBuf == nil {
-							IjBuf = make([]byte, v)
-						}
-						bytesShort := v - len(Ijb)
-						for i := 0; i < bytesShort; i++ {
-							IjBuf[i] = 0
-						}
-						copy(IjBuf[bytesShort:], Ijb)
-						Ijb = IjBuf
-					}
-					copy(I[j*v:(j+1)*v], Ijb)
-				}
-			}
-		}
-	}
-	//    7.  Concatenate A_1, A_2, ..., A_c together to form a pseudorandom
-	//        bit string, A.
-
-	//    8.  Use the first n bits of A as the output of this entire process.
-	return A[:size]
-
-	//    If the above process is being used to generate a DES key, the process
-	//    should be used to create 64 random bits, and the key's parity bits
-	//    should be set after the 64 bits have been produced.  Similar concerns
-	//    hold for 2-key and 3-key triple-DES keys, for CDMF keys, and for any
-	//    similar keys with parity bits "built into them".
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf_test.go
deleted file mode 100644
index 262037d7eb..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/pbkdf_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestThatPBKDFWorksCorrectlyForLongKeys(t *testing.T) {
-	cipherInfo := shaWithTripleDESCBC{}
-
-	salt := []byte("\xff\xff\xff\xff\xff\xff\xff\xff")
-	password, _ := bmpString("sesame")
-	key := cipherInfo.deriveKey(salt, password, 2048)
-
-	if expected := []byte("\x7c\xd9\xfd\x3e\x2b\x3b\xe7\x69\x1a\x44\xe3\xbe\xf0\xf9\xea\x0f\xb9\xb8\x97\xd4\xe3\x25\xd9\xd1"); bytes.Compare(key, expected) != 0 {
-		t.Fatalf("expected key '%x', but found '%x'", expected, key)
-	}
-}
-
-func TestThatPBKDFHandlesLeadingZeros(t *testing.T) {
-	// This test triggers a case where I_j (in step 6C) ends up with leading zero
-	// byte, meaning that len(Ijb) < v (leading zeros get stripped by big.Int).
-	// This was previously causing bug whereby certain inputs would break the
-	// derivation and produce the wrong output.
-	key := pbkdf(sha1Sum, 20, 64, []byte("\xf3\x7e\x05\xb5\x18\x32\x4b\x4b"), []byte("\x00\x00"), 2048, 1, 24)
-	expected := []byte("\x00\xf7\x59\xff\x47\xd1\x4d\xd0\x36\x65\xd5\x94\x3c\xb3\xc4\xa3\x9a\x25\x55\xc0\x2a\xed\x66\xe1")
-	if bytes.Compare(key, expected) != 0 {
-		t.Fatalf("expected key '%x', but found '%x'", expected, key)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12.go b/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12.go
deleted file mode 100644
index eff9ad3a98..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12.go
+++ /dev/null
@@ -1,346 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package pkcs12 implements some of PKCS#12.
-//
-// This implementation is distilled from https://tools.ietf.org/html/rfc7292
-// and referenced documents. It is intended for decoding P12/PFX-stored
-// certificates and keys for use with the crypto/tls package.
-package pkcs12
-
-import (
-	"crypto/ecdsa"
-	"crypto/rsa"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"encoding/hex"
-	"encoding/pem"
-	"errors"
-)
-
-var (
-	oidDataContentType          = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 7, 1})
-	oidEncryptedDataContentType = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 7, 6})
-
-	oidFriendlyName     = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 9, 20})
-	oidLocalKeyID       = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 9, 21})
-	oidMicrosoftCSPName = asn1.ObjectIdentifier([]int{1, 3, 6, 1, 4, 1, 311, 17, 1})
-)
-
-type pfxPdu struct {
-	Version  int
-	AuthSafe contentInfo
-	MacData  macData `asn1:"optional"`
-}
-
-type contentInfo struct {
-	ContentType asn1.ObjectIdentifier
-	Content     asn1.RawValue `asn1:"tag:0,explicit,optional"`
-}
-
-type encryptedData struct {
-	Version              int
-	EncryptedContentInfo encryptedContentInfo
-}
-
-type encryptedContentInfo struct {
-	ContentType                asn1.ObjectIdentifier
-	ContentEncryptionAlgorithm pkix.AlgorithmIdentifier
-	EncryptedContent           []byte `asn1:"tag:0,optional"`
-}
-
-func (i encryptedContentInfo) Algorithm() pkix.AlgorithmIdentifier {
-	return i.ContentEncryptionAlgorithm
-}
-
-func (i encryptedContentInfo) Data() []byte { return i.EncryptedContent }
-
-type safeBag struct {
-	Id         asn1.ObjectIdentifier
-	Value      asn1.RawValue     `asn1:"tag:0,explicit"`
-	Attributes []pkcs12Attribute `asn1:"set,optional"`
-}
-
-type pkcs12Attribute struct {
-	Id    asn1.ObjectIdentifier
-	Value asn1.RawValue `asn1:"set"`
-}
-
-type encryptedPrivateKeyInfo struct {
-	AlgorithmIdentifier pkix.AlgorithmIdentifier
-	EncryptedData       []byte
-}
-
-func (i encryptedPrivateKeyInfo) Algorithm() pkix.AlgorithmIdentifier {
-	return i.AlgorithmIdentifier
-}
-
-func (i encryptedPrivateKeyInfo) Data() []byte {
-	return i.EncryptedData
-}
-
-// PEM block types
-const (
-	certificateType = "CERTIFICATE"
-	privateKeyType  = "PRIVATE KEY"
-)
-
-// unmarshal calls asn1.Unmarshal, but also returns an error if there is any
-// trailing data after unmarshaling.
-func unmarshal(in []byte, out interface{}) error {
-	trailing, err := asn1.Unmarshal(in, out)
-	if err != nil {
-		return err
-	}
-	if len(trailing) != 0 {
-		return errors.New("pkcs12: trailing data found")
-	}
-	return nil
-}
-
-// ConvertToPEM converts all "safe bags" contained in pfxData to PEM blocks.
-func ToPEM(pfxData []byte, password string) ([]*pem.Block, error) {
-	encodedPassword, err := bmpString(password)
-	if err != nil {
-		return nil, ErrIncorrectPassword
-	}
-
-	bags, encodedPassword, err := getSafeContents(pfxData, encodedPassword)
-
-	if err != nil {
-		return nil, err
-	}
-
-	blocks := make([]*pem.Block, 0, len(bags))
-	for _, bag := range bags {
-		block, err := convertBag(&bag, encodedPassword)
-		if err != nil {
-			return nil, err
-		}
-		blocks = append(blocks, block)
-	}
-
-	return blocks, nil
-}
-
-func convertBag(bag *safeBag, password []byte) (*pem.Block, error) {
-	block := &pem.Block{
-		Headers: make(map[string]string),
-	}
-
-	for _, attribute := range bag.Attributes {
-		k, v, err := convertAttribute(&attribute)
-		if err != nil {
-			return nil, err
-		}
-		block.Headers[k] = v
-	}
-
-	switch {
-	case bag.Id.Equal(oidCertBag):
-		block.Type = certificateType
-		certsData, err := decodeCertBag(bag.Value.Bytes)
-		if err != nil {
-			return nil, err
-		}
-		block.Bytes = certsData
-	case bag.Id.Equal(oidPKCS8ShroundedKeyBag):
-		block.Type = privateKeyType
-
-		key, err := decodePkcs8ShroudedKeyBag(bag.Value.Bytes, password)
-		if err != nil {
-			return nil, err
-		}
-
-		switch key := key.(type) {
-		case *rsa.PrivateKey:
-			block.Bytes = x509.MarshalPKCS1PrivateKey(key)
-		case *ecdsa.PrivateKey:
-			block.Bytes, err = x509.MarshalECPrivateKey(key)
-			if err != nil {
-				return nil, err
-			}
-		default:
-			return nil, errors.New("found unknown private key type in PKCS#8 wrapping")
-		}
-	default:
-		return nil, errors.New("don't know how to convert a safe bag of type " + bag.Id.String())
-	}
-	return block, nil
-}
-
-func convertAttribute(attribute *pkcs12Attribute) (key, value string, err error) {
-	isString := false
-
-	switch {
-	case attribute.Id.Equal(oidFriendlyName):
-		key = "friendlyName"
-		isString = true
-	case attribute.Id.Equal(oidLocalKeyID):
-		key = "localKeyId"
-	case attribute.Id.Equal(oidMicrosoftCSPName):
-		// This key is chosen to match OpenSSL.
-		key = "Microsoft CSP Name"
-		isString = true
-	default:
-		return "", "", errors.New("pkcs12: unknown attribute with OID " + attribute.Id.String())
-	}
-
-	if isString {
-		if err := unmarshal(attribute.Value.Bytes, &attribute.Value); err != nil {
-			return "", "", err
-		}
-		if value, err = decodeBMPString(attribute.Value.Bytes); err != nil {
-			return "", "", err
-		}
-	} else {
-		var id []byte
-		if err := unmarshal(attribute.Value.Bytes, &id); err != nil {
-			return "", "", err
-		}
-		value = hex.EncodeToString(id)
-	}
-
-	return key, value, nil
-}
-
-// Decode extracts a certificate and private key from pfxData. This function
-// assumes that there is only one certificate and only one private key in the
-// pfxData.
-func Decode(pfxData []byte, password string) (privateKey interface{}, certificate *x509.Certificate, err error) {
-	encodedPassword, err := bmpString(password)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	bags, encodedPassword, err := getSafeContents(pfxData, encodedPassword)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	if len(bags) != 2 {
-		err = errors.New("pkcs12: expected exactly two safe bags in the PFX PDU")
-		return
-	}
-
-	for _, bag := range bags {
-		switch {
-		case bag.Id.Equal(oidCertBag):
-			if certificate != nil {
-				err = errors.New("pkcs12: expected exactly one certificate bag")
-			}
-
-			certsData, err := decodeCertBag(bag.Value.Bytes)
-			if err != nil {
-				return nil, nil, err
-			}
-			certs, err := x509.ParseCertificates(certsData)
-			if err != nil {
-				return nil, nil, err
-			}
-			if len(certs) != 1 {
-				err = errors.New("pkcs12: expected exactly one certificate in the certBag")
-				return nil, nil, err
-			}
-			certificate = certs[0]
-
-		case bag.Id.Equal(oidPKCS8ShroundedKeyBag):
-			if privateKey != nil {
-				err = errors.New("pkcs12: expected exactly one key bag")
-			}
-
-			if privateKey, err = decodePkcs8ShroudedKeyBag(bag.Value.Bytes, encodedPassword); err != nil {
-				return nil, nil, err
-			}
-		}
-	}
-
-	if certificate == nil {
-		return nil, nil, errors.New("pkcs12: certificate missing")
-	}
-	if privateKey == nil {
-		return nil, nil, errors.New("pkcs12: private key missing")
-	}
-
-	return
-}
-
-func getSafeContents(p12Data, password []byte) (bags []safeBag, updatedPassword []byte, err error) {
-	pfx := new(pfxPdu)
-	if err := unmarshal(p12Data, pfx); err != nil {
-		return nil, nil, errors.New("pkcs12: error reading P12 data: " + err.Error())
-	}
-
-	if pfx.Version != 3 {
-		return nil, nil, NotImplementedError("can only decode v3 PFX PDU's")
-	}
-
-	if !pfx.AuthSafe.ContentType.Equal(oidDataContentType) {
-		return nil, nil, NotImplementedError("only password-protected PFX is implemented")
-	}
-
-	// unmarshal the explicit bytes in the content for type 'data'
-	if err := unmarshal(pfx.AuthSafe.Content.Bytes, &pfx.AuthSafe.Content); err != nil {
-		return nil, nil, err
-	}
-
-	if len(pfx.MacData.Mac.Algorithm.Algorithm) == 0 {
-		return nil, nil, errors.New("pkcs12: no MAC in data")
-	}
-
-	if err := verifyMac(&pfx.MacData, pfx.AuthSafe.Content.Bytes, password); err != nil {
-		if err == ErrIncorrectPassword && len(password) == 2 && password[0] == 0 && password[1] == 0 {
-			// some implementations use an empty byte array
-			// for the empty string password try one more
-			// time with empty-empty password
-			password = nil
-			err = verifyMac(&pfx.MacData, pfx.AuthSafe.Content.Bytes, password)
-		}
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-
-	var authenticatedSafe []contentInfo
-	if err := unmarshal(pfx.AuthSafe.Content.Bytes, &authenticatedSafe); err != nil {
-		return nil, nil, err
-	}
-
-	if len(authenticatedSafe) != 2 {
-		return nil, nil, NotImplementedError("expected exactly two items in the authenticated safe")
-	}
-
-	for _, ci := range authenticatedSafe {
-		var data []byte
-
-		switch {
-		case ci.ContentType.Equal(oidDataContentType):
-			if err := unmarshal(ci.Content.Bytes, &data); err != nil {
-				return nil, nil, err
-			}
-		case ci.ContentType.Equal(oidEncryptedDataContentType):
-			var encryptedData encryptedData
-			if err := unmarshal(ci.Content.Bytes, &encryptedData); err != nil {
-				return nil, nil, err
-			}
-			if encryptedData.Version != 0 {
-				return nil, nil, NotImplementedError("only version 0 of EncryptedData is supported")
-			}
-			if data, err = pbDecrypt(encryptedData.EncryptedContentInfo, password); err != nil {
-				return nil, nil, err
-			}
-		default:
-			return nil, nil, NotImplementedError("only data and encryptedData content types are supported in authenticated safe")
-		}
-
-		var safeContents []safeBag
-		if err := unmarshal(data, &safeContents); err != nil {
-			return nil, nil, err
-		}
-		bags = append(bags, safeContents...)
-	}
-
-	return bags, password, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12_test.go b/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12_test.go
deleted file mode 100644
index 14dd2a6c5d..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/pkcs12_test.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"crypto/rsa"
-	"crypto/tls"
-	"encoding/base64"
-	"encoding/pem"
-	"testing"
-)
-
-func TestPfx(t *testing.T) {
-	for commonName, base64P12 := range testdata {
-		p12, _ := base64.StdEncoding.DecodeString(base64P12)
-
-		priv, cert, err := Decode(p12, "")
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		if err := priv.(*rsa.PrivateKey).Validate(); err != nil {
-			t.Errorf("error while validating private key: %v", err)
-		}
-
-		if cert.Subject.CommonName != commonName {
-			t.Errorf("expected common name to be %q, but found %q", commonName, cert.Subject.CommonName)
-		}
-	}
-}
-
-func TestPEM(t *testing.T) {
-	for commonName, base64P12 := range testdata {
-		p12, _ := base64.StdEncoding.DecodeString(base64P12)
-
-		blocks, err := ToPEM(p12, "")
-		if err != nil {
-			t.Fatalf("error while converting to PEM: %s", err)
-		}
-
-		var pemData []byte
-		for _, b := range blocks {
-			pemData = append(pemData, pem.EncodeToMemory(b)...)
-		}
-
-		cert, err := tls.X509KeyPair(pemData, pemData)
-		if err != nil {
-			t.Errorf("err while converting to key pair: %v", err)
-		}
-		config := tls.Config{
-			Certificates: []tls.Certificate{cert},
-		}
-		config.BuildNameToCertificate()
-
-		if _, exists := config.NameToCertificate[commonName]; !exists {
-			t.Errorf("did not find our cert in PEM?: %v", config.NameToCertificate)
-		}
-	}
-}
-
-func ExampleToPEM() {
-	p12, _ := base64.StdEncoding.DecodeString(`MIIJzgIBAzCCCZQGCS ... CA+gwggPk==`)
-
-	blocks, err := ToPEM(p12, "password")
-	if err != nil {
-		panic(err)
-	}
-
-	var pemData []byte
-	for _, b := range blocks {
-		pemData = append(pemData, pem.EncodeToMemory(b)...)
-	}
-
-	// then use PEM data for tls to construct tls certificate:
-	cert, err := tls.X509KeyPair(pemData, pemData)
-	if err != nil {
-		panic(err)
-	}
-
-	config := &tls.Config{
-		Certificates: []tls.Certificate{cert},
-	}
-
-	_ = config
-}
-
-var testdata = map[string]string{
-	// 'null' password test case
-	"Windows Azure Tools": `MIIKDAIBAzCCCcwGCSqGSIb3DQEHAaCCCb0Eggm5MIIJtTCCBe4GCSqGSIb3DQEHAaCCBd8EggXbMIIF1zCCBdMGCyqGSIb3DQEMCgECoIIE7jCCBOowHAYKKoZIhvcNAQwBAzAOBAhStUNnlTGV+gICB9AEggTIJ81JIossF6boFWpPtkiQRPtI6DW6e9QD4/WvHAVrM2bKdpMzSMsCML5NyuddANTKHBVq00Jc9keqGNAqJPKkjhSUebzQFyhe0E1oI9T4zY5UKr/I8JclOeccH4QQnsySzYUG2SnniXnQ+JrG3juetli7EKth9h6jLc6xbubPadY5HMB3wL/eG/kJymiXwU2KQ9Mgd4X6jbcV+NNCE/8jbZHvSTCPeYTJIjxfeX61Sj5kFKUCzERbsnpyevhY3X0eYtEDezZQarvGmXtMMdzf8HJHkWRdk9VLDLgjk8uiJif/+X4FohZ37ig0CpgC2+dP4DGugaZZ51hb8tN9GeCKIsrmWogMXDIVd0OACBp/EjJVmFB6y0kUCXxUE0TZt0XA1tjAGJcjDUpBvTntZjPsnH/4ZySy+s2d9OOhJ6pzRQBRm360TzkFdSwk9DLiLdGfv4pwMMu/vNGBlqjP/1sQtj+jprJiD1sDbCl4AdQZVoMBQHadF2uSD4/o17XG/Ci0r2h6Htc2yvZMAbEY4zMjjIn2a+vqIxD6onexaek1R3zbkS9j19D6EN9EWn8xgz80YRCyW65znZk8xaIhhvlU/mg7sTxeyuqroBZNcq6uDaQTehDpyH7bY2l4zWRpoj10a6JfH2q5shYz8Y6UZC/kOTfuGqbZDNZWro/9pYquvNNW0M847E5t9bsf9VkAAMHRGBbWoVoU9VpI0UnoXSfvpOo+aXa2DSq5sHHUTVY7A9eov3z5IqT+pligx11xcs+YhDWcU8di3BTJisohKvv5Y8WSkm/rloiZd4ig269k0jTRk1olP/vCksPli4wKG2wdsd5o42nX1yL7mFfXocOANZbB+5qMkiwdyoQSk+Vq+C8nAZx2bbKhUq2MbrORGMzOe0Hh0x2a0PeObycN1Bpyv7Mp3ZI9h5hBnONKCnqMhtyQHUj/nNvbJUnDVYNfoOEqDiEqqEwB7YqWzAKz8KW0OIqdlM8uiQ4JqZZlFllnWJUfaiDrdFM3lYSnFQBkzeVlts6GpDOOBjCYd7dcCNS6kq6pZC6p6HN60Twu0JnurZD6RT7rrPkIGE8vAenFt4iGe/yF52fahCSY8Ws4K0UTwN7bAS+4xRHVCWvE8sMRZsRCHizb5laYsVrPZJhE6+hux6OBb6w8kwPYXc+ud5v6UxawUWgt6uPwl8mlAtU9Z7Miw4Nn/wtBkiLL/ke1UI1gqJtcQXgHxx6mzsjh41+nAgTvdbsSEyU6vfOmxGj3Rwc1eOrIhJUqn5YjOWfzzsz/D5DzWKmwXIwdspt1p+u+kol1N3f2wT9fKPnd/RGCb4g/1hc3Aju4DQYgGY782l89CEEdalpQ/35bQczMFk6Fje12HykakWEXd/bGm9Unh82gH84USiRpeOfQvBDYoqEyrY3zkFZzBjhDqa+jEcAj41tcGx47oSfDq3iVYCdL7HSIjtnyEktVXd7mISZLoMt20JACFcMw+mrbjlug+eU7o2GR7T+LwtOp/p4LZqyLa7oQJDwde1BNZtm3TCK2P1mW94QDL0nDUps5KLtr1DaZXEkRbjSJub2ZE9WqDHyU3KA8G84Tq/rN1IoNu/if45jacyPje1Npj9IftUZSP22nV7HMwZtwQ4P4MYHRMBMGCSqGSIb3DQEJFTEGBAQBAAAAMFsGCSqGSIb3DQEJFDFOHkwAewBCADQAQQA0AEYARQBCADAALQBBADEAOABBAC0ANAA0AEIAQgAtAEIANQBGADIALQA0ADkAMQBFAEYAMQA1ADIAQgBBADEANgB9MF0GCSsGAQQBgjcRATFQHk4ATQBpAGMAcgBvAHMAbwBmAHQAIABTAG8AZgB0AHcAYQByAGUAIABLAGUAeQAgAFMAdABvAHIAYQBnAGUAIABQAHIAbwB2AGkAZABlAHIwggO/BgkqhkiG9w0BBwagggOwMIIDrAIBADCCA6UGCSqGSIb3DQEHATAcBgoqhkiG9w0BDAEGMA4ECEBk5ZAYpu0WAgIH0ICCA3hik4mQFGpw9Ha8TQPtk+j2jwWdxfF0+sTk6S8PTsEfIhB7wPltjiCK92Uv2tCBQnodBUmatIfkpnRDEySmgmdglmOCzj204lWAMRs94PoALGn3JVBXbO1vIDCbAPOZ7Z0Hd0/1t2hmk8v3//QJGUg+qr59/4y/MuVfIg4qfkPcC2QSvYWcK3oTf6SFi5rv9B1IOWFgN5D0+C+x/9Lb/myPYX+rbOHrwtJ4W1fWKoz9g7wwmGFA9IJ2DYGuH8ifVFbDFT1Vcgsvs8arSX7oBsJVW0qrP7XkuDRe3EqCmKW7rBEwYrFznhxZcRDEpMwbFoSvgSIZ4XhFY9VKYglT+JpNH5iDceYEBOQL4vBLpxNUk3l5jKaBNxVa14AIBxq18bVHJ+STInhLhad4u10v/Xbx7wIL3f9DX1yLAkPrpBYbNHS2/ew6H/ySDJnoIDxkw2zZ4qJ+qUJZ1S0lbZVG+VT0OP5uF6tyOSpbMlcGkdl3z254n6MlCrTifcwkzscysDsgKXaYQw06rzrPW6RDub+t+hXzGny799fS9jhQMLDmOggaQ7+LA4oEZsfT89HLMWxJYDqjo3gIfjciV2mV54R684qLDS+AO09U49e6yEbwGlq8lpmO/pbXCbpGbB1b3EomcQbxdWxW2WEkkEd/VBn81K4M3obmywwXJkw+tPXDXfBmzzaqqCR+onMQ5ME1nMkY8ybnfoCc1bDIupjVWsEL2Wvq752RgI6KqzVNr1ew1IdqV5AWN2fOfek+0vi3Jd9FHF3hx8JMwjJL9dZsETV5kHtYJtE7wJ23J68BnCt2eI0GEuwXcCf5EdSKN/xXCTlIokc4Qk/gzRdIZsvcEJ6B1lGovKG54X4IohikqTjiepjbsMWj38yxDmK3mtENZ9ci8FPfbbvIEcOCZIinuY3qFUlRSbx7VUerEoV1IP3clUwexVQo4lHFee2jd7ocWsdSqSapW7OWUupBtDzRkqVhE7tGria+i1W2d6YLlJ21QTjyapWJehAMO637OdbJCCzDs1cXbodRRE7bsP492ocJy8OX66rKdhYbg8srSFNKdb3pF3UDNbN9jhI/t8iagRhNBhlQtTr1me2E/c86Q18qcRXl4bcXTt6acgCeffK6Y26LcVlrgjlD33AEYRRUeyC+rpxbT0aMjdFderlndKRIyG23mSp0HaUwNzAfMAcGBSsOAwIaBBRlviCbIyRrhIysg2dc/KbLFTc2vQQUg4rfwHMM4IKYRD/fsd1x6dda+wQ=`,
-	// empty string password test case
-	"testing@example.com": `MIIJzgIBAzCCCZQGCSqGSIb3DQEHAaCCCYUEggmBMIIJfTCCA/cGCSqGSIb3DQEHBqCCA+gwggPk
-AgEAMIID3QYJKoZIhvcNAQcBMBwGCiqGSIb3DQEMAQYwDgQIIszfRGqcmPcCAggAgIIDsOZ9Eg1L
-s5Wx8JhYoV3HAL4aRnkAWvTYB5NISZOgSgIQTssmt/3A7134dibTmaT/93LikkL3cTKLnQzJ4wDf
-YZ1bprpVJvUqz+HFT79m27bP9zYXFrvxWBJbxjYKTSjQMgz+h8LAEpXXGajCmxMJ1oCOtdXkhhzc
-LdZN6SAYgtmtyFnCdMEDskSggGuLb3fw84QEJ/Sj6FAULXunW/CPaS7Ce0TMsKmNU/jfFWj3yXXw
-ro0kwjKiVLpVFlnBlHo2OoVU7hmkm59YpGhLgS7nxLD3n7nBroQ0ID1+8R01NnV9XLGoGzxMm1te
-6UyTCkr5mj+kEQ8EP1Ys7g/TC411uhVWySMt/rcpkx7Vz1r9kYEAzJpONAfr6cuEVkPKrxpq4Fh0
-2fzlKBky0i/hrfIEUmngh+ERHUb/Mtv/fkv1j5w9suESbhsMLLiCXAlsP1UWMX+3bNizi3WVMEts
-FM2k9byn+p8IUD/A8ULlE4kEaWeoc+2idkCNQkLGuIdGUXUFVm58se0auUkVRoRJx8x4CkMesT8j
-b1H831W66YRWoEwwDQp2kK1lA2vQXxdVHWlFevMNxJeromLzj3ayiaFrfByeUXhR2S+Hpm+c0yNR
-4UVU9WED2kacsZcpRm9nlEa5sr28mri5JdBrNa/K02OOhvKCxr5ZGmbOVzUQKla2z4w+Ku9k8POm
-dfDNU/fGx1b5hcFWtghXe3msWVsSJrQihnN6q1ughzNiYZlJUGcHdZDRtiWwCFI0bR8h/Dmg9uO9
-4rawQQrjIRT7B8yF3UbkZyAqs8Ppb1TsMeNPHh1rxEfGVQknh/48ouJYsmtbnzugTUt3mJCXXiL+
-XcPMV6bBVAUu4aaVKSmg9+yJtY4/VKv10iw88ktv29fViIdBe3t6l/oPuvQgbQ8dqf4T8w0l/uKZ
-9lS1Na9jfT1vCoS7F5TRi+tmyj1vL5kr/amEIW6xKEP6oeAMvCMtbPAzVEj38zdJ1R22FfuIBxkh
-f0Zl7pdVbmzRxl/SBx9iIBJSqAvcXItiT0FIj8HxQ+0iZKqMQMiBuNWJf5pYOLWGrIyntCWwHuaQ
-wrx0sTGuEL9YXLEAsBDrsvzLkx/56E4INGZFrH8G7HBdW6iGqb22IMI4GHltYSyBRKbB0gadYTyv
-abPEoqww8o7/85aPSzOTJ/53ozD438Q+d0u9SyDuOb60SzCD/zPuCEd78YgtXJwBYTuUNRT27FaM
-3LGMX8Hz+6yPNRnmnA2XKPn7dx/IlaqAjIs8MIIFfgYJKoZIhvcNAQcBoIIFbwSCBWswggVnMIIF
-YwYLKoZIhvcNAQwKAQKgggTuMIIE6jAcBgoqhkiG9w0BDAEDMA4ECJr0cClYqOlcAgIIAASCBMhe
-OQSiP2s0/46ONXcNeVAkz2ksW3u/+qorhSiskGZ0b3dFa1hhgBU2Q7JVIkc4Hf7OXaT1eVQ8oqND
-uhqsNz83/kqYo70+LS8Hocj49jFgWAKrf/yQkdyP1daHa2yzlEw4mkpqOfnIORQHvYCa8nEApspZ
-wVu8y6WVuLHKU67mel7db2xwstQp7PRuSAYqGjTfAylElog8ASdaqqYbYIrCXucF8iF9oVgmb/Qo
-xrXshJ9aSLO4MuXlTPELmWgj07AXKSb90FKNihE+y0bWb9LPVFY1Sly3AX9PfrtkSXIZwqW3phpv
-MxGxQl/R6mr1z+hlTfY9Wdpb5vlKXPKA0L0Rt8d2pOesylFi6esJoS01QgP1kJILjbrV731kvDc0
-Jsd+Oxv4BMwA7ClG8w1EAOInc/GrV1MWFGw/HeEqj3CZ/l/0jv9bwkbVeVCiIhoL6P6lVx9pXq4t
-KZ0uKg/tk5TVJmG2vLcMLvezD0Yk3G2ZOMrywtmskrwoF7oAUpO9e87szoH6fEvUZlkDkPVW1NV4
-cZk3DBSQiuA3VOOg8qbo/tx/EE3H59P0axZWno2GSB0wFPWd1aj+b//tJEJHaaNR6qPRj4IWj9ru
-Qbc8eRAcVWleHg8uAehSvUXlFpyMQREyrnpvMGddpiTC8N4UMrrBRhV7+UbCOWhxPCbItnInBqgl
-1JpSZIP7iUtsIMdu3fEC2cdbXMTRul+4rdzUR7F9OaezV3jjvcAbDvgbK1CpyC+MJ1Mxm/iTgk9V
-iUArydhlR8OniN84GyGYoYCW9O/KUwb6ASmeFOu/msx8x6kAsSQHIkKqMKv0TUR3kZnkxUvdpBGP
-KTl4YCTvNGX4dYALBqrAETRDhua2KVBD/kEttDHwBNVbN2xi81+Mc7ml461aADfk0c66R/m2sjHB
-2tN9+wG12OIWFQjL6wF/UfJMYamxx2zOOExiId29Opt57uYiNVLOO4ourPewHPeH0u8Gz35aero7
-lkt7cZAe1Q0038JUuE/QGlnK4lESK9UkSIQAjSaAlTsrcfwtQxB2EjoOoLhwH5mvxUEmcNGNnXUc
-9xj3M5BD3zBz3Ft7G3YMMDwB1+zC2l+0UG0MGVjMVaeoy32VVNvxgX7jk22OXG1iaOB+PY9kdk+O
-X+52BGSf/rD6X0EnqY7XuRPkMGgjtpZeAYxRQnFtCZgDY4wYheuxqSSpdF49yNczSPLkgB3CeCfS
-+9NTKN7aC6hBbmW/8yYh6OvSiCEwY0lFS/T+7iaVxr1loE4zI1y/FFp4Pe1qfLlLttVlkygga2UU
-SCunTQ8UB/M5IXWKkhMOO11dP4niWwb39Y7pCWpau7mwbXOKfRPX96cgHnQJK5uG+BesDD1oYnX0
-6frN7FOnTSHKruRIwuI8KnOQ/I+owmyz71wiv5LMQt+yM47UrEjB/EZa5X8dpEwOZvkdqL7utcyo
-l0XH5kWMXdW856LL/FYftAqJIDAmtX1TXF/rbP6mPyN/IlDC0gjP84Uzd/a2UyTIWr+wk49Ek3vQ
-/uDamq6QrwAxVmNh5Tset5Vhpc1e1kb7mRMZIzxSP8JcTuYd45oFKi98I8YjvueHVZce1g7OudQP
-SbFQoJvdT46iBg1TTatlltpOiH2mFaxWVS0xYjAjBgkqhkiG9w0BCRUxFgQUdA9eVqvETX4an/c8
-p8SsTugkit8wOwYJKoZIhvcNAQkUMS4eLABGAHIAaQBlAG4AZABsAHkAIABuAGEAbQBlACAAZgBv
-AHIAIABjAGUAcgB0MDEwITAJBgUrDgMCGgUABBRFsNz3Zd1O1GI8GTuFwCWuDOjEEwQIuBEfIcAy
-HQ8CAggA`,
-}
diff --git a/installer/vendor/golang.org/x/crypto/pkcs12/safebags.go b/installer/vendor/golang.org/x/crypto/pkcs12/safebags.go
deleted file mode 100644
index def1f7b98d..0000000000
--- a/installer/vendor/golang.org/x/crypto/pkcs12/safebags.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pkcs12
-
-import (
-	"crypto/x509"
-	"encoding/asn1"
-	"errors"
-)
-
-var (
-	// see https://tools.ietf.org/html/rfc7292#appendix-D
-	oidCertTypeX509Certificate = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 9, 22, 1})
-	oidPKCS8ShroundedKeyBag    = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 10, 1, 2})
-	oidCertBag                 = asn1.ObjectIdentifier([]int{1, 2, 840, 113549, 1, 12, 10, 1, 3})
-)
-
-type certBag struct {
-	Id   asn1.ObjectIdentifier
-	Data []byte `asn1:"tag:0,explicit"`
-}
-
-func decodePkcs8ShroudedKeyBag(asn1Data, password []byte) (privateKey interface{}, err error) {
-	pkinfo := new(encryptedPrivateKeyInfo)
-	if err = unmarshal(asn1Data, pkinfo); err != nil {
-		return nil, errors.New("pkcs12: error decoding PKCS#8 shrouded key bag: " + err.Error())
-	}
-
-	pkData, err := pbDecrypt(pkinfo, password)
-	if err != nil {
-		return nil, errors.New("pkcs12: error decrypting PKCS#8 shrouded key bag: " + err.Error())
-	}
-
-	ret := new(asn1.RawValue)
-	if err = unmarshal(pkData, ret); err != nil {
-		return nil, errors.New("pkcs12: error unmarshaling decrypted private key: " + err.Error())
-	}
-
-	if privateKey, err = x509.ParsePKCS8PrivateKey(pkData); err != nil {
-		return nil, errors.New("pkcs12: error parsing PKCS#8 private key: " + err.Error())
-	}
-
-	return privateKey, nil
-}
-
-func decodeCertBag(asn1Data []byte) (x509Certificates []byte, err error) {
-	bag := new(certBag)
-	if err := unmarshal(asn1Data, bag); err != nil {
-		return nil, errors.New("pkcs12: error decoding cert bag: " + err.Error())
-	}
-	if !bag.Id.Equal(oidCertTypeX509Certificate) {
-		return nil, NotImplementedError("only X509 certificates are supported")
-	}
-	return bag.Data, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/poly1305_test.go b/installer/vendor/golang.org/x/crypto/poly1305/poly1305_test.go
deleted file mode 100644
index 017027fe6e..0000000000
--- a/installer/vendor/golang.org/x/crypto/poly1305/poly1305_test.go
+++ /dev/null
@@ -1,159 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package poly1305
-
-import (
-	"bytes"
-	"encoding/hex"
-	"flag"
-	"testing"
-	"unsafe"
-)
-
-var stressFlag = flag.Bool("stress", false, "run slow stress tests")
-
-var testData = []struct {
-	in, k, correct []byte
-}{
-	{
-		[]byte("Hello world!"),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0xa6, 0xf7, 0x45, 0x00, 0x8f, 0x81, 0xc9, 0x16, 0xa2, 0x0d, 0xcc, 0x74, 0xee, 0xf2, 0xb2, 0xf0},
-	},
-	{
-		make([]byte, 32),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0x49, 0xec, 0x78, 0x09, 0x0e, 0x48, 0x1e, 0xc6, 0xc2, 0x6b, 0x33, 0xb9, 0x1c, 0xcc, 0x03, 0x07},
-	},
-	{
-		make([]byte, 2007),
-		[]byte("this is 32-byte key for Poly1305"),
-		[]byte{0xda, 0x84, 0xbc, 0xab, 0x02, 0x67, 0x6c, 0x38, 0xcd, 0xb0, 0x15, 0x60, 0x42, 0x74, 0xc2, 0xaa},
-	},
-	{
-		make([]byte, 2007),
-		make([]byte, 32),
-		make([]byte, 16),
-	},
-	{
-		// This test triggers an edge-case. See https://go-review.googlesource.com/#/c/30101/.
-		[]byte{0x81, 0xd8, 0xb2, 0xe4, 0x6a, 0x25, 0x21, 0x3b, 0x58, 0xfe, 0xe4, 0x21, 0x3a, 0x2a, 0x28, 0xe9, 0x21, 0xc1, 0x2a, 0x96, 0x32, 0x51, 0x6d, 0x3b, 0x73, 0x27, 0x27, 0x27, 0xbe, 0xcf, 0x21, 0x29},
-		[]byte{0x3b, 0x3a, 0x29, 0xe9, 0x3b, 0x21, 0x3a, 0x5c, 0x5c, 0x3b, 0x3b, 0x05, 0x3a, 0x3a, 0x8c, 0x0d},
-		[]byte{0x6d, 0xc1, 0x8b, 0x8c, 0x34, 0x4c, 0xd7, 0x99, 0x27, 0x11, 0x8b, 0xbe, 0x84, 0xb7, 0xf3, 0x14},
-	},
-	{
-		// This test generates a result of (2^130-1) % (2^130-5).
-		[]byte{
-			0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		},
-		[]byte{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-		[]byte{4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	},
-	{
-		// This test generates a result of (2^130-6) % (2^130-5).
-		[]byte{
-			0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		},
-		[]byte{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-		[]byte{0xfa, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-	},
-	{
-		// This test generates a result of (2^130-5) % (2^130-5).
-		[]byte{
-			0xfb, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-		},
-		[]byte{1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-		[]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
-	},
-}
-
-func testSum(t *testing.T, unaligned bool) {
-	var out [16]byte
-	var key [32]byte
-
-	for i, v := range testData {
-		in := v.in
-		if unaligned {
-			in = unalignBytes(in)
-		}
-		copy(key[:], v.k)
-		Sum(&out, in, &key)
-		if !bytes.Equal(out[:], v.correct) {
-			t.Errorf("%d: expected %x, got %x", i, v.correct, out[:])
-		}
-	}
-}
-
-func TestBurnin(t *testing.T) {
-	// This test can be used to sanity-check significant changes. It can
-	// take about many minutes to run, even on fast machines. It's disabled
-	// by default.
-	if !*stressFlag {
-		t.Skip("skipping without -stress")
-	}
-
-	var key [32]byte
-	var input [25]byte
-	var output [16]byte
-
-	for i := range key {
-		key[i] = 1
-	}
-	for i := range input {
-		input[i] = 2
-	}
-
-	for i := uint64(0); i < 1e10; i++ {
-		Sum(&output, input[:], &key)
-		copy(key[0:], output[:])
-		copy(key[16:], output[:])
-		copy(input[:], output[:])
-		copy(input[16:], output[:])
-	}
-
-	const expected = "5e3b866aea0b636d240c83c428f84bfa"
-	if got := hex.EncodeToString(output[:]); got != expected {
-		t.Errorf("expected %s, got %s", expected, got)
-	}
-}
-
-func TestSum(t *testing.T)          { testSum(t, false) }
-func TestSumUnaligned(t *testing.T) { testSum(t, true) }
-
-func benchmark(b *testing.B, size int, unaligned bool) {
-	var out [16]byte
-	var key [32]byte
-	in := make([]byte, size)
-	if unaligned {
-		in = unalignBytes(in)
-	}
-	b.SetBytes(int64(len(in)))
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Sum(&out, in, &key)
-	}
-}
-
-func Benchmark64(b *testing.B)          { benchmark(b, 64, false) }
-func Benchmark1K(b *testing.B)          { benchmark(b, 1024, false) }
-func Benchmark64Unaligned(b *testing.B) { benchmark(b, 64, true) }
-func Benchmark1KUnaligned(b *testing.B) { benchmark(b, 1024, true) }
-
-func unalignBytes(in []byte) []byte {
-	out := make([]byte, len(in)+1)
-	if uintptr(unsafe.Pointer(&out[0]))&(unsafe.Alignof(uint32(0))-1) == 0 {
-		out = out[1:]
-	} else {
-		out = out[:len(in)]
-	}
-	copy(out, in)
-	return out
-}
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/sum_noasm.go b/installer/vendor/golang.org/x/crypto/poly1305/sum_noasm.go
new file mode 100644
index 0000000000..751eec5274
--- /dev/null
+++ b/installer/vendor/golang.org/x/crypto/poly1305/sum_noasm.go
@@ -0,0 +1,14 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,!go1.11 !arm,!amd64,!s390x gccgo appengine nacl
+
+package poly1305
+
+// Sum generates an authenticator for msg using a one-time key and puts the
+// 16-byte result into out. Authenticating two different messages with the same
+// key allows an attacker to forge messages at will.
+func Sum(out *[TagSize]byte, msg []byte, key *[32]byte) {
+	sumGeneric(out, msg, key)
+}
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/sum_ref.go b/installer/vendor/golang.org/x/crypto/poly1305/sum_ref.go
index b2805a5ca1..c4d59bd098 100644
--- a/installer/vendor/golang.org/x/crypto/poly1305/sum_ref.go
+++ b/installer/vendor/golang.org/x/crypto/poly1305/sum_ref.go
@@ -2,16 +2,14 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build !amd64,!arm gccgo appengine nacl
-
 package poly1305
 
 import "encoding/binary"
 
-// Sum generates an authenticator for msg using a one-time key and puts the
-// 16-byte result into out. Authenticating two different messages with the same
-// key allows an attacker to forge messages at will.
-func Sum(out *[TagSize]byte, msg []byte, key *[32]byte) {
+// sumGeneric generates an authenticator for msg using a one-time key and
+// puts the 16-byte result into out. This is the generic implementation of
+// Sum and should be called if no assembly implementation is available.
+func sumGeneric(out *[TagSize]byte, msg []byte, key *[32]byte) {
 	var (
 		h0, h1, h2, h3, h4 uint32 // the hash accumulators
 		r0, r1, r2, r3, r4 uint64 // the r part of the key
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.go b/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.go
new file mode 100644
index 0000000000..7a266cece4
--- /dev/null
+++ b/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.go
@@ -0,0 +1,49 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,go1.11,!gccgo,!appengine
+
+package poly1305
+
+// hasVectorFacility reports whether the machine supports
+// the vector facility (vx).
+func hasVectorFacility() bool
+
+// hasVMSLFacility reports whether the machine supports
+// Vector Multiply Sum Logical (VMSL).
+func hasVMSLFacility() bool
+
+var hasVX = hasVectorFacility()
+var hasVMSL = hasVMSLFacility()
+
+// poly1305vx is an assembly implementation of Poly1305 that uses vector
+// instructions. It must only be called if the vector facility (vx) is
+// available.
+//go:noescape
+func poly1305vx(out *[16]byte, m *byte, mlen uint64, key *[32]byte)
+
+// poly1305vmsl is an assembly implementation of Poly1305 that uses vector
+// instructions, including VMSL. It must only be called if the vector facility (vx) is
+// available and if VMSL is supported.
+//go:noescape
+func poly1305vmsl(out *[16]byte, m *byte, mlen uint64, key *[32]byte)
+
+// Sum generates an authenticator for m using a one-time key and puts the
+// 16-byte result into out. Authenticating two different messages with the same
+// key allows an attacker to forge messages at will.
+func Sum(out *[16]byte, m []byte, key *[32]byte) {
+	if hasVX {
+		var mPtr *byte
+		if len(m) > 0 {
+			mPtr = &m[0]
+		}
+		if hasVMSL && len(m) > 256 {
+			poly1305vmsl(out, mPtr, uint64(len(m)), key)
+		} else {
+			poly1305vx(out, mPtr, uint64(len(m)), key)
+		}
+	} else {
+		sumGeneric(out, m, key)
+	}
+}
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.s b/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.s
new file mode 100644
index 0000000000..356c07a6c2
--- /dev/null
+++ b/installer/vendor/golang.org/x/crypto/poly1305/sum_s390x.s
@@ -0,0 +1,400 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,go1.11,!gccgo,!appengine
+
+#include "textflag.h"
+
+// Implementation of Poly1305 using the vector facility (vx).
+
+// constants
+#define MOD26 V0
+#define EX0   V1
+#define EX1   V2
+#define EX2   V3
+
+// temporaries
+#define T_0 V4
+#define T_1 V5
+#define T_2 V6
+#define T_3 V7
+#define T_4 V8
+
+// key (r)
+#define R_0  V9
+#define R_1  V10
+#define R_2  V11
+#define R_3  V12
+#define R_4  V13
+#define R5_1 V14
+#define R5_2 V15
+#define R5_3 V16
+#define R5_4 V17
+#define RSAVE_0 R5
+#define RSAVE_1 R6
+#define RSAVE_2 R7
+#define RSAVE_3 R8
+#define RSAVE_4 R9
+#define R5SAVE_1 V28
+#define R5SAVE_2 V29
+#define R5SAVE_3 V30
+#define R5SAVE_4 V31
+
+// message block
+#define F_0 V18
+#define F_1 V19
+#define F_2 V20
+#define F_3 V21
+#define F_4 V22
+
+// accumulator
+#define H_0 V23
+#define H_1 V24
+#define H_2 V25
+#define H_3 V26
+#define H_4 V27
+
+GLOBL ·keyMask<>(SB), RODATA, $16
+DATA ·keyMask<>+0(SB)/8, $0xffffff0ffcffff0f
+DATA ·keyMask<>+8(SB)/8, $0xfcffff0ffcffff0f
+
+GLOBL ·bswapMask<>(SB), RODATA, $16
+DATA ·bswapMask<>+0(SB)/8, $0x0f0e0d0c0b0a0908
+DATA ·bswapMask<>+8(SB)/8, $0x0706050403020100
+
+GLOBL ·constants<>(SB), RODATA, $64
+// MOD26
+DATA ·constants<>+0(SB)/8, $0x3ffffff
+DATA ·constants<>+8(SB)/8, $0x3ffffff
+// EX0
+DATA ·constants<>+16(SB)/8, $0x0006050403020100
+DATA ·constants<>+24(SB)/8, $0x1016151413121110
+// EX1
+DATA ·constants<>+32(SB)/8, $0x060c0b0a09080706
+DATA ·constants<>+40(SB)/8, $0x161c1b1a19181716
+// EX2
+DATA ·constants<>+48(SB)/8, $0x0d0d0d0d0d0f0e0d
+DATA ·constants<>+56(SB)/8, $0x1d1d1d1d1d1f1e1d
+
+// h = (f*g) % (2**130-5) [partial reduction]
+#define MULTIPLY(f0, f1, f2, f3, f4, g0, g1, g2, g3, g4, g51, g52, g53, g54, h0, h1, h2, h3, h4) \
+	VMLOF  f0, g0, h0        \
+	VMLOF  f0, g1, h1        \
+	VMLOF  f0, g2, h2        \
+	VMLOF  f0, g3, h3        \
+	VMLOF  f0, g4, h4        \
+	VMLOF  f1, g54, T_0      \
+	VMLOF  f1, g0, T_1       \
+	VMLOF  f1, g1, T_2       \
+	VMLOF  f1, g2, T_3       \
+	VMLOF  f1, g3, T_4       \
+	VMALOF f2, g53, h0, h0   \
+	VMALOF f2, g54, h1, h1   \
+	VMALOF f2, g0, h2, h2    \
+	VMALOF f2, g1, h3, h3    \
+	VMALOF f2, g2, h4, h4    \
+	VMALOF f3, g52, T_0, T_0 \
+	VMALOF f3, g53, T_1, T_1 \
+	VMALOF f3, g54, T_2, T_2 \
+	VMALOF f3, g0, T_3, T_3  \
+	VMALOF f3, g1, T_4, T_4  \
+	VMALOF f4, g51, h0, h0   \
+	VMALOF f4, g52, h1, h1   \
+	VMALOF f4, g53, h2, h2   \
+	VMALOF f4, g54, h3, h3   \
+	VMALOF f4, g0, h4, h4    \
+	VAG    T_0, h0, h0       \
+	VAG    T_1, h1, h1       \
+	VAG    T_2, h2, h2       \
+	VAG    T_3, h3, h3       \
+	VAG    T_4, h4, h4
+
+// carry h0->h1 h3->h4, h1->h2 h4->h0, h0->h1 h2->h3, h3->h4
+#define REDUCE(h0, h1, h2, h3, h4) \
+	VESRLG $26, h0, T_0  \
+	VESRLG $26, h3, T_1  \
+	VN     MOD26, h0, h0 \
+	VN     MOD26, h3, h3 \
+	VAG    T_0, h1, h1   \
+	VAG    T_1, h4, h4   \
+	VESRLG $26, h1, T_2  \
+	VESRLG $26, h4, T_3  \
+	VN     MOD26, h1, h1 \
+	VN     MOD26, h4, h4 \
+	VESLG  $2, T_3, T_4  \
+	VAG    T_3, T_4, T_4 \
+	VAG    T_2, h2, h2   \
+	VAG    T_4, h0, h0   \
+	VESRLG $26, h2, T_0  \
+	VESRLG $26, h0, T_1  \
+	VN     MOD26, h2, h2 \
+	VN     MOD26, h0, h0 \
+	VAG    T_0, h3, h3   \
+	VAG    T_1, h1, h1   \
+	VESRLG $26, h3, T_2  \
+	VN     MOD26, h3, h3 \
+	VAG    T_2, h4, h4
+
+// expand in0 into d[0] and in1 into d[1]
+#define EXPAND(in0, in1, d0, d1, d2, d3, d4) \
+	VGBM   $0x0707, d1       \ // d1=tmp
+	VPERM  in0, in1, EX2, d4 \
+	VPERM  in0, in1, EX0, d0 \
+	VPERM  in0, in1, EX1, d2 \
+	VN     d1, d4, d4        \
+	VESRLG $26, d0, d1       \
+	VESRLG $30, d2, d3       \
+	VESRLG $4, d2, d2        \
+	VN     MOD26, d0, d0     \
+	VN     MOD26, d1, d1     \
+	VN     MOD26, d2, d2     \
+	VN     MOD26, d3, d3
+
+// pack h4:h0 into h1:h0 (no carry)
+#define PACK(h0, h1, h2, h3, h4) \
+	VESLG $26, h1, h1  \
+	VESLG $26, h3, h3  \
+	VO    h0, h1, h0   \
+	VO    h2, h3, h2   \
+	VESLG $4, h2, h2   \
+	VLEIB $7, $48, h1  \
+	VSLB  h1, h2, h2   \
+	VO    h0, h2, h0   \
+	VLEIB $7, $104, h1 \
+	VSLB  h1, h4, h3   \
+	VO    h3, h0, h0   \
+	VLEIB $7, $24, h1  \
+	VSRLB h1, h4, h1
+
+// if h > 2**130-5 then h -= 2**130-5
+#define MOD(h0, h1, t0, t1, t2) \
+	VZERO t0          \
+	VLEIG $1, $5, t0  \
+	VACCQ h0, t0, t1  \
+	VAQ   h0, t0, t0  \
+	VONE  t2          \
+	VLEIG $1, $-4, t2 \
+	VAQ   t2, t1, t1  \
+	VACCQ h1, t1, t1  \
+	VONE  t2          \
+	VAQ   t2, t1, t1  \
+	VN    h0, t1, t2  \
+	VNC   t0, t1, t1  \
+	VO    t1, t2, h0
+
+// func poly1305vx(out *[16]byte, m *byte, mlen uint64, key *[32]key)
+TEXT ·poly1305vx(SB), $0-32
+	// This code processes up to 2 blocks (32 bytes) per iteration
+	// using the algorithm described in:
+	// NEON crypto, Daniel J. Bernstein & Peter Schwabe
+	// https://cryptojedi.org/papers/neoncrypto-20120320.pdf
+	LMG out+0(FP), R1, R4 // R1=out, R2=m, R3=mlen, R4=key
+
+	// load MOD26, EX0, EX1 and EX2
+	MOVD $·constants<>(SB), R5
+	VLM  (R5), MOD26, EX2
+
+	// setup r
+	VL   (R4), T_0
+	MOVD $·keyMask<>(SB), R6
+	VL   (R6), T_1
+	VN   T_0, T_1, T_0
+	EXPAND(T_0, T_0, R_0, R_1, R_2, R_3, R_4)
+
+	// setup r*5
+	VLEIG $0, $5, T_0
+	VLEIG $1, $5, T_0
+
+	// store r (for final block)
+	VMLOF T_0, R_1, R5SAVE_1
+	VMLOF T_0, R_2, R5SAVE_2
+	VMLOF T_0, R_3, R5SAVE_3
+	VMLOF T_0, R_4, R5SAVE_4
+	VLGVG $0, R_0, RSAVE_0
+	VLGVG $0, R_1, RSAVE_1
+	VLGVG $0, R_2, RSAVE_2
+	VLGVG $0, R_3, RSAVE_3
+	VLGVG $0, R_4, RSAVE_4
+
+	// skip r**2 calculation
+	CMPBLE R3, $16, skip
+
+	// calculate r**2
+	MULTIPLY(R_0, R_1, R_2, R_3, R_4, R_0, R_1, R_2, R_3, R_4, R5SAVE_1, R5SAVE_2, R5SAVE_3, R5SAVE_4, H_0, H_1, H_2, H_3, H_4)
+	REDUCE(H_0, H_1, H_2, H_3, H_4)
+	VLEIG $0, $5, T_0
+	VLEIG $1, $5, T_0
+	VMLOF T_0, H_1, R5_1
+	VMLOF T_0, H_2, R5_2
+	VMLOF T_0, H_3, R5_3
+	VMLOF T_0, H_4, R5_4
+	VLR   H_0, R_0
+	VLR   H_1, R_1
+	VLR   H_2, R_2
+	VLR   H_3, R_3
+	VLR   H_4, R_4
+
+	// initialize h
+	VZERO H_0
+	VZERO H_1
+	VZERO H_2
+	VZERO H_3
+	VZERO H_4
+
+loop:
+	CMPBLE R3, $32, b2
+	VLM    (R2), T_0, T_1
+	SUB    $32, R3
+	MOVD   $32(R2), R2
+	EXPAND(T_0, T_1, F_0, F_1, F_2, F_3, F_4)
+	VLEIB  $4, $1, F_4
+	VLEIB  $12, $1, F_4
+
+multiply:
+	VAG    H_0, F_0, F_0
+	VAG    H_1, F_1, F_1
+	VAG    H_2, F_2, F_2
+	VAG    H_3, F_3, F_3
+	VAG    H_4, F_4, F_4
+	MULTIPLY(F_0, F_1, F_2, F_3, F_4, R_0, R_1, R_2, R_3, R_4, R5_1, R5_2, R5_3, R5_4, H_0, H_1, H_2, H_3, H_4)
+	REDUCE(H_0, H_1, H_2, H_3, H_4)
+	CMPBNE R3, $0, loop
+
+finish:
+	// sum vectors
+	VZERO  T_0
+	VSUMQG H_0, T_0, H_0
+	VSUMQG H_1, T_0, H_1
+	VSUMQG H_2, T_0, H_2
+	VSUMQG H_3, T_0, H_3
+	VSUMQG H_4, T_0, H_4
+
+	// h may be >= 2*(2**130-5) so we need to reduce it again
+	REDUCE(H_0, H_1, H_2, H_3, H_4)
+
+	// carry h1->h4
+	VESRLG $26, H_1, T_1
+	VN     MOD26, H_1, H_1
+	VAQ    T_1, H_2, H_2
+	VESRLG $26, H_2, T_2
+	VN     MOD26, H_2, H_2
+	VAQ    T_2, H_3, H_3
+	VESRLG $26, H_3, T_3
+	VN     MOD26, H_3, H_3
+	VAQ    T_3, H_4, H_4
+
+	// h is now < 2*(2**130-5)
+	// pack h into h1 (hi) and h0 (lo)
+	PACK(H_0, H_1, H_2, H_3, H_4)
+
+	// if h > 2**130-5 then h -= 2**130-5
+	MOD(H_0, H_1, T_0, T_1, T_2)
+
+	// h += s
+	MOVD  $·bswapMask<>(SB), R5
+	VL    (R5), T_1
+	VL    16(R4), T_0
+	VPERM T_0, T_0, T_1, T_0    // reverse bytes (to big)
+	VAQ   T_0, H_0, H_0
+	VPERM H_0, H_0, T_1, H_0    // reverse bytes (to little)
+	VST   H_0, (R1)
+
+	RET
+
+b2:
+	CMPBLE R3, $16, b1
+
+	// 2 blocks remaining
+	SUB    $17, R3
+	VL     (R2), T_0
+	VLL    R3, 16(R2), T_1
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, T_1
+	EXPAND(T_0, T_1, F_0, F_1, F_2, F_3, F_4)
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $12, $1, F_4
+	VLEIB  $4, $1, F_4
+
+	// setup [r²,r]
+	VLVGG $1, RSAVE_0, R_0
+	VLVGG $1, RSAVE_1, R_1
+	VLVGG $1, RSAVE_2, R_2
+	VLVGG $1, RSAVE_3, R_3
+	VLVGG $1, RSAVE_4, R_4
+	VPDI  $0, R5_1, R5SAVE_1, R5_1
+	VPDI  $0, R5_2, R5SAVE_2, R5_2
+	VPDI  $0, R5_3, R5SAVE_3, R5_3
+	VPDI  $0, R5_4, R5SAVE_4, R5_4
+
+	MOVD $0, R3
+	BR   multiply
+
+skip:
+	VZERO H_0
+	VZERO H_1
+	VZERO H_2
+	VZERO H_3
+	VZERO H_4
+
+	CMPBEQ R3, $0, finish
+
+b1:
+	// 1 block remaining
+	SUB    $1, R3
+	VLL    R3, (R2), T_0
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, T_0
+	VZERO  T_1
+	EXPAND(T_0, T_1, F_0, F_1, F_2, F_3, F_4)
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $4, $1, F_4
+	VLEIG  $1, $1, R_0
+	VZERO  R_1
+	VZERO  R_2
+	VZERO  R_3
+	VZERO  R_4
+	VZERO  R5_1
+	VZERO  R5_2
+	VZERO  R5_3
+	VZERO  R5_4
+
+	// setup [r, 1]
+	VLVGG $0, RSAVE_0, R_0
+	VLVGG $0, RSAVE_1, R_1
+	VLVGG $0, RSAVE_2, R_2
+	VLVGG $0, RSAVE_3, R_3
+	VLVGG $0, RSAVE_4, R_4
+	VPDI  $0, R5SAVE_1, R5_1, R5_1
+	VPDI  $0, R5SAVE_2, R5_2, R5_2
+	VPDI  $0, R5SAVE_3, R5_3, R5_3
+	VPDI  $0, R5SAVE_4, R5_4, R5_4
+
+	MOVD $0, R3
+	BR   multiply
+
+TEXT ·hasVectorFacility(SB), NOSPLIT, $24-1
+	MOVD  $x-24(SP), R1
+	XC    $24, 0(R1), 0(R1) // clear the storage
+	MOVD  $2, R0            // R0 is the number of double words stored -1
+	WORD  $0xB2B01000       // STFLE 0(R1)
+	XOR   R0, R0            // reset the value of R0
+	MOVBZ z-8(SP), R1
+	AND   $0x40, R1
+	BEQ   novector
+
+vectorinstalled:
+	// check if the vector instruction has been enabled
+	VLEIB  $0, $0xF, V16
+	VLGVB  $0, V16, R1
+	CMPBNE R1, $0xF, novector
+	MOVB   $1, ret+0(FP)      // have vx
+	RET
+
+novector:
+	MOVB $0, ret+0(FP) // no vx
+	RET
diff --git a/installer/vendor/golang.org/x/crypto/poly1305/sum_vmsl_s390x.s b/installer/vendor/golang.org/x/crypto/poly1305/sum_vmsl_s390x.s
new file mode 100644
index 0000000000..e548020b14
--- /dev/null
+++ b/installer/vendor/golang.org/x/crypto/poly1305/sum_vmsl_s390x.s
@@ -0,0 +1,931 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build s390x,go1.11,!gccgo,!appengine
+
+#include "textflag.h"
+
+// Implementation of Poly1305 using the vector facility (vx) and the VMSL instruction.
+
+// constants
+#define EX0   V1
+#define EX1   V2
+#define EX2   V3
+
+// temporaries
+#define T_0 V4
+#define T_1 V5
+#define T_2 V6
+#define T_3 V7
+#define T_4 V8
+#define T_5 V9
+#define T_6 V10
+#define T_7 V11
+#define T_8 V12
+#define T_9 V13
+#define T_10 V14
+
+// r**2 & r**4
+#define R_0  V15
+#define R_1  V16
+#define R_2  V17
+#define R5_1 V18
+#define R5_2 V19
+// key (r)
+#define RSAVE_0 R7
+#define RSAVE_1 R8
+#define RSAVE_2 R9
+#define R5SAVE_1 R10
+#define R5SAVE_2 R11
+
+// message block
+#define M0 V20
+#define M1 V21
+#define M2 V22
+#define M3 V23
+#define M4 V24
+#define M5 V25
+
+// accumulator
+#define H0_0 V26
+#define H1_0 V27
+#define H2_0 V28
+#define H0_1 V29
+#define H1_1 V30
+#define H2_1 V31
+
+GLOBL ·keyMask<>(SB), RODATA, $16
+DATA ·keyMask<>+0(SB)/8, $0xffffff0ffcffff0f
+DATA ·keyMask<>+8(SB)/8, $0xfcffff0ffcffff0f
+
+GLOBL ·bswapMask<>(SB), RODATA, $16
+DATA ·bswapMask<>+0(SB)/8, $0x0f0e0d0c0b0a0908
+DATA ·bswapMask<>+8(SB)/8, $0x0706050403020100
+
+GLOBL ·constants<>(SB), RODATA, $48
+// EX0
+DATA ·constants<>+0(SB)/8, $0x18191a1b1c1d1e1f
+DATA ·constants<>+8(SB)/8, $0x0000050403020100
+// EX1
+DATA ·constants<>+16(SB)/8, $0x18191a1b1c1d1e1f
+DATA ·constants<>+24(SB)/8, $0x00000a0908070605
+// EX2
+DATA ·constants<>+32(SB)/8, $0x18191a1b1c1d1e1f
+DATA ·constants<>+40(SB)/8, $0x0000000f0e0d0c0b
+
+GLOBL ·c<>(SB), RODATA, $48
+// EX0
+DATA ·c<>+0(SB)/8, $0x0000050403020100
+DATA ·c<>+8(SB)/8, $0x0000151413121110
+// EX1
+DATA ·c<>+16(SB)/8, $0x00000a0908070605
+DATA ·c<>+24(SB)/8, $0x00001a1918171615
+// EX2
+DATA ·c<>+32(SB)/8, $0x0000000f0e0d0c0b
+DATA ·c<>+40(SB)/8, $0x0000001f1e1d1c1b
+
+GLOBL ·reduce<>(SB), RODATA, $32
+// 44 bit
+DATA ·reduce<>+0(SB)/8, $0x0
+DATA ·reduce<>+8(SB)/8, $0xfffffffffff
+// 42 bit
+DATA ·reduce<>+16(SB)/8, $0x0
+DATA ·reduce<>+24(SB)/8, $0x3ffffffffff
+
+// h = (f*g) % (2**130-5) [partial reduction]
+// uses T_0...T_9 temporary registers
+// input: m02_0, m02_1, m02_2, m13_0, m13_1, m13_2, r_0, r_1, r_2, r5_1, r5_2, m4_0, m4_1, m4_2, m5_0, m5_1, m5_2
+// temp: t0, t1, t2, t3, t4, t5, t6, t7, t8, t9
+// output: m02_0, m02_1, m02_2, m13_0, m13_1, m13_2
+#define MULTIPLY(m02_0, m02_1, m02_2, m13_0, m13_1, m13_2, r_0, r_1, r_2, r5_1, r5_2, m4_0, m4_1, m4_2, m5_0, m5_1, m5_2, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9) \
+	\ // Eliminate the dependency for the last 2 VMSLs
+	VMSLG m02_0, r_2, m4_2, m4_2                       \
+	VMSLG m13_0, r_2, m5_2, m5_2                       \ // 8 VMSLs pipelined
+	VMSLG m02_0, r_0, m4_0, m4_0                       \
+	VMSLG m02_1, r5_2, V0, T_0                         \
+	VMSLG m02_0, r_1, m4_1, m4_1                       \
+	VMSLG m02_1, r_0, V0, T_1                          \
+	VMSLG m02_1, r_1, V0, T_2                          \
+	VMSLG m02_2, r5_1, V0, T_3                         \
+	VMSLG m02_2, r5_2, V0, T_4                         \
+	VMSLG m13_0, r_0, m5_0, m5_0                       \
+	VMSLG m13_1, r5_2, V0, T_5                         \
+	VMSLG m13_0, r_1, m5_1, m5_1                       \
+	VMSLG m13_1, r_0, V0, T_6                          \
+	VMSLG m13_1, r_1, V0, T_7                          \
+	VMSLG m13_2, r5_1, V0, T_8                         \
+	VMSLG m13_2, r5_2, V0, T_9                         \
+	VMSLG m02_2, r_0, m4_2, m4_2                       \
+	VMSLG m13_2, r_0, m5_2, m5_2                       \
+	VAQ   m4_0, T_0, m02_0                             \
+	VAQ   m4_1, T_1, m02_1                             \
+	VAQ   m5_0, T_5, m13_0                             \
+	VAQ   m5_1, T_6, m13_1                             \
+	VAQ   m02_0, T_3, m02_0                            \
+	VAQ   m02_1, T_4, m02_1                            \
+	VAQ   m13_0, T_8, m13_0                            \
+	VAQ   m13_1, T_9, m13_1                            \
+	VAQ   m4_2, T_2, m02_2                             \
+	VAQ   m5_2, T_7, m13_2                             \
+
+// SQUARE uses three limbs of r and r_2*5 to output square of r
+// uses T_1, T_5 and T_7 temporary registers
+// input: r_0, r_1, r_2, r5_2
+// temp: TEMP0, TEMP1, TEMP2
+// output: p0, p1, p2
+#define SQUARE(r_0, r_1, r_2, r5_2, p0, p1, p2, TEMP0, TEMP1, TEMP2) \
+	VMSLG r_0, r_0, p0, p0     \
+	VMSLG r_1, r5_2, V0, TEMP0 \
+	VMSLG r_2, r5_2, p1, p1    \
+	VMSLG r_0, r_1, V0, TEMP1  \
+	VMSLG r_1, r_1, p2, p2     \
+	VMSLG r_0, r_2, V0, TEMP2  \
+	VAQ   TEMP0, p0, p0        \
+	VAQ   TEMP1, p1, p1        \
+	VAQ   TEMP2, p2, p2        \
+	VAQ   TEMP0, p0, p0        \
+	VAQ   TEMP1, p1, p1        \
+	VAQ   TEMP2, p2, p2        \
+
+// carry h0->h1->h2->h0 || h3->h4->h5->h3
+// uses T_2, T_4, T_5, T_7, T_8, T_9
+//       t6,  t7,  t8,  t9, t10, t11
+// input: h0, h1, h2, h3, h4, h5
+// temp: t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11
+// output: h0, h1, h2, h3, h4, h5
+#define REDUCE(h0, h1, h2, h3, h4, h5, t0, t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11) \
+	VLM    (R12), t6, t7  \ // 44 and 42 bit clear mask
+	VLEIB  $7, $0x28, t10 \ // 5 byte shift mask
+	VREPIB $4, t8         \ // 4 bit shift mask
+	VREPIB $2, t11        \ // 2 bit shift mask
+	VSRLB  t10, h0, t0    \ // h0 byte shift
+	VSRLB  t10, h1, t1    \ // h1 byte shift
+	VSRLB  t10, h2, t2    \ // h2 byte shift
+	VSRLB  t10, h3, t3    \ // h3 byte shift
+	VSRLB  t10, h4, t4    \ // h4 byte shift
+	VSRLB  t10, h5, t5    \ // h5 byte shift
+	VSRL   t8, t0, t0     \ // h0 bit shift
+	VSRL   t8, t1, t1     \ // h2 bit shift
+	VSRL   t11, t2, t2    \ // h2 bit shift
+	VSRL   t8, t3, t3     \ // h3 bit shift
+	VSRL   t8, t4, t4     \ // h4 bit shift
+	VESLG  $2, t2, t9     \ // h2 carry x5
+	VSRL   t11, t5, t5    \ // h5 bit shift
+	VN     t6, h0, h0     \ // h0 clear carry
+	VAQ    t2, t9, t2     \ // h2 carry x5
+	VESLG  $2, t5, t9     \ // h5 carry x5
+	VN     t6, h1, h1     \ // h1 clear carry
+	VN     t7, h2, h2     \ // h2 clear carry
+	VAQ    t5, t9, t5     \ // h5 carry x5
+	VN     t6, h3, h3     \ // h3 clear carry
+	VN     t6, h4, h4     \ // h4 clear carry
+	VN     t7, h5, h5     \ // h5 clear carry
+	VAQ    t0, h1, h1     \ // h0->h1
+	VAQ    t3, h4, h4     \ // h3->h4
+	VAQ    t1, h2, h2     \ // h1->h2
+	VAQ    t4, h5, h5     \ // h4->h5
+	VAQ    t2, h0, h0     \ // h2->h0
+	VAQ    t5, h3, h3     \ // h5->h3
+	VREPG  $1, t6, t6     \ // 44 and 42 bit masks across both halves
+	VREPG  $1, t7, t7     \
+	VSLDB  $8, h0, h0, h0 \ // set up [h0/1/2, h3/4/5]
+	VSLDB  $8, h1, h1, h1 \
+	VSLDB  $8, h2, h2, h2 \
+	VO     h0, h3, h3     \
+	VO     h1, h4, h4     \
+	VO     h2, h5, h5     \
+	VESRLG $44, h3, t0    \ // 44 bit shift right
+	VESRLG $44, h4, t1    \
+	VESRLG $42, h5, t2    \
+	VN     t6, h3, h3     \ // clear carry bits
+	VN     t6, h4, h4     \
+	VN     t7, h5, h5     \
+	VESLG  $2, t2, t9     \ // multiply carry by 5
+	VAQ    t9, t2, t2     \
+	VAQ    t0, h4, h4     \
+	VAQ    t1, h5, h5     \
+	VAQ    t2, h3, h3     \
+
+// carry h0->h1->h2->h0
+// input: h0, h1, h2
+// temp: t0, t1, t2, t3, t4, t5, t6, t7, t8
+// output: h0, h1, h2
+#define REDUCE2(h0, h1, h2, t0, t1, t2, t3, t4, t5, t6, t7, t8) \
+	VLEIB  $7, $0x28, t3 \ // 5 byte shift mask
+	VREPIB $4, t4        \ // 4 bit shift mask
+	VREPIB $2, t7        \ // 2 bit shift mask
+	VGBM   $0x003F, t5   \ // mask to clear carry bits
+	VSRLB  t3, h0, t0    \
+	VSRLB  t3, h1, t1    \
+	VSRLB  t3, h2, t2    \
+	VESRLG $4, t5, t5    \ // 44 bit clear mask
+	VSRL   t4, t0, t0    \
+	VSRL   t4, t1, t1    \
+	VSRL   t7, t2, t2    \
+	VESRLG $2, t5, t6    \ // 42 bit clear mask
+	VESLG  $2, t2, t8    \
+	VAQ    t8, t2, t2    \
+	VN     t5, h0, h0    \
+	VN     t5, h1, h1    \
+	VN     t6, h2, h2    \
+	VAQ    t0, h1, h1    \
+	VAQ    t1, h2, h2    \
+	VAQ    t2, h0, h0    \
+	VSRLB  t3, h0, t0    \
+	VSRLB  t3, h1, t1    \
+	VSRLB  t3, h2, t2    \
+	VSRL   t4, t0, t0    \
+	VSRL   t4, t1, t1    \
+	VSRL   t7, t2, t2    \
+	VN     t5, h0, h0    \
+	VN     t5, h1, h1    \
+	VESLG  $2, t2, t8    \
+	VN     t6, h2, h2    \
+	VAQ    t0, h1, h1    \
+	VAQ    t8, t2, t2    \
+	VAQ    t1, h2, h2    \
+	VAQ    t2, h0, h0    \
+
+// expands two message blocks into the lower halfs of the d registers
+// moves the contents of the d registers into upper halfs
+// input: in1, in2, d0, d1, d2, d3, d4, d5
+// temp: TEMP0, TEMP1, TEMP2, TEMP3
+// output: d0, d1, d2, d3, d4, d5
+#define EXPACC(in1, in2, d0, d1, d2, d3, d4, d5, TEMP0, TEMP1, TEMP2, TEMP3) \
+	VGBM   $0xff3f, TEMP0      \
+	VGBM   $0xff1f, TEMP1      \
+	VESLG  $4, d1, TEMP2       \
+	VESLG  $4, d4, TEMP3       \
+	VESRLG $4, TEMP0, TEMP0    \
+	VPERM  in1, d0, EX0, d0    \
+	VPERM  in2, d3, EX0, d3    \
+	VPERM  in1, d2, EX2, d2    \
+	VPERM  in2, d5, EX2, d5    \
+	VPERM  in1, TEMP2, EX1, d1 \
+	VPERM  in2, TEMP3, EX1, d4 \
+	VN     TEMP0, d0, d0       \
+	VN     TEMP0, d3, d3       \
+	VESRLG $4, d1, d1          \
+	VESRLG $4, d4, d4          \
+	VN     TEMP1, d2, d2       \
+	VN     TEMP1, d5, d5       \
+	VN     TEMP0, d1, d1       \
+	VN     TEMP0, d4, d4       \
+
+// expands one message block into the lower halfs of the d registers
+// moves the contents of the d registers into upper halfs
+// input: in, d0, d1, d2
+// temp: TEMP0, TEMP1, TEMP2
+// output: d0, d1, d2
+#define EXPACC2(in, d0, d1, d2, TEMP0, TEMP1, TEMP2) \
+	VGBM   $0xff3f, TEMP0     \
+	VESLG  $4, d1, TEMP2      \
+	VGBM   $0xff1f, TEMP1     \
+	VPERM  in, d0, EX0, d0    \
+	VESRLG $4, TEMP0, TEMP0   \
+	VPERM  in, d2, EX2, d2    \
+	VPERM  in, TEMP2, EX1, d1 \
+	VN     TEMP0, d0, d0      \
+	VN     TEMP1, d2, d2      \
+	VESRLG $4, d1, d1         \
+	VN     TEMP0, d1, d1      \
+
+// pack h2:h0 into h1:h0 (no carry)
+// input: h0, h1, h2
+// output: h0, h1, h2
+#define PACK(h0, h1, h2) \
+	VMRLG  h1, h2, h2  \ // copy h1 to upper half h2
+	VESLG  $44, h1, h1 \ // shift limb 1 44 bits, leaving 20
+	VO     h0, h1, h0  \ // combine h0 with 20 bits from limb 1
+	VESRLG $20, h2, h1 \ // put top 24 bits of limb 1 into h1
+	VLEIG  $1, $0, h1  \ // clear h2 stuff from lower half of h1
+	VO     h0, h1, h0  \ // h0 now has 88 bits (limb 0 and 1)
+	VLEIG  $0, $0, h2  \ // clear upper half of h2
+	VESRLG $40, h2, h1 \ // h1 now has upper two bits of result
+	VLEIB  $7, $88, h1 \ // for byte shift (11 bytes)
+	VSLB   h1, h2, h2  \ // shift h2 11 bytes to the left
+	VO     h0, h2, h0  \ // combine h0 with 20 bits from limb 1
+	VLEIG  $0, $0, h1  \ // clear upper half of h1
+
+// if h > 2**130-5 then h -= 2**130-5
+// input: h0, h1
+// temp: t0, t1, t2
+// output: h0
+#define MOD(h0, h1, t0, t1, t2) \
+	VZERO t0          \
+	VLEIG $1, $5, t0  \
+	VACCQ h0, t0, t1  \
+	VAQ   h0, t0, t0  \
+	VONE  t2          \
+	VLEIG $1, $-4, t2 \
+	VAQ   t2, t1, t1  \
+	VACCQ h1, t1, t1  \
+	VONE  t2          \
+	VAQ   t2, t1, t1  \
+	VN    h0, t1, t2  \
+	VNC   t0, t1, t1  \
+	VO    t1, t2, h0  \
+
+// func poly1305vmsl(out *[16]byte, m *byte, mlen uint64, key *[32]key)
+TEXT ·poly1305vmsl(SB), $0-32
+	// This code processes 6 + up to 4 blocks (32 bytes) per iteration
+	// using the algorithm described in:
+	// NEON crypto, Daniel J. Bernstein & Peter Schwabe
+	// https://cryptojedi.org/papers/neoncrypto-20120320.pdf
+	// And as moddified for VMSL as described in
+	// Accelerating Poly1305 Cryptographic Message Authentication on the z14
+	// O'Farrell et al, CASCON 2017, p48-55
+	// https://ibm.ent.box.com/s/jf9gedj0e9d2vjctfyh186shaztavnht
+
+	LMG   out+0(FP), R1, R4 // R1=out, R2=m, R3=mlen, R4=key
+	VZERO V0                // c
+
+	// load EX0, EX1 and EX2
+	MOVD $·constants<>(SB), R5
+	VLM  (R5), EX0, EX2        // c
+
+	// setup r
+	VL    (R4), T_0
+	MOVD  $·keyMask<>(SB), R6
+	VL    (R6), T_1
+	VN    T_0, T_1, T_0
+	VZERO T_2                 // limbs for r
+	VZERO T_3
+	VZERO T_4
+	EXPACC2(T_0, T_2, T_3, T_4, T_1, T_5, T_7)
+
+	// T_2, T_3, T_4: [0, r]
+
+	// setup r*20
+	VLEIG $0, $0, T_0
+	VLEIG $1, $20, T_0       // T_0: [0, 20]
+	VZERO T_5
+	VZERO T_6
+	VMSLG T_0, T_3, T_5, T_5
+	VMSLG T_0, T_4, T_6, T_6
+
+	// store r for final block in GR
+	VLGVG $1, T_2, RSAVE_0  // c
+	VLGVG $1, T_3, RSAVE_1  // c
+	VLGVG $1, T_4, RSAVE_2  // c
+	VLGVG $1, T_5, R5SAVE_1 // c
+	VLGVG $1, T_6, R5SAVE_2 // c
+
+	// initialize h
+	VZERO H0_0
+	VZERO H1_0
+	VZERO H2_0
+	VZERO H0_1
+	VZERO H1_1
+	VZERO H2_1
+
+	// initialize pointer for reduce constants
+	MOVD $·reduce<>(SB), R12
+
+	// calculate r**2 and 20*(r**2)
+	VZERO R_0
+	VZERO R_1
+	VZERO R_2
+	SQUARE(T_2, T_3, T_4, T_6, R_0, R_1, R_2, T_1, T_5, T_7)
+	REDUCE2(R_0, R_1, R_2, M0, M1, M2, M3, M4, R5_1, R5_2, M5, T_1)
+	VZERO R5_1
+	VZERO R5_2
+	VMSLG T_0, R_1, R5_1, R5_1
+	VMSLG T_0, R_2, R5_2, R5_2
+
+	// skip r**4 calculation if 3 blocks or less
+	CMPBLE R3, $48, b4
+
+	// calculate r**4 and 20*(r**4)
+	VZERO T_8
+	VZERO T_9
+	VZERO T_10
+	SQUARE(R_0, R_1, R_2, R5_2, T_8, T_9, T_10, T_1, T_5, T_7)
+	REDUCE2(T_8, T_9, T_10, M0, M1, M2, M3, M4, T_2, T_3, M5, T_1)
+	VZERO T_2
+	VZERO T_3
+	VMSLG T_0, T_9, T_2, T_2
+	VMSLG T_0, T_10, T_3, T_3
+
+	// put r**2 to the right and r**4 to the left of R_0, R_1, R_2
+	VSLDB $8, T_8, T_8, T_8
+	VSLDB $8, T_9, T_9, T_9
+	VSLDB $8, T_10, T_10, T_10
+	VSLDB $8, T_2, T_2, T_2
+	VSLDB $8, T_3, T_3, T_3
+
+	VO T_8, R_0, R_0
+	VO T_9, R_1, R_1
+	VO T_10, R_2, R_2
+	VO T_2, R5_1, R5_1
+	VO T_3, R5_2, R5_2
+
+	CMPBLE R3, $80, load // less than or equal to 5 blocks in message
+
+	// 6(or 5+1) blocks
+	SUB    $81, R3
+	VLM    (R2), M0, M4
+	VLL    R3, 80(R2), M5
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBGE R3, $16, 2(PC)
+	VLVGB  R3, R0, M5
+	MOVD   $96(R2), R2
+	EXPACC(M0, M1, H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_0, T_1, T_2, T_3)
+	EXPACC(M2, M3, H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_0, T_1, T_2, T_3)
+	VLEIB  $2, $1, H2_0
+	VLEIB  $2, $1, H2_1
+	VLEIB  $10, $1, H2_0
+	VLEIB  $10, $1, H2_1
+
+	VZERO  M0
+	VZERO  M1
+	VZERO  M2
+	VZERO  M3
+	VZERO  T_4
+	VZERO  T_10
+	EXPACC(M4, M5, M0, M1, M2, M3, T_4, T_10, T_0, T_1, T_2, T_3)
+	VLR    T_4, M4
+	VLEIB  $10, $1, M2
+	CMPBLT R3, $16, 2(PC)
+	VLEIB  $10, $1, T_10
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, T_10, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, M2, M3, M4, T_4, T_5, T_2, T_7, T_8, T_9)
+	VMRHG  V0, H0_1, H0_0
+	VMRHG  V0, H1_1, H1_0
+	VMRHG  V0, H2_1, H2_0
+	VMRLG  V0, H0_1, H0_1
+	VMRLG  V0, H1_1, H1_1
+	VMRLG  V0, H2_1, H2_1
+
+	SUB    $16, R3
+	CMPBLE R3, $0, square
+
+load:
+	// load EX0, EX1 and EX2
+	MOVD $·c<>(SB), R5
+	VLM  (R5), EX0, EX2
+
+loop:
+	CMPBLE R3, $64, add // b4	// last 4 or less blocks left
+
+	// next 4 full blocks
+	VLM  (R2), M2, M5
+	SUB  $64, R3
+	MOVD $64(R2), R2
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, T_0, T_1, T_3, T_4, T_5, T_2, T_7, T_8, T_9)
+
+	// expacc in-lined to create [m2, m3] limbs
+	VGBM   $0x3f3f, T_0     // 44 bit clear mask
+	VGBM   $0x1f1f, T_1     // 40 bit clear mask
+	VPERM  M2, M3, EX0, T_3
+	VESRLG $4, T_0, T_0     // 44 bit clear mask ready
+	VPERM  M2, M3, EX1, T_4
+	VPERM  M2, M3, EX2, T_5
+	VN     T_0, T_3, T_3
+	VESRLG $4, T_4, T_4
+	VN     T_1, T_5, T_5
+	VN     T_0, T_4, T_4
+	VMRHG  H0_1, T_3, H0_0
+	VMRHG  H1_1, T_4, H1_0
+	VMRHG  H2_1, T_5, H2_0
+	VMRLG  H0_1, T_3, H0_1
+	VMRLG  H1_1, T_4, H1_1
+	VMRLG  H2_1, T_5, H2_1
+	VLEIB  $10, $1, H2_0
+	VLEIB  $10, $1, H2_1
+	VPERM  M4, M5, EX0, T_3
+	VPERM  M4, M5, EX1, T_4
+	VPERM  M4, M5, EX2, T_5
+	VN     T_0, T_3, T_3
+	VESRLG $4, T_4, T_4
+	VN     T_1, T_5, T_5
+	VN     T_0, T_4, T_4
+	VMRHG  V0, T_3, M0
+	VMRHG  V0, T_4, M1
+	VMRHG  V0, T_5, M2
+	VMRLG  V0, T_3, M3
+	VMRLG  V0, T_4, M4
+	VMRLG  V0, T_5, M5
+	VLEIB  $10, $1, M2
+	VLEIB  $10, $1, M5
+
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	CMPBNE R3, $0, loop
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, M3, M4, M5, T_4, T_5, T_2, T_7, T_8, T_9)
+	VMRHG  V0, H0_1, H0_0
+	VMRHG  V0, H1_1, H1_0
+	VMRHG  V0, H2_1, H2_0
+	VMRLG  V0, H0_1, H0_1
+	VMRLG  V0, H1_1, H1_1
+	VMRLG  V0, H2_1, H2_1
+
+	// load EX0, EX1, EX2
+	MOVD $·constants<>(SB), R5
+	VLM  (R5), EX0, EX2
+
+	// sum vectors
+	VAQ H0_0, H0_1, H0_0
+	VAQ H1_0, H1_1, H1_0
+	VAQ H2_0, H2_1, H2_0
+
+	// h may be >= 2*(2**130-5) so we need to reduce it again
+	// M0...M4 are used as temps here
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, T_9, T_10, H0_1, M5)
+
+next:  // carry h1->h2
+	VLEIB  $7, $0x28, T_1
+	VREPIB $4, T_2
+	VGBM   $0x003F, T_3
+	VESRLG $4, T_3
+
+	// byte shift
+	VSRLB T_1, H1_0, T_4
+
+	// bit shift
+	VSRL T_2, T_4, T_4
+
+	// clear h1 carry bits
+	VN T_3, H1_0, H1_0
+
+	// add carry
+	VAQ T_4, H2_0, H2_0
+
+	// h is now < 2*(2**130-5)
+	// pack h into h1 (hi) and h0 (lo)
+	PACK(H0_0, H1_0, H2_0)
+
+	// if h > 2**130-5 then h -= 2**130-5
+	MOD(H0_0, H1_0, T_0, T_1, T_2)
+
+	// h += s
+	MOVD  $·bswapMask<>(SB), R5
+	VL    (R5), T_1
+	VL    16(R4), T_0
+	VPERM T_0, T_0, T_1, T_0    // reverse bytes (to big)
+	VAQ   T_0, H0_0, H0_0
+	VPERM H0_0, H0_0, T_1, H0_0 // reverse bytes (to little)
+	VST   H0_0, (R1)
+	RET
+
+add:
+	// load EX0, EX1, EX2
+	MOVD $·constants<>(SB), R5
+	VLM  (R5), EX0, EX2
+
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, M3, M4, M5, T_4, T_5, T_2, T_7, T_8, T_9)
+	VMRHG  V0, H0_1, H0_0
+	VMRHG  V0, H1_1, H1_0
+	VMRHG  V0, H2_1, H2_0
+	VMRLG  V0, H0_1, H0_1
+	VMRLG  V0, H1_1, H1_1
+	VMRLG  V0, H2_1, H2_1
+	CMPBLE R3, $64, b4
+
+b4:
+	CMPBLE R3, $48, b3 // 3 blocks or less
+
+	// 4(3+1) blocks remaining
+	SUB    $49, R3
+	VLM    (R2), M0, M2
+	VLL    R3, 48(R2), M3
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, M3
+	MOVD   $64(R2), R2
+	EXPACC(M0, M1, H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_0, T_1, T_2, T_3)
+	VLEIB  $10, $1, H2_0
+	VLEIB  $10, $1, H2_1
+	VZERO  M0
+	VZERO  M1
+	VZERO  M4
+	VZERO  M5
+	VZERO  T_4
+	VZERO  T_10
+	EXPACC(M2, M3, M0, M1, M4, M5, T_4, T_10, T_0, T_1, T_2, T_3)
+	VLR    T_4, M2
+	VLEIB  $10, $1, M4
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $10, $1, T_10
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M4, M5, M2, T_10, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, M3, M4, M5, T_4, T_5, T_2, T_7, T_8, T_9)
+	VMRHG  V0, H0_1, H0_0
+	VMRHG  V0, H1_1, H1_0
+	VMRHG  V0, H2_1, H2_0
+	VMRLG  V0, H0_1, H0_1
+	VMRLG  V0, H1_1, H1_1
+	VMRLG  V0, H2_1, H2_1
+	SUB    $16, R3
+	CMPBLE R3, $0, square // this condition must always hold true!
+
+b3:
+	CMPBLE R3, $32, b2
+
+	// 3 blocks remaining
+
+	// setup [r²,r]
+	VSLDB $8, R_0, R_0, R_0
+	VSLDB $8, R_1, R_1, R_1
+	VSLDB $8, R_2, R_2, R_2
+	VSLDB $8, R5_1, R5_1, R5_1
+	VSLDB $8, R5_2, R5_2, R5_2
+
+	VLVGG $1, RSAVE_0, R_0
+	VLVGG $1, RSAVE_1, R_1
+	VLVGG $1, RSAVE_2, R_2
+	VLVGG $1, R5SAVE_1, R5_1
+	VLVGG $1, R5SAVE_2, R5_2
+
+	// setup [h0, h1]
+	VSLDB $8, H0_0, H0_0, H0_0
+	VSLDB $8, H1_0, H1_0, H1_0
+	VSLDB $8, H2_0, H2_0, H2_0
+	VO    H0_1, H0_0, H0_0
+	VO    H1_1, H1_0, H1_0
+	VO    H2_1, H2_0, H2_0
+	VZERO H0_1
+	VZERO H1_1
+	VZERO H2_1
+
+	VZERO M0
+	VZERO M1
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+
+	// H*[r**2, r]
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, H0_1, H1_1, T_10, M5)
+
+	SUB    $33, R3
+	VLM    (R2), M0, M1
+	VLL    R3, 32(R2), M2
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, M2
+
+	// H += m0
+	VZERO T_1
+	VZERO T_2
+	VZERO T_3
+	EXPACC2(M0, T_1, T_2, T_3, T_4, T_5, T_6)
+	VLEIB $10, $1, T_3
+	VAG   H0_0, T_1, H0_0
+	VAG   H1_0, T_2, H1_0
+	VAG   H2_0, T_3, H2_0
+
+	VZERO M0
+	VZERO M3
+	VZERO M4
+	VZERO M5
+	VZERO T_10
+
+	// (H+m0)*r
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M3, M4, M5, V0, T_10, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M3, M4, M5, T_10, H0_1, H1_1, H2_1, T_9)
+
+	// H += m1
+	VZERO V0
+	VZERO T_1
+	VZERO T_2
+	VZERO T_3
+	EXPACC2(M1, T_1, T_2, T_3, T_4, T_5, T_6)
+	VLEIB $10, $1, T_3
+	VAQ   H0_0, T_1, H0_0
+	VAQ   H1_0, T_2, H1_0
+	VAQ   H2_0, T_3, H2_0
+	REDUCE2(H0_0, H1_0, H2_0, M0, M3, M4, M5, T_9, H0_1, H1_1, H2_1, T_10)
+
+	// [H, m2] * [r**2, r]
+	EXPACC2(M2, H0_0, H1_0, H2_0, T_1, T_2, T_3)
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $10, $1, H2_0
+	VZERO  M0
+	VZERO  M1
+	VZERO  M2
+	VZERO  M3
+	VZERO  M4
+	VZERO  M5
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, H0_1, H1_1, M5, T_10)
+	SUB    $16, R3
+	CMPBLE R3, $0, next   // this condition must always hold true!
+
+b2:
+	CMPBLE R3, $16, b1
+
+	// 2 blocks remaining
+
+	// setup [r²,r]
+	VSLDB $8, R_0, R_0, R_0
+	VSLDB $8, R_1, R_1, R_1
+	VSLDB $8, R_2, R_2, R_2
+	VSLDB $8, R5_1, R5_1, R5_1
+	VSLDB $8, R5_2, R5_2, R5_2
+
+	VLVGG $1, RSAVE_0, R_0
+	VLVGG $1, RSAVE_1, R_1
+	VLVGG $1, RSAVE_2, R_2
+	VLVGG $1, R5SAVE_1, R5_1
+	VLVGG $1, R5SAVE_2, R5_2
+
+	// setup [h0, h1]
+	VSLDB $8, H0_0, H0_0, H0_0
+	VSLDB $8, H1_0, H1_0, H1_0
+	VSLDB $8, H2_0, H2_0, H2_0
+	VO    H0_1, H0_0, H0_0
+	VO    H1_1, H1_0, H1_0
+	VO    H2_1, H2_0, H2_0
+	VZERO H0_1
+	VZERO H1_1
+	VZERO H2_1
+
+	VZERO M0
+	VZERO M1
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+
+	// H*[r**2, r]
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, T_10, M0, M1, M2, M3, M4, T_4, T_5, T_2, T_7, T_8, T_9)
+	VMRHG V0, H0_1, H0_0
+	VMRHG V0, H1_1, H1_0
+	VMRHG V0, H2_1, H2_0
+	VMRLG V0, H0_1, H0_1
+	VMRLG V0, H1_1, H1_1
+	VMRLG V0, H2_1, H2_1
+
+	// move h to the left and 0s at the right
+	VSLDB $8, H0_0, H0_0, H0_0
+	VSLDB $8, H1_0, H1_0, H1_0
+	VSLDB $8, H2_0, H2_0, H2_0
+
+	// get message blocks and append 1 to start
+	SUB    $17, R3
+	VL     (R2), M0
+	VLL    R3, 16(R2), M1
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, M1
+	VZERO  T_6
+	VZERO  T_7
+	VZERO  T_8
+	EXPACC2(M0, T_6, T_7, T_8, T_1, T_2, T_3)
+	EXPACC2(M1, T_6, T_7, T_8, T_1, T_2, T_3)
+	VLEIB  $2, $1, T_8
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $10, $1, T_8
+
+	// add [m0, m1] to h
+	VAG H0_0, T_6, H0_0
+	VAG H1_0, T_7, H1_0
+	VAG H2_0, T_8, H2_0
+
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+	VZERO T_10
+	VZERO M0
+
+	// at this point R_0 .. R5_2 look like [r**2, r]
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M2, M3, M4, M5, T_10, M0, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M2, M3, M4, M5, T_9, H0_1, H1_1, H2_1, T_10)
+	SUB    $16, R3, R3
+	CMPBLE R3, $0, next
+
+b1:
+	CMPBLE R3, $0, next
+
+	// 1 block remaining
+
+	// setup [r²,r]
+	VSLDB $8, R_0, R_0, R_0
+	VSLDB $8, R_1, R_1, R_1
+	VSLDB $8, R_2, R_2, R_2
+	VSLDB $8, R5_1, R5_1, R5_1
+	VSLDB $8, R5_2, R5_2, R5_2
+
+	VLVGG $1, RSAVE_0, R_0
+	VLVGG $1, RSAVE_1, R_1
+	VLVGG $1, RSAVE_2, R_2
+	VLVGG $1, R5SAVE_1, R5_1
+	VLVGG $1, R5SAVE_2, R5_2
+
+	// setup [h0, h1]
+	VSLDB $8, H0_0, H0_0, H0_0
+	VSLDB $8, H1_0, H1_0, H1_0
+	VSLDB $8, H2_0, H2_0, H2_0
+	VO    H0_1, H0_0, H0_0
+	VO    H1_1, H1_0, H1_0
+	VO    H2_1, H2_0, H2_0
+	VZERO H0_1
+	VZERO H1_1
+	VZERO H2_1
+
+	VZERO M0
+	VZERO M1
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+
+	// H*[r**2, r]
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, T_9, T_10, H0_1, M5)
+
+	// set up [0, m0] limbs
+	SUB    $1, R3
+	VLL    R3, (R2), M0
+	ADD    $1, R3
+	MOVBZ  $1, R0
+	CMPBEQ R3, $16, 2(PC)
+	VLVGB  R3, R0, M0
+	VZERO  T_1
+	VZERO  T_2
+	VZERO  T_3
+	EXPACC2(M0, T_1, T_2, T_3, T_4, T_5, T_6)// limbs: [0, m]
+	CMPBNE R3, $16, 2(PC)
+	VLEIB  $10, $1, T_3
+
+	// h+m0
+	VAQ H0_0, T_1, H0_0
+	VAQ H1_0, T_2, H1_0
+	VAQ H2_0, T_3, H2_0
+
+	VZERO M0
+	VZERO M1
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, T_9, T_10, H0_1, M5)
+
+	BR next
+
+square:
+	// setup [r²,r]
+	VSLDB $8, R_0, R_0, R_0
+	VSLDB $8, R_1, R_1, R_1
+	VSLDB $8, R_2, R_2, R_2
+	VSLDB $8, R5_1, R5_1, R5_1
+	VSLDB $8, R5_2, R5_2, R5_2
+
+	VLVGG $1, RSAVE_0, R_0
+	VLVGG $1, RSAVE_1, R_1
+	VLVGG $1, RSAVE_2, R_2
+	VLVGG $1, R5SAVE_1, R5_1
+	VLVGG $1, R5SAVE_2, R5_2
+
+	// setup [h0, h1]
+	VSLDB $8, H0_0, H0_0, H0_0
+	VSLDB $8, H1_0, H1_0, H1_0
+	VSLDB $8, H2_0, H2_0, H2_0
+	VO    H0_1, H0_0, H0_0
+	VO    H1_1, H1_0, H1_0
+	VO    H2_1, H2_0, H2_0
+	VZERO H0_1
+	VZERO H1_1
+	VZERO H2_1
+
+	VZERO M0
+	VZERO M1
+	VZERO M2
+	VZERO M3
+	VZERO M4
+	VZERO M5
+
+	// (h0*r**2) + (h1*r)
+	MULTIPLY(H0_0, H1_0, H2_0, H0_1, H1_1, H2_1, R_0, R_1, R_2, R5_1, R5_2, M0, M1, M2, M3, M4, M5, T_0, T_1, T_2, T_3, T_4, T_5, T_6, T_7, T_8, T_9)
+	REDUCE2(H0_0, H1_0, H2_0, M0, M1, M2, M3, M4, T_9, T_10, H0_1, M5)
+	BR next
+
+TEXT ·hasVMSLFacility(SB), NOSPLIT, $24-1
+	MOVD  $x-24(SP), R1
+	XC    $24, 0(R1), 0(R1) // clear the storage
+	MOVD  $2, R0            // R0 is the number of double words stored -1
+	WORD  $0xB2B01000       // STFLE 0(R1)
+	XOR   R0, R0            // reset the value of R0
+	MOVBZ z-8(SP), R1
+	AND   $0x01, R1
+	BEQ   novmsl
+
+vectorinstalled:
+	// check if the vector instruction has been enabled
+	VLEIB  $0, $0xF, V16
+	VLGVB  $0, V16, R1
+	CMPBNE R1, $0xF, novmsl
+	MOVB   $1, ret+0(FP)    // have vx
+	RET
+
+novmsl:
+	MOVB $0, ret+0(FP) // no vx
+	RET
diff --git a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160.go b/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160.go
deleted file mode 100644
index 6c6e84236a..0000000000
--- a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ripemd160 implements the RIPEMD-160 hash algorithm.
-package ripemd160 // import "golang.org/x/crypto/ripemd160"
-
-// RIPEMD-160 is designed by by Hans Dobbertin, Antoon Bosselaers, and Bart
-// Preneel with specifications available at:
-// http://homes.esat.kuleuven.be/~cosicart/pdf/AB-9601/AB-9601.pdf.
-
-import (
-	"crypto"
-	"hash"
-)
-
-func init() {
-	crypto.RegisterHash(crypto.RIPEMD160, New)
-}
-
-// The size of the checksum in bytes.
-const Size = 20
-
-// The block size of the hash algorithm in bytes.
-const BlockSize = 64
-
-const (
-	_s0 = 0x67452301
-	_s1 = 0xefcdab89
-	_s2 = 0x98badcfe
-	_s3 = 0x10325476
-	_s4 = 0xc3d2e1f0
-)
-
-// digest represents the partial evaluation of a checksum.
-type digest struct {
-	s  [5]uint32       // running context
-	x  [BlockSize]byte // temporary buffer
-	nx int             // index into x
-	tc uint64          // total count of bytes processed
-}
-
-func (d *digest) Reset() {
-	d.s[0], d.s[1], d.s[2], d.s[3], d.s[4] = _s0, _s1, _s2, _s3, _s4
-	d.nx = 0
-	d.tc = 0
-}
-
-// New returns a new hash.Hash computing the checksum.
-func New() hash.Hash {
-	result := new(digest)
-	result.Reset()
-	return result
-}
-
-func (d *digest) Size() int { return Size }
-
-func (d *digest) BlockSize() int { return BlockSize }
-
-func (d *digest) Write(p []byte) (nn int, err error) {
-	nn = len(p)
-	d.tc += uint64(nn)
-	if d.nx > 0 {
-		n := len(p)
-		if n > BlockSize-d.nx {
-			n = BlockSize - d.nx
-		}
-		for i := 0; i < n; i++ {
-			d.x[d.nx+i] = p[i]
-		}
-		d.nx += n
-		if d.nx == BlockSize {
-			_Block(d, d.x[0:])
-			d.nx = 0
-		}
-		p = p[n:]
-	}
-	n := _Block(d, p)
-	p = p[n:]
-	if len(p) > 0 {
-		d.nx = copy(d.x[:], p)
-	}
-	return
-}
-
-func (d0 *digest) Sum(in []byte) []byte {
-	// Make a copy of d0 so that caller can keep writing and summing.
-	d := *d0
-
-	// Padding.  Add a 1 bit and 0 bits until 56 bytes mod 64.
-	tc := d.tc
-	var tmp [64]byte
-	tmp[0] = 0x80
-	if tc%64 < 56 {
-		d.Write(tmp[0 : 56-tc%64])
-	} else {
-		d.Write(tmp[0 : 64+56-tc%64])
-	}
-
-	// Length in bits.
-	tc <<= 3
-	for i := uint(0); i < 8; i++ {
-		tmp[i] = byte(tc >> (8 * i))
-	}
-	d.Write(tmp[0:8])
-
-	if d.nx != 0 {
-		panic("d.nx != 0")
-	}
-
-	var digest [Size]byte
-	for i, s := range d.s {
-		digest[i*4] = byte(s)
-		digest[i*4+1] = byte(s >> 8)
-		digest[i*4+2] = byte(s >> 16)
-		digest[i*4+3] = byte(s >> 24)
-	}
-
-	return append(in, digest[:]...)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160_test.go b/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160_test.go
deleted file mode 100644
index 5df1b2593d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ripemd160
-
-// Test vectors are from:
-// http://homes.esat.kuleuven.be/~bosselae/ripemd160.html
-
-import (
-	"fmt"
-	"io"
-	"testing"
-)
-
-type mdTest struct {
-	out string
-	in  string
-}
-
-var vectors = [...]mdTest{
-	{"9c1185a5c5e9fc54612808977ee8f548b2258d31", ""},
-	{"0bdc9d2d256b3ee9daae347be6f4dc835a467ffe", "a"},
-	{"8eb208f7e05d987a9b044a8e98c6b087f15a0bfc", "abc"},
-	{"5d0689ef49d2fae572b881b123a85ffa21595f36", "message digest"},
-	{"f71c27109c692c1b56bbdceb5b9d2865b3708dbc", "abcdefghijklmnopqrstuvwxyz"},
-	{"12a053384a9c0c88e405a06c27dcf49ada62eb2b", "abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"},
-	{"b0e20b6e3116640286ed3a87a5713079b21f5189", "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"},
-	{"9b752e45573d4b39f4dbd3323cab82bf63326bfb", "12345678901234567890123456789012345678901234567890123456789012345678901234567890"},
-}
-
-func TestVectors(t *testing.T) {
-	for i := 0; i < len(vectors); i++ {
-		tv := vectors[i]
-		md := New()
-		for j := 0; j < 3; j++ {
-			if j < 2 {
-				io.WriteString(md, tv.in)
-			} else {
-				io.WriteString(md, tv.in[0:len(tv.in)/2])
-				md.Sum(nil)
-				io.WriteString(md, tv.in[len(tv.in)/2:])
-			}
-			s := fmt.Sprintf("%x", md.Sum(nil))
-			if s != tv.out {
-				t.Fatalf("RIPEMD-160[%d](%s) = %s, expected %s", j, tv.in, s, tv.out)
-			}
-			md.Reset()
-		}
-	}
-}
-
-func TestMillionA(t *testing.T) {
-	md := New()
-	for i := 0; i < 100000; i++ {
-		io.WriteString(md, "aaaaaaaaaa")
-	}
-	out := "52783243c1697bdbe16d37f97f68f08325dc1528"
-	s := fmt.Sprintf("%x", md.Sum(nil))
-	if s != out {
-		t.Fatalf("RIPEMD-160 (1 million 'a') = %s, expected %s", s, out)
-	}
-	md.Reset()
-}
diff --git a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160block.go b/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160block.go
deleted file mode 100644
index 7bc8e6c485..0000000000
--- a/installer/vendor/golang.org/x/crypto/ripemd160/ripemd160block.go
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// RIPEMD-160 block step.
-// In its own file so that a faster assembly or C version
-// can be substituted easily.
-
-package ripemd160
-
-// work buffer indices and roll amounts for one line
-var _n = [80]uint{
-	0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15,
-	7, 4, 13, 1, 10, 6, 15, 3, 12, 0, 9, 5, 2, 14, 11, 8,
-	3, 10, 14, 4, 9, 15, 8, 1, 2, 7, 0, 6, 13, 11, 5, 12,
-	1, 9, 11, 10, 0, 8, 12, 4, 13, 3, 7, 15, 14, 5, 6, 2,
-	4, 0, 5, 9, 7, 12, 2, 10, 14, 1, 3, 8, 11, 6, 15, 13,
-}
-
-var _r = [80]uint{
-	11, 14, 15, 12, 5, 8, 7, 9, 11, 13, 14, 15, 6, 7, 9, 8,
-	7, 6, 8, 13, 11, 9, 7, 15, 7, 12, 15, 9, 11, 7, 13, 12,
-	11, 13, 6, 7, 14, 9, 13, 15, 14, 8, 13, 6, 5, 12, 7, 5,
-	11, 12, 14, 15, 14, 15, 9, 8, 9, 14, 5, 6, 8, 6, 5, 12,
-	9, 15, 5, 11, 6, 8, 13, 12, 5, 12, 13, 14, 11, 8, 5, 6,
-}
-
-// same for the other parallel one
-var n_ = [80]uint{
-	5, 14, 7, 0, 9, 2, 11, 4, 13, 6, 15, 8, 1, 10, 3, 12,
-	6, 11, 3, 7, 0, 13, 5, 10, 14, 15, 8, 12, 4, 9, 1, 2,
-	15, 5, 1, 3, 7, 14, 6, 9, 11, 8, 12, 2, 10, 0, 4, 13,
-	8, 6, 4, 1, 3, 11, 15, 0, 5, 12, 2, 13, 9, 7, 10, 14,
-	12, 15, 10, 4, 1, 5, 8, 7, 6, 2, 13, 14, 0, 3, 9, 11,
-}
-
-var r_ = [80]uint{
-	8, 9, 9, 11, 13, 15, 15, 5, 7, 7, 8, 11, 14, 14, 12, 6,
-	9, 13, 15, 7, 12, 8, 9, 11, 7, 7, 12, 7, 6, 15, 13, 11,
-	9, 7, 15, 11, 8, 6, 6, 14, 12, 13, 5, 14, 13, 13, 7, 5,
-	15, 5, 8, 11, 14, 14, 6, 14, 6, 9, 12, 9, 12, 5, 15, 8,
-	8, 5, 12, 9, 12, 5, 14, 6, 8, 13, 6, 5, 15, 13, 11, 11,
-}
-
-func _Block(md *digest, p []byte) int {
-	n := 0
-	var x [16]uint32
-	var alpha, beta uint32
-	for len(p) >= BlockSize {
-		a, b, c, d, e := md.s[0], md.s[1], md.s[2], md.s[3], md.s[4]
-		aa, bb, cc, dd, ee := a, b, c, d, e
-		j := 0
-		for i := 0; i < 16; i++ {
-			x[i] = uint32(p[j]) | uint32(p[j+1])<<8 | uint32(p[j+2])<<16 | uint32(p[j+3])<<24
-			j += 4
-		}
-
-		// round 1
-		i := 0
-		for i < 16 {
-			alpha = a + (b ^ c ^ d) + x[_n[i]]
-			s := _r[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + e
-			beta = c<<10 | c>>22
-			a, b, c, d, e = e, alpha, b, beta, d
-
-			// parallel line
-			alpha = aa + (bb ^ (cc | ^dd)) + x[n_[i]] + 0x50a28be6
-			s = r_[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + ee
-			beta = cc<<10 | cc>>22
-			aa, bb, cc, dd, ee = ee, alpha, bb, beta, dd
-
-			i++
-		}
-
-		// round 2
-		for i < 32 {
-			alpha = a + (b&c | ^b&d) + x[_n[i]] + 0x5a827999
-			s := _r[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + e
-			beta = c<<10 | c>>22
-			a, b, c, d, e = e, alpha, b, beta, d
-
-			// parallel line
-			alpha = aa + (bb&dd | cc&^dd) + x[n_[i]] + 0x5c4dd124
-			s = r_[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + ee
-			beta = cc<<10 | cc>>22
-			aa, bb, cc, dd, ee = ee, alpha, bb, beta, dd
-
-			i++
-		}
-
-		// round 3
-		for i < 48 {
-			alpha = a + (b | ^c ^ d) + x[_n[i]] + 0x6ed9eba1
-			s := _r[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + e
-			beta = c<<10 | c>>22
-			a, b, c, d, e = e, alpha, b, beta, d
-
-			// parallel line
-			alpha = aa + (bb | ^cc ^ dd) + x[n_[i]] + 0x6d703ef3
-			s = r_[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + ee
-			beta = cc<<10 | cc>>22
-			aa, bb, cc, dd, ee = ee, alpha, bb, beta, dd
-
-			i++
-		}
-
-		// round 4
-		for i < 64 {
-			alpha = a + (b&d | c&^d) + x[_n[i]] + 0x8f1bbcdc
-			s := _r[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + e
-			beta = c<<10 | c>>22
-			a, b, c, d, e = e, alpha, b, beta, d
-
-			// parallel line
-			alpha = aa + (bb&cc | ^bb&dd) + x[n_[i]] + 0x7a6d76e9
-			s = r_[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + ee
-			beta = cc<<10 | cc>>22
-			aa, bb, cc, dd, ee = ee, alpha, bb, beta, dd
-
-			i++
-		}
-
-		// round 5
-		for i < 80 {
-			alpha = a + (b ^ (c | ^d)) + x[_n[i]] + 0xa953fd4e
-			s := _r[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + e
-			beta = c<<10 | c>>22
-			a, b, c, d, e = e, alpha, b, beta, d
-
-			// parallel line
-			alpha = aa + (bb ^ cc ^ dd) + x[n_[i]]
-			s = r_[i]
-			alpha = (alpha<<s | alpha>>(32-s)) + ee
-			beta = cc<<10 | cc>>22
-			aa, bb, cc, dd, ee = ee, alpha, bb, beta, dd
-
-			i++
-		}
-
-		// combine results
-		dd += c + md.s[1]
-		md.s[1] = md.s[2] + d + ee
-		md.s[2] = md.s[3] + e + aa
-		md.s[3] = md.s[4] + a + bb
-		md.s[4] = md.s[0] + b + cc
-		md.s[0] = dd
-
-		p = p[BlockSize:]
-		n += BlockSize
-	}
-	return n
-}
diff --git a/installer/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go b/installer/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go
deleted file mode 100644
index f67e94eba4..0000000000
--- a/installer/vendor/golang.org/x/crypto/salsa20/salsa/salsa_test.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package salsa
-
-import "testing"
-
-func TestCore208(t *testing.T) {
-	in := [64]byte{
-		0x7e, 0x87, 0x9a, 0x21, 0x4f, 0x3e, 0xc9, 0x86,
-		0x7c, 0xa9, 0x40, 0xe6, 0x41, 0x71, 0x8f, 0x26,
-		0xba, 0xee, 0x55, 0x5b, 0x8c, 0x61, 0xc1, 0xb5,
-		0x0d, 0xf8, 0x46, 0x11, 0x6d, 0xcd, 0x3b, 0x1d,
-		0xee, 0x24, 0xf3, 0x19, 0xdf, 0x9b, 0x3d, 0x85,
-		0x14, 0x12, 0x1e, 0x4b, 0x5a, 0xc5, 0xaa, 0x32,
-		0x76, 0x02, 0x1d, 0x29, 0x09, 0xc7, 0x48, 0x29,
-		0xed, 0xeb, 0xc6, 0x8d, 0xb8, 0xb8, 0xc2, 0x5e}
-
-	out := [64]byte{
-		0xa4, 0x1f, 0x85, 0x9c, 0x66, 0x08, 0xcc, 0x99,
-		0x3b, 0x81, 0xca, 0xcb, 0x02, 0x0c, 0xef, 0x05,
-		0x04, 0x4b, 0x21, 0x81, 0xa2, 0xfd, 0x33, 0x7d,
-		0xfd, 0x7b, 0x1c, 0x63, 0x96, 0x68, 0x2f, 0x29,
-		0xb4, 0x39, 0x31, 0x68, 0xe3, 0xc9, 0xe6, 0xbc,
-		0xfe, 0x6b, 0xc5, 0xb7, 0xa0, 0x6d, 0x96, 0xba,
-		0xe4, 0x24, 0xcc, 0x10, 0x2c, 0x91, 0x74, 0x5c,
-		0x24, 0xad, 0x67, 0x3d, 0xc7, 0x61, 0x8f, 0x81,
-	}
-
-	Core208(&in, &in)
-	if in != out {
-		t.Errorf("expected %x, got %x", out, in)
-	}
-}
-
-func TestOutOfBoundsWrite(t *testing.T) {
-	// encrypted "0123456789"
-	cipherText := []byte{170, 166, 196, 104, 175, 121, 68, 44, 174, 51}
-	var counter [16]byte
-	var key [32]byte
-	want := "abcdefghij"
-	plainText := []byte(want)
-	defer func() {
-		err := recover()
-		if err == nil {
-			t.Error("XORKeyStream expected to panic on len(dst) < len(src), but didn't")
-		}
-		if plainText[3] == '3' {
-			t.Errorf("XORKeyStream did out of bounds write, want %v, got %v", want, string(plainText))
-		}
-	}()
-	XORKeyStream(plainText[:3], cipherText, &counter, &key)
-}
diff --git a/installer/vendor/golang.org/x/crypto/salsa20/salsa20.go b/installer/vendor/golang.org/x/crypto/salsa20/salsa20.go
deleted file mode 100644
index 0ee62485a7..0000000000
--- a/installer/vendor/golang.org/x/crypto/salsa20/salsa20.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package salsa20 implements the Salsa20 stream cipher as specified in https://cr.yp.to/snuffle/spec.pdf.
-
-Salsa20 differs from many other stream ciphers in that it is message orientated
-rather than byte orientated. Keystream blocks are not preserved between calls,
-therefore each side must encrypt/decrypt data with the same segmentation.
-
-Another aspect of this difference is that part of the counter is exposed as
-a nonce in each call. Encrypting two different messages with the same (key,
-nonce) pair leads to trivial plaintext recovery. This is analogous to
-encrypting two different messages with the same key with a traditional stream
-cipher.
-
-This package also implements XSalsa20: a version of Salsa20 with a 24-byte
-nonce as specified in https://cr.yp.to/snuffle/xsalsa-20081128.pdf. Simply
-passing a 24-byte slice as the nonce triggers XSalsa20.
-*/
-package salsa20 // import "golang.org/x/crypto/salsa20"
-
-// TODO(agl): implement XORKeyStream12 and XORKeyStream8 - the reduced round variants of Salsa20.
-
-import (
-	"golang.org/x/crypto/salsa20/salsa"
-)
-
-// XORKeyStream crypts bytes from in to out using the given key and nonce.
-// In and out must overlap entirely or not at all. Nonce must
-// be either 8 or 24 bytes long.
-func XORKeyStream(out, in []byte, nonce []byte, key *[32]byte) {
-	if len(out) < len(in) {
-		in = in[:len(out)]
-	}
-
-	var subNonce [16]byte
-
-	if len(nonce) == 24 {
-		var subKey [32]byte
-		var hNonce [16]byte
-		copy(hNonce[:], nonce[:16])
-		salsa.HSalsa20(&subKey, &hNonce, key, &salsa.Sigma)
-		copy(subNonce[:], nonce[16:])
-		key = &subKey
-	} else if len(nonce) == 8 {
-		copy(subNonce[:], nonce[:])
-	} else {
-		panic("salsa20: nonce must be 8 or 24 bytes")
-	}
-
-	salsa.XORKeyStream(out, in, &subNonce, key)
-}
diff --git a/installer/vendor/golang.org/x/crypto/salsa20/salsa20_test.go b/installer/vendor/golang.org/x/crypto/salsa20/salsa20_test.go
deleted file mode 100644
index 0ef3328eb0..0000000000
--- a/installer/vendor/golang.org/x/crypto/salsa20/salsa20_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package salsa20
-
-import (
-	"bytes"
-	"encoding/hex"
-	"testing"
-)
-
-func fromHex(s string) []byte {
-	ret, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return ret
-}
-
-// testVectors was taken from set 6 of the ECRYPT test vectors:
-// http://www.ecrypt.eu.org/stream/svn/viewcvs.cgi/ecrypt/trunk/submissions/salsa20/full/verified.test-vectors?logsort=rev&rev=210&view=markup
-var testVectors = []struct {
-	key      []byte
-	iv       []byte
-	numBytes int
-	xor      []byte
-}{
-	{
-		fromHex("0053A6F94C9FF24598EB3E91E4378ADD3083D6297CCF2275C81B6EC11467BA0D"),
-		fromHex("0D74DB42A91077DE"),
-		131072,
-		fromHex("C349B6A51A3EC9B712EAED3F90D8BCEE69B7628645F251A996F55260C62EF31FD6C6B0AEA94E136C9D984AD2DF3578F78E457527B03A0450580DD874F63B1AB9"),
-	},
-	{
-		fromHex("0558ABFE51A4F74A9DF04396E93C8FE23588DB2E81D4277ACD2073C6196CBF12"),
-		fromHex("167DE44BB21980E7"),
-		131072,
-		fromHex("C3EAAF32836BACE32D04E1124231EF47E101367D6305413A0EEB07C60698A2876E4D031870A739D6FFDDD208597AFF0A47AC17EDB0167DD67EBA84F1883D4DFD"),
-	},
-	{
-		fromHex("0A5DB00356A9FC4FA2F5489BEE4194E73A8DE03386D92C7FD22578CB1E71C417"),
-		fromHex("1F86ED54BB2289F0"),
-		131072,
-		fromHex("3CD23C3DC90201ACC0CF49B440B6C417F0DC8D8410A716D5314C059E14B1A8D9A9FB8EA3D9C8DAE12B21402F674AA95C67B1FC514E994C9D3F3A6E41DFF5BBA6"),
-	},
-	{
-		fromHex("0F62B5085BAE0154A7FA4DA0F34699EC3F92E5388BDE3184D72A7DD02376C91C"),
-		fromHex("288FF65DC42B92F9"),
-		131072,
-		fromHex("E00EBCCD70D69152725F9987982178A2E2E139C7BCBE04CA8A0E99E318D9AB76F988C8549F75ADD790BA4F81C176DA653C1A043F11A958E169B6D2319F4EEC1A"),
-	},
-}
-
-func TestSalsa20(t *testing.T) {
-	var inBuf, outBuf []byte
-	var key [32]byte
-
-	for i, test := range testVectors {
-		if test.numBytes%64 != 0 {
-			t.Errorf("#%d: numBytes is not a multiple of 64", i)
-			continue
-		}
-
-		if test.numBytes > len(inBuf) {
-			inBuf = make([]byte, test.numBytes)
-			outBuf = make([]byte, test.numBytes)
-		}
-		in := inBuf[:test.numBytes]
-		out := outBuf[:test.numBytes]
-		copy(key[:], test.key)
-		XORKeyStream(out, in, test.iv, &key)
-
-		var xor [64]byte
-		for len(out) > 0 {
-			for i := 0; i < 64; i++ {
-				xor[i] ^= out[i]
-			}
-			out = out[64:]
-		}
-
-		if !bytes.Equal(xor[:], test.xor) {
-			t.Errorf("#%d: bad result", i)
-		}
-	}
-}
-
-var xSalsa20TestData = []struct {
-	in, nonce, key, out []byte
-}{
-	{
-		[]byte("Hello world!"),
-		[]byte("24-byte nonce for xsalsa"),
-		[]byte("this is 32-byte key for xsalsa20"),
-		[]byte{0x00, 0x2d, 0x45, 0x13, 0x84, 0x3f, 0xc2, 0x40, 0xc4, 0x01, 0xe5, 0x41},
-	},
-	{
-		make([]byte, 64),
-		[]byte("24-byte nonce for xsalsa"),
-		[]byte("this is 32-byte key for xsalsa20"),
-		[]byte{0x48, 0x48, 0x29, 0x7f, 0xeb, 0x1f, 0xb5, 0x2f, 0xb6,
-			0x6d, 0x81, 0x60, 0x9b, 0xd5, 0x47, 0xfa, 0xbc, 0xbe, 0x70,
-			0x26, 0xed, 0xc8, 0xb5, 0xe5, 0xe4, 0x49, 0xd0, 0x88, 0xbf,
-			0xa6, 0x9c, 0x08, 0x8f, 0x5d, 0x8d, 0xa1, 0xd7, 0x91, 0x26,
-			0x7c, 0x2c, 0x19, 0x5a, 0x7f, 0x8c, 0xae, 0x9c, 0x4b, 0x40,
-			0x50, 0xd0, 0x8c, 0xe6, 0xd3, 0xa1, 0x51, 0xec, 0x26, 0x5f,
-			0x3a, 0x58, 0xe4, 0x76, 0x48},
-	},
-}
-
-func TestXSalsa20(t *testing.T) {
-	var key [32]byte
-
-	for i, test := range xSalsa20TestData {
-		out := make([]byte, len(test.in))
-		copy(key[:], test.key)
-		XORKeyStream(out, test.in, test.nonce, &key)
-		if !bytes.Equal(out, test.out) {
-			t.Errorf("%d: expected %x, got %x", i, test.out, out)
-		}
-	}
-}
-
-var (
-	keyArray [32]byte
-	key      = &keyArray
-	nonce    [8]byte
-	msg      = make([]byte, 1<<10)
-)
-
-func BenchmarkXOR1K(b *testing.B) {
-	b.StopTimer()
-	out := make([]byte, 1024)
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		XORKeyStream(out, msg[:1024], nonce[:], key)
-	}
-	b.SetBytes(1024)
-}
diff --git a/installer/vendor/golang.org/x/crypto/scrypt/example_test.go b/installer/vendor/golang.org/x/crypto/scrypt/example_test.go
deleted file mode 100644
index 6736479b19..0000000000
--- a/installer/vendor/golang.org/x/crypto/scrypt/example_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package scrypt_test
-
-import (
-	"encoding/base64"
-	"fmt"
-	"log"
-
-	"golang.org/x/crypto/scrypt"
-)
-
-func Example() {
-	// DO NOT use this salt value; generate your own random salt. 8 bytes is
-	// a good length.
-	salt := []byte{0xc8, 0x28, 0xf2, 0x58, 0xa7, 0x6a, 0xad, 0x7b}
-
-	dk, err := scrypt.Key([]byte("some password"), salt, 1<<15, 8, 1, 32)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Println(base64.StdEncoding.EncodeToString(dk))
-	// Output: lGnMz8io0AUkfzn6Pls1qX20Vs7PGN6sbYQ2TQgY12M=
-}
diff --git a/installer/vendor/golang.org/x/crypto/scrypt/scrypt.go b/installer/vendor/golang.org/x/crypto/scrypt/scrypt.go
deleted file mode 100644
index ff28aaef6f..0000000000
--- a/installer/vendor/golang.org/x/crypto/scrypt/scrypt.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package scrypt implements the scrypt key derivation function as defined in
-// Colin Percival's paper "Stronger Key Derivation via Sequential Memory-Hard
-// Functions" (https://www.tarsnap.com/scrypt/scrypt.pdf).
-package scrypt // import "golang.org/x/crypto/scrypt"
-
-import (
-	"crypto/sha256"
-	"errors"
-
-	"golang.org/x/crypto/pbkdf2"
-)
-
-const maxInt = int(^uint(0) >> 1)
-
-// blockCopy copies n numbers from src into dst.
-func blockCopy(dst, src []uint32, n int) {
-	copy(dst, src[:n])
-}
-
-// blockXOR XORs numbers from dst with n numbers from src.
-func blockXOR(dst, src []uint32, n int) {
-	for i, v := range src[:n] {
-		dst[i] ^= v
-	}
-}
-
-// salsaXOR applies Salsa20/8 to the XOR of 16 numbers from tmp and in,
-// and puts the result into both both tmp and out.
-func salsaXOR(tmp *[16]uint32, in, out []uint32) {
-	w0 := tmp[0] ^ in[0]
-	w1 := tmp[1] ^ in[1]
-	w2 := tmp[2] ^ in[2]
-	w3 := tmp[3] ^ in[3]
-	w4 := tmp[4] ^ in[4]
-	w5 := tmp[5] ^ in[5]
-	w6 := tmp[6] ^ in[6]
-	w7 := tmp[7] ^ in[7]
-	w8 := tmp[8] ^ in[8]
-	w9 := tmp[9] ^ in[9]
-	w10 := tmp[10] ^ in[10]
-	w11 := tmp[11] ^ in[11]
-	w12 := tmp[12] ^ in[12]
-	w13 := tmp[13] ^ in[13]
-	w14 := tmp[14] ^ in[14]
-	w15 := tmp[15] ^ in[15]
-
-	x0, x1, x2, x3, x4, x5, x6, x7, x8 := w0, w1, w2, w3, w4, w5, w6, w7, w8
-	x9, x10, x11, x12, x13, x14, x15 := w9, w10, w11, w12, w13, w14, w15
-
-	for i := 0; i < 8; i += 2 {
-		u := x0 + x12
-		x4 ^= u<<7 | u>>(32-7)
-		u = x4 + x0
-		x8 ^= u<<9 | u>>(32-9)
-		u = x8 + x4
-		x12 ^= u<<13 | u>>(32-13)
-		u = x12 + x8
-		x0 ^= u<<18 | u>>(32-18)
-
-		u = x5 + x1
-		x9 ^= u<<7 | u>>(32-7)
-		u = x9 + x5
-		x13 ^= u<<9 | u>>(32-9)
-		u = x13 + x9
-		x1 ^= u<<13 | u>>(32-13)
-		u = x1 + x13
-		x5 ^= u<<18 | u>>(32-18)
-
-		u = x10 + x6
-		x14 ^= u<<7 | u>>(32-7)
-		u = x14 + x10
-		x2 ^= u<<9 | u>>(32-9)
-		u = x2 + x14
-		x6 ^= u<<13 | u>>(32-13)
-		u = x6 + x2
-		x10 ^= u<<18 | u>>(32-18)
-
-		u = x15 + x11
-		x3 ^= u<<7 | u>>(32-7)
-		u = x3 + x15
-		x7 ^= u<<9 | u>>(32-9)
-		u = x7 + x3
-		x11 ^= u<<13 | u>>(32-13)
-		u = x11 + x7
-		x15 ^= u<<18 | u>>(32-18)
-
-		u = x0 + x3
-		x1 ^= u<<7 | u>>(32-7)
-		u = x1 + x0
-		x2 ^= u<<9 | u>>(32-9)
-		u = x2 + x1
-		x3 ^= u<<13 | u>>(32-13)
-		u = x3 + x2
-		x0 ^= u<<18 | u>>(32-18)
-
-		u = x5 + x4
-		x6 ^= u<<7 | u>>(32-7)
-		u = x6 + x5
-		x7 ^= u<<9 | u>>(32-9)
-		u = x7 + x6
-		x4 ^= u<<13 | u>>(32-13)
-		u = x4 + x7
-		x5 ^= u<<18 | u>>(32-18)
-
-		u = x10 + x9
-		x11 ^= u<<7 | u>>(32-7)
-		u = x11 + x10
-		x8 ^= u<<9 | u>>(32-9)
-		u = x8 + x11
-		x9 ^= u<<13 | u>>(32-13)
-		u = x9 + x8
-		x10 ^= u<<18 | u>>(32-18)
-
-		u = x15 + x14
-		x12 ^= u<<7 | u>>(32-7)
-		u = x12 + x15
-		x13 ^= u<<9 | u>>(32-9)
-		u = x13 + x12
-		x14 ^= u<<13 | u>>(32-13)
-		u = x14 + x13
-		x15 ^= u<<18 | u>>(32-18)
-	}
-	x0 += w0
-	x1 += w1
-	x2 += w2
-	x3 += w3
-	x4 += w4
-	x5 += w5
-	x6 += w6
-	x7 += w7
-	x8 += w8
-	x9 += w9
-	x10 += w10
-	x11 += w11
-	x12 += w12
-	x13 += w13
-	x14 += w14
-	x15 += w15
-
-	out[0], tmp[0] = x0, x0
-	out[1], tmp[1] = x1, x1
-	out[2], tmp[2] = x2, x2
-	out[3], tmp[3] = x3, x3
-	out[4], tmp[4] = x4, x4
-	out[5], tmp[5] = x5, x5
-	out[6], tmp[6] = x6, x6
-	out[7], tmp[7] = x7, x7
-	out[8], tmp[8] = x8, x8
-	out[9], tmp[9] = x9, x9
-	out[10], tmp[10] = x10, x10
-	out[11], tmp[11] = x11, x11
-	out[12], tmp[12] = x12, x12
-	out[13], tmp[13] = x13, x13
-	out[14], tmp[14] = x14, x14
-	out[15], tmp[15] = x15, x15
-}
-
-func blockMix(tmp *[16]uint32, in, out []uint32, r int) {
-	blockCopy(tmp[:], in[(2*r-1)*16:], 16)
-	for i := 0; i < 2*r; i += 2 {
-		salsaXOR(tmp, in[i*16:], out[i*8:])
-		salsaXOR(tmp, in[i*16+16:], out[i*8+r*16:])
-	}
-}
-
-func integer(b []uint32, r int) uint64 {
-	j := (2*r - 1) * 16
-	return uint64(b[j]) | uint64(b[j+1])<<32
-}
-
-func smix(b []byte, r, N int, v, xy []uint32) {
-	var tmp [16]uint32
-	x := xy
-	y := xy[32*r:]
-
-	j := 0
-	for i := 0; i < 32*r; i++ {
-		x[i] = uint32(b[j]) | uint32(b[j+1])<<8 | uint32(b[j+2])<<16 | uint32(b[j+3])<<24
-		j += 4
-	}
-	for i := 0; i < N; i += 2 {
-		blockCopy(v[i*(32*r):], x, 32*r)
-		blockMix(&tmp, x, y, r)
-
-		blockCopy(v[(i+1)*(32*r):], y, 32*r)
-		blockMix(&tmp, y, x, r)
-	}
-	for i := 0; i < N; i += 2 {
-		j := int(integer(x, r) & uint64(N-1))
-		blockXOR(x, v[j*(32*r):], 32*r)
-		blockMix(&tmp, x, y, r)
-
-		j = int(integer(y, r) & uint64(N-1))
-		blockXOR(y, v[j*(32*r):], 32*r)
-		blockMix(&tmp, y, x, r)
-	}
-	j = 0
-	for _, v := range x[:32*r] {
-		b[j+0] = byte(v >> 0)
-		b[j+1] = byte(v >> 8)
-		b[j+2] = byte(v >> 16)
-		b[j+3] = byte(v >> 24)
-		j += 4
-	}
-}
-
-// Key derives a key from the password, salt, and cost parameters, returning
-// a byte slice of length keyLen that can be used as cryptographic key.
-//
-// N is a CPU/memory cost parameter, which must be a power of two greater than 1.
-// r and p must satisfy r * p < 2³⁰. If the parameters do not satisfy the
-// limits, the function returns a nil byte slice and an error.
-//
-// For example, you can get a derived key for e.g. AES-256 (which needs a
-// 32-byte key) by doing:
-//
-//      dk, err := scrypt.Key([]byte("some password"), salt, 16384, 8, 1, 32)
-//
-// The recommended parameters for interactive logins as of 2017 are N=32768, r=8
-// and p=1. The parameters N, r, and p should be increased as memory latency and
-// CPU parallelism increases; consider setting N to the highest power of 2 you
-// can derive within 100 milliseconds. Remember to get a good random salt.
-func Key(password, salt []byte, N, r, p, keyLen int) ([]byte, error) {
-	if N <= 1 || N&(N-1) != 0 {
-		return nil, errors.New("scrypt: N must be > 1 and a power of 2")
-	}
-	if uint64(r)*uint64(p) >= 1<<30 || r > maxInt/128/p || r > maxInt/256 || N > maxInt/128/r {
-		return nil, errors.New("scrypt: parameters are too large")
-	}
-
-	xy := make([]uint32, 64*r)
-	v := make([]uint32, 32*N*r)
-	b := pbkdf2.Key(password, salt, 1, p*128*r, sha256.New)
-
-	for i := 0; i < p; i++ {
-		smix(b[i*128*r:], r, N, v, xy)
-	}
-
-	return pbkdf2.Key(password, b, 1, keyLen, sha256.New), nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/scrypt/scrypt_test.go b/installer/vendor/golang.org/x/crypto/scrypt/scrypt_test.go
deleted file mode 100644
index 766ed8d905..0000000000
--- a/installer/vendor/golang.org/x/crypto/scrypt/scrypt_test.go
+++ /dev/null
@@ -1,162 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package scrypt
-
-import (
-	"bytes"
-	"testing"
-)
-
-type testVector struct {
-	password string
-	salt     string
-	N, r, p  int
-	output   []byte
-}
-
-var good = []testVector{
-	{
-		"password",
-		"salt",
-		2, 10, 10,
-		[]byte{
-			0x48, 0x2c, 0x85, 0x8e, 0x22, 0x90, 0x55, 0xe6, 0x2f,
-			0x41, 0xe0, 0xec, 0x81, 0x9a, 0x5e, 0xe1, 0x8b, 0xdb,
-			0x87, 0x25, 0x1a, 0x53, 0x4f, 0x75, 0xac, 0xd9, 0x5a,
-			0xc5, 0xe5, 0xa, 0xa1, 0x5f,
-		},
-	},
-	{
-		"password",
-		"salt",
-		16, 100, 100,
-		[]byte{
-			0x88, 0xbd, 0x5e, 0xdb, 0x52, 0xd1, 0xdd, 0x0, 0x18,
-			0x87, 0x72, 0xad, 0x36, 0x17, 0x12, 0x90, 0x22, 0x4e,
-			0x74, 0x82, 0x95, 0x25, 0xb1, 0x8d, 0x73, 0x23, 0xa5,
-			0x7f, 0x91, 0x96, 0x3c, 0x37,
-		},
-	},
-	{
-		"this is a long \000 password",
-		"and this is a long \000 salt",
-		16384, 8, 1,
-		[]byte{
-			0xc3, 0xf1, 0x82, 0xee, 0x2d, 0xec, 0x84, 0x6e, 0x70,
-			0xa6, 0x94, 0x2f, 0xb5, 0x29, 0x98, 0x5a, 0x3a, 0x09,
-			0x76, 0x5e, 0xf0, 0x4c, 0x61, 0x29, 0x23, 0xb1, 0x7f,
-			0x18, 0x55, 0x5a, 0x37, 0x07, 0x6d, 0xeb, 0x2b, 0x98,
-			0x30, 0xd6, 0x9d, 0xe5, 0x49, 0x26, 0x51, 0xe4, 0x50,
-			0x6a, 0xe5, 0x77, 0x6d, 0x96, 0xd4, 0x0f, 0x67, 0xaa,
-			0xee, 0x37, 0xe1, 0x77, 0x7b, 0x8a, 0xd5, 0xc3, 0x11,
-			0x14, 0x32, 0xbb, 0x3b, 0x6f, 0x7e, 0x12, 0x64, 0x40,
-			0x18, 0x79, 0xe6, 0x41, 0xae,
-		},
-	},
-	{
-		"p",
-		"s",
-		2, 1, 1,
-		[]byte{
-			0x48, 0xb0, 0xd2, 0xa8, 0xa3, 0x27, 0x26, 0x11, 0x98,
-			0x4c, 0x50, 0xeb, 0xd6, 0x30, 0xaf, 0x52,
-		},
-	},
-
-	{
-		"",
-		"",
-		16, 1, 1,
-		[]byte{
-			0x77, 0xd6, 0x57, 0x62, 0x38, 0x65, 0x7b, 0x20, 0x3b,
-			0x19, 0xca, 0x42, 0xc1, 0x8a, 0x04, 0x97, 0xf1, 0x6b,
-			0x48, 0x44, 0xe3, 0x07, 0x4a, 0xe8, 0xdf, 0xdf, 0xfa,
-			0x3f, 0xed, 0xe2, 0x14, 0x42, 0xfc, 0xd0, 0x06, 0x9d,
-			0xed, 0x09, 0x48, 0xf8, 0x32, 0x6a, 0x75, 0x3a, 0x0f,
-			0xc8, 0x1f, 0x17, 0xe8, 0xd3, 0xe0, 0xfb, 0x2e, 0x0d,
-			0x36, 0x28, 0xcf, 0x35, 0xe2, 0x0c, 0x38, 0xd1, 0x89,
-			0x06,
-		},
-	},
-	{
-		"password",
-		"NaCl",
-		1024, 8, 16,
-		[]byte{
-			0xfd, 0xba, 0xbe, 0x1c, 0x9d, 0x34, 0x72, 0x00, 0x78,
-			0x56, 0xe7, 0x19, 0x0d, 0x01, 0xe9, 0xfe, 0x7c, 0x6a,
-			0xd7, 0xcb, 0xc8, 0x23, 0x78, 0x30, 0xe7, 0x73, 0x76,
-			0x63, 0x4b, 0x37, 0x31, 0x62, 0x2e, 0xaf, 0x30, 0xd9,
-			0x2e, 0x22, 0xa3, 0x88, 0x6f, 0xf1, 0x09, 0x27, 0x9d,
-			0x98, 0x30, 0xda, 0xc7, 0x27, 0xaf, 0xb9, 0x4a, 0x83,
-			0xee, 0x6d, 0x83, 0x60, 0xcb, 0xdf, 0xa2, 0xcc, 0x06,
-			0x40,
-		},
-	},
-	{
-		"pleaseletmein", "SodiumChloride",
-		16384, 8, 1,
-		[]byte{
-			0x70, 0x23, 0xbd, 0xcb, 0x3a, 0xfd, 0x73, 0x48, 0x46,
-			0x1c, 0x06, 0xcd, 0x81, 0xfd, 0x38, 0xeb, 0xfd, 0xa8,
-			0xfb, 0xba, 0x90, 0x4f, 0x8e, 0x3e, 0xa9, 0xb5, 0x43,
-			0xf6, 0x54, 0x5d, 0xa1, 0xf2, 0xd5, 0x43, 0x29, 0x55,
-			0x61, 0x3f, 0x0f, 0xcf, 0x62, 0xd4, 0x97, 0x05, 0x24,
-			0x2a, 0x9a, 0xf9, 0xe6, 0x1e, 0x85, 0xdc, 0x0d, 0x65,
-			0x1e, 0x40, 0xdf, 0xcf, 0x01, 0x7b, 0x45, 0x57, 0x58,
-			0x87,
-		},
-	},
-	/*
-		// Disabled: needs 1 GiB RAM and takes too long for a simple test.
-		{
-			"pleaseletmein", "SodiumChloride",
-			1048576, 8, 1,
-			[]byte{
-				0x21, 0x01, 0xcb, 0x9b, 0x6a, 0x51, 0x1a, 0xae, 0xad,
-				0xdb, 0xbe, 0x09, 0xcf, 0x70, 0xf8, 0x81, 0xec, 0x56,
-				0x8d, 0x57, 0x4a, 0x2f, 0xfd, 0x4d, 0xab, 0xe5, 0xee,
-				0x98, 0x20, 0xad, 0xaa, 0x47, 0x8e, 0x56, 0xfd, 0x8f,
-				0x4b, 0xa5, 0xd0, 0x9f, 0xfa, 0x1c, 0x6d, 0x92, 0x7c,
-				0x40, 0xf4, 0xc3, 0x37, 0x30, 0x40, 0x49, 0xe8, 0xa9,
-				0x52, 0xfb, 0xcb, 0xf4, 0x5c, 0x6f, 0xa7, 0x7a, 0x41,
-				0xa4,
-			},
-		},
-	*/
-}
-
-var bad = []testVector{
-	{"p", "s", 0, 1, 1, nil},                    // N == 0
-	{"p", "s", 1, 1, 1, nil},                    // N == 1
-	{"p", "s", 7, 8, 1, nil},                    // N is not power of 2
-	{"p", "s", 16, maxInt / 2, maxInt / 2, nil}, // p * r too large
-}
-
-func TestKey(t *testing.T) {
-	for i, v := range good {
-		k, err := Key([]byte(v.password), []byte(v.salt), v.N, v.r, v.p, len(v.output))
-		if err != nil {
-			t.Errorf("%d: got unexpected error: %s", i, err)
-		}
-		if !bytes.Equal(k, v.output) {
-			t.Errorf("%d: expected %x, got %x", i, v.output, k)
-		}
-	}
-	for i, v := range bad {
-		_, err := Key([]byte(v.password), []byte(v.salt), v.N, v.r, v.p, 32)
-		if err == nil {
-			t.Errorf("%d: expected error, got nil", i)
-		}
-	}
-}
-
-var sink []byte
-
-func BenchmarkKey(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		sink, _ = Key([]byte("password"), []byte("salt"), 1<<15, 8, 1, 64)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/doc.go b/installer/vendor/golang.org/x/crypto/sha3/doc.go
deleted file mode 100644
index a0ee3ae725..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/doc.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package sha3 implements the SHA-3 fixed-output-length hash functions and
-// the SHAKE variable-output-length hash functions defined by FIPS-202.
-//
-// Both types of hash function use the "sponge" construction and the Keccak
-// permutation. For a detailed specification see http://keccak.noekeon.org/
-//
-//
-// Guidance
-//
-// If you aren't sure what function you need, use SHAKE256 with at least 64
-// bytes of output. The SHAKE instances are faster than the SHA3 instances;
-// the latter have to allocate memory to conform to the hash.Hash interface.
-//
-// If you need a secret-key MAC (message authentication code), prepend the
-// secret key to the input, hash with SHAKE256 and read at least 32 bytes of
-// output.
-//
-//
-// Security strengths
-//
-// The SHA3-x (x equals 224, 256, 384, or 512) functions have a security
-// strength against preimage attacks of x bits. Since they only produce "x"
-// bits of output, their collision-resistance is only "x/2" bits.
-//
-// The SHAKE-256 and -128 functions have a generic security strength of 256 and
-// 128 bits against all attacks, provided that at least 2x bits of their output
-// is used.  Requesting more than 64 or 32 bytes of output, respectively, does
-// not increase the collision-resistance of the SHAKE functions.
-//
-//
-// The sponge construction
-//
-// A sponge builds a pseudo-random function from a public pseudo-random
-// permutation, by applying the permutation to a state of "rate + capacity"
-// bytes, but hiding "capacity" of the bytes.
-//
-// A sponge starts out with a zero state. To hash an input using a sponge, up
-// to "rate" bytes of the input are XORed into the sponge's state. The sponge
-// is then "full" and the permutation is applied to "empty" it. This process is
-// repeated until all the input has been "absorbed". The input is then padded.
-// The digest is "squeezed" from the sponge in the same way, except that output
-// output is copied out instead of input being XORed in.
-//
-// A sponge is parameterized by its generic security strength, which is equal
-// to half its capacity; capacity + rate is equal to the permutation's width.
-// Since the KeccakF-1600 permutation is 1600 bits (200 bytes) wide, this means
-// that the security strength of a sponge instance is equal to (1600 - bitrate) / 2.
-//
-//
-// Recommendations
-//
-// The SHAKE functions are recommended for most new uses. They can produce
-// output of arbitrary length. SHAKE256, with an output length of at least
-// 64 bytes, provides 256-bit security against all attacks.  The Keccak team
-// recommends it for most applications upgrading from SHA2-512. (NIST chose a
-// much stronger, but much slower, sponge instance for SHA3-512.)
-//
-// The SHA-3 functions are "drop-in" replacements for the SHA-2 functions.
-// They produce output of the same length, with the same security strengths
-// against all attacks. This means, in particular, that SHA3-256 only has
-// 128-bit collision resistance, because its output length is 32 bytes.
-package sha3 // import "golang.org/x/crypto/sha3"
diff --git a/installer/vendor/golang.org/x/crypto/sha3/hashes.go b/installer/vendor/golang.org/x/crypto/sha3/hashes.go
deleted file mode 100644
index 2b51cf4e9b..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/hashes.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// This file provides functions for creating instances of the SHA-3
-// and SHAKE hash functions, as well as utility functions for hashing
-// bytes.
-
-import (
-	"hash"
-)
-
-// New224 creates a new SHA3-224 hash.
-// Its generic security strength is 224 bits against preimage attacks,
-// and 112 bits against collision attacks.
-func New224() hash.Hash { return &state{rate: 144, outputLen: 28, dsbyte: 0x06} }
-
-// New256 creates a new SHA3-256 hash.
-// Its generic security strength is 256 bits against preimage attacks,
-// and 128 bits against collision attacks.
-func New256() hash.Hash { return &state{rate: 136, outputLen: 32, dsbyte: 0x06} }
-
-// New384 creates a new SHA3-384 hash.
-// Its generic security strength is 384 bits against preimage attacks,
-// and 192 bits against collision attacks.
-func New384() hash.Hash { return &state{rate: 104, outputLen: 48, dsbyte: 0x06} }
-
-// New512 creates a new SHA3-512 hash.
-// Its generic security strength is 512 bits against preimage attacks,
-// and 256 bits against collision attacks.
-func New512() hash.Hash { return &state{rate: 72, outputLen: 64, dsbyte: 0x06} }
-
-// Sum224 returns the SHA3-224 digest of the data.
-func Sum224(data []byte) (digest [28]byte) {
-	h := New224()
-	h.Write(data)
-	h.Sum(digest[:0])
-	return
-}
-
-// Sum256 returns the SHA3-256 digest of the data.
-func Sum256(data []byte) (digest [32]byte) {
-	h := New256()
-	h.Write(data)
-	h.Sum(digest[:0])
-	return
-}
-
-// Sum384 returns the SHA3-384 digest of the data.
-func Sum384(data []byte) (digest [48]byte) {
-	h := New384()
-	h.Write(data)
-	h.Sum(digest[:0])
-	return
-}
-
-// Sum512 returns the SHA3-512 digest of the data.
-func Sum512(data []byte) (digest [64]byte) {
-	h := New512()
-	h.Write(data)
-	h.Sum(digest[:0])
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/keccakf.go b/installer/vendor/golang.org/x/crypto/sha3/keccakf.go
deleted file mode 100644
index 46d03ed385..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/keccakf.go
+++ /dev/null
@@ -1,412 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//  +build !amd64 appengine gccgo
-
-package sha3
-
-// rc stores the round constants for use in the ι step.
-var rc = [24]uint64{
-	0x0000000000000001,
-	0x0000000000008082,
-	0x800000000000808A,
-	0x8000000080008000,
-	0x000000000000808B,
-	0x0000000080000001,
-	0x8000000080008081,
-	0x8000000000008009,
-	0x000000000000008A,
-	0x0000000000000088,
-	0x0000000080008009,
-	0x000000008000000A,
-	0x000000008000808B,
-	0x800000000000008B,
-	0x8000000000008089,
-	0x8000000000008003,
-	0x8000000000008002,
-	0x8000000000000080,
-	0x000000000000800A,
-	0x800000008000000A,
-	0x8000000080008081,
-	0x8000000000008080,
-	0x0000000080000001,
-	0x8000000080008008,
-}
-
-// keccakF1600 applies the Keccak permutation to a 1600b-wide
-// state represented as a slice of 25 uint64s.
-func keccakF1600(a *[25]uint64) {
-	// Implementation translated from Keccak-inplace.c
-	// in the keccak reference code.
-	var t, bc0, bc1, bc2, bc3, bc4, d0, d1, d2, d3, d4 uint64
-
-	for i := 0; i < 24; i += 4 {
-		// Combines the 5 steps in each round into 2 steps.
-		// Unrolls 4 rounds per loop and spreads some steps across rounds.
-
-		// Round 1
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[6] ^ d1
-		bc1 = t<<44 | t>>(64-44)
-		t = a[12] ^ d2
-		bc2 = t<<43 | t>>(64-43)
-		t = a[18] ^ d3
-		bc3 = t<<21 | t>>(64-21)
-		t = a[24] ^ d4
-		bc4 = t<<14 | t>>(64-14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i]
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc2 = t<<3 | t>>(64-3)
-		t = a[16] ^ d1
-		bc3 = t<<45 | t>>(64-45)
-		t = a[22] ^ d2
-		bc4 = t<<61 | t>>(64-61)
-		t = a[3] ^ d3
-		bc0 = t<<28 | t>>(64-28)
-		t = a[9] ^ d4
-		bc1 = t<<20 | t>>(64-20)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc4 = t<<18 | t>>(64-18)
-		t = a[1] ^ d1
-		bc0 = t<<1 | t>>(64-1)
-		t = a[7] ^ d2
-		bc1 = t<<6 | t>>(64-6)
-		t = a[13] ^ d3
-		bc2 = t<<25 | t>>(64-25)
-		t = a[19] ^ d4
-		bc3 = t<<8 | t>>(64-8)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc1 = t<<36 | t>>(64-36)
-		t = a[11] ^ d1
-		bc2 = t<<10 | t>>(64-10)
-		t = a[17] ^ d2
-		bc3 = t<<15 | t>>(64-15)
-		t = a[23] ^ d3
-		bc4 = t<<56 | t>>(64-56)
-		t = a[4] ^ d4
-		bc0 = t<<27 | t>>(64-27)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc3 = t<<41 | t>>(64-41)
-		t = a[21] ^ d1
-		bc4 = t<<2 | t>>(64-2)
-		t = a[2] ^ d2
-		bc0 = t<<62 | t>>(64-62)
-		t = a[8] ^ d3
-		bc1 = t<<55 | t>>(64-55)
-		t = a[14] ^ d4
-		bc2 = t<<39 | t>>(64-39)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 2
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[16] ^ d1
-		bc1 = t<<44 | t>>(64-44)
-		t = a[7] ^ d2
-		bc2 = t<<43 | t>>(64-43)
-		t = a[23] ^ d3
-		bc3 = t<<21 | t>>(64-21)
-		t = a[14] ^ d4
-		bc4 = t<<14 | t>>(64-14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+1]
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc2 = t<<3 | t>>(64-3)
-		t = a[11] ^ d1
-		bc3 = t<<45 | t>>(64-45)
-		t = a[2] ^ d2
-		bc4 = t<<61 | t>>(64-61)
-		t = a[18] ^ d3
-		bc0 = t<<28 | t>>(64-28)
-		t = a[9] ^ d4
-		bc1 = t<<20 | t>>(64-20)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc4 = t<<18 | t>>(64-18)
-		t = a[6] ^ d1
-		bc0 = t<<1 | t>>(64-1)
-		t = a[22] ^ d2
-		bc1 = t<<6 | t>>(64-6)
-		t = a[13] ^ d3
-		bc2 = t<<25 | t>>(64-25)
-		t = a[4] ^ d4
-		bc3 = t<<8 | t>>(64-8)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc1 = t<<36 | t>>(64-36)
-		t = a[1] ^ d1
-		bc2 = t<<10 | t>>(64-10)
-		t = a[17] ^ d2
-		bc3 = t<<15 | t>>(64-15)
-		t = a[8] ^ d3
-		bc4 = t<<56 | t>>(64-56)
-		t = a[24] ^ d4
-		bc0 = t<<27 | t>>(64-27)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc3 = t<<41 | t>>(64-41)
-		t = a[21] ^ d1
-		bc4 = t<<2 | t>>(64-2)
-		t = a[12] ^ d2
-		bc0 = t<<62 | t>>(64-62)
-		t = a[3] ^ d3
-		bc1 = t<<55 | t>>(64-55)
-		t = a[19] ^ d4
-		bc2 = t<<39 | t>>(64-39)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 3
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[11] ^ d1
-		bc1 = t<<44 | t>>(64-44)
-		t = a[22] ^ d2
-		bc2 = t<<43 | t>>(64-43)
-		t = a[8] ^ d3
-		bc3 = t<<21 | t>>(64-21)
-		t = a[19] ^ d4
-		bc4 = t<<14 | t>>(64-14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+2]
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc2 = t<<3 | t>>(64-3)
-		t = a[1] ^ d1
-		bc3 = t<<45 | t>>(64-45)
-		t = a[12] ^ d2
-		bc4 = t<<61 | t>>(64-61)
-		t = a[23] ^ d3
-		bc0 = t<<28 | t>>(64-28)
-		t = a[9] ^ d4
-		bc1 = t<<20 | t>>(64-20)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc4 = t<<18 | t>>(64-18)
-		t = a[16] ^ d1
-		bc0 = t<<1 | t>>(64-1)
-		t = a[2] ^ d2
-		bc1 = t<<6 | t>>(64-6)
-		t = a[13] ^ d3
-		bc2 = t<<25 | t>>(64-25)
-		t = a[24] ^ d4
-		bc3 = t<<8 | t>>(64-8)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc1 = t<<36 | t>>(64-36)
-		t = a[6] ^ d1
-		bc2 = t<<10 | t>>(64-10)
-		t = a[17] ^ d2
-		bc3 = t<<15 | t>>(64-15)
-		t = a[3] ^ d3
-		bc4 = t<<56 | t>>(64-56)
-		t = a[14] ^ d4
-		bc0 = t<<27 | t>>(64-27)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc3 = t<<41 | t>>(64-41)
-		t = a[21] ^ d1
-		bc4 = t<<2 | t>>(64-2)
-		t = a[7] ^ d2
-		bc0 = t<<62 | t>>(64-62)
-		t = a[18] ^ d3
-		bc1 = t<<55 | t>>(64-55)
-		t = a[4] ^ d4
-		bc2 = t<<39 | t>>(64-39)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		// Round 4
-		bc0 = a[0] ^ a[5] ^ a[10] ^ a[15] ^ a[20]
-		bc1 = a[1] ^ a[6] ^ a[11] ^ a[16] ^ a[21]
-		bc2 = a[2] ^ a[7] ^ a[12] ^ a[17] ^ a[22]
-		bc3 = a[3] ^ a[8] ^ a[13] ^ a[18] ^ a[23]
-		bc4 = a[4] ^ a[9] ^ a[14] ^ a[19] ^ a[24]
-		d0 = bc4 ^ (bc1<<1 | bc1>>63)
-		d1 = bc0 ^ (bc2<<1 | bc2>>63)
-		d2 = bc1 ^ (bc3<<1 | bc3>>63)
-		d3 = bc2 ^ (bc4<<1 | bc4>>63)
-		d4 = bc3 ^ (bc0<<1 | bc0>>63)
-
-		bc0 = a[0] ^ d0
-		t = a[1] ^ d1
-		bc1 = t<<44 | t>>(64-44)
-		t = a[2] ^ d2
-		bc2 = t<<43 | t>>(64-43)
-		t = a[3] ^ d3
-		bc3 = t<<21 | t>>(64-21)
-		t = a[4] ^ d4
-		bc4 = t<<14 | t>>(64-14)
-		a[0] = bc0 ^ (bc2 &^ bc1) ^ rc[i+3]
-		a[1] = bc1 ^ (bc3 &^ bc2)
-		a[2] = bc2 ^ (bc4 &^ bc3)
-		a[3] = bc3 ^ (bc0 &^ bc4)
-		a[4] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[5] ^ d0
-		bc2 = t<<3 | t>>(64-3)
-		t = a[6] ^ d1
-		bc3 = t<<45 | t>>(64-45)
-		t = a[7] ^ d2
-		bc4 = t<<61 | t>>(64-61)
-		t = a[8] ^ d3
-		bc0 = t<<28 | t>>(64-28)
-		t = a[9] ^ d4
-		bc1 = t<<20 | t>>(64-20)
-		a[5] = bc0 ^ (bc2 &^ bc1)
-		a[6] = bc1 ^ (bc3 &^ bc2)
-		a[7] = bc2 ^ (bc4 &^ bc3)
-		a[8] = bc3 ^ (bc0 &^ bc4)
-		a[9] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[10] ^ d0
-		bc4 = t<<18 | t>>(64-18)
-		t = a[11] ^ d1
-		bc0 = t<<1 | t>>(64-1)
-		t = a[12] ^ d2
-		bc1 = t<<6 | t>>(64-6)
-		t = a[13] ^ d3
-		bc2 = t<<25 | t>>(64-25)
-		t = a[14] ^ d4
-		bc3 = t<<8 | t>>(64-8)
-		a[10] = bc0 ^ (bc2 &^ bc1)
-		a[11] = bc1 ^ (bc3 &^ bc2)
-		a[12] = bc2 ^ (bc4 &^ bc3)
-		a[13] = bc3 ^ (bc0 &^ bc4)
-		a[14] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[15] ^ d0
-		bc1 = t<<36 | t>>(64-36)
-		t = a[16] ^ d1
-		bc2 = t<<10 | t>>(64-10)
-		t = a[17] ^ d2
-		bc3 = t<<15 | t>>(64-15)
-		t = a[18] ^ d3
-		bc4 = t<<56 | t>>(64-56)
-		t = a[19] ^ d4
-		bc0 = t<<27 | t>>(64-27)
-		a[15] = bc0 ^ (bc2 &^ bc1)
-		a[16] = bc1 ^ (bc3 &^ bc2)
-		a[17] = bc2 ^ (bc4 &^ bc3)
-		a[18] = bc3 ^ (bc0 &^ bc4)
-		a[19] = bc4 ^ (bc1 &^ bc0)
-
-		t = a[20] ^ d0
-		bc3 = t<<41 | t>>(64-41)
-		t = a[21] ^ d1
-		bc4 = t<<2 | t>>(64-2)
-		t = a[22] ^ d2
-		bc0 = t<<62 | t>>(64-62)
-		t = a[23] ^ d3
-		bc1 = t<<55 | t>>(64-55)
-		t = a[24] ^ d4
-		bc2 = t<<39 | t>>(64-39)
-		a[20] = bc0 ^ (bc2 &^ bc1)
-		a[21] = bc1 ^ (bc3 &^ bc2)
-		a[22] = bc2 ^ (bc4 &^ bc3)
-		a[23] = bc3 ^ (bc0 &^ bc4)
-		a[24] = bc4 ^ (bc1 &^ bc0)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.go b/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.go
deleted file mode 100644
index 7886795850..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!appengine,!gccgo
-
-package sha3
-
-// This function is implemented in keccakf_amd64.s.
-
-//go:noescape
-
-func keccakF1600(a *[25]uint64)
diff --git a/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.s b/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.s
deleted file mode 100644
index f88533accd..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/keccakf_amd64.s
+++ /dev/null
@@ -1,390 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!appengine,!gccgo
-
-// This code was translated into a form compatible with 6a from the public
-// domain sources at https://github.com/gvanas/KeccakCodePackage
-
-// Offsets in state
-#define _ba  (0*8)
-#define _be  (1*8)
-#define _bi  (2*8)
-#define _bo  (3*8)
-#define _bu  (4*8)
-#define _ga  (5*8)
-#define _ge  (6*8)
-#define _gi  (7*8)
-#define _go  (8*8)
-#define _gu  (9*8)
-#define _ka (10*8)
-#define _ke (11*8)
-#define _ki (12*8)
-#define _ko (13*8)
-#define _ku (14*8)
-#define _ma (15*8)
-#define _me (16*8)
-#define _mi (17*8)
-#define _mo (18*8)
-#define _mu (19*8)
-#define _sa (20*8)
-#define _se (21*8)
-#define _si (22*8)
-#define _so (23*8)
-#define _su (24*8)
-
-// Temporary registers
-#define rT1  AX
-
-// Round vars
-#define rpState DI
-#define rpStack SP
-
-#define rDa BX
-#define rDe CX
-#define rDi DX
-#define rDo R8
-#define rDu R9
-
-#define rBa R10
-#define rBe R11
-#define rBi R12
-#define rBo R13
-#define rBu R14
-
-#define rCa SI
-#define rCe BP
-#define rCi rBi
-#define rCo rBo
-#define rCu R15
-
-#define MOVQ_RBI_RCE MOVQ rBi, rCe
-#define XORQ_RT1_RCA XORQ rT1, rCa
-#define XORQ_RT1_RCE XORQ rT1, rCe
-#define XORQ_RBA_RCU XORQ rBa, rCu
-#define XORQ_RBE_RCU XORQ rBe, rCu
-#define XORQ_RDU_RCU XORQ rDu, rCu
-#define XORQ_RDA_RCA XORQ rDa, rCa
-#define XORQ_RDE_RCE XORQ rDe, rCe
-
-#define mKeccakRound(iState, oState, rc, B_RBI_RCE, G_RT1_RCA, G_RT1_RCE, G_RBA_RCU, K_RT1_RCA, K_RT1_RCE, K_RBA_RCU, M_RT1_RCA, M_RT1_RCE, M_RBE_RCU, S_RDU_RCU, S_RDA_RCA, S_RDE_RCE) \
-	/* Prepare round */    \
-	MOVQ rCe, rDa;         \
-	ROLQ $1, rDa;          \
-	                       \
-	MOVQ _bi(iState), rCi; \
-	XORQ _gi(iState), rDi; \
-	XORQ rCu, rDa;         \
-	XORQ _ki(iState), rCi; \
-	XORQ _mi(iState), rDi; \
-	XORQ rDi, rCi;         \
-	                       \
-	MOVQ rCi, rDe;         \
-	ROLQ $1, rDe;          \
-	                       \
-	MOVQ _bo(iState), rCo; \
-	XORQ _go(iState), rDo; \
-	XORQ rCa, rDe;         \
-	XORQ _ko(iState), rCo; \
-	XORQ _mo(iState), rDo; \
-	XORQ rDo, rCo;         \
-	                       \
-	MOVQ rCo, rDi;         \
-	ROLQ $1, rDi;          \
-	                       \
-	MOVQ rCu, rDo;         \
-	XORQ rCe, rDi;         \
-	ROLQ $1, rDo;          \
-	                       \
-	MOVQ rCa, rDu;         \
-	XORQ rCi, rDo;         \
-	ROLQ $1, rDu;          \
-	                       \
-	/* Result b */         \
-	MOVQ _ba(iState), rBa; \
-	MOVQ _ge(iState), rBe; \
-	XORQ rCo, rDu;         \
-	MOVQ _ki(iState), rBi; \
-	MOVQ _mo(iState), rBo; \
-	MOVQ _su(iState), rBu; \
-	XORQ rDe, rBe;         \
-	ROLQ $44, rBe;         \
-	XORQ rDi, rBi;         \
-	XORQ rDa, rBa;         \
-	ROLQ $43, rBi;         \
-	                       \
-	MOVQ rBe, rCa;         \
-	MOVQ rc, rT1;          \
-	ORQ  rBi, rCa;         \
-	XORQ rBa, rT1;         \
-	XORQ rT1, rCa;         \
-	MOVQ rCa, _ba(oState); \
-	                       \
-	XORQ rDu, rBu;         \
-	ROLQ $14, rBu;         \
-	MOVQ rBa, rCu;         \
-	ANDQ rBe, rCu;         \
-	XORQ rBu, rCu;         \
-	MOVQ rCu, _bu(oState); \
-	                       \
-	XORQ rDo, rBo;         \
-	ROLQ $21, rBo;         \
-	MOVQ rBo, rT1;         \
-	ANDQ rBu, rT1;         \
-	XORQ rBi, rT1;         \
-	MOVQ rT1, _bi(oState); \
-	                       \
-	NOTQ rBi;              \
-	ORQ  rBa, rBu;         \
-	ORQ  rBo, rBi;         \
-	XORQ rBo, rBu;         \
-	XORQ rBe, rBi;         \
-	MOVQ rBu, _bo(oState); \
-	MOVQ rBi, _be(oState); \
-	B_RBI_RCE;             \
-	                       \
-	/* Result g */         \
-	MOVQ _gu(iState), rBe; \
-	XORQ rDu, rBe;         \
-	MOVQ _ka(iState), rBi; \
-	ROLQ $20, rBe;         \
-	XORQ rDa, rBi;         \
-	ROLQ $3, rBi;          \
-	MOVQ _bo(iState), rBa; \
-	MOVQ rBe, rT1;         \
-	ORQ  rBi, rT1;         \
-	XORQ rDo, rBa;         \
-	MOVQ _me(iState), rBo; \
-	MOVQ _si(iState), rBu; \
-	ROLQ $28, rBa;         \
-	XORQ rBa, rT1;         \
-	MOVQ rT1, _ga(oState); \
-	G_RT1_RCA;             \
-	                       \
-	XORQ rDe, rBo;         \
-	ROLQ $45, rBo;         \
-	MOVQ rBi, rT1;         \
-	ANDQ rBo, rT1;         \
-	XORQ rBe, rT1;         \
-	MOVQ rT1, _ge(oState); \
-	G_RT1_RCE;             \
-	                       \
-	XORQ rDi, rBu;         \
-	ROLQ $61, rBu;         \
-	MOVQ rBu, rT1;         \
-	ORQ  rBa, rT1;         \
-	XORQ rBo, rT1;         \
-	MOVQ rT1, _go(oState); \
-	                       \
-	ANDQ rBe, rBa;         \
-	XORQ rBu, rBa;         \
-	MOVQ rBa, _gu(oState); \
-	NOTQ rBu;              \
-	G_RBA_RCU;             \
-	                       \
-	ORQ  rBu, rBo;         \
-	XORQ rBi, rBo;         \
-	MOVQ rBo, _gi(oState); \
-	                       \
-	/* Result k */         \
-	MOVQ _be(iState), rBa; \
-	MOVQ _gi(iState), rBe; \
-	MOVQ _ko(iState), rBi; \
-	MOVQ _mu(iState), rBo; \
-	MOVQ _sa(iState), rBu; \
-	XORQ rDi, rBe;         \
-	ROLQ $6, rBe;          \
-	XORQ rDo, rBi;         \
-	ROLQ $25, rBi;         \
-	MOVQ rBe, rT1;         \
-	ORQ  rBi, rT1;         \
-	XORQ rDe, rBa;         \
-	ROLQ $1, rBa;          \
-	XORQ rBa, rT1;         \
-	MOVQ rT1, _ka(oState); \
-	K_RT1_RCA;             \
-	                       \
-	XORQ rDu, rBo;         \
-	ROLQ $8, rBo;          \
-	MOVQ rBi, rT1;         \
-	ANDQ rBo, rT1;         \
-	XORQ rBe, rT1;         \
-	MOVQ rT1, _ke(oState); \
-	K_RT1_RCE;             \
-	                       \
-	XORQ rDa, rBu;         \
-	ROLQ $18, rBu;         \
-	NOTQ rBo;              \
-	MOVQ rBo, rT1;         \
-	ANDQ rBu, rT1;         \
-	XORQ rBi, rT1;         \
-	MOVQ rT1, _ki(oState); \
-	                       \
-	MOVQ rBu, rT1;         \
-	ORQ  rBa, rT1;         \
-	XORQ rBo, rT1;         \
-	MOVQ rT1, _ko(oState); \
-	                       \
-	ANDQ rBe, rBa;         \
-	XORQ rBu, rBa;         \
-	MOVQ rBa, _ku(oState); \
-	K_RBA_RCU;             \
-	                       \
-	/* Result m */         \
-	MOVQ _ga(iState), rBe; \
-	XORQ rDa, rBe;         \
-	MOVQ _ke(iState), rBi; \
-	ROLQ $36, rBe;         \
-	XORQ rDe, rBi;         \
-	MOVQ _bu(iState), rBa; \
-	ROLQ $10, rBi;         \
-	MOVQ rBe, rT1;         \
-	MOVQ _mi(iState), rBo; \
-	ANDQ rBi, rT1;         \
-	XORQ rDu, rBa;         \
-	MOVQ _so(iState), rBu; \
-	ROLQ $27, rBa;         \
-	XORQ rBa, rT1;         \
-	MOVQ rT1, _ma(oState); \
-	M_RT1_RCA;             \
-	                       \
-	XORQ rDi, rBo;         \
-	ROLQ $15, rBo;         \
-	MOVQ rBi, rT1;         \
-	ORQ  rBo, rT1;         \
-	XORQ rBe, rT1;         \
-	MOVQ rT1, _me(oState); \
-	M_RT1_RCE;             \
-	                       \
-	XORQ rDo, rBu;         \
-	ROLQ $56, rBu;         \
-	NOTQ rBo;              \
-	MOVQ rBo, rT1;         \
-	ORQ  rBu, rT1;         \
-	XORQ rBi, rT1;         \
-	MOVQ rT1, _mi(oState); \
-	                       \
-	ORQ  rBa, rBe;         \
-	XORQ rBu, rBe;         \
-	MOVQ rBe, _mu(oState); \
-	                       \
-	ANDQ rBa, rBu;         \
-	XORQ rBo, rBu;         \
-	MOVQ rBu, _mo(oState); \
-	M_RBE_RCU;             \
-	                       \
-	/* Result s */         \
-	MOVQ _bi(iState), rBa; \
-	MOVQ _go(iState), rBe; \
-	MOVQ _ku(iState), rBi; \
-	XORQ rDi, rBa;         \
-	MOVQ _ma(iState), rBo; \
-	ROLQ $62, rBa;         \
-	XORQ rDo, rBe;         \
-	MOVQ _se(iState), rBu; \
-	ROLQ $55, rBe;         \
-	                       \
-	XORQ rDu, rBi;         \
-	MOVQ rBa, rDu;         \
-	XORQ rDe, rBu;         \
-	ROLQ $2, rBu;          \
-	ANDQ rBe, rDu;         \
-	XORQ rBu, rDu;         \
-	MOVQ rDu, _su(oState); \
-	                       \
-	ROLQ $39, rBi;         \
-	S_RDU_RCU;             \
-	NOTQ rBe;              \
-	XORQ rDa, rBo;         \
-	MOVQ rBe, rDa;         \
-	ANDQ rBi, rDa;         \
-	XORQ rBa, rDa;         \
-	MOVQ rDa, _sa(oState); \
-	S_RDA_RCA;             \
-	                       \
-	ROLQ $41, rBo;         \
-	MOVQ rBi, rDe;         \
-	ORQ  rBo, rDe;         \
-	XORQ rBe, rDe;         \
-	MOVQ rDe, _se(oState); \
-	S_RDE_RCE;             \
-	                       \
-	MOVQ rBo, rDi;         \
-	MOVQ rBu, rDo;         \
-	ANDQ rBu, rDi;         \
-	ORQ  rBa, rDo;         \
-	XORQ rBi, rDi;         \
-	XORQ rBo, rDo;         \
-	MOVQ rDi, _si(oState); \
-	MOVQ rDo, _so(oState)  \
-
-// func keccakF1600(state *[25]uint64)
-TEXT ·keccakF1600(SB), 0, $200-8
-	MOVQ state+0(FP), rpState
-
-	// Convert the user state into an internal state
-	NOTQ _be(rpState)
-	NOTQ _bi(rpState)
-	NOTQ _go(rpState)
-	NOTQ _ki(rpState)
-	NOTQ _mi(rpState)
-	NOTQ _sa(rpState)
-
-	// Execute the KeccakF permutation
-	MOVQ _ba(rpState), rCa
-	MOVQ _be(rpState), rCe
-	MOVQ _bu(rpState), rCu
-
-	XORQ _ga(rpState), rCa
-	XORQ _ge(rpState), rCe
-	XORQ _gu(rpState), rCu
-
-	XORQ _ka(rpState), rCa
-	XORQ _ke(rpState), rCe
-	XORQ _ku(rpState), rCu
-
-	XORQ _ma(rpState), rCa
-	XORQ _me(rpState), rCe
-	XORQ _mu(rpState), rCu
-
-	XORQ _sa(rpState), rCa
-	XORQ _se(rpState), rCe
-	MOVQ _si(rpState), rDi
-	MOVQ _so(rpState), rDo
-	XORQ _su(rpState), rCu
-
-	mKeccakRound(rpState, rpStack, $0x0000000000000001, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x0000000000008082, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x800000000000808a, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000080008000, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x000000000000808b, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x0000000080000001, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x8000000080008081, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000000008009, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x000000000000008a, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x0000000000000088, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x0000000080008009, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x000000008000000a, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x000000008000808b, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x800000000000008b, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x8000000000008089, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000000008003, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x8000000000008002, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000000000080, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x000000000000800a, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x800000008000000a, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x8000000080008081, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000000008080, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpState, rpStack, $0x0000000080000001, MOVQ_RBI_RCE, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBA_RCU, XORQ_RT1_RCA, XORQ_RT1_RCE, XORQ_RBE_RCU, XORQ_RDU_RCU, XORQ_RDA_RCA, XORQ_RDE_RCE)
-	mKeccakRound(rpStack, rpState, $0x8000000080008008, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP, NOP)
-
-	// Revert the internal state to the user state
-	NOTQ _be(rpState)
-	NOTQ _bi(rpState)
-	NOTQ _go(rpState)
-	NOTQ _ki(rpState)
-	NOTQ _mi(rpState)
-	NOTQ _sa(rpState)
-
-	RET
diff --git a/installer/vendor/golang.org/x/crypto/sha3/register.go b/installer/vendor/golang.org/x/crypto/sha3/register.go
deleted file mode 100644
index 3cf6a22e09..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/register.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package sha3
-
-import (
-	"crypto"
-)
-
-func init() {
-	crypto.RegisterHash(crypto.SHA3_224, New224)
-	crypto.RegisterHash(crypto.SHA3_256, New256)
-	crypto.RegisterHash(crypto.SHA3_384, New384)
-	crypto.RegisterHash(crypto.SHA3_512, New512)
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/sha3.go b/installer/vendor/golang.org/x/crypto/sha3/sha3.go
deleted file mode 100644
index b12a35c87f..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/sha3.go
+++ /dev/null
@@ -1,192 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// spongeDirection indicates the direction bytes are flowing through the sponge.
-type spongeDirection int
-
-const (
-	// spongeAbsorbing indicates that the sponge is absorbing input.
-	spongeAbsorbing spongeDirection = iota
-	// spongeSqueezing indicates that the sponge is being squeezed.
-	spongeSqueezing
-)
-
-const (
-	// maxRate is the maximum size of the internal buffer. SHAKE-256
-	// currently needs the largest buffer.
-	maxRate = 168
-)
-
-type state struct {
-	// Generic sponge components.
-	a    [25]uint64 // main state of the hash
-	buf  []byte     // points into storage
-	rate int        // the number of bytes of state to use
-
-	// dsbyte contains the "domain separation" bits and the first bit of
-	// the padding. Sections 6.1 and 6.2 of [1] separate the outputs of the
-	// SHA-3 and SHAKE functions by appending bitstrings to the message.
-	// Using a little-endian bit-ordering convention, these are "01" for SHA-3
-	// and "1111" for SHAKE, or 00000010b and 00001111b, respectively. Then the
-	// padding rule from section 5.1 is applied to pad the message to a multiple
-	// of the rate, which involves adding a "1" bit, zero or more "0" bits, and
-	// a final "1" bit. We merge the first "1" bit from the padding into dsbyte,
-	// giving 00000110b (0x06) and 00011111b (0x1f).
-	// [1] http://csrc.nist.gov/publications/drafts/fips-202/fips_202_draft.pdf
-	//     "Draft FIPS 202: SHA-3 Standard: Permutation-Based Hash and
-	//      Extendable-Output Functions (May 2014)"
-	dsbyte  byte
-	storage [maxRate]byte
-
-	// Specific to SHA-3 and SHAKE.
-	outputLen int             // the default output size in bytes
-	state     spongeDirection // whether the sponge is absorbing or squeezing
-}
-
-// BlockSize returns the rate of sponge underlying this hash function.
-func (d *state) BlockSize() int { return d.rate }
-
-// Size returns the output size of the hash function in bytes.
-func (d *state) Size() int { return d.outputLen }
-
-// Reset clears the internal state by zeroing the sponge state and
-// the byte buffer, and setting Sponge.state to absorbing.
-func (d *state) Reset() {
-	// Zero the permutation's state.
-	for i := range d.a {
-		d.a[i] = 0
-	}
-	d.state = spongeAbsorbing
-	d.buf = d.storage[:0]
-}
-
-func (d *state) clone() *state {
-	ret := *d
-	if ret.state == spongeAbsorbing {
-		ret.buf = ret.storage[:len(ret.buf)]
-	} else {
-		ret.buf = ret.storage[d.rate-cap(d.buf) : d.rate]
-	}
-
-	return &ret
-}
-
-// permute applies the KeccakF-1600 permutation. It handles
-// any input-output buffering.
-func (d *state) permute() {
-	switch d.state {
-	case spongeAbsorbing:
-		// If we're absorbing, we need to xor the input into the state
-		// before applying the permutation.
-		xorIn(d, d.buf)
-		d.buf = d.storage[:0]
-		keccakF1600(&d.a)
-	case spongeSqueezing:
-		// If we're squeezing, we need to apply the permutatin before
-		// copying more output.
-		keccakF1600(&d.a)
-		d.buf = d.storage[:d.rate]
-		copyOut(d, d.buf)
-	}
-}
-
-// pads appends the domain separation bits in dsbyte, applies
-// the multi-bitrate 10..1 padding rule, and permutes the state.
-func (d *state) padAndPermute(dsbyte byte) {
-	if d.buf == nil {
-		d.buf = d.storage[:0]
-	}
-	// Pad with this instance's domain-separator bits. We know that there's
-	// at least one byte of space in d.buf because, if it were full,
-	// permute would have been called to empty it. dsbyte also contains the
-	// first one bit for the padding. See the comment in the state struct.
-	d.buf = append(d.buf, dsbyte)
-	zerosStart := len(d.buf)
-	d.buf = d.storage[:d.rate]
-	for i := zerosStart; i < d.rate; i++ {
-		d.buf[i] = 0
-	}
-	// This adds the final one bit for the padding. Because of the way that
-	// bits are numbered from the LSB upwards, the final bit is the MSB of
-	// the last byte.
-	d.buf[d.rate-1] ^= 0x80
-	// Apply the permutation
-	d.permute()
-	d.state = spongeSqueezing
-	d.buf = d.storage[:d.rate]
-	copyOut(d, d.buf)
-}
-
-// Write absorbs more data into the hash's state. It produces an error
-// if more data is written to the ShakeHash after writing
-func (d *state) Write(p []byte) (written int, err error) {
-	if d.state != spongeAbsorbing {
-		panic("sha3: write to sponge after read")
-	}
-	if d.buf == nil {
-		d.buf = d.storage[:0]
-	}
-	written = len(p)
-
-	for len(p) > 0 {
-		if len(d.buf) == 0 && len(p) >= d.rate {
-			// The fast path; absorb a full "rate" bytes of input and apply the permutation.
-			xorIn(d, p[:d.rate])
-			p = p[d.rate:]
-			keccakF1600(&d.a)
-		} else {
-			// The slow path; buffer the input until we can fill the sponge, and then xor it in.
-			todo := d.rate - len(d.buf)
-			if todo > len(p) {
-				todo = len(p)
-			}
-			d.buf = append(d.buf, p[:todo]...)
-			p = p[todo:]
-
-			// If the sponge is full, apply the permutation.
-			if len(d.buf) == d.rate {
-				d.permute()
-			}
-		}
-	}
-
-	return
-}
-
-// Read squeezes an arbitrary number of bytes from the sponge.
-func (d *state) Read(out []byte) (n int, err error) {
-	// If we're still absorbing, pad and apply the permutation.
-	if d.state == spongeAbsorbing {
-		d.padAndPermute(d.dsbyte)
-	}
-
-	n = len(out)
-
-	// Now, do the squeezing.
-	for len(out) > 0 {
-		n := copy(out, d.buf)
-		d.buf = d.buf[n:]
-		out = out[n:]
-
-		// Apply the permutation if we've squeezed the sponge dry.
-		if len(d.buf) == 0 {
-			d.permute()
-		}
-	}
-
-	return
-}
-
-// Sum applies padding to the hash state and then squeezes out the desired
-// number of output bytes.
-func (d *state) Sum(in []byte) []byte {
-	// Make a copy of the original hash so that caller can keep writing
-	// and summing.
-	dup := d.clone()
-	hash := make([]byte, dup.outputLen)
-	dup.Read(hash)
-	return append(in, hash...)
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/sha3_test.go b/installer/vendor/golang.org/x/crypto/sha3/sha3_test.go
deleted file mode 100644
index 312e8f9077..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/sha3_test.go
+++ /dev/null
@@ -1,311 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// Tests include all the ShortMsgKATs provided by the Keccak team at
-// https://github.com/gvanas/KeccakCodePackage
-//
-// They only include the zero-bit case of the bitwise testvectors
-// published by NIST in the draft of FIPS-202.
-
-import (
-	"bytes"
-	"compress/flate"
-	"encoding/hex"
-	"encoding/json"
-	"fmt"
-	"hash"
-	"os"
-	"strings"
-	"testing"
-)
-
-const (
-	testString  = "brekeccakkeccak koax koax"
-	katFilename = "testdata/keccakKats.json.deflate"
-)
-
-// Internal-use instances of SHAKE used to test against KATs.
-func newHashShake128() hash.Hash {
-	return &state{rate: 168, dsbyte: 0x1f, outputLen: 512}
-}
-func newHashShake256() hash.Hash {
-	return &state{rate: 136, dsbyte: 0x1f, outputLen: 512}
-}
-
-// testDigests contains functions returning hash.Hash instances
-// with output-length equal to the KAT length for both SHA-3 and
-// SHAKE instances.
-var testDigests = map[string]func() hash.Hash{
-	"SHA3-224": New224,
-	"SHA3-256": New256,
-	"SHA3-384": New384,
-	"SHA3-512": New512,
-	"SHAKE128": newHashShake128,
-	"SHAKE256": newHashShake256,
-}
-
-// testShakes contains functions that return ShakeHash instances for
-// testing the ShakeHash-specific interface.
-var testShakes = map[string]func() ShakeHash{
-	"SHAKE128": NewShake128,
-	"SHAKE256": NewShake256,
-}
-
-// decodeHex converts a hex-encoded string into a raw byte string.
-func decodeHex(s string) []byte {
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-// structs used to marshal JSON test-cases.
-type KeccakKats struct {
-	Kats map[string][]struct {
-		Digest  string `json:"digest"`
-		Length  int64  `json:"length"`
-		Message string `json:"message"`
-	}
-}
-
-func testUnalignedAndGeneric(t *testing.T, testf func(impl string)) {
-	xorInOrig, copyOutOrig := xorIn, copyOut
-	xorIn, copyOut = xorInGeneric, copyOutGeneric
-	testf("generic")
-	if xorImplementationUnaligned != "generic" {
-		xorIn, copyOut = xorInUnaligned, copyOutUnaligned
-		testf("unaligned")
-	}
-	xorIn, copyOut = xorInOrig, copyOutOrig
-}
-
-// TestKeccakKats tests the SHA-3 and Shake implementations against all the
-// ShortMsgKATs from https://github.com/gvanas/KeccakCodePackage
-// (The testvectors are stored in keccakKats.json.deflate due to their length.)
-func TestKeccakKats(t *testing.T) {
-	testUnalignedAndGeneric(t, func(impl string) {
-		// Read the KATs.
-		deflated, err := os.Open(katFilename)
-		if err != nil {
-			t.Errorf("error opening %s: %s", katFilename, err)
-		}
-		file := flate.NewReader(deflated)
-		dec := json.NewDecoder(file)
-		var katSet KeccakKats
-		err = dec.Decode(&katSet)
-		if err != nil {
-			t.Errorf("error decoding KATs: %s", err)
-		}
-
-		// Do the KATs.
-		for functionName, kats := range katSet.Kats {
-			d := testDigests[functionName]()
-			for _, kat := range kats {
-				d.Reset()
-				in, err := hex.DecodeString(kat.Message)
-				if err != nil {
-					t.Errorf("error decoding KAT: %s", err)
-				}
-				d.Write(in[:kat.Length/8])
-				got := strings.ToUpper(hex.EncodeToString(d.Sum(nil)))
-				if got != kat.Digest {
-					t.Errorf("function=%s, implementation=%s, length=%d\nmessage:\n  %s\ngot:\n  %s\nwanted:\n %s",
-						functionName, impl, kat.Length, kat.Message, got, kat.Digest)
-					t.Logf("wanted %+v", kat)
-					t.FailNow()
-				}
-				continue
-			}
-		}
-	})
-}
-
-// TestUnalignedWrite tests that writing data in an arbitrary pattern with
-// small input buffers.
-func testUnalignedWrite(t *testing.T) {
-	testUnalignedAndGeneric(t, func(impl string) {
-		buf := sequentialBytes(0x10000)
-		for alg, df := range testDigests {
-			d := df()
-			d.Reset()
-			d.Write(buf)
-			want := d.Sum(nil)
-			d.Reset()
-			for i := 0; i < len(buf); {
-				// Cycle through offsets which make a 137 byte sequence.
-				// Because 137 is prime this sequence should exercise all corner cases.
-				offsets := [17]int{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 1}
-				for _, j := range offsets {
-					if v := len(buf) - i; v < j {
-						j = v
-					}
-					d.Write(buf[i : i+j])
-					i += j
-				}
-			}
-			got := d.Sum(nil)
-			if !bytes.Equal(got, want) {
-				t.Errorf("Unaligned writes, implementation=%s, alg=%s\ngot %q, want %q", impl, alg, got, want)
-			}
-		}
-	})
-}
-
-// TestAppend checks that appending works when reallocation is necessary.
-func TestAppend(t *testing.T) {
-	testUnalignedAndGeneric(t, func(impl string) {
-		d := New224()
-
-		for capacity := 2; capacity <= 66; capacity += 64 {
-			// The first time around the loop, Sum will have to reallocate.
-			// The second time, it will not.
-			buf := make([]byte, 2, capacity)
-			d.Reset()
-			d.Write([]byte{0xcc})
-			buf = d.Sum(buf)
-			expected := "0000DF70ADC49B2E76EEE3A6931B93FA41841C3AF2CDF5B32A18B5478C39"
-			if got := strings.ToUpper(hex.EncodeToString(buf)); got != expected {
-				t.Errorf("got %s, want %s", got, expected)
-			}
-		}
-	})
-}
-
-// TestAppendNoRealloc tests that appending works when no reallocation is necessary.
-func TestAppendNoRealloc(t *testing.T) {
-	testUnalignedAndGeneric(t, func(impl string) {
-		buf := make([]byte, 1, 200)
-		d := New224()
-		d.Write([]byte{0xcc})
-		buf = d.Sum(buf)
-		expected := "00DF70ADC49B2E76EEE3A6931B93FA41841C3AF2CDF5B32A18B5478C39"
-		if got := strings.ToUpper(hex.EncodeToString(buf)); got != expected {
-			t.Errorf("%s: got %s, want %s", impl, got, expected)
-		}
-	})
-}
-
-// TestSqueezing checks that squeezing the full output a single time produces
-// the same output as repeatedly squeezing the instance.
-func TestSqueezing(t *testing.T) {
-	testUnalignedAndGeneric(t, func(impl string) {
-		for functionName, newShakeHash := range testShakes {
-			d0 := newShakeHash()
-			d0.Write([]byte(testString))
-			ref := make([]byte, 32)
-			d0.Read(ref)
-
-			d1 := newShakeHash()
-			d1.Write([]byte(testString))
-			var multiple []byte
-			for _ = range ref {
-				one := make([]byte, 1)
-				d1.Read(one)
-				multiple = append(multiple, one...)
-			}
-			if !bytes.Equal(ref, multiple) {
-				t.Errorf("%s (%s): squeezing %d bytes one at a time failed", functionName, impl, len(ref))
-			}
-		}
-	})
-}
-
-// sequentialBytes produces a buffer of size consecutive bytes 0x00, 0x01, ..., used for testing.
-func sequentialBytes(size int) []byte {
-	result := make([]byte, size)
-	for i := range result {
-		result[i] = byte(i)
-	}
-	return result
-}
-
-// BenchmarkPermutationFunction measures the speed of the permutation function
-// with no input data.
-func BenchmarkPermutationFunction(b *testing.B) {
-	b.SetBytes(int64(200))
-	var lanes [25]uint64
-	for i := 0; i < b.N; i++ {
-		keccakF1600(&lanes)
-	}
-}
-
-// benchmarkHash tests the speed to hash num buffers of buflen each.
-func benchmarkHash(b *testing.B, h hash.Hash, size, num int) {
-	b.StopTimer()
-	h.Reset()
-	data := sequentialBytes(size)
-	b.SetBytes(int64(size * num))
-	b.StartTimer()
-
-	var state []byte
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < num; j++ {
-			h.Write(data)
-		}
-		state = h.Sum(state[:0])
-	}
-	b.StopTimer()
-	h.Reset()
-}
-
-// benchmarkShake is specialized to the Shake instances, which don't
-// require a copy on reading output.
-func benchmarkShake(b *testing.B, h ShakeHash, size, num int) {
-	b.StopTimer()
-	h.Reset()
-	data := sequentialBytes(size)
-	d := make([]byte, 32)
-
-	b.SetBytes(int64(size * num))
-	b.StartTimer()
-
-	for i := 0; i < b.N; i++ {
-		h.Reset()
-		for j := 0; j < num; j++ {
-			h.Write(data)
-		}
-		h.Read(d)
-	}
-}
-
-func BenchmarkSha3_512_MTU(b *testing.B) { benchmarkHash(b, New512(), 1350, 1) }
-func BenchmarkSha3_384_MTU(b *testing.B) { benchmarkHash(b, New384(), 1350, 1) }
-func BenchmarkSha3_256_MTU(b *testing.B) { benchmarkHash(b, New256(), 1350, 1) }
-func BenchmarkSha3_224_MTU(b *testing.B) { benchmarkHash(b, New224(), 1350, 1) }
-
-func BenchmarkShake128_MTU(b *testing.B)  { benchmarkShake(b, NewShake128(), 1350, 1) }
-func BenchmarkShake256_MTU(b *testing.B)  { benchmarkShake(b, NewShake256(), 1350, 1) }
-func BenchmarkShake256_16x(b *testing.B)  { benchmarkShake(b, NewShake256(), 16, 1024) }
-func BenchmarkShake256_1MiB(b *testing.B) { benchmarkShake(b, NewShake256(), 1024, 1024) }
-
-func BenchmarkSha3_512_1MiB(b *testing.B) { benchmarkHash(b, New512(), 1024, 1024) }
-
-func Example_sum() {
-	buf := []byte("some data to hash")
-	// A hash needs to be 64 bytes long to have 256-bit collision resistance.
-	h := make([]byte, 64)
-	// Compute a 64-byte hash of buf and put it in h.
-	ShakeSum256(h, buf)
-	fmt.Printf("%x\n", h)
-	// Output: 0f65fe41fc353e52c55667bb9e2b27bfcc8476f2c413e9437d272ee3194a4e3146d05ec04a25d16b8f577c19b82d16b1424c3e022e783d2b4da98de3658d363d
-}
-
-func Example_mac() {
-	k := []byte("this is a secret key; you should generate a strong random key that's at least 32 bytes long")
-	buf := []byte("and this is some data to authenticate")
-	// A MAC with 32 bytes of output has 256-bit security strength -- if you use at least a 32-byte-long key.
-	h := make([]byte, 32)
-	d := NewShake256()
-	// Write the key into the hash.
-	d.Write(k)
-	// Now write the data.
-	d.Write(buf)
-	// Read 32 bytes of output from the hash into h.
-	d.Read(h)
-	fmt.Printf("%x\n", h)
-	// Output: 78de2974bd2711d5549ffd32b753ef0f5fa80a0db2556db60f0987eb8a9218ff
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/shake.go b/installer/vendor/golang.org/x/crypto/sha3/shake.go
deleted file mode 100644
index 841f9860f0..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/shake.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-// This file defines the ShakeHash interface, and provides
-// functions for creating SHAKE instances, as well as utility
-// functions for hashing bytes to arbitrary-length output.
-
-import (
-	"io"
-)
-
-// ShakeHash defines the interface to hash functions that
-// support arbitrary-length output.
-type ShakeHash interface {
-	// Write absorbs more data into the hash's state. It panics if input is
-	// written to it after output has been read from it.
-	io.Writer
-
-	// Read reads more output from the hash; reading affects the hash's
-	// state. (ShakeHash.Read is thus very different from Hash.Sum)
-	// It never returns an error.
-	io.Reader
-
-	// Clone returns a copy of the ShakeHash in its current state.
-	Clone() ShakeHash
-
-	// Reset resets the ShakeHash to its initial state.
-	Reset()
-}
-
-func (d *state) Clone() ShakeHash {
-	return d.clone()
-}
-
-// NewShake128 creates a new SHAKE128 variable-output-length ShakeHash.
-// Its generic security strength is 128 bits against all attacks if at
-// least 32 bytes of its output are used.
-func NewShake128() ShakeHash { return &state{rate: 168, dsbyte: 0x1f} }
-
-// NewShake256 creates a new SHAKE128 variable-output-length ShakeHash.
-// Its generic security strength is 256 bits against all attacks if
-// at least 64 bytes of its output are used.
-func NewShake256() ShakeHash { return &state{rate: 136, dsbyte: 0x1f} }
-
-// ShakeSum128 writes an arbitrary-length digest of data into hash.
-func ShakeSum128(hash, data []byte) {
-	h := NewShake128()
-	h.Write(data)
-	h.Read(hash)
-}
-
-// ShakeSum256 writes an arbitrary-length digest of data into hash.
-func ShakeSum256(hash, data []byte) {
-	h := NewShake256()
-	h.Write(data)
-	h.Read(hash)
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/testdata/keccakKats.json.deflate b/installer/vendor/golang.org/x/crypto/sha3/testdata/keccakKats.json.deflate
deleted file mode 100644
index 62e85ae242..0000000000
Binary files a/installer/vendor/golang.org/x/crypto/sha3/testdata/keccakKats.json.deflate and /dev/null differ
diff --git a/installer/vendor/golang.org/x/crypto/sha3/xor.go b/installer/vendor/golang.org/x/crypto/sha3/xor.go
deleted file mode 100644
index 46a0d63a6d..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/xor.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64,!386,!ppc64le appengine
-
-package sha3
-
-var (
-	xorIn            = xorInGeneric
-	copyOut          = copyOutGeneric
-	xorInUnaligned   = xorInGeneric
-	copyOutUnaligned = copyOutGeneric
-)
-
-const xorImplementationUnaligned = "generic"
diff --git a/installer/vendor/golang.org/x/crypto/sha3/xor_generic.go b/installer/vendor/golang.org/x/crypto/sha3/xor_generic.go
deleted file mode 100644
index fd35f02ef6..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/xor_generic.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package sha3
-
-import "encoding/binary"
-
-// xorInGeneric xors the bytes in buf into the state; it
-// makes no non-portable assumptions about memory layout
-// or alignment.
-func xorInGeneric(d *state, buf []byte) {
-	n := len(buf) / 8
-
-	for i := 0; i < n; i++ {
-		a := binary.LittleEndian.Uint64(buf)
-		d.a[i] ^= a
-		buf = buf[8:]
-	}
-}
-
-// copyOutGeneric copies ulint64s to a byte buffer.
-func copyOutGeneric(d *state, b []byte) {
-	for i := 0; len(b) >= 8; i++ {
-		binary.LittleEndian.PutUint64(b, d.a[i])
-		b = b[8:]
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/sha3/xor_unaligned.go b/installer/vendor/golang.org/x/crypto/sha3/xor_unaligned.go
deleted file mode 100644
index 929a486a79..0000000000
--- a/installer/vendor/golang.org/x/crypto/sha3/xor_unaligned.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64 386 ppc64le
-// +build !appengine
-
-package sha3
-
-import "unsafe"
-
-func xorInUnaligned(d *state, buf []byte) {
-	bw := (*[maxRate / 8]uint64)(unsafe.Pointer(&buf[0]))
-	n := len(buf)
-	if n >= 72 {
-		d.a[0] ^= bw[0]
-		d.a[1] ^= bw[1]
-		d.a[2] ^= bw[2]
-		d.a[3] ^= bw[3]
-		d.a[4] ^= bw[4]
-		d.a[5] ^= bw[5]
-		d.a[6] ^= bw[6]
-		d.a[7] ^= bw[7]
-		d.a[8] ^= bw[8]
-	}
-	if n >= 104 {
-		d.a[9] ^= bw[9]
-		d.a[10] ^= bw[10]
-		d.a[11] ^= bw[11]
-		d.a[12] ^= bw[12]
-	}
-	if n >= 136 {
-		d.a[13] ^= bw[13]
-		d.a[14] ^= bw[14]
-		d.a[15] ^= bw[15]
-		d.a[16] ^= bw[16]
-	}
-	if n >= 144 {
-		d.a[17] ^= bw[17]
-	}
-	if n >= 168 {
-		d.a[18] ^= bw[18]
-		d.a[19] ^= bw[19]
-		d.a[20] ^= bw[20]
-	}
-}
-
-func copyOutUnaligned(d *state, buf []byte) {
-	ab := (*[maxRate]uint8)(unsafe.Pointer(&d.a[0]))
-	copy(buf, ab[:])
-}
-
-var (
-	xorIn   = xorInUnaligned
-	copyOut = copyOutUnaligned
-)
-
-const xorImplementationUnaligned = "unaligned"
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/client.go b/installer/vendor/golang.org/x/crypto/ssh/agent/client.go
deleted file mode 100644
index dce7682fae..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/client.go
+++ /dev/null
@@ -1,683 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package agent implements the ssh-agent protocol, and provides both
-// a client and a server. The client can talk to a standard ssh-agent
-// that uses UNIX sockets, and one could implement an alternative
-// ssh-agent process using the sample server.
-//
-// References:
-//  [PROTOCOL.agent]:    http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.agent?rev=HEAD
-package agent // import "golang.org/x/crypto/ssh/agent"
-
-import (
-	"bytes"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"encoding/base64"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"sync"
-
-	"golang.org/x/crypto/ed25519"
-	"golang.org/x/crypto/ssh"
-)
-
-// Agent represents the capabilities of an ssh-agent.
-type Agent interface {
-	// List returns the identities known to the agent.
-	List() ([]*Key, error)
-
-	// Sign has the agent sign the data using a protocol 2 key as defined
-	// in [PROTOCOL.agent] section 2.6.2.
-	Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error)
-
-	// Add adds a private key to the agent.
-	Add(key AddedKey) error
-
-	// Remove removes all identities with the given public key.
-	Remove(key ssh.PublicKey) error
-
-	// RemoveAll removes all identities.
-	RemoveAll() error
-
-	// Lock locks the agent. Sign and Remove will fail, and List will empty an empty list.
-	Lock(passphrase []byte) error
-
-	// Unlock undoes the effect of Lock
-	Unlock(passphrase []byte) error
-
-	// Signers returns signers for all the known keys.
-	Signers() ([]ssh.Signer, error)
-}
-
-// ConstraintExtension describes an optional constraint defined by users.
-type ConstraintExtension struct {
-	// ExtensionName consist of a UTF-8 string suffixed by the
-	// implementation domain following the naming scheme defined
-	// in Section 4.2 of [RFC4251], e.g.  "foo@example.com".
-	ExtensionName string
-	// ExtensionDetails contains the actual content of the extended
-	// constraint.
-	ExtensionDetails []byte
-}
-
-// AddedKey describes an SSH key to be added to an Agent.
-type AddedKey struct {
-	// PrivateKey must be a *rsa.PrivateKey, *dsa.PrivateKey or
-	// *ecdsa.PrivateKey, which will be inserted into the agent.
-	PrivateKey interface{}
-	// Certificate, if not nil, is communicated to the agent and will be
-	// stored with the key.
-	Certificate *ssh.Certificate
-	// Comment is an optional, free-form string.
-	Comment string
-	// LifetimeSecs, if not zero, is the number of seconds that the
-	// agent will store the key for.
-	LifetimeSecs uint32
-	// ConfirmBeforeUse, if true, requests that the agent confirm with the
-	// user before each use of this key.
-	ConfirmBeforeUse bool
-	// ConstraintExtensions are the experimental or private-use constraints
-	// defined by users.
-	ConstraintExtensions []ConstraintExtension
-}
-
-// See [PROTOCOL.agent], section 3.
-const (
-	agentRequestV1Identities   = 1
-	agentRemoveAllV1Identities = 9
-
-	// 3.2 Requests from client to agent for protocol 2 key operations
-	agentAddIdentity         = 17
-	agentRemoveIdentity      = 18
-	agentRemoveAllIdentities = 19
-	agentAddIdConstrained    = 25
-
-	// 3.3 Key-type independent requests from client to agent
-	agentAddSmartcardKey            = 20
-	agentRemoveSmartcardKey         = 21
-	agentLock                       = 22
-	agentUnlock                     = 23
-	agentAddSmartcardKeyConstrained = 26
-
-	// 3.7 Key constraint identifiers
-	agentConstrainLifetime  = 1
-	agentConstrainConfirm   = 2
-	agentConstrainExtension = 3
-)
-
-// maxAgentResponseBytes is the maximum agent reply size that is accepted. This
-// is a sanity check, not a limit in the spec.
-const maxAgentResponseBytes = 16 << 20
-
-// Agent messages:
-// These structures mirror the wire format of the corresponding ssh agent
-// messages found in [PROTOCOL.agent].
-
-// 3.4 Generic replies from agent to client
-const agentFailure = 5
-
-type failureAgentMsg struct{}
-
-const agentSuccess = 6
-
-type successAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentRequestIdentities = 11
-
-type requestIdentitiesAgentMsg struct{}
-
-// See [PROTOCOL.agent], section 2.5.2.
-const agentIdentitiesAnswer = 12
-
-type identitiesAnswerAgentMsg struct {
-	NumKeys uint32 `sshtype:"12"`
-	Keys    []byte `ssh:"rest"`
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-const agentSignRequest = 13
-
-type signRequestAgentMsg struct {
-	KeyBlob []byte `sshtype:"13"`
-	Data    []byte
-	Flags   uint32
-}
-
-// See [PROTOCOL.agent], section 2.6.2.
-
-// 3.6 Replies from agent to client for protocol 2 key operations
-const agentSignResponse = 14
-
-type signResponseAgentMsg struct {
-	SigBlob []byte `sshtype:"14"`
-}
-
-type publicKey struct {
-	Format string
-	Rest   []byte `ssh:"rest"`
-}
-
-// 3.7 Key constraint identifiers
-type constrainLifetimeAgentMsg struct {
-	LifetimeSecs uint32 `sshtype:"1"`
-}
-
-type constrainExtensionAgentMsg struct {
-	ExtensionName    string `sshtype:"3"`
-	ExtensionDetails []byte
-
-	// Rest is a field used for parsing, not part of message
-	Rest []byte `ssh:"rest"`
-}
-
-// Key represents a protocol 2 public key as defined in
-// [PROTOCOL.agent], section 2.5.2.
-type Key struct {
-	Format  string
-	Blob    []byte
-	Comment string
-}
-
-func clientErr(err error) error {
-	return fmt.Errorf("agent: client error: %v", err)
-}
-
-// String returns the storage form of an agent key with the format, base64
-// encoded serialized key, and the comment if it is not empty.
-func (k *Key) String() string {
-	s := string(k.Format) + " " + base64.StdEncoding.EncodeToString(k.Blob)
-
-	if k.Comment != "" {
-		s += " " + k.Comment
-	}
-
-	return s
-}
-
-// Type returns the public key type.
-func (k *Key) Type() string {
-	return k.Format
-}
-
-// Marshal returns key blob to satisfy the ssh.PublicKey interface.
-func (k *Key) Marshal() []byte {
-	return k.Blob
-}
-
-// Verify satisfies the ssh.PublicKey interface.
-func (k *Key) Verify(data []byte, sig *ssh.Signature) error {
-	pubKey, err := ssh.ParsePublicKey(k.Blob)
-	if err != nil {
-		return fmt.Errorf("agent: bad public key: %v", err)
-	}
-	return pubKey.Verify(data, sig)
-}
-
-type wireKey struct {
-	Format string
-	Rest   []byte `ssh:"rest"`
-}
-
-func parseKey(in []byte) (out *Key, rest []byte, err error) {
-	var record struct {
-		Blob    []byte
-		Comment string
-		Rest    []byte `ssh:"rest"`
-	}
-
-	if err := ssh.Unmarshal(in, &record); err != nil {
-		return nil, nil, err
-	}
-
-	var wk wireKey
-	if err := ssh.Unmarshal(record.Blob, &wk); err != nil {
-		return nil, nil, err
-	}
-
-	return &Key{
-		Format:  wk.Format,
-		Blob:    record.Blob,
-		Comment: record.Comment,
-	}, record.Rest, nil
-}
-
-// client is a client for an ssh-agent process.
-type client struct {
-	// conn is typically a *net.UnixConn
-	conn io.ReadWriter
-	// mu is used to prevent concurrent access to the agent
-	mu sync.Mutex
-}
-
-// NewClient returns an Agent that talks to an ssh-agent process over
-// the given connection.
-func NewClient(rw io.ReadWriter) Agent {
-	return &client{conn: rw}
-}
-
-// call sends an RPC to the agent. On success, the reply is
-// unmarshaled into reply and replyType is set to the first byte of
-// the reply, which contains the type of the message.
-func (c *client) call(req []byte) (reply interface{}, err error) {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-
-	msg := make([]byte, 4+len(req))
-	binary.BigEndian.PutUint32(msg, uint32(len(req)))
-	copy(msg[4:], req)
-	if _, err = c.conn.Write(msg); err != nil {
-		return nil, clientErr(err)
-	}
-
-	var respSizeBuf [4]byte
-	if _, err = io.ReadFull(c.conn, respSizeBuf[:]); err != nil {
-		return nil, clientErr(err)
-	}
-	respSize := binary.BigEndian.Uint32(respSizeBuf[:])
-	if respSize > maxAgentResponseBytes {
-		return nil, clientErr(err)
-	}
-
-	buf := make([]byte, respSize)
-	if _, err = io.ReadFull(c.conn, buf); err != nil {
-		return nil, clientErr(err)
-	}
-	reply, err = unmarshal(buf)
-	if err != nil {
-		return nil, clientErr(err)
-	}
-	return reply, err
-}
-
-func (c *client) simpleCall(req []byte) error {
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-func (c *client) RemoveAll() error {
-	return c.simpleCall([]byte{agentRemoveAllIdentities})
-}
-
-func (c *client) Remove(key ssh.PublicKey) error {
-	req := ssh.Marshal(&agentRemoveIdentityMsg{
-		KeyBlob: key.Marshal(),
-	})
-	return c.simpleCall(req)
-}
-
-func (c *client) Lock(passphrase []byte) error {
-	req := ssh.Marshal(&agentLockMsg{
-		Passphrase: passphrase,
-	})
-	return c.simpleCall(req)
-}
-
-func (c *client) Unlock(passphrase []byte) error {
-	req := ssh.Marshal(&agentUnlockMsg{
-		Passphrase: passphrase,
-	})
-	return c.simpleCall(req)
-}
-
-// List returns the identities known to the agent.
-func (c *client) List() ([]*Key, error) {
-	// see [PROTOCOL.agent] section 2.5.2.
-	req := []byte{agentRequestIdentities}
-
-	msg, err := c.call(req)
-	if err != nil {
-		return nil, err
-	}
-
-	switch msg := msg.(type) {
-	case *identitiesAnswerAgentMsg:
-		if msg.NumKeys > maxAgentResponseBytes/8 {
-			return nil, errors.New("agent: too many keys in agent reply")
-		}
-		keys := make([]*Key, msg.NumKeys)
-		data := msg.Keys
-		for i := uint32(0); i < msg.NumKeys; i++ {
-			var key *Key
-			var err error
-			if key, data, err = parseKey(data); err != nil {
-				return nil, err
-			}
-			keys[i] = key
-		}
-		return keys, nil
-	case *failureAgentMsg:
-		return nil, errors.New("agent: failed to list keys")
-	}
-	panic("unreachable")
-}
-
-// Sign has the agent sign the data using a protocol 2 key as defined
-// in [PROTOCOL.agent] section 2.6.2.
-func (c *client) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
-	req := ssh.Marshal(signRequestAgentMsg{
-		KeyBlob: key.Marshal(),
-		Data:    data,
-	})
-
-	msg, err := c.call(req)
-	if err != nil {
-		return nil, err
-	}
-
-	switch msg := msg.(type) {
-	case *signResponseAgentMsg:
-		var sig ssh.Signature
-		if err := ssh.Unmarshal(msg.SigBlob, &sig); err != nil {
-			return nil, err
-		}
-
-		return &sig, nil
-	case *failureAgentMsg:
-		return nil, errors.New("agent: failed to sign challenge")
-	}
-	panic("unreachable")
-}
-
-// unmarshal parses an agent message in packet, returning the parsed
-// form and the message type of packet.
-func unmarshal(packet []byte) (interface{}, error) {
-	if len(packet) < 1 {
-		return nil, errors.New("agent: empty packet")
-	}
-	var msg interface{}
-	switch packet[0] {
-	case agentFailure:
-		return new(failureAgentMsg), nil
-	case agentSuccess:
-		return new(successAgentMsg), nil
-	case agentIdentitiesAnswer:
-		msg = new(identitiesAnswerAgentMsg)
-	case agentSignResponse:
-		msg = new(signResponseAgentMsg)
-	case agentV1IdentitiesAnswer:
-		msg = new(agentV1IdentityMsg)
-	default:
-		return nil, fmt.Errorf("agent: unknown type tag %d", packet[0])
-	}
-	if err := ssh.Unmarshal(packet, msg); err != nil {
-		return nil, err
-	}
-	return msg, nil
-}
-
-type rsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	N           *big.Int
-	E           *big.Int
-	D           *big.Int
-	Iqmp        *big.Int // IQMP = Inverse Q Mod P
-	P           *big.Int
-	Q           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type dsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	P           *big.Int
-	Q           *big.Int
-	G           *big.Int
-	Y           *big.Int
-	X           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaKeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	Curve       string
-	KeyBytes    []byte
-	D           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ed25519KeyMsg struct {
-	Type        string `sshtype:"17|25"`
-	Pub         []byte
-	Priv        []byte
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-// Insert adds a private key to the agent.
-func (c *client) insertKey(s interface{}, comment string, constraints []byte) error {
-	var req []byte
-	switch k := s.(type) {
-	case *rsa.PrivateKey:
-		if len(k.Primes) != 2 {
-			return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
-		}
-		k.Precompute()
-		req = ssh.Marshal(rsaKeyMsg{
-			Type:        ssh.KeyAlgoRSA,
-			N:           k.N,
-			E:           big.NewInt(int64(k.E)),
-			D:           k.D,
-			Iqmp:        k.Precomputed.Qinv,
-			P:           k.Primes[0],
-			Q:           k.Primes[1],
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *dsa.PrivateKey:
-		req = ssh.Marshal(dsaKeyMsg{
-			Type:        ssh.KeyAlgoDSA,
-			P:           k.P,
-			Q:           k.Q,
-			G:           k.G,
-			Y:           k.Y,
-			X:           k.X,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ecdsa.PrivateKey:
-		nistID := fmt.Sprintf("nistp%d", k.Params().BitSize)
-		req = ssh.Marshal(ecdsaKeyMsg{
-			Type:        "ecdsa-sha2-" + nistID,
-			Curve:       nistID,
-			KeyBytes:    elliptic.Marshal(k.Curve, k.X, k.Y),
-			D:           k.D,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519KeyMsg{
-			Type:        ssh.KeyAlgoED25519,
-			Pub:         []byte(*k)[32:],
-			Priv:        []byte(*k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	default:
-		return fmt.Errorf("agent: unsupported key type %T", s)
-	}
-
-	// if constraints are present then the message type needs to be changed.
-	if len(constraints) != 0 {
-		req[0] = agentAddIdConstrained
-	}
-
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-type rsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	D           *big.Int
-	Iqmp        *big.Int // IQMP = Inverse Q Mod P
-	P           *big.Int
-	Q           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type dsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	X           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ecdsaCertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	D           *big.Int
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-type ed25519CertMsg struct {
-	Type        string `sshtype:"17|25"`
-	CertBytes   []byte
-	Pub         []byte
-	Priv        []byte
-	Comments    string
-	Constraints []byte `ssh:"rest"`
-}
-
-// Add adds a private key to the agent. If a certificate is given,
-// that certificate is added instead as public key.
-func (c *client) Add(key AddedKey) error {
-	var constraints []byte
-
-	if secs := key.LifetimeSecs; secs != 0 {
-		constraints = append(constraints, ssh.Marshal(constrainLifetimeAgentMsg{secs})...)
-	}
-
-	if key.ConfirmBeforeUse {
-		constraints = append(constraints, agentConstrainConfirm)
-	}
-
-	if cert := key.Certificate; cert == nil {
-		return c.insertKey(key.PrivateKey, key.Comment, constraints)
-	} else {
-		return c.insertCert(key.PrivateKey, cert, key.Comment, constraints)
-	}
-}
-
-func (c *client) insertCert(s interface{}, cert *ssh.Certificate, comment string, constraints []byte) error {
-	var req []byte
-	switch k := s.(type) {
-	case *rsa.PrivateKey:
-		if len(k.Primes) != 2 {
-			return fmt.Errorf("agent: unsupported RSA key with %d primes", len(k.Primes))
-		}
-		k.Precompute()
-		req = ssh.Marshal(rsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			D:           k.D,
-			Iqmp:        k.Precomputed.Qinv,
-			P:           k.Primes[0],
-			Q:           k.Primes[1],
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *dsa.PrivateKey:
-		req = ssh.Marshal(dsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			X:           k.X,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ecdsa.PrivateKey:
-		req = ssh.Marshal(ecdsaCertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			D:           k.D,
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	case *ed25519.PrivateKey:
-		req = ssh.Marshal(ed25519CertMsg{
-			Type:        cert.Type(),
-			CertBytes:   cert.Marshal(),
-			Pub:         []byte(*k)[32:],
-			Priv:        []byte(*k),
-			Comments:    comment,
-			Constraints: constraints,
-		})
-	default:
-		return fmt.Errorf("agent: unsupported key type %T", s)
-	}
-
-	// if constraints are present then the message type needs to be changed.
-	if len(constraints) != 0 {
-		req[0] = agentAddIdConstrained
-	}
-
-	signer, err := ssh.NewSignerFromKey(s)
-	if err != nil {
-		return err
-	}
-	if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 {
-		return errors.New("agent: signer and cert have different public key")
-	}
-
-	resp, err := c.call(req)
-	if err != nil {
-		return err
-	}
-	if _, ok := resp.(*successAgentMsg); ok {
-		return nil
-	}
-	return errors.New("agent: failure")
-}
-
-// Signers provides a callback for client authentication.
-func (c *client) Signers() ([]ssh.Signer, error) {
-	keys, err := c.List()
-	if err != nil {
-		return nil, err
-	}
-
-	var result []ssh.Signer
-	for _, k := range keys {
-		result = append(result, &agentKeyringSigner{c, k})
-	}
-	return result, nil
-}
-
-type agentKeyringSigner struct {
-	agent *client
-	pub   ssh.PublicKey
-}
-
-func (s *agentKeyringSigner) PublicKey() ssh.PublicKey {
-	return s.pub
-}
-
-func (s *agentKeyringSigner) Sign(rand io.Reader, data []byte) (*ssh.Signature, error) {
-	// The agent has its own entropy source, so the rand argument is ignored.
-	return s.agent.Sign(s.pub, data)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/client_test.go b/installer/vendor/golang.org/x/crypto/ssh/agent/client_test.go
deleted file mode 100644
index 266fd6d404..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/client_test.go
+++ /dev/null
@@ -1,379 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"bytes"
-	"crypto/rand"
-	"errors"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strconv"
-	"testing"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// startOpenSSHAgent executes ssh-agent, and returns an Agent interface to it.
-func startOpenSSHAgent(t *testing.T) (client Agent, socket string, cleanup func()) {
-	if testing.Short() {
-		// ssh-agent is not always available, and the key
-		// types supported vary by platform.
-		t.Skip("skipping test due to -short")
-	}
-
-	bin, err := exec.LookPath("ssh-agent")
-	if err != nil {
-		t.Skip("could not find ssh-agent")
-	}
-
-	cmd := exec.Command(bin, "-s")
-	out, err := cmd.Output()
-	if err != nil {
-		t.Fatalf("cmd.Output: %v", err)
-	}
-
-	/* Output looks like:
-
-		   SSH_AUTH_SOCK=/tmp/ssh-P65gpcqArqvH/agent.15541; export SSH_AUTH_SOCK;
-	           SSH_AGENT_PID=15542; export SSH_AGENT_PID;
-	           echo Agent pid 15542;
-	*/
-	fields := bytes.Split(out, []byte(";"))
-	line := bytes.SplitN(fields[0], []byte("="), 2)
-	line[0] = bytes.TrimLeft(line[0], "\n")
-	if string(line[0]) != "SSH_AUTH_SOCK" {
-		t.Fatalf("could not find key SSH_AUTH_SOCK in %q", fields[0])
-	}
-	socket = string(line[1])
-
-	line = bytes.SplitN(fields[2], []byte("="), 2)
-	line[0] = bytes.TrimLeft(line[0], "\n")
-	if string(line[0]) != "SSH_AGENT_PID" {
-		t.Fatalf("could not find key SSH_AGENT_PID in %q", fields[2])
-	}
-	pidStr := line[1]
-	pid, err := strconv.Atoi(string(pidStr))
-	if err != nil {
-		t.Fatalf("Atoi(%q): %v", pidStr, err)
-	}
-
-	conn, err := net.Dial("unix", string(socket))
-	if err != nil {
-		t.Fatalf("net.Dial: %v", err)
-	}
-
-	ac := NewClient(conn)
-	return ac, socket, func() {
-		proc, _ := os.FindProcess(pid)
-		if proc != nil {
-			proc.Kill()
-		}
-		conn.Close()
-		os.RemoveAll(filepath.Dir(socket))
-	}
-}
-
-// startKeyringAgent uses Keyring to simulate a ssh-agent Server and returns a client.
-func startKeyringAgent(t *testing.T) (client Agent, cleanup func()) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	go ServeAgent(NewKeyring(), c2)
-
-	return NewClient(c1), func() {
-		c1.Close()
-		c2.Close()
-	}
-}
-
-func testOpenSSHAgent(t *testing.T, key interface{}, cert *ssh.Certificate, lifetimeSecs uint32) {
-	agent, _, cleanup := startOpenSSHAgent(t)
-	defer cleanup()
-
-	testAgentInterface(t, agent, key, cert, lifetimeSecs)
-}
-
-func testKeyringAgent(t *testing.T, key interface{}, cert *ssh.Certificate, lifetimeSecs uint32) {
-	agent, cleanup := startKeyringAgent(t)
-	defer cleanup()
-
-	testAgentInterface(t, agent, key, cert, lifetimeSecs)
-}
-
-func testAgentInterface(t *testing.T, agent Agent, key interface{}, cert *ssh.Certificate, lifetimeSecs uint32) {
-	signer, err := ssh.NewSignerFromKey(key)
-	if err != nil {
-		t.Fatalf("NewSignerFromKey(%T): %v", key, err)
-	}
-	// The agent should start up empty.
-	if keys, err := agent.List(); err != nil {
-		t.Fatalf("RequestIdentities: %v", err)
-	} else if len(keys) > 0 {
-		t.Fatalf("got %d keys, want 0: %v", len(keys), keys)
-	}
-
-	// Attempt to insert the key, with certificate if specified.
-	var pubKey ssh.PublicKey
-	if cert != nil {
-		err = agent.Add(AddedKey{
-			PrivateKey:   key,
-			Certificate:  cert,
-			Comment:      "comment",
-			LifetimeSecs: lifetimeSecs,
-		})
-		pubKey = cert
-	} else {
-		err = agent.Add(AddedKey{PrivateKey: key, Comment: "comment", LifetimeSecs: lifetimeSecs})
-		pubKey = signer.PublicKey()
-	}
-	if err != nil {
-		t.Fatalf("insert(%T): %v", key, err)
-	}
-
-	// Did the key get inserted successfully?
-	if keys, err := agent.List(); err != nil {
-		t.Fatalf("List: %v", err)
-	} else if len(keys) != 1 {
-		t.Fatalf("got %v, want 1 key", keys)
-	} else if keys[0].Comment != "comment" {
-		t.Fatalf("key comment: got %v, want %v", keys[0].Comment, "comment")
-	} else if !bytes.Equal(keys[0].Blob, pubKey.Marshal()) {
-		t.Fatalf("key mismatch")
-	}
-
-	// Can the agent make a valid signature?
-	data := []byte("hello")
-	sig, err := agent.Sign(pubKey, data)
-	if err != nil {
-		t.Fatalf("Sign(%s): %v", pubKey.Type(), err)
-	}
-
-	if err := pubKey.Verify(data, sig); err != nil {
-		t.Fatalf("Verify(%s): %v", pubKey.Type(), err)
-	}
-
-	// If the key has a lifetime, is it removed when it should be?
-	if lifetimeSecs > 0 {
-		time.Sleep(time.Second*time.Duration(lifetimeSecs) + 100*time.Millisecond)
-		keys, err := agent.List()
-		if err != nil {
-			t.Fatalf("List: %v", err)
-		}
-		if len(keys) > 0 {
-			t.Fatalf("key not expired")
-		}
-	}
-
-}
-
-func TestAgent(t *testing.T) {
-	for _, keyType := range []string{"rsa", "dsa", "ecdsa", "ed25519"} {
-		testOpenSSHAgent(t, testPrivateKeys[keyType], nil, 0)
-		testKeyringAgent(t, testPrivateKeys[keyType], nil, 0)
-	}
-}
-
-func TestCert(t *testing.T) {
-	cert := &ssh.Certificate{
-		Key:         testPublicKeys["rsa"],
-		ValidBefore: ssh.CertTimeInfinity,
-		CertType:    ssh.UserCert,
-	}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-
-	testOpenSSHAgent(t, testPrivateKeys["rsa"], cert, 0)
-	testKeyringAgent(t, testPrivateKeys["rsa"], cert, 0)
-}
-
-// netPipe is analogous to net.Pipe, but it uses a real net.Conn, and
-// therefore is buffered (net.Pipe deadlocks if both sides start with
-// a write.)
-func netPipe() (net.Conn, net.Conn, error) {
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		listener, err = net.Listen("tcp", "[::1]:0")
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	defer listener.Close()
-	c1, err := net.Dial("tcp", listener.Addr().String())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c2, err := listener.Accept()
-	if err != nil {
-		c1.Close()
-		return nil, nil, err
-	}
-
-	return c1, c2, nil
-}
-
-func TestAuth(t *testing.T) {
-	agent, _, cleanup := startOpenSSHAgent(t)
-	defer cleanup()
-
-	a, b, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-
-	defer a.Close()
-	defer b.Close()
-
-	if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["rsa"], Comment: "comment"}); err != nil {
-		t.Errorf("Add: %v", err)
-	}
-
-	serverConf := ssh.ServerConfig{}
-	serverConf.AddHostKey(testSigners["rsa"])
-	serverConf.PublicKeyCallback = func(c ssh.ConnMetadata, key ssh.PublicKey) (*ssh.Permissions, error) {
-		if bytes.Equal(key.Marshal(), testPublicKeys["rsa"].Marshal()) {
-			return nil, nil
-		}
-
-		return nil, errors.New("pubkey rejected")
-	}
-
-	go func() {
-		conn, _, _, err := ssh.NewServerConn(a, &serverConf)
-		if err != nil {
-			t.Fatalf("Server: %v", err)
-		}
-		conn.Close()
-	}()
-
-	conf := ssh.ClientConfig{
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-	}
-	conf.Auth = append(conf.Auth, ssh.PublicKeysCallback(agent.Signers))
-	conn, _, _, err := ssh.NewClientConn(b, "", &conf)
-	if err != nil {
-		t.Fatalf("NewClientConn: %v", err)
-	}
-	conn.Close()
-}
-
-func TestLockOpenSSHAgent(t *testing.T) {
-	agent, _, cleanup := startOpenSSHAgent(t)
-	defer cleanup()
-	testLockAgent(agent, t)
-}
-
-func TestLockKeyringAgent(t *testing.T) {
-	agent, cleanup := startKeyringAgent(t)
-	defer cleanup()
-	testLockAgent(agent, t)
-}
-
-func testLockAgent(agent Agent, t *testing.T) {
-	if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["rsa"], Comment: "comment 1"}); err != nil {
-		t.Errorf("Add: %v", err)
-	}
-	if err := agent.Add(AddedKey{PrivateKey: testPrivateKeys["dsa"], Comment: "comment dsa"}); err != nil {
-		t.Errorf("Add: %v", err)
-	}
-	if keys, err := agent.List(); err != nil {
-		t.Errorf("List: %v", err)
-	} else if len(keys) != 2 {
-		t.Errorf("Want 2 keys, got %v", keys)
-	}
-
-	passphrase := []byte("secret")
-	if err := agent.Lock(passphrase); err != nil {
-		t.Errorf("Lock: %v", err)
-	}
-
-	if keys, err := agent.List(); err != nil {
-		t.Errorf("List: %v", err)
-	} else if len(keys) != 0 {
-		t.Errorf("Want 0 keys, got %v", keys)
-	}
-
-	signer, _ := ssh.NewSignerFromKey(testPrivateKeys["rsa"])
-	if _, err := agent.Sign(signer.PublicKey(), []byte("hello")); err == nil {
-		t.Fatalf("Sign did not fail")
-	}
-
-	if err := agent.Remove(signer.PublicKey()); err == nil {
-		t.Fatalf("Remove did not fail")
-	}
-
-	if err := agent.RemoveAll(); err == nil {
-		t.Fatalf("RemoveAll did not fail")
-	}
-
-	if err := agent.Unlock(nil); err == nil {
-		t.Errorf("Unlock with wrong passphrase succeeded")
-	}
-	if err := agent.Unlock(passphrase); err != nil {
-		t.Errorf("Unlock: %v", err)
-	}
-
-	if err := agent.Remove(signer.PublicKey()); err != nil {
-		t.Fatalf("Remove: %v", err)
-	}
-
-	if keys, err := agent.List(); err != nil {
-		t.Errorf("List: %v", err)
-	} else if len(keys) != 1 {
-		t.Errorf("Want 1 keys, got %v", keys)
-	}
-}
-
-func testOpenSSHAgentLifetime(t *testing.T) {
-	agent, _, cleanup := startOpenSSHAgent(t)
-	defer cleanup()
-	testAgentLifetime(t, agent)
-}
-
-func testKeyringAgentLifetime(t *testing.T) {
-	agent, cleanup := startKeyringAgent(t)
-	defer cleanup()
-	testAgentLifetime(t, agent)
-}
-
-func testAgentLifetime(t *testing.T, agent Agent) {
-	for _, keyType := range []string{"rsa", "dsa", "ecdsa"} {
-		// Add private keys to the agent.
-		err := agent.Add(AddedKey{
-			PrivateKey:   testPrivateKeys[keyType],
-			Comment:      "comment",
-			LifetimeSecs: 1,
-		})
-		if err != nil {
-			t.Fatalf("add: %v", err)
-		}
-		// Add certs to the agent.
-		cert := &ssh.Certificate{
-			Key:         testPublicKeys[keyType],
-			ValidBefore: ssh.CertTimeInfinity,
-			CertType:    ssh.UserCert,
-		}
-		cert.SignCert(rand.Reader, testSigners[keyType])
-		err = agent.Add(AddedKey{
-			PrivateKey:   testPrivateKeys[keyType],
-			Certificate:  cert,
-			Comment:      "comment",
-			LifetimeSecs: 1,
-		})
-		if err != nil {
-			t.Fatalf("add: %v", err)
-		}
-	}
-	time.Sleep(1100 * time.Millisecond)
-	if keys, err := agent.List(); err != nil {
-		t.Errorf("List: %v", err)
-	} else if len(keys) != 0 {
-		t.Errorf("Want 0 keys, got %v", len(keys))
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/example_test.go b/installer/vendor/golang.org/x/crypto/ssh/agent/example_test.go
deleted file mode 100644
index 85562253ea..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/example_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent_test
-
-import (
-	"log"
-	"net"
-	"os"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/agent"
-)
-
-func ExampleClientAgent() {
-	// ssh-agent has a UNIX socket under $SSH_AUTH_SOCK
-	socket := os.Getenv("SSH_AUTH_SOCK")
-	conn, err := net.Dial("unix", socket)
-	if err != nil {
-		log.Fatalf("net.Dial: %v", err)
-	}
-	agentClient := agent.NewClient(conn)
-	config := &ssh.ClientConfig{
-		User: "username",
-		Auth: []ssh.AuthMethod{
-			// Use a callback rather than PublicKeys
-			// so we only consult the agent once the remote server
-			// wants it.
-			ssh.PublicKeysCallback(agentClient.Signers),
-		},
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-	}
-
-	sshc, err := ssh.Dial("tcp", "localhost:22", config)
-	if err != nil {
-		log.Fatalf("Dial: %v", err)
-	}
-	// .. use sshc
-	sshc.Close()
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/forward.go b/installer/vendor/golang.org/x/crypto/ssh/agent/forward.go
deleted file mode 100644
index fd24ba900d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/forward.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"errors"
-	"io"
-	"net"
-	"sync"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// RequestAgentForwarding sets up agent forwarding for the session.
-// ForwardToAgent or ForwardToRemote should be called to route
-// the authentication requests.
-func RequestAgentForwarding(session *ssh.Session) error {
-	ok, err := session.SendRequest("auth-agent-req@openssh.com", true, nil)
-	if err != nil {
-		return err
-	}
-	if !ok {
-		return errors.New("forwarding request denied")
-	}
-	return nil
-}
-
-// ForwardToAgent routes authentication requests to the given keyring.
-func ForwardToAgent(client *ssh.Client, keyring Agent) error {
-	channels := client.HandleChannelOpen(channelType)
-	if channels == nil {
-		return errors.New("agent: already have handler for " + channelType)
-	}
-
-	go func() {
-		for ch := range channels {
-			channel, reqs, err := ch.Accept()
-			if err != nil {
-				continue
-			}
-			go ssh.DiscardRequests(reqs)
-			go func() {
-				ServeAgent(keyring, channel)
-				channel.Close()
-			}()
-		}
-	}()
-	return nil
-}
-
-const channelType = "auth-agent@openssh.com"
-
-// ForwardToRemote routes authentication requests to the ssh-agent
-// process serving on the given unix socket.
-func ForwardToRemote(client *ssh.Client, addr string) error {
-	channels := client.HandleChannelOpen(channelType)
-	if channels == nil {
-		return errors.New("agent: already have handler for " + channelType)
-	}
-	conn, err := net.Dial("unix", addr)
-	if err != nil {
-		return err
-	}
-	conn.Close()
-
-	go func() {
-		for ch := range channels {
-			channel, reqs, err := ch.Accept()
-			if err != nil {
-				continue
-			}
-			go ssh.DiscardRequests(reqs)
-			go forwardUnixSocket(channel, addr)
-		}
-	}()
-	return nil
-}
-
-func forwardUnixSocket(channel ssh.Channel, addr string) {
-	conn, err := net.Dial("unix", addr)
-	if err != nil {
-		return
-	}
-
-	var wg sync.WaitGroup
-	wg.Add(2)
-	go func() {
-		io.Copy(conn, channel)
-		conn.(*net.UnixConn).CloseWrite()
-		wg.Done()
-	}()
-	go func() {
-		io.Copy(channel, conn)
-		channel.CloseWrite()
-		wg.Done()
-	}()
-
-	wg.Wait()
-	conn.Close()
-	channel.Close()
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/keyring.go b/installer/vendor/golang.org/x/crypto/ssh/agent/keyring.go
deleted file mode 100644
index a6ba06ab30..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/keyring.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"bytes"
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"fmt"
-	"sync"
-	"time"
-
-	"golang.org/x/crypto/ssh"
-)
-
-type privKey struct {
-	signer  ssh.Signer
-	comment string
-	expire  *time.Time
-}
-
-type keyring struct {
-	mu   sync.Mutex
-	keys []privKey
-
-	locked     bool
-	passphrase []byte
-}
-
-var errLocked = errors.New("agent: locked")
-
-// NewKeyring returns an Agent that holds keys in memory.  It is safe
-// for concurrent use by multiple goroutines.
-func NewKeyring() Agent {
-	return &keyring{}
-}
-
-// RemoveAll removes all identities.
-func (r *keyring) RemoveAll() error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	r.keys = nil
-	return nil
-}
-
-// removeLocked does the actual key removal. The caller must already be holding the
-// keyring mutex.
-func (r *keyring) removeLocked(want []byte) error {
-	found := false
-	for i := 0; i < len(r.keys); {
-		if bytes.Equal(r.keys[i].signer.PublicKey().Marshal(), want) {
-			found = true
-			r.keys[i] = r.keys[len(r.keys)-1]
-			r.keys = r.keys[:len(r.keys)-1]
-			continue
-		} else {
-			i++
-		}
-	}
-
-	if !found {
-		return errors.New("agent: key not found")
-	}
-	return nil
-}
-
-// Remove removes all identities with the given public key.
-func (r *keyring) Remove(key ssh.PublicKey) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	return r.removeLocked(key.Marshal())
-}
-
-// Lock locks the agent. Sign and Remove will fail, and List will return an empty list.
-func (r *keyring) Lock(passphrase []byte) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-
-	r.locked = true
-	r.passphrase = passphrase
-	return nil
-}
-
-// Unlock undoes the effect of Lock
-func (r *keyring) Unlock(passphrase []byte) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if !r.locked {
-		return errors.New("agent: not locked")
-	}
-	if len(passphrase) != len(r.passphrase) || 1 != subtle.ConstantTimeCompare(passphrase, r.passphrase) {
-		return fmt.Errorf("agent: incorrect passphrase")
-	}
-
-	r.locked = false
-	r.passphrase = nil
-	return nil
-}
-
-// expireKeysLocked removes expired keys from the keyring. If a key was added
-// with a lifetimesecs contraint and seconds >= lifetimesecs seconds have
-// ellapsed, it is removed. The caller *must* be holding the keyring mutex.
-func (r *keyring) expireKeysLocked() {
-	for _, k := range r.keys {
-		if k.expire != nil && time.Now().After(*k.expire) {
-			r.removeLocked(k.signer.PublicKey().Marshal())
-		}
-	}
-}
-
-// List returns the identities known to the agent.
-func (r *keyring) List() ([]*Key, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		// section 2.7: locked agents return empty.
-		return nil, nil
-	}
-
-	r.expireKeysLocked()
-	var ids []*Key
-	for _, k := range r.keys {
-		pub := k.signer.PublicKey()
-		ids = append(ids, &Key{
-			Format:  pub.Type(),
-			Blob:    pub.Marshal(),
-			Comment: k.comment})
-	}
-	return ids, nil
-}
-
-// Insert adds a private key to the keyring. If a certificate
-// is given, that certificate is added as public key. Note that
-// any constraints given are ignored.
-func (r *keyring) Add(key AddedKey) error {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return errLocked
-	}
-	signer, err := ssh.NewSignerFromKey(key.PrivateKey)
-
-	if err != nil {
-		return err
-	}
-
-	if cert := key.Certificate; cert != nil {
-		signer, err = ssh.NewCertSigner(cert, signer)
-		if err != nil {
-			return err
-		}
-	}
-
-	p := privKey{
-		signer:  signer,
-		comment: key.Comment,
-	}
-
-	if key.LifetimeSecs > 0 {
-		t := time.Now().Add(time.Duration(key.LifetimeSecs) * time.Second)
-		p.expire = &t
-	}
-
-	r.keys = append(r.keys, p)
-
-	return nil
-}
-
-// Sign returns a signature for the data.
-func (r *keyring) Sign(key ssh.PublicKey, data []byte) (*ssh.Signature, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return nil, errLocked
-	}
-
-	r.expireKeysLocked()
-	wanted := key.Marshal()
-	for _, k := range r.keys {
-		if bytes.Equal(k.signer.PublicKey().Marshal(), wanted) {
-			return k.signer.Sign(rand.Reader, data)
-		}
-	}
-	return nil, errors.New("not found")
-}
-
-// Signers returns signers for all the known keys.
-func (r *keyring) Signers() ([]ssh.Signer, error) {
-	r.mu.Lock()
-	defer r.mu.Unlock()
-	if r.locked {
-		return nil, errLocked
-	}
-
-	r.expireKeysLocked()
-	s := make([]ssh.Signer, 0, len(r.keys))
-	for _, k := range r.keys {
-		s = append(s, k.signer)
-	}
-	return s, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/keyring_test.go b/installer/vendor/golang.org/x/crypto/ssh/agent/keyring_test.go
deleted file mode 100644
index e5d50e7e0d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/keyring_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import "testing"
-
-func addTestKey(t *testing.T, a Agent, keyName string) {
-	err := a.Add(AddedKey{
-		PrivateKey: testPrivateKeys[keyName],
-		Comment:    keyName,
-	})
-	if err != nil {
-		t.Fatalf("failed to add key %q: %v", keyName, err)
-	}
-}
-
-func removeTestKey(t *testing.T, a Agent, keyName string) {
-	err := a.Remove(testPublicKeys[keyName])
-	if err != nil {
-		t.Fatalf("failed to remove key %q: %v", keyName, err)
-	}
-}
-
-func validateListedKeys(t *testing.T, a Agent, expectedKeys []string) {
-	listedKeys, err := a.List()
-	if err != nil {
-		t.Fatalf("failed to list keys: %v", err)
-		return
-	}
-	actualKeys := make(map[string]bool)
-	for _, key := range listedKeys {
-		actualKeys[key.Comment] = true
-	}
-
-	matchedKeys := make(map[string]bool)
-	for _, expectedKey := range expectedKeys {
-		if !actualKeys[expectedKey] {
-			t.Fatalf("expected key %q, but was not found", expectedKey)
-		} else {
-			matchedKeys[expectedKey] = true
-		}
-	}
-
-	for actualKey := range actualKeys {
-		if !matchedKeys[actualKey] {
-			t.Fatalf("key %q was found, but was not expected", actualKey)
-		}
-	}
-}
-
-func TestKeyringAddingAndRemoving(t *testing.T) {
-	keyNames := []string{"dsa", "ecdsa", "rsa", "user"}
-
-	// add all test private keys
-	k := NewKeyring()
-	for _, keyName := range keyNames {
-		addTestKey(t, k, keyName)
-	}
-	validateListedKeys(t, k, keyNames)
-
-	// remove a key in the middle
-	keyToRemove := keyNames[1]
-	keyNames = append(keyNames[:1], keyNames[2:]...)
-
-	removeTestKey(t, k, keyToRemove)
-	validateListedKeys(t, k, keyNames)
-
-	// remove all keys
-	err := k.RemoveAll()
-	if err != nil {
-		t.Fatalf("failed to remove all keys: %v", err)
-	}
-	validateListedKeys(t, k, []string{})
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/server.go b/installer/vendor/golang.org/x/crypto/ssh/agent/server.go
deleted file mode 100644
index 321e48a264..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/server.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rsa"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math/big"
-
-	"golang.org/x/crypto/ed25519"
-	"golang.org/x/crypto/ssh"
-)
-
-// Server wraps an Agent and uses it to implement the agent side of
-// the SSH-agent, wire protocol.
-type server struct {
-	agent Agent
-}
-
-func (s *server) processRequestBytes(reqData []byte) []byte {
-	rep, err := s.processRequest(reqData)
-	if err != nil {
-		if err != errLocked {
-			// TODO(hanwen): provide better logging interface?
-			log.Printf("agent %d: %v", reqData[0], err)
-		}
-		return []byte{agentFailure}
-	}
-
-	if err == nil && rep == nil {
-		return []byte{agentSuccess}
-	}
-
-	return ssh.Marshal(rep)
-}
-
-func marshalKey(k *Key) []byte {
-	var record struct {
-		Blob    []byte
-		Comment string
-	}
-	record.Blob = k.Marshal()
-	record.Comment = k.Comment
-
-	return ssh.Marshal(&record)
-}
-
-// See [PROTOCOL.agent], section 2.5.1.
-const agentV1IdentitiesAnswer = 2
-
-type agentV1IdentityMsg struct {
-	Numkeys uint32 `sshtype:"2"`
-}
-
-type agentRemoveIdentityMsg struct {
-	KeyBlob []byte `sshtype:"18"`
-}
-
-type agentLockMsg struct {
-	Passphrase []byte `sshtype:"22"`
-}
-
-type agentUnlockMsg struct {
-	Passphrase []byte `sshtype:"23"`
-}
-
-func (s *server) processRequest(data []byte) (interface{}, error) {
-	switch data[0] {
-	case agentRequestV1Identities:
-		return &agentV1IdentityMsg{0}, nil
-
-	case agentRemoveAllV1Identities:
-		return nil, nil
-
-	case agentRemoveIdentity:
-		var req agentRemoveIdentityMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		var wk wireKey
-		if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
-			return nil, err
-		}
-
-		return nil, s.agent.Remove(&Key{Format: wk.Format, Blob: req.KeyBlob})
-
-	case agentRemoveAllIdentities:
-		return nil, s.agent.RemoveAll()
-
-	case agentLock:
-		var req agentLockMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		return nil, s.agent.Lock(req.Passphrase)
-
-	case agentUnlock:
-		var req agentUnlockMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-		return nil, s.agent.Unlock(req.Passphrase)
-
-	case agentSignRequest:
-		var req signRequestAgentMsg
-		if err := ssh.Unmarshal(data, &req); err != nil {
-			return nil, err
-		}
-
-		var wk wireKey
-		if err := ssh.Unmarshal(req.KeyBlob, &wk); err != nil {
-			return nil, err
-		}
-
-		k := &Key{
-			Format: wk.Format,
-			Blob:   req.KeyBlob,
-		}
-
-		sig, err := s.agent.Sign(k, req.Data) //  TODO(hanwen): flags.
-		if err != nil {
-			return nil, err
-		}
-		return &signResponseAgentMsg{SigBlob: ssh.Marshal(sig)}, nil
-
-	case agentRequestIdentities:
-		keys, err := s.agent.List()
-		if err != nil {
-			return nil, err
-		}
-
-		rep := identitiesAnswerAgentMsg{
-			NumKeys: uint32(len(keys)),
-		}
-		for _, k := range keys {
-			rep.Keys = append(rep.Keys, marshalKey(k)...)
-		}
-		return rep, nil
-
-	case agentAddIdConstrained, agentAddIdentity:
-		return nil, s.insertIdentity(data)
-	}
-
-	return nil, fmt.Errorf("unknown opcode %d", data[0])
-}
-
-func parseConstraints(constraints []byte) (lifetimeSecs uint32, confirmBeforeUse bool, extensions []ConstraintExtension, err error) {
-	for len(constraints) != 0 {
-		switch constraints[0] {
-		case agentConstrainLifetime:
-			lifetimeSecs = binary.BigEndian.Uint32(constraints[1:5])
-			constraints = constraints[5:]
-		case agentConstrainConfirm:
-			confirmBeforeUse = true
-			constraints = constraints[1:]
-		case agentConstrainExtension:
-			var msg constrainExtensionAgentMsg
-			if err = ssh.Unmarshal(constraints, &msg); err != nil {
-				return 0, false, nil, err
-			}
-			extensions = append(extensions, ConstraintExtension{
-				ExtensionName:    msg.ExtensionName,
-				ExtensionDetails: msg.ExtensionDetails,
-			})
-			constraints = msg.Rest
-		default:
-			return 0, false, nil, fmt.Errorf("unknown constraint type: %d", constraints[0])
-		}
-	}
-	return
-}
-
-func setConstraints(key *AddedKey, constraintBytes []byte) error {
-	lifetimeSecs, confirmBeforeUse, constraintExtensions, err := parseConstraints(constraintBytes)
-	if err != nil {
-		return err
-	}
-
-	key.LifetimeSecs = lifetimeSecs
-	key.ConfirmBeforeUse = confirmBeforeUse
-	key.ConstraintExtensions = constraintExtensions
-	return nil
-}
-
-func parseRSAKey(req []byte) (*AddedKey, error) {
-	var k rsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	if k.E.BitLen() > 30 {
-		return nil, errors.New("agent: RSA public exponent too large")
-	}
-	priv := &rsa.PrivateKey{
-		PublicKey: rsa.PublicKey{
-			E: int(k.E.Int64()),
-			N: k.N,
-		},
-		D:      k.D,
-		Primes: []*big.Int{k.P, k.Q},
-	}
-	priv.Precompute()
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseEd25519Key(req []byte) (*AddedKey, error) {
-	var k ed25519KeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	priv := ed25519.PrivateKey(k.Priv)
-
-	addedKey := &AddedKey{PrivateKey: &priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseDSAKey(req []byte) (*AddedKey, error) {
-	var k dsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	priv := &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: k.P,
-				Q: k.Q,
-				G: k.G,
-			},
-			Y: k.Y,
-		},
-		X: k.X,
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func unmarshalECDSA(curveName string, keyBytes []byte, privScalar *big.Int) (priv *ecdsa.PrivateKey, err error) {
-	priv = &ecdsa.PrivateKey{
-		D: privScalar,
-	}
-
-	switch curveName {
-	case "nistp256":
-		priv.Curve = elliptic.P256()
-	case "nistp384":
-		priv.Curve = elliptic.P384()
-	case "nistp521":
-		priv.Curve = elliptic.P521()
-	default:
-		return nil, fmt.Errorf("agent: unknown curve %q", curveName)
-	}
-
-	priv.X, priv.Y = elliptic.Unmarshal(priv.Curve, keyBytes)
-	if priv.X == nil || priv.Y == nil {
-		return nil, errors.New("agent: point not on curve")
-	}
-
-	return priv, nil
-}
-
-func parseEd25519Cert(req []byte) (*AddedKey, error) {
-	var k ed25519CertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	priv := ed25519.PrivateKey(k.Priv)
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad ED25519 certificate")
-	}
-
-	addedKey := &AddedKey{PrivateKey: &priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseECDSAKey(req []byte) (*AddedKey, error) {
-	var k ecdsaKeyMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	priv, err := unmarshalECDSA(k.Curve, k.KeyBytes, k.D)
-	if err != nil {
-		return nil, err
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseRSACert(req []byte) (*AddedKey, error) {
-	var k rsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad RSA certificate")
-	}
-
-	// An RSA publickey as marshaled by rsaPublicKey.Marshal() in keys.go
-	var rsaPub struct {
-		Name string
-		E    *big.Int
-		N    *big.Int
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &rsaPub); err != nil {
-		return nil, fmt.Errorf("agent: Unmarshal failed to parse public key: %v", err)
-	}
-
-	if rsaPub.E.BitLen() > 30 {
-		return nil, errors.New("agent: RSA public exponent too large")
-	}
-
-	priv := rsa.PrivateKey{
-		PublicKey: rsa.PublicKey{
-			E: int(rsaPub.E.Int64()),
-			N: rsaPub.N,
-		},
-		D:      k.D,
-		Primes: []*big.Int{k.Q, k.P},
-	}
-	priv.Precompute()
-
-	addedKey := &AddedKey{PrivateKey: &priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseDSACert(req []byte) (*AddedKey, error) {
-	var k dsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad DSA certificate")
-	}
-
-	// A DSA publickey as marshaled by dsaPublicKey.Marshal() in keys.go
-	var w struct {
-		Name       string
-		P, Q, G, Y *big.Int
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &w); err != nil {
-		return nil, fmt.Errorf("agent: Unmarshal failed to parse public key: %v", err)
-	}
-
-	priv := &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: w.P,
-				Q: w.Q,
-				G: w.G,
-			},
-			Y: w.Y,
-		},
-		X: k.X,
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func parseECDSACert(req []byte) (*AddedKey, error) {
-	var k ecdsaCertMsg
-	if err := ssh.Unmarshal(req, &k); err != nil {
-		return nil, err
-	}
-
-	pubKey, err := ssh.ParsePublicKey(k.CertBytes)
-	if err != nil {
-		return nil, err
-	}
-	cert, ok := pubKey.(*ssh.Certificate)
-	if !ok {
-		return nil, errors.New("agent: bad ECDSA certificate")
-	}
-
-	// An ECDSA publickey as marshaled by ecdsaPublicKey.Marshal() in keys.go
-	var ecdsaPub struct {
-		Name string
-		ID   string
-		Key  []byte
-	}
-	if err := ssh.Unmarshal(cert.Key.Marshal(), &ecdsaPub); err != nil {
-		return nil, err
-	}
-
-	priv, err := unmarshalECDSA(ecdsaPub.ID, ecdsaPub.Key, k.D)
-	if err != nil {
-		return nil, err
-	}
-
-	addedKey := &AddedKey{PrivateKey: priv, Certificate: cert, Comment: k.Comments}
-	if err := setConstraints(addedKey, k.Constraints); err != nil {
-		return nil, err
-	}
-	return addedKey, nil
-}
-
-func (s *server) insertIdentity(req []byte) error {
-	var record struct {
-		Type string `sshtype:"17|25"`
-		Rest []byte `ssh:"rest"`
-	}
-
-	if err := ssh.Unmarshal(req, &record); err != nil {
-		return err
-	}
-
-	var addedKey *AddedKey
-	var err error
-
-	switch record.Type {
-	case ssh.KeyAlgoRSA:
-		addedKey, err = parseRSAKey(req)
-	case ssh.KeyAlgoDSA:
-		addedKey, err = parseDSAKey(req)
-	case ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521:
-		addedKey, err = parseECDSAKey(req)
-	case ssh.KeyAlgoED25519:
-		addedKey, err = parseEd25519Key(req)
-	case ssh.CertAlgoRSAv01:
-		addedKey, err = parseRSACert(req)
-	case ssh.CertAlgoDSAv01:
-		addedKey, err = parseDSACert(req)
-	case ssh.CertAlgoECDSA256v01, ssh.CertAlgoECDSA384v01, ssh.CertAlgoECDSA521v01:
-		addedKey, err = parseECDSACert(req)
-	case ssh.CertAlgoED25519v01:
-		addedKey, err = parseEd25519Cert(req)
-	default:
-		return fmt.Errorf("agent: not implemented: %q", record.Type)
-	}
-
-	if err != nil {
-		return err
-	}
-	return s.agent.Add(*addedKey)
-}
-
-// ServeAgent serves the agent protocol on the given connection. It
-// returns when an I/O error occurs.
-func ServeAgent(agent Agent, c io.ReadWriter) error {
-	s := &server{agent}
-
-	var length [4]byte
-	for {
-		if _, err := io.ReadFull(c, length[:]); err != nil {
-			return err
-		}
-		l := binary.BigEndian.Uint32(length[:])
-		if l > maxAgentResponseBytes {
-			// We also cap requests.
-			return fmt.Errorf("agent: request too large: %d", l)
-		}
-
-		req := make([]byte, l)
-		if _, err := io.ReadFull(c, req); err != nil {
-			return err
-		}
-
-		repData := s.processRequestBytes(req)
-		if len(repData) > maxAgentResponseBytes {
-			return fmt.Errorf("agent: reply too large: %d bytes", len(repData))
-		}
-
-		binary.BigEndian.PutUint32(length[:], uint32(len(repData)))
-		if _, err := c.Write(length[:]); err != nil {
-			return err
-		}
-		if _, err := c.Write(repData); err != nil {
-			return err
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/server_test.go b/installer/vendor/golang.org/x/crypto/ssh/agent/server_test.go
deleted file mode 100644
index 038018ebb1..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/server_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package agent
-
-import (
-	"crypto"
-	"crypto/rand"
-	"fmt"
-	pseudorand "math/rand"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/ssh"
-)
-
-func TestServer(t *testing.T) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-	client := NewClient(c1)
-
-	go ServeAgent(NewKeyring(), c2)
-
-	testAgentInterface(t, client, testPrivateKeys["rsa"], nil, 0)
-}
-
-func TestLockServer(t *testing.T) {
-	testLockAgent(NewKeyring(), t)
-}
-
-func TestSetupForwardAgent(t *testing.T) {
-	a, b, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-
-	defer a.Close()
-	defer b.Close()
-
-	_, socket, cleanup := startOpenSSHAgent(t)
-	defer cleanup()
-
-	serverConf := ssh.ServerConfig{
-		NoClientAuth: true,
-	}
-	serverConf.AddHostKey(testSigners["rsa"])
-	incoming := make(chan *ssh.ServerConn, 1)
-	go func() {
-		conn, _, _, err := ssh.NewServerConn(a, &serverConf)
-		if err != nil {
-			t.Fatalf("Server: %v", err)
-		}
-		incoming <- conn
-	}()
-
-	conf := ssh.ClientConfig{
-		HostKeyCallback: ssh.InsecureIgnoreHostKey(),
-	}
-	conn, chans, reqs, err := ssh.NewClientConn(b, "", &conf)
-	if err != nil {
-		t.Fatalf("NewClientConn: %v", err)
-	}
-	client := ssh.NewClient(conn, chans, reqs)
-
-	if err := ForwardToRemote(client, socket); err != nil {
-		t.Fatalf("SetupForwardAgent: %v", err)
-	}
-
-	server := <-incoming
-	ch, reqs, err := server.OpenChannel(channelType, nil)
-	if err != nil {
-		t.Fatalf("OpenChannel(%q): %v", channelType, err)
-	}
-	go ssh.DiscardRequests(reqs)
-
-	agentClient := NewClient(ch)
-	testAgentInterface(t, agentClient, testPrivateKeys["rsa"], nil, 0)
-	conn.Close()
-}
-
-func TestV1ProtocolMessages(t *testing.T) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-	c := NewClient(c1)
-
-	go ServeAgent(NewKeyring(), c2)
-
-	testV1ProtocolMessages(t, c.(*client))
-}
-
-func testV1ProtocolMessages(t *testing.T, c *client) {
-	reply, err := c.call([]byte{agentRequestV1Identities})
-	if err != nil {
-		t.Fatalf("v1 request all failed: %v", err)
-	}
-	if msg, ok := reply.(*agentV1IdentityMsg); !ok || msg.Numkeys != 0 {
-		t.Fatalf("invalid request all response: %#v", reply)
-	}
-
-	reply, err = c.call([]byte{agentRemoveAllV1Identities})
-	if err != nil {
-		t.Fatalf("v1 remove all failed: %v", err)
-	}
-	if _, ok := reply.(*successAgentMsg); !ok {
-		t.Fatalf("invalid remove all response: %#v", reply)
-	}
-}
-
-func verifyKey(sshAgent Agent) error {
-	keys, err := sshAgent.List()
-	if err != nil {
-		return fmt.Errorf("listing keys: %v", err)
-	}
-
-	if len(keys) != 1 {
-		return fmt.Errorf("bad number of keys found. expected 1, got %d", len(keys))
-	}
-
-	buf := make([]byte, 128)
-	if _, err := rand.Read(buf); err != nil {
-		return fmt.Errorf("rand: %v", err)
-	}
-
-	sig, err := sshAgent.Sign(keys[0], buf)
-	if err != nil {
-		return fmt.Errorf("sign: %v", err)
-	}
-
-	if err := keys[0].Verify(buf, sig); err != nil {
-		return fmt.Errorf("verify: %v", err)
-	}
-	return nil
-}
-
-func addKeyToAgent(key crypto.PrivateKey) error {
-	sshAgent := NewKeyring()
-	if err := sshAgent.Add(AddedKey{PrivateKey: key}); err != nil {
-		return fmt.Errorf("add: %v", err)
-	}
-	return verifyKey(sshAgent)
-}
-
-func TestKeyTypes(t *testing.T) {
-	for k, v := range testPrivateKeys {
-		if err := addKeyToAgent(v); err != nil {
-			t.Errorf("error adding key type %s, %v", k, err)
-		}
-		if err := addCertToAgentSock(v, nil); err != nil {
-			t.Errorf("error adding key type %s, %v", k, err)
-		}
-	}
-}
-
-func addCertToAgentSock(key crypto.PrivateKey, cert *ssh.Certificate) error {
-	a, b, err := netPipe()
-	if err != nil {
-		return err
-	}
-	agentServer := NewKeyring()
-	go ServeAgent(agentServer, a)
-
-	agentClient := NewClient(b)
-	if err := agentClient.Add(AddedKey{PrivateKey: key, Certificate: cert}); err != nil {
-		return fmt.Errorf("add: %v", err)
-	}
-	return verifyKey(agentClient)
-}
-
-func addCertToAgent(key crypto.PrivateKey, cert *ssh.Certificate) error {
-	sshAgent := NewKeyring()
-	if err := sshAgent.Add(AddedKey{PrivateKey: key, Certificate: cert}); err != nil {
-		return fmt.Errorf("add: %v", err)
-	}
-	return verifyKey(sshAgent)
-}
-
-func TestCertTypes(t *testing.T) {
-	for keyType, key := range testPublicKeys {
-		cert := &ssh.Certificate{
-			ValidPrincipals: []string{"gopher1"},
-			ValidAfter:      0,
-			ValidBefore:     ssh.CertTimeInfinity,
-			Key:             key,
-			Serial:          1,
-			CertType:        ssh.UserCert,
-			SignatureKey:    testPublicKeys["rsa"],
-			Permissions: ssh.Permissions{
-				CriticalOptions: map[string]string{},
-				Extensions:      map[string]string{},
-			},
-		}
-		if err := cert.SignCert(rand.Reader, testSigners["rsa"]); err != nil {
-			t.Fatalf("signcert: %v", err)
-		}
-		if err := addCertToAgent(testPrivateKeys[keyType], cert); err != nil {
-			t.Fatalf("%v", err)
-		}
-		if err := addCertToAgentSock(testPrivateKeys[keyType], cert); err != nil {
-			t.Fatalf("%v", err)
-		}
-	}
-}
-
-func TestParseConstraints(t *testing.T) {
-	// Test LifetimeSecs
-	var msg = constrainLifetimeAgentMsg{pseudorand.Uint32()}
-	lifetimeSecs, _, _, err := parseConstraints(ssh.Marshal(msg))
-	if err != nil {
-		t.Fatalf("parseConstraints: %v", err)
-	}
-	if lifetimeSecs != msg.LifetimeSecs {
-		t.Errorf("got lifetime %v, want %v", lifetimeSecs, msg.LifetimeSecs)
-	}
-
-	// Test ConfirmBeforeUse
-	_, confirmBeforeUse, _, err := parseConstraints([]byte{agentConstrainConfirm})
-	if err != nil {
-		t.Fatalf("%v", err)
-	}
-	if !confirmBeforeUse {
-		t.Error("got comfirmBeforeUse == false")
-	}
-
-	// Test ConstraintExtensions
-	var data []byte
-	var expect []ConstraintExtension
-	for i := 0; i < 10; i++ {
-		var ext = ConstraintExtension{
-			ExtensionName:    fmt.Sprintf("name%d", i),
-			ExtensionDetails: []byte(fmt.Sprintf("details: %d", i)),
-		}
-		expect = append(expect, ext)
-		data = append(data, agentConstrainExtension)
-		data = append(data, ssh.Marshal(ext)...)
-	}
-	_, _, extensions, err := parseConstraints(data)
-	if err != nil {
-		t.Fatalf("%v", err)
-	}
-	if !reflect.DeepEqual(expect, extensions) {
-		t.Errorf("got extension %v, want %v", extensions, expect)
-	}
-
-	// Test Unknown Constraint
-	_, _, _, err = parseConstraints([]byte{128})
-	if err == nil || !strings.Contains(err.Error(), "unknown constraint") {
-		t.Errorf("unexpected error: %v", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/agent/testdata_test.go b/installer/vendor/golang.org/x/crypto/ssh/agent/testdata_test.go
deleted file mode 100644
index cc42a87cb9..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/agent/testdata_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// IMPLEMENTATION NOTE: To avoid a package loop, this file is in three places:
-// ssh/, ssh/agent, and ssh/test/. It should be kept in sync across all three
-// instances.
-
-package agent
-
-import (
-	"crypto/rand"
-	"fmt"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/testdata"
-)
-
-var (
-	testPrivateKeys map[string]interface{}
-	testSigners     map[string]ssh.Signer
-	testPublicKeys  map[string]ssh.PublicKey
-)
-
-func init() {
-	var err error
-
-	n := len(testdata.PEMBytes)
-	testPrivateKeys = make(map[string]interface{}, n)
-	testSigners = make(map[string]ssh.Signer, n)
-	testPublicKeys = make(map[string]ssh.PublicKey, n)
-	for t, k := range testdata.PEMBytes {
-		testPrivateKeys[t], err = ssh.ParseRawPrivateKey(k)
-		if err != nil {
-			panic(fmt.Sprintf("Unable to parse test key %s: %v", t, err))
-		}
-		testSigners[t], err = ssh.NewSignerFromKey(testPrivateKeys[t])
-		if err != nil {
-			panic(fmt.Sprintf("Unable to create signer for test key %s: %v", t, err))
-		}
-		testPublicKeys[t] = testSigners[t].PublicKey()
-	}
-
-	// Create a cert and sign it for use in tests.
-	testCert := &ssh.Certificate{
-		Nonce:           []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		ValidPrincipals: []string{"gopher1", "gopher2"}, // increases test coverage
-		ValidAfter:      0,                              // unix epoch
-		ValidBefore:     ssh.CertTimeInfinity,           // The end of currently representable time.
-		Reserved:        []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		Key:             testPublicKeys["ecdsa"],
-		SignatureKey:    testPublicKeys["rsa"],
-		Permissions: ssh.Permissions{
-			CriticalOptions: map[string]string{},
-			Extensions:      map[string]string{},
-		},
-	}
-	testCert.SignCert(rand.Reader, testSigners["rsa"])
-	testPrivateKeys["cert"] = testPrivateKeys["ecdsa"]
-	testSigners["cert"], err = ssh.NewCertSigner(testCert, testSigners["ecdsa"])
-	if err != nil {
-		panic(fmt.Sprintf("Unable to create certificate signer: %v", err))
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/benchmark_test.go b/installer/vendor/golang.org/x/crypto/ssh/benchmark_test.go
deleted file mode 100644
index d9f7eb9b60..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/benchmark_test.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"errors"
-	"io"
-	"net"
-	"testing"
-)
-
-type server struct {
-	*ServerConn
-	chans <-chan NewChannel
-}
-
-func newServer(c net.Conn, conf *ServerConfig) (*server, error) {
-	sconn, chans, reqs, err := NewServerConn(c, conf)
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(reqs)
-	return &server{sconn, chans}, nil
-}
-
-func (s *server) Accept() (NewChannel, error) {
-	n, ok := <-s.chans
-	if !ok {
-		return nil, io.EOF
-	}
-	return n, nil
-}
-
-func sshPipe() (Conn, *server, error) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	clientConf := ClientConfig{
-		User: "user",
-	}
-	serverConf := ServerConfig{
-		NoClientAuth: true,
-	}
-	serverConf.AddHostKey(testSigners["ecdsa"])
-	done := make(chan *server, 1)
-	go func() {
-		server, err := newServer(c2, &serverConf)
-		if err != nil {
-			done <- nil
-		}
-		done <- server
-	}()
-
-	client, _, reqs, err := NewClientConn(c1, "", &clientConf)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	server := <-done
-	if server == nil {
-		return nil, nil, errors.New("server handshake failed.")
-	}
-	go DiscardRequests(reqs)
-
-	return client, server, nil
-}
-
-func BenchmarkEndToEnd(b *testing.B) {
-	b.StopTimer()
-
-	client, server, err := sshPipe()
-	if err != nil {
-		b.Fatalf("sshPipe: %v", err)
-	}
-
-	defer client.Close()
-	defer server.Close()
-
-	size := (1 << 20)
-	input := make([]byte, size)
-	output := make([]byte, size)
-	b.SetBytes(int64(size))
-	done := make(chan int, 1)
-
-	go func() {
-		newCh, err := server.Accept()
-		if err != nil {
-			b.Fatalf("Client: %v", err)
-		}
-		ch, incoming, err := newCh.Accept()
-		go DiscardRequests(incoming)
-		for i := 0; i < b.N; i++ {
-			if _, err := io.ReadFull(ch, output); err != nil {
-				b.Fatalf("ReadFull: %v", err)
-			}
-		}
-		ch.Close()
-		done <- 1
-	}()
-
-	ch, in, err := client.OpenChannel("speed", nil)
-	if err != nil {
-		b.Fatalf("OpenChannel: %v", err)
-	}
-	go DiscardRequests(in)
-
-	b.ResetTimer()
-	b.StartTimer()
-	for i := 0; i < b.N; i++ {
-		if _, err := ch.Write(input); err != nil {
-			b.Fatalf("WriteFull: %v", err)
-		}
-	}
-	ch.Close()
-	b.StopTimer()
-
-	<-done
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/buffer.go b/installer/vendor/golang.org/x/crypto/ssh/buffer.go
deleted file mode 100644
index 1ab07d078d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/buffer.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"io"
-	"sync"
-)
-
-// buffer provides a linked list buffer for data exchange
-// between producer and consumer. Theoretically the buffer is
-// of unlimited capacity as it does no allocation of its own.
-type buffer struct {
-	// protects concurrent access to head, tail and closed
-	*sync.Cond
-
-	head *element // the buffer that will be read first
-	tail *element // the buffer that will be read last
-
-	closed bool
-}
-
-// An element represents a single link in a linked list.
-type element struct {
-	buf  []byte
-	next *element
-}
-
-// newBuffer returns an empty buffer that is not closed.
-func newBuffer() *buffer {
-	e := new(element)
-	b := &buffer{
-		Cond: newCond(),
-		head: e,
-		tail: e,
-	}
-	return b
-}
-
-// write makes buf available for Read to receive.
-// buf must not be modified after the call to write.
-func (b *buffer) write(buf []byte) {
-	b.Cond.L.Lock()
-	e := &element{buf: buf}
-	b.tail.next = e
-	b.tail = e
-	b.Cond.Signal()
-	b.Cond.L.Unlock()
-}
-
-// eof closes the buffer. Reads from the buffer once all
-// the data has been consumed will receive io.EOF.
-func (b *buffer) eof() {
-	b.Cond.L.Lock()
-	b.closed = true
-	b.Cond.Signal()
-	b.Cond.L.Unlock()
-}
-
-// Read reads data from the internal buffer in buf.  Reads will block
-// if no data is available, or until the buffer is closed.
-func (b *buffer) Read(buf []byte) (n int, err error) {
-	b.Cond.L.Lock()
-	defer b.Cond.L.Unlock()
-
-	for len(buf) > 0 {
-		// if there is data in b.head, copy it
-		if len(b.head.buf) > 0 {
-			r := copy(buf, b.head.buf)
-			buf, b.head.buf = buf[r:], b.head.buf[r:]
-			n += r
-			continue
-		}
-		// if there is a next buffer, make it the head
-		if len(b.head.buf) == 0 && b.head != b.tail {
-			b.head = b.head.next
-			continue
-		}
-
-		// if at least one byte has been copied, return
-		if n > 0 {
-			break
-		}
-
-		// if nothing was read, and there is nothing outstanding
-		// check to see if the buffer is closed.
-		if b.closed {
-			err = io.EOF
-			break
-		}
-		// out of buffers, wait for producer
-		b.Cond.Wait()
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/buffer_test.go b/installer/vendor/golang.org/x/crypto/ssh/buffer_test.go
deleted file mode 100644
index d5781cb3da..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/buffer_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"io"
-	"testing"
-)
-
-var alphabet = []byte("abcdefghijklmnopqrstuvwxyz")
-
-func TestBufferReadwrite(t *testing.T) {
-	b := newBuffer()
-	b.write(alphabet[:10])
-	r, _ := b.Read(make([]byte, 10))
-	if r != 10 {
-		t.Fatalf("Expected written == read == 10, written: 10, read %d", r)
-	}
-
-	b = newBuffer()
-	b.write(alphabet[:5])
-	r, _ = b.Read(make([]byte, 10))
-	if r != 5 {
-		t.Fatalf("Expected written == read == 5, written: 5, read %d", r)
-	}
-
-	b = newBuffer()
-	b.write(alphabet[:10])
-	r, _ = b.Read(make([]byte, 5))
-	if r != 5 {
-		t.Fatalf("Expected written == 10, read == 5, written: 10, read %d", r)
-	}
-
-	b = newBuffer()
-	b.write(alphabet[:5])
-	b.write(alphabet[5:15])
-	r, _ = b.Read(make([]byte, 10))
-	r2, _ := b.Read(make([]byte, 10))
-	if r != 10 || r2 != 5 || 15 != r+r2 {
-		t.Fatal("Expected written == read == 15")
-	}
-}
-
-func TestBufferClose(t *testing.T) {
-	b := newBuffer()
-	b.write(alphabet[:10])
-	b.eof()
-	_, err := b.Read(make([]byte, 5))
-	if err != nil {
-		t.Fatal("expected read of 5 to not return EOF")
-	}
-	b = newBuffer()
-	b.write(alphabet[:10])
-	b.eof()
-	r, err := b.Read(make([]byte, 5))
-	r2, err2 := b.Read(make([]byte, 10))
-	if r != 5 || r2 != 5 || err != nil || err2 != nil {
-		t.Fatal("expected reads of 5 and 5")
-	}
-
-	b = newBuffer()
-	b.write(alphabet[:10])
-	b.eof()
-	r, err = b.Read(make([]byte, 5))
-	r2, err2 = b.Read(make([]byte, 10))
-	r3, err3 := b.Read(make([]byte, 10))
-	if r != 5 || r2 != 5 || r3 != 0 || err != nil || err2 != nil || err3 != io.EOF {
-		t.Fatal("expected reads of 5 and 5 and 0, with EOF")
-	}
-
-	b = newBuffer()
-	b.write(make([]byte, 5))
-	b.write(make([]byte, 10))
-	b.eof()
-	r, err = b.Read(make([]byte, 9))
-	r2, err2 = b.Read(make([]byte, 3))
-	r3, err3 = b.Read(make([]byte, 3))
-	r4, err4 := b.Read(make([]byte, 10))
-	if err != nil || err2 != nil || err3 != nil || err4 != io.EOF {
-		t.Fatalf("Expected EOF on forth read only, err=%v, err2=%v, err3=%v, err4=%v", err, err2, err3, err4)
-	}
-	if r != 9 || r2 != 3 || r3 != 3 || r4 != 0 {
-		t.Fatal("Expected written == read == 15", r, r2, r3, r4)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/certs.go b/installer/vendor/golang.org/x/crypto/ssh/certs.go
deleted file mode 100644
index b1f0220781..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/certs.go
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"sort"
-	"time"
-)
-
-// These constants from [PROTOCOL.certkeys] represent the algorithm names
-// for certificate types supported by this package.
-const (
-	CertAlgoRSAv01      = "ssh-rsa-cert-v01@openssh.com"
-	CertAlgoDSAv01      = "ssh-dss-cert-v01@openssh.com"
-	CertAlgoECDSA256v01 = "ecdsa-sha2-nistp256-cert-v01@openssh.com"
-	CertAlgoECDSA384v01 = "ecdsa-sha2-nistp384-cert-v01@openssh.com"
-	CertAlgoECDSA521v01 = "ecdsa-sha2-nistp521-cert-v01@openssh.com"
-	CertAlgoED25519v01  = "ssh-ed25519-cert-v01@openssh.com"
-)
-
-// Certificate types distinguish between host and user
-// certificates. The values can be set in the CertType field of
-// Certificate.
-const (
-	UserCert = 1
-	HostCert = 2
-)
-
-// Signature represents a cryptographic signature.
-type Signature struct {
-	Format string
-	Blob   []byte
-}
-
-// CertTimeInfinity can be used for OpenSSHCertV01.ValidBefore to indicate that
-// a certificate does not expire.
-const CertTimeInfinity = 1<<64 - 1
-
-// An Certificate represents an OpenSSH certificate as defined in
-// [PROTOCOL.certkeys]?rev=1.8.
-type Certificate struct {
-	Nonce           []byte
-	Key             PublicKey
-	Serial          uint64
-	CertType        uint32
-	KeyId           string
-	ValidPrincipals []string
-	ValidAfter      uint64
-	ValidBefore     uint64
-	Permissions
-	Reserved     []byte
-	SignatureKey PublicKey
-	Signature    *Signature
-}
-
-// genericCertData holds the key-independent part of the certificate data.
-// Overall, certificates contain an nonce, public key fields and
-// key-independent fields.
-type genericCertData struct {
-	Serial          uint64
-	CertType        uint32
-	KeyId           string
-	ValidPrincipals []byte
-	ValidAfter      uint64
-	ValidBefore     uint64
-	CriticalOptions []byte
-	Extensions      []byte
-	Reserved        []byte
-	SignatureKey    []byte
-	Signature       []byte
-}
-
-func marshalStringList(namelist []string) []byte {
-	var to []byte
-	for _, name := range namelist {
-		s := struct{ N string }{name}
-		to = append(to, Marshal(&s)...)
-	}
-	return to
-}
-
-type optionsTuple struct {
-	Key   string
-	Value []byte
-}
-
-type optionsTupleValue struct {
-	Value string
-}
-
-// serialize a map of critical options or extensions
-// issue #10569 - per [PROTOCOL.certkeys] and SSH implementation,
-// we need two length prefixes for a non-empty string value
-func marshalTuples(tups map[string]string) []byte {
-	keys := make([]string, 0, len(tups))
-	for key := range tups {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-
-	var ret []byte
-	for _, key := range keys {
-		s := optionsTuple{Key: key}
-		if value := tups[key]; len(value) > 0 {
-			s.Value = Marshal(&optionsTupleValue{value})
-		}
-		ret = append(ret, Marshal(&s)...)
-	}
-	return ret
-}
-
-// issue #10569 - per [PROTOCOL.certkeys] and SSH implementation,
-// we need two length prefixes for a non-empty option value
-func parseTuples(in []byte) (map[string]string, error) {
-	tups := map[string]string{}
-	var lastKey string
-	var haveLastKey bool
-
-	for len(in) > 0 {
-		var key, val, extra []byte
-		var ok bool
-
-		if key, in, ok = parseString(in); !ok {
-			return nil, errShortRead
-		}
-		keyStr := string(key)
-		// according to [PROTOCOL.certkeys], the names must be in
-		// lexical order.
-		if haveLastKey && keyStr <= lastKey {
-			return nil, fmt.Errorf("ssh: certificate options are not in lexical order")
-		}
-		lastKey, haveLastKey = keyStr, true
-		// the next field is a data field, which if non-empty has a string embedded
-		if val, in, ok = parseString(in); !ok {
-			return nil, errShortRead
-		}
-		if len(val) > 0 {
-			val, extra, ok = parseString(val)
-			if !ok {
-				return nil, errShortRead
-			}
-			if len(extra) > 0 {
-				return nil, fmt.Errorf("ssh: unexpected trailing data after certificate option value")
-			}
-			tups[keyStr] = string(val)
-		} else {
-			tups[keyStr] = ""
-		}
-	}
-	return tups, nil
-}
-
-func parseCert(in []byte, privAlgo string) (*Certificate, error) {
-	nonce, rest, ok := parseString(in)
-	if !ok {
-		return nil, errShortRead
-	}
-
-	key, rest, err := parsePubKey(rest, privAlgo)
-	if err != nil {
-		return nil, err
-	}
-
-	var g genericCertData
-	if err := Unmarshal(rest, &g); err != nil {
-		return nil, err
-	}
-
-	c := &Certificate{
-		Nonce:       nonce,
-		Key:         key,
-		Serial:      g.Serial,
-		CertType:    g.CertType,
-		KeyId:       g.KeyId,
-		ValidAfter:  g.ValidAfter,
-		ValidBefore: g.ValidBefore,
-	}
-
-	for principals := g.ValidPrincipals; len(principals) > 0; {
-		principal, rest, ok := parseString(principals)
-		if !ok {
-			return nil, errShortRead
-		}
-		c.ValidPrincipals = append(c.ValidPrincipals, string(principal))
-		principals = rest
-	}
-
-	c.CriticalOptions, err = parseTuples(g.CriticalOptions)
-	if err != nil {
-		return nil, err
-	}
-	c.Extensions, err = parseTuples(g.Extensions)
-	if err != nil {
-		return nil, err
-	}
-	c.Reserved = g.Reserved
-	k, err := ParsePublicKey(g.SignatureKey)
-	if err != nil {
-		return nil, err
-	}
-
-	c.SignatureKey = k
-	c.Signature, rest, ok = parseSignatureBody(g.Signature)
-	if !ok || len(rest) > 0 {
-		return nil, errors.New("ssh: signature parse error")
-	}
-
-	return c, nil
-}
-
-type openSSHCertSigner struct {
-	pub    *Certificate
-	signer Signer
-}
-
-// NewCertSigner returns a Signer that signs with the given Certificate, whose
-// private key is held by signer. It returns an error if the public key in cert
-// doesn't match the key used by signer.
-func NewCertSigner(cert *Certificate, signer Signer) (Signer, error) {
-	if bytes.Compare(cert.Key.Marshal(), signer.PublicKey().Marshal()) != 0 {
-		return nil, errors.New("ssh: signer and cert have different public key")
-	}
-
-	return &openSSHCertSigner{cert, signer}, nil
-}
-
-func (s *openSSHCertSigner) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	return s.signer.Sign(rand, data)
-}
-
-func (s *openSSHCertSigner) PublicKey() PublicKey {
-	return s.pub
-}
-
-const sourceAddressCriticalOption = "source-address"
-
-// CertChecker does the work of verifying a certificate. Its methods
-// can be plugged into ClientConfig.HostKeyCallback and
-// ServerConfig.PublicKeyCallback. For the CertChecker to work,
-// minimally, the IsAuthority callback should be set.
-type CertChecker struct {
-	// SupportedCriticalOptions lists the CriticalOptions that the
-	// server application layer understands. These are only used
-	// for user certificates.
-	SupportedCriticalOptions []string
-
-	// IsUserAuthority should return true if the key is recognized as an
-	// authority for the given user certificate. This allows for
-	// certificates to be signed by other certificates. This must be set
-	// if this CertChecker will be checking user certificates.
-	IsUserAuthority func(auth PublicKey) bool
-
-	// IsHostAuthority should report whether the key is recognized as
-	// an authority for this host. This allows for certificates to be
-	// signed by other keys, and for those other keys to only be valid
-	// signers for particular hostnames. This must be set if this
-	// CertChecker will be checking host certificates.
-	IsHostAuthority func(auth PublicKey, address string) bool
-
-	// Clock is used for verifying time stamps. If nil, time.Now
-	// is used.
-	Clock func() time.Time
-
-	// UserKeyFallback is called when CertChecker.Authenticate encounters a
-	// public key that is not a certificate. It must implement validation
-	// of user keys or else, if nil, all such keys are rejected.
-	UserKeyFallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
-
-	// HostKeyFallback is called when CertChecker.CheckHostKey encounters a
-	// public key that is not a certificate. It must implement host key
-	// validation or else, if nil, all such keys are rejected.
-	HostKeyFallback HostKeyCallback
-
-	// IsRevoked is called for each certificate so that revocation checking
-	// can be implemented. It should return true if the given certificate
-	// is revoked and false otherwise. If nil, no certificates are
-	// considered to have been revoked.
-	IsRevoked func(cert *Certificate) bool
-}
-
-// CheckHostKey checks a host key certificate. This method can be
-// plugged into ClientConfig.HostKeyCallback.
-func (c *CertChecker) CheckHostKey(addr string, remote net.Addr, key PublicKey) error {
-	cert, ok := key.(*Certificate)
-	if !ok {
-		if c.HostKeyFallback != nil {
-			return c.HostKeyFallback(addr, remote, key)
-		}
-		return errors.New("ssh: non-certificate host key")
-	}
-	if cert.CertType != HostCert {
-		return fmt.Errorf("ssh: certificate presented as a host key has type %d", cert.CertType)
-	}
-	if !c.IsHostAuthority(cert.SignatureKey, addr) {
-		return fmt.Errorf("ssh: no authorities for hostname: %v", addr)
-	}
-
-	hostname, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return err
-	}
-
-	// Pass hostname only as principal for host certificates (consistent with OpenSSH)
-	return c.CheckCert(hostname, cert)
-}
-
-// Authenticate checks a user certificate. Authenticate can be used as
-// a value for ServerConfig.PublicKeyCallback.
-func (c *CertChecker) Authenticate(conn ConnMetadata, pubKey PublicKey) (*Permissions, error) {
-	cert, ok := pubKey.(*Certificate)
-	if !ok {
-		if c.UserKeyFallback != nil {
-			return c.UserKeyFallback(conn, pubKey)
-		}
-		return nil, errors.New("ssh: normal key pairs not accepted")
-	}
-
-	if cert.CertType != UserCert {
-		return nil, fmt.Errorf("ssh: cert has type %d", cert.CertType)
-	}
-	if !c.IsUserAuthority(cert.SignatureKey) {
-		return nil, fmt.Errorf("ssh: certificate signed by unrecognized authority")
-	}
-
-	if err := c.CheckCert(conn.User(), cert); err != nil {
-		return nil, err
-	}
-
-	return &cert.Permissions, nil
-}
-
-// CheckCert checks CriticalOptions, ValidPrincipals, revocation, timestamp and
-// the signature of the certificate.
-func (c *CertChecker) CheckCert(principal string, cert *Certificate) error {
-	if c.IsRevoked != nil && c.IsRevoked(cert) {
-		return fmt.Errorf("ssh: certicate serial %d revoked", cert.Serial)
-	}
-
-	for opt, _ := range cert.CriticalOptions {
-		// sourceAddressCriticalOption will be enforced by
-		// serverAuthenticate
-		if opt == sourceAddressCriticalOption {
-			continue
-		}
-
-		found := false
-		for _, supp := range c.SupportedCriticalOptions {
-			if supp == opt {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("ssh: unsupported critical option %q in certificate", opt)
-		}
-	}
-
-	if len(cert.ValidPrincipals) > 0 {
-		// By default, certs are valid for all users/hosts.
-		found := false
-		for _, p := range cert.ValidPrincipals {
-			if p == principal {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("ssh: principal %q not in the set of valid principals for given certificate: %q", principal, cert.ValidPrincipals)
-		}
-	}
-
-	clock := c.Clock
-	if clock == nil {
-		clock = time.Now
-	}
-
-	unixNow := clock().Unix()
-	if after := int64(cert.ValidAfter); after < 0 || unixNow < int64(cert.ValidAfter) {
-		return fmt.Errorf("ssh: cert is not yet valid")
-	}
-	if before := int64(cert.ValidBefore); cert.ValidBefore != uint64(CertTimeInfinity) && (unixNow >= before || before < 0) {
-		return fmt.Errorf("ssh: cert has expired")
-	}
-	if err := cert.SignatureKey.Verify(cert.bytesForSigning(), cert.Signature); err != nil {
-		return fmt.Errorf("ssh: certificate signature does not verify")
-	}
-
-	return nil
-}
-
-// SignCert sets c.SignatureKey to the authority's public key and stores a
-// Signature, by authority, in the certificate.
-func (c *Certificate) SignCert(rand io.Reader, authority Signer) error {
-	c.Nonce = make([]byte, 32)
-	if _, err := io.ReadFull(rand, c.Nonce); err != nil {
-		return err
-	}
-	c.SignatureKey = authority.PublicKey()
-
-	sig, err := authority.Sign(rand, c.bytesForSigning())
-	if err != nil {
-		return err
-	}
-	c.Signature = sig
-	return nil
-}
-
-var certAlgoNames = map[string]string{
-	KeyAlgoRSA:      CertAlgoRSAv01,
-	KeyAlgoDSA:      CertAlgoDSAv01,
-	KeyAlgoECDSA256: CertAlgoECDSA256v01,
-	KeyAlgoECDSA384: CertAlgoECDSA384v01,
-	KeyAlgoECDSA521: CertAlgoECDSA521v01,
-	KeyAlgoED25519:  CertAlgoED25519v01,
-}
-
-// certToPrivAlgo returns the underlying algorithm for a certificate algorithm.
-// Panics if a non-certificate algorithm is passed.
-func certToPrivAlgo(algo string) string {
-	for privAlgo, pubAlgo := range certAlgoNames {
-		if pubAlgo == algo {
-			return privAlgo
-		}
-	}
-	panic("unknown cert algorithm")
-}
-
-func (cert *Certificate) bytesForSigning() []byte {
-	c2 := *cert
-	c2.Signature = nil
-	out := c2.Marshal()
-	// Drop trailing signature length.
-	return out[:len(out)-4]
-}
-
-// Marshal serializes c into OpenSSH's wire format. It is part of the
-// PublicKey interface.
-func (c *Certificate) Marshal() []byte {
-	generic := genericCertData{
-		Serial:          c.Serial,
-		CertType:        c.CertType,
-		KeyId:           c.KeyId,
-		ValidPrincipals: marshalStringList(c.ValidPrincipals),
-		ValidAfter:      uint64(c.ValidAfter),
-		ValidBefore:     uint64(c.ValidBefore),
-		CriticalOptions: marshalTuples(c.CriticalOptions),
-		Extensions:      marshalTuples(c.Extensions),
-		Reserved:        c.Reserved,
-		SignatureKey:    c.SignatureKey.Marshal(),
-	}
-	if c.Signature != nil {
-		generic.Signature = Marshal(c.Signature)
-	}
-	genericBytes := Marshal(&generic)
-	keyBytes := c.Key.Marshal()
-	_, keyBytes, _ = parseString(keyBytes)
-	prefix := Marshal(&struct {
-		Name  string
-		Nonce []byte
-		Key   []byte `ssh:"rest"`
-	}{c.Type(), c.Nonce, keyBytes})
-
-	result := make([]byte, 0, len(prefix)+len(genericBytes))
-	result = append(result, prefix...)
-	result = append(result, genericBytes...)
-	return result
-}
-
-// Type returns the key name. It is part of the PublicKey interface.
-func (c *Certificate) Type() string {
-	algo, ok := certAlgoNames[c.Key.Type()]
-	if !ok {
-		panic("unknown cert key type " + c.Key.Type())
-	}
-	return algo
-}
-
-// Verify verifies a signature against the certificate's public
-// key. It is part of the PublicKey interface.
-func (c *Certificate) Verify(data []byte, sig *Signature) error {
-	return c.Key.Verify(data, sig)
-}
-
-func parseSignatureBody(in []byte) (out *Signature, rest []byte, ok bool) {
-	format, in, ok := parseString(in)
-	if !ok {
-		return
-	}
-
-	out = &Signature{
-		Format: string(format),
-	}
-
-	if out.Blob, in, ok = parseString(in); !ok {
-		return
-	}
-
-	return out, in, ok
-}
-
-func parseSignature(in []byte) (out *Signature, rest []byte, ok bool) {
-	sigBytes, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-
-	out, trailing, ok := parseSignatureBody(sigBytes)
-	if !ok || len(trailing) > 0 {
-		return nil, nil, false
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/certs_test.go b/installer/vendor/golang.org/x/crypto/ssh/certs_test.go
deleted file mode 100644
index 0200531f4c..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/certs_test.go
+++ /dev/null
@@ -1,222 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto/rand"
-	"reflect"
-	"testing"
-	"time"
-)
-
-// Cert generated by ssh-keygen 6.0p1 Debian-4.
-// % ssh-keygen -s ca-key -I test user-key
-const exampleSSHCert = `ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgb1srW/W3ZDjYAO45xLYAwzHBDLsJ4Ux6ICFIkTjb1LEAAAADAQABAAAAYQCkoR51poH0wE8w72cqSB8Sszx+vAhzcMdCO0wqHTj7UNENHWEXGrU0E0UQekD7U+yhkhtoyjbPOVIP7hNa6aRk/ezdh/iUnCIt4Jt1v3Z1h1P+hA4QuYFMHNB+rmjPwAcAAAAAAAAAAAAAAAEAAAAEdGVzdAAAAAAAAAAAAAAAAP//////////AAAAAAAAAIIAAAAVcGVybWl0LVgxMS1mb3J3YXJkaW5nAAAAAAAAABdwZXJtaXQtYWdlbnQtZm9yd2FyZGluZwAAAAAAAAAWcGVybWl0LXBvcnQtZm9yd2FyZGluZwAAAAAAAAAKcGVybWl0LXB0eQAAAAAAAAAOcGVybWl0LXVzZXItcmMAAAAAAAAAAAAAAHcAAAAHc3NoLXJzYQAAAAMBAAEAAABhANFS2kaktpSGc+CcmEKPyw9mJC4nZKxHKTgLVZeaGbFZOvJTNzBspQHdy7Q1uKSfktxpgjZnksiu/tFF9ngyY2KFoc+U88ya95IZUycBGCUbBQ8+bhDtw/icdDGQD5WnUwAAAG8AAAAHc3NoLXJzYQAAAGC8Y9Z2LQKhIhxf52773XaWrXdxP0t3GBVo4A10vUWiYoAGepr6rQIoGGXFxT4B9Gp+nEBJjOwKDXPrAevow0T9ca8gZN+0ykbhSrXLE5Ao48rqr3zP4O1/9P7e6gp0gw8=`
-
-func TestParseCert(t *testing.T) {
-	authKeyBytes := []byte(exampleSSHCert)
-
-	key, _, _, rest, err := ParseAuthorizedKey(authKeyBytes)
-	if err != nil {
-		t.Fatalf("ParseAuthorizedKey: %v", err)
-	}
-	if len(rest) > 0 {
-		t.Errorf("rest: got %q, want empty", rest)
-	}
-
-	if _, ok := key.(*Certificate); !ok {
-		t.Fatalf("got %v (%T), want *Certificate", key, key)
-	}
-
-	marshaled := MarshalAuthorizedKey(key)
-	// Before comparison, remove the trailing newline that
-	// MarshalAuthorizedKey adds.
-	marshaled = marshaled[:len(marshaled)-1]
-	if !bytes.Equal(authKeyBytes, marshaled) {
-		t.Errorf("marshaled certificate does not match original: got %q, want %q", marshaled, authKeyBytes)
-	}
-}
-
-// Cert generated by ssh-keygen OpenSSH_6.8p1 OS X 10.10.3
-// % ssh-keygen -s ca -I testcert -O source-address=192.168.1.0/24 -O force-command=/bin/sleep user.pub
-// user.pub key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDACh1rt2DXfV3hk6fszSQcQ/rueMId0kVD9U7nl8cfEnFxqOCrNT92g4laQIGl2mn8lsGZfTLg8ksHq3gkvgO3oo/0wHy4v32JeBOHTsN5AL4gfHNEhWeWb50ev47hnTsRIt9P4dxogeUo/hTu7j9+s9lLpEQXCvq6xocXQt0j8MV9qZBBXFLXVT3cWIkSqOdwt/5ZBg+1GSrc7WfCXVWgTk4a20uPMuJPxU4RQwZW6X3+O8Pqo8C3cW0OzZRFP6gUYUKUsTI5WntlS+LAxgw1mZNsozFGdbiOPRnEryE3SRldh9vjDR3tin1fGpA5P7+CEB/bqaXtG3V+F2OkqaMN
-// Critical Options:
-//         force-command /bin/sleep
-//         source-address 192.168.1.0/24
-// Extensions:
-//         permit-X11-forwarding
-//         permit-agent-forwarding
-//         permit-port-forwarding
-//         permit-pty
-//         permit-user-rc
-const exampleSSHCertWithOptions = `ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgDyysCJY0XrO1n03EeRRoITnTPdjENFmWDs9X58PP3VUAAAADAQABAAABAQDACh1rt2DXfV3hk6fszSQcQ/rueMId0kVD9U7nl8cfEnFxqOCrNT92g4laQIGl2mn8lsGZfTLg8ksHq3gkvgO3oo/0wHy4v32JeBOHTsN5AL4gfHNEhWeWb50ev47hnTsRIt9P4dxogeUo/hTu7j9+s9lLpEQXCvq6xocXQt0j8MV9qZBBXFLXVT3cWIkSqOdwt/5ZBg+1GSrc7WfCXVWgTk4a20uPMuJPxU4RQwZW6X3+O8Pqo8C3cW0OzZRFP6gUYUKUsTI5WntlS+LAxgw1mZNsozFGdbiOPRnEryE3SRldh9vjDR3tin1fGpA5P7+CEB/bqaXtG3V+F2OkqaMNAAAAAAAAAAAAAAABAAAACHRlc3RjZXJ0AAAAAAAAAAAAAAAA//////////8AAABLAAAADWZvcmNlLWNvbW1hbmQAAAAOAAAACi9iaW4vc2xlZXAAAAAOc291cmNlLWFkZHJlc3MAAAASAAAADjE5Mi4xNjguMS4wLzI0AAAAggAAABVwZXJtaXQtWDExLWZvcndhcmRpbmcAAAAAAAAAF3Blcm1pdC1hZ2VudC1mb3J3YXJkaW5nAAAAAAAAABZwZXJtaXQtcG9ydC1mb3J3YXJkaW5nAAAAAAAAAApwZXJtaXQtcHR5AAAAAAAAAA5wZXJtaXQtdXNlci1yYwAAAAAAAAAAAAABFwAAAAdzc2gtcnNhAAAAAwEAAQAAAQEAwU+c5ui5A8+J/CFpjW8wCa52bEODA808WWQDCSuTG/eMXNf59v9Y8Pk0F1E9dGCosSNyVcB/hacUrc6He+i97+HJCyKavBsE6GDxrjRyxYqAlfcOXi/IVmaUGiO8OQ39d4GHrjToInKvExSUeleQyH4Y4/e27T/pILAqPFL3fyrvMLT5qU9QyIt6zIpa7GBP5+urouNavMprV3zsfIqNBbWypinOQAw823a5wN+zwXnhZrgQiHZ/USG09Y6k98y1dTVz8YHlQVR4D3lpTAsKDKJ5hCH9WU4fdf+lU8OyNGaJ/vz0XNqxcToe1l4numLTnaoSuH89pHryjqurB7lJKwAAAQ8AAAAHc3NoLXJzYQAAAQCaHvUIoPL1zWUHIXLvu96/HU1s/i4CAW2IIEuGgxCUCiFj6vyTyYtgxQxcmbfZf6eaITlS6XJZa7Qq4iaFZh75C1DXTX8labXhRSD4E2t//AIP9MC1rtQC5xo6FmbQ+BoKcDskr+mNACcbRSxs3IL3bwCfWDnIw2WbVox9ZdcthJKk4UoCW4ix4QwdHw7zlddlz++fGEEVhmTbll1SUkycGApPFBsAYRTMupUJcYPIeReBI/m8XfkoMk99bV8ZJQTAd7OekHY2/48Ff53jLmyDjP7kNw1F8OaPtkFs6dGJXta4krmaekPy87j+35In5hFj7yoOqvSbmYUkeX70/GGQ`
-
-func TestParseCertWithOptions(t *testing.T) {
-	opts := map[string]string{
-		"source-address": "192.168.1.0/24",
-		"force-command":  "/bin/sleep",
-	}
-	exts := map[string]string{
-		"permit-X11-forwarding":   "",
-		"permit-agent-forwarding": "",
-		"permit-port-forwarding":  "",
-		"permit-pty":              "",
-		"permit-user-rc":          "",
-	}
-	authKeyBytes := []byte(exampleSSHCertWithOptions)
-
-	key, _, _, rest, err := ParseAuthorizedKey(authKeyBytes)
-	if err != nil {
-		t.Fatalf("ParseAuthorizedKey: %v", err)
-	}
-	if len(rest) > 0 {
-		t.Errorf("rest: got %q, want empty", rest)
-	}
-	cert, ok := key.(*Certificate)
-	if !ok {
-		t.Fatalf("got %v (%T), want *Certificate", key, key)
-	}
-	if !reflect.DeepEqual(cert.CriticalOptions, opts) {
-		t.Errorf("unexpected critical options - got %v, want %v", cert.CriticalOptions, opts)
-	}
-	if !reflect.DeepEqual(cert.Extensions, exts) {
-		t.Errorf("unexpected Extensions - got %v, want %v", cert.Extensions, exts)
-	}
-	marshaled := MarshalAuthorizedKey(key)
-	// Before comparison, remove the trailing newline that
-	// MarshalAuthorizedKey adds.
-	marshaled = marshaled[:len(marshaled)-1]
-	if !bytes.Equal(authKeyBytes, marshaled) {
-		t.Errorf("marshaled certificate does not match original: got %q, want %q", marshaled, authKeyBytes)
-	}
-}
-
-func TestValidateCert(t *testing.T) {
-	key, _, _, _, err := ParseAuthorizedKey([]byte(exampleSSHCert))
-	if err != nil {
-		t.Fatalf("ParseAuthorizedKey: %v", err)
-	}
-	validCert, ok := key.(*Certificate)
-	if !ok {
-		t.Fatalf("got %v (%T), want *Certificate", key, key)
-	}
-	checker := CertChecker{}
-	checker.IsUserAuthority = func(k PublicKey) bool {
-		return bytes.Equal(k.Marshal(), validCert.SignatureKey.Marshal())
-	}
-
-	if err := checker.CheckCert("user", validCert); err != nil {
-		t.Errorf("Unable to validate certificate: %v", err)
-	}
-	invalidCert := &Certificate{
-		Key:          testPublicKeys["rsa"],
-		SignatureKey: testPublicKeys["ecdsa"],
-		ValidBefore:  CertTimeInfinity,
-		Signature:    &Signature{},
-	}
-	if err := checker.CheckCert("user", invalidCert); err == nil {
-		t.Error("Invalid cert signature passed validation")
-	}
-}
-
-func TestValidateCertTime(t *testing.T) {
-	cert := Certificate{
-		ValidPrincipals: []string{"user"},
-		Key:             testPublicKeys["rsa"],
-		ValidAfter:      50,
-		ValidBefore:     100,
-	}
-
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-
-	for ts, ok := range map[int64]bool{
-		25:  false,
-		50:  true,
-		99:  true,
-		100: false,
-		125: false,
-	} {
-		checker := CertChecker{
-			Clock: func() time.Time { return time.Unix(ts, 0) },
-		}
-		checker.IsUserAuthority = func(k PublicKey) bool {
-			return bytes.Equal(k.Marshal(),
-				testPublicKeys["ecdsa"].Marshal())
-		}
-
-		if v := checker.CheckCert("user", &cert); (v == nil) != ok {
-			t.Errorf("Authenticate(%d): %v", ts, v)
-		}
-	}
-}
-
-// TODO(hanwen): tests for
-//
-// host keys:
-// * fallbacks
-
-func TestHostKeyCert(t *testing.T) {
-	cert := &Certificate{
-		ValidPrincipals: []string{"hostname", "hostname.domain", "otherhost"},
-		Key:             testPublicKeys["rsa"],
-		ValidBefore:     CertTimeInfinity,
-		CertType:        HostCert,
-	}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-
-	checker := &CertChecker{
-		IsHostAuthority: func(p PublicKey, addr string) bool {
-			return addr == "hostname:22" && bytes.Equal(testPublicKeys["ecdsa"].Marshal(), p.Marshal())
-		},
-	}
-
-	certSigner, err := NewCertSigner(cert, testSigners["rsa"])
-	if err != nil {
-		t.Errorf("NewCertSigner: %v", err)
-	}
-
-	for _, test := range []struct {
-		addr    string
-		succeed bool
-	}{
-		{addr: "hostname:22", succeed: true},
-		{addr: "otherhost:22", succeed: false}, // The certificate is valid for 'otherhost' as hostname, but we only recognize the authority of the signer for the address 'hostname:22'
-		{addr: "lasthost:22", succeed: false},
-	} {
-		c1, c2, err := netPipe()
-		if err != nil {
-			t.Fatalf("netPipe: %v", err)
-		}
-		defer c1.Close()
-		defer c2.Close()
-
-		errc := make(chan error)
-
-		go func() {
-			conf := ServerConfig{
-				NoClientAuth: true,
-			}
-			conf.AddHostKey(certSigner)
-			_, _, _, err := NewServerConn(c1, &conf)
-			errc <- err
-		}()
-
-		config := &ClientConfig{
-			User:            "user",
-			HostKeyCallback: checker.CheckHostKey,
-		}
-		_, _, _, err = NewClientConn(c2, test.addr, config)
-
-		if (err == nil) != test.succeed {
-			t.Fatalf("NewClientConn(%q): %v", test.addr, err)
-		}
-
-		err = <-errc
-		if (err == nil) != test.succeed {
-			t.Fatalf("NewServerConn(%q): %v", test.addr, err)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/channel.go b/installer/vendor/golang.org/x/crypto/ssh/channel.go
deleted file mode 100644
index 195530ea0d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/channel.go
+++ /dev/null
@@ -1,633 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"sync"
-)
-
-const (
-	minPacketLength = 9
-	// channelMaxPacket contains the maximum number of bytes that will be
-	// sent in a single packet. As per RFC 4253, section 6.1, 32k is also
-	// the minimum.
-	channelMaxPacket = 1 << 15
-	// We follow OpenSSH here.
-	channelWindowSize = 64 * channelMaxPacket
-)
-
-// NewChannel represents an incoming request to a channel. It must either be
-// accepted for use by calling Accept, or rejected by calling Reject.
-type NewChannel interface {
-	// Accept accepts the channel creation request. It returns the Channel
-	// and a Go channel containing SSH requests. The Go channel must be
-	// serviced otherwise the Channel will hang.
-	Accept() (Channel, <-chan *Request, error)
-
-	// Reject rejects the channel creation request. After calling
-	// this, no other methods on the Channel may be called.
-	Reject(reason RejectionReason, message string) error
-
-	// ChannelType returns the type of the channel, as supplied by the
-	// client.
-	ChannelType() string
-
-	// ExtraData returns the arbitrary payload for this channel, as supplied
-	// by the client. This data is specific to the channel type.
-	ExtraData() []byte
-}
-
-// A Channel is an ordered, reliable, flow-controlled, duplex stream
-// that is multiplexed over an SSH connection.
-type Channel interface {
-	// Read reads up to len(data) bytes from the channel.
-	Read(data []byte) (int, error)
-
-	// Write writes len(data) bytes to the channel.
-	Write(data []byte) (int, error)
-
-	// Close signals end of channel use. No data may be sent after this
-	// call.
-	Close() error
-
-	// CloseWrite signals the end of sending in-band
-	// data. Requests may still be sent, and the other side may
-	// still send data
-	CloseWrite() error
-
-	// SendRequest sends a channel request.  If wantReply is true,
-	// it will wait for a reply and return the result as a
-	// boolean, otherwise the return value will be false. Channel
-	// requests are out-of-band messages so they may be sent even
-	// if the data stream is closed or blocked by flow control.
-	// If the channel is closed before a reply is returned, io.EOF
-	// is returned.
-	SendRequest(name string, wantReply bool, payload []byte) (bool, error)
-
-	// Stderr returns an io.ReadWriter that writes to this channel
-	// with the extended data type set to stderr. Stderr may
-	// safely be read and written from a different goroutine than
-	// Read and Write respectively.
-	Stderr() io.ReadWriter
-}
-
-// Request is a request sent outside of the normal stream of
-// data. Requests can either be specific to an SSH channel, or they
-// can be global.
-type Request struct {
-	Type      string
-	WantReply bool
-	Payload   []byte
-
-	ch  *channel
-	mux *mux
-}
-
-// Reply sends a response to a request. It must be called for all requests
-// where WantReply is true and is a no-op otherwise. The payload argument is
-// ignored for replies to channel-specific requests.
-func (r *Request) Reply(ok bool, payload []byte) error {
-	if !r.WantReply {
-		return nil
-	}
-
-	if r.ch == nil {
-		return r.mux.ackRequest(ok, payload)
-	}
-
-	return r.ch.ackRequest(ok)
-}
-
-// RejectionReason is an enumeration used when rejecting channel creation
-// requests. See RFC 4254, section 5.1.
-type RejectionReason uint32
-
-const (
-	Prohibited RejectionReason = iota + 1
-	ConnectionFailed
-	UnknownChannelType
-	ResourceShortage
-)
-
-// String converts the rejection reason to human readable form.
-func (r RejectionReason) String() string {
-	switch r {
-	case Prohibited:
-		return "administratively prohibited"
-	case ConnectionFailed:
-		return "connect failed"
-	case UnknownChannelType:
-		return "unknown channel type"
-	case ResourceShortage:
-		return "resource shortage"
-	}
-	return fmt.Sprintf("unknown reason %d", int(r))
-}
-
-func min(a uint32, b int) uint32 {
-	if a < uint32(b) {
-		return a
-	}
-	return uint32(b)
-}
-
-type channelDirection uint8
-
-const (
-	channelInbound channelDirection = iota
-	channelOutbound
-)
-
-// channel is an implementation of the Channel interface that works
-// with the mux class.
-type channel struct {
-	// R/O after creation
-	chanType          string
-	extraData         []byte
-	localId, remoteId uint32
-
-	// maxIncomingPayload and maxRemotePayload are the maximum
-	// payload sizes of normal and extended data packets for
-	// receiving and sending, respectively. The wire packet will
-	// be 9 or 13 bytes larger (excluding encryption overhead).
-	maxIncomingPayload uint32
-	maxRemotePayload   uint32
-
-	mux *mux
-
-	// decided is set to true if an accept or reject message has been sent
-	// (for outbound channels) or received (for inbound channels).
-	decided bool
-
-	// direction contains either channelOutbound, for channels created
-	// locally, or channelInbound, for channels created by the peer.
-	direction channelDirection
-
-	// Pending internal channel messages.
-	msg chan interface{}
-
-	// Since requests have no ID, there can be only one request
-	// with WantReply=true outstanding.  This lock is held by a
-	// goroutine that has such an outgoing request pending.
-	sentRequestMu sync.Mutex
-
-	incomingRequests chan *Request
-
-	sentEOF bool
-
-	// thread-safe data
-	remoteWin  window
-	pending    *buffer
-	extPending *buffer
-
-	// windowMu protects myWindow, the flow-control window.
-	windowMu sync.Mutex
-	myWindow uint32
-
-	// writeMu serializes calls to mux.conn.writePacket() and
-	// protects sentClose and packetPool. This mutex must be
-	// different from windowMu, as writePacket can block if there
-	// is a key exchange pending.
-	writeMu   sync.Mutex
-	sentClose bool
-
-	// packetPool has a buffer for each extended channel ID to
-	// save allocations during writes.
-	packetPool map[uint32][]byte
-}
-
-// writePacket sends a packet. If the packet is a channel close, it updates
-// sentClose. This method takes the lock c.writeMu.
-func (c *channel) writePacket(packet []byte) error {
-	c.writeMu.Lock()
-	if c.sentClose {
-		c.writeMu.Unlock()
-		return io.EOF
-	}
-	c.sentClose = (packet[0] == msgChannelClose)
-	err := c.mux.conn.writePacket(packet)
-	c.writeMu.Unlock()
-	return err
-}
-
-func (c *channel) sendMessage(msg interface{}) error {
-	if debugMux {
-		log.Printf("send(%d): %#v", c.mux.chanList.offset, msg)
-	}
-
-	p := Marshal(msg)
-	binary.BigEndian.PutUint32(p[1:], c.remoteId)
-	return c.writePacket(p)
-}
-
-// WriteExtended writes data to a specific extended stream. These streams are
-// used, for example, for stderr.
-func (c *channel) WriteExtended(data []byte, extendedCode uint32) (n int, err error) {
-	if c.sentEOF {
-		return 0, io.EOF
-	}
-	// 1 byte message type, 4 bytes remoteId, 4 bytes data length
-	opCode := byte(msgChannelData)
-	headerLength := uint32(9)
-	if extendedCode > 0 {
-		headerLength += 4
-		opCode = msgChannelExtendedData
-	}
-
-	c.writeMu.Lock()
-	packet := c.packetPool[extendedCode]
-	// We don't remove the buffer from packetPool, so
-	// WriteExtended calls from different goroutines will be
-	// flagged as errors by the race detector.
-	c.writeMu.Unlock()
-
-	for len(data) > 0 {
-		space := min(c.maxRemotePayload, len(data))
-		if space, err = c.remoteWin.reserve(space); err != nil {
-			return n, err
-		}
-		if want := headerLength + space; uint32(cap(packet)) < want {
-			packet = make([]byte, want)
-		} else {
-			packet = packet[:want]
-		}
-
-		todo := data[:space]
-
-		packet[0] = opCode
-		binary.BigEndian.PutUint32(packet[1:], c.remoteId)
-		if extendedCode > 0 {
-			binary.BigEndian.PutUint32(packet[5:], uint32(extendedCode))
-		}
-		binary.BigEndian.PutUint32(packet[headerLength-4:], uint32(len(todo)))
-		copy(packet[headerLength:], todo)
-		if err = c.writePacket(packet); err != nil {
-			return n, err
-		}
-
-		n += len(todo)
-		data = data[len(todo):]
-	}
-
-	c.writeMu.Lock()
-	c.packetPool[extendedCode] = packet
-	c.writeMu.Unlock()
-
-	return n, err
-}
-
-func (c *channel) handleData(packet []byte) error {
-	headerLen := 9
-	isExtendedData := packet[0] == msgChannelExtendedData
-	if isExtendedData {
-		headerLen = 13
-	}
-	if len(packet) < headerLen {
-		// malformed data packet
-		return parseError(packet[0])
-	}
-
-	var extended uint32
-	if isExtendedData {
-		extended = binary.BigEndian.Uint32(packet[5:])
-	}
-
-	length := binary.BigEndian.Uint32(packet[headerLen-4 : headerLen])
-	if length == 0 {
-		return nil
-	}
-	if length > c.maxIncomingPayload {
-		// TODO(hanwen): should send Disconnect?
-		return errors.New("ssh: incoming packet exceeds maximum payload size")
-	}
-
-	data := packet[headerLen:]
-	if length != uint32(len(data)) {
-		return errors.New("ssh: wrong packet length")
-	}
-
-	c.windowMu.Lock()
-	if c.myWindow < length {
-		c.windowMu.Unlock()
-		// TODO(hanwen): should send Disconnect with reason?
-		return errors.New("ssh: remote side wrote too much")
-	}
-	c.myWindow -= length
-	c.windowMu.Unlock()
-
-	if extended == 1 {
-		c.extPending.write(data)
-	} else if extended > 0 {
-		// discard other extended data.
-	} else {
-		c.pending.write(data)
-	}
-	return nil
-}
-
-func (c *channel) adjustWindow(n uint32) error {
-	c.windowMu.Lock()
-	// Since myWindow is managed on our side, and can never exceed
-	// the initial window setting, we don't worry about overflow.
-	c.myWindow += uint32(n)
-	c.windowMu.Unlock()
-	return c.sendMessage(windowAdjustMsg{
-		AdditionalBytes: uint32(n),
-	})
-}
-
-func (c *channel) ReadExtended(data []byte, extended uint32) (n int, err error) {
-	switch extended {
-	case 1:
-		n, err = c.extPending.Read(data)
-	case 0:
-		n, err = c.pending.Read(data)
-	default:
-		return 0, fmt.Errorf("ssh: extended code %d unimplemented", extended)
-	}
-
-	if n > 0 {
-		err = c.adjustWindow(uint32(n))
-		// sendWindowAdjust can return io.EOF if the remote
-		// peer has closed the connection, however we want to
-		// defer forwarding io.EOF to the caller of Read until
-		// the buffer has been drained.
-		if n > 0 && err == io.EOF {
-			err = nil
-		}
-	}
-
-	return n, err
-}
-
-func (c *channel) close() {
-	c.pending.eof()
-	c.extPending.eof()
-	close(c.msg)
-	close(c.incomingRequests)
-	c.writeMu.Lock()
-	// This is not necessary for a normal channel teardown, but if
-	// there was another error, it is.
-	c.sentClose = true
-	c.writeMu.Unlock()
-	// Unblock writers.
-	c.remoteWin.close()
-}
-
-// responseMessageReceived is called when a success or failure message is
-// received on a channel to check that such a message is reasonable for the
-// given channel.
-func (c *channel) responseMessageReceived() error {
-	if c.direction == channelInbound {
-		return errors.New("ssh: channel response message received on inbound channel")
-	}
-	if c.decided {
-		return errors.New("ssh: duplicate response received for channel")
-	}
-	c.decided = true
-	return nil
-}
-
-func (c *channel) handlePacket(packet []byte) error {
-	switch packet[0] {
-	case msgChannelData, msgChannelExtendedData:
-		return c.handleData(packet)
-	case msgChannelClose:
-		c.sendMessage(channelCloseMsg{PeersId: c.remoteId})
-		c.mux.chanList.remove(c.localId)
-		c.close()
-		return nil
-	case msgChannelEOF:
-		// RFC 4254 is mute on how EOF affects dataExt messages but
-		// it is logical to signal EOF at the same time.
-		c.extPending.eof()
-		c.pending.eof()
-		return nil
-	}
-
-	decoded, err := decode(packet)
-	if err != nil {
-		return err
-	}
-
-	switch msg := decoded.(type) {
-	case *channelOpenFailureMsg:
-		if err := c.responseMessageReceived(); err != nil {
-			return err
-		}
-		c.mux.chanList.remove(msg.PeersId)
-		c.msg <- msg
-	case *channelOpenConfirmMsg:
-		if err := c.responseMessageReceived(); err != nil {
-			return err
-		}
-		if msg.MaxPacketSize < minPacketLength || msg.MaxPacketSize > 1<<31 {
-			return fmt.Errorf("ssh: invalid MaxPacketSize %d from peer", msg.MaxPacketSize)
-		}
-		c.remoteId = msg.MyId
-		c.maxRemotePayload = msg.MaxPacketSize
-		c.remoteWin.add(msg.MyWindow)
-		c.msg <- msg
-	case *windowAdjustMsg:
-		if !c.remoteWin.add(msg.AdditionalBytes) {
-			return fmt.Errorf("ssh: invalid window update for %d bytes", msg.AdditionalBytes)
-		}
-	case *channelRequestMsg:
-		req := Request{
-			Type:      msg.Request,
-			WantReply: msg.WantReply,
-			Payload:   msg.RequestSpecificData,
-			ch:        c,
-		}
-
-		c.incomingRequests <- &req
-	default:
-		c.msg <- msg
-	}
-	return nil
-}
-
-func (m *mux) newChannel(chanType string, direction channelDirection, extraData []byte) *channel {
-	ch := &channel{
-		remoteWin:        window{Cond: newCond()},
-		myWindow:         channelWindowSize,
-		pending:          newBuffer(),
-		extPending:       newBuffer(),
-		direction:        direction,
-		incomingRequests: make(chan *Request, chanSize),
-		msg:              make(chan interface{}, chanSize),
-		chanType:         chanType,
-		extraData:        extraData,
-		mux:              m,
-		packetPool:       make(map[uint32][]byte),
-	}
-	ch.localId = m.chanList.add(ch)
-	return ch
-}
-
-var errUndecided = errors.New("ssh: must Accept or Reject channel")
-var errDecidedAlready = errors.New("ssh: can call Accept or Reject only once")
-
-type extChannel struct {
-	code uint32
-	ch   *channel
-}
-
-func (e *extChannel) Write(data []byte) (n int, err error) {
-	return e.ch.WriteExtended(data, e.code)
-}
-
-func (e *extChannel) Read(data []byte) (n int, err error) {
-	return e.ch.ReadExtended(data, e.code)
-}
-
-func (c *channel) Accept() (Channel, <-chan *Request, error) {
-	if c.decided {
-		return nil, nil, errDecidedAlready
-	}
-	c.maxIncomingPayload = channelMaxPacket
-	confirm := channelOpenConfirmMsg{
-		PeersId:       c.remoteId,
-		MyId:          c.localId,
-		MyWindow:      c.myWindow,
-		MaxPacketSize: c.maxIncomingPayload,
-	}
-	c.decided = true
-	if err := c.sendMessage(confirm); err != nil {
-		return nil, nil, err
-	}
-
-	return c, c.incomingRequests, nil
-}
-
-func (ch *channel) Reject(reason RejectionReason, message string) error {
-	if ch.decided {
-		return errDecidedAlready
-	}
-	reject := channelOpenFailureMsg{
-		PeersId:  ch.remoteId,
-		Reason:   reason,
-		Message:  message,
-		Language: "en",
-	}
-	ch.decided = true
-	return ch.sendMessage(reject)
-}
-
-func (ch *channel) Read(data []byte) (int, error) {
-	if !ch.decided {
-		return 0, errUndecided
-	}
-	return ch.ReadExtended(data, 0)
-}
-
-func (ch *channel) Write(data []byte) (int, error) {
-	if !ch.decided {
-		return 0, errUndecided
-	}
-	return ch.WriteExtended(data, 0)
-}
-
-func (ch *channel) CloseWrite() error {
-	if !ch.decided {
-		return errUndecided
-	}
-	ch.sentEOF = true
-	return ch.sendMessage(channelEOFMsg{
-		PeersId: ch.remoteId})
-}
-
-func (ch *channel) Close() error {
-	if !ch.decided {
-		return errUndecided
-	}
-
-	return ch.sendMessage(channelCloseMsg{
-		PeersId: ch.remoteId})
-}
-
-// Extended returns an io.ReadWriter that sends and receives data on the given,
-// SSH extended stream. Such streams are used, for example, for stderr.
-func (ch *channel) Extended(code uint32) io.ReadWriter {
-	if !ch.decided {
-		return nil
-	}
-	return &extChannel{code, ch}
-}
-
-func (ch *channel) Stderr() io.ReadWriter {
-	return ch.Extended(1)
-}
-
-func (ch *channel) SendRequest(name string, wantReply bool, payload []byte) (bool, error) {
-	if !ch.decided {
-		return false, errUndecided
-	}
-
-	if wantReply {
-		ch.sentRequestMu.Lock()
-		defer ch.sentRequestMu.Unlock()
-	}
-
-	msg := channelRequestMsg{
-		PeersId:             ch.remoteId,
-		Request:             name,
-		WantReply:           wantReply,
-		RequestSpecificData: payload,
-	}
-
-	if err := ch.sendMessage(msg); err != nil {
-		return false, err
-	}
-
-	if wantReply {
-		m, ok := (<-ch.msg)
-		if !ok {
-			return false, io.EOF
-		}
-		switch m.(type) {
-		case *channelRequestFailureMsg:
-			return false, nil
-		case *channelRequestSuccessMsg:
-			return true, nil
-		default:
-			return false, fmt.Errorf("ssh: unexpected response to channel request: %#v", m)
-		}
-	}
-
-	return false, nil
-}
-
-// ackRequest either sends an ack or nack to the channel request.
-func (ch *channel) ackRequest(ok bool) error {
-	if !ch.decided {
-		return errUndecided
-	}
-
-	var msg interface{}
-	if !ok {
-		msg = channelRequestFailureMsg{
-			PeersId: ch.remoteId,
-		}
-	} else {
-		msg = channelRequestSuccessMsg{
-			PeersId: ch.remoteId,
-		}
-	}
-	return ch.sendMessage(msg)
-}
-
-func (ch *channel) ChannelType() string {
-	return ch.chanType
-}
-
-func (ch *channel) ExtraData() []byte {
-	return ch.extraData
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/cipher.go b/installer/vendor/golang.org/x/crypto/ssh/cipher.go
deleted file mode 100644
index 22bb30ccd7..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/cipher.go
+++ /dev/null
@@ -1,629 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto/aes"
-	"crypto/cipher"
-	"crypto/des"
-	"crypto/rc4"
-	"crypto/subtle"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"hash"
-	"io"
-	"io/ioutil"
-)
-
-const (
-	packetSizeMultiple = 16 // TODO(huin) this should be determined by the cipher.
-
-	// RFC 4253 section 6.1 defines a minimum packet size of 32768 that implementations
-	// MUST be able to process (plus a few more kilobytes for padding and mac). The RFC
-	// indicates implementations SHOULD be able to handle larger packet sizes, but then
-	// waffles on about reasonable limits.
-	//
-	// OpenSSH caps their maxPacket at 256kB so we choose to do
-	// the same. maxPacket is also used to ensure that uint32
-	// length fields do not overflow, so it should remain well
-	// below 4G.
-	maxPacket = 256 * 1024
-)
-
-// noneCipher implements cipher.Stream and provides no encryption. It is used
-// by the transport before the first key-exchange.
-type noneCipher struct{}
-
-func (c noneCipher) XORKeyStream(dst, src []byte) {
-	copy(dst, src)
-}
-
-func newAESCTR(key, iv []byte) (cipher.Stream, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-	return cipher.NewCTR(c, iv), nil
-}
-
-func newRC4(key, iv []byte) (cipher.Stream, error) {
-	return rc4.NewCipher(key)
-}
-
-type streamCipherMode struct {
-	keySize    int
-	ivSize     int
-	skip       int
-	createFunc func(key, iv []byte) (cipher.Stream, error)
-}
-
-func (c *streamCipherMode) createStream(key, iv []byte) (cipher.Stream, error) {
-	if len(key) < c.keySize {
-		panic("ssh: key length too small for cipher")
-	}
-	if len(iv) < c.ivSize {
-		panic("ssh: iv too small for cipher")
-	}
-
-	stream, err := c.createFunc(key[:c.keySize], iv[:c.ivSize])
-	if err != nil {
-		return nil, err
-	}
-
-	var streamDump []byte
-	if c.skip > 0 {
-		streamDump = make([]byte, 512)
-	}
-
-	for remainingToDump := c.skip; remainingToDump > 0; {
-		dumpThisTime := remainingToDump
-		if dumpThisTime > len(streamDump) {
-			dumpThisTime = len(streamDump)
-		}
-		stream.XORKeyStream(streamDump[:dumpThisTime], streamDump[:dumpThisTime])
-		remainingToDump -= dumpThisTime
-	}
-
-	return stream, nil
-}
-
-// cipherModes documents properties of supported ciphers. Ciphers not included
-// are not supported and will not be negotiated, even if explicitly requested in
-// ClientConfig.Crypto.Ciphers.
-var cipherModes = map[string]*streamCipherMode{
-	// Ciphers from RFC4344, which introduced many CTR-based ciphers. Algorithms
-	// are defined in the order specified in the RFC.
-	"aes128-ctr": {16, aes.BlockSize, 0, newAESCTR},
-	"aes192-ctr": {24, aes.BlockSize, 0, newAESCTR},
-	"aes256-ctr": {32, aes.BlockSize, 0, newAESCTR},
-
-	// Ciphers from RFC4345, which introduces security-improved arcfour ciphers.
-	// They are defined in the order specified in the RFC.
-	"arcfour128": {16, 0, 1536, newRC4},
-	"arcfour256": {32, 0, 1536, newRC4},
-
-	// Cipher defined in RFC 4253, which describes SSH Transport Layer Protocol.
-	// Note that this cipher is not safe, as stated in RFC 4253: "Arcfour (and
-	// RC4) has problems with weak keys, and should be used with caution."
-	// RFC4345 introduces improved versions of Arcfour.
-	"arcfour": {16, 0, 0, newRC4},
-
-	// AES-GCM is not a stream cipher, so it is constructed with a
-	// special case. If we add any more non-stream ciphers, we
-	// should invest a cleaner way to do this.
-	gcmCipherID: {16, 12, 0, nil},
-
-	// CBC mode is insecure and so is not included in the default config.
-	// (See http://www.isg.rhul.ac.uk/~kp/SandPfinal.pdf). If absolutely
-	// needed, it's possible to specify a custom Config to enable it.
-	// You should expect that an active attacker can recover plaintext if
-	// you do.
-	aes128cbcID: {16, aes.BlockSize, 0, nil},
-
-	// 3des-cbc is insecure and is disabled by default.
-	tripledescbcID: {24, des.BlockSize, 0, nil},
-}
-
-// prefixLen is the length of the packet prefix that contains the packet length
-// and number of padding bytes.
-const prefixLen = 5
-
-// streamPacketCipher is a packetCipher using a stream cipher.
-type streamPacketCipher struct {
-	mac    hash.Hash
-	cipher cipher.Stream
-	etm    bool
-
-	// The following members are to avoid per-packet allocations.
-	prefix      [prefixLen]byte
-	seqNumBytes [4]byte
-	padding     [2 * packetSizeMultiple]byte
-	packetData  []byte
-	macResult   []byte
-}
-
-// readPacket reads and decrypt a single packet from the reader argument.
-func (s *streamPacketCipher) readPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	if _, err := io.ReadFull(r, s.prefix[:]); err != nil {
-		return nil, err
-	}
-
-	var encryptedPaddingLength [1]byte
-	if s.mac != nil && s.etm {
-		copy(encryptedPaddingLength[:], s.prefix[4:5])
-		s.cipher.XORKeyStream(s.prefix[4:5], s.prefix[4:5])
-	} else {
-		s.cipher.XORKeyStream(s.prefix[:], s.prefix[:])
-	}
-
-	length := binary.BigEndian.Uint32(s.prefix[0:4])
-	paddingLength := uint32(s.prefix[4])
-
-	var macSize uint32
-	if s.mac != nil {
-		s.mac.Reset()
-		binary.BigEndian.PutUint32(s.seqNumBytes[:], seqNum)
-		s.mac.Write(s.seqNumBytes[:])
-		if s.etm {
-			s.mac.Write(s.prefix[:4])
-			s.mac.Write(encryptedPaddingLength[:])
-		} else {
-			s.mac.Write(s.prefix[:])
-		}
-		macSize = uint32(s.mac.Size())
-	}
-
-	if length <= paddingLength+1 {
-		return nil, errors.New("ssh: invalid packet length, packet too small")
-	}
-
-	if length > maxPacket {
-		return nil, errors.New("ssh: invalid packet length, packet too large")
-	}
-
-	// the maxPacket check above ensures that length-1+macSize
-	// does not overflow.
-	if uint32(cap(s.packetData)) < length-1+macSize {
-		s.packetData = make([]byte, length-1+macSize)
-	} else {
-		s.packetData = s.packetData[:length-1+macSize]
-	}
-
-	if _, err := io.ReadFull(r, s.packetData); err != nil {
-		return nil, err
-	}
-	mac := s.packetData[length-1:]
-	data := s.packetData[:length-1]
-
-	if s.mac != nil && s.etm {
-		s.mac.Write(data)
-	}
-
-	s.cipher.XORKeyStream(data, data)
-
-	if s.mac != nil {
-		if !s.etm {
-			s.mac.Write(data)
-		}
-		s.macResult = s.mac.Sum(s.macResult[:0])
-		if subtle.ConstantTimeCompare(s.macResult, mac) != 1 {
-			return nil, errors.New("ssh: MAC failure")
-		}
-	}
-
-	return s.packetData[:length-paddingLength-1], nil
-}
-
-// writePacket encrypts and sends a packet of data to the writer argument
-func (s *streamPacketCipher) writePacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	if len(packet) > maxPacket {
-		return errors.New("ssh: packet too large")
-	}
-
-	aadlen := 0
-	if s.mac != nil && s.etm {
-		// packet length is not encrypted for EtM modes
-		aadlen = 4
-	}
-
-	paddingLength := packetSizeMultiple - (prefixLen+len(packet)-aadlen)%packetSizeMultiple
-	if paddingLength < 4 {
-		paddingLength += packetSizeMultiple
-	}
-
-	length := len(packet) + 1 + paddingLength
-	binary.BigEndian.PutUint32(s.prefix[:], uint32(length))
-	s.prefix[4] = byte(paddingLength)
-	padding := s.padding[:paddingLength]
-	if _, err := io.ReadFull(rand, padding); err != nil {
-		return err
-	}
-
-	if s.mac != nil {
-		s.mac.Reset()
-		binary.BigEndian.PutUint32(s.seqNumBytes[:], seqNum)
-		s.mac.Write(s.seqNumBytes[:])
-
-		if s.etm {
-			// For EtM algorithms, the packet length must stay unencrypted,
-			// but the following data (padding length) must be encrypted
-			s.cipher.XORKeyStream(s.prefix[4:5], s.prefix[4:5])
-		}
-
-		s.mac.Write(s.prefix[:])
-
-		if !s.etm {
-			// For non-EtM algorithms, the algorithm is applied on unencrypted data
-			s.mac.Write(packet)
-			s.mac.Write(padding)
-		}
-	}
-
-	if !(s.mac != nil && s.etm) {
-		// For EtM algorithms, the padding length has already been encrypted
-		// and the packet length must remain unencrypted
-		s.cipher.XORKeyStream(s.prefix[:], s.prefix[:])
-	}
-
-	s.cipher.XORKeyStream(packet, packet)
-	s.cipher.XORKeyStream(padding, padding)
-
-	if s.mac != nil && s.etm {
-		// For EtM algorithms, packet and padding must be encrypted
-		s.mac.Write(packet)
-		s.mac.Write(padding)
-	}
-
-	if _, err := w.Write(s.prefix[:]); err != nil {
-		return err
-	}
-	if _, err := w.Write(packet); err != nil {
-		return err
-	}
-	if _, err := w.Write(padding); err != nil {
-		return err
-	}
-
-	if s.mac != nil {
-		s.macResult = s.mac.Sum(s.macResult[:0])
-		if _, err := w.Write(s.macResult); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-type gcmCipher struct {
-	aead   cipher.AEAD
-	prefix [4]byte
-	iv     []byte
-	buf    []byte
-}
-
-func newGCMCipher(iv, key, macKey []byte) (packetCipher, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	aead, err := cipher.NewGCM(c)
-	if err != nil {
-		return nil, err
-	}
-
-	return &gcmCipher{
-		aead: aead,
-		iv:   iv,
-	}, nil
-}
-
-const gcmTagSize = 16
-
-func (c *gcmCipher) writePacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	// Pad out to multiple of 16 bytes. This is different from the
-	// stream cipher because that encrypts the length too.
-	padding := byte(packetSizeMultiple - (1+len(packet))%packetSizeMultiple)
-	if padding < 4 {
-		padding += packetSizeMultiple
-	}
-
-	length := uint32(len(packet) + int(padding) + 1)
-	binary.BigEndian.PutUint32(c.prefix[:], length)
-	if _, err := w.Write(c.prefix[:]); err != nil {
-		return err
-	}
-
-	if cap(c.buf) < int(length) {
-		c.buf = make([]byte, length)
-	} else {
-		c.buf = c.buf[:length]
-	}
-
-	c.buf[0] = padding
-	copy(c.buf[1:], packet)
-	if _, err := io.ReadFull(rand, c.buf[1+len(packet):]); err != nil {
-		return err
-	}
-	c.buf = c.aead.Seal(c.buf[:0], c.iv, c.buf, c.prefix[:])
-	if _, err := w.Write(c.buf); err != nil {
-		return err
-	}
-	c.incIV()
-
-	return nil
-}
-
-func (c *gcmCipher) incIV() {
-	for i := 4 + 7; i >= 4; i-- {
-		c.iv[i]++
-		if c.iv[i] != 0 {
-			break
-		}
-	}
-}
-
-func (c *gcmCipher) readPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	if _, err := io.ReadFull(r, c.prefix[:]); err != nil {
-		return nil, err
-	}
-	length := binary.BigEndian.Uint32(c.prefix[:])
-	if length > maxPacket {
-		return nil, errors.New("ssh: max packet length exceeded.")
-	}
-
-	if cap(c.buf) < int(length+gcmTagSize) {
-		c.buf = make([]byte, length+gcmTagSize)
-	} else {
-		c.buf = c.buf[:length+gcmTagSize]
-	}
-
-	if _, err := io.ReadFull(r, c.buf); err != nil {
-		return nil, err
-	}
-
-	plain, err := c.aead.Open(c.buf[:0], c.iv, c.buf, c.prefix[:])
-	if err != nil {
-		return nil, err
-	}
-	c.incIV()
-
-	padding := plain[0]
-	if padding < 4 {
-		// padding is a byte, so it automatically satisfies
-		// the maximum size, which is 255.
-		return nil, fmt.Errorf("ssh: illegal padding %d", padding)
-	}
-
-	if int(padding+1) >= len(plain) {
-		return nil, fmt.Errorf("ssh: padding %d too large", padding)
-	}
-	plain = plain[1 : length-uint32(padding)]
-	return plain, nil
-}
-
-// cbcCipher implements aes128-cbc cipher defined in RFC 4253 section 6.1
-type cbcCipher struct {
-	mac       hash.Hash
-	macSize   uint32
-	decrypter cipher.BlockMode
-	encrypter cipher.BlockMode
-
-	// The following members are to avoid per-packet allocations.
-	seqNumBytes [4]byte
-	packetData  []byte
-	macResult   []byte
-
-	// Amount of data we should still read to hide which
-	// verification error triggered.
-	oracleCamouflage uint32
-}
-
-func newCBCCipher(c cipher.Block, iv, key, macKey []byte, algs directionAlgorithms) (packetCipher, error) {
-	cbc := &cbcCipher{
-		mac:        macModes[algs.MAC].new(macKey),
-		decrypter:  cipher.NewCBCDecrypter(c, iv),
-		encrypter:  cipher.NewCBCEncrypter(c, iv),
-		packetData: make([]byte, 1024),
-	}
-	if cbc.mac != nil {
-		cbc.macSize = uint32(cbc.mac.Size())
-	}
-
-	return cbc, nil
-}
-
-func newAESCBCCipher(iv, key, macKey []byte, algs directionAlgorithms) (packetCipher, error) {
-	c, err := aes.NewCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	cbc, err := newCBCCipher(c, iv, key, macKey, algs)
-	if err != nil {
-		return nil, err
-	}
-
-	return cbc, nil
-}
-
-func newTripleDESCBCCipher(iv, key, macKey []byte, algs directionAlgorithms) (packetCipher, error) {
-	c, err := des.NewTripleDESCipher(key)
-	if err != nil {
-		return nil, err
-	}
-
-	cbc, err := newCBCCipher(c, iv, key, macKey, algs)
-	if err != nil {
-		return nil, err
-	}
-
-	return cbc, nil
-}
-
-func maxUInt32(a, b int) uint32 {
-	if a > b {
-		return uint32(a)
-	}
-	return uint32(b)
-}
-
-const (
-	cbcMinPacketSizeMultiple = 8
-	cbcMinPacketSize         = 16
-	cbcMinPaddingSize        = 4
-)
-
-// cbcError represents a verification error that may leak information.
-type cbcError string
-
-func (e cbcError) Error() string { return string(e) }
-
-func (c *cbcCipher) readPacket(seqNum uint32, r io.Reader) ([]byte, error) {
-	p, err := c.readPacketLeaky(seqNum, r)
-	if err != nil {
-		if _, ok := err.(cbcError); ok {
-			// Verification error: read a fixed amount of
-			// data, to make distinguishing between
-			// failing MAC and failing length check more
-			// difficult.
-			io.CopyN(ioutil.Discard, r, int64(c.oracleCamouflage))
-		}
-	}
-	return p, err
-}
-
-func (c *cbcCipher) readPacketLeaky(seqNum uint32, r io.Reader) ([]byte, error) {
-	blockSize := c.decrypter.BlockSize()
-
-	// Read the header, which will include some of the subsequent data in the
-	// case of block ciphers - this is copied back to the payload later.
-	// How many bytes of payload/padding will be read with this first read.
-	firstBlockLength := uint32((prefixLen + blockSize - 1) / blockSize * blockSize)
-	firstBlock := c.packetData[:firstBlockLength]
-	if _, err := io.ReadFull(r, firstBlock); err != nil {
-		return nil, err
-	}
-
-	c.oracleCamouflage = maxPacket + 4 + c.macSize - firstBlockLength
-
-	c.decrypter.CryptBlocks(firstBlock, firstBlock)
-	length := binary.BigEndian.Uint32(firstBlock[:4])
-	if length > maxPacket {
-		return nil, cbcError("ssh: packet too large")
-	}
-	if length+4 < maxUInt32(cbcMinPacketSize, blockSize) {
-		// The minimum size of a packet is 16 (or the cipher block size, whichever
-		// is larger) bytes.
-		return nil, cbcError("ssh: packet too small")
-	}
-	// The length of the packet (including the length field but not the MAC) must
-	// be a multiple of the block size or 8, whichever is larger.
-	if (length+4)%maxUInt32(cbcMinPacketSizeMultiple, blockSize) != 0 {
-		return nil, cbcError("ssh: invalid packet length multiple")
-	}
-
-	paddingLength := uint32(firstBlock[4])
-	if paddingLength < cbcMinPaddingSize || length <= paddingLength+1 {
-		return nil, cbcError("ssh: invalid packet length")
-	}
-
-	// Positions within the c.packetData buffer:
-	macStart := 4 + length
-	paddingStart := macStart - paddingLength
-
-	// Entire packet size, starting before length, ending at end of mac.
-	entirePacketSize := macStart + c.macSize
-
-	// Ensure c.packetData is large enough for the entire packet data.
-	if uint32(cap(c.packetData)) < entirePacketSize {
-		// Still need to upsize and copy, but this should be rare at runtime, only
-		// on upsizing the packetData buffer.
-		c.packetData = make([]byte, entirePacketSize)
-		copy(c.packetData, firstBlock)
-	} else {
-		c.packetData = c.packetData[:entirePacketSize]
-	}
-
-	if n, err := io.ReadFull(r, c.packetData[firstBlockLength:]); err != nil {
-		return nil, err
-	} else {
-		c.oracleCamouflage -= uint32(n)
-	}
-
-	remainingCrypted := c.packetData[firstBlockLength:macStart]
-	c.decrypter.CryptBlocks(remainingCrypted, remainingCrypted)
-
-	mac := c.packetData[macStart:]
-	if c.mac != nil {
-		c.mac.Reset()
-		binary.BigEndian.PutUint32(c.seqNumBytes[:], seqNum)
-		c.mac.Write(c.seqNumBytes[:])
-		c.mac.Write(c.packetData[:macStart])
-		c.macResult = c.mac.Sum(c.macResult[:0])
-		if subtle.ConstantTimeCompare(c.macResult, mac) != 1 {
-			return nil, cbcError("ssh: MAC failure")
-		}
-	}
-
-	return c.packetData[prefixLen:paddingStart], nil
-}
-
-func (c *cbcCipher) writePacket(seqNum uint32, w io.Writer, rand io.Reader, packet []byte) error {
-	effectiveBlockSize := maxUInt32(cbcMinPacketSizeMultiple, c.encrypter.BlockSize())
-
-	// Length of encrypted portion of the packet (header, payload, padding).
-	// Enforce minimum padding and packet size.
-	encLength := maxUInt32(prefixLen+len(packet)+cbcMinPaddingSize, cbcMinPaddingSize)
-	// Enforce block size.
-	encLength = (encLength + effectiveBlockSize - 1) / effectiveBlockSize * effectiveBlockSize
-
-	length := encLength - 4
-	paddingLength := int(length) - (1 + len(packet))
-
-	// Overall buffer contains: header, payload, padding, mac.
-	// Space for the MAC is reserved in the capacity but not the slice length.
-	bufferSize := encLength + c.macSize
-	if uint32(cap(c.packetData)) < bufferSize {
-		c.packetData = make([]byte, encLength, bufferSize)
-	} else {
-		c.packetData = c.packetData[:encLength]
-	}
-
-	p := c.packetData
-
-	// Packet header.
-	binary.BigEndian.PutUint32(p, length)
-	p = p[4:]
-	p[0] = byte(paddingLength)
-
-	// Payload.
-	p = p[1:]
-	copy(p, packet)
-
-	// Padding.
-	p = p[len(packet):]
-	if _, err := io.ReadFull(rand, p); err != nil {
-		return err
-	}
-
-	if c.mac != nil {
-		c.mac.Reset()
-		binary.BigEndian.PutUint32(c.seqNumBytes[:], seqNum)
-		c.mac.Write(c.seqNumBytes[:])
-		c.mac.Write(c.packetData)
-		// The MAC is now appended into the capacity reserved for it earlier.
-		c.packetData = c.mac.Sum(c.packetData)
-	}
-
-	c.encrypter.CryptBlocks(c.packetData[:encLength], c.packetData[:encLength])
-
-	if _, err := w.Write(c.packetData); err != nil {
-		return err
-	}
-
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/cipher_test.go b/installer/vendor/golang.org/x/crypto/ssh/cipher_test.go
deleted file mode 100644
index 5cfa17a62d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/cipher_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/aes"
-	"crypto/rand"
-	"testing"
-)
-
-func TestDefaultCiphersExist(t *testing.T) {
-	for _, cipherAlgo := range supportedCiphers {
-		if _, ok := cipherModes[cipherAlgo]; !ok {
-			t.Errorf("default cipher %q is unknown", cipherAlgo)
-		}
-	}
-}
-
-func TestPacketCiphers(t *testing.T) {
-	// Still test aes128cbc cipher although it's commented out.
-	cipherModes[aes128cbcID] = &streamCipherMode{16, aes.BlockSize, 0, nil}
-	defer delete(cipherModes, aes128cbcID)
-
-	for cipher := range cipherModes {
-		for mac := range macModes {
-			kr := &kexResult{Hash: crypto.SHA1}
-			algs := directionAlgorithms{
-				Cipher:      cipher,
-				MAC:         mac,
-				Compression: "none",
-			}
-			client, err := newPacketCipher(clientKeys, algs, kr)
-			if err != nil {
-				t.Errorf("newPacketCipher(client, %q, %q): %v", cipher, mac, err)
-				continue
-			}
-			server, err := newPacketCipher(clientKeys, algs, kr)
-			if err != nil {
-				t.Errorf("newPacketCipher(client, %q, %q): %v", cipher, mac, err)
-				continue
-			}
-
-			want := "bla bla"
-			input := []byte(want)
-			buf := &bytes.Buffer{}
-			if err := client.writePacket(0, buf, rand.Reader, input); err != nil {
-				t.Errorf("writePacket(%q, %q): %v", cipher, mac, err)
-				continue
-			}
-
-			packet, err := server.readPacket(0, buf)
-			if err != nil {
-				t.Errorf("readPacket(%q, %q): %v", cipher, mac, err)
-				continue
-			}
-
-			if string(packet) != want {
-				t.Errorf("roundtrip(%q, %q): got %q, want %q", cipher, mac, packet, want)
-			}
-		}
-	}
-}
-
-func TestCBCOracleCounterMeasure(t *testing.T) {
-	cipherModes[aes128cbcID] = &streamCipherMode{16, aes.BlockSize, 0, nil}
-	defer delete(cipherModes, aes128cbcID)
-
-	kr := &kexResult{Hash: crypto.SHA1}
-	algs := directionAlgorithms{
-		Cipher:      aes128cbcID,
-		MAC:         "hmac-sha1",
-		Compression: "none",
-	}
-	client, err := newPacketCipher(clientKeys, algs, kr)
-	if err != nil {
-		t.Fatalf("newPacketCipher(client): %v", err)
-	}
-
-	want := "bla bla"
-	input := []byte(want)
-	buf := &bytes.Buffer{}
-	if err := client.writePacket(0, buf, rand.Reader, input); err != nil {
-		t.Errorf("writePacket: %v", err)
-	}
-
-	packetSize := buf.Len()
-	buf.Write(make([]byte, 2*maxPacket))
-
-	// We corrupt each byte, but this usually will only test the
-	// 'packet too large' or 'MAC failure' cases.
-	lastRead := -1
-	for i := 0; i < packetSize; i++ {
-		server, err := newPacketCipher(clientKeys, algs, kr)
-		if err != nil {
-			t.Fatalf("newPacketCipher(client): %v", err)
-		}
-
-		fresh := &bytes.Buffer{}
-		fresh.Write(buf.Bytes())
-		fresh.Bytes()[i] ^= 0x01
-
-		before := fresh.Len()
-		_, err = server.readPacket(0, fresh)
-		if err == nil {
-			t.Errorf("corrupt byte %d: readPacket succeeded ", i)
-			continue
-		}
-		if _, ok := err.(cbcError); !ok {
-			t.Errorf("corrupt byte %d: got %v (%T), want cbcError", i, err, err)
-			continue
-		}
-
-		after := fresh.Len()
-		bytesRead := before - after
-		if bytesRead < maxPacket {
-			t.Errorf("corrupt byte %d: read %d bytes, want more than %d", i, bytesRead, maxPacket)
-			continue
-		}
-
-		if i > 0 && bytesRead != lastRead {
-			t.Errorf("corrupt byte %d: read %d bytes, want %d bytes read", i, bytesRead, lastRead)
-		}
-		lastRead = bytesRead
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/client.go b/installer/vendor/golang.org/x/crypto/ssh/client.go
deleted file mode 100644
index a7e3263bca..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/client.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"net"
-	"sync"
-	"time"
-)
-
-// Client implements a traditional SSH client that supports shells,
-// subprocesses, TCP port/streamlocal forwarding and tunneled dialing.
-type Client struct {
-	Conn
-
-	forwards        forwardList // forwarded tcpip connections from the remote side
-	mu              sync.Mutex
-	channelHandlers map[string]chan NewChannel
-}
-
-// HandleChannelOpen returns a channel on which NewChannel requests
-// for the given type are sent. If the type already is being handled,
-// nil is returned. The channel is closed when the connection is closed.
-func (c *Client) HandleChannelOpen(channelType string) <-chan NewChannel {
-	c.mu.Lock()
-	defer c.mu.Unlock()
-	if c.channelHandlers == nil {
-		// The SSH channel has been closed.
-		c := make(chan NewChannel)
-		close(c)
-		return c
-	}
-
-	ch := c.channelHandlers[channelType]
-	if ch != nil {
-		return nil
-	}
-
-	ch = make(chan NewChannel, chanSize)
-	c.channelHandlers[channelType] = ch
-	return ch
-}
-
-// NewClient creates a Client on top of the given connection.
-func NewClient(c Conn, chans <-chan NewChannel, reqs <-chan *Request) *Client {
-	conn := &Client{
-		Conn:            c,
-		channelHandlers: make(map[string]chan NewChannel, 1),
-	}
-
-	go conn.handleGlobalRequests(reqs)
-	go conn.handleChannelOpens(chans)
-	go func() {
-		conn.Wait()
-		conn.forwards.closeAll()
-	}()
-	go conn.forwards.handleChannels(conn.HandleChannelOpen("forwarded-tcpip"))
-	go conn.forwards.handleChannels(conn.HandleChannelOpen("forwarded-streamlocal@openssh.com"))
-	return conn
-}
-
-// NewClientConn establishes an authenticated SSH connection using c
-// as the underlying transport.  The Request and NewChannel channels
-// must be serviced or the connection will hang.
-func NewClientConn(c net.Conn, addr string, config *ClientConfig) (Conn, <-chan NewChannel, <-chan *Request, error) {
-	fullConf := *config
-	fullConf.SetDefaults()
-	if fullConf.HostKeyCallback == nil {
-		c.Close()
-		return nil, nil, nil, errors.New("ssh: must specify HostKeyCallback")
-	}
-
-	conn := &connection{
-		sshConn: sshConn{conn: c},
-	}
-
-	if err := conn.clientHandshake(addr, &fullConf); err != nil {
-		c.Close()
-		return nil, nil, nil, fmt.Errorf("ssh: handshake failed: %v", err)
-	}
-	conn.mux = newMux(conn.transport)
-	return conn, conn.mux.incomingChannels, conn.mux.incomingRequests, nil
-}
-
-// clientHandshake performs the client side key exchange. See RFC 4253 Section
-// 7.
-func (c *connection) clientHandshake(dialAddress string, config *ClientConfig) error {
-	if config.ClientVersion != "" {
-		c.clientVersion = []byte(config.ClientVersion)
-	} else {
-		c.clientVersion = []byte(packageVersion)
-	}
-	var err error
-	c.serverVersion, err = exchangeVersions(c.sshConn.conn, c.clientVersion)
-	if err != nil {
-		return err
-	}
-
-	c.transport = newClientTransport(
-		newTransport(c.sshConn.conn, config.Rand, true /* is client */),
-		c.clientVersion, c.serverVersion, config, dialAddress, c.sshConn.RemoteAddr())
-	if err := c.transport.waitSession(); err != nil {
-		return err
-	}
-
-	c.sessionID = c.transport.getSessionID()
-	return c.clientAuthenticate(config)
-}
-
-// verifyHostKeySignature verifies the host key obtained in the key
-// exchange.
-func verifyHostKeySignature(hostKey PublicKey, result *kexResult) error {
-	sig, rest, ok := parseSignatureBody(result.Signature)
-	if len(rest) > 0 || !ok {
-		return errors.New("ssh: signature parse error")
-	}
-
-	return hostKey.Verify(result.H, sig)
-}
-
-// NewSession opens a new Session for this client. (A session is a remote
-// execution of a program.)
-func (c *Client) NewSession() (*Session, error) {
-	ch, in, err := c.OpenChannel("session", nil)
-	if err != nil {
-		return nil, err
-	}
-	return newSession(ch, in)
-}
-
-func (c *Client) handleGlobalRequests(incoming <-chan *Request) {
-	for r := range incoming {
-		// This handles keepalive messages and matches
-		// the behaviour of OpenSSH.
-		r.Reply(false, nil)
-	}
-}
-
-// handleChannelOpens channel open messages from the remote side.
-func (c *Client) handleChannelOpens(in <-chan NewChannel) {
-	for ch := range in {
-		c.mu.Lock()
-		handler := c.channelHandlers[ch.ChannelType()]
-		c.mu.Unlock()
-
-		if handler != nil {
-			handler <- ch
-		} else {
-			ch.Reject(UnknownChannelType, fmt.Sprintf("unknown channel type: %v", ch.ChannelType()))
-		}
-	}
-
-	c.mu.Lock()
-	for _, ch := range c.channelHandlers {
-		close(ch)
-	}
-	c.channelHandlers = nil
-	c.mu.Unlock()
-}
-
-// Dial starts a client connection to the given SSH server. It is a
-// convenience function that connects to the given network address,
-// initiates the SSH handshake, and then sets up a Client.  For access
-// to incoming channels and requests, use net.Dial with NewClientConn
-// instead.
-func Dial(network, addr string, config *ClientConfig) (*Client, error) {
-	conn, err := net.DialTimeout(network, addr, config.Timeout)
-	if err != nil {
-		return nil, err
-	}
-	c, chans, reqs, err := NewClientConn(conn, addr, config)
-	if err != nil {
-		return nil, err
-	}
-	return NewClient(c, chans, reqs), nil
-}
-
-// HostKeyCallback is the function type used for verifying server
-// keys.  A HostKeyCallback must return nil if the host key is OK, or
-// an error to reject it. It receives the hostname as passed to Dial
-// or NewClientConn. The remote address is the RemoteAddr of the
-// net.Conn underlying the the SSH connection.
-type HostKeyCallback func(hostname string, remote net.Addr, key PublicKey) error
-
-// A ClientConfig structure is used to configure a Client. It must not be
-// modified after having been passed to an SSH function.
-type ClientConfig struct {
-	// Config contains configuration that is shared between clients and
-	// servers.
-	Config
-
-	// User contains the username to authenticate as.
-	User string
-
-	// Auth contains possible authentication methods to use with the
-	// server. Only the first instance of a particular RFC 4252 method will
-	// be used during authentication.
-	Auth []AuthMethod
-
-	// HostKeyCallback is called during the cryptographic
-	// handshake to validate the server's host key. The client
-	// configuration must supply this callback for the connection
-	// to succeed. The functions InsecureIgnoreHostKey or
-	// FixedHostKey can be used for simplistic host key checks.
-	HostKeyCallback HostKeyCallback
-
-	// ClientVersion contains the version identification string that will
-	// be used for the connection. If empty, a reasonable default is used.
-	ClientVersion string
-
-	// HostKeyAlgorithms lists the key types that the client will
-	// accept from the server as host key, in order of
-	// preference. If empty, a reasonable default is used. Any
-	// string returned from PublicKey.Type method may be used, or
-	// any of the CertAlgoXxxx and KeyAlgoXxxx constants.
-	HostKeyAlgorithms []string
-
-	// Timeout is the maximum amount of time for the TCP connection to establish.
-	//
-	// A Timeout of zero means no timeout.
-	Timeout time.Duration
-}
-
-// InsecureIgnoreHostKey returns a function that can be used for
-// ClientConfig.HostKeyCallback to accept any host key. It should
-// not be used for production code.
-func InsecureIgnoreHostKey() HostKeyCallback {
-	return func(hostname string, remote net.Addr, key PublicKey) error {
-		return nil
-	}
-}
-
-type fixedHostKey struct {
-	key PublicKey
-}
-
-func (f *fixedHostKey) check(hostname string, remote net.Addr, key PublicKey) error {
-	if f.key == nil {
-		return fmt.Errorf("ssh: required host key was nil")
-	}
-	if !bytes.Equal(key.Marshal(), f.key.Marshal()) {
-		return fmt.Errorf("ssh: host key mismatch")
-	}
-	return nil
-}
-
-// FixedHostKey returns a function for use in
-// ClientConfig.HostKeyCallback to accept only a specific host key.
-func FixedHostKey(key PublicKey) HostKeyCallback {
-	hk := &fixedHostKey{key}
-	return hk.check
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/client_auth.go b/installer/vendor/golang.org/x/crypto/ssh/client_auth.go
deleted file mode 100644
index 3acd8d4988..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/client_auth.go
+++ /dev/null
@@ -1,486 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-)
-
-// clientAuthenticate authenticates with the remote server. See RFC 4252.
-func (c *connection) clientAuthenticate(config *ClientConfig) error {
-	// initiate user auth session
-	if err := c.transport.writePacket(Marshal(&serviceRequestMsg{serviceUserAuth})); err != nil {
-		return err
-	}
-	packet, err := c.transport.readPacket()
-	if err != nil {
-		return err
-	}
-	var serviceAccept serviceAcceptMsg
-	if err := Unmarshal(packet, &serviceAccept); err != nil {
-		return err
-	}
-
-	// during the authentication phase the client first attempts the "none" method
-	// then any untried methods suggested by the server.
-	tried := make(map[string]bool)
-	var lastMethods []string
-
-	sessionID := c.transport.getSessionID()
-	for auth := AuthMethod(new(noneAuth)); auth != nil; {
-		ok, methods, err := auth.auth(sessionID, config.User, c.transport, config.Rand)
-		if err != nil {
-			return err
-		}
-		if ok {
-			// success
-			return nil
-		}
-		tried[auth.method()] = true
-		if methods == nil {
-			methods = lastMethods
-		}
-		lastMethods = methods
-
-		auth = nil
-
-	findNext:
-		for _, a := range config.Auth {
-			candidateMethod := a.method()
-			if tried[candidateMethod] {
-				continue
-			}
-			for _, meth := range methods {
-				if meth == candidateMethod {
-					auth = a
-					break findNext
-				}
-			}
-		}
-	}
-	return fmt.Errorf("ssh: unable to authenticate, attempted methods %v, no supported methods remain", keys(tried))
-}
-
-func keys(m map[string]bool) []string {
-	s := make([]string, 0, len(m))
-
-	for key := range m {
-		s = append(s, key)
-	}
-	return s
-}
-
-// An AuthMethod represents an instance of an RFC 4252 authentication method.
-type AuthMethod interface {
-	// auth authenticates user over transport t.
-	// Returns true if authentication is successful.
-	// If authentication is not successful, a []string of alternative
-	// method names is returned. If the slice is nil, it will be ignored
-	// and the previous set of possible methods will be reused.
-	auth(session []byte, user string, p packetConn, rand io.Reader) (bool, []string, error)
-
-	// method returns the RFC 4252 method name.
-	method() string
-}
-
-// "none" authentication, RFC 4252 section 5.2.
-type noneAuth int
-
-func (n *noneAuth) auth(session []byte, user string, c packetConn, rand io.Reader) (bool, []string, error) {
-	if err := c.writePacket(Marshal(&userAuthRequestMsg{
-		User:    user,
-		Service: serviceSSH,
-		Method:  "none",
-	})); err != nil {
-		return false, nil, err
-	}
-
-	return handleAuthResponse(c)
-}
-
-func (n *noneAuth) method() string {
-	return "none"
-}
-
-// passwordCallback is an AuthMethod that fetches the password through
-// a function call, e.g. by prompting the user.
-type passwordCallback func() (password string, err error)
-
-func (cb passwordCallback) auth(session []byte, user string, c packetConn, rand io.Reader) (bool, []string, error) {
-	type passwordAuthMsg struct {
-		User     string `sshtype:"50"`
-		Service  string
-		Method   string
-		Reply    bool
-		Password string
-	}
-
-	pw, err := cb()
-	// REVIEW NOTE: is there a need to support skipping a password attempt?
-	// The program may only find out that the user doesn't have a password
-	// when prompting.
-	if err != nil {
-		return false, nil, err
-	}
-
-	if err := c.writePacket(Marshal(&passwordAuthMsg{
-		User:     user,
-		Service:  serviceSSH,
-		Method:   cb.method(),
-		Reply:    false,
-		Password: pw,
-	})); err != nil {
-		return false, nil, err
-	}
-
-	return handleAuthResponse(c)
-}
-
-func (cb passwordCallback) method() string {
-	return "password"
-}
-
-// Password returns an AuthMethod using the given password.
-func Password(secret string) AuthMethod {
-	return passwordCallback(func() (string, error) { return secret, nil })
-}
-
-// PasswordCallback returns an AuthMethod that uses a callback for
-// fetching a password.
-func PasswordCallback(prompt func() (secret string, err error)) AuthMethod {
-	return passwordCallback(prompt)
-}
-
-type publickeyAuthMsg struct {
-	User    string `sshtype:"50"`
-	Service string
-	Method  string
-	// HasSig indicates to the receiver packet that the auth request is signed and
-	// should be used for authentication of the request.
-	HasSig   bool
-	Algoname string
-	PubKey   []byte
-	// Sig is tagged with "rest" so Marshal will exclude it during
-	// validateKey
-	Sig []byte `ssh:"rest"`
-}
-
-// publicKeyCallback is an AuthMethod that uses a set of key
-// pairs for authentication.
-type publicKeyCallback func() ([]Signer, error)
-
-func (cb publicKeyCallback) method() string {
-	return "publickey"
-}
-
-func (cb publicKeyCallback) auth(session []byte, user string, c packetConn, rand io.Reader) (bool, []string, error) {
-	// Authentication is performed by sending an enquiry to test if a key is
-	// acceptable to the remote. If the key is acceptable, the client will
-	// attempt to authenticate with the valid key.  If not the client will repeat
-	// the process with the remaining keys.
-
-	signers, err := cb()
-	if err != nil {
-		return false, nil, err
-	}
-	var methods []string
-	for _, signer := range signers {
-		ok, err := validateKey(signer.PublicKey(), user, c)
-		if err != nil {
-			return false, nil, err
-		}
-		if !ok {
-			continue
-		}
-
-		pub := signer.PublicKey()
-		pubKey := pub.Marshal()
-		sign, err := signer.Sign(rand, buildDataSignedForAuth(session, userAuthRequestMsg{
-			User:    user,
-			Service: serviceSSH,
-			Method:  cb.method(),
-		}, []byte(pub.Type()), pubKey))
-		if err != nil {
-			return false, nil, err
-		}
-
-		// manually wrap the serialized signature in a string
-		s := Marshal(sign)
-		sig := make([]byte, stringLength(len(s)))
-		marshalString(sig, s)
-		msg := publickeyAuthMsg{
-			User:     user,
-			Service:  serviceSSH,
-			Method:   cb.method(),
-			HasSig:   true,
-			Algoname: pub.Type(),
-			PubKey:   pubKey,
-			Sig:      sig,
-		}
-		p := Marshal(&msg)
-		if err := c.writePacket(p); err != nil {
-			return false, nil, err
-		}
-		var success bool
-		success, methods, err = handleAuthResponse(c)
-		if err != nil {
-			return false, nil, err
-		}
-
-		// If authentication succeeds or the list of available methods does not
-		// contain the "publickey" method, do not attempt to authenticate with any
-		// other keys.  According to RFC 4252 Section 7, the latter can occur when
-		// additional authentication methods are required.
-		if success || !containsMethod(methods, cb.method()) {
-			return success, methods, err
-		}
-	}
-
-	return false, methods, nil
-}
-
-func containsMethod(methods []string, method string) bool {
-	for _, m := range methods {
-		if m == method {
-			return true
-		}
-	}
-
-	return false
-}
-
-// validateKey validates the key provided is acceptable to the server.
-func validateKey(key PublicKey, user string, c packetConn) (bool, error) {
-	pubKey := key.Marshal()
-	msg := publickeyAuthMsg{
-		User:     user,
-		Service:  serviceSSH,
-		Method:   "publickey",
-		HasSig:   false,
-		Algoname: key.Type(),
-		PubKey:   pubKey,
-	}
-	if err := c.writePacket(Marshal(&msg)); err != nil {
-		return false, err
-	}
-
-	return confirmKeyAck(key, c)
-}
-
-func confirmKeyAck(key PublicKey, c packetConn) (bool, error) {
-	pubKey := key.Marshal()
-	algoname := key.Type()
-
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return false, err
-		}
-		switch packet[0] {
-		case msgUserAuthBanner:
-			// TODO(gpaul): add callback to present the banner to the user
-		case msgUserAuthPubKeyOk:
-			var msg userAuthPubKeyOkMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return false, err
-			}
-			if msg.Algo != algoname || !bytes.Equal(msg.PubKey, pubKey) {
-				return false, nil
-			}
-			return true, nil
-		case msgUserAuthFailure:
-			return false, nil
-		default:
-			return false, unexpectedMessageError(msgUserAuthSuccess, packet[0])
-		}
-	}
-}
-
-// PublicKeys returns an AuthMethod that uses the given key
-// pairs.
-func PublicKeys(signers ...Signer) AuthMethod {
-	return publicKeyCallback(func() ([]Signer, error) { return signers, nil })
-}
-
-// PublicKeysCallback returns an AuthMethod that runs the given
-// function to obtain a list of key pairs.
-func PublicKeysCallback(getSigners func() (signers []Signer, err error)) AuthMethod {
-	return publicKeyCallback(getSigners)
-}
-
-// handleAuthResponse returns whether the preceding authentication request succeeded
-// along with a list of remaining authentication methods to try next and
-// an error if an unexpected response was received.
-func handleAuthResponse(c packetConn) (bool, []string, error) {
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return false, nil, err
-		}
-
-		switch packet[0] {
-		case msgUserAuthBanner:
-			// TODO: add callback to present the banner to the user
-		case msgUserAuthFailure:
-			var msg userAuthFailureMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return false, nil, err
-			}
-			return false, msg.Methods, nil
-		case msgUserAuthSuccess:
-			return true, nil, nil
-		default:
-			return false, nil, unexpectedMessageError(msgUserAuthSuccess, packet[0])
-		}
-	}
-}
-
-// KeyboardInteractiveChallenge should print questions, optionally
-// disabling echoing (e.g. for passwords), and return all the answers.
-// Challenge may be called multiple times in a single session. After
-// successful authentication, the server may send a challenge with no
-// questions, for which the user and instruction messages should be
-// printed.  RFC 4256 section 3.3 details how the UI should behave for
-// both CLI and GUI environments.
-type KeyboardInteractiveChallenge func(user, instruction string, questions []string, echos []bool) (answers []string, err error)
-
-// KeyboardInteractive returns an AuthMethod using a prompt/response
-// sequence controlled by the server.
-func KeyboardInteractive(challenge KeyboardInteractiveChallenge) AuthMethod {
-	return challenge
-}
-
-func (cb KeyboardInteractiveChallenge) method() string {
-	return "keyboard-interactive"
-}
-
-func (cb KeyboardInteractiveChallenge) auth(session []byte, user string, c packetConn, rand io.Reader) (bool, []string, error) {
-	type initiateMsg struct {
-		User       string `sshtype:"50"`
-		Service    string
-		Method     string
-		Language   string
-		Submethods string
-	}
-
-	if err := c.writePacket(Marshal(&initiateMsg{
-		User:    user,
-		Service: serviceSSH,
-		Method:  "keyboard-interactive",
-	})); err != nil {
-		return false, nil, err
-	}
-
-	for {
-		packet, err := c.readPacket()
-		if err != nil {
-			return false, nil, err
-		}
-
-		// like handleAuthResponse, but with less options.
-		switch packet[0] {
-		case msgUserAuthBanner:
-			// TODO: Print banners during userauth.
-			continue
-		case msgUserAuthInfoRequest:
-			// OK
-		case msgUserAuthFailure:
-			var msg userAuthFailureMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return false, nil, err
-			}
-			return false, msg.Methods, nil
-		case msgUserAuthSuccess:
-			return true, nil, nil
-		default:
-			return false, nil, unexpectedMessageError(msgUserAuthInfoRequest, packet[0])
-		}
-
-		var msg userAuthInfoRequestMsg
-		if err := Unmarshal(packet, &msg); err != nil {
-			return false, nil, err
-		}
-
-		// Manually unpack the prompt/echo pairs.
-		rest := msg.Prompts
-		var prompts []string
-		var echos []bool
-		for i := 0; i < int(msg.NumPrompts); i++ {
-			prompt, r, ok := parseString(rest)
-			if !ok || len(r) == 0 {
-				return false, nil, errors.New("ssh: prompt format error")
-			}
-			prompts = append(prompts, string(prompt))
-			echos = append(echos, r[0] != 0)
-			rest = r[1:]
-		}
-
-		if len(rest) != 0 {
-			return false, nil, errors.New("ssh: extra data following keyboard-interactive pairs")
-		}
-
-		answers, err := cb(msg.User, msg.Instruction, prompts, echos)
-		if err != nil {
-			return false, nil, err
-		}
-
-		if len(answers) != len(prompts) {
-			return false, nil, errors.New("ssh: not enough answers from keyboard-interactive callback")
-		}
-		responseLength := 1 + 4
-		for _, a := range answers {
-			responseLength += stringLength(len(a))
-		}
-		serialized := make([]byte, responseLength)
-		p := serialized
-		p[0] = msgUserAuthInfoResponse
-		p = p[1:]
-		p = marshalUint32(p, uint32(len(answers)))
-		for _, a := range answers {
-			p = marshalString(p, []byte(a))
-		}
-
-		if err := c.writePacket(serialized); err != nil {
-			return false, nil, err
-		}
-	}
-}
-
-type retryableAuthMethod struct {
-	authMethod AuthMethod
-	maxTries   int
-}
-
-func (r *retryableAuthMethod) auth(session []byte, user string, c packetConn, rand io.Reader) (ok bool, methods []string, err error) {
-	for i := 0; r.maxTries <= 0 || i < r.maxTries; i++ {
-		ok, methods, err = r.authMethod.auth(session, user, c, rand)
-		if ok || err != nil { // either success or error terminate
-			return ok, methods, err
-		}
-	}
-	return ok, methods, err
-}
-
-func (r *retryableAuthMethod) method() string {
-	return r.authMethod.method()
-}
-
-// RetryableAuthMethod is a decorator for other auth methods enabling them to
-// be retried up to maxTries before considering that AuthMethod itself failed.
-// If maxTries is <= 0, will retry indefinitely
-//
-// This is useful for interactive clients using challenge/response type
-// authentication (e.g. Keyboard-Interactive, Password, etc) where the user
-// could mistype their response resulting in the server issuing a
-// SSH_MSG_USERAUTH_FAILURE (rfc4252 #8 [password] and rfc4256 #3.4
-// [keyboard-interactive]); Without this decorator, the non-retryable
-// AuthMethod would be removed from future consideration, and never tried again
-// (and so the user would never be able to retry their entry).
-func RetryableAuthMethod(auth AuthMethod, maxTries int) AuthMethod {
-	return &retryableAuthMethod{authMethod: auth, maxTries: maxTries}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/client_auth_test.go b/installer/vendor/golang.org/x/crypto/ssh/client_auth_test.go
deleted file mode 100644
index 145b57a2bb..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/client_auth_test.go
+++ /dev/null
@@ -1,628 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto/rand"
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-)
-
-type keyboardInteractive map[string]string
-
-func (cr keyboardInteractive) Challenge(user string, instruction string, questions []string, echos []bool) ([]string, error) {
-	var answers []string
-	for _, q := range questions {
-		answers = append(answers, cr[q])
-	}
-	return answers, nil
-}
-
-// reused internally by tests
-var clientPassword = "tiger"
-
-// tryAuth runs a handshake with a given config against an SSH server
-// with config serverConfig
-func tryAuth(t *testing.T, config *ClientConfig) error {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	certChecker := CertChecker{
-		IsUserAuthority: func(k PublicKey) bool {
-			return bytes.Equal(k.Marshal(), testPublicKeys["ecdsa"].Marshal())
-		},
-		UserKeyFallback: func(conn ConnMetadata, key PublicKey) (*Permissions, error) {
-			if conn.User() == "testuser" && bytes.Equal(key.Marshal(), testPublicKeys["rsa"].Marshal()) {
-				return nil, nil
-			}
-
-			return nil, fmt.Errorf("pubkey for %q not acceptable", conn.User())
-		},
-		IsRevoked: func(c *Certificate) bool {
-			return c.Serial == 666
-		},
-	}
-
-	serverConfig := &ServerConfig{
-		PasswordCallback: func(conn ConnMetadata, pass []byte) (*Permissions, error) {
-			if conn.User() == "testuser" && string(pass) == clientPassword {
-				return nil, nil
-			}
-			return nil, errors.New("password auth failed")
-		},
-		PublicKeyCallback: certChecker.Authenticate,
-		KeyboardInteractiveCallback: func(conn ConnMetadata, challenge KeyboardInteractiveChallenge) (*Permissions, error) {
-			ans, err := challenge("user",
-				"instruction",
-				[]string{"question1", "question2"},
-				[]bool{true, true})
-			if err != nil {
-				return nil, err
-			}
-			ok := conn.User() == "testuser" && ans[0] == "answer1" && ans[1] == "answer2"
-			if ok {
-				challenge("user", "motd", nil, nil)
-				return nil, nil
-			}
-			return nil, errors.New("keyboard-interactive failed")
-		},
-	}
-	serverConfig.AddHostKey(testSigners["rsa"])
-
-	go newServer(c1, serverConfig)
-	_, _, _, err = NewClientConn(c2, "", config)
-	return err
-}
-
-func TestClientAuthPublicKey(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-}
-
-func TestAuthMethodPassword(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			Password(clientPassword),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-}
-
-func TestAuthMethodFallback(t *testing.T) {
-	var passwordCalled bool
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["rsa"]),
-			PasswordCallback(
-				func() (string, error) {
-					passwordCalled = true
-					return "WRONG", nil
-				}),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-
-	if passwordCalled {
-		t.Errorf("password auth tried before public-key auth.")
-	}
-}
-
-func TestAuthMethodWrongPassword(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			Password("wrong"),
-			PublicKeys(testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-}
-
-func TestAuthMethodKeyboardInteractive(t *testing.T) {
-	answers := keyboardInteractive(map[string]string{
-		"question1": "answer1",
-		"question2": "answer2",
-	})
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			KeyboardInteractive(answers.Challenge),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-}
-
-func TestAuthMethodWrongKeyboardInteractive(t *testing.T) {
-	answers := keyboardInteractive(map[string]string{
-		"question1": "answer1",
-		"question2": "WRONG",
-	})
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			KeyboardInteractive(answers.Challenge),
-		},
-	}
-
-	if err := tryAuth(t, config); err == nil {
-		t.Fatalf("wrong answers should not have authenticated with KeyboardInteractive")
-	}
-}
-
-// the mock server will only authenticate ssh-rsa keys
-func TestAuthMethodInvalidPublicKey(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["dsa"]),
-		},
-	}
-
-	if err := tryAuth(t, config); err == nil {
-		t.Fatalf("dsa private key should not have authenticated with rsa public key")
-	}
-}
-
-// the client should authenticate with the second key
-func TestAuthMethodRSAandDSA(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["dsa"], testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("client could not authenticate with rsa key: %v", err)
-	}
-}
-
-func TestClientHMAC(t *testing.T) {
-	for _, mac := range supportedMACs {
-		config := &ClientConfig{
-			User: "testuser",
-			Auth: []AuthMethod{
-				PublicKeys(testSigners["rsa"]),
-			},
-			Config: Config{
-				MACs: []string{mac},
-			},
-			HostKeyCallback: InsecureIgnoreHostKey(),
-		}
-		if err := tryAuth(t, config); err != nil {
-			t.Fatalf("client could not authenticate with mac algo %s: %v", mac, err)
-		}
-	}
-}
-
-// issue 4285.
-func TestClientUnsupportedCipher(t *testing.T) {
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(),
-		},
-		Config: Config{
-			Ciphers: []string{"aes128-cbc"}, // not currently supported
-		},
-	}
-	if err := tryAuth(t, config); err == nil {
-		t.Errorf("expected no ciphers in common")
-	}
-}
-
-func TestClientUnsupportedKex(t *testing.T) {
-	if os.Getenv("GO_BUILDER_NAME") != "" {
-		t.Skip("skipping known-flaky test on the Go build dashboard; see golang.org/issue/15198")
-	}
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(),
-		},
-		Config: Config{
-			KeyExchanges: []string{"diffie-hellman-group-exchange-sha256"}, // not currently supported
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if err := tryAuth(t, config); err == nil || !strings.Contains(err.Error(), "common algorithm") {
-		t.Errorf("got %v, expected 'common algorithm'", err)
-	}
-}
-
-func TestClientLoginCert(t *testing.T) {
-	cert := &Certificate{
-		Key:         testPublicKeys["rsa"],
-		ValidBefore: CertTimeInfinity,
-		CertType:    UserCert,
-	}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	certSigner, err := NewCertSigner(cert, testSigners["rsa"])
-	if err != nil {
-		t.Fatalf("NewCertSigner: %v", err)
-	}
-
-	clientConfig := &ClientConfig{
-		User:            "user",
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	clientConfig.Auth = append(clientConfig.Auth, PublicKeys(certSigner))
-
-	// should succeed
-	if err := tryAuth(t, clientConfig); err != nil {
-		t.Errorf("cert login failed: %v", err)
-	}
-
-	// corrupted signature
-	cert.Signature.Blob[0]++
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login passed with corrupted sig")
-	}
-
-	// revoked
-	cert.Serial = 666
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("revoked cert login succeeded")
-	}
-	cert.Serial = 1
-
-	// sign with wrong key
-	cert.SignCert(rand.Reader, testSigners["dsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login passed with non-authoritative key")
-	}
-
-	// host cert
-	cert.CertType = HostCert
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login passed with wrong type")
-	}
-	cert.CertType = UserCert
-
-	// principal specified
-	cert.ValidPrincipals = []string{"user"}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err != nil {
-		t.Errorf("cert login failed: %v", err)
-	}
-
-	// wrong principal specified
-	cert.ValidPrincipals = []string{"fred"}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login passed with wrong principal")
-	}
-	cert.ValidPrincipals = nil
-
-	// added critical option
-	cert.CriticalOptions = map[string]string{"root-access": "yes"}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login passed with unrecognized critical option")
-	}
-
-	// allowed source address
-	cert.CriticalOptions = map[string]string{"source-address": "127.0.0.42/24,::42/120"}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err != nil {
-		t.Errorf("cert login with source-address failed: %v", err)
-	}
-
-	// disallowed source address
-	cert.CriticalOptions = map[string]string{"source-address": "127.0.0.42,::42"}
-	cert.SignCert(rand.Reader, testSigners["ecdsa"])
-	if err := tryAuth(t, clientConfig); err == nil {
-		t.Errorf("cert login with source-address succeeded")
-	}
-}
-
-func testPermissionsPassing(withPermissions bool, t *testing.T) {
-	serverConfig := &ServerConfig{
-		PublicKeyCallback: func(conn ConnMetadata, key PublicKey) (*Permissions, error) {
-			if conn.User() == "nopermissions" {
-				return nil, nil
-			}
-			return &Permissions{}, nil
-		},
-	}
-	serverConfig.AddHostKey(testSigners["rsa"])
-
-	clientConfig := &ClientConfig{
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if withPermissions {
-		clientConfig.User = "permissions"
-	} else {
-		clientConfig.User = "nopermissions"
-	}
-
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	go NewClientConn(c2, "", clientConfig)
-	serverConn, err := newServer(c1, serverConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if p := serverConn.Permissions; (p != nil) != withPermissions {
-		t.Fatalf("withPermissions is %t, but Permissions object is %#v", withPermissions, p)
-	}
-}
-
-func TestPermissionsPassing(t *testing.T) {
-	testPermissionsPassing(true, t)
-}
-
-func TestNoPermissionsPassing(t *testing.T) {
-	testPermissionsPassing(false, t)
-}
-
-func TestRetryableAuth(t *testing.T) {
-	n := 0
-	passwords := []string{"WRONG1", "WRONG2"}
-
-	config := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			RetryableAuthMethod(PasswordCallback(func() (string, error) {
-				p := passwords[n]
-				n++
-				return p, nil
-			}), 2),
-			PublicKeys(testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-	if n != 2 {
-		t.Fatalf("Did not try all passwords")
-	}
-}
-
-func ExampleRetryableAuthMethod(t *testing.T) {
-	user := "testuser"
-	NumberOfPrompts := 3
-
-	// Normally this would be a callback that prompts the user to answer the
-	// provided questions
-	Cb := func(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
-		return []string{"answer1", "answer2"}, nil
-	}
-
-	config := &ClientConfig{
-		HostKeyCallback: InsecureIgnoreHostKey(),
-		User:            user,
-		Auth: []AuthMethod{
-			RetryableAuthMethod(KeyboardInteractiveChallenge(Cb), NumberOfPrompts),
-		},
-	}
-
-	if err := tryAuth(t, config); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-}
-
-// Test if username is received on server side when NoClientAuth is used
-func TestClientAuthNone(t *testing.T) {
-	user := "testuser"
-	serverConfig := &ServerConfig{
-		NoClientAuth: true,
-	}
-	serverConfig.AddHostKey(testSigners["rsa"])
-
-	clientConfig := &ClientConfig{
-		User:            user,
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	go NewClientConn(c2, "", clientConfig)
-	serverConn, err := newServer(c1, serverConfig)
-	if err != nil {
-		t.Fatalf("newServer: %v", err)
-	}
-	if serverConn.User() != user {
-		t.Fatalf("server: got %q, want %q", serverConn.User(), user)
-	}
-}
-
-// Test if authentication attempts are limited on server when MaxAuthTries is set
-func TestClientAuthMaxAuthTries(t *testing.T) {
-	user := "testuser"
-
-	serverConfig := &ServerConfig{
-		MaxAuthTries: 2,
-		PasswordCallback: func(conn ConnMetadata, pass []byte) (*Permissions, error) {
-			if conn.User() == "testuser" && string(pass) == "right" {
-				return nil, nil
-			}
-			return nil, errors.New("password auth failed")
-		},
-	}
-	serverConfig.AddHostKey(testSigners["rsa"])
-
-	expectedErr := fmt.Errorf("ssh: handshake failed: %v", &disconnectMsg{
-		Reason:  2,
-		Message: "too many authentication failures",
-	})
-
-	for tries := 2; tries < 4; tries++ {
-		n := tries
-		clientConfig := &ClientConfig{
-			User: user,
-			Auth: []AuthMethod{
-				RetryableAuthMethod(PasswordCallback(func() (string, error) {
-					n--
-					if n == 0 {
-						return "right", nil
-					}
-					return "wrong", nil
-				}), tries),
-			},
-			HostKeyCallback: InsecureIgnoreHostKey(),
-		}
-
-		c1, c2, err := netPipe()
-		if err != nil {
-			t.Fatalf("netPipe: %v", err)
-		}
-		defer c1.Close()
-		defer c2.Close()
-
-		go newServer(c1, serverConfig)
-		_, _, _, err = NewClientConn(c2, "", clientConfig)
-		if tries > 2 {
-			if err == nil {
-				t.Fatalf("client: got no error, want %s", expectedErr)
-			} else if err.Error() != expectedErr.Error() {
-				t.Fatalf("client: got %s, want %s", err, expectedErr)
-			}
-		} else {
-			if err != nil {
-				t.Fatalf("client: got %s, want no error", err)
-			}
-		}
-	}
-}
-
-// Test if authentication attempts are correctly limited on server
-// when more public keys are provided then MaxAuthTries
-func TestClientAuthMaxAuthTriesPublicKey(t *testing.T) {
-	signers := []Signer{}
-	for i := 0; i < 6; i++ {
-		signers = append(signers, testSigners["dsa"])
-	}
-
-	validConfig := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(append([]Signer{testSigners["rsa"]}, signers...)...),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if err := tryAuth(t, validConfig); err != nil {
-		t.Fatalf("unable to dial remote side: %s", err)
-	}
-
-	expectedErr := fmt.Errorf("ssh: handshake failed: %v", &disconnectMsg{
-		Reason:  2,
-		Message: "too many authentication failures",
-	})
-	invalidConfig := &ClientConfig{
-		User: "testuser",
-		Auth: []AuthMethod{
-			PublicKeys(append(signers, testSigners["rsa"])...),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	if err := tryAuth(t, invalidConfig); err == nil {
-		t.Fatalf("client: got no error, want %s", expectedErr)
-	} else if err.Error() != expectedErr.Error() {
-		t.Fatalf("client: got %s, want %s", err, expectedErr)
-	}
-}
-
-// Test whether authentication errors are being properly logged if all
-// authentication methods have been exhausted
-func TestClientAuthErrorList(t *testing.T) {
-	publicKeyErr := errors.New("This is an error from PublicKeyCallback")
-
-	clientConfig := &ClientConfig{
-		Auth: []AuthMethod{
-			PublicKeys(testSigners["rsa"]),
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	serverConfig := &ServerConfig{
-		PublicKeyCallback: func(_ ConnMetadata, _ PublicKey) (*Permissions, error) {
-			return nil, publicKeyErr
-		},
-	}
-	serverConfig.AddHostKey(testSigners["rsa"])
-
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	go NewClientConn(c2, "", clientConfig)
-	_, err = newServer(c1, serverConfig)
-	if err == nil {
-		t.Fatal("newServer: got nil, expected errors")
-	}
-
-	authErrs, ok := err.(*ServerAuthError)
-	if !ok {
-		t.Fatalf("errors: got %T, want *ssh.ServerAuthError", err)
-	}
-	for i, e := range authErrs.Errors {
-		switch i {
-		case 0:
-			if e.Error() != "no auth passed yet" {
-				t.Fatalf("errors: got %v, want no auth passed yet", e.Error())
-			}
-		case 1:
-			if e != publicKeyErr {
-				t.Fatalf("errors: got %v, want %v", e, publicKeyErr)
-			}
-		default:
-			t.Fatalf("errors: got %v, expected 2 errors", authErrs.Errors)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/client_test.go b/installer/vendor/golang.org/x/crypto/ssh/client_test.go
deleted file mode 100644
index ccf56074d7..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/client_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"net"
-	"strings"
-	"testing"
-)
-
-func testClientVersion(t *testing.T, config *ClientConfig, expected string) {
-	clientConn, serverConn := net.Pipe()
-	defer clientConn.Close()
-	receivedVersion := make(chan string, 1)
-	config.HostKeyCallback = InsecureIgnoreHostKey()
-	go func() {
-		version, err := readVersion(serverConn)
-		if err != nil {
-			receivedVersion <- ""
-		} else {
-			receivedVersion <- string(version)
-		}
-		serverConn.Close()
-	}()
-	NewClientConn(clientConn, "", config)
-	actual := <-receivedVersion
-	if actual != expected {
-		t.Fatalf("got %s; want %s", actual, expected)
-	}
-}
-
-func TestCustomClientVersion(t *testing.T) {
-	version := "Test-Client-Version-0.0"
-	testClientVersion(t, &ClientConfig{ClientVersion: version}, version)
-}
-
-func TestDefaultClientVersion(t *testing.T) {
-	testClientVersion(t, &ClientConfig{}, packageVersion)
-}
-
-func TestHostKeyCheck(t *testing.T) {
-	for _, tt := range []struct {
-		name      string
-		wantError string
-		key       PublicKey
-	}{
-		{"no callback", "must specify HostKeyCallback", nil},
-		{"correct key", "", testSigners["rsa"].PublicKey()},
-		{"mismatch", "mismatch", testSigners["ecdsa"].PublicKey()},
-	} {
-		c1, c2, err := netPipe()
-		if err != nil {
-			t.Fatalf("netPipe: %v", err)
-		}
-		defer c1.Close()
-		defer c2.Close()
-		serverConf := &ServerConfig{
-			NoClientAuth: true,
-		}
-		serverConf.AddHostKey(testSigners["rsa"])
-
-		go NewServerConn(c1, serverConf)
-		clientConf := ClientConfig{
-			User: "user",
-		}
-		if tt.key != nil {
-			clientConf.HostKeyCallback = FixedHostKey(tt.key)
-		}
-
-		_, _, _, err = NewClientConn(c2, "", &clientConf)
-		if err != nil {
-			if tt.wantError == "" || !strings.Contains(err.Error(), tt.wantError) {
-				t.Errorf("%s: got error %q, missing %q", tt.name, err.Error(), tt.wantError)
-			}
-		} else if tt.wantError != "" {
-			t.Errorf("%s: succeeded, but want error string %q", tt.name, tt.wantError)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/common.go b/installer/vendor/golang.org/x/crypto/ssh/common.go
deleted file mode 100644
index dc39e4d231..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/common.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"math"
-	"sync"
-
-	_ "crypto/sha1"
-	_ "crypto/sha256"
-	_ "crypto/sha512"
-)
-
-// These are string constants in the SSH protocol.
-const (
-	compressionNone = "none"
-	serviceUserAuth = "ssh-userauth"
-	serviceSSH      = "ssh-connection"
-)
-
-// supportedCiphers specifies the supported ciphers in preference order.
-var supportedCiphers = []string{
-	"aes128-ctr", "aes192-ctr", "aes256-ctr",
-	"aes128-gcm@openssh.com",
-	"arcfour256", "arcfour128",
-}
-
-// supportedKexAlgos specifies the supported key-exchange algorithms in
-// preference order.
-var supportedKexAlgos = []string{
-	kexAlgoCurve25519SHA256,
-	// P384 and P521 are not constant-time yet, but since we don't
-	// reuse ephemeral keys, using them for ECDH should be OK.
-	kexAlgoECDH256, kexAlgoECDH384, kexAlgoECDH521,
-	kexAlgoDH14SHA1, kexAlgoDH1SHA1,
-}
-
-// supportedHostKeyAlgos specifies the supported host-key algorithms (i.e. methods
-// of authenticating servers) in preference order.
-var supportedHostKeyAlgos = []string{
-	CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01,
-	CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoED25519v01,
-
-	KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521,
-	KeyAlgoRSA, KeyAlgoDSA,
-
-	KeyAlgoED25519,
-}
-
-// supportedMACs specifies a default set of MAC algorithms in preference order.
-// This is based on RFC 4253, section 6.4, but with hmac-md5 variants removed
-// because they have reached the end of their useful life.
-var supportedMACs = []string{
-	"hmac-sha2-256-etm@openssh.com", "hmac-sha2-256", "hmac-sha1", "hmac-sha1-96",
-}
-
-var supportedCompressions = []string{compressionNone}
-
-// hashFuncs keeps the mapping of supported algorithms to their respective
-// hashes needed for signature verification.
-var hashFuncs = map[string]crypto.Hash{
-	KeyAlgoRSA:          crypto.SHA1,
-	KeyAlgoDSA:          crypto.SHA1,
-	KeyAlgoECDSA256:     crypto.SHA256,
-	KeyAlgoECDSA384:     crypto.SHA384,
-	KeyAlgoECDSA521:     crypto.SHA512,
-	CertAlgoRSAv01:      crypto.SHA1,
-	CertAlgoDSAv01:      crypto.SHA1,
-	CertAlgoECDSA256v01: crypto.SHA256,
-	CertAlgoECDSA384v01: crypto.SHA384,
-	CertAlgoECDSA521v01: crypto.SHA512,
-}
-
-// unexpectedMessageError results when the SSH message that we received didn't
-// match what we wanted.
-func unexpectedMessageError(expected, got uint8) error {
-	return fmt.Errorf("ssh: unexpected message type %d (expected %d)", got, expected)
-}
-
-// parseError results from a malformed SSH message.
-func parseError(tag uint8) error {
-	return fmt.Errorf("ssh: parse error in message type %d", tag)
-}
-
-func findCommon(what string, client []string, server []string) (common string, err error) {
-	for _, c := range client {
-		for _, s := range server {
-			if c == s {
-				return c, nil
-			}
-		}
-	}
-	return "", fmt.Errorf("ssh: no common algorithm for %s; client offered: %v, server offered: %v", what, client, server)
-}
-
-type directionAlgorithms struct {
-	Cipher      string
-	MAC         string
-	Compression string
-}
-
-// rekeyBytes returns a rekeying intervals in bytes.
-func (a *directionAlgorithms) rekeyBytes() int64 {
-	// According to RFC4344 block ciphers should rekey after
-	// 2^(BLOCKSIZE/4) blocks. For all AES flavors BLOCKSIZE is
-	// 128.
-	switch a.Cipher {
-	case "aes128-ctr", "aes192-ctr", "aes256-ctr", gcmCipherID, aes128cbcID:
-		return 16 * (1 << 32)
-
-	}
-
-	// For others, stick with RFC4253 recommendation to rekey after 1 Gb of data.
-	return 1 << 30
-}
-
-type algorithms struct {
-	kex     string
-	hostKey string
-	w       directionAlgorithms
-	r       directionAlgorithms
-}
-
-func findAgreedAlgorithms(clientKexInit, serverKexInit *kexInitMsg) (algs *algorithms, err error) {
-	result := &algorithms{}
-
-	result.kex, err = findCommon("key exchange", clientKexInit.KexAlgos, serverKexInit.KexAlgos)
-	if err != nil {
-		return
-	}
-
-	result.hostKey, err = findCommon("host key", clientKexInit.ServerHostKeyAlgos, serverKexInit.ServerHostKeyAlgos)
-	if err != nil {
-		return
-	}
-
-	result.w.Cipher, err = findCommon("client to server cipher", clientKexInit.CiphersClientServer, serverKexInit.CiphersClientServer)
-	if err != nil {
-		return
-	}
-
-	result.r.Cipher, err = findCommon("server to client cipher", clientKexInit.CiphersServerClient, serverKexInit.CiphersServerClient)
-	if err != nil {
-		return
-	}
-
-	result.w.MAC, err = findCommon("client to server MAC", clientKexInit.MACsClientServer, serverKexInit.MACsClientServer)
-	if err != nil {
-		return
-	}
-
-	result.r.MAC, err = findCommon("server to client MAC", clientKexInit.MACsServerClient, serverKexInit.MACsServerClient)
-	if err != nil {
-		return
-	}
-
-	result.w.Compression, err = findCommon("client to server compression", clientKexInit.CompressionClientServer, serverKexInit.CompressionClientServer)
-	if err != nil {
-		return
-	}
-
-	result.r.Compression, err = findCommon("server to client compression", clientKexInit.CompressionServerClient, serverKexInit.CompressionServerClient)
-	if err != nil {
-		return
-	}
-
-	return result, nil
-}
-
-// If rekeythreshold is too small, we can't make any progress sending
-// stuff.
-const minRekeyThreshold uint64 = 256
-
-// Config contains configuration data common to both ServerConfig and
-// ClientConfig.
-type Config struct {
-	// Rand provides the source of entropy for cryptographic
-	// primitives. If Rand is nil, the cryptographic random reader
-	// in package crypto/rand will be used.
-	Rand io.Reader
-
-	// The maximum number of bytes sent or received after which a
-	// new key is negotiated. It must be at least 256. If
-	// unspecified, a size suitable for the chosen cipher is used.
-	RekeyThreshold uint64
-
-	// The allowed key exchanges algorithms. If unspecified then a
-	// default set of algorithms is used.
-	KeyExchanges []string
-
-	// The allowed cipher algorithms. If unspecified then a sensible
-	// default is used.
-	Ciphers []string
-
-	// The allowed MAC algorithms. If unspecified then a sensible default
-	// is used.
-	MACs []string
-}
-
-// SetDefaults sets sensible values for unset fields in config. This is
-// exported for testing: Configs passed to SSH functions are copied and have
-// default values set automatically.
-func (c *Config) SetDefaults() {
-	if c.Rand == nil {
-		c.Rand = rand.Reader
-	}
-	if c.Ciphers == nil {
-		c.Ciphers = supportedCiphers
-	}
-	var ciphers []string
-	for _, c := range c.Ciphers {
-		if cipherModes[c] != nil {
-			// reject the cipher if we have no cipherModes definition
-			ciphers = append(ciphers, c)
-		}
-	}
-	c.Ciphers = ciphers
-
-	if c.KeyExchanges == nil {
-		c.KeyExchanges = supportedKexAlgos
-	}
-
-	if c.MACs == nil {
-		c.MACs = supportedMACs
-	}
-
-	if c.RekeyThreshold == 0 {
-		// cipher specific default
-	} else if c.RekeyThreshold < minRekeyThreshold {
-		c.RekeyThreshold = minRekeyThreshold
-	} else if c.RekeyThreshold >= math.MaxInt64 {
-		// Avoid weirdness if somebody uses -1 as a threshold.
-		c.RekeyThreshold = math.MaxInt64
-	}
-}
-
-// buildDataSignedForAuth returns the data that is signed in order to prove
-// possession of a private key. See RFC 4252, section 7.
-func buildDataSignedForAuth(sessionId []byte, req userAuthRequestMsg, algo, pubKey []byte) []byte {
-	data := struct {
-		Session []byte
-		Type    byte
-		User    string
-		Service string
-		Method  string
-		Sign    bool
-		Algo    []byte
-		PubKey  []byte
-	}{
-		sessionId,
-		msgUserAuthRequest,
-		req.User,
-		req.Service,
-		req.Method,
-		true,
-		algo,
-		pubKey,
-	}
-	return Marshal(data)
-}
-
-func appendU16(buf []byte, n uint16) []byte {
-	return append(buf, byte(n>>8), byte(n))
-}
-
-func appendU32(buf []byte, n uint32) []byte {
-	return append(buf, byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-}
-
-func appendU64(buf []byte, n uint64) []byte {
-	return append(buf,
-		byte(n>>56), byte(n>>48), byte(n>>40), byte(n>>32),
-		byte(n>>24), byte(n>>16), byte(n>>8), byte(n))
-}
-
-func appendInt(buf []byte, n int) []byte {
-	return appendU32(buf, uint32(n))
-}
-
-func appendString(buf []byte, s string) []byte {
-	buf = appendU32(buf, uint32(len(s)))
-	buf = append(buf, s...)
-	return buf
-}
-
-func appendBool(buf []byte, b bool) []byte {
-	if b {
-		return append(buf, 1)
-	}
-	return append(buf, 0)
-}
-
-// newCond is a helper to hide the fact that there is no usable zero
-// value for sync.Cond.
-func newCond() *sync.Cond { return sync.NewCond(new(sync.Mutex)) }
-
-// window represents the buffer available to clients
-// wishing to write to a channel.
-type window struct {
-	*sync.Cond
-	win          uint32 // RFC 4254 5.2 says the window size can grow to 2^32-1
-	writeWaiters int
-	closed       bool
-}
-
-// add adds win to the amount of window available
-// for consumers.
-func (w *window) add(win uint32) bool {
-	// a zero sized window adjust is a noop.
-	if win == 0 {
-		return true
-	}
-	w.L.Lock()
-	if w.win+win < win {
-		w.L.Unlock()
-		return false
-	}
-	w.win += win
-	// It is unusual that multiple goroutines would be attempting to reserve
-	// window space, but not guaranteed. Use broadcast to notify all waiters
-	// that additional window is available.
-	w.Broadcast()
-	w.L.Unlock()
-	return true
-}
-
-// close sets the window to closed, so all reservations fail
-// immediately.
-func (w *window) close() {
-	w.L.Lock()
-	w.closed = true
-	w.Broadcast()
-	w.L.Unlock()
-}
-
-// reserve reserves win from the available window capacity.
-// If no capacity remains, reserve will block. reserve may
-// return less than requested.
-func (w *window) reserve(win uint32) (uint32, error) {
-	var err error
-	w.L.Lock()
-	w.writeWaiters++
-	w.Broadcast()
-	for w.win == 0 && !w.closed {
-		w.Wait()
-	}
-	w.writeWaiters--
-	if w.win < win {
-		win = w.win
-	}
-	w.win -= win
-	if w.closed {
-		err = io.EOF
-	}
-	w.L.Unlock()
-	return win, err
-}
-
-// waitWriterBlocked waits until some goroutine is blocked for further
-// writes. It is used in tests only.
-func (w *window) waitWriterBlocked() {
-	w.Cond.L.Lock()
-	for w.writeWaiters == 0 {
-		w.Cond.Wait()
-	}
-	w.Cond.L.Unlock()
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/connection.go b/installer/vendor/golang.org/x/crypto/ssh/connection.go
deleted file mode 100644
index fd6b0681b5..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/connection.go
+++ /dev/null
@@ -1,143 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"fmt"
-	"net"
-)
-
-// OpenChannelError is returned if the other side rejects an
-// OpenChannel request.
-type OpenChannelError struct {
-	Reason  RejectionReason
-	Message string
-}
-
-func (e *OpenChannelError) Error() string {
-	return fmt.Sprintf("ssh: rejected: %s (%s)", e.Reason, e.Message)
-}
-
-// ConnMetadata holds metadata for the connection.
-type ConnMetadata interface {
-	// User returns the user ID for this connection.
-	User() string
-
-	// SessionID returns the session hash, also denoted by H.
-	SessionID() []byte
-
-	// ClientVersion returns the client's version string as hashed
-	// into the session ID.
-	ClientVersion() []byte
-
-	// ServerVersion returns the server's version string as hashed
-	// into the session ID.
-	ServerVersion() []byte
-
-	// RemoteAddr returns the remote address for this connection.
-	RemoteAddr() net.Addr
-
-	// LocalAddr returns the local address for this connection.
-	LocalAddr() net.Addr
-}
-
-// Conn represents an SSH connection for both server and client roles.
-// Conn is the basis for implementing an application layer, such
-// as ClientConn, which implements the traditional shell access for
-// clients.
-type Conn interface {
-	ConnMetadata
-
-	// SendRequest sends a global request, and returns the
-	// reply. If wantReply is true, it returns the response status
-	// and payload. See also RFC4254, section 4.
-	SendRequest(name string, wantReply bool, payload []byte) (bool, []byte, error)
-
-	// OpenChannel tries to open an channel. If the request is
-	// rejected, it returns *OpenChannelError. On success it returns
-	// the SSH Channel and a Go channel for incoming, out-of-band
-	// requests. The Go channel must be serviced, or the
-	// connection will hang.
-	OpenChannel(name string, data []byte) (Channel, <-chan *Request, error)
-
-	// Close closes the underlying network connection
-	Close() error
-
-	// Wait blocks until the connection has shut down, and returns the
-	// error causing the shutdown.
-	Wait() error
-
-	// TODO(hanwen): consider exposing:
-	//   RequestKeyChange
-	//   Disconnect
-}
-
-// DiscardRequests consumes and rejects all requests from the
-// passed-in channel.
-func DiscardRequests(in <-chan *Request) {
-	for req := range in {
-		if req.WantReply {
-			req.Reply(false, nil)
-		}
-	}
-}
-
-// A connection represents an incoming connection.
-type connection struct {
-	transport *handshakeTransport
-	sshConn
-
-	// The connection protocol.
-	*mux
-}
-
-func (c *connection) Close() error {
-	return c.sshConn.conn.Close()
-}
-
-// sshconn provides net.Conn metadata, but disallows direct reads and
-// writes.
-type sshConn struct {
-	conn net.Conn
-
-	user          string
-	sessionID     []byte
-	clientVersion []byte
-	serverVersion []byte
-}
-
-func dup(src []byte) []byte {
-	dst := make([]byte, len(src))
-	copy(dst, src)
-	return dst
-}
-
-func (c *sshConn) User() string {
-	return c.user
-}
-
-func (c *sshConn) RemoteAddr() net.Addr {
-	return c.conn.RemoteAddr()
-}
-
-func (c *sshConn) Close() error {
-	return c.conn.Close()
-}
-
-func (c *sshConn) LocalAddr() net.Addr {
-	return c.conn.LocalAddr()
-}
-
-func (c *sshConn) SessionID() []byte {
-	return dup(c.sessionID)
-}
-
-func (c *sshConn) ClientVersion() []byte {
-	return dup(c.clientVersion)
-}
-
-func (c *sshConn) ServerVersion() []byte {
-	return dup(c.serverVersion)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/doc.go b/installer/vendor/golang.org/x/crypto/ssh/doc.go
deleted file mode 100644
index 67b7322c05..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/doc.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package ssh implements an SSH client and server.
-
-SSH is a transport security protocol, an authentication protocol and a
-family of application protocols. The most typical application level
-protocol is a remote shell and this is specifically implemented.  However,
-the multiplexed nature of SSH is exposed to users that wish to support
-others.
-
-References:
-  [PROTOCOL.certkeys]: http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/usr.bin/ssh/PROTOCOL.certkeys?rev=HEAD
-  [SSH-PARAMETERS]:    http://www.iana.org/assignments/ssh-parameters/ssh-parameters.xml#ssh-parameters-1
-
-This package does not fall under the stability promise of the Go language itself,
-so its API may be changed when pressing needs arise.
-*/
-package ssh // import "golang.org/x/crypto/ssh"
diff --git a/installer/vendor/golang.org/x/crypto/ssh/example_test.go b/installer/vendor/golang.org/x/crypto/ssh/example_test.go
deleted file mode 100644
index b910c7bf60..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/example_test.go
+++ /dev/null
@@ -1,320 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh_test
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/terminal"
-)
-
-func ExampleNewServerConn() {
-	// Public key authentication is done by comparing
-	// the public key of a received connection
-	// with the entries in the authorized_keys file.
-	authorizedKeysBytes, err := ioutil.ReadFile("authorized_keys")
-	if err != nil {
-		log.Fatalf("Failed to load authorized_keys, err: %v", err)
-	}
-
-	authorizedKeysMap := map[string]bool{}
-	for len(authorizedKeysBytes) > 0 {
-		pubKey, _, _, rest, err := ssh.ParseAuthorizedKey(authorizedKeysBytes)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		authorizedKeysMap[string(pubKey.Marshal())] = true
-		authorizedKeysBytes = rest
-	}
-
-	// An SSH server is represented by a ServerConfig, which holds
-	// certificate details and handles authentication of ServerConns.
-	config := &ssh.ServerConfig{
-		// Remove to disable password auth.
-		PasswordCallback: func(c ssh.ConnMetadata, pass []byte) (*ssh.Permissions, error) {
-			// Should use constant-time compare (or better, salt+hash) in
-			// a production setting.
-			if c.User() == "testuser" && string(pass) == "tiger" {
-				return nil, nil
-			}
-			return nil, fmt.Errorf("password rejected for %q", c.User())
-		},
-
-		// Remove to disable public key auth.
-		PublicKeyCallback: func(c ssh.ConnMetadata, pubKey ssh.PublicKey) (*ssh.Permissions, error) {
-			if authorizedKeysMap[string(pubKey.Marshal())] {
-				return &ssh.Permissions{
-					// Record the public key used for authentication.
-					Extensions: map[string]string{
-						"pubkey-fp": ssh.FingerprintSHA256(pubKey),
-					},
-				}, nil
-			}
-			return nil, fmt.Errorf("unknown public key for %q", c.User())
-		},
-	}
-
-	privateBytes, err := ioutil.ReadFile("id_rsa")
-	if err != nil {
-		log.Fatal("Failed to load private key: ", err)
-	}
-
-	private, err := ssh.ParsePrivateKey(privateBytes)
-	if err != nil {
-		log.Fatal("Failed to parse private key: ", err)
-	}
-
-	config.AddHostKey(private)
-
-	// Once a ServerConfig has been configured, connections can be
-	// accepted.
-	listener, err := net.Listen("tcp", "0.0.0.0:2022")
-	if err != nil {
-		log.Fatal("failed to listen for connection: ", err)
-	}
-	nConn, err := listener.Accept()
-	if err != nil {
-		log.Fatal("failed to accept incoming connection: ", err)
-	}
-
-	// Before use, a handshake must be performed on the incoming
-	// net.Conn.
-	conn, chans, reqs, err := ssh.NewServerConn(nConn, config)
-	if err != nil {
-		log.Fatal("failed to handshake: ", err)
-	}
-	log.Printf("logged in with key %s", conn.Permissions.Extensions["pubkey-fp"])
-
-	// The incoming Request channel must be serviced.
-	go ssh.DiscardRequests(reqs)
-
-	// Service the incoming Channel channel.
-	for newChannel := range chans {
-		// Channels have a type, depending on the application level
-		// protocol intended. In the case of a shell, the type is
-		// "session" and ServerShell may be used to present a simple
-		// terminal interface.
-		if newChannel.ChannelType() != "session" {
-			newChannel.Reject(ssh.UnknownChannelType, "unknown channel type")
-			continue
-		}
-		channel, requests, err := newChannel.Accept()
-		if err != nil {
-			log.Fatalf("Could not accept channel: %v", err)
-		}
-
-		// Sessions have out-of-band requests such as "shell",
-		// "pty-req" and "env".  Here we handle only the
-		// "shell" request.
-		go func(in <-chan *ssh.Request) {
-			for req := range in {
-				req.Reply(req.Type == "shell", nil)
-			}
-		}(requests)
-
-		term := terminal.NewTerminal(channel, "> ")
-
-		go func() {
-			defer channel.Close()
-			for {
-				line, err := term.ReadLine()
-				if err != nil {
-					break
-				}
-				fmt.Println(line)
-			}
-		}()
-	}
-}
-
-func ExampleHostKeyCheck() {
-	// Every client must provide a host key check.  Here is a
-	// simple-minded parse of OpenSSH's known_hosts file
-	host := "hostname"
-	file, err := os.Open(filepath.Join(os.Getenv("HOME"), ".ssh", "known_hosts"))
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	var hostKey ssh.PublicKey
-	for scanner.Scan() {
-		fields := strings.Split(scanner.Text(), " ")
-		if len(fields) != 3 {
-			continue
-		}
-		if strings.Contains(fields[0], host) {
-			var err error
-			hostKey, _, _, _, err = ssh.ParseAuthorizedKey(scanner.Bytes())
-			if err != nil {
-				log.Fatalf("error parsing %q: %v", fields[2], err)
-			}
-			break
-		}
-	}
-
-	if hostKey == nil {
-		log.Fatalf("no hostkey for %s", host)
-	}
-
-	config := ssh.ClientConfig{
-		User:            os.Getenv("USER"),
-		HostKeyCallback: ssh.FixedHostKey(hostKey),
-	}
-
-	_, err = ssh.Dial("tcp", host+":22", &config)
-	log.Println(err)
-}
-
-func ExampleDial() {
-	var hostKey ssh.PublicKey
-	// An SSH client is represented with a ClientConn.
-	//
-	// To authenticate with the remote server you must pass at least one
-	// implementation of AuthMethod via the Auth field in ClientConfig,
-	// and provide a HostKeyCallback.
-	config := &ssh.ClientConfig{
-		User: "username",
-		Auth: []ssh.AuthMethod{
-			ssh.Password("yourpassword"),
-		},
-		HostKeyCallback: ssh.FixedHostKey(hostKey),
-	}
-	client, err := ssh.Dial("tcp", "yourserver.com:22", config)
-	if err != nil {
-		log.Fatal("Failed to dial: ", err)
-	}
-
-	// Each ClientConn can support multiple interactive sessions,
-	// represented by a Session.
-	session, err := client.NewSession()
-	if err != nil {
-		log.Fatal("Failed to create session: ", err)
-	}
-	defer session.Close()
-
-	// Once a Session is created, you can execute a single command on
-	// the remote side using the Run method.
-	var b bytes.Buffer
-	session.Stdout = &b
-	if err := session.Run("/usr/bin/whoami"); err != nil {
-		log.Fatal("Failed to run: " + err.Error())
-	}
-	fmt.Println(b.String())
-}
-
-func ExamplePublicKeys() {
-	var hostKey ssh.PublicKey
-	// A public key may be used to authenticate against the remote
-	// server by using an unencrypted PEM-encoded private key file.
-	//
-	// If you have an encrypted private key, the crypto/x509 package
-	// can be used to decrypt it.
-	key, err := ioutil.ReadFile("/home/user/.ssh/id_rsa")
-	if err != nil {
-		log.Fatalf("unable to read private key: %v", err)
-	}
-
-	// Create the Signer for this private key.
-	signer, err := ssh.ParsePrivateKey(key)
-	if err != nil {
-		log.Fatalf("unable to parse private key: %v", err)
-	}
-
-	config := &ssh.ClientConfig{
-		User: "user",
-		Auth: []ssh.AuthMethod{
-			// Use the PublicKeys method for remote authentication.
-			ssh.PublicKeys(signer),
-		},
-		HostKeyCallback: ssh.FixedHostKey(hostKey),
-	}
-
-	// Connect to the remote server and perform the SSH handshake.
-	client, err := ssh.Dial("tcp", "host.com:22", config)
-	if err != nil {
-		log.Fatalf("unable to connect: %v", err)
-	}
-	defer client.Close()
-}
-
-func ExampleClient_Listen() {
-	var hostKey ssh.PublicKey
-	config := &ssh.ClientConfig{
-		User: "username",
-		Auth: []ssh.AuthMethod{
-			ssh.Password("password"),
-		},
-		HostKeyCallback: ssh.FixedHostKey(hostKey),
-	}
-	// Dial your ssh server.
-	conn, err := ssh.Dial("tcp", "localhost:22", config)
-	if err != nil {
-		log.Fatal("unable to connect: ", err)
-	}
-	defer conn.Close()
-
-	// Request the remote side to open port 8080 on all interfaces.
-	l, err := conn.Listen("tcp", "0.0.0.0:8080")
-	if err != nil {
-		log.Fatal("unable to register tcp forward: ", err)
-	}
-	defer l.Close()
-
-	// Serve HTTP with your SSH server acting as a reverse proxy.
-	http.Serve(l, http.HandlerFunc(func(resp http.ResponseWriter, req *http.Request) {
-		fmt.Fprintf(resp, "Hello world!\n")
-	}))
-}
-
-func ExampleSession_RequestPty() {
-	var hostKey ssh.PublicKey
-	// Create client config
-	config := &ssh.ClientConfig{
-		User: "username",
-		Auth: []ssh.AuthMethod{
-			ssh.Password("password"),
-		},
-		HostKeyCallback: ssh.FixedHostKey(hostKey),
-	}
-	// Connect to ssh server
-	conn, err := ssh.Dial("tcp", "localhost:22", config)
-	if err != nil {
-		log.Fatal("unable to connect: ", err)
-	}
-	defer conn.Close()
-	// Create a session
-	session, err := conn.NewSession()
-	if err != nil {
-		log.Fatal("unable to create session: ", err)
-	}
-	defer session.Close()
-	// Set up terminal modes
-	modes := ssh.TerminalModes{
-		ssh.ECHO:          0,     // disable echoing
-		ssh.TTY_OP_ISPEED: 14400, // input speed = 14.4kbaud
-		ssh.TTY_OP_OSPEED: 14400, // output speed = 14.4kbaud
-	}
-	// Request pseudo terminal
-	if err := session.RequestPty("xterm", 40, 80, modes); err != nil {
-		log.Fatal("request for pseudo terminal failed: ", err)
-	}
-	// Start remote shell
-	if err := session.Shell(); err != nil {
-		log.Fatal("failed to start shell: ", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/handshake.go b/installer/vendor/golang.org/x/crypto/ssh/handshake.go
deleted file mode 100644
index 932ce8393e..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/handshake.go
+++ /dev/null
@@ -1,640 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto/rand"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"sync"
-)
-
-// debugHandshake, if set, prints messages sent and received.  Key
-// exchange messages are printed as if DH were used, so the debug
-// messages are wrong when using ECDH.
-const debugHandshake = false
-
-// chanSize sets the amount of buffering SSH connections. This is
-// primarily for testing: setting chanSize=0 uncovers deadlocks more
-// quickly.
-const chanSize = 16
-
-// keyingTransport is a packet based transport that supports key
-// changes. It need not be thread-safe. It should pass through
-// msgNewKeys in both directions.
-type keyingTransport interface {
-	packetConn
-
-	// prepareKeyChange sets up a key change. The key change for a
-	// direction will be effected if a msgNewKeys message is sent
-	// or received.
-	prepareKeyChange(*algorithms, *kexResult) error
-}
-
-// handshakeTransport implements rekeying on top of a keyingTransport
-// and offers a thread-safe writePacket() interface.
-type handshakeTransport struct {
-	conn   keyingTransport
-	config *Config
-
-	serverVersion []byte
-	clientVersion []byte
-
-	// hostKeys is non-empty if we are the server. In that case,
-	// it contains all host keys that can be used to sign the
-	// connection.
-	hostKeys []Signer
-
-	// hostKeyAlgorithms is non-empty if we are the client. In that case,
-	// we accept these key types from the server as host key.
-	hostKeyAlgorithms []string
-
-	// On read error, incoming is closed, and readError is set.
-	incoming  chan []byte
-	readError error
-
-	mu             sync.Mutex
-	writeError     error
-	sentInitPacket []byte
-	sentInitMsg    *kexInitMsg
-	pendingPackets [][]byte // Used when a key exchange is in progress.
-
-	// If the read loop wants to schedule a kex, it pings this
-	// channel, and the write loop will send out a kex
-	// message.
-	requestKex chan struct{}
-
-	// If the other side requests or confirms a kex, its kexInit
-	// packet is sent here for the write loop to find it.
-	startKex chan *pendingKex
-
-	// data for host key checking
-	hostKeyCallback HostKeyCallback
-	dialAddress     string
-	remoteAddr      net.Addr
-
-	// Algorithms agreed in the last key exchange.
-	algorithms *algorithms
-
-	readPacketsLeft uint32
-	readBytesLeft   int64
-
-	writePacketsLeft uint32
-	writeBytesLeft   int64
-
-	// The session ID or nil if first kex did not complete yet.
-	sessionID []byte
-}
-
-type pendingKex struct {
-	otherInit []byte
-	done      chan error
-}
-
-func newHandshakeTransport(conn keyingTransport, config *Config, clientVersion, serverVersion []byte) *handshakeTransport {
-	t := &handshakeTransport{
-		conn:          conn,
-		serverVersion: serverVersion,
-		clientVersion: clientVersion,
-		incoming:      make(chan []byte, chanSize),
-		requestKex:    make(chan struct{}, 1),
-		startKex:      make(chan *pendingKex, 1),
-
-		config: config,
-	}
-	t.resetReadThresholds()
-	t.resetWriteThresholds()
-
-	// We always start with a mandatory key exchange.
-	t.requestKex <- struct{}{}
-	return t
-}
-
-func newClientTransport(conn keyingTransport, clientVersion, serverVersion []byte, config *ClientConfig, dialAddr string, addr net.Addr) *handshakeTransport {
-	t := newHandshakeTransport(conn, &config.Config, clientVersion, serverVersion)
-	t.dialAddress = dialAddr
-	t.remoteAddr = addr
-	t.hostKeyCallback = config.HostKeyCallback
-	if config.HostKeyAlgorithms != nil {
-		t.hostKeyAlgorithms = config.HostKeyAlgorithms
-	} else {
-		t.hostKeyAlgorithms = supportedHostKeyAlgos
-	}
-	go t.readLoop()
-	go t.kexLoop()
-	return t
-}
-
-func newServerTransport(conn keyingTransport, clientVersion, serverVersion []byte, config *ServerConfig) *handshakeTransport {
-	t := newHandshakeTransport(conn, &config.Config, clientVersion, serverVersion)
-	t.hostKeys = config.hostKeys
-	go t.readLoop()
-	go t.kexLoop()
-	return t
-}
-
-func (t *handshakeTransport) getSessionID() []byte {
-	return t.sessionID
-}
-
-// waitSession waits for the session to be established. This should be
-// the first thing to call after instantiating handshakeTransport.
-func (t *handshakeTransport) waitSession() error {
-	p, err := t.readPacket()
-	if err != nil {
-		return err
-	}
-	if p[0] != msgNewKeys {
-		return fmt.Errorf("ssh: first packet should be msgNewKeys")
-	}
-
-	return nil
-}
-
-func (t *handshakeTransport) id() string {
-	if len(t.hostKeys) > 0 {
-		return "server"
-	}
-	return "client"
-}
-
-func (t *handshakeTransport) printPacket(p []byte, write bool) {
-	action := "got"
-	if write {
-		action = "sent"
-	}
-
-	if p[0] == msgChannelData || p[0] == msgChannelExtendedData {
-		log.Printf("%s %s data (packet %d bytes)", t.id(), action, len(p))
-	} else {
-		msg, err := decode(p)
-		log.Printf("%s %s %T %v (%v)", t.id(), action, msg, msg, err)
-	}
-}
-
-func (t *handshakeTransport) readPacket() ([]byte, error) {
-	p, ok := <-t.incoming
-	if !ok {
-		return nil, t.readError
-	}
-	return p, nil
-}
-
-func (t *handshakeTransport) readLoop() {
-	first := true
-	for {
-		p, err := t.readOnePacket(first)
-		first = false
-		if err != nil {
-			t.readError = err
-			close(t.incoming)
-			break
-		}
-		if p[0] == msgIgnore || p[0] == msgDebug {
-			continue
-		}
-		t.incoming <- p
-	}
-
-	// Stop writers too.
-	t.recordWriteError(t.readError)
-
-	// Unblock the writer should it wait for this.
-	close(t.startKex)
-
-	// Don't close t.requestKex; it's also written to from writePacket.
-}
-
-func (t *handshakeTransport) pushPacket(p []byte) error {
-	if debugHandshake {
-		t.printPacket(p, true)
-	}
-	return t.conn.writePacket(p)
-}
-
-func (t *handshakeTransport) getWriteError() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	return t.writeError
-}
-
-func (t *handshakeTransport) recordWriteError(err error) {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.writeError == nil && err != nil {
-		t.writeError = err
-	}
-}
-
-func (t *handshakeTransport) requestKeyExchange() {
-	select {
-	case t.requestKex <- struct{}{}:
-	default:
-		// something already requested a kex, so do nothing.
-	}
-}
-
-func (t *handshakeTransport) resetWriteThresholds() {
-	t.writePacketsLeft = packetRekeyThreshold
-	if t.config.RekeyThreshold > 0 {
-		t.writeBytesLeft = int64(t.config.RekeyThreshold)
-	} else if t.algorithms != nil {
-		t.writeBytesLeft = t.algorithms.w.rekeyBytes()
-	} else {
-		t.writeBytesLeft = 1 << 30
-	}
-}
-
-func (t *handshakeTransport) kexLoop() {
-
-write:
-	for t.getWriteError() == nil {
-		var request *pendingKex
-		var sent bool
-
-		for request == nil || !sent {
-			var ok bool
-			select {
-			case request, ok = <-t.startKex:
-				if !ok {
-					break write
-				}
-			case <-t.requestKex:
-				break
-			}
-
-			if !sent {
-				if err := t.sendKexInit(); err != nil {
-					t.recordWriteError(err)
-					break
-				}
-				sent = true
-			}
-		}
-
-		if err := t.getWriteError(); err != nil {
-			if request != nil {
-				request.done <- err
-			}
-			break
-		}
-
-		// We're not servicing t.requestKex, but that is OK:
-		// we never block on sending to t.requestKex.
-
-		// We're not servicing t.startKex, but the remote end
-		// has just sent us a kexInitMsg, so it can't send
-		// another key change request, until we close the done
-		// channel on the pendingKex request.
-
-		err := t.enterKeyExchange(request.otherInit)
-
-		t.mu.Lock()
-		t.writeError = err
-		t.sentInitPacket = nil
-		t.sentInitMsg = nil
-
-		t.resetWriteThresholds()
-
-		// we have completed the key exchange. Since the
-		// reader is still blocked, it is safe to clear out
-		// the requestKex channel. This avoids the situation
-		// where: 1) we consumed our own request for the
-		// initial kex, and 2) the kex from the remote side
-		// caused another send on the requestKex channel,
-	clear:
-		for {
-			select {
-			case <-t.requestKex:
-				//
-			default:
-				break clear
-			}
-		}
-
-		request.done <- t.writeError
-
-		// kex finished. Push packets that we received while
-		// the kex was in progress. Don't look at t.startKex
-		// and don't increment writtenSinceKex: if we trigger
-		// another kex while we are still busy with the last
-		// one, things will become very confusing.
-		for _, p := range t.pendingPackets {
-			t.writeError = t.pushPacket(p)
-			if t.writeError != nil {
-				break
-			}
-		}
-		t.pendingPackets = t.pendingPackets[:0]
-		t.mu.Unlock()
-	}
-
-	// drain startKex channel. We don't service t.requestKex
-	// because nobody does blocking sends there.
-	go func() {
-		for init := range t.startKex {
-			init.done <- t.writeError
-		}
-	}()
-
-	// Unblock reader.
-	t.conn.Close()
-}
-
-// The protocol uses uint32 for packet counters, so we can't let them
-// reach 1<<32.  We will actually read and write more packets than
-// this, though: the other side may send more packets, and after we
-// hit this limit on writing we will send a few more packets for the
-// key exchange itself.
-const packetRekeyThreshold = (1 << 31)
-
-func (t *handshakeTransport) resetReadThresholds() {
-	t.readPacketsLeft = packetRekeyThreshold
-	if t.config.RekeyThreshold > 0 {
-		t.readBytesLeft = int64(t.config.RekeyThreshold)
-	} else if t.algorithms != nil {
-		t.readBytesLeft = t.algorithms.r.rekeyBytes()
-	} else {
-		t.readBytesLeft = 1 << 30
-	}
-}
-
-func (t *handshakeTransport) readOnePacket(first bool) ([]byte, error) {
-	p, err := t.conn.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	if t.readPacketsLeft > 0 {
-		t.readPacketsLeft--
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if t.readBytesLeft > 0 {
-		t.readBytesLeft -= int64(len(p))
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if debugHandshake {
-		t.printPacket(p, false)
-	}
-
-	if first && p[0] != msgKexInit {
-		return nil, fmt.Errorf("ssh: first packet should be msgKexInit")
-	}
-
-	if p[0] != msgKexInit {
-		return p, nil
-	}
-
-	firstKex := t.sessionID == nil
-
-	kex := pendingKex{
-		done:      make(chan error, 1),
-		otherInit: p,
-	}
-	t.startKex <- &kex
-	err = <-kex.done
-
-	if debugHandshake {
-		log.Printf("%s exited key exchange (first %v), err %v", t.id(), firstKex, err)
-	}
-
-	if err != nil {
-		return nil, err
-	}
-
-	t.resetReadThresholds()
-
-	// By default, a key exchange is hidden from higher layers by
-	// translating it into msgIgnore.
-	successPacket := []byte{msgIgnore}
-	if firstKex {
-		// sendKexInit() for the first kex waits for
-		// msgNewKeys so the authentication process is
-		// guaranteed to happen over an encrypted transport.
-		successPacket = []byte{msgNewKeys}
-	}
-
-	return successPacket, nil
-}
-
-// sendKexInit sends a key change message.
-func (t *handshakeTransport) sendKexInit() error {
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.sentInitMsg != nil {
-		// kexInits may be sent either in response to the other side,
-		// or because our side wants to initiate a key change, so we
-		// may have already sent a kexInit. In that case, don't send a
-		// second kexInit.
-		return nil
-	}
-
-	msg := &kexInitMsg{
-		KexAlgos:                t.config.KeyExchanges,
-		CiphersClientServer:     t.config.Ciphers,
-		CiphersServerClient:     t.config.Ciphers,
-		MACsClientServer:        t.config.MACs,
-		MACsServerClient:        t.config.MACs,
-		CompressionClientServer: supportedCompressions,
-		CompressionServerClient: supportedCompressions,
-	}
-	io.ReadFull(rand.Reader, msg.Cookie[:])
-
-	if len(t.hostKeys) > 0 {
-		for _, k := range t.hostKeys {
-			msg.ServerHostKeyAlgos = append(
-				msg.ServerHostKeyAlgos, k.PublicKey().Type())
-		}
-	} else {
-		msg.ServerHostKeyAlgos = t.hostKeyAlgorithms
-	}
-	packet := Marshal(msg)
-
-	// writePacket destroys the contents, so save a copy.
-	packetCopy := make([]byte, len(packet))
-	copy(packetCopy, packet)
-
-	if err := t.pushPacket(packetCopy); err != nil {
-		return err
-	}
-
-	t.sentInitMsg = msg
-	t.sentInitPacket = packet
-
-	return nil
-}
-
-func (t *handshakeTransport) writePacket(p []byte) error {
-	switch p[0] {
-	case msgKexInit:
-		return errors.New("ssh: only handshakeTransport can send kexInit")
-	case msgNewKeys:
-		return errors.New("ssh: only handshakeTransport can send newKeys")
-	}
-
-	t.mu.Lock()
-	defer t.mu.Unlock()
-	if t.writeError != nil {
-		return t.writeError
-	}
-
-	if t.sentInitMsg != nil {
-		// Copy the packet so the writer can reuse the buffer.
-		cp := make([]byte, len(p))
-		copy(cp, p)
-		t.pendingPackets = append(t.pendingPackets, cp)
-		return nil
-	}
-
-	if t.writeBytesLeft > 0 {
-		t.writeBytesLeft -= int64(len(p))
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if t.writePacketsLeft > 0 {
-		t.writePacketsLeft--
-	} else {
-		t.requestKeyExchange()
-	}
-
-	if err := t.pushPacket(p); err != nil {
-		t.writeError = err
-	}
-
-	return nil
-}
-
-func (t *handshakeTransport) Close() error {
-	return t.conn.Close()
-}
-
-func (t *handshakeTransport) enterKeyExchange(otherInitPacket []byte) error {
-	if debugHandshake {
-		log.Printf("%s entered key exchange", t.id())
-	}
-
-	otherInit := &kexInitMsg{}
-	if err := Unmarshal(otherInitPacket, otherInit); err != nil {
-		return err
-	}
-
-	magics := handshakeMagics{
-		clientVersion: t.clientVersion,
-		serverVersion: t.serverVersion,
-		clientKexInit: otherInitPacket,
-		serverKexInit: t.sentInitPacket,
-	}
-
-	clientInit := otherInit
-	serverInit := t.sentInitMsg
-	if len(t.hostKeys) == 0 {
-		clientInit, serverInit = serverInit, clientInit
-
-		magics.clientKexInit = t.sentInitPacket
-		magics.serverKexInit = otherInitPacket
-	}
-
-	var err error
-	t.algorithms, err = findAgreedAlgorithms(clientInit, serverInit)
-	if err != nil {
-		return err
-	}
-
-	// We don't send FirstKexFollows, but we handle receiving it.
-	//
-	// RFC 4253 section 7 defines the kex and the agreement method for
-	// first_kex_packet_follows. It states that the guessed packet
-	// should be ignored if the "kex algorithm and/or the host
-	// key algorithm is guessed wrong (server and client have
-	// different preferred algorithm), or if any of the other
-	// algorithms cannot be agreed upon". The other algorithms have
-	// already been checked above so the kex algorithm and host key
-	// algorithm are checked here.
-	if otherInit.FirstKexFollows && (clientInit.KexAlgos[0] != serverInit.KexAlgos[0] || clientInit.ServerHostKeyAlgos[0] != serverInit.ServerHostKeyAlgos[0]) {
-		// other side sent a kex message for the wrong algorithm,
-		// which we have to ignore.
-		if _, err := t.conn.readPacket(); err != nil {
-			return err
-		}
-	}
-
-	kex, ok := kexAlgoMap[t.algorithms.kex]
-	if !ok {
-		return fmt.Errorf("ssh: unexpected key exchange algorithm %v", t.algorithms.kex)
-	}
-
-	var result *kexResult
-	if len(t.hostKeys) > 0 {
-		result, err = t.server(kex, t.algorithms, &magics)
-	} else {
-		result, err = t.client(kex, t.algorithms, &magics)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	if t.sessionID == nil {
-		t.sessionID = result.H
-	}
-	result.SessionID = t.sessionID
-
-	if err := t.conn.prepareKeyChange(t.algorithms, result); err != nil {
-		return err
-	}
-	if err = t.conn.writePacket([]byte{msgNewKeys}); err != nil {
-		return err
-	}
-	if packet, err := t.conn.readPacket(); err != nil {
-		return err
-	} else if packet[0] != msgNewKeys {
-		return unexpectedMessageError(msgNewKeys, packet[0])
-	}
-
-	return nil
-}
-
-func (t *handshakeTransport) server(kex kexAlgorithm, algs *algorithms, magics *handshakeMagics) (*kexResult, error) {
-	var hostKey Signer
-	for _, k := range t.hostKeys {
-		if algs.hostKey == k.PublicKey().Type() {
-			hostKey = k
-		}
-	}
-
-	r, err := kex.Server(t.conn, t.config.Rand, magics, hostKey)
-	return r, err
-}
-
-func (t *handshakeTransport) client(kex kexAlgorithm, algs *algorithms, magics *handshakeMagics) (*kexResult, error) {
-	result, err := kex.Client(t.conn, t.config.Rand, magics)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKey, err := ParsePublicKey(result.HostKey)
-	if err != nil {
-		return nil, err
-	}
-
-	if err := verifyHostKeySignature(hostKey, result); err != nil {
-		return nil, err
-	}
-
-	err = t.hostKeyCallback(t.dialAddress, t.remoteAddr, hostKey)
-	if err != nil {
-		return nil, err
-	}
-
-	return result, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/handshake_test.go b/installer/vendor/golang.org/x/crypto/ssh/handshake_test.go
deleted file mode 100644
index 91d4935689..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/handshake_test.go
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto/rand"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-)
-
-type testChecker struct {
-	calls []string
-}
-
-func (t *testChecker) Check(dialAddr string, addr net.Addr, key PublicKey) error {
-	if dialAddr == "bad" {
-		return fmt.Errorf("dialAddr is bad")
-	}
-
-	if tcpAddr, ok := addr.(*net.TCPAddr); !ok || tcpAddr == nil {
-		return fmt.Errorf("testChecker: got %T want *net.TCPAddr", addr)
-	}
-
-	t.calls = append(t.calls, fmt.Sprintf("%s %v %s %x", dialAddr, addr, key.Type(), key.Marshal()))
-
-	return nil
-}
-
-// netPipe is analogous to net.Pipe, but it uses a real net.Conn, and
-// therefore is buffered (net.Pipe deadlocks if both sides start with
-// a write.)
-func netPipe() (net.Conn, net.Conn, error) {
-	listener, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		listener, err = net.Listen("tcp", "[::1]:0")
-		if err != nil {
-			return nil, nil, err
-		}
-	}
-	defer listener.Close()
-	c1, err := net.Dial("tcp", listener.Addr().String())
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c2, err := listener.Accept()
-	if err != nil {
-		c1.Close()
-		return nil, nil, err
-	}
-
-	return c1, c2, nil
-}
-
-// noiseTransport inserts ignore messages to check that the read loop
-// and the key exchange filters out these messages.
-type noiseTransport struct {
-	keyingTransport
-}
-
-func (t *noiseTransport) writePacket(p []byte) error {
-	ignore := []byte{msgIgnore}
-	if err := t.keyingTransport.writePacket(ignore); err != nil {
-		return err
-	}
-	debug := []byte{msgDebug, 1, 2, 3}
-	if err := t.keyingTransport.writePacket(debug); err != nil {
-		return err
-	}
-
-	return t.keyingTransport.writePacket(p)
-}
-
-func addNoiseTransport(t keyingTransport) keyingTransport {
-	return &noiseTransport{t}
-}
-
-// handshakePair creates two handshakeTransports connected with each
-// other. If the noise argument is true, both transports will try to
-// confuse the other side by sending ignore and debug messages.
-func handshakePair(clientConf *ClientConfig, addr string, noise bool) (client *handshakeTransport, server *handshakeTransport, err error) {
-	a, b, err := netPipe()
-	if err != nil {
-		return nil, nil, err
-	}
-
-	var trC, trS keyingTransport
-
-	trC = newTransport(a, rand.Reader, true)
-	trS = newTransport(b, rand.Reader, false)
-	if noise {
-		trC = addNoiseTransport(trC)
-		trS = addNoiseTransport(trS)
-	}
-	clientConf.SetDefaults()
-
-	v := []byte("version")
-	client = newClientTransport(trC, v, v, clientConf, addr, a.RemoteAddr())
-
-	serverConf := &ServerConfig{}
-	serverConf.AddHostKey(testSigners["ecdsa"])
-	serverConf.AddHostKey(testSigners["rsa"])
-	serverConf.SetDefaults()
-	server = newServerTransport(trS, v, v, serverConf)
-
-	if err := server.waitSession(); err != nil {
-		return nil, nil, fmt.Errorf("server.waitSession: %v", err)
-	}
-	if err := client.waitSession(); err != nil {
-		return nil, nil, fmt.Errorf("client.waitSession: %v", err)
-	}
-
-	return client, server, nil
-}
-
-func TestHandshakeBasic(t *testing.T) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("see golang.org/issue/7237")
-	}
-
-	checker := &syncChecker{
-		waitCall: make(chan int, 10),
-		called:   make(chan int, 10),
-	}
-
-	checker.waitCall <- 1
-	trC, trS, err := handshakePair(&ClientConfig{HostKeyCallback: checker.Check}, "addr", false)
-	if err != nil {
-		t.Fatalf("handshakePair: %v", err)
-	}
-
-	defer trC.Close()
-	defer trS.Close()
-
-	// Let first kex complete normally.
-	<-checker.called
-
-	clientDone := make(chan int, 0)
-	gotHalf := make(chan int, 0)
-	const N = 20
-
-	go func() {
-		defer close(clientDone)
-		// Client writes a bunch of stuff, and does a key
-		// change in the middle. This should not confuse the
-		// handshake in progress. We do this twice, so we test
-		// that the packet buffer is reset correctly.
-		for i := 0; i < N; i++ {
-			p := []byte{msgRequestSuccess, byte(i)}
-			if err := trC.writePacket(p); err != nil {
-				t.Fatalf("sendPacket: %v", err)
-			}
-			if (i % 10) == 5 {
-				<-gotHalf
-				// halfway through, we request a key change.
-				trC.requestKeyExchange()
-
-				// Wait until we can be sure the key
-				// change has really started before we
-				// write more.
-				<-checker.called
-			}
-			if (i % 10) == 7 {
-				// write some packets until the kex
-				// completes, to test buffering of
-				// packets.
-				checker.waitCall <- 1
-			}
-		}
-	}()
-
-	// Server checks that client messages come in cleanly
-	i := 0
-	err = nil
-	for ; i < N; i++ {
-		var p []byte
-		p, err = trS.readPacket()
-		if err != nil {
-			break
-		}
-		if (i % 10) == 5 {
-			gotHalf <- 1
-		}
-
-		want := []byte{msgRequestSuccess, byte(i)}
-		if bytes.Compare(p, want) != 0 {
-			t.Errorf("message %d: got %v, want %v", i, p, want)
-		}
-	}
-	<-clientDone
-	if err != nil && err != io.EOF {
-		t.Fatalf("server error: %v", err)
-	}
-	if i != N {
-		t.Errorf("received %d messages, want 10.", i)
-	}
-
-	close(checker.called)
-	if _, ok := <-checker.called; ok {
-		// If all went well, we registered exactly 2 key changes: one
-		// that establishes the session, and one that we requested
-		// additionally.
-		t.Fatalf("got another host key checks after 2 handshakes")
-	}
-}
-
-func TestForceFirstKex(t *testing.T) {
-	// like handshakePair, but must access the keyingTransport.
-	checker := &testChecker{}
-	clientConf := &ClientConfig{HostKeyCallback: checker.Check}
-	a, b, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-
-	var trC, trS keyingTransport
-
-	trC = newTransport(a, rand.Reader, true)
-
-	// This is the disallowed packet:
-	trC.writePacket(Marshal(&serviceRequestMsg{serviceUserAuth}))
-
-	// Rest of the setup.
-	trS = newTransport(b, rand.Reader, false)
-	clientConf.SetDefaults()
-
-	v := []byte("version")
-	client := newClientTransport(trC, v, v, clientConf, "addr", a.RemoteAddr())
-
-	serverConf := &ServerConfig{}
-	serverConf.AddHostKey(testSigners["ecdsa"])
-	serverConf.AddHostKey(testSigners["rsa"])
-	serverConf.SetDefaults()
-	server := newServerTransport(trS, v, v, serverConf)
-
-	defer client.Close()
-	defer server.Close()
-
-	// We setup the initial key exchange, but the remote side
-	// tries to send serviceRequestMsg in cleartext, which is
-	// disallowed.
-
-	if err := server.waitSession(); err == nil {
-		t.Errorf("server first kex init should reject unexpected packet")
-	}
-}
-
-func TestHandshakeAutoRekeyWrite(t *testing.T) {
-	checker := &syncChecker{
-		called:   make(chan int, 10),
-		waitCall: nil,
-	}
-	clientConf := &ClientConfig{HostKeyCallback: checker.Check}
-	clientConf.RekeyThreshold = 500
-	trC, trS, err := handshakePair(clientConf, "addr", false)
-	if err != nil {
-		t.Fatalf("handshakePair: %v", err)
-	}
-	defer trC.Close()
-	defer trS.Close()
-
-	input := make([]byte, 251)
-	input[0] = msgRequestSuccess
-
-	done := make(chan int, 1)
-	const numPacket = 5
-	go func() {
-		defer close(done)
-		j := 0
-		for ; j < numPacket; j++ {
-			if p, err := trS.readPacket(); err != nil {
-				break
-			} else if !bytes.Equal(input, p) {
-				t.Errorf("got packet type %d, want %d", p[0], input[0])
-			}
-		}
-
-		if j != numPacket {
-			t.Errorf("got %d, want 5 messages", j)
-		}
-	}()
-
-	<-checker.called
-
-	for i := 0; i < numPacket; i++ {
-		p := make([]byte, len(input))
-		copy(p, input)
-		if err := trC.writePacket(p); err != nil {
-			t.Errorf("writePacket: %v", err)
-		}
-		if i == 2 {
-			// Make sure the kex is in progress.
-			<-checker.called
-		}
-
-	}
-	<-done
-}
-
-type syncChecker struct {
-	waitCall chan int
-	called   chan int
-}
-
-func (c *syncChecker) Check(dialAddr string, addr net.Addr, key PublicKey) error {
-	c.called <- 1
-	if c.waitCall != nil {
-		<-c.waitCall
-	}
-	return nil
-}
-
-func TestHandshakeAutoRekeyRead(t *testing.T) {
-	sync := &syncChecker{
-		called:   make(chan int, 2),
-		waitCall: nil,
-	}
-	clientConf := &ClientConfig{
-		HostKeyCallback: sync.Check,
-	}
-	clientConf.RekeyThreshold = 500
-
-	trC, trS, err := handshakePair(clientConf, "addr", false)
-	if err != nil {
-		t.Fatalf("handshakePair: %v", err)
-	}
-	defer trC.Close()
-	defer trS.Close()
-
-	packet := make([]byte, 501)
-	packet[0] = msgRequestSuccess
-	if err := trS.writePacket(packet); err != nil {
-		t.Fatalf("writePacket: %v", err)
-	}
-
-	// While we read out the packet, a key change will be
-	// initiated.
-	done := make(chan int, 1)
-	go func() {
-		defer close(done)
-		if _, err := trC.readPacket(); err != nil {
-			t.Fatalf("readPacket(client): %v", err)
-		}
-
-	}()
-
-	<-done
-	<-sync.called
-}
-
-// errorKeyingTransport generates errors after a given number of
-// read/write operations.
-type errorKeyingTransport struct {
-	packetConn
-	readLeft, writeLeft int
-}
-
-func (n *errorKeyingTransport) prepareKeyChange(*algorithms, *kexResult) error {
-	return nil
-}
-
-func (n *errorKeyingTransport) getSessionID() []byte {
-	return nil
-}
-
-func (n *errorKeyingTransport) writePacket(packet []byte) error {
-	if n.writeLeft == 0 {
-		n.Close()
-		return errors.New("barf")
-	}
-
-	n.writeLeft--
-	return n.packetConn.writePacket(packet)
-}
-
-func (n *errorKeyingTransport) readPacket() ([]byte, error) {
-	if n.readLeft == 0 {
-		n.Close()
-		return nil, errors.New("barf")
-	}
-
-	n.readLeft--
-	return n.packetConn.readPacket()
-}
-
-func TestHandshakeErrorHandlingRead(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		testHandshakeErrorHandlingN(t, i, -1, false)
-	}
-}
-
-func TestHandshakeErrorHandlingWrite(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		testHandshakeErrorHandlingN(t, -1, i, false)
-	}
-}
-
-func TestHandshakeErrorHandlingReadCoupled(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		testHandshakeErrorHandlingN(t, i, -1, true)
-	}
-}
-
-func TestHandshakeErrorHandlingWriteCoupled(t *testing.T) {
-	for i := 0; i < 20; i++ {
-		testHandshakeErrorHandlingN(t, -1, i, true)
-	}
-}
-
-// testHandshakeErrorHandlingN runs handshakes, injecting errors. If
-// handshakeTransport deadlocks, the go runtime will detect it and
-// panic.
-func testHandshakeErrorHandlingN(t *testing.T, readLimit, writeLimit int, coupled bool) {
-	msg := Marshal(&serviceRequestMsg{strings.Repeat("x", int(minRekeyThreshold)/4)})
-
-	a, b := memPipe()
-	defer a.Close()
-	defer b.Close()
-
-	key := testSigners["ecdsa"]
-	serverConf := Config{RekeyThreshold: minRekeyThreshold}
-	serverConf.SetDefaults()
-	serverConn := newHandshakeTransport(&errorKeyingTransport{a, readLimit, writeLimit}, &serverConf, []byte{'a'}, []byte{'b'})
-	serverConn.hostKeys = []Signer{key}
-	go serverConn.readLoop()
-	go serverConn.kexLoop()
-
-	clientConf := Config{RekeyThreshold: 10 * minRekeyThreshold}
-	clientConf.SetDefaults()
-	clientConn := newHandshakeTransport(&errorKeyingTransport{b, -1, -1}, &clientConf, []byte{'a'}, []byte{'b'})
-	clientConn.hostKeyAlgorithms = []string{key.PublicKey().Type()}
-	clientConn.hostKeyCallback = InsecureIgnoreHostKey()
-	go clientConn.readLoop()
-	go clientConn.kexLoop()
-
-	var wg sync.WaitGroup
-
-	for _, hs := range []packetConn{serverConn, clientConn} {
-		if !coupled {
-			wg.Add(2)
-			go func(c packetConn) {
-				for i := 0; ; i++ {
-					str := fmt.Sprintf("%08x", i) + strings.Repeat("x", int(minRekeyThreshold)/4-8)
-					err := c.writePacket(Marshal(&serviceRequestMsg{str}))
-					if err != nil {
-						break
-					}
-				}
-				wg.Done()
-				c.Close()
-			}(hs)
-			go func(c packetConn) {
-				for {
-					_, err := c.readPacket()
-					if err != nil {
-						break
-					}
-				}
-				wg.Done()
-			}(hs)
-		} else {
-			wg.Add(1)
-			go func(c packetConn) {
-				for {
-					_, err := c.readPacket()
-					if err != nil {
-						break
-					}
-					if err := c.writePacket(msg); err != nil {
-						break
-					}
-
-				}
-				wg.Done()
-			}(hs)
-		}
-	}
-	wg.Wait()
-}
-
-func TestDisconnect(t *testing.T) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("see golang.org/issue/7237")
-	}
-	checker := &testChecker{}
-	trC, trS, err := handshakePair(&ClientConfig{HostKeyCallback: checker.Check}, "addr", false)
-	if err != nil {
-		t.Fatalf("handshakePair: %v", err)
-	}
-
-	defer trC.Close()
-	defer trS.Close()
-
-	trC.writePacket([]byte{msgRequestSuccess, 0, 0})
-	errMsg := &disconnectMsg{
-		Reason:  42,
-		Message: "such is life",
-	}
-	trC.writePacket(Marshal(errMsg))
-	trC.writePacket([]byte{msgRequestSuccess, 0, 0})
-
-	packet, err := trS.readPacket()
-	if err != nil {
-		t.Fatalf("readPacket 1: %v", err)
-	}
-	if packet[0] != msgRequestSuccess {
-		t.Errorf("got packet %v, want packet type %d", packet, msgRequestSuccess)
-	}
-
-	_, err = trS.readPacket()
-	if err == nil {
-		t.Errorf("readPacket 2 succeeded")
-	} else if !reflect.DeepEqual(err, errMsg) {
-		t.Errorf("got error %#v, want %#v", err, errMsg)
-	}
-
-	_, err = trS.readPacket()
-	if err == nil {
-		t.Errorf("readPacket 3 succeeded")
-	}
-}
-
-func TestHandshakeRekeyDefault(t *testing.T) {
-	clientConf := &ClientConfig{
-		Config: Config{
-			Ciphers: []string{"aes128-ctr"},
-		},
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	trC, trS, err := handshakePair(clientConf, "addr", false)
-	if err != nil {
-		t.Fatalf("handshakePair: %v", err)
-	}
-	defer trC.Close()
-	defer trS.Close()
-
-	trC.writePacket([]byte{msgRequestSuccess, 0, 0})
-	trC.Close()
-
-	rgb := (1024 + trC.readBytesLeft) >> 30
-	wgb := (1024 + trC.writeBytesLeft) >> 30
-
-	if rgb != 64 {
-		t.Errorf("got rekey after %dG read, want 64G", rgb)
-	}
-	if wgb != 64 {
-		t.Errorf("got rekey after %dG write, want 64G", wgb)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/kex.go b/installer/vendor/golang.org/x/crypto/ssh/kex.go
deleted file mode 100644
index f91c2770ed..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/kex.go
+++ /dev/null
@@ -1,540 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/subtle"
-	"errors"
-	"io"
-	"math/big"
-
-	"golang.org/x/crypto/curve25519"
-)
-
-const (
-	kexAlgoDH1SHA1          = "diffie-hellman-group1-sha1"
-	kexAlgoDH14SHA1         = "diffie-hellman-group14-sha1"
-	kexAlgoECDH256          = "ecdh-sha2-nistp256"
-	kexAlgoECDH384          = "ecdh-sha2-nistp384"
-	kexAlgoECDH521          = "ecdh-sha2-nistp521"
-	kexAlgoCurve25519SHA256 = "curve25519-sha256@libssh.org"
-)
-
-// kexResult captures the outcome of a key exchange.
-type kexResult struct {
-	// Session hash. See also RFC 4253, section 8.
-	H []byte
-
-	// Shared secret. See also RFC 4253, section 8.
-	K []byte
-
-	// Host key as hashed into H.
-	HostKey []byte
-
-	// Signature of H.
-	Signature []byte
-
-	// A cryptographic hash function that matches the security
-	// level of the key exchange algorithm. It is used for
-	// calculating H, and for deriving keys from H and K.
-	Hash crypto.Hash
-
-	// The session ID, which is the first H computed. This is used
-	// to derive key material inside the transport.
-	SessionID []byte
-}
-
-// handshakeMagics contains data that is always included in the
-// session hash.
-type handshakeMagics struct {
-	clientVersion, serverVersion []byte
-	clientKexInit, serverKexInit []byte
-}
-
-func (m *handshakeMagics) write(w io.Writer) {
-	writeString(w, m.clientVersion)
-	writeString(w, m.serverVersion)
-	writeString(w, m.clientKexInit)
-	writeString(w, m.serverKexInit)
-}
-
-// kexAlgorithm abstracts different key exchange algorithms.
-type kexAlgorithm interface {
-	// Server runs server-side key agreement, signing the result
-	// with a hostkey.
-	Server(p packetConn, rand io.Reader, magics *handshakeMagics, s Signer) (*kexResult, error)
-
-	// Client runs the client-side key agreement. Caller is
-	// responsible for verifying the host key signature.
-	Client(p packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error)
-}
-
-// dhGroup is a multiplicative group suitable for implementing Diffie-Hellman key agreement.
-type dhGroup struct {
-	g, p, pMinus1 *big.Int
-}
-
-func (group *dhGroup) diffieHellman(theirPublic, myPrivate *big.Int) (*big.Int, error) {
-	if theirPublic.Cmp(bigOne) <= 0 || theirPublic.Cmp(group.pMinus1) >= 0 {
-		return nil, errors.New("ssh: DH parameter out of bounds")
-	}
-	return new(big.Int).Exp(theirPublic, myPrivate, group.p), nil
-}
-
-func (group *dhGroup) Client(c packetConn, randSource io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	hashFunc := crypto.SHA1
-
-	var x *big.Int
-	for {
-		var err error
-		if x, err = rand.Int(randSource, group.pMinus1); err != nil {
-			return nil, err
-		}
-		if x.Sign() > 0 {
-			break
-		}
-	}
-
-	X := new(big.Int).Exp(group.g, x, group.p)
-	kexDHInit := kexDHInitMsg{
-		X: X,
-	}
-	if err := c.writePacket(Marshal(&kexDHInit)); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexDHReply kexDHReplyMsg
-	if err = Unmarshal(packet, &kexDHReply); err != nil {
-		return nil, err
-	}
-
-	kInt, err := group.diffieHellman(kexDHReply.Y, x)
-	if err != nil {
-		return nil, err
-	}
-
-	h := hashFunc.New()
-	magics.write(h)
-	writeString(h, kexDHReply.HostKey)
-	writeInt(h, X)
-	writeInt(h, kexDHReply.Y)
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   kexDHReply.HostKey,
-		Signature: kexDHReply.Signature,
-		Hash:      crypto.SHA1,
-	}, nil
-}
-
-func (group *dhGroup) Server(c packetConn, randSource io.Reader, magics *handshakeMagics, priv Signer) (result *kexResult, err error) {
-	hashFunc := crypto.SHA1
-	packet, err := c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexDHInit kexDHInitMsg
-	if err = Unmarshal(packet, &kexDHInit); err != nil {
-		return
-	}
-
-	var y *big.Int
-	for {
-		if y, err = rand.Int(randSource, group.pMinus1); err != nil {
-			return
-		}
-		if y.Sign() > 0 {
-			break
-		}
-	}
-
-	Y := new(big.Int).Exp(group.g, y, group.p)
-	kInt, err := group.diffieHellman(kexDHInit.X, y)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h := hashFunc.New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeInt(h, kexDHInit.X)
-	writeInt(h, Y)
-
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	// H is already a hash, but the hostkey signing will apply its
-	// own key-specific hash algorithm.
-	sig, err := signAndMarshal(priv, randSource, H)
-	if err != nil {
-		return nil, err
-	}
-
-	kexDHReply := kexDHReplyMsg{
-		HostKey:   hostKeyBytes,
-		Y:         Y,
-		Signature: sig,
-	}
-	packet = Marshal(&kexDHReply)
-
-	err = c.writePacket(packet)
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      crypto.SHA1,
-	}, nil
-}
-
-// ecdh performs Elliptic Curve Diffie-Hellman key exchange as
-// described in RFC 5656, section 4.
-type ecdh struct {
-	curve elliptic.Curve
-}
-
-func (kex *ecdh) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	ephKey, err := ecdsa.GenerateKey(kex.curve, rand)
-	if err != nil {
-		return nil, err
-	}
-
-	kexInit := kexECDHInitMsg{
-		ClientPubKey: elliptic.Marshal(kex.curve, ephKey.PublicKey.X, ephKey.PublicKey.Y),
-	}
-
-	serialized := Marshal(&kexInit)
-	if err := c.writePacket(serialized); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var reply kexECDHReplyMsg
-	if err = Unmarshal(packet, &reply); err != nil {
-		return nil, err
-	}
-
-	x, y, err := unmarshalECKey(kex.curve, reply.EphemeralPubKey)
-	if err != nil {
-		return nil, err
-	}
-
-	// generate shared secret
-	secret, _ := kex.curve.ScalarMult(x, y, ephKey.D.Bytes())
-
-	h := ecHash(kex.curve).New()
-	magics.write(h)
-	writeString(h, reply.HostKey)
-	writeString(h, kexInit.ClientPubKey)
-	writeString(h, reply.EphemeralPubKey)
-	K := make([]byte, intLength(secret))
-	marshalInt(K, secret)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: reply.Signature,
-		Hash:      ecHash(kex.curve),
-	}, nil
-}
-
-// unmarshalECKey parses and checks an EC key.
-func unmarshalECKey(curve elliptic.Curve, pubkey []byte) (x, y *big.Int, err error) {
-	x, y = elliptic.Unmarshal(curve, pubkey)
-	if x == nil {
-		return nil, nil, errors.New("ssh: elliptic.Unmarshal failure")
-	}
-	if !validateECPublicKey(curve, x, y) {
-		return nil, nil, errors.New("ssh: public key not on curve")
-	}
-	return x, y, nil
-}
-
-// validateECPublicKey checks that the point is a valid public key for
-// the given curve. See [SEC1], 3.2.2
-func validateECPublicKey(curve elliptic.Curve, x, y *big.Int) bool {
-	if x.Sign() == 0 && y.Sign() == 0 {
-		return false
-	}
-
-	if x.Cmp(curve.Params().P) >= 0 {
-		return false
-	}
-
-	if y.Cmp(curve.Params().P) >= 0 {
-		return false
-	}
-
-	if !curve.IsOnCurve(x, y) {
-		return false
-	}
-
-	// We don't check if N * PubKey == 0, since
-	//
-	// - the NIST curves have cofactor = 1, so this is implicit.
-	// (We don't foresee an implementation that supports non NIST
-	// curves)
-	//
-	// - for ephemeral keys, we don't need to worry about small
-	// subgroup attacks.
-	return true
-}
-
-func (kex *ecdh) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv Signer) (result *kexResult, err error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var kexECDHInit kexECDHInitMsg
-	if err = Unmarshal(packet, &kexECDHInit); err != nil {
-		return nil, err
-	}
-
-	clientX, clientY, err := unmarshalECKey(kex.curve, kexECDHInit.ClientPubKey)
-	if err != nil {
-		return nil, err
-	}
-
-	// We could cache this key across multiple users/multiple
-	// connection attempts, but the benefit is small. OpenSSH
-	// generates a new key for each incoming connection.
-	ephKey, err := ecdsa.GenerateKey(kex.curve, rand)
-	if err != nil {
-		return nil, err
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	serializedEphKey := elliptic.Marshal(kex.curve, ephKey.PublicKey.X, ephKey.PublicKey.Y)
-
-	// generate shared secret
-	secret, _ := kex.curve.ScalarMult(clientX, clientY, ephKey.D.Bytes())
-
-	h := ecHash(kex.curve).New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeString(h, kexECDHInit.ClientPubKey)
-	writeString(h, serializedEphKey)
-
-	K := make([]byte, intLength(secret))
-	marshalInt(K, secret)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	// H is already a hash, but the hostkey signing will apply its
-	// own key-specific hash algorithm.
-	sig, err := signAndMarshal(priv, rand, H)
-	if err != nil {
-		return nil, err
-	}
-
-	reply := kexECDHReplyMsg{
-		EphemeralPubKey: serializedEphKey,
-		HostKey:         hostKeyBytes,
-		Signature:       sig,
-	}
-
-	serialized := Marshal(&reply)
-	if err := c.writePacket(serialized); err != nil {
-		return nil, err
-	}
-
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: sig,
-		Hash:      ecHash(kex.curve),
-	}, nil
-}
-
-var kexAlgoMap = map[string]kexAlgorithm{}
-
-func init() {
-	// This is the group called diffie-hellman-group1-sha1 in RFC
-	// 4253 and Oakley Group 2 in RFC 2409.
-	p, _ := new(big.Int).SetString("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE65381FFFFFFFFFFFFFFFF", 16)
-	kexAlgoMap[kexAlgoDH1SHA1] = &dhGroup{
-		g:       new(big.Int).SetInt64(2),
-		p:       p,
-		pMinus1: new(big.Int).Sub(p, bigOne),
-	}
-
-	// This is the group called diffie-hellman-group14-sha1 in RFC
-	// 4253 and Oakley Group 14 in RFC 3526.
-	p, _ = new(big.Int).SetString("FFFFFFFFFFFFFFFFC90FDAA22168C234C4C6628B80DC1CD129024E088A67CC74020BBEA63B139B22514A08798E3404DDEF9519B3CD3A431B302B0A6DF25F14374FE1356D6D51C245E485B576625E7EC6F44C42E9A637ED6B0BFF5CB6F406B7EDEE386BFB5A899FA5AE9F24117C4B1FE649286651ECE45B3DC2007CB8A163BF0598DA48361C55D39A69163FA8FD24CF5F83655D23DCA3AD961C62F356208552BB9ED529077096966D670C354E4ABC9804F1746C08CA18217C32905E462E36CE3BE39E772C180E86039B2783A2EC07A28FB5C55DF06F4C52C9DE2BCBF6955817183995497CEA956AE515D2261898FA051015728E5A8AACAA68FFFFFFFFFFFFFFFF", 16)
-
-	kexAlgoMap[kexAlgoDH14SHA1] = &dhGroup{
-		g:       new(big.Int).SetInt64(2),
-		p:       p,
-		pMinus1: new(big.Int).Sub(p, bigOne),
-	}
-
-	kexAlgoMap[kexAlgoECDH521] = &ecdh{elliptic.P521()}
-	kexAlgoMap[kexAlgoECDH384] = &ecdh{elliptic.P384()}
-	kexAlgoMap[kexAlgoECDH256] = &ecdh{elliptic.P256()}
-	kexAlgoMap[kexAlgoCurve25519SHA256] = &curve25519sha256{}
-}
-
-// curve25519sha256 implements the curve25519-sha256@libssh.org key
-// agreement protocol, as described in
-// https://git.libssh.org/projects/libssh.git/tree/doc/curve25519-sha256@libssh.org.txt
-type curve25519sha256 struct{}
-
-type curve25519KeyPair struct {
-	priv [32]byte
-	pub  [32]byte
-}
-
-func (kp *curve25519KeyPair) generate(rand io.Reader) error {
-	if _, err := io.ReadFull(rand, kp.priv[:]); err != nil {
-		return err
-	}
-	curve25519.ScalarBaseMult(&kp.pub, &kp.priv)
-	return nil
-}
-
-// curve25519Zeros is just an array of 32 zero bytes so that we have something
-// convenient to compare against in order to reject curve25519 points with the
-// wrong order.
-var curve25519Zeros [32]byte
-
-func (kex *curve25519sha256) Client(c packetConn, rand io.Reader, magics *handshakeMagics) (*kexResult, error) {
-	var kp curve25519KeyPair
-	if err := kp.generate(rand); err != nil {
-		return nil, err
-	}
-	if err := c.writePacket(Marshal(&kexECDHInitMsg{kp.pub[:]})); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.readPacket()
-	if err != nil {
-		return nil, err
-	}
-
-	var reply kexECDHReplyMsg
-	if err = Unmarshal(packet, &reply); err != nil {
-		return nil, err
-	}
-	if len(reply.EphemeralPubKey) != 32 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong length")
-	}
-
-	var servPub, secret [32]byte
-	copy(servPub[:], reply.EphemeralPubKey)
-	curve25519.ScalarMult(&secret, &kp.priv, &servPub)
-	if subtle.ConstantTimeCompare(secret[:], curve25519Zeros[:]) == 1 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong order")
-	}
-
-	h := crypto.SHA256.New()
-	magics.write(h)
-	writeString(h, reply.HostKey)
-	writeString(h, kp.pub[:])
-	writeString(h, reply.EphemeralPubKey)
-
-	kInt := new(big.Int).SetBytes(secret[:])
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	return &kexResult{
-		H:         h.Sum(nil),
-		K:         K,
-		HostKey:   reply.HostKey,
-		Signature: reply.Signature,
-		Hash:      crypto.SHA256,
-	}, nil
-}
-
-func (kex *curve25519sha256) Server(c packetConn, rand io.Reader, magics *handshakeMagics, priv Signer) (result *kexResult, err error) {
-	packet, err := c.readPacket()
-	if err != nil {
-		return
-	}
-	var kexInit kexECDHInitMsg
-	if err = Unmarshal(packet, &kexInit); err != nil {
-		return
-	}
-
-	if len(kexInit.ClientPubKey) != 32 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong length")
-	}
-
-	var kp curve25519KeyPair
-	if err := kp.generate(rand); err != nil {
-		return nil, err
-	}
-
-	var clientPub, secret [32]byte
-	copy(clientPub[:], kexInit.ClientPubKey)
-	curve25519.ScalarMult(&secret, &kp.priv, &clientPub)
-	if subtle.ConstantTimeCompare(secret[:], curve25519Zeros[:]) == 1 {
-		return nil, errors.New("ssh: peer's curve25519 public value has wrong order")
-	}
-
-	hostKeyBytes := priv.PublicKey().Marshal()
-
-	h := crypto.SHA256.New()
-	magics.write(h)
-	writeString(h, hostKeyBytes)
-	writeString(h, kexInit.ClientPubKey)
-	writeString(h, kp.pub[:])
-
-	kInt := new(big.Int).SetBytes(secret[:])
-	K := make([]byte, intLength(kInt))
-	marshalInt(K, kInt)
-	h.Write(K)
-
-	H := h.Sum(nil)
-
-	sig, err := signAndMarshal(priv, rand, H)
-	if err != nil {
-		return nil, err
-	}
-
-	reply := kexECDHReplyMsg{
-		EphemeralPubKey: kp.pub[:],
-		HostKey:         hostKeyBytes,
-		Signature:       sig,
-	}
-	if err := c.writePacket(Marshal(&reply)); err != nil {
-		return nil, err
-	}
-	return &kexResult{
-		H:         H,
-		K:         K,
-		HostKey:   hostKeyBytes,
-		Signature: sig,
-		Hash:      crypto.SHA256,
-	}, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/kex_test.go b/installer/vendor/golang.org/x/crypto/ssh/kex_test.go
deleted file mode 100644
index 12ca0acd31..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/kex_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Key exchange tests.
-
-import (
-	"crypto/rand"
-	"reflect"
-	"testing"
-)
-
-func TestKexes(t *testing.T) {
-	type kexResultErr struct {
-		result *kexResult
-		err    error
-	}
-
-	for name, kex := range kexAlgoMap {
-		a, b := memPipe()
-
-		s := make(chan kexResultErr, 1)
-		c := make(chan kexResultErr, 1)
-		var magics handshakeMagics
-		go func() {
-			r, e := kex.Client(a, rand.Reader, &magics)
-			a.Close()
-			c <- kexResultErr{r, e}
-		}()
-		go func() {
-			r, e := kex.Server(b, rand.Reader, &magics, testSigners["ecdsa"])
-			b.Close()
-			s <- kexResultErr{r, e}
-		}()
-
-		clientRes := <-c
-		serverRes := <-s
-		if clientRes.err != nil {
-			t.Errorf("client: %v", clientRes.err)
-		}
-		if serverRes.err != nil {
-			t.Errorf("server: %v", serverRes.err)
-		}
-		if !reflect.DeepEqual(clientRes.result, serverRes.result) {
-			t.Errorf("kex %q: mismatch %#v, %#v", name, clientRes.result, serverRes.result)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/keys.go b/installer/vendor/golang.org/x/crypto/ssh/keys.go
deleted file mode 100644
index b682c1741b..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/keys.go
+++ /dev/null
@@ -1,1031 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/md5"
-	"crypto/rsa"
-	"crypto/sha256"
-	"crypto/x509"
-	"encoding/asn1"
-	"encoding/base64"
-	"encoding/hex"
-	"encoding/pem"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"strings"
-
-	"golang.org/x/crypto/ed25519"
-)
-
-// These constants represent the algorithm names for key types supported by this
-// package.
-const (
-	KeyAlgoRSA      = "ssh-rsa"
-	KeyAlgoDSA      = "ssh-dss"
-	KeyAlgoECDSA256 = "ecdsa-sha2-nistp256"
-	KeyAlgoECDSA384 = "ecdsa-sha2-nistp384"
-	KeyAlgoECDSA521 = "ecdsa-sha2-nistp521"
-	KeyAlgoED25519  = "ssh-ed25519"
-)
-
-// parsePubKey parses a public key of the given algorithm.
-// Use ParsePublicKey for keys with prepended algorithm.
-func parsePubKey(in []byte, algo string) (pubKey PublicKey, rest []byte, err error) {
-	switch algo {
-	case KeyAlgoRSA:
-		return parseRSA(in)
-	case KeyAlgoDSA:
-		return parseDSA(in)
-	case KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521:
-		return parseECDSA(in)
-	case KeyAlgoED25519:
-		return parseED25519(in)
-	case CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01, CertAlgoECDSA384v01, CertAlgoECDSA521v01, CertAlgoED25519v01:
-		cert, err := parseCert(in, certToPrivAlgo(algo))
-		if err != nil {
-			return nil, nil, err
-		}
-		return cert, nil, nil
-	}
-	return nil, nil, fmt.Errorf("ssh: unknown key algorithm: %v", algo)
-}
-
-// parseAuthorizedKey parses a public key in OpenSSH authorized_keys format
-// (see sshd(8) manual page) once the options and key type fields have been
-// removed.
-func parseAuthorizedKey(in []byte) (out PublicKey, comment string, err error) {
-	in = bytes.TrimSpace(in)
-
-	i := bytes.IndexAny(in, " \t")
-	if i == -1 {
-		i = len(in)
-	}
-	base64Key := in[:i]
-
-	key := make([]byte, base64.StdEncoding.DecodedLen(len(base64Key)))
-	n, err := base64.StdEncoding.Decode(key, base64Key)
-	if err != nil {
-		return nil, "", err
-	}
-	key = key[:n]
-	out, err = ParsePublicKey(key)
-	if err != nil {
-		return nil, "", err
-	}
-	comment = string(bytes.TrimSpace(in[i:]))
-	return out, comment, nil
-}
-
-// ParseKnownHosts parses an entry in the format of the known_hosts file.
-//
-// The known_hosts format is documented in the sshd(8) manual page. This
-// function will parse a single entry from in. On successful return, marker
-// will contain the optional marker value (i.e. "cert-authority" or "revoked")
-// or else be empty, hosts will contain the hosts that this entry matches,
-// pubKey will contain the public key and comment will contain any trailing
-// comment at the end of the line. See the sshd(8) manual page for the various
-// forms that a host string can take.
-//
-// The unparsed remainder of the input will be returned in rest. This function
-// can be called repeatedly to parse multiple entries.
-//
-// If no entries were found in the input then err will be io.EOF. Otherwise a
-// non-nil err value indicates a parse error.
-func ParseKnownHosts(in []byte) (marker string, hosts []string, pubKey PublicKey, comment string, rest []byte, err error) {
-	for len(in) > 0 {
-		end := bytes.IndexByte(in, '\n')
-		if end != -1 {
-			rest = in[end+1:]
-			in = in[:end]
-		} else {
-			rest = nil
-		}
-
-		end = bytes.IndexByte(in, '\r')
-		if end != -1 {
-			in = in[:end]
-		}
-
-		in = bytes.TrimSpace(in)
-		if len(in) == 0 || in[0] == '#' {
-			in = rest
-			continue
-		}
-
-		i := bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		// Strip out the beginning of the known_host key.
-		// This is either an optional marker or a (set of) hostname(s).
-		keyFields := bytes.Fields(in)
-		if len(keyFields) < 3 || len(keyFields) > 5 {
-			return "", nil, nil, "", nil, errors.New("ssh: invalid entry in known_hosts data")
-		}
-
-		// keyFields[0] is either "@cert-authority", "@revoked" or a comma separated
-		// list of hosts
-		marker := ""
-		if keyFields[0][0] == '@' {
-			marker = string(keyFields[0][1:])
-			keyFields = keyFields[1:]
-		}
-
-		hosts := string(keyFields[0])
-		// keyFields[1] contains the key type (e.g. “ssh-rsa”).
-		// However, that information is duplicated inside the
-		// base64-encoded key and so is ignored here.
-
-		key := bytes.Join(keyFields[2:], []byte(" "))
-		if pubKey, comment, err = parseAuthorizedKey(key); err != nil {
-			return "", nil, nil, "", nil, err
-		}
-
-		return marker, strings.Split(hosts, ","), pubKey, comment, rest, nil
-	}
-
-	return "", nil, nil, "", nil, io.EOF
-}
-
-// ParseAuthorizedKeys parses a public key from an authorized_keys
-// file used in OpenSSH according to the sshd(8) manual page.
-func ParseAuthorizedKey(in []byte) (out PublicKey, comment string, options []string, rest []byte, err error) {
-	for len(in) > 0 {
-		end := bytes.IndexByte(in, '\n')
-		if end != -1 {
-			rest = in[end+1:]
-			in = in[:end]
-		} else {
-			rest = nil
-		}
-
-		end = bytes.IndexByte(in, '\r')
-		if end != -1 {
-			in = in[:end]
-		}
-
-		in = bytes.TrimSpace(in)
-		if len(in) == 0 || in[0] == '#' {
-			in = rest
-			continue
-		}
-
-		i := bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
-			return out, comment, options, rest, nil
-		}
-
-		// No key type recognised. Maybe there's an options field at
-		// the beginning.
-		var b byte
-		inQuote := false
-		var candidateOptions []string
-		optionStart := 0
-		for i, b = range in {
-			isEnd := !inQuote && (b == ' ' || b == '\t')
-			if (b == ',' && !inQuote) || isEnd {
-				if i-optionStart > 0 {
-					candidateOptions = append(candidateOptions, string(in[optionStart:i]))
-				}
-				optionStart = i + 1
-			}
-			if isEnd {
-				break
-			}
-			if b == '"' && (i == 0 || (i > 0 && in[i-1] != '\\')) {
-				inQuote = !inQuote
-			}
-		}
-		for i < len(in) && (in[i] == ' ' || in[i] == '\t') {
-			i++
-		}
-		if i == len(in) {
-			// Invalid line: unmatched quote
-			in = rest
-			continue
-		}
-
-		in = in[i:]
-		i = bytes.IndexAny(in, " \t")
-		if i == -1 {
-			in = rest
-			continue
-		}
-
-		if out, comment, err = parseAuthorizedKey(in[i:]); err == nil {
-			options = candidateOptions
-			return out, comment, options, rest, nil
-		}
-
-		in = rest
-		continue
-	}
-
-	return nil, "", nil, nil, errors.New("ssh: no key found")
-}
-
-// ParsePublicKey parses an SSH public key formatted for use in
-// the SSH wire protocol according to RFC 4253, section 6.6.
-func ParsePublicKey(in []byte) (out PublicKey, err error) {
-	algo, in, ok := parseString(in)
-	if !ok {
-		return nil, errShortRead
-	}
-	var rest []byte
-	out, rest, err = parsePubKey(in, string(algo))
-	if len(rest) > 0 {
-		return nil, errors.New("ssh: trailing junk in public key")
-	}
-
-	return out, err
-}
-
-// MarshalAuthorizedKey serializes key for inclusion in an OpenSSH
-// authorized_keys file. The return value ends with newline.
-func MarshalAuthorizedKey(key PublicKey) []byte {
-	b := &bytes.Buffer{}
-	b.WriteString(key.Type())
-	b.WriteByte(' ')
-	e := base64.NewEncoder(base64.StdEncoding, b)
-	e.Write(key.Marshal())
-	e.Close()
-	b.WriteByte('\n')
-	return b.Bytes()
-}
-
-// PublicKey is an abstraction of different types of public keys.
-type PublicKey interface {
-	// Type returns the key's type, e.g. "ssh-rsa".
-	Type() string
-
-	// Marshal returns the serialized key data in SSH wire format,
-	// with the name prefix.
-	Marshal() []byte
-
-	// Verify that sig is a signature on the given data using this
-	// key. This function will hash the data appropriately first.
-	Verify(data []byte, sig *Signature) error
-}
-
-// CryptoPublicKey, if implemented by a PublicKey,
-// returns the underlying crypto.PublicKey form of the key.
-type CryptoPublicKey interface {
-	CryptoPublicKey() crypto.PublicKey
-}
-
-// A Signer can create signatures that verify against a public key.
-type Signer interface {
-	// PublicKey returns an associated PublicKey instance.
-	PublicKey() PublicKey
-
-	// Sign returns raw signature for the given data. This method
-	// will apply the hash specified for the keytype to the data.
-	Sign(rand io.Reader, data []byte) (*Signature, error)
-}
-
-type rsaPublicKey rsa.PublicKey
-
-func (r *rsaPublicKey) Type() string {
-	return "ssh-rsa"
-}
-
-// parseRSA parses an RSA key according to RFC 4253, section 6.6.
-func parseRSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		E    *big.Int
-		N    *big.Int
-		Rest []byte `ssh:"rest"`
-	}
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	if w.E.BitLen() > 24 {
-		return nil, nil, errors.New("ssh: exponent too large")
-	}
-	e := w.E.Int64()
-	if e < 3 || e&1 == 0 {
-		return nil, nil, errors.New("ssh: incorrect exponent")
-	}
-
-	var key rsa.PublicKey
-	key.E = int(e)
-	key.N = w.N
-	return (*rsaPublicKey)(&key), w.Rest, nil
-}
-
-func (r *rsaPublicKey) Marshal() []byte {
-	e := new(big.Int).SetInt64(int64(r.E))
-	// RSA publickey struct layout should match the struct used by
-	// parseRSACert in the x/crypto/ssh/agent package.
-	wirekey := struct {
-		Name string
-		E    *big.Int
-		N    *big.Int
-	}{
-		KeyAlgoRSA,
-		e,
-		r.N,
-	}
-	return Marshal(&wirekey)
-}
-
-func (r *rsaPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != r.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, r.Type())
-	}
-	h := crypto.SHA1.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-	return rsa.VerifyPKCS1v15((*rsa.PublicKey)(r), crypto.SHA1, digest, sig.Blob)
-}
-
-func (r *rsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*rsa.PublicKey)(r)
-}
-
-type dsaPublicKey dsa.PublicKey
-
-func (r *dsaPublicKey) Type() string {
-	return "ssh-dss"
-}
-
-func checkDSAParams(param *dsa.Parameters) error {
-	// SSH specifies FIPS 186-2, which only provided a single size
-	// (1024 bits) DSA key. FIPS 186-3 allows for larger key
-	// sizes, which would confuse SSH.
-	if l := param.P.BitLen(); l != 1024 {
-		return fmt.Errorf("ssh: unsupported DSA key size %d", l)
-	}
-
-	return nil
-}
-
-// parseDSA parses an DSA key according to RFC 4253, section 6.6.
-func parseDSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		P, Q, G, Y *big.Int
-		Rest       []byte `ssh:"rest"`
-	}
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	param := dsa.Parameters{
-		P: w.P,
-		Q: w.Q,
-		G: w.G,
-	}
-	if err := checkDSAParams(&param); err != nil {
-		return nil, nil, err
-	}
-
-	key := &dsaPublicKey{
-		Parameters: param,
-		Y:          w.Y,
-	}
-	return key, w.Rest, nil
-}
-
-func (k *dsaPublicKey) Marshal() []byte {
-	// DSA publickey struct layout should match the struct used by
-	// parseDSACert in the x/crypto/ssh/agent package.
-	w := struct {
-		Name       string
-		P, Q, G, Y *big.Int
-	}{
-		k.Type(),
-		k.P,
-		k.Q,
-		k.G,
-		k.Y,
-	}
-
-	return Marshal(&w)
-}
-
-func (k *dsaPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != k.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, k.Type())
-	}
-	h := crypto.SHA1.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-
-	// Per RFC 4253, section 6.6,
-	// The value for 'dss_signature_blob' is encoded as a string containing
-	// r, followed by s (which are 160-bit integers, without lengths or
-	// padding, unsigned, and in network byte order).
-	// For DSS purposes, sig.Blob should be exactly 40 bytes in length.
-	if len(sig.Blob) != 40 {
-		return errors.New("ssh: DSA signature parse error")
-	}
-	r := new(big.Int).SetBytes(sig.Blob[:20])
-	s := new(big.Int).SetBytes(sig.Blob[20:])
-	if dsa.Verify((*dsa.PublicKey)(k), digest, r, s) {
-		return nil
-	}
-	return errors.New("ssh: signature did not verify")
-}
-
-func (k *dsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*dsa.PublicKey)(k)
-}
-
-type dsaPrivateKey struct {
-	*dsa.PrivateKey
-}
-
-func (k *dsaPrivateKey) PublicKey() PublicKey {
-	return (*dsaPublicKey)(&k.PrivateKey.PublicKey)
-}
-
-func (k *dsaPrivateKey) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	h := crypto.SHA1.New()
-	h.Write(data)
-	digest := h.Sum(nil)
-	r, s, err := dsa.Sign(rand, k.PrivateKey, digest)
-	if err != nil {
-		return nil, err
-	}
-
-	sig := make([]byte, 40)
-	rb := r.Bytes()
-	sb := s.Bytes()
-
-	copy(sig[20-len(rb):20], rb)
-	copy(sig[40-len(sb):], sb)
-
-	return &Signature{
-		Format: k.PublicKey().Type(),
-		Blob:   sig,
-	}, nil
-}
-
-type ecdsaPublicKey ecdsa.PublicKey
-
-func (key *ecdsaPublicKey) Type() string {
-	return "ecdsa-sha2-" + key.nistID()
-}
-
-func (key *ecdsaPublicKey) nistID() string {
-	switch key.Params().BitSize {
-	case 256:
-		return "nistp256"
-	case 384:
-		return "nistp384"
-	case 521:
-		return "nistp521"
-	}
-	panic("ssh: unsupported ecdsa key size")
-}
-
-type ed25519PublicKey ed25519.PublicKey
-
-func (key ed25519PublicKey) Type() string {
-	return KeyAlgoED25519
-}
-
-func parseED25519(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		KeyBytes []byte
-		Rest     []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	key := ed25519.PublicKey(w.KeyBytes)
-
-	return (ed25519PublicKey)(key), w.Rest, nil
-}
-
-func (key ed25519PublicKey) Marshal() []byte {
-	w := struct {
-		Name     string
-		KeyBytes []byte
-	}{
-		KeyAlgoED25519,
-		[]byte(key),
-	}
-	return Marshal(&w)
-}
-
-func (key ed25519PublicKey) Verify(b []byte, sig *Signature) error {
-	if sig.Format != key.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, key.Type())
-	}
-
-	edKey := (ed25519.PublicKey)(key)
-	if ok := ed25519.Verify(edKey, b, sig.Blob); !ok {
-		return errors.New("ssh: signature did not verify")
-	}
-
-	return nil
-}
-
-func (k ed25519PublicKey) CryptoPublicKey() crypto.PublicKey {
-	return ed25519.PublicKey(k)
-}
-
-func supportedEllipticCurve(curve elliptic.Curve) bool {
-	return curve == elliptic.P256() || curve == elliptic.P384() || curve == elliptic.P521()
-}
-
-// ecHash returns the hash to match the given elliptic curve, see RFC
-// 5656, section 6.2.1
-func ecHash(curve elliptic.Curve) crypto.Hash {
-	bitSize := curve.Params().BitSize
-	switch {
-	case bitSize <= 256:
-		return crypto.SHA256
-	case bitSize <= 384:
-		return crypto.SHA384
-	}
-	return crypto.SHA512
-}
-
-// parseECDSA parses an ECDSA key according to RFC 5656, section 3.1.
-func parseECDSA(in []byte) (out PublicKey, rest []byte, err error) {
-	var w struct {
-		Curve    string
-		KeyBytes []byte
-		Rest     []byte `ssh:"rest"`
-	}
-
-	if err := Unmarshal(in, &w); err != nil {
-		return nil, nil, err
-	}
-
-	key := new(ecdsa.PublicKey)
-
-	switch w.Curve {
-	case "nistp256":
-		key.Curve = elliptic.P256()
-	case "nistp384":
-		key.Curve = elliptic.P384()
-	case "nistp521":
-		key.Curve = elliptic.P521()
-	default:
-		return nil, nil, errors.New("ssh: unsupported curve")
-	}
-
-	key.X, key.Y = elliptic.Unmarshal(key.Curve, w.KeyBytes)
-	if key.X == nil || key.Y == nil {
-		return nil, nil, errors.New("ssh: invalid curve point")
-	}
-	return (*ecdsaPublicKey)(key), w.Rest, nil
-}
-
-func (key *ecdsaPublicKey) Marshal() []byte {
-	// See RFC 5656, section 3.1.
-	keyBytes := elliptic.Marshal(key.Curve, key.X, key.Y)
-	// ECDSA publickey struct layout should match the struct used by
-	// parseECDSACert in the x/crypto/ssh/agent package.
-	w := struct {
-		Name string
-		ID   string
-		Key  []byte
-	}{
-		key.Type(),
-		key.nistID(),
-		keyBytes,
-	}
-
-	return Marshal(&w)
-}
-
-func (key *ecdsaPublicKey) Verify(data []byte, sig *Signature) error {
-	if sig.Format != key.Type() {
-		return fmt.Errorf("ssh: signature type %s for key type %s", sig.Format, key.Type())
-	}
-
-	h := ecHash(key.Curve).New()
-	h.Write(data)
-	digest := h.Sum(nil)
-
-	// Per RFC 5656, section 3.1.2,
-	// The ecdsa_signature_blob value has the following specific encoding:
-	//    mpint    r
-	//    mpint    s
-	var ecSig struct {
-		R *big.Int
-		S *big.Int
-	}
-
-	if err := Unmarshal(sig.Blob, &ecSig); err != nil {
-		return err
-	}
-
-	if ecdsa.Verify((*ecdsa.PublicKey)(key), digest, ecSig.R, ecSig.S) {
-		return nil
-	}
-	return errors.New("ssh: signature did not verify")
-}
-
-func (k *ecdsaPublicKey) CryptoPublicKey() crypto.PublicKey {
-	return (*ecdsa.PublicKey)(k)
-}
-
-// NewSignerFromKey takes an *rsa.PrivateKey, *dsa.PrivateKey,
-// *ecdsa.PrivateKey or any other crypto.Signer and returns a
-// corresponding Signer instance. ECDSA keys must use P-256, P-384 or
-// P-521. DSA keys must use parameter size L1024N160.
-func NewSignerFromKey(key interface{}) (Signer, error) {
-	switch key := key.(type) {
-	case crypto.Signer:
-		return NewSignerFromSigner(key)
-	case *dsa.PrivateKey:
-		return newDSAPrivateKey(key)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", key)
-	}
-}
-
-func newDSAPrivateKey(key *dsa.PrivateKey) (Signer, error) {
-	if err := checkDSAParams(&key.PublicKey.Parameters); err != nil {
-		return nil, err
-	}
-
-	return &dsaPrivateKey{key}, nil
-}
-
-type wrappedSigner struct {
-	signer crypto.Signer
-	pubKey PublicKey
-}
-
-// NewSignerFromSigner takes any crypto.Signer implementation and
-// returns a corresponding Signer interface. This can be used, for
-// example, with keys kept in hardware modules.
-func NewSignerFromSigner(signer crypto.Signer) (Signer, error) {
-	pubKey, err := NewPublicKey(signer.Public())
-	if err != nil {
-		return nil, err
-	}
-
-	return &wrappedSigner{signer, pubKey}, nil
-}
-
-func (s *wrappedSigner) PublicKey() PublicKey {
-	return s.pubKey
-}
-
-func (s *wrappedSigner) Sign(rand io.Reader, data []byte) (*Signature, error) {
-	var hashFunc crypto.Hash
-
-	switch key := s.pubKey.(type) {
-	case *rsaPublicKey, *dsaPublicKey:
-		hashFunc = crypto.SHA1
-	case *ecdsaPublicKey:
-		hashFunc = ecHash(key.Curve)
-	case ed25519PublicKey:
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", key)
-	}
-
-	var digest []byte
-	if hashFunc != 0 {
-		h := hashFunc.New()
-		h.Write(data)
-		digest = h.Sum(nil)
-	} else {
-		digest = data
-	}
-
-	signature, err := s.signer.Sign(rand, digest, hashFunc)
-	if err != nil {
-		return nil, err
-	}
-
-	// crypto.Signer.Sign is expected to return an ASN.1-encoded signature
-	// for ECDSA and DSA, but that's not the encoding expected by SSH, so
-	// re-encode.
-	switch s.pubKey.(type) {
-	case *ecdsaPublicKey, *dsaPublicKey:
-		type asn1Signature struct {
-			R, S *big.Int
-		}
-		asn1Sig := new(asn1Signature)
-		_, err := asn1.Unmarshal(signature, asn1Sig)
-		if err != nil {
-			return nil, err
-		}
-
-		switch s.pubKey.(type) {
-		case *ecdsaPublicKey:
-			signature = Marshal(asn1Sig)
-
-		case *dsaPublicKey:
-			signature = make([]byte, 40)
-			r := asn1Sig.R.Bytes()
-			s := asn1Sig.S.Bytes()
-			copy(signature[20-len(r):20], r)
-			copy(signature[40-len(s):40], s)
-		}
-	}
-
-	return &Signature{
-		Format: s.pubKey.Type(),
-		Blob:   signature,
-	}, nil
-}
-
-// NewPublicKey takes an *rsa.PublicKey, *dsa.PublicKey, *ecdsa.PublicKey,
-// or ed25519.PublicKey returns a corresponding PublicKey instance.
-// ECDSA keys must use P-256, P-384 or P-521.
-func NewPublicKey(key interface{}) (PublicKey, error) {
-	switch key := key.(type) {
-	case *rsa.PublicKey:
-		return (*rsaPublicKey)(key), nil
-	case *ecdsa.PublicKey:
-		if !supportedEllipticCurve(key.Curve) {
-			return nil, errors.New("ssh: only P-256, P-384 and P-521 EC keys are supported.")
-		}
-		return (*ecdsaPublicKey)(key), nil
-	case *dsa.PublicKey:
-		return (*dsaPublicKey)(key), nil
-	case ed25519.PublicKey:
-		return (ed25519PublicKey)(key), nil
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %T", key)
-	}
-}
-
-// ParsePrivateKey returns a Signer from a PEM encoded private key. It supports
-// the same keys as ParseRawPrivateKey.
-func ParsePrivateKey(pemBytes []byte) (Signer, error) {
-	key, err := ParseRawPrivateKey(pemBytes)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewSignerFromKey(key)
-}
-
-// ParsePrivateKeyWithPassphrase returns a Signer from a PEM encoded private
-// key and passphrase. It supports the same keys as
-// ParseRawPrivateKeyWithPassphrase.
-func ParsePrivateKeyWithPassphrase(pemBytes, passPhrase []byte) (Signer, error) {
-	key, err := ParseRawPrivateKeyWithPassphrase(pemBytes, passPhrase)
-	if err != nil {
-		return nil, err
-	}
-
-	return NewSignerFromKey(key)
-}
-
-// encryptedBlock tells whether a private key is
-// encrypted by examining its Proc-Type header
-// for a mention of ENCRYPTED
-// according to RFC 1421 Section 4.6.1.1.
-func encryptedBlock(block *pem.Block) bool {
-	return strings.Contains(block.Headers["Proc-Type"], "ENCRYPTED")
-}
-
-// ParseRawPrivateKey returns a private key from a PEM encoded private key. It
-// supports RSA (PKCS#1), DSA (OpenSSL), and ECDSA private keys.
-func ParseRawPrivateKey(pemBytes []byte) (interface{}, error) {
-	block, _ := pem.Decode(pemBytes)
-	if block == nil {
-		return nil, errors.New("ssh: no key found")
-	}
-
-	if encryptedBlock(block) {
-		return nil, errors.New("ssh: cannot decode encrypted private keys")
-	}
-
-	switch block.Type {
-	case "RSA PRIVATE KEY":
-		return x509.ParsePKCS1PrivateKey(block.Bytes)
-	case "EC PRIVATE KEY":
-		return x509.ParseECPrivateKey(block.Bytes)
-	case "DSA PRIVATE KEY":
-		return ParseDSAPrivateKey(block.Bytes)
-	case "OPENSSH PRIVATE KEY":
-		return parseOpenSSHPrivateKey(block.Bytes)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %q", block.Type)
-	}
-}
-
-// ParseRawPrivateKeyWithPassphrase returns a private key decrypted with
-// passphrase from a PEM encoded private key. If wrong passphrase, return
-// x509.IncorrectPasswordError.
-func ParseRawPrivateKeyWithPassphrase(pemBytes, passPhrase []byte) (interface{}, error) {
-	block, _ := pem.Decode(pemBytes)
-	if block == nil {
-		return nil, errors.New("ssh: no key found")
-	}
-	buf := block.Bytes
-
-	if encryptedBlock(block) {
-		if x509.IsEncryptedPEMBlock(block) {
-			var err error
-			buf, err = x509.DecryptPEMBlock(block, passPhrase)
-			if err != nil {
-				if err == x509.IncorrectPasswordError {
-					return nil, err
-				}
-				return nil, fmt.Errorf("ssh: cannot decode encrypted private keys: %v", err)
-			}
-		}
-	}
-
-	switch block.Type {
-	case "RSA PRIVATE KEY":
-		return x509.ParsePKCS1PrivateKey(buf)
-	case "EC PRIVATE KEY":
-		return x509.ParseECPrivateKey(buf)
-	case "DSA PRIVATE KEY":
-		return ParseDSAPrivateKey(buf)
-	case "OPENSSH PRIVATE KEY":
-		return parseOpenSSHPrivateKey(buf)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported key type %q", block.Type)
-	}
-}
-
-// ParseDSAPrivateKey returns a DSA private key from its ASN.1 DER encoding, as
-// specified by the OpenSSL DSA man page.
-func ParseDSAPrivateKey(der []byte) (*dsa.PrivateKey, error) {
-	var k struct {
-		Version int
-		P       *big.Int
-		Q       *big.Int
-		G       *big.Int
-		Pub     *big.Int
-		Priv    *big.Int
-	}
-	rest, err := asn1.Unmarshal(der, &k)
-	if err != nil {
-		return nil, errors.New("ssh: failed to parse DSA key: " + err.Error())
-	}
-	if len(rest) > 0 {
-		return nil, errors.New("ssh: garbage after DSA key")
-	}
-
-	return &dsa.PrivateKey{
-		PublicKey: dsa.PublicKey{
-			Parameters: dsa.Parameters{
-				P: k.P,
-				Q: k.Q,
-				G: k.G,
-			},
-			Y: k.Pub,
-		},
-		X: k.Priv,
-	}, nil
-}
-
-// Implemented based on the documentation at
-// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL.key
-func parseOpenSSHPrivateKey(key []byte) (crypto.PrivateKey, error) {
-	magic := append([]byte("openssh-key-v1"), 0)
-	if !bytes.Equal(magic, key[0:len(magic)]) {
-		return nil, errors.New("ssh: invalid openssh private key format")
-	}
-	remaining := key[len(magic):]
-
-	var w struct {
-		CipherName   string
-		KdfName      string
-		KdfOpts      string
-		NumKeys      uint32
-		PubKey       []byte
-		PrivKeyBlock []byte
-	}
-
-	if err := Unmarshal(remaining, &w); err != nil {
-		return nil, err
-	}
-
-	if w.KdfName != "none" || w.CipherName != "none" {
-		return nil, errors.New("ssh: cannot decode encrypted private keys")
-	}
-
-	pk1 := struct {
-		Check1  uint32
-		Check2  uint32
-		Keytype string
-		Rest    []byte `ssh:"rest"`
-	}{}
-
-	if err := Unmarshal(w.PrivKeyBlock, &pk1); err != nil {
-		return nil, err
-	}
-
-	if pk1.Check1 != pk1.Check2 {
-		return nil, errors.New("ssh: checkint mismatch")
-	}
-
-	// we only handle ed25519 and rsa keys currently
-	switch pk1.Keytype {
-	case KeyAlgoRSA:
-		// https://github.com/openssh/openssh-portable/blob/master/sshkey.c#L2760-L2773
-		key := struct {
-			N       *big.Int
-			E       *big.Int
-			D       *big.Int
-			Iqmp    *big.Int
-			P       *big.Int
-			Q       *big.Int
-			Comment string
-			Pad     []byte `ssh:"rest"`
-		}{}
-
-		if err := Unmarshal(pk1.Rest, &key); err != nil {
-			return nil, err
-		}
-
-		for i, b := range key.Pad {
-			if int(b) != i+1 {
-				return nil, errors.New("ssh: padding not as expected")
-			}
-		}
-
-		pk := &rsa.PrivateKey{
-			PublicKey: rsa.PublicKey{
-				N: key.N,
-				E: int(key.E.Int64()),
-			},
-			D:      key.D,
-			Primes: []*big.Int{key.P, key.Q},
-		}
-
-		if err := pk.Validate(); err != nil {
-			return nil, err
-		}
-
-		pk.Precompute()
-
-		return pk, nil
-	case KeyAlgoED25519:
-		key := struct {
-			Pub     []byte
-			Priv    []byte
-			Comment string
-			Pad     []byte `ssh:"rest"`
-		}{}
-
-		if err := Unmarshal(pk1.Rest, &key); err != nil {
-			return nil, err
-		}
-
-		if len(key.Priv) != ed25519.PrivateKeySize {
-			return nil, errors.New("ssh: private key unexpected length")
-		}
-
-		for i, b := range key.Pad {
-			if int(b) != i+1 {
-				return nil, errors.New("ssh: padding not as expected")
-			}
-		}
-
-		pk := ed25519.PrivateKey(make([]byte, ed25519.PrivateKeySize))
-		copy(pk, key.Priv)
-		return &pk, nil
-	default:
-		return nil, errors.New("ssh: unhandled key type")
-	}
-}
-
-// FingerprintLegacyMD5 returns the user presentation of the key's
-// fingerprint as described by RFC 4716 section 4.
-func FingerprintLegacyMD5(pubKey PublicKey) string {
-	md5sum := md5.Sum(pubKey.Marshal())
-	hexarray := make([]string, len(md5sum))
-	for i, c := range md5sum {
-		hexarray[i] = hex.EncodeToString([]byte{c})
-	}
-	return strings.Join(hexarray, ":")
-}
-
-// FingerprintSHA256 returns the user presentation of the key's
-// fingerprint as unpadded base64 encoded sha256 hash.
-// This format was introduced from OpenSSH 6.8.
-// https://www.openssh.com/txt/release-6.8
-// https://tools.ietf.org/html/rfc4648#section-3.2 (unpadded base64 encoding)
-func FingerprintSHA256(pubKey PublicKey) string {
-	sha256sum := sha256.Sum256(pubKey.Marshal())
-	hash := base64.RawStdEncoding.EncodeToString(sha256sum[:])
-	return "SHA256:" + hash
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/keys_test.go b/installer/vendor/golang.org/x/crypto/ssh/keys_test.go
deleted file mode 100644
index 20ab954e2a..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/keys_test.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto/dsa"
-	"crypto/ecdsa"
-	"crypto/elliptic"
-	"crypto/rand"
-	"crypto/rsa"
-	"crypto/x509"
-	"encoding/base64"
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/ed25519"
-	"golang.org/x/crypto/ssh/testdata"
-)
-
-func rawKey(pub PublicKey) interface{} {
-	switch k := pub.(type) {
-	case *rsaPublicKey:
-		return (*rsa.PublicKey)(k)
-	case *dsaPublicKey:
-		return (*dsa.PublicKey)(k)
-	case *ecdsaPublicKey:
-		return (*ecdsa.PublicKey)(k)
-	case ed25519PublicKey:
-		return (ed25519.PublicKey)(k)
-	case *Certificate:
-		return k
-	}
-	panic("unknown key type")
-}
-
-func TestKeyMarshalParse(t *testing.T) {
-	for _, priv := range testSigners {
-		pub := priv.PublicKey()
-		roundtrip, err := ParsePublicKey(pub.Marshal())
-		if err != nil {
-			t.Errorf("ParsePublicKey(%T): %v", pub, err)
-		}
-
-		k1 := rawKey(pub)
-		k2 := rawKey(roundtrip)
-
-		if !reflect.DeepEqual(k1, k2) {
-			t.Errorf("got %#v in roundtrip, want %#v", k2, k1)
-		}
-	}
-}
-
-func TestUnsupportedCurves(t *testing.T) {
-	raw, err := ecdsa.GenerateKey(elliptic.P224(), rand.Reader)
-	if err != nil {
-		t.Fatalf("GenerateKey: %v", err)
-	}
-
-	if _, err = NewSignerFromKey(raw); err == nil || !strings.Contains(err.Error(), "only P-256") {
-		t.Fatalf("NewPrivateKey should not succeed with P-224, got: %v", err)
-	}
-
-	if _, err = NewPublicKey(&raw.PublicKey); err == nil || !strings.Contains(err.Error(), "only P-256") {
-		t.Fatalf("NewPublicKey should not succeed with P-224, got: %v", err)
-	}
-}
-
-func TestNewPublicKey(t *testing.T) {
-	for _, k := range testSigners {
-		raw := rawKey(k.PublicKey())
-		// Skip certificates, as NewPublicKey does not support them.
-		if _, ok := raw.(*Certificate); ok {
-			continue
-		}
-		pub, err := NewPublicKey(raw)
-		if err != nil {
-			t.Errorf("NewPublicKey(%#v): %v", raw, err)
-		}
-		if !reflect.DeepEqual(k.PublicKey(), pub) {
-			t.Errorf("NewPublicKey(%#v) = %#v, want %#v", raw, pub, k.PublicKey())
-		}
-	}
-}
-
-func TestKeySignVerify(t *testing.T) {
-	for _, priv := range testSigners {
-		pub := priv.PublicKey()
-
-		data := []byte("sign me")
-		sig, err := priv.Sign(rand.Reader, data)
-		if err != nil {
-			t.Fatalf("Sign(%T): %v", priv, err)
-		}
-
-		if err := pub.Verify(data, sig); err != nil {
-			t.Errorf("publicKey.Verify(%T): %v", priv, err)
-		}
-		sig.Blob[5]++
-		if err := pub.Verify(data, sig); err == nil {
-			t.Errorf("publicKey.Verify on broken sig did not fail")
-		}
-	}
-}
-
-func TestParseRSAPrivateKey(t *testing.T) {
-	key := testPrivateKeys["rsa"]
-
-	rsa, ok := key.(*rsa.PrivateKey)
-	if !ok {
-		t.Fatalf("got %T, want *rsa.PrivateKey", rsa)
-	}
-
-	if err := rsa.Validate(); err != nil {
-		t.Errorf("Validate: %v", err)
-	}
-}
-
-func TestParseECPrivateKey(t *testing.T) {
-	key := testPrivateKeys["ecdsa"]
-
-	ecKey, ok := key.(*ecdsa.PrivateKey)
-	if !ok {
-		t.Fatalf("got %T, want *ecdsa.PrivateKey", ecKey)
-	}
-
-	if !validateECPublicKey(ecKey.Curve, ecKey.X, ecKey.Y) {
-		t.Fatalf("public key does not validate.")
-	}
-}
-
-// See Issue https://github.com/golang/go/issues/6650.
-func TestParseEncryptedPrivateKeysFails(t *testing.T) {
-	const wantSubstring = "encrypted"
-	for i, tt := range testdata.PEMEncryptedKeys {
-		_, err := ParsePrivateKey(tt.PEMBytes)
-		if err == nil {
-			t.Errorf("#%d key %s: ParsePrivateKey successfully parsed, expected an error", i, tt.Name)
-			continue
-		}
-
-		if !strings.Contains(err.Error(), wantSubstring) {
-			t.Errorf("#%d key %s: got error %q, want substring %q", i, tt.Name, err, wantSubstring)
-		}
-	}
-}
-
-// Parse encrypted private keys with passphrase
-func TestParseEncryptedPrivateKeysWithPassphrase(t *testing.T) {
-	data := []byte("sign me")
-	for _, tt := range testdata.PEMEncryptedKeys {
-		s, err := ParsePrivateKeyWithPassphrase(tt.PEMBytes, []byte(tt.EncryptionKey))
-		if err != nil {
-			t.Fatalf("ParsePrivateKeyWithPassphrase returned error: %s", err)
-			continue
-		}
-		sig, err := s.Sign(rand.Reader, data)
-		if err != nil {
-			t.Fatalf("dsa.Sign: %v", err)
-		}
-		if err := s.PublicKey().Verify(data, sig); err != nil {
-			t.Errorf("Verify failed: %v", err)
-		}
-	}
-
-	tt := testdata.PEMEncryptedKeys[0]
-	_, err := ParsePrivateKeyWithPassphrase(tt.PEMBytes, []byte("incorrect"))
-	if err != x509.IncorrectPasswordError {
-		t.Fatalf("got %v want IncorrectPasswordError", err)
-	}
-}
-
-func TestParseDSA(t *testing.T) {
-	// We actually exercise the ParsePrivateKey codepath here, as opposed to
-	// using the ParseRawPrivateKey+NewSignerFromKey path that testdata_test.go
-	// uses.
-	s, err := ParsePrivateKey(testdata.PEMBytes["dsa"])
-	if err != nil {
-		t.Fatalf("ParsePrivateKey returned error: %s", err)
-	}
-
-	data := []byte("sign me")
-	sig, err := s.Sign(rand.Reader, data)
-	if err != nil {
-		t.Fatalf("dsa.Sign: %v", err)
-	}
-
-	if err := s.PublicKey().Verify(data, sig); err != nil {
-		t.Errorf("Verify failed: %v", err)
-	}
-}
-
-// Tests for authorized_keys parsing.
-
-// getTestKey returns a public key, and its base64 encoding.
-func getTestKey() (PublicKey, string) {
-	k := testPublicKeys["rsa"]
-
-	b := &bytes.Buffer{}
-	e := base64.NewEncoder(base64.StdEncoding, b)
-	e.Write(k.Marshal())
-	e.Close()
-
-	return k, b.String()
-}
-
-func TestMarshalParsePublicKey(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	line := fmt.Sprintf("%s %s user@host", pub.Type(), pubSerialized)
-
-	authKeys := MarshalAuthorizedKey(pub)
-	actualFields := strings.Fields(string(authKeys))
-	if len(actualFields) == 0 {
-		t.Fatalf("failed authKeys: %v", authKeys)
-	}
-
-	// drop the comment
-	expectedFields := strings.Fields(line)[0:2]
-
-	if !reflect.DeepEqual(actualFields, expectedFields) {
-		t.Errorf("got %v, expected %v", actualFields, expectedFields)
-	}
-
-	actPub, _, _, _, err := ParseAuthorizedKey([]byte(line))
-	if err != nil {
-		t.Fatalf("cannot parse %v: %v", line, err)
-	}
-	if !reflect.DeepEqual(actPub, pub) {
-		t.Errorf("got %v, expected %v", actPub, pub)
-	}
-}
-
-type authResult struct {
-	pubKey   PublicKey
-	options  []string
-	comments string
-	rest     string
-	ok       bool
-}
-
-func testAuthorizedKeys(t *testing.T, authKeys []byte, expected []authResult) {
-	rest := authKeys
-	var values []authResult
-	for len(rest) > 0 {
-		var r authResult
-		var err error
-		r.pubKey, r.comments, r.options, rest, err = ParseAuthorizedKey(rest)
-		r.ok = (err == nil)
-		t.Log(err)
-		r.rest = string(rest)
-		values = append(values, r)
-	}
-
-	if !reflect.DeepEqual(values, expected) {
-		t.Errorf("got %#v, expected %#v", values, expected)
-	}
-}
-
-func TestAuthorizedKeyBasic(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	line := "ssh-rsa " + pubSerialized + " user@host"
-	testAuthorizedKeys(t, []byte(line),
-		[]authResult{
-			{pub, nil, "user@host", "", true},
-		})
-}
-
-func TestAuth(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	authWithOptions := []string{
-		`# comments to ignore before any keys...`,
-		``,
-		`env="HOME=/home/root",no-port-forwarding ssh-rsa ` + pubSerialized + ` user@host`,
-		`# comments to ignore, along with a blank line`,
-		``,
-		`env="HOME=/home/root2" ssh-rsa ` + pubSerialized + ` user2@host2`,
-		``,
-		`# more comments, plus a invalid entry`,
-		`ssh-rsa data-that-will-not-parse user@host3`,
-	}
-	for _, eol := range []string{"\n", "\r\n"} {
-		authOptions := strings.Join(authWithOptions, eol)
-		rest2 := strings.Join(authWithOptions[3:], eol)
-		rest3 := strings.Join(authWithOptions[6:], eol)
-		testAuthorizedKeys(t, []byte(authOptions), []authResult{
-			{pub, []string{`env="HOME=/home/root"`, "no-port-forwarding"}, "user@host", rest2, true},
-			{pub, []string{`env="HOME=/home/root2"`}, "user2@host2", rest3, true},
-			{nil, nil, "", "", false},
-		})
-	}
-}
-
-func TestAuthWithQuotedSpaceInEnv(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	authWithQuotedSpaceInEnv := []byte(`env="HOME=/home/root dir",no-port-forwarding ssh-rsa ` + pubSerialized + ` user@host`)
-	testAuthorizedKeys(t, []byte(authWithQuotedSpaceInEnv), []authResult{
-		{pub, []string{`env="HOME=/home/root dir"`, "no-port-forwarding"}, "user@host", "", true},
-	})
-}
-
-func TestAuthWithQuotedCommaInEnv(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	authWithQuotedCommaInEnv := []byte(`env="HOME=/home/root,dir",no-port-forwarding ssh-rsa ` + pubSerialized + `   user@host`)
-	testAuthorizedKeys(t, []byte(authWithQuotedCommaInEnv), []authResult{
-		{pub, []string{`env="HOME=/home/root,dir"`, "no-port-forwarding"}, "user@host", "", true},
-	})
-}
-
-func TestAuthWithQuotedQuoteInEnv(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	authWithQuotedQuoteInEnv := []byte(`env="HOME=/home/\"root dir",no-port-forwarding` + "\t" + `ssh-rsa` + "\t" + pubSerialized + `   user@host`)
-	authWithDoubleQuotedQuote := []byte(`no-port-forwarding,env="HOME=/home/ \"root dir\"" ssh-rsa ` + pubSerialized + "\t" + `user@host`)
-	testAuthorizedKeys(t, []byte(authWithQuotedQuoteInEnv), []authResult{
-		{pub, []string{`env="HOME=/home/\"root dir"`, "no-port-forwarding"}, "user@host", "", true},
-	})
-
-	testAuthorizedKeys(t, []byte(authWithDoubleQuotedQuote), []authResult{
-		{pub, []string{"no-port-forwarding", `env="HOME=/home/ \"root dir\""`}, "user@host", "", true},
-	})
-}
-
-func TestAuthWithInvalidSpace(t *testing.T) {
-	_, pubSerialized := getTestKey()
-	authWithInvalidSpace := []byte(`env="HOME=/home/root dir", no-port-forwarding ssh-rsa ` + pubSerialized + ` user@host
-#more to follow but still no valid keys`)
-	testAuthorizedKeys(t, []byte(authWithInvalidSpace), []authResult{
-		{nil, nil, "", "", false},
-	})
-}
-
-func TestAuthWithMissingQuote(t *testing.T) {
-	pub, pubSerialized := getTestKey()
-	authWithMissingQuote := []byte(`env="HOME=/home/root,no-port-forwarding ssh-rsa ` + pubSerialized + ` user@host
-env="HOME=/home/root",shared-control ssh-rsa ` + pubSerialized + ` user@host`)
-
-	testAuthorizedKeys(t, []byte(authWithMissingQuote), []authResult{
-		{pub, []string{`env="HOME=/home/root"`, `shared-control`}, "user@host", "", true},
-	})
-}
-
-func TestInvalidEntry(t *testing.T) {
-	authInvalid := []byte(`ssh-rsa`)
-	_, _, _, _, err := ParseAuthorizedKey(authInvalid)
-	if err == nil {
-		t.Errorf("got valid entry for %q", authInvalid)
-	}
-}
-
-var knownHostsParseTests = []struct {
-	input string
-	err   string
-
-	marker  string
-	comment string
-	hosts   []string
-	rest    string
-}{
-	{
-		"",
-		"EOF",
-
-		"", "", nil, "",
-	},
-	{
-		"# Just a comment",
-		"EOF",
-
-		"", "", nil, "",
-	},
-	{
-		"   \t   ",
-		"EOF",
-
-		"", "", nil, "",
-	},
-	{
-		"localhost ssh-rsa {RSAPUB}",
-		"",
-
-		"", "", []string{"localhost"}, "",
-	},
-	{
-		"localhost\tssh-rsa {RSAPUB}",
-		"",
-
-		"", "", []string{"localhost"}, "",
-	},
-	{
-		"localhost\tssh-rsa {RSAPUB}\tcomment comment",
-		"",
-
-		"", "comment comment", []string{"localhost"}, "",
-	},
-	{
-		"localhost\tssh-rsa {RSAPUB}\tcomment comment\n",
-		"",
-
-		"", "comment comment", []string{"localhost"}, "",
-	},
-	{
-		"localhost\tssh-rsa {RSAPUB}\tcomment comment\r\n",
-		"",
-
-		"", "comment comment", []string{"localhost"}, "",
-	},
-	{
-		"localhost\tssh-rsa {RSAPUB}\tcomment comment\r\nnext line",
-		"",
-
-		"", "comment comment", []string{"localhost"}, "next line",
-	},
-	{
-		"localhost,[host2:123]\tssh-rsa {RSAPUB}\tcomment comment",
-		"",
-
-		"", "comment comment", []string{"localhost", "[host2:123]"}, "",
-	},
-	{
-		"@marker \tlocalhost,[host2:123]\tssh-rsa {RSAPUB}",
-		"",
-
-		"marker", "", []string{"localhost", "[host2:123]"}, "",
-	},
-	{
-		"@marker \tlocalhost,[host2:123]\tssh-rsa aabbccdd",
-		"short read",
-
-		"", "", nil, "",
-	},
-}
-
-func TestKnownHostsParsing(t *testing.T) {
-	rsaPub, rsaPubSerialized := getTestKey()
-
-	for i, test := range knownHostsParseTests {
-		var expectedKey PublicKey
-		const rsaKeyToken = "{RSAPUB}"
-
-		input := test.input
-		if strings.Contains(input, rsaKeyToken) {
-			expectedKey = rsaPub
-			input = strings.Replace(test.input, rsaKeyToken, rsaPubSerialized, -1)
-		}
-
-		marker, hosts, pubKey, comment, rest, err := ParseKnownHosts([]byte(input))
-		if err != nil {
-			if len(test.err) == 0 {
-				t.Errorf("#%d: unexpectedly failed with %q", i, err)
-			} else if !strings.Contains(err.Error(), test.err) {
-				t.Errorf("#%d: expected error containing %q, but got %q", i, test.err, err)
-			}
-			continue
-		} else if len(test.err) != 0 {
-			t.Errorf("#%d: succeeded but expected error including %q", i, test.err)
-			continue
-		}
-
-		if !reflect.DeepEqual(expectedKey, pubKey) {
-			t.Errorf("#%d: expected key %#v, but got %#v", i, expectedKey, pubKey)
-		}
-
-		if marker != test.marker {
-			t.Errorf("#%d: expected marker %q, but got %q", i, test.marker, marker)
-		}
-
-		if comment != test.comment {
-			t.Errorf("#%d: expected comment %q, but got %q", i, test.comment, comment)
-		}
-
-		if !reflect.DeepEqual(test.hosts, hosts) {
-			t.Errorf("#%d: expected hosts %#v, but got %#v", i, test.hosts, hosts)
-		}
-
-		if rest := string(rest); rest != test.rest {
-			t.Errorf("#%d: expected remaining input to be %q, but got %q", i, test.rest, rest)
-		}
-	}
-}
-
-func TestFingerprintLegacyMD5(t *testing.T) {
-	pub, _ := getTestKey()
-	fingerprint := FingerprintLegacyMD5(pub)
-	want := "fb:61:6d:1a:e3:f0:95:45:3c:a0:79:be:4a:93:63:66" // ssh-keygen -lf -E md5 rsa
-	if fingerprint != want {
-		t.Errorf("got fingerprint %q want %q", fingerprint, want)
-	}
-}
-
-func TestFingerprintSHA256(t *testing.T) {
-	pub, _ := getTestKey()
-	fingerprint := FingerprintSHA256(pub)
-	want := "SHA256:Anr3LjZK8YVpjrxu79myrW9Hrb/wpcMNpVvTq/RcBm8" // ssh-keygen -lf rsa
-	if fingerprint != want {
-		t.Errorf("got fingerprint %q want %q", fingerprint, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go b/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go
deleted file mode 100644
index ea92b29832..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts.go
+++ /dev/null
@@ -1,546 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package knownhosts implements a parser for the OpenSSH
-// known_hosts host key database.
-package knownhosts
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/hmac"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/base64"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"os"
-	"strings"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// See the sshd manpage
-// (http://man.openbsd.org/sshd#SSH_KNOWN_HOSTS_FILE_FORMAT) for
-// background.
-
-type addr struct{ host, port string }
-
-func (a *addr) String() string {
-	h := a.host
-	if strings.Contains(h, ":") {
-		h = "[" + h + "]"
-	}
-	return h + ":" + a.port
-}
-
-type matcher interface {
-	match([]addr) bool
-}
-
-type hostPattern struct {
-	negate bool
-	addr   addr
-}
-
-func (p *hostPattern) String() string {
-	n := ""
-	if p.negate {
-		n = "!"
-	}
-
-	return n + p.addr.String()
-}
-
-type hostPatterns []hostPattern
-
-func (ps hostPatterns) match(addrs []addr) bool {
-	matched := false
-	for _, p := range ps {
-		for _, a := range addrs {
-			m := p.match(a)
-			if !m {
-				continue
-			}
-			if p.negate {
-				return false
-			}
-			matched = true
-		}
-	}
-	return matched
-}
-
-// See
-// https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/addrmatch.c
-// The matching of * has no regard for separators, unlike filesystem globs
-func wildcardMatch(pat []byte, str []byte) bool {
-	for {
-		if len(pat) == 0 {
-			return len(str) == 0
-		}
-		if len(str) == 0 {
-			return false
-		}
-
-		if pat[0] == '*' {
-			if len(pat) == 1 {
-				return true
-			}
-
-			for j := range str {
-				if wildcardMatch(pat[1:], str[j:]) {
-					return true
-				}
-			}
-			return false
-		}
-
-		if pat[0] == '?' || pat[0] == str[0] {
-			pat = pat[1:]
-			str = str[1:]
-		} else {
-			return false
-		}
-	}
-}
-
-func (l *hostPattern) match(a addr) bool {
-	return wildcardMatch([]byte(l.addr.host), []byte(a.host)) && l.addr.port == a.port
-}
-
-type keyDBLine struct {
-	cert     bool
-	matcher  matcher
-	knownKey KnownKey
-}
-
-func serialize(k ssh.PublicKey) string {
-	return k.Type() + " " + base64.StdEncoding.EncodeToString(k.Marshal())
-}
-
-func (l *keyDBLine) match(addrs []addr) bool {
-	return l.matcher.match(addrs)
-}
-
-type hostKeyDB struct {
-	// Serialized version of revoked keys
-	revoked map[string]*KnownKey
-	lines   []keyDBLine
-}
-
-func newHostKeyDB() *hostKeyDB {
-	db := &hostKeyDB{
-		revoked: make(map[string]*KnownKey),
-	}
-
-	return db
-}
-
-func keyEq(a, b ssh.PublicKey) bool {
-	return bytes.Equal(a.Marshal(), b.Marshal())
-}
-
-// IsAuthorityForHost can be used as a callback in ssh.CertChecker
-func (db *hostKeyDB) IsHostAuthority(remote ssh.PublicKey, address string) bool {
-	h, p, err := net.SplitHostPort(address)
-	if err != nil {
-		return false
-	}
-	a := addr{host: h, port: p}
-
-	for _, l := range db.lines {
-		if l.cert && keyEq(l.knownKey.Key, remote) && l.match([]addr{a}) {
-			return true
-		}
-	}
-	return false
-}
-
-// IsRevoked can be used as a callback in ssh.CertChecker
-func (db *hostKeyDB) IsRevoked(key *ssh.Certificate) bool {
-	_, ok := db.revoked[string(key.Marshal())]
-	return ok
-}
-
-const markerCert = "@cert-authority"
-const markerRevoked = "@revoked"
-
-func nextWord(line []byte) (string, []byte) {
-	i := bytes.IndexAny(line, "\t ")
-	if i == -1 {
-		return string(line), nil
-	}
-
-	return string(line[:i]), bytes.TrimSpace(line[i:])
-}
-
-func parseLine(line []byte) (marker, host string, key ssh.PublicKey, err error) {
-	if w, next := nextWord(line); w == markerCert || w == markerRevoked {
-		marker = w
-		line = next
-	}
-
-	host, line = nextWord(line)
-	if len(line) == 0 {
-		return "", "", nil, errors.New("knownhosts: missing host pattern")
-	}
-
-	// ignore the keytype as it's in the key blob anyway.
-	_, line = nextWord(line)
-	if len(line) == 0 {
-		return "", "", nil, errors.New("knownhosts: missing key type pattern")
-	}
-
-	keyBlob, _ := nextWord(line)
-
-	keyBytes, err := base64.StdEncoding.DecodeString(keyBlob)
-	if err != nil {
-		return "", "", nil, err
-	}
-	key, err = ssh.ParsePublicKey(keyBytes)
-	if err != nil {
-		return "", "", nil, err
-	}
-
-	return marker, host, key, nil
-}
-
-func (db *hostKeyDB) parseLine(line []byte, filename string, linenum int) error {
-	marker, pattern, key, err := parseLine(line)
-	if err != nil {
-		return err
-	}
-
-	if marker == markerRevoked {
-		db.revoked[string(key.Marshal())] = &KnownKey{
-			Key:      key,
-			Filename: filename,
-			Line:     linenum,
-		}
-
-		return nil
-	}
-
-	entry := keyDBLine{
-		cert: marker == markerCert,
-		knownKey: KnownKey{
-			Filename: filename,
-			Line:     linenum,
-			Key:      key,
-		},
-	}
-
-	if pattern[0] == '|' {
-		entry.matcher, err = newHashedHost(pattern)
-	} else {
-		entry.matcher, err = newHostnameMatcher(pattern)
-	}
-
-	if err != nil {
-		return err
-	}
-
-	db.lines = append(db.lines, entry)
-	return nil
-}
-
-func newHostnameMatcher(pattern string) (matcher, error) {
-	var hps hostPatterns
-	for _, p := range strings.Split(pattern, ",") {
-		if len(p) == 0 {
-			continue
-		}
-
-		var a addr
-		var negate bool
-		if p[0] == '!' {
-			negate = true
-			p = p[1:]
-		}
-
-		if len(p) == 0 {
-			return nil, errors.New("knownhosts: negation without following hostname")
-		}
-
-		var err error
-		if p[0] == '[' {
-			a.host, a.port, err = net.SplitHostPort(p)
-			if err != nil {
-				return nil, err
-			}
-		} else {
-			a.host, a.port, err = net.SplitHostPort(p)
-			if err != nil {
-				a.host = p
-				a.port = "22"
-			}
-		}
-		hps = append(hps, hostPattern{
-			negate: negate,
-			addr:   a,
-		})
-	}
-	return hps, nil
-}
-
-// KnownKey represents a key declared in a known_hosts file.
-type KnownKey struct {
-	Key      ssh.PublicKey
-	Filename string
-	Line     int
-}
-
-func (k *KnownKey) String() string {
-	return fmt.Sprintf("%s:%d: %s", k.Filename, k.Line, serialize(k.Key))
-}
-
-// KeyError is returned if we did not find the key in the host key
-// database, or there was a mismatch.  Typically, in batch
-// applications, this should be interpreted as failure. Interactive
-// applications can offer an interactive prompt to the user.
-type KeyError struct {
-	// Want holds the accepted host keys. For each key algorithm,
-	// there can be one hostkey.  If Want is empty, the host is
-	// unknown. If Want is non-empty, there was a mismatch, which
-	// can signify a MITM attack.
-	Want []KnownKey
-}
-
-func (u *KeyError) Error() string {
-	if len(u.Want) == 0 {
-		return "knownhosts: key is unknown"
-	}
-	return "knownhosts: key mismatch"
-}
-
-// RevokedError is returned if we found a key that was revoked.
-type RevokedError struct {
-	Revoked KnownKey
-}
-
-func (r *RevokedError) Error() string {
-	return "knownhosts: key is revoked"
-}
-
-// check checks a key against the host database. This should not be
-// used for verifying certificates.
-func (db *hostKeyDB) check(address string, remote net.Addr, remoteKey ssh.PublicKey) error {
-	if revoked := db.revoked[string(remoteKey.Marshal())]; revoked != nil {
-		return &RevokedError{Revoked: *revoked}
-	}
-
-	host, port, err := net.SplitHostPort(remote.String())
-	if err != nil {
-		return fmt.Errorf("knownhosts: SplitHostPort(%s): %v", remote, err)
-	}
-
-	addrs := []addr{
-		{host, port},
-	}
-
-	if address != "" {
-		host, port, err := net.SplitHostPort(address)
-		if err != nil {
-			return fmt.Errorf("knownhosts: SplitHostPort(%s): %v", address, err)
-		}
-
-		addrs = append(addrs, addr{host, port})
-	}
-
-	return db.checkAddrs(addrs, remoteKey)
-}
-
-// checkAddrs checks if we can find the given public key for any of
-// the given addresses.  If we only find an entry for the IP address,
-// or only the hostname, then this still succeeds.
-func (db *hostKeyDB) checkAddrs(addrs []addr, remoteKey ssh.PublicKey) error {
-	// TODO(hanwen): are these the right semantics? What if there
-	// is just a key for the IP address, but not for the
-	// hostname?
-
-	// Algorithm => key.
-	knownKeys := map[string]KnownKey{}
-	for _, l := range db.lines {
-		if l.match(addrs) {
-			typ := l.knownKey.Key.Type()
-			if _, ok := knownKeys[typ]; !ok {
-				knownKeys[typ] = l.knownKey
-			}
-		}
-	}
-
-	keyErr := &KeyError{}
-	for _, v := range knownKeys {
-		keyErr.Want = append(keyErr.Want, v)
-	}
-
-	// Unknown remote host.
-	if len(knownKeys) == 0 {
-		return keyErr
-	}
-
-	// If the remote host starts using a different, unknown key type, we
-	// also interpret that as a mismatch.
-	if known, ok := knownKeys[remoteKey.Type()]; !ok || !keyEq(known.Key, remoteKey) {
-		return keyErr
-	}
-
-	return nil
-}
-
-// The Read function parses file contents.
-func (db *hostKeyDB) Read(r io.Reader, filename string) error {
-	scanner := bufio.NewScanner(r)
-
-	lineNum := 0
-	for scanner.Scan() {
-		lineNum++
-		line := scanner.Bytes()
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 || line[0] == '#' {
-			continue
-		}
-
-		if err := db.parseLine(line, filename, lineNum); err != nil {
-			return fmt.Errorf("knownhosts: %s:%d: %v", filename, lineNum, err)
-		}
-	}
-	return scanner.Err()
-}
-
-// New creates a host key callback from the given OpenSSH host key
-// files. The returned callback is for use in
-// ssh.ClientConfig.HostKeyCallback. Hashed hostnames are not supported.
-func New(files ...string) (ssh.HostKeyCallback, error) {
-	db := newHostKeyDB()
-	for _, fn := range files {
-		f, err := os.Open(fn)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		if err := db.Read(f, fn); err != nil {
-			return nil, err
-		}
-	}
-
-	var certChecker ssh.CertChecker
-	certChecker.IsHostAuthority = db.IsHostAuthority
-	certChecker.IsRevoked = db.IsRevoked
-	certChecker.HostKeyFallback = db.check
-
-	return certChecker.CheckHostKey, nil
-}
-
-// Normalize normalizes an address into the form used in known_hosts
-func Normalize(address string) string {
-	host, port, err := net.SplitHostPort(address)
-	if err != nil {
-		host = address
-		port = "22"
-	}
-	entry := host
-	if port != "22" {
-		entry = "[" + entry + "]:" + port
-	} else if strings.Contains(host, ":") && !strings.HasPrefix(host, "[") {
-		entry = "[" + entry + "]"
-	}
-	return entry
-}
-
-// Line returns a line to add append to the known_hosts files.
-func Line(addresses []string, key ssh.PublicKey) string {
-	var trimmed []string
-	for _, a := range addresses {
-		trimmed = append(trimmed, Normalize(a))
-	}
-
-	return strings.Join(trimmed, ",") + " " + serialize(key)
-}
-
-// HashHostname hashes the given hostname. The hostname is not
-// normalized before hashing.
-func HashHostname(hostname string) string {
-	// TODO(hanwen): check if we can safely normalize this always.
-	salt := make([]byte, sha1.Size)
-
-	_, err := rand.Read(salt)
-	if err != nil {
-		panic(fmt.Sprintf("crypto/rand failure %v", err))
-	}
-
-	hash := hashHost(hostname, salt)
-	return encodeHash(sha1HashType, salt, hash)
-}
-
-func decodeHash(encoded string) (hashType string, salt, hash []byte, err error) {
-	if len(encoded) == 0 || encoded[0] != '|' {
-		err = errors.New("knownhosts: hashed host must start with '|'")
-		return
-	}
-	components := strings.Split(encoded, "|")
-	if len(components) != 4 {
-		err = fmt.Errorf("knownhosts: got %d components, want 3", len(components))
-		return
-	}
-
-	hashType = components[1]
-	if salt, err = base64.StdEncoding.DecodeString(components[2]); err != nil {
-		return
-	}
-	if hash, err = base64.StdEncoding.DecodeString(components[3]); err != nil {
-		return
-	}
-	return
-}
-
-func encodeHash(typ string, salt []byte, hash []byte) string {
-	return strings.Join([]string{"",
-		typ,
-		base64.StdEncoding.EncodeToString(salt),
-		base64.StdEncoding.EncodeToString(hash),
-	}, "|")
-}
-
-// See https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/hostfile.c#120
-func hashHost(hostname string, salt []byte) []byte {
-	mac := hmac.New(sha1.New, salt)
-	mac.Write([]byte(hostname))
-	return mac.Sum(nil)
-}
-
-type hashedHost struct {
-	salt []byte
-	hash []byte
-}
-
-const sha1HashType = "1"
-
-func newHashedHost(encoded string) (*hashedHost, error) {
-	typ, salt, hash, err := decodeHash(encoded)
-	if err != nil {
-		return nil, err
-	}
-
-	// The type field seems for future algorithm agility, but it's
-	// actually hardcoded in openssh currently, see
-	// https://android.googlesource.com/platform/external/openssh/+/ab28f5495c85297e7a597c1ba62e996416da7c7e/hostfile.c#120
-	if typ != sha1HashType {
-		return nil, fmt.Errorf("knownhosts: got hash type %s, must be '1'", typ)
-	}
-
-	return &hashedHost{salt: salt, hash: hash}, nil
-}
-
-func (h *hashedHost) match(addrs []addr) bool {
-	for _, a := range addrs {
-		if bytes.Equal(hashHost(Normalize(a.String()), h.salt), h.hash) {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts_test.go b/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts_test.go
deleted file mode 100644
index be7cc0e801..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/knownhosts/knownhosts_test.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package knownhosts
-
-import (
-	"bytes"
-	"fmt"
-	"net"
-	"reflect"
-	"testing"
-
-	"golang.org/x/crypto/ssh"
-)
-
-const edKeyStr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGBAarftlLeoyf+v+nVchEZII/vna2PCV8FaX4vsF5BX"
-const alternateEdKeyStr = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIXffBYeYL+WVzVru8npl5JHt2cjlr4ornFTWzoij9sx"
-const ecKeyStr = "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBNLCu01+wpXe3xB5olXCN4SqU2rQu0qjSRKJO4Bg+JRCPU+ENcgdA5srTU8xYDz/GEa4dzK5ldPw4J/gZgSXCMs="
-
-var ecKey, alternateEdKey, edKey ssh.PublicKey
-var testAddr = &net.TCPAddr{
-	IP:   net.IP{198, 41, 30, 196},
-	Port: 22,
-}
-
-var testAddr6 = &net.TCPAddr{
-	IP: net.IP{198, 41, 30, 196,
-		1, 2, 3, 4,
-		1, 2, 3, 4,
-		1, 2, 3, 4,
-	},
-	Port: 22,
-}
-
-func init() {
-	var err error
-	ecKey, _, _, _, err = ssh.ParseAuthorizedKey([]byte(ecKeyStr))
-	if err != nil {
-		panic(err)
-	}
-	edKey, _, _, _, err = ssh.ParseAuthorizedKey([]byte(edKeyStr))
-	if err != nil {
-		panic(err)
-	}
-	alternateEdKey, _, _, _, err = ssh.ParseAuthorizedKey([]byte(alternateEdKeyStr))
-	if err != nil {
-		panic(err)
-	}
-}
-
-func testDB(t *testing.T, s string) *hostKeyDB {
-	db := newHostKeyDB()
-	if err := db.Read(bytes.NewBufferString(s), "testdb"); err != nil {
-		t.Fatalf("Read: %v", err)
-	}
-
-	return db
-}
-
-func TestRevoked(t *testing.T) {
-	db := testDB(t, "\n\n@revoked * "+edKeyStr+"\n")
-	want := &RevokedError{
-		Revoked: KnownKey{
-			Key:      edKey,
-			Filename: "testdb",
-			Line:     3,
-		},
-	}
-	if err := db.check("", &net.TCPAddr{
-		Port: 42,
-	}, edKey); err == nil {
-		t.Fatal("no error for revoked key")
-	} else if !reflect.DeepEqual(want, err) {
-		t.Fatalf("got %#v, want %#v", want, err)
-	}
-}
-
-func TestHostAuthority(t *testing.T) {
-	for _, m := range []struct {
-		authorityFor string
-		address      string
-
-		good bool
-	}{
-		{authorityFor: "localhost", address: "localhost:22", good: true},
-		{authorityFor: "localhost", address: "localhost", good: false},
-		{authorityFor: "localhost", address: "localhost:1234", good: false},
-		{authorityFor: "[localhost]:1234", address: "localhost:1234", good: true},
-		{authorityFor: "[localhost]:1234", address: "localhost:22", good: false},
-		{authorityFor: "[localhost]:1234", address: "localhost", good: false},
-	} {
-		db := testDB(t, `@cert-authority `+m.authorityFor+` `+edKeyStr)
-		if ok := db.IsHostAuthority(db.lines[0].knownKey.Key, m.address); ok != m.good {
-			t.Errorf("IsHostAuthority: authority %s, address %s, wanted good = %v, got good = %v",
-				m.authorityFor, m.address, m.good, ok)
-		}
-	}
-}
-
-func TestBracket(t *testing.T) {
-	db := testDB(t, `[git.eclipse.org]:29418,[198.41.30.196]:29418 `+edKeyStr)
-
-	if err := db.check("git.eclipse.org:29418", &net.TCPAddr{
-		IP:   net.IP{198, 41, 30, 196},
-		Port: 29418,
-	}, edKey); err != nil {
-		t.Errorf("got error %v, want none", err)
-	}
-
-	if err := db.check("git.eclipse.org:29419", &net.TCPAddr{
-		Port: 42,
-	}, edKey); err == nil {
-		t.Fatalf("no error for unknown address")
-	} else if ke, ok := err.(*KeyError); !ok {
-		t.Fatalf("got type %T, want *KeyError", err)
-	} else if len(ke.Want) > 0 {
-		t.Fatalf("got Want %v, want []", ke.Want)
-	}
-}
-
-func TestNewKeyType(t *testing.T) {
-	str := fmt.Sprintf("%s %s", testAddr, edKeyStr)
-	db := testDB(t, str)
-	if err := db.check("", testAddr, ecKey); err == nil {
-		t.Fatalf("no error for unknown address")
-	} else if ke, ok := err.(*KeyError); !ok {
-		t.Fatalf("got type %T, want *KeyError", err)
-	} else if len(ke.Want) == 0 {
-		t.Fatalf("got empty KeyError.Want")
-	}
-}
-
-func TestSameKeyType(t *testing.T) {
-	str := fmt.Sprintf("%s %s", testAddr, edKeyStr)
-	db := testDB(t, str)
-	if err := db.check("", testAddr, alternateEdKey); err == nil {
-		t.Fatalf("no error for unknown address")
-	} else if ke, ok := err.(*KeyError); !ok {
-		t.Fatalf("got type %T, want *KeyError", err)
-	} else if len(ke.Want) == 0 {
-		t.Fatalf("got empty KeyError.Want")
-	} else if got, want := ke.Want[0].Key.Marshal(), edKey.Marshal(); !bytes.Equal(got, want) {
-		t.Fatalf("got key %q, want %q", got, want)
-	}
-}
-
-func TestIPAddress(t *testing.T) {
-	str := fmt.Sprintf("%s %s", testAddr, edKeyStr)
-	db := testDB(t, str)
-	if err := db.check("", testAddr, edKey); err != nil {
-		t.Errorf("got error %q, want none", err)
-	}
-}
-
-func TestIPv6Address(t *testing.T) {
-	str := fmt.Sprintf("%s %s", testAddr6, edKeyStr)
-	db := testDB(t, str)
-
-	if err := db.check("", testAddr6, edKey); err != nil {
-		t.Errorf("got error %q, want none", err)
-	}
-}
-
-func TestBasic(t *testing.T) {
-	str := fmt.Sprintf("#comment\n\nserver.org,%s %s\notherhost %s", testAddr, edKeyStr, ecKeyStr)
-	db := testDB(t, str)
-	if err := db.check("server.org:22", testAddr, edKey); err != nil {
-		t.Errorf("got error %q, want none", err)
-	}
-
-	want := KnownKey{
-		Key:      edKey,
-		Filename: "testdb",
-		Line:     3,
-	}
-	if err := db.check("server.org:22", testAddr, ecKey); err == nil {
-		t.Errorf("succeeded, want KeyError")
-	} else if ke, ok := err.(*KeyError); !ok {
-		t.Errorf("got %T, want *KeyError", err)
-	} else if len(ke.Want) != 1 {
-		t.Errorf("got %v, want 1 entry", ke)
-	} else if !reflect.DeepEqual(ke.Want[0], want) {
-		t.Errorf("got %v, want %v", ke.Want[0], want)
-	}
-}
-
-func TestNegate(t *testing.T) {
-	str := fmt.Sprintf("%s,!server.org %s", testAddr, edKeyStr)
-	db := testDB(t, str)
-	if err := db.check("server.org:22", testAddr, ecKey); err == nil {
-		t.Errorf("succeeded")
-	} else if ke, ok := err.(*KeyError); !ok {
-		t.Errorf("got error type %T, want *KeyError", err)
-	} else if len(ke.Want) != 0 {
-		t.Errorf("got expected keys %d (first of type %s), want []", len(ke.Want), ke.Want[0].Key.Type())
-	}
-}
-
-func TestWildcard(t *testing.T) {
-	str := fmt.Sprintf("server*.domain %s", edKeyStr)
-	db := testDB(t, str)
-
-	want := &KeyError{
-		Want: []KnownKey{{
-			Filename: "testdb",
-			Line:     1,
-			Key:      edKey,
-		}},
-	}
-
-	got := db.check("server.domain:22", &net.TCPAddr{}, ecKey)
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("got %s, want %s", got, want)
-	}
-}
-
-func TestLine(t *testing.T) {
-	for in, want := range map[string]string{
-		"server.org":                             "server.org " + edKeyStr,
-		"server.org:22":                          "server.org " + edKeyStr,
-		"server.org:23":                          "[server.org]:23 " + edKeyStr,
-		"[c629:1ec4:102:304:102:304:102:304]:22": "[c629:1ec4:102:304:102:304:102:304] " + edKeyStr,
-		"[c629:1ec4:102:304:102:304:102:304]:23": "[c629:1ec4:102:304:102:304:102:304]:23 " + edKeyStr,
-	} {
-		if got := Line([]string{in}, edKey); got != want {
-			t.Errorf("Line(%q) = %q, want %q", in, got, want)
-		}
-	}
-}
-
-func TestWildcardMatch(t *testing.T) {
-	for _, c := range []struct {
-		pat, str string
-		want     bool
-	}{
-		{"a?b", "abb", true},
-		{"ab", "abc", false},
-		{"abc", "ab", false},
-		{"a*b", "axxxb", true},
-		{"a*b", "axbxb", true},
-		{"a*b", "axbxbc", false},
-		{"a*?", "axbxc", true},
-		{"a*b*", "axxbxxxxxx", true},
-		{"a*b*c", "axxbxxxxxxc", true},
-		{"a*b*?", "axxbxxxxxxc", true},
-		{"a*b*z", "axxbxxbxxxz", true},
-		{"a*b*z", "axxbxxzxxxz", true},
-		{"a*b*z", "axxbxxzxxx", false},
-	} {
-		got := wildcardMatch([]byte(c.pat), []byte(c.str))
-		if got != c.want {
-			t.Errorf("wildcardMatch(%q, %q) = %v, want %v", c.pat, c.str, got, c.want)
-		}
-
-	}
-}
-
-// TODO(hanwen): test coverage for certificates.
-
-const testHostname = "hostname"
-
-// generated with keygen -H -f
-const encodedTestHostnameHash = "|1|IHXZvQMvTcZTUU29+2vXFgx8Frs=|UGccIWfRVDwilMBnA3WJoRAC75Y="
-
-func TestHostHash(t *testing.T) {
-	testHostHash(t, testHostname, encodedTestHostnameHash)
-}
-
-func TestHashList(t *testing.T) {
-	encoded := HashHostname(testHostname)
-	testHostHash(t, testHostname, encoded)
-}
-
-func testHostHash(t *testing.T, hostname, encoded string) {
-	typ, salt, hash, err := decodeHash(encoded)
-	if err != nil {
-		t.Fatalf("decodeHash: %v", err)
-	}
-
-	if got := encodeHash(typ, salt, hash); got != encoded {
-		t.Errorf("got encoding %s want %s", got, encoded)
-	}
-
-	if typ != sha1HashType {
-		t.Fatalf("got hash type %q, want %q", typ, sha1HashType)
-	}
-
-	got := hashHost(hostname, salt)
-	if !bytes.Equal(got, hash) {
-		t.Errorf("got hash %x want %x", got, hash)
-	}
-}
-
-func TestNormalize(t *testing.T) {
-	for in, want := range map[string]string{
-		"127.0.0.1:22":             "127.0.0.1",
-		"[127.0.0.1]:22":           "127.0.0.1",
-		"[127.0.0.1]:23":           "[127.0.0.1]:23",
-		"127.0.0.1:23":             "[127.0.0.1]:23",
-		"[a.b.c]:22":               "a.b.c",
-		"[abcd:abcd:abcd:abcd]":    "[abcd:abcd:abcd:abcd]",
-		"[abcd:abcd:abcd:abcd]:22": "[abcd:abcd:abcd:abcd]",
-		"[abcd:abcd:abcd:abcd]:23": "[abcd:abcd:abcd:abcd]:23",
-	} {
-		got := Normalize(in)
-		if got != want {
-			t.Errorf("Normalize(%q) = %q, want %q", in, got, want)
-		}
-	}
-}
-
-func TestHashedHostkeyCheck(t *testing.T) {
-	str := fmt.Sprintf("%s %s", HashHostname(testHostname), edKeyStr)
-	db := testDB(t, str)
-	if err := db.check(testHostname+":22", testAddr, edKey); err != nil {
-		t.Errorf("check(%s): %v", testHostname, err)
-	}
-	want := &KeyError{
-		Want: []KnownKey{{
-			Filename: "testdb",
-			Line:     1,
-			Key:      edKey,
-		}},
-	}
-	if got := db.check(testHostname+":22", testAddr, alternateEdKey); !reflect.DeepEqual(got, want) {
-		t.Errorf("got error %v, want %v", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/mac.go b/installer/vendor/golang.org/x/crypto/ssh/mac.go
deleted file mode 100644
index c07a06285e..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/mac.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Message authentication support
-
-import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"crypto/sha256"
-	"hash"
-)
-
-type macMode struct {
-	keySize int
-	etm     bool
-	new     func(key []byte) hash.Hash
-}
-
-// truncatingMAC wraps around a hash.Hash and truncates the output digest to
-// a given size.
-type truncatingMAC struct {
-	length int
-	hmac   hash.Hash
-}
-
-func (t truncatingMAC) Write(data []byte) (int, error) {
-	return t.hmac.Write(data)
-}
-
-func (t truncatingMAC) Sum(in []byte) []byte {
-	out := t.hmac.Sum(in)
-	return out[:len(in)+t.length]
-}
-
-func (t truncatingMAC) Reset() {
-	t.hmac.Reset()
-}
-
-func (t truncatingMAC) Size() int {
-	return t.length
-}
-
-func (t truncatingMAC) BlockSize() int { return t.hmac.BlockSize() }
-
-var macModes = map[string]*macMode{
-	"hmac-sha2-256-etm@openssh.com": {32, true, func(key []byte) hash.Hash {
-		return hmac.New(sha256.New, key)
-	}},
-	"hmac-sha2-256": {32, false, func(key []byte) hash.Hash {
-		return hmac.New(sha256.New, key)
-	}},
-	"hmac-sha1": {20, false, func(key []byte) hash.Hash {
-		return hmac.New(sha1.New, key)
-	}},
-	"hmac-sha1-96": {20, false, func(key []byte) hash.Hash {
-		return truncatingMAC{12, hmac.New(sha1.New, key)}
-	}},
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/mempipe_test.go b/installer/vendor/golang.org/x/crypto/ssh/mempipe_test.go
deleted file mode 100644
index 8697cd6140..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/mempipe_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"io"
-	"sync"
-	"testing"
-)
-
-// An in-memory packetConn. It is safe to call Close and writePacket
-// from different goroutines.
-type memTransport struct {
-	eof     bool
-	pending [][]byte
-	write   *memTransport
-	sync.Mutex
-	*sync.Cond
-}
-
-func (t *memTransport) readPacket() ([]byte, error) {
-	t.Lock()
-	defer t.Unlock()
-	for {
-		if len(t.pending) > 0 {
-			r := t.pending[0]
-			t.pending = t.pending[1:]
-			return r, nil
-		}
-		if t.eof {
-			return nil, io.EOF
-		}
-		t.Cond.Wait()
-	}
-}
-
-func (t *memTransport) closeSelf() error {
-	t.Lock()
-	defer t.Unlock()
-	if t.eof {
-		return io.EOF
-	}
-	t.eof = true
-	t.Cond.Broadcast()
-	return nil
-}
-
-func (t *memTransport) Close() error {
-	err := t.write.closeSelf()
-	t.closeSelf()
-	return err
-}
-
-func (t *memTransport) writePacket(p []byte) error {
-	t.write.Lock()
-	defer t.write.Unlock()
-	if t.write.eof {
-		return io.EOF
-	}
-	c := make([]byte, len(p))
-	copy(c, p)
-	t.write.pending = append(t.write.pending, c)
-	t.write.Cond.Signal()
-	return nil
-}
-
-func memPipe() (a, b packetConn) {
-	t1 := memTransport{}
-	t2 := memTransport{}
-	t1.write = &t2
-	t2.write = &t1
-	t1.Cond = sync.NewCond(&t1.Mutex)
-	t2.Cond = sync.NewCond(&t2.Mutex)
-	return &t1, &t2
-}
-
-func TestMemPipe(t *testing.T) {
-	a, b := memPipe()
-	if err := a.writePacket([]byte{42}); err != nil {
-		t.Fatalf("writePacket: %v", err)
-	}
-	if err := a.Close(); err != nil {
-		t.Fatal("Close: ", err)
-	}
-	p, err := b.readPacket()
-	if err != nil {
-		t.Fatal("readPacket: ", err)
-	}
-	if len(p) != 1 || p[0] != 42 {
-		t.Fatalf("got %v, want {42}", p)
-	}
-	p, err = b.readPacket()
-	if err != io.EOF {
-		t.Fatalf("got %v, %v, want EOF", p, err)
-	}
-}
-
-func TestDoubleClose(t *testing.T) {
-	a, _ := memPipe()
-	err := a.Close()
-	if err != nil {
-		t.Errorf("Close: %v", err)
-	}
-	err = a.Close()
-	if err != io.EOF {
-		t.Errorf("expect EOF on double close.")
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/messages.go b/installer/vendor/golang.org/x/crypto/ssh/messages.go
deleted file mode 100644
index e6ecd3afa5..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/messages.go
+++ /dev/null
@@ -1,758 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"math/big"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-// These are SSH message type numbers. They are scattered around several
-// documents but many were taken from [SSH-PARAMETERS].
-const (
-	msgIgnore        = 2
-	msgUnimplemented = 3
-	msgDebug         = 4
-	msgNewKeys       = 21
-
-	// Standard authentication messages
-	msgUserAuthSuccess = 52
-	msgUserAuthBanner  = 53
-)
-
-// SSH messages:
-//
-// These structures mirror the wire format of the corresponding SSH messages.
-// They are marshaled using reflection with the marshal and unmarshal functions
-// in this file. The only wrinkle is that a final member of type []byte with a
-// ssh tag of "rest" receives the remainder of a packet when unmarshaling.
-
-// See RFC 4253, section 11.1.
-const msgDisconnect = 1
-
-// disconnectMsg is the message that signals a disconnect. It is also
-// the error type returned from mux.Wait()
-type disconnectMsg struct {
-	Reason   uint32 `sshtype:"1"`
-	Message  string
-	Language string
-}
-
-func (d *disconnectMsg) Error() string {
-	return fmt.Sprintf("ssh: disconnect, reason %d: %s", d.Reason, d.Message)
-}
-
-// See RFC 4253, section 7.1.
-const msgKexInit = 20
-
-type kexInitMsg struct {
-	Cookie                  [16]byte `sshtype:"20"`
-	KexAlgos                []string
-	ServerHostKeyAlgos      []string
-	CiphersClientServer     []string
-	CiphersServerClient     []string
-	MACsClientServer        []string
-	MACsServerClient        []string
-	CompressionClientServer []string
-	CompressionServerClient []string
-	LanguagesClientServer   []string
-	LanguagesServerClient   []string
-	FirstKexFollows         bool
-	Reserved                uint32
-}
-
-// See RFC 4253, section 8.
-
-// Diffie-Helman
-const msgKexDHInit = 30
-
-type kexDHInitMsg struct {
-	X *big.Int `sshtype:"30"`
-}
-
-const msgKexECDHInit = 30
-
-type kexECDHInitMsg struct {
-	ClientPubKey []byte `sshtype:"30"`
-}
-
-const msgKexECDHReply = 31
-
-type kexECDHReplyMsg struct {
-	HostKey         []byte `sshtype:"31"`
-	EphemeralPubKey []byte
-	Signature       []byte
-}
-
-const msgKexDHReply = 31
-
-type kexDHReplyMsg struct {
-	HostKey   []byte `sshtype:"31"`
-	Y         *big.Int
-	Signature []byte
-}
-
-// See RFC 4253, section 10.
-const msgServiceRequest = 5
-
-type serviceRequestMsg struct {
-	Service string `sshtype:"5"`
-}
-
-// See RFC 4253, section 10.
-const msgServiceAccept = 6
-
-type serviceAcceptMsg struct {
-	Service string `sshtype:"6"`
-}
-
-// See RFC 4252, section 5.
-const msgUserAuthRequest = 50
-
-type userAuthRequestMsg struct {
-	User    string `sshtype:"50"`
-	Service string
-	Method  string
-	Payload []byte `ssh:"rest"`
-}
-
-// Used for debug printouts of packets.
-type userAuthSuccessMsg struct {
-}
-
-// See RFC 4252, section 5.1
-const msgUserAuthFailure = 51
-
-type userAuthFailureMsg struct {
-	Methods        []string `sshtype:"51"`
-	PartialSuccess bool
-}
-
-// See RFC 4256, section 3.2
-const msgUserAuthInfoRequest = 60
-const msgUserAuthInfoResponse = 61
-
-type userAuthInfoRequestMsg struct {
-	User               string `sshtype:"60"`
-	Instruction        string
-	DeprecatedLanguage string
-	NumPrompts         uint32
-	Prompts            []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpen = 90
-
-type channelOpenMsg struct {
-	ChanType         string `sshtype:"90"`
-	PeersId          uint32
-	PeersWindow      uint32
-	MaxPacketSize    uint32
-	TypeSpecificData []byte `ssh:"rest"`
-}
-
-const msgChannelExtendedData = 95
-const msgChannelData = 94
-
-// Used for debug print outs of packets.
-type channelDataMsg struct {
-	PeersId uint32 `sshtype:"94"`
-	Length  uint32
-	Rest    []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpenConfirm = 91
-
-type channelOpenConfirmMsg struct {
-	PeersId          uint32 `sshtype:"91"`
-	MyId             uint32
-	MyWindow         uint32
-	MaxPacketSize    uint32
-	TypeSpecificData []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.1.
-const msgChannelOpenFailure = 92
-
-type channelOpenFailureMsg struct {
-	PeersId  uint32 `sshtype:"92"`
-	Reason   RejectionReason
-	Message  string
-	Language string
-}
-
-const msgChannelRequest = 98
-
-type channelRequestMsg struct {
-	PeersId             uint32 `sshtype:"98"`
-	Request             string
-	WantReply           bool
-	RequestSpecificData []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 5.4.
-const msgChannelSuccess = 99
-
-type channelRequestSuccessMsg struct {
-	PeersId uint32 `sshtype:"99"`
-}
-
-// See RFC 4254, section 5.4.
-const msgChannelFailure = 100
-
-type channelRequestFailureMsg struct {
-	PeersId uint32 `sshtype:"100"`
-}
-
-// See RFC 4254, section 5.3
-const msgChannelClose = 97
-
-type channelCloseMsg struct {
-	PeersId uint32 `sshtype:"97"`
-}
-
-// See RFC 4254, section 5.3
-const msgChannelEOF = 96
-
-type channelEOFMsg struct {
-	PeersId uint32 `sshtype:"96"`
-}
-
-// See RFC 4254, section 4
-const msgGlobalRequest = 80
-
-type globalRequestMsg struct {
-	Type      string `sshtype:"80"`
-	WantReply bool
-	Data      []byte `ssh:"rest"`
-}
-
-// See RFC 4254, section 4
-const msgRequestSuccess = 81
-
-type globalRequestSuccessMsg struct {
-	Data []byte `ssh:"rest" sshtype:"81"`
-}
-
-// See RFC 4254, section 4
-const msgRequestFailure = 82
-
-type globalRequestFailureMsg struct {
-	Data []byte `ssh:"rest" sshtype:"82"`
-}
-
-// See RFC 4254, section 5.2
-const msgChannelWindowAdjust = 93
-
-type windowAdjustMsg struct {
-	PeersId         uint32 `sshtype:"93"`
-	AdditionalBytes uint32
-}
-
-// See RFC 4252, section 7
-const msgUserAuthPubKeyOk = 60
-
-type userAuthPubKeyOkMsg struct {
-	Algo   string `sshtype:"60"`
-	PubKey []byte
-}
-
-// typeTags returns the possible type bytes for the given reflect.Type, which
-// should be a struct. The possible values are separated by a '|' character.
-func typeTags(structType reflect.Type) (tags []byte) {
-	tagStr := structType.Field(0).Tag.Get("sshtype")
-
-	for _, tag := range strings.Split(tagStr, "|") {
-		i, err := strconv.Atoi(tag)
-		if err == nil {
-			tags = append(tags, byte(i))
-		}
-	}
-
-	return tags
-}
-
-func fieldError(t reflect.Type, field int, problem string) error {
-	if problem != "" {
-		problem = ": " + problem
-	}
-	return fmt.Errorf("ssh: unmarshal error for field %s of type %s%s", t.Field(field).Name, t.Name(), problem)
-}
-
-var errShortRead = errors.New("ssh: short read")
-
-// Unmarshal parses data in SSH wire format into a structure. The out
-// argument should be a pointer to struct. If the first member of the
-// struct has the "sshtype" tag set to a '|'-separated set of numbers
-// in decimal, the packet must start with one of those numbers. In
-// case of error, Unmarshal returns a ParseError or
-// UnexpectedMessageError.
-func Unmarshal(data []byte, out interface{}) error {
-	v := reflect.ValueOf(out).Elem()
-	structType := v.Type()
-	expectedTypes := typeTags(structType)
-
-	var expectedType byte
-	if len(expectedTypes) > 0 {
-		expectedType = expectedTypes[0]
-	}
-
-	if len(data) == 0 {
-		return parseError(expectedType)
-	}
-
-	if len(expectedTypes) > 0 {
-		goodType := false
-		for _, e := range expectedTypes {
-			if e > 0 && data[0] == e {
-				goodType = true
-				break
-			}
-		}
-		if !goodType {
-			return fmt.Errorf("ssh: unexpected message type %d (expected one of %v)", data[0], expectedTypes)
-		}
-		data = data[1:]
-	}
-
-	var ok bool
-	for i := 0; i < v.NumField(); i++ {
-		field := v.Field(i)
-		t := field.Type()
-		switch t.Kind() {
-		case reflect.Bool:
-			if len(data) < 1 {
-				return errShortRead
-			}
-			field.SetBool(data[0] != 0)
-			data = data[1:]
-		case reflect.Array:
-			if t.Elem().Kind() != reflect.Uint8 {
-				return fieldError(structType, i, "array of unsupported type")
-			}
-			if len(data) < t.Len() {
-				return errShortRead
-			}
-			for j, n := 0, t.Len(); j < n; j++ {
-				field.Index(j).Set(reflect.ValueOf(data[j]))
-			}
-			data = data[t.Len():]
-		case reflect.Uint64:
-			var u64 uint64
-			if u64, data, ok = parseUint64(data); !ok {
-				return errShortRead
-			}
-			field.SetUint(u64)
-		case reflect.Uint32:
-			var u32 uint32
-			if u32, data, ok = parseUint32(data); !ok {
-				return errShortRead
-			}
-			field.SetUint(uint64(u32))
-		case reflect.Uint8:
-			if len(data) < 1 {
-				return errShortRead
-			}
-			field.SetUint(uint64(data[0]))
-			data = data[1:]
-		case reflect.String:
-			var s []byte
-			if s, data, ok = parseString(data); !ok {
-				return fieldError(structType, i, "")
-			}
-			field.SetString(string(s))
-		case reflect.Slice:
-			switch t.Elem().Kind() {
-			case reflect.Uint8:
-				if structType.Field(i).Tag.Get("ssh") == "rest" {
-					field.Set(reflect.ValueOf(data))
-					data = nil
-				} else {
-					var s []byte
-					if s, data, ok = parseString(data); !ok {
-						return errShortRead
-					}
-					field.Set(reflect.ValueOf(s))
-				}
-			case reflect.String:
-				var nl []string
-				if nl, data, ok = parseNameList(data); !ok {
-					return errShortRead
-				}
-				field.Set(reflect.ValueOf(nl))
-			default:
-				return fieldError(structType, i, "slice of unsupported type")
-			}
-		case reflect.Ptr:
-			if t == bigIntType {
-				var n *big.Int
-				if n, data, ok = parseInt(data); !ok {
-					return errShortRead
-				}
-				field.Set(reflect.ValueOf(n))
-			} else {
-				return fieldError(structType, i, "pointer to unsupported type")
-			}
-		default:
-			return fieldError(structType, i, fmt.Sprintf("unsupported type: %v", t))
-		}
-	}
-
-	if len(data) != 0 {
-		return parseError(expectedType)
-	}
-
-	return nil
-}
-
-// Marshal serializes the message in msg to SSH wire format.  The msg
-// argument should be a struct or pointer to struct. If the first
-// member has the "sshtype" tag set to a number in decimal, that
-// number is prepended to the result. If the last of member has the
-// "ssh" tag set to "rest", its contents are appended to the output.
-func Marshal(msg interface{}) []byte {
-	out := make([]byte, 0, 64)
-	return marshalStruct(out, msg)
-}
-
-func marshalStruct(out []byte, msg interface{}) []byte {
-	v := reflect.Indirect(reflect.ValueOf(msg))
-	msgTypes := typeTags(v.Type())
-	if len(msgTypes) > 0 {
-		out = append(out, msgTypes[0])
-	}
-
-	for i, n := 0, v.NumField(); i < n; i++ {
-		field := v.Field(i)
-		switch t := field.Type(); t.Kind() {
-		case reflect.Bool:
-			var v uint8
-			if field.Bool() {
-				v = 1
-			}
-			out = append(out, v)
-		case reflect.Array:
-			if t.Elem().Kind() != reflect.Uint8 {
-				panic(fmt.Sprintf("array of non-uint8 in field %d: %T", i, field.Interface()))
-			}
-			for j, l := 0, t.Len(); j < l; j++ {
-				out = append(out, uint8(field.Index(j).Uint()))
-			}
-		case reflect.Uint32:
-			out = appendU32(out, uint32(field.Uint()))
-		case reflect.Uint64:
-			out = appendU64(out, uint64(field.Uint()))
-		case reflect.Uint8:
-			out = append(out, uint8(field.Uint()))
-		case reflect.String:
-			s := field.String()
-			out = appendInt(out, len(s))
-			out = append(out, s...)
-		case reflect.Slice:
-			switch t.Elem().Kind() {
-			case reflect.Uint8:
-				if v.Type().Field(i).Tag.Get("ssh") != "rest" {
-					out = appendInt(out, field.Len())
-				}
-				out = append(out, field.Bytes()...)
-			case reflect.String:
-				offset := len(out)
-				out = appendU32(out, 0)
-				if n := field.Len(); n > 0 {
-					for j := 0; j < n; j++ {
-						f := field.Index(j)
-						if j != 0 {
-							out = append(out, ',')
-						}
-						out = append(out, f.String()...)
-					}
-					// overwrite length value
-					binary.BigEndian.PutUint32(out[offset:], uint32(len(out)-offset-4))
-				}
-			default:
-				panic(fmt.Sprintf("slice of unknown type in field %d: %T", i, field.Interface()))
-			}
-		case reflect.Ptr:
-			if t == bigIntType {
-				var n *big.Int
-				nValue := reflect.ValueOf(&n)
-				nValue.Elem().Set(field)
-				needed := intLength(n)
-				oldLength := len(out)
-
-				if cap(out)-len(out) < needed {
-					newOut := make([]byte, len(out), 2*(len(out)+needed))
-					copy(newOut, out)
-					out = newOut
-				}
-				out = out[:oldLength+needed]
-				marshalInt(out[oldLength:], n)
-			} else {
-				panic(fmt.Sprintf("pointer to unknown type in field %d: %T", i, field.Interface()))
-			}
-		}
-	}
-
-	return out
-}
-
-var bigOne = big.NewInt(1)
-
-func parseString(in []byte) (out, rest []byte, ok bool) {
-	if len(in) < 4 {
-		return
-	}
-	length := binary.BigEndian.Uint32(in)
-	in = in[4:]
-	if uint32(len(in)) < length {
-		return
-	}
-	out = in[:length]
-	rest = in[length:]
-	ok = true
-	return
-}
-
-var (
-	comma         = []byte{','}
-	emptyNameList = []string{}
-)
-
-func parseNameList(in []byte) (out []string, rest []byte, ok bool) {
-	contents, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-	if len(contents) == 0 {
-		out = emptyNameList
-		return
-	}
-	parts := bytes.Split(contents, comma)
-	out = make([]string, len(parts))
-	for i, part := range parts {
-		out[i] = string(part)
-	}
-	return
-}
-
-func parseInt(in []byte) (out *big.Int, rest []byte, ok bool) {
-	contents, rest, ok := parseString(in)
-	if !ok {
-		return
-	}
-	out = new(big.Int)
-
-	if len(contents) > 0 && contents[0]&0x80 == 0x80 {
-		// This is a negative number
-		notBytes := make([]byte, len(contents))
-		for i := range notBytes {
-			notBytes[i] = ^contents[i]
-		}
-		out.SetBytes(notBytes)
-		out.Add(out, bigOne)
-		out.Neg(out)
-	} else {
-		// Positive number
-		out.SetBytes(contents)
-	}
-	ok = true
-	return
-}
-
-func parseUint32(in []byte) (uint32, []byte, bool) {
-	if len(in) < 4 {
-		return 0, nil, false
-	}
-	return binary.BigEndian.Uint32(in), in[4:], true
-}
-
-func parseUint64(in []byte) (uint64, []byte, bool) {
-	if len(in) < 8 {
-		return 0, nil, false
-	}
-	return binary.BigEndian.Uint64(in), in[8:], true
-}
-
-func intLength(n *big.Int) int {
-	length := 4 /* length bytes */
-	if n.Sign() < 0 {
-		nMinus1 := new(big.Int).Neg(n)
-		nMinus1.Sub(nMinus1, bigOne)
-		bitLen := nMinus1.BitLen()
-		if bitLen%8 == 0 {
-			// The number will need 0xff padding
-			length++
-		}
-		length += (bitLen + 7) / 8
-	} else if n.Sign() == 0 {
-		// A zero is the zero length string
-	} else {
-		bitLen := n.BitLen()
-		if bitLen%8 == 0 {
-			// The number will need 0x00 padding
-			length++
-		}
-		length += (bitLen + 7) / 8
-	}
-
-	return length
-}
-
-func marshalUint32(to []byte, n uint32) []byte {
-	binary.BigEndian.PutUint32(to, n)
-	return to[4:]
-}
-
-func marshalUint64(to []byte, n uint64) []byte {
-	binary.BigEndian.PutUint64(to, n)
-	return to[8:]
-}
-
-func marshalInt(to []byte, n *big.Int) []byte {
-	lengthBytes := to
-	to = to[4:]
-	length := 0
-
-	if n.Sign() < 0 {
-		// A negative number has to be converted to two's-complement
-		// form. So we'll subtract 1 and invert. If the
-		// most-significant-bit isn't set then we'll need to pad the
-		// beginning with 0xff in order to keep the number negative.
-		nMinus1 := new(big.Int).Neg(n)
-		nMinus1.Sub(nMinus1, bigOne)
-		bytes := nMinus1.Bytes()
-		for i := range bytes {
-			bytes[i] ^= 0xff
-		}
-		if len(bytes) == 0 || bytes[0]&0x80 == 0 {
-			to[0] = 0xff
-			to = to[1:]
-			length++
-		}
-		nBytes := copy(to, bytes)
-		to = to[nBytes:]
-		length += nBytes
-	} else if n.Sign() == 0 {
-		// A zero is the zero length string
-	} else {
-		bytes := n.Bytes()
-		if len(bytes) > 0 && bytes[0]&0x80 != 0 {
-			// We'll have to pad this with a 0x00 in order to
-			// stop it looking like a negative number.
-			to[0] = 0
-			to = to[1:]
-			length++
-		}
-		nBytes := copy(to, bytes)
-		to = to[nBytes:]
-		length += nBytes
-	}
-
-	lengthBytes[0] = byte(length >> 24)
-	lengthBytes[1] = byte(length >> 16)
-	lengthBytes[2] = byte(length >> 8)
-	lengthBytes[3] = byte(length)
-	return to
-}
-
-func writeInt(w io.Writer, n *big.Int) {
-	length := intLength(n)
-	buf := make([]byte, length)
-	marshalInt(buf, n)
-	w.Write(buf)
-}
-
-func writeString(w io.Writer, s []byte) {
-	var lengthBytes [4]byte
-	lengthBytes[0] = byte(len(s) >> 24)
-	lengthBytes[1] = byte(len(s) >> 16)
-	lengthBytes[2] = byte(len(s) >> 8)
-	lengthBytes[3] = byte(len(s))
-	w.Write(lengthBytes[:])
-	w.Write(s)
-}
-
-func stringLength(n int) int {
-	return 4 + n
-}
-
-func marshalString(to []byte, s []byte) []byte {
-	to[0] = byte(len(s) >> 24)
-	to[1] = byte(len(s) >> 16)
-	to[2] = byte(len(s) >> 8)
-	to[3] = byte(len(s))
-	to = to[4:]
-	copy(to, s)
-	return to[len(s):]
-}
-
-var bigIntType = reflect.TypeOf((*big.Int)(nil))
-
-// Decode a packet into its corresponding message.
-func decode(packet []byte) (interface{}, error) {
-	var msg interface{}
-	switch packet[0] {
-	case msgDisconnect:
-		msg = new(disconnectMsg)
-	case msgServiceRequest:
-		msg = new(serviceRequestMsg)
-	case msgServiceAccept:
-		msg = new(serviceAcceptMsg)
-	case msgKexInit:
-		msg = new(kexInitMsg)
-	case msgKexDHInit:
-		msg = new(kexDHInitMsg)
-	case msgKexDHReply:
-		msg = new(kexDHReplyMsg)
-	case msgUserAuthRequest:
-		msg = new(userAuthRequestMsg)
-	case msgUserAuthSuccess:
-		return new(userAuthSuccessMsg), nil
-	case msgUserAuthFailure:
-		msg = new(userAuthFailureMsg)
-	case msgUserAuthPubKeyOk:
-		msg = new(userAuthPubKeyOkMsg)
-	case msgGlobalRequest:
-		msg = new(globalRequestMsg)
-	case msgRequestSuccess:
-		msg = new(globalRequestSuccessMsg)
-	case msgRequestFailure:
-		msg = new(globalRequestFailureMsg)
-	case msgChannelOpen:
-		msg = new(channelOpenMsg)
-	case msgChannelData:
-		msg = new(channelDataMsg)
-	case msgChannelOpenConfirm:
-		msg = new(channelOpenConfirmMsg)
-	case msgChannelOpenFailure:
-		msg = new(channelOpenFailureMsg)
-	case msgChannelWindowAdjust:
-		msg = new(windowAdjustMsg)
-	case msgChannelEOF:
-		msg = new(channelEOFMsg)
-	case msgChannelClose:
-		msg = new(channelCloseMsg)
-	case msgChannelRequest:
-		msg = new(channelRequestMsg)
-	case msgChannelSuccess:
-		msg = new(channelRequestSuccessMsg)
-	case msgChannelFailure:
-		msg = new(channelRequestFailureMsg)
-	default:
-		return nil, unexpectedMessageError(0, packet[0])
-	}
-	if err := Unmarshal(packet, msg); err != nil {
-		return nil, err
-	}
-	return msg, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/messages_test.go b/installer/vendor/golang.org/x/crypto/ssh/messages_test.go
deleted file mode 100644
index e79076412a..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/messages_test.go
+++ /dev/null
@@ -1,288 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"math/big"
-	"math/rand"
-	"reflect"
-	"testing"
-	"testing/quick"
-)
-
-var intLengthTests = []struct {
-	val, length int
-}{
-	{0, 4 + 0},
-	{1, 4 + 1},
-	{127, 4 + 1},
-	{128, 4 + 2},
-	{-1, 4 + 1},
-}
-
-func TestIntLength(t *testing.T) {
-	for _, test := range intLengthTests {
-		v := new(big.Int).SetInt64(int64(test.val))
-		length := intLength(v)
-		if length != test.length {
-			t.Errorf("For %d, got length %d but expected %d", test.val, length, test.length)
-		}
-	}
-}
-
-type msgAllTypes struct {
-	Bool    bool `sshtype:"21"`
-	Array   [16]byte
-	Uint64  uint64
-	Uint32  uint32
-	Uint8   uint8
-	String  string
-	Strings []string
-	Bytes   []byte
-	Int     *big.Int
-	Rest    []byte `ssh:"rest"`
-}
-
-func (t *msgAllTypes) Generate(rand *rand.Rand, size int) reflect.Value {
-	m := &msgAllTypes{}
-	m.Bool = rand.Intn(2) == 1
-	randomBytes(m.Array[:], rand)
-	m.Uint64 = uint64(rand.Int63n(1<<63 - 1))
-	m.Uint32 = uint32(rand.Intn((1 << 31) - 1))
-	m.Uint8 = uint8(rand.Intn(1 << 8))
-	m.String = string(m.Array[:])
-	m.Strings = randomNameList(rand)
-	m.Bytes = m.Array[:]
-	m.Int = randomInt(rand)
-	m.Rest = m.Array[:]
-	return reflect.ValueOf(m)
-}
-
-func TestMarshalUnmarshal(t *testing.T) {
-	rand := rand.New(rand.NewSource(0))
-	iface := &msgAllTypes{}
-	ty := reflect.ValueOf(iface).Type()
-
-	n := 100
-	if testing.Short() {
-		n = 5
-	}
-	for j := 0; j < n; j++ {
-		v, ok := quick.Value(ty, rand)
-		if !ok {
-			t.Errorf("failed to create value")
-			break
-		}
-
-		m1 := v.Elem().Interface()
-		m2 := iface
-
-		marshaled := Marshal(m1)
-		if err := Unmarshal(marshaled, m2); err != nil {
-			t.Errorf("Unmarshal %#v: %s", m1, err)
-			break
-		}
-
-		if !reflect.DeepEqual(v.Interface(), m2) {
-			t.Errorf("got: %#v\nwant:%#v\n%x", m2, m1, marshaled)
-			break
-		}
-	}
-}
-
-func TestUnmarshalEmptyPacket(t *testing.T) {
-	var b []byte
-	var m channelRequestSuccessMsg
-	if err := Unmarshal(b, &m); err == nil {
-		t.Fatalf("unmarshal of empty slice succeeded")
-	}
-}
-
-func TestUnmarshalUnexpectedPacket(t *testing.T) {
-	type S struct {
-		I uint32 `sshtype:"43"`
-		S string
-		B bool
-	}
-
-	s := S{11, "hello", true}
-	packet := Marshal(s)
-	packet[0] = 42
-	roundtrip := S{}
-	err := Unmarshal(packet, &roundtrip)
-	if err == nil {
-		t.Fatal("expected error, not nil")
-	}
-}
-
-func TestMarshalPtr(t *testing.T) {
-	s := struct {
-		S string
-	}{"hello"}
-
-	m1 := Marshal(s)
-	m2 := Marshal(&s)
-	if !bytes.Equal(m1, m2) {
-		t.Errorf("got %q, want %q for marshaled pointer", m2, m1)
-	}
-}
-
-func TestBareMarshalUnmarshal(t *testing.T) {
-	type S struct {
-		I uint32
-		S string
-		B bool
-	}
-
-	s := S{42, "hello", true}
-	packet := Marshal(s)
-	roundtrip := S{}
-	Unmarshal(packet, &roundtrip)
-
-	if !reflect.DeepEqual(s, roundtrip) {
-		t.Errorf("got %#v, want %#v", roundtrip, s)
-	}
-}
-
-func TestBareMarshal(t *testing.T) {
-	type S2 struct {
-		I uint32
-	}
-	s := S2{42}
-	packet := Marshal(s)
-	i, rest, ok := parseUint32(packet)
-	if len(rest) > 0 || !ok {
-		t.Errorf("parseInt(%q): parse error", packet)
-	}
-	if i != s.I {
-		t.Errorf("got %d, want %d", i, s.I)
-	}
-}
-
-func TestUnmarshalShortKexInitPacket(t *testing.T) {
-	// This used to panic.
-	// Issue 11348
-	packet := []byte{0x14, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0xff, 0xff, 0xff, 0xff}
-	kim := &kexInitMsg{}
-	if err := Unmarshal(packet, kim); err == nil {
-		t.Error("truncated packet unmarshaled without error")
-	}
-}
-
-func TestMarshalMultiTag(t *testing.T) {
-	var res struct {
-		A uint32 `sshtype:"1|2"`
-	}
-
-	good1 := struct {
-		A uint32 `sshtype:"1"`
-	}{
-		1,
-	}
-	good2 := struct {
-		A uint32 `sshtype:"2"`
-	}{
-		1,
-	}
-
-	if e := Unmarshal(Marshal(good1), &res); e != nil {
-		t.Errorf("error unmarshaling multipart tag: %v", e)
-	}
-
-	if e := Unmarshal(Marshal(good2), &res); e != nil {
-		t.Errorf("error unmarshaling multipart tag: %v", e)
-	}
-
-	bad1 := struct {
-		A uint32 `sshtype:"3"`
-	}{
-		1,
-	}
-	if e := Unmarshal(Marshal(bad1), &res); e == nil {
-		t.Errorf("bad struct unmarshaled without error")
-	}
-}
-
-func randomBytes(out []byte, rand *rand.Rand) {
-	for i := 0; i < len(out); i++ {
-		out[i] = byte(rand.Int31())
-	}
-}
-
-func randomNameList(rand *rand.Rand) []string {
-	ret := make([]string, rand.Int31()&15)
-	for i := range ret {
-		s := make([]byte, 1+(rand.Int31()&15))
-		for j := range s {
-			s[j] = 'a' + uint8(rand.Int31()&15)
-		}
-		ret[i] = string(s)
-	}
-	return ret
-}
-
-func randomInt(rand *rand.Rand) *big.Int {
-	return new(big.Int).SetInt64(int64(int32(rand.Uint32())))
-}
-
-func (*kexInitMsg) Generate(rand *rand.Rand, size int) reflect.Value {
-	ki := &kexInitMsg{}
-	randomBytes(ki.Cookie[:], rand)
-	ki.KexAlgos = randomNameList(rand)
-	ki.ServerHostKeyAlgos = randomNameList(rand)
-	ki.CiphersClientServer = randomNameList(rand)
-	ki.CiphersServerClient = randomNameList(rand)
-	ki.MACsClientServer = randomNameList(rand)
-	ki.MACsServerClient = randomNameList(rand)
-	ki.CompressionClientServer = randomNameList(rand)
-	ki.CompressionServerClient = randomNameList(rand)
-	ki.LanguagesClientServer = randomNameList(rand)
-	ki.LanguagesServerClient = randomNameList(rand)
-	if rand.Int31()&1 == 1 {
-		ki.FirstKexFollows = true
-	}
-	return reflect.ValueOf(ki)
-}
-
-func (*kexDHInitMsg) Generate(rand *rand.Rand, size int) reflect.Value {
-	dhi := &kexDHInitMsg{}
-	dhi.X = randomInt(rand)
-	return reflect.ValueOf(dhi)
-}
-
-var (
-	_kexInitMsg   = new(kexInitMsg).Generate(rand.New(rand.NewSource(0)), 10).Elem().Interface()
-	_kexDHInitMsg = new(kexDHInitMsg).Generate(rand.New(rand.NewSource(0)), 10).Elem().Interface()
-
-	_kexInit   = Marshal(_kexInitMsg)
-	_kexDHInit = Marshal(_kexDHInitMsg)
-)
-
-func BenchmarkMarshalKexInitMsg(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Marshal(_kexInitMsg)
-	}
-}
-
-func BenchmarkUnmarshalKexInitMsg(b *testing.B) {
-	m := new(kexInitMsg)
-	for i := 0; i < b.N; i++ {
-		Unmarshal(_kexInit, m)
-	}
-}
-
-func BenchmarkMarshalKexDHInitMsg(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		Marshal(_kexDHInitMsg)
-	}
-}
-
-func BenchmarkUnmarshalKexDHInitMsg(b *testing.B) {
-	m := new(kexDHInitMsg)
-	for i := 0; i < b.N; i++ {
-		Unmarshal(_kexDHInit, m)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/mux.go b/installer/vendor/golang.org/x/crypto/ssh/mux.go
deleted file mode 100644
index 27a527c106..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/mux.go
+++ /dev/null
@@ -1,330 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"log"
-	"sync"
-	"sync/atomic"
-)
-
-// debugMux, if set, causes messages in the connection protocol to be
-// logged.
-const debugMux = false
-
-// chanList is a thread safe channel list.
-type chanList struct {
-	// protects concurrent access to chans
-	sync.Mutex
-
-	// chans are indexed by the local id of the channel, which the
-	// other side should send in the PeersId field.
-	chans []*channel
-
-	// This is a debugging aid: it offsets all IDs by this
-	// amount. This helps distinguish otherwise identical
-	// server/client muxes
-	offset uint32
-}
-
-// Assigns a channel ID to the given channel.
-func (c *chanList) add(ch *channel) uint32 {
-	c.Lock()
-	defer c.Unlock()
-	for i := range c.chans {
-		if c.chans[i] == nil {
-			c.chans[i] = ch
-			return uint32(i) + c.offset
-		}
-	}
-	c.chans = append(c.chans, ch)
-	return uint32(len(c.chans)-1) + c.offset
-}
-
-// getChan returns the channel for the given ID.
-func (c *chanList) getChan(id uint32) *channel {
-	id -= c.offset
-
-	c.Lock()
-	defer c.Unlock()
-	if id < uint32(len(c.chans)) {
-		return c.chans[id]
-	}
-	return nil
-}
-
-func (c *chanList) remove(id uint32) {
-	id -= c.offset
-	c.Lock()
-	if id < uint32(len(c.chans)) {
-		c.chans[id] = nil
-	}
-	c.Unlock()
-}
-
-// dropAll forgets all channels it knows, returning them in a slice.
-func (c *chanList) dropAll() []*channel {
-	c.Lock()
-	defer c.Unlock()
-	var r []*channel
-
-	for _, ch := range c.chans {
-		if ch == nil {
-			continue
-		}
-		r = append(r, ch)
-	}
-	c.chans = nil
-	return r
-}
-
-// mux represents the state for the SSH connection protocol, which
-// multiplexes many channels onto a single packet transport.
-type mux struct {
-	conn     packetConn
-	chanList chanList
-
-	incomingChannels chan NewChannel
-
-	globalSentMu     sync.Mutex
-	globalResponses  chan interface{}
-	incomingRequests chan *Request
-
-	errCond *sync.Cond
-	err     error
-}
-
-// When debugging, each new chanList instantiation has a different
-// offset.
-var globalOff uint32
-
-func (m *mux) Wait() error {
-	m.errCond.L.Lock()
-	defer m.errCond.L.Unlock()
-	for m.err == nil {
-		m.errCond.Wait()
-	}
-	return m.err
-}
-
-// newMux returns a mux that runs over the given connection.
-func newMux(p packetConn) *mux {
-	m := &mux{
-		conn:             p,
-		incomingChannels: make(chan NewChannel, chanSize),
-		globalResponses:  make(chan interface{}, 1),
-		incomingRequests: make(chan *Request, chanSize),
-		errCond:          newCond(),
-	}
-	if debugMux {
-		m.chanList.offset = atomic.AddUint32(&globalOff, 1)
-	}
-
-	go m.loop()
-	return m
-}
-
-func (m *mux) sendMessage(msg interface{}) error {
-	p := Marshal(msg)
-	if debugMux {
-		log.Printf("send global(%d): %#v", m.chanList.offset, msg)
-	}
-	return m.conn.writePacket(p)
-}
-
-func (m *mux) SendRequest(name string, wantReply bool, payload []byte) (bool, []byte, error) {
-	if wantReply {
-		m.globalSentMu.Lock()
-		defer m.globalSentMu.Unlock()
-	}
-
-	if err := m.sendMessage(globalRequestMsg{
-		Type:      name,
-		WantReply: wantReply,
-		Data:      payload,
-	}); err != nil {
-		return false, nil, err
-	}
-
-	if !wantReply {
-		return false, nil, nil
-	}
-
-	msg, ok := <-m.globalResponses
-	if !ok {
-		return false, nil, io.EOF
-	}
-	switch msg := msg.(type) {
-	case *globalRequestFailureMsg:
-		return false, msg.Data, nil
-	case *globalRequestSuccessMsg:
-		return true, msg.Data, nil
-	default:
-		return false, nil, fmt.Errorf("ssh: unexpected response to request: %#v", msg)
-	}
-}
-
-// ackRequest must be called after processing a global request that
-// has WantReply set.
-func (m *mux) ackRequest(ok bool, data []byte) error {
-	if ok {
-		return m.sendMessage(globalRequestSuccessMsg{Data: data})
-	}
-	return m.sendMessage(globalRequestFailureMsg{Data: data})
-}
-
-func (m *mux) Close() error {
-	return m.conn.Close()
-}
-
-// loop runs the connection machine. It will process packets until an
-// error is encountered. To synchronize on loop exit, use mux.Wait.
-func (m *mux) loop() {
-	var err error
-	for err == nil {
-		err = m.onePacket()
-	}
-
-	for _, ch := range m.chanList.dropAll() {
-		ch.close()
-	}
-
-	close(m.incomingChannels)
-	close(m.incomingRequests)
-	close(m.globalResponses)
-
-	m.conn.Close()
-
-	m.errCond.L.Lock()
-	m.err = err
-	m.errCond.Broadcast()
-	m.errCond.L.Unlock()
-
-	if debugMux {
-		log.Println("loop exit", err)
-	}
-}
-
-// onePacket reads and processes one packet.
-func (m *mux) onePacket() error {
-	packet, err := m.conn.readPacket()
-	if err != nil {
-		return err
-	}
-
-	if debugMux {
-		if packet[0] == msgChannelData || packet[0] == msgChannelExtendedData {
-			log.Printf("decoding(%d): data packet - %d bytes", m.chanList.offset, len(packet))
-		} else {
-			p, _ := decode(packet)
-			log.Printf("decoding(%d): %d %#v - %d bytes", m.chanList.offset, packet[0], p, len(packet))
-		}
-	}
-
-	switch packet[0] {
-	case msgChannelOpen:
-		return m.handleChannelOpen(packet)
-	case msgGlobalRequest, msgRequestSuccess, msgRequestFailure:
-		return m.handleGlobalPacket(packet)
-	}
-
-	// assume a channel packet.
-	if len(packet) < 5 {
-		return parseError(packet[0])
-	}
-	id := binary.BigEndian.Uint32(packet[1:])
-	ch := m.chanList.getChan(id)
-	if ch == nil {
-		return fmt.Errorf("ssh: invalid channel %d", id)
-	}
-
-	return ch.handlePacket(packet)
-}
-
-func (m *mux) handleGlobalPacket(packet []byte) error {
-	msg, err := decode(packet)
-	if err != nil {
-		return err
-	}
-
-	switch msg := msg.(type) {
-	case *globalRequestMsg:
-		m.incomingRequests <- &Request{
-			Type:      msg.Type,
-			WantReply: msg.WantReply,
-			Payload:   msg.Data,
-			mux:       m,
-		}
-	case *globalRequestSuccessMsg, *globalRequestFailureMsg:
-		m.globalResponses <- msg
-	default:
-		panic(fmt.Sprintf("not a global message %#v", msg))
-	}
-
-	return nil
-}
-
-// handleChannelOpen schedules a channel to be Accept()ed.
-func (m *mux) handleChannelOpen(packet []byte) error {
-	var msg channelOpenMsg
-	if err := Unmarshal(packet, &msg); err != nil {
-		return err
-	}
-
-	if msg.MaxPacketSize < minPacketLength || msg.MaxPacketSize > 1<<31 {
-		failMsg := channelOpenFailureMsg{
-			PeersId:  msg.PeersId,
-			Reason:   ConnectionFailed,
-			Message:  "invalid request",
-			Language: "en_US.UTF-8",
-		}
-		return m.sendMessage(failMsg)
-	}
-
-	c := m.newChannel(msg.ChanType, channelInbound, msg.TypeSpecificData)
-	c.remoteId = msg.PeersId
-	c.maxRemotePayload = msg.MaxPacketSize
-	c.remoteWin.add(msg.PeersWindow)
-	m.incomingChannels <- c
-	return nil
-}
-
-func (m *mux) OpenChannel(chanType string, extra []byte) (Channel, <-chan *Request, error) {
-	ch, err := m.openChannel(chanType, extra)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	return ch, ch.incomingRequests, nil
-}
-
-func (m *mux) openChannel(chanType string, extra []byte) (*channel, error) {
-	ch := m.newChannel(chanType, channelOutbound, extra)
-
-	ch.maxIncomingPayload = channelMaxPacket
-
-	open := channelOpenMsg{
-		ChanType:         chanType,
-		PeersWindow:      ch.myWindow,
-		MaxPacketSize:    ch.maxIncomingPayload,
-		TypeSpecificData: extra,
-		PeersId:          ch.localId,
-	}
-	if err := m.sendMessage(open); err != nil {
-		return nil, err
-	}
-
-	switch msg := (<-ch.msg).(type) {
-	case *channelOpenConfirmMsg:
-		return ch, nil
-	case *channelOpenFailureMsg:
-		return nil, &OpenChannelError{msg.Reason, msg.Message}
-	default:
-		return nil, fmt.Errorf("ssh: unexpected packet in response to channel open: %T", msg)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/mux_test.go b/installer/vendor/golang.org/x/crypto/ssh/mux_test.go
deleted file mode 100644
index 25d2181d62..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/mux_test.go
+++ /dev/null
@@ -1,505 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"io"
-	"io/ioutil"
-	"sync"
-	"testing"
-)
-
-func muxPair() (*mux, *mux) {
-	a, b := memPipe()
-
-	s := newMux(a)
-	c := newMux(b)
-
-	return s, c
-}
-
-// Returns both ends of a channel, and the mux for the the 2nd
-// channel.
-func channelPair(t *testing.T) (*channel, *channel, *mux) {
-	c, s := muxPair()
-
-	res := make(chan *channel, 1)
-	go func() {
-		newCh, ok := <-s.incomingChannels
-		if !ok {
-			t.Fatalf("No incoming channel")
-		}
-		if newCh.ChannelType() != "chan" {
-			t.Fatalf("got type %q want chan", newCh.ChannelType())
-		}
-		ch, _, err := newCh.Accept()
-		if err != nil {
-			t.Fatalf("Accept %v", err)
-		}
-		res <- ch.(*channel)
-	}()
-
-	ch, err := c.openChannel("chan", nil)
-	if err != nil {
-		t.Fatalf("OpenChannel: %v", err)
-	}
-
-	return <-res, ch, c
-}
-
-// Test that stderr and stdout can be addressed from different
-// goroutines. This is intended for use with the race detector.
-func TestMuxChannelExtendedThreadSafety(t *testing.T) {
-	writer, reader, mux := channelPair(t)
-	defer writer.Close()
-	defer reader.Close()
-	defer mux.Close()
-
-	var wr, rd sync.WaitGroup
-	magic := "hello world"
-
-	wr.Add(2)
-	go func() {
-		io.WriteString(writer, magic)
-		wr.Done()
-	}()
-	go func() {
-		io.WriteString(writer.Stderr(), magic)
-		wr.Done()
-	}()
-
-	rd.Add(2)
-	go func() {
-		c, err := ioutil.ReadAll(reader)
-		if string(c) != magic {
-			t.Fatalf("stdout read got %q, want %q (error %s)", c, magic, err)
-		}
-		rd.Done()
-	}()
-	go func() {
-		c, err := ioutil.ReadAll(reader.Stderr())
-		if string(c) != magic {
-			t.Fatalf("stderr read got %q, want %q (error %s)", c, magic, err)
-		}
-		rd.Done()
-	}()
-
-	wr.Wait()
-	writer.CloseWrite()
-	rd.Wait()
-}
-
-func TestMuxReadWrite(t *testing.T) {
-	s, c, mux := channelPair(t)
-	defer s.Close()
-	defer c.Close()
-	defer mux.Close()
-
-	magic := "hello world"
-	magicExt := "hello stderr"
-	go func() {
-		_, err := s.Write([]byte(magic))
-		if err != nil {
-			t.Fatalf("Write: %v", err)
-		}
-		_, err = s.Extended(1).Write([]byte(magicExt))
-		if err != nil {
-			t.Fatalf("Write: %v", err)
-		}
-		err = s.Close()
-		if err != nil {
-			t.Fatalf("Close: %v", err)
-		}
-	}()
-
-	var buf [1024]byte
-	n, err := c.Read(buf[:])
-	if err != nil {
-		t.Fatalf("server Read: %v", err)
-	}
-	got := string(buf[:n])
-	if got != magic {
-		t.Fatalf("server: got %q want %q", got, magic)
-	}
-
-	n, err = c.Extended(1).Read(buf[:])
-	if err != nil {
-		t.Fatalf("server Read: %v", err)
-	}
-
-	got = string(buf[:n])
-	if got != magicExt {
-		t.Fatalf("server: got %q want %q", got, magic)
-	}
-}
-
-func TestMuxChannelOverflow(t *testing.T) {
-	reader, writer, mux := channelPair(t)
-	defer reader.Close()
-	defer writer.Close()
-	defer mux.Close()
-
-	wDone := make(chan int, 1)
-	go func() {
-		if _, err := writer.Write(make([]byte, channelWindowSize)); err != nil {
-			t.Errorf("could not fill window: %v", err)
-		}
-		writer.Write(make([]byte, 1))
-		wDone <- 1
-	}()
-	writer.remoteWin.waitWriterBlocked()
-
-	// Send 1 byte.
-	packet := make([]byte, 1+4+4+1)
-	packet[0] = msgChannelData
-	marshalUint32(packet[1:], writer.remoteId)
-	marshalUint32(packet[5:], uint32(1))
-	packet[9] = 42
-
-	if err := writer.mux.conn.writePacket(packet); err != nil {
-		t.Errorf("could not send packet")
-	}
-	if _, err := reader.SendRequest("hello", true, nil); err == nil {
-		t.Errorf("SendRequest succeeded.")
-	}
-	<-wDone
-}
-
-func TestMuxChannelCloseWriteUnblock(t *testing.T) {
-	reader, writer, mux := channelPair(t)
-	defer reader.Close()
-	defer writer.Close()
-	defer mux.Close()
-
-	wDone := make(chan int, 1)
-	go func() {
-		if _, err := writer.Write(make([]byte, channelWindowSize)); err != nil {
-			t.Errorf("could not fill window: %v", err)
-		}
-		if _, err := writer.Write(make([]byte, 1)); err != io.EOF {
-			t.Errorf("got %v, want EOF for unblock write", err)
-		}
-		wDone <- 1
-	}()
-
-	writer.remoteWin.waitWriterBlocked()
-	reader.Close()
-	<-wDone
-}
-
-func TestMuxConnectionCloseWriteUnblock(t *testing.T) {
-	reader, writer, mux := channelPair(t)
-	defer reader.Close()
-	defer writer.Close()
-	defer mux.Close()
-
-	wDone := make(chan int, 1)
-	go func() {
-		if _, err := writer.Write(make([]byte, channelWindowSize)); err != nil {
-			t.Errorf("could not fill window: %v", err)
-		}
-		if _, err := writer.Write(make([]byte, 1)); err != io.EOF {
-			t.Errorf("got %v, want EOF for unblock write", err)
-		}
-		wDone <- 1
-	}()
-
-	writer.remoteWin.waitWriterBlocked()
-	mux.Close()
-	<-wDone
-}
-
-func TestMuxReject(t *testing.T) {
-	client, server := muxPair()
-	defer server.Close()
-	defer client.Close()
-
-	go func() {
-		ch, ok := <-server.incomingChannels
-		if !ok {
-			t.Fatalf("Accept")
-		}
-		if ch.ChannelType() != "ch" || string(ch.ExtraData()) != "extra" {
-			t.Fatalf("unexpected channel: %q, %q", ch.ChannelType(), ch.ExtraData())
-		}
-		ch.Reject(RejectionReason(42), "message")
-	}()
-
-	ch, err := client.openChannel("ch", []byte("extra"))
-	if ch != nil {
-		t.Fatal("openChannel not rejected")
-	}
-
-	ocf, ok := err.(*OpenChannelError)
-	if !ok {
-		t.Errorf("got %#v want *OpenChannelError", err)
-	} else if ocf.Reason != 42 || ocf.Message != "message" {
-		t.Errorf("got %#v, want {Reason: 42, Message: %q}", ocf, "message")
-	}
-
-	want := "ssh: rejected: unknown reason 42 (message)"
-	if err.Error() != want {
-		t.Errorf("got %q, want %q", err.Error(), want)
-	}
-}
-
-func TestMuxChannelRequest(t *testing.T) {
-	client, server, mux := channelPair(t)
-	defer server.Close()
-	defer client.Close()
-	defer mux.Close()
-
-	var received int
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go func() {
-		for r := range server.incomingRequests {
-			received++
-			r.Reply(r.Type == "yes", nil)
-		}
-		wg.Done()
-	}()
-	_, err := client.SendRequest("yes", false, nil)
-	if err != nil {
-		t.Fatalf("SendRequest: %v", err)
-	}
-	ok, err := client.SendRequest("yes", true, nil)
-	if err != nil {
-		t.Fatalf("SendRequest: %v", err)
-	}
-
-	if !ok {
-		t.Errorf("SendRequest(yes): %v", ok)
-
-	}
-
-	ok, err = client.SendRequest("no", true, nil)
-	if err != nil {
-		t.Fatalf("SendRequest: %v", err)
-	}
-	if ok {
-		t.Errorf("SendRequest(no): %v", ok)
-
-	}
-
-	client.Close()
-	wg.Wait()
-
-	if received != 3 {
-		t.Errorf("got %d requests, want %d", received, 3)
-	}
-}
-
-func TestMuxGlobalRequest(t *testing.T) {
-	clientMux, serverMux := muxPair()
-	defer serverMux.Close()
-	defer clientMux.Close()
-
-	var seen bool
-	go func() {
-		for r := range serverMux.incomingRequests {
-			seen = seen || r.Type == "peek"
-			if r.WantReply {
-				err := r.Reply(r.Type == "yes",
-					append([]byte(r.Type), r.Payload...))
-				if err != nil {
-					t.Errorf("AckRequest: %v", err)
-				}
-			}
-		}
-	}()
-
-	_, _, err := clientMux.SendRequest("peek", false, nil)
-	if err != nil {
-		t.Errorf("SendRequest: %v", err)
-	}
-
-	ok, data, err := clientMux.SendRequest("yes", true, []byte("a"))
-	if !ok || string(data) != "yesa" || err != nil {
-		t.Errorf("SendRequest(\"yes\", true, \"a\"): %v %v %v",
-			ok, data, err)
-	}
-	if ok, data, err := clientMux.SendRequest("yes", true, []byte("a")); !ok || string(data) != "yesa" || err != nil {
-		t.Errorf("SendRequest(\"yes\", true, \"a\"): %v %v %v",
-			ok, data, err)
-	}
-
-	if ok, data, err := clientMux.SendRequest("no", true, []byte("a")); ok || string(data) != "noa" || err != nil {
-		t.Errorf("SendRequest(\"no\", true, \"a\"): %v %v %v",
-			ok, data, err)
-	}
-
-	if !seen {
-		t.Errorf("never saw 'peek' request")
-	}
-}
-
-func TestMuxGlobalRequestUnblock(t *testing.T) {
-	clientMux, serverMux := muxPair()
-	defer serverMux.Close()
-	defer clientMux.Close()
-
-	result := make(chan error, 1)
-	go func() {
-		_, _, err := clientMux.SendRequest("hello", true, nil)
-		result <- err
-	}()
-
-	<-serverMux.incomingRequests
-	serverMux.conn.Close()
-	err := <-result
-
-	if err != io.EOF {
-		t.Errorf("want EOF, got %v", io.EOF)
-	}
-}
-
-func TestMuxChannelRequestUnblock(t *testing.T) {
-	a, b, connB := channelPair(t)
-	defer a.Close()
-	defer b.Close()
-	defer connB.Close()
-
-	result := make(chan error, 1)
-	go func() {
-		_, err := a.SendRequest("hello", true, nil)
-		result <- err
-	}()
-
-	<-b.incomingRequests
-	connB.conn.Close()
-	err := <-result
-
-	if err != io.EOF {
-		t.Errorf("want EOF, got %v", err)
-	}
-}
-
-func TestMuxCloseChannel(t *testing.T) {
-	r, w, mux := channelPair(t)
-	defer mux.Close()
-	defer r.Close()
-	defer w.Close()
-
-	result := make(chan error, 1)
-	go func() {
-		var b [1024]byte
-		_, err := r.Read(b[:])
-		result <- err
-	}()
-	if err := w.Close(); err != nil {
-		t.Errorf("w.Close: %v", err)
-	}
-
-	if _, err := w.Write([]byte("hello")); err != io.EOF {
-		t.Errorf("got err %v, want io.EOF after Close", err)
-	}
-
-	if err := <-result; err != io.EOF {
-		t.Errorf("got %v (%T), want io.EOF", err, err)
-	}
-}
-
-func TestMuxCloseWriteChannel(t *testing.T) {
-	r, w, mux := channelPair(t)
-	defer mux.Close()
-
-	result := make(chan error, 1)
-	go func() {
-		var b [1024]byte
-		_, err := r.Read(b[:])
-		result <- err
-	}()
-	if err := w.CloseWrite(); err != nil {
-		t.Errorf("w.CloseWrite: %v", err)
-	}
-
-	if _, err := w.Write([]byte("hello")); err != io.EOF {
-		t.Errorf("got err %v, want io.EOF after CloseWrite", err)
-	}
-
-	if err := <-result; err != io.EOF {
-		t.Errorf("got %v (%T), want io.EOF", err, err)
-	}
-}
-
-func TestMuxInvalidRecord(t *testing.T) {
-	a, b := muxPair()
-	defer a.Close()
-	defer b.Close()
-
-	packet := make([]byte, 1+4+4+1)
-	packet[0] = msgChannelData
-	marshalUint32(packet[1:], 29348723 /* invalid channel id */)
-	marshalUint32(packet[5:], 1)
-	packet[9] = 42
-
-	a.conn.writePacket(packet)
-	go a.SendRequest("hello", false, nil)
-	// 'a' wrote an invalid packet, so 'b' has exited.
-	req, ok := <-b.incomingRequests
-	if ok {
-		t.Errorf("got request %#v after receiving invalid packet", req)
-	}
-}
-
-func TestZeroWindowAdjust(t *testing.T) {
-	a, b, mux := channelPair(t)
-	defer a.Close()
-	defer b.Close()
-	defer mux.Close()
-
-	go func() {
-		io.WriteString(a, "hello")
-		// bogus adjust.
-		a.sendMessage(windowAdjustMsg{})
-		io.WriteString(a, "world")
-		a.Close()
-	}()
-
-	want := "helloworld"
-	c, _ := ioutil.ReadAll(b)
-	if string(c) != want {
-		t.Errorf("got %q want %q", c, want)
-	}
-}
-
-func TestMuxMaxPacketSize(t *testing.T) {
-	a, b, mux := channelPair(t)
-	defer a.Close()
-	defer b.Close()
-	defer mux.Close()
-
-	large := make([]byte, a.maxRemotePayload+1)
-	packet := make([]byte, 1+4+4+1+len(large))
-	packet[0] = msgChannelData
-	marshalUint32(packet[1:], a.remoteId)
-	marshalUint32(packet[5:], uint32(len(large)))
-	packet[9] = 42
-
-	if err := a.mux.conn.writePacket(packet); err != nil {
-		t.Errorf("could not send packet")
-	}
-
-	go a.SendRequest("hello", false, nil)
-
-	_, ok := <-b.incomingRequests
-	if ok {
-		t.Errorf("connection still alive after receiving large packet.")
-	}
-}
-
-// Don't ship code with debug=true.
-func TestDebug(t *testing.T) {
-	if debugMux {
-		t.Error("mux debug switched on")
-	}
-	if debugHandshake {
-		t.Error("handshake debug switched on")
-	}
-	if debugTransport {
-		t.Error("transport debug switched on")
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/server.go b/installer/vendor/golang.org/x/crypto/ssh/server.go
deleted file mode 100644
index 8a78b7ca0f..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/server.go
+++ /dev/null
@@ -1,563 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net"
-	"strings"
-)
-
-// The Permissions type holds fine-grained permissions that are
-// specific to a user or a specific authentication method for a user.
-// The Permissions value for a successful authentication attempt is
-// available in ServerConn, so it can be used to pass information from
-// the user-authentication phase to the application layer.
-type Permissions struct {
-	// CriticalOptions indicate restrictions to the default
-	// permissions, and are typically used in conjunction with
-	// user certificates. The standard for SSH certificates
-	// defines "force-command" (only allow the given command to
-	// execute) and "source-address" (only allow connections from
-	// the given address). The SSH package currently only enforces
-	// the "source-address" critical option. It is up to server
-	// implementations to enforce other critical options, such as
-	// "force-command", by checking them after the SSH handshake
-	// is successful. In general, SSH servers should reject
-	// connections that specify critical options that are unknown
-	// or not supported.
-	CriticalOptions map[string]string
-
-	// Extensions are extra functionality that the server may
-	// offer on authenticated connections. Lack of support for an
-	// extension does not preclude authenticating a user. Common
-	// extensions are "permit-agent-forwarding",
-	// "permit-X11-forwarding". The Go SSH library currently does
-	// not act on any extension, and it is up to server
-	// implementations to honor them. Extensions can be used to
-	// pass data from the authentication callbacks to the server
-	// application layer.
-	Extensions map[string]string
-}
-
-// ServerConfig holds server specific configuration data.
-type ServerConfig struct {
-	// Config contains configuration shared between client and server.
-	Config
-
-	hostKeys []Signer
-
-	// NoClientAuth is true if clients are allowed to connect without
-	// authenticating.
-	NoClientAuth bool
-
-	// MaxAuthTries specifies the maximum number of authentication attempts
-	// permitted per connection. If set to a negative number, the number of
-	// attempts are unlimited. If set to zero, the number of attempts are limited
-	// to 6.
-	MaxAuthTries int
-
-	// PasswordCallback, if non-nil, is called when a user
-	// attempts to authenticate using a password.
-	PasswordCallback func(conn ConnMetadata, password []byte) (*Permissions, error)
-
-	// PublicKeyCallback, if non-nil, is called when a client
-	// offers a public key for authentication. It must return a nil error
-	// if the given public key can be used to authenticate the
-	// given user. For example, see CertChecker.Authenticate. A
-	// call to this function does not guarantee that the key
-	// offered is in fact used to authenticate. To record any data
-	// depending on the public key, store it inside a
-	// Permissions.Extensions entry.
-	PublicKeyCallback func(conn ConnMetadata, key PublicKey) (*Permissions, error)
-
-	// KeyboardInteractiveCallback, if non-nil, is called when
-	// keyboard-interactive authentication is selected (RFC
-	// 4256). The client object's Challenge function should be
-	// used to query the user. The callback may offer multiple
-	// Challenge rounds. To avoid information leaks, the client
-	// should be presented a challenge even if the user is
-	// unknown.
-	KeyboardInteractiveCallback func(conn ConnMetadata, client KeyboardInteractiveChallenge) (*Permissions, error)
-
-	// AuthLogCallback, if non-nil, is called to log all authentication
-	// attempts.
-	AuthLogCallback func(conn ConnMetadata, method string, err error)
-
-	// ServerVersion is the version identification string to announce in
-	// the public handshake.
-	// If empty, a reasonable default is used.
-	// Note that RFC 4253 section 4.2 requires that this string start with
-	// "SSH-2.0-".
-	ServerVersion string
-}
-
-// AddHostKey adds a private key as a host key. If an existing host
-// key exists with the same algorithm, it is overwritten. Each server
-// config must have at least one host key.
-func (s *ServerConfig) AddHostKey(key Signer) {
-	for i, k := range s.hostKeys {
-		if k.PublicKey().Type() == key.PublicKey().Type() {
-			s.hostKeys[i] = key
-			return
-		}
-	}
-
-	s.hostKeys = append(s.hostKeys, key)
-}
-
-// cachedPubKey contains the results of querying whether a public key is
-// acceptable for a user.
-type cachedPubKey struct {
-	user       string
-	pubKeyData []byte
-	result     error
-	perms      *Permissions
-}
-
-const maxCachedPubKeys = 16
-
-// pubKeyCache caches tests for public keys.  Since SSH clients
-// will query whether a public key is acceptable before attempting to
-// authenticate with it, we end up with duplicate queries for public
-// key validity.  The cache only applies to a single ServerConn.
-type pubKeyCache struct {
-	keys []cachedPubKey
-}
-
-// get returns the result for a given user/algo/key tuple.
-func (c *pubKeyCache) get(user string, pubKeyData []byte) (cachedPubKey, bool) {
-	for _, k := range c.keys {
-		if k.user == user && bytes.Equal(k.pubKeyData, pubKeyData) {
-			return k, true
-		}
-	}
-	return cachedPubKey{}, false
-}
-
-// add adds the given tuple to the cache.
-func (c *pubKeyCache) add(candidate cachedPubKey) {
-	if len(c.keys) < maxCachedPubKeys {
-		c.keys = append(c.keys, candidate)
-	}
-}
-
-// ServerConn is an authenticated SSH connection, as seen from the
-// server
-type ServerConn struct {
-	Conn
-
-	// If the succeeding authentication callback returned a
-	// non-nil Permissions pointer, it is stored here.
-	Permissions *Permissions
-}
-
-// NewServerConn starts a new SSH server with c as the underlying
-// transport.  It starts with a handshake and, if the handshake is
-// unsuccessful, it closes the connection and returns an error.  The
-// Request and NewChannel channels must be serviced, or the connection
-// will hang.
-func NewServerConn(c net.Conn, config *ServerConfig) (*ServerConn, <-chan NewChannel, <-chan *Request, error) {
-	fullConf := *config
-	fullConf.SetDefaults()
-	if fullConf.MaxAuthTries == 0 {
-		fullConf.MaxAuthTries = 6
-	}
-
-	s := &connection{
-		sshConn: sshConn{conn: c},
-	}
-	perms, err := s.serverHandshake(&fullConf)
-	if err != nil {
-		c.Close()
-		return nil, nil, nil, err
-	}
-	return &ServerConn{s, perms}, s.mux.incomingChannels, s.mux.incomingRequests, nil
-}
-
-// signAndMarshal signs the data with the appropriate algorithm,
-// and serializes the result in SSH wire format.
-func signAndMarshal(k Signer, rand io.Reader, data []byte) ([]byte, error) {
-	sig, err := k.Sign(rand, data)
-	if err != nil {
-		return nil, err
-	}
-
-	return Marshal(sig), nil
-}
-
-// handshake performs key exchange and user authentication.
-func (s *connection) serverHandshake(config *ServerConfig) (*Permissions, error) {
-	if len(config.hostKeys) == 0 {
-		return nil, errors.New("ssh: server has no host keys")
-	}
-
-	if !config.NoClientAuth && config.PasswordCallback == nil && config.PublicKeyCallback == nil && config.KeyboardInteractiveCallback == nil {
-		return nil, errors.New("ssh: no authentication methods configured but NoClientAuth is also false")
-	}
-
-	if config.ServerVersion != "" {
-		s.serverVersion = []byte(config.ServerVersion)
-	} else {
-		s.serverVersion = []byte(packageVersion)
-	}
-	var err error
-	s.clientVersion, err = exchangeVersions(s.sshConn.conn, s.serverVersion)
-	if err != nil {
-		return nil, err
-	}
-
-	tr := newTransport(s.sshConn.conn, config.Rand, false /* not client */)
-	s.transport = newServerTransport(tr, s.clientVersion, s.serverVersion, config)
-
-	if err := s.transport.waitSession(); err != nil {
-		return nil, err
-	}
-
-	// We just did the key change, so the session ID is established.
-	s.sessionID = s.transport.getSessionID()
-
-	var packet []byte
-	if packet, err = s.transport.readPacket(); err != nil {
-		return nil, err
-	}
-
-	var serviceRequest serviceRequestMsg
-	if err = Unmarshal(packet, &serviceRequest); err != nil {
-		return nil, err
-	}
-	if serviceRequest.Service != serviceUserAuth {
-		return nil, errors.New("ssh: requested service '" + serviceRequest.Service + "' before authenticating")
-	}
-	serviceAccept := serviceAcceptMsg{
-		Service: serviceUserAuth,
-	}
-	if err := s.transport.writePacket(Marshal(&serviceAccept)); err != nil {
-		return nil, err
-	}
-
-	perms, err := s.serverAuthenticate(config)
-	if err != nil {
-		return nil, err
-	}
-	s.mux = newMux(s.transport)
-	return perms, err
-}
-
-func isAcceptableAlgo(algo string) bool {
-	switch algo {
-	case KeyAlgoRSA, KeyAlgoDSA, KeyAlgoECDSA256, KeyAlgoECDSA384, KeyAlgoECDSA521, KeyAlgoED25519,
-		CertAlgoRSAv01, CertAlgoDSAv01, CertAlgoECDSA256v01, CertAlgoECDSA384v01, CertAlgoECDSA521v01:
-		return true
-	}
-	return false
-}
-
-func checkSourceAddress(addr net.Addr, sourceAddrs string) error {
-	if addr == nil {
-		return errors.New("ssh: no address known for client, but source-address match required")
-	}
-
-	tcpAddr, ok := addr.(*net.TCPAddr)
-	if !ok {
-		return fmt.Errorf("ssh: remote address %v is not an TCP address when checking source-address match", addr)
-	}
-
-	for _, sourceAddr := range strings.Split(sourceAddrs, ",") {
-		if allowedIP := net.ParseIP(sourceAddr); allowedIP != nil {
-			if allowedIP.Equal(tcpAddr.IP) {
-				return nil
-			}
-		} else {
-			_, ipNet, err := net.ParseCIDR(sourceAddr)
-			if err != nil {
-				return fmt.Errorf("ssh: error parsing source-address restriction %q: %v", sourceAddr, err)
-			}
-
-			if ipNet.Contains(tcpAddr.IP) {
-				return nil
-			}
-		}
-	}
-
-	return fmt.Errorf("ssh: remote address %v is not allowed because of source-address restriction", addr)
-}
-
-// ServerAuthError implements the error interface. It appends any authentication
-// errors that may occur, and is returned if all of the authentication methods
-// provided by the user failed to authenticate.
-type ServerAuthError struct {
-	// Errors contains authentication errors returned by the authentication
-	// callback methods.
-	Errors []error
-}
-
-func (l ServerAuthError) Error() string {
-	var errs []string
-	for _, err := range l.Errors {
-		errs = append(errs, err.Error())
-	}
-	return "[" + strings.Join(errs, ", ") + "]"
-}
-
-func (s *connection) serverAuthenticate(config *ServerConfig) (*Permissions, error) {
-	sessionID := s.transport.getSessionID()
-	var cache pubKeyCache
-	var perms *Permissions
-
-	authFailures := 0
-	var authErrs []error
-
-userAuthLoop:
-	for {
-		if authFailures >= config.MaxAuthTries && config.MaxAuthTries > 0 {
-			discMsg := &disconnectMsg{
-				Reason:  2,
-				Message: "too many authentication failures",
-			}
-
-			if err := s.transport.writePacket(Marshal(discMsg)); err != nil {
-				return nil, err
-			}
-
-			return nil, discMsg
-		}
-
-		var userAuthReq userAuthRequestMsg
-		if packet, err := s.transport.readPacket(); err != nil {
-			if err == io.EOF {
-				return nil, &ServerAuthError{Errors: authErrs}
-			}
-			return nil, err
-		} else if err = Unmarshal(packet, &userAuthReq); err != nil {
-			return nil, err
-		}
-
-		if userAuthReq.Service != serviceSSH {
-			return nil, errors.New("ssh: client attempted to negotiate for unknown service: " + userAuthReq.Service)
-		}
-
-		s.user = userAuthReq.User
-		perms = nil
-		authErr := errors.New("no auth passed yet")
-
-		switch userAuthReq.Method {
-		case "none":
-			if config.NoClientAuth {
-				authErr = nil
-			}
-
-			// allow initial attempt of 'none' without penalty
-			if authFailures == 0 {
-				authFailures--
-			}
-		case "password":
-			if config.PasswordCallback == nil {
-				authErr = errors.New("ssh: password auth not configured")
-				break
-			}
-			payload := userAuthReq.Payload
-			if len(payload) < 1 || payload[0] != 0 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			payload = payload[1:]
-			password, payload, ok := parseString(payload)
-			if !ok || len(payload) > 0 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-
-			perms, authErr = config.PasswordCallback(s, password)
-		case "keyboard-interactive":
-			if config.KeyboardInteractiveCallback == nil {
-				authErr = errors.New("ssh: keyboard-interactive auth not configubred")
-				break
-			}
-
-			prompter := &sshClientKeyboardInteractive{s}
-			perms, authErr = config.KeyboardInteractiveCallback(s, prompter.Challenge)
-		case "publickey":
-			if config.PublicKeyCallback == nil {
-				authErr = errors.New("ssh: publickey auth not configured")
-				break
-			}
-			payload := userAuthReq.Payload
-			if len(payload) < 1 {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			isQuery := payload[0] == 0
-			payload = payload[1:]
-			algoBytes, payload, ok := parseString(payload)
-			if !ok {
-				return nil, parseError(msgUserAuthRequest)
-			}
-			algo := string(algoBytes)
-			if !isAcceptableAlgo(algo) {
-				authErr = fmt.Errorf("ssh: algorithm %q not accepted", algo)
-				break
-			}
-
-			pubKeyData, payload, ok := parseString(payload)
-			if !ok {
-				return nil, parseError(msgUserAuthRequest)
-			}
-
-			pubKey, err := ParsePublicKey(pubKeyData)
-			if err != nil {
-				return nil, err
-			}
-
-			candidate, ok := cache.get(s.user, pubKeyData)
-			if !ok {
-				candidate.user = s.user
-				candidate.pubKeyData = pubKeyData
-				candidate.perms, candidate.result = config.PublicKeyCallback(s, pubKey)
-				if candidate.result == nil && candidate.perms != nil && candidate.perms.CriticalOptions != nil && candidate.perms.CriticalOptions[sourceAddressCriticalOption] != "" {
-					candidate.result = checkSourceAddress(
-						s.RemoteAddr(),
-						candidate.perms.CriticalOptions[sourceAddressCriticalOption])
-				}
-				cache.add(candidate)
-			}
-
-			if isQuery {
-				// The client can query if the given public key
-				// would be okay.
-
-				if len(payload) > 0 {
-					return nil, parseError(msgUserAuthRequest)
-				}
-
-				if candidate.result == nil {
-					okMsg := userAuthPubKeyOkMsg{
-						Algo:   algo,
-						PubKey: pubKeyData,
-					}
-					if err = s.transport.writePacket(Marshal(&okMsg)); err != nil {
-						return nil, err
-					}
-					continue userAuthLoop
-				}
-				authErr = candidate.result
-			} else {
-				sig, payload, ok := parseSignature(payload)
-				if !ok || len(payload) > 0 {
-					return nil, parseError(msgUserAuthRequest)
-				}
-				// Ensure the public key algo and signature algo
-				// are supported.  Compare the private key
-				// algorithm name that corresponds to algo with
-				// sig.Format.  This is usually the same, but
-				// for certs, the names differ.
-				if !isAcceptableAlgo(sig.Format) {
-					break
-				}
-				signedData := buildDataSignedForAuth(sessionID, userAuthReq, algoBytes, pubKeyData)
-
-				if err := pubKey.Verify(signedData, sig); err != nil {
-					return nil, err
-				}
-
-				authErr = candidate.result
-				perms = candidate.perms
-			}
-		default:
-			authErr = fmt.Errorf("ssh: unknown method %q", userAuthReq.Method)
-		}
-
-		authErrs = append(authErrs, authErr)
-
-		if config.AuthLogCallback != nil {
-			config.AuthLogCallback(s, userAuthReq.Method, authErr)
-		}
-
-		if authErr == nil {
-			break userAuthLoop
-		}
-
-		authFailures++
-
-		var failureMsg userAuthFailureMsg
-		if config.PasswordCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "password")
-		}
-		if config.PublicKeyCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "publickey")
-		}
-		if config.KeyboardInteractiveCallback != nil {
-			failureMsg.Methods = append(failureMsg.Methods, "keyboard-interactive")
-		}
-
-		if len(failureMsg.Methods) == 0 {
-			return nil, errors.New("ssh: no authentication methods configured but NoClientAuth is also false")
-		}
-
-		if err := s.transport.writePacket(Marshal(&failureMsg)); err != nil {
-			return nil, err
-		}
-	}
-
-	if err := s.transport.writePacket([]byte{msgUserAuthSuccess}); err != nil {
-		return nil, err
-	}
-	return perms, nil
-}
-
-// sshClientKeyboardInteractive implements a ClientKeyboardInteractive by
-// asking the client on the other side of a ServerConn.
-type sshClientKeyboardInteractive struct {
-	*connection
-}
-
-func (c *sshClientKeyboardInteractive) Challenge(user, instruction string, questions []string, echos []bool) (answers []string, err error) {
-	if len(questions) != len(echos) {
-		return nil, errors.New("ssh: echos and questions must have equal length")
-	}
-
-	var prompts []byte
-	for i := range questions {
-		prompts = appendString(prompts, questions[i])
-		prompts = appendBool(prompts, echos[i])
-	}
-
-	if err := c.transport.writePacket(Marshal(&userAuthInfoRequestMsg{
-		Instruction: instruction,
-		NumPrompts:  uint32(len(questions)),
-		Prompts:     prompts,
-	})); err != nil {
-		return nil, err
-	}
-
-	packet, err := c.transport.readPacket()
-	if err != nil {
-		return nil, err
-	}
-	if packet[0] != msgUserAuthInfoResponse {
-		return nil, unexpectedMessageError(msgUserAuthInfoResponse, packet[0])
-	}
-	packet = packet[1:]
-
-	n, packet, ok := parseUint32(packet)
-	if !ok || int(n) != len(questions) {
-		return nil, parseError(msgUserAuthInfoResponse)
-	}
-
-	for i := uint32(0); i < n; i++ {
-		ans, rest, ok := parseString(packet)
-		if !ok {
-			return nil, parseError(msgUserAuthInfoResponse)
-		}
-
-		answers = append(answers, string(ans))
-		packet = rest
-	}
-	if len(packet) != 0 {
-		return nil, errors.New("ssh: junk at end of message")
-	}
-
-	return answers, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/session.go b/installer/vendor/golang.org/x/crypto/ssh/session.go
deleted file mode 100644
index cc06e03f5c..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/session.go
+++ /dev/null
@@ -1,647 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Session implements an interactive session described in
-// "RFC 4254, section 6".
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"sync"
-)
-
-type Signal string
-
-// POSIX signals as listed in RFC 4254 Section 6.10.
-const (
-	SIGABRT Signal = "ABRT"
-	SIGALRM Signal = "ALRM"
-	SIGFPE  Signal = "FPE"
-	SIGHUP  Signal = "HUP"
-	SIGILL  Signal = "ILL"
-	SIGINT  Signal = "INT"
-	SIGKILL Signal = "KILL"
-	SIGPIPE Signal = "PIPE"
-	SIGQUIT Signal = "QUIT"
-	SIGSEGV Signal = "SEGV"
-	SIGTERM Signal = "TERM"
-	SIGUSR1 Signal = "USR1"
-	SIGUSR2 Signal = "USR2"
-)
-
-var signals = map[Signal]int{
-	SIGABRT: 6,
-	SIGALRM: 14,
-	SIGFPE:  8,
-	SIGHUP:  1,
-	SIGILL:  4,
-	SIGINT:  2,
-	SIGKILL: 9,
-	SIGPIPE: 13,
-	SIGQUIT: 3,
-	SIGSEGV: 11,
-	SIGTERM: 15,
-}
-
-type TerminalModes map[uint8]uint32
-
-// POSIX terminal mode flags as listed in RFC 4254 Section 8.
-const (
-	tty_OP_END    = 0
-	VINTR         = 1
-	VQUIT         = 2
-	VERASE        = 3
-	VKILL         = 4
-	VEOF          = 5
-	VEOL          = 6
-	VEOL2         = 7
-	VSTART        = 8
-	VSTOP         = 9
-	VSUSP         = 10
-	VDSUSP        = 11
-	VREPRINT      = 12
-	VWERASE       = 13
-	VLNEXT        = 14
-	VFLUSH        = 15
-	VSWTCH        = 16
-	VSTATUS       = 17
-	VDISCARD      = 18
-	IGNPAR        = 30
-	PARMRK        = 31
-	INPCK         = 32
-	ISTRIP        = 33
-	INLCR         = 34
-	IGNCR         = 35
-	ICRNL         = 36
-	IUCLC         = 37
-	IXON          = 38
-	IXANY         = 39
-	IXOFF         = 40
-	IMAXBEL       = 41
-	ISIG          = 50
-	ICANON        = 51
-	XCASE         = 52
-	ECHO          = 53
-	ECHOE         = 54
-	ECHOK         = 55
-	ECHONL        = 56
-	NOFLSH        = 57
-	TOSTOP        = 58
-	IEXTEN        = 59
-	ECHOCTL       = 60
-	ECHOKE        = 61
-	PENDIN        = 62
-	OPOST         = 70
-	OLCUC         = 71
-	ONLCR         = 72
-	OCRNL         = 73
-	ONOCR         = 74
-	ONLRET        = 75
-	CS7           = 90
-	CS8           = 91
-	PARENB        = 92
-	PARODD        = 93
-	TTY_OP_ISPEED = 128
-	TTY_OP_OSPEED = 129
-)
-
-// A Session represents a connection to a remote command or shell.
-type Session struct {
-	// Stdin specifies the remote process's standard input.
-	// If Stdin is nil, the remote process reads from an empty
-	// bytes.Buffer.
-	Stdin io.Reader
-
-	// Stdout and Stderr specify the remote process's standard
-	// output and error.
-	//
-	// If either is nil, Run connects the corresponding file
-	// descriptor to an instance of ioutil.Discard. There is a
-	// fixed amount of buffering that is shared for the two streams.
-	// If either blocks it may eventually cause the remote
-	// command to block.
-	Stdout io.Writer
-	Stderr io.Writer
-
-	ch        Channel // the channel backing this session
-	started   bool    // true once Start, Run or Shell is invoked.
-	copyFuncs []func() error
-	errors    chan error // one send per copyFunc
-
-	// true if pipe method is active
-	stdinpipe, stdoutpipe, stderrpipe bool
-
-	// stdinPipeWriter is non-nil if StdinPipe has not been called
-	// and Stdin was specified by the user; it is the write end of
-	// a pipe connecting Session.Stdin to the stdin channel.
-	stdinPipeWriter io.WriteCloser
-
-	exitStatus chan error
-}
-
-// SendRequest sends an out-of-band channel request on the SSH channel
-// underlying the session.
-func (s *Session) SendRequest(name string, wantReply bool, payload []byte) (bool, error) {
-	return s.ch.SendRequest(name, wantReply, payload)
-}
-
-func (s *Session) Close() error {
-	return s.ch.Close()
-}
-
-// RFC 4254 Section 6.4.
-type setenvRequest struct {
-	Name  string
-	Value string
-}
-
-// Setenv sets an environment variable that will be applied to any
-// command executed by Shell or Run.
-func (s *Session) Setenv(name, value string) error {
-	msg := setenvRequest{
-		Name:  name,
-		Value: value,
-	}
-	ok, err := s.ch.SendRequest("env", true, Marshal(&msg))
-	if err == nil && !ok {
-		err = errors.New("ssh: setenv failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.2.
-type ptyRequestMsg struct {
-	Term     string
-	Columns  uint32
-	Rows     uint32
-	Width    uint32
-	Height   uint32
-	Modelist string
-}
-
-// RequestPty requests the association of a pty with the session on the remote host.
-func (s *Session) RequestPty(term string, h, w int, termmodes TerminalModes) error {
-	var tm []byte
-	for k, v := range termmodes {
-		kv := struct {
-			Key byte
-			Val uint32
-		}{k, v}
-
-		tm = append(tm, Marshal(&kv)...)
-	}
-	tm = append(tm, tty_OP_END)
-	req := ptyRequestMsg{
-		Term:     term,
-		Columns:  uint32(w),
-		Rows:     uint32(h),
-		Width:    uint32(w * 8),
-		Height:   uint32(h * 8),
-		Modelist: string(tm),
-	}
-	ok, err := s.ch.SendRequest("pty-req", true, Marshal(&req))
-	if err == nil && !ok {
-		err = errors.New("ssh: pty-req failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.5.
-type subsystemRequestMsg struct {
-	Subsystem string
-}
-
-// RequestSubsystem requests the association of a subsystem with the session on the remote host.
-// A subsystem is a predefined command that runs in the background when the ssh session is initiated
-func (s *Session) RequestSubsystem(subsystem string) error {
-	msg := subsystemRequestMsg{
-		Subsystem: subsystem,
-	}
-	ok, err := s.ch.SendRequest("subsystem", true, Marshal(&msg))
-	if err == nil && !ok {
-		err = errors.New("ssh: subsystem request failed")
-	}
-	return err
-}
-
-// RFC 4254 Section 6.7.
-type ptyWindowChangeMsg struct {
-	Columns uint32
-	Rows    uint32
-	Width   uint32
-	Height  uint32
-}
-
-// WindowChange informs the remote host about a terminal window dimension change to h rows and w columns.
-func (s *Session) WindowChange(h, w int) error {
-	req := ptyWindowChangeMsg{
-		Columns: uint32(w),
-		Rows:    uint32(h),
-		Width:   uint32(w * 8),
-		Height:  uint32(h * 8),
-	}
-	_, err := s.ch.SendRequest("window-change", false, Marshal(&req))
-	return err
-}
-
-// RFC 4254 Section 6.9.
-type signalMsg struct {
-	Signal string
-}
-
-// Signal sends the given signal to the remote process.
-// sig is one of the SIG* constants.
-func (s *Session) Signal(sig Signal) error {
-	msg := signalMsg{
-		Signal: string(sig),
-	}
-
-	_, err := s.ch.SendRequest("signal", false, Marshal(&msg))
-	return err
-}
-
-// RFC 4254 Section 6.5.
-type execMsg struct {
-	Command string
-}
-
-// Start runs cmd on the remote host. Typically, the remote
-// server passes cmd to the shell for interpretation.
-// A Session only accepts one call to Run, Start or Shell.
-func (s *Session) Start(cmd string) error {
-	if s.started {
-		return errors.New("ssh: session already started")
-	}
-	req := execMsg{
-		Command: cmd,
-	}
-
-	ok, err := s.ch.SendRequest("exec", true, Marshal(&req))
-	if err == nil && !ok {
-		err = fmt.Errorf("ssh: command %v failed", cmd)
-	}
-	if err != nil {
-		return err
-	}
-	return s.start()
-}
-
-// Run runs cmd on the remote host. Typically, the remote
-// server passes cmd to the shell for interpretation.
-// A Session only accepts one call to Run, Start, Shell, Output,
-// or CombinedOutput.
-//
-// The returned error is nil if the command runs, has no problems
-// copying stdin, stdout, and stderr, and exits with a zero exit
-// status.
-//
-// If the remote server does not send an exit status, an error of type
-// *ExitMissingError is returned. If the command completes
-// unsuccessfully or is interrupted by a signal, the error is of type
-// *ExitError. Other error types may be returned for I/O problems.
-func (s *Session) Run(cmd string) error {
-	err := s.Start(cmd)
-	if err != nil {
-		return err
-	}
-	return s.Wait()
-}
-
-// Output runs cmd on the remote host and returns its standard output.
-func (s *Session) Output(cmd string) ([]byte, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	var b bytes.Buffer
-	s.Stdout = &b
-	err := s.Run(cmd)
-	return b.Bytes(), err
-}
-
-type singleWriter struct {
-	b  bytes.Buffer
-	mu sync.Mutex
-}
-
-func (w *singleWriter) Write(p []byte) (int, error) {
-	w.mu.Lock()
-	defer w.mu.Unlock()
-	return w.b.Write(p)
-}
-
-// CombinedOutput runs cmd on the remote host and returns its combined
-// standard output and standard error.
-func (s *Session) CombinedOutput(cmd string) ([]byte, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	if s.Stderr != nil {
-		return nil, errors.New("ssh: Stderr already set")
-	}
-	var b singleWriter
-	s.Stdout = &b
-	s.Stderr = &b
-	err := s.Run(cmd)
-	return b.b.Bytes(), err
-}
-
-// Shell starts a login shell on the remote host. A Session only
-// accepts one call to Run, Start, Shell, Output, or CombinedOutput.
-func (s *Session) Shell() error {
-	if s.started {
-		return errors.New("ssh: session already started")
-	}
-
-	ok, err := s.ch.SendRequest("shell", true, nil)
-	if err == nil && !ok {
-		return errors.New("ssh: could not start shell")
-	}
-	if err != nil {
-		return err
-	}
-	return s.start()
-}
-
-func (s *Session) start() error {
-	s.started = true
-
-	type F func(*Session)
-	for _, setupFd := range []F{(*Session).stdin, (*Session).stdout, (*Session).stderr} {
-		setupFd(s)
-	}
-
-	s.errors = make(chan error, len(s.copyFuncs))
-	for _, fn := range s.copyFuncs {
-		go func(fn func() error) {
-			s.errors <- fn()
-		}(fn)
-	}
-	return nil
-}
-
-// Wait waits for the remote command to exit.
-//
-// The returned error is nil if the command runs, has no problems
-// copying stdin, stdout, and stderr, and exits with a zero exit
-// status.
-//
-// If the remote server does not send an exit status, an error of type
-// *ExitMissingError is returned. If the command completes
-// unsuccessfully or is interrupted by a signal, the error is of type
-// *ExitError. Other error types may be returned for I/O problems.
-func (s *Session) Wait() error {
-	if !s.started {
-		return errors.New("ssh: session not started")
-	}
-	waitErr := <-s.exitStatus
-
-	if s.stdinPipeWriter != nil {
-		s.stdinPipeWriter.Close()
-	}
-	var copyError error
-	for _ = range s.copyFuncs {
-		if err := <-s.errors; err != nil && copyError == nil {
-			copyError = err
-		}
-	}
-	if waitErr != nil {
-		return waitErr
-	}
-	return copyError
-}
-
-func (s *Session) wait(reqs <-chan *Request) error {
-	wm := Waitmsg{status: -1}
-	// Wait for msg channel to be closed before returning.
-	for msg := range reqs {
-		switch msg.Type {
-		case "exit-status":
-			wm.status = int(binary.BigEndian.Uint32(msg.Payload))
-		case "exit-signal":
-			var sigval struct {
-				Signal     string
-				CoreDumped bool
-				Error      string
-				Lang       string
-			}
-			if err := Unmarshal(msg.Payload, &sigval); err != nil {
-				return err
-			}
-
-			// Must sanitize strings?
-			wm.signal = sigval.Signal
-			wm.msg = sigval.Error
-			wm.lang = sigval.Lang
-		default:
-			// This handles keepalives and matches
-			// OpenSSH's behaviour.
-			if msg.WantReply {
-				msg.Reply(false, nil)
-			}
-		}
-	}
-	if wm.status == 0 {
-		return nil
-	}
-	if wm.status == -1 {
-		// exit-status was never sent from server
-		if wm.signal == "" {
-			// signal was not sent either.  RFC 4254
-			// section 6.10 recommends against this
-			// behavior, but it is allowed, so we let
-			// clients handle it.
-			return &ExitMissingError{}
-		}
-		wm.status = 128
-		if _, ok := signals[Signal(wm.signal)]; ok {
-			wm.status += signals[Signal(wm.signal)]
-		}
-	}
-
-	return &ExitError{wm}
-}
-
-// ExitMissingError is returned if a session is torn down cleanly, but
-// the server sends no confirmation of the exit status.
-type ExitMissingError struct{}
-
-func (e *ExitMissingError) Error() string {
-	return "wait: remote command exited without exit status or exit signal"
-}
-
-func (s *Session) stdin() {
-	if s.stdinpipe {
-		return
-	}
-	var stdin io.Reader
-	if s.Stdin == nil {
-		stdin = new(bytes.Buffer)
-	} else {
-		r, w := io.Pipe()
-		go func() {
-			_, err := io.Copy(w, s.Stdin)
-			w.CloseWithError(err)
-		}()
-		stdin, s.stdinPipeWriter = r, w
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.ch, stdin)
-		if err1 := s.ch.CloseWrite(); err == nil && err1 != io.EOF {
-			err = err1
-		}
-		return err
-	})
-}
-
-func (s *Session) stdout() {
-	if s.stdoutpipe {
-		return
-	}
-	if s.Stdout == nil {
-		s.Stdout = ioutil.Discard
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.Stdout, s.ch)
-		return err
-	})
-}
-
-func (s *Session) stderr() {
-	if s.stderrpipe {
-		return
-	}
-	if s.Stderr == nil {
-		s.Stderr = ioutil.Discard
-	}
-	s.copyFuncs = append(s.copyFuncs, func() error {
-		_, err := io.Copy(s.Stderr, s.ch.Stderr())
-		return err
-	})
-}
-
-// sessionStdin reroutes Close to CloseWrite.
-type sessionStdin struct {
-	io.Writer
-	ch Channel
-}
-
-func (s *sessionStdin) Close() error {
-	return s.ch.CloseWrite()
-}
-
-// StdinPipe returns a pipe that will be connected to the
-// remote command's standard input when the command starts.
-func (s *Session) StdinPipe() (io.WriteCloser, error) {
-	if s.Stdin != nil {
-		return nil, errors.New("ssh: Stdin already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StdinPipe after process started")
-	}
-	s.stdinpipe = true
-	return &sessionStdin{s.ch, s.ch}, nil
-}
-
-// StdoutPipe returns a pipe that will be connected to the
-// remote command's standard output when the command starts.
-// There is a fixed amount of buffering that is shared between
-// stdout and stderr streams. If the StdoutPipe reader is
-// not serviced fast enough it may eventually cause the
-// remote command to block.
-func (s *Session) StdoutPipe() (io.Reader, error) {
-	if s.Stdout != nil {
-		return nil, errors.New("ssh: Stdout already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StdoutPipe after process started")
-	}
-	s.stdoutpipe = true
-	return s.ch, nil
-}
-
-// StderrPipe returns a pipe that will be connected to the
-// remote command's standard error when the command starts.
-// There is a fixed amount of buffering that is shared between
-// stdout and stderr streams. If the StderrPipe reader is
-// not serviced fast enough it may eventually cause the
-// remote command to block.
-func (s *Session) StderrPipe() (io.Reader, error) {
-	if s.Stderr != nil {
-		return nil, errors.New("ssh: Stderr already set")
-	}
-	if s.started {
-		return nil, errors.New("ssh: StderrPipe after process started")
-	}
-	s.stderrpipe = true
-	return s.ch.Stderr(), nil
-}
-
-// newSession returns a new interactive session on the remote host.
-func newSession(ch Channel, reqs <-chan *Request) (*Session, error) {
-	s := &Session{
-		ch: ch,
-	}
-	s.exitStatus = make(chan error, 1)
-	go func() {
-		s.exitStatus <- s.wait(reqs)
-	}()
-
-	return s, nil
-}
-
-// An ExitError reports unsuccessful completion of a remote command.
-type ExitError struct {
-	Waitmsg
-}
-
-func (e *ExitError) Error() string {
-	return e.Waitmsg.String()
-}
-
-// Waitmsg stores the information about an exited remote command
-// as reported by Wait.
-type Waitmsg struct {
-	status int
-	signal string
-	msg    string
-	lang   string
-}
-
-// ExitStatus returns the exit status of the remote command.
-func (w Waitmsg) ExitStatus() int {
-	return w.status
-}
-
-// Signal returns the exit signal of the remote command if
-// it was terminated violently.
-func (w Waitmsg) Signal() string {
-	return w.signal
-}
-
-// Msg returns the exit message given by the remote command
-func (w Waitmsg) Msg() string {
-	return w.msg
-}
-
-// Lang returns the language tag. See RFC 3066
-func (w Waitmsg) Lang() string {
-	return w.lang
-}
-
-func (w Waitmsg) String() string {
-	str := fmt.Sprintf("Process exited with status %v", w.status)
-	if w.signal != "" {
-		str += fmt.Sprintf(" from signal %v", w.signal)
-	}
-	if w.msg != "" {
-		str += fmt.Sprintf(". Reason was: %v", w.msg)
-	}
-	return str
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/session_test.go b/installer/vendor/golang.org/x/crypto/ssh/session_test.go
deleted file mode 100644
index 7dce6dd699..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/session_test.go
+++ /dev/null
@@ -1,774 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-// Session tests.
-
-import (
-	"bytes"
-	crypto_rand "crypto/rand"
-	"errors"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"testing"
-
-	"golang.org/x/crypto/ssh/terminal"
-)
-
-type serverType func(Channel, <-chan *Request, *testing.T)
-
-// dial constructs a new test server and returns a *ClientConn.
-func dial(handler serverType, t *testing.T) *Client {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-
-	go func() {
-		defer c1.Close()
-		conf := ServerConfig{
-			NoClientAuth: true,
-		}
-		conf.AddHostKey(testSigners["rsa"])
-
-		_, chans, reqs, err := NewServerConn(c1, &conf)
-		if err != nil {
-			t.Fatalf("Unable to handshake: %v", err)
-		}
-		go DiscardRequests(reqs)
-
-		for newCh := range chans {
-			if newCh.ChannelType() != "session" {
-				newCh.Reject(UnknownChannelType, "unknown channel type")
-				continue
-			}
-
-			ch, inReqs, err := newCh.Accept()
-			if err != nil {
-				t.Errorf("Accept: %v", err)
-				continue
-			}
-			go func() {
-				handler(ch, inReqs, t)
-			}()
-		}
-	}()
-
-	config := &ClientConfig{
-		User:            "testuser",
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-
-	conn, chans, reqs, err := NewClientConn(c2, "", config)
-	if err != nil {
-		t.Fatalf("unable to dial remote side: %v", err)
-	}
-
-	return NewClient(conn, chans, reqs)
-}
-
-// Test a simple string is returned to session.Stdout.
-func TestSessionShell(t *testing.T) {
-	conn := dial(shellHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	stdout := new(bytes.Buffer)
-	session.Stdout = stdout
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %s", err)
-	}
-	if err := session.Wait(); err != nil {
-		t.Fatalf("Remote command did not exit cleanly: %v", err)
-	}
-	actual := stdout.String()
-	if actual != "golang" {
-		t.Fatalf("Remote shell did not return expected string: expected=golang, actual=%s", actual)
-	}
-}
-
-// TODO(dfc) add support for Std{in,err}Pipe when the Server supports it.
-
-// Test a simple string is returned via StdoutPipe.
-func TestSessionStdoutPipe(t *testing.T) {
-	conn := dial(shellHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		t.Fatalf("Unable to request StdoutPipe(): %v", err)
-	}
-	var buf bytes.Buffer
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	done := make(chan bool, 1)
-	go func() {
-		if _, err := io.Copy(&buf, stdout); err != nil {
-			t.Errorf("Copy of stdout failed: %v", err)
-		}
-		done <- true
-	}()
-	if err := session.Wait(); err != nil {
-		t.Fatalf("Remote command did not exit cleanly: %v", err)
-	}
-	<-done
-	actual := buf.String()
-	if actual != "golang" {
-		t.Fatalf("Remote shell did not return expected string: expected=golang, actual=%s", actual)
-	}
-}
-
-// Test that a simple string is returned via the Output helper,
-// and that stderr is discarded.
-func TestSessionOutput(t *testing.T) {
-	conn := dial(fixedOutputHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-
-	buf, err := session.Output("") // cmd is ignored by fixedOutputHandler
-	if err != nil {
-		t.Error("Remote command did not exit cleanly:", err)
-	}
-	w := "this-is-stdout."
-	g := string(buf)
-	if g != w {
-		t.Error("Remote command did not return expected string:")
-		t.Logf("want %q", w)
-		t.Logf("got  %q", g)
-	}
-}
-
-// Test that both stdout and stderr are returned
-// via the CombinedOutput helper.
-func TestSessionCombinedOutput(t *testing.T) {
-	conn := dial(fixedOutputHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-
-	buf, err := session.CombinedOutput("") // cmd is ignored by fixedOutputHandler
-	if err != nil {
-		t.Error("Remote command did not exit cleanly:", err)
-	}
-	const stdout = "this-is-stdout."
-	const stderr = "this-is-stderr."
-	g := string(buf)
-	if g != stdout+stderr && g != stderr+stdout {
-		t.Error("Remote command did not return expected string:")
-		t.Logf("want %q, or %q", stdout+stderr, stderr+stdout)
-		t.Logf("got  %q", g)
-	}
-}
-
-// Test non-0 exit status is returned correctly.
-func TestExitStatusNonZero(t *testing.T) {
-	conn := dial(exitStatusNonZeroHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err == nil {
-		t.Fatalf("expected command to fail but it didn't")
-	}
-	e, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected *ExitError but got %T", err)
-	}
-	if e.ExitStatus() != 15 {
-		t.Fatalf("expected command to exit with 15 but got %v", e.ExitStatus())
-	}
-}
-
-// Test 0 exit status is returned correctly.
-func TestExitStatusZero(t *testing.T) {
-	conn := dial(exitStatusZeroHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err != nil {
-		t.Fatalf("expected nil but got %v", err)
-	}
-}
-
-// Test exit signal and status are both returned correctly.
-func TestExitSignalAndStatus(t *testing.T) {
-	conn := dial(exitSignalAndStatusHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err == nil {
-		t.Fatalf("expected command to fail but it didn't")
-	}
-	e, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected *ExitError but got %T", err)
-	}
-	if e.Signal() != "TERM" || e.ExitStatus() != 15 {
-		t.Fatalf("expected command to exit with signal TERM and status 15 but got signal %s and status %v", e.Signal(), e.ExitStatus())
-	}
-}
-
-// Test exit signal and status are both returned correctly.
-func TestKnownExitSignalOnly(t *testing.T) {
-	conn := dial(exitSignalHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err == nil {
-		t.Fatalf("expected command to fail but it didn't")
-	}
-	e, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected *ExitError but got %T", err)
-	}
-	if e.Signal() != "TERM" || e.ExitStatus() != 143 {
-		t.Fatalf("expected command to exit with signal TERM and status 143 but got signal %s and status %v", e.Signal(), e.ExitStatus())
-	}
-}
-
-// Test exit signal and status are both returned correctly.
-func TestUnknownExitSignal(t *testing.T) {
-	conn := dial(exitSignalUnknownHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err == nil {
-		t.Fatalf("expected command to fail but it didn't")
-	}
-	e, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected *ExitError but got %T", err)
-	}
-	if e.Signal() != "SYS" || e.ExitStatus() != 128 {
-		t.Fatalf("expected command to exit with signal SYS and status 128 but got signal %s and status %v", e.Signal(), e.ExitStatus())
-	}
-}
-
-func TestExitWithoutStatusOrSignal(t *testing.T) {
-	conn := dial(exitWithoutSignalOrStatus, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("Unable to request new session: %v", err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err == nil {
-		t.Fatalf("expected command to fail but it didn't")
-	}
-	if _, ok := err.(*ExitMissingError); !ok {
-		t.Fatalf("got %T want *ExitMissingError", err)
-	}
-}
-
-// windowTestBytes is the number of bytes that we'll send to the SSH server.
-const windowTestBytes = 16000 * 200
-
-// TestServerWindow writes random data to the server. The server is expected to echo
-// the same data back, which is compared against the original.
-func TestServerWindow(t *testing.T) {
-	origBuf := bytes.NewBuffer(make([]byte, 0, windowTestBytes))
-	io.CopyN(origBuf, crypto_rand.Reader, windowTestBytes)
-	origBytes := origBuf.Bytes()
-
-	conn := dial(echoHandler, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer session.Close()
-	result := make(chan []byte)
-
-	go func() {
-		defer close(result)
-		echoedBuf := bytes.NewBuffer(make([]byte, 0, windowTestBytes))
-		serverStdout, err := session.StdoutPipe()
-		if err != nil {
-			t.Errorf("StdoutPipe failed: %v", err)
-			return
-		}
-		n, err := copyNRandomly("stdout", echoedBuf, serverStdout, windowTestBytes)
-		if err != nil && err != io.EOF {
-			t.Errorf("Read only %d bytes from server, expected %d: %v", n, windowTestBytes, err)
-		}
-		result <- echoedBuf.Bytes()
-	}()
-
-	serverStdin, err := session.StdinPipe()
-	if err != nil {
-		t.Fatalf("StdinPipe failed: %v", err)
-	}
-	written, err := copyNRandomly("stdin", serverStdin, origBuf, windowTestBytes)
-	if err != nil {
-		t.Fatalf("failed to copy origBuf to serverStdin: %v", err)
-	}
-	if written != windowTestBytes {
-		t.Fatalf("Wrote only %d of %d bytes to server", written, windowTestBytes)
-	}
-
-	echoedBytes := <-result
-
-	if !bytes.Equal(origBytes, echoedBytes) {
-		t.Fatalf("Echoed buffer differed from original, orig %d, echoed %d", len(origBytes), len(echoedBytes))
-	}
-}
-
-// Verify the client can handle a keepalive packet from the server.
-func TestClientHandlesKeepalives(t *testing.T) {
-	conn := dial(channelKeepaliveSender, t)
-	defer conn.Close()
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer session.Close()
-	if err := session.Shell(); err != nil {
-		t.Fatalf("Unable to execute command: %v", err)
-	}
-	err = session.Wait()
-	if err != nil {
-		t.Fatalf("expected nil but got: %v", err)
-	}
-}
-
-type exitStatusMsg struct {
-	Status uint32
-}
-
-type exitSignalMsg struct {
-	Signal     string
-	CoreDumped bool
-	Errmsg     string
-	Lang       string
-}
-
-func handleTerminalRequests(in <-chan *Request) {
-	for req := range in {
-		ok := false
-		switch req.Type {
-		case "shell":
-			ok = true
-			if len(req.Payload) > 0 {
-				// We don't accept any commands, only the default shell.
-				ok = false
-			}
-		case "env":
-			ok = true
-		}
-		req.Reply(ok, nil)
-	}
-}
-
-func newServerShell(ch Channel, in <-chan *Request, prompt string) *terminal.Terminal {
-	term := terminal.NewTerminal(ch, prompt)
-	go handleTerminalRequests(in)
-	return term
-}
-
-func exitStatusZeroHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	// this string is returned to stdout
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	sendStatus(0, ch, t)
-}
-
-func exitStatusNonZeroHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	sendStatus(15, ch, t)
-}
-
-func exitSignalAndStatusHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	sendStatus(15, ch, t)
-	sendSignal("TERM", ch, t)
-}
-
-func exitSignalHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	sendSignal("TERM", ch, t)
-}
-
-func exitSignalUnknownHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	sendSignal("SYS", ch, t)
-}
-
-func exitWithoutSignalOrStatus(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-}
-
-func shellHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	// this string is returned to stdout
-	shell := newServerShell(ch, in, "golang")
-	readLine(shell, t)
-	sendStatus(0, ch, t)
-}
-
-// Ignores the command, writes fixed strings to stderr and stdout.
-// Strings are "this-is-stdout." and "this-is-stderr.".
-func fixedOutputHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	_, err := ch.Read(nil)
-
-	req, ok := <-in
-	if !ok {
-		t.Fatalf("error: expected channel request, got: %#v", err)
-		return
-	}
-
-	// ignore request, always send some text
-	req.Reply(true, nil)
-
-	_, err = io.WriteString(ch, "this-is-stdout.")
-	if err != nil {
-		t.Fatalf("error writing on server: %v", err)
-	}
-	_, err = io.WriteString(ch.Stderr(), "this-is-stderr.")
-	if err != nil {
-		t.Fatalf("error writing on server: %v", err)
-	}
-	sendStatus(0, ch, t)
-}
-
-func readLine(shell *terminal.Terminal, t *testing.T) {
-	if _, err := shell.ReadLine(); err != nil && err != io.EOF {
-		t.Errorf("unable to read line: %v", err)
-	}
-}
-
-func sendStatus(status uint32, ch Channel, t *testing.T) {
-	msg := exitStatusMsg{
-		Status: status,
-	}
-	if _, err := ch.SendRequest("exit-status", false, Marshal(&msg)); err != nil {
-		t.Errorf("unable to send status: %v", err)
-	}
-}
-
-func sendSignal(signal string, ch Channel, t *testing.T) {
-	sig := exitSignalMsg{
-		Signal:     signal,
-		CoreDumped: false,
-		Errmsg:     "Process terminated",
-		Lang:       "en-GB-oed",
-	}
-	if _, err := ch.SendRequest("exit-signal", false, Marshal(&sig)); err != nil {
-		t.Errorf("unable to send signal: %v", err)
-	}
-}
-
-func discardHandler(ch Channel, t *testing.T) {
-	defer ch.Close()
-	io.Copy(ioutil.Discard, ch)
-}
-
-func echoHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	if n, err := copyNRandomly("echohandler", ch, ch, windowTestBytes); err != nil {
-		t.Errorf("short write, wrote %d, expected %d: %v ", n, windowTestBytes, err)
-	}
-}
-
-// copyNRandomly copies n bytes from src to dst. It uses a variable, and random,
-// buffer size to exercise more code paths.
-func copyNRandomly(title string, dst io.Writer, src io.Reader, n int) (int, error) {
-	var (
-		buf       = make([]byte, 32*1024)
-		written   int
-		remaining = n
-	)
-	for remaining > 0 {
-		l := rand.Intn(1 << 15)
-		if remaining < l {
-			l = remaining
-		}
-		nr, er := src.Read(buf[:l])
-		nw, ew := dst.Write(buf[:nr])
-		remaining -= nw
-		written += nw
-		if ew != nil {
-			return written, ew
-		}
-		if nr != nw {
-			return written, io.ErrShortWrite
-		}
-		if er != nil && er != io.EOF {
-			return written, er
-		}
-	}
-	return written, nil
-}
-
-func channelKeepaliveSender(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	shell := newServerShell(ch, in, "> ")
-	readLine(shell, t)
-	if _, err := ch.SendRequest("keepalive@openssh.com", true, nil); err != nil {
-		t.Errorf("unable to send channel keepalive request: %v", err)
-	}
-	sendStatus(0, ch, t)
-}
-
-func TestClientWriteEOF(t *testing.T) {
-	conn := dial(simpleEchoHandler, t)
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer session.Close()
-	stdin, err := session.StdinPipe()
-	if err != nil {
-		t.Fatalf("StdinPipe failed: %v", err)
-	}
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		t.Fatalf("StdoutPipe failed: %v", err)
-	}
-
-	data := []byte(`0000`)
-	_, err = stdin.Write(data)
-	if err != nil {
-		t.Fatalf("Write failed: %v", err)
-	}
-	stdin.Close()
-
-	res, err := ioutil.ReadAll(stdout)
-	if err != nil {
-		t.Fatalf("Read failed: %v", err)
-	}
-
-	if !bytes.Equal(data, res) {
-		t.Fatalf("Read differed from write, wrote: %v, read: %v", data, res)
-	}
-}
-
-func simpleEchoHandler(ch Channel, in <-chan *Request, t *testing.T) {
-	defer ch.Close()
-	data, err := ioutil.ReadAll(ch)
-	if err != nil {
-		t.Errorf("handler read error: %v", err)
-	}
-	_, err = ch.Write(data)
-	if err != nil {
-		t.Errorf("handler write error: %v", err)
-	}
-}
-
-func TestSessionID(t *testing.T) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	serverID := make(chan []byte, 1)
-	clientID := make(chan []byte, 1)
-
-	serverConf := &ServerConfig{
-		NoClientAuth: true,
-	}
-	serverConf.AddHostKey(testSigners["ecdsa"])
-	clientConf := &ClientConfig{
-		HostKeyCallback: InsecureIgnoreHostKey(),
-		User:            "user",
-	}
-
-	go func() {
-		conn, chans, reqs, err := NewServerConn(c1, serverConf)
-		if err != nil {
-			t.Fatalf("server handshake: %v", err)
-		}
-		serverID <- conn.SessionID()
-		go DiscardRequests(reqs)
-		for ch := range chans {
-			ch.Reject(Prohibited, "")
-		}
-	}()
-
-	go func() {
-		conn, chans, reqs, err := NewClientConn(c2, "", clientConf)
-		if err != nil {
-			t.Fatalf("client handshake: %v", err)
-		}
-		clientID <- conn.SessionID()
-		go DiscardRequests(reqs)
-		for ch := range chans {
-			ch.Reject(Prohibited, "")
-		}
-	}()
-
-	s := <-serverID
-	c := <-clientID
-	if bytes.Compare(s, c) != 0 {
-		t.Errorf("server session ID (%x) != client session ID (%x)", s, c)
-	} else if len(s) == 0 {
-		t.Errorf("client and server SessionID were empty.")
-	}
-}
-
-type noReadConn struct {
-	readSeen bool
-	net.Conn
-}
-
-func (c *noReadConn) Close() error {
-	return nil
-}
-
-func (c *noReadConn) Read(b []byte) (int, error) {
-	c.readSeen = true
-	return 0, errors.New("noReadConn error")
-}
-
-func TestInvalidServerConfiguration(t *testing.T) {
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	serveConn := noReadConn{Conn: c1}
-	serverConf := &ServerConfig{}
-
-	NewServerConn(&serveConn, serverConf)
-	if serveConn.readSeen {
-		t.Fatalf("NewServerConn attempted to Read() from Conn while configuration is missing host key")
-	}
-
-	serverConf.AddHostKey(testSigners["ecdsa"])
-
-	NewServerConn(&serveConn, serverConf)
-	if serveConn.readSeen {
-		t.Fatalf("NewServerConn attempted to Read() from Conn while configuration is missing authentication method")
-	}
-}
-
-func TestHostKeyAlgorithms(t *testing.T) {
-	serverConf := &ServerConfig{
-		NoClientAuth: true,
-	}
-	serverConf.AddHostKey(testSigners["rsa"])
-	serverConf.AddHostKey(testSigners["ecdsa"])
-
-	connect := func(clientConf *ClientConfig, want string) {
-		var alg string
-		clientConf.HostKeyCallback = func(h string, a net.Addr, key PublicKey) error {
-			alg = key.Type()
-			return nil
-		}
-		c1, c2, err := netPipe()
-		if err != nil {
-			t.Fatalf("netPipe: %v", err)
-		}
-		defer c1.Close()
-		defer c2.Close()
-
-		go NewServerConn(c1, serverConf)
-		_, _, _, err = NewClientConn(c2, "", clientConf)
-		if err != nil {
-			t.Fatalf("NewClientConn: %v", err)
-		}
-		if alg != want {
-			t.Errorf("selected key algorithm %s, want %s", alg, want)
-		}
-	}
-
-	// By default, we get the preferred algorithm, which is ECDSA 256.
-
-	clientConf := &ClientConfig{
-		HostKeyCallback: InsecureIgnoreHostKey(),
-	}
-	connect(clientConf, KeyAlgoECDSA256)
-
-	// Client asks for RSA explicitly.
-	clientConf.HostKeyAlgorithms = []string{KeyAlgoRSA}
-	connect(clientConf, KeyAlgoRSA)
-
-	c1, c2, err := netPipe()
-	if err != nil {
-		t.Fatalf("netPipe: %v", err)
-	}
-	defer c1.Close()
-	defer c2.Close()
-
-	go NewServerConn(c1, serverConf)
-	clientConf.HostKeyAlgorithms = []string{"nonexistent-hostkey-algo"}
-	_, _, _, err = NewClientConn(c2, "", clientConf)
-	if err == nil {
-		t.Fatal("succeeded connecting with unknown hostkey algorithm")
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/streamlocal.go b/installer/vendor/golang.org/x/crypto/ssh/streamlocal.go
deleted file mode 100644
index a2dccc64c7..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/streamlocal.go
+++ /dev/null
@@ -1,115 +0,0 @@
-package ssh
-
-import (
-	"errors"
-	"io"
-	"net"
-)
-
-// streamLocalChannelOpenDirectMsg is a struct used for SSH_MSG_CHANNEL_OPEN message
-// with "direct-streamlocal@openssh.com" string.
-//
-// See openssh-portable/PROTOCOL, section 2.4. connection: Unix domain socket forwarding
-// https://github.com/openssh/openssh-portable/blob/master/PROTOCOL#L235
-type streamLocalChannelOpenDirectMsg struct {
-	socketPath string
-	reserved0  string
-	reserved1  uint32
-}
-
-// forwardedStreamLocalPayload is a struct used for SSH_MSG_CHANNEL_OPEN message
-// with "forwarded-streamlocal@openssh.com" string.
-type forwardedStreamLocalPayload struct {
-	SocketPath string
-	Reserved0  string
-}
-
-// streamLocalChannelForwardMsg is a struct used for SSH2_MSG_GLOBAL_REQUEST message
-// with "streamlocal-forward@openssh.com"/"cancel-streamlocal-forward@openssh.com" string.
-type streamLocalChannelForwardMsg struct {
-	socketPath string
-}
-
-// ListenUnix is similar to ListenTCP but uses a Unix domain socket.
-func (c *Client) ListenUnix(socketPath string) (net.Listener, error) {
-	m := streamLocalChannelForwardMsg{
-		socketPath,
-	}
-	// send message
-	ok, _, err := c.SendRequest("streamlocal-forward@openssh.com", true, Marshal(&m))
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, errors.New("ssh: streamlocal-forward@openssh.com request denied by peer")
-	}
-	ch := c.forwards.add(&net.UnixAddr{Name: socketPath, Net: "unix"})
-
-	return &unixListener{socketPath, c, ch}, nil
-}
-
-func (c *Client) dialStreamLocal(socketPath string) (Channel, error) {
-	msg := streamLocalChannelOpenDirectMsg{
-		socketPath: socketPath,
-	}
-	ch, in, err := c.OpenChannel("direct-streamlocal@openssh.com", Marshal(&msg))
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(in)
-	return ch, err
-}
-
-type unixListener struct {
-	socketPath string
-
-	conn *Client
-	in   <-chan forward
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (l *unixListener) Accept() (net.Conn, error) {
-	s, ok := <-l.in
-	if !ok {
-		return nil, io.EOF
-	}
-	ch, incoming, err := s.newCh.Accept()
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(incoming)
-
-	return &chanConn{
-		Channel: ch,
-		laddr: &net.UnixAddr{
-			Name: l.socketPath,
-			Net:  "unix",
-		},
-		raddr: &net.UnixAddr{
-			Name: "@",
-			Net:  "unix",
-		},
-	}, nil
-}
-
-// Close closes the listener.
-func (l *unixListener) Close() error {
-	// this also closes the listener.
-	l.conn.forwards.remove(&net.UnixAddr{Name: l.socketPath, Net: "unix"})
-	m := streamLocalChannelForwardMsg{
-		l.socketPath,
-	}
-	ok, _, err := l.conn.SendRequest("cancel-streamlocal-forward@openssh.com", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: cancel-streamlocal-forward@openssh.com failed")
-	}
-	return err
-}
-
-// Addr returns the listener's network address.
-func (l *unixListener) Addr() net.Addr {
-	return &net.UnixAddr{
-		Name: l.socketPath,
-		Net:  "unix",
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/tcpip.go b/installer/vendor/golang.org/x/crypto/ssh/tcpip.go
deleted file mode 100644
index acf17175df..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/tcpip.go
+++ /dev/null
@@ -1,465 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"math/rand"
-	"net"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-// Listen requests the remote peer open a listening socket on
-// addr. Incoming connections will be available by calling Accept on
-// the returned net.Listener. The listener must be serviced, or the
-// SSH connection may hang.
-// N must be "tcp", "tcp4", "tcp6", or "unix".
-func (c *Client) Listen(n, addr string) (net.Listener, error) {
-	switch n {
-	case "tcp", "tcp4", "tcp6":
-		laddr, err := net.ResolveTCPAddr(n, addr)
-		if err != nil {
-			return nil, err
-		}
-		return c.ListenTCP(laddr)
-	case "unix":
-		return c.ListenUnix(addr)
-	default:
-		return nil, fmt.Errorf("ssh: unsupported protocol: %s", n)
-	}
-}
-
-// Automatic port allocation is broken with OpenSSH before 6.0. See
-// also https://bugzilla.mindrot.org/show_bug.cgi?id=2017.  In
-// particular, OpenSSH 5.9 sends a channelOpenMsg with port number 0,
-// rather than the actual port number. This means you can never open
-// two different listeners with auto allocated ports. We work around
-// this by trying explicit ports until we succeed.
-
-const openSSHPrefix = "OpenSSH_"
-
-var portRandomizer = rand.New(rand.NewSource(time.Now().UnixNano()))
-
-// isBrokenOpenSSHVersion returns true if the given version string
-// specifies a version of OpenSSH that is known to have a bug in port
-// forwarding.
-func isBrokenOpenSSHVersion(versionStr string) bool {
-	i := strings.Index(versionStr, openSSHPrefix)
-	if i < 0 {
-		return false
-	}
-	i += len(openSSHPrefix)
-	j := i
-	for ; j < len(versionStr); j++ {
-		if versionStr[j] < '0' || versionStr[j] > '9' {
-			break
-		}
-	}
-	version, _ := strconv.Atoi(versionStr[i:j])
-	return version < 6
-}
-
-// autoPortListenWorkaround simulates automatic port allocation by
-// trying random ports repeatedly.
-func (c *Client) autoPortListenWorkaround(laddr *net.TCPAddr) (net.Listener, error) {
-	var sshListener net.Listener
-	var err error
-	const tries = 10
-	for i := 0; i < tries; i++ {
-		addr := *laddr
-		addr.Port = 1024 + portRandomizer.Intn(60000)
-		sshListener, err = c.ListenTCP(&addr)
-		if err == nil {
-			laddr.Port = addr.Port
-			return sshListener, err
-		}
-	}
-	return nil, fmt.Errorf("ssh: listen on random port failed after %d tries: %v", tries, err)
-}
-
-// RFC 4254 7.1
-type channelForwardMsg struct {
-	addr  string
-	rport uint32
-}
-
-// ListenTCP requests the remote peer open a listening socket
-// on laddr. Incoming connections will be available by calling
-// Accept on the returned net.Listener.
-func (c *Client) ListenTCP(laddr *net.TCPAddr) (net.Listener, error) {
-	if laddr.Port == 0 && isBrokenOpenSSHVersion(string(c.ServerVersion())) {
-		return c.autoPortListenWorkaround(laddr)
-	}
-
-	m := channelForwardMsg{
-		laddr.IP.String(),
-		uint32(laddr.Port),
-	}
-	// send message
-	ok, resp, err := c.SendRequest("tcpip-forward", true, Marshal(&m))
-	if err != nil {
-		return nil, err
-	}
-	if !ok {
-		return nil, errors.New("ssh: tcpip-forward request denied by peer")
-	}
-
-	// If the original port was 0, then the remote side will
-	// supply a real port number in the response.
-	if laddr.Port == 0 {
-		var p struct {
-			Port uint32
-		}
-		if err := Unmarshal(resp, &p); err != nil {
-			return nil, err
-		}
-		laddr.Port = int(p.Port)
-	}
-
-	// Register this forward, using the port number we obtained.
-	ch := c.forwards.add(laddr)
-
-	return &tcpListener{laddr, c, ch}, nil
-}
-
-// forwardList stores a mapping between remote
-// forward requests and the tcpListeners.
-type forwardList struct {
-	sync.Mutex
-	entries []forwardEntry
-}
-
-// forwardEntry represents an established mapping of a laddr on a
-// remote ssh server to a channel connected to a tcpListener.
-type forwardEntry struct {
-	laddr net.Addr
-	c     chan forward
-}
-
-// forward represents an incoming forwarded tcpip connection. The
-// arguments to add/remove/lookup should be address as specified in
-// the original forward-request.
-type forward struct {
-	newCh NewChannel // the ssh client channel underlying this forward
-	raddr net.Addr   // the raddr of the incoming connection
-}
-
-func (l *forwardList) add(addr net.Addr) chan forward {
-	l.Lock()
-	defer l.Unlock()
-	f := forwardEntry{
-		laddr: addr,
-		c:     make(chan forward, 1),
-	}
-	l.entries = append(l.entries, f)
-	return f.c
-}
-
-// See RFC 4254, section 7.2
-type forwardedTCPPayload struct {
-	Addr       string
-	Port       uint32
-	OriginAddr string
-	OriginPort uint32
-}
-
-// parseTCPAddr parses the originating address from the remote into a *net.TCPAddr.
-func parseTCPAddr(addr string, port uint32) (*net.TCPAddr, error) {
-	if port == 0 || port > 65535 {
-		return nil, fmt.Errorf("ssh: port number out of range: %d", port)
-	}
-	ip := net.ParseIP(string(addr))
-	if ip == nil {
-		return nil, fmt.Errorf("ssh: cannot parse IP address %q", addr)
-	}
-	return &net.TCPAddr{IP: ip, Port: int(port)}, nil
-}
-
-func (l *forwardList) handleChannels(in <-chan NewChannel) {
-	for ch := range in {
-		var (
-			laddr net.Addr
-			raddr net.Addr
-			err   error
-		)
-		switch channelType := ch.ChannelType(); channelType {
-		case "forwarded-tcpip":
-			var payload forwardedTCPPayload
-			if err = Unmarshal(ch.ExtraData(), &payload); err != nil {
-				ch.Reject(ConnectionFailed, "could not parse forwarded-tcpip payload: "+err.Error())
-				continue
-			}
-
-			// RFC 4254 section 7.2 specifies that incoming
-			// addresses should list the address, in string
-			// format. It is implied that this should be an IP
-			// address, as it would be impossible to connect to it
-			// otherwise.
-			laddr, err = parseTCPAddr(payload.Addr, payload.Port)
-			if err != nil {
-				ch.Reject(ConnectionFailed, err.Error())
-				continue
-			}
-			raddr, err = parseTCPAddr(payload.OriginAddr, payload.OriginPort)
-			if err != nil {
-				ch.Reject(ConnectionFailed, err.Error())
-				continue
-			}
-
-		case "forwarded-streamlocal@openssh.com":
-			var payload forwardedStreamLocalPayload
-			if err = Unmarshal(ch.ExtraData(), &payload); err != nil {
-				ch.Reject(ConnectionFailed, "could not parse forwarded-streamlocal@openssh.com payload: "+err.Error())
-				continue
-			}
-			laddr = &net.UnixAddr{
-				Name: payload.SocketPath,
-				Net:  "unix",
-			}
-			raddr = &net.UnixAddr{
-				Name: "@",
-				Net:  "unix",
-			}
-		default:
-			panic(fmt.Errorf("ssh: unknown channel type %s", channelType))
-		}
-		if ok := l.forward(laddr, raddr, ch); !ok {
-			// Section 7.2, implementations MUST reject spurious incoming
-			// connections.
-			ch.Reject(Prohibited, "no forward for address")
-			continue
-		}
-
-	}
-}
-
-// remove removes the forward entry, and the channel feeding its
-// listener.
-func (l *forwardList) remove(addr net.Addr) {
-	l.Lock()
-	defer l.Unlock()
-	for i, f := range l.entries {
-		if addr.Network() == f.laddr.Network() && addr.String() == f.laddr.String() {
-			l.entries = append(l.entries[:i], l.entries[i+1:]...)
-			close(f.c)
-			return
-		}
-	}
-}
-
-// closeAll closes and clears all forwards.
-func (l *forwardList) closeAll() {
-	l.Lock()
-	defer l.Unlock()
-	for _, f := range l.entries {
-		close(f.c)
-	}
-	l.entries = nil
-}
-
-func (l *forwardList) forward(laddr, raddr net.Addr, ch NewChannel) bool {
-	l.Lock()
-	defer l.Unlock()
-	for _, f := range l.entries {
-		if laddr.Network() == f.laddr.Network() && laddr.String() == f.laddr.String() {
-			f.c <- forward{newCh: ch, raddr: raddr}
-			return true
-		}
-	}
-	return false
-}
-
-type tcpListener struct {
-	laddr *net.TCPAddr
-
-	conn *Client
-	in   <-chan forward
-}
-
-// Accept waits for and returns the next connection to the listener.
-func (l *tcpListener) Accept() (net.Conn, error) {
-	s, ok := <-l.in
-	if !ok {
-		return nil, io.EOF
-	}
-	ch, incoming, err := s.newCh.Accept()
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(incoming)
-
-	return &chanConn{
-		Channel: ch,
-		laddr:   l.laddr,
-		raddr:   s.raddr,
-	}, nil
-}
-
-// Close closes the listener.
-func (l *tcpListener) Close() error {
-	m := channelForwardMsg{
-		l.laddr.IP.String(),
-		uint32(l.laddr.Port),
-	}
-
-	// this also closes the listener.
-	l.conn.forwards.remove(l.laddr)
-	ok, _, err := l.conn.SendRequest("cancel-tcpip-forward", true, Marshal(&m))
-	if err == nil && !ok {
-		err = errors.New("ssh: cancel-tcpip-forward failed")
-	}
-	return err
-}
-
-// Addr returns the listener's network address.
-func (l *tcpListener) Addr() net.Addr {
-	return l.laddr
-}
-
-// Dial initiates a connection to the addr from the remote host.
-// The resulting connection has a zero LocalAddr() and RemoteAddr().
-func (c *Client) Dial(n, addr string) (net.Conn, error) {
-	var ch Channel
-	switch n {
-	case "tcp", "tcp4", "tcp6":
-		// Parse the address into host and numeric port.
-		host, portString, err := net.SplitHostPort(addr)
-		if err != nil {
-			return nil, err
-		}
-		port, err := strconv.ParseUint(portString, 10, 16)
-		if err != nil {
-			return nil, err
-		}
-		ch, err = c.dial(net.IPv4zero.String(), 0, host, int(port))
-		if err != nil {
-			return nil, err
-		}
-		// Use a zero address for local and remote address.
-		zeroAddr := &net.TCPAddr{
-			IP:   net.IPv4zero,
-			Port: 0,
-		}
-		return &chanConn{
-			Channel: ch,
-			laddr:   zeroAddr,
-			raddr:   zeroAddr,
-		}, nil
-	case "unix":
-		var err error
-		ch, err = c.dialStreamLocal(addr)
-		if err != nil {
-			return nil, err
-		}
-		return &chanConn{
-			Channel: ch,
-			laddr: &net.UnixAddr{
-				Name: "@",
-				Net:  "unix",
-			},
-			raddr: &net.UnixAddr{
-				Name: addr,
-				Net:  "unix",
-			},
-		}, nil
-	default:
-		return nil, fmt.Errorf("ssh: unsupported protocol: %s", n)
-	}
-}
-
-// DialTCP connects to the remote address raddr on the network net,
-// which must be "tcp", "tcp4", or "tcp6".  If laddr is not nil, it is used
-// as the local address for the connection.
-func (c *Client) DialTCP(n string, laddr, raddr *net.TCPAddr) (net.Conn, error) {
-	if laddr == nil {
-		laddr = &net.TCPAddr{
-			IP:   net.IPv4zero,
-			Port: 0,
-		}
-	}
-	ch, err := c.dial(laddr.IP.String(), laddr.Port, raddr.IP.String(), raddr.Port)
-	if err != nil {
-		return nil, err
-	}
-	return &chanConn{
-		Channel: ch,
-		laddr:   laddr,
-		raddr:   raddr,
-	}, nil
-}
-
-// RFC 4254 7.2
-type channelOpenDirectMsg struct {
-	raddr string
-	rport uint32
-	laddr string
-	lport uint32
-}
-
-func (c *Client) dial(laddr string, lport int, raddr string, rport int) (Channel, error) {
-	msg := channelOpenDirectMsg{
-		raddr: raddr,
-		rport: uint32(rport),
-		laddr: laddr,
-		lport: uint32(lport),
-	}
-	ch, in, err := c.OpenChannel("direct-tcpip", Marshal(&msg))
-	if err != nil {
-		return nil, err
-	}
-	go DiscardRequests(in)
-	return ch, err
-}
-
-type tcpChan struct {
-	Channel // the backing channel
-}
-
-// chanConn fulfills the net.Conn interface without
-// the tcpChan having to hold laddr or raddr directly.
-type chanConn struct {
-	Channel
-	laddr, raddr net.Addr
-}
-
-// LocalAddr returns the local network address.
-func (t *chanConn) LocalAddr() net.Addr {
-	return t.laddr
-}
-
-// RemoteAddr returns the remote network address.
-func (t *chanConn) RemoteAddr() net.Addr {
-	return t.raddr
-}
-
-// SetDeadline sets the read and write deadlines associated
-// with the connection.
-func (t *chanConn) SetDeadline(deadline time.Time) error {
-	if err := t.SetReadDeadline(deadline); err != nil {
-		return err
-	}
-	return t.SetWriteDeadline(deadline)
-}
-
-// SetReadDeadline sets the read deadline.
-// A zero value for t means Read will not time out.
-// After the deadline, the error from Read will implement net.Error
-// with Timeout() == true.
-func (t *chanConn) SetReadDeadline(deadline time.Time) error {
-	// for compatibility with previous version,
-	// the error message contains "tcpChan"
-	return errors.New("ssh: tcpChan: deadline not supported")
-}
-
-// SetWriteDeadline exists to satisfy the net.Conn interface
-// but is not implemented by this type.  It always returns an error.
-func (t *chanConn) SetWriteDeadline(deadline time.Time) error {
-	return errors.New("ssh: tcpChan: deadline not supported")
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/tcpip_test.go b/installer/vendor/golang.org/x/crypto/ssh/tcpip_test.go
deleted file mode 100644
index f1265cb496..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/tcpip_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"testing"
-)
-
-func TestAutoPortListenBroken(t *testing.T) {
-	broken := "SSH-2.0-OpenSSH_5.9hh11"
-	works := "SSH-2.0-OpenSSH_6.1"
-	if !isBrokenOpenSSHVersion(broken) {
-		t.Errorf("version %q not marked as broken", broken)
-	}
-	if isBrokenOpenSSHVersion(works) {
-		t.Errorf("version %q marked as broken", works)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal.go b/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
index 18379a935b..9a887598ff 100644
--- a/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
+++ b/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal.go
@@ -617,7 +617,7 @@ func writeWithCRLF(w io.Writer, buf []byte) (n int, err error) {
 			if _, err = w.Write(crlf); err != nil {
 				return n, err
 			}
-			n += 1
+			n++
 			buf = buf[1:]
 		}
 	}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal_test.go b/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal_test.go
deleted file mode 100644
index 901c72ab35..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/terminal/terminal_test.go
+++ /dev/null
@@ -1,350 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package terminal
-
-import (
-	"bytes"
-	"io"
-	"os"
-	"testing"
-)
-
-type MockTerminal struct {
-	toSend       []byte
-	bytesPerRead int
-	received     []byte
-}
-
-func (c *MockTerminal) Read(data []byte) (n int, err error) {
-	n = len(data)
-	if n == 0 {
-		return
-	}
-	if n > len(c.toSend) {
-		n = len(c.toSend)
-	}
-	if n == 0 {
-		return 0, io.EOF
-	}
-	if c.bytesPerRead > 0 && n > c.bytesPerRead {
-		n = c.bytesPerRead
-	}
-	copy(data, c.toSend[:n])
-	c.toSend = c.toSend[n:]
-	return
-}
-
-func (c *MockTerminal) Write(data []byte) (n int, err error) {
-	c.received = append(c.received, data...)
-	return len(data), nil
-}
-
-func TestClose(t *testing.T) {
-	c := &MockTerminal{}
-	ss := NewTerminal(c, "> ")
-	line, err := ss.ReadLine()
-	if line != "" {
-		t.Errorf("Expected empty line but got: %s", line)
-	}
-	if err != io.EOF {
-		t.Errorf("Error should have been EOF but got: %s", err)
-	}
-}
-
-var keyPressTests = []struct {
-	in             string
-	line           string
-	err            error
-	throwAwayLines int
-}{
-	{
-		err: io.EOF,
-	},
-	{
-		in:   "\r",
-		line: "",
-	},
-	{
-		in:   "foo\r",
-		line: "foo",
-	},
-	{
-		in:   "a\x1b[Cb\r", // right
-		line: "ab",
-	},
-	{
-		in:   "a\x1b[Db\r", // left
-		line: "ba",
-	},
-	{
-		in:   "a\177b\r", // backspace
-		line: "b",
-	},
-	{
-		in: "\x1b[A\r", // up
-	},
-	{
-		in: "\x1b[B\r", // down
-	},
-	{
-		in:   "line\x1b[A\x1b[B\r", // up then down
-		line: "line",
-	},
-	{
-		in:             "line1\rline2\x1b[A\r", // recall previous line.
-		line:           "line1",
-		throwAwayLines: 1,
-	},
-	{
-		// recall two previous lines and append.
-		in:             "line1\rline2\rline3\x1b[A\x1b[Axxx\r",
-		line:           "line1xxx",
-		throwAwayLines: 2,
-	},
-	{
-		// Ctrl-A to move to beginning of line followed by ^K to kill
-		// line.
-		in:   "a b \001\013\r",
-		line: "",
-	},
-	{
-		// Ctrl-A to move to beginning of line, Ctrl-E to move to end,
-		// finally ^K to kill nothing.
-		in:   "a b \001\005\013\r",
-		line: "a b ",
-	},
-	{
-		in:   "\027\r",
-		line: "",
-	},
-	{
-		in:   "a\027\r",
-		line: "",
-	},
-	{
-		in:   "a \027\r",
-		line: "",
-	},
-	{
-		in:   "a b\027\r",
-		line: "a ",
-	},
-	{
-		in:   "a b \027\r",
-		line: "a ",
-	},
-	{
-		in:   "one two thr\x1b[D\027\r",
-		line: "one two r",
-	},
-	{
-		in:   "\013\r",
-		line: "",
-	},
-	{
-		in:   "a\013\r",
-		line: "a",
-	},
-	{
-		in:   "ab\x1b[D\013\r",
-		line: "a",
-	},
-	{
-		in:   "Ξεσκεπάζω\r",
-		line: "Ξεσκεπάζω",
-	},
-	{
-		in:             "£\r\x1b[A\177\r", // non-ASCII char, enter, up, backspace.
-		line:           "",
-		throwAwayLines: 1,
-	},
-	{
-		in:             "£\r££\x1b[A\x1b[B\177\r", // non-ASCII char, enter, 2x non-ASCII, up, down, backspace, enter.
-		line:           "£",
-		throwAwayLines: 1,
-	},
-	{
-		// Ctrl-D at the end of the line should be ignored.
-		in:   "a\004\r",
-		line: "a",
-	},
-	{
-		// a, b, left, Ctrl-D should erase the b.
-		in:   "ab\x1b[D\004\r",
-		line: "a",
-	},
-	{
-		// a, b, c, d, left, left, ^U should erase to the beginning of
-		// the line.
-		in:   "abcd\x1b[D\x1b[D\025\r",
-		line: "cd",
-	},
-	{
-		// Bracketed paste mode: control sequences should be returned
-		// verbatim in paste mode.
-		in:   "abc\x1b[200~de\177f\x1b[201~\177\r",
-		line: "abcde\177",
-	},
-	{
-		// Enter in bracketed paste mode should still work.
-		in:             "abc\x1b[200~d\refg\x1b[201~h\r",
-		line:           "efgh",
-		throwAwayLines: 1,
-	},
-	{
-		// Lines consisting entirely of pasted data should be indicated as such.
-		in:   "\x1b[200~a\r",
-		line: "a",
-		err:  ErrPasteIndicator,
-	},
-}
-
-func TestKeyPresses(t *testing.T) {
-	for i, test := range keyPressTests {
-		for j := 1; j < len(test.in); j++ {
-			c := &MockTerminal{
-				toSend:       []byte(test.in),
-				bytesPerRead: j,
-			}
-			ss := NewTerminal(c, "> ")
-			for k := 0; k < test.throwAwayLines; k++ {
-				_, err := ss.ReadLine()
-				if err != nil {
-					t.Errorf("Throwaway line %d from test %d resulted in error: %s", k, i, err)
-				}
-			}
-			line, err := ss.ReadLine()
-			if line != test.line {
-				t.Errorf("Line resulting from test %d (%d bytes per read) was '%s', expected '%s'", i, j, line, test.line)
-				break
-			}
-			if err != test.err {
-				t.Errorf("Error resulting from test %d (%d bytes per read) was '%v', expected '%v'", i, j, err, test.err)
-				break
-			}
-		}
-	}
-}
-
-func TestPasswordNotSaved(t *testing.T) {
-	c := &MockTerminal{
-		toSend:       []byte("password\r\x1b[A\r"),
-		bytesPerRead: 1,
-	}
-	ss := NewTerminal(c, "> ")
-	pw, _ := ss.ReadPassword("> ")
-	if pw != "password" {
-		t.Fatalf("failed to read password, got %s", pw)
-	}
-	line, _ := ss.ReadLine()
-	if len(line) > 0 {
-		t.Fatalf("password was saved in history")
-	}
-}
-
-var setSizeTests = []struct {
-	width, height int
-}{
-	{40, 13},
-	{80, 24},
-	{132, 43},
-}
-
-func TestTerminalSetSize(t *testing.T) {
-	for _, setSize := range setSizeTests {
-		c := &MockTerminal{
-			toSend:       []byte("password\r\x1b[A\r"),
-			bytesPerRead: 1,
-		}
-		ss := NewTerminal(c, "> ")
-		ss.SetSize(setSize.width, setSize.height)
-		pw, _ := ss.ReadPassword("Password: ")
-		if pw != "password" {
-			t.Fatalf("failed to read password, got %s", pw)
-		}
-		if string(c.received) != "Password: \r\n" {
-			t.Errorf("failed to set the temporary prompt expected %q, got %q", "Password: ", c.received)
-		}
-	}
-}
-
-func TestReadPasswordLineEnd(t *testing.T) {
-	var tests = []struct {
-		input string
-		want  string
-	}{
-		{"\n", ""},
-		{"\r\n", ""},
-		{"test\r\n", "test"},
-		{"testtesttesttes\n", "testtesttesttes"},
-		{"testtesttesttes\r\n", "testtesttesttes"},
-		{"testtesttesttesttest\n", "testtesttesttesttest"},
-		{"testtesttesttesttest\r\n", "testtesttesttesttest"},
-	}
-	for _, test := range tests {
-		buf := new(bytes.Buffer)
-		if _, err := buf.WriteString(test.input); err != nil {
-			t.Fatal(err)
-		}
-
-		have, err := readPasswordLine(buf)
-		if err != nil {
-			t.Errorf("readPasswordLine(%q) failed: %v", test.input, err)
-			continue
-		}
-		if string(have) != test.want {
-			t.Errorf("readPasswordLine(%q) returns %q, but %q is expected", test.input, string(have), test.want)
-			continue
-		}
-
-		if _, err = buf.WriteString(test.input); err != nil {
-			t.Fatal(err)
-		}
-		have, err = readPasswordLine(buf)
-		if err != nil {
-			t.Errorf("readPasswordLine(%q) failed: %v", test.input, err)
-			continue
-		}
-		if string(have) != test.want {
-			t.Errorf("readPasswordLine(%q) returns %q, but %q is expected", test.input, string(have), test.want)
-			continue
-		}
-	}
-}
-
-func TestMakeRawState(t *testing.T) {
-	fd := int(os.Stdout.Fd())
-	if !IsTerminal(fd) {
-		t.Skip("stdout is not a terminal; skipping test")
-	}
-
-	st, err := GetState(fd)
-	if err != nil {
-		t.Fatalf("failed to get terminal state from GetState: %s", err)
-	}
-	defer Restore(fd, st)
-	raw, err := MakeRaw(fd)
-	if err != nil {
-		t.Fatalf("failed to get terminal state from MakeRaw: %s", err)
-	}
-
-	if *st != *raw {
-		t.Errorf("states do not match; was %v, expected %v", raw, st)
-	}
-}
-
-func TestOutputNewlines(t *testing.T) {
-	// \n should be changed to \r\n in terminal output.
-	buf := new(bytes.Buffer)
-	term := NewTerminal(buf, ">")
-
-	term.Write([]byte("1\n2\n"))
-	output := string(buf.Bytes())
-	const expected = "1\r\n2\r\n"
-
-	if output != expected {
-		t.Errorf("incorrect output: was %q, expected %q", output, expected)
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/terminal/util.go b/installer/vendor/golang.org/x/crypto/ssh/terminal/util.go
index e7404ff492..731c89a284 100644
--- a/installer/vendor/golang.org/x/crypto/ssh/terminal/util.go
+++ b/installer/vendor/golang.org/x/crypto/ssh/terminal/util.go
@@ -17,44 +17,41 @@
 package terminal // import "golang.org/x/crypto/ssh/terminal"
 
 import (
-	"syscall"
-	"unsafe"
-
 	"golang.org/x/sys/unix"
 )
 
 // State contains the state of a terminal.
 type State struct {
-	termios syscall.Termios
+	termios unix.Termios
 }
 
 // IsTerminal returns true if the given file descriptor is a terminal.
 func IsTerminal(fd int) bool {
-	var termios syscall.Termios
-	_, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&termios)), 0, 0, 0)
-	return err == 0
+	_, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	return err == nil
 }
 
 // MakeRaw put the terminal connected to the given file descriptor into raw
 // mode and returns the previous state of the terminal so that it can be
 // restored.
 func MakeRaw(fd int) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
+	termios, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	if err != nil {
 		return nil, err
 	}
 
-	newState := oldState.termios
+	oldState := State{termios: *termios}
+
 	// This attempts to replicate the behaviour documented for cfmakeraw in
 	// the termios(3) manpage.
-	newState.Iflag &^= syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON
-	newState.Oflag &^= syscall.OPOST
-	newState.Lflag &^= syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN
-	newState.Cflag &^= syscall.CSIZE | syscall.PARENB
-	newState.Cflag |= syscall.CS8
-	newState.Cc[unix.VMIN] = 1
-	newState.Cc[unix.VTIME] = 0
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
+	termios.Iflag &^= unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON
+	termios.Oflag &^= unix.OPOST
+	termios.Lflag &^= unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN
+	termios.Cflag &^= unix.CSIZE | unix.PARENB
+	termios.Cflag |= unix.CS8
+	termios.Cc[unix.VMIN] = 1
+	termios.Cc[unix.VTIME] = 0
+	if err := unix.IoctlSetTermios(fd, ioctlWriteTermios, termios); err != nil {
 		return nil, err
 	}
 
@@ -64,60 +61,54 @@ func MakeRaw(fd int) (*State, error) {
 // GetState returns the current state of a terminal which may be useful to
 // restore the terminal after a signal.
 func GetState(fd int) (*State, error) {
-	var oldState State
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState.termios)), 0, 0, 0); err != 0 {
+	termios, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	if err != nil {
 		return nil, err
 	}
 
-	return &oldState, nil
+	return &State{termios: *termios}, nil
 }
 
 // Restore restores the terminal connected to the given file descriptor to a
 // previous state.
 func Restore(fd int, state *State) error {
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&state.termios)), 0, 0, 0); err != 0 {
-		return err
-	}
-	return nil
+	return unix.IoctlSetTermios(fd, ioctlWriteTermios, &state.termios)
 }
 
 // GetSize returns the dimensions of the given terminal.
 func GetSize(fd int) (width, height int, err error) {
-	var dimensions [4]uint16
-
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), uintptr(syscall.TIOCGWINSZ), uintptr(unsafe.Pointer(&dimensions)), 0, 0, 0); err != 0 {
+	ws, err := unix.IoctlGetWinsize(fd, unix.TIOCGWINSZ)
+	if err != nil {
 		return -1, -1, err
 	}
-	return int(dimensions[1]), int(dimensions[0]), nil
+	return int(ws.Col), int(ws.Row), nil
 }
 
 // passwordReader is an io.Reader that reads from a specific file descriptor.
 type passwordReader int
 
 func (r passwordReader) Read(buf []byte) (int, error) {
-	return syscall.Read(int(r), buf)
+	return unix.Read(int(r), buf)
 }
 
 // ReadPassword reads a line of input from a terminal without local echo.  This
 // is commonly used for inputting passwords and other sensitive data. The slice
 // returned does not include the \n.
 func ReadPassword(fd int) ([]byte, error) {
-	var oldState syscall.Termios
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlReadTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0); err != 0 {
+	termios, err := unix.IoctlGetTermios(fd, ioctlReadTermios)
+	if err != nil {
 		return nil, err
 	}
 
-	newState := oldState
-	newState.Lflag &^= syscall.ECHO
-	newState.Lflag |= syscall.ICANON | syscall.ISIG
-	newState.Iflag |= syscall.ICRNL
-	if _, _, err := syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&newState)), 0, 0, 0); err != 0 {
+	newState := *termios
+	newState.Lflag &^= unix.ECHO
+	newState.Lflag |= unix.ICANON | unix.ISIG
+	newState.Iflag |= unix.ICRNL
+	if err := unix.IoctlSetTermios(fd, ioctlWriteTermios, &newState); err != nil {
 		return nil, err
 	}
 
-	defer func() {
-		syscall.Syscall6(syscall.SYS_IOCTL, uintptr(fd), ioctlWriteTermios, uintptr(unsafe.Pointer(&oldState)), 0, 0, 0)
-	}()
+	defer unix.IoctlSetTermios(fd, ioctlWriteTermios, termios)
 
 	return readPasswordLine(passwordReader(fd))
 }
diff --git a/installer/vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go b/installer/vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go
index a2e1b57dc1..9e41b9f43f 100644
--- a/installer/vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go
+++ b/installer/vendor/golang.org/x/crypto/ssh/terminal/util_solaris.go
@@ -14,7 +14,7 @@ import (
 
 // State contains the state of a terminal.
 type State struct {
-	state *unix.Termios
+	termios unix.Termios
 }
 
 // IsTerminal returns true if the given file descriptor is a terminal.
@@ -75,47 +75,43 @@ func ReadPassword(fd int) ([]byte, error) {
 // restored.
 // see http://cr.illumos.org/~webrev/andy_js/1060/
 func MakeRaw(fd int) (*State, error) {
-	oldTermiosPtr, err := unix.IoctlGetTermios(fd, unix.TCGETS)
+	termios, err := unix.IoctlGetTermios(fd, unix.TCGETS)
 	if err != nil {
 		return nil, err
 	}
-	oldTermios := *oldTermiosPtr
-
-	newTermios := oldTermios
-	newTermios.Iflag &^= syscall.IGNBRK | syscall.BRKINT | syscall.PARMRK | syscall.ISTRIP | syscall.INLCR | syscall.IGNCR | syscall.ICRNL | syscall.IXON
-	newTermios.Oflag &^= syscall.OPOST
-	newTermios.Lflag &^= syscall.ECHO | syscall.ECHONL | syscall.ICANON | syscall.ISIG | syscall.IEXTEN
-	newTermios.Cflag &^= syscall.CSIZE | syscall.PARENB
-	newTermios.Cflag |= syscall.CS8
-	newTermios.Cc[unix.VMIN] = 1
-	newTermios.Cc[unix.VTIME] = 0
-
-	if err := unix.IoctlSetTermios(fd, unix.TCSETS, &newTermios); err != nil {
+
+	oldState := State{termios: *termios}
+
+	termios.Iflag &^= unix.IGNBRK | unix.BRKINT | unix.PARMRK | unix.ISTRIP | unix.INLCR | unix.IGNCR | unix.ICRNL | unix.IXON
+	termios.Oflag &^= unix.OPOST
+	termios.Lflag &^= unix.ECHO | unix.ECHONL | unix.ICANON | unix.ISIG | unix.IEXTEN
+	termios.Cflag &^= unix.CSIZE | unix.PARENB
+	termios.Cflag |= unix.CS8
+	termios.Cc[unix.VMIN] = 1
+	termios.Cc[unix.VTIME] = 0
+
+	if err := unix.IoctlSetTermios(fd, unix.TCSETS, termios); err != nil {
 		return nil, err
 	}
 
-	return &State{
-		state: oldTermiosPtr,
-	}, nil
+	return &oldState, nil
 }
 
 // Restore restores the terminal connected to the given file descriptor to a
 // previous state.
 func Restore(fd int, oldState *State) error {
-	return unix.IoctlSetTermios(fd, unix.TCSETS, oldState.state)
+	return unix.IoctlSetTermios(fd, unix.TCSETS, &oldState.termios)
 }
 
 // GetState returns the current state of a terminal which may be useful to
 // restore the terminal after a signal.
 func GetState(fd int) (*State, error) {
-	oldTermiosPtr, err := unix.IoctlGetTermios(fd, unix.TCGETS)
+	termios, err := unix.IoctlGetTermios(fd, unix.TCGETS)
 	if err != nil {
 		return nil, err
 	}
 
-	return &State{
-		state: oldTermiosPtr,
-	}, nil
+	return &State{termios: *termios}, nil
 }
 
 // GetSize returns the dimensions of the given terminal.
diff --git a/installer/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go b/installer/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
index 60979ccd00..8618955df7 100644
--- a/installer/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
+++ b/installer/vendor/golang.org/x/crypto/ssh/terminal/util_windows.go
@@ -17,6 +17,8 @@
 package terminal
 
 import (
+	"os"
+
 	"golang.org/x/sys/windows"
 )
 
@@ -71,13 +73,6 @@ func GetSize(fd int) (width, height int, err error) {
 	return int(info.Size.X), int(info.Size.Y), nil
 }
 
-// passwordReader is an io.Reader that reads from a specific Windows HANDLE.
-type passwordReader int
-
-func (r passwordReader) Read(buf []byte) (int, error) {
-	return windows.Read(windows.Handle(r), buf)
-}
-
 // ReadPassword reads a line of input from a terminal without local echo.  This
 // is commonly used for inputting passwords and other sensitive data. The slice
 // returned does not include the \n.
@@ -94,9 +89,15 @@ func ReadPassword(fd int) ([]byte, error) {
 		return nil, err
 	}
 
-	defer func() {
-		windows.SetConsoleMode(windows.Handle(fd), old)
-	}()
+	defer windows.SetConsoleMode(windows.Handle(fd), old)
+
+	var h windows.Handle
+	p, _ := windows.GetCurrentProcess()
+	if err := windows.DuplicateHandle(p, windows.Handle(fd), p, &h, 0, false, windows.DUPLICATE_SAME_ACCESS); err != nil {
+		return nil, err
+	}
 
-	return readPasswordLine(passwordReader(fd))
+	f := os.NewFile(uintptr(h), "stdin")
+	defer f.Close()
+	return readPasswordLine(f)
 }
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/agent_unix_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/agent_unix_test.go
deleted file mode 100644
index f481253c9e..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/agent_unix_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package test
-
-import (
-	"bytes"
-	"testing"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/agent"
-)
-
-func TestAgentForward(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	keyring := agent.NewKeyring()
-	if err := keyring.Add(agent.AddedKey{PrivateKey: testPrivateKeys["dsa"]}); err != nil {
-		t.Fatalf("Error adding key: %s", err)
-	}
-	if err := keyring.Add(agent.AddedKey{
-		PrivateKey:       testPrivateKeys["dsa"],
-		ConfirmBeforeUse: true,
-		LifetimeSecs:     3600,
-	}); err != nil {
-		t.Fatalf("Error adding key with constraints: %s", err)
-	}
-	pub := testPublicKeys["dsa"]
-
-	sess, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("NewSession: %v", err)
-	}
-	if err := agent.RequestAgentForwarding(sess); err != nil {
-		t.Fatalf("RequestAgentForwarding: %v", err)
-	}
-
-	if err := agent.ForwardToAgent(conn, keyring); err != nil {
-		t.Fatalf("SetupForwardKeyring: %v", err)
-	}
-	out, err := sess.CombinedOutput("ssh-add -L")
-	if err != nil {
-		t.Fatalf("running ssh-add: %v, out %s", err, out)
-	}
-	key, _, _, _, err := ssh.ParseAuthorizedKey(out)
-	if err != nil {
-		t.Fatalf("ParseAuthorizedKey(%q): %v", out, err)
-	}
-
-	if !bytes.Equal(key.Marshal(), pub.Marshal()) {
-		t.Fatalf("got key %s, want %s", ssh.MarshalAuthorizedKey(key), ssh.MarshalAuthorizedKey(pub))
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/cert_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/cert_test.go
deleted file mode 100644
index b231dd80c6..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/cert_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package test
-
-import (
-	"bytes"
-	"crypto/rand"
-	"testing"
-
-	"golang.org/x/crypto/ssh"
-)
-
-// Test both logging in with a cert, and also that the certificate presented by an OpenSSH host can be validated correctly
-func TestCertLogin(t *testing.T) {
-	s := newServer(t)
-	defer s.Shutdown()
-
-	// Use a key different from the default.
-	clientKey := testSigners["dsa"]
-	caAuthKey := testSigners["ecdsa"]
-	cert := &ssh.Certificate{
-		Key:             clientKey.PublicKey(),
-		ValidPrincipals: []string{username()},
-		CertType:        ssh.UserCert,
-		ValidBefore:     ssh.CertTimeInfinity,
-	}
-	if err := cert.SignCert(rand.Reader, caAuthKey); err != nil {
-		t.Fatalf("SetSignature: %v", err)
-	}
-
-	certSigner, err := ssh.NewCertSigner(cert, clientKey)
-	if err != nil {
-		t.Fatalf("NewCertSigner: %v", err)
-	}
-
-	conf := &ssh.ClientConfig{
-		User: username(),
-		HostKeyCallback: (&ssh.CertChecker{
-			IsHostAuthority: func(pk ssh.PublicKey, addr string) bool {
-				return bytes.Equal(pk.Marshal(), testPublicKeys["ca"].Marshal())
-			},
-		}).CheckHostKey,
-	}
-	conf.Auth = append(conf.Auth, ssh.PublicKeys(certSigner))
-
-	for _, test := range []struct {
-		addr    string
-		succeed bool
-	}{
-		{addr: "host.example.com:22", succeed: true},
-		{addr: "host.example.com:10000", succeed: true}, // non-standard port must be OK
-		{addr: "host.example.com", succeed: false},      // port must be specified
-		{addr: "host.ex4mple.com:22", succeed: false},   // wrong host
-	} {
-		client, err := s.TryDialWithAddr(conf, test.addr)
-
-		// Always close client if opened successfully
-		if err == nil {
-			client.Close()
-		}
-
-		// Now evaluate whether the test failed or passed
-		if test.succeed {
-			if err != nil {
-				t.Fatalf("TryDialWithAddr: %v", err)
-			}
-		} else {
-			if err == nil {
-				t.Fatalf("TryDialWithAddr, unexpected success")
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/dial_unix_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/dial_unix_test.go
deleted file mode 100644
index 091e48cc1d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/dial_unix_test.go
+++ /dev/null
@@ -1,128 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !windows
-
-package test
-
-// direct-tcpip and direct-streamlocal functional tests
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"strings"
-	"testing"
-)
-
-type dialTester interface {
-	TestServerConn(t *testing.T, c net.Conn)
-	TestClientConn(t *testing.T, c net.Conn)
-}
-
-func testDial(t *testing.T, n, listenAddr string, x dialTester) {
-	server := newServer(t)
-	defer server.Shutdown()
-	sshConn := server.Dial(clientConfig())
-	defer sshConn.Close()
-
-	l, err := net.Listen(n, listenAddr)
-	if err != nil {
-		t.Fatalf("Listen: %v", err)
-	}
-	defer l.Close()
-
-	testData := fmt.Sprintf("hello from %s, %s", n, listenAddr)
-	go func() {
-		for {
-			c, err := l.Accept()
-			if err != nil {
-				break
-			}
-			x.TestServerConn(t, c)
-
-			io.WriteString(c, testData)
-			c.Close()
-		}
-	}()
-
-	conn, err := sshConn.Dial(n, l.Addr().String())
-	if err != nil {
-		t.Fatalf("Dial: %v", err)
-	}
-	x.TestClientConn(t, conn)
-	defer conn.Close()
-	b, err := ioutil.ReadAll(conn)
-	if err != nil {
-		t.Fatalf("ReadAll: %v", err)
-	}
-	t.Logf("got %q", string(b))
-	if string(b) != testData {
-		t.Fatalf("expected %q, got %q", testData, string(b))
-	}
-}
-
-type tcpDialTester struct {
-	listenAddr string
-}
-
-func (x *tcpDialTester) TestServerConn(t *testing.T, c net.Conn) {
-	host := strings.Split(x.listenAddr, ":")[0]
-	prefix := host + ":"
-	if !strings.HasPrefix(c.LocalAddr().String(), prefix) {
-		t.Fatalf("expected to start with %q, got %q", prefix, c.LocalAddr().String())
-	}
-	if !strings.HasPrefix(c.RemoteAddr().String(), prefix) {
-		t.Fatalf("expected to start with %q, got %q", prefix, c.RemoteAddr().String())
-	}
-}
-
-func (x *tcpDialTester) TestClientConn(t *testing.T, c net.Conn) {
-	// we use zero addresses. see *Client.Dial.
-	if c.LocalAddr().String() != "0.0.0.0:0" {
-		t.Fatalf("expected \"0.0.0.0:0\", got %q", c.LocalAddr().String())
-	}
-	if c.RemoteAddr().String() != "0.0.0.0:0" {
-		t.Fatalf("expected \"0.0.0.0:0\", got %q", c.RemoteAddr().String())
-	}
-}
-
-func TestDialTCP(t *testing.T) {
-	x := &tcpDialTester{
-		listenAddr: "127.0.0.1:0",
-	}
-	testDial(t, "tcp", x.listenAddr, x)
-}
-
-type unixDialTester struct {
-	listenAddr string
-}
-
-func (x *unixDialTester) TestServerConn(t *testing.T, c net.Conn) {
-	if c.LocalAddr().String() != x.listenAddr {
-		t.Fatalf("expected %q, got %q", x.listenAddr, c.LocalAddr().String())
-	}
-	if c.RemoteAddr().String() != "@" {
-		t.Fatalf("expected \"@\", got %q", c.RemoteAddr().String())
-	}
-}
-
-func (x *unixDialTester) TestClientConn(t *testing.T, c net.Conn) {
-	if c.RemoteAddr().String() != x.listenAddr {
-		t.Fatalf("expected %q, got %q", x.listenAddr, c.RemoteAddr().String())
-	}
-	if c.LocalAddr().String() != "@" {
-		t.Fatalf("expected \"@\", got %q", c.LocalAddr().String())
-	}
-}
-
-func TestDialUnix(t *testing.T) {
-	addr, cleanup := newTempSocket(t)
-	defer cleanup()
-	x := &unixDialTester{
-		listenAddr: addr,
-	}
-	testDial(t, "unix", x.listenAddr, x)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/doc.go b/installer/vendor/golang.org/x/crypto/ssh/test/doc.go
deleted file mode 100644
index 3f9b3346df..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/doc.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This package contains integration tests for the
-// golang.org/x/crypto/ssh package.
-package test // import "golang.org/x/crypto/ssh/test"
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/forward_unix_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/forward_unix_test.go
deleted file mode 100644
index ea81937803..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/forward_unix_test.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package test
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"testing"
-	"time"
-)
-
-type closeWriter interface {
-	CloseWrite() error
-}
-
-func testPortForward(t *testing.T, n, listenAddr string) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	sshListener, err := conn.Listen(n, listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	go func() {
-		sshConn, err := sshListener.Accept()
-		if err != nil {
-			t.Fatalf("listen.Accept failed: %v", err)
-		}
-
-		_, err = io.Copy(sshConn, sshConn)
-		if err != nil && err != io.EOF {
-			t.Fatalf("ssh client copy: %v", err)
-		}
-		sshConn.Close()
-	}()
-
-	forwardedAddr := sshListener.Addr().String()
-	netConn, err := net.Dial(n, forwardedAddr)
-	if err != nil {
-		t.Fatalf("net dial failed: %v", err)
-	}
-
-	readChan := make(chan []byte)
-	go func() {
-		data, _ := ioutil.ReadAll(netConn)
-		readChan <- data
-	}()
-
-	// Invent some data.
-	data := make([]byte, 100*1000)
-	for i := range data {
-		data[i] = byte(i % 255)
-	}
-
-	var sent []byte
-	for len(sent) < 1000*1000 {
-		// Send random sized chunks
-		m := rand.Intn(len(data))
-		n, err := netConn.Write(data[:m])
-		if err != nil {
-			break
-		}
-		sent = append(sent, data[:n]...)
-	}
-	if err := netConn.(closeWriter).CloseWrite(); err != nil {
-		t.Errorf("netConn.CloseWrite: %v", err)
-	}
-
-	read := <-readChan
-
-	if len(sent) != len(read) {
-		t.Fatalf("got %d bytes, want %d", len(read), len(sent))
-	}
-	if bytes.Compare(sent, read) != 0 {
-		t.Fatalf("read back data does not match")
-	}
-
-	if err := sshListener.Close(); err != nil {
-		t.Fatalf("sshListener.Close: %v", err)
-	}
-
-	// Check that the forward disappeared.
-	netConn, err = net.Dial(n, forwardedAddr)
-	if err == nil {
-		netConn.Close()
-		t.Errorf("still listening to %s after closing", forwardedAddr)
-	}
-}
-
-func TestPortForwardTCP(t *testing.T) {
-	testPortForward(t, "tcp", "localhost:0")
-}
-
-func TestPortForwardUnix(t *testing.T) {
-	addr, cleanup := newTempSocket(t)
-	defer cleanup()
-	testPortForward(t, "unix", addr)
-}
-
-func testAcceptClose(t *testing.T, n, listenAddr string) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-
-	sshListener, err := conn.Listen(n, listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	quit := make(chan error, 1)
-	go func() {
-		for {
-			c, err := sshListener.Accept()
-			if err != nil {
-				quit <- err
-				break
-			}
-			c.Close()
-		}
-	}()
-	sshListener.Close()
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Errorf("timeout: listener did not close.")
-	case err := <-quit:
-		t.Logf("quit as expected (error %v)", err)
-	}
-}
-
-func TestAcceptCloseTCP(t *testing.T) {
-	testAcceptClose(t, "tcp", "localhost:0")
-}
-
-func TestAcceptCloseUnix(t *testing.T) {
-	addr, cleanup := newTempSocket(t)
-	defer cleanup()
-	testAcceptClose(t, "unix", addr)
-}
-
-// Check that listeners exit if the underlying client transport dies.
-func testPortForwardConnectionClose(t *testing.T, n, listenAddr string) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-
-	sshListener, err := conn.Listen(n, listenAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	quit := make(chan error, 1)
-	go func() {
-		for {
-			c, err := sshListener.Accept()
-			if err != nil {
-				quit <- err
-				break
-			}
-			c.Close()
-		}
-	}()
-
-	// It would be even nicer if we closed the server side, but it
-	// is more involved as the fd for that side is dup()ed.
-	server.clientConn.Close()
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Errorf("timeout: listener did not close.")
-	case err := <-quit:
-		t.Logf("quit as expected (error %v)", err)
-	}
-}
-
-func TestPortForwardConnectionCloseTCP(t *testing.T) {
-	testPortForwardConnectionClose(t, "tcp", "localhost:0")
-}
-
-func TestPortForwardConnectionCloseUnix(t *testing.T) {
-	addr, cleanup := newTempSocket(t)
-	defer cleanup()
-	testPortForwardConnectionClose(t, "unix", addr)
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/session_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/session_test.go
deleted file mode 100644
index 8238d9d90d..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/session_test.go
+++ /dev/null
@@ -1,413 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !windows
-
-package test
-
-// Session functional tests.
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strings"
-	"testing"
-
-	"golang.org/x/crypto/ssh"
-)
-
-func TestRunCommandSuccess(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-	err = session.Run("true")
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-}
-
-func TestHostKeyCheck(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-
-	conf := clientConfig()
-	hostDB := hostKeyDB()
-	conf.HostKeyCallback = hostDB.Check
-
-	// change the keys.
-	hostDB.keys[ssh.KeyAlgoRSA][25]++
-	hostDB.keys[ssh.KeyAlgoDSA][25]++
-	hostDB.keys[ssh.KeyAlgoECDSA256][25]++
-
-	conn, err := server.TryDial(conf)
-	if err == nil {
-		conn.Close()
-		t.Fatalf("dial should have failed.")
-	} else if !strings.Contains(err.Error(), "host key mismatch") {
-		t.Fatalf("'host key mismatch' not found in %v", err)
-	}
-}
-
-func TestRunCommandStdin(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-
-	r, w := io.Pipe()
-	defer r.Close()
-	defer w.Close()
-	session.Stdin = r
-
-	err = session.Run("true")
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-}
-
-func TestRunCommandStdinError(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-
-	r, w := io.Pipe()
-	defer r.Close()
-	session.Stdin = r
-	pipeErr := errors.New("closing write end of pipe")
-	w.CloseWithError(pipeErr)
-
-	err = session.Run("true")
-	if err != pipeErr {
-		t.Fatalf("expected %v, found %v", pipeErr, err)
-	}
-}
-
-func TestRunCommandFailed(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-	err = session.Run(`bash -c "kill -9 $$"`)
-	if err == nil {
-		t.Fatalf("session succeeded: %v", err)
-	}
-}
-
-func TestRunCommandWeClosed(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	err = session.Shell()
-	if err != nil {
-		t.Fatalf("shell failed: %v", err)
-	}
-	err = session.Close()
-	if err != nil {
-		t.Fatalf("shell failed: %v", err)
-	}
-}
-
-func TestFuncLargeRead(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("unable to create new session: %s", err)
-	}
-
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		t.Fatalf("unable to acquire stdout pipe: %s", err)
-	}
-
-	err = session.Start("dd if=/dev/urandom bs=2048 count=1024")
-	if err != nil {
-		t.Fatalf("unable to execute remote command: %s", err)
-	}
-
-	buf := new(bytes.Buffer)
-	n, err := io.Copy(buf, stdout)
-	if err != nil {
-		t.Fatalf("error reading from remote stdout: %s", err)
-	}
-
-	if n != 2048*1024 {
-		t.Fatalf("Expected %d bytes but read only %d from remote command", 2048, n)
-	}
-}
-
-func TestKeyChange(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conf := clientConfig()
-	hostDB := hostKeyDB()
-	conf.HostKeyCallback = hostDB.Check
-	conf.RekeyThreshold = 1024
-	conn := server.Dial(conf)
-	defer conn.Close()
-
-	for i := 0; i < 4; i++ {
-		session, err := conn.NewSession()
-		if err != nil {
-			t.Fatalf("unable to create new session: %s", err)
-		}
-
-		stdout, err := session.StdoutPipe()
-		if err != nil {
-			t.Fatalf("unable to acquire stdout pipe: %s", err)
-		}
-
-		err = session.Start("dd if=/dev/urandom bs=1024 count=1")
-		if err != nil {
-			t.Fatalf("unable to execute remote command: %s", err)
-		}
-		buf := new(bytes.Buffer)
-		n, err := io.Copy(buf, stdout)
-		if err != nil {
-			t.Fatalf("error reading from remote stdout: %s", err)
-		}
-
-		want := int64(1024)
-		if n != want {
-			t.Fatalf("Expected %d bytes but read only %d from remote command", want, n)
-		}
-	}
-
-	if changes := hostDB.checkCount; changes < 4 {
-		t.Errorf("got %d key changes, want 4", changes)
-	}
-}
-
-func TestInvalidTerminalMode(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-
-	if err = session.RequestPty("vt100", 80, 40, ssh.TerminalModes{255: 1984}); err == nil {
-		t.Fatalf("req-pty failed: successful request with invalid mode")
-	}
-}
-
-func TestValidTerminalMode(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		t.Fatalf("unable to acquire stdout pipe: %s", err)
-	}
-
-	stdin, err := session.StdinPipe()
-	if err != nil {
-		t.Fatalf("unable to acquire stdin pipe: %s", err)
-	}
-
-	tm := ssh.TerminalModes{ssh.ECHO: 0}
-	if err = session.RequestPty("xterm", 80, 40, tm); err != nil {
-		t.Fatalf("req-pty failed: %s", err)
-	}
-
-	err = session.Shell()
-	if err != nil {
-		t.Fatalf("session failed: %s", err)
-	}
-
-	stdin.Write([]byte("stty -a && exit\n"))
-
-	var buf bytes.Buffer
-	if _, err := io.Copy(&buf, stdout); err != nil {
-		t.Fatalf("reading failed: %s", err)
-	}
-
-	if sttyOutput := buf.String(); !strings.Contains(sttyOutput, "-echo ") {
-		t.Fatalf("terminal mode failure: expected -echo in stty output, got %s", sttyOutput)
-	}
-}
-
-func TestWindowChange(t *testing.T) {
-	server := newServer(t)
-	defer server.Shutdown()
-	conn := server.Dial(clientConfig())
-	defer conn.Close()
-
-	session, err := conn.NewSession()
-	if err != nil {
-		t.Fatalf("session failed: %v", err)
-	}
-	defer session.Close()
-
-	stdout, err := session.StdoutPipe()
-	if err != nil {
-		t.Fatalf("unable to acquire stdout pipe: %s", err)
-	}
-
-	stdin, err := session.StdinPipe()
-	if err != nil {
-		t.Fatalf("unable to acquire stdin pipe: %s", err)
-	}
-
-	tm := ssh.TerminalModes{ssh.ECHO: 0}
-	if err = session.RequestPty("xterm", 80, 40, tm); err != nil {
-		t.Fatalf("req-pty failed: %s", err)
-	}
-
-	if err := session.WindowChange(100, 100); err != nil {
-		t.Fatalf("window-change failed: %s", err)
-	}
-
-	err = session.Shell()
-	if err != nil {
-		t.Fatalf("session failed: %s", err)
-	}
-
-	stdin.Write([]byte("stty size && exit\n"))
-
-	var buf bytes.Buffer
-	if _, err := io.Copy(&buf, stdout); err != nil {
-		t.Fatalf("reading failed: %s", err)
-	}
-
-	if sttyOutput := buf.String(); !strings.Contains(sttyOutput, "100 100") {
-		t.Fatalf("terminal WindowChange failure: expected \"100 100\" stty output, got %s", sttyOutput)
-	}
-}
-
-func TestCiphers(t *testing.T) {
-	var config ssh.Config
-	config.SetDefaults()
-	cipherOrder := config.Ciphers
-	// These ciphers will not be tested when commented out in cipher.go it will
-	// fallback to the next available as per line 292.
-	cipherOrder = append(cipherOrder, "aes128-cbc", "3des-cbc")
-
-	for _, ciph := range cipherOrder {
-		server := newServer(t)
-		defer server.Shutdown()
-		conf := clientConfig()
-		conf.Ciphers = []string{ciph}
-		// Don't fail if sshd doesn't have the cipher.
-		conf.Ciphers = append(conf.Ciphers, cipherOrder...)
-		conn, err := server.TryDial(conf)
-		if err == nil {
-			conn.Close()
-		} else {
-			t.Fatalf("failed for cipher %q", ciph)
-		}
-	}
-}
-
-func TestMACs(t *testing.T) {
-	var config ssh.Config
-	config.SetDefaults()
-	macOrder := config.MACs
-
-	for _, mac := range macOrder {
-		server := newServer(t)
-		defer server.Shutdown()
-		conf := clientConfig()
-		conf.MACs = []string{mac}
-		// Don't fail if sshd doesn't have the MAC.
-		conf.MACs = append(conf.MACs, macOrder...)
-		if conn, err := server.TryDial(conf); err == nil {
-			conn.Close()
-		} else {
-			t.Fatalf("failed for MAC %q", mac)
-		}
-	}
-}
-
-func TestKeyExchanges(t *testing.T) {
-	var config ssh.Config
-	config.SetDefaults()
-	kexOrder := config.KeyExchanges
-	for _, kex := range kexOrder {
-		server := newServer(t)
-		defer server.Shutdown()
-		conf := clientConfig()
-		// Don't fail if sshd doesn't have the kex.
-		conf.KeyExchanges = append([]string{kex}, kexOrder...)
-		conn, err := server.TryDial(conf)
-		if err == nil {
-			conn.Close()
-		} else {
-			t.Errorf("failed for kex %q", kex)
-		}
-	}
-}
-
-func TestClientAuthAlgorithms(t *testing.T) {
-	for _, key := range []string{
-		"rsa",
-		"dsa",
-		"ecdsa",
-		"ed25519",
-	} {
-		server := newServer(t)
-		conf := clientConfig()
-		conf.SetDefaults()
-		conf.Auth = []ssh.AuthMethod{
-			ssh.PublicKeys(testSigners[key]),
-		}
-
-		conn, err := server.TryDial(conf)
-		if err == nil {
-			conn.Close()
-		} else {
-			t.Errorf("failed for key %q", key)
-		}
-
-		server.Shutdown()
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
deleted file mode 100644
index e673536a89..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/test_unix_test.go
+++ /dev/null
@@ -1,295 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd plan9
-
-package test
-
-// functional test harness for unix.
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"net"
-	"os"
-	"os/exec"
-	"os/user"
-	"path/filepath"
-	"testing"
-	"text/template"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/testdata"
-)
-
-const sshd_config = `
-Protocol 2
-HostKey {{.Dir}}/id_rsa
-HostKey {{.Dir}}/id_dsa
-HostKey {{.Dir}}/id_ecdsa
-HostCertificate {{.Dir}}/id_rsa-cert.pub
-Pidfile {{.Dir}}/sshd.pid
-#UsePrivilegeSeparation no
-KeyRegenerationInterval 3600
-ServerKeyBits 768
-SyslogFacility AUTH
-LogLevel DEBUG2
-LoginGraceTime 120
-PermitRootLogin no
-StrictModes no
-RSAAuthentication yes
-PubkeyAuthentication yes
-AuthorizedKeysFile	{{.Dir}}/authorized_keys
-TrustedUserCAKeys {{.Dir}}/id_ecdsa.pub
-IgnoreRhosts yes
-RhostsRSAAuthentication no
-HostbasedAuthentication no
-PubkeyAcceptedKeyTypes=*
-`
-
-var configTmpl = template.Must(template.New("").Parse(sshd_config))
-
-type server struct {
-	t          *testing.T
-	cleanup    func() // executed during Shutdown
-	configfile string
-	cmd        *exec.Cmd
-	output     bytes.Buffer // holds stderr from sshd process
-
-	// Client half of the network connection.
-	clientConn net.Conn
-}
-
-func username() string {
-	var username string
-	if user, err := user.Current(); err == nil {
-		username = user.Username
-	} else {
-		// user.Current() currently requires cgo. If an error is
-		// returned attempt to get the username from the environment.
-		log.Printf("user.Current: %v; falling back on $USER", err)
-		username = os.Getenv("USER")
-	}
-	if username == "" {
-		panic("Unable to get username")
-	}
-	return username
-}
-
-type storedHostKey struct {
-	// keys map from an algorithm string to binary key data.
-	keys map[string][]byte
-
-	// checkCount counts the Check calls. Used for testing
-	// rekeying.
-	checkCount int
-}
-
-func (k *storedHostKey) Add(key ssh.PublicKey) {
-	if k.keys == nil {
-		k.keys = map[string][]byte{}
-	}
-	k.keys[key.Type()] = key.Marshal()
-}
-
-func (k *storedHostKey) Check(addr string, remote net.Addr, key ssh.PublicKey) error {
-	k.checkCount++
-	algo := key.Type()
-
-	if k.keys == nil || bytes.Compare(key.Marshal(), k.keys[algo]) != 0 {
-		return fmt.Errorf("host key mismatch. Got %q, want %q", key, k.keys[algo])
-	}
-	return nil
-}
-
-func hostKeyDB() *storedHostKey {
-	keyChecker := &storedHostKey{}
-	keyChecker.Add(testPublicKeys["ecdsa"])
-	keyChecker.Add(testPublicKeys["rsa"])
-	keyChecker.Add(testPublicKeys["dsa"])
-	return keyChecker
-}
-
-func clientConfig() *ssh.ClientConfig {
-	config := &ssh.ClientConfig{
-		User: username(),
-		Auth: []ssh.AuthMethod{
-			ssh.PublicKeys(testSigners["user"]),
-		},
-		HostKeyCallback: hostKeyDB().Check,
-		HostKeyAlgorithms: []string{ // by default, don't allow certs as this affects the hostKeyDB checker
-			ssh.KeyAlgoECDSA256, ssh.KeyAlgoECDSA384, ssh.KeyAlgoECDSA521,
-			ssh.KeyAlgoRSA, ssh.KeyAlgoDSA,
-			ssh.KeyAlgoED25519,
-		},
-	}
-	return config
-}
-
-// unixConnection creates two halves of a connected net.UnixConn.  It
-// is used for connecting the Go SSH client with sshd without opening
-// ports.
-func unixConnection() (*net.UnixConn, *net.UnixConn, error) {
-	dir, err := ioutil.TempDir("", "unixConnection")
-	if err != nil {
-		return nil, nil, err
-	}
-	defer os.Remove(dir)
-
-	addr := filepath.Join(dir, "ssh")
-	listener, err := net.Listen("unix", addr)
-	if err != nil {
-		return nil, nil, err
-	}
-	defer listener.Close()
-	c1, err := net.Dial("unix", addr)
-	if err != nil {
-		return nil, nil, err
-	}
-
-	c2, err := listener.Accept()
-	if err != nil {
-		c1.Close()
-		return nil, nil, err
-	}
-
-	return c1.(*net.UnixConn), c2.(*net.UnixConn), nil
-}
-
-func (s *server) TryDial(config *ssh.ClientConfig) (*ssh.Client, error) {
-	return s.TryDialWithAddr(config, "")
-}
-
-// addr is the user specified host:port. While we don't actually dial it,
-// we need to know this for host key matching
-func (s *server) TryDialWithAddr(config *ssh.ClientConfig, addr string) (*ssh.Client, error) {
-	sshd, err := exec.LookPath("sshd")
-	if err != nil {
-		s.t.Skipf("skipping test: %v", err)
-	}
-
-	c1, c2, err := unixConnection()
-	if err != nil {
-		s.t.Fatalf("unixConnection: %v", err)
-	}
-
-	s.cmd = exec.Command(sshd, "-f", s.configfile, "-i", "-e")
-	f, err := c2.File()
-	if err != nil {
-		s.t.Fatalf("UnixConn.File: %v", err)
-	}
-	defer f.Close()
-	s.cmd.Stdin = f
-	s.cmd.Stdout = f
-	s.cmd.Stderr = &s.output
-	if err := s.cmd.Start(); err != nil {
-		s.t.Fail()
-		s.Shutdown()
-		s.t.Fatalf("s.cmd.Start: %v", err)
-	}
-	s.clientConn = c1
-	conn, chans, reqs, err := ssh.NewClientConn(c1, addr, config)
-	if err != nil {
-		return nil, err
-	}
-	return ssh.NewClient(conn, chans, reqs), nil
-}
-
-func (s *server) Dial(config *ssh.ClientConfig) *ssh.Client {
-	conn, err := s.TryDial(config)
-	if err != nil {
-		s.t.Fail()
-		s.Shutdown()
-		s.t.Fatalf("ssh.Client: %v", err)
-	}
-	return conn
-}
-
-func (s *server) Shutdown() {
-	if s.cmd != nil && s.cmd.Process != nil {
-		// Don't check for errors; if it fails it's most
-		// likely "os: process already finished", and we don't
-		// care about that. Use os.Interrupt, so child
-		// processes are killed too.
-		s.cmd.Process.Signal(os.Interrupt)
-		s.cmd.Wait()
-	}
-	if s.t.Failed() {
-		// log any output from sshd process
-		s.t.Logf("sshd: %s", s.output.String())
-	}
-	s.cleanup()
-}
-
-func writeFile(path string, contents []byte) {
-	f, err := os.OpenFile(path, os.O_WRONLY|os.O_TRUNC|os.O_CREATE, 0600)
-	if err != nil {
-		panic(err)
-	}
-	defer f.Close()
-	if _, err := f.Write(contents); err != nil {
-		panic(err)
-	}
-}
-
-// newServer returns a new mock ssh server.
-func newServer(t *testing.T) *server {
-	if testing.Short() {
-		t.Skip("skipping test due to -short")
-	}
-	dir, err := ioutil.TempDir("", "sshtest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	f, err := os.Create(filepath.Join(dir, "sshd_config"))
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = configTmpl.Execute(f, map[string]string{
-		"Dir": dir,
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	f.Close()
-
-	for k, v := range testdata.PEMBytes {
-		filename := "id_" + k
-		writeFile(filepath.Join(dir, filename), v)
-		writeFile(filepath.Join(dir, filename+".pub"), ssh.MarshalAuthorizedKey(testPublicKeys[k]))
-	}
-
-	for k, v := range testdata.SSHCertificates {
-		filename := "id_" + k + "-cert.pub"
-		writeFile(filepath.Join(dir, filename), v)
-	}
-
-	var authkeys bytes.Buffer
-	for k, _ := range testdata.PEMBytes {
-		authkeys.Write(ssh.MarshalAuthorizedKey(testPublicKeys[k]))
-	}
-	writeFile(filepath.Join(dir, "authorized_keys"), authkeys.Bytes())
-
-	return &server{
-		t:          t,
-		configfile: f.Name(),
-		cleanup: func() {
-			if err := os.RemoveAll(dir); err != nil {
-				t.Error(err)
-			}
-		},
-	}
-}
-
-func newTempSocket(t *testing.T) (string, func()) {
-	dir, err := ioutil.TempDir("", "socket")
-	if err != nil {
-		t.Fatal(err)
-	}
-	deferFunc := func() { os.RemoveAll(dir) }
-	addr := filepath.Join(dir, "sock")
-	return addr, deferFunc
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/test/testdata_test.go b/installer/vendor/golang.org/x/crypto/ssh/test/testdata_test.go
deleted file mode 100644
index a053f67eab..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/test/testdata_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// IMPLEMENTATION NOTE: To avoid a package loop, this file is in three places:
-// ssh/, ssh/agent, and ssh/test/. It should be kept in sync across all three
-// instances.
-
-package test
-
-import (
-	"crypto/rand"
-	"fmt"
-
-	"golang.org/x/crypto/ssh"
-	"golang.org/x/crypto/ssh/testdata"
-)
-
-var (
-	testPrivateKeys map[string]interface{}
-	testSigners     map[string]ssh.Signer
-	testPublicKeys  map[string]ssh.PublicKey
-)
-
-func init() {
-	var err error
-
-	n := len(testdata.PEMBytes)
-	testPrivateKeys = make(map[string]interface{}, n)
-	testSigners = make(map[string]ssh.Signer, n)
-	testPublicKeys = make(map[string]ssh.PublicKey, n)
-	for t, k := range testdata.PEMBytes {
-		testPrivateKeys[t], err = ssh.ParseRawPrivateKey(k)
-		if err != nil {
-			panic(fmt.Sprintf("Unable to parse test key %s: %v", t, err))
-		}
-		testSigners[t], err = ssh.NewSignerFromKey(testPrivateKeys[t])
-		if err != nil {
-			panic(fmt.Sprintf("Unable to create signer for test key %s: %v", t, err))
-		}
-		testPublicKeys[t] = testSigners[t].PublicKey()
-	}
-
-	// Create a cert and sign it for use in tests.
-	testCert := &ssh.Certificate{
-		Nonce:           []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		ValidPrincipals: []string{"gopher1", "gopher2"}, // increases test coverage
-		ValidAfter:      0,                              // unix epoch
-		ValidBefore:     ssh.CertTimeInfinity,           // The end of currently representable time.
-		Reserved:        []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		Key:             testPublicKeys["ecdsa"],
-		SignatureKey:    testPublicKeys["rsa"],
-		Permissions: ssh.Permissions{
-			CriticalOptions: map[string]string{},
-			Extensions:      map[string]string{},
-		},
-	}
-	testCert.SignCert(rand.Reader, testSigners["rsa"])
-	testPrivateKeys["cert"] = testPrivateKeys["ecdsa"]
-	testSigners["cert"], err = ssh.NewCertSigner(testCert, testSigners["ecdsa"])
-	if err != nil {
-		panic(fmt.Sprintf("Unable to create certificate signer: %v", err))
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/testdata/doc.go b/installer/vendor/golang.org/x/crypto/ssh/testdata/doc.go
deleted file mode 100644
index fcae47ca68..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/testdata/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This package contains test data shared between the various subpackages of
-// the golang.org/x/crypto/ssh package. Under no circumstance should
-// this data be used for production code.
-package testdata // import "golang.org/x/crypto/ssh/testdata"
diff --git a/installer/vendor/golang.org/x/crypto/ssh/testdata/keys.go b/installer/vendor/golang.org/x/crypto/ssh/testdata/keys.go
deleted file mode 100644
index 3b3d26c5b9..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/testdata/keys.go
+++ /dev/null
@@ -1,177 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package testdata
-
-var PEMBytes = map[string][]byte{
-	"dsa": []byte(`-----BEGIN DSA PRIVATE KEY-----
-MIIBuwIBAAKBgQD6PDSEyXiI9jfNs97WuM46MSDCYlOqWw80ajN16AohtBncs1YB
-lHk//dQOvCYOsYaE+gNix2jtoRjwXhDsc25/IqQbU1ahb7mB8/rsaILRGIbA5WH3
-EgFtJmXFovDz3if6F6TzvhFpHgJRmLYVR8cqsezL3hEZOvvs2iH7MorkxwIVAJHD
-nD82+lxh2fb4PMsIiaXudAsBAoGAQRf7Q/iaPRn43ZquUhd6WwvirqUj+tkIu6eV
-2nZWYmXLlqFQKEy4Tejl7Wkyzr2OSYvbXLzo7TNxLKoWor6ips0phYPPMyXld14r
-juhT24CrhOzuLMhDduMDi032wDIZG4Y+K7ElU8Oufn8Sj5Wge8r6ANmmVgmFfynr
-FhdYCngCgYEA3ucGJ93/Mx4q4eKRDxcWD3QzWyqpbRVRRV1Vmih9Ha/qC994nJFz
-DQIdjxDIT2Rk2AGzMqFEB68Zc3O+Wcsmz5eWWzEwFxaTwOGWTyDqsDRLm3fD+QYj
-nOwuxb0Kce+gWI8voWcqC9cyRm09jGzu2Ab3Bhtpg8JJ8L7gS3MRZK4CFEx4UAfY
-Fmsr0W6fHB9nhS4/UXM8
------END DSA PRIVATE KEY-----
-`),
-	"ecdsa": []byte(`-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEINGWx0zo6fhJ/0EAfrPzVFyFC9s18lBt3cRoEDhS3ARooAoGCCqGSM49
-AwEHoUQDQgAEi9Hdw6KvZcWxfg2IDhA7UkpDtzzt6ZqJXSsFdLd+Kx4S3Sx4cVO+
-6/ZOXRnPmNAlLUqjShUsUBBngG0u2fqEqA==
------END EC PRIVATE KEY-----
-`),
-	"rsa": []byte(`-----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQC8A6FGHDiWCSREAXCq6yBfNVr0xCVG2CzvktFNRpue+RXrGs/2
-a6ySEJQb3IYquw7HlJgu6fg3WIWhOmHCjfpG0PrL4CRwbqQ2LaPPXhJErWYejcD8
-Di00cF3677+G10KMZk9RXbmHtuBFZT98wxg8j+ZsBMqGM1+7yrWUvynswQIDAQAB
-AoGAJMCk5vqfSRzyXOTXLGIYCuR4Kj6pdsbNSeuuRGfYBeR1F2c/XdFAg7D/8s5R
-38p/Ih52/Ty5S8BfJtwtvgVY9ecf/JlU/rl/QzhG8/8KC0NG7KsyXklbQ7gJT8UT
-Ojmw5QpMk+rKv17ipDVkQQmPaj+gJXYNAHqImke5mm/K/h0CQQDciPmviQ+DOhOq
-2ZBqUfH8oXHgFmp7/6pXw80DpMIxgV3CwkxxIVx6a8lVH9bT/AFySJ6vXq4zTuV9
-6QmZcZzDAkEA2j/UXJPIs1fQ8z/6sONOkU/BjtoePFIWJlRxdN35cZjXnBraX5UR
-fFHkePv4YwqmXNqrBOvSu+w2WdSDci+IKwJAcsPRc/jWmsrJW1q3Ha0hSf/WG/Bu
-X7MPuXaKpP/DkzGoUmb8ks7yqj6XWnYkPNLjCc8izU5vRwIiyWBRf4mxMwJBAILa
-NDvRS0rjwt6lJGv7zPZoqDc65VfrK2aNyHx2PgFyzwrEOtuF57bu7pnvEIxpLTeM
-z26i6XVMeYXAWZMTloMCQBbpGgEERQpeUknLBqUHhg/wXF6+lFA+vEGnkY+Dwab2
-KCXFGd+SQ5GdUcEMe9isUH6DYj/6/yCDoFrXXmpQb+M=
------END RSA PRIVATE KEY-----
-`),
-	"ed25519": []byte(`-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACA+3f7hS7g5UWwXOGVTrMfhmxyrjqz7Sxxbx7I1j8DvvwAAAJhAFfkOQBX5
-DgAAAAtzc2gtZWQyNTUxOQAAACA+3f7hS7g5UWwXOGVTrMfhmxyrjqz7Sxxbx7I1j8Dvvw
-AAAEAaYmXltfW6nhRo3iWGglRB48lYq0z0Q3I3KyrdutEr6j7d/uFLuDlRbBc4ZVOsx+Gb
-HKuOrPtLHFvHsjWPwO+/AAAAE2dhcnRvbm1AZ2FydG9ubS14cHMBAg==
------END OPENSSH PRIVATE KEY-----
-`),
-	"rsa-openssh-format": []byte(`-----BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAlwAAAAdzc2gtcn
-NhAAAAAwEAAQAAAIEAwa48yfWFi3uIdqzuf9X7C2Zxfea/Iaaw0zIwHudpF8U92WVIiC5l
-oEuW1+OaVi3UWfIEjWMV1tHGysrHOwtwc34BPCJqJknUQO/KtDTBTJ4Pryhw1bWPC999Lz
-a+yrCTdNQYBzoROXKExZgPFh9pTMi5wqpHDuOQ2qZFIEI3lT0AAAIQWL0H31i9B98AAAAH
-c3NoLXJzYQAAAIEAwa48yfWFi3uIdqzuf9X7C2Zxfea/Iaaw0zIwHudpF8U92WVIiC5loE
-uW1+OaVi3UWfIEjWMV1tHGysrHOwtwc34BPCJqJknUQO/KtDTBTJ4Pryhw1bWPC999Lza+
-yrCTdNQYBzoROXKExZgPFh9pTMi5wqpHDuOQ2qZFIEI3lT0AAAADAQABAAAAgCThyTGsT4
-IARDxVMhWl6eiB2ZrgFgWSeJm/NOqtppWgOebsIqPMMg4UVuVFsl422/lE3RkPhVkjGXgE
-pWvZAdCnmLmApK8wK12vF334lZhZT7t3Z9EzJps88PWEHo7kguf285HcnUM7FlFeissJdk
-kXly34y7/3X/a6Tclm+iABAAAAQE0xR/KxZ39slwfMv64Rz7WKk1PPskaryI29aHE3mKHk
-pY2QA+P3QlrKxT/VWUMjHUbNNdYfJm48xu0SGNMRdKMAAABBAORh2NP/06JUV3J9W/2Hju
-X1ViJuqqcQnJPVzpgSL826EC2xwOECTqoY8uvFpUdD7CtpksIxNVqRIhuNOlz0lqEAAABB
-ANkaHTTaPojClO0dKJ/Zjs7pWOCGliebBYprQ/Y4r9QLBkC/XaWMS26gFIrjgC7D2Rv+rZ
-wSD0v0RcmkITP1ZR0AAAAYcHF1ZXJuYUBMdWNreUh5ZHJvLmxvY2FsAQID
------END OPENSSH PRIVATE KEY-----`),
-	"user": []byte(`-----BEGIN EC PRIVATE KEY-----
-MHcCAQEEILYCAeq8f7V4vSSypRw7pxy8yz3V5W4qg8kSC3zJhqpQoAoGCCqGSM49
-AwEHoUQDQgAEYcO2xNKiRUYOLEHM7VYAp57HNyKbOdYtHD83Z4hzNPVC4tM5mdGD
-PLL8IEwvYu2wq+lpXfGQnNMbzYf9gspG0w==
------END EC PRIVATE KEY-----
-`),
-	"ca": []byte(`-----BEGIN RSA PRIVATE KEY-----
-MIIEpAIBAAKCAQEAvg9dQ9IRG59lYJb+GESfKWTch4yBpr7Ydw1jkK6vvtrx9jLo
-5hkA8X6+ElRPRqTAZSlN5cBm6YCAcQIOsmXDUn6Oj1lVPQAoOjTBTvsjM3NjGhvv
-52kHTY0nsMsBeY9q5DTtlzmlYkVUq2a6Htgf2mNi01dIw5fJ7uTTo8EbNf7O0i3u
-c9a8P19HaZl5NKiWN4EIZkfB2WdXYRJCVBsGgQj3dE/GrEmH9QINq1A+GkNvK96u
-vZm8H1jjmuqzHplWa7lFeXcx8FTVTbVb/iJrZ2Lc/JvIPitKZWhqbR59yrGjpwEp
-Id7bo4WhO5L3OB0fSIJYvfu+o4WYnt4f3UzecwIDAQABAoIBABRD9yHgKErVuC2Q
-bA+SYZY8VvdtF/X7q4EmQFORDNRA7EPgMc03JU6awRGbQ8i4kHs46EFzPoXvWcKz
-AXYsO6N0Myc900Tp22A5d9NAHATEbPC/wdje7hRq1KyZONMJY9BphFv3nZbY5apR
-Dc90JBFZP5RhXjTc3n9GjvqLAKfFEKVmPRCvqxCOZunw6XR+SgIQLJo36nsIsbhW
-QUXIVaCI6cXMN8bRPm8EITdBNZu06Fpu4ZHm6VaxlXN9smERCDkgBSNXNWHKxmmA
-c3Glo2DByUr2/JFBOrLEe9fkYgr24KNCQkHVcSaFxEcZvTggr7StjKISVHlCNEaB
-7Q+kPoECgYEA3zE9FmvFGoQCU4g4Nl3dpQHs6kaAW8vJlrmq3xsireIuaJoa2HMe
-wYdIvgCnK9DIjyxd5OWnE4jXtAEYPsyGD32B5rSLQrRO96lgb3f4bESCLUb3Bsn/
-sdgeE3p1xZMA0B59htqCrvVgN9k8WxyevBxYl3/gSBm/p8OVH1RTW/ECgYEA2f9Z
-95OLj0KQHQtxQXf+I3VjhCw3LkLW39QZOXVI0QrCJfqqP7uxsJXH9NYX0l0GFTcR
-kRrlyoaSU1EGQosZh+n1MvplGBTkTSV47/bPsTzFpgK2NfEZuFm9RoWgltS+nYeH
-Y2k4mnAN3PhReCMwuprmJz8GRLsO3Cs2s2YylKMCgYEA2UX+uO/q7jgqZ5UJW+ue
-1H5+W0aMuFA3i7JtZEnvRaUVFqFGlwXin/WJ2+WY1++k/rPrJ+Rk9IBXtBUIvEGw
-FC5TIfsKQsJyyWgqx/jbbtJ2g4s8+W/1qfTAuqeRNOg5d2DnRDs90wJuS4//0JaY
-9HkHyVwkQyxFxhSA/AHEMJECgYA2MvyFR1O9bIk0D3I7GsA+xKLXa77Ua53MzIjw
-9i4CezBGDQpjCiFli/fI8am+jY5DnAtsDknvjoG24UAzLy5L0mk6IXMdB6SzYYut
-7ak5oahqW+Y9hxIj+XvLmtGQbphtxhJtLu35x75KoBpxSh6FZpmuTEccs31AVCYn
-eFM/DQKBgQDOPUwbLKqVi6ddFGgrV9MrWw+SWsDa43bPuyvYppMM3oqesvyaX1Dt
-qDvN7owaNxNM4OnfKcZr91z8YPVCFo4RbBif3DXRzjNNBlxEjHBtuMOikwvsmucN
-vIrbeEpjTiUMTEAr6PoTiVHjsfS8WAM6MDlF5M+2PNswDsBpa2yLgA==
------END RSA PRIVATE KEY-----
-`),
-}
-
-var SSHCertificates = map[string][]byte{
-	// The following are corresponding certificates for the private keys above, signed by the CA key
-	// Generated by the following commands:
-	//
-	// 1. Assumes "rsa" key above in file named "rsa", write out the public key to "rsa.pub":
-	//    ssh-keygen -y -f rsa > rsa.pu
-	//
-	// 2. Assumes "ca" key above in file named "ca", sign a cert for "rsa.pub":
-	//    ssh-keygen -s ca -h -n host.example.com -V +500w -I host.example.com-key rsa.pub
-	"rsa": []byte(`ssh-rsa-cert-v01@openssh.com AAAAHHNzaC1yc2EtY2VydC12MDFAb3BlbnNzaC5jb20AAAAgLjYqmmuTSEmjVhSfLQphBSTJMLwIZhRgmpn8FHKLiEIAAAADAQABAAAAgQC8A6FGHDiWCSREAXCq6yBfNVr0xCVG2CzvktFNRpue+RXrGs/2a6ySEJQb3IYquw7HlJgu6fg3WIWhOmHCjfpG0PrL4CRwbqQ2LaPPXhJErWYejcD8Di00cF3677+G10KMZk9RXbmHtuBFZT98wxg8j+ZsBMqGM1+7yrWUvynswQAAAAAAAAAAAAAAAgAAABRob3N0LmV4YW1wbGUuY29tLWtleQAAABQAAAAQaG9zdC5leGFtcGxlLmNvbQAAAABZHN8UAAAAAGsjIYUAAAAAAAAAAAAAAAAAAAEXAAAAB3NzaC1yc2EAAAADAQABAAABAQC+D11D0hEbn2Vglv4YRJ8pZNyHjIGmvth3DWOQrq++2vH2MujmGQDxfr4SVE9GpMBlKU3lwGbpgIBxAg6yZcNSfo6PWVU9ACg6NMFO+yMzc2MaG+/naQdNjSewywF5j2rkNO2XOaViRVSrZroe2B/aY2LTV0jDl8nu5NOjwRs1/s7SLe5z1rw/X0dpmXk0qJY3gQhmR8HZZ1dhEkJUGwaBCPd0T8asSYf1Ag2rUD4aQ28r3q69mbwfWOOa6rMemVZruUV5dzHwVNVNtVv+ImtnYtz8m8g+K0plaGptHn3KsaOnASkh3tujhaE7kvc4HR9Igli9+76jhZie3h/dTN5zAAABDwAAAAdzc2gtcnNhAAABALeDea+60H6xJGhktAyosHaSY7AYzLocaqd8hJQjEIDifBwzoTlnBmcK9CxGhKuaoJFThdCLdaevCeOSuquh8HTkf+2ebZZc/G5T+2thPvPqmcuEcmMosWo+SIjYhbP3S6KD49aLC1X0kz8IBQeauFvURhkZ5ZjhA1L4aQYt9NjL73nqOl8PplRui+Ov5w8b4ldul4zOvYAFrzfcP6wnnXk3c1Zzwwf5wynD5jakO8GpYKBuhM7Z4crzkKSQjU3hla7xqgfomC5Gz4XbR2TNjcQiRrJQ0UlKtX3X3ObRCEhuvG0Kzjklhv+Ddw6txrhKjMjiSi/Yyius/AE8TmC1p4U= host.example.com
-`),
-}
-
-var PEMEncryptedKeys = []struct {
-	Name          string
-	EncryptionKey string
-	PEMBytes      []byte
-}{
-	0: {
-		Name:          "rsa-encrypted",
-		EncryptionKey: "r54-G0pher_t3st$",
-		PEMBytes: []byte(`-----BEGIN RSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,3E1714DE130BC5E81327F36564B05462
-
-MqW88sud4fnWk/Jk3fkjh7ydu51ZkHLN5qlQgA4SkAXORPPMj2XvqZOv1v2LOgUV
-dUevUn8PZK7a9zbZg4QShUSzwE5k6wdB7XKPyBgI39mJ79GBd2U4W3h6KT6jIdWA
-goQpluxkrzr2/X602IaxLEre97FT9mpKC6zxKCLvyFWVIP9n3OSFS47cTTXyFr+l
-7PdRhe60nn6jSBgUNk/Q1lAvEQ9fufdPwDYY93F1wyJ6lOr0F1+mzRrMbH67NyKs
-rG8J1Fa7cIIre7ueKIAXTIne7OAWqpU9UDgQatDtZTbvA7ciqGsSFgiwwW13N+Rr
-hN8MkODKs9cjtONxSKi05s206A3NDU6STtZ3KuPDjFE1gMJODotOuqSM+cxKfyFq
-wxpk/CHYCDdMAVBSwxb/vraOHamylL4uCHpJdBHypzf2HABt+lS8Su23uAmL87DR
-yvyCS/lmpuNTndef6qHPRkoW2EV3xqD3ovosGf7kgwGJUk2ZpCLVteqmYehKlZDK
-r/Jy+J26ooI2jIg9bjvD1PZq+Mv+2dQ1RlDrPG3PB+rEixw6vBaL9x3jatCd4ej7
-XG7lb3qO9xFpLsx89tkEcvpGR+broSpUJ6Mu5LBCVmrvqHjvnDhrZVz1brMiQtU9
-iMZbgXqDLXHd6ERWygk7OTU03u+l1gs+KGMfmS0h0ZYw6KGVLgMnsoxqd6cFSKNB
-8Ohk9ZTZGCiovlXBUepyu8wKat1k8YlHSfIHoRUJRhhcd7DrmojC+bcbMIZBU22T
-Pl2ftVRGtcQY23lYd0NNKfebF7ncjuLWQGy+vZW+7cgfI6wPIbfYfP6g7QAutk6W
-KQx0AoX5woZ6cNxtpIrymaVjSMRRBkKQrJKmRp3pC/lul5E5P2cueMs1fj4OHTbJ
-lAUv88ywr+R+mRgYQlFW/XQ653f6DT4t6+njfO9oBcPrQDASZel3LjXLpjjYG/N5
-+BWnVexuJX9ika8HJiFl55oqaKb+WknfNhk5cPY+x7SDV9ywQeMiDZpr0ffeYAEP
-LlwwiWRDYpO+uwXHSFF3+JjWwjhs8m8g99iFb7U93yKgBB12dCEPPa2ZeH9wUHMJ
-sreYhNuq6f4iWWSXpzN45inQqtTi8jrJhuNLTT543ErW7DtntBO2rWMhff3aiXbn
-Uy3qzZM1nPbuCGuBmP9L2dJ3Z5ifDWB4JmOyWY4swTZGt9AVmUxMIKdZpRONx8vz
-I9u9nbVPGZBcou50Pa0qTLbkWsSL94MNXrARBxzhHC9Zs6XNEtwN7mOuii7uMkVc
-adrxgknBH1J1N+NX/eTKzUwJuPvDtA+Z5ILWNN9wpZT/7ed8zEnKHPNUexyeT5g3
-uw9z9jH7ffGxFYlx87oiVPHGOrCXYZYW5uoZE31SCBkbtNuffNRJRKIFeipmpJ3P
-7bpAG+kGHMelQH6b+5K1Qgsv4tpuSyKeTKpPFH9Av5nN4P1ZBm9N80tzbNWqjSJm
-S7rYdHnuNEVnUGnRmEUMmVuYZnNBEVN/fP2m2SEwXcP3Uh7TiYlcWw10ygaGmOr7
-MvMLGkYgQ4Utwnd98mtqa0jr0hK2TcOSFir3AqVvXN3XJj4cVULkrXe4Im1laWgp
------END RSA PRIVATE KEY-----
-`),
-	},
-
-	1: {
-		Name:          "dsa-encrypted",
-		EncryptionKey: "qG0pher-dsa_t3st$",
-		PEMBytes: []byte(`-----BEGIN DSA PRIVATE KEY-----
-Proc-Type: 4,ENCRYPTED
-DEK-Info: AES-128-CBC,7CE7A6E4A647DC01AF860210B15ADE3E
-
-hvnBpI99Hceq/55pYRdOzBLntIEis02JFNXuLEydWL+RJBFDn7tA+vXec0ERJd6J
-G8JXlSOAhmC2H4uK3q2xR8/Y3yL95n6OIcjvCBiLsV+o3jj1MYJmErxP6zRtq4w3
-JjIjGHWmaYFSxPKQ6e8fs74HEqaeMV9ONUoTtB+aISmgaBL15Fcoayg245dkBvVl
-h5Kqspe7yvOBmzA3zjRuxmSCqKJmasXM7mqs3vIrMxZE3XPo1/fWKcPuExgpVQoT
-HkJZEoIEIIPnPMwT2uYbFJSGgPJVMDT84xz7yvjCdhLmqrsXgs5Qw7Pw0i0c0BUJ
-b7fDJ2UhdiwSckWGmIhTLlJZzr8K+JpjCDlP+REYBI5meB7kosBnlvCEHdw2EJkH
-0QDc/2F4xlVrHOLbPRFyu1Oi2Gvbeoo9EsM/DThpd1hKAlb0sF5Y0y0d+owv0PnE
-R/4X3HWfIdOHsDUvJ8xVWZ4BZk9Zk9qol045DcFCehpr/3hslCrKSZHakLt9GI58
-vVQJ4L0aYp5nloLfzhViZtKJXRLkySMKdzYkIlNmW1oVGl7tce5UCNI8Nok4j6yn
-IiHM7GBn+0nJoKTXsOGMIBe3ulKlKVxLjEuk9yivh/8=
------END DSA PRIVATE KEY-----
-`),
-	},
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/testdata_test.go b/installer/vendor/golang.org/x/crypto/ssh/testdata_test.go
deleted file mode 100644
index 2da8c79dc6..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/testdata_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// IMPLEMENTATION NOTE: To avoid a package loop, this file is in three places:
-// ssh/, ssh/agent, and ssh/test/. It should be kept in sync across all three
-// instances.
-
-package ssh
-
-import (
-	"crypto/rand"
-	"fmt"
-
-	"golang.org/x/crypto/ssh/testdata"
-)
-
-var (
-	testPrivateKeys map[string]interface{}
-	testSigners     map[string]Signer
-	testPublicKeys  map[string]PublicKey
-)
-
-func init() {
-	var err error
-
-	n := len(testdata.PEMBytes)
-	testPrivateKeys = make(map[string]interface{}, n)
-	testSigners = make(map[string]Signer, n)
-	testPublicKeys = make(map[string]PublicKey, n)
-	for t, k := range testdata.PEMBytes {
-		testPrivateKeys[t], err = ParseRawPrivateKey(k)
-		if err != nil {
-			panic(fmt.Sprintf("Unable to parse test key %s: %v", t, err))
-		}
-		testSigners[t], err = NewSignerFromKey(testPrivateKeys[t])
-		if err != nil {
-			panic(fmt.Sprintf("Unable to create signer for test key %s: %v", t, err))
-		}
-		testPublicKeys[t] = testSigners[t].PublicKey()
-	}
-
-	// Create a cert and sign it for use in tests.
-	testCert := &Certificate{
-		Nonce:           []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		ValidPrincipals: []string{"gopher1", "gopher2"}, // increases test coverage
-		ValidAfter:      0,                              // unix epoch
-		ValidBefore:     CertTimeInfinity,               // The end of currently representable time.
-		Reserved:        []byte{},                       // To pass reflect.DeepEqual after marshal & parse, this must be non-nil
-		Key:             testPublicKeys["ecdsa"],
-		SignatureKey:    testPublicKeys["rsa"],
-		Permissions: Permissions{
-			CriticalOptions: map[string]string{},
-			Extensions:      map[string]string{},
-		},
-	}
-	testCert.SignCert(rand.Reader, testSigners["rsa"])
-	testPrivateKeys["cert"] = testPrivateKeys["ecdsa"]
-	testSigners["cert"], err = NewCertSigner(testCert, testSigners["ecdsa"])
-	if err != nil {
-		panic(fmt.Sprintf("Unable to create certificate signer: %v", err))
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/transport.go b/installer/vendor/golang.org/x/crypto/ssh/transport.go
deleted file mode 100644
index f9780e0ae7..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/transport.go
+++ /dev/null
@@ -1,375 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bufio"
-	"errors"
-	"io"
-	"log"
-)
-
-// debugTransport if set, will print packet types as they go over the
-// wire. No message decoding is done, to minimize the impact on timing.
-const debugTransport = false
-
-const (
-	gcmCipherID    = "aes128-gcm@openssh.com"
-	aes128cbcID    = "aes128-cbc"
-	tripledescbcID = "3des-cbc"
-)
-
-// packetConn represents a transport that implements packet based
-// operations.
-type packetConn interface {
-	// Encrypt and send a packet of data to the remote peer.
-	writePacket(packet []byte) error
-
-	// Read a packet from the connection. The read is blocking,
-	// i.e. if error is nil, then the returned byte slice is
-	// always non-empty.
-	readPacket() ([]byte, error)
-
-	// Close closes the write-side of the connection.
-	Close() error
-}
-
-// transport is the keyingTransport that implements the SSH packet
-// protocol.
-type transport struct {
-	reader connectionState
-	writer connectionState
-
-	bufReader *bufio.Reader
-	bufWriter *bufio.Writer
-	rand      io.Reader
-	isClient  bool
-	io.Closer
-}
-
-// packetCipher represents a combination of SSH encryption/MAC
-// protocol.  A single instance should be used for one direction only.
-type packetCipher interface {
-	// writePacket encrypts the packet and writes it to w. The
-	// contents of the packet are generally scrambled.
-	writePacket(seqnum uint32, w io.Writer, rand io.Reader, packet []byte) error
-
-	// readPacket reads and decrypts a packet of data. The
-	// returned packet may be overwritten by future calls of
-	// readPacket.
-	readPacket(seqnum uint32, r io.Reader) ([]byte, error)
-}
-
-// connectionState represents one side (read or write) of the
-// connection. This is necessary because each direction has its own
-// keys, and can even have its own algorithms
-type connectionState struct {
-	packetCipher
-	seqNum           uint32
-	dir              direction
-	pendingKeyChange chan packetCipher
-}
-
-// prepareKeyChange sets up key material for a keychange. The key changes in
-// both directions are triggered by reading and writing a msgNewKey packet
-// respectively.
-func (t *transport) prepareKeyChange(algs *algorithms, kexResult *kexResult) error {
-	if ciph, err := newPacketCipher(t.reader.dir, algs.r, kexResult); err != nil {
-		return err
-	} else {
-		t.reader.pendingKeyChange <- ciph
-	}
-
-	if ciph, err := newPacketCipher(t.writer.dir, algs.w, kexResult); err != nil {
-		return err
-	} else {
-		t.writer.pendingKeyChange <- ciph
-	}
-
-	return nil
-}
-
-func (t *transport) printPacket(p []byte, write bool) {
-	if len(p) == 0 {
-		return
-	}
-	who := "server"
-	if t.isClient {
-		who = "client"
-	}
-	what := "read"
-	if write {
-		what = "write"
-	}
-
-	log.Println(what, who, p[0])
-}
-
-// Read and decrypt next packet.
-func (t *transport) readPacket() (p []byte, err error) {
-	for {
-		p, err = t.reader.readPacket(t.bufReader)
-		if err != nil {
-			break
-		}
-		if len(p) == 0 || (p[0] != msgIgnore && p[0] != msgDebug) {
-			break
-		}
-	}
-	if debugTransport {
-		t.printPacket(p, false)
-	}
-
-	return p, err
-}
-
-func (s *connectionState) readPacket(r *bufio.Reader) ([]byte, error) {
-	packet, err := s.packetCipher.readPacket(s.seqNum, r)
-	s.seqNum++
-	if err == nil && len(packet) == 0 {
-		err = errors.New("ssh: zero length packet")
-	}
-
-	if len(packet) > 0 {
-		switch packet[0] {
-		case msgNewKeys:
-			select {
-			case cipher := <-s.pendingKeyChange:
-				s.packetCipher = cipher
-			default:
-				return nil, errors.New("ssh: got bogus newkeys message.")
-			}
-
-		case msgDisconnect:
-			// Transform a disconnect message into an
-			// error. Since this is lowest level at which
-			// we interpret message types, doing it here
-			// ensures that we don't have to handle it
-			// elsewhere.
-			var msg disconnectMsg
-			if err := Unmarshal(packet, &msg); err != nil {
-				return nil, err
-			}
-			return nil, &msg
-		}
-	}
-
-	// The packet may point to an internal buffer, so copy the
-	// packet out here.
-	fresh := make([]byte, len(packet))
-	copy(fresh, packet)
-
-	return fresh, err
-}
-
-func (t *transport) writePacket(packet []byte) error {
-	if debugTransport {
-		t.printPacket(packet, true)
-	}
-	return t.writer.writePacket(t.bufWriter, t.rand, packet)
-}
-
-func (s *connectionState) writePacket(w *bufio.Writer, rand io.Reader, packet []byte) error {
-	changeKeys := len(packet) > 0 && packet[0] == msgNewKeys
-
-	err := s.packetCipher.writePacket(s.seqNum, w, rand, packet)
-	if err != nil {
-		return err
-	}
-	if err = w.Flush(); err != nil {
-		return err
-	}
-	s.seqNum++
-	if changeKeys {
-		select {
-		case cipher := <-s.pendingKeyChange:
-			s.packetCipher = cipher
-		default:
-			panic("ssh: no key material for msgNewKeys")
-		}
-	}
-	return err
-}
-
-func newTransport(rwc io.ReadWriteCloser, rand io.Reader, isClient bool) *transport {
-	t := &transport{
-		bufReader: bufio.NewReader(rwc),
-		bufWriter: bufio.NewWriter(rwc),
-		rand:      rand,
-		reader: connectionState{
-			packetCipher:     &streamPacketCipher{cipher: noneCipher{}},
-			pendingKeyChange: make(chan packetCipher, 1),
-		},
-		writer: connectionState{
-			packetCipher:     &streamPacketCipher{cipher: noneCipher{}},
-			pendingKeyChange: make(chan packetCipher, 1),
-		},
-		Closer: rwc,
-	}
-	t.isClient = isClient
-
-	if isClient {
-		t.reader.dir = serverKeys
-		t.writer.dir = clientKeys
-	} else {
-		t.reader.dir = clientKeys
-		t.writer.dir = serverKeys
-	}
-
-	return t
-}
-
-type direction struct {
-	ivTag     []byte
-	keyTag    []byte
-	macKeyTag []byte
-}
-
-var (
-	serverKeys = direction{[]byte{'B'}, []byte{'D'}, []byte{'F'}}
-	clientKeys = direction{[]byte{'A'}, []byte{'C'}, []byte{'E'}}
-)
-
-// generateKeys generates key material for IV, MAC and encryption.
-func generateKeys(d direction, algs directionAlgorithms, kex *kexResult) (iv, key, macKey []byte) {
-	cipherMode := cipherModes[algs.Cipher]
-	macMode := macModes[algs.MAC]
-
-	iv = make([]byte, cipherMode.ivSize)
-	key = make([]byte, cipherMode.keySize)
-	macKey = make([]byte, macMode.keySize)
-
-	generateKeyMaterial(iv, d.ivTag, kex)
-	generateKeyMaterial(key, d.keyTag, kex)
-	generateKeyMaterial(macKey, d.macKeyTag, kex)
-	return
-}
-
-// setupKeys sets the cipher and MAC keys from kex.K, kex.H and sessionId, as
-// described in RFC 4253, section 6.4. direction should either be serverKeys
-// (to setup server->client keys) or clientKeys (for client->server keys).
-func newPacketCipher(d direction, algs directionAlgorithms, kex *kexResult) (packetCipher, error) {
-	iv, key, macKey := generateKeys(d, algs, kex)
-
-	if algs.Cipher == gcmCipherID {
-		return newGCMCipher(iv, key, macKey)
-	}
-
-	if algs.Cipher == aes128cbcID {
-		return newAESCBCCipher(iv, key, macKey, algs)
-	}
-
-	if algs.Cipher == tripledescbcID {
-		return newTripleDESCBCCipher(iv, key, macKey, algs)
-	}
-
-	c := &streamPacketCipher{
-		mac: macModes[algs.MAC].new(macKey),
-		etm: macModes[algs.MAC].etm,
-	}
-	c.macResult = make([]byte, c.mac.Size())
-
-	var err error
-	c.cipher, err = cipherModes[algs.Cipher].createStream(key, iv)
-	if err != nil {
-		return nil, err
-	}
-
-	return c, nil
-}
-
-// generateKeyMaterial fills out with key material generated from tag, K, H
-// and sessionId, as specified in RFC 4253, section 7.2.
-func generateKeyMaterial(out, tag []byte, r *kexResult) {
-	var digestsSoFar []byte
-
-	h := r.Hash.New()
-	for len(out) > 0 {
-		h.Reset()
-		h.Write(r.K)
-		h.Write(r.H)
-
-		if len(digestsSoFar) == 0 {
-			h.Write(tag)
-			h.Write(r.SessionID)
-		} else {
-			h.Write(digestsSoFar)
-		}
-
-		digest := h.Sum(nil)
-		n := copy(out, digest)
-		out = out[n:]
-		if len(out) > 0 {
-			digestsSoFar = append(digestsSoFar, digest...)
-		}
-	}
-}
-
-const packageVersion = "SSH-2.0-Go"
-
-// Sends and receives a version line.  The versionLine string should
-// be US ASCII, start with "SSH-2.0-", and should not include a
-// newline. exchangeVersions returns the other side's version line.
-func exchangeVersions(rw io.ReadWriter, versionLine []byte) (them []byte, err error) {
-	// Contrary to the RFC, we do not ignore lines that don't
-	// start with "SSH-2.0-" to make the library usable with
-	// nonconforming servers.
-	for _, c := range versionLine {
-		// The spec disallows non US-ASCII chars, and
-		// specifically forbids null chars.
-		if c < 32 {
-			return nil, errors.New("ssh: junk character in version line")
-		}
-	}
-	if _, err = rw.Write(append(versionLine, '\r', '\n')); err != nil {
-		return
-	}
-
-	them, err = readVersion(rw)
-	return them, err
-}
-
-// maxVersionStringBytes is the maximum number of bytes that we'll
-// accept as a version string. RFC 4253 section 4.2 limits this at 255
-// chars
-const maxVersionStringBytes = 255
-
-// Read version string as specified by RFC 4253, section 4.2.
-func readVersion(r io.Reader) ([]byte, error) {
-	versionString := make([]byte, 0, 64)
-	var ok bool
-	var buf [1]byte
-
-	for len(versionString) < maxVersionStringBytes {
-		_, err := io.ReadFull(r, buf[:])
-		if err != nil {
-			return nil, err
-		}
-		// The RFC says that the version should be terminated with \r\n
-		// but several SSH servers actually only send a \n.
-		if buf[0] == '\n' {
-			ok = true
-			break
-		}
-
-		// non ASCII chars are disallowed, but we are lenient,
-		// since Go doesn't use null-terminated strings.
-
-		// The RFC allows a comment after a space, however,
-		// all of it (version and comments) goes into the
-		// session hash.
-		versionString = append(versionString, buf[0])
-	}
-
-	if !ok {
-		return nil, errors.New("ssh: overflow reading version string")
-	}
-
-	// There might be a '\r' on the end which we should remove.
-	if len(versionString) > 0 && versionString[len(versionString)-1] == '\r' {
-		versionString = versionString[:len(versionString)-1]
-	}
-	return versionString, nil
-}
diff --git a/installer/vendor/golang.org/x/crypto/ssh/transport_test.go b/installer/vendor/golang.org/x/crypto/ssh/transport_test.go
deleted file mode 100644
index 92d83abf93..0000000000
--- a/installer/vendor/golang.org/x/crypto/ssh/transport_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssh
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-	"strings"
-	"testing"
-)
-
-func TestReadVersion(t *testing.T) {
-	longversion := strings.Repeat("SSH-2.0-bla", 50)[:253]
-	cases := map[string]string{
-		"SSH-2.0-bla\r\n":    "SSH-2.0-bla",
-		"SSH-2.0-bla\n":      "SSH-2.0-bla",
-		longversion + "\r\n": longversion,
-	}
-
-	for in, want := range cases {
-		result, err := readVersion(bytes.NewBufferString(in))
-		if err != nil {
-			t.Errorf("readVersion(%q): %s", in, err)
-		}
-		got := string(result)
-		if got != want {
-			t.Errorf("got %q, want %q", got, want)
-		}
-	}
-}
-
-func TestReadVersionError(t *testing.T) {
-	longversion := strings.Repeat("SSH-2.0-bla", 50)[:253]
-	cases := []string{
-		longversion + "too-long\r\n",
-	}
-	for _, in := range cases {
-		if _, err := readVersion(bytes.NewBufferString(in)); err == nil {
-			t.Errorf("readVersion(%q) should have failed", in)
-		}
-	}
-}
-
-func TestExchangeVersionsBasic(t *testing.T) {
-	v := "SSH-2.0-bla"
-	buf := bytes.NewBufferString(v + "\r\n")
-	them, err := exchangeVersions(buf, []byte("xyz"))
-	if err != nil {
-		t.Errorf("exchangeVersions: %v", err)
-	}
-
-	if want := "SSH-2.0-bla"; string(them) != want {
-		t.Errorf("got %q want %q for our version", them, want)
-	}
-}
-
-func TestExchangeVersions(t *testing.T) {
-	cases := []string{
-		"not\x000allowed",
-		"not allowed\n",
-	}
-	for _, c := range cases {
-		buf := bytes.NewBufferString("SSH-2.0-bla\r\n")
-		if _, err := exchangeVersions(buf, []byte(c)); err == nil {
-			t.Errorf("exchangeVersions(%q): should have failed", c)
-		}
-	}
-}
-
-type closerBuffer struct {
-	bytes.Buffer
-}
-
-func (b *closerBuffer) Close() error {
-	return nil
-}
-
-func TestTransportMaxPacketWrite(t *testing.T) {
-	buf := &closerBuffer{}
-	tr := newTransport(buf, rand.Reader, true)
-	huge := make([]byte, maxPacket+1)
-	err := tr.writePacket(huge)
-	if err == nil {
-		t.Errorf("transport accepted write for a huge packet.")
-	}
-}
-
-func TestTransportMaxPacketReader(t *testing.T) {
-	var header [5]byte
-	huge := make([]byte, maxPacket+128)
-	binary.BigEndian.PutUint32(header[0:], uint32(len(huge)))
-	// padding.
-	header[4] = 0
-
-	buf := &closerBuffer{}
-	buf.Write(header[:])
-	buf.Write(huge)
-
-	tr := newTransport(buf, rand.Reader, true)
-	_, err := tr.readPacket()
-	if err == nil {
-		t.Errorf("transport succeeded reading huge packet.")
-	} else if !strings.Contains(err.Error(), "large") {
-		t.Errorf("got %q, should mention %q", err.Error(), "large")
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/tea/cipher.go b/installer/vendor/golang.org/x/crypto/tea/cipher.go
deleted file mode 100644
index 9c13d12a22..0000000000
--- a/installer/vendor/golang.org/x/crypto/tea/cipher.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package tea implements the TEA algorithm, as defined in Needham and
-// Wheeler's 1994 technical report, “TEA, a Tiny Encryption Algorithm”. See
-// http://www.cix.co.uk/~klockstone/tea.pdf for details.
-
-package tea
-
-import (
-	"crypto/cipher"
-	"encoding/binary"
-	"errors"
-)
-
-const (
-	// BlockSize is the size of a TEA block, in bytes.
-	BlockSize = 8
-
-	// KeySize is the size of a TEA key, in bytes.
-	KeySize = 16
-
-	// delta is the TEA key schedule constant.
-	delta = 0x9e3779b9
-
-	// numRounds is the standard number of rounds in TEA.
-	numRounds = 64
-)
-
-// tea is an instance of the TEA cipher with a particular key.
-type tea struct {
-	key    [16]byte
-	rounds int
-}
-
-// NewCipher returns an instance of the TEA cipher with the standard number of
-// rounds. The key argument must be 16 bytes long.
-func NewCipher(key []byte) (cipher.Block, error) {
-	return NewCipherWithRounds(key, numRounds)
-}
-
-// NewCipherWithRounds returns an instance of the TEA cipher with a given
-// number of rounds, which must be even. The key argument must be 16 bytes
-// long.
-func NewCipherWithRounds(key []byte, rounds int) (cipher.Block, error) {
-	if len(key) != 16 {
-		return nil, errors.New("tea: incorrect key size")
-	}
-
-	if rounds&1 != 0 {
-		return nil, errors.New("tea: odd number of rounds specified")
-	}
-
-	c := &tea{
-		rounds: rounds,
-	}
-	copy(c.key[:], key)
-
-	return c, nil
-}
-
-// BlockSize returns the TEA block size, which is eight bytes. It is necessary
-// to satisfy the Block interface in the package "crypto/cipher".
-func (*tea) BlockSize() int {
-	return BlockSize
-}
-
-// Encrypt encrypts the 8 byte buffer src using the key in t and stores the
-// result in dst. Note that for amounts of data larger than a block, it is not
-// safe to just call Encrypt on successive blocks; instead, use an encryption
-// mode like CBC (see crypto/cipher/cbc.go).
-func (t *tea) Encrypt(dst, src []byte) {
-	e := binary.BigEndian
-	v0, v1 := e.Uint32(src), e.Uint32(src[4:])
-	k0, k1, k2, k3 := e.Uint32(t.key[0:]), e.Uint32(t.key[4:]), e.Uint32(t.key[8:]), e.Uint32(t.key[12:])
-
-	sum := uint32(0)
-	delta := uint32(delta)
-
-	for i := 0; i < t.rounds/2; i++ {
-		sum += delta
-		v0 += ((v1 << 4) + k0) ^ (v1 + sum) ^ ((v1 >> 5) + k1)
-		v1 += ((v0 << 4) + k2) ^ (v0 + sum) ^ ((v0 >> 5) + k3)
-	}
-
-	e.PutUint32(dst, v0)
-	e.PutUint32(dst[4:], v1)
-}
-
-// Decrypt decrypts the 8 byte buffer src using the key in t and stores the
-// result in dst.
-func (t *tea) Decrypt(dst, src []byte) {
-	e := binary.BigEndian
-	v0, v1 := e.Uint32(src), e.Uint32(src[4:])
-	k0, k1, k2, k3 := e.Uint32(t.key[0:]), e.Uint32(t.key[4:]), e.Uint32(t.key[8:]), e.Uint32(t.key[12:])
-
-	delta := uint32(delta)
-	sum := delta * uint32(t.rounds/2) // in general, sum = delta * n
-
-	for i := 0; i < t.rounds/2; i++ {
-		v1 -= ((v0 << 4) + k2) ^ (v0 + sum) ^ ((v0 >> 5) + k3)
-		v0 -= ((v1 << 4) + k0) ^ (v1 + sum) ^ ((v1 >> 5) + k1)
-		sum -= delta
-	}
-
-	e.PutUint32(dst, v0)
-	e.PutUint32(dst[4:], v1)
-}
diff --git a/installer/vendor/golang.org/x/crypto/tea/tea_test.go b/installer/vendor/golang.org/x/crypto/tea/tea_test.go
deleted file mode 100644
index eb98d1e0e0..0000000000
--- a/installer/vendor/golang.org/x/crypto/tea/tea_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package tea
-
-import (
-	"bytes"
-	"testing"
-)
-
-// A sample test key for when we just want to initialize a cipher
-var testKey = []byte{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}
-
-// Test that the block size for tea is correct
-func TestBlocksize(t *testing.T) {
-	c, err := NewCipher(testKey)
-	if err != nil {
-		t.Fatalf("NewCipher returned error: %s", err)
-	}
-
-	if result := c.BlockSize(); result != BlockSize {
-		t.Errorf("cipher.BlockSize returned %d, but expected %d", result, BlockSize)
-	}
-}
-
-// Test that invalid key sizes return an error
-func TestInvalidKeySize(t *testing.T) {
-	var key [KeySize + 1]byte
-
-	if _, err := NewCipher(key[:]); err == nil {
-		t.Errorf("invalid key size %d didn't result in an error.", len(key))
-	}
-
-	if _, err := NewCipher(key[:KeySize-1]); err == nil {
-		t.Errorf("invalid key size %d didn't result in an error.", KeySize-1)
-	}
-}
-
-// Test Vectors
-type teaTest struct {
-	rounds     int
-	key        []byte
-	plaintext  []byte
-	ciphertext []byte
-}
-
-var teaTests = []teaTest{
-	// These were sourced from https://github.com/froydnj/ironclad/blob/master/testing/test-vectors/tea.testvec
-	{
-		numRounds,
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x41, 0xea, 0x3a, 0x0a, 0x94, 0xba, 0xa9, 0x40},
-	},
-	{
-		numRounds,
-		[]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-		[]byte{0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff},
-		[]byte{0x31, 0x9b, 0xbe, 0xfb, 0x01, 0x6a, 0xbd, 0xb2},
-	},
-	{
-		16,
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0xed, 0x28, 0x5d, 0xa1, 0x45, 0x5b, 0x33, 0xc1},
-	},
-}
-
-// Test encryption
-func TestCipherEncrypt(t *testing.T) {
-	// Test encryption with standard 64 rounds
-	for i, test := range teaTests {
-		c, err := NewCipherWithRounds(test.key, test.rounds)
-		if err != nil {
-			t.Fatalf("#%d: NewCipher returned error: %s", i, err)
-		}
-
-		var ciphertext [BlockSize]byte
-		c.Encrypt(ciphertext[:], test.plaintext)
-
-		if !bytes.Equal(ciphertext[:], test.ciphertext) {
-			t.Errorf("#%d: incorrect ciphertext. Got %x, wanted %x", i, ciphertext, test.ciphertext)
-		}
-
-		var plaintext2 [BlockSize]byte
-		c.Decrypt(plaintext2[:], ciphertext[:])
-
-		if !bytes.Equal(plaintext2[:], test.plaintext) {
-			t.Errorf("#%d: incorrect plaintext. Got %x, wanted %x", i, plaintext2, test.plaintext)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/twofish/twofish.go b/installer/vendor/golang.org/x/crypto/twofish/twofish.go
deleted file mode 100644
index 6db01fcf45..0000000000
--- a/installer/vendor/golang.org/x/crypto/twofish/twofish.go
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package twofish implements Bruce Schneier's Twofish encryption algorithm.
-package twofish // import "golang.org/x/crypto/twofish"
-
-// Twofish is defined in https://www.schneier.com/paper-twofish-paper.pdf [TWOFISH]
-
-// This code is a port of the LibTom C implementation.
-// See http://libtom.org/?page=features&newsitems=5&whatfile=crypt.
-// LibTomCrypt is free for all purposes under the public domain.
-// It was heavily inspired by the go blowfish package.
-
-import "strconv"
-
-// BlockSize is the constant block size of Twofish.
-const BlockSize = 16
-
-const mdsPolynomial = 0x169 // x^8 + x^6 + x^5 + x^3 + 1, see [TWOFISH] 4.2
-const rsPolynomial = 0x14d  // x^8 + x^6 + x^3 + x^2 + 1, see [TWOFISH] 4.3
-
-// A Cipher is an instance of Twofish encryption using a particular key.
-type Cipher struct {
-	s [4][256]uint32
-	k [40]uint32
-}
-
-type KeySizeError int
-
-func (k KeySizeError) Error() string {
-	return "crypto/twofish: invalid key size " + strconv.Itoa(int(k))
-}
-
-// NewCipher creates and returns a Cipher.
-// The key argument should be the Twofish key, 16, 24 or 32 bytes.
-func NewCipher(key []byte) (*Cipher, error) {
-	keylen := len(key)
-
-	if keylen != 16 && keylen != 24 && keylen != 32 {
-		return nil, KeySizeError(keylen)
-	}
-
-	// k is the number of 64 bit words in key
-	k := keylen / 8
-
-	// Create the S[..] words
-	var S [4 * 4]byte
-	for i := 0; i < k; i++ {
-		// Computes [y0 y1 y2 y3] = rs . [x0 x1 x2 x3 x4 x5 x6 x7]
-		for j, rsRow := range rs {
-			for k, rsVal := range rsRow {
-				S[4*i+j] ^= gfMult(key[8*i+k], rsVal, rsPolynomial)
-			}
-		}
-	}
-
-	// Calculate subkeys
-	c := new(Cipher)
-	var tmp [4]byte
-	for i := byte(0); i < 20; i++ {
-		// A = h(p * 2x, Me)
-		for j := range tmp {
-			tmp[j] = 2 * i
-		}
-		A := h(tmp[:], key, 0)
-
-		// B = rolc(h(p * (2x + 1), Mo), 8)
-		for j := range tmp {
-			tmp[j] = 2*i + 1
-		}
-		B := h(tmp[:], key, 1)
-		B = rol(B, 8)
-
-		c.k[2*i] = A + B
-
-		// K[2i+1] = (A + 2B) <<< 9
-		c.k[2*i+1] = rol(2*B+A, 9)
-	}
-
-	// Calculate sboxes
-	switch k {
-	case 2:
-		for i := range c.s[0] {
-			c.s[0][i] = mdsColumnMult(sbox[1][sbox[0][sbox[0][byte(i)]^S[0]]^S[4]], 0)
-			c.s[1][i] = mdsColumnMult(sbox[0][sbox[0][sbox[1][byte(i)]^S[1]]^S[5]], 1)
-			c.s[2][i] = mdsColumnMult(sbox[1][sbox[1][sbox[0][byte(i)]^S[2]]^S[6]], 2)
-			c.s[3][i] = mdsColumnMult(sbox[0][sbox[1][sbox[1][byte(i)]^S[3]]^S[7]], 3)
-		}
-	case 3:
-		for i := range c.s[0] {
-			c.s[0][i] = mdsColumnMult(sbox[1][sbox[0][sbox[0][sbox[1][byte(i)]^S[0]]^S[4]]^S[8]], 0)
-			c.s[1][i] = mdsColumnMult(sbox[0][sbox[0][sbox[1][sbox[1][byte(i)]^S[1]]^S[5]]^S[9]], 1)
-			c.s[2][i] = mdsColumnMult(sbox[1][sbox[1][sbox[0][sbox[0][byte(i)]^S[2]]^S[6]]^S[10]], 2)
-			c.s[3][i] = mdsColumnMult(sbox[0][sbox[1][sbox[1][sbox[0][byte(i)]^S[3]]^S[7]]^S[11]], 3)
-		}
-	default:
-		for i := range c.s[0] {
-			c.s[0][i] = mdsColumnMult(sbox[1][sbox[0][sbox[0][sbox[1][sbox[1][byte(i)]^S[0]]^S[4]]^S[8]]^S[12]], 0)
-			c.s[1][i] = mdsColumnMult(sbox[0][sbox[0][sbox[1][sbox[1][sbox[0][byte(i)]^S[1]]^S[5]]^S[9]]^S[13]], 1)
-			c.s[2][i] = mdsColumnMult(sbox[1][sbox[1][sbox[0][sbox[0][sbox[0][byte(i)]^S[2]]^S[6]]^S[10]]^S[14]], 2)
-			c.s[3][i] = mdsColumnMult(sbox[0][sbox[1][sbox[1][sbox[0][sbox[1][byte(i)]^S[3]]^S[7]]^S[11]]^S[15]], 3)
-		}
-	}
-
-	return c, nil
-}
-
-// BlockSize returns the Twofish block size, 16 bytes.
-func (c *Cipher) BlockSize() int { return BlockSize }
-
-// store32l stores src in dst in little-endian form.
-func store32l(dst []byte, src uint32) {
-	dst[0] = byte(src)
-	dst[1] = byte(src >> 8)
-	dst[2] = byte(src >> 16)
-	dst[3] = byte(src >> 24)
-	return
-}
-
-// load32l reads a little-endian uint32 from src.
-func load32l(src []byte) uint32 {
-	return uint32(src[0]) | uint32(src[1])<<8 | uint32(src[2])<<16 | uint32(src[3])<<24
-}
-
-// rol returns x after a left circular rotation of y bits.
-func rol(x, y uint32) uint32 {
-	return (x << (y & 31)) | (x >> (32 - (y & 31)))
-}
-
-// ror returns x after a right circular rotation of y bits.
-func ror(x, y uint32) uint32 {
-	return (x >> (y & 31)) | (x << (32 - (y & 31)))
-}
-
-// The RS matrix. See [TWOFISH] 4.3
-var rs = [4][8]byte{
-	{0x01, 0xA4, 0x55, 0x87, 0x5A, 0x58, 0xDB, 0x9E},
-	{0xA4, 0x56, 0x82, 0xF3, 0x1E, 0xC6, 0x68, 0xE5},
-	{0x02, 0xA1, 0xFC, 0xC1, 0x47, 0xAE, 0x3D, 0x19},
-	{0xA4, 0x55, 0x87, 0x5A, 0x58, 0xDB, 0x9E, 0x03},
-}
-
-// sbox tables
-var sbox = [2][256]byte{
-	{
-		0xa9, 0x67, 0xb3, 0xe8, 0x04, 0xfd, 0xa3, 0x76, 0x9a, 0x92, 0x80, 0x78, 0xe4, 0xdd, 0xd1, 0x38,
-		0x0d, 0xc6, 0x35, 0x98, 0x18, 0xf7, 0xec, 0x6c, 0x43, 0x75, 0x37, 0x26, 0xfa, 0x13, 0x94, 0x48,
-		0xf2, 0xd0, 0x8b, 0x30, 0x84, 0x54, 0xdf, 0x23, 0x19, 0x5b, 0x3d, 0x59, 0xf3, 0xae, 0xa2, 0x82,
-		0x63, 0x01, 0x83, 0x2e, 0xd9, 0x51, 0x9b, 0x7c, 0xa6, 0xeb, 0xa5, 0xbe, 0x16, 0x0c, 0xe3, 0x61,
-		0xc0, 0x8c, 0x3a, 0xf5, 0x73, 0x2c, 0x25, 0x0b, 0xbb, 0x4e, 0x89, 0x6b, 0x53, 0x6a, 0xb4, 0xf1,
-		0xe1, 0xe6, 0xbd, 0x45, 0xe2, 0xf4, 0xb6, 0x66, 0xcc, 0x95, 0x03, 0x56, 0xd4, 0x1c, 0x1e, 0xd7,
-		0xfb, 0xc3, 0x8e, 0xb5, 0xe9, 0xcf, 0xbf, 0xba, 0xea, 0x77, 0x39, 0xaf, 0x33, 0xc9, 0x62, 0x71,
-		0x81, 0x79, 0x09, 0xad, 0x24, 0xcd, 0xf9, 0xd8, 0xe5, 0xc5, 0xb9, 0x4d, 0x44, 0x08, 0x86, 0xe7,
-		0xa1, 0x1d, 0xaa, 0xed, 0x06, 0x70, 0xb2, 0xd2, 0x41, 0x7b, 0xa0, 0x11, 0x31, 0xc2, 0x27, 0x90,
-		0x20, 0xf6, 0x60, 0xff, 0x96, 0x5c, 0xb1, 0xab, 0x9e, 0x9c, 0x52, 0x1b, 0x5f, 0x93, 0x0a, 0xef,
-		0x91, 0x85, 0x49, 0xee, 0x2d, 0x4f, 0x8f, 0x3b, 0x47, 0x87, 0x6d, 0x46, 0xd6, 0x3e, 0x69, 0x64,
-		0x2a, 0xce, 0xcb, 0x2f, 0xfc, 0x97, 0x05, 0x7a, 0xac, 0x7f, 0xd5, 0x1a, 0x4b, 0x0e, 0xa7, 0x5a,
-		0x28, 0x14, 0x3f, 0x29, 0x88, 0x3c, 0x4c, 0x02, 0xb8, 0xda, 0xb0, 0x17, 0x55, 0x1f, 0x8a, 0x7d,
-		0x57, 0xc7, 0x8d, 0x74, 0xb7, 0xc4, 0x9f, 0x72, 0x7e, 0x15, 0x22, 0x12, 0x58, 0x07, 0x99, 0x34,
-		0x6e, 0x50, 0xde, 0x68, 0x65, 0xbc, 0xdb, 0xf8, 0xc8, 0xa8, 0x2b, 0x40, 0xdc, 0xfe, 0x32, 0xa4,
-		0xca, 0x10, 0x21, 0xf0, 0xd3, 0x5d, 0x0f, 0x00, 0x6f, 0x9d, 0x36, 0x42, 0x4a, 0x5e, 0xc1, 0xe0,
-	},
-	{
-		0x75, 0xf3, 0xc6, 0xf4, 0xdb, 0x7b, 0xfb, 0xc8, 0x4a, 0xd3, 0xe6, 0x6b, 0x45, 0x7d, 0xe8, 0x4b,
-		0xd6, 0x32, 0xd8, 0xfd, 0x37, 0x71, 0xf1, 0xe1, 0x30, 0x0f, 0xf8, 0x1b, 0x87, 0xfa, 0x06, 0x3f,
-		0x5e, 0xba, 0xae, 0x5b, 0x8a, 0x00, 0xbc, 0x9d, 0x6d, 0xc1, 0xb1, 0x0e, 0x80, 0x5d, 0xd2, 0xd5,
-		0xa0, 0x84, 0x07, 0x14, 0xb5, 0x90, 0x2c, 0xa3, 0xb2, 0x73, 0x4c, 0x54, 0x92, 0x74, 0x36, 0x51,
-		0x38, 0xb0, 0xbd, 0x5a, 0xfc, 0x60, 0x62, 0x96, 0x6c, 0x42, 0xf7, 0x10, 0x7c, 0x28, 0x27, 0x8c,
-		0x13, 0x95, 0x9c, 0xc7, 0x24, 0x46, 0x3b, 0x70, 0xca, 0xe3, 0x85, 0xcb, 0x11, 0xd0, 0x93, 0xb8,
-		0xa6, 0x83, 0x20, 0xff, 0x9f, 0x77, 0xc3, 0xcc, 0x03, 0x6f, 0x08, 0xbf, 0x40, 0xe7, 0x2b, 0xe2,
-		0x79, 0x0c, 0xaa, 0x82, 0x41, 0x3a, 0xea, 0xb9, 0xe4, 0x9a, 0xa4, 0x97, 0x7e, 0xda, 0x7a, 0x17,
-		0x66, 0x94, 0xa1, 0x1d, 0x3d, 0xf0, 0xde, 0xb3, 0x0b, 0x72, 0xa7, 0x1c, 0xef, 0xd1, 0x53, 0x3e,
-		0x8f, 0x33, 0x26, 0x5f, 0xec, 0x76, 0x2a, 0x49, 0x81, 0x88, 0xee, 0x21, 0xc4, 0x1a, 0xeb, 0xd9,
-		0xc5, 0x39, 0x99, 0xcd, 0xad, 0x31, 0x8b, 0x01, 0x18, 0x23, 0xdd, 0x1f, 0x4e, 0x2d, 0xf9, 0x48,
-		0x4f, 0xf2, 0x65, 0x8e, 0x78, 0x5c, 0x58, 0x19, 0x8d, 0xe5, 0x98, 0x57, 0x67, 0x7f, 0x05, 0x64,
-		0xaf, 0x63, 0xb6, 0xfe, 0xf5, 0xb7, 0x3c, 0xa5, 0xce, 0xe9, 0x68, 0x44, 0xe0, 0x4d, 0x43, 0x69,
-		0x29, 0x2e, 0xac, 0x15, 0x59, 0xa8, 0x0a, 0x9e, 0x6e, 0x47, 0xdf, 0x34, 0x35, 0x6a, 0xcf, 0xdc,
-		0x22, 0xc9, 0xc0, 0x9b, 0x89, 0xd4, 0xed, 0xab, 0x12, 0xa2, 0x0d, 0x52, 0xbb, 0x02, 0x2f, 0xa9,
-		0xd7, 0x61, 0x1e, 0xb4, 0x50, 0x04, 0xf6, 0xc2, 0x16, 0x25, 0x86, 0x56, 0x55, 0x09, 0xbe, 0x91,
-	},
-}
-
-// gfMult returns a·b in GF(2^8)/p
-func gfMult(a, b byte, p uint32) byte {
-	B := [2]uint32{0, uint32(b)}
-	P := [2]uint32{0, p}
-	var result uint32
-
-	// branchless GF multiplier
-	for i := 0; i < 7; i++ {
-		result ^= B[a&1]
-		a >>= 1
-		B[1] = P[B[1]>>7] ^ (B[1] << 1)
-	}
-	result ^= B[a&1]
-	return byte(result)
-}
-
-// mdsColumnMult calculates y{col} where [y0 y1 y2 y3] = MDS · [x0]
-func mdsColumnMult(in byte, col int) uint32 {
-	mul01 := in
-	mul5B := gfMult(in, 0x5B, mdsPolynomial)
-	mulEF := gfMult(in, 0xEF, mdsPolynomial)
-
-	switch col {
-	case 0:
-		return uint32(mul01) | uint32(mul5B)<<8 | uint32(mulEF)<<16 | uint32(mulEF)<<24
-	case 1:
-		return uint32(mulEF) | uint32(mulEF)<<8 | uint32(mul5B)<<16 | uint32(mul01)<<24
-	case 2:
-		return uint32(mul5B) | uint32(mulEF)<<8 | uint32(mul01)<<16 | uint32(mulEF)<<24
-	case 3:
-		return uint32(mul5B) | uint32(mul01)<<8 | uint32(mulEF)<<16 | uint32(mul5B)<<24
-	}
-
-	panic("unreachable")
-}
-
-// h implements the S-box generation function. See [TWOFISH] 4.3.5
-func h(in, key []byte, offset int) uint32 {
-	var y [4]byte
-	for x := range y {
-		y[x] = in[x]
-	}
-	switch len(key) / 8 {
-	case 4:
-		y[0] = sbox[1][y[0]] ^ key[4*(6+offset)+0]
-		y[1] = sbox[0][y[1]] ^ key[4*(6+offset)+1]
-		y[2] = sbox[0][y[2]] ^ key[4*(6+offset)+2]
-		y[3] = sbox[1][y[3]] ^ key[4*(6+offset)+3]
-		fallthrough
-	case 3:
-		y[0] = sbox[1][y[0]] ^ key[4*(4+offset)+0]
-		y[1] = sbox[1][y[1]] ^ key[4*(4+offset)+1]
-		y[2] = sbox[0][y[2]] ^ key[4*(4+offset)+2]
-		y[3] = sbox[0][y[3]] ^ key[4*(4+offset)+3]
-		fallthrough
-	case 2:
-		y[0] = sbox[1][sbox[0][sbox[0][y[0]]^key[4*(2+offset)+0]]^key[4*(0+offset)+0]]
-		y[1] = sbox[0][sbox[0][sbox[1][y[1]]^key[4*(2+offset)+1]]^key[4*(0+offset)+1]]
-		y[2] = sbox[1][sbox[1][sbox[0][y[2]]^key[4*(2+offset)+2]]^key[4*(0+offset)+2]]
-		y[3] = sbox[0][sbox[1][sbox[1][y[3]]^key[4*(2+offset)+3]]^key[4*(0+offset)+3]]
-	}
-	// [y0 y1 y2 y3] = MDS . [x0 x1 x2 x3]
-	var mdsMult uint32
-	for i := range y {
-		mdsMult ^= mdsColumnMult(y[i], i)
-	}
-	return mdsMult
-}
-
-// Encrypt encrypts a 16-byte block from src to dst, which may overlap.
-// Note that for amounts of data larger than a block,
-// it is not safe to just call Encrypt on successive blocks;
-// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
-func (c *Cipher) Encrypt(dst, src []byte) {
-	S1 := c.s[0]
-	S2 := c.s[1]
-	S3 := c.s[2]
-	S4 := c.s[3]
-
-	// Load input
-	ia := load32l(src[0:4])
-	ib := load32l(src[4:8])
-	ic := load32l(src[8:12])
-	id := load32l(src[12:16])
-
-	// Pre-whitening
-	ia ^= c.k[0]
-	ib ^= c.k[1]
-	ic ^= c.k[2]
-	id ^= c.k[3]
-
-	for i := 0; i < 8; i++ {
-		k := c.k[8+i*4 : 12+i*4]
-		t2 := S2[byte(ib)] ^ S3[byte(ib>>8)] ^ S4[byte(ib>>16)] ^ S1[byte(ib>>24)]
-		t1 := S1[byte(ia)] ^ S2[byte(ia>>8)] ^ S3[byte(ia>>16)] ^ S4[byte(ia>>24)] + t2
-		ic = ror(ic^(t1+k[0]), 1)
-		id = rol(id, 1) ^ (t2 + t1 + k[1])
-
-		t2 = S2[byte(id)] ^ S3[byte(id>>8)] ^ S4[byte(id>>16)] ^ S1[byte(id>>24)]
-		t1 = S1[byte(ic)] ^ S2[byte(ic>>8)] ^ S3[byte(ic>>16)] ^ S4[byte(ic>>24)] + t2
-		ia = ror(ia^(t1+k[2]), 1)
-		ib = rol(ib, 1) ^ (t2 + t1 + k[3])
-	}
-
-	// Output with "undo last swap"
-	ta := ic ^ c.k[4]
-	tb := id ^ c.k[5]
-	tc := ia ^ c.k[6]
-	td := ib ^ c.k[7]
-
-	store32l(dst[0:4], ta)
-	store32l(dst[4:8], tb)
-	store32l(dst[8:12], tc)
-	store32l(dst[12:16], td)
-}
-
-// Decrypt decrypts a 16-byte block from src to dst, which may overlap.
-func (c *Cipher) Decrypt(dst, src []byte) {
-	S1 := c.s[0]
-	S2 := c.s[1]
-	S3 := c.s[2]
-	S4 := c.s[3]
-
-	// Load input
-	ta := load32l(src[0:4])
-	tb := load32l(src[4:8])
-	tc := load32l(src[8:12])
-	td := load32l(src[12:16])
-
-	// Undo undo final swap
-	ia := tc ^ c.k[6]
-	ib := td ^ c.k[7]
-	ic := ta ^ c.k[4]
-	id := tb ^ c.k[5]
-
-	for i := 8; i > 0; i-- {
-		k := c.k[4+i*4 : 8+i*4]
-		t2 := S2[byte(id)] ^ S3[byte(id>>8)] ^ S4[byte(id>>16)] ^ S1[byte(id>>24)]
-		t1 := S1[byte(ic)] ^ S2[byte(ic>>8)] ^ S3[byte(ic>>16)] ^ S4[byte(ic>>24)] + t2
-		ia = rol(ia, 1) ^ (t1 + k[2])
-		ib = ror(ib^(t2+t1+k[3]), 1)
-
-		t2 = S2[byte(ib)] ^ S3[byte(ib>>8)] ^ S4[byte(ib>>16)] ^ S1[byte(ib>>24)]
-		t1 = S1[byte(ia)] ^ S2[byte(ia>>8)] ^ S3[byte(ia>>16)] ^ S4[byte(ia>>24)] + t2
-		ic = rol(ic, 1) ^ (t1 + k[0])
-		id = ror(id^(t2+t1+k[1]), 1)
-	}
-
-	// Undo pre-whitening
-	ia ^= c.k[0]
-	ib ^= c.k[1]
-	ic ^= c.k[2]
-	id ^= c.k[3]
-
-	store32l(dst[0:4], ia)
-	store32l(dst[4:8], ib)
-	store32l(dst[8:12], ic)
-	store32l(dst[12:16], id)
-}
diff --git a/installer/vendor/golang.org/x/crypto/twofish/twofish_test.go b/installer/vendor/golang.org/x/crypto/twofish/twofish_test.go
deleted file mode 100644
index ed6a1a8fdb..0000000000
--- a/installer/vendor/golang.org/x/crypto/twofish/twofish_test.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package twofish
-
-import (
-	"bytes"
-	"testing"
-)
-
-var qbox = [2][4][16]byte{
-	{
-		{0x8, 0x1, 0x7, 0xD, 0x6, 0xF, 0x3, 0x2, 0x0, 0xB, 0x5, 0x9, 0xE, 0xC, 0xA, 0x4},
-		{0xE, 0xC, 0xB, 0x8, 0x1, 0x2, 0x3, 0x5, 0xF, 0x4, 0xA, 0x6, 0x7, 0x0, 0x9, 0xD},
-		{0xB, 0xA, 0x5, 0xE, 0x6, 0xD, 0x9, 0x0, 0xC, 0x8, 0xF, 0x3, 0x2, 0x4, 0x7, 0x1},
-		{0xD, 0x7, 0xF, 0x4, 0x1, 0x2, 0x6, 0xE, 0x9, 0xB, 0x3, 0x0, 0x8, 0x5, 0xC, 0xA},
-	},
-	{
-		{0x2, 0x8, 0xB, 0xD, 0xF, 0x7, 0x6, 0xE, 0x3, 0x1, 0x9, 0x4, 0x0, 0xA, 0xC, 0x5},
-		{0x1, 0xE, 0x2, 0xB, 0x4, 0xC, 0x3, 0x7, 0x6, 0xD, 0xA, 0x5, 0xF, 0x9, 0x0, 0x8},
-		{0x4, 0xC, 0x7, 0x5, 0x1, 0x6, 0x9, 0xA, 0x0, 0xE, 0xD, 0x8, 0x2, 0xB, 0x3, 0xF},
-		{0xB, 0x9, 0x5, 0x1, 0xC, 0x3, 0xD, 0xE, 0x6, 0x4, 0x7, 0xF, 0x2, 0x0, 0x8, 0xA},
-	},
-}
-
-// genSbox generates the variable sbox
-func genSbox(qi int, x byte) byte {
-	a0, b0 := x/16, x%16
-	for i := 0; i < 2; i++ {
-		a1 := a0 ^ b0
-		b1 := (a0 ^ ((b0 << 3) | (b0 >> 1)) ^ (a0 << 3)) & 15
-		a0 = qbox[qi][2*i][a1]
-		b0 = qbox[qi][2*i+1][b1]
-	}
-	return (b0 << 4) + a0
-}
-
-func TestSbox(t *testing.T) {
-	for n := range sbox {
-		for m := range sbox[n] {
-			if genSbox(n, byte(m)) != sbox[n][m] {
-				t.Errorf("#%d|%d: sbox value = %d want %d", n, m, sbox[n][m], genSbox(n, byte(m)))
-			}
-		}
-	}
-}
-
-var testVectors = []struct {
-	key []byte
-	dec []byte
-	enc []byte
-}{
-	// These tests are extracted from LibTom
-	{
-		[]byte{0x9F, 0x58, 0x9F, 0x5C, 0xF6, 0x12, 0x2C, 0x32, 0xB6, 0xBF, 0xEC, 0x2F, 0x2A, 0xE8, 0xC3, 0x5A},
-		[]byte{0xD4, 0x91, 0xDB, 0x16, 0xE7, 0xB1, 0xC3, 0x9E, 0x86, 0xCB, 0x08, 0x6B, 0x78, 0x9F, 0x54, 0x19},
-		[]byte{0x01, 0x9F, 0x98, 0x09, 0xDE, 0x17, 0x11, 0x85, 0x8F, 0xAA, 0xC3, 0xA3, 0xBA, 0x20, 0xFB, 0xC3},
-	},
-	{
-		[]byte{0x88, 0xB2, 0xB2, 0x70, 0x6B, 0x10, 0x5E, 0x36, 0xB4, 0x46, 0xBB, 0x6D, 0x73, 0x1A, 0x1E, 0x88,
-			0xEF, 0xA7, 0x1F, 0x78, 0x89, 0x65, 0xBD, 0x44},
-		[]byte{0x39, 0xDA, 0x69, 0xD6, 0xBA, 0x49, 0x97, 0xD5, 0x85, 0xB6, 0xDC, 0x07, 0x3C, 0xA3, 0x41, 0xB2},
-		[]byte{0x18, 0x2B, 0x02, 0xD8, 0x14, 0x97, 0xEA, 0x45, 0xF9, 0xDA, 0xAC, 0xDC, 0x29, 0x19, 0x3A, 0x65},
-	},
-	{
-		[]byte{0xD4, 0x3B, 0xB7, 0x55, 0x6E, 0xA3, 0x2E, 0x46, 0xF2, 0xA2, 0x82, 0xB7, 0xD4, 0x5B, 0x4E, 0x0D,
-			0x57, 0xFF, 0x73, 0x9D, 0x4D, 0xC9, 0x2C, 0x1B, 0xD7, 0xFC, 0x01, 0x70, 0x0C, 0xC8, 0x21, 0x6F},
-		[]byte{0x90, 0xAF, 0xE9, 0x1B, 0xB2, 0x88, 0x54, 0x4F, 0x2C, 0x32, 0xDC, 0x23, 0x9B, 0x26, 0x35, 0xE6},
-		[]byte{0x6C, 0xB4, 0x56, 0x1C, 0x40, 0xBF, 0x0A, 0x97, 0x05, 0x93, 0x1C, 0xB6, 0xD4, 0x08, 0xE7, 0xFA},
-	},
-	// These tests are derived from https://www.schneier.com/code/ecb_ival.txt
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x9F, 0x58, 0x9F, 0x5C, 0xF6, 0x12, 0x2C, 0x32, 0xB6, 0xBF, 0xEC, 0x2F, 0x2A, 0xE8, 0xC3, 0x5A},
-	},
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
-			0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77,
-		},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0xCF, 0xD1, 0xD2, 0xE5, 0xA9, 0xBE, 0x9C, 0xDF, 0x50, 0x1F, 0x13, 0xB8, 0x92, 0xBD, 0x22, 0x48},
-	},
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF, 0xFE, 0xDC, 0xBA, 0x98, 0x76, 0x54, 0x32, 0x10,
-			0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
-		},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x37, 0x52, 0x7B, 0xE0, 0x05, 0x23, 0x34, 0xB8, 0x9F, 0x0C, 0xFC, 0xCA, 0xE8, 0x7C, 0xFA, 0x20},
-	},
-}
-
-func TestCipher(t *testing.T) {
-	for n, tt := range testVectors {
-		// Test if the plaintext (dec) is encrypts to the given
-		// ciphertext (enc) using the given key. Test also if enc can
-		// be decrypted again into dec.
-		c, err := NewCipher(tt.key)
-		if err != nil {
-			t.Errorf("#%d: NewCipher: %v", n, err)
-			return
-		}
-
-		buf := make([]byte, 16)
-		c.Encrypt(buf, tt.dec)
-		if !bytes.Equal(buf, tt.enc) {
-			t.Errorf("#%d: encrypt = %x want %x", n, buf, tt.enc)
-		}
-		c.Decrypt(buf, tt.enc)
-		if !bytes.Equal(buf, tt.dec) {
-			t.Errorf("#%d: decrypt = %x want %x", n, buf, tt.dec)
-		}
-
-		// Test that 16 zero bytes, encrypted 1000 times then decrypted
-		// 1000 times results in zero bytes again.
-		zero := make([]byte, 16)
-		buf = make([]byte, 16)
-		for i := 0; i < 1000; i++ {
-			c.Encrypt(buf, buf)
-		}
-		for i := 0; i < 1000; i++ {
-			c.Decrypt(buf, buf)
-		}
-		if !bytes.Equal(buf, zero) {
-			t.Errorf("#%d: encrypt/decrypt 1000: have %x want %x", n, buf, zero)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/xtea/block.go b/installer/vendor/golang.org/x/crypto/xtea/block.go
deleted file mode 100644
index bf5d245992..0000000000
--- a/installer/vendor/golang.org/x/crypto/xtea/block.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-	Implementation adapted from Needham and Wheeler's paper:
-	http://www.cix.co.uk/~klockstone/xtea.pdf
-
-	A precalculated look up table is used during encryption/decryption for values that are based purely on the key.
-*/
-
-package xtea
-
-// XTEA is based on 64 rounds.
-const numRounds = 64
-
-// blockToUint32 reads an 8 byte slice into two uint32s.
-// The block is treated as big endian.
-func blockToUint32(src []byte) (uint32, uint32) {
-	r0 := uint32(src[0])<<24 | uint32(src[1])<<16 | uint32(src[2])<<8 | uint32(src[3])
-	r1 := uint32(src[4])<<24 | uint32(src[5])<<16 | uint32(src[6])<<8 | uint32(src[7])
-	return r0, r1
-}
-
-// uint32ToBlock writes two uint32s into an 8 byte data block.
-// Values are written as big endian.
-func uint32ToBlock(v0, v1 uint32, dst []byte) {
-	dst[0] = byte(v0 >> 24)
-	dst[1] = byte(v0 >> 16)
-	dst[2] = byte(v0 >> 8)
-	dst[3] = byte(v0)
-	dst[4] = byte(v1 >> 24)
-	dst[5] = byte(v1 >> 16)
-	dst[6] = byte(v1 >> 8)
-	dst[7] = byte(v1 >> 0)
-}
-
-// encryptBlock encrypts a single 8 byte block using XTEA.
-func encryptBlock(c *Cipher, dst, src []byte) {
-	v0, v1 := blockToUint32(src)
-
-	// Two rounds of XTEA applied per loop
-	for i := 0; i < numRounds; {
-		v0 += ((v1<<4 ^ v1>>5) + v1) ^ c.table[i]
-		i++
-		v1 += ((v0<<4 ^ v0>>5) + v0) ^ c.table[i]
-		i++
-	}
-
-	uint32ToBlock(v0, v1, dst)
-}
-
-// decryptBlock decrypt a single 8 byte block using XTEA.
-func decryptBlock(c *Cipher, dst, src []byte) {
-	v0, v1 := blockToUint32(src)
-
-	// Two rounds of XTEA applied per loop
-	for i := numRounds; i > 0; {
-		i--
-		v1 -= ((v0<<4 ^ v0>>5) + v0) ^ c.table[i]
-		i--
-		v0 -= ((v1<<4 ^ v1>>5) + v1) ^ c.table[i]
-	}
-
-	uint32ToBlock(v0, v1, dst)
-}
diff --git a/installer/vendor/golang.org/x/crypto/xtea/cipher.go b/installer/vendor/golang.org/x/crypto/xtea/cipher.go
deleted file mode 100644
index 108b426355..0000000000
--- a/installer/vendor/golang.org/x/crypto/xtea/cipher.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package xtea implements XTEA encryption, as defined in Needham and Wheeler's
-// 1997 technical report, "Tea extensions."
-package xtea // import "golang.org/x/crypto/xtea"
-
-// For details, see http://www.cix.co.uk/~klockstone/xtea.pdf
-
-import "strconv"
-
-// The XTEA block size in bytes.
-const BlockSize = 8
-
-// A Cipher is an instance of an XTEA cipher using a particular key.
-// table contains a series of precalculated values that are used each round.
-type Cipher struct {
-	table [64]uint32
-}
-
-type KeySizeError int
-
-func (k KeySizeError) Error() string {
-	return "crypto/xtea: invalid key size " + strconv.Itoa(int(k))
-}
-
-// NewCipher creates and returns a new Cipher.
-// The key argument should be the XTEA key.
-// XTEA only supports 128 bit (16 byte) keys.
-func NewCipher(key []byte) (*Cipher, error) {
-	k := len(key)
-	switch k {
-	default:
-		return nil, KeySizeError(k)
-	case 16:
-		break
-	}
-
-	c := new(Cipher)
-	initCipher(c, key)
-
-	return c, nil
-}
-
-// BlockSize returns the XTEA block size, 8 bytes.
-// It is necessary to satisfy the Block interface in the
-// package "crypto/cipher".
-func (c *Cipher) BlockSize() int { return BlockSize }
-
-// Encrypt encrypts the 8 byte buffer src using the key and stores the result in dst.
-// Note that for amounts of data larger than a block,
-// it is not safe to just call Encrypt on successive blocks;
-// instead, use an encryption mode like CBC (see crypto/cipher/cbc.go).
-func (c *Cipher) Encrypt(dst, src []byte) { encryptBlock(c, dst, src) }
-
-// Decrypt decrypts the 8 byte buffer src using the key k and stores the result in dst.
-func (c *Cipher) Decrypt(dst, src []byte) { decryptBlock(c, dst, src) }
-
-// initCipher initializes the cipher context by creating a look up table
-// of precalculated values that are based on the key.
-func initCipher(c *Cipher, key []byte) {
-	// Load the key into four uint32s
-	var k [4]uint32
-	for i := 0; i < len(k); i++ {
-		j := i << 2 // Multiply by 4
-		k[i] = uint32(key[j+0])<<24 | uint32(key[j+1])<<16 | uint32(key[j+2])<<8 | uint32(key[j+3])
-	}
-
-	// Precalculate the table
-	const delta = 0x9E3779B9
-	var sum uint32 = 0
-
-	// Two rounds of XTEA applied per loop
-	for i := 0; i < numRounds; {
-		c.table[i] = sum + k[sum&3]
-		i++
-		sum += delta
-		c.table[i] = sum + k[(sum>>11)&3]
-		i++
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/xtea/xtea_test.go b/installer/vendor/golang.org/x/crypto/xtea/xtea_test.go
deleted file mode 100644
index be711bf5af..0000000000
--- a/installer/vendor/golang.org/x/crypto/xtea/xtea_test.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xtea
-
-import (
-	"testing"
-)
-
-// A sample test key for when we just want to initialize a cipher
-var testKey = []byte{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF}
-
-// Test that the block size for XTEA is correct
-func TestBlocksize(t *testing.T) {
-	if BlockSize != 8 {
-		t.Errorf("BlockSize constant - expected 8, got %d", BlockSize)
-		return
-	}
-
-	c, err := NewCipher(testKey)
-	if err != nil {
-		t.Errorf("NewCipher(%d bytes) = %s", len(testKey), err)
-		return
-	}
-
-	result := c.BlockSize()
-	if result != 8 {
-		t.Errorf("BlockSize function - expected 8, got %d", result)
-		return
-	}
-}
-
-// A series of test values to confirm that the Cipher.table array was initialized correctly
-var testTable = []uint32{
-	0x00112233, 0x6B1568B8, 0xE28CE030, 0xC5089E2D, 0xC5089E2D, 0x1EFBD3A2, 0xA7845C2A, 0x78EF0917,
-	0x78EF0917, 0x172682D0, 0x5B6AC714, 0x822AC955, 0x3DE68511, 0xDC1DFECA, 0x2062430E, 0x3611343F,
-	0xF1CCEFFB, 0x900469B4, 0xD448ADF8, 0x2E3BE36D, 0xB6C46BF5, 0x994029F2, 0x994029F2, 0xF3335F67,
-	0x6AAAD6DF, 0x4D2694DC, 0x4D2694DC, 0xEB5E0E95, 0x2FA252D9, 0x4551440A, 0x121E10D6, 0xB0558A8F,
-	0xE388BDC3, 0x0A48C004, 0xC6047BC0, 0x643BF579, 0xA88039BD, 0x02736F32, 0x8AFBF7BA, 0x5C66A4A7,
-	0x5C66A4A7, 0xC76AEB2C, 0x3EE262A4, 0x215E20A1, 0x215E20A1, 0x7B515616, 0x03D9DE9E, 0x1988CFCF,
-	0xD5448B8B, 0x737C0544, 0xB7C04988, 0xDE804BC9, 0x9A3C0785, 0x3873813E, 0x7CB7C582, 0xD6AAFAF7,
-	0x4E22726F, 0x309E306C, 0x309E306C, 0x8A9165E1, 0x1319EE69, 0xF595AC66, 0xF595AC66, 0x4F88E1DB,
-}
-
-// Test that the cipher context is initialized correctly
-func TestCipherInit(t *testing.T) {
-	c, err := NewCipher(testKey)
-	if err != nil {
-		t.Errorf("NewCipher(%d bytes) = %s", len(testKey), err)
-		return
-	}
-
-	for i := 0; i < len(c.table); i++ {
-		if c.table[i] != testTable[i] {
-			t.Errorf("NewCipher() failed to initialize Cipher.table[%d] correctly. Expected %08X, got %08X", i, testTable[i], c.table[i])
-			break
-		}
-	}
-}
-
-// Test that invalid key sizes return an error
-func TestInvalidKeySize(t *testing.T) {
-	// Test a long key
-	key := []byte{
-		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
-		0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xAA, 0xBB, 0xCC, 0xDD, 0xEE, 0xFF,
-	}
-
-	_, err := NewCipher(key)
-	if err == nil {
-		t.Errorf("Invalid key size %d didn't result in an error.", len(key))
-	}
-
-	// Test a short key
-	key = []byte{0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77}
-
-	_, err = NewCipher(key)
-	if err == nil {
-		t.Errorf("Invalid key size %d didn't result in an error.", len(key))
-	}
-}
-
-// Test that we can correctly decode some bytes we have encoded
-func TestEncodeDecode(t *testing.T) {
-	original := []byte{0x01, 0x23, 0x45, 0x67, 0x89, 0xAB, 0xCD, 0xEF}
-	input := original
-	output := make([]byte, BlockSize)
-
-	c, err := NewCipher(testKey)
-	if err != nil {
-		t.Errorf("NewCipher(%d bytes) = %s", len(testKey), err)
-		return
-	}
-
-	// Encrypt the input block
-	c.Encrypt(output, input)
-
-	// Check that the output does not match the input
-	differs := false
-	for i := 0; i < len(input); i++ {
-		if output[i] != input[i] {
-			differs = true
-			break
-		}
-	}
-	if differs == false {
-		t.Error("Cipher.Encrypt: Failed to encrypt the input block.")
-		return
-	}
-
-	// Decrypt the block we just encrypted
-	input = output
-	output = make([]byte, BlockSize)
-	c.Decrypt(output, input)
-
-	// Check that the output from decrypt matches our initial input
-	for i := 0; i < len(input); i++ {
-		if output[i] != original[i] {
-			t.Errorf("Decrypted byte %d differed. Expected %02X, got %02X\n", i, original[i], output[i])
-			return
-		}
-	}
-}
-
-// Test Vectors
-type CryptTest struct {
-	key        []byte
-	plainText  []byte
-	cipherText []byte
-}
-
-var CryptTests = []CryptTest{
-	// These were sourced from http://www.freemedialibrary.com/index.php/XTEA_test_vectors
-	{
-		[]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
-		[]byte{0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48},
-		[]byte{0x49, 0x7d, 0xf3, 0xd0, 0x72, 0x61, 0x2c, 0xb5},
-	},
-	{
-		[]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
-		[]byte{0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41},
-		[]byte{0xe7, 0x8f, 0x2d, 0x13, 0x74, 0x43, 0x41, 0xd8},
-	},
-	{
-		[]byte{0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f},
-		[]byte{0x5a, 0x5b, 0x6e, 0x27, 0x89, 0x48, 0xd7, 0x7f},
-		[]byte{0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41},
-	},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x41, 0x42, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48},
-		[]byte{0xa0, 0x39, 0x05, 0x89, 0xf8, 0xb8, 0xef, 0xa5},
-	},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41},
-		[]byte{0xed, 0x23, 0x37, 0x5a, 0x82, 0x1a, 0x8c, 0x2d},
-	},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x70, 0xe1, 0x22, 0x5d, 0x6e, 0x4e, 0x76, 0x55},
-		[]byte{0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41, 0x41},
-	},
-
-	// These vectors are from http://wiki.secondlife.com/wiki/XTEA_Strong_Encryption_Implementation#Bouncy_Castle_C.23_API
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0xDE, 0xE9, 0xD4, 0xD8, 0xF7, 0x13, 0x1E, 0xD9},
-	},
-	{
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-		[]byte{0x06, 0x5C, 0x1B, 0x89, 0x75, 0xC6, 0xA8, 0x16},
-	},
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78, 0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A},
-		[]byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00},
-		[]byte{0x1F, 0xF9, 0xA0, 0x26, 0x1A, 0xC6, 0x42, 0x64},
-	},
-	{
-		[]byte{0x01, 0x23, 0x45, 0x67, 0x12, 0x34, 0x56, 0x78, 0x23, 0x45, 0x67, 0x89, 0x34, 0x56, 0x78, 0x9A},
-		[]byte{0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08},
-		[]byte{0x8C, 0x67, 0x15, 0x5B, 0x2E, 0xF9, 0x1E, 0xAD},
-	},
-}
-
-// Test encryption
-func TestCipherEncrypt(t *testing.T) {
-	for i, tt := range CryptTests {
-		c, err := NewCipher(tt.key)
-		if err != nil {
-			t.Errorf("NewCipher(%d bytes), vector %d = %s", len(tt.key), i, err)
-			continue
-		}
-
-		out := make([]byte, len(tt.plainText))
-		c.Encrypt(out, tt.plainText)
-
-		for j := 0; j < len(out); j++ {
-			if out[j] != tt.cipherText[j] {
-				t.Errorf("Cipher.Encrypt %d: out[%d] = %02X, expected %02X", i, j, out[j], tt.cipherText[j])
-				break
-			}
-		}
-	}
-}
-
-// Test decryption
-func TestCipherDecrypt(t *testing.T) {
-	for i, tt := range CryptTests {
-		c, err := NewCipher(tt.key)
-		if err != nil {
-			t.Errorf("NewCipher(%d bytes), vector %d = %s", len(tt.key), i, err)
-			continue
-		}
-
-		out := make([]byte, len(tt.cipherText))
-		c.Decrypt(out, tt.cipherText)
-
-		for j := 0; j < len(out); j++ {
-			if out[j] != tt.plainText[j] {
-				t.Errorf("Cipher.Decrypt %d: out[%d] = %02X, expected %02X", i, j, out[j], tt.plainText[j])
-				break
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/xts/xts.go b/installer/vendor/golang.org/x/crypto/xts/xts.go
deleted file mode 100644
index 92cbce99b9..0000000000
--- a/installer/vendor/golang.org/x/crypto/xts/xts.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package xts implements the XTS cipher mode as specified in IEEE P1619/D16.
-//
-// XTS mode is typically used for disk encryption, which presents a number of
-// novel problems that make more common modes inapplicable. The disk is
-// conceptually an array of sectors and we must be able to encrypt and decrypt
-// a sector in isolation. However, an attacker must not be able to transpose
-// two sectors of plaintext by transposing their ciphertext.
-//
-// XTS wraps a block cipher with Rogaway's XEX mode in order to build a
-// tweakable block cipher. This allows each sector to have a unique tweak and
-// effectively create a unique key for each sector.
-//
-// XTS does not provide any authentication. An attacker can manipulate the
-// ciphertext and randomise a block (16 bytes) of the plaintext.
-//
-// (Note: this package does not implement ciphertext-stealing so sectors must
-// be a multiple of 16 bytes.)
-package xts // import "golang.org/x/crypto/xts"
-
-import (
-	"crypto/cipher"
-	"encoding/binary"
-	"errors"
-)
-
-// Cipher contains an expanded key structure. It doesn't contain mutable state
-// and therefore can be used concurrently.
-type Cipher struct {
-	k1, k2 cipher.Block
-}
-
-// blockSize is the block size that the underlying cipher must have. XTS is
-// only defined for 16-byte ciphers.
-const blockSize = 16
-
-// NewCipher creates a Cipher given a function for creating the underlying
-// block cipher (which must have a block size of 16 bytes). The key must be
-// twice the length of the underlying cipher's key.
-func NewCipher(cipherFunc func([]byte) (cipher.Block, error), key []byte) (c *Cipher, err error) {
-	c = new(Cipher)
-	if c.k1, err = cipherFunc(key[:len(key)/2]); err != nil {
-		return
-	}
-	c.k2, err = cipherFunc(key[len(key)/2:])
-
-	if c.k1.BlockSize() != blockSize {
-		err = errors.New("xts: cipher does not have a block size of 16")
-	}
-
-	return
-}
-
-// Encrypt encrypts a sector of plaintext and puts the result into ciphertext.
-// Plaintext and ciphertext must overlap entirely or not at all.
-// Sectors must be a multiple of 16 bytes and less than 2²⁴ bytes.
-func (c *Cipher) Encrypt(ciphertext, plaintext []byte, sectorNum uint64) {
-	if len(ciphertext) < len(plaintext) {
-		panic("xts: ciphertext is smaller than plaintext")
-	}
-	if len(plaintext)%blockSize != 0 {
-		panic("xts: plaintext is not a multiple of the block size")
-	}
-
-	var tweak [blockSize]byte
-	binary.LittleEndian.PutUint64(tweak[:8], sectorNum)
-
-	c.k2.Encrypt(tweak[:], tweak[:])
-
-	for len(plaintext) > 0 {
-		for j := range tweak {
-			ciphertext[j] = plaintext[j] ^ tweak[j]
-		}
-		c.k1.Encrypt(ciphertext, ciphertext)
-		for j := range tweak {
-			ciphertext[j] ^= tweak[j]
-		}
-		plaintext = plaintext[blockSize:]
-		ciphertext = ciphertext[blockSize:]
-
-		mul2(&tweak)
-	}
-}
-
-// Decrypt decrypts a sector of ciphertext and puts the result into plaintext.
-// Plaintext and ciphertext must overlap entirely or not at all.
-// Sectors must be a multiple of 16 bytes and less than 2²⁴ bytes.
-func (c *Cipher) Decrypt(plaintext, ciphertext []byte, sectorNum uint64) {
-	if len(plaintext) < len(ciphertext) {
-		panic("xts: plaintext is smaller than ciphertext")
-	}
-	if len(ciphertext)%blockSize != 0 {
-		panic("xts: ciphertext is not a multiple of the block size")
-	}
-
-	var tweak [blockSize]byte
-	binary.LittleEndian.PutUint64(tweak[:8], sectorNum)
-
-	c.k2.Encrypt(tweak[:], tweak[:])
-
-	for len(ciphertext) > 0 {
-		for j := range tweak {
-			plaintext[j] = ciphertext[j] ^ tweak[j]
-		}
-		c.k1.Decrypt(plaintext, plaintext)
-		for j := range tweak {
-			plaintext[j] ^= tweak[j]
-		}
-		plaintext = plaintext[blockSize:]
-		ciphertext = ciphertext[blockSize:]
-
-		mul2(&tweak)
-	}
-}
-
-// mul2 multiplies tweak by 2 in GF(2¹²⁸) with an irreducible polynomial of
-// x¹²⁸ + x⁷ + x² + x + 1.
-func mul2(tweak *[blockSize]byte) {
-	var carryIn byte
-	for j := range tweak {
-		carryOut := tweak[j] >> 7
-		tweak[j] = (tweak[j] << 1) + carryIn
-		carryIn = carryOut
-	}
-	if carryIn != 0 {
-		// If we have a carry bit then we need to subtract a multiple
-		// of the irreducible polynomial (x¹²⁸ + x⁷ + x² + x + 1).
-		// By dropping the carry bit, we're subtracting the x^128 term
-		// so all that remains is to subtract x⁷ + x² + x + 1.
-		// Subtraction (and addition) in this representation is just
-		// XOR.
-		tweak[0] ^= 1<<7 | 1<<2 | 1<<1 | 1
-	}
-}
diff --git a/installer/vendor/golang.org/x/crypto/xts/xts_test.go b/installer/vendor/golang.org/x/crypto/xts/xts_test.go
deleted file mode 100644
index 96d3b6cbc6..0000000000
--- a/installer/vendor/golang.org/x/crypto/xts/xts_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xts
-
-import (
-	"bytes"
-	"crypto/aes"
-	"encoding/hex"
-	"testing"
-)
-
-// These test vectors have been taken from IEEE P1619/D16, Annex B.
-var xtsTestVectors = []struct {
-	key        string
-	sector     uint64
-	plaintext  string
-	ciphertext string
-}{
-	{
-		"0000000000000000000000000000000000000000000000000000000000000000",
-		0,
-		"0000000000000000000000000000000000000000000000000000000000000000",
-		"917cf69ebd68b2ec9b9fe9a3eadda692cd43d2f59598ed858c02c2652fbf922e",
-	}, {
-		"1111111111111111111111111111111122222222222222222222222222222222",
-		0x3333333333,
-		"4444444444444444444444444444444444444444444444444444444444444444",
-		"c454185e6a16936e39334038acef838bfb186fff7480adc4289382ecd6d394f0",
-	}, {
-		"fffefdfcfbfaf9f8f7f6f5f4f3f2f1f022222222222222222222222222222222",
-		0x3333333333,
-		"4444444444444444444444444444444444444444444444444444444444444444",
-		"af85336b597afc1a900b2eb21ec949d292df4c047e0b21532186a5971a227a89",
-	}, {
-		"2718281828459045235360287471352631415926535897932384626433832795",
-		0,
-		"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
-		"27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568",
-	}, {
-		"2718281828459045235360287471352631415926535897932384626433832795",
-		1,
-		"27a7479befa1d476489f308cd4cfa6e2a96e4bbe3208ff25287dd3819616e89cc78cf7f5e543445f8333d8fa7f56000005279fa5d8b5e4ad40e736ddb4d35412328063fd2aab53e5ea1e0a9f332500a5df9487d07a5c92cc512c8866c7e860ce93fdf166a24912b422976146ae20ce846bb7dc9ba94a767aaef20c0d61ad02655ea92dc4c4e41a8952c651d33174be51a10c421110e6d81588ede82103a252d8a750e8768defffed9122810aaeb99f9172af82b604dc4b8e51bcb08235a6f4341332e4ca60482a4ba1a03b3e65008fc5da76b70bf1690db4eae29c5f1badd03c5ccf2a55d705ddcd86d449511ceb7ec30bf12b1fa35b913f9f747a8afd1b130e94bff94effd01a91735ca1726acd0b197c4e5b03393697e126826fb6bbde8ecc1e08298516e2c9ed03ff3c1b7860f6de76d4cecd94c8119855ef5297ca67e9f3e7ff72b1e99785ca0a7e7720c5b36dc6d72cac9574c8cbbc2f801e23e56fd344b07f22154beba0f08ce8891e643ed995c94d9a69c9f1b5f499027a78572aeebd74d20cc39881c213ee770b1010e4bea718846977ae119f7a023ab58cca0ad752afe656bb3c17256a9f6e9bf19fdd5a38fc82bbe872c5539edb609ef4f79c203ebb140f2e583cb2ad15b4aa5b655016a8449277dbd477ef2c8d6c017db738b18deb4a427d1923ce3ff262735779a418f20a282df920147beabe421ee5319d0568",
-		"264d3ca8512194fec312c8c9891f279fefdd608d0c027b60483a3fa811d65ee59d52d9e40ec5672d81532b38b6b089ce951f0f9c35590b8b978d175213f329bb1c2fd30f2f7f30492a61a532a79f51d36f5e31a7c9a12c286082ff7d2394d18f783e1a8e72c722caaaa52d8f065657d2631fd25bfd8e5baad6e527d763517501c68c5edc3cdd55435c532d7125c8614deed9adaa3acade5888b87bef641c4c994c8091b5bcd387f3963fb5bc37aa922fbfe3df4e5b915e6eb514717bdd2a74079a5073f5c4bfd46adf7d282e7a393a52579d11a028da4d9cd9c77124f9648ee383b1ac763930e7162a8d37f350b2f74b8472cf09902063c6b32e8c2d9290cefbd7346d1c779a0df50edcde4531da07b099c638e83a755944df2aef1aa31752fd323dcb710fb4bfbb9d22b925bc3577e1b8949e729a90bbafeacf7f7879e7b1147e28ba0bae940db795a61b15ecf4df8db07b824bb062802cc98a9545bb2aaeed77cb3fc6db15dcd7d80d7d5bc406c4970a3478ada8899b329198eb61c193fb6275aa8ca340344a75a862aebe92eee1ce032fd950b47d7704a3876923b4ad62844bf4a09c4dbe8b4397184b7471360c9564880aedddb9baa4af2e75394b08cd32ff479c57a07d3eab5d54de5f9738b8d27f27a9f0ab11799d7b7ffefb2704c95c6ad12c39f1e867a4b7b1d7818a4b753dfd2a89ccb45e001a03a867b187f225dd",
-	}, {
-		"27182818284590452353602874713526624977572470936999595749669676273141592653589793238462643383279502884197169399375105820974944592",
-		0xff,
-		"000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff000102030405060708090a0b0c0d0e0f101112131415161718191a1b1c1d1e1f202122232425262728292a2b2c2d2e2f303132333435363738393a3b3c3d3e3f404142434445464748494a4b4c4d4e4f505152535455565758595a5b5c5d5e5f606162636465666768696a6b6c6d6e6f707172737475767778797a7b7c7d7e7f808182838485868788898a8b8c8d8e8f909192939495969798999a9b9c9d9e9fa0a1a2a3a4a5a6a7a8a9aaabacadaeafb0b1b2b3b4b5b6b7b8b9babbbcbdbebfc0c1c2c3c4c5c6c7c8c9cacbcccdcecfd0d1d2d3d4d5d6d7d8d9dadbdcdddedfe0e1e2e3e4e5e6e7e8e9eaebecedeeeff0f1f2f3f4f5f6f7f8f9fafbfcfdfeff",
-		"1c3b3a102f770386e4836c99e370cf9bea00803f5e482357a4ae12d414a3e63b5d31e276f8fe4a8d66b317f9ac683f44680a86ac35adfc3345befecb4bb188fd5776926c49a3095eb108fd1098baec70aaa66999a72a82f27d848b21d4a741b0c5cd4d5fff9dac89aeba122961d03a757123e9870f8acf1000020887891429ca2a3e7a7d7df7b10355165c8b9a6d0a7de8b062c4500dc4cd120c0f7418dae3d0b5781c34803fa75421c790dfe1de1834f280d7667b327f6c8cd7557e12ac3a0f93ec05c52e0493ef31a12d3d9260f79a289d6a379bc70c50841473d1a8cc81ec583e9645e07b8d9670655ba5bbcfecc6dc3966380ad8fecb17b6ba02469a020a84e18e8f84252070c13e9f1f289be54fbc481457778f616015e1327a02b140f1505eb309326d68378f8374595c849d84f4c333ec4423885143cb47bd71c5edae9be69a2ffeceb1bec9de244fbe15992b11b77c040f12bd8f6a975a44a0f90c29a9abc3d4d893927284c58754cce294529f8614dcd2aba991925fedc4ae74ffac6e333b93eb4aff0479da9a410e4450e0dd7ae4c6e2910900575da401fc07059f645e8b7e9bfdef33943054ff84011493c27b3429eaedb4ed5376441a77ed43851ad77f16f541dfd269d50d6a5f14fb0aab1cbb4c1550be97f7ab4066193c4caa773dad38014bd2092fa755c824bb5e54c4f36ffda9fcea70b9c6e693e148c151",
-	},
-}
-
-func fromHex(s string) []byte {
-	ret, err := hex.DecodeString(s)
-	if err != nil {
-		panic("xts: invalid hex in test")
-	}
-	return ret
-}
-
-func TestXTS(t *testing.T) {
-	for i, test := range xtsTestVectors {
-		c, err := NewCipher(aes.NewCipher, fromHex(test.key))
-		if err != nil {
-			t.Errorf("#%d: failed to create cipher: %s", i, err)
-			continue
-		}
-		plaintext := fromHex(test.plaintext)
-		ciphertext := make([]byte, len(plaintext))
-		c.Encrypt(ciphertext, plaintext, test.sector)
-
-		expectedCiphertext := fromHex(test.ciphertext)
-		if !bytes.Equal(ciphertext, expectedCiphertext) {
-			t.Errorf("#%d: encrypted failed, got: %x, want: %x", i, ciphertext, expectedCiphertext)
-			continue
-		}
-
-		decrypted := make([]byte, len(ciphertext))
-		c.Decrypt(decrypted, ciphertext, test.sector)
-		if !bytes.Equal(decrypted, plaintext) {
-			t.Errorf("#%d: decryption failed, got: %x, want: %x", i, decrypted, plaintext)
-		}
-	}
-}
-
-func TestShorterCiphertext(t *testing.T) {
-	// Decrypt used to panic if the input was shorter than the output. See
-	// https://go-review.googlesource.com/c/39954/
-	c, err := NewCipher(aes.NewCipher, make([]byte, 32))
-	if err != nil {
-		t.Fatalf("NewCipher failed: %s", err)
-	}
-
-	plaintext := make([]byte, 32)
-	encrypted := make([]byte, 48)
-	decrypted := make([]byte, 48)
-
-	c.Encrypt(encrypted, plaintext, 0)
-	c.Decrypt(decrypted, encrypted[:len(plaintext)], 0)
-
-	if !bytes.Equal(plaintext, decrypted[:len(plaintext)]) {
-		t.Errorf("En/Decryption is not inverse")
-	}
-}
diff --git a/installer/vendor/golang.org/x/lint/LICENSE b/installer/vendor/golang.org/x/lint/LICENSE
new file mode 100644
index 0000000000..65d761bc9f
--- /dev/null
+++ b/installer/vendor/golang.org/x/lint/LICENSE
@@ -0,0 +1,27 @@
+Copyright (c) 2013 The Go Authors. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+   * Redistributions of source code must retain the above copyright
+notice, this list of conditions and the following disclaimer.
+   * Redistributions in binary form must reproduce the above
+copyright notice, this list of conditions and the following disclaimer
+in the documentation and/or other materials provided with the
+distribution.
+   * Neither the name of Google Inc. nor the names of its
+contributors may be used to endorse or promote products derived from
+this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/installer/vendor/github.com/golang/lint/lint.go b/installer/vendor/golang.org/x/lint/lint.go
similarity index 95%
rename from installer/vendor/github.com/golang/lint/lint.go
rename to installer/vendor/golang.org/x/lint/lint.go
index e1a5f30293..46bd45f4e2 100644
--- a/installer/vendor/github.com/golang/lint/lint.go
+++ b/installer/vendor/golang.org/x/lint/lint.go
@@ -23,6 +23,7 @@ import (
 	"unicode"
 	"unicode/utf8"
 
+	"golang.org/x/tools/go/ast/astutil"
 	"golang.org/x/tools/go/gcexportdata"
 )
 
@@ -199,7 +200,6 @@ func (f *file) lint() {
 	f.lintNames()
 	f.lintVarDecls()
 	f.lintElses()
-	f.lintIfError()
 	f.lintRanges()
 	f.lintErrorf()
 	f.lintErrors()
@@ -527,7 +527,10 @@ func (f *file) lintExported() {
 	})
 }
 
-var allCapsRE = regexp.MustCompile(`^[A-Z0-9_]+$`)
+var (
+	allCapsRE = regexp.MustCompile(`^[A-Z0-9_]+$`)
+	anyCapsRE = regexp.MustCompile(`[A-Z]`)
+)
 
 // knownNameExceptions is a set of names that are known to be exempt from naming checks.
 // This is usually because they are constrained by having to match names in the
@@ -544,6 +547,9 @@ func (f *file) lintNames() {
 	if strings.Contains(f.f.Name.Name, "_") && !strings.HasSuffix(f.f.Name.Name, "_test") {
 		f.errorf(f.f, 1, link("http://golang.org/doc/effective_go.html#package-names"), category("naming"), "don't use an underscore in package name")
 	}
+	if anyCapsRE.MatchString(f.f.Name.Name) {
+		f.errorf(f.f, 1, link("http://golang.org/doc/effective_go.html#package-names"), category("mixed-caps"), "don't use MixedCaps in package name; %s should be %s", f.f.Name.Name, strings.ToLower(f.f.Name.Name))
+	}
 
 	check := func(id *ast.Ident, thing string) {
 		if id.Name == "_" {
@@ -1039,13 +1045,13 @@ func (f *file) lintElses() {
 		if !ok || ifStmt.Else == nil {
 			return true
 		}
-		if ignore[ifStmt] {
-			return true
-		}
 		if elseif, ok := ifStmt.Else.(*ast.IfStmt); ok {
 			ignore[elseif] = true
 			return true
 		}
+		if ignore[ifStmt] {
+			return true
+		}
 		if _, ok := ifStmt.Else.(*ast.BlockStmt); !ok {
 			// only care about elses without conditions
 			return true
@@ -1078,20 +1084,25 @@ func (f *file) lintRanges() {
 		if !ok {
 			return true
 		}
-		if rs.Value == nil {
-			// for x = range m { ... }
-			return true // single var form
-		}
-		if !isIdent(rs.Value, "_") {
-			// for ?, y = range m { ... }
+
+		if isIdent(rs.Key, "_") && (rs.Value == nil || isIdent(rs.Value, "_")) {
+			p := f.errorf(rs.Key, 1, category("range-loop"), "should omit values from range; this loop is equivalent to `for range ...`")
+
+			newRS := *rs // shallow copy
+			newRS.Value = nil
+			newRS.Key = nil
+			p.ReplacementLine = f.firstLineOf(&newRS, rs)
+
 			return true
 		}
 
-		p := f.errorf(rs.Value, 1, category("range-loop"), "should omit 2nd value from range; this loop is equivalent to `for %s %s range ...`", f.render(rs.Key), rs.Tok)
+		if isIdent(rs.Value, "_") {
+			p := f.errorf(rs.Value, 1, category("range-loop"), "should omit 2nd value from range; this loop is equivalent to `for %s %s range ...`", f.render(rs.Key), rs.Tok)
 
-		newRS := *rs // shallow copy
-		newRS.Value = nil
-		p.ReplacementLine = f.firstLineOf(&newRS, rs)
+			newRS := *rs // shallow copy
+			newRS.Value = nil
+			p.ReplacementLine = f.firstLineOf(&newRS, rs)
+		}
 
 		return true
 	})
@@ -1115,6 +1126,9 @@ func (f *file) lintErrorf() {
 		if !isErrorsNew && !isTestingError {
 			return true
 		}
+		if !f.imports("errors") {
+			return true
+		}
 		arg := ce.Args[0]
 		ce, ok = arg.(*ast.CallExpr)
 		if !ok || !isPkgDot(ce.Fun, "fmt", "Sprintf") {
@@ -1295,6 +1309,9 @@ func (f *file) lintErrorReturn() {
 		if len(ret) <= 1 {
 			return true
 		}
+		if isIdent(ret[len(ret)-1].Type, "error") {
+			return true
+		}
 		// An error return parameter should be the last parameter.
 		// Flag any error parameters found before the last.
 		for _, r := range ret[:len(ret)-1] {
@@ -1489,63 +1506,6 @@ func (f *file) containsComments(start, end token.Pos) bool {
 	return false
 }
 
-func (f *file) lintIfError() {
-	f.walk(func(node ast.Node) bool {
-		switch v := node.(type) {
-		case *ast.BlockStmt:
-			for i := 0; i < len(v.List)-1; i++ {
-				// if var := whatever; var != nil { return var }
-				s, ok := v.List[i].(*ast.IfStmt)
-				if !ok || s.Body == nil || len(s.Body.List) != 1 || s.Else != nil {
-					continue
-				}
-				assign, ok := s.Init.(*ast.AssignStmt)
-				if !ok || len(assign.Lhs) != 1 || !(assign.Tok == token.DEFINE || assign.Tok == token.ASSIGN) {
-					continue
-				}
-				id, ok := assign.Lhs[0].(*ast.Ident)
-				if !ok {
-					continue
-				}
-				expr, ok := s.Cond.(*ast.BinaryExpr)
-				if !ok || expr.Op != token.NEQ {
-					continue
-				}
-				if lhs, ok := expr.X.(*ast.Ident); !ok || lhs.Name != id.Name {
-					continue
-				}
-				if rhs, ok := expr.Y.(*ast.Ident); !ok || rhs.Name != "nil" {
-					continue
-				}
-				r, ok := s.Body.List[0].(*ast.ReturnStmt)
-				if !ok || len(r.Results) != 1 {
-					continue
-				}
-				if r, ok := r.Results[0].(*ast.Ident); !ok || r.Name != id.Name {
-					continue
-				}
-
-				// return nil
-				r, ok = v.List[i+1].(*ast.ReturnStmt)
-				if !ok || len(r.Results) != 1 {
-					continue
-				}
-				if r, ok := r.Results[0].(*ast.Ident); !ok || r.Name != "nil" {
-					continue
-				}
-
-				// check if there are any comments explaining the construct, don't emit an error if there are some.
-				if f.containsComments(s.Pos(), r.Pos()) {
-					continue
-				}
-
-				f.errorf(v.List[i], 0.9, "redundant if ...; err != nil check, just return error instead.")
-			}
-		}
-		return true
-	})
-}
-
 // receiverType returns the named type of the method receiver, sans "*",
 // or "invalid-type" if fn.Recv is ill formed.
 func receiverType(fn *ast.FuncDecl) string {
@@ -1606,11 +1566,6 @@ func isPkgDot(expr ast.Expr, pkg, name string) bool {
 	return ok && isIdent(sel.X, pkg) && isIdent(sel.Sel, name)
 }
 
-func isZero(expr ast.Expr) bool {
-	lit, ok := expr.(*ast.BasicLit)
-	return ok && lit.Kind == token.INT && lit.Value == "0"
-}
-
 func isOne(expr ast.Expr) bool {
 	lit, ok := expr.(*ast.BasicLit)
 	return ok && lit.Kind == token.INT && lit.Value == "1"
@@ -1688,6 +1643,20 @@ func (f *file) srcLineWithMatch(node ast.Node, pattern string) (m []string) {
 	return rx.FindStringSubmatch(line)
 }
 
+// imports returns true if the current file imports the specified package path.
+func (f *file) imports(importPath string) bool {
+	all := astutil.Imports(f.fset, f.f)
+	for _, p := range all {
+		for _, i := range p {
+			uq, err := strconv.Unquote(i.Path.Value)
+			if err == nil && importPath == uq {
+				return true
+			}
+		}
+	}
+	return false
+}
+
 // srcLine returns the complete line at p, including the terminating newline.
 func srcLine(src []byte, p token.Position) string {
 	// Run to end of line in both directions if not at line start/end.
diff --git a/installer/vendor/golang.org/x/net/.gitattributes b/installer/vendor/golang.org/x/net/.gitattributes
deleted file mode 100644
index d2f212e5da..0000000000
--- a/installer/vendor/golang.org/x/net/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/installer/vendor/golang.org/x/net/.gitignore b/installer/vendor/golang.org/x/net/.gitignore
deleted file mode 100644
index 8339fd61d3..0000000000
--- a/installer/vendor/golang.org/x/net/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/installer/vendor/golang.org/x/net/CONTRIBUTING.md b/installer/vendor/golang.org/x/net/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/net/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/net/README b/installer/vendor/golang.org/x/net/README
deleted file mode 100644
index 6b13d8e505..0000000000
--- a/installer/vendor/golang.org/x/net/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository holds supplementary Go networking libraries.
-
-To submit changes to this repository, see http://golang.org/doc/contribute.html.
diff --git a/installer/vendor/golang.org/x/net/bpf/asm.go b/installer/vendor/golang.org/x/net/bpf/asm.go
deleted file mode 100644
index 15e21b1812..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/asm.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import "fmt"
-
-// Assemble converts insts into raw instructions suitable for loading
-// into a BPF virtual machine.
-//
-// Currently, no optimization is attempted, the assembled program flow
-// is exactly as provided.
-func Assemble(insts []Instruction) ([]RawInstruction, error) {
-	ret := make([]RawInstruction, len(insts))
-	var err error
-	for i, inst := range insts {
-		ret[i], err = inst.Assemble()
-		if err != nil {
-			return nil, fmt.Errorf("assembling instruction %d: %s", i+1, err)
-		}
-	}
-	return ret, nil
-}
-
-// Disassemble attempts to parse raw back into
-// Instructions. Unrecognized RawInstructions are assumed to be an
-// extension not implemented by this package, and are passed through
-// unchanged to the output. The allDecoded value reports whether insts
-// contains no RawInstructions.
-func Disassemble(raw []RawInstruction) (insts []Instruction, allDecoded bool) {
-	insts = make([]Instruction, len(raw))
-	allDecoded = true
-	for i, r := range raw {
-		insts[i] = r.Disassemble()
-		if _, ok := insts[i].(RawInstruction); ok {
-			allDecoded = false
-		}
-	}
-	return insts, allDecoded
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/constants.go b/installer/vendor/golang.org/x/net/bpf/constants.go
deleted file mode 100644
index ccf6adafbf..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/constants.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-// A Register is a register of the BPF virtual machine.
-type Register uint16
-
-const (
-	// RegA is the accumulator register. RegA is always the
-	// destination register of ALU operations.
-	RegA Register = iota
-	// RegX is the indirection register, used by LoadIndirect
-	// operations.
-	RegX
-)
-
-// An ALUOp is an arithmetic or logic operation.
-type ALUOp uint16
-
-// ALU binary operation types.
-const (
-	ALUOpAdd ALUOp = iota << 4
-	ALUOpSub
-	ALUOpMul
-	ALUOpDiv
-	ALUOpOr
-	ALUOpAnd
-	ALUOpShiftLeft
-	ALUOpShiftRight
-	aluOpNeg // Not exported because it's the only unary ALU operation, and gets its own instruction type.
-	ALUOpMod
-	ALUOpXor
-)
-
-// A JumpTest is a comparison operator used in conditional jumps.
-type JumpTest uint16
-
-// Supported operators for conditional jumps.
-const (
-	// K == A
-	JumpEqual JumpTest = iota
-	// K != A
-	JumpNotEqual
-	// K > A
-	JumpGreaterThan
-	// K < A
-	JumpLessThan
-	// K >= A
-	JumpGreaterOrEqual
-	// K <= A
-	JumpLessOrEqual
-	// K & A != 0
-	JumpBitsSet
-	// K & A == 0
-	JumpBitsNotSet
-)
-
-// An Extension is a function call provided by the kernel that
-// performs advanced operations that are expensive or impossible
-// within the BPF virtual machine.
-//
-// Extensions are only implemented by the Linux kernel.
-//
-// TODO: should we prune this list? Some of these extensions seem
-// either broken or near-impossible to use correctly, whereas other
-// (len, random, ifindex) are quite useful.
-type Extension int
-
-// Extension functions available in the Linux kernel.
-const (
-	// extOffset is the negative maximum number of instructions used
-	// to load instructions by overloading the K argument.
-	extOffset = -0x1000
-	// ExtLen returns the length of the packet.
-	ExtLen Extension = 1
-	// ExtProto returns the packet's L3 protocol type.
-	ExtProto = 0
-	// ExtType returns the packet's type (skb->pkt_type in the kernel)
-	//
-	// TODO: better documentation. How nice an API do we want to
-	// provide for these esoteric extensions?
-	ExtType = 4
-	// ExtPayloadOffset returns the offset of the packet payload, or
-	// the first protocol header that the kernel does not know how to
-	// parse.
-	ExtPayloadOffset = 52
-	// ExtInterfaceIndex returns the index of the interface on which
-	// the packet was received.
-	ExtInterfaceIndex = 8
-	// ExtNetlinkAttr returns the netlink attribute of type X at
-	// offset A.
-	ExtNetlinkAttr = 12
-	// ExtNetlinkAttrNested returns the nested netlink attribute of
-	// type X at offset A.
-	ExtNetlinkAttrNested = 16
-	// ExtMark returns the packet's mark value.
-	ExtMark = 20
-	// ExtQueue returns the packet's assigned hardware queue.
-	ExtQueue = 24
-	// ExtLinkLayerType returns the packet's hardware address type
-	// (e.g. Ethernet, Infiniband).
-	ExtLinkLayerType = 28
-	// ExtRXHash returns the packets receive hash.
-	//
-	// TODO: figure out what this rxhash actually is.
-	ExtRXHash = 32
-	// ExtCPUID returns the ID of the CPU processing the current
-	// packet.
-	ExtCPUID = 36
-	// ExtVLANTag returns the packet's VLAN tag.
-	ExtVLANTag = 44
-	// ExtVLANTagPresent returns non-zero if the packet has a VLAN
-	// tag.
-	//
-	// TODO: I think this might be a lie: it reads bit 0x1000 of the
-	// VLAN header, which changed meaning in recent revisions of the
-	// spec - this extension may now return meaningless information.
-	ExtVLANTagPresent = 48
-	// ExtVLANProto returns 0x8100 if the frame has a VLAN header,
-	// 0x88a8 if the frame has a "Q-in-Q" double VLAN header, or some
-	// other value if no VLAN information is present.
-	ExtVLANProto = 60
-	// ExtRand returns a uniformly random uint32.
-	ExtRand = 56
-)
-
-// The following gives names to various bit patterns used in opcode construction.
-
-const (
-	opMaskCls uint16 = 0x7
-	// opClsLoad masks
-	opMaskLoadDest  = 0x01
-	opMaskLoadWidth = 0x18
-	opMaskLoadMode  = 0xe0
-	// opClsALU
-	opMaskOperandSrc = 0x08
-	opMaskOperator   = 0xf0
-	// opClsJump
-	opMaskJumpConst = 0x0f
-	opMaskJumpCond  = 0xf0
-)
-
-const (
-	// +---------------+-----------------+---+---+---+
-	// | AddrMode (3b) | LoadWidth (2b)  | 0 | 0 | 0 |
-	// +---------------+-----------------+---+---+---+
-	opClsLoadA uint16 = iota
-	// +---------------+-----------------+---+---+---+
-	// | AddrMode (3b) | LoadWidth (2b)  | 0 | 0 | 1 |
-	// +---------------+-----------------+---+---+---+
-	opClsLoadX
-	// +---+---+---+---+---+---+---+---+
-	// | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 0 |
-	// +---+---+---+---+---+---+---+---+
-	opClsStoreA
-	// +---+---+---+---+---+---+---+---+
-	// | 0 | 0 | 0 | 0 | 0 | 0 | 1 | 1 |
-	// +---+---+---+---+---+---+---+---+
-	opClsStoreX
-	// +---------------+-----------------+---+---+---+
-	// | Operator (4b) | OperandSrc (1b) | 1 | 0 | 0 |
-	// +---------------+-----------------+---+---+---+
-	opClsALU
-	// +-----------------------------+---+---+---+---+
-	// |      TestOperator (4b)      | 0 | 1 | 0 | 1 |
-	// +-----------------------------+---+---+---+---+
-	opClsJump
-	// +---+-------------------------+---+---+---+---+
-	// | 0 | 0 | 0 |   RetSrc (1b)   | 0 | 1 | 1 | 0 |
-	// +---+-------------------------+---+---+---+---+
-	opClsReturn
-	// +---+-------------------------+---+---+---+---+
-	// | 0 | 0 | 0 |  TXAorTAX (1b)  | 0 | 1 | 1 | 1 |
-	// +---+-------------------------+---+---+---+---+
-	opClsMisc
-)
-
-const (
-	opAddrModeImmediate uint16 = iota << 5
-	opAddrModeAbsolute
-	opAddrModeIndirect
-	opAddrModeScratch
-	opAddrModePacketLen // actually an extension, not an addressing mode.
-	opAddrModeMemShift
-)
-
-const (
-	opLoadWidth4 uint16 = iota << 3
-	opLoadWidth2
-	opLoadWidth1
-)
-
-// Operator defined by ALUOp*
-
-const (
-	opALUSrcConstant uint16 = iota << 3
-	opALUSrcX
-)
-
-const (
-	opJumpAlways = iota << 4
-	opJumpEqual
-	opJumpGT
-	opJumpGE
-	opJumpSet
-)
-
-const (
-	opRetSrcConstant uint16 = iota << 4
-	opRetSrcA
-)
-
-const (
-	opMiscTAX = 0x00
-	opMiscTXA = 0x80
-)
diff --git a/installer/vendor/golang.org/x/net/bpf/doc.go b/installer/vendor/golang.org/x/net/bpf/doc.go
deleted file mode 100644
index ae62feb534..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/doc.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Package bpf implements marshaling and unmarshaling of programs for the
-Berkeley Packet Filter virtual machine, and provides a Go implementation
-of the virtual machine.
-
-BPF's main use is to specify a packet filter for network taps, so that
-the kernel doesn't have to expensively copy every packet it sees to
-userspace. However, it's been repurposed to other areas where running
-user code in-kernel is needed. For example, Linux's seccomp uses BPF
-to apply security policies to system calls. For simplicity, this
-documentation refers only to packets, but other uses of BPF have their
-own data payloads.
-
-BPF programs run in a restricted virtual machine. It has almost no
-access to kernel functions, and while conditional branches are
-allowed, they can only jump forwards, to guarantee that there are no
-infinite loops.
-
-The virtual machine
-
-The BPF VM is an accumulator machine. Its main register, called
-register A, is an implicit source and destination in all arithmetic
-and logic operations. The machine also has 16 scratch registers for
-temporary storage, and an indirection register (register X) for
-indirect memory access. All registers are 32 bits wide.
-
-Each run of a BPF program is given one packet, which is placed in the
-VM's read-only "main memory". LoadAbsolute and LoadIndirect
-instructions can fetch up to 32 bits at a time into register A for
-examination.
-
-The goal of a BPF program is to produce and return a verdict (uint32),
-which tells the kernel what to do with the packet. In the context of
-packet filtering, the returned value is the number of bytes of the
-packet to forward to userspace, or 0 to ignore the packet. Other
-contexts like seccomp define their own return values.
-
-In order to simplify programs, attempts to read past the end of the
-packet terminate the program execution with a verdict of 0 (ignore
-packet). This means that the vast majority of BPF programs don't need
-to do any explicit bounds checking.
-
-In addition to the bytes of the packet, some BPF programs have access
-to extensions, which are essentially calls to kernel utility
-functions. Currently, the only extensions supported by this package
-are the Linux packet filter extensions.
-
-Examples
-
-This packet filter selects all ARP packets.
-
-	bpf.Assemble([]bpf.Instruction{
-		// Load "EtherType" field from the ethernet header.
-		bpf.LoadAbsolute{Off: 12, Size: 2},
-		// Skip over the next instruction if EtherType is not ARP.
-		bpf.JumpIf{Cond: bpf.JumpNotEqual, Val: 0x0806, SkipTrue: 1},
-		// Verdict is "send up to 4k of the packet to userspace."
-		bpf.RetConstant{Val: 4096},
-		// Verdict is "ignore packet."
-		bpf.RetConstant{Val: 0},
-	})
-
-This packet filter captures a random 1% sample of traffic.
-
-	bpf.Assemble([]bpf.Instruction{
-		// Get a 32-bit random number from the Linux kernel.
-		bpf.LoadExtension{Num: bpf.ExtRand},
-		// 1% dice roll?
-		bpf.JumpIf{Cond: bpf.JumpLessThan, Val: 2^32/100, SkipFalse: 1},
-		// Capture.
-		bpf.RetConstant{Val: 4096},
-		// Ignore.
-		bpf.RetConstant{Val: 0},
-	})
-
-*/
-package bpf // import "golang.org/x/net/bpf"
diff --git a/installer/vendor/golang.org/x/net/bpf/instructions.go b/installer/vendor/golang.org/x/net/bpf/instructions.go
deleted file mode 100644
index 3b4fd08916..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/instructions.go
+++ /dev/null
@@ -1,704 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import "fmt"
-
-// An Instruction is one instruction executed by the BPF virtual
-// machine.
-type Instruction interface {
-	// Assemble assembles the Instruction into a RawInstruction.
-	Assemble() (RawInstruction, error)
-}
-
-// A RawInstruction is a raw BPF virtual machine instruction.
-type RawInstruction struct {
-	// Operation to execute.
-	Op uint16
-	// For conditional jump instructions, the number of instructions
-	// to skip if the condition is true/false.
-	Jt uint8
-	Jf uint8
-	// Constant parameter. The meaning depends on the Op.
-	K uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (ri RawInstruction) Assemble() (RawInstruction, error) { return ri, nil }
-
-// Disassemble parses ri into an Instruction and returns it. If ri is
-// not recognized by this package, ri itself is returned.
-func (ri RawInstruction) Disassemble() Instruction {
-	switch ri.Op & opMaskCls {
-	case opClsLoadA, opClsLoadX:
-		reg := Register(ri.Op & opMaskLoadDest)
-		sz := 0
-		switch ri.Op & opMaskLoadWidth {
-		case opLoadWidth4:
-			sz = 4
-		case opLoadWidth2:
-			sz = 2
-		case opLoadWidth1:
-			sz = 1
-		default:
-			return ri
-		}
-		switch ri.Op & opMaskLoadMode {
-		case opAddrModeImmediate:
-			if sz != 4 {
-				return ri
-			}
-			return LoadConstant{Dst: reg, Val: ri.K}
-		case opAddrModeScratch:
-			if sz != 4 || ri.K > 15 {
-				return ri
-			}
-			return LoadScratch{Dst: reg, N: int(ri.K)}
-		case opAddrModeAbsolute:
-			if ri.K > extOffset+0xffffffff {
-				return LoadExtension{Num: Extension(-extOffset + ri.K)}
-			}
-			return LoadAbsolute{Size: sz, Off: ri.K}
-		case opAddrModeIndirect:
-			return LoadIndirect{Size: sz, Off: ri.K}
-		case opAddrModePacketLen:
-			if sz != 4 {
-				return ri
-			}
-			return LoadExtension{Num: ExtLen}
-		case opAddrModeMemShift:
-			return LoadMemShift{Off: ri.K}
-		default:
-			return ri
-		}
-
-	case opClsStoreA:
-		if ri.Op != opClsStoreA || ri.K > 15 {
-			return ri
-		}
-		return StoreScratch{Src: RegA, N: int(ri.K)}
-
-	case opClsStoreX:
-		if ri.Op != opClsStoreX || ri.K > 15 {
-			return ri
-		}
-		return StoreScratch{Src: RegX, N: int(ri.K)}
-
-	case opClsALU:
-		switch op := ALUOp(ri.Op & opMaskOperator); op {
-		case ALUOpAdd, ALUOpSub, ALUOpMul, ALUOpDiv, ALUOpOr, ALUOpAnd, ALUOpShiftLeft, ALUOpShiftRight, ALUOpMod, ALUOpXor:
-			if ri.Op&opMaskOperandSrc != 0 {
-				return ALUOpX{Op: op}
-			}
-			return ALUOpConstant{Op: op, Val: ri.K}
-		case aluOpNeg:
-			return NegateA{}
-		default:
-			return ri
-		}
-
-	case opClsJump:
-		if ri.Op&opMaskJumpConst != opClsJump {
-			return ri
-		}
-		switch ri.Op & opMaskJumpCond {
-		case opJumpAlways:
-			return Jump{Skip: ri.K}
-		case opJumpEqual:
-			if ri.Jt == 0 {
-				return JumpIf{
-					Cond:      JumpNotEqual,
-					Val:       ri.K,
-					SkipTrue:  ri.Jf,
-					SkipFalse: 0,
-				}
-			}
-			return JumpIf{
-				Cond:      JumpEqual,
-				Val:       ri.K,
-				SkipTrue:  ri.Jt,
-				SkipFalse: ri.Jf,
-			}
-		case opJumpGT:
-			if ri.Jt == 0 {
-				return JumpIf{
-					Cond:      JumpLessOrEqual,
-					Val:       ri.K,
-					SkipTrue:  ri.Jf,
-					SkipFalse: 0,
-				}
-			}
-			return JumpIf{
-				Cond:      JumpGreaterThan,
-				Val:       ri.K,
-				SkipTrue:  ri.Jt,
-				SkipFalse: ri.Jf,
-			}
-		case opJumpGE:
-			if ri.Jt == 0 {
-				return JumpIf{
-					Cond:      JumpLessThan,
-					Val:       ri.K,
-					SkipTrue:  ri.Jf,
-					SkipFalse: 0,
-				}
-			}
-			return JumpIf{
-				Cond:      JumpGreaterOrEqual,
-				Val:       ri.K,
-				SkipTrue:  ri.Jt,
-				SkipFalse: ri.Jf,
-			}
-		case opJumpSet:
-			return JumpIf{
-				Cond:      JumpBitsSet,
-				Val:       ri.K,
-				SkipTrue:  ri.Jt,
-				SkipFalse: ri.Jf,
-			}
-		default:
-			return ri
-		}
-
-	case opClsReturn:
-		switch ri.Op {
-		case opClsReturn | opRetSrcA:
-			return RetA{}
-		case opClsReturn | opRetSrcConstant:
-			return RetConstant{Val: ri.K}
-		default:
-			return ri
-		}
-
-	case opClsMisc:
-		switch ri.Op {
-		case opClsMisc | opMiscTAX:
-			return TAX{}
-		case opClsMisc | opMiscTXA:
-			return TXA{}
-		default:
-			return ri
-		}
-
-	default:
-		panic("unreachable") // switch is exhaustive on the bit pattern
-	}
-}
-
-// LoadConstant loads Val into register Dst.
-type LoadConstant struct {
-	Dst Register
-	Val uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadConstant) Assemble() (RawInstruction, error) {
-	return assembleLoad(a.Dst, 4, opAddrModeImmediate, a.Val)
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadConstant) String() string {
-	switch a.Dst {
-	case RegA:
-		return fmt.Sprintf("ld #%d", a.Val)
-	case RegX:
-		return fmt.Sprintf("ldx #%d", a.Val)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// LoadScratch loads scratch[N] into register Dst.
-type LoadScratch struct {
-	Dst Register
-	N   int // 0-15
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadScratch) Assemble() (RawInstruction, error) {
-	if a.N < 0 || a.N > 15 {
-		return RawInstruction{}, fmt.Errorf("invalid scratch slot %d", a.N)
-	}
-	return assembleLoad(a.Dst, 4, opAddrModeScratch, uint32(a.N))
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadScratch) String() string {
-	switch a.Dst {
-	case RegA:
-		return fmt.Sprintf("ld M[%d]", a.N)
-	case RegX:
-		return fmt.Sprintf("ldx M[%d]", a.N)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// LoadAbsolute loads packet[Off:Off+Size] as an integer value into
-// register A.
-type LoadAbsolute struct {
-	Off  uint32
-	Size int // 1, 2 or 4
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadAbsolute) Assemble() (RawInstruction, error) {
-	return assembleLoad(RegA, a.Size, opAddrModeAbsolute, a.Off)
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadAbsolute) String() string {
-	switch a.Size {
-	case 1: // byte
-		return fmt.Sprintf("ldb [%d]", a.Off)
-	case 2: // half word
-		return fmt.Sprintf("ldh [%d]", a.Off)
-	case 4: // word
-		if a.Off > extOffset+0xffffffff {
-			return LoadExtension{Num: Extension(a.Off + 0x1000)}.String()
-		}
-		return fmt.Sprintf("ld [%d]", a.Off)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// LoadIndirect loads packet[X+Off:X+Off+Size] as an integer value
-// into register A.
-type LoadIndirect struct {
-	Off  uint32
-	Size int // 1, 2 or 4
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadIndirect) Assemble() (RawInstruction, error) {
-	return assembleLoad(RegA, a.Size, opAddrModeIndirect, a.Off)
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadIndirect) String() string {
-	switch a.Size {
-	case 1: // byte
-		return fmt.Sprintf("ldb [x + %d]", a.Off)
-	case 2: // half word
-		return fmt.Sprintf("ldh [x + %d]", a.Off)
-	case 4: // word
-		return fmt.Sprintf("ld [x + %d]", a.Off)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// LoadMemShift multiplies the first 4 bits of the byte at packet[Off]
-// by 4 and stores the result in register X.
-//
-// This instruction is mainly useful to load into X the length of an
-// IPv4 packet header in a single instruction, rather than have to do
-// the arithmetic on the header's first byte by hand.
-type LoadMemShift struct {
-	Off uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadMemShift) Assemble() (RawInstruction, error) {
-	return assembleLoad(RegX, 1, opAddrModeMemShift, a.Off)
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadMemShift) String() string {
-	return fmt.Sprintf("ldx 4*([%d]&0xf)", a.Off)
-}
-
-// LoadExtension invokes a linux-specific extension and stores the
-// result in register A.
-type LoadExtension struct {
-	Num Extension
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a LoadExtension) Assemble() (RawInstruction, error) {
-	if a.Num == ExtLen {
-		return assembleLoad(RegA, 4, opAddrModePacketLen, 0)
-	}
-	return assembleLoad(RegA, 4, opAddrModeAbsolute, uint32(extOffset+a.Num))
-}
-
-// String returns the the instruction in assembler notation.
-func (a LoadExtension) String() string {
-	switch a.Num {
-	case ExtLen:
-		return "ld #len"
-	case ExtProto:
-		return "ld #proto"
-	case ExtType:
-		return "ld #type"
-	case ExtPayloadOffset:
-		return "ld #poff"
-	case ExtInterfaceIndex:
-		return "ld #ifidx"
-	case ExtNetlinkAttr:
-		return "ld #nla"
-	case ExtNetlinkAttrNested:
-		return "ld #nlan"
-	case ExtMark:
-		return "ld #mark"
-	case ExtQueue:
-		return "ld #queue"
-	case ExtLinkLayerType:
-		return "ld #hatype"
-	case ExtRXHash:
-		return "ld #rxhash"
-	case ExtCPUID:
-		return "ld #cpu"
-	case ExtVLANTag:
-		return "ld #vlan_tci"
-	case ExtVLANTagPresent:
-		return "ld #vlan_avail"
-	case ExtVLANProto:
-		return "ld #vlan_tpid"
-	case ExtRand:
-		return "ld #rand"
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// StoreScratch stores register Src into scratch[N].
-type StoreScratch struct {
-	Src Register
-	N   int // 0-15
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a StoreScratch) Assemble() (RawInstruction, error) {
-	if a.N < 0 || a.N > 15 {
-		return RawInstruction{}, fmt.Errorf("invalid scratch slot %d", a.N)
-	}
-	var op uint16
-	switch a.Src {
-	case RegA:
-		op = opClsStoreA
-	case RegX:
-		op = opClsStoreX
-	default:
-		return RawInstruction{}, fmt.Errorf("invalid source register %v", a.Src)
-	}
-
-	return RawInstruction{
-		Op: op,
-		K:  uint32(a.N),
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a StoreScratch) String() string {
-	switch a.Src {
-	case RegA:
-		return fmt.Sprintf("st M[%d]", a.N)
-	case RegX:
-		return fmt.Sprintf("stx M[%d]", a.N)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// ALUOpConstant executes A = A <Op> Val.
-type ALUOpConstant struct {
-	Op  ALUOp
-	Val uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a ALUOpConstant) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsALU | opALUSrcConstant | uint16(a.Op),
-		K:  a.Val,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a ALUOpConstant) String() string {
-	switch a.Op {
-	case ALUOpAdd:
-		return fmt.Sprintf("add #%d", a.Val)
-	case ALUOpSub:
-		return fmt.Sprintf("sub #%d", a.Val)
-	case ALUOpMul:
-		return fmt.Sprintf("mul #%d", a.Val)
-	case ALUOpDiv:
-		return fmt.Sprintf("div #%d", a.Val)
-	case ALUOpMod:
-		return fmt.Sprintf("mod #%d", a.Val)
-	case ALUOpAnd:
-		return fmt.Sprintf("and #%d", a.Val)
-	case ALUOpOr:
-		return fmt.Sprintf("or #%d", a.Val)
-	case ALUOpXor:
-		return fmt.Sprintf("xor #%d", a.Val)
-	case ALUOpShiftLeft:
-		return fmt.Sprintf("lsh #%d", a.Val)
-	case ALUOpShiftRight:
-		return fmt.Sprintf("rsh #%d", a.Val)
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// ALUOpX executes A = A <Op> X
-type ALUOpX struct {
-	Op ALUOp
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a ALUOpX) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsALU | opALUSrcX | uint16(a.Op),
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a ALUOpX) String() string {
-	switch a.Op {
-	case ALUOpAdd:
-		return "add x"
-	case ALUOpSub:
-		return "sub x"
-	case ALUOpMul:
-		return "mul x"
-	case ALUOpDiv:
-		return "div x"
-	case ALUOpMod:
-		return "mod x"
-	case ALUOpAnd:
-		return "and x"
-	case ALUOpOr:
-		return "or x"
-	case ALUOpXor:
-		return "xor x"
-	case ALUOpShiftLeft:
-		return "lsh x"
-	case ALUOpShiftRight:
-		return "rsh x"
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-// NegateA executes A = -A.
-type NegateA struct{}
-
-// Assemble implements the Instruction Assemble method.
-func (a NegateA) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsALU | uint16(aluOpNeg),
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a NegateA) String() string {
-	return fmt.Sprintf("neg")
-}
-
-// Jump skips the following Skip instructions in the program.
-type Jump struct {
-	Skip uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a Jump) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsJump | opJumpAlways,
-		K:  a.Skip,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a Jump) String() string {
-	return fmt.Sprintf("ja %d", a.Skip)
-}
-
-// JumpIf skips the following Skip instructions in the program if A
-// <Cond> Val is true.
-type JumpIf struct {
-	Cond      JumpTest
-	Val       uint32
-	SkipTrue  uint8
-	SkipFalse uint8
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a JumpIf) Assemble() (RawInstruction, error) {
-	var (
-		cond uint16
-		flip bool
-	)
-	switch a.Cond {
-	case JumpEqual:
-		cond = opJumpEqual
-	case JumpNotEqual:
-		cond, flip = opJumpEqual, true
-	case JumpGreaterThan:
-		cond = opJumpGT
-	case JumpLessThan:
-		cond, flip = opJumpGE, true
-	case JumpGreaterOrEqual:
-		cond = opJumpGE
-	case JumpLessOrEqual:
-		cond, flip = opJumpGT, true
-	case JumpBitsSet:
-		cond = opJumpSet
-	case JumpBitsNotSet:
-		cond, flip = opJumpSet, true
-	default:
-		return RawInstruction{}, fmt.Errorf("unknown JumpTest %v", a.Cond)
-	}
-	jt, jf := a.SkipTrue, a.SkipFalse
-	if flip {
-		jt, jf = jf, jt
-	}
-	return RawInstruction{
-		Op: opClsJump | cond,
-		Jt: jt,
-		Jf: jf,
-		K:  a.Val,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a JumpIf) String() string {
-	switch a.Cond {
-	// K == A
-	case JumpEqual:
-		return conditionalJump(a, "jeq", "jneq")
-	// K != A
-	case JumpNotEqual:
-		return fmt.Sprintf("jneq #%d,%d", a.Val, a.SkipTrue)
-	// K > A
-	case JumpGreaterThan:
-		return conditionalJump(a, "jgt", "jle")
-	// K < A
-	case JumpLessThan:
-		return fmt.Sprintf("jlt #%d,%d", a.Val, a.SkipTrue)
-	// K >= A
-	case JumpGreaterOrEqual:
-		return conditionalJump(a, "jge", "jlt")
-	// K <= A
-	case JumpLessOrEqual:
-		return fmt.Sprintf("jle #%d,%d", a.Val, a.SkipTrue)
-	// K & A != 0
-	case JumpBitsSet:
-		if a.SkipFalse > 0 {
-			return fmt.Sprintf("jset #%d,%d,%d", a.Val, a.SkipTrue, a.SkipFalse)
-		}
-		return fmt.Sprintf("jset #%d,%d", a.Val, a.SkipTrue)
-	// K & A == 0, there is no assembler instruction for JumpBitNotSet, use JumpBitSet and invert skips
-	case JumpBitsNotSet:
-		return JumpIf{Cond: JumpBitsSet, SkipTrue: a.SkipFalse, SkipFalse: a.SkipTrue, Val: a.Val}.String()
-	default:
-		return fmt.Sprintf("unknown instruction: %#v", a)
-	}
-}
-
-func conditionalJump(inst JumpIf, positiveJump, negativeJump string) string {
-	if inst.SkipTrue > 0 {
-		if inst.SkipFalse > 0 {
-			return fmt.Sprintf("%s #%d,%d,%d", positiveJump, inst.Val, inst.SkipTrue, inst.SkipFalse)
-		}
-		return fmt.Sprintf("%s #%d,%d", positiveJump, inst.Val, inst.SkipTrue)
-	}
-	return fmt.Sprintf("%s #%d,%d", negativeJump, inst.Val, inst.SkipFalse)
-}
-
-// RetA exits the BPF program, returning the value of register A.
-type RetA struct{}
-
-// Assemble implements the Instruction Assemble method.
-func (a RetA) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsReturn | opRetSrcA,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a RetA) String() string {
-	return fmt.Sprintf("ret a")
-}
-
-// RetConstant exits the BPF program, returning a constant value.
-type RetConstant struct {
-	Val uint32
-}
-
-// Assemble implements the Instruction Assemble method.
-func (a RetConstant) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsReturn | opRetSrcConstant,
-		K:  a.Val,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a RetConstant) String() string {
-	return fmt.Sprintf("ret #%d", a.Val)
-}
-
-// TXA copies the value of register X to register A.
-type TXA struct{}
-
-// Assemble implements the Instruction Assemble method.
-func (a TXA) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsMisc | opMiscTXA,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a TXA) String() string {
-	return fmt.Sprintf("txa")
-}
-
-// TAX copies the value of register A to register X.
-type TAX struct{}
-
-// Assemble implements the Instruction Assemble method.
-func (a TAX) Assemble() (RawInstruction, error) {
-	return RawInstruction{
-		Op: opClsMisc | opMiscTAX,
-	}, nil
-}
-
-// String returns the the instruction in assembler notation.
-func (a TAX) String() string {
-	return fmt.Sprintf("tax")
-}
-
-func assembleLoad(dst Register, loadSize int, mode uint16, k uint32) (RawInstruction, error) {
-	var (
-		cls uint16
-		sz  uint16
-	)
-	switch dst {
-	case RegA:
-		cls = opClsLoadA
-	case RegX:
-		cls = opClsLoadX
-	default:
-		return RawInstruction{}, fmt.Errorf("invalid target register %v", dst)
-	}
-	switch loadSize {
-	case 1:
-		sz = opLoadWidth1
-	case 2:
-		sz = opLoadWidth2
-	case 4:
-		sz = opLoadWidth4
-	default:
-		return RawInstruction{}, fmt.Errorf("invalid load byte length %d", sz)
-	}
-	return RawInstruction{
-		Op: cls | sz | mode,
-		K:  k,
-	}, nil
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/instructions_test.go b/installer/vendor/golang.org/x/net/bpf/instructions_test.go
deleted file mode 100644
index dde474aba6..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/instructions_test.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import (
-	"fmt"
-	"io/ioutil"
-	"reflect"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-// This is a direct translation of the program in
-// testdata/all_instructions.txt.
-var allInstructions = []Instruction{
-	LoadConstant{Dst: RegA, Val: 42},
-	LoadConstant{Dst: RegX, Val: 42},
-
-	LoadScratch{Dst: RegA, N: 3},
-	LoadScratch{Dst: RegX, N: 3},
-
-	LoadAbsolute{Off: 42, Size: 1},
-	LoadAbsolute{Off: 42, Size: 2},
-	LoadAbsolute{Off: 42, Size: 4},
-
-	LoadIndirect{Off: 42, Size: 1},
-	LoadIndirect{Off: 42, Size: 2},
-	LoadIndirect{Off: 42, Size: 4},
-
-	LoadMemShift{Off: 42},
-
-	LoadExtension{Num: ExtLen},
-	LoadExtension{Num: ExtProto},
-	LoadExtension{Num: ExtType},
-	LoadExtension{Num: ExtRand},
-
-	StoreScratch{Src: RegA, N: 3},
-	StoreScratch{Src: RegX, N: 3},
-
-	ALUOpConstant{Op: ALUOpAdd, Val: 42},
-	ALUOpConstant{Op: ALUOpSub, Val: 42},
-	ALUOpConstant{Op: ALUOpMul, Val: 42},
-	ALUOpConstant{Op: ALUOpDiv, Val: 42},
-	ALUOpConstant{Op: ALUOpOr, Val: 42},
-	ALUOpConstant{Op: ALUOpAnd, Val: 42},
-	ALUOpConstant{Op: ALUOpShiftLeft, Val: 42},
-	ALUOpConstant{Op: ALUOpShiftRight, Val: 42},
-	ALUOpConstant{Op: ALUOpMod, Val: 42},
-	ALUOpConstant{Op: ALUOpXor, Val: 42},
-
-	ALUOpX{Op: ALUOpAdd},
-	ALUOpX{Op: ALUOpSub},
-	ALUOpX{Op: ALUOpMul},
-	ALUOpX{Op: ALUOpDiv},
-	ALUOpX{Op: ALUOpOr},
-	ALUOpX{Op: ALUOpAnd},
-	ALUOpX{Op: ALUOpShiftLeft},
-	ALUOpX{Op: ALUOpShiftRight},
-	ALUOpX{Op: ALUOpMod},
-	ALUOpX{Op: ALUOpXor},
-
-	NegateA{},
-
-	Jump{Skip: 10},
-	JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8, SkipFalse: 9},
-	JumpIf{Cond: JumpNotEqual, Val: 42, SkipTrue: 8},
-	JumpIf{Cond: JumpLessThan, Val: 42, SkipTrue: 7},
-	JumpIf{Cond: JumpLessOrEqual, Val: 42, SkipTrue: 6},
-	JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4, SkipFalse: 5},
-	JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3, SkipFalse: 4},
-	JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-
-	TAX{},
-	TXA{},
-
-	RetA{},
-	RetConstant{Val: 42},
-}
-var allInstructionsExpected = "testdata/all_instructions.bpf"
-
-// Check that we produce the same output as the canonical bpf_asm
-// linux kernel tool.
-func TestInterop(t *testing.T) {
-	out, err := Assemble(allInstructions)
-	if err != nil {
-		t.Fatalf("assembly of allInstructions program failed: %s", err)
-	}
-	t.Logf("Assembled program is %d instructions long", len(out))
-
-	bs, err := ioutil.ReadFile(allInstructionsExpected)
-	if err != nil {
-		t.Fatalf("reading %s: %s", allInstructionsExpected, err)
-	}
-	// First statement is the number of statements, last statement is
-	// empty. We just ignore both and rely on slice length.
-	stmts := strings.Split(string(bs), ",")
-	if len(stmts)-2 != len(out) {
-		t.Fatalf("test program lengths don't match: %s has %d, Go implementation has %d", allInstructionsExpected, len(stmts)-2, len(allInstructions))
-	}
-
-	for i, stmt := range stmts[1 : len(stmts)-2] {
-		nums := strings.Split(stmt, " ")
-		if len(nums) != 4 {
-			t.Fatalf("malformed instruction %d in %s: %s", i+1, allInstructionsExpected, stmt)
-		}
-
-		actual := out[i]
-
-		op, err := strconv.ParseUint(nums[0], 10, 16)
-		if err != nil {
-			t.Fatalf("malformed opcode %s in instruction %d of %s", nums[0], i+1, allInstructionsExpected)
-		}
-		if actual.Op != uint16(op) {
-			t.Errorf("opcode mismatch on instruction %d (%#v): got 0x%02x, want 0x%02x", i+1, allInstructions[i], actual.Op, op)
-		}
-
-		jt, err := strconv.ParseUint(nums[1], 10, 8)
-		if err != nil {
-			t.Fatalf("malformed jt offset %s in instruction %d of %s", nums[1], i+1, allInstructionsExpected)
-		}
-		if actual.Jt != uint8(jt) {
-			t.Errorf("jt mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.Jt, jt)
-		}
-
-		jf, err := strconv.ParseUint(nums[2], 10, 8)
-		if err != nil {
-			t.Fatalf("malformed jf offset %s in instruction %d of %s", nums[2], i+1, allInstructionsExpected)
-		}
-		if actual.Jf != uint8(jf) {
-			t.Errorf("jf mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.Jf, jf)
-		}
-
-		k, err := strconv.ParseUint(nums[3], 10, 32)
-		if err != nil {
-			t.Fatalf("malformed constant %s in instruction %d of %s", nums[3], i+1, allInstructionsExpected)
-		}
-		if actual.K != uint32(k) {
-			t.Errorf("constant mismatch on instruction %d (%#v): got %d, want %d", i+1, allInstructions[i], actual.K, k)
-		}
-	}
-}
-
-// Check that assembly and disassembly match each other.
-func TestAsmDisasm(t *testing.T) {
-	prog1, err := Assemble(allInstructions)
-	if err != nil {
-		t.Fatalf("assembly of allInstructions program failed: %s", err)
-	}
-	t.Logf("Assembled program is %d instructions long", len(prog1))
-
-	got, allDecoded := Disassemble(prog1)
-	if !allDecoded {
-		t.Errorf("Disassemble(Assemble(allInstructions)) produced unrecognized instructions:")
-		for i, inst := range got {
-			if r, ok := inst.(RawInstruction); ok {
-				t.Logf("  insn %d, %#v --> %#v", i+1, allInstructions[i], r)
-			}
-		}
-	}
-
-	if len(allInstructions) != len(got) {
-		t.Fatalf("disassembly changed program size: %d insns before, %d insns after", len(allInstructions), len(got))
-	}
-	if !reflect.DeepEqual(allInstructions, got) {
-		t.Errorf("program mutated by disassembly:")
-		for i := range got {
-			if !reflect.DeepEqual(allInstructions[i], got[i]) {
-				t.Logf("  insn %d, s: %#v, p1: %#v, got: %#v", i+1, allInstructions[i], prog1[i], got[i])
-			}
-		}
-	}
-}
-
-type InvalidInstruction struct{}
-
-func (a InvalidInstruction) Assemble() (RawInstruction, error) {
-	return RawInstruction{}, fmt.Errorf("Invalid Instruction")
-}
-
-func (a InvalidInstruction) String() string {
-	return fmt.Sprintf("unknown instruction: %#v", a)
-}
-
-func TestString(t *testing.T) {
-	testCases := []struct {
-		instruction Instruction
-		assembler   string
-	}{
-		{
-			instruction: LoadConstant{Dst: RegA, Val: 42},
-			assembler:   "ld #42",
-		},
-		{
-			instruction: LoadConstant{Dst: RegX, Val: 42},
-			assembler:   "ldx #42",
-		},
-		{
-			instruction: LoadConstant{Dst: 0xffff, Val: 42},
-			assembler:   "unknown instruction: bpf.LoadConstant{Dst:0xffff, Val:0x2a}",
-		},
-		{
-			instruction: LoadScratch{Dst: RegA, N: 3},
-			assembler:   "ld M[3]",
-		},
-		{
-			instruction: LoadScratch{Dst: RegX, N: 3},
-			assembler:   "ldx M[3]",
-		},
-		{
-			instruction: LoadScratch{Dst: 0xffff, N: 3},
-			assembler:   "unknown instruction: bpf.LoadScratch{Dst:0xffff, N:3}",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 1},
-			assembler:   "ldb [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 2},
-			assembler:   "ldh [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: 4},
-			assembler:   "ld [42]",
-		},
-		{
-			instruction: LoadAbsolute{Off: 42, Size: -1},
-			assembler:   "unknown instruction: bpf.LoadAbsolute{Off:0x2a, Size:-1}",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 1},
-			assembler:   "ldb [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 2},
-			assembler:   "ldh [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: 4},
-			assembler:   "ld [x + 42]",
-		},
-		{
-			instruction: LoadIndirect{Off: 42, Size: -1},
-			assembler:   "unknown instruction: bpf.LoadIndirect{Off:0x2a, Size:-1}",
-		},
-		{
-			instruction: LoadMemShift{Off: 42},
-			assembler:   "ldx 4*([42]&0xf)",
-		},
-		{
-			instruction: LoadExtension{Num: ExtLen},
-			assembler:   "ld #len",
-		},
-		{
-			instruction: LoadExtension{Num: ExtProto},
-			assembler:   "ld #proto",
-		},
-		{
-			instruction: LoadExtension{Num: ExtType},
-			assembler:   "ld #type",
-		},
-		{
-			instruction: LoadExtension{Num: ExtPayloadOffset},
-			assembler:   "ld #poff",
-		},
-		{
-			instruction: LoadExtension{Num: ExtInterfaceIndex},
-			assembler:   "ld #ifidx",
-		},
-		{
-			instruction: LoadExtension{Num: ExtNetlinkAttr},
-			assembler:   "ld #nla",
-		},
-		{
-			instruction: LoadExtension{Num: ExtNetlinkAttrNested},
-			assembler:   "ld #nlan",
-		},
-		{
-			instruction: LoadExtension{Num: ExtMark},
-			assembler:   "ld #mark",
-		},
-		{
-			instruction: LoadExtension{Num: ExtQueue},
-			assembler:   "ld #queue",
-		},
-		{
-			instruction: LoadExtension{Num: ExtLinkLayerType},
-			assembler:   "ld #hatype",
-		},
-		{
-			instruction: LoadExtension{Num: ExtRXHash},
-			assembler:   "ld #rxhash",
-		},
-		{
-			instruction: LoadExtension{Num: ExtCPUID},
-			assembler:   "ld #cpu",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANTag},
-			assembler:   "ld #vlan_tci",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANTagPresent},
-			assembler:   "ld #vlan_avail",
-		},
-		{
-			instruction: LoadExtension{Num: ExtVLANProto},
-			assembler:   "ld #vlan_tpid",
-		},
-		{
-			instruction: LoadExtension{Num: ExtRand},
-			assembler:   "ld #rand",
-		},
-		{
-			instruction: LoadAbsolute{Off: 0xfffff038, Size: 4},
-			assembler:   "ld #rand",
-		},
-		{
-			instruction: LoadExtension{Num: 0xfff},
-			assembler:   "unknown instruction: bpf.LoadExtension{Num:4095}",
-		},
-		{
-			instruction: StoreScratch{Src: RegA, N: 3},
-			assembler:   "st M[3]",
-		},
-		{
-			instruction: StoreScratch{Src: RegX, N: 3},
-			assembler:   "stx M[3]",
-		},
-		{
-			instruction: StoreScratch{Src: 0xffff, N: 3},
-			assembler:   "unknown instruction: bpf.StoreScratch{Src:0xffff, N:3}",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpAdd, Val: 42},
-			assembler:   "add #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpSub, Val: 42},
-			assembler:   "sub #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpMul, Val: 42},
-			assembler:   "mul #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpDiv, Val: 42},
-			assembler:   "div #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpOr, Val: 42},
-			assembler:   "or #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpAnd, Val: 42},
-			assembler:   "and #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpShiftLeft, Val: 42},
-			assembler:   "lsh #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpShiftRight, Val: 42},
-			assembler:   "rsh #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpMod, Val: 42},
-			assembler:   "mod #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: ALUOpXor, Val: 42},
-			assembler:   "xor #42",
-		},
-		{
-			instruction: ALUOpConstant{Op: 0xffff, Val: 42},
-			assembler:   "unknown instruction: bpf.ALUOpConstant{Op:0xffff, Val:0x2a}",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpAdd},
-			assembler:   "add x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpSub},
-			assembler:   "sub x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpMul},
-			assembler:   "mul x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpDiv},
-			assembler:   "div x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpOr},
-			assembler:   "or x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpAnd},
-			assembler:   "and x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpShiftLeft},
-			assembler:   "lsh x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpShiftRight},
-			assembler:   "rsh x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpMod},
-			assembler:   "mod x",
-		},
-		{
-			instruction: ALUOpX{Op: ALUOpXor},
-			assembler:   "xor x",
-		},
-		{
-			instruction: ALUOpX{Op: 0xffff},
-			assembler:   "unknown instruction: bpf.ALUOpX{Op:0xffff}",
-		},
-		{
-			instruction: NegateA{},
-			assembler:   "neg",
-		},
-		{
-			instruction: Jump{Skip: 10},
-			assembler:   "ja 10",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8, SkipFalse: 9},
-			assembler:   "jeq #42,8,9",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipTrue: 8},
-			assembler:   "jeq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpEqual, Val: 42, SkipFalse: 8},
-			assembler:   "jneq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpNotEqual, Val: 42, SkipTrue: 8},
-			assembler:   "jneq #42,8",
-		},
-		{
-			instruction: JumpIf{Cond: JumpLessThan, Val: 42, SkipTrue: 7},
-			assembler:   "jlt #42,7",
-		},
-		{
-			instruction: JumpIf{Cond: JumpLessOrEqual, Val: 42, SkipTrue: 6},
-			assembler:   "jle #42,6",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4, SkipFalse: 5},
-			assembler:   "jgt #42,4,5",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterThan, Val: 42, SkipTrue: 4},
-			assembler:   "jgt #42,4",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3, SkipFalse: 4},
-			assembler:   "jge #42,3,4",
-		},
-		{
-			instruction: JumpIf{Cond: JumpGreaterOrEqual, Val: 42, SkipTrue: 3},
-			assembler:   "jge #42,3",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-			assembler:   "jset #42,2,3",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsSet, Val: 42, SkipTrue: 2},
-			assembler:   "jset #42,2",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsNotSet, Val: 42, SkipTrue: 2, SkipFalse: 3},
-			assembler:   "jset #42,3,2",
-		},
-		{
-			instruction: JumpIf{Cond: JumpBitsNotSet, Val: 42, SkipTrue: 2},
-			assembler:   "jset #42,0,2",
-		},
-		{
-			instruction: JumpIf{Cond: 0xffff, Val: 42, SkipTrue: 1, SkipFalse: 2},
-			assembler:   "unknown instruction: bpf.JumpIf{Cond:0xffff, Val:0x2a, SkipTrue:0x1, SkipFalse:0x2}",
-		},
-		{
-			instruction: TAX{},
-			assembler:   "tax",
-		},
-		{
-			instruction: TXA{},
-			assembler:   "txa",
-		},
-		{
-			instruction: RetA{},
-			assembler:   "ret a",
-		},
-		{
-			instruction: RetConstant{Val: 42},
-			assembler:   "ret #42",
-		},
-		// Invalid instruction
-		{
-			instruction: InvalidInstruction{},
-			assembler:   "unknown instruction: bpf.InvalidInstruction{}",
-		},
-	}
-
-	for _, testCase := range testCases {
-		if input, ok := testCase.instruction.(fmt.Stringer); ok {
-			got := input.String()
-			if got != testCase.assembler {
-				t.Errorf("String did not return expected assembler notation, expected: %s, got: %s", testCase.assembler, got)
-			}
-		} else {
-			t.Errorf("Instruction %#v is not a fmt.Stringer", testCase.instruction)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.bpf b/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.bpf
deleted file mode 100644
index f87144064b..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.bpf
+++ /dev/null
@@ -1 +0,0 @@
-50,0 0 0 42,1 0 0 42,96 0 0 3,97 0 0 3,48 0 0 42,40 0 0 42,32 0 0 42,80 0 0 42,72 0 0 42,64 0 0 42,177 0 0 42,128 0 0 0,32 0 0 4294963200,32 0 0 4294963204,32 0 0 4294963256,2 0 0 3,3 0 0 3,4 0 0 42,20 0 0 42,36 0 0 42,52 0 0 42,68 0 0 42,84 0 0 42,100 0 0 42,116 0 0 42,148 0 0 42,164 0 0 42,12 0 0 0,28 0 0 0,44 0 0 0,60 0 0 0,76 0 0 0,92 0 0 0,108 0 0 0,124 0 0 0,156 0 0 0,172 0 0 0,132 0 0 0,5 0 0 10,21 8 9 42,21 0 8 42,53 0 7 42,37 0 6 42,37 4 5 42,53 3 4 42,69 2 3 42,7 0 0 0,135 0 0 0,22 0 0 0,6 0 0 0,
diff --git a/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.txt b/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.txt
deleted file mode 100644
index 3045501553..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/testdata/all_instructions.txt
+++ /dev/null
@@ -1,79 +0,0 @@
-# This filter is compiled to all_instructions.bpf by the `bpf_asm`
-# tool, which can be found in the linux kernel source tree under
-# tools/net.
-
-# Load immediate
-ld #42
-ldx #42
-
-# Load scratch
-ld M[3]
-ldx M[3]
-
-# Load absolute
-ldb [42]
-ldh [42]
-ld [42]
-
-# Load indirect
-ldb [x + 42]
-ldh [x + 42]
-ld [x + 42]
-
-# Load IPv4 header length
-ldx 4*([42]&0xf)
-
-# Run extension function
-ld #len
-ld #proto
-ld #type
-ld #rand
-
-# Store scratch
-st M[3]
-stx M[3]
-
-# A <op> constant
-add #42
-sub #42
-mul #42
-div #42
-or #42
-and #42
-lsh #42
-rsh #42
-mod #42
-xor #42
-
-# A <op> X
-add x
-sub x
-mul x
-div x
-or x
-and x
-lsh x
-rsh x
-mod x
-xor x
-
-# !A
-neg
-
-# Jumps
-ja end
-jeq #42,prev,end
-jne #42,end
-jlt #42,end
-jle #42,end
-jgt #42,prev,end
-jge #42,prev,end
-jset #42,prev,end
-
-# Register transfers
-tax
-txa
-
-# Returns
-prev: ret a
-end: ret #42
diff --git a/installer/vendor/golang.org/x/net/bpf/vm.go b/installer/vendor/golang.org/x/net/bpf/vm.go
deleted file mode 100644
index 4c656f1e12..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import (
-	"errors"
-	"fmt"
-)
-
-// A VM is an emulated BPF virtual machine.
-type VM struct {
-	filter []Instruction
-}
-
-// NewVM returns a new VM using the input BPF program.
-func NewVM(filter []Instruction) (*VM, error) {
-	if len(filter) == 0 {
-		return nil, errors.New("one or more Instructions must be specified")
-	}
-
-	for i, ins := range filter {
-		check := len(filter) - (i + 1)
-		switch ins := ins.(type) {
-		// Check for out-of-bounds jumps in instructions
-		case Jump:
-			if check <= int(ins.Skip) {
-				return nil, fmt.Errorf("cannot jump %d instructions; jumping past program bounds", ins.Skip)
-			}
-		case JumpIf:
-			if check <= int(ins.SkipTrue) {
-				return nil, fmt.Errorf("cannot jump %d instructions in true case; jumping past program bounds", ins.SkipTrue)
-			}
-			if check <= int(ins.SkipFalse) {
-				return nil, fmt.Errorf("cannot jump %d instructions in false case; jumping past program bounds", ins.SkipFalse)
-			}
-		// Check for division or modulus by zero
-		case ALUOpConstant:
-			if ins.Val != 0 {
-				break
-			}
-
-			switch ins.Op {
-			case ALUOpDiv, ALUOpMod:
-				return nil, errors.New("cannot divide by zero using ALUOpConstant")
-			}
-		// Check for unknown extensions
-		case LoadExtension:
-			switch ins.Num {
-			case ExtLen:
-			default:
-				return nil, fmt.Errorf("extension %d not implemented", ins.Num)
-			}
-		}
-	}
-
-	// Make sure last instruction is a return instruction
-	switch filter[len(filter)-1].(type) {
-	case RetA, RetConstant:
-	default:
-		return nil, errors.New("BPF program must end with RetA or RetConstant")
-	}
-
-	// Though our VM works using disassembled instructions, we
-	// attempt to assemble the input filter anyway to ensure it is compatible
-	// with an operating system VM.
-	_, err := Assemble(filter)
-
-	return &VM{
-		filter: filter,
-	}, err
-}
-
-// Run runs the VM's BPF program against the input bytes.
-// Run returns the number of bytes accepted by the BPF program, and any errors
-// which occurred while processing the program.
-func (v *VM) Run(in []byte) (int, error) {
-	var (
-		// Registers of the virtual machine
-		regA       uint32
-		regX       uint32
-		regScratch [16]uint32
-
-		// OK is true if the program should continue processing the next
-		// instruction, or false if not, causing the loop to break
-		ok = true
-	)
-
-	// TODO(mdlayher): implement:
-	// - NegateA:
-	//   - would require a change from uint32 registers to int32
-	//     registers
-
-	// TODO(mdlayher): add interop tests that check signedness of ALU
-	// operations against kernel implementation, and make sure Go
-	// implementation matches behavior
-
-	for i := 0; i < len(v.filter) && ok; i++ {
-		ins := v.filter[i]
-
-		switch ins := ins.(type) {
-		case ALUOpConstant:
-			regA = aluOpConstant(ins, regA)
-		case ALUOpX:
-			regA, ok = aluOpX(ins, regA, regX)
-		case Jump:
-			i += int(ins.Skip)
-		case JumpIf:
-			jump := jumpIf(ins, regA)
-			i += jump
-		case LoadAbsolute:
-			regA, ok = loadAbsolute(ins, in)
-		case LoadConstant:
-			regA, regX = loadConstant(ins, regA, regX)
-		case LoadExtension:
-			regA = loadExtension(ins, in)
-		case LoadIndirect:
-			regA, ok = loadIndirect(ins, in, regX)
-		case LoadMemShift:
-			regX, ok = loadMemShift(ins, in)
-		case LoadScratch:
-			regA, regX = loadScratch(ins, regScratch, regA, regX)
-		case RetA:
-			return int(regA), nil
-		case RetConstant:
-			return int(ins.Val), nil
-		case StoreScratch:
-			regScratch = storeScratch(ins, regScratch, regA, regX)
-		case TAX:
-			regX = regA
-		case TXA:
-			regA = regX
-		default:
-			return 0, fmt.Errorf("unknown Instruction at index %d: %T", i, ins)
-		}
-	}
-
-	return 0, nil
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_aluop_test.go b/installer/vendor/golang.org/x/net/bpf/vm_aluop_test.go
deleted file mode 100644
index 16678244aa..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_aluop_test.go
+++ /dev/null
@@ -1,512 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMALUOpAdd(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAdd,
-			Val: 3,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		8, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 3, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpSub(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		bpf.ALUOpX{
-			Op: bpf.ALUOpSub,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpMul(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMul,
-			Val: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		6, 2, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpDiv(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpDiv,
-			Val: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		20, 2, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpDivByZeroALUOpConstant(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpDiv,
-			Val: 0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot divide by zero using ALUOpConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMALUOpDivByZeroALUOpX(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 0 into X
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		// Load byte 1 into A
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Attempt to perform 1/0
-		bpf.ALUOpX{
-			Op: bpf.ALUOpDiv,
-		},
-		// Return 4 bytes if program does not terminate
-		bpf.LoadConstant{
-			Val: 12,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpOr(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpOr,
-			Val: 0x01,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x00, 0x10, 0x03, 0x04,
-		0x05, 0x06, 0x07, 0x08,
-		0x09, 0xff,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 9, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpAnd(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAnd,
-			Val: 0x0019,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0xaa, 0x09,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpShiftLeft(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpShiftLeft,
-			Val: 0x01,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x02,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0xaa,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpShiftRight(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpShiftRight,
-			Val: 0x01,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x04,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x08, 0xff, 0xff,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpMod(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMod,
-			Val: 20,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		30, 0, 0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpModByZeroALUOpConstant(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpMod,
-			Val: 0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot divide by zero using ALUOpConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMALUOpModByZeroALUOpX(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 0 into X
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.TAX{},
-		// Load byte 1 into A
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Attempt to perform 1%0
-		bpf.ALUOpX{
-			Op: bpf.ALUOpMod,
-		},
-		// Return 4 bytes if program does not terminate
-		bpf.LoadConstant{
-			Val: 12,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 3, 4,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpXor(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpXor,
-			Val: 0x0a,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x01,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x0b, 0x00, 0x00, 0x00,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMALUOpUnknown(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.ALUOpConstant{
-			Op:  bpf.ALUOpAdd,
-			Val: 1,
-		},
-		// Verify that an unknown operation is a no-op
-		bpf.ALUOpConstant{
-			Op: 100,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      0x02,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_bpf_test.go b/installer/vendor/golang.org/x/net/bpf/vm_bpf_test.go
deleted file mode 100644
index 76dd970e63..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_bpf_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-// A virtualMachine is a BPF virtual machine which can process an
-// input packet against a BPF program and render a verdict.
-type virtualMachine interface {
-	Run(in []byte) (int, error)
-}
-
-// canUseOSVM indicates if the OS BPF VM is available on this platform.
-func canUseOSVM() bool {
-	// OS BPF VM can only be used on platforms where x/net/ipv4 supports
-	// attaching a BPF program to a socket.
-	switch runtime.GOOS {
-	case "linux":
-		return true
-	}
-
-	return false
-}
-
-// All BPF tests against both the Go VM and OS VM are assumed to
-// be used with a UDP socket. As a result, the entire contents
-// of a UDP datagram is sent through the BPF program, but only
-// the body after the UDP header will ever be returned in output.
-
-// testVM sets up a Go BPF VM, and if available, a native OS BPF VM
-// for integration testing.
-func testVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func(), error) {
-	goVM, err := bpf.NewVM(filter)
-	if err != nil {
-		// Some tests expect an error, so this error must be returned
-		// instead of fatally exiting the test
-		return nil, nil, err
-	}
-
-	mvm := &multiVirtualMachine{
-		goVM: goVM,
-
-		t: t,
-	}
-
-	// If available, add the OS VM for tests which verify that both the Go
-	// VM and OS VM have exactly the same output for the same input program
-	// and packet.
-	done := func() {}
-	if canUseOSVM() {
-		osVM, osVMDone := testOSVM(t, filter)
-		done = func() { osVMDone() }
-		mvm.osVM = osVM
-	}
-
-	return mvm, done, nil
-}
-
-// udpHeaderLen is the length of a UDP header.
-const udpHeaderLen = 8
-
-// A multiVirtualMachine is a virtualMachine which can call out to both the Go VM
-// and the native OS VM, if the OS VM is available.
-type multiVirtualMachine struct {
-	goVM virtualMachine
-	osVM virtualMachine
-
-	t *testing.T
-}
-
-func (mvm *multiVirtualMachine) Run(in []byte) (int, error) {
-	if len(in) < udpHeaderLen {
-		mvm.t.Fatalf("input must be at least length of UDP header (%d), got: %d",
-			udpHeaderLen, len(in))
-	}
-
-	// All tests have a UDP header as part of input, because the OS VM
-	// packets always will. For the Go VM, this output is trimmed before
-	// being sent back to tests.
-	goOut, goErr := mvm.goVM.Run(in)
-	if goOut >= udpHeaderLen {
-		goOut -= udpHeaderLen
-	}
-
-	// If Go output is larger than the size of the packet, packet filtering
-	// interop tests must trim the output bytes to the length of the packet.
-	// The BPF VM should not do this on its own, as other uses of it do
-	// not trim the output byte count.
-	trim := len(in) - udpHeaderLen
-	if goOut > trim {
-		goOut = trim
-	}
-
-	// When the OS VM is not available, process using the Go VM alone
-	if mvm.osVM == nil {
-		return goOut, goErr
-	}
-
-	// The OS VM will apply its own UDP header, so remove the pseudo header
-	// that the Go VM needs.
-	osOut, err := mvm.osVM.Run(in[udpHeaderLen:])
-	if err != nil {
-		mvm.t.Fatalf("error while running OS VM: %v", err)
-	}
-
-	// Verify both VMs return same number of bytes
-	var mismatch bool
-	if goOut != osOut {
-		mismatch = true
-		mvm.t.Logf("output byte count does not match:\n- go: %v\n- os: %v", goOut, osOut)
-	}
-
-	if mismatch {
-		mvm.t.Fatal("Go BPF and OS BPF packet outputs do not match")
-	}
-
-	return goOut, goErr
-}
-
-// An osVirtualMachine is a virtualMachine which uses the OS's BPF VM for
-// processing BPF programs.
-type osVirtualMachine struct {
-	l net.PacketConn
-	s net.Conn
-}
-
-// testOSVM creates a virtualMachine which uses the OS's BPF VM by injecting
-// packets into a UDP listener with a BPF program attached to it.
-func testOSVM(t *testing.T, filter []bpf.Instruction) (virtualMachine, func()) {
-	l, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("failed to open OS VM UDP listener: %v", err)
-	}
-
-	prog, err := bpf.Assemble(filter)
-	if err != nil {
-		t.Fatalf("failed to compile BPF program: %v", err)
-	}
-
-	p := ipv4.NewPacketConn(l)
-	if err = p.SetBPF(prog); err != nil {
-		if err.Error() == "operation not supported" { // TODO: gross. remove once 19051 fixed.
-			t.Skip("Skipping until Issue 19051 is fixed.")
-		}
-		t.Fatalf("failed to attach BPF program to listener: %v", err)
-	}
-
-	s, err := net.Dial("udp4", l.LocalAddr().String())
-	if err != nil {
-		t.Fatalf("failed to dial connection to listener: %v", err)
-	}
-
-	done := func() {
-		_ = s.Close()
-		_ = l.Close()
-	}
-
-	return &osVirtualMachine{
-		l: l,
-		s: s,
-	}, done
-}
-
-// Run sends the input bytes into the OS's BPF VM and returns its verdict.
-func (vm *osVirtualMachine) Run(in []byte) (int, error) {
-	go func() {
-		_, _ = vm.s.Write(in)
-	}()
-
-	vm.l.SetDeadline(time.Now().Add(50 * time.Millisecond))
-
-	var b [512]byte
-	n, _, err := vm.l.ReadFrom(b[:])
-	if err != nil {
-		// A timeout indicates that BPF filtered out the packet, and thus,
-		// no input should be returned.
-		if nerr, ok := err.(net.Error); ok && nerr.Timeout() {
-			return n, nil
-		}
-
-		return n, err
-	}
-
-	return n, nil
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_extension_test.go b/installer/vendor/golang.org/x/net/bpf/vm_extension_test.go
deleted file mode 100644
index 7a48c82f3c..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_extension_test.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMLoadExtensionNotImplemented(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadExtension{
-			Num: 100,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "extension 100 not implemented" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadExtensionExtLen(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadExtension{
-			Num: bpf.ExtLen,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_instructions.go b/installer/vendor/golang.org/x/net/bpf/vm_instructions.go
deleted file mode 100644
index 516f9462b9..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_instructions.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf
-
-import (
-	"encoding/binary"
-	"fmt"
-)
-
-func aluOpConstant(ins ALUOpConstant, regA uint32) uint32 {
-	return aluOpCommon(ins.Op, regA, ins.Val)
-}
-
-func aluOpX(ins ALUOpX, regA uint32, regX uint32) (uint32, bool) {
-	// Guard against division or modulus by zero by terminating
-	// the program, as the OS BPF VM does
-	if regX == 0 {
-		switch ins.Op {
-		case ALUOpDiv, ALUOpMod:
-			return 0, false
-		}
-	}
-
-	return aluOpCommon(ins.Op, regA, regX), true
-}
-
-func aluOpCommon(op ALUOp, regA uint32, value uint32) uint32 {
-	switch op {
-	case ALUOpAdd:
-		return regA + value
-	case ALUOpSub:
-		return regA - value
-	case ALUOpMul:
-		return regA * value
-	case ALUOpDiv:
-		// Division by zero not permitted by NewVM and aluOpX checks
-		return regA / value
-	case ALUOpOr:
-		return regA | value
-	case ALUOpAnd:
-		return regA & value
-	case ALUOpShiftLeft:
-		return regA << value
-	case ALUOpShiftRight:
-		return regA >> value
-	case ALUOpMod:
-		// Modulus by zero not permitted by NewVM and aluOpX checks
-		return regA % value
-	case ALUOpXor:
-		return regA ^ value
-	default:
-		return regA
-	}
-}
-
-func jumpIf(ins JumpIf, value uint32) int {
-	var ok bool
-	inV := uint32(ins.Val)
-
-	switch ins.Cond {
-	case JumpEqual:
-		ok = value == inV
-	case JumpNotEqual:
-		ok = value != inV
-	case JumpGreaterThan:
-		ok = value > inV
-	case JumpLessThan:
-		ok = value < inV
-	case JumpGreaterOrEqual:
-		ok = value >= inV
-	case JumpLessOrEqual:
-		ok = value <= inV
-	case JumpBitsSet:
-		ok = (value & inV) != 0
-	case JumpBitsNotSet:
-		ok = (value & inV) == 0
-	}
-
-	if ok {
-		return int(ins.SkipTrue)
-	}
-
-	return int(ins.SkipFalse)
-}
-
-func loadAbsolute(ins LoadAbsolute, in []byte) (uint32, bool) {
-	offset := int(ins.Off)
-	size := int(ins.Size)
-
-	return loadCommon(in, offset, size)
-}
-
-func loadConstant(ins LoadConstant, regA uint32, regX uint32) (uint32, uint32) {
-	switch ins.Dst {
-	case RegA:
-		regA = ins.Val
-	case RegX:
-		regX = ins.Val
-	}
-
-	return regA, regX
-}
-
-func loadExtension(ins LoadExtension, in []byte) uint32 {
-	switch ins.Num {
-	case ExtLen:
-		return uint32(len(in))
-	default:
-		panic(fmt.Sprintf("unimplemented extension: %d", ins.Num))
-	}
-}
-
-func loadIndirect(ins LoadIndirect, in []byte, regX uint32) (uint32, bool) {
-	offset := int(ins.Off) + int(regX)
-	size := int(ins.Size)
-
-	return loadCommon(in, offset, size)
-}
-
-func loadMemShift(ins LoadMemShift, in []byte) (uint32, bool) {
-	offset := int(ins.Off)
-
-	if !inBounds(len(in), offset, 0) {
-		return 0, false
-	}
-
-	// Mask off high 4 bits and multiply low 4 bits by 4
-	return uint32(in[offset]&0x0f) * 4, true
-}
-
-func inBounds(inLen int, offset int, size int) bool {
-	return offset+size <= inLen
-}
-
-func loadCommon(in []byte, offset int, size int) (uint32, bool) {
-	if !inBounds(len(in), offset, size) {
-		return 0, false
-	}
-
-	switch size {
-	case 1:
-		return uint32(in[offset]), true
-	case 2:
-		return uint32(binary.BigEndian.Uint16(in[offset : offset+size])), true
-	case 4:
-		return uint32(binary.BigEndian.Uint32(in[offset : offset+size])), true
-	default:
-		panic(fmt.Sprintf("invalid load size: %d", size))
-	}
-}
-
-func loadScratch(ins LoadScratch, regScratch [16]uint32, regA uint32, regX uint32) (uint32, uint32) {
-	switch ins.Dst {
-	case RegA:
-		regA = regScratch[ins.N]
-	case RegX:
-		regX = regScratch[ins.N]
-	}
-
-	return regA, regX
-}
-
-func storeScratch(ins StoreScratch, regScratch [16]uint32, regA uint32, regX uint32) [16]uint32 {
-	switch ins.Src {
-	case RegA:
-		regScratch[ins.N] = regA
-	case RegX:
-		regScratch[ins.N] = regX
-	}
-
-	return regScratch
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_jump_test.go b/installer/vendor/golang.org/x/net/bpf/vm_jump_test.go
deleted file mode 100644
index e0a3a988bf..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_jump_test.go
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMJumpOne(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.Jump{
-			Skip: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.Jump{
-			Skip: 1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 1 instructions; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfTrueOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			SkipTrue: 2,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 2 instructions in true case; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfFalseOutOfProgram(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.JumpIf{
-			Cond:      bpf.JumpEqual,
-			SkipFalse: 3,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "cannot jump 3 instructions in false case; jumping past program bounds" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMJumpIfEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      1,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfNotEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.JumpIf{
-			Cond:      bpf.JumpNotEqual,
-			Val:       1,
-			SkipFalse: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfGreaterThan(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpGreaterThan,
-			Val:      0x00010202,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfLessThan(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpLessThan,
-			Val:      0xff010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfGreaterOrEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpGreaterOrEqual,
-			Val:      0x00010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfLessOrEqual(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 4,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpLessOrEqual,
-			Val:      0xff010203,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 12,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 4, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfBitsSet(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpBitsSet,
-			Val:      0x1122,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0x02,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMJumpIfBitsNotSet(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.JumpIf{
-			Cond:     bpf.JumpBitsNotSet,
-			Val:      0x1221,
-			SkipTrue: 1,
-		},
-		bpf.RetConstant{
-			Val: 0,
-		},
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x01, 0x02,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_load_test.go b/installer/vendor/golang.org/x/net/bpf/vm_load_test.go
deleted file mode 100644
index 04578b66b4..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_load_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"net"
-	"testing"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-func TestVMLoadAbsoluteOffsetOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  100,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1, 2, 3,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadAbsoluteOffsetPlusSizeOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadAbsoluteBadInstructionSize(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Size: 5,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid load byte length 0" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadConstantOK(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegX,
-			Val: 9,
-		},
-		bpf.TXA{},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadIndirectOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadIndirect{
-			Off:  100,
-			Size: 1,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadMemShiftOutOfBounds(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadMemShift{
-			Off: 100,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-const (
-	dhcp4Port = 53
-)
-
-func TestVMLoadMemShiftLoadIndirectNoResult(t *testing.T) {
-	vm, in, done := testDHCPv4(t)
-	defer done()
-
-	// Append mostly empty UDP header with incorrect DHCPv4 port
-	in = append(in, []byte{
-		0, 0,
-		0, dhcp4Port + 1,
-		0, 0,
-		0, 0,
-	}...)
-
-	out, err := vm.Run(in)
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 0, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMLoadMemShiftLoadIndirectOK(t *testing.T) {
-	vm, in, done := testDHCPv4(t)
-	defer done()
-
-	// Append mostly empty UDP header with correct DHCPv4 port
-	in = append(in, []byte{
-		0, 0,
-		0, dhcp4Port,
-		0, 0,
-		0, 0,
-	}...)
-
-	out, err := vm.Run(in)
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := len(in)-8, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func testDHCPv4(t *testing.T) (virtualMachine, []byte, func()) {
-	// DHCPv4 test data courtesy of David Anderson:
-	// https://github.com/google/netboot/blob/master/dhcp4/conn_linux.go#L59-L70
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load IPv4 packet length
-		bpf.LoadMemShift{Off: 8},
-		// Get UDP dport
-		bpf.LoadIndirect{Off: 8 + 2, Size: 2},
-		// Correct dport?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: dhcp4Port, SkipFalse: 1},
-		// Accept
-		bpf.RetConstant{Val: 1500},
-		// Ignore
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-
-	// Minimal requirements to make a valid IPv4 header
-	h := &ipv4.Header{
-		Len: ipv4.HeaderLen,
-		Src: net.IPv4(192, 168, 1, 1),
-		Dst: net.IPv4(192, 168, 1, 2),
-	}
-	hb, err := h.Marshal()
-	if err != nil {
-		t.Fatalf("failed to marshal IPv4 header: %v", err)
-	}
-
-	hb = append([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-	}, hb...)
-
-	return vm, hb, done
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_ret_test.go b/installer/vendor/golang.org/x/net/bpf/vm_ret_test.go
deleted file mode 100644
index 2d86eae3e7..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_ret_test.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMRetA(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		9,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetALargerThanInput(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 2,
-		},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 255,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetConstant(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.RetConstant{
-			Val: 9,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 1, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMRetConstantLargerThanInput(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.RetConstant{
-			Val: 16,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_scratch_test.go b/installer/vendor/golang.org/x/net/bpf/vm_scratch_test.go
deleted file mode 100644
index e600e3c282..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_scratch_test.go
+++ /dev/null
@@ -1,247 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-func TestVMStoreScratchInvalidScratchRegisterTooSmall(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   -1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot -1" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchInvalidScratchRegisterTooLarge(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   16,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot 16" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchUnknownSourceRegister(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.StoreScratch{
-			Src: 100,
-			N:   0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid source register 100" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchInvalidScratchRegisterTooSmall(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   -1,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot -1" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchInvalidScratchRegisterTooLarge(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   16,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid scratch slot 16" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMLoadScratchUnknownDestinationRegister(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadScratch{
-			Dst: 100,
-			N:   0,
-		},
-		bpf.RetA{},
-	})
-	if errStr(err) != "assembling instruction 1: invalid target register 100" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMStoreScratchLoadScratchOneValue(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 255
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		// Copy to X and store in scratch[0]
-		bpf.TAX{},
-		bpf.StoreScratch{
-			Src: bpf.RegX,
-			N:   0,
-		},
-		// Load byte 1
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Overwrite 1 with 255 from scratch[0]
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   0,
-		},
-		// Return 255
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		255, 1, 2,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 3, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
-
-func TestVMStoreScratchLoadScratchMultipleValues(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		// Load byte 10
-		bpf.LoadAbsolute{
-			Off:  8,
-			Size: 1,
-		},
-		// Store in scratch[0]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   0,
-		},
-		// Load byte 20
-		bpf.LoadAbsolute{
-			Off:  9,
-			Size: 1,
-		},
-		// Store in scratch[1]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   1,
-		},
-		// Load byte 30
-		bpf.LoadAbsolute{
-			Off:  10,
-			Size: 1,
-		},
-		// Store in scratch[2]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   2,
-		},
-		// Load byte 1
-		bpf.LoadAbsolute{
-			Off:  11,
-			Size: 1,
-		},
-		// Store in scratch[3]
-		bpf.StoreScratch{
-			Src: bpf.RegA,
-			N:   3,
-		},
-		// Load in byte 10 to X
-		bpf.LoadScratch{
-			Dst: bpf.RegX,
-			N:   0,
-		},
-		// Copy X -> A
-		bpf.TXA{},
-		// Verify value is 10
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      10,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Load in byte 20 to A
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   1,
-		},
-		// Verify value is 20
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      20,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Load in byte 30 to A
-		bpf.LoadScratch{
-			Dst: bpf.RegA,
-			N:   2,
-		},
-		// Verify value is 30
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      30,
-			SkipTrue: 1,
-		},
-		// Fail test if incorrect
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// Return first two bytes on success
-		bpf.RetConstant{
-			Val: 10,
-		},
-	})
-	if err != nil {
-		t.Fatalf("failed to load BPF program: %v", err)
-	}
-	defer done()
-
-	out, err := vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		10, 20, 30, 1,
-	})
-	if err != nil {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-	if want, got := 2, out; want != got {
-		t.Fatalf("unexpected number of output bytes:\n- want: %d\n-  got: %d",
-			want, got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/bpf/vm_test.go b/installer/vendor/golang.org/x/net/bpf/vm_test.go
deleted file mode 100644
index 6bd4dd5c3a..0000000000
--- a/installer/vendor/golang.org/x/net/bpf/vm_test.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package bpf_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/net/bpf"
-)
-
-var _ bpf.Instruction = unknown{}
-
-type unknown struct{}
-
-func (unknown) Assemble() (bpf.RawInstruction, error) {
-	return bpf.RawInstruction{}, nil
-}
-
-func TestVMUnknownInstruction(t *testing.T) {
-	vm, done, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegA,
-			Val: 100,
-		},
-		// Should terminate the program with an error immediately
-		unknown{},
-		bpf.RetA{},
-	})
-	if err != nil {
-		t.Fatalf("unexpected error: %v", err)
-	}
-	defer done()
-
-	_, err = vm.Run([]byte{
-		0xff, 0xff, 0xff, 0xff,
-		0xff, 0xff, 0xff, 0xff,
-		0x00, 0x00,
-	})
-	if errStr(err) != "unknown Instruction at index 1: bpf_test.unknown" {
-		t.Fatalf("unexpected error while running program: %v", err)
-	}
-}
-
-func TestVMNoReturnInstruction(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{
-		bpf.LoadConstant{
-			Dst: bpf.RegA,
-			Val: 1,
-		},
-	})
-	if errStr(err) != "BPF program must end with RetA or RetConstant" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-func TestVMNoInputInstructions(t *testing.T) {
-	_, _, err := testVM(t, []bpf.Instruction{})
-	if errStr(err) != "one or more Instructions must be specified" {
-		t.Fatalf("unexpected error: %v", err)
-	}
-}
-
-// ExampleNewVM demonstrates usage of a VM, using an Ethernet frame
-// as input and checking its EtherType to determine if it should be accepted.
-func ExampleNewVM() {
-	// Offset | Length | Comment
-	// -------------------------
-	//   00   |   06   | Ethernet destination MAC address
-	//   06   |   06   | Ethernet source MAC address
-	//   12   |   02   | Ethernet EtherType
-	const (
-		etOff = 12
-		etLen = 2
-
-		etARP = 0x0806
-	)
-
-	// Set up a VM to filter traffic based on if its EtherType
-	// matches the ARP EtherType.
-	vm, err := bpf.NewVM([]bpf.Instruction{
-		// Load EtherType value from Ethernet header
-		bpf.LoadAbsolute{
-			Off:  etOff,
-			Size: etLen,
-		},
-		// If EtherType is equal to the ARP EtherType, jump to allow
-		// packet to be accepted
-		bpf.JumpIf{
-			Cond:     bpf.JumpEqual,
-			Val:      etARP,
-			SkipTrue: 1,
-		},
-		// EtherType does not match the ARP EtherType
-		bpf.RetConstant{
-			Val: 0,
-		},
-		// EtherType matches the ARP EtherType, accept up to 1500
-		// bytes of packet
-		bpf.RetConstant{
-			Val: 1500,
-		},
-	})
-	if err != nil {
-		panic(fmt.Sprintf("failed to load BPF program: %v", err))
-	}
-
-	// Create an Ethernet frame with the ARP EtherType for testing
-	frame := []byte{
-		0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		0x00, 0x11, 0x22, 0x33, 0x44, 0x55,
-		0x08, 0x06,
-		// Payload omitted for brevity
-	}
-
-	// Run our VM's BPF program using the Ethernet frame as input
-	out, err := vm.Run(frame)
-	if err != nil {
-		panic(fmt.Sprintf("failed to accept Ethernet frame: %v", err))
-	}
-
-	// BPF VM can return a byte count greater than the number of input
-	// bytes, so trim the output to match the input byte length
-	if out > len(frame) {
-		out = len(frame)
-	}
-
-	fmt.Printf("out: %d bytes", out)
-
-	// Output:
-	// out: 14 bytes
-}
-
-// errStr returns the string representation of an error, or
-// "<nil>" if it is nil.
-func errStr(err error) string {
-	if err == nil {
-		return "<nil>"
-	}
-
-	return err.Error()
-}
diff --git a/installer/vendor/golang.org/x/net/codereview.cfg b/installer/vendor/golang.org/x/net/codereview.cfg
deleted file mode 100644
index 3f8b14b64e..0000000000
--- a/installer/vendor/golang.org/x/net/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/installer/vendor/golang.org/x/net/context/context.go b/installer/vendor/golang.org/x/net/context/context.go
index f143ed6a1e..a3c021d3f8 100644
--- a/installer/vendor/golang.org/x/net/context/context.go
+++ b/installer/vendor/golang.org/x/net/context/context.go
@@ -5,6 +5,8 @@
 // Package context defines the Context type, which carries deadlines,
 // cancelation signals, and other request-scoped values across API boundaries
 // and between processes.
+// As of Go 1.7 this package is available in the standard library under the
+// name context.  https://golang.org/pkg/context.
 //
 // Incoming requests to a server should create a Context, and outgoing calls to
 // servers should accept a Context. The chain of function calls between must
@@ -36,103 +38,6 @@
 // Contexts.
 package context // import "golang.org/x/net/context"
 
-import "time"
-
-// A Context carries a deadline, a cancelation signal, and other values across
-// API boundaries.
-//
-// Context's methods may be called by multiple goroutines simultaneously.
-type Context interface {
-	// Deadline returns the time when work done on behalf of this context
-	// should be canceled. Deadline returns ok==false when no deadline is
-	// set. Successive calls to Deadline return the same results.
-	Deadline() (deadline time.Time, ok bool)
-
-	// Done returns a channel that's closed when work done on behalf of this
-	// context should be canceled. Done may return nil if this context can
-	// never be canceled. Successive calls to Done return the same value.
-	//
-	// WithCancel arranges for Done to be closed when cancel is called;
-	// WithDeadline arranges for Done to be closed when the deadline
-	// expires; WithTimeout arranges for Done to be closed when the timeout
-	// elapses.
-	//
-	// Done is provided for use in select statements:
-	//
-	//  // Stream generates values with DoSomething and sends them to out
-	//  // until DoSomething returns an error or ctx.Done is closed.
-	//  func Stream(ctx context.Context, out chan<- Value) error {
-	//  	for {
-	//  		v, err := DoSomething(ctx)
-	//  		if err != nil {
-	//  			return err
-	//  		}
-	//  		select {
-	//  		case <-ctx.Done():
-	//  			return ctx.Err()
-	//  		case out <- v:
-	//  		}
-	//  	}
-	//  }
-	//
-	// See http://blog.golang.org/pipelines for more examples of how to use
-	// a Done channel for cancelation.
-	Done() <-chan struct{}
-
-	// Err returns a non-nil error value after Done is closed. Err returns
-	// Canceled if the context was canceled or DeadlineExceeded if the
-	// context's deadline passed. No other values for Err are defined.
-	// After Done is closed, successive calls to Err return the same value.
-	Err() error
-
-	// Value returns the value associated with this context for key, or nil
-	// if no value is associated with key. Successive calls to Value with
-	// the same key returns the same result.
-	//
-	// Use context values only for request-scoped data that transits
-	// processes and API boundaries, not for passing optional parameters to
-	// functions.
-	//
-	// A key identifies a specific value in a Context. Functions that wish
-	// to store values in Context typically allocate a key in a global
-	// variable then use that key as the argument to context.WithValue and
-	// Context.Value. A key can be any type that supports equality;
-	// packages should define keys as an unexported type to avoid
-	// collisions.
-	//
-	// Packages that define a Context key should provide type-safe accessors
-	// for the values stores using that key:
-	//
-	// 	// Package user defines a User type that's stored in Contexts.
-	// 	package user
-	//
-	// 	import "golang.org/x/net/context"
-	//
-	// 	// User is the type of value stored in the Contexts.
-	// 	type User struct {...}
-	//
-	// 	// key is an unexported type for keys defined in this package.
-	// 	// This prevents collisions with keys defined in other packages.
-	// 	type key int
-	//
-	// 	// userKey is the key for user.User values in Contexts. It is
-	// 	// unexported; clients use user.NewContext and user.FromContext
-	// 	// instead of using this key directly.
-	// 	var userKey key = 0
-	//
-	// 	// NewContext returns a new Context that carries value u.
-	// 	func NewContext(ctx context.Context, u *User) context.Context {
-	// 		return context.WithValue(ctx, userKey, u)
-	// 	}
-	//
-	// 	// FromContext returns the User value stored in ctx, if any.
-	// 	func FromContext(ctx context.Context) (*User, bool) {
-	// 		u, ok := ctx.Value(userKey).(*User)
-	// 		return u, ok
-	// 	}
-	Value(key interface{}) interface{}
-}
-
 // Background returns a non-nil, empty Context. It is never canceled, has no
 // values, and has no deadline. It is typically used by the main function,
 // initialization, and tests, and as the top-level Context for incoming
@@ -149,8 +54,3 @@ func Background() Context {
 func TODO() Context {
 	return todo
 }
-
-// A CancelFunc tells an operation to abandon its work.
-// A CancelFunc does not wait for the work to stop.
-// After the first call, subsequent calls to a CancelFunc do nothing.
-type CancelFunc func()
diff --git a/installer/vendor/golang.org/x/net/context/context_test.go b/installer/vendor/golang.org/x/net/context/context_test.go
deleted file mode 100644
index 62844131bd..0000000000
--- a/installer/vendor/golang.org/x/net/context/context_test.go
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package context
-
-import (
-	"fmt"
-	"math/rand"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-// otherContext is a Context that's not one of the types defined in context.go.
-// This lets us test code paths that differ based on the underlying type of the
-// Context.
-type otherContext struct {
-	Context
-}
-
-func TestBackground(t *testing.T) {
-	c := Background()
-	if c == nil {
-		t.Fatalf("Background returned nil")
-	}
-	select {
-	case x := <-c.Done():
-		t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-	default:
-	}
-	if got, want := fmt.Sprint(c), "context.Background"; got != want {
-		t.Errorf("Background().String() = %q want %q", got, want)
-	}
-}
-
-func TestTODO(t *testing.T) {
-	c := TODO()
-	if c == nil {
-		t.Fatalf("TODO returned nil")
-	}
-	select {
-	case x := <-c.Done():
-		t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-	default:
-	}
-	if got, want := fmt.Sprint(c), "context.TODO"; got != want {
-		t.Errorf("TODO().String() = %q want %q", got, want)
-	}
-}
-
-func TestWithCancel(t *testing.T) {
-	c1, cancel := WithCancel(Background())
-
-	if got, want := fmt.Sprint(c1), "context.Background.WithCancel"; got != want {
-		t.Errorf("c1.String() = %q want %q", got, want)
-	}
-
-	o := otherContext{c1}
-	c2, _ := WithCancel(o)
-	contexts := []Context{c1, o, c2}
-
-	for i, c := range contexts {
-		if d := c.Done(); d == nil {
-			t.Errorf("c[%d].Done() == %v want non-nil", i, d)
-		}
-		if e := c.Err(); e != nil {
-			t.Errorf("c[%d].Err() == %v want nil", i, e)
-		}
-
-		select {
-		case x := <-c.Done():
-			t.Errorf("<-c.Done() == %v want nothing (it should block)", x)
-		default:
-		}
-	}
-
-	cancel()
-	time.Sleep(100 * time.Millisecond) // let cancelation propagate
-
-	for i, c := range contexts {
-		select {
-		case <-c.Done():
-		default:
-			t.Errorf("<-c[%d].Done() blocked, but shouldn't have", i)
-		}
-		if e := c.Err(); e != Canceled {
-			t.Errorf("c[%d].Err() == %v want %v", i, e, Canceled)
-		}
-	}
-}
-
-func TestParentFinishesChild(t *testing.T) {
-	// Context tree:
-	// parent -> cancelChild
-	// parent -> valueChild -> timerChild
-	parent, cancel := WithCancel(Background())
-	cancelChild, stop := WithCancel(parent)
-	defer stop()
-	valueChild := WithValue(parent, "key", "value")
-	timerChild, stop := WithTimeout(valueChild, 10000*time.Hour)
-	defer stop()
-
-	select {
-	case x := <-parent.Done():
-		t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-	case x := <-cancelChild.Done():
-		t.Errorf("<-cancelChild.Done() == %v want nothing (it should block)", x)
-	case x := <-timerChild.Done():
-		t.Errorf("<-timerChild.Done() == %v want nothing (it should block)", x)
-	case x := <-valueChild.Done():
-		t.Errorf("<-valueChild.Done() == %v want nothing (it should block)", x)
-	default:
-	}
-
-	// The parent's children should contain the two cancelable children.
-	pc := parent.(*cancelCtx)
-	cc := cancelChild.(*cancelCtx)
-	tc := timerChild.(*timerCtx)
-	pc.mu.Lock()
-	if len(pc.children) != 2 || !pc.children[cc] || !pc.children[tc] {
-		t.Errorf("bad linkage: pc.children = %v, want %v and %v",
-			pc.children, cc, tc)
-	}
-	pc.mu.Unlock()
-
-	if p, ok := parentCancelCtx(cc.Context); !ok || p != pc {
-		t.Errorf("bad linkage: parentCancelCtx(cancelChild.Context) = %v, %v want %v, true", p, ok, pc)
-	}
-	if p, ok := parentCancelCtx(tc.Context); !ok || p != pc {
-		t.Errorf("bad linkage: parentCancelCtx(timerChild.Context) = %v, %v want %v, true", p, ok, pc)
-	}
-
-	cancel()
-
-	pc.mu.Lock()
-	if len(pc.children) != 0 {
-		t.Errorf("pc.cancel didn't clear pc.children = %v", pc.children)
-	}
-	pc.mu.Unlock()
-
-	// parent and children should all be finished.
-	check := func(ctx Context, name string) {
-		select {
-		case <-ctx.Done():
-		default:
-			t.Errorf("<-%s.Done() blocked, but shouldn't have", name)
-		}
-		if e := ctx.Err(); e != Canceled {
-			t.Errorf("%s.Err() == %v want %v", name, e, Canceled)
-		}
-	}
-	check(parent, "parent")
-	check(cancelChild, "cancelChild")
-	check(valueChild, "valueChild")
-	check(timerChild, "timerChild")
-
-	// WithCancel should return a canceled context on a canceled parent.
-	precanceledChild := WithValue(parent, "key", "value")
-	select {
-	case <-precanceledChild.Done():
-	default:
-		t.Errorf("<-precanceledChild.Done() blocked, but shouldn't have")
-	}
-	if e := precanceledChild.Err(); e != Canceled {
-		t.Errorf("precanceledChild.Err() == %v want %v", e, Canceled)
-	}
-}
-
-func TestChildFinishesFirst(t *testing.T) {
-	cancelable, stop := WithCancel(Background())
-	defer stop()
-	for _, parent := range []Context{Background(), cancelable} {
-		child, cancel := WithCancel(parent)
-
-		select {
-		case x := <-parent.Done():
-			t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-		case x := <-child.Done():
-			t.Errorf("<-child.Done() == %v want nothing (it should block)", x)
-		default:
-		}
-
-		cc := child.(*cancelCtx)
-		pc, pcok := parent.(*cancelCtx) // pcok == false when parent == Background()
-		if p, ok := parentCancelCtx(cc.Context); ok != pcok || (ok && pc != p) {
-			t.Errorf("bad linkage: parentCancelCtx(cc.Context) = %v, %v want %v, %v", p, ok, pc, pcok)
-		}
-
-		if pcok {
-			pc.mu.Lock()
-			if len(pc.children) != 1 || !pc.children[cc] {
-				t.Errorf("bad linkage: pc.children = %v, cc = %v", pc.children, cc)
-			}
-			pc.mu.Unlock()
-		}
-
-		cancel()
-
-		if pcok {
-			pc.mu.Lock()
-			if len(pc.children) != 0 {
-				t.Errorf("child's cancel didn't remove self from pc.children = %v", pc.children)
-			}
-			pc.mu.Unlock()
-		}
-
-		// child should be finished.
-		select {
-		case <-child.Done():
-		default:
-			t.Errorf("<-child.Done() blocked, but shouldn't have")
-		}
-		if e := child.Err(); e != Canceled {
-			t.Errorf("child.Err() == %v want %v", e, Canceled)
-		}
-
-		// parent should not be finished.
-		select {
-		case x := <-parent.Done():
-			t.Errorf("<-parent.Done() == %v want nothing (it should block)", x)
-		default:
-		}
-		if e := parent.Err(); e != nil {
-			t.Errorf("parent.Err() == %v want nil", e)
-		}
-	}
-}
-
-func testDeadline(c Context, wait time.Duration, t *testing.T) {
-	select {
-	case <-time.After(wait):
-		t.Fatalf("context should have timed out")
-	case <-c.Done():
-	}
-	if e := c.Err(); e != DeadlineExceeded {
-		t.Errorf("c.Err() == %v want %v", e, DeadlineExceeded)
-	}
-}
-
-func TestDeadline(t *testing.T) {
-	t.Parallel()
-	const timeUnit = 500 * time.Millisecond
-	c, _ := WithDeadline(Background(), time.Now().Add(1*timeUnit))
-	if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
-		t.Errorf("c.String() = %q want prefix %q", got, prefix)
-	}
-	testDeadline(c, 2*timeUnit, t)
-
-	c, _ = WithDeadline(Background(), time.Now().Add(1*timeUnit))
-	o := otherContext{c}
-	testDeadline(o, 2*timeUnit, t)
-
-	c, _ = WithDeadline(Background(), time.Now().Add(1*timeUnit))
-	o = otherContext{c}
-	c, _ = WithDeadline(o, time.Now().Add(3*timeUnit))
-	testDeadline(c, 2*timeUnit, t)
-}
-
-func TestTimeout(t *testing.T) {
-	t.Parallel()
-	const timeUnit = 500 * time.Millisecond
-	c, _ := WithTimeout(Background(), 1*timeUnit)
-	if got, prefix := fmt.Sprint(c), "context.Background.WithDeadline("; !strings.HasPrefix(got, prefix) {
-		t.Errorf("c.String() = %q want prefix %q", got, prefix)
-	}
-	testDeadline(c, 2*timeUnit, t)
-
-	c, _ = WithTimeout(Background(), 1*timeUnit)
-	o := otherContext{c}
-	testDeadline(o, 2*timeUnit, t)
-
-	c, _ = WithTimeout(Background(), 1*timeUnit)
-	o = otherContext{c}
-	c, _ = WithTimeout(o, 3*timeUnit)
-	testDeadline(c, 2*timeUnit, t)
-}
-
-func TestCanceledTimeout(t *testing.T) {
-	t.Parallel()
-	const timeUnit = 500 * time.Millisecond
-	c, _ := WithTimeout(Background(), 2*timeUnit)
-	o := otherContext{c}
-	c, cancel := WithTimeout(o, 4*timeUnit)
-	cancel()
-	time.Sleep(1 * timeUnit) // let cancelation propagate
-	select {
-	case <-c.Done():
-	default:
-		t.Errorf("<-c.Done() blocked, but shouldn't have")
-	}
-	if e := c.Err(); e != Canceled {
-		t.Errorf("c.Err() == %v want %v", e, Canceled)
-	}
-}
-
-type key1 int
-type key2 int
-
-var k1 = key1(1)
-var k2 = key2(1) // same int as k1, different type
-var k3 = key2(3) // same type as k2, different int
-
-func TestValues(t *testing.T) {
-	check := func(c Context, nm, v1, v2, v3 string) {
-		if v, ok := c.Value(k1).(string); ok == (len(v1) == 0) || v != v1 {
-			t.Errorf(`%s.Value(k1).(string) = %q, %t want %q, %t`, nm, v, ok, v1, len(v1) != 0)
-		}
-		if v, ok := c.Value(k2).(string); ok == (len(v2) == 0) || v != v2 {
-			t.Errorf(`%s.Value(k2).(string) = %q, %t want %q, %t`, nm, v, ok, v2, len(v2) != 0)
-		}
-		if v, ok := c.Value(k3).(string); ok == (len(v3) == 0) || v != v3 {
-			t.Errorf(`%s.Value(k3).(string) = %q, %t want %q, %t`, nm, v, ok, v3, len(v3) != 0)
-		}
-	}
-
-	c0 := Background()
-	check(c0, "c0", "", "", "")
-
-	c1 := WithValue(Background(), k1, "c1k1")
-	check(c1, "c1", "c1k1", "", "")
-
-	if got, want := fmt.Sprint(c1), `context.Background.WithValue(1, "c1k1")`; got != want {
-		t.Errorf("c.String() = %q want %q", got, want)
-	}
-
-	c2 := WithValue(c1, k2, "c2k2")
-	check(c2, "c2", "c1k1", "c2k2", "")
-
-	c3 := WithValue(c2, k3, "c3k3")
-	check(c3, "c2", "c1k1", "c2k2", "c3k3")
-
-	c4 := WithValue(c3, k1, nil)
-	check(c4, "c4", "", "c2k2", "c3k3")
-
-	o0 := otherContext{Background()}
-	check(o0, "o0", "", "", "")
-
-	o1 := otherContext{WithValue(Background(), k1, "c1k1")}
-	check(o1, "o1", "c1k1", "", "")
-
-	o2 := WithValue(o1, k2, "o2k2")
-	check(o2, "o2", "c1k1", "o2k2", "")
-
-	o3 := otherContext{c4}
-	check(o3, "o3", "", "c2k2", "c3k3")
-
-	o4 := WithValue(o3, k3, nil)
-	check(o4, "o4", "", "c2k2", "")
-}
-
-func TestAllocs(t *testing.T) {
-	bg := Background()
-	for _, test := range []struct {
-		desc       string
-		f          func()
-		limit      float64
-		gccgoLimit float64
-	}{
-		{
-			desc:       "Background()",
-			f:          func() { Background() },
-			limit:      0,
-			gccgoLimit: 0,
-		},
-		{
-			desc: fmt.Sprintf("WithValue(bg, %v, nil)", k1),
-			f: func() {
-				c := WithValue(bg, k1, nil)
-				c.Value(k1)
-			},
-			limit:      3,
-			gccgoLimit: 3,
-		},
-		{
-			desc: "WithTimeout(bg, 15*time.Millisecond)",
-			f: func() {
-				c, _ := WithTimeout(bg, 15*time.Millisecond)
-				<-c.Done()
-			},
-			limit:      8,
-			gccgoLimit: 16,
-		},
-		{
-			desc: "WithCancel(bg)",
-			f: func() {
-				c, cancel := WithCancel(bg)
-				cancel()
-				<-c.Done()
-			},
-			limit:      5,
-			gccgoLimit: 8,
-		},
-		{
-			desc: "WithTimeout(bg, 100*time.Millisecond)",
-			f: func() {
-				c, cancel := WithTimeout(bg, 100*time.Millisecond)
-				cancel()
-				<-c.Done()
-			},
-			limit:      8,
-			gccgoLimit: 25,
-		},
-	} {
-		limit := test.limit
-		if runtime.Compiler == "gccgo" {
-			// gccgo does not yet do escape analysis.
-			// TODO(iant): Remove this when gccgo does do escape analysis.
-			limit = test.gccgoLimit
-		}
-		if n := testing.AllocsPerRun(100, test.f); n > limit {
-			t.Errorf("%s allocs = %f want %d", test.desc, n, int(limit))
-		}
-	}
-}
-
-func TestSimultaneousCancels(t *testing.T) {
-	root, cancel := WithCancel(Background())
-	m := map[Context]CancelFunc{root: cancel}
-	q := []Context{root}
-	// Create a tree of contexts.
-	for len(q) != 0 && len(m) < 100 {
-		parent := q[0]
-		q = q[1:]
-		for i := 0; i < 4; i++ {
-			ctx, cancel := WithCancel(parent)
-			m[ctx] = cancel
-			q = append(q, ctx)
-		}
-	}
-	// Start all the cancels in a random order.
-	var wg sync.WaitGroup
-	wg.Add(len(m))
-	for _, cancel := range m {
-		go func(cancel CancelFunc) {
-			cancel()
-			wg.Done()
-		}(cancel)
-	}
-	// Wait on all the contexts in a random order.
-	for ctx := range m {
-		select {
-		case <-ctx.Done():
-		case <-time.After(1 * time.Second):
-			buf := make([]byte, 10<<10)
-			n := runtime.Stack(buf, true)
-			t.Fatalf("timed out waiting for <-ctx.Done(); stacks:\n%s", buf[:n])
-		}
-	}
-	// Wait for all the cancel functions to return.
-	done := make(chan struct{})
-	go func() {
-		wg.Wait()
-		close(done)
-	}()
-	select {
-	case <-done:
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for cancel functions; stacks:\n%s", buf[:n])
-	}
-}
-
-func TestInterlockedCancels(t *testing.T) {
-	parent, cancelParent := WithCancel(Background())
-	child, cancelChild := WithCancel(parent)
-	go func() {
-		parent.Done()
-		cancelChild()
-	}()
-	cancelParent()
-	select {
-	case <-child.Done():
-	case <-time.After(1 * time.Second):
-		buf := make([]byte, 10<<10)
-		n := runtime.Stack(buf, true)
-		t.Fatalf("timed out waiting for child.Done(); stacks:\n%s", buf[:n])
-	}
-}
-
-func TestLayersCancel(t *testing.T) {
-	testLayers(t, time.Now().UnixNano(), false)
-}
-
-func TestLayersTimeout(t *testing.T) {
-	testLayers(t, time.Now().UnixNano(), true)
-}
-
-func testLayers(t *testing.T, seed int64, testTimeout bool) {
-	rand.Seed(seed)
-	errorf := func(format string, a ...interface{}) {
-		t.Errorf(fmt.Sprintf("seed=%d: %s", seed, format), a...)
-	}
-	const (
-		timeout   = 200 * time.Millisecond
-		minLayers = 30
-	)
-	type value int
-	var (
-		vals      []*value
-		cancels   []CancelFunc
-		numTimers int
-		ctx       = Background()
-	)
-	for i := 0; i < minLayers || numTimers == 0 || len(cancels) == 0 || len(vals) == 0; i++ {
-		switch rand.Intn(3) {
-		case 0:
-			v := new(value)
-			ctx = WithValue(ctx, v, v)
-			vals = append(vals, v)
-		case 1:
-			var cancel CancelFunc
-			ctx, cancel = WithCancel(ctx)
-			cancels = append(cancels, cancel)
-		case 2:
-			var cancel CancelFunc
-			ctx, cancel = WithTimeout(ctx, timeout)
-			cancels = append(cancels, cancel)
-			numTimers++
-		}
-	}
-	checkValues := func(when string) {
-		for _, key := range vals {
-			if val := ctx.Value(key).(*value); key != val {
-				errorf("%s: ctx.Value(%p) = %p want %p", when, key, val, key)
-			}
-		}
-	}
-	select {
-	case <-ctx.Done():
-		errorf("ctx should not be canceled yet")
-	default:
-	}
-	if s, prefix := fmt.Sprint(ctx), "context.Background."; !strings.HasPrefix(s, prefix) {
-		t.Errorf("ctx.String() = %q want prefix %q", s, prefix)
-	}
-	t.Log(ctx)
-	checkValues("before cancel")
-	if testTimeout {
-		select {
-		case <-ctx.Done():
-		case <-time.After(timeout + 100*time.Millisecond):
-			errorf("ctx should have timed out")
-		}
-		checkValues("after timeout")
-	} else {
-		cancel := cancels[rand.Intn(len(cancels))]
-		cancel()
-		select {
-		case <-ctx.Done():
-		default:
-			errorf("ctx should be canceled")
-		}
-		checkValues("after cancel")
-	}
-}
-
-func TestCancelRemoves(t *testing.T) {
-	checkChildren := func(when string, ctx Context, want int) {
-		if got := len(ctx.(*cancelCtx).children); got != want {
-			t.Errorf("%s: context has %d children, want %d", when, got, want)
-		}
-	}
-
-	ctx, _ := WithCancel(Background())
-	checkChildren("after creation", ctx, 0)
-	_, cancel := WithCancel(ctx)
-	checkChildren("with WithCancel child ", ctx, 1)
-	cancel()
-	checkChildren("after cancelling WithCancel child", ctx, 0)
-
-	ctx, _ = WithCancel(Background())
-	checkChildren("after creation", ctx, 0)
-	_, cancel = WithTimeout(ctx, 60*time.Minute)
-	checkChildren("with WithTimeout child ", ctx, 1)
-	cancel()
-	checkChildren("after cancelling WithTimeout child", ctx, 0)
-}
diff --git a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_17_test.go b/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_17_test.go
deleted file mode 100644
index 72411b1b67..0000000000
--- a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_17_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9,go1.7
-
-package ctxhttp
-
-import (
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-
-	"context"
-)
-
-func TestGo17Context(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, "ok")
-	}))
-	defer ts.Close()
-	ctx := context.Background()
-	resp, err := Get(ctx, http.DefaultClient, ts.URL)
-	if resp == nil || err != nil {
-		t.Fatalf("error received from client: %v %v", err, resp)
-	}
-	resp.Body.Close()
-}
diff --git a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17_test.go b/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17_test.go
deleted file mode 100644
index 9159cf0225..0000000000
--- a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_pre17_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9,!go1.7
-
-package ctxhttp
-
-import (
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"sync"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-// golang.org/issue/14065
-func TestClosesResponseBodyOnCancel(t *testing.T) {
-	defer func() { testHookContextDoneBeforeHeaders = nop }()
-	defer func() { testHookDoReturned = nop }()
-	defer func() { testHookDidBodyClose = nop }()
-
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {}))
-	defer ts.Close()
-
-	ctx, cancel := context.WithCancel(context.Background())
-
-	// closed when Do enters select case <-ctx.Done()
-	enteredDonePath := make(chan struct{})
-
-	testHookContextDoneBeforeHeaders = func() {
-		close(enteredDonePath)
-	}
-
-	testHookDoReturned = func() {
-		// We now have the result (the Flush'd headers) at least,
-		// so we can cancel the request.
-		cancel()
-
-		// But block the client.Do goroutine from sending
-		// until Do enters into the <-ctx.Done() path, since
-		// otherwise if both channels are readable, select
-		// picks a random one.
-		<-enteredDonePath
-	}
-
-	sawBodyClose := make(chan struct{})
-	testHookDidBodyClose = func() { close(sawBodyClose) }
-
-	tr := &http.Transport{}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-	req, _ := http.NewRequest("GET", ts.URL, nil)
-	_, doErr := Do(ctx, c, req)
-
-	select {
-	case <-sawBodyClose:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for body to close")
-	}
-
-	if doErr != ctx.Err() {
-		t.Errorf("Do error = %v; want %v", doErr, ctx.Err())
-	}
-}
-
-type noteCloseConn struct {
-	net.Conn
-	onceClose sync.Once
-	closefn   func()
-}
-
-func (c *noteCloseConn) Close() error {
-	c.onceClose.Do(c.closefn)
-	return c.Conn.Close()
-}
diff --git a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go b/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
deleted file mode 100644
index 1e4155180c..0000000000
--- a/installer/vendor/golang.org/x/net/context/ctxhttp/ctxhttp_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9
-
-package ctxhttp
-
-import (
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-const (
-	requestDuration = 100 * time.Millisecond
-	requestBody     = "ok"
-)
-
-func okHandler(w http.ResponseWriter, r *http.Request) {
-	time.Sleep(requestDuration)
-	io.WriteString(w, requestBody)
-}
-
-func TestNoTimeout(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(okHandler))
-	defer ts.Close()
-
-	ctx := context.Background()
-	res, err := Get(ctx, nil, ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(slurp) != requestBody {
-		t.Errorf("body = %q; want %q", slurp, requestBody)
-	}
-}
-
-func TestCancelBeforeHeaders(t *testing.T) {
-	ctx, cancel := context.WithCancel(context.Background())
-
-	blockServer := make(chan struct{})
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		cancel()
-		<-blockServer
-		io.WriteString(w, requestBody)
-	}))
-	defer ts.Close()
-	defer close(blockServer)
-
-	res, err := Get(ctx, nil, ts.URL)
-	if err == nil {
-		res.Body.Close()
-		t.Fatal("Get returned unexpected nil error")
-	}
-	if err != context.Canceled {
-		t.Errorf("err = %v; want %v", err, context.Canceled)
-	}
-}
-
-func TestCancelAfterHangingRequest(t *testing.T) {
-	ts := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(http.StatusOK)
-		w.(http.Flusher).Flush()
-		<-w.(http.CloseNotifier).CloseNotify()
-	}))
-	defer ts.Close()
-
-	ctx, cancel := context.WithCancel(context.Background())
-	resp, err := Get(ctx, nil, ts.URL)
-	if err != nil {
-		t.Fatalf("unexpected error in Get: %v", err)
-	}
-
-	// Cancel befer reading the body.
-	// Reading Request.Body should fail, since the request was
-	// canceled before anything was written.
-	cancel()
-
-	done := make(chan struct{})
-
-	go func() {
-		b, err := ioutil.ReadAll(resp.Body)
-		if len(b) != 0 || err == nil {
-			t.Errorf(`Read got (%q, %v); want ("", error)`, b, err)
-		}
-		close(done)
-	}()
-
-	select {
-	case <-time.After(1 * time.Second):
-		t.Errorf("Test timed out")
-	case <-done:
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/context/go19.go b/installer/vendor/golang.org/x/net/context/go19.go
new file mode 100644
index 0000000000..d88bd1db12
--- /dev/null
+++ b/installer/vendor/golang.org/x/net/context/go19.go
@@ -0,0 +1,20 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build go1.9
+
+package context
+
+import "context" // standard library's context, as of Go 1.7
+
+// A Context carries a deadline, a cancelation signal, and other values across
+// API boundaries.
+//
+// Context's methods may be called by multiple goroutines simultaneously.
+type Context = context.Context
+
+// A CancelFunc tells an operation to abandon its work.
+// A CancelFunc does not wait for the work to stop.
+// After the first call, subsequent calls to a CancelFunc do nothing.
+type CancelFunc = context.CancelFunc
diff --git a/installer/vendor/golang.org/x/net/context/pre_go19.go b/installer/vendor/golang.org/x/net/context/pre_go19.go
new file mode 100644
index 0000000000..b105f80be4
--- /dev/null
+++ b/installer/vendor/golang.org/x/net/context/pre_go19.go
@@ -0,0 +1,109 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !go1.9
+
+package context
+
+import "time"
+
+// A Context carries a deadline, a cancelation signal, and other values across
+// API boundaries.
+//
+// Context's methods may be called by multiple goroutines simultaneously.
+type Context interface {
+	// Deadline returns the time when work done on behalf of this context
+	// should be canceled. Deadline returns ok==false when no deadline is
+	// set. Successive calls to Deadline return the same results.
+	Deadline() (deadline time.Time, ok bool)
+
+	// Done returns a channel that's closed when work done on behalf of this
+	// context should be canceled. Done may return nil if this context can
+	// never be canceled. Successive calls to Done return the same value.
+	//
+	// WithCancel arranges for Done to be closed when cancel is called;
+	// WithDeadline arranges for Done to be closed when the deadline
+	// expires; WithTimeout arranges for Done to be closed when the timeout
+	// elapses.
+	//
+	// Done is provided for use in select statements:
+	//
+	//  // Stream generates values with DoSomething and sends them to out
+	//  // until DoSomething returns an error or ctx.Done is closed.
+	//  func Stream(ctx context.Context, out chan<- Value) error {
+	//  	for {
+	//  		v, err := DoSomething(ctx)
+	//  		if err != nil {
+	//  			return err
+	//  		}
+	//  		select {
+	//  		case <-ctx.Done():
+	//  			return ctx.Err()
+	//  		case out <- v:
+	//  		}
+	//  	}
+	//  }
+	//
+	// See http://blog.golang.org/pipelines for more examples of how to use
+	// a Done channel for cancelation.
+	Done() <-chan struct{}
+
+	// Err returns a non-nil error value after Done is closed. Err returns
+	// Canceled if the context was canceled or DeadlineExceeded if the
+	// context's deadline passed. No other values for Err are defined.
+	// After Done is closed, successive calls to Err return the same value.
+	Err() error
+
+	// Value returns the value associated with this context for key, or nil
+	// if no value is associated with key. Successive calls to Value with
+	// the same key returns the same result.
+	//
+	// Use context values only for request-scoped data that transits
+	// processes and API boundaries, not for passing optional parameters to
+	// functions.
+	//
+	// A key identifies a specific value in a Context. Functions that wish
+	// to store values in Context typically allocate a key in a global
+	// variable then use that key as the argument to context.WithValue and
+	// Context.Value. A key can be any type that supports equality;
+	// packages should define keys as an unexported type to avoid
+	// collisions.
+	//
+	// Packages that define a Context key should provide type-safe accessors
+	// for the values stores using that key:
+	//
+	// 	// Package user defines a User type that's stored in Contexts.
+	// 	package user
+	//
+	// 	import "golang.org/x/net/context"
+	//
+	// 	// User is the type of value stored in the Contexts.
+	// 	type User struct {...}
+	//
+	// 	// key is an unexported type for keys defined in this package.
+	// 	// This prevents collisions with keys defined in other packages.
+	// 	type key int
+	//
+	// 	// userKey is the key for user.User values in Contexts. It is
+	// 	// unexported; clients use user.NewContext and user.FromContext
+	// 	// instead of using this key directly.
+	// 	var userKey key = 0
+	//
+	// 	// NewContext returns a new Context that carries value u.
+	// 	func NewContext(ctx context.Context, u *User) context.Context {
+	// 		return context.WithValue(ctx, userKey, u)
+	// 	}
+	//
+	// 	// FromContext returns the User value stored in ctx, if any.
+	// 	func FromContext(ctx context.Context) (*User, bool) {
+	// 		u, ok := ctx.Value(userKey).(*User)
+	// 		return u, ok
+	// 	}
+	Value(key interface{}) interface{}
+}
+
+// A CancelFunc tells an operation to abandon its work.
+// A CancelFunc does not wait for the work to stop.
+// After the first call, subsequent calls to a CancelFunc do nothing.
+type CancelFunc func()
diff --git a/installer/vendor/golang.org/x/net/context/withtimeout_test.go b/installer/vendor/golang.org/x/net/context/withtimeout_test.go
deleted file mode 100644
index a6754dc368..0000000000
--- a/installer/vendor/golang.org/x/net/context/withtimeout_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package context_test
-
-import (
-	"fmt"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-func ExampleWithTimeout() {
-	// Pass a context with a timeout to tell a blocking function that it
-	// should abandon its work after the timeout elapses.
-	ctx, _ := context.WithTimeout(context.Background(), 100*time.Millisecond)
-	select {
-	case <-time.After(200 * time.Millisecond):
-		fmt.Println("overslept")
-	case <-ctx.Done():
-		fmt.Println(ctx.Err()) // prints "context deadline exceeded"
-	}
-	// Output:
-	// context deadline exceeded
-}
diff --git a/installer/vendor/golang.org/x/net/dict/dict.go b/installer/vendor/golang.org/x/net/dict/dict.go
deleted file mode 100644
index 93e65c03cf..0000000000
--- a/installer/vendor/golang.org/x/net/dict/dict.go
+++ /dev/null
@@ -1,210 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package dict implements the Dictionary Server Protocol
-// as defined in RFC 2229.
-package dict // import "golang.org/x/net/dict"
-
-import (
-	"net/textproto"
-	"strconv"
-	"strings"
-)
-
-// A Client represents a client connection to a dictionary server.
-type Client struct {
-	text *textproto.Conn
-}
-
-// Dial returns a new client connected to a dictionary server at
-// addr on the given network.
-func Dial(network, addr string) (*Client, error) {
-	text, err := textproto.Dial(network, addr)
-	if err != nil {
-		return nil, err
-	}
-	_, _, err = text.ReadCodeLine(220)
-	if err != nil {
-		text.Close()
-		return nil, err
-	}
-	return &Client{text: text}, nil
-}
-
-// Close closes the connection to the dictionary server.
-func (c *Client) Close() error {
-	return c.text.Close()
-}
-
-// A Dict represents a dictionary available on the server.
-type Dict struct {
-	Name string // short name of dictionary
-	Desc string // long description
-}
-
-// Dicts returns a list of the dictionaries available on the server.
-func (c *Client) Dicts() ([]Dict, error) {
-	id, err := c.text.Cmd("SHOW DB")
-	if err != nil {
-		return nil, err
-	}
-
-	c.text.StartResponse(id)
-	defer c.text.EndResponse(id)
-
-	_, _, err = c.text.ReadCodeLine(110)
-	if err != nil {
-		return nil, err
-	}
-	lines, err := c.text.ReadDotLines()
-	if err != nil {
-		return nil, err
-	}
-	_, _, err = c.text.ReadCodeLine(250)
-
-	dicts := make([]Dict, len(lines))
-	for i := range dicts {
-		d := &dicts[i]
-		a, _ := fields(lines[i])
-		if len(a) < 2 {
-			return nil, textproto.ProtocolError("invalid dictionary: " + lines[i])
-		}
-		d.Name = a[0]
-		d.Desc = a[1]
-	}
-	return dicts, err
-}
-
-// A Defn represents a definition.
-type Defn struct {
-	Dict Dict   // Dict where definition was found
-	Word string // Word being defined
-	Text []byte // Definition text, typically multiple lines
-}
-
-// Define requests the definition of the given word.
-// The argument dict names the dictionary to use,
-// the Name field of a Dict returned by Dicts.
-//
-// The special dictionary name "*" means to look in all the
-// server's dictionaries.
-// The special dictionary name "!" means to look in all the
-// server's dictionaries in turn, stopping after finding the word
-// in one of them.
-func (c *Client) Define(dict, word string) ([]*Defn, error) {
-	id, err := c.text.Cmd("DEFINE %s %q", dict, word)
-	if err != nil {
-		return nil, err
-	}
-
-	c.text.StartResponse(id)
-	defer c.text.EndResponse(id)
-
-	_, line, err := c.text.ReadCodeLine(150)
-	if err != nil {
-		return nil, err
-	}
-	a, _ := fields(line)
-	if len(a) < 1 {
-		return nil, textproto.ProtocolError("malformed response: " + line)
-	}
-	n, err := strconv.Atoi(a[0])
-	if err != nil {
-		return nil, textproto.ProtocolError("invalid definition count: " + a[0])
-	}
-	def := make([]*Defn, n)
-	for i := 0; i < n; i++ {
-		_, line, err = c.text.ReadCodeLine(151)
-		if err != nil {
-			return nil, err
-		}
-		a, _ := fields(line)
-		if len(a) < 3 {
-			// skip it, to keep protocol in sync
-			i--
-			n--
-			def = def[0:n]
-			continue
-		}
-		d := &Defn{Word: a[0], Dict: Dict{a[1], a[2]}}
-		d.Text, err = c.text.ReadDotBytes()
-		if err != nil {
-			return nil, err
-		}
-		def[i] = d
-	}
-	_, _, err = c.text.ReadCodeLine(250)
-	return def, err
-}
-
-// Fields returns the fields in s.
-// Fields are space separated unquoted words
-// or quoted with single or double quote.
-func fields(s string) ([]string, error) {
-	var v []string
-	i := 0
-	for {
-		for i < len(s) && (s[i] == ' ' || s[i] == '\t') {
-			i++
-		}
-		if i >= len(s) {
-			break
-		}
-		if s[i] == '"' || s[i] == '\'' {
-			q := s[i]
-			// quoted string
-			var j int
-			for j = i + 1; ; j++ {
-				if j >= len(s) {
-					return nil, textproto.ProtocolError("malformed quoted string")
-				}
-				if s[j] == '\\' {
-					j++
-					continue
-				}
-				if s[j] == q {
-					j++
-					break
-				}
-			}
-			v = append(v, unquote(s[i+1:j-1]))
-			i = j
-		} else {
-			// atom
-			var j int
-			for j = i; j < len(s); j++ {
-				if s[j] == ' ' || s[j] == '\t' || s[j] == '\\' || s[j] == '"' || s[j] == '\'' {
-					break
-				}
-			}
-			v = append(v, s[i:j])
-			i = j
-		}
-		if i < len(s) {
-			c := s[i]
-			if c != ' ' && c != '\t' {
-				return nil, textproto.ProtocolError("quotes not on word boundaries")
-			}
-		}
-	}
-	return v, nil
-}
-
-func unquote(s string) string {
-	if strings.Index(s, "\\") < 0 {
-		return s
-	}
-	b := []byte(s)
-	w := 0
-	for r := 0; r < len(b); r++ {
-		c := b[r]
-		if c == '\\' {
-			r++
-			c = b[r]
-		}
-		b[w] = c
-		w++
-	}
-	return string(b[0:w])
-}
diff --git a/installer/vendor/golang.org/x/net/dns/dnsmessage/message.go b/installer/vendor/golang.org/x/net/dns/dnsmessage/message.go
deleted file mode 100644
index da43b0ba48..0000000000
--- a/installer/vendor/golang.org/x/net/dns/dnsmessage/message.go
+++ /dev/null
@@ -1,1418 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package dnsmessage provides a mostly RFC 1035 compliant implementation of
-// DNS message packing and unpacking.
-//
-// This implementation is designed to minimize heap allocations and avoid
-// unnecessary packing and unpacking as much as possible.
-package dnsmessage
-
-import (
-	"errors"
-)
-
-// Packet formats
-
-// A Type is a type of DNS request and response.
-type Type uint16
-
-// A Class is a type of network.
-type Class uint16
-
-// An OpCode is a DNS operation code.
-type OpCode uint16
-
-// An RCode is a DNS response status code.
-type RCode uint16
-
-// Wire constants.
-const (
-	// ResourceHeader.Type and Question.Type
-	TypeA     Type = 1
-	TypeNS    Type = 2
-	TypeCNAME Type = 5
-	TypeSOA   Type = 6
-	TypePTR   Type = 12
-	TypeMX    Type = 15
-	TypeTXT   Type = 16
-	TypeAAAA  Type = 28
-	TypeSRV   Type = 33
-
-	// Question.Type
-	TypeWKS   Type = 11
-	TypeHINFO Type = 13
-	TypeMINFO Type = 14
-	TypeAXFR  Type = 252
-	TypeALL   Type = 255
-
-	// ResourceHeader.Class and Question.Class
-	ClassINET   Class = 1
-	ClassCSNET  Class = 2
-	ClassCHAOS  Class = 3
-	ClassHESIOD Class = 4
-
-	// Question.Class
-	ClassANY Class = 255
-
-	// Message.Rcode
-	RCodeSuccess        RCode = 0
-	RCodeFormatError    RCode = 1
-	RCodeServerFailure  RCode = 2
-	RCodeNameError      RCode = 3
-	RCodeNotImplemented RCode = 4
-	RCodeRefused        RCode = 5
-)
-
-var (
-	// ErrNotStarted indicates that the prerequisite information isn't
-	// available yet because the previous records haven't been appropriately
-	// parsed or skipped.
-	ErrNotStarted = errors.New("parsing of this type isn't available yet")
-
-	// ErrSectionDone indicated that all records in the section have been
-	// parsed.
-	ErrSectionDone = errors.New("parsing of this section has completed")
-
-	errBaseLen            = errors.New("insufficient data for base length type")
-	errCalcLen            = errors.New("insufficient data for calculated length type")
-	errReserved           = errors.New("segment prefix is reserved")
-	errTooManyPtr         = errors.New("too many pointers (>10)")
-	errInvalidPtr         = errors.New("invalid pointer")
-	errResourceLen        = errors.New("insufficient data for resource body length")
-	errSegTooLong         = errors.New("segment length too long")
-	errZeroSegLen         = errors.New("zero length segment")
-	errResTooLong         = errors.New("resource length too long")
-	errTooManyQuestions   = errors.New("too many Questions to pack (>65535)")
-	errTooManyAnswers     = errors.New("too many Answers to pack (>65535)")
-	errTooManyAuthorities = errors.New("too many Authorities to pack (>65535)")
-	errTooManyAdditionals = errors.New("too many Additionals to pack (>65535)")
-)
-
-type nestedError struct {
-	// s is the current level's error message.
-	s string
-
-	// err is the nested error.
-	err error
-}
-
-// nestedError implements error.Error.
-func (e *nestedError) Error() string {
-	return e.s + ": " + e.err.Error()
-}
-
-// Header is a representation of a DNS message header.
-type Header struct {
-	ID                 uint16
-	Response           bool
-	OpCode             OpCode
-	Authoritative      bool
-	Truncated          bool
-	RecursionDesired   bool
-	RecursionAvailable bool
-	RCode              RCode
-}
-
-func (m *Header) pack() (id uint16, bits uint16) {
-	id = m.ID
-	bits = uint16(m.OpCode)<<11 | uint16(m.RCode)
-	if m.RecursionAvailable {
-		bits |= headerBitRA
-	}
-	if m.RecursionDesired {
-		bits |= headerBitRD
-	}
-	if m.Truncated {
-		bits |= headerBitTC
-	}
-	if m.Authoritative {
-		bits |= headerBitAA
-	}
-	if m.Response {
-		bits |= headerBitQR
-	}
-	return
-}
-
-// Message is a representation of a DNS message.
-type Message struct {
-	Header
-	Questions   []Question
-	Answers     []Resource
-	Authorities []Resource
-	Additionals []Resource
-}
-
-type section uint8
-
-const (
-	sectionHeader section = iota
-	sectionQuestions
-	sectionAnswers
-	sectionAuthorities
-	sectionAdditionals
-	sectionDone
-
-	headerBitQR = 1 << 15 // query/response (response=1)
-	headerBitAA = 1 << 10 // authoritative
-	headerBitTC = 1 << 9  // truncated
-	headerBitRD = 1 << 8  // recursion desired
-	headerBitRA = 1 << 7  // recursion available
-)
-
-var sectionNames = map[section]string{
-	sectionHeader:      "header",
-	sectionQuestions:   "Question",
-	sectionAnswers:     "Answer",
-	sectionAuthorities: "Authority",
-	sectionAdditionals: "Additional",
-}
-
-// header is the wire format for a DNS message header.
-type header struct {
-	id          uint16
-	bits        uint16
-	questions   uint16
-	answers     uint16
-	authorities uint16
-	additionals uint16
-}
-
-func (h *header) count(sec section) uint16 {
-	switch sec {
-	case sectionQuestions:
-		return h.questions
-	case sectionAnswers:
-		return h.answers
-	case sectionAuthorities:
-		return h.authorities
-	case sectionAdditionals:
-		return h.additionals
-	}
-	return 0
-}
-
-func (h *header) pack(msg []byte) []byte {
-	msg = packUint16(msg, h.id)
-	msg = packUint16(msg, h.bits)
-	msg = packUint16(msg, h.questions)
-	msg = packUint16(msg, h.answers)
-	msg = packUint16(msg, h.authorities)
-	return packUint16(msg, h.additionals)
-}
-
-func (h *header) unpack(msg []byte, off int) (int, error) {
-	newOff := off
-	var err error
-	if h.id, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"id", err}
-	}
-	if h.bits, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"bits", err}
-	}
-	if h.questions, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"questions", err}
-	}
-	if h.answers, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"answers", err}
-	}
-	if h.authorities, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"authorities", err}
-	}
-	if h.additionals, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"additionals", err}
-	}
-	return newOff, nil
-}
-
-func (h *header) header() Header {
-	return Header{
-		ID:                 h.id,
-		Response:           (h.bits & headerBitQR) != 0,
-		OpCode:             OpCode(h.bits>>11) & 0xF,
-		Authoritative:      (h.bits & headerBitAA) != 0,
-		Truncated:          (h.bits & headerBitTC) != 0,
-		RecursionDesired:   (h.bits & headerBitRD) != 0,
-		RecursionAvailable: (h.bits & headerBitRA) != 0,
-		RCode:              RCode(h.bits & 0xF),
-	}
-}
-
-// A Resource is a DNS resource record.
-type Resource interface {
-	// Header return's the Resource's ResourceHeader.
-	Header() *ResourceHeader
-
-	// pack packs a Resource except for its header.
-	pack(msg []byte, compression map[string]int) ([]byte, error)
-
-	// realType returns the actual type of the Resource. This is used to
-	// fill in the header Type field.
-	realType() Type
-}
-
-func packResource(msg []byte, resource Resource, compression map[string]int) ([]byte, error) {
-	oldMsg := msg
-	resource.Header().Type = resource.realType()
-	msg, length, err := resource.Header().pack(msg, compression)
-	if err != nil {
-		return msg, &nestedError{"ResourceHeader", err}
-	}
-	preLen := len(msg)
-	msg, err = resource.pack(msg, compression)
-	if err != nil {
-		return msg, &nestedError{"content", err}
-	}
-	conLen := len(msg) - preLen
-	if conLen > int(^uint16(0)) {
-		return oldMsg, errResTooLong
-	}
-	// Fill in the length now that we know how long the content is.
-	packUint16(length[:0], uint16(conLen))
-	resource.Header().Length = uint16(conLen)
-	return msg, nil
-}
-
-// A Parser allows incrementally parsing a DNS message.
-//
-// When parsing is started, the Header is parsed. Next, each Question can be
-// either parsed or skipped. Alternatively, all Questions can be skipped at
-// once. When all Questions have been parsed, attempting to parse Questions
-// will return (nil, nil) and attempting to skip Questions will return
-// (true, nil). After all Questions have been either parsed or skipped, all
-// Answers, Authorities and Additionals can be either parsed or skipped in the
-// same way, and each type of Resource must be fully parsed or skipped before
-// proceeding to the next type of Resource.
-//
-// Note that there is no requirement to fully skip or parse the message.
-type Parser struct {
-	msg    []byte
-	header header
-
-	section        section
-	off            int
-	index          int
-	resHeaderValid bool
-	resHeader      ResourceHeader
-}
-
-// Start parses the header and enables the parsing of Questions.
-func (p *Parser) Start(msg []byte) (Header, error) {
-	if p.msg != nil {
-		*p = Parser{}
-	}
-	p.msg = msg
-	var err error
-	if p.off, err = p.header.unpack(msg, 0); err != nil {
-		return Header{}, &nestedError{"unpacking header", err}
-	}
-	p.section = sectionQuestions
-	return p.header.header(), nil
-}
-
-func (p *Parser) checkAdvance(sec section) error {
-	if p.section < sec {
-		return ErrNotStarted
-	}
-	if p.section > sec {
-		return ErrSectionDone
-	}
-	p.resHeaderValid = false
-	if p.index == int(p.header.count(sec)) {
-		p.index = 0
-		p.section++
-		return ErrSectionDone
-	}
-	return nil
-}
-
-func (p *Parser) resource(sec section) (Resource, error) {
-	var r Resource
-	hdr, err := p.resourceHeader(sec)
-	if err != nil {
-		return r, err
-	}
-	p.resHeaderValid = false
-	r, p.off, err = unpackResource(p.msg, p.off, hdr)
-	if err != nil {
-		return nil, &nestedError{"unpacking " + sectionNames[sec], err}
-	}
-	p.index++
-	return r, nil
-}
-
-func (p *Parser) resourceHeader(sec section) (ResourceHeader, error) {
-	if p.resHeaderValid {
-		return p.resHeader, nil
-	}
-	if err := p.checkAdvance(sec); err != nil {
-		return ResourceHeader{}, err
-	}
-	var hdr ResourceHeader
-	off, err := hdr.unpack(p.msg, p.off)
-	if err != nil {
-		return ResourceHeader{}, err
-	}
-	p.resHeaderValid = true
-	p.resHeader = hdr
-	p.off = off
-	return hdr, nil
-}
-
-func (p *Parser) skipResource(sec section) error {
-	if p.resHeaderValid {
-		newOff := p.off + int(p.resHeader.Length)
-		if newOff > len(p.msg) {
-			return errResourceLen
-		}
-		p.off = newOff
-		p.resHeaderValid = false
-		p.index++
-		return nil
-	}
-	if err := p.checkAdvance(sec); err != nil {
-		return err
-	}
-	var err error
-	p.off, err = skipResource(p.msg, p.off)
-	if err != nil {
-		return &nestedError{"skipping: " + sectionNames[sec], err}
-	}
-	p.index++
-	return nil
-}
-
-// Question parses a single Question.
-func (p *Parser) Question() (Question, error) {
-	if err := p.checkAdvance(sectionQuestions); err != nil {
-		return Question{}, err
-	}
-	name, off, err := unpackName(p.msg, p.off)
-	if err != nil {
-		return Question{}, &nestedError{"unpacking Question.Name", err}
-	}
-	typ, off, err := unpackType(p.msg, off)
-	if err != nil {
-		return Question{}, &nestedError{"unpacking Question.Type", err}
-	}
-	class, off, err := unpackClass(p.msg, off)
-	if err != nil {
-		return Question{}, &nestedError{"unpacking Question.Class", err}
-	}
-	p.off = off
-	p.index++
-	return Question{name, typ, class}, nil
-}
-
-// AllQuestions parses all Questions.
-func (p *Parser) AllQuestions() ([]Question, error) {
-	qs := make([]Question, 0, p.header.questions)
-	for {
-		q, err := p.Question()
-		if err == ErrSectionDone {
-			return qs, nil
-		}
-		if err != nil {
-			return nil, err
-		}
-		qs = append(qs, q)
-	}
-}
-
-// SkipQuestion skips a single Question.
-func (p *Parser) SkipQuestion() error {
-	if err := p.checkAdvance(sectionQuestions); err != nil {
-		return err
-	}
-	off, err := skipName(p.msg, p.off)
-	if err != nil {
-		return &nestedError{"skipping Question Name", err}
-	}
-	if off, err = skipType(p.msg, off); err != nil {
-		return &nestedError{"skipping Question Type", err}
-	}
-	if off, err = skipClass(p.msg, off); err != nil {
-		return &nestedError{"skipping Question Class", err}
-	}
-	p.off = off
-	p.index++
-	return nil
-}
-
-// SkipAllQuestions skips all Questions.
-func (p *Parser) SkipAllQuestions() error {
-	for {
-		if err := p.SkipQuestion(); err == ErrSectionDone {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-}
-
-// AnswerHeader parses a single Answer ResourceHeader.
-func (p *Parser) AnswerHeader() (ResourceHeader, error) {
-	return p.resourceHeader(sectionAnswers)
-}
-
-// Answer parses a single Answer Resource.
-func (p *Parser) Answer() (Resource, error) {
-	return p.resource(sectionAnswers)
-}
-
-// AllAnswers parses all Answer Resources.
-func (p *Parser) AllAnswers() ([]Resource, error) {
-	as := make([]Resource, 0, p.header.answers)
-	for {
-		a, err := p.Answer()
-		if err == ErrSectionDone {
-			return as, nil
-		}
-		if err != nil {
-			return nil, err
-		}
-		as = append(as, a)
-	}
-}
-
-// SkipAnswer skips a single Answer Resource.
-func (p *Parser) SkipAnswer() error {
-	return p.skipResource(sectionAnswers)
-}
-
-// SkipAllAnswers skips all Answer Resources.
-func (p *Parser) SkipAllAnswers() error {
-	for {
-		if err := p.SkipAnswer(); err == ErrSectionDone {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-}
-
-// AuthorityHeader parses a single Authority ResourceHeader.
-func (p *Parser) AuthorityHeader() (ResourceHeader, error) {
-	return p.resourceHeader(sectionAuthorities)
-}
-
-// Authority parses a single Authority Resource.
-func (p *Parser) Authority() (Resource, error) {
-	return p.resource(sectionAuthorities)
-}
-
-// AllAuthorities parses all Authority Resources.
-func (p *Parser) AllAuthorities() ([]Resource, error) {
-	as := make([]Resource, 0, p.header.authorities)
-	for {
-		a, err := p.Authority()
-		if err == ErrSectionDone {
-			return as, nil
-		}
-		if err != nil {
-			return nil, err
-		}
-		as = append(as, a)
-	}
-}
-
-// SkipAuthority skips a single Authority Resource.
-func (p *Parser) SkipAuthority() error {
-	return p.skipResource(sectionAuthorities)
-}
-
-// SkipAllAuthorities skips all Authority Resources.
-func (p *Parser) SkipAllAuthorities() error {
-	for {
-		if err := p.SkipAuthority(); err == ErrSectionDone {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-}
-
-// AdditionalHeader parses a single Additional ResourceHeader.
-func (p *Parser) AdditionalHeader() (ResourceHeader, error) {
-	return p.resourceHeader(sectionAdditionals)
-}
-
-// Additional parses a single Additional Resource.
-func (p *Parser) Additional() (Resource, error) {
-	return p.resource(sectionAdditionals)
-}
-
-// AllAdditionals parses all Additional Resources.
-func (p *Parser) AllAdditionals() ([]Resource, error) {
-	as := make([]Resource, 0, p.header.additionals)
-	for {
-		a, err := p.Additional()
-		if err == ErrSectionDone {
-			return as, nil
-		}
-		if err != nil {
-			return nil, err
-		}
-		as = append(as, a)
-	}
-}
-
-// SkipAdditional skips a single Additional Resource.
-func (p *Parser) SkipAdditional() error {
-	return p.skipResource(sectionAdditionals)
-}
-
-// SkipAllAdditionals skips all Additional Resources.
-func (p *Parser) SkipAllAdditionals() error {
-	for {
-		if err := p.SkipAdditional(); err == ErrSectionDone {
-			return nil
-		} else if err != nil {
-			return err
-		}
-	}
-}
-
-// Unpack parses a full Message.
-func (m *Message) Unpack(msg []byte) error {
-	var p Parser
-	var err error
-	if m.Header, err = p.Start(msg); err != nil {
-		return err
-	}
-	if m.Questions, err = p.AllQuestions(); err != nil {
-		return err
-	}
-	if m.Answers, err = p.AllAnswers(); err != nil {
-		return err
-	}
-	if m.Authorities, err = p.AllAuthorities(); err != nil {
-		return err
-	}
-	if m.Additionals, err = p.AllAdditionals(); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Pack packs a full Message.
-func (m *Message) Pack() ([]byte, error) {
-	// Validate the lengths. It is very unlikely that anyone will try to
-	// pack more than 65535 of any particular type, but it is possible and
-	// we should fail gracefully.
-	if len(m.Questions) > int(^uint16(0)) {
-		return nil, errTooManyQuestions
-	}
-	if len(m.Answers) > int(^uint16(0)) {
-		return nil, errTooManyAnswers
-	}
-	if len(m.Authorities) > int(^uint16(0)) {
-		return nil, errTooManyAuthorities
-	}
-	if len(m.Additionals) > int(^uint16(0)) {
-		return nil, errTooManyAdditionals
-	}
-
-	var h header
-	h.id, h.bits = m.Header.pack()
-
-	h.questions = uint16(len(m.Questions))
-	h.answers = uint16(len(m.Answers))
-	h.authorities = uint16(len(m.Authorities))
-	h.additionals = uint16(len(m.Additionals))
-
-	// The starting capacity doesn't matter too much, but most DNS responses
-	// Will be <= 512 bytes as it is the limit for DNS over UDP.
-	msg := make([]byte, 0, 512)
-
-	msg = h.pack(msg)
-
-	// RFC 1035 allows (but does not require) compression for packing. RFC
-	// 1035 requires unpacking implementations to support compression, so
-	// unconditionally enabling it is fine.
-	//
-	// DNS lookups are typically done over UDP, and RFC 1035 states that UDP
-	// DNS packets can be a maximum of 512 bytes long. Without compression,
-	// many DNS response packets are over this limit, so enabling
-	// compression will help ensure compliance.
-	compression := map[string]int{}
-
-	for _, q := range m.Questions {
-		var err error
-		msg, err = q.pack(msg, compression)
-		if err != nil {
-			return nil, &nestedError{"packing Question", err}
-		}
-	}
-	for _, a := range m.Answers {
-		var err error
-		msg, err = packResource(msg, a, compression)
-		if err != nil {
-			return nil, &nestedError{"packing Answer", err}
-		}
-	}
-	for _, a := range m.Authorities {
-		var err error
-		msg, err = packResource(msg, a, compression)
-		if err != nil {
-			return nil, &nestedError{"packing Authority", err}
-		}
-	}
-	for _, a := range m.Additionals {
-		var err error
-		msg, err = packResource(msg, a, compression)
-		if err != nil {
-			return nil, &nestedError{"packing Additional", err}
-		}
-	}
-
-	return msg, nil
-}
-
-// An ResourceHeader is the header of a DNS resource record. There are
-// many types of DNS resource records, but they all share the same header.
-type ResourceHeader struct {
-	// Name is the domain name for which this resource record pertains.
-	Name string
-
-	// Type is the type of DNS resource record.
-	//
-	// This field will be set automatically during packing.
-	Type Type
-
-	// Class is the class of network to which this DNS resource record
-	// pertains.
-	Class Class
-
-	// TTL is the length of time (measured in seconds) which this resource
-	// record is valid for (time to live). All Resources in a set should
-	// have the same TTL (RFC 2181 Section 5.2).
-	TTL uint32
-
-	// Length is the length of data in the resource record after the header.
-	//
-	// This field will be set automatically during packing.
-	Length uint16
-}
-
-// Header implements Resource.Header.
-func (h *ResourceHeader) Header() *ResourceHeader {
-	return h
-}
-
-// pack packs all of the fields in a ResourceHeader except for the length. The
-// length bytes are returned as a slice so they can be filled in after the rest
-// of the Resource has been packed.
-func (h *ResourceHeader) pack(oldMsg []byte, compression map[string]int) (msg []byte, length []byte, err error) {
-	msg = oldMsg
-	if msg, err = packName(msg, h.Name, compression); err != nil {
-		return oldMsg, nil, &nestedError{"Name", err}
-	}
-	msg = packType(msg, h.Type)
-	msg = packClass(msg, h.Class)
-	msg = packUint32(msg, h.TTL)
-	lenBegin := len(msg)
-	msg = packUint16(msg, h.Length)
-	return msg, msg[lenBegin:], nil
-}
-
-func (h *ResourceHeader) unpack(msg []byte, off int) (int, error) {
-	newOff := off
-	var err error
-	if h.Name, newOff, err = unpackName(msg, newOff); err != nil {
-		return off, &nestedError{"Name", err}
-	}
-	if h.Type, newOff, err = unpackType(msg, newOff); err != nil {
-		return off, &nestedError{"Type", err}
-	}
-	if h.Class, newOff, err = unpackClass(msg, newOff); err != nil {
-		return off, &nestedError{"Class", err}
-	}
-	if h.TTL, newOff, err = unpackUint32(msg, newOff); err != nil {
-		return off, &nestedError{"TTL", err}
-	}
-	if h.Length, newOff, err = unpackUint16(msg, newOff); err != nil {
-		return off, &nestedError{"Length", err}
-	}
-	return newOff, nil
-}
-
-func skipResource(msg []byte, off int) (int, error) {
-	newOff, err := skipName(msg, off)
-	if err != nil {
-		return off, &nestedError{"Name", err}
-	}
-	if newOff, err = skipType(msg, newOff); err != nil {
-		return off, &nestedError{"Type", err}
-	}
-	if newOff, err = skipClass(msg, newOff); err != nil {
-		return off, &nestedError{"Class", err}
-	}
-	if newOff, err = skipUint32(msg, newOff); err != nil {
-		return off, &nestedError{"TTL", err}
-	}
-	length, newOff, err := unpackUint16(msg, newOff)
-	if err != nil {
-		return off, &nestedError{"Length", err}
-	}
-	if newOff += int(length); newOff > len(msg) {
-		return off, errResourceLen
-	}
-	return newOff, nil
-}
-
-func packUint16(msg []byte, field uint16) []byte {
-	return append(msg, byte(field>>8), byte(field))
-}
-
-func unpackUint16(msg []byte, off int) (uint16, int, error) {
-	if off+2 > len(msg) {
-		return 0, off, errBaseLen
-	}
-	return uint16(msg[off])<<8 | uint16(msg[off+1]), off + 2, nil
-}
-
-func skipUint16(msg []byte, off int) (int, error) {
-	if off+2 > len(msg) {
-		return off, errBaseLen
-	}
-	return off + 2, nil
-}
-
-func packType(msg []byte, field Type) []byte {
-	return packUint16(msg, uint16(field))
-}
-
-func unpackType(msg []byte, off int) (Type, int, error) {
-	t, o, err := unpackUint16(msg, off)
-	return Type(t), o, err
-}
-
-func skipType(msg []byte, off int) (int, error) {
-	return skipUint16(msg, off)
-}
-
-func packClass(msg []byte, field Class) []byte {
-	return packUint16(msg, uint16(field))
-}
-
-func unpackClass(msg []byte, off int) (Class, int, error) {
-	c, o, err := unpackUint16(msg, off)
-	return Class(c), o, err
-}
-
-func skipClass(msg []byte, off int) (int, error) {
-	return skipUint16(msg, off)
-}
-
-func packUint32(msg []byte, field uint32) []byte {
-	return append(
-		msg,
-		byte(field>>24),
-		byte(field>>16),
-		byte(field>>8),
-		byte(field),
-	)
-}
-
-func unpackUint32(msg []byte, off int) (uint32, int, error) {
-	if off+4 > len(msg) {
-		return 0, off, errBaseLen
-	}
-	v := uint32(msg[off])<<24 | uint32(msg[off+1])<<16 | uint32(msg[off+2])<<8 | uint32(msg[off+3])
-	return v, off + 4, nil
-}
-
-func skipUint32(msg []byte, off int) (int, error) {
-	if off+4 > len(msg) {
-		return off, errBaseLen
-	}
-	return off + 4, nil
-}
-
-func packText(msg []byte, field string) []byte {
-	for len(field) > 0 {
-		l := len(field)
-		if l > 255 {
-			l = 255
-		}
-		msg = append(msg, byte(l))
-		msg = append(msg, field[:l]...)
-		field = field[l:]
-	}
-	return msg
-}
-
-func unpackText(msg []byte, off int) (string, int, error) {
-	if off >= len(msg) {
-		return "", off, errBaseLen
-	}
-	beginOff := off + 1
-	endOff := beginOff + int(msg[off])
-	if endOff > len(msg) {
-		return "", off, errCalcLen
-	}
-	return string(msg[beginOff:endOff]), endOff, nil
-}
-
-func skipText(msg []byte, off int) (int, error) {
-	if off >= len(msg) {
-		return off, errBaseLen
-	}
-	endOff := off + 1 + int(msg[off])
-	if endOff > len(msg) {
-		return off, errCalcLen
-	}
-	return endOff, nil
-}
-
-func packBytes(msg []byte, field []byte) []byte {
-	return append(msg, field...)
-}
-
-func unpackBytes(msg []byte, off int, field []byte) (int, error) {
-	newOff := off + len(field)
-	if newOff > len(msg) {
-		return off, errBaseLen
-	}
-	copy(field, msg[off:newOff])
-	return newOff, nil
-}
-
-func skipBytes(msg []byte, off int, field []byte) (int, error) {
-	newOff := off + len(field)
-	if newOff > len(msg) {
-		return off, errBaseLen
-	}
-	return newOff, nil
-}
-
-// packName packs a domain name.
-//
-// Domain names are a sequence of counted strings split at the dots. They end
-// with a zero-length string. Compression can be used to reuse domain suffixes.
-//
-// The compression map will be updated with new domain suffixes. If compression
-// is nil, compression will not be used.
-func packName(msg []byte, name string, compression map[string]int) ([]byte, error) {
-	oldMsg := msg
-
-	// Add a trailing dot to canonicalize name.
-	if n := len(name); n == 0 || name[n-1] != '.' {
-		name += "."
-	}
-
-	// Allow root domain.
-	if name == "." {
-		return append(msg, 0), nil
-	}
-
-	// Emit sequence of counted strings, chopping at dots.
-	for i, begin := 0, 0; i < len(name); i++ {
-		// Check for the end of the segment.
-		if name[i] == '.' {
-			// The two most significant bits have special meaning.
-			// It isn't allowed for segments to be long enough to
-			// need them.
-			if i-begin >= 1<<6 {
-				return oldMsg, errSegTooLong
-			}
-
-			// Segments must have a non-zero length.
-			if i-begin == 0 {
-				return oldMsg, errZeroSegLen
-			}
-
-			msg = append(msg, byte(i-begin))
-
-			for j := begin; j < i; j++ {
-				msg = append(msg, name[j])
-			}
-
-			begin = i + 1
-			continue
-		}
-
-		// We can only compress domain suffixes starting with a new
-		// segment. A pointer is two bytes with the two most significant
-		// bits set to 1 to indicate that it is a pointer.
-		if (i == 0 || name[i-1] == '.') && compression != nil {
-			if ptr, ok := compression[name[i:]]; ok {
-				// Hit. Emit a pointer instead of the rest of
-				// the domain.
-				return append(msg, byte(ptr>>8|0xC0), byte(ptr)), nil
-			}
-
-			// Miss. Add the suffix to the compression table if the
-			// offset can be stored in the available 14 bytes.
-			if len(msg) <= int(^uint16(0)>>2) {
-				compression[name[i:]] = len(msg)
-			}
-		}
-	}
-	return append(msg, 0), nil
-}
-
-// unpackName unpacks a domain name.
-func unpackName(msg []byte, off int) (string, int, error) {
-	// currOff is the current working offset.
-	currOff := off
-
-	// newOff is the offset where the next record will start. Pointers lead
-	// to data that belongs to other names and thus doesn't count towards to
-	// the usage of this name.
-	newOff := off
-
-	// name is the domain name being unpacked.
-	name := make([]byte, 0, 255)
-
-	// ptr is the number of pointers followed.
-	var ptr int
-Loop:
-	for {
-		if currOff >= len(msg) {
-			return "", off, errBaseLen
-		}
-		c := int(msg[currOff])
-		currOff++
-		switch c & 0xC0 {
-		case 0x00: // String segment
-			if c == 0x00 {
-				// A zero length signals the end of the name.
-				break Loop
-			}
-			endOff := currOff + c
-			if endOff > len(msg) {
-				return "", off, errCalcLen
-			}
-			name = append(name, msg[currOff:endOff]...)
-			name = append(name, '.')
-			currOff = endOff
-		case 0xC0: // Pointer
-			if currOff >= len(msg) {
-				return "", off, errInvalidPtr
-			}
-			c1 := msg[currOff]
-			currOff++
-			if ptr == 0 {
-				newOff = currOff
-			}
-			// Don't follow too many pointers, maybe there's a loop.
-			if ptr++; ptr > 10 {
-				return "", off, errTooManyPtr
-			}
-			currOff = (c^0xC0)<<8 | int(c1)
-		default:
-			// Prefixes 0x80 and 0x40 are reserved.
-			return "", off, errReserved
-		}
-	}
-	if len(name) == 0 {
-		name = append(name, '.')
-	}
-	if ptr == 0 {
-		newOff = currOff
-	}
-	return string(name), newOff, nil
-}
-
-func skipName(msg []byte, off int) (int, error) {
-	// newOff is the offset where the next record will start. Pointers lead
-	// to data that belongs to other names and thus doesn't count towards to
-	// the usage of this name.
-	newOff := off
-
-Loop:
-	for {
-		if newOff >= len(msg) {
-			return off, errBaseLen
-		}
-		c := int(msg[newOff])
-		newOff++
-		switch c & 0xC0 {
-		case 0x00:
-			if c == 0x00 {
-				// A zero length signals the end of the name.
-				break Loop
-			}
-			// literal string
-			newOff += c
-			if newOff > len(msg) {
-				return off, errCalcLen
-			}
-		case 0xC0:
-			// Pointer to somewhere else in msg.
-
-			// Pointers are two bytes.
-			newOff++
-
-			// Don't follow the pointer as the data here has ended.
-			break Loop
-		default:
-			// Prefixes 0x80 and 0x40 are reserved.
-			return off, errReserved
-		}
-	}
-
-	return newOff, nil
-}
-
-// A Question is a DNS query.
-type Question struct {
-	Name  string
-	Type  Type
-	Class Class
-}
-
-func (q *Question) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	msg, err := packName(msg, q.Name, compression)
-	if err != nil {
-		return msg, &nestedError{"Name", err}
-	}
-	msg = packType(msg, q.Type)
-	return packClass(msg, q.Class), nil
-}
-
-func unpackResource(msg []byte, off int, hdr ResourceHeader) (Resource, int, error) {
-	var (
-		r    Resource
-		err  error
-		name string
-	)
-	switch hdr.Type {
-	case TypeA:
-		r, err = unpackAResource(hdr, msg, off)
-		name = "A"
-	case TypeNS:
-		r, err = unpackNSResource(hdr, msg, off)
-		name = "NS"
-	case TypeCNAME:
-		r, err = unpackCNAMEResource(hdr, msg, off)
-		name = "CNAME"
-	case TypeSOA:
-		r, err = unpackSOAResource(hdr, msg, off)
-		name = "SOA"
-	case TypePTR:
-		r, err = unpackPTRResource(hdr, msg, off)
-		name = "PTR"
-	case TypeMX:
-		r, err = unpackMXResource(hdr, msg, off)
-		name = "MX"
-	case TypeTXT:
-		r, err = unpackTXTResource(hdr, msg, off)
-		name = "TXT"
-	case TypeAAAA:
-		r, err = unpackAAAAResource(hdr, msg, off)
-		name = "AAAA"
-	case TypeSRV:
-		r, err = unpackSRVResource(hdr, msg, off)
-		name = "SRV"
-	}
-	if err != nil {
-		return nil, off, &nestedError{name + " record", err}
-	}
-	if r != nil {
-		return r, off + int(hdr.Length), nil
-	}
-	return nil, off, errors.New("invalid resource type: " + string(hdr.Type+'0'))
-}
-
-// A CNAMEResource is a CNAME Resource record.
-type CNAMEResource struct {
-	ResourceHeader
-
-	CNAME string
-}
-
-func (r *CNAMEResource) realType() Type {
-	return TypeCNAME
-}
-
-func (r *CNAMEResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packName(msg, r.CNAME, compression)
-}
-
-func unpackCNAMEResource(hdr ResourceHeader, msg []byte, off int) (*CNAMEResource, error) {
-	cname, _, err := unpackName(msg, off)
-	if err != nil {
-		return nil, err
-	}
-	return &CNAMEResource{hdr, cname}, nil
-}
-
-// An MXResource is an MX Resource record.
-type MXResource struct {
-	ResourceHeader
-
-	Pref uint16
-	MX   string
-}
-
-func (r *MXResource) realType() Type {
-	return TypeMX
-}
-
-func (r *MXResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	oldMsg := msg
-	msg = packUint16(msg, r.Pref)
-	msg, err := packName(msg, r.MX, compression)
-	if err != nil {
-		return oldMsg, &nestedError{"MXResource.MX", err}
-	}
-	return msg, nil
-}
-
-func unpackMXResource(hdr ResourceHeader, msg []byte, off int) (*MXResource, error) {
-	pref, off, err := unpackUint16(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Pref", err}
-	}
-	mx, _, err := unpackName(msg, off)
-	if err != nil {
-		return nil, &nestedError{"MX", err}
-	}
-	return &MXResource{hdr, pref, mx}, nil
-}
-
-// An NSResource is an NS Resource record.
-type NSResource struct {
-	ResourceHeader
-
-	NS string
-}
-
-func (r *NSResource) realType() Type {
-	return TypeNS
-}
-
-func (r *NSResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packName(msg, r.NS, compression)
-}
-
-func unpackNSResource(hdr ResourceHeader, msg []byte, off int) (*NSResource, error) {
-	ns, _, err := unpackName(msg, off)
-	if err != nil {
-		return nil, err
-	}
-	return &NSResource{hdr, ns}, nil
-}
-
-// A PTRResource is a PTR Resource record.
-type PTRResource struct {
-	ResourceHeader
-
-	PTR string
-}
-
-func (r *PTRResource) realType() Type {
-	return TypePTR
-}
-
-func (r *PTRResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packName(msg, r.PTR, compression)
-}
-
-func unpackPTRResource(hdr ResourceHeader, msg []byte, off int) (*PTRResource, error) {
-	ptr, _, err := unpackName(msg, off)
-	if err != nil {
-		return nil, err
-	}
-	return &PTRResource{hdr, ptr}, nil
-}
-
-// An SOAResource is an SOA Resource record.
-type SOAResource struct {
-	ResourceHeader
-
-	NS      string
-	MBox    string
-	Serial  uint32
-	Refresh uint32
-	Retry   uint32
-	Expire  uint32
-
-	// MinTTL the is the default TTL of Resources records which did not
-	// contain a TTL value and the TTL of negative responses. (RFC 2308
-	// Section 4)
-	MinTTL uint32
-}
-
-func (r *SOAResource) realType() Type {
-	return TypeSOA
-}
-
-func (r *SOAResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	oldMsg := msg
-	msg, err := packName(msg, r.NS, compression)
-	if err != nil {
-		return oldMsg, &nestedError{"SOAResource.NS", err}
-	}
-	msg, err = packName(msg, r.MBox, compression)
-	if err != nil {
-		return oldMsg, &nestedError{"SOAResource.MBox", err}
-	}
-	msg = packUint32(msg, r.Serial)
-	msg = packUint32(msg, r.Refresh)
-	msg = packUint32(msg, r.Retry)
-	msg = packUint32(msg, r.Expire)
-	return packUint32(msg, r.MinTTL), nil
-}
-
-func unpackSOAResource(hdr ResourceHeader, msg []byte, off int) (*SOAResource, error) {
-	ns, off, err := unpackName(msg, off)
-	if err != nil {
-		return nil, &nestedError{"NS", err}
-	}
-	mbox, off, err := unpackName(msg, off)
-	if err != nil {
-		return nil, &nestedError{"MBox", err}
-	}
-	serial, off, err := unpackUint32(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Serial", err}
-	}
-	refresh, off, err := unpackUint32(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Refresh", err}
-	}
-	retry, off, err := unpackUint32(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Retry", err}
-	}
-	expire, off, err := unpackUint32(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Expire", err}
-	}
-	minTTL, _, err := unpackUint32(msg, off)
-	if err != nil {
-		return nil, &nestedError{"MinTTL", err}
-	}
-	return &SOAResource{hdr, ns, mbox, serial, refresh, retry, expire, minTTL}, nil
-}
-
-// A TXTResource is a TXT Resource record.
-type TXTResource struct {
-	ResourceHeader
-
-	Txt string // Not a domain name.
-}
-
-func (r *TXTResource) realType() Type {
-	return TypeTXT
-}
-
-func (r *TXTResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packText(msg, r.Txt), nil
-}
-
-func unpackTXTResource(hdr ResourceHeader, msg []byte, off int) (*TXTResource, error) {
-	var txt string
-	for n := uint16(0); n < hdr.Length; {
-		var t string
-		var err error
-		if t, off, err = unpackText(msg, off); err != nil {
-			return nil, &nestedError{"text", err}
-		}
-		// Check if we got too many bytes.
-		if hdr.Length-n < uint16(len(t))+1 {
-			return nil, errCalcLen
-		}
-		n += uint16(len(t)) + 1
-		txt += t
-	}
-	return &TXTResource{hdr, txt}, nil
-}
-
-// An SRVResource is an SRV Resource record.
-type SRVResource struct {
-	ResourceHeader
-
-	Priority uint16
-	Weight   uint16
-	Port     uint16
-	Target   string // Not compressed as per RFC 2782.
-}
-
-func (r *SRVResource) realType() Type {
-	return TypeSRV
-}
-
-func (r *SRVResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	oldMsg := msg
-	msg = packUint16(msg, r.Priority)
-	msg = packUint16(msg, r.Weight)
-	msg = packUint16(msg, r.Port)
-	msg, err := packName(msg, r.Target, nil)
-	if err != nil {
-		return oldMsg, &nestedError{"SRVResource.Target", err}
-	}
-	return msg, nil
-}
-
-func unpackSRVResource(hdr ResourceHeader, msg []byte, off int) (*SRVResource, error) {
-	priority, off, err := unpackUint16(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Priority", err}
-	}
-	weight, off, err := unpackUint16(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Weight", err}
-	}
-	port, off, err := unpackUint16(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Port", err}
-	}
-	target, _, err := unpackName(msg, off)
-	if err != nil {
-		return nil, &nestedError{"Target", err}
-	}
-	return &SRVResource{hdr, priority, weight, port, target}, nil
-}
-
-// An AResource is an A Resource record.
-type AResource struct {
-	ResourceHeader
-
-	A [4]byte
-}
-
-func (r *AResource) realType() Type {
-	return TypeA
-}
-
-func (r *AResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packBytes(msg, r.A[:]), nil
-}
-
-func unpackAResource(hdr ResourceHeader, msg []byte, off int) (*AResource, error) {
-	var a [4]byte
-	if _, err := unpackBytes(msg, off, a[:]); err != nil {
-		return nil, err
-	}
-	return &AResource{hdr, a}, nil
-}
-
-// An AAAAResource is an AAAA Resource record.
-type AAAAResource struct {
-	ResourceHeader
-
-	AAAA [16]byte
-}
-
-func (r *AAAAResource) realType() Type {
-	return TypeAAAA
-}
-
-func (r *AAAAResource) pack(msg []byte, compression map[string]int) ([]byte, error) {
-	return packBytes(msg, r.AAAA[:]), nil
-}
-
-func unpackAAAAResource(hdr ResourceHeader, msg []byte, off int) (*AAAAResource, error) {
-	var aaaa [16]byte
-	if _, err := unpackBytes(msg, off, aaaa[:]); err != nil {
-		return nil, err
-	}
-	return &AAAAResource{hdr, aaaa}, nil
-}
diff --git a/installer/vendor/golang.org/x/net/dns/dnsmessage/message_test.go b/installer/vendor/golang.org/x/net/dns/dnsmessage/message_test.go
deleted file mode 100644
index 46edd72436..0000000000
--- a/installer/vendor/golang.org/x/net/dns/dnsmessage/message_test.go
+++ /dev/null
@@ -1,575 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package dnsmessage
-
-import (
-	"fmt"
-	"net"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func (m *Message) String() string {
-	s := fmt.Sprintf("Message: %#v\n", &m.Header)
-	if len(m.Questions) > 0 {
-		s += "-- Questions\n"
-		for _, q := range m.Questions {
-			s += fmt.Sprintf("%#v\n", q)
-		}
-	}
-	if len(m.Answers) > 0 {
-		s += "-- Answers\n"
-		for _, a := range m.Answers {
-			s += fmt.Sprintf("%#v\n", a)
-		}
-	}
-	if len(m.Authorities) > 0 {
-		s += "-- Authorities\n"
-		for _, ns := range m.Authorities {
-			s += fmt.Sprintf("%#v\n", ns)
-		}
-	}
-	if len(m.Additionals) > 0 {
-		s += "-- Additionals\n"
-		for _, e := range m.Additionals {
-			s += fmt.Sprintf("%#v\n", e)
-		}
-	}
-	return s
-}
-
-func TestQuestionPackUnpack(t *testing.T) {
-	want := Question{
-		Name:  ".",
-		Type:  TypeA,
-		Class: ClassINET,
-	}
-	buf, err := want.pack(make([]byte, 1, 50), map[string]int{})
-	if err != nil {
-		t.Fatal("Packing failed:", err)
-	}
-	var p Parser
-	p.msg = buf
-	p.header.questions = 1
-	p.section = sectionQuestions
-	p.off = 1
-	got, err := p.Question()
-	if err != nil {
-		t.Fatalf("Unpacking failed: %v\n%s", err, string(buf[1:]))
-	}
-	if p.off != len(buf) {
-		t.Errorf("Unpacked different amount than packed: got n = %d, want = %d", p.off, len(buf))
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Got = %+v, want = %+v", got, want)
-	}
-}
-
-func TestNamePackUnpack(t *testing.T) {
-	tests := []struct {
-		in   string
-		want string
-		err  error
-	}{
-		{"", ".", nil},
-		{".", ".", nil},
-		{"google..com", "", errZeroSegLen},
-		{"google.com", "google.com.", nil},
-		{"google..com.", "", errZeroSegLen},
-		{"google.com.", "google.com.", nil},
-		{".google.com.", "", errZeroSegLen},
-		{"www..google.com.", "", errZeroSegLen},
-		{"www.google.com.", "www.google.com.", nil},
-	}
-
-	for _, test := range tests {
-		buf, err := packName(make([]byte, 0, 30), test.in, map[string]int{})
-		if err != test.err {
-			t.Errorf("Packing of %s: got err = %v, want err = %v", test.in, err, test.err)
-			continue
-		}
-		if test.err != nil {
-			continue
-		}
-		got, n, err := unpackName(buf, 0)
-		if err != nil {
-			t.Errorf("Unpacking for %s failed: %v", test.in, err)
-			continue
-		}
-		if n != len(buf) {
-			t.Errorf(
-				"Unpacked different amount than packed for %s: got n = %d, want = %d",
-				test.in,
-				n,
-				len(buf),
-			)
-		}
-		if got != test.want {
-			t.Errorf("Unpacking packing of %s: got = %s, want = %s", test.in, got, test.want)
-		}
-	}
-}
-
-func TestDNSPackUnpack(t *testing.T) {
-	wants := []Message{
-		{
-			Questions: []Question{
-				{
-					Name:  ".",
-					Type:  TypeAAAA,
-					Class: ClassINET,
-				},
-			},
-			Answers:     []Resource{},
-			Authorities: []Resource{},
-			Additionals: []Resource{},
-		},
-		largeTestMsg(),
-	}
-	for i, want := range wants {
-		b, err := want.Pack()
-		if err != nil {
-			t.Fatalf("%d: packing failed: %v", i, err)
-		}
-		var got Message
-		err = got.Unpack(b)
-		if err != nil {
-			t.Fatalf("%d: unpacking failed: %v", i, err)
-		}
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("%d: got = %+v, want = %+v", i, &got, &want)
-		}
-	}
-}
-
-func TestSkipAll(t *testing.T) {
-	msg := largeTestMsg()
-	buf, err := msg.Pack()
-	if err != nil {
-		t.Fatal("Packing large test message:", err)
-	}
-	var p Parser
-	if _, err := p.Start(buf); err != nil {
-		t.Fatal(err)
-	}
-
-	tests := []struct {
-		name string
-		f    func() error
-	}{
-		{"SkipAllQuestions", p.SkipAllQuestions},
-		{"SkipAllAnswers", p.SkipAllAnswers},
-		{"SkipAllAuthorities", p.SkipAllAuthorities},
-		{"SkipAllAdditionals", p.SkipAllAdditionals},
-	}
-	for _, test := range tests {
-		for i := 1; i <= 3; i++ {
-			if err := test.f(); err != nil {
-				t.Errorf("Call #%d to %s(): %v", i, test.name, err)
-			}
-		}
-	}
-}
-
-func TestSkipNotStarted(t *testing.T) {
-	var p Parser
-
-	tests := []struct {
-		name string
-		f    func() error
-	}{
-		{"SkipAllQuestions", p.SkipAllQuestions},
-		{"SkipAllAnswers", p.SkipAllAnswers},
-		{"SkipAllAuthorities", p.SkipAllAuthorities},
-		{"SkipAllAdditionals", p.SkipAllAdditionals},
-	}
-	for _, test := range tests {
-		if err := test.f(); err != ErrNotStarted {
-			t.Errorf("Got %s() = %v, want = %v", test.name, err, ErrNotStarted)
-		}
-	}
-}
-
-func TestTooManyRecords(t *testing.T) {
-	const recs = int(^uint16(0)) + 1
-	tests := []struct {
-		name string
-		msg  Message
-		want error
-	}{
-		{
-			"Questions",
-			Message{
-				Questions: make([]Question, recs),
-			},
-			errTooManyQuestions,
-		},
-		{
-			"Answers",
-			Message{
-				Answers: make([]Resource, recs),
-			},
-			errTooManyAnswers,
-		},
-		{
-			"Authorities",
-			Message{
-				Authorities: make([]Resource, recs),
-			},
-			errTooManyAuthorities,
-		},
-		{
-			"Additionals",
-			Message{
-				Additionals: make([]Resource, recs),
-			},
-			errTooManyAdditionals,
-		},
-	}
-
-	for _, test := range tests {
-		if _, got := test.msg.Pack(); got != test.want {
-			t.Errorf("Packing %d %s: got = %v, want = %v", recs, test.name, got, test.want)
-		}
-	}
-}
-
-func TestVeryLongTxt(t *testing.T) {
-	want := &TXTResource{
-		ResourceHeader: ResourceHeader{
-			Name:  "foo.bar.example.com.",
-			Type:  TypeTXT,
-			Class: ClassINET,
-		},
-		Txt: loremIpsum,
-	}
-	buf, err := packResource(make([]byte, 0, 8000), want, map[string]int{})
-	if err != nil {
-		t.Fatal("Packing failed:", err)
-	}
-	var hdr ResourceHeader
-	off, err := hdr.unpack(buf, 0)
-	if err != nil {
-		t.Fatal("Unpacking ResourceHeader failed:", err)
-	}
-	got, n, err := unpackResource(buf, off, hdr)
-	if err != nil {
-		t.Fatal("Unpacking failed:", err)
-	}
-	if n != len(buf) {
-		t.Errorf("Unpacked different amount than packed: got n = %d, want = %d", n, len(buf))
-	}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("Got = %+v, want = %+v", got, want)
-	}
-}
-
-func ExampleHeaderSearch() {
-	msg := Message{
-		Header: Header{Response: true, Authoritative: true},
-		Questions: []Question{
-			{
-				Name:  "foo.bar.example.com.",
-				Type:  TypeA,
-				Class: ClassINET,
-			},
-			{
-				Name:  "bar.example.com.",
-				Type:  TypeA,
-				Class: ClassINET,
-			},
-		},
-		Answers: []Resource{
-			&AResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeA,
-					Class: ClassINET,
-				},
-				A: [4]byte{127, 0, 0, 1},
-			},
-			&AResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "bar.example.com.",
-					Type:  TypeA,
-					Class: ClassINET,
-				},
-				A: [4]byte{127, 0, 0, 2},
-			},
-		},
-	}
-
-	buf, err := msg.Pack()
-	if err != nil {
-		panic(err)
-	}
-
-	wantName := "bar.example.com."
-
-	var p Parser
-	if _, err := p.Start(buf); err != nil {
-		panic(err)
-	}
-
-	for {
-		q, err := p.Question()
-		if err == ErrSectionDone {
-			break
-		}
-		if err != nil {
-			panic(err)
-		}
-
-		if q.Name != wantName {
-			continue
-		}
-
-		fmt.Println("Found question for name", wantName)
-		if err := p.SkipAllQuestions(); err != nil {
-			panic(err)
-		}
-		break
-	}
-
-	var gotIPs []net.IP
-	for {
-		h, err := p.AnswerHeader()
-		if err == ErrSectionDone {
-			break
-		}
-		if err != nil {
-			panic(err)
-		}
-
-		if (h.Type != TypeA && h.Type != TypeAAAA) || h.Class != ClassINET {
-			continue
-		}
-
-		if !strings.EqualFold(h.Name, wantName) {
-			if err := p.SkipAnswer(); err != nil {
-				panic(err)
-			}
-			continue
-		}
-		a, err := p.Answer()
-		if err != nil {
-			panic(err)
-		}
-
-		switch r := a.(type) {
-		default:
-			panic(fmt.Sprintf("unknown type: %T", r))
-		case *AResource:
-			gotIPs = append(gotIPs, r.A[:])
-		case *AAAAResource:
-			gotIPs = append(gotIPs, r.AAAA[:])
-		}
-	}
-
-	fmt.Printf("Found A/AAAA records for name %s: %v\n", wantName, gotIPs)
-
-	// Output:
-	// Found question for name bar.example.com.
-	// Found A/AAAA records for name bar.example.com.: [127.0.0.2]
-}
-
-func largeTestMsg() Message {
-	return Message{
-		Header: Header{Response: true, Authoritative: true},
-		Questions: []Question{
-			{
-				Name:  "foo.bar.example.com.",
-				Type:  TypeA,
-				Class: ClassINET,
-			},
-		},
-		Answers: []Resource{
-			&AResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeA,
-					Class: ClassINET,
-				},
-				A: [4]byte{127, 0, 0, 1},
-			},
-			&AResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeA,
-					Class: ClassINET,
-				},
-				A: [4]byte{127, 0, 0, 2},
-			},
-		},
-		Authorities: []Resource{
-			&NSResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeNS,
-					Class: ClassINET,
-				},
-				NS: "ns1.example.com.",
-			},
-			&NSResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeNS,
-					Class: ClassINET,
-				},
-				NS: "ns2.example.com.",
-			},
-		},
-		Additionals: []Resource{
-			&TXTResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeTXT,
-					Class: ClassINET,
-				},
-				Txt: "So Long, and Thanks for All the Fish",
-			},
-			&TXTResource{
-				ResourceHeader: ResourceHeader{
-					Name:  "foo.bar.example.com.",
-					Type:  TypeTXT,
-					Class: ClassINET,
-				},
-				Txt: "Hamster Huey and the Gooey Kablooie",
-			},
-		},
-	}
-}
-
-const loremIpsum = `
-Lorem ipsum dolor sit amet, nec enim antiopam id, an ullum choro
-nonumes qui, pro eu debet honestatis mediocritatem. No alia enim eos,
-magna signiferumque ex vis. Mei no aperiri dissentias, cu vel quas
-regione. Malorum quaeque vim ut, eum cu semper aliquid invidunt, ei
-nam ipsum assentior.
-
-Nostrum appellantur usu no, vis ex probatus adipiscing. Cu usu illum
-facilis eleifend. Iusto conceptam complectitur vim id. Tale omnesque
-no usu, ei oblique sadipscing vim. At nullam voluptua usu, mei laudem
-reformidans et. Qui ei eros porro reformidans, ius suas veritus
-torquatos ex. Mea te facer alterum consequat.
-
-Soleat torquatos democritum sed et, no mea congue appareat, facer
-aliquam nec in. Has te ipsum tritani. At justo dicta option nec, movet
-phaedrum ad nam. Ea detracto verterem liberavisse has, delectus
-suscipiantur in mei. Ex nam meliore complectitur. Ut nam omnis
-honestatis quaerendum, ea mea nihil affert detracto, ad vix rebum
-mollis.
-
-Ut epicurei praesent neglegentur pri, prima fuisset intellegebat ad
-vim. An habemus comprehensam usu, at enim dignissim pro. Eam reque
-vivendum adipisci ea. Vel ne odio choro minimum. Sea admodum
-dissentiet ex. Mundi tamquam evertitur ius cu. Homero postea iisque ut
-pro, vel ne saepe senserit consetetur.
-
-Nulla utamur facilisis ius ea, in viderer diceret pertinax eum. Mei no
-enim quodsi facilisi, ex sed aeterno appareat mediocritatem, eum
-sententiae deterruisset ut. At suas timeam euismod cum, offendit
-appareat interpretaris ne vix. Vel ea civibus albucius, ex vim quidam
-accusata intellegebat, noluisse instructior sea id. Nec te nonumes
-habemus appellantur, quis dignissim vituperata eu nam.
-
-At vix apeirian patrioque vituperatoribus, an usu agam assum. Debet
-iisque an mea. Per eu dicant ponderum accommodare. Pri alienum
-placerat senserit an, ne eum ferri abhorreant vituperatoribus. Ut mea
-eligendi disputationi. Ius no tation everti impedit, ei magna quidam
-mediocritatem pri.
-
-Legendos perpetua iracundia ne usu, no ius ullum epicurei intellegam,
-ad modus epicuri lucilius eam. In unum quaerendum usu. Ne diam paulo
-has, ea veri virtute sed. Alia honestatis conclusionemque mea eu, ut
-iudico albucius his.
-
-Usu essent probatus eu, sed omnis dolor delicatissimi ex. No qui augue
-dissentias dissentiet. Laudem recteque no usu, vel an velit noluisse,
-an sed utinam eirmod appetere. Ne mea fuisset inimicus ocurreret. At
-vis dicant abhorreant, utinam forensibus nec ne, mei te docendi
-consequat. Brute inermis persecuti cum id. Ut ipsum munere propriae
-usu, dicit graeco disputando id has.
-
-Eros dolore quaerendum nam ei. Timeam ornatus inciderint pro id. Nec
-torquatos sadipscing ei, ancillae molestie per in. Malis principes duo
-ea, usu liber postulant ei.
-
-Graece timeam voluptatibus eu eam. Alia probatus quo no, ea scripta
-feugiat duo. Congue option meliore ex qui, noster invenire appellantur
-ea vel. Eu exerci legendos vel. Consetetur repudiandae vim ut. Vix an
-probo minimum, et nam illud falli tempor.
-
-Cum dico signiferumque eu. Sed ut regione maiorum, id veritus insolens
-tacimates vix. Eu mel sint tamquam lucilius, duo no oporteat
-tacimates. Atqui augue concludaturque vix ei, id mel utroque menandri.
-
-Ad oratio blandit aliquando pro. Vis et dolorum rationibus
-philosophia, ad cum nulla molestie. Hinc fuisset adversarium eum et,
-ne qui nisl verear saperet, vel te quaestio forensibus. Per odio
-option delenit an. Alii placerat has no, in pri nihil platonem
-cotidieque. Est ut elit copiosae scaevola, debet tollit maluisset sea
-an.
-
-Te sea hinc debet pericula, liber ridens fabulas cu sed, quem mutat
-accusam mea et. Elitr labitur albucius et pri, an labore feugait mel.
-Velit zril melius usu ea. Ad stet putent interpretaris qui. Mel no
-error volumus scripserit. In pro paulo iudico, quo ei dolorem
-verterem, affert fabellas dissentiet ea vix.
-
-Vis quot deserunt te. Error aliquid detraxit eu usu, vis alia eruditi
-salutatus cu. Est nostrud bonorum an, ei usu alii salutatus. Vel at
-nisl primis, eum ex aperiri noluisse reformidans. Ad veri velit
-utroque vis, ex equidem detraxit temporibus has.
-
-Inermis appareat usu ne. Eros placerat periculis mea ad, in dictas
-pericula pro. Errem postulant at usu, ea nec amet ornatus mentitum. Ad
-mazim graeco eum, vel ex percipit volutpat iudicabit, sit ne delicata
-interesset. Mel sapientem prodesset abhorreant et, oblique suscipit
-eam id.
-
-An maluisset disputando mea, vidit mnesarchum pri et. Malis insolens
-inciderint no sea. Ea persius maluisset vix, ne vim appellantur
-instructior, consul quidam definiebas pri id. Cum integre feugiat
-pericula in, ex sed persius similique, mel ne natum dicit percipitur.
-
-Primis discere ne pri, errem putent definitionem at vis. Ei mel dolore
-neglegentur, mei tincidunt percipitur ei. Pro ad simul integre
-rationibus. Eu vel alii honestatis definitiones, mea no nonumy
-reprehendunt.
-
-Dicta appareat legendos est cu. Eu vel congue dicunt omittam, no vix
-adhuc minimum constituam, quot noluisse id mel. Eu quot sale mutat
-duo, ex nisl munere invenire duo. Ne nec ullum utamur. Pro alterum
-debitis nostrum no, ut vel aliquid vivendo.
-
-Aliquip fierent praesent quo ne, id sit audiam recusabo delicatissimi.
-Usu postulant incorrupte cu. At pro dicit tibique intellegam, cibo
-dolore impedit id eam, et aeque feugait assentior has. Quando sensibus
-nec ex. Possit sensibus pri ad, unum mutat periculis cu vix.
-
-Mundi tibique vix te, duo simul partiendo qualisque id, est at vidit
-sonet tempor. No per solet aeterno deseruisse. Petentium salutandi
-definiebas pri cu. Munere vivendum est in. Ei justo congue eligendi
-vis, modus offendit omittantur te mel.
-
-Integre voluptaria in qui, sit habemus tractatos constituam no. Utinam
-melius conceptam est ne, quo in minimum apeirian delicata, ut ius
-porro recusabo. Dicant expetenda vix no, ludus scripserit sed ex, eu
-his modo nostro. Ut etiam sonet his, quodsi inciderint philosophia te
-per. Nullam lobortis eu cum, vix an sonet efficiendi repudiandae. Vis
-ad idque fabellas intellegebat.
-
-Eum commodo senserit conclusionemque ex. Sed forensibus sadipscing ut,
-mei in facer delicata periculis, sea ne hinc putent cetero. Nec ne
-alia corpora invenire, alia prima soleat te cum. Eleifend posidonium
-nam at.
-
-Dolorum indoctum cu quo, ex dolor legendos recteque eam, cu pri zril
-discere. Nec civibus officiis dissentiunt ex, est te liber ludus
-elaboraret. Cum ea fabellas invenire. Ex vim nostrud eripuit
-comprehensam, nam te inermis delectus, saepe inermis senserit.
-`
diff --git a/installer/vendor/golang.org/x/net/html/atom/atom.go b/installer/vendor/golang.org/x/net/html/atom/atom.go
deleted file mode 100644
index cd0a8ac154..0000000000
--- a/installer/vendor/golang.org/x/net/html/atom/atom.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package atom provides integer codes (also known as atoms) for a fixed set of
-// frequently occurring HTML strings: tag names and attribute keys such as "p"
-// and "id".
-//
-// Sharing an atom's name between all elements with the same tag can result in
-// fewer string allocations when tokenizing and parsing HTML. Integer
-// comparisons are also generally faster than string comparisons.
-//
-// The value of an atom's particular code is not guaranteed to stay the same
-// between versions of this package. Neither is any ordering guaranteed:
-// whether atom.H1 < atom.H2 may also change. The codes are not guaranteed to
-// be dense. The only guarantees are that e.g. looking up "div" will yield
-// atom.Div, calling atom.Div.String will return "div", and atom.Div != 0.
-package atom // import "golang.org/x/net/html/atom"
-
-// Atom is an integer code for a string. The zero value maps to "".
-type Atom uint32
-
-// String returns the atom's name.
-func (a Atom) String() string {
-	start := uint32(a >> 8)
-	n := uint32(a & 0xff)
-	if start+n > uint32(len(atomText)) {
-		return ""
-	}
-	return atomText[start : start+n]
-}
-
-func (a Atom) string() string {
-	return atomText[a>>8 : a>>8+a&0xff]
-}
-
-// fnv computes the FNV hash with an arbitrary starting value h.
-func fnv(h uint32, s []byte) uint32 {
-	for i := range s {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-func match(s string, t []byte) bool {
-	for i, c := range t {
-		if s[i] != c {
-			return false
-		}
-	}
-	return true
-}
-
-// Lookup returns the atom whose name is s. It returns zero if there is no
-// such atom. The lookup is case sensitive.
-func Lookup(s []byte) Atom {
-	if len(s) == 0 || len(s) > maxAtomLen {
-		return 0
-	}
-	h := fnv(hash0, s)
-	if a := table[h&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	if a := table[(h>>16)&uint32(len(table)-1)]; int(a&0xff) == len(s) && match(a.string(), s) {
-		return a
-	}
-	return 0
-}
-
-// String returns a string whose contents are equal to s. In that sense, it is
-// equivalent to string(s) but may be more efficient.
-func String(s []byte) string {
-	if a := Lookup(s); a != 0 {
-		return a.String()
-	}
-	return string(s)
-}
diff --git a/installer/vendor/golang.org/x/net/html/atom/atom_test.go b/installer/vendor/golang.org/x/net/html/atom/atom_test.go
deleted file mode 100644
index 6e33704dd5..0000000000
--- a/installer/vendor/golang.org/x/net/html/atom/atom_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package atom
-
-import (
-	"sort"
-	"testing"
-)
-
-func TestKnown(t *testing.T) {
-	for _, s := range testAtomList {
-		if atom := Lookup([]byte(s)); atom.String() != s {
-			t.Errorf("Lookup(%q) = %#x (%q)", s, uint32(atom), atom.String())
-		}
-	}
-}
-
-func TestHits(t *testing.T) {
-	for _, a := range table {
-		if a == 0 {
-			continue
-		}
-		got := Lookup([]byte(a.String()))
-		if got != a {
-			t.Errorf("Lookup(%q) = %#x, want %#x", a.String(), uint32(got), uint32(a))
-		}
-	}
-}
-
-func TestMisses(t *testing.T) {
-	testCases := []string{
-		"",
-		"\x00",
-		"\xff",
-		"A",
-		"DIV",
-		"Div",
-		"dIV",
-		"aa",
-		"a\x00",
-		"ab",
-		"abb",
-		"abbr0",
-		"abbr ",
-		" abbr",
-		" a",
-		"acceptcharset",
-		"acceptCharset",
-		"accept_charset",
-		"h0",
-		"h1h2",
-		"h7",
-		"onClick",
-		"λ",
-		// The following string has the same hash (0xa1d7fab7) as "onmouseover".
-		"\x00\x00\x00\x00\x00\x50\x18\xae\x38\xd0\xb7",
-	}
-	for _, tc := range testCases {
-		got := Lookup([]byte(tc))
-		if got != 0 {
-			t.Errorf("Lookup(%q): got %d, want 0", tc, got)
-		}
-	}
-}
-
-func TestForeignObject(t *testing.T) {
-	const (
-		afo = Foreignobject
-		afO = ForeignObject
-		sfo = "foreignobject"
-		sfO = "foreignObject"
-	)
-	if got := Lookup([]byte(sfo)); got != afo {
-		t.Errorf("Lookup(%q): got %#v, want %#v", sfo, got, afo)
-	}
-	if got := Lookup([]byte(sfO)); got != afO {
-		t.Errorf("Lookup(%q): got %#v, want %#v", sfO, got, afO)
-	}
-	if got := afo.String(); got != sfo {
-		t.Errorf("Atom(%#v).String(): got %q, want %q", afo, got, sfo)
-	}
-	if got := afO.String(); got != sfO {
-		t.Errorf("Atom(%#v).String(): got %q, want %q", afO, got, sfO)
-	}
-}
-
-func BenchmarkLookup(b *testing.B) {
-	sortedTable := make([]string, 0, len(table))
-	for _, a := range table {
-		if a != 0 {
-			sortedTable = append(sortedTable, a.String())
-		}
-	}
-	sort.Strings(sortedTable)
-
-	x := make([][]byte, 1000)
-	for i := range x {
-		x[i] = []byte(sortedTable[i%len(sortedTable)])
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for _, s := range x {
-			Lookup(s)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/atom/gen.go b/installer/vendor/golang.org/x/net/html/atom/gen.go
deleted file mode 100644
index 6bfa866019..0000000000
--- a/installer/vendor/golang.org/x/net/html/atom/gen.go
+++ /dev/null
@@ -1,648 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-// This program generates table.go and table_test.go.
-// Invoke as
-//
-//	go run gen.go |gofmt >table.go
-//	go run gen.go -test |gofmt >table_test.go
-
-import (
-	"flag"
-	"fmt"
-	"math/rand"
-	"os"
-	"sort"
-	"strings"
-)
-
-// identifier converts s to a Go exported identifier.
-// It converts "div" to "Div" and "accept-charset" to "AcceptCharset".
-func identifier(s string) string {
-	b := make([]byte, 0, len(s))
-	cap := true
-	for _, c := range s {
-		if c == '-' {
-			cap = true
-			continue
-		}
-		if cap && 'a' <= c && c <= 'z' {
-			c -= 'a' - 'A'
-		}
-		cap = false
-		b = append(b, byte(c))
-	}
-	return string(b)
-}
-
-var test = flag.Bool("test", false, "generate table_test.go")
-
-func main() {
-	flag.Parse()
-
-	var all []string
-	all = append(all, elements...)
-	all = append(all, attributes...)
-	all = append(all, eventHandlers...)
-	all = append(all, extra...)
-	sort.Strings(all)
-
-	if *test {
-		fmt.Printf("// generated by go run gen.go -test; DO NOT EDIT\n\n")
-		fmt.Printf("package atom\n\n")
-		fmt.Printf("var testAtomList = []string{\n")
-		for _, s := range all {
-			fmt.Printf("\t%q,\n", s)
-		}
-		fmt.Printf("}\n")
-		return
-	}
-
-	// uniq - lists have dups
-	// compute max len too
-	maxLen := 0
-	w := 0
-	for _, s := range all {
-		if w == 0 || all[w-1] != s {
-			if maxLen < len(s) {
-				maxLen = len(s)
-			}
-			all[w] = s
-			w++
-		}
-	}
-	all = all[:w]
-
-	// Find hash that minimizes table size.
-	var best *table
-	for i := 0; i < 1000000; i++ {
-		if best != nil && 1<<(best.k-1) < len(all) {
-			break
-		}
-		h := rand.Uint32()
-		for k := uint(0); k <= 16; k++ {
-			if best != nil && k >= best.k {
-				break
-			}
-			var t table
-			if t.init(h, k, all) {
-				best = &t
-				break
-			}
-		}
-	}
-	if best == nil {
-		fmt.Fprintf(os.Stderr, "failed to construct string table\n")
-		os.Exit(1)
-	}
-
-	// Lay out strings, using overlaps when possible.
-	layout := append([]string{}, all...)
-
-	// Remove strings that are substrings of other strings
-	for changed := true; changed; {
-		changed = false
-		for i, s := range layout {
-			if s == "" {
-				continue
-			}
-			for j, t := range layout {
-				if i != j && t != "" && strings.Contains(s, t) {
-					changed = true
-					layout[j] = ""
-				}
-			}
-		}
-	}
-
-	// Join strings where one suffix matches another prefix.
-	for {
-		// Find best i, j, k such that layout[i][len-k:] == layout[j][:k],
-		// maximizing overlap length k.
-		besti := -1
-		bestj := -1
-		bestk := 0
-		for i, s := range layout {
-			if s == "" {
-				continue
-			}
-			for j, t := range layout {
-				if i == j {
-					continue
-				}
-				for k := bestk + 1; k <= len(s) && k <= len(t); k++ {
-					if s[len(s)-k:] == t[:k] {
-						besti = i
-						bestj = j
-						bestk = k
-					}
-				}
-			}
-		}
-		if bestk > 0 {
-			layout[besti] += layout[bestj][bestk:]
-			layout[bestj] = ""
-			continue
-		}
-		break
-	}
-
-	text := strings.Join(layout, "")
-
-	atom := map[string]uint32{}
-	for _, s := range all {
-		off := strings.Index(text, s)
-		if off < 0 {
-			panic("lost string " + s)
-		}
-		atom[s] = uint32(off<<8 | len(s))
-	}
-
-	// Generate the Go code.
-	fmt.Printf("// generated by go run gen.go; DO NOT EDIT\n\n")
-	fmt.Printf("package atom\n\nconst (\n")
-	for _, s := range all {
-		fmt.Printf("\t%s Atom = %#x\n", identifier(s), atom[s])
-	}
-	fmt.Printf(")\n\n")
-
-	fmt.Printf("const hash0 = %#x\n\n", best.h0)
-	fmt.Printf("const maxAtomLen = %d\n\n", maxLen)
-
-	fmt.Printf("var table = [1<<%d]Atom{\n", best.k)
-	for i, s := range best.tab {
-		if s == "" {
-			continue
-		}
-		fmt.Printf("\t%#x: %#x, // %s\n", i, atom[s], s)
-	}
-	fmt.Printf("}\n")
-	datasize := (1 << best.k) * 4
-
-	fmt.Printf("const atomText =\n")
-	textsize := len(text)
-	for len(text) > 60 {
-		fmt.Printf("\t%q +\n", text[:60])
-		text = text[60:]
-	}
-	fmt.Printf("\t%q\n\n", text)
-
-	fmt.Fprintf(os.Stderr, "%d atoms; %d string bytes + %d tables = %d total data\n", len(all), textsize, datasize, textsize+datasize)
-}
-
-type byLen []string
-
-func (x byLen) Less(i, j int) bool { return len(x[i]) > len(x[j]) }
-func (x byLen) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x byLen) Len() int           { return len(x) }
-
-// fnv computes the FNV hash with an arbitrary starting value h.
-func fnv(h uint32, s string) uint32 {
-	for i := 0; i < len(s); i++ {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return h
-}
-
-// A table represents an attempt at constructing the lookup table.
-// The lookup table uses cuckoo hashing, meaning that each string
-// can be found in one of two positions.
-type table struct {
-	h0   uint32
-	k    uint
-	mask uint32
-	tab  []string
-}
-
-// hash returns the two hashes for s.
-func (t *table) hash(s string) (h1, h2 uint32) {
-	h := fnv(t.h0, s)
-	h1 = h & t.mask
-	h2 = (h >> 16) & t.mask
-	return
-}
-
-// init initializes the table with the given parameters.
-// h0 is the initial hash value,
-// k is the number of bits of hash value to use, and
-// x is the list of strings to store in the table.
-// init returns false if the table cannot be constructed.
-func (t *table) init(h0 uint32, k uint, x []string) bool {
-	t.h0 = h0
-	t.k = k
-	t.tab = make([]string, 1<<k)
-	t.mask = 1<<k - 1
-	for _, s := range x {
-		if !t.insert(s) {
-			return false
-		}
-	}
-	return true
-}
-
-// insert inserts s in the table.
-func (t *table) insert(s string) bool {
-	h1, h2 := t.hash(s)
-	if t.tab[h1] == "" {
-		t.tab[h1] = s
-		return true
-	}
-	if t.tab[h2] == "" {
-		t.tab[h2] = s
-		return true
-	}
-	if t.push(h1, 0) {
-		t.tab[h1] = s
-		return true
-	}
-	if t.push(h2, 0) {
-		t.tab[h2] = s
-		return true
-	}
-	return false
-}
-
-// push attempts to push aside the entry in slot i.
-func (t *table) push(i uint32, depth int) bool {
-	if depth > len(t.tab) {
-		return false
-	}
-	s := t.tab[i]
-	h1, h2 := t.hash(s)
-	j := h1 + h2 - i
-	if t.tab[j] != "" && !t.push(j, depth+1) {
-		return false
-	}
-	t.tab[j] = s
-	return true
-}
-
-// The lists of element names and attribute keys were taken from
-// https://html.spec.whatwg.org/multipage/indices.html#index
-// as of the "HTML Living Standard - Last Updated 21 February 2015" version.
-
-var elements = []string{
-	"a",
-	"abbr",
-	"address",
-	"area",
-	"article",
-	"aside",
-	"audio",
-	"b",
-	"base",
-	"bdi",
-	"bdo",
-	"blockquote",
-	"body",
-	"br",
-	"button",
-	"canvas",
-	"caption",
-	"cite",
-	"code",
-	"col",
-	"colgroup",
-	"command",
-	"data",
-	"datalist",
-	"dd",
-	"del",
-	"details",
-	"dfn",
-	"dialog",
-	"div",
-	"dl",
-	"dt",
-	"em",
-	"embed",
-	"fieldset",
-	"figcaption",
-	"figure",
-	"footer",
-	"form",
-	"h1",
-	"h2",
-	"h3",
-	"h4",
-	"h5",
-	"h6",
-	"head",
-	"header",
-	"hgroup",
-	"hr",
-	"html",
-	"i",
-	"iframe",
-	"img",
-	"input",
-	"ins",
-	"kbd",
-	"keygen",
-	"label",
-	"legend",
-	"li",
-	"link",
-	"map",
-	"mark",
-	"menu",
-	"menuitem",
-	"meta",
-	"meter",
-	"nav",
-	"noscript",
-	"object",
-	"ol",
-	"optgroup",
-	"option",
-	"output",
-	"p",
-	"param",
-	"pre",
-	"progress",
-	"q",
-	"rp",
-	"rt",
-	"ruby",
-	"s",
-	"samp",
-	"script",
-	"section",
-	"select",
-	"small",
-	"source",
-	"span",
-	"strong",
-	"style",
-	"sub",
-	"summary",
-	"sup",
-	"table",
-	"tbody",
-	"td",
-	"template",
-	"textarea",
-	"tfoot",
-	"th",
-	"thead",
-	"time",
-	"title",
-	"tr",
-	"track",
-	"u",
-	"ul",
-	"var",
-	"video",
-	"wbr",
-}
-
-// https://html.spec.whatwg.org/multipage/indices.html#attributes-3
-
-var attributes = []string{
-	"abbr",
-	"accept",
-	"accept-charset",
-	"accesskey",
-	"action",
-	"alt",
-	"async",
-	"autocomplete",
-	"autofocus",
-	"autoplay",
-	"challenge",
-	"charset",
-	"checked",
-	"cite",
-	"class",
-	"cols",
-	"colspan",
-	"command",
-	"content",
-	"contenteditable",
-	"contextmenu",
-	"controls",
-	"coords",
-	"crossorigin",
-	"data",
-	"datetime",
-	"default",
-	"defer",
-	"dir",
-	"dirname",
-	"disabled",
-	"download",
-	"draggable",
-	"dropzone",
-	"enctype",
-	"for",
-	"form",
-	"formaction",
-	"formenctype",
-	"formmethod",
-	"formnovalidate",
-	"formtarget",
-	"headers",
-	"height",
-	"hidden",
-	"high",
-	"href",
-	"hreflang",
-	"http-equiv",
-	"icon",
-	"id",
-	"inputmode",
-	"ismap",
-	"itemid",
-	"itemprop",
-	"itemref",
-	"itemscope",
-	"itemtype",
-	"keytype",
-	"kind",
-	"label",
-	"lang",
-	"list",
-	"loop",
-	"low",
-	"manifest",
-	"max",
-	"maxlength",
-	"media",
-	"mediagroup",
-	"method",
-	"min",
-	"minlength",
-	"multiple",
-	"muted",
-	"name",
-	"novalidate",
-	"open",
-	"optimum",
-	"pattern",
-	"ping",
-	"placeholder",
-	"poster",
-	"preload",
-	"radiogroup",
-	"readonly",
-	"rel",
-	"required",
-	"reversed",
-	"rows",
-	"rowspan",
-	"sandbox",
-	"spellcheck",
-	"scope",
-	"scoped",
-	"seamless",
-	"selected",
-	"shape",
-	"size",
-	"sizes",
-	"sortable",
-	"sorted",
-	"span",
-	"src",
-	"srcdoc",
-	"srclang",
-	"start",
-	"step",
-	"style",
-	"tabindex",
-	"target",
-	"title",
-	"translate",
-	"type",
-	"typemustmatch",
-	"usemap",
-	"value",
-	"width",
-	"wrap",
-}
-
-var eventHandlers = []string{
-	"onabort",
-	"onautocomplete",
-	"onautocompleteerror",
-	"onafterprint",
-	"onbeforeprint",
-	"onbeforeunload",
-	"onblur",
-	"oncancel",
-	"oncanplay",
-	"oncanplaythrough",
-	"onchange",
-	"onclick",
-	"onclose",
-	"oncontextmenu",
-	"oncuechange",
-	"ondblclick",
-	"ondrag",
-	"ondragend",
-	"ondragenter",
-	"ondragleave",
-	"ondragover",
-	"ondragstart",
-	"ondrop",
-	"ondurationchange",
-	"onemptied",
-	"onended",
-	"onerror",
-	"onfocus",
-	"onhashchange",
-	"oninput",
-	"oninvalid",
-	"onkeydown",
-	"onkeypress",
-	"onkeyup",
-	"onlanguagechange",
-	"onload",
-	"onloadeddata",
-	"onloadedmetadata",
-	"onloadstart",
-	"onmessage",
-	"onmousedown",
-	"onmousemove",
-	"onmouseout",
-	"onmouseover",
-	"onmouseup",
-	"onmousewheel",
-	"onoffline",
-	"ononline",
-	"onpagehide",
-	"onpageshow",
-	"onpause",
-	"onplay",
-	"onplaying",
-	"onpopstate",
-	"onprogress",
-	"onratechange",
-	"onreset",
-	"onresize",
-	"onscroll",
-	"onseeked",
-	"onseeking",
-	"onselect",
-	"onshow",
-	"onsort",
-	"onstalled",
-	"onstorage",
-	"onsubmit",
-	"onsuspend",
-	"ontimeupdate",
-	"ontoggle",
-	"onunload",
-	"onvolumechange",
-	"onwaiting",
-}
-
-// extra are ad-hoc values not covered by any of the lists above.
-var extra = []string{
-	"align",
-	"annotation",
-	"annotation-xml",
-	"applet",
-	"basefont",
-	"bgsound",
-	"big",
-	"blink",
-	"center",
-	"color",
-	"desc",
-	"face",
-	"font",
-	"foreignObject", // HTML is case-insensitive, but SVG-embedded-in-HTML is case-sensitive.
-	"foreignobject",
-	"frame",
-	"frameset",
-	"image",
-	"isindex",
-	"listing",
-	"malignmark",
-	"marquee",
-	"math",
-	"mglyph",
-	"mi",
-	"mn",
-	"mo",
-	"ms",
-	"mtext",
-	"nobr",
-	"noembed",
-	"noframes",
-	"plaintext",
-	"prompt",
-	"public",
-	"spacer",
-	"strike",
-	"svg",
-	"system",
-	"tt",
-	"xmp",
-}
diff --git a/installer/vendor/golang.org/x/net/html/atom/table.go b/installer/vendor/golang.org/x/net/html/atom/table.go
deleted file mode 100644
index 2605ba3102..0000000000
--- a/installer/vendor/golang.org/x/net/html/atom/table.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package atom
-
-const (
-	A                   Atom = 0x1
-	Abbr                Atom = 0x4
-	Accept              Atom = 0x2106
-	AcceptCharset       Atom = 0x210e
-	Accesskey           Atom = 0x3309
-	Action              Atom = 0x1f606
-	Address             Atom = 0x4f307
-	Align               Atom = 0x1105
-	Alt                 Atom = 0x4503
-	Annotation          Atom = 0x1670a
-	AnnotationXml       Atom = 0x1670e
-	Applet              Atom = 0x2b306
-	Area                Atom = 0x2fa04
-	Article             Atom = 0x38807
-	Aside               Atom = 0x8305
-	Async               Atom = 0x7b05
-	Audio               Atom = 0xa605
-	Autocomplete        Atom = 0x1fc0c
-	Autofocus           Atom = 0xb309
-	Autoplay            Atom = 0xce08
-	B                   Atom = 0x101
-	Base                Atom = 0xd604
-	Basefont            Atom = 0xd608
-	Bdi                 Atom = 0x1a03
-	Bdo                 Atom = 0xe703
-	Bgsound             Atom = 0x11807
-	Big                 Atom = 0x12403
-	Blink               Atom = 0x12705
-	Blockquote          Atom = 0x12c0a
-	Body                Atom = 0x2f04
-	Br                  Atom = 0x202
-	Button              Atom = 0x13606
-	Canvas              Atom = 0x7f06
-	Caption             Atom = 0x1bb07
-	Center              Atom = 0x5b506
-	Challenge           Atom = 0x21f09
-	Charset             Atom = 0x2807
-	Checked             Atom = 0x32807
-	Cite                Atom = 0x3c804
-	Class               Atom = 0x4de05
-	Code                Atom = 0x14904
-	Col                 Atom = 0x15003
-	Colgroup            Atom = 0x15008
-	Color               Atom = 0x15d05
-	Cols                Atom = 0x16204
-	Colspan             Atom = 0x16207
-	Command             Atom = 0x17507
-	Content             Atom = 0x42307
-	Contenteditable     Atom = 0x4230f
-	Contextmenu         Atom = 0x3310b
-	Controls            Atom = 0x18808
-	Coords              Atom = 0x19406
-	Crossorigin         Atom = 0x19f0b
-	Data                Atom = 0x44a04
-	Datalist            Atom = 0x44a08
-	Datetime            Atom = 0x23c08
-	Dd                  Atom = 0x26702
-	Default             Atom = 0x8607
-	Defer               Atom = 0x14b05
-	Del                 Atom = 0x3ef03
-	Desc                Atom = 0x4db04
-	Details             Atom = 0x4807
-	Dfn                 Atom = 0x6103
-	Dialog              Atom = 0x1b06
-	Dir                 Atom = 0x6903
-	Dirname             Atom = 0x6907
-	Disabled            Atom = 0x10c08
-	Div                 Atom = 0x11303
-	Dl                  Atom = 0x11e02
-	Download            Atom = 0x40008
-	Draggable           Atom = 0x17b09
-	Dropzone            Atom = 0x39108
-	Dt                  Atom = 0x50902
-	Em                  Atom = 0x6502
-	Embed               Atom = 0x6505
-	Enctype             Atom = 0x21107
-	Face                Atom = 0x5b304
-	Fieldset            Atom = 0x1b008
-	Figcaption          Atom = 0x1b80a
-	Figure              Atom = 0x1cc06
-	Font                Atom = 0xda04
-	Footer              Atom = 0x8d06
-	For                 Atom = 0x1d803
-	ForeignObject       Atom = 0x1d80d
-	Foreignobject       Atom = 0x1e50d
-	Form                Atom = 0x1f204
-	Formaction          Atom = 0x1f20a
-	Formenctype         Atom = 0x20d0b
-	Formmethod          Atom = 0x2280a
-	Formnovalidate      Atom = 0x2320e
-	Formtarget          Atom = 0x2470a
-	Frame               Atom = 0x9a05
-	Frameset            Atom = 0x9a08
-	H1                  Atom = 0x26e02
-	H2                  Atom = 0x29402
-	H3                  Atom = 0x2a702
-	H4                  Atom = 0x2e902
-	H5                  Atom = 0x2f302
-	H6                  Atom = 0x50b02
-	Head                Atom = 0x2d504
-	Header              Atom = 0x2d506
-	Headers             Atom = 0x2d507
-	Height              Atom = 0x25106
-	Hgroup              Atom = 0x25906
-	Hidden              Atom = 0x26506
-	High                Atom = 0x26b04
-	Hr                  Atom = 0x27002
-	Href                Atom = 0x27004
-	Hreflang            Atom = 0x27008
-	Html                Atom = 0x25504
-	HttpEquiv           Atom = 0x2780a
-	I                   Atom = 0x601
-	Icon                Atom = 0x42204
-	Id                  Atom = 0x8502
-	Iframe              Atom = 0x29606
-	Image               Atom = 0x29c05
-	Img                 Atom = 0x2a103
-	Input               Atom = 0x3e805
-	Inputmode           Atom = 0x3e809
-	Ins                 Atom = 0x1a803
-	Isindex             Atom = 0x2a907
-	Ismap               Atom = 0x2b005
-	Itemid              Atom = 0x33c06
-	Itemprop            Atom = 0x3c908
-	Itemref             Atom = 0x5ad07
-	Itemscope           Atom = 0x2b909
-	Itemtype            Atom = 0x2c308
-	Kbd                 Atom = 0x1903
-	Keygen              Atom = 0x3906
-	Keytype             Atom = 0x53707
-	Kind                Atom = 0x10904
-	Label               Atom = 0xf005
-	Lang                Atom = 0x27404
-	Legend              Atom = 0x18206
-	Li                  Atom = 0x1202
-	Link                Atom = 0x12804
-	List                Atom = 0x44e04
-	Listing             Atom = 0x44e07
-	Loop                Atom = 0xf404
-	Low                 Atom = 0x11f03
-	Malignmark          Atom = 0x100a
-	Manifest            Atom = 0x5f108
-	Map                 Atom = 0x2b203
-	Mark                Atom = 0x1604
-	Marquee             Atom = 0x2cb07
-	Math                Atom = 0x2d204
-	Max                 Atom = 0x2e103
-	Maxlength           Atom = 0x2e109
-	Media               Atom = 0x6e05
-	Mediagroup          Atom = 0x6e0a
-	Menu                Atom = 0x33804
-	Menuitem            Atom = 0x33808
-	Meta                Atom = 0x45d04
-	Meter               Atom = 0x24205
-	Method              Atom = 0x22c06
-	Mglyph              Atom = 0x2a206
-	Mi                  Atom = 0x2eb02
-	Min                 Atom = 0x2eb03
-	Minlength           Atom = 0x2eb09
-	Mn                  Atom = 0x23502
-	Mo                  Atom = 0x3ed02
-	Ms                  Atom = 0x2bc02
-	Mtext               Atom = 0x2f505
-	Multiple            Atom = 0x30308
-	Muted               Atom = 0x30b05
-	Name                Atom = 0x6c04
-	Nav                 Atom = 0x3e03
-	Nobr                Atom = 0x5704
-	Noembed             Atom = 0x6307
-	Noframes            Atom = 0x9808
-	Noscript            Atom = 0x3d208
-	Novalidate          Atom = 0x2360a
-	Object              Atom = 0x1ec06
-	Ol                  Atom = 0xc902
-	Onabort             Atom = 0x13a07
-	Onafterprint        Atom = 0x1c00c
-	Onautocomplete      Atom = 0x1fa0e
-	Onautocompleteerror Atom = 0x1fa13
-	Onbeforeprint       Atom = 0x6040d
-	Onbeforeunload      Atom = 0x4e70e
-	Onblur              Atom = 0xaa06
-	Oncancel            Atom = 0xe908
-	Oncanplay           Atom = 0x28509
-	Oncanplaythrough    Atom = 0x28510
-	Onchange            Atom = 0x3a708
-	Onclick             Atom = 0x31007
-	Onclose             Atom = 0x31707
-	Oncontextmenu       Atom = 0x32f0d
-	Oncuechange         Atom = 0x3420b
-	Ondblclick          Atom = 0x34d0a
-	Ondrag              Atom = 0x35706
-	Ondragend           Atom = 0x35709
-	Ondragenter         Atom = 0x3600b
-	Ondragleave         Atom = 0x36b0b
-	Ondragover          Atom = 0x3760a
-	Ondragstart         Atom = 0x3800b
-	Ondrop              Atom = 0x38f06
-	Ondurationchange    Atom = 0x39f10
-	Onemptied           Atom = 0x39609
-	Onended             Atom = 0x3af07
-	Onerror             Atom = 0x3b607
-	Onfocus             Atom = 0x3bd07
-	Onhashchange        Atom = 0x3da0c
-	Oninput             Atom = 0x3e607
-	Oninvalid           Atom = 0x3f209
-	Onkeydown           Atom = 0x3fb09
-	Onkeypress          Atom = 0x4080a
-	Onkeyup             Atom = 0x41807
-	Onlanguagechange    Atom = 0x43210
-	Onload              Atom = 0x44206
-	Onloadeddata        Atom = 0x4420c
-	Onloadedmetadata    Atom = 0x45510
-	Onloadstart         Atom = 0x46b0b
-	Onmessage           Atom = 0x47609
-	Onmousedown         Atom = 0x47f0b
-	Onmousemove         Atom = 0x48a0b
-	Onmouseout          Atom = 0x4950a
-	Onmouseover         Atom = 0x4a20b
-	Onmouseup           Atom = 0x4ad09
-	Onmousewheel        Atom = 0x4b60c
-	Onoffline           Atom = 0x4c209
-	Ononline            Atom = 0x4cb08
-	Onpagehide          Atom = 0x4d30a
-	Onpageshow          Atom = 0x4fe0a
-	Onpause             Atom = 0x50d07
-	Onplay              Atom = 0x51706
-	Onplaying           Atom = 0x51709
-	Onpopstate          Atom = 0x5200a
-	Onprogress          Atom = 0x52a0a
-	Onratechange        Atom = 0x53e0c
-	Onreset             Atom = 0x54a07
-	Onresize            Atom = 0x55108
-	Onscroll            Atom = 0x55f08
-	Onseeked            Atom = 0x56708
-	Onseeking           Atom = 0x56f09
-	Onselect            Atom = 0x57808
-	Onshow              Atom = 0x58206
-	Onsort              Atom = 0x58b06
-	Onstalled           Atom = 0x59509
-	Onstorage           Atom = 0x59e09
-	Onsubmit            Atom = 0x5a708
-	Onsuspend           Atom = 0x5bb09
-	Ontimeupdate        Atom = 0xdb0c
-	Ontoggle            Atom = 0x5c408
-	Onunload            Atom = 0x5cc08
-	Onvolumechange      Atom = 0x5d40e
-	Onwaiting           Atom = 0x5e209
-	Open                Atom = 0x3cf04
-	Optgroup            Atom = 0xf608
-	Optimum             Atom = 0x5eb07
-	Option              Atom = 0x60006
-	Output              Atom = 0x49c06
-	P                   Atom = 0xc01
-	Param               Atom = 0xc05
-	Pattern             Atom = 0x5107
-	Ping                Atom = 0x7704
-	Placeholder         Atom = 0xc30b
-	Plaintext           Atom = 0xfd09
-	Poster              Atom = 0x15706
-	Pre                 Atom = 0x25e03
-	Preload             Atom = 0x25e07
-	Progress            Atom = 0x52c08
-	Prompt              Atom = 0x5fa06
-	Public              Atom = 0x41e06
-	Q                   Atom = 0x13101
-	Radiogroup          Atom = 0x30a
-	Readonly            Atom = 0x2fb08
-	Rel                 Atom = 0x25f03
-	Required            Atom = 0x1d008
-	Reversed            Atom = 0x5a08
-	Rows                Atom = 0x9204
-	Rowspan             Atom = 0x9207
-	Rp                  Atom = 0x1c602
-	Rt                  Atom = 0x13f02
-	Ruby                Atom = 0xaf04
-	S                   Atom = 0x2c01
-	Samp                Atom = 0x4e04
-	Sandbox             Atom = 0xbb07
-	Scope               Atom = 0x2bd05
-	Scoped              Atom = 0x2bd06
-	Script              Atom = 0x3d406
-	Seamless            Atom = 0x31c08
-	Section             Atom = 0x4e207
-	Select              Atom = 0x57a06
-	Selected            Atom = 0x57a08
-	Shape               Atom = 0x4f905
-	Size                Atom = 0x55504
-	Sizes               Atom = 0x55505
-	Small               Atom = 0x18f05
-	Sortable            Atom = 0x58d08
-	Sorted              Atom = 0x19906
-	Source              Atom = 0x1aa06
-	Spacer              Atom = 0x2db06
-	Span                Atom = 0x9504
-	Spellcheck          Atom = 0x3230a
-	Src                 Atom = 0x3c303
-	Srcdoc              Atom = 0x3c306
-	Srclang             Atom = 0x41107
-	Start               Atom = 0x38605
-	Step                Atom = 0x5f704
-	Strike              Atom = 0x53306
-	Strong              Atom = 0x55906
-	Style               Atom = 0x61105
-	Sub                 Atom = 0x5a903
-	Summary             Atom = 0x61607
-	Sup                 Atom = 0x61d03
-	Svg                 Atom = 0x62003
-	System              Atom = 0x62306
-	Tabindex            Atom = 0x46308
-	Table               Atom = 0x42d05
-	Target              Atom = 0x24b06
-	Tbody               Atom = 0x2e05
-	Td                  Atom = 0x4702
-	Template            Atom = 0x62608
-	Textarea            Atom = 0x2f608
-	Tfoot               Atom = 0x8c05
-	Th                  Atom = 0x22e02
-	Thead               Atom = 0x2d405
-	Time                Atom = 0xdd04
-	Title               Atom = 0xa105
-	Tr                  Atom = 0x10502
-	Track               Atom = 0x10505
-	Translate           Atom = 0x14009
-	Tt                  Atom = 0x5302
-	Type                Atom = 0x21404
-	Typemustmatch       Atom = 0x2140d
-	U                   Atom = 0xb01
-	Ul                  Atom = 0x8a02
-	Usemap              Atom = 0x51106
-	Value               Atom = 0x4005
-	Var                 Atom = 0x11503
-	Video               Atom = 0x28105
-	Wbr                 Atom = 0x12103
-	Width               Atom = 0x50705
-	Wrap                Atom = 0x58704
-	Xmp                 Atom = 0xc103
-)
-
-const hash0 = 0xc17da63e
-
-const maxAtomLen = 19
-
-var table = [1 << 9]Atom{
-	0x1:   0x48a0b, // onmousemove
-	0x2:   0x5e209, // onwaiting
-	0x3:   0x1fa13, // onautocompleteerror
-	0x4:   0x5fa06, // prompt
-	0x7:   0x5eb07, // optimum
-	0x8:   0x1604,  // mark
-	0xa:   0x5ad07, // itemref
-	0xb:   0x4fe0a, // onpageshow
-	0xc:   0x57a06, // select
-	0xd:   0x17b09, // draggable
-	0xe:   0x3e03,  // nav
-	0xf:   0x17507, // command
-	0x11:  0xb01,   // u
-	0x14:  0x2d507, // headers
-	0x15:  0x44a08, // datalist
-	0x17:  0x4e04,  // samp
-	0x1a:  0x3fb09, // onkeydown
-	0x1b:  0x55f08, // onscroll
-	0x1c:  0x15003, // col
-	0x20:  0x3c908, // itemprop
-	0x21:  0x2780a, // http-equiv
-	0x22:  0x61d03, // sup
-	0x24:  0x1d008, // required
-	0x2b:  0x25e07, // preload
-	0x2c:  0x6040d, // onbeforeprint
-	0x2d:  0x3600b, // ondragenter
-	0x2e:  0x50902, // dt
-	0x2f:  0x5a708, // onsubmit
-	0x30:  0x27002, // hr
-	0x31:  0x32f0d, // oncontextmenu
-	0x33:  0x29c05, // image
-	0x34:  0x50d07, // onpause
-	0x35:  0x25906, // hgroup
-	0x36:  0x7704,  // ping
-	0x37:  0x57808, // onselect
-	0x3a:  0x11303, // div
-	0x3b:  0x1fa0e, // onautocomplete
-	0x40:  0x2eb02, // mi
-	0x41:  0x31c08, // seamless
-	0x42:  0x2807,  // charset
-	0x43:  0x8502,  // id
-	0x44:  0x5200a, // onpopstate
-	0x45:  0x3ef03, // del
-	0x46:  0x2cb07, // marquee
-	0x47:  0x3309,  // accesskey
-	0x49:  0x8d06,  // footer
-	0x4a:  0x44e04, // list
-	0x4b:  0x2b005, // ismap
-	0x51:  0x33804, // menu
-	0x52:  0x2f04,  // body
-	0x55:  0x9a08,  // frameset
-	0x56:  0x54a07, // onreset
-	0x57:  0x12705, // blink
-	0x58:  0xa105,  // title
-	0x59:  0x38807, // article
-	0x5b:  0x22e02, // th
-	0x5d:  0x13101, // q
-	0x5e:  0x3cf04, // open
-	0x5f:  0x2fa04, // area
-	0x61:  0x44206, // onload
-	0x62:  0xda04,  // font
-	0x63:  0xd604,  // base
-	0x64:  0x16207, // colspan
-	0x65:  0x53707, // keytype
-	0x66:  0x11e02, // dl
-	0x68:  0x1b008, // fieldset
-	0x6a:  0x2eb03, // min
-	0x6b:  0x11503, // var
-	0x6f:  0x2d506, // header
-	0x70:  0x13f02, // rt
-	0x71:  0x15008, // colgroup
-	0x72:  0x23502, // mn
-	0x74:  0x13a07, // onabort
-	0x75:  0x3906,  // keygen
-	0x76:  0x4c209, // onoffline
-	0x77:  0x21f09, // challenge
-	0x78:  0x2b203, // map
-	0x7a:  0x2e902, // h4
-	0x7b:  0x3b607, // onerror
-	0x7c:  0x2e109, // maxlength
-	0x7d:  0x2f505, // mtext
-	0x7e:  0xbb07,  // sandbox
-	0x7f:  0x58b06, // onsort
-	0x80:  0x100a,  // malignmark
-	0x81:  0x45d04, // meta
-	0x82:  0x7b05,  // async
-	0x83:  0x2a702, // h3
-	0x84:  0x26702, // dd
-	0x85:  0x27004, // href
-	0x86:  0x6e0a,  // mediagroup
-	0x87:  0x19406, // coords
-	0x88:  0x41107, // srclang
-	0x89:  0x34d0a, // ondblclick
-	0x8a:  0x4005,  // value
-	0x8c:  0xe908,  // oncancel
-	0x8e:  0x3230a, // spellcheck
-	0x8f:  0x9a05,  // frame
-	0x91:  0x12403, // big
-	0x94:  0x1f606, // action
-	0x95:  0x6903,  // dir
-	0x97:  0x2fb08, // readonly
-	0x99:  0x42d05, // table
-	0x9a:  0x61607, // summary
-	0x9b:  0x12103, // wbr
-	0x9c:  0x30a,   // radiogroup
-	0x9d:  0x6c04,  // name
-	0x9f:  0x62306, // system
-	0xa1:  0x15d05, // color
-	0xa2:  0x7f06,  // canvas
-	0xa3:  0x25504, // html
-	0xa5:  0x56f09, // onseeking
-	0xac:  0x4f905, // shape
-	0xad:  0x25f03, // rel
-	0xae:  0x28510, // oncanplaythrough
-	0xaf:  0x3760a, // ondragover
-	0xb0:  0x62608, // template
-	0xb1:  0x1d80d, // foreignObject
-	0xb3:  0x9204,  // rows
-	0xb6:  0x44e07, // listing
-	0xb7:  0x49c06, // output
-	0xb9:  0x3310b, // contextmenu
-	0xbb:  0x11f03, // low
-	0xbc:  0x1c602, // rp
-	0xbd:  0x5bb09, // onsuspend
-	0xbe:  0x13606, // button
-	0xbf:  0x4db04, // desc
-	0xc1:  0x4e207, // section
-	0xc2:  0x52a0a, // onprogress
-	0xc3:  0x59e09, // onstorage
-	0xc4:  0x2d204, // math
-	0xc5:  0x4503,  // alt
-	0xc7:  0x8a02,  // ul
-	0xc8:  0x5107,  // pattern
-	0xc9:  0x4b60c, // onmousewheel
-	0xca:  0x35709, // ondragend
-	0xcb:  0xaf04,  // ruby
-	0xcc:  0xc01,   // p
-	0xcd:  0x31707, // onclose
-	0xce:  0x24205, // meter
-	0xcf:  0x11807, // bgsound
-	0xd2:  0x25106, // height
-	0xd4:  0x101,   // b
-	0xd5:  0x2c308, // itemtype
-	0xd8:  0x1bb07, // caption
-	0xd9:  0x10c08, // disabled
-	0xdb:  0x33808, // menuitem
-	0xdc:  0x62003, // svg
-	0xdd:  0x18f05, // small
-	0xde:  0x44a04, // data
-	0xe0:  0x4cb08, // ononline
-	0xe1:  0x2a206, // mglyph
-	0xe3:  0x6505,  // embed
-	0xe4:  0x10502, // tr
-	0xe5:  0x46b0b, // onloadstart
-	0xe7:  0x3c306, // srcdoc
-	0xeb:  0x5c408, // ontoggle
-	0xed:  0xe703,  // bdo
-	0xee:  0x4702,  // td
-	0xef:  0x8305,  // aside
-	0xf0:  0x29402, // h2
-	0xf1:  0x52c08, // progress
-	0xf2:  0x12c0a, // blockquote
-	0xf4:  0xf005,  // label
-	0xf5:  0x601,   // i
-	0xf7:  0x9207,  // rowspan
-	0xfb:  0x51709, // onplaying
-	0xfd:  0x2a103, // img
-	0xfe:  0xf608,  // optgroup
-	0xff:  0x42307, // content
-	0x101: 0x53e0c, // onratechange
-	0x103: 0x3da0c, // onhashchange
-	0x104: 0x4807,  // details
-	0x106: 0x40008, // download
-	0x109: 0x14009, // translate
-	0x10b: 0x4230f, // contenteditable
-	0x10d: 0x36b0b, // ondragleave
-	0x10e: 0x2106,  // accept
-	0x10f: 0x57a08, // selected
-	0x112: 0x1f20a, // formaction
-	0x113: 0x5b506, // center
-	0x115: 0x45510, // onloadedmetadata
-	0x116: 0x12804, // link
-	0x117: 0xdd04,  // time
-	0x118: 0x19f0b, // crossorigin
-	0x119: 0x3bd07, // onfocus
-	0x11a: 0x58704, // wrap
-	0x11b: 0x42204, // icon
-	0x11d: 0x28105, // video
-	0x11e: 0x4de05, // class
-	0x121: 0x5d40e, // onvolumechange
-	0x122: 0xaa06,  // onblur
-	0x123: 0x2b909, // itemscope
-	0x124: 0x61105, // style
-	0x127: 0x41e06, // public
-	0x129: 0x2320e, // formnovalidate
-	0x12a: 0x58206, // onshow
-	0x12c: 0x51706, // onplay
-	0x12d: 0x3c804, // cite
-	0x12e: 0x2bc02, // ms
-	0x12f: 0xdb0c,  // ontimeupdate
-	0x130: 0x10904, // kind
-	0x131: 0x2470a, // formtarget
-	0x135: 0x3af07, // onended
-	0x136: 0x26506, // hidden
-	0x137: 0x2c01,  // s
-	0x139: 0x2280a, // formmethod
-	0x13a: 0x3e805, // input
-	0x13c: 0x50b02, // h6
-	0x13d: 0xc902,  // ol
-	0x13e: 0x3420b, // oncuechange
-	0x13f: 0x1e50d, // foreignobject
-	0x143: 0x4e70e, // onbeforeunload
-	0x144: 0x2bd05, // scope
-	0x145: 0x39609, // onemptied
-	0x146: 0x14b05, // defer
-	0x147: 0xc103,  // xmp
-	0x148: 0x39f10, // ondurationchange
-	0x149: 0x1903,  // kbd
-	0x14c: 0x47609, // onmessage
-	0x14d: 0x60006, // option
-	0x14e: 0x2eb09, // minlength
-	0x14f: 0x32807, // checked
-	0x150: 0xce08,  // autoplay
-	0x152: 0x202,   // br
-	0x153: 0x2360a, // novalidate
-	0x156: 0x6307,  // noembed
-	0x159: 0x31007, // onclick
-	0x15a: 0x47f0b, // onmousedown
-	0x15b: 0x3a708, // onchange
-	0x15e: 0x3f209, // oninvalid
-	0x15f: 0x2bd06, // scoped
-	0x160: 0x18808, // controls
-	0x161: 0x30b05, // muted
-	0x162: 0x58d08, // sortable
-	0x163: 0x51106, // usemap
-	0x164: 0x1b80a, // figcaption
-	0x165: 0x35706, // ondrag
-	0x166: 0x26b04, // high
-	0x168: 0x3c303, // src
-	0x169: 0x15706, // poster
-	0x16b: 0x1670e, // annotation-xml
-	0x16c: 0x5f704, // step
-	0x16d: 0x4,     // abbr
-	0x16e: 0x1b06,  // dialog
-	0x170: 0x1202,  // li
-	0x172: 0x3ed02, // mo
-	0x175: 0x1d803, // for
-	0x176: 0x1a803, // ins
-	0x178: 0x55504, // size
-	0x179: 0x43210, // onlanguagechange
-	0x17a: 0x8607,  // default
-	0x17b: 0x1a03,  // bdi
-	0x17c: 0x4d30a, // onpagehide
-	0x17d: 0x6907,  // dirname
-	0x17e: 0x21404, // type
-	0x17f: 0x1f204, // form
-	0x181: 0x28509, // oncanplay
-	0x182: 0x6103,  // dfn
-	0x183: 0x46308, // tabindex
-	0x186: 0x6502,  // em
-	0x187: 0x27404, // lang
-	0x189: 0x39108, // dropzone
-	0x18a: 0x4080a, // onkeypress
-	0x18b: 0x23c08, // datetime
-	0x18c: 0x16204, // cols
-	0x18d: 0x1,     // a
-	0x18e: 0x4420c, // onloadeddata
-	0x190: 0xa605,  // audio
-	0x192: 0x2e05,  // tbody
-	0x193: 0x22c06, // method
-	0x195: 0xf404,  // loop
-	0x196: 0x29606, // iframe
-	0x198: 0x2d504, // head
-	0x19e: 0x5f108, // manifest
-	0x19f: 0xb309,  // autofocus
-	0x1a0: 0x14904, // code
-	0x1a1: 0x55906, // strong
-	0x1a2: 0x30308, // multiple
-	0x1a3: 0xc05,   // param
-	0x1a6: 0x21107, // enctype
-	0x1a7: 0x5b304, // face
-	0x1a8: 0xfd09,  // plaintext
-	0x1a9: 0x26e02, // h1
-	0x1aa: 0x59509, // onstalled
-	0x1ad: 0x3d406, // script
-	0x1ae: 0x2db06, // spacer
-	0x1af: 0x55108, // onresize
-	0x1b0: 0x4a20b, // onmouseover
-	0x1b1: 0x5cc08, // onunload
-	0x1b2: 0x56708, // onseeked
-	0x1b4: 0x2140d, // typemustmatch
-	0x1b5: 0x1cc06, // figure
-	0x1b6: 0x4950a, // onmouseout
-	0x1b7: 0x25e03, // pre
-	0x1b8: 0x50705, // width
-	0x1b9: 0x19906, // sorted
-	0x1bb: 0x5704,  // nobr
-	0x1be: 0x5302,  // tt
-	0x1bf: 0x1105,  // align
-	0x1c0: 0x3e607, // oninput
-	0x1c3: 0x41807, // onkeyup
-	0x1c6: 0x1c00c, // onafterprint
-	0x1c7: 0x210e,  // accept-charset
-	0x1c8: 0x33c06, // itemid
-	0x1c9: 0x3e809, // inputmode
-	0x1cb: 0x53306, // strike
-	0x1cc: 0x5a903, // sub
-	0x1cd: 0x10505, // track
-	0x1ce: 0x38605, // start
-	0x1d0: 0xd608,  // basefont
-	0x1d6: 0x1aa06, // source
-	0x1d7: 0x18206, // legend
-	0x1d8: 0x2d405, // thead
-	0x1da: 0x8c05,  // tfoot
-	0x1dd: 0x1ec06, // object
-	0x1de: 0x6e05,  // media
-	0x1df: 0x1670a, // annotation
-	0x1e0: 0x20d0b, // formenctype
-	0x1e2: 0x3d208, // noscript
-	0x1e4: 0x55505, // sizes
-	0x1e5: 0x1fc0c, // autocomplete
-	0x1e6: 0x9504,  // span
-	0x1e7: 0x9808,  // noframes
-	0x1e8: 0x24b06, // target
-	0x1e9: 0x38f06, // ondrop
-	0x1ea: 0x2b306, // applet
-	0x1ec: 0x5a08,  // reversed
-	0x1f0: 0x2a907, // isindex
-	0x1f3: 0x27008, // hreflang
-	0x1f5: 0x2f302, // h5
-	0x1f6: 0x4f307, // address
-	0x1fa: 0x2e103, // max
-	0x1fb: 0xc30b,  // placeholder
-	0x1fc: 0x2f608, // textarea
-	0x1fe: 0x4ad09, // onmouseup
-	0x1ff: 0x3800b, // ondragstart
-}
-
-const atomText = "abbradiogrouparamalignmarkbdialogaccept-charsetbodyaccesskey" +
-	"genavaluealtdetailsampatternobreversedfnoembedirnamediagroup" +
-	"ingasyncanvasidefaultfooterowspanoframesetitleaudionblurubya" +
-	"utofocusandboxmplaceholderautoplaybasefontimeupdatebdoncance" +
-	"labelooptgrouplaintextrackindisabledivarbgsoundlowbrbigblink" +
-	"blockquotebuttonabortranslatecodefercolgroupostercolorcolspa" +
-	"nnotation-xmlcommandraggablegendcontrolsmallcoordsortedcross" +
-	"originsourcefieldsetfigcaptionafterprintfigurequiredforeignO" +
-	"bjectforeignobjectformactionautocompleteerrorformenctypemust" +
-	"matchallengeformmethodformnovalidatetimeterformtargetheightm" +
-	"lhgroupreloadhiddenhigh1hreflanghttp-equivideoncanplaythroug" +
-	"h2iframeimageimglyph3isindexismappletitemscopeditemtypemarqu" +
-	"eematheaderspacermaxlength4minlength5mtextareadonlymultiplem" +
-	"utedonclickoncloseamlesspellcheckedoncontextmenuitemidoncuec" +
-	"hangeondblclickondragendondragenterondragleaveondragoverondr" +
-	"agstarticleondropzonemptiedondurationchangeonendedonerroronf" +
-	"ocusrcdocitempropenoscriptonhashchangeoninputmodeloninvalido" +
-	"nkeydownloadonkeypressrclangonkeyupublicontenteditableonlang" +
-	"uagechangeonloadeddatalistingonloadedmetadatabindexonloadsta" +
-	"rtonmessageonmousedownonmousemoveonmouseoutputonmouseoveronm" +
-	"ouseuponmousewheelonofflineononlineonpagehidesclassectionbef" +
-	"oreunloaddresshapeonpageshowidth6onpausemaponplayingonpopsta" +
-	"teonprogresstrikeytypeonratechangeonresetonresizestrongonscr" +
-	"ollonseekedonseekingonselectedonshowraponsortableonstalledon" +
-	"storageonsubmitemrefacenteronsuspendontoggleonunloadonvolume" +
-	"changeonwaitingoptimumanifestepromptoptionbeforeprintstylesu" +
-	"mmarysupsvgsystemplate"
diff --git a/installer/vendor/golang.org/x/net/html/atom/table_test.go b/installer/vendor/golang.org/x/net/html/atom/table_test.go
deleted file mode 100644
index 0f2ecce4fd..0000000000
--- a/installer/vendor/golang.org/x/net/html/atom/table_test.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// generated by go run gen.go -test; DO NOT EDIT
-
-package atom
-
-var testAtomList = []string{
-	"a",
-	"abbr",
-	"abbr",
-	"accept",
-	"accept-charset",
-	"accesskey",
-	"action",
-	"address",
-	"align",
-	"alt",
-	"annotation",
-	"annotation-xml",
-	"applet",
-	"area",
-	"article",
-	"aside",
-	"async",
-	"audio",
-	"autocomplete",
-	"autofocus",
-	"autoplay",
-	"b",
-	"base",
-	"basefont",
-	"bdi",
-	"bdo",
-	"bgsound",
-	"big",
-	"blink",
-	"blockquote",
-	"body",
-	"br",
-	"button",
-	"canvas",
-	"caption",
-	"center",
-	"challenge",
-	"charset",
-	"checked",
-	"cite",
-	"cite",
-	"class",
-	"code",
-	"col",
-	"colgroup",
-	"color",
-	"cols",
-	"colspan",
-	"command",
-	"command",
-	"content",
-	"contenteditable",
-	"contextmenu",
-	"controls",
-	"coords",
-	"crossorigin",
-	"data",
-	"data",
-	"datalist",
-	"datetime",
-	"dd",
-	"default",
-	"defer",
-	"del",
-	"desc",
-	"details",
-	"dfn",
-	"dialog",
-	"dir",
-	"dirname",
-	"disabled",
-	"div",
-	"dl",
-	"download",
-	"draggable",
-	"dropzone",
-	"dt",
-	"em",
-	"embed",
-	"enctype",
-	"face",
-	"fieldset",
-	"figcaption",
-	"figure",
-	"font",
-	"footer",
-	"for",
-	"foreignObject",
-	"foreignobject",
-	"form",
-	"form",
-	"formaction",
-	"formenctype",
-	"formmethod",
-	"formnovalidate",
-	"formtarget",
-	"frame",
-	"frameset",
-	"h1",
-	"h2",
-	"h3",
-	"h4",
-	"h5",
-	"h6",
-	"head",
-	"header",
-	"headers",
-	"height",
-	"hgroup",
-	"hidden",
-	"high",
-	"hr",
-	"href",
-	"hreflang",
-	"html",
-	"http-equiv",
-	"i",
-	"icon",
-	"id",
-	"iframe",
-	"image",
-	"img",
-	"input",
-	"inputmode",
-	"ins",
-	"isindex",
-	"ismap",
-	"itemid",
-	"itemprop",
-	"itemref",
-	"itemscope",
-	"itemtype",
-	"kbd",
-	"keygen",
-	"keytype",
-	"kind",
-	"label",
-	"label",
-	"lang",
-	"legend",
-	"li",
-	"link",
-	"list",
-	"listing",
-	"loop",
-	"low",
-	"malignmark",
-	"manifest",
-	"map",
-	"mark",
-	"marquee",
-	"math",
-	"max",
-	"maxlength",
-	"media",
-	"mediagroup",
-	"menu",
-	"menuitem",
-	"meta",
-	"meter",
-	"method",
-	"mglyph",
-	"mi",
-	"min",
-	"minlength",
-	"mn",
-	"mo",
-	"ms",
-	"mtext",
-	"multiple",
-	"muted",
-	"name",
-	"nav",
-	"nobr",
-	"noembed",
-	"noframes",
-	"noscript",
-	"novalidate",
-	"object",
-	"ol",
-	"onabort",
-	"onafterprint",
-	"onautocomplete",
-	"onautocompleteerror",
-	"onbeforeprint",
-	"onbeforeunload",
-	"onblur",
-	"oncancel",
-	"oncanplay",
-	"oncanplaythrough",
-	"onchange",
-	"onclick",
-	"onclose",
-	"oncontextmenu",
-	"oncuechange",
-	"ondblclick",
-	"ondrag",
-	"ondragend",
-	"ondragenter",
-	"ondragleave",
-	"ondragover",
-	"ondragstart",
-	"ondrop",
-	"ondurationchange",
-	"onemptied",
-	"onended",
-	"onerror",
-	"onfocus",
-	"onhashchange",
-	"oninput",
-	"oninvalid",
-	"onkeydown",
-	"onkeypress",
-	"onkeyup",
-	"onlanguagechange",
-	"onload",
-	"onloadeddata",
-	"onloadedmetadata",
-	"onloadstart",
-	"onmessage",
-	"onmousedown",
-	"onmousemove",
-	"onmouseout",
-	"onmouseover",
-	"onmouseup",
-	"onmousewheel",
-	"onoffline",
-	"ononline",
-	"onpagehide",
-	"onpageshow",
-	"onpause",
-	"onplay",
-	"onplaying",
-	"onpopstate",
-	"onprogress",
-	"onratechange",
-	"onreset",
-	"onresize",
-	"onscroll",
-	"onseeked",
-	"onseeking",
-	"onselect",
-	"onshow",
-	"onsort",
-	"onstalled",
-	"onstorage",
-	"onsubmit",
-	"onsuspend",
-	"ontimeupdate",
-	"ontoggle",
-	"onunload",
-	"onvolumechange",
-	"onwaiting",
-	"open",
-	"optgroup",
-	"optimum",
-	"option",
-	"output",
-	"p",
-	"param",
-	"pattern",
-	"ping",
-	"placeholder",
-	"plaintext",
-	"poster",
-	"pre",
-	"preload",
-	"progress",
-	"prompt",
-	"public",
-	"q",
-	"radiogroup",
-	"readonly",
-	"rel",
-	"required",
-	"reversed",
-	"rows",
-	"rowspan",
-	"rp",
-	"rt",
-	"ruby",
-	"s",
-	"samp",
-	"sandbox",
-	"scope",
-	"scoped",
-	"script",
-	"seamless",
-	"section",
-	"select",
-	"selected",
-	"shape",
-	"size",
-	"sizes",
-	"small",
-	"sortable",
-	"sorted",
-	"source",
-	"spacer",
-	"span",
-	"span",
-	"spellcheck",
-	"src",
-	"srcdoc",
-	"srclang",
-	"start",
-	"step",
-	"strike",
-	"strong",
-	"style",
-	"style",
-	"sub",
-	"summary",
-	"sup",
-	"svg",
-	"system",
-	"tabindex",
-	"table",
-	"target",
-	"tbody",
-	"td",
-	"template",
-	"textarea",
-	"tfoot",
-	"th",
-	"thead",
-	"time",
-	"title",
-	"title",
-	"tr",
-	"track",
-	"translate",
-	"tt",
-	"type",
-	"typemustmatch",
-	"u",
-	"ul",
-	"usemap",
-	"value",
-	"var",
-	"video",
-	"wbr",
-	"width",
-	"wrap",
-	"xmp",
-}
diff --git a/installer/vendor/golang.org/x/net/html/charset/charset.go b/installer/vendor/golang.org/x/net/html/charset/charset.go
deleted file mode 100644
index 13bed1599f..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/charset.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package charset provides common text encodings for HTML documents.
-//
-// The mapping from encoding labels to encodings is defined at
-// https://encoding.spec.whatwg.org/.
-package charset // import "golang.org/x/net/html/charset"
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"mime"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/net/html"
-	"golang.org/x/text/encoding"
-	"golang.org/x/text/encoding/charmap"
-	"golang.org/x/text/encoding/htmlindex"
-	"golang.org/x/text/transform"
-)
-
-// Lookup returns the encoding with the specified label, and its canonical
-// name. It returns nil and the empty string if label is not one of the
-// standard encodings for HTML. Matching is case-insensitive and ignores
-// leading and trailing whitespace. Encoders will use HTML escape sequences for
-// runes that are not supported by the character set.
-func Lookup(label string) (e encoding.Encoding, name string) {
-	e, err := htmlindex.Get(label)
-	if err != nil {
-		return nil, ""
-	}
-	name, _ = htmlindex.Name(e)
-	return &htmlEncoding{e}, name
-}
-
-type htmlEncoding struct{ encoding.Encoding }
-
-func (h *htmlEncoding) NewEncoder() *encoding.Encoder {
-	// HTML requires a non-terminating legacy encoder. We use HTML escapes to
-	// substitute unsupported code points.
-	return encoding.HTMLEscapeUnsupported(h.Encoding.NewEncoder())
-}
-
-// DetermineEncoding determines the encoding of an HTML document by examining
-// up to the first 1024 bytes of content and the declared Content-Type.
-//
-// See http://www.whatwg.org/specs/web-apps/current-work/multipage/parsing.html#determining-the-character-encoding
-func DetermineEncoding(content []byte, contentType string) (e encoding.Encoding, name string, certain bool) {
-	if len(content) > 1024 {
-		content = content[:1024]
-	}
-
-	for _, b := range boms {
-		if bytes.HasPrefix(content, b.bom) {
-			e, name = Lookup(b.enc)
-			return e, name, true
-		}
-	}
-
-	if _, params, err := mime.ParseMediaType(contentType); err == nil {
-		if cs, ok := params["charset"]; ok {
-			if e, name = Lookup(cs); e != nil {
-				return e, name, true
-			}
-		}
-	}
-
-	if len(content) > 0 {
-		e, name = prescan(content)
-		if e != nil {
-			return e, name, false
-		}
-	}
-
-	// Try to detect UTF-8.
-	// First eliminate any partial rune at the end.
-	for i := len(content) - 1; i >= 0 && i > len(content)-4; i-- {
-		b := content[i]
-		if b < 0x80 {
-			break
-		}
-		if utf8.RuneStart(b) {
-			content = content[:i]
-			break
-		}
-	}
-	hasHighBit := false
-	for _, c := range content {
-		if c >= 0x80 {
-			hasHighBit = true
-			break
-		}
-	}
-	if hasHighBit && utf8.Valid(content) {
-		return encoding.Nop, "utf-8", false
-	}
-
-	// TODO: change default depending on user's locale?
-	return charmap.Windows1252, "windows-1252", false
-}
-
-// NewReader returns an io.Reader that converts the content of r to UTF-8.
-// It calls DetermineEncoding to find out what r's encoding is.
-func NewReader(r io.Reader, contentType string) (io.Reader, error) {
-	preview := make([]byte, 1024)
-	n, err := io.ReadFull(r, preview)
-	switch {
-	case err == io.ErrUnexpectedEOF:
-		preview = preview[:n]
-		r = bytes.NewReader(preview)
-	case err != nil:
-		return nil, err
-	default:
-		r = io.MultiReader(bytes.NewReader(preview), r)
-	}
-
-	if e, _, _ := DetermineEncoding(preview, contentType); e != encoding.Nop {
-		r = transform.NewReader(r, e.NewDecoder())
-	}
-	return r, nil
-}
-
-// NewReaderLabel returns a reader that converts from the specified charset to
-// UTF-8. It uses Lookup to find the encoding that corresponds to label, and
-// returns an error if Lookup returns nil. It is suitable for use as
-// encoding/xml.Decoder's CharsetReader function.
-func NewReaderLabel(label string, input io.Reader) (io.Reader, error) {
-	e, _ := Lookup(label)
-	if e == nil {
-		return nil, fmt.Errorf("unsupported charset: %q", label)
-	}
-	return transform.NewReader(input, e.NewDecoder()), nil
-}
-
-func prescan(content []byte) (e encoding.Encoding, name string) {
-	z := html.NewTokenizer(bytes.NewReader(content))
-	for {
-		switch z.Next() {
-		case html.ErrorToken:
-			return nil, ""
-
-		case html.StartTagToken, html.SelfClosingTagToken:
-			tagName, hasAttr := z.TagName()
-			if !bytes.Equal(tagName, []byte("meta")) {
-				continue
-			}
-			attrList := make(map[string]bool)
-			gotPragma := false
-
-			const (
-				dontKnow = iota
-				doNeedPragma
-				doNotNeedPragma
-			)
-			needPragma := dontKnow
-
-			name = ""
-			e = nil
-			for hasAttr {
-				var key, val []byte
-				key, val, hasAttr = z.TagAttr()
-				ks := string(key)
-				if attrList[ks] {
-					continue
-				}
-				attrList[ks] = true
-				for i, c := range val {
-					if 'A' <= c && c <= 'Z' {
-						val[i] = c + 0x20
-					}
-				}
-
-				switch ks {
-				case "http-equiv":
-					if bytes.Equal(val, []byte("content-type")) {
-						gotPragma = true
-					}
-
-				case "content":
-					if e == nil {
-						name = fromMetaElement(string(val))
-						if name != "" {
-							e, name = Lookup(name)
-							if e != nil {
-								needPragma = doNeedPragma
-							}
-						}
-					}
-
-				case "charset":
-					e, name = Lookup(string(val))
-					needPragma = doNotNeedPragma
-				}
-			}
-
-			if needPragma == dontKnow || needPragma == doNeedPragma && !gotPragma {
-				continue
-			}
-
-			if strings.HasPrefix(name, "utf-16") {
-				name = "utf-8"
-				e = encoding.Nop
-			}
-
-			if e != nil {
-				return e, name
-			}
-		}
-	}
-}
-
-func fromMetaElement(s string) string {
-	for s != "" {
-		csLoc := strings.Index(s, "charset")
-		if csLoc == -1 {
-			return ""
-		}
-		s = s[csLoc+len("charset"):]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if !strings.HasPrefix(s, "=") {
-			continue
-		}
-		s = s[1:]
-		s = strings.TrimLeft(s, " \t\n\f\r")
-		if s == "" {
-			return ""
-		}
-		if q := s[0]; q == '"' || q == '\'' {
-			s = s[1:]
-			closeQuote := strings.IndexRune(s, rune(q))
-			if closeQuote == -1 {
-				return ""
-			}
-			return s[:closeQuote]
-		}
-
-		end := strings.IndexAny(s, "; \t\n\f\r")
-		if end == -1 {
-			end = len(s)
-		}
-		return s[:end]
-	}
-	return ""
-}
-
-var boms = []struct {
-	bom []byte
-	enc string
-}{
-	{[]byte{0xfe, 0xff}, "utf-16be"},
-	{[]byte{0xff, 0xfe}, "utf-16le"},
-	{[]byte{0xef, 0xbb, 0xbf}, "utf-8"},
-}
diff --git a/installer/vendor/golang.org/x/net/html/charset/charset_test.go b/installer/vendor/golang.org/x/net/html/charset/charset_test.go
deleted file mode 100644
index e4e7d86bf9..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/charset_test.go
+++ /dev/null
@@ -1,237 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package charset
-
-import (
-	"bytes"
-	"encoding/xml"
-	"io/ioutil"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/text/transform"
-)
-
-func transformString(t transform.Transformer, s string) (string, error) {
-	r := transform.NewReader(strings.NewReader(s), t)
-	b, err := ioutil.ReadAll(r)
-	return string(b), err
-}
-
-type testCase struct {
-	utf8, other, otherEncoding string
-}
-
-// testCases for encoding and decoding.
-var testCases = []testCase{
-	{"Résumé", "Résumé", "utf8"},
-	{"Résumé", "R\xe9sum\xe9", "latin1"},
-	{"これは漢字です。", "S0\x8c0o0\"oW[g0Y0\x020", "UTF-16LE"},
-	{"これは漢字です。", "0S0\x8c0oo\"[W0g0Y0\x02", "UTF-16BE"},
-	{"Hello, world", "Hello, world", "ASCII"},
-	{"Gdańsk", "Gda\xf1sk", "ISO-8859-2"},
-	{"Ââ Čč Đđ Ŋŋ Õõ Šš Žž Åå Ää", "\xc2\xe2 \xc8\xe8 \xa9\xb9 \xaf\xbf \xd5\xf5 \xaa\xba \xac\xbc \xc5\xe5 \xc4\xe4", "ISO-8859-10"},
-	{"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "ISO-8859-11"},
-	{"latviešu", "latvie\xf0u", "ISO-8859-13"},
-	{"Seònaid", "Se\xf2naid", "ISO-8859-14"},
-	{"€1 is cheap", "\xa41 is cheap", "ISO-8859-15"},
-	{"românește", "rom\xe2ne\xbate", "ISO-8859-16"},
-	{"nutraĵo", "nutra\xbco", "ISO-8859-3"},
-	{"Kalâdlit", "Kal\xe2dlit", "ISO-8859-4"},
-	{"русский", "\xe0\xe3\xe1\xe1\xda\xd8\xd9", "ISO-8859-5"},
-	{"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "ISO-8859-7"},
-	{"Kağan", "Ka\xf0an", "ISO-8859-9"},
-	{"Résumé", "R\x8esum\x8e", "macintosh"},
-	{"Gdańsk", "Gda\xf1sk", "windows-1250"},
-	{"русский", "\xf0\xf3\xf1\xf1\xea\xe8\xe9", "windows-1251"},
-	{"Résumé", "R\xe9sum\xe9", "windows-1252"},
-	{"ελληνικά", "\xe5\xeb\xeb\xe7\xed\xe9\xea\xdc", "windows-1253"},
-	{"Kağan", "Ka\xf0an", "windows-1254"},
-	{"עִבְרִית", "\xf2\xc4\xe1\xc0\xf8\xc4\xe9\xfa", "windows-1255"},
-	{"العربية", "\xc7\xe1\xda\xd1\xc8\xed\xc9", "windows-1256"},
-	{"latviešu", "latvie\xf0u", "windows-1257"},
-	{"Việt", "Vi\xea\xf2t", "windows-1258"},
-	{"สำหรับ", "\xca\xd3\xcb\xc3\u047a", "windows-874"},
-	{"русский", "\xd2\xd5\xd3\xd3\xcb\xc9\xca", "KOI8-R"},
-	{"українська", "\xd5\xcb\xd2\xc1\xa7\xce\xd3\xd8\xcb\xc1", "KOI8-U"},
-	{"Hello 常用國字標準字體表", "Hello \xb1`\xa5\u03b0\xea\xa6r\xbc\u0437\u01e6r\xc5\xe9\xaa\xed", "big5"},
-	{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gbk"},
-	{"Hello 常用國字標準字體表", "Hello \xb3\xa3\xd3\xc3\x87\xf8\xd7\xd6\x98\xcb\x9c\xca\xd7\xd6\xf3\x77\xb1\xed", "gb18030"},
-	{"עִבְרִית", "\x81\x30\xfb\x30\x81\x30\xf6\x34\x81\x30\xf9\x33\x81\x30\xf6\x30\x81\x30\xfb\x36\x81\x30\xf6\x34\x81\x30\xfa\x31\x81\x30\xfb\x38", "gb18030"},
-	{"㧯", "\x82\x31\x89\x38", "gb18030"},
-	{"これは漢字です。", "\x82\xb1\x82\xea\x82\xcd\x8a\xbf\x8e\x9a\x82\xc5\x82\xb7\x81B", "SJIS"},
-	{"Hello, 世界!", "Hello, \x90\xa2\x8aE!", "SJIS"},
-	{"ｲｳｴｵｶ", "\xb2\xb3\xb4\xb5\xb6", "SJIS"},
-	{"これは漢字です。", "\xa4\xb3\xa4\xec\xa4\u03f4\xc1\xbb\xfa\xa4\u01e4\xb9\xa1\xa3", "EUC-JP"},
-	{"Hello, 世界!", "Hello, \x1b$B@$3&\x1b(B!", "ISO-2022-JP"},
-	{"다음과 같은 조건을 따라야 합니다: 저작자표시", "\xb4\xd9\xc0\xbd\xb0\xfa \xb0\xb0\xc0\xba \xc1\xb6\xb0\xc7\xc0\xbb \xb5\xfb\xb6\xf3\xbe\xdf \xc7մϴ\xd9: \xc0\xfa\xc0\xdb\xc0\xdaǥ\xbd\xc3", "EUC-KR"},
-}
-
-func TestDecode(t *testing.T) {
-	testCases := append(testCases, []testCase{
-		// Replace multi-byte maximum subpart of ill-formed subsequence with
-		// single replacement character (WhatWG requirement).
-		{"Rés\ufffdumé", "Rés\xe1\x80umé", "utf8"},
-	}...)
-	for _, tc := range testCases {
-		e, _ := Lookup(tc.otherEncoding)
-		if e == nil {
-			t.Errorf("%s: not found", tc.otherEncoding)
-			continue
-		}
-		s, err := transformString(e.NewDecoder(), tc.other)
-		if err != nil {
-			t.Errorf("%s: decode %q: %v", tc.otherEncoding, tc.other, err)
-			continue
-		}
-		if s != tc.utf8 {
-			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.utf8)
-		}
-	}
-}
-
-func TestEncode(t *testing.T) {
-	testCases := append(testCases, []testCase{
-		// Use Go-style replacement.
-		{"Rés\xe1\x80umé", "Rés\ufffd\ufffdumé", "utf8"},
-		// U+0144 LATIN SMALL LETTER N WITH ACUTE not supported by encoding.
-		{"Gdańsk", "Gda&#324;sk", "ISO-8859-11"},
-		{"\ufffd", "&#65533;", "ISO-8859-11"},
-		{"a\xe1\x80b", "a&#65533;&#65533;b", "ISO-8859-11"},
-	}...)
-	for _, tc := range testCases {
-		e, _ := Lookup(tc.otherEncoding)
-		if e == nil {
-			t.Errorf("%s: not found", tc.otherEncoding)
-			continue
-		}
-		s, err := transformString(e.NewEncoder(), tc.utf8)
-		if err != nil {
-			t.Errorf("%s: encode %q: %s", tc.otherEncoding, tc.utf8, err)
-			continue
-		}
-		if s != tc.other {
-			t.Errorf("%s: got %q, want %q", tc.otherEncoding, s, tc.other)
-		}
-	}
-}
-
-var sniffTestCases = []struct {
-	filename, declared, want string
-}{
-	{"HTTP-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-	{"UTF-16LE-BOM.html", "", "utf-16le"},
-	{"UTF-16BE-BOM.html", "", "utf-16be"},
-	{"meta-content-attribute.html", "text/html", "iso-8859-15"},
-	{"meta-charset-attribute.html", "text/html", "iso-8859-15"},
-	{"No-encoding-declaration.html", "text/html", "utf-8"},
-	{"HTTP-vs-UTF-8-BOM.html", "text/html; charset=iso-8859-15", "utf-8"},
-	{"HTTP-vs-meta-content.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-	{"HTTP-vs-meta-charset.html", "text/html; charset=iso-8859-15", "iso-8859-15"},
-	{"UTF-8-BOM-vs-meta-content.html", "text/html", "utf-8"},
-	{"UTF-8-BOM-vs-meta-charset.html", "text/html", "utf-8"},
-}
-
-func TestSniff(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl": // platforms that don't permit direct file system access
-		t.Skipf("not supported on %q", runtime.GOOS)
-	}
-
-	for _, tc := range sniffTestCases {
-		content, err := ioutil.ReadFile("testdata/" + tc.filename)
-		if err != nil {
-			t.Errorf("%s: error reading file: %v", tc.filename, err)
-			continue
-		}
-
-		_, name, _ := DetermineEncoding(content, tc.declared)
-		if name != tc.want {
-			t.Errorf("%s: got %q, want %q", tc.filename, name, tc.want)
-			continue
-		}
-	}
-}
-
-func TestReader(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl": // platforms that don't permit direct file system access
-		t.Skipf("not supported on %q", runtime.GOOS)
-	}
-
-	for _, tc := range sniffTestCases {
-		content, err := ioutil.ReadFile("testdata/" + tc.filename)
-		if err != nil {
-			t.Errorf("%s: error reading file: %v", tc.filename, err)
-			continue
-		}
-
-		r, err := NewReader(bytes.NewReader(content), tc.declared)
-		if err != nil {
-			t.Errorf("%s: error creating reader: %v", tc.filename, err)
-			continue
-		}
-
-		got, err := ioutil.ReadAll(r)
-		if err != nil {
-			t.Errorf("%s: error reading from charset.NewReader: %v", tc.filename, err)
-			continue
-		}
-
-		e, _ := Lookup(tc.want)
-		want, err := ioutil.ReadAll(transform.NewReader(bytes.NewReader(content), e.NewDecoder()))
-		if err != nil {
-			t.Errorf("%s: error decoding with hard-coded charset name: %v", tc.filename, err)
-			continue
-		}
-
-		if !bytes.Equal(got, want) {
-			t.Errorf("%s: got %q, want %q", tc.filename, got, want)
-			continue
-		}
-	}
-}
-
-var metaTestCases = []struct {
-	meta, want string
-}{
-	{"", ""},
-	{"text/html", ""},
-	{"text/html; charset utf-8", ""},
-	{"text/html; charset=latin-2", "latin-2"},
-	{"text/html; charset; charset = utf-8", "utf-8"},
-	{`charset="big5"`, "big5"},
-	{"charset='shift_jis'", "shift_jis"},
-}
-
-func TestFromMeta(t *testing.T) {
-	for _, tc := range metaTestCases {
-		got := fromMetaElement(tc.meta)
-		if got != tc.want {
-			t.Errorf("%q: got %q, want %q", tc.meta, got, tc.want)
-		}
-	}
-}
-
-func TestXML(t *testing.T) {
-	const s = "<?xml version=\"1.0\" encoding=\"windows-1252\"?><a><Word>r\xe9sum\xe9</Word></a>"
-
-	d := xml.NewDecoder(strings.NewReader(s))
-	d.CharsetReader = NewReaderLabel
-
-	var a struct {
-		Word string
-	}
-	err := d.Decode(&a)
-	if err != nil {
-		t.Fatalf("Decode: %v", err)
-	}
-
-	want := "résumé"
-	if a.Word != want {
-		t.Errorf("got %q, want %q", a.Word, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-charset.html b/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-charset.html
deleted file mode 100644
index 9915fa0ee4..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-charset.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-  <title>HTTP charset</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="The character encoding of a page can be set using the HTTP header charset declaration.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
-</head>
-<body>
-<p class='title'>HTTP charset</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">The character encoding of a page can be set using the HTTP header charset declaration.</p>
-<div class="notes"><p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p><p>The only character encoding declaration for this HTML file is in the HTTP header, which sets the encoding to ISO 8859-15.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-003">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-001<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-001" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html b/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
deleted file mode 100644
index 26e5d8b4eb..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-UTF-8-BOM.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-  <title>HTTP vs UTF-8 BOM</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
-</head>
-<body>
-<p class='title'>HTTP vs UTF-8 BOM</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">A character encoding set in the HTTP header has lower precedence than the UTF-8 signature.</p>
-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p><p>If the test is unsuccessful, the characters &#x00EF;&#x00BB;&#x00BF; should appear at the top of the page.  These represent the bytes that make up the UTF-8 signature when encountered in the ISO 8859-15 encoding.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-022">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-034<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-034" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html b/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
deleted file mode 100644
index 2f07e95158..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-charset.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta charset="iso-8859-1" > <title>HTTP vs meta charset</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.">
-<style type='text/css'>
-.test div { width: 50px; }.test div { width: 90px; }
-</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
-</head>
-<body>
-<p class='title'>HTTP vs meta charset</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta charset attribute.</p>
-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-037">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-018<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-018" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html b/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
deleted file mode 100644
index 6853cddecc..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/HTTP-vs-meta-content.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta http-equiv="content-type" content="text/html;charset=iso-8859-1" > <title>HTTP vs meta content</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.">
-<style type='text/css'>
-.test div { width: 50px; }.test div { width: 90px; }
-</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
-</head>
-<body>
-<p class='title'>HTTP vs meta content</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">The HTTP header has a higher precedence than an encoding declaration in a meta content attribute.</p>
-<div class="notes"><p><p>The HTTP header attempts to set the character encoding to ISO 8859-15. The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-1.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-018">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-016<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-016" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html b/installer/vendor/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
deleted file mode 100644
index 612e26c6c5..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/No-encoding-declaration.html
+++ /dev/null
@@ -1,47 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
-  <title>No encoding declaration</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
-</head>
-<body>
-<p class='title'>No encoding declaration</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">A page with no encoding information in HTTP, BOM, XML declaration or meta element will be treated as UTF-8.</p>
-<div class="notes"><p><p>The test on this page contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-034">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-015<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-015" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/README b/installer/vendor/golang.org/x/net/html/charset/testdata/README
deleted file mode 100644
index 38ef0f9f12..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/README
+++ /dev/null
@@ -1,9 +0,0 @@
-These test cases come from
-http://www.w3.org/International/tests/repository/html5/the-input-byte-stream/results-basics
-
-Distributed under both the W3C Test Suite License
-(http://www.w3.org/Consortium/Legal/2008/04-testsuite-license)
-and the W3C 3-clause BSD License
-(http://www.w3.org/Consortium/Legal/2008/03-bsd-license).
-To contribute to a W3C Test Suite, see the policies and contribution
-forms (http://www.w3.org/2004/10/27-testcases).
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html b/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html
deleted file mode 100644
index 3abf7a9343..0000000000
Binary files a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16BE-BOM.html and /dev/null differ
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html b/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html
deleted file mode 100644
index 76254c980c..0000000000
Binary files a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-16LE-BOM.html and /dev/null differ
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html b/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
deleted file mode 100644
index 83de43338e..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-charset.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta charset="iso-8859-15"> <title>UTF-8 BOM vs meta charset</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.">
-<style type='text/css'>
-.test div { width: 50px; }.test div { width: 90px; }
-</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
-</head>
-<body>
-<p class='title'>UTF-8 BOM vs meta charset</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta charset attribute declares a different encoding.</p>
-<div class="notes"><p><p>The page contains an encoding declaration in a meta charset attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-024">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-038<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-038" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html b/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
deleted file mode 100644
index 501aac2d6a..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/UTF-8-BOM-vs-meta-content.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>UTF-8 BOM vs meta content</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-utf8.css">
-</head>
-<body>
-<p class='title'>UTF-8 BOM vs meta content</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">A page with a UTF-8 BOM will be recognized as UTF-8 even if the meta content attribute declares a different encoding.</p>
-<div class="notes"><p><p>The page contains an encoding declaration in a meta content attribute that attempts to set the character encoding to ISO 8859-15, but the file starts with a UTF-8 signature.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00FD;&#x00E4;&#x00E8;</code>. This matches the sequence of bytes above when they are interpreted as UTF-8. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-038">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-037<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#precedence" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-037" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html b/installer/vendor/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
deleted file mode 100644
index 2d7d25aba1..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/meta-charset-attribute.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta charset="iso-8859-15"> <title>meta charset attribute</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="The character encoding of the page can be set by a meta element with charset attribute.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
-</head>
-<body>
-<p class='title'>meta charset attribute</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with charset attribute.</p>
-<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the charset attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-015">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-009<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-009" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/charset/testdata/meta-content-attribute.html b/installer/vendor/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
deleted file mode 100644
index 1c3f228e7c..0000000000
--- a/installer/vendor/golang.org/x/net/html/charset/testdata/meta-content-attribute.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE html>
-<html  lang="en" >
-<head>
- <meta http-equiv="content-type" content="text/html; charset=iso-8859-15"> <title>meta content attribute</title>
-<link rel='author' title='Richard Ishida' href='mailto:ishida@w3.org'>
-<link rel='help' href='http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream'>
-<link rel="stylesheet" type="text/css" href="./generatedtests.css">
-<script src="http://w3c-test.org/resources/testharness.js"></script>
-<script src="http://w3c-test.org/resources/testharnessreport.js"></script>
-<meta name='flags' content='http'>
-<meta name="assert" content="The character encoding of the page can be set by a meta element with http-equiv and content attributes.">
-<style type='text/css'>
-.test div { width: 50px; }</style>
-<link rel="stylesheet" type="text/css" href="the-input-byte-stream/support/encodingtests-15.css">
-</head>
-<body>
-<p class='title'>meta content attribute</p>
-
-
-<div id='log'></div>
-
-
-<div class='test'><div id='box' class='ýäè'>&#xA0;</div></div>
-
-
-
-
-
-<div class='description'>
-<p class="assertion" title="Assertion">The character encoding of the page can be set by a meta element with http-equiv and content attributes.</p>
-<div class="notes"><p><p>The only character encoding declaration for this HTML file is in the content attribute of the meta element, which declares the encoding to be ISO 8859-15.</p><p>The test contains a div with a class name that contains the following sequence of bytes: 0xC3 0xBD 0xC3 0xA4 0xC3 0xA8. These represent different sequences of characters in ISO 8859-15, ISO 8859-1 and UTF-8. The external, UTF-8-encoded stylesheet contains a selector <code>.test div.&#x00C3;&#x0153;&#x00C3;&#x20AC;&#x00C3;&#x0161;</code>. This matches the sequence of bytes above when they are interpreted as ISO 8859-15. If the class name matches the selector then the test will pass.</p></p>
-</div>
-</div>
-<div class="nexttest"><div><a href="generate?test=the-input-byte-stream-009">Next test</a></div><div class="doctype">HTML5</div>
-<p class="jump">the-input-byte-stream-007<br /><a href="/International/tests/html5/the-input-byte-stream/results-basics#basics" target="_blank">Result summary &amp; related tests</a><br /><a href="http://w3c-test.org/framework/details/i18n-html5/the-input-byte-stream-007" target="_blank">Detailed results for this test</a><br/>	<a href="http://www.w3.org/TR/html5/syntax.html#the-input-byte-stream" target="_blank">Link to spec</a></p>
-<div class='prereq'>Assumptions: <ul><li>The default encoding for the browser you are testing is not set to ISO 8859-15.</li>
-				<li>The test is read from a server that supports HTTP.</li></ul></div>
-</div>
-<script>
-test(function() {
-assert_equals(document.getElementById('box').offsetWidth, 100);
-}, " ");
-</script>
-
-</body>
-</html>
-
-
diff --git a/installer/vendor/golang.org/x/net/html/const.go b/installer/vendor/golang.org/x/net/html/const.go
deleted file mode 100644
index 52f651ff6d..0000000000
--- a/installer/vendor/golang.org/x/net/html/const.go
+++ /dev/null
@@ -1,102 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// Section 12.2.3.2 of the HTML5 specification says "The following elements
-// have varying levels of special parsing rules".
-// https://html.spec.whatwg.org/multipage/syntax.html#the-stack-of-open-elements
-var isSpecialElementMap = map[string]bool{
-	"address":    true,
-	"applet":     true,
-	"area":       true,
-	"article":    true,
-	"aside":      true,
-	"base":       true,
-	"basefont":   true,
-	"bgsound":    true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"button":     true,
-	"caption":    true,
-	"center":     true,
-	"col":        true,
-	"colgroup":   true,
-	"dd":         true,
-	"details":    true,
-	"dir":        true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"embed":      true,
-	"fieldset":   true,
-	"figcaption": true,
-	"figure":     true,
-	"footer":     true,
-	"form":       true,
-	"frame":      true,
-	"frameset":   true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"header":     true,
-	"hgroup":     true,
-	"hr":         true,
-	"html":       true,
-	"iframe":     true,
-	"img":        true,
-	"input":      true,
-	"isindex":    true,
-	"li":         true,
-	"link":       true,
-	"listing":    true,
-	"marquee":    true,
-	"menu":       true,
-	"meta":       true,
-	"nav":        true,
-	"noembed":    true,
-	"noframes":   true,
-	"noscript":   true,
-	"object":     true,
-	"ol":         true,
-	"p":          true,
-	"param":      true,
-	"plaintext":  true,
-	"pre":        true,
-	"script":     true,
-	"section":    true,
-	"select":     true,
-	"source":     true,
-	"style":      true,
-	"summary":    true,
-	"table":      true,
-	"tbody":      true,
-	"td":         true,
-	"template":   true,
-	"textarea":   true,
-	"tfoot":      true,
-	"th":         true,
-	"thead":      true,
-	"title":      true,
-	"tr":         true,
-	"track":      true,
-	"ul":         true,
-	"wbr":        true,
-	"xmp":        true,
-}
-
-func isSpecialElement(element *Node) bool {
-	switch element.Namespace {
-	case "", "html":
-		return isSpecialElementMap[element.Data]
-	case "svg":
-		return element.Data == "foreignObject"
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/html/doc.go b/installer/vendor/golang.org/x/net/html/doc.go
deleted file mode 100644
index 94f496874a..0000000000
--- a/installer/vendor/golang.org/x/net/html/doc.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package html implements an HTML5-compliant tokenizer and parser.
-
-Tokenization is done by creating a Tokenizer for an io.Reader r. It is the
-caller's responsibility to ensure that r provides UTF-8 encoded HTML.
-
-	z := html.NewTokenizer(r)
-
-Given a Tokenizer z, the HTML is tokenized by repeatedly calling z.Next(),
-which parses the next token and returns its type, or an error:
-
-	for {
-		tt := z.Next()
-		if tt == html.ErrorToken {
-			// ...
-			return ...
-		}
-		// Process the current token.
-	}
-
-There are two APIs for retrieving the current token. The high-level API is to
-call Token; the low-level API is to call Text or TagName / TagAttr. Both APIs
-allow optionally calling Raw after Next but before Token, Text, TagName, or
-TagAttr. In EBNF notation, the valid call sequence per token is:
-
-	Next {Raw} [ Token | Text | TagName {TagAttr} ]
-
-Token returns an independent data structure that completely describes a token.
-Entities (such as "&lt;") are unescaped, tag names and attribute keys are
-lower-cased, and attributes are collected into a []Attribute. For example:
-
-	for {
-		if z.Next() == html.ErrorToken {
-			// Returning io.EOF indicates success.
-			return z.Err()
-		}
-		emitToken(z.Token())
-	}
-
-The low-level API performs fewer allocations and copies, but the contents of
-the []byte values returned by Text, TagName and TagAttr may change on the next
-call to Next. For example, to extract an HTML page's anchor text:
-
-	depth := 0
-	for {
-		tt := z.Next()
-		switch tt {
-		case ErrorToken:
-			return z.Err()
-		case TextToken:
-			if depth > 0 {
-				// emitBytes should copy the []byte it receives,
-				// if it doesn't process it immediately.
-				emitBytes(z.Text())
-			}
-		case StartTagToken, EndTagToken:
-			tn, _ := z.TagName()
-			if len(tn) == 1 && tn[0] == 'a' {
-				if tt == StartTagToken {
-					depth++
-				} else {
-					depth--
-				}
-			}
-		}
-	}
-
-Parsing is done by calling Parse with an io.Reader, which returns the root of
-the parse tree (the document element) as a *Node. It is the caller's
-responsibility to ensure that the Reader provides UTF-8 encoded HTML. For
-example, to process each anchor node in depth-first order:
-
-	doc, err := html.Parse(r)
-	if err != nil {
-		// ...
-	}
-	var f func(*html.Node)
-	f = func(n *html.Node) {
-		if n.Type == html.ElementNode && n.Data == "a" {
-			// Do something with n...
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			f(c)
-		}
-	}
-	f(doc)
-
-The relevant specifications include:
-https://html.spec.whatwg.org/multipage/syntax.html and
-https://html.spec.whatwg.org/multipage/syntax.html#tokenization
-*/
-package html // import "golang.org/x/net/html"
-
-// The tokenization algorithm implemented by this package is not a line-by-line
-// transliteration of the relatively verbose state-machine in the WHATWG
-// specification. A more direct approach is used instead, where the program
-// counter implies the state, such as whether it is tokenizing a tag or a text
-// node. Specification compliance is verified by checking expected and actual
-// outputs over a test suite rather than aiming for algorithmic fidelity.
-
-// TODO(nigeltao): Does a DOM API belong in this package or a separate one?
-// TODO(nigeltao): How does parsing interact with a JavaScript engine?
diff --git a/installer/vendor/golang.org/x/net/html/doctype.go b/installer/vendor/golang.org/x/net/html/doctype.go
deleted file mode 100644
index c484e5a94f..0000000000
--- a/installer/vendor/golang.org/x/net/html/doctype.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-// parseDoctype parses the data from a DoctypeToken into a name,
-// public identifier, and system identifier. It returns a Node whose Type
-// is DoctypeNode, whose Data is the name, and which has attributes
-// named "system" and "public" for the two identifiers if they were present.
-// quirks is whether the document should be parsed in "quirks mode".
-func parseDoctype(s string) (n *Node, quirks bool) {
-	n = &Node{Type: DoctypeNode}
-
-	// Find the name.
-	space := strings.IndexAny(s, whitespace)
-	if space == -1 {
-		space = len(s)
-	}
-	n.Data = s[:space]
-	// The comparison to "html" is case-sensitive.
-	if n.Data != "html" {
-		quirks = true
-	}
-	n.Data = strings.ToLower(n.Data)
-	s = strings.TrimLeft(s[space:], whitespace)
-
-	if len(s) < 6 {
-		// It can't start with "PUBLIC" or "SYSTEM".
-		// Ignore the rest of the string.
-		return n, quirks || s != ""
-	}
-
-	key := strings.ToLower(s[:6])
-	s = s[6:]
-	for key == "public" || key == "system" {
-		s = strings.TrimLeft(s, whitespace)
-		if s == "" {
-			break
-		}
-		quote := s[0]
-		if quote != '"' && quote != '\'' {
-			break
-		}
-		s = s[1:]
-		q := strings.IndexRune(s, rune(quote))
-		var id string
-		if q == -1 {
-			id = s
-			s = ""
-		} else {
-			id = s[:q]
-			s = s[q+1:]
-		}
-		n.Attr = append(n.Attr, Attribute{Key: key, Val: id})
-		if key == "public" {
-			key = "system"
-		} else {
-			key = ""
-		}
-	}
-
-	if key != "" || s != "" {
-		quirks = true
-	} else if len(n.Attr) > 0 {
-		if n.Attr[0].Key == "public" {
-			public := strings.ToLower(n.Attr[0].Val)
-			switch public {
-			case "-//w3o//dtd w3 html strict 3.0//en//", "-/w3d/dtd html 4.0 transitional/en", "html":
-				quirks = true
-			default:
-				for _, q := range quirkyIDs {
-					if strings.HasPrefix(public, q) {
-						quirks = true
-						break
-					}
-				}
-			}
-			// The following two public IDs only cause quirks mode if there is no system ID.
-			if len(n.Attr) == 1 && (strings.HasPrefix(public, "-//w3c//dtd html 4.01 frameset//") ||
-				strings.HasPrefix(public, "-//w3c//dtd html 4.01 transitional//")) {
-				quirks = true
-			}
-		}
-		if lastAttr := n.Attr[len(n.Attr)-1]; lastAttr.Key == "system" &&
-			strings.ToLower(lastAttr.Val) == "http://www.ibm.com/data/dtd/v11/ibmxhtml1-transitional.dtd" {
-			quirks = true
-		}
-	}
-
-	return n, quirks
-}
-
-// quirkyIDs is a list of public doctype identifiers that cause a document
-// to be interpreted in quirks mode. The identifiers should be in lower case.
-var quirkyIDs = []string{
-	"+//silmaril//dtd html pro v0r11 19970101//",
-	"-//advasoft ltd//dtd html 3.0 aswedit + extensions//",
-	"-//as//dtd html 3.0 aswedit + extensions//",
-	"-//ietf//dtd html 2.0 level 1//",
-	"-//ietf//dtd html 2.0 level 2//",
-	"-//ietf//dtd html 2.0 strict level 1//",
-	"-//ietf//dtd html 2.0 strict level 2//",
-	"-//ietf//dtd html 2.0 strict//",
-	"-//ietf//dtd html 2.0//",
-	"-//ietf//dtd html 2.1e//",
-	"-//ietf//dtd html 3.0//",
-	"-//ietf//dtd html 3.2 final//",
-	"-//ietf//dtd html 3.2//",
-	"-//ietf//dtd html 3//",
-	"-//ietf//dtd html level 0//",
-	"-//ietf//dtd html level 1//",
-	"-//ietf//dtd html level 2//",
-	"-//ietf//dtd html level 3//",
-	"-//ietf//dtd html strict level 0//",
-	"-//ietf//dtd html strict level 1//",
-	"-//ietf//dtd html strict level 2//",
-	"-//ietf//dtd html strict level 3//",
-	"-//ietf//dtd html strict//",
-	"-//ietf//dtd html//",
-	"-//metrius//dtd metrius presentational//",
-	"-//microsoft//dtd internet explorer 2.0 html strict//",
-	"-//microsoft//dtd internet explorer 2.0 html//",
-	"-//microsoft//dtd internet explorer 2.0 tables//",
-	"-//microsoft//dtd internet explorer 3.0 html strict//",
-	"-//microsoft//dtd internet explorer 3.0 html//",
-	"-//microsoft//dtd internet explorer 3.0 tables//",
-	"-//netscape comm. corp.//dtd html//",
-	"-//netscape comm. corp.//dtd strict html//",
-	"-//o'reilly and associates//dtd html 2.0//",
-	"-//o'reilly and associates//dtd html extended 1.0//",
-	"-//o'reilly and associates//dtd html extended relaxed 1.0//",
-	"-//softquad software//dtd hotmetal pro 6.0::19990601::extensions to html 4.0//",
-	"-//softquad//dtd hotmetal pro 4.0::19971010::extensions to html 4.0//",
-	"-//spyglass//dtd html 2.0 extended//",
-	"-//sq//dtd html 2.0 hotmetal + extensions//",
-	"-//sun microsystems corp.//dtd hotjava html//",
-	"-//sun microsystems corp.//dtd hotjava strict html//",
-	"-//w3c//dtd html 3 1995-03-24//",
-	"-//w3c//dtd html 3.2 draft//",
-	"-//w3c//dtd html 3.2 final//",
-	"-//w3c//dtd html 3.2//",
-	"-//w3c//dtd html 3.2s draft//",
-	"-//w3c//dtd html 4.0 frameset//",
-	"-//w3c//dtd html 4.0 transitional//",
-	"-//w3c//dtd html experimental 19960712//",
-	"-//w3c//dtd html experimental 970421//",
-	"-//w3c//dtd w3 html//",
-	"-//w3o//dtd w3 html 3.0//",
-	"-//webtechs//dtd mozilla html 2.0//",
-	"-//webtechs//dtd mozilla html//",
-}
diff --git a/installer/vendor/golang.org/x/net/html/entity.go b/installer/vendor/golang.org/x/net/html/entity.go
deleted file mode 100644
index a50c04c60e..0000000000
--- a/installer/vendor/golang.org/x/net/html/entity.go
+++ /dev/null
@@ -1,2253 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-// All entities that do not end with ';' are 6 or fewer bytes long.
-const longestEntityWithoutSemicolon = 6
-
-// entity is a map from HTML entity names to their values. The semicolon matters:
-// https://html.spec.whatwg.org/multipage/syntax.html#named-character-references
-// lists both "amp" and "amp;" as two separate entries.
-//
-// Note that the HTML5 list is larger than the HTML4 list at
-// http://www.w3.org/TR/html4/sgml/entities.html
-var entity = map[string]rune{
-	"AElig;":                           '\U000000C6',
-	"AMP;":                             '\U00000026',
-	"Aacute;":                          '\U000000C1',
-	"Abreve;":                          '\U00000102',
-	"Acirc;":                           '\U000000C2',
-	"Acy;":                             '\U00000410',
-	"Afr;":                             '\U0001D504',
-	"Agrave;":                          '\U000000C0',
-	"Alpha;":                           '\U00000391',
-	"Amacr;":                           '\U00000100',
-	"And;":                             '\U00002A53',
-	"Aogon;":                           '\U00000104',
-	"Aopf;":                            '\U0001D538',
-	"ApplyFunction;":                   '\U00002061',
-	"Aring;":                           '\U000000C5',
-	"Ascr;":                            '\U0001D49C',
-	"Assign;":                          '\U00002254',
-	"Atilde;":                          '\U000000C3',
-	"Auml;":                            '\U000000C4',
-	"Backslash;":                       '\U00002216',
-	"Barv;":                            '\U00002AE7',
-	"Barwed;":                          '\U00002306',
-	"Bcy;":                             '\U00000411',
-	"Because;":                         '\U00002235',
-	"Bernoullis;":                      '\U0000212C',
-	"Beta;":                            '\U00000392',
-	"Bfr;":                             '\U0001D505',
-	"Bopf;":                            '\U0001D539',
-	"Breve;":                           '\U000002D8',
-	"Bscr;":                            '\U0000212C',
-	"Bumpeq;":                          '\U0000224E',
-	"CHcy;":                            '\U00000427',
-	"COPY;":                            '\U000000A9',
-	"Cacute;":                          '\U00000106',
-	"Cap;":                             '\U000022D2',
-	"CapitalDifferentialD;":            '\U00002145',
-	"Cayleys;":                         '\U0000212D',
-	"Ccaron;":                          '\U0000010C',
-	"Ccedil;":                          '\U000000C7',
-	"Ccirc;":                           '\U00000108',
-	"Cconint;":                         '\U00002230',
-	"Cdot;":                            '\U0000010A',
-	"Cedilla;":                         '\U000000B8',
-	"CenterDot;":                       '\U000000B7',
-	"Cfr;":                             '\U0000212D',
-	"Chi;":                             '\U000003A7',
-	"CircleDot;":                       '\U00002299',
-	"CircleMinus;":                     '\U00002296',
-	"CirclePlus;":                      '\U00002295',
-	"CircleTimes;":                     '\U00002297',
-	"ClockwiseContourIntegral;":        '\U00002232',
-	"CloseCurlyDoubleQuote;":           '\U0000201D',
-	"CloseCurlyQuote;":                 '\U00002019',
-	"Colon;":                           '\U00002237',
-	"Colone;":                          '\U00002A74',
-	"Congruent;":                       '\U00002261',
-	"Conint;":                          '\U0000222F',
-	"ContourIntegral;":                 '\U0000222E',
-	"Copf;":                            '\U00002102',
-	"Coproduct;":                       '\U00002210',
-	"CounterClockwiseContourIntegral;": '\U00002233',
-	"Cross;":                    '\U00002A2F',
-	"Cscr;":                     '\U0001D49E',
-	"Cup;":                      '\U000022D3',
-	"CupCap;":                   '\U0000224D',
-	"DD;":                       '\U00002145',
-	"DDotrahd;":                 '\U00002911',
-	"DJcy;":                     '\U00000402',
-	"DScy;":                     '\U00000405',
-	"DZcy;":                     '\U0000040F',
-	"Dagger;":                   '\U00002021',
-	"Darr;":                     '\U000021A1',
-	"Dashv;":                    '\U00002AE4',
-	"Dcaron;":                   '\U0000010E',
-	"Dcy;":                      '\U00000414',
-	"Del;":                      '\U00002207',
-	"Delta;":                    '\U00000394',
-	"Dfr;":                      '\U0001D507',
-	"DiacriticalAcute;":         '\U000000B4',
-	"DiacriticalDot;":           '\U000002D9',
-	"DiacriticalDoubleAcute;":   '\U000002DD',
-	"DiacriticalGrave;":         '\U00000060',
-	"DiacriticalTilde;":         '\U000002DC',
-	"Diamond;":                  '\U000022C4',
-	"DifferentialD;":            '\U00002146',
-	"Dopf;":                     '\U0001D53B',
-	"Dot;":                      '\U000000A8',
-	"DotDot;":                   '\U000020DC',
-	"DotEqual;":                 '\U00002250',
-	"DoubleContourIntegral;":    '\U0000222F',
-	"DoubleDot;":                '\U000000A8',
-	"DoubleDownArrow;":          '\U000021D3',
-	"DoubleLeftArrow;":          '\U000021D0',
-	"DoubleLeftRightArrow;":     '\U000021D4',
-	"DoubleLeftTee;":            '\U00002AE4',
-	"DoubleLongLeftArrow;":      '\U000027F8',
-	"DoubleLongLeftRightArrow;": '\U000027FA',
-	"DoubleLongRightArrow;":     '\U000027F9',
-	"DoubleRightArrow;":         '\U000021D2',
-	"DoubleRightTee;":           '\U000022A8',
-	"DoubleUpArrow;":            '\U000021D1',
-	"DoubleUpDownArrow;":        '\U000021D5',
-	"DoubleVerticalBar;":        '\U00002225',
-	"DownArrow;":                '\U00002193',
-	"DownArrowBar;":             '\U00002913',
-	"DownArrowUpArrow;":         '\U000021F5',
-	"DownBreve;":                '\U00000311',
-	"DownLeftRightVector;":      '\U00002950',
-	"DownLeftTeeVector;":        '\U0000295E',
-	"DownLeftVector;":           '\U000021BD',
-	"DownLeftVectorBar;":        '\U00002956',
-	"DownRightTeeVector;":       '\U0000295F',
-	"DownRightVector;":          '\U000021C1',
-	"DownRightVectorBar;":       '\U00002957',
-	"DownTee;":                  '\U000022A4',
-	"DownTeeArrow;":             '\U000021A7',
-	"Downarrow;":                '\U000021D3',
-	"Dscr;":                     '\U0001D49F',
-	"Dstrok;":                   '\U00000110',
-	"ENG;":                      '\U0000014A',
-	"ETH;":                      '\U000000D0',
-	"Eacute;":                   '\U000000C9',
-	"Ecaron;":                   '\U0000011A',
-	"Ecirc;":                    '\U000000CA',
-	"Ecy;":                      '\U0000042D',
-	"Edot;":                     '\U00000116',
-	"Efr;":                      '\U0001D508',
-	"Egrave;":                   '\U000000C8',
-	"Element;":                  '\U00002208',
-	"Emacr;":                    '\U00000112',
-	"EmptySmallSquare;":         '\U000025FB',
-	"EmptyVerySmallSquare;":     '\U000025AB',
-	"Eogon;":                    '\U00000118',
-	"Eopf;":                     '\U0001D53C',
-	"Epsilon;":                  '\U00000395',
-	"Equal;":                    '\U00002A75',
-	"EqualTilde;":               '\U00002242',
-	"Equilibrium;":              '\U000021CC',
-	"Escr;":                     '\U00002130',
-	"Esim;":                     '\U00002A73',
-	"Eta;":                      '\U00000397',
-	"Euml;":                     '\U000000CB',
-	"Exists;":                   '\U00002203',
-	"ExponentialE;":             '\U00002147',
-	"Fcy;":                      '\U00000424',
-	"Ffr;":                      '\U0001D509',
-	"FilledSmallSquare;":        '\U000025FC',
-	"FilledVerySmallSquare;":    '\U000025AA',
-	"Fopf;":                     '\U0001D53D',
-	"ForAll;":                   '\U00002200',
-	"Fouriertrf;":               '\U00002131',
-	"Fscr;":                     '\U00002131',
-	"GJcy;":                     '\U00000403',
-	"GT;":                       '\U0000003E',
-	"Gamma;":                    '\U00000393',
-	"Gammad;":                   '\U000003DC',
-	"Gbreve;":                   '\U0000011E',
-	"Gcedil;":                   '\U00000122',
-	"Gcirc;":                    '\U0000011C',
-	"Gcy;":                      '\U00000413',
-	"Gdot;":                     '\U00000120',
-	"Gfr;":                      '\U0001D50A',
-	"Gg;":                       '\U000022D9',
-	"Gopf;":                     '\U0001D53E',
-	"GreaterEqual;":             '\U00002265',
-	"GreaterEqualLess;":         '\U000022DB',
-	"GreaterFullEqual;":         '\U00002267',
-	"GreaterGreater;":           '\U00002AA2',
-	"GreaterLess;":              '\U00002277',
-	"GreaterSlantEqual;":        '\U00002A7E',
-	"GreaterTilde;":             '\U00002273',
-	"Gscr;":                     '\U0001D4A2',
-	"Gt;":                       '\U0000226B',
-	"HARDcy;":                   '\U0000042A',
-	"Hacek;":                    '\U000002C7',
-	"Hat;":                      '\U0000005E',
-	"Hcirc;":                    '\U00000124',
-	"Hfr;":                      '\U0000210C',
-	"HilbertSpace;":             '\U0000210B',
-	"Hopf;":                     '\U0000210D',
-	"HorizontalLine;":           '\U00002500',
-	"Hscr;":                     '\U0000210B',
-	"Hstrok;":                   '\U00000126',
-	"HumpDownHump;":             '\U0000224E',
-	"HumpEqual;":                '\U0000224F',
-	"IEcy;":                     '\U00000415',
-	"IJlig;":                    '\U00000132',
-	"IOcy;":                     '\U00000401',
-	"Iacute;":                   '\U000000CD',
-	"Icirc;":                    '\U000000CE',
-	"Icy;":                      '\U00000418',
-	"Idot;":                     '\U00000130',
-	"Ifr;":                      '\U00002111',
-	"Igrave;":                   '\U000000CC',
-	"Im;":                       '\U00002111',
-	"Imacr;":                    '\U0000012A',
-	"ImaginaryI;":               '\U00002148',
-	"Implies;":                  '\U000021D2',
-	"Int;":                      '\U0000222C',
-	"Integral;":                 '\U0000222B',
-	"Intersection;":             '\U000022C2',
-	"InvisibleComma;":           '\U00002063',
-	"InvisibleTimes;":           '\U00002062',
-	"Iogon;":                    '\U0000012E',
-	"Iopf;":                     '\U0001D540',
-	"Iota;":                     '\U00000399',
-	"Iscr;":                     '\U00002110',
-	"Itilde;":                   '\U00000128',
-	"Iukcy;":                    '\U00000406',
-	"Iuml;":                     '\U000000CF',
-	"Jcirc;":                    '\U00000134',
-	"Jcy;":                      '\U00000419',
-	"Jfr;":                      '\U0001D50D',
-	"Jopf;":                     '\U0001D541',
-	"Jscr;":                     '\U0001D4A5',
-	"Jsercy;":                   '\U00000408',
-	"Jukcy;":                    '\U00000404',
-	"KHcy;":                     '\U00000425',
-	"KJcy;":                     '\U0000040C',
-	"Kappa;":                    '\U0000039A',
-	"Kcedil;":                   '\U00000136',
-	"Kcy;":                      '\U0000041A',
-	"Kfr;":                      '\U0001D50E',
-	"Kopf;":                     '\U0001D542',
-	"Kscr;":                     '\U0001D4A6',
-	"LJcy;":                     '\U00000409',
-	"LT;":                       '\U0000003C',
-	"Lacute;":                   '\U00000139',
-	"Lambda;":                   '\U0000039B',
-	"Lang;":                     '\U000027EA',
-	"Laplacetrf;":               '\U00002112',
-	"Larr;":                     '\U0000219E',
-	"Lcaron;":                   '\U0000013D',
-	"Lcedil;":                   '\U0000013B',
-	"Lcy;":                      '\U0000041B',
-	"LeftAngleBracket;":         '\U000027E8',
-	"LeftArrow;":                '\U00002190',
-	"LeftArrowBar;":             '\U000021E4',
-	"LeftArrowRightArrow;":      '\U000021C6',
-	"LeftCeiling;":              '\U00002308',
-	"LeftDoubleBracket;":        '\U000027E6',
-	"LeftDownTeeVector;":        '\U00002961',
-	"LeftDownVector;":           '\U000021C3',
-	"LeftDownVectorBar;":        '\U00002959',
-	"LeftFloor;":                '\U0000230A',
-	"LeftRightArrow;":           '\U00002194',
-	"LeftRightVector;":          '\U0000294E',
-	"LeftTee;":                  '\U000022A3',
-	"LeftTeeArrow;":             '\U000021A4',
-	"LeftTeeVector;":            '\U0000295A',
-	"LeftTriangle;":             '\U000022B2',
-	"LeftTriangleBar;":          '\U000029CF',
-	"LeftTriangleEqual;":        '\U000022B4',
-	"LeftUpDownVector;":         '\U00002951',
-	"LeftUpTeeVector;":          '\U00002960',
-	"LeftUpVector;":             '\U000021BF',
-	"LeftUpVectorBar;":          '\U00002958',
-	"LeftVector;":               '\U000021BC',
-	"LeftVectorBar;":            '\U00002952',
-	"Leftarrow;":                '\U000021D0',
-	"Leftrightarrow;":           '\U000021D4',
-	"LessEqualGreater;":         '\U000022DA',
-	"LessFullEqual;":            '\U00002266',
-	"LessGreater;":              '\U00002276',
-	"LessLess;":                 '\U00002AA1',
-	"LessSlantEqual;":           '\U00002A7D',
-	"LessTilde;":                '\U00002272',
-	"Lfr;":                      '\U0001D50F',
-	"Ll;":                       '\U000022D8',
-	"Lleftarrow;":               '\U000021DA',
-	"Lmidot;":                   '\U0000013F',
-	"LongLeftArrow;":            '\U000027F5',
-	"LongLeftRightArrow;":       '\U000027F7',
-	"LongRightArrow;":           '\U000027F6',
-	"Longleftarrow;":            '\U000027F8',
-	"Longleftrightarrow;":       '\U000027FA',
-	"Longrightarrow;":           '\U000027F9',
-	"Lopf;":                     '\U0001D543',
-	"LowerLeftArrow;":           '\U00002199',
-	"LowerRightArrow;":          '\U00002198',
-	"Lscr;":                     '\U00002112',
-	"Lsh;":                      '\U000021B0',
-	"Lstrok;":                   '\U00000141',
-	"Lt;":                       '\U0000226A',
-	"Map;":                      '\U00002905',
-	"Mcy;":                      '\U0000041C',
-	"MediumSpace;":              '\U0000205F',
-	"Mellintrf;":                '\U00002133',
-	"Mfr;":                      '\U0001D510',
-	"MinusPlus;":                '\U00002213',
-	"Mopf;":                     '\U0001D544',
-	"Mscr;":                     '\U00002133',
-	"Mu;":                       '\U0000039C',
-	"NJcy;":                     '\U0000040A',
-	"Nacute;":                   '\U00000143',
-	"Ncaron;":                   '\U00000147',
-	"Ncedil;":                   '\U00000145',
-	"Ncy;":                      '\U0000041D',
-	"NegativeMediumSpace;":      '\U0000200B',
-	"NegativeThickSpace;":       '\U0000200B',
-	"NegativeThinSpace;":        '\U0000200B',
-	"NegativeVeryThinSpace;":    '\U0000200B',
-	"NestedGreaterGreater;":     '\U0000226B',
-	"NestedLessLess;":           '\U0000226A',
-	"NewLine;":                  '\U0000000A',
-	"Nfr;":                      '\U0001D511',
-	"NoBreak;":                  '\U00002060',
-	"NonBreakingSpace;":         '\U000000A0',
-	"Nopf;":                     '\U00002115',
-	"Not;":                      '\U00002AEC',
-	"NotCongruent;":             '\U00002262',
-	"NotCupCap;":                '\U0000226D',
-	"NotDoubleVerticalBar;":     '\U00002226',
-	"NotElement;":               '\U00002209',
-	"NotEqual;":                 '\U00002260',
-	"NotExists;":                '\U00002204',
-	"NotGreater;":               '\U0000226F',
-	"NotGreaterEqual;":          '\U00002271',
-	"NotGreaterLess;":           '\U00002279',
-	"NotGreaterTilde;":          '\U00002275',
-	"NotLeftTriangle;":          '\U000022EA',
-	"NotLeftTriangleEqual;":     '\U000022EC',
-	"NotLess;":                  '\U0000226E',
-	"NotLessEqual;":             '\U00002270',
-	"NotLessGreater;":           '\U00002278',
-	"NotLessTilde;":             '\U00002274',
-	"NotPrecedes;":              '\U00002280',
-	"NotPrecedesSlantEqual;":    '\U000022E0',
-	"NotReverseElement;":        '\U0000220C',
-	"NotRightTriangle;":         '\U000022EB',
-	"NotRightTriangleEqual;":    '\U000022ED',
-	"NotSquareSubsetEqual;":     '\U000022E2',
-	"NotSquareSupersetEqual;":   '\U000022E3',
-	"NotSubsetEqual;":           '\U00002288',
-	"NotSucceeds;":              '\U00002281',
-	"NotSucceedsSlantEqual;":    '\U000022E1',
-	"NotSupersetEqual;":         '\U00002289',
-	"NotTilde;":                 '\U00002241',
-	"NotTildeEqual;":            '\U00002244',
-	"NotTildeFullEqual;":        '\U00002247',
-	"NotTildeTilde;":            '\U00002249',
-	"NotVerticalBar;":           '\U00002224',
-	"Nscr;":                     '\U0001D4A9',
-	"Ntilde;":                   '\U000000D1',
-	"Nu;":                       '\U0000039D',
-	"OElig;":                    '\U00000152',
-	"Oacute;":                   '\U000000D3',
-	"Ocirc;":                    '\U000000D4',
-	"Ocy;":                      '\U0000041E',
-	"Odblac;":                   '\U00000150',
-	"Ofr;":                      '\U0001D512',
-	"Ograve;":                   '\U000000D2',
-	"Omacr;":                    '\U0000014C',
-	"Omega;":                    '\U000003A9',
-	"Omicron;":                  '\U0000039F',
-	"Oopf;":                     '\U0001D546',
-	"OpenCurlyDoubleQuote;":     '\U0000201C',
-	"OpenCurlyQuote;":           '\U00002018',
-	"Or;":                       '\U00002A54',
-	"Oscr;":                     '\U0001D4AA',
-	"Oslash;":                   '\U000000D8',
-	"Otilde;":                   '\U000000D5',
-	"Otimes;":                   '\U00002A37',
-	"Ouml;":                     '\U000000D6',
-	"OverBar;":                  '\U0000203E',
-	"OverBrace;":                '\U000023DE',
-	"OverBracket;":              '\U000023B4',
-	"OverParenthesis;":          '\U000023DC',
-	"PartialD;":                 '\U00002202',
-	"Pcy;":                      '\U0000041F',
-	"Pfr;":                      '\U0001D513',
-	"Phi;":                      '\U000003A6',
-	"Pi;":                       '\U000003A0',
-	"PlusMinus;":                '\U000000B1',
-	"Poincareplane;":            '\U0000210C',
-	"Popf;":                     '\U00002119',
-	"Pr;":                       '\U00002ABB',
-	"Precedes;":                 '\U0000227A',
-	"PrecedesEqual;":            '\U00002AAF',
-	"PrecedesSlantEqual;":       '\U0000227C',
-	"PrecedesTilde;":            '\U0000227E',
-	"Prime;":                    '\U00002033',
-	"Product;":                  '\U0000220F',
-	"Proportion;":               '\U00002237',
-	"Proportional;":             '\U0000221D',
-	"Pscr;":                     '\U0001D4AB',
-	"Psi;":                      '\U000003A8',
-	"QUOT;":                     '\U00000022',
-	"Qfr;":                      '\U0001D514',
-	"Qopf;":                     '\U0000211A',
-	"Qscr;":                     '\U0001D4AC',
-	"RBarr;":                    '\U00002910',
-	"REG;":                      '\U000000AE',
-	"Racute;":                   '\U00000154',
-	"Rang;":                     '\U000027EB',
-	"Rarr;":                     '\U000021A0',
-	"Rarrtl;":                   '\U00002916',
-	"Rcaron;":                   '\U00000158',
-	"Rcedil;":                   '\U00000156',
-	"Rcy;":                      '\U00000420',
-	"Re;":                       '\U0000211C',
-	"ReverseElement;":           '\U0000220B',
-	"ReverseEquilibrium;":       '\U000021CB',
-	"ReverseUpEquilibrium;":     '\U0000296F',
-	"Rfr;":                      '\U0000211C',
-	"Rho;":                      '\U000003A1',
-	"RightAngleBracket;":        '\U000027E9',
-	"RightArrow;":               '\U00002192',
-	"RightArrowBar;":            '\U000021E5',
-	"RightArrowLeftArrow;":      '\U000021C4',
-	"RightCeiling;":             '\U00002309',
-	"RightDoubleBracket;":       '\U000027E7',
-	"RightDownTeeVector;":       '\U0000295D',
-	"RightDownVector;":          '\U000021C2',
-	"RightDownVectorBar;":       '\U00002955',
-	"RightFloor;":               '\U0000230B',
-	"RightTee;":                 '\U000022A2',
-	"RightTeeArrow;":            '\U000021A6',
-	"RightTeeVector;":           '\U0000295B',
-	"RightTriangle;":            '\U000022B3',
-	"RightTriangleBar;":         '\U000029D0',
-	"RightTriangleEqual;":       '\U000022B5',
-	"RightUpDownVector;":        '\U0000294F',
-	"RightUpTeeVector;":         '\U0000295C',
-	"RightUpVector;":            '\U000021BE',
-	"RightUpVectorBar;":         '\U00002954',
-	"RightVector;":              '\U000021C0',
-	"RightVectorBar;":           '\U00002953',
-	"Rightarrow;":               '\U000021D2',
-	"Ropf;":                     '\U0000211D',
-	"RoundImplies;":             '\U00002970',
-	"Rrightarrow;":              '\U000021DB',
-	"Rscr;":                     '\U0000211B',
-	"Rsh;":                      '\U000021B1',
-	"RuleDelayed;":              '\U000029F4',
-	"SHCHcy;":                   '\U00000429',
-	"SHcy;":                     '\U00000428',
-	"SOFTcy;":                   '\U0000042C',
-	"Sacute;":                   '\U0000015A',
-	"Sc;":                       '\U00002ABC',
-	"Scaron;":                   '\U00000160',
-	"Scedil;":                   '\U0000015E',
-	"Scirc;":                    '\U0000015C',
-	"Scy;":                      '\U00000421',
-	"Sfr;":                      '\U0001D516',
-	"ShortDownArrow;":           '\U00002193',
-	"ShortLeftArrow;":           '\U00002190',
-	"ShortRightArrow;":          '\U00002192',
-	"ShortUpArrow;":             '\U00002191',
-	"Sigma;":                    '\U000003A3',
-	"SmallCircle;":              '\U00002218',
-	"Sopf;":                     '\U0001D54A',
-	"Sqrt;":                     '\U0000221A',
-	"Square;":                   '\U000025A1',
-	"SquareIntersection;":       '\U00002293',
-	"SquareSubset;":             '\U0000228F',
-	"SquareSubsetEqual;":        '\U00002291',
-	"SquareSuperset;":           '\U00002290',
-	"SquareSupersetEqual;":      '\U00002292',
-	"SquareUnion;":              '\U00002294',
-	"Sscr;":                     '\U0001D4AE',
-	"Star;":                     '\U000022C6',
-	"Sub;":                      '\U000022D0',
-	"Subset;":                   '\U000022D0',
-	"SubsetEqual;":              '\U00002286',
-	"Succeeds;":                 '\U0000227B',
-	"SucceedsEqual;":            '\U00002AB0',
-	"SucceedsSlantEqual;":       '\U0000227D',
-	"SucceedsTilde;":            '\U0000227F',
-	"SuchThat;":                 '\U0000220B',
-	"Sum;":                      '\U00002211',
-	"Sup;":                      '\U000022D1',
-	"Superset;":                 '\U00002283',
-	"SupersetEqual;":            '\U00002287',
-	"Supset;":                   '\U000022D1',
-	"THORN;":                    '\U000000DE',
-	"TRADE;":                    '\U00002122',
-	"TSHcy;":                    '\U0000040B',
-	"TScy;":                     '\U00000426',
-	"Tab;":                      '\U00000009',
-	"Tau;":                      '\U000003A4',
-	"Tcaron;":                   '\U00000164',
-	"Tcedil;":                   '\U00000162',
-	"Tcy;":                      '\U00000422',
-	"Tfr;":                      '\U0001D517',
-	"Therefore;":                '\U00002234',
-	"Theta;":                    '\U00000398',
-	"ThinSpace;":                '\U00002009',
-	"Tilde;":                    '\U0000223C',
-	"TildeEqual;":               '\U00002243',
-	"TildeFullEqual;":           '\U00002245',
-	"TildeTilde;":               '\U00002248',
-	"Topf;":                     '\U0001D54B',
-	"TripleDot;":                '\U000020DB',
-	"Tscr;":                     '\U0001D4AF',
-	"Tstrok;":                   '\U00000166',
-	"Uacute;":                   '\U000000DA',
-	"Uarr;":                     '\U0000219F',
-	"Uarrocir;":                 '\U00002949',
-	"Ubrcy;":                    '\U0000040E',
-	"Ubreve;":                   '\U0000016C',
-	"Ucirc;":                    '\U000000DB',
-	"Ucy;":                      '\U00000423',
-	"Udblac;":                   '\U00000170',
-	"Ufr;":                      '\U0001D518',
-	"Ugrave;":                   '\U000000D9',
-	"Umacr;":                    '\U0000016A',
-	"UnderBar;":                 '\U0000005F',
-	"UnderBrace;":               '\U000023DF',
-	"UnderBracket;":             '\U000023B5',
-	"UnderParenthesis;":         '\U000023DD',
-	"Union;":                    '\U000022C3',
-	"UnionPlus;":                '\U0000228E',
-	"Uogon;":                    '\U00000172',
-	"Uopf;":                     '\U0001D54C',
-	"UpArrow;":                  '\U00002191',
-	"UpArrowBar;":               '\U00002912',
-	"UpArrowDownArrow;":         '\U000021C5',
-	"UpDownArrow;":              '\U00002195',
-	"UpEquilibrium;":            '\U0000296E',
-	"UpTee;":                    '\U000022A5',
-	"UpTeeArrow;":               '\U000021A5',
-	"Uparrow;":                  '\U000021D1',
-	"Updownarrow;":              '\U000021D5',
-	"UpperLeftArrow;":           '\U00002196',
-	"UpperRightArrow;":          '\U00002197',
-	"Upsi;":                     '\U000003D2',
-	"Upsilon;":                  '\U000003A5',
-	"Uring;":                    '\U0000016E',
-	"Uscr;":                     '\U0001D4B0',
-	"Utilde;":                   '\U00000168',
-	"Uuml;":                     '\U000000DC',
-	"VDash;":                    '\U000022AB',
-	"Vbar;":                     '\U00002AEB',
-	"Vcy;":                      '\U00000412',
-	"Vdash;":                    '\U000022A9',
-	"Vdashl;":                   '\U00002AE6',
-	"Vee;":                      '\U000022C1',
-	"Verbar;":                   '\U00002016',
-	"Vert;":                     '\U00002016',
-	"VerticalBar;":              '\U00002223',
-	"VerticalLine;":             '\U0000007C',
-	"VerticalSeparator;":        '\U00002758',
-	"VerticalTilde;":            '\U00002240',
-	"VeryThinSpace;":            '\U0000200A',
-	"Vfr;":                      '\U0001D519',
-	"Vopf;":                     '\U0001D54D',
-	"Vscr;":                     '\U0001D4B1',
-	"Vvdash;":                   '\U000022AA',
-	"Wcirc;":                    '\U00000174',
-	"Wedge;":                    '\U000022C0',
-	"Wfr;":                      '\U0001D51A',
-	"Wopf;":                     '\U0001D54E',
-	"Wscr;":                     '\U0001D4B2',
-	"Xfr;":                      '\U0001D51B',
-	"Xi;":                       '\U0000039E',
-	"Xopf;":                     '\U0001D54F',
-	"Xscr;":                     '\U0001D4B3',
-	"YAcy;":                     '\U0000042F',
-	"YIcy;":                     '\U00000407',
-	"YUcy;":                     '\U0000042E',
-	"Yacute;":                   '\U000000DD',
-	"Ycirc;":                    '\U00000176',
-	"Ycy;":                      '\U0000042B',
-	"Yfr;":                      '\U0001D51C',
-	"Yopf;":                     '\U0001D550',
-	"Yscr;":                     '\U0001D4B4',
-	"Yuml;":                     '\U00000178',
-	"ZHcy;":                     '\U00000416',
-	"Zacute;":                   '\U00000179',
-	"Zcaron;":                   '\U0000017D',
-	"Zcy;":                      '\U00000417',
-	"Zdot;":                     '\U0000017B',
-	"ZeroWidthSpace;":           '\U0000200B',
-	"Zeta;":                     '\U00000396',
-	"Zfr;":                      '\U00002128',
-	"Zopf;":                     '\U00002124',
-	"Zscr;":                     '\U0001D4B5',
-	"aacute;":                   '\U000000E1',
-	"abreve;":                   '\U00000103',
-	"ac;":                       '\U0000223E',
-	"acd;":                      '\U0000223F',
-	"acirc;":                    '\U000000E2',
-	"acute;":                    '\U000000B4',
-	"acy;":                      '\U00000430',
-	"aelig;":                    '\U000000E6',
-	"af;":                       '\U00002061',
-	"afr;":                      '\U0001D51E',
-	"agrave;":                   '\U000000E0',
-	"alefsym;":                  '\U00002135',
-	"aleph;":                    '\U00002135',
-	"alpha;":                    '\U000003B1',
-	"amacr;":                    '\U00000101',
-	"amalg;":                    '\U00002A3F',
-	"amp;":                      '\U00000026',
-	"and;":                      '\U00002227',
-	"andand;":                   '\U00002A55',
-	"andd;":                     '\U00002A5C',
-	"andslope;":                 '\U00002A58',
-	"andv;":                     '\U00002A5A',
-	"ang;":                      '\U00002220',
-	"ange;":                     '\U000029A4',
-	"angle;":                    '\U00002220',
-	"angmsd;":                   '\U00002221',
-	"angmsdaa;":                 '\U000029A8',
-	"angmsdab;":                 '\U000029A9',
-	"angmsdac;":                 '\U000029AA',
-	"angmsdad;":                 '\U000029AB',
-	"angmsdae;":                 '\U000029AC',
-	"angmsdaf;":                 '\U000029AD',
-	"angmsdag;":                 '\U000029AE',
-	"angmsdah;":                 '\U000029AF',
-	"angrt;":                    '\U0000221F',
-	"angrtvb;":                  '\U000022BE',
-	"angrtvbd;":                 '\U0000299D',
-	"angsph;":                   '\U00002222',
-	"angst;":                    '\U000000C5',
-	"angzarr;":                  '\U0000237C',
-	"aogon;":                    '\U00000105',
-	"aopf;":                     '\U0001D552',
-	"ap;":                       '\U00002248',
-	"apE;":                      '\U00002A70',
-	"apacir;":                   '\U00002A6F',
-	"ape;":                      '\U0000224A',
-	"apid;":                     '\U0000224B',
-	"apos;":                     '\U00000027',
-	"approx;":                   '\U00002248',
-	"approxeq;":                 '\U0000224A',
-	"aring;":                    '\U000000E5',
-	"ascr;":                     '\U0001D4B6',
-	"ast;":                      '\U0000002A',
-	"asymp;":                    '\U00002248',
-	"asympeq;":                  '\U0000224D',
-	"atilde;":                   '\U000000E3',
-	"auml;":                     '\U000000E4',
-	"awconint;":                 '\U00002233',
-	"awint;":                    '\U00002A11',
-	"bNot;":                     '\U00002AED',
-	"backcong;":                 '\U0000224C',
-	"backepsilon;":              '\U000003F6',
-	"backprime;":                '\U00002035',
-	"backsim;":                  '\U0000223D',
-	"backsimeq;":                '\U000022CD',
-	"barvee;":                   '\U000022BD',
-	"barwed;":                   '\U00002305',
-	"barwedge;":                 '\U00002305',
-	"bbrk;":                     '\U000023B5',
-	"bbrktbrk;":                 '\U000023B6',
-	"bcong;":                    '\U0000224C',
-	"bcy;":                      '\U00000431',
-	"bdquo;":                    '\U0000201E',
-	"becaus;":                   '\U00002235',
-	"because;":                  '\U00002235',
-	"bemptyv;":                  '\U000029B0',
-	"bepsi;":                    '\U000003F6',
-	"bernou;":                   '\U0000212C',
-	"beta;":                     '\U000003B2',
-	"beth;":                     '\U00002136',
-	"between;":                  '\U0000226C',
-	"bfr;":                      '\U0001D51F',
-	"bigcap;":                   '\U000022C2',
-	"bigcirc;":                  '\U000025EF',
-	"bigcup;":                   '\U000022C3',
-	"bigodot;":                  '\U00002A00',
-	"bigoplus;":                 '\U00002A01',
-	"bigotimes;":                '\U00002A02',
-	"bigsqcup;":                 '\U00002A06',
-	"bigstar;":                  '\U00002605',
-	"bigtriangledown;":          '\U000025BD',
-	"bigtriangleup;":            '\U000025B3',
-	"biguplus;":                 '\U00002A04',
-	"bigvee;":                   '\U000022C1',
-	"bigwedge;":                 '\U000022C0',
-	"bkarow;":                   '\U0000290D',
-	"blacklozenge;":             '\U000029EB',
-	"blacksquare;":              '\U000025AA',
-	"blacktriangle;":            '\U000025B4',
-	"blacktriangledown;":        '\U000025BE',
-	"blacktriangleleft;":        '\U000025C2',
-	"blacktriangleright;":       '\U000025B8',
-	"blank;":                    '\U00002423',
-	"blk12;":                    '\U00002592',
-	"blk14;":                    '\U00002591',
-	"blk34;":                    '\U00002593',
-	"block;":                    '\U00002588',
-	"bnot;":                     '\U00002310',
-	"bopf;":                     '\U0001D553',
-	"bot;":                      '\U000022A5',
-	"bottom;":                   '\U000022A5',
-	"bowtie;":                   '\U000022C8',
-	"boxDL;":                    '\U00002557',
-	"boxDR;":                    '\U00002554',
-	"boxDl;":                    '\U00002556',
-	"boxDr;":                    '\U00002553',
-	"boxH;":                     '\U00002550',
-	"boxHD;":                    '\U00002566',
-	"boxHU;":                    '\U00002569',
-	"boxHd;":                    '\U00002564',
-	"boxHu;":                    '\U00002567',
-	"boxUL;":                    '\U0000255D',
-	"boxUR;":                    '\U0000255A',
-	"boxUl;":                    '\U0000255C',
-	"boxUr;":                    '\U00002559',
-	"boxV;":                     '\U00002551',
-	"boxVH;":                    '\U0000256C',
-	"boxVL;":                    '\U00002563',
-	"boxVR;":                    '\U00002560',
-	"boxVh;":                    '\U0000256B',
-	"boxVl;":                    '\U00002562',
-	"boxVr;":                    '\U0000255F',
-	"boxbox;":                   '\U000029C9',
-	"boxdL;":                    '\U00002555',
-	"boxdR;":                    '\U00002552',
-	"boxdl;":                    '\U00002510',
-	"boxdr;":                    '\U0000250C',
-	"boxh;":                     '\U00002500',
-	"boxhD;":                    '\U00002565',
-	"boxhU;":                    '\U00002568',
-	"boxhd;":                    '\U0000252C',
-	"boxhu;":                    '\U00002534',
-	"boxminus;":                 '\U0000229F',
-	"boxplus;":                  '\U0000229E',
-	"boxtimes;":                 '\U000022A0',
-	"boxuL;":                    '\U0000255B',
-	"boxuR;":                    '\U00002558',
-	"boxul;":                    '\U00002518',
-	"boxur;":                    '\U00002514',
-	"boxv;":                     '\U00002502',
-	"boxvH;":                    '\U0000256A',
-	"boxvL;":                    '\U00002561',
-	"boxvR;":                    '\U0000255E',
-	"boxvh;":                    '\U0000253C',
-	"boxvl;":                    '\U00002524',
-	"boxvr;":                    '\U0000251C',
-	"bprime;":                   '\U00002035',
-	"breve;":                    '\U000002D8',
-	"brvbar;":                   '\U000000A6',
-	"bscr;":                     '\U0001D4B7',
-	"bsemi;":                    '\U0000204F',
-	"bsim;":                     '\U0000223D',
-	"bsime;":                    '\U000022CD',
-	"bsol;":                     '\U0000005C',
-	"bsolb;":                    '\U000029C5',
-	"bsolhsub;":                 '\U000027C8',
-	"bull;":                     '\U00002022',
-	"bullet;":                   '\U00002022',
-	"bump;":                     '\U0000224E',
-	"bumpE;":                    '\U00002AAE',
-	"bumpe;":                    '\U0000224F',
-	"bumpeq;":                   '\U0000224F',
-	"cacute;":                   '\U00000107',
-	"cap;":                      '\U00002229',
-	"capand;":                   '\U00002A44',
-	"capbrcup;":                 '\U00002A49',
-	"capcap;":                   '\U00002A4B',
-	"capcup;":                   '\U00002A47',
-	"capdot;":                   '\U00002A40',
-	"caret;":                    '\U00002041',
-	"caron;":                    '\U000002C7',
-	"ccaps;":                    '\U00002A4D',
-	"ccaron;":                   '\U0000010D',
-	"ccedil;":                   '\U000000E7',
-	"ccirc;":                    '\U00000109',
-	"ccups;":                    '\U00002A4C',
-	"ccupssm;":                  '\U00002A50',
-	"cdot;":                     '\U0000010B',
-	"cedil;":                    '\U000000B8',
-	"cemptyv;":                  '\U000029B2',
-	"cent;":                     '\U000000A2',
-	"centerdot;":                '\U000000B7',
-	"cfr;":                      '\U0001D520',
-	"chcy;":                     '\U00000447',
-	"check;":                    '\U00002713',
-	"checkmark;":                '\U00002713',
-	"chi;":                      '\U000003C7',
-	"cir;":                      '\U000025CB',
-	"cirE;":                     '\U000029C3',
-	"circ;":                     '\U000002C6',
-	"circeq;":                   '\U00002257',
-	"circlearrowleft;":          '\U000021BA',
-	"circlearrowright;":         '\U000021BB',
-	"circledR;":                 '\U000000AE',
-	"circledS;":                 '\U000024C8',
-	"circledast;":               '\U0000229B',
-	"circledcirc;":              '\U0000229A',
-	"circleddash;":              '\U0000229D',
-	"cire;":                     '\U00002257',
-	"cirfnint;":                 '\U00002A10',
-	"cirmid;":                   '\U00002AEF',
-	"cirscir;":                  '\U000029C2',
-	"clubs;":                    '\U00002663',
-	"clubsuit;":                 '\U00002663',
-	"colon;":                    '\U0000003A',
-	"colone;":                   '\U00002254',
-	"coloneq;":                  '\U00002254',
-	"comma;":                    '\U0000002C',
-	"commat;":                   '\U00000040',
-	"comp;":                     '\U00002201',
-	"compfn;":                   '\U00002218',
-	"complement;":               '\U00002201',
-	"complexes;":                '\U00002102',
-	"cong;":                     '\U00002245',
-	"congdot;":                  '\U00002A6D',
-	"conint;":                   '\U0000222E',
-	"copf;":                     '\U0001D554',
-	"coprod;":                   '\U00002210',
-	"copy;":                     '\U000000A9',
-	"copysr;":                   '\U00002117',
-	"crarr;":                    '\U000021B5',
-	"cross;":                    '\U00002717',
-	"cscr;":                     '\U0001D4B8',
-	"csub;":                     '\U00002ACF',
-	"csube;":                    '\U00002AD1',
-	"csup;":                     '\U00002AD0',
-	"csupe;":                    '\U00002AD2',
-	"ctdot;":                    '\U000022EF',
-	"cudarrl;":                  '\U00002938',
-	"cudarrr;":                  '\U00002935',
-	"cuepr;":                    '\U000022DE',
-	"cuesc;":                    '\U000022DF',
-	"cularr;":                   '\U000021B6',
-	"cularrp;":                  '\U0000293D',
-	"cup;":                      '\U0000222A',
-	"cupbrcap;":                 '\U00002A48',
-	"cupcap;":                   '\U00002A46',
-	"cupcup;":                   '\U00002A4A',
-	"cupdot;":                   '\U0000228D',
-	"cupor;":                    '\U00002A45',
-	"curarr;":                   '\U000021B7',
-	"curarrm;":                  '\U0000293C',
-	"curlyeqprec;":              '\U000022DE',
-	"curlyeqsucc;":              '\U000022DF',
-	"curlyvee;":                 '\U000022CE',
-	"curlywedge;":               '\U000022CF',
-	"curren;":                   '\U000000A4',
-	"curvearrowleft;":           '\U000021B6',
-	"curvearrowright;":          '\U000021B7',
-	"cuvee;":                    '\U000022CE',
-	"cuwed;":                    '\U000022CF',
-	"cwconint;":                 '\U00002232',
-	"cwint;":                    '\U00002231',
-	"cylcty;":                   '\U0000232D',
-	"dArr;":                     '\U000021D3',
-	"dHar;":                     '\U00002965',
-	"dagger;":                   '\U00002020',
-	"daleth;":                   '\U00002138',
-	"darr;":                     '\U00002193',
-	"dash;":                     '\U00002010',
-	"dashv;":                    '\U000022A3',
-	"dbkarow;":                  '\U0000290F',
-	"dblac;":                    '\U000002DD',
-	"dcaron;":                   '\U0000010F',
-	"dcy;":                      '\U00000434',
-	"dd;":                       '\U00002146',
-	"ddagger;":                  '\U00002021',
-	"ddarr;":                    '\U000021CA',
-	"ddotseq;":                  '\U00002A77',
-	"deg;":                      '\U000000B0',
-	"delta;":                    '\U000003B4',
-	"demptyv;":                  '\U000029B1',
-	"dfisht;":                   '\U0000297F',
-	"dfr;":                      '\U0001D521',
-	"dharl;":                    '\U000021C3',
-	"dharr;":                    '\U000021C2',
-	"diam;":                     '\U000022C4',
-	"diamond;":                  '\U000022C4',
-	"diamondsuit;":              '\U00002666',
-	"diams;":                    '\U00002666',
-	"die;":                      '\U000000A8',
-	"digamma;":                  '\U000003DD',
-	"disin;":                    '\U000022F2',
-	"div;":                      '\U000000F7',
-	"divide;":                   '\U000000F7',
-	"divideontimes;":            '\U000022C7',
-	"divonx;":                   '\U000022C7',
-	"djcy;":                     '\U00000452',
-	"dlcorn;":                   '\U0000231E',
-	"dlcrop;":                   '\U0000230D',
-	"dollar;":                   '\U00000024',
-	"dopf;":                     '\U0001D555',
-	"dot;":                      '\U000002D9',
-	"doteq;":                    '\U00002250',
-	"doteqdot;":                 '\U00002251',
-	"dotminus;":                 '\U00002238',
-	"dotplus;":                  '\U00002214',
-	"dotsquare;":                '\U000022A1',
-	"doublebarwedge;":           '\U00002306',
-	"downarrow;":                '\U00002193',
-	"downdownarrows;":           '\U000021CA',
-	"downharpoonleft;":          '\U000021C3',
-	"downharpoonright;":         '\U000021C2',
-	"drbkarow;":                 '\U00002910',
-	"drcorn;":                   '\U0000231F',
-	"drcrop;":                   '\U0000230C',
-	"dscr;":                     '\U0001D4B9',
-	"dscy;":                     '\U00000455',
-	"dsol;":                     '\U000029F6',
-	"dstrok;":                   '\U00000111',
-	"dtdot;":                    '\U000022F1',
-	"dtri;":                     '\U000025BF',
-	"dtrif;":                    '\U000025BE',
-	"duarr;":                    '\U000021F5',
-	"duhar;":                    '\U0000296F',
-	"dwangle;":                  '\U000029A6',
-	"dzcy;":                     '\U0000045F',
-	"dzigrarr;":                 '\U000027FF',
-	"eDDot;":                    '\U00002A77',
-	"eDot;":                     '\U00002251',
-	"eacute;":                   '\U000000E9',
-	"easter;":                   '\U00002A6E',
-	"ecaron;":                   '\U0000011B',
-	"ecir;":                     '\U00002256',
-	"ecirc;":                    '\U000000EA',
-	"ecolon;":                   '\U00002255',
-	"ecy;":                      '\U0000044D',
-	"edot;":                     '\U00000117',
-	"ee;":                       '\U00002147',
-	"efDot;":                    '\U00002252',
-	"efr;":                      '\U0001D522',
-	"eg;":                       '\U00002A9A',
-	"egrave;":                   '\U000000E8',
-	"egs;":                      '\U00002A96',
-	"egsdot;":                   '\U00002A98',
-	"el;":                       '\U00002A99',
-	"elinters;":                 '\U000023E7',
-	"ell;":                      '\U00002113',
-	"els;":                      '\U00002A95',
-	"elsdot;":                   '\U00002A97',
-	"emacr;":                    '\U00000113',
-	"empty;":                    '\U00002205',
-	"emptyset;":                 '\U00002205',
-	"emptyv;":                   '\U00002205',
-	"emsp;":                     '\U00002003',
-	"emsp13;":                   '\U00002004',
-	"emsp14;":                   '\U00002005',
-	"eng;":                      '\U0000014B',
-	"ensp;":                     '\U00002002',
-	"eogon;":                    '\U00000119',
-	"eopf;":                     '\U0001D556',
-	"epar;":                     '\U000022D5',
-	"eparsl;":                   '\U000029E3',
-	"eplus;":                    '\U00002A71',
-	"epsi;":                     '\U000003B5',
-	"epsilon;":                  '\U000003B5',
-	"epsiv;":                    '\U000003F5',
-	"eqcirc;":                   '\U00002256',
-	"eqcolon;":                  '\U00002255',
-	"eqsim;":                    '\U00002242',
-	"eqslantgtr;":               '\U00002A96',
-	"eqslantless;":              '\U00002A95',
-	"equals;":                   '\U0000003D',
-	"equest;":                   '\U0000225F',
-	"equiv;":                    '\U00002261',
-	"equivDD;":                  '\U00002A78',
-	"eqvparsl;":                 '\U000029E5',
-	"erDot;":                    '\U00002253',
-	"erarr;":                    '\U00002971',
-	"escr;":                     '\U0000212F',
-	"esdot;":                    '\U00002250',
-	"esim;":                     '\U00002242',
-	"eta;":                      '\U000003B7',
-	"eth;":                      '\U000000F0',
-	"euml;":                     '\U000000EB',
-	"euro;":                     '\U000020AC',
-	"excl;":                     '\U00000021',
-	"exist;":                    '\U00002203',
-	"expectation;":              '\U00002130',
-	"exponentiale;":             '\U00002147',
-	"fallingdotseq;":            '\U00002252',
-	"fcy;":                      '\U00000444',
-	"female;":                   '\U00002640',
-	"ffilig;":                   '\U0000FB03',
-	"fflig;":                    '\U0000FB00',
-	"ffllig;":                   '\U0000FB04',
-	"ffr;":                      '\U0001D523',
-	"filig;":                    '\U0000FB01',
-	"flat;":                     '\U0000266D',
-	"fllig;":                    '\U0000FB02',
-	"fltns;":                    '\U000025B1',
-	"fnof;":                     '\U00000192',
-	"fopf;":                     '\U0001D557',
-	"forall;":                   '\U00002200',
-	"fork;":                     '\U000022D4',
-	"forkv;":                    '\U00002AD9',
-	"fpartint;":                 '\U00002A0D',
-	"frac12;":                   '\U000000BD',
-	"frac13;":                   '\U00002153',
-	"frac14;":                   '\U000000BC',
-	"frac15;":                   '\U00002155',
-	"frac16;":                   '\U00002159',
-	"frac18;":                   '\U0000215B',
-	"frac23;":                   '\U00002154',
-	"frac25;":                   '\U00002156',
-	"frac34;":                   '\U000000BE',
-	"frac35;":                   '\U00002157',
-	"frac38;":                   '\U0000215C',
-	"frac45;":                   '\U00002158',
-	"frac56;":                   '\U0000215A',
-	"frac58;":                   '\U0000215D',
-	"frac78;":                   '\U0000215E',
-	"frasl;":                    '\U00002044',
-	"frown;":                    '\U00002322',
-	"fscr;":                     '\U0001D4BB',
-	"gE;":                       '\U00002267',
-	"gEl;":                      '\U00002A8C',
-	"gacute;":                   '\U000001F5',
-	"gamma;":                    '\U000003B3',
-	"gammad;":                   '\U000003DD',
-	"gap;":                      '\U00002A86',
-	"gbreve;":                   '\U0000011F',
-	"gcirc;":                    '\U0000011D',
-	"gcy;":                      '\U00000433',
-	"gdot;":                     '\U00000121',
-	"ge;":                       '\U00002265',
-	"gel;":                      '\U000022DB',
-	"geq;":                      '\U00002265',
-	"geqq;":                     '\U00002267',
-	"geqslant;":                 '\U00002A7E',
-	"ges;":                      '\U00002A7E',
-	"gescc;":                    '\U00002AA9',
-	"gesdot;":                   '\U00002A80',
-	"gesdoto;":                  '\U00002A82',
-	"gesdotol;":                 '\U00002A84',
-	"gesles;":                   '\U00002A94',
-	"gfr;":                      '\U0001D524',
-	"gg;":                       '\U0000226B',
-	"ggg;":                      '\U000022D9',
-	"gimel;":                    '\U00002137',
-	"gjcy;":                     '\U00000453',
-	"gl;":                       '\U00002277',
-	"glE;":                      '\U00002A92',
-	"gla;":                      '\U00002AA5',
-	"glj;":                      '\U00002AA4',
-	"gnE;":                      '\U00002269',
-	"gnap;":                     '\U00002A8A',
-	"gnapprox;":                 '\U00002A8A',
-	"gne;":                      '\U00002A88',
-	"gneq;":                     '\U00002A88',
-	"gneqq;":                    '\U00002269',
-	"gnsim;":                    '\U000022E7',
-	"gopf;":                     '\U0001D558',
-	"grave;":                    '\U00000060',
-	"gscr;":                     '\U0000210A',
-	"gsim;":                     '\U00002273',
-	"gsime;":                    '\U00002A8E',
-	"gsiml;":                    '\U00002A90',
-	"gt;":                       '\U0000003E',
-	"gtcc;":                     '\U00002AA7',
-	"gtcir;":                    '\U00002A7A',
-	"gtdot;":                    '\U000022D7',
-	"gtlPar;":                   '\U00002995',
-	"gtquest;":                  '\U00002A7C',
-	"gtrapprox;":                '\U00002A86',
-	"gtrarr;":                   '\U00002978',
-	"gtrdot;":                   '\U000022D7',
-	"gtreqless;":                '\U000022DB',
-	"gtreqqless;":               '\U00002A8C',
-	"gtrless;":                  '\U00002277',
-	"gtrsim;":                   '\U00002273',
-	"hArr;":                     '\U000021D4',
-	"hairsp;":                   '\U0000200A',
-	"half;":                     '\U000000BD',
-	"hamilt;":                   '\U0000210B',
-	"hardcy;":                   '\U0000044A',
-	"harr;":                     '\U00002194',
-	"harrcir;":                  '\U00002948',
-	"harrw;":                    '\U000021AD',
-	"hbar;":                     '\U0000210F',
-	"hcirc;":                    '\U00000125',
-	"hearts;":                   '\U00002665',
-	"heartsuit;":                '\U00002665',
-	"hellip;":                   '\U00002026',
-	"hercon;":                   '\U000022B9',
-	"hfr;":                      '\U0001D525',
-	"hksearow;":                 '\U00002925',
-	"hkswarow;":                 '\U00002926',
-	"hoarr;":                    '\U000021FF',
-	"homtht;":                   '\U0000223B',
-	"hookleftarrow;":            '\U000021A9',
-	"hookrightarrow;":           '\U000021AA',
-	"hopf;":                     '\U0001D559',
-	"horbar;":                   '\U00002015',
-	"hscr;":                     '\U0001D4BD',
-	"hslash;":                   '\U0000210F',
-	"hstrok;":                   '\U00000127',
-	"hybull;":                   '\U00002043',
-	"hyphen;":                   '\U00002010',
-	"iacute;":                   '\U000000ED',
-	"ic;":                       '\U00002063',
-	"icirc;":                    '\U000000EE',
-	"icy;":                      '\U00000438',
-	"iecy;":                     '\U00000435',
-	"iexcl;":                    '\U000000A1',
-	"iff;":                      '\U000021D4',
-	"ifr;":                      '\U0001D526',
-	"igrave;":                   '\U000000EC',
-	"ii;":                       '\U00002148',
-	"iiiint;":                   '\U00002A0C',
-	"iiint;":                    '\U0000222D',
-	"iinfin;":                   '\U000029DC',
-	"iiota;":                    '\U00002129',
-	"ijlig;":                    '\U00000133',
-	"imacr;":                    '\U0000012B',
-	"image;":                    '\U00002111',
-	"imagline;":                 '\U00002110',
-	"imagpart;":                 '\U00002111',
-	"imath;":                    '\U00000131',
-	"imof;":                     '\U000022B7',
-	"imped;":                    '\U000001B5',
-	"in;":                       '\U00002208',
-	"incare;":                   '\U00002105',
-	"infin;":                    '\U0000221E',
-	"infintie;":                 '\U000029DD',
-	"inodot;":                   '\U00000131',
-	"int;":                      '\U0000222B',
-	"intcal;":                   '\U000022BA',
-	"integers;":                 '\U00002124',
-	"intercal;":                 '\U000022BA',
-	"intlarhk;":                 '\U00002A17',
-	"intprod;":                  '\U00002A3C',
-	"iocy;":                     '\U00000451',
-	"iogon;":                    '\U0000012F',
-	"iopf;":                     '\U0001D55A',
-	"iota;":                     '\U000003B9',
-	"iprod;":                    '\U00002A3C',
-	"iquest;":                   '\U000000BF',
-	"iscr;":                     '\U0001D4BE',
-	"isin;":                     '\U00002208',
-	"isinE;":                    '\U000022F9',
-	"isindot;":                  '\U000022F5',
-	"isins;":                    '\U000022F4',
-	"isinsv;":                   '\U000022F3',
-	"isinv;":                    '\U00002208',
-	"it;":                       '\U00002062',
-	"itilde;":                   '\U00000129',
-	"iukcy;":                    '\U00000456',
-	"iuml;":                     '\U000000EF',
-	"jcirc;":                    '\U00000135',
-	"jcy;":                      '\U00000439',
-	"jfr;":                      '\U0001D527',
-	"jmath;":                    '\U00000237',
-	"jopf;":                     '\U0001D55B',
-	"jscr;":                     '\U0001D4BF',
-	"jsercy;":                   '\U00000458',
-	"jukcy;":                    '\U00000454',
-	"kappa;":                    '\U000003BA',
-	"kappav;":                   '\U000003F0',
-	"kcedil;":                   '\U00000137',
-	"kcy;":                      '\U0000043A',
-	"kfr;":                      '\U0001D528',
-	"kgreen;":                   '\U00000138',
-	"khcy;":                     '\U00000445',
-	"kjcy;":                     '\U0000045C',
-	"kopf;":                     '\U0001D55C',
-	"kscr;":                     '\U0001D4C0',
-	"lAarr;":                    '\U000021DA',
-	"lArr;":                     '\U000021D0',
-	"lAtail;":                   '\U0000291B',
-	"lBarr;":                    '\U0000290E',
-	"lE;":                       '\U00002266',
-	"lEg;":                      '\U00002A8B',
-	"lHar;":                     '\U00002962',
-	"lacute;":                   '\U0000013A',
-	"laemptyv;":                 '\U000029B4',
-	"lagran;":                   '\U00002112',
-	"lambda;":                   '\U000003BB',
-	"lang;":                     '\U000027E8',
-	"langd;":                    '\U00002991',
-	"langle;":                   '\U000027E8',
-	"lap;":                      '\U00002A85',
-	"laquo;":                    '\U000000AB',
-	"larr;":                     '\U00002190',
-	"larrb;":                    '\U000021E4',
-	"larrbfs;":                  '\U0000291F',
-	"larrfs;":                   '\U0000291D',
-	"larrhk;":                   '\U000021A9',
-	"larrlp;":                   '\U000021AB',
-	"larrpl;":                   '\U00002939',
-	"larrsim;":                  '\U00002973',
-	"larrtl;":                   '\U000021A2',
-	"lat;":                      '\U00002AAB',
-	"latail;":                   '\U00002919',
-	"late;":                     '\U00002AAD',
-	"lbarr;":                    '\U0000290C',
-	"lbbrk;":                    '\U00002772',
-	"lbrace;":                   '\U0000007B',
-	"lbrack;":                   '\U0000005B',
-	"lbrke;":                    '\U0000298B',
-	"lbrksld;":                  '\U0000298F',
-	"lbrkslu;":                  '\U0000298D',
-	"lcaron;":                   '\U0000013E',
-	"lcedil;":                   '\U0000013C',
-	"lceil;":                    '\U00002308',
-	"lcub;":                     '\U0000007B',
-	"lcy;":                      '\U0000043B',
-	"ldca;":                     '\U00002936',
-	"ldquo;":                    '\U0000201C',
-	"ldquor;":                   '\U0000201E',
-	"ldrdhar;":                  '\U00002967',
-	"ldrushar;":                 '\U0000294B',
-	"ldsh;":                     '\U000021B2',
-	"le;":                       '\U00002264',
-	"leftarrow;":                '\U00002190',
-	"leftarrowtail;":            '\U000021A2',
-	"leftharpoondown;":          '\U000021BD',
-	"leftharpoonup;":            '\U000021BC',
-	"leftleftarrows;":           '\U000021C7',
-	"leftrightarrow;":           '\U00002194',
-	"leftrightarrows;":          '\U000021C6',
-	"leftrightharpoons;":        '\U000021CB',
-	"leftrightsquigarrow;":      '\U000021AD',
-	"leftthreetimes;":           '\U000022CB',
-	"leg;":                      '\U000022DA',
-	"leq;":                      '\U00002264',
-	"leqq;":                     '\U00002266',
-	"leqslant;":                 '\U00002A7D',
-	"les;":                      '\U00002A7D',
-	"lescc;":                    '\U00002AA8',
-	"lesdot;":                   '\U00002A7F',
-	"lesdoto;":                  '\U00002A81',
-	"lesdotor;":                 '\U00002A83',
-	"lesges;":                   '\U00002A93',
-	"lessapprox;":               '\U00002A85',
-	"lessdot;":                  '\U000022D6',
-	"lesseqgtr;":                '\U000022DA',
-	"lesseqqgtr;":               '\U00002A8B',
-	"lessgtr;":                  '\U00002276',
-	"lesssim;":                  '\U00002272',
-	"lfisht;":                   '\U0000297C',
-	"lfloor;":                   '\U0000230A',
-	"lfr;":                      '\U0001D529',
-	"lg;":                       '\U00002276',
-	"lgE;":                      '\U00002A91',
-	"lhard;":                    '\U000021BD',
-	"lharu;":                    '\U000021BC',
-	"lharul;":                   '\U0000296A',
-	"lhblk;":                    '\U00002584',
-	"ljcy;":                     '\U00000459',
-	"ll;":                       '\U0000226A',
-	"llarr;":                    '\U000021C7',
-	"llcorner;":                 '\U0000231E',
-	"llhard;":                   '\U0000296B',
-	"lltri;":                    '\U000025FA',
-	"lmidot;":                   '\U00000140',
-	"lmoust;":                   '\U000023B0',
-	"lmoustache;":               '\U000023B0',
-	"lnE;":                      '\U00002268',
-	"lnap;":                     '\U00002A89',
-	"lnapprox;":                 '\U00002A89',
-	"lne;":                      '\U00002A87',
-	"lneq;":                     '\U00002A87',
-	"lneqq;":                    '\U00002268',
-	"lnsim;":                    '\U000022E6',
-	"loang;":                    '\U000027EC',
-	"loarr;":                    '\U000021FD',
-	"lobrk;":                    '\U000027E6',
-	"longleftarrow;":            '\U000027F5',
-	"longleftrightarrow;":       '\U000027F7',
-	"longmapsto;":               '\U000027FC',
-	"longrightarrow;":           '\U000027F6',
-	"looparrowleft;":            '\U000021AB',
-	"looparrowright;":           '\U000021AC',
-	"lopar;":                    '\U00002985',
-	"lopf;":                     '\U0001D55D',
-	"loplus;":                   '\U00002A2D',
-	"lotimes;":                  '\U00002A34',
-	"lowast;":                   '\U00002217',
-	"lowbar;":                   '\U0000005F',
-	"loz;":                      '\U000025CA',
-	"lozenge;":                  '\U000025CA',
-	"lozf;":                     '\U000029EB',
-	"lpar;":                     '\U00000028',
-	"lparlt;":                   '\U00002993',
-	"lrarr;":                    '\U000021C6',
-	"lrcorner;":                 '\U0000231F',
-	"lrhar;":                    '\U000021CB',
-	"lrhard;":                   '\U0000296D',
-	"lrm;":                      '\U0000200E',
-	"lrtri;":                    '\U000022BF',
-	"lsaquo;":                   '\U00002039',
-	"lscr;":                     '\U0001D4C1',
-	"lsh;":                      '\U000021B0',
-	"lsim;":                     '\U00002272',
-	"lsime;":                    '\U00002A8D',
-	"lsimg;":                    '\U00002A8F',
-	"lsqb;":                     '\U0000005B',
-	"lsquo;":                    '\U00002018',
-	"lsquor;":                   '\U0000201A',
-	"lstrok;":                   '\U00000142',
-	"lt;":                       '\U0000003C',
-	"ltcc;":                     '\U00002AA6',
-	"ltcir;":                    '\U00002A79',
-	"ltdot;":                    '\U000022D6',
-	"lthree;":                   '\U000022CB',
-	"ltimes;":                   '\U000022C9',
-	"ltlarr;":                   '\U00002976',
-	"ltquest;":                  '\U00002A7B',
-	"ltrPar;":                   '\U00002996',
-	"ltri;":                     '\U000025C3',
-	"ltrie;":                    '\U000022B4',
-	"ltrif;":                    '\U000025C2',
-	"lurdshar;":                 '\U0000294A',
-	"luruhar;":                  '\U00002966',
-	"mDDot;":                    '\U0000223A',
-	"macr;":                     '\U000000AF',
-	"male;":                     '\U00002642',
-	"malt;":                     '\U00002720',
-	"maltese;":                  '\U00002720',
-	"map;":                      '\U000021A6',
-	"mapsto;":                   '\U000021A6',
-	"mapstodown;":               '\U000021A7',
-	"mapstoleft;":               '\U000021A4',
-	"mapstoup;":                 '\U000021A5',
-	"marker;":                   '\U000025AE',
-	"mcomma;":                   '\U00002A29',
-	"mcy;":                      '\U0000043C',
-	"mdash;":                    '\U00002014',
-	"measuredangle;":            '\U00002221',
-	"mfr;":                      '\U0001D52A',
-	"mho;":                      '\U00002127',
-	"micro;":                    '\U000000B5',
-	"mid;":                      '\U00002223',
-	"midast;":                   '\U0000002A',
-	"midcir;":                   '\U00002AF0',
-	"middot;":                   '\U000000B7',
-	"minus;":                    '\U00002212',
-	"minusb;":                   '\U0000229F',
-	"minusd;":                   '\U00002238',
-	"minusdu;":                  '\U00002A2A',
-	"mlcp;":                     '\U00002ADB',
-	"mldr;":                     '\U00002026',
-	"mnplus;":                   '\U00002213',
-	"models;":                   '\U000022A7',
-	"mopf;":                     '\U0001D55E',
-	"mp;":                       '\U00002213',
-	"mscr;":                     '\U0001D4C2',
-	"mstpos;":                   '\U0000223E',
-	"mu;":                       '\U000003BC',
-	"multimap;":                 '\U000022B8',
-	"mumap;":                    '\U000022B8',
-	"nLeftarrow;":               '\U000021CD',
-	"nLeftrightarrow;":          '\U000021CE',
-	"nRightarrow;":              '\U000021CF',
-	"nVDash;":                   '\U000022AF',
-	"nVdash;":                   '\U000022AE',
-	"nabla;":                    '\U00002207',
-	"nacute;":                   '\U00000144',
-	"nap;":                      '\U00002249',
-	"napos;":                    '\U00000149',
-	"napprox;":                  '\U00002249',
-	"natur;":                    '\U0000266E',
-	"natural;":                  '\U0000266E',
-	"naturals;":                 '\U00002115',
-	"nbsp;":                     '\U000000A0',
-	"ncap;":                     '\U00002A43',
-	"ncaron;":                   '\U00000148',
-	"ncedil;":                   '\U00000146',
-	"ncong;":                    '\U00002247',
-	"ncup;":                     '\U00002A42',
-	"ncy;":                      '\U0000043D',
-	"ndash;":                    '\U00002013',
-	"ne;":                       '\U00002260',
-	"neArr;":                    '\U000021D7',
-	"nearhk;":                   '\U00002924',
-	"nearr;":                    '\U00002197',
-	"nearrow;":                  '\U00002197',
-	"nequiv;":                   '\U00002262',
-	"nesear;":                   '\U00002928',
-	"nexist;":                   '\U00002204',
-	"nexists;":                  '\U00002204',
-	"nfr;":                      '\U0001D52B',
-	"nge;":                      '\U00002271',
-	"ngeq;":                     '\U00002271',
-	"ngsim;":                    '\U00002275',
-	"ngt;":                      '\U0000226F',
-	"ngtr;":                     '\U0000226F',
-	"nhArr;":                    '\U000021CE',
-	"nharr;":                    '\U000021AE',
-	"nhpar;":                    '\U00002AF2',
-	"ni;":                       '\U0000220B',
-	"nis;":                      '\U000022FC',
-	"nisd;":                     '\U000022FA',
-	"niv;":                      '\U0000220B',
-	"njcy;":                     '\U0000045A',
-	"nlArr;":                    '\U000021CD',
-	"nlarr;":                    '\U0000219A',
-	"nldr;":                     '\U00002025',
-	"nle;":                      '\U00002270',
-	"nleftarrow;":               '\U0000219A',
-	"nleftrightarrow;":          '\U000021AE',
-	"nleq;":                     '\U00002270',
-	"nless;":                    '\U0000226E',
-	"nlsim;":                    '\U00002274',
-	"nlt;":                      '\U0000226E',
-	"nltri;":                    '\U000022EA',
-	"nltrie;":                   '\U000022EC',
-	"nmid;":                     '\U00002224',
-	"nopf;":                     '\U0001D55F',
-	"not;":                      '\U000000AC',
-	"notin;":                    '\U00002209',
-	"notinva;":                  '\U00002209',
-	"notinvb;":                  '\U000022F7',
-	"notinvc;":                  '\U000022F6',
-	"notni;":                    '\U0000220C',
-	"notniva;":                  '\U0000220C',
-	"notnivb;":                  '\U000022FE',
-	"notnivc;":                  '\U000022FD',
-	"npar;":                     '\U00002226',
-	"nparallel;":                '\U00002226',
-	"npolint;":                  '\U00002A14',
-	"npr;":                      '\U00002280',
-	"nprcue;":                   '\U000022E0',
-	"nprec;":                    '\U00002280',
-	"nrArr;":                    '\U000021CF',
-	"nrarr;":                    '\U0000219B',
-	"nrightarrow;":              '\U0000219B',
-	"nrtri;":                    '\U000022EB',
-	"nrtrie;":                   '\U000022ED',
-	"nsc;":                      '\U00002281',
-	"nsccue;":                   '\U000022E1',
-	"nscr;":                     '\U0001D4C3',
-	"nshortmid;":                '\U00002224',
-	"nshortparallel;":           '\U00002226',
-	"nsim;":                     '\U00002241',
-	"nsime;":                    '\U00002244',
-	"nsimeq;":                   '\U00002244',
-	"nsmid;":                    '\U00002224',
-	"nspar;":                    '\U00002226',
-	"nsqsube;":                  '\U000022E2',
-	"nsqsupe;":                  '\U000022E3',
-	"nsub;":                     '\U00002284',
-	"nsube;":                    '\U00002288',
-	"nsubseteq;":                '\U00002288',
-	"nsucc;":                    '\U00002281',
-	"nsup;":                     '\U00002285',
-	"nsupe;":                    '\U00002289',
-	"nsupseteq;":                '\U00002289',
-	"ntgl;":                     '\U00002279',
-	"ntilde;":                   '\U000000F1',
-	"ntlg;":                     '\U00002278',
-	"ntriangleleft;":            '\U000022EA',
-	"ntrianglelefteq;":          '\U000022EC',
-	"ntriangleright;":           '\U000022EB',
-	"ntrianglerighteq;":         '\U000022ED',
-	"nu;":                       '\U000003BD',
-	"num;":                      '\U00000023',
-	"numero;":                   '\U00002116',
-	"numsp;":                    '\U00002007',
-	"nvDash;":                   '\U000022AD',
-	"nvHarr;":                   '\U00002904',
-	"nvdash;":                   '\U000022AC',
-	"nvinfin;":                  '\U000029DE',
-	"nvlArr;":                   '\U00002902',
-	"nvrArr;":                   '\U00002903',
-	"nwArr;":                    '\U000021D6',
-	"nwarhk;":                   '\U00002923',
-	"nwarr;":                    '\U00002196',
-	"nwarrow;":                  '\U00002196',
-	"nwnear;":                   '\U00002927',
-	"oS;":                       '\U000024C8',
-	"oacute;":                   '\U000000F3',
-	"oast;":                     '\U0000229B',
-	"ocir;":                     '\U0000229A',
-	"ocirc;":                    '\U000000F4',
-	"ocy;":                      '\U0000043E',
-	"odash;":                    '\U0000229D',
-	"odblac;":                   '\U00000151',
-	"odiv;":                     '\U00002A38',
-	"odot;":                     '\U00002299',
-	"odsold;":                   '\U000029BC',
-	"oelig;":                    '\U00000153',
-	"ofcir;":                    '\U000029BF',
-	"ofr;":                      '\U0001D52C',
-	"ogon;":                     '\U000002DB',
-	"ograve;":                   '\U000000F2',
-	"ogt;":                      '\U000029C1',
-	"ohbar;":                    '\U000029B5',
-	"ohm;":                      '\U000003A9',
-	"oint;":                     '\U0000222E',
-	"olarr;":                    '\U000021BA',
-	"olcir;":                    '\U000029BE',
-	"olcross;":                  '\U000029BB',
-	"oline;":                    '\U0000203E',
-	"olt;":                      '\U000029C0',
-	"omacr;":                    '\U0000014D',
-	"omega;":                    '\U000003C9',
-	"omicron;":                  '\U000003BF',
-	"omid;":                     '\U000029B6',
-	"ominus;":                   '\U00002296',
-	"oopf;":                     '\U0001D560',
-	"opar;":                     '\U000029B7',
-	"operp;":                    '\U000029B9',
-	"oplus;":                    '\U00002295',
-	"or;":                       '\U00002228',
-	"orarr;":                    '\U000021BB',
-	"ord;":                      '\U00002A5D',
-	"order;":                    '\U00002134',
-	"orderof;":                  '\U00002134',
-	"ordf;":                     '\U000000AA',
-	"ordm;":                     '\U000000BA',
-	"origof;":                   '\U000022B6',
-	"oror;":                     '\U00002A56',
-	"orslope;":                  '\U00002A57',
-	"orv;":                      '\U00002A5B',
-	"oscr;":                     '\U00002134',
-	"oslash;":                   '\U000000F8',
-	"osol;":                     '\U00002298',
-	"otilde;":                   '\U000000F5',
-	"otimes;":                   '\U00002297',
-	"otimesas;":                 '\U00002A36',
-	"ouml;":                     '\U000000F6',
-	"ovbar;":                    '\U0000233D',
-	"par;":                      '\U00002225',
-	"para;":                     '\U000000B6',
-	"parallel;":                 '\U00002225',
-	"parsim;":                   '\U00002AF3',
-	"parsl;":                    '\U00002AFD',
-	"part;":                     '\U00002202',
-	"pcy;":                      '\U0000043F',
-	"percnt;":                   '\U00000025',
-	"period;":                   '\U0000002E',
-	"permil;":                   '\U00002030',
-	"perp;":                     '\U000022A5',
-	"pertenk;":                  '\U00002031',
-	"pfr;":                      '\U0001D52D',
-	"phi;":                      '\U000003C6',
-	"phiv;":                     '\U000003D5',
-	"phmmat;":                   '\U00002133',
-	"phone;":                    '\U0000260E',
-	"pi;":                       '\U000003C0',
-	"pitchfork;":                '\U000022D4',
-	"piv;":                      '\U000003D6',
-	"planck;":                   '\U0000210F',
-	"planckh;":                  '\U0000210E',
-	"plankv;":                   '\U0000210F',
-	"plus;":                     '\U0000002B',
-	"plusacir;":                 '\U00002A23',
-	"plusb;":                    '\U0000229E',
-	"pluscir;":                  '\U00002A22',
-	"plusdo;":                   '\U00002214',
-	"plusdu;":                   '\U00002A25',
-	"pluse;":                    '\U00002A72',
-	"plusmn;":                   '\U000000B1',
-	"plussim;":                  '\U00002A26',
-	"plustwo;":                  '\U00002A27',
-	"pm;":                       '\U000000B1',
-	"pointint;":                 '\U00002A15',
-	"popf;":                     '\U0001D561',
-	"pound;":                    '\U000000A3',
-	"pr;":                       '\U0000227A',
-	"prE;":                      '\U00002AB3',
-	"prap;":                     '\U00002AB7',
-	"prcue;":                    '\U0000227C',
-	"pre;":                      '\U00002AAF',
-	"prec;":                     '\U0000227A',
-	"precapprox;":               '\U00002AB7',
-	"preccurlyeq;":              '\U0000227C',
-	"preceq;":                   '\U00002AAF',
-	"precnapprox;":              '\U00002AB9',
-	"precneqq;":                 '\U00002AB5',
-	"precnsim;":                 '\U000022E8',
-	"precsim;":                  '\U0000227E',
-	"prime;":                    '\U00002032',
-	"primes;":                   '\U00002119',
-	"prnE;":                     '\U00002AB5',
-	"prnap;":                    '\U00002AB9',
-	"prnsim;":                   '\U000022E8',
-	"prod;":                     '\U0000220F',
-	"profalar;":                 '\U0000232E',
-	"profline;":                 '\U00002312',
-	"profsurf;":                 '\U00002313',
-	"prop;":                     '\U0000221D',
-	"propto;":                   '\U0000221D',
-	"prsim;":                    '\U0000227E',
-	"prurel;":                   '\U000022B0',
-	"pscr;":                     '\U0001D4C5',
-	"psi;":                      '\U000003C8',
-	"puncsp;":                   '\U00002008',
-	"qfr;":                      '\U0001D52E',
-	"qint;":                     '\U00002A0C',
-	"qopf;":                     '\U0001D562',
-	"qprime;":                   '\U00002057',
-	"qscr;":                     '\U0001D4C6',
-	"quaternions;":              '\U0000210D',
-	"quatint;":                  '\U00002A16',
-	"quest;":                    '\U0000003F',
-	"questeq;":                  '\U0000225F',
-	"quot;":                     '\U00000022',
-	"rAarr;":                    '\U000021DB',
-	"rArr;":                     '\U000021D2',
-	"rAtail;":                   '\U0000291C',
-	"rBarr;":                    '\U0000290F',
-	"rHar;":                     '\U00002964',
-	"racute;":                   '\U00000155',
-	"radic;":                    '\U0000221A',
-	"raemptyv;":                 '\U000029B3',
-	"rang;":                     '\U000027E9',
-	"rangd;":                    '\U00002992',
-	"range;":                    '\U000029A5',
-	"rangle;":                   '\U000027E9',
-	"raquo;":                    '\U000000BB',
-	"rarr;":                     '\U00002192',
-	"rarrap;":                   '\U00002975',
-	"rarrb;":                    '\U000021E5',
-	"rarrbfs;":                  '\U00002920',
-	"rarrc;":                    '\U00002933',
-	"rarrfs;":                   '\U0000291E',
-	"rarrhk;":                   '\U000021AA',
-	"rarrlp;":                   '\U000021AC',
-	"rarrpl;":                   '\U00002945',
-	"rarrsim;":                  '\U00002974',
-	"rarrtl;":                   '\U000021A3',
-	"rarrw;":                    '\U0000219D',
-	"ratail;":                   '\U0000291A',
-	"ratio;":                    '\U00002236',
-	"rationals;":                '\U0000211A',
-	"rbarr;":                    '\U0000290D',
-	"rbbrk;":                    '\U00002773',
-	"rbrace;":                   '\U0000007D',
-	"rbrack;":                   '\U0000005D',
-	"rbrke;":                    '\U0000298C',
-	"rbrksld;":                  '\U0000298E',
-	"rbrkslu;":                  '\U00002990',
-	"rcaron;":                   '\U00000159',
-	"rcedil;":                   '\U00000157',
-	"rceil;":                    '\U00002309',
-	"rcub;":                     '\U0000007D',
-	"rcy;":                      '\U00000440',
-	"rdca;":                     '\U00002937',
-	"rdldhar;":                  '\U00002969',
-	"rdquo;":                    '\U0000201D',
-	"rdquor;":                   '\U0000201D',
-	"rdsh;":                     '\U000021B3',
-	"real;":                     '\U0000211C',
-	"realine;":                  '\U0000211B',
-	"realpart;":                 '\U0000211C',
-	"reals;":                    '\U0000211D',
-	"rect;":                     '\U000025AD',
-	"reg;":                      '\U000000AE',
-	"rfisht;":                   '\U0000297D',
-	"rfloor;":                   '\U0000230B',
-	"rfr;":                      '\U0001D52F',
-	"rhard;":                    '\U000021C1',
-	"rharu;":                    '\U000021C0',
-	"rharul;":                   '\U0000296C',
-	"rho;":                      '\U000003C1',
-	"rhov;":                     '\U000003F1',
-	"rightarrow;":               '\U00002192',
-	"rightarrowtail;":           '\U000021A3',
-	"rightharpoondown;":         '\U000021C1',
-	"rightharpoonup;":           '\U000021C0',
-	"rightleftarrows;":          '\U000021C4',
-	"rightleftharpoons;":        '\U000021CC',
-	"rightrightarrows;":         '\U000021C9',
-	"rightsquigarrow;":          '\U0000219D',
-	"rightthreetimes;":          '\U000022CC',
-	"ring;":                     '\U000002DA',
-	"risingdotseq;":             '\U00002253',
-	"rlarr;":                    '\U000021C4',
-	"rlhar;":                    '\U000021CC',
-	"rlm;":                      '\U0000200F',
-	"rmoust;":                   '\U000023B1',
-	"rmoustache;":               '\U000023B1',
-	"rnmid;":                    '\U00002AEE',
-	"roang;":                    '\U000027ED',
-	"roarr;":                    '\U000021FE',
-	"robrk;":                    '\U000027E7',
-	"ropar;":                    '\U00002986',
-	"ropf;":                     '\U0001D563',
-	"roplus;":                   '\U00002A2E',
-	"rotimes;":                  '\U00002A35',
-	"rpar;":                     '\U00000029',
-	"rpargt;":                   '\U00002994',
-	"rppolint;":                 '\U00002A12',
-	"rrarr;":                    '\U000021C9',
-	"rsaquo;":                   '\U0000203A',
-	"rscr;":                     '\U0001D4C7',
-	"rsh;":                      '\U000021B1',
-	"rsqb;":                     '\U0000005D',
-	"rsquo;":                    '\U00002019',
-	"rsquor;":                   '\U00002019',
-	"rthree;":                   '\U000022CC',
-	"rtimes;":                   '\U000022CA',
-	"rtri;":                     '\U000025B9',
-	"rtrie;":                    '\U000022B5',
-	"rtrif;":                    '\U000025B8',
-	"rtriltri;":                 '\U000029CE',
-	"ruluhar;":                  '\U00002968',
-	"rx;":                       '\U0000211E',
-	"sacute;":                   '\U0000015B',
-	"sbquo;":                    '\U0000201A',
-	"sc;":                       '\U0000227B',
-	"scE;":                      '\U00002AB4',
-	"scap;":                     '\U00002AB8',
-	"scaron;":                   '\U00000161',
-	"sccue;":                    '\U0000227D',
-	"sce;":                      '\U00002AB0',
-	"scedil;":                   '\U0000015F',
-	"scirc;":                    '\U0000015D',
-	"scnE;":                     '\U00002AB6',
-	"scnap;":                    '\U00002ABA',
-	"scnsim;":                   '\U000022E9',
-	"scpolint;":                 '\U00002A13',
-	"scsim;":                    '\U0000227F',
-	"scy;":                      '\U00000441',
-	"sdot;":                     '\U000022C5',
-	"sdotb;":                    '\U000022A1',
-	"sdote;":                    '\U00002A66',
-	"seArr;":                    '\U000021D8',
-	"searhk;":                   '\U00002925',
-	"searr;":                    '\U00002198',
-	"searrow;":                  '\U00002198',
-	"sect;":                     '\U000000A7',
-	"semi;":                     '\U0000003B',
-	"seswar;":                   '\U00002929',
-	"setminus;":                 '\U00002216',
-	"setmn;":                    '\U00002216',
-	"sext;":                     '\U00002736',
-	"sfr;":                      '\U0001D530',
-	"sfrown;":                   '\U00002322',
-	"sharp;":                    '\U0000266F',
-	"shchcy;":                   '\U00000449',
-	"shcy;":                     '\U00000448',
-	"shortmid;":                 '\U00002223',
-	"shortparallel;":            '\U00002225',
-	"shy;":                      '\U000000AD',
-	"sigma;":                    '\U000003C3',
-	"sigmaf;":                   '\U000003C2',
-	"sigmav;":                   '\U000003C2',
-	"sim;":                      '\U0000223C',
-	"simdot;":                   '\U00002A6A',
-	"sime;":                     '\U00002243',
-	"simeq;":                    '\U00002243',
-	"simg;":                     '\U00002A9E',
-	"simgE;":                    '\U00002AA0',
-	"siml;":                     '\U00002A9D',
-	"simlE;":                    '\U00002A9F',
-	"simne;":                    '\U00002246',
-	"simplus;":                  '\U00002A24',
-	"simrarr;":                  '\U00002972',
-	"slarr;":                    '\U00002190',
-	"smallsetminus;":            '\U00002216',
-	"smashp;":                   '\U00002A33',
-	"smeparsl;":                 '\U000029E4',
-	"smid;":                     '\U00002223',
-	"smile;":                    '\U00002323',
-	"smt;":                      '\U00002AAA',
-	"smte;":                     '\U00002AAC',
-	"softcy;":                   '\U0000044C',
-	"sol;":                      '\U0000002F',
-	"solb;":                     '\U000029C4',
-	"solbar;":                   '\U0000233F',
-	"sopf;":                     '\U0001D564',
-	"spades;":                   '\U00002660',
-	"spadesuit;":                '\U00002660',
-	"spar;":                     '\U00002225',
-	"sqcap;":                    '\U00002293',
-	"sqcup;":                    '\U00002294',
-	"sqsub;":                    '\U0000228F',
-	"sqsube;":                   '\U00002291',
-	"sqsubset;":                 '\U0000228F',
-	"sqsubseteq;":               '\U00002291',
-	"sqsup;":                    '\U00002290',
-	"sqsupe;":                   '\U00002292',
-	"sqsupset;":                 '\U00002290',
-	"sqsupseteq;":               '\U00002292',
-	"squ;":                      '\U000025A1',
-	"square;":                   '\U000025A1',
-	"squarf;":                   '\U000025AA',
-	"squf;":                     '\U000025AA',
-	"srarr;":                    '\U00002192',
-	"sscr;":                     '\U0001D4C8',
-	"ssetmn;":                   '\U00002216',
-	"ssmile;":                   '\U00002323',
-	"sstarf;":                   '\U000022C6',
-	"star;":                     '\U00002606',
-	"starf;":                    '\U00002605',
-	"straightepsilon;":          '\U000003F5',
-	"straightphi;":              '\U000003D5',
-	"strns;":                    '\U000000AF',
-	"sub;":                      '\U00002282',
-	"subE;":                     '\U00002AC5',
-	"subdot;":                   '\U00002ABD',
-	"sube;":                     '\U00002286',
-	"subedot;":                  '\U00002AC3',
-	"submult;":                  '\U00002AC1',
-	"subnE;":                    '\U00002ACB',
-	"subne;":                    '\U0000228A',
-	"subplus;":                  '\U00002ABF',
-	"subrarr;":                  '\U00002979',
-	"subset;":                   '\U00002282',
-	"subseteq;":                 '\U00002286',
-	"subseteqq;":                '\U00002AC5',
-	"subsetneq;":                '\U0000228A',
-	"subsetneqq;":               '\U00002ACB',
-	"subsim;":                   '\U00002AC7',
-	"subsub;":                   '\U00002AD5',
-	"subsup;":                   '\U00002AD3',
-	"succ;":                     '\U0000227B',
-	"succapprox;":               '\U00002AB8',
-	"succcurlyeq;":              '\U0000227D',
-	"succeq;":                   '\U00002AB0',
-	"succnapprox;":              '\U00002ABA',
-	"succneqq;":                 '\U00002AB6',
-	"succnsim;":                 '\U000022E9',
-	"succsim;":                  '\U0000227F',
-	"sum;":                      '\U00002211',
-	"sung;":                     '\U0000266A',
-	"sup;":                      '\U00002283',
-	"sup1;":                     '\U000000B9',
-	"sup2;":                     '\U000000B2',
-	"sup3;":                     '\U000000B3',
-	"supE;":                     '\U00002AC6',
-	"supdot;":                   '\U00002ABE',
-	"supdsub;":                  '\U00002AD8',
-	"supe;":                     '\U00002287',
-	"supedot;":                  '\U00002AC4',
-	"suphsol;":                  '\U000027C9',
-	"suphsub;":                  '\U00002AD7',
-	"suplarr;":                  '\U0000297B',
-	"supmult;":                  '\U00002AC2',
-	"supnE;":                    '\U00002ACC',
-	"supne;":                    '\U0000228B',
-	"supplus;":                  '\U00002AC0',
-	"supset;":                   '\U00002283',
-	"supseteq;":                 '\U00002287',
-	"supseteqq;":                '\U00002AC6',
-	"supsetneq;":                '\U0000228B',
-	"supsetneqq;":               '\U00002ACC',
-	"supsim;":                   '\U00002AC8',
-	"supsub;":                   '\U00002AD4',
-	"supsup;":                   '\U00002AD6',
-	"swArr;":                    '\U000021D9',
-	"swarhk;":                   '\U00002926',
-	"swarr;":                    '\U00002199',
-	"swarrow;":                  '\U00002199',
-	"swnwar;":                   '\U0000292A',
-	"szlig;":                    '\U000000DF',
-	"target;":                   '\U00002316',
-	"tau;":                      '\U000003C4',
-	"tbrk;":                     '\U000023B4',
-	"tcaron;":                   '\U00000165',
-	"tcedil;":                   '\U00000163',
-	"tcy;":                      '\U00000442',
-	"tdot;":                     '\U000020DB',
-	"telrec;":                   '\U00002315',
-	"tfr;":                      '\U0001D531',
-	"there4;":                   '\U00002234',
-	"therefore;":                '\U00002234',
-	"theta;":                    '\U000003B8',
-	"thetasym;":                 '\U000003D1',
-	"thetav;":                   '\U000003D1',
-	"thickapprox;":              '\U00002248',
-	"thicksim;":                 '\U0000223C',
-	"thinsp;":                   '\U00002009',
-	"thkap;":                    '\U00002248',
-	"thksim;":                   '\U0000223C',
-	"thorn;":                    '\U000000FE',
-	"tilde;":                    '\U000002DC',
-	"times;":                    '\U000000D7',
-	"timesb;":                   '\U000022A0',
-	"timesbar;":                 '\U00002A31',
-	"timesd;":                   '\U00002A30',
-	"tint;":                     '\U0000222D',
-	"toea;":                     '\U00002928',
-	"top;":                      '\U000022A4',
-	"topbot;":                   '\U00002336',
-	"topcir;":                   '\U00002AF1',
-	"topf;":                     '\U0001D565',
-	"topfork;":                  '\U00002ADA',
-	"tosa;":                     '\U00002929',
-	"tprime;":                   '\U00002034',
-	"trade;":                    '\U00002122',
-	"triangle;":                 '\U000025B5',
-	"triangledown;":             '\U000025BF',
-	"triangleleft;":             '\U000025C3',
-	"trianglelefteq;":           '\U000022B4',
-	"triangleq;":                '\U0000225C',
-	"triangleright;":            '\U000025B9',
-	"trianglerighteq;":          '\U000022B5',
-	"tridot;":                   '\U000025EC',
-	"trie;":                     '\U0000225C',
-	"triminus;":                 '\U00002A3A',
-	"triplus;":                  '\U00002A39',
-	"trisb;":                    '\U000029CD',
-	"tritime;":                  '\U00002A3B',
-	"trpezium;":                 '\U000023E2',
-	"tscr;":                     '\U0001D4C9',
-	"tscy;":                     '\U00000446',
-	"tshcy;":                    '\U0000045B',
-	"tstrok;":                   '\U00000167',
-	"twixt;":                    '\U0000226C',
-	"twoheadleftarrow;":         '\U0000219E',
-	"twoheadrightarrow;":        '\U000021A0',
-	"uArr;":                     '\U000021D1',
-	"uHar;":                     '\U00002963',
-	"uacute;":                   '\U000000FA',
-	"uarr;":                     '\U00002191',
-	"ubrcy;":                    '\U0000045E',
-	"ubreve;":                   '\U0000016D',
-	"ucirc;":                    '\U000000FB',
-	"ucy;":                      '\U00000443',
-	"udarr;":                    '\U000021C5',
-	"udblac;":                   '\U00000171',
-	"udhar;":                    '\U0000296E',
-	"ufisht;":                   '\U0000297E',
-	"ufr;":                      '\U0001D532',
-	"ugrave;":                   '\U000000F9',
-	"uharl;":                    '\U000021BF',
-	"uharr;":                    '\U000021BE',
-	"uhblk;":                    '\U00002580',
-	"ulcorn;":                   '\U0000231C',
-	"ulcorner;":                 '\U0000231C',
-	"ulcrop;":                   '\U0000230F',
-	"ultri;":                    '\U000025F8',
-	"umacr;":                    '\U0000016B',
-	"uml;":                      '\U000000A8',
-	"uogon;":                    '\U00000173',
-	"uopf;":                     '\U0001D566',
-	"uparrow;":                  '\U00002191',
-	"updownarrow;":              '\U00002195',
-	"upharpoonleft;":            '\U000021BF',
-	"upharpoonright;":           '\U000021BE',
-	"uplus;":                    '\U0000228E',
-	"upsi;":                     '\U000003C5',
-	"upsih;":                    '\U000003D2',
-	"upsilon;":                  '\U000003C5',
-	"upuparrows;":               '\U000021C8',
-	"urcorn;":                   '\U0000231D',
-	"urcorner;":                 '\U0000231D',
-	"urcrop;":                   '\U0000230E',
-	"uring;":                    '\U0000016F',
-	"urtri;":                    '\U000025F9',
-	"uscr;":                     '\U0001D4CA',
-	"utdot;":                    '\U000022F0',
-	"utilde;":                   '\U00000169',
-	"utri;":                     '\U000025B5',
-	"utrif;":                    '\U000025B4',
-	"uuarr;":                    '\U000021C8',
-	"uuml;":                     '\U000000FC',
-	"uwangle;":                  '\U000029A7',
-	"vArr;":                     '\U000021D5',
-	"vBar;":                     '\U00002AE8',
-	"vBarv;":                    '\U00002AE9',
-	"vDash;":                    '\U000022A8',
-	"vangrt;":                   '\U0000299C',
-	"varepsilon;":               '\U000003F5',
-	"varkappa;":                 '\U000003F0',
-	"varnothing;":               '\U00002205',
-	"varphi;":                   '\U000003D5',
-	"varpi;":                    '\U000003D6',
-	"varpropto;":                '\U0000221D',
-	"varr;":                     '\U00002195',
-	"varrho;":                   '\U000003F1',
-	"varsigma;":                 '\U000003C2',
-	"vartheta;":                 '\U000003D1',
-	"vartriangleleft;":          '\U000022B2',
-	"vartriangleright;":         '\U000022B3',
-	"vcy;":                      '\U00000432',
-	"vdash;":                    '\U000022A2',
-	"vee;":                      '\U00002228',
-	"veebar;":                   '\U000022BB',
-	"veeeq;":                    '\U0000225A',
-	"vellip;":                   '\U000022EE',
-	"verbar;":                   '\U0000007C',
-	"vert;":                     '\U0000007C',
-	"vfr;":                      '\U0001D533',
-	"vltri;":                    '\U000022B2',
-	"vopf;":                     '\U0001D567',
-	"vprop;":                    '\U0000221D',
-	"vrtri;":                    '\U000022B3',
-	"vscr;":                     '\U0001D4CB',
-	"vzigzag;":                  '\U0000299A',
-	"wcirc;":                    '\U00000175',
-	"wedbar;":                   '\U00002A5F',
-	"wedge;":                    '\U00002227',
-	"wedgeq;":                   '\U00002259',
-	"weierp;":                   '\U00002118',
-	"wfr;":                      '\U0001D534',
-	"wopf;":                     '\U0001D568',
-	"wp;":                       '\U00002118',
-	"wr;":                       '\U00002240',
-	"wreath;":                   '\U00002240',
-	"wscr;":                     '\U0001D4CC',
-	"xcap;":                     '\U000022C2',
-	"xcirc;":                    '\U000025EF',
-	"xcup;":                     '\U000022C3',
-	"xdtri;":                    '\U000025BD',
-	"xfr;":                      '\U0001D535',
-	"xhArr;":                    '\U000027FA',
-	"xharr;":                    '\U000027F7',
-	"xi;":                       '\U000003BE',
-	"xlArr;":                    '\U000027F8',
-	"xlarr;":                    '\U000027F5',
-	"xmap;":                     '\U000027FC',
-	"xnis;":                     '\U000022FB',
-	"xodot;":                    '\U00002A00',
-	"xopf;":                     '\U0001D569',
-	"xoplus;":                   '\U00002A01',
-	"xotime;":                   '\U00002A02',
-	"xrArr;":                    '\U000027F9',
-	"xrarr;":                    '\U000027F6',
-	"xscr;":                     '\U0001D4CD',
-	"xsqcup;":                   '\U00002A06',
-	"xuplus;":                   '\U00002A04',
-	"xutri;":                    '\U000025B3',
-	"xvee;":                     '\U000022C1',
-	"xwedge;":                   '\U000022C0',
-	"yacute;":                   '\U000000FD',
-	"yacy;":                     '\U0000044F',
-	"ycirc;":                    '\U00000177',
-	"ycy;":                      '\U0000044B',
-	"yen;":                      '\U000000A5',
-	"yfr;":                      '\U0001D536',
-	"yicy;":                     '\U00000457',
-	"yopf;":                     '\U0001D56A',
-	"yscr;":                     '\U0001D4CE',
-	"yucy;":                     '\U0000044E',
-	"yuml;":                     '\U000000FF',
-	"zacute;":                   '\U0000017A',
-	"zcaron;":                   '\U0000017E',
-	"zcy;":                      '\U00000437',
-	"zdot;":                     '\U0000017C',
-	"zeetrf;":                   '\U00002128',
-	"zeta;":                     '\U000003B6',
-	"zfr;":                      '\U0001D537',
-	"zhcy;":                     '\U00000436',
-	"zigrarr;":                  '\U000021DD',
-	"zopf;":                     '\U0001D56B',
-	"zscr;":                     '\U0001D4CF',
-	"zwj;":                      '\U0000200D',
-	"zwnj;":                     '\U0000200C',
-	"AElig":                     '\U000000C6',
-	"AMP":                       '\U00000026',
-	"Aacute":                    '\U000000C1',
-	"Acirc":                     '\U000000C2',
-	"Agrave":                    '\U000000C0',
-	"Aring":                     '\U000000C5',
-	"Atilde":                    '\U000000C3',
-	"Auml":                      '\U000000C4',
-	"COPY":                      '\U000000A9',
-	"Ccedil":                    '\U000000C7',
-	"ETH":                       '\U000000D0',
-	"Eacute":                    '\U000000C9',
-	"Ecirc":                     '\U000000CA',
-	"Egrave":                    '\U000000C8',
-	"Euml":                      '\U000000CB',
-	"GT":                        '\U0000003E',
-	"Iacute":                    '\U000000CD',
-	"Icirc":                     '\U000000CE',
-	"Igrave":                    '\U000000CC',
-	"Iuml":                      '\U000000CF',
-	"LT":                        '\U0000003C',
-	"Ntilde":                    '\U000000D1',
-	"Oacute":                    '\U000000D3',
-	"Ocirc":                     '\U000000D4',
-	"Ograve":                    '\U000000D2',
-	"Oslash":                    '\U000000D8',
-	"Otilde":                    '\U000000D5',
-	"Ouml":                      '\U000000D6',
-	"QUOT":                      '\U00000022',
-	"REG":                       '\U000000AE',
-	"THORN":                     '\U000000DE',
-	"Uacute":                    '\U000000DA',
-	"Ucirc":                     '\U000000DB',
-	"Ugrave":                    '\U000000D9',
-	"Uuml":                      '\U000000DC',
-	"Yacute":                    '\U000000DD',
-	"aacute":                    '\U000000E1',
-	"acirc":                     '\U000000E2',
-	"acute":                     '\U000000B4',
-	"aelig":                     '\U000000E6',
-	"agrave":                    '\U000000E0',
-	"amp":                       '\U00000026',
-	"aring":                     '\U000000E5',
-	"atilde":                    '\U000000E3',
-	"auml":                      '\U000000E4',
-	"brvbar":                    '\U000000A6',
-	"ccedil":                    '\U000000E7',
-	"cedil":                     '\U000000B8',
-	"cent":                      '\U000000A2',
-	"copy":                      '\U000000A9',
-	"curren":                    '\U000000A4',
-	"deg":                       '\U000000B0',
-	"divide":                    '\U000000F7',
-	"eacute":                    '\U000000E9',
-	"ecirc":                     '\U000000EA',
-	"egrave":                    '\U000000E8',
-	"eth":                       '\U000000F0',
-	"euml":                      '\U000000EB',
-	"frac12":                    '\U000000BD',
-	"frac14":                    '\U000000BC',
-	"frac34":                    '\U000000BE',
-	"gt":                        '\U0000003E',
-	"iacute":                    '\U000000ED',
-	"icirc":                     '\U000000EE',
-	"iexcl":                     '\U000000A1',
-	"igrave":                    '\U000000EC',
-	"iquest":                    '\U000000BF',
-	"iuml":                      '\U000000EF',
-	"laquo":                     '\U000000AB',
-	"lt":                        '\U0000003C',
-	"macr":                      '\U000000AF',
-	"micro":                     '\U000000B5',
-	"middot":                    '\U000000B7',
-	"nbsp":                      '\U000000A0',
-	"not":                       '\U000000AC',
-	"ntilde":                    '\U000000F1',
-	"oacute":                    '\U000000F3',
-	"ocirc":                     '\U000000F4',
-	"ograve":                    '\U000000F2',
-	"ordf":                      '\U000000AA',
-	"ordm":                      '\U000000BA',
-	"oslash":                    '\U000000F8',
-	"otilde":                    '\U000000F5',
-	"ouml":                      '\U000000F6',
-	"para":                      '\U000000B6',
-	"plusmn":                    '\U000000B1',
-	"pound":                     '\U000000A3',
-	"quot":                      '\U00000022',
-	"raquo":                     '\U000000BB',
-	"reg":                       '\U000000AE',
-	"sect":                      '\U000000A7',
-	"shy":                       '\U000000AD',
-	"sup1":                      '\U000000B9',
-	"sup2":                      '\U000000B2',
-	"sup3":                      '\U000000B3',
-	"szlig":                     '\U000000DF',
-	"thorn":                     '\U000000FE',
-	"times":                     '\U000000D7',
-	"uacute":                    '\U000000FA',
-	"ucirc":                     '\U000000FB',
-	"ugrave":                    '\U000000F9',
-	"uml":                       '\U000000A8',
-	"uuml":                      '\U000000FC',
-	"yacute":                    '\U000000FD',
-	"yen":                       '\U000000A5',
-	"yuml":                      '\U000000FF',
-}
-
-// HTML entities that are two unicode codepoints.
-var entity2 = map[string][2]rune{
-	// TODO(nigeltao): Handle replacements that are wider than their names.
-	// "nLt;":                     {'\u226A', '\u20D2'},
-	// "nGt;":                     {'\u226B', '\u20D2'},
-	"NotEqualTilde;":           {'\u2242', '\u0338'},
-	"NotGreaterFullEqual;":     {'\u2267', '\u0338'},
-	"NotGreaterGreater;":       {'\u226B', '\u0338'},
-	"NotGreaterSlantEqual;":    {'\u2A7E', '\u0338'},
-	"NotHumpDownHump;":         {'\u224E', '\u0338'},
-	"NotHumpEqual;":            {'\u224F', '\u0338'},
-	"NotLeftTriangleBar;":      {'\u29CF', '\u0338'},
-	"NotLessLess;":             {'\u226A', '\u0338'},
-	"NotLessSlantEqual;":       {'\u2A7D', '\u0338'},
-	"NotNestedGreaterGreater;": {'\u2AA2', '\u0338'},
-	"NotNestedLessLess;":       {'\u2AA1', '\u0338'},
-	"NotPrecedesEqual;":        {'\u2AAF', '\u0338'},
-	"NotRightTriangleBar;":     {'\u29D0', '\u0338'},
-	"NotSquareSubset;":         {'\u228F', '\u0338'},
-	"NotSquareSuperset;":       {'\u2290', '\u0338'},
-	"NotSubset;":               {'\u2282', '\u20D2'},
-	"NotSucceedsEqual;":        {'\u2AB0', '\u0338'},
-	"NotSucceedsTilde;":        {'\u227F', '\u0338'},
-	"NotSuperset;":             {'\u2283', '\u20D2'},
-	"ThickSpace;":              {'\u205F', '\u200A'},
-	"acE;":                     {'\u223E', '\u0333'},
-	"bne;":                     {'\u003D', '\u20E5'},
-	"bnequiv;":                 {'\u2261', '\u20E5'},
-	"caps;":                    {'\u2229', '\uFE00'},
-	"cups;":                    {'\u222A', '\uFE00'},
-	"fjlig;":                   {'\u0066', '\u006A'},
-	"gesl;":                    {'\u22DB', '\uFE00'},
-	"gvertneqq;":               {'\u2269', '\uFE00'},
-	"gvnE;":                    {'\u2269', '\uFE00'},
-	"lates;":                   {'\u2AAD', '\uFE00'},
-	"lesg;":                    {'\u22DA', '\uFE00'},
-	"lvertneqq;":               {'\u2268', '\uFE00'},
-	"lvnE;":                    {'\u2268', '\uFE00'},
-	"nGg;":                     {'\u22D9', '\u0338'},
-	"nGtv;":                    {'\u226B', '\u0338'},
-	"nLl;":                     {'\u22D8', '\u0338'},
-	"nLtv;":                    {'\u226A', '\u0338'},
-	"nang;":                    {'\u2220', '\u20D2'},
-	"napE;":                    {'\u2A70', '\u0338'},
-	"napid;":                   {'\u224B', '\u0338'},
-	"nbump;":                   {'\u224E', '\u0338'},
-	"nbumpe;":                  {'\u224F', '\u0338'},
-	"ncongdot;":                {'\u2A6D', '\u0338'},
-	"nedot;":                   {'\u2250', '\u0338'},
-	"nesim;":                   {'\u2242', '\u0338'},
-	"ngE;":                     {'\u2267', '\u0338'},
-	"ngeqq;":                   {'\u2267', '\u0338'},
-	"ngeqslant;":               {'\u2A7E', '\u0338'},
-	"nges;":                    {'\u2A7E', '\u0338'},
-	"nlE;":                     {'\u2266', '\u0338'},
-	"nleqq;":                   {'\u2266', '\u0338'},
-	"nleqslant;":               {'\u2A7D', '\u0338'},
-	"nles;":                    {'\u2A7D', '\u0338'},
-	"notinE;":                  {'\u22F9', '\u0338'},
-	"notindot;":                {'\u22F5', '\u0338'},
-	"nparsl;":                  {'\u2AFD', '\u20E5'},
-	"npart;":                   {'\u2202', '\u0338'},
-	"npre;":                    {'\u2AAF', '\u0338'},
-	"npreceq;":                 {'\u2AAF', '\u0338'},
-	"nrarrc;":                  {'\u2933', '\u0338'},
-	"nrarrw;":                  {'\u219D', '\u0338'},
-	"nsce;":                    {'\u2AB0', '\u0338'},
-	"nsubE;":                   {'\u2AC5', '\u0338'},
-	"nsubset;":                 {'\u2282', '\u20D2'},
-	"nsubseteqq;":              {'\u2AC5', '\u0338'},
-	"nsucceq;":                 {'\u2AB0', '\u0338'},
-	"nsupE;":                   {'\u2AC6', '\u0338'},
-	"nsupset;":                 {'\u2283', '\u20D2'},
-	"nsupseteqq;":              {'\u2AC6', '\u0338'},
-	"nvap;":                    {'\u224D', '\u20D2'},
-	"nvge;":                    {'\u2265', '\u20D2'},
-	"nvgt;":                    {'\u003E', '\u20D2'},
-	"nvle;":                    {'\u2264', '\u20D2'},
-	"nvlt;":                    {'\u003C', '\u20D2'},
-	"nvltrie;":                 {'\u22B4', '\u20D2'},
-	"nvrtrie;":                 {'\u22B5', '\u20D2'},
-	"nvsim;":                   {'\u223C', '\u20D2'},
-	"race;":                    {'\u223D', '\u0331'},
-	"smtes;":                   {'\u2AAC', '\uFE00'},
-	"sqcaps;":                  {'\u2293', '\uFE00'},
-	"sqcups;":                  {'\u2294', '\uFE00'},
-	"varsubsetneq;":            {'\u228A', '\uFE00'},
-	"varsubsetneqq;":           {'\u2ACB', '\uFE00'},
-	"varsupsetneq;":            {'\u228B', '\uFE00'},
-	"varsupsetneqq;":           {'\u2ACC', '\uFE00'},
-	"vnsub;":                   {'\u2282', '\u20D2'},
-	"vnsup;":                   {'\u2283', '\u20D2'},
-	"vsubnE;":                  {'\u2ACB', '\uFE00'},
-	"vsubne;":                  {'\u228A', '\uFE00'},
-	"vsupnE;":                  {'\u2ACC', '\uFE00'},
-	"vsupne;":                  {'\u228B', '\uFE00'},
-}
diff --git a/installer/vendor/golang.org/x/net/html/entity_test.go b/installer/vendor/golang.org/x/net/html/entity_test.go
deleted file mode 100644
index b53f866fa2..0000000000
--- a/installer/vendor/golang.org/x/net/html/entity_test.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"testing"
-	"unicode/utf8"
-)
-
-func TestEntityLength(t *testing.T) {
-	// We verify that the length of UTF-8 encoding of each value is <= 1 + len(key).
-	// The +1 comes from the leading "&". This property implies that the length of
-	// unescaped text is <= the length of escaped text.
-	for k, v := range entity {
-		if 1+len(k) < utf8.RuneLen(v) {
-			t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v))
-		}
-		if len(k) > longestEntityWithoutSemicolon && k[len(k)-1] != ';' {
-			t.Errorf("entity name %s is %d characters, but longestEntityWithoutSemicolon=%d", k, len(k), longestEntityWithoutSemicolon)
-		}
-	}
-	for k, v := range entity2 {
-		if 1+len(k) < utf8.RuneLen(v[0])+utf8.RuneLen(v[1]) {
-			t.Error("escaped entity &" + k + " is shorter than its UTF-8 encoding " + string(v[0]) + string(v[1]))
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/escape.go b/installer/vendor/golang.org/x/net/html/escape.go
deleted file mode 100644
index d856139620..0000000000
--- a/installer/vendor/golang.org/x/net/html/escape.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"strings"
-	"unicode/utf8"
-)
-
-// These replacements permit compatibility with old numeric entities that
-// assumed Windows-1252 encoding.
-// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-var replacementTable = [...]rune{
-	'\u20AC', // First entry is what 0x80 should be replaced with.
-	'\u0081',
-	'\u201A',
-	'\u0192',
-	'\u201E',
-	'\u2026',
-	'\u2020',
-	'\u2021',
-	'\u02C6',
-	'\u2030',
-	'\u0160',
-	'\u2039',
-	'\u0152',
-	'\u008D',
-	'\u017D',
-	'\u008F',
-	'\u0090',
-	'\u2018',
-	'\u2019',
-	'\u201C',
-	'\u201D',
-	'\u2022',
-	'\u2013',
-	'\u2014',
-	'\u02DC',
-	'\u2122',
-	'\u0161',
-	'\u203A',
-	'\u0153',
-	'\u009D',
-	'\u017E',
-	'\u0178', // Last entry is 0x9F.
-	// 0x00->'\uFFFD' is handled programmatically.
-	// 0x0D->'\u000D' is a no-op.
-}
-
-// unescapeEntity reads an entity like "&lt;" from b[src:] and writes the
-// corresponding "<" to b[dst:], returning the incremented dst and src cursors.
-// Precondition: b[src] == '&' && dst <= src.
-// attribute should be true if parsing an attribute value.
-func unescapeEntity(b []byte, dst, src int, attribute bool) (dst1, src1 int) {
-	// https://html.spec.whatwg.org/multipage/syntax.html#consume-a-character-reference
-
-	// i starts at 1 because we already know that s[0] == '&'.
-	i, s := 1, b[src:]
-
-	if len(s) <= 1 {
-		b[dst] = b[src]
-		return dst + 1, src + 1
-	}
-
-	if s[i] == '#' {
-		if len(s) <= 3 { // We need to have at least "&#.".
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-		i++
-		c := s[i]
-		hex := false
-		if c == 'x' || c == 'X' {
-			hex = true
-			i++
-		}
-
-		x := '\x00'
-		for i < len(s) {
-			c = s[i]
-			i++
-			if hex {
-				if '0' <= c && c <= '9' {
-					x = 16*x + rune(c) - '0'
-					continue
-				} else if 'a' <= c && c <= 'f' {
-					x = 16*x + rune(c) - 'a' + 10
-					continue
-				} else if 'A' <= c && c <= 'F' {
-					x = 16*x + rune(c) - 'A' + 10
-					continue
-				}
-			} else if '0' <= c && c <= '9' {
-				x = 10*x + rune(c) - '0'
-				continue
-			}
-			if c != ';' {
-				i--
-			}
-			break
-		}
-
-		if i <= 3 { // No characters matched.
-			b[dst] = b[src]
-			return dst + 1, src + 1
-		}
-
-		if 0x80 <= x && x <= 0x9F {
-			// Replace characters from Windows-1252 with UTF-8 equivalents.
-			x = replacementTable[x-0x80]
-		} else if x == 0 || (0xD800 <= x && x <= 0xDFFF) || x > 0x10FFFF {
-			// Replace invalid characters with the replacement character.
-			x = '\uFFFD'
-		}
-
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	}
-
-	// Consume the maximum number of characters possible, with the
-	// consumed characters matching one of the named references.
-
-	for i < len(s) {
-		c := s[i]
-		i++
-		// Lower-cased characters are more common in entities, so we check for them first.
-		if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' || '0' <= c && c <= '9' {
-			continue
-		}
-		if c != ';' {
-			i--
-		}
-		break
-	}
-
-	entityName := string(s[1:i])
-	if entityName == "" {
-		// No-op.
-	} else if attribute && entityName[len(entityName)-1] != ';' && len(s) > i && s[i] == '=' {
-		// No-op.
-	} else if x := entity[entityName]; x != 0 {
-		return dst + utf8.EncodeRune(b[dst:], x), src + i
-	} else if x := entity2[entityName]; x[0] != 0 {
-		dst1 := dst + utf8.EncodeRune(b[dst:], x[0])
-		return dst1 + utf8.EncodeRune(b[dst1:], x[1]), src + i
-	} else if !attribute {
-		maxLen := len(entityName) - 1
-		if maxLen > longestEntityWithoutSemicolon {
-			maxLen = longestEntityWithoutSemicolon
-		}
-		for j := maxLen; j > 1; j-- {
-			if x := entity[entityName[:j]]; x != 0 {
-				return dst + utf8.EncodeRune(b[dst:], x), src + j + 1
-			}
-		}
-	}
-
-	dst1, src1 = dst+i, src+i
-	copy(b[dst:dst1], b[src:src1])
-	return dst1, src1
-}
-
-// unescape unescapes b's entities in-place, so that "a&lt;b" becomes "a<b".
-// attribute should be true if parsing an attribute value.
-func unescape(b []byte, attribute bool) []byte {
-	for i, c := range b {
-		if c == '&' {
-			dst, src := unescapeEntity(b, i, i, attribute)
-			for src < len(b) {
-				c := b[src]
-				if c == '&' {
-					dst, src = unescapeEntity(b, dst, src, attribute)
-				} else {
-					b[dst] = c
-					dst, src = dst+1, src+1
-				}
-			}
-			return b[0:dst]
-		}
-	}
-	return b
-}
-
-// lower lower-cases the A-Z bytes in b in-place, so that "aBc" becomes "abc".
-func lower(b []byte) []byte {
-	for i, c := range b {
-		if 'A' <= c && c <= 'Z' {
-			b[i] = c + 'a' - 'A'
-		}
-	}
-	return b
-}
-
-const escapedChars = "&'<>\"\r"
-
-func escape(w writer, s string) error {
-	i := strings.IndexAny(s, escapedChars)
-	for i != -1 {
-		if _, err := w.WriteString(s[:i]); err != nil {
-			return err
-		}
-		var esc string
-		switch s[i] {
-		case '&':
-			esc = "&amp;"
-		case '\'':
-			// "&#39;" is shorter than "&apos;" and apos was not in HTML until HTML5.
-			esc = "&#39;"
-		case '<':
-			esc = "&lt;"
-		case '>':
-			esc = "&gt;"
-		case '"':
-			// "&#34;" is shorter than "&quot;".
-			esc = "&#34;"
-		case '\r':
-			esc = "&#13;"
-		default:
-			panic("unrecognized escape character")
-		}
-		s = s[i+1:]
-		if _, err := w.WriteString(esc); err != nil {
-			return err
-		}
-		i = strings.IndexAny(s, escapedChars)
-	}
-	_, err := w.WriteString(s)
-	return err
-}
-
-// EscapeString escapes special characters like "<" to become "&lt;". It
-// escapes only five such characters: <, >, &, ' and ".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func EscapeString(s string) string {
-	if strings.IndexAny(s, escapedChars) == -1 {
-		return s
-	}
-	var buf bytes.Buffer
-	escape(&buf, s)
-	return buf.String()
-}
-
-// UnescapeString unescapes entities like "&lt;" to become "<". It unescapes a
-// larger range of entities than EscapeString escapes. For example, "&aacute;"
-// unescapes to "á", as does "&#225;" and "&xE1;".
-// UnescapeString(EscapeString(s)) == s always holds, but the converse isn't
-// always true.
-func UnescapeString(s string) string {
-	for _, c := range s {
-		if c == '&' {
-			return string(unescape([]byte(s), false))
-		}
-	}
-	return s
-}
diff --git a/installer/vendor/golang.org/x/net/html/escape_test.go b/installer/vendor/golang.org/x/net/html/escape_test.go
deleted file mode 100644
index b405d4b4a7..0000000000
--- a/installer/vendor/golang.org/x/net/html/escape_test.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import "testing"
-
-type unescapeTest struct {
-	// A short description of the test case.
-	desc string
-	// The HTML text.
-	html string
-	// The unescaped text.
-	unescaped string
-}
-
-var unescapeTests = []unescapeTest{
-	// Handle no entities.
-	{
-		"copy",
-		"A\ttext\nstring",
-		"A\ttext\nstring",
-	},
-	// Handle simple named entities.
-	{
-		"simple",
-		"&amp; &gt; &lt;",
-		"& > <",
-	},
-	// Handle hitting the end of the string.
-	{
-		"stringEnd",
-		"&amp &amp",
-		"& &",
-	},
-	// Handle entities with two codepoints.
-	{
-		"multiCodepoint",
-		"text &gesl; blah",
-		"text \u22db\ufe00 blah",
-	},
-	// Handle decimal numeric entities.
-	{
-		"decimalEntity",
-		"Delta = &#916; ",
-		"Delta = Δ ",
-	},
-	// Handle hexadecimal numeric entities.
-	{
-		"hexadecimalEntity",
-		"Lambda = &#x3bb; = &#X3Bb ",
-		"Lambda = λ = λ ",
-	},
-	// Handle numeric early termination.
-	{
-		"numericEnds",
-		"&# &#x &#128;43 &copy = &#169f = &#xa9",
-		"&# &#x €43 © = ©f = ©",
-	},
-	// Handle numeric ISO-8859-1 entity replacements.
-	{
-		"numericReplacements",
-		"Footnote&#x87;",
-		"Footnote‡",
-	},
-}
-
-func TestUnescape(t *testing.T) {
-	for _, tt := range unescapeTests {
-		unescaped := UnescapeString(tt.html)
-		if unescaped != tt.unescaped {
-			t.Errorf("TestUnescape %s: want %q, got %q", tt.desc, tt.unescaped, unescaped)
-		}
-	}
-}
-
-func TestUnescapeEscape(t *testing.T) {
-	ss := []string{
-		``,
-		`abc def`,
-		`a & b`,
-		`a&amp;b`,
-		`a &amp b`,
-		`&quot;`,
-		`"`,
-		`"<&>"`,
-		`&quot;&lt;&amp;&gt;&quot;`,
-		`3&5==1 && 0<1, "0&lt;1", a+acute=&aacute;`,
-		`The special characters are: <, >, &, ' and "`,
-	}
-	for _, s := range ss {
-		if got := UnescapeString(EscapeString(s)); got != s {
-			t.Errorf("got %q want %q", got, s)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/example_test.go b/installer/vendor/golang.org/x/net/html/example_test.go
deleted file mode 100644
index 0b06ed7730..0000000000
--- a/installer/vendor/golang.org/x/net/html/example_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This example demonstrates parsing HTML data and walking the resulting tree.
-package html_test
-
-import (
-	"fmt"
-	"log"
-	"strings"
-
-	"golang.org/x/net/html"
-)
-
-func ExampleParse() {
-	s := `<p>Links:</p><ul><li><a href="foo">Foo</a><li><a href="/bar/baz">BarBaz</a></ul>`
-	doc, err := html.Parse(strings.NewReader(s))
-	if err != nil {
-		log.Fatal(err)
-	}
-	var f func(*html.Node)
-	f = func(n *html.Node) {
-		if n.Type == html.ElementNode && n.Data == "a" {
-			for _, a := range n.Attr {
-				if a.Key == "href" {
-					fmt.Println(a.Val)
-					break
-				}
-			}
-		}
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			f(c)
-		}
-	}
-	f(doc)
-	// Output:
-	// foo
-	// /bar/baz
-}
diff --git a/installer/vendor/golang.org/x/net/html/foreign.go b/installer/vendor/golang.org/x/net/html/foreign.go
deleted file mode 100644
index d3b3844099..0000000000
--- a/installer/vendor/golang.org/x/net/html/foreign.go
+++ /dev/null
@@ -1,226 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"strings"
-)
-
-func adjustAttributeNames(aa []Attribute, nameMap map[string]string) {
-	for i := range aa {
-		if newName, ok := nameMap[aa[i].Key]; ok {
-			aa[i].Key = newName
-		}
-	}
-}
-
-func adjustForeignAttributes(aa []Attribute) {
-	for i, a := range aa {
-		if a.Key == "" || a.Key[0] != 'x' {
-			continue
-		}
-		switch a.Key {
-		case "xlink:actuate", "xlink:arcrole", "xlink:href", "xlink:role", "xlink:show",
-			"xlink:title", "xlink:type", "xml:base", "xml:lang", "xml:space", "xmlns:xlink":
-			j := strings.Index(a.Key, ":")
-			aa[i].Namespace = a.Key[:j]
-			aa[i].Key = a.Key[j+1:]
-		}
-	}
-}
-
-func htmlIntegrationPoint(n *Node) bool {
-	if n.Type != ElementNode {
-		return false
-	}
-	switch n.Namespace {
-	case "math":
-		if n.Data == "annotation-xml" {
-			for _, a := range n.Attr {
-				if a.Key == "encoding" {
-					val := strings.ToLower(a.Val)
-					if val == "text/html" || val == "application/xhtml+xml" {
-						return true
-					}
-				}
-			}
-		}
-	case "svg":
-		switch n.Data {
-		case "desc", "foreignObject", "title":
-			return true
-		}
-	}
-	return false
-}
-
-func mathMLTextIntegrationPoint(n *Node) bool {
-	if n.Namespace != "math" {
-		return false
-	}
-	switch n.Data {
-	case "mi", "mo", "mn", "ms", "mtext":
-		return true
-	}
-	return false
-}
-
-// Section 12.2.5.5.
-var breakout = map[string]bool{
-	"b":          true,
-	"big":        true,
-	"blockquote": true,
-	"body":       true,
-	"br":         true,
-	"center":     true,
-	"code":       true,
-	"dd":         true,
-	"div":        true,
-	"dl":         true,
-	"dt":         true,
-	"em":         true,
-	"embed":      true,
-	"h1":         true,
-	"h2":         true,
-	"h3":         true,
-	"h4":         true,
-	"h5":         true,
-	"h6":         true,
-	"head":       true,
-	"hr":         true,
-	"i":          true,
-	"img":        true,
-	"li":         true,
-	"listing":    true,
-	"menu":       true,
-	"meta":       true,
-	"nobr":       true,
-	"ol":         true,
-	"p":          true,
-	"pre":        true,
-	"ruby":       true,
-	"s":          true,
-	"small":      true,
-	"span":       true,
-	"strong":     true,
-	"strike":     true,
-	"sub":        true,
-	"sup":        true,
-	"table":      true,
-	"tt":         true,
-	"u":          true,
-	"ul":         true,
-	"var":        true,
-}
-
-// Section 12.2.5.5.
-var svgTagNameAdjustments = map[string]string{
-	"altglyph":            "altGlyph",
-	"altglyphdef":         "altGlyphDef",
-	"altglyphitem":        "altGlyphItem",
-	"animatecolor":        "animateColor",
-	"animatemotion":       "animateMotion",
-	"animatetransform":    "animateTransform",
-	"clippath":            "clipPath",
-	"feblend":             "feBlend",
-	"fecolormatrix":       "feColorMatrix",
-	"fecomponenttransfer": "feComponentTransfer",
-	"fecomposite":         "feComposite",
-	"feconvolvematrix":    "feConvolveMatrix",
-	"fediffuselighting":   "feDiffuseLighting",
-	"fedisplacementmap":   "feDisplacementMap",
-	"fedistantlight":      "feDistantLight",
-	"feflood":             "feFlood",
-	"fefunca":             "feFuncA",
-	"fefuncb":             "feFuncB",
-	"fefuncg":             "feFuncG",
-	"fefuncr":             "feFuncR",
-	"fegaussianblur":      "feGaussianBlur",
-	"feimage":             "feImage",
-	"femerge":             "feMerge",
-	"femergenode":         "feMergeNode",
-	"femorphology":        "feMorphology",
-	"feoffset":            "feOffset",
-	"fepointlight":        "fePointLight",
-	"fespecularlighting":  "feSpecularLighting",
-	"fespotlight":         "feSpotLight",
-	"fetile":              "feTile",
-	"feturbulence":        "feTurbulence",
-	"foreignobject":       "foreignObject",
-	"glyphref":            "glyphRef",
-	"lineargradient":      "linearGradient",
-	"radialgradient":      "radialGradient",
-	"textpath":            "textPath",
-}
-
-// Section 12.2.5.1
-var mathMLAttributeAdjustments = map[string]string{
-	"definitionurl": "definitionURL",
-}
-
-var svgAttributeAdjustments = map[string]string{
-	"attributename":             "attributeName",
-	"attributetype":             "attributeType",
-	"basefrequency":             "baseFrequency",
-	"baseprofile":               "baseProfile",
-	"calcmode":                  "calcMode",
-	"clippathunits":             "clipPathUnits",
-	"contentscripttype":         "contentScriptType",
-	"contentstyletype":          "contentStyleType",
-	"diffuseconstant":           "diffuseConstant",
-	"edgemode":                  "edgeMode",
-	"externalresourcesrequired": "externalResourcesRequired",
-	"filterres":                 "filterRes",
-	"filterunits":               "filterUnits",
-	"glyphref":                  "glyphRef",
-	"gradienttransform":         "gradientTransform",
-	"gradientunits":             "gradientUnits",
-	"kernelmatrix":              "kernelMatrix",
-	"kernelunitlength":          "kernelUnitLength",
-	"keypoints":                 "keyPoints",
-	"keysplines":                "keySplines",
-	"keytimes":                  "keyTimes",
-	"lengthadjust":              "lengthAdjust",
-	"limitingconeangle":         "limitingConeAngle",
-	"markerheight":              "markerHeight",
-	"markerunits":               "markerUnits",
-	"markerwidth":               "markerWidth",
-	"maskcontentunits":          "maskContentUnits",
-	"maskunits":                 "maskUnits",
-	"numoctaves":                "numOctaves",
-	"pathlength":                "pathLength",
-	"patterncontentunits":       "patternContentUnits",
-	"patterntransform":          "patternTransform",
-	"patternunits":              "patternUnits",
-	"pointsatx":                 "pointsAtX",
-	"pointsaty":                 "pointsAtY",
-	"pointsatz":                 "pointsAtZ",
-	"preservealpha":             "preserveAlpha",
-	"preserveaspectratio":       "preserveAspectRatio",
-	"primitiveunits":            "primitiveUnits",
-	"refx":                      "refX",
-	"refy":                      "refY",
-	"repeatcount":               "repeatCount",
-	"repeatdur":                 "repeatDur",
-	"requiredextensions":        "requiredExtensions",
-	"requiredfeatures":          "requiredFeatures",
-	"specularconstant":          "specularConstant",
-	"specularexponent":          "specularExponent",
-	"spreadmethod":              "spreadMethod",
-	"startoffset":               "startOffset",
-	"stddeviation":              "stdDeviation",
-	"stitchtiles":               "stitchTiles",
-	"surfacescale":              "surfaceScale",
-	"systemlanguage":            "systemLanguage",
-	"tablevalues":               "tableValues",
-	"targetx":                   "targetX",
-	"targety":                   "targetY",
-	"textlength":                "textLength",
-	"viewbox":                   "viewBox",
-	"viewtarget":                "viewTarget",
-	"xchannelselector":          "xChannelSelector",
-	"ychannelselector":          "yChannelSelector",
-	"zoomandpan":                "zoomAndPan",
-}
diff --git a/installer/vendor/golang.org/x/net/html/node.go b/installer/vendor/golang.org/x/net/html/node.go
deleted file mode 100644
index 26b657aec8..0000000000
--- a/installer/vendor/golang.org/x/net/html/node.go
+++ /dev/null
@@ -1,193 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"golang.org/x/net/html/atom"
-)
-
-// A NodeType is the type of a Node.
-type NodeType uint32
-
-const (
-	ErrorNode NodeType = iota
-	TextNode
-	DocumentNode
-	ElementNode
-	CommentNode
-	DoctypeNode
-	scopeMarkerNode
-)
-
-// Section 12.2.3.3 says "scope markers are inserted when entering applet
-// elements, buttons, object elements, marquees, table cells, and table
-// captions, and are used to prevent formatting from 'leaking'".
-var scopeMarker = Node{Type: scopeMarkerNode}
-
-// A Node consists of a NodeType and some Data (tag name for element nodes,
-// content for text) and are part of a tree of Nodes. Element nodes may also
-// have a Namespace and contain a slice of Attributes. Data is unescaped, so
-// that it looks like "a<b" rather than "a&lt;b". For element nodes, DataAtom
-// is the atom for Data, or zero if Data is not a known tag name.
-//
-// An empty Namespace implies a "http://www.w3.org/1999/xhtml" namespace.
-// Similarly, "math" is short for "http://www.w3.org/1998/Math/MathML", and
-// "svg" is short for "http://www.w3.org/2000/svg".
-type Node struct {
-	Parent, FirstChild, LastChild, PrevSibling, NextSibling *Node
-
-	Type      NodeType
-	DataAtom  atom.Atom
-	Data      string
-	Namespace string
-	Attr      []Attribute
-}
-
-// InsertBefore inserts newChild as a child of n, immediately before oldChild
-// in the sequence of n's children. oldChild may be nil, in which case newChild
-// is appended to the end of n's children.
-//
-// It will panic if newChild already has a parent or siblings.
-func (n *Node) InsertBefore(newChild, oldChild *Node) {
-	if newChild.Parent != nil || newChild.PrevSibling != nil || newChild.NextSibling != nil {
-		panic("html: InsertBefore called for an attached child Node")
-	}
-	var prev, next *Node
-	if oldChild != nil {
-		prev, next = oldChild.PrevSibling, oldChild
-	} else {
-		prev = n.LastChild
-	}
-	if prev != nil {
-		prev.NextSibling = newChild
-	} else {
-		n.FirstChild = newChild
-	}
-	if next != nil {
-		next.PrevSibling = newChild
-	} else {
-		n.LastChild = newChild
-	}
-	newChild.Parent = n
-	newChild.PrevSibling = prev
-	newChild.NextSibling = next
-}
-
-// AppendChild adds a node c as a child of n.
-//
-// It will panic if c already has a parent or siblings.
-func (n *Node) AppendChild(c *Node) {
-	if c.Parent != nil || c.PrevSibling != nil || c.NextSibling != nil {
-		panic("html: AppendChild called for an attached child Node")
-	}
-	last := n.LastChild
-	if last != nil {
-		last.NextSibling = c
-	} else {
-		n.FirstChild = c
-	}
-	n.LastChild = c
-	c.Parent = n
-	c.PrevSibling = last
-}
-
-// RemoveChild removes a node c that is a child of n. Afterwards, c will have
-// no parent and no siblings.
-//
-// It will panic if c's parent is not n.
-func (n *Node) RemoveChild(c *Node) {
-	if c.Parent != n {
-		panic("html: RemoveChild called for a non-child Node")
-	}
-	if n.FirstChild == c {
-		n.FirstChild = c.NextSibling
-	}
-	if c.NextSibling != nil {
-		c.NextSibling.PrevSibling = c.PrevSibling
-	}
-	if n.LastChild == c {
-		n.LastChild = c.PrevSibling
-	}
-	if c.PrevSibling != nil {
-		c.PrevSibling.NextSibling = c.NextSibling
-	}
-	c.Parent = nil
-	c.PrevSibling = nil
-	c.NextSibling = nil
-}
-
-// reparentChildren reparents all of src's child nodes to dst.
-func reparentChildren(dst, src *Node) {
-	for {
-		child := src.FirstChild
-		if child == nil {
-			break
-		}
-		src.RemoveChild(child)
-		dst.AppendChild(child)
-	}
-}
-
-// clone returns a new node with the same type, data and attributes.
-// The clone has no parent, no siblings and no children.
-func (n *Node) clone() *Node {
-	m := &Node{
-		Type:     n.Type,
-		DataAtom: n.DataAtom,
-		Data:     n.Data,
-		Attr:     make([]Attribute, len(n.Attr)),
-	}
-	copy(m.Attr, n.Attr)
-	return m
-}
-
-// nodeStack is a stack of nodes.
-type nodeStack []*Node
-
-// pop pops the stack. It will panic if s is empty.
-func (s *nodeStack) pop() *Node {
-	i := len(*s)
-	n := (*s)[i-1]
-	*s = (*s)[:i-1]
-	return n
-}
-
-// top returns the most recently pushed node, or nil if s is empty.
-func (s *nodeStack) top() *Node {
-	if i := len(*s); i > 0 {
-		return (*s)[i-1]
-	}
-	return nil
-}
-
-// index returns the index of the top-most occurrence of n in the stack, or -1
-// if n is not present.
-func (s *nodeStack) index(n *Node) int {
-	for i := len(*s) - 1; i >= 0; i-- {
-		if (*s)[i] == n {
-			return i
-		}
-	}
-	return -1
-}
-
-// insert inserts a node at the given index.
-func (s *nodeStack) insert(i int, n *Node) {
-	(*s) = append(*s, nil)
-	copy((*s)[i+1:], (*s)[i:])
-	(*s)[i] = n
-}
-
-// remove removes a node from the stack. It is a no-op if n is not present.
-func (s *nodeStack) remove(n *Node) {
-	i := s.index(n)
-	if i == -1 {
-		return
-	}
-	copy((*s)[i:], (*s)[i+1:])
-	j := len(*s) - 1
-	(*s)[j] = nil
-	*s = (*s)[:j]
-}
diff --git a/installer/vendor/golang.org/x/net/html/node_test.go b/installer/vendor/golang.org/x/net/html/node_test.go
deleted file mode 100644
index 471102f3a2..0000000000
--- a/installer/vendor/golang.org/x/net/html/node_test.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"fmt"
-)
-
-// checkTreeConsistency checks that a node and its descendants are all
-// consistent in their parent/child/sibling relationships.
-func checkTreeConsistency(n *Node) error {
-	return checkTreeConsistency1(n, 0)
-}
-
-func checkTreeConsistency1(n *Node, depth int) error {
-	if depth == 1e4 {
-		return fmt.Errorf("html: tree looks like it contains a cycle")
-	}
-	if err := checkNodeConsistency(n); err != nil {
-		return err
-	}
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		if err := checkTreeConsistency1(c, depth+1); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// checkNodeConsistency checks that a node's parent/child/sibling relationships
-// are consistent.
-func checkNodeConsistency(n *Node) error {
-	if n == nil {
-		return nil
-	}
-
-	nParent := 0
-	for p := n.Parent; p != nil; p = p.Parent {
-		nParent++
-		if nParent == 1e4 {
-			return fmt.Errorf("html: parent list looks like an infinite loop")
-		}
-	}
-
-	nForward := 0
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		nForward++
-		if nForward == 1e6 {
-			return fmt.Errorf("html: forward list of children looks like an infinite loop")
-		}
-		if c.Parent != n {
-			return fmt.Errorf("html: inconsistent child/parent relationship")
-		}
-	}
-
-	nBackward := 0
-	for c := n.LastChild; c != nil; c = c.PrevSibling {
-		nBackward++
-		if nBackward == 1e6 {
-			return fmt.Errorf("html: backward list of children looks like an infinite loop")
-		}
-		if c.Parent != n {
-			return fmt.Errorf("html: inconsistent child/parent relationship")
-		}
-	}
-
-	if n.Parent != nil {
-		if n.Parent == n {
-			return fmt.Errorf("html: inconsistent parent relationship")
-		}
-		if n.Parent == n.FirstChild {
-			return fmt.Errorf("html: inconsistent parent/first relationship")
-		}
-		if n.Parent == n.LastChild {
-			return fmt.Errorf("html: inconsistent parent/last relationship")
-		}
-		if n.Parent == n.PrevSibling {
-			return fmt.Errorf("html: inconsistent parent/prev relationship")
-		}
-		if n.Parent == n.NextSibling {
-			return fmt.Errorf("html: inconsistent parent/next relationship")
-		}
-
-		parentHasNAsAChild := false
-		for c := n.Parent.FirstChild; c != nil; c = c.NextSibling {
-			if c == n {
-				parentHasNAsAChild = true
-				break
-			}
-		}
-		if !parentHasNAsAChild {
-			return fmt.Errorf("html: inconsistent parent/child relationship")
-		}
-	}
-
-	if n.PrevSibling != nil && n.PrevSibling.NextSibling != n {
-		return fmt.Errorf("html: inconsistent prev/next relationship")
-	}
-	if n.NextSibling != nil && n.NextSibling.PrevSibling != n {
-		return fmt.Errorf("html: inconsistent next/prev relationship")
-	}
-
-	if (n.FirstChild == nil) != (n.LastChild == nil) {
-		return fmt.Errorf("html: inconsistent first/last relationship")
-	}
-	if n.FirstChild != nil && n.FirstChild == n.LastChild {
-		// We have a sole child.
-		if n.FirstChild.PrevSibling != nil || n.FirstChild.NextSibling != nil {
-			return fmt.Errorf("html: inconsistent sole child's sibling relationship")
-		}
-	}
-
-	seen := map[*Node]bool{}
-
-	var last *Node
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		if seen[c] {
-			return fmt.Errorf("html: inconsistent repeated child")
-		}
-		seen[c] = true
-		last = c
-	}
-	if last != n.LastChild {
-		return fmt.Errorf("html: inconsistent last relationship")
-	}
-
-	var first *Node
-	for c := n.LastChild; c != nil; c = c.PrevSibling {
-		if !seen[c] {
-			return fmt.Errorf("html: inconsistent missing child")
-		}
-		delete(seen, c)
-		first = c
-	}
-	if first != n.FirstChild {
-		return fmt.Errorf("html: inconsistent first relationship")
-	}
-
-	if len(seen) != 0 {
-		return fmt.Errorf("html: inconsistent forwards/backwards child list")
-	}
-
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/html/parse.go b/installer/vendor/golang.org/x/net/html/parse.go
deleted file mode 100644
index be4b2bf5aa..0000000000
--- a/installer/vendor/golang.org/x/net/html/parse.go
+++ /dev/null
@@ -1,2094 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-
-	a "golang.org/x/net/html/atom"
-)
-
-// A parser implements the HTML5 parsing algorithm:
-// https://html.spec.whatwg.org/multipage/syntax.html#tree-construction
-type parser struct {
-	// tokenizer provides the tokens for the parser.
-	tokenizer *Tokenizer
-	// tok is the most recently read token.
-	tok Token
-	// Self-closing tags like <hr/> are treated as start tags, except that
-	// hasSelfClosingToken is set while they are being processed.
-	hasSelfClosingToken bool
-	// doc is the document root element.
-	doc *Node
-	// The stack of open elements (section 12.2.3.2) and active formatting
-	// elements (section 12.2.3.3).
-	oe, afe nodeStack
-	// Element pointers (section 12.2.3.4).
-	head, form *Node
-	// Other parsing state flags (section 12.2.3.5).
-	scripting, framesetOK bool
-	// im is the current insertion mode.
-	im insertionMode
-	// originalIM is the insertion mode to go back to after completing a text
-	// or inTableText insertion mode.
-	originalIM insertionMode
-	// fosterParenting is whether new elements should be inserted according to
-	// the foster parenting rules (section 12.2.5.3).
-	fosterParenting bool
-	// quirks is whether the parser is operating in "quirks mode."
-	quirks bool
-	// fragment is whether the parser is parsing an HTML fragment.
-	fragment bool
-	// context is the context element when parsing an HTML fragment
-	// (section 12.4).
-	context *Node
-}
-
-func (p *parser) top() *Node {
-	if n := p.oe.top(); n != nil {
-		return n
-	}
-	return p.doc
-}
-
-// Stop tags for use in popUntil. These come from section 12.2.3.2.
-var (
-	defaultScopeStopTags = map[string][]a.Atom{
-		"":     {a.Applet, a.Caption, a.Html, a.Table, a.Td, a.Th, a.Marquee, a.Object, a.Template},
-		"math": {a.AnnotationXml, a.Mi, a.Mn, a.Mo, a.Ms, a.Mtext},
-		"svg":  {a.Desc, a.ForeignObject, a.Title},
-	}
-)
-
-type scope int
-
-const (
-	defaultScope scope = iota
-	listItemScope
-	buttonScope
-	tableScope
-	tableRowScope
-	tableBodyScope
-	selectScope
-)
-
-// popUntil pops the stack of open elements at the highest element whose tag
-// is in matchTags, provided there is no higher element in the scope's stop
-// tags (as defined in section 12.2.3.2). It returns whether or not there was
-// such an element. If there was not, popUntil leaves the stack unchanged.
-//
-// For example, the set of stop tags for table scope is: "html", "table". If
-// the stack was:
-// ["html", "body", "font", "table", "b", "i", "u"]
-// then popUntil(tableScope, "font") would return false, but
-// popUntil(tableScope, "i") would return true and the stack would become:
-// ["html", "body", "font", "table", "b"]
-//
-// If an element's tag is in both the stop tags and matchTags, then the stack
-// will be popped and the function returns true (provided, of course, there was
-// no higher element in the stack that was also in the stop tags). For example,
-// popUntil(tableScope, "table") returns true and leaves:
-// ["html", "body", "font"]
-func (p *parser) popUntil(s scope, matchTags ...a.Atom) bool {
-	if i := p.indexOfElementInScope(s, matchTags...); i != -1 {
-		p.oe = p.oe[:i]
-		return true
-	}
-	return false
-}
-
-// indexOfElementInScope returns the index in p.oe of the highest element whose
-// tag is in matchTags that is in scope. If no matching element is in scope, it
-// returns -1.
-func (p *parser) indexOfElementInScope(s scope, matchTags ...a.Atom) int {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		if p.oe[i].Namespace == "" {
-			for _, t := range matchTags {
-				if t == tagAtom {
-					return i
-				}
-			}
-			switch s {
-			case defaultScope:
-				// No-op.
-			case listItemScope:
-				if tagAtom == a.Ol || tagAtom == a.Ul {
-					return -1
-				}
-			case buttonScope:
-				if tagAtom == a.Button {
-					return -1
-				}
-			case tableScope:
-				if tagAtom == a.Html || tagAtom == a.Table {
-					return -1
-				}
-			case selectScope:
-				if tagAtom != a.Optgroup && tagAtom != a.Option {
-					return -1
-				}
-			default:
-				panic("unreachable")
-			}
-		}
-		switch s {
-		case defaultScope, listItemScope, buttonScope:
-			for _, t := range defaultScopeStopTags[p.oe[i].Namespace] {
-				if t == tagAtom {
-					return -1
-				}
-			}
-		}
-	}
-	return -1
-}
-
-// elementInScope is like popUntil, except that it doesn't modify the stack of
-// open elements.
-func (p *parser) elementInScope(s scope, matchTags ...a.Atom) bool {
-	return p.indexOfElementInScope(s, matchTags...) != -1
-}
-
-// clearStackToContext pops elements off the stack of open elements until a
-// scope-defined element is found.
-func (p *parser) clearStackToContext(s scope) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		tagAtom := p.oe[i].DataAtom
-		switch s {
-		case tableScope:
-			if tagAtom == a.Html || tagAtom == a.Table {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableRowScope:
-			if tagAtom == a.Html || tagAtom == a.Tr {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		case tableBodyScope:
-			if tagAtom == a.Html || tagAtom == a.Tbody || tagAtom == a.Tfoot || tagAtom == a.Thead {
-				p.oe = p.oe[:i+1]
-				return
-			}
-		default:
-			panic("unreachable")
-		}
-	}
-}
-
-// generateImpliedEndTags pops nodes off the stack of open elements as long as
-// the top node has a tag name of dd, dt, li, option, optgroup, p, rp, or rt.
-// If exceptions are specified, nodes with that name will not be popped off.
-func (p *parser) generateImpliedEndTags(exceptions ...string) {
-	var i int
-loop:
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if n.Type == ElementNode {
-			switch n.DataAtom {
-			case a.Dd, a.Dt, a.Li, a.Option, a.Optgroup, a.P, a.Rp, a.Rt:
-				for _, except := range exceptions {
-					if n.Data == except {
-						break loop
-					}
-				}
-				continue
-			}
-		}
-		break
-	}
-
-	p.oe = p.oe[:i+1]
-}
-
-// addChild adds a child node n to the top element, and pushes n onto the stack
-// of open elements if it is an element node.
-func (p *parser) addChild(n *Node) {
-	if p.shouldFosterParent() {
-		p.fosterParent(n)
-	} else {
-		p.top().AppendChild(n)
-	}
-
-	if n.Type == ElementNode {
-		p.oe = append(p.oe, n)
-	}
-}
-
-// shouldFosterParent returns whether the next node to be added should be
-// foster parented.
-func (p *parser) shouldFosterParent() bool {
-	if p.fosterParenting {
-		switch p.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			return true
-		}
-	}
-	return false
-}
-
-// fosterParent adds a child node according to the foster parenting rules.
-// Section 12.2.5.3, "foster parenting".
-func (p *parser) fosterParent(n *Node) {
-	var table, parent, prev *Node
-	var i int
-	for i = len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == a.Table {
-			table = p.oe[i]
-			break
-		}
-	}
-
-	if table == nil {
-		// The foster parent is the html element.
-		parent = p.oe[0]
-	} else {
-		parent = table.Parent
-	}
-	if parent == nil {
-		parent = p.oe[i-1]
-	}
-
-	if table != nil {
-		prev = table.PrevSibling
-	} else {
-		prev = parent.LastChild
-	}
-	if prev != nil && prev.Type == TextNode && n.Type == TextNode {
-		prev.Data += n.Data
-		return
-	}
-
-	parent.InsertBefore(n, table)
-}
-
-// addText adds text to the preceding node if it is a text node, or else it
-// calls addChild with a new text node.
-func (p *parser) addText(text string) {
-	if text == "" {
-		return
-	}
-
-	if p.shouldFosterParent() {
-		p.fosterParent(&Node{
-			Type: TextNode,
-			Data: text,
-		})
-		return
-	}
-
-	t := p.top()
-	if n := t.LastChild; n != nil && n.Type == TextNode {
-		n.Data += text
-		return
-	}
-	p.addChild(&Node{
-		Type: TextNode,
-		Data: text,
-	})
-}
-
-// addElement adds a child element based on the current token.
-func (p *parser) addElement() {
-	p.addChild(&Node{
-		Type:     ElementNode,
-		DataAtom: p.tok.DataAtom,
-		Data:     p.tok.Data,
-		Attr:     p.tok.Attr,
-	})
-}
-
-// Section 12.2.3.3.
-func (p *parser) addFormattingElement() {
-	tagAtom, attr := p.tok.DataAtom, p.tok.Attr
-	p.addElement()
-
-	// Implement the Noah's Ark clause, but with three per family instead of two.
-	identicalElements := 0
-findIdenticalElements:
-	for i := len(p.afe) - 1; i >= 0; i-- {
-		n := p.afe[i]
-		if n.Type == scopeMarkerNode {
-			break
-		}
-		if n.Type != ElementNode {
-			continue
-		}
-		if n.Namespace != "" {
-			continue
-		}
-		if n.DataAtom != tagAtom {
-			continue
-		}
-		if len(n.Attr) != len(attr) {
-			continue
-		}
-	compareAttributes:
-		for _, t0 := range n.Attr {
-			for _, t1 := range attr {
-				if t0.Key == t1.Key && t0.Namespace == t1.Namespace && t0.Val == t1.Val {
-					// Found a match for this attribute, continue with the next attribute.
-					continue compareAttributes
-				}
-			}
-			// If we get here, there is no attribute that matches a.
-			// Therefore the element is not identical to the new one.
-			continue findIdenticalElements
-		}
-
-		identicalElements++
-		if identicalElements >= 3 {
-			p.afe.remove(n)
-		}
-	}
-
-	p.afe = append(p.afe, p.top())
-}
-
-// Section 12.2.3.3.
-func (p *parser) clearActiveFormattingElements() {
-	for {
-		n := p.afe.pop()
-		if len(p.afe) == 0 || n.Type == scopeMarkerNode {
-			return
-		}
-	}
-}
-
-// Section 12.2.3.3.
-func (p *parser) reconstructActiveFormattingElements() {
-	n := p.afe.top()
-	if n == nil {
-		return
-	}
-	if n.Type == scopeMarkerNode || p.oe.index(n) != -1 {
-		return
-	}
-	i := len(p.afe) - 1
-	for n.Type != scopeMarkerNode && p.oe.index(n) == -1 {
-		if i == 0 {
-			i = -1
-			break
-		}
-		i--
-		n = p.afe[i]
-	}
-	for {
-		i++
-		clone := p.afe[i].clone()
-		p.addChild(clone)
-		p.afe[i] = clone
-		if i == len(p.afe)-1 {
-			break
-		}
-	}
-}
-
-// Section 12.2.4.
-func (p *parser) acknowledgeSelfClosingTag() {
-	p.hasSelfClosingToken = false
-}
-
-// An insertion mode (section 12.2.3.1) is the state transition function from
-// a particular state in the HTML5 parser's state machine. It updates the
-// parser's fields depending on parser.tok (where ErrorToken means EOF).
-// It returns whether the token was consumed.
-type insertionMode func(*parser) bool
-
-// setOriginalIM sets the insertion mode to return to after completing a text or
-// inTableText insertion mode.
-// Section 12.2.3.1, "using the rules for".
-func (p *parser) setOriginalIM() {
-	if p.originalIM != nil {
-		panic("html: bad parser state: originalIM was set twice")
-	}
-	p.originalIM = p.im
-}
-
-// Section 12.2.3.1, "reset the insertion mode".
-func (p *parser) resetInsertionMode() {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		n := p.oe[i]
-		if i == 0 && p.context != nil {
-			n = p.context
-		}
-
-		switch n.DataAtom {
-		case a.Select:
-			p.im = inSelectIM
-		case a.Td, a.Th:
-			p.im = inCellIM
-		case a.Tr:
-			p.im = inRowIM
-		case a.Tbody, a.Thead, a.Tfoot:
-			p.im = inTableBodyIM
-		case a.Caption:
-			p.im = inCaptionIM
-		case a.Colgroup:
-			p.im = inColumnGroupIM
-		case a.Table:
-			p.im = inTableIM
-		case a.Head:
-			p.im = inBodyIM
-		case a.Body:
-			p.im = inBodyIM
-		case a.Frameset:
-			p.im = inFramesetIM
-		case a.Html:
-			p.im = beforeHeadIM
-		default:
-			continue
-		}
-		return
-	}
-	p.im = inBodyIM
-}
-
-const whitespace = " \t\r\n\f"
-
-// Section 12.2.5.4.1.
-func initialIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		n, quirks := parseDoctype(p.tok.Data)
-		p.doc.AppendChild(n)
-		p.quirks = quirks
-		p.im = beforeHTMLIM
-		return true
-	}
-	p.quirks = true
-	p.im = beforeHTMLIM
-	return false
-}
-
-// Section 12.2.5.4.2.
-func beforeHTMLIM(p *parser) bool {
-	switch p.tok.Type {
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			p.addElement()
-			p.im = beforeHeadIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.parseImpliedToken(StartTagToken, a.Html, a.Html.String())
-	return false
-}
-
-// Section 12.2.5.4.3.
-func beforeHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		p.tok.Data = strings.TrimLeft(p.tok.Data, whitespace)
-		if len(p.tok.Data) == 0 {
-			// It was all whitespace, so ignore it.
-			return true
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			p.addElement()
-			p.head = p.top()
-			p.im = inHeadIM
-			return true
-		case a.Html:
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head, a.Body, a.Html, a.Br:
-			p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.4.
-func inHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		case a.Script, a.Title, a.Noscript, a.Noframes, a.Style:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-			return true
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Head:
-			n := p.oe.pop()
-			if n.DataAtom != a.Head {
-				panic("html: bad parser state: <head> element not found, in the in-head insertion mode")
-			}
-			p.im = afterHeadIM
-			return true
-		case a.Body, a.Html, a.Br:
-			p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-			return false
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(EndTagToken, a.Head, a.Head.String())
-	return false
-}
-
-// Section 12.2.5.4.6.
-func afterHeadIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Body:
-			p.addElement()
-			p.framesetOK = false
-			p.im = inBodyIM
-			return true
-		case a.Frameset:
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Base, a.Basefont, a.Bgsound, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			p.oe = append(p.oe, p.head)
-			defer p.oe.remove(p.head)
-			return inHeadIM(p)
-		case a.Head:
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body, a.Html, a.Br:
-			// Drop down to creating an implied <body> tag.
-		default:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.parseImpliedToken(StartTagToken, a.Body, a.Body.String())
-	p.framesetOK = true
-	return false
-}
-
-// copyAttributes copies attributes of src not found on dst to dst.
-func copyAttributes(dst *Node, src Token) {
-	if len(src.Attr) == 0 {
-		return
-	}
-	attr := map[string]string{}
-	for _, t := range dst.Attr {
-		attr[t.Key] = t.Val
-	}
-	for _, t := range src.Attr {
-		if _, ok := attr[t.Key]; !ok {
-			dst.Attr = append(dst.Attr, t)
-			attr[t.Key] = t.Val
-		}
-	}
-}
-
-// Section 12.2.5.4.7.
-func inBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		d := p.tok.Data
-		switch n := p.oe.top(); n.DataAtom {
-		case a.Pre, a.Listing:
-			if n.FirstChild == nil {
-				// Ignore a newline at the start of a <pre> block.
-				if d != "" && d[0] == '\r' {
-					d = d[1:]
-				}
-				if d != "" && d[0] == '\n' {
-					d = d[1:]
-				}
-			}
-		}
-		d = strings.Replace(d, "\x00", "", -1)
-		if d == "" {
-			return true
-		}
-		p.reconstructActiveFormattingElements()
-		p.addText(d)
-		if p.framesetOK && strings.TrimLeft(d, whitespace) != "" {
-			// There were non-whitespace characters inserted.
-			p.framesetOK = false
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			copyAttributes(p.oe[0], p.tok)
-		case a.Base, a.Basefont, a.Bgsound, a.Command, a.Link, a.Meta, a.Noframes, a.Script, a.Style, a.Title:
-			return inHeadIM(p)
-		case a.Body:
-			if len(p.oe) >= 2 {
-				body := p.oe[1]
-				if body.Type == ElementNode && body.DataAtom == a.Body {
-					p.framesetOK = false
-					copyAttributes(body, p.tok)
-				}
-			}
-		case a.Frameset:
-			if !p.framesetOK || len(p.oe) < 2 || p.oe[1].DataAtom != a.Body {
-				// Ignore the token.
-				return true
-			}
-			body := p.oe[1]
-			if body.Parent != nil {
-				body.Parent.RemoveChild(body)
-			}
-			p.oe = p.oe[:1]
-			p.addElement()
-			p.im = inFramesetIM
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Menu, a.Nav, a.Ol, a.P, a.Section, a.Summary, a.Ul:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(buttonScope, a.P)
-			switch n := p.top(); n.DataAtom {
-			case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Pre, a.Listing:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			// The newline, if any, will be dealt with by the TextToken case.
-			p.framesetOK = false
-		case a.Form:
-			if p.form == nil {
-				p.popUntil(buttonScope, a.P)
-				p.addElement()
-				p.form = p.top()
-			}
-		case a.Li:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Li:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Dd, a.Dt:
-			p.framesetOK = false
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				node := p.oe[i]
-				switch node.DataAtom {
-				case a.Dd, a.Dt:
-					p.oe = p.oe[:i]
-				case a.Address, a.Div, a.P:
-					continue
-				default:
-					if !isSpecialElement(node) {
-						continue
-					}
-				}
-				break
-			}
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Plaintext:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-		case a.Button:
-			p.popUntil(defaultScope, a.Button)
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-		case a.A:
-			for i := len(p.afe) - 1; i >= 0 && p.afe[i].Type != scopeMarkerNode; i-- {
-				if n := p.afe[i]; n.Type == ElementNode && n.DataAtom == a.A {
-					p.inBodyEndTagFormatting(a.A)
-					p.oe.remove(n)
-					p.afe.remove(n)
-					break
-				}
-			}
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.reconstructActiveFormattingElements()
-			p.addFormattingElement()
-		case a.Nobr:
-			p.reconstructActiveFormattingElements()
-			if p.elementInScope(defaultScope, a.Nobr) {
-				p.inBodyEndTagFormatting(a.Nobr)
-				p.reconstructActiveFormattingElements()
-			}
-			p.addFormattingElement()
-		case a.Applet, a.Marquee, a.Object:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.framesetOK = false
-		case a.Table:
-			if !p.quirks {
-				p.popUntil(buttonScope, a.P)
-			}
-			p.addElement()
-			p.framesetOK = false
-			p.im = inTableIM
-			return true
-		case a.Area, a.Br, a.Embed, a.Img, a.Input, a.Keygen, a.Wbr:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			if p.tok.DataAtom == a.Input {
-				for _, t := range p.tok.Attr {
-					if t.Key == "type" {
-						if strings.ToLower(t.Val) == "hidden" {
-							// Skip setting framesetOK = false
-							return true
-						}
-					}
-				}
-			}
-			p.framesetOK = false
-		case a.Param, a.Source, a.Track:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Hr:
-			p.popUntil(buttonScope, a.P)
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			p.framesetOK = false
-		case a.Image:
-			p.tok.DataAtom = a.Img
-			p.tok.Data = a.Img.String()
-			return false
-		case a.Isindex:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			action := ""
-			prompt := "This is a searchable index. Enter search keywords: "
-			attr := []Attribute{{Key: "name", Val: "isindex"}}
-			for _, t := range p.tok.Attr {
-				switch t.Key {
-				case "action":
-					action = t.Val
-				case "name":
-					// Ignore the attribute.
-				case "prompt":
-					prompt = t.Val
-				default:
-					attr = append(attr, t)
-				}
-			}
-			p.acknowledgeSelfClosingTag()
-			p.popUntil(buttonScope, a.P)
-			p.parseImpliedToken(StartTagToken, a.Form, a.Form.String())
-			if action != "" {
-				p.form.Attr = []Attribute{{Key: "action", Val: action}}
-			}
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(StartTagToken, a.Label, a.Label.String())
-			p.addText(prompt)
-			p.addChild(&Node{
-				Type:     ElementNode,
-				DataAtom: a.Input,
-				Data:     a.Input.String(),
-				Attr:     attr,
-			})
-			p.oe.pop()
-			p.parseImpliedToken(EndTagToken, a.Label, a.Label.String())
-			p.parseImpliedToken(StartTagToken, a.Hr, a.Hr.String())
-			p.parseImpliedToken(EndTagToken, a.Form, a.Form.String())
-		case a.Textarea:
-			p.addElement()
-			p.setOriginalIM()
-			p.framesetOK = false
-			p.im = textIM
-		case a.Xmp:
-			p.popUntil(buttonScope, a.P)
-			p.reconstructActiveFormattingElements()
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Iframe:
-			p.framesetOK = false
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Noembed, a.Noscript:
-			p.addElement()
-			p.setOriginalIM()
-			p.im = textIM
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectIM
-			return true
-		case a.Optgroup, a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		case a.Rp, a.Rt:
-			if p.elementInScope(defaultScope, a.Ruby) {
-				p.generateImpliedEndTags()
-			}
-			p.addElement()
-		case a.Math, a.Svg:
-			p.reconstructActiveFormattingElements()
-			if p.tok.DataAtom == a.Math {
-				adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-			} else {
-				adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-			}
-			adjustForeignAttributes(p.tok.Attr)
-			p.addElement()
-			p.top().Namespace = p.tok.Data
-			if p.hasSelfClosingToken {
-				p.oe.pop()
-				p.acknowledgeSelfClosingTag()
-			}
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Frame, a.Head, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-		default:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Body:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.im = afterBodyIM
-			}
-		case a.Html:
-			if p.elementInScope(defaultScope, a.Body) {
-				p.parseImpliedToken(EndTagToken, a.Body, a.Body.String())
-				return false
-			}
-			return true
-		case a.Address, a.Article, a.Aside, a.Blockquote, a.Button, a.Center, a.Details, a.Dir, a.Div, a.Dl, a.Fieldset, a.Figcaption, a.Figure, a.Footer, a.Header, a.Hgroup, a.Listing, a.Menu, a.Nav, a.Ol, a.Pre, a.Section, a.Summary, a.Ul:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.Form:
-			node := p.form
-			p.form = nil
-			i := p.indexOfElementInScope(defaultScope, a.Form)
-			if node == nil || i == -1 || p.oe[i] != node {
-				// Ignore the token.
-				return true
-			}
-			p.generateImpliedEndTags()
-			p.oe.remove(node)
-		case a.P:
-			if !p.elementInScope(buttonScope, a.P) {
-				p.parseImpliedToken(StartTagToken, a.P, a.P.String())
-			}
-			p.popUntil(buttonScope, a.P)
-		case a.Li:
-			p.popUntil(listItemScope, a.Li)
-		case a.Dd, a.Dt:
-			p.popUntil(defaultScope, p.tok.DataAtom)
-		case a.H1, a.H2, a.H3, a.H4, a.H5, a.H6:
-			p.popUntil(defaultScope, a.H1, a.H2, a.H3, a.H4, a.H5, a.H6)
-		case a.A, a.B, a.Big, a.Code, a.Em, a.Font, a.I, a.Nobr, a.S, a.Small, a.Strike, a.Strong, a.Tt, a.U:
-			p.inBodyEndTagFormatting(p.tok.DataAtom)
-		case a.Applet, a.Marquee, a.Object:
-			if p.popUntil(defaultScope, p.tok.DataAtom) {
-				p.clearActiveFormattingElements()
-			}
-		case a.Br:
-			p.tok.Type = StartTagToken
-			return false
-		default:
-			p.inBodyEndTagOther(p.tok.DataAtom)
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	}
-
-	return true
-}
-
-func (p *parser) inBodyEndTagFormatting(tagAtom a.Atom) {
-	// This is the "adoption agency" algorithm, described at
-	// https://html.spec.whatwg.org/multipage/syntax.html#adoptionAgency
-
-	// TODO: this is a fairly literal line-by-line translation of that algorithm.
-	// Once the code successfully parses the comprehensive test suite, we should
-	// refactor this code to be more idiomatic.
-
-	// Steps 1-4. The outer loop.
-	for i := 0; i < 8; i++ {
-		// Step 5. Find the formatting element.
-		var formattingElement *Node
-		for j := len(p.afe) - 1; j >= 0; j-- {
-			if p.afe[j].Type == scopeMarkerNode {
-				break
-			}
-			if p.afe[j].DataAtom == tagAtom {
-				formattingElement = p.afe[j]
-				break
-			}
-		}
-		if formattingElement == nil {
-			p.inBodyEndTagOther(tagAtom)
-			return
-		}
-		feIndex := p.oe.index(formattingElement)
-		if feIndex == -1 {
-			p.afe.remove(formattingElement)
-			return
-		}
-		if !p.elementInScope(defaultScope, tagAtom) {
-			// Ignore the tag.
-			return
-		}
-
-		// Steps 9-10. Find the furthest block.
-		var furthestBlock *Node
-		for _, e := range p.oe[feIndex:] {
-			if isSpecialElement(e) {
-				furthestBlock = e
-				break
-			}
-		}
-		if furthestBlock == nil {
-			e := p.oe.pop()
-			for e != formattingElement {
-				e = p.oe.pop()
-			}
-			p.afe.remove(e)
-			return
-		}
-
-		// Steps 11-12. Find the common ancestor and bookmark node.
-		commonAncestor := p.oe[feIndex-1]
-		bookmark := p.afe.index(formattingElement)
-
-		// Step 13. The inner loop. Find the lastNode to reparent.
-		lastNode := furthestBlock
-		node := furthestBlock
-		x := p.oe.index(node)
-		// Steps 13.1-13.2
-		for j := 0; j < 3; j++ {
-			// Step 13.3.
-			x--
-			node = p.oe[x]
-			// Step 13.4 - 13.5.
-			if p.afe.index(node) == -1 {
-				p.oe.remove(node)
-				continue
-			}
-			// Step 13.6.
-			if node == formattingElement {
-				break
-			}
-			// Step 13.7.
-			clone := node.clone()
-			p.afe[p.afe.index(node)] = clone
-			p.oe[p.oe.index(node)] = clone
-			node = clone
-			// Step 13.8.
-			if lastNode == furthestBlock {
-				bookmark = p.afe.index(node) + 1
-			}
-			// Step 13.9.
-			if lastNode.Parent != nil {
-				lastNode.Parent.RemoveChild(lastNode)
-			}
-			node.AppendChild(lastNode)
-			// Step 13.10.
-			lastNode = node
-		}
-
-		// Step 14. Reparent lastNode to the common ancestor,
-		// or for misnested table nodes, to the foster parent.
-		if lastNode.Parent != nil {
-			lastNode.Parent.RemoveChild(lastNode)
-		}
-		switch commonAncestor.DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			p.fosterParent(lastNode)
-		default:
-			commonAncestor.AppendChild(lastNode)
-		}
-
-		// Steps 15-17. Reparent nodes from the furthest block's children
-		// to a clone of the formatting element.
-		clone := formattingElement.clone()
-		reparentChildren(clone, furthestBlock)
-		furthestBlock.AppendChild(clone)
-
-		// Step 18. Fix up the list of active formatting elements.
-		if oldLoc := p.afe.index(formattingElement); oldLoc != -1 && oldLoc < bookmark {
-			// Move the bookmark with the rest of the list.
-			bookmark--
-		}
-		p.afe.remove(formattingElement)
-		p.afe.insert(bookmark, clone)
-
-		// Step 19. Fix up the stack of open elements.
-		p.oe.remove(formattingElement)
-		p.oe.insert(p.oe.index(furthestBlock)+1, clone)
-	}
-}
-
-// inBodyEndTagOther performs the "any other end tag" algorithm for inBodyIM.
-// "Any other end tag" handling from 12.2.5.5 The rules for parsing tokens in foreign content
-// https://html.spec.whatwg.org/multipage/syntax.html#parsing-main-inforeign
-func (p *parser) inBodyEndTagOther(tagAtom a.Atom) {
-	for i := len(p.oe) - 1; i >= 0; i-- {
-		if p.oe[i].DataAtom == tagAtom {
-			p.oe = p.oe[:i]
-			break
-		}
-		if isSpecialElement(p.oe[i]) {
-			break
-		}
-	}
-}
-
-// Section 12.2.5.4.8.
-func textIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		p.oe.pop()
-	case TextToken:
-		d := p.tok.Data
-		if n := p.oe.top(); n.DataAtom == a.Textarea && n.FirstChild == nil {
-			// Ignore a newline at the start of a <textarea> block.
-			if d != "" && d[0] == '\r' {
-				d = d[1:]
-			}
-			if d != "" && d[0] == '\n' {
-				d = d[1:]
-			}
-		}
-		if d == "" {
-			return true
-		}
-		p.addText(d)
-		return true
-	case EndTagToken:
-		p.oe.pop()
-	}
-	p.im = p.originalIM
-	p.originalIM = nil
-	return p.tok.Type == EndTagToken
-}
-
-// Section 12.2.5.4.9.
-func inTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "", -1)
-		switch p.oe.top().DataAtom {
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if strings.Trim(p.tok.Data, whitespace) == "" {
-				p.addText(p.tok.Data)
-				return true
-			}
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			p.clearStackToContext(tableScope)
-			p.afe = append(p.afe, &scopeMarker)
-			p.addElement()
-			p.im = inCaptionIM
-			return true
-		case a.Colgroup:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inColumnGroupIM
-			return true
-		case a.Col:
-			p.parseImpliedToken(StartTagToken, a.Colgroup, a.Colgroup.String())
-			return false
-		case a.Tbody, a.Tfoot, a.Thead:
-			p.clearStackToContext(tableScope)
-			p.addElement()
-			p.im = inTableBodyIM
-			return true
-		case a.Td, a.Th, a.Tr:
-			p.parseImpliedToken(StartTagToken, a.Tbody, a.Tbody.String())
-			return false
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Style, a.Script:
-			return inHeadIM(p)
-		case a.Input:
-			for _, t := range p.tok.Attr {
-				if t.Key == "type" && strings.ToLower(t.Val) == "hidden" {
-					p.addElement()
-					p.oe.pop()
-					return true
-				}
-			}
-			// Otherwise drop down to the default action.
-		case a.Form:
-			if p.form != nil {
-				// Ignore the token.
-				return true
-			}
-			p.addElement()
-			p.form = p.oe.pop()
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			switch p.top().DataAtom {
-			case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-				p.fosterParenting = true
-			}
-			p.addElement()
-			p.fosterParenting = false
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Table:
-			if p.popUntil(tableScope, a.Table) {
-				p.resetInsertionMode()
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	p.fosterParenting = true
-	defer func() { p.fosterParenting = false }()
-
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.11.
-func inCaptionIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Caption) {
-				p.clearActiveFormattingElements()
-				p.im = inTableIM
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		case a.Body, a.Col, a.Colgroup, a.Html, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.12.
-func inColumnGroupIM(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) < len(p.tok.Data) {
-			// Add the initial whitespace to the current node.
-			p.addText(p.tok.Data[:len(p.tok.Data)-len(s)])
-			if s == "" {
-				return true
-			}
-			p.tok.Data = s
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Col:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Colgroup:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Col:
-			// Ignore the token.
-			return true
-		}
-	}
-	if p.oe.top().DataAtom != a.Html {
-		p.oe.pop()
-		p.im = inTableIM
-		return false
-	}
-	return true
-}
-
-// Section 12.2.5.4.13.
-func inTableBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			p.clearStackToContext(tableBodyScope)
-			p.addElement()
-			p.im = inRowIM
-			return true
-		case a.Td, a.Th:
-			p.parseImpliedToken(StartTagToken, a.Tr, a.Tr.String())
-			return false
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.clearStackToContext(tableBodyScope)
-				p.oe.pop()
-				p.im = inTableIM
-			}
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tbody, a.Thead, a.Tfoot) {
-				p.im = inTableIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th, a.Tr:
-			// Ignore the token.
-			return true
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.14.
-func inRowIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			p.clearStackToContext(tableRowScope)
-			p.addElement()
-			p.afe = append(p.afe, &scopeMarker)
-			p.im = inCellIM
-			return true
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Tr:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return true
-			}
-			// Ignore the token.
-			return true
-		case a.Table:
-			if p.popUntil(tableScope, a.Tr) {
-				p.im = inTableBodyIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Tbody, a.Tfoot, a.Thead:
-			if p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Tr, a.Tr.String())
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html, a.Td, a.Th:
-			// Ignore the token.
-			return true
-		}
-	}
-
-	return inTableIM(p)
-}
-
-// Section 12.2.5.4.15.
-func inCellIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Col, a.Colgroup, a.Tbody, a.Td, a.Tfoot, a.Th, a.Thead, a.Tr:
-			if p.popUntil(tableScope, a.Td, a.Th) {
-				// Close the cell and reprocess.
-				p.clearActiveFormattingElements()
-				p.im = inRowIM
-				return false
-			}
-			// Ignore the token.
-			return true
-		case a.Select:
-			p.reconstructActiveFormattingElements()
-			p.addElement()
-			p.framesetOK = false
-			p.im = inSelectInTableIM
-			return true
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Td, a.Th:
-			if !p.popUntil(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return true
-		case a.Body, a.Caption, a.Col, a.Colgroup, a.Html:
-			// Ignore the token.
-			return true
-		case a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr:
-			if !p.elementInScope(tableScope, p.tok.DataAtom) {
-				// Ignore the token.
-				return true
-			}
-			// Close the cell and reprocess.
-			p.popUntil(tableScope, a.Td, a.Th)
-			p.clearActiveFormattingElements()
-			p.im = inRowIM
-			return false
-		}
-	}
-	return inBodyIM(p)
-}
-
-// Section 12.2.5.4.16.
-func inSelectIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		p.addText(strings.Replace(p.tok.Data, "\x00", "", -1))
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Optgroup:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-			if p.top().DataAtom == a.Optgroup {
-				p.oe.pop()
-			}
-			p.addElement()
-		case a.Select:
-			p.tok.Type = EndTagToken
-			return false
-		case a.Input, a.Keygen, a.Textarea:
-			if p.elementInScope(selectScope, a.Select) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			}
-			// In order to properly ignore <textarea>, we need to change the tokenizer mode.
-			p.tokenizer.NextIsNotRawText()
-			// Ignore the token.
-			return true
-		case a.Script:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Option:
-			if p.top().DataAtom == a.Option {
-				p.oe.pop()
-			}
-		case a.Optgroup:
-			i := len(p.oe) - 1
-			if p.oe[i].DataAtom == a.Option {
-				i--
-			}
-			if p.oe[i].DataAtom == a.Optgroup {
-				p.oe = p.oe[:i]
-			}
-		case a.Select:
-			if p.popUntil(selectScope, a.Select) {
-				p.resetInsertionMode()
-			}
-		}
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case DoctypeToken:
-		// Ignore the token.
-		return true
-	}
-
-	return true
-}
-
-// Section 12.2.5.4.17.
-func inSelectInTableIM(p *parser) bool {
-	switch p.tok.Type {
-	case StartTagToken, EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Caption, a.Table, a.Tbody, a.Tfoot, a.Thead, a.Tr, a.Td, a.Th:
-			if p.tok.Type == StartTagToken || p.elementInScope(tableScope, p.tok.DataAtom) {
-				p.parseImpliedToken(EndTagToken, a.Select, a.Select.String())
-				return false
-			} else {
-				// Ignore the token.
-				return true
-			}
-		}
-	}
-	return inSelectIM(p)
-}
-
-// Section 12.2.5.4.18.
-func afterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case EndTagToken:
-		if p.tok.DataAtom == a.Html {
-			if !p.fragment {
-				p.im = afterAfterBodyIM
-			}
-			return true
-		}
-	case CommentToken:
-		// The comment is attached to the <html> element.
-		if len(p.oe) < 1 || p.oe[0].DataAtom != a.Html {
-			panic("html: bad parser state: <html> element not found, in the after-body insertion mode")
-		}
-		p.oe[0].AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.19.
-func inFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Frameset:
-			p.addElement()
-		case a.Frame:
-			p.addElement()
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Frameset:
-			if p.oe.top().DataAtom != a.Html {
-				p.oe.pop()
-				if p.oe.top().DataAtom != a.Frameset {
-					p.im = afterFramesetIM
-					return true
-				}
-			}
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.20.
-func afterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.addText(s)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case EndTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			p.im = afterAfterFramesetIM
-			return true
-		}
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.4.21.
-func afterAfterBodyIM(p *parser) bool {
-	switch p.tok.Type {
-	case ErrorToken:
-		// Stop parsing.
-		return true
-	case TextToken:
-		s := strings.TrimLeft(p.tok.Data, whitespace)
-		if len(s) == 0 {
-			// It was all whitespace.
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		if p.tok.DataAtom == a.Html {
-			return inBodyIM(p)
-		}
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-		return true
-	case DoctypeToken:
-		return inBodyIM(p)
-	}
-	p.im = inBodyIM
-	return false
-}
-
-// Section 12.2.5.4.22.
-func afterAfterFramesetIM(p *parser) bool {
-	switch p.tok.Type {
-	case CommentToken:
-		p.doc.AppendChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case TextToken:
-		// Ignore all text but whitespace.
-		s := strings.Map(func(c rune) rune {
-			switch c {
-			case ' ', '\t', '\n', '\f', '\r':
-				return c
-			}
-			return -1
-		}, p.tok.Data)
-		if s != "" {
-			p.tok.Data = s
-			return inBodyIM(p)
-		}
-	case StartTagToken:
-		switch p.tok.DataAtom {
-		case a.Html:
-			return inBodyIM(p)
-		case a.Noframes:
-			return inHeadIM(p)
-		}
-	case DoctypeToken:
-		return inBodyIM(p)
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-const whitespaceOrNUL = whitespace + "\x00"
-
-// Section 12.2.5.5.
-func parseForeignContent(p *parser) bool {
-	switch p.tok.Type {
-	case TextToken:
-		if p.framesetOK {
-			p.framesetOK = strings.TrimLeft(p.tok.Data, whitespaceOrNUL) == ""
-		}
-		p.tok.Data = strings.Replace(p.tok.Data, "\x00", "\ufffd", -1)
-		p.addText(p.tok.Data)
-	case CommentToken:
-		p.addChild(&Node{
-			Type: CommentNode,
-			Data: p.tok.Data,
-		})
-	case StartTagToken:
-		b := breakout[p.tok.Data]
-		if p.tok.DataAtom == a.Font {
-		loop:
-			for _, attr := range p.tok.Attr {
-				switch attr.Key {
-				case "color", "face", "size":
-					b = true
-					break loop
-				}
-			}
-		}
-		if b {
-			for i := len(p.oe) - 1; i >= 0; i-- {
-				n := p.oe[i]
-				if n.Namespace == "" || htmlIntegrationPoint(n) || mathMLTextIntegrationPoint(n) {
-					p.oe = p.oe[:i+1]
-					break
-				}
-			}
-			return false
-		}
-		switch p.top().Namespace {
-		case "math":
-			adjustAttributeNames(p.tok.Attr, mathMLAttributeAdjustments)
-		case "svg":
-			// Adjust SVG tag names. The tokenizer lower-cases tag names, but
-			// SVG wants e.g. "foreignObject" with a capital second "O".
-			if x := svgTagNameAdjustments[p.tok.Data]; x != "" {
-				p.tok.DataAtom = a.Lookup([]byte(x))
-				p.tok.Data = x
-			}
-			adjustAttributeNames(p.tok.Attr, svgAttributeAdjustments)
-		default:
-			panic("html: bad parser state: unexpected namespace")
-		}
-		adjustForeignAttributes(p.tok.Attr)
-		namespace := p.top().Namespace
-		p.addElement()
-		p.top().Namespace = namespace
-		if namespace != "" {
-			// Don't let the tokenizer go into raw text mode in foreign content
-			// (e.g. in an SVG <title> tag).
-			p.tokenizer.NextIsNotRawText()
-		}
-		if p.hasSelfClosingToken {
-			p.oe.pop()
-			p.acknowledgeSelfClosingTag()
-		}
-	case EndTagToken:
-		for i := len(p.oe) - 1; i >= 0; i-- {
-			if p.oe[i].Namespace == "" {
-				return p.im(p)
-			}
-			if strings.EqualFold(p.oe[i].Data, p.tok.Data) {
-				p.oe = p.oe[:i]
-				break
-			}
-		}
-		return true
-	default:
-		// Ignore the token.
-	}
-	return true
-}
-
-// Section 12.2.5.
-func (p *parser) inForeignContent() bool {
-	if len(p.oe) == 0 {
-		return false
-	}
-	n := p.oe[len(p.oe)-1]
-	if n.Namespace == "" {
-		return false
-	}
-	if mathMLTextIntegrationPoint(n) {
-		if p.tok.Type == StartTagToken && p.tok.DataAtom != a.Mglyph && p.tok.DataAtom != a.Malignmark {
-			return false
-		}
-		if p.tok.Type == TextToken {
-			return false
-		}
-	}
-	if n.Namespace == "math" && n.DataAtom == a.AnnotationXml && p.tok.Type == StartTagToken && p.tok.DataAtom == a.Svg {
-		return false
-	}
-	if htmlIntegrationPoint(n) && (p.tok.Type == StartTagToken || p.tok.Type == TextToken) {
-		return false
-	}
-	if p.tok.Type == ErrorToken {
-		return false
-	}
-	return true
-}
-
-// parseImpliedToken parses a token as though it had appeared in the parser's
-// input.
-func (p *parser) parseImpliedToken(t TokenType, dataAtom a.Atom, data string) {
-	realToken, selfClosing := p.tok, p.hasSelfClosingToken
-	p.tok = Token{
-		Type:     t,
-		DataAtom: dataAtom,
-		Data:     data,
-	}
-	p.hasSelfClosingToken = false
-	p.parseCurrentToken()
-	p.tok, p.hasSelfClosingToken = realToken, selfClosing
-}
-
-// parseCurrentToken runs the current token through the parsing routines
-// until it is consumed.
-func (p *parser) parseCurrentToken() {
-	if p.tok.Type == SelfClosingTagToken {
-		p.hasSelfClosingToken = true
-		p.tok.Type = StartTagToken
-	}
-
-	consumed := false
-	for !consumed {
-		if p.inForeignContent() {
-			consumed = parseForeignContent(p)
-		} else {
-			consumed = p.im(p)
-		}
-	}
-
-	if p.hasSelfClosingToken {
-		// This is a parse error, but ignore it.
-		p.hasSelfClosingToken = false
-	}
-}
-
-func (p *parser) parse() error {
-	// Iterate until EOF. Any other error will cause an early return.
-	var err error
-	for err != io.EOF {
-		// CDATA sections are allowed only in foreign content.
-		n := p.oe.top()
-		p.tokenizer.AllowCDATA(n != nil && n.Namespace != "")
-		// Read and parse the next token.
-		p.tokenizer.Next()
-		p.tok = p.tokenizer.Token()
-		if p.tok.Type == ErrorToken {
-			err = p.tokenizer.Err()
-			if err != nil && err != io.EOF {
-				return err
-			}
-		}
-		p.parseCurrentToken()
-	}
-	return nil
-}
-
-// Parse returns the parse tree for the HTML from the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func Parse(r io.Reader) (*Node, error) {
-	p := &parser{
-		tokenizer: NewTokenizer(r),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting:  true,
-		framesetOK: true,
-		im:         initialIM,
-	}
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-	return p.doc, nil
-}
-
-// ParseFragment parses a fragment of HTML and returns the nodes that were
-// found. If the fragment is the InnerHTML for an existing element, pass that
-// element in context.
-func ParseFragment(r io.Reader, context *Node) ([]*Node, error) {
-	contextTag := ""
-	if context != nil {
-		if context.Type != ElementNode {
-			return nil, errors.New("html: ParseFragment of non-element Node")
-		}
-		// The next check isn't just context.DataAtom.String() == context.Data because
-		// it is valid to pass an element whose tag isn't a known atom. For example,
-		// DataAtom == 0 and Data = "tagfromthefuture" is perfectly consistent.
-		if context.DataAtom != a.Lookup([]byte(context.Data)) {
-			return nil, fmt.Errorf("html: inconsistent Node: DataAtom=%q, Data=%q", context.DataAtom, context.Data)
-		}
-		contextTag = context.DataAtom.String()
-	}
-	p := &parser{
-		tokenizer: NewTokenizerFragment(r, contextTag),
-		doc: &Node{
-			Type: DocumentNode,
-		},
-		scripting: true,
-		fragment:  true,
-		context:   context,
-	}
-
-	root := &Node{
-		Type:     ElementNode,
-		DataAtom: a.Html,
-		Data:     a.Html.String(),
-	}
-	p.doc.AppendChild(root)
-	p.oe = nodeStack{root}
-	p.resetInsertionMode()
-
-	for n := context; n != nil; n = n.Parent {
-		if n.Type == ElementNode && n.DataAtom == a.Form {
-			p.form = n
-			break
-		}
-	}
-
-	err := p.parse()
-	if err != nil {
-		return nil, err
-	}
-
-	parent := p.doc
-	if context != nil {
-		parent = root
-	}
-
-	var result []*Node
-	for c := parent.FirstChild; c != nil; {
-		next := c.NextSibling
-		parent.RemoveChild(c)
-		result = append(result, c)
-		c = next
-	}
-	return result, nil
-}
diff --git a/installer/vendor/golang.org/x/net/html/parse_test.go b/installer/vendor/golang.org/x/net/html/parse_test.go
deleted file mode 100644
index 7e47d11be8..0000000000
--- a/installer/vendor/golang.org/x/net/html/parse_test.go
+++ /dev/null
@@ -1,388 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/html/atom"
-)
-
-// readParseTest reads a single test case from r.
-func readParseTest(r *bufio.Reader) (text, want, context string, err error) {
-	line, err := r.ReadSlice('\n')
-	if err != nil {
-		return "", "", "", err
-	}
-	var b []byte
-
-	// Read the HTML.
-	if string(line) != "#data\n" {
-		return "", "", "", fmt.Errorf(`got %q want "#data\n"`, line)
-	}
-	for {
-		line, err = r.ReadSlice('\n')
-		if err != nil {
-			return "", "", "", err
-		}
-		if line[0] == '#' {
-			break
-		}
-		b = append(b, line...)
-	}
-	text = strings.TrimSuffix(string(b), "\n")
-	b = b[:0]
-
-	// Skip the error list.
-	if string(line) != "#errors\n" {
-		return "", "", "", fmt.Errorf(`got %q want "#errors\n"`, line)
-	}
-	for {
-		line, err = r.ReadSlice('\n')
-		if err != nil {
-			return "", "", "", err
-		}
-		if line[0] == '#' {
-			break
-		}
-	}
-
-	if string(line) == "#document-fragment\n" {
-		line, err = r.ReadSlice('\n')
-		if err != nil {
-			return "", "", "", err
-		}
-		context = strings.TrimSpace(string(line))
-		line, err = r.ReadSlice('\n')
-		if err != nil {
-			return "", "", "", err
-		}
-	}
-
-	// Read the dump of what the parse tree should be.
-	if string(line) != "#document\n" {
-		return "", "", "", fmt.Errorf(`got %q want "#document\n"`, line)
-	}
-	inQuote := false
-	for {
-		line, err = r.ReadSlice('\n')
-		if err != nil && err != io.EOF {
-			return "", "", "", err
-		}
-		trimmed := bytes.Trim(line, "| \n")
-		if len(trimmed) > 0 {
-			if line[0] == '|' && trimmed[0] == '"' {
-				inQuote = true
-			}
-			if trimmed[len(trimmed)-1] == '"' && !(line[0] == '|' && len(trimmed) == 1) {
-				inQuote = false
-			}
-		}
-		if len(line) == 0 || len(line) == 1 && line[0] == '\n' && !inQuote {
-			break
-		}
-		b = append(b, line...)
-	}
-	return text, string(b), context, nil
-}
-
-func dumpIndent(w io.Writer, level int) {
-	io.WriteString(w, "| ")
-	for i := 0; i < level; i++ {
-		io.WriteString(w, "  ")
-	}
-}
-
-type sortedAttributes []Attribute
-
-func (a sortedAttributes) Len() int {
-	return len(a)
-}
-
-func (a sortedAttributes) Less(i, j int) bool {
-	if a[i].Namespace != a[j].Namespace {
-		return a[i].Namespace < a[j].Namespace
-	}
-	return a[i].Key < a[j].Key
-}
-
-func (a sortedAttributes) Swap(i, j int) {
-	a[i], a[j] = a[j], a[i]
-}
-
-func dumpLevel(w io.Writer, n *Node, level int) error {
-	dumpIndent(w, level)
-	switch n.Type {
-	case ErrorNode:
-		return errors.New("unexpected ErrorNode")
-	case DocumentNode:
-		return errors.New("unexpected DocumentNode")
-	case ElementNode:
-		if n.Namespace != "" {
-			fmt.Fprintf(w, "<%s %s>", n.Namespace, n.Data)
-		} else {
-			fmt.Fprintf(w, "<%s>", n.Data)
-		}
-		attr := sortedAttributes(n.Attr)
-		sort.Sort(attr)
-		for _, a := range attr {
-			io.WriteString(w, "\n")
-			dumpIndent(w, level+1)
-			if a.Namespace != "" {
-				fmt.Fprintf(w, `%s %s="%s"`, a.Namespace, a.Key, a.Val)
-			} else {
-				fmt.Fprintf(w, `%s="%s"`, a.Key, a.Val)
-			}
-		}
-	case TextNode:
-		fmt.Fprintf(w, `"%s"`, n.Data)
-	case CommentNode:
-		fmt.Fprintf(w, "<!-- %s -->", n.Data)
-	case DoctypeNode:
-		fmt.Fprintf(w, "<!DOCTYPE %s", n.Data)
-		if n.Attr != nil {
-			var p, s string
-			for _, a := range n.Attr {
-				switch a.Key {
-				case "public":
-					p = a.Val
-				case "system":
-					s = a.Val
-				}
-			}
-			if p != "" || s != "" {
-				fmt.Fprintf(w, ` "%s"`, p)
-				fmt.Fprintf(w, ` "%s"`, s)
-			}
-		}
-		io.WriteString(w, ">")
-	case scopeMarkerNode:
-		return errors.New("unexpected scopeMarkerNode")
-	default:
-		return errors.New("unknown node type")
-	}
-	io.WriteString(w, "\n")
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		if err := dumpLevel(w, c, level+1); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func dump(n *Node) (string, error) {
-	if n == nil || n.FirstChild == nil {
-		return "", nil
-	}
-	var b bytes.Buffer
-	for c := n.FirstChild; c != nil; c = c.NextSibling {
-		if err := dumpLevel(&b, c, 0); err != nil {
-			return "", err
-		}
-	}
-	return b.String(), nil
-}
-
-const testDataDir = "testdata/webkit/"
-
-func TestParser(t *testing.T) {
-	testFiles, err := filepath.Glob(testDataDir + "*.dat")
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, tf := range testFiles {
-		f, err := os.Open(tf)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer f.Close()
-		r := bufio.NewReader(f)
-
-		for i := 0; ; i++ {
-			text, want, context, err := readParseTest(r)
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				t.Fatal(err)
-			}
-
-			err = testParseCase(text, want, context)
-
-			if err != nil {
-				t.Errorf("%s test #%d %q, %s", tf, i, text, err)
-			}
-		}
-	}
-}
-
-// testParseCase tests one test case from the test files. If the test does not
-// pass, it returns an error that explains the failure.
-// text is the HTML to be parsed, want is a dump of the correct parse tree,
-// and context is the name of the context node, if any.
-func testParseCase(text, want, context string) (err error) {
-	defer func() {
-		if x := recover(); x != nil {
-			switch e := x.(type) {
-			case error:
-				err = e
-			default:
-				err = fmt.Errorf("%v", e)
-			}
-		}
-	}()
-
-	var doc *Node
-	if context == "" {
-		doc, err = Parse(strings.NewReader(text))
-		if err != nil {
-			return err
-		}
-	} else {
-		contextNode := &Node{
-			Type:     ElementNode,
-			DataAtom: atom.Lookup([]byte(context)),
-			Data:     context,
-		}
-		nodes, err := ParseFragment(strings.NewReader(text), contextNode)
-		if err != nil {
-			return err
-		}
-		doc = &Node{
-			Type: DocumentNode,
-		}
-		for _, n := range nodes {
-			doc.AppendChild(n)
-		}
-	}
-
-	if err := checkTreeConsistency(doc); err != nil {
-		return err
-	}
-
-	got, err := dump(doc)
-	if err != nil {
-		return err
-	}
-	// Compare the parsed tree to the #document section.
-	if got != want {
-		return fmt.Errorf("got vs want:\n----\n%s----\n%s----", got, want)
-	}
-
-	if renderTestBlacklist[text] || context != "" {
-		return nil
-	}
-
-	// Check that rendering and re-parsing results in an identical tree.
-	pr, pw := io.Pipe()
-	go func() {
-		pw.CloseWithError(Render(pw, doc))
-	}()
-	doc1, err := Parse(pr)
-	if err != nil {
-		return err
-	}
-	got1, err := dump(doc1)
-	if err != nil {
-		return err
-	}
-	if got != got1 {
-		return fmt.Errorf("got vs got1:\n----\n%s----\n%s----", got, got1)
-	}
-
-	return nil
-}
-
-// Some test input result in parse trees are not 'well-formed' despite
-// following the HTML5 recovery algorithms. Rendering and re-parsing such a
-// tree will not result in an exact clone of that tree. We blacklist such
-// inputs from the render test.
-var renderTestBlacklist = map[string]bool{
-	// The second <a> will be reparented to the first <table>'s parent. This
-	// results in an <a> whose parent is an <a>, which is not 'well-formed'.
-	`<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y`: true,
-	// The same thing with a <p>:
-	`<p><table></p>`: true,
-	// More cases of <a> being reparented:
-	`<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe`: true,
-	`<a><table><a></table><p><a><div><a>`:                                     true,
-	`<a><table><td><a><table></table><a></tr><a></table><a>`:                  true,
-	// A similar reparenting situation involving <nobr>:
-	`<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3`: true,
-	// A <plaintext> element is reparented, putting it before a table.
-	// A <plaintext> element can't have anything after it in HTML.
-	`<table><plaintext><td>`:                                   true,
-	`<!doctype html><table><plaintext></plaintext>`:            true,
-	`<!doctype html><table><tbody><plaintext></plaintext>`:     true,
-	`<!doctype html><table><tbody><tr><plaintext></plaintext>`: true,
-	// A form inside a table inside a form doesn't work either.
-	`<!doctype html><form><table></form><form></table></form>`: true,
-	// A script that ends at EOF may escape its own closing tag when rendered.
-	`<!doctype html><script><!--<script `:          true,
-	`<!doctype html><script><!--<script <`:         true,
-	`<!doctype html><script><!--<script <a`:        true,
-	`<!doctype html><script><!--<script </`:        true,
-	`<!doctype html><script><!--<script </s`:       true,
-	`<!doctype html><script><!--<script </script`:  true,
-	`<!doctype html><script><!--<script </scripta`: true,
-	`<!doctype html><script><!--<script -`:         true,
-	`<!doctype html><script><!--<script -a`:        true,
-	`<!doctype html><script><!--<script -<`:        true,
-	`<!doctype html><script><!--<script --`:        true,
-	`<!doctype html><script><!--<script --a`:       true,
-	`<!doctype html><script><!--<script --<`:       true,
-	`<script><!--<script `:                         true,
-	`<script><!--<script <a`:                       true,
-	`<script><!--<script </script`:                 true,
-	`<script><!--<script </scripta`:                true,
-	`<script><!--<script -`:                        true,
-	`<script><!--<script -a`:                       true,
-	`<script><!--<script --`:                       true,
-	`<script><!--<script --a`:                      true,
-	`<script><!--<script <`:                        true,
-	`<script><!--<script </`:                       true,
-	`<script><!--<script </s`:                      true,
-	// Reconstructing the active formatting elements results in a <plaintext>
-	// element that contains an <a> element.
-	`<!doctype html><p><a><plaintext>b`: true,
-}
-
-func TestNodeConsistency(t *testing.T) {
-	// inconsistentNode is a Node whose DataAtom and Data do not agree.
-	inconsistentNode := &Node{
-		Type:     ElementNode,
-		DataAtom: atom.Frameset,
-		Data:     "table",
-	}
-	_, err := ParseFragment(strings.NewReader("<p>hello</p>"), inconsistentNode)
-	if err == nil {
-		t.Errorf("got nil error, want non-nil")
-	}
-}
-
-func BenchmarkParser(b *testing.B) {
-	buf, err := ioutil.ReadFile("testdata/go1.html")
-	if err != nil {
-		b.Fatalf("could not read testdata/go1.html: %v", err)
-	}
-	b.SetBytes(int64(len(buf)))
-	runtime.GC()
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		Parse(bytes.NewBuffer(buf))
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/render.go b/installer/vendor/golang.org/x/net/html/render.go
deleted file mode 100644
index d34564f49d..0000000000
--- a/installer/vendor/golang.org/x/net/html/render.go
+++ /dev/null
@@ -1,271 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bufio"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-)
-
-type writer interface {
-	io.Writer
-	io.ByteWriter
-	WriteString(string) (int, error)
-}
-
-// Render renders the parse tree n to the given writer.
-//
-// Rendering is done on a 'best effort' basis: calling Parse on the output of
-// Render will always result in something similar to the original tree, but it
-// is not necessarily an exact clone unless the original tree was 'well-formed'.
-// 'Well-formed' is not easily specified; the HTML5 specification is
-// complicated.
-//
-// Calling Parse on arbitrary input typically results in a 'well-formed' parse
-// tree. However, it is possible for Parse to yield a 'badly-formed' parse tree.
-// For example, in a 'well-formed' parse tree, no <a> element is a child of
-// another <a> element: parsing "<a><a>" results in two sibling elements.
-// Similarly, in a 'well-formed' parse tree, no <a> element is a child of a
-// <table> element: parsing "<p><table><a>" results in a <p> with two sibling
-// children; the <a> is reparented to the <table>'s parent. However, calling
-// Parse on "<a><table><a>" does not return an error, but the result has an <a>
-// element with an <a> child, and is therefore not 'well-formed'.
-//
-// Programmatically constructed trees are typically also 'well-formed', but it
-// is possible to construct a tree that looks innocuous but, when rendered and
-// re-parsed, results in a different tree. A simple example is that a solitary
-// text node would become a tree containing <html>, <head> and <body> elements.
-// Another example is that the programmatic equivalent of "a<head>b</head>c"
-// becomes "<html><head><head/><body>abc</body></html>".
-func Render(w io.Writer, n *Node) error {
-	if x, ok := w.(writer); ok {
-		return render(x, n)
-	}
-	buf := bufio.NewWriter(w)
-	if err := render(buf, n); err != nil {
-		return err
-	}
-	return buf.Flush()
-}
-
-// plaintextAbort is returned from render1 when a <plaintext> element
-// has been rendered. No more end tags should be rendered after that.
-var plaintextAbort = errors.New("html: internal error (plaintext abort)")
-
-func render(w writer, n *Node) error {
-	err := render1(w, n)
-	if err == plaintextAbort {
-		err = nil
-	}
-	return err
-}
-
-func render1(w writer, n *Node) error {
-	// Render non-element nodes; these are the easy cases.
-	switch n.Type {
-	case ErrorNode:
-		return errors.New("html: cannot render an ErrorNode node")
-	case TextNode:
-		return escape(w, n.Data)
-	case DocumentNode:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-		return nil
-	case ElementNode:
-		// No-op.
-	case CommentNode:
-		if _, err := w.WriteString("<!--"); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if _, err := w.WriteString("-->"); err != nil {
-			return err
-		}
-		return nil
-	case DoctypeNode:
-		if _, err := w.WriteString("<!DOCTYPE "); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(n.Data); err != nil {
-			return err
-		}
-		if n.Attr != nil {
-			var p, s string
-			for _, a := range n.Attr {
-				switch a.Key {
-				case "public":
-					p = a.Val
-				case "system":
-					s = a.Val
-				}
-			}
-			if p != "" {
-				if _, err := w.WriteString(" PUBLIC "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, p); err != nil {
-					return err
-				}
-				if s != "" {
-					if err := w.WriteByte(' '); err != nil {
-						return err
-					}
-					if err := writeQuoted(w, s); err != nil {
-						return err
-					}
-				}
-			} else if s != "" {
-				if _, err := w.WriteString(" SYSTEM "); err != nil {
-					return err
-				}
-				if err := writeQuoted(w, s); err != nil {
-					return err
-				}
-			}
-		}
-		return w.WriteByte('>')
-	default:
-		return errors.New("html: unknown node type")
-	}
-
-	// Render the <xxx> opening tag.
-	if err := w.WriteByte('<'); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	for _, a := range n.Attr {
-		if err := w.WriteByte(' '); err != nil {
-			return err
-		}
-		if a.Namespace != "" {
-			if _, err := w.WriteString(a.Namespace); err != nil {
-				return err
-			}
-			if err := w.WriteByte(':'); err != nil {
-				return err
-			}
-		}
-		if _, err := w.WriteString(a.Key); err != nil {
-			return err
-		}
-		if _, err := w.WriteString(`="`); err != nil {
-			return err
-		}
-		if err := escape(w, a.Val); err != nil {
-			return err
-		}
-		if err := w.WriteByte('"'); err != nil {
-			return err
-		}
-	}
-	if voidElements[n.Data] {
-		if n.FirstChild != nil {
-			return fmt.Errorf("html: void element <%s> has child nodes", n.Data)
-		}
-		_, err := w.WriteString("/>")
-		return err
-	}
-	if err := w.WriteByte('>'); err != nil {
-		return err
-	}
-
-	// Add initial newline where there is danger of a newline beging ignored.
-	if c := n.FirstChild; c != nil && c.Type == TextNode && strings.HasPrefix(c.Data, "\n") {
-		switch n.Data {
-		case "pre", "listing", "textarea":
-			if err := w.WriteByte('\n'); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render any child nodes.
-	switch n.Data {
-	case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "xmp":
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if c.Type == TextNode {
-				if _, err := w.WriteString(c.Data); err != nil {
-					return err
-				}
-			} else {
-				if err := render1(w, c); err != nil {
-					return err
-				}
-			}
-		}
-		if n.Data == "plaintext" {
-			// Don't render anything else. <plaintext> must be the
-			// last element in the file, with no closing tag.
-			return plaintextAbort
-		}
-	default:
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			if err := render1(w, c); err != nil {
-				return err
-			}
-		}
-	}
-
-	// Render the </xxx> closing tag.
-	if _, err := w.WriteString("</"); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(n.Data); err != nil {
-		return err
-	}
-	return w.WriteByte('>')
-}
-
-// writeQuoted writes s to w surrounded by quotes. Normally it will use double
-// quotes, but if s contains a double quote, it will use single quotes.
-// It is used for writing the identifiers in a doctype declaration.
-// In valid HTML, they can't contain both types of quotes.
-func writeQuoted(w writer, s string) error {
-	var q byte = '"'
-	if strings.Contains(s, `"`) {
-		q = '\''
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	if _, err := w.WriteString(s); err != nil {
-		return err
-	}
-	if err := w.WriteByte(q); err != nil {
-		return err
-	}
-	return nil
-}
-
-// Section 12.1.2, "Elements", gives this list of void elements. Void elements
-// are those that can't have any contents.
-var voidElements = map[string]bool{
-	"area":    true,
-	"base":    true,
-	"br":      true,
-	"col":     true,
-	"command": true,
-	"embed":   true,
-	"hr":      true,
-	"img":     true,
-	"input":   true,
-	"keygen":  true,
-	"link":    true,
-	"meta":    true,
-	"param":   true,
-	"source":  true,
-	"track":   true,
-	"wbr":     true,
-}
diff --git a/installer/vendor/golang.org/x/net/html/render_test.go b/installer/vendor/golang.org/x/net/html/render_test.go
deleted file mode 100644
index 11da54b313..0000000000
--- a/installer/vendor/golang.org/x/net/html/render_test.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"testing"
-)
-
-func TestRenderer(t *testing.T) {
-	nodes := [...]*Node{
-		0: {
-			Type: ElementNode,
-			Data: "html",
-		},
-		1: {
-			Type: ElementNode,
-			Data: "head",
-		},
-		2: {
-			Type: ElementNode,
-			Data: "body",
-		},
-		3: {
-			Type: TextNode,
-			Data: "0<1",
-		},
-		4: {
-			Type: ElementNode,
-			Data: "p",
-			Attr: []Attribute{
-				{
-					Key: "id",
-					Val: "A",
-				},
-				{
-					Key: "foo",
-					Val: `abc"def`,
-				},
-			},
-		},
-		5: {
-			Type: TextNode,
-			Data: "2",
-		},
-		6: {
-			Type: ElementNode,
-			Data: "b",
-			Attr: []Attribute{
-				{
-					Key: "empty",
-					Val: "",
-				},
-			},
-		},
-		7: {
-			Type: TextNode,
-			Data: "3",
-		},
-		8: {
-			Type: ElementNode,
-			Data: "i",
-			Attr: []Attribute{
-				{
-					Key: "backslash",
-					Val: `\`,
-				},
-			},
-		},
-		9: {
-			Type: TextNode,
-			Data: "&4",
-		},
-		10: {
-			Type: TextNode,
-			Data: "5",
-		},
-		11: {
-			Type: ElementNode,
-			Data: "blockquote",
-		},
-		12: {
-			Type: ElementNode,
-			Data: "br",
-		},
-		13: {
-			Type: TextNode,
-			Data: "6",
-		},
-	}
-
-	// Build a tree out of those nodes, based on a textual representation.
-	// Only the ".\t"s are significant. The trailing HTML-like text is
-	// just commentary. The "0:" prefixes are for easy cross-reference with
-	// the nodes array.
-	treeAsText := [...]string{
-		0: `<html>`,
-		1: `.	<head>`,
-		2: `.	<body>`,
-		3: `.	.	"0&lt;1"`,
-		4: `.	.	<p id="A" foo="abc&#34;def">`,
-		5: `.	.	.	"2"`,
-		6: `.	.	.	<b empty="">`,
-		7: `.	.	.	.	"3"`,
-		8: `.	.	.	<i backslash="\">`,
-		9: `.	.	.	.	"&amp;4"`,
-		10: `.	.	"5"`,
-		11: `.	.	<blockquote>`,
-		12: `.	.	<br>`,
-		13: `.	.	"6"`,
-	}
-	if len(nodes) != len(treeAsText) {
-		t.Fatal("len(nodes) != len(treeAsText)")
-	}
-	var stack [8]*Node
-	for i, line := range treeAsText {
-		level := 0
-		for line[0] == '.' {
-			// Strip a leading ".\t".
-			line = line[2:]
-			level++
-		}
-		n := nodes[i]
-		if level == 0 {
-			if stack[0] != nil {
-				t.Fatal("multiple root nodes")
-			}
-			stack[0] = n
-		} else {
-			stack[level-1].AppendChild(n)
-			stack[level] = n
-			for i := level + 1; i < len(stack); i++ {
-				stack[i] = nil
-			}
-		}
-		// At each stage of tree construction, we check all nodes for consistency.
-		for j, m := range nodes {
-			if err := checkNodeConsistency(m); err != nil {
-				t.Fatalf("i=%d, j=%d: %v", i, j, err)
-			}
-		}
-	}
-
-	want := `<html><head></head><body>0&lt;1<p id="A" foo="abc&#34;def">` +
-		`2<b empty="">3</b><i backslash="\">&amp;4</i></p>` +
-		`5<blockquote></blockquote><br/>6</body></html>`
-	b := new(bytes.Buffer)
-	if err := Render(b, nodes[0]); err != nil {
-		t.Fatal(err)
-	}
-	if got := b.String(); got != want {
-		t.Errorf("got vs want:\n%s\n%s\n", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/html/testdata/go1.html b/installer/vendor/golang.org/x/net/html/testdata/go1.html
deleted file mode 100644
index d238257c33..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/go1.html
+++ /dev/null
@@ -1,2237 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-
-  <title>Go 1 Release Notes - The Go Programming Language</title>
-
-<link type="text/css" rel="stylesheet" href="/doc/style.css">
-<script type="text/javascript" src="/doc/godocs.js"></script>
-
-<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
-
-<script type="text/javascript">
-var _gaq = _gaq || [];
-_gaq.push(["_setAccount", "UA-11222381-2"]);
-_gaq.push(["_trackPageview"]);
-</script>
-</head>
-<body>
-
-<div id="topbar"><div class="container wide">
-
-<form method="GET" action="/search">
-<div id="menu">
-<a href="/doc/">Documents</a>
-<a href="/ref/">References</a>
-<a href="/pkg/">Packages</a>
-<a href="/project/">The Project</a>
-<a href="/help/">Help</a>
-<input type="text" id="search" name="q" class="inactive" value="Search">
-</div>
-<div id="heading"><a href="/">The Go Programming Language</a></div>
-</form>
-
-</div></div>
-
-<div id="page" class="wide">
-
-
-  <div id="plusone"><g:plusone size="small" annotation="none"></g:plusone></div>
-  <h1>Go 1 Release Notes</h1>
-
-
-
-
-<div id="nav"></div>
-
-
-
-
-<h2 id="introduction">Introduction to Go 1</h2>
-
-<p>
-Go version 1, Go 1 for short, defines a language and a set of core libraries
-that provide a stable foundation for creating reliable products, projects, and
-publications.
-</p>
-
-<p>
-The driving motivation for Go 1 is stability for its users. People should be able to
-write Go programs and expect that they will continue to compile and run without
-change, on a time scale of years, including in production environments such as
-Google App Engine. Similarly, people should be able to write books about Go, be
-able to say which version of Go the book is describing, and have that version
-number still be meaningful much later.
-</p>
-
-<p>
-Code that compiles in Go 1 should, with few exceptions, continue to compile and
-run throughout the lifetime of that version, even as we issue updates and bug
-fixes such as Go version 1.1, 1.2, and so on. Other than critical fixes, changes
-made to the language and library for subsequent releases of Go 1 may
-add functionality but will not break existing Go 1 programs.
-<a href="go1compat.html">The Go 1 compatibility document</a>
-explains the compatibility guidelines in more detail.
-</p>
-
-<p>
-Go 1 is a representation of Go as it used today, not a wholesale rethinking of
-the language. We avoided designing new features and instead focused on cleaning
-up problems and inconsistencies and improving portability. There are a number
-changes to the Go language and packages that we had considered for some time and
-prototyped but not released primarily because they are significant and
-backwards-incompatible. Go 1 was an opportunity to get them out, which is
-helpful for the long term, but also means that Go 1 introduces incompatibilities
-for old programs. Fortunately, the <code>go</code> <code>fix</code> tool can
-automate much of the work needed to bring programs up to the Go 1 standard.
-</p>
-
-<p>
-This document outlines the major changes in Go 1 that will affect programmers
-updating existing code; its reference point is the prior release, r60 (tagged as
-r60.3). It also explains how to update code from r60 to run under Go 1.
-</p>
-
-<h2 id="language">Changes to the language</h2>
-
-<h3 id="append">Append</h3>
-
-<p>
-The <code>append</code> predeclared variadic function makes it easy to grow a slice
-by adding elements to the end.
-A common use is to add bytes to the end of a byte slice when generating output.
-However, <code>append</code> did not provide a way to append a string to a <code>[]byte</code>,
-which is another common case.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/greeting := ..byte/` `/append.*hello/`}}
--->    greeting := []byte{}
-    greeting = append(greeting, []byte(&#34;hello &#34;)...)</pre>
-
-<p>
-By analogy with the similar property of <code>copy</code>, Go 1
-permits a string to be appended (byte-wise) directly to a byte
-slice, reducing the friction between strings and byte slices.
-The conversion is no longer necessary:
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/append.*world/`}}
--->    greeting = append(greeting, &#34;world&#34;...)</pre>
-
-<p>
-<em>Updating</em>:
-This is a new feature, so existing code needs no changes.
-</p>
-
-<h3 id="close">Close</h3>
-
-<p>
-The <code>close</code> predeclared function provides a mechanism
-for a sender to signal that no more values will be sent.
-It is important to the implementation of <code>for</code> <code>range</code>
-loops over channels and is helpful in other situations.
-Partly by design and partly because of race conditions that can occur otherwise,
-it is intended for use only by the goroutine sending on the channel,
-not by the goroutine receiving data.
-However, before Go 1 there was no compile-time checking that <code>close</code>
-was being used correctly.
-</p>
-
-<p>
-To close this gap, at least in part, Go 1 disallows <code>close</code> on receive-only channels.
-Attempting to close such a channel is a compile-time error.
-</p>
-
-<pre>
-    var c chan int
-    var csend chan&lt;- int = c
-    var crecv &lt;-chan int = c
-    close(c)     // legal
-    close(csend) // legal
-    close(crecv) // illegal
-</pre>
-
-<p>
-<em>Updating</em>:
-Existing code that attempts to close a receive-only channel was
-erroneous even before Go 1 and should be fixed.  The compiler will
-now reject such code.
-</p>
-
-<h3 id="literals">Composite literals</h3>
-
-<p>
-In Go 1, a composite literal of array, slice, or map type can elide the
-type specification for the elements' initializers if they are of pointer type.
-All four of the initializations in this example are legal; the last one was illegal before Go 1.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/type Date struct/` `/STOP/`}}
--->    type Date struct {
-        month string
-        day   int
-    }
-    <span class="comment">// Struct values, fully qualified; always legal.</span>
-    holiday1 := []Date{
-        Date{&#34;Feb&#34;, 14},
-        Date{&#34;Nov&#34;, 11},
-        Date{&#34;Dec&#34;, 25},
-    }
-    <span class="comment">// Struct values, type name elided; always legal.</span>
-    holiday2 := []Date{
-        {&#34;Feb&#34;, 14},
-        {&#34;Nov&#34;, 11},
-        {&#34;Dec&#34;, 25},
-    }
-    <span class="comment">// Pointers, fully qualified, always legal.</span>
-    holiday3 := []*Date{
-        &amp;Date{&#34;Feb&#34;, 14},
-        &amp;Date{&#34;Nov&#34;, 11},
-        &amp;Date{&#34;Dec&#34;, 25},
-    }
-    <span class="comment">// Pointers, type name elided; legal in Go 1.</span>
-    holiday4 := []*Date{
-        {&#34;Feb&#34;, 14},
-        {&#34;Nov&#34;, 11},
-        {&#34;Dec&#34;, 25},
-    }</pre>
-
-<p>
-<em>Updating</em>:
-This change has no effect on existing code, but the command
-<code>gofmt</code> <code>-s</code> applied to existing source
-will, among other things, elide explicit element types wherever permitted.
-</p>
-
-
-<h3 id="init">Goroutines during init</h3>
-
-<p>
-The old language defined that <code>go</code> statements executed during initialization created goroutines but that they did not begin to run until initialization of the entire program was complete.
-This introduced clumsiness in many places and, in effect, limited the utility
-of the <code>init</code> construct:
-if it was possible for another package to use the library during initialization, the library
-was forced to avoid goroutines.
-This design was done for reasons of simplicity and safety but,
-as our confidence in the language grew, it seemed unnecessary.
-Running goroutines during initialization is no more complex or unsafe than running them during normal execution.
-</p>
-
-<p>
-In Go 1, code that uses goroutines can be called from
-<code>init</code> routines and global initialization expressions
-without introducing a deadlock.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/PackageGlobal/` `/^}/`}}
--->var PackageGlobal int
-
-func init() {
-    c := make(chan int)
-    go initializationFunction(c)
-    PackageGlobal = &lt;-c
-}</pre>
-
-<p>
-<em>Updating</em>:
-This is a new feature, so existing code needs no changes,
-although it's possible that code that depends on goroutines not starting before <code>main</code> will break.
-There was no such code in the standard repository.
-</p>
-
-<h3 id="rune">The rune type</h3>
-
-<p>
-The language spec allows the <code>int</code> type to be 32 or 64 bits wide, but current implementations set <code>int</code> to 32 bits even on 64-bit platforms.
-It would be preferable to have <code>int</code> be 64 bits on 64-bit platforms.
-(There are important consequences for indexing large slices.)
-However, this change would waste space when processing Unicode characters with
-the old language because the <code>int</code> type was also used to hold Unicode code points: each code point would waste an extra 32 bits of storage if <code>int</code> grew from 32 bits to 64.
-</p>
-
-<p>
-To make changing to 64-bit <code>int</code> feasible,
-Go 1 introduces a new basic type, <code>rune</code>, to represent
-individual Unicode code points.
-It is an alias for <code>int32</code>, analogous to <code>byte</code>
-as an alias for <code>uint8</code>.
-</p>
-
-<p>
-Character literals such as <code>'a'</code>, <code>'語'</code>, and <code>'\u0345'</code>
-now have default type <code>rune</code>,
-analogous to <code>1.0</code> having default type <code>float64</code>.
-A variable initialized to a character constant will therefore
-have type <code>rune</code> unless otherwise specified.
-</p>
-
-<p>
-Libraries have been updated to use <code>rune</code> rather than <code>int</code>
-when appropriate. For instance, the functions <code>unicode.ToLower</code> and
-relatives now take and return a <code>rune</code>.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/STARTRUNE/` `/ENDRUNE/`}}
--->    delta := &#39;δ&#39; <span class="comment">// delta has type rune.</span>
-    var DELTA rune
-    DELTA = unicode.ToUpper(delta)
-    epsilon := unicode.ToLower(DELTA + 1)
-    if epsilon != &#39;δ&#39;+1 {
-        log.Fatal(&#34;inconsistent casing for Greek&#34;)
-    }</pre>
-
-<p>
-<em>Updating</em>:
-Most source code will be unaffected by this because the type inference from
-<code>:=</code> initializers introduces the new type silently, and it propagates
-from there.
-Some code may get type errors that a trivial conversion will resolve.
-</p>
-
-<h3 id="error">The error type</h3>
-
-<p>
-Go 1 introduces a new built-in type, <code>error</code>, which has the following definition:
-</p>
-
-<pre>
-    type error interface {
-        Error() string
-    }
-</pre>
-
-<p>
-Since the consequences of this type are all in the package library,
-it is discussed <a href="#errors">below</a>.
-</p>
-
-<h3 id="delete">Deleting from maps</h3>
-
-<p>
-In the old language, to delete the entry with key <code>k</code> from map <code>m</code>, one wrote the statement,
-</p>
-
-<pre>
-    m[k] = value, false
-</pre>
-
-<p>
-This syntax was a peculiar special case, the only two-to-one assignment.
-It required passing a value (usually ignored) that is evaluated but discarded,
-plus a boolean that was nearly always the constant <code>false</code>.
-It did the job but was odd and a point of contention.
-</p>
-
-<p>
-In Go 1, that syntax has gone; instead there is a new built-in
-function, <code>delete</code>.  The call
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/delete\(m, k\)/`}}
--->    delete(m, k)</pre>
-
-<p>
-will delete the map entry retrieved by the expression <code>m[k]</code>.
-There is no return value. Deleting a non-existent entry is a no-op.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will convert expressions of the form <code>m[k] = value,
-false</code> into <code>delete(m, k)</code> when it is clear that
-the ignored value can be safely discarded from the program and
-<code>false</code> refers to the predefined boolean constant.
-The fix tool
-will flag other uses of the syntax for inspection by the programmer.
-</p>
-
-<h3 id="iteration">Iterating in maps</h3>
-
-<p>
-The old language specification did not define the order of iteration for maps,
-and in practice it differed across hardware platforms.
-This caused tests that iterated over maps to be fragile and non-portable, with the
-unpleasant property that a test might always pass on one machine but break on another.
-</p>
-
-<p>
-In Go 1, the order in which elements are visited when iterating
-over a map using a <code>for</code> <code>range</code> statement
-is defined to be unpredictable, even if the same loop is run multiple
-times with the same map.
-Code should not assume that the elements are visited in any particular order.
-</p>
-
-<p>
-This change means that code that depends on iteration order is very likely to break early and be fixed long before it becomes a problem.
-Just as important, it allows the map implementation to ensure better map balancing even when programs are using range loops to select an element from a map.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/Sunday/` `/^	}/`}}
--->    m := map[string]int{&#34;Sunday&#34;: 0, &#34;Monday&#34;: 1}
-    for name, value := range m {
-        <span class="comment">// This loop should not assume Sunday will be visited first.</span>
-        f(name, value)
-    }</pre>
-
-<p>
-<em>Updating</em>:
-This is one change where tools cannot help.  Most existing code
-will be unaffected, but some programs may break or misbehave; we
-recommend manual checking of all range statements over maps to
-verify they do not depend on iteration order. There were a few such
-examples in the standard repository; they have been fixed.
-Note that it was already incorrect to depend on the iteration order, which
-was unspecified. This change codifies the unpredictability.
-</p>
-
-<h3 id="multiple_assignment">Multiple assignment</h3>
-
-<p>
-The language specification has long guaranteed that in assignments
-the right-hand-side expressions are all evaluated before any left-hand-side expressions are assigned.
-To guarantee predictable behavior,
-Go 1 refines the specification further.
-</p>
-
-<p>
-If the left-hand side of the assignment
-statement contains expressions that require evaluation, such as
-function calls or array indexing operations, these will all be done
-using the usual left-to-right rule before any variables are assigned
-their value.  Once everything is evaluated, the actual assignments
-proceed in left-to-right order.
-</p>
-
-<p>
-These examples illustrate the behavior.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/sa :=/` `/then sc.0. = 2/`}}
--->    sa := []int{1, 2, 3}
-    i := 0
-    i, sa[i] = 1, 2 <span class="comment">// sets i = 1, sa[0] = 2</span>
-
-    sb := []int{1, 2, 3}
-    j := 0
-    sb[j], j = 2, 1 <span class="comment">// sets sb[0] = 2, j = 1</span>
-
-    sc := []int{1, 2, 3}
-    sc[0], sc[0] = 1, 2 <span class="comment">// sets sc[0] = 1, then sc[0] = 2 (so sc[0] = 2 at end)</span></pre>
-
-<p>
-<em>Updating</em>:
-This is one change where tools cannot help, but breakage is unlikely.
-No code in the standard repository was broken by this change, and code
-that depended on the previous unspecified behavior was already incorrect.
-</p>
-
-<h3 id="shadowing">Returns and shadowed variables</h3>
-
-<p>
-A common mistake is to use <code>return</code> (without arguments) after an assignment to a variable that has the same name as a result variable but is not the same variable.
-This situation is called <em>shadowing</em>: the result variable has been shadowed by another variable with the same name declared in an inner scope.
-</p>
-
-<p>
-In functions with named return values,
-the Go 1 compilers disallow return statements without arguments if any of the named return values is shadowed at the point of the return statement.
-(It isn't part of the specification, because this is one area we are still exploring;
-the situation is analogous to the compilers rejecting functions that do not end with an explicit return statement.)
-</p>
-
-<p>
-This function implicitly returns a shadowed return value and will be rejected by the compiler:
-</p>
-
-<pre>
-    func Bug() (i, j, k int) {
-        for i = 0; i &lt; 5; i++ {
-            for j := 0; j &lt; 5; j++ { // Redeclares j.
-                k += i*j
-                if k > 100 {
-                    return // Rejected: j is shadowed here.
-                }
-            }
-        }
-        return // OK: j is not shadowed here.
-    }
-</pre>
-
-<p>
-<em>Updating</em>:
-Code that shadows return values in this way will be rejected by the compiler and will need to be fixed by hand.
-The few cases that arose in the standard repository were mostly bugs.
-</p>
-
-<h3 id="unexported">Copying structs with unexported fields</h3>
-
-<p>
-The old language did not allow a package to make a copy of a struct value containing unexported fields belonging to a different package.
-There was, however, a required exception for a method receiver;
-also, the implementations of <code>copy</code> and <code>append</code> have never honored the restriction.
-</p>
-
-<p>
-Go 1 will allow packages to copy struct values containing unexported fields from other packages.
-Besides resolving the inconsistency,
-this change admits a new kind of API: a package can return an opaque value without resorting to a pointer or interface.
-The new implementations of <code>time.Time</code> and
-<code>reflect.Value</code> are examples of types taking advantage of this new property.
-</p>
-
-<p>
-As an example, if package <code>p</code> includes the definitions,
-</p>
-
-<pre>
-    type Struct struct {
-        Public int
-        secret int
-    }
-    func NewStruct(a int) Struct {  // Note: not a pointer.
-        return Struct{a, f(a)}
-    }
-    func (s Struct) String() string {
-        return fmt.Sprintf("{%d (secret %d)}", s.Public, s.secret)
-    }
-</pre>
-
-<p>
-a package that imports <code>p</code> can assign and copy values of type
-<code>p.Struct</code> at will.
-Behind the scenes the unexported fields will be assigned and copied just
-as if they were exported,
-but the client code will never be aware of them. The code
-</p>
-
-<pre>
-    import "p"
-
-    myStruct := p.NewStruct(23)
-    copyOfMyStruct := myStruct
-    fmt.Println(myStruct, copyOfMyStruct)
-</pre>
-
-<p>
-will show that the secret field of the struct has been copied to the new value.
-</p>
-
-<p>
-<em>Updating</em>:
-This is a new feature, so existing code needs no changes.
-</p>
-
-<h3 id="equality">Equality</h3>
-
-<p>
-Before Go 1, the language did not define equality on struct and array values.
-This meant,
-among other things, that structs and arrays could not be used as map keys.
-On the other hand, Go did define equality on function and map values.
-Function equality was problematic in the presence of closures
-(when are two closures equal?)
-while map equality compared pointers, not the maps' content, which was usually
-not what the user would want.
-</p>
-
-<p>
-Go 1 addressed these issues.
-First, structs and arrays can be compared for equality and inequality
-(<code>==</code> and <code>!=</code>),
-and therefore be used as map keys,
-provided they are composed from elements for which equality is also defined,
-using element-wise comparison.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/type Day struct/` `/Printf/`}}
--->    type Day struct {
-        long  string
-        short string
-    }
-    Christmas := Day{&#34;Christmas&#34;, &#34;XMas&#34;}
-    Thanksgiving := Day{&#34;Thanksgiving&#34;, &#34;Turkey&#34;}
-    holiday := map[Day]bool{
-        Christmas:    true,
-        Thanksgiving: true,
-    }
-    fmt.Printf(&#34;Christmas is a holiday: %t\n&#34;, holiday[Christmas])</pre>
-
-<p>
-Second, Go 1 removes the definition of equality for function values,
-except for comparison with <code>nil</code>.
-Finally, map equality is gone too, also except for comparison with <code>nil</code>.
-</p>
-
-<p>
-Note that equality is still undefined for slices, for which the
-calculation is in general infeasible.  Also note that the ordered
-comparison operators (<code>&lt;</code> <code>&lt;=</code>
-<code>&gt;</code> <code>&gt;=</code>) are still undefined for
-structs and arrays.
-
-<p>
-<em>Updating</em>:
-Struct and array equality is a new feature, so existing code needs no changes.
-Existing code that depends on function or map equality will be
-rejected by the compiler and will need to be fixed by hand.
-Few programs will be affected, but the fix may require some
-redesign.
-</p>
-
-<h2 id="packages">The package hierarchy</h2>
-
-<p>
-Go 1 addresses many deficiencies in the old standard library and
-cleans up a number of packages, making them more internally consistent
-and portable.
-</p>
-
-<p>
-This section describes how the packages have been rearranged in Go 1.
-Some have moved, some have been renamed, some have been deleted.
-New packages are described in later sections.
-</p>
-
-<h3 id="hierarchy">The package hierarchy</h3>
-
-<p>
-Go 1 has a rearranged package hierarchy that groups related items
-into subdirectories. For instance, <code>utf8</code> and
-<code>utf16</code> now occupy subdirectories of <code>unicode</code>.
-Also, <a href="#subrepo">some packages</a> have moved into
-subrepositories of
-<a href="http://code.google.com/p/go"><code>code.google.com/p/go</code></a>
-while <a href="#deleted">others</a> have been deleted outright.
-</p>
-
-<table class="codetable" frame="border" summary="Moved packages">
-<colgroup align="left" width="60%"></colgroup>
-<colgroup align="left" width="40%"></colgroup>
-<tr>
-<th align="left">Old path</th>
-<th align="left">New path</th>
-</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>asn1</td> <td>encoding/asn1</td></tr>
-<tr><td>csv</td> <td>encoding/csv</td></tr>
-<tr><td>gob</td> <td>encoding/gob</td></tr>
-<tr><td>json</td> <td>encoding/json</td></tr>
-<tr><td>xml</td> <td>encoding/xml</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>exp/template/html</td> <td>html/template</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>big</td> <td>math/big</td></tr>
-<tr><td>cmath</td> <td>math/cmplx</td></tr>
-<tr><td>rand</td> <td>math/rand</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>http</td> <td>net/http</td></tr>
-<tr><td>http/cgi</td> <td>net/http/cgi</td></tr>
-<tr><td>http/fcgi</td> <td>net/http/fcgi</td></tr>
-<tr><td>http/httptest</td> <td>net/http/httptest</td></tr>
-<tr><td>http/pprof</td> <td>net/http/pprof</td></tr>
-<tr><td>mail</td> <td>net/mail</td></tr>
-<tr><td>rpc</td> <td>net/rpc</td></tr>
-<tr><td>rpc/jsonrpc</td> <td>net/rpc/jsonrpc</td></tr>
-<tr><td>smtp</td> <td>net/smtp</td></tr>
-<tr><td>url</td> <td>net/url</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>exec</td> <td>os/exec</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>scanner</td> <td>text/scanner</td></tr>
-<tr><td>tabwriter</td> <td>text/tabwriter</td></tr>
-<tr><td>template</td> <td>text/template</td></tr>
-<tr><td>template/parse</td> <td>text/template/parse</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>utf8</td> <td>unicode/utf8</td></tr>
-<tr><td>utf16</td> <td>unicode/utf16</td></tr>
-</table>
-
-<p>
-Note that the package names for the old <code>cmath</code> and
-<code>exp/template/html</code> packages have changed to <code>cmplx</code>
-and <code>template</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update all imports and package renames for packages that
-remain inside the standard repository.  Programs that import packages
-that are no longer in the standard repository will need to be edited
-by hand.
-</p>
-
-<h3 id="exp">The package tree exp</h3>
-
-<p>
-Because they are not standardized, the packages under the <code>exp</code> directory will not be available in the
-standard Go 1 release distributions, although they will be available in source code form
-in <a href="http://code.google.com/p/go/">the repository</a> for
-developers who wish to use them.
-</p>
-
-<p>
-Several packages have moved under <code>exp</code> at the time of Go 1's release:
-</p>
-
-<ul>
-<li><code>ebnf</code></li>
-<li><code>html</code><sup>&#8224;</sup></li>
-<li><code>go/types</code></li>
-</ul>
-
-<p>
-(<sup>&#8224;</sup>The <code>EscapeString</code> and <code>UnescapeString</code> types remain
-in package <code>html</code>.)
-</p>
-
-<p>
-All these packages are available under the same names, with the prefix <code>exp/</code>: <code>exp/ebnf</code> etc.
-</p>
-
-<p>
-Also, the <code>utf8.String</code> type has been moved to its own package, <code>exp/utf8string</code>.
-</p>
-
-<p>
-Finally, the <code>gotype</code> command now resides in <code>exp/gotype</code>, while
-<code>ebnflint</code> is now in <code>exp/ebnflint</code>.
-If they are installed, they now reside in <code>$GOROOT/bin/tool</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses packages in <code>exp</code> will need to be updated by hand,
-or else compiled from an installation that has <code>exp</code> available.
-The <code>go</code> <code>fix</code> tool or the compiler will complain about such uses.
-</p>
-
-<h3 id="old">The package tree old</h3>
-
-<p>
-Because they are deprecated, the packages under the <code>old</code> directory will not be available in the
-standard Go 1 release distributions, although they will be available in source code form for
-developers who wish to use them.
-</p>
-
-<p>
-The packages in their new locations are:
-</p>
-
-<ul>
-<li><code>old/netchan</code></li>
-<li><code>old/regexp</code></li>
-<li><code>old/template</code></li>
-</ul>
-
-<p>
-<em>Updating</em>:
-Code that uses packages now in <code>old</code> will need to be updated by hand,
-or else compiled from an installation that has <code>old</code> available.
-The <code>go</code> <code>fix</code> tool will warn about such uses.
-</p>
-
-<h3 id="deleted">Deleted packages</h3>
-
-<p>
-Go 1 deletes several packages outright:
-</p>
-
-<ul>
-<li><code>container/vector</code></li>
-<li><code>exp/datafmt</code></li>
-<li><code>go/typechecker</code></li>
-<li><code>try</code></li>
-</ul>
-
-<p>
-and also the command <code>gotry</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses <code>container/vector</code> should be updated to use
-slices directly.  See
-<a href="http://code.google.com/p/go-wiki/wiki/SliceTricks">the Go
-Language Community Wiki</a> for some suggestions.
-Code that uses the other packages (there should be almost zero) will need to be rethought.
-</p>
-
-<h3 id="subrepo">Packages moving to subrepositories</h3>
-
-<p>
-Go 1 has moved a number of packages into other repositories, usually sub-repositories of
-<a href="http://code.google.com/p/go/">the main Go repository</a>.
-This table lists the old and new import paths:
-
-<table class="codetable" frame="border" summary="Sub-repositories">
-<colgroup align="left" width="40%"></colgroup>
-<colgroup align="left" width="60%"></colgroup>
-<tr>
-<th align="left">Old</th>
-<th align="left">New</th>
-</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>crypto/bcrypt</td> <td>code.google.com/p/go.crypto/bcrypt</tr>
-<tr><td>crypto/blowfish</td> <td>code.google.com/p/go.crypto/blowfish</tr>
-<tr><td>crypto/cast5</td> <td>code.google.com/p/go.crypto/cast5</tr>
-<tr><td>crypto/md4</td> <td>code.google.com/p/go.crypto/md4</tr>
-<tr><td>crypto/ocsp</td> <td>code.google.com/p/go.crypto/ocsp</tr>
-<tr><td>crypto/openpgp</td> <td>code.google.com/p/go.crypto/openpgp</tr>
-<tr><td>crypto/openpgp/armor</td> <td>code.google.com/p/go.crypto/openpgp/armor</tr>
-<tr><td>crypto/openpgp/elgamal</td> <td>code.google.com/p/go.crypto/openpgp/elgamal</tr>
-<tr><td>crypto/openpgp/errors</td> <td>code.google.com/p/go.crypto/openpgp/errors</tr>
-<tr><td>crypto/openpgp/packet</td> <td>code.google.com/p/go.crypto/openpgp/packet</tr>
-<tr><td>crypto/openpgp/s2k</td> <td>code.google.com/p/go.crypto/openpgp/s2k</tr>
-<tr><td>crypto/ripemd160</td> <td>code.google.com/p/go.crypto/ripemd160</tr>
-<tr><td>crypto/twofish</td> <td>code.google.com/p/go.crypto/twofish</tr>
-<tr><td>crypto/xtea</td> <td>code.google.com/p/go.crypto/xtea</tr>
-<tr><td>exp/ssh</td> <td>code.google.com/p/go.crypto/ssh</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>image/bmp</td> <td>code.google.com/p/go.image/bmp</tr>
-<tr><td>image/tiff</td> <td>code.google.com/p/go.image/tiff</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>net/dict</td> <td>code.google.com/p/go.net/dict</tr>
-<tr><td>net/websocket</td> <td>code.google.com/p/go.net/websocket</tr>
-<tr><td>exp/spdy</td> <td>code.google.com/p/go.net/spdy</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>encoding/git85</td> <td>code.google.com/p/go.codereview/git85</tr>
-<tr><td>patch</td> <td>code.google.com/p/go.codereview/patch</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>exp/wingui</td> <td>code.google.com/p/gowingui</tr>
-</table>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update imports of these packages to use the new import paths.
-Installations that depend on these packages will need to install them using
-a <code>go get</code> command.
-</p>
-
-<h2 id="major">Major changes to the library</h2>
-
-<p>
-This section describes significant changes to the core libraries, the ones that
-affect the most programs.
-</p>
-
-<h3 id="errors">The error type and errors package</h3>
-
-<p>
-The placement of <code>os.Error</code> in package <code>os</code> is mostly historical: errors first came up when implementing package <code>os</code>, and they seemed system-related at the time.
-Since then it has become clear that errors are more fundamental than the operating system.  For example, it would be nice to use <code>Errors</code> in packages that <code>os</code> depends on, like <code>syscall</code>.
-Also, having <code>Error</code> in <code>os</code> introduces many dependencies on <code>os</code> that would otherwise not exist.
-</p>
-
-<p>
-Go 1 solves these problems by introducing a built-in <code>error</code> interface type and a separate <code>errors</code> package (analogous to <code>bytes</code> and <code>strings</code>) that contains utility functions.
-It replaces <code>os.NewError</code> with
-<a href="/pkg/errors/#New"><code>errors.New</code></a>,
-giving errors a more central place in the environment.
-</p>
-
-<p>
-So the widely-used <code>String</code> method does not cause accidental satisfaction
-of the <code>error</code> interface, the <code>error</code> interface uses instead
-the name <code>Error</code> for that method:
-</p>
-
-<pre>
-    type error interface {
-        Error() string
-    }
-</pre>
-
-<p>
-The <code>fmt</code> library automatically invokes <code>Error</code>, as it already
-does for <code>String</code>, for easy printing of error values.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/START ERROR EXAMPLE/` `/END ERROR EXAMPLE/`}}
--->type SyntaxError struct {
-    File    string
-    Line    int
-    Message string
-}
-
-func (se *SyntaxError) Error() string {
-    return fmt.Sprintf(&#34;%s:%d: %s&#34;, se.File, se.Line, se.Message)
-}</pre>
-
-<p>
-All standard packages have been updated to use the new interface; the old <code>os.Error</code> is gone.
-</p>
-
-<p>
-A new package, <a href="/pkg/errors/"><code>errors</code></a>, contains the function
-</p>
-
-<pre>
-func New(text string) error
-</pre>
-
-<p>
-to turn a string into an error. It replaces the old <code>os.NewError</code>.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/ErrSyntax/`}}
--->    var ErrSyntax = errors.New(&#34;syntax error&#34;)</pre>
-		
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
-Code that defines error types with a <code>String</code> method will need to be updated
-by hand to rename the methods to <code>Error</code>.
-</p>
-
-<h3 id="errno">System call errors</h3>
-
-<p>
-The old <code>syscall</code> package, which predated <code>os.Error</code>
-(and just about everything else),
-returned errors as <code>int</code> values.
-In turn, the <code>os</code> package forwarded many of these errors, such
-as <code>EINVAL</code>, but using a different set of errors on each platform.
-This behavior was unpleasant and unportable.
-</p>
-
-<p>
-In Go 1, the
-<a href="/pkg/syscall/"><code>syscall</code></a>
-package instead returns an <code>error</code> for system call errors.
-On Unix, the implementation is done by a
-<a href="/pkg/syscall/#Errno"><code>syscall.Errno</code></a> type
-that satisfies <code>error</code> and replaces the old <code>os.Errno</code>.
-</p>
-
-<p>
-The changes affecting <code>os.EINVAL</code> and relatives are
-described <a href="#os">elsewhere</a>.
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
-Regardless, most code should use the <code>os</code> package
-rather than <code>syscall</code> and so will be unaffected.
-</p>
-
-<h3 id="time">Time</h3>
-
-<p>
-Time is always a challenge to support well in a programming language.
-The old Go <code>time</code> package had <code>int64</code> units, no
-real type safety,
-and no distinction between absolute times and durations.
-</p>
-
-<p>
-One of the most sweeping changes in the Go 1 library is therefore a
-complete redesign of the
-<a href="/pkg/time/"><code>time</code></a> package.
-Instead of an integer number of nanoseconds as an <code>int64</code>,
-and a separate <code>*time.Time</code> type to deal with human
-units such as hours and years,
-there are now two fundamental types:
-<a href="/pkg/time/#Time"><code>time.Time</code></a>
-(a value, so the <code>*</code> is gone), which represents a moment in time;
-and <a href="/pkg/time/#Duration"><code>time.Duration</code></a>,
-which represents an interval.
-Both have nanosecond resolution.
-A <code>Time</code> can represent any time into the ancient
-past and remote future, while a <code>Duration</code> can
-span plus or minus only about 290 years.
-There are methods on these types, plus a number of helpful
-predefined constant durations such as <code>time.Second</code>.
-</p>
-
-<p>
-Among the new methods are things like
-<a href="/pkg/time/#Time.Add"><code>Time.Add</code></a>,
-which adds a <code>Duration</code> to a <code>Time</code>, and
-<a href="/pkg/time/#Time.Sub"><code>Time.Sub</code></a>,
-which subtracts two <code>Times</code> to yield a <code>Duration</code>.
-</p>
-
-<p>
-The most important semantic change is that the Unix epoch (Jan 1, 1970) is now
-relevant only for those functions and methods that mention Unix:
-<a href="/pkg/time/#Unix"><code>time.Unix</code></a>
-and the <a href="/pkg/time/#Time.Unix"><code>Unix</code></a>
-and <a href="/pkg/time/#Time.UnixNano"><code>UnixNano</code></a> methods
-of the <code>Time</code> type.
-In particular,
-<a href="/pkg/time/#Now"><code>time.Now</code></a>
-returns a <code>time.Time</code> value rather than, in the old
-API, an integer nanosecond count since the Unix epoch.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/sleepUntil/` `/^}/`}}
---><span class="comment">// sleepUntil sleeps until the specified time. It returns immediately if it&#39;s too late.</span>
-func sleepUntil(wakeup time.Time) {
-    now := time.Now() <span class="comment">// A Time.</span>
-    if !wakeup.After(now) {
-        return
-    }
-    delta := wakeup.Sub(now) <span class="comment">// A Duration.</span>
-    fmt.Printf(&#34;Sleeping for %.3fs\n&#34;, delta.Seconds())
-    time.Sleep(delta)
-}</pre>
-
-<p>
-The new types, methods, and constants have been propagated through
-all the standard packages that use time, such as <code>os</code> and
-its representation of file time stamps.
-</p>
-
-<p>
-<em>Updating</em>:
-The <code>go</code> <code>fix</code> tool will update many uses of the old <code>time</code> package to use the new
-types and methods, although it does not replace values such as <code>1e9</code>
-representing nanoseconds per second.
-Also, because of type changes in some of the values that arise,
-some of the expressions rewritten by the fix tool may require
-further hand editing; in such cases the rewrite will include
-the correct function or method for the old functionality, but
-may have the wrong type or require further analysis.
-</p>
-
-<h2 id="minor">Minor changes to the library</h2>
-
-<p>
-This section describes smaller changes, such as those to less commonly
-used packages or that affect
-few programs beyond the need to run <code>go</code> <code>fix</code>.
-This category includes packages that are new in Go 1.
-Collectively they improve portability, regularize behavior, and
-make the interfaces more modern and Go-like.
-</p>
-
-<h3 id="archive_zip">The archive/zip package</h3>
-
-<p>
-In Go 1, <a href="/pkg/archive/zip/#Writer"><code>*zip.Writer</code></a> no
-longer has a <code>Write</code> method. Its presence was a mistake.
-</p>
-
-<p>
-<em>Updating</em>:
-What little code is affected will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="bufio">The bufio package</h3>
-
-<p>
-In Go 1, <a href="/pkg/bufio/#NewReaderSize"><code>bufio.NewReaderSize</code></a>
-and
-<a href="/pkg/bufio/#NewWriterSize"><code>bufio.NewWriterSize</code></a>
-functions no longer return an error for invalid sizes.
-If the argument size is too small or invalid, it is adjusted.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update calls that assign the error to _.
-Calls that aren't fixed will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="compress">The compress/flate, compress/gzip and compress/zlib packages</h3>
-
-<p>
-In Go 1, the <code>NewWriterXxx</code> functions in
-<a href="/pkg/compress/flate"><code>compress/flate</code></a>,
-<a href="/pkg/compress/gzip"><code>compress/gzip</code></a> and
-<a href="/pkg/compress/zlib"><code>compress/zlib</code></a>
-all return <code>(*Writer, error)</code> if they take a compression level,
-and <code>*Writer</code> otherwise. Package <code>gzip</code>'s
-<code>Compressor</code> and <code>Decompressor</code> types have been renamed
-to <code>Writer</code> and <code>Reader</code>. Package <code>flate</code>'s
-<code>WrongValueError</code> type has been removed.
-</p>
-
-<p>
-<em>Updating</em>
-Running <code>go</code> <code>fix</code> will update old names and calls that assign the error to _.
-Calls that aren't fixed will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="crypto_aes_des">The crypto/aes and crypto/des packages</h3>
-
-<p>
-In Go 1, the <code>Reset</code> method has been removed. Go does not guarantee
-that memory is not copied and therefore this method was misleading.
-</p>
-
-<p>
-The cipher-specific types <code>*aes.Cipher</code>, <code>*des.Cipher</code>,
-and <code>*des.TripleDESCipher</code> have been removed in favor of
-<code>cipher.Block</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Remove the calls to Reset. Replace uses of the specific cipher types with
-cipher.Block.
-</p>
-
-<h3 id="crypto_elliptic">The crypto/elliptic package</h3>
-
-<p>
-In Go 1, <a href="/pkg/crypto/elliptic/#Curve"><code>elliptic.Curve</code></a>
-has been made an interface to permit alternative implementations. The curve
-parameters have been moved to the
-<a href="/pkg/crypto/elliptic/#CurveParams"><code>elliptic.CurveParams</code></a>
-structure.
-</p>
-
-<p>
-<em>Updating</em>:
-Existing users of <code>*elliptic.Curve</code> will need to change to
-simply <code>elliptic.Curve</code>. Calls to <code>Marshal</code>,
-<code>Unmarshal</code> and <code>GenerateKey</code> are now functions
-in <code>crypto/elliptic</code> that take an <code>elliptic.Curve</code>
-as their first argument.
-</p>
-
-<h3 id="crypto_hmac">The crypto/hmac package</h3>
-
-<p>
-In Go 1, the hash-specific functions, such as <code>hmac.NewMD5</code>, have
-been removed from <code>crypto/hmac</code>. Instead, <code>hmac.New</code> takes
-a function that returns a <code>hash.Hash</code>, such as <code>md5.New</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will perform the needed changes.
-</p>
-
-<h3 id="crypto_x509">The crypto/x509 package</h3>
-
-<p>
-In Go 1, the
-<a href="/pkg/crypto/x509/#CreateCertificate"><code>CreateCertificate</code></a>
-and
-<a href="/pkg/crypto/x509/#CreateCRL"><code>CreateCRL</code></a>
-functions in <code>crypto/x509</code> have been altered to take an
-<code>interface{}</code> where they previously took a <code>*rsa.PublicKey</code>
-or <code>*rsa.PrivateKey</code>. This will allow other public key algorithms
-to be implemented in the future.
-</p>
-
-<p>
-<em>Updating</em>:
-No changes will be needed.
-</p>
-
-<h3 id="encoding_binary">The encoding/binary package</h3>
-
-<p>
-In Go 1, the <code>binary.TotalSize</code> function has been replaced by
-<a href="/pkg/encoding/binary/#Size"><code>Size</code></a>,
-which takes an <code>interface{}</code> argument rather than
-a <code>reflect.Value</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-What little code is affected will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="encoding_xml">The encoding/xml package</h3>
-
-<p>
-In Go 1, the <a href="/pkg/encoding/xml/"><code>xml</code></a> package
-has been brought closer in design to the other marshaling packages such
-as <a href="/pkg/encoding/gob/"><code>encoding/gob</code></a>.
-</p>
-
-<p>
-The old <code>Parser</code> type is renamed
-<a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> and has a new
-<a href="/pkg/encoding/xml/#Decoder.Decode"><code>Decode</code></a> method. An
-<a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a> type was also introduced.
-</p>
-
-<p>
-The functions <a href="/pkg/encoding/xml/#Marshal"><code>Marshal</code></a>
-and <a href="/pkg/encoding/xml/#Unmarshal"><code>Unmarshal</code></a>
-work with <code>[]byte</code> values now. To work with streams,
-use the new <a href="/pkg/encoding/xml/#Encoder"><code>Encoder</code></a>
-and <a href="/pkg/encoding/xml/#Decoder"><code>Decoder</code></a> types.
-</p>
-
-<p>
-When marshaling or unmarshaling values, the format of supported flags in
-field tags has changed to be closer to the
-<a href="/pkg/encoding/json"><code>json</code></a> package
-(<code>`xml:"name,flag"`</code>). The matching done between field tags, field
-names, and the XML attribute and element names is now case-sensitive.
-The <code>XMLName</code> field tag, if present, must also match the name
-of the XML element being marshaled.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update most uses of the package except for some calls to
-<code>Unmarshal</code>. Special care must be taken with field tags,
-since the fix tool will not update them and if not fixed by hand they will
-misbehave silently in some cases. For example, the old
-<code>"attr"</code> is now written <code>",attr"</code> while plain
-<code>"attr"</code> remains valid but with a different meaning.
-</p>
-
-<h3 id="expvar">The expvar package</h3>
-
-<p>
-In Go 1, the <code>RemoveAll</code> function has been removed.
-The <code>Iter</code> function and Iter method on <code>*Map</code> have
-been replaced by
-<a href="/pkg/expvar/#Do"><code>Do</code></a>
-and
-<a href="/pkg/expvar/#Map.Do"><code>(*Map).Do</code></a>.
-</p>
-
-<p>
-<em>Updating</em>:
-Most code using <code>expvar</code> will not need changing. The rare code that used
-<code>Iter</code> can be updated to pass a closure to <code>Do</code> to achieve the same effect.
-</p>
-
-<h3 id="flag">The flag package</h3>
-
-<p>
-In Go 1, the interface <a href="/pkg/flag/#Value"><code>flag.Value</code></a> has changed slightly.
-The <code>Set</code> method now returns an <code>error</code> instead of
-a <code>bool</code> to indicate success or failure.
-</p>
-
-<p>
-There is also a new kind of flag, <code>Duration</code>, to support argument
-values specifying time intervals.
-Values for such flags must be given units, just as <code>time.Duration</code>
-formats them: <code>10s</code>, <code>1h30m</code>, etc.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/timeout/`}}
--->var timeout = flag.Duration(&#34;timeout&#34;, 30*time.Second, &#34;how long to wait for completion&#34;)</pre>
-
-<p>
-<em>Updating</em>:
-Programs that implement their own flags will need minor manual fixes to update their
-<code>Set</code> methods.
-The <code>Duration</code> flag is new and affects no existing code.
-</p>
-
-
-<h3 id="go">The go/* packages</h3>
-
-<p>
-Several packages under <code>go</code> have slightly revised APIs.
-</p>
-
-<p>
-A concrete <code>Mode</code> type was introduced for configuration mode flags
-in the packages
-<a href="/pkg/go/scanner/"><code>go/scanner</code></a>,
-<a href="/pkg/go/parser/"><code>go/parser</code></a>,
-<a href="/pkg/go/printer/"><code>go/printer</code></a>, and
-<a href="/pkg/go/doc/"><code>go/doc</code></a>.
-</p>
-
-<p>
-The modes <code>AllowIllegalChars</code> and <code>InsertSemis</code> have been removed
-from the <a href="/pkg/go/scanner/"><code>go/scanner</code></a> package. They were mostly
-useful for scanning text other then Go source files. Instead, the
-<a href="/pkg/text/scanner/"><code>text/scanner</code></a> package should be used
-for that purpose.
-</p>
-
-<p>
-The <a href="/pkg/go/scanner/#ErrorHandler"><code>ErrorHandler</code></a> provided
-to the scanner's <a href="/pkg/go/scanner/#Scanner.Init"><code>Init</code></a> method is
-now simply a function rather than an interface. The <code>ErrorVector</code> type has
-been removed in favor of the (existing) <a href="/pkg/go/scanner/#ErrorList"><code>ErrorList</code></a>
-type, and the <code>ErrorVector</code> methods have been migrated. Instead of embedding
-an <code>ErrorVector</code> in a client of the scanner, now a client should maintain
-an <code>ErrorList</code>.
-</p>
-
-<p>
-The set of parse functions provided by the <a href="/pkg/go/parser/"><code>go/parser</code></a>
-package has been reduced to the primary parse function
-<a href="/pkg/go/parser/#ParseFile"><code>ParseFile</code></a>, and a couple of
-convenience functions <a href="/pkg/go/parser/#ParseDir"><code>ParseDir</code></a>
-and <a href="/pkg/go/parser/#ParseExpr"><code>ParseExpr</code></a>.
-</p>
-
-<p>
-The <a href="/pkg/go/printer/"><code>go/printer</code></a> package supports an additional
-configuration mode <a href="/pkg/go/printer/#Mode"><code>SourcePos</code></a>;
-if set, the printer will emit <code>//line</code> comments such that the generated
-output contains the original source code position information. The new type
-<a href="/pkg/go/printer/#CommentedNode"><code>CommentedNode</code></a> can be
-used to provide comments associated with an arbitrary
-<a href="/pkg/go/ast/#Node"><code>ast.Node</code></a> (until now only
-<a href="/pkg/go/ast/#File"><code>ast.File</code></a> carried comment information).
-</p>
-
-<p>
-The type names of the <a href="/pkg/go/doc/"><code>go/doc</code></a> package have been
-streamlined by removing the <code>Doc</code> suffix: <code>PackageDoc</code>
-is now <code>Package</code>, <code>ValueDoc</code> is <code>Value</code>, etc.
-Also, all types now consistently have a <code>Name</code> field (or <code>Names</code>,
-in the case of type <code>Value</code>) and <code>Type.Factories</code> has become
-<code>Type.Funcs</code>.
-Instead of calling <code>doc.NewPackageDoc(pkg, importpath)</code>,
-documentation for a package is created with:
-</p>
-
-<pre>
-    doc.New(pkg, importpath, mode)
-</pre>
-
-<p>
-where the new <code>mode</code> parameter specifies the operation mode:
-if set to <a href="/pkg/go/doc/#AllDecls"><code>AllDecls</code></a>, all declarations
-(not just exported ones) are considered.
-The function <code>NewFileDoc</code> was removed, and the function
-<code>CommentText</code> has become the method
-<a href="/pkg/go/ast/#Text"><code>Text</code></a> of
-<a href="/pkg/go/ast/#CommentGroup"><code>ast.CommentGroup</code></a>.
-</p>
-
-<p>
-In package <a href="/pkg/go/token/"><code>go/token</code></a>, the
-<a href="/pkg/go/token/#FileSet"><code>token.FileSet</code></a> method <code>Files</code>
-(which originally returned a channel of <code>*token.File</code>s) has been replaced
-with the iterator <a href="/pkg/go/token/#FileSet.Iterate"><code>Iterate</code></a> that
-accepts a function argument instead.
-</p>
-
-<p>
-In package <a href="/pkg/go/build/"><code>go/build</code></a>, the API
-has been nearly completely replaced.
-The package still computes Go package information
-but it does not run the build: the <code>Cmd</code> and <code>Script</code>
-types are gone.
-(To build code, use the new
-<a href="/cmd/go/"><code>go</code></a> command instead.)
-The <code>DirInfo</code> type is now named
-<a href="/pkg/go/build/#Package"><code>Package</code></a>.
-<code>FindTree</code> and <code>ScanDir</code> are replaced by
-<a href="/pkg/go/build/#Import"><code>Import</code></a>
-and
-<a href="/pkg/go/build/#ImportDir"><code>ImportDir</code></a>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses packages in <code>go</code> will have to be updated by hand; the
-compiler will reject incorrect uses. Templates used in conjunction with any of the
-<code>go/doc</code> types may need manual fixes; the renamed fields will lead
-to run-time errors.
-</p>
-
-<h3 id="hash">The hash package</h3>
-
-<p>
-In Go 1, the definition of <a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> includes
-a new method, <code>BlockSize</code>.  This new method is used primarily in the
-cryptographic libraries.
-</p>
-
-<p>
-The <code>Sum</code> method of the
-<a href="/pkg/hash/#Hash"><code>hash.Hash</code></a> interface now takes a
-<code>[]byte</code> argument, to which the hash value will be appended.
-The previous behavior can be recreated by adding a <code>nil</code> argument to the call.
-</p>
-
-<p>
-<em>Updating</em>:
-Existing implementations of <code>hash.Hash</code> will need to add a
-<code>BlockSize</code> method.  Hashes that process the input one byte at
-a time can implement <code>BlockSize</code> to return 1.
-Running <code>go</code> <code>fix</code> will update calls to the <code>Sum</code> methods of the various
-implementations of <code>hash.Hash</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Since the package's functionality is new, no updating is necessary.
-</p>
-
-<h3 id="http">The http package</h3>
-
-<p>
-In Go 1 the <a href="/pkg/net/http/"><code>http</code></a> package is refactored,
-putting some of the utilities into a
-<a href="/pkg/net/http/httputil/"><code>httputil</code></a> subdirectory.
-These pieces are only rarely needed by HTTP clients.
-The affected items are:
-</p>
-
-<ul>
-<li>ClientConn</li>
-<li>DumpRequest</li>
-<li>DumpRequestOut</li>
-<li>DumpResponse</li>
-<li>NewChunkedReader</li>
-<li>NewChunkedWriter</li>
-<li>NewClientConn</li>
-<li>NewProxyClientConn</li>
-<li>NewServerConn</li>
-<li>NewSingleHostReverseProxy</li>
-<li>ReverseProxy</li>
-<li>ServerConn</li>
-</ul>
-
-<p>
-The <code>Request.RawURL</code> field has been removed; it was a
-historical artifact.
-</p>
-
-<p>
-The <code>Handle</code> and <code>HandleFunc</code>
-functions, and the similarly-named methods of <code>ServeMux</code>,
-now panic if an attempt is made to register the same pattern twice.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update the few programs that are affected except for
-uses of <code>RawURL</code>, which must be fixed by hand.
-</p>
-
-<h3 id="image">The image package</h3>
-
-<p>
-The <a href="/pkg/image/"><code>image</code></a> package has had a number of
-minor changes, rearrangements and renamings.
-</p>
-
-<p>
-Most of the color handling code has been moved into its own package,
-<a href="/pkg/image/color/"><code>image/color</code></a>.
-For the elements that moved, a symmetry arises; for instance,
-each pixel of an
-<a href="/pkg/image/#RGBA"><code>image.RGBA</code></a>
-is a
-<a href="/pkg/image/color/#RGBA"><code>color.RGBA</code></a>.
-</p>
-
-<p>
-The old <code>image/ycbcr</code> package has been folded, with some
-renamings, into the
-<a href="/pkg/image/"><code>image</code></a>
-and
-<a href="/pkg/image/color/"><code>image/color</code></a>
-packages.
-</p>
-
-<p>
-The old <code>image.ColorImage</code> type is still in the <code>image</code>
-package but has been renamed
-<a href="/pkg/image/#Uniform"><code>image.Uniform</code></a>,
-while <code>image.Tiled</code> has been removed.
-</p>
-
-<p>
-This table lists the renamings.
-</p>
-
-<table class="codetable" frame="border" summary="image renames">
-<colgroup align="left" width="50%"></colgroup>
-<colgroup align="left" width="50%"></colgroup>
-<tr>
-<th align="left">Old</th>
-<th align="left">New</th>
-</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>image.Color</td> <td>color.Color</td></tr>
-<tr><td>image.ColorModel</td> <td>color.Model</td></tr>
-<tr><td>image.ColorModelFunc</td> <td>color.ModelFunc</td></tr>
-<tr><td>image.PalettedColorModel</td> <td>color.Palette</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>image.RGBAColor</td> <td>color.RGBA</td></tr>
-<tr><td>image.RGBA64Color</td> <td>color.RGBA64</td></tr>
-<tr><td>image.NRGBAColor</td> <td>color.NRGBA</td></tr>
-<tr><td>image.NRGBA64Color</td> <td>color.NRGBA64</td></tr>
-<tr><td>image.AlphaColor</td> <td>color.Alpha</td></tr>
-<tr><td>image.Alpha16Color</td> <td>color.Alpha16</td></tr>
-<tr><td>image.GrayColor</td> <td>color.Gray</td></tr>
-<tr><td>image.Gray16Color</td> <td>color.Gray16</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>image.RGBAColorModel</td> <td>color.RGBAModel</td></tr>
-<tr><td>image.RGBA64ColorModel</td> <td>color.RGBA64Model</td></tr>
-<tr><td>image.NRGBAColorModel</td> <td>color.NRGBAModel</td></tr>
-<tr><td>image.NRGBA64ColorModel</td> <td>color.NRGBA64Model</td></tr>
-<tr><td>image.AlphaColorModel</td> <td>color.AlphaModel</td></tr>
-<tr><td>image.Alpha16ColorModel</td> <td>color.Alpha16Model</td></tr>
-<tr><td>image.GrayColorModel</td> <td>color.GrayModel</td></tr>
-<tr><td>image.Gray16ColorModel</td> <td>color.Gray16Model</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>ycbcr.RGBToYCbCr</td> <td>color.RGBToYCbCr</td></tr>
-<tr><td>ycbcr.YCbCrToRGB</td> <td>color.YCbCrToRGB</td></tr>
-<tr><td>ycbcr.YCbCrColorModel</td> <td>color.YCbCrModel</td></tr>
-<tr><td>ycbcr.YCbCrColor</td> <td>color.YCbCr</td></tr>
-<tr><td>ycbcr.YCbCr</td> <td>image.YCbCr</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>ycbcr.SubsampleRatio444</td> <td>image.YCbCrSubsampleRatio444</td></tr>
-<tr><td>ycbcr.SubsampleRatio422</td> <td>image.YCbCrSubsampleRatio422</td></tr>
-<tr><td>ycbcr.SubsampleRatio420</td> <td>image.YCbCrSubsampleRatio420</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>image.ColorImage</td> <td>image.Uniform</td></tr>
-</table>
-
-<p>
-The image package's <code>New</code> functions
-(<a href="/pkg/image/#NewRGBA"><code>NewRGBA</code></a>,
-<a href="/pkg/image/#NewRGBA64"><code>NewRGBA64</code></a>, etc.)
-take an <a href="/pkg/image/#Rectangle"><code>image.Rectangle</code></a> as an argument
-instead of four integers.
-</p>
-
-<p>
-Finally, there are new predefined <code>color.Color</code> variables
-<a href="/pkg/image/color/#Black"><code>color.Black</code></a>,
-<a href="/pkg/image/color/#White"><code>color.White</code></a>,
-<a href="/pkg/image/color/#Opaque"><code>color.Opaque</code></a>
-and
-<a href="/pkg/image/color/#Transparent"><code>color.Transparent</code></a>.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
-</p>
-
-<h3 id="log_syslog">The log/syslog package</h3>
-
-<p>
-In Go 1, the <a href="/pkg/log/syslog/#NewLogger"><code>syslog.NewLogger</code></a>
-function returns an error as well as a <code>log.Logger</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-What little code is affected will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="mime">The mime package</h3>
-
-<p>
-In Go 1, the <a href="/pkg/mime/#FormatMediaType"><code>FormatMediaType</code></a> function
-of the <code>mime</code> package has  been simplified to make it
-consistent with
-<a href="/pkg/mime/#ParseMediaType"><code>ParseMediaType</code></a>.
-It now takes <code>"text/html"</code> rather than <code>"text"</code> and <code>"html"</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-What little code is affected will be caught by the compiler and must be updated by hand.
-</p>
-
-<h3 id="net">The net package</h3>
-
-<p>
-In Go 1, the various <code>SetTimeout</code>,
-<code>SetReadTimeout</code>, and <code>SetWriteTimeout</code> methods
-have been replaced with
-<a href="/pkg/net/#IPConn.SetDeadline"><code>SetDeadline</code></a>,
-<a href="/pkg/net/#IPConn.SetReadDeadline"><code>SetReadDeadline</code></a>, and
-<a href="/pkg/net/#IPConn.SetWriteDeadline"><code>SetWriteDeadline</code></a>,
-respectively.  Rather than taking a timeout value in nanoseconds that
-apply to any activity on the connection, the new methods set an
-absolute deadline (as a <code>time.Time</code> value) after which
-reads and writes will time out and no longer block.
-</p>
-
-<p>
-There are also new functions
-<a href="/pkg/net/#DialTimeout"><code>net.DialTimeout</code></a>
-to simplify timing out dialing a network address and
-<a href="/pkg/net/#ListenMulticastUDP"><code>net.ListenMulticastUDP</code></a>
-to allow multicast UDP to listen concurrently across multiple listeners.
-The <code>net.ListenMulticastUDP</code> function replaces the old
-<code>JoinGroup</code> and <code>LeaveGroup</code> methods.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses the old methods will fail to compile and must be updated by hand.
-The semantic change makes it difficult for the fix tool to update automatically.
-</p>
-
-<h3 id="os">The os package</h3>
-
-<p>
-The <code>Time</code> function has been removed; callers should use
-the <a href="/pkg/time/#Time"><code>Time</code></a> type from the
-<code>time</code> package.
-</p>
-
-<p>
-The <code>Exec</code> function has been removed; callers should use
-<code>Exec</code> from the <code>syscall</code> package, where available.
-</p>
-
-<p>
-The <code>ShellExpand</code> function has been renamed to <a
-href="/pkg/os/#ExpandEnv"><code>ExpandEnv</code></a>.
-</p>
-
-<p>
-The <a href="/pkg/os/#NewFile"><code>NewFile</code></a> function
-now takes a <code>uintptr</code> fd, instead of an <code>int</code>.
-The <a href="/pkg/os/#File.Fd"><code>Fd</code></a> method on files now
-also returns a <code>uintptr</code>.
-</p>
-
-<p>
-There are no longer error constants such as <code>EINVAL</code>
-in the <code>os</code> package, since the set of values varied with
-the underlying operating system. There are new portable functions like
-<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>
-to test common error properties, plus a few new error values
-with more Go-like names, such as
-<a href="/pkg/os/#ErrPermission"><code>ErrPermission</code></a>
-and
-<a href="/pkg/os/#ErrNoEnv"><code>ErrNoEnv</code></a>.
-</p>
-
-<p>
-The <code>Getenverror</code> function has been removed. To distinguish
-between a non-existent environment variable and an empty string,
-use <a href="/pkg/os/#Environ"><code>os.Environ</code></a> or
-<a href="/pkg/syscall/#Getenv"><code>syscall.Getenv</code></a>.
-</p>
-
-
-<p>
-The <a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a> method has
-dropped its option argument and the associated constants are gone
-from the package.
-Also, the function <code>Wait</code> is gone; only the method of
-the <code>Process</code> type persists.
-</p>
-
-<p>
-The <code>Waitmsg</code> type returned by
-<a href="/pkg/os/#Process.Wait"><code>Process.Wait</code></a>
-has been replaced with a more portable
-<a href="/pkg/os/#ProcessState"><code>ProcessState</code></a>
-type with accessor methods to recover information about the
-process.
-Because of changes to <code>Wait</code>, the <code>ProcessState</code>
-value always describes an exited process.
-Portability concerns simplified the interface in other ways, but the values returned by the
-<a href="/pkg/os/#ProcessState.Sys"><code>ProcessState.Sys</code></a> and
-<a href="/pkg/os/#ProcessState.SysUsage"><code>ProcessState.SysUsage</code></a>
-methods can be type-asserted to underlying system-specific data structures such as
-<a href="/pkg/syscall/#WaitStatus"><code>syscall.WaitStatus</code></a> and
-<a href="/pkg/syscall/#Rusage"><code>syscall.Rusage</code></a> on Unix.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will drop a zero argument to <code>Process.Wait</code>.
-All other changes will be caught by the compiler and must be updated by hand.
-</p>
-
-<h4 id="os_fileinfo">The os.FileInfo type</h4>
-
-<p>
-Go 1 redefines the <a href="/pkg/os/#FileInfo"><code>os.FileInfo</code></a> type,
-changing it from a struct to an interface:
-</p>
-
-<pre>
-    type FileInfo interface {
-        Name() string       // base name of the file
-        Size() int64        // length in bytes
-        Mode() FileMode     // file mode bits
-        ModTime() time.Time // modification time
-        IsDir() bool        // abbreviation for Mode().IsDir()
-        Sys() interface{}   // underlying data source (can return nil)
-    }
-</pre>
-
-<p>
-The file mode information has been moved into a subtype called
-<a href="/pkg/os/#FileMode"><code>os.FileMode</code></a>,
-a simple integer type with <code>IsDir</code>, <code>Perm</code>, and <code>String</code>
-methods.
-</p>
-
-<p>
-The system-specific details of file modes and properties such as (on Unix)
-i-number have been removed from <code>FileInfo</code> altogether.
-Instead, each operating system's <code>os</code> package provides an
-implementation of the <code>FileInfo</code> interface, which
-has a <code>Sys</code> method that returns the
-system-specific representation of file metadata.
-For instance, to discover the i-number of a file on a Unix system, unpack
-the <code>FileInfo</code> like this:
-</p>
-
-<pre>
-    fi, err := os.Stat("hello.go")
-    if err != nil {
-        log.Fatal(err)
-    }
-    // Check that it's a Unix file.
-    unixStat, ok := fi.Sys().(*syscall.Stat_t)
-    if !ok {
-        log.Fatal("hello.go: not a Unix file")
-    }
-    fmt.Printf("file i-number: %d\n", unixStat.Ino)
-</pre>
-
-<p>
-Assuming (which is unwise) that <code>"hello.go"</code> is a Unix file,
-the i-number expression could be contracted to
-</p>
-
-<pre>
-    fi.Sys().(*syscall.Stat_t).Ino
-</pre>
-
-<p>
-The vast majority of uses of <code>FileInfo</code> need only the methods
-of the standard interface.
-</p>
-
-<p>
-The <code>os</code> package no longer contains wrappers for the POSIX errors
-such as <code>ENOENT</code>.
-For the few programs that need to verify particular error conditions, there are
-now the boolean functions
-<a href="/pkg/os/#IsExist"><code>IsExist</code></a>,
-<a href="/pkg/os/#IsNotExist"><code>IsNotExist</code></a>
-and
-<a href="/pkg/os/#IsPermission"><code>IsPermission</code></a>.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/os\.Open/` `/}/`}}
--->    f, err := os.OpenFile(name, os.O_RDWR|os.O_CREATE|os.O_EXCL, 0600)
-    if os.IsExist(err) {
-        log.Printf(&#34;%s already exists&#34;, name)
-    }</pre>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update code that uses the old equivalent of the current <code>os.FileInfo</code>
-and <code>os.FileMode</code> API.
-Code that needs system-specific file details will need to be updated by hand.
-Code that uses the old POSIX error values from the <code>os</code> package
-will fail to compile and will also need to be updated by hand.
-</p>
-
-<h3 id="os_signal">The os/signal package</h3>
-
-<p>
-The <code>os/signal</code> package in Go 1 replaces the
-<code>Incoming</code> function, which returned a channel
-that received all incoming signals,
-with the selective <code>Notify</code> function, which asks
-for delivery of specific signals on an existing channel.
-</p>
-
-<p>
-<em>Updating</em>:
-Code must be updated by hand.
-A literal translation of
-</p>
-<pre>
-c := signal.Incoming()
-</pre>
-<p>
-is
-</p>
-<pre>
-c := make(chan os.Signal)
-signal.Notify(c) // ask for all signals
-</pre>
-<p>
-but most code should list the specific signals it wants to handle instead:
-</p>
-<pre>
-c := make(chan os.Signal)
-signal.Notify(c, syscall.SIGHUP, syscall.SIGQUIT)
-</pre>
-
-<h3 id="path_filepath">The path/filepath package</h3>
-
-<p>
-In Go 1, the <a href="/pkg/path/filepath/#Walk"><code>Walk</code></a> function of the
-<code>path/filepath</code> package
-has been changed to take a function value of type
-<a href="/pkg/path/filepath/#WalkFunc"><code>WalkFunc</code></a>
-instead of a <code>Visitor</code> interface value.
-<code>WalkFunc</code> unifies the handling of both files and directories.
-</p>
-
-<pre>
-    type WalkFunc func(path string, info os.FileInfo, err error) error
-</pre>
-
-<p>
-The <code>WalkFunc</code> function will be called even for files or directories that could not be opened;
-in such cases the error argument will describe the failure.
-If a directory's contents are to be skipped,
-the function should return the value <a href="/pkg/path/filepath/#variables"><code>filepath.SkipDir</code></a>
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/STARTWALK/` `/ENDWALK/`}}
--->    markFn := func(path string, info os.FileInfo, err error) error {
-        if path == &#34;pictures&#34; { <span class="comment">// Will skip walking of directory pictures and its contents.</span>
-            return filepath.SkipDir
-        }
-        if err != nil {
-            return err
-        }
-        log.Println(path)
-        return nil
-    }
-    err := filepath.Walk(&#34;.&#34;, markFn)
-    if err != nil {
-        log.Fatal(err)
-    }</pre>
-
-<p>
-<em>Updating</em>:
-The change simplifies most code but has subtle consequences, so affected programs
-will need to be updated by hand.
-The compiler will catch code using the old interface.
-</p>
-
-<h3 id="regexp">The regexp package</h3>
-
-<p>
-The <a href="/pkg/regexp/"><code>regexp</code></a> package has been rewritten.
-It has the same interface but the specification of the regular expressions
-it supports has changed from the old "egrep" form to that of
-<a href="http://code.google.com/p/re2/">RE2</a>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses the package should have its regular expressions checked by hand.
-</p>
-
-<h3 id="runtime">The runtime package</h3>
-
-<p>
-In Go 1, much of the API exported by package
-<code>runtime</code> has been removed in favor of
-functionality provided by other packages.
-Code using the <code>runtime.Type</code> interface
-or its specific concrete type implementations should
-now use package <a href="/pkg/reflect/"><code>reflect</code></a>.
-Code using <code>runtime.Semacquire</code> or <code>runtime.Semrelease</code>
-should use channels or the abstractions in package <a href="/pkg/sync/"><code>sync</code></a>.
-The <code>runtime.Alloc</code>, <code>runtime.Free</code>,
-and <code>runtime.Lookup</code> functions, an unsafe API created for
-debugging the memory allocator, have no replacement.
-</p>
-
-<p>
-Before, <code>runtime.MemStats</code> was a global variable holding
-statistics about memory allocation, and calls to <code>runtime.UpdateMemStats</code>
-ensured that it was up to date.
-In Go 1, <code>runtime.MemStats</code> is a struct type, and code should use
-<a href="/pkg/runtime/#ReadMemStats"><code>runtime.ReadMemStats</code></a>
-to obtain the current statistics.
-</p>
-
-<p>
-The package adds a new function,
-<a href="/pkg/runtime/#NumCPU"><code>runtime.NumCPU</code></a>, that returns the number of CPUs available
-for parallel execution, as reported by the operating system kernel.
-Its value can inform the setting of <code>GOMAXPROCS</code>.
-The <code>runtime.Cgocalls</code> and <code>runtime.Goroutines</code> functions
-have been renamed to <code>runtime.NumCgoCall</code> and <code>runtime.NumGoroutine</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update code for the function renamings.
-Other code will need to be updated by hand.
-</p>
-
-<h3 id="strconv">The strconv package</h3>
-
-<p>
-In Go 1, the
-<a href="/pkg/strconv/"><code>strconv</code></a>
-package has been significantly reworked to make it more Go-like and less C-like,
-although <code>Atoi</code> lives on (it's similar to
-<code>int(ParseInt(x, 10, 0))</code>, as does
-<code>Itoa(x)</code> (<code>FormatInt(int64(x), 10)</code>).
-There are also new variants of some of the functions that append to byte slices rather than
-return strings, to allow control over allocation.
-</p>
-
-<p>
-This table summarizes the renamings; see the
-<a href="/pkg/strconv/">package documentation</a>
-for full details.
-</p>
-
-<table class="codetable" frame="border" summary="strconv renames">
-<colgroup align="left" width="50%"></colgroup>
-<colgroup align="left" width="50%"></colgroup>
-<tr>
-<th align="left">Old call</th>
-<th align="left">New call</th>
-</tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Atob(x)</td> <td>ParseBool(x)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Atof32(x)</td> <td>ParseFloat(x, 32)§</td></tr>
-<tr><td>Atof64(x)</td> <td>ParseFloat(x, 64)</td></tr>
-<tr><td>AtofN(x, n)</td> <td>ParseFloat(x, n)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Atoi(x)</td> <td>Atoi(x)</td></tr>
-<tr><td>Atoi(x)</td> <td>ParseInt(x, 10, 0)§</td></tr>
-<tr><td>Atoi64(x)</td> <td>ParseInt(x, 10, 64)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Atoui(x)</td> <td>ParseUint(x, 10, 0)§</td></tr>
-<tr><td>Atoui64(x)</td> <td>ParseUint(x, 10, 64)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Btoi64(x, b)</td> <td>ParseInt(x, b, 64)</td></tr>
-<tr><td>Btoui64(x, b)</td> <td>ParseUint(x, b, 64)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Btoa(x)</td> <td>FormatBool(x)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Ftoa32(x, f, p)</td> <td>FormatFloat(float64(x), f, p, 32)</td></tr>
-<tr><td>Ftoa64(x, f, p)</td> <td>FormatFloat(x, f, p, 64)</td></tr>
-<tr><td>FtoaN(x, f, p, n)</td> <td>FormatFloat(x, f, p, n)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Itoa(x)</td> <td>Itoa(x)</td></tr>
-<tr><td>Itoa(x)</td> <td>FormatInt(int64(x), 10)</td></tr>
-<tr><td>Itoa64(x)</td> <td>FormatInt(x, 10)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Itob(x, b)</td> <td>FormatInt(int64(x), b)</td></tr>
-<tr><td>Itob64(x, b)</td> <td>FormatInt(x, b)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Uitoa(x)</td> <td>FormatUint(uint64(x), 10)</td></tr>
-<tr><td>Uitoa64(x)</td> <td>FormatUint(x, 10)</td></tr>
-<tr>
-<td colspan="2"><hr></td>
-</tr>
-<tr><td>Uitob(x, b)</td> <td>FormatUint(uint64(x), b)</td></tr>
-<tr><td>Uitob64(x, b)</td> <td>FormatUint(x, b)</td></tr>
-</table>
-		
-<p>
-<em>Updating</em>:
-Running <code>go</code> <code>fix</code> will update almost all code affected by the change.
-<br>
-§ <code>Atoi</code> persists but <code>Atoui</code> and <code>Atof32</code> do not, so
-they may require
-a cast that must be added by hand; the <code>go</code> <code>fix</code> tool will warn about it.
-</p>
-
-
-<h3 id="templates">The template packages</h3>
-
-<p>
-The <code>template</code> and <code>exp/template/html</code> packages have moved to 
-<a href="/pkg/text/template/"><code>text/template</code></a> and
-<a href="/pkg/html/template/"><code>html/template</code></a>.
-More significant, the interface to these packages has been simplified.
-The template language is the same, but the concept of "template set" is gone
-and the functions and methods of the packages have changed accordingly,
-often by elimination.
-</p>
-
-<p>
-Instead of sets, a <code>Template</code> object
-may contain multiple named template definitions,
-in effect constructing
-name spaces for template invocation.
-A template can invoke any other template associated with it, but only those
-templates associated with it.
-The simplest way to associate templates is to parse them together, something
-made easier with the new structure of the packages.
-</p>
-
-<p>
-<em>Updating</em>:
-The imports will be updated by fix tool.
-Single-template uses will be otherwise be largely unaffected.
-Code that uses multiple templates in concert will need to be updated by hand.
-The <a href="/pkg/text/template/#examples">examples</a> in
-the documentation for <code>text/template</code> can provide guidance.
-</p>
-
-<h3 id="testing">The testing package</h3>
-
-<p>
-The testing package has a type, <code>B</code>, passed as an argument to benchmark functions.
-In Go 1, <code>B</code> has new methods, analogous to those of <code>T</code>, enabling
-logging and failure reporting.
-</p>
-
-<pre><!--{{code "/doc/progs/go1.go" `/func.*Benchmark/` `/^}/`}}
--->func BenchmarkSprintf(b *testing.B) {
-    <span class="comment">// Verify correctness before running benchmark.</span>
-    b.StopTimer()
-    got := fmt.Sprintf(&#34;%x&#34;, 23)
-    const expect = &#34;17&#34;
-    if expect != got {
-        b.Fatalf(&#34;expected %q; got %q&#34;, expect, got)
-    }
-    b.StartTimer()
-    for i := 0; i &lt; b.N; i++ {
-        fmt.Sprintf(&#34;%x&#34;, 23)
-    }
-}</pre>
-
-<p>
-<em>Updating</em>:
-Existing code is unaffected, although benchmarks that use <code>println</code>
-or <code>panic</code> should be updated to use the new methods.
-</p>
-
-<h3 id="testing_script">The testing/script package</h3>
-
-<p>
-The testing/script package has been deleted. It was a dreg.
-</p>
-
-<p>
-<em>Updating</em>:
-No code is likely to be affected.
-</p>
-
-<h3 id="unsafe">The unsafe package</h3>
-
-<p>
-In Go 1, the functions
-<code>unsafe.Typeof</code>, <code>unsafe.Reflect</code>,
-<code>unsafe.Unreflect</code>, <code>unsafe.New</code>, and
-<code>unsafe.NewArray</code> have been removed;
-they duplicated safer functionality provided by
-package <a href="/pkg/reflect/"><code>reflect</code></a>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code using these functions must be rewritten to use
-package <a href="/pkg/reflect/"><code>reflect</code></a>.
-The changes to <a href="http://code.google.com/p/go/source/detail?r=2646dc956207">encoding/gob</a> and the <a href="http://code.google.com/p/goprotobuf/source/detail?r=5340ad310031">protocol buffer library</a>
-may be helpful as examples.
-</p>
-
-<h3 id="url">The url package</h3>
-
-<p>
-In Go 1 several fields from the <a href="/pkg/net/url/#URL"><code>url.URL</code></a> type
-were removed or replaced.
-</p>
-
-<p>
-The <a href="/pkg/net/url/#URL.String"><code>String</code></a> method now
-predictably rebuilds an encoded URL string using all of <code>URL</code>'s
-fields as necessary. The resulting string will also no longer have
-passwords escaped.
-</p>
-
-<p>
-The <code>Raw</code> field has been removed. In most cases the <code>String</code>
-method may be used in its place.
-</p>
-
-<p>
-The old <code>RawUserinfo</code> field is replaced by the <code>User</code>
-field, of type <a href="/pkg/net/url/#Userinfo"><code>*net.Userinfo</code></a>.
-Values of this type may be created using the new <a href="/pkg/net/url/#User"><code>net.User</code></a>
-and <a href="/pkg/net/url/#UserPassword"><code>net.UserPassword</code></a>
-functions. The <code>EscapeUserinfo</code> and <code>UnescapeUserinfo</code>
-functions are also gone.
-</p>
-
-<p>
-The <code>RawAuthority</code> field has been removed. The same information is
-available in the <code>Host</code> and <code>User</code> fields.
-</p>
-
-<p>
-The <code>RawPath</code> field and the <code>EncodedPath</code> method have
-been removed. The path information in rooted URLs (with a slash following the
-schema) is now available only in decoded form in the <code>Path</code> field.
-Occasionally, the encoded data may be required to obtain information that
-was lost in the decoding process. These cases must be handled by accessing
-the data the URL was built from.
-</p>
-
-<p>
-URLs with non-rooted paths, such as <code>"mailto:dev@golang.org?subject=Hi"</code>,
-are also handled differently. The <code>OpaquePath</code> boolean field has been
-removed and a new <code>Opaque</code> string field introduced to hold the encoded
-path for such URLs. In Go 1, the cited URL parses as:
-</p>
-
-<pre>
-    URL{
-        Scheme: "mailto",
-        Opaque: "dev@golang.org",
-        RawQuery: "subject=Hi",
-    }
-</pre>
-
-<p>
-A new <a href="/pkg/net/url/#URL.RequestURI"><code>RequestURI</code></a> method was
-added to <code>URL</code>.
-</p>
-
-<p>
-The <code>ParseWithReference</code> function has been renamed to <code>ParseWithFragment</code>.
-</p>
-
-<p>
-<em>Updating</em>:
-Code that uses the old fields will fail to compile and must be updated by hand.
-The semantic changes make it difficult for the fix tool to update automatically.
-</p>
-
-<h2 id="cmd_go">The go command</h2>
-
-<p>
-Go 1 introduces the <a href="/cmd/go/">go command</a>, a tool for fetching,
-building, and installing Go packages and commands. The <code>go</code> command
-does away with makefiles, instead using Go source code to find dependencies and
-determine build conditions. Most existing Go programs will no longer require
-makefiles to be built.
-</p>
-
-<p>
-See <a href="/doc/code.html">How to Write Go Code</a> for a primer on the
-<code>go</code> command and the <a href="/cmd/go/">go command documentation</a>
-for the full details.
-</p>
-
-<p>
-<em>Updating</em>:
-Projects that depend on the Go project's old makefile-based build
-infrastructure (<code>Make.pkg</code>, <code>Make.cmd</code>, and so on) should
-switch to using the <code>go</code> command for building Go code and, if
-necessary, rewrite their makefiles to perform any auxiliary build tasks.
-</p>
-
-<h2 id="cmd_cgo">The cgo command</h2>
-
-<p>
-In Go 1, the <a href="/cmd/cgo">cgo command</a>
-uses a different <code>_cgo_export.h</code>
-file, which is generated for packages containing <code>//export</code> lines.
-The <code>_cgo_export.h</code> file now begins with the C preamble comment,
-so that exported function definitions can use types defined there.
-This has the effect of compiling the preamble multiple times, so a
-package using <code>//export</code> must not put function definitions
-or variable initializations in the C preamble.
-</p>
-
-<h2 id="releases">Packaged releases</h2>
-
-<p>
-One of the most significant changes associated with Go 1 is the availability
-of prepackaged, downloadable distributions.
-They are available for many combinations of architecture and operating system
-(including Windows) and the list will grow.
-Installation details are described on the
-<a href="/doc/install">Getting Started</a> page, while
-the distributions themselves are listed on the
-<a href="http://code.google.com/p/go/downloads/list">downloads page</a>.
-
-
-</div>
-
-<div id="footer">
-Build version go1.0.1.<br>
-A link <a href="http://code.google.com/policies.html#restrictions">noted</a>,
-and then, coming up on the very next line, we will
-find yet another link, link 3.0 if you will,
-after a few more words <a href="/LINK">link text</a>.<br>
-<a href="/doc/tos.html">Terms of Service</a> | 
-<a href="http://www.google.com/intl/en/privacy/privacy-policy.html">Privacy Policy</a>
-</div>
-
-<script type="text/javascript">
-(function() {
-  var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
-  ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-  var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
-})();
-</script>
-</body>
-<script type="text/javascript">
-  (function() {
-    var po = document.createElement('script'); po.type = 'text/javascript'; po.async = true;
-    po.src = 'https://apis.google.com/js/plusone.js';
-    var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
-  })();
-</script>
-</html>
-
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/README b/installer/vendor/golang.org/x/net/html/testdata/webkit/README
deleted file mode 100644
index 9b4c2d8be0..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/README
+++ /dev/null
@@ -1,28 +0,0 @@
-The *.dat files in this directory are copied from The WebKit Open Source
-Project, specifically $WEBKITROOT/LayoutTests/html5lib/resources.
-WebKit is licensed under a BSD style license.
-http://webkit.org/coding/bsd-license.html says:
-
-Copyright (C) 2009 Apple Inc. All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation
-and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS "AS IS" AND ANY
-EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR ANY
-DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption01.dat
deleted file mode 100644
index 787e1b01e1..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption01.dat
+++ /dev/null
@@ -1,194 +0,0 @@
-#data
-<a><p></a></p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <p>
-|       <a>
-
-#data
-<a>1<p>2</a>3</p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|     <p>
-|       <a>
-|         "2"
-|       "3"
-
-#data
-<a>1<button>2</a>3</button>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|     <button>
-|       <a>
-|         "2"
-|       "3"
-
-#data
-<a>1<b>2</a>3</b>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|       <b>
-|         "2"
-|     <b>
-|       "3"
-
-#data
-<a>1<div>2<div>3</a>4</div>5</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|     <div>
-|       <a>
-|         "2"
-|       <div>
-|         <a>
-|           "3"
-|         "4"
-|       "5"
-
-#data
-<table><a>1<p>2</a>3</p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|     <p>
-|       <a>
-|         "2"
-|       "3"
-|     <table>
-
-#data
-<b><b><a><p></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <b>
-|         <a>
-|         <p>
-|           <a>
-
-#data
-<b><a><b><p></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <a>
-|         <b>
-|       <b>
-|         <p>
-|           <a>
-
-#data
-<a><b><b><p></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|         <b>
-|     <b>
-|       <b>
-|         <p>
-|           <a>
-
-#data
-<p>1<s id="A">2<b id="B">3</p>4</s>5</b>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "1"
-|       <s>
-|         id="A"
-|         "2"
-|         <b>
-|           id="B"
-|           "3"
-|     <s>
-|       id="A"
-|       <b>
-|         id="B"
-|         "4"
-|     <b>
-|       id="B"
-|       "5"
-
-#data
-<table><a>1<td>2</td>3</table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "1"
-|     <a>
-|       "3"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "2"
-
-#data
-<table>A<td>B</td>C</table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "AC"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "B"
-
-#data
-<a><svg><tr><input></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <svg svg>
-|         <svg tr>
-|           <svg input>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption02.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption02.dat
deleted file mode 100644
index d18151b44f..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/adoption02.dat
+++ /dev/null
@@ -1,31 +0,0 @@
-#data
-<b>1<i>2<p>3</b>4
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "1"
-|       <i>
-|         "2"
-|     <i>
-|       <p>
-|         <b>
-|           "3"
-|         "4"
-
-#data
-<a><div><style></style><address><a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <div>
-|       <a>
-|         <style>
-|       <address>
-|         <a>
-|         <a>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/comments01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/comments01.dat
deleted file mode 100644
index 44f1876830..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/comments01.dat
+++ /dev/null
@@ -1,135 +0,0 @@
-#data
-FOO<!-- BAR -->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR  -->
-|     "BAZ"
-
-#data
-FOO<!-- BAR --!>BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR  -->
-|     "BAZ"
-
-#data
-FOO<!-- BAR --   >BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR --   >BAZ -->
-
-#data
-FOO<!-- BAR -- <QUX> -- MUX -->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX  -->
-|     "BAZ"
-
-#data
-FOO<!-- BAR -- <QUX> -- MUX --!>BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX  -->
-|     "BAZ"
-
-#data
-FOO<!-- BAR -- <QUX> -- MUX -- >BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  BAR -- <QUX> -- MUX -- >BAZ -->
-
-#data
-FOO<!---->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  -->
-|     "BAZ"
-
-#data
-FOO<!--->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  -->
-|     "BAZ"
-
-#data
-FOO<!-->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!--  -->
-|     "BAZ"
-
-#data
-<?xml version="1.0">Hi
-#errors
-#document
-| <!-- ?xml version="1.0" -->
-| <html>
-|   <head>
-|   <body>
-|     "Hi"
-
-#data
-<?xml version="1.0">
-#errors
-#document
-| <!-- ?xml version="1.0" -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<?xml version
-#errors
-#document
-| <!-- ?xml version -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-FOO<!----->BAZ
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <!-- - -->
-|     "BAZ"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/doctype01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/doctype01.dat
deleted file mode 100644
index ae457328a4..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/doctype01.dat
+++ /dev/null
@@ -1,370 +0,0 @@
-#data
-<!DOCTYPE html>Hello
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!dOctYpE HtMl>Hello
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPEhtml>Hello
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE>Hello
-#errors
-#document
-| <!DOCTYPE >
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE >Hello
-#errors
-#document
-| <!DOCTYPE >
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato >Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato taco>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato taco "ddd>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato sYstEM>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato sYstEM    >Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE   potato       sYstEM  ggg>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato SYSTEM taco  >Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato SYSTEM 'taco"'>Hello
-#errors
-#document
-| <!DOCTYPE potato "" "taco"">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato SYSTEM "taco">Hello
-#errors
-#document
-| <!DOCTYPE potato "" "taco">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato SYSTEM "tai'co">Hello
-#errors
-#document
-| <!DOCTYPE potato "" "tai'co">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato SYSTEMtaco "ddd">Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato grass SYSTEM taco>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato pUbLIc>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato pUbLIc >Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato pUbLIcgoof>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato PUBLIC goof>Hello
-#errors
-#document
-| <!DOCTYPE potato>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato PUBLIC "go'of">Hello
-#errors
-#document
-| <!DOCTYPE potato "go'of" "">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato PUBLIC 'go'of'>Hello
-#errors
-#document
-| <!DOCTYPE potato "go" "">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato PUBLIC 'go:hh   of' >Hello
-#errors
-#document
-| <!DOCTYPE potato "go:hh   of" "">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE potato PUBLIC "W3C-//dfdf" SYSTEM ggg>Hello
-#errors
-#document
-| <!DOCTYPE potato "W3C-//dfdf" "">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"
-   "http://www.w3.org/TR/html4/strict.dtd">Hello
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE ...>Hello
-#errors
-#document
-| <!DOCTYPE ...>
-| <html>
-|   <head>
-|   <body>
-|     "Hello"
-
-#data
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN"
-"http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD XHTML 1.0 Frameset//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE root-element [SYSTEM OR PUBLIC FPI] "uri" [ 
-<!-- internal declarations -->
-]>
-#errors
-#document
-| <!DOCTYPE root-element>
-| <html>
-|   <head>
-|   <body>
-|     "]>"
-
-#data
-<!DOCTYPE html PUBLIC
-  "-//WAPFORUM//DTD XHTML Mobile 1.0//EN"
-    "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-#errors
-#document
-| <!DOCTYPE html "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE HTML SYSTEM "http://www.w3.org/DTD/HTML4-strict.dtd"><body><b>Mine!</b></body>
-#errors
-#document
-| <!DOCTYPE html "" "http://www.w3.org/DTD/HTML4-strict.dtd">
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "Mine!"
-
-#data
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN""http://www.w3.org/TR/html4/strict.dtd">
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE HTML PUBLIC"-//W3C//DTD HTML 4.01//EN"'http://www.w3.org/TR/html4/strict.dtd'>
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE HTML PUBLIC'-//W3C//DTD HTML 4.01//EN''http://www.w3.org/TR/html4/strict.dtd'>
-#errors
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-| <html>
-|   <head>
-|   <body>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/entities01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/entities01.dat
deleted file mode 100644
index c8073b7810..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/entities01.dat
+++ /dev/null
@@ -1,603 +0,0 @@
-#data
-FOO&gt;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO>BAR"
-
-#data
-FOO&gtBAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO>BAR"
-
-#data
-FOO&gt BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO> BAR"
-
-#data
-FOO&gt;;;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO>;;BAR"
-
-#data
-I'm &notit; I tell you
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "I'm ¬it; I tell you"
-
-#data
-I'm &notin; I tell you
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "I'm ∉ I tell you"
-
-#data
-FOO& BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO& BAR"
-
-#data
-FOO&<BAR>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&"
-|     <bar>
-
-#data
-FOO&&&&gt;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&&&>BAR"
-
-#data
-FOO&#41;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO)BAR"
-
-#data
-FOO&#x41;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOABAR"
-
-#data
-FOO&#X41;BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOABAR"
-
-#data
-FOO&#BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&#BAR"
-
-#data
-FOO&#ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&#ZOO"
-
-#data
-FOO&#xBAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOºR"
-
-#data
-FOO&#xZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&#xZOO"
-
-#data
-FOO&#XZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO&#XZOO"
-
-#data
-FOO&#41BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO)BAR"
-
-#data
-FOO&#x41BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO䆺R"
-
-#data
-FOO&#x41ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOAZOO"
-
-#data
-FOO&#x0000;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#x0078;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOxZOO"
-
-#data
-FOO&#x0079;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOyZOO"
-
-#data
-FOO&#x0080;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO€ZOO"
-
-#data
-FOO&#x0081;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x0082;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO‚ZOO"
-
-#data
-FOO&#x0083;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOƒZOO"
-
-#data
-FOO&#x0084;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO„ZOO"
-
-#data
-FOO&#x0085;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO…ZOO"
-
-#data
-FOO&#x0086;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO†ZOO"
-
-#data
-FOO&#x0087;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO‡ZOO"
-
-#data
-FOO&#x0088;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOˆZOO"
-
-#data
-FOO&#x0089;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO‰ZOO"
-
-#data
-FOO&#x008A;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOŠZOO"
-
-#data
-FOO&#x008B;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO‹ZOO"
-
-#data
-FOO&#x008C;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOŒZOO"
-
-#data
-FOO&#x008D;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x008E;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOŽZOO"
-
-#data
-FOO&#x008F;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x0090;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x0091;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO‘ZOO"
-
-#data
-FOO&#x0092;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO’ZOO"
-
-#data
-FOO&#x0093;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO“ZOO"
-
-#data
-FOO&#x0094;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO”ZOO"
-
-#data
-FOO&#x0095;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO•ZOO"
-
-#data
-FOO&#x0096;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO–ZOO"
-
-#data
-FOO&#x0097;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO—ZOO"
-
-#data
-FOO&#x0098;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO˜ZOO"
-
-#data
-FOO&#x0099;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO™ZOO"
-
-#data
-FOO&#x009A;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOšZOO"
-
-#data
-FOO&#x009B;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO›ZOO"
-
-#data
-FOO&#x009C;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOœZOO"
-
-#data
-FOO&#x009D;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x009E;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOžZOO"
-
-#data
-FOO&#x009F;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOŸZOO"
-
-#data
-FOO&#x00A0;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO ZOO"
-
-#data
-FOO&#xD7FF;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO퟿ZOO"
-
-#data
-FOO&#xD800;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#xD801;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#xDFFE;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#xDFFF;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#xE000;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOOZOO"
-
-#data
-FOO&#x10FFFE;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO􏿾ZOO"
-
-#data
-FOO&#x1087D4;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO􈟔ZOO"
-
-#data
-FOO&#x10FFFF;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO􏿿ZOO"
-
-#data
-FOO&#x110000;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
-
-#data
-FOO&#xFFFFFF;ZOO
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO�ZOO"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/entities02.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/entities02.dat
deleted file mode 100644
index e2fb42a078..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/entities02.dat
+++ /dev/null
@@ -1,249 +0,0 @@
-#data
-<div bar="ZZ&gt;YY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ>YY"
-
-#data
-<div bar="ZZ&"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&"
-
-#data
-<div bar='ZZ&'></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&"
-
-#data
-<div bar=ZZ&></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&"
-
-#data
-<div bar="ZZ&gt=YY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&gt=YY"
-
-#data
-<div bar="ZZ&gt0YY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&gt0YY"
-
-#data
-<div bar="ZZ&gt9YY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&gt9YY"
-
-#data
-<div bar="ZZ&gtaYY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&gtaYY"
-
-#data
-<div bar="ZZ&gtZYY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&gtZYY"
-
-#data
-<div bar="ZZ&gt YY"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ> YY"
-
-#data
-<div bar="ZZ&gt"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ>"
-
-#data
-<div bar='ZZ&gt'></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ>"
-
-#data
-<div bar=ZZ&gt></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ>"
-
-#data
-<div bar="ZZ&pound_id=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ£_id=23"
-
-#data
-<div bar="ZZ&prod_id=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&prod_id=23"
-
-#data
-<div bar="ZZ&pound;_id=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ£_id=23"
-
-#data
-<div bar="ZZ&prod;_id=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ∏_id=23"
-
-#data
-<div bar="ZZ&pound=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&pound=23"
-
-#data
-<div bar="ZZ&prod=23"></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       bar="ZZ&prod=23"
-
-#data
-<div>ZZ&pound_id=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ£_id=23"
-
-#data
-<div>ZZ&prod_id=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ&prod_id=23"
-
-#data
-<div>ZZ&pound;_id=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ£_id=23"
-
-#data
-<div>ZZ&prod;_id=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ∏_id=23"
-
-#data
-<div>ZZ&pound=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ£=23"
-
-#data
-<div>ZZ&prod=23</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "ZZ&prod=23"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/html5test-com.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/html5test-com.dat
deleted file mode 100644
index d7cb71db05..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/html5test-com.dat
+++ /dev/null
@@ -1,246 +0,0 @@
-#data
-<div<div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div<div>
-
-#data
-<div foo<bar=''>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       foo<bar=""
-
-#data
-<div foo=`bar`>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       foo="`bar`"
-
-#data
-<div \"foo=''>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       \"foo=""
-
-#data
-<a href='\nbar'></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="\nbar"
-
-#data
-<!DOCTYPE html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-&lang;&rang;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "⟨⟩"
-
-#data
-&apos;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "'"
-
-#data
-&ImaginaryI;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "ⅈ"
-
-#data
-&Kopf;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "𝕂"
-
-#data
-&notinva;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "∉"
-
-#data
-<?import namespace="foo" implementation="#bar">
-#errors
-#document
-| <!-- ?import namespace="foo" implementation="#bar" -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!--foo--bar-->
-#errors
-#document
-| <!-- foo--bar -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<![CDATA[x]]>
-#errors
-#document
-| <!-- [CDATA[x]] -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<textarea><!--</textarea>--></textarea>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<!--"
-|     "-->"
-
-#data
-<textarea><!--</textarea>-->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<!--"
-|     "-->"
-
-#data
-<style><!--</style>--></style>
-#errors
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--"
-|   <body>
-|     "-->"
-
-#data
-<style><!--</style>-->
-#errors
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--"
-|   <body>
-|     "-->"
-
-#data
-<ul><li>A </li> <li>B</li></ul>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ul>
-|       <li>
-|         "A "
-|       " "
-|       <li>
-|         "B"
-
-#data
-<table><form><input type=hidden><input></form><div></div></table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <input>
-|     <div>
-|     <table>
-|       <form>
-|       <input>
-|         type="hidden"
-
-#data
-<i>A<b>B<p></i>C</b>D
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "A"
-|       <b>
-|         "B"
-|     <b>
-|     <p>
-|       <b>
-|         <i>
-|         "C"
-|       "D"
-
-#data
-<div></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-
-#data
-<svg></svg>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<math></math>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/inbody01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/inbody01.dat
deleted file mode 100644
index 3f2bd374c0..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/inbody01.dat
+++ /dev/null
@@ -1,43 +0,0 @@
-#data
-<button>1</foo>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <button>
-|       "1"
-
-#data
-<foo>1<p>2</foo>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       "1"
-|       <p>
-|         "2"
-
-#data
-<dd>1</foo>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <dd>
-|       "1"
-
-#data
-<foo>1<dd>2</foo>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       "1"
-|       <dd>
-|         "2"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/isindex.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/isindex.dat
deleted file mode 100644
index 88325ffe64..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/isindex.dat
+++ /dev/null
@@ -1,40 +0,0 @@
-#data
-<isindex>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
-
-#data
-<isindex name="A" action="B" prompt="C" foo="D">
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       action="B"
-|       <hr>
-|       <label>
-|         "C"
-|         <input>
-|           foo="D"
-|           name="isindex"
-|       <hr>
-
-#data
-<form><isindex>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat
deleted file mode 100644
index a5ebb1eb28..0000000000
Binary files a/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes-plain-text-unsafe.dat and /dev/null differ
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
deleted file mode 100644
index 5a9208465f..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/pending-spec-changes.dat
+++ /dev/null
@@ -1,52 +0,0 @@
-#data
-<input type="hidden"><frameset>
-#errors
-21: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-31: “frameset” start tag seen.
-31: End of file seen and there were open elements.
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><table><caption><svg>foo</table>bar
-#errors
-47: End tag “table” did not match the name of the current open element (“svg”).
-47: “table” closed but “caption” was still open.
-47: End tag “table” seen, but there were open elements.
-36: Unclosed element “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <svg svg>
-|           "foo"
-|     "bar"
-
-#data
-<table><tr><td><svg><desc><td></desc><circle>
-#errors
-7: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-30: A table cell was implicitly closed, but there were open elements.
-26: Unclosed element “desc”.
-20: Unclosed element “svg”.
-37: Stray end tag “desc”.
-45: End of file seen and there were open elements.
-45: Unclosed element “circle”.
-7: Unclosed element “table”.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg desc>
-|           <td>
-|             <circle>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat
deleted file mode 100644
index 04cc11fb9d..0000000000
Binary files a/installer/vendor/golang.org/x/net/html/testdata/webkit/plain-text-unsafe.dat and /dev/null differ
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/scriptdata01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
deleted file mode 100644
index 76b67f4ba6..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/scriptdata01.dat
+++ /dev/null
@@ -1,308 +0,0 @@
-#data
-FOO<script>'Hello'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'Hello'"
-|     "BAR"
-
-#data
-FOO<script></script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|     "BAR"
-
-#data
-FOO<script></script >BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|     "BAR"
-
-#data
-FOO<script></script/>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|     "BAR"
-
-#data
-FOO<script></script/ >BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|     "BAR"
-
-#data
-FOO<script type="text/plain"></scriptx>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "</scriptx>BAR"
-
-#data
-FOO<script></script foo=">" dd>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|     "BAR"
-
-#data
-FOO<script>'<'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<'"
-|     "BAR"
-
-#data
-FOO<script>'<!'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!'"
-|     "BAR"
-
-#data
-FOO<script>'<!-'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-'"
-|     "BAR"
-
-#data
-FOO<script>'<!--'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!--'"
-|     "BAR"
-
-#data
-FOO<script>'<!---'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!---'"
-|     "BAR"
-
-#data
-FOO<script>'<!-->'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-->'"
-|     "BAR"
-
-#data
-FOO<script>'<!-->'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-->'"
-|     "BAR"
-
-#data
-FOO<script>'<!-- potato'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-- potato'"
-|     "BAR"
-
-#data
-FOO<script>'<!-- <sCrIpt'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-- <sCrIpt'"
-|     "BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt>'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt>'</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt> -'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt> -'</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt> --'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt> --'</script>BAR"
-
-#data
-FOO<script>'<!-- <sCrIpt> -->'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       "'<!-- <sCrIpt> -->'"
-|     "BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt> --!>'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt> --!>'</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt> -- >'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt> -- >'</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt '</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt '</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt/'</script>BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt\'</script>BAR
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt\'"
-|     "BAR"
-
-#data
-FOO<script type="text/plain">'<!-- <sCrIpt/'</script>BAR</script>QUX
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "FOO"
-|     <script>
-|       type="text/plain"
-|       "'<!-- <sCrIpt/'</script>BAR"
-|     "QUX"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
deleted file mode 100644
index 4e08d0e84a..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/adoption01.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-#data
-<p><b id="A"><script>document.getElementById("A").id = "B"</script></p>TEXT</b>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|         id="B"
-|         <script>
-|           "document.getElementById("A").id = "B""
-|     <b>
-|       id="A"
-|       "TEXT"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
deleted file mode 100644
index ef4a41ca00..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/scripted/webkit01.dat
+++ /dev/null
@@ -1,28 +0,0 @@
-#data
-1<script>document.write("2")</script>3
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "1"
-|     <script>
-|       "document.write("2")"
-|     "23"
-
-#data
-1<script>document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")</script>4
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "1"
-|     <script>
-|       "document.write("<script>document.write('2')</scr"+ "ipt><script>document.write('3')</scr" + "ipt>")"
-|     <script>
-|       "document.write('2')"
-|     "2"
-|     <script>
-|       "document.write('3')"
-|     "34"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tables01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tables01.dat
deleted file mode 100644
index c4b47e48a8..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tables01.dat
+++ /dev/null
@@ -1,212 +0,0 @@
-#data
-<table><th>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <th>
-
-#data
-<table><td>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><col foo='bar'>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <colgroup>
-|         <col>
-|           foo="bar"
-
-#data
-<table><colgroup></html>foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "foo"
-|     <table>
-|       <colgroup>
-
-#data
-<table></table><p>foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|     <p>
-|       "foo"
-
-#data
-<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr><td>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><select><option>3</select></table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|         "3"
-|     <table>
-
-#data
-<table><select><table></table></select></table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <table>
-|     <table>
-
-#data
-<table><select></table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <table>
-
-#data
-<table><select><option>A<tr><td>B</td></tr></table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|         "A"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "B"
-
-#data
-<table><td></body></caption></col></colgroup></html>foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "foo"
-
-#data
-<table><td>A</table>B
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "A"
-|     "B"
-
-#data
-<table><tr><caption>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|       <caption>
-
-#data
-<table><tr></body></caption></col></colgroup></html></td></th><td>foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "foo"
-
-#data
-<table><td><tr>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|         <tr>
-
-#data
-<table><td><button><td>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <button>
-|           <td>
-
-#data
-<table><tr><td><svg><desc><td>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg desc>
-|           <td>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests1.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests1.dat
deleted file mode 100644
index cbf8bdda63..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests1.dat
+++ /dev/null
@@ -1,1952 +0,0 @@
-#data
-Test
-#errors
-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "Test"
-
-#data
-<p>One<p>Two
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "One"
-|     <p>
-|       "Two"
-
-#data
-Line1<br>Line2<br>Line3<br>Line4
-#errors
-Line: 1 Col: 5 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "Line1"
-|     <br>
-|     "Line2"
-|     <br>
-|     "Line3"
-|     <br>
-|     "Line4"
-
-#data
-<html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<head>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<body>
-#errors
-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head></head>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head></head><body>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head></head><body></body>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head><body></body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head></body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-Line: 1 Col: 19 Unexpected end tag (body).
-Line: 1 Col: 26 Unexpected end tag (html).
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><head><body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<html><body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<head></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end tag (html). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-</head>
-#errors
-Line: 1 Col: 7 Unexpected end tag (head). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-</body>
-#errors
-Line: 1 Col: 7 Unexpected end tag (body). Expected DOCTYPE.
-Line: 1 Col: 7 Unexpected end tag (body) after the (implied) root element.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-</html>
-#errors
-Line: 1 Col: 7 Unexpected end tag (html). Expected DOCTYPE.
-Line: 1 Col: 7 Unexpected end tag (html) after the (implied) root element.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<b><table><td><i></table>
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <i>
-
-#data
-<b><table><td></b><i></table>X
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 30 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <i>
-|       "X"
-
-#data
-<h1>Hello<h2>World
-#errors
-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-13: Heading cannot be a child of another heading.
-18: End of file seen and there were open elements.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <h1>
-|       "Hello"
-|     <h2>
-|       "World"
-
-#data
-<a><p>X<a>Y</a>Z</p></a>
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 10 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 10 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 24 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <p>
-|       <a>
-|         "X"
-|       <a>
-|         "Y"
-|       "Z"
-
-#data
-<b><button>foo</b>bar
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|     <button>
-|       <b>
-|         "foo"
-|       "bar"
-
-#data
-<!DOCTYPE html><span><button>foo</span>bar
-#errors
-39: End tag “span” seen but there were unclosed elements.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <span>
-|       <button>
-|         "foobar"
-
-#data
-<p><b><div><marquee></p></b></div>X
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
-Line: 1 Col: 24 Unexpected end tag (p). Ignored.
-Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|     <div>
-|       <b>
-|         <marquee>
-|           <p>
-|           "X"
-
-#data
-<script><div></script></div><title><p></title><p><p>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 28 Unexpected end tag (div). Ignored.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<div>"
-|     <title>
-|       "<p>"
-|   <body>
-|     <p>
-|     <p>
-
-#data
-<!--><div>--<!-->
-#errors
-Line: 1 Col: 5 Incorrect comment.
-Line: 1 Col: 10 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 17 Incorrect comment.
-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
-#document
-| <!--  -->
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "--"
-|       <!--  -->
-
-#data
-<p><hr></p>
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <hr>
-|     <p>
-
-#data
-<select><b><option><select><option></b></select>X
-#errors
-Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
-Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
-Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 48 Unexpected end tag (select). Ignored.
-Line: 1 Col: 49 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|     <option>
-|       "X"
-
-#data
-<a><table><td><a><table></table><a></tr><a></table><b>X</b>C<a>Y
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 63 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 64 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <a>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <a>
-|                 <table>
-|               <a>
-|     <a>
-|       <b>
-|         "X"
-|       "C"
-|     <a>
-|       "Y"
-
-#data
-<a X>0<b>1<a Y>2
-#errors
-Line: 1 Col: 5 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 15 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       x=""
-|       "0"
-|       <b>
-|         "1"
-|     <b>
-|       <a>
-|         y=""
-|         "2"
-
-#data
-<!-----><font><div>hello<table>excite!<b>me!<th><i>please!</tr><!--X-->
-#errors
-Line: 1 Col: 7 Unexpected '-' after '--' found in comment.
-Line: 1 Col: 14 Unexpected start tag (font). Expected DOCTYPE.
-Line: 1 Col: 38 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 41 Unexpected start tag (b) in table context caused voodoo mode.
-Line: 1 Col: 48 Unexpected implied end tag (b) in the table phase.
-Line: 1 Col: 48 Unexpected table cell start tag (th) in the table body phase.
-Line: 1 Col: 63 Got table cell end tag (th) while required end tags are missing.
-Line: 1 Col: 71 Unexpected end of file. Expected table content.
-#document
-| <!-- - -->
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|       <div>
-|         "helloexcite!"
-|         <b>
-|           "me!"
-|         <table>
-|           <tbody>
-|             <tr>
-|               <th>
-|                 <i>
-|                   "please!"
-|             <!-- X -->
-
-#data
-<!DOCTYPE html><li>hello<li>world<ul>how<li>do</ul>you</body><!--do-->
-#errors
-Line: 1 Col: 61 Unexpected end tag (li). Missing end tag (body).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <li>
-|       "hello"
-|     <li>
-|       "world"
-|       <ul>
-|         "how"
-|         <li>
-|           "do"
-|       "you"
-|   <!-- do -->
-
-#data
-<!DOCTYPE html>A<option>B<optgroup>C<select>D</option>E
-#errors
-Line: 1 Col: 54 Unexpected end tag (option) in the select phase. Ignored.
-Line: 1 Col: 55 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "A"
-|     <option>
-|       "B"
-|     <optgroup>
-|       "C"
-|       <select>
-|         "DE"
-
-#data
-<
-#errors
-Line: 1 Col: 1 Expected tag name. Got something else instead
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "<"
-
-#data
-<#
-#errors
-Line: 1 Col: 1 Expected tag name. Got something else instead
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "<#"
-
-#data
-</
-#errors
-Line: 1 Col: 2 Expected closing tag. Unexpected end of file.
-Line: 1 Col: 2 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "</"
-
-#data
-</#
-#errors
-Line: 1 Col: 2 Expected closing tag. Unexpected character '#' found.
-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- # -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<?
-#errors
-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
-Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- ? -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<?#
-#errors
-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- ?# -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!
-#errors
-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
-Line: 1 Col: 2 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!--  -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!#
-#errors
-Line: 1 Col: 3 Expected '--' or 'DOCTYPE'. Not found.
-Line: 1 Col: 3 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- # -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<?COMMENT?>
-#errors
-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
-Line: 1 Col: 11 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- ?COMMENT? -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!COMMENT>
-#errors
-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
-Line: 1 Col: 10 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- COMMENT -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-</ COMMENT >
-#errors
-Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
-Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!--  COMMENT  -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<?COM--MENT?>
-#errors
-Line: 1 Col: 1 Expected tag name. Got '?' instead. (HTML doesn't support processing instructions.)
-Line: 1 Col: 13 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- ?COM--MENT? -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!COM--MENT>
-#errors
-Line: 1 Col: 2 Expected '--' or 'DOCTYPE'. Not found.
-Line: 1 Col: 12 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- COM--MENT -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-</ COM--MENT >
-#errors
-Line: 1 Col: 2 Expected closing tag. Unexpected character ' ' found.
-Line: 1 Col: 14 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!--  COM--MENT  -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><style> EOF
-#errors
-Line: 1 Col: 26 Unexpected end of file. Expected end tag (style).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       " EOF"
-|   <body>
-
-#data
-<!DOCTYPE html><script> <!-- </script> --> </script> EOF
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       " <!-- "
-|     " "
-|   <body>
-|     "-->  EOF"
-
-#data
-<b><p></b>TEST
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 10 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|     <p>
-|       <b>
-|       "TEST"
-
-#data
-<p id=a><b><p id=b></b>TEST
-#errors
-Line: 1 Col: 8 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 19 Unexpected end tag (p). Ignored.
-Line: 1 Col: 23 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       id="a"
-|       <b>
-|     <p>
-|       id="b"
-|       "TEST"
-
-#data
-<b id=a><p><b id=b></p></b>TEST
-#errors
-Line: 1 Col: 8 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end tag (p). Ignored.
-Line: 1 Col: 27 End tag (b) violates step 1, paragraph 2 of the adoption agency algorithm.
-Line: 1 Col: 31 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       id="a"
-|       <p>
-|         <b>
-|           id="b"
-|       "TEST"
-
-#data
-<!DOCTYPE html><title>U-test</title><body><div><p>Test<u></p></div></body>
-#errors
-Line: 1 Col: 61 Unexpected end tag (p). Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "U-test"
-|   <body>
-|     <div>
-|       <p>
-|         "Test"
-|         <u>
-
-#data
-<!DOCTYPE html><font><table></font></table></font>
-#errors
-Line: 1 Col: 35 Unexpected end tag (font) in table context caused voodoo mode.
-Line: 1 Col: 35 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|       <table>
-
-#data
-<font><p>hello<b>cruel</font>world
-#errors
-Line: 1 Col: 6 Unexpected start tag (font). Expected DOCTYPE.
-Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 29 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|     <p>
-|       <font>
-|         "hello"
-|         <b>
-|           "cruel"
-|       <b>
-|         "world"
-
-#data
-<b>Test</i>Test
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 11 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "TestTest"
-
-#data
-<b>A<cite>B<div>C
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "A"
-|       <cite>
-|         "B"
-|         <div>
-|           "C"
-
-#data
-<b>A<cite>B<div>C</cite>D
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 24 Unexpected end tag (cite). Ignored.
-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "A"
-|       <cite>
-|         "B"
-|         <div>
-|           "CD"
-
-#data
-<b>A<cite>B<div>C</b>D
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 21 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 22 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "A"
-|       <cite>
-|         "B"
-|     <div>
-|       <b>
-|         "C"
-|       "D"
-
-#data
-
-#errors
-Line: 1 Col: 0 Unexpected End of file. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<DIV>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 5 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-
-#data
-<DIV> abc
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 9 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc"
-
-#data
-<DIV> abc <B>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-
-#data
-<DIV> abc <B> def
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 17 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def"
-
-#data
-<DIV> abc <B> def <I>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-
-#data
-<DIV> abc <B> def <I> ghi
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi"
-
-#data
-<DIV> abc <B> def <I> ghi <P>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|           <p>
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|           <p>
-|             " jkl"
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 38 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|         <p>
-|           <b>
-|             " jkl "
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B> mno
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|         <p>
-|           <b>
-|             " jkl "
-|           " mno"
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|       <p>
-|         <i>
-|           <b>
-|             " jkl "
-|           " mno "
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|       <p>
-|         <i>
-|           <b>
-|             " jkl "
-|           " mno "
-|         " pqr"
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P>
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|       <p>
-|         <i>
-|           <b>
-|             " jkl "
-|           " mno "
-|         " pqr "
-
-#data
-<DIV> abc <B> def <I> ghi <P> jkl </B> mno </I> pqr </P> stu
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 38 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 47 End tag (i) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 60 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       " abc "
-|       <b>
-|         " def "
-|         <i>
-|           " ghi "
-|       <i>
-|       <p>
-|         <i>
-|           <b>
-|             " jkl "
-|           " mno "
-|         " pqr "
-|       " stu"
-
-#data
-<test attribute---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------->
-#errors
-Line: 1 Col: 1040 Unexpected start tag (test). Expected DOCTYPE.
-Line: 1 Col: 1040 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <test>
-|       attribute----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------=""
-
-#data
-<a href="blah">aba<table><a href="foo">br<tr><td></td></tr>x</table>aoe
-#errors
-Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 39 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 39 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 39 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 45 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
-
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="blah"
-|       "aba"
-|       <a>
-|         href="foo"
-|         "br"
-|       <a>
-|         href="foo"
-|         "x"
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|     <a>
-|       href="foo"
-|       "aoe"
-
-#data
-<a href="blah">aba<table><tr><td><a href="foo">br</td></tr>x</table>aoe
-#errors
-Line: 1 Col: 15 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 60 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="blah"
-|       "abax"
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <a>
-|                 href="foo"
-|                 "br"
-|       "aoe"
-
-#data
-<table><a href="blah">aba<tr><td><a href="foo">br</td></tr>x</table>aoe
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 29 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 54 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 68 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 71 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="blah"
-|       "aba"
-|     <a>
-|       href="blah"
-|       "x"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <a>
-|               href="foo"
-|               "br"
-|     <a>
-|       href="blah"
-|       "aoe"
-
-#data
-<a href=a>aa<marquee>aa<a href=b>bb</marquee>aa
-#errors
-Line: 1 Col: 10 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 45 End tag (marquee) seen too early. Expected other end tag.
-Line: 1 Col: 47 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="a"
-|       "aa"
-|       <marquee>
-|         "aa"
-|         <a>
-|           href="b"
-|           "bb"
-|       "aa"
-
-#data
-<wbr><strike><code></strike><code><strike></code>
-#errors
-Line: 1 Col: 5 Unexpected start tag (wbr). Expected DOCTYPE.
-Line: 1 Col: 28 End tag (strike) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 49 Unexpected end tag (code). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <wbr>
-|     <strike>
-|       <code>
-|     <code>
-|       <code>
-|         <strike>
-
-#data
-<!DOCTYPE html><spacer>foo
-#errors
-26: End of file seen and there were open elements.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <spacer>
-|       "foo"
-
-#data
-<title><meta></title><link><title><meta></title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|       "<meta>"
-|     <link>
-|     <title>
-|       "<meta>"
-|   <body>
-
-#data
-<style><!--</style><meta><script>--><link></script>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 51 Unexpected end of file. Expected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--"
-|     <meta>
-|     <script>
-|       "--><link>"
-|   <body>
-
-#data
-<head><meta></head><link>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 25 Unexpected start tag (link) that can be in head. Moved.
-#document
-| <html>
-|   <head>
-|     <meta>
-|     <link>
-|   <body>
-
-#data
-<table><tr><tr><td><td><span><th><span>X</table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 33 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 48 Got table cell end tag (th) while required end tags are missing.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|         <tr>
-|           <td>
-|           <td>
-|             <span>
-|           <th>
-|             <span>
-|               "X"
-
-#data
-<body><body><base><link><meta><title><p></title><body><p></body>
-#errors
-Line: 1 Col: 6 Unexpected start tag (body). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected start tag (body).
-Line: 1 Col: 54 Unexpected start tag (body).
-Line: 1 Col: 64 Unexpected end tag (p). Missing end tag (body).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <base>
-|     <link>
-|     <meta>
-|     <title>
-|       "<p>"
-|     <p>
-
-#data
-<textarea><p></textarea>
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<p>"
-
-#data
-<p><image></p>
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 10 Unexpected start tag (image). Treated as img.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <img>
-
-#data
-<a><table><a></table><p><a><div><a>
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 13 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 13 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 21 Unexpected end tag (table). Expected end tag (a).
-Line: 1 Col: 27 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 27 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
-Line: 1 Col: 32 Unexpected end tag (p). Ignored.
-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 35 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <a>
-|       <table>
-|     <p>
-|       <a>
-|     <div>
-|       <a>
-
-#data
-<head></p><meta><p>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 10 Unexpected end tag (p). Ignored.
-#document
-| <html>
-|   <head>
-|     <meta>
-|   <body>
-|     <p>
-
-#data
-<head></html><meta><p>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 19 Unexpected start tag (meta).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <meta>
-|     <p>
-
-#data
-<b><table><td><i></table>
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 25 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <i>
-
-#data
-<b><table><td></b><i></table>
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 18 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 29 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <i>
-
-#data
-<h1><h2>
-#errors
-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-8: Heading cannot be a child of another heading.
-8: End of file seen and there were open elements.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <h1>
-|     <h2>
-
-#data
-<a><p><a></a></p></a>
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 9 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 9 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 21 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <p>
-|       <a>
-|       <a>
-
-#data
-<b><button></b></button></b>
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 15 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|     <button>
-|       <b>
-
-#data
-<p><b><div><marquee></p></b></div>
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
-Line: 1 Col: 24 Unexpected end tag (p). Ignored.
-Line: 1 Col: 28 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 34 End tag (div) seen too early. Expected other end tag.
-Line: 1 Col: 34 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|     <div>
-|       <b>
-|         <marquee>
-|           <p>
-
-#data
-<script></script></div><title></title><p><p>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end tag (div). Ignored.
-#document
-| <html>
-|   <head>
-|     <script>
-|     <title>
-|   <body>
-|     <p>
-|     <p>
-
-#data
-<p><hr></p>
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end tag (p). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <hr>
-|     <p>
-
-#data
-<select><b><option><select><option></b></select>
-#errors
-Line: 1 Col: 8 Unexpected start tag (select). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected start tag token (b) in the select phase. Ignored.
-Line: 1 Col: 27 Unexpected select start tag in the select phase treated as select end tag.
-Line: 1 Col: 39 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 48 Unexpected end tag (select). Ignored.
-Line: 1 Col: 48 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|     <option>
-
-#data
-<html><head><title></title><body></body></html>
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|   <body>
-
-#data
-<a><table><td><a><table></table><a></tr><a></table><a>
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 35 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 40 Got table cell end tag (td) while required end tags are missing.
-Line: 1 Col: 43 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 43 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 43 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 51 Unexpected implied end tag (a) in the table phase.
-Line: 1 Col: 54 Unexpected start tag (a) implies end tag (a).
-Line: 1 Col: 54 End tag (a) violates step 1, paragraph 2 of the adoption agency algorithm.
-Line: 1 Col: 54 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <a>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <a>
-|                 <table>
-|               <a>
-|     <a>
-
-#data
-<ul><li></li><div><li></div><li><li><div><li><address><li><b><em></b><li></ul>
-#errors
-Line: 1 Col: 4 Unexpected start tag (ul). Expected DOCTYPE.
-Line: 1 Col: 45 Missing end tag (div, li).
-Line: 1 Col: 58 Missing end tag (address, li).
-Line: 1 Col: 69 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ul>
-|       <li>
-|       <div>
-|         <li>
-|       <li>
-|       <li>
-|         <div>
-|       <li>
-|         <address>
-|       <li>
-|         <b>
-|           <em>
-|       <li>
-
-#data
-<ul><li><ul></li><li>a</li></ul></li></ul>
-#errors
-XXX: fix me
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ul>
-|       <li>
-|         <ul>
-|           <li>
-|             "a"
-
-#data
-<frameset><frame><frameset><frame></frameset><noframes></noframes></frameset>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-|     <frameset>
-|       <frame>
-|     <noframes>
-
-#data
-<h1><table><td><h3></table><h3></h1>
-#errors
-4: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-15: “td” start tag in table body.
-27: Unclosed elements.
-31: Heading cannot be a child of another heading.
-36: End tag “h1” seen but there were unclosed elements.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <h1>
-|       <table>
-|         <tbody>
-|           <tr>
-|             <td>
-|               <h3>
-|     <h3>
-
-#data
-<table><colgroup><col><colgroup><col><col><col><colgroup><col><col><thead><tr><td></table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <colgroup>
-|         <col>
-|       <colgroup>
-|         <col>
-|         <col>
-|         <col>
-|       <colgroup>
-|         <col>
-|         <col>
-|       <thead>
-|         <tr>
-|           <td>
-
-#data
-<table><col><tbody><col><tr><col><td><col></table><col>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 37 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 55 Unexpected start tag col. Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <colgroup>
-|         <col>
-|       <tbody>
-|       <colgroup>
-|         <col>
-|       <tbody>
-|         <tr>
-|       <colgroup>
-|         <col>
-|       <tbody>
-|         <tr>
-|           <td>
-|       <colgroup>
-|         <col>
-
-#data
-<table><colgroup><tbody><colgroup><tr><colgroup><td><colgroup></table><colgroup>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 52 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 80 Unexpected start tag colgroup. Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <colgroup>
-|       <tbody>
-|       <colgroup>
-|       <tbody>
-|         <tr>
-|       <colgroup>
-|       <tbody>
-|         <tr>
-|           <td>
-|       <colgroup>
-
-#data
-</strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
-#errors
-Line: 1 Col: 9 Unexpected end tag (strong). Expected DOCTYPE.
-Line: 1 Col: 9 Unexpected end tag (strong) after the (implied) root element.
-Line: 1 Col: 13 Unexpected end tag (b) after the (implied) root element.
-Line: 1 Col: 18 Unexpected end tag (em) after the (implied) root element.
-Line: 1 Col: 22 Unexpected end tag (i) after the (implied) root element.
-Line: 1 Col: 26 Unexpected end tag (u) after the (implied) root element.
-Line: 1 Col: 35 Unexpected end tag (strike) after the (implied) root element.
-Line: 1 Col: 39 Unexpected end tag (s) after the (implied) root element.
-Line: 1 Col: 47 Unexpected end tag (blink) after the (implied) root element.
-Line: 1 Col: 52 Unexpected end tag (tt) after the (implied) root element.
-Line: 1 Col: 58 Unexpected end tag (pre) after the (implied) root element.
-Line: 1 Col: 64 Unexpected end tag (big) after the (implied) root element.
-Line: 1 Col: 72 Unexpected end tag (small) after the (implied) root element.
-Line: 1 Col: 79 Unexpected end tag (font) after the (implied) root element.
-Line: 1 Col: 88 Unexpected end tag (select) after the (implied) root element.
-Line: 1 Col: 93 Unexpected end tag (h1) after the (implied) root element.
-Line: 1 Col: 98 Unexpected end tag (h2) after the (implied) root element.
-Line: 1 Col: 103 Unexpected end tag (h3) after the (implied) root element.
-Line: 1 Col: 108 Unexpected end tag (h4) after the (implied) root element.
-Line: 1 Col: 113 Unexpected end tag (h5) after the (implied) root element.
-Line: 1 Col: 118 Unexpected end tag (h6) after the (implied) root element.
-Line: 1 Col: 125 Unexpected end tag (body) after the (implied) root element.
-Line: 1 Col: 130 Unexpected end tag (br). Treated as br element.
-Line: 1 Col: 134 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 140 This element (img) has no end tag.
-Line: 1 Col: 148 Unexpected end tag (title). Ignored.
-Line: 1 Col: 155 Unexpected end tag (span). Ignored.
-Line: 1 Col: 163 Unexpected end tag (style). Ignored.
-Line: 1 Col: 172 Unexpected end tag (script). Ignored.
-Line: 1 Col: 180 Unexpected end tag (table). Ignored.
-Line: 1 Col: 185 Unexpected end tag (th). Ignored.
-Line: 1 Col: 190 Unexpected end tag (td). Ignored.
-Line: 1 Col: 195 Unexpected end tag (tr). Ignored.
-Line: 1 Col: 203 This element (frame) has no end tag.
-Line: 1 Col: 210 This element (area) has no end tag.
-Line: 1 Col: 217 Unexpected end tag (link). Ignored.
-Line: 1 Col: 225 This element (param) has no end tag.
-Line: 1 Col: 230 This element (hr) has no end tag.
-Line: 1 Col: 238 This element (input) has no end tag.
-Line: 1 Col: 244 Unexpected end tag (col). Ignored.
-Line: 1 Col: 251 Unexpected end tag (base). Ignored.
-Line: 1 Col: 258 Unexpected end tag (meta). Ignored.
-Line: 1 Col: 269 This element (basefont) has no end tag.
-Line: 1 Col: 279 This element (bgsound) has no end tag.
-Line: 1 Col: 287 This element (embed) has no end tag.
-Line: 1 Col: 296 This element (spacer) has no end tag.
-Line: 1 Col: 300 Unexpected end tag (p). Ignored.
-Line: 1 Col: 305 End tag (dd) seen too early. Expected other end tag.
-Line: 1 Col: 310 End tag (dt) seen too early. Expected other end tag.
-Line: 1 Col: 320 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 331 Unexpected end tag (colgroup). Ignored.
-Line: 1 Col: 339 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 347 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 355 Unexpected end tag (thead). Ignored.
-Line: 1 Col: 365 End tag (address) seen too early. Expected other end tag.
-Line: 1 Col: 378 End tag (blockquote) seen too early. Expected other end tag.
-Line: 1 Col: 387 End tag (center) seen too early. Expected other end tag.
-Line: 1 Col: 393 Unexpected end tag (dir). Ignored.
-Line: 1 Col: 399 End tag (div) seen too early. Expected other end tag.
-Line: 1 Col: 404 End tag (dl) seen too early. Expected other end tag.
-Line: 1 Col: 415 End tag (fieldset) seen too early. Expected other end tag.
-Line: 1 Col: 425 End tag (listing) seen too early. Expected other end tag.
-Line: 1 Col: 432 End tag (menu) seen too early. Expected other end tag.
-Line: 1 Col: 437 End tag (ol) seen too early. Expected other end tag.
-Line: 1 Col: 442 End tag (ul) seen too early. Expected other end tag.
-Line: 1 Col: 447 End tag (li) seen too early. Expected other end tag.
-Line: 1 Col: 454 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 460 This element (wbr) has no end tag.
-Line: 1 Col: 476 End tag (button) seen too early. Expected other end tag.
-Line: 1 Col: 486 End tag (marquee) seen too early. Expected other end tag.
-Line: 1 Col: 495 End tag (object) seen too early. Expected other end tag.
-Line: 1 Col: 513 Unexpected end tag (html). Ignored.
-Line: 1 Col: 513 Unexpected end tag (frameset). Ignored.
-Line: 1 Col: 520 Unexpected end tag (head). Ignored.
-Line: 1 Col: 529 Unexpected end tag (iframe). Ignored.
-Line: 1 Col: 537 This element (image) has no end tag.
-Line: 1 Col: 547 This element (isindex) has no end tag.
-Line: 1 Col: 557 Unexpected end tag (noembed). Ignored.
-Line: 1 Col: 568 Unexpected end tag (noframes). Ignored.
-Line: 1 Col: 579 Unexpected end tag (noscript). Ignored.
-Line: 1 Col: 590 Unexpected end tag (optgroup). Ignored.
-Line: 1 Col: 599 Unexpected end tag (option). Ignored.
-Line: 1 Col: 611 Unexpected end tag (plaintext). Ignored.
-Line: 1 Col: 622 Unexpected end tag (textarea). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <br>
-|     <p>
-
-#data
-<table><tr></strong></b></em></i></u></strike></s></blink></tt></pre></big></small></font></select></h1></h2></h3></h4></h5></h6></body></br></a></img></title></span></style></script></table></th></td></tr></frame></area></link></param></hr></input></col></base></meta></basefont></bgsound></embed></spacer></p></dd></dt></caption></colgroup></tbody></tfoot></thead></address></blockquote></center></dir></div></dl></fieldset></listing></menu></ol></ul></li></nobr></wbr></form></button></marquee></object></html></frameset></head></iframe></image></isindex></noembed></noframes></noscript></optgroup></option></plaintext></textarea>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end tag (strong) in table context caused voodoo mode.
-Line: 1 Col: 20 End tag (strong) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 24 Unexpected end tag (b) in table context caused voodoo mode.
-Line: 1 Col: 24 End tag (b) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 29 Unexpected end tag (em) in table context caused voodoo mode.
-Line: 1 Col: 29 End tag (em) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 33 Unexpected end tag (i) in table context caused voodoo mode.
-Line: 1 Col: 33 End tag (i) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 37 Unexpected end tag (u) in table context caused voodoo mode.
-Line: 1 Col: 37 End tag (u) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 46 Unexpected end tag (strike) in table context caused voodoo mode.
-Line: 1 Col: 46 End tag (strike) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 50 Unexpected end tag (s) in table context caused voodoo mode.
-Line: 1 Col: 50 End tag (s) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 58 Unexpected end tag (blink) in table context caused voodoo mode.
-Line: 1 Col: 58 Unexpected end tag (blink). Ignored.
-Line: 1 Col: 63 Unexpected end tag (tt) in table context caused voodoo mode.
-Line: 1 Col: 63 End tag (tt) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 69 Unexpected end tag (pre) in table context caused voodoo mode.
-Line: 1 Col: 69 End tag (pre) seen too early. Expected other end tag.
-Line: 1 Col: 75 Unexpected end tag (big) in table context caused voodoo mode.
-Line: 1 Col: 75 End tag (big) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 83 Unexpected end tag (small) in table context caused voodoo mode.
-Line: 1 Col: 83 End tag (small) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 90 Unexpected end tag (font) in table context caused voodoo mode.
-Line: 1 Col: 90 End tag (font) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 99 Unexpected end tag (select) in table context caused voodoo mode.
-Line: 1 Col: 99 Unexpected end tag (select). Ignored.
-Line: 1 Col: 104 Unexpected end tag (h1) in table context caused voodoo mode.
-Line: 1 Col: 104 End tag (h1) seen too early. Expected other end tag.
-Line: 1 Col: 109 Unexpected end tag (h2) in table context caused voodoo mode.
-Line: 1 Col: 109 End tag (h2) seen too early. Expected other end tag.
-Line: 1 Col: 114 Unexpected end tag (h3) in table context caused voodoo mode.
-Line: 1 Col: 114 End tag (h3) seen too early. Expected other end tag.
-Line: 1 Col: 119 Unexpected end tag (h4) in table context caused voodoo mode.
-Line: 1 Col: 119 End tag (h4) seen too early. Expected other end tag.
-Line: 1 Col: 124 Unexpected end tag (h5) in table context caused voodoo mode.
-Line: 1 Col: 124 End tag (h5) seen too early. Expected other end tag.
-Line: 1 Col: 129 Unexpected end tag (h6) in table context caused voodoo mode.
-Line: 1 Col: 129 End tag (h6) seen too early. Expected other end tag.
-Line: 1 Col: 136 Unexpected end tag (body) in the table row phase. Ignored.
-Line: 1 Col: 141 Unexpected end tag (br) in table context caused voodoo mode.
-Line: 1 Col: 141 Unexpected end tag (br). Treated as br element.
-Line: 1 Col: 145 Unexpected end tag (a) in table context caused voodoo mode.
-Line: 1 Col: 145 End tag (a) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 151 Unexpected end tag (img) in table context caused voodoo mode.
-Line: 1 Col: 151 This element (img) has no end tag.
-Line: 1 Col: 159 Unexpected end tag (title) in table context caused voodoo mode.
-Line: 1 Col: 159 Unexpected end tag (title). Ignored.
-Line: 1 Col: 166 Unexpected end tag (span) in table context caused voodoo mode.
-Line: 1 Col: 166 Unexpected end tag (span). Ignored.
-Line: 1 Col: 174 Unexpected end tag (style) in table context caused voodoo mode.
-Line: 1 Col: 174 Unexpected end tag (style). Ignored.
-Line: 1 Col: 183 Unexpected end tag (script) in table context caused voodoo mode.
-Line: 1 Col: 183 Unexpected end tag (script). Ignored.
-Line: 1 Col: 196 Unexpected end tag (th). Ignored.
-Line: 1 Col: 201 Unexpected end tag (td). Ignored.
-Line: 1 Col: 206 Unexpected end tag (tr). Ignored.
-Line: 1 Col: 214 This element (frame) has no end tag.
-Line: 1 Col: 221 This element (area) has no end tag.
-Line: 1 Col: 228 Unexpected end tag (link). Ignored.
-Line: 1 Col: 236 This element (param) has no end tag.
-Line: 1 Col: 241 This element (hr) has no end tag.
-Line: 1 Col: 249 This element (input) has no end tag.
-Line: 1 Col: 255 Unexpected end tag (col). Ignored.
-Line: 1 Col: 262 Unexpected end tag (base). Ignored.
-Line: 1 Col: 269 Unexpected end tag (meta). Ignored.
-Line: 1 Col: 280 This element (basefont) has no end tag.
-Line: 1 Col: 290 This element (bgsound) has no end tag.
-Line: 1 Col: 298 This element (embed) has no end tag.
-Line: 1 Col: 307 This element (spacer) has no end tag.
-Line: 1 Col: 311 Unexpected end tag (p). Ignored.
-Line: 1 Col: 316 End tag (dd) seen too early. Expected other end tag.
-Line: 1 Col: 321 End tag (dt) seen too early. Expected other end tag.
-Line: 1 Col: 331 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 342 Unexpected end tag (colgroup). Ignored.
-Line: 1 Col: 350 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 358 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 366 Unexpected end tag (thead). Ignored.
-Line: 1 Col: 376 End tag (address) seen too early. Expected other end tag.
-Line: 1 Col: 389 End tag (blockquote) seen too early. Expected other end tag.
-Line: 1 Col: 398 End tag (center) seen too early. Expected other end tag.
-Line: 1 Col: 404 Unexpected end tag (dir). Ignored.
-Line: 1 Col: 410 End tag (div) seen too early. Expected other end tag.
-Line: 1 Col: 415 End tag (dl) seen too early. Expected other end tag.
-Line: 1 Col: 426 End tag (fieldset) seen too early. Expected other end tag.
-Line: 1 Col: 436 End tag (listing) seen too early. Expected other end tag.
-Line: 1 Col: 443 End tag (menu) seen too early. Expected other end tag.
-Line: 1 Col: 448 End tag (ol) seen too early. Expected other end tag.
-Line: 1 Col: 453 End tag (ul) seen too early. Expected other end tag.
-Line: 1 Col: 458 End tag (li) seen too early. Expected other end tag.
-Line: 1 Col: 465 End tag (nobr) violates step 1, paragraph 1 of the adoption agency algorithm.
-Line: 1 Col: 471 This element (wbr) has no end tag.
-Line: 1 Col: 487 End tag (button) seen too early. Expected other end tag.
-Line: 1 Col: 497 End tag (marquee) seen too early. Expected other end tag.
-Line: 1 Col: 506 End tag (object) seen too early. Expected other end tag.
-Line: 1 Col: 524 Unexpected end tag (html). Ignored.
-Line: 1 Col: 524 Unexpected end tag (frameset). Ignored.
-Line: 1 Col: 531 Unexpected end tag (head). Ignored.
-Line: 1 Col: 540 Unexpected end tag (iframe). Ignored.
-Line: 1 Col: 548 This element (image) has no end tag.
-Line: 1 Col: 558 This element (isindex) has no end tag.
-Line: 1 Col: 568 Unexpected end tag (noembed). Ignored.
-Line: 1 Col: 579 Unexpected end tag (noframes). Ignored.
-Line: 1 Col: 590 Unexpected end tag (noscript). Ignored.
-Line: 1 Col: 601 Unexpected end tag (optgroup). Ignored.
-Line: 1 Col: 610 Unexpected end tag (option). Ignored.
-Line: 1 Col: 622 Unexpected end tag (plaintext). Ignored.
-Line: 1 Col: 633 Unexpected end tag (textarea). Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <br>
-|     <table>
-|       <tbody>
-|         <tr>
-|     <p>
-
-#data
-<frameset>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 1 Col: 10 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <frameset>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests10.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests10.dat
deleted file mode 100644
index 4f8df86f20..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests10.dat
+++ /dev/null
@@ -1,799 +0,0 @@
-#data
-<!DOCTYPE html><svg></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<!DOCTYPE html><svg></svg><![CDATA[a]]>
-#errors
-29: Bogus comment
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|     <!-- [CDATA[a]] -->
-
-#data
-<!DOCTYPE html><body><svg></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<!DOCTYPE html><body><select><svg></svg></select>
-#errors
-35: Stray “svg” start tag.
-42: Stray end tag “svg”
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!DOCTYPE html><body><select><option><svg></svg></option></select>
-#errors
-43: Stray “svg” start tag.
-50: Stray end tag “svg”
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-
-#data
-<!DOCTYPE html><body><table><svg></svg></table>
-#errors
-34: Start tag “svg” seen in “table”.
-41: Stray end tag “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><svg><g>foo</g></svg></table>
-#errors
-34: Start tag “svg” seen in “table”.
-46: Stray end tag “g”.
-53: Stray end tag “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><svg><g>foo</g><g>bar</g></svg></table>
-#errors
-34: Start tag “svg” seen in “table”.
-46: Stray end tag “g”.
-58: Stray end tag “g”.
-65: Stray end tag “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><tbody><svg><g>foo</g><g>bar</g></svg></tbody></table>
-#errors
-41: Start tag “svg” seen in “table”.
-53: Stray end tag “g”.
-65: Stray end tag “g”.
-72: Stray end tag “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <table>
-|       <tbody>
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><svg><g>foo</g><g>bar</g></svg></tr></tbody></table>
-#errors
-45: Start tag “svg” seen in “table”.
-57: Stray end tag “g”.
-69: Stray end tag “g”.
-76: Stray end tag “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg></td></tr></tbody></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg g>
-|                 "foo"
-|               <svg g>
-|                 "bar"
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><td><svg><g>foo</g><g>bar</g></svg><p>baz</td></tr></tbody></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg g>
-|                 "foo"
-|               <svg g>
-|                 "bar"
-|             <p>
-|               "baz"
-
-#data
-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g></svg><p>baz</caption></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <svg svg>
-|           <svg g>
-|             "foo"
-|           <svg g>
-|             "bar"
-|         <p>
-|           "baz"
-
-#data
-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
-#errors
-70: HTML start tag “p” in a foreign namespace context.
-81: “table” closed but “caption” was still open.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <svg svg>
-|           <svg g>
-|             "foo"
-|           <svg g>
-|             "bar"
-|         <p>
-|           "baz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><caption><svg><g>foo</g><g>bar</g>baz</table><p>quux
-#errors
-78: “table” closed but “caption” was still open.
-78: Unclosed elements on stack.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <svg svg>
-|           <svg g>
-|             "foo"
-|           <svg g>
-|             "bar"
-|           "baz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><colgroup><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
-#errors
-44: Start tag “svg” seen in “table”.
-56: Stray end tag “g”.
-68: Stray end tag “g”.
-71: HTML start tag “p” in a foreign namespace context.
-71: Start tag “p” seen in “table”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <p>
-|       "baz"
-|     <table>
-|       <colgroup>
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><tr><td><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
-#errors
-50: Stray “svg” start tag.
-54: Stray “g” start tag.
-62: Stray end tag “g”
-66: Stray “g” start tag.
-74: Stray end tag “g”
-77: Stray “p” start tag.
-88: “table” end tag with “select” open.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foobarbaz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><select><svg><g>foo</g><g>bar</g><p>baz</table><p>quux
-#errors
-36: Start tag “select” seen in “table”.
-42: Stray “svg” start tag.
-46: Stray “g” start tag.
-54: Stray end tag “g”
-58: Stray “g” start tag.
-66: Stray end tag “g”
-69: Stray “p” start tag.
-80: “table” end tag with “select” open.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       "foobarbaz"
-|     <table>
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body></body></html><svg><g>foo</g><g>bar</g><p>baz
-#errors
-41: Stray “svg” start tag.
-68: HTML start tag “p” in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <p>
-|       "baz"
-
-#data
-<!DOCTYPE html><body></body><svg><g>foo</g><g>bar</g><p>baz
-#errors
-34: Stray “svg” start tag.
-61: HTML start tag “p” in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg g>
-|         "foo"
-|       <svg g>
-|         "bar"
-|     <p>
-|       "baz"
-
-#data
-<!DOCTYPE html><frameset><svg><g></g><g></g><p><span>
-#errors
-31: Stray “svg” start tag.
-35: Stray “g” start tag.
-40: Stray end tag “g”
-44: Stray “g” start tag.
-49: Stray end tag “g”
-52: Stray “p” start tag.
-58: Stray “span” start tag.
-58: End of file seen and there were open elements.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><frameset></frameset><svg><g></g><g></g><p><span>
-#errors
-42: Stray “svg” start tag.
-46: Stray “g” start tag.
-51: Stray end tag “g”
-55: Stray “g” start tag.
-60: Stray end tag “g”
-63: Stray “p” start tag.
-69: Stray “span” start tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><body xlink:href=foo><svg xlink:href=foo></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     <svg svg>
-|       xlink href="foo"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo></g></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <svg svg>
-|       <svg g>
-|         xlink href="foo"
-|         xml lang="en"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo /></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <svg svg>
-|       <svg g>
-|         xlink href="foo"
-|         xml lang="en"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><svg><g xml:lang=en xlink:href=foo />bar</svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <svg svg>
-|       <svg g>
-|         xlink href="foo"
-|         xml lang="en"
-|       "bar"
-
-#data
-<svg></path>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<div><svg></div>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|     "a"
-
-#data
-<div><svg><path></div>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|         <svg path>
-|     "a"
-
-#data
-<div><svg><path></svg><path>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|         <svg path>
-|       <path>
-
-#data
-<div><svg><path><foreignObject><math></div>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|         <svg path>
-|           <svg foreignObject>
-|             <math math>
-|               "a"
-
-#data
-<div><svg><path><foreignObject><p></div>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|         <svg path>
-|           <svg foreignObject>
-|             <p>
-|               "a"
-
-#data
-<!DOCTYPE html><svg><desc><div><svg><ul>a
-#errors
-40: HTML start tag “ul” in a foreign namespace context.
-41: End of file in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg desc>
-|         <div>
-|           <svg svg>
-|           <ul>
-|             "a"
-
-#data
-<!DOCTYPE html><svg><desc><svg><ul>a
-#errors
-35: HTML start tag “ul” in a foreign namespace context.
-36: End of file in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg desc>
-|         <svg svg>
-|         <ul>
-|           "a"
-
-#data
-<!DOCTYPE html><p><svg><desc><p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <svg svg>
-|         <svg desc>
-|           <p>
-
-#data
-<!DOCTYPE html><p><svg><title><p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <svg svg>
-|         <svg title>
-|           <p>
-
-#data
-<div><svg><path><foreignObject><p></foreignObject><p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <svg svg>
-|         <svg path>
-|           <svg foreignObject>
-|             <p>
-|             <p>
-
-#data
-<math><mi><div><object><div><span></span></div></object></div></mi><mi>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         <div>
-|           <object>
-|             <div>
-|               <span>
-|       <math mi>
-
-#data
-<math><mi><svg><foreignObject><div><div></div></div></foreignObject></svg></mi><mi>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         <svg svg>
-|           <svg foreignObject>
-|             <div>
-|               <div>
-|       <math mi>
-
-#data
-<svg><script></script><path>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg script>
-|       <svg path>
-
-#data
-<table><svg></svg><tr>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<math><mi><mglyph>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         <math mglyph>
-
-#data
-<math><mi><malignmark>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         <math malignmark>
-
-#data
-<math><mo><mglyph>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mo>
-|         <math mglyph>
-
-#data
-<math><mo><malignmark>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mo>
-|         <math malignmark>
-
-#data
-<math><mn><mglyph>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mn>
-|         <math mglyph>
-
-#data
-<math><mn><malignmark>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mn>
-|         <math malignmark>
-
-#data
-<math><ms><mglyph>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math ms>
-|         <math mglyph>
-
-#data
-<math><ms><malignmark>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math ms>
-|         <math malignmark>
-
-#data
-<math><mtext><mglyph>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mtext>
-|         <math mglyph>
-
-#data
-<math><mtext><malignmark>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mtext>
-|         <math malignmark>
-
-#data
-<math><annotation-xml><svg></svg></annotation-xml><mi>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         <svg svg>
-|       <math mi>
-
-#data
-<math><annotation-xml><svg><foreignObject><div><math><mi></mi></math><span></span></div></foreignObject><path></path></svg></annotation-xml><mi>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         <svg svg>
-|           <svg foreignObject>
-|             <div>
-|               <math math>
-|                 <math mi>
-|               <span>
-|           <svg path>
-|       <math mi>
-
-#data
-<math><annotation-xml><svg><foreignObject><math><mi><svg></svg></mi><mo></mo></math><span></span></foreignObject><path></path></svg></annotation-xml><mi>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         <svg svg>
-|           <svg foreignObject>
-|             <math math>
-|               <math mi>
-|                 <svg svg>
-|               <math mo>
-|             <span>
-|           <svg path>
-|       <math mi>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests11.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests11.dat
deleted file mode 100644
index 638cde479f..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests11.dat
+++ /dev/null
@@ -1,482 +0,0 @@
-#data
-<!DOCTYPE html><body><svg attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       attributeName=""
-|       attributeType=""
-|       baseFrequency=""
-|       baseProfile=""
-|       calcMode=""
-|       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
-|       diffuseConstant=""
-|       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
-|       filterUnits=""
-|       glyphRef=""
-|       gradientTransform=""
-|       gradientUnits=""
-|       kernelMatrix=""
-|       kernelUnitLength=""
-|       keyPoints=""
-|       keySplines=""
-|       keyTimes=""
-|       lengthAdjust=""
-|       limitingConeAngle=""
-|       markerHeight=""
-|       markerUnits=""
-|       markerWidth=""
-|       maskContentUnits=""
-|       maskUnits=""
-|       numOctaves=""
-|       pathLength=""
-|       patternContentUnits=""
-|       patternTransform=""
-|       patternUnits=""
-|       pointsAtX=""
-|       pointsAtY=""
-|       pointsAtZ=""
-|       preserveAlpha=""
-|       preserveAspectRatio=""
-|       primitiveUnits=""
-|       refX=""
-|       refY=""
-|       repeatCount=""
-|       repeatDur=""
-|       requiredExtensions=""
-|       requiredFeatures=""
-|       specularConstant=""
-|       specularExponent=""
-|       spreadMethod=""
-|       startOffset=""
-|       stdDeviation=""
-|       stitchTiles=""
-|       surfaceScale=""
-|       systemLanguage=""
-|       tableValues=""
-|       targetX=""
-|       targetY=""
-|       textLength=""
-|       viewBox=""
-|       viewTarget=""
-|       xChannelSelector=""
-|       yChannelSelector=""
-|       zoomAndPan=""
-
-#data
-<!DOCTYPE html><BODY><SVG ATTRIBUTENAME='' ATTRIBUTETYPE='' BASEFREQUENCY='' BASEPROFILE='' CALCMODE='' CLIPPATHUNITS='' CONTENTSCRIPTTYPE='' CONTENTSTYLETYPE='' DIFFUSECONSTANT='' EDGEMODE='' EXTERNALRESOURCESREQUIRED='' FILTERRES='' FILTERUNITS='' GLYPHREF='' GRADIENTTRANSFORM='' GRADIENTUNITS='' KERNELMATRIX='' KERNELUNITLENGTH='' KEYPOINTS='' KEYSPLINES='' KEYTIMES='' LENGTHADJUST='' LIMITINGCONEANGLE='' MARKERHEIGHT='' MARKERUNITS='' MARKERWIDTH='' MASKCONTENTUNITS='' MASKUNITS='' NUMOCTAVES='' PATHLENGTH='' PATTERNCONTENTUNITS='' PATTERNTRANSFORM='' PATTERNUNITS='' POINTSATX='' POINTSATY='' POINTSATZ='' PRESERVEALPHA='' PRESERVEASPECTRATIO='' PRIMITIVEUNITS='' REFX='' REFY='' REPEATCOUNT='' REPEATDUR='' REQUIREDEXTENSIONS='' REQUIREDFEATURES='' SPECULARCONSTANT='' SPECULAREXPONENT='' SPREADMETHOD='' STARTOFFSET='' STDDEVIATION='' STITCHTILES='' SURFACESCALE='' SYSTEMLANGUAGE='' TABLEVALUES='' TARGETX='' TARGETY='' TEXTLENGTH='' VIEWBOX='' VIEWTARGET='' XCHANNELSELECTOR='' YCHANNELSELECTOR='' ZOOMANDPAN=''></SVG>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       attributeName=""
-|       attributeType=""
-|       baseFrequency=""
-|       baseProfile=""
-|       calcMode=""
-|       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
-|       diffuseConstant=""
-|       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
-|       filterUnits=""
-|       glyphRef=""
-|       gradientTransform=""
-|       gradientUnits=""
-|       kernelMatrix=""
-|       kernelUnitLength=""
-|       keyPoints=""
-|       keySplines=""
-|       keyTimes=""
-|       lengthAdjust=""
-|       limitingConeAngle=""
-|       markerHeight=""
-|       markerUnits=""
-|       markerWidth=""
-|       maskContentUnits=""
-|       maskUnits=""
-|       numOctaves=""
-|       pathLength=""
-|       patternContentUnits=""
-|       patternTransform=""
-|       patternUnits=""
-|       pointsAtX=""
-|       pointsAtY=""
-|       pointsAtZ=""
-|       preserveAlpha=""
-|       preserveAspectRatio=""
-|       primitiveUnits=""
-|       refX=""
-|       refY=""
-|       repeatCount=""
-|       repeatDur=""
-|       requiredExtensions=""
-|       requiredFeatures=""
-|       specularConstant=""
-|       specularExponent=""
-|       spreadMethod=""
-|       startOffset=""
-|       stdDeviation=""
-|       stitchTiles=""
-|       surfaceScale=""
-|       systemLanguage=""
-|       tableValues=""
-|       targetX=""
-|       targetY=""
-|       textLength=""
-|       viewBox=""
-|       viewTarget=""
-|       xChannelSelector=""
-|       yChannelSelector=""
-|       zoomAndPan=""
-
-#data
-<!DOCTYPE html><body><svg attributename='' attributetype='' basefrequency='' baseprofile='' calcmode='' clippathunits='' contentscripttype='' contentstyletype='' diffuseconstant='' edgemode='' externalresourcesrequired='' filterres='' filterunits='' glyphref='' gradienttransform='' gradientunits='' kernelmatrix='' kernelunitlength='' keypoints='' keysplines='' keytimes='' lengthadjust='' limitingconeangle='' markerheight='' markerunits='' markerwidth='' maskcontentunits='' maskunits='' numoctaves='' pathlength='' patterncontentunits='' patterntransform='' patternunits='' pointsatx='' pointsaty='' pointsatz='' preservealpha='' preserveaspectratio='' primitiveunits='' refx='' refy='' repeatcount='' repeatdur='' requiredextensions='' requiredfeatures='' specularconstant='' specularexponent='' spreadmethod='' startoffset='' stddeviation='' stitchtiles='' surfacescale='' systemlanguage='' tablevalues='' targetx='' targety='' textlength='' viewbox='' viewtarget='' xchannelselector='' ychannelselector='' zoomandpan=''></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       attributeName=""
-|       attributeType=""
-|       baseFrequency=""
-|       baseProfile=""
-|       calcMode=""
-|       clipPathUnits=""
-|       contentScriptType=""
-|       contentStyleType=""
-|       diffuseConstant=""
-|       edgeMode=""
-|       externalResourcesRequired=""
-|       filterRes=""
-|       filterUnits=""
-|       glyphRef=""
-|       gradientTransform=""
-|       gradientUnits=""
-|       kernelMatrix=""
-|       kernelUnitLength=""
-|       keyPoints=""
-|       keySplines=""
-|       keyTimes=""
-|       lengthAdjust=""
-|       limitingConeAngle=""
-|       markerHeight=""
-|       markerUnits=""
-|       markerWidth=""
-|       maskContentUnits=""
-|       maskUnits=""
-|       numOctaves=""
-|       pathLength=""
-|       patternContentUnits=""
-|       patternTransform=""
-|       patternUnits=""
-|       pointsAtX=""
-|       pointsAtY=""
-|       pointsAtZ=""
-|       preserveAlpha=""
-|       preserveAspectRatio=""
-|       primitiveUnits=""
-|       refX=""
-|       refY=""
-|       repeatCount=""
-|       repeatDur=""
-|       requiredExtensions=""
-|       requiredFeatures=""
-|       specularConstant=""
-|       specularExponent=""
-|       spreadMethod=""
-|       startOffset=""
-|       stdDeviation=""
-|       stitchTiles=""
-|       surfaceScale=""
-|       systemLanguage=""
-|       tableValues=""
-|       targetX=""
-|       targetY=""
-|       textLength=""
-|       viewBox=""
-|       viewTarget=""
-|       xChannelSelector=""
-|       yChannelSelector=""
-|       zoomAndPan=""
-
-#data
-<!DOCTYPE html><body><math attributeName='' attributeType='' baseFrequency='' baseProfile='' calcMode='' clipPathUnits='' contentScriptType='' contentStyleType='' diffuseConstant='' edgeMode='' externalResourcesRequired='' filterRes='' filterUnits='' glyphRef='' gradientTransform='' gradientUnits='' kernelMatrix='' kernelUnitLength='' keyPoints='' keySplines='' keyTimes='' lengthAdjust='' limitingConeAngle='' markerHeight='' markerUnits='' markerWidth='' maskContentUnits='' maskUnits='' numOctaves='' pathLength='' patternContentUnits='' patternTransform='' patternUnits='' pointsAtX='' pointsAtY='' pointsAtZ='' preserveAlpha='' preserveAspectRatio='' primitiveUnits='' refX='' refY='' repeatCount='' repeatDur='' requiredExtensions='' requiredFeatures='' specularConstant='' specularExponent='' spreadMethod='' startOffset='' stdDeviation='' stitchTiles='' surfaceScale='' systemLanguage='' tableValues='' targetX='' targetY='' textLength='' viewBox='' viewTarget='' xChannelSelector='' yChannelSelector='' zoomAndPan=''></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       attributename=""
-|       attributetype=""
-|       basefrequency=""
-|       baseprofile=""
-|       calcmode=""
-|       clippathunits=""
-|       contentscripttype=""
-|       contentstyletype=""
-|       diffuseconstant=""
-|       edgemode=""
-|       externalresourcesrequired=""
-|       filterres=""
-|       filterunits=""
-|       glyphref=""
-|       gradienttransform=""
-|       gradientunits=""
-|       kernelmatrix=""
-|       kernelunitlength=""
-|       keypoints=""
-|       keysplines=""
-|       keytimes=""
-|       lengthadjust=""
-|       limitingconeangle=""
-|       markerheight=""
-|       markerunits=""
-|       markerwidth=""
-|       maskcontentunits=""
-|       maskunits=""
-|       numoctaves=""
-|       pathlength=""
-|       patterncontentunits=""
-|       patterntransform=""
-|       patternunits=""
-|       pointsatx=""
-|       pointsaty=""
-|       pointsatz=""
-|       preservealpha=""
-|       preserveaspectratio=""
-|       primitiveunits=""
-|       refx=""
-|       refy=""
-|       repeatcount=""
-|       repeatdur=""
-|       requiredextensions=""
-|       requiredfeatures=""
-|       specularconstant=""
-|       specularexponent=""
-|       spreadmethod=""
-|       startoffset=""
-|       stddeviation=""
-|       stitchtiles=""
-|       surfacescale=""
-|       systemlanguage=""
-|       tablevalues=""
-|       targetx=""
-|       targety=""
-|       textlength=""
-|       viewbox=""
-|       viewtarget=""
-|       xchannelselector=""
-|       ychannelselector=""
-|       zoomandpan=""
-
-#data
-<!DOCTYPE html><body><svg><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg altGlyph>
-|       <svg altGlyphDef>
-|       <svg altGlyphItem>
-|       <svg animateColor>
-|       <svg animateMotion>
-|       <svg animateTransform>
-|       <svg clipPath>
-|       <svg feBlend>
-|       <svg feColorMatrix>
-|       <svg feComponentTransfer>
-|       <svg feComposite>
-|       <svg feConvolveMatrix>
-|       <svg feDiffuseLighting>
-|       <svg feDisplacementMap>
-|       <svg feDistantLight>
-|       <svg feFlood>
-|       <svg feFuncA>
-|       <svg feFuncB>
-|       <svg feFuncG>
-|       <svg feFuncR>
-|       <svg feGaussianBlur>
-|       <svg feImage>
-|       <svg feMerge>
-|       <svg feMergeNode>
-|       <svg feMorphology>
-|       <svg feOffset>
-|       <svg fePointLight>
-|       <svg feSpecularLighting>
-|       <svg feSpotLight>
-|       <svg feTile>
-|       <svg feTurbulence>
-|       <svg foreignObject>
-|       <svg glyphRef>
-|       <svg linearGradient>
-|       <svg radialGradient>
-|       <svg textPath>
-
-#data
-<!DOCTYPE html><body><svg><altglyph /><altglyphdef /><altglyphitem /><animatecolor /><animatemotion /><animatetransform /><clippath /><feblend /><fecolormatrix /><fecomponenttransfer /><fecomposite /><feconvolvematrix /><fediffuselighting /><fedisplacementmap /><fedistantlight /><feflood /><fefunca /><fefuncb /><fefuncg /><fefuncr /><fegaussianblur /><feimage /><femerge /><femergenode /><femorphology /><feoffset /><fepointlight /><fespecularlighting /><fespotlight /><fetile /><feturbulence /><foreignobject /><glyphref /><lineargradient /><radialgradient /><textpath /></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg altGlyph>
-|       <svg altGlyphDef>
-|       <svg altGlyphItem>
-|       <svg animateColor>
-|       <svg animateMotion>
-|       <svg animateTransform>
-|       <svg clipPath>
-|       <svg feBlend>
-|       <svg feColorMatrix>
-|       <svg feComponentTransfer>
-|       <svg feComposite>
-|       <svg feConvolveMatrix>
-|       <svg feDiffuseLighting>
-|       <svg feDisplacementMap>
-|       <svg feDistantLight>
-|       <svg feFlood>
-|       <svg feFuncA>
-|       <svg feFuncB>
-|       <svg feFuncG>
-|       <svg feFuncR>
-|       <svg feGaussianBlur>
-|       <svg feImage>
-|       <svg feMerge>
-|       <svg feMergeNode>
-|       <svg feMorphology>
-|       <svg feOffset>
-|       <svg fePointLight>
-|       <svg feSpecularLighting>
-|       <svg feSpotLight>
-|       <svg feTile>
-|       <svg feTurbulence>
-|       <svg foreignObject>
-|       <svg glyphRef>
-|       <svg linearGradient>
-|       <svg radialGradient>
-|       <svg textPath>
-
-#data
-<!DOCTYPE html><BODY><SVG><ALTGLYPH /><ALTGLYPHDEF /><ALTGLYPHITEM /><ANIMATECOLOR /><ANIMATEMOTION /><ANIMATETRANSFORM /><CLIPPATH /><FEBLEND /><FECOLORMATRIX /><FECOMPONENTTRANSFER /><FECOMPOSITE /><FECONVOLVEMATRIX /><FEDIFFUSELIGHTING /><FEDISPLACEMENTMAP /><FEDISTANTLIGHT /><FEFLOOD /><FEFUNCA /><FEFUNCB /><FEFUNCG /><FEFUNCR /><FEGAUSSIANBLUR /><FEIMAGE /><FEMERGE /><FEMERGENODE /><FEMORPHOLOGY /><FEOFFSET /><FEPOINTLIGHT /><FESPECULARLIGHTING /><FESPOTLIGHT /><FETILE /><FETURBULENCE /><FOREIGNOBJECT /><GLYPHREF /><LINEARGRADIENT /><RADIALGRADIENT /><TEXTPATH /></SVG>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg altGlyph>
-|       <svg altGlyphDef>
-|       <svg altGlyphItem>
-|       <svg animateColor>
-|       <svg animateMotion>
-|       <svg animateTransform>
-|       <svg clipPath>
-|       <svg feBlend>
-|       <svg feColorMatrix>
-|       <svg feComponentTransfer>
-|       <svg feComposite>
-|       <svg feConvolveMatrix>
-|       <svg feDiffuseLighting>
-|       <svg feDisplacementMap>
-|       <svg feDistantLight>
-|       <svg feFlood>
-|       <svg feFuncA>
-|       <svg feFuncB>
-|       <svg feFuncG>
-|       <svg feFuncR>
-|       <svg feGaussianBlur>
-|       <svg feImage>
-|       <svg feMerge>
-|       <svg feMergeNode>
-|       <svg feMorphology>
-|       <svg feOffset>
-|       <svg fePointLight>
-|       <svg feSpecularLighting>
-|       <svg feSpotLight>
-|       <svg feTile>
-|       <svg feTurbulence>
-|       <svg foreignObject>
-|       <svg glyphRef>
-|       <svg linearGradient>
-|       <svg radialGradient>
-|       <svg textPath>
-
-#data
-<!DOCTYPE html><body><math><altGlyph /><altGlyphDef /><altGlyphItem /><animateColor /><animateMotion /><animateTransform /><clipPath /><feBlend /><feColorMatrix /><feComponentTransfer /><feComposite /><feConvolveMatrix /><feDiffuseLighting /><feDisplacementMap /><feDistantLight /><feFlood /><feFuncA /><feFuncB /><feFuncG /><feFuncR /><feGaussianBlur /><feImage /><feMerge /><feMergeNode /><feMorphology /><feOffset /><fePointLight /><feSpecularLighting /><feSpotLight /><feTile /><feTurbulence /><foreignObject /><glyphRef /><linearGradient /><radialGradient /><textPath /></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math altglyph>
-|       <math altglyphdef>
-|       <math altglyphitem>
-|       <math animatecolor>
-|       <math animatemotion>
-|       <math animatetransform>
-|       <math clippath>
-|       <math feblend>
-|       <math fecolormatrix>
-|       <math fecomponenttransfer>
-|       <math fecomposite>
-|       <math feconvolvematrix>
-|       <math fediffuselighting>
-|       <math fedisplacementmap>
-|       <math fedistantlight>
-|       <math feflood>
-|       <math fefunca>
-|       <math fefuncb>
-|       <math fefuncg>
-|       <math fefuncr>
-|       <math fegaussianblur>
-|       <math feimage>
-|       <math femerge>
-|       <math femergenode>
-|       <math femorphology>
-|       <math feoffset>
-|       <math fepointlight>
-|       <math fespecularlighting>
-|       <math fespotlight>
-|       <math fetile>
-|       <math feturbulence>
-|       <math foreignobject>
-|       <math glyphref>
-|       <math lineargradient>
-|       <math radialgradient>
-|       <math textpath>
-
-#data
-<!DOCTYPE html><body><svg><solidColor /></svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg solidcolor>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests12.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests12.dat
deleted file mode 100644
index 63107d277b..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests12.dat
+++ /dev/null
@@ -1,62 +0,0 @@
-#data
-<!DOCTYPE html><body><p>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "foo"
-|       <math math>
-|         <math mtext>
-|           <i>
-|             "baz"
-|         <math annotation-xml>
-|           <svg svg>
-|             <svg desc>
-|               <b>
-|                 "eggs"
-|             <svg g>
-|               <svg foreignObject>
-|                 <p>
-|                   "spam"
-|                 <table>
-|                   <tbody>
-|                     <tr>
-|                       <td>
-|                         <img>
-|             <svg g>
-|               "quux"
-|       "bar"
-
-#data
-<!DOCTYPE html><body>foo<math><mtext><i>baz</i></mtext><annotation-xml><svg><desc><b>eggs</b></desc><g><foreignObject><P>spam<TABLE><tr><td><img></td></table></foreignObject></g><g>quux</g></svg></annotation-xml></math>bar
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "foo"
-|     <math math>
-|       <math mtext>
-|         <i>
-|           "baz"
-|       <math annotation-xml>
-|         <svg svg>
-|           <svg desc>
-|             <b>
-|               "eggs"
-|           <svg g>
-|             <svg foreignObject>
-|               <p>
-|                 "spam"
-|               <table>
-|                 <tbody>
-|                   <tr>
-|                     <td>
-|                       <img>
-|           <svg g>
-|             "quux"
-|     "bar"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests14.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests14.dat
deleted file mode 100644
index b8713f8858..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests14.dat
+++ /dev/null
@@ -1,74 +0,0 @@
-#data
-<!DOCTYPE html><html><body><xyz:abc></xyz:abc>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <xyz:abc>
-
-#data
-<!DOCTYPE html><html><body><xyz:abc></xyz:abc><span></span>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <xyz:abc>
-|     <span>
-
-#data
-<!DOCTYPE html><html><html abc:def=gh><xyz:abc></xyz:abc>
-#errors
-15: Unexpected start tag html
-#document
-| <!DOCTYPE html>
-| <html>
-|   abc:def="gh"
-|   <head>
-|   <body>
-|     <xyz:abc>
-
-#data
-<!DOCTYPE html><html xml:lang=bar><html xml:lang=foo>
-#errors
-15: Unexpected start tag html
-#document
-| <!DOCTYPE html>
-| <html>
-|   xml:lang="bar"
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><html 123=456>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   123="456"
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><html 123=456><html 789=012>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   123="456"
-|   789="012"
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><html><body 789=012>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     789="012"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests15.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests15.dat
deleted file mode 100644
index 6ce1c0d166..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests15.dat
+++ /dev/null
@@ -1,208 +0,0 @@
-#data
-<!DOCTYPE html><p><b><i><u></p> <p>X
-#errors
-Line: 1 Col: 31 Unexpected end tag (p). Ignored.
-Line: 1 Col: 36 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|         <i>
-|           <u>
-|     <b>
-|       <i>
-|         <u>
-|           " "
-|           <p>
-|             "X"
-
-#data
-<p><b><i><u></p>
-<p>X
-#errors
-Line: 1 Col: 3 Unexpected start tag (p). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected end tag (p). Ignored.
-Line: 2 Col: 4 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|         <i>
-|           <u>
-|     <b>
-|       <i>
-|         <u>
-|           "
-"
-|           <p>
-|             "X"
-
-#data
-<!doctype html></html> <head>
-#errors
-Line: 1 Col: 22 Unexpected end tag (html) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " "
-
-#data
-<!doctype html></body><meta>
-#errors
-Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <meta>
-
-#data
-<html></html><!-- foo -->
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end tag (html) after the (implied) root element.
-#document
-| <html>
-|   <head>
-|   <body>
-| <!--  foo  -->
-
-#data
-<!doctype html></body><title>X</title>
-#errors
-Line: 1 Col: 22 Unexpected end tag (body) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <title>
-|       "X"
-
-#data
-<!doctype html><table> X<meta></table>
-#errors
-Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 30 Unexpected start tag (meta) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " X"
-|     <meta>
-|     <table>
-
-#data
-<!doctype html><table> x</table>
-#errors
-Line: 1 Col: 24 Unexpected non-space characters in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " x"
-|     <table>
-
-#data
-<!doctype html><table> x </table>
-#errors
-Line: 1 Col: 25 Unexpected non-space characters in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " x "
-|     <table>
-
-#data
-<!doctype html><table><tr> x</table>
-#errors
-Line: 1 Col: 28 Unexpected non-space characters in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " x"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><table>X<style> <tr>x </style> </table>
-#errors
-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     <table>
-|       <style>
-|         " <tr>x "
-|       " "
-
-#data
-<!doctype html><div><table><a>foo</a> <tr><td>bar</td> </tr></table></div>
-#errors
-Line: 1 Col: 30 Unexpected start tag (a) in table context caused voodoo mode.
-Line: 1 Col: 37 Unexpected end tag (a) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <a>
-|         "foo"
-|       <table>
-|         " "
-|         <tbody>
-|           <tr>
-|             <td>
-|               "bar"
-|             " "
-
-#data
-<frame></frame></frame><frameset><frame><frameset><frame></frameset><noframes></frameset><noframes>
-#errors
-6: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-13: Stray start tag “frame”.
-21: Stray end tag “frame”.
-29: Stray end tag “frame”.
-39: “frameset” start tag after “body” already open.
-105: End of file seen inside an [R]CDATA element.
-105: End of file seen and there were open elements.
-XXX: These errors are wrong, please fix me!
-#document
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-|     <frameset>
-|       <frame>
-|     <noframes>
-|       "</frameset><noframes>"
-
-#data
-<!DOCTYPE html><object></html>
-#errors
-1: Expected closing tag. Unexpected end of file
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <object>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests16.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests16.dat
deleted file mode 100644
index c8ef66f0e6..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests16.dat
+++ /dev/null
@@ -1,2299 +0,0 @@
-#data
-<!doctype html><script>
-#errors
-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<!doctype html><script>a
-#errors
-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "a"
-|   <body>
-
-#data
-<!doctype html><script><
-#errors
-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<"
-|   <body>
-
-#data
-<!doctype html><script></
-#errors
-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</"
-|   <body>
-
-#data
-<!doctype html><script></S
-#errors
-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</S"
-|   <body>
-
-#data
-<!doctype html><script></SC
-#errors
-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</SC"
-|   <body>
-
-#data
-<!doctype html><script></SCR
-#errors
-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</SCR"
-|   <body>
-
-#data
-<!doctype html><script></SCRI
-#errors
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</SCRI"
-|   <body>
-
-#data
-<!doctype html><script></SCRIP
-#errors
-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</SCRIP"
-|   <body>
-
-#data
-<!doctype html><script></SCRIPT
-#errors
-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</SCRIPT"
-|   <body>
-
-#data
-<!doctype html><script></SCRIPT 
-#errors
-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<!doctype html><script></s
-#errors
-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</s"
-|   <body>
-
-#data
-<!doctype html><script></sc
-#errors
-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</sc"
-|   <body>
-
-#data
-<!doctype html><script></scr
-#errors
-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</scr"
-|   <body>
-
-#data
-<!doctype html><script></scri
-#errors
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</scri"
-|   <body>
-
-#data
-<!doctype html><script></scrip
-#errors
-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</scrip"
-|   <body>
-
-#data
-<!doctype html><script></script
-#errors
-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "</script"
-|   <body>
-
-#data
-<!doctype html><script></script 
-#errors
-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<!doctype html><script><!
-#errors
-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!"
-|   <body>
-
-#data
-<!doctype html><script><!a
-#errors
-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!a"
-|   <body>
-
-#data
-<!doctype html><script><!-
-#errors
-Line: 1 Col: 26 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!-"
-|   <body>
-
-#data
-<!doctype html><script><!-a
-#errors
-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!-a"
-|   <body>
-
-#data
-<!doctype html><script><!--
-#errors
-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--"
-|   <body>
-
-#data
-<!doctype html><script><!--a
-#errors
-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--a"
-|   <body>
-
-#data
-<!doctype html><script><!--<
-#errors
-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<"
-|   <body>
-
-#data
-<!doctype html><script><!--<a
-#errors
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<a"
-|   <body>
-
-#data
-<!doctype html><script><!--</
-#errors
-Line: 1 Col: 27 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--</"
-|   <body>
-
-#data
-<!doctype html><script><!--</script
-#errors
-Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--</script"
-|   <body>
-
-#data
-<!doctype html><script><!--</script 
-#errors
-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--"
-|   <body>
-
-#data
-<!doctype html><script><!--<s
-#errors
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<s"
-|   <body>
-
-#data
-<!doctype html><script><!--<script
-#errors
-Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script"
-|   <body>
-
-#data
-<!doctype html><script><!--<script 
-#errors
-Line: 1 Col: 35 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script "
-|   <body>
-
-#data
-<!doctype html><script><!--<script <
-#errors
-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script <"
-|   <body>
-
-#data
-<!doctype html><script><!--<script <a
-#errors
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script <a"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </
-#errors
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </s
-#errors
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </s"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script
-#errors
-Line: 1 Col: 43 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </scripta
-#errors
-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </scripta"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script 
-#errors
-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script>
-#errors
-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script>"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script/
-#errors
-Line: 1 Col: 44 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script/"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script <
-#errors
-Line: 1 Col: 45 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script <"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script <a
-#errors
-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script <a"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script </
-#errors
-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script </"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script </script
-#errors
-Line: 1 Col: 52 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script </script"
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script </script 
-#errors
-Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script </script/
-#errors
-Line: 1 Col: 53 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<!doctype html><script><!--<script </script </script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<!doctype html><script><!--<script -
-#errors
-Line: 1 Col: 36 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -"
-|   <body>
-
-#data
-<!doctype html><script><!--<script -a
-#errors
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -a"
-|   <body>
-
-#data
-<!doctype html><script><!--<script -<
-#errors
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -<"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --
-#errors
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --a
-#errors
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --a"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --<
-#errors
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --<"
-|   <body>
-
-#data
-<!doctype html><script><!--<script -->
-#errors
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --><
-#errors
-Line: 1 Col: 39 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --><"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --></
-#errors
-Line: 1 Col: 40 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --></"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --></script
-#errors
-Line: 1 Col: 46 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --></script"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --></script 
-#errors
-Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --></script/
-#errors
-Line: 1 Col: 47 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script --></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script><\/script>--></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script><\/script>-->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></scr'+'ipt>--></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></scr'+'ipt>-->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script>--><!--</script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>--><!--"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script>-- ></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>-- >"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script>- -></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>- ->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script>- - ></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>- - >"
-|   <body>
-
-#data
-<!doctype html><script><!--<script></script><script></script>-></script>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>->"
-|   <body>
-
-#data
-<!doctype html><script><!--<script>--!></script>X
-#errors
-Line: 1 Col: 49 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script>--!></script>X"
-|   <body>
-
-#data
-<!doctype html><script><!--<scr'+'ipt></script>--></script>
-#errors
-Line: 1 Col: 59 Unexpected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<scr'+'ipt>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><script><!--<script></scr'+'ipt></script>X
-#errors
-Line: 1 Col: 57 Unexpected end of file. Expected end tag (script).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></scr'+'ipt></script>X"
-|   <body>
-
-#data
-<!doctype html><style><!--<style></style>--></style>
-#errors
-Line: 1 Col: 52 Unexpected end tag (style).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--<style>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><style><!--</style>X
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--"
-|   <body>
-|     "X"
-
-#data
-<!doctype html><style><!--...</style>...--></style>
-#errors
-Line: 1 Col: 51 Unexpected end tag (style).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--..."
-|   <body>
-|     "...-->"
-
-#data
-<!doctype html><style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
-|   <body>
-|     "X"
-
-#data
-<!doctype html><style><!--...<style><!--...--!></style>--></style>
-#errors
-Line: 1 Col: 66 Unexpected end tag (style).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--...<style><!--...--!>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><style><!--...</style><!-- --><style>@import ...</style>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "<!--..."
-|     <!--   -->
-|     <style>
-|       "@import ..."
-|   <body>
-
-#data
-<!doctype html><style>...<style><!--...</style><!-- --></style>
-#errors
-Line: 1 Col: 63 Unexpected end tag (style).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "...<style><!--..."
-|     <!--   -->
-|   <body>
-
-#data
-<!doctype html><style>...<!--[if IE]><style>...</style>X
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <style>
-|       "...<!--[if IE]><style>..."
-|   <body>
-|     "X"
-
-#data
-<!doctype html><title><!--<title></title>--></title>
-#errors
-Line: 1 Col: 52 Unexpected end tag (title).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "<!--<title>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><title>&lt;/title></title>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "</title>"
-|   <body>
-
-#data
-<!doctype html><title>foo/title><link></head><body>X
-#errors
-Line: 1 Col: 52 Unexpected end of file. Expected end tag (title).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "foo/title><link></head><body>X"
-|   <body>
-
-#data
-<!doctype html><noscript><!--<noscript></noscript>--></noscript>
-#errors
-Line: 1 Col: 64 Unexpected end tag (noscript).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <noscript>
-|       "<!--<noscript>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><noscript><!--</noscript>X<noscript>--></noscript>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <noscript>
-|       "<!--"
-|   <body>
-|     "X"
-|     <noscript>
-|       "-->"
-
-#data
-<!doctype html><noscript><iframe></noscript>X
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <noscript>
-|       "<iframe>"
-|   <body>
-|     "X"
-
-#data
-<!doctype html><noframes><!--<noframes></noframes>--></noframes>
-#errors
-Line: 1 Col: 64 Unexpected end tag (noframes).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <noframes>
-|       "<!--<noframes>"
-|   <body>
-|     "-->"
-
-#data
-<!doctype html><noframes><body><script><!--...</script></body></noframes></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <noframes>
-|       "<body><script><!--...</script></body>"
-|   <body>
-
-#data
-<!doctype html><textarea><!--<textarea></textarea>--></textarea>
-#errors
-Line: 1 Col: 64 Unexpected end tag (textarea).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<!--<textarea>"
-|     "-->"
-
-#data
-<!doctype html><textarea>&lt;/textarea></textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "</textarea>"
-
-#data
-<!doctype html><textarea>&lt;</textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<"
-
-#data
-<!doctype html><textarea>a&lt;b</textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "a<b"
-
-#data
-<!doctype html><iframe><!--<iframe></iframe>--></iframe>
-#errors
-Line: 1 Col: 56 Unexpected end tag (iframe).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       "<!--<iframe>"
-|     "-->"
-
-#data
-<!doctype html><iframe>...<!--X->...<!--/X->...</iframe>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       "...<!--X->...<!--/X->..."
-
-#data
-<!doctype html><xmp><!--<xmp></xmp>--></xmp>
-#errors
-Line: 1 Col: 44 Unexpected end tag (xmp).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <xmp>
-|       "<!--<xmp>"
-|     "-->"
-
-#data
-<!doctype html><noembed><!--<noembed></noembed>--></noembed>
-#errors
-Line: 1 Col: 60 Unexpected end tag (noembed).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <noembed>
-|       "<!--<noembed>"
-|     "-->"
-
-#data
-<script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 8 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<script>a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "a"
-|   <body>
-
-#data
-<script><
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 9 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<"
-|   <body>
-
-#data
-<script></
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</"
-|   <body>
-
-#data
-<script></S
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</S"
-|   <body>
-
-#data
-<script></SC
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</SC"
-|   <body>
-
-#data
-<script></SCR
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</SCR"
-|   <body>
-
-#data
-<script></SCRI
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</SCRI"
-|   <body>
-
-#data
-<script></SCRIP
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</SCRIP"
-|   <body>
-
-#data
-<script></SCRIPT
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</SCRIPT"
-|   <body>
-
-#data
-<script></SCRIPT 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<script></s
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</s"
-|   <body>
-
-#data
-<script></sc
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</sc"
-|   <body>
-
-#data
-<script></scr
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</scr"
-|   <body>
-
-#data
-<script></scri
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</scri"
-|   <body>
-
-#data
-<script></scrip
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 15 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</scrip"
-|   <body>
-
-#data
-<script></script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</script"
-|   <body>
-
-#data
-<script></script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 17 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<script><!
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 10 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!"
-|   <body>
-
-#data
-<script><!a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!a"
-|   <body>
-
-#data
-<script><!-
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!-"
-|   <body>
-
-#data
-<script><!-a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!-a"
-|   <body>
-
-#data
-<script><!--
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--"
-|   <body>
-
-#data
-<script><!--a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--a"
-|   <body>
-
-#data
-<script><!--<
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<"
-|   <body>
-
-#data
-<script><!--<a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<a"
-|   <body>
-
-#data
-<script><!--</
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--</"
-|   <body>
-
-#data
-<script><!--</script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--</script"
-|   <body>
-
-#data
-<script><!--</script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--"
-|   <body>
-
-#data
-<script><!--<s
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<s"
-|   <body>
-
-#data
-<script><!--<script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 19 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script"
-|   <body>
-
-#data
-<script><!--<script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script "
-|   <body>
-
-#data
-<script><!--<script <
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script <"
-|   <body>
-
-#data
-<script><!--<script <a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script <a"
-|   <body>
-
-#data
-<script><!--<script </
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </"
-|   <body>
-
-#data
-<script><!--<script </s
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </s"
-|   <body>
-
-#data
-<script><!--<script </script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 28 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script"
-|   <body>
-
-#data
-<script><!--<script </scripta
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </scripta"
-|   <body>
-
-#data
-<script><!--<script </script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<script><!--<script </script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script>"
-|   <body>
-
-#data
-<script><!--<script </script/
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 29 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script/"
-|   <body>
-
-#data
-<script><!--<script </script <
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 30 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script <"
-|   <body>
-
-#data
-<script><!--<script </script <a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script <a"
-|   <body>
-
-#data
-<script><!--<script </script </
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script </"
-|   <body>
-
-#data
-<script><!--<script </script </script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script </script"
-|   <body>
-
-#data
-<script><!--<script </script </script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<script><!--<script </script </script/
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 38 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<script><!--<script </script </script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script </script "
-|   <body>
-
-#data
-<script><!--<script -
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 21 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -"
-|   <body>
-
-#data
-<script><!--<script -a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -a"
-|   <body>
-
-#data
-<script><!--<script --
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --"
-|   <body>
-
-#data
-<script><!--<script --a
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --a"
-|   <body>
-
-#data
-<script><!--<script -->
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<script><!--<script --><
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 24 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --><"
-|   <body>
-
-#data
-<script><!--<script --></
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 25 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --></"
-|   <body>
-
-#data
-<script><!--<script --></script
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 31 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script --></script"
-|   <body>
-
-#data
-<script><!--<script --></script 
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<script><!--<script --></script/
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 32 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<script><!--<script --></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script -->"
-|   <body>
-
-#data
-<script><!--<script><\/script>--></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script><\/script>-->"
-|   <body>
-
-#data
-<script><!--<script></scr'+'ipt>--></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></scr'+'ipt>-->"
-|   <body>
-
-#data
-<script><!--<script></script><script></script></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>"
-|   <body>
-
-#data
-<script><!--<script></script><script></script>--><!--</script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>--><!--"
-|   <body>
-
-#data
-<script><!--<script></script><script></script>-- ></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>-- >"
-|   <body>
-
-#data
-<script><!--<script></script><script></script>- -></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>- ->"
-|   <body>
-
-#data
-<script><!--<script></script><script></script>- - ></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>- - >"
-|   <body>
-
-#data
-<script><!--<script></script><script></script>-></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></script><script></script>->"
-|   <body>
-
-#data
-<script><!--<script>--!></script>X
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 34 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script>--!></script>X"
-|   <body>
-
-#data
-<script><!--<scr'+'ipt></script>--></script>
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 44 Unexpected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<scr'+'ipt>"
-|   <body>
-|     "-->"
-
-#data
-<script><!--<script></scr'+'ipt></script>X
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 42 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "<!--<script></scr'+'ipt></script>X"
-|   <body>
-
-#data
-<style><!--<style></style>--></style>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 37 Unexpected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--<style>"
-|   <body>
-|     "-->"
-
-#data
-<style><!--</style>X
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--"
-|   <body>
-|     "X"
-
-#data
-<style><!--...</style>...--></style>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 36 Unexpected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--..."
-|   <body>
-|     "...-->"
-
-#data
-<style><!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style></style>X
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--<br><html xmlns:v="urn:schemas-microsoft-com:vml"><!--[if !mso]><style>"
-|   <body>
-|     "X"
-
-#data
-<style><!--...<style><!--...--!></style>--></style>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 51 Unexpected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--...<style><!--...--!>"
-|   <body>
-|     "-->"
-
-#data
-<style><!--...</style><!-- --><style>@import ...</style>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       "<!--..."
-|     <!--   -->
-|     <style>
-|       "@import ..."
-|   <body>
-
-#data
-<style>...<style><!--...</style><!-- --></style>
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 48 Unexpected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       "...<style><!--..."
-|     <!--   -->
-|   <body>
-
-#data
-<style>...<!--[if IE]><style>...</style>X
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       "...<!--[if IE]><style>..."
-|   <body>
-|     "X"
-
-#data
-<title><!--<title></title>--></title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-Line: 1 Col: 37 Unexpected end tag (title).
-#document
-| <html>
-|   <head>
-|     <title>
-|       "<!--<title>"
-|   <body>
-|     "-->"
-
-#data
-<title>&lt;/title></title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|       "</title>"
-|   <body>
-
-#data
-<title>foo/title><link></head><body>X
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-Line: 1 Col: 37 Unexpected end of file. Expected end tag (title).
-#document
-| <html>
-|   <head>
-|     <title>
-|       "foo/title><link></head><body>X"
-|   <body>
-
-#data
-<noscript><!--<noscript></noscript>--></noscript>
-#errors
-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
-Line: 1 Col: 49 Unexpected end tag (noscript).
-#document
-| <html>
-|   <head>
-|     <noscript>
-|       "<!--<noscript>"
-|   <body>
-|     "-->"
-
-#data
-<noscript><!--</noscript>X<noscript>--></noscript>
-#errors
-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <noscript>
-|       "<!--"
-|   <body>
-|     "X"
-|     <noscript>
-|       "-->"
-
-#data
-<noscript><iframe></noscript>X
-#errors
-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <noscript>
-|       "<iframe>"
-|   <body>
-|     "X"
-
-#data
-<noframes><!--<noframes></noframes>--></noframes>
-#errors
-Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
-Line: 1 Col: 49 Unexpected end tag (noframes).
-#document
-| <html>
-|   <head>
-|     <noframes>
-|       "<!--<noframes>"
-|   <body>
-|     "-->"
-
-#data
-<noframes><body><script><!--...</script></body></noframes></html>
-#errors
-Line: 1 Col: 10 Unexpected start tag (noframes). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <noframes>
-|       "<body><script><!--...</script></body>"
-|   <body>
-
-#data
-<textarea><!--<textarea></textarea>--></textarea>
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-Line: 1 Col: 49 Unexpected end tag (textarea).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "<!--<textarea>"
-|     "-->"
-
-#data
-<textarea>&lt;/textarea></textarea>
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "</textarea>"
-
-#data
-<iframe><!--<iframe></iframe>--></iframe>
-#errors
-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
-Line: 1 Col: 41 Unexpected end tag (iframe).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       "<!--<iframe>"
-|     "-->"
-
-#data
-<iframe>...<!--X->...<!--/X->...</iframe>
-#errors
-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       "...<!--X->...<!--/X->..."
-
-#data
-<xmp><!--<xmp></xmp>--></xmp>
-#errors
-Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
-Line: 1 Col: 29 Unexpected end tag (xmp).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <xmp>
-|       "<!--<xmp>"
-|     "-->"
-
-#data
-<noembed><!--<noembed></noembed>--></noembed>
-#errors
-Line: 1 Col: 9 Unexpected start tag (noembed). Expected DOCTYPE.
-Line: 1 Col: 45 Unexpected end tag (noembed).
-#document
-| <html>
-|   <head>
-|   <body>
-|     <noembed>
-|       "<!--<noembed>"
-|     "-->"
-
-#data
-<!doctype html><table>
-
-#errors
-Line 2 Col 0 Unexpected end of file. Expected table content.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       "
-"
-
-#data
-<!doctype html><table><td><span><font></span><span>
-#errors
-Line 1 Col 26 Unexpected table cell start tag (td) in the table body phase.
-Line 1 Col 45 Unexpected end tag (span).
-Line 1 Col 51 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <span>
-|               <font>
-|             <font>
-|               <span>
-
-#data
-<!doctype html><form><table></form><form></table></form>
-#errors
-35: Stray end tag “form”.
-41: Start tag “form” seen in “table”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <table>
-|         <form>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests17.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests17.dat
deleted file mode 100644
index 7b555f888d..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests17.dat
+++ /dev/null
@@ -1,153 +0,0 @@
-#data
-<!doctype html><table><tbody><select><tr>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><table><tr><select><td>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<!doctype html><table><tr><td><select><td>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|           <td>
-
-#data
-<!doctype html><table><tr><th><select><td>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <th>
-|             <select>
-|           <td>
-
-#data
-<!doctype html><table><caption><select><tr>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <select>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><select><tr>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><td>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><th>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><tbody>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><thead>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><tfoot>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><select><caption>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><table><tr></table>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|     "a"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests18.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests18.dat
deleted file mode 100644
index 680e1f068a..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests18.dat
+++ /dev/null
@@ -1,269 +0,0 @@
-#data
-<!doctype html><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-
-#data
-<!doctype html><table><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-|     <table>
-
-#data
-<!doctype html><table><tbody><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-|     <table>
-|       <tbody>
-
-#data
-<!doctype html><table><tbody><tr><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><table><tbody><tr><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><table><td><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <plaintext>
-|               "</plaintext>"
-
-#data
-<!doctype html><table><caption><plaintext></plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <plaintext>
-|           "</plaintext>"
-
-#data
-<!doctype html><table><tr><style></script></style>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "abc"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <style>
-|             "</script>"
-
-#data
-<!doctype html><table><tr><script></style></script>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "abc"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <script>
-|             "</style>"
-
-#data
-<!doctype html><table><caption><style></script></style>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <style>
-|           "</script>"
-|         "abc"
-
-#data
-<!doctype html><table><td><style></script></style>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <style>
-|               "</script>"
-|             "abc"
-
-#data
-<!doctype html><select><script></style></script>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <script>
-|         "</style>"
-|       "abc"
-
-#data
-<!doctype html><table><select><script></style></script>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <script>
-|         "</style>"
-|       "abc"
-|     <table>
-
-#data
-<!doctype html><table><tr><select><script></style></script>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <script>
-|         "</style>"
-|       "abc"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><frameset></frameset><noframes>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|   <noframes>
-|     "abc"
-
-#data
-<!doctype html><frameset></frameset><noframes>abc</noframes><!--abc-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|   <noframes>
-|     "abc"
-|   <!-- abc -->
-
-#data
-<!doctype html><frameset></frameset></html><noframes>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|   <noframes>
-|     "abc"
-
-#data
-<!doctype html><frameset></frameset></html><noframes>abc</noframes><!--abc-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|   <noframes>
-|     "abc"
-| <!-- abc -->
-
-#data
-<!doctype html><table><tr></tbody><tfoot>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|       <tfoot>
-
-#data
-<!doctype html><table><td><svg></svg>abc<td>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|             "abc"
-|           <td>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests19.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests19.dat
deleted file mode 100644
index 0d62f5a5b0..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests19.dat
+++ /dev/null
@@ -1,1237 +0,0 @@
-#data
-<!doctype html><math><mn DefinitionUrl="foo">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mn>
-|         definitionURL="foo"
-
-#data
-<!doctype html><html></p><!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <!-- foo -->
-|   <head>
-|   <body>
-
-#data
-<!doctype html><head></head></p><!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <!-- foo -->
-|   <body>
-
-#data
-<!doctype html><body><p><pre>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <pre>
-
-#data
-<!doctype html><body><p><listing>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <listing>
-
-#data
-<!doctype html><p><plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <plaintext>
-
-#data
-<!doctype html><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <h1>
-
-#data
-<!doctype html><form><isindex>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-
-#data
-<!doctype html><isindex action="POST">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       action="POST"
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
-
-#data
-<!doctype html><isindex prompt="this is isindex">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "this is isindex"
-|         <input>
-|           name="isindex"
-|       <hr>
-
-#data
-<!doctype html><isindex type="hidden">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|           type="hidden"
-|       <hr>
-
-#data
-<!doctype html><isindex name="foo">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|       <hr>
-
-#data
-<!doctype html><ruby><p><rp>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <p>
-|       <rp>
-
-#data
-<!doctype html><ruby><div><span><rp>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <span>
-|           <rp>
-
-#data
-<!doctype html><ruby><div><p><rp>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <p>
-|         <rp>
-
-#data
-<!doctype html><ruby><p><rt>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <p>
-|       <rt>
-
-#data
-<!doctype html><ruby><div><span><rt>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <span>
-|           <rt>
-
-#data
-<!doctype html><ruby><div><p><rt>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <p>
-|         <rt>
-
-#data
-<!doctype html><math/><foo>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|     <foo>
-
-#data
-<!doctype html><svg/><foo>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|     <foo>
-
-#data
-<!doctype html><div></body><!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|   <!-- foo -->
-
-#data
-<!doctype html><h1><div><h3><span></h1>foo
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <h1>
-|       <div>
-|         <h3>
-|           <span>
-|         "foo"
-
-#data
-<!doctype html><p></h3>foo
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "foo"
-
-#data
-<!doctype html><h3><li>abc</h2>foo
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <h3>
-|       <li>
-|         "abc"
-|     "foo"
-
-#data
-<!doctype html><table>abc<!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "abc"
-|     <table>
-|       <!-- foo -->
-
-#data
-<!doctype html><table>  <!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       "  "
-|       <!-- foo -->
-
-#data
-<!doctype html><table> b <!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     " b "
-|     <table>
-|       <!-- foo -->
-
-#data
-<!doctype html><select><option><option>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|       <option>
-
-#data
-<!doctype html><select><option></optgroup>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-
-#data
-<!doctype html><select><option></optgroup>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-
-#data
-<!doctype html><p><math><mi><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math mi>
-|           <p>
-|           <h1>
-
-#data
-<!doctype html><p><math><mo><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math mo>
-|           <p>
-|           <h1>
-
-#data
-<!doctype html><p><math><mn><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math mn>
-|           <p>
-|           <h1>
-
-#data
-<!doctype html><p><math><ms><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math ms>
-|           <p>
-|           <h1>
-
-#data
-<!doctype html><p><math><mtext><p><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math mtext>
-|           <p>
-|           <h1>
-
-#data
-<!doctype html><frameset></noframes>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><html c=d><body></html><html a=b>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   a="b"
-|   c="d"
-|   <head>
-|   <body>
-
-#data
-<!doctype html><html c=d><frameset></frameset></html><html a=b>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   a="b"
-|   c="d"
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><html><frameset></frameset></html><!--foo-->
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-| <!-- foo -->
-
-#data
-<!doctype html><html><frameset></frameset></html>  
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|   "  "
-
-#data
-<!doctype html><html><frameset></frameset></html>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><html><frameset></frameset></html><p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><html><frameset></frameset></html></p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<html><frameset></frameset></html><!doctype html>
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><body><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!doctype html><p><frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<!doctype html><p>a<frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "a"
-
-#data
-<!doctype html><p> <frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<!doctype html><pre><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-
-#data
-<!doctype html><listing><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <listing>
-
-#data
-<!doctype html><li><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <li>
-
-#data
-<!doctype html><dd><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <dd>
-
-#data
-<!doctype html><dt><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <dt>
-
-#data
-<!doctype html><button><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <button>
-
-#data
-<!doctype html><applet><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <applet>
-
-#data
-<!doctype html><marquee><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <marquee>
-
-#data
-<!doctype html><object><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <object>
-
-#data
-<!doctype html><table><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-
-#data
-<!doctype html><area><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <area>
-
-#data
-<!doctype html><basefont><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <basefont>
-|   <frameset>
-
-#data
-<!doctype html><bgsound><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <bgsound>
-|   <frameset>
-
-#data
-<!doctype html><br><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <br>
-
-#data
-<!doctype html><embed><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <embed>
-
-#data
-<!doctype html><img><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <img>
-
-#data
-<!doctype html><input><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <input>
-
-#data
-<!doctype html><keygen><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <keygen>
-
-#data
-<!doctype html><wbr><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <wbr>
-
-#data
-<!doctype html><hr><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <hr>
-
-#data
-<!doctype html><textarea></textarea><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-
-#data
-<!doctype html><xmp></xmp><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <xmp>
-
-#data
-<!doctype html><iframe></iframe><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-
-#data
-<!doctype html><select></select><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!doctype html><svg></svg><frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<!doctype html><math></math><frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<!doctype html><svg><foreignObject><div> <frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<!doctype html><svg>a</svg><frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "a"
-
-#data
-<!doctype html><svg> </svg><frameset><frame>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-|     <frame>
-
-#data
-<html>aaa<frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "aaa"
-
-#data
-<html> a <frameset></frameset>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "a "
-
-#data
-<!doctype html><div><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><div><body><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-
-#data
-<!doctype html><p><math></p>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|     "a"
-
-#data
-<!doctype html><p><math><mn><span></p>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <math math>
-|         <math mn>
-|           <span>
-|             <p>
-|             "a"
-
-#data
-<!doctype html><math></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-
-#data
-<!doctype html><meta charset="ascii">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <meta>
-|       charset="ascii"
-|   <body>
-
-#data
-<!doctype html><meta http-equiv="content-type" content="text/html;charset=ascii">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <meta>
-|       content="text/html;charset=ascii"
-|       http-equiv="content-type"
-|   <body>
-
-#data
-<!doctype html><head><!--aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa--><meta charset="utf8">
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <!-- aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa -->
-|     <meta>
-|       charset="utf8"
-|   <body>
-
-#data
-<!doctype html><html a=b><head></head><html c=d>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   a="b"
-|   c="d"
-|   <head>
-|   <body>
-
-#data
-<!doctype html><image/>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <img>
-
-#data
-<!doctype html>a<i>b<table>c<b>d</i>e</b>f
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "a"
-|     <i>
-|       "bc"
-|       <b>
-|         "de"
-|       "f"
-|       <table>
-
-#data
-<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "a"
-|       <b>
-|         "b"
-|     <b>
-|     <div>
-|       <b>
-|         <i>
-|           "c"
-|           <a>
-|             "d"
-|         <a>
-|           "e"
-|       <a>
-|         "f"
-|     <table>
-
-#data
-<!doctype html><i>a<b>b<div>c<a>d</i>e</b>f
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "a"
-|       <b>
-|         "b"
-|     <b>
-|     <div>
-|       <b>
-|         <i>
-|           "c"
-|           <a>
-|             "d"
-|         <a>
-|           "e"
-|       <a>
-|         "f"
-
-#data
-<!doctype html><table><i>a<b>b<div>c</i>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "a"
-|       <b>
-|         "b"
-|     <b>
-|       <div>
-|         <i>
-|           "c"
-|     <table>
-
-#data
-<!doctype html><table><i>a<b>b<div>c<a>d</i>e</b>f
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "a"
-|       <b>
-|         "b"
-|     <b>
-|     <div>
-|       <b>
-|         <i>
-|           "c"
-|           <a>
-|             "d"
-|         <a>
-|           "e"
-|       <a>
-|         "f"
-|     <table>
-
-#data
-<!doctype html><table><i>a<div>b<tr>c<b>d</i>e
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <i>
-|       "a"
-|       <div>
-|         "b"
-|     <i>
-|       "c"
-|       <b>
-|         "d"
-|     <b>
-|       "e"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><table><td><table><i>a<div>b<b>c</i>d
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <i>
-|               "a"
-|             <div>
-|               <i>
-|                 "b"
-|                 <b>
-|                   "c"
-|               <b>
-|                 "d"
-|             <table>
-
-#data
-<!doctype html><body><bgsound>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <bgsound>
-
-#data
-<!doctype html><body><basefont>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <basefont>
-
-#data
-<!doctype html><a><b></a><basefont>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|     <basefont>
-
-#data
-<!doctype html><a><b></a><bgsound>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|     <bgsound>
-
-#data
-<!doctype html><figcaption><article></figcaption>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <figcaption>
-|       <article>
-|     "a"
-
-#data
-<!doctype html><summary><article></summary>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <summary>
-|       <article>
-|     "a"
-
-#data
-<!doctype html><p><a><plaintext>b
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <a>
-|     <plaintext>
-|       <a>
-|         "b"
-
-#data
-<!DOCTYPE html><div>a<a></div>b<p>c</p>d
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "a"
-|       <a>
-|     <a>
-|       "b"
-|       <p>
-|         "c"
-|       "d"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests2.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests2.dat
deleted file mode 100644
index 60d8592216..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests2.dat
+++ /dev/null
@@ -1,763 +0,0 @@
-#data
-<!DOCTYPE html>Test
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "Test"
-
-#data
-<textarea>test</div>test
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-Line: 1 Col: 24 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "test</div>test"
-
-#data
-<table><td>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 11 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><td>test</tbody></table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected table cell start tag (td) in the table body phase.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "test"
-
-#data
-<frame>test
-#errors
-Line: 1 Col: 7 Unexpected start tag (frame). Expected DOCTYPE.
-Line: 1 Col: 7 Unexpected start tag frame. Ignored.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "test"
-
-#data
-<!DOCTYPE html><frameset>test
-#errors
-Line: 1 Col: 29 Unepxected characters in the frameset phase. Characters ignored.
-Line: 1 Col: 29 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><frameset><!DOCTYPE html>
-#errors
-Line: 1 Col: 40 Unexpected DOCTYPE. Ignored.
-Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><font><p><b>test</font>
-#errors
-Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 38 End tag (font) violates step 1, paragraph 3 of the adoption agency algorithm.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|     <p>
-|       <font>
-|         <b>
-|           "test"
-
-#data
-<!DOCTYPE html><dt><div><dd>
-#errors
-Line: 1 Col: 28 Missing end tag (div, dt).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <dt>
-|       <div>
-|     <dd>
-
-#data
-<script></x
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-Line: 1 Col: 11 Unexpected end of file. Expected end tag (script).
-#document
-| <html>
-|   <head>
-|     <script>
-|       "</x"
-|   <body>
-
-#data
-<table><plaintext><td>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 18 Unexpected start tag (plaintext) in table context caused voodoo mode.
-Line: 1 Col: 22 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "<td>"
-|     <table>
-
-#data
-<plaintext></plaintext>
-#errors
-Line: 1 Col: 11 Unexpected start tag (plaintext). Expected DOCTYPE.
-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <plaintext>
-|       "</plaintext>"
-
-#data
-<!DOCTYPE html><table><tr>TEST
-#errors
-Line: 1 Col: 30 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 30 Unexpected end of file. Expected table content.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "TEST"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!DOCTYPE html><body t1=1><body t2=2><body t3=3 t4=4>
-#errors
-Line: 1 Col: 37 Unexpected start tag (body).
-Line: 1 Col: 53 Unexpected start tag (body).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     t1="1"
-|     t2="2"
-|     t3="3"
-|     t4="4"
-
-#data
-</b test
-#errors
-Line: 1 Col: 8 Unexpected end of file in attribute name.
-Line: 1 Col: 8 End tag contains unexpected attributes.
-Line: 1 Col: 8 Unexpected end tag (b). Expected DOCTYPE.
-Line: 1 Col: 8 Unexpected end tag (b) after the (implied) root element.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html></b test<b &=&amp>X
-#errors
-Line: 1 Col: 32 Named entity didn't end with ';'.
-Line: 1 Col: 33 End tag contains unexpected attributes.
-Line: 1 Col: 33 Unexpected end tag (b) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-
-#data
-<!doctypehtml><scrIPt type=text/x-foobar;baz>X</SCRipt
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-Line: 1 Col: 54 Unexpected end of file in the tag name.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       type="text/x-foobar;baz"
-|       "X</SCRipt"
-|   <body>
-
-#data
-&
-#errors
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&"
-
-#data
-&#
-#errors
-Line: 1 Col: 1 Numeric entity expected. Got end of file instead.
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&#"
-
-#data
-&#X
-#errors
-Line: 1 Col: 3 Numeric entity expected but none found.
-Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&#X"
-
-#data
-&#x
-#errors
-Line: 1 Col: 3 Numeric entity expected but none found.
-Line: 1 Col: 3 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&#x"
-
-#data
-&#45
-#errors
-Line: 1 Col: 4 Numeric entity didn't end with ';'.
-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "-"
-
-#data
-&x-test
-#errors
-Line: 1 Col: 1 Named entity expected. Got none.
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&x-test"
-
-#data
-<!doctypehtml><p><li>
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <li>
-
-#data
-<!doctypehtml><p><dt>
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <dt>
-
-#data
-<!doctypehtml><p><dd>
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <dd>
-
-#data
-<!doctypehtml><p><form>
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <form>
-
-#data
-<!DOCTYPE html><p></P>X
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     "X"
-
-#data
-&AMP
-#errors
-Line: 1 Col: 4 Named entity didn't end with ';'.
-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&"
-
-#data
-&AMp;
-#errors
-Line: 1 Col: 1 Named entity expected. Got none.
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "&AMp;"
-
-#data
-<!DOCTYPE html><html><head></head><body><thisISasillyTESTelementNameToMakeSureCrazyTagNamesArePARSEDcorrectLY>
-#errors
-Line: 1 Col: 110 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <thisisasillytestelementnametomakesurecrazytagnamesareparsedcorrectly>
-
-#data
-<!DOCTYPE html>X</body>X
-#errors
-Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "XX"
-
-#data
-<!DOCTYPE html><!-- X
-#errors
-Line: 1 Col: 21 Unexpected end of file in comment.
-#document
-| <!DOCTYPE html>
-| <!--  X -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><table><caption>test TEST</caption><td>test
-#errors
-Line: 1 Col: 54 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         "test TEST"
-|       <tbody>
-|         <tr>
-|           <td>
-|             "test"
-
-#data
-<!DOCTYPE html><select><option><optgroup>
-#errors
-Line: 1 Col: 41 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|       <optgroup>
-
-#data
-<!DOCTYPE html><select><optgroup><option></optgroup><option><select><option>
-#errors
-Line: 1 Col: 68 Unexpected select start tag in the select phase treated as select end tag.
-Line: 1 Col: 76 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <optgroup>
-|         <option>
-|       <option>
-|     <option>
-
-#data
-<!DOCTYPE html><select><optgroup><option><optgroup>
-#errors
-Line: 1 Col: 51 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <optgroup>
-|         <option>
-|       <optgroup>
-
-#data
-<!DOCTYPE html><datalist><option>foo</datalist>bar
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <datalist>
-|       <option>
-|         "foo"
-|     "bar"
-
-#data
-<!DOCTYPE html><font><input><input></font>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|       <input>
-|       <input>
-
-#data
-<!DOCTYPE html><!-- XXX - XXX -->
-#errors
-#document
-| <!DOCTYPE html>
-| <!--  XXX - XXX  -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><!-- XXX - XXX
-#errors
-Line: 1 Col: 29 Unexpected end of file in comment (-)
-#document
-| <!DOCTYPE html>
-| <!--  XXX - XXX -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><!-- XXX - XXX - XXX -->
-#errors
-#document
-| <!DOCTYPE html>
-| <!--  XXX - XXX - XXX  -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<isindex test=x name=x>
-#errors
-Line: 1 Col: 23 Unexpected start tag (isindex). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected start tag isindex. Don't use it!
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <hr>
-|       <label>
-|         "This is a searchable index. Enter search keywords: "
-|         <input>
-|           name="isindex"
-|           test="x"
-|       <hr>
-
-#data
-test
-test
-#errors
-Line: 2 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "test
-test"
-
-#data
-<!DOCTYPE html><body><title>test</body></title>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <title>
-|       "test</body>"
-
-#data
-<!DOCTYPE html><body><title>X</title><meta name=z><link rel=foo><style>
-x { content:"</style" } </style>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <title>
-|       "X"
-|     <meta>
-|       name="z"
-|     <link>
-|       rel="foo"
-|     <style>
-|       "
-x { content:"</style" } "
-
-#data
-<!DOCTYPE html><select><optgroup></optgroup></select>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <optgroup>
-
-#data
- 
- 
-#errors
-Line: 2 Col: 1 Unexpected End of file. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html>  <html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><script>
-</script>  <title>x</title>  </head>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <script>
-|       "
-"
-|     "  "
-|     <title>
-|       "x"
-|     "  "
-|   <body>
-
-#data
-<!DOCTYPE html><html><body><html id=x>
-#errors
-Line: 1 Col: 38 html needs to be the first start tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   id="x"
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html>X</body><html id="x">
-#errors
-Line: 1 Col: 36 Unexpected start tag token (html) in the after body phase.
-Line: 1 Col: 36 html needs to be the first start tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   id="x"
-|   <head>
-|   <body>
-|     "X"
-
-#data
-<!DOCTYPE html><head><html id=x>
-#errors
-Line: 1 Col: 32 html needs to be the first start tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   id="x"
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html>X</html>X
-#errors
-Line: 1 Col: 24 Unexpected non-space characters in the after body phase.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "XX"
-
-#data
-<!DOCTYPE html>X</html> 
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X "
-
-#data
-<!DOCTYPE html>X</html><p>X
-#errors
-Line: 1 Col: 26 Unexpected start tag (p).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     <p>
-|       "X"
-
-#data
-<!DOCTYPE html>X<p/x/y/z>
-#errors
-Line: 1 Col: 19 Expected a > after the /.
-Line: 1 Col: 21 Solidus (/) incorrectly placed in tag.
-Line: 1 Col: 23 Solidus (/) incorrectly placed in tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     <p>
-|       x=""
-|       y=""
-|       z=""
-
-#data
-<!DOCTYPE html><!--x--
-#errors
-Line: 1 Col: 22 Unexpected end of file in comment (--).
-#document
-| <!DOCTYPE html>
-| <!-- x -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE html><table><tr><td></p></table>
-#errors
-Line: 1 Col: 34 Unexpected end tag (p). Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <p>
-
-#data
-<!DOCTYPE <!DOCTYPE HTML>><!--<!--x-->-->
-#errors
-Line: 1 Col: 20 Expected space or '>'. Got ''
-Line: 1 Col: 25 Erroneous DOCTYPE.
-Line: 1 Col: 35 Unexpected character in comment found.
-#document
-| <!DOCTYPE <!doctype>
-| <html>
-|   <head>
-|   <body>
-|     ">"
-|     <!-- <!--x -->
-|     "-->"
-
-#data
-<!doctype html><div><form></form><div></div></div>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <form>
-|       <div>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests20.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests20.dat
deleted file mode 100644
index 6bd825608f..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests20.dat
+++ /dev/null
@@ -1,455 +0,0 @@
-#data
-<!doctype html><p><button><button>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|       <button>
-
-#data
-<!doctype html><p><button><address>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <address>
-
-#data
-<!doctype html><p><button><blockquote>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <blockquote>
-
-#data
-<!doctype html><p><button><menu>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <menu>
-
-#data
-<!doctype html><p><button><p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <p>
-
-#data
-<!doctype html><p><button><ul>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <ul>
-
-#data
-<!doctype html><p><button><h1>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <h1>
-
-#data
-<!doctype html><p><button><h6>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <h6>
-
-#data
-<!doctype html><p><button><listing>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <listing>
-
-#data
-<!doctype html><p><button><pre>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <pre>
-
-#data
-<!doctype html><p><button><form>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <form>
-
-#data
-<!doctype html><p><button><li>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <li>
-
-#data
-<!doctype html><p><button><dd>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <dd>
-
-#data
-<!doctype html><p><button><dt>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <dt>
-
-#data
-<!doctype html><p><button><plaintext>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <plaintext>
-
-#data
-<!doctype html><p><button><table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <table>
-
-#data
-<!doctype html><p><button><hr>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <hr>
-
-#data
-<!doctype html><p><button><xmp>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <xmp>
-
-#data
-<!doctype html><p><button></p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <button>
-|         <p>
-
-#data
-<!doctype html><address><button></address>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <address>
-|       <button>
-|     "a"
-
-#data
-<!doctype html><address><button></address>a
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <address>
-|       <button>
-|     "a"
-
-#data
-<p><table></p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <p>
-|       <table>
-
-#data
-<!doctype html><svg>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<!doctype html><p><figcaption>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <figcaption>
-
-#data
-<!doctype html><p><summary>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <summary>
-
-#data
-<!doctype html><form><table><form>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <table>
-
-#data
-<!doctype html><table><form><form>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <form>
-
-#data
-<!doctype html><table><form></table><form>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <form>
-
-#data
-<!doctype html><svg><foreignObject><p>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg foreignObject>
-|         <p>
-
-#data
-<!doctype html><svg><title>abc
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg title>
-|         "abc"
-
-#data
-<option><span><option>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <option>
-|       <span>
-|         <option>
-
-#data
-<option><option>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <option>
-|     <option>
-
-#data
-<math><annotation-xml><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|     <div>
-
-#data
-<math><annotation-xml encoding="application/svg+xml"><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding="application/svg+xml"
-|     <div>
-
-#data
-<math><annotation-xml encoding="application/xhtml+xml"><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding="application/xhtml+xml"
-|         <div>
-
-#data
-<math><annotation-xml encoding="aPPlication/xhtmL+xMl"><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding="aPPlication/xhtmL+xMl"
-|         <div>
-
-#data
-<math><annotation-xml encoding="text/html"><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding="text/html"
-|         <div>
-
-#data
-<math><annotation-xml encoding="Text/htmL"><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding="Text/htmL"
-|         <div>
-
-#data
-<math><annotation-xml encoding=" text/html "><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         encoding=" text/html "
-|     <div>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests21.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests21.dat
deleted file mode 100644
index 1260ec03e2..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests21.dat
+++ /dev/null
@@ -1,221 +0,0 @@
-#data
-<svg><![CDATA[foo]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "foo"
-
-#data
-<math><![CDATA[foo]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       "foo"
-
-#data
-<div><![CDATA[foo]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <!-- [CDATA[foo]] -->
-
-#data
-<svg><![CDATA[foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "foo"
-
-#data
-<svg><![CDATA[foo
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "foo"
-
-#data
-<svg><![CDATA[
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<svg><![CDATA[]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-
-#data
-<svg><![CDATA[]] >]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]] >"
-
-#data
-<svg><![CDATA[]] >]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]] >"
-
-#data
-<svg><![CDATA[]]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]]"
-
-#data
-<svg><![CDATA[]
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]"
-
-#data
-<svg><![CDATA[]>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "]>a"
-
-#data
-<svg><foreignObject><div><![CDATA[foo]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg foreignObject>
-|         <div>
-|           <!-- [CDATA[foo]] -->
-
-#data
-<svg><![CDATA[<svg>]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>"
-
-#data
-<svg><![CDATA[</svg>a]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "</svg>a"
-
-#data
-<svg><![CDATA[<svg>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>a"
-
-#data
-<svg><![CDATA[</svg>a
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "</svg>a"
-
-#data
-<svg><![CDATA[<svg>]]><path>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>"
-|       <svg path>
-
-#data
-<svg><![CDATA[<svg>]]></path>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>"
-
-#data
-<svg><![CDATA[<svg>]]><!--path-->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>"
-|       <!-- path -->
-
-#data
-<svg><![CDATA[<svg>]]>path
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<svg>path"
-
-#data
-<svg><![CDATA[<!--svg-->]]>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       "<!--svg-->"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests22.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests22.dat
deleted file mode 100644
index aab27b2e90..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests22.dat
+++ /dev/null
@@ -1,157 +0,0 @@
-#data
-<a><b><big><em><strong><div>X</a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|         <big>
-|           <em>
-|             <strong>
-|     <big>
-|       <em>
-|         <strong>
-|           <div>
-|             <a>
-|               "X"
-
-#data
-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8>A</a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|     <b>
-|       <div>
-|         id="1"
-|         <a>
-|         <div>
-|           id="2"
-|           <a>
-|           <div>
-|             id="3"
-|             <a>
-|             <div>
-|               id="4"
-|               <a>
-|               <div>
-|                 id="5"
-|                 <a>
-|                 <div>
-|                   id="6"
-|                   <a>
-|                   <div>
-|                     id="7"
-|                     <a>
-|                     <div>
-|                       id="8"
-|                       <a>
-|                         "A"
-
-#data
-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9>A</a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|     <b>
-|       <div>
-|         id="1"
-|         <a>
-|         <div>
-|           id="2"
-|           <a>
-|           <div>
-|             id="3"
-|             <a>
-|             <div>
-|               id="4"
-|               <a>
-|               <div>
-|                 id="5"
-|                 <a>
-|                 <div>
-|                   id="6"
-|                   <a>
-|                   <div>
-|                     id="7"
-|                     <a>
-|                     <div>
-|                       id="8"
-|                       <a>
-|                         <div>
-|                           id="9"
-|                           "A"
-
-#data
-<a><b><div id=1><div id=2><div id=3><div id=4><div id=5><div id=6><div id=7><div id=8><div id=9><div id=10>A</a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       <b>
-|     <b>
-|       <div>
-|         id="1"
-|         <a>
-|         <div>
-|           id="2"
-|           <a>
-|           <div>
-|             id="3"
-|             <a>
-|             <div>
-|               id="4"
-|               <a>
-|               <div>
-|                 id="5"
-|                 <a>
-|                 <div>
-|                   id="6"
-|                   <a>
-|                   <div>
-|                     id="7"
-|                     <a>
-|                     <div>
-|                       id="8"
-|                       <a>
-|                         <div>
-|                           id="9"
-|                           <div>
-|                             id="10"
-|                             "A"
-
-#data
-<cite><b><cite><i><cite><i><cite><i><div>X</b>TEST
-#errors
-Line: 1 Col: 6 Unexpected start tag (cite). Expected DOCTYPE.
-Line: 1 Col: 46 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 50 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <cite>
-|       <b>
-|         <cite>
-|           <i>
-|             <cite>
-|               <i>
-|                 <cite>
-|                   <i>
-|       <i>
-|         <i>
-|           <div>
-|             <b>
-|               "X"
-|             "TEST"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests23.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests23.dat
deleted file mode 100644
index 34d2a73f1c..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests23.dat
+++ /dev/null
@@ -1,155 +0,0 @@
-#data
-<p><font size=4><font color=red><font size=4><font size=4><font size=4><font size=4><font size=4><font color=red><p>X
-#errors
-3: Start tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-116: Unclosed elements.
-117: End of file seen and there were open elements.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <font>
-|         size="4"
-|         <font>
-|           color="red"
-|           <font>
-|             size="4"
-|             <font>
-|               size="4"
-|               <font>
-|                 size="4"
-|                 <font>
-|                   size="4"
-|                   <font>
-|                     size="4"
-|                     <font>
-|                       color="red"
-|     <p>
-|       <font>
-|         color="red"
-|         <font>
-|           size="4"
-|           <font>
-|             size="4"
-|             <font>
-|               size="4"
-|               <font>
-|                 color="red"
-|                 "X"
-
-#data
-<p><font size=4><font size=4><font size=4><font size=4><p>X
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <font>
-|         size="4"
-|         <font>
-|           size="4"
-|           <font>
-|             size="4"
-|             <font>
-|               size="4"
-|     <p>
-|       <font>
-|         size="4"
-|         <font>
-|           size="4"
-|           <font>
-|             size="4"
-|             "X"
-
-#data
-<p><font size=4><font size=4><font size=4><font size="5"><font size=4><p>X
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <font>
-|         size="4"
-|         <font>
-|           size="4"
-|           <font>
-|             size="4"
-|             <font>
-|               size="5"
-|               <font>
-|                 size="4"
-|     <p>
-|       <font>
-|         size="4"
-|         <font>
-|           size="4"
-|           <font>
-|             size="5"
-|             <font>
-|               size="4"
-|               "X"
-
-#data
-<p><font size=4 id=a><font size=4 id=b><font size=4><font size=4><p>X
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <font>
-|         id="a"
-|         size="4"
-|         <font>
-|           id="b"
-|           size="4"
-|           <font>
-|             size="4"
-|             <font>
-|               size="4"
-|     <p>
-|       <font>
-|         id="a"
-|         size="4"
-|         <font>
-|           id="b"
-|           size="4"
-|           <font>
-|             size="4"
-|             <font>
-|               size="4"
-|               "X"
-
-#data
-<p><b id=a><b id=a><b id=a><b><object><b id=a><b id=a>X</object><p>Y
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <b>
-|         id="a"
-|         <b>
-|           id="a"
-|           <b>
-|             id="a"
-|             <b>
-|               <object>
-|                 <b>
-|                   id="a"
-|                   <b>
-|                     id="a"
-|                     "X"
-|     <p>
-|       <b>
-|         id="a"
-|         <b>
-|           id="a"
-|           <b>
-|             id="a"
-|             <b>
-|               "Y"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests24.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests24.dat
deleted file mode 100644
index f6dc7eb48a..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests24.dat
+++ /dev/null
@@ -1,79 +0,0 @@
-#data
-<!DOCTYPE html>&NotEqualTilde;
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "≂̸"
-
-#data
-<!DOCTYPE html>&NotEqualTilde;A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "≂̸A"
-
-#data
-<!DOCTYPE html>&ThickSpace;
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "  "
-
-#data
-<!DOCTYPE html>&ThickSpace;A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "  A"
-
-#data
-<!DOCTYPE html>&NotSubset;
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "⊂⃒"
-
-#data
-<!DOCTYPE html>&NotSubset;A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "⊂⃒A"
-
-#data
-<!DOCTYPE html>&Gopf;
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "𝔾"
-
-#data
-<!DOCTYPE html>&Gopf;A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "𝔾A"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests25.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests25.dat
deleted file mode 100644
index 00de7295b7..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests25.dat
+++ /dev/null
@@ -1,219 +0,0 @@
-#data
-<!DOCTYPE html><body><foo>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       "A"
-
-#data
-<!DOCTYPE html><body><area>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <area>
-|     "A"
-
-#data
-<!DOCTYPE html><body><base>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <base>
-|     "A"
-
-#data
-<!DOCTYPE html><body><basefont>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <basefont>
-|     "A"
-
-#data
-<!DOCTYPE html><body><bgsound>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <bgsound>
-|     "A"
-
-#data
-<!DOCTYPE html><body><br>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <br>
-|     "A"
-
-#data
-<!DOCTYPE html><body><col>A
-#errors
-26: Stray start tag “col”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "A"
-
-#data
-<!DOCTYPE html><body><command>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <command>
-|     "A"
-
-#data
-<!DOCTYPE html><body><embed>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <embed>
-|     "A"
-
-#data
-<!DOCTYPE html><body><frame>A
-#errors
-26: Stray start tag “frame”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "A"
-
-#data
-<!DOCTYPE html><body><hr>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <hr>
-|     "A"
-
-#data
-<!DOCTYPE html><body><img>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <img>
-|     "A"
-
-#data
-<!DOCTYPE html><body><input>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <input>
-|     "A"
-
-#data
-<!DOCTYPE html><body><keygen>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <keygen>
-|     "A"
-
-#data
-<!DOCTYPE html><body><link>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <link>
-|     "A"
-
-#data
-<!DOCTYPE html><body><meta>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <meta>
-|     "A"
-
-#data
-<!DOCTYPE html><body><param>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <param>
-|     "A"
-
-#data
-<!DOCTYPE html><body><source>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <source>
-|     "A"
-
-#data
-<!DOCTYPE html><body><track>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <track>
-|     "A"
-
-#data
-<!DOCTYPE html><body><wbr>A
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <wbr>
-|     "A"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests26.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests26.dat
deleted file mode 100644
index fae11ffdf9..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests26.dat
+++ /dev/null
@@ -1,313 +0,0 @@
-#data
-<!DOCTYPE html><body><a href='#1'><nobr>1<nobr></a><br><a href='#2'><nobr>2<nobr></a><br><a href='#3'><nobr>3<nobr></a>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       href="#1"
-|       <nobr>
-|         "1"
-|       <nobr>
-|     <nobr>
-|       <br>
-|       <a>
-|         href="#2"
-|     <a>
-|       href="#2"
-|       <nobr>
-|         "2"
-|       <nobr>
-|     <nobr>
-|       <br>
-|       <a>
-|         href="#3"
-|     <a>
-|       href="#3"
-|       <nobr>
-|         "3"
-|       <nobr>
-
-#data
-<!DOCTYPE html><body><b><nobr>1<nobr></b><i><nobr>2<nobr></i>3
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|       <nobr>
-|     <nobr>
-|       <i>
-|     <i>
-|       <nobr>
-|         "2"
-|       <nobr>
-|     <nobr>
-|       "3"
-
-#data
-<!DOCTYPE html><body><b><nobr>1<table><nobr></b><i><nobr>2<nobr></i>3
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|         <nobr>
-|           <i>
-|         <i>
-|           <nobr>
-|             "2"
-|           <nobr>
-|         <nobr>
-|           "3"
-|         <table>
-
-#data
-<!DOCTYPE html><body><b><nobr>1<table><tr><td><nobr></b><i><nobr>2<nobr></i>3
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|         <table>
-|           <tbody>
-|             <tr>
-|               <td>
-|                 <nobr>
-|                   <i>
-|                 <i>
-|                   <nobr>
-|                     "2"
-|                   <nobr>
-|                 <nobr>
-|                   "3"
-
-#data
-<!DOCTYPE html><body><b><nobr>1<div><nobr></b><i><nobr>2<nobr></i>3
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|     <div>
-|       <b>
-|         <nobr>
-|         <nobr>
-|       <nobr>
-|         <i>
-|       <i>
-|         <nobr>
-|           "2"
-|         <nobr>
-|       <nobr>
-|         "3"
-
-#data
-<!DOCTYPE html><body><b><nobr>1<nobr></b><div><i><nobr>2<nobr></i>3
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|       <nobr>
-|     <div>
-|       <nobr>
-|         <i>
-|       <i>
-|         <nobr>
-|           "2"
-|         <nobr>
-|       <nobr>
-|         "3"
-
-#data
-<!DOCTYPE html><body><b><nobr>1<nobr><ins></b><i><nobr>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|       <nobr>
-|         <ins>
-|     <nobr>
-|       <i>
-|     <i>
-|       <nobr>
-
-#data
-<!DOCTYPE html><body><b><nobr>1<ins><nobr></b><i>2
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       <nobr>
-|         "1"
-|         <ins>
-|       <nobr>
-|     <nobr>
-|       <i>
-|         "2"
-
-#data
-<!DOCTYPE html><body><b>1<nobr></b><i><nobr>2</i>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "1"
-|       <nobr>
-|     <nobr>
-|       <i>
-|     <i>
-|       <nobr>
-|         "2"
-
-#data
-<p><code x</code></p>
-
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <code>
-|         code=""
-|         x<=""
-|     <code>
-|       code=""
-|       x<=""
-|       "
-"
-
-#data
-<!DOCTYPE html><svg><foreignObject><p><i></p>a
-#errors
-45: End tag “p” seen, but there were open elements.
-41: Unclosed element “i”.
-46: End of file seen and there were open elements.
-35: Unclosed element “foreignObject”.
-20: Unclosed element “svg”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg foreignObject>
-|         <p>
-|           <i>
-|         <i>
-|           "a"
-
-#data
-<!DOCTYPE html><table><tr><td><svg><foreignObject><p><i></p>a
-#errors
-56: End tag “p” seen, but there were open elements.
-52: Unclosed element “i”.
-57: End of file seen and there were open elements.
-46: Unclosed element “foreignObject”.
-31: Unclosed element “svg”.
-22: Unclosed element “table”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg foreignObject>
-|                 <p>
-|                   <i>
-|                 <i>
-|                   "a"
-
-#data
-<!DOCTYPE html><math><mtext><p><i></p>a
-#errors
-38: End tag “p” seen, but there were open elements.
-34: Unclosed element “i”.
-39: End of file in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mtext>
-|         <p>
-|           <i>
-|         <i>
-|           "a"
-
-#data
-<!DOCTYPE html><table><tr><td><math><mtext><p><i></p>a
-#errors
-53: End tag “p” seen, but there were open elements.
-49: Unclosed element “i”.
-54: End of file in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <math math>
-|               <math mtext>
-|                 <p>
-|                   <i>
-|                 <i>
-|                   "a"
-
-#data
-<!DOCTYPE html><body><div><!/div>a
-#errors
-29: Bogus comment.
-34: End of file seen and there were open elements.
-26: Unclosed element “div”.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <!-- /div -->
-|       "a"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests3.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests3.dat
deleted file mode 100644
index 38dc501be3..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests3.dat
+++ /dev/null
@@ -1,305 +0,0 @@
-#data
-<head></head><style></style>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected start tag (style) that can be in head. Moved.
-#document
-| <html>
-|   <head>
-|     <style>
-|   <body>
-
-#data
-<head></head><script></script>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 21 Unexpected start tag (script) that can be in head. Moved.
-#document
-| <html>
-|   <head>
-|     <script>
-|   <body>
-
-#data
-<head></head><!-- --><style></style><!-- --><script></script>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-Line: 1 Col: 28 Unexpected start tag (style) that can be in head. Moved.
-#document
-| <html>
-|   <head>
-|     <style>
-|     <script>
-|   <!--   -->
-|   <!--   -->
-|   <body>
-
-#data
-<head></head><!-- -->x<style></style><!-- --><script></script>
-#errors
-Line: 1 Col: 6 Unexpected start tag (head). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <!--   -->
-|   <body>
-|     "x"
-|     <style>
-|     <!--   -->
-|     <script>
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>
-</pre></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>
-foo</pre></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "foo"
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>
-
-foo</pre></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "
-foo"
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>
-foo
-</pre></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "foo
-"
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>x</pre><span>
-</span></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "x"
-|     <span>
-|       "
-"
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>x
-y</pre></body></html>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "x
-y"
-
-#data
-<!DOCTYPE html><html><head></head><body><pre>x<div>
-y</pre></body></html>
-#errors
-Line: 2 Col: 7 End tag (pre) seen too early. Expected other end tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "x"
-|       <div>
-|         "
-y"
-
-#data
-<!DOCTYPE html><pre>&#x0a;&#x0a;A</pre>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <pre>
-|       "
-A"
-
-#data
-<!DOCTYPE html><HTML><META><HEAD></HEAD></HTML>
-#errors
-Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <meta>
-|   <body>
-
-#data
-<!DOCTYPE html><HTML><HEAD><head></HEAD></HTML>
-#errors
-Line: 1 Col: 33 Unexpected start tag head in existing head. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<textarea>foo<span>bar</span><i>baz
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-Line: 1 Col: 35 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "foo<span>bar</span><i>baz"
-
-#data
-<title>foo<span>bar</em><i>baz
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-Line: 1 Col: 30 Unexpected end of file. Expected end tag (title).
-#document
-| <html>
-|   <head>
-|     <title>
-|       "foo<span>bar</em><i>baz"
-|   <body>
-
-#data
-<!DOCTYPE html><textarea>
-</textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-
-#data
-<!DOCTYPE html><textarea>
-foo</textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "foo"
-
-#data
-<!DOCTYPE html><textarea>
-
-foo</textarea>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       "
-foo"
-
-#data
-<!DOCTYPE html><html><head></head><body><ul><li><div><p><li></ul></body></html>
-#errors
-Line: 1 Col: 60 Missing end tag (div, li).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <ul>
-|       <li>
-|         <div>
-|           <p>
-|       <li>
-
-#data
-<!doctype html><nobr><nobr><nobr>
-#errors
-Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
-Line: 1 Col: 33 Unexpected start tag (nobr) implies end tag (nobr).
-Line: 1 Col: 33 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <nobr>
-|     <nobr>
-|     <nobr>
-
-#data
-<!doctype html><nobr><nobr></nobr><nobr>
-#errors
-Line: 1 Col: 27 Unexpected start tag (nobr) implies end tag (nobr).
-Line: 1 Col: 40 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <nobr>
-|     <nobr>
-|     <nobr>
-
-#data
-<!doctype html><html><body><p><table></table></body></html>
-#errors
-Not known
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <table>
-
-#data
-<p><table></table>
-#errors
-Not known
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <table>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests4.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests4.dat
deleted file mode 100644
index 3c506326d1..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests4.dat
+++ /dev/null
@@ -1,59 +0,0 @@
-#data
-direct div content
-#errors
-#document-fragment
-div
-#document
-| "direct div content"
-
-#data
-direct textarea content
-#errors
-#document-fragment
-textarea
-#document
-| "direct textarea content"
-
-#data
-textarea content with <em>pseudo</em> <foo>markup
-#errors
-#document-fragment
-textarea
-#document
-| "textarea content with <em>pseudo</em> <foo>markup"
-
-#data
-this is &#x0043;DATA inside a <style> element
-#errors
-#document-fragment
-style
-#document
-| "this is &#x0043;DATA inside a <style> element"
-
-#data
-</plaintext>
-#errors
-#document-fragment
-plaintext
-#document
-| "</plaintext>"
-
-#data
-setting html's innerHTML
-#errors
-Line: 1 Col: 24 Unexpected EOF in inner html mode.
-#document-fragment
-html
-#document
-| <head>
-| <body>
-|   "setting html's innerHTML"
-
-#data
-<title>setting head's innerHTML</title>
-#errors
-#document-fragment
-head
-#document
-| <title>
-|   "setting head's innerHTML"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests5.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests5.dat
deleted file mode 100644
index d7b5128a44..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests5.dat
+++ /dev/null
@@ -1,191 +0,0 @@
-#data
-<style> <!-- </style>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end of file. Expected end tag (style).
-#document
-| <html>
-|   <head>
-|     <style>
-|       " <!-- "
-|   <body>
-|     "x"
-
-#data
-<style> <!-- </style> --> </style>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       " <!-- "
-|     " "
-|   <body>
-|     "--> x"
-
-#data
-<style> <!--> </style>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       " <!--> "
-|   <body>
-|     "x"
-
-#data
-<style> <!---> </style>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       " <!---> "
-|   <body>
-|     "x"
-
-#data
-<iframe> <!---> </iframe>x
-#errors
-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       " <!---> "
-|     "x"
-
-#data
-<iframe> <!--- </iframe>->x</iframe> --> </iframe>x
-#errors
-Line: 1 Col: 8 Unexpected start tag (iframe). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <iframe>
-|       " <!--- "
-|     "->x --> x"
-
-#data
-<script> <!-- </script> --> </script>x
-#errors
-Line: 1 Col: 8 Unexpected start tag (script). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <script>
-|       " <!-- "
-|     " "
-|   <body>
-|     "--> x"
-
-#data
-<title> <!-- </title> --> </title>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|       " <!-- "
-|     " "
-|   <body>
-|     "--> x"
-
-#data
-<textarea> <!--- </textarea>->x</textarea> --> </textarea>x
-#errors
-Line: 1 Col: 10 Unexpected start tag (textarea). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <textarea>
-|       " <!--- "
-|     "->x --> x"
-
-#data
-<style> <!</-- </style>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (style). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <style>
-|       " <!</-- "
-|   <body>
-|     "x"
-
-#data
-<p><xmp></xmp>
-#errors
-XXX: Unknown
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|     <xmp>
-
-#data
-<xmp> <!-- > --> </xmp>
-#errors
-Line: 1 Col: 5 Unexpected start tag (xmp). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <xmp>
-|       " <!-- > --> "
-
-#data
-<title>&amp;</title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|       "&"
-|   <body>
-
-#data
-<title><!--&amp;--></title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <title>
-|       "<!--&-->"
-|   <body>
-
-#data
-<title><!--</title>
-#errors
-Line: 1 Col: 7 Unexpected start tag (title). Expected DOCTYPE.
-Line: 1 Col: 19 Unexpected end of file. Expected end tag (title).
-#document
-| <html>
-|   <head>
-|     <title>
-|       "<!--"
-|   <body>
-
-#data
-<noscript><!--</noscript>--></noscript>
-#errors
-Line: 1 Col: 10 Unexpected start tag (noscript). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|     <noscript>
-|       "<!--"
-|   <body>
-|     "-->"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests6.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests6.dat
deleted file mode 100644
index f28ece4fb0..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests6.dat
+++ /dev/null
@@ -1,663 +0,0 @@
-#data
-<!doctype html></head> <head>
-#errors
-Line: 1 Col: 29 Unexpected start tag head. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   " "
-|   <body>
-
-#data
-<!doctype html><form><div></form><div>
-#errors
-33: End tag "form" seen but there were unclosed elements.
-38: End of file seen and there were open elements.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <form>
-|       <div>
-|         <div>
-
-#data
-<!doctype html><title>&amp;</title>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "&"
-|   <body>
-
-#data
-<!doctype html><title><!--&amp;--></title>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "<!--&-->"
-|   <body>
-
-#data
-<!doctype>
-#errors
-Line: 1 Col: 9 No space after literal string 'DOCTYPE'.
-Line: 1 Col: 10 Unexpected > character. Expected DOCTYPE name.
-Line: 1 Col: 10 Erroneous DOCTYPE.
-#document
-| <!DOCTYPE >
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!---x
-#errors
-Line: 1 Col: 6 Unexpected end of file in comment.
-Line: 1 Col: 6 Unexpected End of file. Expected DOCTYPE.
-#document
-| <!-- -x -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<body>
-<div>
-#errors
-Line: 1 Col: 6 Unexpected start tag (body).
-Line: 2 Col: 5 Expected closing tag. Unexpected end of file.
-#document-fragment
-div
-#document
-| "
-"
-| <div>
-
-#data
-<frameset></frameset>
-foo
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 2 Col: 3 Unexpected non-space characters in the after frameset phase. Ignored.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   "
-"
-
-#data
-<frameset></frameset>
-<noframes>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 2 Col: 10 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   "
-"
-|   <noframes>
-
-#data
-<frameset></frameset>
-<div>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 2 Col: 5 Unexpected start tag (div) in the after frameset phase. Ignored.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   "
-"
-
-#data
-<frameset></frameset>
-</html>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   "
-"
-
-#data
-<frameset></frameset>
-</div>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 2 Col: 6 Unexpected end tag (div) in the after frameset phase. Ignored.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   "
-"
-
-#data
-<form><form>
-#errors
-Line: 1 Col: 6 Unexpected start tag (form). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected start tag (form).
-Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <form>
-
-#data
-<button><button>
-#errors
-Line: 1 Col: 8 Unexpected start tag (button). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected start tag (button) implies end tag (button).
-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <button>
-|     <button>
-
-#data
-<table><tr><td></th>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end tag (th). Ignored.
-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><caption><td>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end tag (td). Ignored.
-Line: 1 Col: 20 Unexpected table cell start tag (td) in the table body phase.
-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><caption><div>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 21 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <div>
-
-#data
-</caption><div>
-#errors
-Line: 1 Col: 10 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
-#document-fragment
-caption
-#document
-| <div>
-
-#data
-<table><caption><div></caption>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 31 Unexpected end tag (caption). Missing end tag (div).
-Line: 1 Col: 31 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <div>
-
-#data
-<table><caption></table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 24 Unexpected end table tag in caption. Generates implied end caption.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-
-#data
-</table><div>
-#errors
-Line: 1 Col: 8 Unexpected end table tag in caption. Generates implied end caption.
-Line: 1 Col: 8 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 13 Expected closing tag. Unexpected end of file.
-#document-fragment
-caption
-#document
-| <div>
-
-#data
-<table><caption></body></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 23 Unexpected end tag (body). Ignored.
-Line: 1 Col: 29 Unexpected end tag (col). Ignored.
-Line: 1 Col: 40 Unexpected end tag (colgroup). Ignored.
-Line: 1 Col: 47 Unexpected end tag (html). Ignored.
-Line: 1 Col: 55 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 60 Unexpected end tag (td). Ignored.
-Line: 1 Col: 68 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 73 Unexpected end tag (th). Ignored.
-Line: 1 Col: 81 Unexpected end tag (thead). Ignored.
-Line: 1 Col: 86 Unexpected end tag (tr). Ignored.
-Line: 1 Col: 86 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-
-#data
-<table><caption><div></div>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 27 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <div>
-
-#data
-<table><tr><td></body></caption></col></colgroup></html>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end tag (body). Ignored.
-Line: 1 Col: 32 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 38 Unexpected end tag (col). Ignored.
-Line: 1 Col: 49 Unexpected end tag (colgroup). Ignored.
-Line: 1 Col: 56 Unexpected end tag (html). Ignored.
-Line: 1 Col: 56 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-</table></tbody></tfoot></thead></tr><div>
-#errors
-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
-Line: 1 Col: 16 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 24 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 32 Unexpected end tag (thead). Ignored.
-Line: 1 Col: 37 Unexpected end tag (tr). Ignored.
-Line: 1 Col: 42 Expected closing tag. Unexpected end of file.
-#document-fragment
-td
-#document
-| <div>
-
-#data
-<table><colgroup>foo
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 20 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "foo"
-|     <table>
-|       <colgroup>
-
-#data
-foo<col>
-#errors
-Line: 1 Col: 3 Unexpected end tag (colgroup). Ignored.
-#document-fragment
-colgroup
-#document
-| <col>
-
-#data
-<table><colgroup></col>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 23 This element (col) has no end tag.
-Line: 1 Col: 23 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <colgroup>
-
-#data
-<frameset><div>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 1 Col: 15 Unexpected start tag token (div) in the frameset phase. Ignored.
-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-</frameset><frame>
-#errors
-Line: 1 Col: 11 Unexpected end tag token (frameset) in the frameset phase (innerHTML).
-#document-fragment
-frameset
-#document
-| <frame>
-
-#data
-<frameset></div>
-#errors
-Line: 1 Col: 10 Unexpected start tag (frameset). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected end tag token (div) in the frameset phase. Ignored.
-Line: 1 Col: 16 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-</body><div>
-#errors
-Line: 1 Col: 7 Unexpected end tag (body). Ignored.
-Line: 1 Col: 12 Expected closing tag. Unexpected end of file.
-#document-fragment
-body
-#document
-| <div>
-
-#data
-<table><tr><div>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
-Line: 1 Col: 16 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-</tr><td>
-#errors
-Line: 1 Col: 5 Unexpected end tag (tr). Ignored.
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-</tbody></tfoot></thead><td>
-#errors
-Line: 1 Col: 8 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 16 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 24 Unexpected end tag (thead). Ignored.
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<table><tr><div><td>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 16 Unexpected start tag (div) in table context caused voodoo mode.
-Line: 1 Col: 20 Unexpected implied end tag (div) in the table row phase.
-Line: 1 Col: 20 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<caption><col><colgroup><tbody><tfoot><thead><tr>
-#errors
-Line: 1 Col: 9 Unexpected start tag (caption).
-Line: 1 Col: 14 Unexpected start tag (col).
-Line: 1 Col: 24 Unexpected start tag (colgroup).
-Line: 1 Col: 31 Unexpected start tag (tbody).
-Line: 1 Col: 38 Unexpected start tag (tfoot).
-Line: 1 Col: 45 Unexpected start tag (thead).
-Line: 1 Col: 49 Unexpected end of file. Expected table content.
-#document-fragment
-tbody
-#document
-| <tr>
-
-#data
-<table><tbody></thead>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 22 Unexpected end tag (thead) in the table body phase. Ignored.
-Line: 1 Col: 22 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-
-#data
-</table><tr>
-#errors
-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
-Line: 1 Col: 12 Unexpected end of file. Expected table content.
-#document-fragment
-tbody
-#document
-| <tr>
-
-#data
-<table><tbody></body></caption></col></colgroup></html></td></th></tr>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 21 Unexpected end tag (body) in the table body phase. Ignored.
-Line: 1 Col: 31 Unexpected end tag (caption) in the table body phase. Ignored.
-Line: 1 Col: 37 Unexpected end tag (col) in the table body phase. Ignored.
-Line: 1 Col: 48 Unexpected end tag (colgroup) in the table body phase. Ignored.
-Line: 1 Col: 55 Unexpected end tag (html) in the table body phase. Ignored.
-Line: 1 Col: 60 Unexpected end tag (td) in the table body phase. Ignored.
-Line: 1 Col: 65 Unexpected end tag (th) in the table body phase. Ignored.
-Line: 1 Col: 70 Unexpected end tag (tr) in the table body phase. Ignored.
-Line: 1 Col: 70 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-
-#data
-<table><tbody></div>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 20 Unexpected end tag (div) in table context caused voodoo mode.
-Line: 1 Col: 20 End tag (div) seen too early. Expected other end tag.
-Line: 1 Col: 20 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-
-#data
-<table><table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected start tag (table) implies end tag (table).
-Line: 1 Col: 14 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|     <table>
-
-#data
-<table></body></caption></col></colgroup></html></tbody></td></tfoot></th></thead></tr>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 14 Unexpected end tag (body). Ignored.
-Line: 1 Col: 24 Unexpected end tag (caption). Ignored.
-Line: 1 Col: 30 Unexpected end tag (col). Ignored.
-Line: 1 Col: 41 Unexpected end tag (colgroup). Ignored.
-Line: 1 Col: 48 Unexpected end tag (html). Ignored.
-Line: 1 Col: 56 Unexpected end tag (tbody). Ignored.
-Line: 1 Col: 61 Unexpected end tag (td). Ignored.
-Line: 1 Col: 69 Unexpected end tag (tfoot). Ignored.
-Line: 1 Col: 74 Unexpected end tag (th). Ignored.
-Line: 1 Col: 82 Unexpected end tag (thead). Ignored.
-Line: 1 Col: 87 Unexpected end tag (tr). Ignored.
-Line: 1 Col: 87 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-
-#data
-</table><tr>
-#errors
-Line: 1 Col: 8 Unexpected end tag (table). Ignored.
-Line: 1 Col: 12 Unexpected end of file. Expected table content.
-#document-fragment
-table
-#document
-| <tbody>
-|   <tr>
-
-#data
-<body></body></html>
-#errors
-Line: 1 Col: 20 Unexpected html end tag in inner html mode.
-Line: 1 Col: 20 Unexpected EOF in inner html mode.
-#document-fragment
-html
-#document
-| <head>
-| <body>
-
-#data
-<html><frameset></frameset></html> 
-#errors
-Line: 1 Col: 6 Unexpected start tag (html). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <frameset>
-|   " "
-
-#data
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN"><html></html>
-#errors
-Line: 1 Col: 50 Erroneous DOCTYPE.
-Line: 1 Col: 63 Unexpected end tag (html) after the (implied) root element.
-#document
-| <!DOCTYPE html "-//W3C//DTD HTML 4.01//EN" "">
-| <html>
-|   <head>
-|   <body>
-
-#data
-<param><frameset></frameset>
-#errors
-Line: 1 Col: 7 Unexpected start tag (param). Expected DOCTYPE.
-Line: 1 Col: 17 Unexpected start tag (frameset).
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<source><frameset></frameset>
-#errors
-Line: 1 Col: 7 Unexpected start tag (source). Expected DOCTYPE.
-Line: 1 Col: 17 Unexpected start tag (frameset).
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<track><frameset></frameset>
-#errors
-Line: 1 Col: 7 Unexpected start tag (track). Expected DOCTYPE.
-Line: 1 Col: 17 Unexpected start tag (frameset).
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-</html><frameset></frameset>
-#errors
-7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-17: Stray “frameset” start tag.
-17: “frameset” start tag seen.
-#document
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-</body><frameset></frameset>
-#errors
-7: End tag seen without seeing a doctype first. Expected “<!DOCTYPE html>”.
-17: Stray “frameset” start tag.
-17: “frameset” start tag seen.
-#document
-| <html>
-|   <head>
-|   <frameset>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests7.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests7.dat
deleted file mode 100644
index f5193c660b..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests7.dat
+++ /dev/null
@@ -1,390 +0,0 @@
-#data
-<!doctype html><body><title>X</title>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <title>
-|       "X"
-
-#data
-<!doctype html><table><title>X</title></table>
-#errors
-Line: 1 Col: 29 Unexpected start tag (title) in table context caused voodoo mode.
-Line: 1 Col: 38 Unexpected end tag (title) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <title>
-|       "X"
-|     <table>
-
-#data
-<!doctype html><head></head><title>X</title>
-#errors
-Line: 1 Col: 35 Unexpected start tag (title) that can be in head. Moved.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "X"
-|   <body>
-
-#data
-<!doctype html></head><title>X</title>
-#errors
-Line: 1 Col: 29 Unexpected start tag (title) that can be in head. Moved.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|     <title>
-|       "X"
-|   <body>
-
-#data
-<!doctype html><table><meta></table>
-#errors
-Line: 1 Col: 28 Unexpected start tag (meta) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <meta>
-|     <table>
-
-#data
-<!doctype html><table>X<tr><td><table> <meta></table></table>
-#errors
-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 45 Unexpected start tag (meta) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <meta>
-|             <table>
-|               " "
-
-#data
-<!doctype html><html> <head>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!doctype html> <head>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!doctype html><table><style> <tr>x </style> </table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <style>
-|         " <tr>x "
-|       " "
-
-#data
-<!doctype html><table><TBODY><script> <tr>x </script> </table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <script>
-|           " <tr>x "
-|         " "
-
-#data
-<!doctype html><p><applet><p>X</p></applet>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <applet>
-|         <p>
-|           "X"
-
-#data
-<!doctype html><listing>
-X</listing>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <listing>
-|       "X"
-
-#data
-<!doctype html><select><input>X
-#errors
-Line: 1 Col: 30 Unexpected input start tag in the select phase.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <input>
-|     "X"
-
-#data
-<!doctype html><select><select>X
-#errors
-Line: 1 Col: 31 Unexpected select start tag in the select phase treated as select end tag.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     "X"
-
-#data
-<!doctype html><table><input type=hidDEN></table>
-#errors
-Line: 1 Col: 41 Unexpected input with type hidden in table context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <input>
-|         type="hidDEN"
-
-#data
-<!doctype html><table>X<input type=hidDEN></table>
-#errors
-Line: 1 Col: 23 Unexpected non-space characters in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     "X"
-|     <table>
-|       <input>
-|         type="hidDEN"
-
-#data
-<!doctype html><table>  <input type=hidDEN></table>
-#errors
-Line: 1 Col: 43 Unexpected input with type hidden in table context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       "  "
-|       <input>
-|         type="hidDEN"
-
-#data
-<!doctype html><table>  <input type='hidDEN'></table>
-#errors
-Line: 1 Col: 45 Unexpected input with type hidden in table context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       "  "
-|       <input>
-|         type="hidDEN"
-
-#data
-<!doctype html><table><input type=" hidden"><input type=hidDEN></table>
-#errors
-Line: 1 Col: 44 Unexpected start tag (input) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <input>
-|       type=" hidden"
-|     <table>
-|       <input>
-|         type="hidDEN"
-
-#data
-<!doctype html><table><select>X<tr>
-#errors
-Line: 1 Col: 30 Unexpected start tag (select) in table context caused voodoo mode.
-Line: 1 Col: 35 Unexpected table element start tag (trs) in the select in table phase.
-Line: 1 Col: 35 Unexpected end of file. Expected table content.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       "X"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!doctype html><select>X</select>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       "X"
-
-#data
-<!DOCTYPE hTmL><html></html>
-#errors
-Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<!DOCTYPE HTML><html></html>
-#errors
-Line: 1 Col: 28 Unexpected end tag (html) after the (implied) root element.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-
-#data
-<body>X</body></body>
-#errors
-Line: 1 Col: 21 Unexpected end tag token (body) in the after body phase.
-Line: 1 Col: 21 Unexpected EOF in inner html mode.
-#document-fragment
-html
-#document
-| <head>
-| <body>
-|   "X"
-
-#data
-<div><p>a</x> b
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 13 Unexpected end tag (x). Ignored.
-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <p>
-|         "a b"
-
-#data
-<table><tr><td><code></code> </table>
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <code>
-|             " "
-
-#data
-<table><b><tr><td>aaa</td></tr>bbb</table>ccc
-#errors
-XXX: Fix me
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|     <b>
-|       "bbb"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "aaa"
-|     <b>
-|       "ccc"
-
-#data
-A<table><tr> B</tr> B</table>
-#errors
-XXX: Fix me
-#document
-| <html>
-|   <head>
-|   <body>
-|     "A B B"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-A<table><tr> B</tr> </em>C</table>
-#errors
-XXX: Fix me
-#document
-| <html>
-|   <head>
-|   <body>
-|     "A BC"
-|     <table>
-|       <tbody>
-|         <tr>
-|         " "
-
-#data
-<select><keygen>
-#errors
-Not known
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|     <keygen>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests8.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests8.dat
deleted file mode 100644
index 90e6c919e8..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests8.dat
+++ /dev/null
@@ -1,148 +0,0 @@
-#data
-<div>
-<div></div>
-</span>x
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 3 Col: 7 Unexpected end tag (span). Ignored.
-Line: 3 Col: 8 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "
-"
-|       <div>
-|       "
-x"
-
-#data
-<div>x<div></div>
-</span>x
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 2 Col: 7 Unexpected end tag (span). Ignored.
-Line: 2 Col: 8 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "
-x"
-
-#data
-<div>x<div></div>x</span>x
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 25 Unexpected end tag (span). Ignored.
-Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "xx"
-
-#data
-<div>x<div></div>y</span>z
-#errors
-Line: 1 Col: 5 Unexpected start tag (div). Expected DOCTYPE.
-Line: 1 Col: 25 Unexpected end tag (span). Ignored.
-Line: 1 Col: 26 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "yz"
-
-#data
-<table><div>x<div></div>x</span>x
-#errors
-Line: 1 Col: 7 Unexpected start tag (table). Expected DOCTYPE.
-Line: 1 Col: 12 Unexpected start tag (div) in table context caused voodoo mode.
-Line: 1 Col: 18 Unexpected start tag (div) in table context caused voodoo mode.
-Line: 1 Col: 24 Unexpected end tag (div) in table context caused voodoo mode.
-Line: 1 Col: 32 Unexpected end tag (span) in table context caused voodoo mode.
-Line: 1 Col: 32 Unexpected end tag (span). Ignored.
-Line: 1 Col: 33 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "x"
-|       <div>
-|       "xx"
-|     <table>
-
-#data
-x<table>x
-#errors
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-Line: 1 Col: 9 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 9 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "xx"
-|     <table>
-
-#data
-x<table><table>x
-#errors
-Line: 1 Col: 1 Unexpected non-space characters. Expected DOCTYPE.
-Line: 1 Col: 15 Unexpected start tag (table) implies end tag (table).
-Line: 1 Col: 16 Unexpected non-space characters in table context caused voodoo mode.
-Line: 1 Col: 16 Unexpected end of file. Expected table content.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "x"
-|     <table>
-|     "x"
-|     <table>
-
-#data
-<b>a<div></div><div></b>y
-#errors
-Line: 1 Col: 3 Unexpected start tag (b). Expected DOCTYPE.
-Line: 1 Col: 24 End tag (b) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 25 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|       "a"
-|       <div>
-|     <div>
-|       <b>
-|       "y"
-
-#data
-<a><div><p></a>
-#errors
-Line: 1 Col: 3 Unexpected start tag (a). Expected DOCTYPE.
-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 15 End tag (a) violates step 1, paragraph 3 of the adoption agency algorithm.
-Line: 1 Col: 15 Expected closing tag. Unexpected end of file.
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <div>
-|       <a>
-|       <p>
-|         <a>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests9.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests9.dat
deleted file mode 100644
index 554e27aecf..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests9.dat
+++ /dev/null
@@ -1,457 +0,0 @@
-#data
-<!DOCTYPE html><math></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-
-#data
-<!DOCTYPE html><body><math></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-
-#data
-<!DOCTYPE html><math><mi>
-#errors
-25: End of file in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-
-#data
-<!DOCTYPE html><math><annotation-xml><svg><u>
-#errors
-45: HTML start tag “u” in a foreign namespace context.
-45: End of file seen and there were open elements.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math annotation-xml>
-|         <svg svg>
-|     <u>
-
-#data
-<!DOCTYPE html><body><select><math></math></select>
-#errors
-Line: 1 Col: 35 Unexpected start tag token (math) in the select phase. Ignored.
-Line: 1 Col: 42 Unexpected end tag (math) in the select phase. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-
-#data
-<!DOCTYPE html><body><select><option><math></math></option></select>
-#errors
-Line: 1 Col: 43 Unexpected start tag token (math) in the select phase. Ignored.
-Line: 1 Col: 50 Unexpected end tag (math) in the select phase. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-
-#data
-<!DOCTYPE html><body><table><math></math></table>
-#errors
-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 41 Unexpected end tag (math) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><math><mi>foo</mi></math></table>
-#errors
-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 53 Unexpected end tag (math) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><math><mi>foo</mi><mi>bar</mi></math></table>
-#errors
-Line: 1 Col: 34 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 46 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 58 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 65 Unexpected end tag (math) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <table>
-
-#data
-<!DOCTYPE html><body><table><tbody><math><mi>foo</mi><mi>bar</mi></math></tbody></table>
-#errors
-Line: 1 Col: 41 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 53 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 65 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 72 Unexpected end tag (math) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <table>
-|       <tbody>
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><math><mi>foo</mi><mi>bar</mi></math></tr></tbody></table>
-#errors
-Line: 1 Col: 45 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 57 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 69 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 76 Unexpected end tag (math) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math></td></tr></tbody></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <math math>
-|               <math mi>
-|                 "foo"
-|               <math mi>
-|                 "bar"
-
-#data
-<!DOCTYPE html><body><table><tbody><tr><td><math><mi>foo</mi><mi>bar</mi></math><p>baz</td></tr></tbody></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <math math>
-|               <math mi>
-|                 "foo"
-|               <math mi>
-|                 "bar"
-|             <p>
-|               "baz"
-
-#data
-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi></math><p>baz</caption></table>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <math math>
-|           <math mi>
-|             "foo"
-|           <math mi>
-|             "bar"
-|         <p>
-|           "baz"
-
-#data
-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
-#errors
-Line: 1 Col: 70 HTML start tag "p" in a foreign namespace context.
-Line: 1 Col: 81 Unexpected end table tag in caption. Generates implied end caption.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <math math>
-|           <math mi>
-|             "foo"
-|           <math mi>
-|             "bar"
-|         <p>
-|           "baz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><caption><math><mi>foo</mi><mi>bar</mi>baz</table><p>quux
-#errors
-Line: 1 Col: 78 Unexpected end table tag in caption. Generates implied end caption.
-Line: 1 Col: 78 Unexpected end tag (caption). Missing end tag (math).
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <caption>
-|         <math math>
-|           <math mi>
-|             "foo"
-|           <math mi>
-|             "bar"
-|           "baz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><colgroup><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
-#errors
-Line: 1 Col: 44 Unexpected start tag (math) in table context caused voodoo mode.
-Line: 1 Col: 56 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 68 Unexpected end tag (mi) in table context caused voodoo mode.
-Line: 1 Col: 71 HTML start tag "p" in a foreign namespace context.
-Line: 1 Col: 71 Unexpected start tag (p) in table context caused voodoo mode.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <p>
-|       "baz"
-|     <table>
-|       <colgroup>
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><tr><td><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
-#errors
-Line: 1 Col: 50 Unexpected start tag token (math) in the select phase. Ignored.
-Line: 1 Col: 54 Unexpected start tag token (mi) in the select phase. Ignored.
-Line: 1 Col: 62 Unexpected end tag (mi) in the select phase. Ignored.
-Line: 1 Col: 66 Unexpected start tag token (mi) in the select phase. Ignored.
-Line: 1 Col: 74 Unexpected end tag (mi) in the select phase. Ignored.
-Line: 1 Col: 77 Unexpected start tag token (p) in the select phase. Ignored.
-Line: 1 Col: 88 Unexpected table element end tag (tables) in the select in table phase.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <select>
-|               "foobarbaz"
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body><table><select><math><mi>foo</mi><mi>bar</mi><p>baz</table><p>quux
-#errors
-Line: 1 Col: 36 Unexpected start tag (select) in table context caused voodoo mode.
-Line: 1 Col: 42 Unexpected start tag token (math) in the select phase. Ignored.
-Line: 1 Col: 46 Unexpected start tag token (mi) in the select phase. Ignored.
-Line: 1 Col: 54 Unexpected end tag (mi) in the select phase. Ignored.
-Line: 1 Col: 58 Unexpected start tag token (mi) in the select phase. Ignored.
-Line: 1 Col: 66 Unexpected end tag (mi) in the select phase. Ignored.
-Line: 1 Col: 69 Unexpected start tag token (p) in the select phase. Ignored.
-Line: 1 Col: 80 Unexpected table element end tag (tables) in the select in table phase.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       "foobarbaz"
-|     <table>
-|     <p>
-|       "quux"
-
-#data
-<!DOCTYPE html><body></body></html><math><mi>foo</mi><mi>bar</mi><p>baz
-#errors
-Line: 1 Col: 41 Unexpected start tag (math).
-Line: 1 Col: 68 HTML start tag "p" in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <p>
-|       "baz"
-
-#data
-<!DOCTYPE html><body></body><math><mi>foo</mi><mi>bar</mi><p>baz
-#errors
-Line: 1 Col: 34 Unexpected start tag token (math) in the after body phase.
-Line: 1 Col: 61 HTML start tag "p" in a foreign namespace context.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mi>
-|         "foo"
-|       <math mi>
-|         "bar"
-|     <p>
-|       "baz"
-
-#data
-<!DOCTYPE html><frameset><math><mi></mi><mi></mi><p><span>
-#errors
-Line: 1 Col: 31 Unexpected start tag token (math) in the frameset phase. Ignored.
-Line: 1 Col: 35 Unexpected start tag token (mi) in the frameset phase. Ignored.
-Line: 1 Col: 40 Unexpected end tag token (mi) in the frameset phase. Ignored.
-Line: 1 Col: 44 Unexpected start tag token (mi) in the frameset phase. Ignored.
-Line: 1 Col: 49 Unexpected end tag token (mi) in the frameset phase. Ignored.
-Line: 1 Col: 52 Unexpected start tag token (p) in the frameset phase. Ignored.
-Line: 1 Col: 58 Unexpected start tag token (span) in the frameset phase. Ignored.
-Line: 1 Col: 58 Expected closing tag. Unexpected end of file.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><frameset></frameset><math><mi></mi><mi></mi><p><span>
-#errors
-Line: 1 Col: 42 Unexpected start tag (math) in the after frameset phase. Ignored.
-Line: 1 Col: 46 Unexpected start tag (mi) in the after frameset phase. Ignored.
-Line: 1 Col: 51 Unexpected end tag (mi) in the after frameset phase. Ignored.
-Line: 1 Col: 55 Unexpected start tag (mi) in the after frameset phase. Ignored.
-Line: 1 Col: 60 Unexpected end tag (mi) in the after frameset phase. Ignored.
-Line: 1 Col: 63 Unexpected start tag (p) in the after frameset phase. Ignored.
-Line: 1 Col: 69 Unexpected start tag (span) in the after frameset phase. Ignored.
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!DOCTYPE html><body xlink:href=foo><math xlink:href=foo></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     <math math>
-|       xlink href="foo"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo></mi></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <math math>
-|       <math mi>
-|         xlink href="foo"
-|         xml lang="en"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo /></math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <math math>
-|       <math mi>
-|         xlink href="foo"
-|         xml lang="en"
-
-#data
-<!DOCTYPE html><body xlink:href=foo xml:lang=en><math><mi xml:lang=en xlink:href=foo />bar</math>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     xlink:href="foo"
-|     xml:lang="en"
-|     <math math>
-|       <math mi>
-|         xlink href="foo"
-|         xml lang="en"
-|       "bar"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
deleted file mode 100644
index 6c78661e0c..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tests_innerHTML_1.dat
+++ /dev/null
@@ -1,741 +0,0 @@
-#data
-<body><span>
-#errors
-#document-fragment
-body
-#document
-| <span>
-
-#data
-<span><body>
-#errors
-#document-fragment
-body
-#document
-| <span>
-
-#data
-<span><body>
-#errors
-#document-fragment
-div
-#document
-| <span>
-
-#data
-<body><span>
-#errors
-#document-fragment
-html
-#document
-| <head>
-| <body>
-|   <span>
-
-#data
-<frameset><span>
-#errors
-#document-fragment
-body
-#document
-| <span>
-
-#data
-<span><frameset>
-#errors
-#document-fragment
-body
-#document
-| <span>
-
-#data
-<span><frameset>
-#errors
-#document-fragment
-div
-#document
-| <span>
-
-#data
-<frameset><span>
-#errors
-#document-fragment
-html
-#document
-| <head>
-| <frameset>
-
-#data
-<table><tr>
-#errors
-#document-fragment
-table
-#document
-| <tbody>
-|   <tr>
-
-#data
-</table><tr>
-#errors
-#document-fragment
-table
-#document
-| <tbody>
-|   <tr>
-
-#data
-<a>
-#errors
-#document-fragment
-table
-#document
-| <a>
-
-#data
-<a>
-#errors
-#document-fragment
-table
-#document
-| <a>
-
-#data
-<a><caption>a
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <caption>
-|   "a"
-
-#data
-<a><colgroup><col>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <colgroup>
-|   <col>
-
-#data
-<a><tbody><tr>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <tbody>
-|   <tr>
-
-#data
-<a><tfoot><tr>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <tfoot>
-|   <tr>
-
-#data
-<a><thead><tr>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <thead>
-|   <tr>
-
-#data
-<a><tr>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <tbody>
-|   <tr>
-
-#data
-<a><th>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <tbody>
-|   <tr>
-|     <th>
-
-#data
-<a><td>
-#errors
-#document-fragment
-table
-#document
-| <a>
-| <tbody>
-|   <tr>
-|     <td>
-
-#data
-<table></table><tbody>
-#errors
-#document-fragment
-caption
-#document
-| <table>
-
-#data
-</table><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-
-#data
-<span></table>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-
-#data
-</caption><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-
-#data
-<span></caption><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><caption><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><col><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><colgroup><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><html><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><tbody><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><td><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><tfoot><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><thead><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><th><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span><tr><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-<span></table><span>
-#errors
-#document-fragment
-caption
-#document
-| <span>
-|   <span>
-
-#data
-</colgroup><col>
-#errors
-#document-fragment
-colgroup
-#document
-| <col>
-
-#data
-<a><col>
-#errors
-#document-fragment
-colgroup
-#document
-| <col>
-
-#data
-<caption><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<col><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<colgroup><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<tbody><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<tfoot><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<thead><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-</table><a>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-
-#data
-<a><tr>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-| <tr>
-
-#data
-<a><td>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-| <tr>
-|   <td>
-
-#data
-<a><td>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-| <tr>
-|   <td>
-
-#data
-<a><td>
-#errors
-#document-fragment
-tbody
-#document
-| <a>
-| <tr>
-|   <td>
-
-#data
-<td><table><tbody><a><tr>
-#errors
-#document-fragment
-tbody
-#document
-| <tr>
-|   <td>
-|     <a>
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-</tr><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<td><table><a><tr></tr><tr>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-|   <a>
-|   <table>
-|     <tbody>
-|       <tr>
-|       <tr>
-
-#data
-<caption><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<col><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<colgroup><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<tbody><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<tfoot><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<thead><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<tr><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-</table><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-
-#data
-<td><table></table><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-|   <table>
-| <td>
-
-#data
-<td><table></table><td>
-#errors
-#document-fragment
-tr
-#document
-| <td>
-|   <table>
-| <td>
-
-#data
-<caption><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<col><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<colgroup><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<tbody><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<tfoot><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<th><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<thead><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<tr><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</table><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</tbody><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</td><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</tfoot><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</thead><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</th><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-</tr><a>
-#errors
-#document-fragment
-td
-#document
-| <a>
-
-#data
-<table><td><td>
-#errors
-#document-fragment
-td
-#document
-| <table>
-|   <tbody>
-|     <tr>
-|       <td>
-|       <td>
-
-#data
-</select><option>
-#errors
-#document-fragment
-select
-#document
-| <option>
-
-#data
-<input><option>
-#errors
-#document-fragment
-select
-#document
-| <option>
-
-#data
-<keygen><option>
-#errors
-#document-fragment
-select
-#document
-| <option>
-
-#data
-<textarea><option>
-#errors
-#document-fragment
-select
-#document
-| <option>
-
-#data
-</html><!--abc-->
-#errors
-#document-fragment
-html
-#document
-| <head>
-| <body>
-| <!-- abc -->
-
-#data
-</frameset><frame>
-#errors
-#document-fragment
-frameset
-#document
-| <frame>
-
-#data
-#errors
-#document-fragment
-html
-#document
-| <head>
-| <body>
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/tricky01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/tricky01.dat
deleted file mode 100644
index 0841992448..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/tricky01.dat
+++ /dev/null
@@ -1,261 +0,0 @@
-#data
-<b><p>Bold </b> Not bold</p>
-Also not bold.
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <b>
-|     <p>
-|       <b>
-|         "Bold "
-|       " Not bold"
-|     "
-Also not bold."
-
-#data
-<html>
-<font color=red><i>Italic and Red<p>Italic and Red </font> Just italic.</p> Italic only.</i> Plain
-<p>I should not be red. <font color=red>Red. <i>Italic and red.</p>
-<p>Italic and red. </i> Red.</font> I should not be red.</p>
-<b>Bold <i>Bold and italic</b> Only Italic </i> Plain
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|       color="red"
-|       <i>
-|         "Italic and Red"
-|     <i>
-|       <p>
-|         <font>
-|           color="red"
-|           "Italic and Red "
-|         " Just italic."
-|       " Italic only."
-|     " Plain
-"
-|     <p>
-|       "I should not be red. "
-|       <font>
-|         color="red"
-|         "Red. "
-|         <i>
-|           "Italic and red."
-|     <font>
-|       color="red"
-|       <i>
-|         "
-"
-|     <p>
-|       <font>
-|         color="red"
-|         <i>
-|           "Italic and red. "
-|         " Red."
-|       " I should not be red."
-|     "
-"
-|     <b>
-|       "Bold "
-|       <i>
-|         "Bold and italic"
-|     <i>
-|       " Only Italic "
-|     " Plain"
-
-#data
-<html><body>
-<p><font size="7">First paragraph.</p>
-<p>Second paragraph.</p></font>
-<b><p><i>Bold and Italic</b> Italic</p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "
-"
-|     <p>
-|       <font>
-|         size="7"
-|         "First paragraph."
-|     <font>
-|       size="7"
-|       "
-"
-|       <p>
-|         "Second paragraph."
-|     "
-"
-|     <b>
-|     <p>
-|       <b>
-|         <i>
-|           "Bold and Italic"
-|       <i>
-|         " Italic"
-
-#data
-<html>
-<dl>
-<dt><b>Boo
-<dd>Goo?
-</dl>
-</html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <dl>
-|       "
-"
-|       <dt>
-|         <b>
-|           "Boo
-"
-|       <dd>
-|         <b>
-|           "Goo?
-"
-|     <b>
-|       "
-"
-
-#data
-<html><body>
-<label><a><div>Hello<div>World</div></a></label>  
-</body></html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "
-"
-|     <label>
-|       <a>
-|       <div>
-|         <a>
-|           "Hello"
-|           <div>
-|             "World"
-|         "  
-"
-
-#data
-<table><center> <font>a</center> <img> <tr><td> </td> </tr> </table>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <center>
-|       " "
-|       <font>
-|         "a"
-|     <font>
-|       <img>
-|       " "
-|     <table>
-|       " "
-|       <tbody>
-|         <tr>
-|           <td>
-|             " "
-|           " "
-|         " "
-
-#data
-<table><tr><p><a><p>You should see this text.
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       <a>
-|     <p>
-|       <a>
-|         "You should see this text."
-|     <table>
-|       <tbody>
-|         <tr>
-
-#data
-<TABLE>
-<TR>
-<CENTER><CENTER><TD></TD></TR><TR>
-<FONT>
-<TABLE><tr></tr></TABLE>
-</P>
-<a></font><font></a>
-This page contains an insanely badly-nested tag sequence.
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <center>
-|       <center>
-|     <font>
-|       "
-"
-|     <table>
-|       "
-"
-|       <tbody>
-|         <tr>
-|           "
-"
-|           <td>
-|         <tr>
-|           "
-"
-|     <table>
-|       <tbody>
-|         <tr>
-|     <font>
-|       "
-"
-|       <p>
-|       "
-"
-|       <a>
-|     <a>
-|       <font>
-|     <font>
-|       "
-This page contains an insanely badly-nested tag sequence."
-
-#data
-<html>
-<body>
-<b><nobr><div>This text is in a div inside a nobr</nobr>More text that should not be in the nobr, i.e., the
-nobr should have closed the div inside it implicitly. </b><pre>A pre tag outside everything else.</pre>
-</body>
-</html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "
-"
-|     <b>
-|       <nobr>
-|     <div>
-|       <b>
-|         <nobr>
-|           "This text is in a div inside a nobr"
-|         "More text that should not be in the nobr, i.e., the
-nobr should have closed the div inside it implicitly. "
-|       <pre>
-|         "A pre tag outside everything else."
-|       "
-
-"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit01.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit01.dat
deleted file mode 100644
index 9d425e99d5..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit01.dat
+++ /dev/null
@@ -1,610 +0,0 @@
-#data
-Test
-#errors
-Line: 1 Col: 4 Unexpected non-space characters. Expected DOCTYPE.
-#document
-| <html>
-|   <head>
-|   <body>
-|     "Test"
-
-#data
-<div></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-
-#data
-<div>Test</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "Test"
-
-#data
-<di
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<div>Hello</div>
-<script>
-console.log("PASS");
-</script>
-<div>Bye</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "Hello"
-|     "
-"
-|     <script>
-|       "
-console.log("PASS");
-"
-|     "
-"
-|     <div>
-|       "Bye"
-
-#data
-<div foo="bar">Hello</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       foo="bar"
-|       "Hello"
-
-#data
-<div>Hello</div>
-<script>
-console.log("FOO<span>BAR</span>BAZ");
-</script>
-<div>Bye</div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       "Hello"
-|     "
-"
-|     <script>
-|       "
-console.log("FOO<span>BAR</span>BAZ");
-"
-|     "
-"
-|     <div>
-|       "Bye"
-
-#data
-<foo bar="baz"></foo><potato quack="duck"></potato>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       bar="baz"
-|     <potato>
-|       quack="duck"
-
-#data
-<foo bar="baz"><potato quack="duck"></potato></foo>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       bar="baz"
-|       <potato>
-|         quack="duck"
-
-#data
-<foo></foo bar="baz"><potato></potato quack="duck">
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|     <potato>
-
-#data
-</ tttt>
-#errors
-#document
-| <!--  tttt -->
-| <html>
-|   <head>
-|   <body>
-
-#data
-<div FOO ><img><img></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       foo=""
-|       <img>
-|       <img>
-
-#data
-<p>Test</p<p>Test2</p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       "TestTest2"
-
-#data
-<rdar://problem/6869687>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <rdar:>
-|       6869687=""
-|       problem=""
-
-#data
-<A>test< /A>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|       "test< /A>"
-
-#data
-&lt;
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "<"
-
-#data
-<body foo='bar'><body foo='baz' yo='mama'>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     foo="bar"
-|     yo="mama"
-
-#data
-<body></br foo="bar"></body>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <br>
-
-#data
-<bdy><br foo="bar"></body>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <bdy>
-|       <br>
-|         foo="bar"
-
-#data
-<body></body></br foo="bar">
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <br>
-
-#data
-<bdy></body><br foo="bar">
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <bdy>
-|       <br>
-|         foo="bar"
-
-#data
-<html><body></body></html><!-- Hi there -->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-| <!--  Hi there  -->
-
-#data
-<html><body></body></html>x<!-- Hi there -->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "x"
-|     <!--  Hi there  -->
-
-#data
-<html><body></body></html>x<!-- Hi there --></html><!-- Again -->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "x"
-|     <!--  Hi there  -->
-| <!--  Again  -->
-
-#data
-<html><body></body></html>x<!-- Hi there --></body></html><!-- Again -->
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "x"
-|     <!--  Hi there  -->
-| <!--  Again  -->
-
-#data
-<html><body><ruby><div><rp>xx</rp></div></ruby></body></html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <rp>
-|           "xx"
-
-#data
-<html><body><ruby><div><rt>xx</rt></div></ruby></body></html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ruby>
-|       <div>
-|         <rt>
-|           "xx"
-
-#data
-<html><frameset><!--1--><noframes>A</noframes><!--2--></frameset><!--3--><noframes>B</noframes><!--4--></html><!--5--><noframes>C</noframes><!--6-->
-#errors
-#document
-| <html>
-|   <head>
-|   <frameset>
-|     <!-- 1 -->
-|     <noframes>
-|       "A"
-|     <!-- 2 -->
-|   <!-- 3 -->
-|   <noframes>
-|     "B"
-|   <!-- 4 -->
-|   <noframes>
-|     "C"
-| <!-- 5 -->
-| <!-- 6 -->
-
-#data
-<select><option>A<select><option>B<select><option>C<select><option>D<select><option>E<select><option>F<select><option>G<select>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <select>
-|       <option>
-|         "A"
-|     <option>
-|       "B"
-|       <select>
-|         <option>
-|           "C"
-|     <option>
-|       "D"
-|       <select>
-|         <option>
-|           "E"
-|     <option>
-|       "F"
-|       <select>
-|         <option>
-|           "G"
-
-#data
-<dd><dd><dt><dt><dd><li><li>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <dd>
-|     <dd>
-|     <dt>
-|     <dt>
-|     <dd>
-|       <li>
-|       <li>
-
-#data
-<div><b></div><div><nobr>a<nobr>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <b>
-|     <div>
-|       <b>
-|         <nobr>
-|           "a"
-|         <nobr>
-
-#data
-<head></head>
-<body></body>
-#errors
-#document
-| <html>
-|   <head>
-|   "
-"
-|   <body>
-
-#data
-<head></head> <style></style>ddd
-#errors
-#document
-| <html>
-|   <head>
-|     <style>
-|   " "
-|   <body>
-|     "ddd"
-
-#data
-<kbd><table></kbd><col><select><tr>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <kbd>
-|       <select>
-|       <table>
-|         <colgroup>
-|           <col>
-|         <tbody>
-|           <tr>
-
-#data
-<kbd><table></kbd><col><select><tr></table><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <kbd>
-|       <select>
-|       <table>
-|         <colgroup>
-|           <col>
-|         <tbody>
-|           <tr>
-|       <div>
-
-#data
-<a><li><style></style><title></title></a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <li>
-|       <a>
-|         <style>
-|         <title>
-
-#data
-<font></p><p><meta><title></title></font>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <font>
-|       <p>
-|     <p>
-|       <font>
-|         <meta>
-|         <title>
-
-#data
-<a><center><title></title><a>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <a>
-|     <center>
-|       <a>
-|         <title>
-|       <a>
-
-#data
-<svg><title><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg title>
-|         <div>
-
-#data
-<svg><title><rect><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg title>
-|         <rect>
-|           <div>
-
-#data
-<svg><title><svg><div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg title>
-|         <svg svg>
-|         <div>
-
-#data
-<img <="" FAIL>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <img>
-|       <=""
-|       fail=""
-
-#data
-<ul><li><div id='foo'/>A</li><li>B<div>C</div></li></ul>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <ul>
-|       <li>
-|         <div>
-|           id="foo"
-|           "A"
-|       <li>
-|         "B"
-|         <div>
-|           "C"
-
-#data
-<svg><em><desc></em>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|     <em>
-|       <desc>
-
-#data
-<table><tr><td><svg><desc><td></desc><circle>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             <svg svg>
-|               <svg desc>
-|           <td>
-|             <circle>
-
-#data
-<svg><tfoot></mi><td>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <svg svg>
-|       <svg tfoot>
-|         <svg td>
-
-#data
-<math><mrow><mrow><mn>1</mn></mrow><mi>a</mi></mrow></math>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <math math>
-|       <math mrow>
-|         <math mrow>
-|           <math mn>
-|             "1"
-|         <math mi>
-|           "a"
-
-#data
-<!doctype html><input type="hidden"><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <frameset>
-
-#data
-<!doctype html><input type="button"><frameset>
-#errors
-#document
-| <!DOCTYPE html>
-| <html>
-|   <head>
-|   <body>
-|     <input>
-|       type="button"
diff --git a/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit02.dat b/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit02.dat
deleted file mode 100644
index 905783d3cd..0000000000
--- a/installer/vendor/golang.org/x/net/html/testdata/webkit/webkit02.dat
+++ /dev/null
@@ -1,159 +0,0 @@
-#data
-<foo bar=qux/>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <foo>
-|       bar="qux/"
-
-#data
-<p id="status"><noscript><strong>A</strong></noscript><span>B</span></p>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <p>
-|       id="status"
-|       <noscript>
-|         "<strong>A</strong>"
-|       <span>
-|         "B"
-
-#data
-<div><sarcasm><div></div></sarcasm></div>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <div>
-|       <sarcasm>
-|         <div>
-
-#data
-<html><body><img src="" border="0" alt="><div>A</div></body></html>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-
-#data
-<table><td></tbody>A
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     "A"
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-
-#data
-<table><td></thead>A
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "A"
-
-#data
-<table><td></tfoot>A
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <tbody>
-|         <tr>
-|           <td>
-|             "A"
-
-#data
-<table><thead><td></tbody>A
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <table>
-|       <thead>
-|         <tr>
-|           <td>
-|             "A"
-
-#data
-<legend>test</legend>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <legend>
-|       "test"
-
-#data
-<table><input>
-#errors
-#document
-| <html>
-|   <head>
-|   <body>
-|     <input>
-|     <table>
-
-#data
-<b><em><dcell><postfield><postfield><postfield><postfield><missing_glyph><missing_glyph><missing_glyph><missing_glyph><hkern><aside></b></em>
-#errors
-#document-fragment
-div
-#document
-| <b>
-|   <em>
-|     <dcell>
-|       <postfield>
-|         <postfield>
-|           <postfield>
-|             <postfield>
-|               <missing_glyph>
-|                 <missing_glyph>
-|                   <missing_glyph>
-|                     <missing_glyph>
-|                       <hkern>
-| <aside>
-|   <em>
-|     <b>
-
-#data
-<isindex action="x">
-#errors
-#document-fragment
-table
-#document
-| <form>
-|   action="x"
-| <hr>
-| <label>
-|   "This is a searchable index. Enter search keywords: "
-|   <input>
-|     name="isindex"
-| <hr>
-
-#data
-<option><XH<optgroup></optgroup>
-#errors
-#document-fragment
-select
-#document
-| <option>
diff --git a/installer/vendor/golang.org/x/net/html/token.go b/installer/vendor/golang.org/x/net/html/token.go
deleted file mode 100644
index 893e272a9e..0000000000
--- a/installer/vendor/golang.org/x/net/html/token.go
+++ /dev/null
@@ -1,1219 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"strconv"
-	"strings"
-
-	"golang.org/x/net/html/atom"
-)
-
-// A TokenType is the type of a Token.
-type TokenType uint32
-
-const (
-	// ErrorToken means that an error occurred during tokenization.
-	ErrorToken TokenType = iota
-	// TextToken means a text node.
-	TextToken
-	// A StartTagToken looks like <a>.
-	StartTagToken
-	// An EndTagToken looks like </a>.
-	EndTagToken
-	// A SelfClosingTagToken tag looks like <br/>.
-	SelfClosingTagToken
-	// A CommentToken looks like <!--x-->.
-	CommentToken
-	// A DoctypeToken looks like <!DOCTYPE x>
-	DoctypeToken
-)
-
-// ErrBufferExceeded means that the buffering limit was exceeded.
-var ErrBufferExceeded = errors.New("max buffer exceeded")
-
-// String returns a string representation of the TokenType.
-func (t TokenType) String() string {
-	switch t {
-	case ErrorToken:
-		return "Error"
-	case TextToken:
-		return "Text"
-	case StartTagToken:
-		return "StartTag"
-	case EndTagToken:
-		return "EndTag"
-	case SelfClosingTagToken:
-		return "SelfClosingTag"
-	case CommentToken:
-		return "Comment"
-	case DoctypeToken:
-		return "Doctype"
-	}
-	return "Invalid(" + strconv.Itoa(int(t)) + ")"
-}
-
-// An Attribute is an attribute namespace-key-value triple. Namespace is
-// non-empty for foreign attributes like xlink, Key is alphabetic (and hence
-// does not contain escapable characters like '&', '<' or '>'), and Val is
-// unescaped (it looks like "a<b" rather than "a&lt;b").
-//
-// Namespace is only used by the parser, not the tokenizer.
-type Attribute struct {
-	Namespace, Key, Val string
-}
-
-// A Token consists of a TokenType and some Data (tag name for start and end
-// tags, content for text, comments and doctypes). A tag Token may also contain
-// a slice of Attributes. Data is unescaped for all Tokens (it looks like "a<b"
-// rather than "a&lt;b"). For tag Tokens, DataAtom is the atom for Data, or
-// zero if Data is not a known tag name.
-type Token struct {
-	Type     TokenType
-	DataAtom atom.Atom
-	Data     string
-	Attr     []Attribute
-}
-
-// tagString returns a string representation of a tag Token's Data and Attr.
-func (t Token) tagString() string {
-	if len(t.Attr) == 0 {
-		return t.Data
-	}
-	buf := bytes.NewBufferString(t.Data)
-	for _, a := range t.Attr {
-		buf.WriteByte(' ')
-		buf.WriteString(a.Key)
-		buf.WriteString(`="`)
-		escape(buf, a.Val)
-		buf.WriteByte('"')
-	}
-	return buf.String()
-}
-
-// String returns a string representation of the Token.
-func (t Token) String() string {
-	switch t.Type {
-	case ErrorToken:
-		return ""
-	case TextToken:
-		return EscapeString(t.Data)
-	case StartTagToken:
-		return "<" + t.tagString() + ">"
-	case EndTagToken:
-		return "</" + t.tagString() + ">"
-	case SelfClosingTagToken:
-		return "<" + t.tagString() + "/>"
-	case CommentToken:
-		return "<!--" + t.Data + "-->"
-	case DoctypeToken:
-		return "<!DOCTYPE " + t.Data + ">"
-	}
-	return "Invalid(" + strconv.Itoa(int(t.Type)) + ")"
-}
-
-// span is a range of bytes in a Tokenizer's buffer. The start is inclusive,
-// the end is exclusive.
-type span struct {
-	start, end int
-}
-
-// A Tokenizer returns a stream of HTML Tokens.
-type Tokenizer struct {
-	// r is the source of the HTML text.
-	r io.Reader
-	// tt is the TokenType of the current token.
-	tt TokenType
-	// err is the first error encountered during tokenization. It is possible
-	// for tt != Error && err != nil to hold: this means that Next returned a
-	// valid token but the subsequent Next call will return an error token.
-	// For example, if the HTML text input was just "plain", then the first
-	// Next call would set z.err to io.EOF but return a TextToken, and all
-	// subsequent Next calls would return an ErrorToken.
-	// err is never reset. Once it becomes non-nil, it stays non-nil.
-	err error
-	// readErr is the error returned by the io.Reader r. It is separate from
-	// err because it is valid for an io.Reader to return (n int, err1 error)
-	// such that n > 0 && err1 != nil, and callers should always process the
-	// n > 0 bytes before considering the error err1.
-	readErr error
-	// buf[raw.start:raw.end] holds the raw bytes of the current token.
-	// buf[raw.end:] is buffered input that will yield future tokens.
-	raw span
-	buf []byte
-	// maxBuf limits the data buffered in buf. A value of 0 means unlimited.
-	maxBuf int
-	// buf[data.start:data.end] holds the raw bytes of the current token's data:
-	// a text token's text, a tag token's tag name, etc.
-	data span
-	// pendingAttr is the attribute key and value currently being tokenized.
-	// When complete, pendingAttr is pushed onto attr. nAttrReturned is
-	// incremented on each call to TagAttr.
-	pendingAttr   [2]span
-	attr          [][2]span
-	nAttrReturned int
-	// rawTag is the "script" in "</script>" that closes the next token. If
-	// non-empty, the subsequent call to Next will return a raw or RCDATA text
-	// token: one that treats "<p>" as text instead of an element.
-	// rawTag's contents are lower-cased.
-	rawTag string
-	// textIsRaw is whether the current text token's data is not escaped.
-	textIsRaw bool
-	// convertNUL is whether NUL bytes in the current token's data should
-	// be converted into \ufffd replacement characters.
-	convertNUL bool
-	// allowCDATA is whether CDATA sections are allowed in the current context.
-	allowCDATA bool
-}
-
-// AllowCDATA sets whether or not the tokenizer recognizes <![CDATA[foo]]> as
-// the text "foo". The default value is false, which means to recognize it as
-// a bogus comment "<!-- [CDATA[foo]] -->" instead.
-//
-// Strictly speaking, an HTML5 compliant tokenizer should allow CDATA if and
-// only if tokenizing foreign content, such as MathML and SVG. However,
-// tracking foreign-contentness is difficult to do purely in the tokenizer,
-// as opposed to the parser, due to HTML integration points: an <svg> element
-// can contain a <foreignObject> that is foreign-to-SVG but not foreign-to-
-// HTML. For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call AllowCDATA as appropriate.
-// In practice, if using the tokenizer without caring whether MathML or SVG
-// CDATA is text or comments, such as tokenizing HTML to find all the anchor
-// text, it is acceptable to ignore this responsibility.
-func (z *Tokenizer) AllowCDATA(allowCDATA bool) {
-	z.allowCDATA = allowCDATA
-}
-
-// NextIsNotRawText instructs the tokenizer that the next token should not be
-// considered as 'raw text'. Some elements, such as script and title elements,
-// normally require the next token after the opening tag to be 'raw text' that
-// has no child elements. For example, tokenizing "<title>a<b>c</b>d</title>"
-// yields a start tag token for "<title>", a text token for "a<b>c</b>d", and
-// an end tag token for "</title>". There are no distinct start tag or end tag
-// tokens for the "<b>" and "</b>".
-//
-// This tokenizer implementation will generally look for raw text at the right
-// times. Strictly speaking, an HTML5 compliant tokenizer should not look for
-// raw text if in foreign content: <title> generally needs raw text, but a
-// <title> inside an <svg> does not. Another example is that a <textarea>
-// generally needs raw text, but a <textarea> is not allowed as an immediate
-// child of a <select>; in normal parsing, a <textarea> implies </select>, but
-// one cannot close the implicit element when parsing a <select>'s InnerHTML.
-// Similarly to AllowCDATA, tracking the correct moment to override raw-text-
-// ness is difficult to do purely in the tokenizer, as opposed to the parser.
-// For strict compliance with the HTML5 tokenization algorithm, it is the
-// responsibility of the user of a tokenizer to call NextIsNotRawText as
-// appropriate. In practice, like AllowCDATA, it is acceptable to ignore this
-// responsibility for basic usage.
-//
-// Note that this 'raw text' concept is different from the one offered by the
-// Tokenizer.Raw method.
-func (z *Tokenizer) NextIsNotRawText() {
-	z.rawTag = ""
-}
-
-// Err returns the error associated with the most recent ErrorToken token.
-// This is typically io.EOF, meaning the end of tokenization.
-func (z *Tokenizer) Err() error {
-	if z.tt != ErrorToken {
-		return nil
-	}
-	return z.err
-}
-
-// readByte returns the next byte from the input stream, doing a buffered read
-// from z.r into z.buf if necessary. z.buf[z.raw.start:z.raw.end] remains a contiguous byte
-// slice that holds all the bytes read so far for the current token.
-// It sets z.err if the underlying reader returns an error.
-// Pre-condition: z.err == nil.
-func (z *Tokenizer) readByte() byte {
-	if z.raw.end >= len(z.buf) {
-		// Our buffer is exhausted and we have to read from z.r. Check if the
-		// previous read resulted in an error.
-		if z.readErr != nil {
-			z.err = z.readErr
-			return 0
-		}
-		// We copy z.buf[z.raw.start:z.raw.end] to the beginning of z.buf. If the length
-		// z.raw.end - z.raw.start is more than half the capacity of z.buf, then we
-		// allocate a new buffer before the copy.
-		c := cap(z.buf)
-		d := z.raw.end - z.raw.start
-		var buf1 []byte
-		if 2*d > c {
-			buf1 = make([]byte, d, 2*c)
-		} else {
-			buf1 = z.buf[:d]
-		}
-		copy(buf1, z.buf[z.raw.start:z.raw.end])
-		if x := z.raw.start; x != 0 {
-			// Adjust the data/attr spans to refer to the same contents after the copy.
-			z.data.start -= x
-			z.data.end -= x
-			z.pendingAttr[0].start -= x
-			z.pendingAttr[0].end -= x
-			z.pendingAttr[1].start -= x
-			z.pendingAttr[1].end -= x
-			for i := range z.attr {
-				z.attr[i][0].start -= x
-				z.attr[i][0].end -= x
-				z.attr[i][1].start -= x
-				z.attr[i][1].end -= x
-			}
-		}
-		z.raw.start, z.raw.end, z.buf = 0, d, buf1[:d]
-		// Now that we have copied the live bytes to the start of the buffer,
-		// we read from z.r into the remainder.
-		var n int
-		n, z.readErr = readAtLeastOneByte(z.r, buf1[d:cap(buf1)])
-		if n == 0 {
-			z.err = z.readErr
-			return 0
-		}
-		z.buf = buf1[:d+n]
-	}
-	x := z.buf[z.raw.end]
-	z.raw.end++
-	if z.maxBuf > 0 && z.raw.end-z.raw.start >= z.maxBuf {
-		z.err = ErrBufferExceeded
-		return 0
-	}
-	return x
-}
-
-// Buffered returns a slice containing data buffered but not yet tokenized.
-func (z *Tokenizer) Buffered() []byte {
-	return z.buf[z.raw.end:]
-}
-
-// readAtLeastOneByte wraps an io.Reader so that reading cannot return (0, nil).
-// It returns io.ErrNoProgress if the underlying r.Read method returns (0, nil)
-// too many times in succession.
-func readAtLeastOneByte(r io.Reader, b []byte) (int, error) {
-	for i := 0; i < 100; i++ {
-		n, err := r.Read(b)
-		if n != 0 || err != nil {
-			return n, err
-		}
-	}
-	return 0, io.ErrNoProgress
-}
-
-// skipWhiteSpace skips past any white space.
-func (z *Tokenizer) skipWhiteSpace() {
-	if z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			// No-op.
-		default:
-			z.raw.end--
-			return
-		}
-	}
-}
-
-// readRawOrRCDATA reads until the next "</foo>", where "foo" is z.rawTag and
-// is typically something like "script" or "textarea".
-func (z *Tokenizer) readRawOrRCDATA() {
-	if z.rawTag == "script" {
-		z.readScript()
-		z.textIsRaw = true
-		z.rawTag = ""
-		return
-	}
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '/' {
-			continue loop
-		}
-		if z.readRawEndTag() || z.err != nil {
-			break loop
-		}
-	}
-	z.data.end = z.raw.end
-	// A textarea's or title's RCDATA can contain escaped entities.
-	z.textIsRaw = z.rawTag != "textarea" && z.rawTag != "title"
-	z.rawTag = ""
-}
-
-// readRawEndTag attempts to read a tag like "</foo>", where "foo" is z.rawTag.
-// If it succeeds, it backs up the input position to reconsume the tag and
-// returns true. Otherwise it returns false. The opening "</" has already been
-// consumed.
-func (z *Tokenizer) readRawEndTag() bool {
-	for i := 0; i < len(z.rawTag); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			return false
-		}
-		if c != z.rawTag[i] && c != z.rawTag[i]-('a'-'A') {
-			z.raw.end--
-			return false
-		}
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return false
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		// The 3 is 2 for the leading "</" plus 1 for the trailing character c.
-		z.raw.end -= 3 + len(z.rawTag)
-		return true
-	}
-	z.raw.end--
-	return false
-}
-
-// readScript reads until the next </script> tag, following the byzantine
-// rules for escaping/hiding the closing tag.
-func (z *Tokenizer) readScript() {
-	defer func() {
-		z.data.end = z.raw.end
-	}()
-	var c byte
-
-scriptData:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '<' {
-		goto scriptDataLessThanSign
-	}
-	goto scriptData
-
-scriptDataLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '/':
-		goto scriptDataEndTagOpen
-	case '!':
-		goto scriptDataEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptData
-
-scriptDataEscapeStart:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapeStartDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapeStartDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '-' {
-		goto scriptDataEscapedDashDash
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataEscapedDashDash
-	case '<':
-		goto scriptDataEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataEscaped
-
-scriptDataEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataEscapedEndTagOpen
-	}
-	if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-		goto scriptDataDoubleEscapeStart
-	}
-	z.raw.end--
-	goto scriptData
-
-scriptDataEscapedEndTagOpen:
-	if z.readRawEndTag() || z.err != nil {
-		return
-	}
-	goto scriptDataEscaped
-
-scriptDataDoubleEscapeStart:
-	z.raw.end--
-	for i := 0; i < len("script"); i++ {
-		c = z.readByte()
-		if z.err != nil {
-			return
-		}
-		if c != "script"[i] && c != "SCRIPT"[i] {
-			z.raw.end--
-			goto scriptDataEscaped
-		}
-	}
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case ' ', '\n', '\r', '\t', '\f', '/', '>':
-		goto scriptDataDoubleEscaped
-	}
-	z.raw.end--
-	goto scriptDataEscaped
-
-scriptDataDoubleEscaped:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedDashDash:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch c {
-	case '-':
-		goto scriptDataDoubleEscapedDashDash
-	case '<':
-		goto scriptDataDoubleEscapedLessThanSign
-	case '>':
-		goto scriptData
-	}
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapedLessThanSign:
-	c = z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c == '/' {
-		goto scriptDataDoubleEscapeEnd
-	}
-	z.raw.end--
-	goto scriptDataDoubleEscaped
-
-scriptDataDoubleEscapeEnd:
-	if z.readRawEndTag() {
-		z.raw.end += len("</script>")
-		goto scriptDataEscaped
-	}
-	if z.err != nil {
-		return
-	}
-	goto scriptDataDoubleEscaped
-}
-
-// readComment reads the next comment token starting with "<!--". The opening
-// "<!--" has already been consumed.
-func (z *Tokenizer) readComment() {
-	z.data.start = z.raw.end
-	defer func() {
-		if z.data.end < z.data.start {
-			// It's a comment with no data, like <!-->.
-			z.data.end = z.data.start
-		}
-	}()
-	for dashCount := 2; ; {
-		c := z.readByte()
-		if z.err != nil {
-			// Ignore up to two dashes at EOF.
-			if dashCount > 2 {
-				dashCount = 2
-			}
-			z.data.end = z.raw.end - dashCount
-			return
-		}
-		switch c {
-		case '-':
-			dashCount++
-			continue
-		case '>':
-			if dashCount >= 2 {
-				z.data.end = z.raw.end - len("-->")
-				return
-			}
-		case '!':
-			if dashCount >= 2 {
-				c = z.readByte()
-				if z.err != nil {
-					z.data.end = z.raw.end
-					return
-				}
-				if c == '>' {
-					z.data.end = z.raw.end - len("--!>")
-					return
-				}
-			}
-		}
-		dashCount = 0
-	}
-}
-
-// readUntilCloseAngle reads until the next ">".
-func (z *Tokenizer) readUntilCloseAngle() {
-	z.data.start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		if c == '>' {
-			z.data.end = z.raw.end - len(">")
-			return
-		}
-	}
-}
-
-// readMarkupDeclaration reads the next token starting with "<!". It might be
-// a "<!--comment-->", a "<!DOCTYPE foo>", a "<![CDATA[section]]>" or
-// "<!a bogus comment". The opening "<!" has already been consumed.
-func (z *Tokenizer) readMarkupDeclaration() TokenType {
-	z.data.start = z.raw.end
-	var c [2]byte
-	for i := 0; i < 2; i++ {
-		c[i] = z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return CommentToken
-		}
-	}
-	if c[0] == '-' && c[1] == '-' {
-		z.readComment()
-		return CommentToken
-	}
-	z.raw.end -= 2
-	if z.readDoctype() {
-		return DoctypeToken
-	}
-	if z.allowCDATA && z.readCDATA() {
-		z.convertNUL = true
-		return TextToken
-	}
-	// It's a bogus comment.
-	z.readUntilCloseAngle()
-	return CommentToken
-}
-
-// readDoctype attempts to read a doctype declaration and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readDoctype() bool {
-	const s = "DOCTYPE"
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] && c != s[i]+('a'-'A') {
-			// Back up to read the fragment of "DOCTYPE" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		return true
-	}
-	z.readUntilCloseAngle()
-	return true
-}
-
-// readCDATA attempts to read a CDATA section and returns true if
-// successful. The opening "<!" has already been consumed.
-func (z *Tokenizer) readCDATA() bool {
-	const s = "[CDATA["
-	for i := 0; i < len(s); i++ {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return false
-		}
-		if c != s[i] {
-			// Back up to read the fragment of "[CDATA[" again.
-			z.raw.end = z.data.start
-			return false
-		}
-	}
-	z.data.start = z.raw.end
-	brackets := 0
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return true
-		}
-		switch c {
-		case ']':
-			brackets++
-		case '>':
-			if brackets >= 2 {
-				z.data.end = z.raw.end - len("]]>")
-				return true
-			}
-			brackets = 0
-		default:
-			brackets = 0
-		}
-	}
-}
-
-// startTagIn returns whether the start tag in z.buf[z.data.start:z.data.end]
-// case-insensitively matches any element of ss.
-func (z *Tokenizer) startTagIn(ss ...string) bool {
-loop:
-	for _, s := range ss {
-		if z.data.end-z.data.start != len(s) {
-			continue loop
-		}
-		for i := 0; i < len(s); i++ {
-			c := z.buf[z.data.start+i]
-			if 'A' <= c && c <= 'Z' {
-				c += 'a' - 'A'
-			}
-			if c != s[i] {
-				continue loop
-			}
-		}
-		return true
-	}
-	return false
-}
-
-// readStartTag reads the next start tag token. The opening "<a" has already
-// been consumed, where 'a' means anything in [A-Za-z].
-func (z *Tokenizer) readStartTag() TokenType {
-	z.readTag(true)
-	if z.err != nil {
-		return ErrorToken
-	}
-	// Several tags flag the tokenizer's next token as raw.
-	c, raw := z.buf[z.data.start], false
-	if 'A' <= c && c <= 'Z' {
-		c += 'a' - 'A'
-	}
-	switch c {
-	case 'i':
-		raw = z.startTagIn("iframe")
-	case 'n':
-		raw = z.startTagIn("noembed", "noframes", "noscript")
-	case 'p':
-		raw = z.startTagIn("plaintext")
-	case 's':
-		raw = z.startTagIn("script", "style")
-	case 't':
-		raw = z.startTagIn("textarea", "title")
-	case 'x':
-		raw = z.startTagIn("xmp")
-	}
-	if raw {
-		z.rawTag = strings.ToLower(string(z.buf[z.data.start:z.data.end]))
-	}
-	// Look for a self-closing token like "<br/>".
-	if z.err == nil && z.buf[z.raw.end-2] == '/' {
-		return SelfClosingTagToken
-	}
-	return StartTagToken
-}
-
-// readTag reads the next tag token and its attributes. If saveAttr, those
-// attributes are saved in z.attr, otherwise z.attr is set to an empty slice.
-// The opening "<a" or "</a" has already been consumed, where 'a' means anything
-// in [A-Za-z].
-func (z *Tokenizer) readTag(saveAttr bool) {
-	z.attr = z.attr[:0]
-	z.nAttrReturned = 0
-	// Read the tag name and attribute key/value pairs.
-	z.readTagName()
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	for {
-		c := z.readByte()
-		if z.err != nil || c == '>' {
-			break
-		}
-		z.raw.end--
-		z.readTagAttrKey()
-		z.readTagAttrVal()
-		// Save pendingAttr if saveAttr and that attribute has a non-empty key.
-		if saveAttr && z.pendingAttr[0].start != z.pendingAttr[0].end {
-			z.attr = append(z.attr, z.pendingAttr)
-		}
-		if z.skipWhiteSpace(); z.err != nil {
-			break
-		}
-	}
-}
-
-// readTagName sets z.data to the "div" in "<div k=v>". The reader (z.raw.end)
-// is positioned such that the first byte of the tag name (the "d" in "<div")
-// has already been consumed.
-func (z *Tokenizer) readTagName() {
-	z.data.start = z.raw.end - 1
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.data.end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f':
-			z.data.end = z.raw.end - 1
-			return
-		case '/', '>':
-			z.raw.end--
-			z.data.end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrKey sets z.pendingAttr[0] to the "k" in "<div k=v>".
-// Precondition: z.err == nil.
-func (z *Tokenizer) readTagAttrKey() {
-	z.pendingAttr[0].start = z.raw.end
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-		switch c {
-		case ' ', '\n', '\r', '\t', '\f', '/':
-			z.pendingAttr[0].end = z.raw.end - 1
-			return
-		case '=', '>':
-			z.raw.end--
-			z.pendingAttr[0].end = z.raw.end
-			return
-		}
-	}
-}
-
-// readTagAttrVal sets z.pendingAttr[1] to the "v" in "<div k=v>".
-func (z *Tokenizer) readTagAttrVal() {
-	z.pendingAttr[1].start = z.raw.end
-	z.pendingAttr[1].end = z.raw.end
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	c := z.readByte()
-	if z.err != nil {
-		return
-	}
-	if c != '=' {
-		z.raw.end--
-		return
-	}
-	if z.skipWhiteSpace(); z.err != nil {
-		return
-	}
-	quote := z.readByte()
-	if z.err != nil {
-		return
-	}
-	switch quote {
-	case '>':
-		z.raw.end--
-		return
-
-	case '\'', '"':
-		z.pendingAttr[1].start = z.raw.end
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			if c == quote {
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			}
-		}
-
-	default:
-		z.pendingAttr[1].start = z.raw.end - 1
-		for {
-			c := z.readByte()
-			if z.err != nil {
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-			switch c {
-			case ' ', '\n', '\r', '\t', '\f':
-				z.pendingAttr[1].end = z.raw.end - 1
-				return
-			case '>':
-				z.raw.end--
-				z.pendingAttr[1].end = z.raw.end
-				return
-			}
-		}
-	}
-}
-
-// Next scans the next token and returns its type.
-func (z *Tokenizer) Next() TokenType {
-	z.raw.start = z.raw.end
-	z.data.start = z.raw.end
-	z.data.end = z.raw.end
-	if z.err != nil {
-		z.tt = ErrorToken
-		return z.tt
-	}
-	if z.rawTag != "" {
-		if z.rawTag == "plaintext" {
-			// Read everything up to EOF.
-			for z.err == nil {
-				z.readByte()
-			}
-			z.data.end = z.raw.end
-			z.textIsRaw = true
-		} else {
-			z.readRawOrRCDATA()
-		}
-		if z.data.end > z.data.start {
-			z.tt = TextToken
-			z.convertNUL = true
-			return z.tt
-		}
-	}
-	z.textIsRaw = false
-	z.convertNUL = false
-
-loop:
-	for {
-		c := z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		if c != '<' {
-			continue loop
-		}
-
-		// Check if the '<' we have just read is part of a tag, comment
-		// or doctype. If not, it's part of the accumulated text token.
-		c = z.readByte()
-		if z.err != nil {
-			break loop
-		}
-		var tokenType TokenType
-		switch {
-		case 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z':
-			tokenType = StartTagToken
-		case c == '/':
-			tokenType = EndTagToken
-		case c == '!' || c == '?':
-			// We use CommentToken to mean any of "<!--actual comments-->",
-			// "<!DOCTYPE declarations>" and "<?xml processing instructions?>".
-			tokenType = CommentToken
-		default:
-			// Reconsume the current character.
-			z.raw.end--
-			continue
-		}
-
-		// We have a non-text token, but we might have accumulated some text
-		// before that. If so, we return the text first, and return the non-
-		// text token on the subsequent call to Next.
-		if x := z.raw.end - len("<a"); z.raw.start < x {
-			z.raw.end = x
-			z.data.end = x
-			z.tt = TextToken
-			return z.tt
-		}
-		switch tokenType {
-		case StartTagToken:
-			z.tt = z.readStartTag()
-			return z.tt
-		case EndTagToken:
-			c = z.readByte()
-			if z.err != nil {
-				break loop
-			}
-			if c == '>' {
-				// "</>" does not generate a token at all. Generate an empty comment
-				// to allow passthrough clients to pick up the data using Raw.
-				// Reset the tokenizer state and start again.
-				z.tt = CommentToken
-				return z.tt
-			}
-			if 'a' <= c && c <= 'z' || 'A' <= c && c <= 'Z' {
-				z.readTag(false)
-				if z.err != nil {
-					z.tt = ErrorToken
-				} else {
-					z.tt = EndTagToken
-				}
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		case CommentToken:
-			if c == '!' {
-				z.tt = z.readMarkupDeclaration()
-				return z.tt
-			}
-			z.raw.end--
-			z.readUntilCloseAngle()
-			z.tt = CommentToken
-			return z.tt
-		}
-	}
-	if z.raw.start < z.raw.end {
-		z.data.end = z.raw.end
-		z.tt = TextToken
-		return z.tt
-	}
-	z.tt = ErrorToken
-	return z.tt
-}
-
-// Raw returns the unmodified text of the current token. Calling Next, Token,
-// Text, TagName or TagAttr may change the contents of the returned slice.
-func (z *Tokenizer) Raw() []byte {
-	return z.buf[z.raw.start:z.raw.end]
-}
-
-// convertNewlines converts "\r" and "\r\n" in s to "\n".
-// The conversion happens in place, but the resulting slice may be shorter.
-func convertNewlines(s []byte) []byte {
-	for i, c := range s {
-		if c != '\r' {
-			continue
-		}
-
-		src := i + 1
-		if src >= len(s) || s[src] != '\n' {
-			s[i] = '\n'
-			continue
-		}
-
-		dst := i
-		for src < len(s) {
-			if s[src] == '\r' {
-				if src+1 < len(s) && s[src+1] == '\n' {
-					src++
-				}
-				s[dst] = '\n'
-			} else {
-				s[dst] = s[src]
-			}
-			src++
-			dst++
-		}
-		return s[:dst]
-	}
-	return s
-}
-
-var (
-	nul         = []byte("\x00")
-	replacement = []byte("\ufffd")
-)
-
-// Text returns the unescaped text of a text, comment or doctype token. The
-// contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) Text() []byte {
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		s := z.buf[z.data.start:z.data.end]
-		z.data.start = z.raw.end
-		z.data.end = z.raw.end
-		s = convertNewlines(s)
-		if (z.convertNUL || z.tt == CommentToken) && bytes.Contains(s, nul) {
-			s = bytes.Replace(s, nul, replacement, -1)
-		}
-		if !z.textIsRaw {
-			s = unescape(s, false)
-		}
-		return s
-	}
-	return nil
-}
-
-// TagName returns the lower-cased name of a tag token (the `img` out of
-// `<IMG SRC="foo">`) and whether the tag has attributes.
-// The contents of the returned slice may change on the next call to Next.
-func (z *Tokenizer) TagName() (name []byte, hasAttr bool) {
-	if z.data.start < z.data.end {
-		switch z.tt {
-		case StartTagToken, EndTagToken, SelfClosingTagToken:
-			s := z.buf[z.data.start:z.data.end]
-			z.data.start = z.raw.end
-			z.data.end = z.raw.end
-			return lower(s), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, false
-}
-
-// TagAttr returns the lower-cased key and unescaped value of the next unparsed
-// attribute for the current tag token and whether there are more attributes.
-// The contents of the returned slices may change on the next call to Next.
-func (z *Tokenizer) TagAttr() (key, val []byte, moreAttr bool) {
-	if z.nAttrReturned < len(z.attr) {
-		switch z.tt {
-		case StartTagToken, SelfClosingTagToken:
-			x := z.attr[z.nAttrReturned]
-			z.nAttrReturned++
-			key = z.buf[x[0].start:x[0].end]
-			val = z.buf[x[1].start:x[1].end]
-			return lower(key), unescape(convertNewlines(val), true), z.nAttrReturned < len(z.attr)
-		}
-	}
-	return nil, nil, false
-}
-
-// Token returns the next Token. The result's Data and Attr values remain valid
-// after subsequent Next calls.
-func (z *Tokenizer) Token() Token {
-	t := Token{Type: z.tt}
-	switch z.tt {
-	case TextToken, CommentToken, DoctypeToken:
-		t.Data = string(z.Text())
-	case StartTagToken, SelfClosingTagToken, EndTagToken:
-		name, moreAttr := z.TagName()
-		for moreAttr {
-			var key, val []byte
-			key, val, moreAttr = z.TagAttr()
-			t.Attr = append(t.Attr, Attribute{"", atom.String(key), string(val)})
-		}
-		if a := atom.Lookup(name); a != 0 {
-			t.DataAtom, t.Data = a, a.String()
-		} else {
-			t.DataAtom, t.Data = 0, string(name)
-		}
-	}
-	return t
-}
-
-// SetMaxBuf sets a limit on the amount of data buffered during tokenization.
-// A value of 0 means unlimited.
-func (z *Tokenizer) SetMaxBuf(n int) {
-	z.maxBuf = n
-}
-
-// NewTokenizer returns a new HTML Tokenizer for the given Reader.
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizer(r io.Reader) *Tokenizer {
-	return NewTokenizerFragment(r, "")
-}
-
-// NewTokenizerFragment returns a new HTML Tokenizer for the given Reader, for
-// tokenizing an existing element's InnerHTML fragment. contextTag is that
-// element's tag, such as "div" or "iframe".
-//
-// For example, how the InnerHTML "a<b" is tokenized depends on whether it is
-// for a <p> tag or a <script> tag.
-//
-// The input is assumed to be UTF-8 encoded.
-func NewTokenizerFragment(r io.Reader, contextTag string) *Tokenizer {
-	z := &Tokenizer{
-		r:   r,
-		buf: make([]byte, 0, 4096),
-	}
-	if contextTag != "" {
-		switch s := strings.ToLower(contextTag); s {
-		case "iframe", "noembed", "noframes", "noscript", "plaintext", "script", "style", "title", "textarea", "xmp":
-			z.rawTag = s
-		}
-	}
-	return z
-}
diff --git a/installer/vendor/golang.org/x/net/html/token_test.go b/installer/vendor/golang.org/x/net/html/token_test.go
deleted file mode 100644
index 20221c3284..0000000000
--- a/installer/vendor/golang.org/x/net/html/token_test.go
+++ /dev/null
@@ -1,748 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package html
-
-import (
-	"bytes"
-	"io"
-	"io/ioutil"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-type tokenTest struct {
-	// A short description of the test case.
-	desc string
-	// The HTML to parse.
-	html string
-	// The string representations of the expected tokens, joined by '$'.
-	golden string
-}
-
-var tokenTests = []tokenTest{
-	{
-		"empty",
-		"",
-		"",
-	},
-	// A single text node. The tokenizer should not break text nodes on whitespace,
-	// nor should it normalize whitespace within a text node.
-	{
-		"text",
-		"foo  bar",
-		"foo  bar",
-	},
-	// An entity.
-	{
-		"entity",
-		"one &lt; two",
-		"one &lt; two",
-	},
-	// A start, self-closing and end tag. The tokenizer does not care if the start
-	// and end tokens don't match; that is the job of the parser.
-	{
-		"tags",
-		"<a>b<c/>d</e>",
-		"<a>$b$<c/>$d$</e>",
-	},
-	// Angle brackets that aren't a tag.
-	{
-		"not a tag #0",
-		"<",
-		"&lt;",
-	},
-	{
-		"not a tag #1",
-		"</",
-		"&lt;/",
-	},
-	{
-		"not a tag #2",
-		"</>",
-		"<!---->",
-	},
-	{
-		"not a tag #3",
-		"a</>b",
-		"a$<!---->$b",
-	},
-	{
-		"not a tag #4",
-		"</ >",
-		"<!-- -->",
-	},
-	{
-		"not a tag #5",
-		"</.",
-		"<!--.-->",
-	},
-	{
-		"not a tag #6",
-		"</.>",
-		"<!--.-->",
-	},
-	{
-		"not a tag #7",
-		"a < b",
-		"a &lt; b",
-	},
-	{
-		"not a tag #8",
-		"<.>",
-		"&lt;.&gt;",
-	},
-	{
-		"not a tag #9",
-		"a<<<b>>>c",
-		"a&lt;&lt;$<b>$&gt;&gt;c",
-	},
-	{
-		"not a tag #10",
-		"if x<0 and y < 0 then x*y>0",
-		"if x&lt;0 and y &lt; 0 then x*y&gt;0",
-	},
-	{
-		"not a tag #11",
-		"<<p>",
-		"&lt;$<p>",
-	},
-	// EOF in a tag name.
-	{
-		"tag name eof #0",
-		"<a",
-		"",
-	},
-	{
-		"tag name eof #1",
-		"<a ",
-		"",
-	},
-	{
-		"tag name eof #2",
-		"a<b",
-		"a",
-	},
-	{
-		"tag name eof #3",
-		"<a><b",
-		"<a>",
-	},
-	{
-		"tag name eof #4",
-		`<a x`,
-		``,
-	},
-	// Some malformed tags that are missing a '>'.
-	{
-		"malformed tag #0",
-		`<p</p>`,
-		`<p< p="">`,
-	},
-	{
-		"malformed tag #1",
-		`<p </p>`,
-		`<p <="" p="">`,
-	},
-	{
-		"malformed tag #2",
-		`<p id`,
-		``,
-	},
-	{
-		"malformed tag #3",
-		`<p id=`,
-		``,
-	},
-	{
-		"malformed tag #4",
-		`<p id=>`,
-		`<p id="">`,
-	},
-	{
-		"malformed tag #5",
-		`<p id=0`,
-		``,
-	},
-	{
-		"malformed tag #6",
-		`<p id=0</p>`,
-		`<p id="0&lt;/p">`,
-	},
-	{
-		"malformed tag #7",
-		`<p id="0</p>`,
-		``,
-	},
-	{
-		"malformed tag #8",
-		`<p id="0"</p>`,
-		`<p id="0" <="" p="">`,
-	},
-	{
-		"malformed tag #9",
-		`<p></p id`,
-		`<p>`,
-	},
-	// Raw text and RCDATA.
-	{
-		"basic raw text",
-		"<script><a></b></script>",
-		"<script>$&lt;a&gt;&lt;/b&gt;$</script>",
-	},
-	{
-		"unfinished script end tag",
-		"<SCRIPT>a</SCR",
-		"<script>$a&lt;/SCR",
-	},
-	{
-		"broken script end tag",
-		"<SCRIPT>a</SCR ipt>",
-		"<script>$a&lt;/SCR ipt&gt;",
-	},
-	{
-		"EOF in script end tag",
-		"<SCRIPT>a</SCRipt",
-		"<script>$a&lt;/SCRipt",
-	},
-	{
-		"scriptx end tag",
-		"<SCRIPT>a</SCRiptx",
-		"<script>$a&lt;/SCRiptx",
-	},
-	{
-		"' ' completes script end tag",
-		"<SCRIPT>a</SCRipt ",
-		"<script>$a",
-	},
-	{
-		"'>' completes script end tag",
-		"<SCRIPT>a</SCRipt>",
-		"<script>$a$</script>",
-	},
-	{
-		"self-closing script end tag",
-		"<SCRIPT>a</SCRipt/>",
-		"<script>$a$</script>",
-	},
-	{
-		"nested script tag",
-		"<SCRIPT>a</SCRipt<script>",
-		"<script>$a&lt;/SCRipt&lt;script&gt;",
-	},
-	{
-		"script end tag after unfinished",
-		"<SCRIPT>a</SCRipt</script>",
-		"<script>$a&lt;/SCRipt$</script>",
-	},
-	{
-		"script/style mismatched tags",
-		"<script>a</style>",
-		"<script>$a&lt;/style&gt;",
-	},
-	{
-		"style element with entity",
-		"<style>&apos;",
-		"<style>$&amp;apos;",
-	},
-	{
-		"textarea with tag",
-		"<textarea><div></textarea>",
-		"<textarea>$&lt;div&gt;$</textarea>",
-	},
-	{
-		"title with tag and entity",
-		"<title><b>K&amp;R C</b></title>",
-		"<title>$&lt;b&gt;K&amp;R C&lt;/b&gt;$</title>",
-	},
-	// DOCTYPE tests.
-	{
-		"Proper DOCTYPE",
-		"<!DOCTYPE html>",
-		"<!DOCTYPE html>",
-	},
-	{
-		"DOCTYPE with no space",
-		"<!doctypehtml>",
-		"<!DOCTYPE html>",
-	},
-	{
-		"DOCTYPE with two spaces",
-		"<!doctype  html>",
-		"<!DOCTYPE html>",
-	},
-	{
-		"looks like DOCTYPE but isn't",
-		"<!DOCUMENT html>",
-		"<!--DOCUMENT html-->",
-	},
-	{
-		"DOCTYPE at EOF",
-		"<!DOCtype",
-		"<!DOCTYPE >",
-	},
-	// XML processing instructions.
-	{
-		"XML processing instruction",
-		"<?xml?>",
-		"<!--?xml?-->",
-	},
-	// Comments.
-	{
-		"comment0",
-		"abc<b><!-- skipme --></b>def",
-		"abc$<b>$<!-- skipme -->$</b>$def",
-	},
-	{
-		"comment1",
-		"a<!-->z",
-		"a$<!---->$z",
-	},
-	{
-		"comment2",
-		"a<!--->z",
-		"a$<!---->$z",
-	},
-	{
-		"comment3",
-		"a<!--x>-->z",
-		"a$<!--x>-->$z",
-	},
-	{
-		"comment4",
-		"a<!--x->-->z",
-		"a$<!--x->-->$z",
-	},
-	{
-		"comment5",
-		"a<!>z",
-		"a$<!---->$z",
-	},
-	{
-		"comment6",
-		"a<!->z",
-		"a$<!----->$z",
-	},
-	{
-		"comment7",
-		"a<!---<>z",
-		"a$<!---<>z-->",
-	},
-	{
-		"comment8",
-		"a<!--z",
-		"a$<!--z-->",
-	},
-	{
-		"comment9",
-		"a<!--z-",
-		"a$<!--z-->",
-	},
-	{
-		"comment10",
-		"a<!--z--",
-		"a$<!--z-->",
-	},
-	{
-		"comment11",
-		"a<!--z---",
-		"a$<!--z--->",
-	},
-	{
-		"comment12",
-		"a<!--z----",
-		"a$<!--z---->",
-	},
-	{
-		"comment13",
-		"a<!--x--!>z",
-		"a$<!--x-->$z",
-	},
-	// An attribute with a backslash.
-	{
-		"backslash",
-		`<p id="a\"b">`,
-		`<p id="a\" b"="">`,
-	},
-	// Entities, tag name and attribute key lower-casing, and whitespace
-	// normalization within a tag.
-	{
-		"tricky",
-		"<p \t\n iD=\"a&quot;B\"  foo=\"bar\"><EM>te&lt;&amp;;xt</em></p>",
-		`<p id="a&#34;B" foo="bar">$<em>$te&lt;&amp;;xt$</em>$</p>`,
-	},
-	// A nonexistent entity. Tokenizing and converting back to a string should
-	// escape the "&" to become "&amp;".
-	{
-		"noSuchEntity",
-		`<a b="c&noSuchEntity;d">&lt;&alsoDoesntExist;&`,
-		`<a b="c&amp;noSuchEntity;d">$&lt;&amp;alsoDoesntExist;&amp;`,
-	},
-	{
-		"entity without semicolon",
-		`&notit;&notin;<a b="q=z&amp=5&notice=hello&not;=world">`,
-		`¬it;∉$<a b="q=z&amp;amp=5&amp;notice=hello¬=world">`,
-	},
-	{
-		"entity with digits",
-		"&frac12;",
-		"½",
-	},
-	// Attribute tests:
-	// http://dev.w3.org/html5/pf-summary/Overview.html#attributes
-	{
-		"Empty attribute",
-		`<input disabled FOO>`,
-		`<input disabled="" foo="">`,
-	},
-	{
-		"Empty attribute, whitespace",
-		`<input disabled FOO >`,
-		`<input disabled="" foo="">`,
-	},
-	{
-		"Unquoted attribute value",
-		`<input value=yes FOO=BAR>`,
-		`<input value="yes" foo="BAR">`,
-	},
-	{
-		"Unquoted attribute value, spaces",
-		`<input value = yes FOO = BAR>`,
-		`<input value="yes" foo="BAR">`,
-	},
-	{
-		"Unquoted attribute value, trailing space",
-		`<input value=yes FOO=BAR >`,
-		`<input value="yes" foo="BAR">`,
-	},
-	{
-		"Single-quoted attribute value",
-		`<input value='yes' FOO='BAR'>`,
-		`<input value="yes" foo="BAR">`,
-	},
-	{
-		"Single-quoted attribute value, trailing space",
-		`<input value='yes' FOO='BAR' >`,
-		`<input value="yes" foo="BAR">`,
-	},
-	{
-		"Double-quoted attribute value",
-		`<input value="I'm an attribute" FOO="BAR">`,
-		`<input value="I&#39;m an attribute" foo="BAR">`,
-	},
-	{
-		"Attribute name characters",
-		`<meta http-equiv="content-type">`,
-		`<meta http-equiv="content-type">`,
-	},
-	{
-		"Mixed attributes",
-		`a<P V="0 1" w='2' X=3 y>z`,
-		`a$<p v="0 1" w="2" x="3" y="">$z`,
-	},
-	{
-		"Attributes with a solitary single quote",
-		`<p id=can't><p id=won't>`,
-		`<p id="can&#39;t">$<p id="won&#39;t">`,
-	},
-}
-
-func TestTokenizer(t *testing.T) {
-loop:
-	for _, tt := range tokenTests {
-		z := NewTokenizer(strings.NewReader(tt.html))
-		if tt.golden != "" {
-			for i, s := range strings.Split(tt.golden, "$") {
-				if z.Next() == ErrorToken {
-					t.Errorf("%s token %d: want %q got error %v", tt.desc, i, s, z.Err())
-					continue loop
-				}
-				actual := z.Token().String()
-				if s != actual {
-					t.Errorf("%s token %d: want %q got %q", tt.desc, i, s, actual)
-					continue loop
-				}
-			}
-		}
-		z.Next()
-		if z.Err() != io.EOF {
-			t.Errorf("%s: want EOF got %q", tt.desc, z.Err())
-		}
-	}
-}
-
-func TestMaxBuffer(t *testing.T) {
-	// Exceeding the maximum buffer size generates ErrBufferExceeded.
-	z := NewTokenizer(strings.NewReader("<" + strings.Repeat("t", 10)))
-	z.SetMaxBuf(5)
-	tt := z.Next()
-	if got, want := tt, ErrorToken; got != want {
-		t.Fatalf("token type: got: %v want: %v", got, want)
-	}
-	if got, want := z.Err(), ErrBufferExceeded; got != want {
-		t.Errorf("error type: got: %v want: %v", got, want)
-	}
-	if got, want := string(z.Raw()), "<tttt"; got != want {
-		t.Fatalf("buffered before overflow: got: %q want: %q", got, want)
-	}
-}
-
-func TestMaxBufferReconstruction(t *testing.T) {
-	// Exceeding the maximum buffer size at any point while tokenizing permits
-	// reconstructing the original input.
-tests:
-	for _, test := range tokenTests {
-		for maxBuf := 1; ; maxBuf++ {
-			r := strings.NewReader(test.html)
-			z := NewTokenizer(r)
-			z.SetMaxBuf(maxBuf)
-			var tokenized bytes.Buffer
-			for {
-				tt := z.Next()
-				tokenized.Write(z.Raw())
-				if tt == ErrorToken {
-					if err := z.Err(); err != io.EOF && err != ErrBufferExceeded {
-						t.Errorf("%s: unexpected error: %v", test.desc, err)
-					}
-					break
-				}
-			}
-			// Anything tokenized along with untokenized input or data left in the reader.
-			assembled, err := ioutil.ReadAll(io.MultiReader(&tokenized, bytes.NewReader(z.Buffered()), r))
-			if err != nil {
-				t.Errorf("%s: ReadAll: %v", test.desc, err)
-				continue tests
-			}
-			if got, want := string(assembled), test.html; got != want {
-				t.Errorf("%s: reassembled html:\n got: %q\nwant: %q", test.desc, got, want)
-				continue tests
-			}
-			// EOF indicates that we completed tokenization and hence found the max
-			// maxBuf that generates ErrBufferExceeded, so continue to the next test.
-			if z.Err() == io.EOF {
-				break
-			}
-		} // buffer sizes
-	} // tests
-}
-
-func TestPassthrough(t *testing.T) {
-	// Accumulating the raw output for each parse event should reconstruct the
-	// original input.
-	for _, test := range tokenTests {
-		z := NewTokenizer(strings.NewReader(test.html))
-		var parsed bytes.Buffer
-		for {
-			tt := z.Next()
-			parsed.Write(z.Raw())
-			if tt == ErrorToken {
-				break
-			}
-		}
-		if got, want := parsed.String(), test.html; got != want {
-			t.Errorf("%s: parsed output:\n got: %q\nwant: %q", test.desc, got, want)
-		}
-	}
-}
-
-func TestBufAPI(t *testing.T) {
-	s := "0<a>1</a>2<b>3<a>4<a>5</a>6</b>7</a>8<a/>9"
-	z := NewTokenizer(bytes.NewBufferString(s))
-	var result bytes.Buffer
-	depth := 0
-loop:
-	for {
-		tt := z.Next()
-		switch tt {
-		case ErrorToken:
-			if z.Err() != io.EOF {
-				t.Error(z.Err())
-			}
-			break loop
-		case TextToken:
-			if depth > 0 {
-				result.Write(z.Text())
-			}
-		case StartTagToken, EndTagToken:
-			tn, _ := z.TagName()
-			if len(tn) == 1 && tn[0] == 'a' {
-				if tt == StartTagToken {
-					depth++
-				} else {
-					depth--
-				}
-			}
-		}
-	}
-	u := "14567"
-	v := string(result.Bytes())
-	if u != v {
-		t.Errorf("TestBufAPI: want %q got %q", u, v)
-	}
-}
-
-func TestConvertNewlines(t *testing.T) {
-	testCases := map[string]string{
-		"Mac\rDOS\r\nUnix\n":    "Mac\nDOS\nUnix\n",
-		"Unix\nMac\rDOS\r\n":    "Unix\nMac\nDOS\n",
-		"DOS\r\nDOS\r\nDOS\r\n": "DOS\nDOS\nDOS\n",
-		"":         "",
-		"\n":       "\n",
-		"\n\r":     "\n\n",
-		"\r":       "\n",
-		"\r\n":     "\n",
-		"\r\n\n":   "\n\n",
-		"\r\n\r":   "\n\n",
-		"\r\n\r\n": "\n\n",
-		"\r\r":     "\n\n",
-		"\r\r\n":   "\n\n",
-		"\r\r\n\n": "\n\n\n",
-		"\r\r\r\n": "\n\n\n",
-		"\r \n":    "\n \n",
-		"xyz":      "xyz",
-	}
-	for in, want := range testCases {
-		if got := string(convertNewlines([]byte(in))); got != want {
-			t.Errorf("input %q: got %q, want %q", in, got, want)
-		}
-	}
-}
-
-func TestReaderEdgeCases(t *testing.T) {
-	const s = "<p>An io.Reader can return (0, nil) or (n, io.EOF).</p>"
-	testCases := []io.Reader{
-		&zeroOneByteReader{s: s},
-		&eofStringsReader{s: s},
-		&stuckReader{},
-	}
-	for i, tc := range testCases {
-		got := []TokenType{}
-		z := NewTokenizer(tc)
-		for {
-			tt := z.Next()
-			if tt == ErrorToken {
-				break
-			}
-			got = append(got, tt)
-		}
-		if err := z.Err(); err != nil && err != io.EOF {
-			if err != io.ErrNoProgress {
-				t.Errorf("i=%d: %v", i, err)
-			}
-			continue
-		}
-		want := []TokenType{
-			StartTagToken,
-			TextToken,
-			EndTagToken,
-		}
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("i=%d: got %v, want %v", i, got, want)
-			continue
-		}
-	}
-}
-
-// zeroOneByteReader is like a strings.Reader that alternates between
-// returning 0 bytes and 1 byte at a time.
-type zeroOneByteReader struct {
-	s string
-	n int
-}
-
-func (r *zeroOneByteReader) Read(p []byte) (int, error) {
-	if len(p) == 0 {
-		return 0, nil
-	}
-	if len(r.s) == 0 {
-		return 0, io.EOF
-	}
-	r.n++
-	if r.n%2 != 0 {
-		return 0, nil
-	}
-	p[0], r.s = r.s[0], r.s[1:]
-	return 1, nil
-}
-
-// eofStringsReader is like a strings.Reader but can return an (n, err) where
-// n > 0 && err != nil.
-type eofStringsReader struct {
-	s string
-}
-
-func (r *eofStringsReader) Read(p []byte) (int, error) {
-	n := copy(p, r.s)
-	r.s = r.s[n:]
-	if r.s != "" {
-		return n, nil
-	}
-	return n, io.EOF
-}
-
-// stuckReader is an io.Reader that always returns no data and no error.
-type stuckReader struct{}
-
-func (*stuckReader) Read(p []byte) (int, error) {
-	return 0, nil
-}
-
-const (
-	rawLevel = iota
-	lowLevel
-	highLevel
-)
-
-func benchmarkTokenizer(b *testing.B, level int) {
-	buf, err := ioutil.ReadFile("testdata/go1.html")
-	if err != nil {
-		b.Fatalf("could not read testdata/go1.html: %v", err)
-	}
-	b.SetBytes(int64(len(buf)))
-	runtime.GC()
-	b.ReportAllocs()
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		z := NewTokenizer(bytes.NewBuffer(buf))
-		for {
-			tt := z.Next()
-			if tt == ErrorToken {
-				if err := z.Err(); err != nil && err != io.EOF {
-					b.Fatalf("tokenizer error: %v", err)
-				}
-				break
-			}
-			switch level {
-			case rawLevel:
-				// Calling z.Raw just returns the raw bytes of the token. It does
-				// not unescape &lt; to <, or lower-case tag names and attribute keys.
-				z.Raw()
-			case lowLevel:
-				// Caling z.Text, z.TagName and z.TagAttr returns []byte values
-				// whose contents may change on the next call to z.Next.
-				switch tt {
-				case TextToken, CommentToken, DoctypeToken:
-					z.Text()
-				case StartTagToken, SelfClosingTagToken:
-					_, more := z.TagName()
-					for more {
-						_, _, more = z.TagAttr()
-					}
-				case EndTagToken:
-					z.TagName()
-				}
-			case highLevel:
-				// Calling z.Token converts []byte values to strings whose validity
-				// extend beyond the next call to z.Next.
-				z.Token()
-			}
-		}
-	}
-}
-
-func BenchmarkRawLevelTokenizer(b *testing.B)  { benchmarkTokenizer(b, rawLevel) }
-func BenchmarkLowLevelTokenizer(b *testing.B)  { benchmarkTokenizer(b, lowLevel) }
-func BenchmarkHighLevelTokenizer(b *testing.B) { benchmarkTokenizer(b, highLevel) }
diff --git a/installer/vendor/golang.org/x/net/http2/.gitignore b/installer/vendor/golang.org/x/net/http2/.gitignore
deleted file mode 100644
index 190f12234a..0000000000
--- a/installer/vendor/golang.org/x/net/http2/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*~
-h2i/h2i
diff --git a/installer/vendor/golang.org/x/net/http2/Dockerfile b/installer/vendor/golang.org/x/net/http2/Dockerfile
deleted file mode 100644
index 53fc525797..0000000000
--- a/installer/vendor/golang.org/x/net/http2/Dockerfile
+++ /dev/null
@@ -1,51 +0,0 @@
-#
-# This Dockerfile builds a recent curl with HTTP/2 client support, using
-# a recent nghttp2 build.
-#
-# See the Makefile for how to tag it. If Docker and that image is found, the
-# Go tests use this curl binary for integration tests.
-#
-
-FROM ubuntu:trusty
-
-RUN apt-get update && \
-    apt-get upgrade -y && \
-    apt-get install -y git-core build-essential wget
-
-RUN apt-get install -y --no-install-recommends \
-       autotools-dev libtool pkg-config zlib1g-dev \
-       libcunit1-dev libssl-dev libxml2-dev libevent-dev \
-       automake autoconf
-
-# The list of packages nghttp2 recommends for h2load:
-RUN apt-get install -y --no-install-recommends make binutils \
-        autoconf automake autotools-dev \
-        libtool pkg-config zlib1g-dev libcunit1-dev libssl-dev libxml2-dev \
-        libev-dev libevent-dev libjansson-dev libjemalloc-dev \
-        cython python3.4-dev python-setuptools
-
-# Note: setting NGHTTP2_VER before the git clone, so an old git clone isn't cached:
-ENV NGHTTP2_VER 895da9a
-RUN cd /root && git clone https://github.com/tatsuhiro-t/nghttp2.git
-
-WORKDIR /root/nghttp2
-RUN git reset --hard $NGHTTP2_VER
-RUN autoreconf -i
-RUN automake
-RUN autoconf
-RUN ./configure
-RUN make
-RUN make install
-
-WORKDIR /root
-RUN wget http://curl.haxx.se/download/curl-7.45.0.tar.gz
-RUN tar -zxvf curl-7.45.0.tar.gz
-WORKDIR /root/curl-7.45.0
-RUN ./configure --with-ssl --with-nghttp2=/usr/local
-RUN make
-RUN make install
-RUN ldconfig
-
-CMD ["-h"]
-ENTRYPOINT ["/usr/local/bin/curl"]
-
diff --git a/installer/vendor/golang.org/x/net/http2/Makefile b/installer/vendor/golang.org/x/net/http2/Makefile
deleted file mode 100644
index 55fd826f77..0000000000
--- a/installer/vendor/golang.org/x/net/http2/Makefile
+++ /dev/null
@@ -1,3 +0,0 @@
-curlimage:
-	docker build -t gohttp2/curl .
-
diff --git a/installer/vendor/golang.org/x/net/http2/README b/installer/vendor/golang.org/x/net/http2/README
deleted file mode 100644
index 360d5aa379..0000000000
--- a/installer/vendor/golang.org/x/net/http2/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This is a work-in-progress HTTP/2 implementation for Go.
-
-It will eventually live in the Go standard library and won't require
-any changes to your code to use.  It will just be automatic.
-
-Status:
-
-* The server support is pretty good. A few things are missing
-  but are being worked on.
-* The client work has just started but shares a lot of code
-  is coming along much quicker.
-
-Docs are at https://godoc.org/golang.org/x/net/http2
-
-Demo test server at https://http2.golang.org/
-
-Help & bug reports welcome!
-
-Contributing: https://golang.org/doc/contribute.html
-Bugs:         https://golang.org/issue/new?title=x/net/http2:+
diff --git a/installer/vendor/golang.org/x/net/http2/client_conn_pool.go b/installer/vendor/golang.org/x/net/http2/client_conn_pool.go
deleted file mode 100644
index bdf5652b01..0000000000
--- a/installer/vendor/golang.org/x/net/http2/client_conn_pool.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Transport code's client connection pooling.
-
-package http2
-
-import (
-	"crypto/tls"
-	"net/http"
-	"sync"
-)
-
-// ClientConnPool manages a pool of HTTP/2 client connections.
-type ClientConnPool interface {
-	GetClientConn(req *http.Request, addr string) (*ClientConn, error)
-	MarkDead(*ClientConn)
-}
-
-// clientConnPoolIdleCloser is the interface implemented by ClientConnPool
-// implementations which can close their idle connections.
-type clientConnPoolIdleCloser interface {
-	ClientConnPool
-	closeIdleConnections()
-}
-
-var (
-	_ clientConnPoolIdleCloser = (*clientConnPool)(nil)
-	_ clientConnPoolIdleCloser = noDialClientConnPool{}
-)
-
-// TODO: use singleflight for dialing and addConnCalls?
-type clientConnPool struct {
-	t *Transport
-
-	mu sync.Mutex // TODO: maybe switch to RWMutex
-	// TODO: add support for sharing conns based on cert names
-	// (e.g. share conn for googleapis.com and appspot.com)
-	conns        map[string][]*ClientConn // key is host:port
-	dialing      map[string]*dialCall     // currently in-flight dials
-	keys         map[*ClientConn][]string
-	addConnCalls map[string]*addConnCall // in-flight addConnIfNeede calls
-}
-
-func (p *clientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
-	return p.getClientConn(req, addr, dialOnMiss)
-}
-
-const (
-	dialOnMiss   = true
-	noDialOnMiss = false
-)
-
-func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMiss bool) (*ClientConn, error) {
-	if isConnectionCloseRequest(req) && dialOnMiss {
-		// It gets its own connection.
-		const singleUse = true
-		cc, err := p.t.dialClientConn(addr, singleUse)
-		if err != nil {
-			return nil, err
-		}
-		return cc, nil
-	}
-	p.mu.Lock()
-	for _, cc := range p.conns[addr] {
-		if cc.CanTakeNewRequest() {
-			p.mu.Unlock()
-			return cc, nil
-		}
-	}
-	if !dialOnMiss {
-		p.mu.Unlock()
-		return nil, ErrNoCachedConn
-	}
-	call := p.getStartDialLocked(addr)
-	p.mu.Unlock()
-	<-call.done
-	return call.res, call.err
-}
-
-// dialCall is an in-flight Transport dial call to a host.
-type dialCall struct {
-	p    *clientConnPool
-	done chan struct{} // closed when done
-	res  *ClientConn   // valid after done is closed
-	err  error         // valid after done is closed
-}
-
-// requires p.mu is held.
-func (p *clientConnPool) getStartDialLocked(addr string) *dialCall {
-	if call, ok := p.dialing[addr]; ok {
-		// A dial is already in-flight. Don't start another.
-		return call
-	}
-	call := &dialCall{p: p, done: make(chan struct{})}
-	if p.dialing == nil {
-		p.dialing = make(map[string]*dialCall)
-	}
-	p.dialing[addr] = call
-	go call.dial(addr)
-	return call
-}
-
-// run in its own goroutine.
-func (c *dialCall) dial(addr string) {
-	const singleUse = false // shared conn
-	c.res, c.err = c.p.t.dialClientConn(addr, singleUse)
-	close(c.done)
-
-	c.p.mu.Lock()
-	delete(c.p.dialing, addr)
-	if c.err == nil {
-		c.p.addConnLocked(addr, c.res)
-	}
-	c.p.mu.Unlock()
-}
-
-// addConnIfNeeded makes a NewClientConn out of c if a connection for key doesn't
-// already exist. It coalesces concurrent calls with the same key.
-// This is used by the http1 Transport code when it creates a new connection. Because
-// the http1 Transport doesn't de-dup TCP dials to outbound hosts (because it doesn't know
-// the protocol), it can get into a situation where it has multiple TLS connections.
-// This code decides which ones live or die.
-// The return value used is whether c was used.
-// c is never closed.
-func (p *clientConnPool) addConnIfNeeded(key string, t *Transport, c *tls.Conn) (used bool, err error) {
-	p.mu.Lock()
-	for _, cc := range p.conns[key] {
-		if cc.CanTakeNewRequest() {
-			p.mu.Unlock()
-			return false, nil
-		}
-	}
-	call, dup := p.addConnCalls[key]
-	if !dup {
-		if p.addConnCalls == nil {
-			p.addConnCalls = make(map[string]*addConnCall)
-		}
-		call = &addConnCall{
-			p:    p,
-			done: make(chan struct{}),
-		}
-		p.addConnCalls[key] = call
-		go call.run(t, key, c)
-	}
-	p.mu.Unlock()
-
-	<-call.done
-	if call.err != nil {
-		return false, call.err
-	}
-	return !dup, nil
-}
-
-type addConnCall struct {
-	p    *clientConnPool
-	done chan struct{} // closed when done
-	err  error
-}
-
-func (c *addConnCall) run(t *Transport, key string, tc *tls.Conn) {
-	cc, err := t.NewClientConn(tc)
-
-	p := c.p
-	p.mu.Lock()
-	if err != nil {
-		c.err = err
-	} else {
-		p.addConnLocked(key, cc)
-	}
-	delete(p.addConnCalls, key)
-	p.mu.Unlock()
-	close(c.done)
-}
-
-func (p *clientConnPool) addConn(key string, cc *ClientConn) {
-	p.mu.Lock()
-	p.addConnLocked(key, cc)
-	p.mu.Unlock()
-}
-
-// p.mu must be held
-func (p *clientConnPool) addConnLocked(key string, cc *ClientConn) {
-	for _, v := range p.conns[key] {
-		if v == cc {
-			return
-		}
-	}
-	if p.conns == nil {
-		p.conns = make(map[string][]*ClientConn)
-	}
-	if p.keys == nil {
-		p.keys = make(map[*ClientConn][]string)
-	}
-	p.conns[key] = append(p.conns[key], cc)
-	p.keys[cc] = append(p.keys[cc], key)
-}
-
-func (p *clientConnPool) MarkDead(cc *ClientConn) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	for _, key := range p.keys[cc] {
-		vv, ok := p.conns[key]
-		if !ok {
-			continue
-		}
-		newList := filterOutClientConn(vv, cc)
-		if len(newList) > 0 {
-			p.conns[key] = newList
-		} else {
-			delete(p.conns, key)
-		}
-	}
-	delete(p.keys, cc)
-}
-
-func (p *clientConnPool) closeIdleConnections() {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	// TODO: don't close a cc if it was just added to the pool
-	// milliseconds ago and has never been used. There's currently
-	// a small race window with the HTTP/1 Transport's integration
-	// where it can add an idle conn just before using it, and
-	// somebody else can concurrently call CloseIdleConns and
-	// break some caller's RoundTrip.
-	for _, vv := range p.conns {
-		for _, cc := range vv {
-			cc.closeIfIdle()
-		}
-	}
-}
-
-func filterOutClientConn(in []*ClientConn, exclude *ClientConn) []*ClientConn {
-	out := in[:0]
-	for _, v := range in {
-		if v != exclude {
-			out = append(out, v)
-		}
-	}
-	// If we filtered it out, zero out the last item to prevent
-	// the GC from seeing it.
-	if len(in) != len(out) {
-		in[len(in)-1] = nil
-	}
-	return out
-}
-
-// noDialClientConnPool is an implementation of http2.ClientConnPool
-// which never dials. We let the HTTP/1.1 client dial and use its TLS
-// connection instead.
-type noDialClientConnPool struct{ *clientConnPool }
-
-func (p noDialClientConnPool) GetClientConn(req *http.Request, addr string) (*ClientConn, error) {
-	return p.getClientConn(req, addr, noDialOnMiss)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/configure_transport.go b/installer/vendor/golang.org/x/net/http2/configure_transport.go
deleted file mode 100644
index 4f720f530b..0000000000
--- a/installer/vendor/golang.org/x/net/http2/configure_transport.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.6
-
-package http2
-
-import (
-	"crypto/tls"
-	"fmt"
-	"net/http"
-)
-
-func configureTransport(t1 *http.Transport) (*Transport, error) {
-	connPool := new(clientConnPool)
-	t2 := &Transport{
-		ConnPool: noDialClientConnPool{connPool},
-		t1:       t1,
-	}
-	connPool.t = t2
-	if err := registerHTTPSProtocol(t1, noDialH2RoundTripper{t2}); err != nil {
-		return nil, err
-	}
-	if t1.TLSClientConfig == nil {
-		t1.TLSClientConfig = new(tls.Config)
-	}
-	if !strSliceContains(t1.TLSClientConfig.NextProtos, "h2") {
-		t1.TLSClientConfig.NextProtos = append([]string{"h2"}, t1.TLSClientConfig.NextProtos...)
-	}
-	if !strSliceContains(t1.TLSClientConfig.NextProtos, "http/1.1") {
-		t1.TLSClientConfig.NextProtos = append(t1.TLSClientConfig.NextProtos, "http/1.1")
-	}
-	upgradeFn := func(authority string, c *tls.Conn) http.RoundTripper {
-		addr := authorityAddr("https", authority)
-		if used, err := connPool.addConnIfNeeded(addr, t2, c); err != nil {
-			go c.Close()
-			return erringRoundTripper{err}
-		} else if !used {
-			// Turns out we don't need this c.
-			// For example, two goroutines made requests to the same host
-			// at the same time, both kicking off TCP dials. (since protocol
-			// was unknown)
-			go c.Close()
-		}
-		return t2
-	}
-	if m := t1.TLSNextProto; len(m) == 0 {
-		t1.TLSNextProto = map[string]func(string, *tls.Conn) http.RoundTripper{
-			"h2": upgradeFn,
-		}
-	} else {
-		m["h2"] = upgradeFn
-	}
-	return t2, nil
-}
-
-// registerHTTPSProtocol calls Transport.RegisterProtocol but
-// convering panics into errors.
-func registerHTTPSProtocol(t *http.Transport, rt http.RoundTripper) (err error) {
-	defer func() {
-		if e := recover(); e != nil {
-			err = fmt.Errorf("%v", e)
-		}
-	}()
-	t.RegisterProtocol("https", rt)
-	return nil
-}
-
-// noDialH2RoundTripper is a RoundTripper which only tries to complete the request
-// if there's already has a cached connection to the host.
-type noDialH2RoundTripper struct{ t *Transport }
-
-func (rt noDialH2RoundTripper) RoundTrip(req *http.Request) (*http.Response, error) {
-	res, err := rt.t.RoundTrip(req)
-	if err == ErrNoCachedConn {
-		return nil, http.ErrSkipAltProtocol
-	}
-	return res, err
-}
diff --git a/installer/vendor/golang.org/x/net/http2/databuffer.go b/installer/vendor/golang.org/x/net/http2/databuffer.go
deleted file mode 100644
index a3067f8de7..0000000000
--- a/installer/vendor/golang.org/x/net/http2/databuffer.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-)
-
-// Buffer chunks are allocated from a pool to reduce pressure on GC.
-// The maximum wasted space per dataBuffer is 2x the largest size class,
-// which happens when the dataBuffer has multiple chunks and there is
-// one unread byte in both the first and last chunks. We use a few size
-// classes to minimize overheads for servers that typically receive very
-// small request bodies.
-//
-// TODO: Benchmark to determine if the pools are necessary. The GC may have
-// improved enough that we can instead allocate chunks like this:
-// make([]byte, max(16<<10, expectedBytesRemaining))
-var (
-	dataChunkSizeClasses = []int{
-		1 << 10,
-		2 << 10,
-		4 << 10,
-		8 << 10,
-		16 << 10,
-	}
-	dataChunkPools = [...]sync.Pool{
-		{New: func() interface{} { return make([]byte, 1<<10) }},
-		{New: func() interface{} { return make([]byte, 2<<10) }},
-		{New: func() interface{} { return make([]byte, 4<<10) }},
-		{New: func() interface{} { return make([]byte, 8<<10) }},
-		{New: func() interface{} { return make([]byte, 16<<10) }},
-	}
-)
-
-func getDataBufferChunk(size int64) []byte {
-	i := 0
-	for ; i < len(dataChunkSizeClasses)-1; i++ {
-		if size <= int64(dataChunkSizeClasses[i]) {
-			break
-		}
-	}
-	return dataChunkPools[i].Get().([]byte)
-}
-
-func putDataBufferChunk(p []byte) {
-	for i, n := range dataChunkSizeClasses {
-		if len(p) == n {
-			dataChunkPools[i].Put(p)
-			return
-		}
-	}
-	panic(fmt.Sprintf("unexpected buffer len=%v", len(p)))
-}
-
-// dataBuffer is an io.ReadWriter backed by a list of data chunks.
-// Each dataBuffer is used to read DATA frames on a single stream.
-// The buffer is divided into chunks so the server can limit the
-// total memory used by a single connection without limiting the
-// request body size on any single stream.
-type dataBuffer struct {
-	chunks   [][]byte
-	r        int   // next byte to read is chunks[0][r]
-	w        int   // next byte to write is chunks[len(chunks)-1][w]
-	size     int   // total buffered bytes
-	expected int64 // we expect at least this many bytes in future Write calls (ignored if <= 0)
-}
-
-var errReadEmpty = errors.New("read from empty dataBuffer")
-
-// Read copies bytes from the buffer into p.
-// It is an error to read when no data is available.
-func (b *dataBuffer) Read(p []byte) (int, error) {
-	if b.size == 0 {
-		return 0, errReadEmpty
-	}
-	var ntotal int
-	for len(p) > 0 && b.size > 0 {
-		readFrom := b.bytesFromFirstChunk()
-		n := copy(p, readFrom)
-		p = p[n:]
-		ntotal += n
-		b.r += n
-		b.size -= n
-		// If the first chunk has been consumed, advance to the next chunk.
-		if b.r == len(b.chunks[0]) {
-			putDataBufferChunk(b.chunks[0])
-			end := len(b.chunks) - 1
-			copy(b.chunks[:end], b.chunks[1:])
-			b.chunks[end] = nil
-			b.chunks = b.chunks[:end]
-			b.r = 0
-		}
-	}
-	return ntotal, nil
-}
-
-func (b *dataBuffer) bytesFromFirstChunk() []byte {
-	if len(b.chunks) == 1 {
-		return b.chunks[0][b.r:b.w]
-	}
-	return b.chunks[0][b.r:]
-}
-
-// Len returns the number of bytes of the unread portion of the buffer.
-func (b *dataBuffer) Len() int {
-	return b.size
-}
-
-// Write appends p to the buffer.
-func (b *dataBuffer) Write(p []byte) (int, error) {
-	ntotal := len(p)
-	for len(p) > 0 {
-		// If the last chunk is empty, allocate a new chunk. Try to allocate
-		// enough to fully copy p plus any additional bytes we expect to
-		// receive. However, this may allocate less than len(p).
-		want := int64(len(p))
-		if b.expected > want {
-			want = b.expected
-		}
-		chunk := b.lastChunkOrAlloc(want)
-		n := copy(chunk[b.w:], p)
-		p = p[n:]
-		b.w += n
-		b.size += n
-		b.expected -= int64(n)
-	}
-	return ntotal, nil
-}
-
-func (b *dataBuffer) lastChunkOrAlloc(want int64) []byte {
-	if len(b.chunks) != 0 {
-		last := b.chunks[len(b.chunks)-1]
-		if b.w < len(last) {
-			return last
-		}
-	}
-	chunk := getDataBufferChunk(want)
-	b.chunks = append(b.chunks, chunk)
-	b.w = 0
-	return chunk
-}
diff --git a/installer/vendor/golang.org/x/net/http2/databuffer_test.go b/installer/vendor/golang.org/x/net/http2/databuffer_test.go
deleted file mode 100644
index ca227b5288..0000000000
--- a/installer/vendor/golang.org/x/net/http2/databuffer_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func fmtDataChunk(chunk []byte) string {
-	out := ""
-	var last byte
-	var count int
-	for _, c := range chunk {
-		if c != last {
-			if count > 0 {
-				out += fmt.Sprintf(" x %d ", count)
-				count = 0
-			}
-			out += string([]byte{c})
-			last = c
-		}
-		count++
-	}
-	if count > 0 {
-		out += fmt.Sprintf(" x %d", count)
-	}
-	return out
-}
-
-func fmtDataChunks(chunks [][]byte) string {
-	var out string
-	for _, chunk := range chunks {
-		out += fmt.Sprintf("{%q}", fmtDataChunk(chunk))
-	}
-	return out
-}
-
-func testDataBuffer(t *testing.T, wantBytes []byte, setup func(t *testing.T) *dataBuffer) {
-	// Run setup, then read the remaining bytes from the dataBuffer and check
-	// that they match wantBytes. We use different read sizes to check corner
-	// cases in Read.
-	for _, readSize := range []int{1, 2, 1 * 1024, 32 * 1024} {
-		t.Run(fmt.Sprintf("ReadSize=%d", readSize), func(t *testing.T) {
-			b := setup(t)
-			buf := make([]byte, readSize)
-			var gotRead bytes.Buffer
-			for {
-				n, err := b.Read(buf)
-				gotRead.Write(buf[:n])
-				if err == errReadEmpty {
-					break
-				}
-				if err != nil {
-					t.Fatalf("error after %v bytes: %v", gotRead.Len(), err)
-				}
-			}
-			if got, want := gotRead.Bytes(), wantBytes; !bytes.Equal(got, want) {
-				t.Errorf("FinalRead=%q, want %q", fmtDataChunk(got), fmtDataChunk(want))
-			}
-		})
-	}
-}
-
-func TestDataBufferAllocation(t *testing.T) {
-	writes := [][]byte{
-		bytes.Repeat([]byte("a"), 1*1024-1),
-		[]byte{'a'},
-		bytes.Repeat([]byte("b"), 4*1024-1),
-		[]byte{'b'},
-		bytes.Repeat([]byte("c"), 8*1024-1),
-		[]byte{'c'},
-		bytes.Repeat([]byte("d"), 16*1024-1),
-		[]byte{'d'},
-		bytes.Repeat([]byte("e"), 32*1024),
-	}
-	var wantRead bytes.Buffer
-	for _, p := range writes {
-		wantRead.Write(p)
-	}
-
-	testDataBuffer(t, wantRead.Bytes(), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{}
-		for _, p := range writes {
-			if n, err := b.Write(p); n != len(p) || err != nil {
-				t.Fatalf("Write(%q x %d)=%v,%v want %v,nil", p[:1], len(p), n, err, len(p))
-			}
-		}
-		want := [][]byte{
-			bytes.Repeat([]byte("a"), 1*1024),
-			bytes.Repeat([]byte("b"), 4*1024),
-			bytes.Repeat([]byte("c"), 8*1024),
-			bytes.Repeat([]byte("d"), 16*1024),
-			bytes.Repeat([]byte("e"), 16*1024),
-			bytes.Repeat([]byte("e"), 16*1024),
-		}
-		if !reflect.DeepEqual(b.chunks, want) {
-			t.Errorf("dataBuffer.chunks\ngot:  %s\nwant: %s", fmtDataChunks(b.chunks), fmtDataChunks(want))
-		}
-		return b
-	})
-}
-
-func TestDataBufferAllocationWithExpected(t *testing.T) {
-	writes := [][]byte{
-		bytes.Repeat([]byte("a"), 1*1024), // allocates 16KB
-		bytes.Repeat([]byte("b"), 14*1024),
-		bytes.Repeat([]byte("c"), 15*1024), // allocates 16KB more
-		bytes.Repeat([]byte("d"), 2*1024),
-		bytes.Repeat([]byte("e"), 1*1024), // overflows 32KB expectation, allocates just 1KB
-	}
-	var wantRead bytes.Buffer
-	for _, p := range writes {
-		wantRead.Write(p)
-	}
-
-	testDataBuffer(t, wantRead.Bytes(), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{expected: 32 * 1024}
-		for _, p := range writes {
-			if n, err := b.Write(p); n != len(p) || err != nil {
-				t.Fatalf("Write(%q x %d)=%v,%v want %v,nil", p[:1], len(p), n, err, len(p))
-			}
-		}
-		want := [][]byte{
-			append(bytes.Repeat([]byte("a"), 1*1024), append(bytes.Repeat([]byte("b"), 14*1024), bytes.Repeat([]byte("c"), 1*1024)...)...),
-			append(bytes.Repeat([]byte("c"), 14*1024), bytes.Repeat([]byte("d"), 2*1024)...),
-			bytes.Repeat([]byte("e"), 1*1024),
-		}
-		if !reflect.DeepEqual(b.chunks, want) {
-			t.Errorf("dataBuffer.chunks\ngot:  %s\nwant: %s", fmtDataChunks(b.chunks), fmtDataChunks(want))
-		}
-		return b
-	})
-}
-
-func TestDataBufferWriteAfterPartialRead(t *testing.T) {
-	testDataBuffer(t, []byte("cdxyz"), func(t *testing.T) *dataBuffer {
-		b := &dataBuffer{}
-		if n, err := b.Write([]byte("abcd")); n != 4 || err != nil {
-			t.Fatalf("Write(\"abcd\")=%v,%v want 4,nil", n, err)
-		}
-		p := make([]byte, 2)
-		if n, err := b.Read(p); n != 2 || err != nil || !bytes.Equal(p, []byte("ab")) {
-			t.Fatalf("Read()=%q,%v,%v want \"ab\",2,nil", p, n, err)
-		}
-		if n, err := b.Write([]byte("xyz")); n != 3 || err != nil {
-			t.Fatalf("Write(\"xyz\")=%v,%v want 3,nil", n, err)
-		}
-		return b
-	})
-}
diff --git a/installer/vendor/golang.org/x/net/http2/errors.go b/installer/vendor/golang.org/x/net/http2/errors.go
deleted file mode 100644
index 20fd7626a5..0000000000
--- a/installer/vendor/golang.org/x/net/http2/errors.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"errors"
-	"fmt"
-)
-
-// An ErrCode is an unsigned 32-bit error code as defined in the HTTP/2 spec.
-type ErrCode uint32
-
-const (
-	ErrCodeNo                 ErrCode = 0x0
-	ErrCodeProtocol           ErrCode = 0x1
-	ErrCodeInternal           ErrCode = 0x2
-	ErrCodeFlowControl        ErrCode = 0x3
-	ErrCodeSettingsTimeout    ErrCode = 0x4
-	ErrCodeStreamClosed       ErrCode = 0x5
-	ErrCodeFrameSize          ErrCode = 0x6
-	ErrCodeRefusedStream      ErrCode = 0x7
-	ErrCodeCancel             ErrCode = 0x8
-	ErrCodeCompression        ErrCode = 0x9
-	ErrCodeConnect            ErrCode = 0xa
-	ErrCodeEnhanceYourCalm    ErrCode = 0xb
-	ErrCodeInadequateSecurity ErrCode = 0xc
-	ErrCodeHTTP11Required     ErrCode = 0xd
-)
-
-var errCodeName = map[ErrCode]string{
-	ErrCodeNo:                 "NO_ERROR",
-	ErrCodeProtocol:           "PROTOCOL_ERROR",
-	ErrCodeInternal:           "INTERNAL_ERROR",
-	ErrCodeFlowControl:        "FLOW_CONTROL_ERROR",
-	ErrCodeSettingsTimeout:    "SETTINGS_TIMEOUT",
-	ErrCodeStreamClosed:       "STREAM_CLOSED",
-	ErrCodeFrameSize:          "FRAME_SIZE_ERROR",
-	ErrCodeRefusedStream:      "REFUSED_STREAM",
-	ErrCodeCancel:             "CANCEL",
-	ErrCodeCompression:        "COMPRESSION_ERROR",
-	ErrCodeConnect:            "CONNECT_ERROR",
-	ErrCodeEnhanceYourCalm:    "ENHANCE_YOUR_CALM",
-	ErrCodeInadequateSecurity: "INADEQUATE_SECURITY",
-	ErrCodeHTTP11Required:     "HTTP_1_1_REQUIRED",
-}
-
-func (e ErrCode) String() string {
-	if s, ok := errCodeName[e]; ok {
-		return s
-	}
-	return fmt.Sprintf("unknown error code 0x%x", uint32(e))
-}
-
-// ConnectionError is an error that results in the termination of the
-// entire connection.
-type ConnectionError ErrCode
-
-func (e ConnectionError) Error() string { return fmt.Sprintf("connection error: %s", ErrCode(e)) }
-
-// StreamError is an error that only affects one stream within an
-// HTTP/2 connection.
-type StreamError struct {
-	StreamID uint32
-	Code     ErrCode
-	Cause    error // optional additional detail
-}
-
-func streamError(id uint32, code ErrCode) StreamError {
-	return StreamError{StreamID: id, Code: code}
-}
-
-func (e StreamError) Error() string {
-	if e.Cause != nil {
-		return fmt.Sprintf("stream error: stream ID %d; %v; %v", e.StreamID, e.Code, e.Cause)
-	}
-	return fmt.Sprintf("stream error: stream ID %d; %v", e.StreamID, e.Code)
-}
-
-// 6.9.1 The Flow Control Window
-// "If a sender receives a WINDOW_UPDATE that causes a flow control
-// window to exceed this maximum it MUST terminate either the stream
-// or the connection, as appropriate. For streams, [...]; for the
-// connection, a GOAWAY frame with a FLOW_CONTROL_ERROR code."
-type goAwayFlowError struct{}
-
-func (goAwayFlowError) Error() string { return "connection exceeded flow control window size" }
-
-// connErrorReason wraps a ConnectionError with an informative error about why it occurs.
-
-// Errors of this type are only returned by the frame parser functions
-// and converted into ConnectionError(ErrCodeProtocol).
-type connError struct {
-	Code   ErrCode
-	Reason string
-}
-
-func (e connError) Error() string {
-	return fmt.Sprintf("http2: connection error: %v: %v", e.Code, e.Reason)
-}
-
-type pseudoHeaderError string
-
-func (e pseudoHeaderError) Error() string {
-	return fmt.Sprintf("invalid pseudo-header %q", string(e))
-}
-
-type duplicatePseudoHeaderError string
-
-func (e duplicatePseudoHeaderError) Error() string {
-	return fmt.Sprintf("duplicate pseudo-header %q", string(e))
-}
-
-type headerFieldNameError string
-
-func (e headerFieldNameError) Error() string {
-	return fmt.Sprintf("invalid header field name %q", string(e))
-}
-
-type headerFieldValueError string
-
-func (e headerFieldValueError) Error() string {
-	return fmt.Sprintf("invalid header field value %q", string(e))
-}
-
-var (
-	errMixPseudoHeaderTypes = errors.New("mix of request and response pseudo headers")
-	errPseudoAfterRegular   = errors.New("pseudo header field after regular")
-)
diff --git a/installer/vendor/golang.org/x/net/http2/errors_test.go b/installer/vendor/golang.org/x/net/http2/errors_test.go
deleted file mode 100644
index da5c58c31d..0000000000
--- a/installer/vendor/golang.org/x/net/http2/errors_test.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestErrCodeString(t *testing.T) {
-	tests := []struct {
-		err  ErrCode
-		want string
-	}{
-		{ErrCodeProtocol, "PROTOCOL_ERROR"},
-		{0xd, "HTTP_1_1_REQUIRED"},
-		{0xf, "unknown error code 0xf"},
-	}
-	for i, tt := range tests {
-		got := tt.err.String()
-		if got != tt.want {
-			t.Errorf("%d. Error = %q; want %q", i, got, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/flow.go b/installer/vendor/golang.org/x/net/http2/flow.go
deleted file mode 100644
index 957de25420..0000000000
--- a/installer/vendor/golang.org/x/net/http2/flow.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Flow control
-
-package http2
-
-// flow is the flow control window's size.
-type flow struct {
-	// n is the number of DATA bytes we're allowed to send.
-	// A flow is kept both on a conn and a per-stream.
-	n int32
-
-	// conn points to the shared connection-level flow that is
-	// shared by all streams on that conn. It is nil for the flow
-	// that's on the conn directly.
-	conn *flow
-}
-
-func (f *flow) setConnFlow(cf *flow) { f.conn = cf }
-
-func (f *flow) available() int32 {
-	n := f.n
-	if f.conn != nil && f.conn.n < n {
-		n = f.conn.n
-	}
-	return n
-}
-
-func (f *flow) take(n int32) {
-	if n > f.available() {
-		panic("internal error: took too much")
-	}
-	f.n -= n
-	if f.conn != nil {
-		f.conn.n -= n
-	}
-}
-
-// add adds n bytes (positive or negative) to the flow control window.
-// It returns false if the sum would exceed 2^31-1.
-func (f *flow) add(n int32) bool {
-	remain := (1<<31 - 1) - f.n
-	if n > remain {
-		return false
-	}
-	f.n += n
-	return true
-}
diff --git a/installer/vendor/golang.org/x/net/http2/flow_test.go b/installer/vendor/golang.org/x/net/http2/flow_test.go
deleted file mode 100644
index 859adf5d14..0000000000
--- a/installer/vendor/golang.org/x/net/http2/flow_test.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestFlow(t *testing.T) {
-	var st flow
-	var conn flow
-	st.add(3)
-	conn.add(2)
-
-	if got, want := st.available(), int32(3); got != want {
-		t.Errorf("available = %d; want %d", got, want)
-	}
-	st.setConnFlow(&conn)
-	if got, want := st.available(), int32(2); got != want {
-		t.Errorf("after parent setup, available = %d; want %d", got, want)
-	}
-
-	st.take(2)
-	if got, want := conn.available(), int32(0); got != want {
-		t.Errorf("after taking 2, conn = %d; want %d", got, want)
-	}
-	if got, want := st.available(), int32(0); got != want {
-		t.Errorf("after taking 2, stream = %d; want %d", got, want)
-	}
-}
-
-func TestFlowAdd(t *testing.T) {
-	var f flow
-	if !f.add(1) {
-		t.Fatal("failed to add 1")
-	}
-	if !f.add(-1) {
-		t.Fatal("failed to add -1")
-	}
-	if got, want := f.available(), int32(0); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-	if !f.add(1<<31 - 1) {
-		t.Fatal("failed to add 2^31-1")
-	}
-	if got, want := f.available(), int32(1<<31-1); got != want {
-		t.Fatalf("size = %d; want %d", got, want)
-	}
-	if f.add(1) {
-		t.Fatal("adding 1 to max shouldn't be allowed")
-	}
-
-}
diff --git a/installer/vendor/golang.org/x/net/http2/frame.go b/installer/vendor/golang.org/x/net/http2/frame.go
deleted file mode 100644
index 3b14890728..0000000000
--- a/installer/vendor/golang.org/x/net/http2/frame.go
+++ /dev/null
@@ -1,1579 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"encoding/binary"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/lex/httplex"
-)
-
-const frameHeaderLen = 9
-
-var padZeros = make([]byte, 255) // zeros for padding
-
-// A FrameType is a registered frame type as defined in
-// http://http2.github.io/http2-spec/#rfc.section.11.2
-type FrameType uint8
-
-const (
-	FrameData         FrameType = 0x0
-	FrameHeaders      FrameType = 0x1
-	FramePriority     FrameType = 0x2
-	FrameRSTStream    FrameType = 0x3
-	FrameSettings     FrameType = 0x4
-	FramePushPromise  FrameType = 0x5
-	FramePing         FrameType = 0x6
-	FrameGoAway       FrameType = 0x7
-	FrameWindowUpdate FrameType = 0x8
-	FrameContinuation FrameType = 0x9
-)
-
-var frameName = map[FrameType]string{
-	FrameData:         "DATA",
-	FrameHeaders:      "HEADERS",
-	FramePriority:     "PRIORITY",
-	FrameRSTStream:    "RST_STREAM",
-	FrameSettings:     "SETTINGS",
-	FramePushPromise:  "PUSH_PROMISE",
-	FramePing:         "PING",
-	FrameGoAway:       "GOAWAY",
-	FrameWindowUpdate: "WINDOW_UPDATE",
-	FrameContinuation: "CONTINUATION",
-}
-
-func (t FrameType) String() string {
-	if s, ok := frameName[t]; ok {
-		return s
-	}
-	return fmt.Sprintf("UNKNOWN_FRAME_TYPE_%d", uint8(t))
-}
-
-// Flags is a bitmask of HTTP/2 flags.
-// The meaning of flags varies depending on the frame type.
-type Flags uint8
-
-// Has reports whether f contains all (0 or more) flags in v.
-func (f Flags) Has(v Flags) bool {
-	return (f & v) == v
-}
-
-// Frame-specific FrameHeader flag bits.
-const (
-	// Data Frame
-	FlagDataEndStream Flags = 0x1
-	FlagDataPadded    Flags = 0x8
-
-	// Headers Frame
-	FlagHeadersEndStream  Flags = 0x1
-	FlagHeadersEndHeaders Flags = 0x4
-	FlagHeadersPadded     Flags = 0x8
-	FlagHeadersPriority   Flags = 0x20
-
-	// Settings Frame
-	FlagSettingsAck Flags = 0x1
-
-	// Ping Frame
-	FlagPingAck Flags = 0x1
-
-	// Continuation Frame
-	FlagContinuationEndHeaders Flags = 0x4
-
-	FlagPushPromiseEndHeaders Flags = 0x4
-	FlagPushPromisePadded     Flags = 0x8
-)
-
-var flagName = map[FrameType]map[Flags]string{
-	FrameData: {
-		FlagDataEndStream: "END_STREAM",
-		FlagDataPadded:    "PADDED",
-	},
-	FrameHeaders: {
-		FlagHeadersEndStream:  "END_STREAM",
-		FlagHeadersEndHeaders: "END_HEADERS",
-		FlagHeadersPadded:     "PADDED",
-		FlagHeadersPriority:   "PRIORITY",
-	},
-	FrameSettings: {
-		FlagSettingsAck: "ACK",
-	},
-	FramePing: {
-		FlagPingAck: "ACK",
-	},
-	FrameContinuation: {
-		FlagContinuationEndHeaders: "END_HEADERS",
-	},
-	FramePushPromise: {
-		FlagPushPromiseEndHeaders: "END_HEADERS",
-		FlagPushPromisePadded:     "PADDED",
-	},
-}
-
-// a frameParser parses a frame given its FrameHeader and payload
-// bytes. The length of payload will always equal fh.Length (which
-// might be 0).
-type frameParser func(fc *frameCache, fh FrameHeader, payload []byte) (Frame, error)
-
-var frameParsers = map[FrameType]frameParser{
-	FrameData:         parseDataFrame,
-	FrameHeaders:      parseHeadersFrame,
-	FramePriority:     parsePriorityFrame,
-	FrameRSTStream:    parseRSTStreamFrame,
-	FrameSettings:     parseSettingsFrame,
-	FramePushPromise:  parsePushPromise,
-	FramePing:         parsePingFrame,
-	FrameGoAway:       parseGoAwayFrame,
-	FrameWindowUpdate: parseWindowUpdateFrame,
-	FrameContinuation: parseContinuationFrame,
-}
-
-func typeFrameParser(t FrameType) frameParser {
-	if f := frameParsers[t]; f != nil {
-		return f
-	}
-	return parseUnknownFrame
-}
-
-// A FrameHeader is the 9 byte header of all HTTP/2 frames.
-//
-// See http://http2.github.io/http2-spec/#FrameHeader
-type FrameHeader struct {
-	valid bool // caller can access []byte fields in the Frame
-
-	// Type is the 1 byte frame type. There are ten standard frame
-	// types, but extension frame types may be written by WriteRawFrame
-	// and will be returned by ReadFrame (as UnknownFrame).
-	Type FrameType
-
-	// Flags are the 1 byte of 8 potential bit flags per frame.
-	// They are specific to the frame type.
-	Flags Flags
-
-	// Length is the length of the frame, not including the 9 byte header.
-	// The maximum size is one byte less than 16MB (uint24), but only
-	// frames up to 16KB are allowed without peer agreement.
-	Length uint32
-
-	// StreamID is which stream this frame is for. Certain frames
-	// are not stream-specific, in which case this field is 0.
-	StreamID uint32
-}
-
-// Header returns h. It exists so FrameHeaders can be embedded in other
-// specific frame types and implement the Frame interface.
-func (h FrameHeader) Header() FrameHeader { return h }
-
-func (h FrameHeader) String() string {
-	var buf bytes.Buffer
-	buf.WriteString("[FrameHeader ")
-	h.writeDebug(&buf)
-	buf.WriteByte(']')
-	return buf.String()
-}
-
-func (h FrameHeader) writeDebug(buf *bytes.Buffer) {
-	buf.WriteString(h.Type.String())
-	if h.Flags != 0 {
-		buf.WriteString(" flags=")
-		set := 0
-		for i := uint8(0); i < 8; i++ {
-			if h.Flags&(1<<i) == 0 {
-				continue
-			}
-			set++
-			if set > 1 {
-				buf.WriteByte('|')
-			}
-			name := flagName[h.Type][Flags(1<<i)]
-			if name != "" {
-				buf.WriteString(name)
-			} else {
-				fmt.Fprintf(buf, "0x%x", 1<<i)
-			}
-		}
-	}
-	if h.StreamID != 0 {
-		fmt.Fprintf(buf, " stream=%d", h.StreamID)
-	}
-	fmt.Fprintf(buf, " len=%d", h.Length)
-}
-
-func (h *FrameHeader) checkValid() {
-	if !h.valid {
-		panic("Frame accessor called on non-owned Frame")
-	}
-}
-
-func (h *FrameHeader) invalidate() { h.valid = false }
-
-// frame header bytes.
-// Used only by ReadFrameHeader.
-var fhBytes = sync.Pool{
-	New: func() interface{} {
-		buf := make([]byte, frameHeaderLen)
-		return &buf
-	},
-}
-
-// ReadFrameHeader reads 9 bytes from r and returns a FrameHeader.
-// Most users should use Framer.ReadFrame instead.
-func ReadFrameHeader(r io.Reader) (FrameHeader, error) {
-	bufp := fhBytes.Get().(*[]byte)
-	defer fhBytes.Put(bufp)
-	return readFrameHeader(*bufp, r)
-}
-
-func readFrameHeader(buf []byte, r io.Reader) (FrameHeader, error) {
-	_, err := io.ReadFull(r, buf[:frameHeaderLen])
-	if err != nil {
-		return FrameHeader{}, err
-	}
-	return FrameHeader{
-		Length:   (uint32(buf[0])<<16 | uint32(buf[1])<<8 | uint32(buf[2])),
-		Type:     FrameType(buf[3]),
-		Flags:    Flags(buf[4]),
-		StreamID: binary.BigEndian.Uint32(buf[5:]) & (1<<31 - 1),
-		valid:    true,
-	}, nil
-}
-
-// A Frame is the base interface implemented by all frame types.
-// Callers will generally type-assert the specific frame type:
-// *HeadersFrame, *SettingsFrame, *WindowUpdateFrame, etc.
-//
-// Frames are only valid until the next call to Framer.ReadFrame.
-type Frame interface {
-	Header() FrameHeader
-
-	// invalidate is called by Framer.ReadFrame to make this
-	// frame's buffers as being invalid, since the subsequent
-	// frame will reuse them.
-	invalidate()
-}
-
-// A Framer reads and writes Frames.
-type Framer struct {
-	r         io.Reader
-	lastFrame Frame
-	errDetail error
-
-	// lastHeaderStream is non-zero if the last frame was an
-	// unfinished HEADERS/CONTINUATION.
-	lastHeaderStream uint32
-
-	maxReadSize uint32
-	headerBuf   [frameHeaderLen]byte
-
-	// TODO: let getReadBuf be configurable, and use a less memory-pinning
-	// allocator in server.go to minimize memory pinned for many idle conns.
-	// Will probably also need to make frame invalidation have a hook too.
-	getReadBuf func(size uint32) []byte
-	readBuf    []byte // cache for default getReadBuf
-
-	maxWriteSize uint32 // zero means unlimited; TODO: implement
-
-	w    io.Writer
-	wbuf []byte
-
-	// AllowIllegalWrites permits the Framer's Write methods to
-	// write frames that do not conform to the HTTP/2 spec. This
-	// permits using the Framer to test other HTTP/2
-	// implementations' conformance to the spec.
-	// If false, the Write methods will prefer to return an error
-	// rather than comply.
-	AllowIllegalWrites bool
-
-	// AllowIllegalReads permits the Framer's ReadFrame method
-	// to return non-compliant frames or frame orders.
-	// This is for testing and permits using the Framer to test
-	// other HTTP/2 implementations' conformance to the spec.
-	// It is not compatible with ReadMetaHeaders.
-	AllowIllegalReads bool
-
-	// ReadMetaHeaders if non-nil causes ReadFrame to merge
-	// HEADERS and CONTINUATION frames together and return
-	// MetaHeadersFrame instead.
-	ReadMetaHeaders *hpack.Decoder
-
-	// MaxHeaderListSize is the http2 MAX_HEADER_LIST_SIZE.
-	// It's used only if ReadMetaHeaders is set; 0 means a sane default
-	// (currently 16MB)
-	// If the limit is hit, MetaHeadersFrame.Truncated is set true.
-	MaxHeaderListSize uint32
-
-	// TODO: track which type of frame & with which flags was sent
-	// last. Then return an error (unless AllowIllegalWrites) if
-	// we're in the middle of a header block and a
-	// non-Continuation or Continuation on a different stream is
-	// attempted to be written.
-
-	logReads, logWrites bool
-
-	debugFramer       *Framer // only use for logging written writes
-	debugFramerBuf    *bytes.Buffer
-	debugReadLoggerf  func(string, ...interface{})
-	debugWriteLoggerf func(string, ...interface{})
-
-	frameCache *frameCache // nil if frames aren't reused (default)
-}
-
-func (fr *Framer) maxHeaderListSize() uint32 {
-	if fr.MaxHeaderListSize == 0 {
-		return 16 << 20 // sane default, per docs
-	}
-	return fr.MaxHeaderListSize
-}
-
-func (f *Framer) startWrite(ftype FrameType, flags Flags, streamID uint32) {
-	// Write the FrameHeader.
-	f.wbuf = append(f.wbuf[:0],
-		0, // 3 bytes of length, filled in in endWrite
-		0,
-		0,
-		byte(ftype),
-		byte(flags),
-		byte(streamID>>24),
-		byte(streamID>>16),
-		byte(streamID>>8),
-		byte(streamID))
-}
-
-func (f *Framer) endWrite() error {
-	// Now that we know the final size, fill in the FrameHeader in
-	// the space previously reserved for it. Abuse append.
-	length := len(f.wbuf) - frameHeaderLen
-	if length >= (1 << 24) {
-		return ErrFrameTooLarge
-	}
-	_ = append(f.wbuf[:0],
-		byte(length>>16),
-		byte(length>>8),
-		byte(length))
-	if f.logWrites {
-		f.logWrite()
-	}
-
-	n, err := f.w.Write(f.wbuf)
-	if err == nil && n != len(f.wbuf) {
-		err = io.ErrShortWrite
-	}
-	return err
-}
-
-func (f *Framer) logWrite() {
-	if f.debugFramer == nil {
-		f.debugFramerBuf = new(bytes.Buffer)
-		f.debugFramer = NewFramer(nil, f.debugFramerBuf)
-		f.debugFramer.logReads = false // we log it ourselves, saying "wrote" below
-		// Let us read anything, even if we accidentally wrote it
-		// in the wrong order:
-		f.debugFramer.AllowIllegalReads = true
-	}
-	f.debugFramerBuf.Write(f.wbuf)
-	fr, err := f.debugFramer.ReadFrame()
-	if err != nil {
-		f.debugWriteLoggerf("http2: Framer %p: failed to decode just-written frame", f)
-		return
-	}
-	f.debugWriteLoggerf("http2: Framer %p: wrote %v", f, summarizeFrame(fr))
-}
-
-func (f *Framer) writeByte(v byte)     { f.wbuf = append(f.wbuf, v) }
-func (f *Framer) writeBytes(v []byte)  { f.wbuf = append(f.wbuf, v...) }
-func (f *Framer) writeUint16(v uint16) { f.wbuf = append(f.wbuf, byte(v>>8), byte(v)) }
-func (f *Framer) writeUint32(v uint32) {
-	f.wbuf = append(f.wbuf, byte(v>>24), byte(v>>16), byte(v>>8), byte(v))
-}
-
-const (
-	minMaxFrameSize = 1 << 14
-	maxFrameSize    = 1<<24 - 1
-)
-
-// SetReuseFrames allows the Framer to reuse Frames.
-// If called on a Framer, Frames returned by calls to ReadFrame are only
-// valid until the next call to ReadFrame.
-func (fr *Framer) SetReuseFrames() {
-	if fr.frameCache != nil {
-		return
-	}
-	fr.frameCache = &frameCache{}
-}
-
-type frameCache struct {
-	dataFrame DataFrame
-}
-
-func (fc *frameCache) getDataFrame() *DataFrame {
-	if fc == nil {
-		return &DataFrame{}
-	}
-	return &fc.dataFrame
-}
-
-// NewFramer returns a Framer that writes frames to w and reads them from r.
-func NewFramer(w io.Writer, r io.Reader) *Framer {
-	fr := &Framer{
-		w:                 w,
-		r:                 r,
-		logReads:          logFrameReads,
-		logWrites:         logFrameWrites,
-		debugReadLoggerf:  log.Printf,
-		debugWriteLoggerf: log.Printf,
-	}
-	fr.getReadBuf = func(size uint32) []byte {
-		if cap(fr.readBuf) >= int(size) {
-			return fr.readBuf[:size]
-		}
-		fr.readBuf = make([]byte, size)
-		return fr.readBuf
-	}
-	fr.SetMaxReadFrameSize(maxFrameSize)
-	return fr
-}
-
-// SetMaxReadFrameSize sets the maximum size of a frame
-// that will be read by a subsequent call to ReadFrame.
-// It is the caller's responsibility to advertise this
-// limit with a SETTINGS frame.
-func (fr *Framer) SetMaxReadFrameSize(v uint32) {
-	if v > maxFrameSize {
-		v = maxFrameSize
-	}
-	fr.maxReadSize = v
-}
-
-// ErrorDetail returns a more detailed error of the last error
-// returned by Framer.ReadFrame. For instance, if ReadFrame
-// returns a StreamError with code PROTOCOL_ERROR, ErrorDetail
-// will say exactly what was invalid. ErrorDetail is not guaranteed
-// to return a non-nil value and like the rest of the http2 package,
-// its return value is not protected by an API compatibility promise.
-// ErrorDetail is reset after the next call to ReadFrame.
-func (fr *Framer) ErrorDetail() error {
-	return fr.errDetail
-}
-
-// ErrFrameTooLarge is returned from Framer.ReadFrame when the peer
-// sends a frame that is larger than declared with SetMaxReadFrameSize.
-var ErrFrameTooLarge = errors.New("http2: frame too large")
-
-// terminalReadFrameError reports whether err is an unrecoverable
-// error from ReadFrame and no other frames should be read.
-func terminalReadFrameError(err error) bool {
-	if _, ok := err.(StreamError); ok {
-		return false
-	}
-	return err != nil
-}
-
-// ReadFrame reads a single frame. The returned Frame is only valid
-// until the next call to ReadFrame.
-//
-// If the frame is larger than previously set with SetMaxReadFrameSize, the
-// returned error is ErrFrameTooLarge. Other errors may be of type
-// ConnectionError, StreamError, or anything else from the underlying
-// reader.
-func (fr *Framer) ReadFrame() (Frame, error) {
-	fr.errDetail = nil
-	if fr.lastFrame != nil {
-		fr.lastFrame.invalidate()
-	}
-	fh, err := readFrameHeader(fr.headerBuf[:], fr.r)
-	if err != nil {
-		return nil, err
-	}
-	if fh.Length > fr.maxReadSize {
-		return nil, ErrFrameTooLarge
-	}
-	payload := fr.getReadBuf(fh.Length)
-	if _, err := io.ReadFull(fr.r, payload); err != nil {
-		return nil, err
-	}
-	f, err := typeFrameParser(fh.Type)(fr.frameCache, fh, payload)
-	if err != nil {
-		if ce, ok := err.(connError); ok {
-			return nil, fr.connError(ce.Code, ce.Reason)
-		}
-		return nil, err
-	}
-	if err := fr.checkFrameOrder(f); err != nil {
-		return nil, err
-	}
-	if fr.logReads {
-		fr.debugReadLoggerf("http2: Framer %p: read %v", fr, summarizeFrame(f))
-	}
-	if fh.Type == FrameHeaders && fr.ReadMetaHeaders != nil {
-		return fr.readMetaFrame(f.(*HeadersFrame))
-	}
-	return f, nil
-}
-
-// connError returns ConnectionError(code) but first
-// stashes away a public reason to the caller can optionally relay it
-// to the peer before hanging up on them. This might help others debug
-// their implementations.
-func (fr *Framer) connError(code ErrCode, reason string) error {
-	fr.errDetail = errors.New(reason)
-	return ConnectionError(code)
-}
-
-// checkFrameOrder reports an error if f is an invalid frame to return
-// next from ReadFrame. Mostly it checks whether HEADERS and
-// CONTINUATION frames are contiguous.
-func (fr *Framer) checkFrameOrder(f Frame) error {
-	last := fr.lastFrame
-	fr.lastFrame = f
-	if fr.AllowIllegalReads {
-		return nil
-	}
-
-	fh := f.Header()
-	if fr.lastHeaderStream != 0 {
-		if fh.Type != FrameContinuation {
-			return fr.connError(ErrCodeProtocol,
-				fmt.Sprintf("got %s for stream %d; expected CONTINUATION following %s for stream %d",
-					fh.Type, fh.StreamID,
-					last.Header().Type, fr.lastHeaderStream))
-		}
-		if fh.StreamID != fr.lastHeaderStream {
-			return fr.connError(ErrCodeProtocol,
-				fmt.Sprintf("got CONTINUATION for stream %d; expected stream %d",
-					fh.StreamID, fr.lastHeaderStream))
-		}
-	} else if fh.Type == FrameContinuation {
-		return fr.connError(ErrCodeProtocol, fmt.Sprintf("unexpected CONTINUATION for stream %d", fh.StreamID))
-	}
-
-	switch fh.Type {
-	case FrameHeaders, FrameContinuation:
-		if fh.Flags.Has(FlagHeadersEndHeaders) {
-			fr.lastHeaderStream = 0
-		} else {
-			fr.lastHeaderStream = fh.StreamID
-		}
-	}
-
-	return nil
-}
-
-// A DataFrame conveys arbitrary, variable-length sequences of octets
-// associated with a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.1
-type DataFrame struct {
-	FrameHeader
-	data []byte
-}
-
-func (f *DataFrame) StreamEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagDataEndStream)
-}
-
-// Data returns the frame's data octets, not including any padding
-// size byte or padding suffix bytes.
-// The caller must not retain the returned memory past the next
-// call to ReadFrame.
-func (f *DataFrame) Data() []byte {
-	f.checkValid()
-	return f.data
-}
-
-func parseDataFrame(fc *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
-	if fh.StreamID == 0 {
-		// DATA frames MUST be associated with a stream. If a
-		// DATA frame is received whose stream identifier
-		// field is 0x0, the recipient MUST respond with a
-		// connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR.
-		return nil, connError{ErrCodeProtocol, "DATA frame with stream ID 0"}
-	}
-	f := fc.getDataFrame()
-	f.FrameHeader = fh
-
-	var padSize byte
-	if fh.Flags.Has(FlagDataPadded) {
-		var err error
-		payload, padSize, err = readByte(payload)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if int(padSize) > len(payload) {
-		// If the length of the padding is greater than the
-		// length of the frame payload, the recipient MUST
-		// treat this as a connection error.
-		// Filed: https://github.com/http2/http2-spec/issues/610
-		return nil, connError{ErrCodeProtocol, "pad size larger than data payload"}
-	}
-	f.data = payload[:len(payload)-int(padSize)]
-	return f, nil
-}
-
-var (
-	errStreamID    = errors.New("invalid stream ID")
-	errDepStreamID = errors.New("invalid dependent stream ID")
-	errPadLength   = errors.New("pad length too large")
-	errPadBytes    = errors.New("padding bytes must all be zeros unless AllowIllegalWrites is enabled")
-)
-
-func validStreamIDOrZero(streamID uint32) bool {
-	return streamID&(1<<31) == 0
-}
-
-func validStreamID(streamID uint32) bool {
-	return streamID != 0 && streamID&(1<<31) == 0
-}
-
-// WriteData writes a DATA frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility not to violate the maximum frame size
-// and to not call other Write methods concurrently.
-func (f *Framer) WriteData(streamID uint32, endStream bool, data []byte) error {
-	return f.WriteDataPadded(streamID, endStream, data, nil)
-}
-
-// WriteData writes a DATA frame with optional padding.
-//
-// If pad is nil, the padding bit is not sent.
-// The length of pad must not exceed 255 bytes.
-// The bytes of pad must all be zero, unless f.AllowIllegalWrites is set.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility not to violate the maximum frame size
-// and to not call other Write methods concurrently.
-func (f *Framer) WriteDataPadded(streamID uint32, endStream bool, data, pad []byte) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	if len(pad) > 0 {
-		if len(pad) > 255 {
-			return errPadLength
-		}
-		if !f.AllowIllegalWrites {
-			for _, b := range pad {
-				if b != 0 {
-					// "Padding octets MUST be set to zero when sending."
-					return errPadBytes
-				}
-			}
-		}
-	}
-	var flags Flags
-	if endStream {
-		flags |= FlagDataEndStream
-	}
-	if pad != nil {
-		flags |= FlagDataPadded
-	}
-	f.startWrite(FrameData, flags, streamID)
-	if pad != nil {
-		f.wbuf = append(f.wbuf, byte(len(pad)))
-	}
-	f.wbuf = append(f.wbuf, data...)
-	f.wbuf = append(f.wbuf, pad...)
-	return f.endWrite()
-}
-
-// A SettingsFrame conveys configuration parameters that affect how
-// endpoints communicate, such as preferences and constraints on peer
-// behavior.
-//
-// See http://http2.github.io/http2-spec/#SETTINGS
-type SettingsFrame struct {
-	FrameHeader
-	p []byte
-}
-
-func parseSettingsFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	if fh.Flags.Has(FlagSettingsAck) && fh.Length > 0 {
-		// When this (ACK 0x1) bit is set, the payload of the
-		// SETTINGS frame MUST be empty. Receipt of a
-		// SETTINGS frame with the ACK flag set and a length
-		// field value other than 0 MUST be treated as a
-		// connection error (Section 5.4.1) of type
-		// FRAME_SIZE_ERROR.
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID != 0 {
-		// SETTINGS frames always apply to a connection,
-		// never a single stream. The stream identifier for a
-		// SETTINGS frame MUST be zero (0x0).  If an endpoint
-		// receives a SETTINGS frame whose stream identifier
-		// field is anything other than 0x0, the endpoint MUST
-		// respond with a connection error (Section 5.4.1) of
-		// type PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	if len(p)%6 != 0 {
-		// Expecting even number of 6 byte settings.
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	f := &SettingsFrame{FrameHeader: fh, p: p}
-	if v, ok := f.Value(SettingInitialWindowSize); ok && v > (1<<31)-1 {
-		// Values above the maximum flow control window size of 2^31 - 1 MUST
-		// be treated as a connection error (Section 5.4.1) of type
-		// FLOW_CONTROL_ERROR.
-		return nil, ConnectionError(ErrCodeFlowControl)
-	}
-	return f, nil
-}
-
-func (f *SettingsFrame) IsAck() bool {
-	return f.FrameHeader.Flags.Has(FlagSettingsAck)
-}
-
-func (f *SettingsFrame) Value(s SettingID) (v uint32, ok bool) {
-	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		settingID := SettingID(binary.BigEndian.Uint16(buf[:2]))
-		if settingID == s {
-			return binary.BigEndian.Uint32(buf[2:6]), true
-		}
-		buf = buf[6:]
-	}
-	return 0, false
-}
-
-// ForeachSetting runs fn for each setting.
-// It stops and returns the first error.
-func (f *SettingsFrame) ForeachSetting(fn func(Setting) error) error {
-	f.checkValid()
-	buf := f.p
-	for len(buf) > 0 {
-		if err := fn(Setting{
-			SettingID(binary.BigEndian.Uint16(buf[:2])),
-			binary.BigEndian.Uint32(buf[2:6]),
-		}); err != nil {
-			return err
-		}
-		buf = buf[6:]
-	}
-	return nil
-}
-
-// WriteSettings writes a SETTINGS frame with zero or more settings
-// specified and the ACK bit not set.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteSettings(settings ...Setting) error {
-	f.startWrite(FrameSettings, 0, 0)
-	for _, s := range settings {
-		f.writeUint16(uint16(s.ID))
-		f.writeUint32(s.Val)
-	}
-	return f.endWrite()
-}
-
-// WriteSettingsAck writes an empty SETTINGS frame with the ACK bit set.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteSettingsAck() error {
-	f.startWrite(FrameSettings, FlagSettingsAck, 0)
-	return f.endWrite()
-}
-
-// A PingFrame is a mechanism for measuring a minimal round trip time
-// from the sender, as well as determining whether an idle connection
-// is still functional.
-// See http://http2.github.io/http2-spec/#rfc.section.6.7
-type PingFrame struct {
-	FrameHeader
-	Data [8]byte
-}
-
-func (f *PingFrame) IsAck() bool { return f.Flags.Has(FlagPingAck) }
-
-func parsePingFrame(_ *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
-	if len(payload) != 8 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID != 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	f := &PingFrame{FrameHeader: fh}
-	copy(f.Data[:], payload)
-	return f, nil
-}
-
-func (f *Framer) WritePing(ack bool, data [8]byte) error {
-	var flags Flags
-	if ack {
-		flags = FlagPingAck
-	}
-	f.startWrite(FramePing, flags, 0)
-	f.writeBytes(data[:])
-	return f.endWrite()
-}
-
-// A GoAwayFrame informs the remote peer to stop creating streams on this connection.
-// See http://http2.github.io/http2-spec/#rfc.section.6.8
-type GoAwayFrame struct {
-	FrameHeader
-	LastStreamID uint32
-	ErrCode      ErrCode
-	debugData    []byte
-}
-
-// DebugData returns any debug data in the GOAWAY frame. Its contents
-// are not defined.
-// The caller must not retain the returned memory past the next
-// call to ReadFrame.
-func (f *GoAwayFrame) DebugData() []byte {
-	f.checkValid()
-	return f.debugData
-}
-
-func parseGoAwayFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	if fh.StreamID != 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	if len(p) < 8 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	return &GoAwayFrame{
-		FrameHeader:  fh,
-		LastStreamID: binary.BigEndian.Uint32(p[:4]) & (1<<31 - 1),
-		ErrCode:      ErrCode(binary.BigEndian.Uint32(p[4:8])),
-		debugData:    p[8:],
-	}, nil
-}
-
-func (f *Framer) WriteGoAway(maxStreamID uint32, code ErrCode, debugData []byte) error {
-	f.startWrite(FrameGoAway, 0, 0)
-	f.writeUint32(maxStreamID & (1<<31 - 1))
-	f.writeUint32(uint32(code))
-	f.writeBytes(debugData)
-	return f.endWrite()
-}
-
-// An UnknownFrame is the frame type returned when the frame type is unknown
-// or no specific frame type parser exists.
-type UnknownFrame struct {
-	FrameHeader
-	p []byte
-}
-
-// Payload returns the frame's payload (after the header).  It is not
-// valid to call this method after a subsequent call to
-// Framer.ReadFrame, nor is it valid to retain the returned slice.
-// The memory is owned by the Framer and is invalidated when the next
-// frame is read.
-func (f *UnknownFrame) Payload() []byte {
-	f.checkValid()
-	return f.p
-}
-
-func parseUnknownFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	return &UnknownFrame{fh, p}, nil
-}
-
-// A WindowUpdateFrame is used to implement flow control.
-// See http://http2.github.io/http2-spec/#rfc.section.6.9
-type WindowUpdateFrame struct {
-	FrameHeader
-	Increment uint32 // never read with high bit set
-}
-
-func parseWindowUpdateFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	if len(p) != 4 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	inc := binary.BigEndian.Uint32(p[:4]) & 0x7fffffff // mask off high reserved bit
-	if inc == 0 {
-		// A receiver MUST treat the receipt of a
-		// WINDOW_UPDATE frame with an flow control window
-		// increment of 0 as a stream error (Section 5.4.2) of
-		// type PROTOCOL_ERROR; errors on the connection flow
-		// control window MUST be treated as a connection
-		// error (Section 5.4.1).
-		if fh.StreamID == 0 {
-			return nil, ConnectionError(ErrCodeProtocol)
-		}
-		return nil, streamError(fh.StreamID, ErrCodeProtocol)
-	}
-	return &WindowUpdateFrame{
-		FrameHeader: fh,
-		Increment:   inc,
-	}, nil
-}
-
-// WriteWindowUpdate writes a WINDOW_UPDATE frame.
-// The increment value must be between 1 and 2,147,483,647, inclusive.
-// If the Stream ID is zero, the window update applies to the
-// connection as a whole.
-func (f *Framer) WriteWindowUpdate(streamID, incr uint32) error {
-	// "The legal range for the increment to the flow control window is 1 to 2^31-1 (2,147,483,647) octets."
-	if (incr < 1 || incr > 2147483647) && !f.AllowIllegalWrites {
-		return errors.New("illegal window increment value")
-	}
-	f.startWrite(FrameWindowUpdate, 0, streamID)
-	f.writeUint32(incr)
-	return f.endWrite()
-}
-
-// A HeadersFrame is used to open a stream and additionally carries a
-// header block fragment.
-type HeadersFrame struct {
-	FrameHeader
-
-	// Priority is set if FlagHeadersPriority is set in the FrameHeader.
-	Priority PriorityParam
-
-	headerFragBuf []byte // not owned
-}
-
-func (f *HeadersFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *HeadersFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersEndHeaders)
-}
-
-func (f *HeadersFrame) StreamEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersEndStream)
-}
-
-func (f *HeadersFrame) HasPriority() bool {
-	return f.FrameHeader.Flags.Has(FlagHeadersPriority)
-}
-
-func parseHeadersFrame(_ *frameCache, fh FrameHeader, p []byte) (_ Frame, err error) {
-	hf := &HeadersFrame{
-		FrameHeader: fh,
-	}
-	if fh.StreamID == 0 {
-		// HEADERS frames MUST be associated with a stream. If a HEADERS frame
-		// is received whose stream identifier field is 0x0, the recipient MUST
-		// respond with a connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR.
-		return nil, connError{ErrCodeProtocol, "HEADERS frame with stream ID 0"}
-	}
-	var padLength uint8
-	if fh.Flags.Has(FlagHeadersPadded) {
-		if p, padLength, err = readByte(p); err != nil {
-			return
-		}
-	}
-	if fh.Flags.Has(FlagHeadersPriority) {
-		var v uint32
-		p, v, err = readUint32(p)
-		if err != nil {
-			return nil, err
-		}
-		hf.Priority.StreamDep = v & 0x7fffffff
-		hf.Priority.Exclusive = (v != hf.Priority.StreamDep) // high bit was set
-		p, hf.Priority.Weight, err = readByte(p)
-		if err != nil {
-			return nil, err
-		}
-	}
-	if len(p)-int(padLength) <= 0 {
-		return nil, streamError(fh.StreamID, ErrCodeProtocol)
-	}
-	hf.headerFragBuf = p[:len(p)-int(padLength)]
-	return hf, nil
-}
-
-// HeadersFrameParam are the parameters for writing a HEADERS frame.
-type HeadersFrameParam struct {
-	// StreamID is the required Stream ID to initiate.
-	StreamID uint32
-	// BlockFragment is part (or all) of a Header Block.
-	BlockFragment []byte
-
-	// EndStream indicates that the header block is the last that
-	// the endpoint will send for the identified stream. Setting
-	// this flag causes the stream to enter one of "half closed"
-	// states.
-	EndStream bool
-
-	// EndHeaders indicates that this frame contains an entire
-	// header block and is not followed by any
-	// CONTINUATION frames.
-	EndHeaders bool
-
-	// PadLength is the optional number of bytes of zeros to add
-	// to this frame.
-	PadLength uint8
-
-	// Priority, if non-zero, includes stream priority information
-	// in the HEADER frame.
-	Priority PriorityParam
-}
-
-// WriteHeaders writes a single HEADERS frame.
-//
-// This is a low-level header writing method. Encoding headers and
-// splitting them into any necessary CONTINUATION frames is handled
-// elsewhere.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteHeaders(p HeadersFrameParam) error {
-	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if p.PadLength != 0 {
-		flags |= FlagHeadersPadded
-	}
-	if p.EndStream {
-		flags |= FlagHeadersEndStream
-	}
-	if p.EndHeaders {
-		flags |= FlagHeadersEndHeaders
-	}
-	if !p.Priority.IsZero() {
-		flags |= FlagHeadersPriority
-	}
-	f.startWrite(FrameHeaders, flags, p.StreamID)
-	if p.PadLength != 0 {
-		f.writeByte(p.PadLength)
-	}
-	if !p.Priority.IsZero() {
-		v := p.Priority.StreamDep
-		if !validStreamIDOrZero(v) && !f.AllowIllegalWrites {
-			return errDepStreamID
-		}
-		if p.Priority.Exclusive {
-			v |= 1 << 31
-		}
-		f.writeUint32(v)
-		f.writeByte(p.Priority.Weight)
-	}
-	f.wbuf = append(f.wbuf, p.BlockFragment...)
-	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
-	return f.endWrite()
-}
-
-// A PriorityFrame specifies the sender-advised priority of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.3
-type PriorityFrame struct {
-	FrameHeader
-	PriorityParam
-}
-
-// PriorityParam are the stream prioritzation parameters.
-type PriorityParam struct {
-	// StreamDep is a 31-bit stream identifier for the
-	// stream that this stream depends on. Zero means no
-	// dependency.
-	StreamDep uint32
-
-	// Exclusive is whether the dependency is exclusive.
-	Exclusive bool
-
-	// Weight is the stream's zero-indexed weight. It should be
-	// set together with StreamDep, or neither should be set. Per
-	// the spec, "Add one to the value to obtain a weight between
-	// 1 and 256."
-	Weight uint8
-}
-
-func (p PriorityParam) IsZero() bool {
-	return p == PriorityParam{}
-}
-
-func parsePriorityFrame(_ *frameCache, fh FrameHeader, payload []byte) (Frame, error) {
-	if fh.StreamID == 0 {
-		return nil, connError{ErrCodeProtocol, "PRIORITY frame with stream ID 0"}
-	}
-	if len(payload) != 5 {
-		return nil, connError{ErrCodeFrameSize, fmt.Sprintf("PRIORITY frame payload size was %d; want 5", len(payload))}
-	}
-	v := binary.BigEndian.Uint32(payload[:4])
-	streamID := v & 0x7fffffff // mask off high bit
-	return &PriorityFrame{
-		FrameHeader: fh,
-		PriorityParam: PriorityParam{
-			Weight:    payload[4],
-			StreamDep: streamID,
-			Exclusive: streamID != v, // was high bit set?
-		},
-	}, nil
-}
-
-// WritePriority writes a PRIORITY frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WritePriority(streamID uint32, p PriorityParam) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	if !validStreamIDOrZero(p.StreamDep) {
-		return errDepStreamID
-	}
-	f.startWrite(FramePriority, 0, streamID)
-	v := p.StreamDep
-	if p.Exclusive {
-		v |= 1 << 31
-	}
-	f.writeUint32(v)
-	f.writeByte(p.Weight)
-	return f.endWrite()
-}
-
-// A RSTStreamFrame allows for abnormal termination of a stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.4
-type RSTStreamFrame struct {
-	FrameHeader
-	ErrCode ErrCode
-}
-
-func parseRSTStreamFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	if len(p) != 4 {
-		return nil, ConnectionError(ErrCodeFrameSize)
-	}
-	if fh.StreamID == 0 {
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	return &RSTStreamFrame{fh, ErrCode(binary.BigEndian.Uint32(p[:4]))}, nil
-}
-
-// WriteRSTStream writes a RST_STREAM frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteRSTStream(streamID uint32, code ErrCode) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	f.startWrite(FrameRSTStream, 0, streamID)
-	f.writeUint32(uint32(code))
-	return f.endWrite()
-}
-
-// A ContinuationFrame is used to continue a sequence of header block fragments.
-// See http://http2.github.io/http2-spec/#rfc.section.6.10
-type ContinuationFrame struct {
-	FrameHeader
-	headerFragBuf []byte
-}
-
-func parseContinuationFrame(_ *frameCache, fh FrameHeader, p []byte) (Frame, error) {
-	if fh.StreamID == 0 {
-		return nil, connError{ErrCodeProtocol, "CONTINUATION frame with stream ID 0"}
-	}
-	return &ContinuationFrame{fh, p}, nil
-}
-
-func (f *ContinuationFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *ContinuationFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagContinuationEndHeaders)
-}
-
-// WriteContinuation writes a CONTINUATION frame.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WriteContinuation(streamID uint32, endHeaders bool, headerBlockFragment []byte) error {
-	if !validStreamID(streamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if endHeaders {
-		flags |= FlagContinuationEndHeaders
-	}
-	f.startWrite(FrameContinuation, flags, streamID)
-	f.wbuf = append(f.wbuf, headerBlockFragment...)
-	return f.endWrite()
-}
-
-// A PushPromiseFrame is used to initiate a server stream.
-// See http://http2.github.io/http2-spec/#rfc.section.6.6
-type PushPromiseFrame struct {
-	FrameHeader
-	PromiseID     uint32
-	headerFragBuf []byte // not owned
-}
-
-func (f *PushPromiseFrame) HeaderBlockFragment() []byte {
-	f.checkValid()
-	return f.headerFragBuf
-}
-
-func (f *PushPromiseFrame) HeadersEnded() bool {
-	return f.FrameHeader.Flags.Has(FlagPushPromiseEndHeaders)
-}
-
-func parsePushPromise(_ *frameCache, fh FrameHeader, p []byte) (_ Frame, err error) {
-	pp := &PushPromiseFrame{
-		FrameHeader: fh,
-	}
-	if pp.StreamID == 0 {
-		// PUSH_PROMISE frames MUST be associated with an existing,
-		// peer-initiated stream. The stream identifier of a
-		// PUSH_PROMISE frame indicates the stream it is associated
-		// with. If the stream identifier field specifies the value
-		// 0x0, a recipient MUST respond with a connection error
-		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	// The PUSH_PROMISE frame includes optional padding.
-	// Padding fields and flags are identical to those defined for DATA frames
-	var padLength uint8
-	if fh.Flags.Has(FlagPushPromisePadded) {
-		if p, padLength, err = readByte(p); err != nil {
-			return
-		}
-	}
-
-	p, pp.PromiseID, err = readUint32(p)
-	if err != nil {
-		return
-	}
-	pp.PromiseID = pp.PromiseID & (1<<31 - 1)
-
-	if int(padLength) > len(p) {
-		// like the DATA frame, error out if padding is longer than the body.
-		return nil, ConnectionError(ErrCodeProtocol)
-	}
-	pp.headerFragBuf = p[:len(p)-int(padLength)]
-	return pp, nil
-}
-
-// PushPromiseParam are the parameters for writing a PUSH_PROMISE frame.
-type PushPromiseParam struct {
-	// StreamID is the required Stream ID to initiate.
-	StreamID uint32
-
-	// PromiseID is the required Stream ID which this
-	// Push Promises
-	PromiseID uint32
-
-	// BlockFragment is part (or all) of a Header Block.
-	BlockFragment []byte
-
-	// EndHeaders indicates that this frame contains an entire
-	// header block and is not followed by any
-	// CONTINUATION frames.
-	EndHeaders bool
-
-	// PadLength is the optional number of bytes of zeros to add
-	// to this frame.
-	PadLength uint8
-}
-
-// WritePushPromise writes a single PushPromise Frame.
-//
-// As with Header Frames, This is the low level call for writing
-// individual frames. Continuation frames are handled elsewhere.
-//
-// It will perform exactly one Write to the underlying Writer.
-// It is the caller's responsibility to not call other Write methods concurrently.
-func (f *Framer) WritePushPromise(p PushPromiseParam) error {
-	if !validStreamID(p.StreamID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	var flags Flags
-	if p.PadLength != 0 {
-		flags |= FlagPushPromisePadded
-	}
-	if p.EndHeaders {
-		flags |= FlagPushPromiseEndHeaders
-	}
-	f.startWrite(FramePushPromise, flags, p.StreamID)
-	if p.PadLength != 0 {
-		f.writeByte(p.PadLength)
-	}
-	if !validStreamID(p.PromiseID) && !f.AllowIllegalWrites {
-		return errStreamID
-	}
-	f.writeUint32(p.PromiseID)
-	f.wbuf = append(f.wbuf, p.BlockFragment...)
-	f.wbuf = append(f.wbuf, padZeros[:p.PadLength]...)
-	return f.endWrite()
-}
-
-// WriteRawFrame writes a raw frame. This can be used to write
-// extension frames unknown to this package.
-func (f *Framer) WriteRawFrame(t FrameType, flags Flags, streamID uint32, payload []byte) error {
-	f.startWrite(t, flags, streamID)
-	f.writeBytes(payload)
-	return f.endWrite()
-}
-
-func readByte(p []byte) (remain []byte, b byte, err error) {
-	if len(p) == 0 {
-		return nil, 0, io.ErrUnexpectedEOF
-	}
-	return p[1:], p[0], nil
-}
-
-func readUint32(p []byte) (remain []byte, v uint32, err error) {
-	if len(p) < 4 {
-		return nil, 0, io.ErrUnexpectedEOF
-	}
-	return p[4:], binary.BigEndian.Uint32(p[:4]), nil
-}
-
-type streamEnder interface {
-	StreamEnded() bool
-}
-
-type headersEnder interface {
-	HeadersEnded() bool
-}
-
-type headersOrContinuation interface {
-	headersEnder
-	HeaderBlockFragment() []byte
-}
-
-// A MetaHeadersFrame is the representation of one HEADERS frame and
-// zero or more contiguous CONTINUATION frames and the decoding of
-// their HPACK-encoded contents.
-//
-// This type of frame does not appear on the wire and is only returned
-// by the Framer when Framer.ReadMetaHeaders is set.
-type MetaHeadersFrame struct {
-	*HeadersFrame
-
-	// Fields are the fields contained in the HEADERS and
-	// CONTINUATION frames. The underlying slice is owned by the
-	// Framer and must not be retained after the next call to
-	// ReadFrame.
-	//
-	// Fields are guaranteed to be in the correct http2 order and
-	// not have unknown pseudo header fields or invalid header
-	// field names or values. Required pseudo header fields may be
-	// missing, however. Use the MetaHeadersFrame.Pseudo accessor
-	// method access pseudo headers.
-	Fields []hpack.HeaderField
-
-	// Truncated is whether the max header list size limit was hit
-	// and Fields is incomplete. The hpack decoder state is still
-	// valid, however.
-	Truncated bool
-}
-
-// PseudoValue returns the given pseudo header field's value.
-// The provided pseudo field should not contain the leading colon.
-func (mh *MetaHeadersFrame) PseudoValue(pseudo string) string {
-	for _, hf := range mh.Fields {
-		if !hf.IsPseudo() {
-			return ""
-		}
-		if hf.Name[1:] == pseudo {
-			return hf.Value
-		}
-	}
-	return ""
-}
-
-// RegularFields returns the regular (non-pseudo) header fields of mh.
-// The caller does not own the returned slice.
-func (mh *MetaHeadersFrame) RegularFields() []hpack.HeaderField {
-	for i, hf := range mh.Fields {
-		if !hf.IsPseudo() {
-			return mh.Fields[i:]
-		}
-	}
-	return nil
-}
-
-// PseudoFields returns the pseudo header fields of mh.
-// The caller does not own the returned slice.
-func (mh *MetaHeadersFrame) PseudoFields() []hpack.HeaderField {
-	for i, hf := range mh.Fields {
-		if !hf.IsPseudo() {
-			return mh.Fields[:i]
-		}
-	}
-	return mh.Fields
-}
-
-func (mh *MetaHeadersFrame) checkPseudos() error {
-	var isRequest, isResponse bool
-	pf := mh.PseudoFields()
-	for i, hf := range pf {
-		switch hf.Name {
-		case ":method", ":path", ":scheme", ":authority":
-			isRequest = true
-		case ":status":
-			isResponse = true
-		default:
-			return pseudoHeaderError(hf.Name)
-		}
-		// Check for duplicates.
-		// This would be a bad algorithm, but N is 4.
-		// And this doesn't allocate.
-		for _, hf2 := range pf[:i] {
-			if hf.Name == hf2.Name {
-				return duplicatePseudoHeaderError(hf.Name)
-			}
-		}
-	}
-	if isRequest && isResponse {
-		return errMixPseudoHeaderTypes
-	}
-	return nil
-}
-
-func (fr *Framer) maxHeaderStringLen() int {
-	v := fr.maxHeaderListSize()
-	if uint32(int(v)) == v {
-		return int(v)
-	}
-	// They had a crazy big number for MaxHeaderBytes anyway,
-	// so give them unlimited header lengths:
-	return 0
-}
-
-// readMetaFrame returns 0 or more CONTINUATION frames from fr and
-// merge them into into the provided hf and returns a MetaHeadersFrame
-// with the decoded hpack values.
-func (fr *Framer) readMetaFrame(hf *HeadersFrame) (*MetaHeadersFrame, error) {
-	if fr.AllowIllegalReads {
-		return nil, errors.New("illegal use of AllowIllegalReads with ReadMetaHeaders")
-	}
-	mh := &MetaHeadersFrame{
-		HeadersFrame: hf,
-	}
-	var remainSize = fr.maxHeaderListSize()
-	var sawRegular bool
-
-	var invalid error // pseudo header field errors
-	hdec := fr.ReadMetaHeaders
-	hdec.SetEmitEnabled(true)
-	hdec.SetMaxStringLength(fr.maxHeaderStringLen())
-	hdec.SetEmitFunc(func(hf hpack.HeaderField) {
-		if VerboseLogs && fr.logReads {
-			fr.debugReadLoggerf("http2: decoded hpack field %+v", hf)
-		}
-		if !httplex.ValidHeaderFieldValue(hf.Value) {
-			invalid = headerFieldValueError(hf.Value)
-		}
-		isPseudo := strings.HasPrefix(hf.Name, ":")
-		if isPseudo {
-			if sawRegular {
-				invalid = errPseudoAfterRegular
-			}
-		} else {
-			sawRegular = true
-			if !validWireHeaderFieldName(hf.Name) {
-				invalid = headerFieldNameError(hf.Name)
-			}
-		}
-
-		if invalid != nil {
-			hdec.SetEmitEnabled(false)
-			return
-		}
-
-		size := hf.Size()
-		if size > remainSize {
-			hdec.SetEmitEnabled(false)
-			mh.Truncated = true
-			return
-		}
-		remainSize -= size
-
-		mh.Fields = append(mh.Fields, hf)
-	})
-	// Lose reference to MetaHeadersFrame:
-	defer hdec.SetEmitFunc(func(hf hpack.HeaderField) {})
-
-	var hc headersOrContinuation = hf
-	for {
-		frag := hc.HeaderBlockFragment()
-		if _, err := hdec.Write(frag); err != nil {
-			return nil, ConnectionError(ErrCodeCompression)
-		}
-
-		if hc.HeadersEnded() {
-			break
-		}
-		if f, err := fr.ReadFrame(); err != nil {
-			return nil, err
-		} else {
-			hc = f.(*ContinuationFrame) // guaranteed by checkFrameOrder
-		}
-	}
-
-	mh.HeadersFrame.headerFragBuf = nil
-	mh.HeadersFrame.invalidate()
-
-	if err := hdec.Close(); err != nil {
-		return nil, ConnectionError(ErrCodeCompression)
-	}
-	if invalid != nil {
-		fr.errDetail = invalid
-		if VerboseLogs {
-			log.Printf("http2: invalid header: %v", invalid)
-		}
-		return nil, StreamError{mh.StreamID, ErrCodeProtocol, invalid}
-	}
-	if err := mh.checkPseudos(); err != nil {
-		fr.errDetail = err
-		if VerboseLogs {
-			log.Printf("http2: invalid pseudo headers: %v", err)
-		}
-		return nil, StreamError{mh.StreamID, ErrCodeProtocol, err}
-	}
-	return mh, nil
-}
-
-func summarizeFrame(f Frame) string {
-	var buf bytes.Buffer
-	f.Header().writeDebug(&buf)
-	switch f := f.(type) {
-	case *SettingsFrame:
-		n := 0
-		f.ForeachSetting(func(s Setting) error {
-			n++
-			if n == 1 {
-				buf.WriteString(", settings:")
-			}
-			fmt.Fprintf(&buf, " %v=%v,", s.ID, s.Val)
-			return nil
-		})
-		if n > 0 {
-			buf.Truncate(buf.Len() - 1) // remove trailing comma
-		}
-	case *DataFrame:
-		data := f.Data()
-		const max = 256
-		if len(data) > max {
-			data = data[:max]
-		}
-		fmt.Fprintf(&buf, " data=%q", data)
-		if len(f.Data()) > max {
-			fmt.Fprintf(&buf, " (%d bytes omitted)", len(f.Data())-max)
-		}
-	case *WindowUpdateFrame:
-		if f.StreamID == 0 {
-			buf.WriteString(" (conn)")
-		}
-		fmt.Fprintf(&buf, " incr=%v", f.Increment)
-	case *PingFrame:
-		fmt.Fprintf(&buf, " ping=%q", f.Data[:])
-	case *GoAwayFrame:
-		fmt.Fprintf(&buf, " LastStreamID=%v ErrCode=%v Debug=%q",
-			f.LastStreamID, f.ErrCode, f.debugData)
-	case *RSTStreamFrame:
-		fmt.Fprintf(&buf, " ErrCode=%v", f.ErrCode)
-	}
-	return buf.String()
-}
diff --git a/installer/vendor/golang.org/x/net/http2/frame_test.go b/installer/vendor/golang.org/x/net/http2/frame_test.go
deleted file mode 100644
index 37266bc58f..0000000000
--- a/installer/vendor/golang.org/x/net/http2/frame_test.go
+++ /dev/null
@@ -1,1191 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"unsafe"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-func testFramer() (*Framer, *bytes.Buffer) {
-	buf := new(bytes.Buffer)
-	return NewFramer(buf, buf), buf
-}
-
-func TestFrameSizes(t *testing.T) {
-	// Catch people rearranging the FrameHeader fields.
-	if got, want := int(unsafe.Sizeof(FrameHeader{})), 12; got != want {
-		t.Errorf("FrameHeader size = %d; want %d", got, want)
-	}
-}
-
-func TestFrameTypeString(t *testing.T) {
-	tests := []struct {
-		ft   FrameType
-		want string
-	}{
-		{FrameData, "DATA"},
-		{FramePing, "PING"},
-		{FrameGoAway, "GOAWAY"},
-		{0xf, "UNKNOWN_FRAME_TYPE_15"},
-	}
-
-	for i, tt := range tests {
-		got := tt.ft.String()
-		if got != tt.want {
-			t.Errorf("%d. String(FrameType %d) = %q; want %q", i, int(tt.ft), got, tt.want)
-		}
-	}
-}
-
-func TestWriteRST(t *testing.T) {
-	fr, buf := testFramer()
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	var errCode uint32 = 7<<24 + 6<<16 + 5<<8 + 4
-	fr.WriteRSTStream(streamID, ErrCode(errCode))
-	const wantEnc = "\x00\x00\x04\x03\x00\x01\x02\x03\x04\x07\x06\x05\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &RSTStreamFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x3,
-			Flags:    0x0,
-			Length:   0x4,
-			StreamID: 0x1020304,
-		},
-		ErrCode: 0x7060504,
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestWriteData(t *testing.T) {
-	fr, buf := testFramer()
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	data := []byte("ABC")
-	fr.WriteData(streamID, true, data)
-	const wantEnc = "\x00\x00\x03\x00\x01\x01\x02\x03\x04ABC"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		t.Fatalf("got %T; want *DataFrame", f)
-	}
-	if !bytes.Equal(df.Data(), data) {
-		t.Errorf("got %q; want %q", df.Data(), data)
-	}
-	if f.Header().Flags&1 == 0 {
-		t.Errorf("didn't see END_STREAM flag")
-	}
-}
-
-func TestWriteDataPadded(t *testing.T) {
-	tests := [...]struct {
-		streamID   uint32
-		endStream  bool
-		data       []byte
-		pad        []byte
-		wantHeader FrameHeader
-	}{
-		// Unpadded:
-		0: {
-			streamID:  1,
-			endStream: true,
-			data:      []byte("foo"),
-			pad:       nil,
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataEndStream,
-				Length:   3,
-				StreamID: 1,
-			},
-		},
-
-		// Padded bit set, but no padding:
-		1: {
-			streamID:  1,
-			endStream: true,
-			data:      []byte("foo"),
-			pad:       []byte{},
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataEndStream | FlagDataPadded,
-				Length:   4,
-				StreamID: 1,
-			},
-		},
-
-		// Padded bit set, with padding:
-		2: {
-			streamID:  1,
-			endStream: false,
-			data:      []byte("foo"),
-			pad:       []byte{0, 0, 0},
-			wantHeader: FrameHeader{
-				Type:     FrameData,
-				Flags:    FlagDataPadded,
-				Length:   7,
-				StreamID: 1,
-			},
-		},
-	}
-	for i, tt := range tests {
-		fr, _ := testFramer()
-		fr.WriteDataPadded(tt.streamID, tt.endStream, tt.data, tt.pad)
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("%d. ReadFrame: %v", i, err)
-			continue
-		}
-		got := f.Header()
-		tt.wantHeader.valid = true
-		if got != tt.wantHeader {
-			t.Errorf("%d. read %+v; want %+v", i, got, tt.wantHeader)
-			continue
-		}
-		df := f.(*DataFrame)
-		if !bytes.Equal(df.Data(), tt.data) {
-			t.Errorf("%d. got %q; want %q", i, df.Data(), tt.data)
-		}
-	}
-}
-
-func TestWriteHeaders(t *testing.T) {
-	tests := []struct {
-		name      string
-		p         HeadersFrameParam
-		wantEnc   string
-		wantFrame *HeadersFrame
-	}{
-		{
-			"basic",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\x03\x01\x00\x00\x00\x00*abc",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Length:   uint32(len("abc")),
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"basic + end flags",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\x03\x01\x05\x00\x00\x00*abc",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders,
-					Length:   uint32(len("abc")),
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with padding",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     5,
-				Priority:      PriorityParam{},
-			},
-			"\x00\x00\t\x01\r\x00\x00\x00*\x05abc\x00\x00\x00\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded,
-					Length:   uint32(1 + len("abc") + 5), // pad length + contents + padding
-				},
-				Priority:      PriorityParam{},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with priority",
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     2,
-				Priority: PriorityParam{
-					StreamDep: 15,
-					Exclusive: true,
-					Weight:    127,
-				},
-			},
-			"\x00\x00\v\x01-\x00\x00\x00*\x02\x80\x00\x00\x0f\u007fabc\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded | FlagHeadersPriority,
-					Length:   uint32(1 + 5 + len("abc") + 2), // pad length + priority + contents + padding
-				},
-				Priority: PriorityParam{
-					StreamDep: 15,
-					Exclusive: true,
-					Weight:    127,
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"with priority stream dep zero", // golang.org/issue/15444
-			HeadersFrameParam{
-				StreamID:      42,
-				BlockFragment: []byte("abc"),
-				EndStream:     true,
-				EndHeaders:    true,
-				PadLength:     2,
-				Priority: PriorityParam{
-					StreamDep: 0,
-					Exclusive: true,
-					Weight:    127,
-				},
-			},
-			"\x00\x00\v\x01-\x00\x00\x00*\x02\x80\x00\x00\x00\u007fabc\x00\x00",
-			&HeadersFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: 42,
-					Type:     FrameHeaders,
-					Flags:    FlagHeadersEndStream | FlagHeadersEndHeaders | FlagHeadersPadded | FlagHeadersPriority,
-					Length:   uint32(1 + 5 + len("abc") + 2), // pad length + priority + contents + padding
-				},
-				Priority: PriorityParam{
-					StreamDep: 0,
-					Exclusive: true,
-					Weight:    127,
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, buf := testFramer()
-		if err := fr.WriteHeaders(tt.p); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		if buf.String() != tt.wantEnc {
-			t.Errorf("test %q: encoded %q; want %q", tt.name, buf.Bytes(), tt.wantEnc)
-		}
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWriteInvalidStreamDep(t *testing.T) {
-	fr, _ := testFramer()
-	err := fr.WriteHeaders(HeadersFrameParam{
-		StreamID: 42,
-		Priority: PriorityParam{
-			StreamDep: 1 << 31,
-		},
-	})
-	if err != errDepStreamID {
-		t.Errorf("header error = %v; want %q", err, errDepStreamID)
-	}
-
-	err = fr.WritePriority(2, PriorityParam{StreamDep: 1 << 31})
-	if err != errDepStreamID {
-		t.Errorf("priority error = %v; want %q", err, errDepStreamID)
-	}
-}
-
-func TestWriteContinuation(t *testing.T) {
-	const streamID = 42
-	tests := []struct {
-		name string
-		end  bool
-		frag []byte
-
-		wantFrame *ContinuationFrame
-	}{
-		{
-			"not end",
-			false,
-			[]byte("abc"),
-			&ContinuationFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FrameContinuation,
-					Length:   uint32(len("abc")),
-				},
-				headerFragBuf: []byte("abc"),
-			},
-		},
-		{
-			"end",
-			true,
-			[]byte("def"),
-			&ContinuationFrame{
-				FrameHeader: FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FrameContinuation,
-					Flags:    FlagContinuationEndHeaders,
-					Length:   uint32(len("def")),
-				},
-				headerFragBuf: []byte("def"),
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, _ := testFramer()
-		if err := fr.WriteContinuation(streamID, tt.end, tt.frag); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		fr.AllowIllegalReads = true
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWritePriority(t *testing.T) {
-	const streamID = 42
-	tests := []struct {
-		name      string
-		priority  PriorityParam
-		wantFrame *PriorityFrame
-	}{
-		{
-			"not exclusive",
-			PriorityParam{
-				StreamDep: 2,
-				Exclusive: false,
-				Weight:    127,
-			},
-			&PriorityFrame{
-				FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FramePriority,
-					Length:   5,
-				},
-				PriorityParam{
-					StreamDep: 2,
-					Exclusive: false,
-					Weight:    127,
-				},
-			},
-		},
-
-		{
-			"exclusive",
-			PriorityParam{
-				StreamDep: 3,
-				Exclusive: true,
-				Weight:    77,
-			},
-			&PriorityFrame{
-				FrameHeader{
-					valid:    true,
-					StreamID: streamID,
-					Type:     FramePriority,
-					Length:   5,
-				},
-				PriorityParam{
-					StreamDep: 3,
-					Exclusive: true,
-					Weight:    77,
-				},
-			},
-		},
-	}
-	for _, tt := range tests {
-		fr, _ := testFramer()
-		if err := fr.WritePriority(streamID, tt.priority); err != nil {
-			t.Errorf("test %q: %v", tt.name, err)
-			continue
-		}
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Errorf("test %q: failed to read the frame back: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(f, tt.wantFrame) {
-			t.Errorf("test %q: mismatch.\n got: %#v\nwant: %#v\n", tt.name, f, tt.wantFrame)
-		}
-	}
-}
-
-func TestWriteSettings(t *testing.T) {
-	fr, buf := testFramer()
-	settings := []Setting{{1, 2}, {3, 4}}
-	fr.WriteSettings(settings...)
-	const wantEnc = "\x00\x00\f\x04\x00\x00\x00\x00\x00\x00\x01\x00\x00\x00\x02\x00\x03\x00\x00\x00\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		t.Fatalf("Got a %T; want a SettingsFrame", f)
-	}
-	var got []Setting
-	sf.ForeachSetting(func(s Setting) error {
-		got = append(got, s)
-		valBack, ok := sf.Value(s.ID)
-		if !ok || valBack != s.Val {
-			t.Errorf("Value(%d) = %v, %v; want %v, true", s.ID, valBack, ok, s.Val)
-		}
-		return nil
-	})
-	if !reflect.DeepEqual(settings, got) {
-		t.Errorf("Read settings %+v != written settings %+v", got, settings)
-	}
-}
-
-func TestWriteSettingsAck(t *testing.T) {
-	fr, buf := testFramer()
-	fr.WriteSettingsAck()
-	const wantEnc = "\x00\x00\x00\x04\x01\x00\x00\x00\x00"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-}
-
-func TestWriteWindowUpdate(t *testing.T) {
-	fr, buf := testFramer()
-	const streamID = 1<<24 + 2<<16 + 3<<8 + 4
-	const incr = 7<<24 + 6<<16 + 5<<8 + 4
-	if err := fr.WriteWindowUpdate(streamID, incr); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\x04\x08\x00\x01\x02\x03\x04\x07\x06\x05\x04"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &WindowUpdateFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x8,
-			Flags:    0x0,
-			Length:   0x4,
-			StreamID: 0x1020304,
-		},
-		Increment: 0x7060504,
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestWritePing(t *testing.T)    { testWritePing(t, false) }
-func TestWritePingAck(t *testing.T) { testWritePing(t, true) }
-
-func testWritePing(t *testing.T, ack bool) {
-	fr, buf := testFramer()
-	if err := fr.WritePing(ack, [8]byte{1, 2, 3, 4, 5, 6, 7, 8}); err != nil {
-		t.Fatal(err)
-	}
-	var wantFlags Flags
-	if ack {
-		wantFlags = FlagPingAck
-	}
-	var wantEnc = "\x00\x00\x08\x06" + string(wantFlags) + "\x00\x00\x00\x00" + "\x01\x02\x03\x04\x05\x06\x07\x08"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &PingFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x6,
-			Flags:    wantFlags,
-			Length:   0x8,
-			StreamID: 0,
-		},
-		Data: [8]byte{1, 2, 3, 4, 5, 6, 7, 8},
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Errorf("parsed back %#v; want %#v", f, want)
-	}
-}
-
-func TestReadFrameHeader(t *testing.T) {
-	tests := []struct {
-		in   string
-		want FrameHeader
-	}{
-		{in: "\x00\x00\x00" + "\x00" + "\x00" + "\x00\x00\x00\x00", want: FrameHeader{}},
-		{in: "\x01\x02\x03" + "\x04" + "\x05" + "\x06\x07\x08\x09", want: FrameHeader{
-			Length: 66051, Type: 4, Flags: 5, StreamID: 101124105,
-		}},
-		// Ignore high bit:
-		{in: "\xff\xff\xff" + "\xff" + "\xff" + "\xff\xff\xff\xff", want: FrameHeader{
-			Length: 16777215, Type: 255, Flags: 255, StreamID: 2147483647}},
-		{in: "\xff\xff\xff" + "\xff" + "\xff" + "\x7f\xff\xff\xff", want: FrameHeader{
-			Length: 16777215, Type: 255, Flags: 255, StreamID: 2147483647}},
-	}
-	for i, tt := range tests {
-		got, err := readFrameHeader(make([]byte, 9), strings.NewReader(tt.in))
-		if err != nil {
-			t.Errorf("%d. readFrameHeader(%q) = %v", i, tt.in, err)
-			continue
-		}
-		tt.want.valid = true
-		if got != tt.want {
-			t.Errorf("%d. readFrameHeader(%q) = %+v; want %+v", i, tt.in, got, tt.want)
-		}
-	}
-}
-
-func TestReadWriteFrameHeader(t *testing.T) {
-	tests := []struct {
-		len      uint32
-		typ      FrameType
-		flags    Flags
-		streamID uint32
-	}{
-		{len: 0, typ: 255, flags: 1, streamID: 0},
-		{len: 0, typ: 255, flags: 1, streamID: 1},
-		{len: 0, typ: 255, flags: 1, streamID: 255},
-		{len: 0, typ: 255, flags: 1, streamID: 256},
-		{len: 0, typ: 255, flags: 1, streamID: 65535},
-		{len: 0, typ: 255, flags: 1, streamID: 65536},
-
-		{len: 0, typ: 1, flags: 255, streamID: 1},
-		{len: 255, typ: 1, flags: 255, streamID: 1},
-		{len: 256, typ: 1, flags: 255, streamID: 1},
-		{len: 65535, typ: 1, flags: 255, streamID: 1},
-		{len: 65536, typ: 1, flags: 255, streamID: 1},
-		{len: 16777215, typ: 1, flags: 255, streamID: 1},
-	}
-	for _, tt := range tests {
-		fr, buf := testFramer()
-		fr.startWrite(tt.typ, tt.flags, tt.streamID)
-		fr.writeBytes(make([]byte, tt.len))
-		fr.endWrite()
-		fh, err := ReadFrameHeader(buf)
-		if err != nil {
-			t.Errorf("ReadFrameHeader(%+v) = %v", tt, err)
-			continue
-		}
-		if fh.Type != tt.typ || fh.Flags != tt.flags || fh.Length != tt.len || fh.StreamID != tt.streamID {
-			t.Errorf("ReadFrameHeader(%+v) = %+v; mismatch", tt, fh)
-		}
-	}
-
-}
-
-func TestWriteTooLargeFrame(t *testing.T) {
-	fr, _ := testFramer()
-	fr.startWrite(0, 1, 1)
-	fr.writeBytes(make([]byte, 1<<24))
-	err := fr.endWrite()
-	if err != ErrFrameTooLarge {
-		t.Errorf("endWrite = %v; want errFrameTooLarge", err)
-	}
-}
-
-func TestWriteGoAway(t *testing.T) {
-	const debug = "foo"
-	fr, buf := testFramer()
-	if err := fr.WriteGoAway(0x01020304, 0x05060708, []byte(debug)); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\v\a\x00\x00\x00\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08" + debug
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := &GoAwayFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x7,
-			Flags:    0,
-			Length:   uint32(4 + 4 + len(debug)),
-			StreamID: 0,
-		},
-		LastStreamID: 0x01020304,
-		ErrCode:      0x05060708,
-		debugData:    []byte(debug),
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Fatalf("parsed back:\n%#v\nwant:\n%#v", f, want)
-	}
-	if got := string(f.(*GoAwayFrame).DebugData()); got != debug {
-		t.Errorf("debug data = %q; want %q", got, debug)
-	}
-}
-
-func TestWritePushPromise(t *testing.T) {
-	pp := PushPromiseParam{
-		StreamID:      42,
-		PromiseID:     42,
-		BlockFragment: []byte("abc"),
-	}
-	fr, buf := testFramer()
-	if err := fr.WritePushPromise(pp); err != nil {
-		t.Fatal(err)
-	}
-	const wantEnc = "\x00\x00\x07\x05\x00\x00\x00\x00*\x00\x00\x00*abc"
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, ok := f.(*PushPromiseFrame)
-	if !ok {
-		t.Fatalf("got %T; want *PushPromiseFrame", f)
-	}
-	want := &PushPromiseFrame{
-		FrameHeader: FrameHeader{
-			valid:    true,
-			Type:     0x5,
-			Flags:    0x0,
-			Length:   0x7,
-			StreamID: 42,
-		},
-		PromiseID:     42,
-		headerFragBuf: []byte("abc"),
-	}
-	if !reflect.DeepEqual(f, want) {
-		t.Fatalf("parsed back:\n%#v\nwant:\n%#v", f, want)
-	}
-}
-
-// test checkFrameOrder and that HEADERS and CONTINUATION frames can't be intermingled.
-func TestReadFrameOrder(t *testing.T) {
-	head := func(f *Framer, id uint32, end bool) {
-		f.WriteHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: []byte("foo"), // unused, but non-empty
-			EndHeaders:    end,
-		})
-	}
-	cont := func(f *Framer, id uint32, end bool) {
-		f.WriteContinuation(id, end, []byte("foo"))
-	}
-
-	tests := [...]struct {
-		name    string
-		w       func(*Framer)
-		atLeast int
-		wantErr string
-	}{
-		0: {
-			w: func(f *Framer) {
-				head(f, 1, true)
-			},
-		},
-		1: {
-			w: func(f *Framer) {
-				head(f, 1, true)
-				head(f, 2, true)
-			},
-		},
-		2: {
-			wantErr: "got HEADERS for stream 2; expected CONTINUATION following HEADERS for stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-				head(f, 2, true)
-			},
-		},
-		3: {
-			wantErr: "got DATA for stream 1; expected CONTINUATION following HEADERS for stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-			},
-		},
-		4: {
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 1, true)
-				head(f, 2, true)
-			},
-		},
-		5: {
-			wantErr: "got CONTINUATION for stream 2; expected stream 1",
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 2, true)
-				head(f, 2, true)
-			},
-		},
-		6: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			w: func(f *Framer) {
-				cont(f, 1, true)
-			},
-		},
-		7: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			w: func(f *Framer) {
-				cont(f, 1, false)
-			},
-		},
-		8: {
-			wantErr: "HEADERS frame with stream ID 0",
-			w: func(f *Framer) {
-				head(f, 0, true)
-			},
-		},
-		9: {
-			wantErr: "CONTINUATION frame with stream ID 0",
-			w: func(f *Framer) {
-				cont(f, 0, true)
-			},
-		},
-		10: {
-			wantErr: "unexpected CONTINUATION for stream 1",
-			atLeast: 5,
-			w: func(f *Framer) {
-				head(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, false)
-				cont(f, 1, true)
-				cont(f, 1, false)
-			},
-		},
-	}
-	for i, tt := range tests {
-		buf := new(bytes.Buffer)
-		f := NewFramer(buf, buf)
-		f.AllowIllegalWrites = true
-		tt.w(f)
-		f.WriteData(1, true, nil) // to test transition away from last step
-
-		var err error
-		n := 0
-		var log bytes.Buffer
-		for {
-			var got Frame
-			got, err = f.ReadFrame()
-			fmt.Fprintf(&log, "  read %v, %v\n", got, err)
-			if err != nil {
-				break
-			}
-			n++
-		}
-		if err == io.EOF {
-			err = nil
-		}
-		ok := tt.wantErr == ""
-		if ok && err != nil {
-			t.Errorf("%d. after %d good frames, ReadFrame = %v; want success\n%s", i, n, err, log.Bytes())
-			continue
-		}
-		if !ok && err != ConnectionError(ErrCodeProtocol) {
-			t.Errorf("%d. after %d good frames, ReadFrame = %v; want ConnectionError(ErrCodeProtocol)\n%s", i, n, err, log.Bytes())
-			continue
-		}
-		if !((f.errDetail == nil && tt.wantErr == "") || (fmt.Sprint(f.errDetail) == tt.wantErr)) {
-			t.Errorf("%d. framer eror = %q; want %q\n%s", i, f.errDetail, tt.wantErr, log.Bytes())
-		}
-		if n < tt.atLeast {
-			t.Errorf("%d. framer only read %d frames; want at least %d\n%s", i, n, tt.atLeast, log.Bytes())
-		}
-	}
-}
-
-func TestMetaFrameHeader(t *testing.T) {
-	write := func(f *Framer, frags ...[]byte) {
-		for i, frag := range frags {
-			end := (i == len(frags)-1)
-			if i == 0 {
-				f.WriteHeaders(HeadersFrameParam{
-					StreamID:      1,
-					BlockFragment: frag,
-					EndHeaders:    end,
-				})
-			} else {
-				f.WriteContinuation(1, end, frag)
-			}
-		}
-	}
-
-	want := func(flags Flags, length uint32, pairs ...string) *MetaHeadersFrame {
-		mh := &MetaHeadersFrame{
-			HeadersFrame: &HeadersFrame{
-				FrameHeader: FrameHeader{
-					Type:     FrameHeaders,
-					Flags:    flags,
-					Length:   length,
-					StreamID: 1,
-				},
-			},
-			Fields: []hpack.HeaderField(nil),
-		}
-		for len(pairs) > 0 {
-			mh.Fields = append(mh.Fields, hpack.HeaderField{
-				Name:  pairs[0],
-				Value: pairs[1],
-			})
-			pairs = pairs[2:]
-		}
-		return mh
-	}
-	truncated := func(mh *MetaHeadersFrame) *MetaHeadersFrame {
-		mh.Truncated = true
-		return mh
-	}
-
-	const noFlags Flags = 0
-
-	oneKBString := strings.Repeat("a", 1<<10)
-
-	tests := [...]struct {
-		name              string
-		w                 func(*Framer)
-		want              interface{} // *MetaHeaderFrame or error
-		wantErrReason     string
-		maxHeaderListSize uint32
-	}{
-		0: {
-			name: "single_headers",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/")
-				write(f, all)
-			},
-			want: want(FlagHeadersEndHeaders, 2, ":method", "GET", ":path", "/"),
-		},
-		1: {
-			name: "with_continuation",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", "bar")
-				write(f, all[:1], all[1:])
-			},
-			want: want(noFlags, 1, ":method", "GET", ":path", "/", "foo", "bar"),
-		},
-		2: {
-			name: "with_two_continuation",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", "bar")
-				write(f, all[:2], all[2:4], all[4:])
-			},
-			want: want(noFlags, 2, ":method", "GET", ":path", "/", "foo", "bar"),
-		},
-		3: {
-			name: "big_string_okay",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", oneKBString)
-				write(f, all[:2], all[2:])
-			},
-			want: want(noFlags, 2, ":method", "GET", ":path", "/", "foo", oneKBString),
-		},
-		4: {
-			name: "big_string_error",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				all := he.encodeHeaderRaw(t, ":method", "GET", ":path", "/", "foo", oneKBString)
-				write(f, all[:2], all[2:])
-			},
-			maxHeaderListSize: (1 << 10) / 2,
-			want:              ConnectionError(ErrCodeCompression),
-		},
-		5: {
-			name: "max_header_list_truncated",
-			w: func(f *Framer) {
-				var he hpackEncoder
-				var pairs = []string{":method", "GET", ":path", "/"}
-				for i := 0; i < 100; i++ {
-					pairs = append(pairs, "foo", "bar")
-				}
-				all := he.encodeHeaderRaw(t, pairs...)
-				write(f, all[:2], all[2:])
-			},
-			maxHeaderListSize: (1 << 10) / 2,
-			want: truncated(want(noFlags, 2,
-				":method", "GET",
-				":path", "/",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar",
-				"foo", "bar", // 11
-			)),
-		},
-		6: {
-			name: "pseudo_order",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					"foo", "bar",
-					":path", "/", // bogus
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "pseudo header field after regular",
-		},
-		7: {
-			name: "pseudo_unknown",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":unknown", "foo", // bogus
-					"foo", "bar",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid pseudo-header \":unknown\"",
-		},
-		8: {
-			name: "pseudo_mix_request_response",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					":status", "100",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "mix of request and response pseudo headers",
-		},
-		9: {
-			name: "pseudo_dup",
-			w: func(f *Framer) {
-				write(f, encodeHeaderRaw(t,
-					":method", "GET",
-					":method", "POST",
-				))
-			},
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "duplicate pseudo-header \":method\"",
-		},
-		10: {
-			name: "trailer_okay_no_pseudo",
-			w:    func(f *Framer) { write(f, encodeHeaderRaw(t, "foo", "bar")) },
-			want: want(FlagHeadersEndHeaders, 8, "foo", "bar"),
-		},
-		11: {
-			name:          "invalid_field_name",
-			w:             func(f *Framer) { write(f, encodeHeaderRaw(t, "CapitalBad", "x")) },
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid header field name \"CapitalBad\"",
-		},
-		12: {
-			name:          "invalid_field_value",
-			w:             func(f *Framer) { write(f, encodeHeaderRaw(t, "key", "bad_null\x00")) },
-			want:          streamError(1, ErrCodeProtocol),
-			wantErrReason: "invalid header field value \"bad_null\\x00\"",
-		},
-	}
-	for i, tt := range tests {
-		buf := new(bytes.Buffer)
-		f := NewFramer(buf, buf)
-		f.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
-		f.MaxHeaderListSize = tt.maxHeaderListSize
-		tt.w(f)
-
-		name := tt.name
-		if name == "" {
-			name = fmt.Sprintf("test index %d", i)
-		}
-
-		var got interface{}
-		var err error
-		got, err = f.ReadFrame()
-		if err != nil {
-			got = err
-
-			// Ignore the StreamError.Cause field, if it matches the wantErrReason.
-			// The test table above predates the Cause field.
-			if se, ok := err.(StreamError); ok && se.Cause != nil && se.Cause.Error() == tt.wantErrReason {
-				se.Cause = nil
-				got = se
-			}
-		}
-		if !reflect.DeepEqual(got, tt.want) {
-			if mhg, ok := got.(*MetaHeadersFrame); ok {
-				if mhw, ok := tt.want.(*MetaHeadersFrame); ok {
-					hg := mhg.HeadersFrame
-					hw := mhw.HeadersFrame
-					if hg != nil && hw != nil && !reflect.DeepEqual(*hg, *hw) {
-						t.Errorf("%s: headers differ:\n got: %+v\nwant: %+v\n", name, *hg, *hw)
-					}
-				}
-			}
-			str := func(v interface{}) string {
-				if _, ok := v.(error); ok {
-					return fmt.Sprintf("error %v", v)
-				} else {
-					return fmt.Sprintf("value %#v", v)
-				}
-			}
-			t.Errorf("%s:\n got: %v\nwant: %s", name, str(got), str(tt.want))
-		}
-		if tt.wantErrReason != "" && tt.wantErrReason != fmt.Sprint(f.errDetail) {
-			t.Errorf("%s: got error reason %q; want %q", name, f.errDetail, tt.wantErrReason)
-		}
-	}
-}
-
-func TestSetReuseFrames(t *testing.T) {
-	fr, buf := testFramer()
-	fr.SetReuseFrames()
-
-	// Check that DataFrames are reused. Note that
-	// SetReuseFrames only currently implements reuse of DataFrames.
-	firstDf := readAndVerifyDataFrame("ABC", 3, fr, buf, t)
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("", 0, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("HHH", 3, fr, buf, t)
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-}
-
-func TestSetReuseFramesMoreThanOnce(t *testing.T) {
-	fr, buf := testFramer()
-	fr.SetReuseFrames()
-
-	firstDf := readAndVerifyDataFrame("ABC", 3, fr, buf, t)
-	fr.SetReuseFrames()
-
-	for i := 0; i < 10; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		// SetReuseFrames should be idempotent
-		fr.SetReuseFrames()
-		if df != firstDf {
-			t.Errorf("Expected Framer to return references to the same DataFrame. Have %v and %v", &df, &firstDf)
-		}
-	}
-}
-
-func TestNoSetReuseFrames(t *testing.T) {
-	fr, buf := testFramer()
-	const numNewDataFrames = 10
-	dfSoFar := make([]interface{}, numNewDataFrames)
-
-	// Check that DataFrames are not reused if SetReuseFrames wasn't called.
-	// SetReuseFrames only currently implements reuse of DataFrames.
-	for i := 0; i < numNewDataFrames; i++ {
-		df := readAndVerifyDataFrame("XYZ", 3, fr, buf, t)
-		for _, item := range dfSoFar {
-			if df == item {
-				t.Errorf("Expected Framer to return new DataFrames since SetNoReuseFrames not set.")
-			}
-		}
-		dfSoFar[i] = df
-	}
-}
-
-func readAndVerifyDataFrame(data string, length byte, fr *Framer, buf *bytes.Buffer, t *testing.T) *DataFrame {
-	var streamID uint32 = 1<<24 + 2<<16 + 3<<8 + 4
-	fr.WriteData(streamID, true, []byte(data))
-	wantEnc := "\x00\x00" + string(length) + "\x00\x01\x01\x02\x03\x04" + data
-	if buf.String() != wantEnc {
-		t.Errorf("encoded as %q; want %q", buf.Bytes(), wantEnc)
-	}
-	f, err := fr.ReadFrame()
-	if err != nil {
-		t.Fatal(err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		t.Fatalf("got %T; want *DataFrame", f)
-	}
-	if !bytes.Equal(df.Data(), []byte(data)) {
-		t.Errorf("got %q; want %q", df.Data(), []byte(data))
-	}
-	if f.Header().Flags&1 == 0 {
-		t.Errorf("didn't see END_STREAM flag")
-	}
-	return df
-}
-
-func encodeHeaderRaw(t *testing.T, pairs ...string) []byte {
-	var he hpackEncoder
-	return he.encodeHeaderRaw(t, pairs...)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/go16.go b/installer/vendor/golang.org/x/net/http2/go16.go
deleted file mode 100644
index 2b72855f55..0000000000
--- a/installer/vendor/golang.org/x/net/http2/go16.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.6
-
-package http2
-
-import (
-	"crypto/tls"
-	"net/http"
-	"time"
-)
-
-func transportExpectContinueTimeout(t1 *http.Transport) time.Duration {
-	return t1.ExpectContinueTimeout
-}
-
-// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
-func isBadCipher(cipher uint16) bool {
-	switch cipher {
-	case tls.TLS_RSA_WITH_RC4_128_SHA,
-		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_128_GCM_SHA256,
-		tls.TLS_RSA_WITH_AES_256_GCM_SHA384,
-		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-		// Reject cipher suites from Appendix A.
-		// "This list includes those cipher suites that do not
-		// offer an ephemeral key exchange and those that are
-		// based on the TLS null, stream or block cipher type"
-		return true
-	default:
-		return false
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/go17.go b/installer/vendor/golang.org/x/net/http2/go17.go
deleted file mode 100644
index 47b7fae081..0000000000
--- a/installer/vendor/golang.org/x/net/http2/go17.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package http2
-
-import (
-	"context"
-	"net"
-	"net/http"
-	"net/http/httptrace"
-	"time"
-)
-
-type contextContext interface {
-	context.Context
-}
-
-func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
-	ctx, cancel = context.WithCancel(context.Background())
-	ctx = context.WithValue(ctx, http.LocalAddrContextKey, c.LocalAddr())
-	if hs := opts.baseConfig(); hs != nil {
-		ctx = context.WithValue(ctx, http.ServerContextKey, hs)
-	}
-	return
-}
-
-func contextWithCancel(ctx contextContext) (_ contextContext, cancel func()) {
-	return context.WithCancel(ctx)
-}
-
-func requestWithContext(req *http.Request, ctx contextContext) *http.Request {
-	return req.WithContext(ctx)
-}
-
-type clientTrace httptrace.ClientTrace
-
-func reqContext(r *http.Request) context.Context { return r.Context() }
-
-func (t *Transport) idleConnTimeout() time.Duration {
-	if t.t1 != nil {
-		return t.t1.IdleConnTimeout
-	}
-	return 0
-}
-
-func setResponseUncompressed(res *http.Response) { res.Uncompressed = true }
-
-func traceGotConn(req *http.Request, cc *ClientConn) {
-	trace := httptrace.ContextClientTrace(req.Context())
-	if trace == nil || trace.GotConn == nil {
-		return
-	}
-	ci := httptrace.GotConnInfo{Conn: cc.tconn}
-	cc.mu.Lock()
-	ci.Reused = cc.nextStreamID > 1
-	ci.WasIdle = len(cc.streams) == 0 && ci.Reused
-	if ci.WasIdle && !cc.lastActive.IsZero() {
-		ci.IdleTime = time.Now().Sub(cc.lastActive)
-	}
-	cc.mu.Unlock()
-
-	trace.GotConn(ci)
-}
-
-func traceWroteHeaders(trace *clientTrace) {
-	if trace != nil && trace.WroteHeaders != nil {
-		trace.WroteHeaders()
-	}
-}
-
-func traceGot100Continue(trace *clientTrace) {
-	if trace != nil && trace.Got100Continue != nil {
-		trace.Got100Continue()
-	}
-}
-
-func traceWait100Continue(trace *clientTrace) {
-	if trace != nil && trace.Wait100Continue != nil {
-		trace.Wait100Continue()
-	}
-}
-
-func traceWroteRequest(trace *clientTrace, err error) {
-	if trace != nil && trace.WroteRequest != nil {
-		trace.WroteRequest(httptrace.WroteRequestInfo{Err: err})
-	}
-}
-
-func traceFirstResponseByte(trace *clientTrace) {
-	if trace != nil && trace.GotFirstResponseByte != nil {
-		trace.GotFirstResponseByte()
-	}
-}
-
-func requestTrace(req *http.Request) *clientTrace {
-	trace := httptrace.ContextClientTrace(req.Context())
-	return (*clientTrace)(trace)
-}
-
-// Ping sends a PING frame to the server and waits for the ack.
-func (cc *ClientConn) Ping(ctx context.Context) error {
-	return cc.ping(ctx)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/go17_not18.go b/installer/vendor/golang.org/x/net/http2/go17_not18.go
deleted file mode 100644
index b4c52ecec3..0000000000
--- a/installer/vendor/golang.org/x/net/http2/go17_not18.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7,!go1.8
-
-package http2
-
-import "crypto/tls"
-
-// temporary copy of Go 1.7's private tls.Config.clone:
-func cloneTLSConfig(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                        c.Rand,
-		Time:                        c.Time,
-		Certificates:                c.Certificates,
-		NameToCertificate:           c.NameToCertificate,
-		GetCertificate:              c.GetCertificate,
-		RootCAs:                     c.RootCAs,
-		NextProtos:                  c.NextProtos,
-		ServerName:                  c.ServerName,
-		ClientAuth:                  c.ClientAuth,
-		ClientCAs:                   c.ClientCAs,
-		InsecureSkipVerify:          c.InsecureSkipVerify,
-		CipherSuites:                c.CipherSuites,
-		PreferServerCipherSuites:    c.PreferServerCipherSuites,
-		SessionTicketsDisabled:      c.SessionTicketsDisabled,
-		SessionTicketKey:            c.SessionTicketKey,
-		ClientSessionCache:          c.ClientSessionCache,
-		MinVersion:                  c.MinVersion,
-		MaxVersion:                  c.MaxVersion,
-		CurvePreferences:            c.CurvePreferences,
-		DynamicRecordSizingDisabled: c.DynamicRecordSizingDisabled,
-		Renegotiation:               c.Renegotiation,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/go18.go b/installer/vendor/golang.org/x/net/http2/go18.go
deleted file mode 100644
index 73cc2381f3..0000000000
--- a/installer/vendor/golang.org/x/net/http2/go18.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package http2
-
-import (
-	"crypto/tls"
-	"io"
-	"net/http"
-)
-
-func cloneTLSConfig(c *tls.Config) *tls.Config {
-	c2 := c.Clone()
-	c2.GetClientCertificate = c.GetClientCertificate // golang.org/issue/19264
-	return c2
-}
-
-var _ http.Pusher = (*responseWriter)(nil)
-
-// Push implements http.Pusher.
-func (w *responseWriter) Push(target string, opts *http.PushOptions) error {
-	internalOpts := pushOptions{}
-	if opts != nil {
-		internalOpts.Method = opts.Method
-		internalOpts.Header = opts.Header
-	}
-	return w.push(target, internalOpts)
-}
-
-func configureServer18(h1 *http.Server, h2 *Server) error {
-	if h2.IdleTimeout == 0 {
-		if h1.IdleTimeout != 0 {
-			h2.IdleTimeout = h1.IdleTimeout
-		} else {
-			h2.IdleTimeout = h1.ReadTimeout
-		}
-	}
-	return nil
-}
-
-func shouldLogPanic(panicValue interface{}) bool {
-	return panicValue != nil && panicValue != http.ErrAbortHandler
-}
-
-func reqGetBody(req *http.Request) func() (io.ReadCloser, error) {
-	return req.GetBody
-}
-
-func reqBodyIsNoBody(body io.ReadCloser) bool {
-	return body == http.NoBody
-}
diff --git a/installer/vendor/golang.org/x/net/http2/go18_test.go b/installer/vendor/golang.org/x/net/http2/go18_test.go
deleted file mode 100644
index 30e3b038bf..0000000000
--- a/installer/vendor/golang.org/x/net/http2/go18_test.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package http2
-
-import (
-	"crypto/tls"
-	"net/http"
-	"testing"
-	"time"
-)
-
-// Tests that http2.Server.IdleTimeout is initialized from
-// http.Server.{Idle,Read}Timeout. http.Server.IdleTimeout was
-// added in Go 1.8.
-func TestConfigureServerIdleTimeout_Go18(t *testing.T) {
-	const timeout = 5 * time.Second
-	const notThisOne = 1 * time.Second
-
-	// With a zero http2.Server, verify that it copies IdleTimeout:
-	{
-		s1 := &http.Server{
-			IdleTimeout: timeout,
-			ReadTimeout: notThisOne,
-		}
-		s2 := &Server{}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-
-	// And that it falls back to ReadTimeout:
-	{
-		s1 := &http.Server{
-			ReadTimeout: timeout,
-		}
-		s2 := &Server{}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-
-	// Verify that s1's IdleTimeout doesn't overwrite an existing setting:
-	{
-		s1 := &http.Server{
-			IdleTimeout: notThisOne,
-		}
-		s2 := &Server{
-			IdleTimeout: timeout,
-		}
-		if err := ConfigureServer(s1, s2); err != nil {
-			t.Fatal(err)
-		}
-		if s2.IdleTimeout != timeout {
-			t.Errorf("s2.IdleTimeout = %v; want %v", s2.IdleTimeout, timeout)
-		}
-	}
-}
-
-func TestCertClone(t *testing.T) {
-	c := &tls.Config{
-		GetClientCertificate: func(*tls.CertificateRequestInfo) (*tls.Certificate, error) {
-			panic("shouldn't be called")
-		},
-	}
-	c2 := cloneTLSConfig(c)
-	if c2.GetClientCertificate == nil {
-		t.Error("GetClientCertificate is nil")
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/gotrack.go b/installer/vendor/golang.org/x/net/http2/gotrack.go
deleted file mode 100644
index 9933c9f8c7..0000000000
--- a/installer/vendor/golang.org/x/net/http2/gotrack.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Defensive debug-only utility to track that functions run on the
-// goroutine that they're supposed to.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"runtime"
-	"strconv"
-	"sync"
-)
-
-var DebugGoroutines = os.Getenv("DEBUG_HTTP2_GOROUTINES") == "1"
-
-type goroutineLock uint64
-
-func newGoroutineLock() goroutineLock {
-	if !DebugGoroutines {
-		return 0
-	}
-	return goroutineLock(curGoroutineID())
-}
-
-func (g goroutineLock) check() {
-	if !DebugGoroutines {
-		return
-	}
-	if curGoroutineID() != uint64(g) {
-		panic("running on the wrong goroutine")
-	}
-}
-
-func (g goroutineLock) checkNotOn() {
-	if !DebugGoroutines {
-		return
-	}
-	if curGoroutineID() == uint64(g) {
-		panic("running on the wrong goroutine")
-	}
-}
-
-var goroutineSpace = []byte("goroutine ")
-
-func curGoroutineID() uint64 {
-	bp := littleBuf.Get().(*[]byte)
-	defer littleBuf.Put(bp)
-	b := *bp
-	b = b[:runtime.Stack(b, false)]
-	// Parse the 4707 out of "goroutine 4707 ["
-	b = bytes.TrimPrefix(b, goroutineSpace)
-	i := bytes.IndexByte(b, ' ')
-	if i < 0 {
-		panic(fmt.Sprintf("No space found in %q", b))
-	}
-	b = b[:i]
-	n, err := parseUintBytes(b, 10, 64)
-	if err != nil {
-		panic(fmt.Sprintf("Failed to parse goroutine ID out of %q: %v", b, err))
-	}
-	return n
-}
-
-var littleBuf = sync.Pool{
-	New: func() interface{} {
-		buf := make([]byte, 64)
-		return &buf
-	},
-}
-
-// parseUintBytes is like strconv.ParseUint, but using a []byte.
-func parseUintBytes(s []byte, base int, bitSize int) (n uint64, err error) {
-	var cutoff, maxVal uint64
-
-	if bitSize == 0 {
-		bitSize = int(strconv.IntSize)
-	}
-
-	s0 := s
-	switch {
-	case len(s) < 1:
-		err = strconv.ErrSyntax
-		goto Error
-
-	case 2 <= base && base <= 36:
-		// valid base; nothing to do
-
-	case base == 0:
-		// Look for octal, hex prefix.
-		switch {
-		case s[0] == '0' && len(s) > 1 && (s[1] == 'x' || s[1] == 'X'):
-			base = 16
-			s = s[2:]
-			if len(s) < 1 {
-				err = strconv.ErrSyntax
-				goto Error
-			}
-		case s[0] == '0':
-			base = 8
-		default:
-			base = 10
-		}
-
-	default:
-		err = errors.New("invalid base " + strconv.Itoa(base))
-		goto Error
-	}
-
-	n = 0
-	cutoff = cutoff64(base)
-	maxVal = 1<<uint(bitSize) - 1
-
-	for i := 0; i < len(s); i++ {
-		var v byte
-		d := s[i]
-		switch {
-		case '0' <= d && d <= '9':
-			v = d - '0'
-		case 'a' <= d && d <= 'z':
-			v = d - 'a' + 10
-		case 'A' <= d && d <= 'Z':
-			v = d - 'A' + 10
-		default:
-			n = 0
-			err = strconv.ErrSyntax
-			goto Error
-		}
-		if int(v) >= base {
-			n = 0
-			err = strconv.ErrSyntax
-			goto Error
-		}
-
-		if n >= cutoff {
-			// n*base overflows
-			n = 1<<64 - 1
-			err = strconv.ErrRange
-			goto Error
-		}
-		n *= uint64(base)
-
-		n1 := n + uint64(v)
-		if n1 < n || n1 > maxVal {
-			// n+v overflows
-			n = 1<<64 - 1
-			err = strconv.ErrRange
-			goto Error
-		}
-		n = n1
-	}
-
-	return n, nil
-
-Error:
-	return n, &strconv.NumError{Func: "ParseUint", Num: string(s0), Err: err}
-}
-
-// Return the first number n such that n*base >= 1<<64.
-func cutoff64(base int) uint64 {
-	if base < 2 {
-		return 0
-	}
-	return (1<<64-1)/uint64(base) + 1
-}
diff --git a/installer/vendor/golang.org/x/net/http2/gotrack_test.go b/installer/vendor/golang.org/x/net/http2/gotrack_test.go
deleted file mode 100644
index 06db61231d..0000000000
--- a/installer/vendor/golang.org/x/net/http2/gotrack_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"strings"
-	"testing"
-)
-
-func TestGoroutineLock(t *testing.T) {
-	oldDebug := DebugGoroutines
-	DebugGoroutines = true
-	defer func() { DebugGoroutines = oldDebug }()
-
-	g := newGoroutineLock()
-	g.check()
-
-	sawPanic := make(chan interface{})
-	go func() {
-		defer func() { sawPanic <- recover() }()
-		g.check() // should panic
-	}()
-	e := <-sawPanic
-	if e == nil {
-		t.Fatal("did not see panic from check in other goroutine")
-	}
-	if !strings.Contains(fmt.Sprint(e), "wrong goroutine") {
-		t.Errorf("expected on see panic about running on the wrong goroutine; got %v", e)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/.gitignore b/installer/vendor/golang.org/x/net/http2/h2demo/.gitignore
deleted file mode 100644
index 0de86ddbc5..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/.gitignore
+++ /dev/null
@@ -1,5 +0,0 @@
-h2demo
-h2demo.linux
-client-id.dat
-client-secret.dat
-token.dat
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/Makefile b/installer/vendor/golang.org/x/net/http2/h2demo/Makefile
deleted file mode 100644
index f5c31ef3e2..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-h2demo.linux: h2demo.go
-	GOOS=linux go build --tags=h2demo -o h2demo.linux .
-
-FORCE:
-
-upload: FORCE
-	go install golang.org/x/build/cmd/upload
-	upload --verbose --osarch=linux-amd64 --tags=h2demo --file=go:golang.org/x/net/http2/h2demo --public http2-demo-server-tls/h2demo
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/README b/installer/vendor/golang.org/x/net/http2/h2demo/README
deleted file mode 100644
index 212a96f383..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-Client:
- -- Firefox nightly with about:config network.http.spdy.enabled.http2draft set true
- -- Chrome: go to chrome://flags/#enable-spdy4, save and restart (button at bottom)
-
-Make CA:
-$ openssl genrsa -out rootCA.key 2048
-$ openssl req -x509 -new -nodes -key rootCA.key -days 1024 -out rootCA.pem
-... install that to Firefox
-
-Make cert:
-$ openssl genrsa -out server.key 2048
-$ openssl req -new -key server.key -out server.csr
-$ openssl x509 -req -in server.csr -CA rootCA.pem -CAkey rootCA.key -CAcreateserial -out server.crt -days 500
-
-
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/h2demo.go b/installer/vendor/golang.org/x/net/http2/h2demo/h2demo.go
deleted file mode 100644
index 980b6d67d6..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/h2demo.go
+++ /dev/null
@@ -1,486 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build h2demo
-
-package main
-
-import (
-	"bytes"
-	"crypto/tls"
-	"flag"
-	"fmt"
-	"hash/crc32"
-	"image"
-	"image/jpeg"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"go4.org/syncutil/singleflight"
-	"golang.org/x/crypto/acme/autocert"
-	"golang.org/x/net/http2"
-)
-
-var (
-	prod = flag.Bool("prod", false, "Whether to configure itself to be the production http2.golang.org server.")
-
-	httpsAddr = flag.String("https_addr", "localhost:4430", "TLS address to listen on ('host:port' or ':port'). Required.")
-	httpAddr  = flag.String("http_addr", "", "Plain HTTP address to listen on ('host:port', or ':port'). Empty means no HTTP.")
-
-	hostHTTP  = flag.String("http_host", "", "Optional host or host:port to use for http:// links to this service. By default, this is implied from -http_addr.")
-	hostHTTPS = flag.String("https_host", "", "Optional host or host:port to use for http:// links to this service. By default, this is implied from -https_addr.")
-)
-
-func homeOldHTTP(w http.ResponseWriter, r *http.Request) {
-	io.WriteString(w, `<html>
-<body>
-<h1>Go + HTTP/2</h1>
-<p>Welcome to <a href="https://golang.org/">the Go language</a>'s <a href="https://http2.github.io/">HTTP/2</a> demo & interop server.</p>
-<p>Unfortunately, you're <b>not</b> using HTTP/2 right now. To do so:</p>
-<ul>
-   <li>Use Firefox Nightly or go to <b>about:config</b> and enable "network.http.spdy.enabled.http2draft"</li>
-   <li>Use Google Chrome Canary and/or go to <b>chrome://flags/#enable-spdy4</b> to <i>Enable SPDY/4</i> (Chrome's name for HTTP/2)</li>
-</ul>
-<p>See code & instructions for connecting at <a href="https://github.com/golang/net/tree/master/http2">https://github.com/golang/net/tree/master/http2</a>.</p>
-
-</body></html>`)
-}
-
-func home(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path != "/" {
-		http.NotFound(w, r)
-		return
-	}
-	io.WriteString(w, `<html>
-<body>
-<h1>Go + HTTP/2</h1>
-
-<p>Welcome to <a href="https://golang.org/">the Go language</a>'s <a
-href="https://http2.github.io/">HTTP/2</a> demo & interop server.</p>
-
-<p>Congratulations, <b>you're using HTTP/2 right now</b>.</p>
-
-<p>This server exists for others in the HTTP/2 community to test their HTTP/2 client implementations and point out flaws in our server.</p>
-
-<p>
-The code is at <a href="https://golang.org/x/net/http2">golang.org/x/net/http2</a> and
-is used transparently by the Go standard library from Go 1.6 and later.
-</p>
-
-<p>Contact info: <i>bradfitz@golang.org</i>, or <a
-href="https://golang.org/s/http2bug">file a bug</a>.</p>
-
-<h2>Handlers for testing</h2>
-<ul>
-  <li>GET <a href="/reqinfo">/reqinfo</a> to dump the request + headers received</li>
-  <li>GET <a href="/clockstream">/clockstream</a> streams the current time every second</li>
-  <li>GET <a href="/gophertiles">/gophertiles</a> to see a page with a bunch of images</li>
-  <li>GET <a href="/file/gopher.png">/file/gopher.png</a> for a small file (does If-Modified-Since, Content-Range, etc)</li>
-  <li>GET <a href="/file/go.src.tar.gz">/file/go.src.tar.gz</a> for a larger file (~10 MB)</li>
-  <li>GET <a href="/redirect">/redirect</a> to redirect back to / (this page)</li>
-  <li>GET <a href="/goroutines">/goroutines</a> to see all active goroutines in this server</li>
-  <li>PUT something to <a href="/crc32">/crc32</a> to get a count of number of bytes and its CRC-32</li>
-  <li>PUT something to <a href="/ECHO">/ECHO</a> and it will be streamed back to you capitalized</li>
-</ul>
-
-</body></html>`)
-}
-
-func reqInfoHandler(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "text/plain")
-	fmt.Fprintf(w, "Method: %s\n", r.Method)
-	fmt.Fprintf(w, "Protocol: %s\n", r.Proto)
-	fmt.Fprintf(w, "Host: %s\n", r.Host)
-	fmt.Fprintf(w, "RemoteAddr: %s\n", r.RemoteAddr)
-	fmt.Fprintf(w, "RequestURI: %q\n", r.RequestURI)
-	fmt.Fprintf(w, "URL: %#v\n", r.URL)
-	fmt.Fprintf(w, "Body.ContentLength: %d (-1 means unknown)\n", r.ContentLength)
-	fmt.Fprintf(w, "Close: %v (relevant for HTTP/1 only)\n", r.Close)
-	fmt.Fprintf(w, "TLS: %#v\n", r.TLS)
-	fmt.Fprintf(w, "\nHeaders:\n")
-	r.Header.Write(w)
-}
-
-func crcHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "PUT" {
-		http.Error(w, "PUT required.", 400)
-		return
-	}
-	crc := crc32.NewIEEE()
-	n, err := io.Copy(crc, r.Body)
-	if err == nil {
-		w.Header().Set("Content-Type", "text/plain")
-		fmt.Fprintf(w, "bytes=%d, CRC32=%x", n, crc.Sum(nil))
-	}
-}
-
-type capitalizeReader struct {
-	r io.Reader
-}
-
-func (cr capitalizeReader) Read(p []byte) (n int, err error) {
-	n, err = cr.r.Read(p)
-	for i, b := range p[:n] {
-		if b >= 'a' && b <= 'z' {
-			p[i] = b - ('a' - 'A')
-		}
-	}
-	return
-}
-
-type flushWriter struct {
-	w io.Writer
-}
-
-func (fw flushWriter) Write(p []byte) (n int, err error) {
-	n, err = fw.w.Write(p)
-	if f, ok := fw.w.(http.Flusher); ok {
-		f.Flush()
-	}
-	return
-}
-
-func echoCapitalHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "PUT" {
-		http.Error(w, "PUT required.", 400)
-		return
-	}
-	io.Copy(flushWriter{w}, capitalizeReader{r.Body})
-}
-
-var (
-	fsGrp   singleflight.Group
-	fsMu    sync.Mutex // guards fsCache
-	fsCache = map[string]http.Handler{}
-)
-
-// fileServer returns a file-serving handler that proxies URL.
-// It lazily fetches URL on the first access and caches its contents forever.
-func fileServer(url string) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		hi, err := fsGrp.Do(url, func() (interface{}, error) {
-			fsMu.Lock()
-			if h, ok := fsCache[url]; ok {
-				fsMu.Unlock()
-				return h, nil
-			}
-			fsMu.Unlock()
-
-			res, err := http.Get(url)
-			if err != nil {
-				return nil, err
-			}
-			defer res.Body.Close()
-			slurp, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				return nil, err
-			}
-
-			modTime := time.Now()
-			var h http.Handler = http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				http.ServeContent(w, r, path.Base(url), modTime, bytes.NewReader(slurp))
-			})
-			fsMu.Lock()
-			fsCache[url] = h
-			fsMu.Unlock()
-			return h, nil
-		})
-		if err != nil {
-			http.Error(w, err.Error(), 500)
-			return
-		}
-		hi.(http.Handler).ServeHTTP(w, r)
-	})
-}
-
-func clockStreamHandler(w http.ResponseWriter, r *http.Request) {
-	clientGone := w.(http.CloseNotifier).CloseNotify()
-	w.Header().Set("Content-Type", "text/plain")
-	ticker := time.NewTicker(1 * time.Second)
-	defer ticker.Stop()
-	fmt.Fprintf(w, "# ~1KB of junk to force browsers to start rendering immediately: \n")
-	io.WriteString(w, strings.Repeat("# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx\n", 13))
-
-	for {
-		fmt.Fprintf(w, "%v\n", time.Now())
-		w.(http.Flusher).Flush()
-		select {
-		case <-ticker.C:
-		case <-clientGone:
-			log.Printf("Client %v disconnected from the clock", r.RemoteAddr)
-			return
-		}
-	}
-}
-
-func registerHandlers() {
-	tiles := newGopherTilesHandler()
-
-	mux2 := http.NewServeMux()
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		if r.TLS == nil {
-			if r.URL.Path == "/gophertiles" {
-				tiles.ServeHTTP(w, r)
-				return
-			}
-			http.Redirect(w, r, "https://"+httpsHost()+"/", http.StatusFound)
-			return
-		}
-		if r.ProtoMajor == 1 {
-			if r.URL.Path == "/reqinfo" {
-				reqInfoHandler(w, r)
-				return
-			}
-			homeOldHTTP(w, r)
-			return
-		}
-		mux2.ServeHTTP(w, r)
-	})
-	mux2.HandleFunc("/", home)
-	mux2.Handle("/file/gopher.png", fileServer("https://golang.org/doc/gopher/frontpage.png"))
-	mux2.Handle("/file/go.src.tar.gz", fileServer("https://storage.googleapis.com/golang/go1.4.1.src.tar.gz"))
-	mux2.HandleFunc("/reqinfo", reqInfoHandler)
-	mux2.HandleFunc("/crc32", crcHandler)
-	mux2.HandleFunc("/ECHO", echoCapitalHandler)
-	mux2.HandleFunc("/clockstream", clockStreamHandler)
-	mux2.Handle("/gophertiles", tiles)
-	mux2.HandleFunc("/redirect", func(w http.ResponseWriter, r *http.Request) {
-		http.Redirect(w, r, "/", http.StatusFound)
-	})
-	stripHomedir := regexp.MustCompile(`/(Users|home)/\w+`)
-	mux2.HandleFunc("/goroutines", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/plain; charset=utf-8")
-		buf := make([]byte, 2<<20)
-		w.Write(stripHomedir.ReplaceAll(buf[:runtime.Stack(buf, true)], nil))
-	})
-}
-
-func newGopherTilesHandler() http.Handler {
-	const gopherURL = "https://blog.golang.org/go-programming-language-turns-two_gophers.jpg"
-	res, err := http.Get(gopherURL)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if res.StatusCode != 200 {
-		log.Fatalf("Error fetching %s: %v", gopherURL, res.Status)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		log.Fatal(err)
-	}
-	im, err := jpeg.Decode(bytes.NewReader(slurp))
-	if err != nil {
-		if len(slurp) > 1024 {
-			slurp = slurp[:1024]
-		}
-		log.Fatalf("Failed to decode gopher image: %v (got %q)", err, slurp)
-	}
-
-	type subImager interface {
-		SubImage(image.Rectangle) image.Image
-	}
-	const tileSize = 32
-	xt := im.Bounds().Max.X / tileSize
-	yt := im.Bounds().Max.Y / tileSize
-	var tile [][][]byte // y -> x -> jpeg bytes
-	for yi := 0; yi < yt; yi++ {
-		var row [][]byte
-		for xi := 0; xi < xt; xi++ {
-			si := im.(subImager).SubImage(image.Rectangle{
-				Min: image.Point{xi * tileSize, yi * tileSize},
-				Max: image.Point{(xi + 1) * tileSize, (yi + 1) * tileSize},
-			})
-			buf := new(bytes.Buffer)
-			if err := jpeg.Encode(buf, si, &jpeg.Options{Quality: 90}); err != nil {
-				log.Fatal(err)
-			}
-			row = append(row, buf.Bytes())
-		}
-		tile = append(tile, row)
-	}
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		ms, _ := strconv.Atoi(r.FormValue("latency"))
-		const nanosPerMilli = 1e6
-		if r.FormValue("x") != "" {
-			x, _ := strconv.Atoi(r.FormValue("x"))
-			y, _ := strconv.Atoi(r.FormValue("y"))
-			if ms <= 1000 {
-				time.Sleep(time.Duration(ms) * nanosPerMilli)
-			}
-			if x >= 0 && x < xt && y >= 0 && y < yt {
-				http.ServeContent(w, r, "", time.Time{}, bytes.NewReader(tile[y][x]))
-				return
-			}
-		}
-		io.WriteString(w, "<html><body onload='showtimes()'>")
-		fmt.Fprintf(w, "A grid of %d tiled images is below. Compare:<p>", xt*yt)
-		for _, ms := range []int{0, 30, 200, 1000} {
-			d := time.Duration(ms) * nanosPerMilli
-			fmt.Fprintf(w, "[<a href='https://%s/gophertiles?latency=%d'>HTTP/2, %v latency</a>] [<a href='http://%s/gophertiles?latency=%d'>HTTP/1, %v latency</a>]<br>\n",
-				httpsHost(), ms, d,
-				httpHost(), ms, d,
-			)
-		}
-		io.WriteString(w, "<p>\n")
-		cacheBust := time.Now().UnixNano()
-		for y := 0; y < yt; y++ {
-			for x := 0; x < xt; x++ {
-				fmt.Fprintf(w, "<img width=%d height=%d src='/gophertiles?x=%d&y=%d&cachebust=%d&latency=%d'>",
-					tileSize, tileSize, x, y, cacheBust, ms)
-			}
-			io.WriteString(w, "<br/>\n")
-		}
-		io.WriteString(w, `<p><div id='loadtimes'></div></p>
-<script>
-function showtimes() {
-	var times = 'Times from connection start:<br>'
-	times += 'DOM loaded: ' + (window.performance.timing.domContentLoadedEventEnd - window.performance.timing.connectStart) + 'ms<br>'
-	times += 'DOM complete (images loaded): ' + (window.performance.timing.domComplete - window.performance.timing.connectStart) + 'ms<br>'
-	document.getElementById('loadtimes').innerHTML = times
-}
-</script>
-<hr><a href='/'>&lt;&lt Back to Go HTTP/2 demo server</a></body></html>`)
-	})
-}
-
-func httpsHost() string {
-	if *hostHTTPS != "" {
-		return *hostHTTPS
-	}
-	if v := *httpsAddr; strings.HasPrefix(v, ":") {
-		return "localhost" + v
-	} else {
-		return v
-	}
-}
-
-func httpHost() string {
-	if *hostHTTP != "" {
-		return *hostHTTP
-	}
-	if v := *httpAddr; strings.HasPrefix(v, ":") {
-		return "localhost" + v
-	} else {
-		return v
-	}
-}
-
-func serveProdTLS() error {
-	const cacheDir = "/var/cache/autocert"
-	if err := os.MkdirAll(cacheDir, 0700); err != nil {
-		return err
-	}
-	m := autocert.Manager{
-		Cache:      autocert.DirCache(cacheDir),
-		Prompt:     autocert.AcceptTOS,
-		HostPolicy: autocert.HostWhitelist("http2.golang.org"),
-	}
-	srv := &http.Server{
-		TLSConfig: &tls.Config{
-			GetCertificate: m.GetCertificate,
-		},
-	}
-	http2.ConfigureServer(srv, &http2.Server{})
-	ln, err := net.Listen("tcp", ":443")
-	if err != nil {
-		return err
-	}
-	return srv.Serve(tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, srv.TLSConfig))
-}
-
-type tcpKeepAliveListener struct {
-	*net.TCPListener
-}
-
-func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
-		return
-	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
-}
-
-func serveProd() error {
-	errc := make(chan error, 2)
-	go func() { errc <- http.ListenAndServe(":80", nil) }()
-	go func() { errc <- serveProdTLS() }()
-	return <-errc
-}
-
-const idleTimeout = 5 * time.Minute
-const activeTimeout = 10 * time.Minute
-
-// TODO: put this into the standard library and actually send
-// PING frames and GOAWAY, etc: golang.org/issue/14204
-func idleTimeoutHook() func(net.Conn, http.ConnState) {
-	var mu sync.Mutex
-	m := map[net.Conn]*time.Timer{}
-	return func(c net.Conn, cs http.ConnState) {
-		mu.Lock()
-		defer mu.Unlock()
-		if t, ok := m[c]; ok {
-			delete(m, c)
-			t.Stop()
-		}
-		var d time.Duration
-		switch cs {
-		case http.StateNew, http.StateIdle:
-			d = idleTimeout
-		case http.StateActive:
-			d = activeTimeout
-		default:
-			return
-		}
-		m[c] = time.AfterFunc(d, func() {
-			log.Printf("closing idle conn %v after %v", c.RemoteAddr(), d)
-			go c.Close()
-		})
-	}
-}
-
-func main() {
-	var srv http.Server
-	flag.BoolVar(&http2.VerboseLogs, "verbose", false, "Verbose HTTP/2 debugging.")
-	flag.Parse()
-	srv.Addr = *httpsAddr
-	srv.ConnState = idleTimeoutHook()
-
-	registerHandlers()
-
-	if *prod {
-		*hostHTTP = "http2.golang.org"
-		*hostHTTPS = "http2.golang.org"
-		log.Fatal(serveProd())
-	}
-
-	url := "https://" + httpsHost() + "/"
-	log.Printf("Listening on " + url)
-	http2.ConfigureServer(&srv, &http2.Server{})
-
-	if *httpAddr != "" {
-		go func() {
-			log.Printf("Listening on http://" + httpHost() + "/ (for unencrypted HTTP/1)")
-			log.Fatal(http.ListenAndServe(*httpAddr, nil))
-		}()
-	}
-
-	go func() {
-		log.Fatal(srv.ListenAndServeTLS("server.crt", "server.key"))
-	}()
-	select {}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/launch.go b/installer/vendor/golang.org/x/net/http2/h2demo/launch.go
deleted file mode 100644
index df0866a307..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/launch.go
+++ /dev/null
@@ -1,302 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	"strings"
-	"time"
-
-	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/google"
-	compute "google.golang.org/api/compute/v1"
-)
-
-var (
-	proj     = flag.String("project", "symbolic-datum-552", "name of Project")
-	zone     = flag.String("zone", "us-central1-a", "GCE zone")
-	mach     = flag.String("machinetype", "n1-standard-1", "Machine type")
-	instName = flag.String("instance_name", "http2-demo", "Name of VM instance.")
-	sshPub   = flag.String("ssh_public_key", "", "ssh public key file to authorize. Can modify later in Google's web UI anyway.")
-	staticIP = flag.String("static_ip", "130.211.116.44", "Static IP to use. If empty, automatic.")
-
-	writeObject  = flag.String("write_object", "", "If non-empty, a VM isn't created and the flag value is Google Cloud Storage bucket/object to write. The contents from stdin.")
-	publicObject = flag.Bool("write_object_is_public", false, "Whether the object created by --write_object should be public.")
-)
-
-func readFile(v string) string {
-	slurp, err := ioutil.ReadFile(v)
-	if err != nil {
-		log.Fatalf("Error reading %s: %v", v, err)
-	}
-	return strings.TrimSpace(string(slurp))
-}
-
-var config = &oauth2.Config{
-	// The client-id and secret should be for an "Installed Application" when using
-	// the CLI. Later we'll use a web application with a callback.
-	ClientID:     readFile("client-id.dat"),
-	ClientSecret: readFile("client-secret.dat"),
-	Endpoint:     google.Endpoint,
-	Scopes: []string{
-		compute.DevstorageFullControlScope,
-		compute.ComputeScope,
-		"https://www.googleapis.com/auth/sqlservice",
-		"https://www.googleapis.com/auth/sqlservice.admin",
-	},
-	RedirectURL: "urn:ietf:wg:oauth:2.0:oob",
-}
-
-const baseConfig = `#cloud-config
-coreos:
-  units:
-    - name: h2demo.service
-      command: start
-      content: |
-        [Unit]
-        Description=HTTP2 Demo
-        
-        [Service]
-        ExecStartPre=/bin/bash -c 'mkdir -p /opt/bin && curl -s -o /opt/bin/h2demo http://storage.googleapis.com/http2-demo-server-tls/h2demo && chmod +x /opt/bin/h2demo'
-        ExecStart=/opt/bin/h2demo --prod
-        RestartSec=5s
-        Restart=always
-        Type=simple
-        
-        [Install]
-        WantedBy=multi-user.target
-`
-
-func main() {
-	flag.Parse()
-	if *proj == "" {
-		log.Fatalf("Missing --project flag")
-	}
-	prefix := "https://www.googleapis.com/compute/v1/projects/" + *proj
-	machType := prefix + "/zones/" + *zone + "/machineTypes/" + *mach
-
-	const tokenFileName = "token.dat"
-	tokenFile := tokenCacheFile(tokenFileName)
-	tokenSource := oauth2.ReuseTokenSource(nil, tokenFile)
-	token, err := tokenSource.Token()
-	if err != nil {
-		if *writeObject != "" {
-			log.Fatalf("Can't use --write_object without a valid token.dat file already cached.")
-		}
-		log.Printf("Error getting token from %s: %v", tokenFileName, err)
-		log.Printf("Get auth code from %v", config.AuthCodeURL("my-state"))
-		fmt.Print("\nEnter auth code: ")
-		sc := bufio.NewScanner(os.Stdin)
-		sc.Scan()
-		authCode := strings.TrimSpace(sc.Text())
-		token, err = config.Exchange(oauth2.NoContext, authCode)
-		if err != nil {
-			log.Fatalf("Error exchanging auth code for a token: %v", err)
-		}
-		if err := tokenFile.WriteToken(token); err != nil {
-			log.Fatalf("Error writing to %s: %v", tokenFileName, err)
-		}
-		tokenSource = oauth2.ReuseTokenSource(token, nil)
-	}
-
-	oauthClient := oauth2.NewClient(oauth2.NoContext, tokenSource)
-
-	if *writeObject != "" {
-		writeCloudStorageObject(oauthClient)
-		return
-	}
-
-	computeService, _ := compute.New(oauthClient)
-
-	natIP := *staticIP
-	if natIP == "" {
-		// Try to find it by name.
-		aggAddrList, err := computeService.Addresses.AggregatedList(*proj).Do()
-		if err != nil {
-			log.Fatal(err)
-		}
-		// http://godoc.org/code.google.com/p/google-api-go-client/compute/v1#AddressAggregatedList
-	IPLoop:
-		for _, asl := range aggAddrList.Items {
-			for _, addr := range asl.Addresses {
-				if addr.Name == *instName+"-ip" && addr.Status == "RESERVED" {
-					natIP = addr.Address
-					break IPLoop
-				}
-			}
-		}
-	}
-
-	cloudConfig := baseConfig
-	if *sshPub != "" {
-		key := strings.TrimSpace(readFile(*sshPub))
-		cloudConfig += fmt.Sprintf("\nssh_authorized_keys:\n    - %s\n", key)
-	}
-	if os.Getenv("USER") == "bradfitz" {
-		cloudConfig += fmt.Sprintf("\nssh_authorized_keys:\n    - %s\n", "ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAIEAwks9dwWKlRC+73gRbvYtVg0vdCwDSuIlyt4z6xa/YU/jTDynM4R4W10hm2tPjy8iR1k8XhDv4/qdxe6m07NjG/By1tkmGpm1mGwho4Pr5kbAAy/Qg+NLCSdAYnnE00FQEcFOC15GFVMOW2AzDGKisReohwH9eIzHPzdYQNPRWXE= bradfitz@papag.bradfitz.com")
-	}
-	const maxCloudConfig = 32 << 10 // per compute API docs
-	if len(cloudConfig) > maxCloudConfig {
-		log.Fatalf("cloud config length of %d bytes is over %d byte limit", len(cloudConfig), maxCloudConfig)
-	}
-
-	instance := &compute.Instance{
-		Name:        *instName,
-		Description: "Go Builder",
-		MachineType: machType,
-		Disks:       []*compute.AttachedDisk{instanceDisk(computeService)},
-		Tags: &compute.Tags{
-			Items: []string{"http-server", "https-server"},
-		},
-		Metadata: &compute.Metadata{
-			Items: []*compute.MetadataItems{
-				{
-					Key:   "user-data",
-					Value: &cloudConfig,
-				},
-			},
-		},
-		NetworkInterfaces: []*compute.NetworkInterface{
-			{
-				AccessConfigs: []*compute.AccessConfig{
-					{
-						Type:  "ONE_TO_ONE_NAT",
-						Name:  "External NAT",
-						NatIP: natIP,
-					},
-				},
-				Network: prefix + "/global/networks/default",
-			},
-		},
-		ServiceAccounts: []*compute.ServiceAccount{
-			{
-				Email: "default",
-				Scopes: []string{
-					compute.DevstorageFullControlScope,
-					compute.ComputeScope,
-				},
-			},
-		},
-	}
-
-	log.Printf("Creating instance...")
-	op, err := computeService.Instances.Insert(*proj, *zone, instance).Do()
-	if err != nil {
-		log.Fatalf("Failed to create instance: %v", err)
-	}
-	opName := op.Name
-	log.Printf("Created. Waiting on operation %v", opName)
-OpLoop:
-	for {
-		time.Sleep(2 * time.Second)
-		op, err := computeService.ZoneOperations.Get(*proj, *zone, opName).Do()
-		if err != nil {
-			log.Fatalf("Failed to get op %s: %v", opName, err)
-		}
-		switch op.Status {
-		case "PENDING", "RUNNING":
-			log.Printf("Waiting on operation %v", opName)
-			continue
-		case "DONE":
-			if op.Error != nil {
-				for _, operr := range op.Error.Errors {
-					log.Printf("Error: %+v", operr)
-				}
-				log.Fatalf("Failed to start.")
-			}
-			log.Printf("Success. %+v", op)
-			break OpLoop
-		default:
-			log.Fatalf("Unknown status %q: %+v", op.Status, op)
-		}
-	}
-
-	inst, err := computeService.Instances.Get(*proj, *zone, *instName).Do()
-	if err != nil {
-		log.Fatalf("Error getting instance after creation: %v", err)
-	}
-	ij, _ := json.MarshalIndent(inst, "", "    ")
-	log.Printf("Instance: %s", ij)
-}
-
-func instanceDisk(svc *compute.Service) *compute.AttachedDisk {
-	const imageURL = "https://www.googleapis.com/compute/v1/projects/coreos-cloud/global/images/coreos-stable-444-5-0-v20141016"
-	diskName := *instName + "-disk"
-
-	return &compute.AttachedDisk{
-		AutoDelete: true,
-		Boot:       true,
-		Type:       "PERSISTENT",
-		InitializeParams: &compute.AttachedDiskInitializeParams{
-			DiskName:    diskName,
-			SourceImage: imageURL,
-			DiskSizeGb:  50,
-		},
-	}
-}
-
-func writeCloudStorageObject(httpClient *http.Client) {
-	content := os.Stdin
-	const maxSlurp = 1 << 20
-	var buf bytes.Buffer
-	n, err := io.CopyN(&buf, content, maxSlurp)
-	if err != nil && err != io.EOF {
-		log.Fatalf("Error reading from stdin: %v, %v", n, err)
-	}
-	contentType := http.DetectContentType(buf.Bytes())
-
-	req, err := http.NewRequest("PUT", "https://storage.googleapis.com/"+*writeObject, io.MultiReader(&buf, content))
-	if err != nil {
-		log.Fatal(err)
-	}
-	req.Header.Set("x-goog-api-version", "2")
-	if *publicObject {
-		req.Header.Set("x-goog-acl", "public-read")
-	}
-	req.Header.Set("Content-Type", contentType)
-	res, err := httpClient.Do(req)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if res.StatusCode != 200 {
-		res.Write(os.Stderr)
-		log.Fatalf("Failed.")
-	}
-	log.Printf("Success.")
-	os.Exit(0)
-}
-
-type tokenCacheFile string
-
-func (f tokenCacheFile) Token() (*oauth2.Token, error) {
-	slurp, err := ioutil.ReadFile(string(f))
-	if err != nil {
-		return nil, err
-	}
-	t := new(oauth2.Token)
-	if err := json.Unmarshal(slurp, t); err != nil {
-		return nil, err
-	}
-	return t, nil
-}
-
-func (f tokenCacheFile) WriteToken(t *oauth2.Token) error {
-	jt, err := json.Marshal(t)
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(string(f), jt, 0600)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.key b/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.key
deleted file mode 100644
index a15a6abaf7..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAt5fAjp4fTcekWUTfzsp0kyih1OYbsGL0KX1eRbSSR8Od0+9Q
-62Hyny+GFwMTb4A/KU8mssoHvcceSAAbwfbxFK/+s51TobqUnORZrOoTZjkUygby
-XDSK99YBbcR1Pip8vwMTm4XKuLtCigeBBdjjAQdgUO28LENGlsMnmeYkJfODVGnV
-mr5Ltb9ANA8IKyTfsnHJ4iOCS/PlPbUj2q7YnoVLposUBMlgUb/CykX3mOoLb4yJ
-JQyA/iST6ZxiIEj36D4yWZ5lg7YJl+UiiBQHGCnPdGyipqV06ex0heYWcaiW8LWZ
-SUQ93jQ+WVCH8hT7DQO1dmsvUmXlq/JeAlwQ/QIDAQABAoIBAFFHV7JMAqPWnMYA
-nezY6J81v9+XN+7xABNWM2Q8uv4WdksbigGLTXR3/680Z2hXqJ7LMeC5XJACFT/e
-/Gr0vmpgOCygnCPfjGehGKpavtfksXV3edikUlnCXsOP1C//c1bFL+sMYmFCVgTx
-qYdDK8yKzXNGrKYT6q5YG7IglyRNV1rsQa8lM/5taFYiD1Ck/3tQi3YIq8Lcuser
-hrxsMABcQ6mi+EIvG6Xr4mfJug0dGJMHG4RG1UGFQn6RXrQq2+q53fC8ZbVUSi0j
-NQ918aKFzktwv+DouKU0ME4I9toks03gM860bAL7zCbKGmwR3hfgX/TqzVCWpG9E
-LDVfvekCgYEA8fk9N53jbBRmULUGEf4qWypcLGiZnNU0OeXWpbPV9aa3H0VDytA7
-8fCN2dPAVDPqlthMDdVe983NCNwp2Yo8ZimDgowyIAKhdC25s1kejuaiH9OAPj3c
-0f8KbriYX4n8zNHxFwK6Ae3pQ6EqOLJVCUsziUaZX9nyKY5aZlyX6xcCgYEAwjws
-K62PjC64U5wYddNLp+kNdJ4edx+a7qBb3mEgPvSFT2RO3/xafJyG8kQB30Mfstjd
-bRxyUV6N0vtX1zA7VQtRUAvfGCecpMo+VQZzcHXKzoRTnQ7eZg4Lmj5fQ9tOAKAo
-QCVBoSW/DI4PZL26CAMDcAba4Pa22ooLapoRIQsCgYA6pIfkkbxLNkpxpt2YwLtt
-Kr/590O7UaR9n6k8sW/aQBRDXNsILR1KDl2ifAIxpf9lnXgZJiwE7HiTfCAcW7c1
-nzwDCI0hWuHcMTS/NYsFYPnLsstyyjVZI3FY0h4DkYKV9Q9z3zJLQ2hz/nwoD3gy
-b2pHC7giFcTts1VPV4Nt8wKBgHeFn4ihHJweg76vZz3Z78w7VNRWGFklUalVdDK7
-gaQ7w2y/ROn/146mo0OhJaXFIFRlrpvdzVrU3GDf2YXJYDlM5ZRkObwbZADjksev
-WInzcgDy3KDg7WnPasRXbTfMU4t/AkW2p1QKbi3DnSVYuokDkbH2Beo45vxDxhKr
-C69RAoGBAIyo3+OJenoZmoNzNJl2WPW5MeBUzSh8T/bgyjFTdqFHF5WiYRD/lfHj
-x9Glyw2nutuT4hlOqHvKhgTYdDMsF2oQ72fe3v8Q5FU7FuKndNPEAyvKNXZaShVA
-hnlhv5DjXKb0wFWnt5PCCiQLtzG0yyHaITrrEme7FikkIcTxaX/Y
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.pem b/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.pem
deleted file mode 100644
index 3a323e774e..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.pem
+++ /dev/null
@@ -1,26 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIEWjCCA0KgAwIBAgIJALfRlWsI8YQHMA0GCSqGSIb3DQEBBQUAMHsxCzAJBgNV
-BAYTAlVTMQswCQYDVQQIEwJDQTEWMBQGA1UEBxMNU2FuIEZyYW5jaXNjbzEUMBIG
-A1UEChMLQnJhZGZpdHppbmMxEjAQBgNVBAMTCWxvY2FsaG9zdDEdMBsGCSqGSIb3
-DQEJARYOYnJhZEBkYW5nYS5jb20wHhcNMTQwNzE1MjA0NjA1WhcNMTcwNTA0MjA0
-NjA1WjB7MQswCQYDVQQGEwJVUzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBG
-cmFuY2lzY28xFDASBgNVBAoTC0JyYWRmaXR6aW5jMRIwEAYDVQQDEwlsb2NhbGhv
-c3QxHTAbBgkqhkiG9w0BCQEWDmJyYWRAZGFuZ2EuY29tMIIBIjANBgkqhkiG9w0B
-AQEFAAOCAQ8AMIIBCgKCAQEAt5fAjp4fTcekWUTfzsp0kyih1OYbsGL0KX1eRbSS
-R8Od0+9Q62Hyny+GFwMTb4A/KU8mssoHvcceSAAbwfbxFK/+s51TobqUnORZrOoT
-ZjkUygbyXDSK99YBbcR1Pip8vwMTm4XKuLtCigeBBdjjAQdgUO28LENGlsMnmeYk
-JfODVGnVmr5Ltb9ANA8IKyTfsnHJ4iOCS/PlPbUj2q7YnoVLposUBMlgUb/CykX3
-mOoLb4yJJQyA/iST6ZxiIEj36D4yWZ5lg7YJl+UiiBQHGCnPdGyipqV06ex0heYW
-caiW8LWZSUQ93jQ+WVCH8hT7DQO1dmsvUmXlq/JeAlwQ/QIDAQABo4HgMIHdMB0G
-A1UdDgQWBBRcAROthS4P4U7vTfjByC569R7E6DCBrQYDVR0jBIGlMIGigBRcAROt
-hS4P4U7vTfjByC569R7E6KF/pH0wezELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNB
-MRYwFAYDVQQHEw1TYW4gRnJhbmNpc2NvMRQwEgYDVQQKEwtCcmFkZml0emluYzES
-MBAGA1UEAxMJbG9jYWxob3N0MR0wGwYJKoZIhvcNAQkBFg5icmFkQGRhbmdhLmNv
-bYIJALfRlWsI8YQHMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBAG6h
-U9f9sNH0/6oBbGGy2EVU0UgITUQIrFWo9rFkrW5k/XkDjQm+3lzjT0iGR4IxE/Ao
-eU6sQhua7wrWeFEn47GL98lnCsJdD7oZNhFmQ95Tb/LnDUjs5Yj9brP0NWzXfYU4
-UK2ZnINJRcJpB8iRCaCxE8DdcUF0XqIEq6pA272snoLmiXLMvNl3kYEdm+je6voD
-58SNVEUsztzQyXmJEhCpwVI0A6QCjzXj+qvpmw3ZZHi8JwXei8ZZBLTSFBki8Z7n
-sH9BBH38/SzUmAN4QHSPy1gjqm00OAE8NaYDkh/bzE4d7mLGGMWp/WE3KPSu82HF
-kPe6XoSbiLm/kxk32T0=
------END CERTIFICATE-----
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.srl b/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.srl
deleted file mode 100644
index 6db3891880..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/rootCA.srl
+++ /dev/null
@@ -1 +0,0 @@
-E2CE26BF3285059C
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/server.crt b/installer/vendor/golang.org/x/net/http2/h2demo/server.crt
deleted file mode 100644
index c59059bd64..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/server.crt
+++ /dev/null
@@ -1,20 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIDPjCCAiYCCQDizia/MoUFnDANBgkqhkiG9w0BAQUFADB7MQswCQYDVQQGEwJV
-UzELMAkGA1UECBMCQ0ExFjAUBgNVBAcTDVNhbiBGcmFuY2lzY28xFDASBgNVBAoT
-C0JyYWRmaXR6aW5jMRIwEAYDVQQDEwlsb2NhbGhvc3QxHTAbBgkqhkiG9w0BCQEW
-DmJyYWRAZGFuZ2EuY29tMB4XDTE0MDcxNTIwNTAyN1oXDTE1MTEyNzIwNTAyN1ow
-RzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAkNBMQswCQYDVQQHEwJTRjEeMBwGA1UE
-ChMVYnJhZGZpdHogaHR0cDIgc2VydmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A
-MIIBCgKCAQEAs1Y9CyLFrdL8VQWN1WaifDqaZFnoqjHhCMlc1TfG2zA+InDifx2l
-gZD3o8FeNnAcfM2sPlk3+ZleOYw9P/CklFVDlvqmpCv9ss/BEp/dDaWvy1LmJ4c2
-dbQJfmTxn7CV1H3TsVJvKdwFmdoABb41NoBp6+NNO7OtDyhbIMiCI0pL3Nefb3HL
-A7hIMo3DYbORTtJLTIH9W8YKrEWL0lwHLrYFx/UdutZnv+HjdmO6vCN4na55mjws
-/vjKQUmc7xeY7Xe20xDEG2oDKVkL2eD7FfyrYMS3rO1ExP2KSqlXYG/1S9I/fz88
-F0GK7HX55b5WjZCl2J3ERVdnv/0MQv+sYQIDAQABMA0GCSqGSIb3DQEBBQUAA4IB
-AQC0zL+n/YpRZOdulSu9tS8FxrstXqGWoxfe+vIUgqfMZ5+0MkjJ/vW0FqlLDl2R
-rn4XaR3e7FmWkwdDVbq/UB6lPmoAaFkCgh9/5oapMaclNVNnfF3fjCJfRr+qj/iD
-EmJStTIN0ZuUjAlpiACmfnpEU55PafT5Zx+i1yE4FGjw8bJpFoyD4Hnm54nGjX19
-KeCuvcYFUPnBm3lcL0FalF2AjqV02WTHYNQk7YF/oeO7NKBoEgvGvKG3x+xaOeBI
-dwvdq175ZsGul30h+QjrRlXhH/twcuaT3GSdoysDl9cCYE8f1Mk8PD6gan3uBCJU
-90p6/CbU71bGbfpM2PHot2fm
------END CERTIFICATE-----
diff --git a/installer/vendor/golang.org/x/net/http2/h2demo/server.key b/installer/vendor/golang.org/x/net/http2/h2demo/server.key
deleted file mode 100644
index f329c14212..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2demo/server.key
+++ /dev/null
@@ -1,27 +0,0 @@
------BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAs1Y9CyLFrdL8VQWN1WaifDqaZFnoqjHhCMlc1TfG2zA+InDi
-fx2lgZD3o8FeNnAcfM2sPlk3+ZleOYw9P/CklFVDlvqmpCv9ss/BEp/dDaWvy1Lm
-J4c2dbQJfmTxn7CV1H3TsVJvKdwFmdoABb41NoBp6+NNO7OtDyhbIMiCI0pL3Nef
-b3HLA7hIMo3DYbORTtJLTIH9W8YKrEWL0lwHLrYFx/UdutZnv+HjdmO6vCN4na55
-mjws/vjKQUmc7xeY7Xe20xDEG2oDKVkL2eD7FfyrYMS3rO1ExP2KSqlXYG/1S9I/
-fz88F0GK7HX55b5WjZCl2J3ERVdnv/0MQv+sYQIDAQABAoIBADQ2spUwbY+bcz4p
-3M66ECrNQTBggP40gYl2XyHxGGOu2xhZ94f9ELf1hjRWU2DUKWco1rJcdZClV6q3
-qwmXvcM2Q/SMS8JW0ImkNVl/0/NqPxGatEnj8zY30d/L8hGFb0orzFu/XYA5gCP4
-NbN2WrXgk3ZLeqwcNxHHtSiJWGJ/fPyeDWAu/apy75u9Xf2GlzBZmV6HYD9EfK80
-LTlI60f5FO487CrJnboL7ovPJrIHn+k05xRQqwma4orpz932rTXnTjs9Lg6KtbQN
-a7PrqfAntIISgr11a66Mng3IYH1lYqJsWJJwX/xHT4WLEy0EH4/0+PfYemJekz2+
-Co62drECgYEA6O9zVJZXrLSDsIi54cfxA7nEZWm5CAtkYWeAHa4EJ+IlZ7gIf9sL
-W8oFcEfFGpvwVqWZ+AsQ70dsjXAv3zXaG0tmg9FtqWp7pzRSMPidifZcQwWkKeTO
-gJnFmnVyed8h6GfjTEu4gxo1/S5U0V+mYSha01z5NTnN6ltKx1Or3b0CgYEAxRgm
-S30nZxnyg/V7ys61AZhst1DG2tkZXEMcA7dYhabMoXPJAP/EfhlWwpWYYUs/u0gS
-Wwmf5IivX5TlYScgmkvb/NYz0u4ZmOXkLTnLPtdKKFXhjXJcHjUP67jYmOxNlJLp
-V4vLRnFxTpffAV+OszzRxsXX6fvruwZBANYJeXUCgYBVouLFsFgfWGYp2rpr9XP4
-KK25kvrBqF6JKOIDB1zjxNJ3pUMKrl8oqccCFoCyXa4oTM2kUX0yWxHfleUjrMq4
-yimwQKiOZmV7fVLSSjSw6e/VfBd0h3gb82ygcplZkN0IclkwTY5SNKqwn/3y07V5
-drqdhkrgdJXtmQ6O5YYECQKBgATERcDToQ1USlI4sKrB/wyv1AlG8dg/IebiVJ4e
-ZAyvcQmClFzq0qS+FiQUnB/WQw9TeeYrwGs1hxBHuJh16srwhLyDrbMvQP06qh8R
-48F8UXXSRec22dV9MQphaROhu2qZdv1AC0WD3tqov6L33aqmEOi+xi8JgbT/PLk5
-c/c1AoGBAI1A/02ryksW6/wc7/6SP2M2rTy4m1sD/GnrTc67EHnRcVBdKO6qH2RY
-nqC8YcveC2ZghgPTDsA3VGuzuBXpwY6wTyV99q6jxQJ6/xcrD9/NUG6Uwv/xfCxl
-IJLeBYEqQundSSny3VtaAUK8Ul1nxpTvVRNwtcyWTo8RHAAyNPWd
------END RSA PRIVATE KEY-----
diff --git a/installer/vendor/golang.org/x/net/http2/h2i/README.md b/installer/vendor/golang.org/x/net/http2/h2i/README.md
deleted file mode 100644
index fb5c5efb0f..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2i/README.md
+++ /dev/null
@@ -1,97 +0,0 @@
-# h2i
-
-**h2i** is an interactive HTTP/2 ("h2") console debugger. Miss the good ol'
-days of telnetting to your HTTP/1.n servers? We're bringing you
-back.
-
-Features:
-- send raw HTTP/2 frames
- - PING
- - SETTINGS
- - HEADERS
- - etc
-- type in HTTP/1.n and have it auto-HPACK/frame-ify it for HTTP/2
-- pretty print all received HTTP/2 frames from the peer (including HPACK decoding)
-- tab completion of commands, options
-
-Not yet features, but soon:
-- unnecessary CONTINUATION frames on short boundaries, to test peer implementations 
-- request bodies (DATA frames)
-- send invalid frames for testing server implementations (supported by underlying Framer)
-
-Later:
-- act like a server
-
-## Installation
-
-```
-$ go get golang.org/x/net/http2/h2i
-$ h2i <host>
-```
-
-## Demo
-
-```
-$ h2i
-Usage: h2i <hostname>
-  
-  -insecure
-        Whether to skip TLS cert validation
-  -nextproto string
-        Comma-separated list of NPN/ALPN protocol names to negotiate. (default "h2,h2-14")
-
-$ h2i google.com
-Connecting to google.com:443 ...
-Connected to 74.125.224.41:443
-Negotiated protocol "h2-14"
-[FrameHeader SETTINGS len=18]
-  [MAX_CONCURRENT_STREAMS = 100]
-  [INITIAL_WINDOW_SIZE = 1048576]
-  [MAX_FRAME_SIZE = 16384]
-[FrameHeader WINDOW_UPDATE len=4]
-  Window-Increment = 983041
-  
-h2i> PING h2iSayHI
-[FrameHeader PING flags=ACK len=8]
-  Data = "h2iSayHI"
-h2i> headers
-(as HTTP/1.1)> GET / HTTP/1.1
-(as HTTP/1.1)> Host: ip.appspot.com
-(as HTTP/1.1)> User-Agent: h2i/brad-n-blake
-(as HTTP/1.1)>  
-Opening Stream-ID 1:
- :authority = ip.appspot.com
- :method = GET
- :path = /
- :scheme = https
- user-agent = h2i/brad-n-blake
-[FrameHeader HEADERS flags=END_HEADERS stream=1 len=77]
-  :status = "200"
-  alternate-protocol = "443:quic,p=1"
-  content-length = "15"
-  content-type = "text/html"
-  date = "Fri, 01 May 2015 23:06:56 GMT"
-  server = "Google Frontend"
-[FrameHeader DATA flags=END_STREAM stream=1 len=15]
-  "173.164.155.78\n"
-[FrameHeader PING len=8]
-  Data = "\x00\x00\x00\x00\x00\x00\x00\x00"
-h2i> ping  
-[FrameHeader PING flags=ACK len=8]  
-  Data = "h2i_ping"  
-h2i> ping  
-[FrameHeader PING flags=ACK len=8]
-  Data = "h2i_ping"
-h2i> ping
-[FrameHeader GOAWAY len=22]
-  Last-Stream-ID = 1; Error-Code = PROTOCOL_ERROR (1)
-
-ReadFrame: EOF
-```
-
-## Status
-
-Quick few hour hack. So much yet to do. Feel free to file issues for
-bugs or wishlist items, but [@bmizerany](https://github.com/bmizerany/)
-and I aren't yet accepting pull requests until things settle down.
-
diff --git a/installer/vendor/golang.org/x/net/http2/h2i/h2i.go b/installer/vendor/golang.org/x/net/http2/h2i/h2i.go
deleted file mode 100644
index 76c778711c..0000000000
--- a/installer/vendor/golang.org/x/net/http2/h2i/h2i.go
+++ /dev/null
@@ -1,509 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9,!solaris
-
-/*
-The h2i command is an interactive HTTP/2 console.
-
-Usage:
-  $ h2i [flags] <hostname>
-
-Interactive commands in the console: (all parts case-insensitive)
-
-  ping [data]
-  settings ack
-  settings FOO=n BAR=z
-  headers      (open a new stream by typing HTTP/1.1)
-*/
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"golang.org/x/crypto/ssh/terminal"
-	"golang.org/x/net/http2"
-	"golang.org/x/net/http2/hpack"
-)
-
-// Flags
-var (
-	flagNextProto = flag.String("nextproto", "h2,h2-14", "Comma-separated list of NPN/ALPN protocol names to negotiate.")
-	flagInsecure  = flag.Bool("insecure", false, "Whether to skip TLS cert validation")
-	flagSettings  = flag.String("settings", "empty", "comma-separated list of KEY=value settings for the initial SETTINGS frame. The magic value 'empty' sends an empty initial settings frame, and the magic value 'omit' causes no initial settings frame to be sent.")
-)
-
-type command struct {
-	run func(*h2i, []string) error // required
-
-	// complete optionally specifies tokens (case-insensitive) which are
-	// valid for this subcommand.
-	complete func() []string
-}
-
-var commands = map[string]command{
-	"ping": {run: (*h2i).cmdPing},
-	"settings": {
-		run: (*h2i).cmdSettings,
-		complete: func() []string {
-			return []string{
-				"ACK",
-				http2.SettingHeaderTableSize.String(),
-				http2.SettingEnablePush.String(),
-				http2.SettingMaxConcurrentStreams.String(),
-				http2.SettingInitialWindowSize.String(),
-				http2.SettingMaxFrameSize.String(),
-				http2.SettingMaxHeaderListSize.String(),
-			}
-		},
-	},
-	"quit":    {run: (*h2i).cmdQuit},
-	"headers": {run: (*h2i).cmdHeaders},
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "Usage: h2i <hostname>\n\n")
-	flag.PrintDefaults()
-}
-
-// withPort adds ":443" if another port isn't already present.
-func withPort(host string) string {
-	if _, _, err := net.SplitHostPort(host); err != nil {
-		return net.JoinHostPort(host, "443")
-	}
-	return host
-}
-
-// withoutPort strips the port from addr if present.
-func withoutPort(addr string) string {
-	if h, _, err := net.SplitHostPort(addr); err == nil {
-		return h
-	}
-	return addr
-}
-
-// h2i is the app's state.
-type h2i struct {
-	host   string
-	tc     *tls.Conn
-	framer *http2.Framer
-	term   *terminal.Terminal
-
-	// owned by the command loop:
-	streamID uint32
-	hbuf     bytes.Buffer
-	henc     *hpack.Encoder
-
-	// owned by the readFrames loop:
-	peerSetting map[http2.SettingID]uint32
-	hdec        *hpack.Decoder
-}
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-	if flag.NArg() != 1 {
-		usage()
-		os.Exit(2)
-	}
-	log.SetFlags(0)
-
-	host := flag.Arg(0)
-	app := &h2i{
-		host:        host,
-		peerSetting: make(map[http2.SettingID]uint32),
-	}
-	app.henc = hpack.NewEncoder(&app.hbuf)
-
-	if err := app.Main(); err != nil {
-		if app.term != nil {
-			app.logf("%v\n", err)
-		} else {
-			fmt.Fprintf(os.Stderr, "%v\n", err)
-		}
-		os.Exit(1)
-	}
-	fmt.Fprintf(os.Stdout, "\n")
-}
-
-func (app *h2i) Main() error {
-	cfg := &tls.Config{
-		ServerName:         withoutPort(app.host),
-		NextProtos:         strings.Split(*flagNextProto, ","),
-		InsecureSkipVerify: *flagInsecure,
-	}
-
-	hostAndPort := withPort(app.host)
-	log.Printf("Connecting to %s ...", hostAndPort)
-	tc, err := tls.Dial("tcp", hostAndPort, cfg)
-	if err != nil {
-		return fmt.Errorf("Error dialing %s: %v", withPort(app.host), err)
-	}
-	log.Printf("Connected to %v", tc.RemoteAddr())
-	defer tc.Close()
-
-	if err := tc.Handshake(); err != nil {
-		return fmt.Errorf("TLS handshake: %v", err)
-	}
-	if !*flagInsecure {
-		if err := tc.VerifyHostname(app.host); err != nil {
-			return fmt.Errorf("VerifyHostname: %v", err)
-		}
-	}
-	state := tc.ConnectionState()
-	log.Printf("Negotiated protocol %q", state.NegotiatedProtocol)
-	if !state.NegotiatedProtocolIsMutual || state.NegotiatedProtocol == "" {
-		return fmt.Errorf("Could not negotiate protocol mutually")
-	}
-
-	if _, err := io.WriteString(tc, http2.ClientPreface); err != nil {
-		return err
-	}
-
-	app.framer = http2.NewFramer(tc, tc)
-
-	oldState, err := terminal.MakeRaw(int(os.Stdin.Fd()))
-	if err != nil {
-		return err
-	}
-	defer terminal.Restore(0, oldState)
-
-	var screen = struct {
-		io.Reader
-		io.Writer
-	}{os.Stdin, os.Stdout}
-
-	app.term = terminal.NewTerminal(screen, "h2i> ")
-	lastWord := regexp.MustCompile(`.+\W(\w+)$`)
-	app.term.AutoCompleteCallback = func(line string, pos int, key rune) (newLine string, newPos int, ok bool) {
-		if key != '\t' {
-			return
-		}
-		if pos != len(line) {
-			// TODO: we're being lazy for now, only supporting tab completion at the end.
-			return
-		}
-		// Auto-complete for the command itself.
-		if !strings.Contains(line, " ") {
-			var name string
-			name, _, ok = lookupCommand(line)
-			if !ok {
-				return
-			}
-			return name, len(name), true
-		}
-		_, c, ok := lookupCommand(line[:strings.IndexByte(line, ' ')])
-		if !ok || c.complete == nil {
-			return
-		}
-		if strings.HasSuffix(line, " ") {
-			app.logf("%s", strings.Join(c.complete(), " "))
-			return line, pos, true
-		}
-		m := lastWord.FindStringSubmatch(line)
-		if m == nil {
-			return line, len(line), true
-		}
-		soFar := m[1]
-		var match []string
-		for _, cand := range c.complete() {
-			if len(soFar) > len(cand) || !strings.EqualFold(cand[:len(soFar)], soFar) {
-				continue
-			}
-			match = append(match, cand)
-		}
-		if len(match) == 0 {
-			return
-		}
-		if len(match) > 1 {
-			// TODO: auto-complete any common prefix
-			app.logf("%s", strings.Join(match, " "))
-			return line, pos, true
-		}
-		newLine = line[:len(line)-len(soFar)] + match[0]
-		return newLine, len(newLine), true
-
-	}
-
-	errc := make(chan error, 2)
-	go func() { errc <- app.readFrames() }()
-	go func() { errc <- app.readConsole() }()
-	return <-errc
-}
-
-func (app *h2i) logf(format string, args ...interface{}) {
-	fmt.Fprintf(app.term, format+"\r\n", args...)
-}
-
-func (app *h2i) readConsole() error {
-	if s := *flagSettings; s != "omit" {
-		var args []string
-		if s != "empty" {
-			args = strings.Split(s, ",")
-		}
-		_, c, ok := lookupCommand("settings")
-		if !ok {
-			panic("settings command not found")
-		}
-		c.run(app, args)
-	}
-
-	for {
-		line, err := app.term.ReadLine()
-		if err == io.EOF {
-			return nil
-		}
-		if err != nil {
-			return fmt.Errorf("terminal.ReadLine: %v", err)
-		}
-		f := strings.Fields(line)
-		if len(f) == 0 {
-			continue
-		}
-		cmd, args := f[0], f[1:]
-		if _, c, ok := lookupCommand(cmd); ok {
-			err = c.run(app, args)
-		} else {
-			app.logf("Unknown command %q", line)
-		}
-		if err == errExitApp {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-	}
-}
-
-func lookupCommand(prefix string) (name string, c command, ok bool) {
-	prefix = strings.ToLower(prefix)
-	if c, ok = commands[prefix]; ok {
-		return prefix, c, ok
-	}
-
-	for full, candidate := range commands {
-		if strings.HasPrefix(full, prefix) {
-			if c.run != nil {
-				return "", command{}, false // ambiguous
-			}
-			c = candidate
-			name = full
-		}
-	}
-	return name, c, c.run != nil
-}
-
-var errExitApp = errors.New("internal sentinel error value to quit the console reading loop")
-
-func (a *h2i) cmdQuit(args []string) error {
-	if len(args) > 0 {
-		a.logf("the QUIT command takes no argument")
-		return nil
-	}
-	return errExitApp
-}
-
-func (a *h2i) cmdSettings(args []string) error {
-	if len(args) == 1 && strings.EqualFold(args[0], "ACK") {
-		return a.framer.WriteSettingsAck()
-	}
-	var settings []http2.Setting
-	for _, arg := range args {
-		if strings.EqualFold(arg, "ACK") {
-			a.logf("Error: ACK must be only argument with the SETTINGS command")
-			return nil
-		}
-		eq := strings.Index(arg, "=")
-		if eq == -1 {
-			a.logf("Error: invalid argument %q (expected SETTING_NAME=nnnn)", arg)
-			return nil
-		}
-		sid, ok := settingByName(arg[:eq])
-		if !ok {
-			a.logf("Error: unknown setting name %q", arg[:eq])
-			return nil
-		}
-		val, err := strconv.ParseUint(arg[eq+1:], 10, 32)
-		if err != nil {
-			a.logf("Error: invalid argument %q (expected SETTING_NAME=nnnn)", arg)
-			return nil
-		}
-		settings = append(settings, http2.Setting{
-			ID:  sid,
-			Val: uint32(val),
-		})
-	}
-	a.logf("Sending: %v", settings)
-	return a.framer.WriteSettings(settings...)
-}
-
-func settingByName(name string) (http2.SettingID, bool) {
-	for _, sid := range [...]http2.SettingID{
-		http2.SettingHeaderTableSize,
-		http2.SettingEnablePush,
-		http2.SettingMaxConcurrentStreams,
-		http2.SettingInitialWindowSize,
-		http2.SettingMaxFrameSize,
-		http2.SettingMaxHeaderListSize,
-	} {
-		if strings.EqualFold(sid.String(), name) {
-			return sid, true
-		}
-	}
-	return 0, false
-}
-
-func (app *h2i) cmdPing(args []string) error {
-	if len(args) > 1 {
-		app.logf("invalid PING usage: only accepts 0 or 1 args")
-		return nil // nil means don't end the program
-	}
-	var data [8]byte
-	if len(args) == 1 {
-		copy(data[:], args[0])
-	} else {
-		copy(data[:], "h2i_ping")
-	}
-	return app.framer.WritePing(false, data)
-}
-
-func (app *h2i) cmdHeaders(args []string) error {
-	if len(args) > 0 {
-		app.logf("Error: HEADERS doesn't yet take arguments.")
-		// TODO: flags for restricting window size, to force CONTINUATION
-		// frames.
-		return nil
-	}
-	var h1req bytes.Buffer
-	app.term.SetPrompt("(as HTTP/1.1)> ")
-	defer app.term.SetPrompt("h2i> ")
-	for {
-		line, err := app.term.ReadLine()
-		if err != nil {
-			return err
-		}
-		h1req.WriteString(line)
-		h1req.WriteString("\r\n")
-		if line == "" {
-			break
-		}
-	}
-	req, err := http.ReadRequest(bufio.NewReader(&h1req))
-	if err != nil {
-		app.logf("Invalid HTTP/1.1 request: %v", err)
-		return nil
-	}
-	if app.streamID == 0 {
-		app.streamID = 1
-	} else {
-		app.streamID += 2
-	}
-	app.logf("Opening Stream-ID %d:", app.streamID)
-	hbf := app.encodeHeaders(req)
-	if len(hbf) > 16<<10 {
-		app.logf("TODO: h2i doesn't yet write CONTINUATION frames. Copy it from transport.go")
-		return nil
-	}
-	return app.framer.WriteHeaders(http2.HeadersFrameParam{
-		StreamID:      app.streamID,
-		BlockFragment: hbf,
-		EndStream:     req.Method == "GET" || req.Method == "HEAD", // good enough for now
-		EndHeaders:    true,                                        // for now
-	})
-}
-
-func (app *h2i) readFrames() error {
-	for {
-		f, err := app.framer.ReadFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame: %v", err)
-		}
-		app.logf("%v", f)
-		switch f := f.(type) {
-		case *http2.PingFrame:
-			app.logf("  Data = %q", f.Data)
-		case *http2.SettingsFrame:
-			f.ForeachSetting(func(s http2.Setting) error {
-				app.logf("  %v", s)
-				app.peerSetting[s.ID] = s.Val
-				return nil
-			})
-		case *http2.WindowUpdateFrame:
-			app.logf("  Window-Increment = %v", f.Increment)
-		case *http2.GoAwayFrame:
-			app.logf("  Last-Stream-ID = %d; Error-Code = %v (%d)", f.LastStreamID, f.ErrCode, f.ErrCode)
-		case *http2.DataFrame:
-			app.logf("  %q", f.Data())
-		case *http2.HeadersFrame:
-			if f.HasPriority() {
-				app.logf("  PRIORITY = %v", f.Priority)
-			}
-			if app.hdec == nil {
-				// TODO: if the user uses h2i to send a SETTINGS frame advertising
-				// something larger, we'll need to respect SETTINGS_HEADER_TABLE_SIZE
-				// and stuff here instead of using the 4k default. But for now:
-				tableSize := uint32(4 << 10)
-				app.hdec = hpack.NewDecoder(tableSize, app.onNewHeaderField)
-			}
-			app.hdec.Write(f.HeaderBlockFragment())
-		}
-	}
-}
-
-// called from readLoop
-func (app *h2i) onNewHeaderField(f hpack.HeaderField) {
-	if f.Sensitive {
-		app.logf("  %s = %q (SENSITIVE)", f.Name, f.Value)
-	}
-	app.logf("  %s = %q", f.Name, f.Value)
-}
-
-func (app *h2i) encodeHeaders(req *http.Request) []byte {
-	app.hbuf.Reset()
-
-	// TODO(bradfitz): figure out :authority-vs-Host stuff between http2 and Go
-	host := req.Host
-	if host == "" {
-		host = req.URL.Host
-	}
-
-	path := req.RequestURI
-	if path == "" {
-		path = "/"
-	}
-
-	app.writeHeader(":authority", host) // probably not right for all sites
-	app.writeHeader(":method", req.Method)
-	app.writeHeader(":path", path)
-	app.writeHeader(":scheme", "https")
-
-	for k, vv := range req.Header {
-		lowKey := strings.ToLower(k)
-		if lowKey == "host" {
-			continue
-		}
-		for _, v := range vv {
-			app.writeHeader(lowKey, v)
-		}
-	}
-	return app.hbuf.Bytes()
-}
-
-func (app *h2i) writeHeader(name, value string) {
-	app.henc.WriteField(hpack.HeaderField{Name: name, Value: value})
-	app.logf(" %s = %s", name, value)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/headermap.go b/installer/vendor/golang.org/x/net/http2/headermap.go
deleted file mode 100644
index c2805f6ac4..0000000000
--- a/installer/vendor/golang.org/x/net/http2/headermap.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"net/http"
-	"strings"
-)
-
-var (
-	commonLowerHeader = map[string]string{} // Go-Canonical-Case -> lower-case
-	commonCanonHeader = map[string]string{} // lower-case -> Go-Canonical-Case
-)
-
-func init() {
-	for _, v := range []string{
-		"accept",
-		"accept-charset",
-		"accept-encoding",
-		"accept-language",
-		"accept-ranges",
-		"age",
-		"access-control-allow-origin",
-		"allow",
-		"authorization",
-		"cache-control",
-		"content-disposition",
-		"content-encoding",
-		"content-language",
-		"content-length",
-		"content-location",
-		"content-range",
-		"content-type",
-		"cookie",
-		"date",
-		"etag",
-		"expect",
-		"expires",
-		"from",
-		"host",
-		"if-match",
-		"if-modified-since",
-		"if-none-match",
-		"if-unmodified-since",
-		"last-modified",
-		"link",
-		"location",
-		"max-forwards",
-		"proxy-authenticate",
-		"proxy-authorization",
-		"range",
-		"referer",
-		"refresh",
-		"retry-after",
-		"server",
-		"set-cookie",
-		"strict-transport-security",
-		"trailer",
-		"transfer-encoding",
-		"user-agent",
-		"vary",
-		"via",
-		"www-authenticate",
-	} {
-		chk := http.CanonicalHeaderKey(v)
-		commonLowerHeader[chk] = v
-		commonCanonHeader[v] = chk
-	}
-}
-
-func lowerHeader(v string) string {
-	if s, ok := commonLowerHeader[v]; ok {
-		return s
-	}
-	return strings.ToLower(v)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/encode.go b/installer/vendor/golang.org/x/net/http2/hpack/encode.go
deleted file mode 100644
index 54726c2a3c..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/encode.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"io"
-)
-
-const (
-	uint32Max              = ^uint32(0)
-	initialHeaderTableSize = 4096
-)
-
-type Encoder struct {
-	dynTab dynamicTable
-	// minSize is the minimum table size set by
-	// SetMaxDynamicTableSize after the previous Header Table Size
-	// Update.
-	minSize uint32
-	// maxSizeLimit is the maximum table size this encoder
-	// supports. This will protect the encoder from too large
-	// size.
-	maxSizeLimit uint32
-	// tableSizeUpdate indicates whether "Header Table Size
-	// Update" is required.
-	tableSizeUpdate bool
-	w               io.Writer
-	buf             []byte
-}
-
-// NewEncoder returns a new Encoder which performs HPACK encoding. An
-// encoded data is written to w.
-func NewEncoder(w io.Writer) *Encoder {
-	e := &Encoder{
-		minSize:         uint32Max,
-		maxSizeLimit:    initialHeaderTableSize,
-		tableSizeUpdate: false,
-		w:               w,
-	}
-	e.dynTab.table.init()
-	e.dynTab.setMaxSize(initialHeaderTableSize)
-	return e
-}
-
-// WriteField encodes f into a single Write to e's underlying Writer.
-// This function may also produce bytes for "Header Table Size Update"
-// if necessary. If produced, it is done before encoding f.
-func (e *Encoder) WriteField(f HeaderField) error {
-	e.buf = e.buf[:0]
-
-	if e.tableSizeUpdate {
-		e.tableSizeUpdate = false
-		if e.minSize < e.dynTab.maxSize {
-			e.buf = appendTableSize(e.buf, e.minSize)
-		}
-		e.minSize = uint32Max
-		e.buf = appendTableSize(e.buf, e.dynTab.maxSize)
-	}
-
-	idx, nameValueMatch := e.searchTable(f)
-	if nameValueMatch {
-		e.buf = appendIndexed(e.buf, idx)
-	} else {
-		indexing := e.shouldIndex(f)
-		if indexing {
-			e.dynTab.add(f)
-		}
-
-		if idx == 0 {
-			e.buf = appendNewName(e.buf, f, indexing)
-		} else {
-			e.buf = appendIndexedName(e.buf, f, idx, indexing)
-		}
-	}
-	n, err := e.w.Write(e.buf)
-	if err == nil && n != len(e.buf) {
-		err = io.ErrShortWrite
-	}
-	return err
-}
-
-// searchTable searches f in both stable and dynamic header tables.
-// The static header table is searched first. Only when there is no
-// exact match for both name and value, the dynamic header table is
-// then searched. If there is no match, i is 0. If both name and value
-// match, i is the matched index and nameValueMatch becomes true. If
-// only name matches, i points to that index and nameValueMatch
-// becomes false.
-func (e *Encoder) searchTable(f HeaderField) (i uint64, nameValueMatch bool) {
-	i, nameValueMatch = staticTable.search(f)
-	if nameValueMatch {
-		return i, true
-	}
-
-	j, nameValueMatch := e.dynTab.table.search(f)
-	if nameValueMatch || (i == 0 && j != 0) {
-		return j + uint64(staticTable.len()), nameValueMatch
-	}
-
-	return i, false
-}
-
-// SetMaxDynamicTableSize changes the dynamic header table size to v.
-// The actual size is bounded by the value passed to
-// SetMaxDynamicTableSizeLimit.
-func (e *Encoder) SetMaxDynamicTableSize(v uint32) {
-	if v > e.maxSizeLimit {
-		v = e.maxSizeLimit
-	}
-	if v < e.minSize {
-		e.minSize = v
-	}
-	e.tableSizeUpdate = true
-	e.dynTab.setMaxSize(v)
-}
-
-// SetMaxDynamicTableSizeLimit changes the maximum value that can be
-// specified in SetMaxDynamicTableSize to v. By default, it is set to
-// 4096, which is the same size of the default dynamic header table
-// size described in HPACK specification. If the current maximum
-// dynamic header table size is strictly greater than v, "Header Table
-// Size Update" will be done in the next WriteField call and the
-// maximum dynamic header table size is truncated to v.
-func (e *Encoder) SetMaxDynamicTableSizeLimit(v uint32) {
-	e.maxSizeLimit = v
-	if e.dynTab.maxSize > v {
-		e.tableSizeUpdate = true
-		e.dynTab.setMaxSize(v)
-	}
-}
-
-// shouldIndex reports whether f should be indexed.
-func (e *Encoder) shouldIndex(f HeaderField) bool {
-	return !f.Sensitive && f.Size() <= e.dynTab.maxSize
-}
-
-// appendIndexed appends index i, as encoded in "Indexed Header Field"
-// representation, to dst and returns the extended buffer.
-func appendIndexed(dst []byte, i uint64) []byte {
-	first := len(dst)
-	dst = appendVarInt(dst, 7, i)
-	dst[first] |= 0x80
-	return dst
-}
-
-// appendNewName appends f, as encoded in one of "Literal Header field
-// - New Name" representation variants, to dst and returns the
-// extended buffer.
-//
-// If f.Sensitive is true, "Never Indexed" representation is used. If
-// f.Sensitive is false and indexing is true, "Inremental Indexing"
-// representation is used.
-func appendNewName(dst []byte, f HeaderField, indexing bool) []byte {
-	dst = append(dst, encodeTypeByte(indexing, f.Sensitive))
-	dst = appendHpackString(dst, f.Name)
-	return appendHpackString(dst, f.Value)
-}
-
-// appendIndexedName appends f and index i referring indexed name
-// entry, as encoded in one of "Literal Header field - Indexed Name"
-// representation variants, to dst and returns the extended buffer.
-//
-// If f.Sensitive is true, "Never Indexed" representation is used. If
-// f.Sensitive is false and indexing is true, "Incremental Indexing"
-// representation is used.
-func appendIndexedName(dst []byte, f HeaderField, i uint64, indexing bool) []byte {
-	first := len(dst)
-	var n byte
-	if indexing {
-		n = 6
-	} else {
-		n = 4
-	}
-	dst = appendVarInt(dst, n, i)
-	dst[first] |= encodeTypeByte(indexing, f.Sensitive)
-	return appendHpackString(dst, f.Value)
-}
-
-// appendTableSize appends v, as encoded in "Header Table Size Update"
-// representation, to dst and returns the extended buffer.
-func appendTableSize(dst []byte, v uint32) []byte {
-	first := len(dst)
-	dst = appendVarInt(dst, 5, uint64(v))
-	dst[first] |= 0x20
-	return dst
-}
-
-// appendVarInt appends i, as encoded in variable integer form using n
-// bit prefix, to dst and returns the extended buffer.
-//
-// See
-// http://http2.github.io/http2-spec/compression.html#integer.representation
-func appendVarInt(dst []byte, n byte, i uint64) []byte {
-	k := uint64((1 << n) - 1)
-	if i < k {
-		return append(dst, byte(i))
-	}
-	dst = append(dst, byte(k))
-	i -= k
-	for ; i >= 128; i >>= 7 {
-		dst = append(dst, byte(0x80|(i&0x7f)))
-	}
-	return append(dst, byte(i))
-}
-
-// appendHpackString appends s, as encoded in "String Literal"
-// representation, to dst and returns the the extended buffer.
-//
-// s will be encoded in Huffman codes only when it produces strictly
-// shorter byte string.
-func appendHpackString(dst []byte, s string) []byte {
-	huffmanLength := HuffmanEncodeLength(s)
-	if huffmanLength < uint64(len(s)) {
-		first := len(dst)
-		dst = appendVarInt(dst, 7, huffmanLength)
-		dst = AppendHuffmanString(dst, s)
-		dst[first] |= 0x80
-	} else {
-		dst = appendVarInt(dst, 7, uint64(len(s)))
-		dst = append(dst, s...)
-	}
-	return dst
-}
-
-// encodeTypeByte returns type byte. If sensitive is true, type byte
-// for "Never Indexed" representation is returned. If sensitive is
-// false and indexing is true, type byte for "Incremental Indexing"
-// representation is returned. Otherwise, type byte for "Without
-// Indexing" is returned.
-func encodeTypeByte(indexing, sensitive bool) byte {
-	if sensitive {
-		return 0x10
-	}
-	if indexing {
-		return 0x40
-	}
-	return 0
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/encode_test.go b/installer/vendor/golang.org/x/net/http2/hpack/encode_test.go
deleted file mode 100644
index 05f12db9cd..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/encode_test.go
+++ /dev/null
@@ -1,386 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestEncoderTableSizeUpdate(t *testing.T) {
-	tests := []struct {
-		size1, size2 uint32
-		wantHex      string
-	}{
-		// Should emit 2 table size updates (2048 and 4096)
-		{2048, 4096, "3fe10f 3fe11f 82"},
-
-		// Should emit 1 table size update (2048)
-		{16384, 2048, "3fe10f 82"},
-	}
-	for _, tt := range tests {
-		var buf bytes.Buffer
-		e := NewEncoder(&buf)
-		e.SetMaxDynamicTableSize(tt.size1)
-		e.SetMaxDynamicTableSize(tt.size2)
-		if err := e.WriteField(pair(":method", "GET")); err != nil {
-			t.Fatal(err)
-		}
-		want := removeSpace(tt.wantHex)
-		if got := hex.EncodeToString(buf.Bytes()); got != want {
-			t.Errorf("e.SetDynamicTableSize %v, %v = %q; want %q", tt.size1, tt.size2, got, want)
-		}
-	}
-}
-
-func TestEncoderWriteField(t *testing.T) {
-	var buf bytes.Buffer
-	e := NewEncoder(&buf)
-	var got []HeaderField
-	d := NewDecoder(4<<10, func(f HeaderField) {
-		got = append(got, f)
-	})
-
-	tests := []struct {
-		hdrs []HeaderField
-	}{
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "http"),
-			pair(":path", "/"),
-			pair(":authority", "www.example.com"),
-		}},
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "http"),
-			pair(":path", "/"),
-			pair(":authority", "www.example.com"),
-			pair("cache-control", "no-cache"),
-		}},
-		{[]HeaderField{
-			pair(":method", "GET"),
-			pair(":scheme", "https"),
-			pair(":path", "/index.html"),
-			pair(":authority", "www.example.com"),
-			pair("custom-key", "custom-value"),
-		}},
-	}
-	for i, tt := range tests {
-		buf.Reset()
-		got = got[:0]
-		for _, hf := range tt.hdrs {
-			if err := e.WriteField(hf); err != nil {
-				t.Fatal(err)
-			}
-		}
-		_, err := d.Write(buf.Bytes())
-		if err != nil {
-			t.Errorf("%d. Decoder Write = %v", i, err)
-		}
-		if !reflect.DeepEqual(got, tt.hdrs) {
-			t.Errorf("%d. Decoded %+v; want %+v", i, got, tt.hdrs)
-		}
-	}
-}
-
-func TestEncoderSearchTable(t *testing.T) {
-	e := NewEncoder(nil)
-
-	e.dynTab.add(pair("foo", "bar"))
-	e.dynTab.add(pair("blake", "miz"))
-	e.dynTab.add(pair(":method", "GET"))
-
-	tests := []struct {
-		hf        HeaderField
-		wantI     uint64
-		wantMatch bool
-	}{
-		// Name and Value match
-		{pair("foo", "bar"), uint64(staticTable.len()) + 3, true},
-		{pair("blake", "miz"), uint64(staticTable.len()) + 2, true},
-		{pair(":method", "GET"), 2, true},
-
-		// Only name match because Sensitive == true. This is allowed to match
-		// any ":method" entry. The current implementation uses the last entry
-		// added in newStaticTable.
-		{HeaderField{":method", "GET", true}, 3, false},
-
-		// Only Name matches
-		{pair("foo", "..."), uint64(staticTable.len()) + 3, false},
-		{pair("blake", "..."), uint64(staticTable.len()) + 2, false},
-		// As before, this is allowed to match any ":method" entry.
-		{pair(":method", "..."), 3, false},
-
-		// None match
-		{pair("foo-", "bar"), 0, false},
-	}
-	for _, tt := range tests {
-		if gotI, gotMatch := e.searchTable(tt.hf); gotI != tt.wantI || gotMatch != tt.wantMatch {
-			t.Errorf("d.search(%+v) = %v, %v; want %v, %v", tt.hf, gotI, gotMatch, tt.wantI, tt.wantMatch)
-		}
-	}
-}
-
-func TestAppendVarInt(t *testing.T) {
-	tests := []struct {
-		n    byte
-		i    uint64
-		want []byte
-	}{
-		// Fits in a byte:
-		{1, 0, []byte{0}},
-		{2, 2, []byte{2}},
-		{3, 6, []byte{6}},
-		{4, 14, []byte{14}},
-		{5, 30, []byte{30}},
-		{6, 62, []byte{62}},
-		{7, 126, []byte{126}},
-		{8, 254, []byte{254}},
-
-		// Multiple bytes:
-		{5, 1337, []byte{31, 154, 10}},
-	}
-	for _, tt := range tests {
-		got := appendVarInt(nil, tt.n, tt.i)
-		if !bytes.Equal(got, tt.want) {
-			t.Errorf("appendVarInt(nil, %v, %v) = %v; want %v", tt.n, tt.i, got, tt.want)
-		}
-	}
-}
-
-func TestAppendHpackString(t *testing.T) {
-	tests := []struct {
-		s, wantHex string
-	}{
-		// Huffman encoded
-		{"www.example.com", "8c f1e3 c2e5 f23a 6ba0 ab90 f4ff"},
-
-		// Not Huffman encoded
-		{"a", "01 61"},
-
-		// zero length
-		{"", "00"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendHpackString(nil, tt.s)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendHpackString(nil, %q) = %q; want %q", tt.s, got, want)
-		}
-	}
-}
-
-func TestAppendIndexed(t *testing.T) {
-	tests := []struct {
-		i       uint64
-		wantHex string
-	}{
-		// 1 byte
-		{1, "81"},
-		{126, "fe"},
-
-		// 2 bytes
-		{127, "ff00"},
-		{128, "ff01"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendIndexed(nil, tt.i)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendIndex(nil, %v) = %q; want %q", tt.i, got, want)
-		}
-	}
-}
-
-func TestAppendNewName(t *testing.T) {
-	tests := []struct {
-		f        HeaderField
-		indexing bool
-		wantHex  string
-	}{
-		// Incremental indexing
-		{HeaderField{"custom-key", "custom-value", false}, true, "40 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-
-		// Without indexing
-		{HeaderField{"custom-key", "custom-value", false}, false, "00 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-
-		// Never indexed
-		{HeaderField{"custom-key", "custom-value", true}, true, "10 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-		{HeaderField{"custom-key", "custom-value", true}, false, "10 88 25a8 49e9 5ba9 7d7f 89 25a8 49e9 5bb8 e8b4 bf"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendNewName(nil, tt.f, tt.indexing)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendNewName(nil, %+v, %v) = %q; want %q", tt.f, tt.indexing, got, want)
-		}
-	}
-}
-
-func TestAppendIndexedName(t *testing.T) {
-	tests := []struct {
-		f        HeaderField
-		i        uint64
-		indexing bool
-		wantHex  string
-	}{
-		// Incremental indexing
-		{HeaderField{":status", "302", false}, 8, true, "48 82 6402"},
-
-		// Without indexing
-		{HeaderField{":status", "302", false}, 8, false, "08 82 6402"},
-
-		// Never indexed
-		{HeaderField{":status", "302", true}, 8, true, "18 82 6402"},
-		{HeaderField{":status", "302", true}, 8, false, "18 82 6402"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendIndexedName(nil, tt.f, tt.i, tt.indexing)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendIndexedName(nil, %+v, %v) = %q; want %q", tt.f, tt.indexing, got, want)
-		}
-	}
-}
-
-func TestAppendTableSize(t *testing.T) {
-	tests := []struct {
-		i       uint32
-		wantHex string
-	}{
-		// Fits into 1 byte
-		{30, "3e"},
-
-		// Extra byte
-		{31, "3f00"},
-		{32, "3f01"},
-	}
-	for _, tt := range tests {
-		want := removeSpace(tt.wantHex)
-		buf := appendTableSize(nil, tt.i)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("appendTableSize(nil, %v) = %q; want %q", tt.i, got, want)
-		}
-	}
-}
-
-func TestEncoderSetMaxDynamicTableSize(t *testing.T) {
-	var buf bytes.Buffer
-	e := NewEncoder(&buf)
-	tests := []struct {
-		v           uint32
-		wantUpdate  bool
-		wantMinSize uint32
-		wantMaxSize uint32
-	}{
-		// Set new table size to 2048
-		{2048, true, 2048, 2048},
-
-		// Set new table size to 16384, but still limited to
-		// 4096
-		{16384, true, 2048, 4096},
-	}
-	for _, tt := range tests {
-		e.SetMaxDynamicTableSize(tt.v)
-		if got := e.tableSizeUpdate; tt.wantUpdate != got {
-			t.Errorf("e.tableSizeUpdate = %v; want %v", got, tt.wantUpdate)
-		}
-		if got := e.minSize; tt.wantMinSize != got {
-			t.Errorf("e.minSize = %v; want %v", got, tt.wantMinSize)
-		}
-		if got := e.dynTab.maxSize; tt.wantMaxSize != got {
-			t.Errorf("e.maxSize = %v; want %v", got, tt.wantMaxSize)
-		}
-	}
-}
-
-func TestEncoderSetMaxDynamicTableSizeLimit(t *testing.T) {
-	e := NewEncoder(nil)
-	// 4095 < initialHeaderTableSize means maxSize is truncated to
-	// 4095.
-	e.SetMaxDynamicTableSizeLimit(4095)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	if got, want := e.maxSizeLimit, uint32(4095); got != want {
-		t.Errorf("e.maxSizeLimit = %v; want %v", got, want)
-	}
-	if got, want := e.tableSizeUpdate, true; got != want {
-		t.Errorf("e.tableSizeUpdate = %v; want %v", got, want)
-	}
-	// maxSize will be truncated to maxSizeLimit
-	e.SetMaxDynamicTableSize(16384)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	// 8192 > current maxSizeLimit, so maxSize does not change.
-	e.SetMaxDynamicTableSizeLimit(8192)
-	if got, want := e.dynTab.maxSize, uint32(4095); got != want {
-		t.Errorf("e.dynTab.maxSize = %v; want %v", got, want)
-	}
-	if got, want := e.maxSizeLimit, uint32(8192); got != want {
-		t.Errorf("e.maxSizeLimit = %v; want %v", got, want)
-	}
-}
-
-func removeSpace(s string) string {
-	return strings.Replace(s, " ", "", -1)
-}
-
-func BenchmarkEncoderSearchTable(b *testing.B) {
-	e := NewEncoder(nil)
-
-	// A sample of possible header fields.
-	// This is not based on any actual data from HTTP/2 traces.
-	var possible []HeaderField
-	for _, f := range staticTable.ents {
-		if f.Value == "" {
-			possible = append(possible, f)
-			continue
-		}
-		// Generate 5 random values, except for cookie and set-cookie,
-		// which we know can have many values in practice.
-		num := 5
-		if f.Name == "cookie" || f.Name == "set-cookie" {
-			num = 25
-		}
-		for i := 0; i < num; i++ {
-			f.Value = fmt.Sprintf("%s-%d", f.Name, i)
-			possible = append(possible, f)
-		}
-	}
-	for k := 0; k < 10; k++ {
-		f := HeaderField{
-			Name:      fmt.Sprintf("x-header-%d", k),
-			Sensitive: rand.Int()%2 == 0,
-		}
-		for i := 0; i < 5; i++ {
-			f.Value = fmt.Sprintf("%s-%d", f.Name, i)
-			possible = append(possible, f)
-		}
-	}
-
-	// Add a random sample to the dynamic table. This very loosely simulates
-	// a history of 100 requests with 20 header fields per request.
-	for r := 0; r < 100*20; r++ {
-		f := possible[rand.Int31n(int32(len(possible)))]
-		// Skip if this is in the staticTable verbatim.
-		if _, has := staticTable.search(f); !has {
-			e.dynTab.add(f)
-		}
-	}
-
-	b.ResetTimer()
-	for n := 0; n < b.N; n++ {
-		for _, f := range possible {
-			e.searchTable(f)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/hpack.go b/installer/vendor/golang.org/x/net/http2/hpack/hpack.go
deleted file mode 100644
index 176644acda..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/hpack.go
+++ /dev/null
@@ -1,490 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package hpack implements HPACK, a compression format for
-// efficiently representing HTTP header fields in the context of HTTP/2.
-//
-// See http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-09
-package hpack
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-)
-
-// A DecodingError is something the spec defines as a decoding error.
-type DecodingError struct {
-	Err error
-}
-
-func (de DecodingError) Error() string {
-	return fmt.Sprintf("decoding error: %v", de.Err)
-}
-
-// An InvalidIndexError is returned when an encoder references a table
-// entry before the static table or after the end of the dynamic table.
-type InvalidIndexError int
-
-func (e InvalidIndexError) Error() string {
-	return fmt.Sprintf("invalid indexed representation index %d", int(e))
-}
-
-// A HeaderField is a name-value pair. Both the name and value are
-// treated as opaque sequences of octets.
-type HeaderField struct {
-	Name, Value string
-
-	// Sensitive means that this header field should never be
-	// indexed.
-	Sensitive bool
-}
-
-// IsPseudo reports whether the header field is an http2 pseudo header.
-// That is, it reports whether it starts with a colon.
-// It is not otherwise guaranteed to be a valid pseudo header field,
-// though.
-func (hf HeaderField) IsPseudo() bool {
-	return len(hf.Name) != 0 && hf.Name[0] == ':'
-}
-
-func (hf HeaderField) String() string {
-	var suffix string
-	if hf.Sensitive {
-		suffix = " (sensitive)"
-	}
-	return fmt.Sprintf("header field %q = %q%s", hf.Name, hf.Value, suffix)
-}
-
-// Size returns the size of an entry per RFC 7541 section 4.1.
-func (hf HeaderField) Size() uint32 {
-	// http://http2.github.io/http2-spec/compression.html#rfc.section.4.1
-	// "The size of the dynamic table is the sum of the size of
-	// its entries. The size of an entry is the sum of its name's
-	// length in octets (as defined in Section 5.2), its value's
-	// length in octets (see Section 5.2), plus 32.  The size of
-	// an entry is calculated using the length of the name and
-	// value without any Huffman encoding applied."
-
-	// This can overflow if somebody makes a large HeaderField
-	// Name and/or Value by hand, but we don't care, because that
-	// won't happen on the wire because the encoding doesn't allow
-	// it.
-	return uint32(len(hf.Name) + len(hf.Value) + 32)
-}
-
-// A Decoder is the decoding context for incremental processing of
-// header blocks.
-type Decoder struct {
-	dynTab dynamicTable
-	emit   func(f HeaderField)
-
-	emitEnabled bool // whether calls to emit are enabled
-	maxStrLen   int  // 0 means unlimited
-
-	// buf is the unparsed buffer. It's only written to
-	// saveBuf if it was truncated in the middle of a header
-	// block. Because it's usually not owned, we can only
-	// process it under Write.
-	buf []byte // not owned; only valid during Write
-
-	// saveBuf is previous data passed to Write which we weren't able
-	// to fully parse before. Unlike buf, we own this data.
-	saveBuf bytes.Buffer
-}
-
-// NewDecoder returns a new decoder with the provided maximum dynamic
-// table size. The emitFunc will be called for each valid field
-// parsed, in the same goroutine as calls to Write, before Write returns.
-func NewDecoder(maxDynamicTableSize uint32, emitFunc func(f HeaderField)) *Decoder {
-	d := &Decoder{
-		emit:        emitFunc,
-		emitEnabled: true,
-	}
-	d.dynTab.table.init()
-	d.dynTab.allowedMaxSize = maxDynamicTableSize
-	d.dynTab.setMaxSize(maxDynamicTableSize)
-	return d
-}
-
-// ErrStringLength is returned by Decoder.Write when the max string length
-// (as configured by Decoder.SetMaxStringLength) would be violated.
-var ErrStringLength = errors.New("hpack: string too long")
-
-// SetMaxStringLength sets the maximum size of a HeaderField name or
-// value string. If a string exceeds this length (even after any
-// decompression), Write will return ErrStringLength.
-// A value of 0 means unlimited and is the default from NewDecoder.
-func (d *Decoder) SetMaxStringLength(n int) {
-	d.maxStrLen = n
-}
-
-// SetEmitFunc changes the callback used when new header fields
-// are decoded.
-// It must be non-nil. It does not affect EmitEnabled.
-func (d *Decoder) SetEmitFunc(emitFunc func(f HeaderField)) {
-	d.emit = emitFunc
-}
-
-// SetEmitEnabled controls whether the emitFunc provided to NewDecoder
-// should be called. The default is true.
-//
-// This facility exists to let servers enforce MAX_HEADER_LIST_SIZE
-// while still decoding and keeping in-sync with decoder state, but
-// without doing unnecessary decompression or generating unnecessary
-// garbage for header fields past the limit.
-func (d *Decoder) SetEmitEnabled(v bool) { d.emitEnabled = v }
-
-// EmitEnabled reports whether calls to the emitFunc provided to NewDecoder
-// are currently enabled. The default is true.
-func (d *Decoder) EmitEnabled() bool { return d.emitEnabled }
-
-// TODO: add method *Decoder.Reset(maxSize, emitFunc) to let callers re-use Decoders and their
-// underlying buffers for garbage reasons.
-
-func (d *Decoder) SetMaxDynamicTableSize(v uint32) {
-	d.dynTab.setMaxSize(v)
-}
-
-// SetAllowedMaxDynamicTableSize sets the upper bound that the encoded
-// stream (via dynamic table size updates) may set the maximum size
-// to.
-func (d *Decoder) SetAllowedMaxDynamicTableSize(v uint32) {
-	d.dynTab.allowedMaxSize = v
-}
-
-type dynamicTable struct {
-	// http://http2.github.io/http2-spec/compression.html#rfc.section.2.3.2
-	table          headerFieldTable
-	size           uint32 // in bytes
-	maxSize        uint32 // current maxSize
-	allowedMaxSize uint32 // maxSize may go up to this, inclusive
-}
-
-func (dt *dynamicTable) setMaxSize(v uint32) {
-	dt.maxSize = v
-	dt.evict()
-}
-
-func (dt *dynamicTable) add(f HeaderField) {
-	dt.table.addEntry(f)
-	dt.size += f.Size()
-	dt.evict()
-}
-
-// If we're too big, evict old stuff.
-func (dt *dynamicTable) evict() {
-	var n int
-	for dt.size > dt.maxSize && n < dt.table.len() {
-		dt.size -= dt.table.ents[n].Size()
-		n++
-	}
-	dt.table.evictOldest(n)
-}
-
-func (d *Decoder) maxTableIndex() int {
-	// This should never overflow. RFC 7540 Section 6.5.2 limits the size of
-	// the dynamic table to 2^32 bytes, where each entry will occupy more than
-	// one byte. Further, the staticTable has a fixed, small length.
-	return d.dynTab.table.len() + staticTable.len()
-}
-
-func (d *Decoder) at(i uint64) (hf HeaderField, ok bool) {
-	// See Section 2.3.3.
-	if i == 0 {
-		return
-	}
-	if i <= uint64(staticTable.len()) {
-		return staticTable.ents[i-1], true
-	}
-	if i > uint64(d.maxTableIndex()) {
-		return
-	}
-	// In the dynamic table, newer entries have lower indices.
-	// However, dt.ents[0] is the oldest entry. Hence, dt.ents is
-	// the reversed dynamic table.
-	dt := d.dynTab.table
-	return dt.ents[dt.len()-(int(i)-staticTable.len())], true
-}
-
-// Decode decodes an entire block.
-//
-// TODO: remove this method and make it incremental later? This is
-// easier for debugging now.
-func (d *Decoder) DecodeFull(p []byte) ([]HeaderField, error) {
-	var hf []HeaderField
-	saveFunc := d.emit
-	defer func() { d.emit = saveFunc }()
-	d.emit = func(f HeaderField) { hf = append(hf, f) }
-	if _, err := d.Write(p); err != nil {
-		return nil, err
-	}
-	if err := d.Close(); err != nil {
-		return nil, err
-	}
-	return hf, nil
-}
-
-func (d *Decoder) Close() error {
-	if d.saveBuf.Len() > 0 {
-		d.saveBuf.Reset()
-		return DecodingError{errors.New("truncated headers")}
-	}
-	return nil
-}
-
-func (d *Decoder) Write(p []byte) (n int, err error) {
-	if len(p) == 0 {
-		// Prevent state machine CPU attacks (making us redo
-		// work up to the point of finding out we don't have
-		// enough data)
-		return
-	}
-	// Only copy the data if we have to. Optimistically assume
-	// that p will contain a complete header block.
-	if d.saveBuf.Len() == 0 {
-		d.buf = p
-	} else {
-		d.saveBuf.Write(p)
-		d.buf = d.saveBuf.Bytes()
-		d.saveBuf.Reset()
-	}
-
-	for len(d.buf) > 0 {
-		err = d.parseHeaderFieldRepr()
-		if err == errNeedMore {
-			// Extra paranoia, making sure saveBuf won't
-			// get too large. All the varint and string
-			// reading code earlier should already catch
-			// overlong things and return ErrStringLength,
-			// but keep this as a last resort.
-			const varIntOverhead = 8 // conservative
-			if d.maxStrLen != 0 && int64(len(d.buf)) > 2*(int64(d.maxStrLen)+varIntOverhead) {
-				return 0, ErrStringLength
-			}
-			d.saveBuf.Write(d.buf)
-			return len(p), nil
-		}
-		if err != nil {
-			break
-		}
-	}
-	return len(p), err
-}
-
-// errNeedMore is an internal sentinel error value that means the
-// buffer is truncated and we need to read more data before we can
-// continue parsing.
-var errNeedMore = errors.New("need more data")
-
-type indexType int
-
-const (
-	indexedTrue indexType = iota
-	indexedFalse
-	indexedNever
-)
-
-func (v indexType) indexed() bool   { return v == indexedTrue }
-func (v indexType) sensitive() bool { return v == indexedNever }
-
-// returns errNeedMore if there isn't enough data available.
-// any other error is fatal.
-// consumes d.buf iff it returns nil.
-// precondition: must be called with len(d.buf) > 0
-func (d *Decoder) parseHeaderFieldRepr() error {
-	b := d.buf[0]
-	switch {
-	case b&128 != 0:
-		// Indexed representation.
-		// High bit set?
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.1
-		return d.parseFieldIndexed()
-	case b&192 == 64:
-		// 6.2.1 Literal Header Field with Incremental Indexing
-		// 0b10xxxxxx: top two bits are 10
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.1
-		return d.parseFieldLiteral(6, indexedTrue)
-	case b&240 == 0:
-		// 6.2.2 Literal Header Field without Indexing
-		// 0b0000xxxx: top four bits are 0000
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.2
-		return d.parseFieldLiteral(4, indexedFalse)
-	case b&240 == 16:
-		// 6.2.3 Literal Header Field never Indexed
-		// 0b0001xxxx: top four bits are 0001
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.2.3
-		return d.parseFieldLiteral(4, indexedNever)
-	case b&224 == 32:
-		// 6.3 Dynamic Table Size Update
-		// Top three bits are '001'.
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.6.3
-		return d.parseDynamicTableSizeUpdate()
-	}
-
-	return DecodingError{errors.New("invalid encoding")}
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseFieldIndexed() error {
-	buf := d.buf
-	idx, buf, err := readVarInt(7, buf)
-	if err != nil {
-		return err
-	}
-	hf, ok := d.at(idx)
-	if !ok {
-		return DecodingError{InvalidIndexError(idx)}
-	}
-	d.buf = buf
-	return d.callEmit(HeaderField{Name: hf.Name, Value: hf.Value})
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseFieldLiteral(n uint8, it indexType) error {
-	buf := d.buf
-	nameIdx, buf, err := readVarInt(n, buf)
-	if err != nil {
-		return err
-	}
-
-	var hf HeaderField
-	wantStr := d.emitEnabled || it.indexed()
-	if nameIdx > 0 {
-		ihf, ok := d.at(nameIdx)
-		if !ok {
-			return DecodingError{InvalidIndexError(nameIdx)}
-		}
-		hf.Name = ihf.Name
-	} else {
-		hf.Name, buf, err = d.readString(buf, wantStr)
-		if err != nil {
-			return err
-		}
-	}
-	hf.Value, buf, err = d.readString(buf, wantStr)
-	if err != nil {
-		return err
-	}
-	d.buf = buf
-	if it.indexed() {
-		d.dynTab.add(hf)
-	}
-	hf.Sensitive = it.sensitive()
-	return d.callEmit(hf)
-}
-
-func (d *Decoder) callEmit(hf HeaderField) error {
-	if d.maxStrLen != 0 {
-		if len(hf.Name) > d.maxStrLen || len(hf.Value) > d.maxStrLen {
-			return ErrStringLength
-		}
-	}
-	if d.emitEnabled {
-		d.emit(hf)
-	}
-	return nil
-}
-
-// (same invariants and behavior as parseHeaderFieldRepr)
-func (d *Decoder) parseDynamicTableSizeUpdate() error {
-	buf := d.buf
-	size, buf, err := readVarInt(5, buf)
-	if err != nil {
-		return err
-	}
-	if size > uint64(d.dynTab.allowedMaxSize) {
-		return DecodingError{errors.New("dynamic table size update too large")}
-	}
-	d.dynTab.setMaxSize(uint32(size))
-	d.buf = buf
-	return nil
-}
-
-var errVarintOverflow = DecodingError{errors.New("varint integer overflow")}
-
-// readVarInt reads an unsigned variable length integer off the
-// beginning of p. n is the parameter as described in
-// http://http2.github.io/http2-spec/compression.html#rfc.section.5.1.
-//
-// n must always be between 1 and 8.
-//
-// The returned remain buffer is either a smaller suffix of p, or err != nil.
-// The error is errNeedMore if p doesn't contain a complete integer.
-func readVarInt(n byte, p []byte) (i uint64, remain []byte, err error) {
-	if n < 1 || n > 8 {
-		panic("bad n")
-	}
-	if len(p) == 0 {
-		return 0, p, errNeedMore
-	}
-	i = uint64(p[0])
-	if n < 8 {
-		i &= (1 << uint64(n)) - 1
-	}
-	if i < (1<<uint64(n))-1 {
-		return i, p[1:], nil
-	}
-
-	origP := p
-	p = p[1:]
-	var m uint64
-	for len(p) > 0 {
-		b := p[0]
-		p = p[1:]
-		i += uint64(b&127) << m
-		if b&128 == 0 {
-			return i, p, nil
-		}
-		m += 7
-		if m >= 63 { // TODO: proper overflow check. making this up.
-			return 0, origP, errVarintOverflow
-		}
-	}
-	return 0, origP, errNeedMore
-}
-
-// readString decodes an hpack string from p.
-//
-// wantStr is whether s will be used. If false, decompression and
-// []byte->string garbage are skipped if s will be ignored
-// anyway. This does mean that huffman decoding errors for non-indexed
-// strings past the MAX_HEADER_LIST_SIZE are ignored, but the server
-// is returning an error anyway, and because they're not indexed, the error
-// won't affect the decoding state.
-func (d *Decoder) readString(p []byte, wantStr bool) (s string, remain []byte, err error) {
-	if len(p) == 0 {
-		return "", p, errNeedMore
-	}
-	isHuff := p[0]&128 != 0
-	strLen, p, err := readVarInt(7, p)
-	if err != nil {
-		return "", p, err
-	}
-	if d.maxStrLen != 0 && strLen > uint64(d.maxStrLen) {
-		return "", nil, ErrStringLength
-	}
-	if uint64(len(p)) < strLen {
-		return "", p, errNeedMore
-	}
-	if !isHuff {
-		if wantStr {
-			s = string(p[:strLen])
-		}
-		return s, p[strLen:], nil
-	}
-
-	if wantStr {
-		buf := bufPool.Get().(*bytes.Buffer)
-		buf.Reset() // don't trust others
-		defer bufPool.Put(buf)
-		if err := huffmanDecode(buf, d.maxStrLen, p[:strLen]); err != nil {
-			buf.Reset()
-			return "", nil, err
-		}
-		s = buf.String()
-		buf.Reset() // be nice to GC
-	}
-	return s, p[strLen:], nil
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/hpack_test.go b/installer/vendor/golang.org/x/net/http2/hpack/hpack_test.go
deleted file mode 100644
index c2f8fd102b..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/hpack_test.go
+++ /dev/null
@@ -1,718 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bytes"
-	"encoding/hex"
-	"fmt"
-	"math/rand"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-func (d *Decoder) mustAt(idx int) HeaderField {
-	if hf, ok := d.at(uint64(idx)); !ok {
-		panic(fmt.Sprintf("bogus index %d", idx))
-	} else {
-		return hf
-	}
-}
-
-func TestDynamicTableAt(t *testing.T) {
-	d := NewDecoder(4096, nil)
-	at := d.mustAt
-	if got, want := at(2), (pair(":method", "GET")); got != want {
-		t.Errorf("at(2) = %v; want %v", got, want)
-	}
-	d.dynTab.add(pair("foo", "bar"))
-	d.dynTab.add(pair("blake", "miz"))
-	if got, want := at(staticTable.len()+1), (pair("blake", "miz")); got != want {
-		t.Errorf("at(dyn 1) = %v; want %v", got, want)
-	}
-	if got, want := at(staticTable.len()+2), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 2) = %v; want %v", got, want)
-	}
-	if got, want := at(3), (pair(":method", "POST")); got != want {
-		t.Errorf("at(3) = %v; want %v", got, want)
-	}
-}
-
-func TestDynamicTableSizeEvict(t *testing.T) {
-	d := NewDecoder(4096, nil)
-	if want := uint32(0); d.dynTab.size != want {
-		t.Fatalf("size = %d; want %d", d.dynTab.size, want)
-	}
-	add := d.dynTab.add
-	add(pair("blake", "eats pizza"))
-	if want := uint32(15 + 32); d.dynTab.size != want {
-		t.Fatalf("after pizza, size = %d; want %d", d.dynTab.size, want)
-	}
-	add(pair("foo", "bar"))
-	if want := uint32(15 + 32 + 6 + 32); d.dynTab.size != want {
-		t.Fatalf("after foo bar, size = %d; want %d", d.dynTab.size, want)
-	}
-	d.dynTab.setMaxSize(15 + 32 + 1 /* slop */)
-	if want := uint32(6 + 32); d.dynTab.size != want {
-		t.Fatalf("after setMaxSize, size = %d; want %d", d.dynTab.size, want)
-	}
-	if got, want := d.mustAt(staticTable.len()+1), (pair("foo", "bar")); got != want {
-		t.Errorf("at(dyn 1) = %v; want %v", got, want)
-	}
-	add(pair("long", strings.Repeat("x", 500)))
-	if want := uint32(0); d.dynTab.size != want {
-		t.Fatalf("after big one, size = %d; want %d", d.dynTab.size, want)
-	}
-}
-
-func TestDecoderDecode(t *testing.T) {
-	tests := []struct {
-		name       string
-		in         []byte
-		want       []HeaderField
-		wantDynTab []HeaderField // newest entry first
-	}{
-		// C.2.1 Literal Header Field with Indexing
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.1
-		{"C.2.1", dehex("400a 6375 7374 6f6d 2d6b 6579 0d63 7573 746f 6d2d 6865 6164 6572"),
-			[]HeaderField{pair("custom-key", "custom-header")},
-			[]HeaderField{pair("custom-key", "custom-header")},
-		},
-
-		// C.2.2 Literal Header Field without Indexing
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.2
-		{"C.2.2", dehex("040c 2f73 616d 706c 652f 7061 7468"),
-			[]HeaderField{pair(":path", "/sample/path")},
-			[]HeaderField{}},
-
-		// C.2.3 Literal Header Field never Indexed
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.3
-		{"C.2.3", dehex("1008 7061 7373 776f 7264 0673 6563 7265 74"),
-			[]HeaderField{{"password", "secret", true}},
-			[]HeaderField{}},
-
-		// C.2.4 Indexed Header Field
-		// http://http2.github.io/http2-spec/compression.html#rfc.section.C.2.4
-		{"C.2.4", []byte("\x82"),
-			[]HeaderField{pair(":method", "GET")},
-			[]HeaderField{}},
-	}
-	for _, tt := range tests {
-		d := NewDecoder(4096, nil)
-		hf, err := d.DecodeFull(tt.in)
-		if err != nil {
-			t.Errorf("%s: %v", tt.name, err)
-			continue
-		}
-		if !reflect.DeepEqual(hf, tt.want) {
-			t.Errorf("%s: Got %v; want %v", tt.name, hf, tt.want)
-		}
-		gotDynTab := d.dynTab.reverseCopy()
-		if !reflect.DeepEqual(gotDynTab, tt.wantDynTab) {
-			t.Errorf("%s: dynamic table after = %v; want %v", tt.name, gotDynTab, tt.wantDynTab)
-		}
-	}
-}
-
-func (dt *dynamicTable) reverseCopy() (hf []HeaderField) {
-	hf = make([]HeaderField, len(dt.table.ents))
-	for i := range hf {
-		hf[i] = dt.table.ents[len(dt.table.ents)-1-i]
-	}
-	return
-}
-
-type encAndWant struct {
-	enc         []byte
-	want        []HeaderField
-	wantDynTab  []HeaderField
-	wantDynSize uint32
-}
-
-// C.3 Request Examples without Huffman Coding
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.3
-func TestDecodeC3_NoHuffman(t *testing.T) {
-	testDecodeSeries(t, 4096, []encAndWant{
-		{dehex("8286 8441 0f77 7777 2e65 7861 6d70 6c65 2e63 6f6d"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-			},
-			[]HeaderField{
-				pair(":authority", "www.example.com"),
-			},
-			57,
-		},
-		{dehex("8286 84be 5808 6e6f 2d63 6163 6865"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-				pair("cache-control", "no-cache"),
-			},
-			[]HeaderField{
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			110,
-		},
-		{dehex("8287 85bf 400a 6375 7374 6f6d 2d6b 6579 0c63 7573 746f 6d2d 7661 6c75 65"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "https"),
-				pair(":path", "/index.html"),
-				pair(":authority", "www.example.com"),
-				pair("custom-key", "custom-value"),
-			},
-			[]HeaderField{
-				pair("custom-key", "custom-value"),
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			164,
-		},
-	})
-}
-
-// C.4 Request Examples with Huffman Coding
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.4
-func TestDecodeC4_Huffman(t *testing.T) {
-	testDecodeSeries(t, 4096, []encAndWant{
-		{dehex("8286 8441 8cf1 e3c2 e5f2 3a6b a0ab 90f4 ff"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-			},
-			[]HeaderField{
-				pair(":authority", "www.example.com"),
-			},
-			57,
-		},
-		{dehex("8286 84be 5886 a8eb 1064 9cbf"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "http"),
-				pair(":path", "/"),
-				pair(":authority", "www.example.com"),
-				pair("cache-control", "no-cache"),
-			},
-			[]HeaderField{
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			110,
-		},
-		{dehex("8287 85bf 4088 25a8 49e9 5ba9 7d7f 8925 a849 e95b b8e8 b4bf"),
-			[]HeaderField{
-				pair(":method", "GET"),
-				pair(":scheme", "https"),
-				pair(":path", "/index.html"),
-				pair(":authority", "www.example.com"),
-				pair("custom-key", "custom-value"),
-			},
-			[]HeaderField{
-				pair("custom-key", "custom-value"),
-				pair("cache-control", "no-cache"),
-				pair(":authority", "www.example.com"),
-			},
-			164,
-		},
-	})
-}
-
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.5
-// "This section shows several consecutive header lists, corresponding
-// to HTTP responses, on the same connection. The HTTP/2 setting
-// parameter SETTINGS_HEADER_TABLE_SIZE is set to the value of 256
-// octets, causing some evictions to occur."
-func TestDecodeC5_ResponsesNoHuff(t *testing.T) {
-	testDecodeSeries(t, 256, []encAndWant{
-		{dehex(`
-4803 3330 3258 0770 7269 7661 7465 611d
-4d6f 6e2c 2032 3120 4f63 7420 3230 3133
-2032 303a 3133 3a32 3120 474d 546e 1768
-7474 7073 3a2f 2f77 7777 2e65 7861 6d70
-6c65 2e63 6f6d
-`),
-			[]HeaderField{
-				pair(":status", "302"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-				pair(":status", "302"),
-			},
-			222,
-		},
-		{dehex("4803 3330 37c1 c0bf"),
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-			},
-			222,
-		},
-		{dehex(`
-88c1 611d 4d6f 6e2c 2032 3120 4f63 7420
-3230 3133 2032 303a 3133 3a32 3220 474d
-54c0 5a04 677a 6970 7738 666f 6f3d 4153
-444a 4b48 514b 425a 584f 5157 454f 5049
-5541 5851 5745 4f49 553b 206d 6178 2d61
-6765 3d33 3630 303b 2076 6572 7369 6f6e
-3d31
-`),
-			[]HeaderField{
-				pair(":status", "200"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-				pair("location", "https://www.example.com"),
-				pair("content-encoding", "gzip"),
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-			},
-			[]HeaderField{
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-				pair("content-encoding", "gzip"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-			},
-			215,
-		},
-	})
-}
-
-// http://http2.github.io/http2-spec/compression.html#rfc.section.C.6
-// "This section shows the same examples as the previous section, but
-// using Huffman encoding for the literal values. The HTTP/2 setting
-// parameter SETTINGS_HEADER_TABLE_SIZE is set to the value of 256
-// octets, causing some evictions to occur. The eviction mechanism
-// uses the length of the decoded literal values, so the same
-// evictions occurs as in the previous section."
-func TestDecodeC6_ResponsesHuffman(t *testing.T) {
-	testDecodeSeries(t, 256, []encAndWant{
-		{dehex(`
-4882 6402 5885 aec3 771a 4b61 96d0 7abe
-9410 54d4 44a8 2005 9504 0b81 66e0 82a6
-2d1b ff6e 919d 29ad 1718 63c7 8f0b 97c8
-e9ae 82ae 43d3
-`),
-			[]HeaderField{
-				pair(":status", "302"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-				pair(":status", "302"),
-			},
-			222,
-		},
-		{dehex("4883 640e ffc1 c0bf"),
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("location", "https://www.example.com"),
-			},
-			[]HeaderField{
-				pair(":status", "307"),
-				pair("location", "https://www.example.com"),
-				pair("date", "Mon, 21 Oct 2013 20:13:21 GMT"),
-				pair("cache-control", "private"),
-			},
-			222,
-		},
-		{dehex(`
-88c1 6196 d07a be94 1054 d444 a820 0595
-040b 8166 e084 a62d 1bff c05a 839b d9ab
-77ad 94e7 821d d7f2 e6c7 b335 dfdf cd5b
-3960 d5af 2708 7f36 72c1 ab27 0fb5 291f
-9587 3160 65c0 03ed 4ee5 b106 3d50 07
-`),
-			[]HeaderField{
-				pair(":status", "200"),
-				pair("cache-control", "private"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-				pair("location", "https://www.example.com"),
-				pair("content-encoding", "gzip"),
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-			},
-			[]HeaderField{
-				pair("set-cookie", "foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"),
-				pair("content-encoding", "gzip"),
-				pair("date", "Mon, 21 Oct 2013 20:13:22 GMT"),
-			},
-			215,
-		},
-	})
-}
-
-func testDecodeSeries(t *testing.T, size uint32, steps []encAndWant) {
-	d := NewDecoder(size, nil)
-	for i, step := range steps {
-		hf, err := d.DecodeFull(step.enc)
-		if err != nil {
-			t.Fatalf("Error at step index %d: %v", i, err)
-		}
-		if !reflect.DeepEqual(hf, step.want) {
-			t.Fatalf("At step index %d: Got headers %v; want %v", i, hf, step.want)
-		}
-		gotDynTab := d.dynTab.reverseCopy()
-		if !reflect.DeepEqual(gotDynTab, step.wantDynTab) {
-			t.Errorf("After step index %d, dynamic table = %v; want %v", i, gotDynTab, step.wantDynTab)
-		}
-		if d.dynTab.size != step.wantDynSize {
-			t.Errorf("After step index %d, dynamic table size = %v; want %v", i, d.dynTab.size, step.wantDynSize)
-		}
-	}
-}
-
-func TestHuffmanDecodeExcessPadding(t *testing.T) {
-	tests := [][]byte{
-		{0xff},                                   // Padding Exceeds 7 bits
-		{0x1f, 0xff},                             // {"a", 1 byte excess padding}
-		{0x1f, 0xff, 0xff},                       // {"a", 2 byte excess padding}
-		{0x1f, 0xff, 0xff, 0xff},                 // {"a", 3 byte excess padding}
-		{0xff, 0x9f, 0xff, 0xff, 0xff},           // {"a", 29 bit excess padding}
-		{'R', 0xbc, '0', 0xff, 0xff, 0xff, 0xff}, // Padding ends on partial symbol.
-	}
-	for i, in := range tests {
-		var buf bytes.Buffer
-		if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-			t.Errorf("test-%d: decode(%q) = %v; want ErrInvalidHuffman", i, in, err)
-		}
-	}
-}
-
-func TestHuffmanDecodeEOS(t *testing.T) {
-	in := []byte{0xff, 0xff, 0xff, 0xff, 0xfc} // {EOS, "?"}
-	var buf bytes.Buffer
-	if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-		t.Errorf("error = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func TestHuffmanDecodeMaxLengthOnTrailingByte(t *testing.T) {
-	in := []byte{0x00, 0x01} // {"0", "0", "0"}
-	var buf bytes.Buffer
-	if err := huffmanDecode(&buf, 2, in); err != ErrStringLength {
-		t.Errorf("error = %v; want ErrStringLength", err)
-	}
-}
-
-func TestHuffmanDecodeCorruptPadding(t *testing.T) {
-	in := []byte{0x00}
-	var buf bytes.Buffer
-	if _, err := HuffmanDecode(&buf, in); err != ErrInvalidHuffman {
-		t.Errorf("error = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func TestHuffmanDecode(t *testing.T) {
-	tests := []struct {
-		inHex, want string
-	}{
-		{"f1e3 c2e5 f23a 6ba0 ab90 f4ff", "www.example.com"},
-		{"a8eb 1064 9cbf", "no-cache"},
-		{"25a8 49e9 5ba9 7d7f", "custom-key"},
-		{"25a8 49e9 5bb8 e8b4 bf", "custom-value"},
-		{"6402", "302"},
-		{"aec3 771a 4b", "private"},
-		{"d07a be94 1054 d444 a820 0595 040b 8166 e082 a62d 1bff", "Mon, 21 Oct 2013 20:13:21 GMT"},
-		{"9d29 ad17 1863 c78f 0b97 c8e9 ae82 ae43 d3", "https://www.example.com"},
-		{"9bd9 ab", "gzip"},
-		{"94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 3160 65c0 03ed 4ee5 b106 3d50 07",
-			"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1"},
-	}
-	for i, tt := range tests {
-		var buf bytes.Buffer
-		in, err := hex.DecodeString(strings.Replace(tt.inHex, " ", "", -1))
-		if err != nil {
-			t.Errorf("%d. hex input error: %v", i, err)
-			continue
-		}
-		if _, err := HuffmanDecode(&buf, in); err != nil {
-			t.Errorf("%d. decode error: %v", i, err)
-			continue
-		}
-		if got := buf.String(); tt.want != got {
-			t.Errorf("%d. decode = %q; want %q", i, got, tt.want)
-		}
-	}
-}
-
-func TestAppendHuffmanString(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"www.example.com", "f1e3 c2e5 f23a 6ba0 ab90 f4ff"},
-		{"no-cache", "a8eb 1064 9cbf"},
-		{"custom-key", "25a8 49e9 5ba9 7d7f"},
-		{"custom-value", "25a8 49e9 5bb8 e8b4 bf"},
-		{"302", "6402"},
-		{"private", "aec3 771a 4b"},
-		{"Mon, 21 Oct 2013 20:13:21 GMT", "d07a be94 1054 d444 a820 0595 040b 8166 e082 a62d 1bff"},
-		{"https://www.example.com", "9d29 ad17 1863 c78f 0b97 c8e9 ae82 ae43 d3"},
-		{"gzip", "9bd9 ab"},
-		{"foo=ASDJKHQKBZXOQWEOPIUAXQWEOIU; max-age=3600; version=1",
-			"94e7 821d d7f2 e6c7 b335 dfdf cd5b 3960 d5af 2708 7f36 72c1 ab27 0fb5 291f 9587 3160 65c0 03ed 4ee5 b106 3d50 07"},
-	}
-	for i, tt := range tests {
-		buf := []byte{}
-		want := strings.Replace(tt.want, " ", "", -1)
-		buf = AppendHuffmanString(buf, tt.in)
-		if got := hex.EncodeToString(buf); want != got {
-			t.Errorf("%d. encode = %q; want %q", i, got, want)
-		}
-	}
-}
-
-func TestHuffmanMaxStrLen(t *testing.T) {
-	const msg = "Some string"
-	huff := AppendHuffmanString(nil, msg)
-
-	testGood := func(max int) {
-		var out bytes.Buffer
-		if err := huffmanDecode(&out, max, huff); err != nil {
-			t.Errorf("For maxLen=%d, unexpected error: %v", max, err)
-		}
-		if out.String() != msg {
-			t.Errorf("For maxLen=%d, out = %q; want %q", max, out.String(), msg)
-		}
-	}
-	testGood(0)
-	testGood(len(msg))
-	testGood(len(msg) + 1)
-
-	var out bytes.Buffer
-	if err := huffmanDecode(&out, len(msg)-1, huff); err != ErrStringLength {
-		t.Errorf("err = %v; want ErrStringLength", err)
-	}
-}
-
-func TestHuffmanRoundtripStress(t *testing.T) {
-	const Len = 50 // of uncompressed string
-	input := make([]byte, Len)
-	var output bytes.Buffer
-	var huff []byte
-
-	n := 5000
-	if testing.Short() {
-		n = 100
-	}
-	seed := time.Now().UnixNano()
-	t.Logf("Seed = %v", seed)
-	src := rand.New(rand.NewSource(seed))
-	var encSize int64
-	for i := 0; i < n; i++ {
-		for l := range input {
-			input[l] = byte(src.Intn(256))
-		}
-		huff = AppendHuffmanString(huff[:0], string(input))
-		encSize += int64(len(huff))
-		output.Reset()
-		if err := huffmanDecode(&output, 0, huff); err != nil {
-			t.Errorf("Failed to decode %q -> %q -> error %v", input, huff, err)
-			continue
-		}
-		if !bytes.Equal(output.Bytes(), input) {
-			t.Errorf("Roundtrip failure on %q -> %q -> %q", input, huff, output.Bytes())
-		}
-	}
-	t.Logf("Compressed size of original: %0.02f%% (%v -> %v)", 100*(float64(encSize)/(Len*float64(n))), Len*n, encSize)
-}
-
-func TestHuffmanDecodeFuzz(t *testing.T) {
-	const Len = 50 // of compressed
-	var buf, zbuf bytes.Buffer
-
-	n := 5000
-	if testing.Short() {
-		n = 100
-	}
-	seed := time.Now().UnixNano()
-	t.Logf("Seed = %v", seed)
-	src := rand.New(rand.NewSource(seed))
-	numFail := 0
-	for i := 0; i < n; i++ {
-		zbuf.Reset()
-		if i == 0 {
-			// Start with at least one invalid one.
-			zbuf.WriteString("00\x91\xff\xff\xff\xff\xc8")
-		} else {
-			for l := 0; l < Len; l++ {
-				zbuf.WriteByte(byte(src.Intn(256)))
-			}
-		}
-
-		buf.Reset()
-		if err := huffmanDecode(&buf, 0, zbuf.Bytes()); err != nil {
-			if err == ErrInvalidHuffman {
-				numFail++
-				continue
-			}
-			t.Errorf("Failed to decode %q: %v", zbuf.Bytes(), err)
-			continue
-		}
-	}
-	t.Logf("%0.02f%% are invalid (%d / %d)", 100*float64(numFail)/float64(n), numFail, n)
-	if numFail < 1 {
-		t.Error("expected at least one invalid huffman encoding (test starts with one)")
-	}
-}
-
-func TestReadVarInt(t *testing.T) {
-	type res struct {
-		i        uint64
-		consumed int
-		err      error
-	}
-	tests := []struct {
-		n    byte
-		p    []byte
-		want res
-	}{
-		// Fits in a byte:
-		{1, []byte{0}, res{0, 1, nil}},
-		{2, []byte{2}, res{2, 1, nil}},
-		{3, []byte{6}, res{6, 1, nil}},
-		{4, []byte{14}, res{14, 1, nil}},
-		{5, []byte{30}, res{30, 1, nil}},
-		{6, []byte{62}, res{62, 1, nil}},
-		{7, []byte{126}, res{126, 1, nil}},
-		{8, []byte{254}, res{254, 1, nil}},
-
-		// Doesn't fit in a byte:
-		{1, []byte{1}, res{0, 0, errNeedMore}},
-		{2, []byte{3}, res{0, 0, errNeedMore}},
-		{3, []byte{7}, res{0, 0, errNeedMore}},
-		{4, []byte{15}, res{0, 0, errNeedMore}},
-		{5, []byte{31}, res{0, 0, errNeedMore}},
-		{6, []byte{63}, res{0, 0, errNeedMore}},
-		{7, []byte{127}, res{0, 0, errNeedMore}},
-		{8, []byte{255}, res{0, 0, errNeedMore}},
-
-		// Ignoring top bits:
-		{5, []byte{255, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 111
-		{5, []byte{159, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 100
-		{5, []byte{191, 154, 10}, res{1337, 3, nil}}, // high dummy three bits: 101
-
-		// Extra byte:
-		{5, []byte{191, 154, 10, 2}, res{1337, 3, nil}}, // extra byte
-
-		// Short a byte:
-		{5, []byte{191, 154}, res{0, 0, errNeedMore}},
-
-		// integer overflow:
-		{1, []byte{255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128}, res{0, 0, errVarintOverflow}},
-	}
-	for _, tt := range tests {
-		i, remain, err := readVarInt(tt.n, tt.p)
-		consumed := len(tt.p) - len(remain)
-		got := res{i, consumed, err}
-		if got != tt.want {
-			t.Errorf("readVarInt(%d, %v ~ %x) = %+v; want %+v", tt.n, tt.p, tt.p, got, tt.want)
-		}
-	}
-}
-
-// Fuzz crash, originally reported at https://github.com/bradfitz/http2/issues/56
-func TestHuffmanFuzzCrash(t *testing.T) {
-	got, err := HuffmanDecodeToString([]byte("00\x91\xff\xff\xff\xff\xc8"))
-	if got != "" {
-		t.Errorf("Got %q; want empty string", got)
-	}
-	if err != ErrInvalidHuffman {
-		t.Errorf("Err = %v; want ErrInvalidHuffman", err)
-	}
-}
-
-func dehex(s string) []byte {
-	s = strings.Replace(s, " ", "", -1)
-	s = strings.Replace(s, "\n", "", -1)
-	b, err := hex.DecodeString(s)
-	if err != nil {
-		panic(err)
-	}
-	return b
-}
-
-func TestEmitEnabled(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
-	enc.WriteField(HeaderField{Name: "foo", Value: "bar"})
-
-	numCallback := 0
-	var dec *Decoder
-	dec = NewDecoder(8<<20, func(HeaderField) {
-		numCallback++
-		dec.SetEmitEnabled(false)
-	})
-	if !dec.EmitEnabled() {
-		t.Errorf("initial emit enabled = false; want true")
-	}
-	if _, err := dec.Write(buf.Bytes()); err != nil {
-		t.Error(err)
-	}
-	if numCallback != 1 {
-		t.Errorf("num callbacks = %d; want 1", numCallback)
-	}
-	if dec.EmitEnabled() {
-		t.Errorf("emit enabled = true; want false")
-	}
-}
-
-func TestSaveBufLimit(t *testing.T) {
-	const maxStr = 1 << 10
-	var got []HeaderField
-	dec := NewDecoder(initialHeaderTableSize, func(hf HeaderField) {
-		got = append(got, hf)
-	})
-	dec.SetMaxStringLength(maxStr)
-	var frag []byte
-	frag = append(frag[:0], encodeTypeByte(false, false))
-	frag = appendVarInt(frag, 7, 3)
-	frag = append(frag, "foo"...)
-	frag = appendVarInt(frag, 7, 3)
-	frag = append(frag, "bar"...)
-
-	if _, err := dec.Write(frag); err != nil {
-		t.Fatal(err)
-	}
-
-	want := []HeaderField{{Name: "foo", Value: "bar"}}
-	if !reflect.DeepEqual(got, want) {
-		t.Errorf("After small writes, got %v; want %v", got, want)
-	}
-
-	frag = append(frag[:0], encodeTypeByte(false, false))
-	frag = appendVarInt(frag, 7, maxStr*3)
-	frag = append(frag, make([]byte, maxStr*3)...)
-
-	_, err := dec.Write(frag)
-	if err != ErrStringLength {
-		t.Fatalf("Write error = %v; want ErrStringLength", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/huffman.go b/installer/vendor/golang.org/x/net/http2/hpack/huffman.go
deleted file mode 100644
index 8850e39467..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/huffman.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"sync"
-)
-
-var bufPool = sync.Pool{
-	New: func() interface{} { return new(bytes.Buffer) },
-}
-
-// HuffmanDecode decodes the string in v and writes the expanded
-// result to w, returning the number of bytes written to w and the
-// Write call's return value. At most one Write call is made.
-func HuffmanDecode(w io.Writer, v []byte) (int, error) {
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset()
-	defer bufPool.Put(buf)
-	if err := huffmanDecode(buf, 0, v); err != nil {
-		return 0, err
-	}
-	return w.Write(buf.Bytes())
-}
-
-// HuffmanDecodeToString decodes the string in v.
-func HuffmanDecodeToString(v []byte) (string, error) {
-	buf := bufPool.Get().(*bytes.Buffer)
-	buf.Reset()
-	defer bufPool.Put(buf)
-	if err := huffmanDecode(buf, 0, v); err != nil {
-		return "", err
-	}
-	return buf.String(), nil
-}
-
-// ErrInvalidHuffman is returned for errors found decoding
-// Huffman-encoded strings.
-var ErrInvalidHuffman = errors.New("hpack: invalid Huffman-encoded data")
-
-// huffmanDecode decodes v to buf.
-// If maxLen is greater than 0, attempts to write more to buf than
-// maxLen bytes will return ErrStringLength.
-func huffmanDecode(buf *bytes.Buffer, maxLen int, v []byte) error {
-	n := rootHuffmanNode
-	// cur is the bit buffer that has not been fed into n.
-	// cbits is the number of low order bits in cur that are valid.
-	// sbits is the number of bits of the symbol prefix being decoded.
-	cur, cbits, sbits := uint(0), uint8(0), uint8(0)
-	for _, b := range v {
-		cur = cur<<8 | uint(b)
-		cbits += 8
-		sbits += 8
-		for cbits >= 8 {
-			idx := byte(cur >> (cbits - 8))
-			n = n.children[idx]
-			if n == nil {
-				return ErrInvalidHuffman
-			}
-			if n.children == nil {
-				if maxLen != 0 && buf.Len() == maxLen {
-					return ErrStringLength
-				}
-				buf.WriteByte(n.sym)
-				cbits -= n.codeLen
-				n = rootHuffmanNode
-				sbits = cbits
-			} else {
-				cbits -= 8
-			}
-		}
-	}
-	for cbits > 0 {
-		n = n.children[byte(cur<<(8-cbits))]
-		if n == nil {
-			return ErrInvalidHuffman
-		}
-		if n.children != nil || n.codeLen > cbits {
-			break
-		}
-		if maxLen != 0 && buf.Len() == maxLen {
-			return ErrStringLength
-		}
-		buf.WriteByte(n.sym)
-		cbits -= n.codeLen
-		n = rootHuffmanNode
-		sbits = cbits
-	}
-	if sbits > 7 {
-		// Either there was an incomplete symbol, or overlong padding.
-		// Both are decoding errors per RFC 7541 section 5.2.
-		return ErrInvalidHuffman
-	}
-	if mask := uint(1<<cbits - 1); cur&mask != mask {
-		// Trailing bits must be a prefix of EOS per RFC 7541 section 5.2.
-		return ErrInvalidHuffman
-	}
-
-	return nil
-}
-
-type node struct {
-	// children is non-nil for internal nodes
-	children []*node
-
-	// The following are only valid if children is nil:
-	codeLen uint8 // number of bits that led to the output of sym
-	sym     byte  // output symbol
-}
-
-func newInternalNode() *node {
-	return &node{children: make([]*node, 256)}
-}
-
-var rootHuffmanNode = newInternalNode()
-
-func init() {
-	if len(huffmanCodes) != 256 {
-		panic("unexpected size")
-	}
-	for i, code := range huffmanCodes {
-		addDecoderNode(byte(i), code, huffmanCodeLen[i])
-	}
-}
-
-func addDecoderNode(sym byte, code uint32, codeLen uint8) {
-	cur := rootHuffmanNode
-	for codeLen > 8 {
-		codeLen -= 8
-		i := uint8(code >> codeLen)
-		if cur.children[i] == nil {
-			cur.children[i] = newInternalNode()
-		}
-		cur = cur.children[i]
-	}
-	shift := 8 - codeLen
-	start, end := int(uint8(code<<shift)), int(1<<shift)
-	for i := start; i < start+end; i++ {
-		cur.children[i] = &node{sym: sym, codeLen: codeLen}
-	}
-}
-
-// AppendHuffmanString appends s, as encoded in Huffman codes, to dst
-// and returns the extended buffer.
-func AppendHuffmanString(dst []byte, s string) []byte {
-	rembits := uint8(8)
-
-	for i := 0; i < len(s); i++ {
-		if rembits == 8 {
-			dst = append(dst, 0)
-		}
-		dst, rembits = appendByteToHuffmanCode(dst, rembits, s[i])
-	}
-
-	if rembits < 8 {
-		// special EOS symbol
-		code := uint32(0x3fffffff)
-		nbits := uint8(30)
-
-		t := uint8(code >> (nbits - rembits))
-		dst[len(dst)-1] |= t
-	}
-
-	return dst
-}
-
-// HuffmanEncodeLength returns the number of bytes required to encode
-// s in Huffman codes. The result is round up to byte boundary.
-func HuffmanEncodeLength(s string) uint64 {
-	n := uint64(0)
-	for i := 0; i < len(s); i++ {
-		n += uint64(huffmanCodeLen[s[i]])
-	}
-	return (n + 7) / 8
-}
-
-// appendByteToHuffmanCode appends Huffman code for c to dst and
-// returns the extended buffer and the remaining bits in the last
-// element. The appending is not byte aligned and the remaining bits
-// in the last element of dst is given in rembits.
-func appendByteToHuffmanCode(dst []byte, rembits uint8, c byte) ([]byte, uint8) {
-	code := huffmanCodes[c]
-	nbits := huffmanCodeLen[c]
-
-	for {
-		if rembits > nbits {
-			t := uint8(code << (rembits - nbits))
-			dst[len(dst)-1] |= t
-			rembits -= nbits
-			break
-		}
-
-		t := uint8(code >> (nbits - rembits))
-		dst[len(dst)-1] |= t
-
-		nbits -= rembits
-		rembits = 8
-
-		if nbits == 0 {
-			break
-		}
-
-		dst = append(dst, 0)
-	}
-
-	return dst, rembits
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/tables.go b/installer/vendor/golang.org/x/net/http2/hpack/tables.go
deleted file mode 100644
index 8701592444..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/tables.go
+++ /dev/null
@@ -1,478 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"fmt"
-)
-
-// headerFieldTable implements a list of HeaderFields.
-// This is used to implement the static and dynamic tables.
-type headerFieldTable struct {
-	// For static tables, entries are never evicted.
-	//
-	// For dynamic tables, entries are evicted from ents[0] and added to the end.
-	// Each entry has a unique id that starts at one and increments for each
-	// entry that is added. This unique id is stable across evictions, meaning
-	// it can be used as a pointer to a specific entry. As in hpack, unique ids
-	// are 1-based. The unique id for ents[k] is k + evictCount + 1.
-	//
-	// Zero is not a valid unique id.
-	//
-	// evictCount should not overflow in any remotely practical situation. In
-	// practice, we will have one dynamic table per HTTP/2 connection. If we
-	// assume a very powerful server that handles 1M QPS per connection and each
-	// request adds (then evicts) 100 entries from the table, it would still take
-	// 2M years for evictCount to overflow.
-	ents       []HeaderField
-	evictCount uint64
-
-	// byName maps a HeaderField name to the unique id of the newest entry with
-	// the same name. See above for a definition of "unique id".
-	byName map[string]uint64
-
-	// byNameValue maps a HeaderField name/value pair to the unique id of the newest
-	// entry with the same name and value. See above for a definition of "unique id".
-	byNameValue map[pairNameValue]uint64
-}
-
-type pairNameValue struct {
-	name, value string
-}
-
-func (t *headerFieldTable) init() {
-	t.byName = make(map[string]uint64)
-	t.byNameValue = make(map[pairNameValue]uint64)
-}
-
-// len reports the number of entries in the table.
-func (t *headerFieldTable) len() int {
-	return len(t.ents)
-}
-
-// addEntry adds a new entry.
-func (t *headerFieldTable) addEntry(f HeaderField) {
-	id := uint64(t.len()) + t.evictCount + 1
-	t.byName[f.Name] = id
-	t.byNameValue[pairNameValue{f.Name, f.Value}] = id
-	t.ents = append(t.ents, f)
-}
-
-// evictOldest evicts the n oldest entries in the table.
-func (t *headerFieldTable) evictOldest(n int) {
-	if n > t.len() {
-		panic(fmt.Sprintf("evictOldest(%v) on table with %v entries", n, t.len()))
-	}
-	for k := 0; k < n; k++ {
-		f := t.ents[k]
-		id := t.evictCount + uint64(k) + 1
-		if t.byName[f.Name] == id {
-			t.byName[f.Name] = 0
-		}
-		if p := (pairNameValue{f.Name, f.Value}); t.byNameValue[p] == id {
-			t.byNameValue[p] = 0
-		}
-	}
-	copy(t.ents, t.ents[n:])
-	for k := t.len() - n; k < t.len(); k++ {
-		t.ents[k] = HeaderField{} // so strings can be garbage collected
-	}
-	t.ents = t.ents[:t.len()-n]
-	if t.evictCount+uint64(n) < t.evictCount {
-		panic("evictCount overflow")
-	}
-	t.evictCount += uint64(n)
-}
-
-// search finds f in the table. If there is no match, i is 0.
-// If both name and value match, i is the matched index and nameValueMatch
-// becomes true. If only name matches, i points to that index and
-// nameValueMatch becomes false.
-//
-// The returned index is a 1-based HPACK index. For dynamic tables, HPACK says
-// that index 1 should be the newest entry, but t.ents[0] is the oldest entry,
-// meaning t.ents is reversed for dynamic tables. Hence, when t is a dynamic
-// table, the return value i actually refers to the entry t.ents[t.len()-i].
-//
-// All tables are assumed to be a dynamic tables except for the global
-// staticTable pointer.
-//
-// See Section 2.3.3.
-func (t *headerFieldTable) search(f HeaderField) (i uint64, nameValueMatch bool) {
-	if !f.Sensitive {
-		if id := t.byNameValue[pairNameValue{f.Name, f.Value}]; id != 0 {
-			return t.idToIndex(id), true
-		}
-	}
-	if id := t.byName[f.Name]; id != 0 {
-		return t.idToIndex(id), false
-	}
-	return 0, false
-}
-
-// idToIndex converts a unique id to an HPACK index.
-// See Section 2.3.3.
-func (t *headerFieldTable) idToIndex(id uint64) uint64 {
-	if id <= t.evictCount {
-		panic(fmt.Sprintf("id (%v) <= evictCount (%v)", id, t.evictCount))
-	}
-	k := id - t.evictCount - 1 // convert id to an index t.ents[k]
-	if t != staticTable {
-		return uint64(t.len()) - k // dynamic table
-	}
-	return k + 1
-}
-
-func pair(name, value string) HeaderField {
-	return HeaderField{Name: name, Value: value}
-}
-
-// http://tools.ietf.org/html/draft-ietf-httpbis-header-compression-07#appendix-B
-var staticTable = newStaticTable()
-
-func newStaticTable() *headerFieldTable {
-	t := &headerFieldTable{}
-	t.init()
-	t.addEntry(pair(":authority", ""))
-	t.addEntry(pair(":method", "GET"))
-	t.addEntry(pair(":method", "POST"))
-	t.addEntry(pair(":path", "/"))
-	t.addEntry(pair(":path", "/index.html"))
-	t.addEntry(pair(":scheme", "http"))
-	t.addEntry(pair(":scheme", "https"))
-	t.addEntry(pair(":status", "200"))
-	t.addEntry(pair(":status", "204"))
-	t.addEntry(pair(":status", "206"))
-	t.addEntry(pair(":status", "304"))
-	t.addEntry(pair(":status", "400"))
-	t.addEntry(pair(":status", "404"))
-	t.addEntry(pair(":status", "500"))
-	t.addEntry(pair("accept-charset", ""))
-	t.addEntry(pair("accept-encoding", "gzip, deflate"))
-	t.addEntry(pair("accept-language", ""))
-	t.addEntry(pair("accept-ranges", ""))
-	t.addEntry(pair("accept", ""))
-	t.addEntry(pair("access-control-allow-origin", ""))
-	t.addEntry(pair("age", ""))
-	t.addEntry(pair("allow", ""))
-	t.addEntry(pair("authorization", ""))
-	t.addEntry(pair("cache-control", ""))
-	t.addEntry(pair("content-disposition", ""))
-	t.addEntry(pair("content-encoding", ""))
-	t.addEntry(pair("content-language", ""))
-	t.addEntry(pair("content-length", ""))
-	t.addEntry(pair("content-location", ""))
-	t.addEntry(pair("content-range", ""))
-	t.addEntry(pair("content-type", ""))
-	t.addEntry(pair("cookie", ""))
-	t.addEntry(pair("date", ""))
-	t.addEntry(pair("etag", ""))
-	t.addEntry(pair("expect", ""))
-	t.addEntry(pair("expires", ""))
-	t.addEntry(pair("from", ""))
-	t.addEntry(pair("host", ""))
-	t.addEntry(pair("if-match", ""))
-	t.addEntry(pair("if-modified-since", ""))
-	t.addEntry(pair("if-none-match", ""))
-	t.addEntry(pair("if-range", ""))
-	t.addEntry(pair("if-unmodified-since", ""))
-	t.addEntry(pair("last-modified", ""))
-	t.addEntry(pair("link", ""))
-	t.addEntry(pair("location", ""))
-	t.addEntry(pair("max-forwards", ""))
-	t.addEntry(pair("proxy-authenticate", ""))
-	t.addEntry(pair("proxy-authorization", ""))
-	t.addEntry(pair("range", ""))
-	t.addEntry(pair("referer", ""))
-	t.addEntry(pair("refresh", ""))
-	t.addEntry(pair("retry-after", ""))
-	t.addEntry(pair("server", ""))
-	t.addEntry(pair("set-cookie", ""))
-	t.addEntry(pair("strict-transport-security", ""))
-	t.addEntry(pair("transfer-encoding", ""))
-	t.addEntry(pair("user-agent", ""))
-	t.addEntry(pair("vary", ""))
-	t.addEntry(pair("via", ""))
-	t.addEntry(pair("www-authenticate", ""))
-	return t
-}
-
-var huffmanCodes = [256]uint32{
-	0x1ff8,
-	0x7fffd8,
-	0xfffffe2,
-	0xfffffe3,
-	0xfffffe4,
-	0xfffffe5,
-	0xfffffe6,
-	0xfffffe7,
-	0xfffffe8,
-	0xffffea,
-	0x3ffffffc,
-	0xfffffe9,
-	0xfffffea,
-	0x3ffffffd,
-	0xfffffeb,
-	0xfffffec,
-	0xfffffed,
-	0xfffffee,
-	0xfffffef,
-	0xffffff0,
-	0xffffff1,
-	0xffffff2,
-	0x3ffffffe,
-	0xffffff3,
-	0xffffff4,
-	0xffffff5,
-	0xffffff6,
-	0xffffff7,
-	0xffffff8,
-	0xffffff9,
-	0xffffffa,
-	0xffffffb,
-	0x14,
-	0x3f8,
-	0x3f9,
-	0xffa,
-	0x1ff9,
-	0x15,
-	0xf8,
-	0x7fa,
-	0x3fa,
-	0x3fb,
-	0xf9,
-	0x7fb,
-	0xfa,
-	0x16,
-	0x17,
-	0x18,
-	0x0,
-	0x1,
-	0x2,
-	0x19,
-	0x1a,
-	0x1b,
-	0x1c,
-	0x1d,
-	0x1e,
-	0x1f,
-	0x5c,
-	0xfb,
-	0x7ffc,
-	0x20,
-	0xffb,
-	0x3fc,
-	0x1ffa,
-	0x21,
-	0x5d,
-	0x5e,
-	0x5f,
-	0x60,
-	0x61,
-	0x62,
-	0x63,
-	0x64,
-	0x65,
-	0x66,
-	0x67,
-	0x68,
-	0x69,
-	0x6a,
-	0x6b,
-	0x6c,
-	0x6d,
-	0x6e,
-	0x6f,
-	0x70,
-	0x71,
-	0x72,
-	0xfc,
-	0x73,
-	0xfd,
-	0x1ffb,
-	0x7fff0,
-	0x1ffc,
-	0x3ffc,
-	0x22,
-	0x7ffd,
-	0x3,
-	0x23,
-	0x4,
-	0x24,
-	0x5,
-	0x25,
-	0x26,
-	0x27,
-	0x6,
-	0x74,
-	0x75,
-	0x28,
-	0x29,
-	0x2a,
-	0x7,
-	0x2b,
-	0x76,
-	0x2c,
-	0x8,
-	0x9,
-	0x2d,
-	0x77,
-	0x78,
-	0x79,
-	0x7a,
-	0x7b,
-	0x7ffe,
-	0x7fc,
-	0x3ffd,
-	0x1ffd,
-	0xffffffc,
-	0xfffe6,
-	0x3fffd2,
-	0xfffe7,
-	0xfffe8,
-	0x3fffd3,
-	0x3fffd4,
-	0x3fffd5,
-	0x7fffd9,
-	0x3fffd6,
-	0x7fffda,
-	0x7fffdb,
-	0x7fffdc,
-	0x7fffdd,
-	0x7fffde,
-	0xffffeb,
-	0x7fffdf,
-	0xffffec,
-	0xffffed,
-	0x3fffd7,
-	0x7fffe0,
-	0xffffee,
-	0x7fffe1,
-	0x7fffe2,
-	0x7fffe3,
-	0x7fffe4,
-	0x1fffdc,
-	0x3fffd8,
-	0x7fffe5,
-	0x3fffd9,
-	0x7fffe6,
-	0x7fffe7,
-	0xffffef,
-	0x3fffda,
-	0x1fffdd,
-	0xfffe9,
-	0x3fffdb,
-	0x3fffdc,
-	0x7fffe8,
-	0x7fffe9,
-	0x1fffde,
-	0x7fffea,
-	0x3fffdd,
-	0x3fffde,
-	0xfffff0,
-	0x1fffdf,
-	0x3fffdf,
-	0x7fffeb,
-	0x7fffec,
-	0x1fffe0,
-	0x1fffe1,
-	0x3fffe0,
-	0x1fffe2,
-	0x7fffed,
-	0x3fffe1,
-	0x7fffee,
-	0x7fffef,
-	0xfffea,
-	0x3fffe2,
-	0x3fffe3,
-	0x3fffe4,
-	0x7ffff0,
-	0x3fffe5,
-	0x3fffe6,
-	0x7ffff1,
-	0x3ffffe0,
-	0x3ffffe1,
-	0xfffeb,
-	0x7fff1,
-	0x3fffe7,
-	0x7ffff2,
-	0x3fffe8,
-	0x1ffffec,
-	0x3ffffe2,
-	0x3ffffe3,
-	0x3ffffe4,
-	0x7ffffde,
-	0x7ffffdf,
-	0x3ffffe5,
-	0xfffff1,
-	0x1ffffed,
-	0x7fff2,
-	0x1fffe3,
-	0x3ffffe6,
-	0x7ffffe0,
-	0x7ffffe1,
-	0x3ffffe7,
-	0x7ffffe2,
-	0xfffff2,
-	0x1fffe4,
-	0x1fffe5,
-	0x3ffffe8,
-	0x3ffffe9,
-	0xffffffd,
-	0x7ffffe3,
-	0x7ffffe4,
-	0x7ffffe5,
-	0xfffec,
-	0xfffff3,
-	0xfffed,
-	0x1fffe6,
-	0x3fffe9,
-	0x1fffe7,
-	0x1fffe8,
-	0x7ffff3,
-	0x3fffea,
-	0x3fffeb,
-	0x1ffffee,
-	0x1ffffef,
-	0xfffff4,
-	0xfffff5,
-	0x3ffffea,
-	0x7ffff4,
-	0x3ffffeb,
-	0x7ffffe6,
-	0x3ffffec,
-	0x3ffffed,
-	0x7ffffe7,
-	0x7ffffe8,
-	0x7ffffe9,
-	0x7ffffea,
-	0x7ffffeb,
-	0xffffffe,
-	0x7ffffec,
-	0x7ffffed,
-	0x7ffffee,
-	0x7ffffef,
-	0x7fffff0,
-	0x3ffffee,
-}
-
-var huffmanCodeLen = [256]uint8{
-	13, 23, 28, 28, 28, 28, 28, 28, 28, 24, 30, 28, 28, 30, 28, 28,
-	28, 28, 28, 28, 28, 28, 30, 28, 28, 28, 28, 28, 28, 28, 28, 28,
-	6, 10, 10, 12, 13, 6, 8, 11, 10, 10, 8, 11, 8, 6, 6, 6,
-	5, 5, 5, 6, 6, 6, 6, 6, 6, 6, 7, 8, 15, 6, 12, 10,
-	13, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
-	7, 7, 7, 7, 7, 7, 7, 7, 8, 7, 8, 13, 19, 13, 14, 6,
-	15, 5, 6, 5, 6, 5, 6, 6, 6, 5, 7, 7, 6, 6, 6, 5,
-	6, 7, 6, 5, 5, 6, 7, 7, 7, 7, 7, 15, 11, 14, 13, 28,
-	20, 22, 20, 20, 22, 22, 22, 23, 22, 23, 23, 23, 23, 23, 24, 23,
-	24, 24, 22, 23, 24, 23, 23, 23, 23, 21, 22, 23, 22, 23, 23, 24,
-	22, 21, 20, 22, 22, 23, 23, 21, 23, 22, 22, 24, 21, 22, 23, 23,
-	21, 21, 22, 21, 23, 22, 23, 23, 20, 22, 22, 22, 23, 22, 22, 23,
-	26, 26, 20, 19, 22, 23, 22, 25, 26, 26, 26, 27, 27, 26, 24, 25,
-	19, 21, 26, 27, 27, 26, 27, 24, 21, 21, 26, 26, 28, 27, 27, 27,
-	20, 24, 20, 21, 22, 21, 21, 23, 22, 22, 25, 25, 24, 24, 26, 23,
-	26, 27, 26, 26, 27, 27, 27, 27, 27, 28, 27, 27, 27, 27, 27, 26,
-}
diff --git a/installer/vendor/golang.org/x/net/http2/hpack/tables_test.go b/installer/vendor/golang.org/x/net/http2/hpack/tables_test.go
deleted file mode 100644
index 7f40d9a420..0000000000
--- a/installer/vendor/golang.org/x/net/http2/hpack/tables_test.go
+++ /dev/null
@@ -1,188 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package hpack
-
-import (
-	"bufio"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func TestHeaderFieldTable(t *testing.T) {
-	table := &headerFieldTable{}
-	table.init()
-	table.addEntry(pair("key1", "value1-1"))
-	table.addEntry(pair("key2", "value2-1"))
-	table.addEntry(pair("key1", "value1-2"))
-	table.addEntry(pair("key3", "value3-1"))
-	table.addEntry(pair("key4", "value4-1"))
-	table.addEntry(pair("key2", "value2-2"))
-
-	// Tests will be run twice: once before evicting anything, and
-	// again after evicting the three oldest entries.
-	tests := []struct {
-		f                 HeaderField
-		beforeWantStaticI uint64
-		beforeWantMatch   bool
-		afterWantStaticI  uint64
-		afterWantMatch    bool
-	}{
-		{HeaderField{"key1", "value1-1", false}, 1, true, 0, false},
-		{HeaderField{"key1", "value1-2", false}, 3, true, 0, false},
-		{HeaderField{"key1", "value1-3", false}, 3, false, 0, false},
-		{HeaderField{"key2", "value2-1", false}, 2, true, 3, false},
-		{HeaderField{"key2", "value2-2", false}, 6, true, 3, true},
-		{HeaderField{"key2", "value2-3", false}, 6, false, 3, false},
-		{HeaderField{"key4", "value4-1", false}, 5, true, 2, true},
-		// Name match only, because sensitive.
-		{HeaderField{"key4", "value4-1", true}, 5, false, 2, false},
-		// Key not found.
-		{HeaderField{"key5", "value5-x", false}, 0, false, 0, false},
-	}
-
-	staticToDynamic := func(i uint64) uint64 {
-		if i == 0 {
-			return 0
-		}
-		return uint64(table.len()) - i + 1 // dynamic is the reversed table
-	}
-
-	searchStatic := func(f HeaderField) (uint64, bool) {
-		old := staticTable
-		staticTable = table
-		defer func() { staticTable = old }()
-		return staticTable.search(f)
-	}
-
-	searchDynamic := func(f HeaderField) (uint64, bool) {
-		return table.search(f)
-	}
-
-	for _, test := range tests {
-		gotI, gotMatch := searchStatic(test.f)
-		if wantI, wantMatch := test.beforeWantStaticI, test.beforeWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("before evictions: searchStatic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-		gotI, gotMatch = searchDynamic(test.f)
-		wantDynamicI := staticToDynamic(test.beforeWantStaticI)
-		if wantI, wantMatch := wantDynamicI, test.beforeWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("before evictions: searchDynamic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-	}
-
-	table.evictOldest(3)
-
-	for _, test := range tests {
-		gotI, gotMatch := searchStatic(test.f)
-		if wantI, wantMatch := test.afterWantStaticI, test.afterWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("after evictions: searchStatic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-		gotI, gotMatch = searchDynamic(test.f)
-		wantDynamicI := staticToDynamic(test.afterWantStaticI)
-		if wantI, wantMatch := wantDynamicI, test.afterWantMatch; gotI != wantI || gotMatch != wantMatch {
-			t.Errorf("after evictions: searchDynamic(%+v)=%v,%v want %v,%v", test.f, gotI, gotMatch, wantI, wantMatch)
-		}
-	}
-}
-
-func TestStaticTable(t *testing.T) {
-	fromSpec := `
-          +-------+-----------------------------+---------------+
-          | 1     | :authority                  |               |
-          | 2     | :method                     | GET           |
-          | 3     | :method                     | POST          |
-          | 4     | :path                       | /             |
-          | 5     | :path                       | /index.html   |
-          | 6     | :scheme                     | http          |
-          | 7     | :scheme                     | https         |
-          | 8     | :status                     | 200           |
-          | 9     | :status                     | 204           |
-          | 10    | :status                     | 206           |
-          | 11    | :status                     | 304           |
-          | 12    | :status                     | 400           |
-          | 13    | :status                     | 404           |
-          | 14    | :status                     | 500           |
-          | 15    | accept-charset              |               |
-          | 16    | accept-encoding             | gzip, deflate |
-          | 17    | accept-language             |               |
-          | 18    | accept-ranges               |               |
-          | 19    | accept                      |               |
-          | 20    | access-control-allow-origin |               |
-          | 21    | age                         |               |
-          | 22    | allow                       |               |
-          | 23    | authorization               |               |
-          | 24    | cache-control               |               |
-          | 25    | content-disposition         |               |
-          | 26    | content-encoding            |               |
-          | 27    | content-language            |               |
-          | 28    | content-length              |               |
-          | 29    | content-location            |               |
-          | 30    | content-range               |               |
-          | 31    | content-type                |               |
-          | 32    | cookie                      |               |
-          | 33    | date                        |               |
-          | 34    | etag                        |               |
-          | 35    | expect                      |               |
-          | 36    | expires                     |               |
-          | 37    | from                        |               |
-          | 38    | host                        |               |
-          | 39    | if-match                    |               |
-          | 40    | if-modified-since           |               |
-          | 41    | if-none-match               |               |
-          | 42    | if-range                    |               |
-          | 43    | if-unmodified-since         |               |
-          | 44    | last-modified               |               |
-          | 45    | link                        |               |
-          | 46    | location                    |               |
-          | 47    | max-forwards                |               |
-          | 48    | proxy-authenticate          |               |
-          | 49    | proxy-authorization         |               |
-          | 50    | range                       |               |
-          | 51    | referer                     |               |
-          | 52    | refresh                     |               |
-          | 53    | retry-after                 |               |
-          | 54    | server                      |               |
-          | 55    | set-cookie                  |               |
-          | 56    | strict-transport-security   |               |
-          | 57    | transfer-encoding           |               |
-          | 58    | user-agent                  |               |
-          | 59    | vary                        |               |
-          | 60    | via                         |               |
-          | 61    | www-authenticate            |               |
-          +-------+-----------------------------+---------------+
-`
-	bs := bufio.NewScanner(strings.NewReader(fromSpec))
-	re := regexp.MustCompile(`\| (\d+)\s+\| (\S+)\s*\| (\S(.*\S)?)?\s+\|`)
-	for bs.Scan() {
-		l := bs.Text()
-		if !strings.Contains(l, "|") {
-			continue
-		}
-		m := re.FindStringSubmatch(l)
-		if m == nil {
-			continue
-		}
-		i, err := strconv.Atoi(m[1])
-		if err != nil {
-			t.Errorf("Bogus integer on line %q", l)
-			continue
-		}
-		if i < 1 || i > staticTable.len() {
-			t.Errorf("Bogus index %d on line %q", i, l)
-			continue
-		}
-		if got, want := staticTable.ents[i-1].Name, m[2]; got != want {
-			t.Errorf("header index %d name = %q; want %q", i, got, want)
-		}
-		if got, want := staticTable.ents[i-1].Value, m[3]; got != want {
-			t.Errorf("header index %d value = %q; want %q", i, got, want)
-		}
-	}
-	if err := bs.Err(); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/http2.go b/installer/vendor/golang.org/x/net/http2/http2.go
deleted file mode 100644
index b6b0f9ad15..0000000000
--- a/installer/vendor/golang.org/x/net/http2/http2.go
+++ /dev/null
@@ -1,387 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package http2 implements the HTTP/2 protocol.
-//
-// This package is low-level and intended to be used directly by very
-// few people. Most users will use it indirectly through the automatic
-// use by the net/http package (from Go 1.6 and later).
-// For use in earlier Go versions see ConfigureServer. (Transport support
-// requires Go 1.6 or later)
-//
-// See https://http2.github.io/ for more information on HTTP/2.
-//
-// See https://http2.golang.org/ for a test server running this code.
-//
-package http2 // import "golang.org/x/net/http2"
-
-import (
-	"bufio"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-
-	"golang.org/x/net/lex/httplex"
-)
-
-var (
-	VerboseLogs    bool
-	logFrameWrites bool
-	logFrameReads  bool
-	inTests        bool
-)
-
-func init() {
-	e := os.Getenv("GODEBUG")
-	if strings.Contains(e, "http2debug=1") {
-		VerboseLogs = true
-	}
-	if strings.Contains(e, "http2debug=2") {
-		VerboseLogs = true
-		logFrameWrites = true
-		logFrameReads = true
-	}
-}
-
-const (
-	// ClientPreface is the string that must be sent by new
-	// connections from clients.
-	ClientPreface = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"
-
-	// SETTINGS_MAX_FRAME_SIZE default
-	// http://http2.github.io/http2-spec/#rfc.section.6.5.2
-	initialMaxFrameSize = 16384
-
-	// NextProtoTLS is the NPN/ALPN protocol negotiated during
-	// HTTP/2's TLS setup.
-	NextProtoTLS = "h2"
-
-	// http://http2.github.io/http2-spec/#SettingValues
-	initialHeaderTableSize = 4096
-
-	initialWindowSize = 65535 // 6.9.2 Initial Flow Control Window Size
-
-	defaultMaxReadFrameSize = 1 << 20
-)
-
-var (
-	clientPreface = []byte(ClientPreface)
-)
-
-type streamState int
-
-// HTTP/2 stream states.
-//
-// See http://tools.ietf.org/html/rfc7540#section-5.1.
-//
-// For simplicity, the server code merges "reserved (local)" into
-// "half-closed (remote)". This is one less state transition to track.
-// The only downside is that we send PUSH_PROMISEs slightly less
-// liberally than allowable. More discussion here:
-// https://lists.w3.org/Archives/Public/ietf-http-wg/2016JulSep/0599.html
-//
-// "reserved (remote)" is omitted since the client code does not
-// support server push.
-const (
-	stateIdle streamState = iota
-	stateOpen
-	stateHalfClosedLocal
-	stateHalfClosedRemote
-	stateClosed
-)
-
-var stateName = [...]string{
-	stateIdle:             "Idle",
-	stateOpen:             "Open",
-	stateHalfClosedLocal:  "HalfClosedLocal",
-	stateHalfClosedRemote: "HalfClosedRemote",
-	stateClosed:           "Closed",
-}
-
-func (st streamState) String() string {
-	return stateName[st]
-}
-
-// Setting is a setting parameter: which setting it is, and its value.
-type Setting struct {
-	// ID is which setting is being set.
-	// See http://http2.github.io/http2-spec/#SettingValues
-	ID SettingID
-
-	// Val is the value.
-	Val uint32
-}
-
-func (s Setting) String() string {
-	return fmt.Sprintf("[%v = %d]", s.ID, s.Val)
-}
-
-// Valid reports whether the setting is valid.
-func (s Setting) Valid() error {
-	// Limits and error codes from 6.5.2 Defined SETTINGS Parameters
-	switch s.ID {
-	case SettingEnablePush:
-		if s.Val != 1 && s.Val != 0 {
-			return ConnectionError(ErrCodeProtocol)
-		}
-	case SettingInitialWindowSize:
-		if s.Val > 1<<31-1 {
-			return ConnectionError(ErrCodeFlowControl)
-		}
-	case SettingMaxFrameSize:
-		if s.Val < 16384 || s.Val > 1<<24-1 {
-			return ConnectionError(ErrCodeProtocol)
-		}
-	}
-	return nil
-}
-
-// A SettingID is an HTTP/2 setting as defined in
-// http://http2.github.io/http2-spec/#iana-settings
-type SettingID uint16
-
-const (
-	SettingHeaderTableSize      SettingID = 0x1
-	SettingEnablePush           SettingID = 0x2
-	SettingMaxConcurrentStreams SettingID = 0x3
-	SettingInitialWindowSize    SettingID = 0x4
-	SettingMaxFrameSize         SettingID = 0x5
-	SettingMaxHeaderListSize    SettingID = 0x6
-)
-
-var settingName = map[SettingID]string{
-	SettingHeaderTableSize:      "HEADER_TABLE_SIZE",
-	SettingEnablePush:           "ENABLE_PUSH",
-	SettingMaxConcurrentStreams: "MAX_CONCURRENT_STREAMS",
-	SettingInitialWindowSize:    "INITIAL_WINDOW_SIZE",
-	SettingMaxFrameSize:         "MAX_FRAME_SIZE",
-	SettingMaxHeaderListSize:    "MAX_HEADER_LIST_SIZE",
-}
-
-func (s SettingID) String() string {
-	if v, ok := settingName[s]; ok {
-		return v
-	}
-	return fmt.Sprintf("UNKNOWN_SETTING_%d", uint16(s))
-}
-
-var (
-	errInvalidHeaderFieldName  = errors.New("http2: invalid header field name")
-	errInvalidHeaderFieldValue = errors.New("http2: invalid header field value")
-)
-
-// validWireHeaderFieldName reports whether v is a valid header field
-// name (key). See httplex.ValidHeaderName for the base rules.
-//
-// Further, http2 says:
-//   "Just as in HTTP/1.x, header field names are strings of ASCII
-//   characters that are compared in a case-insensitive
-//   fashion. However, header field names MUST be converted to
-//   lowercase prior to their encoding in HTTP/2. "
-func validWireHeaderFieldName(v string) bool {
-	if len(v) == 0 {
-		return false
-	}
-	for _, r := range v {
-		if !httplex.IsTokenRune(r) {
-			return false
-		}
-		if 'A' <= r && r <= 'Z' {
-			return false
-		}
-	}
-	return true
-}
-
-var httpCodeStringCommon = map[int]string{} // n -> strconv.Itoa(n)
-
-func init() {
-	for i := 100; i <= 999; i++ {
-		if v := http.StatusText(i); v != "" {
-			httpCodeStringCommon[i] = strconv.Itoa(i)
-		}
-	}
-}
-
-func httpCodeString(code int) string {
-	if s, ok := httpCodeStringCommon[code]; ok {
-		return s
-	}
-	return strconv.Itoa(code)
-}
-
-// from pkg io
-type stringWriter interface {
-	WriteString(s string) (n int, err error)
-}
-
-// A gate lets two goroutines coordinate their activities.
-type gate chan struct{}
-
-func (g gate) Done() { g <- struct{}{} }
-func (g gate) Wait() { <-g }
-
-// A closeWaiter is like a sync.WaitGroup but only goes 1 to 0 (open to closed).
-type closeWaiter chan struct{}
-
-// Init makes a closeWaiter usable.
-// It exists because so a closeWaiter value can be placed inside a
-// larger struct and have the Mutex and Cond's memory in the same
-// allocation.
-func (cw *closeWaiter) Init() {
-	*cw = make(chan struct{})
-}
-
-// Close marks the closeWaiter as closed and unblocks any waiters.
-func (cw closeWaiter) Close() {
-	close(cw)
-}
-
-// Wait waits for the closeWaiter to become closed.
-func (cw closeWaiter) Wait() {
-	<-cw
-}
-
-// bufferedWriter is a buffered writer that writes to w.
-// Its buffered writer is lazily allocated as needed, to minimize
-// idle memory usage with many connections.
-type bufferedWriter struct {
-	w  io.Writer     // immutable
-	bw *bufio.Writer // non-nil when data is buffered
-}
-
-func newBufferedWriter(w io.Writer) *bufferedWriter {
-	return &bufferedWriter{w: w}
-}
-
-// bufWriterPoolBufferSize is the size of bufio.Writer's
-// buffers created using bufWriterPool.
-//
-// TODO: pick a less arbitrary value? this is a bit under
-// (3 x typical 1500 byte MTU) at least. Other than that,
-// not much thought went into it.
-const bufWriterPoolBufferSize = 4 << 10
-
-var bufWriterPool = sync.Pool{
-	New: func() interface{} {
-		return bufio.NewWriterSize(nil, bufWriterPoolBufferSize)
-	},
-}
-
-func (w *bufferedWriter) Available() int {
-	if w.bw == nil {
-		return bufWriterPoolBufferSize
-	}
-	return w.bw.Available()
-}
-
-func (w *bufferedWriter) Write(p []byte) (n int, err error) {
-	if w.bw == nil {
-		bw := bufWriterPool.Get().(*bufio.Writer)
-		bw.Reset(w.w)
-		w.bw = bw
-	}
-	return w.bw.Write(p)
-}
-
-func (w *bufferedWriter) Flush() error {
-	bw := w.bw
-	if bw == nil {
-		return nil
-	}
-	err := bw.Flush()
-	bw.Reset(nil)
-	bufWriterPool.Put(bw)
-	w.bw = nil
-	return err
-}
-
-func mustUint31(v int32) uint32 {
-	if v < 0 || v > 2147483647 {
-		panic("out of range")
-	}
-	return uint32(v)
-}
-
-// bodyAllowedForStatus reports whether a given response status code
-// permits a body. See RFC 2616, section 4.4.
-func bodyAllowedForStatus(status int) bool {
-	switch {
-	case status >= 100 && status <= 199:
-		return false
-	case status == 204:
-		return false
-	case status == 304:
-		return false
-	}
-	return true
-}
-
-type httpError struct {
-	msg     string
-	timeout bool
-}
-
-func (e *httpError) Error() string   { return e.msg }
-func (e *httpError) Timeout() bool   { return e.timeout }
-func (e *httpError) Temporary() bool { return true }
-
-var errTimeout error = &httpError{msg: "http2: timeout awaiting response headers", timeout: true}
-
-type connectionStater interface {
-	ConnectionState() tls.ConnectionState
-}
-
-var sorterPool = sync.Pool{New: func() interface{} { return new(sorter) }}
-
-type sorter struct {
-	v []string // owned by sorter
-}
-
-func (s *sorter) Len() int           { return len(s.v) }
-func (s *sorter) Swap(i, j int)      { s.v[i], s.v[j] = s.v[j], s.v[i] }
-func (s *sorter) Less(i, j int) bool { return s.v[i] < s.v[j] }
-
-// Keys returns the sorted keys of h.
-//
-// The returned slice is only valid until s used again or returned to
-// its pool.
-func (s *sorter) Keys(h http.Header) []string {
-	keys := s.v[:0]
-	for k := range h {
-		keys = append(keys, k)
-	}
-	s.v = keys
-	sort.Sort(s)
-	return keys
-}
-
-func (s *sorter) SortStrings(ss []string) {
-	// Our sorter works on s.v, which sorter owns, so
-	// stash it away while we sort the user's buffer.
-	save := s.v
-	s.v = ss
-	sort.Sort(s)
-	s.v = save
-}
-
-// validPseudoPath reports whether v is a valid :path pseudo-header
-// value. It must be either:
-//
-//     *) a non-empty string starting with '/', but not with with "//",
-//     *) the string '*', for OPTIONS requests.
-//
-// For now this is only used a quick check for deciding when to clean
-// up Opaque URLs before sending requests from the Transport.
-// See golang.org/issue/16847
-func validPseudoPath(v string) bool {
-	return (len(v) > 0 && v[0] == '/' && (len(v) == 1 || v[1] != '/')) || v == "*"
-}
diff --git a/installer/vendor/golang.org/x/net/http2/http2_test.go b/installer/vendor/golang.org/x/net/http2/http2_test.go
deleted file mode 100644
index 5248776470..0000000000
--- a/installer/vendor/golang.org/x/net/http2/http2_test.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"net/http"
-	"os/exec"
-	"strconv"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var knownFailing = flag.Bool("known_failing", false, "Run known-failing tests.")
-
-func condSkipFailingTest(t *testing.T) {
-	if !*knownFailing {
-		t.Skip("Skipping known-failing test without --known_failing")
-	}
-}
-
-func init() {
-	inTests = true
-	DebugGoroutines = true
-	flag.BoolVar(&VerboseLogs, "verboseh2", VerboseLogs, "Verbose HTTP/2 debug logging")
-}
-
-func TestSettingString(t *testing.T) {
-	tests := []struct {
-		s    Setting
-		want string
-	}{
-		{Setting{SettingMaxFrameSize, 123}, "[MAX_FRAME_SIZE = 123]"},
-		{Setting{1<<16 - 1, 123}, "[UNKNOWN_SETTING_65535 = 123]"},
-	}
-	for i, tt := range tests {
-		got := fmt.Sprint(tt.s)
-		if got != tt.want {
-			t.Errorf("%d. for %#v, string = %q; want %q", i, tt.s, got, tt.want)
-		}
-	}
-}
-
-type twriter struct {
-	t  testing.TB
-	st *serverTester // optional
-}
-
-func (w twriter) Write(p []byte) (n int, err error) {
-	if w.st != nil {
-		ps := string(p)
-		for _, phrase := range w.st.logFilter {
-			if strings.Contains(ps, phrase) {
-				return len(p), nil // no logging
-			}
-		}
-	}
-	w.t.Logf("%s", p)
-	return len(p), nil
-}
-
-// like encodeHeader, but don't add implicit pseudo headers.
-func encodeHeaderNoImplicit(t *testing.T, headers ...string) []byte {
-	var buf bytes.Buffer
-	enc := hpack.NewEncoder(&buf)
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		headers = headers[2:]
-		if err := enc.WriteField(hpack.HeaderField{Name: k, Value: v}); err != nil {
-			t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-		}
-	}
-	return buf.Bytes()
-}
-
-// Verify that curl has http2.
-func requireCurl(t *testing.T) {
-	out, err := dockerLogs(curl(t, "--version"))
-	if err != nil {
-		t.Skipf("failed to determine curl features; skipping test")
-	}
-	if !strings.Contains(string(out), "HTTP2") {
-		t.Skip("curl doesn't support HTTP2; skipping test")
-	}
-}
-
-func curl(t *testing.T, args ...string) (container string) {
-	out, err := exec.Command("docker", append([]string{"run", "-d", "--net=host", "gohttp2/curl"}, args...)...).Output()
-	if err != nil {
-		t.Skipf("Failed to run curl in docker: %v, %s", err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-// Verify that h2load exists.
-func requireH2load(t *testing.T) {
-	out, err := dockerLogs(h2load(t, "--version"))
-	if err != nil {
-		t.Skipf("failed to probe h2load; skipping test: %s", out)
-	}
-	if !strings.Contains(string(out), "h2load nghttp2/") {
-		t.Skipf("h2load not present; skipping test. (Output=%q)", out)
-	}
-}
-
-func h2load(t *testing.T, args ...string) (container string) {
-	out, err := exec.Command("docker", append([]string{"run", "-d", "--net=host", "--entrypoint=/usr/local/bin/h2load", "gohttp2/curl"}, args...)...).Output()
-	if err != nil {
-		t.Skipf("Failed to run h2load in docker: %v, %s", err, out)
-	}
-	return strings.TrimSpace(string(out))
-}
-
-type puppetCommand struct {
-	fn   func(w http.ResponseWriter, r *http.Request)
-	done chan<- bool
-}
-
-type handlerPuppet struct {
-	ch chan puppetCommand
-}
-
-func newHandlerPuppet() *handlerPuppet {
-	return &handlerPuppet{
-		ch: make(chan puppetCommand),
-	}
-}
-
-func (p *handlerPuppet) act(w http.ResponseWriter, r *http.Request) {
-	for cmd := range p.ch {
-		cmd.fn(w, r)
-		cmd.done <- true
-	}
-}
-
-func (p *handlerPuppet) done() { close(p.ch) }
-func (p *handlerPuppet) do(fn func(http.ResponseWriter, *http.Request)) {
-	done := make(chan bool)
-	p.ch <- puppetCommand{fn, done}
-	<-done
-}
-func dockerLogs(container string) ([]byte, error) {
-	out, err := exec.Command("docker", "wait", container).CombinedOutput()
-	if err != nil {
-		return out, err
-	}
-	exitStatus, err := strconv.Atoi(strings.TrimSpace(string(out)))
-	if err != nil {
-		return out, errors.New("unexpected exit status from docker wait")
-	}
-	out, err = exec.Command("docker", "logs", container).CombinedOutput()
-	exec.Command("docker", "rm", container).Run()
-	if err == nil && exitStatus != 0 {
-		err = fmt.Errorf("exit status %d: %s", exitStatus, out)
-	}
-	return out, err
-}
-
-func kill(container string) {
-	exec.Command("docker", "kill", container).Run()
-	exec.Command("docker", "rm", container).Run()
-}
-
-func cleanDate(res *http.Response) {
-	if d := res.Header["Date"]; len(d) == 1 {
-		d[0] = "XXX"
-	}
-}
-
-func TestSorterPoolAllocs(t *testing.T) {
-	ss := []string{"a", "b", "c"}
-	h := http.Header{
-		"a": nil,
-		"b": nil,
-		"c": nil,
-	}
-	sorter := new(sorter)
-
-	if allocs := testing.AllocsPerRun(100, func() {
-		sorter.SortStrings(ss)
-	}); allocs >= 1 {
-		t.Logf("SortStrings allocs = %v; want <1", allocs)
-	}
-
-	if allocs := testing.AllocsPerRun(5, func() {
-		if len(sorter.Keys(h)) != 3 {
-			t.Fatal("wrong result")
-		}
-	}); allocs > 0 {
-		t.Logf("Keys allocs = %v; want <1", allocs)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/not_go16.go b/installer/vendor/golang.org/x/net/http2/not_go16.go
deleted file mode 100644
index efd2e1282c..0000000000
--- a/installer/vendor/golang.org/x/net/http2/not_go16.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.6
-
-package http2
-
-import (
-	"crypto/tls"
-	"net/http"
-	"time"
-)
-
-func configureTransport(t1 *http.Transport) (*Transport, error) {
-	return nil, errTransportVersion
-}
-
-func transportExpectContinueTimeout(t1 *http.Transport) time.Duration {
-	return 0
-
-}
-
-// isBadCipher reports whether the cipher is blacklisted by the HTTP/2 spec.
-func isBadCipher(cipher uint16) bool {
-	switch cipher {
-	case tls.TLS_RSA_WITH_RC4_128_SHA,
-		tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-		tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-		tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA:
-		// Reject cipher suites from Appendix A.
-		// "This list includes those cipher suites that do not
-		// offer an ephemeral key exchange and those that are
-		// based on the TLS null, stream or block cipher type"
-		return true
-	default:
-		return false
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/not_go17.go b/installer/vendor/golang.org/x/net/http2/not_go17.go
deleted file mode 100644
index 140434a791..0000000000
--- a/installer/vendor/golang.org/x/net/http2/not_go17.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package http2
-
-import (
-	"crypto/tls"
-	"net"
-	"net/http"
-	"time"
-)
-
-type contextContext interface {
-	Done() <-chan struct{}
-	Err() error
-}
-
-type fakeContext struct{}
-
-func (fakeContext) Done() <-chan struct{} { return nil }
-func (fakeContext) Err() error            { panic("should not be called") }
-
-func reqContext(r *http.Request) fakeContext {
-	return fakeContext{}
-}
-
-func setResponseUncompressed(res *http.Response) {
-	// Nothing.
-}
-
-type clientTrace struct{}
-
-func requestTrace(*http.Request) *clientTrace { return nil }
-func traceGotConn(*http.Request, *ClientConn) {}
-func traceFirstResponseByte(*clientTrace)     {}
-func traceWroteHeaders(*clientTrace)          {}
-func traceWroteRequest(*clientTrace, error)   {}
-func traceGot100Continue(trace *clientTrace)  {}
-func traceWait100Continue(trace *clientTrace) {}
-
-func nop() {}
-
-func serverConnBaseContext(c net.Conn, opts *ServeConnOpts) (ctx contextContext, cancel func()) {
-	return nil, nop
-}
-
-func contextWithCancel(ctx contextContext) (_ contextContext, cancel func()) {
-	return ctx, nop
-}
-
-func requestWithContext(req *http.Request, ctx contextContext) *http.Request {
-	return req
-}
-
-// temporary copy of Go 1.6's private tls.Config.clone:
-func cloneTLSConfig(c *tls.Config) *tls.Config {
-	return &tls.Config{
-		Rand:                     c.Rand,
-		Time:                     c.Time,
-		Certificates:             c.Certificates,
-		NameToCertificate:        c.NameToCertificate,
-		GetCertificate:           c.GetCertificate,
-		RootCAs:                  c.RootCAs,
-		NextProtos:               c.NextProtos,
-		ServerName:               c.ServerName,
-		ClientAuth:               c.ClientAuth,
-		ClientCAs:                c.ClientCAs,
-		InsecureSkipVerify:       c.InsecureSkipVerify,
-		CipherSuites:             c.CipherSuites,
-		PreferServerCipherSuites: c.PreferServerCipherSuites,
-		SessionTicketsDisabled:   c.SessionTicketsDisabled,
-		SessionTicketKey:         c.SessionTicketKey,
-		ClientSessionCache:       c.ClientSessionCache,
-		MinVersion:               c.MinVersion,
-		MaxVersion:               c.MaxVersion,
-		CurvePreferences:         c.CurvePreferences,
-	}
-}
-
-func (cc *ClientConn) Ping(ctx contextContext) error {
-	return cc.ping(ctx)
-}
-
-func (t *Transport) idleConnTimeout() time.Duration { return 0 }
diff --git a/installer/vendor/golang.org/x/net/http2/not_go18.go b/installer/vendor/golang.org/x/net/http2/not_go18.go
deleted file mode 100644
index efbf83c32c..0000000000
--- a/installer/vendor/golang.org/x/net/http2/not_go18.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.8
-
-package http2
-
-import (
-	"io"
-	"net/http"
-)
-
-func configureServer18(h1 *http.Server, h2 *Server) error {
-	// No IdleTimeout to sync prior to Go 1.8.
-	return nil
-}
-
-func shouldLogPanic(panicValue interface{}) bool {
-	return panicValue != nil
-}
-
-func reqGetBody(req *http.Request) func() (io.ReadCloser, error) {
-	return nil
-}
-
-func reqBodyIsNoBody(io.ReadCloser) bool { return false }
diff --git a/installer/vendor/golang.org/x/net/http2/pipe.go b/installer/vendor/golang.org/x/net/http2/pipe.go
deleted file mode 100644
index 914aaf8a7f..0000000000
--- a/installer/vendor/golang.org/x/net/http2/pipe.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"errors"
-	"io"
-	"sync"
-)
-
-// pipe is a goroutine-safe io.Reader/io.Writer pair. It's like
-// io.Pipe except there are no PipeReader/PipeWriter halves, and the
-// underlying buffer is an interface. (io.Pipe is always unbuffered)
-type pipe struct {
-	mu       sync.Mutex
-	c        sync.Cond // c.L lazily initialized to &p.mu
-	b        pipeBuffer
-	err      error         // read error once empty. non-nil means closed.
-	breakErr error         // immediate read error (caller doesn't see rest of b)
-	donec    chan struct{} // closed on error
-	readFn   func()        // optional code to run in Read before error
-}
-
-type pipeBuffer interface {
-	Len() int
-	io.Writer
-	io.Reader
-}
-
-func (p *pipe) Len() int {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	return p.b.Len()
-}
-
-// Read waits until data is available and copies bytes
-// from the buffer into p.
-func (p *pipe) Read(d []byte) (n int, err error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.c.L == nil {
-		p.c.L = &p.mu
-	}
-	for {
-		if p.breakErr != nil {
-			return 0, p.breakErr
-		}
-		if p.b.Len() > 0 {
-			return p.b.Read(d)
-		}
-		if p.err != nil {
-			if p.readFn != nil {
-				p.readFn()     // e.g. copy trailers
-				p.readFn = nil // not sticky like p.err
-			}
-			return 0, p.err
-		}
-		p.c.Wait()
-	}
-}
-
-var errClosedPipeWrite = errors.New("write on closed buffer")
-
-// Write copies bytes from p into the buffer and wakes a reader.
-// It is an error to write more data than the buffer can hold.
-func (p *pipe) Write(d []byte) (n int, err error) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.c.L == nil {
-		p.c.L = &p.mu
-	}
-	defer p.c.Signal()
-	if p.err != nil {
-		return 0, errClosedPipeWrite
-	}
-	return p.b.Write(d)
-}
-
-// CloseWithError causes the next Read (waking up a current blocked
-// Read if needed) to return the provided err after all data has been
-// read.
-//
-// The error must be non-nil.
-func (p *pipe) CloseWithError(err error) { p.closeWithError(&p.err, err, nil) }
-
-// BreakWithError causes the next Read (waking up a current blocked
-// Read if needed) to return the provided err immediately, without
-// waiting for unread data.
-func (p *pipe) BreakWithError(err error) { p.closeWithError(&p.breakErr, err, nil) }
-
-// closeWithErrorAndCode is like CloseWithError but also sets some code to run
-// in the caller's goroutine before returning the error.
-func (p *pipe) closeWithErrorAndCode(err error, fn func()) { p.closeWithError(&p.err, err, fn) }
-
-func (p *pipe) closeWithError(dst *error, err error, fn func()) {
-	if err == nil {
-		panic("err must be non-nil")
-	}
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.c.L == nil {
-		p.c.L = &p.mu
-	}
-	defer p.c.Signal()
-	if *dst != nil {
-		// Already been done.
-		return
-	}
-	p.readFn = fn
-	*dst = err
-	p.closeDoneLocked()
-}
-
-// requires p.mu be held.
-func (p *pipe) closeDoneLocked() {
-	if p.donec == nil {
-		return
-	}
-	// Close if unclosed. This isn't racy since we always
-	// hold p.mu while closing.
-	select {
-	case <-p.donec:
-	default:
-		close(p.donec)
-	}
-}
-
-// Err returns the error (if any) first set by BreakWithError or CloseWithError.
-func (p *pipe) Err() error {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.breakErr != nil {
-		return p.breakErr
-	}
-	return p.err
-}
-
-// Done returns a channel which is closed if and when this pipe is closed
-// with CloseWithError.
-func (p *pipe) Done() <-chan struct{} {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.donec == nil {
-		p.donec = make(chan struct{})
-		if p.err != nil || p.breakErr != nil {
-			// Already hit an error.
-			p.closeDoneLocked()
-		}
-	}
-	return p.donec
-}
diff --git a/installer/vendor/golang.org/x/net/http2/pipe_test.go b/installer/vendor/golang.org/x/net/http2/pipe_test.go
deleted file mode 100644
index 7632299996..0000000000
--- a/installer/vendor/golang.org/x/net/http2/pipe_test.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"errors"
-	"io"
-	"io/ioutil"
-	"testing"
-)
-
-func TestPipeClose(t *testing.T) {
-	var p pipe
-	p.b = new(bytes.Buffer)
-	a := errors.New("a")
-	b := errors.New("b")
-	p.CloseWithError(a)
-	p.CloseWithError(b)
-	_, err := p.Read(make([]byte, 1))
-	if err != a {
-		t.Errorf("err = %v want %v", err, a)
-	}
-}
-
-func TestPipeDoneChan(t *testing.T) {
-	var p pipe
-	done := p.Done()
-	select {
-	case <-done:
-		t.Fatal("done too soon")
-	default:
-	}
-	p.CloseWithError(io.EOF)
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_ErrFirst(t *testing.T) {
-	var p pipe
-	p.CloseWithError(io.EOF)
-	done := p.Done()
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_Break(t *testing.T) {
-	var p pipe
-	done := p.Done()
-	select {
-	case <-done:
-		t.Fatal("done too soon")
-	default:
-	}
-	p.BreakWithError(io.EOF)
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeDoneChan_Break_ErrFirst(t *testing.T) {
-	var p pipe
-	p.BreakWithError(io.EOF)
-	done := p.Done()
-	select {
-	case <-done:
-	default:
-		t.Fatal("should be done")
-	}
-}
-
-func TestPipeCloseWithError(t *testing.T) {
-	p := &pipe{b: new(bytes.Buffer)}
-	const body = "foo"
-	io.WriteString(p, body)
-	a := errors.New("test error")
-	p.CloseWithError(a)
-	all, err := ioutil.ReadAll(p)
-	if string(all) != body {
-		t.Errorf("read bytes = %q; want %q", all, body)
-	}
-	if err != a {
-		t.Logf("read error = %v, %v", err, a)
-	}
-}
-
-func TestPipeBreakWithError(t *testing.T) {
-	p := &pipe{b: new(bytes.Buffer)}
-	io.WriteString(p, "foo")
-	a := errors.New("test err")
-	p.BreakWithError(a)
-	all, err := ioutil.ReadAll(p)
-	if string(all) != "" {
-		t.Errorf("read bytes = %q; want empty string", all)
-	}
-	if err != a {
-		t.Logf("read error = %v, %v", err, a)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/server.go b/installer/vendor/golang.org/x/net/http2/server.go
deleted file mode 100644
index 550427dda6..0000000000
--- a/installer/vendor/golang.org/x/net/http2/server.go
+++ /dev/null
@@ -1,2758 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO: turn off the serve goroutine when idle, so
-// an idle conn only has the readFrames goroutine active. (which could
-// also be optimized probably to pin less memory in crypto/tls). This
-// would involve tracking when the serve goroutine is active (atomic
-// int32 read/CAS probably?) and starting it up when frames arrive,
-// and shutting it down when all handlers exit. the occasional PING
-// packets could use time.AfterFunc to call sc.wakeStartServeLoop()
-// (which is a no-op if already running) and then queue the PING write
-// as normal. The serve loop would then exit in most cases (if no
-// Handlers running) and not be woken up again until the PING packet
-// returns.
-
-// TODO (maybe): add a mechanism for Handlers to going into
-// half-closed-local mode (rw.(io.Closer) test?) but not exit their
-// handler, and continue to be able to read from the
-// Request.Body. This would be a somewhat semantic change from HTTP/1
-// (or at least what we expose in net/http), so I'd probably want to
-// add it there too. For now, this package says that returning from
-// the Handler ServeHTTP function means you're both done reading and
-// done writing, without a way to stop just one or the other.
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"math"
-	"net"
-	"net/http"
-	"net/textproto"
-	"net/url"
-	"os"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-const (
-	prefaceTimeout        = 10 * time.Second
-	firstSettingsTimeout  = 2 * time.Second // should be in-flight with preface anyway
-	handlerChunkWriteSize = 4 << 10
-	defaultMaxStreams     = 250 // TODO: make this 100 as the GFE seems to?
-)
-
-var (
-	errClientDisconnected = errors.New("client disconnected")
-	errClosedBody         = errors.New("body closed by handler")
-	errHandlerComplete    = errors.New("http2: request body closed due to handler exiting")
-	errStreamClosed       = errors.New("http2: stream closed")
-)
-
-var responseWriterStatePool = sync.Pool{
-	New: func() interface{} {
-		rws := &responseWriterState{}
-		rws.bw = bufio.NewWriterSize(chunkWriter{rws}, handlerChunkWriteSize)
-		return rws
-	},
-}
-
-// Test hooks.
-var (
-	testHookOnConn        func()
-	testHookGetServerConn func(*serverConn)
-	testHookOnPanicMu     *sync.Mutex // nil except in tests
-	testHookOnPanic       func(sc *serverConn, panicVal interface{}) (rePanic bool)
-)
-
-// Server is an HTTP/2 server.
-type Server struct {
-	// MaxHandlers limits the number of http.Handler ServeHTTP goroutines
-	// which may run at a time over all connections.
-	// Negative or zero no limit.
-	// TODO: implement
-	MaxHandlers int
-
-	// MaxConcurrentStreams optionally specifies the number of
-	// concurrent streams that each client may have open at a
-	// time. This is unrelated to the number of http.Handler goroutines
-	// which may be active globally, which is MaxHandlers.
-	// If zero, MaxConcurrentStreams defaults to at least 100, per
-	// the HTTP/2 spec's recommendations.
-	MaxConcurrentStreams uint32
-
-	// MaxReadFrameSize optionally specifies the largest frame
-	// this server is willing to read. A valid value is between
-	// 16k and 16M, inclusive. If zero or otherwise invalid, a
-	// default value is used.
-	MaxReadFrameSize uint32
-
-	// PermitProhibitedCipherSuites, if true, permits the use of
-	// cipher suites prohibited by the HTTP/2 spec.
-	PermitProhibitedCipherSuites bool
-
-	// IdleTimeout specifies how long until idle clients should be
-	// closed with a GOAWAY frame. PING frames are not considered
-	// activity for the purposes of IdleTimeout.
-	IdleTimeout time.Duration
-
-	// MaxUploadBufferPerConnection is the size of the initial flow
-	// control window for each connections. The HTTP/2 spec does not
-	// allow this to be smaller than 65535 or larger than 2^32-1.
-	// If the value is outside this range, a default value will be
-	// used instead.
-	MaxUploadBufferPerConnection int32
-
-	// MaxUploadBufferPerStream is the size of the initial flow control
-	// window for each stream. The HTTP/2 spec does not allow this to
-	// be larger than 2^32-1. If the value is zero or larger than the
-	// maximum, a default value will be used instead.
-	MaxUploadBufferPerStream int32
-
-	// NewWriteScheduler constructs a write scheduler for a connection.
-	// If nil, a default scheduler is chosen.
-	NewWriteScheduler func() WriteScheduler
-}
-
-func (s *Server) initialConnRecvWindowSize() int32 {
-	if s.MaxUploadBufferPerConnection > initialWindowSize {
-		return s.MaxUploadBufferPerConnection
-	}
-	return 1 << 20
-}
-
-func (s *Server) initialStreamRecvWindowSize() int32 {
-	if s.MaxUploadBufferPerStream > 0 {
-		return s.MaxUploadBufferPerStream
-	}
-	return 1 << 20
-}
-
-func (s *Server) maxReadFrameSize() uint32 {
-	if v := s.MaxReadFrameSize; v >= minMaxFrameSize && v <= maxFrameSize {
-		return v
-	}
-	return defaultMaxReadFrameSize
-}
-
-func (s *Server) maxConcurrentStreams() uint32 {
-	if v := s.MaxConcurrentStreams; v > 0 {
-		return v
-	}
-	return defaultMaxStreams
-}
-
-// ConfigureServer adds HTTP/2 support to a net/http Server.
-//
-// The configuration conf may be nil.
-//
-// ConfigureServer must be called before s begins serving.
-func ConfigureServer(s *http.Server, conf *Server) error {
-	if s == nil {
-		panic("nil *http.Server")
-	}
-	if conf == nil {
-		conf = new(Server)
-	}
-	if err := configureServer18(s, conf); err != nil {
-		return err
-	}
-
-	if s.TLSConfig == nil {
-		s.TLSConfig = new(tls.Config)
-	} else if s.TLSConfig.CipherSuites != nil {
-		// If they already provided a CipherSuite list, return
-		// an error if it has a bad order or is missing
-		// ECDHE_RSA_WITH_AES_128_GCM_SHA256.
-		const requiredCipher = tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-		haveRequired := false
-		sawBad := false
-		for i, cs := range s.TLSConfig.CipherSuites {
-			if cs == requiredCipher {
-				haveRequired = true
-			}
-			if isBadCipher(cs) {
-				sawBad = true
-			} else if sawBad {
-				return fmt.Errorf("http2: TLSConfig.CipherSuites index %d contains an HTTP/2-approved cipher suite (%#04x), but it comes after unapproved cipher suites. With this configuration, clients that don't support previous, approved cipher suites may be given an unapproved one and reject the connection.", i, cs)
-			}
-		}
-		if !haveRequired {
-			return fmt.Errorf("http2: TLSConfig.CipherSuites is missing HTTP/2-required TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256")
-		}
-	}
-
-	// Note: not setting MinVersion to tls.VersionTLS12,
-	// as we don't want to interfere with HTTP/1.1 traffic
-	// on the user's server. We enforce TLS 1.2 later once
-	// we accept a connection. Ideally this should be done
-	// during next-proto selection, but using TLS <1.2 with
-	// HTTP/2 is still the client's bug.
-
-	s.TLSConfig.PreferServerCipherSuites = true
-
-	haveNPN := false
-	for _, p := range s.TLSConfig.NextProtos {
-		if p == NextProtoTLS {
-			haveNPN = true
-			break
-		}
-	}
-	if !haveNPN {
-		s.TLSConfig.NextProtos = append(s.TLSConfig.NextProtos, NextProtoTLS)
-	}
-
-	if s.TLSNextProto == nil {
-		s.TLSNextProto = map[string]func(*http.Server, *tls.Conn, http.Handler){}
-	}
-	protoHandler := func(hs *http.Server, c *tls.Conn, h http.Handler) {
-		if testHookOnConn != nil {
-			testHookOnConn()
-		}
-		conf.ServeConn(c, &ServeConnOpts{
-			Handler:    h,
-			BaseConfig: hs,
-		})
-	}
-	s.TLSNextProto[NextProtoTLS] = protoHandler
-	return nil
-}
-
-// ServeConnOpts are options for the Server.ServeConn method.
-type ServeConnOpts struct {
-	// BaseConfig optionally sets the base configuration
-	// for values. If nil, defaults are used.
-	BaseConfig *http.Server
-
-	// Handler specifies which handler to use for processing
-	// requests. If nil, BaseConfig.Handler is used. If BaseConfig
-	// or BaseConfig.Handler is nil, http.DefaultServeMux is used.
-	Handler http.Handler
-}
-
-func (o *ServeConnOpts) baseConfig() *http.Server {
-	if o != nil && o.BaseConfig != nil {
-		return o.BaseConfig
-	}
-	return new(http.Server)
-}
-
-func (o *ServeConnOpts) handler() http.Handler {
-	if o != nil {
-		if o.Handler != nil {
-			return o.Handler
-		}
-		if o.BaseConfig != nil && o.BaseConfig.Handler != nil {
-			return o.BaseConfig.Handler
-		}
-	}
-	return http.DefaultServeMux
-}
-
-// ServeConn serves HTTP/2 requests on the provided connection and
-// blocks until the connection is no longer readable.
-//
-// ServeConn starts speaking HTTP/2 assuming that c has not had any
-// reads or writes. It writes its initial settings frame and expects
-// to be able to read the preface and settings frame from the
-// client. If c has a ConnectionState method like a *tls.Conn, the
-// ConnectionState is used to verify the TLS ciphersuite and to set
-// the Request.TLS field in Handlers.
-//
-// ServeConn does not support h2c by itself. Any h2c support must be
-// implemented in terms of providing a suitably-behaving net.Conn.
-//
-// The opts parameter is optional. If nil, default values are used.
-func (s *Server) ServeConn(c net.Conn, opts *ServeConnOpts) {
-	baseCtx, cancel := serverConnBaseContext(c, opts)
-	defer cancel()
-
-	sc := &serverConn{
-		srv:                         s,
-		hs:                          opts.baseConfig(),
-		conn:                        c,
-		baseCtx:                     baseCtx,
-		remoteAddrStr:               c.RemoteAddr().String(),
-		bw:                          newBufferedWriter(c),
-		handler:                     opts.handler(),
-		streams:                     make(map[uint32]*stream),
-		readFrameCh:                 make(chan readFrameResult),
-		wantWriteFrameCh:            make(chan FrameWriteRequest, 8),
-		wantStartPushCh:             make(chan startPushRequest, 8),
-		wroteFrameCh:                make(chan frameWriteResult, 1), // buffered; one send in writeFrameAsync
-		bodyReadCh:                  make(chan bodyReadMsg),         // buffering doesn't matter either way
-		doneServing:                 make(chan struct{}),
-		clientMaxStreams:            math.MaxUint32, // Section 6.5.2: "Initially, there is no limit to this value"
-		advMaxStreams:               s.maxConcurrentStreams(),
-		initialStreamSendWindowSize: initialWindowSize,
-		maxFrameSize:                initialMaxFrameSize,
-		headerTableSize:             initialHeaderTableSize,
-		serveG:                      newGoroutineLock(),
-		pushEnabled:                 true,
-	}
-
-	// The net/http package sets the write deadline from the
-	// http.Server.WriteTimeout during the TLS handshake, but then
-	// passes the connection off to us with the deadline already
-	// set. Disarm it here so that it is not applied to additional
-	// streams opened on this connection.
-	// TODO: implement WriteTimeout fully. See Issue 18437.
-	if sc.hs.WriteTimeout != 0 {
-		sc.conn.SetWriteDeadline(time.Time{})
-	}
-
-	if s.NewWriteScheduler != nil {
-		sc.writeSched = s.NewWriteScheduler()
-	} else {
-		sc.writeSched = NewRandomWriteScheduler()
-	}
-
-	// These start at the RFC-specified defaults. If there is a higher
-	// configured value for inflow, that will be updated when we send a
-	// WINDOW_UPDATE shortly after sending SETTINGS.
-	sc.flow.add(initialWindowSize)
-	sc.inflow.add(initialWindowSize)
-	sc.hpackEncoder = hpack.NewEncoder(&sc.headerWriteBuf)
-
-	fr := NewFramer(sc.bw, c)
-	fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
-	fr.MaxHeaderListSize = sc.maxHeaderListSize()
-	fr.SetMaxReadFrameSize(s.maxReadFrameSize())
-	sc.framer = fr
-
-	if tc, ok := c.(connectionStater); ok {
-		sc.tlsState = new(tls.ConnectionState)
-		*sc.tlsState = tc.ConnectionState()
-		// 9.2 Use of TLS Features
-		// An implementation of HTTP/2 over TLS MUST use TLS
-		// 1.2 or higher with the restrictions on feature set
-		// and cipher suite described in this section. Due to
-		// implementation limitations, it might not be
-		// possible to fail TLS negotiation. An endpoint MUST
-		// immediately terminate an HTTP/2 connection that
-		// does not meet the TLS requirements described in
-		// this section with a connection error (Section
-		// 5.4.1) of type INADEQUATE_SECURITY.
-		if sc.tlsState.Version < tls.VersionTLS12 {
-			sc.rejectConn(ErrCodeInadequateSecurity, "TLS version too low")
-			return
-		}
-
-		if sc.tlsState.ServerName == "" {
-			// Client must use SNI, but we don't enforce that anymore,
-			// since it was causing problems when connecting to bare IP
-			// addresses during development.
-			//
-			// TODO: optionally enforce? Or enforce at the time we receive
-			// a new request, and verify the the ServerName matches the :authority?
-			// But that precludes proxy situations, perhaps.
-			//
-			// So for now, do nothing here again.
-		}
-
-		if !s.PermitProhibitedCipherSuites && isBadCipher(sc.tlsState.CipherSuite) {
-			// "Endpoints MAY choose to generate a connection error
-			// (Section 5.4.1) of type INADEQUATE_SECURITY if one of
-			// the prohibited cipher suites are negotiated."
-			//
-			// We choose that. In my opinion, the spec is weak
-			// here. It also says both parties must support at least
-			// TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 so there's no
-			// excuses here. If we really must, we could allow an
-			// "AllowInsecureWeakCiphers" option on the server later.
-			// Let's see how it plays out first.
-			sc.rejectConn(ErrCodeInadequateSecurity, fmt.Sprintf("Prohibited TLS 1.2 Cipher Suite: %x", sc.tlsState.CipherSuite))
-			return
-		}
-	}
-
-	if hook := testHookGetServerConn; hook != nil {
-		hook(sc)
-	}
-	sc.serve()
-}
-
-func (sc *serverConn) rejectConn(err ErrCode, debug string) {
-	sc.vlogf("http2: server rejecting conn: %v, %s", err, debug)
-	// ignoring errors. hanging up anyway.
-	sc.framer.WriteGoAway(0, err, []byte(debug))
-	sc.bw.Flush()
-	sc.conn.Close()
-}
-
-type serverConn struct {
-	// Immutable:
-	srv              *Server
-	hs               *http.Server
-	conn             net.Conn
-	bw               *bufferedWriter // writing to conn
-	handler          http.Handler
-	baseCtx          contextContext
-	framer           *Framer
-	doneServing      chan struct{}          // closed when serverConn.serve ends
-	readFrameCh      chan readFrameResult   // written by serverConn.readFrames
-	wantWriteFrameCh chan FrameWriteRequest // from handlers -> serve
-	wantStartPushCh  chan startPushRequest  // from handlers -> serve
-	wroteFrameCh     chan frameWriteResult  // from writeFrameAsync -> serve, tickles more frame writes
-	bodyReadCh       chan bodyReadMsg       // from handlers -> serve
-	testHookCh       chan func(int)         // code to run on the serve loop
-	flow             flow                   // conn-wide (not stream-specific) outbound flow control
-	inflow           flow                   // conn-wide inbound flow control
-	tlsState         *tls.ConnectionState   // shared by all handlers, like net/http
-	remoteAddrStr    string
-	writeSched       WriteScheduler
-
-	// Everything following is owned by the serve loop; use serveG.check():
-	serveG                      goroutineLock // used to verify funcs are on serve()
-	pushEnabled                 bool
-	sawFirstSettings            bool // got the initial SETTINGS frame after the preface
-	needToSendSettingsAck       bool
-	unackedSettings             int    // how many SETTINGS have we sent without ACKs?
-	clientMaxStreams            uint32 // SETTINGS_MAX_CONCURRENT_STREAMS from client (our PUSH_PROMISE limit)
-	advMaxStreams               uint32 // our SETTINGS_MAX_CONCURRENT_STREAMS advertised the client
-	curClientStreams            uint32 // number of open streams initiated by the client
-	curPushedStreams            uint32 // number of open streams initiated by server push
-	maxClientStreamID           uint32 // max ever seen from client (odd), or 0 if there have been no client requests
-	maxPushPromiseID            uint32 // ID of the last push promise (even), or 0 if there have been no pushes
-	streams                     map[uint32]*stream
-	initialStreamSendWindowSize int32
-	maxFrameSize                int32
-	headerTableSize             uint32
-	peerMaxHeaderListSize       uint32            // zero means unknown (default)
-	canonHeader                 map[string]string // http2-lower-case -> Go-Canonical-Case
-	writingFrame                bool              // started writing a frame (on serve goroutine or separate)
-	writingFrameAsync           bool              // started a frame on its own goroutine but haven't heard back on wroteFrameCh
-	needsFrameFlush             bool              // last frame write wasn't a flush
-	inGoAway                    bool              // we've started to or sent GOAWAY
-	inFrameScheduleLoop         bool              // whether we're in the scheduleFrameWrite loop
-	needToSendGoAway            bool              // we need to schedule a GOAWAY frame write
-	goAwayCode                  ErrCode
-	shutdownTimerCh             <-chan time.Time // nil until used
-	shutdownTimer               *time.Timer      // nil until used
-	idleTimer                   *time.Timer      // nil if unused
-	idleTimerCh                 <-chan time.Time // nil if unused
-
-	// Owned by the writeFrameAsync goroutine:
-	headerWriteBuf bytes.Buffer
-	hpackEncoder   *hpack.Encoder
-}
-
-func (sc *serverConn) maxHeaderListSize() uint32 {
-	n := sc.hs.MaxHeaderBytes
-	if n <= 0 {
-		n = http.DefaultMaxHeaderBytes
-	}
-	// http2's count is in a slightly different unit and includes 32 bytes per pair.
-	// So, take the net/http.Server value and pad it up a bit, assuming 10 headers.
-	const perFieldOverhead = 32 // per http2 spec
-	const typicalHeaders = 10   // conservative
-	return uint32(n + typicalHeaders*perFieldOverhead)
-}
-
-func (sc *serverConn) curOpenStreams() uint32 {
-	sc.serveG.check()
-	return sc.curClientStreams + sc.curPushedStreams
-}
-
-// stream represents a stream. This is the minimal metadata needed by
-// the serve goroutine. Most of the actual stream state is owned by
-// the http.Handler's goroutine in the responseWriter. Because the
-// responseWriter's responseWriterState is recycled at the end of a
-// handler, this struct intentionally has no pointer to the
-// *responseWriter{,State} itself, as the Handler ending nils out the
-// responseWriter's state field.
-type stream struct {
-	// immutable:
-	sc        *serverConn
-	id        uint32
-	body      *pipe       // non-nil if expecting DATA frames
-	cw        closeWaiter // closed wait stream transitions to closed state
-	ctx       contextContext
-	cancelCtx func()
-
-	// owned by serverConn's serve loop:
-	bodyBytes        int64   // body bytes seen so far
-	declBodyBytes    int64   // or -1 if undeclared
-	flow             flow    // limits writing from Handler to client
-	inflow           flow    // what the client is allowed to POST/etc to us
-	parent           *stream // or nil
-	numTrailerValues int64
-	weight           uint8
-	state            streamState
-	resetQueued      bool // RST_STREAM queued for write; set by sc.resetStream
-	gotTrailerHeader bool // HEADER frame for trailers was seen
-	wroteHeaders     bool // whether we wrote headers (not status 100)
-
-	trailer    http.Header // accumulated trailers
-	reqTrailer http.Header // handler's Request.Trailer
-}
-
-func (sc *serverConn) Framer() *Framer  { return sc.framer }
-func (sc *serverConn) CloseConn() error { return sc.conn.Close() }
-func (sc *serverConn) Flush() error     { return sc.bw.Flush() }
-func (sc *serverConn) HeaderEncoder() (*hpack.Encoder, *bytes.Buffer) {
-	return sc.hpackEncoder, &sc.headerWriteBuf
-}
-
-func (sc *serverConn) state(streamID uint32) (streamState, *stream) {
-	sc.serveG.check()
-	// http://tools.ietf.org/html/rfc7540#section-5.1
-	if st, ok := sc.streams[streamID]; ok {
-		return st.state, st
-	}
-	// "The first use of a new stream identifier implicitly closes all
-	// streams in the "idle" state that might have been initiated by
-	// that peer with a lower-valued stream identifier. For example, if
-	// a client sends a HEADERS frame on stream 7 without ever sending a
-	// frame on stream 5, then stream 5 transitions to the "closed"
-	// state when the first frame for stream 7 is sent or received."
-	if streamID%2 == 1 {
-		if streamID <= sc.maxClientStreamID {
-			return stateClosed, nil
-		}
-	} else {
-		if streamID <= sc.maxPushPromiseID {
-			return stateClosed, nil
-		}
-	}
-	return stateIdle, nil
-}
-
-// setConnState calls the net/http ConnState hook for this connection, if configured.
-// Note that the net/http package does StateNew and StateClosed for us.
-// There is currently no plan for StateHijacked or hijacking HTTP/2 connections.
-func (sc *serverConn) setConnState(state http.ConnState) {
-	if sc.hs.ConnState != nil {
-		sc.hs.ConnState(sc.conn, state)
-	}
-}
-
-func (sc *serverConn) vlogf(format string, args ...interface{}) {
-	if VerboseLogs {
-		sc.logf(format, args...)
-	}
-}
-
-func (sc *serverConn) logf(format string, args ...interface{}) {
-	if lg := sc.hs.ErrorLog; lg != nil {
-		lg.Printf(format, args...)
-	} else {
-		log.Printf(format, args...)
-	}
-}
-
-// errno returns v's underlying uintptr, else 0.
-//
-// TODO: remove this helper function once http2 can use build
-// tags. See comment in isClosedConnError.
-func errno(v error) uintptr {
-	if rv := reflect.ValueOf(v); rv.Kind() == reflect.Uintptr {
-		return uintptr(rv.Uint())
-	}
-	return 0
-}
-
-// isClosedConnError reports whether err is an error from use of a closed
-// network connection.
-func isClosedConnError(err error) bool {
-	if err == nil {
-		return false
-	}
-
-	// TODO: remove this string search and be more like the Windows
-	// case below. That might involve modifying the standard library
-	// to return better error types.
-	str := err.Error()
-	if strings.Contains(str, "use of closed network connection") {
-		return true
-	}
-
-	// TODO(bradfitz): x/tools/cmd/bundle doesn't really support
-	// build tags, so I can't make an http2_windows.go file with
-	// Windows-specific stuff. Fix that and move this, once we
-	// have a way to bundle this into std's net/http somehow.
-	if runtime.GOOS == "windows" {
-		if oe, ok := err.(*net.OpError); ok && oe.Op == "read" {
-			if se, ok := oe.Err.(*os.SyscallError); ok && se.Syscall == "wsarecv" {
-				const WSAECONNABORTED = 10053
-				const WSAECONNRESET = 10054
-				if n := errno(se.Err); n == WSAECONNRESET || n == WSAECONNABORTED {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func (sc *serverConn) condlogf(err error, format string, args ...interface{}) {
-	if err == nil {
-		return
-	}
-	if err == io.EOF || err == io.ErrUnexpectedEOF || isClosedConnError(err) {
-		// Boring, expected errors.
-		sc.vlogf(format, args...)
-	} else {
-		sc.logf(format, args...)
-	}
-}
-
-func (sc *serverConn) canonicalHeader(v string) string {
-	sc.serveG.check()
-	cv, ok := commonCanonHeader[v]
-	if ok {
-		return cv
-	}
-	cv, ok = sc.canonHeader[v]
-	if ok {
-		return cv
-	}
-	if sc.canonHeader == nil {
-		sc.canonHeader = make(map[string]string)
-	}
-	cv = http.CanonicalHeaderKey(v)
-	sc.canonHeader[v] = cv
-	return cv
-}
-
-type readFrameResult struct {
-	f   Frame // valid until readMore is called
-	err error
-
-	// readMore should be called once the consumer no longer needs or
-	// retains f. After readMore, f is invalid and more frames can be
-	// read.
-	readMore func()
-}
-
-// readFrames is the loop that reads incoming frames.
-// It takes care to only read one frame at a time, blocking until the
-// consumer is done with the frame.
-// It's run on its own goroutine.
-func (sc *serverConn) readFrames() {
-	gate := make(gate)
-	gateDone := gate.Done
-	for {
-		f, err := sc.framer.ReadFrame()
-		select {
-		case sc.readFrameCh <- readFrameResult{f, err, gateDone}:
-		case <-sc.doneServing:
-			return
-		}
-		select {
-		case <-gate:
-		case <-sc.doneServing:
-			return
-		}
-		if terminalReadFrameError(err) {
-			return
-		}
-	}
-}
-
-// frameWriteResult is the message passed from writeFrameAsync to the serve goroutine.
-type frameWriteResult struct {
-	wr  FrameWriteRequest // what was written (or attempted)
-	err error             // result of the writeFrame call
-}
-
-// writeFrameAsync runs in its own goroutine and writes a single frame
-// and then reports when it's done.
-// At most one goroutine can be running writeFrameAsync at a time per
-// serverConn.
-func (sc *serverConn) writeFrameAsync(wr FrameWriteRequest) {
-	err := wr.write.writeFrame(sc)
-	sc.wroteFrameCh <- frameWriteResult{wr, err}
-}
-
-func (sc *serverConn) closeAllStreamsOnConnClose() {
-	sc.serveG.check()
-	for _, st := range sc.streams {
-		sc.closeStream(st, errClientDisconnected)
-	}
-}
-
-func (sc *serverConn) stopShutdownTimer() {
-	sc.serveG.check()
-	if t := sc.shutdownTimer; t != nil {
-		t.Stop()
-	}
-}
-
-func (sc *serverConn) notePanic() {
-	// Note: this is for serverConn.serve panicking, not http.Handler code.
-	if testHookOnPanicMu != nil {
-		testHookOnPanicMu.Lock()
-		defer testHookOnPanicMu.Unlock()
-	}
-	if testHookOnPanic != nil {
-		if e := recover(); e != nil {
-			if testHookOnPanic(sc, e) {
-				panic(e)
-			}
-		}
-	}
-}
-
-func (sc *serverConn) serve() {
-	sc.serveG.check()
-	defer sc.notePanic()
-	defer sc.conn.Close()
-	defer sc.closeAllStreamsOnConnClose()
-	defer sc.stopShutdownTimer()
-	defer close(sc.doneServing) // unblocks handlers trying to send
-
-	if VerboseLogs {
-		sc.vlogf("http2: server connection from %v on %p", sc.conn.RemoteAddr(), sc.hs)
-	}
-
-	sc.writeFrame(FrameWriteRequest{
-		write: writeSettings{
-			{SettingMaxFrameSize, sc.srv.maxReadFrameSize()},
-			{SettingMaxConcurrentStreams, sc.advMaxStreams},
-			{SettingMaxHeaderListSize, sc.maxHeaderListSize()},
-			{SettingInitialWindowSize, uint32(sc.srv.initialStreamRecvWindowSize())},
-		},
-	})
-	sc.unackedSettings++
-
-	// Each connection starts with intialWindowSize inflow tokens.
-	// If a higher value is configured, we add more tokens.
-	if diff := sc.srv.initialConnRecvWindowSize() - initialWindowSize; diff > 0 {
-		sc.sendWindowUpdate(nil, int(diff))
-	}
-
-	if err := sc.readPreface(); err != nil {
-		sc.condlogf(err, "http2: server: error reading preface from client %v: %v", sc.conn.RemoteAddr(), err)
-		return
-	}
-	// Now that we've got the preface, get us out of the
-	// "StateNew" state. We can't go directly to idle, though.
-	// Active means we read some data and anticipate a request. We'll
-	// do another Active when we get a HEADERS frame.
-	sc.setConnState(http.StateActive)
-	sc.setConnState(http.StateIdle)
-
-	if sc.srv.IdleTimeout != 0 {
-		sc.idleTimer = time.NewTimer(sc.srv.IdleTimeout)
-		defer sc.idleTimer.Stop()
-		sc.idleTimerCh = sc.idleTimer.C
-	}
-
-	var gracefulShutdownCh <-chan struct{}
-	if sc.hs != nil {
-		gracefulShutdownCh = h1ServerShutdownChan(sc.hs)
-	}
-
-	go sc.readFrames() // closed by defer sc.conn.Close above
-
-	settingsTimer := time.NewTimer(firstSettingsTimeout)
-	loopNum := 0
-	for {
-		loopNum++
-		select {
-		case wr := <-sc.wantWriteFrameCh:
-			sc.writeFrame(wr)
-		case spr := <-sc.wantStartPushCh:
-			sc.startPush(spr)
-		case res := <-sc.wroteFrameCh:
-			sc.wroteFrame(res)
-		case res := <-sc.readFrameCh:
-			if !sc.processFrameFromReader(res) {
-				return
-			}
-			res.readMore()
-			if settingsTimer.C != nil {
-				settingsTimer.Stop()
-				settingsTimer.C = nil
-			}
-		case m := <-sc.bodyReadCh:
-			sc.noteBodyRead(m.st, m.n)
-		case <-settingsTimer.C:
-			sc.logf("timeout waiting for SETTINGS frames from %v", sc.conn.RemoteAddr())
-			return
-		case <-gracefulShutdownCh:
-			gracefulShutdownCh = nil
-			sc.startGracefulShutdown()
-		case <-sc.shutdownTimerCh:
-			sc.vlogf("GOAWAY close timer fired; closing conn from %v", sc.conn.RemoteAddr())
-			return
-		case <-sc.idleTimerCh:
-			sc.vlogf("connection is idle")
-			sc.goAway(ErrCodeNo)
-		case fn := <-sc.testHookCh:
-			fn(loopNum)
-		}
-
-		if sc.inGoAway && sc.curOpenStreams() == 0 && !sc.needToSendGoAway && !sc.writingFrame {
-			return
-		}
-	}
-}
-
-// readPreface reads the ClientPreface greeting from the peer
-// or returns an error on timeout or an invalid greeting.
-func (sc *serverConn) readPreface() error {
-	errc := make(chan error, 1)
-	go func() {
-		// Read the client preface
-		buf := make([]byte, len(ClientPreface))
-		if _, err := io.ReadFull(sc.conn, buf); err != nil {
-			errc <- err
-		} else if !bytes.Equal(buf, clientPreface) {
-			errc <- fmt.Errorf("bogus greeting %q", buf)
-		} else {
-			errc <- nil
-		}
-	}()
-	timer := time.NewTimer(prefaceTimeout) // TODO: configurable on *Server?
-	defer timer.Stop()
-	select {
-	case <-timer.C:
-		return errors.New("timeout waiting for client preface")
-	case err := <-errc:
-		if err == nil {
-			if VerboseLogs {
-				sc.vlogf("http2: server: client %v said hello", sc.conn.RemoteAddr())
-			}
-		}
-		return err
-	}
-}
-
-var errChanPool = sync.Pool{
-	New: func() interface{} { return make(chan error, 1) },
-}
-
-var writeDataPool = sync.Pool{
-	New: func() interface{} { return new(writeData) },
-}
-
-// writeDataFromHandler writes DATA response frames from a handler on
-// the given stream.
-func (sc *serverConn) writeDataFromHandler(stream *stream, data []byte, endStream bool) error {
-	ch := errChanPool.Get().(chan error)
-	writeArg := writeDataPool.Get().(*writeData)
-	*writeArg = writeData{stream.id, data, endStream}
-	err := sc.writeFrameFromHandler(FrameWriteRequest{
-		write:  writeArg,
-		stream: stream,
-		done:   ch,
-	})
-	if err != nil {
-		return err
-	}
-	var frameWriteDone bool // the frame write is done (successfully or not)
-	select {
-	case err = <-ch:
-		frameWriteDone = true
-	case <-sc.doneServing:
-		return errClientDisconnected
-	case <-stream.cw:
-		// If both ch and stream.cw were ready (as might
-		// happen on the final Write after an http.Handler
-		// ends), prefer the write result. Otherwise this
-		// might just be us successfully closing the stream.
-		// The writeFrameAsync and serve goroutines guarantee
-		// that the ch send will happen before the stream.cw
-		// close.
-		select {
-		case err = <-ch:
-			frameWriteDone = true
-		default:
-			return errStreamClosed
-		}
-	}
-	errChanPool.Put(ch)
-	if frameWriteDone {
-		writeDataPool.Put(writeArg)
-	}
-	return err
-}
-
-// writeFrameFromHandler sends wr to sc.wantWriteFrameCh, but aborts
-// if the connection has gone away.
-//
-// This must not be run from the serve goroutine itself, else it might
-// deadlock writing to sc.wantWriteFrameCh (which is only mildly
-// buffered and is read by serve itself). If you're on the serve
-// goroutine, call writeFrame instead.
-func (sc *serverConn) writeFrameFromHandler(wr FrameWriteRequest) error {
-	sc.serveG.checkNotOn() // NOT
-	select {
-	case sc.wantWriteFrameCh <- wr:
-		return nil
-	case <-sc.doneServing:
-		// Serve loop is gone.
-		// Client has closed their connection to the server.
-		return errClientDisconnected
-	}
-}
-
-// writeFrame schedules a frame to write and sends it if there's nothing
-// already being written.
-//
-// There is no pushback here (the serve goroutine never blocks). It's
-// the http.Handlers that block, waiting for their previous frames to
-// make it onto the wire
-//
-// If you're not on the serve goroutine, use writeFrameFromHandler instead.
-func (sc *serverConn) writeFrame(wr FrameWriteRequest) {
-	sc.serveG.check()
-
-	// If true, wr will not be written and wr.done will not be signaled.
-	var ignoreWrite bool
-
-	// We are not allowed to write frames on closed streams. RFC 7540 Section
-	// 5.1.1 says: "An endpoint MUST NOT send frames other than PRIORITY on
-	// a closed stream." Our server never sends PRIORITY, so that exception
-	// does not apply.
-	//
-	// The serverConn might close an open stream while the stream's handler
-	// is still running. For example, the server might close a stream when it
-	// receives bad data from the client. If this happens, the handler might
-	// attempt to write a frame after the stream has been closed (since the
-	// handler hasn't yet been notified of the close). In this case, we simply
-	// ignore the frame. The handler will notice that the stream is closed when
-	// it waits for the frame to be written.
-	//
-	// As an exception to this rule, we allow sending RST_STREAM after close.
-	// This allows us to immediately reject new streams without tracking any
-	// state for those streams (except for the queued RST_STREAM frame). This
-	// may result in duplicate RST_STREAMs in some cases, but the client should
-	// ignore those.
-	if wr.StreamID() != 0 {
-		_, isReset := wr.write.(StreamError)
-		if state, _ := sc.state(wr.StreamID()); state == stateClosed && !isReset {
-			ignoreWrite = true
-		}
-	}
-
-	// Don't send a 100-continue response if we've already sent headers.
-	// See golang.org/issue/14030.
-	switch wr.write.(type) {
-	case *writeResHeaders:
-		wr.stream.wroteHeaders = true
-	case write100ContinueHeadersFrame:
-		if wr.stream.wroteHeaders {
-			// We do not need to notify wr.done because this frame is
-			// never written with wr.done != nil.
-			if wr.done != nil {
-				panic("wr.done != nil for write100ContinueHeadersFrame")
-			}
-			ignoreWrite = true
-		}
-	}
-
-	if !ignoreWrite {
-		sc.writeSched.Push(wr)
-	}
-	sc.scheduleFrameWrite()
-}
-
-// startFrameWrite starts a goroutine to write wr (in a separate
-// goroutine since that might block on the network), and updates the
-// serve goroutine's state about the world, updated from info in wr.
-func (sc *serverConn) startFrameWrite(wr FrameWriteRequest) {
-	sc.serveG.check()
-	if sc.writingFrame {
-		panic("internal error: can only be writing one frame at a time")
-	}
-
-	st := wr.stream
-	if st != nil {
-		switch st.state {
-		case stateHalfClosedLocal:
-			switch wr.write.(type) {
-			case StreamError, handlerPanicRST, writeWindowUpdate:
-				// RFC 7540 Section 5.1 allows sending RST_STREAM, PRIORITY, and WINDOW_UPDATE
-				// in this state. (We never send PRIORITY from the server, so that is not checked.)
-			default:
-				panic(fmt.Sprintf("internal error: attempt to send frame on a half-closed-local stream: %v", wr))
-			}
-		case stateClosed:
-			panic(fmt.Sprintf("internal error: attempt to send frame on a closed stream: %v", wr))
-		}
-	}
-	if wpp, ok := wr.write.(*writePushPromise); ok {
-		var err error
-		wpp.promisedID, err = wpp.allocatePromisedID()
-		if err != nil {
-			sc.writingFrameAsync = false
-			wr.replyToWriter(err)
-			return
-		}
-	}
-
-	sc.writingFrame = true
-	sc.needsFrameFlush = true
-	if wr.write.staysWithinBuffer(sc.bw.Available()) {
-		sc.writingFrameAsync = false
-		err := wr.write.writeFrame(sc)
-		sc.wroteFrame(frameWriteResult{wr, err})
-	} else {
-		sc.writingFrameAsync = true
-		go sc.writeFrameAsync(wr)
-	}
-}
-
-// errHandlerPanicked is the error given to any callers blocked in a read from
-// Request.Body when the main goroutine panics. Since most handlers read in the
-// the main ServeHTTP goroutine, this will show up rarely.
-var errHandlerPanicked = errors.New("http2: handler panicked")
-
-// wroteFrame is called on the serve goroutine with the result of
-// whatever happened on writeFrameAsync.
-func (sc *serverConn) wroteFrame(res frameWriteResult) {
-	sc.serveG.check()
-	if !sc.writingFrame {
-		panic("internal error: expected to be already writing a frame")
-	}
-	sc.writingFrame = false
-	sc.writingFrameAsync = false
-
-	wr := res.wr
-
-	if writeEndsStream(wr.write) {
-		st := wr.stream
-		if st == nil {
-			panic("internal error: expecting non-nil stream")
-		}
-		switch st.state {
-		case stateOpen:
-			// Here we would go to stateHalfClosedLocal in
-			// theory, but since our handler is done and
-			// the net/http package provides no mechanism
-			// for closing a ResponseWriter while still
-			// reading data (see possible TODO at top of
-			// this file), we go into closed state here
-			// anyway, after telling the peer we're
-			// hanging up on them. We'll transition to
-			// stateClosed after the RST_STREAM frame is
-			// written.
-			st.state = stateHalfClosedLocal
-			sc.resetStream(streamError(st.id, ErrCodeCancel))
-		case stateHalfClosedRemote:
-			sc.closeStream(st, errHandlerComplete)
-		}
-	} else {
-		switch v := wr.write.(type) {
-		case StreamError:
-			// st may be unknown if the RST_STREAM was generated to reject bad input.
-			if st, ok := sc.streams[v.StreamID]; ok {
-				sc.closeStream(st, v)
-			}
-		case handlerPanicRST:
-			sc.closeStream(wr.stream, errHandlerPanicked)
-		}
-	}
-
-	// Reply (if requested) to unblock the ServeHTTP goroutine.
-	wr.replyToWriter(res.err)
-
-	sc.scheduleFrameWrite()
-}
-
-// scheduleFrameWrite tickles the frame writing scheduler.
-//
-// If a frame is already being written, nothing happens. This will be called again
-// when the frame is done being written.
-//
-// If a frame isn't being written we need to send one, the best frame
-// to send is selected, preferring first things that aren't
-// stream-specific (e.g. ACKing settings), and then finding the
-// highest priority stream.
-//
-// If a frame isn't being written and there's nothing else to send, we
-// flush the write buffer.
-func (sc *serverConn) scheduleFrameWrite() {
-	sc.serveG.check()
-	if sc.writingFrame || sc.inFrameScheduleLoop {
-		return
-	}
-	sc.inFrameScheduleLoop = true
-	for !sc.writingFrameAsync {
-		if sc.needToSendGoAway {
-			sc.needToSendGoAway = false
-			sc.startFrameWrite(FrameWriteRequest{
-				write: &writeGoAway{
-					maxStreamID: sc.maxClientStreamID,
-					code:        sc.goAwayCode,
-				},
-			})
-			continue
-		}
-		if sc.needToSendSettingsAck {
-			sc.needToSendSettingsAck = false
-			sc.startFrameWrite(FrameWriteRequest{write: writeSettingsAck{}})
-			continue
-		}
-		if !sc.inGoAway || sc.goAwayCode == ErrCodeNo {
-			if wr, ok := sc.writeSched.Pop(); ok {
-				sc.startFrameWrite(wr)
-				continue
-			}
-		}
-		if sc.needsFrameFlush {
-			sc.startFrameWrite(FrameWriteRequest{write: flushFrameWriter{}})
-			sc.needsFrameFlush = false // after startFrameWrite, since it sets this true
-			continue
-		}
-		break
-	}
-	sc.inFrameScheduleLoop = false
-}
-
-// startGracefulShutdown sends a GOAWAY with ErrCodeNo to tell the
-// client we're gracefully shutting down. The connection isn't closed
-// until all current streams are done.
-func (sc *serverConn) startGracefulShutdown() {
-	sc.goAwayIn(ErrCodeNo, 0)
-}
-
-func (sc *serverConn) goAway(code ErrCode) {
-	sc.serveG.check()
-	var forceCloseIn time.Duration
-	if code != ErrCodeNo {
-		forceCloseIn = 250 * time.Millisecond
-	} else {
-		// TODO: configurable
-		forceCloseIn = 1 * time.Second
-	}
-	sc.goAwayIn(code, forceCloseIn)
-}
-
-func (sc *serverConn) goAwayIn(code ErrCode, forceCloseIn time.Duration) {
-	sc.serveG.check()
-	if sc.inGoAway {
-		return
-	}
-	if forceCloseIn != 0 {
-		sc.shutDownIn(forceCloseIn)
-	}
-	sc.inGoAway = true
-	sc.needToSendGoAway = true
-	sc.goAwayCode = code
-	sc.scheduleFrameWrite()
-}
-
-func (sc *serverConn) shutDownIn(d time.Duration) {
-	sc.serveG.check()
-	sc.shutdownTimer = time.NewTimer(d)
-	sc.shutdownTimerCh = sc.shutdownTimer.C
-}
-
-func (sc *serverConn) resetStream(se StreamError) {
-	sc.serveG.check()
-	sc.writeFrame(FrameWriteRequest{write: se})
-	if st, ok := sc.streams[se.StreamID]; ok {
-		st.resetQueued = true
-	}
-}
-
-// processFrameFromReader processes the serve loop's read from readFrameCh from the
-// frame-reading goroutine.
-// processFrameFromReader returns whether the connection should be kept open.
-func (sc *serverConn) processFrameFromReader(res readFrameResult) bool {
-	sc.serveG.check()
-	err := res.err
-	if err != nil {
-		if err == ErrFrameTooLarge {
-			sc.goAway(ErrCodeFrameSize)
-			return true // goAway will close the loop
-		}
-		clientGone := err == io.EOF || err == io.ErrUnexpectedEOF || isClosedConnError(err)
-		if clientGone {
-			// TODO: could we also get into this state if
-			// the peer does a half close
-			// (e.g. CloseWrite) because they're done
-			// sending frames but they're still wanting
-			// our open replies?  Investigate.
-			// TODO: add CloseWrite to crypto/tls.Conn first
-			// so we have a way to test this? I suppose
-			// just for testing we could have a non-TLS mode.
-			return false
-		}
-	} else {
-		f := res.f
-		if VerboseLogs {
-			sc.vlogf("http2: server read frame %v", summarizeFrame(f))
-		}
-		err = sc.processFrame(f)
-		if err == nil {
-			return true
-		}
-	}
-
-	switch ev := err.(type) {
-	case StreamError:
-		sc.resetStream(ev)
-		return true
-	case goAwayFlowError:
-		sc.goAway(ErrCodeFlowControl)
-		return true
-	case ConnectionError:
-		sc.logf("http2: server connection error from %v: %v", sc.conn.RemoteAddr(), ev)
-		sc.goAway(ErrCode(ev))
-		return true // goAway will handle shutdown
-	default:
-		if res.err != nil {
-			sc.vlogf("http2: server closing client connection; error reading frame from client %s: %v", sc.conn.RemoteAddr(), err)
-		} else {
-			sc.logf("http2: server closing client connection: %v", err)
-		}
-		return false
-	}
-}
-
-func (sc *serverConn) processFrame(f Frame) error {
-	sc.serveG.check()
-
-	// First frame received must be SETTINGS.
-	if !sc.sawFirstSettings {
-		if _, ok := f.(*SettingsFrame); !ok {
-			return ConnectionError(ErrCodeProtocol)
-		}
-		sc.sawFirstSettings = true
-	}
-
-	switch f := f.(type) {
-	case *SettingsFrame:
-		return sc.processSettings(f)
-	case *MetaHeadersFrame:
-		return sc.processHeaders(f)
-	case *WindowUpdateFrame:
-		return sc.processWindowUpdate(f)
-	case *PingFrame:
-		return sc.processPing(f)
-	case *DataFrame:
-		return sc.processData(f)
-	case *RSTStreamFrame:
-		return sc.processResetStream(f)
-	case *PriorityFrame:
-		return sc.processPriority(f)
-	case *GoAwayFrame:
-		return sc.processGoAway(f)
-	case *PushPromiseFrame:
-		// A client cannot push. Thus, servers MUST treat the receipt of a PUSH_PROMISE
-		// frame as a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-		return ConnectionError(ErrCodeProtocol)
-	default:
-		sc.vlogf("http2: server ignoring frame: %v", f.Header())
-		return nil
-	}
-}
-
-func (sc *serverConn) processPing(f *PingFrame) error {
-	sc.serveG.check()
-	if f.IsAck() {
-		// 6.7 PING: " An endpoint MUST NOT respond to PING frames
-		// containing this flag."
-		return nil
-	}
-	if f.StreamID != 0 {
-		// "PING frames are not associated with any individual
-		// stream. If a PING frame is received with a stream
-		// identifier field value other than 0x0, the recipient MUST
-		// respond with a connection error (Section 5.4.1) of type
-		// PROTOCOL_ERROR."
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if sc.inGoAway && sc.goAwayCode != ErrCodeNo {
-		return nil
-	}
-	sc.writeFrame(FrameWriteRequest{write: writePingAck{f}})
-	return nil
-}
-
-func (sc *serverConn) processWindowUpdate(f *WindowUpdateFrame) error {
-	sc.serveG.check()
-	switch {
-	case f.StreamID != 0: // stream-level flow control
-		state, st := sc.state(f.StreamID)
-		if state == stateIdle {
-			// Section 5.1: "Receiving any frame other than HEADERS
-			// or PRIORITY on a stream in this state MUST be
-			// treated as a connection error (Section 5.4.1) of
-			// type PROTOCOL_ERROR."
-			return ConnectionError(ErrCodeProtocol)
-		}
-		if st == nil {
-			// "WINDOW_UPDATE can be sent by a peer that has sent a
-			// frame bearing the END_STREAM flag. This means that a
-			// receiver could receive a WINDOW_UPDATE frame on a "half
-			// closed (remote)" or "closed" stream. A receiver MUST
-			// NOT treat this as an error, see Section 5.1."
-			return nil
-		}
-		if !st.flow.add(int32(f.Increment)) {
-			return streamError(f.StreamID, ErrCodeFlowControl)
-		}
-	default: // connection-level flow control
-		if !sc.flow.add(int32(f.Increment)) {
-			return goAwayFlowError{}
-		}
-	}
-	sc.scheduleFrameWrite()
-	return nil
-}
-
-func (sc *serverConn) processResetStream(f *RSTStreamFrame) error {
-	sc.serveG.check()
-
-	state, st := sc.state(f.StreamID)
-	if state == stateIdle {
-		// 6.4 "RST_STREAM frames MUST NOT be sent for a
-		// stream in the "idle" state. If a RST_STREAM frame
-		// identifying an idle stream is received, the
-		// recipient MUST treat this as a connection error
-		// (Section 5.4.1) of type PROTOCOL_ERROR.
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if st != nil {
-		st.cancelCtx()
-		sc.closeStream(st, streamError(f.StreamID, f.ErrCode))
-	}
-	return nil
-}
-
-func (sc *serverConn) closeStream(st *stream, err error) {
-	sc.serveG.check()
-	if st.state == stateIdle || st.state == stateClosed {
-		panic(fmt.Sprintf("invariant; can't close stream in state %v", st.state))
-	}
-	st.state = stateClosed
-	if st.isPushed() {
-		sc.curPushedStreams--
-	} else {
-		sc.curClientStreams--
-	}
-	delete(sc.streams, st.id)
-	if len(sc.streams) == 0 {
-		sc.setConnState(http.StateIdle)
-		if sc.srv.IdleTimeout != 0 {
-			sc.idleTimer.Reset(sc.srv.IdleTimeout)
-		}
-		if h1ServerKeepAlivesDisabled(sc.hs) {
-			sc.startGracefulShutdown()
-		}
-	}
-	if p := st.body; p != nil {
-		// Return any buffered unread bytes worth of conn-level flow control.
-		// See golang.org/issue/16481
-		sc.sendWindowUpdate(nil, p.Len())
-
-		p.CloseWithError(err)
-	}
-	st.cw.Close() // signals Handler's CloseNotifier, unblocks writes, etc
-	sc.writeSched.CloseStream(st.id)
-}
-
-func (sc *serverConn) processSettings(f *SettingsFrame) error {
-	sc.serveG.check()
-	if f.IsAck() {
-		sc.unackedSettings--
-		if sc.unackedSettings < 0 {
-			// Why is the peer ACKing settings we never sent?
-			// The spec doesn't mention this case, but
-			// hang up on them anyway.
-			return ConnectionError(ErrCodeProtocol)
-		}
-		return nil
-	}
-	if err := f.ForeachSetting(sc.processSetting); err != nil {
-		return err
-	}
-	sc.needToSendSettingsAck = true
-	sc.scheduleFrameWrite()
-	return nil
-}
-
-func (sc *serverConn) processSetting(s Setting) error {
-	sc.serveG.check()
-	if err := s.Valid(); err != nil {
-		return err
-	}
-	if VerboseLogs {
-		sc.vlogf("http2: server processing setting %v", s)
-	}
-	switch s.ID {
-	case SettingHeaderTableSize:
-		sc.headerTableSize = s.Val
-		sc.hpackEncoder.SetMaxDynamicTableSize(s.Val)
-	case SettingEnablePush:
-		sc.pushEnabled = s.Val != 0
-	case SettingMaxConcurrentStreams:
-		sc.clientMaxStreams = s.Val
-	case SettingInitialWindowSize:
-		return sc.processSettingInitialWindowSize(s.Val)
-	case SettingMaxFrameSize:
-		sc.maxFrameSize = int32(s.Val) // the maximum valid s.Val is < 2^31
-	case SettingMaxHeaderListSize:
-		sc.peerMaxHeaderListSize = s.Val
-	default:
-		// Unknown setting: "An endpoint that receives a SETTINGS
-		// frame with any unknown or unsupported identifier MUST
-		// ignore that setting."
-		if VerboseLogs {
-			sc.vlogf("http2: server ignoring unknown setting %v", s)
-		}
-	}
-	return nil
-}
-
-func (sc *serverConn) processSettingInitialWindowSize(val uint32) error {
-	sc.serveG.check()
-	// Note: val already validated to be within range by
-	// processSetting's Valid call.
-
-	// "A SETTINGS frame can alter the initial flow control window
-	// size for all current streams. When the value of
-	// SETTINGS_INITIAL_WINDOW_SIZE changes, a receiver MUST
-	// adjust the size of all stream flow control windows that it
-	// maintains by the difference between the new value and the
-	// old value."
-	old := sc.initialStreamSendWindowSize
-	sc.initialStreamSendWindowSize = int32(val)
-	growth := int32(val) - old // may be negative
-	for _, st := range sc.streams {
-		if !st.flow.add(growth) {
-			// 6.9.2 Initial Flow Control Window Size
-			// "An endpoint MUST treat a change to
-			// SETTINGS_INITIAL_WINDOW_SIZE that causes any flow
-			// control window to exceed the maximum size as a
-			// connection error (Section 5.4.1) of type
-			// FLOW_CONTROL_ERROR."
-			return ConnectionError(ErrCodeFlowControl)
-		}
-	}
-	return nil
-}
-
-func (sc *serverConn) processData(f *DataFrame) error {
-	sc.serveG.check()
-	if sc.inGoAway && sc.goAwayCode != ErrCodeNo {
-		return nil
-	}
-	data := f.Data()
-
-	// "If a DATA frame is received whose stream is not in "open"
-	// or "half closed (local)" state, the recipient MUST respond
-	// with a stream error (Section 5.4.2) of type STREAM_CLOSED."
-	id := f.Header().StreamID
-	state, st := sc.state(id)
-	if id == 0 || state == stateIdle {
-		// Section 5.1: "Receiving any frame other than HEADERS
-		// or PRIORITY on a stream in this state MUST be
-		// treated as a connection error (Section 5.4.1) of
-		// type PROTOCOL_ERROR."
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if st == nil || state != stateOpen || st.gotTrailerHeader || st.resetQueued {
-		// This includes sending a RST_STREAM if the stream is
-		// in stateHalfClosedLocal (which currently means that
-		// the http.Handler returned, so it's done reading &
-		// done writing). Try to stop the client from sending
-		// more DATA.
-
-		// But still enforce their connection-level flow control,
-		// and return any flow control bytes since we're not going
-		// to consume them.
-		if sc.inflow.available() < int32(f.Length) {
-			return streamError(id, ErrCodeFlowControl)
-		}
-		// Deduct the flow control from inflow, since we're
-		// going to immediately add it back in
-		// sendWindowUpdate, which also schedules sending the
-		// frames.
-		sc.inflow.take(int32(f.Length))
-		sc.sendWindowUpdate(nil, int(f.Length)) // conn-level
-
-		if st != nil && st.resetQueued {
-			// Already have a stream error in flight. Don't send another.
-			return nil
-		}
-		return streamError(id, ErrCodeStreamClosed)
-	}
-	if st.body == nil {
-		panic("internal error: should have a body in this state")
-	}
-
-	// Sender sending more than they'd declared?
-	if st.declBodyBytes != -1 && st.bodyBytes+int64(len(data)) > st.declBodyBytes {
-		st.body.CloseWithError(fmt.Errorf("sender tried to send more than declared Content-Length of %d bytes", st.declBodyBytes))
-		return streamError(id, ErrCodeStreamClosed)
-	}
-	if f.Length > 0 {
-		// Check whether the client has flow control quota.
-		if st.inflow.available() < int32(f.Length) {
-			return streamError(id, ErrCodeFlowControl)
-		}
-		st.inflow.take(int32(f.Length))
-
-		if len(data) > 0 {
-			wrote, err := st.body.Write(data)
-			if err != nil {
-				return streamError(id, ErrCodeStreamClosed)
-			}
-			if wrote != len(data) {
-				panic("internal error: bad Writer")
-			}
-			st.bodyBytes += int64(len(data))
-		}
-
-		// Return any padded flow control now, since we won't
-		// refund it later on body reads.
-		if pad := int32(f.Length) - int32(len(data)); pad > 0 {
-			sc.sendWindowUpdate32(nil, pad)
-			sc.sendWindowUpdate32(st, pad)
-		}
-	}
-	if f.StreamEnded() {
-		st.endStream()
-	}
-	return nil
-}
-
-func (sc *serverConn) processGoAway(f *GoAwayFrame) error {
-	sc.serveG.check()
-	if f.ErrCode != ErrCodeNo {
-		sc.logf("http2: received GOAWAY %+v, starting graceful shutdown", f)
-	} else {
-		sc.vlogf("http2: received GOAWAY %+v, starting graceful shutdown", f)
-	}
-	sc.startGracefulShutdown()
-	// http://tools.ietf.org/html/rfc7540#section-6.8
-	// We should not create any new streams, which means we should disable push.
-	sc.pushEnabled = false
-	return nil
-}
-
-// isPushed reports whether the stream is server-initiated.
-func (st *stream) isPushed() bool {
-	return st.id%2 == 0
-}
-
-// endStream closes a Request.Body's pipe. It is called when a DATA
-// frame says a request body is over (or after trailers).
-func (st *stream) endStream() {
-	sc := st.sc
-	sc.serveG.check()
-
-	if st.declBodyBytes != -1 && st.declBodyBytes != st.bodyBytes {
-		st.body.CloseWithError(fmt.Errorf("request declared a Content-Length of %d but only wrote %d bytes",
-			st.declBodyBytes, st.bodyBytes))
-	} else {
-		st.body.closeWithErrorAndCode(io.EOF, st.copyTrailersToHandlerRequest)
-		st.body.CloseWithError(io.EOF)
-	}
-	st.state = stateHalfClosedRemote
-}
-
-// copyTrailersToHandlerRequest is run in the Handler's goroutine in
-// its Request.Body.Read just before it gets io.EOF.
-func (st *stream) copyTrailersToHandlerRequest() {
-	for k, vv := range st.trailer {
-		if _, ok := st.reqTrailer[k]; ok {
-			// Only copy it over it was pre-declared.
-			st.reqTrailer[k] = vv
-		}
-	}
-}
-
-func (sc *serverConn) processHeaders(f *MetaHeadersFrame) error {
-	sc.serveG.check()
-	id := f.StreamID
-	if sc.inGoAway {
-		// Ignore.
-		return nil
-	}
-	// http://tools.ietf.org/html/rfc7540#section-5.1.1
-	// Streams initiated by a client MUST use odd-numbered stream
-	// identifiers. [...] An endpoint that receives an unexpected
-	// stream identifier MUST respond with a connection error
-	// (Section 5.4.1) of type PROTOCOL_ERROR.
-	if id%2 != 1 {
-		return ConnectionError(ErrCodeProtocol)
-	}
-	// A HEADERS frame can be used to create a new stream or
-	// send a trailer for an open one. If we already have a stream
-	// open, let it process its own HEADERS frame (trailers at this
-	// point, if it's valid).
-	if st := sc.streams[f.StreamID]; st != nil {
-		if st.resetQueued {
-			// We're sending RST_STREAM to close the stream, so don't bother
-			// processing this frame.
-			return nil
-		}
-		return st.processTrailerHeaders(f)
-	}
-
-	// [...] The identifier of a newly established stream MUST be
-	// numerically greater than all streams that the initiating
-	// endpoint has opened or reserved. [...]  An endpoint that
-	// receives an unexpected stream identifier MUST respond with
-	// a connection error (Section 5.4.1) of type PROTOCOL_ERROR.
-	if id <= sc.maxClientStreamID {
-		return ConnectionError(ErrCodeProtocol)
-	}
-	sc.maxClientStreamID = id
-
-	if sc.idleTimer != nil {
-		sc.idleTimer.Stop()
-	}
-
-	// http://tools.ietf.org/html/rfc7540#section-5.1.2
-	// [...] Endpoints MUST NOT exceed the limit set by their peer. An
-	// endpoint that receives a HEADERS frame that causes their
-	// advertised concurrent stream limit to be exceeded MUST treat
-	// this as a stream error (Section 5.4.2) of type PROTOCOL_ERROR
-	// or REFUSED_STREAM.
-	if sc.curClientStreams+1 > sc.advMaxStreams {
-		if sc.unackedSettings == 0 {
-			// They should know better.
-			return streamError(id, ErrCodeProtocol)
-		}
-		// Assume it's a network race, where they just haven't
-		// received our last SETTINGS update. But actually
-		// this can't happen yet, because we don't yet provide
-		// a way for users to adjust server parameters at
-		// runtime.
-		return streamError(id, ErrCodeRefusedStream)
-	}
-
-	initialState := stateOpen
-	if f.StreamEnded() {
-		initialState = stateHalfClosedRemote
-	}
-	st := sc.newStream(id, 0, initialState)
-
-	if f.HasPriority() {
-		if err := checkPriority(f.StreamID, f.Priority); err != nil {
-			return err
-		}
-		sc.writeSched.AdjustStream(st.id, f.Priority)
-	}
-
-	rw, req, err := sc.newWriterAndRequest(st, f)
-	if err != nil {
-		return err
-	}
-	st.reqTrailer = req.Trailer
-	if st.reqTrailer != nil {
-		st.trailer = make(http.Header)
-	}
-	st.body = req.Body.(*requestBody).pipe // may be nil
-	st.declBodyBytes = req.ContentLength
-
-	handler := sc.handler.ServeHTTP
-	if f.Truncated {
-		// Their header list was too long. Send a 431 error.
-		handler = handleHeaderListTooLong
-	} else if err := checkValidHTTP2RequestHeaders(req.Header); err != nil {
-		handler = new400Handler(err)
-	}
-
-	// The net/http package sets the read deadline from the
-	// http.Server.ReadTimeout during the TLS handshake, but then
-	// passes the connection off to us with the deadline already
-	// set. Disarm it here after the request headers are read,
-	// similar to how the http1 server works. Here it's
-	// technically more like the http1 Server's ReadHeaderTimeout
-	// (in Go 1.8), though. That's a more sane option anyway.
-	if sc.hs.ReadTimeout != 0 {
-		sc.conn.SetReadDeadline(time.Time{})
-	}
-
-	go sc.runHandler(rw, req, handler)
-	return nil
-}
-
-func (st *stream) processTrailerHeaders(f *MetaHeadersFrame) error {
-	sc := st.sc
-	sc.serveG.check()
-	if st.gotTrailerHeader {
-		return ConnectionError(ErrCodeProtocol)
-	}
-	st.gotTrailerHeader = true
-	if !f.StreamEnded() {
-		return streamError(st.id, ErrCodeProtocol)
-	}
-
-	if len(f.PseudoFields()) > 0 {
-		return streamError(st.id, ErrCodeProtocol)
-	}
-	if st.trailer != nil {
-		for _, hf := range f.RegularFields() {
-			key := sc.canonicalHeader(hf.Name)
-			if !ValidTrailerHeader(key) {
-				// TODO: send more details to the peer somehow. But http2 has
-				// no way to send debug data at a stream level. Discuss with
-				// HTTP folk.
-				return streamError(st.id, ErrCodeProtocol)
-			}
-			st.trailer[key] = append(st.trailer[key], hf.Value)
-		}
-	}
-	st.endStream()
-	return nil
-}
-
-func checkPriority(streamID uint32, p PriorityParam) error {
-	if streamID == p.StreamDep {
-		// Section 5.3.1: "A stream cannot depend on itself. An endpoint MUST treat
-		// this as a stream error (Section 5.4.2) of type PROTOCOL_ERROR."
-		// Section 5.3.3 says that a stream can depend on one of its dependencies,
-		// so it's only self-dependencies that are forbidden.
-		return streamError(streamID, ErrCodeProtocol)
-	}
-	return nil
-}
-
-func (sc *serverConn) processPriority(f *PriorityFrame) error {
-	if sc.inGoAway {
-		return nil
-	}
-	if err := checkPriority(f.StreamID, f.PriorityParam); err != nil {
-		return err
-	}
-	sc.writeSched.AdjustStream(f.StreamID, f.PriorityParam)
-	return nil
-}
-
-func (sc *serverConn) newStream(id, pusherID uint32, state streamState) *stream {
-	sc.serveG.check()
-	if id == 0 {
-		panic("internal error: cannot create stream with id 0")
-	}
-
-	ctx, cancelCtx := contextWithCancel(sc.baseCtx)
-	st := &stream{
-		sc:        sc,
-		id:        id,
-		state:     state,
-		ctx:       ctx,
-		cancelCtx: cancelCtx,
-	}
-	st.cw.Init()
-	st.flow.conn = &sc.flow // link to conn-level counter
-	st.flow.add(sc.initialStreamSendWindowSize)
-	st.inflow.conn = &sc.inflow // link to conn-level counter
-	st.inflow.add(sc.srv.initialStreamRecvWindowSize())
-
-	sc.streams[id] = st
-	sc.writeSched.OpenStream(st.id, OpenStreamOptions{PusherID: pusherID})
-	if st.isPushed() {
-		sc.curPushedStreams++
-	} else {
-		sc.curClientStreams++
-	}
-	if sc.curOpenStreams() == 1 {
-		sc.setConnState(http.StateActive)
-	}
-
-	return st
-}
-
-func (sc *serverConn) newWriterAndRequest(st *stream, f *MetaHeadersFrame) (*responseWriter, *http.Request, error) {
-	sc.serveG.check()
-
-	rp := requestParam{
-		method:    f.PseudoValue("method"),
-		scheme:    f.PseudoValue("scheme"),
-		authority: f.PseudoValue("authority"),
-		path:      f.PseudoValue("path"),
-	}
-
-	isConnect := rp.method == "CONNECT"
-	if isConnect {
-		if rp.path != "" || rp.scheme != "" || rp.authority == "" {
-			return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
-		}
-	} else if rp.method == "" || rp.path == "" || (rp.scheme != "https" && rp.scheme != "http") {
-		// See 8.1.2.6 Malformed Requests and Responses:
-		//
-		// Malformed requests or responses that are detected
-		// MUST be treated as a stream error (Section 5.4.2)
-		// of type PROTOCOL_ERROR."
-		//
-		// 8.1.2.3 Request Pseudo-Header Fields
-		// "All HTTP/2 requests MUST include exactly one valid
-		// value for the :method, :scheme, and :path
-		// pseudo-header fields"
-		return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
-	}
-
-	bodyOpen := !f.StreamEnded()
-	if rp.method == "HEAD" && bodyOpen {
-		// HEAD requests can't have bodies
-		return nil, nil, streamError(f.StreamID, ErrCodeProtocol)
-	}
-
-	rp.header = make(http.Header)
-	for _, hf := range f.RegularFields() {
-		rp.header.Add(sc.canonicalHeader(hf.Name), hf.Value)
-	}
-	if rp.authority == "" {
-		rp.authority = rp.header.Get("Host")
-	}
-
-	rw, req, err := sc.newWriterAndRequestNoBody(st, rp)
-	if err != nil {
-		return nil, nil, err
-	}
-	if bodyOpen {
-		if vv, ok := rp.header["Content-Length"]; ok {
-			req.ContentLength, _ = strconv.ParseInt(vv[0], 10, 64)
-		} else {
-			req.ContentLength = -1
-		}
-		req.Body.(*requestBody).pipe = &pipe{
-			b: &dataBuffer{expected: req.ContentLength},
-		}
-	}
-	return rw, req, nil
-}
-
-type requestParam struct {
-	method                  string
-	scheme, authority, path string
-	header                  http.Header
-}
-
-func (sc *serverConn) newWriterAndRequestNoBody(st *stream, rp requestParam) (*responseWriter, *http.Request, error) {
-	sc.serveG.check()
-
-	var tlsState *tls.ConnectionState // nil if not scheme https
-	if rp.scheme == "https" {
-		tlsState = sc.tlsState
-	}
-
-	needsContinue := rp.header.Get("Expect") == "100-continue"
-	if needsContinue {
-		rp.header.Del("Expect")
-	}
-	// Merge Cookie headers into one "; "-delimited value.
-	if cookies := rp.header["Cookie"]; len(cookies) > 1 {
-		rp.header.Set("Cookie", strings.Join(cookies, "; "))
-	}
-
-	// Setup Trailers
-	var trailer http.Header
-	for _, v := range rp.header["Trailer"] {
-		for _, key := range strings.Split(v, ",") {
-			key = http.CanonicalHeaderKey(strings.TrimSpace(key))
-			switch key {
-			case "Transfer-Encoding", "Trailer", "Content-Length":
-				// Bogus. (copy of http1 rules)
-				// Ignore.
-			default:
-				if trailer == nil {
-					trailer = make(http.Header)
-				}
-				trailer[key] = nil
-			}
-		}
-	}
-	delete(rp.header, "Trailer")
-
-	var url_ *url.URL
-	var requestURI string
-	if rp.method == "CONNECT" {
-		url_ = &url.URL{Host: rp.authority}
-		requestURI = rp.authority // mimic HTTP/1 server behavior
-	} else {
-		var err error
-		url_, err = url.ParseRequestURI(rp.path)
-		if err != nil {
-			return nil, nil, streamError(st.id, ErrCodeProtocol)
-		}
-		requestURI = rp.path
-	}
-
-	body := &requestBody{
-		conn:          sc,
-		stream:        st,
-		needsContinue: needsContinue,
-	}
-	req := &http.Request{
-		Method:     rp.method,
-		URL:        url_,
-		RemoteAddr: sc.remoteAddrStr,
-		Header:     rp.header,
-		RequestURI: requestURI,
-		Proto:      "HTTP/2.0",
-		ProtoMajor: 2,
-		ProtoMinor: 0,
-		TLS:        tlsState,
-		Host:       rp.authority,
-		Body:       body,
-		Trailer:    trailer,
-	}
-	req = requestWithContext(req, st.ctx)
-
-	rws := responseWriterStatePool.Get().(*responseWriterState)
-	bwSave := rws.bw
-	*rws = responseWriterState{} // zero all the fields
-	rws.conn = sc
-	rws.bw = bwSave
-	rws.bw.Reset(chunkWriter{rws})
-	rws.stream = st
-	rws.req = req
-	rws.body = body
-
-	rw := &responseWriter{rws: rws}
-	return rw, req, nil
-}
-
-// Run on its own goroutine.
-func (sc *serverConn) runHandler(rw *responseWriter, req *http.Request, handler func(http.ResponseWriter, *http.Request)) {
-	didPanic := true
-	defer func() {
-		rw.rws.stream.cancelCtx()
-		if didPanic {
-			e := recover()
-			sc.writeFrameFromHandler(FrameWriteRequest{
-				write:  handlerPanicRST{rw.rws.stream.id},
-				stream: rw.rws.stream,
-			})
-			// Same as net/http:
-			if shouldLogPanic(e) {
-				const size = 64 << 10
-				buf := make([]byte, size)
-				buf = buf[:runtime.Stack(buf, false)]
-				sc.logf("http2: panic serving %v: %v\n%s", sc.conn.RemoteAddr(), e, buf)
-			}
-			return
-		}
-		rw.handlerDone()
-	}()
-	handler(rw, req)
-	didPanic = false
-}
-
-func handleHeaderListTooLong(w http.ResponseWriter, r *http.Request) {
-	// 10.5.1 Limits on Header Block Size:
-	// .. "A server that receives a larger header block than it is
-	// willing to handle can send an HTTP 431 (Request Header Fields Too
-	// Large) status code"
-	const statusRequestHeaderFieldsTooLarge = 431 // only in Go 1.6+
-	w.WriteHeader(statusRequestHeaderFieldsTooLarge)
-	io.WriteString(w, "<h1>HTTP Error 431</h1><p>Request Header Field(s) Too Large</p>")
-}
-
-// called from handler goroutines.
-// h may be nil.
-func (sc *serverConn) writeHeaders(st *stream, headerData *writeResHeaders) error {
-	sc.serveG.checkNotOn() // NOT on
-	var errc chan error
-	if headerData.h != nil {
-		// If there's a header map (which we don't own), so we have to block on
-		// waiting for this frame to be written, so an http.Flush mid-handler
-		// writes out the correct value of keys, before a handler later potentially
-		// mutates it.
-		errc = errChanPool.Get().(chan error)
-	}
-	if err := sc.writeFrameFromHandler(FrameWriteRequest{
-		write:  headerData,
-		stream: st,
-		done:   errc,
-	}); err != nil {
-		return err
-	}
-	if errc != nil {
-		select {
-		case err := <-errc:
-			errChanPool.Put(errc)
-			return err
-		case <-sc.doneServing:
-			return errClientDisconnected
-		case <-st.cw:
-			return errStreamClosed
-		}
-	}
-	return nil
-}
-
-// called from handler goroutines.
-func (sc *serverConn) write100ContinueHeaders(st *stream) {
-	sc.writeFrameFromHandler(FrameWriteRequest{
-		write:  write100ContinueHeadersFrame{st.id},
-		stream: st,
-	})
-}
-
-// A bodyReadMsg tells the server loop that the http.Handler read n
-// bytes of the DATA from the client on the given stream.
-type bodyReadMsg struct {
-	st *stream
-	n  int
-}
-
-// called from handler goroutines.
-// Notes that the handler for the given stream ID read n bytes of its body
-// and schedules flow control tokens to be sent.
-func (sc *serverConn) noteBodyReadFromHandler(st *stream, n int, err error) {
-	sc.serveG.checkNotOn() // NOT on
-	if n > 0 {
-		select {
-		case sc.bodyReadCh <- bodyReadMsg{st, n}:
-		case <-sc.doneServing:
-		}
-	}
-}
-
-func (sc *serverConn) noteBodyRead(st *stream, n int) {
-	sc.serveG.check()
-	sc.sendWindowUpdate(nil, n) // conn-level
-	if st.state != stateHalfClosedRemote && st.state != stateClosed {
-		// Don't send this WINDOW_UPDATE if the stream is closed
-		// remotely.
-		sc.sendWindowUpdate(st, n)
-	}
-}
-
-// st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate(st *stream, n int) {
-	sc.serveG.check()
-	// "The legal range for the increment to the flow control
-	// window is 1 to 2^31-1 (2,147,483,647) octets."
-	// A Go Read call on 64-bit machines could in theory read
-	// a larger Read than this. Very unlikely, but we handle it here
-	// rather than elsewhere for now.
-	const maxUint31 = 1<<31 - 1
-	for n >= maxUint31 {
-		sc.sendWindowUpdate32(st, maxUint31)
-		n -= maxUint31
-	}
-	sc.sendWindowUpdate32(st, int32(n))
-}
-
-// st may be nil for conn-level
-func (sc *serverConn) sendWindowUpdate32(st *stream, n int32) {
-	sc.serveG.check()
-	if n == 0 {
-		return
-	}
-	if n < 0 {
-		panic("negative update")
-	}
-	var streamID uint32
-	if st != nil {
-		streamID = st.id
-	}
-	sc.writeFrame(FrameWriteRequest{
-		write:  writeWindowUpdate{streamID: streamID, n: uint32(n)},
-		stream: st,
-	})
-	var ok bool
-	if st == nil {
-		ok = sc.inflow.add(n)
-	} else {
-		ok = st.inflow.add(n)
-	}
-	if !ok {
-		panic("internal error; sent too many window updates without decrements?")
-	}
-}
-
-// requestBody is the Handler's Request.Body type.
-// Read and Close may be called concurrently.
-type requestBody struct {
-	stream        *stream
-	conn          *serverConn
-	closed        bool  // for use by Close only
-	sawEOF        bool  // for use by Read only
-	pipe          *pipe // non-nil if we have a HTTP entity message body
-	needsContinue bool  // need to send a 100-continue
-}
-
-func (b *requestBody) Close() error {
-	if b.pipe != nil && !b.closed {
-		b.pipe.BreakWithError(errClosedBody)
-	}
-	b.closed = true
-	return nil
-}
-
-func (b *requestBody) Read(p []byte) (n int, err error) {
-	if b.needsContinue {
-		b.needsContinue = false
-		b.conn.write100ContinueHeaders(b.stream)
-	}
-	if b.pipe == nil || b.sawEOF {
-		return 0, io.EOF
-	}
-	n, err = b.pipe.Read(p)
-	if err == io.EOF {
-		b.sawEOF = true
-	}
-	if b.conn == nil && inTests {
-		return
-	}
-	b.conn.noteBodyReadFromHandler(b.stream, n, err)
-	return
-}
-
-// responseWriter is the http.ResponseWriter implementation. It's
-// intentionally small (1 pointer wide) to minimize garbage. The
-// responseWriterState pointer inside is zeroed at the end of a
-// request (in handlerDone) and calls on the responseWriter thereafter
-// simply crash (caller's mistake), but the much larger responseWriterState
-// and buffers are reused between multiple requests.
-type responseWriter struct {
-	rws *responseWriterState
-}
-
-// Optional http.ResponseWriter interfaces implemented.
-var (
-	_ http.CloseNotifier = (*responseWriter)(nil)
-	_ http.Flusher       = (*responseWriter)(nil)
-	_ stringWriter       = (*responseWriter)(nil)
-)
-
-type responseWriterState struct {
-	// immutable within a request:
-	stream *stream
-	req    *http.Request
-	body   *requestBody // to close at end of request, if DATA frames didn't
-	conn   *serverConn
-
-	// TODO: adjust buffer writing sizes based on server config, frame size updates from peer, etc
-	bw *bufio.Writer // writing to a chunkWriter{this *responseWriterState}
-
-	// mutated by http.Handler goroutine:
-	handlerHeader http.Header // nil until called
-	snapHeader    http.Header // snapshot of handlerHeader at WriteHeader time
-	trailers      []string    // set in writeChunk
-	status        int         // status code passed to WriteHeader
-	wroteHeader   bool        // WriteHeader called (explicitly or implicitly). Not necessarily sent to user yet.
-	sentHeader    bool        // have we sent the header frame?
-	handlerDone   bool        // handler has finished
-
-	sentContentLen int64 // non-zero if handler set a Content-Length header
-	wroteBytes     int64
-
-	closeNotifierMu sync.Mutex // guards closeNotifierCh
-	closeNotifierCh chan bool  // nil until first used
-}
-
-type chunkWriter struct{ rws *responseWriterState }
-
-func (cw chunkWriter) Write(p []byte) (n int, err error) { return cw.rws.writeChunk(p) }
-
-func (rws *responseWriterState) hasTrailers() bool { return len(rws.trailers) != 0 }
-
-// declareTrailer is called for each Trailer header when the
-// response header is written. It notes that a header will need to be
-// written in the trailers at the end of the response.
-func (rws *responseWriterState) declareTrailer(k string) {
-	k = http.CanonicalHeaderKey(k)
-	if !ValidTrailerHeader(k) {
-		// Forbidden by RFC 2616 14.40.
-		rws.conn.logf("ignoring invalid trailer %q", k)
-		return
-	}
-	if !strSliceContains(rws.trailers, k) {
-		rws.trailers = append(rws.trailers, k)
-	}
-}
-
-// writeChunk writes chunks from the bufio.Writer. But because
-// bufio.Writer may bypass its chunking, sometimes p may be
-// arbitrarily large.
-//
-// writeChunk is also responsible (on the first chunk) for sending the
-// HEADER response.
-func (rws *responseWriterState) writeChunk(p []byte) (n int, err error) {
-	if !rws.wroteHeader {
-		rws.writeHeader(200)
-	}
-
-	isHeadResp := rws.req.Method == "HEAD"
-	if !rws.sentHeader {
-		rws.sentHeader = true
-		var ctype, clen string
-		if clen = rws.snapHeader.Get("Content-Length"); clen != "" {
-			rws.snapHeader.Del("Content-Length")
-			clen64, err := strconv.ParseInt(clen, 10, 64)
-			if err == nil && clen64 >= 0 {
-				rws.sentContentLen = clen64
-			} else {
-				clen = ""
-			}
-		}
-		if clen == "" && rws.handlerDone && bodyAllowedForStatus(rws.status) && (len(p) > 0 || !isHeadResp) {
-			clen = strconv.Itoa(len(p))
-		}
-		_, hasContentType := rws.snapHeader["Content-Type"]
-		if !hasContentType && bodyAllowedForStatus(rws.status) {
-			ctype = http.DetectContentType(p)
-		}
-		var date string
-		if _, ok := rws.snapHeader["Date"]; !ok {
-			// TODO(bradfitz): be faster here, like net/http? measure.
-			date = time.Now().UTC().Format(http.TimeFormat)
-		}
-
-		for _, v := range rws.snapHeader["Trailer"] {
-			foreachHeaderElement(v, rws.declareTrailer)
-		}
-
-		endStream := (rws.handlerDone && !rws.hasTrailers() && len(p) == 0) || isHeadResp
-		err = rws.conn.writeHeaders(rws.stream, &writeResHeaders{
-			streamID:      rws.stream.id,
-			httpResCode:   rws.status,
-			h:             rws.snapHeader,
-			endStream:     endStream,
-			contentType:   ctype,
-			contentLength: clen,
-			date:          date,
-		})
-		if err != nil {
-			return 0, err
-		}
-		if endStream {
-			return 0, nil
-		}
-	}
-	if isHeadResp {
-		return len(p), nil
-	}
-	if len(p) == 0 && !rws.handlerDone {
-		return 0, nil
-	}
-
-	if rws.handlerDone {
-		rws.promoteUndeclaredTrailers()
-	}
-
-	endStream := rws.handlerDone && !rws.hasTrailers()
-	if len(p) > 0 || endStream {
-		// only send a 0 byte DATA frame if we're ending the stream.
-		if err := rws.conn.writeDataFromHandler(rws.stream, p, endStream); err != nil {
-			return 0, err
-		}
-	}
-
-	if rws.handlerDone && rws.hasTrailers() {
-		err = rws.conn.writeHeaders(rws.stream, &writeResHeaders{
-			streamID:  rws.stream.id,
-			h:         rws.handlerHeader,
-			trailers:  rws.trailers,
-			endStream: true,
-		})
-		return len(p), err
-	}
-	return len(p), nil
-}
-
-// TrailerPrefix is a magic prefix for ResponseWriter.Header map keys
-// that, if present, signals that the map entry is actually for
-// the response trailers, and not the response headers. The prefix
-// is stripped after the ServeHTTP call finishes and the values are
-// sent in the trailers.
-//
-// This mechanism is intended only for trailers that are not known
-// prior to the headers being written. If the set of trailers is fixed
-// or known before the header is written, the normal Go trailers mechanism
-// is preferred:
-//    https://golang.org/pkg/net/http/#ResponseWriter
-//    https://golang.org/pkg/net/http/#example_ResponseWriter_trailers
-const TrailerPrefix = "Trailer:"
-
-// promoteUndeclaredTrailers permits http.Handlers to set trailers
-// after the header has already been flushed. Because the Go
-// ResponseWriter interface has no way to set Trailers (only the
-// Header), and because we didn't want to expand the ResponseWriter
-// interface, and because nobody used trailers, and because RFC 2616
-// says you SHOULD (but not must) predeclare any trailers in the
-// header, the official ResponseWriter rules said trailers in Go must
-// be predeclared, and then we reuse the same ResponseWriter.Header()
-// map to mean both Headers and Trailers. When it's time to write the
-// Trailers, we pick out the fields of Headers that were declared as
-// trailers. That worked for a while, until we found the first major
-// user of Trailers in the wild: gRPC (using them only over http2),
-// and gRPC libraries permit setting trailers mid-stream without
-// predeclarnig them. So: change of plans. We still permit the old
-// way, but we also permit this hack: if a Header() key begins with
-// "Trailer:", the suffix of that key is a Trailer. Because ':' is an
-// invalid token byte anyway, there is no ambiguity. (And it's already
-// filtered out) It's mildly hacky, but not terrible.
-//
-// This method runs after the Handler is done and promotes any Header
-// fields to be trailers.
-func (rws *responseWriterState) promoteUndeclaredTrailers() {
-	for k, vv := range rws.handlerHeader {
-		if !strings.HasPrefix(k, TrailerPrefix) {
-			continue
-		}
-		trailerKey := strings.TrimPrefix(k, TrailerPrefix)
-		rws.declareTrailer(trailerKey)
-		rws.handlerHeader[http.CanonicalHeaderKey(trailerKey)] = vv
-	}
-
-	if len(rws.trailers) > 1 {
-		sorter := sorterPool.Get().(*sorter)
-		sorter.SortStrings(rws.trailers)
-		sorterPool.Put(sorter)
-	}
-}
-
-func (w *responseWriter) Flush() {
-	rws := w.rws
-	if rws == nil {
-		panic("Header called after Handler finished")
-	}
-	if rws.bw.Buffered() > 0 {
-		if err := rws.bw.Flush(); err != nil {
-			// Ignore the error. The frame writer already knows.
-			return
-		}
-	} else {
-		// The bufio.Writer won't call chunkWriter.Write
-		// (writeChunk with zero bytes, so we have to do it
-		// ourselves to force the HTTP response header and/or
-		// final DATA frame (with END_STREAM) to be sent.
-		rws.writeChunk(nil)
-	}
-}
-
-func (w *responseWriter) CloseNotify() <-chan bool {
-	rws := w.rws
-	if rws == nil {
-		panic("CloseNotify called after Handler finished")
-	}
-	rws.closeNotifierMu.Lock()
-	ch := rws.closeNotifierCh
-	if ch == nil {
-		ch = make(chan bool, 1)
-		rws.closeNotifierCh = ch
-		cw := rws.stream.cw
-		go func() {
-			cw.Wait() // wait for close
-			ch <- true
-		}()
-	}
-	rws.closeNotifierMu.Unlock()
-	return ch
-}
-
-func (w *responseWriter) Header() http.Header {
-	rws := w.rws
-	if rws == nil {
-		panic("Header called after Handler finished")
-	}
-	if rws.handlerHeader == nil {
-		rws.handlerHeader = make(http.Header)
-	}
-	return rws.handlerHeader
-}
-
-func (w *responseWriter) WriteHeader(code int) {
-	rws := w.rws
-	if rws == nil {
-		panic("WriteHeader called after Handler finished")
-	}
-	rws.writeHeader(code)
-}
-
-func (rws *responseWriterState) writeHeader(code int) {
-	if !rws.wroteHeader {
-		rws.wroteHeader = true
-		rws.status = code
-		if len(rws.handlerHeader) > 0 {
-			rws.snapHeader = cloneHeader(rws.handlerHeader)
-		}
-	}
-}
-
-func cloneHeader(h http.Header) http.Header {
-	h2 := make(http.Header, len(h))
-	for k, vv := range h {
-		vv2 := make([]string, len(vv))
-		copy(vv2, vv)
-		h2[k] = vv2
-	}
-	return h2
-}
-
-// The Life Of A Write is like this:
-//
-// * Handler calls w.Write or w.WriteString ->
-// * -> rws.bw (*bufio.Writer) ->
-// * (Handler migth call Flush)
-// * -> chunkWriter{rws}
-// * -> responseWriterState.writeChunk(p []byte)
-// * -> responseWriterState.writeChunk (most of the magic; see comment there)
-func (w *responseWriter) Write(p []byte) (n int, err error) {
-	return w.write(len(p), p, "")
-}
-
-func (w *responseWriter) WriteString(s string) (n int, err error) {
-	return w.write(len(s), nil, s)
-}
-
-// either dataB or dataS is non-zero.
-func (w *responseWriter) write(lenData int, dataB []byte, dataS string) (n int, err error) {
-	rws := w.rws
-	if rws == nil {
-		panic("Write called after Handler finished")
-	}
-	if !rws.wroteHeader {
-		w.WriteHeader(200)
-	}
-	if !bodyAllowedForStatus(rws.status) {
-		return 0, http.ErrBodyNotAllowed
-	}
-	rws.wroteBytes += int64(len(dataB)) + int64(len(dataS)) // only one can be set
-	if rws.sentContentLen != 0 && rws.wroteBytes > rws.sentContentLen {
-		// TODO: send a RST_STREAM
-		return 0, errors.New("http2: handler wrote more than declared Content-Length")
-	}
-
-	if dataB != nil {
-		return rws.bw.Write(dataB)
-	} else {
-		return rws.bw.WriteString(dataS)
-	}
-}
-
-func (w *responseWriter) handlerDone() {
-	rws := w.rws
-	rws.handlerDone = true
-	w.Flush()
-	w.rws = nil
-	responseWriterStatePool.Put(rws)
-}
-
-// Push errors.
-var (
-	ErrRecursivePush    = errors.New("http2: recursive push not allowed")
-	ErrPushLimitReached = errors.New("http2: push would exceed peer's SETTINGS_MAX_CONCURRENT_STREAMS")
-)
-
-// pushOptions is the internal version of http.PushOptions, which we
-// cannot include here because it's only defined in Go 1.8 and later.
-type pushOptions struct {
-	Method string
-	Header http.Header
-}
-
-func (w *responseWriter) push(target string, opts pushOptions) error {
-	st := w.rws.stream
-	sc := st.sc
-	sc.serveG.checkNotOn()
-
-	// No recursive pushes: "PUSH_PROMISE frames MUST only be sent on a peer-initiated stream."
-	// http://tools.ietf.org/html/rfc7540#section-6.6
-	if st.isPushed() {
-		return ErrRecursivePush
-	}
-
-	// Default options.
-	if opts.Method == "" {
-		opts.Method = "GET"
-	}
-	if opts.Header == nil {
-		opts.Header = http.Header{}
-	}
-	wantScheme := "http"
-	if w.rws.req.TLS != nil {
-		wantScheme = "https"
-	}
-
-	// Validate the request.
-	u, err := url.Parse(target)
-	if err != nil {
-		return err
-	}
-	if u.Scheme == "" {
-		if !strings.HasPrefix(target, "/") {
-			return fmt.Errorf("target must be an absolute URL or an absolute path: %q", target)
-		}
-		u.Scheme = wantScheme
-		u.Host = w.rws.req.Host
-	} else {
-		if u.Scheme != wantScheme {
-			return fmt.Errorf("cannot push URL with scheme %q from request with scheme %q", u.Scheme, wantScheme)
-		}
-		if u.Host == "" {
-			return errors.New("URL must have a host")
-		}
-	}
-	for k := range opts.Header {
-		if strings.HasPrefix(k, ":") {
-			return fmt.Errorf("promised request headers cannot include pseudo header %q", k)
-		}
-		// These headers are meaningful only if the request has a body,
-		// but PUSH_PROMISE requests cannot have a body.
-		// http://tools.ietf.org/html/rfc7540#section-8.2
-		// Also disallow Host, since the promised URL must be absolute.
-		switch strings.ToLower(k) {
-		case "content-length", "content-encoding", "trailer", "te", "expect", "host":
-			return fmt.Errorf("promised request headers cannot include %q", k)
-		}
-	}
-	if err := checkValidHTTP2RequestHeaders(opts.Header); err != nil {
-		return err
-	}
-
-	// The RFC effectively limits promised requests to GET and HEAD:
-	// "Promised requests MUST be cacheable [GET, HEAD, or POST], and MUST be safe [GET or HEAD]"
-	// http://tools.ietf.org/html/rfc7540#section-8.2
-	if opts.Method != "GET" && opts.Method != "HEAD" {
-		return fmt.Errorf("method %q must be GET or HEAD", opts.Method)
-	}
-
-	msg := startPushRequest{
-		parent: st,
-		method: opts.Method,
-		url:    u,
-		header: cloneHeader(opts.Header),
-		done:   errChanPool.Get().(chan error),
-	}
-
-	select {
-	case <-sc.doneServing:
-		return errClientDisconnected
-	case <-st.cw:
-		return errStreamClosed
-	case sc.wantStartPushCh <- msg:
-	}
-
-	select {
-	case <-sc.doneServing:
-		return errClientDisconnected
-	case <-st.cw:
-		return errStreamClosed
-	case err := <-msg.done:
-		errChanPool.Put(msg.done)
-		return err
-	}
-}
-
-type startPushRequest struct {
-	parent *stream
-	method string
-	url    *url.URL
-	header http.Header
-	done   chan error
-}
-
-func (sc *serverConn) startPush(msg startPushRequest) {
-	sc.serveG.check()
-
-	// http://tools.ietf.org/html/rfc7540#section-6.6.
-	// PUSH_PROMISE frames MUST only be sent on a peer-initiated stream that
-	// is in either the "open" or "half-closed (remote)" state.
-	if msg.parent.state != stateOpen && msg.parent.state != stateHalfClosedRemote {
-		// responseWriter.Push checks that the stream is peer-initiaed.
-		msg.done <- errStreamClosed
-		return
-	}
-
-	// http://tools.ietf.org/html/rfc7540#section-6.6.
-	if !sc.pushEnabled {
-		msg.done <- http.ErrNotSupported
-		return
-	}
-
-	// PUSH_PROMISE frames must be sent in increasing order by stream ID, so
-	// we allocate an ID for the promised stream lazily, when the PUSH_PROMISE
-	// is written. Once the ID is allocated, we start the request handler.
-	allocatePromisedID := func() (uint32, error) {
-		sc.serveG.check()
-
-		// Check this again, just in case. Technically, we might have received
-		// an updated SETTINGS by the time we got around to writing this frame.
-		if !sc.pushEnabled {
-			return 0, http.ErrNotSupported
-		}
-		// http://tools.ietf.org/html/rfc7540#section-6.5.2.
-		if sc.curPushedStreams+1 > sc.clientMaxStreams {
-			return 0, ErrPushLimitReached
-		}
-
-		// http://tools.ietf.org/html/rfc7540#section-5.1.1.
-		// Streams initiated by the server MUST use even-numbered identifiers.
-		// A server that is unable to establish a new stream identifier can send a GOAWAY
-		// frame so that the client is forced to open a new connection for new streams.
-		if sc.maxPushPromiseID+2 >= 1<<31 {
-			sc.startGracefulShutdown()
-			return 0, ErrPushLimitReached
-		}
-		sc.maxPushPromiseID += 2
-		promisedID := sc.maxPushPromiseID
-
-		// http://tools.ietf.org/html/rfc7540#section-8.2.
-		// Strictly speaking, the new stream should start in "reserved (local)", then
-		// transition to "half closed (remote)" after sending the initial HEADERS, but
-		// we start in "half closed (remote)" for simplicity.
-		// See further comments at the definition of stateHalfClosedRemote.
-		promised := sc.newStream(promisedID, msg.parent.id, stateHalfClosedRemote)
-		rw, req, err := sc.newWriterAndRequestNoBody(promised, requestParam{
-			method:    msg.method,
-			scheme:    msg.url.Scheme,
-			authority: msg.url.Host,
-			path:      msg.url.RequestURI(),
-			header:    cloneHeader(msg.header), // clone since handler runs concurrently with writing the PUSH_PROMISE
-		})
-		if err != nil {
-			// Should not happen, since we've already validated msg.url.
-			panic(fmt.Sprintf("newWriterAndRequestNoBody(%+v): %v", msg.url, err))
-		}
-
-		go sc.runHandler(rw, req, sc.handler.ServeHTTP)
-		return promisedID, nil
-	}
-
-	sc.writeFrame(FrameWriteRequest{
-		write: &writePushPromise{
-			streamID:           msg.parent.id,
-			method:             msg.method,
-			url:                msg.url,
-			h:                  msg.header,
-			allocatePromisedID: allocatePromisedID,
-		},
-		stream: msg.parent,
-		done:   msg.done,
-	})
-}
-
-// foreachHeaderElement splits v according to the "#rule" construction
-// in RFC 2616 section 2.1 and calls fn for each non-empty element.
-func foreachHeaderElement(v string, fn func(string)) {
-	v = textproto.TrimString(v)
-	if v == "" {
-		return
-	}
-	if !strings.Contains(v, ",") {
-		fn(v)
-		return
-	}
-	for _, f := range strings.Split(v, ",") {
-		if f = textproto.TrimString(f); f != "" {
-			fn(f)
-		}
-	}
-}
-
-// From http://httpwg.org/specs/rfc7540.html#rfc.section.8.1.2.2
-var connHeaders = []string{
-	"Connection",
-	"Keep-Alive",
-	"Proxy-Connection",
-	"Transfer-Encoding",
-	"Upgrade",
-}
-
-// checkValidHTTP2RequestHeaders checks whether h is a valid HTTP/2 request,
-// per RFC 7540 Section 8.1.2.2.
-// The returned error is reported to users.
-func checkValidHTTP2RequestHeaders(h http.Header) error {
-	for _, k := range connHeaders {
-		if _, ok := h[k]; ok {
-			return fmt.Errorf("request header %q is not valid in HTTP/2", k)
-		}
-	}
-	te := h["Te"]
-	if len(te) > 0 && (len(te) > 1 || (te[0] != "trailers" && te[0] != "")) {
-		return errors.New(`request header "TE" may only be "trailers" in HTTP/2`)
-	}
-	return nil
-}
-
-func new400Handler(err error) http.HandlerFunc {
-	return func(w http.ResponseWriter, r *http.Request) {
-		http.Error(w, err.Error(), http.StatusBadRequest)
-	}
-}
-
-// ValidTrailerHeader reports whether name is a valid header field name to appear
-// in trailers.
-// See: http://tools.ietf.org/html/rfc7230#section-4.1.2
-func ValidTrailerHeader(name string) bool {
-	name = http.CanonicalHeaderKey(name)
-	if strings.HasPrefix(name, "If-") || badTrailer[name] {
-		return false
-	}
-	return true
-}
-
-var badTrailer = map[string]bool{
-	"Authorization":       true,
-	"Cache-Control":       true,
-	"Connection":          true,
-	"Content-Encoding":    true,
-	"Content-Length":      true,
-	"Content-Range":       true,
-	"Content-Type":        true,
-	"Expect":              true,
-	"Host":                true,
-	"Keep-Alive":          true,
-	"Max-Forwards":        true,
-	"Pragma":              true,
-	"Proxy-Authenticate":  true,
-	"Proxy-Authorization": true,
-	"Proxy-Connection":    true,
-	"Range":               true,
-	"Realm":               true,
-	"Te":                  true,
-	"Trailer":             true,
-	"Transfer-Encoding":   true,
-	"Www-Authenticate":    true,
-}
-
-// h1ServerShutdownChan returns a channel that will be closed when the
-// provided *http.Server wants to shut down.
-//
-// This is a somewhat hacky way to get at http1 innards. It works
-// when the http2 code is bundled into the net/http package in the
-// standard library. The alternatives ended up making the cmd/go tool
-// depend on http Servers. This is the lightest option for now.
-// This is tested via the TestServeShutdown* tests in net/http.
-func h1ServerShutdownChan(hs *http.Server) <-chan struct{} {
-	if fn := testh1ServerShutdownChan; fn != nil {
-		return fn(hs)
-	}
-	var x interface{} = hs
-	type I interface {
-		getDoneChan() <-chan struct{}
-	}
-	if hs, ok := x.(I); ok {
-		return hs.getDoneChan()
-	}
-	return nil
-}
-
-// optional test hook for h1ServerShutdownChan.
-var testh1ServerShutdownChan func(hs *http.Server) <-chan struct{}
-
-// h1ServerKeepAlivesDisabled reports whether hs has its keep-alives
-// disabled. See comments on h1ServerShutdownChan above for why
-// the code is written this way.
-func h1ServerKeepAlivesDisabled(hs *http.Server) bool {
-	var x interface{} = hs
-	type I interface {
-		doKeepAlives() bool
-	}
-	if hs, ok := x.(I); ok {
-		return !hs.doKeepAlives()
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/http2/server_push_test.go b/installer/vendor/golang.org/x/net/http2/server_push_test.go
deleted file mode 100644
index f70edd3c72..0000000000
--- a/installer/vendor/golang.org/x/net/http2/server_push_test.go
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package http2
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"reflect"
-	"strconv"
-	"sync"
-	"testing"
-	"time"
-)
-
-func TestServer_Push_Success(t *testing.T) {
-	const (
-		mainBody   = "<html>index page</html>"
-		pushedBody = "<html>pushed page</html>"
-		userAgent  = "testagent"
-		cookie     = "testcookie"
-	)
-
-	var stURL string
-	checkPromisedReq := func(r *http.Request, wantMethod string, wantH http.Header) error {
-		if got, want := r.Method, wantMethod; got != want {
-			return fmt.Errorf("promised Req.Method=%q, want %q", got, want)
-		}
-		if got, want := r.Header, wantH; !reflect.DeepEqual(got, want) {
-			return fmt.Errorf("promised Req.Header=%q, want %q", got, want)
-		}
-		if got, want := "https://"+r.Host, stURL; got != want {
-			return fmt.Errorf("promised Req.Host=%q, want %q", got, want)
-		}
-		if r.Body == nil {
-			return fmt.Errorf("nil Body")
-		}
-		if buf, err := ioutil.ReadAll(r.Body); err != nil || len(buf) != 0 {
-			return fmt.Errorf("ReadAll(Body)=%q,%v, want '',nil", buf, err)
-		}
-		return nil
-	}
-
-	errc := make(chan error, 3)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			// Push "/pushed?get" as a GET request, using an absolute URL.
-			opt := &http.PushOptions{
-				Header: http.Header{
-					"User-Agent": {userAgent},
-				},
-			}
-			if err := w.(http.Pusher).Push(stURL+"/pushed?get", opt); err != nil {
-				errc <- fmt.Errorf("error pushing /pushed?get: %v", err)
-				return
-			}
-			// Push "/pushed?head" as a HEAD request, using a path.
-			opt = &http.PushOptions{
-				Method: "HEAD",
-				Header: http.Header{
-					"User-Agent": {userAgent},
-					"Cookie":     {cookie},
-				},
-			}
-			if err := w.(http.Pusher).Push("/pushed?head", opt); err != nil {
-				errc <- fmt.Errorf("error pushing /pushed?head: %v", err)
-				return
-			}
-			w.Header().Set("Content-Type", "text/html")
-			w.Header().Set("Content-Length", strconv.Itoa(len(mainBody)))
-			w.WriteHeader(200)
-			io.WriteString(w, mainBody)
-			errc <- nil
-
-		case "/pushed?get":
-			wantH := http.Header{}
-			wantH.Set("User-Agent", userAgent)
-			if err := checkPromisedReq(r, "GET", wantH); err != nil {
-				errc <- fmt.Errorf("/pushed?get: %v", err)
-				return
-			}
-			w.Header().Set("Content-Type", "text/html")
-			w.Header().Set("Content-Length", strconv.Itoa(len(pushedBody)))
-			w.WriteHeader(200)
-			io.WriteString(w, pushedBody)
-			errc <- nil
-
-		case "/pushed?head":
-			wantH := http.Header{}
-			wantH.Set("User-Agent", userAgent)
-			wantH.Set("Cookie", cookie)
-			if err := checkPromisedReq(r, "HEAD", wantH); err != nil {
-				errc <- fmt.Errorf("/pushed?head: %v", err)
-				return
-			}
-			w.WriteHeader(204)
-			errc <- nil
-
-		default:
-			errc <- fmt.Errorf("unknown RequestURL %q", r.URL.RequestURI())
-		}
-	})
-	stURL = st.ts.URL
-
-	// Send one request, which should push two responses.
-	st.greet()
-	getSlash(st)
-	for k := 0; k < 3; k++ {
-		select {
-		case <-time.After(2 * time.Second):
-			t.Errorf("timeout waiting for handler %d to finish", k)
-		case err := <-errc:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-
-	checkPushPromise := func(f Frame, promiseID uint32, wantH [][2]string) error {
-		pp, ok := f.(*PushPromiseFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *PushPromiseFrame", f)
-		}
-		if !pp.HeadersEnded() {
-			return fmt.Errorf("want END_HEADERS flag in PushPromiseFrame")
-		}
-		if got, want := pp.PromiseID, promiseID; got != want {
-			return fmt.Errorf("got PromiseID %v; want %v", got, want)
-		}
-		gotH := st.decodeHeader(pp.HeaderBlockFragment())
-		if !reflect.DeepEqual(gotH, wantH) {
-			return fmt.Errorf("got promised headers %v; want %v", gotH, wantH)
-		}
-		return nil
-	}
-	checkHeaders := func(f Frame, wantH [][2]string) error {
-		hf, ok := f.(*HeadersFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *HeadersFrame", f)
-		}
-		gotH := st.decodeHeader(hf.HeaderBlockFragment())
-		if !reflect.DeepEqual(gotH, wantH) {
-			return fmt.Errorf("got response headers %v; want %v", gotH, wantH)
-		}
-		return nil
-	}
-	checkData := func(f Frame, wantData string) error {
-		df, ok := f.(*DataFrame)
-		if !ok {
-			return fmt.Errorf("got a %T; want *DataFrame", f)
-		}
-		if gotData := string(df.Data()); gotData != wantData {
-			return fmt.Errorf("got response data %q; want %q", gotData, wantData)
-		}
-		return nil
-	}
-
-	// Stream 1 has 2 PUSH_PROMISE + HEADERS + DATA
-	// Stream 2 has HEADERS + DATA
-	// Stream 4 has HEADERS
-	expected := map[uint32][]func(Frame) error{
-		1: {
-			func(f Frame) error {
-				return checkPushPromise(f, 2, [][2]string{
-					{":method", "GET"},
-					{":scheme", "https"},
-					{":authority", st.ts.Listener.Addr().String()},
-					{":path", "/pushed?get"},
-					{"user-agent", userAgent},
-				})
-			},
-			func(f Frame) error {
-				return checkPushPromise(f, 4, [][2]string{
-					{":method", "HEAD"},
-					{":scheme", "https"},
-					{":authority", st.ts.Listener.Addr().String()},
-					{":path", "/pushed?head"},
-					{"cookie", cookie},
-					{"user-agent", userAgent},
-				})
-			},
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "200"},
-					{"content-type", "text/html"},
-					{"content-length", strconv.Itoa(len(mainBody))},
-				})
-			},
-			func(f Frame) error {
-				return checkData(f, mainBody)
-			},
-		},
-		2: {
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "200"},
-					{"content-type", "text/html"},
-					{"content-length", strconv.Itoa(len(pushedBody))},
-				})
-			},
-			func(f Frame) error {
-				return checkData(f, pushedBody)
-			},
-		},
-		4: {
-			func(f Frame) error {
-				return checkHeaders(f, [][2]string{
-					{":status", "204"},
-				})
-			},
-		},
-	}
-
-	consumed := map[uint32]int{}
-	for k := 0; len(expected) > 0; k++ {
-		f, err := st.readFrame()
-		if err != nil {
-			for id, left := range expected {
-				t.Errorf("stream %d: missing %d frames", id, len(left))
-			}
-			t.Fatalf("readFrame %d: %v", k, err)
-		}
-		id := f.Header().StreamID
-		label := fmt.Sprintf("stream %d, frame %d", id, consumed[id])
-		if len(expected[id]) == 0 {
-			t.Fatalf("%s: unexpected frame %#+v", label, f)
-		}
-		check := expected[id][0]
-		expected[id] = expected[id][1:]
-		if len(expected[id]) == 0 {
-			delete(expected, id)
-		}
-		if err := check(f); err != nil {
-			t.Fatalf("%s: %v", label, err)
-		}
-		consumed[id]++
-	}
-}
-
-func TestServer_Push_SuccessNoRace(t *testing.T) {
-	// Regression test for issue #18326. Ensure the request handler can mutate
-	// pushed request headers without racing with the PUSH_PROMISE write.
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			opt := &http.PushOptions{
-				Header: http.Header{"User-Agent": {"testagent"}},
-			}
-			if err := w.(http.Pusher).Push("/pushed", opt); err != nil {
-				errc <- fmt.Errorf("error pushing: %v", err)
-				return
-			}
-			w.WriteHeader(200)
-			errc <- nil
-
-		case "/pushed":
-			// Update request header, ensure there is no race.
-			r.Header.Set("User-Agent", "newagent")
-			r.Header.Set("Cookie", "cookie")
-			w.WriteHeader(200)
-			errc <- nil
-
-		default:
-			errc <- fmt.Errorf("unknown RequestURL %q", r.URL.RequestURI())
-		}
-	})
-
-	// Send one request, which should push one response.
-	st.greet()
-	getSlash(st)
-	for k := 0; k < 2; k++ {
-		select {
-		case <-time.After(2 * time.Second):
-			t.Errorf("timeout waiting for handler %d to finish", k)
-		case err := <-errc:
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestServer_Push_RejectRecursivePush(t *testing.T) {
-	// Expect two requests, but might get three if there's a bug and the second push succeeds.
-	errc := make(chan error, 3)
-	handler := func(w http.ResponseWriter, r *http.Request) error {
-		baseURL := "https://" + r.Host
-		switch r.URL.Path {
-		case "/":
-			if err := w.(http.Pusher).Push(baseURL+"/push1", nil); err != nil {
-				return fmt.Errorf("first Push()=%v, want nil", err)
-			}
-			return nil
-
-		case "/push1":
-			if got, want := w.(http.Pusher).Push(baseURL+"/push2", nil), ErrRecursivePush; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-
-		default:
-			return fmt.Errorf("unexpected path: %q", r.URL.Path)
-		}
-	}
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-	st.greet()
-	getSlash(st)
-	if err := <-errc; err != nil {
-		t.Errorf("First request failed: %v", err)
-	}
-	if err := <-errc; err != nil {
-		t.Errorf("Second request failed: %v", err)
-	}
-}
-
-func testServer_Push_RejectSingleRequest(t *testing.T, doPush func(http.Pusher, *http.Request) error, settings ...Setting) {
-	// Expect one request, but might get two if there's a bug and the push succeeds.
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		errc <- doPush(w.(http.Pusher), r)
-	})
-	defer st.Close()
-	st.greet()
-	if err := st.fr.WriteSettings(settings...); err != nil {
-		st.t.Fatalf("WriteSettings: %v", err)
-	}
-	st.wantSettingsAck()
-	getSlash(st)
-	if err := <-errc; err != nil {
-		t.Error(err)
-	}
-	// Should not get a PUSH_PROMISE frame.
-	hf := st.wantHeaders()
-	if !hf.StreamEnded() {
-		t.Error("stream should end after headers")
-	}
-}
-
-func TestServer_Push_RejectIfDisabled(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if got, want := p.Push("https://"+r.Host+"/pushed", nil), http.ErrNotSupported; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-		},
-		Setting{SettingEnablePush, 0})
-}
-
-func TestServer_Push_RejectWhenNoConcurrentStreams(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if got, want := p.Push("https://"+r.Host+"/pushed", nil), ErrPushLimitReached; got != want {
-				return fmt.Errorf("Push()=%v, want %v", got, want)
-			}
-			return nil
-		},
-		Setting{SettingMaxConcurrentStreams, 0})
-}
-
-func TestServer_Push_RejectWrongScheme(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("http://"+r.Host+"/pushed", nil); err == nil {
-				return errors.New("Push() should have failed (push target URL is http)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectMissingHost(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("https:pushed", nil); err == nil {
-				return errors.New("Push() should have failed (push target URL missing host)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectRelativePath(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("../test", nil); err == nil {
-				return errors.New("Push() should have failed (push target is a relative path)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectForbiddenMethod(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			if err := p.Push("https://"+r.Host+"/pushed", &http.PushOptions{Method: "POST"}); err == nil {
-				return errors.New("Push() should have failed (cannot promise a POST)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_RejectForbiddenHeader(t *testing.T) {
-	testServer_Push_RejectSingleRequest(t,
-		func(p http.Pusher, r *http.Request) error {
-			header := http.Header{
-				"Content-Length":   {"10"},
-				"Content-Encoding": {"gzip"},
-				"Trailer":          {"Foo"},
-				"Te":               {"trailers"},
-				"Host":             {"test.com"},
-				":authority":       {"test.com"},
-			}
-			if err := p.Push("https://"+r.Host+"/pushed", &http.PushOptions{Header: header}); err == nil {
-				return errors.New("Push() should have failed (forbidden headers)")
-			}
-			return nil
-		})
-}
-
-func TestServer_Push_StateTransitions(t *testing.T) {
-	const body = "foo"
-
-	gotPromise := make(chan bool)
-	finishedPush := make(chan bool)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		switch r.URL.RequestURI() {
-		case "/":
-			if err := w.(http.Pusher).Push("/pushed", nil); err != nil {
-				t.Errorf("Push error: %v", err)
-			}
-			// Don't finish this request until the push finishes so we don't
-			// nondeterministically interleave output frames with the push.
-			<-finishedPush
-		case "/pushed":
-			<-gotPromise
-		}
-		w.Header().Set("Content-Type", "text/html")
-		w.Header().Set("Content-Length", strconv.Itoa(len(body)))
-		w.WriteHeader(200)
-		io.WriteString(w, body)
-	})
-	defer st.Close()
-
-	st.greet()
-	if st.stream(2) != nil {
-		t.Fatal("stream 2 should be empty")
-	}
-	if got, want := st.streamState(2), stateIdle; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	getSlash(st)
-	// After the PUSH_PROMISE is sent, the stream should be stateHalfClosedRemote.
-	st.wantPushPromise()
-	if got, want := st.streamState(2), stateHalfClosedRemote; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	// We stall the HTTP handler for "/pushed" until the above check. If we don't
-	// stall the handler, then the handler might write HEADERS and DATA and finish
-	// the stream before we check st.streamState(2) -- should that happen, we'll
-	// see stateClosed and fail the above check.
-	close(gotPromise)
-	st.wantHeaders()
-	if df := st.wantData(); !df.StreamEnded() {
-		t.Fatal("expected END_STREAM flag on DATA")
-	}
-	if got, want := st.streamState(2), stateClosed; got != want {
-		t.Fatalf("streamState(2)=%v, want %v", got, want)
-	}
-	close(finishedPush)
-}
-
-func TestServer_Push_RejectAfterGoAway(t *testing.T) {
-	var readyOnce sync.Once
-	ready := make(chan struct{})
-	errc := make(chan error, 2)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		select {
-		case <-ready:
-		case <-time.After(5 * time.Second):
-			errc <- fmt.Errorf("timeout waiting for GOAWAY to be processed")
-		}
-		if got, want := w.(http.Pusher).Push("https://"+r.Host+"/pushed", nil), http.ErrNotSupported; got != want {
-			errc <- fmt.Errorf("Push()=%v, want %v", got, want)
-		}
-		errc <- nil
-	})
-	defer st.Close()
-	st.greet()
-	getSlash(st)
-
-	// Send GOAWAY and wait for it to be processed.
-	st.fr.WriteGoAway(1, ErrCodeNo, nil)
-	go func() {
-		for {
-			select {
-			case <-ready:
-				return
-			default:
-			}
-			st.sc.testHookCh <- func(loopNum int) {
-				if !st.sc.pushEnabled {
-					readyOnce.Do(func() { close(ready) })
-				}
-			}
-		}
-	}()
-	if err := <-errc; err != nil {
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/server_test.go b/installer/vendor/golang.org/x/net/http2/server_test.go
deleted file mode 100644
index 407fafc6d5..0000000000
--- a/installer/vendor/golang.org/x/net/http2/server_test.go
+++ /dev/null
@@ -1,3731 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"os"
-	"os/exec"
-	"reflect"
-	"runtime"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var stderrVerbose = flag.Bool("stderr_verbose", false, "Mirror verbosity to stderr, unbuffered")
-
-func stderrv() io.Writer {
-	if *stderrVerbose {
-		return os.Stderr
-	}
-
-	return ioutil.Discard
-}
-
-type serverTester struct {
-	cc             net.Conn // client conn
-	t              testing.TB
-	ts             *httptest.Server
-	fr             *Framer
-	serverLogBuf   bytes.Buffer // logger for httptest.Server
-	logFilter      []string     // substrings to filter out
-	scMu           sync.Mutex   // guards sc
-	sc             *serverConn
-	hpackDec       *hpack.Decoder
-	decodedHeaders [][2]string
-
-	// If http2debug!=2, then we capture Frame debug logs that will be written
-	// to t.Log after a test fails. The read and write logs use separate locks
-	// and buffers so we don't accidentally introduce synchronization between
-	// the read and write goroutines, which may hide data races.
-	frameReadLogMu   sync.Mutex
-	frameReadLogBuf  bytes.Buffer
-	frameWriteLogMu  sync.Mutex
-	frameWriteLogBuf bytes.Buffer
-
-	// writing headers:
-	headerBuf bytes.Buffer
-	hpackEnc  *hpack.Encoder
-}
-
-func init() {
-	testHookOnPanicMu = new(sync.Mutex)
-}
-
-func resetHooks() {
-	testHookOnPanicMu.Lock()
-	testHookOnPanic = nil
-	testHookOnPanicMu.Unlock()
-}
-
-type serverTesterOpt string
-
-var optOnlyServer = serverTesterOpt("only_server")
-var optQuiet = serverTesterOpt("quiet_logging")
-var optFramerReuseFrames = serverTesterOpt("frame_reuse_frames")
-
-func newServerTester(t testing.TB, handler http.HandlerFunc, opts ...interface{}) *serverTester {
-	resetHooks()
-
-	ts := httptest.NewUnstartedServer(handler)
-
-	tlsConfig := &tls.Config{
-		InsecureSkipVerify: true,
-		NextProtos:         []string{NextProtoTLS},
-	}
-
-	var onlyServer, quiet, framerReuseFrames bool
-	h2server := new(Server)
-	for _, opt := range opts {
-		switch v := opt.(type) {
-		case func(*tls.Config):
-			v(tlsConfig)
-		case func(*httptest.Server):
-			v(ts)
-		case func(*Server):
-			v(h2server)
-		case serverTesterOpt:
-			switch v {
-			case optOnlyServer:
-				onlyServer = true
-			case optQuiet:
-				quiet = true
-			case optFramerReuseFrames:
-				framerReuseFrames = true
-			}
-		case func(net.Conn, http.ConnState):
-			ts.Config.ConnState = v
-		default:
-			t.Fatalf("unknown newServerTester option type %T", v)
-		}
-	}
-
-	ConfigureServer(ts.Config, h2server)
-
-	st := &serverTester{
-		t:  t,
-		ts: ts,
-	}
-	st.hpackEnc = hpack.NewEncoder(&st.headerBuf)
-	st.hpackDec = hpack.NewDecoder(initialHeaderTableSize, st.onHeaderField)
-
-	ts.TLS = ts.Config.TLSConfig // the httptest.Server has its own copy of this TLS config
-	if quiet {
-		ts.Config.ErrorLog = log.New(ioutil.Discard, "", 0)
-	} else {
-		ts.Config.ErrorLog = log.New(io.MultiWriter(stderrv(), twriter{t: t, st: st}, &st.serverLogBuf), "", log.LstdFlags)
-	}
-	ts.StartTLS()
-
-	if VerboseLogs {
-		t.Logf("Running test server at: %s", ts.URL)
-	}
-	testHookGetServerConn = func(v *serverConn) {
-		st.scMu.Lock()
-		defer st.scMu.Unlock()
-		st.sc = v
-		st.sc.testHookCh = make(chan func(int))
-	}
-	log.SetOutput(io.MultiWriter(stderrv(), twriter{t: t, st: st}))
-	if !onlyServer {
-		cc, err := tls.Dial("tcp", ts.Listener.Addr().String(), tlsConfig)
-		if err != nil {
-			t.Fatal(err)
-		}
-		st.cc = cc
-		st.fr = NewFramer(cc, cc)
-		if framerReuseFrames {
-			st.fr.SetReuseFrames()
-		}
-		if !logFrameReads && !logFrameWrites {
-			st.fr.debugReadLoggerf = func(m string, v ...interface{}) {
-				m = time.Now().Format("2006-01-02 15:04:05.999999999 ") + strings.TrimPrefix(m, "http2: ") + "\n"
-				st.frameReadLogMu.Lock()
-				fmt.Fprintf(&st.frameReadLogBuf, m, v...)
-				st.frameReadLogMu.Unlock()
-			}
-			st.fr.debugWriteLoggerf = func(m string, v ...interface{}) {
-				m = time.Now().Format("2006-01-02 15:04:05.999999999 ") + strings.TrimPrefix(m, "http2: ") + "\n"
-				st.frameWriteLogMu.Lock()
-				fmt.Fprintf(&st.frameWriteLogBuf, m, v...)
-				st.frameWriteLogMu.Unlock()
-			}
-			st.fr.logReads = true
-			st.fr.logWrites = true
-		}
-	}
-	return st
-}
-
-func (st *serverTester) closeConn() {
-	st.scMu.Lock()
-	defer st.scMu.Unlock()
-	st.sc.conn.Close()
-}
-
-func (st *serverTester) addLogFilter(phrase string) {
-	st.logFilter = append(st.logFilter, phrase)
-}
-
-func (st *serverTester) stream(id uint32) *stream {
-	ch := make(chan *stream, 1)
-	st.sc.testHookCh <- func(int) {
-		ch <- st.sc.streams[id]
-	}
-	return <-ch
-}
-
-func (st *serverTester) streamState(id uint32) streamState {
-	ch := make(chan streamState, 1)
-	st.sc.testHookCh <- func(int) {
-		state, _ := st.sc.state(id)
-		ch <- state
-	}
-	return <-ch
-}
-
-// loopNum reports how many times this conn's select loop has gone around.
-func (st *serverTester) loopNum() int {
-	lastc := make(chan int, 1)
-	st.sc.testHookCh <- func(loopNum int) {
-		lastc <- loopNum
-	}
-	return <-lastc
-}
-
-// awaitIdle heuristically awaits for the server conn's select loop to be idle.
-// The heuristic is that the server connection's serve loop must schedule
-// 50 times in a row without any channel sends or receives occurring.
-func (st *serverTester) awaitIdle() {
-	remain := 50
-	last := st.loopNum()
-	for remain > 0 {
-		n := st.loopNum()
-		if n == last+1 {
-			remain--
-		} else {
-			remain = 50
-		}
-		last = n
-	}
-}
-
-func (st *serverTester) Close() {
-	if st.t.Failed() {
-		st.frameReadLogMu.Lock()
-		if st.frameReadLogBuf.Len() > 0 {
-			st.t.Logf("Framer read log:\n%s", st.frameReadLogBuf.String())
-		}
-		st.frameReadLogMu.Unlock()
-
-		st.frameWriteLogMu.Lock()
-		if st.frameWriteLogBuf.Len() > 0 {
-			st.t.Logf("Framer write log:\n%s", st.frameWriteLogBuf.String())
-		}
-		st.frameWriteLogMu.Unlock()
-
-		// If we failed already (and are likely in a Fatal,
-		// unwindowing), force close the connection, so the
-		// httptest.Server doesn't wait forever for the conn
-		// to close.
-		if st.cc != nil {
-			st.cc.Close()
-		}
-	}
-	st.ts.Close()
-	if st.cc != nil {
-		st.cc.Close()
-	}
-	log.SetOutput(os.Stderr)
-}
-
-// greet initiates the client's HTTP/2 connection into a state where
-// frames may be sent.
-func (st *serverTester) greet() {
-	st.greetAndCheckSettings(func(Setting) error { return nil })
-}
-
-func (st *serverTester) greetAndCheckSettings(checkSetting func(s Setting) error) {
-	st.writePreface()
-	st.writeInitialSettings()
-	st.wantSettings().ForeachSetting(checkSetting)
-	st.writeSettingsAck()
-
-	// The initial WINDOW_UPDATE and SETTINGS ACK can come in any order.
-	var gotSettingsAck bool
-	var gotWindowUpdate bool
-
-	for i := 0; i < 2; i++ {
-		f, err := st.readFrame()
-		if err != nil {
-			st.t.Fatal(err)
-		}
-		switch f := f.(type) {
-		case *SettingsFrame:
-			if !f.Header().Flags.Has(FlagSettingsAck) {
-				st.t.Fatal("Settings Frame didn't have ACK set")
-			}
-			gotSettingsAck = true
-
-		case *WindowUpdateFrame:
-			if f.FrameHeader.StreamID != 0 {
-				st.t.Fatalf("WindowUpdate StreamID = %d; want 0", f.FrameHeader.StreamID, 0)
-			}
-			incr := uint32((&Server{}).initialConnRecvWindowSize() - initialWindowSize)
-			if f.Increment != incr {
-				st.t.Fatalf("WindowUpdate increment = %d; want %d", f.Increment, incr)
-			}
-			gotWindowUpdate = true
-
-		default:
-			st.t.Fatalf("Wanting a settings ACK or window update, received a %T", f)
-		}
-	}
-
-	if !gotSettingsAck {
-		st.t.Fatalf("Didn't get a settings ACK")
-	}
-	if !gotWindowUpdate {
-		st.t.Fatalf("Didn't get a window update")
-	}
-}
-
-func (st *serverTester) writePreface() {
-	n, err := st.cc.Write(clientPreface)
-	if err != nil {
-		st.t.Fatalf("Error writing client preface: %v", err)
-	}
-	if n != len(clientPreface) {
-		st.t.Fatalf("Writing client preface, wrote %d bytes; want %d", n, len(clientPreface))
-	}
-}
-
-func (st *serverTester) writeInitialSettings() {
-	if err := st.fr.WriteSettings(); err != nil {
-		st.t.Fatalf("Error writing initial SETTINGS frame from client to server: %v", err)
-	}
-}
-
-func (st *serverTester) writeSettingsAck() {
-	if err := st.fr.WriteSettingsAck(); err != nil {
-		st.t.Fatalf("Error writing ACK of server's SETTINGS: %v", err)
-	}
-}
-
-func (st *serverTester) writeHeaders(p HeadersFrameParam) {
-	if err := st.fr.WriteHeaders(p); err != nil {
-		st.t.Fatalf("Error writing HEADERS: %v", err)
-	}
-}
-
-func (st *serverTester) writePriority(id uint32, p PriorityParam) {
-	if err := st.fr.WritePriority(id, p); err != nil {
-		st.t.Fatalf("Error writing PRIORITY: %v", err)
-	}
-}
-
-func (st *serverTester) encodeHeaderField(k, v string) {
-	err := st.hpackEnc.WriteField(hpack.HeaderField{Name: k, Value: v})
-	if err != nil {
-		st.t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-	}
-}
-
-// encodeHeaderRaw is the magic-free version of encodeHeader.
-// It takes 0 or more (k, v) pairs and encodes them.
-func (st *serverTester) encodeHeaderRaw(headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-	st.headerBuf.Reset()
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		st.encodeHeaderField(k, v)
-		headers = headers[2:]
-	}
-	return st.headerBuf.Bytes()
-}
-
-// encodeHeader encodes headers and returns their HPACK bytes. headers
-// must contain an even number of key/value pairs. There may be
-// multiple pairs for keys (e.g. "cookie").  The :method, :path, and
-// :scheme headers default to GET, / and https. The :authority header
-// defaults to st.ts.Listener.Addr().
-func (st *serverTester) encodeHeader(headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-
-	st.headerBuf.Reset()
-	defaultAuthority := st.ts.Listener.Addr().String()
-
-	if len(headers) == 0 {
-		// Fast path, mostly for benchmarks, so test code doesn't pollute
-		// profiles when we're looking to improve server allocations.
-		st.encodeHeaderField(":method", "GET")
-		st.encodeHeaderField(":scheme", "https")
-		st.encodeHeaderField(":authority", defaultAuthority)
-		st.encodeHeaderField(":path", "/")
-		return st.headerBuf.Bytes()
-	}
-
-	if len(headers) == 2 && headers[0] == ":method" {
-		// Another fast path for benchmarks.
-		st.encodeHeaderField(":method", headers[1])
-		st.encodeHeaderField(":scheme", "https")
-		st.encodeHeaderField(":authority", defaultAuthority)
-		st.encodeHeaderField(":path", "/")
-		return st.headerBuf.Bytes()
-	}
-
-	pseudoCount := map[string]int{}
-	keys := []string{":method", ":scheme", ":authority", ":path"}
-	vals := map[string][]string{
-		":method":    {"GET"},
-		":scheme":    {"https"},
-		":authority": {defaultAuthority},
-		":path":      {"/"},
-	}
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		headers = headers[2:]
-		if _, ok := vals[k]; !ok {
-			keys = append(keys, k)
-		}
-		if strings.HasPrefix(k, ":") {
-			pseudoCount[k]++
-			if pseudoCount[k] == 1 {
-				vals[k] = []string{v}
-			} else {
-				// Allows testing of invalid headers w/ dup pseudo fields.
-				vals[k] = append(vals[k], v)
-			}
-		} else {
-			vals[k] = append(vals[k], v)
-		}
-	}
-	for _, k := range keys {
-		for _, v := range vals[k] {
-			st.encodeHeaderField(k, v)
-		}
-	}
-	return st.headerBuf.Bytes()
-}
-
-// bodylessReq1 writes a HEADERS frames with StreamID 1 and EndStream and EndHeaders set.
-func (st *serverTester) bodylessReq1(headers ...string) {
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(headers...),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-}
-
-func (st *serverTester) writeData(streamID uint32, endStream bool, data []byte) {
-	if err := st.fr.WriteData(streamID, endStream, data); err != nil {
-		st.t.Fatalf("Error writing DATA: %v", err)
-	}
-}
-
-func (st *serverTester) writeDataPadded(streamID uint32, endStream bool, data, pad []byte) {
-	if err := st.fr.WriteDataPadded(streamID, endStream, data, pad); err != nil {
-		st.t.Fatalf("Error writing DATA: %v", err)
-	}
-}
-
-func readFrameTimeout(fr *Framer, wait time.Duration) (Frame, error) {
-	ch := make(chan interface{}, 1)
-	go func() {
-		fr, err := fr.ReadFrame()
-		if err != nil {
-			ch <- err
-		} else {
-			ch <- fr
-		}
-	}()
-	t := time.NewTimer(wait)
-	select {
-	case v := <-ch:
-		t.Stop()
-		if fr, ok := v.(Frame); ok {
-			return fr, nil
-		}
-		return nil, v.(error)
-	case <-t.C:
-		return nil, errors.New("timeout waiting for frame")
-	}
-}
-
-func (st *serverTester) readFrame() (Frame, error) {
-	return readFrameTimeout(st.fr, 2*time.Second)
-}
-
-func (st *serverTester) wantHeaders() *HeadersFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a HEADERS frame: %v", err)
-	}
-	hf, ok := f.(*HeadersFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *HeadersFrame", f)
-	}
-	return hf
-}
-
-func (st *serverTester) wantContinuation() *ContinuationFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a CONTINUATION frame: %v", err)
-	}
-	cf, ok := f.(*ContinuationFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *ContinuationFrame", f)
-	}
-	return cf
-}
-
-func (st *serverTester) wantData() *DataFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a DATA frame: %v", err)
-	}
-	df, ok := f.(*DataFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *DataFrame", f)
-	}
-	return df
-}
-
-func (st *serverTester) wantSettings() *SettingsFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a SETTINGS frame: %v", err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *SettingsFrame", f)
-	}
-	return sf
-}
-
-func (st *serverTester) wantPing() *PingFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a PING frame: %v", err)
-	}
-	pf, ok := f.(*PingFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *PingFrame", f)
-	}
-	return pf
-}
-
-func (st *serverTester) wantGoAway() *GoAwayFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a GOAWAY frame: %v", err)
-	}
-	gf, ok := f.(*GoAwayFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *GoAwayFrame", f)
-	}
-	return gf
-}
-
-func (st *serverTester) wantRSTStream(streamID uint32, errCode ErrCode) {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting an RSTStream frame: %v", err)
-	}
-	rs, ok := f.(*RSTStreamFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *RSTStreamFrame", f)
-	}
-	if rs.FrameHeader.StreamID != streamID {
-		st.t.Fatalf("RSTStream StreamID = %d; want %d", rs.FrameHeader.StreamID, streamID)
-	}
-	if rs.ErrCode != errCode {
-		st.t.Fatalf("RSTStream ErrCode = %d (%s); want %d (%s)", rs.ErrCode, rs.ErrCode, errCode, errCode)
-	}
-}
-
-func (st *serverTester) wantWindowUpdate(streamID, incr uint32) {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatalf("Error while expecting a WINDOW_UPDATE frame: %v", err)
-	}
-	wu, ok := f.(*WindowUpdateFrame)
-	if !ok {
-		st.t.Fatalf("got a %T; want *WindowUpdateFrame", f)
-	}
-	if wu.FrameHeader.StreamID != streamID {
-		st.t.Fatalf("WindowUpdate StreamID = %d; want %d", wu.FrameHeader.StreamID, streamID)
-	}
-	if wu.Increment != incr {
-		st.t.Fatalf("WindowUpdate increment = %d; want %d", wu.Increment, incr)
-	}
-}
-
-func (st *serverTester) wantSettingsAck() {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatal(err)
-	}
-	sf, ok := f.(*SettingsFrame)
-	if !ok {
-		st.t.Fatalf("Wanting a settings ACK, received a %T", f)
-	}
-	if !sf.Header().Flags.Has(FlagSettingsAck) {
-		st.t.Fatal("Settings Frame didn't have ACK set")
-	}
-}
-
-func (st *serverTester) wantPushPromise() *PushPromiseFrame {
-	f, err := st.readFrame()
-	if err != nil {
-		st.t.Fatal(err)
-	}
-	ppf, ok := f.(*PushPromiseFrame)
-	if !ok {
-		st.t.Fatalf("Wanted PushPromise, received %T", ppf)
-	}
-	return ppf
-}
-
-func TestServer(t *testing.T) {
-	gotReq := make(chan bool, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Foo", "Bar")
-		gotReq <- true
-	})
-	defer st.Close()
-
-	covers("3.5", `
-		The server connection preface consists of a potentially empty
-		SETTINGS frame ([SETTINGS]) that MUST be the first frame the
-		server sends in the HTTP/2 connection.
-	`)
-
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(),
-		EndStream:     true, // no DATA frames
-		EndHeaders:    true,
-	})
-
-	select {
-	case <-gotReq:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for request")
-	}
-}
-
-func TestServer_Request_Get(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader("foo-bar", "some-value"),
-			EndStream:     true, // no DATA frames
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Method != "GET" {
-			t.Errorf("Method = %q; want GET", r.Method)
-		}
-		if r.URL.Path != "/" {
-			t.Errorf("URL.Path = %q; want /", r.URL.Path)
-		}
-		if r.ContentLength != 0 {
-			t.Errorf("ContentLength = %v; want 0", r.ContentLength)
-		}
-		if r.Close {
-			t.Error("Close = true; want false")
-		}
-		if !strings.Contains(r.RemoteAddr, ":") {
-			t.Errorf("RemoteAddr = %q; want something with a colon", r.RemoteAddr)
-		}
-		if r.Proto != "HTTP/2.0" || r.ProtoMajor != 2 || r.ProtoMinor != 0 {
-			t.Errorf("Proto = %q Major=%v,Minor=%v; want HTTP/2.0", r.Proto, r.ProtoMajor, r.ProtoMinor)
-		}
-		wantHeader := http.Header{
-			"Foo-Bar": []string{"some-value"},
-		}
-		if !reflect.DeepEqual(r.Header, wantHeader) {
-			t.Errorf("Header = %#v; want %#v", r.Header, wantHeader)
-		}
-		if n, err := r.Body.Read([]byte(" ")); err != io.EOF || n != 0 {
-			t.Errorf("Read = %d, %v; want 0, EOF", n, err)
-		}
-	})
-}
-
-func TestServer_Request_Get_PathSlashes(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":path", "/%2f/"),
-			EndStream:     true, // no DATA frames
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.RequestURI != "/%2f/" {
-			t.Errorf("RequestURI = %q; want /%%2f/", r.RequestURI)
-		}
-		if r.URL.Path != "///" {
-			t.Errorf("URL.Path = %q; want ///", r.URL.Path)
-		}
-	})
-}
-
-// TODO: add a test with EndStream=true on the HEADERS but setting a
-// Content-Length anyway. Should we just omit it and force it to
-// zero?
-
-func TestServer_Request_Post_NoContentLength_EndStream(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != 0 {
-			t.Errorf("ContentLength = %v; want 0", r.ContentLength)
-		}
-		if n, err := r.Body.Read([]byte(" ")); err != io.EOF || n != 0 {
-			t.Errorf("Read = %d, %v; want 0, EOF", n, err)
-		}
-	})
-}
-
-func TestServer_Request_Post_Body_ImmediateEOF(t *testing.T) {
-	testBodyContents(t, -1, "", func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, true, nil) // just kidding. empty body.
-	})
-}
-
-func TestServer_Request_Post_Body_OneData(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, -1, content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, true, []byte(content))
-	})
-}
-
-func TestServer_Request_Post_Body_TwoData(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, -1, content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false, // to say DATA frames are coming
-			EndHeaders:    true,
-		})
-		st.writeData(1, false, []byte(content[:5]))
-		st.writeData(1, true, []byte(content[5:]))
-	})
-}
-
-func TestServer_Request_Post_Body_ContentLength_Correct(t *testing.T) {
-	const content = "Some content"
-	testBodyContents(t, int64(len(content)), content, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(
-				":method", "POST",
-				"content-length", strconv.Itoa(len(content)),
-			),
-			EndStream:  false, // to say DATA frames are coming
-			EndHeaders: true,
-		})
-		st.writeData(1, true, []byte(content))
-	})
-}
-
-func TestServer_Request_Post_Body_ContentLength_TooLarge(t *testing.T) {
-	testBodyContentsFail(t, 3, "request declared a Content-Length of 3 but only wrote 2 bytes",
-		func(st *serverTester) {
-			st.writeHeaders(HeadersFrameParam{
-				StreamID: 1, // clients send odd numbers
-				BlockFragment: st.encodeHeader(
-					":method", "POST",
-					"content-length", "3",
-				),
-				EndStream:  false, // to say DATA frames are coming
-				EndHeaders: true,
-			})
-			st.writeData(1, true, []byte("12"))
-		})
-}
-
-func TestServer_Request_Post_Body_ContentLength_TooSmall(t *testing.T) {
-	testBodyContentsFail(t, 4, "sender tried to send more than declared Content-Length of 4 bytes",
-		func(st *serverTester) {
-			st.writeHeaders(HeadersFrameParam{
-				StreamID: 1, // clients send odd numbers
-				BlockFragment: st.encodeHeader(
-					":method", "POST",
-					"content-length", "4",
-				),
-				EndStream:  false, // to say DATA frames are coming
-				EndHeaders: true,
-			})
-			st.writeData(1, true, []byte("12345"))
-		})
-}
-
-func testBodyContents(t *testing.T, wantContentLength int64, wantBody string, write func(st *serverTester)) {
-	testServerRequest(t, write, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != wantContentLength {
-			t.Errorf("ContentLength = %v; want %d", r.ContentLength, wantContentLength)
-		}
-		all, err := ioutil.ReadAll(r.Body)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(all) != wantBody {
-			t.Errorf("Read = %q; want %q", all, wantBody)
-		}
-		if err := r.Body.Close(); err != nil {
-			t.Fatalf("Close: %v", err)
-		}
-	})
-}
-
-func testBodyContentsFail(t *testing.T, wantContentLength int64, wantReadError string, write func(st *serverTester)) {
-	testServerRequest(t, write, func(r *http.Request) {
-		if r.Method != "POST" {
-			t.Errorf("Method = %q; want POST", r.Method)
-		}
-		if r.ContentLength != wantContentLength {
-			t.Errorf("ContentLength = %v; want %d", r.ContentLength, wantContentLength)
-		}
-		all, err := ioutil.ReadAll(r.Body)
-		if err == nil {
-			t.Fatalf("expected an error (%q) reading from the body. Successfully read %q instead.",
-				wantReadError, all)
-		}
-		if !strings.Contains(err.Error(), wantReadError) {
-			t.Fatalf("Body.Read = %v; want substring %q", err, wantReadError)
-		}
-		if err := r.Body.Close(); err != nil {
-			t.Fatalf("Close: %v", err)
-		}
-	})
-}
-
-// Using a Host header, instead of :authority
-func TestServer_Request_Get_Host(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":authority", "", "host", host),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Host != host {
-			t.Errorf("Host = %q; want %q", r.Host, host)
-		}
-	})
-}
-
-// Using an :authority pseudo-header, instead of Host
-func TestServer_Request_Get_Authority(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":authority", host),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}, func(r *http.Request) {
-		if r.Host != host {
-			t.Errorf("Host = %q; want %q", r.Host, host)
-		}
-	})
-}
-
-func TestServer_Request_WithContinuation(t *testing.T) {
-	wantHeader := http.Header{
-		"Foo-One":   []string{"value-one"},
-		"Foo-Two":   []string{"value-two"},
-		"Foo-Three": []string{"value-three"},
-	}
-	testServerRequest(t, func(st *serverTester) {
-		fullHeaders := st.encodeHeader(
-			"foo-one", "value-one",
-			"foo-two", "value-two",
-			"foo-three", "value-three",
-		)
-		remain := fullHeaders
-		chunks := 0
-		for len(remain) > 0 {
-			const maxChunkSize = 5
-			chunk := remain
-			if len(chunk) > maxChunkSize {
-				chunk = chunk[:maxChunkSize]
-			}
-			remain = remain[len(chunk):]
-
-			if chunks == 0 {
-				st.writeHeaders(HeadersFrameParam{
-					StreamID:      1, // clients send odd numbers
-					BlockFragment: chunk,
-					EndStream:     true,  // no DATA frames
-					EndHeaders:    false, // we'll have continuation frames
-				})
-			} else {
-				err := st.fr.WriteContinuation(1, len(remain) == 0, chunk)
-				if err != nil {
-					t.Fatal(err)
-				}
-			}
-			chunks++
-		}
-		if chunks < 2 {
-			t.Fatal("too few chunks")
-		}
-	}, func(r *http.Request) {
-		if !reflect.DeepEqual(r.Header, wantHeader) {
-			t.Errorf("Header = %#v; want %#v", r.Header, wantHeader)
-		}
-	})
-}
-
-// Concatenated cookie headers. ("8.1.2.5 Compressing the Cookie Header Field")
-func TestServer_Request_CookieConcat(t *testing.T) {
-	const host = "example.com"
-	testServerRequest(t, func(st *serverTester) {
-		st.bodylessReq1(
-			":authority", host,
-			"cookie", "a=b",
-			"cookie", "c=d",
-			"cookie", "e=f",
-		)
-	}, func(r *http.Request) {
-		const want = "a=b; c=d; e=f"
-		if got := r.Header.Get("Cookie"); got != want {
-			t.Errorf("Cookie = %q; want %q", got, want)
-		}
-	})
-}
-
-func TestServer_Request_Reject_CapitalHeader(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("UPPER", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameColon(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("has:colon", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameNULL(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("has\x00null", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldNameEmpty(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("", "v") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueNewline(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\nnewline") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueCR(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\rcarriage") })
-}
-
-func TestServer_Request_Reject_HeaderFieldValueDEL(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1("foo", "has\x7fdel") })
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_method(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":method", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_ExactlyOne(t *testing.T) {
-	// 8.1.2.3 Request Pseudo-Header Fields
-	// "All HTTP/2 requests MUST include exactly one valid value" ...
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter("duplicate pseudo-header")
-		st.bodylessReq1(":method", "GET", ":method", "POST")
-	})
-}
-
-func TestServer_Request_Reject_Pseudo_AfterRegular(t *testing.T) {
-	// 8.1.2.3 Request Pseudo-Header Fields
-	// "All pseudo-header fields MUST appear in the header block
-	// before regular header fields. Any request or response that
-	// contains a pseudo-header field that appears in a header
-	// block after a regular header field MUST be treated as
-	// malformed (Section 8.1.2.6)."
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter("pseudo-header after regular header")
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":method", Value: "GET"})
-		enc.WriteField(hpack.HeaderField{Name: "regular", Value: "foobar"})
-		enc.WriteField(hpack.HeaderField{Name: ":path", Value: "/"})
-		enc.WriteField(hpack.HeaderField{Name: ":scheme", Value: "https"})
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: buf.Bytes(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_path(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":path", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_Missing_scheme(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":scheme", "") })
-}
-
-func TestServer_Request_Reject_Pseudo_scheme_invalid(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) { st.bodylessReq1(":scheme", "bogus") })
-}
-
-func TestServer_Request_Reject_Pseudo_Unknown(t *testing.T) {
-	testRejectRequest(t, func(st *serverTester) {
-		st.addLogFilter(`invalid pseudo-header ":unknown_thing"`)
-		st.bodylessReq1(":unknown_thing", "")
-	})
-}
-
-func testRejectRequest(t *testing.T, send func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server request made it to handler; should've been rejected")
-	})
-	defer st.Close()
-
-	st.greet()
-	send(st)
-	st.wantRSTStream(1, ErrCodeProtocol)
-}
-
-func testRejectRequestWithProtocolError(t *testing.T, send func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("server request made it to handler; should've been rejected")
-	}, optQuiet)
-	defer st.Close()
-
-	st.greet()
-	send(st)
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeProtocol {
-		t.Errorf("err code = %v; want %v", gf.ErrCode, ErrCodeProtocol)
-	}
-}
-
-// Section 5.1, on idle connections: "Receiving any frame other than
-// HEADERS or PRIORITY on a stream in this state MUST be treated as a
-// connection error (Section 5.4.1) of type PROTOCOL_ERROR."
-func TestRejectFrameOnIdle_WindowUpdate(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteWindowUpdate(123, 456)
-	})
-}
-func TestRejectFrameOnIdle_Data(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteData(123, true, nil)
-	})
-}
-func TestRejectFrameOnIdle_RSTStream(t *testing.T) {
-	testRejectRequestWithProtocolError(t, func(st *serverTester) {
-		st.fr.WriteRSTStream(123, ErrCodeCancel)
-	})
-}
-
-func TestServer_Request_Connect(t *testing.T) {
-	testServerRequest(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	}, func(r *http.Request) {
-		if g, w := r.Method, "CONNECT"; g != w {
-			t.Errorf("Method = %q; want %q", g, w)
-		}
-		if g, w := r.RequestURI, "example.com:123"; g != w {
-			t.Errorf("RequestURI = %q; want %q", g, w)
-		}
-		if g, w := r.URL.Host, "example.com:123"; g != w {
-			t.Errorf("URL.Host = %q; want %q", g, w)
-		}
-	})
-}
-
-func TestServer_Request_Connect_InvalidPath(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-				":path", "/bogus",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	})
-}
-
-func TestServer_Request_Connect_InvalidScheme(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1,
-			BlockFragment: st.encodeHeaderRaw(
-				":method", "CONNECT",
-				":authority", "example.com:123",
-				":scheme", "https",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	})
-}
-
-func TestServer_Ping(t *testing.T) {
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-
-	// Server should ignore this one, since it has ACK set.
-	ackPingData := [8]byte{1, 2, 4, 8, 16, 32, 64, 128}
-	if err := st.fr.WritePing(true, ackPingData); err != nil {
-		t.Fatal(err)
-	}
-
-	// But the server should reply to this one, since ACK is false.
-	pingData := [8]byte{1, 2, 3, 4, 5, 6, 7, 8}
-	if err := st.fr.WritePing(false, pingData); err != nil {
-		t.Fatal(err)
-	}
-
-	pf := st.wantPing()
-	if !pf.Flags.Has(FlagPingAck) {
-		t.Error("response ping doesn't have ACK set")
-	}
-	if pf.Data != pingData {
-		t.Errorf("response ping has data %q; want %q", pf.Data, pingData)
-	}
-}
-
-func TestServer_RejectsLargeFrames(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("see golang.org/issue/13434")
-	}
-
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-
-	// Write too large of a frame (too large by one byte)
-	// We ignore the return value because it's expected that the server
-	// will only read the first 9 bytes (the headre) and then disconnect.
-	st.fr.WriteRawFrame(0xff, 0, 0, make([]byte, defaultMaxReadFrameSize+1))
-
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeFrameSize {
-		t.Errorf("GOAWAY err = %v; want %v", gf.ErrCode, ErrCodeFrameSize)
-	}
-	if st.serverLogBuf.Len() != 0 {
-		// Previously we spun here for a bit until the GOAWAY disconnect
-		// timer fired, logging while we fired.
-		t.Errorf("unexpected server output: %.500s\n", st.serverLogBuf.Bytes())
-	}
-}
-
-func TestServer_Handler_Sends_WindowUpdate(t *testing.T) {
-	puppet := newHandlerPuppet()
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		puppet.act(w, r)
-	})
-	defer st.Close()
-	defer puppet.done()
-
-	st.greet()
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // data coming
-		EndHeaders:    true,
-	})
-	st.writeData(1, false, []byte("abcdef"))
-	puppet.do(readBodyHandler(t, "abc"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	puppet.do(readBodyHandler(t, "def"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	st.writeData(1, true, []byte("ghijkl")) // END_STREAM here
-	puppet.do(readBodyHandler(t, "ghi"))
-	puppet.do(readBodyHandler(t, "jkl"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(0, 3) // no more stream-level, since END_STREAM
-}
-
-// the version of the TestServer_Handler_Sends_WindowUpdate with padding.
-// See golang.org/issue/16556
-func TestServer_Handler_Sends_WindowUpdate_Padding(t *testing.T) {
-	puppet := newHandlerPuppet()
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		puppet.act(w, r)
-	})
-	defer st.Close()
-	defer puppet.done()
-
-	st.greet()
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-	st.writeDataPadded(1, false, []byte("abcdef"), []byte{0, 0, 0, 0})
-
-	// Expect to immediately get our 5 bytes of padding back for
-	// both the connection and stream (4 bytes of padding + 1 byte of length)
-	st.wantWindowUpdate(0, 5)
-	st.wantWindowUpdate(1, 5)
-
-	puppet.do(readBodyHandler(t, "abc"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-
-	puppet.do(readBodyHandler(t, "def"))
-	st.wantWindowUpdate(0, 3)
-	st.wantWindowUpdate(1, 3)
-}
-
-func TestServer_Send_GoAway_After_Bogus_WindowUpdate(t *testing.T) {
-	st := newServerTester(t, nil)
-	defer st.Close()
-	st.greet()
-	if err := st.fr.WriteWindowUpdate(0, 1<<31-1); err != nil {
-		t.Fatal(err)
-	}
-	gf := st.wantGoAway()
-	if gf.ErrCode != ErrCodeFlowControl {
-		t.Errorf("GOAWAY err = %v; want %v", gf.ErrCode, ErrCodeFlowControl)
-	}
-	if gf.LastStreamID != 0 {
-		t.Errorf("GOAWAY last stream ID = %v; want %v", gf.LastStreamID, 0)
-	}
-}
-
-func TestServer_Send_RstStream_After_Bogus_WindowUpdate(t *testing.T) {
-	inHandler := make(chan bool)
-	blockHandler := make(chan bool)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		<-blockHandler
-	})
-	defer st.Close()
-	defer close(blockHandler)
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	// Send a bogus window update:
-	if err := st.fr.WriteWindowUpdate(1, 1<<31-1); err != nil {
-		t.Fatal(err)
-	}
-	st.wantRSTStream(1, ErrCodeFlowControl)
-}
-
-// testServerPostUnblock sends a hanging POST with unsent data to handler,
-// then runs fn once in the handler, and verifies that the error returned from
-// handler is acceptable. It fails if takes over 5 seconds for handler to exit.
-func testServerPostUnblock(t *testing.T,
-	handler func(http.ResponseWriter, *http.Request) error,
-	fn func(*serverTester),
-	checkErr func(error),
-	otherHeaders ...string) {
-	inHandler := make(chan bool)
-	errc := make(chan error, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(append([]string{":method", "POST"}, otherHeaders...)...),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	fn(st)
-	select {
-	case err := <-errc:
-		if checkErr != nil {
-			checkErr(err)
-		}
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for Handler to return")
-	}
-}
-
-func TestServer_RSTStream_Unblocks_Read(t *testing.T) {
-	testServerPostUnblock(t,
-		func(w http.ResponseWriter, r *http.Request) (err error) {
-			_, err = r.Body.Read(make([]byte, 1))
-			return
-		},
-		func(st *serverTester) {
-			if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-				t.Fatal(err)
-			}
-		},
-		func(err error) {
-			want := StreamError{StreamID: 0x1, Code: 0x8}
-			if !reflect.DeepEqual(err, want) {
-				t.Errorf("Read error = %v; want %v", err, want)
-			}
-		},
-	)
-}
-
-func TestServer_RSTStream_Unblocks_Header_Write(t *testing.T) {
-	// Run this test a bunch, because it doesn't always
-	// deadlock. But with a bunch, it did.
-	n := 50
-	if testing.Short() {
-		n = 5
-	}
-	for i := 0; i < n; i++ {
-		testServer_RSTStream_Unblocks_Header_Write(t)
-	}
-}
-
-func testServer_RSTStream_Unblocks_Header_Write(t *testing.T) {
-	inHandler := make(chan bool, 1)
-	unblockHandler := make(chan bool, 1)
-	headerWritten := make(chan bool, 1)
-	wroteRST := make(chan bool, 1)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		<-wroteRST
-		w.Header().Set("foo", "bar")
-		w.WriteHeader(200)
-		w.(http.Flusher).Flush()
-		headerWritten <- true
-		<-unblockHandler
-	})
-	defer st.Close()
-
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-		t.Fatal(err)
-	}
-	wroteRST <- true
-	st.awaitIdle()
-	select {
-	case <-headerWritten:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for header write")
-	}
-	unblockHandler <- true
-}
-
-func TestServer_DeadConn_Unblocks_Read(t *testing.T) {
-	testServerPostUnblock(t,
-		func(w http.ResponseWriter, r *http.Request) (err error) {
-			_, err = r.Body.Read(make([]byte, 1))
-			return
-		},
-		func(st *serverTester) { st.cc.Close() },
-		func(err error) {
-			if err == nil {
-				t.Error("unexpected nil error from Request.Body.Read")
-			}
-		},
-	)
-}
-
-var blockUntilClosed = func(w http.ResponseWriter, r *http.Request) error {
-	<-w.(http.CloseNotifier).CloseNotify()
-	return nil
-}
-
-func TestServer_CloseNotify_After_RSTStream(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) {
-		if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-			t.Fatal(err)
-		}
-	}, nil)
-}
-
-func TestServer_CloseNotify_After_ConnClose(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) { st.cc.Close() }, nil)
-}
-
-// that CloseNotify unblocks after a stream error due to the client's
-// problem that's unrelated to them explicitly canceling it (which is
-// TestServer_CloseNotify_After_RSTStream above)
-func TestServer_CloseNotify_After_StreamError(t *testing.T) {
-	testServerPostUnblock(t, blockUntilClosed, func(st *serverTester) {
-		// data longer than declared Content-Length => stream error
-		st.writeData(1, true, []byte("1234"))
-	}, nil, "content-length", "3")
-}
-
-func TestServer_StateTransitions(t *testing.T) {
-	var st *serverTester
-	inHandler := make(chan bool)
-	writeData := make(chan bool)
-	leaveHandler := make(chan bool)
-	st = newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		inHandler <- true
-		if st.stream(1) == nil {
-			t.Errorf("nil stream 1 in handler")
-		}
-		if got, want := st.streamState(1), stateOpen; got != want {
-			t.Errorf("in handler, state is %v; want %v", got, want)
-		}
-		writeData <- true
-		if n, err := r.Body.Read(make([]byte, 1)); n != 0 || err != io.EOF {
-			t.Errorf("body read = %d, %v; want 0, EOF", n, err)
-		}
-		if got, want := st.streamState(1), stateHalfClosedRemote; got != want {
-			t.Errorf("in handler, state is %v; want %v", got, want)
-		}
-
-		<-leaveHandler
-	})
-	st.greet()
-	if st.stream(1) != nil {
-		t.Fatal("stream 1 should be empty")
-	}
-	if got := st.streamState(1); got != stateIdle {
-		t.Fatalf("stream 1 should be idle; got %v", got)
-	}
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false, // keep it open
-		EndHeaders:    true,
-	})
-	<-inHandler
-	<-writeData
-	st.writeData(1, true, nil)
-
-	leaveHandler <- true
-	hf := st.wantHeaders()
-	if !hf.StreamEnded() {
-		t.Fatal("expected END_STREAM flag")
-	}
-
-	if got, want := st.streamState(1), stateClosed; got != want {
-		t.Errorf("at end, state is %v; want %v", got, want)
-	}
-	if st.stream(1) != nil {
-		t.Fatal("at end, stream 1 should be gone")
-	}
-}
-
-// test HEADERS w/o EndHeaders + another HEADERS (should get rejected)
-func TestServer_Rejects_HeadersNoEnd_Then_Headers(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		st.writeHeaders(HeadersFrameParam{ // Not a continuation.
-			StreamID:      3, // different stream.
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-// test HEADERS w/o EndHeaders + PING (should get rejected)
-func TestServer_Rejects_HeadersNoEnd_Then_Ping(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		if err := st.fr.WritePing(false, [8]byte{}); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// test HEADERS w/ EndHeaders + a continuation HEADERS (should get rejected)
-func TestServer_Rejects_HeadersEnd_Then_Continuation(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		if err := st.fr.WriteContinuation(1, true, encodeHeaderNoImplicit(t, "foo", "bar")); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// test HEADERS w/o EndHeaders + a continuation HEADERS on wrong stream ID
-func TestServer_Rejects_HeadersNoEnd_Then_ContinuationWrongStream(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    false,
-		})
-		if err := st.fr.WriteContinuation(3, true, encodeHeaderNoImplicit(t, "foo", "bar")); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// No HEADERS on stream 0.
-func TestServer_Rejects_Headers0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      0,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	})
-}
-
-// No CONTINUATION on stream 0.
-func TestServer_Rejects_Continuation0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		if err := st.fr.WriteContinuation(0, true, st.encodeHeader()); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// No PRIORITY on stream 0.
-func TestServer_Rejects_Priority0(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writePriority(0, PriorityParam{StreamDep: 1})
-	})
-}
-
-// No HEADERS frame with a self-dependence.
-func TestServer_Rejects_HeadersSelfDependence(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-			Priority:      PriorityParam{StreamDep: 1},
-		})
-	})
-}
-
-// No PRIORTY frame with a self-dependence.
-func TestServer_Rejects_PrioritySelfDependence(t *testing.T) {
-	testServerRejectsStream(t, ErrCodeProtocol, func(st *serverTester) {
-		st.fr.AllowIllegalWrites = true
-		st.writePriority(1, PriorityParam{StreamDep: 1})
-	})
-}
-
-func TestServer_Rejects_PushPromise(t *testing.T) {
-	testServerRejectsConn(t, func(st *serverTester) {
-		pp := PushPromiseParam{
-			StreamID:  1,
-			PromiseID: 3,
-		}
-		if err := st.fr.WritePushPromise(pp); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-// testServerRejectsConn tests that the server hangs up with a GOAWAY
-// frame and a server close after the client does something
-// deserving a CONNECTION_ERROR.
-func testServerRejectsConn(t *testing.T, writeReq func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	st.addLogFilter("connection error: PROTOCOL_ERROR")
-	defer st.Close()
-	st.greet()
-	writeReq(st)
-
-	st.wantGoAway()
-	errc := make(chan error, 1)
-	go func() {
-		fr, err := st.fr.ReadFrame()
-		if err == nil {
-			err = fmt.Errorf("got frame of type %T", fr)
-		}
-		errc <- err
-	}()
-	select {
-	case err := <-errc:
-		if err != io.EOF {
-			t.Errorf("ReadFrame = %v; want io.EOF", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for disconnect")
-	}
-}
-
-// testServerRejectsStream tests that the server sends a RST_STREAM with the provided
-// error code after a client sends a bogus request.
-func testServerRejectsStream(t *testing.T, code ErrCode, writeReq func(*serverTester)) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	defer st.Close()
-	st.greet()
-	writeReq(st)
-	st.wantRSTStream(1, code)
-}
-
-// testServerRequest sets up an idle HTTP/2 connection and lets you
-// write a single request with writeReq, and then verify that the
-// *http.Request is built correctly in checkReq.
-func testServerRequest(t *testing.T, writeReq func(*serverTester), checkReq func(*http.Request)) {
-	gotReq := make(chan bool, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.Body == nil {
-			t.Fatal("nil Body")
-		}
-		checkReq(r)
-		gotReq <- true
-	})
-	defer st.Close()
-
-	st.greet()
-	writeReq(st)
-
-	select {
-	case <-gotReq:
-	case <-time.After(2 * time.Second):
-		t.Error("timeout waiting for request")
-	}
-}
-
-func getSlash(st *serverTester) { st.bodylessReq1() }
-
-func TestServer_Response_NoData(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		// Nothing.
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Fatal("want END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-	})
-}
-
-func TestServer_Response_NoData_Header_FooBar(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Foo-Bar", "some-value")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Fatal("want END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo-bar", "some-value"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", "0"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-func TestServer_Response_Data_Sniff_DoesntOverride(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Content-Type", "foo/bar")
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("don't want END_STREAM, expecting data")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "foo/bar"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		df := st.wantData()
-		if !df.StreamEnded() {
-			t.Error("expected DATA to have END_STREAM flag")
-		}
-		if got := string(df.Data()); got != msg {
-			t.Errorf("got DATA %q; want %q", got, msg)
-		}
-	})
-}
-
-func TestServer_Response_TransferEncoding_chunked(t *testing.T) {
-	const msg = "hi"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Transfer-Encoding", "chunked") // should be stripped
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-// Header accessed only after the initial write.
-func TestServer_Response_Data_IgnoreHeaderAfterWrite_After(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		w.Header().Set("foo", "should be ignored")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-// Header accessed before the initial write and later mutated.
-func TestServer_Response_Data_IgnoreHeaderAfterWrite_Overwrite(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("foo", "proper value")
-		io.WriteString(w, msg)
-		w.Header().Set("foo", "should be ignored")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo", "proper value"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-	})
-}
-
-func TestServer_Response_Data_SniffLenType(t *testing.T) {
-	const msg = "<html>this is HTML."
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("don't want END_STREAM, expecting data")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(msg))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		df := st.wantData()
-		if !df.StreamEnded() {
-			t.Error("expected DATA to have END_STREAM flag")
-		}
-		if got := string(df.Data()); got != msg {
-			t.Errorf("got DATA %q; want %q", got, msg)
-		}
-	})
-}
-
-func TestServer_Response_Header_Flush_MidWrite(t *testing.T) {
-	const msg = "<html>this is HTML"
-	const msg2 = ", and this is the next chunk"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-		io.WriteString(w, msg2)
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/html; charset=utf-8"}, // sniffed
-			// and no content-length
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		{
-			df := st.wantData()
-			if df.StreamEnded() {
-				t.Error("unexpected END_STREAM flag")
-			}
-			if got := string(df.Data()); got != msg {
-				t.Errorf("got DATA %q; want %q", got, msg)
-			}
-		}
-		{
-			df := st.wantData()
-			if !df.StreamEnded() {
-				t.Error("wanted END_STREAM flag on last data chunk")
-			}
-			if got := string(df.Data()); got != msg2 {
-				t.Errorf("got DATA %q; want %q", got, msg2)
-			}
-		}
-	})
-}
-
-func TestServer_Response_LargeWrite(t *testing.T) {
-	const size = 1 << 20
-	const maxFrameSize = 16 << 10
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		n, err := w.Write(bytes.Repeat([]byte("a"), size))
-		if err != nil {
-			return fmt.Errorf("Write error: %v", err)
-		}
-		if n != size {
-			return fmt.Errorf("wrong size %d from Write", n)
-		}
-		return nil
-	}, func(st *serverTester) {
-		if err := st.fr.WriteSettings(
-			Setting{SettingInitialWindowSize, 0},
-			Setting{SettingMaxFrameSize, maxFrameSize},
-		); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		// Give the handler quota to write:
-		if err := st.fr.WriteWindowUpdate(1, size); err != nil {
-			t.Fatal(err)
-		}
-		// Give the handler quota to write to connection-level
-		// window as well
-		if err := st.fr.WriteWindowUpdate(0, size); err != nil {
-			t.Fatal(err)
-		}
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"}, // sniffed
-			// and no content-length
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-		var bytes, frames int
-		for {
-			df := st.wantData()
-			bytes += len(df.Data())
-			frames++
-			for _, b := range df.Data() {
-				if b != 'a' {
-					t.Fatal("non-'a' byte seen in DATA")
-				}
-			}
-			if df.StreamEnded() {
-				break
-			}
-		}
-		if bytes != size {
-			t.Errorf("Got %d bytes; want %d", bytes, size)
-		}
-		if want := int(size / maxFrameSize); frames < want || frames > want*2 {
-			t.Errorf("Got %d frames; want %d", frames, size)
-		}
-	})
-}
-
-// Test that the handler can't write more than the client allows
-func TestServer_Response_LargeWrite_FlowControlled(t *testing.T) {
-	// Make these reads. Before each read, the client adds exactly enough
-	// flow-control to satisfy the read. Numbers chosen arbitrarily.
-	reads := []int{123, 1, 13, 127}
-	size := 0
-	for _, n := range reads {
-		size += n
-	}
-
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		n, err := w.Write(bytes.Repeat([]byte("a"), size))
-		if err != nil {
-			return fmt.Errorf("Write error: %v", err)
-		}
-		if n != size {
-			return fmt.Errorf("wrong size %d from Write", n)
-		}
-		return nil
-	}, func(st *serverTester) {
-		// Set the window size to something explicit for this test.
-		// It's also how much initial data we expect.
-		if err := st.fr.WriteSettings(Setting{SettingInitialWindowSize, uint32(reads[0])}); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		df := st.wantData()
-		if got := len(df.Data()); got != reads[0] {
-			t.Fatalf("Initial window size = %d but got DATA with %d bytes", reads[0], got)
-		}
-
-		for _, quota := range reads[1:] {
-			if err := st.fr.WriteWindowUpdate(1, uint32(quota)); err != nil {
-				t.Fatal(err)
-			}
-			df := st.wantData()
-			if int(quota) != len(df.Data()) {
-				t.Fatalf("read %d bytes after giving %d quota", len(df.Data()), quota)
-			}
-		}
-	})
-}
-
-// Test that the handler blocked in a Write is unblocked if the server sends a RST_STREAM.
-func TestServer_Response_RST_Unblocks_LargeWrite(t *testing.T) {
-	const size = 1 << 20
-	const maxFrameSize = 16 << 10
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		errc := make(chan error, 1)
-		go func() {
-			_, err := w.Write(bytes.Repeat([]byte("a"), size))
-			errc <- err
-		}()
-		select {
-		case err := <-errc:
-			if err == nil {
-				return errors.New("unexpected nil error from Write in handler")
-			}
-			return nil
-		case <-time.After(2 * time.Second):
-			return errors.New("timeout waiting for Write in handler")
-		}
-	}, func(st *serverTester) {
-		if err := st.fr.WriteSettings(
-			Setting{SettingInitialWindowSize, 0},
-			Setting{SettingMaxFrameSize, maxFrameSize},
-		); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		if err := st.fr.WriteRSTStream(1, ErrCodeCancel); err != nil {
-			t.Fatal(err)
-		}
-	})
-}
-
-func TestServer_Response_Empty_Data_Not_FlowControlled(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.(http.Flusher).Flush()
-		// Nothing; send empty DATA
-		return nil
-	}, func(st *serverTester) {
-		// Handler gets no data quota:
-		if err := st.fr.WriteSettings(Setting{SettingInitialWindowSize, 0}); err != nil {
-			t.Fatal(err)
-		}
-		st.wantSettingsAck()
-
-		getSlash(st) // make the single request
-
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-
-		df := st.wantData()
-		if got := len(df.Data()); got != 0 {
-			t.Fatalf("unexpected %d DATA bytes; want 0", got)
-		}
-		if !df.StreamEnded() {
-			t.Fatal("DATA didn't have END_STREAM")
-		}
-	})
-}
-
-func TestServer_Response_Automatic100Continue(t *testing.T) {
-	const msg = "foo"
-	const reply = "bar"
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		if v := r.Header.Get("Expect"); v != "" {
-			t.Errorf("Expect header = %q; want empty", v)
-		}
-		buf := make([]byte, len(msg))
-		// This read should trigger the 100-continue being sent.
-		if n, err := io.ReadFull(r.Body, buf); err != nil || n != len(msg) || string(buf) != msg {
-			return fmt.Errorf("ReadFull = %q, %v; want %q, nil", buf[:n], err, msg)
-		}
-		_, err := io.WriteString(w, reply)
-		return err
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader(":method", "POST", "expect", "100-continue"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "100"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Fatalf("Got headers %v; want %v", goth, wanth)
-		}
-
-		// Okay, they sent status 100, so we can send our
-		// gigantic and/or sensitive "foo" payload now.
-		st.writeData(1, true, []byte(msg))
-
-		st.wantWindowUpdate(0, uint32(len(msg)))
-
-		hf = st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("expected data to follow")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		goth = st.decodeHeader(hf.HeaderBlockFragment())
-		wanth = [][2]string{
-			{":status", "200"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", strconv.Itoa(len(reply))},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Got headers %v; want %v", goth, wanth)
-		}
-
-		df := st.wantData()
-		if string(df.Data()) != reply {
-			t.Errorf("Client read %q; want %q", df.Data(), reply)
-		}
-		if !df.StreamEnded() {
-			t.Errorf("expect data stream end")
-		}
-	})
-}
-
-func TestServer_HandlerWriteErrorOnDisconnect(t *testing.T) {
-	errc := make(chan error, 1)
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		p := []byte("some data.\n")
-		for {
-			_, err := w.Write(p)
-			if err != nil {
-				errc <- err
-				return nil
-			}
-		}
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("unexpected END_STREAM flag")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("want END_HEADERS flag")
-		}
-		// Close the connection and wait for the handler to (hopefully) notice.
-		st.cc.Close()
-		select {
-		case <-errc:
-		case <-time.After(5 * time.Second):
-			t.Error("timeout")
-		}
-	})
-}
-
-func TestServer_Rejects_Too_Many_Streams(t *testing.T) {
-	const testPath = "/some/path"
-
-	inHandler := make(chan uint32)
-	leaveHandler := make(chan bool)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		id := w.(*responseWriter).rws.stream.id
-		inHandler <- id
-		if id == 1+(defaultMaxStreams+1)*2 && r.URL.Path != testPath {
-			t.Errorf("decoded final path as %q; want %q", r.URL.Path, testPath)
-		}
-		<-leaveHandler
-	})
-	defer st.Close()
-	st.greet()
-	nextStreamID := uint32(1)
-	streamID := func() uint32 {
-		defer func() { nextStreamID += 2 }()
-		return nextStreamID
-	}
-	sendReq := func(id uint32, headers ...string) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(headers...),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-	}
-	for i := 0; i < defaultMaxStreams; i++ {
-		sendReq(streamID())
-		<-inHandler
-	}
-	defer func() {
-		for i := 0; i < defaultMaxStreams; i++ {
-			leaveHandler <- true
-		}
-	}()
-
-	// And this one should cross the limit:
-	// (It's also sent as a CONTINUATION, to verify we still track the decoder context,
-	// even if we're rejecting it)
-	rejectID := streamID()
-	headerBlock := st.encodeHeader(":path", testPath)
-	frag1, frag2 := headerBlock[:3], headerBlock[3:]
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      rejectID,
-		BlockFragment: frag1,
-		EndStream:     true,
-		EndHeaders:    false, // CONTINUATION coming
-	})
-	if err := st.fr.WriteContinuation(rejectID, true, frag2); err != nil {
-		t.Fatal(err)
-	}
-	st.wantRSTStream(rejectID, ErrCodeProtocol)
-
-	// But let a handler finish:
-	leaveHandler <- true
-	st.wantHeaders()
-
-	// And now another stream should be able to start:
-	goodID := streamID()
-	sendReq(goodID, ":path", testPath)
-	select {
-	case got := <-inHandler:
-		if got != goodID {
-			t.Errorf("Got stream %d; want %d", got, goodID)
-		}
-	case <-time.After(3 * time.Second):
-		t.Error("timeout waiting for handler")
-	}
-}
-
-// So many response headers that the server needs to use CONTINUATION frames:
-func TestServer_Response_ManyHeaders_With_Continuation(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		h := w.Header()
-		for i := 0; i < 5000; i++ {
-			h.Set(fmt.Sprintf("x-header-%d", i), fmt.Sprintf("x-value-%d", i))
-		}
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.HeadersEnded() {
-			t.Fatal("got unwanted END_HEADERS flag")
-		}
-		n := 0
-		for {
-			n++
-			cf := st.wantContinuation()
-			if cf.HeadersEnded() {
-				break
-			}
-		}
-		if n < 5 {
-			t.Errorf("Only got %d CONTINUATION frames; expected 5+ (currently 6)", n)
-		}
-	})
-}
-
-// This previously crashed (reported by Mathieu Lonjaret as observed
-// while using Camlistore) because we got a DATA frame from the client
-// after the handler exited and our logic at the time was wrong,
-// keeping a stream in the map in stateClosed, which tickled an
-// invariant check later when we tried to remove that stream (via
-// defer sc.closeAllStreamsOnConnClose) when the serverConn serve loop
-// ended.
-func TestServer_NoCrash_HandlerClose_Then_ClientClose(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		// nothing
-		return nil
-	}, func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     false, // DATA is coming
-			EndHeaders:    true,
-		})
-		hf := st.wantHeaders()
-		if !hf.HeadersEnded() || !hf.StreamEnded() {
-			t.Fatalf("want END_HEADERS+END_STREAM, got %v", hf)
-		}
-
-		// Sent when the a Handler closes while a client has
-		// indicated it's still sending DATA:
-		st.wantRSTStream(1, ErrCodeCancel)
-
-		// Now the handler has ended, so it's ended its
-		// stream, but the client hasn't closed its side
-		// (stateClosedLocal).  So send more data and verify
-		// it doesn't crash with an internal invariant panic, like
-		// it did before.
-		st.writeData(1, true, []byte("foo"))
-
-		// Get our flow control bytes back, since the handler didn't get them.
-		st.wantWindowUpdate(0, uint32(len("foo")))
-
-		// Sent after a peer sends data anyway (admittedly the
-		// previous RST_STREAM might've still been in-flight),
-		// but they'll get the more friendly 'cancel' code
-		// first.
-		st.wantRSTStream(1, ErrCodeStreamClosed)
-
-		// Set up a bunch of machinery to record the panic we saw
-		// previously.
-		var (
-			panMu    sync.Mutex
-			panicVal interface{}
-		)
-
-		testHookOnPanicMu.Lock()
-		testHookOnPanic = func(sc *serverConn, pv interface{}) bool {
-			panMu.Lock()
-			panicVal = pv
-			panMu.Unlock()
-			return true
-		}
-		testHookOnPanicMu.Unlock()
-
-		// Now force the serve loop to end, via closing the connection.
-		st.cc.Close()
-		select {
-		case <-st.sc.doneServing:
-			// Loop has exited.
-			panMu.Lock()
-			got := panicVal
-			panMu.Unlock()
-			if got != nil {
-				t.Errorf("Got panic: %v", got)
-			}
-		case <-time.After(5 * time.Second):
-			t.Error("timeout")
-		}
-	})
-}
-
-func TestServer_Rejects_TLS10(t *testing.T) { testRejectTLS(t, tls.VersionTLS10) }
-func TestServer_Rejects_TLS11(t *testing.T) { testRejectTLS(t, tls.VersionTLS11) }
-
-func testRejectTLS(t *testing.T, max uint16) {
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		c.MaxVersion = max
-	})
-	defer st.Close()
-	gf := st.wantGoAway()
-	if got, want := gf.ErrCode, ErrCodeInadequateSecurity; got != want {
-		t.Errorf("Got error code %v; want %v", got, want)
-	}
-}
-
-func TestServer_Rejects_TLSBadCipher(t *testing.T) {
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		// Only list bad ones:
-		c.CipherSuites = []uint16{
-			tls.TLS_RSA_WITH_RC4_128_SHA,
-			tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_RSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA,
-			tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA,
-			tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA,
-		}
-	})
-	defer st.Close()
-	gf := st.wantGoAway()
-	if got, want := gf.ErrCode, ErrCodeInadequateSecurity; got != want {
-		t.Errorf("Got error code %v; want %v", got, want)
-	}
-}
-
-func TestServer_Advertises_Common_Cipher(t *testing.T) {
-	const requiredSuite = tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256
-	st := newServerTester(t, nil, func(c *tls.Config) {
-		// Have the client only support the one required by the spec.
-		c.CipherSuites = []uint16{requiredSuite}
-	}, func(ts *httptest.Server) {
-		var srv *http.Server = ts.Config
-		// Have the server configured with no specific cipher suites.
-		// This tests that Go's defaults include the required one.
-		srv.TLSConfig = nil
-	})
-	defer st.Close()
-	st.greet()
-}
-
-func (st *serverTester) onHeaderField(f hpack.HeaderField) {
-	if f.Name == "date" {
-		return
-	}
-	st.decodedHeaders = append(st.decodedHeaders, [2]string{f.Name, f.Value})
-}
-
-func (st *serverTester) decodeHeader(headerBlock []byte) (pairs [][2]string) {
-	st.decodedHeaders = nil
-	if _, err := st.hpackDec.Write(headerBlock); err != nil {
-		st.t.Fatalf("hpack decoding error: %v", err)
-	}
-	if err := st.hpackDec.Close(); err != nil {
-		st.t.Fatalf("hpack decoding error: %v", err)
-	}
-	return st.decodedHeaders
-}
-
-// testServerResponse sets up an idle HTTP/2 connection. The client function should
-// write a single request that must be handled by the handler. This waits up to 5s
-// for client to return, then up to an additional 2s for the handler to return.
-func testServerResponse(t testing.TB,
-	handler func(http.ResponseWriter, *http.Request) error,
-	client func(*serverTester),
-) {
-	errc := make(chan error, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if r.Body == nil {
-			t.Fatal("nil Body")
-		}
-		errc <- handler(w, r)
-	})
-	defer st.Close()
-
-	donec := make(chan bool)
-	go func() {
-		defer close(donec)
-		st.greet()
-		client(st)
-	}()
-
-	select {
-	case <-donec:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout in client")
-	}
-
-	select {
-	case err := <-errc:
-		if err != nil {
-			t.Fatalf("Error in handler: %v", err)
-		}
-	case <-time.After(2 * time.Second):
-		t.Fatal("timeout in handler")
-	}
-}
-
-// readBodyHandler returns an http Handler func that reads len(want)
-// bytes from r.Body and fails t if the contents read were not
-// the value of want.
-func readBodyHandler(t *testing.T, want string) func(w http.ResponseWriter, r *http.Request) {
-	return func(w http.ResponseWriter, r *http.Request) {
-		buf := make([]byte, len(want))
-		_, err := io.ReadFull(r.Body, buf)
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if string(buf) != want {
-			t.Errorf("read %q; want %q", buf, want)
-		}
-	}
-}
-
-// TestServerWithCurl currently fails, hence the LenientCipherSuites test. See:
-//   https://github.com/tatsuhiro-t/nghttp2/issues/140 &
-//   http://sourceforge.net/p/curl/bugs/1472/
-func TestServerWithCurl(t *testing.T)                     { testServerWithCurl(t, false) }
-func TestServerWithCurl_LenientCipherSuites(t *testing.T) { testServerWithCurl(t, true) }
-
-func testServerWithCurl(t *testing.T, permitProhibitedCipherSuites bool) {
-	if runtime.GOOS != "linux" {
-		t.Skip("skipping Docker test when not on Linux; requires --net which won't work with boot2docker anyway")
-	}
-	if testing.Short() {
-		t.Skip("skipping curl test in short mode")
-	}
-	requireCurl(t)
-	var gotConn int32
-	testHookOnConn = func() { atomic.StoreInt32(&gotConn, 1) }
-
-	const msg = "Hello from curl!\n"
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Foo", "Bar")
-		w.Header().Set("Client-Proto", r.Proto)
-		io.WriteString(w, msg)
-	}))
-	ConfigureServer(ts.Config, &Server{
-		PermitProhibitedCipherSuites: permitProhibitedCipherSuites,
-	})
-	ts.TLS = ts.Config.TLSConfig // the httptest.Server has its own copy of this TLS config
-	ts.StartTLS()
-	defer ts.Close()
-
-	t.Logf("Running test server for curl to hit at: %s", ts.URL)
-	container := curl(t, "--silent", "--http2", "--insecure", "-v", ts.URL)
-	defer kill(container)
-	resc := make(chan interface{}, 1)
-	go func() {
-		res, err := dockerLogs(container)
-		if err != nil {
-			resc <- err
-		} else {
-			resc <- res
-		}
-	}()
-	select {
-	case res := <-resc:
-		if err, ok := res.(error); ok {
-			t.Fatal(err)
-		}
-		body := string(res.([]byte))
-		// Search for both "key: value" and "key:value", since curl changed their format
-		// Our Dockerfile contains the latest version (no space), but just in case people
-		// didn't rebuild, check both.
-		if !strings.Contains(body, "foo: Bar") && !strings.Contains(body, "foo:Bar") {
-			t.Errorf("didn't see foo: Bar header")
-			t.Logf("Got: %s", body)
-		}
-		if !strings.Contains(body, "client-proto: HTTP/2") && !strings.Contains(body, "client-proto:HTTP/2") {
-			t.Errorf("didn't see client-proto: HTTP/2 header")
-			t.Logf("Got: %s", res)
-		}
-		if !strings.Contains(string(res.([]byte)), msg) {
-			t.Errorf("didn't see %q content", msg)
-			t.Logf("Got: %s", res)
-		}
-	case <-time.After(3 * time.Second):
-		t.Errorf("timeout waiting for curl")
-	}
-
-	if atomic.LoadInt32(&gotConn) == 0 {
-		t.Error("never saw an http2 connection")
-	}
-}
-
-var doh2load = flag.Bool("h2load", false, "Run h2load test")
-
-func TestServerWithH2Load(t *testing.T) {
-	if !*doh2load {
-		t.Skip("Skipping without --h2load flag.")
-	}
-	if runtime.GOOS != "linux" {
-		t.Skip("skipping Docker test when not on Linux; requires --net which won't work with boot2docker anyway")
-	}
-	requireH2load(t)
-
-	msg := strings.Repeat("Hello, h2load!\n", 5000)
-	ts := httptest.NewUnstartedServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-		io.WriteString(w, msg)
-	}))
-	ts.StartTLS()
-	defer ts.Close()
-
-	cmd := exec.Command("docker", "run", "--net=host", "--entrypoint=/usr/local/bin/h2load", "gohttp2/curl",
-		"-n100000", "-c100", "-m100", ts.URL)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Issue 12843
-func TestServerDoS_MaxHeaderListSize(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {})
-	defer st.Close()
-
-	// shake hands
-	frameSize := defaultMaxReadFrameSize
-	var advHeaderListSize *uint32
-	st.greetAndCheckSettings(func(s Setting) error {
-		switch s.ID {
-		case SettingMaxFrameSize:
-			if s.Val < minMaxFrameSize {
-				frameSize = minMaxFrameSize
-			} else if s.Val > maxFrameSize {
-				frameSize = maxFrameSize
-			} else {
-				frameSize = int(s.Val)
-			}
-		case SettingMaxHeaderListSize:
-			advHeaderListSize = &s.Val
-		}
-		return nil
-	})
-
-	if advHeaderListSize == nil {
-		t.Errorf("server didn't advertise a max header list size")
-	} else if *advHeaderListSize == 0 {
-		t.Errorf("server advertised a max header list size of 0")
-	}
-
-	st.encodeHeaderField(":method", "GET")
-	st.encodeHeaderField(":path", "/")
-	st.encodeHeaderField(":scheme", "https")
-	cookie := strings.Repeat("*", 4058)
-	st.encodeHeaderField("cookie", cookie)
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.headerBuf.Bytes(),
-		EndStream:     true,
-		EndHeaders:    false,
-	})
-
-	// Capture the short encoding of a duplicate ~4K cookie, now
-	// that we've already sent it once.
-	st.headerBuf.Reset()
-	st.encodeHeaderField("cookie", cookie)
-
-	// Now send 1MB of it.
-	const size = 1 << 20
-	b := bytes.Repeat(st.headerBuf.Bytes(), size/st.headerBuf.Len())
-	for len(b) > 0 {
-		chunk := b
-		if len(chunk) > frameSize {
-			chunk = chunk[:frameSize]
-		}
-		b = b[len(chunk):]
-		st.fr.WriteContinuation(1, len(b) == 0, chunk)
-	}
-
-	h := st.wantHeaders()
-	if !h.HeadersEnded() {
-		t.Fatalf("Got HEADERS without END_HEADERS set: %v", h)
-	}
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "431"},
-		{"content-type", "text/html; charset=utf-8"},
-		{"content-length", "63"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-func TestCompressionErrorOnWrite(t *testing.T) {
-	const maxStrLen = 8 << 10
-	var serverConfig *http.Server
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	}, func(ts *httptest.Server) {
-		serverConfig = ts.Config
-		serverConfig.MaxHeaderBytes = maxStrLen
-	})
-	st.addLogFilter("connection error: COMPRESSION_ERROR")
-	defer st.Close()
-	st.greet()
-
-	maxAllowed := st.sc.framer.maxHeaderStringLen()
-
-	// Crank this up, now that we have a conn connected with the
-	// hpack.Decoder's max string length set has been initialized
-	// from the earlier low ~8K value. We want this higher so don't
-	// hit the max header list size. We only want to test hitting
-	// the max string size.
-	serverConfig.MaxHeaderBytes = 1 << 20
-
-	// First a request with a header that's exactly the max allowed size
-	// for the hpack compression. It's still too long for the header list
-	// size, so we'll get the 431 error, but that keeps the compression
-	// context still valid.
-	hbf := st.encodeHeader("foo", strings.Repeat("a", maxAllowed))
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	if !h.HeadersEnded() {
-		t.Fatalf("Got HEADERS without END_HEADERS set: %v", h)
-	}
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "431"},
-		{"content-type", "text/html; charset=utf-8"},
-		{"content-length", "63"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-	df := st.wantData()
-	if !strings.Contains(string(df.Data()), "HTTP Error 431") {
-		t.Errorf("Unexpected data body: %q", df.Data())
-	}
-	if !df.StreamEnded() {
-		t.Fatalf("expect data stream end")
-	}
-
-	// And now send one that's just one byte too big.
-	hbf = st.encodeHeader("bar", strings.Repeat("b", maxAllowed+1))
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      3,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeCompression {
-		t.Errorf("GOAWAY err = %v; want ErrCodeCompression", ga.ErrCode)
-	}
-}
-
-func TestCompressionErrorOnClose(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	})
-	st.addLogFilter("connection error: COMPRESSION_ERROR")
-	defer st.Close()
-	st.greet()
-
-	hbf := st.encodeHeader("foo", "bar")
-	hbf = hbf[:len(hbf)-1] // truncate one byte from the end, so hpack.Decoder.Close fails.
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: hbf,
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeCompression {
-		t.Errorf("GOAWAY err = %v; want ErrCodeCompression", ga.ErrCode)
-	}
-}
-
-// test that a server handler can read trailers from a client
-func TestServerReadsTrailers(t *testing.T) {
-	const testBody = "some test body"
-	writeReq := func(st *serverTester) {
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      1, // clients send odd numbers
-			BlockFragment: st.encodeHeader("trailer", "Foo, Bar", "trailer", "Baz"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(1, false, []byte(testBody))
-		st.writeHeaders(HeadersFrameParam{
-			StreamID: 1, // clients send odd numbers
-			BlockFragment: st.encodeHeaderRaw(
-				"foo", "foov",
-				"bar", "barv",
-				"baz", "bazv",
-				"surprise", "wasn't declared; shouldn't show up",
-			),
-			EndStream:  true,
-			EndHeaders: true,
-		})
-	}
-	checkReq := func(r *http.Request) {
-		wantTrailer := http.Header{
-			"Foo": nil,
-			"Bar": nil,
-			"Baz": nil,
-		}
-		if !reflect.DeepEqual(r.Trailer, wantTrailer) {
-			t.Errorf("initial Trailer = %v; want %v", r.Trailer, wantTrailer)
-		}
-		slurp, err := ioutil.ReadAll(r.Body)
-		if string(slurp) != testBody {
-			t.Errorf("read body %q; want %q", slurp, testBody)
-		}
-		if err != nil {
-			t.Fatalf("Body slurp: %v", err)
-		}
-		wantTrailerAfter := http.Header{
-			"Foo": {"foov"},
-			"Bar": {"barv"},
-			"Baz": {"bazv"},
-		}
-		if !reflect.DeepEqual(r.Trailer, wantTrailerAfter) {
-			t.Errorf("final Trailer = %v; want %v", r.Trailer, wantTrailerAfter)
-		}
-	}
-	testServerRequest(t, writeReq, checkReq)
-}
-
-// test that a server handler can send trailers
-func TestServerWritesTrailers_WithFlush(t *testing.T)    { testServerWritesTrailers(t, true) }
-func TestServerWritesTrailers_WithoutFlush(t *testing.T) { testServerWritesTrailers(t, false) }
-
-func testServerWritesTrailers(t *testing.T, withFlush bool) {
-	// See https://httpwg.github.io/specs/rfc7540.html#rfc.section.8.1.3
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Set("Trailer", "Server-Trailer-A, Server-Trailer-B")
-		w.Header().Add("Trailer", "Server-Trailer-C")
-		w.Header().Add("Trailer", "Transfer-Encoding, Content-Length, Trailer") // filtered
-
-		// Regular headers:
-		w.Header().Set("Foo", "Bar")
-		w.Header().Set("Content-Length", "5") // len("Hello")
-
-		io.WriteString(w, "Hello")
-		if withFlush {
-			w.(http.Flusher).Flush()
-		}
-		w.Header().Set("Server-Trailer-A", "valuea")
-		w.Header().Set("Server-Trailer-C", "valuec") // skipping B
-		// After a flush, random keys like Server-Surprise shouldn't show up:
-		w.Header().Set("Server-Surpise", "surprise! this isn't predeclared!")
-		// But we do permit promoting keys to trailers after a
-		// flush if they start with the magic
-		// otherwise-invalid "Trailer:" prefix:
-		w.Header().Set("Trailer:Post-Header-Trailer", "hi1")
-		w.Header().Set("Trailer:post-header-trailer2", "hi2")
-		w.Header().Set("Trailer:Range", "invalid")
-		w.Header().Set("Trailer:Foo\x01Bogus", "invalid")
-		w.Header().Set("Transfer-Encoding", "should not be included; Forbidden by RFC 2616 14.40")
-		w.Header().Set("Content-Length", "should not be included; Forbidden by RFC 2616 14.40")
-		w.Header().Set("Trailer", "should not be included; Forbidden by RFC 2616 14.40")
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if hf.StreamEnded() {
-			t.Fatal("response HEADERS had END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("response HEADERS didn't have END_HEADERS")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"foo", "Bar"},
-			{"trailer", "Server-Trailer-A, Server-Trailer-B"},
-			{"trailer", "Server-Trailer-C"},
-			{"trailer", "Transfer-Encoding, Content-Length, Trailer"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", "5"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-		df := st.wantData()
-		if string(df.Data()) != "Hello" {
-			t.Fatalf("Client read %q; want Hello", df.Data())
-		}
-		if df.StreamEnded() {
-			t.Fatalf("data frame had STREAM_ENDED")
-		}
-		tf := st.wantHeaders() // for the trailers
-		if !tf.StreamEnded() {
-			t.Fatalf("trailers HEADERS lacked END_STREAM")
-		}
-		if !tf.HeadersEnded() {
-			t.Fatalf("trailers HEADERS lacked END_HEADERS")
-		}
-		wanth = [][2]string{
-			{"post-header-trailer", "hi1"},
-			{"post-header-trailer2", "hi2"},
-			{"server-trailer-a", "valuea"},
-			{"server-trailer-c", "valuec"},
-		}
-		goth = st.decodeHeader(tf.HeaderBlockFragment())
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-	})
-}
-
-// validate transmitted header field names & values
-// golang.org/issue/14048
-func TestServerDoesntWriteInvalidHeaders(t *testing.T) {
-	testServerResponse(t, func(w http.ResponseWriter, r *http.Request) error {
-		w.Header().Add("OK1", "x")
-		w.Header().Add("Bad:Colon", "x") // colon (non-token byte) in key
-		w.Header().Add("Bad1\x00", "x")  // null in key
-		w.Header().Add("Bad2", "x\x00y") // null in value
-		return nil
-	}, func(st *serverTester) {
-		getSlash(st)
-		hf := st.wantHeaders()
-		if !hf.StreamEnded() {
-			t.Error("response HEADERS lacked END_STREAM")
-		}
-		if !hf.HeadersEnded() {
-			t.Fatal("response HEADERS didn't have END_HEADERS")
-		}
-		goth := st.decodeHeader(hf.HeaderBlockFragment())
-		wanth := [][2]string{
-			{":status", "200"},
-			{"ok1", "x"},
-			{"content-type", "text/plain; charset=utf-8"},
-			{"content-length", "0"},
-		}
-		if !reflect.DeepEqual(goth, wanth) {
-			t.Errorf("Header mismatch.\n got: %v\nwant: %v", goth, wanth)
-		}
-	})
-}
-
-func BenchmarkServerGets(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-
-	const msg = "Hello, world"
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-
-	// Give the server quota to reply. (plus it has the the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		id := 1 + uint32(i)*2
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		df := st.wantData()
-		if !df.StreamEnded() {
-			b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-		}
-	}
-}
-
-func BenchmarkServerPosts(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-
-	const msg = "Hello, world"
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		// Consume the (empty) body from th peer before replying, otherwise
-		// the server will sometimes (depending on scheduling) send the peer a
-		// a RST_STREAM with the CANCEL error code.
-		if n, err := io.Copy(ioutil.Discard, r.Body); n != 0 || err != nil {
-			b.Errorf("Copy error; got %v, %v; want 0, nil", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-
-	// Give the server quota to reply. (plus it has the the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-
-	for i := 0; i < b.N; i++ {
-		id := 1 + uint32(i)*2
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      id,
-			BlockFragment: st.encodeHeader(":method", "POST"),
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(id, true, nil)
-		st.wantHeaders()
-		df := st.wantData()
-		if !df.StreamEnded() {
-			b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-		}
-	}
-}
-
-// Send a stream of messages from server to client in separate data frames.
-// Brings up performance issues seen in long streams.
-// Created to show problem in go issue #18502
-func BenchmarkServerToClientStreamDefaultOptions(b *testing.B) {
-	benchmarkServerToClientStream(b)
-}
-
-// Justification for Change-Id: Iad93420ef6c3918f54249d867098f1dadfa324d8
-// Expect to see memory/alloc reduction by opting in to Frame reuse with the Framer.
-func BenchmarkServerToClientStreamReuseFrames(b *testing.B) {
-	benchmarkServerToClientStream(b, optFramerReuseFrames)
-}
-
-func benchmarkServerToClientStream(b *testing.B, newServerOpts ...interface{}) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msgLen = 1
-	// default window size
-	const windowSize = 1<<16 - 1
-
-	// next message to send from the server and for the client to expect
-	nextMsg := func(i int) []byte {
-		msg := make([]byte, msgLen)
-		msg[0] = byte(i)
-		if len(msg) != msgLen {
-			panic("invalid test setup msg length")
-		}
-		return msg
-	}
-
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		// Consume the (empty) body from th peer before replying, otherwise
-		// the server will sometimes (depending on scheduling) send the peer a
-		// a RST_STREAM with the CANCEL error code.
-		if n, err := io.Copy(ioutil.Discard, r.Body); n != 0 || err != nil {
-			b.Errorf("Copy error; got %v, %v; want 0, nil", n, err)
-		}
-		for i := 0; i < b.N; i += 1 {
-			w.Write(nextMsg(i))
-			w.(http.Flusher).Flush()
-		}
-	}, newServerOpts...)
-	defer st.Close()
-	st.greet()
-
-	const id = uint32(1)
-
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      id,
-		BlockFragment: st.encodeHeader(":method", "POST"),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-
-	st.writeData(id, true, nil)
-	st.wantHeaders()
-
-	var pendingWindowUpdate = uint32(0)
-
-	for i := 0; i < b.N; i += 1 {
-		expected := nextMsg(i)
-		df := st.wantData()
-		if bytes.Compare(expected, df.data) != 0 {
-			b.Fatalf("Bad message received; want %v; got %v", expected, df.data)
-		}
-		// try to send infrequent but large window updates so they don't overwhelm the test
-		pendingWindowUpdate += uint32(len(df.data))
-		if pendingWindowUpdate >= windowSize/2 {
-			if err := st.fr.WriteWindowUpdate(0, pendingWindowUpdate); err != nil {
-				b.Fatal(err)
-			}
-			if err := st.fr.WriteWindowUpdate(id, pendingWindowUpdate); err != nil {
-				b.Fatal(err)
-			}
-			pendingWindowUpdate = 0
-		}
-	}
-	df := st.wantData()
-	if !df.StreamEnded() {
-		b.Fatalf("DATA didn't have END_STREAM; got %v", df)
-	}
-}
-
-// go-fuzz bug, originally reported at https://github.com/bradfitz/http2/issues/53
-// Verify we don't hang.
-func TestIssue53(t *testing.T) {
-	const data = "PRI * HTTP/2.0\r\n\r\nSM" +
-		"\r\n\r\n\x00\x00\x00\x01\ainfinfin\ad"
-	s := &http.Server{
-		ErrorLog: log.New(io.MultiWriter(stderrv(), twriter{t: t}), "", log.LstdFlags),
-		Handler: http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-			w.Write([]byte("hello"))
-		}),
-	}
-	s2 := &Server{
-		MaxReadFrameSize:             1 << 16,
-		PermitProhibitedCipherSuites: true,
-	}
-	c := &issue53Conn{[]byte(data), false, false}
-	s2.ServeConn(c, &ServeConnOpts{BaseConfig: s})
-	if !c.closed {
-		t.Fatal("connection is not closed")
-	}
-}
-
-type issue53Conn struct {
-	data    []byte
-	closed  bool
-	written bool
-}
-
-func (c *issue53Conn) Read(b []byte) (n int, err error) {
-	if len(c.data) == 0 {
-		return 0, io.EOF
-	}
-	n = copy(b, c.data)
-	c.data = c.data[n:]
-	return
-}
-
-func (c *issue53Conn) Write(b []byte) (n int, err error) {
-	c.written = true
-	return len(b), nil
-}
-
-func (c *issue53Conn) Close() error {
-	c.closed = true
-	return nil
-}
-
-func (c *issue53Conn) LocalAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 49706}
-}
-func (c *issue53Conn) RemoteAddr() net.Addr {
-	return &net.TCPAddr{IP: net.IPv4(127, 0, 0, 1), Port: 49706}
-}
-func (c *issue53Conn) SetDeadline(t time.Time) error      { return nil }
-func (c *issue53Conn) SetReadDeadline(t time.Time) error  { return nil }
-func (c *issue53Conn) SetWriteDeadline(t time.Time) error { return nil }
-
-// golang.org/issue/12895
-func TestConfigureServer(t *testing.T) {
-	tests := []struct {
-		name      string
-		tlsConfig *tls.Config
-		wantErr   string
-	}{
-		{
-			name: "empty server",
-		},
-		{
-			name: "just the required cipher suite",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
-			},
-		},
-		{
-			name: "missing required cipher suite",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384},
-			},
-			wantErr: "is missing HTTP/2-required TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
-		},
-		{
-			name: "required after bad",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_RSA_WITH_RC4_128_SHA, tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256},
-			},
-			wantErr: "contains an HTTP/2-approved cipher suite (0xc02f), but it comes after",
-		},
-		{
-			name: "bad after required",
-			tlsConfig: &tls.Config{
-				CipherSuites: []uint16{tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256, tls.TLS_RSA_WITH_RC4_128_SHA},
-			},
-		},
-	}
-	for _, tt := range tests {
-		srv := &http.Server{TLSConfig: tt.tlsConfig}
-		err := ConfigureServer(srv, nil)
-		if (err != nil) != (tt.wantErr != "") {
-			if tt.wantErr != "" {
-				t.Errorf("%s: success, but want error", tt.name)
-			} else {
-				t.Errorf("%s: unexpected error: %v", tt.name, err)
-			}
-		}
-		if err != nil && tt.wantErr != "" && !strings.Contains(err.Error(), tt.wantErr) {
-			t.Errorf("%s: err = %v; want substring %q", tt.name, err, tt.wantErr)
-		}
-		if err == nil && !srv.TLSConfig.PreferServerCipherSuites {
-			t.Errorf("%s: PreferServerCipherSuite is false; want true", tt.name)
-		}
-	}
-}
-
-func TestServerRejectHeadWithBody(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body.
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "HEAD"),
-		EndStream:     false, // what we're testing, a bogus HEAD request with body
-		EndHeaders:    true,
-	})
-	st.wantRSTStream(1, ErrCodeProtocol)
-}
-
-func TestServerNoAutoContentLengthOnHead(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// No response body. (or smaller than one frame)
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1, // clients send odd numbers
-		BlockFragment: st.encodeHeader(":method", "HEAD"),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "200"},
-		{"content-type", "text/plain; charset=utf-8"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-// golang.org/issue/13495
-func TestServerNoDuplicateContentType(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.Header()["Content-Type"] = []string{""}
-		fmt.Fprintf(w, "<html><head></head><body>hi</body></html>")
-	})
-	defer st.Close()
-	st.greet()
-	st.writeHeaders(HeadersFrameParam{
-		StreamID:      1,
-		BlockFragment: st.encodeHeader(),
-		EndStream:     true,
-		EndHeaders:    true,
-	})
-	h := st.wantHeaders()
-	headers := st.decodeHeader(h.HeaderBlockFragment())
-	want := [][2]string{
-		{":status", "200"},
-		{"content-type", ""},
-		{"content-length", "41"},
-	}
-	if !reflect.DeepEqual(headers, want) {
-		t.Errorf("Headers mismatch.\n got: %q\nwant: %q\n", headers, want)
-	}
-}
-
-func disableGoroutineTracking() (restore func()) {
-	old := DebugGoroutines
-	DebugGoroutines = false
-	return func() { DebugGoroutines = old }
-}
-
-func BenchmarkServer_GetRequest(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msg = "Hello, world."
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		n, err := io.Copy(ioutil.Discard, r.Body)
-		if err != nil || n > 0 {
-			b.Errorf("Read %d bytes, error %v; want 0 bytes.", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-
-	st.greet()
-	// Give the server quota to reply. (plus it has the the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-	hbf := st.encodeHeader(":method", "GET")
-	for i := 0; i < b.N; i++ {
-		streamID := uint32(1 + 2*i)
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      streamID,
-			BlockFragment: hbf,
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		st.wantHeaders()
-		st.wantData()
-	}
-}
-
-func BenchmarkServer_PostRequest(b *testing.B) {
-	defer disableGoroutineTracking()()
-	b.ReportAllocs()
-	const msg = "Hello, world."
-	st := newServerTester(b, func(w http.ResponseWriter, r *http.Request) {
-		n, err := io.Copy(ioutil.Discard, r.Body)
-		if err != nil || n > 0 {
-			b.Errorf("Read %d bytes, error %v; want 0 bytes.", n, err)
-		}
-		io.WriteString(w, msg)
-	})
-	defer st.Close()
-	st.greet()
-	// Give the server quota to reply. (plus it has the the 64KB)
-	if err := st.fr.WriteWindowUpdate(0, uint32(b.N*len(msg))); err != nil {
-		b.Fatal(err)
-	}
-	hbf := st.encodeHeader(":method", "POST")
-	for i := 0; i < b.N; i++ {
-		streamID := uint32(1 + 2*i)
-		st.writeHeaders(HeadersFrameParam{
-			StreamID:      streamID,
-			BlockFragment: hbf,
-			EndStream:     false,
-			EndHeaders:    true,
-		})
-		st.writeData(streamID, true, nil)
-		st.wantHeaders()
-		st.wantData()
-	}
-}
-
-type connStateConn struct {
-	net.Conn
-	cs tls.ConnectionState
-}
-
-func (c connStateConn) ConnectionState() tls.ConnectionState { return c.cs }
-
-// golang.org/issue/12737 -- handle any net.Conn, not just
-// *tls.Conn.
-func TestServerHandleCustomConn(t *testing.T) {
-	var s Server
-	c1, c2 := net.Pipe()
-	clientDone := make(chan struct{})
-	handlerDone := make(chan struct{})
-	var req *http.Request
-	go func() {
-		defer close(clientDone)
-		defer c2.Close()
-		fr := NewFramer(c2, c2)
-		io.WriteString(c2, ClientPreface)
-		fr.WriteSettings()
-		fr.WriteSettingsAck()
-		f, err := fr.ReadFrame()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if sf, ok := f.(*SettingsFrame); !ok || sf.IsAck() {
-			t.Errorf("Got %v; want non-ACK SettingsFrame", summarizeFrame(f))
-			return
-		}
-		f, err = fr.ReadFrame()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		if sf, ok := f.(*SettingsFrame); !ok || !sf.IsAck() {
-			t.Errorf("Got %v; want ACK SettingsFrame", summarizeFrame(f))
-			return
-		}
-		var henc hpackEncoder
-		fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      1,
-			BlockFragment: henc.encodeHeaderRaw(t, ":method", "GET", ":path", "/", ":scheme", "https", ":authority", "foo.com"),
-			EndStream:     true,
-			EndHeaders:    true,
-		})
-		go io.Copy(ioutil.Discard, c2)
-		<-handlerDone
-	}()
-	const testString = "my custom ConnectionState"
-	fakeConnState := tls.ConnectionState{
-		ServerName: testString,
-		Version:    tls.VersionTLS12,
-	}
-	go s.ServeConn(connStateConn{c1, fakeConnState}, &ServeConnOpts{
-		BaseConfig: &http.Server{
-			Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-				defer close(handlerDone)
-				req = r
-			}),
-		}})
-	select {
-	case <-clientDone:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout waiting for handler")
-	}
-	if req.TLS == nil {
-		t.Fatalf("Request.TLS is nil. Got: %#v", req)
-	}
-	if req.TLS.ServerName != testString {
-		t.Fatalf("Request.TLS = %+v; want ServerName of %q", req.TLS, testString)
-	}
-}
-
-// golang.org/issue/14214
-func TestServer_Rejects_ConnHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		t.Error("should not get to Handler")
-	})
-	defer st.Close()
-	st.greet()
-	st.bodylessReq1("connection", "foo")
-	hf := st.wantHeaders()
-	goth := st.decodeHeader(hf.HeaderBlockFragment())
-	wanth := [][2]string{
-		{":status", "400"},
-		{"content-type", "text/plain; charset=utf-8"},
-		{"x-content-type-options", "nosniff"},
-		{"content-length", "51"},
-	}
-	if !reflect.DeepEqual(goth, wanth) {
-		t.Errorf("Got headers %v; want %v", goth, wanth)
-	}
-}
-
-type hpackEncoder struct {
-	enc *hpack.Encoder
-	buf bytes.Buffer
-}
-
-func (he *hpackEncoder) encodeHeaderRaw(t *testing.T, headers ...string) []byte {
-	if len(headers)%2 == 1 {
-		panic("odd number of kv args")
-	}
-	he.buf.Reset()
-	if he.enc == nil {
-		he.enc = hpack.NewEncoder(&he.buf)
-	}
-	for len(headers) > 0 {
-		k, v := headers[0], headers[1]
-		err := he.enc.WriteField(hpack.HeaderField{Name: k, Value: v})
-		if err != nil {
-			t.Fatalf("HPACK encoding error for %q/%q: %v", k, v, err)
-		}
-		headers = headers[2:]
-	}
-	return he.buf.Bytes()
-}
-
-func TestCheckValidHTTP2Request(t *testing.T) {
-	tests := []struct {
-		h    http.Header
-		want error
-	}{
-		{
-			h:    http.Header{"Te": {"trailers"}},
-			want: nil,
-		},
-		{
-			h:    http.Header{"Te": {"trailers", "bogus"}},
-			want: errors.New(`request header "TE" may only be "trailers" in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Foo": {""}},
-			want: nil,
-		},
-		{
-			h:    http.Header{"Connection": {""}},
-			want: errors.New(`request header "Connection" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Proxy-Connection": {""}},
-			want: errors.New(`request header "Proxy-Connection" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Keep-Alive": {""}},
-			want: errors.New(`request header "Keep-Alive" is not valid in HTTP/2`),
-		},
-		{
-			h:    http.Header{"Upgrade": {""}},
-			want: errors.New(`request header "Upgrade" is not valid in HTTP/2`),
-		},
-	}
-	for i, tt := range tests {
-		got := checkValidHTTP2RequestHeaders(tt.h)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d. checkValidHTTP2Request = %v; want %v", i, got, tt.want)
-		}
-	}
-}
-
-// golang.org/issue/14030
-func TestExpect100ContinueAfterHandlerWrites(t *testing.T) {
-	const msg = "Hello"
-	const msg2 = "World"
-
-	doRead := make(chan bool, 1)
-	defer close(doRead) // fallback cleanup
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, msg)
-		w.(http.Flusher).Flush()
-
-		// Do a read, which might force a 100-continue status to be sent.
-		<-doRead
-		r.Body.Read(make([]byte, 10))
-
-		io.WriteString(w, msg2)
-
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, _ := http.NewRequest("POST", st.ts.URL, io.LimitReader(neverEnding('A'), 2<<20))
-	req.Header.Set("Expect", "100-continue")
-
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	buf := make([]byte, len(msg))
-	if _, err := io.ReadFull(res.Body, buf); err != nil {
-		t.Fatal(err)
-	}
-	if string(buf) != msg {
-		t.Fatalf("msg = %q; want %q", buf, msg)
-	}
-
-	doRead <- true
-
-	if _, err := io.ReadFull(res.Body, buf); err != nil {
-		t.Fatal(err)
-	}
-	if string(buf) != msg2 {
-		t.Fatalf("second msg = %q; want %q", buf, msg2)
-	}
-}
-
-type funcReader func([]byte) (n int, err error)
-
-func (f funcReader) Read(p []byte) (n int, err error) { return f(p) }
-
-// golang.org/issue/16481 -- return flow control when streams close with unread data.
-// (The Server version of the bug. See also TestUnreadFlowControlReturned_Transport)
-func TestUnreadFlowControlReturned_Server(t *testing.T) {
-	unblock := make(chan bool, 1)
-	defer close(unblock)
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// Don't read the 16KB request body. Wait until the client's
-		// done sending it and then return. This should cause the Server
-		// to then return those 16KB of flow control to the client.
-		<-unblock
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	// This previously hung on the 4th iteration.
-	for i := 0; i < 6; i++ {
-		body := io.MultiReader(
-			io.LimitReader(neverEnding('A'), 16<<10),
-			funcReader(func([]byte) (n int, err error) {
-				unblock <- true
-				return 0, io.EOF
-			}),
-		)
-		req, _ := http.NewRequest("POST", st.ts.URL, body)
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		res.Body.Close()
-	}
-
-}
-
-func TestServerIdleTimeout(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-	}, func(h2s *Server) {
-		h2s.IdleTimeout = 500 * time.Millisecond
-	})
-	defer st.Close()
-
-	st.greet()
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeNo {
-		t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-	}
-}
-
-func TestServerIdleTimeout_AfterRequest(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-	const timeout = 250 * time.Millisecond
-
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		time.Sleep(timeout * 2)
-	}, func(h2s *Server) {
-		h2s.IdleTimeout = timeout
-	})
-	defer st.Close()
-
-	st.greet()
-
-	// Send a request which takes twice the timeout. Verifies the
-	// idle timeout doesn't fire while we're in a request:
-	st.bodylessReq1()
-	st.wantHeaders()
-
-	// But the idle timeout should be rearmed after the request
-	// is done:
-	ga := st.wantGoAway()
-	if ga.ErrCode != ErrCodeNo {
-		t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-	}
-}
-
-// grpc-go closes the Request.Body currently with a Read.
-// Verify that it doesn't race.
-// See https://github.com/grpc/grpc-go/pull/938
-func TestRequestBodyReadCloseRace(t *testing.T) {
-	for i := 0; i < 100; i++ {
-		body := &requestBody{
-			pipe: &pipe{
-				b: new(bytes.Buffer),
-			},
-		}
-		body.pipe.CloseWithError(io.EOF)
-
-		done := make(chan bool, 1)
-		buf := make([]byte, 10)
-		go func() {
-			time.Sleep(1 * time.Millisecond)
-			body.Close()
-			done <- true
-		}()
-		body.Read(buf)
-		<-done
-	}
-}
-
-func TestServerGracefulShutdown(t *testing.T) {
-	shutdownCh := make(chan struct{})
-	defer func() { testh1ServerShutdownChan = nil }()
-	testh1ServerShutdownChan = func(*http.Server) <-chan struct{} { return shutdownCh }
-
-	var st *serverTester
-	handlerDone := make(chan struct{})
-	st = newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		defer close(handlerDone)
-		close(shutdownCh)
-
-		ga := st.wantGoAway()
-		if ga.ErrCode != ErrCodeNo {
-			t.Errorf("GOAWAY error = %v; want ErrCodeNo", ga.ErrCode)
-		}
-		if ga.LastStreamID != 1 {
-			t.Errorf("GOAWAY LastStreamID = %v; want 1", ga.LastStreamID)
-		}
-
-		w.Header().Set("x-foo", "bar")
-	})
-	defer st.Close()
-
-	st.greet()
-	st.bodylessReq1()
-
-	<-handlerDone
-	hf := st.wantHeaders()
-	goth := st.decodeHeader(hf.HeaderBlockFragment())
-	wanth := [][2]string{
-		{":status", "200"},
-		{"x-foo", "bar"},
-		{"content-type", "text/plain; charset=utf-8"},
-		{"content-length", "0"},
-	}
-	if !reflect.DeepEqual(goth, wanth) {
-		t.Errorf("Got headers %v; want %v", goth, wanth)
-	}
-
-	n, err := st.cc.Read([]byte{0})
-	if n != 0 || err == nil {
-		t.Errorf("Read = %v, %v; want 0, non-nil", n, err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/testdata/draft-ietf-httpbis-http2.xml b/installer/vendor/golang.org/x/net/http2/testdata/draft-ietf-httpbis-http2.xml
deleted file mode 100644
index 31a84bed4f..0000000000
--- a/installer/vendor/golang.org/x/net/http2/testdata/draft-ietf-httpbis-http2.xml
+++ /dev/null
@@ -1,5021 +0,0 @@
-<?xml version="1.0"?>
-<?xml-stylesheet type="text/xsl" href="lib/rfc2629.xslt"?>
-<?rfc toc="yes" ?>
-<?rfc symrefs="yes" ?>
-<?rfc sortrefs="yes" ?>
-<?rfc compact="yes"?>
-<?rfc subcompact="no" ?>
-<?rfc linkmailto="no" ?>
-<?rfc editing="no" ?>
-<?rfc comments="yes" ?>
-<?rfc inline="yes"?>
-<?rfc rfcedstyle="yes"?>
-<?rfc-ext allow-markup-in-artwork="yes" ?>
-<?rfc-ext include-index="no" ?>
-
-<rfc ipr="trust200902"
-     category="std"
-     docName="draft-ietf-httpbis-http2-latest"
-     x:maturity-level="proposed"
-     xmlns:x="http://purl.org/net/xml2rfc/ext">
-  <x:feedback template="mailto:ietf-http-wg@w3.org?subject={docname},%20%22{section}%22&amp;body=&lt;{ref}&gt;:"/>
-  <front>
-    <title abbrev="HTTP/2">Hypertext Transfer Protocol version 2</title>
-
-    <author initials="M." surname="Belshe" fullname="Mike Belshe">
-      <organization>Twist</organization>
-      <address>
-        <email>mbelshe@chromium.org</email>
-      </address>
-    </author>
-
-    <author initials="R." surname="Peon" fullname="Roberto Peon">
-      <organization>Google, Inc</organization>
-      <address>
-        <email>fenix@google.com</email>
-      </address>
-    </author>
-
-    <author initials="M." surname="Thomson" fullname="Martin Thomson" role="editor">
-      <organization>Mozilla</organization>
-      <address>
-        <postal>
-          <street>331 E Evelyn Street</street>
-          <city>Mountain View</city>
-          <region>CA</region>
-          <code>94041</code>
-          <country>US</country>
-        </postal>
-        <email>martin.thomson@gmail.com</email>
-      </address>
-    </author>
-
-    <date year="2014" />
-    <area>Applications</area>
-    <workgroup>HTTPbis</workgroup>
-    <keyword>HTTP</keyword>
-    <keyword>SPDY</keyword>
-    <keyword>Web</keyword>
-
-    <abstract>
-      <t>
-        This specification describes an optimized expression of the semantics of the Hypertext
-        Transfer Protocol (HTTP). HTTP/2 enables a more efficient use of network resources and a
-        reduced perception of latency by introducing header field compression and allowing multiple
-        concurrent messages on the same connection. It also introduces unsolicited push of
-        representations from servers to clients.
-      </t>
-      <t>
-        This specification is an alternative to, but does not obsolete, the HTTP/1.1 message syntax.
-        HTTP's existing semantics remain unchanged.
-      </t>
-    </abstract>
-
-    <note title="Editorial Note (To be removed by RFC Editor)">
-      <t>
-        Discussion of this draft takes place on the HTTPBIS working group mailing list
-        (ietf-http-wg@w3.org), which is archived at <eref
-        target="https://lists.w3.org/Archives/Public/ietf-http-wg/"/>.
-      </t>
-      <t>
-        Working Group information can be found at <eref
-        target="https://tools.ietf.org/wg/httpbis/"/>; that specific to HTTP/2 are at <eref
-        target="https://http2.github.io/"/>.
-      </t>
-      <t>
-        The changes in this draft are summarized in <xref
-        target="change.log"/>.
-      </t>
-    </note>
-
-  </front>
-
-  <middle>
-    <section anchor="intro" title="Introduction">
-
-      <t>
-        The Hypertext Transfer Protocol (HTTP) is a wildly successful protocol. However, the
-        HTTP/1.1 message format (<xref target="RFC7230" x:fmt="," x:rel="#http.message"/>) has
-        several characteristics that have a negative overall effect on application performance
-        today.
-      </t>
-      <t>
-        In particular, HTTP/1.0 allowed only one request to be outstanding at a time on a given
-        TCP connection. HTTP/1.1 added request pipelining, but this only partially addressed
-        request concurrency and still suffers from head-of-line blocking. Therefore, HTTP/1.1
-        clients that need to make many requests typically use multiple connections to a server in
-        order to achieve concurrency and thereby reduce latency.
-      </t>
-      <t>
-        Furthermore, HTTP header fields are often repetitive and verbose, causing unnecessary
-        network traffic, as well as causing the initial <xref target="TCP">TCP</xref> congestion
-        window to quickly fill. This can result in excessive latency when multiple requests are
-        made on a new TCP connection.
-      </t>
-      <t>
-        HTTP/2 addresses these issues by defining an optimized mapping of HTTP's semantics to an
-        underlying connection. Specifically, it allows interleaving of request and response
-        messages on the same connection and uses an efficient coding for HTTP header fields. It
-        also allows prioritization of requests, letting more important requests complete more
-        quickly, further improving performance.
-      </t>
-      <t>
-        The resulting protocol is more friendly to the network, because fewer TCP connections can
-        be used in comparison to HTTP/1.x. This means less competition with other flows, and
-        longer-lived connections, which in turn leads to better utilization of available network
-        capacity.
-      </t>
-      <t>
-        Finally, HTTP/2 also enables more efficient processing of messages through use of binary
-        message framing.
-      </t>
-    </section>
-
-    <section anchor="Overview" title="HTTP/2 Protocol Overview">
-      <t>
-        HTTP/2 provides an optimized transport for HTTP semantics.  HTTP/2 supports all of the core
-        features of HTTP/1.1, but aims to be more efficient in several ways.
-      </t>
-      <t>
-        The basic protocol unit in HTTP/2 is a <xref target="FrameHeader">frame</xref>.  Each frame
-        type serves a different purpose.  For example, <x:ref>HEADERS</x:ref> and
-        <x:ref>DATA</x:ref> frames form the basis of <xref target="HttpSequence">HTTP requests and
-        responses</xref>; other frame types like <x:ref>SETTINGS</x:ref>,
-        <x:ref>WINDOW_UPDATE</x:ref>, and <x:ref>PUSH_PROMISE</x:ref> are used in support of other
-        HTTP/2 features.
-      </t>
-      <t>
-        Multiplexing of requests is achieved by having each HTTP request-response exchange
-        associated with its own <xref target="StreamsLayer">stream</xref>. Streams are largely
-        independent of each other, so a blocked or stalled request or response does not prevent
-        progress on other streams.
-      </t>
-      <t>
-        Flow control and prioritization ensure that it is possible to efficiently use multiplexed
-        streams.  <xref target="FlowControl">Flow control</xref> helps to ensure that only data that
-        can be used by a receiver is transmitted.  <xref
-        target="StreamPriority">Prioritization</xref> ensures that limited resources can be directed
-        to the most important streams first.
-      </t>
-      <t>
-        HTTP/2 adds a new interaction mode, whereby a server can <xref target="PushResources">push
-        responses to a client</xref>.  Server push allows a server to speculatively send a client
-        data that the server anticipates the client will need, trading off some network usage
-        against a potential latency gain.  The server does this by synthesizing a request, which it
-        sends as a <x:ref>PUSH_PROMISE</x:ref> frame.  The server is then able to send a response to
-        the synthetic request on a separate stream.
-      </t>
-      <t>
-        Frames that contain HTTP header fields are <xref target="HeaderBlock">compressed</xref>.
-        HTTP requests can be highly redundant, so compression can reduce the size of requests and
-        responses significantly.
-      </t>
-
-      <section title="Document Organization">
-        <t>
-          The HTTP/2 specification is split into four parts:
-          <list style="symbols">
-            <t>
-              <xref target="starting">Starting HTTP/2</xref> covers how an HTTP/2 connection is
-              initiated.
-            </t>
-            <t>
-              The <xref target="FramingLayer">framing</xref> and <xref
-              target="StreamsLayer">streams</xref> layers describe the way HTTP/2 frames are
-              structured and formed into multiplexed streams.
-            </t>
-            <t>
-              <xref target="FrameTypes">Frame</xref> and <xref target="ErrorCodes">error</xref>
-              definitions include details of the frame and error types used in HTTP/2.
-            </t>
-            <t>
-              <xref target="HTTPLayer">HTTP mappings</xref> and <xref target="HttpExtra">additional
-              requirements</xref> describe how HTTP semantics are expressed using frames and
-              streams.
-          </t>
-          </list>
-        </t>
-        <t>
-          While some of the frame and stream layer concepts are isolated from HTTP, this
-          specification does not define a completely generic framing layer. The framing and streams
-          layers are tailored to the needs of the HTTP protocol and server push.
-        </t>
-      </section>
-
-      <section title="Conventions and Terminology">
-        <t>
-          The key words "MUST", "MUST NOT", "REQUIRED", "SHALL", "SHALL NOT", "SHOULD", "SHOULD
-          NOT", "RECOMMENDED", "MAY", and "OPTIONAL" in this document are to be interpreted as
-          described in <xref target="RFC2119">RFC 2119</xref>.
-        </t>
-        <t>
-          All numeric values are in network byte order.  Values are unsigned unless otherwise
-          indicated.  Literal values are provided in decimal or hexadecimal as appropriate.
-          Hexadecimal literals are prefixed with <spanx style="verb">0x</spanx> to distinguish them
-          from decimal literals.
-        </t>
-        <t>
-          The following terms are used:
-          <list style="hanging">
-            <t hangText="client:">
-              The endpoint initiating the HTTP/2 connection.
-            </t>
-            <t hangText="connection:">
-              A transport-layer connection between two endpoints.
-            </t>
-            <t hangText="connection error:">
-              An error that affects the entire HTTP/2 connection.
-            </t>
-            <t hangText="endpoint:">
-              Either the client or server of the connection.
-            </t>
-            <t hangText="frame:">
-              The smallest unit of communication within an HTTP/2 connection, consisting of a header
-              and a variable-length sequence of octets structured according to the frame type.
-            </t>
-            <t hangText="peer:">
-              An endpoint.  When discussing a particular endpoint, "peer" refers to the endpoint
-              that is remote to the primary subject of discussion.
-            </t>
-            <t hangText="receiver:">
-              An endpoint that is receiving frames.
-            </t>
-            <t hangText="sender:">
-              An endpoint that is transmitting frames.
-            </t>
-            <t hangText="server:">
-              The endpoint which did not initiate the HTTP/2 connection.
-            </t>
-            <t hangText="stream:">
-              A bi-directional flow of frames across a virtual channel within the HTTP/2 connection.
-            </t>
-            <t hangText="stream error:">
-              An error on the individual HTTP/2 stream.
-            </t>
-          </list>
-        </t>
-        <t>
-          Finally, the terms "gateway", "intermediary", "proxy", and "tunnel" are defined
-          in <xref target="RFC7230" x:fmt="of" x:rel="#intermediaries"/>.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="starting" title="Starting HTTP/2">
-      <t>
-        An HTTP/2 connection is an application layer protocol running on top of a TCP connection
-        (<xref target="TCP"/>). The client is the TCP connection initiator.
-      </t>
-      <t>
-        HTTP/2 uses the same "http" and "https" URI schemes used by HTTP/1.1. HTTP/2 shares the same
-        default port numbers: 80 for "http" URIs and 443 for "https" URIs.  As a result,
-        implementations processing requests for target resource URIs like <spanx
-        style="verb">http://example.org/foo</spanx> or <spanx
-        style="verb">https://example.com/bar</spanx> are required to first discover whether the
-        upstream server (the immediate peer to which the client wishes to establish a connection)
-        supports HTTP/2.
-      </t>
-
-      <t>
-        The means by which support for HTTP/2 is determined is different for "http" and "https"
-        URIs. Discovery for "http" URIs is described in <xref target="discover-http"/>.  Discovery
-        for "https" URIs is described in <xref target="discover-https"/>.
-      </t>
-
-      <section anchor="versioning" title="HTTP/2 Version Identification">
-        <t>
-          The protocol defined in this document has two identifiers.
-          <list style="symbols">
-            <x:lt>
-              <t>
-                The string "h2" identifies the protocol where HTTP/2 uses <xref
-                target="TLS12">TLS</xref>.  This identifier is used in the <xref
-                target="TLS-ALPN">TLS application layer protocol negotiation extension (ALPN)</xref>
-                field and any place that HTTP/2 over TLS is identified.
-              </t>
-              <t>
-                The "h2" string is serialized into an ALPN protocol identifier as the two octet
-                sequence: 0x68, 0x32.
-              </t>
-            </x:lt>
-            <x:lt>
-              <t>
-                The string "h2c" identifies the protocol where HTTP/2 is run over cleartext TCP.
-                This identifier is used in the HTTP/1.1 Upgrade header field and any place that
-                HTTP/2 over TCP is identified.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-        <t>
-          Negotiating "h2" or "h2c" implies the use of the transport, security, framing and message
-          semantics described in this document.
-        </t>
-        <t>
-          <cref>RFC Editor's Note: please remove the remainder of this section prior to the
-          publication of a final version of this document.</cref>
-        </t>
-        <t>
-          Only implementations of the final, published RFC can identify themselves as "h2" or "h2c".
-          Until such an RFC exists, implementations MUST NOT identify themselves using these
-          strings.
-        </t>
-        <t>
-          Examples and text throughout the rest of this document use "h2" as a matter of
-          editorial convenience only.  Implementations of draft versions MUST NOT identify using
-          this string.
-        </t>
-        <t>
-          Implementations of draft versions of the protocol MUST add the string "-" and the
-          corresponding draft number to the identifier. For example, draft-ietf-httpbis-http2-11
-          over TLS is identified using the string "h2-11".
-        </t>
-        <t>
-          Non-compatible experiments that are based on these draft versions MUST append the string
-          "-" and an experiment name to the identifier.  For example, an experimental implementation
-          of packet mood-based encoding based on draft-ietf-httpbis-http2-09 might identify itself
-          as "h2-09-emo".  Note that any label MUST conform to the "token" syntax defined in
-          <xref target="RFC7230" x:fmt="of" x:rel="#field.components"/>.  Experimenters are
-          encouraged to coordinate their experiments on the ietf-http-wg@w3.org mailing list.
-        </t>
-      </section>
-
-      <section anchor="discover-http" title="Starting HTTP/2 for &quot;http&quot; URIs">
-        <t>
-          A client that makes a request for an "http" URI without prior knowledge about support for
-          HTTP/2 uses the HTTP Upgrade mechanism (<xref target="RFC7230" x:fmt="of"
-          x:rel="#header.upgrade"/>).  The client makes an HTTP/1.1 request that includes an Upgrade
-          header field identifying HTTP/2 with the "h2c" token.  The HTTP/1.1 request MUST include
-          exactly one <xref target="Http2SettingsHeader">HTTP2-Settings</xref> header field.
-        </t>
-        <figure>
-          <preamble>For example:</preamble>
-          <artwork type="message/http; msgtype=&#34;request&#34;" x:indent-with="  "><![CDATA[
-GET / HTTP/1.1
-Host: server.example.com
-Connection: Upgrade, HTTP2-Settings
-Upgrade: h2c
-HTTP2-Settings: <base64url encoding of HTTP/2 SETTINGS payload>
-
-]]></artwork>
-        </figure>
-        <t>
-          Requests that contain an entity body MUST be sent in their entirety before the client can
-          send HTTP/2 frames.  This means that a large request entity can block the use of the
-          connection until it is completely sent.
-        </t>
-        <t>
-          If concurrency of an initial request with subsequent requests is important, an OPTIONS
-          request can be used to perform the upgrade to HTTP/2, at the cost of an additional
-          round-trip.
-        </t>
-        <t>
-          A server that does not support HTTP/2 can respond to the request as though the Upgrade
-          header field were absent:
-        </t>
-        <figure>
-          <artwork type="message/http; msgtype=&#34;response&#34;" x:indent-with="  ">
-HTTP/1.1 200 OK
-Content-Length: 243
-Content-Type: text/html
-
-...
-</artwork>
-        </figure>
-        <t>
-          A server MUST ignore a "h2" token in an Upgrade header field.  Presence of a token with
-          "h2" implies HTTP/2 over TLS, which is instead negotiated as described in <xref
-          target="discover-https"/>.
-        </t>
-        <t>
-          A server that supports HTTP/2 can accept the upgrade with a 101 (Switching Protocols)
-          response.  After the empty line that terminates the 101 response, the server can begin
-          sending HTTP/2 frames.  These frames MUST include a response to the request that initiated
-          the Upgrade.
-        </t>
-
-        <figure>
-          <preamble>
-            For example:
-          </preamble>
-          <artwork type="message/http; msgtype=&#34;response&#34;" x:indent-with="  ">
-HTTP/1.1 101 Switching Protocols
-Connection: Upgrade
-Upgrade: h2c
-
-[ HTTP/2 connection ...
-</artwork>
-        </figure>
-        <t>
-          The first HTTP/2 frame sent by the server is a <x:ref>SETTINGS</x:ref> frame (<xref
-          target="SETTINGS"/>) as the server connection preface (<xref
-          target="ConnectionHeader"/>). Upon receiving the 101 response, the client sends a <xref
-          target="ConnectionHeader">connection preface</xref>, which includes a
-          <x:ref>SETTINGS</x:ref> frame.
-        </t>
-        <t>
-          The HTTP/1.1 request that is sent prior to upgrade is assigned stream identifier 1 and is
-          assigned <xref target="pri-default">default priority values</xref>.  Stream 1 is
-          implicitly half closed from the client toward the server, since the request is completed
-          as an HTTP/1.1 request.  After commencing the HTTP/2 connection, stream 1 is used for the
-          response.
-        </t>
-
-        <section anchor="Http2SettingsHeader" title="HTTP2-Settings Header Field">
-          <t>
-            A request that upgrades from HTTP/1.1 to HTTP/2 MUST include exactly one <spanx
-            style="verb">HTTP2-Settings</spanx> header field.  The <spanx
-            style="verb">HTTP2-Settings</spanx> header field is a connection-specific header field
-            that includes parameters that govern the HTTP/2 connection, provided in anticipation of
-            the server accepting the request to upgrade.
-          </t>
-          <figure>
-            <artwork type="abnf" x:indent-with="  "><![CDATA[
-HTTP2-Settings    = token68
-]]></artwork>
-          </figure>
-          <t>
-            A server MUST NOT upgrade the connection to HTTP/2 if this header field is not present,
-            or if more than one is present. A server MUST NOT send this header field.
-          </t>
-
-          <t>
-            The content of the <spanx style="verb">HTTP2-Settings</spanx> header field is the
-            payload of a <x:ref>SETTINGS</x:ref> frame (<xref target="SETTINGS"/>), encoded as a
-            base64url string (that is, the URL- and filename-safe Base64 encoding described in <xref
-            target="RFC4648" x:fmt="of" x:sec="5"/>, with any trailing '=' characters omitted).  The
-            <xref target="RFC5234">ABNF</xref> production for <spanx style="verb">token68</spanx> is
-            defined in <xref target="RFC7235" x:fmt="of" x:rel="#challenge.and.response"/>.
-          </t>
-          <t>
-            Since the upgrade is only intended to apply to the immediate connection, a client
-            sending <spanx style="verb">HTTP2-Settings</spanx> MUST also send <spanx
-            style="verb">HTTP2-Settings</spanx> as a connection option in the <spanx
-            style="verb">Connection</spanx> header field to prevent it from being forwarded
-            downstream.
-          </t>
-          <t>
-            A server decodes and interprets these values as it would any other
-            <x:ref>SETTINGS</x:ref> frame.  <xref target="SettingsSync">Acknowledgement of the
-            SETTINGS parameters</xref> is not necessary, since a 101 response serves as implicit
-            acknowledgment.  Providing these values in the Upgrade request gives a client an
-            opportunity to provide parameters prior to receiving any frames from the server.
-          </t>
-        </section>
-      </section>
-
-      <section anchor="discover-https" title="Starting HTTP/2 for &quot;https&quot; URIs">
-        <t>
-          A client that makes a request to an "https" URI uses <xref target="TLS12">TLS</xref>
-          with the <xref target="TLS-ALPN">application layer protocol negotiation extension</xref>.
-        </t>
-        <t>
-          HTTP/2 over TLS uses the "h2" application token.  The "h2c" token MUST NOT be sent by a
-          client or selected by a server.
-        </t>
-        <t>
-          Once TLS negotiation is complete, both the client and the server send a <xref
-          target="ConnectionHeader">connection preface</xref>.
-        </t>
-      </section>
-
-      <section anchor="known-http" title="Starting HTTP/2 with Prior Knowledge">
-        <t>
-          A client can learn that a particular server supports HTTP/2 by other means.  For example,
-          <xref target="ALT-SVC"/> describes a mechanism for advertising this capability.
-        </t>
-        <t>
-          A client MAY immediately send HTTP/2 frames to a server that is known to support HTTP/2,
-          after the <xref target="ConnectionHeader">connection preface</xref>; a server can
-          identify such a connection by the presence of the connection preface. This only affects
-          the establishment of HTTP/2 connections over cleartext TCP; implementations that support
-          HTTP/2 over TLS MUST use <xref target="TLS-ALPN">protocol negotiation in TLS</xref>.
-        </t>
-        <t>
-          Without additional information, prior support for HTTP/2 is not a strong signal that a
-          given server will support HTTP/2 for future connections. For example, it is possible for
-          server configurations to change, for configurations to differ between instances in
-          clustered servers, or for network conditions to change.
-        </t>
-      </section>
-
-      <section anchor="ConnectionHeader" title="HTTP/2 Connection Preface">
-        <t>
-          Upon establishment of a TCP connection and determination that HTTP/2 will be used by both
-          peers, each endpoint MUST send a connection preface as a final confirmation and to
-          establish the initial SETTINGS parameters for the HTTP/2 connection.  The client and
-          server each send a different connection preface.
-        </t>
-        <t>
-          The client connection preface starts with a sequence of 24 octets, which in hex notation
-          are:
-        </t>
-        <figure>
-          <artwork type="inline" x:indent-with="  "><![CDATA[
-0x505249202a20485454502f322e300d0a0d0a534d0d0a0d0a
-]]></artwork>
-        </figure>
-        <t>
-          (the string <spanx style="verb">PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n</spanx>).  This sequence
-          is followed by a <x:ref>SETTINGS</x:ref> frame (<xref target="SETTINGS"/>).  The
-          <x:ref>SETTINGS</x:ref> frame MAY be empty.  The client sends the client connection
-          preface immediately upon receipt of a 101 Switching Protocols response (indicating a
-          successful upgrade), or as the first application data octets of a TLS connection. If
-          starting an HTTP/2 connection with prior knowledge of server support for the protocol, the
-          client connection preface is sent upon connection establishment.
-        </t>
-        <t>
-          <list>
-            <t>
-              The client connection preface is selected so that a large proportion of HTTP/1.1 or
-              HTTP/1.0 servers and intermediaries do not attempt to process further frames.  Note
-              that this does not address the concerns raised in <xref target="TALKING"/>.
-            </t>
-          </list>
-        </t>
-        <t>
-          The server connection preface consists of a potentially empty <x:ref>SETTINGS</x:ref>
-          frame (<xref target="SETTINGS"/>) that MUST be the first frame the server sends in the
-          HTTP/2 connection.
-        </t>
-        <t>
-          The <x:ref>SETTINGS</x:ref> frames received from a peer as part of the connection preface
-          MUST be acknowledged (see <xref target="SettingsSync"/>) after sending the connection
-          preface.
-        </t>
-        <t>
-          To avoid unnecessary latency, clients are permitted to send additional frames to the
-          server immediately after sending the client connection preface, without waiting to receive
-          the server connection preface.  It is important to note, however, that the server
-          connection preface <x:ref>SETTINGS</x:ref> frame might include parameters that necessarily
-          alter how a client is expected to communicate with the server. Upon receiving the
-          <x:ref>SETTINGS</x:ref> frame, the client is expected to honor any parameters established.
-          In some configurations, it is possible for the server to transmit <x:ref>SETTINGS</x:ref>
-          before the client sends additional frames, providing an opportunity to avoid this issue.
-        </t>
-        <t>
-          Clients and servers MUST treat an invalid connection preface as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.  A <x:ref>GOAWAY</x:ref> frame (<xref target="GOAWAY"/>)
-          MAY be omitted in this case, since an invalid preface indicates that the peer is not using
-          HTTP/2.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="FramingLayer" title="HTTP Frames">
-      <t>
-        Once the HTTP/2 connection is established, endpoints can begin exchanging frames.
-      </t>
-
-      <section anchor="FrameHeader" title="Frame Format">
-        <t>
-          All frames begin with a fixed 9-octet header followed by a variable-length payload.
-        </t>
-        <figure title="Frame Layout">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |                 Length (24)                   |
- +---------------+---------------+---------------+
- |   Type (8)    |   Flags (8)   |
- +-+-+-----------+---------------+-------------------------------+
- |R|                 Stream Identifier (31)                      |
- +=+=============================================================+
- |                   Frame Payload (0...)                      ...
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The fields of the frame header are defined as:
-          <list style="hanging">
-            <x:lt hangText="Length:">
-              <t>
-                The length of the frame payload expressed as an unsigned 24-bit integer.  Values
-                greater than 2<x:sup>14</x:sup> (16,384) MUST NOT be sent unless the receiver has
-                set a larger value for <x:ref>SETTINGS_MAX_FRAME_SIZE</x:ref>.
-              </t>
-              <t>
-                The 9 octets of the frame header are not included in this value.
-              </t>
-            </x:lt>
-            <x:lt hangText="Type:">
-              <t>
-                The 8-bit type of the frame.  The frame type determines the format and semantics of
-                the frame.  Implementations MUST ignore and discard any frame that has a type that
-                is unknown.
-              </t>
-            </x:lt>
-            <x:lt hangText="Flags:">
-              <t>
-                An 8-bit field reserved for frame-type specific boolean flags.
-              </t>
-              <t>
-                Flags are assigned semantics specific to the indicated frame type.  Flags that have
-                no defined semantics for a particular frame type MUST be ignored, and MUST be left
-                unset (0) when sending.
-              </t>
-            </x:lt>
-            <x:lt hangText="R:">
-              <t>
-                A reserved 1-bit field.  The semantics of this bit are undefined and the bit MUST
-                remain unset (0) when sending and MUST be ignored when receiving.
-              </t>
-            </x:lt>
-            <x:lt hangText="Stream Identifier:">
-              <t>
-                A 31-bit stream identifier (see <xref target="StreamIdentifiers"/>).  The value 0 is
-                reserved for frames that are associated with the connection as a whole as opposed to
-                an individual stream.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-        <t>
-          The structure and content of the frame payload is dependent entirely on the frame type.
-        </t>
-      </section>
-
-      <section anchor="FrameSize" title="Frame Size">
-        <t>
-          The size of a frame payload is limited by the maximum size that a receiver advertises in
-          the <x:ref>SETTINGS_MAX_FRAME_SIZE</x:ref> setting.  This setting can have any value
-          between 2<x:sup>14</x:sup> (16,384) and 2<x:sup>24</x:sup>-1 (16,777,215) octets,
-          inclusive.
-        </t>
-        <t>
-          All implementations MUST be capable of receiving and minimally processing frames up to
-          2<x:sup>14</x:sup> octets in length, plus the 9 octet <xref target="FrameHeader">frame
-          header</xref>.  The size of the frame header is not included when describing frame sizes.
-          <list style="hanging">
-            <t hangText="Note:">
-              Certain frame types, such as <xref target="PING">PING</xref>, impose additional limits
-              on the amount of payload data allowed.
-            </t>
-          </list>
-        </t>
-        <t>
-          If a frame size exceeds any defined limit, or is too small to contain mandatory frame
-          data, the endpoint MUST send a <x:ref>FRAME_SIZE_ERROR</x:ref> error. A frame size error
-          in a frame that could alter the state of the entire connection MUST be treated as a <xref
-          target="ConnectionErrorHandler">connection error</xref>; this includes any frame carrying
-          a <xref target="HeaderBlock">header block</xref> (that is, <x:ref>HEADERS</x:ref>,
-          <x:ref>PUSH_PROMISE</x:ref>, and <x:ref>CONTINUATION</x:ref>), <x:ref>SETTINGS</x:ref>,
-          and any <x:ref>WINDOW_UPDATE</x:ref> frame with a stream identifier of 0.
-        </t>
-        <t>
-          Endpoints are not obligated to use all available space in a frame. Responsiveness can be
-          improved by using frames that are smaller than the permitted maximum size. Sending large
-          frames can result in delays in sending time-sensitive frames (such
-          <x:ref>RST_STREAM</x:ref>, <x:ref>WINDOW_UPDATE</x:ref>, or <x:ref>PRIORITY</x:ref>)
-          which if blocked by the transmission of a large frame, could affect performance.
-        </t>
-      </section>
-
-      <section anchor="HeaderBlock" title="Header Compression and Decompression">
-        <t>
-          Just as in HTTP/1, a header field in HTTP/2 is a name with one or more associated values.
-          They are used within HTTP request and response messages as well as server push operations
-          (see <xref target="PushResources" />).
-        </t>
-        <t>
-          Header lists are collections of zero or more header fields.  When transmitted over a
-          connection, a header list is serialized into a header block using <xref
-          target="COMPRESSION">HTTP Header Compression</xref>.  The serialized header block is then
-          divided into one or more octet sequences, called header block fragments, and transmitted
-          within the payload of <xref target="HEADERS">HEADERS</xref>, <xref
-          target="PUSH_PROMISE">PUSH_PROMISE</xref> or <xref
-          target="CONTINUATION">CONTINUATION</xref> frames.
-        </t>
-        <t>
-          The <xref target="COOKIE">Cookie header field</xref> is treated specially by the HTTP
-          mapping (see <xref target="CompressCookie"/>).
-        </t>
-        <t>
-          A receiving endpoint reassembles the header block by concatenating its fragments, then
-          decompresses the block to reconstruct the header list.
-        </t>
-        <t>
-          A complete header block consists of either:
-          <list style="symbols">
-            <t>
-              a single <x:ref>HEADERS</x:ref> or <x:ref>PUSH_PROMISE</x:ref> frame,
-              with the END_HEADERS flag set, or
-            </t>
-            <t>
-              a <x:ref>HEADERS</x:ref> or <x:ref>PUSH_PROMISE</x:ref> frame with the END_HEADERS
-              flag cleared and one or more <x:ref>CONTINUATION</x:ref> frames,
-              where the last <x:ref>CONTINUATION</x:ref> frame has the END_HEADERS flag set.
-            </t>
-          </list>
-        </t>
-        <t>
-          Header compression is stateful.  One compression context and one decompression context is
-          used for the entire connection.  Each header block is processed as a discrete unit.
-          Header blocks MUST be transmitted as a contiguous sequence of frames, with no interleaved
-          frames of any other type or from any other stream.  The last frame in a sequence of
-          <x:ref>HEADERS</x:ref> or <x:ref>CONTINUATION</x:ref> frames MUST have the END_HEADERS
-          flag set.  The last frame in a sequence of <x:ref>PUSH_PROMISE</x:ref> or
-          <x:ref>CONTINUATION</x:ref> frames MUST have the END_HEADERS flag set.  This allows a
-          header block to be logically equivalent to a single frame.
-        </t>
-        <t>
-          Header block fragments can only be sent as the payload of <x:ref>HEADERS</x:ref>,
-          <x:ref>PUSH_PROMISE</x:ref> or <x:ref>CONTINUATION</x:ref> frames, because these frames
-          carry data that can modify the compression context maintained by a receiver.  An endpoint
-          receiving <x:ref>HEADERS</x:ref>, <x:ref>PUSH_PROMISE</x:ref> or
-          <x:ref>CONTINUATION</x:ref> frames MUST reassemble header blocks and perform decompression
-          even if the frames are to be discarded.  A receiver MUST terminate the connection with a
-          <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>COMPRESSION_ERROR</x:ref> if it does not decompress a header block.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="StreamsLayer" title="Streams and Multiplexing">
-      <t>
-        A "stream" is an independent, bi-directional sequence of frames exchanged between the client
-        and server within an HTTP/2 connection.  Streams have several important characteristics:
-        <list style="symbols">
-          <t>
-            A single HTTP/2 connection can contain multiple concurrently open streams, with either
-            endpoint interleaving frames from multiple streams.
-          </t>
-          <t>
-            Streams can be established and used unilaterally or shared by either the client or
-            server.
-          </t>
-          <t>
-            Streams can be closed by either endpoint.
-          </t>
-          <t>
-            The order in which frames are sent on a stream is significant. Recipients process frames
-            in the order they are received.  In particular, the order of <x:ref>HEADERS</x:ref>,
-            and <x:ref>DATA</x:ref> frames is semantically significant.
-          </t>
-          <t>
-            Streams are identified by an integer.  Stream identifiers are assigned to streams by the
-            endpoint initiating the stream.
-          </t>
-        </list>
-      </t>
-
-      <section anchor="StreamStates" title="Stream States">
-        <t>
-          The lifecycle of a stream is shown in <xref target="StreamStatesFigure"/>.
-        </t>
-
-        <figure anchor="StreamStatesFigure" title="Stream States">
-          <artwork type="drawing">
-            <![CDATA[
-                           +--------+
-                     PP    |        |    PP
-                  ,--------|  idle  |--------.
-                 /         |        |         \
-                v          +--------+          v
-         +----------+          |           +----------+
-         |          |          | H         |          |
-     ,---| reserved |          |           | reserved |---.
-     |   | (local)  |          v           | (remote) |   |
-     |   +----------+      +--------+      +----------+   |
-     |      |          ES  |        |  ES          |      |
-     |      | H    ,-------|  open  |-------.      | H    |
-     |      |     /        |        |        \     |      |
-     |      v    v         +--------+         v    v      |
-     |   +----------+          |           +----------+   |
-     |   |   half   |          |           |   half   |   |
-     |   |  closed  |          | R         |  closed  |   |
-     |   | (remote) |          |           | (local)  |   |
-     |   +----------+          |           +----------+   |
-     |        |                v                 |        |
-     |        |  ES / R    +--------+  ES / R    |        |
-     |        `----------->|        |<-----------'        |
-     |  R                  | closed |                  R  |
-     `-------------------->|        |<--------------------'
-                           +--------+
-
-       H:  HEADERS frame (with implied CONTINUATIONs)
-       PP: PUSH_PROMISE frame (with implied CONTINUATIONs)
-       ES: END_STREAM flag
-       R:  RST_STREAM frame
-]]>
-          </artwork>
-        </figure>
-
-        <t>
-          Note that this diagram shows stream state transitions and the frames and flags that affect
-          those transitions only.  In this regard, <x:ref>CONTINUATION</x:ref> frames do not result
-          in state transitions; they are effectively part of the <x:ref>HEADERS</x:ref> or
-          <x:ref>PUSH_PROMISE</x:ref> that they follow.  For this purpose, the END_STREAM flag is
-          processed as a separate event to the frame that bears it; a <x:ref>HEADERS</x:ref> frame
-          with the END_STREAM flag set can cause two state transitions.
-        </t>
-        <t>
-          Both endpoints have a subjective view of the state of a stream that could be different
-          when frames are in transit.  Endpoints do not coordinate the creation of streams; they are
-          created unilaterally by either endpoint.  The negative consequences of a mismatch in
-          states are limited to the "closed" state after sending <x:ref>RST_STREAM</x:ref>, where
-          frames might be received for some time after closing.
-        </t>
-        <t>
-          Streams have the following states:
-          <list style="hanging">
-
-            <x:lt hangText="idle:">
-              <t>
-                <vspace blankLines="0"/>
-                All streams start in the "idle" state.  In this state, no frames have been
-                exchanged.
-              </t>
-              <t>
-                The following transitions are valid from this state:
-                <list style="symbols">
-                  <t>
-                    Sending or receiving a <x:ref>HEADERS</x:ref> frame causes the stream to become
-                    "open".  The stream identifier is selected as described in <xref
-                    target="StreamIdentifiers"/>.  The same <x:ref>HEADERS</x:ref> frame can also
-                    cause a stream to immediately become "half closed".
-                  </t>
-                  <t>
-                    Sending a <x:ref>PUSH_PROMISE</x:ref> frame marks the associated stream for
-                    later use.  The stream state for the reserved stream transitions to "reserved
-                    (local)".
-                  </t>
-                  <t>
-                    Receiving a <x:ref>PUSH_PROMISE</x:ref> frame marks the associated stream as
-                    reserved by the remote peer.  The state of the stream becomes "reserved
-                    (remote)".
-                  </t>
-                </list>
-              </t>
-              <t>
-                Receiving any frames other than <x:ref>HEADERS</x:ref> or
-                <x:ref>PUSH_PROMISE</x:ref> on a stream in this state MUST be treated as a <xref
-                target="ConnectionErrorHandler">connection error</xref> of type
-                <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-
-            <x:lt hangText="reserved (local):">
-              <t>
-                <vspace blankLines="0"/>
-                A stream in the "reserved (local)" state is one that has been promised by sending a
-                <x:ref>PUSH_PROMISE</x:ref> frame.  A <x:ref>PUSH_PROMISE</x:ref> frame reserves an
-                idle stream by associating the stream with an open stream that was initiated by the
-                remote peer (see <xref target="PushResources"/>).
-              </t>
-              <t>
-                In this state, only the following transitions are possible:
-                <list style="symbols">
-                  <t>
-                    The endpoint can send a <x:ref>HEADERS</x:ref> frame.  This causes the stream to
-                    open in a "half closed (remote)" state.
-                  </t>
-                  <t>
-                    Either endpoint can send a <x:ref>RST_STREAM</x:ref> frame to cause the stream
-                    to become "closed".  This releases the stream reservation.
-                  </t>
-                </list>
-              </t>
-              <t>
-                An endpoint MUST NOT send any type of frame other than <x:ref>HEADERS</x:ref> or
-                <x:ref>RST_STREAM</x:ref> in this state.
-              </t>
-              <t>
-                A <x:ref>PRIORITY</x:ref> frame MAY be received in this state.  Receiving any type
-                of frame other than <x:ref>RST_STREAM</x:ref> or <x:ref>PRIORITY</x:ref> on a stream
-                in this state MUST be treated as a <xref target="ConnectionErrorHandler">connection
-                error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-
-            <x:lt hangText="reserved (remote):">
-              <t>
-                <vspace blankLines="0"/>
-                A stream in the "reserved (remote)" state has been reserved by a remote peer.
-              </t>
-              <t>
-                In this state, only the following transitions are possible:
-                <list style="symbols">
-                  <t>
-                    Receiving a <x:ref>HEADERS</x:ref> frame causes the stream to transition to
-                    "half closed (local)".
-                  </t>
-                  <t>
-                    Either endpoint can send a <x:ref>RST_STREAM</x:ref> frame to cause the stream
-                    to become "closed".  This releases the stream reservation.
-                  </t>
-                </list>
-              </t>
-              <t>
-                An endpoint MAY send a <x:ref>PRIORITY</x:ref> frame in this state to reprioritize
-                the reserved stream.  An endpoint MUST NOT send any type of frame other than
-                <x:ref>RST_STREAM</x:ref>, <x:ref>WINDOW_UPDATE</x:ref>, or <x:ref>PRIORITY</x:ref>
-                in this state.
-              </t>
-              <t>
-                Receiving any type of frame other than <x:ref>HEADERS</x:ref> or
-                <x:ref>RST_STREAM</x:ref> on a stream in this state MUST be treated as a <xref
-                target="ConnectionErrorHandler">connection error</xref> of type
-                <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-
-            <x:lt hangText="open:">
-              <t>
-                <vspace blankLines="0"/>
-                A stream in the "open" state may be used by both peers to send frames of any type.
-                In this state, sending peers observe advertised <xref target="FlowControl">stream
-                level flow control limits</xref>.
-              </t>
-              <t>
-                From this state either endpoint can send a frame with an END_STREAM flag set, which
-                causes the stream to transition into one of the "half closed" states: an endpoint
-                sending an END_STREAM flag causes the stream state to become "half closed (local)";
-                an endpoint receiving an END_STREAM flag causes the stream state to become "half
-                closed (remote)".
-              </t>
-              <t>
-                Either endpoint can send a <x:ref>RST_STREAM</x:ref> frame from this state, causing
-                it to transition immediately to "closed".
-              </t>
-            </x:lt>
-
-            <x:lt hangText="half closed (local):">
-              <t>
-                <vspace blankLines="0"/>
-                A stream that is in the "half closed (local)" state cannot be used for sending
-                frames.  Only <x:ref>WINDOW_UPDATE</x:ref>, <x:ref>PRIORITY</x:ref> and
-                <x:ref>RST_STREAM</x:ref> frames can be sent in this state.
-              </t>
-              <t>
-                A stream transitions from this state to "closed" when a frame that contains an
-                END_STREAM flag is received, or when either peer sends a <x:ref>RST_STREAM</x:ref>
-                frame.
-              </t>
-              <t>
-                A receiver can ignore <x:ref>WINDOW_UPDATE</x:ref> frames in this state, which might
-                arrive for a short period after a frame bearing the END_STREAM flag is sent.
-              </t>
-              <t>
-                <x:ref>PRIORITY</x:ref> frames received in this state are used to reprioritize
-                streams that depend on the current stream.
-              </t>
-            </x:lt>
-
-            <x:lt hangText="half closed (remote):">
-              <t>
-                <vspace blankLines="0"/>
-                A stream that is "half closed (remote)" is no longer being used by the peer to send
-                frames.  In this state, an endpoint is no longer obligated to maintain a receiver
-                flow control window if it performs flow control.
-              </t>
-              <t>
-                If an endpoint receives additional frames for a stream that is in this state, other
-                than <x:ref>WINDOW_UPDATE</x:ref>, <x:ref>PRIORITY</x:ref> or
-                <x:ref>RST_STREAM</x:ref>, it MUST respond with a <xref
-                target="StreamErrorHandler">stream error</xref> of type
-                <x:ref>STREAM_CLOSED</x:ref>.
-              </t>
-              <t>
-                A stream that is "half closed (remote)" can be used by the endpoint to send frames
-                of any type. In this state, the endpoint continues to observe advertised <xref
-                target="FlowControl">stream level flow control limits</xref>.
-              </t>
-              <t>
-                A stream can transition from this state to "closed" by sending a frame that contains
-                an END_STREAM flag, or when either peer sends a <x:ref>RST_STREAM</x:ref> frame.
-              </t>
-            </x:lt>
-
-            <x:lt hangText="closed:">
-              <t>
-                <vspace blankLines="0"/>
-                The "closed" state is the terminal state.
-              </t>
-              <t>
-                An endpoint MUST NOT send frames other than <x:ref>PRIORITY</x:ref> on a closed
-                stream.  An endpoint that receives any frame other than <x:ref>PRIORITY</x:ref>
-                after receiving a <x:ref>RST_STREAM</x:ref> MUST treat that as a <xref
-                target="StreamErrorHandler">stream error</xref> of type
-                <x:ref>STREAM_CLOSED</x:ref>.  Similarly, an endpoint that receives any frames after
-                receiving a frame with the END_STREAM flag set MUST treat that as a <xref
-                target="ConnectionErrorHandler">connection error</xref> of type
-                <x:ref>STREAM_CLOSED</x:ref>, unless the frame is permitted as described below.
-              </t>
-              <t>
-                <x:ref>WINDOW_UPDATE</x:ref> or <x:ref>RST_STREAM</x:ref> frames can be received in
-                this state for a short period after a <x:ref>DATA</x:ref> or <x:ref>HEADERS</x:ref>
-                frame containing an END_STREAM flag is sent.  Until the remote peer receives and
-                processes <x:ref>RST_STREAM</x:ref> or the frame bearing the END_STREAM flag, it
-                might send frames of these types.  Endpoints MUST ignore
-                <x:ref>WINDOW_UPDATE</x:ref> or <x:ref>RST_STREAM</x:ref> frames received in this
-                state, though endpoints MAY choose to treat frames that arrive a significant time
-                after sending END_STREAM as a <xref target="ConnectionErrorHandler">connection
-                error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-              <t>
-                <x:ref>PRIORITY</x:ref> frames can be sent on closed streams to prioritize streams
-                that are dependent on the closed stream.  Endpoints SHOULD process
-                <x:ref>PRIORITY</x:ref> frame, though they can be ignored if the stream has been
-                removed from the dependency tree (see <xref target="priority-gc"/>).
-              </t>
-              <t>
-                If this state is reached as a result of sending a <x:ref>RST_STREAM</x:ref> frame,
-                the peer that receives the <x:ref>RST_STREAM</x:ref> might have already sent - or
-                enqueued for sending - frames on the stream that cannot be withdrawn.  An endpoint
-                MUST ignore frames that it receives on closed streams after it has sent a
-                <x:ref>RST_STREAM</x:ref> frame.  An endpoint MAY choose to limit the period over
-                which it ignores frames and treat frames that arrive after this time as being in
-                error.
-              </t>
-              <t>
-                Flow controlled frames (i.e., <x:ref>DATA</x:ref>) received after sending
-                <x:ref>RST_STREAM</x:ref> are counted toward the connection flow control window.
-                Even though these frames might be ignored, because they are sent before the sender
-                receives the <x:ref>RST_STREAM</x:ref>, the sender will consider the frames to count
-                against the flow control window.
-              </t>
-              <t>
-                An endpoint might receive a <x:ref>PUSH_PROMISE</x:ref> frame after it sends
-                <x:ref>RST_STREAM</x:ref>.  <x:ref>PUSH_PROMISE</x:ref> causes a stream to become
-                "reserved" even if the associated stream has been reset.  Therefore, a
-                <x:ref>RST_STREAM</x:ref> is needed to close an unwanted promised stream.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-        <t>
-          In the absence of more specific guidance elsewhere in this document, implementations
-          SHOULD treat the receipt of a frame that is not expressly permitted in the description of
-          a state as a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.  Frame of unknown types are ignored.
-        </t>
-        <t>
-          An example of the state transitions for an HTTP request/response exchange can be found in
-          <xref target="HttpSequence"/>.  An example of the state transitions for server push can be
-          found in <xref target="PushRequests"/> and <xref target="PushResponses"/>.
-        </t>
-
-        <section anchor="StreamIdentifiers" title="Stream Identifiers">
-          <t>
-            Streams are identified with an unsigned 31-bit integer.  Streams initiated by a client
-            MUST use odd-numbered stream identifiers; those initiated by the server MUST use
-            even-numbered stream identifiers.  A stream identifier of zero (0x0) is used for
-            connection control messages; the stream identifier zero cannot be used to establish a
-            new stream.
-          </t>
-          <t>
-            HTTP/1.1 requests that are upgraded to HTTP/2 (see <xref target="discover-http"/>) are
-            responded to with a stream identifier of one (0x1).  After the upgrade
-            completes, stream 0x1 is "half closed (local)" to the client.  Therefore, stream 0x1
-            cannot be selected as a new stream identifier by a client that upgrades from HTTP/1.1.
-          </t>
-          <t>
-            The identifier of a newly established stream MUST be numerically greater than all
-            streams that the initiating endpoint has opened or reserved.  This governs streams that
-            are opened using a <x:ref>HEADERS</x:ref> frame and streams that are reserved using
-            <x:ref>PUSH_PROMISE</x:ref>.  An endpoint that receives an unexpected stream identifier
-            MUST respond with a <xref target="ConnectionErrorHandler">connection error</xref> of
-            type <x:ref>PROTOCOL_ERROR</x:ref>.
-          </t>
-          <t>
-            The first use of a new stream identifier implicitly closes all streams in the "idle"
-            state that might have been initiated by that peer with a lower-valued stream identifier.
-            For example, if a client sends a <x:ref>HEADERS</x:ref> frame on stream 7 without ever
-            sending a frame on stream 5, then stream 5 transitions to the "closed" state when the
-            first frame for stream 7 is sent or received.
-          </t>
-          <t>
-            Stream identifiers cannot be reused.  Long-lived connections can result in an endpoint
-            exhausting the available range of stream identifiers.  A client that is unable to
-            establish a new stream identifier can establish a new connection for new streams.  A
-            server that is unable to establish a new stream identifier can send a
-            <x:ref>GOAWAY</x:ref> frame so that the client is forced to open a new connection for
-            new streams.
-          </t>
-        </section>
-
-        <section title="Stream Concurrency">
-          <t>
-            A peer can limit the number of concurrently active streams using the
-            <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref> parameter (see <xref
-            target="SettingValues"/>) within a <x:ref>SETTINGS</x:ref> frame. The maximum concurrent
-            streams setting is specific to each endpoint and applies only to the peer that receives
-            the setting. That is, clients specify the maximum number of concurrent streams the
-            server can initiate, and servers specify the maximum number of concurrent streams the
-            client can initiate.
-          </t>
-          <t>
-            Streams that are in the "open" state, or either of the "half closed" states count toward
-            the maximum number of streams that an endpoint is permitted to open.  Streams in any of
-            these three states count toward the limit advertised in the
-            <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref> setting.  Streams in either of the
-            "reserved" states do not count toward the stream limit.
-          </t>
-          <t>
-            Endpoints MUST NOT exceed the limit set by their peer.  An endpoint that receives a
-            <x:ref>HEADERS</x:ref> frame that causes their advertised concurrent stream limit to be
-            exceeded MUST treat this as a <xref target="StreamErrorHandler">stream error</xref>.  An
-            endpoint that wishes to reduce the value of
-            <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref> to a value that is below the current
-            number of open streams can either close streams that exceed the new value or allow
-            streams to complete.
-          </t>
-        </section>
-      </section>
-
-     <section anchor="FlowControl" title="Flow Control">
-        <t>
-          Using streams for multiplexing introduces contention over use of the TCP connection,
-          resulting in blocked streams.  A flow control scheme ensures that streams on the same
-          connection do not destructively interfere with each other.  Flow control is used for both
-          individual streams and for the connection as a whole.
-        </t>
-        <t>
-          HTTP/2 provides for flow control through use of the <xref
-          target="WINDOW_UPDATE">WINDOW_UPDATE frame</xref>.
-        </t>
-
-        <section anchor="fc-principles" title="Flow Control Principles">
-          <t>
-            HTTP/2 stream flow control aims to allow a variety of flow control algorithms to be
-            used without requiring protocol changes. Flow control in HTTP/2 has the following
-            characteristics:
-            <list style="numbers">
-              <t>
-                Flow control is specific to a connection; i.e., it is "hop-by-hop", not
-                "end-to-end".
-              </t>
-              <t>
-                Flow control is based on window update frames.  Receivers advertise how many octets
-                they are prepared to receive on a stream and for the entire connection.  This is a
-                credit-based scheme.
-              </t>
-              <t>
-                Flow control is directional with overall control provided by the receiver.  A
-                receiver MAY choose to set any window size that it desires for each stream and for
-                the entire connection.  A sender MUST respect flow control limits imposed by a
-                receiver.  Clients, servers and intermediaries all independently advertise their
-                flow control window as a receiver and abide by the flow control limits set by
-                their peer when sending.
-              </t>
-              <t>
-                The initial value for the flow control window is 65,535 octets for both new streams
-                and the overall connection.
-              </t>
-              <t>
-                The frame type determines whether flow control applies to a frame.  Of the frames
-                specified in this document, only <x:ref>DATA</x:ref> frames are subject to flow
-                control; all other frame types do not consume space in the advertised flow control
-                window.  This ensures that important control frames are not blocked by flow control.
-              </t>
-              <t>
-                Flow control cannot be disabled.
-              </t>
-              <t>
-                HTTP/2 defines only the format and semantics of the <x:ref>WINDOW_UPDATE</x:ref>
-                frame (<xref target="WINDOW_UPDATE"/>).  This document does not stipulate how a
-                receiver decides when to send this frame or the value that it sends, nor does it
-                specify how a sender chooses to send packets.  Implementations are able to select
-                any algorithm that suits their needs.
-              </t>
-            </list>
-          </t>
-          <t>
-            Implementations are also responsible for managing how requests and responses are sent
-            based on priority; choosing how to avoid head of line blocking for requests; and
-            managing the creation of new streams.  Algorithm choices for these could interact with
-            any flow control algorithm.
-          </t>
-        </section>
-
-        <section anchor="DisableFlowControl" title="Appropriate Use of Flow Control">
-          <t>
-            Flow control is defined to protect endpoints that are operating under resource
-            constraints.  For example, a proxy needs to share memory between many connections, and
-            also might have a slow upstream connection and a fast downstream one.  Flow control
-            addresses cases where the receiver is unable process data on one stream, yet wants to
-            continue to process other streams in the same connection.
-          </t>
-          <t>
-            Deployments that do not require this capability can advertise a flow control window of
-            the maximum size, incrementing the available space when new data is received.  This
-            effectively disables flow control for that receiver.  Conversely, a sender is always
-            subject to the flow control window advertised by the receiver.
-          </t>
-          <t>
-            Deployments with constrained resources (for example, memory) can employ flow control to
-            limit the amount of memory a peer can consume.  Note, however, that this can lead to
-            suboptimal use of available network resources if flow control is enabled without
-            knowledge of the bandwidth-delay product (see <xref target="RFC1323"/>).
-          </t>
-          <t>
-            Even with full awareness of the current bandwidth-delay product, implementation of flow
-            control can be difficult.  When using flow control, the receiver MUST read from the TCP
-            receive buffer in a timely fashion.  Failure to do so could lead to a deadlock when
-            critical frames, such as <x:ref>WINDOW_UPDATE</x:ref>, are not read and acted upon.
-          </t>
-        </section>
-      </section>
-
-      <section anchor="StreamPriority" title="Stream priority">
-        <t>
-          A client can assign a priority for a new stream by including prioritization information in
-          the <xref target="HEADERS">HEADERS frame</xref> that opens the stream.  For an existing
-          stream, the <xref target="PRIORITY">PRIORITY frame</xref> can be used to change the
-          priority.
-        </t>
-        <t>
-          The purpose of prioritization is to allow an endpoint to express how it would prefer its
-          peer allocate resources when managing concurrent streams.  Most importantly, priority can
-          be used to select streams for transmitting frames when there is limited capacity for
-          sending.
-        </t>
-        <t>
-          Streams can be prioritized by marking them as dependent on the completion of other streams
-          (<xref target="pri-depend"/>).  Each dependency is assigned a relative weight, a number
-          that is used to determine the relative proportion of available resources that are assigned
-          to streams dependent on the same stream.
-        </t>
-        <!--
-          Note that stream dependencies have not yet been validated in practice.  The theory
-          might be fairly sound, but there are no implementations currently sending these.  If it
-          turns out that they are not useful, or actively harmful, implementations will be requested
-          to avoid creating stream dependencies.
-        -->
-        <t>
-          Explicitly setting the priority for a stream is input to a prioritization process.  It
-          does not guarantee any particular processing or transmission order for the stream relative
-          to any other stream.  An endpoint cannot force a peer to process concurrent streams in a
-          particular order using priority.  Expressing priority is therefore only ever a suggestion.
-        </t>
-        <t>
-          Providing prioritization information is optional, so default values are used if no
-          explicit indicator is provided (<xref target="pri-default"/>).
-        </t>
-
-        <section title="Stream Dependencies" anchor="pri-depend">
-          <t>
-            Each stream can be given an explicit dependency on another stream.  Including a
-            dependency expresses a preference to allocate resources to the identified stream rather
-            than to the dependent stream.
-          </t>
-          <t>
-            A stream that is not dependent on any other stream is given a stream dependency of 0x0.
-            In other words, the non-existent stream 0 forms the root of the tree.
-          </t>
-          <t>
-            A stream that depends on another stream is a dependent stream. The stream upon which a
-            stream is dependent is a parent stream. A dependency on a stream that is not currently
-            in the tree - such as a stream in the "idle" state - results in that stream being given
-            a <xref target="pri-default">default priority</xref>.
-          </t>
-          <t>
-            When assigning a dependency on another stream, the stream is added as a new dependency
-            of the parent stream.  Dependent streams that share the same parent are not ordered with
-            respect to each other.  For example, if streams B and C are dependent on stream A, and
-            if stream D is created with a dependency on stream A, this results in a dependency order
-            of A followed by B, C, and D in any order.
-          </t>
-          <figure title="Example of Default Dependency Creation">
-            <artwork type="inline"><![CDATA[
-    A                 A
-   / \      ==>      /|\
-  B   C             B D C
-]]></artwork>
-          </figure>
-          <t>
-            An exclusive flag allows for the insertion of a new level of dependencies.  The
-            exclusive flag causes the stream to become the sole dependency of its parent stream,
-            causing other dependencies to become dependent on the exclusive stream.  In the
-            previous example, if stream D is created with an exclusive dependency on stream A, this
-            results in D becoming the dependency parent of B and C.
-          </t>
-          <figure title="Example of Exclusive Dependency Creation">
-            <artwork type="inline"><![CDATA[
-                      A
-    A                 |
-   / \      ==>       D
-  B   C              / \
-                    B   C
-]]></artwork>
-          </figure>
-          <t>
-            Inside the dependency tree, a dependent stream SHOULD only be allocated resources if all
-            of the streams that it depends on (the chain of parent streams up to 0x0) are either
-            closed, or it is not possible to make progress on them.
-          </t>
-          <t>
-            A stream cannot depend on itself.  An endpoint MUST treat this as a <xref
-            target="StreamErrorHandler">stream error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-          </t>
-        </section>
-
-        <section title="Dependency Weighting">
-          <t>
-            All dependent streams are allocated an integer weight between 1 and 256 (inclusive).
-          </t>
-          <t>
-            Streams with the same parent SHOULD be allocated resources proportionally based on their
-            weight.  Thus, if stream B depends on stream A with weight 4, and C depends on stream A
-            with weight 12, and if no progress can be made on A, stream B ideally receives one third
-            of the resources allocated to stream C.
-          </t>
-        </section>
-
-        <section anchor="reprioritize" title="Reprioritization">
-          <t>
-            Stream priorities are changed using the <x:ref>PRIORITY</x:ref> frame.  Setting a
-            dependency causes a stream to become dependent on the identified parent stream.
-          </t>
-          <t>
-            Dependent streams move with their parent stream if the parent is reprioritized.  Setting
-            a dependency with the exclusive flag for a reprioritized stream moves all the
-            dependencies of the new parent stream to become dependent on the reprioritized stream.
-          </t>
-          <t>
-            If a stream is made dependent on one of its own dependencies, the formerly dependent
-            stream is first moved to be dependent on the reprioritized stream's previous parent.
-            The moved dependency retains its weight.
-          </t>
-          <figure title="Example of Dependency Reordering">
-            <preamble>
-              For example, consider an original dependency tree where B and C depend on A, D and E
-              depend on C, and F depends on D.  If A is made dependent on D, then D takes the place
-              of A.  All other dependency relationships stay the same, except for F, which becomes
-              dependent on A if the reprioritization is exclusive.
-            </preamble>
-            <artwork type="inline"><![CDATA[
-    ?                ?                ?                 ?
-    |               / \               |                 |
-    A              D   A              D                 D
-   / \            /   / \            / \                |
-  B   C     ==>  F   B   C   ==>    F   A       OR      A
-     / \                 |             / \             /|\
-    D   E                E            B   C           B C F
-    |                                     |             |
-    F                                     E             E
-               (intermediate)   (non-exclusive)    (exclusive)
-]]></artwork>
-          </figure>
-        </section>
-
-        <section anchor="priority-gc" title="Prioritization State Management">
-          <t>
-            When a stream is removed from the dependency tree, its dependencies can be moved to
-            become dependent on the parent of the closed stream.  The weights of new dependencies
-            are recalculated by distributing the weight of the dependency of the closed stream
-            proportionally based on the weights of its dependencies.
-          </t>
-          <t>
-            Streams that are removed from the dependency tree cause some prioritization information
-            to be lost.  Resources are shared between streams with the same parent stream, which
-            means that if a stream in that set closes or becomes blocked, any spare capacity
-            allocated to a stream is distributed to the immediate neighbors of the stream.  However,
-            if the common dependency is removed from the tree, those streams share resources with
-            streams at the next highest level.
-          </t>
-          <t>
-            For example, assume streams A and B share a parent, and streams C and D both depend on
-            stream A. Prior to the removal of stream A, if streams A and D are unable to proceed,
-            then stream C receives all the resources dedicated to stream A.  If stream A is removed
-            from the tree, the weight of stream A is divided between streams C and D.  If stream D
-            is still unable to proceed, this results in stream C receiving a reduced proportion of
-            resources.  For equal starting weights, C receives one third, rather than one half, of
-            available resources.
-          </t>
-          <t>
-            It is possible for a stream to become closed while prioritization information that
-            creates a dependency on that stream is in transit.  If a stream identified in a
-            dependency has no associated priority information, then the dependent stream is instead
-            assigned a <xref target="pri-default">default priority</xref>.  This potentially creates
-            suboptimal prioritization, since the stream could be given a priority that is different
-            to what is intended.
-          </t>
-          <t>
-            To avoid these problems, an endpoint SHOULD retain stream prioritization state for a
-            period after streams become closed.  The longer state is retained, the lower the chance
-            that streams are assigned incorrect or default priority values.
-          </t>
-          <t>
-            This could create a large state burden for an endpoint, so this state MAY be limited.
-            An endpoint MAY apply a fixed upper limit on the number of closed streams for which
-            prioritization state is tracked to limit state exposure.  The amount of additional state
-            an endpoint maintains could be dependent on load; under high load, prioritization state
-            can be discarded to limit resource commitments.  In extreme cases, an endpoint could
-            even discard prioritization state for active or reserved streams. If a fixed limit is
-            applied, endpoints SHOULD maintain state for at least as many streams as allowed by
-            their setting for <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref>.
-          </t>
-          <t>
-            An endpoint receiving a <x:ref>PRIORITY</x:ref> frame that changes the priority of a
-            closed stream SHOULD alter the dependencies of the streams that depend on it, if it has
-            retained enough state to do so.
-          </t>
-        </section>
-
-        <section title="Default Priorities" anchor="pri-default">
-          <t>
-            Providing priority information is optional.  Streams are assigned a non-exclusive
-            dependency on stream 0x0 by default.  <xref target="PushResources">Pushed streams</xref>
-            initially depend on their associated stream.  In both cases, streams are assigned a
-            default weight of 16.
-          </t>
-        </section>
-      </section>
-
-      <section title="Error Handling">
-        <t>
-          HTTP/2 framing permits two classes of error:
-          <list style="symbols">
-            <t>
-              An error condition that renders the entire connection unusable is a connection error.
-            </t>
-            <t>
-              An error in an individual stream is a stream error.
-            </t>
-          </list>
-        </t>
-        <t>
-          A list of error codes is included in <xref target="ErrorCodes"/>.
-        </t>
-
-        <section anchor="ConnectionErrorHandler" title="Connection Error Handling">
-          <t>
-            A connection error is any error which prevents further processing of the framing layer,
-            or which corrupts any connection state.
-          </t>
-          <t>
-            An endpoint that encounters a connection error SHOULD first send a <x:ref>GOAWAY</x:ref>
-            frame (<xref target="GOAWAY"/>) with the stream identifier of the last stream that it
-            successfully received from its peer.  The <x:ref>GOAWAY</x:ref> frame includes an error
-            code that indicates why the connection is terminating.  After sending the
-            <x:ref>GOAWAY</x:ref> frame, the endpoint MUST close the TCP connection.
-          </t>
-          <t>
-            It is possible that the <x:ref>GOAWAY</x:ref> will not be reliably received by the
-            receiving endpoint (see <xref target="RFC7230" x:fmt=","
-            x:rel="#persistent.tear-down"/>).  In the event of a connection error,
-            <x:ref>GOAWAY</x:ref> only provides a best effort attempt to communicate with the peer
-            about why the connection is being terminated.
-          </t>
-          <t>
-            An endpoint can end a connection at any time.  In particular, an endpoint MAY choose to
-            treat a stream error as a connection error.  Endpoints SHOULD send a
-            <x:ref>GOAWAY</x:ref> frame when ending a connection, providing that circumstances
-            permit it.
-          </t>
-        </section>
-
-        <section anchor="StreamErrorHandler" title="Stream Error Handling">
-          <t>
-            A stream error is an error related to a specific stream that does not affect processing
-            of other streams.
-          </t>
-          <t>
-            An endpoint that detects a stream error sends a <x:ref>RST_STREAM</x:ref> frame (<xref
-            target="RST_STREAM"/>) that contains the stream identifier of the stream where the error
-            occurred.  The <x:ref>RST_STREAM</x:ref> frame includes an error code that indicates the
-            type of error.
-          </t>
-          <t>
-            A <x:ref>RST_STREAM</x:ref> is the last frame that an endpoint can send on a stream.
-            The peer that sends the <x:ref>RST_STREAM</x:ref> frame MUST be prepared to receive any
-            frames that were sent or enqueued for sending by the remote peer.  These frames can be
-            ignored, except where they modify connection state (such as the state maintained for
-            <xref target="HeaderBlock">header compression</xref>, or flow control).
-          </t>
-          <t>
-            Normally, an endpoint SHOULD NOT send more than one <x:ref>RST_STREAM</x:ref> frame for
-            any stream. However, an endpoint MAY send additional <x:ref>RST_STREAM</x:ref> frames if
-            it receives frames on a closed stream after more than a round-trip time.  This behavior
-            is permitted to deal with misbehaving implementations.
-          </t>
-          <t>
-            An endpoint MUST NOT send a <x:ref>RST_STREAM</x:ref> in response to an
-            <x:ref>RST_STREAM</x:ref> frame, to avoid looping.
-          </t>
-        </section>
-
-        <section title="Connection Termination">
-          <t>
-            If the TCP connection is closed or reset while streams remain in open or half closed
-            states, then the endpoint MUST assume that those streams were abnormally interrupted and
-            could be incomplete.
-          </t>
-        </section>
-      </section>
-
-      <section anchor="extensibility" title="Extending HTTP/2">
-        <t>
-          HTTP/2 permits extension of the protocol.  Protocol extensions can be used to provide
-          additional services or alter any aspect of the protocol, within the limitations described
-          in this section.  Extensions are effective only within the scope of a single HTTP/2
-          connection.
-        </t>
-        <t>
-          Extensions are permitted to use new <xref target="FrameHeader">frame types</xref>, new
-          <xref target="SettingValues">settings</xref>, or new <xref target="ErrorCodes">error
-          codes</xref>.  Registries are established for managing these extension points: <xref
-          target="iana-frames">frame types</xref>, <xref target="iana-settings">settings</xref> and
-          <xref target="iana-errors">error codes</xref>.
-        </t>
-        <t>
-          Implementations MUST ignore unknown or unsupported values in all extensible protocol
-          elements.  Implementations MUST discard frames that have unknown or unsupported types.
-          This means that any of these extension points can be safely used by extensions without
-          prior arrangement or negotiation.  However, extension frames that appear in the middle of
-          a <xref target="HeaderBlock">header block</xref> are not permitted; these MUST be treated
-          as a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          However, extensions that could change the semantics of existing protocol components MUST
-          be negotiated before being used.  For example, an extension that changes the layout of the
-          <x:ref>HEADERS</x:ref> frame cannot be used until the peer has given a positive signal
-          that this is acceptable.  In this case, it could also be necessary to coordinate when the
-          revised layout comes into effect.  Note that treating any frame other than
-          <x:ref>DATA</x:ref> frames as flow controlled is such a change in semantics, and can only
-          be done through negotiation.
-        </t>
-        <t>
-          This document doesn't mandate a specific method for negotiating the use of an extension,
-          but notes that a <xref target="SettingValues">setting</xref> could be used for that
-          purpose.  If both peers set a value that indicates willingness to use the extension, then
-          the extension can be used.  If a setting is used for extension negotiation, the initial
-          value MUST be defined so that the extension is initially disabled.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="FrameTypes" title="Frame Definitions">
-      <t>
-        This specification defines a number of frame types, each identified by a unique 8-bit type
-        code. Each frame type serves a distinct purpose either in the establishment and management
-        of the connection as a whole, or of individual streams.
-      </t>
-      <t>
-        The transmission of specific frame types can alter the state of a connection. If endpoints
-        fail to maintain a synchronized view of the connection state, successful communication
-        within the connection will no longer be possible. Therefore, it is important that endpoints
-        have a shared comprehension of how the state is affected by the use any given frame.
-      </t>
-
-      <section anchor="DATA" title="DATA">
-        <t>
-          DATA frames (type=0x0) convey arbitrary, variable-length sequences of octets associated
-          with a stream. One or more DATA frames are used, for instance, to carry HTTP request or
-          response payloads.
-        </t>
-        <t>
-          DATA frames MAY also contain arbitrary padding.  Padding can be added to DATA frames to
-          obscure the size of messages.
-        </t>
-        <figure title="DATA Frame Payload">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |Pad Length? (8)|
- +---------------+-----------------------------------------------+
- |                            Data (*)                         ...
- +---------------------------------------------------------------+
- |                           Padding (*)                       ...
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The DATA frame contains the following fields:
-          <list style="hanging">
-            <t hangText="Pad Length:">
-              An 8-bit field containing the length of the frame padding in units of octets.  This
-              field is optional and is only present if the PADDED flag is set.
-            </t>
-            <t hangText="Data:">
-              Application data.  The amount of data is the remainder of the frame payload after
-              subtracting the length of the other fields that are present.
-            </t>
-            <t hangText="Padding:">
-              Padding octets that contain no application semantic value.  Padding octets MUST be set
-              to zero when sending and ignored when receiving.
-            </t>
-          </list>
-        </t>
-
-        <t>
-          The DATA frame defines the following flags:
-          <list style="hanging">
-            <t hangText="END_STREAM (0x1):">
-              Bit 1 being set indicates that this frame is the last that the endpoint will send for
-              the identified stream.  Setting this flag causes the stream to enter one of <xref
-              target="StreamStates">the "half closed" states or the "closed" state</xref>.
-            </t>
-            <t hangText="PADDED (0x8):">
-              Bit 4 being set indicates that the Pad Length field and any padding that it describes
-              is present.
-            </t>
-          </list>
-        </t>
-        <t>
-          DATA frames MUST be associated with a stream. If a DATA frame is received whose stream
-          identifier field is 0x0, the recipient MUST respond with a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          DATA frames are subject to flow control and can only be sent when a stream is in the
-          "open" or "half closed (remote)" states. The entire DATA frame payload is included in flow
-          control, including Pad Length and Padding fields if present.  If a DATA frame is received
-          whose stream is not in "open" or "half closed (local)" state, the recipient MUST respond
-          with a <xref target="StreamErrorHandler">stream error</xref> of type
-          <x:ref>STREAM_CLOSED</x:ref>.
-        </t>
-        <t>
-          The total number of padding octets is determined by the value of the Pad Length field. If
-          the length of the padding is greater than the length of the frame payload, the recipient
-          MUST treat this as a <xref target="ConnectionErrorHandler">connection error</xref> of
-          type <x:ref>PROTOCOL_ERROR</x:ref>.
-          <list style="hanging">
-            <t hangText="Note:">
-              A frame can be increased in size by one octet by including a Pad Length field with a
-              value of zero.
-            </t>
-          </list>
-        </t>
-        <t>
-          Padding is a security feature; see <xref target="padding"/>.
-        </t>
-      </section>
-
-      <section anchor="HEADERS" title="HEADERS">
-        <t>
-          The HEADERS frame (type=0x1) is used to <xref target="StreamStates">open a stream</xref>,
-          and additionally carries a header block fragment. HEADERS frames can be sent on a stream
-          in the "open" or "half closed (remote)" states.
-        </t>
-        <figure title="HEADERS Frame Payload">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |Pad Length? (8)|
- +-+-------------+-----------------------------------------------+
- |E|                 Stream Dependency? (31)                     |
- +-+-------------+-----------------------------------------------+
- |  Weight? (8)  |
- +-+-------------+-----------------------------------------------+
- |                   Header Block Fragment (*)                 ...
- +---------------------------------------------------------------+
- |                           Padding (*)                       ...
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The HEADERS frame payload has the following fields:
-          <list style="hanging">
-            <t hangText="Pad Length:">
-              An 8-bit field containing the length of the frame padding in units of octets.  This
-              field is only present if the PADDED flag is set.
-            </t>
-            <t hangText="E:">
-              A single bit flag indicates that the stream dependency is exclusive, see <xref
-              target="StreamPriority"/>.  This field is only present if the PRIORITY flag is set.
-            </t>
-            <t hangText="Stream Dependency:">
-              A 31-bit stream identifier for the stream that this stream depends on, see <xref
-              target="StreamPriority"/>.  This field is only present if the PRIORITY flag is set.
-            </t>
-            <t hangText="Weight:">
-              An 8-bit weight for the stream, see <xref target="StreamPriority"/>.  Add one to the
-              value to obtain a weight between 1 and 256.  This field is only present if the
-              PRIORITY flag is set.
-            </t>
-            <t hangText="Header Block Fragment:">
-              A <xref target="HeaderBlock">header block fragment</xref>.
-            </t>
-            <t hangText="Padding:">
-              Padding octets that contain no application semantic value.  Padding octets MUST be set
-              to zero when sending and ignored when receiving.
-            </t>
-          </list>
-        </t>
-
-        <t>
-          The HEADERS frame defines the following flags:
-          <list style="hanging">
-            <x:lt hangText="END_STREAM (0x1):">
-              <t>
-                Bit 1 being set indicates that the <xref target="HeaderBlock">header block</xref> is
-                the last that the endpoint will send for the identified stream.  Setting this flag
-                causes the stream to enter one of <xref target="StreamStates">"half closed"
-                states</xref>.
-              </t>
-              <t>
-                A HEADERS frame carries the END_STREAM flag that signals the end of a stream.
-                However, a HEADERS frame with the END_STREAM flag set can be followed by
-                <x:ref>CONTINUATION</x:ref> frames on the same stream.  Logically, the
-                <x:ref>CONTINUATION</x:ref> frames are part of the HEADERS frame.
-              </t>
-            </x:lt>
-            <x:lt hangText="END_HEADERS (0x4):">
-              <t>
-                Bit 3 being set indicates that this frame contains an entire <xref
-                target="HeaderBlock">header block</xref> and is not followed by any
-                <x:ref>CONTINUATION</x:ref> frames.
-              </t>
-              <t>
-                A HEADERS frame without the END_HEADERS flag set MUST be followed by a
-                <x:ref>CONTINUATION</x:ref> frame for the same stream.  A receiver MUST treat the
-                receipt of any other type of frame or a frame on a different stream as a <xref
-                target="ConnectionErrorHandler">connection error</xref> of type
-                <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-            <x:lt hangText="PADDED (0x8):">
-              <t>
-                Bit 4 being set indicates that the Pad Length field and any padding that it
-                describes is present.
-              </t>
-            </x:lt>
-            <x:lt hangText="PRIORITY (0x20):">
-              <t>
-                Bit 6 being set indicates that the Exclusive Flag (E), Stream Dependency, and Weight
-                fields are present; see <xref target="StreamPriority"/>.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-
-        <t>
-          The payload of a HEADERS frame contains a <xref target="HeaderBlock">header block
-          fragment</xref>.  A header block that does not fit within a HEADERS frame is continued in
-          a <xref target="CONTINUATION">CONTINUATION frame</xref>.
-        </t>
-
-        <t>
-          HEADERS frames MUST be associated with a stream. If a HEADERS frame is received whose
-          stream identifier field is 0x0, the recipient MUST respond with a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <t>
-          The HEADERS frame changes the connection state as described in <xref
-          target="HeaderBlock"/>.
-        </t>
-
-        <t>
-          The HEADERS frame includes optional padding.  Padding fields and flags are identical to
-          those defined for <xref target="DATA">DATA frames</xref>.
-        </t>
-        <t>
-          Prioritization information in a HEADERS frame is logically equivalent to a separate
-          <x:ref>PRIORITY</x:ref> frame, but inclusion in HEADERS avoids the potential for churn in
-          stream prioritization when new streams are created.  Priorization fields in HEADERS frames
-          subsequent to the first on a stream <xref target="reprioritize">reprioritize the
-          stream</xref>.
-        </t>
-      </section>
-
-      <section anchor="PRIORITY" title="PRIORITY">
-        <t>
-          The PRIORITY frame (type=0x2) specifies the <xref target="StreamPriority">sender-advised
-          priority of a stream</xref>.  It can be sent at any time for an existing stream, including
-          closed streams.  This enables reprioritization of existing streams.
-        </t>
-        <figure title="PRIORITY Frame Payload">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |E|                  Stream Dependency (31)                     |
- +-+-------------+-----------------------------------------------+
- |   Weight (8)  |
- +-+-------------+
-]]></artwork>
-        </figure>
-        <t>
-          The payload of a PRIORITY frame contains the following fields:
-          <list style="hanging">
-            <t hangText="E:">
-              A single bit flag indicates that the stream dependency is exclusive, see <xref
-              target="StreamPriority"/>.
-            </t>
-            <t hangText="Stream Dependency:">
-              A 31-bit stream identifier for the stream that this stream depends on, see <xref
-              target="StreamPriority"/>.
-            </t>
-            <t hangText="Weight:">
-              An 8-bit weight for the identified stream dependency, see <xref
-              target="StreamPriority"/>.  Add one to the value to obtain a weight between 1 and 256.
-            </t>
-          </list>
-        </t>
-
-        <t>
-          The PRIORITY frame does not define any flags.
-        </t>
-
-        <t>
-          The PRIORITY frame is associated with an existing stream. If a PRIORITY frame is received
-          with a stream identifier of 0x0, the recipient MUST respond with a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          The PRIORITY frame can be sent on a stream in any of the "reserved (remote)", "open",
-          "half closed (local)", "half closed (remote)", or "closed" states, though it cannot be
-          sent between consecutive frames that comprise a single <xref target="HeaderBlock">header
-          block</xref>.  Note that this frame could arrive after processing or frame sending has
-          completed, which would cause it to have no effect on the current stream.  For a stream
-          that is in the "half closed (remote)" or "closed" - state, this frame can only affect
-          processing of the current stream and not frame transmission.
-        </t>
-        <t>
-          The PRIORITY frame is the only frame that can be sent for a stream in the "closed" state.
-          This allows for the reprioritization of a group of dependent streams by altering the
-          priority of a parent stream, which might be closed.  However, a PRIORITY frame sent on a
-          closed stream risks being ignored due to the peer having discarded priority state
-          information for that stream.
-        </t>
-      </section>
-
-      <section anchor="RST_STREAM" title="RST_STREAM">
-        <t>
-          The RST_STREAM frame (type=0x3) allows for abnormal termination of a stream.  When sent by
-          the initiator of a stream, it indicates that they wish to cancel the stream or that an
-          error condition has occurred.  When sent by the receiver of a stream, it indicates that
-          either the receiver is rejecting the stream, requesting that the stream be cancelled, or
-          that an error condition has occurred.
-        </t>
-        <figure title="RST_STREAM Frame Payload">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |                        Error Code (32)                        |
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-
-        <t>
-          The RST_STREAM frame contains a single unsigned, 32-bit integer identifying the <xref
-          target="ErrorCodes">error code</xref>.  The error code indicates why the stream is being
-          terminated.
-        </t>
-
-        <t>
-          The RST_STREAM frame does not define any flags.
-        </t>
-
-        <t>
-          The RST_STREAM frame fully terminates the referenced stream and causes it to enter the
-          closed state. After receiving a RST_STREAM on a stream, the receiver MUST NOT send
-          additional frames for that stream, with the exception of <x:ref>PRIORITY</x:ref>. However,
-          after sending the RST_STREAM, the sending endpoint MUST be prepared to receive and process
-          additional frames sent on the stream that might have been sent by the peer prior to the
-          arrival of the RST_STREAM.
-        </t>
-
-        <t>
-          RST_STREAM frames MUST be associated with a stream.  If a RST_STREAM frame is received
-          with a stream identifier of 0x0, the recipient MUST treat this as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <t>
-          RST_STREAM frames MUST NOT be sent for a stream in the "idle" state.  If a RST_STREAM
-          frame identifying an idle stream is received, the recipient MUST treat this as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-      </section>
-
-      <section anchor="SETTINGS" title="SETTINGS">
-        <t>
-          The SETTINGS frame (type=0x4) conveys configuration parameters that affect how endpoints
-          communicate, such as preferences and constraints on peer behavior.  The SETTINGS frame is
-          also used to acknowledge the receipt of those parameters.  Individually, a SETTINGS
-          parameter can also be referred to as a "setting".
-        </t>
-        <t>
-          SETTINGS parameters are not negotiated; they describe characteristics of the sending peer,
-          which are used by the receiving peer. Different values for the same parameter can be
-          advertised by each peer. For example, a client might set a high initial flow control
-          window, whereas a server might set a lower value to conserve resources.
-        </t>
-
-        <t>
-          A SETTINGS frame MUST be sent by both endpoints at the start of a connection, and MAY be
-          sent at any other time by either endpoint over the lifetime of the connection.
-          Implementations MUST support all of the parameters defined by this specification.
-        </t>
-
-        <t>
-          Each parameter in a SETTINGS frame replaces any existing value for that parameter.
-          Parameters are processed in the order in which they appear, and a receiver of a SETTINGS
-          frame does not need to maintain any state other than the current value of its
-          parameters. Therefore, the value of a SETTINGS parameter is the last value that is seen by
-          a receiver.
-        </t>
-        <t>
-          SETTINGS parameters are acknowledged by the receiving peer. To enable this, the SETTINGS
-          frame defines the following flag:
-          <list style="hanging">
-            <t hangText="ACK (0x1):">
-              Bit 1 being set indicates that this frame acknowledges receipt and application of the
-              peer's SETTINGS frame.  When this bit is set, the payload of the SETTINGS frame MUST
-              be empty.  Receipt of a SETTINGS frame with the ACK flag set and a length field value
-              other than 0 MUST be treated as a <xref target="ConnectionErrorHandler">connection
-              error</xref> of type <x:ref>FRAME_SIZE_ERROR</x:ref>.  For more info, see <xref
-              target="SettingsSync">Settings Synchronization</xref>.
-            </t>
-          </list>
-        </t>
-        <t>
-          SETTINGS frames always apply to a connection, never a single stream.  The stream
-          identifier for a SETTINGS frame MUST be zero (0x0). If an endpoint receives a SETTINGS
-          frame whose stream identifier field is anything other than 0x0, the endpoint MUST respond
-          with a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          The SETTINGS frame affects connection state.  A badly formed or incomplete SETTINGS frame
-          MUST be treated as a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <section title="SETTINGS Format" anchor="SettingFormat">
-          <t>
-            The payload of a SETTINGS frame consists of zero or more parameters, each consisting of
-            an unsigned 16-bit setting identifier and an unsigned 32-bit value.
-          </t>
-
-          <figure title="Setting Format">
-            <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |       Identifier (16)         |
- +-------------------------------+-------------------------------+
- |                        Value (32)                             |
- +---------------------------------------------------------------+
-]]></artwork>
-          </figure>
-        </section>
-
-        <section anchor="SettingValues" title="Defined SETTINGS Parameters">
-          <t>
-            The following parameters are defined:
-            <list style="hanging">
-              <x:lt hangText="SETTINGS_HEADER_TABLE_SIZE (0x1):"
-                    anchor="SETTINGS_HEADER_TABLE_SIZE">
-                <t>
-                  Allows the sender to inform the remote endpoint of the maximum size of the header
-                  compression table used to decode header blocks, in octets. The encoder can select
-                  any size equal to or less than this value by using signaling specific to the
-                  header compression format inside a header block. The initial value is 4,096
-                  octets.
-                </t>
-              </x:lt>
-              <x:lt hangText="SETTINGS_ENABLE_PUSH (0x2):"
-                    anchor="SETTINGS_ENABLE_PUSH">
-                <t>
-                  This setting can be use to disable <xref target="PushResources">server
-                  push</xref>. An endpoint MUST NOT send a <x:ref>PUSH_PROMISE</x:ref> frame if it
-                  receives this parameter set to a value of 0. An endpoint that has both set this
-                  parameter to 0 and had it acknowledged MUST treat the receipt of a
-                  <x:ref>PUSH_PROMISE</x:ref> frame as a <xref
-                  target="ConnectionErrorHandler">connection error</xref> of type
-                  <x:ref>PROTOCOL_ERROR</x:ref>.
-                </t>
-                <t>
-                  The initial value is 1, which indicates that server push is permitted.  Any value
-                  other than 0 or 1 MUST be treated as a <xref
-                  target="ConnectionErrorHandler">connection error</xref> of type
-                  <x:ref>PROTOCOL_ERROR</x:ref>.
-                </t>
-              </x:lt>
-              <x:lt hangText="SETTINGS_MAX_CONCURRENT_STREAMS (0x3):"
-                    anchor="SETTINGS_MAX_CONCURRENT_STREAMS">
-                <t>
-                  Indicates the maximum number of concurrent streams that the sender will allow.
-                  This limit is directional: it applies to the number of streams that the sender
-                  permits the receiver to create. Initially there is no limit to this value.  It is
-                  recommended that this value be no smaller than 100, so as to not unnecessarily
-                  limit parallelism.
-                </t>
-                <t>
-                  A value of 0 for SETTINGS_MAX_CONCURRENT_STREAMS SHOULD NOT be treated as special
-                  by endpoints.  A zero value does prevent the creation of new streams, however this
-                  can also happen for any limit that is exhausted with active streams.  Servers
-                  SHOULD only set a zero value for short durations; if a server does not wish to
-                  accept requests, closing the connection could be preferable.
-                </t>
-              </x:lt>
-              <x:lt hangText="SETTINGS_INITIAL_WINDOW_SIZE (0x4):"
-                    anchor="SETTINGS_INITIAL_WINDOW_SIZE">
-                <t>
-                  Indicates the sender's initial window size (in octets) for stream level flow
-                  control.  The initial value is 2<x:sup>16</x:sup>-1 (65,535) octets.
-                </t>
-                <t>
-                  This setting affects the window size of all streams, including existing streams,
-                  see <xref target="InitialWindowSize"/>.
-                </t>
-                <t>
-                  Values above the maximum flow control window size of 2<x:sup>31</x:sup>-1 MUST
-                  be treated as a <xref target="ConnectionErrorHandler">connection error</xref> of
-                  type <x:ref>FLOW_CONTROL_ERROR</x:ref>.
-                </t>
-              </x:lt>
-              <x:lt hangText="SETTINGS_MAX_FRAME_SIZE (0x5):"
-                    anchor="SETTINGS_MAX_FRAME_SIZE">
-                <t>
-                  Indicates the size of the largest frame payload that the sender is willing to
-                  receive, in octets.
-                </t>
-                <t>
-                  The initial value is 2<x:sup>14</x:sup> (16,384) octets.  The value advertised by
-                  an endpoint MUST be between this initial value and the maximum allowed frame size
-                  (2<x:sup>24</x:sup>-1 or 16,777,215 octets), inclusive.  Values outside this range
-                  MUST be treated as a <xref target="ConnectionErrorHandler">connection error</xref>
-                  of type <x:ref>PROTOCOL_ERROR</x:ref>.
-                </t>
-              </x:lt>
-              <x:lt hangText="SETTINGS_MAX_HEADER_LIST_SIZE (0x6):"
-                    anchor="SETTINGS_MAX_HEADER_LIST_SIZE">
-                <t>
-                  This advisory setting informs a peer of the maximum size of header list that the
-                  sender is prepared to accept, in octets. The value is based on the uncompressed
-                  size of header fields, including the length of the name and value in octets plus
-                  an overhead of 32 octets for each header field.
-                </t>
-                <t>
-                  For any given request, a lower limit than what is advertised MAY be enforced.  The
-                  initial value of this setting is unlimited.
-                </t>
-              </x:lt>
-            </list>
-          </t>
-          <t>
-            An endpoint that receives a SETTINGS frame with any unknown or unsupported identifier
-            MUST ignore that setting.
-          </t>
-        </section>
-
-        <section anchor="SettingsSync" title="Settings Synchronization">
-          <t>
-            Most values in SETTINGS benefit from or require an understanding of when the peer has
-            received and applied the changed parameter values. In order to provide
-            such synchronization timepoints, the recipient of a SETTINGS frame in which the ACK flag
-            is not set MUST apply the updated parameters as soon as possible upon receipt.
-          </t>
-          <t>
-            The values in the SETTINGS frame MUST be processed in the order they appear, with no
-            other frame processing between values.  Unsupported parameters MUST be ignored.  Once
-            all values have been processed, the recipient MUST immediately emit a SETTINGS frame
-            with the ACK flag set. Upon receiving a SETTINGS frame with the ACK flag set, the sender
-            of the altered parameters can rely on the setting having been applied.
-          </t>
-          <t>
-            If the sender of a SETTINGS frame does not receive an acknowledgement within a
-            reasonable amount of time, it MAY issue a <xref
-            target="ConnectionErrorHandler">connection error</xref> of type
-            <x:ref>SETTINGS_TIMEOUT</x:ref>.
-          </t>
-        </section>
-      </section>
-
-      <section anchor="PUSH_PROMISE" title="PUSH_PROMISE">
-        <t>
-          The PUSH_PROMISE frame (type=0x5) is used to notify the peer endpoint in advance of
-          streams the sender intends to initiate.  The PUSH_PROMISE frame includes the unsigned
-          31-bit identifier of the stream the endpoint plans to create along with a set of headers
-          that provide additional context for the stream.  <xref target="PushResources"/> contains a
-          thorough description of the use of PUSH_PROMISE frames.
-        </t>
-
-        <figure title="PUSH_PROMISE Payload Format">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |Pad Length? (8)|
- +-+-------------+-----------------------------------------------+
- |R|                  Promised Stream ID (31)                    |
- +-+-----------------------------+-------------------------------+
- |                   Header Block Fragment (*)                 ...
- +---------------------------------------------------------------+
- |                           Padding (*)                       ...
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The PUSH_PROMISE frame payload has the following fields:
-          <list style="hanging">
-            <t hangText="Pad Length:">
-              An 8-bit field containing the length of the frame padding in units of octets.  This
-              field is only present if the PADDED flag is set.
-            </t>
-            <t hangText="R:">
-              A single reserved bit.
-            </t>
-            <t hangText="Promised Stream ID:">
-              An unsigned 31-bit integer that identifies the stream that is reserved by the
-              PUSH_PROMISE.  The promised stream identifier MUST be a valid choice for the next
-              stream sent by the sender (see <xref target="StreamIdentifiers">new stream
-              identifier</xref>).
-            </t>
-            <t hangText="Header Block Fragment:">
-              A <xref target="HeaderBlock">header block fragment</xref> containing request header
-              fields.
-            </t>
-            <t hangText="Padding:">
-              Padding octets.
-            </t>
-          </list>
-        </t>
-
-        <t>
-          The PUSH_PROMISE frame defines the following flags:
-          <list style="hanging">
-            <x:lt hangText="END_HEADERS (0x4):">
-              <t>
-                Bit 3 being set indicates that this frame contains an entire <xref
-                target="HeaderBlock">header block</xref> and is not followed by any
-                <x:ref>CONTINUATION</x:ref> frames.
-              </t>
-              <t>
-                A PUSH_PROMISE frame without the END_HEADERS flag set MUST be followed by a
-                CONTINUATION frame for the same stream.  A receiver MUST treat the receipt of any
-                other type of frame or a frame on a different stream as a <xref
-                target="ConnectionErrorHandler">connection error</xref> of type
-                <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-            <x:lt hangText="PADDED (0x8):">
-              <t>
-                Bit 4 being set indicates that the Pad Length field and any padding that it
-                describes is present.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-
-        <t>
-          PUSH_PROMISE frames MUST be associated with an existing, peer-initiated stream. The stream
-          identifier of a PUSH_PROMISE frame indicates the stream it is associated with.  If the
-          stream identifier field specifies the value 0x0, a recipient MUST respond with a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <t>
-          Promised streams are not required to be used in the order they are promised.  The
-          PUSH_PROMISE only reserves stream identifiers for later use.
-        </t>
-
-        <t>
-          PUSH_PROMISE MUST NOT be sent if the <x:ref>SETTINGS_ENABLE_PUSH</x:ref> setting of the
-          peer endpoint is set to 0.  An endpoint that has set this setting and has received
-          acknowledgement MUST treat the receipt of a PUSH_PROMISE frame as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          Recipients of PUSH_PROMISE frames can choose to reject promised streams by returning a
-          <x:ref>RST_STREAM</x:ref> referencing the promised stream identifier back to the sender of
-          the PUSH_PROMISE.
-        </t>
-
-       <t>
-          A PUSH_PROMISE frame modifies the connection state in two ways.  The inclusion of a <xref
-          target="HeaderBlock">header block</xref> potentially modifies the state maintained for
-          header compression.  PUSH_PROMISE also reserves a stream for later use, causing the
-          promised stream to enter the "reserved" state.  A sender MUST NOT send a PUSH_PROMISE on a
-          stream unless that stream is either "open" or "half closed (remote)"; the sender MUST
-          ensure that the promised stream is a valid choice for a <xref
-          target="StreamIdentifiers">new stream identifier</xref> (that is, the promised stream MUST
-          be in the "idle" state).
-        </t>
-        <t>
-          Since PUSH_PROMISE reserves a stream, ignoring a PUSH_PROMISE frame causes the stream
-          state to become indeterminate.  A receiver MUST treat the receipt of a PUSH_PROMISE on a
-          stream that is neither "open" nor "half closed (local)" as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.  However, an endpoint that has sent
-          <x:ref>RST_STREAM</x:ref> on the associated stream MUST handle PUSH_PROMISE frames that
-          might have been created before the <x:ref>RST_STREAM</x:ref> frame is received and
-          processed.
-        </t>
-        <t>
-          A receiver MUST treat the receipt of a PUSH_PROMISE that promises an <xref
-          target="StreamIdentifiers">illegal stream identifier</xref> (that is, an identifier for a
-          stream that is not currently in the "idle" state) as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <t>
-          The PUSH_PROMISE frame includes optional padding.  Padding fields and flags are identical
-          to those defined for <xref target="DATA">DATA frames</xref>.
-        </t>
-      </section>
-
-      <section anchor="PING" title="PING">
-        <t>
-          The PING frame (type=0x6) is a mechanism for measuring a minimal round trip time from the
-          sender, as well as determining whether an idle connection is still functional.  PING
-          frames can be sent from any endpoint.
-        </t>
-        <figure title="PING Payload Format">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |                                                               |
- |                      Opaque Data (64)                         |
- |                                                               |
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-
-        <t>
-          In addition to the frame header, PING frames MUST contain 8 octets of data in the payload.
-          A sender can include any value it chooses and use those bytes in any fashion.
-        </t>
-        <t>
-          Receivers of a PING frame that does not include an ACK flag MUST send a PING frame with
-          the ACK flag set in response, with an identical payload.  PING responses SHOULD be given
-          higher priority than any other frame.
-        </t>
-
-        <t>
-          The PING frame defines the following flags:
-          <list style="hanging">
-            <t hangText="ACK (0x1):">
-              Bit 1 being set indicates that this PING frame is a PING response.  An endpoint MUST
-              set this flag in PING responses.  An endpoint MUST NOT respond to PING frames
-              containing this flag.
-            </t>
-          </list>
-        </t>
-        <t>
-          PING frames are not associated with any individual stream. If a PING frame is received
-          with a stream identifier field value other than 0x0, the recipient MUST respond with a
-          <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          Receipt of a PING frame with a length field value other than 8 MUST be treated as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>FRAME_SIZE_ERROR</x:ref>.
-        </t>
-
-      </section>
-
-      <section anchor="GOAWAY" title="GOAWAY">
-        <t>
-          The GOAWAY frame (type=0x7) informs the remote peer to stop creating streams on this
-          connection.  GOAWAY can be sent by either the client or the server.  Once sent, the sender
-          will ignore frames sent on any new streams with identifiers higher than the included last
-          stream identifier.  Receivers of a GOAWAY frame MUST NOT open additional streams on the
-          connection, although a new connection can be established for new streams.
-        </t>
-        <t>
-          The purpose of this frame is to allow an endpoint to gracefully stop accepting new
-          streams, while still finishing processing of previously established streams.  This enables
-          administrative actions, like server maintainance.
-        </t>
-        <t>
-          There is an inherent race condition between an endpoint starting new streams and the
-          remote sending a GOAWAY frame.  To deal with this case, the GOAWAY contains the stream
-          identifier of the last peer-initiated stream which was or might be processed on the
-          sending endpoint in this connection.  For instance, if the server sends a GOAWAY frame,
-          the identified stream is the highest numbered stream initiated by the client.
-        </t>
-        <t>
-          If the receiver of the GOAWAY has sent data on streams with a higher stream identifier
-          than what is indicated in the GOAWAY frame, those streams are not or will not be
-          processed.  The receiver of the GOAWAY frame can treat the streams as though they had
-          never been created at all, thereby allowing those streams to be retried later on a new
-          connection.
-        </t>
-        <t>
-          Endpoints SHOULD always send a GOAWAY frame before closing a connection so that the remote
-          can know whether a stream has been partially processed or not.  For example, if an HTTP
-          client sends a POST at the same time that a server closes a connection, the client cannot
-          know if the server started to process that POST request if the server does not send a
-          GOAWAY frame to indicate what streams it might have acted on.
-        </t>
-        <t>
-          An endpoint might choose to close a connection without sending GOAWAY for misbehaving
-          peers.
-        </t>
-
-        <figure title="GOAWAY Payload Format">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |R|                  Last-Stream-ID (31)                        |
- +-+-------------------------------------------------------------+
- |                      Error Code (32)                          |
- +---------------------------------------------------------------+
- |                  Additional Debug Data (*)                    |
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The GOAWAY frame does not define any flags.
-        </t>
-        <t>
-          The GOAWAY frame applies to the connection, not a specific stream.  An endpoint MUST treat
-          a <x:ref>GOAWAY</x:ref> frame with a stream identifier other than 0x0 as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          The last stream identifier in the GOAWAY frame contains the highest numbered stream
-          identifier for which the sender of the GOAWAY frame might have taken some action on, or
-          might yet take action on.  All streams up to and including the identified stream might
-          have been processed in some way.  The last stream identifier can be set to 0 if no streams
-          were processed.
-          <list style="hanging">
-            <t hangText="Note:">
-              In this context, "processed" means that some data from the stream was passed to some
-              higher layer of software that might have taken some action as a result.
-            </t>
-          </list>
-          If a connection terminates without a GOAWAY frame, the last stream identifier is
-          effectively the highest possible stream identifier.
-        </t>
-        <t>
-          On streams with lower or equal numbered identifiers that were not closed completely prior
-          to the connection being closed, re-attempting requests, transactions, or any protocol
-          activity is not possible, with the exception of idempotent actions like HTTP GET, PUT, or
-          DELETE.  Any protocol activity that uses higher numbered streams can be safely retried
-          using a new connection.
-        </t>
-        <t>
-          Activity on streams numbered lower or equal to the last stream identifier might still
-          complete successfully.  The sender of a GOAWAY frame might gracefully shut down a
-          connection by sending a GOAWAY frame, maintaining the connection in an open state until
-          all in-progress streams complete.
-        </t>
-        <t>
-          An endpoint MAY send multiple GOAWAY frames if circumstances change.  For instance, an
-          endpoint that sends GOAWAY with <x:ref>NO_ERROR</x:ref> during graceful shutdown could
-          subsequently encounter an condition that requires immediate termination of the connection.
-          The last stream identifier from the last GOAWAY frame received indicates which streams
-          could have been acted upon.  Endpoints MUST NOT increase the value they send in the last
-          stream identifier, since the peers might already have retried unprocessed requests on
-          another connection.
-        </t>
-        <t>
-          A client that is unable to retry requests loses all requests that are in flight when the
-          server closes the connection.  This is especially true for intermediaries that might
-          not be serving clients using HTTP/2.  A server that is attempting to gracefully shut down
-          a connection SHOULD send an initial GOAWAY frame with the last stream identifier set to
-          2<x:sup>31</x:sup>-1 and a <x:ref>NO_ERROR</x:ref> code.  This signals to the client that
-          a shutdown is imminent and that no further requests can be initiated.  After waiting at
-          least one round trip time, the server can send another GOAWAY frame with an updated last
-          stream identifier.  This ensures that a connection can be cleanly shut down without losing
-          requests.
-        </t>
-
-        <t>
-          After sending a GOAWAY frame, the sender can discard frames for streams with identifiers
-          higher than the identified last stream.  However, any frames that alter connection state
-          cannot be completely ignored.  For instance, <x:ref>HEADERS</x:ref>,
-          <x:ref>PUSH_PROMISE</x:ref> and <x:ref>CONTINUATION</x:ref> frames MUST be minimally
-          processed to ensure the state maintained for header compression is consistent (see <xref
-          target="HeaderBlock"/>); similarly DATA frames MUST be counted toward the connection flow
-          control window.  Failure to process these frames can cause flow control or header
-          compression state to become unsynchronized.
-        </t>
-
-        <t>
-          The GOAWAY frame also contains a 32-bit <xref target="ErrorCodes">error code</xref> that
-          contains the reason for closing the connection.
-        </t>
-        <t>
-          Endpoints MAY append opaque data to the payload of any GOAWAY frame.  Additional debug
-          data is intended for diagnostic purposes only and carries no semantic value.  Debug
-          information could contain security- or privacy-sensitive data.  Logged or otherwise
-          persistently stored debug data MUST have adequate safeguards to prevent unauthorized
-          access.
-        </t>
-      </section>
-
-      <section anchor="WINDOW_UPDATE" title="WINDOW_UPDATE">
-        <t>
-          The WINDOW_UPDATE frame (type=0x8) is used to implement flow control; see <xref
-          target="FlowControl"/> for an overview.
-        </t>
-        <t>
-          Flow control operates at two levels: on each individual stream and on the entire
-          connection.
-        </t>
-        <t>
-          Both types of flow control are hop-by-hop; that is, only between the two endpoints.
-          Intermediaries do not forward WINDOW_UPDATE frames between dependent connections.
-          However, throttling of data transfer by any receiver can indirectly cause the propagation
-          of flow control information toward the original sender.
-        </t>
-        <t>
-          Flow control only applies to frames that are identified as being subject to flow control.
-          Of the frame types defined in this document, this includes only <x:ref>DATA</x:ref> frames.
-          Frames that are exempt from flow control MUST be accepted and processed, unless the
-          receiver is unable to assign resources to handling the frame.  A receiver MAY respond with
-          a <xref target="StreamErrorHandler">stream error</xref> or <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>FLOW_CONTROL_ERROR</x:ref> if it is unable to accept a frame.
-        </t>
-        <figure title="WINDOW_UPDATE Payload Format">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |R|              Window Size Increment (31)                     |
- +-+-------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The payload of a WINDOW_UPDATE frame is one reserved bit, plus an unsigned 31-bit integer
-          indicating the number of octets that the sender can transmit in addition to the existing
-          flow control window.  The legal range for the increment to the flow control window is 1 to
-          2<x:sup>31</x:sup>-1 (0x7fffffff) octets.
-        </t>
-        <t>
-          The WINDOW_UPDATE frame does not define any flags.
-        </t>
-        <t>
-          The WINDOW_UPDATE frame can be specific to a stream or to the entire connection.  In the
-          former case, the frame's stream identifier indicates the affected stream; in the latter,
-          the value "0" indicates that the entire connection is the subject of the frame.
-        </t>
-        <t>
-          A receiver MUST treat the receipt of a WINDOW_UPDATE frame with an flow control window
-          increment of 0 as a <xref target="StreamErrorHandler">stream error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>; errors on the connection flow control window MUST be
-          treated as a <xref target="ConnectionErrorHandler">connection error</xref>.
-        </t>
-        <t>
-          WINDOW_UPDATE can be sent by a peer that has sent a frame bearing the END_STREAM flag.
-          This means that a receiver could receive a WINDOW_UPDATE frame on a "half closed (remote)"
-          or "closed" stream.  A receiver MUST NOT treat this as an error, see <xref
-          target="StreamStates"/>.
-        </t>
-        <t>
-          A receiver that receives a flow controlled frame MUST always account for its contribution
-          against the connection flow control window, unless the receiver treats this as a <xref
-          target="ConnectionErrorHandler">connection error</xref>.  This is necessary even if the
-          frame is in error.  Since the sender counts the frame toward the flow control window, if
-          the receiver does not, the flow control window at sender and receiver can become
-          different.
-        </t>
-
-        <section title="The Flow Control Window">
-          <t>
-            Flow control in HTTP/2 is implemented using a window kept by each sender on every
-            stream. The flow control window is a simple integer value that indicates how many octets
-            of data the sender is permitted to transmit; as such, its size is a measure of the
-            buffering capacity of the receiver.
-          </t>
-          <t>
-            Two flow control windows are applicable: the stream flow control window and the
-            connection flow control window.  The sender MUST NOT send a flow controlled frame with a
-            length that exceeds the space available in either of the flow control windows advertised
-            by the receiver.  Frames with zero length with the END_STREAM flag set (that is, an
-            empty <x:ref>DATA</x:ref> frame) MAY be sent if there is no available space in either
-            flow control window.
-          </t>
-          <t>
-            For flow control calculations, the 9 octet frame header is not counted.
-          </t>
-          <t>
-            After sending a flow controlled frame, the sender reduces the space available in both
-            windows by the length of the transmitted frame.
-          </t>
-          <t>
-            The receiver of a frame sends a WINDOW_UPDATE frame as it consumes data and frees up
-            space in flow control windows.  Separate WINDOW_UPDATE frames are sent for the stream
-            and connection level flow control windows.
-          </t>
-          <t>
-            A sender that receives a WINDOW_UPDATE frame updates the corresponding window by the
-            amount specified in the frame.
-          </t>
-          <t>
-            A sender MUST NOT allow a flow control window to exceed 2<x:sup>31</x:sup>-1 octets.
-            If a sender receives a WINDOW_UPDATE that causes a flow control window to exceed this
-            maximum it MUST terminate either the stream or the connection, as appropriate.  For
-            streams, the sender sends a <x:ref>RST_STREAM</x:ref> with the error code of
-            <x:ref>FLOW_CONTROL_ERROR</x:ref> code; for the connection, a <x:ref>GOAWAY</x:ref>
-            frame with a <x:ref>FLOW_CONTROL_ERROR</x:ref> code.
-          </t>
-          <t>
-            Flow controlled frames from the sender and WINDOW_UPDATE frames from the receiver are
-            completely asynchronous with respect to each other. This property allows a receiver to
-            aggressively update the window size kept by the sender to prevent streams from stalling.
-          </t>
-        </section>
-
-        <section anchor="InitialWindowSize" title="Initial Flow Control Window Size">
-          <t>
-            When an HTTP/2 connection is first established, new streams are created with an initial
-            flow control window size of 65,535 octets. The connection flow control window is 65,535
-            octets. Both endpoints can adjust the initial window size for new streams by including
-            a value for <x:ref>SETTINGS_INITIAL_WINDOW_SIZE</x:ref> in the <x:ref>SETTINGS</x:ref>
-            frame that forms part of the connection preface. The connection flow control window can
-            only be changed using WINDOW_UPDATE frames.
-          </t>
-          <t>
-            Prior to receiving a <x:ref>SETTINGS</x:ref> frame that sets a value for
-            <x:ref>SETTINGS_INITIAL_WINDOW_SIZE</x:ref>, an endpoint can only use the default
-            initial window size when sending flow controlled frames.  Similarly, the connection flow
-            control window is set to the default initial window size until a WINDOW_UPDATE frame is
-            received.
-          </t>
-          <t>
-            A <x:ref>SETTINGS</x:ref> frame can alter the initial flow control window size for all
-            current streams. When the value of <x:ref>SETTINGS_INITIAL_WINDOW_SIZE</x:ref> changes,
-            a receiver MUST adjust the size of all stream flow control windows that it maintains by
-            the difference between the new value and the old value.
-          </t>
-          <t>
-            A change to <x:ref>SETTINGS_INITIAL_WINDOW_SIZE</x:ref> can cause the available space in
-            a flow control window to become negative.  A sender MUST track the negative flow control
-            window, and MUST NOT send new flow controlled frames until it receives WINDOW_UPDATE
-            frames that cause the flow control window to become positive.
-          </t>
-          <t>
-            For example, if the client sends 60KB immediately on connection establishment, and the
-            server sets the initial window size to be 16KB, the client will recalculate the
-            available flow control window to be -44KB on receipt of the <x:ref>SETTINGS</x:ref>
-            frame.  The client retains a negative flow control window until WINDOW_UPDATE frames
-            restore the window to being positive, after which the client can resume sending.
-          </t>
-          <t>
-            A <x:ref>SETTINGS</x:ref> frame cannot alter the connection flow control window.
-          </t>
-          <t>
-            An endpoint MUST treat a change to <x:ref>SETTINGS_INITIAL_WINDOW_SIZE</x:ref> that
-            causes any flow control window to exceed the maximum size as a <xref
-            target="ConnectionErrorHandler">connection error</xref> of type
-            <x:ref>FLOW_CONTROL_ERROR</x:ref>.
-          </t>
-        </section>
-
-        <section title="Reducing the Stream Window Size">
-          <t>
-            A receiver that wishes to use a smaller flow control window than the current size can
-            send a new <x:ref>SETTINGS</x:ref> frame.  However, the receiver MUST be prepared to
-            receive data that exceeds this window size, since the sender might send data that
-            exceeds the lower limit prior to processing the <x:ref>SETTINGS</x:ref> frame.
-          </t>
-          <t>
-            After sending a SETTINGS frame that reduces the initial flow control window size, a
-            receiver has two options for handling streams that exceed flow control limits:
-            <list style="numbers">
-              <t>
-                The receiver can immediately send <x:ref>RST_STREAM</x:ref> with
-                <x:ref>FLOW_CONTROL_ERROR</x:ref> error code for the affected streams.
-              </t>
-              <t>
-                The receiver can accept the streams and tolerate the resulting head of line
-                blocking, sending WINDOW_UPDATE frames as it consumes data.
-              </t>
-            </list>
-          </t>
-        </section>
-      </section>
-
-      <section anchor="CONTINUATION" title="CONTINUATION">
-        <t>
-          The CONTINUATION frame (type=0x9) is used to continue a sequence of <xref
-          target="HeaderBlock">header block fragments</xref>.  Any number of CONTINUATION frames can
-          be sent on an existing stream, as long as the preceding frame is on the same stream and is
-          a <x:ref>HEADERS</x:ref>, <x:ref>PUSH_PROMISE</x:ref> or CONTINUATION frame without the
-          END_HEADERS flag set.
-        </t>
-
-        <figure title="CONTINUATION Frame Payload">
-          <artwork type="inline"><![CDATA[
-  0                   1                   2                   3
-  0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0 1
- +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
- |                   Header Block Fragment (*)                 ...
- +---------------------------------------------------------------+
-]]></artwork>
-        </figure>
-        <t>
-          The CONTINUATION frame payload contains a <xref target="HeaderBlock">header block
-          fragment</xref>.
-        </t>
-
-        <t>
-          The CONTINUATION frame defines the following flag:
-          <list style="hanging">
-            <x:lt hangText="END_HEADERS (0x4):">
-              <t>
-                Bit 3 being set indicates that this frame ends a <xref target="HeaderBlock">header
-                block</xref>.
-              </t>
-              <t>
-                If the END_HEADERS bit is not set, this frame MUST be followed by another
-                CONTINUATION frame.  A receiver MUST treat the receipt of any other type of frame or
-                a frame on a different stream as a <xref target="ConnectionErrorHandler">connection
-                error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-              </t>
-            </x:lt>
-          </list>
-        </t>
-
-        <t>
-          The CONTINUATION frame changes the connection state as defined in <xref
-          target="HeaderBlock" />.
-        </t>
-
-        <t>
-          CONTINUATION frames MUST be associated with a stream. If a CONTINUATION frame is received
-          whose stream identifier field is 0x0, the recipient MUST respond with a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type PROTOCOL_ERROR.
-        </t>
-
-        <t>
-          A CONTINUATION frame MUST be preceded by a <x:ref>HEADERS</x:ref>,
-          <x:ref>PUSH_PROMISE</x:ref> or CONTINUATION frame without the END_HEADERS flag set.  A
-          recipient that observes violation of this rule MUST respond with a <xref
-          target="ConnectionErrorHandler"> connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="ErrorCodes" title="Error Codes">
-      <t>
-        Error codes are 32-bit fields that are used in <x:ref>RST_STREAM</x:ref> and
-        <x:ref>GOAWAY</x:ref> frames to convey the reasons for the stream or connection error.
-      </t>
-
-      <t>
-        Error codes share a common code space.  Some error codes apply only to either streams or the
-        entire connection and have no defined semantics in the other context.
-      </t>
-
-      <t>
-        The following error codes are defined:
-        <list style="hanging">
-          <t hangText="NO_ERROR (0x0):" anchor="NO_ERROR">
-            The associated condition is not as a result of an error.  For example, a
-            <x:ref>GOAWAY</x:ref> might include this code to indicate graceful shutdown of a
-            connection.
-          </t>
-          <t hangText="PROTOCOL_ERROR (0x1):" anchor="PROTOCOL_ERROR">
-            The endpoint detected an unspecific protocol error.  This error is for use when a more
-            specific error code is not available.
-          </t>
-          <t hangText="INTERNAL_ERROR (0x2):" anchor="INTERNAL_ERROR">
-            The endpoint encountered an unexpected internal error.
-          </t>
-          <t hangText="FLOW_CONTROL_ERROR (0x3):" anchor="FLOW_CONTROL_ERROR">
-            The endpoint detected that its peer violated the flow control protocol.
-          </t>
-          <t hangText="SETTINGS_TIMEOUT (0x4):" anchor="SETTINGS_TIMEOUT">
-            The endpoint sent a <x:ref>SETTINGS</x:ref> frame, but did not receive a response in a
-            timely manner.  See <xref target="SettingsSync">Settings Synchronization</xref>.
-          </t>
-          <t hangText="STREAM_CLOSED (0x5):" anchor="STREAM_CLOSED">
-            The endpoint received a frame after a stream was half closed.
-          </t>
-          <t hangText="FRAME_SIZE_ERROR (0x6):" anchor="FRAME_SIZE_ERROR">
-            The endpoint received a frame with an invalid size.
-          </t>
-          <t hangText="REFUSED_STREAM (0x7):" anchor="REFUSED_STREAM">
-            The endpoint refuses the stream prior to performing any application processing, see
-            <xref target="Reliability"/> for details.
-          </t>
-          <t hangText="CANCEL (0x8):" anchor="CANCEL">
-            Used by the endpoint to indicate that the stream is no longer needed.
-          </t>
-          <t hangText="COMPRESSION_ERROR (0x9):" anchor="COMPRESSION_ERROR">
-            The endpoint is unable to maintain the header compression context for the connection.
-          </t>
-          <t hangText="CONNECT_ERROR (0xa):" anchor="CONNECT_ERROR">
-            The connection established in response to a <xref target="CONNECT">CONNECT
-            request</xref> was reset or abnormally closed.
-          </t>
-          <t hangText="ENHANCE_YOUR_CALM (0xb):" anchor="ENHANCE_YOUR_CALM">
-            The endpoint detected that its peer is exhibiting a behavior that might be generating
-            excessive load.
-          </t>
-          <t hangText="INADEQUATE_SECURITY (0xc):" anchor="INADEQUATE_SECURITY">
-            The underlying transport has properties that do not meet minimum security
-            requirements (see <xref target="TLSUsage"/>).
-          </t>
-        </list>
-      </t>
-      <t>
-        Unknown or unsupported error codes MUST NOT trigger any special behavior.  These MAY be
-        treated by an implementation as being equivalent to <x:ref>INTERNAL_ERROR</x:ref>.
-      </t>
-    </section>
-
-    <section anchor="HTTPLayer" title="HTTP Message Exchanges">
-      <t>
-        HTTP/2 is intended to be as compatible as possible with current uses of HTTP. This means
-        that, from the application perspective, the features of the protocol are largely
-        unchanged. To achieve this, all request and response semantics are preserved, although the
-        syntax of conveying those semantics has changed.
-      </t>
-      <t>
-        Thus, the specification and requirements of HTTP/1.1 Semantics and Content <xref
-        target="RFC7231"/>, Conditional Requests <xref target="RFC7232"/>, Range Requests <xref
-        target="RFC7233"/>, Caching <xref target="RFC7234"/> and Authentication <xref
-        target="RFC7235"/> are applicable to HTTP/2. Selected portions of HTTP/1.1 Message Syntax
-        and Routing <xref target="RFC7230"/>, such as the HTTP and HTTPS URI schemes, are also
-        applicable in HTTP/2, but the expression of those semantics for this protocol are defined
-        in the sections below.
-      </t>
-
-      <section anchor="HttpSequence" title="HTTP Request/Response Exchange">
-        <t>
-          A client sends an HTTP request on a new stream, using a previously unused <xref
-          target="StreamIdentifiers">stream identifier</xref>.  A server sends an HTTP response on
-          the same stream as the request.
-        </t>
-        <t>
-          An HTTP message (request or response) consists of:
-          <list style="numbers">
-            <t>
-              for a response only, zero or more <x:ref>HEADERS</x:ref> frames (each followed by zero
-              or more <x:ref>CONTINUATION</x:ref> frames) containing the message headers of
-              informational (1xx) HTTP responses (see <xref target="RFC7230" x:fmt=","
-              x:rel="#header.fields"/> and <xref target="RFC7231" x:fmt="," x:rel="#status.1xx"/>),
-              and
-            </t>
-            <t>
-              one <x:ref>HEADERS</x:ref> frame (followed by zero or more <x:ref>CONTINUATION</x:ref>
-              frames) containing the message headers (see <xref target="RFC7230" x:fmt=","
-              x:rel="#header.fields"/>), and
-            </t>
-            <t>
-              zero or more <x:ref>DATA</x:ref> frames containing the message payload (see <xref
-              target="RFC7230" x:fmt="," x:rel="#message.body"/>), and
-            </t>
-            <t>
-              optionally, one <x:ref>HEADERS</x:ref> frame, followed by zero or more
-              <x:ref>CONTINUATION</x:ref> frames containing the trailer-part, if present (see <xref
-              target="RFC7230" x:fmt="," x:rel="#chunked.trailer.part"/>).
-            </t>
-          </list>
-          The last frame in the sequence bears an END_STREAM flag, noting that a
-          <x:ref>HEADERS</x:ref> frame bearing the END_STREAM flag can be followed by
-          <x:ref>CONTINUATION</x:ref> frames that carry any remaining portions of the header block.
-        </t>
-        <t>
-          Other frames (from any stream) MUST NOT occur between either <x:ref>HEADERS</x:ref> frame
-          and any <x:ref>CONTINUATION</x:ref> frames that might follow.
-        </t>
-
-        <t>
-          Trailing header fields are carried in a header block that also terminates the stream.
-          That is, a sequence starting with a <x:ref>HEADERS</x:ref> frame, followed by zero or more
-          <x:ref>CONTINUATION</x:ref> frames, where the <x:ref>HEADERS</x:ref> frame bears an
-          END_STREAM flag.  Header blocks after the first that do not terminate the stream are not
-          part of an HTTP request or response.
-        </t>
-        <t>
-          A <x:ref>HEADERS</x:ref> frame (and associated <x:ref>CONTINUATION</x:ref> frames) can
-          only appear at the start or end of a stream.  An endpoint that receives a
-          <x:ref>HEADERS</x:ref> frame without the END_STREAM flag set after receiving a final
-          (non-informational) status code MUST treat the corresponding request or response as <xref
-          target="malformed">malformed</xref>.
-        </t>
-
-        <t>
-          An HTTP request/response exchange fully consumes a single stream.  A request starts with
-          the <x:ref>HEADERS</x:ref> frame that puts the stream into an "open" state. The request
-          ends with a frame bearing END_STREAM, which causes the stream to become "half closed
-          (local)" for the client and "half closed (remote)" for the server.  A response starts with
-          a <x:ref>HEADERS</x:ref> frame and ends with a frame bearing END_STREAM, which places the
-          stream in the "closed" state.
-          <!-- Yes, the response might be completed before the request does, but that's not a detail
-               we need to expand upon.  It's complicated enough explaining this as it is.  -->
-        </t>
-
-        <section anchor="informational-responses" title="Upgrading From HTTP/2">
-          <t>
-            HTTP/2 removes support for the 101 (Switching Protocols) informational status code
-            (<xref target="RFC7231" x:fmt="," x:rel="#status.101"/>).
-          </t>
-          <t>
-            The semantics of 101 (Switching Protocols) aren't applicable to a multiplexed protocol.
-            Alternative protocols are able to use the same mechanisms that HTTP/2 uses to negotiate
-            their use (see <xref target="starting"/>).
-          </t>
-        </section>
-
-        <section anchor="HttpHeaders" title="HTTP Header Fields">
-          <t>
-            HTTP header fields carry information as a series of key-value pairs. For a listing of
-            registered HTTP headers, see the Message Header Field Registry maintained at <eref
-            target="https://www.iana.org/assignments/message-headers"/>.
-          </t>
-
-          <section anchor="PseudoHeaderFields" title="Pseudo-Header Fields">
-            <t>
-              While HTTP/1.x used the message start-line (see <xref target="RFC7230" x:fmt=","
-              x:rel="#start.line"/>) to convey the target URI and method of the request, and the
-              status code for the response, HTTP/2 uses special pseudo-header fields beginning with
-              ':' character (ASCII 0x3a) for this purpose.
-            </t>
-            <t>
-              Pseudo-header fields are not HTTP header fields. Endpoints MUST NOT generate
-              pseudo-header fields other than those defined in this document.
-            </t>
-            <t>
-              Pseudo-header fields are only valid in the context in which they are defined.
-              Pseudo-header fields defined for requests MUST NOT appear in responses; pseudo-header
-              fields defined for responses MUST NOT appear in requests.  Pseudo-header fields MUST
-              NOT appear in trailers.  Endpoints MUST treat a request or response that contains
-              undefined or invalid pseudo-header fields as <xref
-              target="malformed">malformed</xref>.
-            </t>
-            <t>
-              Just as in HTTP/1.x, header field names are strings of ASCII characters that are
-              compared in a case-insensitive fashion. However, header field names MUST be converted
-              to lowercase prior to their encoding in HTTP/2. A request or response containing
-              uppercase header field names MUST be treated as <xref
-              target="malformed">malformed</xref>.
-            </t>
-            <t>
-              All pseudo-header fields MUST appear in the header block before regular header fields.
-              Any request or response that contains a pseudo-header field that appears in a header
-              block after a regular header field MUST be treated as <xref
-              target="malformed">malformed</xref>.
-            </t>
-          </section>
-
-          <section title="Connection-Specific Header Fields">
-            <t>
-              HTTP/2 does not use the <spanx style="verb">Connection</spanx> header field to
-              indicate connection-specific header fields; in this protocol, connection-specific
-              metadata is conveyed by other means.  An endpoint MUST NOT generate a HTTP/2 message
-              containing connection-specific header fields; any message containing
-              connection-specific header fields MUST be treated as <xref
-              target="malformed">malformed</xref>.
-            </t>
-            <t>
-              This means that an intermediary transforming an HTTP/1.x message to HTTP/2 will need
-              to remove any header fields nominated by the Connection header field, along with the
-              Connection header field itself. Such intermediaries SHOULD also remove other
-              connection-specific header fields, such as Keep-Alive, Proxy-Connection,
-              Transfer-Encoding and Upgrade, even if they are not nominated by Connection.
-            </t>
-            <t>
-              One exception to this is the TE header field, which MAY be present in an HTTP/2
-              request, but when it is MUST NOT contain any value other than "trailers".
-            </t>
-            <t>
-              <list style="hanging">
-                <t hangText="Note:">
-                  HTTP/2 purposefully does not support upgrade to another protocol.  The handshake
-                  methods described in <xref target="starting"/> are believed sufficient to
-                  negotiate the use of alternative protocols.
-                </t>
-              </list>
-            </t>
-          </section>
-
-          <section anchor="HttpRequest" title="Request Pseudo-Header Fields">
-            <t>
-              The following pseudo-header fields are defined for HTTP/2 requests:
-              <list style="symbols">
-                <x:lt>
-                  <t>
-                    The <spanx style="verb">:method</spanx> pseudo-header field includes the HTTP
-                    method (<xref target="RFC7231" x:fmt="," x:rel="#methods"/>).
-                  </t>
-                </x:lt>
-                <x:lt>
-                  <t>
-                    The <spanx style="verb">:scheme</spanx> pseudo-header field includes the scheme
-                    portion of the target URI (<xref target="RFC3986" x:fmt="," x:sec="3.1"/>).
-                  </t>
-                  <t>
-                    <spanx style="verb">:scheme</spanx> is not restricted to <spanx
-                    style="verb">http</spanx> and <spanx style="verb">https</spanx> schemed URIs.  A
-                    proxy or gateway can translate requests for non-HTTP schemes, enabling the use
-                    of HTTP to interact with non-HTTP services.
-                  </t>
-                </x:lt>
-                <x:lt>
-                  <t>
-                    The <spanx style="verb">:authority</spanx> pseudo-header field includes the
-                    authority portion of the target URI (<xref target="RFC3986" x:fmt=","
-                    x:sec="3.2"/>). The authority MUST NOT include the deprecated <spanx
-                    style="verb">userinfo</spanx> subcomponent for <spanx style="verb">http</spanx>
-                    or <spanx style="verb">https</spanx> schemed URIs.
-                  </t>
-                  <t>
-                    To ensure that the HTTP/1.1 request line can be reproduced accurately, this
-                    pseudo-header field MUST be omitted when translating from an HTTP/1.1 request
-                    that has a request target in origin or asterisk form (see <xref
-                    target="RFC7230" x:fmt="," x:rel="#request-target"/>). Clients that generate
-                    HTTP/2 requests directly SHOULD use the <spanx>:authority</spanx> pseudo-header
-                    field instead of the <spanx style="verb">Host</spanx> header field. An
-                    intermediary that converts an HTTP/2 request to HTTP/1.1 MUST create a <spanx
-                    style="verb">Host</spanx> header field if one is not present in a request by
-                    copying the value of the <spanx style="verb">:authority</spanx> pseudo-header
-                    field.
-                  </t>
-                </x:lt>
-                <x:lt>
-                  <t>
-                    The <spanx style="verb">:path</spanx> pseudo-header field includes the path and
-                    query parts of the target URI (the <spanx style="verb">path-absolute</spanx>
-                    production from <xref target="RFC3986"/> and optionally a '?' character
-                    followed by the <spanx style="verb">query</spanx> production, see <xref
-                    target="RFC3986" x:fmt="," x:sec="3.3"/> and <xref target="RFC3986" x:fmt=","
-                    x:sec="3.4"/>). A request in asterisk form includes the value '*' for the
-                    <spanx style="verb">:path</spanx> pseudo-header field.
-                  </t>
-                  <t>
-                    This pseudo-header field MUST NOT be empty for <spanx style="verb">http</spanx>
-                    or <spanx style="verb">https</spanx> URIs; <spanx style="verb">http</spanx> or
-                    <spanx style="verb">https</spanx> URIs that do not contain a path component
-                    MUST include a value of '/'. The exception to this rule is an OPTIONS request
-                    for an <spanx style="verb">http</spanx> or <spanx style="verb">https</spanx>
-                    URI that does not include a path component; these MUST include a <spanx
-                    style="verb">:path</spanx> pseudo-header field with a value of '*' (see <xref
-                    target="RFC7230" x:fmt="," x:rel="#asterisk-form"/>).
-                  </t>
-                </x:lt>
-              </list>
-            </t>
-            <t>
-              All HTTP/2 requests MUST include exactly one valid value for the <spanx
-              style="verb">:method</spanx>, <spanx style="verb">:scheme</spanx>, and <spanx
-              style="verb">:path</spanx> pseudo-header fields, unless it is a <xref
-              target="CONNECT">CONNECT request</xref>. An HTTP request that omits mandatory
-              pseudo-header fields is <xref target="malformed">malformed</xref>.
-            </t>
-            <t>
-              HTTP/2 does not define a way to carry the version identifier that is included in the
-              HTTP/1.1 request line.
-            </t>
-          </section>
-
-          <section anchor="HttpResponse" title="Response Pseudo-Header Fields">
-            <t>
-              For HTTP/2 responses, a single <spanx style="verb">:status</spanx> pseudo-header
-              field is defined that carries the HTTP status code field (see <xref target="RFC7231"
-              x:fmt="," x:rel="#status.codes"/>). This pseudo-header field MUST be included in all
-              responses, otherwise the response is <xref target="malformed">malformed</xref>.
-            </t>
-            <t>
-              HTTP/2 does not define a way to carry the version or reason phrase that is included in
-              an HTTP/1.1 status line.
-            </t>
-          </section>
-
-         <section anchor="CompressCookie" title="Compressing the Cookie Header Field">
-            <t>
-              The <xref target="COOKIE">Cookie header field</xref> can carry a significant amount of
-              redundant data.
-            </t>
-            <t>
-              The Cookie header field uses a semi-colon (";") to delimit cookie-pairs (or "crumbs").
-              This header field doesn't follow the list construction rules in HTTP (see <xref
-              target="RFC7230" x:fmt="," x:rel="#field.order"/>), which prevents cookie-pairs from
-              being separated into different name-value pairs.  This can significantly reduce
-              compression efficiency as individual cookie-pairs are updated.
-            </t>
-            <t>
-              To allow for better compression efficiency, the Cookie header field MAY be split into
-              separate header fields, each with one or more cookie-pairs.  If there are multiple
-              Cookie header fields after decompression, these MUST be concatenated into a single
-              octet string using the two octet delimiter of 0x3B, 0x20 (the ASCII string "; ")
-              before being passed into a non-HTTP/2 context, such as an HTTP/1.1 connection, or a
-              generic HTTP server application.
-            </t>
-            <figure>
-              <preamble>
-                Therefore, the following two lists of Cookie header fields are semantically
-                equivalent.
-              </preamble>
-              <artwork type="inline"><![CDATA[
-  cookie: a=b; c=d; e=f
-
-  cookie: a=b
-  cookie: c=d
-  cookie: e=f
-]]></artwork>
-            </figure>
-          </section>
-
-          <section anchor="malformed" title="Malformed Requests and Responses">
-            <t>
-              A malformed request or response is one that is an otherwise valid sequence of HTTP/2
-              frames, but is otherwise invalid due to the presence of extraneous frames, prohibited
-              header fields, the absence of mandatory header fields, or the inclusion of uppercase
-              header field names.
-            </t>
-            <t>
-              A request or response that includes an entity body can include a <spanx
-              style="verb">content-length</spanx> header field.  A request or response is also
-              malformed if the value of a <spanx style="verb">content-length</spanx> header field
-              does not equal the sum of the <x:ref>DATA</x:ref> frame payload lengths that form the
-              body.  A response that is defined to have no payload, as described in <xref
-              target="RFC7230" x:fmt="," x:rel="#header.content-length"/>, can have a non-zero
-              <spanx style="verb">content-length</spanx> header field, even though no content is
-              included in <x:ref>DATA</x:ref> frames.
-            </t>
-            <t>
-              Intermediaries that process HTTP requests or responses (i.e., any intermediary not
-              acting as a tunnel) MUST NOT forward a malformed request or response.  Malformed
-              requests or responses that are detected MUST be treated as a <xref
-              target="StreamErrorHandler">stream error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-            </t>
-            <t>
-              For malformed requests, a server MAY send an HTTP response prior to closing or
-              resetting the stream.  Clients MUST NOT accept a malformed response. Note that these
-              requirements are intended to protect against several types of common attacks against
-              HTTP; they are deliberately strict, because being permissive can expose
-              implementations to these vulnerabilities.
-            </t>
-          </section>
-        </section>
-
-        <section title="Examples">
-          <t>
-            This section shows HTTP/1.1 requests and responses, with illustrations of equivalent
-            HTTP/2 requests and responses.
-          </t>
-          <t>
-            An HTTP GET request includes request header fields and no body and is therefore
-            transmitted as a single <x:ref>HEADERS</x:ref> frame, followed by zero or more
-            <x:ref>CONTINUATION</x:ref> frames containing the serialized block of request header
-            fields.  The <x:ref>HEADERS</x:ref> frame in the following has both the END_HEADERS and
-            END_STREAM flags set; no <x:ref>CONTINUATION</x:ref> frames are sent:
-          </t>
-
-          <figure>
-            <artwork type="inline"><![CDATA[
-  GET /resource HTTP/1.1           HEADERS
-  Host: example.org          ==>     + END_STREAM
-  Accept: image/jpeg                 + END_HEADERS
-                                       :method = GET
-                                       :scheme = https
-                                       :path = /resource
-                                       host = example.org
-                                       accept = image/jpeg
-]]></artwork>
-          </figure>
-
-          <t>
-            Similarly, a response that includes only response header fields is transmitted as a
-            <x:ref>HEADERS</x:ref> frame (again, followed by zero or more
-            <x:ref>CONTINUATION</x:ref> frames) containing the serialized block of response header
-            fields.
-          </t>
-
-          <figure>
-            <artwork type="inline"><![CDATA[
-  HTTP/1.1 304 Not Modified        HEADERS
-  ETag: "xyzzy"              ==>     + END_STREAM
-  Expires: Thu, 23 Jan ...           + END_HEADERS
-                                       :status = 304
-                                       etag = "xyzzy"
-                                       expires = Thu, 23 Jan ...
-]]></artwork>
-          </figure>
-
-          <t>
-            An HTTP POST request that includes request header fields and payload data is transmitted
-            as one <x:ref>HEADERS</x:ref> frame, followed by zero or more
-            <x:ref>CONTINUATION</x:ref> frames containing the request header fields, followed by one
-            or more <x:ref>DATA</x:ref> frames, with the last <x:ref>CONTINUATION</x:ref> (or
-            <x:ref>HEADERS</x:ref>) frame having the END_HEADERS flag set and the final
-            <x:ref>DATA</x:ref> frame having the END_STREAM flag set:
-          </t>
-
-          <figure>
-            <artwork type="inline"><![CDATA[
-  POST /resource HTTP/1.1          HEADERS
-  Host: example.org          ==>     - END_STREAM
-  Content-Type: image/jpeg           - END_HEADERS
-  Content-Length: 123                  :method = POST
-                                       :path = /resource
-  {binary data}                        :scheme = https
-
-                                   CONTINUATION
-                                     + END_HEADERS
-                                       content-type = image/jpeg
-                                       host = example.org
-                                       content-length = 123
-
-                                   DATA
-                                     + END_STREAM
-                                   {binary data}
-]]></artwork>
-            <postamble>
-              Note that data contributing to any given header field could be spread between header
-              block fragments.  The allocation of header fields to frames in this example is
-              illustrative only.
-            </postamble>
-          </figure>
-
-          <t>
-            A response that includes header fields and payload data is transmitted as a
-            <x:ref>HEADERS</x:ref> frame, followed by zero or more <x:ref>CONTINUATION</x:ref>
-            frames, followed by one or more <x:ref>DATA</x:ref> frames, with the last
-            <x:ref>DATA</x:ref> frame in the sequence having the END_STREAM flag set:
-          </t>
-
-          <figure>
-            <artwork type="inline"><![CDATA[
-  HTTP/1.1 200 OK                  HEADERS
-  Content-Type: image/jpeg   ==>     - END_STREAM
-  Content-Length: 123                + END_HEADERS
-                                       :status = 200
-  {binary data}                        content-type = image/jpeg
-                                       content-length = 123
-
-                                   DATA
-                                     + END_STREAM
-                                   {binary data}
-]]></artwork>
-          </figure>
-
-          <t>
-            Trailing header fields are sent as a header block after both the request or response
-            header block and all the <x:ref>DATA</x:ref> frames have been sent.  The
-            <x:ref>HEADERS</x:ref> frame starting the trailers header block has the END_STREAM flag
-            set.
-          </t>
-
-          <figure>
-            <artwork type="inline"><![CDATA[
-  HTTP/1.1 200 OK                  HEADERS
-  Content-Type: image/jpeg   ==>     - END_STREAM
-  Transfer-Encoding: chunked         + END_HEADERS
-  Trailer: Foo                         :status = 200
-                                       content-length = 123
-  123                                  content-type = image/jpeg
-  {binary data}                        trailer = Foo
-  0
-  Foo: bar                         DATA
-                                     - END_STREAM
-                                   {binary data}
-
-                                   HEADERS
-                                     + END_STREAM
-                                     + END_HEADERS
-                                       foo = bar
-]]></artwork>
-          </figure>
-
-
-          <figure>
-           <preamble>
-             An informational response using a 1xx status code other than 101 is transmitted as a
-             <x:ref>HEADERS</x:ref> frame, followed by zero or more <x:ref>CONTINUATION</x:ref>
-             frames:
-           </preamble>
-           <artwork type="inline"><![CDATA[
-  HTTP/1.1 103 BAR                 HEADERS
-  Extension-Field: bar       ==>     - END_STREAM
-                                     + END_HEADERS
-                                       :status = 103
-                                       extension-field = bar
-]]></artwork>
- </figure>
-        </section>
-
-        <section anchor="Reliability" title="Request Reliability Mechanisms in HTTP/2">
-          <t>
-            In HTTP/1.1, an HTTP client is unable to retry a non-idempotent request when an error
-            occurs, because there is no means to determine the nature of the error.  It is possible
-            that some server processing occurred prior to the error, which could result in
-            undesirable effects if the request were reattempted.
-          </t>
-          <t>
-            HTTP/2 provides two mechanisms for providing a guarantee to a client that a request has
-            not been processed:
-            <list style="symbols">
-              <t>
-                The <x:ref>GOAWAY</x:ref> frame indicates the highest stream number that might have
-                been processed.  Requests on streams with higher numbers are therefore guaranteed to
-                be safe to retry.
-              </t>
-              <t>
-                The <x:ref>REFUSED_STREAM</x:ref> error code can be included in a
-                <x:ref>RST_STREAM</x:ref> frame to indicate that the stream is being closed prior to
-                any processing having occurred.  Any request that was sent on the reset stream can
-                be safely retried.
-              </t>
-            </list>
-          </t>
-          <t>
-            Requests that have not been processed have not failed; clients MAY automatically retry
-            them, even those with non-idempotent methods.
-          </t>
-          <t>
-            A server MUST NOT indicate that a stream has not been processed unless it can guarantee
-            that fact.  If frames that are on a stream are passed to the application layer for any
-            stream, then <x:ref>REFUSED_STREAM</x:ref> MUST NOT be used for that stream, and a
-            <x:ref>GOAWAY</x:ref> frame MUST include a stream identifier that is greater than or
-            equal to the given stream identifier.
-          </t>
-          <t>
-            In addition to these mechanisms, the <x:ref>PING</x:ref> frame provides a way for a
-            client to easily test a connection.  Connections that remain idle can become broken as
-            some middleboxes (for instance, network address translators, or load balancers) silently
-            discard connection bindings.  The <x:ref>PING</x:ref> frame allows a client to safely
-            test whether a connection is still active without sending a request.
-          </t>
-        </section>
-      </section>
-
-      <section anchor="PushResources" title="Server Push">
-        <t>
-          HTTP/2 allows a server to pre-emptively send (or "push") responses (along with
-          corresponding "promised" requests) to a client in association with a previous
-          client-initiated request. This can be useful when the server knows the client will need
-          to have those responses available in order to fully process the response to the original
-          request.
-        </t>
-
-        <t>
-          Pushing additional message exchanges in this fashion is optional, and is negotiated
-          between individual endpoints. The <x:ref>SETTINGS_ENABLE_PUSH</x:ref> setting can be set
-          to 0 to indicate that server push is disabled.
-        </t>
-        <t>
-          Promised requests MUST be cacheable (see <xref target="RFC7231" x:fmt=","
-          x:rel="#cacheable.methods"/>), MUST be safe (see <xref target="RFC7231" x:fmt=","
-          x:rel="#safe.methods"/>) and MUST NOT include a request body. Clients that receive a
-          promised request that is not cacheable, unsafe or that includes a request body MUST
-          reset the stream with a <xref target="StreamErrorHandler">stream error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-        <t>
-          Pushed responses that are cacheable (see <xref target="RFC7234" x:fmt=","
-          x:rel="#response.cacheability"/>) can be stored by the client, if it implements a HTTP
-          cache.  Pushed responses are considered successfully validated on the origin server (e.g.,
-          if the "no-cache" cache response directive <xref target="RFC7234" x:fmt=","
-          x:rel="#cache-response-directive"/> is present) while the stream identified by the
-          promised stream ID is still open.
-        </t>
-        <t>
-          Pushed responses that are not cacheable MUST NOT be stored by any HTTP cache. They MAY
-          be made available to the application separately.
-        </t>
-        <t>
-          An intermediary can receive pushes from the server and choose not to forward them on to
-          the client. In other words, how to make use of the pushed information is up to that
-          intermediary. Equally, the intermediary might choose to make additional pushes to the
-          client, without any action taken by the server.
-        </t>
-        <t>
-          A client cannot push. Thus, servers MUST treat the receipt of a
-          <x:ref>PUSH_PROMISE</x:ref> frame as a <xref target="ConnectionErrorHandler">connection
-          error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>. Clients MUST reject any attempt to
-          change the <x:ref>SETTINGS_ENABLE_PUSH</x:ref> setting to a value other than 0 by treating
-          the message as a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>PROTOCOL_ERROR</x:ref>.
-        </t>
-
-        <section anchor="PushRequests" title="Push Requests">
-          <t>
-            Server push is semantically equivalent to a server responding to a request; however, in
-            this case that request is also sent by the server, as a <x:ref>PUSH_PROMISE</x:ref>
-            frame.
-          </t>
-          <t>
-            The <x:ref>PUSH_PROMISE</x:ref> frame includes a header block that contains a complete
-            set of request header fields that the server attributes to the request. It is not
-            possible to push a response to a request that includes a request body.
-          </t>
-
-          <t>
-            Pushed responses are always associated with an explicit request from the client. The
-            <x:ref>PUSH_PROMISE</x:ref> frames sent by the server are sent on that explicit
-            request's stream. The <x:ref>PUSH_PROMISE</x:ref> frame also includes a promised stream
-            identifier, chosen from the stream identifiers available to the server (see <xref
-            target="StreamIdentifiers"/>).
-          </t>
-
-          <t>
-            The header fields in <x:ref>PUSH_PROMISE</x:ref> and any subsequent
-            <x:ref>CONTINUATION</x:ref> frames MUST be a valid and complete set of <xref
-            target="HttpRequest">request header fields</xref>.  The server MUST include a method in
-            the <spanx style="verb">:method</spanx> header field that is safe and cacheable.  If a
-            client receives a <x:ref>PUSH_PROMISE</x:ref> that does not include a complete and valid
-            set of header fields, or the <spanx style="verb">:method</spanx> header field identifies
-            a method that is not safe, it MUST respond with a <xref
-            target="StreamErrorHandler">stream error</xref> of type <x:ref>PROTOCOL_ERROR</x:ref>.
-          </t>
-
-          <t>
-            The server SHOULD send <x:ref>PUSH_PROMISE</x:ref> (<xref target="PUSH_PROMISE"/>)
-            frames prior to sending any frames that reference the promised responses. This avoids a
-            race where clients issue requests prior to receiving any <x:ref>PUSH_PROMISE</x:ref>
-            frames.
-          </t>
-          <t>
-            For example, if the server receives a request for a document containing embedded links
-            to multiple image files, and the server chooses to push those additional images to the
-            client, sending push promises before the <x:ref>DATA</x:ref> frames that contain the
-            image links ensures that the client is able to see the promises before discovering
-            embedded links. Similarly, if the server pushes responses referenced by the header block
-            (for instance, in Link header fields), sending the push promises before sending the
-            header block ensures that clients do not request them.
-          </t>
-
-          <t>
-            <x:ref>PUSH_PROMISE</x:ref> frames MUST NOT be sent by the client.
-          </t>
-          <t>
-            <x:ref>PUSH_PROMISE</x:ref> frames can be sent by the server in response to any
-            client-initiated stream, but the stream MUST be in either the "open" or "half closed
-            (remote)" state with respect to the server.  <x:ref>PUSH_PROMISE</x:ref> frames are
-            interspersed with the frames that comprise a response, though they cannot be
-            interspersed with <x:ref>HEADERS</x:ref> and <x:ref>CONTINUATION</x:ref> frames that
-            comprise a single header block.
-          </t>
-          <t>
-            Sending a <x:ref>PUSH_PROMISE</x:ref> frame creates a new stream and puts the stream
-            into the “reserved (local)” state for the server and the “reserved (remote)” state for
-            the client.
-          </t>
-        </section>
-
-        <section anchor="PushResponses" title="Push Responses">
-          <t>
-            After sending the <x:ref>PUSH_PROMISE</x:ref> frame, the server can begin delivering the
-            pushed response as a <xref target="HttpResponse">response</xref> on a server-initiated
-            stream that uses the promised stream identifier.  The server uses this stream to
-            transmit an HTTP response, using the same sequence of frames as defined in <xref
-            target="HttpSequence"/>.  This stream becomes <xref target="StreamStates">"half closed"
-            to the client</xref> after the initial <x:ref>HEADERS</x:ref> frame is sent.
-          </t>
-
-          <t>
-            Once a client receives a <x:ref>PUSH_PROMISE</x:ref> frame and chooses to accept the
-            pushed response, the client SHOULD NOT issue any requests for the promised response
-            until after the promised stream has closed.
-          </t>
-
-          <t>
-            If the client determines, for any reason, that it does not wish to receive the pushed
-            response from the server, or if the server takes too long to begin sending the promised
-            response, the client can send an <x:ref>RST_STREAM</x:ref> frame, using either the
-            <x:ref>CANCEL</x:ref> or <x:ref>REFUSED_STREAM</x:ref> codes, and referencing the pushed
-            stream's identifier.
-          </t>
-          <t>
-            A client can use the <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref> setting to limit the
-            number of responses that can be concurrently pushed by a server.  Advertising a
-            <x:ref>SETTINGS_MAX_CONCURRENT_STREAMS</x:ref> value of zero disables server push by
-            preventing the server from creating the necessary streams.  This does not prohibit a
-            server from sending <x:ref>PUSH_PROMISE</x:ref> frames; clients need to reset any
-            promised streams that are not wanted.
-          </t>
-
-          <t>
-            Clients receiving a pushed response MUST validate that either the server is
-            authoritative (see <xref target="authority"/>), or the proxy that provided the pushed
-            response is configured for the corresponding request. For example, a server that offers
-            a certificate for only the <spanx style="verb">example.com</spanx> DNS-ID or Common Name
-            is not permitted to push a response for <spanx
-            style="verb">https://www.example.org/doc</spanx>.
-          </t>
-          <t>
-            The response for a <x:ref>PUSH_PROMISE</x:ref> stream begins with a
-            <x:ref>HEADERS</x:ref> frame, which immediately puts the stream into the “half closed
-            (remote)” state for the server and “half closed (local)” state for the client, and ends
-            with a frame bearing END_STREAM, which places the stream in the "closed" state.
-            <list style="hanging">
-              <t hangText="Note:">
-                The client never sends a frame with the END_STREAM flag for a server push.
-              </t>
-            </list>
-          </t>
-        </section>
-
-      </section>
-
-      <section anchor="CONNECT" title="The CONNECT Method">
-        <t>
-          In HTTP/1.x, the pseudo-method CONNECT (<xref target="RFC7231" x:fmt=","
-          x:rel="#CONNECT"/>) is used to convert an HTTP connection into a tunnel to a remote host.
-          CONNECT is primarily used with HTTP proxies to establish a TLS session with an origin
-          server for the purposes of interacting with <spanx style="verb">https</spanx> resources.
-        </t>
-        <t>
-          In HTTP/2, the CONNECT method is used to establish a tunnel over a single HTTP/2 stream to
-          a remote host, for similar purposes. The HTTP header field mapping works as defined in
-          <xref target="HttpRequest">Request Header Fields</xref>, with a few
-          differences. Specifically:
-          <list style="symbols">
-            <t>
-              The <spanx style="verb">:method</spanx> header field is set to <spanx
-              style="verb">CONNECT</spanx>.
-            </t>
-            <t>
-              The <spanx style="verb">:scheme</spanx> and <spanx style="verb">:path</spanx> header
-              fields MUST be omitted.
-            </t>
-            <t>
-              The <spanx style="verb">:authority</spanx> header field contains the host and port to
-              connect to (equivalent to the authority-form of the request-target of CONNECT
-              requests, see <xref target="RFC7230" x:fmt="," x:rel="#request-target"/>).
-            </t>
-          </list>
-        </t>
-        <t>
-          A proxy that supports CONNECT establishes a <xref target="TCP">TCP connection</xref> to
-          the server identified in the <spanx style="verb">:authority</spanx> header field. Once
-          this connection is successfully established, the proxy sends a <x:ref>HEADERS</x:ref>
-          frame containing a 2xx series status code to the client, as defined in <xref
-          target="RFC7231" x:fmt="," x:rel="#CONNECT"/>.
-        </t>
-        <t>
-          After the initial <x:ref>HEADERS</x:ref> frame sent by each peer, all subsequent
-          <x:ref>DATA</x:ref> frames correspond to data sent on the TCP connection.  The payload of
-          any <x:ref>DATA</x:ref> frames sent by the client is transmitted by the proxy to the TCP
-          server; data received from the TCP server is assembled into <x:ref>DATA</x:ref> frames by
-          the proxy.  Frame types other than <x:ref>DATA</x:ref> or stream management frames
-          (<x:ref>RST_STREAM</x:ref>, <x:ref>WINDOW_UPDATE</x:ref>, and <x:ref>PRIORITY</x:ref>)
-          MUST NOT be sent on a connected stream, and MUST be treated as a <xref
-          target="StreamErrorHandler">stream error</xref> if received.
-        </t>
-        <t>
-          The TCP connection can be closed by either peer.  The END_STREAM flag on a
-          <x:ref>DATA</x:ref> frame is treated as being equivalent to the TCP FIN bit.  A client is
-          expected to send a <x:ref>DATA</x:ref> frame with the END_STREAM flag set after receiving
-          a frame bearing the END_STREAM flag.  A proxy that receives a <x:ref>DATA</x:ref> frame
-          with the END_STREAM flag set sends the attached data with the FIN bit set on the last TCP
-          segment.  A proxy that receives a TCP segment with the FIN bit set sends a
-          <x:ref>DATA</x:ref> frame with the END_STREAM flag set.  Note that the final TCP segment
-          or <x:ref>DATA</x:ref> frame could be empty.
-        </t>
-        <t>
-          A TCP connection error is signaled with <x:ref>RST_STREAM</x:ref>.  A proxy treats any
-          error in the TCP connection, which includes receiving a TCP segment with the RST bit set,
-          as a <xref target="StreamErrorHandler">stream error</xref> of type
-          <x:ref>CONNECT_ERROR</x:ref>.  Correspondingly, a proxy MUST send a TCP segment with the
-          RST bit set if it detects an error with the stream or the HTTP/2 connection.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="HttpExtra" title="Additional HTTP Requirements/Considerations">
-      <t>
-        This section outlines attributes of the HTTP protocol that improve interoperability, reduce
-        exposure to known security vulnerabilities, or reduce the potential for implementation
-        variation.
-      </t>
-
-      <section title="Connection Management">
-        <t>
-          HTTP/2 connections are persistent.  For best performance, it is expected clients will not
-          close connections until it is determined that no further communication with a server is
-          necessary (for example, when a user navigates away from a particular web page), or until
-          the server closes the connection.
-        </t>
-        <t>
-          Clients SHOULD NOT open more than one HTTP/2 connection to a given host and port pair,
-          where host is derived from a URI, a selected <xref target="ALT-SVC">alternative
-          service</xref>, or a configured proxy.
-        </t>
-        <t>
-          A client can create additional connections as replacements, either to replace connections
-          that are near to exhausting the available <xref target="StreamIdentifiers">stream
-          identifier space</xref>, to refresh the keying material for a TLS connection, or to
-          replace connections that have encountered <xref
-          target="ConnectionErrorHandler">errors</xref>.
-        </t>
-        <t>
-          A client MAY open multiple connections to the same IP address and TCP port using different
-          <xref target="TLS-EXT">Server Name Indication</xref> values or to provide different TLS
-          client certificates, but SHOULD avoid creating multiple connections with the same
-          configuration.
-        </t>
-        <t>
-          Servers are encouraged to maintain open connections for as long as possible, but are
-          permitted to terminate idle connections if necessary.  When either endpoint chooses to
-          close the transport-layer TCP connection, the terminating endpoint SHOULD first send a
-          <x:ref>GOAWAY</x:ref> (<xref target="GOAWAY"/>) frame so that both endpoints can reliably
-          determine whether previously sent frames have been processed and gracefully complete or
-          terminate any necessary remaining tasks.
-        </t>
-
-        <section anchor="reuse" title="Connection Reuse">
-          <t>
-            Connections that are made to an origin servers, either directly or through a tunnel
-            created using the <xref target="CONNECT">CONNECT method</xref> MAY be reused for
-            requests with multiple different URI authority components.  A connection can be reused
-            as long as the origin server is <xref target="authority">authoritative</xref>.  For
-            <spanx style="verb">http</spanx> resources, this depends on the host having resolved to
-            the same IP address.
-          </t>
-          <t>
-            For <spanx style="verb">https</spanx> resources, connection reuse additionally depends
-            on having a certificate that is valid for the host in the URI.  An origin server might
-            offer a certificate with multiple <spanx style="verb">subjectAltName</spanx> attributes,
-            or names with wildcards, one of which is valid for the authority in the URI.  For
-            example, a certificate with a <spanx style="verb">subjectAltName</spanx> of <spanx
-            style="verb">*.example.com</spanx> might permit the use of the same connection for
-            requests to URIs starting with <spanx style="verb">https://a.example.com/</spanx> and
-            <spanx style="verb">https://b.example.com/</spanx>.
-          </t>
-          <t>
-            In some deployments, reusing a connection for multiple origins can result in requests
-            being directed to the wrong origin server.  For example, TLS termination might be
-            performed by a middlebox that uses the TLS <xref target="TLS-EXT">Server Name Indication
-            (SNI)</xref> extension to select an origin server.  This means that it is possible
-            for clients to send confidential information to servers that might not be the intended
-            target for the request, even though the server is otherwise authoritative.
-          </t>
-          <t>
-            A server that does not wish clients to reuse connections can indicate that it is not
-            authoritative for a request by sending a 421 (Misdirected Request) status code in response
-            to the request (see <xref target="MisdirectedRequest"/>).
-          </t>
-          <t>
-            A client that is configured to use a proxy over HTTP/2 directs requests to that proxy
-            through a single connection.  That is, all requests sent via a proxy reuse the
-            connection to the proxy.
-          </t>
-        </section>
-
-        <section anchor="MisdirectedRequest" title="The 421 (Misdirected Request) Status Code">
-          <t>
-            The 421 (Misdirected Request) status code indicates that the request was directed at a
-            server that is not able to produce a response.  This can be sent by a server that is not
-            configured to produce responses for the combination of scheme and authority that are
-            included in the request URI.
-          </t>
-          <t>
-            Clients receiving a 421 (Misdirected Request) response from a server MAY retry the
-            request - whether the request method is idempotent or not - over a different connection.
-            This is possible if a connection is reused (<xref target="reuse"/>) or if an alternative
-            service is selected (<xref target="ALT-SVC"/>).
-          </t>
-          <t>
-            This status code MUST NOT be generated by proxies.
-          </t>
-          <t>
-            A 421 response is cacheable by default; i.e., unless otherwise indicated by the method
-            definition or explicit cache controls (see <xref target="RFC7234"
-            x:rel="#heuristic.freshness" x:fmt="of"/>).
-          </t>
-        </section>
-      </section>
-
-      <section title="Use of TLS Features" anchor="TLSUsage">
-        <t>
-          Implementations of HTTP/2 MUST support <xref target="TLS12">TLS 1.2</xref> for HTTP/2 over
-          TLS.  The general TLS usage guidance in <xref target="TLSBCP"/> SHOULD be followed, with
-          some additional restrictions that are specific to HTTP/2.
-        </t>
-
-        <t>
-          An implementation of HTTP/2 over TLS MUST use TLS 1.2 or higher with the restrictions on
-          feature set and cipher suite described in this section.  Due to implementation
-          limitations, it might not be possible to fail TLS negotiation.  An endpoint MUST
-          immediately terminate an HTTP/2 connection that does not meet these minimum requirements
-          with a <xref target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>INADEQUATE_SECURITY</x:ref>.
-        </t>
-
-        <section anchor="TLSFeatures" title="TLS Features">
-          <t>
-            The TLS implementation MUST support the <xref target="TLS-EXT">Server Name Indication
-            (SNI)</xref> extension to TLS. HTTP/2 clients MUST indicate the target domain name when
-            negotiating TLS.
-          </t>
-          <t>
-            The TLS implementation MUST disable compression.  TLS compression can lead to the
-            exposure of information that would not otherwise be revealed <xref target="RFC3749"/>.
-            Generic compression is unnecessary since HTTP/2 provides compression features that are
-            more aware of context and therefore likely to be more appropriate for use for
-            performance, security or other reasons.
-          </t>
-          <t>
-            The TLS implementation MUST disable renegotiation.  An endpoint MUST treat a TLS
-            renegotiation as a <xref target="ConnectionErrorHandler">connection error</xref> of type
-            <x:ref>PROTOCOL_ERROR</x:ref>.  Note that disabling renegotiation can result in
-            long-lived connections becoming unusable due to limits on the number of messages the
-            underlying cipher suite can encipher.
-          </t>
-          <t>
-            A client MAY use renegotiation to provide confidentiality protection for client
-            credentials offered in the handshake, but any renegotiation MUST occur prior to sending
-            the connection preface.  A server SHOULD request a client certificate if it sees a
-            renegotiation request immediately after establishing a connection.
-          </t>
-          <t>
-            This effectively prevents the use of renegotiation in response to a request for a
-            specific protected resource.  A future specification might provide a way to support this
-            use case. <!-- <cref> We are tracking this in a non-blocking fashion in issue #496 and
-            with a new draft. -->
-          </t>
-        </section>
-
-        <section title="TLS Cipher Suites">
-          <t>
-            The set of TLS cipher suites that are permitted in HTTP/2 is restricted.  HTTP/2 MUST
-            only be used with cipher suites that have ephemeral key exchange, such as the <xref
-            target="TLS12">ephemeral Diffie-Hellman (DHE)</xref> or the <xref
-            target="RFC4492">elliptic curve variant (ECDHE)</xref>.  Ephemeral key exchange MUST
-            have a minimum size of 2048 bits for DHE or security level of 128 bits for ECDHE.
-            Clients MUST accept DHE sizes of up to 4096 bits.  HTTP MUST NOT be used with cipher
-            suites that use stream or block ciphers.  Authenticated Encryption with Additional Data
-            (AEAD) modes, such as the <xref target="RFC5288">Galois Counter Model (GCM) mode for
-            AES</xref> are acceptable.
-          </t>
-          <t>
-            The effect of these restrictions is that TLS 1.2 implementations could have
-            non-intersecting sets of available cipher suites, since these prevent the use of the
-            cipher suite that TLS 1.2 makes mandatory.  To avoid this problem, implementations of
-            HTTP/2 that use TLS 1.2 MUST support TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 <xref
-            target="TLS-ECDHE"/> with P256 <xref target="FIPS186"/>.
-          </t>
-          <t>
-            Clients MAY advertise support of cipher suites that are prohibited by the above
-            restrictions in order to allow for connection to servers that do not support HTTP/2.
-            This enables a fallback to protocols without these constraints without the additional
-            latency imposed by using a separate connection for fallback.
-          </t>
-        </section>
-      </section>
-    </section>
-
-    <section anchor="security" title="Security Considerations">
-      <section title="Server Authority" anchor="authority">
-        <t>
-          HTTP/2 relies on the HTTP/1.1 definition of authority for determining whether a server is
-          authoritative in providing a given response, see <xref target="RFC7230" x:fmt=","
-          x:rel="#establishing.authority"/>.  This relies on local name resolution for the "http"
-          URI scheme, and the authenticated server identity for the "https" scheme (see <xref
-          target="RFC2818" x:fmt="," x:sec="3"/>).
-        </t>
-      </section>
-
-      <section title="Cross-Protocol Attacks">
-        <t>
-          In a cross-protocol attack, an attacker causes a client to initiate a transaction in one
-          protocol toward a server that understands a different protocol.  An attacker might be able
-          to cause the transaction to appear as valid transaction in the second protocol.  In
-          combination with the capabilities of the web context, this can be used to interact with
-          poorly protected servers in private networks.
-        </t>
-        <t>
-          Completing a TLS handshake with an ALPN identifier for HTTP/2 can be considered sufficient
-          protection against cross protocol attacks.  ALPN provides a positive indication that a
-          server is willing to proceed with HTTP/2, which prevents attacks on other TLS-based
-          protocols.
-        </t>
-        <t>
-          The encryption in TLS makes it difficult for attackers to control the data which could be
-          used in a cross-protocol attack on a cleartext protocol.
-        </t>
-        <t>
-          The cleartext version of HTTP/2 has minimal protection against cross-protocol attacks.
-          The <xref target="ConnectionHeader">connection preface</xref> contains a string that is
-          designed to confuse HTTP/1.1 servers, but no special protection is offered for other
-          protocols.  A server that is willing to ignore parts of an HTTP/1.1 request containing an
-          Upgrade header field in addition to the client connection preface could be exposed to a
-          cross-protocol attack.
-        </t>
-      </section>
-
-      <section title="Intermediary Encapsulation Attacks">
-        <t>
-          HTTP/2 header field names and values are encoded as sequences of octets with a length
-          prefix.  This enables HTTP/2 to carry any string of octets as the name or value of a
-          header field.  An intermediary that translates HTTP/2 requests or responses into HTTP/1.1
-          directly could permit the creation of corrupted HTTP/1.1 messages.  An attacker might
-          exploit this behavior to cause the intermediary to create HTTP/1.1 messages with illegal
-          header fields, extra header fields, or even new messages that are entirely falsified.
-        </t>
-        <t>
-          Header field names or values that contain characters not permitted by HTTP/1.1, including
-          carriage return (ASCII 0xd) or line feed (ASCII 0xa) MUST NOT be translated verbatim by an
-          intermediary, as stipulated in <xref target="RFC7230" x:rel="#field.parsing" x:fmt=","/>.
-        </t>
-        <t>
-          Translation from HTTP/1.x to HTTP/2 does not produce the same opportunity to an attacker.
-          Intermediaries that perform translation to HTTP/2 MUST remove any instances of the <spanx
-          style="verb">obs-fold</spanx> production from header field values.
-        </t>
-      </section>
-
-      <section title="Cacheability of Pushed Responses">
-        <t>
-          Pushed responses do not have an explicit request from the client; the request
-          is provided by the server in the <x:ref>PUSH_PROMISE</x:ref> frame.
-        </t>
-        <t>
-          Caching responses that are pushed is possible based on the guidance provided by the origin
-          server in the Cache-Control header field.  However, this can cause issues if a single
-          server hosts more than one tenant.  For example, a server might offer multiple users each
-          a small portion of its URI space.
-        </t>
-        <t>
-          Where multiple tenants share space on the same server, that server MUST ensure that
-          tenants are not able to push representations of resources that they do not have authority
-          over.  Failure to enforce this would allow a tenant to provide a representation that would
-          be served out of cache, overriding the actual representation that the authoritative tenant
-          provides.
-        </t>
-        <t>
-          Pushed responses for which an origin server is not authoritative (see
-          <xref target="authority"/>) are never cached or used.
-        </t>
-      </section>
-
-      <section anchor="dos" title="Denial of Service Considerations">
-        <t>
-          An HTTP/2 connection can demand a greater commitment of resources to operate than a
-          HTTP/1.1 connection.  The use of header compression and flow control depend on a
-          commitment of resources for storing a greater amount of state.  Settings for these
-          features ensure that memory commitments for these features are strictly bounded.
-        </t>
-        <t>
-          The number of <x:ref>PUSH_PROMISE</x:ref> frames is not constrained in the same fashion.
-          A client that accepts server push SHOULD limit the number of streams it allows to be in
-          the "reserved (remote)" state.  Excessive number of server push streams can be treated as
-          a <xref target="StreamErrorHandler">stream error</xref> of type
-          <x:ref>ENHANCE_YOUR_CALM</x:ref>.
-        </t>
-        <t>
-          Processing capacity cannot be guarded as effectively as state capacity.
-        </t>
-        <t>
-          The <x:ref>SETTINGS</x:ref> frame can be abused to cause a peer to expend additional
-          processing time. This might be done by pointlessly changing SETTINGS parameters, setting
-          multiple undefined parameters, or changing the same setting multiple times in the same
-          frame.  <x:ref>WINDOW_UPDATE</x:ref> or <x:ref>PRIORITY</x:ref> frames can be abused to
-          cause an unnecessary waste of resources.
-        </t>
-        <t>
-          Large numbers of small or empty frames can be abused to cause a peer to expend time
-          processing frame headers.  Note however that some uses are entirely legitimate, such as
-          the sending of an empty <x:ref>DATA</x:ref> frame to end a stream.
-        </t>
-        <t>
-          Header compression also offers some opportunities to waste processing resources; see <xref
-          target="COMPRESSION" x:fmt="of" x:rel="#Security"/> for more details on potential abuses.
-        </t>
-        <t>
-          Limits in <x:ref>SETTINGS</x:ref> parameters cannot be reduced instantaneously, which
-          leaves an endpoint exposed to behavior from a peer that could exceed the new limits. In
-          particular, immediately after establishing a connection, limits set by a server are not
-          known to clients and could be exceeded without being an obvious protocol violation.
-        </t>
-        <t>
-          All these features - i.e., <x:ref>SETTINGS</x:ref> changes, small frames, header
-          compression - have legitimate uses.  These features become a burden only when they are
-          used unnecessarily or to excess.
-        </t>
-        <t>
-          An endpoint that doesn't monitor this behavior exposes itself to a risk of denial of
-          service attack.  Implementations SHOULD track the use of these features and set limits on
-          their use.  An endpoint MAY treat activity that is suspicious as a <xref
-          target="ConnectionErrorHandler">connection error</xref> of type
-          <x:ref>ENHANCE_YOUR_CALM</x:ref>.
-        </t>
-
-        <section anchor="MaxHeaderBlock" title="Limits on Header Block Size">
-          <t>
-            A large <xref target="HeaderBlock">header block</xref> can cause an implementation to
-            commit a large amount of state.  Header fields that are critical for routing can appear
-            toward the end of a header block, which prevents streaming of header fields to their
-            ultimate destination. For this an other reasons, such as ensuring cache correctness,
-            means that an endpoint might need to buffer the entire header block.  Since there is no
-            hard limit to the size of a header block, some endpoints could be forced commit a large
-            amount of available memory for header fields.
-          </t>
-          <t>
-            An endpoint can use the <x:ref>SETTINGS_MAX_HEADER_LIST_SIZE</x:ref> to advise peers of
-            limits that might apply on the size of header blocks.  This setting is only advisory, so
-            endpoints MAY choose to send header blocks that exceed this limit and risk having the
-            request or response being treated as malformed.  This setting specific to a connection,
-            so any request or response could encounter a hop with a lower, unknown limit.  An
-            intermediary can attempt to avoid this problem by passing on values presented by
-            different peers, but they are not obligated to do so.
-          </t>
-          <t>
-            A server that receives a larger header block than it is willing to handle can send an
-            HTTP 431 (Request Header Fields Too Large) status code <xref target="RFC6585"/>.  A
-            client can discard responses that it cannot process.  The header block MUST be processed
-            to ensure a consistent connection state, unless the connection is closed.
-          </t>
-        </section>
-      </section>
-
-      <section title="Use of Compression">
-        <t>
-          HTTP/2 enables greater use of compression for both header fields (<xref
-          target="HeaderBlock"/>) and entity bodies.  Compression can allow an attacker to recover
-          secret data when it is compressed in the same context as data under attacker control.
-        </t>
-        <t>
-          There are demonstrable attacks on compression that exploit the characteristics of the web
-          (e.g., <xref target="BREACH"/>).  The attacker induces multiple requests containing
-          varying plaintext, observing the length of the resulting ciphertext in each, which
-          reveals a shorter length when a guess about the secret is correct.
-        </t>
-        <t>
-          Implementations communicating on a secure channel MUST NOT compress content that includes
-          both confidential and attacker-controlled data unless separate compression dictionaries
-          are used for each source of data.  Compression MUST NOT be used if the source of data
-          cannot be reliably determined.  Generic stream compression, such as that provided by TLS
-          MUST NOT be used with HTTP/2 (<xref target="TLSFeatures"/>).
-        </t>
-        <t>
-          Further considerations regarding the compression of header fields are described in <xref
-          target="COMPRESSION"/>.
-        </t>
-      </section>
-
-      <section title="Use of Padding" anchor="padding">
-        <t>
-          Padding within HTTP/2 is not intended as a replacement for general purpose padding, such
-          as might be provided by <xref target="TLS12">TLS</xref>.  Redundant padding could even be
-          counterproductive.  Correct application can depend on having specific knowledge of the
-          data that is being padded.
-        </t>
-        <t>
-          To mitigate attacks that rely on compression, disabling or limiting compression might be
-          preferable to padding as a countermeasure.
-        </t>
-        <t>
-          Padding can be used to obscure the exact size of frame content, and is provided to
-          mitigate specific attacks within HTTP.  For example, attacks where compressed content
-          includes both attacker-controlled plaintext and secret data (see for example, <xref
-          target="BREACH"/>).
-        </t>
-        <t>
-          Use of padding can result in less protection than might seem immediately obvious.  At
-          best, padding only makes it more difficult for an attacker to infer length information by
-          increasing the number of frames an attacker has to observe.  Incorrectly implemented
-          padding schemes can be easily defeated.  In particular, randomized padding with a
-          predictable distribution provides very little protection; similarly, padding payloads to a
-          fixed size exposes information as payload sizes cross the fixed size boundary, which could
-          be possible if an attacker can control plaintext.
-        </t>
-        <t>
-          Intermediaries SHOULD retain padding for <x:ref>DATA</x:ref> frames, but MAY drop padding
-          for <x:ref>HEADERS</x:ref> and <x:ref>PUSH_PROMISE</x:ref> frames.  A valid reason for an
-          intermediary to change the amount of padding of frames is to improve the protections that
-          padding provides.
-        </t>
-      </section>
-
-      <section title="Privacy Considerations">
-        <t>
-          Several characteristics of HTTP/2 provide an observer an opportunity to correlate actions
-          of a single client or server over time.  This includes the value of settings, the manner
-          in which flow control windows are managed, the way priorities are allocated to streams,
-          timing of reactions to stimulus, and handling of any optional features.
-        </t>
-        <t>
-          As far as this creates observable differences in behavior, they could be used as a basis
-          for fingerprinting a specific client, as defined in <xref target="HTML5" x:fmt="of"
-          x:sec="1.8" x:rel="introduction.html#fingerprint"/>.
-        </t>
-      </section>
-    </section>
-
-    <section anchor="iana" title="IANA Considerations">
-      <t>
-        A string for identifying HTTP/2 is entered into the "Application Layer Protocol Negotiation
-        (ALPN) Protocol IDs" registry established in <xref target="TLS-ALPN"/>.
-      </t>
-      <t>
-        This document establishes a registry for frame types, settings, and error codes.  These new
-        registries are entered into a new "Hypertext Transfer Protocol (HTTP) 2 Parameters" section.
-      </t>
-      <t>
-        This document registers the <spanx style="verb">HTTP2-Settings</spanx> header field for
-        use in HTTP; and the 421 (Misdirected Request) status code.
-      </t>
-      <t>
-        This document registers the <spanx style="verb">PRI</spanx> method for use in HTTP, to avoid
-        collisions with the <xref target="ConnectionHeader">connection preface</xref>.
-      </t>
-
-      <section anchor="iana-alpn" title="Registration of HTTP/2 Identification Strings">
-        <t>
-          This document creates two registrations for the identification of HTTP/2 in the
-          "Application Layer Protocol Negotiation (ALPN) Protocol IDs" registry established in <xref
-          target="TLS-ALPN"/>.
-        </t>
-        <t>
-          The "h2" string identifies HTTP/2 when used over TLS:
-          <list style="hanging">
-            <t hangText="Protocol:">HTTP/2 over TLS</t>
-            <t hangText="Identification Sequence:">0x68 0x32 ("h2")</t>
-            <t hangText="Specification:">This document</t>
-          </list>
-        </t>
-        <t>
-          The "h2c" string identifies HTTP/2 when used over cleartext TCP:
-          <list style="hanging">
-            <t hangText="Protocol:">HTTP/2 over TCP</t>
-            <t hangText="Identification Sequence:">0x68 0x32 0x63 ("h2c")</t>
-            <t hangText="Specification:">This document</t>
-          </list>
-        </t>
-      </section>
-
-      <section anchor="iana-frames" title="Frame Type Registry">
-        <t>
-          This document establishes a registry for HTTP/2 frame type codes.  The "HTTP/2 Frame
-          Type" registry manages an 8-bit space.  The "HTTP/2 Frame Type" registry operates under
-          either of the <xref target="RFC5226">"IETF Review" or "IESG Approval" policies</xref> for
-          values between 0x00 and 0xef, with values between 0xf0 and 0xff being reserved for
-          experimental use.
-        </t>
-        <t>
-          New entries in this registry require the following information:
-          <list style="hanging">
-            <t hangText="Frame Type:">
-              A name or label for the frame type.
-            </t>
-            <t hangText="Code:">
-              The 8-bit code assigned to the frame type.
-            </t>
-            <t hangText="Specification:">
-              A reference to a specification that includes a description of the frame layout,
-              it's semantics and flags that the frame type uses, including any parts of the frame
-              that are conditionally present based on the value of flags.
-            </t>
-          </list>
-        </t>
-        <t>
-          The entries in the following table are registered by this document.
-        </t>
-        <texttable align="left" suppress-title="true">
-          <ttcol>Frame Type</ttcol>
-          <ttcol>Code</ttcol>
-          <ttcol>Section</ttcol>
-          <c>DATA</c><c>0x0</c><c><xref target="DATA"/></c>
-          <c>HEADERS</c><c>0x1</c><c><xref target="HEADERS"/></c>
-          <c>PRIORITY</c><c>0x2</c><c><xref target="PRIORITY"/></c>
-          <c>RST_STREAM</c><c>0x3</c><c><xref target="RST_STREAM"/></c>
-          <c>SETTINGS</c><c>0x4</c><c><xref target="SETTINGS"/></c>
-          <c>PUSH_PROMISE</c><c>0x5</c><c><xref target="PUSH_PROMISE"/></c>
-          <c>PING</c><c>0x6</c><c><xref target="PING"/></c>
-          <c>GOAWAY</c><c>0x7</c><c><xref target="GOAWAY"/></c>
-          <c>WINDOW_UPDATE</c><c>0x8</c><c><xref target="WINDOW_UPDATE"/></c>
-          <c>CONTINUATION</c><c>0x9</c><c><xref target="CONTINUATION"/></c>
-        </texttable>
-      </section>
-
-      <section anchor="iana-settings" title="Settings Registry">
-        <t>
-          This document establishes a registry for HTTP/2 settings.  The "HTTP/2 Settings" registry
-          manages a 16-bit space.  The "HTTP/2 Settings" registry operates under the <xref
-          target="RFC5226">"Expert Review" policy</xref> for values in the range from 0x0000 to
-          0xefff, with values between and 0xf000 and 0xffff being reserved for experimental use.
-        </t>
-        <t>
-          New registrations are advised to provide the following information:
-          <list style="hanging">
-            <t hangText="Name:">
-              A symbolic name for the setting.  Specifying a setting name is optional.
-            </t>
-            <t hangText="Code:">
-              The 16-bit code assigned to the setting.
-            </t>
-            <t hangText="Initial Value:">
-              An initial value for the setting.
-            </t>
-            <t hangText="Specification:">
-              An optional reference to a specification that describes the use of the setting.
-            </t>
-          </list>
-        </t>
-        <t>
-          An initial set of setting registrations can be found in <xref target="SettingValues"/>.
-        </t>
-        <texttable align="left" suppress-title="true">
-          <ttcol>Name</ttcol>
-          <ttcol>Code</ttcol>
-          <ttcol>Initial Value</ttcol>
-          <ttcol>Specification</ttcol>
-          <c>HEADER_TABLE_SIZE</c>
-          <c>0x1</c><c>4096</c><c><xref target="SettingValues"/></c>
-          <c>ENABLE_PUSH</c>
-          <c>0x2</c><c>1</c><c><xref target="SettingValues"/></c>
-          <c>MAX_CONCURRENT_STREAMS</c>
-          <c>0x3</c><c>(infinite)</c><c><xref target="SettingValues"/></c>
-          <c>INITIAL_WINDOW_SIZE</c>
-          <c>0x4</c><c>65535</c><c><xref target="SettingValues"/></c>
-          <c>MAX_FRAME_SIZE</c>
-          <c>0x5</c><c>16384</c><c><xref target="SettingValues"/></c>
-          <c>MAX_HEADER_LIST_SIZE</c>
-          <c>0x6</c><c>(infinite)</c><c><xref target="SettingValues"/></c>
-        </texttable>
-
-      </section>
-
-      <section anchor="iana-errors" title="Error Code Registry">
-        <t>
-          This document establishes a registry for HTTP/2 error codes.  The "HTTP/2 Error Code"
-          registry manages a 32-bit space.  The "HTTP/2 Error Code" registry operates under the
-          <xref target="RFC5226">"Expert Review" policy</xref>.
-        </t>
-        <t>
-          Registrations for error codes are required to include a description of the error code.  An
-          expert reviewer is advised to examine new registrations for possible duplication with
-          existing error codes.  Use of existing registrations is to be encouraged, but not
-          mandated.
-        </t>
-        <t>
-          New registrations are advised to provide the following information:
-          <list style="hanging">
-            <t hangText="Name:">
-              A name for the error code.  Specifying an error code name is optional.
-            </t>
-            <t hangText="Code:">
-              The 32-bit error code value.
-            </t>
-            <t hangText="Description:">
-              A brief description of the error code semantics, longer if no detailed specification
-              is provided.
-            </t>
-            <t hangText="Specification:">
-              An optional reference for a specification that defines the error code.
-            </t>
-          </list>
-        </t>
-        <t>
-          The entries in the following table are registered by this document.
-        </t>
-        <texttable align="left" suppress-title="true">
-          <ttcol>Name</ttcol>
-          <ttcol>Code</ttcol>
-          <ttcol>Description</ttcol>
-          <ttcol>Specification</ttcol>
-          <c>NO_ERROR</c><c>0x0</c>
-          <c>Graceful shutdown</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>PROTOCOL_ERROR</c><c>0x1</c>
-          <c>Protocol error detected</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>INTERNAL_ERROR</c><c>0x2</c>
-          <c>Implementation fault</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>FLOW_CONTROL_ERROR</c><c>0x3</c>
-          <c>Flow control limits exceeded</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>SETTINGS_TIMEOUT</c><c>0x4</c>
-          <c>Settings not acknowledged</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>STREAM_CLOSED</c><c>0x5</c>
-          <c>Frame received for closed stream</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>FRAME_SIZE_ERROR</c><c>0x6</c>
-          <c>Frame size incorrect</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>REFUSED_STREAM</c><c>0x7</c>
-          <c>Stream not processed</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>CANCEL</c><c>0x8</c>
-          <c>Stream cancelled</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>COMPRESSION_ERROR</c><c>0x9</c>
-          <c>Compression state not updated</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>CONNECT_ERROR</c><c>0xa</c>
-          <c>TCP connection error for CONNECT method</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>ENHANCE_YOUR_CALM</c><c>0xb</c>
-          <c>Processing capacity exceeded</c>
-          <c><xref target="ErrorCodes"/></c>
-          <c>INADEQUATE_SECURITY</c><c>0xc</c>
-          <c>Negotiated TLS parameters not acceptable</c>
-          <c><xref target="ErrorCodes"/></c>
-        </texttable>
-
-      </section>
-
-      <section title="HTTP2-Settings Header Field Registration">
-        <t>
-          This section registers the <spanx style="verb">HTTP2-Settings</spanx> header field in the
-          <xref target="BCP90">Permanent Message Header Field Registry</xref>.
-          <list style="hanging">
-            <t hangText="Header field name:">
-              HTTP2-Settings
-            </t>
-            <t hangText="Applicable protocol:">
-              http
-            </t>
-            <t hangText="Status:">
-              standard
-            </t>
-            <t hangText="Author/Change controller:">
-              IETF
-            </t>
-            <t hangText="Specification document(s):">
-              <xref target="Http2SettingsHeader"/> of this document
-            </t>
-            <t hangText="Related information:">
-              This header field is only used by an HTTP/2 client for Upgrade-based negotiation.
-            </t>
-          </list>
-        </t>
-      </section>
-
-      <section title="PRI Method Registration">
-        <t>
-          This section registers the <spanx style="verb">PRI</spanx> method in the HTTP Method
-          Registry (<xref target="RFC7231" x:fmt="," x:rel="#method.registry"/>).
-          <list style="hanging">
-            <t hangText="Method Name:">
-              PRI
-            </t>
-            <t hangText="Safe">
-              No
-            </t>
-            <t hangText="Idempotent">
-              No
-            </t>
-            <t hangText="Specification document(s)">
-              <xref target="ConnectionHeader"/> of this document
-            </t>
-            <t hangText="Related information:">
-              This method is never used by an actual client. This method will appear to be used
-              when an HTTP/1.1 server or intermediary attempts to parse an HTTP/2 connection
-              preface.
-            </t>
-          </list>
-        </t>
-      </section>
-
-      <section title="The 421 (Misdirected Request) HTTP Status Code"
-               anchor="iana-MisdirectedRequest">
-        <t>
-          This document registers the 421 (Misdirected Request) HTTP Status code in the Hypertext
-          Transfer Protocol (HTTP) Status Code Registry (<xref target="RFC7231" x:fmt=","
-          x:rel="#status.code.registry"/>).
-        </t>
-        <t>
-          <list style="hanging">
-            <t hangText="Status Code:">
-              421
-            </t>
-            <t hangText="Short Description:">
-              Misdirected Request
-            </t>
-            <t hangText="Specification:">
-              <xref target="MisdirectedRequest"/> of this document
-            </t>
-          </list>
-        </t>
-      </section>
-
-    </section>
-
-    <section title="Acknowledgements">
-      <t>
-        This document includes substantial input from the following individuals:
-        <list style="symbols">
-          <t>
-            Adam Langley, Wan-Teh Chang, Jim Morrison, Mark Nottingham, Alyssa Wilk, Costin
-            Manolache, William Chan, Vitaliy Lvin, Joe Chan, Adam Barth, Ryan Hamilton, Gavin
-            Peters, Kent Alstad, Kevin Lindsay, Paul Amer, Fan Yang, Jonathan Leighton (SPDY
-            contributors).
-          </t>
-          <t>
-            Gabriel Montenegro and Willy Tarreau (Upgrade mechanism).
-          </t>
-          <t>
-            William Chan, Salvatore Loreto, Osama Mazahir, Gabriel Montenegro, Jitu Padhye, Roberto
-            Peon, Rob Trace (Flow control).
-          </t>
-          <t>
-            Mike Bishop (Extensibility).
-          </t>
-          <t>
-            Mark Nottingham, Julian Reschke, James Snell, Jeff Pinner, Mike Bishop, Herve Ruellan
-            (Substantial editorial contributions).
-          </t>
-          <t>
-            Kari Hurtta, Tatsuhiro Tsujikawa, Greg Wilkins, Poul-Henning Kamp.
-          </t>
-          <t>
-            Alexey Melnikov was an editor of this document during 2013.
-          </t>
-          <t>
-            A substantial proportion of Martin's contribution was supported by Microsoft during his
-            employment there.
-          </t>
-        </list>
-      </t>
-    </section>
-  </middle>
-
-  <back>
-    <references title="Normative References">
-      <reference anchor="COMPRESSION">
-        <front>
-          <title>HPACK - Header Compression for HTTP/2</title>
-          <author initials="H." surname="Ruellan" fullname="Herve Ruellan"/>
-          <author initials="R." surname="Peon" fullname="Roberto Peon"/>
-          <date month="July" year="2014" />
-        </front>
-        <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-header-compression-09" />
-        <x:source href="refs/draft-ietf-httpbis-header-compression-09.xml"/>
-      </reference>
-
-      <reference anchor="TCP">
-        <front>
-          <title abbrev="Transmission Control Protocol">
-            Transmission Control Protocol
-          </title>
-          <author initials="J." surname="Postel" fullname="Jon Postel">
-            <organization>University of Southern California (USC)/Information Sciences
-            Institute</organization>
-          </author>
-          <date year="1981" month="September" />
-        </front>
-        <seriesInfo name="STD" value="7" />
-        <seriesInfo name="RFC" value="793" />
-      </reference>
-
-      <reference anchor="RFC2119">
-        <front>
-          <title>
-            Key words for use in RFCs to Indicate Requirement Levels
-          </title>
-          <author initials="S." surname="Bradner" fullname="Scott Bradner">
-            <organization>Harvard University</organization>
-            <address><email>sob@harvard.edu</email></address>
-          </author>
-          <date month="March" year="1997"/>
-        </front>
-        <seriesInfo name="BCP" value="14"/>
-        <seriesInfo name="RFC" value="2119"/>
-      </reference>
-
-     <reference anchor="RFC2818">
-        <front>
-          <title>
-            HTTP Over TLS
-          </title>
-          <author initials="E." surname="Rescorla" fullname="Eric Rescorla"/>
-          <date month="May" year="2000"/>
-        </front>
-        <seriesInfo name="RFC" value="2818"/>
-      </reference>
-
-      <reference anchor="RFC3986">
-        <front>
-          <title abbrev="URI Generic Syntax">Uniform Resource Identifier (URI): Generic
-          Syntax</title>
-          <author initials="T." surname="Berners-Lee" fullname="Tim Berners-Lee"></author>
-          <author initials="R." surname="Fielding" fullname="Roy T. Fielding"></author>
-          <author initials="L." surname="Masinter" fullname="Larry Masinter"></author>
-          <date year="2005" month="January" />
-        </front>
-        <seriesInfo name="STD" value="66" />
-        <seriesInfo name="RFC" value="3986" />
-      </reference>
-
-      <reference anchor="RFC4648">
-        <front>
-          <title>The Base16, Base32, and Base64 Data Encodings</title>
-          <author fullname="S. Josefsson" initials="S." surname="Josefsson"/>
-          <date year="2006" month="October"/>
-        </front>
-        <seriesInfo value="4648" name="RFC"/>
-      </reference>
-
-      <reference anchor="RFC5226">
-        <front>
-          <title>Guidelines for Writing an IANA Considerations Section in RFCs</title>
-          <author initials="T." surname="Narten" fullname="T. Narten"/>
-          <author initials="H." surname="Alvestrand" fullname="H. Alvestrand"/>
-          <date year="2008" month="May" />
-        </front>
-        <seriesInfo name="BCP" value="26" />
-        <seriesInfo name="RFC" value="5226" />
-      </reference>
-
-      <reference anchor="RFC5234">
-        <front>
-          <title>Augmented BNF for Syntax Specifications: ABNF</title>
-          <author initials="D." surname="Crocker" fullname="D. Crocker"/>
-          <author initials="P." surname="Overell" fullname="P. Overell"/>
-          <date year="2008" month="January" />
-        </front>
-        <seriesInfo name="STD" value="68" />
-        <seriesInfo name="RFC" value="5234" />
-      </reference>
-
-      <reference anchor="TLS12">
-        <front>
-          <title>The Transport Layer Security (TLS) Protocol Version 1.2</title>
-          <author initials="T." surname="Dierks" fullname="Tim Dierks"/>
-          <author initials="E." surname="Rescorla" fullname="Eric Rescorla"/>
-          <date year="2008" month="August" />
-        </front>
-        <seriesInfo name="RFC" value="5246" />
-      </reference>
-
-      <reference anchor="TLS-EXT">
-        <front>
-          <title>
-            Transport Layer Security (TLS) Extensions: Extension Definitions
-          </title>
-          <author initials="D." surname="Eastlake" fullname="D. Eastlake"/>
-          <date year="2011" month="January"/>
-        </front>
-        <seriesInfo name="RFC" value="6066"/>
-      </reference>
-
-      <reference anchor="TLS-ALPN">
-        <front>
-          <title>Transport Layer Security (TLS) Application-Layer Protocol Negotiation Extension</title>
-          <author initials="S." surname="Friedl" fullname="Stephan Friedl"></author>
-          <author initials="A." surname="Popov" fullname="Andrei Popov"></author>
-          <author initials="A." surname="Langley" fullname="Adam Langley"></author>
-          <author initials="E." surname="Stephan" fullname="Emile Stephan"></author>
-          <date month="July" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7301" />
-      </reference>
-
-      <reference anchor="TLS-ECDHE">
-        <front>
-          <title>
-            TLS Elliptic Curve Cipher Suites with SHA-256/384 and AES Galois
-            Counter Mode (GCM)
-          </title>
-          <author initials="E." surname="Rescorla" fullname="E. Rescorla"/>
-          <date year="2008" month="August" />
-        </front>
-        <seriesInfo name="RFC" value="5289" />
-      </reference>
-
-      <reference anchor="FIPS186">
-        <front>
-          <title>
-            Digital Signature Standard (DSS)
-          </title>
-          <author><organization>NIST</organization></author>
-          <date year="2013" month="July" />
-        </front>
-        <seriesInfo name="FIPS" value="PUB 186-4" />
-      </reference>
-
-      <reference anchor="RFC7230">
-        <front>
-          <title>
-          Hypertext Transfer Protocol (HTTP/1.1): Message Syntax and Routing</title>
-          <author fullname="Roy T. Fielding" initials="R." role="editor" surname="Fielding">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author fullname="Julian F. Reschke" initials="J. F." role="editor" surname="Reschke">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7230" />
-        <x:source href="refs/rfc7230.xml"
-                  basename="https://svn.tools.ietf.org/svn/wg/httpbis/specs/rfc7230"/>
-      </reference>
-      <reference anchor="RFC7231">
-        <front>
-          <title>
-          Hypertext Transfer Protocol (HTTP/1.1): Semantics and Content</title>
-          <author fullname="Roy T. Fielding" initials="R." role="editor" surname="Fielding">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author fullname="Julian F. Reschke" initials="J. F." role="editor" surname="Reschke">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7231" />
-        <x:source href="refs/rfc7231.xml"
-                  basename="https://svn.tools.ietf.org/svn/wg/httpbis/specs/rfc7231"/>
-      </reference>
-      <reference anchor="RFC7232">
-        <front>
-          <title>Hypertext Transfer Protocol (HTTP/1.1): Conditional Requests</title>
-          <author fullname="Roy T. Fielding" initials="R." role="editor" surname="Fielding">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author fullname="Julian F. Reschke" initials="J. F." role="editor" surname="Reschke">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7232" />
-      </reference>
-      <reference anchor="RFC7233">
-        <front>
-          <title>Hypertext Transfer Protocol (HTTP/1.1): Range Requests</title>
-          <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author initials="Y." surname="Lafon" fullname="Yves Lafon" role="editor">
-            <organization abbrev="W3C">World Wide Web Consortium</organization>
-            <address><email>ylafon@w3.org</email></address>
-          </author>
-          <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7233" />
-      </reference>
-      <reference anchor="RFC7234">
-        <front>
-          <title>Hypertext Transfer Protocol (HTTP/1.1): Caching</title>
-          <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author fullname="Mark Nottingham" initials="M." role="editor" surname="Nottingham">
-            <organization>Akamai</organization>
-            <address><email>mnot@mnot.net</email></address>
-          </author>
-          <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7234"/>
-        <x:source href="refs/rfc7234.xml"
-                  basename="https://svn.tools.ietf.org/svn/wg/httpbis/specs/rfc7234"/>
-      </reference>
-      <reference anchor="RFC7235">
-        <front>
-          <title>Hypertext Transfer Protocol (HTTP/1.1): Authentication</title>
-          <author initials="R." surname="Fielding" fullname="Roy T. Fielding" role="editor">
-            <organization abbrev="Adobe">Adobe Systems Incorporated</organization>
-            <address><email>fielding@gbiv.com</email></address>
-          </author>
-          <author initials="J. F." surname="Reschke" fullname="Julian F. Reschke" role="editor">
-            <organization abbrev="greenbytes">greenbytes GmbH</organization>
-            <address><email>julian.reschke@greenbytes.de</email></address>
-          </author>
-          <date month="June" year="2014" />
-        </front>
-        <seriesInfo name="RFC" value="7235"/>
-        <x:source href="refs/rfc7235.xml"
-                  basename="https://svn.tools.ietf.org/svn/wg/httpbis/specs/rfc7235"/>
-      </reference>
-
-      <reference anchor="COOKIE">
-        <front>
-          <title>HTTP State Management Mechanism</title>
-          <author initials="A." surname="Barth" fullname="A. Barth"/>
-          <date year="2011" month="April" />
-        </front>
-        <seriesInfo name="RFC" value="6265" />
-      </reference>
-    </references>
-
-    <references title="Informative References">
-      <reference anchor="RFC1323">
-        <front>
-          <title>
-            TCP Extensions for High Performance
-          </title>
-          <author initials="V." surname="Jacobson" fullname="Van Jacobson"></author>
-          <author initials="B." surname="Braden" fullname="Bob Braden"></author>
-          <author initials="D." surname="Borman" fullname="Dave Borman"></author>
-          <date year="1992" month="May" />
-        </front>
-        <seriesInfo name="RFC" value="1323" />
-      </reference>
-
-      <reference anchor="RFC3749">
-        <front>
-          <title>Transport Layer Security Protocol Compression Methods</title>
-          <author initials="S." surname="Hollenbeck" fullname="S. Hollenbeck"/>
-          <date year="2004" month="May" />
-        </front>
-        <seriesInfo name="RFC" value="3749" />
-      </reference>
-
-      <reference anchor="RFC6585">
-        <front>
-          <title>Additional HTTP Status Codes</title>
-          <author initials="M." surname="Nottingham" fullname="Mark Nottingham"/>
-          <author initials="R." surname="Fielding" fullname="Roy Fielding"/>
-          <date year="2012" month="April" />
-        </front>
-        <seriesInfo name="RFC" value="6585" />
-      </reference>
-
-      <reference anchor="RFC4492">
-        <front>
-          <title>
-            Elliptic Curve Cryptography (ECC) Cipher Suites for Transport Layer Security (TLS)
-          </title>
-          <author initials="S." surname="Blake-Wilson" fullname="S. Blake-Wilson"/>
-          <author initials="N." surname="Bolyard" fullname="N. Bolyard"/>
-          <author initials="V." surname="Gupta" fullname="V. Gupta"/>
-          <author initials="C." surname="Hawk" fullname="C. Hawk"/>
-          <author initials="B." surname="Moeller" fullname="B. Moeller"/>
-          <date year="2006" month="May" />
-        </front>
-        <seriesInfo name="RFC" value="4492" />
-      </reference>
-
-      <reference anchor="RFC5288">
-        <front>
-          <title>
-            AES Galois Counter Mode (GCM) Cipher Suites for TLS
-          </title>
-          <author initials="J." surname="Salowey" fullname="J. Salowey"/>
-          <author initials="A." surname="Choudhury" fullname="A. Choudhury"/>
-          <author initials="D." surname="McGrew" fullname="D. McGrew"/>
-          <date year="2008" month="August" />
-        </front>
-        <seriesInfo name="RFC" value="5288" />
-      </reference>
-
-      <reference anchor='HTML5'
-           target='http://www.w3.org/TR/2014/CR-html5-20140731/'>
-        <front>
-          <title>HTML5</title>
-          <author fullname='Robin Berjon' surname='Berjon' initials='R.'/>
-          <author fullname='Steve Faulkner' surname='Faulkner' initials='S.'/>
-          <author fullname='Travis Leithead' surname='Leithead' initials='T.'/>
-          <author fullname='Erika Doyle Navara' surname='Doyle Navara' initials='E.'/>
-          <author fullname='Edward O&apos;Connor' surname='O&apos;Connor' initials='E.'/>
-          <author fullname='Silvia Pfeiffer' surname='Pfeiffer' initials='S.'/>
-          <date year='2014' month='July' day='31'/>
-        </front>
-        <seriesInfo name='W3C Candidate Recommendation' value='CR-html5-20140731'/>
-        <annotation>
-          Latest version available at
-          <eref target='http://www.w3.org/TR/html5/'/>.
-        </annotation>
-      </reference>
-
-      <reference anchor="TALKING" target="http://w2spconf.com/2011/papers/websocket.pdf">
-        <front>
-          <title>
-            Talking to Yourself for Fun and Profit
-          </title>
-          <author initials="L-S." surname="Huang"/>
-          <author initials="E." surname="Chen"/>
-          <author initials="A." surname="Barth"/>
-          <author initials="E." surname="Rescorla"/>
-          <author initials="C." surname="Jackson"/>
-          <date year="2011" />
-        </front>
-      </reference>
-
-      <reference anchor="BREACH"
-                 target="http://breachattack.com/resources/BREACH%20-%20SSL,%20gone%20in%2030%20seconds.pdf">
-        <front>
-          <title>
-            BREACH: Reviving the CRIME Attack
-          </title>
-          <author initials="Y." surname="Gluck"/>
-          <author initials="N." surname="Harris"/>
-          <author initials="A." surname="Prado"/>
-          <date year="2013" month="July" day="12"/>
-        </front>
-      </reference>
-
-      <reference anchor="BCP90">
-        <front>
-          <title>Registration Procedures for Message Header Fields</title>
-          <author initials="G." surname="Klyne" fullname="G. Klyne">
-            <organization>Nine by Nine</organization>
-            <address><email>GK-IETF@ninebynine.org</email></address>
-          </author>
-          <author initials="M." surname="Nottingham" fullname="M. Nottingham">
-            <organization>BEA Systems</organization>
-            <address><email>mnot@pobox.com</email></address>
-          </author>
-          <author initials="J." surname="Mogul" fullname="J. Mogul">
-            <organization>HP Labs</organization>
-            <address><email>JeffMogul@acm.org</email></address>
-          </author>
-          <date year="2004" month="September" />
-        </front>
-        <seriesInfo name="BCP" value="90" />
-        <seriesInfo name="RFC" value="3864" />
-      </reference>
-
-      <reference anchor="TLSBCP">
-        <front>
-          <title>Recommendations for Secure Use of TLS and DTLS</title>
-          <author initials="Y" surname="Sheffer" fullname="Yaron Sheffer">
-            <organization />
-          </author>
-          <author initials="R" surname="Holz" fullname="Ralph Holz">
-            <organization />
-          </author>
-          <author initials="P" surname="Saint-Andre" fullname="Peter Saint-Andre">
-            <organization />
-          </author>
-          <date month="June" day="23" year="2014" />
-        </front>
-        <seriesInfo name="Internet-Draft" value="draft-ietf-uta-tls-bcp-01" />
-      </reference>
-
-      <reference anchor="ALT-SVC">
-        <front>
-          <title>
-            HTTP Alternative Services
-          </title>
-          <author initials="M." surname="Nottingham" fullname="Mark Nottingham">
-            <organization>Akamai</organization>
-          </author>
-          <author initials="P." surname="McManus" fullname="Patrick McManus">
-            <organization>Mozilla</organization>
-          </author>
-          <author initials="J." surname="Reschke" fullname="Julian Reschke">
-            <organization>greenbytes</organization>
-          </author>
-          <date year="2014" month="April"/>
-        </front>
-        <seriesInfo name="Internet-Draft" value="draft-ietf-httpbis-alt-svc-02"/>
-        <x:source href="refs/draft-ietf-httpbis-alt-svc-02.xml"/>
-      </reference>
-    </references>
-
-    <section title="Change Log" anchor="change.log">
-      <t>
-        This section is to be removed by RFC Editor before publication.
-      </t>
-
-      <section title="Since draft-ietf-httpbis-http2-14" anchor="changes.since.draft-ietf-httpbis-http2-14">
-        <t>
-          Renamed Not Authoritative status code to Misdirected Request.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-13" anchor="changes.since.draft-ietf-httpbis-http2-13">
-        <t>
-          Pseudo-header fields are now required to appear strictly before regular ones.
-        </t>
-        <t>
-          Restored 1xx series status codes, except 101.
-        </t>
-        <t>
-          Changed frame length field 24-bits.  Expanded frame header to 9 octets.  Added a setting
-          to limit the damage.
-        </t>
-        <t>
-          Added a setting to advise peers of header set size limits.
-        </t>
-        <t>
-          Removed segments.
-        </t>
-        <t>
-          Made non-semantic-bearing <x:ref>HEADERS</x:ref> frames illegal in the HTTP mapping.
-        </t>
-      </section>
-
-       <section title="Since draft-ietf-httpbis-http2-12" anchor="changes.since.draft-ietf-httpbis-http2-12">
-         <t>
-           Restored extensibility options.
-         </t>
-         <t>
-           Restricting TLS cipher suites to AEAD only.
-         </t>
-         <t>
-           Removing Content-Encoding requirements.
-         </t>
-         <t>
-           Permitting the use of <x:ref>PRIORITY</x:ref> after stream close.
-         </t>
-         <t>
-           Removed ALTSVC frame.
-         </t>
-         <t>
-           Removed BLOCKED frame.
-         </t>
-         <t>
-           Reducing the maximum padding size to 256 octets; removing padding from
-           <x:ref>CONTINUATION</x:ref> frames.
-         </t>
-         <t>
-           Removed per-frame GZIP compression.
-         </t>
-       </section>
-
-       <section title="Since draft-ietf-httpbis-http2-11" anchor="changes.since.draft-ietf-httpbis-http2-11">
-         <t>
-           Added BLOCKED frame (at risk).
-         </t>
-         <t>
-           Simplified priority scheme.
-         </t>
-         <t>
-           Added <x:ref>DATA</x:ref> per-frame GZIP compression.
-         </t>
-       </section>
-
-       <section title="Since draft-ietf-httpbis-http2-10" anchor="changes.since.draft-ietf-httpbis-http2-10">
-        <t>
-          Changed "connection header" to "connection preface" to avoid confusion.
-        </t>
-        <t>
-          Added dependency-based stream prioritization.
-        </t>
-        <t>
-          Added "h2c" identifier to distinguish between cleartext and secured HTTP/2.
-        </t>
-        <t>
-          Adding missing padding to <x:ref>PUSH_PROMISE</x:ref>.
-        </t>
-        <t>
-          Integrate ALTSVC frame and supporting text.
-        </t>
-        <t>
-          Dropping requirement on "deflate" Content-Encoding.
-        </t>
-        <t>
-          Improving security considerations around use of compression.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-09" anchor="changes.since.draft-ietf-httpbis-http2-09">
-        <t>
-          Adding padding for data frames.
-        </t>
-        <t>
-          Renumbering frame types, error codes, and settings.
-        </t>
-        <t>
-          Adding INADEQUATE_SECURITY error code.
-        </t>
-        <t>
-          Updating TLS usage requirements to 1.2; forbidding TLS compression.
-        </t>
-        <t>
-          Removing extensibility for frames and settings.
-        </t>
-        <t>
-          Changing setting identifier size.
-        </t>
-        <t>
-          Removing the ability to disable flow control.
-        </t>
-        <t>
-          Changing the protocol identification token to "h2".
-        </t>
-        <t>
-          Changing the use of :authority to make it optional and to allow userinfo in non-HTTP
-          cases.
-        </t>
-        <t>
-          Allowing split on 0x0 for Cookie.
-        </t>
-        <t>
-          Reserved PRI method in HTTP/1.1 to avoid possible future collisions.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-08" anchor="changes.since.draft-ietf-httpbis-http2-08">
-        <t>
-          Added cookie crumbling for more efficient header compression.
-        </t>
-        <t>
-          Added header field ordering with the value-concatenation mechanism.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-07" anchor="changes.since.draft-ietf-httpbis-http2-07">
-        <t>
-          Marked draft for implementation.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-06" anchor="changes.since.draft-ietf-httpbis-http2-06">
-        <t>
-          Adding definition for CONNECT method.
-        </t>
-        <t>
-          Constraining the use of push to safe, cacheable methods with no request body.
-        </t>
-        <t>
-          Changing from :host to :authority to remove any potential confusion.
-        </t>
-        <t>
-          Adding setting for header compression table size.
-        </t>
-        <t>
-          Adding settings acknowledgement.
-        </t>
-        <t>
-          Removing unnecessary and potentially problematic flags from CONTINUATION.
-        </t>
-        <t>
-          Added denial of service considerations.
-        </t>
-      </section>
-      <section title="Since draft-ietf-httpbis-http2-05" anchor="changes.since.draft-ietf-httpbis-http2-05">
-        <t>
-          Marking the draft ready for implementation.
-        </t>
-        <t>
-          Renumbering END_PUSH_PROMISE flag.
-        </t>
-        <t>
-          Editorial clarifications and changes.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-04" anchor="changes.since.draft-ietf-httpbis-http2-04">
-        <t>
-          Added CONTINUATION frame for HEADERS and PUSH_PROMISE.
-        </t>
-        <t>
-          PUSH_PROMISE is no longer implicitly prohibited if SETTINGS_MAX_CONCURRENT_STREAMS is
-          zero.
-        </t>
-        <t>
-          Push expanded to allow all safe methods without a request body.
-        </t>
-        <t>
-          Clarified the use of HTTP header fields in requests and responses.  Prohibited HTTP/1.1
-          hop-by-hop header fields.
-        </t>
-        <t>
-          Requiring that intermediaries not forward requests with missing or illegal routing
-          :-headers.
-        </t>
-        <t>
-          Clarified requirements around handling different frames after stream close, stream reset
-          and <x:ref>GOAWAY</x:ref>.
-        </t>
-        <t>
-          Added more specific prohibitions for sending of different frame types in various stream
-          states.
-        </t>
-        <t>
-          Making the last received setting value the effective value.
-        </t>
-        <t>
-          Clarified requirements on TLS version, extension and ciphers.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-03" anchor="changes.since.draft-ietf-httpbis-http2-03">
-        <t>
-          Committed major restructuring atrocities.
-        </t>
-        <t>
-          Added reference to first header compression draft.
-        </t>
-        <t>
-          Added more formal description of frame lifecycle.
-        </t>
-        <t>
-          Moved END_STREAM (renamed from FINAL) back to <x:ref>HEADERS</x:ref>/<x:ref>DATA</x:ref>.
-        </t>
-        <t>
-          Removed HEADERS+PRIORITY, added optional priority to <x:ref>HEADERS</x:ref> frame.
-        </t>
-        <t>
-          Added <x:ref>PRIORITY</x:ref> frame.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-02" anchor="changes.since.draft-ietf-httpbis-http2-02">
-        <t>
-          Added continuations to frames carrying header blocks.
-        </t>
-        <t>
-          Replaced use of "session" with "connection" to avoid confusion with other HTTP stateful
-          concepts, like cookies.
-        </t>
-        <t>
-          Removed "message".
-        </t>
-        <t>
-          Switched to TLS ALPN from NPN.
-        </t>
-        <t>
-          Editorial changes.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-01" anchor="changes.since.draft-ietf-httpbis-http2-01">
-        <t>
-          Added IANA considerations section for frame types, error codes and settings.
-        </t>
-        <t>
-          Removed data frame compression.
-        </t>
-        <t>
-          Added <x:ref>PUSH_PROMISE</x:ref>.
-        </t>
-        <t>
-          Added globally applicable flags to framing.
-        </t>
-        <t>
-          Removed zlib-based header compression mechanism.
-        </t>
-        <t>
-          Updated references.
-        </t>
-        <t>
-          Clarified stream identifier reuse.
-        </t>
-        <t>
-          Removed CREDENTIALS frame and associated mechanisms.
-        </t>
-        <t>
-          Added advice against naive implementation of flow control.
-        </t>
-        <t>
-          Added session header section.
-        </t>
-        <t>
-          Restructured frame header.  Removed distinction between data and control frames.
-        </t>
-        <t>
-          Altered flow control properties to include session-level limits.
-        </t>
-        <t>
-          Added note on cacheability of pushed resources and multiple tenant servers.
-        </t>
-        <t>
-          Changed protocol label form based on discussions.
-        </t>
-      </section>
-
-      <section title="Since draft-ietf-httpbis-http2-00" anchor="changes.since.draft-ietf-httpbis-http2-00">
-        <t>
-          Changed title throughout.
-        </t>
-        <t>
-          Removed section on Incompatibilities with SPDY draft#2.
-        </t>
-        <t>
-          Changed <x:ref>INTERNAL_ERROR</x:ref> on <x:ref>GOAWAY</x:ref> to have a value of 2 <eref
-          target="https://groups.google.com/forum/?fromgroups#!topic/spdy-dev/cfUef2gL3iU"/>.
-        </t>
-        <t>
-          Replaced abstract and introduction.
-        </t>
-        <t>
-          Added section on starting HTTP/2.0, including upgrade mechanism.
-        </t>
-        <t>
-          Removed unused references.
-        </t>
-        <t>
-          Added <xref target="fc-principles">flow control principles</xref> based on <eref
-          target="https://tools.ietf.org/html/draft-montenegro-httpbis-http2-fc-principles-01"/>.
-        </t>
-      </section>
-
-      <section title="Since draft-mbelshe-httpbis-spdy-00" anchor="changes.since.draft-mbelshe-httpbis-spdy-00">
-        <t>
-          Adopted as base for draft-ietf-httpbis-http2.
-        </t>
-        <t>
-          Updated authors/editors list.
-        </t>
-        <t>
-          Added status note.
-        </t>
-      </section>
-    </section>
-
-  </back>
-</rfc>
-<!--
-  vim:et:tw=100:sw=2:
-  -->
diff --git a/installer/vendor/golang.org/x/net/http2/transport.go b/installer/vendor/golang.org/x/net/http2/transport.go
deleted file mode 100644
index 84d042d469..0000000000
--- a/installer/vendor/golang.org/x/net/http2/transport.go
+++ /dev/null
@@ -1,2128 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Transport code.
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"compress/gzip"
-	"crypto/rand"
-	"crypto/tls"
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"math"
-	"net"
-	"net/http"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/idna"
-	"golang.org/x/net/lex/httplex"
-)
-
-const (
-	// transportDefaultConnFlow is how many connection-level flow control
-	// tokens we give the server at start-up, past the default 64k.
-	transportDefaultConnFlow = 1 << 30
-
-	// transportDefaultStreamFlow is how many stream-level flow
-	// control tokens we announce to the peer, and how many bytes
-	// we buffer per stream.
-	transportDefaultStreamFlow = 4 << 20
-
-	// transportDefaultStreamMinRefresh is the minimum number of bytes we'll send
-	// a stream-level WINDOW_UPDATE for at a time.
-	transportDefaultStreamMinRefresh = 4 << 10
-
-	defaultUserAgent = "Go-http-client/2.0"
-)
-
-// Transport is an HTTP/2 Transport.
-//
-// A Transport internally caches connections to servers. It is safe
-// for concurrent use by multiple goroutines.
-type Transport struct {
-	// DialTLS specifies an optional dial function for creating
-	// TLS connections for requests.
-	//
-	// If DialTLS is nil, tls.Dial is used.
-	//
-	// If the returned net.Conn has a ConnectionState method like tls.Conn,
-	// it will be used to set http.Response.TLS.
-	DialTLS func(network, addr string, cfg *tls.Config) (net.Conn, error)
-
-	// TLSClientConfig specifies the TLS configuration to use with
-	// tls.Client. If nil, the default configuration is used.
-	TLSClientConfig *tls.Config
-
-	// ConnPool optionally specifies an alternate connection pool to use.
-	// If nil, the default is used.
-	ConnPool ClientConnPool
-
-	// DisableCompression, if true, prevents the Transport from
-	// requesting compression with an "Accept-Encoding: gzip"
-	// request header when the Request contains no existing
-	// Accept-Encoding value. If the Transport requests gzip on
-	// its own and gets a gzipped response, it's transparently
-	// decoded in the Response.Body. However, if the user
-	// explicitly requested gzip it is not automatically
-	// uncompressed.
-	DisableCompression bool
-
-	// AllowHTTP, if true, permits HTTP/2 requests using the insecure,
-	// plain-text "http" scheme. Note that this does not enable h2c support.
-	AllowHTTP bool
-
-	// MaxHeaderListSize is the http2 SETTINGS_MAX_HEADER_LIST_SIZE to
-	// send in the initial settings frame. It is how many bytes
-	// of response headers are allow. Unlike the http2 spec, zero here
-	// means to use a default limit (currently 10MB). If you actually
-	// want to advertise an ulimited value to the peer, Transport
-	// interprets the highest possible value here (0xffffffff or 1<<32-1)
-	// to mean no limit.
-	MaxHeaderListSize uint32
-
-	// t1, if non-nil, is the standard library Transport using
-	// this transport. Its settings are used (but not its
-	// RoundTrip method, etc).
-	t1 *http.Transport
-
-	connPoolOnce  sync.Once
-	connPoolOrDef ClientConnPool // non-nil version of ConnPool
-}
-
-func (t *Transport) maxHeaderListSize() uint32 {
-	if t.MaxHeaderListSize == 0 {
-		return 10 << 20
-	}
-	if t.MaxHeaderListSize == 0xffffffff {
-		return 0
-	}
-	return t.MaxHeaderListSize
-}
-
-func (t *Transport) disableCompression() bool {
-	return t.DisableCompression || (t.t1 != nil && t.t1.DisableCompression)
-}
-
-var errTransportVersion = errors.New("http2: ConfigureTransport is only supported starting at Go 1.6")
-
-// ConfigureTransport configures a net/http HTTP/1 Transport to use HTTP/2.
-// It requires Go 1.6 or later and returns an error if the net/http package is too old
-// or if t1 has already been HTTP/2-enabled.
-func ConfigureTransport(t1 *http.Transport) error {
-	_, err := configureTransport(t1) // in configure_transport.go (go1.6) or not_go16.go
-	return err
-}
-
-func (t *Transport) connPool() ClientConnPool {
-	t.connPoolOnce.Do(t.initConnPool)
-	return t.connPoolOrDef
-}
-
-func (t *Transport) initConnPool() {
-	if t.ConnPool != nil {
-		t.connPoolOrDef = t.ConnPool
-	} else {
-		t.connPoolOrDef = &clientConnPool{t: t}
-	}
-}
-
-// ClientConn is the state of a single HTTP/2 client connection to an
-// HTTP/2 server.
-type ClientConn struct {
-	t         *Transport
-	tconn     net.Conn             // usually *tls.Conn, except specialized impls
-	tlsState  *tls.ConnectionState // nil only for specialized impls
-	singleUse bool                 // whether being used for a single http.Request
-
-	// readLoop goroutine fields:
-	readerDone chan struct{} // closed on error
-	readerErr  error         // set before readerDone is closed
-
-	idleTimeout time.Duration // or 0 for never
-	idleTimer   *time.Timer
-
-	mu              sync.Mutex // guards following
-	cond            *sync.Cond // hold mu; broadcast on flow/closed changes
-	flow            flow       // our conn-level flow control quota (cs.flow is per stream)
-	inflow          flow       // peer's conn-level flow control
-	closed          bool
-	wantSettingsAck bool                     // we sent a SETTINGS frame and haven't heard back
-	goAway          *GoAwayFrame             // if non-nil, the GoAwayFrame we received
-	goAwayDebug     string                   // goAway frame's debug data, retained as a string
-	streams         map[uint32]*clientStream // client-initiated
-	nextStreamID    uint32
-	pings           map[[8]byte]chan struct{} // in flight ping data to notification channel
-	bw              *bufio.Writer
-	br              *bufio.Reader
-	fr              *Framer
-	lastActive      time.Time
-	// Settings from peer: (also guarded by mu)
-	maxFrameSize         uint32
-	maxConcurrentStreams uint32
-	initialWindowSize    uint32
-
-	hbuf    bytes.Buffer // HPACK encoder writes into this
-	henc    *hpack.Encoder
-	freeBuf [][]byte
-
-	wmu  sync.Mutex // held while writing; acquire AFTER mu if holding both
-	werr error      // first write error that has occurred
-}
-
-// clientStream is the state for a single HTTP/2 stream. One of these
-// is created for each Transport.RoundTrip call.
-type clientStream struct {
-	cc            *ClientConn
-	req           *http.Request
-	trace         *clientTrace // or nil
-	ID            uint32
-	resc          chan resAndError
-	bufPipe       pipe // buffered pipe with the flow-controlled response payload
-	startedWrite  bool // started request body write; guarded by cc.mu
-	requestedGzip bool
-	on100         func() // optional code to run if get a 100 continue response
-
-	flow        flow  // guarded by cc.mu
-	inflow      flow  // guarded by cc.mu
-	bytesRemain int64 // -1 means unknown; owned by transportResponseBody.Read
-	readErr     error // sticky read error; owned by transportResponseBody.Read
-	stopReqBody error // if non-nil, stop writing req body; guarded by cc.mu
-	didReset    bool  // whether we sent a RST_STREAM to the server; guarded by cc.mu
-
-	peerReset chan struct{} // closed on peer reset
-	resetErr  error         // populated before peerReset is closed
-
-	done chan struct{} // closed when stream remove from cc.streams map; close calls guarded by cc.mu
-
-	// owned by clientConnReadLoop:
-	firstByte    bool // got the first response byte
-	pastHeaders  bool // got first MetaHeadersFrame (actual headers)
-	pastTrailers bool // got optional second MetaHeadersFrame (trailers)
-
-	trailer    http.Header  // accumulated trailers
-	resTrailer *http.Header // client's Response.Trailer
-}
-
-// awaitRequestCancel runs in its own goroutine and waits for the user
-// to cancel a RoundTrip request, its context to expire, or for the
-// request to be done (any way it might be removed from the cc.streams
-// map: peer reset, successful completion, TCP connection breakage,
-// etc)
-func (cs *clientStream) awaitRequestCancel(req *http.Request) {
-	ctx := reqContext(req)
-	if req.Cancel == nil && ctx.Done() == nil {
-		return
-	}
-	select {
-	case <-req.Cancel:
-		cs.cancelStream()
-		cs.bufPipe.CloseWithError(errRequestCanceled)
-	case <-ctx.Done():
-		cs.cancelStream()
-		cs.bufPipe.CloseWithError(ctx.Err())
-	case <-cs.done:
-	}
-}
-
-func (cs *clientStream) cancelStream() {
-	cs.cc.mu.Lock()
-	didReset := cs.didReset
-	cs.didReset = true
-	cs.cc.mu.Unlock()
-
-	if !didReset {
-		cs.cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
-	}
-}
-
-// checkResetOrDone reports any error sent in a RST_STREAM frame by the
-// server, or errStreamClosed if the stream is complete.
-func (cs *clientStream) checkResetOrDone() error {
-	select {
-	case <-cs.peerReset:
-		return cs.resetErr
-	case <-cs.done:
-		return errStreamClosed
-	default:
-		return nil
-	}
-}
-
-func (cs *clientStream) abortRequestBodyWrite(err error) {
-	if err == nil {
-		panic("nil error")
-	}
-	cc := cs.cc
-	cc.mu.Lock()
-	cs.stopReqBody = err
-	cc.cond.Broadcast()
-	cc.mu.Unlock()
-}
-
-type stickyErrWriter struct {
-	w   io.Writer
-	err *error
-}
-
-func (sew stickyErrWriter) Write(p []byte) (n int, err error) {
-	if *sew.err != nil {
-		return 0, *sew.err
-	}
-	n, err = sew.w.Write(p)
-	*sew.err = err
-	return
-}
-
-var ErrNoCachedConn = errors.New("http2: no cached connection was available")
-
-// RoundTripOpt are options for the Transport.RoundTripOpt method.
-type RoundTripOpt struct {
-	// OnlyCachedConn controls whether RoundTripOpt may
-	// create a new TCP connection. If set true and
-	// no cached connection is available, RoundTripOpt
-	// will return ErrNoCachedConn.
-	OnlyCachedConn bool
-}
-
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
-	return t.RoundTripOpt(req, RoundTripOpt{})
-}
-
-// authorityAddr returns a given authority (a host/IP, or host:port / ip:port)
-// and returns a host:port. The port 443 is added if needed.
-func authorityAddr(scheme string, authority string) (addr string) {
-	host, port, err := net.SplitHostPort(authority)
-	if err != nil { // authority didn't have a port
-		port = "443"
-		if scheme == "http" {
-			port = "80"
-		}
-		host = authority
-	}
-	if a, err := idna.ToASCII(host); err == nil {
-		host = a
-	}
-	// IPv6 address literal, without a port:
-	if strings.HasPrefix(host, "[") && strings.HasSuffix(host, "]") {
-		return host + ":" + port
-	}
-	return net.JoinHostPort(host, port)
-}
-
-// RoundTripOpt is like RoundTrip, but takes options.
-func (t *Transport) RoundTripOpt(req *http.Request, opt RoundTripOpt) (*http.Response, error) {
-	if !(req.URL.Scheme == "https" || (req.URL.Scheme == "http" && t.AllowHTTP)) {
-		return nil, errors.New("http2: unsupported scheme")
-	}
-
-	addr := authorityAddr(req.URL.Scheme, req.URL.Host)
-	for {
-		cc, err := t.connPool().GetClientConn(req, addr)
-		if err != nil {
-			t.vlogf("http2: Transport failed to get client conn for %s: %v", addr, err)
-			return nil, err
-		}
-		traceGotConn(req, cc)
-		res, err := cc.RoundTrip(req)
-		if err != nil {
-			if req, err = shouldRetryRequest(req, err); err == nil {
-				continue
-			}
-		}
-		if err != nil {
-			t.vlogf("RoundTrip failure: %v", err)
-			return nil, err
-		}
-		return res, nil
-	}
-}
-
-// CloseIdleConnections closes any connections which were previously
-// connected from previous requests but are now sitting idle.
-// It does not interrupt any connections currently in use.
-func (t *Transport) CloseIdleConnections() {
-	if cp, ok := t.connPool().(clientConnPoolIdleCloser); ok {
-		cp.closeIdleConnections()
-	}
-}
-
-var (
-	errClientConnClosed   = errors.New("http2: client conn is closed")
-	errClientConnUnusable = errors.New("http2: client conn not usable")
-
-	errClientConnGotGoAway                 = errors.New("http2: Transport received Server's graceful shutdown GOAWAY")
-	errClientConnGotGoAwayAfterSomeReqBody = errors.New("http2: Transport received Server's graceful shutdown GOAWAY; some request body already written")
-)
-
-// shouldRetryRequest is called by RoundTrip when a request fails to get
-// response headers. It is always called with a non-nil error.
-// It returns either a request to retry (either the same request, or a
-// modified clone), or an error if the request can't be replayed.
-func shouldRetryRequest(req *http.Request, err error) (*http.Request, error) {
-	switch err {
-	default:
-		return nil, err
-	case errClientConnUnusable, errClientConnGotGoAway:
-		return req, nil
-	case errClientConnGotGoAwayAfterSomeReqBody:
-		// If the Body is nil (or http.NoBody), it's safe to reuse
-		// this request and its Body.
-		if req.Body == nil || reqBodyIsNoBody(req.Body) {
-			return req, nil
-		}
-		// Otherwise we depend on the Request having its GetBody
-		// func defined.
-		getBody := reqGetBody(req) // Go 1.8: getBody = req.GetBody
-		if getBody == nil {
-			return nil, errors.New("http2: Transport: peer server initiated graceful shutdown after some of Request.Body was written; define Request.GetBody to avoid this error")
-		}
-		body, err := getBody()
-		if err != nil {
-			return nil, err
-		}
-		newReq := *req
-		newReq.Body = body
-		return &newReq, nil
-	}
-}
-
-func (t *Transport) dialClientConn(addr string, singleUse bool) (*ClientConn, error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-	tconn, err := t.dialTLS()("tcp", addr, t.newTLSConfig(host))
-	if err != nil {
-		return nil, err
-	}
-	return t.newClientConn(tconn, singleUse)
-}
-
-func (t *Transport) newTLSConfig(host string) *tls.Config {
-	cfg := new(tls.Config)
-	if t.TLSClientConfig != nil {
-		*cfg = *cloneTLSConfig(t.TLSClientConfig)
-	}
-	if !strSliceContains(cfg.NextProtos, NextProtoTLS) {
-		cfg.NextProtos = append([]string{NextProtoTLS}, cfg.NextProtos...)
-	}
-	if cfg.ServerName == "" {
-		cfg.ServerName = host
-	}
-	return cfg
-}
-
-func (t *Transport) dialTLS() func(string, string, *tls.Config) (net.Conn, error) {
-	if t.DialTLS != nil {
-		return t.DialTLS
-	}
-	return t.dialTLSDefault
-}
-
-func (t *Transport) dialTLSDefault(network, addr string, cfg *tls.Config) (net.Conn, error) {
-	cn, err := tls.Dial(network, addr, cfg)
-	if err != nil {
-		return nil, err
-	}
-	if err := cn.Handshake(); err != nil {
-		return nil, err
-	}
-	if !cfg.InsecureSkipVerify {
-		if err := cn.VerifyHostname(cfg.ServerName); err != nil {
-			return nil, err
-		}
-	}
-	state := cn.ConnectionState()
-	if p := state.NegotiatedProtocol; p != NextProtoTLS {
-		return nil, fmt.Errorf("http2: unexpected ALPN protocol %q; want %q", p, NextProtoTLS)
-	}
-	if !state.NegotiatedProtocolIsMutual {
-		return nil, errors.New("http2: could not negotiate protocol mutually")
-	}
-	return cn, nil
-}
-
-// disableKeepAlives reports whether connections should be closed as
-// soon as possible after handling the first request.
-func (t *Transport) disableKeepAlives() bool {
-	return t.t1 != nil && t.t1.DisableKeepAlives
-}
-
-func (t *Transport) expectContinueTimeout() time.Duration {
-	if t.t1 == nil {
-		return 0
-	}
-	return transportExpectContinueTimeout(t.t1)
-}
-
-func (t *Transport) NewClientConn(c net.Conn) (*ClientConn, error) {
-	return t.newClientConn(c, false)
-}
-
-func (t *Transport) newClientConn(c net.Conn, singleUse bool) (*ClientConn, error) {
-	cc := &ClientConn{
-		t:                    t,
-		tconn:                c,
-		readerDone:           make(chan struct{}),
-		nextStreamID:         1,
-		maxFrameSize:         16 << 10, // spec default
-		initialWindowSize:    65535,    // spec default
-		maxConcurrentStreams: 1000,     // "infinite", per spec. 1000 seems good enough.
-		streams:              make(map[uint32]*clientStream),
-		singleUse:            singleUse,
-		wantSettingsAck:      true,
-		pings:                make(map[[8]byte]chan struct{}),
-	}
-	if d := t.idleConnTimeout(); d != 0 {
-		cc.idleTimeout = d
-		cc.idleTimer = time.AfterFunc(d, cc.onIdleTimeout)
-	}
-	if VerboseLogs {
-		t.vlogf("http2: Transport creating client conn %p to %v", cc, c.RemoteAddr())
-	}
-
-	cc.cond = sync.NewCond(&cc.mu)
-	cc.flow.add(int32(initialWindowSize))
-
-	// TODO: adjust this writer size to account for frame size +
-	// MTU + crypto/tls record padding.
-	cc.bw = bufio.NewWriter(stickyErrWriter{c, &cc.werr})
-	cc.br = bufio.NewReader(c)
-	cc.fr = NewFramer(cc.bw, cc.br)
-	cc.fr.ReadMetaHeaders = hpack.NewDecoder(initialHeaderTableSize, nil)
-	cc.fr.MaxHeaderListSize = t.maxHeaderListSize()
-
-	// TODO: SetMaxDynamicTableSize, SetMaxDynamicTableSizeLimit on
-	// henc in response to SETTINGS frames?
-	cc.henc = hpack.NewEncoder(&cc.hbuf)
-
-	if cs, ok := c.(connectionStater); ok {
-		state := cs.ConnectionState()
-		cc.tlsState = &state
-	}
-
-	initialSettings := []Setting{
-		{ID: SettingEnablePush, Val: 0},
-		{ID: SettingInitialWindowSize, Val: transportDefaultStreamFlow},
-	}
-	if max := t.maxHeaderListSize(); max != 0 {
-		initialSettings = append(initialSettings, Setting{ID: SettingMaxHeaderListSize, Val: max})
-	}
-
-	cc.bw.Write(clientPreface)
-	cc.fr.WriteSettings(initialSettings...)
-	cc.fr.WriteWindowUpdate(0, transportDefaultConnFlow)
-	cc.inflow.add(transportDefaultConnFlow + initialWindowSize)
-	cc.bw.Flush()
-	if cc.werr != nil {
-		return nil, cc.werr
-	}
-
-	go cc.readLoop()
-	return cc, nil
-}
-
-func (cc *ClientConn) setGoAway(f *GoAwayFrame) {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-
-	old := cc.goAway
-	cc.goAway = f
-
-	// Merge the previous and current GoAway error frames.
-	if cc.goAwayDebug == "" {
-		cc.goAwayDebug = string(f.DebugData())
-	}
-	if old != nil && old.ErrCode != ErrCodeNo {
-		cc.goAway.ErrCode = old.ErrCode
-	}
-	last := f.LastStreamID
-	for streamID, cs := range cc.streams {
-		if streamID > last {
-			select {
-			case cs.resc <- resAndError{err: errClientConnGotGoAway}:
-			default:
-			}
-		}
-	}
-}
-
-func (cc *ClientConn) CanTakeNewRequest() bool {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	return cc.canTakeNewRequestLocked()
-}
-
-func (cc *ClientConn) canTakeNewRequestLocked() bool {
-	if cc.singleUse && cc.nextStreamID > 1 {
-		return false
-	}
-	return cc.goAway == nil && !cc.closed &&
-		int64(len(cc.streams)+1) < int64(cc.maxConcurrentStreams) &&
-		cc.nextStreamID < math.MaxInt32
-}
-
-// onIdleTimeout is called from a time.AfterFunc goroutine. It will
-// only be called when we're idle, but because we're coming from a new
-// goroutine, there could be a new request coming in at the same time,
-// so this simply calls the synchronized closeIfIdle to shut down this
-// connection. The timer could just call closeIfIdle, but this is more
-// clear.
-func (cc *ClientConn) onIdleTimeout() {
-	cc.closeIfIdle()
-}
-
-func (cc *ClientConn) closeIfIdle() {
-	cc.mu.Lock()
-	if len(cc.streams) > 0 {
-		cc.mu.Unlock()
-		return
-	}
-	cc.closed = true
-	nextID := cc.nextStreamID
-	// TODO: do clients send GOAWAY too? maybe? Just Close:
-	cc.mu.Unlock()
-
-	if VerboseLogs {
-		cc.vlogf("http2: Transport closing idle conn %p (forSingleUse=%v, maxStream=%v)", cc, cc.singleUse, nextID-2)
-	}
-	cc.tconn.Close()
-}
-
-const maxAllocFrameSize = 512 << 10
-
-// frameBuffer returns a scratch buffer suitable for writing DATA frames.
-// They're capped at the min of the peer's max frame size or 512KB
-// (kinda arbitrarily), but definitely capped so we don't allocate 4GB
-// bufers.
-func (cc *ClientConn) frameScratchBuffer() []byte {
-	cc.mu.Lock()
-	size := cc.maxFrameSize
-	if size > maxAllocFrameSize {
-		size = maxAllocFrameSize
-	}
-	for i, buf := range cc.freeBuf {
-		if len(buf) >= int(size) {
-			cc.freeBuf[i] = nil
-			cc.mu.Unlock()
-			return buf[:size]
-		}
-	}
-	cc.mu.Unlock()
-	return make([]byte, size)
-}
-
-func (cc *ClientConn) putFrameScratchBuffer(buf []byte) {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	const maxBufs = 4 // arbitrary; 4 concurrent requests per conn? investigate.
-	if len(cc.freeBuf) < maxBufs {
-		cc.freeBuf = append(cc.freeBuf, buf)
-		return
-	}
-	for i, old := range cc.freeBuf {
-		if old == nil {
-			cc.freeBuf[i] = buf
-			return
-		}
-	}
-	// forget about it.
-}
-
-// errRequestCanceled is a copy of net/http's errRequestCanceled because it's not
-// exported. At least they'll be DeepEqual for h1-vs-h2 comparisons tests.
-var errRequestCanceled = errors.New("net/http: request canceled")
-
-func commaSeparatedTrailers(req *http.Request) (string, error) {
-	keys := make([]string, 0, len(req.Trailer))
-	for k := range req.Trailer {
-		k = http.CanonicalHeaderKey(k)
-		switch k {
-		case "Transfer-Encoding", "Trailer", "Content-Length":
-			return "", &badStringError{"invalid Trailer key", k}
-		}
-		keys = append(keys, k)
-	}
-	if len(keys) > 0 {
-		sort.Strings(keys)
-		return strings.Join(keys, ","), nil
-	}
-	return "", nil
-}
-
-func (cc *ClientConn) responseHeaderTimeout() time.Duration {
-	if cc.t.t1 != nil {
-		return cc.t.t1.ResponseHeaderTimeout
-	}
-	// No way to do this (yet?) with just an http2.Transport. Probably
-	// no need. Request.Cancel this is the new way. We only need to support
-	// this for compatibility with the old http.Transport fields when
-	// we're doing transparent http2.
-	return 0
-}
-
-// checkConnHeaders checks whether req has any invalid connection-level headers.
-// per RFC 7540 section 8.1.2.2: Connection-Specific Header Fields.
-// Certain headers are special-cased as okay but not transmitted later.
-func checkConnHeaders(req *http.Request) error {
-	if v := req.Header.Get("Upgrade"); v != "" {
-		return fmt.Errorf("http2: invalid Upgrade request header: %q", req.Header["Upgrade"])
-	}
-	if vv := req.Header["Transfer-Encoding"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "chunked") {
-		return fmt.Errorf("http2: invalid Transfer-Encoding request header: %q", vv)
-	}
-	if vv := req.Header["Connection"]; len(vv) > 0 && (len(vv) > 1 || vv[0] != "" && vv[0] != "close" && vv[0] != "keep-alive") {
-		return fmt.Errorf("http2: invalid Connection request header: %q", vv)
-	}
-	return nil
-}
-
-// actualContentLength returns a sanitized version of
-// req.ContentLength, where 0 actually means zero (not unknown) and -1
-// means unknown.
-func actualContentLength(req *http.Request) int64 {
-	if req.Body == nil {
-		return 0
-	}
-	if req.ContentLength != 0 {
-		return req.ContentLength
-	}
-	return -1
-}
-
-func (cc *ClientConn) RoundTrip(req *http.Request) (*http.Response, error) {
-	if err := checkConnHeaders(req); err != nil {
-		return nil, err
-	}
-	if cc.idleTimer != nil {
-		cc.idleTimer.Stop()
-	}
-
-	trailers, err := commaSeparatedTrailers(req)
-	if err != nil {
-		return nil, err
-	}
-	hasTrailers := trailers != ""
-
-	cc.mu.Lock()
-	cc.lastActive = time.Now()
-	if cc.closed || !cc.canTakeNewRequestLocked() {
-		cc.mu.Unlock()
-		return nil, errClientConnUnusable
-	}
-
-	body := req.Body
-	hasBody := body != nil
-	contentLen := actualContentLength(req)
-
-	// TODO(bradfitz): this is a copy of the logic in net/http. Unify somewhere?
-	var requestedGzip bool
-	if !cc.t.disableCompression() &&
-		req.Header.Get("Accept-Encoding") == "" &&
-		req.Header.Get("Range") == "" &&
-		req.Method != "HEAD" {
-		// Request gzip only, not deflate. Deflate is ambiguous and
-		// not as universally supported anyway.
-		// See: http://www.gzip.org/zlib/zlib_faq.html#faq38
-		//
-		// Note that we don't request this for HEAD requests,
-		// due to a bug in nginx:
-		//   http://trac.nginx.org/nginx/ticket/358
-		//   https://golang.org/issue/5522
-		//
-		// We don't request gzip if the request is for a range, since
-		// auto-decoding a portion of a gzipped document will just fail
-		// anyway. See https://golang.org/issue/8923
-		requestedGzip = true
-	}
-
-	// we send: HEADERS{1}, CONTINUATION{0,} + DATA{0,} (DATA is
-	// sent by writeRequestBody below, along with any Trailers,
-	// again in form HEADERS{1}, CONTINUATION{0,})
-	hdrs, err := cc.encodeHeaders(req, requestedGzip, trailers, contentLen)
-	if err != nil {
-		cc.mu.Unlock()
-		return nil, err
-	}
-
-	cs := cc.newStream()
-	cs.req = req
-	cs.trace = requestTrace(req)
-	cs.requestedGzip = requestedGzip
-	bodyWriter := cc.t.getBodyWriterState(cs, body)
-	cs.on100 = bodyWriter.on100
-
-	cc.wmu.Lock()
-	endStream := !hasBody && !hasTrailers
-	werr := cc.writeHeaders(cs.ID, endStream, hdrs)
-	cc.wmu.Unlock()
-	traceWroteHeaders(cs.trace)
-	cc.mu.Unlock()
-
-	if werr != nil {
-		if hasBody {
-			req.Body.Close() // per RoundTripper contract
-			bodyWriter.cancel()
-		}
-		cc.forgetStreamID(cs.ID)
-		// Don't bother sending a RST_STREAM (our write already failed;
-		// no need to keep writing)
-		traceWroteRequest(cs.trace, werr)
-		return nil, werr
-	}
-
-	var respHeaderTimer <-chan time.Time
-	if hasBody {
-		bodyWriter.scheduleBodyWrite()
-	} else {
-		traceWroteRequest(cs.trace, nil)
-		if d := cc.responseHeaderTimeout(); d != 0 {
-			timer := time.NewTimer(d)
-			defer timer.Stop()
-			respHeaderTimer = timer.C
-		}
-	}
-
-	readLoopResCh := cs.resc
-	bodyWritten := false
-	ctx := reqContext(req)
-
-	handleReadLoopResponse := func(re resAndError) (*http.Response, error) {
-		res := re.res
-		if re.err != nil || res.StatusCode > 299 {
-			// On error or status code 3xx, 4xx, 5xx, etc abort any
-			// ongoing write, assuming that the server doesn't care
-			// about our request body. If the server replied with 1xx or
-			// 2xx, however, then assume the server DOES potentially
-			// want our body (e.g. full-duplex streaming:
-			// golang.org/issue/13444). If it turns out the server
-			// doesn't, they'll RST_STREAM us soon enough. This is a
-			// heuristic to avoid adding knobs to Transport. Hopefully
-			// we can keep it.
-			bodyWriter.cancel()
-			cs.abortRequestBodyWrite(errStopReqBodyWrite)
-		}
-		if re.err != nil {
-			if re.err == errClientConnGotGoAway {
-				cc.mu.Lock()
-				if cs.startedWrite {
-					re.err = errClientConnGotGoAwayAfterSomeReqBody
-				}
-				cc.mu.Unlock()
-			}
-			cc.forgetStreamID(cs.ID)
-			return nil, re.err
-		}
-		res.Request = req
-		res.TLS = cc.tlsState
-		return res, nil
-	}
-
-	for {
-		select {
-		case re := <-readLoopResCh:
-			return handleReadLoopResponse(re)
-		case <-respHeaderTimer:
-			cc.forgetStreamID(cs.ID)
-			if !hasBody || bodyWritten {
-				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
-			} else {
-				bodyWriter.cancel()
-				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
-			}
-			return nil, errTimeout
-		case <-ctx.Done():
-			cc.forgetStreamID(cs.ID)
-			if !hasBody || bodyWritten {
-				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
-			} else {
-				bodyWriter.cancel()
-				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
-			}
-			return nil, ctx.Err()
-		case <-req.Cancel:
-			cc.forgetStreamID(cs.ID)
-			if !hasBody || bodyWritten {
-				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
-			} else {
-				bodyWriter.cancel()
-				cs.abortRequestBodyWrite(errStopReqBodyWriteAndCancel)
-			}
-			return nil, errRequestCanceled
-		case <-cs.peerReset:
-			// processResetStream already removed the
-			// stream from the streams map; no need for
-			// forgetStreamID.
-			return nil, cs.resetErr
-		case err := <-bodyWriter.resc:
-			// Prefer the read loop's response, if available. Issue 16102.
-			select {
-			case re := <-readLoopResCh:
-				return handleReadLoopResponse(re)
-			default:
-			}
-			if err != nil {
-				return nil, err
-			}
-			bodyWritten = true
-			if d := cc.responseHeaderTimeout(); d != 0 {
-				timer := time.NewTimer(d)
-				defer timer.Stop()
-				respHeaderTimer = timer.C
-			}
-		}
-	}
-}
-
-// requires cc.wmu be held
-func (cc *ClientConn) writeHeaders(streamID uint32, endStream bool, hdrs []byte) error {
-	first := true // first frame written (HEADERS is first, then CONTINUATION)
-	frameSize := int(cc.maxFrameSize)
-	for len(hdrs) > 0 && cc.werr == nil {
-		chunk := hdrs
-		if len(chunk) > frameSize {
-			chunk = chunk[:frameSize]
-		}
-		hdrs = hdrs[len(chunk):]
-		endHeaders := len(hdrs) == 0
-		if first {
-			cc.fr.WriteHeaders(HeadersFrameParam{
-				StreamID:      streamID,
-				BlockFragment: chunk,
-				EndStream:     endStream,
-				EndHeaders:    endHeaders,
-			})
-			first = false
-		} else {
-			cc.fr.WriteContinuation(streamID, endHeaders, chunk)
-		}
-	}
-	// TODO(bradfitz): this Flush could potentially block (as
-	// could the WriteHeaders call(s) above), which means they
-	// wouldn't respond to Request.Cancel being readable. That's
-	// rare, but this should probably be in a goroutine.
-	cc.bw.Flush()
-	return cc.werr
-}
-
-// internal error values; they don't escape to callers
-var (
-	// abort request body write; don't send cancel
-	errStopReqBodyWrite = errors.New("http2: aborting request body write")
-
-	// abort request body write, but send stream reset of cancel.
-	errStopReqBodyWriteAndCancel = errors.New("http2: canceling request")
-)
-
-func (cs *clientStream) writeRequestBody(body io.Reader, bodyCloser io.Closer) (err error) {
-	cc := cs.cc
-	sentEnd := false // whether we sent the final DATA frame w/ END_STREAM
-	buf := cc.frameScratchBuffer()
-	defer cc.putFrameScratchBuffer(buf)
-
-	defer func() {
-		traceWroteRequest(cs.trace, err)
-		// TODO: write h12Compare test showing whether
-		// Request.Body is closed by the Transport,
-		// and in multiple cases: server replies <=299 and >299
-		// while still writing request body
-		cerr := bodyCloser.Close()
-		if err == nil {
-			err = cerr
-		}
-	}()
-
-	req := cs.req
-	hasTrailers := req.Trailer != nil
-
-	var sawEOF bool
-	for !sawEOF {
-		n, err := body.Read(buf)
-		if err == io.EOF {
-			sawEOF = true
-			err = nil
-		} else if err != nil {
-			return err
-		}
-
-		remain := buf[:n]
-		for len(remain) > 0 && err == nil {
-			var allowed int32
-			allowed, err = cs.awaitFlowControl(len(remain))
-			switch {
-			case err == errStopReqBodyWrite:
-				return err
-			case err == errStopReqBodyWriteAndCancel:
-				cc.writeStreamReset(cs.ID, ErrCodeCancel, nil)
-				return err
-			case err != nil:
-				return err
-			}
-			cc.wmu.Lock()
-			data := remain[:allowed]
-			remain = remain[allowed:]
-			sentEnd = sawEOF && len(remain) == 0 && !hasTrailers
-			err = cc.fr.WriteData(cs.ID, sentEnd, data)
-			if err == nil {
-				// TODO(bradfitz): this flush is for latency, not bandwidth.
-				// Most requests won't need this. Make this opt-in or
-				// opt-out?  Use some heuristic on the body type? Nagel-like
-				// timers?  Based on 'n'? Only last chunk of this for loop,
-				// unless flow control tokens are low? For now, always.
-				// If we change this, see comment below.
-				err = cc.bw.Flush()
-			}
-			cc.wmu.Unlock()
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	if sentEnd {
-		// Already sent END_STREAM (which implies we have no
-		// trailers) and flushed, because currently all
-		// WriteData frames above get a flush. So we're done.
-		return nil
-	}
-
-	var trls []byte
-	if hasTrailers {
-		cc.mu.Lock()
-		defer cc.mu.Unlock()
-		trls = cc.encodeTrailers(req)
-	}
-
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
-
-	// Two ways to send END_STREAM: either with trailers, or
-	// with an empty DATA frame.
-	if len(trls) > 0 {
-		err = cc.writeHeaders(cs.ID, true, trls)
-	} else {
-		err = cc.fr.WriteData(cs.ID, true, nil)
-	}
-	if ferr := cc.bw.Flush(); ferr != nil && err == nil {
-		err = ferr
-	}
-	return err
-}
-
-// awaitFlowControl waits for [1, min(maxBytes, cc.cs.maxFrameSize)] flow
-// control tokens from the server.
-// It returns either the non-zero number of tokens taken or an error
-// if the stream is dead.
-func (cs *clientStream) awaitFlowControl(maxBytes int) (taken int32, err error) {
-	cc := cs.cc
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	for {
-		if cc.closed {
-			return 0, errClientConnClosed
-		}
-		if cs.stopReqBody != nil {
-			return 0, cs.stopReqBody
-		}
-		if err := cs.checkResetOrDone(); err != nil {
-			return 0, err
-		}
-		if a := cs.flow.available(); a > 0 {
-			take := a
-			if int(take) > maxBytes {
-
-				take = int32(maxBytes) // can't truncate int; take is int32
-			}
-			if take > int32(cc.maxFrameSize) {
-				take = int32(cc.maxFrameSize)
-			}
-			cs.flow.take(take)
-			return take, nil
-		}
-		cc.cond.Wait()
-	}
-}
-
-type badStringError struct {
-	what string
-	str  string
-}
-
-func (e *badStringError) Error() string { return fmt.Sprintf("%s %q", e.what, e.str) }
-
-// requires cc.mu be held.
-func (cc *ClientConn) encodeHeaders(req *http.Request, addGzipHeader bool, trailers string, contentLength int64) ([]byte, error) {
-	cc.hbuf.Reset()
-
-	host := req.Host
-	if host == "" {
-		host = req.URL.Host
-	}
-	host, err := httplex.PunycodeHostPort(host)
-	if err != nil {
-		return nil, err
-	}
-
-	var path string
-	if req.Method != "CONNECT" {
-		path = req.URL.RequestURI()
-		if !validPseudoPath(path) {
-			orig := path
-			path = strings.TrimPrefix(path, req.URL.Scheme+"://"+host)
-			if !validPseudoPath(path) {
-				if req.URL.Opaque != "" {
-					return nil, fmt.Errorf("invalid request :path %q from URL.Opaque = %q", orig, req.URL.Opaque)
-				} else {
-					return nil, fmt.Errorf("invalid request :path %q", orig)
-				}
-			}
-		}
-	}
-
-	// Check for any invalid headers and return an error before we
-	// potentially pollute our hpack state. (We want to be able to
-	// continue to reuse the hpack encoder for future requests)
-	for k, vv := range req.Header {
-		if !httplex.ValidHeaderFieldName(k) {
-			return nil, fmt.Errorf("invalid HTTP header name %q", k)
-		}
-		for _, v := range vv {
-			if !httplex.ValidHeaderFieldValue(v) {
-				return nil, fmt.Errorf("invalid HTTP header value %q for header %q", v, k)
-			}
-		}
-	}
-
-	// 8.1.2.3 Request Pseudo-Header Fields
-	// The :path pseudo-header field includes the path and query parts of the
-	// target URI (the path-absolute production and optionally a '?' character
-	// followed by the query production (see Sections 3.3 and 3.4 of
-	// [RFC3986]).
-	cc.writeHeader(":authority", host)
-	cc.writeHeader(":method", req.Method)
-	if req.Method != "CONNECT" {
-		cc.writeHeader(":path", path)
-		cc.writeHeader(":scheme", req.URL.Scheme)
-	}
-	if trailers != "" {
-		cc.writeHeader("trailer", trailers)
-	}
-
-	var didUA bool
-	for k, vv := range req.Header {
-		lowKey := strings.ToLower(k)
-		switch lowKey {
-		case "host", "content-length":
-			// Host is :authority, already sent.
-			// Content-Length is automatic, set below.
-			continue
-		case "connection", "proxy-connection", "transfer-encoding", "upgrade", "keep-alive":
-			// Per 8.1.2.2 Connection-Specific Header
-			// Fields, don't send connection-specific
-			// fields. We have already checked if any
-			// are error-worthy so just ignore the rest.
-			continue
-		case "user-agent":
-			// Match Go's http1 behavior: at most one
-			// User-Agent. If set to nil or empty string,
-			// then omit it. Otherwise if not mentioned,
-			// include the default (below).
-			didUA = true
-			if len(vv) < 1 {
-				continue
-			}
-			vv = vv[:1]
-			if vv[0] == "" {
-				continue
-			}
-		}
-		for _, v := range vv {
-			cc.writeHeader(lowKey, v)
-		}
-	}
-	if shouldSendReqContentLength(req.Method, contentLength) {
-		cc.writeHeader("content-length", strconv.FormatInt(contentLength, 10))
-	}
-	if addGzipHeader {
-		cc.writeHeader("accept-encoding", "gzip")
-	}
-	if !didUA {
-		cc.writeHeader("user-agent", defaultUserAgent)
-	}
-	return cc.hbuf.Bytes(), nil
-}
-
-// shouldSendReqContentLength reports whether the http2.Transport should send
-// a "content-length" request header. This logic is basically a copy of the net/http
-// transferWriter.shouldSendContentLength.
-// The contentLength is the corrected contentLength (so 0 means actually 0, not unknown).
-// -1 means unknown.
-func shouldSendReqContentLength(method string, contentLength int64) bool {
-	if contentLength > 0 {
-		return true
-	}
-	if contentLength < 0 {
-		return false
-	}
-	// For zero bodies, whether we send a content-length depends on the method.
-	// It also kinda doesn't matter for http2 either way, with END_STREAM.
-	switch method {
-	case "POST", "PUT", "PATCH":
-		return true
-	default:
-		return false
-	}
-}
-
-// requires cc.mu be held.
-func (cc *ClientConn) encodeTrailers(req *http.Request) []byte {
-	cc.hbuf.Reset()
-	for k, vv := range req.Trailer {
-		// Transfer-Encoding, etc.. have already been filter at the
-		// start of RoundTrip
-		lowKey := strings.ToLower(k)
-		for _, v := range vv {
-			cc.writeHeader(lowKey, v)
-		}
-	}
-	return cc.hbuf.Bytes()
-}
-
-func (cc *ClientConn) writeHeader(name, value string) {
-	if VerboseLogs {
-		log.Printf("http2: Transport encoding header %q = %q", name, value)
-	}
-	cc.henc.WriteField(hpack.HeaderField{Name: name, Value: value})
-}
-
-type resAndError struct {
-	res *http.Response
-	err error
-}
-
-// requires cc.mu be held.
-func (cc *ClientConn) newStream() *clientStream {
-	cs := &clientStream{
-		cc:        cc,
-		ID:        cc.nextStreamID,
-		resc:      make(chan resAndError, 1),
-		peerReset: make(chan struct{}),
-		done:      make(chan struct{}),
-	}
-	cs.flow.add(int32(cc.initialWindowSize))
-	cs.flow.setConnFlow(&cc.flow)
-	cs.inflow.add(transportDefaultStreamFlow)
-	cs.inflow.setConnFlow(&cc.inflow)
-	cc.nextStreamID += 2
-	cc.streams[cs.ID] = cs
-	return cs
-}
-
-func (cc *ClientConn) forgetStreamID(id uint32) {
-	cc.streamByID(id, true)
-}
-
-func (cc *ClientConn) streamByID(id uint32, andRemove bool) *clientStream {
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-	cs := cc.streams[id]
-	if andRemove && cs != nil && !cc.closed {
-		cc.lastActive = time.Now()
-		delete(cc.streams, id)
-		if len(cc.streams) == 0 && cc.idleTimer != nil {
-			cc.idleTimer.Reset(cc.idleTimeout)
-		}
-		close(cs.done)
-		cc.cond.Broadcast() // wake up checkResetOrDone via clientStream.awaitFlowControl
-	}
-	return cs
-}
-
-// clientConnReadLoop is the state owned by the clientConn's frame-reading readLoop.
-type clientConnReadLoop struct {
-	cc            *ClientConn
-	activeRes     map[uint32]*clientStream // keyed by streamID
-	closeWhenIdle bool
-}
-
-// readLoop runs in its own goroutine and reads and dispatches frames.
-func (cc *ClientConn) readLoop() {
-	rl := &clientConnReadLoop{
-		cc:        cc,
-		activeRes: make(map[uint32]*clientStream),
-	}
-
-	defer rl.cleanup()
-	cc.readerErr = rl.run()
-	if ce, ok := cc.readerErr.(ConnectionError); ok {
-		cc.wmu.Lock()
-		cc.fr.WriteGoAway(0, ErrCode(ce), nil)
-		cc.wmu.Unlock()
-	}
-}
-
-// GoAwayError is returned by the Transport when the server closes the
-// TCP connection after sending a GOAWAY frame.
-type GoAwayError struct {
-	LastStreamID uint32
-	ErrCode      ErrCode
-	DebugData    string
-}
-
-func (e GoAwayError) Error() string {
-	return fmt.Sprintf("http2: server sent GOAWAY and closed the connection; LastStreamID=%v, ErrCode=%v, debug=%q",
-		e.LastStreamID, e.ErrCode, e.DebugData)
-}
-
-func isEOFOrNetReadError(err error) bool {
-	if err == io.EOF {
-		return true
-	}
-	ne, ok := err.(*net.OpError)
-	return ok && ne.Op == "read"
-}
-
-func (rl *clientConnReadLoop) cleanup() {
-	cc := rl.cc
-	defer cc.tconn.Close()
-	defer cc.t.connPool().MarkDead(cc)
-	defer close(cc.readerDone)
-
-	if cc.idleTimer != nil {
-		cc.idleTimer.Stop()
-	}
-
-	// Close any response bodies if the server closes prematurely.
-	// TODO: also do this if we've written the headers but not
-	// gotten a response yet.
-	err := cc.readerErr
-	cc.mu.Lock()
-	if cc.goAway != nil && isEOFOrNetReadError(err) {
-		err = GoAwayError{
-			LastStreamID: cc.goAway.LastStreamID,
-			ErrCode:      cc.goAway.ErrCode,
-			DebugData:    cc.goAwayDebug,
-		}
-	} else if err == io.EOF {
-		err = io.ErrUnexpectedEOF
-	}
-	for _, cs := range rl.activeRes {
-		cs.bufPipe.CloseWithError(err)
-	}
-	for _, cs := range cc.streams {
-		select {
-		case cs.resc <- resAndError{err: err}:
-		default:
-		}
-		close(cs.done)
-	}
-	cc.closed = true
-	cc.cond.Broadcast()
-	cc.mu.Unlock()
-}
-
-func (rl *clientConnReadLoop) run() error {
-	cc := rl.cc
-	rl.closeWhenIdle = cc.t.disableKeepAlives() || cc.singleUse
-	gotReply := false // ever saw a HEADERS reply
-	gotSettings := false
-	for {
-		f, err := cc.fr.ReadFrame()
-		if err != nil {
-			cc.vlogf("http2: Transport readFrame error on conn %p: (%T) %v", cc, err, err)
-		}
-		if se, ok := err.(StreamError); ok {
-			if cs := cc.streamByID(se.StreamID, true /*ended; remove it*/); cs != nil {
-				cs.cc.writeStreamReset(cs.ID, se.Code, err)
-				if se.Cause == nil {
-					se.Cause = cc.fr.errDetail
-				}
-				rl.endStreamError(cs, se)
-			}
-			continue
-		} else if err != nil {
-			return err
-		}
-		if VerboseLogs {
-			cc.vlogf("http2: Transport received %s", summarizeFrame(f))
-		}
-		if !gotSettings {
-			if _, ok := f.(*SettingsFrame); !ok {
-				cc.logf("protocol error: received %T before a SETTINGS frame", f)
-				return ConnectionError(ErrCodeProtocol)
-			}
-			gotSettings = true
-		}
-		maybeIdle := false // whether frame might transition us to idle
-
-		switch f := f.(type) {
-		case *MetaHeadersFrame:
-			err = rl.processHeaders(f)
-			maybeIdle = true
-			gotReply = true
-		case *DataFrame:
-			err = rl.processData(f)
-			maybeIdle = true
-		case *GoAwayFrame:
-			err = rl.processGoAway(f)
-			maybeIdle = true
-		case *RSTStreamFrame:
-			err = rl.processResetStream(f)
-			maybeIdle = true
-		case *SettingsFrame:
-			err = rl.processSettings(f)
-		case *PushPromiseFrame:
-			err = rl.processPushPromise(f)
-		case *WindowUpdateFrame:
-			err = rl.processWindowUpdate(f)
-		case *PingFrame:
-			err = rl.processPing(f)
-		default:
-			cc.logf("Transport: unhandled response frame type %T", f)
-		}
-		if err != nil {
-			if VerboseLogs {
-				cc.vlogf("http2: Transport conn %p received error from processing frame %v: %v", cc, summarizeFrame(f), err)
-			}
-			return err
-		}
-		if rl.closeWhenIdle && gotReply && maybeIdle && len(rl.activeRes) == 0 {
-			cc.closeIfIdle()
-		}
-	}
-}
-
-func (rl *clientConnReadLoop) processHeaders(f *MetaHeadersFrame) error {
-	cc := rl.cc
-	cs := cc.streamByID(f.StreamID, f.StreamEnded())
-	if cs == nil {
-		// We'd get here if we canceled a request while the
-		// server had its response still in flight. So if this
-		// was just something we canceled, ignore it.
-		return nil
-	}
-	if !cs.firstByte {
-		if cs.trace != nil {
-			// TODO(bradfitz): move first response byte earlier,
-			// when we first read the 9 byte header, not waiting
-			// until all the HEADERS+CONTINUATION frames have been
-			// merged. This works for now.
-			traceFirstResponseByte(cs.trace)
-		}
-		cs.firstByte = true
-	}
-	if !cs.pastHeaders {
-		cs.pastHeaders = true
-	} else {
-		return rl.processTrailers(cs, f)
-	}
-
-	res, err := rl.handleResponse(cs, f)
-	if err != nil {
-		if _, ok := err.(ConnectionError); ok {
-			return err
-		}
-		// Any other error type is a stream error.
-		cs.cc.writeStreamReset(f.StreamID, ErrCodeProtocol, err)
-		cs.resc <- resAndError{err: err}
-		return nil // return nil from process* funcs to keep conn alive
-	}
-	if res == nil {
-		// (nil, nil) special case. See handleResponse docs.
-		return nil
-	}
-	if res.Body != noBody {
-		rl.activeRes[cs.ID] = cs
-	}
-	cs.resTrailer = &res.Trailer
-	cs.resc <- resAndError{res: res}
-	return nil
-}
-
-// may return error types nil, or ConnectionError. Any other error value
-// is a StreamError of type ErrCodeProtocol. The returned error in that case
-// is the detail.
-//
-// As a special case, handleResponse may return (nil, nil) to skip the
-// frame (currently only used for 100 expect continue). This special
-// case is going away after Issue 13851 is fixed.
-func (rl *clientConnReadLoop) handleResponse(cs *clientStream, f *MetaHeadersFrame) (*http.Response, error) {
-	if f.Truncated {
-		return nil, errResponseHeaderListSize
-	}
-
-	status := f.PseudoValue("status")
-	if status == "" {
-		return nil, errors.New("missing status pseudo header")
-	}
-	statusCode, err := strconv.Atoi(status)
-	if err != nil {
-		return nil, errors.New("malformed non-numeric status pseudo header")
-	}
-
-	if statusCode == 100 {
-		traceGot100Continue(cs.trace)
-		if cs.on100 != nil {
-			cs.on100() // forces any write delay timer to fire
-		}
-		cs.pastHeaders = false // do it all again
-		return nil, nil
-	}
-
-	header := make(http.Header)
-	res := &http.Response{
-		Proto:      "HTTP/2.0",
-		ProtoMajor: 2,
-		Header:     header,
-		StatusCode: statusCode,
-		Status:     status + " " + http.StatusText(statusCode),
-	}
-	for _, hf := range f.RegularFields() {
-		key := http.CanonicalHeaderKey(hf.Name)
-		if key == "Trailer" {
-			t := res.Trailer
-			if t == nil {
-				t = make(http.Header)
-				res.Trailer = t
-			}
-			foreachHeaderElement(hf.Value, func(v string) {
-				t[http.CanonicalHeaderKey(v)] = nil
-			})
-		} else {
-			header[key] = append(header[key], hf.Value)
-		}
-	}
-
-	streamEnded := f.StreamEnded()
-	isHead := cs.req.Method == "HEAD"
-	if !streamEnded || isHead {
-		res.ContentLength = -1
-		if clens := res.Header["Content-Length"]; len(clens) == 1 {
-			if clen64, err := strconv.ParseInt(clens[0], 10, 64); err == nil {
-				res.ContentLength = clen64
-			} else {
-				// TODO: care? unlike http/1, it won't mess up our framing, so it's
-				// more safe smuggling-wise to ignore.
-			}
-		} else if len(clens) > 1 {
-			// TODO: care? unlike http/1, it won't mess up our framing, so it's
-			// more safe smuggling-wise to ignore.
-		}
-	}
-
-	if streamEnded || isHead {
-		res.Body = noBody
-		return res, nil
-	}
-
-	cs.bufPipe = pipe{b: &dataBuffer{expected: res.ContentLength}}
-	cs.bytesRemain = res.ContentLength
-	res.Body = transportResponseBody{cs}
-	go cs.awaitRequestCancel(cs.req)
-
-	if cs.requestedGzip && res.Header.Get("Content-Encoding") == "gzip" {
-		res.Header.Del("Content-Encoding")
-		res.Header.Del("Content-Length")
-		res.ContentLength = -1
-		res.Body = &gzipReader{body: res.Body}
-		setResponseUncompressed(res)
-	}
-	return res, nil
-}
-
-func (rl *clientConnReadLoop) processTrailers(cs *clientStream, f *MetaHeadersFrame) error {
-	if cs.pastTrailers {
-		// Too many HEADERS frames for this stream.
-		return ConnectionError(ErrCodeProtocol)
-	}
-	cs.pastTrailers = true
-	if !f.StreamEnded() {
-		// We expect that any headers for trailers also
-		// has END_STREAM.
-		return ConnectionError(ErrCodeProtocol)
-	}
-	if len(f.PseudoFields()) > 0 {
-		// No pseudo header fields are defined for trailers.
-		// TODO: ConnectionError might be overly harsh? Check.
-		return ConnectionError(ErrCodeProtocol)
-	}
-
-	trailer := make(http.Header)
-	for _, hf := range f.RegularFields() {
-		key := http.CanonicalHeaderKey(hf.Name)
-		trailer[key] = append(trailer[key], hf.Value)
-	}
-	cs.trailer = trailer
-
-	rl.endStream(cs)
-	return nil
-}
-
-// transportResponseBody is the concrete type of Transport.RoundTrip's
-// Response.Body. It is an io.ReadCloser. On Read, it reads from cs.body.
-// On Close it sends RST_STREAM if EOF wasn't already seen.
-type transportResponseBody struct {
-	cs *clientStream
-}
-
-func (b transportResponseBody) Read(p []byte) (n int, err error) {
-	cs := b.cs
-	cc := cs.cc
-
-	if cs.readErr != nil {
-		return 0, cs.readErr
-	}
-	n, err = b.cs.bufPipe.Read(p)
-	if cs.bytesRemain != -1 {
-		if int64(n) > cs.bytesRemain {
-			n = int(cs.bytesRemain)
-			if err == nil {
-				err = errors.New("net/http: server replied with more than declared Content-Length; truncated")
-				cc.writeStreamReset(cs.ID, ErrCodeProtocol, err)
-			}
-			cs.readErr = err
-			return int(cs.bytesRemain), err
-		}
-		cs.bytesRemain -= int64(n)
-		if err == io.EOF && cs.bytesRemain > 0 {
-			err = io.ErrUnexpectedEOF
-			cs.readErr = err
-			return n, err
-		}
-	}
-	if n == 0 {
-		// No flow control tokens to send back.
-		return
-	}
-
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-
-	var connAdd, streamAdd int32
-	// Check the conn-level first, before the stream-level.
-	if v := cc.inflow.available(); v < transportDefaultConnFlow/2 {
-		connAdd = transportDefaultConnFlow - v
-		cc.inflow.add(connAdd)
-	}
-	if err == nil { // No need to refresh if the stream is over or failed.
-		// Consider any buffered body data (read from the conn but not
-		// consumed by the client) when computing flow control for this
-		// stream.
-		v := int(cs.inflow.available()) + cs.bufPipe.Len()
-		if v < transportDefaultStreamFlow-transportDefaultStreamMinRefresh {
-			streamAdd = int32(transportDefaultStreamFlow - v)
-			cs.inflow.add(streamAdd)
-		}
-	}
-	if connAdd != 0 || streamAdd != 0 {
-		cc.wmu.Lock()
-		defer cc.wmu.Unlock()
-		if connAdd != 0 {
-			cc.fr.WriteWindowUpdate(0, mustUint31(connAdd))
-		}
-		if streamAdd != 0 {
-			cc.fr.WriteWindowUpdate(cs.ID, mustUint31(streamAdd))
-		}
-		cc.bw.Flush()
-	}
-	return
-}
-
-var errClosedResponseBody = errors.New("http2: response body closed")
-
-func (b transportResponseBody) Close() error {
-	cs := b.cs
-	cc := cs.cc
-
-	serverSentStreamEnd := cs.bufPipe.Err() == io.EOF
-	unread := cs.bufPipe.Len()
-
-	if unread > 0 || !serverSentStreamEnd {
-		cc.mu.Lock()
-		cc.wmu.Lock()
-		if !serverSentStreamEnd {
-			cc.fr.WriteRSTStream(cs.ID, ErrCodeCancel)
-		}
-		// Return connection-level flow control.
-		if unread > 0 {
-			cc.inflow.add(int32(unread))
-			cc.fr.WriteWindowUpdate(0, uint32(unread))
-		}
-		cc.bw.Flush()
-		cc.wmu.Unlock()
-		cc.mu.Unlock()
-	}
-
-	cs.bufPipe.BreakWithError(errClosedResponseBody)
-	return nil
-}
-
-func (rl *clientConnReadLoop) processData(f *DataFrame) error {
-	cc := rl.cc
-	cs := cc.streamByID(f.StreamID, f.StreamEnded())
-	data := f.Data()
-	if cs == nil {
-		cc.mu.Lock()
-		neverSent := cc.nextStreamID
-		cc.mu.Unlock()
-		if f.StreamID >= neverSent {
-			// We never asked for this.
-			cc.logf("http2: Transport received unsolicited DATA frame; closing connection")
-			return ConnectionError(ErrCodeProtocol)
-		}
-		// We probably did ask for this, but canceled. Just ignore it.
-		// TODO: be stricter here? only silently ignore things which
-		// we canceled, but not things which were closed normally
-		// by the peer? Tough without accumulating too much state.
-
-		// But at least return their flow control:
-		if f.Length > 0 {
-			cc.mu.Lock()
-			cc.inflow.add(int32(f.Length))
-			cc.mu.Unlock()
-
-			cc.wmu.Lock()
-			cc.fr.WriteWindowUpdate(0, uint32(f.Length))
-			cc.bw.Flush()
-			cc.wmu.Unlock()
-		}
-		return nil
-	}
-	if f.Length > 0 {
-		if len(data) > 0 && cs.bufPipe.b == nil {
-			// Data frame after it's already closed?
-			cc.logf("http2: Transport received DATA frame for closed stream; closing connection")
-			return ConnectionError(ErrCodeProtocol)
-		}
-
-		// Check connection-level flow control.
-		cc.mu.Lock()
-		if cs.inflow.available() >= int32(f.Length) {
-			cs.inflow.take(int32(f.Length))
-		} else {
-			cc.mu.Unlock()
-			return ConnectionError(ErrCodeFlowControl)
-		}
-		// Return any padded flow control now, since we won't
-		// refund it later on body reads.
-		if pad := int32(f.Length) - int32(len(data)); pad > 0 {
-			cs.inflow.add(pad)
-			cc.inflow.add(pad)
-			cc.wmu.Lock()
-			cc.fr.WriteWindowUpdate(0, uint32(pad))
-			cc.fr.WriteWindowUpdate(cs.ID, uint32(pad))
-			cc.bw.Flush()
-			cc.wmu.Unlock()
-		}
-		didReset := cs.didReset
-		cc.mu.Unlock()
-
-		if len(data) > 0 && !didReset {
-			if _, err := cs.bufPipe.Write(data); err != nil {
-				rl.endStreamError(cs, err)
-				return err
-			}
-		}
-	}
-
-	if f.StreamEnded() {
-		rl.endStream(cs)
-	}
-	return nil
-}
-
-var errInvalidTrailers = errors.New("http2: invalid trailers")
-
-func (rl *clientConnReadLoop) endStream(cs *clientStream) {
-	// TODO: check that any declared content-length matches, like
-	// server.go's (*stream).endStream method.
-	rl.endStreamError(cs, nil)
-}
-
-func (rl *clientConnReadLoop) endStreamError(cs *clientStream, err error) {
-	var code func()
-	if err == nil {
-		err = io.EOF
-		code = cs.copyTrailers
-	}
-	cs.bufPipe.closeWithErrorAndCode(err, code)
-	delete(rl.activeRes, cs.ID)
-	if isConnectionCloseRequest(cs.req) {
-		rl.closeWhenIdle = true
-	}
-
-	select {
-	case cs.resc <- resAndError{err: err}:
-	default:
-	}
-}
-
-func (cs *clientStream) copyTrailers() {
-	for k, vv := range cs.trailer {
-		t := cs.resTrailer
-		if *t == nil {
-			*t = make(http.Header)
-		}
-		(*t)[k] = vv
-	}
-}
-
-func (rl *clientConnReadLoop) processGoAway(f *GoAwayFrame) error {
-	cc := rl.cc
-	cc.t.connPool().MarkDead(cc)
-	if f.ErrCode != 0 {
-		// TODO: deal with GOAWAY more. particularly the error code
-		cc.vlogf("transport got GOAWAY with error code = %v", f.ErrCode)
-	}
-	cc.setGoAway(f)
-	return nil
-}
-
-func (rl *clientConnReadLoop) processSettings(f *SettingsFrame) error {
-	cc := rl.cc
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-
-	if f.IsAck() {
-		if cc.wantSettingsAck {
-			cc.wantSettingsAck = false
-			return nil
-		}
-		return ConnectionError(ErrCodeProtocol)
-	}
-
-	err := f.ForeachSetting(func(s Setting) error {
-		switch s.ID {
-		case SettingMaxFrameSize:
-			cc.maxFrameSize = s.Val
-		case SettingMaxConcurrentStreams:
-			cc.maxConcurrentStreams = s.Val
-		case SettingInitialWindowSize:
-			// Values above the maximum flow-control
-			// window size of 2^31-1 MUST be treated as a
-			// connection error (Section 5.4.1) of type
-			// FLOW_CONTROL_ERROR.
-			if s.Val > math.MaxInt32 {
-				return ConnectionError(ErrCodeFlowControl)
-			}
-
-			// Adjust flow control of currently-open
-			// frames by the difference of the old initial
-			// window size and this one.
-			delta := int32(s.Val) - int32(cc.initialWindowSize)
-			for _, cs := range cc.streams {
-				cs.flow.add(delta)
-			}
-			cc.cond.Broadcast()
-
-			cc.initialWindowSize = s.Val
-		default:
-			// TODO(bradfitz): handle more settings? SETTINGS_HEADER_TABLE_SIZE probably.
-			cc.vlogf("Unhandled Setting: %v", s)
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
-
-	cc.fr.WriteSettingsAck()
-	cc.bw.Flush()
-	return cc.werr
-}
-
-func (rl *clientConnReadLoop) processWindowUpdate(f *WindowUpdateFrame) error {
-	cc := rl.cc
-	cs := cc.streamByID(f.StreamID, false)
-	if f.StreamID != 0 && cs == nil {
-		return nil
-	}
-
-	cc.mu.Lock()
-	defer cc.mu.Unlock()
-
-	fl := &cc.flow
-	if cs != nil {
-		fl = &cs.flow
-	}
-	if !fl.add(int32(f.Increment)) {
-		return ConnectionError(ErrCodeFlowControl)
-	}
-	cc.cond.Broadcast()
-	return nil
-}
-
-func (rl *clientConnReadLoop) processResetStream(f *RSTStreamFrame) error {
-	cs := rl.cc.streamByID(f.StreamID, true)
-	if cs == nil {
-		// TODO: return error if server tries to RST_STEAM an idle stream
-		return nil
-	}
-	select {
-	case <-cs.peerReset:
-		// Already reset.
-		// This is the only goroutine
-		// which closes this, so there
-		// isn't a race.
-	default:
-		err := streamError(cs.ID, f.ErrCode)
-		cs.resetErr = err
-		close(cs.peerReset)
-		cs.bufPipe.CloseWithError(err)
-		cs.cc.cond.Broadcast() // wake up checkResetOrDone via clientStream.awaitFlowControl
-	}
-	delete(rl.activeRes, cs.ID)
-	return nil
-}
-
-// Ping sends a PING frame to the server and waits for the ack.
-// Public implementation is in go17.go and not_go17.go
-func (cc *ClientConn) ping(ctx contextContext) error {
-	c := make(chan struct{})
-	// Generate a random payload
-	var p [8]byte
-	for {
-		if _, err := rand.Read(p[:]); err != nil {
-			return err
-		}
-		cc.mu.Lock()
-		// check for dup before insert
-		if _, found := cc.pings[p]; !found {
-			cc.pings[p] = c
-			cc.mu.Unlock()
-			break
-		}
-		cc.mu.Unlock()
-	}
-	cc.wmu.Lock()
-	if err := cc.fr.WritePing(false, p); err != nil {
-		cc.wmu.Unlock()
-		return err
-	}
-	if err := cc.bw.Flush(); err != nil {
-		cc.wmu.Unlock()
-		return err
-	}
-	cc.wmu.Unlock()
-	select {
-	case <-c:
-		return nil
-	case <-ctx.Done():
-		return ctx.Err()
-	case <-cc.readerDone:
-		// connection closed
-		return cc.readerErr
-	}
-}
-
-func (rl *clientConnReadLoop) processPing(f *PingFrame) error {
-	if f.IsAck() {
-		cc := rl.cc
-		cc.mu.Lock()
-		defer cc.mu.Unlock()
-		// If ack, notify listener if any
-		if c, ok := cc.pings[f.Data]; ok {
-			close(c)
-			delete(cc.pings, f.Data)
-		}
-		return nil
-	}
-	cc := rl.cc
-	cc.wmu.Lock()
-	defer cc.wmu.Unlock()
-	if err := cc.fr.WritePing(true, f.Data); err != nil {
-		return err
-	}
-	return cc.bw.Flush()
-}
-
-func (rl *clientConnReadLoop) processPushPromise(f *PushPromiseFrame) error {
-	// We told the peer we don't want them.
-	// Spec says:
-	// "PUSH_PROMISE MUST NOT be sent if the SETTINGS_ENABLE_PUSH
-	// setting of the peer endpoint is set to 0. An endpoint that
-	// has set this setting and has received acknowledgement MUST
-	// treat the receipt of a PUSH_PROMISE frame as a connection
-	// error (Section 5.4.1) of type PROTOCOL_ERROR."
-	return ConnectionError(ErrCodeProtocol)
-}
-
-func (cc *ClientConn) writeStreamReset(streamID uint32, code ErrCode, err error) {
-	// TODO: map err to more interesting error codes, once the
-	// HTTP community comes up with some. But currently for
-	// RST_STREAM there's no equivalent to GOAWAY frame's debug
-	// data, and the error codes are all pretty vague ("cancel").
-	cc.wmu.Lock()
-	cc.fr.WriteRSTStream(streamID, code)
-	cc.bw.Flush()
-	cc.wmu.Unlock()
-}
-
-var (
-	errResponseHeaderListSize = errors.New("http2: response header list larger than advertised limit")
-	errPseudoTrailers         = errors.New("http2: invalid pseudo header in trailers")
-)
-
-func (cc *ClientConn) logf(format string, args ...interface{}) {
-	cc.t.logf(format, args...)
-}
-
-func (cc *ClientConn) vlogf(format string, args ...interface{}) {
-	cc.t.vlogf(format, args...)
-}
-
-func (t *Transport) vlogf(format string, args ...interface{}) {
-	if VerboseLogs {
-		t.logf(format, args...)
-	}
-}
-
-func (t *Transport) logf(format string, args ...interface{}) {
-	log.Printf(format, args...)
-}
-
-var noBody io.ReadCloser = ioutil.NopCloser(bytes.NewReader(nil))
-
-func strSliceContains(ss []string, s string) bool {
-	for _, v := range ss {
-		if v == s {
-			return true
-		}
-	}
-	return false
-}
-
-type erringRoundTripper struct{ err error }
-
-func (rt erringRoundTripper) RoundTrip(*http.Request) (*http.Response, error) { return nil, rt.err }
-
-// gzipReader wraps a response body so it can lazily
-// call gzip.NewReader on the first call to Read
-type gzipReader struct {
-	body io.ReadCloser // underlying Response.Body
-	zr   *gzip.Reader  // lazily-initialized gzip reader
-	zerr error         // sticky error
-}
-
-func (gz *gzipReader) Read(p []byte) (n int, err error) {
-	if gz.zerr != nil {
-		return 0, gz.zerr
-	}
-	if gz.zr == nil {
-		gz.zr, err = gzip.NewReader(gz.body)
-		if err != nil {
-			gz.zerr = err
-			return 0, err
-		}
-	}
-	return gz.zr.Read(p)
-}
-
-func (gz *gzipReader) Close() error {
-	return gz.body.Close()
-}
-
-type errorReader struct{ err error }
-
-func (r errorReader) Read(p []byte) (int, error) { return 0, r.err }
-
-// bodyWriterState encapsulates various state around the Transport's writing
-// of the request body, particularly regarding doing delayed writes of the body
-// when the request contains "Expect: 100-continue".
-type bodyWriterState struct {
-	cs     *clientStream
-	timer  *time.Timer   // if non-nil, we're doing a delayed write
-	fnonce *sync.Once    // to call fn with
-	fn     func()        // the code to run in the goroutine, writing the body
-	resc   chan error    // result of fn's execution
-	delay  time.Duration // how long we should delay a delayed write for
-}
-
-func (t *Transport) getBodyWriterState(cs *clientStream, body io.Reader) (s bodyWriterState) {
-	s.cs = cs
-	if body == nil {
-		return
-	}
-	resc := make(chan error, 1)
-	s.resc = resc
-	s.fn = func() {
-		cs.cc.mu.Lock()
-		cs.startedWrite = true
-		cs.cc.mu.Unlock()
-		resc <- cs.writeRequestBody(body, cs.req.Body)
-	}
-	s.delay = t.expectContinueTimeout()
-	if s.delay == 0 ||
-		!httplex.HeaderValuesContainsToken(
-			cs.req.Header["Expect"],
-			"100-continue") {
-		return
-	}
-	s.fnonce = new(sync.Once)
-
-	// Arm the timer with a very large duration, which we'll
-	// intentionally lower later. It has to be large now because
-	// we need a handle to it before writing the headers, but the
-	// s.delay value is defined to not start until after the
-	// request headers were written.
-	const hugeDuration = 365 * 24 * time.Hour
-	s.timer = time.AfterFunc(hugeDuration, func() {
-		s.fnonce.Do(s.fn)
-	})
-	return
-}
-
-func (s bodyWriterState) cancel() {
-	if s.timer != nil {
-		s.timer.Stop()
-	}
-}
-
-func (s bodyWriterState) on100() {
-	if s.timer == nil {
-		// If we didn't do a delayed write, ignore the server's
-		// bogus 100 continue response.
-		return
-	}
-	s.timer.Stop()
-	go func() { s.fnonce.Do(s.fn) }()
-}
-
-// scheduleBodyWrite starts writing the body, either immediately (in
-// the common case) or after the delay timeout. It should not be
-// called until after the headers have been written.
-func (s bodyWriterState) scheduleBodyWrite() {
-	if s.timer == nil {
-		// We're not doing a delayed write (see
-		// getBodyWriterState), so just start the writing
-		// goroutine immediately.
-		go s.fn()
-		return
-	}
-	traceWait100Continue(s.cs.trace)
-	if s.timer.Stop() {
-		s.timer.Reset(s.delay)
-	}
-}
-
-// isConnectionCloseRequest reports whether req should use its own
-// connection for a single request and then close the connection.
-func isConnectionCloseRequest(req *http.Request) bool {
-	return req.Close || httplex.HeaderValuesContainsToken(req.Header["Connection"], "close")
-}
diff --git a/installer/vendor/golang.org/x/net/http2/transport_test.go b/installer/vendor/golang.org/x/net/http2/transport_test.go
deleted file mode 100644
index 7ae8ff787a..0000000000
--- a/installer/vendor/golang.org/x/net/http2/transport_test.go
+++ /dev/null
@@ -1,2916 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/tls"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"reflect"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-)
-
-var (
-	extNet        = flag.Bool("extnet", false, "do external network tests")
-	transportHost = flag.String("transporthost", "http2.golang.org", "hostname to use for TestTransport")
-	insecure      = flag.Bool("insecure", false, "insecure TLS dials") // TODO: dead code. remove?
-)
-
-var tlsConfigInsecure = &tls.Config{InsecureSkipVerify: true}
-
-type testContext struct{}
-
-func (testContext) Done() <-chan struct{}                   { return make(chan struct{}) }
-func (testContext) Err() error                              { panic("should not be called") }
-func (testContext) Deadline() (deadline time.Time, ok bool) { return time.Time{}, false }
-func (testContext) Value(key interface{}) interface{}       { return nil }
-
-func TestTransportExternal(t *testing.T) {
-	if !*extNet {
-		t.Skip("skipping external network test")
-	}
-	req, _ := http.NewRequest("GET", "https://"+*transportHost+"/", nil)
-	rt := &Transport{TLSClientConfig: tlsConfigInsecure}
-	res, err := rt.RoundTrip(req)
-	if err != nil {
-		t.Fatalf("%v", err)
-	}
-	res.Write(os.Stdout)
-}
-
-type fakeTLSConn struct {
-	net.Conn
-}
-
-func (c *fakeTLSConn) ConnectionState() tls.ConnectionState {
-	return tls.ConnectionState{
-		Version: tls.VersionTLS12,
-	}
-}
-
-func startH2cServer(t *testing.T) net.Listener {
-	h2Server := &Server{}
-	l := newLocalListener(t)
-	go func() {
-		conn, err := l.Accept()
-		if err != nil {
-			t.Error(err)
-			return
-		}
-		h2Server.ServeConn(&fakeTLSConn{conn}, &ServeConnOpts{Handler: http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			fmt.Fprintf(w, "Hello, %v, http: %v", r.URL.Path, r.TLS == nil)
-		})})
-	}()
-	return l
-}
-
-func TestTransportH2c(t *testing.T) {
-	l := startH2cServer(t)
-	defer l.Close()
-	req, err := http.NewRequest("GET", "http://"+l.Addr().String()+"/foobar", nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	tr := &Transport{
-		AllowHTTP: true,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			return net.Dial(network, addr)
-		},
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if res.ProtoMajor != 2 {
-		t.Fatal("proto not h2c")
-	}
-	body, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got, want := string(body), "Hello, /foobar, http: true"; got != want {
-		t.Fatalf("response got %v, want %v", got, want)
-	}
-}
-
-func TestTransport(t *testing.T) {
-	const body = "sup"
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, body)
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	t.Logf("Got res: %+v", res)
-	if g, w := res.StatusCode, 200; g != w {
-		t.Errorf("StatusCode = %v; want %v", g, w)
-	}
-	if g, w := res.Status, "200 OK"; g != w {
-		t.Errorf("Status = %q; want %q", g, w)
-	}
-	wantHeader := http.Header{
-		"Content-Length": []string{"3"},
-		"Content-Type":   []string{"text/plain; charset=utf-8"},
-		"Date":           []string{"XXX"}, // see cleanDate
-	}
-	cleanDate(res)
-	if !reflect.DeepEqual(res.Header, wantHeader) {
-		t.Errorf("res Header = %v; want %v", res.Header, wantHeader)
-	}
-	if res.Request != req {
-		t.Errorf("Response.Request = %p; want %p", res.Request, req)
-	}
-	if res.TLS == nil {
-		t.Error("Response.TLS = nil; want non-nil")
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Errorf("Body read: %v", err)
-	} else if string(slurp) != body {
-		t.Errorf("Body = %q; want %q", slurp, body)
-	}
-}
-
-func onSameConn(t *testing.T, modReq func(*http.Request)) bool {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.RemoteAddr)
-	}, optOnlyServer, func(c net.Conn, st http.ConnState) {
-		t.Logf("conn %v is now state %v", c.RemoteAddr(), st)
-	})
-	defer st.Close()
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	get := func() string {
-		req, err := http.NewRequest("GET", st.ts.URL, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		modReq(req)
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer res.Body.Close()
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			t.Fatalf("Body read: %v", err)
-		}
-		addr := strings.TrimSpace(string(slurp))
-		if addr == "" {
-			t.Fatalf("didn't get an addr in response")
-		}
-		return addr
-	}
-	first := get()
-	second := get()
-	return first == second
-}
-
-func TestTransportReusesConns(t *testing.T) {
-	if !onSameConn(t, func(*http.Request) {}) {
-		t.Errorf("first and second responses were on different connections")
-	}
-}
-
-func TestTransportReusesConn_RequestClose(t *testing.T) {
-	if onSameConn(t, func(r *http.Request) { r.Close = true }) {
-		t.Errorf("first and second responses were not on different connections")
-	}
-}
-
-func TestTransportReusesConn_ConnClose(t *testing.T) {
-	if onSameConn(t, func(r *http.Request) { r.Header.Set("Connection", "close") }) {
-		t.Errorf("first and second responses were not on different connections")
-	}
-}
-
-// Tests that the Transport only keeps one pending dial open per destination address.
-// https://golang.org/issue/13397
-func TestTransportGroupsPendingDials(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.RemoteAddr)
-	}, optOnlyServer)
-	defer st.Close()
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-	}
-	defer tr.CloseIdleConnections()
-	var (
-		mu    sync.Mutex
-		dials = map[string]int{}
-	)
-	var wg sync.WaitGroup
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			req, err := http.NewRequest("GET", st.ts.URL, nil)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			res, err := tr.RoundTrip(req)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			defer res.Body.Close()
-			slurp, err := ioutil.ReadAll(res.Body)
-			if err != nil {
-				t.Errorf("Body read: %v", err)
-			}
-			addr := strings.TrimSpace(string(slurp))
-			if addr == "" {
-				t.Errorf("didn't get an addr in response")
-			}
-			mu.Lock()
-			dials[addr]++
-			mu.Unlock()
-		}()
-	}
-	wg.Wait()
-	if len(dials) != 1 {
-		t.Errorf("saw %d dials; want 1: %v", len(dials), dials)
-	}
-	tr.CloseIdleConnections()
-	if err := retry(50, 10*time.Millisecond, func() error {
-		cp, ok := tr.connPool().(*clientConnPool)
-		if !ok {
-			return fmt.Errorf("Conn pool is %T; want *clientConnPool", tr.connPool())
-		}
-		cp.mu.Lock()
-		defer cp.mu.Unlock()
-		if len(cp.dialing) != 0 {
-			return fmt.Errorf("dialing map = %v; want empty", cp.dialing)
-		}
-		if len(cp.conns) != 0 {
-			return fmt.Errorf("conns = %v; want empty", cp.conns)
-		}
-		if len(cp.keys) != 0 {
-			return fmt.Errorf("keys = %v; want empty", cp.keys)
-		}
-		return nil
-	}); err != nil {
-		t.Errorf("State of pool after CloseIdleConnections: %v", err)
-	}
-}
-
-func retry(tries int, delay time.Duration, fn func() error) error {
-	var err error
-	for i := 0; i < tries; i++ {
-		err = fn()
-		if err == nil {
-			return nil
-		}
-		time.Sleep(delay)
-	}
-	return err
-}
-
-func TestTransportAbortClosesPipes(t *testing.T) {
-	shutdown := make(chan struct{})
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			w.(http.Flusher).Flush()
-			<-shutdown
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-	defer close(shutdown) // we must shutdown before st.Close() to avoid hanging
-
-	done := make(chan struct{})
-	requestMade := make(chan struct{})
-	go func() {
-		defer close(done)
-		tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-		req, err := http.NewRequest("GET", st.ts.URL, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer res.Body.Close()
-		close(requestMade)
-		_, err = ioutil.ReadAll(res.Body)
-		if err == nil {
-			t.Error("expected error from res.Body.Read")
-		}
-	}()
-
-	<-requestMade
-	// Now force the serve loop to end, via closing the connection.
-	st.closeConn()
-	// deadlock? that's a bug.
-	select {
-	case <-done:
-	case <-time.After(3 * time.Second):
-		t.Fatal("timeout")
-	}
-}
-
-// TODO: merge this with TestTransportBody to make TestTransportRequest? This
-// could be a table-driven test with extra goodies.
-func TestTransportPath(t *testing.T) {
-	gotc := make(chan *url.URL, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			gotc <- r.URL
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	const (
-		path  = "/testpath"
-		query = "q=1"
-	)
-	surl := st.ts.URL + path + "?" + query
-	req, err := http.NewRequest("POST", surl, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	c := &http.Client{Transport: tr}
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	got := <-gotc
-	if got.Path != path {
-		t.Errorf("Read Path = %q; want %q", got.Path, path)
-	}
-	if got.RawQuery != query {
-		t.Errorf("Read RawQuery = %q; want %q", got.RawQuery, query)
-	}
-}
-
-func randString(n int) string {
-	rnd := rand.New(rand.NewSource(int64(n)))
-	b := make([]byte, n)
-	for i := range b {
-		b[i] = byte(rnd.Intn(256))
-	}
-	return string(b)
-}
-
-type panicReader struct{}
-
-func (panicReader) Read([]byte) (int, error) { panic("unexpected Read") }
-func (panicReader) Close() error             { panic("unexpected Close") }
-
-func TestActualContentLength(t *testing.T) {
-	tests := []struct {
-		req  *http.Request
-		want int64
-	}{
-		// Verify we don't read from Body:
-		0: {
-			req:  &http.Request{Body: panicReader{}},
-			want: -1,
-		},
-		// nil Body means 0, regardless of ContentLength:
-		1: {
-			req:  &http.Request{Body: nil, ContentLength: 5},
-			want: 0,
-		},
-		// ContentLength is used if set.
-		2: {
-			req:  &http.Request{Body: panicReader{}, ContentLength: 5},
-			want: 5,
-		},
-	}
-	for i, tt := range tests {
-		got := actualContentLength(tt.req)
-		if got != tt.want {
-			t.Errorf("test[%d]: got %d; want %d", i, got, tt.want)
-		}
-	}
-}
-
-func TestTransportBody(t *testing.T) {
-	bodyTests := []struct {
-		body         string
-		noContentLen bool
-	}{
-		{body: "some message"},
-		{body: "some message", noContentLen: true},
-		{body: strings.Repeat("a", 1<<20), noContentLen: true},
-		{body: strings.Repeat("a", 1<<20)},
-		{body: randString(16<<10 - 1)},
-		{body: randString(16 << 10)},
-		{body: randString(16<<10 + 1)},
-		{body: randString(512<<10 - 1)},
-		{body: randString(512 << 10)},
-		{body: randString(512<<10 + 1)},
-		{body: randString(1<<20 - 1)},
-		{body: randString(1 << 20)},
-		{body: randString(1<<20 + 2)},
-	}
-
-	type reqInfo struct {
-		req   *http.Request
-		slurp []byte
-		err   error
-	}
-	gotc := make(chan reqInfo, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			slurp, err := ioutil.ReadAll(r.Body)
-			if err != nil {
-				gotc <- reqInfo{err: err}
-			} else {
-				gotc <- reqInfo{req: r, slurp: slurp}
-			}
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	for i, tt := range bodyTests {
-		tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-		defer tr.CloseIdleConnections()
-
-		var body io.Reader = strings.NewReader(tt.body)
-		if tt.noContentLen {
-			body = struct{ io.Reader }{body} // just a Reader, hiding concrete type and other methods
-		}
-		req, err := http.NewRequest("POST", st.ts.URL, body)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		c := &http.Client{Transport: tr}
-		res, err := c.Do(req)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		defer res.Body.Close()
-		ri := <-gotc
-		if ri.err != nil {
-			t.Errorf("#%d: read error: %v", i, ri.err)
-			continue
-		}
-		if got := string(ri.slurp); got != tt.body {
-			t.Errorf("#%d: Read body mismatch.\n got: %q (len %d)\nwant: %q (len %d)", i, shortString(got), len(got), shortString(tt.body), len(tt.body))
-		}
-		wantLen := int64(len(tt.body))
-		if tt.noContentLen && tt.body != "" {
-			wantLen = -1
-		}
-		if ri.req.ContentLength != wantLen {
-			t.Errorf("#%d. handler got ContentLength = %v; want %v", i, ri.req.ContentLength, wantLen)
-		}
-	}
-}
-
-func shortString(v string) string {
-	const maxLen = 100
-	if len(v) <= maxLen {
-		return v
-	}
-	return fmt.Sprintf("%v[...%d bytes omitted...]%v", v[:maxLen/2], len(v)-maxLen, v[len(v)-maxLen/2:])
-}
-
-func TestTransportDialTLS(t *testing.T) {
-	var mu sync.Mutex // guards following
-	var gotReq, didDial bool
-
-	ts := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			mu.Lock()
-			gotReq = true
-			mu.Unlock()
-		},
-		optOnlyServer,
-	)
-	defer ts.Close()
-	tr := &Transport{
-		DialTLS: func(netw, addr string, cfg *tls.Config) (net.Conn, error) {
-			mu.Lock()
-			didDial = true
-			mu.Unlock()
-			cfg.InsecureSkipVerify = true
-			c, err := tls.Dial(netw, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			return c, c.Handshake()
-		},
-	}
-	defer tr.CloseIdleConnections()
-	client := &http.Client{Transport: tr}
-	res, err := client.Get(ts.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res.Body.Close()
-	mu.Lock()
-	if !gotReq {
-		t.Error("didn't get request")
-	}
-	if !didDial {
-		t.Error("didn't use dial hook")
-	}
-}
-
-func TestConfigureTransport(t *testing.T) {
-	t1 := &http.Transport{}
-	err := ConfigureTransport(t1)
-	if err == errTransportVersion {
-		t.Skip(err)
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got := fmt.Sprintf("%#v", t1); !strings.Contains(got, `"h2"`) {
-		// Laziness, to avoid buildtags.
-		t.Errorf("stringification of HTTP/1 transport didn't contain \"h2\": %v", got)
-	}
-	wantNextProtos := []string{"h2", "http/1.1"}
-	if t1.TLSClientConfig == nil {
-		t.Errorf("nil t1.TLSClientConfig")
-	} else if !reflect.DeepEqual(t1.TLSClientConfig.NextProtos, wantNextProtos) {
-		t.Errorf("TLSClientConfig.NextProtos = %q; want %q", t1.TLSClientConfig.NextProtos, wantNextProtos)
-	}
-	if err := ConfigureTransport(t1); err == nil {
-		t.Error("unexpected success on second call to ConfigureTransport")
-	}
-
-	// And does it work?
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		io.WriteString(w, r.Proto)
-	}, optOnlyServer)
-	defer st.Close()
-
-	t1.TLSClientConfig.InsecureSkipVerify = true
-	c := &http.Client{Transport: t1}
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got, want := string(slurp), "HTTP/2.0"; got != want {
-		t.Errorf("body = %q; want %q", got, want)
-	}
-}
-
-type capitalizeReader struct {
-	r io.Reader
-}
-
-func (cr capitalizeReader) Read(p []byte) (n int, err error) {
-	n, err = cr.r.Read(p)
-	for i, b := range p[:n] {
-		if b >= 'a' && b <= 'z' {
-			p[i] = b - ('a' - 'A')
-		}
-	}
-	return
-}
-
-type flushWriter struct {
-	w io.Writer
-}
-
-func (fw flushWriter) Write(p []byte) (n int, err error) {
-	n, err = fw.w.Write(p)
-	if f, ok := fw.w.(http.Flusher); ok {
-		f.Flush()
-	}
-	return
-}
-
-type clientTester struct {
-	t      *testing.T
-	tr     *Transport
-	sc, cc net.Conn // server and client conn
-	fr     *Framer  // server's framer
-	client func() error
-	server func() error
-}
-
-func newClientTester(t *testing.T) *clientTester {
-	var dialOnce struct {
-		sync.Mutex
-		dialed bool
-	}
-	ct := &clientTester{
-		t: t,
-	}
-	ct.tr = &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			dialOnce.Lock()
-			defer dialOnce.Unlock()
-			if dialOnce.dialed {
-				return nil, errors.New("only one dial allowed in test mode")
-			}
-			dialOnce.dialed = true
-			return ct.cc, nil
-		},
-	}
-
-	ln := newLocalListener(t)
-	cc, err := net.Dial("tcp", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-
-	}
-	sc, err := ln.Accept()
-	if err != nil {
-		t.Fatal(err)
-	}
-	ln.Close()
-	ct.cc = cc
-	ct.sc = sc
-	ct.fr = NewFramer(sc, sc)
-	return ct
-}
-
-func newLocalListener(t *testing.T) net.Listener {
-	ln, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err == nil {
-		return ln
-	}
-	ln, err = net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	return ln
-}
-
-func (ct *clientTester) greet() {
-	buf := make([]byte, len(ClientPreface))
-	_, err := io.ReadFull(ct.sc, buf)
-	if err != nil {
-		ct.t.Fatalf("reading client preface: %v", err)
-	}
-	f, err := ct.fr.ReadFrame()
-	if err != nil {
-		ct.t.Fatalf("Reading client settings frame: %v", err)
-	}
-	if sf, ok := f.(*SettingsFrame); !ok {
-		ct.t.Fatalf("Wanted client settings frame; got %v", f)
-		_ = sf // stash it away?
-	}
-	if err := ct.fr.WriteSettings(); err != nil {
-		ct.t.Fatal(err)
-	}
-	if err := ct.fr.WriteSettingsAck(); err != nil {
-		ct.t.Fatal(err)
-	}
-}
-
-func (ct *clientTester) readNonSettingsFrame() (Frame, error) {
-	for {
-		f, err := ct.fr.ReadFrame()
-		if err != nil {
-			return nil, err
-		}
-		if _, ok := f.(*SettingsFrame); ok {
-			continue
-		}
-		return f, nil
-	}
-}
-
-func (ct *clientTester) cleanup() {
-	ct.tr.CloseIdleConnections()
-}
-
-func (ct *clientTester) run() {
-	errc := make(chan error, 2)
-	ct.start("client", errc, ct.client)
-	ct.start("server", errc, ct.server)
-	defer ct.cleanup()
-	for i := 0; i < 2; i++ {
-		if err := <-errc; err != nil {
-			ct.t.Error(err)
-			return
-		}
-	}
-}
-
-func (ct *clientTester) start(which string, errc chan<- error, fn func() error) {
-	go func() {
-		finished := false
-		var err error
-		defer func() {
-			if !finished {
-				err = fmt.Errorf("%s goroutine didn't finish.", which)
-			} else if err != nil {
-				err = fmt.Errorf("%s: %v", which, err)
-			}
-			errc <- err
-		}()
-		err = fn()
-		finished = true
-	}()
-}
-
-func (ct *clientTester) readFrame() (Frame, error) {
-	return readFrameTimeout(ct.fr, 2*time.Second)
-}
-
-func (ct *clientTester) firstHeaders() (*HeadersFrame, error) {
-	for {
-		f, err := ct.readFrame()
-		if err != nil {
-			return nil, fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-		}
-		switch f.(type) {
-		case *WindowUpdateFrame, *SettingsFrame:
-			continue
-		}
-		hf, ok := f.(*HeadersFrame)
-		if !ok {
-			return nil, fmt.Errorf("Got %T; want HeadersFrame", f)
-		}
-		return hf, nil
-	}
-}
-
-type countingReader struct {
-	n *int64
-}
-
-func (r countingReader) Read(p []byte) (n int, err error) {
-	for i := range p {
-		p[i] = byte(i)
-	}
-	atomic.AddInt64(r.n, int64(len(p)))
-	return len(p), err
-}
-
-func TestTransportReqBodyAfterResponse_200(t *testing.T) { testTransportReqBodyAfterResponse(t, 200) }
-func TestTransportReqBodyAfterResponse_403(t *testing.T) { testTransportReqBodyAfterResponse(t, 403) }
-
-func testTransportReqBodyAfterResponse(t *testing.T, status int) {
-	const bodySize = 10 << 20
-	clientDone := make(chan struct{})
-	ct := newClientTester(t)
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-
-		var n int64 // atomic
-		req, err := http.NewRequest("PUT", "https://dummy.tld/", io.LimitReader(countingReader{&n}, bodySize))
-		if err != nil {
-			return err
-		}
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != status {
-			return fmt.Errorf("status code = %v; want %v", res.StatusCode, status)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("Slurp: %v", err)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("unexpected body: %q", slurp)
-		}
-		if status == 200 {
-			if got := atomic.LoadInt64(&n); got != bodySize {
-				return fmt.Errorf("For 200 response, Transport wrote %d bytes; want %d", got, bodySize)
-			}
-		} else {
-			if got := atomic.LoadInt64(&n); got == 0 || got >= bodySize {
-				return fmt.Errorf("For %d response, Transport wrote %d bytes; want (0,%d) exclusive", status, got, bodySize)
-			}
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		var dataRecv int64
-		var closed bool
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					// If the client's done, it
-					// will have reported any
-					// errors on its side.
-					return nil
-				default:
-					return err
-				}
-			}
-			//println(fmt.Sprintf("server got frame: %v", f))
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *HeadersFrame:
-				if !f.HeadersEnded() {
-					return fmt.Errorf("headers should have END_HEADERS be ended: %v", f)
-				}
-				if f.StreamEnded() {
-					return fmt.Errorf("headers contains END_STREAM unexpectedly: %v", f)
-				}
-			case *DataFrame:
-				dataLen := len(f.Data())
-				if dataLen > 0 {
-					if dataRecv == 0 {
-						enc.WriteField(hpack.HeaderField{Name: ":status", Value: strconv.Itoa(status)})
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    true,
-							EndStream:     false,
-							BlockFragment: buf.Bytes(),
-						})
-					}
-					if err := ct.fr.WriteWindowUpdate(0, uint32(dataLen)); err != nil {
-						return err
-					}
-					if err := ct.fr.WriteWindowUpdate(f.StreamID, uint32(dataLen)); err != nil {
-						return err
-					}
-				}
-				dataRecv += int64(dataLen)
-
-				if !closed && ((status != 200 && dataRecv > 0) ||
-					(status == 200 && dataRecv == bodySize)) {
-					closed = true
-					if err := ct.fr.WriteData(f.StreamID, true, nil); err != nil {
-						return err
-					}
-				}
-			default:
-				return fmt.Errorf("Unexpected client frame %v", f)
-			}
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/13444
-func TestTransportFullDuplex(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		w.WriteHeader(200) // redundant but for clarity
-		w.(http.Flusher).Flush()
-		io.Copy(flushWriter{w}, capitalizeReader{r.Body})
-		fmt.Fprintf(w, "bye.\n")
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	pr, pw := io.Pipe()
-	req, err := http.NewRequest("PUT", st.ts.URL, ioutil.NopCloser(pr))
-	if err != nil {
-		t.Fatal(err)
-	}
-	req.ContentLength = -1
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	if res.StatusCode != 200 {
-		t.Fatalf("StatusCode = %v; want %v", res.StatusCode, 200)
-	}
-	bs := bufio.NewScanner(res.Body)
-	want := func(v string) {
-		if !bs.Scan() {
-			t.Fatalf("wanted to read %q but Scan() = false, err = %v", v, bs.Err())
-		}
-	}
-	write := func(v string) {
-		_, err := io.WriteString(pw, v)
-		if err != nil {
-			t.Fatalf("pipe write: %v", err)
-		}
-	}
-	write("foo\n")
-	want("FOO")
-	write("bar\n")
-	want("BAR")
-	pw.Close()
-	want("bye.")
-	if err := bs.Err(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestTransportConnectRequest(t *testing.T) {
-	gotc := make(chan *http.Request, 1)
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		gotc <- r
-	}, optOnlyServer)
-	defer st.Close()
-
-	u, err := url.Parse(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	tests := []struct {
-		req  *http.Request
-		want string
-	}{
-		{
-			req: &http.Request{
-				Method: "CONNECT",
-				Header: http.Header{},
-				URL:    u,
-			},
-			want: u.Host,
-		},
-		{
-			req: &http.Request{
-				Method: "CONNECT",
-				Header: http.Header{},
-				URL:    u,
-				Host:   "example.com:123",
-			},
-			want: "example.com:123",
-		},
-	}
-
-	for i, tt := range tests {
-		res, err := c.Do(tt.req)
-		if err != nil {
-			t.Errorf("%d. RoundTrip = %v", i, err)
-			continue
-		}
-		res.Body.Close()
-		req := <-gotc
-		if req.Method != "CONNECT" {
-			t.Errorf("method = %q; want CONNECT", req.Method)
-		}
-		if req.Host != tt.want {
-			t.Errorf("Host = %q; want %q", req.Host, tt.want)
-		}
-		if req.URL.Host != tt.want {
-			t.Errorf("URL.Host = %q; want %q", req.URL.Host, tt.want)
-		}
-	}
-}
-
-type headerType int
-
-const (
-	noHeader headerType = iota // omitted
-	oneHeader
-	splitHeader // broken into continuation on purpose
-)
-
-const (
-	f0 = noHeader
-	f1 = oneHeader
-	f2 = splitHeader
-	d0 = false
-	d1 = true
-)
-
-// Test all 36 combinations of response frame orders:
-//    (3 ways of 100-continue) * (2 ways of headers) * (2 ways of data) * (3 ways of trailers):func TestTransportResponsePattern_00f0(t *testing.T) { testTransportResponsePattern(h0, h1, false, h0) }
-// Generated by http://play.golang.org/p/SScqYKJYXd
-func TestTransportResPattern_c0h1d0t0(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f0) }
-func TestTransportResPattern_c0h1d0t1(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f1) }
-func TestTransportResPattern_c0h1d0t2(t *testing.T) { testTransportResPattern(t, f0, f1, d0, f2) }
-func TestTransportResPattern_c0h1d1t0(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f0) }
-func TestTransportResPattern_c0h1d1t1(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f1) }
-func TestTransportResPattern_c0h1d1t2(t *testing.T) { testTransportResPattern(t, f0, f1, d1, f2) }
-func TestTransportResPattern_c0h2d0t0(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f0) }
-func TestTransportResPattern_c0h2d0t1(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f1) }
-func TestTransportResPattern_c0h2d0t2(t *testing.T) { testTransportResPattern(t, f0, f2, d0, f2) }
-func TestTransportResPattern_c0h2d1t0(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f0) }
-func TestTransportResPattern_c0h2d1t1(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f1) }
-func TestTransportResPattern_c0h2d1t2(t *testing.T) { testTransportResPattern(t, f0, f2, d1, f2) }
-func TestTransportResPattern_c1h1d0t0(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f0) }
-func TestTransportResPattern_c1h1d0t1(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f1) }
-func TestTransportResPattern_c1h1d0t2(t *testing.T) { testTransportResPattern(t, f1, f1, d0, f2) }
-func TestTransportResPattern_c1h1d1t0(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f0) }
-func TestTransportResPattern_c1h1d1t1(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f1) }
-func TestTransportResPattern_c1h1d1t2(t *testing.T) { testTransportResPattern(t, f1, f1, d1, f2) }
-func TestTransportResPattern_c1h2d0t0(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f0) }
-func TestTransportResPattern_c1h2d0t1(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f1) }
-func TestTransportResPattern_c1h2d0t2(t *testing.T) { testTransportResPattern(t, f1, f2, d0, f2) }
-func TestTransportResPattern_c1h2d1t0(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f0) }
-func TestTransportResPattern_c1h2d1t1(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f1) }
-func TestTransportResPattern_c1h2d1t2(t *testing.T) { testTransportResPattern(t, f1, f2, d1, f2) }
-func TestTransportResPattern_c2h1d0t0(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f0) }
-func TestTransportResPattern_c2h1d0t1(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f1) }
-func TestTransportResPattern_c2h1d0t2(t *testing.T) { testTransportResPattern(t, f2, f1, d0, f2) }
-func TestTransportResPattern_c2h1d1t0(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f0) }
-func TestTransportResPattern_c2h1d1t1(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f1) }
-func TestTransportResPattern_c2h1d1t2(t *testing.T) { testTransportResPattern(t, f2, f1, d1, f2) }
-func TestTransportResPattern_c2h2d0t0(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f0) }
-func TestTransportResPattern_c2h2d0t1(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f1) }
-func TestTransportResPattern_c2h2d0t2(t *testing.T) { testTransportResPattern(t, f2, f2, d0, f2) }
-func TestTransportResPattern_c2h2d1t0(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f0) }
-func TestTransportResPattern_c2h2d1t1(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f1) }
-func TestTransportResPattern_c2h2d1t2(t *testing.T) { testTransportResPattern(t, f2, f2, d1, f2) }
-
-func testTransportResPattern(t *testing.T, expect100Continue, resHeader headerType, withData bool, trailers headerType) {
-	const reqBody = "some request body"
-	const resBody = "some response body"
-
-	if resHeader == noHeader {
-		// TODO: test 100-continue followed by immediate
-		// server stream reset, without headers in the middle?
-		panic("invalid combination")
-	}
-
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("POST", "https://dummy.tld/", strings.NewReader(reqBody))
-		if expect100Continue != noHeader {
-			req.Header.Set("Expect", "100-continue")
-		}
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("Slurp: %v", err)
-		}
-		wantBody := resBody
-		if !withData {
-			wantBody = ""
-		}
-		if string(slurp) != wantBody {
-			return fmt.Errorf("body = %q; want %q", slurp, wantBody)
-		}
-		if trailers == noHeader {
-			if len(res.Trailer) > 0 {
-				t.Errorf("Trailer = %v; want none", res.Trailer)
-			}
-		} else {
-			want := http.Header{"Some-Trailer": {"some-value"}}
-			if !reflect.DeepEqual(res.Trailer, want) {
-				t.Errorf("Trailer = %v; want %v", res.Trailer, want)
-			}
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			endStream := false
-			send := func(mode headerType) {
-				hbf := buf.Bytes()
-				switch mode {
-				case oneHeader:
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.Header().StreamID,
-						EndHeaders:    true,
-						EndStream:     endStream,
-						BlockFragment: hbf,
-					})
-				case splitHeader:
-					if len(hbf) < 2 {
-						panic("too small")
-					}
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.Header().StreamID,
-						EndHeaders:    false,
-						EndStream:     endStream,
-						BlockFragment: hbf[:1],
-					})
-					ct.fr.WriteContinuation(f.Header().StreamID, true, hbf[1:])
-				default:
-					panic("bogus mode")
-				}
-			}
-			switch f := f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-			case *DataFrame:
-				if !f.StreamEnded() {
-					// No need to send flow control tokens. The test request body is tiny.
-					continue
-				}
-				// Response headers (1+ frames; 1 or 2 in this test, but never 0)
-				{
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					enc.WriteField(hpack.HeaderField{Name: "x-foo", Value: "blah"})
-					enc.WriteField(hpack.HeaderField{Name: "x-bar", Value: "more"})
-					if trailers != noHeader {
-						enc.WriteField(hpack.HeaderField{Name: "trailer", Value: "some-trailer"})
-					}
-					endStream = withData == false && trailers == noHeader
-					send(resHeader)
-				}
-				if withData {
-					endStream = trailers == noHeader
-					ct.fr.WriteData(f.StreamID, endStream, []byte(resBody))
-				}
-				if trailers != noHeader {
-					endStream = true
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: "some-trailer", Value: "some-value"})
-					send(trailers)
-				}
-				if endStream {
-					return nil
-				}
-			case *HeadersFrame:
-				if expect100Continue != noHeader {
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "100"})
-					send(expect100Continue)
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportReceiveUndeclaredTrailer(t *testing.T) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("res.Body ReadAll error = %q, %v; want %v", slurp, err, nil)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("body = %q; want nothing", slurp)
-		}
-		if _, ok := res.Trailer["Some-Trailer"]; !ok {
-			return fmt.Errorf("expected Some-Trailer")
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var n int
-		var hf *HeadersFrame
-		for hf == nil && n < 10 {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			hf, _ = f.(*HeadersFrame)
-			n++
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		// send headers without Trailer header
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-
-		// send trailers
-		buf.Reset()
-		enc.WriteField(hpack.HeaderField{Name: "some-trailer", Value: "I'm an undeclared Trailer!"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     true,
-			BlockFragment: buf.Bytes(),
-		})
-		return nil
-	}
-	ct.run()
-}
-
-func TestTransportInvalidTrailer_Pseudo1(t *testing.T) {
-	testTransportInvalidTrailer_Pseudo(t, oneHeader)
-}
-func TestTransportInvalidTrailer_Pseudo2(t *testing.T) {
-	testTransportInvalidTrailer_Pseudo(t, splitHeader)
-}
-func testTransportInvalidTrailer_Pseudo(t *testing.T, trailers headerType) {
-	testInvalidTrailer(t, trailers, pseudoHeaderError(":colon"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: ":colon", Value: "foo"})
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-	})
-}
-
-func TestTransportInvalidTrailer_Capital1(t *testing.T) {
-	testTransportInvalidTrailer_Capital(t, oneHeader)
-}
-func TestTransportInvalidTrailer_Capital2(t *testing.T) {
-	testTransportInvalidTrailer_Capital(t, splitHeader)
-}
-func testTransportInvalidTrailer_Capital(t *testing.T, trailers headerType) {
-	testInvalidTrailer(t, trailers, headerFieldNameError("Capital"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-		enc.WriteField(hpack.HeaderField{Name: "Capital", Value: "bad"})
-	})
-}
-func TestTransportInvalidTrailer_EmptyFieldName(t *testing.T) {
-	testInvalidTrailer(t, oneHeader, headerFieldNameError(""), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "", Value: "bad"})
-	})
-}
-func TestTransportInvalidTrailer_BinaryFieldValue(t *testing.T) {
-	testInvalidTrailer(t, oneHeader, headerFieldValueError("has\nnewline"), func(enc *hpack.Encoder) {
-		enc.WriteField(hpack.HeaderField{Name: "x", Value: "has\nnewline"})
-	})
-}
-
-func testInvalidTrailer(t *testing.T, trailers headerType, wantErr error, writeTrailer func(*hpack.Encoder)) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return fmt.Errorf("RoundTrip: %v", err)
-		}
-		defer res.Body.Close()
-		if res.StatusCode != 200 {
-			return fmt.Errorf("status code = %v; want 200", res.StatusCode)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		se, ok := err.(StreamError)
-		if !ok || se.Cause != wantErr {
-			return fmt.Errorf("res.Body ReadAll error = %q, %#v; want StreamError with cause %T, %#v", slurp, err, wantErr, wantErr)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("body = %q; want nothing", slurp)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *HeadersFrame:
-				var endStream bool
-				send := func(mode headerType) {
-					hbf := buf.Bytes()
-					switch mode {
-					case oneHeader:
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    true,
-							EndStream:     endStream,
-							BlockFragment: hbf,
-						})
-					case splitHeader:
-						if len(hbf) < 2 {
-							panic("too small")
-						}
-						ct.fr.WriteHeaders(HeadersFrameParam{
-							StreamID:      f.StreamID,
-							EndHeaders:    false,
-							EndStream:     endStream,
-							BlockFragment: hbf[:1],
-						})
-						ct.fr.WriteContinuation(f.StreamID, true, hbf[1:])
-					default:
-						panic("bogus mode")
-					}
-				}
-				// Response headers (1+ frames; 1 or 2 in this test, but never 0)
-				{
-					buf.Reset()
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					enc.WriteField(hpack.HeaderField{Name: "trailer", Value: "declared"})
-					endStream = false
-					send(oneHeader)
-				}
-				// Trailers:
-				{
-					endStream = true
-					buf.Reset()
-					writeTrailer(enc)
-					send(trailers)
-				}
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportChecksResponseHeaderListSize(t *testing.T) {
-	ct := newClientTester(t)
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != errResponseHeaderListSize {
-			if res != nil {
-				res.Body.Close()
-			}
-			size := int64(0)
-			for k, vv := range res.Header {
-				for _, v := range vv {
-					size += int64(len(k)) + int64(len(v)) + 32
-				}
-			}
-			return fmt.Errorf("RoundTrip Error = %v (and %d bytes of response headers); want errResponseHeaderListSize", err, size)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return err
-			}
-			switch f := f.(type) {
-			case *HeadersFrame:
-				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-				large := strings.Repeat("a", 1<<10)
-				for i := 0; i < 5042; i++ {
-					enc.WriteField(hpack.HeaderField{Name: large, Value: large})
-				}
-				if size, want := buf.Len(), 6329; size != want {
-					// Note: this number might change if
-					// our hpack implementation
-					// changes. That's fine. This is
-					// just a sanity check that our
-					// response can fit in a single
-					// header block fragment frame.
-					return fmt.Errorf("encoding over 10MB of duplicate keypairs took %d bytes; expected %d", size, want)
-				}
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      f.StreamID,
-					EndHeaders:    true,
-					EndStream:     true,
-					BlockFragment: buf.Bytes(),
-				})
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-// Test that the the Transport returns a typed error from Response.Body.Read calls
-// when the server sends an error. (here we use a panic, since that should generate
-// a stream error, but others like cancel should be similar)
-func TestTransportBodyReadErrorType(t *testing.T) {
-	doPanic := make(chan bool, 1)
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			w.(http.Flusher).Flush() // force headers out
-			<-doPanic
-			panic("boom")
-		},
-		optOnlyServer,
-		optQuiet,
-	)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-	doPanic <- true
-	buf := make([]byte, 100)
-	n, err := res.Body.Read(buf)
-	want := StreamError{StreamID: 0x1, Code: 0x2}
-	if !reflect.DeepEqual(want, err) {
-		t.Errorf("Read = %v, %#v; want error %#v", n, err, want)
-	}
-}
-
-// golang.org/issue/13924
-// This used to fail after many iterations, especially with -race:
-// go test -v -run=TestTransportDoubleCloseOnWriteError -count=500 -race
-func TestTransportDoubleCloseOnWriteError(t *testing.T) {
-	var (
-		mu   sync.Mutex
-		conn net.Conn // to close if set
-	)
-
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			mu.Lock()
-			defer mu.Unlock()
-			if conn != nil {
-				conn.Close()
-			}
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			mu.Lock()
-			defer mu.Unlock()
-			conn = tc
-			return tc, nil
-		},
-	}
-	defer tr.CloseIdleConnections()
-	c := &http.Client{Transport: tr}
-	c.Get(st.ts.URL)
-}
-
-// Test that the http1 Transport.DisableKeepAlives option is respected
-// and connections are closed as soon as idle.
-// See golang.org/issue/14008
-func TestTransportDisableKeepAlives(t *testing.T) {
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			io.WriteString(w, "hi")
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	connClosed := make(chan struct{}) // closed on tls.Conn.Close
-	tr := &Transport{
-		t1: &http.Transport{
-			DisableKeepAlives: true,
-		},
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			return &noteCloseConn{Conn: tc, closefn: func() { close(connClosed) }}, nil
-		},
-	}
-	c := &http.Client{Transport: tr}
-	res, err := c.Get(st.ts.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err := ioutil.ReadAll(res.Body); err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-
-	select {
-	case <-connClosed:
-	case <-time.After(1 * time.Second):
-		t.Errorf("timeout")
-	}
-
-}
-
-// Test concurrent requests with Transport.DisableKeepAlives. We can share connections,
-// but when things are totally idle, it still needs to close.
-func TestTransportDisableKeepAlives_Concurrency(t *testing.T) {
-	const D = 25 * time.Millisecond
-	st := newServerTester(t,
-		func(w http.ResponseWriter, r *http.Request) {
-			time.Sleep(D)
-			io.WriteString(w, "hi")
-		},
-		optOnlyServer,
-	)
-	defer st.Close()
-
-	var dials int32
-	var conns sync.WaitGroup
-	tr := &Transport{
-		t1: &http.Transport{
-			DisableKeepAlives: true,
-		},
-		TLSClientConfig: tlsConfigInsecure,
-		DialTLS: func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-			tc, err := tls.Dial(network, addr, cfg)
-			if err != nil {
-				return nil, err
-			}
-			atomic.AddInt32(&dials, 1)
-			conns.Add(1)
-			return &noteCloseConn{Conn: tc, closefn: func() { conns.Done() }}, nil
-		},
-	}
-	c := &http.Client{Transport: tr}
-	var reqs sync.WaitGroup
-	const N = 20
-	for i := 0; i < N; i++ {
-		reqs.Add(1)
-		if i == N-1 {
-			// For the final request, try to make all the
-			// others close. This isn't verified in the
-			// count, other than the Log statement, since
-			// it's so timing dependent. This test is
-			// really to make sure we don't interrupt a
-			// valid request.
-			time.Sleep(D * 2)
-		}
-		go func() {
-			defer reqs.Done()
-			res, err := c.Get(st.ts.URL)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			if _, err := ioutil.ReadAll(res.Body); err != nil {
-				t.Error(err)
-				return
-			}
-			res.Body.Close()
-		}()
-	}
-	reqs.Wait()
-	conns.Wait()
-	t.Logf("did %d dials, %d requests", atomic.LoadInt32(&dials), N)
-}
-
-type noteCloseConn struct {
-	net.Conn
-	onceClose sync.Once
-	closefn   func()
-}
-
-func (c *noteCloseConn) Close() error {
-	c.onceClose.Do(c.closefn)
-	return c.Conn.Close()
-}
-
-func isTimeout(err error) bool {
-	switch err := err.(type) {
-	case nil:
-		return false
-	case *url.Error:
-		return isTimeout(err.Err)
-	case net.Error:
-		return err.Timeout()
-	}
-	return false
-}
-
-// Test that the http1 Transport.ResponseHeaderTimeout option and cancel is sent.
-func TestTransportResponseHeaderTimeout_NoBody(t *testing.T) {
-	testTransportResponseHeaderTimeout(t, false)
-}
-func TestTransportResponseHeaderTimeout_Body(t *testing.T) {
-	testTransportResponseHeaderTimeout(t, true)
-}
-
-func testTransportResponseHeaderTimeout(t *testing.T, body bool) {
-	ct := newClientTester(t)
-	ct.tr.t1 = &http.Transport{
-		ResponseHeaderTimeout: 5 * time.Millisecond,
-	}
-	ct.client = func() error {
-		c := &http.Client{Transport: ct.tr}
-		var err error
-		var n int64
-		const bodySize = 4 << 20
-		if body {
-			_, err = c.Post("https://dummy.tld/", "text/foo", io.LimitReader(countingReader{&n}, bodySize))
-		} else {
-			_, err = c.Get("https://dummy.tld/")
-		}
-		if !isTimeout(err) {
-			t.Errorf("client expected timeout error; got %#v", err)
-		}
-		if body && n != bodySize {
-			t.Errorf("only read %d bytes of body; want %d", n, bodySize)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			switch f := f.(type) {
-			case *DataFrame:
-				dataLen := len(f.Data())
-				if dataLen > 0 {
-					if err := ct.fr.WriteWindowUpdate(0, uint32(dataLen)); err != nil {
-						return err
-					}
-					if err := ct.fr.WriteWindowUpdate(f.StreamID, uint32(dataLen)); err != nil {
-						return err
-					}
-				}
-			case *RSTStreamFrame:
-				if f.StreamID == 1 && f.ErrCode == ErrCodeCancel {
-					return nil
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-func TestTransportDisableCompression(t *testing.T) {
-	const body = "sup"
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		want := http.Header{
-			"User-Agent": []string{"Go-http-client/2.0"},
-		}
-		if !reflect.DeepEqual(r.Header, want) {
-			t.Errorf("request headers = %v; want %v", r.Header, want)
-		}
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-		t1: &http.Transport{
-			DisableCompression: true,
-		},
-	}
-	defer tr.CloseIdleConnections()
-
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	res, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer res.Body.Close()
-}
-
-// RFC 7540 section 8.1.2.2
-func TestTransportRejectsConnHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		var got []string
-		for k := range r.Header {
-			got = append(got, k)
-		}
-		sort.Strings(got)
-		w.Header().Set("Got-Header", strings.Join(got, ","))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	tests := []struct {
-		key   string
-		value []string
-		want  string
-	}{
-		{
-			key:   "Upgrade",
-			value: []string{"anything"},
-			want:  "ERROR: http2: invalid Upgrade request header: [\"anything\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"foo"},
-			want:  "ERROR: http2: invalid Connection request header: [\"foo\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"close"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Connection",
-			value: []string{"close", "something-else"},
-			want:  "ERROR: http2: invalid Connection request header: [\"close\" \"something-else\"]",
-		},
-		{
-			key:   "Connection",
-			value: []string{"keep-alive"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Proxy-Connection", // just deleted and ignored
-			value: []string{"keep-alive"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{""},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"foo"},
-			want:  "ERROR: http2: invalid Transfer-Encoding request header: [\"foo\"]",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"chunked"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Transfer-Encoding",
-			value: []string{"chunked", "other"},
-			want:  "ERROR: http2: invalid Transfer-Encoding request header: [\"chunked\" \"other\"]",
-		},
-		{
-			key:   "Content-Length",
-			value: []string{"123"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-		{
-			key:   "Keep-Alive",
-			value: []string{"doop"},
-			want:  "Accept-Encoding,User-Agent",
-		},
-	}
-
-	for _, tt := range tests {
-		req, _ := http.NewRequest("GET", st.ts.URL, nil)
-		req.Header[tt.key] = tt.value
-		res, err := tr.RoundTrip(req)
-		var got string
-		if err != nil {
-			got = fmt.Sprintf("ERROR: %v", err)
-		} else {
-			got = res.Header.Get("Got-Header")
-			res.Body.Close()
-		}
-		if got != tt.want {
-			t.Errorf("For key %q, value %q, got = %q; want %q", tt.key, tt.value, got, tt.want)
-		}
-	}
-}
-
-// golang.org/issue/14048
-func TestTransportFailsOnInvalidHeaders(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		var got []string
-		for k := range r.Header {
-			got = append(got, k)
-		}
-		sort.Strings(got)
-		w.Header().Set("Got-Header", strings.Join(got, ","))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tests := [...]struct {
-		h       http.Header
-		wantErr string
-	}{
-		0: {
-			h:       http.Header{"with space": {"foo"}},
-			wantErr: `invalid HTTP header name "with space"`,
-		},
-		1: {
-			h:       http.Header{"name": {"Брэд"}},
-			wantErr: "", // okay
-		},
-		2: {
-			h:       http.Header{"имя": {"Brad"}},
-			wantErr: `invalid HTTP header name "имя"`,
-		},
-		3: {
-			h:       http.Header{"foo": {"foo\x01bar"}},
-			wantErr: `invalid HTTP header value "foo\x01bar" for header "foo"`,
-		},
-	}
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	for i, tt := range tests {
-		req, _ := http.NewRequest("GET", st.ts.URL, nil)
-		req.Header = tt.h
-		res, err := tr.RoundTrip(req)
-		var bad bool
-		if tt.wantErr == "" {
-			if err != nil {
-				bad = true
-				t.Errorf("case %d: error = %v; want no error", i, err)
-			}
-		} else {
-			if !strings.Contains(fmt.Sprint(err), tt.wantErr) {
-				bad = true
-				t.Errorf("case %d: error = %v; want error %q", i, err, tt.wantErr)
-			}
-		}
-		if err == nil {
-			if bad {
-				t.Logf("case %d: server got headers %q", i, res.Header.Get("Got-Header"))
-			}
-			res.Body.Close()
-		}
-	}
-}
-
-// Tests that gzipReader doesn't crash on a second Read call following
-// the first Read call's gzip.NewReader returning an error.
-func TestGzipReader_DoubleReadCrash(t *testing.T) {
-	gz := &gzipReader{
-		body: ioutil.NopCloser(strings.NewReader("0123456789")),
-	}
-	var buf [1]byte
-	n, err1 := gz.Read(buf[:])
-	if n != 0 || !strings.Contains(fmt.Sprint(err1), "invalid header") {
-		t.Fatalf("Read = %v, %v; want 0, invalid header", n, err1)
-	}
-	n, err2 := gz.Read(buf[:])
-	if n != 0 || err2 != err1 {
-		t.Fatalf("second Read = %v, %v; want 0, %v", n, err2, err1)
-	}
-}
-
-func TestTransportNewTLSConfig(t *testing.T) {
-	tests := [...]struct {
-		conf *tls.Config
-		host string
-		want *tls.Config
-	}{
-		// Normal case.
-		0: {
-			conf: nil,
-			host: "foo.com",
-			want: &tls.Config{
-				ServerName: "foo.com",
-				NextProtos: []string{NextProtoTLS},
-			},
-		},
-
-		// User-provided name (bar.com) takes precedence:
-		1: {
-			conf: &tls.Config{
-				ServerName: "bar.com",
-			},
-			host: "foo.com",
-			want: &tls.Config{
-				ServerName: "bar.com",
-				NextProtos: []string{NextProtoTLS},
-			},
-		},
-
-		// NextProto is prepended:
-		2: {
-			conf: &tls.Config{
-				NextProtos: []string{"foo", "bar"},
-			},
-			host: "example.com",
-			want: &tls.Config{
-				ServerName: "example.com",
-				NextProtos: []string{NextProtoTLS, "foo", "bar"},
-			},
-		},
-
-		// NextProto is not duplicated:
-		3: {
-			conf: &tls.Config{
-				NextProtos: []string{"foo", "bar", NextProtoTLS},
-			},
-			host: "example.com",
-			want: &tls.Config{
-				ServerName: "example.com",
-				NextProtos: []string{"foo", "bar", NextProtoTLS},
-			},
-		},
-	}
-	for i, tt := range tests {
-		// Ignore the session ticket keys part, which ends up populating
-		// unexported fields in the Config:
-		if tt.conf != nil {
-			tt.conf.SessionTicketsDisabled = true
-		}
-
-		tr := &Transport{TLSClientConfig: tt.conf}
-		got := tr.newTLSConfig(tt.host)
-
-		got.SessionTicketsDisabled = false
-
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d. got %#v; want %#v", i, got, tt.want)
-		}
-	}
-}
-
-// The Google GFE responds to HEAD requests with a HEADERS frame
-// without END_STREAM, followed by a 0-length DATA frame with
-// END_STREAM. Make sure we don't get confused by that. (We did.)
-func TestTransportReadHeadResponse(t *testing.T) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-	ct.client = func() error {
-		defer close(clientDone)
-		req, _ := http.NewRequest("HEAD", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		if res.ContentLength != 123 {
-			return fmt.Errorf("Content-Length = %d; want 123", res.ContentLength)
-		}
-		slurp, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return fmt.Errorf("ReadAll: %v", err)
-		}
-		if len(slurp) > 0 {
-			return fmt.Errorf("Unexpected non-empty ReadAll body: %q", slurp)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			hf, ok := f.(*HeadersFrame)
-			if !ok {
-				continue
-			}
-			var buf bytes.Buffer
-			enc := hpack.NewEncoder(&buf)
-			enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-			enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "123"})
-			ct.fr.WriteHeaders(HeadersFrameParam{
-				StreamID:      hf.StreamID,
-				EndHeaders:    true,
-				EndStream:     false, // as the GFE does
-				BlockFragment: buf.Bytes(),
-			})
-			ct.fr.WriteData(hf.StreamID, true, nil)
-
-			<-clientDone
-			return nil
-		}
-	}
-	ct.run()
-}
-
-type neverEnding byte
-
-func (b neverEnding) Read(p []byte) (int, error) {
-	for i := range p {
-		p[i] = byte(b)
-	}
-	return len(p), nil
-}
-
-// golang.org/issue/15425: test that a handler closing the request
-// body doesn't terminate the stream to the peer. (It just stops
-// readability from the handler's side, and eventually the client
-// runs out of flow control tokens)
-func TestTransportHandlerBodyClose(t *testing.T) {
-	const bodySize = 10 << 20
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		r.Body.Close()
-		io.Copy(w, io.LimitReader(neverEnding('A'), bodySize))
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	g0 := runtime.NumGoroutine()
-
-	const numReq = 10
-	for i := 0; i < numReq; i++ {
-		req, err := http.NewRequest("POST", st.ts.URL, struct{ io.Reader }{io.LimitReader(neverEnding('A'), bodySize)})
-		if err != nil {
-			t.Fatal(err)
-		}
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatal(err)
-		}
-		n, err := io.Copy(ioutil.Discard, res.Body)
-		res.Body.Close()
-		if n != bodySize || err != nil {
-			t.Fatalf("req#%d: Copy = %d, %v; want %d, nil", i, n, err, bodySize)
-		}
-	}
-	tr.CloseIdleConnections()
-
-	gd := runtime.NumGoroutine() - g0
-	if gd > numReq/2 {
-		t.Errorf("appeared to leak goroutines")
-	}
-
-}
-
-// https://golang.org/issue/15930
-func TestTransportFlowControl(t *testing.T) {
-	const bufLen = 64 << 10
-	var total int64 = 100 << 20 // 100MB
-	if testing.Short() {
-		total = 10 << 20
-	}
-
-	var wrote int64 // updated atomically
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		b := make([]byte, bufLen)
-		for wrote < total {
-			n, err := w.Write(b)
-			atomic.AddInt64(&wrote, int64(n))
-			if err != nil {
-				t.Errorf("ResponseWriter.Write error: %v", err)
-				break
-			}
-			w.(http.Flusher).Flush()
-		}
-	}, optOnlyServer)
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	req, err := http.NewRequest("GET", st.ts.URL, nil)
-	if err != nil {
-		t.Fatal("NewRequest error:", err)
-	}
-	resp, err := tr.RoundTrip(req)
-	if err != nil {
-		t.Fatal("RoundTrip error:", err)
-	}
-	defer resp.Body.Close()
-
-	var read int64
-	b := make([]byte, bufLen)
-	for {
-		n, err := resp.Body.Read(b)
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			t.Fatal("Read error:", err)
-		}
-		read += int64(n)
-
-		const max = transportDefaultStreamFlow
-		if w := atomic.LoadInt64(&wrote); -max > read-w || read-w > max {
-			t.Fatalf("Too much data inflight: server wrote %v bytes but client only received %v", w, read)
-		}
-
-		// Let the server get ahead of the client.
-		time.Sleep(1 * time.Millisecond)
-	}
-}
-
-// golang.org/issue/14627 -- if the server sends a GOAWAY frame, make
-// the Transport remember it and return it back to users (via
-// RoundTrip or request body reads) if needed (e.g. if the server
-// proceeds to close the TCP connection before the client gets its
-// response)
-func TestTransportUsesGoAwayDebugError_RoundTrip(t *testing.T) {
-	testTransportUsesGoAwayDebugError(t, false)
-}
-
-func TestTransportUsesGoAwayDebugError_Body(t *testing.T) {
-	testTransportUsesGoAwayDebugError(t, true)
-}
-
-func testTransportUsesGoAwayDebugError(t *testing.T, failMidBody bool) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-
-	const goAwayErrCode = ErrCodeHTTP11Required // arbitrary
-	const goAwayDebugData = "some debug data"
-
-	ct.client = func() error {
-		defer close(clientDone)
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if failMidBody {
-			if err != nil {
-				return fmt.Errorf("unexpected client RoundTrip error: %v", err)
-			}
-			_, err = io.Copy(ioutil.Discard, res.Body)
-			res.Body.Close()
-		}
-		want := GoAwayError{
-			LastStreamID: 5,
-			ErrCode:      goAwayErrCode,
-			DebugData:    goAwayDebugData,
-		}
-		if !reflect.DeepEqual(err, want) {
-			t.Errorf("RoundTrip error = %T: %#v, want %T (%#v)", err, err, want, want)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				t.Logf("ReadFrame: %v", err)
-				return nil
-			}
-			hf, ok := f.(*HeadersFrame)
-			if !ok {
-				continue
-			}
-			if failMidBody {
-				var buf bytes.Buffer
-				enc := hpack.NewEncoder(&buf)
-				enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-				enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "123"})
-				ct.fr.WriteHeaders(HeadersFrameParam{
-					StreamID:      hf.StreamID,
-					EndHeaders:    true,
-					EndStream:     false,
-					BlockFragment: buf.Bytes(),
-				})
-			}
-			// Write two GOAWAY frames, to test that the Transport takes
-			// the interesting parts of both.
-			ct.fr.WriteGoAway(5, ErrCodeNo, []byte(goAwayDebugData))
-			ct.fr.WriteGoAway(5, goAwayErrCode, nil)
-			ct.sc.(*net.TCPConn).CloseWrite()
-			<-clientDone
-			return nil
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/16481
-func TestTransportReturnsUnusedFlowControl(t *testing.T) {
-	ct := newClientTester(t)
-
-	clientClosed := make(chan bool, 1)
-	serverWroteBody := make(chan bool, 1)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		<-serverWroteBody
-
-		if n, err := res.Body.Read(make([]byte, 1)); err != nil || n != 1 {
-			return fmt.Errorf("body read = %v, %v; want 1, nil", n, err)
-		}
-		res.Body.Close() // leaving 4999 bytes unread
-		clientClosed <- true
-
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var hf *HeadersFrame
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-			}
-			switch f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-				continue
-			}
-			var ok bool
-			hf, ok = f.(*HeadersFrame)
-			if !ok {
-				return fmt.Errorf("Got %T; want HeadersFrame", f)
-			}
-			break
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "5000"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-		ct.fr.WriteData(hf.StreamID, false, make([]byte, 5000)) // without ending stream
-		serverWroteBody <- true
-
-		<-clientClosed
-
-		waitingFor := "RSTStreamFrame"
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for %s: %v", waitingFor, err)
-			}
-			if _, ok := f.(*SettingsFrame); ok {
-				continue
-			}
-			switch waitingFor {
-			case "RSTStreamFrame":
-				if rf, ok := f.(*RSTStreamFrame); !ok || rf.ErrCode != ErrCodeCancel {
-					return fmt.Errorf("Expected a WindowUpdateFrame with code cancel; got %v", summarizeFrame(f))
-				}
-				waitingFor = "WindowUpdateFrame"
-			case "WindowUpdateFrame":
-				if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != 4999 {
-					return fmt.Errorf("Expected WindowUpdateFrame for 4999 bytes; got %v", summarizeFrame(f))
-				}
-				return nil
-			}
-		}
-	}
-	ct.run()
-}
-
-// Issue 16612: adjust flow control on open streams when transport
-// receives SETTINGS with INITIAL_WINDOW_SIZE from server.
-func TestTransportAdjustsFlowControl(t *testing.T) {
-	ct := newClientTester(t)
-	clientDone := make(chan struct{})
-
-	const bodySize = 1 << 20
-
-	ct.client = func() error {
-		defer ct.cc.(*net.TCPConn).CloseWrite()
-		defer close(clientDone)
-
-		req, _ := http.NewRequest("POST", "https://dummy.tld/", struct{ io.Reader }{io.LimitReader(neverEnding('A'), bodySize)})
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		res.Body.Close()
-		return nil
-	}
-	ct.server = func() error {
-		_, err := io.ReadFull(ct.sc, make([]byte, len(ClientPreface)))
-		if err != nil {
-			return fmt.Errorf("reading client preface: %v", err)
-		}
-
-		var gotBytes int64
-		var sentSettings bool
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				select {
-				case <-clientDone:
-					return nil
-				default:
-					return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-				}
-			}
-			switch f := f.(type) {
-			case *DataFrame:
-				gotBytes += int64(len(f.Data()))
-				// After we've got half the client's
-				// initial flow control window's worth
-				// of request body data, give it just
-				// enough flow control to finish.
-				if gotBytes >= initialWindowSize/2 && !sentSettings {
-					sentSettings = true
-
-					ct.fr.WriteSettings(Setting{ID: SettingInitialWindowSize, Val: bodySize})
-					ct.fr.WriteWindowUpdate(0, bodySize)
-					ct.fr.WriteSettingsAck()
-				}
-
-				if f.StreamEnded() {
-					var buf bytes.Buffer
-					enc := hpack.NewEncoder(&buf)
-					enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-					ct.fr.WriteHeaders(HeadersFrameParam{
-						StreamID:      f.StreamID,
-						EndHeaders:    true,
-						EndStream:     true,
-						BlockFragment: buf.Bytes(),
-					})
-				}
-			}
-		}
-	}
-	ct.run()
-}
-
-// See golang.org/issue/16556
-func TestTransportReturnsDataPaddingFlowControl(t *testing.T) {
-	ct := newClientTester(t)
-
-	unblockClient := make(chan bool, 1)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err != nil {
-			return err
-		}
-		defer res.Body.Close()
-		<-unblockClient
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		var hf *HeadersFrame
-		for {
-			f, err := ct.fr.ReadFrame()
-			if err != nil {
-				return fmt.Errorf("ReadFrame while waiting for Headers: %v", err)
-			}
-			switch f.(type) {
-			case *WindowUpdateFrame, *SettingsFrame:
-				continue
-			}
-			var ok bool
-			hf, ok = f.(*HeadersFrame)
-			if !ok {
-				return fmt.Errorf("Got %T; want HeadersFrame", f)
-			}
-			break
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "content-length", Value: "5000"})
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-		pad := make([]byte, 5)
-		ct.fr.WriteDataPadded(hf.StreamID, false, make([]byte, 5000), pad) // without ending stream
-
-		f, err := ct.readNonSettingsFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame while waiting for first WindowUpdateFrame: %v", err)
-		}
-		wantBack := uint32(len(pad)) + 1 // one byte for the length of the padding
-		if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != wantBack || wuf.StreamID != 0 {
-			return fmt.Errorf("Expected conn WindowUpdateFrame for %d bytes; got %v", wantBack, summarizeFrame(f))
-		}
-
-		f, err = ct.readNonSettingsFrame()
-		if err != nil {
-			return fmt.Errorf("ReadFrame while waiting for second WindowUpdateFrame: %v", err)
-		}
-		if wuf, ok := f.(*WindowUpdateFrame); !ok || wuf.Increment != wantBack || wuf.StreamID == 0 {
-			return fmt.Errorf("Expected stream WindowUpdateFrame for %d bytes; got %v", wantBack, summarizeFrame(f))
-		}
-		unblockClient <- true
-		return nil
-	}
-	ct.run()
-}
-
-// golang.org/issue/16572 -- RoundTrip shouldn't hang when it gets a
-// StreamError as a result of the response HEADERS
-func TestTransportReturnsErrorOnBadResponseHeaders(t *testing.T) {
-	ct := newClientTester(t)
-
-	ct.client = func() error {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := ct.tr.RoundTrip(req)
-		if err == nil {
-			res.Body.Close()
-			return errors.New("unexpected successful GET")
-		}
-		want := StreamError{1, ErrCodeProtocol, headerFieldNameError("  content-type")}
-		if !reflect.DeepEqual(want, err) {
-			t.Errorf("RoundTrip error = %#v; want %#v", err, want)
-		}
-		return nil
-	}
-	ct.server = func() error {
-		ct.greet()
-
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			return err
-		}
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "  content-type", Value: "bogus"}) // bogus spaces
-		ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-
-		for {
-			fr, err := ct.readFrame()
-			if err != nil {
-				return fmt.Errorf("error waiting for RST_STREAM from client: %v", err)
-			}
-			if _, ok := fr.(*SettingsFrame); ok {
-				continue
-			}
-			if rst, ok := fr.(*RSTStreamFrame); !ok || rst.StreamID != 1 || rst.ErrCode != ErrCodeProtocol {
-				t.Errorf("Frame = %v; want RST_STREAM for stream 1 with ErrCodeProtocol", summarizeFrame(fr))
-			}
-			break
-		}
-
-		return nil
-	}
-	ct.run()
-}
-
-// byteAndEOFReader returns is in an io.Reader which reads one byte
-// (the underlying byte) and io.EOF at once in its Read call.
-type byteAndEOFReader byte
-
-func (b byteAndEOFReader) Read(p []byte) (n int, err error) {
-	if len(p) == 0 {
-		panic("unexpected useless call")
-	}
-	p[0] = byte(b)
-	return 1, io.EOF
-}
-
-// Issue 16788: the Transport had a regression where it started
-// sending a spurious DATA frame with a duplicate END_STREAM bit after
-// the request body writer goroutine had already read an EOF from the
-// Request.Body and included the END_STREAM on a data-carrying DATA
-// frame.
-//
-// Notably, to trigger this, the requests need to use a Request.Body
-// which returns (non-0, io.EOF) and also needs to set the ContentLength
-// explicitly.
-func TestTransportBodyDoubleEndStream(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		// Nothing.
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	for i := 0; i < 2; i++ {
-		req, _ := http.NewRequest("POST", st.ts.URL, byteAndEOFReader('a'))
-		req.ContentLength = 1
-		res, err := tr.RoundTrip(req)
-		if err != nil {
-			t.Fatalf("failure on req %d: %v", i+1, err)
-		}
-		defer res.Body.Close()
-	}
-}
-
-// golangorg/issue/16847
-func TestTransportRequestPathPseudo(t *testing.T) {
-	type result struct {
-		path string
-		err  string
-	}
-	tests := []struct {
-		req  *http.Request
-		want result
-	}{
-		0: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Host: "foo.com",
-					Path: "/foo",
-				},
-			},
-			want: result{path: "/foo"},
-		},
-		// I guess we just don't let users request "//foo" as
-		// a path, since it's illegal to start with two
-		// slashes....
-		1: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Host: "foo.com",
-					Path: "//foo",
-				},
-			},
-			want: result{err: `invalid request :path "//foo"`},
-		},
-
-		// Opaque with //$Matching_Hostname/path
-		2: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//foo.com/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque with some other Request.Host instead:
-		3: {
-			req: &http.Request{
-				Method: "GET",
-				Host:   "bar.com",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//bar.com/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque without the leading "//":
-		4: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Opaque: "/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{path: "/path"},
-		},
-
-		// Opaque we can't handle:
-		5: {
-			req: &http.Request{
-				Method: "GET",
-				URL: &url.URL{
-					Scheme: "https",
-					Opaque: "//unknown_host/path",
-					Host:   "foo.com",
-					Path:   "/ignored",
-				},
-			},
-			want: result{err: `invalid request :path "https://unknown_host/path" from URL.Opaque = "//unknown_host/path"`},
-		},
-
-		// A CONNECT request:
-		6: {
-			req: &http.Request{
-				Method: "CONNECT",
-				URL: &url.URL{
-					Host: "foo.com",
-				},
-			},
-			want: result{},
-		},
-	}
-	for i, tt := range tests {
-		cc := &ClientConn{}
-		cc.henc = hpack.NewEncoder(&cc.hbuf)
-		cc.mu.Lock()
-		hdrs, err := cc.encodeHeaders(tt.req, false, "", -1)
-		cc.mu.Unlock()
-		var got result
-		hpackDec := hpack.NewDecoder(initialHeaderTableSize, func(f hpack.HeaderField) {
-			if f.Name == ":path" {
-				got.path = f.Value
-			}
-		})
-		if err != nil {
-			got.err = err.Error()
-		} else if len(hdrs) > 0 {
-			if _, err := hpackDec.Write(hdrs); err != nil {
-				t.Errorf("%d. bogus hpack: %v", i, err)
-				continue
-			}
-		}
-		if got != tt.want {
-			t.Errorf("%d. got %+v; want %+v", i, got, tt.want)
-		}
-
-	}
-
-}
-
-// golang.org/issue/17071 -- don't sniff the first byte of the request body
-// before we've determined that the ClientConn is usable.
-func TestRoundTripDoesntConsumeRequestBodyEarly(t *testing.T) {
-	const body = "foo"
-	req, _ := http.NewRequest("POST", "http://foo.com/", ioutil.NopCloser(strings.NewReader(body)))
-	cc := &ClientConn{
-		closed: true,
-	}
-	_, err := cc.RoundTrip(req)
-	if err != errClientConnUnusable {
-		t.Fatalf("RoundTrip = %v; want errClientConnUnusable", err)
-	}
-	slurp, err := ioutil.ReadAll(req.Body)
-	if err != nil {
-		t.Errorf("ReadAll = %v", err)
-	}
-	if string(slurp) != body {
-		t.Errorf("Body = %q; want %q", slurp, body)
-	}
-}
-
-func TestClientConnPing(t *testing.T) {
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {}, optOnlyServer)
-	defer st.Close()
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-	cc, err := tr.dialClientConn(st.ts.Listener.Addr().String(), false)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err = cc.Ping(testContext{}); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Issue 16974: if the server sent a DATA frame after the user
-// canceled the Transport's Request, the Transport previously wrote to a
-// closed pipe, got an error, and ended up closing the whole TCP
-// connection.
-func TestTransportCancelDataResponseRace(t *testing.T) {
-	cancel := make(chan struct{})
-	clientGotError := make(chan bool, 1)
-
-	const msg = "Hello."
-	st := newServerTester(t, func(w http.ResponseWriter, r *http.Request) {
-		if strings.Contains(r.URL.Path, "/hello") {
-			time.Sleep(50 * time.Millisecond)
-			io.WriteString(w, msg)
-			return
-		}
-		for i := 0; i < 50; i++ {
-			io.WriteString(w, "Some data.")
-			w.(http.Flusher).Flush()
-			if i == 2 {
-				close(cancel)
-				<-clientGotError
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-	}, optOnlyServer)
-	defer st.Close()
-
-	tr := &Transport{TLSClientConfig: tlsConfigInsecure}
-	defer tr.CloseIdleConnections()
-
-	c := &http.Client{Transport: tr}
-	req, _ := http.NewRequest("GET", st.ts.URL, nil)
-	req.Cancel = cancel
-	res, err := c.Do(req)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if _, err = io.Copy(ioutil.Discard, res.Body); err == nil {
-		t.Fatal("unexpected success")
-	}
-	clientGotError <- true
-
-	res, err = c.Get(st.ts.URL + "/hello")
-	if err != nil {
-		t.Fatal(err)
-	}
-	slurp, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if string(slurp) != msg {
-		t.Errorf("Got = %q; want %q", slurp, msg)
-	}
-}
-
-func TestTransportRetryAfterGOAWAY(t *testing.T) {
-	var dialer struct {
-		sync.Mutex
-		count int
-	}
-	ct1 := make(chan *clientTester)
-	ct2 := make(chan *clientTester)
-
-	ln := newLocalListener(t)
-	defer ln.Close()
-
-	tr := &Transport{
-		TLSClientConfig: tlsConfigInsecure,
-	}
-	tr.DialTLS = func(network, addr string, cfg *tls.Config) (net.Conn, error) {
-		dialer.Lock()
-		defer dialer.Unlock()
-		dialer.count++
-		if dialer.count == 3 {
-			return nil, errors.New("unexpected number of dials")
-		}
-		cc, err := net.Dial("tcp", ln.Addr().String())
-		if err != nil {
-			return nil, fmt.Errorf("dial error: %v", err)
-		}
-		sc, err := ln.Accept()
-		if err != nil {
-			return nil, fmt.Errorf("accept error: %v", err)
-		}
-		ct := &clientTester{
-			t:  t,
-			tr: tr,
-			cc: cc,
-			sc: sc,
-			fr: NewFramer(sc, sc),
-		}
-		switch dialer.count {
-		case 1:
-			ct1 <- ct
-		case 2:
-			ct2 <- ct
-		}
-		return cc, nil
-	}
-
-	errs := make(chan error, 3)
-	done := make(chan struct{})
-	defer close(done)
-
-	// Client.
-	go func() {
-		req, _ := http.NewRequest("GET", "https://dummy.tld/", nil)
-		res, err := tr.RoundTrip(req)
-		if res != nil {
-			res.Body.Close()
-			if got := res.Header.Get("Foo"); got != "bar" {
-				err = fmt.Errorf("foo header = %q; want bar", got)
-			}
-		}
-		if err != nil {
-			err = fmt.Errorf("RoundTrip: %v", err)
-		}
-		errs <- err
-	}()
-
-	connToClose := make(chan io.Closer, 2)
-
-	// Server for the first request.
-	go func() {
-		var ct *clientTester
-		select {
-		case ct = <-ct1:
-		case <-done:
-			return
-		}
-
-		connToClose <- ct.cc
-		ct.greet()
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			errs <- fmt.Errorf("server1 failed reading HEADERS: %v", err)
-			return
-		}
-		t.Logf("server1 got %v", hf)
-		if err := ct.fr.WriteGoAway(0 /*max id*/, ErrCodeNo, nil); err != nil {
-			errs <- fmt.Errorf("server1 failed writing GOAWAY: %v", err)
-			return
-		}
-		errs <- nil
-	}()
-
-	// Server for the second request.
-	go func() {
-		var ct *clientTester
-		select {
-		case ct = <-ct2:
-		case <-done:
-			return
-		}
-
-		connToClose <- ct.cc
-		ct.greet()
-		hf, err := ct.firstHeaders()
-		if err != nil {
-			errs <- fmt.Errorf("server2 failed reading HEADERS: %v", err)
-			return
-		}
-		t.Logf("server2 got %v", hf)
-
-		var buf bytes.Buffer
-		enc := hpack.NewEncoder(&buf)
-		enc.WriteField(hpack.HeaderField{Name: ":status", Value: "200"})
-		enc.WriteField(hpack.HeaderField{Name: "foo", Value: "bar"})
-		err = ct.fr.WriteHeaders(HeadersFrameParam{
-			StreamID:      hf.StreamID,
-			EndHeaders:    true,
-			EndStream:     false,
-			BlockFragment: buf.Bytes(),
-		})
-		if err != nil {
-			errs <- fmt.Errorf("server2 failed writing response HEADERS: %v", err)
-		} else {
-			errs <- nil
-		}
-	}()
-
-	for k := 0; k < 3; k++ {
-		select {
-		case err := <-errs:
-			if err != nil {
-				t.Error(err)
-			}
-		case <-time.After(1 * time.Second):
-			t.Errorf("timed out")
-		}
-	}
-
-	for {
-		select {
-		case c := <-connToClose:
-			c.Close()
-		default:
-			return
-		}
-	}
-}
-
-func TestAuthorityAddr(t *testing.T) {
-	tests := []struct {
-		scheme, authority string
-		want              string
-	}{
-		{"http", "foo.com", "foo.com:80"},
-		{"https", "foo.com", "foo.com:443"},
-		{"https", "foo.com:1234", "foo.com:1234"},
-		{"https", "1.2.3.4:1234", "1.2.3.4:1234"},
-		{"https", "1.2.3.4", "1.2.3.4:443"},
-		{"https", "[::1]:1234", "[::1]:1234"},
-		{"https", "[::1]", "[::1]:443"},
-	}
-	for _, tt := range tests {
-		got := authorityAddr(tt.scheme, tt.authority)
-		if got != tt.want {
-			t.Errorf("authorityAddr(%q, %q) = %q; want %q", tt.scheme, tt.authority, got, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/write.go b/installer/vendor/golang.org/x/net/http2/write.go
deleted file mode 100644
index 6b0dfae319..0000000000
--- a/installer/vendor/golang.org/x/net/http2/write.go
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"net/http"
-	"net/url"
-	"time"
-
-	"golang.org/x/net/http2/hpack"
-	"golang.org/x/net/lex/httplex"
-)
-
-// writeFramer is implemented by any type that is used to write frames.
-type writeFramer interface {
-	writeFrame(writeContext) error
-
-	// staysWithinBuffer reports whether this writer promises that
-	// it will only write less than or equal to size bytes, and it
-	// won't Flush the write context.
-	staysWithinBuffer(size int) bool
-}
-
-// writeContext is the interface needed by the various frame writer
-// types below. All the writeFrame methods below are scheduled via the
-// frame writing scheduler (see writeScheduler in writesched.go).
-//
-// This interface is implemented by *serverConn.
-//
-// TODO: decide whether to a) use this in the client code (which didn't
-// end up using this yet, because it has a simpler design, not
-// currently implementing priorities), or b) delete this and
-// make the server code a bit more concrete.
-type writeContext interface {
-	Framer() *Framer
-	Flush() error
-	CloseConn() error
-	// HeaderEncoder returns an HPACK encoder that writes to the
-	// returned buffer.
-	HeaderEncoder() (*hpack.Encoder, *bytes.Buffer)
-}
-
-// writeEndsStream reports whether w writes a frame that will transition
-// the stream to a half-closed local state. This returns false for RST_STREAM,
-// which closes the entire stream (not just the local half).
-func writeEndsStream(w writeFramer) bool {
-	switch v := w.(type) {
-	case *writeData:
-		return v.endStream
-	case *writeResHeaders:
-		return v.endStream
-	case nil:
-		// This can only happen if the caller reuses w after it's
-		// been intentionally nil'ed out to prevent use. Keep this
-		// here to catch future refactoring breaking it.
-		panic("writeEndsStream called on nil writeFramer")
-	}
-	return false
-}
-
-type flushFrameWriter struct{}
-
-func (flushFrameWriter) writeFrame(ctx writeContext) error {
-	return ctx.Flush()
-}
-
-func (flushFrameWriter) staysWithinBuffer(max int) bool { return false }
-
-type writeSettings []Setting
-
-func (s writeSettings) staysWithinBuffer(max int) bool {
-	const settingSize = 6 // uint16 + uint32
-	return frameHeaderLen+settingSize*len(s) <= max
-
-}
-
-func (s writeSettings) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteSettings([]Setting(s)...)
-}
-
-type writeGoAway struct {
-	maxStreamID uint32
-	code        ErrCode
-}
-
-func (p *writeGoAway) writeFrame(ctx writeContext) error {
-	err := ctx.Framer().WriteGoAway(p.maxStreamID, p.code, nil)
-	if p.code != 0 {
-		ctx.Flush() // ignore error: we're hanging up on them anyway
-		time.Sleep(50 * time.Millisecond)
-		ctx.CloseConn()
-	}
-	return err
-}
-
-func (*writeGoAway) staysWithinBuffer(max int) bool { return false } // flushes
-
-type writeData struct {
-	streamID  uint32
-	p         []byte
-	endStream bool
-}
-
-func (w *writeData) String() string {
-	return fmt.Sprintf("writeData(stream=%d, p=%d, endStream=%v)", w.streamID, len(w.p), w.endStream)
-}
-
-func (w *writeData) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteData(w.streamID, w.endStream, w.p)
-}
-
-func (w *writeData) staysWithinBuffer(max int) bool {
-	return frameHeaderLen+len(w.p) <= max
-}
-
-// handlerPanicRST is the message sent from handler goroutines when
-// the handler panics.
-type handlerPanicRST struct {
-	StreamID uint32
-}
-
-func (hp handlerPanicRST) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteRSTStream(hp.StreamID, ErrCodeInternal)
-}
-
-func (hp handlerPanicRST) staysWithinBuffer(max int) bool { return frameHeaderLen+4 <= max }
-
-func (se StreamError) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteRSTStream(se.StreamID, se.Code)
-}
-
-func (se StreamError) staysWithinBuffer(max int) bool { return frameHeaderLen+4 <= max }
-
-type writePingAck struct{ pf *PingFrame }
-
-func (w writePingAck) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WritePing(true, w.pf.Data)
-}
-
-func (w writePingAck) staysWithinBuffer(max int) bool { return frameHeaderLen+len(w.pf.Data) <= max }
-
-type writeSettingsAck struct{}
-
-func (writeSettingsAck) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteSettingsAck()
-}
-
-func (writeSettingsAck) staysWithinBuffer(max int) bool { return frameHeaderLen <= max }
-
-// splitHeaderBlock splits headerBlock into fragments so that each fragment fits
-// in a single frame, then calls fn for each fragment. firstFrag/lastFrag are true
-// for the first/last fragment, respectively.
-func splitHeaderBlock(ctx writeContext, headerBlock []byte, fn func(ctx writeContext, frag []byte, firstFrag, lastFrag bool) error) error {
-	// For now we're lazy and just pick the minimum MAX_FRAME_SIZE
-	// that all peers must support (16KB). Later we could care
-	// more and send larger frames if the peer advertised it, but
-	// there's little point. Most headers are small anyway (so we
-	// generally won't have CONTINUATION frames), and extra frames
-	// only waste 9 bytes anyway.
-	const maxFrameSize = 16384
-
-	first := true
-	for len(headerBlock) > 0 {
-		frag := headerBlock
-		if len(frag) > maxFrameSize {
-			frag = frag[:maxFrameSize]
-		}
-		headerBlock = headerBlock[len(frag):]
-		if err := fn(ctx, frag, first, len(headerBlock) == 0); err != nil {
-			return err
-		}
-		first = false
-	}
-	return nil
-}
-
-// writeResHeaders is a request to write a HEADERS and 0+ CONTINUATION frames
-// for HTTP response headers or trailers from a server handler.
-type writeResHeaders struct {
-	streamID    uint32
-	httpResCode int         // 0 means no ":status" line
-	h           http.Header // may be nil
-	trailers    []string    // if non-nil, which keys of h to write. nil means all.
-	endStream   bool
-
-	date          string
-	contentType   string
-	contentLength string
-}
-
-func encKV(enc *hpack.Encoder, k, v string) {
-	if VerboseLogs {
-		log.Printf("http2: server encoding header %q = %q", k, v)
-	}
-	enc.WriteField(hpack.HeaderField{Name: k, Value: v})
-}
-
-func (w *writeResHeaders) staysWithinBuffer(max int) bool {
-	// TODO: this is a common one. It'd be nice to return true
-	// here and get into the fast path if we could be clever and
-	// calculate the size fast enough, or at least a conservative
-	// uppper bound that usually fires. (Maybe if w.h and
-	// w.trailers are nil, so we don't need to enumerate it.)
-	// Otherwise I'm afraid that just calculating the length to
-	// answer this question would be slower than the ~2µs benefit.
-	return false
-}
-
-func (w *writeResHeaders) writeFrame(ctx writeContext) error {
-	enc, buf := ctx.HeaderEncoder()
-	buf.Reset()
-
-	if w.httpResCode != 0 {
-		encKV(enc, ":status", httpCodeString(w.httpResCode))
-	}
-
-	encodeHeaders(enc, w.h, w.trailers)
-
-	if w.contentType != "" {
-		encKV(enc, "content-type", w.contentType)
-	}
-	if w.contentLength != "" {
-		encKV(enc, "content-length", w.contentLength)
-	}
-	if w.date != "" {
-		encKV(enc, "date", w.date)
-	}
-
-	headerBlock := buf.Bytes()
-	if len(headerBlock) == 0 && w.trailers == nil {
-		panic("unexpected empty hpack")
-	}
-
-	return splitHeaderBlock(ctx, headerBlock, w.writeHeaderBlock)
-}
-
-func (w *writeResHeaders) writeHeaderBlock(ctx writeContext, frag []byte, firstFrag, lastFrag bool) error {
-	if firstFrag {
-		return ctx.Framer().WriteHeaders(HeadersFrameParam{
-			StreamID:      w.streamID,
-			BlockFragment: frag,
-			EndStream:     w.endStream,
-			EndHeaders:    lastFrag,
-		})
-	} else {
-		return ctx.Framer().WriteContinuation(w.streamID, lastFrag, frag)
-	}
-}
-
-// writePushPromise is a request to write a PUSH_PROMISE and 0+ CONTINUATION frames.
-type writePushPromise struct {
-	streamID uint32   // pusher stream
-	method   string   // for :method
-	url      *url.URL // for :scheme, :authority, :path
-	h        http.Header
-
-	// Creates an ID for a pushed stream. This runs on serveG just before
-	// the frame is written. The returned ID is copied to promisedID.
-	allocatePromisedID func() (uint32, error)
-	promisedID         uint32
-}
-
-func (w *writePushPromise) staysWithinBuffer(max int) bool {
-	// TODO: see writeResHeaders.staysWithinBuffer
-	return false
-}
-
-func (w *writePushPromise) writeFrame(ctx writeContext) error {
-	enc, buf := ctx.HeaderEncoder()
-	buf.Reset()
-
-	encKV(enc, ":method", w.method)
-	encKV(enc, ":scheme", w.url.Scheme)
-	encKV(enc, ":authority", w.url.Host)
-	encKV(enc, ":path", w.url.RequestURI())
-	encodeHeaders(enc, w.h, nil)
-
-	headerBlock := buf.Bytes()
-	if len(headerBlock) == 0 {
-		panic("unexpected empty hpack")
-	}
-
-	return splitHeaderBlock(ctx, headerBlock, w.writeHeaderBlock)
-}
-
-func (w *writePushPromise) writeHeaderBlock(ctx writeContext, frag []byte, firstFrag, lastFrag bool) error {
-	if firstFrag {
-		return ctx.Framer().WritePushPromise(PushPromiseParam{
-			StreamID:      w.streamID,
-			PromiseID:     w.promisedID,
-			BlockFragment: frag,
-			EndHeaders:    lastFrag,
-		})
-	} else {
-		return ctx.Framer().WriteContinuation(w.streamID, lastFrag, frag)
-	}
-}
-
-type write100ContinueHeadersFrame struct {
-	streamID uint32
-}
-
-func (w write100ContinueHeadersFrame) writeFrame(ctx writeContext) error {
-	enc, buf := ctx.HeaderEncoder()
-	buf.Reset()
-	encKV(enc, ":status", "100")
-	return ctx.Framer().WriteHeaders(HeadersFrameParam{
-		StreamID:      w.streamID,
-		BlockFragment: buf.Bytes(),
-		EndStream:     false,
-		EndHeaders:    true,
-	})
-}
-
-func (w write100ContinueHeadersFrame) staysWithinBuffer(max int) bool {
-	// Sloppy but conservative:
-	return 9+2*(len(":status")+len("100")) <= max
-}
-
-type writeWindowUpdate struct {
-	streamID uint32 // or 0 for conn-level
-	n        uint32
-}
-
-func (wu writeWindowUpdate) staysWithinBuffer(max int) bool { return frameHeaderLen+4 <= max }
-
-func (wu writeWindowUpdate) writeFrame(ctx writeContext) error {
-	return ctx.Framer().WriteWindowUpdate(wu.streamID, wu.n)
-}
-
-// encodeHeaders encodes an http.Header. If keys is not nil, then (k, h[k])
-// is encoded only only if k is in keys.
-func encodeHeaders(enc *hpack.Encoder, h http.Header, keys []string) {
-	if keys == nil {
-		sorter := sorterPool.Get().(*sorter)
-		// Using defer here, since the returned keys from the
-		// sorter.Keys method is only valid until the sorter
-		// is returned:
-		defer sorterPool.Put(sorter)
-		keys = sorter.Keys(h)
-	}
-	for _, k := range keys {
-		vv := h[k]
-		k = lowerHeader(k)
-		if !validWireHeaderFieldName(k) {
-			// Skip it as backup paranoia. Per
-			// golang.org/issue/14048, these should
-			// already be rejected at a higher level.
-			continue
-		}
-		isTE := k == "transfer-encoding"
-		for _, v := range vv {
-			if !httplex.ValidHeaderFieldValue(v) {
-				// TODO: return an error? golang.org/issue/14048
-				// For now just omit it.
-				continue
-			}
-			// TODO: more of "8.1.2.2 Connection-Specific Header Fields"
-			if isTE && v != "trailers" {
-				continue
-			}
-			encKV(enc, k, v)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched.go b/installer/vendor/golang.org/x/net/http2/writesched.go
deleted file mode 100644
index 4fe3073073..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "fmt"
-
-// WriteScheduler is the interface implemented by HTTP/2 write schedulers.
-// Methods are never called concurrently.
-type WriteScheduler interface {
-	// OpenStream opens a new stream in the write scheduler.
-	// It is illegal to call this with streamID=0 or with a streamID that is
-	// already open -- the call may panic.
-	OpenStream(streamID uint32, options OpenStreamOptions)
-
-	// CloseStream closes a stream in the write scheduler. Any frames queued on
-	// this stream should be discarded. It is illegal to call this on a stream
-	// that is not open -- the call may panic.
-	CloseStream(streamID uint32)
-
-	// AdjustStream adjusts the priority of the given stream. This may be called
-	// on a stream that has not yet been opened or has been closed. Note that
-	// RFC 7540 allows PRIORITY frames to be sent on streams in any state. See:
-	// https://tools.ietf.org/html/rfc7540#section-5.1
-	AdjustStream(streamID uint32, priority PriorityParam)
-
-	// Push queues a frame in the scheduler. In most cases, this will not be
-	// called with wr.StreamID()!=0 unless that stream is currently open. The one
-	// exception is RST_STREAM frames, which may be sent on idle or closed streams.
-	Push(wr FrameWriteRequest)
-
-	// Pop dequeues the next frame to write. Returns false if no frames can
-	// be written. Frames with a given wr.StreamID() are Pop'd in the same
-	// order they are Push'd.
-	Pop() (wr FrameWriteRequest, ok bool)
-}
-
-// OpenStreamOptions specifies extra options for WriteScheduler.OpenStream.
-type OpenStreamOptions struct {
-	// PusherID is zero if the stream was initiated by the client. Otherwise,
-	// PusherID names the stream that pushed the newly opened stream.
-	PusherID uint32
-}
-
-// FrameWriteRequest is a request to write a frame.
-type FrameWriteRequest struct {
-	// write is the interface value that does the writing, once the
-	// WriteScheduler has selected this frame to write. The write
-	// functions are all defined in write.go.
-	write writeFramer
-
-	// stream is the stream on which this frame will be written.
-	// nil for non-stream frames like PING and SETTINGS.
-	stream *stream
-
-	// done, if non-nil, must be a buffered channel with space for
-	// 1 message and is sent the return value from write (or an
-	// earlier error) when the frame has been written.
-	done chan error
-}
-
-// StreamID returns the id of the stream this frame will be written to.
-// 0 is used for non-stream frames such as PING and SETTINGS.
-func (wr FrameWriteRequest) StreamID() uint32 {
-	if wr.stream == nil {
-		if se, ok := wr.write.(StreamError); ok {
-			// (*serverConn).resetStream doesn't set
-			// stream because it doesn't necessarily have
-			// one. So special case this type of write
-			// message.
-			return se.StreamID
-		}
-		return 0
-	}
-	return wr.stream.id
-}
-
-// DataSize returns the number of flow control bytes that must be consumed
-// to write this entire frame. This is 0 for non-DATA frames.
-func (wr FrameWriteRequest) DataSize() int {
-	if wd, ok := wr.write.(*writeData); ok {
-		return len(wd.p)
-	}
-	return 0
-}
-
-// Consume consumes min(n, available) bytes from this frame, where available
-// is the number of flow control bytes available on the stream. Consume returns
-// 0, 1, or 2 frames, where the integer return value gives the number of frames
-// returned.
-//
-// If flow control prevents consuming any bytes, this returns (_, _, 0). If
-// the entire frame was consumed, this returns (wr, _, 1). Otherwise, this
-// returns (consumed, rest, 2), where 'consumed' contains the consumed bytes and
-// 'rest' contains the remaining bytes. The consumed bytes are deducted from the
-// underlying stream's flow control budget.
-func (wr FrameWriteRequest) Consume(n int32) (FrameWriteRequest, FrameWriteRequest, int) {
-	var empty FrameWriteRequest
-
-	// Non-DATA frames are always consumed whole.
-	wd, ok := wr.write.(*writeData)
-	if !ok || len(wd.p) == 0 {
-		return wr, empty, 1
-	}
-
-	// Might need to split after applying limits.
-	allowed := wr.stream.flow.available()
-	if n < allowed {
-		allowed = n
-	}
-	if wr.stream.sc.maxFrameSize < allowed {
-		allowed = wr.stream.sc.maxFrameSize
-	}
-	if allowed <= 0 {
-		return empty, empty, 0
-	}
-	if len(wd.p) > int(allowed) {
-		wr.stream.flow.take(allowed)
-		consumed := FrameWriteRequest{
-			stream: wr.stream,
-			write: &writeData{
-				streamID: wd.streamID,
-				p:        wd.p[:allowed],
-				// Even if the original had endStream set, there
-				// are bytes remaining because len(wd.p) > allowed,
-				// so we know endStream is false.
-				endStream: false,
-			},
-			// Our caller is blocking on the final DATA frame, not
-			// this intermediate frame, so no need to wait.
-			done: nil,
-		}
-		rest := FrameWriteRequest{
-			stream: wr.stream,
-			write: &writeData{
-				streamID:  wd.streamID,
-				p:         wd.p[allowed:],
-				endStream: wd.endStream,
-			},
-			done: wr.done,
-		}
-		return consumed, rest, 2
-	}
-
-	// The frame is consumed whole.
-	// NB: This cast cannot overflow because allowed is <= math.MaxInt32.
-	wr.stream.flow.take(int32(len(wd.p)))
-	return wr, empty, 1
-}
-
-// String is for debugging only.
-func (wr FrameWriteRequest) String() string {
-	var des string
-	if s, ok := wr.write.(fmt.Stringer); ok {
-		des = s.String()
-	} else {
-		des = fmt.Sprintf("%T", wr.write)
-	}
-	return fmt.Sprintf("[FrameWriteRequest stream=%d, ch=%v, writer=%v]", wr.StreamID(), wr.done != nil, des)
-}
-
-// replyToWriter sends err to wr.done and panics if the send must block
-// This does nothing if wr.done is nil.
-func (wr *FrameWriteRequest) replyToWriter(err error) {
-	if wr.done == nil {
-		return
-	}
-	select {
-	case wr.done <- err:
-	default:
-		panic(fmt.Sprintf("unbuffered done channel passed in for type %T", wr.write))
-	}
-	wr.write = nil // prevent use (assume it's tainted after wr.done send)
-}
-
-// writeQueue is used by implementations of WriteScheduler.
-type writeQueue struct {
-	s []FrameWriteRequest
-}
-
-func (q *writeQueue) empty() bool { return len(q.s) == 0 }
-
-func (q *writeQueue) push(wr FrameWriteRequest) {
-	q.s = append(q.s, wr)
-}
-
-func (q *writeQueue) shift() FrameWriteRequest {
-	if len(q.s) == 0 {
-		panic("invalid use of queue")
-	}
-	wr := q.s[0]
-	// TODO: less copy-happy queue.
-	copy(q.s, q.s[1:])
-	q.s[len(q.s)-1] = FrameWriteRequest{}
-	q.s = q.s[:len(q.s)-1]
-	return wr
-}
-
-// consume consumes up to n bytes from q.s[0]. If the frame is
-// entirely consumed, it is removed from the queue. If the frame
-// is partially consumed, the frame is kept with the consumed
-// bytes removed. Returns true iff any bytes were consumed.
-func (q *writeQueue) consume(n int32) (FrameWriteRequest, bool) {
-	if len(q.s) == 0 {
-		return FrameWriteRequest{}, false
-	}
-	consumed, rest, numresult := q.s[0].Consume(n)
-	switch numresult {
-	case 0:
-		return FrameWriteRequest{}, false
-	case 1:
-		q.shift()
-	case 2:
-		q.s[0] = rest
-	}
-	return consumed, true
-}
-
-type writeQueuePool []*writeQueue
-
-// put inserts an unused writeQueue into the pool.
-func (p *writeQueuePool) put(q *writeQueue) {
-	for i := range q.s {
-		q.s[i] = FrameWriteRequest{}
-	}
-	q.s = q.s[:0]
-	*p = append(*p, q)
-}
-
-// get returns an empty writeQueue.
-func (p *writeQueuePool) get() *writeQueue {
-	ln := len(*p)
-	if ln == 0 {
-		return new(writeQueue)
-	}
-	x := ln - 1
-	q := (*p)[x]
-	(*p)[x] = nil
-	*p = (*p)[:x]
-	return q
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched_priority.go b/installer/vendor/golang.org/x/net/http2/writesched_priority.go
deleted file mode 100644
index 01132721bd..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched_priority.go
+++ /dev/null
@@ -1,452 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"math"
-	"sort"
-)
-
-// RFC 7540, Section 5.3.5: the default weight is 16.
-const priorityDefaultWeight = 15 // 16 = 15 + 1
-
-// PriorityWriteSchedulerConfig configures a priorityWriteScheduler.
-type PriorityWriteSchedulerConfig struct {
-	// MaxClosedNodesInTree controls the maximum number of closed streams to
-	// retain in the priority tree. Setting this to zero saves a small amount
-	// of memory at the cost of performance.
-	//
-	// See RFC 7540, Section 5.3.4:
-	//   "It is possible for a stream to become closed while prioritization
-	//   information ... is in transit. ... This potentially creates suboptimal
-	//   prioritization, since the stream could be given a priority that is
-	//   different from what is intended. To avoid these problems, an endpoint
-	//   SHOULD retain stream prioritization state for a period after streams
-	//   become closed. The longer state is retained, the lower the chance that
-	//   streams are assigned incorrect or default priority values."
-	MaxClosedNodesInTree int
-
-	// MaxIdleNodesInTree controls the maximum number of idle streams to
-	// retain in the priority tree. Setting this to zero saves a small amount
-	// of memory at the cost of performance.
-	//
-	// See RFC 7540, Section 5.3.4:
-	//   Similarly, streams that are in the "idle" state can be assigned
-	//   priority or become a parent of other streams. This allows for the
-	//   creation of a grouping node in the dependency tree, which enables
-	//   more flexible expressions of priority. Idle streams begin with a
-	//   default priority (Section 5.3.5).
-	MaxIdleNodesInTree int
-
-	// ThrottleOutOfOrderWrites enables write throttling to help ensure that
-	// data is delivered in priority order. This works around a race where
-	// stream B depends on stream A and both streams are about to call Write
-	// to queue DATA frames. If B wins the race, a naive scheduler would eagerly
-	// write as much data from B as possible, but this is suboptimal because A
-	// is a higher-priority stream. With throttling enabled, we write a small
-	// amount of data from B to minimize the amount of bandwidth that B can
-	// steal from A.
-	ThrottleOutOfOrderWrites bool
-}
-
-// NewPriorityWriteScheduler constructs a WriteScheduler that schedules
-// frames by following HTTP/2 priorities as described in RFC 7340 Section 5.3.
-// If cfg is nil, default options are used.
-func NewPriorityWriteScheduler(cfg *PriorityWriteSchedulerConfig) WriteScheduler {
-	if cfg == nil {
-		// For justification of these defaults, see:
-		// https://docs.google.com/document/d/1oLhNg1skaWD4_DtaoCxdSRN5erEXrH-KnLrMwEpOtFY
-		cfg = &PriorityWriteSchedulerConfig{
-			MaxClosedNodesInTree:     10,
-			MaxIdleNodesInTree:       10,
-			ThrottleOutOfOrderWrites: false,
-		}
-	}
-
-	ws := &priorityWriteScheduler{
-		nodes:                make(map[uint32]*priorityNode),
-		maxClosedNodesInTree: cfg.MaxClosedNodesInTree,
-		maxIdleNodesInTree:   cfg.MaxIdleNodesInTree,
-		enableWriteThrottle:  cfg.ThrottleOutOfOrderWrites,
-	}
-	ws.nodes[0] = &ws.root
-	if cfg.ThrottleOutOfOrderWrites {
-		ws.writeThrottleLimit = 1024
-	} else {
-		ws.writeThrottleLimit = math.MaxInt32
-	}
-	return ws
-}
-
-type priorityNodeState int
-
-const (
-	priorityNodeOpen priorityNodeState = iota
-	priorityNodeClosed
-	priorityNodeIdle
-)
-
-// priorityNode is a node in an HTTP/2 priority tree.
-// Each node is associated with a single stream ID.
-// See RFC 7540, Section 5.3.
-type priorityNode struct {
-	q            writeQueue        // queue of pending frames to write
-	id           uint32            // id of the stream, or 0 for the root of the tree
-	weight       uint8             // the actual weight is weight+1, so the value is in [1,256]
-	state        priorityNodeState // open | closed | idle
-	bytes        int64             // number of bytes written by this node, or 0 if closed
-	subtreeBytes int64             // sum(node.bytes) of all nodes in this subtree
-
-	// These links form the priority tree.
-	parent     *priorityNode
-	kids       *priorityNode // start of the kids list
-	prev, next *priorityNode // doubly-linked list of siblings
-}
-
-func (n *priorityNode) setParent(parent *priorityNode) {
-	if n == parent {
-		panic("setParent to self")
-	}
-	if n.parent == parent {
-		return
-	}
-	// Unlink from current parent.
-	if parent := n.parent; parent != nil {
-		if n.prev == nil {
-			parent.kids = n.next
-		} else {
-			n.prev.next = n.next
-		}
-		if n.next != nil {
-			n.next.prev = n.prev
-		}
-	}
-	// Link to new parent.
-	// If parent=nil, remove n from the tree.
-	// Always insert at the head of parent.kids (this is assumed by walkReadyInOrder).
-	n.parent = parent
-	if parent == nil {
-		n.next = nil
-		n.prev = nil
-	} else {
-		n.next = parent.kids
-		n.prev = nil
-		if n.next != nil {
-			n.next.prev = n
-		}
-		parent.kids = n
-	}
-}
-
-func (n *priorityNode) addBytes(b int64) {
-	n.bytes += b
-	for ; n != nil; n = n.parent {
-		n.subtreeBytes += b
-	}
-}
-
-// walkReadyInOrder iterates over the tree in priority order, calling f for each node
-// with a non-empty write queue. When f returns true, this funcion returns true and the
-// walk halts. tmp is used as scratch space for sorting.
-//
-// f(n, openParent) takes two arguments: the node to visit, n, and a bool that is true
-// if any ancestor p of n is still open (ignoring the root node).
-func (n *priorityNode) walkReadyInOrder(openParent bool, tmp *[]*priorityNode, f func(*priorityNode, bool) bool) bool {
-	if !n.q.empty() && f(n, openParent) {
-		return true
-	}
-	if n.kids == nil {
-		return false
-	}
-
-	// Don't consider the root "open" when updating openParent since
-	// we can't send data frames on the root stream (only control frames).
-	if n.id != 0 {
-		openParent = openParent || (n.state == priorityNodeOpen)
-	}
-
-	// Common case: only one kid or all kids have the same weight.
-	// Some clients don't use weights; other clients (like web browsers)
-	// use mostly-linear priority trees.
-	w := n.kids.weight
-	needSort := false
-	for k := n.kids.next; k != nil; k = k.next {
-		if k.weight != w {
-			needSort = true
-			break
-		}
-	}
-	if !needSort {
-		for k := n.kids; k != nil; k = k.next {
-			if k.walkReadyInOrder(openParent, tmp, f) {
-				return true
-			}
-		}
-		return false
-	}
-
-	// Uncommon case: sort the child nodes. We remove the kids from the parent,
-	// then re-insert after sorting so we can reuse tmp for future sort calls.
-	*tmp = (*tmp)[:0]
-	for n.kids != nil {
-		*tmp = append(*tmp, n.kids)
-		n.kids.setParent(nil)
-	}
-	sort.Sort(sortPriorityNodeSiblings(*tmp))
-	for i := len(*tmp) - 1; i >= 0; i-- {
-		(*tmp)[i].setParent(n) // setParent inserts at the head of n.kids
-	}
-	for k := n.kids; k != nil; k = k.next {
-		if k.walkReadyInOrder(openParent, tmp, f) {
-			return true
-		}
-	}
-	return false
-}
-
-type sortPriorityNodeSiblings []*priorityNode
-
-func (z sortPriorityNodeSiblings) Len() int      { return len(z) }
-func (z sortPriorityNodeSiblings) Swap(i, k int) { z[i], z[k] = z[k], z[i] }
-func (z sortPriorityNodeSiblings) Less(i, k int) bool {
-	// Prefer the subtree that has sent fewer bytes relative to its weight.
-	// See sections 5.3.2 and 5.3.4.
-	wi, bi := float64(z[i].weight+1), float64(z[i].subtreeBytes)
-	wk, bk := float64(z[k].weight+1), float64(z[k].subtreeBytes)
-	if bi == 0 && bk == 0 {
-		return wi >= wk
-	}
-	if bk == 0 {
-		return false
-	}
-	return bi/bk <= wi/wk
-}
-
-type priorityWriteScheduler struct {
-	// root is the root of the priority tree, where root.id = 0.
-	// The root queues control frames that are not associated with any stream.
-	root priorityNode
-
-	// nodes maps stream ids to priority tree nodes.
-	nodes map[uint32]*priorityNode
-
-	// maxID is the maximum stream id in nodes.
-	maxID uint32
-
-	// lists of nodes that have been closed or are idle, but are kept in
-	// the tree for improved prioritization. When the lengths exceed either
-	// maxClosedNodesInTree or maxIdleNodesInTree, old nodes are discarded.
-	closedNodes, idleNodes []*priorityNode
-
-	// From the config.
-	maxClosedNodesInTree int
-	maxIdleNodesInTree   int
-	writeThrottleLimit   int32
-	enableWriteThrottle  bool
-
-	// tmp is scratch space for priorityNode.walkReadyInOrder to reduce allocations.
-	tmp []*priorityNode
-
-	// pool of empty queues for reuse.
-	queuePool writeQueuePool
-}
-
-func (ws *priorityWriteScheduler) OpenStream(streamID uint32, options OpenStreamOptions) {
-	// The stream may be currently idle but cannot be opened or closed.
-	if curr := ws.nodes[streamID]; curr != nil {
-		if curr.state != priorityNodeIdle {
-			panic(fmt.Sprintf("stream %d already opened", streamID))
-		}
-		curr.state = priorityNodeOpen
-		return
-	}
-
-	// RFC 7540, Section 5.3.5:
-	//  "All streams are initially assigned a non-exclusive dependency on stream 0x0.
-	//  Pushed streams initially depend on their associated stream. In both cases,
-	//  streams are assigned a default weight of 16."
-	parent := ws.nodes[options.PusherID]
-	if parent == nil {
-		parent = &ws.root
-	}
-	n := &priorityNode{
-		q:      *ws.queuePool.get(),
-		id:     streamID,
-		weight: priorityDefaultWeight,
-		state:  priorityNodeOpen,
-	}
-	n.setParent(parent)
-	ws.nodes[streamID] = n
-	if streamID > ws.maxID {
-		ws.maxID = streamID
-	}
-}
-
-func (ws *priorityWriteScheduler) CloseStream(streamID uint32) {
-	if streamID == 0 {
-		panic("violation of WriteScheduler interface: cannot close stream 0")
-	}
-	if ws.nodes[streamID] == nil {
-		panic(fmt.Sprintf("violation of WriteScheduler interface: unknown stream %d", streamID))
-	}
-	if ws.nodes[streamID].state != priorityNodeOpen {
-		panic(fmt.Sprintf("violation of WriteScheduler interface: stream %d already closed", streamID))
-	}
-
-	n := ws.nodes[streamID]
-	n.state = priorityNodeClosed
-	n.addBytes(-n.bytes)
-
-	q := n.q
-	ws.queuePool.put(&q)
-	n.q.s = nil
-	if ws.maxClosedNodesInTree > 0 {
-		ws.addClosedOrIdleNode(&ws.closedNodes, ws.maxClosedNodesInTree, n)
-	} else {
-		ws.removeNode(n)
-	}
-}
-
-func (ws *priorityWriteScheduler) AdjustStream(streamID uint32, priority PriorityParam) {
-	if streamID == 0 {
-		panic("adjustPriority on root")
-	}
-
-	// If streamID does not exist, there are two cases:
-	// - A closed stream that has been removed (this will have ID <= maxID)
-	// - An idle stream that is being used for "grouping" (this will have ID > maxID)
-	n := ws.nodes[streamID]
-	if n == nil {
-		if streamID <= ws.maxID || ws.maxIdleNodesInTree == 0 {
-			return
-		}
-		ws.maxID = streamID
-		n = &priorityNode{
-			q:      *ws.queuePool.get(),
-			id:     streamID,
-			weight: priorityDefaultWeight,
-			state:  priorityNodeIdle,
-		}
-		n.setParent(&ws.root)
-		ws.nodes[streamID] = n
-		ws.addClosedOrIdleNode(&ws.idleNodes, ws.maxIdleNodesInTree, n)
-	}
-
-	// Section 5.3.1: A dependency on a stream that is not currently in the tree
-	// results in that stream being given a default priority (Section 5.3.5).
-	parent := ws.nodes[priority.StreamDep]
-	if parent == nil {
-		n.setParent(&ws.root)
-		n.weight = priorityDefaultWeight
-		return
-	}
-
-	// Ignore if the client tries to make a node its own parent.
-	if n == parent {
-		return
-	}
-
-	// Section 5.3.3:
-	//   "If a stream is made dependent on one of its own dependencies, the
-	//   formerly dependent stream is first moved to be dependent on the
-	//   reprioritized stream's previous parent. The moved dependency retains
-	//   its weight."
-	//
-	// That is: if parent depends on n, move parent to depend on n.parent.
-	for x := parent.parent; x != nil; x = x.parent {
-		if x == n {
-			parent.setParent(n.parent)
-			break
-		}
-	}
-
-	// Section 5.3.3: The exclusive flag causes the stream to become the sole
-	// dependency of its parent stream, causing other dependencies to become
-	// dependent on the exclusive stream.
-	if priority.Exclusive {
-		k := parent.kids
-		for k != nil {
-			next := k.next
-			if k != n {
-				k.setParent(n)
-			}
-			k = next
-		}
-	}
-
-	n.setParent(parent)
-	n.weight = priority.Weight
-}
-
-func (ws *priorityWriteScheduler) Push(wr FrameWriteRequest) {
-	var n *priorityNode
-	if id := wr.StreamID(); id == 0 {
-		n = &ws.root
-	} else {
-		n = ws.nodes[id]
-		if n == nil {
-			// id is an idle or closed stream. wr should not be a HEADERS or
-			// DATA frame. However, wr can be a RST_STREAM. In this case, we
-			// push wr onto the root, rather than creating a new priorityNode,
-			// since RST_STREAM is tiny and the stream's priority is unknown
-			// anyway. See issue #17919.
-			if wr.DataSize() > 0 {
-				panic("add DATA on non-open stream")
-			}
-			n = &ws.root
-		}
-	}
-	n.q.push(wr)
-}
-
-func (ws *priorityWriteScheduler) Pop() (wr FrameWriteRequest, ok bool) {
-	ws.root.walkReadyInOrder(false, &ws.tmp, func(n *priorityNode, openParent bool) bool {
-		limit := int32(math.MaxInt32)
-		if openParent {
-			limit = ws.writeThrottleLimit
-		}
-		wr, ok = n.q.consume(limit)
-		if !ok {
-			return false
-		}
-		n.addBytes(int64(wr.DataSize()))
-		// If B depends on A and B continuously has data available but A
-		// does not, gradually increase the throttling limit to allow B to
-		// steal more and more bandwidth from A.
-		if openParent {
-			ws.writeThrottleLimit += 1024
-			if ws.writeThrottleLimit < 0 {
-				ws.writeThrottleLimit = math.MaxInt32
-			}
-		} else if ws.enableWriteThrottle {
-			ws.writeThrottleLimit = 1024
-		}
-		return true
-	})
-	return wr, ok
-}
-
-func (ws *priorityWriteScheduler) addClosedOrIdleNode(list *[]*priorityNode, maxSize int, n *priorityNode) {
-	if maxSize == 0 {
-		return
-	}
-	if len(*list) == maxSize {
-		// Remove the oldest node, then shift left.
-		ws.removeNode((*list)[0])
-		x := (*list)[1:]
-		copy(*list, x)
-		*list = (*list)[:len(x)]
-	}
-	*list = append(*list, n)
-}
-
-func (ws *priorityWriteScheduler) removeNode(n *priorityNode) {
-	for k := n.kids; k != nil; k = k.next {
-		k.setParent(n.parent)
-	}
-	n.setParent(nil)
-	delete(ws.nodes, n.id)
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched_priority_test.go b/installer/vendor/golang.org/x/net/http2/writesched_priority_test.go
deleted file mode 100644
index f2b535a2c6..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched_priority_test.go
+++ /dev/null
@@ -1,541 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"fmt"
-	"sort"
-	"testing"
-)
-
-func defaultPriorityWriteScheduler() *priorityWriteScheduler {
-	return NewPriorityWriteScheduler(nil).(*priorityWriteScheduler)
-}
-
-func checkPriorityWellFormed(ws *priorityWriteScheduler) error {
-	for id, n := range ws.nodes {
-		if id != n.id {
-			return fmt.Errorf("bad ws.nodes: ws.nodes[%d] = %d", id, n.id)
-		}
-		if n.parent == nil {
-			if n.next != nil || n.prev != nil {
-				return fmt.Errorf("bad node %d: nil parent but prev/next not nil", id)
-			}
-			continue
-		}
-		found := false
-		for k := n.parent.kids; k != nil; k = k.next {
-			if k.id == id {
-				found = true
-				break
-			}
-		}
-		if !found {
-			return fmt.Errorf("bad node %d: not found in parent %d kids list", id, n.parent.id)
-		}
-	}
-	return nil
-}
-
-func fmtTree(ws *priorityWriteScheduler, fmtNode func(*priorityNode) string) string {
-	var ids []int
-	for _, n := range ws.nodes {
-		ids = append(ids, int(n.id))
-	}
-	sort.Ints(ids)
-
-	var buf bytes.Buffer
-	for _, id := range ids {
-		if buf.Len() != 0 {
-			buf.WriteString(" ")
-		}
-		if id == 0 {
-			buf.WriteString(fmtNode(&ws.root))
-		} else {
-			buf.WriteString(fmtNode(ws.nodes[uint32(id)]))
-		}
-	}
-	return buf.String()
-}
-
-func fmtNodeParentSkipRoot(n *priorityNode) string {
-	switch {
-	case n.id == 0:
-		return ""
-	case n.parent == nil:
-		return fmt.Sprintf("%d{parent:nil}", n.id)
-	default:
-		return fmt.Sprintf("%d{parent:%d}", n.id, n.parent.id)
-	}
-}
-
-func fmtNodeWeightParentSkipRoot(n *priorityNode) string {
-	switch {
-	case n.id == 0:
-		return ""
-	case n.parent == nil:
-		return fmt.Sprintf("%d{weight:%d,parent:nil}", n.id, n.weight)
-	default:
-		return fmt.Sprintf("%d{weight:%d,parent:%d}", n.id, n.weight, n.parent.id)
-	}
-}
-
-func TestPriorityTwoStreams(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-
-	// Move 1's parent to 2.
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 2,
-		Weight:    32,
-		Exclusive: false,
-	})
-	want = "1{weight:32,parent:2} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityAdjustExclusiveZero(t *testing.T) {
-	// 1, 2, and 3 are all children of the 0 stream.
-	// Exclusive reprioritization to any of the streams should bring
-	// the rest of the streams under the reprioritized stream.
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-	ws.OpenStream(3, OpenStreamOptions{})
-
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0} 3{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-
-	ws.AdjustStream(2, PriorityParam{
-		StreamDep: 0,
-		Weight:    20,
-		Exclusive: true,
-	})
-	want = "1{weight:15,parent:2} 2{weight:20,parent:0} 3{weight:15,parent:2}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityAdjustOwnParent(t *testing.T) {
-	// Assigning a node as its own parent should have no effect.
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-	ws.AdjustStream(2, PriorityParam{
-		StreamDep: 2,
-		Weight:    20,
-		Exclusive: true,
-	})
-	want := "1{weight:15,parent:0} 2{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityClosedStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{MaxClosedNodesInTree: 2}).(*priorityWriteScheduler)
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-
-	// Close the first three streams. We lose 1, but keep 2 and 3.
-	ws.CloseStream(1)
-	ws.CloseStream(2)
-	ws.CloseStream(3)
-
-	want := "2{weight:15,parent:0} 3{weight:15,parent:2} 4{weight:15,parent:3}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After close\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-
-	// Adding a stream as an exclusive child of 1 gives it default
-	// priorities, since 1 is gone.
-	ws.OpenStream(5, OpenStreamOptions{})
-	ws.AdjustStream(5, PriorityParam{StreamDep: 1, Weight: 15, Exclusive: true})
-
-	// Adding a stream as an exclusive child of 2 should work, since 2 is not gone.
-	ws.OpenStream(6, OpenStreamOptions{})
-	ws.AdjustStream(6, PriorityParam{StreamDep: 2, Weight: 15, Exclusive: true})
-
-	want = "2{weight:15,parent:0} 3{weight:15,parent:6} 4{weight:15,parent:3} 5{weight:15,parent:0} 6{weight:15,parent:2}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After add streams\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityClosedStreamsDisabled(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{}).(*priorityWriteScheduler)
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-
-	// Close the first two streams. We keep only 3.
-	ws.CloseStream(1)
-	ws.CloseStream(2)
-
-	want := "3{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After close\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityIdleStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{MaxIdleNodesInTree: 2}).(*priorityWriteScheduler)
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(3, PriorityParam{StreamDep: 2, Weight: 20}) // idle
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.OpenStream(5, OpenStreamOptions{})
-	ws.OpenStream(6, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{StreamDep: 1, Weight: 15})
-	ws.AdjustStream(5, PriorityParam{StreamDep: 2, Weight: 15})
-	ws.AdjustStream(6, PriorityParam{StreamDep: 3, Weight: 15})
-
-	want := "2{weight:15,parent:0} 3{weight:20,parent:2} 4{weight:15,parent:0} 5{weight:15,parent:2} 6{weight:15,parent:3}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityIdleStreamsDisabled(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{}).(*priorityWriteScheduler)
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 15}) // idle
-	ws.AdjustStream(3, PriorityParam{StreamDep: 2, Weight: 20}) // idle
-	ws.OpenStream(4, OpenStreamOptions{})
-
-	want := "4{weight:15,parent:0}"
-	if got := fmtTree(ws, fmtNodeWeightParentSkipRoot); got != want {
-		t.Errorf("After open\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection531NonExclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.1.
-	// A,B,C,D = 1,2,3,4
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{
-		StreamDep: 1,
-		Weight:    15,
-		Exclusive: false,
-	})
-	want := "1{parent:0} 2{parent:1} 3{parent:1} 4{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection531Exclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.1.
-	// A,B,C,D = 1,2,3,4
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{})
-	ws.AdjustStream(4, PriorityParam{
-		StreamDep: 1,
-		Weight:    15,
-		Exclusive: true,
-	})
-	want := "1{parent:0} 2{parent:4} 3{parent:4} 4{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func makeSection533Tree() *priorityWriteScheduler {
-	// Initial tree from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	return ws
-}
-
-func TestPrioritySection533NonExclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 4,
-		Weight:    15,
-		Exclusive: false,
-	})
-	want := "1{parent:4} 2{parent:1} 3{parent:1} 4{parent:0} 5{parent:3} 6{parent:4}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPrioritySection533Exclusive(t *testing.T) {
-	// Example from RFC 7540 Section 5.3.3.
-	// A,B,C,D,E,F = 1,2,3,4,5,6
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(5, OpenStreamOptions{PusherID: 3})
-	ws.OpenStream(6, OpenStreamOptions{PusherID: 4})
-	ws.AdjustStream(1, PriorityParam{
-		StreamDep: 4,
-		Weight:    15,
-		Exclusive: true,
-	})
-	want := "1{parent:4} 2{parent:1} 3{parent:1} 4{parent:0} 5{parent:3} 6{parent:1}"
-	if got := fmtTree(ws, fmtNodeParentSkipRoot); got != want {
-		t.Errorf("After adjust\ngot  %q\nwant %q", got, want)
-	}
-	if err := checkPriorityWellFormed(ws); err != nil {
-		t.Error(err)
-	}
-}
-
-func checkPopAll(ws WriteScheduler, order []uint32) error {
-	for k, id := range order {
-		wr, ok := ws.Pop()
-		if !ok {
-			return fmt.Errorf("Pop[%d]: got ok=false, want %d (order=%v)", k, id, order)
-		}
-		if got := wr.StreamID(); got != id {
-			return fmt.Errorf("Pop[%d]: got %v, want %d (order=%v)", k, got, id, order)
-		}
-	}
-	wr, ok := ws.Pop()
-	if ok {
-		return fmt.Errorf("Pop[%d]: got %v, want ok=false (order=%v)", len(order), wr.StreamID(), order)
-	}
-	return nil
-}
-
-func TestPriorityPopFrom533Tree(t *testing.T) {
-	ws := makeSection533Tree()
-
-	ws.Push(makeWriteHeadersRequest(3 /*C*/))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteHeadersRequest(5 /*E*/))
-	ws.Push(makeWriteHeadersRequest(1 /*A*/))
-	t.Log("tree:", fmtTree(ws, fmtNodeParentSkipRoot))
-
-	if err := checkPopAll(ws, []uint32{0 /*NonStream*/, 1, 3, 5}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityPopFromLinearTree(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-	ws.OpenStream(3, OpenStreamOptions{PusherID: 2})
-	ws.OpenStream(4, OpenStreamOptions{PusherID: 3})
-
-	ws.Push(makeWriteHeadersRequest(3))
-	ws.Push(makeWriteHeadersRequest(4))
-	ws.Push(makeWriteHeadersRequest(1))
-	ws.Push(makeWriteHeadersRequest(2))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteNonStreamRequest())
-	t.Log("tree:", fmtTree(ws, fmtNodeParentSkipRoot))
-
-	if err := checkPopAll(ws, []uint32{0, 0 /*NonStreams*/, 1, 2, 3, 4}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityFlowControl(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{ThrottleOutOfOrderWrites: false})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-
-	sc := &serverConn{maxFrameSize: 16}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 16), false}, st1, nil})
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 16), false}, st2, nil})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 1})
-
-	// No flow-control bytes available.
-	if wr, ok := ws.Pop(); ok {
-		t.Fatalf("Pop(limited by flow control)=%v,true, want false", wr)
-	}
-
-	// Add enough flow-control bytes to write st2 in two Pop calls.
-	// Should write data from st2 even though it's lower priority than st1.
-	for i := 1; i <= 2; i++ {
-		st2.flow.add(8)
-		wr, ok := ws.Pop()
-		if !ok {
-			t.Fatalf("Pop(%d)=false, want true", i)
-		}
-		if got, want := wr.DataSize(), 8; got != want {
-			t.Fatalf("Pop(%d)=%d bytes, want %d bytes", i, got, want)
-		}
-	}
-}
-
-func TestPriorityThrottleOutOfOrderWrites(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{ThrottleOutOfOrderWrites: true})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{PusherID: 1})
-
-	sc := &serverConn{maxFrameSize: 4096}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-	st1.flow.add(4096)
-	st2.flow.add(4096)
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 4096), false}, st2, nil})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 1})
-
-	// We have enough flow-control bytes to write st2 in a single Pop call.
-	// However, due to out-of-order write throttling, the first call should
-	// only write 1KB.
-	wr, ok := ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st2.first)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(2); got != want {
-		t.Fatalf("Pop(st2.first)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 1024; got != want {
-		t.Fatalf("Pop(st2.first)=%d bytes, want %d bytes", got, want)
-	}
-
-	// Now add data on st1. This should take precedence.
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 4096), false}, st1, nil})
-	wr, ok = ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st1)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(1); got != want {
-		t.Fatalf("Pop(st1)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 4096; got != want {
-		t.Fatalf("Pop(st1)=%d bytes, want %d bytes", got, want)
-	}
-
-	// Should go back to writing 1KB from st2.
-	wr, ok = ws.Pop()
-	if !ok {
-		t.Fatalf("Pop(st2.last)=false, want true")
-	}
-	if got, want := wr.StreamID(), uint32(2); got != want {
-		t.Fatalf("Pop(st2.last)=stream %d, want stream %d", got, want)
-	}
-	if got, want := wr.DataSize(), 1024; got != want {
-		t.Fatalf("Pop(st2.last)=%d bytes, want %d bytes", got, want)
-	}
-}
-
-func TestPriorityWeights(t *testing.T) {
-	ws := defaultPriorityWriteScheduler()
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.OpenStream(2, OpenStreamOptions{})
-
-	sc := &serverConn{maxFrameSize: 8}
-	st1 := &stream{id: 1, sc: sc}
-	st2 := &stream{id: 2, sc: sc}
-	st1.flow.add(40)
-	st2.flow.add(40)
-
-	ws.Push(FrameWriteRequest{&writeData{1, make([]byte, 40), false}, st1, nil})
-	ws.Push(FrameWriteRequest{&writeData{2, make([]byte, 40), false}, st2, nil})
-	ws.AdjustStream(1, PriorityParam{StreamDep: 0, Weight: 34})
-	ws.AdjustStream(2, PriorityParam{StreamDep: 0, Weight: 9})
-
-	// st1 gets 3.5x the bandwidth of st2 (3.5 = (34+1)/(9+1)).
-	// The maximum frame size is 8 bytes. The write sequence should be:
-	//   st1, total bytes so far is (st1=8,  st=0)
-	//   st2, total bytes so far is (st1=8,  st=8)
-	//   st1, total bytes so far is (st1=16, st=8)
-	//   st1, total bytes so far is (st1=24, st=8)   // 3x bandwidth
-	//   st1, total bytes so far is (st1=32, st=8)   // 4x bandwidth
-	//   st2, total bytes so far is (st1=32, st=16)  // 2x bandwidth
-	//   st1, total bytes so far is (st1=40, st=16)
-	//   st2, total bytes so far is (st1=40, st=24)
-	//   st2, total bytes so far is (st1=40, st=32)
-	//   st2, total bytes so far is (st1=40, st=40)
-	if err := checkPopAll(ws, []uint32{1, 2, 1, 1, 1, 2, 1, 2, 2, 2}); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestPriorityRstStreamOnNonOpenStreams(t *testing.T) {
-	ws := NewPriorityWriteScheduler(&PriorityWriteSchedulerConfig{
-		MaxClosedNodesInTree: 0,
-		MaxIdleNodesInTree:   0,
-	})
-	ws.OpenStream(1, OpenStreamOptions{})
-	ws.CloseStream(1)
-	ws.Push(FrameWriteRequest{write: streamError(1, ErrCodeProtocol)})
-	ws.Push(FrameWriteRequest{write: streamError(2, ErrCodeProtocol)})
-
-	if err := checkPopAll(ws, []uint32{1, 2}); err != nil {
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched_random.go b/installer/vendor/golang.org/x/net/http2/writesched_random.go
deleted file mode 100644
index 36d7919f16..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched_random.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "math"
-
-// NewRandomWriteScheduler constructs a WriteScheduler that ignores HTTP/2
-// priorities. Control frames like SETTINGS and PING are written before DATA
-// frames, but if no control frames are queued and multiple streams have queued
-// HEADERS or DATA frames, Pop selects a ready stream arbitrarily.
-func NewRandomWriteScheduler() WriteScheduler {
-	return &randomWriteScheduler{sq: make(map[uint32]*writeQueue)}
-}
-
-type randomWriteScheduler struct {
-	// zero are frames not associated with a specific stream.
-	zero writeQueue
-
-	// sq contains the stream-specific queues, keyed by stream ID.
-	// When a stream is idle or closed, it's deleted from the map.
-	sq map[uint32]*writeQueue
-
-	// pool of empty queues for reuse.
-	queuePool writeQueuePool
-}
-
-func (ws *randomWriteScheduler) OpenStream(streamID uint32, options OpenStreamOptions) {
-	// no-op: idle streams are not tracked
-}
-
-func (ws *randomWriteScheduler) CloseStream(streamID uint32) {
-	q, ok := ws.sq[streamID]
-	if !ok {
-		return
-	}
-	delete(ws.sq, streamID)
-	ws.queuePool.put(q)
-}
-
-func (ws *randomWriteScheduler) AdjustStream(streamID uint32, priority PriorityParam) {
-	// no-op: priorities are ignored
-}
-
-func (ws *randomWriteScheduler) Push(wr FrameWriteRequest) {
-	id := wr.StreamID()
-	if id == 0 {
-		ws.zero.push(wr)
-		return
-	}
-	q, ok := ws.sq[id]
-	if !ok {
-		q = ws.queuePool.get()
-		ws.sq[id] = q
-	}
-	q.push(wr)
-}
-
-func (ws *randomWriteScheduler) Pop() (FrameWriteRequest, bool) {
-	// Control frames first.
-	if !ws.zero.empty() {
-		return ws.zero.shift(), true
-	}
-	// Iterate over all non-idle streams until finding one that can be consumed.
-	for _, q := range ws.sq {
-		if wr, ok := q.consume(math.MaxInt32); ok {
-			return wr, true
-		}
-	}
-	return FrameWriteRequest{}, false
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched_random_test.go b/installer/vendor/golang.org/x/net/http2/writesched_random_test.go
deleted file mode 100644
index 3bf4aa36ab..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched_random_test.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import "testing"
-
-func TestRandomScheduler(t *testing.T) {
-	ws := NewRandomWriteScheduler()
-	ws.Push(makeWriteHeadersRequest(3))
-	ws.Push(makeWriteHeadersRequest(4))
-	ws.Push(makeWriteHeadersRequest(1))
-	ws.Push(makeWriteHeadersRequest(2))
-	ws.Push(makeWriteNonStreamRequest())
-	ws.Push(makeWriteNonStreamRequest())
-
-	// Pop all frames. Should get the non-stream requests first,
-	// followed by the stream requests in any order.
-	var order []FrameWriteRequest
-	for {
-		wr, ok := ws.Pop()
-		if !ok {
-			break
-		}
-		order = append(order, wr)
-	}
-	t.Logf("got frames: %v", order)
-	if len(order) != 6 {
-		t.Fatalf("got %d frames, expected 6", len(order))
-	}
-	if order[0].StreamID() != 0 || order[1].StreamID() != 0 {
-		t.Fatal("expected non-stream frames first", order[0], order[1])
-	}
-	got := make(map[uint32]bool)
-	for _, wr := range order[2:] {
-		got[wr.StreamID()] = true
-	}
-	for id := uint32(1); id <= 4; id++ {
-		if !got[id] {
-			t.Errorf("frame not found for stream %d", id)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/writesched_test.go b/installer/vendor/golang.org/x/net/http2/writesched_test.go
deleted file mode 100644
index 0807056bc9..0000000000
--- a/installer/vendor/golang.org/x/net/http2/writesched_test.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"fmt"
-	"math"
-	"reflect"
-	"testing"
-)
-
-func makeWriteNonStreamRequest() FrameWriteRequest {
-	return FrameWriteRequest{writeSettingsAck{}, nil, nil}
-}
-
-func makeWriteHeadersRequest(streamID uint32) FrameWriteRequest {
-	st := &stream{id: streamID}
-	return FrameWriteRequest{&writeResHeaders{streamID: streamID, httpResCode: 200}, st, nil}
-}
-
-func checkConsume(wr FrameWriteRequest, nbytes int32, want []FrameWriteRequest) error {
-	consumed, rest, n := wr.Consume(nbytes)
-	var wantConsumed, wantRest FrameWriteRequest
-	switch len(want) {
-	case 0:
-	case 1:
-		wantConsumed = want[0]
-	case 2:
-		wantConsumed = want[0]
-		wantRest = want[1]
-	}
-	if !reflect.DeepEqual(consumed, wantConsumed) || !reflect.DeepEqual(rest, wantRest) || n != len(want) {
-		return fmt.Errorf("got %v, %v, %v\nwant %v, %v, %v", consumed, rest, n, wantConsumed, wantRest, len(want))
-	}
-	return nil
-}
-
-func TestFrameWriteRequestNonData(t *testing.T) {
-	wr := makeWriteNonStreamRequest()
-	if got, want := wr.DataSize(), 0; got != want {
-		t.Errorf("DataSize: got %v, want %v", got, want)
-	}
-
-	// Non-DATA frames are always consumed whole.
-	if err := checkConsume(wr, 0, []FrameWriteRequest{wr}); err != nil {
-		t.Errorf("Consume:\n%v", err)
-	}
-}
-
-func TestFrameWriteRequestData(t *testing.T) {
-	st := &stream{
-		id: 1,
-		sc: &serverConn{maxFrameSize: 16},
-	}
-	const size = 32
-	wr := FrameWriteRequest{&writeData{st.id, make([]byte, size), true}, st, make(chan error)}
-	if got, want := wr.DataSize(), size; got != want {
-		t.Errorf("DataSize: got %v, want %v", got, want)
-	}
-
-	// No flow-control bytes available: cannot consume anything.
-	if err := checkConsume(wr, math.MaxInt32, []FrameWriteRequest{}); err != nil {
-		t.Errorf("Consume(limited by flow control):\n%v", err)
-	}
-
-	// Add enough flow-control bytes to consume the entire frame,
-	// but we're now restricted by st.sc.maxFrameSize.
-	st.flow.add(size)
-	want := []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, st.sc.maxFrameSize), false},
-			stream: st,
-			done:   nil,
-		},
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(wr, math.MaxInt32, want); err != nil {
-		t.Errorf("Consume(limited by maxFrameSize):\n%v", err)
-	}
-	rest := want[1]
-
-	// Consume 8 bytes from the remaining frame.
-	want = []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, 8), false},
-			stream: st,
-			done:   nil,
-		},
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize-8), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(rest, 8, want); err != nil {
-		t.Errorf("Consume(8):\n%v", err)
-	}
-	rest = want[1]
-
-	// Consume all remaining bytes.
-	want = []FrameWriteRequest{
-		{
-			write:  &writeData{st.id, make([]byte, size-st.sc.maxFrameSize-8), true},
-			stream: st,
-			done:   wr.done,
-		},
-	}
-	if err := checkConsume(rest, math.MaxInt32, want); err != nil {
-		t.Errorf("Consume(remainder):\n%v", err)
-	}
-}
-
-func TestFrameWriteRequest_StreamID(t *testing.T) {
-	const streamID = 123
-	wr := FrameWriteRequest{write: streamError(streamID, ErrCodeNo)}
-	if got := wr.StreamID(); got != streamID {
-		t.Errorf("FrameWriteRequest(StreamError) = %v; want %v", got, streamID)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/http2/z_spec_test.go b/installer/vendor/golang.org/x/net/http2/z_spec_test.go
deleted file mode 100644
index 610b2cdbc2..0000000000
--- a/installer/vendor/golang.org/x/net/http2/z_spec_test.go
+++ /dev/null
@@ -1,356 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package http2
-
-import (
-	"bytes"
-	"encoding/xml"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"reflect"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-)
-
-var coverSpec = flag.Bool("coverspec", false, "Run spec coverage tests")
-
-// The global map of sentence coverage for the http2 spec.
-var defaultSpecCoverage specCoverage
-
-var loadSpecOnce sync.Once
-
-func loadSpec() {
-	if f, err := os.Open("testdata/draft-ietf-httpbis-http2.xml"); err != nil {
-		panic(err)
-	} else {
-		defaultSpecCoverage = readSpecCov(f)
-		f.Close()
-	}
-}
-
-// covers marks all sentences for section sec in defaultSpecCoverage. Sentences not
-// "covered" will be included in report outputted by TestSpecCoverage.
-func covers(sec, sentences string) {
-	loadSpecOnce.Do(loadSpec)
-	defaultSpecCoverage.cover(sec, sentences)
-}
-
-type specPart struct {
-	section  string
-	sentence string
-}
-
-func (ss specPart) Less(oo specPart) bool {
-	atoi := func(s string) int {
-		n, err := strconv.Atoi(s)
-		if err != nil {
-			panic(err)
-		}
-		return n
-	}
-	a := strings.Split(ss.section, ".")
-	b := strings.Split(oo.section, ".")
-	for len(a) > 0 {
-		if len(b) == 0 {
-			return false
-		}
-		x, y := atoi(a[0]), atoi(b[0])
-		if x == y {
-			a, b = a[1:], b[1:]
-			continue
-		}
-		return x < y
-	}
-	if len(b) > 0 {
-		return true
-	}
-	return false
-}
-
-type bySpecSection []specPart
-
-func (a bySpecSection) Len() int           { return len(a) }
-func (a bySpecSection) Less(i, j int) bool { return a[i].Less(a[j]) }
-func (a bySpecSection) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type specCoverage struct {
-	coverage map[specPart]bool
-	d        *xml.Decoder
-}
-
-func joinSection(sec []int) string {
-	s := fmt.Sprintf("%d", sec[0])
-	for _, n := range sec[1:] {
-		s = fmt.Sprintf("%s.%d", s, n)
-	}
-	return s
-}
-
-func (sc specCoverage) readSection(sec []int) {
-	var (
-		buf = new(bytes.Buffer)
-		sub = 0
-	)
-	for {
-		tk, err := sc.d.Token()
-		if err != nil {
-			if err == io.EOF {
-				return
-			}
-			panic(err)
-		}
-		switch v := tk.(type) {
-		case xml.StartElement:
-			if skipElement(v) {
-				if err := sc.d.Skip(); err != nil {
-					panic(err)
-				}
-				if v.Name.Local == "section" {
-					sub++
-				}
-				break
-			}
-			switch v.Name.Local {
-			case "section":
-				sub++
-				sc.readSection(append(sec, sub))
-			case "xref":
-				buf.Write(sc.readXRef(v))
-			}
-		case xml.CharData:
-			if len(sec) == 0 {
-				break
-			}
-			buf.Write(v)
-		case xml.EndElement:
-			if v.Name.Local == "section" {
-				sc.addSentences(joinSection(sec), buf.String())
-				return
-			}
-		}
-	}
-}
-
-func (sc specCoverage) readXRef(se xml.StartElement) []byte {
-	var b []byte
-	for {
-		tk, err := sc.d.Token()
-		if err != nil {
-			panic(err)
-		}
-		switch v := tk.(type) {
-		case xml.CharData:
-			if b != nil {
-				panic("unexpected CharData")
-			}
-			b = []byte(string(v))
-		case xml.EndElement:
-			if v.Name.Local != "xref" {
-				panic("expected </xref>")
-			}
-			if b != nil {
-				return b
-			}
-			sig := attrSig(se)
-			switch sig {
-			case "target":
-				return []byte(fmt.Sprintf("[%s]", attrValue(se, "target")))
-			case "fmt-of,rel,target", "fmt-,,rel,target":
-				return []byte(fmt.Sprintf("[%s, %s]", attrValue(se, "target"), attrValue(se, "rel")))
-			case "fmt-of,sec,target", "fmt-,,sec,target":
-				return []byte(fmt.Sprintf("[section %s of %s]", attrValue(se, "sec"), attrValue(se, "target")))
-			case "fmt-of,rel,sec,target":
-				return []byte(fmt.Sprintf("[section %s of %s, %s]", attrValue(se, "sec"), attrValue(se, "target"), attrValue(se, "rel")))
-			default:
-				panic(fmt.Sprintf("unknown attribute signature %q in %#v", sig, fmt.Sprintf("%#v", se)))
-			}
-		default:
-			panic(fmt.Sprintf("unexpected tag %q", v))
-		}
-	}
-}
-
-var skipAnchor = map[string]bool{
-	"intro":    true,
-	"Overview": true,
-}
-
-var skipTitle = map[string]bool{
-	"Acknowledgements":            true,
-	"Change Log":                  true,
-	"Document Organization":       true,
-	"Conventions and Terminology": true,
-}
-
-func skipElement(s xml.StartElement) bool {
-	switch s.Name.Local {
-	case "artwork":
-		return true
-	case "section":
-		for _, attr := range s.Attr {
-			switch attr.Name.Local {
-			case "anchor":
-				if skipAnchor[attr.Value] || strings.HasPrefix(attr.Value, "changes.since.") {
-					return true
-				}
-			case "title":
-				if skipTitle[attr.Value] {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
-
-func readSpecCov(r io.Reader) specCoverage {
-	sc := specCoverage{
-		coverage: map[specPart]bool{},
-		d:        xml.NewDecoder(r)}
-	sc.readSection(nil)
-	return sc
-}
-
-func (sc specCoverage) addSentences(sec string, sentence string) {
-	for _, s := range parseSentences(sentence) {
-		sc.coverage[specPart{sec, s}] = false
-	}
-}
-
-func (sc specCoverage) cover(sec string, sentence string) {
-	for _, s := range parseSentences(sentence) {
-		p := specPart{sec, s}
-		if _, ok := sc.coverage[p]; !ok {
-			panic(fmt.Sprintf("Not found in spec: %q, %q", sec, s))
-		}
-		sc.coverage[specPart{sec, s}] = true
-	}
-
-}
-
-var whitespaceRx = regexp.MustCompile(`\s+`)
-
-func parseSentences(sens string) []string {
-	sens = strings.TrimSpace(sens)
-	if sens == "" {
-		return nil
-	}
-	ss := strings.Split(whitespaceRx.ReplaceAllString(sens, " "), ". ")
-	for i, s := range ss {
-		s = strings.TrimSpace(s)
-		if !strings.HasSuffix(s, ".") {
-			s += "."
-		}
-		ss[i] = s
-	}
-	return ss
-}
-
-func TestSpecParseSentences(t *testing.T) {
-	tests := []struct {
-		ss   string
-		want []string
-	}{
-		{"Sentence 1. Sentence 2.",
-			[]string{
-				"Sentence 1.",
-				"Sentence 2.",
-			}},
-		{"Sentence 1.  \nSentence 2.\tSentence 3.",
-			[]string{
-				"Sentence 1.",
-				"Sentence 2.",
-				"Sentence 3.",
-			}},
-	}
-
-	for i, tt := range tests {
-		got := parseSentences(tt.ss)
-		if !reflect.DeepEqual(got, tt.want) {
-			t.Errorf("%d: got = %q, want %q", i, got, tt.want)
-		}
-	}
-}
-
-func TestSpecCoverage(t *testing.T) {
-	if !*coverSpec {
-		t.Skip()
-	}
-
-	loadSpecOnce.Do(loadSpec)
-
-	var (
-		list     []specPart
-		cv       = defaultSpecCoverage.coverage
-		total    = len(cv)
-		complete = 0
-	)
-
-	for sp, touched := range defaultSpecCoverage.coverage {
-		if touched {
-			complete++
-		} else {
-			list = append(list, sp)
-		}
-	}
-	sort.Stable(bySpecSection(list))
-
-	if testing.Short() && len(list) > 5 {
-		list = list[:5]
-	}
-
-	for _, p := range list {
-		t.Errorf("\tSECTION %s: %s", p.section, p.sentence)
-	}
-
-	t.Logf("%d/%d (%d%%) sentences covered", complete, total, (complete/total)*100)
-}
-
-func attrSig(se xml.StartElement) string {
-	var names []string
-	for _, attr := range se.Attr {
-		if attr.Name.Local == "fmt" {
-			names = append(names, "fmt-"+attr.Value)
-		} else {
-			names = append(names, attr.Name.Local)
-		}
-	}
-	sort.Strings(names)
-	return strings.Join(names, ",")
-}
-
-func attrValue(se xml.StartElement, attr string) string {
-	for _, a := range se.Attr {
-		if a.Name.Local == attr {
-			return a.Value
-		}
-	}
-	panic("unknown attribute " + attr)
-}
-
-func TestSpecPartLess(t *testing.T) {
-	tests := []struct {
-		sec1, sec2 string
-		want       bool
-	}{
-		{"6.2.1", "6.2", false},
-		{"6.2", "6.2.1", true},
-		{"6.10", "6.10.1", true},
-		{"6.10", "6.1.1", false}, // 10, not 1
-		{"6.1", "6.1", false},    // equal, so not less
-	}
-	for _, tt := range tests {
-		got := (specPart{tt.sec1, "foo"}).Less(specPart{tt.sec2, "foo"})
-		if got != tt.want {
-			t.Errorf("Less(%q, %q) = %v; want %v", tt.sec1, tt.sec2, got, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/dstunreach.go b/installer/vendor/golang.org/x/net/icmp/dstunreach.go
deleted file mode 100644
index 75db991dfd..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/dstunreach.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-// A DstUnreach represents an ICMP destination unreachable message
-// body.
-type DstUnreach struct {
-	Data       []byte      // data, known as original datagram field
-	Extensions []Extension // extensions
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *DstUnreach) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
-	return 4 + l
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *DstUnreach) Marshal(proto int) ([]byte, error) {
-	return marshalMultipartMessageBody(proto, p.Data, p.Extensions)
-}
-
-// parseDstUnreach parses b as an ICMP destination unreachable message
-// body.
-func parseDstUnreach(proto int, b []byte) (MessageBody, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	p := &DstUnreach{}
-	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/echo.go b/installer/vendor/golang.org/x/net/icmp/echo.go
deleted file mode 100644
index e6f15efd7d..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/echo.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "encoding/binary"
-
-// An Echo represents an ICMP echo request or reply message body.
-type Echo struct {
-	ID   int    // identifier
-	Seq  int    // sequence number
-	Data []byte // data
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *Echo) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	return 4 + len(p.Data)
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *Echo) Marshal(proto int) ([]byte, error) {
-	b := make([]byte, 4+len(p.Data))
-	binary.BigEndian.PutUint16(b[:2], uint16(p.ID))
-	binary.BigEndian.PutUint16(b[2:4], uint16(p.Seq))
-	copy(b[4:], p.Data)
-	return b, nil
-}
-
-// parseEcho parses b as an ICMP echo request or reply message body.
-func parseEcho(proto int, b []byte) (MessageBody, error) {
-	bodyLen := len(b)
-	if bodyLen < 4 {
-		return nil, errMessageTooShort
-	}
-	p := &Echo{ID: int(binary.BigEndian.Uint16(b[:2])), Seq: int(binary.BigEndian.Uint16(b[2:4]))}
-	if bodyLen > 4 {
-		p.Data = make([]byte, bodyLen-4)
-		copy(p.Data, b[4:])
-	}
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/endpoint.go b/installer/vendor/golang.org/x/net/icmp/endpoint.go
deleted file mode 100644
index a68bfb010f..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/endpoint.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"net"
-	"runtime"
-	"syscall"
-	"time"
-
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-var _ net.PacketConn = &PacketConn{}
-
-// A PacketConn represents a packet network endpoint that uses either
-// ICMPv4 or ICMPv6.
-type PacketConn struct {
-	c  net.PacketConn
-	p4 *ipv4.PacketConn
-	p6 *ipv6.PacketConn
-}
-
-func (c *PacketConn) ok() bool { return c != nil && c.c != nil }
-
-// IPv4PacketConn returns the ipv4.PacketConn of c.
-// It returns nil when c is not created as the endpoint for ICMPv4.
-func (c *PacketConn) IPv4PacketConn() *ipv4.PacketConn {
-	if !c.ok() {
-		return nil
-	}
-	return c.p4
-}
-
-// IPv6PacketConn returns the ipv6.PacketConn of c.
-// It returns nil when c is not created as the endpoint for ICMPv6.
-func (c *PacketConn) IPv6PacketConn() *ipv6.PacketConn {
-	if !c.ok() {
-		return nil
-	}
-	return c.p6
-}
-
-// ReadFrom reads an ICMP message from the connection.
-func (c *PacketConn) ReadFrom(b []byte) (int, net.Addr, error) {
-	if !c.ok() {
-		return 0, nil, syscall.EINVAL
-	}
-	// Please be informed that ipv4.NewPacketConn enables
-	// IP_STRIPHDR option by default on Darwin.
-	// See golang.org/issue/9395 for further information.
-	if runtime.GOOS == "darwin" && c.p4 != nil {
-		n, _, peer, err := c.p4.ReadFrom(b)
-		return n, peer, err
-	}
-	return c.c.ReadFrom(b)
-}
-
-// WriteTo writes the ICMP message b to dst.
-// Dst must be net.UDPAddr when c is a non-privileged
-// datagram-oriented ICMP endpoint. Otherwise it must be net.IPAddr.
-func (c *PacketConn) WriteTo(b []byte, dst net.Addr) (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	return c.c.WriteTo(b, dst)
-}
-
-// Close closes the endpoint.
-func (c *PacketConn) Close() error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	return c.c.Close()
-}
-
-// LocalAddr returns the local network address.
-func (c *PacketConn) LocalAddr() net.Addr {
-	if !c.ok() {
-		return nil
-	}
-	return c.c.LocalAddr()
-}
-
-// SetDeadline sets the read and write deadlines associated with the
-// endpoint.
-func (c *PacketConn) SetDeadline(t time.Time) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	return c.c.SetDeadline(t)
-}
-
-// SetReadDeadline sets the read deadline associated with the
-// endpoint.
-func (c *PacketConn) SetReadDeadline(t time.Time) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	return c.c.SetReadDeadline(t)
-}
-
-// SetWriteDeadline sets the write deadline associated with the
-// endpoint.
-func (c *PacketConn) SetWriteDeadline(t time.Time) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	return c.c.SetWriteDeadline(t)
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/example_test.go b/installer/vendor/golang.org/x/net/icmp/example_test.go
deleted file mode 100644
index 1df4ceccdd..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/example_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp_test
-
-import (
-	"log"
-	"net"
-	"os"
-	"runtime"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/ipv6"
-)
-
-func ExamplePacketConn_nonPrivilegedPing() {
-	switch runtime.GOOS {
-	case "darwin":
-	case "linux":
-		log.Println("you may need to adjust the net.ipv4.ping_group_range kernel state")
-	default:
-		log.Println("not supported on", runtime.GOOS)
-		return
-	}
-
-	c, err := icmp.ListenPacket("udp6", "fe80::1%en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-
-	wm := icmp.Message{
-		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-		Body: &icmp.Echo{
-			ID: os.Getpid() & 0xffff, Seq: 1,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-	wb, err := wm.Marshal(nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if _, err := c.WriteTo(wb, &net.UDPAddr{IP: net.ParseIP("ff02::1"), Zone: "en0"}); err != nil {
-		log.Fatal(err)
-	}
-
-	rb := make([]byte, 1500)
-	n, peer, err := c.ReadFrom(rb)
-	if err != nil {
-		log.Fatal(err)
-	}
-	rm, err := icmp.ParseMessage(58, rb[:n])
-	if err != nil {
-		log.Fatal(err)
-	}
-	switch rm.Type {
-	case ipv6.ICMPTypeEchoReply:
-		log.Printf("got reflection from %v", peer)
-	default:
-		log.Printf("got %+v; want echo reply", rm)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/extension.go b/installer/vendor/golang.org/x/net/icmp/extension.go
deleted file mode 100644
index 402a7514b0..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/extension.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "encoding/binary"
-
-// An Extension represents an ICMP extension.
-type Extension interface {
-	// Len returns the length of ICMP extension.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
-	Len(proto int) int
-
-	// Marshal returns the binary encoding of ICMP extension.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
-	Marshal(proto int) ([]byte, error)
-}
-
-const extensionVersion = 2
-
-func validExtensionHeader(b []byte) bool {
-	v := int(b[0]&0xf0) >> 4
-	s := binary.BigEndian.Uint16(b[2:4])
-	if s != 0 {
-		s = checksum(b)
-	}
-	if v != extensionVersion || s != 0 {
-		return false
-	}
-	return true
-}
-
-// parseExtensions parses b as a list of ICMP extensions.
-// The length attribute l must be the length attribute field in
-// received icmp messages.
-//
-// It will return a list of ICMP extensions and an adjusted length
-// attribute that represents the length of the padded original
-// datagram field. Otherwise, it returns an error.
-func parseExtensions(b []byte, l int) ([]Extension, int, error) {
-	// Still a lot of non-RFC 4884 compliant implementations are
-	// out there. Set the length attribute l to 128 when it looks
-	// inappropriate for backwards compatibility.
-	//
-	// A minimal extension at least requires 8 octets; 4 octets
-	// for an extension header, and 4 octets for a single object
-	// header.
-	//
-	// See RFC 4884 for further information.
-	if 128 > l || l+8 > len(b) {
-		l = 128
-	}
-	if l+8 > len(b) {
-		return nil, -1, errNoExtension
-	}
-	if !validExtensionHeader(b[l:]) {
-		if l == 128 {
-			return nil, -1, errNoExtension
-		}
-		l = 128
-		if !validExtensionHeader(b[l:]) {
-			return nil, -1, errNoExtension
-		}
-	}
-	var exts []Extension
-	for b = b[l+4:]; len(b) >= 4; {
-		ol := int(binary.BigEndian.Uint16(b[:2]))
-		if 4 > ol || ol > len(b) {
-			break
-		}
-		switch b[2] {
-		case classMPLSLabelStack:
-			ext, err := parseMPLSLabelStack(b[:ol])
-			if err != nil {
-				return nil, -1, err
-			}
-			exts = append(exts, ext)
-		case classInterfaceInfo:
-			ext, err := parseInterfaceInfo(b[:ol])
-			if err != nil {
-				return nil, -1, err
-			}
-			exts = append(exts, ext)
-		}
-		b = b[ol:]
-	}
-	return exts, l, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/extension_test.go b/installer/vendor/golang.org/x/net/icmp/extension_test.go
deleted file mode 100644
index 0b3f7b9e15..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/extension_test.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"net"
-	"reflect"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var marshalAndParseExtensionTests = []struct {
-	proto int
-	hdr   []byte
-	obj   []byte
-	exts  []Extension
-}{
-	// MPLS label stack with no label
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x04, 0x01, 0x01,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
-			},
-		},
-	},
-	// MPLS label stack with a single label
-	{
-		proto: iana.ProtocolIPv6ICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x08, 0x01, 0x01,
-			0x03, 0xe8, 0xe9, 0xff,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
-				Labels: []MPLSLabel{
-					{
-						Label: 16014,
-						TC:    0x4,
-						S:     true,
-						TTL:   255,
-					},
-				},
-			},
-		},
-	},
-	// MPLS label stack with multiple labels
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x0c, 0x01, 0x01,
-			0x03, 0xe8, 0xde, 0xfe,
-			0x03, 0xe8, 0xe1, 0xff,
-		},
-		exts: []Extension{
-			&MPLSLabelStack{
-				Class: classMPLSLabelStack,
-				Type:  typeIncomingMPLSLabelStack,
-				Labels: []MPLSLabel{
-					{
-						Label: 16013,
-						TC:    0x7,
-						S:     false,
-						TTL:   254,
-					},
-					{
-						Label: 16014,
-						TC:    0,
-						S:     true,
-						TTL:   255,
-					},
-				},
-			},
-		},
-	},
-	// Interface information with no attribute
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x04, 0x02, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
-			},
-		},
-	},
-	// Interface information with ifIndex and name
-	{
-		proto: iana.ProtocolICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x10, 0x02, 0x0a,
-			0x00, 0x00, 0x00, 0x10,
-			0x08, byte('e'), byte('n'), byte('1'),
-			byte('0'), byte('1'), 0x00, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
-				Type:  0x0a,
-				Interface: &net.Interface{
-					Index: 16,
-					Name:  "en101",
-				},
-			},
-		},
-	},
-	// Interface information with ifIndex, IPAddr, name and MTU
-	{
-		proto: iana.ProtocolIPv6ICMP,
-		hdr: []byte{
-			0x20, 0x00, 0x00, 0x00,
-		},
-		obj: []byte{
-			0x00, 0x28, 0x02, 0x0f,
-			0x00, 0x00, 0x00, 0x0f,
-			0x00, 0x02, 0x00, 0x00,
-			0xfe, 0x80, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x00,
-			0x00, 0x00, 0x00, 0x01,
-			0x08, byte('e'), byte('n'), byte('1'),
-			byte('0'), byte('1'), 0x00, 0x00,
-			0x00, 0x00, 0x20, 0x00,
-		},
-		exts: []Extension{
-			&InterfaceInfo{
-				Class: classInterfaceInfo,
-				Type:  0x0f,
-				Interface: &net.Interface{
-					Index: 15,
-					Name:  "en101",
-					MTU:   8192,
-				},
-				Addr: &net.IPAddr{
-					IP:   net.ParseIP("fe80::1"),
-					Zone: "en101",
-				},
-			},
-		},
-	},
-}
-
-func TestMarshalAndParseExtension(t *testing.T) {
-	for i, tt := range marshalAndParseExtensionTests {
-		for j, ext := range tt.exts {
-			var err error
-			var b []byte
-			switch ext := ext.(type) {
-			case *MPLSLabelStack:
-				b, err = ext.Marshal(tt.proto)
-				if err != nil {
-					t.Errorf("#%v/%v: %v", i, j, err)
-					continue
-				}
-			case *InterfaceInfo:
-				b, err = ext.Marshal(tt.proto)
-				if err != nil {
-					t.Errorf("#%v/%v: %v", i, j, err)
-					continue
-				}
-			}
-			if !reflect.DeepEqual(b, tt.obj) {
-				t.Errorf("#%v/%v: got %#v; want %#v", i, j, b, tt.obj)
-				continue
-			}
-		}
-
-		for j, wire := range []struct {
-			data     []byte // original datagram
-			inlattr  int    // length of padded original datagram, a hint
-			outlattr int    // length of padded original datagram, a want
-			err      error
-		}{
-			{nil, 0, -1, errNoExtension},
-			{make([]byte, 127), 128, -1, errNoExtension},
-
-			{make([]byte, 128), 127, -1, errNoExtension},
-			{make([]byte, 128), 128, -1, errNoExtension},
-			{make([]byte, 128), 129, -1, errNoExtension},
-
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 127, 128, nil},
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 128, 128, nil},
-			{append(make([]byte, 128), append(tt.hdr, tt.obj...)...), 129, 128, nil},
-
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 511, -1, errNoExtension},
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 512, 512, nil},
-			{append(make([]byte, 512), append(tt.hdr, tt.obj...)...), 513, -1, errNoExtension},
-		} {
-			exts, l, err := parseExtensions(wire.data, wire.inlattr)
-			if err != wire.err {
-				t.Errorf("#%v/%v: got %v; want %v", i, j, err, wire.err)
-				continue
-			}
-			if wire.err != nil {
-				continue
-			}
-			if l != wire.outlattr {
-				t.Errorf("#%v/%v: got %v; want %v", i, j, l, wire.outlattr)
-			}
-			if !reflect.DeepEqual(exts, tt.exts) {
-				for j, ext := range exts {
-					switch ext := ext.(type) {
-					case *MPLSLabelStack:
-						want := tt.exts[j].(*MPLSLabelStack)
-						t.Errorf("#%v/%v: got %#v; want %#v", i, j, ext, want)
-					case *InterfaceInfo:
-						want := tt.exts[j].(*InterfaceInfo)
-						t.Errorf("#%v/%v: got %#v; want %#v", i, j, ext, want)
-					}
-				}
-				continue
-			}
-		}
-	}
-}
-
-var parseInterfaceNameTests = []struct {
-	b []byte
-	error
-}{
-	{[]byte{0, 'e', 'n', '0'}, errInvalidExtension},
-	{[]byte{4, 'e', 'n', '0'}, nil},
-	{[]byte{7, 'e', 'n', '0', 0xff, 0xff, 0xff, 0xff}, errInvalidExtension},
-	{[]byte{8, 'e', 'n', '0', 0xff, 0xff, 0xff}, errMessageTooShort},
-}
-
-func TestParseInterfaceName(t *testing.T) {
-	ifi := InterfaceInfo{Interface: &net.Interface{}}
-	for i, tt := range parseInterfaceNameTests {
-		if _, err := ifi.parseName(tt.b); err != tt.error {
-			t.Errorf("#%d: got %v; want %v", i, err, tt.error)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/helper.go b/installer/vendor/golang.org/x/net/icmp/helper.go
deleted file mode 100644
index 6c4e633bc9..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/helper.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"encoding/binary"
-	"unsafe"
-)
-
-var (
-	// See http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-	freebsdVersion uint32
-
-	nativeEndian binary.ByteOrder
-)
-
-func init() {
-	i := uint32(1)
-	b := (*[4]byte)(unsafe.Pointer(&i))
-	if b[0] == 1 {
-		nativeEndian = binary.LittleEndian
-	} else {
-		nativeEndian = binary.BigEndian
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/helper_posix.go b/installer/vendor/golang.org/x/net/icmp/helper_posix.go
deleted file mode 100644
index 398fd388ff..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/helper_posix.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package icmp
-
-import (
-	"net"
-	"strconv"
-	"syscall"
-)
-
-func sockaddr(family int, address string) (syscall.Sockaddr, error) {
-	switch family {
-	case syscall.AF_INET:
-		a, err := net.ResolveIPAddr("ip4", address)
-		if err != nil {
-			return nil, err
-		}
-		if len(a.IP) == 0 {
-			a.IP = net.IPv4zero
-		}
-		if a.IP = a.IP.To4(); a.IP == nil {
-			return nil, net.InvalidAddrError("non-ipv4 address")
-		}
-		sa := &syscall.SockaddrInet4{}
-		copy(sa.Addr[:], a.IP)
-		return sa, nil
-	case syscall.AF_INET6:
-		a, err := net.ResolveIPAddr("ip6", address)
-		if err != nil {
-			return nil, err
-		}
-		if len(a.IP) == 0 {
-			a.IP = net.IPv6unspecified
-		}
-		if a.IP.Equal(net.IPv4zero) {
-			a.IP = net.IPv6unspecified
-		}
-		if a.IP = a.IP.To16(); a.IP == nil || a.IP.To4() != nil {
-			return nil, net.InvalidAddrError("non-ipv6 address")
-		}
-		sa := &syscall.SockaddrInet6{ZoneId: zoneToUint32(a.Zone)}
-		copy(sa.Addr[:], a.IP)
-		return sa, nil
-	default:
-		return nil, net.InvalidAddrError("unexpected family")
-	}
-}
-
-func zoneToUint32(zone string) uint32 {
-	if zone == "" {
-		return 0
-	}
-	if ifi, err := net.InterfaceByName(zone); err == nil {
-		return uint32(ifi.Index)
-	}
-	n, err := strconv.Atoi(zone)
-	if err != nil {
-		return 0
-	}
-	return uint32(n)
-}
-
-func last(s string, b byte) int {
-	i := len(s)
-	for i--; i >= 0; i-- {
-		if s[i] == b {
-			break
-		}
-	}
-	return i
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/interface.go b/installer/vendor/golang.org/x/net/icmp/interface.go
deleted file mode 100644
index 78b5b98bf9..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/interface.go
+++ /dev/null
@@ -1,236 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"encoding/binary"
-	"net"
-	"strings"
-
-	"golang.org/x/net/internal/iana"
-)
-
-const (
-	classInterfaceInfo = 2
-
-	afiIPv4 = 1
-	afiIPv6 = 2
-)
-
-const (
-	attrMTU = 1 << iota
-	attrName
-	attrIPAddr
-	attrIfIndex
-)
-
-// An InterfaceInfo represents interface and next-hop identification.
-type InterfaceInfo struct {
-	Class     int // extension object class number
-	Type      int // extension object sub-type
-	Interface *net.Interface
-	Addr      *net.IPAddr
-}
-
-func (ifi *InterfaceInfo) nameLen() int {
-	if len(ifi.Interface.Name) > 63 {
-		return 64
-	}
-	l := 1 + len(ifi.Interface.Name)
-	return (l + 3) &^ 3
-}
-
-func (ifi *InterfaceInfo) attrsAndLen(proto int) (attrs, l int) {
-	l = 4
-	if ifi.Interface != nil && ifi.Interface.Index > 0 {
-		attrs |= attrIfIndex
-		l += 4
-		if len(ifi.Interface.Name) > 0 {
-			attrs |= attrName
-			l += ifi.nameLen()
-		}
-		if ifi.Interface.MTU > 0 {
-			attrs |= attrMTU
-			l += 4
-		}
-	}
-	if ifi.Addr != nil {
-		switch proto {
-		case iana.ProtocolICMP:
-			if ifi.Addr.IP.To4() != nil {
-				attrs |= attrIPAddr
-				l += 4 + net.IPv4len
-			}
-		case iana.ProtocolIPv6ICMP:
-			if ifi.Addr.IP.To16() != nil && ifi.Addr.IP.To4() == nil {
-				attrs |= attrIPAddr
-				l += 4 + net.IPv6len
-			}
-		}
-	}
-	return
-}
-
-// Len implements the Len method of Extension interface.
-func (ifi *InterfaceInfo) Len(proto int) int {
-	_, l := ifi.attrsAndLen(proto)
-	return l
-}
-
-// Marshal implements the Marshal method of Extension interface.
-func (ifi *InterfaceInfo) Marshal(proto int) ([]byte, error) {
-	attrs, l := ifi.attrsAndLen(proto)
-	b := make([]byte, l)
-	if err := ifi.marshal(proto, b, attrs, l); err != nil {
-		return nil, err
-	}
-	return b, nil
-}
-
-func (ifi *InterfaceInfo) marshal(proto int, b []byte, attrs, l int) error {
-	binary.BigEndian.PutUint16(b[:2], uint16(l))
-	b[2], b[3] = classInterfaceInfo, byte(ifi.Type)
-	for b = b[4:]; len(b) > 0 && attrs != 0; {
-		switch {
-		case attrs&attrIfIndex != 0:
-			b = ifi.marshalIfIndex(proto, b)
-			attrs &^= attrIfIndex
-		case attrs&attrIPAddr != 0:
-			b = ifi.marshalIPAddr(proto, b)
-			attrs &^= attrIPAddr
-		case attrs&attrName != 0:
-			b = ifi.marshalName(proto, b)
-			attrs &^= attrName
-		case attrs&attrMTU != 0:
-			b = ifi.marshalMTU(proto, b)
-			attrs &^= attrMTU
-		}
-	}
-	return nil
-}
-
-func (ifi *InterfaceInfo) marshalIfIndex(proto int, b []byte) []byte {
-	binary.BigEndian.PutUint32(b[:4], uint32(ifi.Interface.Index))
-	return b[4:]
-}
-
-func (ifi *InterfaceInfo) parseIfIndex(b []byte) ([]byte, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	ifi.Interface.Index = int(binary.BigEndian.Uint32(b[:4]))
-	return b[4:], nil
-}
-
-func (ifi *InterfaceInfo) marshalIPAddr(proto int, b []byte) []byte {
-	switch proto {
-	case iana.ProtocolICMP:
-		binary.BigEndian.PutUint16(b[:2], uint16(afiIPv4))
-		copy(b[4:4+net.IPv4len], ifi.Addr.IP.To4())
-		b = b[4+net.IPv4len:]
-	case iana.ProtocolIPv6ICMP:
-		binary.BigEndian.PutUint16(b[:2], uint16(afiIPv6))
-		copy(b[4:4+net.IPv6len], ifi.Addr.IP.To16())
-		b = b[4+net.IPv6len:]
-	}
-	return b
-}
-
-func (ifi *InterfaceInfo) parseIPAddr(b []byte) ([]byte, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	afi := int(binary.BigEndian.Uint16(b[:2]))
-	b = b[4:]
-	switch afi {
-	case afiIPv4:
-		if len(b) < net.IPv4len {
-			return nil, errMessageTooShort
-		}
-		ifi.Addr.IP = make(net.IP, net.IPv4len)
-		copy(ifi.Addr.IP, b[:net.IPv4len])
-		b = b[net.IPv4len:]
-	case afiIPv6:
-		if len(b) < net.IPv6len {
-			return nil, errMessageTooShort
-		}
-		ifi.Addr.IP = make(net.IP, net.IPv6len)
-		copy(ifi.Addr.IP, b[:net.IPv6len])
-		b = b[net.IPv6len:]
-	}
-	return b, nil
-}
-
-func (ifi *InterfaceInfo) marshalName(proto int, b []byte) []byte {
-	l := byte(ifi.nameLen())
-	b[0] = l
-	copy(b[1:], []byte(ifi.Interface.Name))
-	return b[l:]
-}
-
-func (ifi *InterfaceInfo) parseName(b []byte) ([]byte, error) {
-	if 4 > len(b) || len(b) < int(b[0]) {
-		return nil, errMessageTooShort
-	}
-	l := int(b[0])
-	if l%4 != 0 || 4 > l || l > 64 {
-		return nil, errInvalidExtension
-	}
-	var name [63]byte
-	copy(name[:], b[1:l])
-	ifi.Interface.Name = strings.Trim(string(name[:]), "\000")
-	return b[l:], nil
-}
-
-func (ifi *InterfaceInfo) marshalMTU(proto int, b []byte) []byte {
-	binary.BigEndian.PutUint32(b[:4], uint32(ifi.Interface.MTU))
-	return b[4:]
-}
-
-func (ifi *InterfaceInfo) parseMTU(b []byte) ([]byte, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	ifi.Interface.MTU = int(binary.BigEndian.Uint32(b[:4]))
-	return b[4:], nil
-}
-
-func parseInterfaceInfo(b []byte) (Extension, error) {
-	ifi := &InterfaceInfo{
-		Class: int(b[2]),
-		Type:  int(b[3]),
-	}
-	if ifi.Type&(attrIfIndex|attrName|attrMTU) != 0 {
-		ifi.Interface = &net.Interface{}
-	}
-	if ifi.Type&attrIPAddr != 0 {
-		ifi.Addr = &net.IPAddr{}
-	}
-	attrs := ifi.Type & (attrIfIndex | attrIPAddr | attrName | attrMTU)
-	for b = b[4:]; len(b) > 0 && attrs != 0; {
-		var err error
-		switch {
-		case attrs&attrIfIndex != 0:
-			b, err = ifi.parseIfIndex(b)
-			attrs &^= attrIfIndex
-		case attrs&attrIPAddr != 0:
-			b, err = ifi.parseIPAddr(b)
-			attrs &^= attrIPAddr
-		case attrs&attrName != 0:
-			b, err = ifi.parseName(b)
-			attrs &^= attrName
-		case attrs&attrMTU != 0:
-			b, err = ifi.parseMTU(b)
-			attrs &^= attrMTU
-		}
-		if err != nil {
-			return nil, err
-		}
-	}
-	if ifi.Interface != nil && ifi.Interface.Name != "" && ifi.Addr != nil && ifi.Addr.IP.To16() != nil && ifi.Addr.IP.To4() == nil {
-		ifi.Addr.Zone = ifi.Interface.Name
-	}
-	return ifi, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/ipv4.go b/installer/vendor/golang.org/x/net/icmp/ipv4.go
deleted file mode 100644
index 729ddc97c0..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/ipv4.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"encoding/binary"
-	"net"
-	"runtime"
-
-	"golang.org/x/net/ipv4"
-)
-
-// ParseIPv4Header parses b as an IPv4 header of ICMP error message
-// invoking packet, which is contained in ICMP error message.
-func ParseIPv4Header(b []byte) (*ipv4.Header, error) {
-	if len(b) < ipv4.HeaderLen {
-		return nil, errHeaderTooShort
-	}
-	hdrlen := int(b[0]&0x0f) << 2
-	if hdrlen > len(b) {
-		return nil, errBufferTooShort
-	}
-	h := &ipv4.Header{
-		Version:  int(b[0] >> 4),
-		Len:      hdrlen,
-		TOS:      int(b[1]),
-		ID:       int(binary.BigEndian.Uint16(b[4:6])),
-		FragOff:  int(binary.BigEndian.Uint16(b[6:8])),
-		TTL:      int(b[8]),
-		Protocol: int(b[9]),
-		Checksum: int(binary.BigEndian.Uint16(b[10:12])),
-		Src:      net.IPv4(b[12], b[13], b[14], b[15]),
-		Dst:      net.IPv4(b[16], b[17], b[18], b[19]),
-	}
-	switch runtime.GOOS {
-	case "darwin":
-		h.TotalLen = int(nativeEndian.Uint16(b[2:4]))
-	case "freebsd":
-		if freebsdVersion >= 1000000 {
-			h.TotalLen = int(binary.BigEndian.Uint16(b[2:4]))
-		} else {
-			h.TotalLen = int(nativeEndian.Uint16(b[2:4]))
-		}
-	default:
-		h.TotalLen = int(binary.BigEndian.Uint16(b[2:4]))
-	}
-	h.Flags = ipv4.HeaderFlags(h.FragOff&0xe000) >> 13
-	h.FragOff = h.FragOff & 0x1fff
-	if hdrlen-ipv4.HeaderLen > 0 {
-		h.Options = make([]byte, hdrlen-ipv4.HeaderLen)
-		copy(h.Options, b[ipv4.HeaderLen:])
-	}
-	return h, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/ipv4_test.go b/installer/vendor/golang.org/x/net/icmp/ipv4_test.go
deleted file mode 100644
index 47cc00d076..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/ipv4_test.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"encoding/binary"
-	"net"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/ipv4"
-)
-
-type ipv4HeaderTest struct {
-	wireHeaderFromKernel        [ipv4.HeaderLen]byte
-	wireHeaderFromTradBSDKernel [ipv4.HeaderLen]byte
-	Header                      *ipv4.Header
-}
-
-var ipv4HeaderLittleEndianTest = ipv4HeaderTest{
-	// TODO(mikio): Add platform dependent wire header formats when
-	// we support new platforms.
-	wireHeaderFromKernel: [ipv4.HeaderLen]byte{
-		0x45, 0x01, 0xbe, 0xef,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderFromTradBSDKernel: [ipv4.HeaderLen]byte{
-		0x45, 0x01, 0xef, 0xbe,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	Header: &ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TOS:      1,
-		TotalLen: 0xbeef,
-		ID:       0xcafe,
-		Flags:    ipv4.DontFragment,
-		FragOff:  1500,
-		TTL:      255,
-		Protocol: 1,
-		Checksum: 0xdead,
-		Src:      net.IPv4(172, 16, 254, 254),
-		Dst:      net.IPv4(192, 168, 0, 1),
-	},
-}
-
-func TestParseIPv4Header(t *testing.T) {
-	tt := &ipv4HeaderLittleEndianTest
-	if nativeEndian != binary.LittleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	var wh []byte
-	switch runtime.GOOS {
-	case "darwin":
-		wh = tt.wireHeaderFromTradBSDKernel[:]
-	case "freebsd":
-		if freebsdVersion >= 1000000 {
-			wh = tt.wireHeaderFromKernel[:]
-		} else {
-			wh = tt.wireHeaderFromTradBSDKernel[:]
-		}
-	default:
-		wh = tt.wireHeaderFromKernel[:]
-	}
-	h, err := ParseIPv4Header(wh)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(h, tt.Header) {
-		t.Fatalf("got %#v; want %#v", h, tt.Header)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/ipv6.go b/installer/vendor/golang.org/x/net/icmp/ipv6.go
deleted file mode 100644
index 2e8cfeb131..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/ipv6.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"net"
-
-	"golang.org/x/net/internal/iana"
-)
-
-const ipv6PseudoHeaderLen = 2*net.IPv6len + 8
-
-// IPv6PseudoHeader returns an IPv6 pseudo header for checksum
-// calculation.
-func IPv6PseudoHeader(src, dst net.IP) []byte {
-	b := make([]byte, ipv6PseudoHeaderLen)
-	copy(b, src.To16())
-	copy(b[net.IPv6len:], dst.To16())
-	b[len(b)-1] = byte(iana.ProtocolIPv6ICMP)
-	return b
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/listen_posix.go b/installer/vendor/golang.org/x/net/icmp/listen_posix.go
deleted file mode 100644
index 7fac4f9652..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/listen_posix.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package icmp
-
-import (
-	"net"
-	"os"
-	"runtime"
-	"syscall"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-const sysIP_STRIPHDR = 0x17 // for now only darwin supports this option
-
-// ListenPacket listens for incoming ICMP packets addressed to
-// address. See net.Dial for the syntax of address.
-//
-// For non-privileged datagram-oriented ICMP endpoints, network must
-// be "udp4" or "udp6". The endpoint allows to read, write a few
-// limited ICMP messages such as echo request and echo reply.
-// Currently only Darwin and Linux support this.
-//
-// Examples:
-//	ListenPacket("udp4", "192.168.0.1")
-//	ListenPacket("udp4", "0.0.0.0")
-//	ListenPacket("udp6", "fe80::1%en0")
-//	ListenPacket("udp6", "::")
-//
-// For privileged raw ICMP endpoints, network must be "ip4" or "ip6"
-// followed by a colon and an ICMP protocol number or name.
-//
-// Examples:
-//	ListenPacket("ip4:icmp", "192.168.0.1")
-//	ListenPacket("ip4:1", "0.0.0.0")
-//	ListenPacket("ip6:ipv6-icmp", "fe80::1%en0")
-//	ListenPacket("ip6:58", "::")
-func ListenPacket(network, address string) (*PacketConn, error) {
-	var family, proto int
-	switch network {
-	case "udp4":
-		family, proto = syscall.AF_INET, iana.ProtocolICMP
-	case "udp6":
-		family, proto = syscall.AF_INET6, iana.ProtocolIPv6ICMP
-	default:
-		i := last(network, ':')
-		switch network[:i] {
-		case "ip4":
-			proto = iana.ProtocolICMP
-		case "ip6":
-			proto = iana.ProtocolIPv6ICMP
-		}
-	}
-	var cerr error
-	var c net.PacketConn
-	switch family {
-	case syscall.AF_INET, syscall.AF_INET6:
-		s, err := syscall.Socket(family, syscall.SOCK_DGRAM, proto)
-		if err != nil {
-			return nil, os.NewSyscallError("socket", err)
-		}
-		if runtime.GOOS == "darwin" && family == syscall.AF_INET {
-			if err := syscall.SetsockoptInt(s, iana.ProtocolIP, sysIP_STRIPHDR, 1); err != nil {
-				syscall.Close(s)
-				return nil, os.NewSyscallError("setsockopt", err)
-			}
-		}
-		sa, err := sockaddr(family, address)
-		if err != nil {
-			syscall.Close(s)
-			return nil, err
-		}
-		if err := syscall.Bind(s, sa); err != nil {
-			syscall.Close(s)
-			return nil, os.NewSyscallError("bind", err)
-		}
-		f := os.NewFile(uintptr(s), "datagram-oriented icmp")
-		c, cerr = net.FilePacketConn(f)
-		f.Close()
-	default:
-		c, cerr = net.ListenPacket(network, address)
-	}
-	if cerr != nil {
-		return nil, cerr
-	}
-	switch proto {
-	case iana.ProtocolICMP:
-		return &PacketConn{c: c, p4: ipv4.NewPacketConn(c)}, nil
-	case iana.ProtocolIPv6ICMP:
-		return &PacketConn{c: c, p6: ipv6.NewPacketConn(c)}, nil
-	default:
-		return &PacketConn{c: c}, nil
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/listen_stub.go b/installer/vendor/golang.org/x/net/icmp/listen_stub.go
deleted file mode 100644
index 668728d17e..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/listen_stub.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package icmp
-
-// ListenPacket listens for incoming ICMP packets addressed to
-// address. See net.Dial for the syntax of address.
-//
-// For non-privileged datagram-oriented ICMP endpoints, network must
-// be "udp4" or "udp6". The endpoint allows to read, write a few
-// limited ICMP messages such as echo request and echo reply.
-// Currently only Darwin and Linux support this.
-//
-// Examples:
-//	ListenPacket("udp4", "192.168.0.1")
-//	ListenPacket("udp4", "0.0.0.0")
-//	ListenPacket("udp6", "fe80::1%en0")
-//	ListenPacket("udp6", "::")
-//
-// For privileged raw ICMP endpoints, network must be "ip4" or "ip6"
-// followed by a colon and an ICMP protocol number or name.
-//
-// Examples:
-//	ListenPacket("ip4:icmp", "192.168.0.1")
-//	ListenPacket("ip4:1", "0.0.0.0")
-//	ListenPacket("ip6:ipv6-icmp", "fe80::1%en0")
-//	ListenPacket("ip6:58", "::")
-func ListenPacket(network, address string) (*PacketConn, error) {
-	return nil, errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/message.go b/installer/vendor/golang.org/x/net/icmp/message.go
deleted file mode 100644
index 81140b0df6..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/message.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package icmp provides basic functions for the manipulation of
-// messages used in the Internet Control Message Protocols,
-// ICMPv4 and ICMPv6.
-//
-// ICMPv4 and ICMPv6 are defined in RFC 792 and RFC 4443.
-// Multi-part message support for ICMP is defined in RFC 4884.
-// ICMP extensions for MPLS are defined in RFC 4950.
-// ICMP extensions for interface and next-hop identification are
-// defined in RFC 5837.
-package icmp // import "golang.org/x/net/icmp"
-
-import (
-	"encoding/binary"
-	"errors"
-	"net"
-	"syscall"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
-
-var (
-	errMessageTooShort  = errors.New("message too short")
-	errHeaderTooShort   = errors.New("header too short")
-	errBufferTooShort   = errors.New("buffer too short")
-	errOpNoSupport      = errors.New("operation not supported")
-	errNoExtension      = errors.New("no extension")
-	errInvalidExtension = errors.New("invalid extension")
-)
-
-func checksum(b []byte) uint16 {
-	csumcv := len(b) - 1 // checksum coverage
-	s := uint32(0)
-	for i := 0; i < csumcv; i += 2 {
-		s += uint32(b[i+1])<<8 | uint32(b[i])
-	}
-	if csumcv&1 == 0 {
-		s += uint32(b[csumcv])
-	}
-	s = s>>16 + s&0xffff
-	s = s + s>>16
-	return ^uint16(s)
-}
-
-// A Type represents an ICMP message type.
-type Type interface {
-	Protocol() int
-}
-
-// A Message represents an ICMP message.
-type Message struct {
-	Type     Type        // type, either ipv4.ICMPType or ipv6.ICMPType
-	Code     int         // code
-	Checksum int         // checksum
-	Body     MessageBody // body
-}
-
-// Marshal returns the binary encoding of the ICMP message m.
-//
-// For an ICMPv4 message, the returned message always contains the
-// calculated checksum field.
-//
-// For an ICMPv6 message, the returned message contains the calculated
-// checksum field when psh is not nil, otherwise the kernel will
-// compute the checksum field during the message transmission.
-// When psh is not nil, it must be the pseudo header for IPv6.
-func (m *Message) Marshal(psh []byte) ([]byte, error) {
-	var mtype int
-	switch typ := m.Type.(type) {
-	case ipv4.ICMPType:
-		mtype = int(typ)
-	case ipv6.ICMPType:
-		mtype = int(typ)
-	default:
-		return nil, syscall.EINVAL
-	}
-	b := []byte{byte(mtype), byte(m.Code), 0, 0}
-	if m.Type.Protocol() == iana.ProtocolIPv6ICMP && psh != nil {
-		b = append(psh, b...)
-	}
-	if m.Body != nil && m.Body.Len(m.Type.Protocol()) != 0 {
-		mb, err := m.Body.Marshal(m.Type.Protocol())
-		if err != nil {
-			return nil, err
-		}
-		b = append(b, mb...)
-	}
-	if m.Type.Protocol() == iana.ProtocolIPv6ICMP {
-		if psh == nil { // cannot calculate checksum here
-			return b, nil
-		}
-		off, l := 2*net.IPv6len, len(b)-len(psh)
-		binary.BigEndian.PutUint32(b[off:off+4], uint32(l))
-	}
-	s := checksum(b)
-	// Place checksum back in header; using ^= avoids the
-	// assumption the checksum bytes are zero.
-	b[len(psh)+2] ^= byte(s)
-	b[len(psh)+3] ^= byte(s >> 8)
-	return b[len(psh):], nil
-}
-
-var parseFns = map[Type]func(int, []byte) (MessageBody, error){
-	ipv4.ICMPTypeDestinationUnreachable: parseDstUnreach,
-	ipv4.ICMPTypeTimeExceeded:           parseTimeExceeded,
-	ipv4.ICMPTypeParameterProblem:       parseParamProb,
-
-	ipv4.ICMPTypeEcho:      parseEcho,
-	ipv4.ICMPTypeEchoReply: parseEcho,
-
-	ipv6.ICMPTypeDestinationUnreachable: parseDstUnreach,
-	ipv6.ICMPTypePacketTooBig:           parsePacketTooBig,
-	ipv6.ICMPTypeTimeExceeded:           parseTimeExceeded,
-	ipv6.ICMPTypeParameterProblem:       parseParamProb,
-
-	ipv6.ICMPTypeEchoRequest: parseEcho,
-	ipv6.ICMPTypeEchoReply:   parseEcho,
-}
-
-// ParseMessage parses b as an ICMP message.
-// Proto must be either the ICMPv4 or ICMPv6 protocol number.
-func ParseMessage(proto int, b []byte) (*Message, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	var err error
-	m := &Message{Code: int(b[1]), Checksum: int(binary.BigEndian.Uint16(b[2:4]))}
-	switch proto {
-	case iana.ProtocolICMP:
-		m.Type = ipv4.ICMPType(b[0])
-	case iana.ProtocolIPv6ICMP:
-		m.Type = ipv6.ICMPType(b[0])
-	default:
-		return nil, syscall.EINVAL
-	}
-	if fn, ok := parseFns[m.Type]; !ok {
-		m.Body, err = parseDefaultMessageBody(proto, b[4:])
-	} else {
-		m.Body, err = fn(proto, b[4:])
-	}
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/message_test.go b/installer/vendor/golang.org/x/net/icmp/message_test.go
deleted file mode 100644
index 5d2605f8d1..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/message_test.go
+++ /dev/null
@@ -1,134 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp_test
-
-import (
-	"net"
-	"reflect"
-	"testing"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-var marshalAndParseMessageForIPv4Tests = []icmp.Message{
-	{
-		Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeEcho, Code: 0,
-		Body: &icmp.Echo{
-			ID: 1, Seq: 2,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	},
-	{
-		Type: ipv4.ICMPTypePhoturis,
-		Body: &icmp.DefaultMessageBody{
-			Data: []byte{0x80, 0x40, 0x20, 0x10},
-		},
-	},
-}
-
-func TestMarshalAndParseMessageForIPv4(t *testing.T) {
-	for i, tt := range marshalAndParseMessageForIPv4Tests {
-		b, err := tt.Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if m.Type != tt.Type || m.Code != tt.Code {
-			t.Errorf("#%v: got %v; want %v", i, m, &tt)
-		}
-		if !reflect.DeepEqual(m.Body, tt.Body) {
-			t.Errorf("#%v: got %v; want %v", i, m.Body, tt.Body)
-		}
-	}
-}
-
-var marshalAndParseMessageForIPv6Tests = []icmp.Message{
-	{
-		Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypePacketTooBig, Code: 0,
-		Body: &icmp.PacketTooBig{
-			MTU:  1<<16 - 1,
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-		Body: &icmp.Echo{
-			ID: 1, Seq: 2,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeDuplicateAddressConfirmation,
-		Body: &icmp.DefaultMessageBody{
-			Data: []byte{0x80, 0x40, 0x20, 0x10},
-		},
-	},
-}
-
-func TestMarshalAndParseMessageForIPv6(t *testing.T) {
-	pshicmp := icmp.IPv6PseudoHeader(net.ParseIP("fe80::1"), net.ParseIP("ff02::1"))
-	for i, tt := range marshalAndParseMessageForIPv6Tests {
-		for _, psh := range [][]byte{pshicmp, nil} {
-			b, err := tt.Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, b)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if m.Type != tt.Type || m.Code != tt.Code {
-				t.Errorf("#%v: got %v; want %v", i, m, &tt)
-			}
-			if !reflect.DeepEqual(m.Body, tt.Body) {
-				t.Errorf("#%v: got %v; want %v", i, m.Body, tt.Body)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/messagebody.go b/installer/vendor/golang.org/x/net/icmp/messagebody.go
deleted file mode 100644
index 2463730ae8..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/messagebody.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-// A MessageBody represents an ICMP message body.
-type MessageBody interface {
-	// Len returns the length of ICMP message body.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
-	Len(proto int) int
-
-	// Marshal returns the binary encoding of ICMP message body.
-	// Proto must be either the ICMPv4 or ICMPv6 protocol number.
-	Marshal(proto int) ([]byte, error)
-}
-
-// A DefaultMessageBody represents the default message body.
-type DefaultMessageBody struct {
-	Data []byte // data
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *DefaultMessageBody) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	return len(p.Data)
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *DefaultMessageBody) Marshal(proto int) ([]byte, error) {
-	return p.Data, nil
-}
-
-// parseDefaultMessageBody parses b as an ICMP message body.
-func parseDefaultMessageBody(proto int, b []byte) (MessageBody, error) {
-	p := &DefaultMessageBody{Data: make([]byte, len(b))}
-	copy(p.Data, b)
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/mpls.go b/installer/vendor/golang.org/x/net/icmp/mpls.go
deleted file mode 100644
index c314917488..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/mpls.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "encoding/binary"
-
-// A MPLSLabel represents a MPLS label stack entry.
-type MPLSLabel struct {
-	Label int  // label value
-	TC    int  // traffic class; formerly experimental use
-	S     bool // bottom of stack
-	TTL   int  // time to live
-}
-
-const (
-	classMPLSLabelStack        = 1
-	typeIncomingMPLSLabelStack = 1
-)
-
-// A MPLSLabelStack represents a MPLS label stack.
-type MPLSLabelStack struct {
-	Class  int // extension object class number
-	Type   int // extension object sub-type
-	Labels []MPLSLabel
-}
-
-// Len implements the Len method of Extension interface.
-func (ls *MPLSLabelStack) Len(proto int) int {
-	return 4 + (4 * len(ls.Labels))
-}
-
-// Marshal implements the Marshal method of Extension interface.
-func (ls *MPLSLabelStack) Marshal(proto int) ([]byte, error) {
-	b := make([]byte, ls.Len(proto))
-	if err := ls.marshal(proto, b); err != nil {
-		return nil, err
-	}
-	return b, nil
-}
-
-func (ls *MPLSLabelStack) marshal(proto int, b []byte) error {
-	l := ls.Len(proto)
-	binary.BigEndian.PutUint16(b[:2], uint16(l))
-	b[2], b[3] = classMPLSLabelStack, typeIncomingMPLSLabelStack
-	off := 4
-	for _, ll := range ls.Labels {
-		b[off], b[off+1], b[off+2] = byte(ll.Label>>12), byte(ll.Label>>4&0xff), byte(ll.Label<<4&0xf0)
-		b[off+2] |= byte(ll.TC << 1 & 0x0e)
-		if ll.S {
-			b[off+2] |= 0x1
-		}
-		b[off+3] = byte(ll.TTL)
-		off += 4
-	}
-	return nil
-}
-
-func parseMPLSLabelStack(b []byte) (Extension, error) {
-	ls := &MPLSLabelStack{
-		Class: int(b[2]),
-		Type:  int(b[3]),
-	}
-	for b = b[4:]; len(b) >= 4; b = b[4:] {
-		ll := MPLSLabel{
-			Label: int(b[0])<<12 | int(b[1])<<4 | int(b[2])>>4,
-			TC:    int(b[2]&0x0e) >> 1,
-			TTL:   int(b[3]),
-		}
-		if b[2]&0x1 != 0 {
-			ll.S = true
-		}
-		ls.Labels = append(ls.Labels, ll)
-	}
-	return ls, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/multipart.go b/installer/vendor/golang.org/x/net/icmp/multipart.go
deleted file mode 100644
index f271356606..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/multipart.go
+++ /dev/null
@@ -1,109 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "golang.org/x/net/internal/iana"
-
-// multipartMessageBodyDataLen takes b as an original datagram and
-// exts as extensions, and returns a required length for message body
-// and a required length for a padded original datagram in wire
-// format.
-func multipartMessageBodyDataLen(proto int, b []byte, exts []Extension) (bodyLen, dataLen int) {
-	for _, ext := range exts {
-		bodyLen += ext.Len(proto)
-	}
-	if bodyLen > 0 {
-		dataLen = multipartMessageOrigDatagramLen(proto, b)
-		bodyLen += 4 // length of extension header
-	} else {
-		dataLen = len(b)
-	}
-	bodyLen += dataLen
-	return bodyLen, dataLen
-}
-
-// multipartMessageOrigDatagramLen takes b as an original datagram,
-// and returns a required length for a padded orignal datagram in wire
-// format.
-func multipartMessageOrigDatagramLen(proto int, b []byte) int {
-	roundup := func(b []byte, align int) int {
-		// According to RFC 4884, the padded original datagram
-		// field must contain at least 128 octets.
-		if len(b) < 128 {
-			return 128
-		}
-		r := len(b)
-		return (r + align - 1) & ^(align - 1)
-	}
-	switch proto {
-	case iana.ProtocolICMP:
-		return roundup(b, 4)
-	case iana.ProtocolIPv6ICMP:
-		return roundup(b, 8)
-	default:
-		return len(b)
-	}
-}
-
-// marshalMultipartMessageBody takes data as an original datagram and
-// exts as extesnsions, and returns a binary encoding of message body.
-// It can be used for non-multipart message bodies when exts is nil.
-func marshalMultipartMessageBody(proto int, data []byte, exts []Extension) ([]byte, error) {
-	bodyLen, dataLen := multipartMessageBodyDataLen(proto, data, exts)
-	b := make([]byte, 4+bodyLen)
-	copy(b[4:], data)
-	off := dataLen + 4
-	if len(exts) > 0 {
-		b[dataLen+4] = byte(extensionVersion << 4)
-		off += 4 // length of object header
-		for _, ext := range exts {
-			switch ext := ext.(type) {
-			case *MPLSLabelStack:
-				if err := ext.marshal(proto, b[off:]); err != nil {
-					return nil, err
-				}
-				off += ext.Len(proto)
-			case *InterfaceInfo:
-				attrs, l := ext.attrsAndLen(proto)
-				if err := ext.marshal(proto, b[off:], attrs, l); err != nil {
-					return nil, err
-				}
-				off += ext.Len(proto)
-			}
-		}
-		s := checksum(b[dataLen+4:])
-		b[dataLen+4+2] ^= byte(s)
-		b[dataLen+4+3] ^= byte(s >> 8)
-		switch proto {
-		case iana.ProtocolICMP:
-			b[1] = byte(dataLen / 4)
-		case iana.ProtocolIPv6ICMP:
-			b[0] = byte(dataLen / 8)
-		}
-	}
-	return b, nil
-}
-
-// parseMultipartMessageBody parses b as either a non-multipart
-// message body or a multipart message body.
-func parseMultipartMessageBody(proto int, b []byte) ([]byte, []Extension, error) {
-	var l int
-	switch proto {
-	case iana.ProtocolICMP:
-		l = 4 * int(b[1])
-	case iana.ProtocolIPv6ICMP:
-		l = 8 * int(b[0])
-	}
-	if len(b) == 4 {
-		return nil, nil, nil
-	}
-	exts, l, err := parseExtensions(b[4:], l)
-	if err != nil {
-		l = len(b) - 4
-	}
-	data := make([]byte, l)
-	copy(data, b[4:])
-	return data, exts, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/multipart_test.go b/installer/vendor/golang.org/x/net/icmp/multipart_test.go
deleted file mode 100644
index 966ccb8da1..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/multipart_test.go
+++ /dev/null
@@ -1,442 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp_test
-
-import (
-	"fmt"
-	"net"
-	"reflect"
-	"testing"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-var marshalAndParseMultipartMessageForIPv4Tests = []icmp.Message{
-	{
-		Type: ipv4.ICMPTypeDestinationUnreachable, Code: 15,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-			},
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-			},
-		},
-	},
-	{
-		Type: ipv4.ICMPTypeParameterProblem, Code: 2,
-		Body: &icmp.ParamProb{
-			Pointer: 8,
-			Data:    []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 1).To4(),
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x2f,
-					Interface: &net.Interface{
-						Index: 16,
-						Name:  "en102",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP: net.IPv4(192, 168, 0, 2).To4(),
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestMarshalAndParseMultipartMessageForIPv4(t *testing.T) {
-	for i, tt := range marshalAndParseMultipartMessageForIPv4Tests {
-		b, err := tt.Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if b[5] != 32 {
-			t.Errorf("#%v: got %v; want 32", i, b[5])
-		}
-		m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if m.Type != tt.Type || m.Code != tt.Code {
-			t.Errorf("#%v: got %v; want %v", i, m, &tt)
-		}
-		switch m.Type {
-		case ipv4.ICMPTypeDestinationUnreachable:
-			got, want := m.Body.(*icmp.DstUnreach), tt.Body.(*icmp.DstUnreach)
-			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-			}
-			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-			}
-		case ipv4.ICMPTypeTimeExceeded:
-			got, want := m.Body.(*icmp.TimeExceeded), tt.Body.(*icmp.TimeExceeded)
-			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-			}
-			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-			}
-		case ipv4.ICMPTypeParameterProblem:
-			got, want := m.Body.(*icmp.ParamProb), tt.Body.(*icmp.ParamProb)
-			if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-				t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-			}
-			if len(got.Data) != 128 {
-				t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-			}
-		}
-	}
-}
-
-var marshalAndParseMultipartMessageForIPv6Tests = []icmp.Message{
-	{
-		Type: ipv6.ICMPTypeDestinationUnreachable, Code: 6,
-		Body: &icmp.DstUnreach{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en101",
-					},
-				},
-			},
-		},
-	},
-	{
-		Type: ipv6.ICMPTypeTimeExceeded, Code: 1,
-		Body: &icmp.TimeExceeded{
-			Data: []byte("ERROR-INVOKING-PACKET"),
-			Extensions: []icmp.Extension{
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x0f,
-					Interface: &net.Interface{
-						Index: 15,
-						Name:  "en101",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en101",
-					},
-				},
-				&icmp.MPLSLabelStack{
-					Class: 1,
-					Type:  1,
-					Labels: []icmp.MPLSLabel{
-						{
-							Label: 16014,
-							TC:    0x4,
-							S:     true,
-							TTL:   255,
-						},
-					},
-				},
-				&icmp.InterfaceInfo{
-					Class: 2,
-					Type:  0x2f,
-					Interface: &net.Interface{
-						Index: 16,
-						Name:  "en102",
-						MTU:   8192,
-					},
-					Addr: &net.IPAddr{
-						IP:   net.ParseIP("fe80::1"),
-						Zone: "en102",
-					},
-				},
-			},
-		},
-	},
-}
-
-func TestMarshalAndParseMultipartMessageForIPv6(t *testing.T) {
-	pshicmp := icmp.IPv6PseudoHeader(net.ParseIP("fe80::1"), net.ParseIP("ff02::1"))
-	for i, tt := range marshalAndParseMultipartMessageForIPv6Tests {
-		for _, psh := range [][]byte{pshicmp, nil} {
-			b, err := tt.Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if b[4] != 16 {
-				t.Errorf("#%v: got %v; want 16", i, b[4])
-			}
-			m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, b)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if m.Type != tt.Type || m.Code != tt.Code {
-				t.Errorf("#%v: got %v; want %v", i, m, &tt)
-			}
-			switch m.Type {
-			case ipv6.ICMPTypeDestinationUnreachable:
-				got, want := m.Body.(*icmp.DstUnreach), tt.Body.(*icmp.DstUnreach)
-				if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-					t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-				}
-				if len(got.Data) != 128 {
-					t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-				}
-			case ipv6.ICMPTypeTimeExceeded:
-				got, want := m.Body.(*icmp.TimeExceeded), tt.Body.(*icmp.TimeExceeded)
-				if !reflect.DeepEqual(got.Extensions, want.Extensions) {
-					t.Error(dumpExtensions(i, got.Extensions, want.Extensions))
-				}
-				if len(got.Data) != 128 {
-					t.Errorf("#%v: got %v; want 128", i, len(got.Data))
-				}
-			}
-		}
-	}
-}
-
-func dumpExtensions(i int, gotExts, wantExts []icmp.Extension) string {
-	var s string
-	for j, got := range gotExts {
-		switch got := got.(type) {
-		case *icmp.MPLSLabelStack:
-			want := wantExts[j].(*icmp.MPLSLabelStack)
-			if !reflect.DeepEqual(got, want) {
-				s += fmt.Sprintf("#%v/%v: got %#v; want %#v\n", i, j, got, want)
-			}
-		case *icmp.InterfaceInfo:
-			want := wantExts[j].(*icmp.InterfaceInfo)
-			if !reflect.DeepEqual(got, want) {
-				s += fmt.Sprintf("#%v/%v: got %#v, %#v, %#v; want %#v, %#v, %#v\n", i, j, got, got.Interface, got.Addr, want, want.Interface, want.Addr)
-			}
-		}
-	}
-	return s[:len(s)-1]
-}
-
-var multipartMessageBodyLenTests = []struct {
-	proto int
-	in    icmp.MessageBody
-	out   int
-}{
-	{
-		iana.ProtocolICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, ipv4.HeaderLen),
-		},
-		4 + ipv4.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.TimeExceeded{
-			Data: make([]byte, ipv4.HeaderLen),
-		},
-		4 + ipv4.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv4.HeaderLen),
-		},
-		4 + ipv4.HeaderLen, // [pointer, unused] and original datagram
-	},
-
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv4.HeaderLen),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload, original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, 128),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 128, // [pointer, length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, 129),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 132, // [pointer, length, unused], extension header, object header, object payload and original datagram
-	},
-
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, ipv6.HeaderLen),
-		},
-		4 + ipv6.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.PacketTooBig{
-			Data: make([]byte, ipv6.HeaderLen),
-		},
-		4 + ipv6.HeaderLen, // mtu and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.TimeExceeded{
-			Data: make([]byte, ipv6.HeaderLen),
-		},
-		4 + ipv6.HeaderLen, // unused and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.ParamProb{
-			Data: make([]byte, ipv6.HeaderLen),
-		},
-		4 + ipv6.HeaderLen, // pointer and original datagram
-	},
-
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 127),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 128),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 128, // [length, unused], extension header, object header, object payload and original datagram
-	},
-	{
-		iana.ProtocolIPv6ICMP,
-		&icmp.DstUnreach{
-			Data: make([]byte, 129),
-			Extensions: []icmp.Extension{
-				&icmp.MPLSLabelStack{},
-			},
-		},
-		4 + 4 + 4 + 0 + 136, // [length, unused], extension header, object header, object payload and original datagram
-	},
-}
-
-func TestMultipartMessageBodyLen(t *testing.T) {
-	for i, tt := range multipartMessageBodyLenTests {
-		if out := tt.in.Len(tt.proto); out != tt.out {
-			t.Errorf("#%d: got %d; want %d", i, out, tt.out)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/packettoobig.go b/installer/vendor/golang.org/x/net/icmp/packettoobig.go
deleted file mode 100644
index a1c9df7bff..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/packettoobig.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "encoding/binary"
-
-// A PacketTooBig represents an ICMP packet too big message body.
-type PacketTooBig struct {
-	MTU  int    // maximum transmission unit of the nexthop link
-	Data []byte // data, known as original datagram field
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *PacketTooBig) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	return 4 + len(p.Data)
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *PacketTooBig) Marshal(proto int) ([]byte, error) {
-	b := make([]byte, 4+len(p.Data))
-	binary.BigEndian.PutUint32(b[:4], uint32(p.MTU))
-	copy(b[4:], p.Data)
-	return b, nil
-}
-
-// parsePacketTooBig parses b as an ICMP packet too big message body.
-func parsePacketTooBig(proto int, b []byte) (MessageBody, error) {
-	bodyLen := len(b)
-	if bodyLen < 4 {
-		return nil, errMessageTooShort
-	}
-	p := &PacketTooBig{MTU: int(binary.BigEndian.Uint32(b[:4]))}
-	if bodyLen > 4 {
-		p.Data = make([]byte, bodyLen-4)
-		copy(p.Data, b[4:])
-	}
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/paramprob.go b/installer/vendor/golang.org/x/net/icmp/paramprob.go
deleted file mode 100644
index 0a2548daae..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/paramprob.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import (
-	"encoding/binary"
-	"golang.org/x/net/internal/iana"
-)
-
-// A ParamProb represents an ICMP parameter problem message body.
-type ParamProb struct {
-	Pointer    uintptr     // offset within the data where the error was detected
-	Data       []byte      // data, known as original datagram field
-	Extensions []Extension // extensions
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *ParamProb) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
-	return 4 + l
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *ParamProb) Marshal(proto int) ([]byte, error) {
-	if proto == iana.ProtocolIPv6ICMP {
-		b := make([]byte, p.Len(proto))
-		binary.BigEndian.PutUint32(b[:4], uint32(p.Pointer))
-		copy(b[4:], p.Data)
-		return b, nil
-	}
-	b, err := marshalMultipartMessageBody(proto, p.Data, p.Extensions)
-	if err != nil {
-		return nil, err
-	}
-	b[0] = byte(p.Pointer)
-	return b, nil
-}
-
-// parseParamProb parses b as an ICMP parameter problem message body.
-func parseParamProb(proto int, b []byte) (MessageBody, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	p := &ParamProb{}
-	if proto == iana.ProtocolIPv6ICMP {
-		p.Pointer = uintptr(binary.BigEndian.Uint32(b[:4]))
-		p.Data = make([]byte, len(b)-4)
-		copy(p.Data, b[4:])
-		return p, nil
-	}
-	p.Pointer = uintptr(b[0])
-	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/ping_test.go b/installer/vendor/golang.org/x/net/icmp/ping_test.go
deleted file mode 100644
index 3171dad118..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/ping_test.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp_test
-
-import (
-	"errors"
-	"fmt"
-	"net"
-	"os"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-	"golang.org/x/net/ipv6"
-)
-
-func googleAddr(c *icmp.PacketConn, protocol int) (net.Addr, error) {
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		return nil, err
-	}
-	netaddr := func(ip net.IP) (net.Addr, error) {
-		switch c.LocalAddr().(type) {
-		case *net.UDPAddr:
-			return &net.UDPAddr{IP: ip}, nil
-		case *net.IPAddr:
-			return &net.IPAddr{IP: ip}, nil
-		default:
-			return nil, errors.New("neither UDPAddr nor IPAddr")
-		}
-	}
-	for _, ip := range ips {
-		switch protocol {
-		case iana.ProtocolICMP:
-			if ip.To4() != nil {
-				return netaddr(ip)
-			}
-		case iana.ProtocolIPv6ICMP:
-			if ip.To16() != nil && ip.To4() == nil {
-				return netaddr(ip)
-			}
-		}
-	}
-	return nil, errors.New("no A or AAAA record")
-}
-
-type pingTest struct {
-	network, address string
-	protocol         int
-	mtype            icmp.Type
-}
-
-var nonPrivilegedPingTests = []pingTest{
-	{"udp4", "0.0.0.0", iana.ProtocolICMP, ipv4.ICMPTypeEcho},
-
-	{"udp6", "::", iana.ProtocolIPv6ICMP, ipv6.ICMPTypeEchoRequest},
-}
-
-func TestNonPrivilegedPing(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	switch runtime.GOOS {
-	case "darwin":
-	case "linux":
-		t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	for i, tt := range nonPrivilegedPingTests {
-		if err := doPing(tt, i); err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-var privilegedPingTests = []pingTest{
-	{"ip4:icmp", "0.0.0.0", iana.ProtocolICMP, ipv4.ICMPTypeEcho},
-
-	{"ip6:ipv6-icmp", "::", iana.ProtocolIPv6ICMP, ipv6.ICMPTypeEchoRequest},
-}
-
-func TestPrivilegedPing(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	for i, tt := range privilegedPingTests {
-		if err := doPing(tt, i); err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func doPing(tt pingTest, seq int) error {
-	c, err := icmp.ListenPacket(tt.network, tt.address)
-	if err != nil {
-		return err
-	}
-	defer c.Close()
-
-	dst, err := googleAddr(c, tt.protocol)
-	if err != nil {
-		return err
-	}
-
-	if tt.network != "udp6" && tt.protocol == iana.ProtocolIPv6ICMP {
-		var f ipv6.ICMPFilter
-		f.SetAll(true)
-		f.Accept(ipv6.ICMPTypeDestinationUnreachable)
-		f.Accept(ipv6.ICMPTypePacketTooBig)
-		f.Accept(ipv6.ICMPTypeTimeExceeded)
-		f.Accept(ipv6.ICMPTypeParameterProblem)
-		f.Accept(ipv6.ICMPTypeEchoReply)
-		if err := c.IPv6PacketConn().SetICMPFilter(&f); err != nil {
-			return err
-		}
-	}
-
-	wm := icmp.Message{
-		Type: tt.mtype, Code: 0,
-		Body: &icmp.Echo{
-			ID: os.Getpid() & 0xffff, Seq: 1 << uint(seq),
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-	wb, err := wm.Marshal(nil)
-	if err != nil {
-		return err
-	}
-	if n, err := c.WriteTo(wb, dst); err != nil {
-		return err
-	} else if n != len(wb) {
-		return fmt.Errorf("got %v; want %v", n, len(wb))
-	}
-
-	rb := make([]byte, 1500)
-	if err := c.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-		return err
-	}
-	n, peer, err := c.ReadFrom(rb)
-	if err != nil {
-		return err
-	}
-	rm, err := icmp.ParseMessage(tt.protocol, rb[:n])
-	if err != nil {
-		return err
-	}
-	switch rm.Type {
-	case ipv4.ICMPTypeEchoReply, ipv6.ICMPTypeEchoReply:
-		return nil
-	default:
-		return fmt.Errorf("got %+v from %v; want echo reply", rm, peer)
-	}
-}
-
-func TestConcurrentNonPrivilegedListenPacket(t *testing.T) {
-	if testing.Short() {
-		t.Skip("avoid external network")
-	}
-	switch runtime.GOOS {
-	case "darwin":
-	case "linux":
-		t.Log("you may need to adjust the net.ipv4.ping_group_range kernel state")
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	network, address := "udp4", "127.0.0.1"
-	if !nettest.SupportsIPv4() {
-		network, address = "udp6", "::1"
-	}
-	const N = 1000
-	var wg sync.WaitGroup
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go func() {
-			defer wg.Done()
-			c, err := icmp.ListenPacket(network, address)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			c.Close()
-		}()
-	}
-	wg.Wait()
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/sys_freebsd.go b/installer/vendor/golang.org/x/net/icmp/sys_freebsd.go
deleted file mode 100644
index c75f3ddaa7..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/sys_freebsd.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-import "syscall"
-
-func init() {
-	freebsdVersion, _ = syscall.SysctlUint32("kern.osreldate")
-}
diff --git a/installer/vendor/golang.org/x/net/icmp/timeexceeded.go b/installer/vendor/golang.org/x/net/icmp/timeexceeded.go
deleted file mode 100644
index 344e15848d..0000000000
--- a/installer/vendor/golang.org/x/net/icmp/timeexceeded.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package icmp
-
-// A TimeExceeded represents an ICMP time exceeded message body.
-type TimeExceeded struct {
-	Data       []byte      // data, known as original datagram field
-	Extensions []Extension // extensions
-}
-
-// Len implements the Len method of MessageBody interface.
-func (p *TimeExceeded) Len(proto int) int {
-	if p == nil {
-		return 0
-	}
-	l, _ := multipartMessageBodyDataLen(proto, p.Data, p.Extensions)
-	return 4 + l
-}
-
-// Marshal implements the Marshal method of MessageBody interface.
-func (p *TimeExceeded) Marshal(proto int) ([]byte, error) {
-	return marshalMultipartMessageBody(proto, p.Data, p.Extensions)
-}
-
-// parseTimeExceeded parses b as an ICMP time exceeded message body.
-func parseTimeExceeded(proto int, b []byte) (MessageBody, error) {
-	if len(b) < 4 {
-		return nil, errMessageTooShort
-	}
-	p := &TimeExceeded{}
-	var err error
-	p.Data, p.Extensions, err = parseMultipartMessageBody(proto, b)
-	if err != nil {
-		return nil, err
-	}
-	return p, nil
-}
diff --git a/installer/vendor/golang.org/x/net/idna/idna.go b/installer/vendor/golang.org/x/net/idna/idna.go
deleted file mode 100644
index 3daa8979e1..0000000000
--- a/installer/vendor/golang.org/x/net/idna/idna.go
+++ /dev/null
@@ -1,68 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package idna implements IDNA2008 (Internationalized Domain Names for
-// Applications), defined in RFC 5890, RFC 5891, RFC 5892, RFC 5893 and
-// RFC 5894.
-package idna // import "golang.org/x/net/idna"
-
-import (
-	"strings"
-	"unicode/utf8"
-)
-
-// TODO(nigeltao): specify when errors occur. For example, is ToASCII(".") or
-// ToASCII("foo\x00") an error? See also http://www.unicode.org/faq/idn.html#11
-
-// acePrefix is the ASCII Compatible Encoding prefix.
-const acePrefix = "xn--"
-
-// ToASCII converts a domain or domain label to its ASCII form. For example,
-// ToASCII("bücher.example.com") is "xn--bcher-kva.example.com", and
-// ToASCII("golang") is "golang".
-func ToASCII(s string) (string, error) {
-	if ascii(s) {
-		return s, nil
-	}
-	labels := strings.Split(s, ".")
-	for i, label := range labels {
-		if !ascii(label) {
-			a, err := encode(acePrefix, label)
-			if err != nil {
-				return "", err
-			}
-			labels[i] = a
-		}
-	}
-	return strings.Join(labels, "."), nil
-}
-
-// ToUnicode converts a domain or domain label to its Unicode form. For example,
-// ToUnicode("xn--bcher-kva.example.com") is "bücher.example.com", and
-// ToUnicode("golang") is "golang".
-func ToUnicode(s string) (string, error) {
-	if !strings.Contains(s, acePrefix) {
-		return s, nil
-	}
-	labels := strings.Split(s, ".")
-	for i, label := range labels {
-		if strings.HasPrefix(label, acePrefix) {
-			u, err := decode(label[len(acePrefix):])
-			if err != nil {
-				return "", err
-			}
-			labels[i] = u
-		}
-	}
-	return strings.Join(labels, "."), nil
-}
-
-func ascii(s string) bool {
-	for i := 0; i < len(s); i++ {
-		if s[i] >= utf8.RuneSelf {
-			return false
-		}
-	}
-	return true
-}
diff --git a/installer/vendor/golang.org/x/net/idna/idna_test.go b/installer/vendor/golang.org/x/net/idna/idna_test.go
deleted file mode 100644
index b1bc6fa225..0000000000
--- a/installer/vendor/golang.org/x/net/idna/idna_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-import (
-	"testing"
-)
-
-var idnaTestCases = [...]struct {
-	ascii, unicode string
-}{
-	// Labels.
-	{"books", "books"},
-	{"xn--bcher-kva", "bücher"},
-
-	// Domains.
-	{"foo--xn--bar.org", "foo--xn--bar.org"},
-	{"golang.org", "golang.org"},
-	{"example.xn--p1ai", "example.рф"},
-	{"xn--czrw28b.tw", "商業.tw"},
-	{"www.xn--mller-kva.de", "www.müller.de"},
-}
-
-func TestIDNA(t *testing.T) {
-	for _, tc := range idnaTestCases {
-		if a, err := ToASCII(tc.unicode); err != nil {
-			t.Errorf("ToASCII(%q): %v", tc.unicode, err)
-		} else if a != tc.ascii {
-			t.Errorf("ToASCII(%q): got %q, want %q", tc.unicode, a, tc.ascii)
-		}
-
-		if u, err := ToUnicode(tc.ascii); err != nil {
-			t.Errorf("ToUnicode(%q): %v", tc.ascii, err)
-		} else if u != tc.unicode {
-			t.Errorf("ToUnicode(%q): got %q, want %q", tc.ascii, u, tc.unicode)
-		}
-	}
-}
-
-// TODO(nigeltao): test errors, once we've specified when ToASCII and ToUnicode
-// return errors.
diff --git a/installer/vendor/golang.org/x/net/idna/punycode.go b/installer/vendor/golang.org/x/net/idna/punycode.go
deleted file mode 100644
index 92e733f6a7..0000000000
--- a/installer/vendor/golang.org/x/net/idna/punycode.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-// This file implements the Punycode algorithm from RFC 3492.
-
-import (
-	"fmt"
-	"math"
-	"strings"
-	"unicode/utf8"
-)
-
-// These parameter values are specified in section 5.
-//
-// All computation is done with int32s, so that overflow behavior is identical
-// regardless of whether int is 32-bit or 64-bit.
-const (
-	base        int32 = 36
-	damp        int32 = 700
-	initialBias int32 = 72
-	initialN    int32 = 128
-	skew        int32 = 38
-	tmax        int32 = 26
-	tmin        int32 = 1
-)
-
-// decode decodes a string as specified in section 6.2.
-func decode(encoded string) (string, error) {
-	if encoded == "" {
-		return "", nil
-	}
-	pos := 1 + strings.LastIndex(encoded, "-")
-	if pos == 1 {
-		return "", fmt.Errorf("idna: invalid label %q", encoded)
-	}
-	if pos == len(encoded) {
-		return encoded[:len(encoded)-1], nil
-	}
-	output := make([]rune, 0, len(encoded))
-	if pos != 0 {
-		for _, r := range encoded[:pos-1] {
-			output = append(output, r)
-		}
-	}
-	i, n, bias := int32(0), initialN, initialBias
-	for pos < len(encoded) {
-		oldI, w := i, int32(1)
-		for k := base; ; k += base {
-			if pos == len(encoded) {
-				return "", fmt.Errorf("idna: invalid label %q", encoded)
-			}
-			digit, ok := decodeDigit(encoded[pos])
-			if !ok {
-				return "", fmt.Errorf("idna: invalid label %q", encoded)
-			}
-			pos++
-			i += digit * w
-			if i < 0 {
-				return "", fmt.Errorf("idna: invalid label %q", encoded)
-			}
-			t := k - bias
-			if t < tmin {
-				t = tmin
-			} else if t > tmax {
-				t = tmax
-			}
-			if digit < t {
-				break
-			}
-			w *= base - t
-			if w >= math.MaxInt32/base {
-				return "", fmt.Errorf("idna: invalid label %q", encoded)
-			}
-		}
-		x := int32(len(output) + 1)
-		bias = adapt(i-oldI, x, oldI == 0)
-		n += i / x
-		i %= x
-		if n > utf8.MaxRune || len(output) >= 1024 {
-			return "", fmt.Errorf("idna: invalid label %q", encoded)
-		}
-		output = append(output, 0)
-		copy(output[i+1:], output[i:])
-		output[i] = n
-		i++
-	}
-	return string(output), nil
-}
-
-// encode encodes a string as specified in section 6.3 and prepends prefix to
-// the result.
-//
-// The "while h < length(input)" line in the specification becomes "for
-// remaining != 0" in the Go code, because len(s) in Go is in bytes, not runes.
-func encode(prefix, s string) (string, error) {
-	output := make([]byte, len(prefix), len(prefix)+1+2*len(s))
-	copy(output, prefix)
-	delta, n, bias := int32(0), initialN, initialBias
-	b, remaining := int32(0), int32(0)
-	for _, r := range s {
-		if r < 0x80 {
-			b++
-			output = append(output, byte(r))
-		} else {
-			remaining++
-		}
-	}
-	h := b
-	if b > 0 {
-		output = append(output, '-')
-	}
-	for remaining != 0 {
-		m := int32(0x7fffffff)
-		for _, r := range s {
-			if m > r && r >= n {
-				m = r
-			}
-		}
-		delta += (m - n) * (h + 1)
-		if delta < 0 {
-			return "", fmt.Errorf("idna: invalid label %q", s)
-		}
-		n = m
-		for _, r := range s {
-			if r < n {
-				delta++
-				if delta < 0 {
-					return "", fmt.Errorf("idna: invalid label %q", s)
-				}
-				continue
-			}
-			if r > n {
-				continue
-			}
-			q := delta
-			for k := base; ; k += base {
-				t := k - bias
-				if t < tmin {
-					t = tmin
-				} else if t > tmax {
-					t = tmax
-				}
-				if q < t {
-					break
-				}
-				output = append(output, encodeDigit(t+(q-t)%(base-t)))
-				q = (q - t) / (base - t)
-			}
-			output = append(output, encodeDigit(q))
-			bias = adapt(delta, h+1, h == b)
-			delta = 0
-			h++
-			remaining--
-		}
-		delta++
-		n++
-	}
-	return string(output), nil
-}
-
-func decodeDigit(x byte) (digit int32, ok bool) {
-	switch {
-	case '0' <= x && x <= '9':
-		return int32(x - ('0' - 26)), true
-	case 'A' <= x && x <= 'Z':
-		return int32(x - 'A'), true
-	case 'a' <= x && x <= 'z':
-		return int32(x - 'a'), true
-	}
-	return 0, false
-}
-
-func encodeDigit(digit int32) byte {
-	switch {
-	case 0 <= digit && digit < 26:
-		return byte(digit + 'a')
-	case 26 <= digit && digit < 36:
-		return byte(digit + ('0' - 26))
-	}
-	panic("idna: internal error in punycode encoding")
-}
-
-// adapt is the bias adaptation function specified in section 6.1.
-func adapt(delta, numPoints int32, firstTime bool) int32 {
-	if firstTime {
-		delta /= damp
-	} else {
-		delta /= 2
-	}
-	delta += delta / numPoints
-	k := int32(0)
-	for delta > ((base-tmin)*tmax)/2 {
-		delta /= base - tmin
-		k += base
-	}
-	return k + (base-tmin+1)*delta/(delta+skew)
-}
diff --git a/installer/vendor/golang.org/x/net/idna/punycode_test.go b/installer/vendor/golang.org/x/net/idna/punycode_test.go
deleted file mode 100644
index bfec81decd..0000000000
--- a/installer/vendor/golang.org/x/net/idna/punycode_test.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package idna
-
-import (
-	"strings"
-	"testing"
-)
-
-var punycodeTestCases = [...]struct {
-	s, encoded string
-}{
-	{"", ""},
-	{"-", "--"},
-	{"-a", "-a-"},
-	{"-a-", "-a--"},
-	{"a", "a-"},
-	{"a-", "a--"},
-	{"a-b", "a-b-"},
-	{"books", "books-"},
-	{"bücher", "bcher-kva"},
-	{"Hello世界", "Hello-ck1hg65u"},
-	{"ü", "tda"},
-	{"üý", "tdac"},
-
-	// The test cases below come from RFC 3492 section 7.1 with Errata 3026.
-	{
-		// (A) Arabic (Egyptian).
-		"\u0644\u064A\u0647\u0645\u0627\u0628\u062A\u0643\u0644" +
-			"\u0645\u0648\u0634\u0639\u0631\u0628\u064A\u061F",
-		"egbpdaj6bu4bxfgehfvwxn",
-	},
-	{
-		// (B) Chinese (simplified).
-		"\u4ED6\u4EEC\u4E3A\u4EC0\u4E48\u4E0D\u8BF4\u4E2D\u6587",
-		"ihqwcrb4cv8a8dqg056pqjye",
-	},
-	{
-		// (C) Chinese (traditional).
-		"\u4ED6\u5011\u7232\u4EC0\u9EBD\u4E0D\u8AAA\u4E2D\u6587",
-		"ihqwctvzc91f659drss3x8bo0yb",
-	},
-	{
-		// (D) Czech.
-		"\u0050\u0072\u006F\u010D\u0070\u0072\u006F\u0073\u0074" +
-			"\u011B\u006E\u0065\u006D\u006C\u0075\u0076\u00ED\u010D" +
-			"\u0065\u0073\u006B\u0079",
-		"Proprostnemluvesky-uyb24dma41a",
-	},
-	{
-		// (E) Hebrew.
-		"\u05DC\u05DE\u05D4\u05D4\u05DD\u05E4\u05E9\u05D5\u05D8" +
-			"\u05DC\u05D0\u05DE\u05D3\u05D1\u05E8\u05D9\u05DD\u05E2" +
-			"\u05D1\u05E8\u05D9\u05EA",
-		"4dbcagdahymbxekheh6e0a7fei0b",
-	},
-	{
-		// (F) Hindi (Devanagari).
-		"\u092F\u0939\u0932\u094B\u0917\u0939\u093F\u0928\u094D" +
-			"\u0926\u0940\u0915\u094D\u092F\u094B\u0902\u0928\u0939" +
-			"\u0940\u0902\u092C\u094B\u0932\u0938\u0915\u0924\u0947" +
-			"\u0939\u0948\u0902",
-		"i1baa7eci9glrd9b2ae1bj0hfcgg6iyaf8o0a1dig0cd",
-	},
-	{
-		// (G) Japanese (kanji and hiragana).
-		"\u306A\u305C\u307F\u3093\u306A\u65E5\u672C\u8A9E\u3092" +
-			"\u8A71\u3057\u3066\u304F\u308C\u306A\u3044\u306E\u304B",
-		"n8jok5ay5dzabd5bym9f0cm5685rrjetr6pdxa",
-	},
-	{
-		// (H) Korean (Hangul syllables).
-		"\uC138\uACC4\uC758\uBAA8\uB4E0\uC0AC\uB78C\uB4E4\uC774" +
-			"\uD55C\uAD6D\uC5B4\uB97C\uC774\uD574\uD55C\uB2E4\uBA74" +
-			"\uC5BC\uB9C8\uB098\uC88B\uC744\uAE4C",
-		"989aomsvi5e83db1d2a355cv1e0vak1dwrv93d5xbh15a0dt30a5j" +
-			"psd879ccm6fea98c",
-	},
-	{
-		// (I) Russian (Cyrillic).
-		"\u043F\u043E\u0447\u0435\u043C\u0443\u0436\u0435\u043E" +
-			"\u043D\u0438\u043D\u0435\u0433\u043E\u0432\u043E\u0440" +
-			"\u044F\u0442\u043F\u043E\u0440\u0443\u0441\u0441\u043A" +
-			"\u0438",
-		"b1abfaaepdrnnbgefbadotcwatmq2g4l",
-	},
-	{
-		// (J) Spanish.
-		"\u0050\u006F\u0072\u0071\u0075\u00E9\u006E\u006F\u0070" +
-			"\u0075\u0065\u0064\u0065\u006E\u0073\u0069\u006D\u0070" +
-			"\u006C\u0065\u006D\u0065\u006E\u0074\u0065\u0068\u0061" +
-			"\u0062\u006C\u0061\u0072\u0065\u006E\u0045\u0073\u0070" +
-			"\u0061\u00F1\u006F\u006C",
-		"PorqunopuedensimplementehablarenEspaol-fmd56a",
-	},
-	{
-		// (K) Vietnamese.
-		"\u0054\u1EA1\u0069\u0073\u0061\u006F\u0068\u1ECD\u006B" +
-			"\u0068\u00F4\u006E\u0067\u0074\u0068\u1EC3\u0063\u0068" +
-			"\u1EC9\u006E\u00F3\u0069\u0074\u0069\u1EBF\u006E\u0067" +
-			"\u0056\u0069\u1EC7\u0074",
-		"TisaohkhngthchnitingVit-kjcr8268qyxafd2f1b9g",
-	},
-	{
-		// (L) 3<nen>B<gumi><kinpachi><sensei>.
-		"\u0033\u5E74\u0042\u7D44\u91D1\u516B\u5148\u751F",
-		"3B-ww4c5e180e575a65lsy2b",
-	},
-	{
-		// (M) <amuro><namie>-with-SUPER-MONKEYS.
-		"\u5B89\u5BA4\u5948\u7F8E\u6075\u002D\u0077\u0069\u0074" +
-			"\u0068\u002D\u0053\u0055\u0050\u0045\u0052\u002D\u004D" +
-			"\u004F\u004E\u004B\u0045\u0059\u0053",
-		"-with-SUPER-MONKEYS-pc58ag80a8qai00g7n9n",
-	},
-	{
-		// (N) Hello-Another-Way-<sorezore><no><basho>.
-		"\u0048\u0065\u006C\u006C\u006F\u002D\u0041\u006E\u006F" +
-			"\u0074\u0068\u0065\u0072\u002D\u0057\u0061\u0079\u002D" +
-			"\u305D\u308C\u305E\u308C\u306E\u5834\u6240",
-		"Hello-Another-Way--fc4qua05auwb3674vfr0b",
-	},
-	{
-		// (O) <hitotsu><yane><no><shita>2.
-		"\u3072\u3068\u3064\u5C4B\u6839\u306E\u4E0B\u0032",
-		"2-u9tlzr9756bt3uc0v",
-	},
-	{
-		// (P) Maji<de>Koi<suru>5<byou><mae>
-		"\u004D\u0061\u006A\u0069\u3067\u004B\u006F\u0069\u3059" +
-			"\u308B\u0035\u79D2\u524D",
-		"MajiKoi5-783gue6qz075azm5e",
-	},
-	{
-		// (Q) <pafii>de<runba>
-		"\u30D1\u30D5\u30A3\u30FC\u0064\u0065\u30EB\u30F3\u30D0",
-		"de-jg4avhby1noc0d",
-	},
-	{
-		// (R) <sono><supiido><de>
-		"\u305D\u306E\u30B9\u30D4\u30FC\u30C9\u3067",
-		"d9juau41awczczp",
-	},
-	{
-		// (S) -> $1.00 <-
-		"\u002D\u003E\u0020\u0024\u0031\u002E\u0030\u0030\u0020" +
-			"\u003C\u002D",
-		"-> $1.00 <--",
-	},
-}
-
-func TestPunycode(t *testing.T) {
-	for _, tc := range punycodeTestCases {
-		if got, err := decode(tc.encoded); err != nil {
-			t.Errorf("decode(%q): %v", tc.encoded, err)
-		} else if got != tc.s {
-			t.Errorf("decode(%q): got %q, want %q", tc.encoded, got, tc.s)
-		}
-
-		if got, err := encode("", tc.s); err != nil {
-			t.Errorf(`encode("", %q): %v`, tc.s, err)
-		} else if got != tc.encoded {
-			t.Errorf(`encode("", %q): got %q, want %q`, tc.s, got, tc.encoded)
-		}
-	}
-}
-
-var punycodeErrorTestCases = [...]string{
-	"decode -",            // A sole '-' is invalid.
-	"decode foo\x00bar",   // '\x00' is not in [0-9A-Za-z].
-	"decode foo#bar",      // '#' is not in [0-9A-Za-z].
-	"decode foo\u00A3bar", // '\u00A3' is not in [0-9A-Za-z].
-	"decode 9",            // "9a" decodes to codepoint \u00A3; "9" is truncated.
-	"decode 99999a",       // "99999a" decodes to codepoint \U0048A3C1, which is > \U0010FFFF.
-	"decode 9999999999a",  // "9999999999a" overflows the int32 calculation.
-
-	"encode " + strings.Repeat("x", 65536) + "\uff00", // int32 overflow.
-}
-
-func TestPunycodeErrors(t *testing.T) {
-	for _, tc := range punycodeErrorTestCases {
-		var err error
-		switch {
-		case strings.HasPrefix(tc, "decode "):
-			_, err = decode(tc[7:])
-		case strings.HasPrefix(tc, "encode "):
-			_, err = encode("", tc[7:])
-		}
-		if err == nil {
-			if len(tc) > 256 {
-				tc = tc[:100] + "..." + tc[len(tc)-100:]
-			}
-			t.Errorf("no error for %s", tc)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/internal/iana/const.go b/installer/vendor/golang.org/x/net/internal/iana/const.go
deleted file mode 100644
index 3438a27c8d..0000000000
--- a/installer/vendor/golang.org/x/net/internal/iana/const.go
+++ /dev/null
@@ -1,180 +0,0 @@
-// go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).
-package iana // import "golang.org/x/net/internal/iana"
-
-// Differentiated Services Field Codepoints (DSCP), Updated: 2013-06-25
-const (
-	DiffServCS0        = 0x0  // CS0
-	DiffServCS1        = 0x20 // CS1
-	DiffServCS2        = 0x40 // CS2
-	DiffServCS3        = 0x60 // CS3
-	DiffServCS4        = 0x80 // CS4
-	DiffServCS5        = 0xa0 // CS5
-	DiffServCS6        = 0xc0 // CS6
-	DiffServCS7        = 0xe0 // CS7
-	DiffServAF11       = 0x28 // AF11
-	DiffServAF12       = 0x30 // AF12
-	DiffServAF13       = 0x38 // AF13
-	DiffServAF21       = 0x48 // AF21
-	DiffServAF22       = 0x50 // AF22
-	DiffServAF23       = 0x58 // AF23
-	DiffServAF31       = 0x68 // AF31
-	DiffServAF32       = 0x70 // AF32
-	DiffServAF33       = 0x78 // AF33
-	DiffServAF41       = 0x88 // AF41
-	DiffServAF42       = 0x90 // AF42
-	DiffServAF43       = 0x98 // AF43
-	DiffServEFPHB      = 0xb8 // EF PHB
-	DiffServVOICEADMIT = 0xb0 // VOICE-ADMIT
-)
-
-// IPv4 TOS Byte and IPv6 Traffic Class Octet, Updated: 2001-09-06
-const (
-	NotECNTransport       = 0x0 // Not-ECT (Not ECN-Capable Transport)
-	ECNTransport1         = 0x1 // ECT(1) (ECN-Capable Transport(1))
-	ECNTransport0         = 0x2 // ECT(0) (ECN-Capable Transport(0))
-	CongestionExperienced = 0x3 // CE (Congestion Experienced)
-)
-
-// Protocol Numbers, Updated: 2015-10-06
-const (
-	ProtocolIP             = 0   // IPv4 encapsulation, pseudo protocol number
-	ProtocolHOPOPT         = 0   // IPv6 Hop-by-Hop Option
-	ProtocolICMP           = 1   // Internet Control Message
-	ProtocolIGMP           = 2   // Internet Group Management
-	ProtocolGGP            = 3   // Gateway-to-Gateway
-	ProtocolIPv4           = 4   // IPv4 encapsulation
-	ProtocolST             = 5   // Stream
-	ProtocolTCP            = 6   // Transmission Control
-	ProtocolCBT            = 7   // CBT
-	ProtocolEGP            = 8   // Exterior Gateway Protocol
-	ProtocolIGP            = 9   // any private interior gateway (used by Cisco for their IGRP)
-	ProtocolBBNRCCMON      = 10  // BBN RCC Monitoring
-	ProtocolNVPII          = 11  // Network Voice Protocol
-	ProtocolPUP            = 12  // PUP
-	ProtocolEMCON          = 14  // EMCON
-	ProtocolXNET           = 15  // Cross Net Debugger
-	ProtocolCHAOS          = 16  // Chaos
-	ProtocolUDP            = 17  // User Datagram
-	ProtocolMUX            = 18  // Multiplexing
-	ProtocolDCNMEAS        = 19  // DCN Measurement Subsystems
-	ProtocolHMP            = 20  // Host Monitoring
-	ProtocolPRM            = 21  // Packet Radio Measurement
-	ProtocolXNSIDP         = 22  // XEROX NS IDP
-	ProtocolTRUNK1         = 23  // Trunk-1
-	ProtocolTRUNK2         = 24  // Trunk-2
-	ProtocolLEAF1          = 25  // Leaf-1
-	ProtocolLEAF2          = 26  // Leaf-2
-	ProtocolRDP            = 27  // Reliable Data Protocol
-	ProtocolIRTP           = 28  // Internet Reliable Transaction
-	ProtocolISOTP4         = 29  // ISO Transport Protocol Class 4
-	ProtocolNETBLT         = 30  // Bulk Data Transfer Protocol
-	ProtocolMFENSP         = 31  // MFE Network Services Protocol
-	ProtocolMERITINP       = 32  // MERIT Internodal Protocol
-	ProtocolDCCP           = 33  // Datagram Congestion Control Protocol
-	Protocol3PC            = 34  // Third Party Connect Protocol
-	ProtocolIDPR           = 35  // Inter-Domain Policy Routing Protocol
-	ProtocolXTP            = 36  // XTP
-	ProtocolDDP            = 37  // Datagram Delivery Protocol
-	ProtocolIDPRCMTP       = 38  // IDPR Control Message Transport Proto
-	ProtocolTPPP           = 39  // TP++ Transport Protocol
-	ProtocolIL             = 40  // IL Transport Protocol
-	ProtocolIPv6           = 41  // IPv6 encapsulation
-	ProtocolSDRP           = 42  // Source Demand Routing Protocol
-	ProtocolIPv6Route      = 43  // Routing Header for IPv6
-	ProtocolIPv6Frag       = 44  // Fragment Header for IPv6
-	ProtocolIDRP           = 45  // Inter-Domain Routing Protocol
-	ProtocolRSVP           = 46  // Reservation Protocol
-	ProtocolGRE            = 47  // Generic Routing Encapsulation
-	ProtocolDSR            = 48  // Dynamic Source Routing Protocol
-	ProtocolBNA            = 49  // BNA
-	ProtocolESP            = 50  // Encap Security Payload
-	ProtocolAH             = 51  // Authentication Header
-	ProtocolINLSP          = 52  // Integrated Net Layer Security  TUBA
-	ProtocolNARP           = 54  // NBMA Address Resolution Protocol
-	ProtocolMOBILE         = 55  // IP Mobility
-	ProtocolTLSP           = 56  // Transport Layer Security Protocol using Kryptonet key management
-	ProtocolSKIP           = 57  // SKIP
-	ProtocolIPv6ICMP       = 58  // ICMP for IPv6
-	ProtocolIPv6NoNxt      = 59  // No Next Header for IPv6
-	ProtocolIPv6Opts       = 60  // Destination Options for IPv6
-	ProtocolCFTP           = 62  // CFTP
-	ProtocolSATEXPAK       = 64  // SATNET and Backroom EXPAK
-	ProtocolKRYPTOLAN      = 65  // Kryptolan
-	ProtocolRVD            = 66  // MIT Remote Virtual Disk Protocol
-	ProtocolIPPC           = 67  // Internet Pluribus Packet Core
-	ProtocolSATMON         = 69  // SATNET Monitoring
-	ProtocolVISA           = 70  // VISA Protocol
-	ProtocolIPCV           = 71  // Internet Packet Core Utility
-	ProtocolCPNX           = 72  // Computer Protocol Network Executive
-	ProtocolCPHB           = 73  // Computer Protocol Heart Beat
-	ProtocolWSN            = 74  // Wang Span Network
-	ProtocolPVP            = 75  // Packet Video Protocol
-	ProtocolBRSATMON       = 76  // Backroom SATNET Monitoring
-	ProtocolSUNND          = 77  // SUN ND PROTOCOL-Temporary
-	ProtocolWBMON          = 78  // WIDEBAND Monitoring
-	ProtocolWBEXPAK        = 79  // WIDEBAND EXPAK
-	ProtocolISOIP          = 80  // ISO Internet Protocol
-	ProtocolVMTP           = 81  // VMTP
-	ProtocolSECUREVMTP     = 82  // SECURE-VMTP
-	ProtocolVINES          = 83  // VINES
-	ProtocolTTP            = 84  // Transaction Transport Protocol
-	ProtocolIPTM           = 84  // Internet Protocol Traffic Manager
-	ProtocolNSFNETIGP      = 85  // NSFNET-IGP
-	ProtocolDGP            = 86  // Dissimilar Gateway Protocol
-	ProtocolTCF            = 87  // TCF
-	ProtocolEIGRP          = 88  // EIGRP
-	ProtocolOSPFIGP        = 89  // OSPFIGP
-	ProtocolSpriteRPC      = 90  // Sprite RPC Protocol
-	ProtocolLARP           = 91  // Locus Address Resolution Protocol
-	ProtocolMTP            = 92  // Multicast Transport Protocol
-	ProtocolAX25           = 93  // AX.25 Frames
-	ProtocolIPIP           = 94  // IP-within-IP Encapsulation Protocol
-	ProtocolSCCSP          = 96  // Semaphore Communications Sec. Pro.
-	ProtocolETHERIP        = 97  // Ethernet-within-IP Encapsulation
-	ProtocolENCAP          = 98  // Encapsulation Header
-	ProtocolGMTP           = 100 // GMTP
-	ProtocolIFMP           = 101 // Ipsilon Flow Management Protocol
-	ProtocolPNNI           = 102 // PNNI over IP
-	ProtocolPIM            = 103 // Protocol Independent Multicast
-	ProtocolARIS           = 104 // ARIS
-	ProtocolSCPS           = 105 // SCPS
-	ProtocolQNX            = 106 // QNX
-	ProtocolAN             = 107 // Active Networks
-	ProtocolIPComp         = 108 // IP Payload Compression Protocol
-	ProtocolSNP            = 109 // Sitara Networks Protocol
-	ProtocolCompaqPeer     = 110 // Compaq Peer Protocol
-	ProtocolIPXinIP        = 111 // IPX in IP
-	ProtocolVRRP           = 112 // Virtual Router Redundancy Protocol
-	ProtocolPGM            = 113 // PGM Reliable Transport Protocol
-	ProtocolL2TP           = 115 // Layer Two Tunneling Protocol
-	ProtocolDDX            = 116 // D-II Data Exchange (DDX)
-	ProtocolIATP           = 117 // Interactive Agent Transfer Protocol
-	ProtocolSTP            = 118 // Schedule Transfer Protocol
-	ProtocolSRP            = 119 // SpectraLink Radio Protocol
-	ProtocolUTI            = 120 // UTI
-	ProtocolSMP            = 121 // Simple Message Protocol
-	ProtocolPTP            = 123 // Performance Transparency Protocol
-	ProtocolISIS           = 124 // ISIS over IPv4
-	ProtocolFIRE           = 125 // FIRE
-	ProtocolCRTP           = 126 // Combat Radio Transport Protocol
-	ProtocolCRUDP          = 127 // Combat Radio User Datagram
-	ProtocolSSCOPMCE       = 128 // SSCOPMCE
-	ProtocolIPLT           = 129 // IPLT
-	ProtocolSPS            = 130 // Secure Packet Shield
-	ProtocolPIPE           = 131 // Private IP Encapsulation within IP
-	ProtocolSCTP           = 132 // Stream Control Transmission Protocol
-	ProtocolFC             = 133 // Fibre Channel
-	ProtocolRSVPE2EIGNORE  = 134 // RSVP-E2E-IGNORE
-	ProtocolMobilityHeader = 135 // Mobility Header
-	ProtocolUDPLite        = 136 // UDPLite
-	ProtocolMPLSinIP       = 137 // MPLS-in-IP
-	ProtocolMANET          = 138 // MANET Protocols
-	ProtocolHIP            = 139 // Host Identity Protocol
-	ProtocolShim6          = 140 // Shim6 Protocol
-	ProtocolWESP           = 141 // Wrapped Encapsulating Security Payload
-	ProtocolROHC           = 142 // Robust Header Compression
-	ProtocolReserved       = 255 // Reserved
-)
diff --git a/installer/vendor/golang.org/x/net/internal/iana/gen.go b/installer/vendor/golang.org/x/net/internal/iana/gen.go
deleted file mode 100644
index 86c78b3bb7..0000000000
--- a/installer/vendor/golang.org/x/net/internal/iana/gen.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-//go:generate go run gen.go
-
-// This program generates internet protocol constants and tables by
-// reading IANA protocol registries.
-package main
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"strconv"
-	"strings"
-)
-
-var registries = []struct {
-	url   string
-	parse func(io.Writer, io.Reader) error
-}{
-	{
-		"http://www.iana.org/assignments/dscp-registry/dscp-registry.xml",
-		parseDSCPRegistry,
-	},
-	{
-		"http://www.iana.org/assignments/ipv4-tos-byte/ipv4-tos-byte.xml",
-		parseTOSTCByte,
-	},
-	{
-		"http://www.iana.org/assignments/protocol-numbers/protocol-numbers.xml",
-		parseProtocolNumbers,
-	},
-}
-
-func main() {
-	var bb bytes.Buffer
-	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
-	fmt.Fprintf(&bb, "// Package iana provides protocol number resources managed by the Internet Assigned Numbers Authority (IANA).\n")
-	fmt.Fprintf(&bb, `package iana // import "golang.org/x/net/internal/iana"`+"\n\n")
-	for _, r := range registries {
-		resp, err := http.Get(r.url)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			fmt.Fprintf(os.Stderr, "got HTTP status code %v for %v\n", resp.StatusCode, r.url)
-			os.Exit(1)
-		}
-		if err := r.parse(&bb, resp.Body); err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-		fmt.Fprintf(&bb, "\n")
-	}
-	b, err := format.Source(bb.Bytes())
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-	if err := ioutil.WriteFile("const.go", b, 0644); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func parseDSCPRegistry(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var dr dscpRegistry
-	if err := dec.Decode(&dr); err != nil {
-		return err
-	}
-	drs := dr.escape()
-	fmt.Fprintf(w, "// %s, Updated: %s\n", dr.Title, dr.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, dr := range drs {
-		fmt.Fprintf(w, "DiffServ%s = %#x", dr.Name, dr.Value)
-		fmt.Fprintf(w, "// %s\n", dr.OrigName)
-	}
-	fmt.Fprintf(w, ")\n")
-	return nil
-}
-
-type dscpRegistry struct {
-	XMLName     xml.Name `xml:"registry"`
-	Title       string   `xml:"title"`
-	Updated     string   `xml:"updated"`
-	Note        string   `xml:"note"`
-	RegTitle    string   `xml:"registry>title"`
-	PoolRecords []struct {
-		Name  string `xml:"name"`
-		Space string `xml:"space"`
-	} `xml:"registry>record"`
-	Records []struct {
-		Name  string `xml:"name"`
-		Space string `xml:"space"`
-	} `xml:"registry>registry>record"`
-}
-
-type canonDSCPRecord struct {
-	OrigName string
-	Name     string
-	Value    int
-}
-
-func (drr *dscpRegistry) escape() []canonDSCPRecord {
-	drs := make([]canonDSCPRecord, len(drr.Records))
-	sr := strings.NewReplacer(
-		"+", "",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, dr := range drr.Records {
-		s := strings.TrimSpace(dr.Name)
-		drs[i].OrigName = s
-		drs[i].Name = sr.Replace(s)
-		n, err := strconv.ParseUint(dr.Space, 2, 8)
-		if err != nil {
-			continue
-		}
-		drs[i].Value = int(n) << 2
-	}
-	return drs
-}
-
-func parseTOSTCByte(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var ttb tosTCByte
-	if err := dec.Decode(&ttb); err != nil {
-		return err
-	}
-	trs := ttb.escape()
-	fmt.Fprintf(w, "// %s, Updated: %s\n", ttb.Title, ttb.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, tr := range trs {
-		fmt.Fprintf(w, "%s = %#x", tr.Keyword, tr.Value)
-		fmt.Fprintf(w, "// %s\n", tr.OrigKeyword)
-	}
-	fmt.Fprintf(w, ")\n")
-	return nil
-}
-
-type tosTCByte struct {
-	XMLName  xml.Name `xml:"registry"`
-	Title    string   `xml:"title"`
-	Updated  string   `xml:"updated"`
-	Note     string   `xml:"note"`
-	RegTitle string   `xml:"registry>title"`
-	Records  []struct {
-		Binary  string `xml:"binary"`
-		Keyword string `xml:"keyword"`
-	} `xml:"registry>record"`
-}
-
-type canonTOSTCByteRecord struct {
-	OrigKeyword string
-	Keyword     string
-	Value       int
-}
-
-func (ttb *tosTCByte) escape() []canonTOSTCByteRecord {
-	trs := make([]canonTOSTCByteRecord, len(ttb.Records))
-	sr := strings.NewReplacer(
-		"Capable", "",
-		"(", "",
-		")", "",
-		"+", "",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, tr := range ttb.Records {
-		s := strings.TrimSpace(tr.Keyword)
-		trs[i].OrigKeyword = s
-		ss := strings.Split(s, " ")
-		if len(ss) > 1 {
-			trs[i].Keyword = strings.Join(ss[1:], " ")
-		} else {
-			trs[i].Keyword = ss[0]
-		}
-		trs[i].Keyword = sr.Replace(trs[i].Keyword)
-		n, err := strconv.ParseUint(tr.Binary, 2, 8)
-		if err != nil {
-			continue
-		}
-		trs[i].Value = int(n)
-	}
-	return trs
-}
-
-func parseProtocolNumbers(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var pn protocolNumbers
-	if err := dec.Decode(&pn); err != nil {
-		return err
-	}
-	prs := pn.escape()
-	prs = append([]canonProtocolRecord{{
-		Name:  "IP",
-		Descr: "IPv4 encapsulation, pseudo protocol number",
-		Value: 0,
-	}}, prs...)
-	fmt.Fprintf(w, "// %s, Updated: %s\n", pn.Title, pn.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, pr := range prs {
-		if pr.Name == "" {
-			continue
-		}
-		fmt.Fprintf(w, "Protocol%s = %d", pr.Name, pr.Value)
-		s := pr.Descr
-		if s == "" {
-			s = pr.OrigName
-		}
-		fmt.Fprintf(w, "// %s\n", s)
-	}
-	fmt.Fprintf(w, ")\n")
-	return nil
-}
-
-type protocolNumbers struct {
-	XMLName  xml.Name `xml:"registry"`
-	Title    string   `xml:"title"`
-	Updated  string   `xml:"updated"`
-	RegTitle string   `xml:"registry>title"`
-	Note     string   `xml:"registry>note"`
-	Records  []struct {
-		Value string `xml:"value"`
-		Name  string `xml:"name"`
-		Descr string `xml:"description"`
-	} `xml:"registry>record"`
-}
-
-type canonProtocolRecord struct {
-	OrigName string
-	Name     string
-	Descr    string
-	Value    int
-}
-
-func (pn *protocolNumbers) escape() []canonProtocolRecord {
-	prs := make([]canonProtocolRecord, len(pn.Records))
-	sr := strings.NewReplacer(
-		"-in-", "in",
-		"-within-", "within",
-		"-over-", "over",
-		"+", "P",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, pr := range pn.Records {
-		if strings.Contains(pr.Name, "Deprecated") ||
-			strings.Contains(pr.Name, "deprecated") {
-			continue
-		}
-		prs[i].OrigName = pr.Name
-		s := strings.TrimSpace(pr.Name)
-		switch pr.Name {
-		case "ISIS over IPv4":
-			prs[i].Name = "ISIS"
-		case "manet":
-			prs[i].Name = "MANET"
-		default:
-			prs[i].Name = sr.Replace(s)
-		}
-		ss := strings.Split(pr.Descr, "\n")
-		for i := range ss {
-			ss[i] = strings.TrimSpace(ss[i])
-		}
-		if len(ss) > 1 {
-			prs[i].Descr = strings.Join(ss, " ")
-		} else {
-			prs[i].Descr = ss[0]
-		}
-		prs[i].Value, _ = strconv.Atoi(pr.Value)
-	}
-	return prs
-}
diff --git a/installer/vendor/golang.org/x/net/internal/netreflect/socket.go b/installer/vendor/golang.org/x/net/internal/netreflect/socket.go
deleted file mode 100644
index 1495b65f59..0000000000
--- a/installer/vendor/golang.org/x/net/internal/netreflect/socket.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-// Package netreflect implements run-time reflection for the
-// facilities of net package.
-//
-// This package works only for Go 1.8 or below.
-package netreflect
-
-import (
-	"errors"
-	"net"
-)
-
-var (
-	errInvalidType = errors.New("invalid type")
-	errOpNoSupport = errors.New("operation not supported")
-)
-
-// SocketOf returns the socket descriptor of c.
-func SocketOf(c net.Conn) (uintptr, error) {
-	switch c.(type) {
-	case *net.TCPConn, *net.UDPConn, *net.IPConn, *net.UnixConn:
-		return socketOf(c)
-	default:
-		return 0, errInvalidType
-	}
-}
-
-// PacketSocketOf returns the socket descriptor of c.
-func PacketSocketOf(c net.PacketConn) (uintptr, error) {
-	switch c.(type) {
-	case *net.UDPConn, *net.IPConn, *net.UnixConn:
-		return socketOf(c.(net.Conn))
-	default:
-		return 0, errInvalidType
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/internal/netreflect/socket_19.go b/installer/vendor/golang.org/x/net/internal/netreflect/socket_19.go
deleted file mode 100644
index 74df52e1ab..0000000000
--- a/installer/vendor/golang.org/x/net/internal/netreflect/socket_19.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package netreflect
-
-import (
-	"errors"
-	"net"
-)
-
-var (
-	errInvalidType = errors.New("invalid type")
-	errOpNoSupport = errors.New("operation not supported")
-)
-
-// SocketOf returns the socket descriptor of c.
-func SocketOf(c net.Conn) (uintptr, error) {
-	switch c.(type) {
-	case *net.TCPConn, *net.UDPConn, *net.IPConn, *net.UnixConn:
-		return 0, errOpNoSupport
-	default:
-		return 0, errInvalidType
-	}
-}
-
-// PacketSocketOf returns the socket descriptor of c.
-func PacketSocketOf(c net.PacketConn) (uintptr, error) {
-	switch c.(type) {
-	case *net.UDPConn, *net.IPConn, *net.UnixConn:
-		return 0, errOpNoSupport
-	default:
-		return 0, errInvalidType
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/internal/netreflect/socket_posix.go b/installer/vendor/golang.org/x/net/internal/netreflect/socket_posix.go
deleted file mode 100644
index 410c0924d2..0000000000
--- a/installer/vendor/golang.org/x/net/internal/netreflect/socket_posix.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package netreflect
-
-import (
-	"net"
-	"reflect"
-	"runtime"
-)
-
-func socketOf(c net.Conn) (uintptr, error) {
-	v := reflect.ValueOf(c)
-	switch e := v.Elem(); e.Kind() {
-	case reflect.Struct:
-		fd := e.FieldByName("conn").FieldByName("fd")
-		switch e := fd.Elem(); e.Kind() {
-		case reflect.Struct:
-			sysfd := e.FieldByName("sysfd")
-			if runtime.GOOS == "windows" {
-				return uintptr(sysfd.Uint()), nil
-			}
-			return uintptr(sysfd.Int()), nil
-		}
-	}
-	return 0, errInvalidType
-}
diff --git a/installer/vendor/golang.org/x/net/internal/netreflect/socket_stub.go b/installer/vendor/golang.org/x/net/internal/netreflect/socket_stub.go
deleted file mode 100644
index 17b20c4783..0000000000
--- a/installer/vendor/golang.org/x/net/internal/netreflect/socket_stub.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-// +build !darwin,!dragonfly,!freebsd,!linux,!netbsd,!openbsd,!solaris,!windows
-
-package netreflect
-
-import "net"
-
-func socketOf(c net.Conn) (uintptr, error) { return 0, errOpNoSupport }
diff --git a/installer/vendor/golang.org/x/net/internal/netreflect/socket_test.go b/installer/vendor/golang.org/x/net/internal/netreflect/socket_test.go
deleted file mode 100644
index b3aad0d92d..0000000000
--- a/installer/vendor/golang.org/x/net/internal/netreflect/socket_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package netreflect_test
-
-import (
-	"net"
-	"os"
-	"testing"
-
-	"golang.org/x/net/internal/netreflect"
-	"golang.org/x/net/internal/nettest"
-)
-
-func TestSocketOf(t *testing.T) {
-	for _, network := range []string{"tcp", "unix", "unixpacket"} {
-		if !nettest.TestableNetwork(network) {
-			continue
-		}
-		ln, err := nettest.NewLocalListener(network)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		defer func() {
-			path := ln.Addr().String()
-			ln.Close()
-			if network == "unix" || network == "unixpacket" {
-				os.Remove(path)
-			}
-		}()
-		c, err := net.Dial(ln.Addr().Network(), ln.Addr().String())
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		defer c.Close()
-		if _, err := netreflect.SocketOf(c); err != nil {
-			t.Error(err)
-			continue
-		}
-	}
-}
-
-func TestPacketSocketOf(t *testing.T) {
-	for _, network := range []string{"udp", "unixgram"} {
-		if !nettest.TestableNetwork(network) {
-			continue
-		}
-		c, err := nettest.NewLocalPacketListener(network)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		defer c.Close()
-		if _, err := netreflect.PacketSocketOf(c); err != nil {
-			t.Error(err)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_bsd.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_bsd.go
deleted file mode 100644
index a6e433b58c..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_bsd.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package nettest
-
-import (
-	"runtime"
-	"strconv"
-	"strings"
-	"syscall"
-)
-
-var darwinVersion int
-
-func init() {
-	if runtime.GOOS == "darwin" {
-		// See http://support.apple.com/kb/HT1633.
-		s, err := syscall.Sysctl("kern.osrelease")
-		if err != nil {
-			return
-		}
-		ss := strings.Split(s, ".")
-		if len(ss) == 0 {
-			return
-		}
-		darwinVersion, _ = strconv.Atoi(ss[0])
-	}
-}
-
-func supportsIPv6MulticastDeliveryOnLoopback() bool {
-	switch runtime.GOOS {
-	case "freebsd":
-		// See http://www.freebsd.org/cgi/query-pr.cgi?pr=180065.
-		// Even after the fix, it looks like the latest
-		// kernels don't deliver link-local scoped multicast
-		// packets correctly.
-		return false
-	case "darwin":
-		return !causesIPv6Crash()
-	default:
-		return true
-	}
-}
-
-func causesIPv6Crash() bool {
-	// We see some kernel crash when running IPv6 with IP-level
-	// options on Darwin kernel version 12 or below.
-	// See golang.org/issues/17015.
-	return darwinVersion < 13
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_nobsd.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_nobsd.go
deleted file mode 100644
index bc7da5e0d5..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_nobsd.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux solaris
-
-package nettest
-
-func supportsIPv6MulticastDeliveryOnLoopback() bool {
-	return true
-}
-
-func causesIPv6Crash() bool {
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_posix.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_posix.go
deleted file mode 100644
index 963ed99655..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_posix.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package nettest
-
-import (
-	"os"
-	"syscall"
-)
-
-func protocolNotSupported(err error) bool {
-	switch err := err.(type) {
-	case syscall.Errno:
-		switch err {
-		case syscall.EPROTONOSUPPORT, syscall.ENOPROTOOPT:
-			return true
-		}
-	case *os.SyscallError:
-		switch err := err.Err.(type) {
-		case syscall.Errno:
-			switch err {
-			case syscall.EPROTONOSUPPORT, syscall.ENOPROTOOPT:
-				return true
-			}
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_stub.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_stub.go
deleted file mode 100644
index ea61b6f399..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_stub.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package nettest
-
-import (
-	"fmt"
-	"runtime"
-)
-
-func maxOpenFiles() int {
-	return defaultMaxOpenFiles
-}
-
-func supportsRawIPSocket() (string, bool) {
-	return fmt.Sprintf("not supported on %s", runtime.GOOS), false
-}
-
-func supportsIPv6MulticastDeliveryOnLoopback() bool {
-	return false
-}
-
-func causesIPv6Crash() bool {
-	return false
-}
-
-func protocolNotSupported(err error) bool {
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_unix.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_unix.go
deleted file mode 100644
index ed13e448b7..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_unix.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package nettest
-
-import (
-	"fmt"
-	"os"
-	"runtime"
-	"syscall"
-)
-
-func maxOpenFiles() int {
-	var rlim syscall.Rlimit
-	if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rlim); err != nil {
-		return defaultMaxOpenFiles
-	}
-	return int(rlim.Cur)
-}
-
-func supportsRawIPSocket() (string, bool) {
-	if os.Getuid() != 0 {
-		return fmt.Sprintf("must be root on %s", runtime.GOOS), false
-	}
-	return "", true
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/helper_windows.go b/installer/vendor/golang.org/x/net/internal/nettest/helper_windows.go
deleted file mode 100644
index 3dcb727c95..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/helper_windows.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nettest
-
-import (
-	"fmt"
-	"runtime"
-	"syscall"
-)
-
-func maxOpenFiles() int {
-	return 4 * defaultMaxOpenFiles /* actually it's 16581375 */
-}
-
-func supportsRawIPSocket() (string, bool) {
-	// From http://msdn.microsoft.com/en-us/library/windows/desktop/ms740548.aspx:
-	// Note: To use a socket of type SOCK_RAW requires administrative privileges.
-	// Users running Winsock applications that use raw sockets must be a member of
-	// the Administrators group on the local computer, otherwise raw socket calls
-	// will fail with an error code of WSAEACCES. On Windows Vista and later, access
-	// for raw sockets is enforced at socket creation. In earlier versions of Windows,
-	// access for raw sockets is enforced during other socket operations.
-	s, err := syscall.Socket(syscall.AF_INET, syscall.SOCK_RAW, 0)
-	if err == syscall.WSAEACCES {
-		return fmt.Sprintf("no access to raw socket allowed on %s", runtime.GOOS), false
-	}
-	if err != nil {
-		return err.Error(), false
-	}
-	syscall.Closesocket(s)
-	return "", true
-}
-
-func supportsIPv6MulticastDeliveryOnLoopback() bool {
-	return true
-}
-
-func causesIPv6Crash() bool {
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/interface.go b/installer/vendor/golang.org/x/net/internal/nettest/interface.go
deleted file mode 100644
index 8e6333afe1..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/interface.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nettest
-
-import "net"
-
-// IsMulticastCapable reports whether ifi is an IP multicast-capable
-// network interface. Network must be "ip", "ip4" or "ip6".
-func IsMulticastCapable(network string, ifi *net.Interface) (net.IP, bool) {
-	switch network {
-	case "ip", "ip4", "ip6":
-	default:
-		return nil, false
-	}
-	if ifi == nil || ifi.Flags&net.FlagUp == 0 || ifi.Flags&net.FlagMulticast == 0 {
-		return nil, false
-	}
-	return hasRoutableIP(network, ifi)
-}
-
-// RoutedInterface returns a network interface that can route IP
-// traffic and satisfies flags. It returns nil when an appropriate
-// network interface is not found. Network must be "ip", "ip4" or
-// "ip6".
-func RoutedInterface(network string, flags net.Flags) *net.Interface {
-	switch network {
-	case "ip", "ip4", "ip6":
-	default:
-		return nil
-	}
-	ift, err := net.Interfaces()
-	if err != nil {
-		return nil
-	}
-	for _, ifi := range ift {
-		if ifi.Flags&flags != flags {
-			continue
-		}
-		if _, ok := hasRoutableIP(network, &ifi); !ok {
-			continue
-		}
-		return &ifi
-	}
-	return nil
-}
-
-func hasRoutableIP(network string, ifi *net.Interface) (net.IP, bool) {
-	ifat, err := ifi.Addrs()
-	if err != nil {
-		return nil, false
-	}
-	for _, ifa := range ifat {
-		switch ifa := ifa.(type) {
-		case *net.IPAddr:
-			if ip := routableIP(network, ifa.IP); ip != nil {
-				return ip, true
-			}
-		case *net.IPNet:
-			if ip := routableIP(network, ifa.IP); ip != nil {
-				return ip, true
-			}
-		}
-	}
-	return nil, false
-}
-
-func routableIP(network string, ip net.IP) net.IP {
-	if !ip.IsLoopback() && !ip.IsLinkLocalUnicast() && !ip.IsGlobalUnicast() {
-		return nil
-	}
-	switch network {
-	case "ip4":
-		if ip := ip.To4(); ip != nil {
-			return ip
-		}
-	case "ip6":
-		if ip.IsLoopback() { // addressing scope of the loopback address depends on each implementation
-			return nil
-		}
-		if ip := ip.To16(); ip != nil && ip.To4() == nil {
-			return ip
-		}
-	default:
-		if ip := ip.To4(); ip != nil {
-			return ip
-		}
-		if ip := ip.To16(); ip != nil {
-			return ip
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/rlimit.go b/installer/vendor/golang.org/x/net/internal/nettest/rlimit.go
deleted file mode 100644
index bb34aec0bb..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/rlimit.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package nettest
-
-const defaultMaxOpenFiles = 256
-
-// MaxOpenFiles returns the maximum number of open files for the
-// caller's process.
-func MaxOpenFiles() int { return maxOpenFiles() }
diff --git a/installer/vendor/golang.org/x/net/internal/nettest/stack.go b/installer/vendor/golang.org/x/net/internal/nettest/stack.go
deleted file mode 100644
index cc92c035bb..0000000000
--- a/installer/vendor/golang.org/x/net/internal/nettest/stack.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package nettest provides utilities for network testing.
-package nettest // import "golang.org/x/net/internal/nettest"
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"runtime"
-)
-
-var (
-	supportsIPv4 bool
-	supportsIPv6 bool
-)
-
-func init() {
-	if ln, err := net.Listen("tcp4", "127.0.0.1:0"); err == nil {
-		ln.Close()
-		supportsIPv4 = true
-	}
-	if ln, err := net.Listen("tcp6", "[::1]:0"); err == nil {
-		ln.Close()
-		supportsIPv6 = true
-	}
-}
-
-// SupportsIPv4 reports whether the platform supports IPv4 networking
-// functionality.
-func SupportsIPv4() bool { return supportsIPv4 }
-
-// SupportsIPv6 reports whether the platform supports IPv6 networking
-// functionality.
-func SupportsIPv6() bool { return supportsIPv6 }
-
-// SupportsRawIPSocket reports whether the platform supports raw IP
-// sockets.
-func SupportsRawIPSocket() (string, bool) {
-	return supportsRawIPSocket()
-}
-
-// SupportsIPv6MulticastDeliveryOnLoopback reports whether the
-// platform supports IPv6 multicast packet delivery on software
-// loopback interface.
-func SupportsIPv6MulticastDeliveryOnLoopback() bool {
-	return supportsIPv6MulticastDeliveryOnLoopback()
-}
-
-// ProtocolNotSupported reports whether err is a protocol not
-// supported error.
-func ProtocolNotSupported(err error) bool {
-	return protocolNotSupported(err)
-}
-
-// TestableNetwork reports whether network is testable on the current
-// platform configuration.
-func TestableNetwork(network string) bool {
-	// This is based on logic from standard library's
-	// net/platform_test.go.
-	switch network {
-	case "unix", "unixgram":
-		switch runtime.GOOS {
-		case "android", "nacl", "plan9", "windows":
-			return false
-		}
-		if runtime.GOOS == "darwin" && (runtime.GOARCH == "arm" || runtime.GOARCH == "arm64") {
-			return false
-		}
-	case "unixpacket":
-		switch runtime.GOOS {
-		case "android", "darwin", "freebsd", "nacl", "plan9", "windows":
-			return false
-		}
-	}
-	return true
-}
-
-// NewLocalListener returns a listener which listens to a loopback IP
-// address or local file system path.
-// Network must be "tcp", "tcp4", "tcp6", "unix" or "unixpacket".
-func NewLocalListener(network string) (net.Listener, error) {
-	switch network {
-	case "tcp":
-		if supportsIPv4 {
-			if ln, err := net.Listen("tcp4", "127.0.0.1:0"); err == nil {
-				return ln, nil
-			}
-		}
-		if supportsIPv6 {
-			return net.Listen("tcp6", "[::1]:0")
-		}
-	case "tcp4":
-		if supportsIPv4 {
-			return net.Listen("tcp4", "127.0.0.1:0")
-		}
-	case "tcp6":
-		if supportsIPv6 {
-			return net.Listen("tcp6", "[::1]:0")
-		}
-	case "unix", "unixpacket":
-		return net.Listen(network, localPath())
-	}
-	return nil, fmt.Errorf("%s is not supported", network)
-}
-
-// NewLocalPacketListener returns a packet listener which listens to a
-// loopback IP address or local file system path.
-// Network must be "udp", "udp4", "udp6" or "unixgram".
-func NewLocalPacketListener(network string) (net.PacketConn, error) {
-	switch network {
-	case "udp":
-		if supportsIPv4 {
-			if c, err := net.ListenPacket("udp4", "127.0.0.1:0"); err == nil {
-				return c, nil
-			}
-		}
-		if supportsIPv6 {
-			return net.ListenPacket("udp6", "[::1]:0")
-		}
-	case "udp4":
-		if supportsIPv4 {
-			return net.ListenPacket("udp4", "127.0.0.1:0")
-		}
-	case "udp6":
-		if supportsIPv6 {
-			return net.ListenPacket("udp6", "[::1]:0")
-		}
-	case "unixgram":
-		return net.ListenPacket(network, localPath())
-	}
-	return nil, fmt.Errorf("%s is not supported", network)
-}
-
-func localPath() string {
-	f, err := ioutil.TempFile("", "nettest")
-	if err != nil {
-		panic(err)
-	}
-	path := f.Name()
-	f.Close()
-	os.Remove(path)
-	return path
-}
diff --git a/installer/vendor/golang.org/x/net/internal/timeseries/timeseries.go b/installer/vendor/golang.org/x/net/internal/timeseries/timeseries.go
deleted file mode 100644
index 685f0e7ea2..0000000000
--- a/installer/vendor/golang.org/x/net/internal/timeseries/timeseries.go
+++ /dev/null
@@ -1,525 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package timeseries implements a time series structure for stats collection.
-package timeseries // import "golang.org/x/net/internal/timeseries"
-
-import (
-	"fmt"
-	"log"
-	"time"
-)
-
-const (
-	timeSeriesNumBuckets       = 64
-	minuteHourSeriesNumBuckets = 60
-)
-
-var timeSeriesResolutions = []time.Duration{
-	1 * time.Second,
-	10 * time.Second,
-	1 * time.Minute,
-	10 * time.Minute,
-	1 * time.Hour,
-	6 * time.Hour,
-	24 * time.Hour,          // 1 day
-	7 * 24 * time.Hour,      // 1 week
-	4 * 7 * 24 * time.Hour,  // 4 weeks
-	16 * 7 * 24 * time.Hour, // 16 weeks
-}
-
-var minuteHourSeriesResolutions = []time.Duration{
-	1 * time.Second,
-	1 * time.Minute,
-}
-
-// An Observable is a kind of data that can be aggregated in a time series.
-type Observable interface {
-	Multiply(ratio float64)    // Multiplies the data in self by a given ratio
-	Add(other Observable)      // Adds the data from a different observation to self
-	Clear()                    // Clears the observation so it can be reused.
-	CopyFrom(other Observable) // Copies the contents of a given observation to self
-}
-
-// Float attaches the methods of Observable to a float64.
-type Float float64
-
-// NewFloat returns a Float.
-func NewFloat() Observable {
-	f := Float(0)
-	return &f
-}
-
-// String returns the float as a string.
-func (f *Float) String() string { return fmt.Sprintf("%g", f.Value()) }
-
-// Value returns the float's value.
-func (f *Float) Value() float64 { return float64(*f) }
-
-func (f *Float) Multiply(ratio float64) { *f *= Float(ratio) }
-
-func (f *Float) Add(other Observable) {
-	o := other.(*Float)
-	*f += *o
-}
-
-func (f *Float) Clear() { *f = 0 }
-
-func (f *Float) CopyFrom(other Observable) {
-	o := other.(*Float)
-	*f = *o
-}
-
-// A Clock tells the current time.
-type Clock interface {
-	Time() time.Time
-}
-
-type defaultClock int
-
-var defaultClockInstance defaultClock
-
-func (defaultClock) Time() time.Time { return time.Now() }
-
-// Information kept per level. Each level consists of a circular list of
-// observations. The start of the level may be derived from end and the
-// len(buckets) * sizeInMillis.
-type tsLevel struct {
-	oldest   int               // index to oldest bucketed Observable
-	newest   int               // index to newest bucketed Observable
-	end      time.Time         // end timestamp for this level
-	size     time.Duration     // duration of the bucketed Observable
-	buckets  []Observable      // collections of observations
-	provider func() Observable // used for creating new Observable
-}
-
-func (l *tsLevel) Clear() {
-	l.oldest = 0
-	l.newest = len(l.buckets) - 1
-	l.end = time.Time{}
-	for i := range l.buckets {
-		if l.buckets[i] != nil {
-			l.buckets[i].Clear()
-			l.buckets[i] = nil
-		}
-	}
-}
-
-func (l *tsLevel) InitLevel(size time.Duration, numBuckets int, f func() Observable) {
-	l.size = size
-	l.provider = f
-	l.buckets = make([]Observable, numBuckets)
-}
-
-// Keeps a sequence of levels. Each level is responsible for storing data at
-// a given resolution. For example, the first level stores data at a one
-// minute resolution while the second level stores data at a one hour
-// resolution.
-
-// Each level is represented by a sequence of buckets. Each bucket spans an
-// interval equal to the resolution of the level. New observations are added
-// to the last bucket.
-type timeSeries struct {
-	provider    func() Observable // make more Observable
-	numBuckets  int               // number of buckets in each level
-	levels      []*tsLevel        // levels of bucketed Observable
-	lastAdd     time.Time         // time of last Observable tracked
-	total       Observable        // convenient aggregation of all Observable
-	clock       Clock             // Clock for getting current time
-	pending     Observable        // observations not yet bucketed
-	pendingTime time.Time         // what time are we keeping in pending
-	dirty       bool              // if there are pending observations
-}
-
-// init initializes a level according to the supplied criteria.
-func (ts *timeSeries) init(resolutions []time.Duration, f func() Observable, numBuckets int, clock Clock) {
-	ts.provider = f
-	ts.numBuckets = numBuckets
-	ts.clock = clock
-	ts.levels = make([]*tsLevel, len(resolutions))
-
-	for i := range resolutions {
-		if i > 0 && resolutions[i-1] >= resolutions[i] {
-			log.Print("timeseries: resolutions must be monotonically increasing")
-			break
-		}
-		newLevel := new(tsLevel)
-		newLevel.InitLevel(resolutions[i], ts.numBuckets, ts.provider)
-		ts.levels[i] = newLevel
-	}
-
-	ts.Clear()
-}
-
-// Clear removes all observations from the time series.
-func (ts *timeSeries) Clear() {
-	ts.lastAdd = time.Time{}
-	ts.total = ts.resetObservation(ts.total)
-	ts.pending = ts.resetObservation(ts.pending)
-	ts.pendingTime = time.Time{}
-	ts.dirty = false
-
-	for i := range ts.levels {
-		ts.levels[i].Clear()
-	}
-}
-
-// Add records an observation at the current time.
-func (ts *timeSeries) Add(observation Observable) {
-	ts.AddWithTime(observation, ts.clock.Time())
-}
-
-// AddWithTime records an observation at the specified time.
-func (ts *timeSeries) AddWithTime(observation Observable, t time.Time) {
-
-	smallBucketDuration := ts.levels[0].size
-
-	if t.After(ts.lastAdd) {
-		ts.lastAdd = t
-	}
-
-	if t.After(ts.pendingTime) {
-		ts.advance(t)
-		ts.mergePendingUpdates()
-		ts.pendingTime = ts.levels[0].end
-		ts.pending.CopyFrom(observation)
-		ts.dirty = true
-	} else if t.After(ts.pendingTime.Add(-1 * smallBucketDuration)) {
-		// The observation is close enough to go into the pending bucket.
-		// This compensates for clock skewing and small scheduling delays
-		// by letting the update stay in the fast path.
-		ts.pending.Add(observation)
-		ts.dirty = true
-	} else {
-		ts.mergeValue(observation, t)
-	}
-}
-
-// mergeValue inserts the observation at the specified time in the past into all levels.
-func (ts *timeSeries) mergeValue(observation Observable, t time.Time) {
-	for _, level := range ts.levels {
-		index := (ts.numBuckets - 1) - int(level.end.Sub(t)/level.size)
-		if 0 <= index && index < ts.numBuckets {
-			bucketNumber := (level.oldest + index) % ts.numBuckets
-			if level.buckets[bucketNumber] == nil {
-				level.buckets[bucketNumber] = level.provider()
-			}
-			level.buckets[bucketNumber].Add(observation)
-		}
-	}
-	ts.total.Add(observation)
-}
-
-// mergePendingUpdates applies the pending updates into all levels.
-func (ts *timeSeries) mergePendingUpdates() {
-	if ts.dirty {
-		ts.mergeValue(ts.pending, ts.pendingTime)
-		ts.pending = ts.resetObservation(ts.pending)
-		ts.dirty = false
-	}
-}
-
-// advance cycles the buckets at each level until the latest bucket in
-// each level can hold the time specified.
-func (ts *timeSeries) advance(t time.Time) {
-	if !t.After(ts.levels[0].end) {
-		return
-	}
-	for i := 0; i < len(ts.levels); i++ {
-		level := ts.levels[i]
-		if !level.end.Before(t) {
-			break
-		}
-
-		// If the time is sufficiently far, just clear the level and advance
-		// directly.
-		if !t.Before(level.end.Add(level.size * time.Duration(ts.numBuckets))) {
-			for _, b := range level.buckets {
-				ts.resetObservation(b)
-			}
-			level.end = time.Unix(0, (t.UnixNano()/level.size.Nanoseconds())*level.size.Nanoseconds())
-		}
-
-		for t.After(level.end) {
-			level.end = level.end.Add(level.size)
-			level.newest = level.oldest
-			level.oldest = (level.oldest + 1) % ts.numBuckets
-			ts.resetObservation(level.buckets[level.newest])
-		}
-
-		t = level.end
-	}
-}
-
-// Latest returns the sum of the num latest buckets from the level.
-func (ts *timeSeries) Latest(level, num int) Observable {
-	now := ts.clock.Time()
-	if ts.levels[0].end.Before(now) {
-		ts.advance(now)
-	}
-
-	ts.mergePendingUpdates()
-
-	result := ts.provider()
-	l := ts.levels[level]
-	index := l.newest
-
-	for i := 0; i < num; i++ {
-		if l.buckets[index] != nil {
-			result.Add(l.buckets[index])
-		}
-		if index == 0 {
-			index = ts.numBuckets
-		}
-		index--
-	}
-
-	return result
-}
-
-// LatestBuckets returns a copy of the num latest buckets from level.
-func (ts *timeSeries) LatestBuckets(level, num int) []Observable {
-	if level < 0 || level > len(ts.levels) {
-		log.Print("timeseries: bad level argument: ", level)
-		return nil
-	}
-	if num < 0 || num >= ts.numBuckets {
-		log.Print("timeseries: bad num argument: ", num)
-		return nil
-	}
-
-	results := make([]Observable, num)
-	now := ts.clock.Time()
-	if ts.levels[0].end.Before(now) {
-		ts.advance(now)
-	}
-
-	ts.mergePendingUpdates()
-
-	l := ts.levels[level]
-	index := l.newest
-
-	for i := 0; i < num; i++ {
-		result := ts.provider()
-		results[i] = result
-		if l.buckets[index] != nil {
-			result.CopyFrom(l.buckets[index])
-		}
-
-		if index == 0 {
-			index = ts.numBuckets
-		}
-		index -= 1
-	}
-	return results
-}
-
-// ScaleBy updates observations by scaling by factor.
-func (ts *timeSeries) ScaleBy(factor float64) {
-	for _, l := range ts.levels {
-		for i := 0; i < ts.numBuckets; i++ {
-			l.buckets[i].Multiply(factor)
-		}
-	}
-
-	ts.total.Multiply(factor)
-	ts.pending.Multiply(factor)
-}
-
-// Range returns the sum of observations added over the specified time range.
-// If start or finish times don't fall on bucket boundaries of the same
-// level, then return values are approximate answers.
-func (ts *timeSeries) Range(start, finish time.Time) Observable {
-	return ts.ComputeRange(start, finish, 1)[0]
-}
-
-// Recent returns the sum of observations from the last delta.
-func (ts *timeSeries) Recent(delta time.Duration) Observable {
-	now := ts.clock.Time()
-	return ts.Range(now.Add(-delta), now)
-}
-
-// Total returns the total of all observations.
-func (ts *timeSeries) Total() Observable {
-	ts.mergePendingUpdates()
-	return ts.total
-}
-
-// ComputeRange computes a specified number of values into a slice using
-// the observations recorded over the specified time period. The return
-// values are approximate if the start or finish times don't fall on the
-// bucket boundaries at the same level or if the number of buckets spanning
-// the range is not an integral multiple of num.
-func (ts *timeSeries) ComputeRange(start, finish time.Time, num int) []Observable {
-	if start.After(finish) {
-		log.Printf("timeseries: start > finish, %v>%v", start, finish)
-		return nil
-	}
-
-	if num < 0 {
-		log.Printf("timeseries: num < 0, %v", num)
-		return nil
-	}
-
-	results := make([]Observable, num)
-
-	for _, l := range ts.levels {
-		if !start.Before(l.end.Add(-l.size * time.Duration(ts.numBuckets))) {
-			ts.extract(l, start, finish, num, results)
-			return results
-		}
-	}
-
-	// Failed to find a level that covers the desired range. So just
-	// extract from the last level, even if it doesn't cover the entire
-	// desired range.
-	ts.extract(ts.levels[len(ts.levels)-1], start, finish, num, results)
-
-	return results
-}
-
-// RecentList returns the specified number of values in slice over the most
-// recent time period of the specified range.
-func (ts *timeSeries) RecentList(delta time.Duration, num int) []Observable {
-	if delta < 0 {
-		return nil
-	}
-	now := ts.clock.Time()
-	return ts.ComputeRange(now.Add(-delta), now, num)
-}
-
-// extract returns a slice of specified number of observations from a given
-// level over a given range.
-func (ts *timeSeries) extract(l *tsLevel, start, finish time.Time, num int, results []Observable) {
-	ts.mergePendingUpdates()
-
-	srcInterval := l.size
-	dstInterval := finish.Sub(start) / time.Duration(num)
-	dstStart := start
-	srcStart := l.end.Add(-srcInterval * time.Duration(ts.numBuckets))
-
-	srcIndex := 0
-
-	// Where should scanning start?
-	if dstStart.After(srcStart) {
-		advance := dstStart.Sub(srcStart) / srcInterval
-		srcIndex += int(advance)
-		srcStart = srcStart.Add(advance * srcInterval)
-	}
-
-	// The i'th value is computed as show below.
-	// interval = (finish/start)/num
-	// i'th value = sum of observation in range
-	//   [ start + i       * interval,
-	//     start + (i + 1) * interval )
-	for i := 0; i < num; i++ {
-		results[i] = ts.resetObservation(results[i])
-		dstEnd := dstStart.Add(dstInterval)
-		for srcIndex < ts.numBuckets && srcStart.Before(dstEnd) {
-			srcEnd := srcStart.Add(srcInterval)
-			if srcEnd.After(ts.lastAdd) {
-				srcEnd = ts.lastAdd
-			}
-
-			if !srcEnd.Before(dstStart) {
-				srcValue := l.buckets[(srcIndex+l.oldest)%ts.numBuckets]
-				if !srcStart.Before(dstStart) && !srcEnd.After(dstEnd) {
-					// dst completely contains src.
-					if srcValue != nil {
-						results[i].Add(srcValue)
-					}
-				} else {
-					// dst partially overlaps src.
-					overlapStart := maxTime(srcStart, dstStart)
-					overlapEnd := minTime(srcEnd, dstEnd)
-					base := srcEnd.Sub(srcStart)
-					fraction := overlapEnd.Sub(overlapStart).Seconds() / base.Seconds()
-
-					used := ts.provider()
-					if srcValue != nil {
-						used.CopyFrom(srcValue)
-					}
-					used.Multiply(fraction)
-					results[i].Add(used)
-				}
-
-				if srcEnd.After(dstEnd) {
-					break
-				}
-			}
-			srcIndex++
-			srcStart = srcStart.Add(srcInterval)
-		}
-		dstStart = dstStart.Add(dstInterval)
-	}
-}
-
-// resetObservation clears the content so the struct may be reused.
-func (ts *timeSeries) resetObservation(observation Observable) Observable {
-	if observation == nil {
-		observation = ts.provider()
-	} else {
-		observation.Clear()
-	}
-	return observation
-}
-
-// TimeSeries tracks data at granularities from 1 second to 16 weeks.
-type TimeSeries struct {
-	timeSeries
-}
-
-// NewTimeSeries creates a new TimeSeries using the function provided for creating new Observable.
-func NewTimeSeries(f func() Observable) *TimeSeries {
-	return NewTimeSeriesWithClock(f, defaultClockInstance)
-}
-
-// NewTimeSeriesWithClock creates a new TimeSeries using the function provided for creating new Observable and the clock for
-// assigning timestamps.
-func NewTimeSeriesWithClock(f func() Observable, clock Clock) *TimeSeries {
-	ts := new(TimeSeries)
-	ts.timeSeries.init(timeSeriesResolutions, f, timeSeriesNumBuckets, clock)
-	return ts
-}
-
-// MinuteHourSeries tracks data at granularities of 1 minute and 1 hour.
-type MinuteHourSeries struct {
-	timeSeries
-}
-
-// NewMinuteHourSeries creates a new MinuteHourSeries using the function provided for creating new Observable.
-func NewMinuteHourSeries(f func() Observable) *MinuteHourSeries {
-	return NewMinuteHourSeriesWithClock(f, defaultClockInstance)
-}
-
-// NewMinuteHourSeriesWithClock creates a new MinuteHourSeries using the function provided for creating new Observable and the clock for
-// assigning timestamps.
-func NewMinuteHourSeriesWithClock(f func() Observable, clock Clock) *MinuteHourSeries {
-	ts := new(MinuteHourSeries)
-	ts.timeSeries.init(minuteHourSeriesResolutions, f,
-		minuteHourSeriesNumBuckets, clock)
-	return ts
-}
-
-func (ts *MinuteHourSeries) Minute() Observable {
-	return ts.timeSeries.Latest(0, 60)
-}
-
-func (ts *MinuteHourSeries) Hour() Observable {
-	return ts.timeSeries.Latest(1, 60)
-}
-
-func minTime(a, b time.Time) time.Time {
-	if a.Before(b) {
-		return a
-	}
-	return b
-}
-
-func maxTime(a, b time.Time) time.Time {
-	if a.After(b) {
-		return a
-	}
-	return b
-}
diff --git a/installer/vendor/golang.org/x/net/internal/timeseries/timeseries_test.go b/installer/vendor/golang.org/x/net/internal/timeseries/timeseries_test.go
deleted file mode 100644
index 66325a912a..0000000000
--- a/installer/vendor/golang.org/x/net/internal/timeseries/timeseries_test.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package timeseries
-
-import (
-	"math"
-	"testing"
-	"time"
-)
-
-func isNear(x *Float, y float64, tolerance float64) bool {
-	return math.Abs(x.Value()-y) < tolerance
-}
-
-func isApproximate(x *Float, y float64) bool {
-	return isNear(x, y, 1e-2)
-}
-
-func checkApproximate(t *testing.T, o Observable, y float64) {
-	x := o.(*Float)
-	if !isApproximate(x, y) {
-		t.Errorf("Wanted %g, got %g", y, x.Value())
-	}
-}
-
-func checkNear(t *testing.T, o Observable, y, tolerance float64) {
-	x := o.(*Float)
-	if !isNear(x, y, tolerance) {
-		t.Errorf("Wanted %g +- %g, got %g", y, tolerance, x.Value())
-	}
-}
-
-var baseTime = time.Date(2013, 1, 1, 0, 0, 0, 0, time.UTC)
-
-func tu(s int64) time.Time {
-	return baseTime.Add(time.Duration(s) * time.Second)
-}
-
-func tu2(s int64, ns int64) time.Time {
-	return baseTime.Add(time.Duration(s)*time.Second + time.Duration(ns)*time.Nanosecond)
-}
-
-func TestBasicTimeSeries(t *testing.T) {
-	ts := NewTimeSeries(NewFloat)
-	fo := new(Float)
-	*fo = Float(10)
-	ts.AddWithTime(fo, tu(1))
-	ts.AddWithTime(fo, tu(1))
-	ts.AddWithTime(fo, tu(1))
-	ts.AddWithTime(fo, tu(1))
-	checkApproximate(t, ts.Range(tu(0), tu(1)), 40)
-	checkApproximate(t, ts.Total(), 40)
-	ts.AddWithTime(fo, tu(3))
-	ts.AddWithTime(fo, tu(3))
-	ts.AddWithTime(fo, tu(3))
-	checkApproximate(t, ts.Range(tu(0), tu(2)), 40)
-	checkApproximate(t, ts.Range(tu(2), tu(4)), 30)
-	checkApproximate(t, ts.Total(), 70)
-	ts.AddWithTime(fo, tu(1))
-	ts.AddWithTime(fo, tu(1))
-	checkApproximate(t, ts.Range(tu(0), tu(2)), 60)
-	checkApproximate(t, ts.Range(tu(2), tu(4)), 30)
-	checkApproximate(t, ts.Total(), 90)
-	*fo = Float(100)
-	ts.AddWithTime(fo, tu(100))
-	checkApproximate(t, ts.Range(tu(99), tu(100)), 100)
-	checkApproximate(t, ts.Range(tu(0), tu(4)), 36)
-	checkApproximate(t, ts.Total(), 190)
-	*fo = Float(10)
-	ts.AddWithTime(fo, tu(1))
-	ts.AddWithTime(fo, tu(1))
-	checkApproximate(t, ts.Range(tu(0), tu(4)), 44)
-	checkApproximate(t, ts.Range(tu(37), tu2(100, 100e6)), 100)
-	checkApproximate(t, ts.Range(tu(50), tu2(100, 100e6)), 100)
-	checkApproximate(t, ts.Range(tu(99), tu2(100, 100e6)), 100)
-	checkApproximate(t, ts.Total(), 210)
-
-	for i, l := range ts.ComputeRange(tu(36), tu(100), 64) {
-		if i == 63 {
-			checkApproximate(t, l, 100)
-		} else {
-			checkApproximate(t, l, 0)
-		}
-	}
-
-	checkApproximate(t, ts.Range(tu(0), tu(100)), 210)
-	checkApproximate(t, ts.Range(tu(10), tu(100)), 100)
-
-	for i, l := range ts.ComputeRange(tu(0), tu(100), 100) {
-		if i < 10 {
-			checkApproximate(t, l, 11)
-		} else if i >= 90 {
-			checkApproximate(t, l, 10)
-		} else {
-			checkApproximate(t, l, 0)
-		}
-	}
-}
-
-func TestFloat(t *testing.T) {
-	f := Float(1)
-	if g, w := f.String(), "1"; g != w {
-		t.Errorf("Float(1).String = %q; want %q", g, w)
-	}
-	f2 := Float(2)
-	var o Observable = &f2
-	f.Add(o)
-	if g, w := f.Value(), 3.0; g != w {
-		t.Errorf("Float post-add = %v; want %v", g, w)
-	}
-	f.Multiply(2)
-	if g, w := f.Value(), 6.0; g != w {
-		t.Errorf("Float post-multiply = %v; want %v", g, w)
-	}
-	f.Clear()
-	if g, w := f.Value(), 0.0; g != w {
-		t.Errorf("Float post-clear = %v; want %v", g, w)
-	}
-	f.CopyFrom(&f2)
-	if g, w := f.Value(), 2.0; g != w {
-		t.Errorf("Float post-CopyFrom = %v; want %v", g, w)
-	}
-}
-
-type mockClock struct {
-	time time.Time
-}
-
-func (m *mockClock) Time() time.Time { return m.time }
-func (m *mockClock) Set(t time.Time) { m.time = t }
-
-const buckets = 6
-
-var testResolutions = []time.Duration{
-	10 * time.Second,  // level holds one minute of observations
-	100 * time.Second, // level holds ten minutes of observations
-	10 * time.Minute,  // level holds one hour of observations
-}
-
-// TestTimeSeries uses a small number of buckets to force a higher
-// error rate on approximations from the timeseries.
-type TestTimeSeries struct {
-	timeSeries
-}
-
-func TestExpectedErrorRate(t *testing.T) {
-	ts := new(TestTimeSeries)
-	fake := new(mockClock)
-	fake.Set(time.Now())
-	ts.timeSeries.init(testResolutions, NewFloat, buckets, fake)
-	for i := 1; i <= 61*61; i++ {
-		fake.Set(fake.Time().Add(1 * time.Second))
-		ob := Float(1)
-		ts.AddWithTime(&ob, fake.Time())
-
-		// The results should be accurate within one missing bucket (1/6) of the observations recorded.
-		checkNear(t, ts.Latest(0, buckets), min(float64(i), 60), 10)
-		checkNear(t, ts.Latest(1, buckets), min(float64(i), 600), 100)
-		checkNear(t, ts.Latest(2, buckets), min(float64(i), 3600), 600)
-	}
-}
-
-func min(a, b float64) float64 {
-	if a < b {
-		return a
-	}
-	return b
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/bpf_test.go b/installer/vendor/golang.org/x/net/ipv4/bpf_test.go
deleted file mode 100644
index b44da90549..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/bpf_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv4"
-)
-
-func TestBPF(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	l, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-
-	p := ipv4.NewPacketConn(l)
-
-	// This filter accepts UDP packets whose first payload byte is
-	// even.
-	prog, err := bpf.Assemble([]bpf.Instruction{
-		// Load the first byte of the payload (skipping UDP header).
-		bpf.LoadAbsolute{Off: 8, Size: 1},
-		// Select LSB of the byte.
-		bpf.ALUOpConstant{Op: bpf.ALUOpAnd, Val: 1},
-		// Byte is even?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: 0, SkipFalse: 1},
-		// Accept.
-		bpf.RetConstant{Val: 4096},
-		// Ignore.
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("compiling BPF: %s", err)
-	}
-
-	if err = p.SetBPF(prog); err != nil {
-		t.Fatalf("attaching filter to Conn: %s", err)
-	}
-
-	s, err := net.Dial("udp4", l.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	go func() {
-		for i := byte(0); i < 10; i++ {
-			s.Write([]byte{i})
-		}
-	}()
-
-	l.SetDeadline(time.Now().Add(2 * time.Second))
-	seen := make([]bool, 5)
-	for {
-		var b [512]byte
-		n, _, err := l.ReadFrom(b[:])
-		if err != nil {
-			t.Fatalf("reading from listener: %s", err)
-		}
-		if n != 1 {
-			t.Fatalf("unexpected packet length, want 1, got %d", n)
-		}
-		if b[0] >= 10 {
-			t.Fatalf("unexpected byte, want 0-9, got %d", b[0])
-		}
-		if b[0]%2 != 0 {
-			t.Fatalf("got odd byte %d, wanted only even bytes", b[0])
-		}
-		seen[b[0]/2] = true
-
-		seenAll := true
-		for _, v := range seen {
-			if !v {
-				seenAll = false
-				break
-			}
-		}
-		if seenAll {
-			break
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/bpfopt_linux.go b/installer/vendor/golang.org/x/net/ipv4/bpfopt_linux.go
deleted file mode 100644
index 2d626d924c..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/bpfopt_linux.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/internal/netreflect"
-)
-
-// SetBPF attaches a BPF program to the connection.
-//
-// Only supported on Linux.
-func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	prog := sockFProg{
-		Len:    uint16(len(filter)),
-		Filter: (*sockFilter)(unsafe.Pointer(&filter[0])),
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, sysSOL_SOCKET, sysSO_ATTACH_FILTER, unsafe.Pointer(&prog), uint32(unsafe.Sizeof(prog))))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/bpfopt_stub.go b/installer/vendor/golang.org/x/net/ipv4/bpfopt_stub.go
deleted file mode 100644
index c4a8481f08..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/bpfopt_stub.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !linux
-
-package ipv4
-
-import "golang.org/x/net/bpf"
-
-// SetBPF attaches a BPF program to the connection.
-//
-// Only supported on Linux.
-func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control.go b/installer/vendor/golang.org/x/net/ipv4/control.go
deleted file mode 100644
index da4da2dd0e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"fmt"
-	"net"
-	"sync"
-)
-
-type rawOpt struct {
-	sync.RWMutex
-	cflags ControlFlags
-}
-
-func (c *rawOpt) set(f ControlFlags)        { c.cflags |= f }
-func (c *rawOpt) clear(f ControlFlags)      { c.cflags &^= f }
-func (c *rawOpt) isset(f ControlFlags) bool { return c.cflags&f != 0 }
-
-type ControlFlags uint
-
-const (
-	FlagTTL       ControlFlags = 1 << iota // pass the TTL on the received packet
-	FlagSrc                                // pass the source address on the received packet
-	FlagDst                                // pass the destination address on the received packet
-	FlagInterface                          // pass the interface index on the received packet
-)
-
-// A ControlMessage represents per packet basis IP-level socket options.
-type ControlMessage struct {
-	// Receiving socket options: SetControlMessage allows to
-	// receive the options from the protocol stack using ReadFrom
-	// method of PacketConn or RawConn.
-	//
-	// Specifying socket options: ControlMessage for WriteTo
-	// method of PacketConn or RawConn allows to send the options
-	// to the protocol stack.
-	//
-	TTL     int    // time-to-live, receiving only
-	Src     net.IP // source address, specifying only
-	Dst     net.IP // destination address, receiving only
-	IfIndex int    // interface index, must be 1 <= value when specifying
-}
-
-func (cm *ControlMessage) String() string {
-	if cm == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ttl=%d src=%v dst=%v ifindex=%d", cm.TTL, cm.Src, cm.Dst, cm.IfIndex)
-}
-
-// Ancillary data socket options
-const (
-	ctlTTL        = iota // header field
-	ctlSrc               // header field
-	ctlDst               // header field
-	ctlInterface         // inbound or outbound interface
-	ctlPacketInfo        // inbound or outbound packet path
-	ctlMax
-)
-
-// A ctlOpt represents a binding for ancillary data socket option.
-type ctlOpt struct {
-	name    int // option name, must be equal or greater than 1
-	length  int // option length
-	marshal func([]byte, *ControlMessage) []byte
-	parse   func(*ControlMessage, []byte)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control_bsd.go b/installer/vendor/golang.org/x/net/ipv4/control_bsd.go
deleted file mode 100644
index 3f27f99452..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control_bsd.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func marshalDst(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIP
-	m.Type = sysIP_RECVDSTADDR
-	m.SetLen(syscall.CmsgLen(net.IPv4len))
-	return b[syscall.CmsgSpace(net.IPv4len):]
-}
-
-func parseDst(cm *ControlMessage, b []byte) {
-	cm.Dst = b[:net.IPv4len]
-}
-
-func marshalInterface(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIP
-	m.Type = sysIP_RECVIF
-	m.SetLen(syscall.CmsgLen(syscall.SizeofSockaddrDatalink))
-	return b[syscall.CmsgSpace(syscall.SizeofSockaddrDatalink):]
-}
-
-func parseInterface(cm *ControlMessage, b []byte) {
-	sadl := (*syscall.SockaddrDatalink)(unsafe.Pointer(&b[0]))
-	cm.IfIndex = int(sadl.Index)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control_pktinfo.go b/installer/vendor/golang.org/x/net/ipv4/control_pktinfo.go
deleted file mode 100644
index 9ed9773416..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control_pktinfo.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin linux solaris
-
-package ipv4
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIP
-	m.Type = sysIP_PKTINFO
-	m.SetLen(syscall.CmsgLen(sizeofInetPktinfo))
-	if cm != nil {
-		pi := (*inetPktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
-		if ip := cm.Src.To4(); ip != nil {
-			copy(pi.Spec_dst[:], ip)
-		}
-		if cm.IfIndex > 0 {
-			pi.setIfindex(cm.IfIndex)
-		}
-	}
-	return b[syscall.CmsgSpace(sizeofInetPktinfo):]
-}
-
-func parsePacketInfo(cm *ControlMessage, b []byte) {
-	pi := (*inetPktinfo)(unsafe.Pointer(&b[0]))
-	cm.IfIndex = int(pi.Ifindex)
-	cm.Dst = pi.Addr[:]
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control_stub.go b/installer/vendor/golang.org/x/net/ipv4/control_stub.go
deleted file mode 100644
index 27e618bc2f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control_stub.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv4
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	return errOpNoSupport
-}
-
-func newControlMessage(opt *rawOpt) []byte {
-	return nil
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	return nil, errOpNoSupport
-}
-
-func marshalControlMessage(cm *ControlMessage) []byte {
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control_unix.go b/installer/vendor/golang.org/x/net/ipv4/control_unix.go
deleted file mode 100644
index 25ef661925..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control_unix.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package ipv4
-
-import (
-	"os"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	opt.Lock()
-	defer opt.Unlock()
-	if cf&FlagTTL != 0 && sockOpts[ssoReceiveTTL].name > 0 {
-		if err := setInt(s, &sockOpts[ssoReceiveTTL], boolint(on)); err != nil {
-			return err
-		}
-		if on {
-			opt.set(FlagTTL)
-		} else {
-			opt.clear(FlagTTL)
-		}
-	}
-	if sockOpts[ssoPacketInfo].name > 0 {
-		if cf&(FlagSrc|FlagDst|FlagInterface) != 0 {
-			if err := setInt(s, &sockOpts[ssoPacketInfo], boolint(on)); err != nil {
-				return err
-			}
-			if on {
-				opt.set(cf & (FlagSrc | FlagDst | FlagInterface))
-			} else {
-				opt.clear(cf & (FlagSrc | FlagDst | FlagInterface))
-			}
-		}
-	} else {
-		if cf&FlagDst != 0 && sockOpts[ssoReceiveDst].name > 0 {
-			if err := setInt(s, &sockOpts[ssoReceiveDst], boolint(on)); err != nil {
-				return err
-			}
-			if on {
-				opt.set(FlagDst)
-			} else {
-				opt.clear(FlagDst)
-			}
-		}
-		if cf&FlagInterface != 0 && sockOpts[ssoReceiveInterface].name > 0 {
-			if err := setInt(s, &sockOpts[ssoReceiveInterface], boolint(on)); err != nil {
-				return err
-			}
-			if on {
-				opt.set(FlagInterface)
-			} else {
-				opt.clear(FlagInterface)
-			}
-		}
-	}
-	return nil
-}
-
-func newControlMessage(opt *rawOpt) (oob []byte) {
-	opt.RLock()
-	var l int
-	if opt.isset(FlagTTL) && ctlOpts[ctlTTL].name > 0 {
-		l += syscall.CmsgSpace(ctlOpts[ctlTTL].length)
-	}
-	if ctlOpts[ctlPacketInfo].name > 0 {
-		if opt.isset(FlagSrc | FlagDst | FlagInterface) {
-			l += syscall.CmsgSpace(ctlOpts[ctlPacketInfo].length)
-		}
-	} else {
-		if opt.isset(FlagDst) && ctlOpts[ctlDst].name > 0 {
-			l += syscall.CmsgSpace(ctlOpts[ctlDst].length)
-		}
-		if opt.isset(FlagInterface) && ctlOpts[ctlInterface].name > 0 {
-			l += syscall.CmsgSpace(ctlOpts[ctlInterface].length)
-		}
-	}
-	if l > 0 {
-		oob = make([]byte, l)
-	}
-	opt.RUnlock()
-	return
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	if len(b) == 0 {
-		return nil, nil
-	}
-	cmsgs, err := syscall.ParseSocketControlMessage(b)
-	if err != nil {
-		return nil, os.NewSyscallError("parse socket control message", err)
-	}
-	cm := &ControlMessage{}
-	for _, m := range cmsgs {
-		if m.Header.Level != iana.ProtocolIP {
-			continue
-		}
-		switch int(m.Header.Type) {
-		case ctlOpts[ctlTTL].name:
-			ctlOpts[ctlTTL].parse(cm, m.Data[:])
-		case ctlOpts[ctlDst].name:
-			ctlOpts[ctlDst].parse(cm, m.Data[:])
-		case ctlOpts[ctlInterface].name:
-			ctlOpts[ctlInterface].parse(cm, m.Data[:])
-		case ctlOpts[ctlPacketInfo].name:
-			ctlOpts[ctlPacketInfo].parse(cm, m.Data[:])
-		}
-	}
-	return cm, nil
-}
-
-func marshalControlMessage(cm *ControlMessage) (oob []byte) {
-	if cm == nil {
-		return nil
-	}
-	var l int
-	pktinfo := false
-	if ctlOpts[ctlPacketInfo].name > 0 && (cm.Src.To4() != nil || cm.IfIndex > 0) {
-		pktinfo = true
-		l += syscall.CmsgSpace(ctlOpts[ctlPacketInfo].length)
-	}
-	if l > 0 {
-		oob = make([]byte, l)
-		b := oob
-		if pktinfo {
-			b = ctlOpts[ctlPacketInfo].marshal(b, cm)
-		}
-	}
-	return
-}
-
-func marshalTTL(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIP
-	m.Type = sysIP_RECVTTL
-	m.SetLen(syscall.CmsgLen(1))
-	return b[syscall.CmsgSpace(1):]
-}
-
-func parseTTL(cm *ControlMessage, b []byte) {
-	cm.TTL = int(*(*byte)(unsafe.Pointer(&b[:1][0])))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/control_windows.go b/installer/vendor/golang.org/x/net/ipv4/control_windows.go
deleted file mode 100644
index b27407db95..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/control_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import "syscall"
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	// TODO(mikio): implement this
-	return syscall.EWINDOWS
-}
-
-func newControlMessage(opt *rawOpt) []byte {
-	// TODO(mikio): implement this
-	return nil
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	// TODO(mikio): implement this
-	return nil, syscall.EWINDOWS
-}
-
-func marshalControlMessage(cm *ControlMessage) []byte {
-	// TODO(mikio): implement this
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_darwin.go b/installer/vendor/golang.org/x/net/ipv4/defs_darwin.go
deleted file mode 100644
index c8f2e05b81..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_darwin.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_STRIPHDR    = C.IP_STRIPHDR
-	sysIP_RECVTTL     = C.IP_RECVTTL
-	sysIP_BOUND_IF    = C.IP_BOUND_IF
-	sysIP_PKTINFO     = C.IP_PKTINFO
-	sysIP_RECVPKTINFO = C.IP_RECVPKTINFO
-
-	sysIP_MULTICAST_IF           = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL          = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP         = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP         = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP        = C.IP_DROP_MEMBERSHIP
-	sysIP_MULTICAST_VIF          = C.IP_MULTICAST_VIF
-	sysIP_MULTICAST_IFINDEX      = C.IP_MULTICAST_IFINDEX
-	sysIP_ADD_SOURCE_MEMBERSHIP  = C.IP_ADD_SOURCE_MEMBERSHIP
-	sysIP_DROP_SOURCE_MEMBERSHIP = C.IP_DROP_SOURCE_MEMBERSHIP
-	sysIP_BLOCK_SOURCE           = C.IP_BLOCK_SOURCE
-	sysIP_UNBLOCK_SOURCE         = C.IP_UNBLOCK_SOURCE
-	sysMCAST_JOIN_GROUP          = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP         = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP   = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP  = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE        = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE      = C.MCAST_UNBLOCK_SOURCE
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofInetPktinfo     = C.sizeof_struct_in_pktinfo
-
-	sizeofIPMreq         = C.sizeof_struct_ip_mreq
-	sizeofIPMreqn        = C.sizeof_struct_ip_mreqn
-	sizeofIPMreqSource   = C.sizeof_struct_ip_mreq_source
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet C.struct_sockaddr_in
-
-type inetPktinfo C.struct_in_pktinfo
-
-type ipMreq C.struct_ip_mreq
-
-type ipMreqn C.struct_ip_mreqn
-
-type ipMreqSource C.struct_ip_mreq_source
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_dragonfly.go b/installer/vendor/golang.org/x/net/ipv4/defs_dragonfly.go
deleted file mode 100644
index f30544ea24..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_dragonfly.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_RECVTTL     = C.IP_RECVTTL
-
-	sysIP_MULTICAST_IF    = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL   = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP  = C.IP_MULTICAST_LOOP
-	sysIP_MULTICAST_VIF   = C.IP_MULTICAST_VIF
-	sysIP_ADD_MEMBERSHIP  = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP = C.IP_DROP_MEMBERSHIP
-
-	sizeofIPMreq = C.sizeof_struct_ip_mreq
-)
-
-type ipMreq C.struct_ip_mreq
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_freebsd.go b/installer/vendor/golang.org/x/net/ipv4/defs_freebsd.go
deleted file mode 100644
index 4dd57d8653..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_freebsd.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_SENDSRCADDR = C.IP_SENDSRCADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_ONESBCAST   = C.IP_ONESBCAST
-	sysIP_BINDANY     = C.IP_BINDANY
-	sysIP_RECVTTL     = C.IP_RECVTTL
-	sysIP_MINTTL      = C.IP_MINTTL
-	sysIP_DONTFRAG    = C.IP_DONTFRAG
-	sysIP_RECVTOS     = C.IP_RECVTOS
-
-	sysIP_MULTICAST_IF           = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL          = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP         = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP         = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP        = C.IP_DROP_MEMBERSHIP
-	sysIP_MULTICAST_VIF          = C.IP_MULTICAST_VIF
-	sysIP_ADD_SOURCE_MEMBERSHIP  = C.IP_ADD_SOURCE_MEMBERSHIP
-	sysIP_DROP_SOURCE_MEMBERSHIP = C.IP_DROP_SOURCE_MEMBERSHIP
-	sysIP_BLOCK_SOURCE           = C.IP_BLOCK_SOURCE
-	sysIP_UNBLOCK_SOURCE         = C.IP_UNBLOCK_SOURCE
-	sysMCAST_JOIN_GROUP          = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP         = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP   = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP  = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE        = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE      = C.MCAST_UNBLOCK_SOURCE
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-
-	sizeofIPMreq         = C.sizeof_struct_ip_mreq
-	sizeofIPMreqn        = C.sizeof_struct_ip_mreqn
-	sizeofIPMreqSource   = C.sizeof_struct_ip_mreq_source
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet C.struct_sockaddr_in
-
-type ipMreq C.struct_ip_mreq
-
-type ipMreqn C.struct_ip_mreqn
-
-type ipMreqSource C.struct_ip_mreq_source
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_linux.go b/installer/vendor/golang.org/x/net/ipv4/defs_linux.go
deleted file mode 100644
index 31dfa093cb..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_linux.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <time.h>
-
-#include <linux/errqueue.h>
-#include <linux/icmp.h>
-#include <linux/in.h>
-#include <linux/filter.h>
-#include <sys/socket.h>
-*/
-import "C"
-
-const (
-	sysIP_TOS             = C.IP_TOS
-	sysIP_TTL             = C.IP_TTL
-	sysIP_HDRINCL         = C.IP_HDRINCL
-	sysIP_OPTIONS         = C.IP_OPTIONS
-	sysIP_ROUTER_ALERT    = C.IP_ROUTER_ALERT
-	sysIP_RECVOPTS        = C.IP_RECVOPTS
-	sysIP_RETOPTS         = C.IP_RETOPTS
-	sysIP_PKTINFO         = C.IP_PKTINFO
-	sysIP_PKTOPTIONS      = C.IP_PKTOPTIONS
-	sysIP_MTU_DISCOVER    = C.IP_MTU_DISCOVER
-	sysIP_RECVERR         = C.IP_RECVERR
-	sysIP_RECVTTL         = C.IP_RECVTTL
-	sysIP_RECVTOS         = C.IP_RECVTOS
-	sysIP_MTU             = C.IP_MTU
-	sysIP_FREEBIND        = C.IP_FREEBIND
-	sysIP_TRANSPARENT     = C.IP_TRANSPARENT
-	sysIP_RECVRETOPTS     = C.IP_RECVRETOPTS
-	sysIP_ORIGDSTADDR     = C.IP_ORIGDSTADDR
-	sysIP_RECVORIGDSTADDR = C.IP_RECVORIGDSTADDR
-	sysIP_MINTTL          = C.IP_MINTTL
-	sysIP_NODEFRAG        = C.IP_NODEFRAG
-	sysIP_UNICAST_IF      = C.IP_UNICAST_IF
-
-	sysIP_MULTICAST_IF           = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL          = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP         = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP         = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP        = C.IP_DROP_MEMBERSHIP
-	sysIP_UNBLOCK_SOURCE         = C.IP_UNBLOCK_SOURCE
-	sysIP_BLOCK_SOURCE           = C.IP_BLOCK_SOURCE
-	sysIP_ADD_SOURCE_MEMBERSHIP  = C.IP_ADD_SOURCE_MEMBERSHIP
-	sysIP_DROP_SOURCE_MEMBERSHIP = C.IP_DROP_SOURCE_MEMBERSHIP
-	sysIP_MSFILTER               = C.IP_MSFILTER
-	sysMCAST_JOIN_GROUP          = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP         = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP   = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP  = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE        = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE      = C.MCAST_UNBLOCK_SOURCE
-	sysMCAST_MSFILTER            = C.MCAST_MSFILTER
-	sysIP_MULTICAST_ALL          = C.IP_MULTICAST_ALL
-
-	//sysIP_PMTUDISC_DONT      = C.IP_PMTUDISC_DONT
-	//sysIP_PMTUDISC_WANT      = C.IP_PMTUDISC_WANT
-	//sysIP_PMTUDISC_DO        = C.IP_PMTUDISC_DO
-	//sysIP_PMTUDISC_PROBE     = C.IP_PMTUDISC_PROBE
-	//sysIP_PMTUDISC_INTERFACE = C.IP_PMTUDISC_INTERFACE
-	//sysIP_PMTUDISC_OMIT      = C.IP_PMTUDISC_OMIT
-
-	sysICMP_FILTER = C.ICMP_FILTER
-
-	sysSO_EE_ORIGIN_NONE         = C.SO_EE_ORIGIN_NONE
-	sysSO_EE_ORIGIN_LOCAL        = C.SO_EE_ORIGIN_LOCAL
-	sysSO_EE_ORIGIN_ICMP         = C.SO_EE_ORIGIN_ICMP
-	sysSO_EE_ORIGIN_ICMP6        = C.SO_EE_ORIGIN_ICMP6
-	sysSO_EE_ORIGIN_TXSTATUS     = C.SO_EE_ORIGIN_TXSTATUS
-	sysSO_EE_ORIGIN_TIMESTAMPING = C.SO_EE_ORIGIN_TIMESTAMPING
-
-	sysSOL_SOCKET       = C.SOL_SOCKET
-	sysSO_ATTACH_FILTER = C.SO_ATTACH_FILTER
-
-	sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage
-	sizeofSockaddrInet          = C.sizeof_struct_sockaddr_in
-	sizeofInetPktinfo           = C.sizeof_struct_in_pktinfo
-	sizeofSockExtendedErr       = C.sizeof_struct_sock_extended_err
-
-	sizeofIPMreq         = C.sizeof_struct_ip_mreq
-	sizeofIPMreqn        = C.sizeof_struct_ip_mreqn
-	sizeofIPMreqSource   = C.sizeof_struct_ip_mreq_source
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-
-	sizeofICMPFilter = C.sizeof_struct_icmp_filter
-)
-
-type kernelSockaddrStorage C.struct___kernel_sockaddr_storage
-
-type sockaddrInet C.struct_sockaddr_in
-
-type inetPktinfo C.struct_in_pktinfo
-
-type sockExtendedErr C.struct_sock_extended_err
-
-type ipMreq C.struct_ip_mreq
-
-type ipMreqn C.struct_ip_mreqn
-
-type ipMreqSource C.struct_ip_mreq_source
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
-
-type icmpFilter C.struct_icmp_filter
-
-type sockFProg C.struct_sock_fprog
-
-type sockFilter C.struct_sock_filter
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_netbsd.go b/installer/vendor/golang.org/x/net/ipv4/defs_netbsd.go
deleted file mode 100644
index 8f8af1b899..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_netbsd.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_RECVTTL     = C.IP_RECVTTL
-
-	sysIP_MULTICAST_IF    = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL   = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP  = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP  = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP = C.IP_DROP_MEMBERSHIP
-
-	sizeofIPMreq = C.sizeof_struct_ip_mreq
-)
-
-type ipMreq C.struct_ip_mreq
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_openbsd.go b/installer/vendor/golang.org/x/net/ipv4/defs_openbsd.go
deleted file mode 100644
index 8f8af1b899..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_openbsd.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_RECVTTL     = C.IP_RECVTTL
-
-	sysIP_MULTICAST_IF    = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL   = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP  = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP  = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP = C.IP_DROP_MEMBERSHIP
-
-	sizeofIPMreq = C.sizeof_struct_ip_mreq
-)
-
-type ipMreq C.struct_ip_mreq
diff --git a/installer/vendor/golang.org/x/net/ipv4/defs_solaris.go b/installer/vendor/golang.org/x/net/ipv4/defs_solaris.go
deleted file mode 100644
index aeb33e9c8f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/defs_solaris.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-
-package ipv4
-
-/*
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysIP_OPTIONS     = C.IP_OPTIONS
-	sysIP_HDRINCL     = C.IP_HDRINCL
-	sysIP_TOS         = C.IP_TOS
-	sysIP_TTL         = C.IP_TTL
-	sysIP_RECVOPTS    = C.IP_RECVOPTS
-	sysIP_RECVRETOPTS = C.IP_RECVRETOPTS
-	sysIP_RECVDSTADDR = C.IP_RECVDSTADDR
-	sysIP_RETOPTS     = C.IP_RETOPTS
-	sysIP_RECVIF      = C.IP_RECVIF
-	sysIP_RECVSLLA    = C.IP_RECVSLLA
-	sysIP_RECVTTL     = C.IP_RECVTTL
-
-	sysIP_MULTICAST_IF           = C.IP_MULTICAST_IF
-	sysIP_MULTICAST_TTL          = C.IP_MULTICAST_TTL
-	sysIP_MULTICAST_LOOP         = C.IP_MULTICAST_LOOP
-	sysIP_ADD_MEMBERSHIP         = C.IP_ADD_MEMBERSHIP
-	sysIP_DROP_MEMBERSHIP        = C.IP_DROP_MEMBERSHIP
-	sysIP_BLOCK_SOURCE           = C.IP_BLOCK_SOURCE
-	sysIP_UNBLOCK_SOURCE         = C.IP_UNBLOCK_SOURCE
-	sysIP_ADD_SOURCE_MEMBERSHIP  = C.IP_ADD_SOURCE_MEMBERSHIP
-	sysIP_DROP_SOURCE_MEMBERSHIP = C.IP_DROP_SOURCE_MEMBERSHIP
-	sysIP_NEXTHOP                = C.IP_NEXTHOP
-
-	sysIP_PKTINFO     = C.IP_PKTINFO
-	sysIP_RECVPKTINFO = C.IP_RECVPKTINFO
-	sysIP_DONTFRAG    = C.IP_DONTFRAG
-
-	sysIP_BOUND_IF      = C.IP_BOUND_IF
-	sysIP_UNSPEC_SRC    = C.IP_UNSPEC_SRC
-	sysIP_BROADCAST_TTL = C.IP_BROADCAST_TTL
-	sysIP_DHCPINIT_IF   = C.IP_DHCPINIT_IF
-
-	sysIP_REUSEADDR = C.IP_REUSEADDR
-	sysIP_DONTROUTE = C.IP_DONTROUTE
-	sysIP_BROADCAST = C.IP_BROADCAST
-
-	sysMCAST_JOIN_GROUP         = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP        = C.MCAST_LEAVE_GROUP
-	sysMCAST_BLOCK_SOURCE       = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE     = C.MCAST_UNBLOCK_SOURCE
-	sysMCAST_JOIN_SOURCE_GROUP  = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP = C.MCAST_LEAVE_SOURCE_GROUP
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofInetPktinfo     = C.sizeof_struct_in_pktinfo
-
-	sizeofIPMreq         = C.sizeof_struct_ip_mreq
-	sizeofIPMreqSource   = C.sizeof_struct_ip_mreq_source
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet C.struct_sockaddr_in
-
-type inetPktinfo C.struct_in_pktinfo
-
-type ipMreq C.struct_ip_mreq
-
-type ipMreqSource C.struct_ip_mreq_source
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
diff --git a/installer/vendor/golang.org/x/net/ipv4/dgramopt_posix.go b/installer/vendor/golang.org/x/net/ipv4/dgramopt_posix.go
deleted file mode 100644
index fbc5df198d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/dgramopt_posix.go
+++ /dev/null
@@ -1,253 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// MulticastTTL returns the time-to-live field value for outgoing
-// multicast packets.
-func (c *dgramOpt) MulticastTTL() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoMulticastTTL])
-}
-
-// SetMulticastTTL sets the time-to-live field value for future
-// outgoing multicast packets.
-func (c *dgramOpt) SetMulticastTTL(ttl int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoMulticastTTL], ttl)
-}
-
-// MulticastInterface returns the default interface for multicast
-// packet transmissions.
-func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
-	if !c.ok() {
-		return nil, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return nil, err
-	}
-	return getInterface(s, &sockOpts[ssoMulticastInterface])
-}
-
-// SetMulticastInterface sets the default interface for future
-// multicast packet transmissions.
-func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInterface(s, &sockOpts[ssoMulticastInterface], ifi)
-}
-
-// MulticastLoopback reports whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) MulticastLoopback() (bool, error) {
-	if !c.ok() {
-		return false, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return false, err
-	}
-	on, err := getInt(s, &sockOpts[ssoMulticastLoopback])
-	if err != nil {
-		return false, err
-	}
-	return on == 1, nil
-}
-
-// SetMulticastLoopback sets whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) SetMulticastLoopback(on bool) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoMulticastLoopback], boolint(on))
-}
-
-// JoinGroup joins the group address group on the interface ifi.
-// By default all sources that can cast data to group are accepted.
-// It's possible to mute and unmute data transmission from a specific
-// source by using ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup.
-// JoinGroup uses the system assigned multicast interface when ifi is
-// nil, although this is not recommended because the assignment
-// depends on platforms and sometimes it might require routing
-// configuration.
-func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	return setGroup(s, &sockOpts[ssoJoinGroup], ifi, grp)
-}
-
-// LeaveGroup leaves the group address group on the interface ifi
-// regardless of whether the group is any-source group or
-// source-specific group.
-func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	return setGroup(s, &sockOpts[ssoLeaveGroup], ifi, grp)
-}
-
-// JoinSourceSpecificGroup joins the source-specific group comprising
-// group and source on the interface ifi.
-// JoinSourceSpecificGroup uses the system assigned multicast
-// interface when ifi is nil, although this is not recommended because
-// the assignment depends on platforms and sometimes it might require
-// routing configuration.
-func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP4(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoJoinSourceGroup], ifi, grp, src)
-}
-
-// LeaveSourceSpecificGroup leaves the source-specific group on the
-// interface ifi.
-func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP4(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoLeaveSourceGroup], ifi, grp, src)
-}
-
-// ExcludeSourceSpecificGroup excludes the source-specific group from
-// the already joined any-source groups by JoinGroup on the interface
-// ifi.
-func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP4(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoBlockSourceGroup], ifi, grp, src)
-}
-
-// IncludeSourceSpecificGroup includes the excluded source-specific
-// group by ExcludeSourceSpecificGroup again on the interface ifi.
-func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP4(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP4(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoUnblockSourceGroup], ifi, grp, src)
-}
-
-// ICMPFilter returns an ICMP filter.
-// Currently only Linux supports this.
-func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
-	if !c.ok() {
-		return nil, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return nil, err
-	}
-	return getICMPFilter(s, &sockOpts[ssoICMPFilter])
-}
-
-// SetICMPFilter deploys the ICMP filter.
-// Currently only Linux supports this.
-func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setICMPFilter(s, &sockOpts[ssoICMPFilter], f)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/dgramopt_stub.go b/installer/vendor/golang.org/x/net/ipv4/dgramopt_stub.go
deleted file mode 100644
index f6b867f929..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/dgramopt_stub.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv4
-
-import "net"
-
-// MulticastTTL returns the time-to-live field value for outgoing
-// multicast packets.
-func (c *dgramOpt) MulticastTTL() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetMulticastTTL sets the time-to-live field value for future
-// outgoing multicast packets.
-func (c *dgramOpt) SetMulticastTTL(ttl int) error {
-	return errOpNoSupport
-}
-
-// MulticastInterface returns the default interface for multicast
-// packet transmissions.
-func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
-	return nil, errOpNoSupport
-}
-
-// SetMulticastInterface sets the default interface for future
-// multicast packet transmissions.
-func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
-	return errOpNoSupport
-}
-
-// MulticastLoopback reports whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) MulticastLoopback() (bool, error) {
-	return false, errOpNoSupport
-}
-
-// SetMulticastLoopback sets whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) SetMulticastLoopback(on bool) error {
-	return errOpNoSupport
-}
-
-// JoinGroup joins the group address group on the interface ifi.
-// By default all sources that can cast data to group are accepted.
-// It's possible to mute and unmute data transmission from a specific
-// source by using ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup.
-// JoinGroup uses the system assigned multicast interface when ifi is
-// nil, although this is not recommended because the assignment
-// depends on platforms and sometimes it might require routing
-// configuration.
-func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
-	return errOpNoSupport
-}
-
-// LeaveGroup leaves the group address group on the interface ifi
-// regardless of whether the group is any-source group or
-// source-specific group.
-func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
-	return errOpNoSupport
-}
-
-// JoinSourceSpecificGroup joins the source-specific group comprising
-// group and source on the interface ifi.
-// JoinSourceSpecificGroup uses the system assigned multicast
-// interface when ifi is nil, although this is not recommended because
-// the assignment depends on platforms and sometimes it might require
-// routing configuration.
-func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// LeaveSourceSpecificGroup leaves the source-specific group on the
-// interface ifi.
-func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// ExcludeSourceSpecificGroup excludes the source-specific group from
-// the already joined any-source groups by JoinGroup on the interface
-// ifi.
-func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// IncludeSourceSpecificGroup includes the excluded source-specific
-// group by ExcludeSourceSpecificGroup again on the interface ifi.
-func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// ICMPFilter returns an ICMP filter.
-// Currently only Linux supports this.
-func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
-	return nil, errOpNoSupport
-}
-
-// SetICMPFilter deploys the ICMP filter.
-// Currently only Linux supports this.
-func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/doc.go b/installer/vendor/golang.org/x/net/ipv4/doc.go
deleted file mode 100644
index b43935a5ae..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/doc.go
+++ /dev/null
@@ -1,244 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ipv4 implements IP-level socket options for the Internet
-// Protocol version 4.
-//
-// The package provides IP-level socket options that allow
-// manipulation of IPv4 facilities.
-//
-// The IPv4 protocol and basic host requirements for IPv4 are defined
-// in RFC 791 and RFC 1122.
-// Host extensions for multicasting and socket interface extensions
-// for multicast source filters are defined in RFC 1112 and RFC 3678.
-// IGMPv1, IGMPv2 and IGMPv3 are defined in RFC 1112, RFC 2236 and RFC
-// 3376.
-// Source-specific multicast is defined in RFC 4607.
-//
-//
-// Unicasting
-//
-// The options for unicasting are available for net.TCPConn,
-// net.UDPConn and net.IPConn which are created as network connections
-// that use the IPv4 transport. When a single TCP connection carrying
-// a data flow of multiple packets needs to indicate the flow is
-// important, Conn is used to set the type-of-service field on the
-// IPv4 header for each packet.
-//
-//	ln, err := net.Listen("tcp4", "0.0.0.0:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer ln.Close()
-//	for {
-//		c, err := ln.Accept()
-//		if err != nil {
-//			// error handling
-//		}
-//		go func(c net.Conn) {
-//			defer c.Close()
-//
-// The outgoing packets will be labeled DiffServ assured forwarding
-// class 1 low drop precedence, known as AF11 packets.
-//
-//			if err := ipv4.NewConn(c).SetTOS(0x28); err != nil {
-//				// error handling
-//			}
-//			if _, err := c.Write(data); err != nil {
-//				// error handling
-//			}
-//		}(c)
-//	}
-//
-//
-// Multicasting
-//
-// The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
-// IPv4 transport. A few network facilities must be prepared before
-// you begin multicasting, at a minimum joining network interfaces and
-// multicast groups.
-//
-//	en0, err := net.InterfaceByName("en0")
-//	if err != nil {
-//		// error handling
-//	}
-//	en1, err := net.InterfaceByIndex(911)
-//	if err != nil {
-//		// error handling
-//	}
-//	group := net.IPv4(224, 0, 0, 250)
-//
-// First, an application listens to an appropriate address with an
-// appropriate service port.
-//
-//	c, err := net.ListenPacket("udp4", "0.0.0.0:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c.Close()
-//
-// Second, the application joins multicast groups, starts listening to
-// the groups on the specified network interfaces. Note that the
-// service port for transport layer protocol does not matter with this
-// operation as joining groups affects only network and link layer
-// protocols, such as IPv4 and Ethernet.
-//
-//	p := ipv4.NewPacketConn(c)
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: group}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en1, &net.UDPAddr{IP: group}); err != nil {
-//		// error handling
-//	}
-//
-// The application might set per packet control message transmissions
-// between the protocol stack within the kernel. When the application
-// needs a destination address on an incoming packet,
-// SetControlMessage of PacketConn is used to enable control message
-// transmissions.
-//
-//	if err := p.SetControlMessage(ipv4.FlagDst, true); err != nil {
-//		// error handling
-//	}
-//
-// The application could identify whether the received packets are
-// of interest by using the control message that contains the
-// destination address of the received packet.
-//
-//	b := make([]byte, 1500)
-//	for {
-//		n, cm, src, err := p.ReadFrom(b)
-//		if err != nil {
-//			// error handling
-//		}
-//		if cm.Dst.IsMulticast() {
-//			if cm.Dst.Equal(group) {
-//				// joined group, do something
-//			} else {
-//				// unknown group, discard
-//				continue
-//			}
-//		}
-//
-// The application can also send both unicast and multicast packets.
-//
-//		p.SetTOS(0x0)
-//		p.SetTTL(16)
-//		if _, err := p.WriteTo(data, nil, src); err != nil {
-//			// error handling
-//		}
-//		dst := &net.UDPAddr{IP: group, Port: 1024}
-//		for _, ifi := range []*net.Interface{en0, en1} {
-//			if err := p.SetMulticastInterface(ifi); err != nil {
-//				// error handling
-//			}
-//			p.SetMulticastTTL(2)
-//			if _, err := p.WriteTo(data, nil, dst); err != nil {
-//				// error handling
-//			}
-//		}
-//	}
-//
-//
-// More multicasting
-//
-// An application that uses PacketConn or RawConn may join multiple
-// multicast groups. For example, a UDP listener with port 1024 might
-// join two different groups across over two different network
-// interfaces by using:
-//
-//	c, err := net.ListenPacket("udp4", "0.0.0.0:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c.Close()
-//	p := ipv4.NewPacketConn(c)
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 248)}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en1, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}); err != nil {
-//		// error handling
-//	}
-//
-// It is possible for multiple UDP listeners that listen on the same
-// UDP port to join the same multicast group. The net package will
-// provide a socket that listens to a wildcard address with reusable
-// UDP port when an appropriate multicast address prefix is passed to
-// the net.ListenPacket or net.ListenUDP.
-//
-//	c1, err := net.ListenPacket("udp4", "224.0.0.0:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c1.Close()
-//	c2, err := net.ListenPacket("udp4", "224.0.0.0:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c2.Close()
-//	p1 := ipv4.NewPacketConn(c1)
-//	if err := p1.JoinGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 248)}); err != nil {
-//		// error handling
-//	}
-//	p2 := ipv4.NewPacketConn(c2)
-//	if err := p2.JoinGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 248)}); err != nil {
-//		// error handling
-//	}
-//
-// Also it is possible for the application to leave or rejoin a
-// multicast group on the network interface.
-//
-//	if err := p.LeaveGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 248)}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.IPv4(224, 0, 0, 250)}); err != nil {
-//		// error handling
-//	}
-//
-//
-// Source-specific multicasting
-//
-// An application that uses PacketConn or RawConn on IGMPv3 supported
-// platform is able to join source-specific multicast groups.
-// The application may use JoinSourceSpecificGroup and
-// LeaveSourceSpecificGroup for the operation known as "include" mode,
-//
-//	ssmgroup := net.UDPAddr{IP: net.IPv4(232, 7, 8, 9)}
-//	ssmsource := net.UDPAddr{IP: net.IPv4(192, 168, 0, 1)})
-//	if err := p.JoinSourceSpecificGroup(en0, &ssmgroup, &ssmsource); err != nil {
-//		// error handling
-//	}
-//	if err := p.LeaveSourceSpecificGroup(en0, &ssmgroup, &ssmsource); err != nil {
-//		// error handling
-//	}
-//
-// or JoinGroup, ExcludeSourceSpecificGroup,
-// IncludeSourceSpecificGroup and LeaveGroup for the operation known
-// as "exclude" mode.
-//
-//	exclsource := net.UDPAddr{IP: net.IPv4(192, 168, 0, 254)}
-//	if err := p.JoinGroup(en0, &ssmgroup); err != nil {
-//		// error handling
-//	}
-//	if err := p.ExcludeSourceSpecificGroup(en0, &ssmgroup, &exclsource); err != nil {
-//		// error handling
-//	}
-//	if err := p.LeaveGroup(en0, &ssmgroup); err != nil {
-//		// error handling
-//	}
-//
-// Note that it depends on each platform implementation what happens
-// when an application which runs on IGMPv3 unsupported platform uses
-// JoinSourceSpecificGroup and LeaveSourceSpecificGroup.
-// In general the platform tries to fall back to conversations using
-// IGMPv1 or IGMPv2 and starts to listen to multicast traffic.
-// In the fallback case, ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup may return an error.
-package ipv4 // import "golang.org/x/net/ipv4"
-
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
diff --git a/installer/vendor/golang.org/x/net/ipv4/endpoint.go b/installer/vendor/golang.org/x/net/ipv4/endpoint.go
deleted file mode 100644
index 8f7e07ac48..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/endpoint.go
+++ /dev/null
@@ -1,194 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-	"time"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// BUG(mikio): On Windows, the JoinSourceSpecificGroup,
-// LeaveSourceSpecificGroup, ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup methods of PacketConn and RawConn are
-// not implemented.
-
-// A Conn represents a network endpoint that uses the IPv4 transport.
-// It is used to control basic IP-level socket options such as TOS and
-// TTL.
-type Conn struct {
-	genericOpt
-}
-
-type genericOpt struct {
-	net.Conn
-}
-
-func (c *genericOpt) ok() bool { return c != nil && c.Conn != nil }
-
-// NewConn returns a new Conn.
-func NewConn(c net.Conn) *Conn {
-	return &Conn{
-		genericOpt: genericOpt{Conn: c},
-	}
-}
-
-// A PacketConn represents a packet network endpoint that uses the
-// IPv4 transport. It is used to control several IP-level socket
-// options including multicasting. It also provides datagram based
-// network I/O methods specific to the IPv4 and higher layer protocols
-// such as UDP.
-type PacketConn struct {
-	genericOpt
-	dgramOpt
-	payloadHandler
-}
-
-type dgramOpt struct {
-	net.PacketConn
-}
-
-func (c *dgramOpt) ok() bool { return c != nil && c.PacketConn != nil }
-
-// SetControlMessage sets the per packet IP-level socket options.
-func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.dgramOpt.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setControlMessage(s, &c.payloadHandler.rawOpt, cf, on)
-}
-
-// SetDeadline sets the read and write deadlines associated with the
-// endpoint.
-func (c *PacketConn) SetDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.PacketConn.SetDeadline(t)
-}
-
-// SetReadDeadline sets the read deadline associated with the
-// endpoint.
-func (c *PacketConn) SetReadDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.PacketConn.SetReadDeadline(t)
-}
-
-// SetWriteDeadline sets the write deadline associated with the
-// endpoint.
-func (c *PacketConn) SetWriteDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.PacketConn.SetWriteDeadline(t)
-}
-
-// Close closes the endpoint.
-func (c *PacketConn) Close() error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.PacketConn.Close()
-}
-
-// NewPacketConn returns a new PacketConn using c as its underlying
-// transport.
-func NewPacketConn(c net.PacketConn) *PacketConn {
-	p := &PacketConn{
-		genericOpt:     genericOpt{Conn: c.(net.Conn)},
-		dgramOpt:       dgramOpt{PacketConn: c},
-		payloadHandler: payloadHandler{PacketConn: c},
-	}
-	if _, ok := c.(*net.IPConn); ok && sockOpts[ssoStripHeader].name > 0 {
-		if s, err := netreflect.PacketSocketOf(c); err == nil {
-			setInt(s, &sockOpts[ssoStripHeader], boolint(true))
-		}
-	}
-	return p
-}
-
-// A RawConn represents a packet network endpoint that uses the IPv4
-// transport. It is used to control several IP-level socket options
-// including IPv4 header manipulation. It also provides datagram
-// based network I/O methods specific to the IPv4 and higher layer
-// protocols that handle IPv4 datagram directly such as OSPF, GRE.
-type RawConn struct {
-	genericOpt
-	dgramOpt
-	packetHandler
-}
-
-// SetControlMessage sets the per packet IP-level socket options.
-func (c *RawConn) SetControlMessage(cf ControlFlags, on bool) error {
-	if !c.packetHandler.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.dgramOpt.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setControlMessage(s, &c.packetHandler.rawOpt, cf, on)
-}
-
-// SetDeadline sets the read and write deadlines associated with the
-// endpoint.
-func (c *RawConn) SetDeadline(t time.Time) error {
-	if !c.packetHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.packetHandler.c.SetDeadline(t)
-}
-
-// SetReadDeadline sets the read deadline associated with the
-// endpoint.
-func (c *RawConn) SetReadDeadline(t time.Time) error {
-	if !c.packetHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.packetHandler.c.SetReadDeadline(t)
-}
-
-// SetWriteDeadline sets the write deadline associated with the
-// endpoint.
-func (c *RawConn) SetWriteDeadline(t time.Time) error {
-	if !c.packetHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.packetHandler.c.SetWriteDeadline(t)
-}
-
-// Close closes the endpoint.
-func (c *RawConn) Close() error {
-	if !c.packetHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.packetHandler.c.Close()
-}
-
-// NewRawConn returns a new RawConn using c as its underlying
-// transport.
-func NewRawConn(c net.PacketConn) (*RawConn, error) {
-	r := &RawConn{
-		genericOpt:    genericOpt{Conn: c.(net.Conn)},
-		dgramOpt:      dgramOpt{PacketConn: c},
-		packetHandler: packetHandler{c: c.(*net.IPConn)},
-	}
-	s, err := netreflect.PacketSocketOf(c)
-	if err != nil {
-		return nil, err
-	}
-	if err := setInt(s, &sockOpts[ssoHeaderPrepend], boolint(true)); err != nil {
-		return nil, err
-	}
-	return r, nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/example_test.go b/installer/vendor/golang.org/x/net/ipv4/example_test.go
deleted file mode 100644
index ddc7577e84..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/example_test.go
+++ /dev/null
@@ -1,224 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"runtime"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/ipv4"
-)
-
-func ExampleConn_markingTCP() {
-	ln, err := net.Listen("tcp", "0.0.0.0:1024")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer ln.Close()
-
-	for {
-		c, err := ln.Accept()
-		if err != nil {
-			log.Fatal(err)
-		}
-		go func(c net.Conn) {
-			defer c.Close()
-			if c.RemoteAddr().(*net.TCPAddr).IP.To4() != nil {
-				p := ipv4.NewConn(c)
-				if err := p.SetTOS(0x28); err != nil { // DSCP AF11
-					log.Fatal(err)
-				}
-				if err := p.SetTTL(128); err != nil {
-					log.Fatal(err)
-				}
-			}
-			if _, err := c.Write([]byte("HELLO-R-U-THERE-ACK")); err != nil {
-				log.Fatal(err)
-			}
-		}(c)
-	}
-}
-
-func ExamplePacketConn_servingOneShotMulticastDNS() {
-	c, err := net.ListenPacket("udp4", "0.0.0.0:5353") // mDNS over UDP
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	mDNSLinkLocal := net.UDPAddr{IP: net.IPv4(224, 0, 0, 251)}
-	if err := p.JoinGroup(en0, &mDNSLinkLocal); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &mDNSLinkLocal)
-	if err := p.SetControlMessage(ipv4.FlagDst, true); err != nil {
-		log.Fatal(err)
-	}
-
-	b := make([]byte, 1500)
-	for {
-		_, cm, peer, err := p.ReadFrom(b)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if !cm.Dst.IsMulticast() || !cm.Dst.Equal(mDNSLinkLocal.IP) {
-			continue
-		}
-		answers := []byte("FAKE-MDNS-ANSWERS") // fake mDNS answers, you need to implement this
-		if _, err := p.WriteTo(answers, nil, peer); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func ExamplePacketConn_tracingIPPacketRoute() {
-	// Tracing an IP packet route to www.google.com.
-
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		log.Fatal(err)
-	}
-	var dst net.IPAddr
-	for _, ip := range ips {
-		if ip.To4() != nil {
-			dst.IP = ip
-			fmt.Printf("using %v for tracing an IP packet route to %s\n", dst.IP, host)
-			break
-		}
-	}
-	if dst.IP == nil {
-		log.Fatal("no A record found")
-	}
-
-	c, err := net.ListenPacket("ip4:1", "0.0.0.0") // ICMP for IPv4
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-
-	if err := p.SetControlMessage(ipv4.FlagTTL|ipv4.FlagSrc|ipv4.FlagDst|ipv4.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-	wm := icmp.Message{
-		Type: ipv4.ICMPTypeEcho, Code: 0,
-		Body: &icmp.Echo{
-			ID:   os.Getpid() & 0xffff,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-
-	rb := make([]byte, 1500)
-	for i := 1; i <= 64; i++ { // up to 64 hops
-		wm.Body.(*icmp.Echo).Seq = i
-		wb, err := wm.Marshal(nil)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetTTL(i); err != nil {
-			log.Fatal(err)
-		}
-
-		// In the real world usually there are several
-		// multiple traffic-engineered paths for each hop.
-		// You may need to probe a few times to each hop.
-		begin := time.Now()
-		if _, err := p.WriteTo(wb, nil, &dst); err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-			log.Fatal(err)
-		}
-		n, cm, peer, err := p.ReadFrom(rb)
-		if err != nil {
-			if err, ok := err.(net.Error); ok && err.Timeout() {
-				fmt.Printf("%v\t*\n", i)
-				continue
-			}
-			log.Fatal(err)
-		}
-		rm, err := icmp.ParseMessage(1, rb[:n])
-		if err != nil {
-			log.Fatal(err)
-		}
-		rtt := time.Since(begin)
-
-		// In the real world you need to determine whether the
-		// received message is yours using ControlMessage.Src,
-		// ControlMessage.Dst, icmp.Echo.ID and icmp.Echo.Seq.
-		switch rm.Type {
-		case ipv4.ICMPTypeTimeExceeded:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, cm)
-		case ipv4.ICMPTypeEchoReply:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, cm)
-			return
-		default:
-			log.Printf("unknown ICMP message: %+v\n", rm)
-		}
-	}
-}
-
-func ExampleRawConn_advertisingOSPFHello() {
-	c, err := net.ListenPacket("ip4:89", "0.0.0.0") // OSPF for IPv4
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	allSPFRouters := net.IPAddr{IP: net.IPv4(224, 0, 0, 5)}
-	if err := r.JoinGroup(en0, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-	defer r.LeaveGroup(en0, &allSPFRouters)
-
-	hello := make([]byte, 24) // fake hello data, you need to implement this
-	ospf := make([]byte, 24)  // fake ospf header, you need to implement this
-	ospf[0] = 2               // version 2
-	ospf[1] = 1               // hello packet
-	ospf = append(ospf, hello...)
-	iph := &ipv4.Header{
-		Version:  ipv4.Version,
-		Len:      ipv4.HeaderLen,
-		TOS:      0xc0, // DSCP CS6
-		TotalLen: ipv4.HeaderLen + len(ospf),
-		TTL:      1,
-		Protocol: 89,
-		Dst:      allSPFRouters.IP.To4(),
-	}
-
-	var cm *ipv4.ControlMessage
-	switch runtime.GOOS {
-	case "darwin", "linux":
-		cm = &ipv4.ControlMessage{IfIndex: en0.Index}
-	default:
-		if err := r.SetMulticastInterface(en0); err != nil {
-			log.Fatal(err)
-		}
-	}
-	if err := r.WriteTo(iph, ospf, cm); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/gen.go b/installer/vendor/golang.org/x/net/ipv4/gen.go
deleted file mode 100644
index ffb44fe681..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/gen.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-//go:generate go run gen.go
-
-// This program generates system adaptation constants and types,
-// internet protocol constants and tables by reading template files
-// and IANA protocol registries.
-package main
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-func main() {
-	if err := genzsys(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-	if err := geniana(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func genzsys() error {
-	defs := "defs_" + runtime.GOOS + ".go"
-	f, err := os.Open(defs)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	f.Close()
-	cmd := exec.Command("go", "tool", "cgo", "-godefs", defs)
-	b, err := cmd.Output()
-	if err != nil {
-		return err
-	}
-	b, err = format.Source(b)
-	if err != nil {
-		return err
-	}
-	zsys := "zsys_" + runtime.GOOS + ".go"
-	switch runtime.GOOS {
-	case "freebsd", "linux":
-		zsys = "zsys_" + runtime.GOOS + "_" + runtime.GOARCH + ".go"
-	}
-	if err := ioutil.WriteFile(zsys, b, 0644); err != nil {
-		return err
-	}
-	return nil
-}
-
-var registries = []struct {
-	url   string
-	parse func(io.Writer, io.Reader) error
-}{
-	{
-		"http://www.iana.org/assignments/icmp-parameters/icmp-parameters.xml",
-		parseICMPv4Parameters,
-	},
-}
-
-func geniana() error {
-	var bb bytes.Buffer
-	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
-	fmt.Fprintf(&bb, "package ipv4\n\n")
-	for _, r := range registries {
-		resp, err := http.Get(r.url)
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			return fmt.Errorf("got HTTP status code %v for %v\n", resp.StatusCode, r.url)
-		}
-		if err := r.parse(&bb, resp.Body); err != nil {
-			return err
-		}
-		fmt.Fprintf(&bb, "\n")
-	}
-	b, err := format.Source(bb.Bytes())
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile("iana.go", b, 0644); err != nil {
-		return err
-	}
-	return nil
-}
-
-func parseICMPv4Parameters(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var icp icmpv4Parameters
-	if err := dec.Decode(&icp); err != nil {
-		return err
-	}
-	prs := icp.escape()
-	fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, pr := range prs {
-		if pr.Descr == "" {
-			continue
-		}
-		fmt.Fprintf(w, "ICMPType%s ICMPType = %d", pr.Descr, pr.Value)
-		fmt.Fprintf(w, "// %s\n", pr.OrigDescr)
-	}
-	fmt.Fprintf(w, ")\n\n")
-	fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated)
-	fmt.Fprintf(w, "var icmpTypes = map[ICMPType]string{\n")
-	for _, pr := range prs {
-		if pr.Descr == "" {
-			continue
-		}
-		fmt.Fprintf(w, "%d: %q,\n", pr.Value, strings.ToLower(pr.OrigDescr))
-	}
-	fmt.Fprintf(w, "}\n")
-	return nil
-}
-
-type icmpv4Parameters struct {
-	XMLName    xml.Name `xml:"registry"`
-	Title      string   `xml:"title"`
-	Updated    string   `xml:"updated"`
-	Registries []struct {
-		Title   string `xml:"title"`
-		Records []struct {
-			Value string `xml:"value"`
-			Descr string `xml:"description"`
-		} `xml:"record"`
-	} `xml:"registry"`
-}
-
-type canonICMPv4ParamRecord struct {
-	OrigDescr string
-	Descr     string
-	Value     int
-}
-
-func (icp *icmpv4Parameters) escape() []canonICMPv4ParamRecord {
-	id := -1
-	for i, r := range icp.Registries {
-		if strings.Contains(r.Title, "Type") || strings.Contains(r.Title, "type") {
-			id = i
-			break
-		}
-	}
-	if id < 0 {
-		return nil
-	}
-	prs := make([]canonICMPv4ParamRecord, len(icp.Registries[id].Records))
-	sr := strings.NewReplacer(
-		"Messages", "",
-		"Message", "",
-		"ICMP", "",
-		"+", "P",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, pr := range icp.Registries[id].Records {
-		if strings.Contains(pr.Descr, "Reserved") ||
-			strings.Contains(pr.Descr, "Unassigned") ||
-			strings.Contains(pr.Descr, "Deprecated") ||
-			strings.Contains(pr.Descr, "Experiment") ||
-			strings.Contains(pr.Descr, "experiment") {
-			continue
-		}
-		ss := strings.Split(pr.Descr, "\n")
-		if len(ss) > 1 {
-			prs[i].Descr = strings.Join(ss, " ")
-		} else {
-			prs[i].Descr = ss[0]
-		}
-		s := strings.TrimSpace(prs[i].Descr)
-		prs[i].OrigDescr = s
-		prs[i].Descr = sr.Replace(s)
-		prs[i].Value, _ = strconv.Atoi(pr.Value)
-	}
-	return prs
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/genericopt_posix.go b/installer/vendor/golang.org/x/net/ipv4/genericopt_posix.go
deleted file mode 100644
index 58168b737d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/genericopt_posix.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv4
-
-import (
-	"syscall"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// TOS returns the type-of-service field value for outgoing packets.
-func (c *genericOpt) TOS() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoTOS])
-}
-
-// SetTOS sets the type-of-service field value for future outgoing
-// packets.
-func (c *genericOpt) SetTOS(tos int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoTOS], tos)
-}
-
-// TTL returns the time-to-live field value for outgoing packets.
-func (c *genericOpt) TTL() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoTTL])
-}
-
-// SetTTL sets the time-to-live field value for future outgoing
-// packets.
-func (c *genericOpt) SetTTL(ttl int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoTTL], ttl)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/genericopt_stub.go b/installer/vendor/golang.org/x/net/ipv4/genericopt_stub.go
deleted file mode 100644
index 661a4d1ab1..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/genericopt_stub.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv4
-
-// TOS returns the type-of-service field value for outgoing packets.
-func (c *genericOpt) TOS() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetTOS sets the type-of-service field value for future outgoing
-// packets.
-func (c *genericOpt) SetTOS(tos int) error {
-	return errOpNoSupport
-}
-
-// TTL returns the time-to-live field value for outgoing packets.
-func (c *genericOpt) TTL() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetTTL sets the time-to-live field value for future outgoing
-// packets.
-func (c *genericOpt) SetTTL(ttl int) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/go19_test.go b/installer/vendor/golang.org/x/net/ipv4/go19_test.go
deleted file mode 100644
index 82a27b1136..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/go19_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package ipv4
-
-func init() {
-	disableTests = true
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/header.go b/installer/vendor/golang.org/x/net/ipv4/header.go
deleted file mode 100644
index 6dc26d43fa..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/header.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-	"runtime"
-	"syscall"
-)
-
-const (
-	Version      = 4  // protocol version
-	HeaderLen    = 20 // header length without extension headers
-	maxHeaderLen = 60 // sensible default, revisit if later RFCs define new usage of version and header length fields
-)
-
-type HeaderFlags int
-
-const (
-	MoreFragments HeaderFlags = 1 << iota // more fragments flag
-	DontFragment                          // don't fragment flag
-)
-
-// A Header represents an IPv4 header.
-type Header struct {
-	Version  int         // protocol version
-	Len      int         // header length
-	TOS      int         // type-of-service
-	TotalLen int         // packet total length
-	ID       int         // identification
-	Flags    HeaderFlags // flags
-	FragOff  int         // fragment offset
-	TTL      int         // time-to-live
-	Protocol int         // next protocol
-	Checksum int         // checksum
-	Src      net.IP      // source address
-	Dst      net.IP      // destination address
-	Options  []byte      // options, extension headers
-}
-
-func (h *Header) String() string {
-	if h == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ver=%d hdrlen=%d tos=%#x totallen=%d id=%#x flags=%#x fragoff=%#x ttl=%d proto=%d cksum=%#x src=%v dst=%v", h.Version, h.Len, h.TOS, h.TotalLen, h.ID, h.Flags, h.FragOff, h.TTL, h.Protocol, h.Checksum, h.Src, h.Dst)
-}
-
-// Marshal returns the binary encoding of the IPv4 header h.
-func (h *Header) Marshal() ([]byte, error) {
-	if h == nil {
-		return nil, syscall.EINVAL
-	}
-	if h.Len < HeaderLen {
-		return nil, errHeaderTooShort
-	}
-	hdrlen := HeaderLen + len(h.Options)
-	b := make([]byte, hdrlen)
-	b[0] = byte(Version<<4 | (hdrlen >> 2 & 0x0f))
-	b[1] = byte(h.TOS)
-	flagsAndFragOff := (h.FragOff & 0x1fff) | int(h.Flags<<13)
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "netbsd":
-		nativeEndian.PutUint16(b[2:4], uint16(h.TotalLen))
-		nativeEndian.PutUint16(b[6:8], uint16(flagsAndFragOff))
-	case "freebsd":
-		if freebsdVersion < 1100000 {
-			nativeEndian.PutUint16(b[2:4], uint16(h.TotalLen))
-			nativeEndian.PutUint16(b[6:8], uint16(flagsAndFragOff))
-		} else {
-			binary.BigEndian.PutUint16(b[2:4], uint16(h.TotalLen))
-			binary.BigEndian.PutUint16(b[6:8], uint16(flagsAndFragOff))
-		}
-	default:
-		binary.BigEndian.PutUint16(b[2:4], uint16(h.TotalLen))
-		binary.BigEndian.PutUint16(b[6:8], uint16(flagsAndFragOff))
-	}
-	binary.BigEndian.PutUint16(b[4:6], uint16(h.ID))
-	b[8] = byte(h.TTL)
-	b[9] = byte(h.Protocol)
-	binary.BigEndian.PutUint16(b[10:12], uint16(h.Checksum))
-	if ip := h.Src.To4(); ip != nil {
-		copy(b[12:16], ip[:net.IPv4len])
-	}
-	if ip := h.Dst.To4(); ip != nil {
-		copy(b[16:20], ip[:net.IPv4len])
-	} else {
-		return nil, errMissingAddress
-	}
-	if len(h.Options) > 0 {
-		copy(b[HeaderLen:], h.Options)
-	}
-	return b, nil
-}
-
-// ParseHeader parses b as an IPv4 header.
-func ParseHeader(b []byte) (*Header, error) {
-	if len(b) < HeaderLen {
-		return nil, errHeaderTooShort
-	}
-	hdrlen := int(b[0]&0x0f) << 2
-	if hdrlen > len(b) {
-		return nil, errBufferTooShort
-	}
-	h := &Header{
-		Version:  int(b[0] >> 4),
-		Len:      hdrlen,
-		TOS:      int(b[1]),
-		ID:       int(binary.BigEndian.Uint16(b[4:6])),
-		TTL:      int(b[8]),
-		Protocol: int(b[9]),
-		Checksum: int(binary.BigEndian.Uint16(b[10:12])),
-		Src:      net.IPv4(b[12], b[13], b[14], b[15]),
-		Dst:      net.IPv4(b[16], b[17], b[18], b[19]),
-	}
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "netbsd":
-		h.TotalLen = int(nativeEndian.Uint16(b[2:4])) + hdrlen
-		h.FragOff = int(nativeEndian.Uint16(b[6:8]))
-	case "freebsd":
-		if freebsdVersion < 1100000 {
-			h.TotalLen = int(nativeEndian.Uint16(b[2:4]))
-			if freebsdVersion < 1000000 {
-				h.TotalLen += hdrlen
-			}
-			h.FragOff = int(nativeEndian.Uint16(b[6:8]))
-		} else {
-			h.TotalLen = int(binary.BigEndian.Uint16(b[2:4]))
-			h.FragOff = int(binary.BigEndian.Uint16(b[6:8]))
-		}
-	default:
-		h.TotalLen = int(binary.BigEndian.Uint16(b[2:4]))
-		h.FragOff = int(binary.BigEndian.Uint16(b[6:8]))
-	}
-	h.Flags = HeaderFlags(h.FragOff&0xe000) >> 13
-	h.FragOff = h.FragOff & 0x1fff
-	if hdrlen-HeaderLen > 0 {
-		h.Options = make([]byte, hdrlen-HeaderLen)
-		copy(h.Options, b[HeaderLen:])
-	}
-	return h, nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/header_test.go b/installer/vendor/golang.org/x/net/ipv4/header_test.go
deleted file mode 100644
index cdf27fd03f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/header_test.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"bytes"
-	"encoding/binary"
-	"net"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-type headerTest struct {
-	wireHeaderFromKernel          [HeaderLen]byte
-	wireHeaderToKernel            [HeaderLen]byte
-	wireHeaderFromTradBSDKernel   [HeaderLen]byte
-	wireHeaderToTradBSDKernel     [HeaderLen]byte
-	wireHeaderFromFreeBSD10Kernel [HeaderLen]byte
-	wireHeaderToFreeBSD10Kernel   [HeaderLen]byte
-	*Header
-}
-
-var headerLittleEndianTest = headerTest{
-	// TODO(mikio): Add platform dependent wire header formats when
-	// we support new platforms.
-	wireHeaderFromKernel: [HeaderLen]byte{
-		0x45, 0x01, 0xbe, 0xef,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderToKernel: [HeaderLen]byte{
-		0x45, 0x01, 0xbe, 0xef,
-		0xca, 0xfe, 0x45, 0xdc,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderFromTradBSDKernel: [HeaderLen]byte{
-		0x45, 0x01, 0xdb, 0xbe,
-		0xca, 0xfe, 0xdc, 0x45,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderToTradBSDKernel: [HeaderLen]byte{
-		0x45, 0x01, 0xef, 0xbe,
-		0xca, 0xfe, 0xdc, 0x45,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderFromFreeBSD10Kernel: [HeaderLen]byte{
-		0x45, 0x01, 0xef, 0xbe,
-		0xca, 0xfe, 0xdc, 0x45,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	wireHeaderToFreeBSD10Kernel: [HeaderLen]byte{
-		0x45, 0x01, 0xef, 0xbe,
-		0xca, 0xfe, 0xdc, 0x45,
-		0xff, 0x01, 0xde, 0xad,
-		172, 16, 254, 254,
-		192, 168, 0, 1,
-	},
-	Header: &Header{
-		Version:  Version,
-		Len:      HeaderLen,
-		TOS:      1,
-		TotalLen: 0xbeef,
-		ID:       0xcafe,
-		Flags:    DontFragment,
-		FragOff:  1500,
-		TTL:      255,
-		Protocol: 1,
-		Checksum: 0xdead,
-		Src:      net.IPv4(172, 16, 254, 254),
-		Dst:      net.IPv4(192, 168, 0, 1),
-	},
-}
-
-func TestMarshalHeader(t *testing.T) {
-	tt := &headerLittleEndianTest
-	if nativeEndian != binary.LittleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	b, err := tt.Header.Marshal()
-	if err != nil {
-		t.Fatal(err)
-	}
-	var wh []byte
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "netbsd":
-		wh = tt.wireHeaderToTradBSDKernel[:]
-	case "freebsd":
-		switch {
-		case freebsdVersion < 1000000:
-			wh = tt.wireHeaderToTradBSDKernel[:]
-		case 1000000 <= freebsdVersion && freebsdVersion < 1100000:
-			wh = tt.wireHeaderToFreeBSD10Kernel[:]
-		default:
-			wh = tt.wireHeaderToKernel[:]
-		}
-	default:
-		wh = tt.wireHeaderToKernel[:]
-	}
-	if !bytes.Equal(b, wh) {
-		t.Fatalf("got %#v; want %#v", b, wh)
-	}
-}
-
-func TestParseHeader(t *testing.T) {
-	tt := &headerLittleEndianTest
-	if nativeEndian != binary.LittleEndian {
-		t.Skip("no test for big endian machine yet")
-	}
-
-	var wh []byte
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "netbsd":
-		wh = tt.wireHeaderFromTradBSDKernel[:]
-	case "freebsd":
-		switch {
-		case freebsdVersion < 1000000:
-			wh = tt.wireHeaderFromTradBSDKernel[:]
-		case 1000000 <= freebsdVersion && freebsdVersion < 1100000:
-			wh = tt.wireHeaderFromFreeBSD10Kernel[:]
-		default:
-			wh = tt.wireHeaderFromKernel[:]
-		}
-	default:
-		wh = tt.wireHeaderFromKernel[:]
-	}
-	h, err := ParseHeader(wh)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(h, tt.Header) {
-		t.Fatalf("got %#v; want %#v", h, tt.Header)
-	}
-	s := h.String()
-	if strings.Contains(s, ",") {
-		t.Fatalf("should be space-separated values: %s", s)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/helper.go b/installer/vendor/golang.org/x/net/ipv4/helper.go
deleted file mode 100644
index 083897995e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/helper.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"encoding/binary"
-	"errors"
-	"net"
-	"unsafe"
-)
-
-var (
-	errMissingAddress           = errors.New("missing address")
-	errMissingHeader            = errors.New("missing header")
-	errHeaderTooShort           = errors.New("header too short")
-	errBufferTooShort           = errors.New("buffer too short")
-	errInvalidConnType          = errors.New("invalid conn type")
-	errOpNoSupport              = errors.New("operation not supported")
-	errNoSuchInterface          = errors.New("no such interface")
-	errNoSuchMulticastInterface = errors.New("no such multicast interface")
-
-	// See http://www.freebsd.org/doc/en/books/porters-handbook/freebsd-versions.html.
-	freebsdVersion uint32
-
-	nativeEndian binary.ByteOrder
-)
-
-func init() {
-	i := uint32(1)
-	b := (*[4]byte)(unsafe.Pointer(&i))
-	if b[0] == 1 {
-		nativeEndian = binary.LittleEndian
-	} else {
-		nativeEndian = binary.BigEndian
-	}
-}
-
-func boolint(b bool) int {
-	if b {
-		return 1
-	}
-	return 0
-}
-
-func netAddrToIP4(a net.Addr) net.IP {
-	switch v := a.(type) {
-	case *net.UDPAddr:
-		if ip := v.IP.To4(); ip != nil {
-			return ip
-		}
-	case *net.IPAddr:
-		if ip := v.IP.To4(); ip != nil {
-			return ip
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/iana.go b/installer/vendor/golang.org/x/net/ipv4/iana.go
deleted file mode 100644
index be10c94888..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/iana.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package ipv4
-
-// Internet Control Message Protocol (ICMP) Parameters, Updated: 2013-04-19
-const (
-	ICMPTypeEchoReply              ICMPType = 0  // Echo Reply
-	ICMPTypeDestinationUnreachable ICMPType = 3  // Destination Unreachable
-	ICMPTypeRedirect               ICMPType = 5  // Redirect
-	ICMPTypeEcho                   ICMPType = 8  // Echo
-	ICMPTypeRouterAdvertisement    ICMPType = 9  // Router Advertisement
-	ICMPTypeRouterSolicitation     ICMPType = 10 // Router Solicitation
-	ICMPTypeTimeExceeded           ICMPType = 11 // Time Exceeded
-	ICMPTypeParameterProblem       ICMPType = 12 // Parameter Problem
-	ICMPTypeTimestamp              ICMPType = 13 // Timestamp
-	ICMPTypeTimestampReply         ICMPType = 14 // Timestamp Reply
-	ICMPTypePhoturis               ICMPType = 40 // Photuris
-)
-
-// Internet Control Message Protocol (ICMP) Parameters, Updated: 2013-04-19
-var icmpTypes = map[ICMPType]string{
-	0:  "echo reply",
-	3:  "destination unreachable",
-	5:  "redirect",
-	8:  "echo",
-	9:  "router advertisement",
-	10: "router solicitation",
-	11: "time exceeded",
-	12: "parameter problem",
-	13: "timestamp",
-	14: "timestamp reply",
-	40: "photuris",
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/icmp.go b/installer/vendor/golang.org/x/net/ipv4/icmp.go
deleted file mode 100644
index 097bea8465..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/icmp.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import "golang.org/x/net/internal/iana"
-
-// An ICMPType represents a type of ICMP message.
-type ICMPType int
-
-func (typ ICMPType) String() string {
-	s, ok := icmpTypes[typ]
-	if !ok {
-		return "<nil>"
-	}
-	return s
-}
-
-// Protocol returns the ICMPv4 protocol number.
-func (typ ICMPType) Protocol() int {
-	return iana.ProtocolICMP
-}
-
-// An ICMPFilter represents an ICMP message filter for incoming
-// packets. The filter belongs to a packet delivery path on a host and
-// it cannot interact with forwarding packets or tunnel-outer packets.
-//
-// Note: RFC 2460 defines a reasonable role model and it works not
-// only for IPv6 but IPv4. A node means a device that implements IP.
-// A router means a node that forwards IP packets not explicitly
-// addressed to itself, and a host means a node that is not a router.
-type ICMPFilter struct {
-	icmpFilter
-}
-
-// Accept accepts incoming ICMP packets including the type field value
-// typ.
-func (f *ICMPFilter) Accept(typ ICMPType) {
-	f.accept(typ)
-}
-
-// Block blocks incoming ICMP packets including the type field value
-// typ.
-func (f *ICMPFilter) Block(typ ICMPType) {
-	f.block(typ)
-}
-
-// SetAll sets the filter action to the filter.
-func (f *ICMPFilter) SetAll(block bool) {
-	f.setAll(block)
-}
-
-// WillBlock reports whether the ICMP type will be blocked.
-func (f *ICMPFilter) WillBlock(typ ICMPType) bool {
-	return f.willBlock(typ)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/icmp_linux.go b/installer/vendor/golang.org/x/net/ipv4/icmp_linux.go
deleted file mode 100644
index 6e1c5c80ad..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/icmp_linux.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-func (f *icmpFilter) accept(typ ICMPType) {
-	f.Data &^= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpFilter) block(typ ICMPType) {
-	f.Data |= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpFilter) setAll(block bool) {
-	if block {
-		f.Data = 1<<32 - 1
-	} else {
-		f.Data = 0
-	}
-}
-
-func (f *icmpFilter) willBlock(typ ICMPType) bool {
-	return f.Data&(1<<(uint32(typ)&31)) != 0
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/icmp_stub.go b/installer/vendor/golang.org/x/net/ipv4/icmp_stub.go
deleted file mode 100644
index 21bb29ab36..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/icmp_stub.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !linux
-
-package ipv4
-
-const sizeofICMPFilter = 0x0
-
-type icmpFilter struct {
-}
-
-func (f *icmpFilter) accept(typ ICMPType) {
-}
-
-func (f *icmpFilter) block(typ ICMPType) {
-}
-
-func (f *icmpFilter) setAll(block bool) {
-}
-
-func (f *icmpFilter) willBlock(typ ICMPType) bool {
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/icmp_test.go b/installer/vendor/golang.org/x/net/ipv4/icmp_test.go
deleted file mode 100644
index 3324b54df6..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/icmp_test.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var icmpStringTests = []struct {
-	in  ipv4.ICMPType
-	out string
-}{
-	{ipv4.ICMPTypeDestinationUnreachable, "destination unreachable"},
-
-	{256, "<nil>"},
-}
-
-func TestICMPString(t *testing.T) {
-	for _, tt := range icmpStringTests {
-		s := tt.in.String()
-		if s != tt.out {
-			t.Errorf("got %s; want %s", s, tt.out)
-		}
-	}
-}
-
-func TestICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "linux":
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	var f ipv4.ICMPFilter
-	for _, toggle := range []bool{false, true} {
-		f.SetAll(toggle)
-		for _, typ := range []ipv4.ICMPType{
-			ipv4.ICMPTypeDestinationUnreachable,
-			ipv4.ICMPTypeEchoReply,
-			ipv4.ICMPTypeTimeExceeded,
-			ipv4.ICMPTypeParameterProblem,
-		} {
-			f.Accept(typ)
-			if f.WillBlock(typ) {
-				t.Errorf("ipv4.ICMPFilter.Set(%v, false) failed", typ)
-			}
-			f.Block(typ)
-			if !f.WillBlock(typ) {
-				t.Errorf("ipv4.ICMPFilter.Set(%v, true) failed", typ)
-			}
-		}
-	}
-}
-
-func TestSetICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "linux":
-	default:
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv4.NewPacketConn(c)
-
-	var f ipv4.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv4.ICMPTypeEcho)
-	f.Accept(ipv4.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-	kf, err := p.ICMPFilter()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(kf, &f) {
-		t.Fatalf("got %#v; want %#v", kf, f)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/ipv4_test.go b/installer/vendor/golang.org/x/net/ipv4/ipv4_test.go
deleted file mode 100644
index 9172992832..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/ipv4_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"fmt"
-	"os"
-	"testing"
-)
-
-var disableTests = false
-
-func TestMain(m *testing.M) {
-	if disableTests {
-		fmt.Fprintf(os.Stderr, "ipv4 tests disabled in Go 1.9 until netreflect is fixed. (Issue 19051)\n")
-		os.Exit(0)
-	}
-	// call flag.Parse() here if TestMain uses flags
-	os.Exit(m.Run())
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/multicast_test.go b/installer/vendor/golang.org/x/net/ipv4/multicast_test.go
deleted file mode 100644
index bcf49736b0..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/multicast_test.go
+++ /dev/null
@@ -1,334 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var packetConnReadWriteMulticastUDPTests = []struct {
-	addr     string
-	grp, src *net.UDPAddr
-}{
-	{"224.0.0.0:0", &net.UDPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{"232.0.1.0:0", &net.UDPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "solaris", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastUDPTests {
-		c, err := net.ListenPacket("udp4", tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		grp := *tt.grp
-		grp.Port = c.LocalAddr().(*net.UDPAddr).Port
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, &grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, &grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, &grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, &grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-		wb := []byte("HELLO-R-U-THERE")
-
-		for i, toggle := range []bool{true, false, true} {
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			p.SetMulticastTTL(i + 1)
-			if n, err := p.WriteTo(wb, nil, &grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else if !bytes.Equal(rb[:n], wb) {
-				t.Fatalf("got %v; want %v", rb[:n], wb)
-			}
-		}
-	}
-}
-
-var packetConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "solaris", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagDst | ipv4.FlagInterface
-		if runtime.GOOS != "solaris" {
-			// Solaris never allows to modify ICMP properties.
-			cf |= ipv4.FlagTTL
-		}
-
-		for i, toggle := range []bool{true, false, true} {
-			wb, err := (&icmp.Message{
-				Type: ipv4.ICMPTypeEcho, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			p.SetMulticastTTL(i + 1)
-			if n, err := p.WriteTo(wb, nil, tt.grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else {
-				m, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n])
-				if err != nil {
-					t.Fatal(err)
-				}
-				switch {
-				case m.Type == ipv4.ICMPTypeEchoReply && m.Code == 0: // net.inet.icmp.bmcastecho=1
-				case m.Type == ipv4.ICMPTypeEcho && m.Code == 0: // net.inet.icmp.bmcastecho=0
-				default:
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
-
-var rawConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 254)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 254)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestRawConnReadWriteMulticastICMP(t *testing.T) {
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range rawConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer r.Close()
-		if tt.src == nil {
-			if err := r.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer r.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := r.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support IGMPv2/3 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer r.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := r.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := r.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := r.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := r.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-		cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-
-		for i, toggle := range []bool{true, false, true} {
-			wb, err := (&icmp.Message{
-				Type: ipv4.ICMPTypeEcho, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(nil)
-			if err != nil {
-				t.Fatal(err)
-			}
-			wh := &ipv4.Header{
-				Version:  ipv4.Version,
-				Len:      ipv4.HeaderLen,
-				TOS:      i + 1,
-				TotalLen: ipv4.HeaderLen + len(wb),
-				Protocol: 1,
-				Dst:      tt.grp.IP,
-			}
-			if err := r.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := r.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			r.SetMulticastTTL(i + 1)
-			if err := r.WriteTo(wh, wb, nil); err != nil {
-				t.Fatal(err)
-			}
-			rb := make([]byte, ipv4.HeaderLen+128)
-			if rh, b, _, err := r.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else {
-				m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-				if err != nil {
-					t.Fatal(err)
-				}
-				switch {
-				case (rh.Dst.IsLoopback() || rh.Dst.IsLinkLocalUnicast() || rh.Dst.IsGlobalUnicast()) && m.Type == ipv4.ICMPTypeEchoReply && m.Code == 0: // net.inet.icmp.bmcastecho=1
-				case rh.Dst.IsMulticast() && m.Type == ipv4.ICMPTypeEcho && m.Code == 0: // net.inet.icmp.bmcastecho=0
-				default:
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/multicastlistener_test.go b/installer/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
deleted file mode 100644
index a0c24b55b0..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/multicastlistener_test.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var udpMultipleGroupListenerTests = []net.Addr{
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}, // see RFC 4727
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 250)},
-	&net.UDPAddr{IP: net.IPv4(224, 0, 0, 254)},
-}
-
-func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c, err := net.ListenPacket("udp4", "0.0.0.0:0") // wildcard address with no reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv4.NewPacketConn(c)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-				continue
-			}
-			if err := p.JoinGroup(&ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			if err := p.LeaveGroup(ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c1, err := net.ListenPacket("udp4", "224.0.0.0:1024") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c1.Close()
-
-		c2, err := net.ListenPacket("udp4", "224.0.0.0:1024") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c2.Close()
-
-		var ps [2]*ipv4.PacketConn
-		ps[0] = ipv4.NewPacketConn(c1)
-		ps[1] = ipv4.NewPacketConn(c2)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-				continue
-			}
-			for _, p := range ps {
-				if err := p.JoinGroup(&ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			for _, p := range ps {
-				if err := p.LeaveGroup(ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-	}
-}
-
-func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	type ml struct {
-		c   *ipv4.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip4", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("udp4", ip.String()+":"+"1024") // unicast address with non-reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPSingleRawConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0") // wildcard address
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	var mift []*net.Interface
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		if _, ok := nettest.IsMulticastCapable("ip4", &ifi); !ok {
-			continue
-		}
-		if err := r.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mift = append(mift, &ift[i])
-	}
-	for _, ifi := range mift {
-		if err := r.LeaveGroup(ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPPerInterfaceSingleRawConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("to avoid external network")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	gaddr := net.IPAddr{IP: net.IPv4(224, 0, 0, 254)} // see RFC 4727
-	type ml struct {
-		c   *ipv4.RawConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip4", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("ip4:253", ip.String()) // unicast address
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := r.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{r, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go b/installer/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
deleted file mode 100644
index f7efac24c8..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/multicastsockopt_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-var packetConnMulticastSocketOptionTests = []struct {
-	net, proto, addr string
-	grp, src         net.Addr
-}{
-	{"udp4", "", "224.0.0.0:0", &net.UDPAddr{IP: net.IPv4(224, 0, 0, 249)}, nil}, // see RFC 4727
-	{"ip4", ":icmp", "0.0.0.0", &net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}, nil},  // see RFC 4727
-
-	{"udp4", "", "232.0.0.0:0", &net.UDPAddr{IP: net.IPv4(232, 0, 1, 249)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-	{"ip4", ":icmp", "0.0.0.0", &net.IPAddr{IP: net.IPv4(232, 0, 1, 250)}, &net.UDPAddr{IP: net.IPv4(127, 0, 0, 1)}},  // see RFC 5771
-}
-
-func TestPacketConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnMulticastSocketOptionTests {
-		if tt.net == "ip4" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv4.NewPacketConn(c)
-		defer p.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, p, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, p, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-var rawConnMulticastSocketOptionTests = []struct {
-	grp, src net.Addr
-}{
-	{&net.IPAddr{IP: net.IPv4(224, 0, 0, 250)}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.IPv4(232, 0, 1, 250)}, &net.IPAddr{IP: net.IPv4(127, 0, 0, 1)}}, // see RFC 5771
-}
-
-func TestRawConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range rawConnMulticastSocketOptionTests {
-		c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		r, err := ipv4.NewRawConn(c)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer r.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, r, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, r, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-type testIPv4MulticastConn interface {
-	MulticastTTL() (int, error)
-	SetMulticastTTL(ttl int) error
-	MulticastLoopback() (bool, error)
-	SetMulticastLoopback(bool) error
-	JoinGroup(*net.Interface, net.Addr) error
-	LeaveGroup(*net.Interface, net.Addr) error
-	JoinSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	LeaveSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	ExcludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	IncludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-}
-
-func testMulticastSocketOptions(t *testing.T, c testIPv4MulticastConn, ifi *net.Interface, grp net.Addr) {
-	const ttl = 255
-	if err := c.SetMulticastTTL(ttl); err != nil {
-		t.Error(err)
-		return
-	}
-	if v, err := c.MulticastTTL(); err != nil {
-		t.Error(err)
-		return
-	} else if v != ttl {
-		t.Errorf("got %v; want %v", v, ttl)
-		return
-	}
-
-	for _, toggle := range []bool{true, false} {
-		if err := c.SetMulticastLoopback(toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if v, err := c.MulticastLoopback(); err != nil {
-			t.Error(err)
-			return
-		} else if v != toggle {
-			t.Errorf("got %v; want %v", v, toggle)
-			return
-		}
-	}
-
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
-
-func testSourceSpecificMulticastSocketOptions(t *testing.T, c testIPv4MulticastConn, ifi *net.Interface, grp, src net.Addr) {
-	// MCAST_JOIN_GROUP -> MCAST_BLOCK_SOURCE -> MCAST_UNBLOCK_SOURCE -> MCAST_LEAVE_GROUP
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.ExcludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		switch runtime.GOOS {
-		case "freebsd", "linux":
-		default: // platforms that don't support IGMPv2/3 fail here
-			t.Logf("not supported on %s", runtime.GOOS)
-			return
-		}
-		t.Error(err)
-		return
-	}
-	if err := c.IncludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_SOURCE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/packet.go b/installer/vendor/golang.org/x/net/ipv4/packet.go
deleted file mode 100644
index d43723ca95..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/packet.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-)
-
-// BUG(mikio): On Windows, the ReadFrom and WriteTo methods of RawConn
-// are not implemented.
-
-// A packetHandler represents the IPv4 datagram handler.
-type packetHandler struct {
-	c *net.IPConn
-	rawOpt
-}
-
-func (c *packetHandler) ok() bool { return c != nil && c.c != nil }
-
-// ReadFrom reads an IPv4 datagram from the endpoint c, copying the
-// datagram into b. It returns the received datagram as the IPv4
-// header h, the payload p and the control message cm.
-func (c *packetHandler) ReadFrom(b []byte) (h *Header, p []byte, cm *ControlMessage, err error) {
-	if !c.ok() {
-		return nil, nil, nil, syscall.EINVAL
-	}
-	oob := newControlMessage(&c.rawOpt)
-	n, oobn, _, src, err := c.c.ReadMsgIP(b, oob)
-	if err != nil {
-		return nil, nil, nil, err
-	}
-	var hs []byte
-	if hs, p, err = slicePacket(b[:n]); err != nil {
-		return nil, nil, nil, err
-	}
-	if h, err = ParseHeader(hs); err != nil {
-		return nil, nil, nil, err
-	}
-	if cm, err = parseControlMessage(oob[:oobn]); err != nil {
-		return nil, nil, nil, err
-	}
-	if src != nil && cm != nil {
-		cm.Src = src.IP
-	}
-	return
-}
-
-func slicePacket(b []byte) (h, p []byte, err error) {
-	if len(b) < HeaderLen {
-		return nil, nil, errHeaderTooShort
-	}
-	hdrlen := int(b[0]&0x0f) << 2
-	return b[:hdrlen], b[hdrlen:], nil
-}
-
-// WriteTo writes an IPv4 datagram through the endpoint c, copying the
-// datagram from the IPv4 header h and the payload p. The control
-// message cm allows the datagram path and the outgoing interface to be
-// specified.  Currently only Darwin and Linux support this. The cm
-// may be nil if control of the outgoing datagram is not required.
-//
-// The IPv4 header h must contain appropriate fields that include:
-//
-//	Version       = <must be specified>
-//	Len           = <must be specified>
-//	TOS           = <must be specified>
-//	TotalLen      = <must be specified>
-//	ID            = platform sets an appropriate value if ID is zero
-//	FragOff       = <must be specified>
-//	TTL           = <must be specified>
-//	Protocol      = <must be specified>
-//	Checksum      = platform sets an appropriate value if Checksum is zero
-//	Src           = platform sets an appropriate value if Src is nil
-//	Dst           = <must be specified>
-//	Options       = optional
-func (c *packetHandler) WriteTo(h *Header, p []byte, cm *ControlMessage) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	oob := marshalControlMessage(cm)
-	wh, err := h.Marshal()
-	if err != nil {
-		return err
-	}
-	dst := &net.IPAddr{}
-	if cm != nil {
-		if ip := cm.Dst.To4(); ip != nil {
-			dst.IP = ip
-		}
-	}
-	if dst.IP == nil {
-		dst.IP = h.Dst
-	}
-	wh = append(wh, p...)
-	_, _, err = c.c.WriteMsgIP(wh, oob, dst)
-	return err
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/payload.go b/installer/vendor/golang.org/x/net/ipv4/payload.go
deleted file mode 100644
index be130e424d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/payload.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import "net"
-
-// BUG(mikio): On Windows, the ControlMessage for ReadFrom and WriteTo
-// methods of PacketConn is not implemented.
-
-// A payloadHandler represents the IPv4 datagram payload handler.
-type payloadHandler struct {
-	net.PacketConn
-	rawOpt
-}
-
-func (c *payloadHandler) ok() bool { return c != nil && c.PacketConn != nil }
diff --git a/installer/vendor/golang.org/x/net/ipv4/payload_cmsg.go b/installer/vendor/golang.org/x/net/ipv4/payload_cmsg.go
deleted file mode 100644
index 5e6e55c20b..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/payload_cmsg.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9,!windows
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-)
-
-// ReadFrom reads a payload of the received IPv4 datagram, from the
-// endpoint c, copying the payload into b. It returns the number of
-// bytes copied into b, the control message cm and the source address
-// src of the received datagram.
-func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
-	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
-	}
-	oob := newControlMessage(&c.rawOpt)
-	var oobn int
-	switch c := c.PacketConn.(type) {
-	case *net.UDPConn:
-		if n, oobn, _, src, err = c.ReadMsgUDP(b, oob); err != nil {
-			return 0, nil, nil, err
-		}
-	case *net.IPConn:
-		if sockOpts[ssoStripHeader].name > 0 {
-			if n, oobn, _, src, err = c.ReadMsgIP(b, oob); err != nil {
-				return 0, nil, nil, err
-			}
-		} else {
-			nb := make([]byte, maxHeaderLen+len(b))
-			if n, oobn, _, src, err = c.ReadMsgIP(nb, oob); err != nil {
-				return 0, nil, nil, err
-			}
-			hdrlen := int(nb[0]&0x0f) << 2
-			copy(b, nb[hdrlen:])
-			n -= hdrlen
-		}
-	default:
-		return 0, nil, nil, errInvalidConnType
-	}
-	if cm, err = parseControlMessage(oob[:oobn]); err != nil {
-		return 0, nil, nil, err
-	}
-	if cm != nil {
-		cm.Src = netAddrToIP4(src)
-	}
-	return
-}
-
-// WriteTo writes a payload of the IPv4 datagram, to the destination
-// address dst through the endpoint c, copying the payload from b. It
-// returns the number of bytes written. The control message cm allows
-// the datagram path and the outgoing interface to be specified.
-// Currently only Darwin and Linux support this. The cm may be nil if
-// control of the outgoing datagram is not required.
-func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	oob := marshalControlMessage(cm)
-	if dst == nil {
-		return 0, errMissingAddress
-	}
-	switch c := c.PacketConn.(type) {
-	case *net.UDPConn:
-		n, _, err = c.WriteMsgUDP(b, oob, dst.(*net.UDPAddr))
-	case *net.IPConn:
-		n, _, err = c.WriteMsgIP(b, oob, dst.(*net.IPAddr))
-	default:
-		return 0, errInvalidConnType
-	}
-	if err != nil {
-		return 0, err
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/payload_nocmsg.go b/installer/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
deleted file mode 100644
index 6f9d5b0efd..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/payload_nocmsg.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9 windows
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-)
-
-// ReadFrom reads a payload of the received IPv4 datagram, from the
-// endpoint c, copying the payload into b. It returns the number of
-// bytes copied into b, the control message cm and the source address
-// src of the received datagram.
-func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
-	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
-	}
-	if n, src, err = c.PacketConn.ReadFrom(b); err != nil {
-		return 0, nil, nil, err
-	}
-	return
-}
-
-// WriteTo writes a payload of the IPv4 datagram, to the destination
-// address dst through the endpoint c, copying the payload from b. It
-// returns the number of bytes written. The control message cm allows
-// the datagram path and the outgoing interface to be specified.
-// Currently only Darwin and Linux support this. The cm may be nil if
-// control of the outgoing datagram is not required.
-func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	if dst == nil {
-		return 0, errMissingAddress
-	}
-	return c.PacketConn.WriteTo(b, dst)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/readwrite_test.go b/installer/vendor/golang.org/x/net/ipv4/readwrite_test.go
deleted file mode 100644
index a2384b8f9a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/readwrite_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func benchmarkUDPListener() (net.PacketConn, net.Addr, error) {
-	c, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		return nil, nil, err
-	}
-	dst, err := net.ResolveUDPAddr("udp4", c.LocalAddr().String())
-	if err != nil {
-		c.Close()
-		return nil, nil, err
-	}
-	return c, dst, nil
-}
-
-func BenchmarkReadWriteNetUDP(b *testing.B) {
-	c, dst, err := benchmarkUDPListener()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer c.Close()
-
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		benchmarkReadWriteNetUDP(b, c, wb, rb, dst)
-	}
-}
-
-func benchmarkReadWriteNetUDP(b *testing.B, c net.PacketConn, wb, rb []byte, dst net.Addr) {
-	if _, err := c.WriteTo(wb, dst); err != nil {
-		b.Fatal(err)
-	}
-	if _, _, err := c.ReadFrom(rb); err != nil {
-		b.Fatal(err)
-	}
-}
-
-func BenchmarkReadWriteIPv4UDP(b *testing.B) {
-	c, dst, err := benchmarkUDPListener()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-	cf := ipv4.FlagTTL | ipv4.FlagInterface
-	if err := p.SetControlMessage(cf, true); err != nil {
-		b.Fatal(err)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		benchmarkReadWriteIPv4UDP(b, p, wb, rb, dst, ifi)
-	}
-}
-
-func benchmarkReadWriteIPv4UDP(b *testing.B, p *ipv4.PacketConn, wb, rb []byte, dst net.Addr, ifi *net.Interface) {
-	cm := ipv4.ControlMessage{TTL: 1}
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-	if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-		b.Fatal(err)
-	} else if n != len(wb) {
-		b.Fatalf("got %v; want %v", n, len(wb))
-	}
-	if _, _, _, err := p.ReadFrom(rb); err != nil {
-		b.Fatal(err)
-	}
-}
-
-func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-
-	dst, err := net.ResolveUDPAddr("udp4", c.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	cf := ipv4.FlagTTL | ipv4.FlagSrc | ipv4.FlagDst | ipv4.FlagInterface
-	wb := []byte("HELLO-R-U-THERE")
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		rb := make([]byte, 128)
-		if n, cm, _, err := p.ReadFrom(rb); err != nil {
-			t.Error(err)
-			return
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Errorf("got %v; want %v", rb[:n], wb)
-			return
-		} else {
-			s := cm.String()
-			if strings.Contains(s, ",") {
-				t.Errorf("should be space-separated values: %s", s)
-			}
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv4.ControlMessage{
-			Src: net.IPv4(127, 0, 0, 1),
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Error(err)
-			return
-		} else if n != len(wb) {
-			t.Errorf("short write: %v", n)
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt.go b/installer/vendor/golang.org/x/net/ipv4/sockopt.go
deleted file mode 100644
index ace37d30f5..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-// Sticky socket options
-const (
-	ssoTOS                = iota // header field for unicast packet
-	ssoTTL                       // header field for unicast packet
-	ssoMulticastTTL              // header field for multicast packet
-	ssoMulticastInterface        // outbound interface for multicast packet
-	ssoMulticastLoopback         // loopback for multicast packet
-	ssoReceiveTTL                // header field on received packet
-	ssoReceiveDst                // header field on received packet
-	ssoReceiveInterface          // inbound interface on received packet
-	ssoPacketInfo                // incbound or outbound packet path
-	ssoHeaderPrepend             // ipv4 header prepend
-	ssoStripHeader               // strip ipv4 header
-	ssoICMPFilter                // icmp filter
-	ssoJoinGroup                 // any-source multicast
-	ssoLeaveGroup                // any-source multicast
-	ssoJoinSourceGroup           // source-specific multicast
-	ssoLeaveSourceGroup          // source-specific multicast
-	ssoBlockSourceGroup          // any-source or source-specific multicast
-	ssoUnblockSourceGroup        // any-source or source-specific multicast
-	ssoMax
-)
-
-// Sticky socket option value types
-const (
-	ssoTypeByte = iota + 1
-	ssoTypeInt
-	ssoTypeInterface
-	ssoTypeICMPFilter
-	ssoTypeIPMreq
-	ssoTypeIPMreqn
-	ssoTypeGroupReq
-	ssoTypeGroupSourceReq
-)
-
-// A sockOpt represents a binding for sticky socket option.
-type sockOpt struct {
-	name int // option name, must be equal or greater than 1
-	typ  int // option value type, must be equal or greater than 1
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq.go
deleted file mode 100644
index 8092f1db08..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd solaris windows
-
-package ipv4
-
-import "net"
-
-func setIPMreqInterface(mreq *ipMreq, ifi *net.Interface) error {
-	if ifi == nil {
-		return nil
-	}
-	ifat, err := ifi.Addrs()
-	if err != nil {
-		return err
-	}
-	for _, ifa := range ifat {
-		switch ifa := ifa.(type) {
-		case *net.IPAddr:
-			if ip := ifa.IP.To4(); ip != nil {
-				copy(mreq.Interface[:], ip)
-				return nil
-			}
-		case *net.IPNet:
-			if ip := ifa.IP.To4(); ip != nil {
-				copy(mreq.Interface[:], ip)
-				return nil
-			}
-		}
-	}
-	return errNoSuchInterface
-}
-
-func netIP4ToInterface(ip net.IP) (*net.Interface, error) {
-	ift, err := net.Interfaces()
-	if err != nil {
-		return nil, err
-	}
-	for _, ifi := range ift {
-		ifat, err := ifi.Addrs()
-		if err != nil {
-			return nil, err
-		}
-		for _, ifa := range ifat {
-			switch ifa := ifa.(type) {
-			case *net.IPAddr:
-				if ip.Equal(ifa.IP) {
-					return &ifi, nil
-				}
-			case *net.IPNet:
-				if ip.Equal(ifa.IP) {
-					return &ifi, nil
-				}
-			}
-		}
-	}
-	return nil, errNoSuchInterface
-}
-
-func netInterfaceToIP4(ifi *net.Interface) (net.IP, error) {
-	if ifi == nil {
-		return net.IPv4zero.To4(), nil
-	}
-	ifat, err := ifi.Addrs()
-	if err != nil {
-		return nil, err
-	}
-	for _, ifa := range ifat {
-		switch ifa := ifa.(type) {
-		case *net.IPAddr:
-			if ip := ifa.IP.To4(); ip != nil {
-				return ip, nil
-			}
-		case *net.IPNet:
-			if ip := ifa.IP.To4(); ip != nil {
-				return ip, nil
-			}
-		}
-	}
-	return nil, errNoSuchInterface
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_posix.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_posix.go
deleted file mode 100644
index 2259a39033..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_posix.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd solaris windows
-
-package ipv4
-
-import (
-	"net"
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func setsockoptIPMreq(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	mreq := ipMreq{Multiaddr: [4]byte{grp[0], grp[1], grp[2], grp[3]}}
-	if err := setIPMreqInterface(&mreq, ifi); err != nil {
-		return err
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, name, unsafe.Pointer(&mreq), sizeofIPMreq))
-}
-
-func getsockoptInterface(s uintptr, name int) (*net.Interface, error) {
-	var b [4]byte
-	l := uint32(4)
-	if err := getsockopt(s, iana.ProtocolIP, name, unsafe.Pointer(&b[0]), &l); err != nil {
-		return nil, os.NewSyscallError("getsockopt", err)
-	}
-	ifi, err := netIP4ToInterface(net.IPv4(b[0], b[1], b[2], b[3]))
-	if err != nil {
-		return nil, err
-	}
-	return ifi, nil
-}
-
-func setsockoptInterface(s uintptr, name int, ifi *net.Interface) error {
-	ip, err := netInterfaceToIP4(ifi)
-	if err != nil {
-		return err
-	}
-	var b [4]byte
-	copy(b[:], ip)
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, name, unsafe.Pointer(&b[0]), uint32(4)))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_stub.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_stub.go
deleted file mode 100644
index e655635ecb..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreq_stub.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !darwin,!dragonfly,!freebsd,!netbsd,!openbsd,!solaris,!windows
-
-package ipv4
-
-import "net"
-
-func setsockoptIPMreq(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	return errOpNoSupport
-}
-
-func getsockoptInterface(s uintptr, name int) (*net.Interface, error) {
-	return nil, errOpNoSupport
-}
-
-func setsockoptInterface(s uintptr, name int, ifi *net.Interface) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_stub.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_stub.go
deleted file mode 100644
index 0c7f0f8166..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_stub.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !darwin,!freebsd,!linux
-
-package ipv4
-
-import "net"
-
-func getsockoptIPMreqn(s uintptr, name int) (*net.Interface, error) {
-	return nil, errOpNoSupport
-}
-
-func setsockoptIPMreqn(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_unix.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_unix.go
deleted file mode 100644
index 92daffb0d3..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_asmreqn_unix.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin freebsd linux
-
-package ipv4
-
-import (
-	"net"
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func getsockoptIPMreqn(s uintptr, name int) (*net.Interface, error) {
-	var mreqn ipMreqn
-	l := uint32(sizeofIPMreqn)
-	if err := getsockopt(s, iana.ProtocolIP, name, unsafe.Pointer(&mreqn), &l); err != nil {
-		return nil, os.NewSyscallError("getsockopt", err)
-	}
-	if mreqn.Ifindex == 0 {
-		return nil, nil
-	}
-	ifi, err := net.InterfaceByIndex(int(mreqn.Ifindex))
-	if err != nil {
-		return nil, err
-	}
-	return ifi, nil
-}
-
-func setsockoptIPMreqn(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	var mreqn ipMreqn
-	if ifi != nil {
-		mreqn.Ifindex = int32(ifi.Index)
-	}
-	if grp != nil {
-		mreqn.Multiaddr = [4]byte{grp[0], grp[1], grp[2], grp[3]}
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, name, unsafe.Pointer(&mreqn), sizeofIPMreqn))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_posix.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_posix.go
deleted file mode 100644
index d80680373d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_posix.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv4
-
-import (
-	"net"
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func getInt(s uintptr, opt *sockOpt) (int, error) {
-	if opt.name < 1 || (opt.typ != ssoTypeByte && opt.typ != ssoTypeInt) {
-		return 0, errOpNoSupport
-	}
-	var i int32
-	var b byte
-	p := unsafe.Pointer(&i)
-	l := uint32(4)
-	if opt.typ == ssoTypeByte {
-		p = unsafe.Pointer(&b)
-		l = 1
-	}
-	if err := getsockopt(s, iana.ProtocolIP, opt.name, p, &l); err != nil {
-		return 0, os.NewSyscallError("getsockopt", err)
-	}
-	if opt.typ == ssoTypeByte {
-		return int(b), nil
-	}
-	return int(i), nil
-}
-
-func setInt(s uintptr, opt *sockOpt, v int) error {
-	if opt.name < 1 || (opt.typ != ssoTypeByte && opt.typ != ssoTypeInt) {
-		return errOpNoSupport
-	}
-	i := int32(v)
-	var b byte
-	p := unsafe.Pointer(&i)
-	l := uint32(4)
-	if opt.typ == ssoTypeByte {
-		b = byte(v)
-		p = unsafe.Pointer(&b)
-		l = 1
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, opt.name, p, l))
-}
-
-func getInterface(s uintptr, opt *sockOpt) (*net.Interface, error) {
-	if opt.name < 1 {
-		return nil, errOpNoSupport
-	}
-	switch opt.typ {
-	case ssoTypeInterface:
-		return getsockoptInterface(s, opt.name)
-	case ssoTypeIPMreqn:
-		return getsockoptIPMreqn(s, opt.name)
-	default:
-		return nil, errOpNoSupport
-	}
-}
-
-func setInterface(s uintptr, opt *sockOpt, ifi *net.Interface) error {
-	if opt.name < 1 {
-		return errOpNoSupport
-	}
-	switch opt.typ {
-	case ssoTypeInterface:
-		return setsockoptInterface(s, opt.name, ifi)
-	case ssoTypeIPMreqn:
-		return setsockoptIPMreqn(s, opt.name, ifi, nil)
-	default:
-		return errOpNoSupport
-	}
-}
-
-func getICMPFilter(s uintptr, opt *sockOpt) (*ICMPFilter, error) {
-	if opt.name < 1 || opt.typ != ssoTypeICMPFilter {
-		return nil, errOpNoSupport
-	}
-	var f ICMPFilter
-	l := uint32(sizeofICMPFilter)
-	if err := getsockopt(s, iana.ProtocolReserved, opt.name, unsafe.Pointer(&f.icmpFilter), &l); err != nil {
-		return nil, os.NewSyscallError("getsockopt", err)
-	}
-	return &f, nil
-}
-
-func setICMPFilter(s uintptr, opt *sockOpt, f *ICMPFilter) error {
-	if opt.name < 1 || opt.typ != ssoTypeICMPFilter {
-		return errOpNoSupport
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolReserved, opt.name, unsafe.Pointer(&f.icmpFilter), sizeofICMPFilter))
-}
-
-func setGroup(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	if opt.name < 1 {
-		return errOpNoSupport
-	}
-	switch opt.typ {
-	case ssoTypeIPMreq:
-		return setsockoptIPMreq(s, opt.name, ifi, grp)
-	case ssoTypeIPMreqn:
-		return setsockoptIPMreqn(s, opt.name, ifi, grp)
-	case ssoTypeGroupReq:
-		return setsockoptGroupReq(s, opt.name, ifi, grp)
-	default:
-		return errOpNoSupport
-	}
-}
-
-func setSourceGroup(s uintptr, opt *sockOpt, ifi *net.Interface, grp, src net.IP) error {
-	if opt.name < 1 || opt.typ != ssoTypeGroupSourceReq {
-		return errOpNoSupport
-	}
-	return setsockoptGroupSourceReq(s, opt.name, ifi, grp, src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_stub.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_stub.go
deleted file mode 100644
index 02873962e9..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_stub.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !darwin,!freebsd,!linux,!solaris
-
-package ipv4
-
-import "net"
-
-func setsockoptGroupReq(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	return errOpNoSupport
-}
-
-func setsockoptGroupSourceReq(s uintptr, name int, ifi *net.Interface, grp, src net.IP) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_unix.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_unix.go
deleted file mode 100644
index c9af55b91f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_ssmreq_unix.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin freebsd linux solaris
-
-package ipv4
-
-import (
-	"net"
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var freebsd32o64 bool
-
-func setsockoptGroupReq(s uintptr, name int, ifi *net.Interface, grp net.IP) error {
-	var gr groupReq
-	if ifi != nil {
-		gr.Interface = uint32(ifi.Index)
-	}
-	gr.setGroup(grp)
-	var p unsafe.Pointer
-	var l uint32
-	if freebsd32o64 {
-		var d [sizeofGroupReq + 4]byte
-		s := (*[sizeofGroupReq]byte)(unsafe.Pointer(&gr))
-		copy(d[:4], s[:4])
-		copy(d[8:], s[4:])
-		p = unsafe.Pointer(&d[0])
-		l = sizeofGroupReq + 4
-	} else {
-		p = unsafe.Pointer(&gr)
-		l = sizeofGroupReq
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, name, p, l))
-}
-
-func setsockoptGroupSourceReq(s uintptr, name int, ifi *net.Interface, grp, src net.IP) error {
-	var gsr groupSourceReq
-	if ifi != nil {
-		gsr.Interface = uint32(ifi.Index)
-	}
-	gsr.setSourceGroup(grp, src)
-	var p unsafe.Pointer
-	var l uint32
-	if freebsd32o64 {
-		var d [sizeofGroupSourceReq + 4]byte
-		s := (*[sizeofGroupSourceReq]byte)(unsafe.Pointer(&gsr))
-		copy(d[:4], s[:4])
-		copy(d[8:], s[4:])
-		p = unsafe.Pointer(&d[0])
-		l = sizeofGroupSourceReq + 4
-	} else {
-		p = unsafe.Pointer(&gsr)
-		l = sizeofGroupSourceReq
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, iana.ProtocolIP, name, p, l))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sockopt_stub.go b/installer/vendor/golang.org/x/net/ipv4/sockopt_stub.go
deleted file mode 100644
index 4ff609917a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sockopt_stub.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv4
-
-func setInt(s uintptr, opt *sockOpt, v int) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_bsd.go b/installer/vendor/golang.org/x/net/ipv4/sys_bsd.go
deleted file mode 100644
index 203033db0f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_bsd.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly netbsd
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:       {sysIP_RECVTTL, 1, marshalTTL, parseTTL},
-		ctlDst:       {sysIP_RECVDSTADDR, net.IPv4len, marshalDst, parseDst},
-		ctlInterface: {sysIP_RECVIF, syscall.SizeofSockaddrDatalink, marshalInterface, parseInterface},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeByte},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoReceiveDst:         {sysIP_RECVDSTADDR, ssoTypeInt},
-		ssoReceiveInterface:   {sysIP_RECVIF, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoJoinGroup:          {sysIP_ADD_MEMBERSHIP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {sysIP_DROP_MEMBERSHIP, ssoTypeIPMreq},
-	}
-)
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_darwin.go b/installer/vendor/golang.org/x/net/ipv4/sys_darwin.go
deleted file mode 100644
index abfffca871..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_darwin.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:       {sysIP_RECVTTL, 1, marshalTTL, parseTTL},
-		ctlDst:       {sysIP_RECVDSTADDR, net.IPv4len, marshalDst, parseDst},
-		ctlInterface: {sysIP_RECVIF, syscall.SizeofSockaddrDatalink, marshalInterface, parseInterface},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeByte},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoReceiveDst:         {sysIP_RECVDSTADDR, ssoTypeInt},
-		ssoReceiveInterface:   {sysIP_RECVIF, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoStripHeader:        {sysIP_STRIPHDR, ssoTypeInt},
-		ssoJoinGroup:          {sysIP_ADD_MEMBERSHIP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {sysIP_DROP_MEMBERSHIP, ssoTypeIPMreq},
-	}
-)
-
-func init() {
-	// Seems like kern.osreldate is veiled on latest OS X. We use
-	// kern.osrelease instead.
-	s, err := syscall.Sysctl("kern.osrelease")
-	if err != nil {
-		return
-	}
-	ss := strings.Split(s, ".")
-	if len(ss) == 0 {
-		return
-	}
-	// The IP_PKTINFO and protocol-independent multicast API were
-	// introduced in OS X 10.7 (Darwin 11). But it looks like
-	// those features require OS X 10.8 (Darwin 12) or above.
-	// See http://support.apple.com/kb/HT1633.
-	if mjver, err := strconv.Atoi(ss[0]); err != nil || mjver < 12 {
-		return
-	}
-	ctlOpts[ctlPacketInfo].name = sysIP_PKTINFO
-	ctlOpts[ctlPacketInfo].length = sizeofInetPktinfo
-	ctlOpts[ctlPacketInfo].marshal = marshalPacketInfo
-	ctlOpts[ctlPacketInfo].parse = parsePacketInfo
-	sockOpts[ssoPacketInfo].name = sysIP_RECVPKTINFO
-	sockOpts[ssoPacketInfo].typ = ssoTypeInt
-	sockOpts[ssoMulticastInterface].typ = ssoTypeIPMreqn
-	sockOpts[ssoJoinGroup].name = sysMCAST_JOIN_GROUP
-	sockOpts[ssoJoinGroup].typ = ssoTypeGroupReq
-	sockOpts[ssoLeaveGroup].name = sysMCAST_LEAVE_GROUP
-	sockOpts[ssoLeaveGroup].typ = ssoTypeGroupReq
-	sockOpts[ssoJoinSourceGroup].name = sysMCAST_JOIN_SOURCE_GROUP
-	sockOpts[ssoJoinSourceGroup].typ = ssoTypeGroupSourceReq
-	sockOpts[ssoLeaveSourceGroup].name = sysMCAST_LEAVE_SOURCE_GROUP
-	sockOpts[ssoLeaveSourceGroup].typ = ssoTypeGroupSourceReq
-	sockOpts[ssoBlockSourceGroup].name = sysMCAST_BLOCK_SOURCE
-	sockOpts[ssoBlockSourceGroup].typ = ssoTypeGroupSourceReq
-	sockOpts[ssoUnblockSourceGroup].name = sysMCAST_UNBLOCK_SOURCE
-	sockOpts[ssoUnblockSourceGroup].typ = ssoTypeGroupSourceReq
-}
-
-func (pi *inetPktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 132))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_freebsd.go b/installer/vendor/golang.org/x/net/ipv4/sys_freebsd.go
deleted file mode 100644
index fceffe98e5..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_freebsd.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"runtime"
-	"strings"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:       {sysIP_RECVTTL, 1, marshalTTL, parseTTL},
-		ctlDst:       {sysIP_RECVDSTADDR, net.IPv4len, marshalDst, parseDst},
-		ctlInterface: {sysIP_RECVIF, syscall.SizeofSockaddrDatalink, marshalInterface, parseInterface},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeByte},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoReceiveDst:         {sysIP_RECVDSTADDR, ssoTypeInt},
-		ssoReceiveInterface:   {sysIP_RECVIF, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoJoinGroup:          {sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:         {sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:    {sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:   {sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:   {sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup: {sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func init() {
-	freebsdVersion, _ = syscall.SysctlUint32("kern.osreldate")
-	if freebsdVersion >= 1000000 {
-		sockOpts[ssoMulticastInterface].typ = ssoTypeIPMreqn
-	}
-	if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" {
-		archs, _ := syscall.Sysctl("kern.supported_archs")
-		for _, s := range strings.Fields(archs) {
-			if s == "amd64" {
-				freebsd32o64 = true
-				break
-			}
-		}
-	}
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(&gr.Group))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(&gsr.Group))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet)(unsafe.Pointer(&gsr.Source))
-	sa.Len = sizeofSockaddrInet
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_linux.go b/installer/vendor/golang.org/x/net/ipv4/sys_linux.go
deleted file mode 100644
index c6c2a50676..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_linux.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:        {sysIP_TTL, 1, marshalTTL, parseTTL},
-		ctlPacketInfo: {sysIP_PKTINFO, sizeofInetPktinfo, marshalPacketInfo, parsePacketInfo},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeInt},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeIPMreqn},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoPacketInfo:         {sysIP_PKTINFO, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoICMPFilter:         {sysICMP_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:          {sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:         {sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:    {sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:   {sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:   {sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup: {sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func (pi *inetPktinfo) setIfindex(i int) {
-	pi.Ifindex = int32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(&gr.Group))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(&gsr.Group))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet)(unsafe.Pointer(&gsr.Source))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_linux_386.s b/installer/vendor/golang.org/x/net/ipv4/sys_linux_386.s
deleted file mode 100644
index b85551a5c1..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_linux_386.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT	·socketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·socketcall(SB)
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_openbsd.go b/installer/vendor/golang.org/x/net/ipv4/sys_openbsd.go
deleted file mode 100644
index d78083a285..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_openbsd.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:       {sysIP_RECVTTL, 1, marshalTTL, parseTTL},
-		ctlDst:       {sysIP_RECVDSTADDR, net.IPv4len, marshalDst, parseDst},
-		ctlInterface: {sysIP_RECVIF, syscall.SizeofSockaddrDatalink, marshalInterface, parseInterface},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeByte},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeByte},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoReceiveDst:         {sysIP_RECVDSTADDR, ssoTypeInt},
-		ssoReceiveInterface:   {sysIP_RECVIF, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoJoinGroup:          {sysIP_ADD_MEMBERSHIP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {sysIP_DROP_MEMBERSHIP, ssoTypeIPMreq},
-	}
-)
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_solaris.go b/installer/vendor/golang.org/x/net/ipv4/sys_solaris.go
deleted file mode 100644
index 879f39e0a1..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_solaris.go
+++ /dev/null
@@ -1,54 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTTL:        {sysIP_RECVTTL, 4, marshalTTL, parseTTL},
-		ctlPacketInfo: {sysIP_PKTINFO, sizeofInetPktinfo, marshalPacketInfo, parsePacketInfo},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeByte},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeByte},
-		ssoReceiveTTL:         {sysIP_RECVTTL, ssoTypeInt},
-		ssoPacketInfo:         {sysIP_RECVPKTINFO, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoJoinGroup:          {sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:         {sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:    {sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:   {sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:   {sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup: {sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func (pi *inetPktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 260))
-	sa.Family = syscall.AF_INET
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_solaris_amd64.s b/installer/vendor/golang.org/x/net/ipv4/sys_solaris_amd64.s
deleted file mode 100644
index 39d76af794..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_solaris_amd64.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT ·sysvicall6(SB),NOSPLIT,$0-88
-	JMP	syscall·sysvicall6(SB)
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_stub.go b/installer/vendor/golang.org/x/net/ipv4/sys_stub.go
deleted file mode 100644
index d6dd812fd7..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_stub.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv4
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{}
-
-	sockOpts = [ssoMax]sockOpt{}
-)
diff --git a/installer/vendor/golang.org/x/net/ipv4/sys_windows.go b/installer/vendor/golang.org/x/net/ipv4/sys_windows.go
deleted file mode 100644
index fac00bda86..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/sys_windows.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-const (
-	// See ws2tcpip.h.
-	sysIP_OPTIONS                = 0x1
-	sysIP_HDRINCL                = 0x2
-	sysIP_TOS                    = 0x3
-	sysIP_TTL                    = 0x4
-	sysIP_MULTICAST_IF           = 0x9
-	sysIP_MULTICAST_TTL          = 0xa
-	sysIP_MULTICAST_LOOP         = 0xb
-	sysIP_ADD_MEMBERSHIP         = 0xc
-	sysIP_DROP_MEMBERSHIP        = 0xd
-	sysIP_DONTFRAGMENT           = 0xe
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0xf
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x10
-	sysIP_PKTINFO                = 0x13
-
-	sizeofInetPktinfo  = 0x8
-	sizeofIPMreq       = 0x8
-	sizeofIPMreqSource = 0xc
-)
-
-type inetPktinfo struct {
-	Addr    [4]byte
-	Ifindex int32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte
-	Interface [4]byte
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte
-	Sourceaddr [4]byte
-	Interface  [4]byte
-}
-
-// See http://msdn.microsoft.com/en-us/library/windows/desktop/ms738586(v=vs.85).aspx
-var (
-	ctlOpts = [ctlMax]ctlOpt{}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTOS:                {sysIP_TOS, ssoTypeInt},
-		ssoTTL:                {sysIP_TTL, ssoTypeInt},
-		ssoMulticastTTL:       {sysIP_MULTICAST_TTL, ssoTypeInt},
-		ssoMulticastInterface: {sysIP_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastLoopback:  {sysIP_MULTICAST_LOOP, ssoTypeInt},
-		ssoHeaderPrepend:      {sysIP_HDRINCL, ssoTypeInt},
-		ssoJoinGroup:          {sysIP_ADD_MEMBERSHIP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {sysIP_DROP_MEMBERSHIP, ssoTypeIPMreq},
-	}
-)
-
-func (pi *inetPktinfo) setIfindex(i int) {
-	pi.Ifindex = int32(i)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/syscall_linux_386.go b/installer/vendor/golang.org/x/net/ipv4/syscall_linux_386.go
deleted file mode 100644
index 84f60bfb20..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/syscall_linux_386.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	sysGETSOCKOPT = 0xf
-	sysSETSOCKOPT = 0xe
-)
-
-func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (int, syscall.Errno)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	if _, errno := socketcall(sysGETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, errno := socketcall(sysSETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/syscall_solaris.go b/installer/vendor/golang.org/x/net/ipv4/syscall_solaris.go
deleted file mode 100644
index 8b0e1e447d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/syscall_solaris.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc___xnet_getsockopt __xnet_getsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
-
-//go:linkname procGetsockopt libc___xnet_getsockopt
-//go:linkname procSetsockopt libc_setsockopt
-
-var (
-	procGetsockopt uintptr
-	procSetsockopt uintptr
-)
-
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (uintptr, uintptr, syscall.Errno)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procGetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0)
-	if errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procSetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/syscall_unix.go b/installer/vendor/golang.org/x/net/ipv4/syscall_unix.go
deleted file mode 100644
index d952763f59..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/syscall_unix.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux,!386 netbsd openbsd
-
-package ipv4
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	if _, _, errno := syscall.Syscall6(syscall.SYS_GETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/syscall_windows.go b/installer/vendor/golang.org/x/net/ipv4/syscall_windows.go
deleted file mode 100644
index 0f42d22eba..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/syscall_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	return syscall.Getsockopt(syscall.Handle(s), int32(level), int32(name), (*byte)(v), (*int32)(unsafe.Pointer(l)))
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	return syscall.Setsockopt(syscall.Handle(s), int32(level), int32(name), (*byte)(v), int32(l))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/unicast_test.go b/installer/vendor/golang.org/x/net/ipv4/unicast_test.go
deleted file mode 100644
index bce8763f78..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/unicast_test.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("udp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	dst, err := net.ResolveUDPAddr("udp4", c.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-	cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-	wb := []byte("HELLO-R-U-THERE")
-
-	for i, toggle := range []bool{true, false, true} {
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		p.SetTTL(i + 1)
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, nil, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			t.Fatal(err)
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Fatalf("got %v; want %v", rb[:n], wb)
-		}
-	}
-}
-
-func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	dst, err := net.ResolveIPAddr("ip4", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	p := ipv4.NewPacketConn(c)
-	defer p.Close()
-	cf := ipv4.FlagDst | ipv4.FlagInterface
-	if runtime.GOOS != "solaris" {
-		// Solaris never allows to modify ICMP properties.
-		cf |= ipv4.FlagTTL
-	}
-
-	for i, toggle := range []bool{true, false, true} {
-		wb, err := (&icmp.Message{
-			Type: ipv4.ICMPTypeEcho, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		p.SetTTL(i + 1)
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, nil, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-	loop:
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			m, err := icmp.ParseMessage(iana.ProtocolICMP, rb[:n])
-			if err != nil {
-				t.Fatal(err)
-			}
-			if runtime.GOOS == "linux" && m.Type == ipv4.ICMPTypeEcho {
-				// On Linux we must handle own sent packets.
-				goto loop
-			}
-			if m.Type != ipv4.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
-
-func TestRawConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "0.0.0.0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	dst, err := net.ResolveIPAddr("ip4", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer r.Close()
-	cf := ipv4.FlagTTL | ipv4.FlagDst | ipv4.FlagInterface
-
-	for i, toggle := range []bool{true, false, true} {
-		wb, err := (&icmp.Message{
-			Type: ipv4.ICMPTypeEcho, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		wh := &ipv4.Header{
-			Version:  ipv4.Version,
-			Len:      ipv4.HeaderLen,
-			TOS:      i + 1,
-			TotalLen: ipv4.HeaderLen + len(wb),
-			TTL:      i + 1,
-			Protocol: 1,
-			Dst:      dst.IP,
-		}
-		if err := r.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		}
-		if err := r.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if err := r.WriteTo(wh, wb, nil); err != nil {
-			t.Fatal(err)
-		}
-		rb := make([]byte, ipv4.HeaderLen+128)
-	loop:
-		if err := r.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if _, b, _, err := r.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			m, err := icmp.ParseMessage(iana.ProtocolICMP, b)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if runtime.GOOS == "linux" && m.Type == ipv4.ICMPTypeEcho {
-				// On Linux we must handle own sent packets.
-				goto loop
-			}
-			if m.Type != ipv4.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv4.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go b/installer/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
deleted file mode 100644
index db5213b91c..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/unicastsockopt_test.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv4_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv4"
-)
-
-func TestConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	ln, err := net.Listen("tcp4", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	errc := make(chan error, 1)
-	go func() {
-		c, err := ln.Accept()
-		if err != nil {
-			errc <- err
-			return
-		}
-		errc <- c.Close()
-	}()
-
-	c, err := net.Dial("tcp4", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	testUnicastSocketOptions(t, ipv4.NewConn(c))
-
-	if err := <-errc; err != nil {
-		t.Errorf("server: %v", err)
-	}
-}
-
-var packetConnUnicastSocketOptionTests = []struct {
-	net, proto, addr string
-}{
-	{"udp4", "", "127.0.0.1:0"},
-	{"ip4", ":icmp", "127.0.0.1"},
-}
-
-func TestPacketConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnUnicastSocketOptionTests {
-		if tt.net == "ip4" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		testUnicastSocketOptions(t, ipv4.NewPacketConn(c))
-	}
-}
-
-func TestRawConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip4", net.FlagUp|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	c, err := net.ListenPacket("ip4:icmp", "127.0.0.1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	r, err := ipv4.NewRawConn(c)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testUnicastSocketOptions(t, r)
-}
-
-type testIPv4UnicastConn interface {
-	TOS() (int, error)
-	SetTOS(int) error
-	TTL() (int, error)
-	SetTTL(int) error
-}
-
-func testUnicastSocketOptions(t *testing.T, c testIPv4UnicastConn) {
-	tos := iana.DiffServCS0 | iana.NotECNTransport
-	switch runtime.GOOS {
-	case "windows":
-		// IP_TOS option is supported on Windows 8 and beyond.
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	if err := c.SetTOS(tos); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.TOS(); err != nil {
-		t.Fatal(err)
-	} else if v != tos {
-		t.Fatalf("got %v; want %v", v, tos)
-	}
-	const ttl = 255
-	if err := c.SetTTL(ttl); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.TTL(); err != nil {
-		t.Fatal(err)
-	} else if v != ttl {
-		t.Fatalf("got %v; want %v", v, ttl)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_darwin.go b/installer/vendor/golang.org/x/net/ipv4/zsys_darwin.go
deleted file mode 100644
index c07cc883fc..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_darwin.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_darwin.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_STRIPHDR    = 0x17
-	sysIP_RECVTTL     = 0x18
-	sysIP_BOUND_IF    = 0x19
-	sysIP_PKTINFO     = 0x1a
-	sysIP_RECVPKTINFO = 0x1a
-
-	sysIP_MULTICAST_IF           = 0x9
-	sysIP_MULTICAST_TTL          = 0xa
-	sysIP_MULTICAST_LOOP         = 0xb
-	sysIP_ADD_MEMBERSHIP         = 0xc
-	sysIP_DROP_MEMBERSHIP        = 0xd
-	sysIP_MULTICAST_VIF          = 0xe
-	sysIP_MULTICAST_IFINDEX      = 0x42
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-	sysIP_BLOCK_SOURCE           = 0x48
-	sysIP_UNBLOCK_SOURCE         = 0x49
-	sysMCAST_JOIN_GROUP          = 0x50
-	sysMCAST_LEAVE_GROUP         = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
-	sysMCAST_BLOCK_SOURCE        = 0x54
-	sysMCAST_UNBLOCK_SOURCE      = 0x55
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofInetPktinfo     = 0xc
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type inetPktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [128]byte
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [128]byte
-	Pad_cgo_1 [128]byte
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_dragonfly.go b/installer/vendor/golang.org/x/net/ipv4/zsys_dragonfly.go
deleted file mode 100644
index c4365e9e71..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_dragonfly.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_dragonfly.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_RECVTTL     = 0x41
-
-	sysIP_MULTICAST_IF    = 0x9
-	sysIP_MULTICAST_TTL   = 0xa
-	sysIP_MULTICAST_LOOP  = 0xb
-	sysIP_MULTICAST_VIF   = 0xe
-	sysIP_ADD_MEMBERSHIP  = 0xc
-	sysIP_DROP_MEMBERSHIP = 0xd
-
-	sizeofIPMreq = 0x8
-)
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_386.go b/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_386.go
deleted file mode 100644
index 8c4aec94c8..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_386.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_SENDSRCADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_ONESBCAST   = 0x17
-	sysIP_BINDANY     = 0x18
-	sysIP_RECVTTL     = 0x41
-	sysIP_MINTTL      = 0x42
-	sysIP_DONTFRAG    = 0x43
-	sysIP_RECVTOS     = 0x44
-
-	sysIP_MULTICAST_IF           = 0x9
-	sysIP_MULTICAST_TTL          = 0xa
-	sysIP_MULTICAST_LOOP         = 0xb
-	sysIP_ADD_MEMBERSHIP         = 0xc
-	sysIP_DROP_MEMBERSHIP        = 0xd
-	sysIP_MULTICAST_VIF          = 0xe
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-	sysIP_BLOCK_SOURCE           = 0x48
-	sysIP_UNBLOCK_SOURCE         = 0x49
-	sysMCAST_JOIN_GROUP          = 0x50
-	sysMCAST_LEAVE_GROUP         = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
-	sysMCAST_BLOCK_SOURCE        = 0x54
-	sysMCAST_UNBLOCK_SOURCE      = 0x55
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_amd64.go b/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_amd64.go
deleted file mode 100644
index 4b10b7c575..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_amd64.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_SENDSRCADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_ONESBCAST   = 0x17
-	sysIP_BINDANY     = 0x18
-	sysIP_RECVTTL     = 0x41
-	sysIP_MINTTL      = 0x42
-	sysIP_DONTFRAG    = 0x43
-	sysIP_RECVTOS     = 0x44
-
-	sysIP_MULTICAST_IF           = 0x9
-	sysIP_MULTICAST_TTL          = 0xa
-	sysIP_MULTICAST_LOOP         = 0xb
-	sysIP_ADD_MEMBERSHIP         = 0xc
-	sysIP_DROP_MEMBERSHIP        = 0xd
-	sysIP_MULTICAST_VIF          = 0xe
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-	sysIP_BLOCK_SOURCE           = 0x48
-	sysIP_UNBLOCK_SOURCE         = 0x49
-	sysMCAST_JOIN_GROUP          = 0x50
-	sysMCAST_LEAVE_GROUP         = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
-	sysMCAST_BLOCK_SOURCE        = 0x54
-	sysMCAST_UNBLOCK_SOURCE      = 0x55
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_arm.go b/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_arm.go
deleted file mode 100644
index 4b10b7c575..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_freebsd_arm.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_SENDSRCADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_ONESBCAST   = 0x17
-	sysIP_BINDANY     = 0x18
-	sysIP_RECVTTL     = 0x41
-	sysIP_MINTTL      = 0x42
-	sysIP_DONTFRAG    = 0x43
-	sysIP_RECVTOS     = 0x44
-
-	sysIP_MULTICAST_IF           = 0x9
-	sysIP_MULTICAST_TTL          = 0xa
-	sysIP_MULTICAST_LOOP         = 0xb
-	sysIP_ADD_MEMBERSHIP         = 0xc
-	sysIP_DROP_MEMBERSHIP        = 0xd
-	sysIP_MULTICAST_VIF          = 0xe
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x46
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x47
-	sysIP_BLOCK_SOURCE           = 0x48
-	sysIP_UNBLOCK_SOURCE         = 0x49
-	sysMCAST_JOIN_GROUP          = 0x50
-	sysMCAST_LEAVE_GROUP         = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x53
-	sysMCAST_BLOCK_SOURCE        = 0x54
-	sysMCAST_UNBLOCK_SOURCE      = 0x55
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet struct {
-	Len    uint8
-	Family uint8
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_386.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_386.go
deleted file mode 100644
index 4da672013e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_386.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_amd64.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_amd64.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_amd64.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm.go
deleted file mode 100644
index 4da672013e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm64.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm64.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_arm64.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips.go
deleted file mode 100644
index 4da672013e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64le.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64le.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mips64le.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mipsle.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mipsle.go
deleted file mode 100644
index 4da672013e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_mipsle.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc.go
deleted file mode 100644
index b825a18e96..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc.go
+++ /dev/null
@@ -1,146 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]uint8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64le.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64le.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_ppc64le.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_s390x.go b/installer/vendor/golang.org/x/net/ipv4/zsys_linux_s390x.go
deleted file mode 100644
index 65945bbd09..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_linux_s390x.go
+++ /dev/null
@@ -1,148 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv4
-
-const (
-	sysIP_TOS             = 0x1
-	sysIP_TTL             = 0x2
-	sysIP_HDRINCL         = 0x3
-	sysIP_OPTIONS         = 0x4
-	sysIP_ROUTER_ALERT    = 0x5
-	sysIP_RECVOPTS        = 0x6
-	sysIP_RETOPTS         = 0x7
-	sysIP_PKTINFO         = 0x8
-	sysIP_PKTOPTIONS      = 0x9
-	sysIP_MTU_DISCOVER    = 0xa
-	sysIP_RECVERR         = 0xb
-	sysIP_RECVTTL         = 0xc
-	sysIP_RECVTOS         = 0xd
-	sysIP_MTU             = 0xe
-	sysIP_FREEBIND        = 0xf
-	sysIP_TRANSPARENT     = 0x13
-	sysIP_RECVRETOPTS     = 0x7
-	sysIP_ORIGDSTADDR     = 0x14
-	sysIP_RECVORIGDSTADDR = 0x14
-	sysIP_MINTTL          = 0x15
-	sysIP_NODEFRAG        = 0x16
-	sysIP_UNICAST_IF      = 0x32
-
-	sysIP_MULTICAST_IF           = 0x20
-	sysIP_MULTICAST_TTL          = 0x21
-	sysIP_MULTICAST_LOOP         = 0x22
-	sysIP_ADD_MEMBERSHIP         = 0x23
-	sysIP_DROP_MEMBERSHIP        = 0x24
-	sysIP_UNBLOCK_SOURCE         = 0x25
-	sysIP_BLOCK_SOURCE           = 0x26
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x27
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x28
-	sysIP_MSFILTER               = 0x29
-	sysMCAST_JOIN_GROUP          = 0x2a
-	sysMCAST_LEAVE_GROUP         = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP   = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP  = 0x2f
-	sysMCAST_BLOCK_SOURCE        = 0x2b
-	sysMCAST_UNBLOCK_SOURCE      = 0x2c
-	sysMCAST_MSFILTER            = 0x30
-	sysIP_MULTICAST_ALL          = 0x31
-
-	sysICMP_FILTER = 0x1
-
-	sysSO_EE_ORIGIN_NONE         = 0x0
-	sysSO_EE_ORIGIN_LOCAL        = 0x1
-	sysSO_EE_ORIGIN_ICMP         = 0x2
-	sysSO_EE_ORIGIN_ICMP6        = 0x3
-	sysSO_EE_ORIGIN_TXSTATUS     = 0x4
-	sysSO_EE_ORIGIN_TIMESTAMPING = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet          = 0x10
-	sizeofInetPktinfo           = 0xc
-	sizeofSockExtendedErr       = 0x10
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqn        = 0xc
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPFilter = 0x4
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	X__pad [8]uint8
-}
-
-type inetPktinfo struct {
-	Ifindex  int32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type sockExtendedErr struct {
-	Errno  uint32
-	Origin uint8
-	Type   uint8
-	Code   uint8
-	Pad    uint8
-	Info   uint32
-	Data   uint32
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqn struct {
-	Multiaddr [4]byte /* in_addr */
-	Address   [4]byte /* in_addr */
-	Ifindex   int32
-}
-
-type ipMreqSource struct {
-	Multiaddr  uint32
-	Interface  uint32
-	Sourceaddr uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpFilter struct {
-	Data uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_netbsd.go b/installer/vendor/golang.org/x/net/ipv4/zsys_netbsd.go
deleted file mode 100644
index fd3624d93c..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_netbsd.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_netbsd.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x14
-	sysIP_RECVTTL     = 0x17
-
-	sysIP_MULTICAST_IF    = 0x9
-	sysIP_MULTICAST_TTL   = 0xa
-	sysIP_MULTICAST_LOOP  = 0xb
-	sysIP_ADD_MEMBERSHIP  = 0xc
-	sysIP_DROP_MEMBERSHIP = 0xd
-
-	sizeofIPMreq = 0x8
-)
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_openbsd.go b/installer/vendor/golang.org/x/net/ipv4/zsys_openbsd.go
deleted file mode 100644
index 12f36be759..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_openbsd.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_openbsd.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x1e
-	sysIP_RECVTTL     = 0x1f
-
-	sysIP_MULTICAST_IF    = 0x9
-	sysIP_MULTICAST_TTL   = 0xa
-	sysIP_MULTICAST_LOOP  = 0xb
-	sysIP_ADD_MEMBERSHIP  = 0xc
-	sysIP_DROP_MEMBERSHIP = 0xd
-
-	sizeofIPMreq = 0x8
-)
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
diff --git a/installer/vendor/golang.org/x/net/ipv4/zsys_solaris.go b/installer/vendor/golang.org/x/net/ipv4/zsys_solaris.go
deleted file mode 100644
index 0a3875cc41..0000000000
--- a/installer/vendor/golang.org/x/net/ipv4/zsys_solaris.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_solaris.go
-
-package ipv4
-
-const (
-	sysIP_OPTIONS     = 0x1
-	sysIP_HDRINCL     = 0x2
-	sysIP_TOS         = 0x3
-	sysIP_TTL         = 0x4
-	sysIP_RECVOPTS    = 0x5
-	sysIP_RECVRETOPTS = 0x6
-	sysIP_RECVDSTADDR = 0x7
-	sysIP_RETOPTS     = 0x8
-	sysIP_RECVIF      = 0x9
-	sysIP_RECVSLLA    = 0xa
-	sysIP_RECVTTL     = 0xb
-
-	sysIP_MULTICAST_IF           = 0x10
-	sysIP_MULTICAST_TTL          = 0x11
-	sysIP_MULTICAST_LOOP         = 0x12
-	sysIP_ADD_MEMBERSHIP         = 0x13
-	sysIP_DROP_MEMBERSHIP        = 0x14
-	sysIP_BLOCK_SOURCE           = 0x15
-	sysIP_UNBLOCK_SOURCE         = 0x16
-	sysIP_ADD_SOURCE_MEMBERSHIP  = 0x17
-	sysIP_DROP_SOURCE_MEMBERSHIP = 0x18
-	sysIP_NEXTHOP                = 0x19
-
-	sysIP_PKTINFO     = 0x1a
-	sysIP_RECVPKTINFO = 0x1a
-	sysIP_DONTFRAG    = 0x1b
-
-	sysIP_BOUND_IF      = 0x41
-	sysIP_UNSPEC_SRC    = 0x42
-	sysIP_BROADCAST_TTL = 0x43
-	sysIP_DHCPINIT_IF   = 0x45
-
-	sysIP_REUSEADDR = 0x104
-	sysIP_DONTROUTE = 0x105
-	sysIP_BROADCAST = 0x106
-
-	sysMCAST_JOIN_GROUP         = 0x29
-	sysMCAST_LEAVE_GROUP        = 0x2a
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2d
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2e
-
-	sizeofSockaddrStorage = 0x100
-	sizeofSockaddrInet    = 0x10
-	sizeofInetPktinfo     = 0xc
-
-	sizeofIPMreq         = 0x8
-	sizeofIPMreqSource   = 0xc
-	sizeofGroupReq       = 0x104
-	sizeofGroupSourceReq = 0x204
-)
-
-type sockaddrStorage struct {
-	Family     uint16
-	X_ss_pad1  [6]int8
-	X_ss_align float64
-	X_ss_pad2  [240]int8
-}
-
-type sockaddrInet struct {
-	Family uint16
-	Port   uint16
-	Addr   [4]byte /* in_addr */
-	Zero   [8]int8
-}
-
-type inetPktinfo struct {
-	Ifindex  uint32
-	Spec_dst [4]byte /* in_addr */
-	Addr     [4]byte /* in_addr */
-}
-
-type ipMreq struct {
-	Multiaddr [4]byte /* in_addr */
-	Interface [4]byte /* in_addr */
-}
-
-type ipMreqSource struct {
-	Multiaddr  [4]byte /* in_addr */
-	Sourceaddr [4]byte /* in_addr */
-	Interface  [4]byte /* in_addr */
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [256]byte
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [256]byte
-	Pad_cgo_1 [256]byte
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/bpf_test.go b/installer/vendor/golang.org/x/net/ipv6/bpf_test.go
deleted file mode 100644
index 8253e1f42a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/bpf_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/ipv6"
-)
-
-func TestBPF(t *testing.T) {
-	if runtime.GOOS != "linux" {
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	l, err := net.ListenPacket("udp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-
-	p := ipv6.NewPacketConn(l)
-
-	// This filter accepts UDP packets whose first payload byte is
-	// even.
-	prog, err := bpf.Assemble([]bpf.Instruction{
-		// Load the first byte of the payload (skipping UDP header).
-		bpf.LoadAbsolute{Off: 8, Size: 1},
-		// Select LSB of the byte.
-		bpf.ALUOpConstant{Op: bpf.ALUOpAnd, Val: 1},
-		// Byte is even?
-		bpf.JumpIf{Cond: bpf.JumpEqual, Val: 0, SkipFalse: 1},
-		// Accept.
-		bpf.RetConstant{Val: 4096},
-		// Ignore.
-		bpf.RetConstant{Val: 0},
-	})
-	if err != nil {
-		t.Fatalf("compiling BPF: %s", err)
-	}
-
-	if err = p.SetBPF(prog); err != nil {
-		t.Fatalf("attaching filter to Conn: %s", err)
-	}
-
-	s, err := net.Dial("udp6", l.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer s.Close()
-	go func() {
-		for i := byte(0); i < 10; i++ {
-			s.Write([]byte{i})
-		}
-	}()
-
-	l.SetDeadline(time.Now().Add(2 * time.Second))
-	seen := make([]bool, 5)
-	for {
-		var b [512]byte
-		n, _, err := l.ReadFrom(b[:])
-		if err != nil {
-			t.Fatalf("reading from listener: %s", err)
-		}
-		if n != 1 {
-			t.Fatalf("unexpected packet length, want 1, got %d", n)
-		}
-		if b[0] >= 10 {
-			t.Fatalf("unexpected byte, want 0-9, got %d", b[0])
-		}
-		if b[0]%2 != 0 {
-			t.Fatalf("got odd byte %d, wanted only even bytes", b[0])
-		}
-		seen[b[0]/2] = true
-
-		seenAll := true
-		for _, v := range seen {
-			if !v {
-				seenAll = false
-				break
-			}
-		}
-		if seenAll {
-			break
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/bpfopt_linux.go b/installer/vendor/golang.org/x/net/ipv6/bpfopt_linux.go
deleted file mode 100644
index daf7ea853f..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/bpfopt_linux.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"os"
-	"unsafe"
-
-	"golang.org/x/net/bpf"
-	"golang.org/x/net/internal/netreflect"
-)
-
-// SetBPF attaches a BPF program to the connection.
-//
-// Only supported on Linux.
-func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	prog := sockFProg{
-		Len:    uint16(len(filter)),
-		Filter: (*sockFilter)(unsafe.Pointer(&filter[0])),
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, sysSOL_SOCKET, sysSO_ATTACH_FILTER, unsafe.Pointer(&prog), uint32(unsafe.Sizeof(prog))))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/bpfopt_stub.go b/installer/vendor/golang.org/x/net/ipv6/bpfopt_stub.go
deleted file mode 100644
index 2e4de5f0d5..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/bpfopt_stub.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !linux
-
-package ipv6
-
-import "golang.org/x/net/bpf"
-
-// SetBPF attaches a BPF program to the connection.
-//
-// Only supported on Linux.
-func (c *dgramOpt) SetBPF(filter []bpf.RawInstruction) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control.go b/installer/vendor/golang.org/x/net/ipv6/control.go
deleted file mode 100644
index 674628d3f0..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"fmt"
-	"net"
-	"sync"
-)
-
-// Note that RFC 3542 obsoletes RFC 2292 but OS X Snow Leopard and the
-// former still support RFC 2292 only. Please be aware that almost
-// all protocol implementations prohibit using a combination of RFC
-// 2292 and RFC 3542 for some practical reasons.
-
-type rawOpt struct {
-	sync.RWMutex
-	cflags ControlFlags
-}
-
-func (c *rawOpt) set(f ControlFlags)        { c.cflags |= f }
-func (c *rawOpt) clear(f ControlFlags)      { c.cflags &^= f }
-func (c *rawOpt) isset(f ControlFlags) bool { return c.cflags&f != 0 }
-
-// A ControlFlags represents per packet basis IP-level socket option
-// control flags.
-type ControlFlags uint
-
-const (
-	FlagTrafficClass ControlFlags = 1 << iota // pass the traffic class on the received packet
-	FlagHopLimit                              // pass the hop limit on the received packet
-	FlagSrc                                   // pass the source address on the received packet
-	FlagDst                                   // pass the destination address on the received packet
-	FlagInterface                             // pass the interface index on the received packet
-	FlagPathMTU                               // pass the path MTU on the received packet path
-)
-
-const flagPacketInfo = FlagDst | FlagInterface
-
-// A ControlMessage represents per packet basis IP-level socket
-// options.
-type ControlMessage struct {
-	// Receiving socket options: SetControlMessage allows to
-	// receive the options from the protocol stack using ReadFrom
-	// method of PacketConn.
-	//
-	// Specifying socket options: ControlMessage for WriteTo
-	// method of PacketConn allows to send the options to the
-	// protocol stack.
-	//
-	TrafficClass int    // traffic class, must be 1 <= value <= 255 when specifying
-	HopLimit     int    // hop limit, must be 1 <= value <= 255 when specifying
-	Src          net.IP // source address, specifying only
-	Dst          net.IP // destination address, receiving only
-	IfIndex      int    // interface index, must be 1 <= value when specifying
-	NextHop      net.IP // next hop address, specifying only
-	MTU          int    // path MTU, receiving only
-}
-
-func (cm *ControlMessage) String() string {
-	if cm == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("tclass=%#x hoplim=%d src=%v dst=%v ifindex=%d nexthop=%v mtu=%d", cm.TrafficClass, cm.HopLimit, cm.Src, cm.Dst, cm.IfIndex, cm.NextHop, cm.MTU)
-}
-
-// Ancillary data socket options
-const (
-	ctlTrafficClass = iota // header field
-	ctlHopLimit            // header field
-	ctlPacketInfo          // inbound or outbound packet path
-	ctlNextHop             // nexthop
-	ctlPathMTU             // path mtu
-	ctlMax
-)
-
-// A ctlOpt represents a binding for ancillary data socket option.
-type ctlOpt struct {
-	name    int // option name, must be equal or greater than 1
-	length  int // option length
-	marshal func([]byte, *ControlMessage) []byte
-	parse   func(*ControlMessage, []byte)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go b/installer/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go
deleted file mode 100644
index d1693af1fd..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control_rfc2292_unix.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func marshal2292HopLimit(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_2292HOPLIMIT
-	m.SetLen(syscall.CmsgLen(4))
-	if cm != nil {
-		data := b[syscall.CmsgLen(0):]
-		nativeEndian.PutUint32(data[:4], uint32(cm.HopLimit))
-	}
-	return b[syscall.CmsgSpace(4):]
-}
-
-func marshal2292PacketInfo(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_2292PKTINFO
-	m.SetLen(syscall.CmsgLen(sizeofInet6Pktinfo))
-	if cm != nil {
-		pi := (*inet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
-		if ip := cm.Src.To16(); ip != nil && ip.To4() == nil {
-			copy(pi.Addr[:], ip)
-		}
-		if cm.IfIndex > 0 {
-			pi.setIfindex(cm.IfIndex)
-		}
-	}
-	return b[syscall.CmsgSpace(sizeofInet6Pktinfo):]
-}
-
-func marshal2292NextHop(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_2292NEXTHOP
-	m.SetLen(syscall.CmsgLen(sizeofSockaddrInet6))
-	if cm != nil {
-		sa := (*sockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
-		sa.setSockaddr(cm.NextHop, cm.IfIndex)
-	}
-	return b[syscall.CmsgSpace(sizeofSockaddrInet6):]
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go b/installer/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go
deleted file mode 100644
index 2800df4bc9..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control_rfc3542_unix.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func marshalTrafficClass(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_TCLASS
-	m.SetLen(syscall.CmsgLen(4))
-	if cm != nil {
-		data := b[syscall.CmsgLen(0):]
-		nativeEndian.PutUint32(data[:4], uint32(cm.TrafficClass))
-	}
-	return b[syscall.CmsgSpace(4):]
-}
-
-func parseTrafficClass(cm *ControlMessage, b []byte) {
-	cm.TrafficClass = int(nativeEndian.Uint32(b[:4]))
-}
-
-func marshalHopLimit(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_HOPLIMIT
-	m.SetLen(syscall.CmsgLen(4))
-	if cm != nil {
-		data := b[syscall.CmsgLen(0):]
-		nativeEndian.PutUint32(data[:4], uint32(cm.HopLimit))
-	}
-	return b[syscall.CmsgSpace(4):]
-}
-
-func parseHopLimit(cm *ControlMessage, b []byte) {
-	cm.HopLimit = int(nativeEndian.Uint32(b[:4]))
-}
-
-func marshalPacketInfo(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_PKTINFO
-	m.SetLen(syscall.CmsgLen(sizeofInet6Pktinfo))
-	if cm != nil {
-		pi := (*inet6Pktinfo)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
-		if ip := cm.Src.To16(); ip != nil && ip.To4() == nil {
-			copy(pi.Addr[:], ip)
-		}
-		if cm.IfIndex > 0 {
-			pi.setIfindex(cm.IfIndex)
-		}
-	}
-	return b[syscall.CmsgSpace(sizeofInet6Pktinfo):]
-}
-
-func parsePacketInfo(cm *ControlMessage, b []byte) {
-	pi := (*inet6Pktinfo)(unsafe.Pointer(&b[0]))
-	cm.Dst = pi.Addr[:]
-	cm.IfIndex = int(pi.Ifindex)
-}
-
-func marshalNextHop(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_NEXTHOP
-	m.SetLen(syscall.CmsgLen(sizeofSockaddrInet6))
-	if cm != nil {
-		sa := (*sockaddrInet6)(unsafe.Pointer(&b[syscall.CmsgLen(0)]))
-		sa.setSockaddr(cm.NextHop, cm.IfIndex)
-	}
-	return b[syscall.CmsgSpace(sizeofSockaddrInet6):]
-}
-
-func parseNextHop(cm *ControlMessage, b []byte) {
-}
-
-func marshalPathMTU(b []byte, cm *ControlMessage) []byte {
-	m := (*syscall.Cmsghdr)(unsafe.Pointer(&b[0]))
-	m.Level = iana.ProtocolIPv6
-	m.Type = sysIPV6_PATHMTU
-	m.SetLen(syscall.CmsgLen(sizeofIPv6Mtuinfo))
-	return b[syscall.CmsgSpace(sizeofIPv6Mtuinfo):]
-}
-
-func parsePathMTU(cm *ControlMessage, b []byte) {
-	mi := (*ipv6Mtuinfo)(unsafe.Pointer(&b[0]))
-	cm.Dst = mi.Addr.Addr[:]
-	cm.IfIndex = int(mi.Addr.Scope_id)
-	cm.MTU = int(mi.Mtu)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control_stub.go b/installer/vendor/golang.org/x/net/ipv6/control_stub.go
deleted file mode 100644
index 24b40a82d2..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control_stub.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	return errOpNoSupport
-}
-
-func newControlMessage(opt *rawOpt) (oob []byte) {
-	return nil
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	return nil, errOpNoSupport
-}
-
-func marshalControlMessage(cm *ControlMessage) (oob []byte) {
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control_unix.go b/installer/vendor/golang.org/x/net/ipv6/control_unix.go
deleted file mode 100644
index 7bd421053e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control_unix.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package ipv6
-
-import (
-	"os"
-	"syscall"
-
-	"golang.org/x/net/internal/iana"
-)
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	opt.Lock()
-	defer opt.Unlock()
-	if cf&FlagTrafficClass != 0 && sockOpts[ssoReceiveTrafficClass].name > 0 {
-		if err := setInt(s, &sockOpts[ssoReceiveTrafficClass], boolint(on)); err != nil {
-			return err
-		}
-		if on {
-			opt.set(FlagTrafficClass)
-		} else {
-			opt.clear(FlagTrafficClass)
-		}
-	}
-	if cf&FlagHopLimit != 0 && sockOpts[ssoReceiveHopLimit].name > 0 {
-		if err := setInt(s, &sockOpts[ssoReceiveHopLimit], boolint(on)); err != nil {
-			return err
-		}
-		if on {
-			opt.set(FlagHopLimit)
-		} else {
-			opt.clear(FlagHopLimit)
-		}
-	}
-	if cf&flagPacketInfo != 0 && sockOpts[ssoReceivePacketInfo].name > 0 {
-		if err := setInt(s, &sockOpts[ssoReceivePacketInfo], boolint(on)); err != nil {
-			return err
-		}
-		if on {
-			opt.set(cf & flagPacketInfo)
-		} else {
-			opt.clear(cf & flagPacketInfo)
-		}
-	}
-	if cf&FlagPathMTU != 0 && sockOpts[ssoReceivePathMTU].name > 0 {
-		if err := setInt(s, &sockOpts[ssoReceivePathMTU], boolint(on)); err != nil {
-			return err
-		}
-		if on {
-			opt.set(FlagPathMTU)
-		} else {
-			opt.clear(FlagPathMTU)
-		}
-	}
-	return nil
-}
-
-func newControlMessage(opt *rawOpt) (oob []byte) {
-	opt.RLock()
-	var l int
-	if opt.isset(FlagTrafficClass) && ctlOpts[ctlTrafficClass].name > 0 {
-		l += syscall.CmsgSpace(ctlOpts[ctlTrafficClass].length)
-	}
-	if opt.isset(FlagHopLimit) && ctlOpts[ctlHopLimit].name > 0 {
-		l += syscall.CmsgSpace(ctlOpts[ctlHopLimit].length)
-	}
-	if opt.isset(flagPacketInfo) && ctlOpts[ctlPacketInfo].name > 0 {
-		l += syscall.CmsgSpace(ctlOpts[ctlPacketInfo].length)
-	}
-	if opt.isset(FlagPathMTU) && ctlOpts[ctlPathMTU].name > 0 {
-		l += syscall.CmsgSpace(ctlOpts[ctlPathMTU].length)
-	}
-	if l > 0 {
-		oob = make([]byte, l)
-	}
-	opt.RUnlock()
-	return
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	if len(b) == 0 {
-		return nil, nil
-	}
-	cmsgs, err := syscall.ParseSocketControlMessage(b)
-	if err != nil {
-		return nil, os.NewSyscallError("parse socket control message", err)
-	}
-	cm := &ControlMessage{}
-	for _, m := range cmsgs {
-		if m.Header.Level != iana.ProtocolIPv6 {
-			continue
-		}
-		switch int(m.Header.Type) {
-		case ctlOpts[ctlTrafficClass].name:
-			ctlOpts[ctlTrafficClass].parse(cm, m.Data[:])
-		case ctlOpts[ctlHopLimit].name:
-			ctlOpts[ctlHopLimit].parse(cm, m.Data[:])
-		case ctlOpts[ctlPacketInfo].name:
-			ctlOpts[ctlPacketInfo].parse(cm, m.Data[:])
-		case ctlOpts[ctlPathMTU].name:
-			ctlOpts[ctlPathMTU].parse(cm, m.Data[:])
-		}
-	}
-	return cm, nil
-}
-
-func marshalControlMessage(cm *ControlMessage) (oob []byte) {
-	if cm == nil {
-		return
-	}
-	var l int
-	tclass := false
-	if ctlOpts[ctlTrafficClass].name > 0 && cm.TrafficClass > 0 {
-		tclass = true
-		l += syscall.CmsgSpace(ctlOpts[ctlTrafficClass].length)
-	}
-	hoplimit := false
-	if ctlOpts[ctlHopLimit].name > 0 && cm.HopLimit > 0 {
-		hoplimit = true
-		l += syscall.CmsgSpace(ctlOpts[ctlHopLimit].length)
-	}
-	pktinfo := false
-	if ctlOpts[ctlPacketInfo].name > 0 && (cm.Src.To16() != nil && cm.Src.To4() == nil || cm.IfIndex > 0) {
-		pktinfo = true
-		l += syscall.CmsgSpace(ctlOpts[ctlPacketInfo].length)
-	}
-	nexthop := false
-	if ctlOpts[ctlNextHop].name > 0 && cm.NextHop.To16() != nil && cm.NextHop.To4() == nil {
-		nexthop = true
-		l += syscall.CmsgSpace(ctlOpts[ctlNextHop].length)
-	}
-	if l > 0 {
-		oob = make([]byte, l)
-		b := oob
-		if tclass {
-			b = ctlOpts[ctlTrafficClass].marshal(b, cm)
-		}
-		if hoplimit {
-			b = ctlOpts[ctlHopLimit].marshal(b, cm)
-		}
-		if pktinfo {
-			b = ctlOpts[ctlPacketInfo].marshal(b, cm)
-		}
-		if nexthop {
-			b = ctlOpts[ctlNextHop].marshal(b, cm)
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/control_windows.go b/installer/vendor/golang.org/x/net/ipv6/control_windows.go
deleted file mode 100644
index feef6ab86a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/control_windows.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import "syscall"
-
-func setControlMessage(s uintptr, opt *rawOpt, cf ControlFlags, on bool) error {
-	// TODO(mikio): implement this
-	return syscall.EWINDOWS
-}
-
-func newControlMessage(opt *rawOpt) (oob []byte) {
-	// TODO(mikio): implement this
-	return nil
-}
-
-func parseControlMessage(b []byte) (*ControlMessage, error) {
-	// TODO(mikio): implement this
-	return nil, syscall.EWINDOWS
-}
-
-func marshalControlMessage(cm *ControlMessage) (oob []byte) {
-	// TODO(mikio): implement this
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_darwin.go b/installer/vendor/golang.org/x/net/ipv6/defs_darwin.go
deleted file mode 100644
index 55ddc116fc..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_darwin.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#define __APPLE_USE_RFC_3542
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-
-	sysIPV6_PORTRANGE    = C.IPV6_PORTRANGE
-	sysICMP6_FILTER      = C.ICMP6_FILTER
-	sysIPV6_2292PKTINFO  = C.IPV6_2292PKTINFO
-	sysIPV6_2292HOPLIMIT = C.IPV6_2292HOPLIMIT
-	sysIPV6_2292NEXTHOP  = C.IPV6_2292NEXTHOP
-	sysIPV6_2292HOPOPTS  = C.IPV6_2292HOPOPTS
-	sysIPV6_2292DSTOPTS  = C.IPV6_2292DSTOPTS
-	sysIPV6_2292RTHDR    = C.IPV6_2292RTHDR
-
-	sysIPV6_2292PKTOPTIONS = C.IPV6_2292PKTOPTIONS
-
-	sysIPV6_CHECKSUM = C.IPV6_CHECKSUM
-	sysIPV6_V6ONLY   = C.IPV6_V6ONLY
-
-	sysIPV6_IPSEC_POLICY = C.IPV6_IPSEC_POLICY
-
-	sysIPV6_RECVTCLASS = C.IPV6_RECVTCLASS
-	sysIPV6_TCLASS     = C.IPV6_TCLASS
-
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-
-	sysIPV6_RECVPKTINFO = C.IPV6_RECVPKTINFO
-
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-
-	sysIPV6_USE_MIN_MTU = C.IPV6_USE_MIN_MTU
-	sysIPV6_RECVPATHMTU = C.IPV6_RECVPATHMTU
-
-	sysIPV6_PATHMTU = C.IPV6_PATHMTU
-
-	sysIPV6_PKTINFO  = C.IPV6_PKTINFO
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-	sysIPV6_RTHDR    = C.IPV6_RTHDR
-
-	sysIPV6_AUTOFLOWLABEL = C.IPV6_AUTOFLOWLABEL
-
-	sysIPV6_DONTFRAG = C.IPV6_DONTFRAG
-
-	sysIPV6_PREFER_TEMPADDR = C.IPV6_PREFER_TEMPADDR
-
-	sysIPV6_MSFILTER            = C.IPV6_MSFILTER
-	sysMCAST_JOIN_GROUP         = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP        = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP  = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE       = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE     = C.MCAST_UNBLOCK_SOURCE
-
-	sysIPV6_BOUND_IF = C.IPV6_BOUND_IF
-
-	sysIPV6_PORTRANGE_DEFAULT = C.IPV6_PORTRANGE_DEFAULT
-	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
-	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type icmpv6Filter C.struct_icmp6_filter
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_dragonfly.go b/installer/vendor/golang.org/x/net/ipv6/defs_dragonfly.go
deleted file mode 100644
index a4c383a515..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_dragonfly.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-	sysIPV6_PORTRANGE      = C.IPV6_PORTRANGE
-	sysICMP6_FILTER        = C.ICMP6_FILTER
-
-	sysIPV6_CHECKSUM = C.IPV6_CHECKSUM
-	sysIPV6_V6ONLY   = C.IPV6_V6ONLY
-
-	sysIPV6_IPSEC_POLICY = C.IPV6_IPSEC_POLICY
-
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-
-	sysIPV6_USE_MIN_MTU = C.IPV6_USE_MIN_MTU
-	sysIPV6_RECVPATHMTU = C.IPV6_RECVPATHMTU
-
-	sysIPV6_PATHMTU = C.IPV6_PATHMTU
-
-	sysIPV6_PKTINFO  = C.IPV6_PKTINFO
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-	sysIPV6_RTHDR    = C.IPV6_RTHDR
-
-	sysIPV6_RECVTCLASS = C.IPV6_RECVTCLASS
-
-	sysIPV6_AUTOFLOWLABEL = C.IPV6_AUTOFLOWLABEL
-
-	sysIPV6_TCLASS   = C.IPV6_TCLASS
-	sysIPV6_DONTFRAG = C.IPV6_DONTFRAG
-
-	sysIPV6_PREFER_TEMPADDR = C.IPV6_PREFER_TEMPADDR
-
-	sysIPV6_PORTRANGE_DEFAULT = C.IPV6_PORTRANGE_DEFAULT
-	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
-	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
-
-	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type icmpv6Filter C.struct_icmp6_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_freebsd.go b/installer/vendor/golang.org/x/net/ipv6/defs_freebsd.go
deleted file mode 100644
index 53e625389a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_freebsd.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-	sysIPV6_PORTRANGE      = C.IPV6_PORTRANGE
-	sysICMP6_FILTER        = C.ICMP6_FILTER
-
-	sysIPV6_CHECKSUM = C.IPV6_CHECKSUM
-	sysIPV6_V6ONLY   = C.IPV6_V6ONLY
-
-	sysIPV6_IPSEC_POLICY = C.IPV6_IPSEC_POLICY
-
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-
-	sysIPV6_USE_MIN_MTU = C.IPV6_USE_MIN_MTU
-	sysIPV6_RECVPATHMTU = C.IPV6_RECVPATHMTU
-
-	sysIPV6_PATHMTU = C.IPV6_PATHMTU
-
-	sysIPV6_PKTINFO  = C.IPV6_PKTINFO
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-	sysIPV6_RTHDR    = C.IPV6_RTHDR
-
-	sysIPV6_RECVTCLASS = C.IPV6_RECVTCLASS
-
-	sysIPV6_AUTOFLOWLABEL = C.IPV6_AUTOFLOWLABEL
-
-	sysIPV6_TCLASS   = C.IPV6_TCLASS
-	sysIPV6_DONTFRAG = C.IPV6_DONTFRAG
-
-	sysIPV6_PREFER_TEMPADDR = C.IPV6_PREFER_TEMPADDR
-
-	sysIPV6_BINDANY = C.IPV6_BINDANY
-
-	sysIPV6_MSFILTER = C.IPV6_MSFILTER
-
-	sysMCAST_JOIN_GROUP         = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP        = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP  = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE       = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE     = C.MCAST_UNBLOCK_SOURCE
-
-	sysIPV6_PORTRANGE_DEFAULT = C.IPV6_PORTRANGE_DEFAULT
-	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
-	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
-
-type icmpv6Filter C.struct_icmp6_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_linux.go b/installer/vendor/golang.org/x/net/ipv6/defs_linux.go
deleted file mode 100644
index 8a967fd214..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_linux.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <linux/in.h>
-#include <linux/in6.h>
-#include <linux/ipv6.h>
-#include <linux/icmpv6.h>
-#include <linux/filter.h>
-#include <sys/socket.h>
-*/
-import "C"
-
-const (
-	sysIPV6_ADDRFORM       = C.IPV6_ADDRFORM
-	sysIPV6_2292PKTINFO    = C.IPV6_2292PKTINFO
-	sysIPV6_2292HOPOPTS    = C.IPV6_2292HOPOPTS
-	sysIPV6_2292DSTOPTS    = C.IPV6_2292DSTOPTS
-	sysIPV6_2292RTHDR      = C.IPV6_2292RTHDR
-	sysIPV6_2292PKTOPTIONS = C.IPV6_2292PKTOPTIONS
-	sysIPV6_CHECKSUM       = C.IPV6_CHECKSUM
-	sysIPV6_2292HOPLIMIT   = C.IPV6_2292HOPLIMIT
-	sysIPV6_NEXTHOP        = C.IPV6_NEXTHOP
-	sysIPV6_FLOWINFO       = C.IPV6_FLOWINFO
-
-	sysIPV6_UNICAST_HOPS        = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF        = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS      = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP      = C.IPV6_MULTICAST_LOOP
-	sysIPV6_ADD_MEMBERSHIP      = C.IPV6_ADD_MEMBERSHIP
-	sysIPV6_DROP_MEMBERSHIP     = C.IPV6_DROP_MEMBERSHIP
-	sysMCAST_JOIN_GROUP         = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP        = C.MCAST_LEAVE_GROUP
-	sysMCAST_JOIN_SOURCE_GROUP  = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP = C.MCAST_LEAVE_SOURCE_GROUP
-	sysMCAST_BLOCK_SOURCE       = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE     = C.MCAST_UNBLOCK_SOURCE
-	sysMCAST_MSFILTER           = C.MCAST_MSFILTER
-	sysIPV6_ROUTER_ALERT        = C.IPV6_ROUTER_ALERT
-	sysIPV6_MTU_DISCOVER        = C.IPV6_MTU_DISCOVER
-	sysIPV6_MTU                 = C.IPV6_MTU
-	sysIPV6_RECVERR             = C.IPV6_RECVERR
-	sysIPV6_V6ONLY              = C.IPV6_V6ONLY
-	sysIPV6_JOIN_ANYCAST        = C.IPV6_JOIN_ANYCAST
-	sysIPV6_LEAVE_ANYCAST       = C.IPV6_LEAVE_ANYCAST
-
-	//sysIPV6_PMTUDISC_DONT      = C.IPV6_PMTUDISC_DONT
-	//sysIPV6_PMTUDISC_WANT      = C.IPV6_PMTUDISC_WANT
-	//sysIPV6_PMTUDISC_DO        = C.IPV6_PMTUDISC_DO
-	//sysIPV6_PMTUDISC_PROBE     = C.IPV6_PMTUDISC_PROBE
-	//sysIPV6_PMTUDISC_INTERFACE = C.IPV6_PMTUDISC_INTERFACE
-	//sysIPV6_PMTUDISC_OMIT      = C.IPV6_PMTUDISC_OMIT
-
-	sysIPV6_FLOWLABEL_MGR = C.IPV6_FLOWLABEL_MGR
-	sysIPV6_FLOWINFO_SEND = C.IPV6_FLOWINFO_SEND
-
-	sysIPV6_IPSEC_POLICY = C.IPV6_IPSEC_POLICY
-	sysIPV6_XFRM_POLICY  = C.IPV6_XFRM_POLICY
-
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_PKTINFO      = C.IPV6_PKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_HOPLIMIT     = C.IPV6_HOPLIMIT
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_HOPOPTS      = C.IPV6_HOPOPTS
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RTHDR        = C.IPV6_RTHDR
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-	sysIPV6_DSTOPTS      = C.IPV6_DSTOPTS
-	sysIPV6_RECVPATHMTU  = C.IPV6_RECVPATHMTU
-	sysIPV6_PATHMTU      = C.IPV6_PATHMTU
-	sysIPV6_DONTFRAG     = C.IPV6_DONTFRAG
-
-	sysIPV6_RECVTCLASS = C.IPV6_RECVTCLASS
-	sysIPV6_TCLASS     = C.IPV6_TCLASS
-
-	sysIPV6_ADDR_PREFERENCES = C.IPV6_ADDR_PREFERENCES
-
-	sysIPV6_PREFER_SRC_TMP            = C.IPV6_PREFER_SRC_TMP
-	sysIPV6_PREFER_SRC_PUBLIC         = C.IPV6_PREFER_SRC_PUBLIC
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = C.IPV6_PREFER_SRC_PUBTMP_DEFAULT
-	sysIPV6_PREFER_SRC_COA            = C.IPV6_PREFER_SRC_COA
-	sysIPV6_PREFER_SRC_HOME           = C.IPV6_PREFER_SRC_HOME
-	sysIPV6_PREFER_SRC_CGA            = C.IPV6_PREFER_SRC_CGA
-	sysIPV6_PREFER_SRC_NONCGA         = C.IPV6_PREFER_SRC_NONCGA
-
-	sysIPV6_MINHOPCOUNT = C.IPV6_MINHOPCOUNT
-
-	sysIPV6_ORIGDSTADDR     = C.IPV6_ORIGDSTADDR
-	sysIPV6_RECVORIGDSTADDR = C.IPV6_RECVORIGDSTADDR
-	sysIPV6_TRANSPARENT     = C.IPV6_TRANSPARENT
-	sysIPV6_UNICAST_IF      = C.IPV6_UNICAST_IF
-
-	sysICMPV6_FILTER = C.ICMPV6_FILTER
-
-	sysICMPV6_FILTER_BLOCK       = C.ICMPV6_FILTER_BLOCK
-	sysICMPV6_FILTER_PASS        = C.ICMPV6_FILTER_PASS
-	sysICMPV6_FILTER_BLOCKOTHERS = C.ICMPV6_FILTER_BLOCKOTHERS
-	sysICMPV6_FILTER_PASSONLY    = C.ICMPV6_FILTER_PASSONLY
-
-	sysSOL_SOCKET       = C.SOL_SOCKET
-	sysSO_ATTACH_FILTER = C.SO_ATTACH_FILTER
-
-	sizeofKernelSockaddrStorage = C.sizeof_struct___kernel_sockaddr_storage
-	sizeofSockaddrInet6         = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo          = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo           = C.sizeof_struct_ip6_mtuinfo
-	sizeofIPv6FlowlabelReq      = C.sizeof_struct_in6_flowlabel_req
-
-	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type kernelSockaddrStorage C.struct___kernel_sockaddr_storage
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6FlowlabelReq C.struct_in6_flowlabel_req
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
-
-type icmpv6Filter C.struct_icmp6_filter
-
-type sockFProg C.struct_sock_fprog
-
-type sockFilter C.struct_sock_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_netbsd.go b/installer/vendor/golang.org/x/net/ipv6/defs_netbsd.go
deleted file mode 100644
index be9ceb9cc0..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_netbsd.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-	sysIPV6_PORTRANGE      = C.IPV6_PORTRANGE
-	sysICMP6_FILTER        = C.ICMP6_FILTER
-
-	sysIPV6_CHECKSUM = C.IPV6_CHECKSUM
-	sysIPV6_V6ONLY   = C.IPV6_V6ONLY
-
-	sysIPV6_IPSEC_POLICY = C.IPV6_IPSEC_POLICY
-
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-
-	sysIPV6_USE_MIN_MTU = C.IPV6_USE_MIN_MTU
-	sysIPV6_RECVPATHMTU = C.IPV6_RECVPATHMTU
-	sysIPV6_PATHMTU     = C.IPV6_PATHMTU
-
-	sysIPV6_PKTINFO  = C.IPV6_PKTINFO
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-	sysIPV6_RTHDR    = C.IPV6_RTHDR
-
-	sysIPV6_RECVTCLASS = C.IPV6_RECVTCLASS
-
-	sysIPV6_TCLASS   = C.IPV6_TCLASS
-	sysIPV6_DONTFRAG = C.IPV6_DONTFRAG
-
-	sysIPV6_PORTRANGE_DEFAULT = C.IPV6_PORTRANGE_DEFAULT
-	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
-	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
-
-	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type icmpv6Filter C.struct_icmp6_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_openbsd.go b/installer/vendor/golang.org/x/net/ipv6/defs_openbsd.go
deleted file mode 100644
index 177ddf87d2..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_openbsd.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <sys/param.h>
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-	sysIPV6_PORTRANGE      = C.IPV6_PORTRANGE
-	sysICMP6_FILTER        = C.ICMP6_FILTER
-
-	sysIPV6_CHECKSUM = C.IPV6_CHECKSUM
-	sysIPV6_V6ONLY   = C.IPV6_V6ONLY
-
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVRTHDR    = C.IPV6_RECVRTHDR
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-	sysIPV6_RECVDSTOPTS  = C.IPV6_RECVDSTOPTS
-
-	sysIPV6_USE_MIN_MTU = C.IPV6_USE_MIN_MTU
-	sysIPV6_RECVPATHMTU = C.IPV6_RECVPATHMTU
-
-	sysIPV6_PATHMTU = C.IPV6_PATHMTU
-
-	sysIPV6_PKTINFO  = C.IPV6_PKTINFO
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-	sysIPV6_RTHDR    = C.IPV6_RTHDR
-
-	sysIPV6_AUTH_LEVEL        = C.IPV6_AUTH_LEVEL
-	sysIPV6_ESP_TRANS_LEVEL   = C.IPV6_ESP_TRANS_LEVEL
-	sysIPV6_ESP_NETWORK_LEVEL = C.IPV6_ESP_NETWORK_LEVEL
-	sysIPSEC6_OUTSA           = C.IPSEC6_OUTSA
-	sysIPV6_RECVTCLASS        = C.IPV6_RECVTCLASS
-
-	sysIPV6_AUTOFLOWLABEL = C.IPV6_AUTOFLOWLABEL
-	sysIPV6_IPCOMP_LEVEL  = C.IPV6_IPCOMP_LEVEL
-
-	sysIPV6_TCLASS   = C.IPV6_TCLASS
-	sysIPV6_DONTFRAG = C.IPV6_DONTFRAG
-	sysIPV6_PIPEX    = C.IPV6_PIPEX
-
-	sysIPV6_RTABLE = C.IPV6_RTABLE
-
-	sysIPV6_PORTRANGE_DEFAULT = C.IPV6_PORTRANGE_DEFAULT
-	sysIPV6_PORTRANGE_HIGH    = C.IPV6_PORTRANGE_HIGH
-	sysIPV6_PORTRANGE_LOW     = C.IPV6_PORTRANGE_LOW
-
-	sizeofSockaddrInet6 = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo  = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo   = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq = C.sizeof_struct_ipv6_mreq
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type icmpv6Filter C.struct_icmp6_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/defs_solaris.go b/installer/vendor/golang.org/x/net/ipv6/defs_solaris.go
deleted file mode 100644
index 0f8ce2b46a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/defs_solaris.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package ipv6
-
-/*
-#include <sys/socket.h>
-
-#include <netinet/in.h>
-#include <netinet/icmp6.h>
-*/
-import "C"
-
-const (
-	sysIPV6_UNICAST_HOPS   = C.IPV6_UNICAST_HOPS
-	sysIPV6_MULTICAST_IF   = C.IPV6_MULTICAST_IF
-	sysIPV6_MULTICAST_HOPS = C.IPV6_MULTICAST_HOPS
-	sysIPV6_MULTICAST_LOOP = C.IPV6_MULTICAST_LOOP
-	sysIPV6_JOIN_GROUP     = C.IPV6_JOIN_GROUP
-	sysIPV6_LEAVE_GROUP    = C.IPV6_LEAVE_GROUP
-
-	sysIPV6_PKTINFO = C.IPV6_PKTINFO
-
-	sysIPV6_HOPLIMIT = C.IPV6_HOPLIMIT
-	sysIPV6_NEXTHOP  = C.IPV6_NEXTHOP
-	sysIPV6_HOPOPTS  = C.IPV6_HOPOPTS
-	sysIPV6_DSTOPTS  = C.IPV6_DSTOPTS
-
-	sysIPV6_RTHDR        = C.IPV6_RTHDR
-	sysIPV6_RTHDRDSTOPTS = C.IPV6_RTHDRDSTOPTS
-
-	sysIPV6_RECVPKTINFO  = C.IPV6_RECVPKTINFO
-	sysIPV6_RECVHOPLIMIT = C.IPV6_RECVHOPLIMIT
-	sysIPV6_RECVHOPOPTS  = C.IPV6_RECVHOPOPTS
-
-	sysIPV6_RECVRTHDR = C.IPV6_RECVRTHDR
-
-	sysIPV6_RECVRTHDRDSTOPTS = C.IPV6_RECVRTHDRDSTOPTS
-
-	sysIPV6_CHECKSUM        = C.IPV6_CHECKSUM
-	sysIPV6_RECVTCLASS      = C.IPV6_RECVTCLASS
-	sysIPV6_USE_MIN_MTU     = C.IPV6_USE_MIN_MTU
-	sysIPV6_DONTFRAG        = C.IPV6_DONTFRAG
-	sysIPV6_SEC_OPT         = C.IPV6_SEC_OPT
-	sysIPV6_SRC_PREFERENCES = C.IPV6_SRC_PREFERENCES
-	sysIPV6_RECVPATHMTU     = C.IPV6_RECVPATHMTU
-	sysIPV6_PATHMTU         = C.IPV6_PATHMTU
-	sysIPV6_TCLASS          = C.IPV6_TCLASS
-	sysIPV6_V6ONLY          = C.IPV6_V6ONLY
-
-	sysIPV6_RECVDSTOPTS = C.IPV6_RECVDSTOPTS
-
-	sysMCAST_JOIN_GROUP         = C.MCAST_JOIN_GROUP
-	sysMCAST_LEAVE_GROUP        = C.MCAST_LEAVE_GROUP
-	sysMCAST_BLOCK_SOURCE       = C.MCAST_BLOCK_SOURCE
-	sysMCAST_UNBLOCK_SOURCE     = C.MCAST_UNBLOCK_SOURCE
-	sysMCAST_JOIN_SOURCE_GROUP  = C.MCAST_JOIN_SOURCE_GROUP
-	sysMCAST_LEAVE_SOURCE_GROUP = C.MCAST_LEAVE_SOURCE_GROUP
-
-	sysIPV6_PREFER_SRC_HOME   = C.IPV6_PREFER_SRC_HOME
-	sysIPV6_PREFER_SRC_COA    = C.IPV6_PREFER_SRC_COA
-	sysIPV6_PREFER_SRC_PUBLIC = C.IPV6_PREFER_SRC_PUBLIC
-	sysIPV6_PREFER_SRC_TMP    = C.IPV6_PREFER_SRC_TMP
-	sysIPV6_PREFER_SRC_NONCGA = C.IPV6_PREFER_SRC_NONCGA
-	sysIPV6_PREFER_SRC_CGA    = C.IPV6_PREFER_SRC_CGA
-
-	sysIPV6_PREFER_SRC_MIPMASK    = C.IPV6_PREFER_SRC_MIPMASK
-	sysIPV6_PREFER_SRC_MIPDEFAULT = C.IPV6_PREFER_SRC_MIPDEFAULT
-	sysIPV6_PREFER_SRC_TMPMASK    = C.IPV6_PREFER_SRC_TMPMASK
-	sysIPV6_PREFER_SRC_TMPDEFAULT = C.IPV6_PREFER_SRC_TMPDEFAULT
-	sysIPV6_PREFER_SRC_CGAMASK    = C.IPV6_PREFER_SRC_CGAMASK
-	sysIPV6_PREFER_SRC_CGADEFAULT = C.IPV6_PREFER_SRC_CGADEFAULT
-
-	sysIPV6_PREFER_SRC_MASK = C.IPV6_PREFER_SRC_MASK
-
-	sysIPV6_PREFER_SRC_DEFAULT = C.IPV6_PREFER_SRC_DEFAULT
-
-	sysIPV6_BOUND_IF   = C.IPV6_BOUND_IF
-	sysIPV6_UNSPEC_SRC = C.IPV6_UNSPEC_SRC
-
-	sysICMP6_FILTER = C.ICMP6_FILTER
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-	sizeofInet6Pktinfo    = C.sizeof_struct_in6_pktinfo
-	sizeofIPv6Mtuinfo     = C.sizeof_struct_ip6_mtuinfo
-
-	sizeofIPv6Mreq       = C.sizeof_struct_ipv6_mreq
-	sizeofGroupReq       = C.sizeof_struct_group_req
-	sizeofGroupSourceReq = C.sizeof_struct_group_source_req
-
-	sizeofICMPv6Filter = C.sizeof_struct_icmp6_filter
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-type sockaddrInet6 C.struct_sockaddr_in6
-
-type inet6Pktinfo C.struct_in6_pktinfo
-
-type ipv6Mtuinfo C.struct_ip6_mtuinfo
-
-type ipv6Mreq C.struct_ipv6_mreq
-
-type groupReq C.struct_group_req
-
-type groupSourceReq C.struct_group_source_req
-
-type icmpv6Filter C.struct_icmp6_filter
diff --git a/installer/vendor/golang.org/x/net/ipv6/dgramopt_posix.go b/installer/vendor/golang.org/x/net/ipv6/dgramopt_posix.go
deleted file mode 100644
index a448cbaa58..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/dgramopt_posix.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// MulticastHopLimit returns the hop limit field value for outgoing
-// multicast packets.
-func (c *dgramOpt) MulticastHopLimit() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoMulticastHopLimit])
-}
-
-// SetMulticastHopLimit sets the hop limit field value for future
-// outgoing multicast packets.
-func (c *dgramOpt) SetMulticastHopLimit(hoplim int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoMulticastHopLimit], hoplim)
-}
-
-// MulticastInterface returns the default interface for multicast
-// packet transmissions.
-func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
-	if !c.ok() {
-		return nil, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return nil, err
-	}
-	return getInterface(s, &sockOpts[ssoMulticastInterface])
-}
-
-// SetMulticastInterface sets the default interface for future
-// multicast packet transmissions.
-func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInterface(s, &sockOpts[ssoMulticastInterface], ifi)
-}
-
-// MulticastLoopback reports whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) MulticastLoopback() (bool, error) {
-	if !c.ok() {
-		return false, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return false, err
-	}
-	on, err := getInt(s, &sockOpts[ssoMulticastLoopback])
-	if err != nil {
-		return false, err
-	}
-	return on == 1, nil
-}
-
-// SetMulticastLoopback sets whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) SetMulticastLoopback(on bool) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoMulticastLoopback], boolint(on))
-}
-
-// JoinGroup joins the group address group on the interface ifi.
-// By default all sources that can cast data to group are accepted.
-// It's possible to mute and unmute data transmission from a specific
-// source by using ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup.
-// JoinGroup uses the system assigned multicast interface when ifi is
-// nil, although this is not recommended because the assignment
-// depends on platforms and sometimes it might require routing
-// configuration.
-func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	return setGroup(s, &sockOpts[ssoJoinGroup], ifi, grp)
-}
-
-// LeaveGroup leaves the group address group on the interface ifi
-// regardless of whether the group is any-source group or
-// source-specific group.
-func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	return setGroup(s, &sockOpts[ssoLeaveGroup], ifi, grp)
-}
-
-// JoinSourceSpecificGroup joins the source-specific group comprising
-// group and source on the interface ifi.
-// JoinSourceSpecificGroup uses the system assigned multicast
-// interface when ifi is nil, although this is not recommended because
-// the assignment depends on platforms and sometimes it might require
-// routing configuration.
-func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP16(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoJoinSourceGroup], ifi, grp, src)
-}
-
-// LeaveSourceSpecificGroup leaves the source-specific group on the
-// interface ifi.
-func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP16(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoLeaveSourceGroup], ifi, grp, src)
-}
-
-// ExcludeSourceSpecificGroup excludes the source-specific group from
-// the already joined any-source groups by JoinGroup on the interface
-// ifi.
-func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP16(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoBlockSourceGroup], ifi, grp, src)
-}
-
-// IncludeSourceSpecificGroup includes the excluded source-specific
-// group by ExcludeSourceSpecificGroup again on the interface ifi.
-func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	grp := netAddrToIP16(group)
-	if grp == nil {
-		return errMissingAddress
-	}
-	src := netAddrToIP16(source)
-	if src == nil {
-		return errMissingAddress
-	}
-	return setSourceGroup(s, &sockOpts[ssoUnblockSourceGroup], ifi, grp, src)
-}
-
-// Checksum reports whether the kernel will compute, store or verify a
-// checksum for both incoming and outgoing packets. If on is true, it
-// returns an offset in bytes into the data of where the checksum
-// field is located.
-func (c *dgramOpt) Checksum() (on bool, offset int, err error) {
-	if !c.ok() {
-		return false, 0, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return false, 0, err
-	}
-	offset, err = getInt(s, &sockOpts[ssoChecksum])
-	if err != nil {
-		return false, 0, err
-	}
-	if offset < 0 {
-		return false, 0, nil
-	}
-	return true, offset, nil
-}
-
-// SetChecksum enables the kernel checksum processing. If on is ture,
-// the offset should be an offset in bytes into the data of where the
-// checksum field is located.
-func (c *dgramOpt) SetChecksum(on bool, offset int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	if !on {
-		offset = -1
-	}
-	return setInt(s, &sockOpts[ssoChecksum], offset)
-}
-
-// ICMPFilter returns an ICMP filter.
-func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
-	if !c.ok() {
-		return nil, syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return nil, err
-	}
-	return getICMPFilter(s, &sockOpts[ssoICMPFilter])
-}
-
-// SetICMPFilter deploys the ICMP filter.
-func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setICMPFilter(s, &sockOpts[ssoICMPFilter], f)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/dgramopt_stub.go b/installer/vendor/golang.org/x/net/ipv6/dgramopt_stub.go
deleted file mode 100644
index 82b0686ae9..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/dgramopt_stub.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-import "net"
-
-// MulticastHopLimit returns the hop limit field value for outgoing
-// multicast packets.
-func (c *dgramOpt) MulticastHopLimit() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetMulticastHopLimit sets the hop limit field value for future
-// outgoing multicast packets.
-func (c *dgramOpt) SetMulticastHopLimit(hoplim int) error {
-	return errOpNoSupport
-}
-
-// MulticastInterface returns the default interface for multicast
-// packet transmissions.
-func (c *dgramOpt) MulticastInterface() (*net.Interface, error) {
-	return nil, errOpNoSupport
-}
-
-// SetMulticastInterface sets the default interface for future
-// multicast packet transmissions.
-func (c *dgramOpt) SetMulticastInterface(ifi *net.Interface) error {
-	return errOpNoSupport
-}
-
-// MulticastLoopback reports whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) MulticastLoopback() (bool, error) {
-	return false, errOpNoSupport
-}
-
-// SetMulticastLoopback sets whether transmitted multicast packets
-// should be copied and send back to the originator.
-func (c *dgramOpt) SetMulticastLoopback(on bool) error {
-	return errOpNoSupport
-}
-
-// JoinGroup joins the group address group on the interface ifi.
-// By default all sources that can cast data to group are accepted.
-// It's possible to mute and unmute data transmission from a specific
-// source by using ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup.
-// JoinGroup uses the system assigned multicast interface when ifi is
-// nil, although this is not recommended because the assignment
-// depends on platforms and sometimes it might require routing
-// configuration.
-func (c *dgramOpt) JoinGroup(ifi *net.Interface, group net.Addr) error {
-	return errOpNoSupport
-}
-
-// LeaveGroup leaves the group address group on the interface ifi
-// regardless of whether the group is any-source group or
-// source-specific group.
-func (c *dgramOpt) LeaveGroup(ifi *net.Interface, group net.Addr) error {
-	return errOpNoSupport
-}
-
-// JoinSourceSpecificGroup joins the source-specific group comprising
-// group and source on the interface ifi.
-// JoinSourceSpecificGroup uses the system assigned multicast
-// interface when ifi is nil, although this is not recommended because
-// the assignment depends on platforms and sometimes it might require
-// routing configuration.
-func (c *dgramOpt) JoinSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// LeaveSourceSpecificGroup leaves the source-specific group on the
-// interface ifi.
-func (c *dgramOpt) LeaveSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// ExcludeSourceSpecificGroup excludes the source-specific group from
-// the already joined any-source groups by JoinGroup on the interface
-// ifi.
-func (c *dgramOpt) ExcludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// IncludeSourceSpecificGroup includes the excluded source-specific
-// group by ExcludeSourceSpecificGroup again on the interface ifi.
-func (c *dgramOpt) IncludeSourceSpecificGroup(ifi *net.Interface, group, source net.Addr) error {
-	return errOpNoSupport
-}
-
-// Checksum reports whether the kernel will compute, store or verify a
-// checksum for both incoming and outgoing packets. If on is true, it
-// returns an offset in bytes into the data of where the checksum
-// field is located.
-func (c *dgramOpt) Checksum() (on bool, offset int, err error) {
-	return false, 0, errOpNoSupport
-}
-
-// SetChecksum enables the kernel checksum processing. If on is ture,
-// the offset should be an offset in bytes into the data of where the
-// checksum field is located.
-func (c *dgramOpt) SetChecksum(on bool, offset int) error {
-	return errOpNoSupport
-}
-
-// ICMPFilter returns an ICMP filter.
-func (c *dgramOpt) ICMPFilter() (*ICMPFilter, error) {
-	return nil, errOpNoSupport
-}
-
-// SetICMPFilter deploys the ICMP filter.
-func (c *dgramOpt) SetICMPFilter(f *ICMPFilter) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/doc.go b/installer/vendor/golang.org/x/net/ipv6/doc.go
deleted file mode 100644
index eaa24c580e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/doc.go
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ipv6 implements IP-level socket options for the Internet
-// Protocol version 6.
-//
-// The package provides IP-level socket options that allow
-// manipulation of IPv6 facilities.
-//
-// The IPv6 protocol is defined in RFC 2460.
-// Socket interface extensions are defined in RFC 3493, RFC 3542 and
-// RFC 3678.
-// MLDv1 and MLDv2 are defined in RFC 2710 and RFC 3810.
-// Source-specific multicast is defined in RFC 4607.
-//
-// On Darwin, this package requires OS X Mavericks version 10.9 or
-// above, or equivalent.
-//
-//
-// Unicasting
-//
-// The options for unicasting are available for net.TCPConn,
-// net.UDPConn and net.IPConn which are created as network connections
-// that use the IPv6 transport. When a single TCP connection carrying
-// a data flow of multiple packets needs to indicate the flow is
-// important, Conn is used to set the traffic class field on the IPv6
-// header for each packet.
-//
-//	ln, err := net.Listen("tcp6", "[::]:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer ln.Close()
-//	for {
-//		c, err := ln.Accept()
-//		if err != nil {
-//			// error handling
-//		}
-//		go func(c net.Conn) {
-//			defer c.Close()
-//
-// The outgoing packets will be labeled DiffServ assured forwarding
-// class 1 low drop precedence, known as AF11 packets.
-//
-//			if err := ipv6.NewConn(c).SetTrafficClass(0x28); err != nil {
-//				// error handling
-//			}
-//			if _, err := c.Write(data); err != nil {
-//				// error handling
-//			}
-//		}(c)
-//	}
-//
-//
-// Multicasting
-//
-// The options for multicasting are available for net.UDPConn and
-// net.IPconn which are created as network connections that use the
-// IPv6 transport. A few network facilities must be prepared before
-// you begin multicasting, at a minimum joining network interfaces and
-// multicast groups.
-//
-//	en0, err := net.InterfaceByName("en0")
-//	if err != nil {
-//		// error handling
-//	}
-//	en1, err := net.InterfaceByIndex(911)
-//	if err != nil {
-//		// error handling
-//	}
-//	group := net.ParseIP("ff02::114")
-//
-// First, an application listens to an appropriate address with an
-// appropriate service port.
-//
-//	c, err := net.ListenPacket("udp6", "[::]:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c.Close()
-//
-// Second, the application joins multicast groups, starts listening to
-// the groups on the specified network interfaces. Note that the
-// service port for transport layer protocol does not matter with this
-// operation as joining groups affects only network and link layer
-// protocols, such as IPv6 and Ethernet.
-//
-//	p := ipv6.NewPacketConn(c)
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: group}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en1, &net.UDPAddr{IP: group}); err != nil {
-//		// error handling
-//	}
-//
-// The application might set per packet control message transmissions
-// between the protocol stack within the kernel. When the application
-// needs a destination address on an incoming packet,
-// SetControlMessage of PacketConn is used to enable control message
-// transmissions.
-//
-//	if err := p.SetControlMessage(ipv6.FlagDst, true); err != nil {
-//		// error handling
-//	}
-//
-// The application could identify whether the received packets are
-// of interest by using the control message that contains the
-// destination address of the received packet.
-//
-//	b := make([]byte, 1500)
-//	for {
-//		n, rcm, src, err := p.ReadFrom(b)
-//		if err != nil {
-//			// error handling
-//		}
-//		if rcm.Dst.IsMulticast() {
-//			if rcm.Dst.Equal(group) {
-//				// joined group, do something
-//			} else {
-//				// unknown group, discard
-//				continue
-//			}
-//		}
-//
-// The application can also send both unicast and multicast packets.
-//
-//		p.SetTrafficClass(0x0)
-//		p.SetHopLimit(16)
-//		if _, err := p.WriteTo(data[:n], nil, src); err != nil {
-//			// error handling
-//		}
-//		dst := &net.UDPAddr{IP: group, Port: 1024}
-//		wcm := ipv6.ControlMessage{TrafficClass: 0xe0, HopLimit: 1}
-//		for _, ifi := range []*net.Interface{en0, en1} {
-//			wcm.IfIndex = ifi.Index
-//			if _, err := p.WriteTo(data[:n], &wcm, dst); err != nil {
-//				// error handling
-//			}
-//		}
-//	}
-//
-//
-// More multicasting
-//
-// An application that uses PacketConn may join multiple multicast
-// groups. For example, a UDP listener with port 1024 might join two
-// different groups across over two different network interfaces by
-// using:
-//
-//	c, err := net.ListenPacket("udp6", "[::]:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c.Close()
-//	p := ipv6.NewPacketConn(c)
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff02::1:114")}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff02::2:114")}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en1, &net.UDPAddr{IP: net.ParseIP("ff02::2:114")}); err != nil {
-//		// error handling
-//	}
-//
-// It is possible for multiple UDP listeners that listen on the same
-// UDP port to join the same multicast group. The net package will
-// provide a socket that listens to a wildcard address with reusable
-// UDP port when an appropriate multicast address prefix is passed to
-// the net.ListenPacket or net.ListenUDP.
-//
-//	c1, err := net.ListenPacket("udp6", "[ff02::]:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c1.Close()
-//	c2, err := net.ListenPacket("udp6", "[ff02::]:1024")
-//	if err != nil {
-//		// error handling
-//	}
-//	defer c2.Close()
-//	p1 := ipv6.NewPacketConn(c1)
-//	if err := p1.JoinGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff02::114")}); err != nil {
-//		// error handling
-//	}
-//	p2 := ipv6.NewPacketConn(c2)
-//	if err := p2.JoinGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff02::114")}); err != nil {
-//		// error handling
-//	}
-//
-// Also it is possible for the application to leave or rejoin a
-// multicast group on the network interface.
-//
-//	if err := p.LeaveGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff02::114")}); err != nil {
-//		// error handling
-//	}
-//	if err := p.JoinGroup(en0, &net.UDPAddr{IP: net.ParseIP("ff01::114")}); err != nil {
-//		// error handling
-//	}
-//
-//
-// Source-specific multicasting
-//
-// An application that uses PacketConn on MLDv2 supported platform is
-// able to join source-specific multicast groups.
-// The application may use JoinSourceSpecificGroup and
-// LeaveSourceSpecificGroup for the operation known as "include" mode,
-//
-//	ssmgroup := net.UDPAddr{IP: net.ParseIP("ff32::8000:9")}
-//	ssmsource := net.UDPAddr{IP: net.ParseIP("fe80::cafe")}
-//	if err := p.JoinSourceSpecificGroup(en0, &ssmgroup, &ssmsource); err != nil {
-//		// error handling
-//	}
-//	if err := p.LeaveSourceSpecificGroup(en0, &ssmgroup, &ssmsource); err != nil {
-//		// error handling
-//	}
-//
-// or JoinGroup, ExcludeSourceSpecificGroup,
-// IncludeSourceSpecificGroup and LeaveGroup for the operation known
-// as "exclude" mode.
-//
-//	exclsource := net.UDPAddr{IP: net.ParseIP("fe80::dead")}
-//	if err := p.JoinGroup(en0, &ssmgroup); err != nil {
-//		// error handling
-//	}
-//	if err := p.ExcludeSourceSpecificGroup(en0, &ssmgroup, &exclsource); err != nil {
-//		// error handling
-//	}
-//	if err := p.LeaveGroup(en0, &ssmgroup); err != nil {
-//		// error handling
-//	}
-//
-// Note that it depends on each platform implementation what happens
-// when an application which runs on MLDv2 unsupported platform uses
-// JoinSourceSpecificGroup and LeaveSourceSpecificGroup.
-// In general the platform tries to fall back to conversations using
-// MLDv1 and starts to listen to multicast traffic.
-// In the fallback case, ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup may return an error.
-package ipv6 // import "golang.org/x/net/ipv6"
-
-// BUG(mikio): This package is not implemented on NaCl and Plan 9.
diff --git a/installer/vendor/golang.org/x/net/ipv6/endpoint.go b/installer/vendor/golang.org/x/net/ipv6/endpoint.go
deleted file mode 100644
index ce0b0ce278..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/endpoint.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-	"time"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// BUG(mikio): On Windows, the JoinSourceSpecificGroup,
-// LeaveSourceSpecificGroup, ExcludeSourceSpecificGroup and
-// IncludeSourceSpecificGroup methods of PacketConn are not
-// implemented.
-
-// A Conn represents a network endpoint that uses IPv6 transport.
-// It allows to set basic IP-level socket options such as traffic
-// class and hop limit.
-type Conn struct {
-	genericOpt
-}
-
-type genericOpt struct {
-	net.Conn
-}
-
-func (c *genericOpt) ok() bool { return c != nil && c.Conn != nil }
-
-// PathMTU returns a path MTU value for the destination associated
-// with the endpoint.
-func (c *Conn) PathMTU() (int, error) {
-	if !c.genericOpt.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.genericOpt.Conn)
-	if err != nil {
-		return 0, err
-	}
-	_, mtu, err := getMTUInfo(s, &sockOpts[ssoPathMTU])
-	if err != nil {
-		return 0, err
-	}
-	return mtu, nil
-}
-
-// NewConn returns a new Conn.
-func NewConn(c net.Conn) *Conn {
-	return &Conn{
-		genericOpt: genericOpt{Conn: c},
-	}
-}
-
-// A PacketConn represents a packet network endpoint that uses IPv6
-// transport. It is used to control several IP-level socket options
-// including IPv6 header manipulation. It also provides datagram
-// based network I/O methods specific to the IPv6 and higher layer
-// protocols such as OSPF, GRE, and UDP.
-type PacketConn struct {
-	genericOpt
-	dgramOpt
-	payloadHandler
-}
-
-type dgramOpt struct {
-	net.PacketConn
-}
-
-func (c *dgramOpt) ok() bool { return c != nil && c.PacketConn != nil }
-
-// SetControlMessage allows to receive the per packet basis IP-level
-// socket options.
-func (c *PacketConn) SetControlMessage(cf ControlFlags, on bool) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.PacketSocketOf(c.dgramOpt.PacketConn)
-	if err != nil {
-		return err
-	}
-	return setControlMessage(s, &c.payloadHandler.rawOpt, cf, on)
-}
-
-// SetDeadline sets the read and write deadlines associated with the
-// endpoint.
-func (c *PacketConn) SetDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.SetDeadline(t)
-}
-
-// SetReadDeadline sets the read deadline associated with the
-// endpoint.
-func (c *PacketConn) SetReadDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.SetReadDeadline(t)
-}
-
-// SetWriteDeadline sets the write deadline associated with the
-// endpoint.
-func (c *PacketConn) SetWriteDeadline(t time.Time) error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.SetWriteDeadline(t)
-}
-
-// Close closes the endpoint.
-func (c *PacketConn) Close() error {
-	if !c.payloadHandler.ok() {
-		return syscall.EINVAL
-	}
-	return c.payloadHandler.Close()
-}
-
-// NewPacketConn returns a new PacketConn using c as its underlying
-// transport.
-func NewPacketConn(c net.PacketConn) *PacketConn {
-	return &PacketConn{
-		genericOpt:     genericOpt{Conn: c.(net.Conn)},
-		dgramOpt:       dgramOpt{PacketConn: c},
-		payloadHandler: payloadHandler{PacketConn: c},
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/example_test.go b/installer/vendor/golang.org/x/net/ipv6/example_test.go
deleted file mode 100644
index e761aa2a17..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/example_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"fmt"
-	"log"
-	"net"
-	"os"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/ipv6"
-)
-
-func ExampleConn_markingTCP() {
-	ln, err := net.Listen("tcp", "[::]:1024")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer ln.Close()
-
-	for {
-		c, err := ln.Accept()
-		if err != nil {
-			log.Fatal(err)
-		}
-		go func(c net.Conn) {
-			defer c.Close()
-			if c.RemoteAddr().(*net.TCPAddr).IP.To16() != nil && c.RemoteAddr().(*net.TCPAddr).IP.To4() == nil {
-				p := ipv6.NewConn(c)
-				if err := p.SetTrafficClass(0x28); err != nil { // DSCP AF11
-					log.Fatal(err)
-				}
-				if err := p.SetHopLimit(128); err != nil {
-					log.Fatal(err)
-				}
-			}
-			if _, err := c.Write([]byte("HELLO-R-U-THERE-ACK")); err != nil {
-				log.Fatal(err)
-			}
-		}(c)
-	}
-}
-
-func ExamplePacketConn_servingOneShotMulticastDNS() {
-	c, err := net.ListenPacket("udp6", "[::]:5353") // mDNS over UDP
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	mDNSLinkLocal := net.UDPAddr{IP: net.ParseIP("ff02::fb")}
-	if err := p.JoinGroup(en0, &mDNSLinkLocal); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &mDNSLinkLocal)
-	if err := p.SetControlMessage(ipv6.FlagDst|ipv6.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-
-	var wcm ipv6.ControlMessage
-	b := make([]byte, 1500)
-	for {
-		_, rcm, peer, err := p.ReadFrom(b)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if !rcm.Dst.IsMulticast() || !rcm.Dst.Equal(mDNSLinkLocal.IP) {
-			continue
-		}
-		wcm.IfIndex = rcm.IfIndex
-		answers := []byte("FAKE-MDNS-ANSWERS") // fake mDNS answers, you need to implement this
-		if _, err := p.WriteTo(answers, &wcm, peer); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func ExamplePacketConn_tracingIPPacketRoute() {
-	// Tracing an IP packet route to www.google.com.
-
-	const host = "www.google.com"
-	ips, err := net.LookupIP(host)
-	if err != nil {
-		log.Fatal(err)
-	}
-	var dst net.IPAddr
-	for _, ip := range ips {
-		if ip.To16() != nil && ip.To4() == nil {
-			dst.IP = ip
-			fmt.Printf("using %v for tracing an IP packet route to %s\n", dst.IP, host)
-			break
-		}
-	}
-	if dst.IP == nil {
-		log.Fatal("no AAAA record found")
-	}
-
-	c, err := net.ListenPacket("ip6:58", "::") // ICMP for IPv6
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	if err := p.SetControlMessage(ipv6.FlagHopLimit|ipv6.FlagSrc|ipv6.FlagDst|ipv6.FlagInterface, true); err != nil {
-		log.Fatal(err)
-	}
-	wm := icmp.Message{
-		Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-		Body: &icmp.Echo{
-			ID:   os.Getpid() & 0xffff,
-			Data: []byte("HELLO-R-U-THERE"),
-		},
-	}
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeTimeExceeded)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		log.Fatal(err)
-	}
-
-	var wcm ipv6.ControlMessage
-	rb := make([]byte, 1500)
-	for i := 1; i <= 64; i++ { // up to 64 hops
-		wm.Body.(*icmp.Echo).Seq = i
-		wb, err := wm.Marshal(nil)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// In the real world usually there are several
-		// multiple traffic-engineered paths for each hop.
-		// You may need to probe a few times to each hop.
-		begin := time.Now()
-		wcm.HopLimit = i
-		if _, err := p.WriteTo(wb, &wcm, &dst); err != nil {
-			log.Fatal(err)
-		}
-		if err := p.SetReadDeadline(time.Now().Add(3 * time.Second)); err != nil {
-			log.Fatal(err)
-		}
-		n, rcm, peer, err := p.ReadFrom(rb)
-		if err != nil {
-			if err, ok := err.(net.Error); ok && err.Timeout() {
-				fmt.Printf("%v\t*\n", i)
-				continue
-			}
-			log.Fatal(err)
-		}
-		rm, err := icmp.ParseMessage(58, rb[:n])
-		if err != nil {
-			log.Fatal(err)
-		}
-		rtt := time.Since(begin)
-
-		// In the real world you need to determine whether the
-		// received message is yours using ControlMessage.Src,
-		// ControlMesage.Dst, icmp.Echo.ID and icmp.Echo.Seq.
-		switch rm.Type {
-		case ipv6.ICMPTypeTimeExceeded:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, rcm)
-		case ipv6.ICMPTypeEchoReply:
-			names, _ := net.LookupAddr(peer.String())
-			fmt.Printf("%d\t%v %+v %v\n\t%+v\n", i, peer, names, rtt, rcm)
-			return
-		}
-	}
-}
-
-func ExamplePacketConn_advertisingOSPFHello() {
-	c, err := net.ListenPacket("ip6:89", "::") // OSPF for IPv6
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-
-	en0, err := net.InterfaceByName("en0")
-	if err != nil {
-		log.Fatal(err)
-	}
-	allSPFRouters := net.IPAddr{IP: net.ParseIP("ff02::5")}
-	if err := p.JoinGroup(en0, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-	defer p.LeaveGroup(en0, &allSPFRouters)
-
-	hello := make([]byte, 24) // fake hello data, you need to implement this
-	ospf := make([]byte, 16)  // fake ospf header, you need to implement this
-	ospf[0] = 3               // version 3
-	ospf[1] = 1               // hello packet
-	ospf = append(ospf, hello...)
-	if err := p.SetChecksum(true, 12); err != nil {
-		log.Fatal(err)
-	}
-
-	cm := ipv6.ControlMessage{
-		TrafficClass: 0xc0, // DSCP CS6
-		HopLimit:     1,
-		IfIndex:      en0.Index,
-	}
-	if _, err := p.WriteTo(ospf, &cm, &allSPFRouters); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/gen.go b/installer/vendor/golang.org/x/net/ipv6/gen.go
deleted file mode 100644
index 41886ec721..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/gen.go
+++ /dev/null
@@ -1,199 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-//go:generate go run gen.go
-
-// This program generates system adaptation constants and types,
-// internet protocol constants and tables by reading template files
-// and IANA protocol registries.
-package main
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"os/exec"
-	"runtime"
-	"strconv"
-	"strings"
-)
-
-func main() {
-	if err := genzsys(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-	if err := geniana(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func genzsys() error {
-	defs := "defs_" + runtime.GOOS + ".go"
-	f, err := os.Open(defs)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil
-		}
-		return err
-	}
-	f.Close()
-	cmd := exec.Command("go", "tool", "cgo", "-godefs", defs)
-	b, err := cmd.Output()
-	if err != nil {
-		return err
-	}
-	b, err = format.Source(b)
-	if err != nil {
-		return err
-	}
-	zsys := "zsys_" + runtime.GOOS + ".go"
-	switch runtime.GOOS {
-	case "freebsd", "linux":
-		zsys = "zsys_" + runtime.GOOS + "_" + runtime.GOARCH + ".go"
-	}
-	if err := ioutil.WriteFile(zsys, b, 0644); err != nil {
-		return err
-	}
-	return nil
-}
-
-var registries = []struct {
-	url   string
-	parse func(io.Writer, io.Reader) error
-}{
-	{
-		"http://www.iana.org/assignments/icmpv6-parameters/icmpv6-parameters.xml",
-		parseICMPv6Parameters,
-	},
-}
-
-func geniana() error {
-	var bb bytes.Buffer
-	fmt.Fprintf(&bb, "// go generate gen.go\n")
-	fmt.Fprintf(&bb, "// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT\n\n")
-	fmt.Fprintf(&bb, "package ipv6\n\n")
-	for _, r := range registries {
-		resp, err := http.Get(r.url)
-		if err != nil {
-			return err
-		}
-		defer resp.Body.Close()
-		if resp.StatusCode != http.StatusOK {
-			return fmt.Errorf("got HTTP status code %v for %v\n", resp.StatusCode, r.url)
-		}
-		if err := r.parse(&bb, resp.Body); err != nil {
-			return err
-		}
-		fmt.Fprintf(&bb, "\n")
-	}
-	b, err := format.Source(bb.Bytes())
-	if err != nil {
-		return err
-	}
-	if err := ioutil.WriteFile("iana.go", b, 0644); err != nil {
-		return err
-	}
-	return nil
-}
-
-func parseICMPv6Parameters(w io.Writer, r io.Reader) error {
-	dec := xml.NewDecoder(r)
-	var icp icmpv6Parameters
-	if err := dec.Decode(&icp); err != nil {
-		return err
-	}
-	prs := icp.escape()
-	fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated)
-	fmt.Fprintf(w, "const (\n")
-	for _, pr := range prs {
-		if pr.Name == "" {
-			continue
-		}
-		fmt.Fprintf(w, "ICMPType%s ICMPType = %d", pr.Name, pr.Value)
-		fmt.Fprintf(w, "// %s\n", pr.OrigName)
-	}
-	fmt.Fprintf(w, ")\n\n")
-	fmt.Fprintf(w, "// %s, Updated: %s\n", icp.Title, icp.Updated)
-	fmt.Fprintf(w, "var icmpTypes = map[ICMPType]string{\n")
-	for _, pr := range prs {
-		if pr.Name == "" {
-			continue
-		}
-		fmt.Fprintf(w, "%d: %q,\n", pr.Value, strings.ToLower(pr.OrigName))
-	}
-	fmt.Fprintf(w, "}\n")
-	return nil
-}
-
-type icmpv6Parameters struct {
-	XMLName    xml.Name `xml:"registry"`
-	Title      string   `xml:"title"`
-	Updated    string   `xml:"updated"`
-	Registries []struct {
-		Title   string `xml:"title"`
-		Records []struct {
-			Value string `xml:"value"`
-			Name  string `xml:"name"`
-		} `xml:"record"`
-	} `xml:"registry"`
-}
-
-type canonICMPv6ParamRecord struct {
-	OrigName string
-	Name     string
-	Value    int
-}
-
-func (icp *icmpv6Parameters) escape() []canonICMPv6ParamRecord {
-	id := -1
-	for i, r := range icp.Registries {
-		if strings.Contains(r.Title, "Type") || strings.Contains(r.Title, "type") {
-			id = i
-			break
-		}
-	}
-	if id < 0 {
-		return nil
-	}
-	prs := make([]canonICMPv6ParamRecord, len(icp.Registries[id].Records))
-	sr := strings.NewReplacer(
-		"Messages", "",
-		"Message", "",
-		"ICMP", "",
-		"+", "P",
-		"-", "",
-		"/", "",
-		".", "",
-		" ", "",
-	)
-	for i, pr := range icp.Registries[id].Records {
-		if strings.Contains(pr.Name, "Reserved") ||
-			strings.Contains(pr.Name, "Unassigned") ||
-			strings.Contains(pr.Name, "Deprecated") ||
-			strings.Contains(pr.Name, "Experiment") ||
-			strings.Contains(pr.Name, "experiment") {
-			continue
-		}
-		ss := strings.Split(pr.Name, "\n")
-		if len(ss) > 1 {
-			prs[i].Name = strings.Join(ss, " ")
-		} else {
-			prs[i].Name = ss[0]
-		}
-		s := strings.TrimSpace(prs[i].Name)
-		prs[i].OrigName = s
-		prs[i].Name = sr.Replace(s)
-		prs[i].Value, _ = strconv.Atoi(pr.Value)
-	}
-	return prs
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/genericopt_posix.go b/installer/vendor/golang.org/x/net/ipv6/genericopt_posix.go
deleted file mode 100644
index 0a8d9883d2..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/genericopt_posix.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv6
-
-import (
-	"syscall"
-
-	"golang.org/x/net/internal/netreflect"
-)
-
-// TrafficClass returns the traffic class field value for outgoing
-// packets.
-func (c *genericOpt) TrafficClass() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoTrafficClass])
-}
-
-// SetTrafficClass sets the traffic class field value for future
-// outgoing packets.
-func (c *genericOpt) SetTrafficClass(tclass int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoTrafficClass], tclass)
-}
-
-// HopLimit returns the hop limit field value for outgoing packets.
-func (c *genericOpt) HopLimit() (int, error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return 0, err
-	}
-	return getInt(s, &sockOpts[ssoHopLimit])
-}
-
-// SetHopLimit sets the hop limit field value for future outgoing
-// packets.
-func (c *genericOpt) SetHopLimit(hoplim int) error {
-	if !c.ok() {
-		return syscall.EINVAL
-	}
-	s, err := netreflect.SocketOf(c.Conn)
-	if err != nil {
-		return err
-	}
-	return setInt(s, &sockOpts[ssoHopLimit], hoplim)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/genericopt_stub.go b/installer/vendor/golang.org/x/net/ipv6/genericopt_stub.go
deleted file mode 100644
index 9dfc57daec..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/genericopt_stub.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-// TrafficClass returns the traffic class field value for outgoing
-// packets.
-func (c *genericOpt) TrafficClass() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetTrafficClass sets the traffic class field value for future
-// outgoing packets.
-func (c *genericOpt) SetTrafficClass(tclass int) error {
-	return errOpNoSupport
-}
-
-// HopLimit returns the hop limit field value for outgoing packets.
-func (c *genericOpt) HopLimit() (int, error) {
-	return 0, errOpNoSupport
-}
-
-// SetHopLimit sets the hop limit field value for future outgoing
-// packets.
-func (c *genericOpt) SetHopLimit(hoplim int) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/go19_test.go b/installer/vendor/golang.org/x/net/ipv6/go19_test.go
deleted file mode 100644
index c7cb057d23..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/go19_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package ipv6
-
-func init() {
-	disableTests = true
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/header.go b/installer/vendor/golang.org/x/net/ipv6/header.go
deleted file mode 100644
index e05cb08b21..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/header.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"encoding/binary"
-	"fmt"
-	"net"
-)
-
-const (
-	Version   = 6  // protocol version
-	HeaderLen = 40 // header length
-)
-
-// A Header represents an IPv6 base header.
-type Header struct {
-	Version      int    // protocol version
-	TrafficClass int    // traffic class
-	FlowLabel    int    // flow label
-	PayloadLen   int    // payload length
-	NextHeader   int    // next header
-	HopLimit     int    // hop limit
-	Src          net.IP // source address
-	Dst          net.IP // destination address
-}
-
-func (h *Header) String() string {
-	if h == nil {
-		return "<nil>"
-	}
-	return fmt.Sprintf("ver=%d tclass=%#x flowlbl=%#x payloadlen=%d nxthdr=%d hoplim=%d src=%v dst=%v", h.Version, h.TrafficClass, h.FlowLabel, h.PayloadLen, h.NextHeader, h.HopLimit, h.Src, h.Dst)
-}
-
-// ParseHeader parses b as an IPv6 base header.
-func ParseHeader(b []byte) (*Header, error) {
-	if len(b) < HeaderLen {
-		return nil, errHeaderTooShort
-	}
-	h := &Header{
-		Version:      int(b[0]) >> 4,
-		TrafficClass: int(b[0]&0x0f)<<4 | int(b[1])>>4,
-		FlowLabel:    int(b[1]&0x0f)<<16 | int(b[2])<<8 | int(b[3]),
-		PayloadLen:   int(binary.BigEndian.Uint16(b[4:6])),
-		NextHeader:   int(b[6]),
-		HopLimit:     int(b[7]),
-	}
-	h.Src = make(net.IP, net.IPv6len)
-	copy(h.Src, b[8:24])
-	h.Dst = make(net.IP, net.IPv6len)
-	copy(h.Dst, b[24:40])
-	return h, nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/header_test.go b/installer/vendor/golang.org/x/net/ipv6/header_test.go
deleted file mode 100644
index ca11dc23de..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/header_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/ipv6"
-)
-
-var (
-	wireHeaderFromKernel = [ipv6.HeaderLen]byte{
-		0x69, 0x8b, 0xee, 0xf1,
-		0xca, 0xfe, 0x2c, 0x01,
-		0x20, 0x01, 0x0d, 0xb8,
-		0x00, 0x01, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01,
-		0x20, 0x01, 0x0d, 0xb8,
-		0x00, 0x02, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x00,
-		0x00, 0x00, 0x00, 0x01,
-	}
-
-	testHeader = &ipv6.Header{
-		Version:      ipv6.Version,
-		TrafficClass: iana.DiffServAF43,
-		FlowLabel:    0xbeef1,
-		PayloadLen:   0xcafe,
-		NextHeader:   iana.ProtocolIPv6Frag,
-		HopLimit:     1,
-		Src:          net.ParseIP("2001:db8:1::1"),
-		Dst:          net.ParseIP("2001:db8:2::1"),
-	}
-)
-
-func TestParseHeader(t *testing.T) {
-	h, err := ipv6.ParseHeader(wireHeaderFromKernel[:])
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(h, testHeader) {
-		t.Fatalf("got %#v; want %#v", h, testHeader)
-	}
-	s := h.String()
-	if strings.Contains(s, ",") {
-		t.Fatalf("should be space-separated values: %s", s)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/helper.go b/installer/vendor/golang.org/x/net/ipv6/helper.go
deleted file mode 100644
index 7a42e5860b..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/helper.go
+++ /dev/null
@@ -1,53 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"encoding/binary"
-	"errors"
-	"net"
-	"unsafe"
-)
-
-var (
-	errMissingAddress  = errors.New("missing address")
-	errHeaderTooShort  = errors.New("header too short")
-	errInvalidConnType = errors.New("invalid conn type")
-	errOpNoSupport     = errors.New("operation not supported")
-	errNoSuchInterface = errors.New("no such interface")
-
-	nativeEndian binary.ByteOrder
-)
-
-func init() {
-	i := uint32(1)
-	b := (*[4]byte)(unsafe.Pointer(&i))
-	if b[0] == 1 {
-		nativeEndian = binary.LittleEndian
-	} else {
-		nativeEndian = binary.BigEndian
-	}
-}
-
-func boolint(b bool) int {
-	if b {
-		return 1
-	}
-	return 0
-}
-
-func netAddrToIP16(a net.Addr) net.IP {
-	switch v := a.(type) {
-	case *net.UDPAddr:
-		if ip := v.IP.To16(); ip != nil && ip.To4() == nil {
-			return ip
-		}
-	case *net.IPAddr:
-		if ip := v.IP.To16(); ip != nil && ip.To4() == nil {
-			return ip
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/iana.go b/installer/vendor/golang.org/x/net/ipv6/iana.go
deleted file mode 100644
index 3c6214fb69..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/iana.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// go generate gen.go
-// GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package ipv6
-
-// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2015-07-07
-const (
-	ICMPTypeDestinationUnreachable                ICMPType = 1   // Destination Unreachable
-	ICMPTypePacketTooBig                          ICMPType = 2   // Packet Too Big
-	ICMPTypeTimeExceeded                          ICMPType = 3   // Time Exceeded
-	ICMPTypeParameterProblem                      ICMPType = 4   // Parameter Problem
-	ICMPTypeEchoRequest                           ICMPType = 128 // Echo Request
-	ICMPTypeEchoReply                             ICMPType = 129 // Echo Reply
-	ICMPTypeMulticastListenerQuery                ICMPType = 130 // Multicast Listener Query
-	ICMPTypeMulticastListenerReport               ICMPType = 131 // Multicast Listener Report
-	ICMPTypeMulticastListenerDone                 ICMPType = 132 // Multicast Listener Done
-	ICMPTypeRouterSolicitation                    ICMPType = 133 // Router Solicitation
-	ICMPTypeRouterAdvertisement                   ICMPType = 134 // Router Advertisement
-	ICMPTypeNeighborSolicitation                  ICMPType = 135 // Neighbor Solicitation
-	ICMPTypeNeighborAdvertisement                 ICMPType = 136 // Neighbor Advertisement
-	ICMPTypeRedirect                              ICMPType = 137 // Redirect Message
-	ICMPTypeRouterRenumbering                     ICMPType = 138 // Router Renumbering
-	ICMPTypeNodeInformationQuery                  ICMPType = 139 // ICMP Node Information Query
-	ICMPTypeNodeInformationResponse               ICMPType = 140 // ICMP Node Information Response
-	ICMPTypeInverseNeighborDiscoverySolicitation  ICMPType = 141 // Inverse Neighbor Discovery Solicitation Message
-	ICMPTypeInverseNeighborDiscoveryAdvertisement ICMPType = 142 // Inverse Neighbor Discovery Advertisement Message
-	ICMPTypeVersion2MulticastListenerReport       ICMPType = 143 // Version 2 Multicast Listener Report
-	ICMPTypeHomeAgentAddressDiscoveryRequest      ICMPType = 144 // Home Agent Address Discovery Request Message
-	ICMPTypeHomeAgentAddressDiscoveryReply        ICMPType = 145 // Home Agent Address Discovery Reply Message
-	ICMPTypeMobilePrefixSolicitation              ICMPType = 146 // Mobile Prefix Solicitation
-	ICMPTypeMobilePrefixAdvertisement             ICMPType = 147 // Mobile Prefix Advertisement
-	ICMPTypeCertificationPathSolicitation         ICMPType = 148 // Certification Path Solicitation Message
-	ICMPTypeCertificationPathAdvertisement        ICMPType = 149 // Certification Path Advertisement Message
-	ICMPTypeMulticastRouterAdvertisement          ICMPType = 151 // Multicast Router Advertisement
-	ICMPTypeMulticastRouterSolicitation           ICMPType = 152 // Multicast Router Solicitation
-	ICMPTypeMulticastRouterTermination            ICMPType = 153 // Multicast Router Termination
-	ICMPTypeFMIPv6                                ICMPType = 154 // FMIPv6 Messages
-	ICMPTypeRPLControl                            ICMPType = 155 // RPL Control Message
-	ICMPTypeILNPv6LocatorUpdate                   ICMPType = 156 // ILNPv6 Locator Update Message
-	ICMPTypeDuplicateAddressRequest               ICMPType = 157 // Duplicate Address Request
-	ICMPTypeDuplicateAddressConfirmation          ICMPType = 158 // Duplicate Address Confirmation
-	ICMPTypeMPLControl                            ICMPType = 159 // MPL Control Message
-)
-
-// Internet Control Message Protocol version 6 (ICMPv6) Parameters, Updated: 2015-07-07
-var icmpTypes = map[ICMPType]string{
-	1:   "destination unreachable",
-	2:   "packet too big",
-	3:   "time exceeded",
-	4:   "parameter problem",
-	128: "echo request",
-	129: "echo reply",
-	130: "multicast listener query",
-	131: "multicast listener report",
-	132: "multicast listener done",
-	133: "router solicitation",
-	134: "router advertisement",
-	135: "neighbor solicitation",
-	136: "neighbor advertisement",
-	137: "redirect message",
-	138: "router renumbering",
-	139: "icmp node information query",
-	140: "icmp node information response",
-	141: "inverse neighbor discovery solicitation message",
-	142: "inverse neighbor discovery advertisement message",
-	143: "version 2 multicast listener report",
-	144: "home agent address discovery request message",
-	145: "home agent address discovery reply message",
-	146: "mobile prefix solicitation",
-	147: "mobile prefix advertisement",
-	148: "certification path solicitation message",
-	149: "certification path advertisement message",
-	151: "multicast router advertisement",
-	152: "multicast router solicitation",
-	153: "multicast router termination",
-	154: "fmipv6 messages",
-	155: "rpl control message",
-	156: "ilnpv6 locator update message",
-	157: "duplicate address request",
-	158: "duplicate address confirmation",
-	159: "mpl control message",
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp.go b/installer/vendor/golang.org/x/net/ipv6/icmp.go
deleted file mode 100644
index ff21d10712..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp.go
+++ /dev/null
@@ -1,60 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import "golang.org/x/net/internal/iana"
-
-// BUG(mikio): On Windows, methods related to ICMPFilter are not
-// implemented.
-
-// An ICMPType represents a type of ICMP message.
-type ICMPType int
-
-func (typ ICMPType) String() string {
-	s, ok := icmpTypes[typ]
-	if !ok {
-		return "<nil>"
-	}
-	return s
-}
-
-// Protocol returns the ICMPv6 protocol number.
-func (typ ICMPType) Protocol() int {
-	return iana.ProtocolIPv6ICMP
-}
-
-// An ICMPFilter represents an ICMP message filter for incoming
-// packets. The filter belongs to a packet delivery path on a host and
-// it cannot interact with forwarding packets or tunnel-outer packets.
-//
-// Note: RFC 2460 defines a reasonable role model. A node means a
-// device that implements IP. A router means a node that forwards IP
-// packets not explicitly addressed to itself, and a host means a node
-// that is not a router.
-type ICMPFilter struct {
-	icmpv6Filter
-}
-
-// Accept accepts incoming ICMP packets including the type field value
-// typ.
-func (f *ICMPFilter) Accept(typ ICMPType) {
-	f.accept(typ)
-}
-
-// Block blocks incoming ICMP packets including the type field value
-// typ.
-func (f *ICMPFilter) Block(typ ICMPType) {
-	f.block(typ)
-}
-
-// SetAll sets the filter action to the filter.
-func (f *ICMPFilter) SetAll(block bool) {
-	f.setAll(block)
-}
-
-// WillBlock reports whether the ICMP type will be blocked.
-func (f *ICMPFilter) WillBlock(typ ICMPType) bool {
-	return f.willBlock(typ)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_bsd.go b/installer/vendor/golang.org/x/net/ipv6/icmp_bsd.go
deleted file mode 100644
index e1a791de46..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_bsd.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package ipv6
-
-func (f *icmpv6Filter) accept(typ ICMPType) {
-	f.Filt[typ>>5] |= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) block(typ ICMPType) {
-	f.Filt[typ>>5] &^= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) setAll(block bool) {
-	for i := range f.Filt {
-		if block {
-			f.Filt[i] = 0
-		} else {
-			f.Filt[i] = 1<<32 - 1
-		}
-	}
-}
-
-func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
-	return f.Filt[typ>>5]&(1<<(uint32(typ)&31)) == 0
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_linux.go b/installer/vendor/golang.org/x/net/ipv6/icmp_linux.go
deleted file mode 100644
index 647f6b44ff..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_linux.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-func (f *icmpv6Filter) accept(typ ICMPType) {
-	f.Data[typ>>5] &^= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) block(typ ICMPType) {
-	f.Data[typ>>5] |= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) setAll(block bool) {
-	for i := range f.Data {
-		if block {
-			f.Data[i] = 1<<32 - 1
-		} else {
-			f.Data[i] = 0
-		}
-	}
-}
-
-func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
-	return f.Data[typ>>5]&(1<<(uint32(typ)&31)) != 0
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_solaris.go b/installer/vendor/golang.org/x/net/ipv6/icmp_solaris.go
deleted file mode 100644
index 7c23bb1cf6..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_solaris.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-func (f *icmpv6Filter) accept(typ ICMPType) {
-	f.X__icmp6_filt[typ>>5] |= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) block(typ ICMPType) {
-	f.X__icmp6_filt[typ>>5] &^= 1 << (uint32(typ) & 31)
-}
-
-func (f *icmpv6Filter) setAll(block bool) {
-	for i := range f.X__icmp6_filt {
-		if block {
-			f.X__icmp6_filt[i] = 0
-		} else {
-			f.X__icmp6_filt[i] = 1<<32 - 1
-		}
-	}
-}
-
-func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
-	return f.X__icmp6_filt[typ>>5]&(1<<(uint32(typ)&31)) == 0
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_stub.go b/installer/vendor/golang.org/x/net/ipv6/icmp_stub.go
deleted file mode 100644
index 3cd84e1956..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_stub.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-type icmpv6Filter struct {
-}
-
-func (f *icmpv6Filter) accept(typ ICMPType) {
-}
-
-func (f *icmpv6Filter) block(typ ICMPType) {
-}
-
-func (f *icmpv6Filter) setAll(block bool) {
-}
-
-func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_test.go b/installer/vendor/golang.org/x/net/ipv6/icmp_test.go
deleted file mode 100644
index d8e9675dcd..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_test.go
+++ /dev/null
@@ -1,96 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"reflect"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var icmpStringTests = []struct {
-	in  ipv6.ICMPType
-	out string
-}{
-	{ipv6.ICMPTypeDestinationUnreachable, "destination unreachable"},
-
-	{256, "<nil>"},
-}
-
-func TestICMPString(t *testing.T) {
-	for _, tt := range icmpStringTests {
-		s := tt.in.String()
-		if s != tt.out {
-			t.Errorf("got %s; want %s", s, tt.out)
-		}
-	}
-}
-
-func TestICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-
-	var f ipv6.ICMPFilter
-	for _, toggle := range []bool{false, true} {
-		f.SetAll(toggle)
-		for _, typ := range []ipv6.ICMPType{
-			ipv6.ICMPTypeDestinationUnreachable,
-			ipv6.ICMPTypeEchoReply,
-			ipv6.ICMPTypeNeighborSolicitation,
-			ipv6.ICMPTypeDuplicateAddressConfirmation,
-		} {
-			f.Accept(typ)
-			if f.WillBlock(typ) {
-				t.Errorf("ipv6.ICMPFilter.Set(%v, false) failed", typ)
-			}
-			f.Block(typ)
-			if !f.WillBlock(typ) {
-				t.Errorf("ipv6.ICMPFilter.Set(%v, true) failed", typ)
-			}
-		}
-	}
-}
-
-func TestSetICMPFilter(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeEchoRequest)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-	kf, err := p.ICMPFilter()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(kf, &f) {
-		t.Fatalf("got %#v; want %#v", kf, f)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/icmp_windows.go b/installer/vendor/golang.org/x/net/ipv6/icmp_windows.go
deleted file mode 100644
index 443cd07367..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/icmp_windows.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-func (f *icmpv6Filter) accept(typ ICMPType) {
-	// TODO(mikio): implement this
-}
-
-func (f *icmpv6Filter) block(typ ICMPType) {
-	// TODO(mikio): implement this
-}
-
-func (f *icmpv6Filter) setAll(block bool) {
-	// TODO(mikio): implement this
-}
-
-func (f *icmpv6Filter) willBlock(typ ICMPType) bool {
-	// TODO(mikio): implement this
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/ipv6_test.go b/installer/vendor/golang.org/x/net/ipv6/ipv6_test.go
deleted file mode 100644
index 8d2d23542d..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/ipv6_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"fmt"
-	"os"
-	"testing"
-)
-
-var disableTests = false
-
-func TestMain(m *testing.M) {
-	if disableTests {
-		fmt.Fprintf(os.Stderr, "ipv6 tests disabled in Go 1.9 until netreflect is fixed (Issue 19051)\n")
-		os.Exit(0)
-	}
-	// call flag.Parse() here if TestMain uses flags
-	os.Exit(m.Run())
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/mocktransponder_test.go b/installer/vendor/golang.org/x/net/ipv6/mocktransponder_test.go
deleted file mode 100644
index 6efe56c688..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/mocktransponder_test.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"testing"
-)
-
-func connector(t *testing.T, network, addr string, done chan<- bool) {
-	defer func() { done <- true }()
-
-	c, err := net.Dial(network, addr)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	c.Close()
-}
-
-func acceptor(t *testing.T, ln net.Listener, done chan<- bool) {
-	defer func() { done <- true }()
-
-	c, err := ln.Accept()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	c.Close()
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/multicast_test.go b/installer/vendor/golang.org/x/net/ipv6/multicast_test.go
deleted file mode 100644
index 69a21cd388..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/multicast_test.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var packetConnReadWriteMulticastUDPTests = []struct {
-	addr     string
-	grp, src *net.UDPAddr
-}{
-	{"[ff02::]:0", &net.UDPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-
-	{"[ff30::8000:0]:0", &net.UDPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.UDPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if !nettest.SupportsIPv6MulticastDeliveryOnLoopback() {
-		t.Skipf("multicast delivery doesn't work correctly on %s", runtime.GOOS)
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastUDPTests {
-		c, err := net.ListenPacket("udp6", tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		grp := *tt.grp
-		grp.Port = c.LocalAddr().(*net.UDPAddr).Port
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, &grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, &grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, &grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support MLDv2 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, &grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-			IfIndex:      ifi.Index,
-		}
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-		wb := []byte("HELLO-R-U-THERE")
-
-		for i, toggle := range []bool{true, false, true} {
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			cm.HopLimit = i + 1
-			if n, err := p.WriteTo(wb, &cm, &grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatal(err)
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				t.Fatal(err)
-			} else if !bytes.Equal(rb[:n], wb) {
-				t.Fatalf("got %v; want %v", rb[:n], wb)
-			}
-		}
-	}
-}
-
-var packetConnReadWriteMulticastICMPTests = []struct {
-	grp, src *net.IPAddr
-}{
-	{&net.IPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-
-	{&net.IPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.IPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-}
-
-func TestPacketConnReadWriteMulticastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if !nettest.SupportsIPv6MulticastDeliveryOnLoopback() {
-		t.Skipf("multicast delivery doesn't work correctly on %s", runtime.GOOS)
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	for _, tt := range packetConnReadWriteMulticastICMPTests {
-		c, err := net.ListenPacket("ip6:ipv6-icmp", "::")
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		pshicmp := icmp.IPv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, tt.grp.IP)
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-		if tt.src == nil {
-			if err := p.JoinGroup(ifi, tt.grp); err != nil {
-				t.Fatal(err)
-			}
-			defer p.LeaveGroup(ifi, tt.grp)
-		} else {
-			if err := p.JoinSourceSpecificGroup(ifi, tt.grp, tt.src); err != nil {
-				switch runtime.GOOS {
-				case "freebsd", "linux":
-				default: // platforms that don't support MLDv2 fail here
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			defer p.LeaveSourceSpecificGroup(ifi, tt.grp, tt.src)
-		}
-		if err := p.SetMulticastInterface(ifi); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastInterface(); err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetMulticastLoopback(true); err != nil {
-			t.Fatal(err)
-		}
-		if _, err := p.MulticastLoopback(); err != nil {
-			t.Fatal(err)
-		}
-
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-			IfIndex:      ifi.Index,
-		}
-		cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-
-		var f ipv6.ICMPFilter
-		f.SetAll(true)
-		f.Accept(ipv6.ICMPTypeEchoReply)
-		if err := p.SetICMPFilter(&f); err != nil {
-			t.Fatal(err)
-		}
-
-		var psh []byte
-		for i, toggle := range []bool{true, false, true} {
-			if toggle {
-				psh = nil
-				if err := p.SetChecksum(true, 2); err != nil {
-					// Solaris never allows to
-					// modify ICMP properties.
-					if runtime.GOOS != "solaris" {
-						t.Fatal(err)
-					}
-				}
-			} else {
-				psh = pshicmp
-				// Some platforms never allow to
-				// disable the kernel checksum
-				// processing.
-				p.SetChecksum(false, -1)
-			}
-			wb, err := (&icmp.Message{
-				Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-				Body: &icmp.Echo{
-					ID: os.Getpid() & 0xffff, Seq: i + 1,
-					Data: []byte("HELLO-R-U-THERE"),
-				},
-			}).Marshal(psh)
-			if err != nil {
-				t.Fatal(err)
-			}
-			if err := p.SetControlMessage(cf, toggle); err != nil {
-				if nettest.ProtocolNotSupported(err) {
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			}
-			if err := p.SetDeadline(time.Now().Add(200 * time.Millisecond)); err != nil {
-				t.Fatal(err)
-			}
-			cm.HopLimit = i + 1
-			if n, err := p.WriteTo(wb, &cm, tt.grp); err != nil {
-				t.Fatal(err)
-			} else if n != len(wb) {
-				t.Fatalf("got %v; want %v", n, len(wb))
-			}
-			rb := make([]byte, 128)
-			if n, _, _, err := p.ReadFrom(rb); err != nil {
-				switch runtime.GOOS {
-				case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-					t.Logf("not supported on %s", runtime.GOOS)
-					continue
-				}
-				t.Fatal(err)
-			} else {
-				if m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, rb[:n]); err != nil {
-					t.Fatal(err)
-				} else if m.Type != ipv6.ICMPTypeEchoReply || m.Code != 0 {
-					t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv6.ICMPTypeEchoReply, 0)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/multicastlistener_test.go b/installer/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
deleted file mode 100644
index 044db157b0..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/multicastlistener_test.go
+++ /dev/null
@@ -1,246 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"fmt"
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var udpMultipleGroupListenerTests = []net.Addr{
-	&net.UDPAddr{IP: net.ParseIP("ff02::114")}, // see RFC 4727
-	&net.UDPAddr{IP: net.ParseIP("ff02::1:114")},
-	&net.UDPAddr{IP: net.ParseIP("ff02::2:114")},
-}
-
-func TestUDPSinglePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c, err := net.ListenPacket("udp6", "[::]:0") // wildcard address with non-reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		p := ipv6.NewPacketConn(c)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-				continue
-			}
-			if err := p.JoinGroup(&ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			if err := p.LeaveGroup(ifi, gaddr); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func TestUDPMultiplePacketConnWithMultipleGroupListeners(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	for _, gaddr := range udpMultipleGroupListenerTests {
-		c1, err := net.ListenPacket("udp6", "[ff02::]:1024") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c1.Close()
-
-		c2, err := net.ListenPacket("udp6", "[ff02::]:1024") // wildcard address with reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c2.Close()
-
-		var ps [2]*ipv6.PacketConn
-		ps[0] = ipv6.NewPacketConn(c1)
-		ps[1] = ipv6.NewPacketConn(c2)
-		var mift []*net.Interface
-
-		ift, err := net.Interfaces()
-		if err != nil {
-			t.Fatal(err)
-		}
-		for i, ifi := range ift {
-			if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-				continue
-			}
-			for _, p := range ps {
-				if err := p.JoinGroup(&ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-			mift = append(mift, &ift[i])
-		}
-		for _, ifi := range mift {
-			for _, p := range ps {
-				if err := p.LeaveGroup(ifi, gaddr); err != nil {
-					t.Fatal(err)
-				}
-			}
-		}
-	}
-}
-
-func TestUDPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	type ml struct {
-		c   *ipv6.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip6", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("udp6", fmt.Sprintf("[%s%%%s]:1024", ip.String(), ifi.Name)) // unicast address with non-reusable port
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::") // wildcard address
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	var mift []*net.Interface
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		if _, ok := nettest.IsMulticastCapable("ip6", &ifi); !ok {
-			continue
-		}
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mift = append(mift, &ift[i])
-	}
-	for _, ifi := range mift {
-		if err := p.LeaveGroup(ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIPPerInterfaceSinglePacketConnWithSingleGroupListener(t *testing.T) {
-	switch runtime.GOOS {
-	case "darwin", "dragonfly", "openbsd": // platforms that return fe80::1%lo0: bind: can't assign requested address
-		t.Skipf("not supported on %s", runtime.GOOS)
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	gaddr := net.IPAddr{IP: net.ParseIP("ff02::114")} // see RFC 4727
-	type ml struct {
-		c   *ipv6.PacketConn
-		ifi *net.Interface
-	}
-	var mlt []*ml
-
-	ift, err := net.Interfaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	for i, ifi := range ift {
-		ip, ok := nettest.IsMulticastCapable("ip6", &ifi)
-		if !ok {
-			continue
-		}
-		c, err := net.ListenPacket("ip6:ipv6-icmp", fmt.Sprintf("%s%%%s", ip.String(), ifi.Name)) // unicast address
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		if err := p.JoinGroup(&ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-		mlt = append(mlt, &ml{p, &ift[i]})
-	}
-	for _, m := range mlt {
-		if err := m.c.LeaveGroup(m.ifi, &gaddr); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go b/installer/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
deleted file mode 100644
index 9e6b902d7e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/multicastsockopt_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var packetConnMulticastSocketOptionTests = []struct {
-	net, proto, addr string
-	grp, src         net.Addr
-}{
-	{"udp6", "", "[ff02::]:0", &net.UDPAddr{IP: net.ParseIP("ff02::114")}, nil}, // see RFC 4727
-	{"ip6", ":ipv6-icmp", "::", &net.IPAddr{IP: net.ParseIP("ff02::115")}, nil}, // see RFC 4727
-
-	{"udp6", "", "[ff30::8000:0]:0", &net.UDPAddr{IP: net.ParseIP("ff30::8000:1")}, &net.UDPAddr{IP: net.IPv6loopback}}, // see RFC 5771
-	{"ip6", ":ipv6-icmp", "::", &net.IPAddr{IP: net.ParseIP("ff30::8000:2")}, &net.IPAddr{IP: net.IPv6loopback}},        // see RFC 5771
-}
-
-func TestPacketConnMulticastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagMulticast|net.FlagLoopback)
-	if ifi == nil {
-		t.Skipf("not available on %s", runtime.GOOS)
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnMulticastSocketOptionTests {
-		if tt.net == "ip6" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-		p := ipv6.NewPacketConn(c)
-		defer p.Close()
-
-		if tt.src == nil {
-			testMulticastSocketOptions(t, p, ifi, tt.grp)
-		} else {
-			testSourceSpecificMulticastSocketOptions(t, p, ifi, tt.grp, tt.src)
-		}
-	}
-}
-
-type testIPv6MulticastConn interface {
-	MulticastHopLimit() (int, error)
-	SetMulticastHopLimit(ttl int) error
-	MulticastLoopback() (bool, error)
-	SetMulticastLoopback(bool) error
-	JoinGroup(*net.Interface, net.Addr) error
-	LeaveGroup(*net.Interface, net.Addr) error
-	JoinSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	LeaveSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	ExcludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-	IncludeSourceSpecificGroup(*net.Interface, net.Addr, net.Addr) error
-}
-
-func testMulticastSocketOptions(t *testing.T, c testIPv6MulticastConn, ifi *net.Interface, grp net.Addr) {
-	const hoplim = 255
-	if err := c.SetMulticastHopLimit(hoplim); err != nil {
-		t.Error(err)
-		return
-	}
-	if v, err := c.MulticastHopLimit(); err != nil {
-		t.Error(err)
-		return
-	} else if v != hoplim {
-		t.Errorf("got %v; want %v", v, hoplim)
-		return
-	}
-
-	for _, toggle := range []bool{true, false} {
-		if err := c.SetMulticastLoopback(toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if v, err := c.MulticastLoopback(); err != nil {
-			t.Error(err)
-			return
-		} else if v != toggle {
-			t.Errorf("got %v; want %v", v, toggle)
-			return
-		}
-	}
-
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
-
-func testSourceSpecificMulticastSocketOptions(t *testing.T, c testIPv6MulticastConn, ifi *net.Interface, grp, src net.Addr) {
-	// MCAST_JOIN_GROUP -> MCAST_BLOCK_SOURCE -> MCAST_UNBLOCK_SOURCE -> MCAST_LEAVE_GROUP
-	if err := c.JoinGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.ExcludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		switch runtime.GOOS {
-		case "freebsd", "linux":
-		default: // platforms that don't support MLDv2 fail here
-			t.Logf("not supported on %s", runtime.GOOS)
-			return
-		}
-		t.Error(err)
-		return
-	}
-	if err := c.IncludeSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_SOURCE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-
-	// MCAST_JOIN_SOURCE_GROUP -> MCAST_LEAVE_GROUP
-	if err := c.JoinSourceSpecificGroup(ifi, grp, src); err != nil {
-		t.Error(err)
-		return
-	}
-	if err := c.LeaveGroup(ifi, grp); err != nil {
-		t.Error(err)
-		return
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/payload.go b/installer/vendor/golang.org/x/net/ipv6/payload.go
deleted file mode 100644
index d9f822510e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/payload.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import "net"
-
-// BUG(mikio): On Windows, the ControlMessage for ReadFrom and WriteTo
-// methods of PacketConn is not implemented.
-
-// A payloadHandler represents the IPv6 datagram payload handler.
-type payloadHandler struct {
-	net.PacketConn
-	rawOpt
-}
-
-func (c *payloadHandler) ok() bool { return c != nil && c.PacketConn != nil }
diff --git a/installer/vendor/golang.org/x/net/ipv6/payload_cmsg.go b/installer/vendor/golang.org/x/net/ipv6/payload_cmsg.go
deleted file mode 100644
index e853c80590..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/payload_cmsg.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !nacl,!plan9,!windows
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-)
-
-// ReadFrom reads a payload of the received IPv6 datagram, from the
-// endpoint c, copying the payload into b. It returns the number of
-// bytes copied into b, the control message cm and the source address
-// src of the received datagram.
-func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
-	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
-	}
-	oob := newControlMessage(&c.rawOpt)
-	var oobn int
-	switch c := c.PacketConn.(type) {
-	case *net.UDPConn:
-		if n, oobn, _, src, err = c.ReadMsgUDP(b, oob); err != nil {
-			return 0, nil, nil, err
-		}
-	case *net.IPConn:
-		if n, oobn, _, src, err = c.ReadMsgIP(b, oob); err != nil {
-			return 0, nil, nil, err
-		}
-	default:
-		return 0, nil, nil, errInvalidConnType
-	}
-	if cm, err = parseControlMessage(oob[:oobn]); err != nil {
-		return 0, nil, nil, err
-	}
-	if cm != nil {
-		cm.Src = netAddrToIP16(src)
-	}
-	return
-}
-
-// WriteTo writes a payload of the IPv6 datagram, to the destination
-// address dst through the endpoint c, copying the payload from b. It
-// returns the number of bytes written. The control message cm allows
-// the IPv6 header fields and the datagram path to be specified. The
-// cm may be nil if control of the outgoing datagram is not required.
-func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	oob := marshalControlMessage(cm)
-	if dst == nil {
-		return 0, errMissingAddress
-	}
-	switch c := c.PacketConn.(type) {
-	case *net.UDPConn:
-		n, _, err = c.WriteMsgUDP(b, oob, dst.(*net.UDPAddr))
-	case *net.IPConn:
-		n, _, err = c.WriteMsgIP(b, oob, dst.(*net.IPAddr))
-	default:
-		return 0, errInvalidConnType
-	}
-	if err != nil {
-		return 0, err
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/payload_nocmsg.go b/installer/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
deleted file mode 100644
index 99a43542b4..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/payload_nocmsg.go
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9 windows
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-)
-
-// ReadFrom reads a payload of the received IPv6 datagram, from the
-// endpoint c, copying the payload into b. It returns the number of
-// bytes copied into b, the control message cm and the source address
-// src of the received datagram.
-func (c *payloadHandler) ReadFrom(b []byte) (n int, cm *ControlMessage, src net.Addr, err error) {
-	if !c.ok() {
-		return 0, nil, nil, syscall.EINVAL
-	}
-	if n, src, err = c.PacketConn.ReadFrom(b); err != nil {
-		return 0, nil, nil, err
-	}
-	return
-}
-
-// WriteTo writes a payload of the IPv6 datagram, to the destination
-// address dst through the endpoint c, copying the payload from b. It
-// returns the number of bytes written. The control message cm allows
-// the IPv6 header fields and the datagram path to be specified. The
-// cm may be nil if control of the outgoing datagram is not required.
-func (c *payloadHandler) WriteTo(b []byte, cm *ControlMessage, dst net.Addr) (n int, err error) {
-	if !c.ok() {
-		return 0, syscall.EINVAL
-	}
-	if dst == nil {
-		return 0, errMissingAddress
-	}
-	return c.PacketConn.WriteTo(b, dst)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/readwrite_test.go b/installer/vendor/golang.org/x/net/ipv6/readwrite_test.go
deleted file mode 100644
index 41f59be5af..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/readwrite_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func benchmarkUDPListener() (net.PacketConn, net.Addr, error) {
-	c, err := net.ListenPacket("udp6", "[::1]:0")
-	if err != nil {
-		return nil, nil, err
-	}
-	dst, err := net.ResolveUDPAddr("udp6", c.LocalAddr().String())
-	if err != nil {
-		c.Close()
-		return nil, nil, err
-	}
-	return c, dst, nil
-}
-
-func BenchmarkReadWriteNetUDP(b *testing.B) {
-	if !supportsIPv6 {
-		b.Skip("ipv6 is not supported")
-	}
-
-	c, dst, err := benchmarkUDPListener()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer c.Close()
-
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		benchmarkReadWriteNetUDP(b, c, wb, rb, dst)
-	}
-}
-
-func benchmarkReadWriteNetUDP(b *testing.B, c net.PacketConn, wb, rb []byte, dst net.Addr) {
-	if _, err := c.WriteTo(wb, dst); err != nil {
-		b.Fatal(err)
-	}
-	if _, _, err := c.ReadFrom(rb); err != nil {
-		b.Fatal(err)
-	}
-}
-
-func BenchmarkReadWriteIPv6UDP(b *testing.B) {
-	if !supportsIPv6 {
-		b.Skip("ipv6 is not supported")
-	}
-
-	c, dst, err := benchmarkUDPListener()
-	if err != nil {
-		b.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	if err := p.SetControlMessage(cf, true); err != nil {
-		b.Fatal(err)
-	}
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-
-	wb, rb := []byte("HELLO-R-U-THERE"), make([]byte, 128)
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		benchmarkReadWriteIPv6UDP(b, p, wb, rb, dst, ifi)
-	}
-}
-
-func benchmarkReadWriteIPv6UDP(b *testing.B, p *ipv6.PacketConn, wb, rb []byte, dst net.Addr, ifi *net.Interface) {
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		HopLimit:     1,
-	}
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-	if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-		b.Fatal(err)
-	} else if n != len(wb) {
-		b.Fatalf("got %v; want %v", n, len(wb))
-	}
-	if _, _, _, err := p.ReadFrom(rb); err != nil {
-		b.Fatal(err)
-	}
-}
-
-func TestPacketConnConcurrentReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	c, err := net.ListenPacket("udp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst, err := net.ResolveUDPAddr("udp6", c.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	wb := []byte("HELLO-R-U-THERE")
-
-	if err := p.SetControlMessage(cf, true); err != nil { // probe before test
-		if nettest.ProtocolNotSupported(err) {
-			t.Skipf("not supported on %s", runtime.GOOS)
-		}
-		t.Fatal(err)
-	}
-
-	var wg sync.WaitGroup
-	reader := func() {
-		defer wg.Done()
-		rb := make([]byte, 128)
-		if n, cm, _, err := p.ReadFrom(rb); err != nil {
-			t.Error(err)
-			return
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Errorf("got %v; want %v", rb[:n], wb)
-			return
-		} else {
-			s := cm.String()
-			if strings.Contains(s, ",") {
-				t.Errorf("should be space-separated values: %s", s)
-			}
-		}
-	}
-	writer := func(toggle bool) {
-		defer wg.Done()
-		cm := ipv6.ControlMessage{
-			TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-			Src:          net.IPv6loopback,
-		}
-		if ifi != nil {
-			cm.IfIndex = ifi.Index
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			t.Error(err)
-			return
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Error(err)
-			return
-		} else if n != len(wb) {
-			t.Errorf("got %v; want %v", n, len(wb))
-			return
-		}
-	}
-
-	const N = 10
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Add(2 * N)
-	for i := 0; i < 2*N; i++ {
-		go writer(i%2 != 0)
-	}
-	wg.Add(N)
-	for i := 0; i < N; i++ {
-		go reader()
-	}
-	wg.Wait()
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt.go b/installer/vendor/golang.org/x/net/ipv6/sockopt.go
deleted file mode 100644
index f0cfc2f94a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt.go
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-// Sticky socket options
-const (
-	ssoTrafficClass        = iota // header field for unicast packet, RFC 3542
-	ssoHopLimit                   // header field for unicast packet, RFC 3493
-	ssoMulticastInterface         // outbound interface for multicast packet, RFC 3493
-	ssoMulticastHopLimit          // header field for multicast packet, RFC 3493
-	ssoMulticastLoopback          // loopback for multicast packet, RFC 3493
-	ssoReceiveTrafficClass        // header field on received packet, RFC 3542
-	ssoReceiveHopLimit            // header field on received packet, RFC 2292 or 3542
-	ssoReceivePacketInfo          // incbound or outbound packet path, RFC 2292 or 3542
-	ssoReceivePathMTU             // path mtu, RFC 3542
-	ssoPathMTU                    // path mtu, RFC 3542
-	ssoChecksum                   // packet checksum, RFC 2292 or 3542
-	ssoICMPFilter                 // icmp filter, RFC 2292 or 3542
-	ssoJoinGroup                  // any-source multicast, RFC 3493
-	ssoLeaveGroup                 // any-source multicast, RFC 3493
-	ssoJoinSourceGroup            // source-specific multicast
-	ssoLeaveSourceGroup           // source-specific multicast
-	ssoBlockSourceGroup           // any-source or source-specific multicast
-	ssoUnblockSourceGroup         // any-source or source-specific multicast
-	ssoMax
-)
-
-// Sticky socket option value types
-const (
-	ssoTypeInt = iota + 1
-	ssoTypeInterface
-	ssoTypeICMPFilter
-	ssoTypeMTUInfo
-	ssoTypeIPMreq
-	ssoTypeGroupReq
-	ssoTypeGroupSourceReq
-)
-
-// A sockOpt represents a binding for sticky socket option.
-type sockOpt struct {
-	level int // option level
-	name  int // option name, must be equal or greater than 1
-	typ   int // option value type, must be equal or greater than 1
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_asmreq_posix.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_asmreq_posix.go
deleted file mode 100644
index cd36739df3..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_asmreq_posix.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv6
-
-import (
-	"net"
-	"os"
-	"unsafe"
-)
-
-func setsockoptIPMreq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	var mreq ipv6Mreq
-	copy(mreq.Multiaddr[:], grp)
-	if ifi != nil {
-		mreq.setIfindex(ifi.Index)
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&mreq), sizeofIPv6Mreq))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_posix.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_posix.go
deleted file mode 100644
index e0a3fa693e..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_posix.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris windows
-
-package ipv6
-
-import (
-	"net"
-	"os"
-	"unsafe"
-)
-
-func getInt(s uintptr, opt *sockOpt) (int, error) {
-	if opt.name < 1 || opt.typ != ssoTypeInt {
-		return 0, errOpNoSupport
-	}
-	var i int32
-	l := uint32(4)
-	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&i), &l); err != nil {
-		return 0, os.NewSyscallError("getsockopt", err)
-	}
-	return int(i), nil
-}
-
-func setInt(s uintptr, opt *sockOpt, v int) error {
-	if opt.name < 1 || opt.typ != ssoTypeInt {
-		return errOpNoSupport
-	}
-	i := int32(v)
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&i), 4))
-}
-
-func getInterface(s uintptr, opt *sockOpt) (*net.Interface, error) {
-	if opt.name < 1 || opt.typ != ssoTypeInterface {
-		return nil, errOpNoSupport
-	}
-	var i int32
-	l := uint32(4)
-	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&i), &l); err != nil {
-		return nil, os.NewSyscallError("getsockopt", err)
-	}
-	if i == 0 {
-		return nil, nil
-	}
-	ifi, err := net.InterfaceByIndex(int(i))
-	if err != nil {
-		return nil, err
-	}
-	return ifi, nil
-}
-
-func setInterface(s uintptr, opt *sockOpt, ifi *net.Interface) error {
-	if opt.name < 1 || opt.typ != ssoTypeInterface {
-		return errOpNoSupport
-	}
-	var i int32
-	if ifi != nil {
-		i = int32(ifi.Index)
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&i), 4))
-}
-
-func getICMPFilter(s uintptr, opt *sockOpt) (*ICMPFilter, error) {
-	if opt.name < 1 || opt.typ != ssoTypeICMPFilter {
-		return nil, errOpNoSupport
-	}
-	var f ICMPFilter
-	l := uint32(sizeofICMPv6Filter)
-	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.icmpv6Filter), &l); err != nil {
-		return nil, os.NewSyscallError("getsockopt", err)
-	}
-	return &f, nil
-}
-
-func setICMPFilter(s uintptr, opt *sockOpt, f *ICMPFilter) error {
-	if opt.name < 1 || opt.typ != ssoTypeICMPFilter {
-		return errOpNoSupport
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, unsafe.Pointer(&f.icmpv6Filter), sizeofICMPv6Filter))
-}
-
-func getMTUInfo(s uintptr, opt *sockOpt) (*net.Interface, int, error) {
-	if opt.name < 1 || opt.typ != ssoTypeMTUInfo {
-		return nil, 0, errOpNoSupport
-	}
-	var mi ipv6Mtuinfo
-	l := uint32(sizeofIPv6Mtuinfo)
-	if err := getsockopt(s, opt.level, opt.name, unsafe.Pointer(&mi), &l); err != nil {
-		return nil, 0, os.NewSyscallError("getsockopt", err)
-	}
-	if mi.Addr.Scope_id == 0 {
-		return nil, int(mi.Mtu), nil
-	}
-	ifi, err := net.InterfaceByIndex(int(mi.Addr.Scope_id))
-	if err != nil {
-		return nil, 0, err
-	}
-	return ifi, int(mi.Mtu), nil
-}
-
-func setGroup(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	if opt.name < 1 {
-		return errOpNoSupport
-	}
-	switch opt.typ {
-	case ssoTypeIPMreq:
-		return setsockoptIPMreq(s, opt, ifi, grp)
-	case ssoTypeGroupReq:
-		return setsockoptGroupReq(s, opt, ifi, grp)
-	default:
-		return errOpNoSupport
-	}
-}
-
-func setSourceGroup(s uintptr, opt *sockOpt, ifi *net.Interface, grp, src net.IP) error {
-	if opt.name < 1 || opt.typ != ssoTypeGroupSourceReq {
-		return errOpNoSupport
-	}
-	return setsockoptGroupSourceReq(s, opt, ifi, grp, src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_stub.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_stub.go
deleted file mode 100644
index 1a8829092c..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_stub.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !darwin,!freebsd,!linux,!solaris
-
-package ipv6
-
-import "net"
-
-func setsockoptGroupReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	return errOpNoSupport
-}
-
-func setsockoptGroupSourceReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp, src net.IP) error {
-	return errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_unix.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_unix.go
deleted file mode 100644
index f3668aefc5..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_ssmreq_unix.go
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin freebsd linux solaris
-
-package ipv6
-
-import (
-	"net"
-	"os"
-	"unsafe"
-)
-
-var freebsd32o64 bool
-
-func setsockoptGroupReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp net.IP) error {
-	var gr groupReq
-	if ifi != nil {
-		gr.Interface = uint32(ifi.Index)
-	}
-	gr.setGroup(grp)
-	var p unsafe.Pointer
-	var l uint32
-	if freebsd32o64 {
-		var d [sizeofGroupReq + 4]byte
-		s := (*[sizeofGroupReq]byte)(unsafe.Pointer(&gr))
-		copy(d[:4], s[:4])
-		copy(d[8:], s[4:])
-		p = unsafe.Pointer(&d[0])
-		l = sizeofGroupReq + 4
-	} else {
-		p = unsafe.Pointer(&gr)
-		l = sizeofGroupReq
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, p, l))
-}
-
-func setsockoptGroupSourceReq(s uintptr, opt *sockOpt, ifi *net.Interface, grp, src net.IP) error {
-	var gsr groupSourceReq
-	if ifi != nil {
-		gsr.Interface = uint32(ifi.Index)
-	}
-	gsr.setSourceGroup(grp, src)
-	var p unsafe.Pointer
-	var l uint32
-	if freebsd32o64 {
-		var d [sizeofGroupSourceReq + 4]byte
-		s := (*[sizeofGroupSourceReq]byte)(unsafe.Pointer(&gsr))
-		copy(d[:4], s[:4])
-		copy(d[8:], s[4:])
-		p = unsafe.Pointer(&d[0])
-		l = sizeofGroupSourceReq + 4
-	} else {
-		p = unsafe.Pointer(&gsr)
-		l = sizeofGroupSourceReq
-	}
-	return os.NewSyscallError("setsockopt", setsockopt(s, opt.level, opt.name, p, l))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_stub.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_stub.go
deleted file mode 100644
index 6d59a00c24..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_stub.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-import "net"
-
-func getMTUInfo(s uintptr, opt *sockOpt) (*net.Interface, int, error) {
-	return nil, 0, errOpNoSupport
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sockopt_test.go b/installer/vendor/golang.org/x/net/ipv6/sockopt_test.go
deleted file mode 100644
index 774338dbf7..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sockopt_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"fmt"
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-var supportsIPv6 bool = nettest.SupportsIPv6()
-
-func TestConnInitiatorPathMTU(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	done := make(chan bool)
-	go acceptor(t, ln, done)
-
-	c, err := net.Dial("tcp6", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	if pmtu, err := ipv6.NewConn(c).PathMTU(); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_PATHMTU option
-			t.Logf("not supported on %s", runtime.GOOS)
-		default:
-			t.Fatal(err)
-		}
-	} else {
-		t.Logf("path mtu for %v: %v", c.RemoteAddr(), pmtu)
-	}
-
-	<-done
-}
-
-func TestConnResponderPathMTU(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	done := make(chan bool)
-	go connector(t, "tcp6", ln.Addr().String(), done)
-
-	c, err := ln.Accept()
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	if pmtu, err := ipv6.NewConn(c).PathMTU(); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_PATHMTU option
-			t.Logf("not supported on %s", runtime.GOOS)
-		default:
-			t.Fatal(err)
-		}
-	} else {
-		t.Logf("path mtu for %v: %v", c.RemoteAddr(), pmtu)
-	}
-
-	<-done
-}
-
-func TestPacketConnChecksum(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket(fmt.Sprintf("ip6:%d", iana.ProtocolOSPFIGP), "::") // OSPF for IPv6
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	p := ipv6.NewPacketConn(c)
-	offset := 12 // see RFC 5340
-
-	for _, toggle := range []bool{false, true} {
-		if err := p.SetChecksum(toggle, offset); err != nil {
-			if toggle {
-				t.Fatalf("ipv6.PacketConn.SetChecksum(%v, %v) failed: %v", toggle, offset, err)
-			} else {
-				// Some platforms never allow to disable the kernel
-				// checksum processing.
-				t.Logf("ipv6.PacketConn.SetChecksum(%v, %v) failed: %v", toggle, offset, err)
-			}
-		}
-		if on, offset, err := p.Checksum(); err != nil {
-			t.Fatal(err)
-		} else {
-			t.Logf("kernel checksum processing enabled=%v, offset=%v", on, offset)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_bsd.go b/installer/vendor/golang.org/x/net/ipv6/sys_bsd.go
deleted file mode 100644
index c22f8ac630..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_bsd.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly netbsd openbsd
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
-		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTrafficClass:        {iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt},
-		ssoHopLimit:            {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTrafficClass: {iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt},
-		ssoReceiveHopLimit:     {iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt},
-		ssoReceivePacketInfo:   {iana.ProtocolIPv6, sysIPV6_RECVPKTINFO, ssoTypeInt},
-		ssoReceivePathMTU:      {iana.ProtocolIPv6, sysIPV6_RECVPATHMTU, ssoTypeInt},
-		ssoPathMTU:             {iana.ProtocolIPv6, sysIPV6_PATHMTU, ssoTypeMTUInfo},
-		ssoChecksum:            {iana.ProtocolIPv6, sysIPV6_CHECKSUM, ssoTypeInt},
-		ssoICMPFilter:          {iana.ProtocolIPv6ICMP, sysICMP6_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:           {iana.ProtocolIPv6, sysIPV6_JOIN_GROUP, ssoTypeIPMreq},
-		ssoLeaveGroup:          {iana.ProtocolIPv6, sysIPV6_LEAVE_GROUP, ssoTypeIPMreq},
-	}
-)
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (pi *inet6Pktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Interface = uint32(i)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_darwin.go b/installer/vendor/golang.org/x/net/ipv6/sys_darwin.go
deleted file mode 100644
index ffcc9d4c40..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_darwin.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"strconv"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlHopLimit:   {sysIPV6_2292HOPLIMIT, 4, marshal2292HopLimit, parseHopLimit},
-		ctlPacketInfo: {sysIPV6_2292PKTINFO, sizeofInet6Pktinfo, marshal2292PacketInfo, parsePacketInfo},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoHopLimit:           {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface: {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveHopLimit:    {iana.ProtocolIPv6, sysIPV6_2292HOPLIMIT, ssoTypeInt},
-		ssoReceivePacketInfo:  {iana.ProtocolIPv6, sysIPV6_2292PKTINFO, ssoTypeInt},
-		ssoChecksum:           {iana.ProtocolIPv6, sysIPV6_CHECKSUM, ssoTypeInt},
-		ssoICMPFilter:         {iana.ProtocolIPv6ICMP, sysICMP6_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:          {iana.ProtocolIPv6, sysIPV6_JOIN_GROUP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {iana.ProtocolIPv6, sysIPV6_LEAVE_GROUP, ssoTypeIPMreq},
-	}
-)
-
-func init() {
-	// Seems like kern.osreldate is veiled on latest OS X. We use
-	// kern.osrelease instead.
-	s, err := syscall.Sysctl("kern.osrelease")
-	if err != nil {
-		return
-	}
-	ss := strings.Split(s, ".")
-	if len(ss) == 0 {
-		return
-	}
-	// The IP_PKTINFO and protocol-independent multicast API were
-	// introduced in OS X 10.7 (Darwin 11). But it looks like
-	// those features require OS X 10.8 (Darwin 12) or above.
-	// See http://support.apple.com/kb/HT1633.
-	if mjver, err := strconv.Atoi(ss[0]); err != nil || mjver < 12 {
-		return
-	}
-	ctlOpts[ctlTrafficClass] = ctlOpt{sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass}
-	ctlOpts[ctlHopLimit] = ctlOpt{sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit}
-	ctlOpts[ctlPacketInfo] = ctlOpt{sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo}
-	ctlOpts[ctlNextHop] = ctlOpt{sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop}
-	ctlOpts[ctlPathMTU] = ctlOpt{sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU}
-	sockOpts[ssoTrafficClass] = sockOpt{iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt}
-	sockOpts[ssoReceiveTrafficClass] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt}
-	sockOpts[ssoReceiveHopLimit] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt}
-	sockOpts[ssoReceivePacketInfo] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVPKTINFO, ssoTypeInt}
-	sockOpts[ssoReceivePathMTU] = sockOpt{iana.ProtocolIPv6, sysIPV6_RECVPATHMTU, ssoTypeInt}
-	sockOpts[ssoPathMTU] = sockOpt{iana.ProtocolIPv6, sysIPV6_PATHMTU, ssoTypeMTUInfo}
-	sockOpts[ssoJoinGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_JOIN_GROUP, ssoTypeGroupReq}
-	sockOpts[ssoLeaveGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_LEAVE_GROUP, ssoTypeGroupReq}
-	sockOpts[ssoJoinSourceGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq}
-	sockOpts[ssoLeaveSourceGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq}
-	sockOpts[ssoBlockSourceGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq}
-	sockOpts[ssoUnblockSourceGroup] = sockOpt{iana.ProtocolIPv6, sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq}
-}
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (pi *inet6Pktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Interface = uint32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 132))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_freebsd.go b/installer/vendor/golang.org/x/net/ipv6/sys_freebsd.go
deleted file mode 100644
index fd5204bebd..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_freebsd.go
+++ /dev/null
@@ -1,91 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"runtime"
-	"strings"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
-		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTrafficClass:        {iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt},
-		ssoHopLimit:            {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTrafficClass: {iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt},
-		ssoReceiveHopLimit:     {iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt},
-		ssoReceivePacketInfo:   {iana.ProtocolIPv6, sysIPV6_RECVPKTINFO, ssoTypeInt},
-		ssoReceivePathMTU:      {iana.ProtocolIPv6, sysIPV6_RECVPATHMTU, ssoTypeInt},
-		ssoPathMTU:             {iana.ProtocolIPv6, sysIPV6_PATHMTU, ssoTypeMTUInfo},
-		ssoChecksum:            {iana.ProtocolIPv6, sysIPV6_CHECKSUM, ssoTypeInt},
-		ssoICMPFilter:          {iana.ProtocolIPv6ICMP, sysICMP6_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:           {iana.ProtocolIPv6, sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:          {iana.ProtocolIPv6, sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:     {iana.ProtocolIPv6, sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:    {iana.ProtocolIPv6, sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:    {iana.ProtocolIPv6, sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup:  {iana.ProtocolIPv6, sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func init() {
-	if runtime.GOOS == "freebsd" && runtime.GOARCH == "386" {
-		archs, _ := syscall.Sysctl("kern.supported_archs")
-		for _, s := range strings.Fields(archs) {
-			if s == "amd64" {
-				freebsd32o64 = true
-				break
-			}
-		}
-	}
-}
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (pi *inet6Pktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Interface = uint32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(&gr.Group))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(&gsr.Group))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet6)(unsafe.Pointer(&gsr.Source))
-	sa.Len = sizeofSockaddrInet6
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_linux.go b/installer/vendor/golang.org/x/net/ipv6/sys_linux.go
deleted file mode 100644
index 42f5f78538..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_linux.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
-		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTrafficClass:        {iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt},
-		ssoHopLimit:            {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTrafficClass: {iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt},
-		ssoReceiveHopLimit:     {iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt},
-		ssoReceivePacketInfo:   {iana.ProtocolIPv6, sysIPV6_RECVPKTINFO, ssoTypeInt},
-		ssoReceivePathMTU:      {iana.ProtocolIPv6, sysIPV6_RECVPATHMTU, ssoTypeInt},
-		ssoPathMTU:             {iana.ProtocolIPv6, sysIPV6_PATHMTU, ssoTypeMTUInfo},
-		ssoChecksum:            {iana.ProtocolReserved, sysIPV6_CHECKSUM, ssoTypeInt},
-		ssoICMPFilter:          {iana.ProtocolIPv6ICMP, sysICMPV6_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:           {iana.ProtocolIPv6, sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:          {iana.ProtocolIPv6, sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:     {iana.ProtocolIPv6, sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:    {iana.ProtocolIPv6, sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:    {iana.ProtocolIPv6, sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup:  {iana.ProtocolIPv6, sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (pi *inet6Pktinfo) setIfindex(i int) {
-	pi.Ifindex = int32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Ifindex = int32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(&gr.Group))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(&gsr.Group))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet6)(unsafe.Pointer(&gsr.Source))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_linux_386.s b/installer/vendor/golang.org/x/net/ipv6/sys_linux_386.s
deleted file mode 100644
index b85551a5c1..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_linux_386.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT	·socketcall(SB),NOSPLIT,$0-36
-	JMP	syscall·socketcall(SB)
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_solaris.go b/installer/vendor/golang.org/x/net/ipv6/sys_solaris.go
deleted file mode 100644
index 9bd2d66fd3..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_solaris.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/net/internal/iana"
-)
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{
-		ctlTrafficClass: {sysIPV6_TCLASS, 4, marshalTrafficClass, parseTrafficClass},
-		ctlHopLimit:     {sysIPV6_HOPLIMIT, 4, marshalHopLimit, parseHopLimit},
-		ctlPacketInfo:   {sysIPV6_PKTINFO, sizeofInet6Pktinfo, marshalPacketInfo, parsePacketInfo},
-		ctlNextHop:      {sysIPV6_NEXTHOP, sizeofSockaddrInet6, marshalNextHop, parseNextHop},
-		ctlPathMTU:      {sysIPV6_PATHMTU, sizeofIPv6Mtuinfo, marshalPathMTU, parsePathMTU},
-	}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoTrafficClass:        {iana.ProtocolIPv6, sysIPV6_TCLASS, ssoTypeInt},
-		ssoHopLimit:            {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:   {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoReceiveTrafficClass: {iana.ProtocolIPv6, sysIPV6_RECVTCLASS, ssoTypeInt},
-		ssoReceiveHopLimit:     {iana.ProtocolIPv6, sysIPV6_RECVHOPLIMIT, ssoTypeInt},
-		ssoReceivePacketInfo:   {iana.ProtocolIPv6, sysIPV6_RECVPKTINFO, ssoTypeInt},
-		ssoReceivePathMTU:      {iana.ProtocolIPv6, sysIPV6_RECVPATHMTU, ssoTypeInt},
-		ssoPathMTU:             {iana.ProtocolIPv6, sysIPV6_PATHMTU, ssoTypeMTUInfo},
-		ssoChecksum:            {iana.ProtocolIPv6, sysIPV6_CHECKSUM, ssoTypeInt},
-		ssoICMPFilter:          {iana.ProtocolIPv6ICMP, sysICMP6_FILTER, ssoTypeICMPFilter},
-		ssoJoinGroup:           {iana.ProtocolIPv6, sysMCAST_JOIN_GROUP, ssoTypeGroupReq},
-		ssoLeaveGroup:          {iana.ProtocolIPv6, sysMCAST_LEAVE_GROUP, ssoTypeGroupReq},
-		ssoJoinSourceGroup:     {iana.ProtocolIPv6, sysMCAST_JOIN_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoLeaveSourceGroup:    {iana.ProtocolIPv6, sysMCAST_LEAVE_SOURCE_GROUP, ssoTypeGroupSourceReq},
-		ssoBlockSourceGroup:    {iana.ProtocolIPv6, sysMCAST_BLOCK_SOURCE, ssoTypeGroupSourceReq},
-		ssoUnblockSourceGroup:  {iana.ProtocolIPv6, sysMCAST_UNBLOCK_SOURCE, ssoTypeGroupSourceReq},
-	}
-)
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (pi *inet6Pktinfo) setIfindex(i int) {
-	pi.Ifindex = uint32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Interface = uint32(i)
-}
-
-func (gr *groupReq) setGroup(grp net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gr)) + 4))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-}
-
-func (gsr *groupSourceReq) setSourceGroup(grp, src net.IP) {
-	sa := (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 4))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], grp)
-	sa = (*sockaddrInet6)(unsafe.Pointer(uintptr(unsafe.Pointer(gsr)) + 260))
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], src)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_solaris_amd64.s b/installer/vendor/golang.org/x/net/ipv6/sys_solaris_amd64.s
deleted file mode 100644
index 39d76af794..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_solaris_amd64.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT ·sysvicall6(SB),NOSPLIT,$0-88
-	JMP	syscall·sysvicall6(SB)
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_stub.go b/installer/vendor/golang.org/x/net/ipv6/sys_stub.go
deleted file mode 100644
index 7663bfc09a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_stub.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build nacl plan9
-
-package ipv6
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{}
-
-	sockOpts = [ssoMax]sockOpt{}
-)
diff --git a/installer/vendor/golang.org/x/net/ipv6/sys_windows.go b/installer/vendor/golang.org/x/net/ipv6/sys_windows.go
deleted file mode 100644
index 003c507d56..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/sys_windows.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"net"
-	"syscall"
-
-	"golang.org/x/net/internal/iana"
-)
-
-const (
-	// See ws2tcpip.h.
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PKTINFO        = 0x13
-
-	sizeofSockaddrInet6 = 0x1c
-
-	sizeofIPv6Mreq     = 0x14
-	sizeofIPv6Mtuinfo  = 0x20
-	sizeofICMPv6Filter = 0
-)
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type icmpv6Filter struct {
-	// TODO(mikio): implement this
-}
-
-var (
-	ctlOpts = [ctlMax]ctlOpt{}
-
-	sockOpts = [ssoMax]sockOpt{
-		ssoHopLimit:           {iana.ProtocolIPv6, sysIPV6_UNICAST_HOPS, ssoTypeInt},
-		ssoMulticastInterface: {iana.ProtocolIPv6, sysIPV6_MULTICAST_IF, ssoTypeInterface},
-		ssoMulticastHopLimit:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_HOPS, ssoTypeInt},
-		ssoMulticastLoopback:  {iana.ProtocolIPv6, sysIPV6_MULTICAST_LOOP, ssoTypeInt},
-		ssoJoinGroup:          {iana.ProtocolIPv6, sysIPV6_JOIN_GROUP, ssoTypeIPMreq},
-		ssoLeaveGroup:         {iana.ProtocolIPv6, sysIPV6_LEAVE_GROUP, ssoTypeIPMreq},
-	}
-)
-
-func (sa *sockaddrInet6) setSockaddr(ip net.IP, i int) {
-	sa.Family = syscall.AF_INET6
-	copy(sa.Addr[:], ip)
-	sa.Scope_id = uint32(i)
-}
-
-func (mreq *ipv6Mreq) setIfindex(i int) {
-	mreq.Interface = uint32(i)
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/syscall_linux_386.go b/installer/vendor/golang.org/x/net/ipv6/syscall_linux_386.go
deleted file mode 100644
index 5184dbe881..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/syscall_linux_386.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-const (
-	sysGETSOCKOPT = 0xf
-	sysSETSOCKOPT = 0xe
-)
-
-func socketcall(call int, a0, a1, a2, a3, a4, a5 uintptr) (int, syscall.Errno)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	if _, errno := socketcall(sysGETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, errno := socketcall(sysSETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/syscall_solaris.go b/installer/vendor/golang.org/x/net/ipv6/syscall_solaris.go
deleted file mode 100644
index 2a5c8ee47c..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/syscall_solaris.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc___xnet_getsockopt __xnet_getsockopt "libsocket.so"
-//go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
-
-//go:linkname procGetsockopt libc___xnet_getsockopt
-//go:linkname procSetsockopt libc_setsockopt
-
-var (
-	procGetsockopt uintptr
-	procSetsockopt uintptr
-)
-
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (uintptr, uintptr, syscall.Errno)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procGetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0)
-	if errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procSetsockopt)), 5, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/syscall_unix.go b/installer/vendor/golang.org/x/net/ipv6/syscall_unix.go
deleted file mode 100644
index 58a75b5281..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/syscall_unix.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux,!386 netbsd openbsd
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	if _, _, errno := syscall.Syscall6(syscall.SYS_GETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(unsafe.Pointer(l)), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	if _, _, errno := syscall.Syscall6(syscall.SYS_SETSOCKOPT, s, uintptr(level), uintptr(name), uintptr(v), uintptr(l), 0); errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/syscall_windows.go b/installer/vendor/golang.org/x/net/ipv6/syscall_windows.go
deleted file mode 100644
index c1f649d388..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/syscall_windows.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func getsockopt(s uintptr, level, name int, v unsafe.Pointer, l *uint32) error {
-	return syscall.Getsockopt(syscall.Handle(s), int32(level), int32(name), (*byte)(v), (*int32)(unsafe.Pointer(l)))
-}
-
-func setsockopt(s uintptr, level, name int, v unsafe.Pointer, l uint32) error {
-	return syscall.Setsockopt(syscall.Handle(s), int32(level), int32(name), (*byte)(v), int32(l))
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/unicast_test.go b/installer/vendor/golang.org/x/net/ipv6/unicast_test.go
deleted file mode 100644
index 406d07128b..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/unicast_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/net/icmp"
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func TestPacketConnReadWriteUnicastUDP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	c, err := net.ListenPacket("udp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst, err := net.ResolveUDPAddr("udp6", c.LocalAddr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		Src:          net.IPv6loopback,
-	}
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-	wb := []byte("HELLO-R-U-THERE")
-
-	for i, toggle := range []bool{true, false, true} {
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Skipf("not supported on %s", runtime.GOOS)
-			}
-			t.Fatal(err)
-		}
-		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			t.Fatal(err)
-		} else if !bytes.Equal(rb[:n], wb) {
-			t.Fatalf("got %v; want %v", rb[:n], wb)
-		}
-	}
-}
-
-func TestPacketConnReadWriteUnicastICMP(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-	if m, ok := nettest.SupportsRawIPSocket(); !ok {
-		t.Skip(m)
-	}
-
-	c, err := net.ListenPacket("ip6:ipv6-icmp", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-	p := ipv6.NewPacketConn(c)
-	defer p.Close()
-
-	dst, err := net.ResolveIPAddr("ip6", "::1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pshicmp := icmp.IPv6PseudoHeader(c.LocalAddr().(*net.IPAddr).IP, dst.IP)
-	cm := ipv6.ControlMessage{
-		TrafficClass: iana.DiffServAF11 | iana.CongestionExperienced,
-		Src:          net.IPv6loopback,
-	}
-	cf := ipv6.FlagTrafficClass | ipv6.FlagHopLimit | ipv6.FlagSrc | ipv6.FlagDst | ipv6.FlagInterface | ipv6.FlagPathMTU
-	ifi := nettest.RoutedInterface("ip6", net.FlagUp|net.FlagLoopback)
-	if ifi != nil {
-		cm.IfIndex = ifi.Index
-	}
-
-	var f ipv6.ICMPFilter
-	f.SetAll(true)
-	f.Accept(ipv6.ICMPTypeEchoReply)
-	if err := p.SetICMPFilter(&f); err != nil {
-		t.Fatal(err)
-	}
-
-	var psh []byte
-	for i, toggle := range []bool{true, false, true} {
-		if toggle {
-			psh = nil
-			if err := p.SetChecksum(true, 2); err != nil {
-				// Solaris never allows to modify
-				// ICMP properties.
-				if runtime.GOOS != "solaris" {
-					t.Fatal(err)
-				}
-			}
-		} else {
-			psh = pshicmp
-			// Some platforms never allow to disable the
-			// kernel checksum processing.
-			p.SetChecksum(false, -1)
-		}
-		wb, err := (&icmp.Message{
-			Type: ipv6.ICMPTypeEchoRequest, Code: 0,
-			Body: &icmp.Echo{
-				ID: os.Getpid() & 0xffff, Seq: i + 1,
-				Data: []byte("HELLO-R-U-THERE"),
-			},
-		}).Marshal(psh)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := p.SetControlMessage(cf, toggle); err != nil {
-			if nettest.ProtocolNotSupported(err) {
-				t.Skipf("not supported on %s", runtime.GOOS)
-			}
-			t.Fatal(err)
-		}
-		cm.HopLimit = i + 1
-		if err := p.SetWriteDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, err := p.WriteTo(wb, &cm, dst); err != nil {
-			t.Fatal(err)
-		} else if n != len(wb) {
-			t.Fatalf("got %v; want %v", n, len(wb))
-		}
-		rb := make([]byte, 128)
-		if err := p.SetReadDeadline(time.Now().Add(100 * time.Millisecond)); err != nil {
-			t.Fatal(err)
-		}
-		if n, _, _, err := p.ReadFrom(rb); err != nil {
-			switch runtime.GOOS {
-			case "darwin": // older darwin kernels have some limitation on receiving icmp packet through raw socket
-				t.Logf("not supported on %s", runtime.GOOS)
-				continue
-			}
-			t.Fatal(err)
-		} else {
-			if m, err := icmp.ParseMessage(iana.ProtocolIPv6ICMP, rb[:n]); err != nil {
-				t.Fatal(err)
-			} else if m.Type != ipv6.ICMPTypeEchoReply || m.Code != 0 {
-				t.Fatalf("got type=%v, code=%v; want type=%v, code=%v", m.Type, m.Code, ipv6.ICMPTypeEchoReply, 0)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go b/installer/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
deleted file mode 100644
index e175dccf58..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/unicastsockopt_test.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ipv6_test
-
-import (
-	"net"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/iana"
-	"golang.org/x/net/internal/nettest"
-	"golang.org/x/net/ipv6"
-)
-
-func TestConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	ln, err := net.Listen("tcp6", "[::1]:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-
-	errc := make(chan error, 1)
-	go func() {
-		c, err := ln.Accept()
-		if err != nil {
-			errc <- err
-			return
-		}
-		errc <- c.Close()
-	}()
-
-	c, err := net.Dial("tcp6", ln.Addr().String())
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer c.Close()
-
-	testUnicastSocketOptions(t, ipv6.NewConn(c))
-
-	if err := <-errc; err != nil {
-		t.Errorf("server: %v", err)
-	}
-}
-
-var packetConnUnicastSocketOptionTests = []struct {
-	net, proto, addr string
-}{
-	{"udp6", "", "[::1]:0"},
-	{"ip6", ":ipv6-icmp", "::1"},
-}
-
-func TestPacketConnUnicastSocketOptions(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl", "plan9", "windows":
-		t.Skipf("not supported on %s", runtime.GOOS)
-	}
-	if !supportsIPv6 {
-		t.Skip("ipv6 is not supported")
-	}
-
-	m, ok := nettest.SupportsRawIPSocket()
-	for _, tt := range packetConnUnicastSocketOptionTests {
-		if tt.net == "ip6" && !ok {
-			t.Log(m)
-			continue
-		}
-		c, err := net.ListenPacket(tt.net+tt.proto, tt.addr)
-		if err != nil {
-			t.Fatal(err)
-		}
-		defer c.Close()
-
-		testUnicastSocketOptions(t, ipv6.NewPacketConn(c))
-	}
-}
-
-type testIPv6UnicastConn interface {
-	TrafficClass() (int, error)
-	SetTrafficClass(int) error
-	HopLimit() (int, error)
-	SetHopLimit(int) error
-}
-
-func testUnicastSocketOptions(t *testing.T, c testIPv6UnicastConn) {
-	tclass := iana.DiffServCS0 | iana.NotECNTransport
-	if err := c.SetTrafficClass(tclass); err != nil {
-		switch runtime.GOOS {
-		case "darwin": // older darwin kernels don't support IPV6_TCLASS option
-			t.Logf("not supported on %s", runtime.GOOS)
-			goto next
-		}
-		t.Fatal(err)
-	}
-	if v, err := c.TrafficClass(); err != nil {
-		t.Fatal(err)
-	} else if v != tclass {
-		t.Fatalf("got %v; want %v", v, tclass)
-	}
-
-next:
-	hoplim := 255
-	if err := c.SetHopLimit(hoplim); err != nil {
-		t.Fatal(err)
-	}
-	if v, err := c.HopLimit(); err != nil {
-		t.Fatal(err)
-	} else if v != hoplim {
-		t.Fatalf("got %v; want %v", v, hoplim)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_darwin.go b/installer/vendor/golang.org/x/net/ipv6/zsys_darwin.go
deleted file mode 100644
index 6aab1dfab7..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_darwin.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_darwin.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-
-	sysIPV6_PORTRANGE    = 0xe
-	sysICMP6_FILTER      = 0x12
-	sysIPV6_2292PKTINFO  = 0x13
-	sysIPV6_2292HOPLIMIT = 0x14
-	sysIPV6_2292NEXTHOP  = 0x15
-	sysIPV6_2292HOPOPTS  = 0x16
-	sysIPV6_2292DSTOPTS  = 0x17
-	sysIPV6_2292RTHDR    = 0x18
-
-	sysIPV6_2292PKTOPTIONS = 0x19
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RECVTCLASS = 0x23
-	sysIPV6_TCLASS     = 0x24
-
-	sysIPV6_RTHDRDSTOPTS = 0x39
-
-	sysIPV6_RECVPKTINFO = 0x3d
-
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PREFER_TEMPADDR = 0x3f
-
-	sysIPV6_MSFILTER            = 0x4a
-	sysMCAST_JOIN_GROUP         = 0x50
-	sysMCAST_LEAVE_GROUP        = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-	sysMCAST_BLOCK_SOURCE       = 0x54
-	sysMCAST_UNBLOCK_SOURCE     = 0x55
-
-	sysIPV6_BOUND_IF = 0x7d
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet6   = 0x1c
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [128]byte
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [128]byte
-	Pad_cgo_1 [128]byte
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_dragonfly.go b/installer/vendor/golang.org/x/net/ipv6/zsys_dragonfly.go
deleted file mode 100644
index d2de804d88..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_dragonfly.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_dragonfly.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_RECVTCLASS = 0x39
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PREFER_TEMPADDR = 0x3f
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrInet6 = 0x1c
-	sizeofInet6Pktinfo  = 0x14
-	sizeofIPv6Mtuinfo   = 0x20
-
-	sizeofIPv6Mreq = 0x14
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_386.go b/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_386.go
deleted file mode 100644
index 919e572d4a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_386.go
+++ /dev/null
@@ -1,122 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_RECVTCLASS = 0x39
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PREFER_TEMPADDR = 0x3f
-
-	sysIPV6_BINDANY = 0x40
-
-	sysIPV6_MSFILTER = 0x4a
-
-	sysMCAST_JOIN_GROUP         = 0x50
-	sysMCAST_LEAVE_GROUP        = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-	sysMCAST_BLOCK_SOURCE       = 0x54
-	sysMCAST_UNBLOCK_SOURCE     = 0x55
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet6   = 0x1c
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_amd64.go b/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_amd64.go
deleted file mode 100644
index cb8141f9c6..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_amd64.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_RECVTCLASS = 0x39
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PREFER_TEMPADDR = 0x3f
-
-	sysIPV6_BINDANY = 0x40
-
-	sysIPV6_MSFILTER = 0x4a
-
-	sysMCAST_JOIN_GROUP         = 0x50
-	sysMCAST_LEAVE_GROUP        = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-	sysMCAST_BLOCK_SOURCE       = 0x54
-	sysMCAST_UNBLOCK_SOURCE     = 0x55
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet6   = 0x1c
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_arm.go b/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_arm.go
deleted file mode 100644
index cb8141f9c6..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_freebsd_arm.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_RECVTCLASS = 0x39
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PREFER_TEMPADDR = 0x3f
-
-	sysIPV6_BINDANY = 0x40
-
-	sysIPV6_MSFILTER = 0x4a
-
-	sysMCAST_JOIN_GROUP         = 0x50
-	sysMCAST_LEAVE_GROUP        = 0x51
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x52
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x53
-	sysMCAST_BLOCK_SOURCE       = 0x54
-	sysMCAST_UNBLOCK_SOURCE     = 0x55
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet6   = 0x1c
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Len         uint8
-	Family      uint8
-	X__ss_pad1  [6]int8
-	X__ss_align int64
-	X__ss_pad2  [112]int8
-}
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     sockaddrStorage
-	Source    sockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_386.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_386.go
deleted file mode 100644
index f5a4109450..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_386.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_amd64.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_amd64.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_amd64.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm.go
deleted file mode 100644
index f5a4109450..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm64.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm64.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_arm64.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips.go
deleted file mode 100644
index f5a4109450..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64le.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64le.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mips64le.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mipsle.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mipsle.go
deleted file mode 100644
index f5a4109450..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_mipsle.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc.go
deleted file mode 100644
index be2dbd6661..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc.go
+++ /dev/null
@@ -1,168 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x84
-	sizeofGroupSourceReq = 0x104
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]uint8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64le.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64le.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_ppc64le.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_s390x.go b/installer/vendor/golang.org/x/net/ipv6/zsys_linux_s390x.go
deleted file mode 100644
index f9376b65ce..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_linux_s390x.go
+++ /dev/null
@@ -1,170 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_linux.go
-
-package ipv6
-
-const (
-	sysIPV6_ADDRFORM       = 0x1
-	sysIPV6_2292PKTINFO    = 0x2
-	sysIPV6_2292HOPOPTS    = 0x3
-	sysIPV6_2292DSTOPTS    = 0x4
-	sysIPV6_2292RTHDR      = 0x5
-	sysIPV6_2292PKTOPTIONS = 0x6
-	sysIPV6_CHECKSUM       = 0x7
-	sysIPV6_2292HOPLIMIT   = 0x8
-	sysIPV6_NEXTHOP        = 0x9
-	sysIPV6_FLOWINFO       = 0xb
-
-	sysIPV6_UNICAST_HOPS        = 0x10
-	sysIPV6_MULTICAST_IF        = 0x11
-	sysIPV6_MULTICAST_HOPS      = 0x12
-	sysIPV6_MULTICAST_LOOP      = 0x13
-	sysIPV6_ADD_MEMBERSHIP      = 0x14
-	sysIPV6_DROP_MEMBERSHIP     = 0x15
-	sysMCAST_JOIN_GROUP         = 0x2a
-	sysMCAST_LEAVE_GROUP        = 0x2d
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2e
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2f
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_MSFILTER           = 0x30
-	sysIPV6_ROUTER_ALERT        = 0x16
-	sysIPV6_MTU_DISCOVER        = 0x17
-	sysIPV6_MTU                 = 0x18
-	sysIPV6_RECVERR             = 0x19
-	sysIPV6_V6ONLY              = 0x1a
-	sysIPV6_JOIN_ANYCAST        = 0x1b
-	sysIPV6_LEAVE_ANYCAST       = 0x1c
-
-	sysIPV6_FLOWLABEL_MGR = 0x20
-	sysIPV6_FLOWINFO_SEND = 0x21
-
-	sysIPV6_IPSEC_POLICY = 0x22
-	sysIPV6_XFRM_POLICY  = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x31
-	sysIPV6_PKTINFO      = 0x32
-	sysIPV6_RECVHOPLIMIT = 0x33
-	sysIPV6_HOPLIMIT     = 0x34
-	sysIPV6_RECVHOPOPTS  = 0x35
-	sysIPV6_HOPOPTS      = 0x36
-	sysIPV6_RTHDRDSTOPTS = 0x37
-	sysIPV6_RECVRTHDR    = 0x38
-	sysIPV6_RTHDR        = 0x39
-	sysIPV6_RECVDSTOPTS  = 0x3a
-	sysIPV6_DSTOPTS      = 0x3b
-	sysIPV6_RECVPATHMTU  = 0x3c
-	sysIPV6_PATHMTU      = 0x3d
-	sysIPV6_DONTFRAG     = 0x3e
-
-	sysIPV6_RECVTCLASS = 0x42
-	sysIPV6_TCLASS     = 0x43
-
-	sysIPV6_ADDR_PREFERENCES = 0x48
-
-	sysIPV6_PREFER_SRC_TMP            = 0x1
-	sysIPV6_PREFER_SRC_PUBLIC         = 0x2
-	sysIPV6_PREFER_SRC_PUBTMP_DEFAULT = 0x100
-	sysIPV6_PREFER_SRC_COA            = 0x4
-	sysIPV6_PREFER_SRC_HOME           = 0x400
-	sysIPV6_PREFER_SRC_CGA            = 0x8
-	sysIPV6_PREFER_SRC_NONCGA         = 0x800
-
-	sysIPV6_MINHOPCOUNT = 0x49
-
-	sysIPV6_ORIGDSTADDR     = 0x4a
-	sysIPV6_RECVORIGDSTADDR = 0x4a
-	sysIPV6_TRANSPARENT     = 0x4b
-	sysIPV6_UNICAST_IF      = 0x4c
-
-	sysICMPV6_FILTER = 0x1
-
-	sysICMPV6_FILTER_BLOCK       = 0x1
-	sysICMPV6_FILTER_PASS        = 0x2
-	sysICMPV6_FILTER_BLOCKOTHERS = 0x3
-	sysICMPV6_FILTER_PASSONLY    = 0x4
-
-	sysSOL_SOCKET       = 0x1
-	sysSO_ATTACH_FILTER = 0x1a
-
-	sizeofKernelSockaddrStorage = 0x80
-	sizeofSockaddrInet6         = 0x1c
-	sizeofInet6Pktinfo          = 0x14
-	sizeofIPv6Mtuinfo           = 0x20
-	sizeofIPv6FlowlabelReq      = 0x20
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x88
-	sizeofGroupSourceReq = 0x108
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type kernelSockaddrStorage struct {
-	Family  uint16
-	X__data [126]int8
-}
-
-type sockaddrInet6 struct {
-	Family   uint16
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex int32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6FlowlabelReq struct {
-	Dst        [16]byte /* in6_addr */
-	Label      uint32
-	Action     uint8
-	Share      uint8
-	Flags      uint16
-	Expires    uint16
-	Linger     uint16
-	X__flr_pad uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Ifindex   int32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [4]byte
-	Group     kernelSockaddrStorage
-	Source    kernelSockaddrStorage
-}
-
-type icmpv6Filter struct {
-	Data [8]uint32
-}
-
-type sockFProg struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *sockFilter
-}
-
-type sockFilter struct {
-	Code uint16
-	Jt   uint8
-	Jf   uint8
-	K    uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_netbsd.go b/installer/vendor/golang.org/x/net/ipv6/zsys_netbsd.go
deleted file mode 100644
index bcada13b7a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_netbsd.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_netbsd.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_IPSEC_POLICY = 0x1c
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-	sysIPV6_PATHMTU     = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_RECVTCLASS = 0x39
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrInet6 = 0x1c
-	sizeofInet6Pktinfo  = 0x14
-	sizeofIPv6Mtuinfo   = 0x20
-
-	sizeofIPv6Mreq = 0x14
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_openbsd.go b/installer/vendor/golang.org/x/net/ipv6/zsys_openbsd.go
deleted file mode 100644
index 86cf3c6379..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_openbsd.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_openbsd.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x4
-	sysIPV6_MULTICAST_IF   = 0x9
-	sysIPV6_MULTICAST_HOPS = 0xa
-	sysIPV6_MULTICAST_LOOP = 0xb
-	sysIPV6_JOIN_GROUP     = 0xc
-	sysIPV6_LEAVE_GROUP    = 0xd
-	sysIPV6_PORTRANGE      = 0xe
-	sysICMP6_FILTER        = 0x12
-
-	sysIPV6_CHECKSUM = 0x1a
-	sysIPV6_V6ONLY   = 0x1b
-
-	sysIPV6_RTHDRDSTOPTS = 0x23
-
-	sysIPV6_RECVPKTINFO  = 0x24
-	sysIPV6_RECVHOPLIMIT = 0x25
-	sysIPV6_RECVRTHDR    = 0x26
-	sysIPV6_RECVHOPOPTS  = 0x27
-	sysIPV6_RECVDSTOPTS  = 0x28
-
-	sysIPV6_USE_MIN_MTU = 0x2a
-	sysIPV6_RECVPATHMTU = 0x2b
-
-	sysIPV6_PATHMTU = 0x2c
-
-	sysIPV6_PKTINFO  = 0x2e
-	sysIPV6_HOPLIMIT = 0x2f
-	sysIPV6_NEXTHOP  = 0x30
-	sysIPV6_HOPOPTS  = 0x31
-	sysIPV6_DSTOPTS  = 0x32
-	sysIPV6_RTHDR    = 0x33
-
-	sysIPV6_AUTH_LEVEL        = 0x35
-	sysIPV6_ESP_TRANS_LEVEL   = 0x36
-	sysIPV6_ESP_NETWORK_LEVEL = 0x37
-	sysIPSEC6_OUTSA           = 0x38
-	sysIPV6_RECVTCLASS        = 0x39
-
-	sysIPV6_AUTOFLOWLABEL = 0x3b
-	sysIPV6_IPCOMP_LEVEL  = 0x3c
-
-	sysIPV6_TCLASS   = 0x3d
-	sysIPV6_DONTFRAG = 0x3e
-	sysIPV6_PIPEX    = 0x3f
-
-	sysIPV6_RTABLE = 0x1021
-
-	sysIPV6_PORTRANGE_DEFAULT = 0x0
-	sysIPV6_PORTRANGE_HIGH    = 0x1
-	sysIPV6_PORTRANGE_LOW     = 0x2
-
-	sizeofSockaddrInet6 = 0x1c
-	sizeofInet6Pktinfo  = 0x14
-	sizeofIPv6Mtuinfo   = 0x20
-
-	sizeofIPv6Mreq = 0x14
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrInet6 struct {
-	Len      uint8
-	Family   uint8
-	Port     uint16
-	Flowinfo uint32
-	Addr     [16]byte /* in6_addr */
-	Scope_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type icmpv6Filter struct {
-	Filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/ipv6/zsys_solaris.go b/installer/vendor/golang.org/x/net/ipv6/zsys_solaris.go
deleted file mode 100644
index cf1837dd2a..0000000000
--- a/installer/vendor/golang.org/x/net/ipv6/zsys_solaris.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_solaris.go
-
-package ipv6
-
-const (
-	sysIPV6_UNICAST_HOPS   = 0x5
-	sysIPV6_MULTICAST_IF   = 0x6
-	sysIPV6_MULTICAST_HOPS = 0x7
-	sysIPV6_MULTICAST_LOOP = 0x8
-	sysIPV6_JOIN_GROUP     = 0x9
-	sysIPV6_LEAVE_GROUP    = 0xa
-
-	sysIPV6_PKTINFO = 0xb
-
-	sysIPV6_HOPLIMIT = 0xc
-	sysIPV6_NEXTHOP  = 0xd
-	sysIPV6_HOPOPTS  = 0xe
-	sysIPV6_DSTOPTS  = 0xf
-
-	sysIPV6_RTHDR        = 0x10
-	sysIPV6_RTHDRDSTOPTS = 0x11
-
-	sysIPV6_RECVPKTINFO  = 0x12
-	sysIPV6_RECVHOPLIMIT = 0x13
-	sysIPV6_RECVHOPOPTS  = 0x14
-
-	sysIPV6_RECVRTHDR = 0x16
-
-	sysIPV6_RECVRTHDRDSTOPTS = 0x17
-
-	sysIPV6_CHECKSUM        = 0x18
-	sysIPV6_RECVTCLASS      = 0x19
-	sysIPV6_USE_MIN_MTU     = 0x20
-	sysIPV6_DONTFRAG        = 0x21
-	sysIPV6_SEC_OPT         = 0x22
-	sysIPV6_SRC_PREFERENCES = 0x23
-	sysIPV6_RECVPATHMTU     = 0x24
-	sysIPV6_PATHMTU         = 0x25
-	sysIPV6_TCLASS          = 0x26
-	sysIPV6_V6ONLY          = 0x27
-
-	sysIPV6_RECVDSTOPTS = 0x28
-
-	sysMCAST_JOIN_GROUP         = 0x29
-	sysMCAST_LEAVE_GROUP        = 0x2a
-	sysMCAST_BLOCK_SOURCE       = 0x2b
-	sysMCAST_UNBLOCK_SOURCE     = 0x2c
-	sysMCAST_JOIN_SOURCE_GROUP  = 0x2d
-	sysMCAST_LEAVE_SOURCE_GROUP = 0x2e
-
-	sysIPV6_PREFER_SRC_HOME   = 0x1
-	sysIPV6_PREFER_SRC_COA    = 0x2
-	sysIPV6_PREFER_SRC_PUBLIC = 0x4
-	sysIPV6_PREFER_SRC_TMP    = 0x8
-	sysIPV6_PREFER_SRC_NONCGA = 0x10
-	sysIPV6_PREFER_SRC_CGA    = 0x20
-
-	sysIPV6_PREFER_SRC_MIPMASK    = 0x3
-	sysIPV6_PREFER_SRC_MIPDEFAULT = 0x1
-	sysIPV6_PREFER_SRC_TMPMASK    = 0xc
-	sysIPV6_PREFER_SRC_TMPDEFAULT = 0x4
-	sysIPV6_PREFER_SRC_CGAMASK    = 0x30
-	sysIPV6_PREFER_SRC_CGADEFAULT = 0x10
-
-	sysIPV6_PREFER_SRC_MASK = 0x3f
-
-	sysIPV6_PREFER_SRC_DEFAULT = 0x15
-
-	sysIPV6_BOUND_IF   = 0x41
-	sysIPV6_UNSPEC_SRC = 0x42
-
-	sysICMP6_FILTER = 0x1
-
-	sizeofSockaddrStorage = 0x100
-	sizeofSockaddrInet6   = 0x20
-	sizeofInet6Pktinfo    = 0x14
-	sizeofIPv6Mtuinfo     = 0x24
-
-	sizeofIPv6Mreq       = 0x14
-	sizeofGroupReq       = 0x104
-	sizeofGroupSourceReq = 0x204
-
-	sizeofICMPv6Filter = 0x20
-)
-
-type sockaddrStorage struct {
-	Family     uint16
-	X_ss_pad1  [6]int8
-	X_ss_align float64
-	X_ss_pad2  [240]int8
-}
-
-type sockaddrInet6 struct {
-	Family         uint16
-	Port           uint16
-	Flowinfo       uint32
-	Addr           [16]byte /* in6_addr */
-	Scope_id       uint32
-	X__sin6_src_id uint32
-}
-
-type inet6Pktinfo struct {
-	Addr    [16]byte /* in6_addr */
-	Ifindex uint32
-}
-
-type ipv6Mtuinfo struct {
-	Addr sockaddrInet6
-	Mtu  uint32
-}
-
-type ipv6Mreq struct {
-	Multiaddr [16]byte /* in6_addr */
-	Interface uint32
-}
-
-type groupReq struct {
-	Interface uint32
-	Pad_cgo_0 [256]byte
-}
-
-type groupSourceReq struct {
-	Interface uint32
-	Pad_cgo_0 [256]byte
-	Pad_cgo_1 [256]byte
-}
-
-type icmpv6Filter struct {
-	X__icmp6_filt [8]uint32
-}
diff --git a/installer/vendor/golang.org/x/net/lex/httplex/httplex.go b/installer/vendor/golang.org/x/net/lex/httplex/httplex.go
deleted file mode 100644
index 20f2b8940b..0000000000
--- a/installer/vendor/golang.org/x/net/lex/httplex/httplex.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package httplex contains rules around lexical matters of various
-// HTTP-related specifications.
-//
-// This package is shared by the standard library (which vendors it)
-// and x/net/http2. It comes with no API stability promise.
-package httplex
-
-import (
-	"net"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/net/idna"
-)
-
-var isTokenTable = [127]bool{
-	'!':  true,
-	'#':  true,
-	'$':  true,
-	'%':  true,
-	'&':  true,
-	'\'': true,
-	'*':  true,
-	'+':  true,
-	'-':  true,
-	'.':  true,
-	'0':  true,
-	'1':  true,
-	'2':  true,
-	'3':  true,
-	'4':  true,
-	'5':  true,
-	'6':  true,
-	'7':  true,
-	'8':  true,
-	'9':  true,
-	'A':  true,
-	'B':  true,
-	'C':  true,
-	'D':  true,
-	'E':  true,
-	'F':  true,
-	'G':  true,
-	'H':  true,
-	'I':  true,
-	'J':  true,
-	'K':  true,
-	'L':  true,
-	'M':  true,
-	'N':  true,
-	'O':  true,
-	'P':  true,
-	'Q':  true,
-	'R':  true,
-	'S':  true,
-	'T':  true,
-	'U':  true,
-	'W':  true,
-	'V':  true,
-	'X':  true,
-	'Y':  true,
-	'Z':  true,
-	'^':  true,
-	'_':  true,
-	'`':  true,
-	'a':  true,
-	'b':  true,
-	'c':  true,
-	'd':  true,
-	'e':  true,
-	'f':  true,
-	'g':  true,
-	'h':  true,
-	'i':  true,
-	'j':  true,
-	'k':  true,
-	'l':  true,
-	'm':  true,
-	'n':  true,
-	'o':  true,
-	'p':  true,
-	'q':  true,
-	'r':  true,
-	's':  true,
-	't':  true,
-	'u':  true,
-	'v':  true,
-	'w':  true,
-	'x':  true,
-	'y':  true,
-	'z':  true,
-	'|':  true,
-	'~':  true,
-}
-
-func IsTokenRune(r rune) bool {
-	i := int(r)
-	return i < len(isTokenTable) && isTokenTable[i]
-}
-
-func isNotToken(r rune) bool {
-	return !IsTokenRune(r)
-}
-
-// HeaderValuesContainsToken reports whether any string in values
-// contains the provided token, ASCII case-insensitively.
-func HeaderValuesContainsToken(values []string, token string) bool {
-	for _, v := range values {
-		if headerValueContainsToken(v, token) {
-			return true
-		}
-	}
-	return false
-}
-
-// isOWS reports whether b is an optional whitespace byte, as defined
-// by RFC 7230 section 3.2.3.
-func isOWS(b byte) bool { return b == ' ' || b == '\t' }
-
-// trimOWS returns x with all optional whitespace removes from the
-// beginning and end.
-func trimOWS(x string) string {
-	// TODO: consider using strings.Trim(x, " \t") instead,
-	// if and when it's fast enough. See issue 10292.
-	// But this ASCII-only code will probably always beat UTF-8
-	// aware code.
-	for len(x) > 0 && isOWS(x[0]) {
-		x = x[1:]
-	}
-	for len(x) > 0 && isOWS(x[len(x)-1]) {
-		x = x[:len(x)-1]
-	}
-	return x
-}
-
-// headerValueContainsToken reports whether v (assumed to be a
-// 0#element, in the ABNF extension described in RFC 7230 section 7)
-// contains token amongst its comma-separated tokens, ASCII
-// case-insensitively.
-func headerValueContainsToken(v string, token string) bool {
-	v = trimOWS(v)
-	if comma := strings.IndexByte(v, ','); comma != -1 {
-		return tokenEqual(trimOWS(v[:comma]), token) || headerValueContainsToken(v[comma+1:], token)
-	}
-	return tokenEqual(v, token)
-}
-
-// lowerASCII returns the ASCII lowercase version of b.
-func lowerASCII(b byte) byte {
-	if 'A' <= b && b <= 'Z' {
-		return b + ('a' - 'A')
-	}
-	return b
-}
-
-// tokenEqual reports whether t1 and t2 are equal, ASCII case-insensitively.
-func tokenEqual(t1, t2 string) bool {
-	if len(t1) != len(t2) {
-		return false
-	}
-	for i, b := range t1 {
-		if b >= utf8.RuneSelf {
-			// No UTF-8 or non-ASCII allowed in tokens.
-			return false
-		}
-		if lowerASCII(byte(b)) != lowerASCII(t2[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// isLWS reports whether b is linear white space, according
-// to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
-//      LWS            = [CRLF] 1*( SP | HT )
-func isLWS(b byte) bool { return b == ' ' || b == '\t' }
-
-// isCTL reports whether b is a control byte, according
-// to http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2
-//      CTL            = <any US-ASCII control character
-//                       (octets 0 - 31) and DEL (127)>
-func isCTL(b byte) bool {
-	const del = 0x7f // a CTL
-	return b < ' ' || b == del
-}
-
-// ValidHeaderFieldName reports whether v is a valid HTTP/1.x header name.
-// HTTP/2 imposes the additional restriction that uppercase ASCII
-// letters are not allowed.
-//
-//  RFC 7230 says:
-//   header-field   = field-name ":" OWS field-value OWS
-//   field-name     = token
-//   token          = 1*tchar
-//   tchar = "!" / "#" / "$" / "%" / "&" / "'" / "*" / "+" / "-" / "." /
-//           "^" / "_" / "`" / "|" / "~" / DIGIT / ALPHA
-func ValidHeaderFieldName(v string) bool {
-	if len(v) == 0 {
-		return false
-	}
-	for _, r := range v {
-		if !IsTokenRune(r) {
-			return false
-		}
-	}
-	return true
-}
-
-// ValidHostHeader reports whether h is a valid host header.
-func ValidHostHeader(h string) bool {
-	// The latest spec is actually this:
-	//
-	// http://tools.ietf.org/html/rfc7230#section-5.4
-	//     Host = uri-host [ ":" port ]
-	//
-	// Where uri-host is:
-	//     http://tools.ietf.org/html/rfc3986#section-3.2.2
-	//
-	// But we're going to be much more lenient for now and just
-	// search for any byte that's not a valid byte in any of those
-	// expressions.
-	for i := 0; i < len(h); i++ {
-		if !validHostByte[h[i]] {
-			return false
-		}
-	}
-	return true
-}
-
-// See the validHostHeader comment.
-var validHostByte = [256]bool{
-	'0': true, '1': true, '2': true, '3': true, '4': true, '5': true, '6': true, '7': true,
-	'8': true, '9': true,
-
-	'a': true, 'b': true, 'c': true, 'd': true, 'e': true, 'f': true, 'g': true, 'h': true,
-	'i': true, 'j': true, 'k': true, 'l': true, 'm': true, 'n': true, 'o': true, 'p': true,
-	'q': true, 'r': true, 's': true, 't': true, 'u': true, 'v': true, 'w': true, 'x': true,
-	'y': true, 'z': true,
-
-	'A': true, 'B': true, 'C': true, 'D': true, 'E': true, 'F': true, 'G': true, 'H': true,
-	'I': true, 'J': true, 'K': true, 'L': true, 'M': true, 'N': true, 'O': true, 'P': true,
-	'Q': true, 'R': true, 'S': true, 'T': true, 'U': true, 'V': true, 'W': true, 'X': true,
-	'Y': true, 'Z': true,
-
-	'!':  true, // sub-delims
-	'$':  true, // sub-delims
-	'%':  true, // pct-encoded (and used in IPv6 zones)
-	'&':  true, // sub-delims
-	'(':  true, // sub-delims
-	')':  true, // sub-delims
-	'*':  true, // sub-delims
-	'+':  true, // sub-delims
-	',':  true, // sub-delims
-	'-':  true, // unreserved
-	'.':  true, // unreserved
-	':':  true, // IPv6address + Host expression's optional port
-	';':  true, // sub-delims
-	'=':  true, // sub-delims
-	'[':  true,
-	'\'': true, // sub-delims
-	']':  true,
-	'_':  true, // unreserved
-	'~':  true, // unreserved
-}
-
-// ValidHeaderFieldValue reports whether v is a valid "field-value" according to
-// http://www.w3.org/Protocols/rfc2616/rfc2616-sec4.html#sec4.2 :
-//
-//        message-header = field-name ":" [ field-value ]
-//        field-value    = *( field-content | LWS )
-//        field-content  = <the OCTETs making up the field-value
-//                         and consisting of either *TEXT or combinations
-//                         of token, separators, and quoted-string>
-//
-// http://www.w3.org/Protocols/rfc2616/rfc2616-sec2.html#sec2.2 :
-//
-//        TEXT           = <any OCTET except CTLs,
-//                          but including LWS>
-//        LWS            = [CRLF] 1*( SP | HT )
-//        CTL            = <any US-ASCII control character
-//                         (octets 0 - 31) and DEL (127)>
-//
-// RFC 7230 says:
-//  field-value    = *( field-content / obs-fold )
-//  obj-fold       =  N/A to http2, and deprecated
-//  field-content  = field-vchar [ 1*( SP / HTAB ) field-vchar ]
-//  field-vchar    = VCHAR / obs-text
-//  obs-text       = %x80-FF
-//  VCHAR          = "any visible [USASCII] character"
-//
-// http2 further says: "Similarly, HTTP/2 allows header field values
-// that are not valid. While most of the values that can be encoded
-// will not alter header field parsing, carriage return (CR, ASCII
-// 0xd), line feed (LF, ASCII 0xa), and the zero character (NUL, ASCII
-// 0x0) might be exploited by an attacker if they are translated
-// verbatim. Any request or response that contains a character not
-// permitted in a header field value MUST be treated as malformed
-// (Section 8.1.2.6). Valid characters are defined by the
-// field-content ABNF rule in Section 3.2 of [RFC7230]."
-//
-// This function does not (yet?) properly handle the rejection of
-// strings that begin or end with SP or HTAB.
-func ValidHeaderFieldValue(v string) bool {
-	for i := 0; i < len(v); i++ {
-		b := v[i]
-		if isCTL(b) && !isLWS(b) {
-			return false
-		}
-	}
-	return true
-}
-
-func isASCII(s string) bool {
-	for i := 0; i < len(s); i++ {
-		if s[i] >= utf8.RuneSelf {
-			return false
-		}
-	}
-	return true
-}
-
-// PunycodeHostPort returns the IDNA Punycode version
-// of the provided "host" or "host:port" string.
-func PunycodeHostPort(v string) (string, error) {
-	if isASCII(v) {
-		return v, nil
-	}
-
-	host, port, err := net.SplitHostPort(v)
-	if err != nil {
-		// The input 'v' argument was just a "host" argument,
-		// without a port. This error should not be returned
-		// to the caller.
-		host = v
-		port = ""
-	}
-	host, err = idna.ToASCII(host)
-	if err != nil {
-		// Non-UTF-8? Not representable in Punycode, in any
-		// case.
-		return "", err
-	}
-	if port == "" {
-		return host, nil
-	}
-	return net.JoinHostPort(host, port), nil
-}
diff --git a/installer/vendor/golang.org/x/net/lex/httplex/httplex_test.go b/installer/vendor/golang.org/x/net/lex/httplex/httplex_test.go
deleted file mode 100644
index f47adc939f..0000000000
--- a/installer/vendor/golang.org/x/net/lex/httplex/httplex_test.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package httplex
-
-import (
-	"testing"
-)
-
-func isChar(c rune) bool { return c <= 127 }
-
-func isCtl(c rune) bool { return c <= 31 || c == 127 }
-
-func isSeparator(c rune) bool {
-	switch c {
-	case '(', ')', '<', '>', '@', ',', ';', ':', '\\', '"', '/', '[', ']', '?', '=', '{', '}', ' ', '\t':
-		return true
-	}
-	return false
-}
-
-func TestIsToken(t *testing.T) {
-	for i := 0; i <= 130; i++ {
-		r := rune(i)
-		expected := isChar(r) && !isCtl(r) && !isSeparator(r)
-		if IsTokenRune(r) != expected {
-			t.Errorf("isToken(0x%x) = %v", r, !expected)
-		}
-	}
-}
-
-func TestHeaderValuesContainsToken(t *testing.T) {
-	tests := []struct {
-		vals  []string
-		token string
-		want  bool
-	}{
-		{
-			vals:  []string{"foo"},
-			token: "foo",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar", "foo"},
-			token: "foo",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo"},
-			token: "bar",
-			want:  false,
-		},
-		{
-			vals:  []string{" foo "},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar,foo,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar , foo"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"foo ,bar "},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar, foo ,bar"},
-			token: "FOO",
-			want:  true,
-		},
-		{
-			vals:  []string{"bar , foo"},
-			token: "FOO",
-			want:  true,
-		},
-	}
-	for _, tt := range tests {
-		got := HeaderValuesContainsToken(tt.vals, tt.token)
-		if got != tt.want {
-			t.Errorf("headerValuesContainsToken(%q, %q) = %v; want %v", tt.vals, tt.token, got, tt.want)
-		}
-	}
-}
-
-func TestPunycodeHostPort(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"www.google.com", "www.google.com"},
-		{"гофер.рф", "xn--c1ae0ajs.xn--p1ai"},
-		{"bücher.de", "xn--bcher-kva.de"},
-		{"bücher.de:8080", "xn--bcher-kva.de:8080"},
-		{"[1::6]:8080", "[1::6]:8080"},
-	}
-	for _, tt := range tests {
-		got, err := PunycodeHostPort(tt.in)
-		if tt.want != got || err != nil {
-			t.Errorf("PunycodeHostPort(%q) = %q, %v, want %q, nil", tt.in, got, err, tt.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/lif/address.go b/installer/vendor/golang.org/x/net/lif/address.go
deleted file mode 100644
index afb957fd8e..0000000000
--- a/installer/vendor/golang.org/x/net/lif/address.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import (
-	"errors"
-	"unsafe"
-)
-
-// An Addr represents an address associated with packet routing.
-type Addr interface {
-	// Family returns an address family.
-	Family() int
-}
-
-// An Inet4Addr represents an internet address for IPv4.
-type Inet4Addr struct {
-	IP        [4]byte // IP address
-	PrefixLen int     // address prefix length
-}
-
-// Family implements the Family method of Addr interface.
-func (a *Inet4Addr) Family() int { return sysAF_INET }
-
-// An Inet6Addr represents an internet address for IPv6.
-type Inet6Addr struct {
-	IP        [16]byte // IP address
-	PrefixLen int      // address prefix length
-	ZoneID    int      // zone identifier
-}
-
-// Family implements the Family method of Addr interface.
-func (a *Inet6Addr) Family() int { return sysAF_INET6 }
-
-// Addrs returns a list of interface addresses.
-//
-// The provided af must be an address family and name must be a data
-// link name. The zero value of af or name means a wildcard.
-func Addrs(af int, name string) ([]Addr, error) {
-	eps, err := newEndpoints(af)
-	if len(eps) == 0 {
-		return nil, err
-	}
-	defer func() {
-		for _, ep := range eps {
-			ep.close()
-		}
-	}()
-	lls, err := links(eps, name)
-	if len(lls) == 0 {
-		return nil, err
-	}
-	var as []Addr
-	for _, ll := range lls {
-		var lifr lifreq
-		for i := 0; i < len(ll.Name); i++ {
-			lifr.Name[i] = int8(ll.Name[i])
-		}
-		for _, ep := range eps {
-			ioc := int64(sysSIOCGLIFADDR)
-			err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifr))
-			if err != nil {
-				continue
-			}
-			sa := (*sockaddrStorage)(unsafe.Pointer(&lifr.Lifru[0]))
-			l := int(nativeEndian.Uint32(lifr.Lifru1[:4]))
-			if l == 0 {
-				continue
-			}
-			switch sa.Family {
-			case sysAF_INET:
-				a := &Inet4Addr{PrefixLen: l}
-				copy(a.IP[:], lifr.Lifru[4:8])
-				as = append(as, a)
-			case sysAF_INET6:
-				a := &Inet6Addr{PrefixLen: l, ZoneID: int(nativeEndian.Uint32(lifr.Lifru[24:28]))}
-				copy(a.IP[:], lifr.Lifru[8:24])
-				as = append(as, a)
-			}
-		}
-	}
-	return as, nil
-}
-
-func parseLinkAddr(b []byte) ([]byte, error) {
-	nlen, alen, slen := int(b[1]), int(b[2]), int(b[3])
-	l := 4 + nlen + alen + slen
-	if len(b) < l {
-		return nil, errors.New("invalid address")
-	}
-	b = b[4:]
-	var addr []byte
-	if nlen > 0 {
-		b = b[nlen:]
-	}
-	if alen > 0 {
-		addr = make([]byte, alen)
-		copy(addr, b[:alen])
-	}
-	return addr, nil
-}
diff --git a/installer/vendor/golang.org/x/net/lif/address_test.go b/installer/vendor/golang.org/x/net/lif/address_test.go
deleted file mode 100644
index f62ed93471..0000000000
--- a/installer/vendor/golang.org/x/net/lif/address_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import (
-	"fmt"
-	"testing"
-)
-
-type addrFamily int
-
-func (af addrFamily) String() string {
-	switch af {
-	case sysAF_UNSPEC:
-		return "unspec"
-	case sysAF_INET:
-		return "inet4"
-	case sysAF_INET6:
-		return "inet6"
-	default:
-		return fmt.Sprintf("%d", af)
-	}
-}
-
-const hexDigit = "0123456789abcdef"
-
-type llAddr []byte
-
-func (a llAddr) String() string {
-	if len(a) == 0 {
-		return ""
-	}
-	buf := make([]byte, 0, len(a)*3-1)
-	for i, b := range a {
-		if i > 0 {
-			buf = append(buf, ':')
-		}
-		buf = append(buf, hexDigit[b>>4])
-		buf = append(buf, hexDigit[b&0xF])
-	}
-	return string(buf)
-}
-
-type ipAddr []byte
-
-func (a ipAddr) String() string {
-	if len(a) == 0 {
-		return "<nil>"
-	}
-	if len(a) == 4 {
-		return fmt.Sprintf("%d.%d.%d.%d", a[0], a[1], a[2], a[3])
-	}
-	if len(a) == 16 {
-		return fmt.Sprintf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15])
-	}
-	s := make([]byte, len(a)*2)
-	for i, tn := range a {
-		s[i*2], s[i*2+1] = hexDigit[tn>>4], hexDigit[tn&0xf]
-	}
-	return string(s)
-}
-
-func (a *Inet4Addr) String() string {
-	return fmt.Sprintf("(%s %s %d)", addrFamily(a.Family()), ipAddr(a.IP[:]), a.PrefixLen)
-}
-
-func (a *Inet6Addr) String() string {
-	return fmt.Sprintf("(%s %s %d %d)", addrFamily(a.Family()), ipAddr(a.IP[:]), a.PrefixLen, a.ZoneID)
-}
-
-type addrPack struct {
-	af int
-	as []Addr
-}
-
-func addrPacks() ([]addrPack, error) {
-	var aps []addrPack
-	for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		as, err := Addrs(af, "")
-		if err != nil {
-			return nil, err
-		}
-		aps = append(aps, addrPack{af: af, as: as})
-	}
-	return aps, nil
-}
-
-func TestAddrs(t *testing.T) {
-	aps, err := addrPacks()
-	if len(aps) == 0 && err != nil {
-		t.Fatal(err)
-	}
-	lps, err := linkPacks()
-	if len(lps) == 0 && err != nil {
-		t.Fatal(err)
-	}
-	for _, lp := range lps {
-		n := 0
-		for _, ll := range lp.lls {
-			as, err := Addrs(lp.af, ll.Name)
-			if err != nil {
-				t.Fatal(lp.af, ll.Name, err)
-			}
-			t.Logf("af=%s name=%s %v", addrFamily(lp.af), ll.Name, as)
-			n += len(as)
-		}
-		for _, ap := range aps {
-			if ap.af != lp.af {
-				continue
-			}
-			if n != len(ap.as) {
-				t.Errorf("af=%s got %d; want %d", addrFamily(lp.af), n, len(ap.as))
-				continue
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/lif/binary.go b/installer/vendor/golang.org/x/net/lif/binary.go
deleted file mode 100644
index 738a94f422..0000000000
--- a/installer/vendor/golang.org/x/net/lif/binary.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-// This file contains duplicates of encoding/binary package.
-//
-// This package is supposed to be used by the net package of standard
-// library. Therefore the package set used in the package must be the
-// same as net package.
-
-var (
-	littleEndian binaryLittleEndian
-	bigEndian    binaryBigEndian
-)
-
-type binaryByteOrder interface {
-	Uint16([]byte) uint16
-	Uint32([]byte) uint32
-	Uint64([]byte) uint64
-	PutUint16([]byte, uint16)
-	PutUint32([]byte, uint32)
-	PutUint64([]byte, uint64)
-}
-
-type binaryLittleEndian struct{}
-
-func (binaryLittleEndian) Uint16(b []byte) uint16 {
-	_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint16(b[0]) | uint16(b[1])<<8
-}
-
-func (binaryLittleEndian) PutUint16(b []byte, v uint16) {
-	_ = b[1] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-}
-
-func (binaryLittleEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (binaryLittleEndian) PutUint32(b []byte, v uint32) {
-	_ = b[3] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-}
-
-func (binaryLittleEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-func (binaryLittleEndian) PutUint64(b []byte, v uint64) {
-	_ = b[7] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	b[4] = byte(v >> 32)
-	b[5] = byte(v >> 40)
-	b[6] = byte(v >> 48)
-	b[7] = byte(v >> 56)
-}
-
-type binaryBigEndian struct{}
-
-func (binaryBigEndian) Uint16(b []byte) uint16 {
-	_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint16(b[1]) | uint16(b[0])<<8
-}
-
-func (binaryBigEndian) PutUint16(b []byte, v uint16) {
-	_ = b[1] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v >> 8)
-	b[1] = byte(v)
-}
-
-func (binaryBigEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (binaryBigEndian) PutUint32(b []byte, v uint32) {
-	_ = b[3] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-}
-
-func (binaryBigEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
-
-func (binaryBigEndian) PutUint64(b []byte, v uint64) {
-	_ = b[7] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v >> 56)
-	b[1] = byte(v >> 48)
-	b[2] = byte(v >> 40)
-	b[3] = byte(v >> 32)
-	b[4] = byte(v >> 24)
-	b[5] = byte(v >> 16)
-	b[6] = byte(v >> 8)
-	b[7] = byte(v)
-}
diff --git a/installer/vendor/golang.org/x/net/lif/defs_solaris.go b/installer/vendor/golang.org/x/net/lif/defs_solaris.go
deleted file mode 100644
index 8b84ba5e33..0000000000
--- a/installer/vendor/golang.org/x/net/lif/defs_solaris.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package lif
-
-/*
-#include <sys/socket.h>
-#include <sys/sockio.h>
-
-#include <net/if.h>
-#include <net/if_types.h>
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_DGRAM = C.SOCK_DGRAM
-)
-
-type sockaddrStorage C.struct_sockaddr_storage
-
-const (
-	sysLIFC_NOXMIT          = C.LIFC_NOXMIT
-	sysLIFC_EXTERNAL_SOURCE = C.LIFC_EXTERNAL_SOURCE
-	sysLIFC_TEMPORARY       = C.LIFC_TEMPORARY
-	sysLIFC_ALLZONES        = C.LIFC_ALLZONES
-	sysLIFC_UNDER_IPMP      = C.LIFC_UNDER_IPMP
-	sysLIFC_ENABLED         = C.LIFC_ENABLED
-
-	sysSIOCGLIFADDR    = C.SIOCGLIFADDR
-	sysSIOCGLIFDSTADDR = C.SIOCGLIFDSTADDR
-	sysSIOCGLIFFLAGS   = C.SIOCGLIFFLAGS
-	sysSIOCGLIFMTU     = C.SIOCGLIFMTU
-	sysSIOCGLIFNETMASK = C.SIOCGLIFNETMASK
-	sysSIOCGLIFMETRIC  = C.SIOCGLIFMETRIC
-	sysSIOCGLIFNUM     = C.SIOCGLIFNUM
-	sysSIOCGLIFINDEX   = C.SIOCGLIFINDEX
-	sysSIOCGLIFSUBNET  = C.SIOCGLIFSUBNET
-	sysSIOCGLIFLNKINFO = C.SIOCGLIFLNKINFO
-	sysSIOCGLIFCONF    = C.SIOCGLIFCONF
-	sysSIOCGLIFHWADDR  = C.SIOCGLIFHWADDR
-)
-
-const (
-	sysIFF_UP          = C.IFF_UP
-	sysIFF_BROADCAST   = C.IFF_BROADCAST
-	sysIFF_DEBUG       = C.IFF_DEBUG
-	sysIFF_LOOPBACK    = C.IFF_LOOPBACK
-	sysIFF_POINTOPOINT = C.IFF_POINTOPOINT
-	sysIFF_NOTRAILERS  = C.IFF_NOTRAILERS
-	sysIFF_RUNNING     = C.IFF_RUNNING
-	sysIFF_NOARP       = C.IFF_NOARP
-	sysIFF_PROMISC     = C.IFF_PROMISC
-	sysIFF_ALLMULTI    = C.IFF_ALLMULTI
-	sysIFF_INTELLIGENT = C.IFF_INTELLIGENT
-	sysIFF_MULTICAST   = C.IFF_MULTICAST
-	sysIFF_MULTI_BCAST = C.IFF_MULTI_BCAST
-	sysIFF_UNNUMBERED  = C.IFF_UNNUMBERED
-	sysIFF_PRIVATE     = C.IFF_PRIVATE
-)
-
-const (
-	sizeofLifnum       = C.sizeof_struct_lifnum
-	sizeofLifreq       = C.sizeof_struct_lifreq
-	sizeofLifconf      = C.sizeof_struct_lifconf
-	sizeofLifIfinfoReq = C.sizeof_struct_lif_ifinfo_req
-)
-
-type sysLifnum C.struct_lifnum
-
-type lifreq C.struct_lifreq
-
-type lifconf C.struct_lifconf
-
-type lifIfinfoReq C.struct_lif_ifinfo_req
-
-const (
-	sysIFT_IPV4 = C.IFT_IPV4
-	sysIFT_IPV6 = C.IFT_IPV6
-	sysIFT_6TO4 = C.IFT_6TO4
-)
diff --git a/installer/vendor/golang.org/x/net/lif/lif.go b/installer/vendor/golang.org/x/net/lif/lif.go
deleted file mode 100644
index 6e81f81f1c..0000000000
--- a/installer/vendor/golang.org/x/net/lif/lif.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-// Package lif provides basic functions for the manipulation of
-// logical network interfaces and interface addresses on Solaris.
-//
-// The package supports Solaris 11 or above.
-package lif
-
-import "syscall"
-
-type endpoint struct {
-	af int
-	s  uintptr
-}
-
-func (ep *endpoint) close() error {
-	return syscall.Close(int(ep.s))
-}
-
-func newEndpoints(af int) ([]endpoint, error) {
-	var lastErr error
-	var eps []endpoint
-	afs := []int{sysAF_INET, sysAF_INET6}
-	if af != sysAF_UNSPEC {
-		afs = []int{af}
-	}
-	for _, af := range afs {
-		s, err := syscall.Socket(af, sysSOCK_DGRAM, 0)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-		eps = append(eps, endpoint{af: af, s: uintptr(s)})
-	}
-	if len(eps) == 0 {
-		return nil, lastErr
-	}
-	return eps, nil
-}
diff --git a/installer/vendor/golang.org/x/net/lif/link.go b/installer/vendor/golang.org/x/net/lif/link.go
deleted file mode 100644
index fce6b2147f..0000000000
--- a/installer/vendor/golang.org/x/net/lif/link.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import "unsafe"
-
-// A Link represents logical data link information.
-//
-// It also represents base information for logical network interface.
-// On Solaris, each logical network interface represents network layer
-// adjacency information and the interface has a only single network
-// address or address pair for tunneling. It's usual that multiple
-// logical network interfaces share the same logical data link.
-type Link struct {
-	Name  string // name, equivalent to IP interface name
-	Index int    // index, equivalent to IP interface index
-	Type  int    // type
-	Flags int    // flags
-	MTU   int    // maximum transmission unit, basically link MTU but may differ between IP address families
-	Addr  []byte // address
-}
-
-func (ll *Link) fetch(s uintptr) {
-	var lifr lifreq
-	for i := 0; i < len(ll.Name); i++ {
-		lifr.Name[i] = int8(ll.Name[i])
-	}
-	ioc := int64(sysSIOCGLIFINDEX)
-	if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
-		ll.Index = int(nativeEndian.Uint32(lifr.Lifru[:4]))
-	}
-	ioc = int64(sysSIOCGLIFFLAGS)
-	if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
-		ll.Flags = int(nativeEndian.Uint64(lifr.Lifru[:8]))
-	}
-	ioc = int64(sysSIOCGLIFMTU)
-	if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
-		ll.MTU = int(nativeEndian.Uint32(lifr.Lifru[:4]))
-	}
-	switch ll.Type {
-	case sysIFT_IPV4, sysIFT_IPV6, sysIFT_6TO4:
-	default:
-		ioc = int64(sysSIOCGLIFHWADDR)
-		if err := ioctl(s, uintptr(ioc), unsafe.Pointer(&lifr)); err == nil {
-			ll.Addr, _ = parseLinkAddr(lifr.Lifru[4:])
-		}
-	}
-}
-
-// Links returns a list of logical data links.
-//
-// The provided af must be an address family and name must be a data
-// link name. The zero value of af or name means a wildcard.
-func Links(af int, name string) ([]Link, error) {
-	eps, err := newEndpoints(af)
-	if len(eps) == 0 {
-		return nil, err
-	}
-	defer func() {
-		for _, ep := range eps {
-			ep.close()
-		}
-	}()
-	return links(eps, name)
-}
-
-func links(eps []endpoint, name string) ([]Link, error) {
-	var lls []Link
-	lifn := sysLifnum{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
-	lifc := lifconf{Flags: sysLIFC_NOXMIT | sysLIFC_TEMPORARY | sysLIFC_ALLZONES | sysLIFC_UNDER_IPMP}
-	for _, ep := range eps {
-		lifn.Family = uint16(ep.af)
-		ioc := int64(sysSIOCGLIFNUM)
-		if err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifn)); err != nil {
-			continue
-		}
-		if lifn.Count == 0 {
-			continue
-		}
-		b := make([]byte, lifn.Count*sizeofLifreq)
-		lifc.Family = uint16(ep.af)
-		lifc.Len = lifn.Count * sizeofLifreq
-		if len(lifc.Lifcu) == 8 {
-			nativeEndian.PutUint64(lifc.Lifcu[:], uint64(uintptr(unsafe.Pointer(&b[0]))))
-		} else {
-			nativeEndian.PutUint32(lifc.Lifcu[:], uint32(uintptr(unsafe.Pointer(&b[0]))))
-		}
-		ioc = int64(sysSIOCGLIFCONF)
-		if err := ioctl(ep.s, uintptr(ioc), unsafe.Pointer(&lifc)); err != nil {
-			continue
-		}
-		nb := make([]byte, 32) // see LIFNAMSIZ in net/if.h
-		for i := 0; i < int(lifn.Count); i++ {
-			lifr := (*lifreq)(unsafe.Pointer(&b[i*sizeofLifreq]))
-			for i := 0; i < 32; i++ {
-				if lifr.Name[i] == 0 {
-					nb = nb[:i]
-					break
-				}
-				nb[i] = byte(lifr.Name[i])
-			}
-			llname := string(nb)
-			nb = nb[:32]
-			if isDupLink(lls, llname) || name != "" && name != llname {
-				continue
-			}
-			ll := Link{Name: llname, Type: int(lifr.Type)}
-			ll.fetch(ep.s)
-			lls = append(lls, ll)
-		}
-	}
-	return lls, nil
-}
-
-func isDupLink(lls []Link, name string) bool {
-	for _, ll := range lls {
-		if ll.Name == name {
-			return true
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/lif/link_test.go b/installer/vendor/golang.org/x/net/lif/link_test.go
deleted file mode 100644
index 8fb2bf6f34..0000000000
--- a/installer/vendor/golang.org/x/net/lif/link_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import (
-	"fmt"
-	"testing"
-)
-
-func (ll *Link) String() string {
-	return fmt.Sprintf("name=%s index=%d type=%d flags=%#x mtu=%d addr=%v", ll.Name, ll.Index, ll.Type, ll.Flags, ll.MTU, llAddr(ll.Addr))
-}
-
-type linkPack struct {
-	af  int
-	lls []Link
-}
-
-func linkPacks() ([]linkPack, error) {
-	var lps []linkPack
-	for _, af := range [...]int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		lls, err := Links(af, "")
-		if err != nil {
-			return nil, err
-		}
-		lps = append(lps, linkPack{af: af, lls: lls})
-	}
-	return lps, nil
-}
-
-func TestLinks(t *testing.T) {
-	lps, err := linkPacks()
-	if len(lps) == 0 && err != nil {
-		t.Fatal(err)
-	}
-	for _, lp := range lps {
-		n := 0
-		for _, sll := range lp.lls {
-			lls, err := Links(lp.af, sll.Name)
-			if err != nil {
-				t.Fatal(lp.af, sll.Name, err)
-			}
-			for _, ll := range lls {
-				if ll.Name != sll.Name || ll.Index != sll.Index {
-					t.Errorf("af=%s got %v; want %v", addrFamily(lp.af), &ll, &sll)
-					continue
-				}
-				t.Logf("af=%s name=%s %v", addrFamily(lp.af), sll.Name, &ll)
-				n++
-			}
-		}
-		if n != len(lp.lls) {
-			t.Errorf("af=%s got %d; want %d", addrFamily(lp.af), n, len(lp.lls))
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/lif/sys.go b/installer/vendor/golang.org/x/net/lif/sys.go
deleted file mode 100644
index c896041b7b..0000000000
--- a/installer/vendor/golang.org/x/net/lif/sys.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import "unsafe"
-
-var nativeEndian binaryByteOrder
-
-func init() {
-	i := uint32(1)
-	b := (*[4]byte)(unsafe.Pointer(&i))
-	if b[0] == 1 {
-		nativeEndian = littleEndian
-	} else {
-		nativeEndian = bigEndian
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/lif/sys_solaris_amd64.s b/installer/vendor/golang.org/x/net/lif/sys_solaris_amd64.s
deleted file mode 100644
index 39d76af794..0000000000
--- a/installer/vendor/golang.org/x/net/lif/sys_solaris_amd64.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT ·sysvicall6(SB),NOSPLIT,$0-88
-	JMP	syscall·sysvicall6(SB)
diff --git a/installer/vendor/golang.org/x/net/lif/syscall.go b/installer/vendor/golang.org/x/net/lif/syscall.go
deleted file mode 100644
index aadab2e14b..0000000000
--- a/installer/vendor/golang.org/x/net/lif/syscall.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build solaris
-
-package lif
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-//go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
-
-//go:linkname procIoctl libc_ioctl
-
-var procIoctl uintptr
-
-func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (uintptr, uintptr, syscall.Errno)
-
-func ioctl(s, ioc uintptr, arg unsafe.Pointer) error {
-	_, _, errno := sysvicall6(uintptr(unsafe.Pointer(&procIoctl)), 3, s, ioc, uintptr(arg), 0, 0, 0)
-	if errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/lif/zsys_solaris_amd64.go b/installer/vendor/golang.org/x/net/lif/zsys_solaris_amd64.go
deleted file mode 100644
index 94231c49c9..0000000000
--- a/installer/vendor/golang.org/x/net/lif/zsys_solaris_amd64.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_solaris.go
-
-package lif
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_INET6  = 0x1a
-
-	sysSOCK_DGRAM = 0x1
-)
-
-type sockaddrStorage struct {
-	Family     uint16
-	X_ss_pad1  [6]int8
-	X_ss_align float64
-	X_ss_pad2  [240]int8
-}
-
-const (
-	sysLIFC_NOXMIT          = 0x1
-	sysLIFC_EXTERNAL_SOURCE = 0x2
-	sysLIFC_TEMPORARY       = 0x4
-	sysLIFC_ALLZONES        = 0x8
-	sysLIFC_UNDER_IPMP      = 0x10
-	sysLIFC_ENABLED         = 0x20
-
-	sysSIOCGLIFADDR    = -0x3f87968f
-	sysSIOCGLIFDSTADDR = -0x3f87968d
-	sysSIOCGLIFFLAGS   = -0x3f87968b
-	sysSIOCGLIFMTU     = -0x3f879686
-	sysSIOCGLIFNETMASK = -0x3f879683
-	sysSIOCGLIFMETRIC  = -0x3f879681
-	sysSIOCGLIFNUM     = -0x3ff3967e
-	sysSIOCGLIFINDEX   = -0x3f87967b
-	sysSIOCGLIFSUBNET  = -0x3f879676
-	sysSIOCGLIFLNKINFO = -0x3f879674
-	sysSIOCGLIFCONF    = -0x3fef965b
-	sysSIOCGLIFHWADDR  = -0x3f879640
-)
-
-const (
-	sysIFF_UP          = 0x1
-	sysIFF_BROADCAST   = 0x2
-	sysIFF_DEBUG       = 0x4
-	sysIFF_LOOPBACK    = 0x8
-	sysIFF_POINTOPOINT = 0x10
-	sysIFF_NOTRAILERS  = 0x20
-	sysIFF_RUNNING     = 0x40
-	sysIFF_NOARP       = 0x80
-	sysIFF_PROMISC     = 0x100
-	sysIFF_ALLMULTI    = 0x200
-	sysIFF_INTELLIGENT = 0x400
-	sysIFF_MULTICAST   = 0x800
-	sysIFF_MULTI_BCAST = 0x1000
-	sysIFF_UNNUMBERED  = 0x2000
-	sysIFF_PRIVATE     = 0x8000
-)
-
-const (
-	sizeofLifnum       = 0xc
-	sizeofLifreq       = 0x178
-	sizeofLifconf      = 0x18
-	sizeofLifIfinfoReq = 0x10
-)
-
-type sysLifnum struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Count     int32
-}
-
-type lifreq struct {
-	Name   [32]int8
-	Lifru1 [4]byte
-	Type   uint32
-	Lifru  [336]byte
-}
-
-type lifconf struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Len       int32
-	Pad_cgo_1 [4]byte
-	Lifcu     [8]byte
-}
-
-type lifIfinfoReq struct {
-	Maxhops      uint8
-	Pad_cgo_0    [3]byte
-	Reachtime    uint32
-	Reachretrans uint32
-	Maxmtu       uint32
-}
-
-const (
-	sysIFT_IPV4 = 0xc8
-	sysIFT_IPV6 = 0xc9
-	sysIFT_6TO4 = 0xca
-)
diff --git a/installer/vendor/golang.org/x/net/nettest/conntest.go b/installer/vendor/golang.org/x/net/nettest/conntest.go
deleted file mode 100644
index c246bbe399..0000000000
--- a/installer/vendor/golang.org/x/net/nettest/conntest.go
+++ /dev/null
@@ -1,451 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package nettest provides utilities for network testing.
-package nettest
-
-import (
-	"bytes"
-	"encoding/binary"
-	"io"
-	"io/ioutil"
-	"math/rand"
-	"net"
-	"sync"
-	"testing"
-	"time"
-)
-
-var (
-	aLongTimeAgo = time.Unix(233431200, 0)
-	neverTimeout = time.Time{}
-)
-
-// MakePipe creates a connection between two endpoints and returns the pair
-// as c1 and c2, such that anything written to c1 is read by c2 and vice-versa.
-// The stop function closes all resources, including c1, c2, and the underlying
-// net.Listener (if there is one), and should not be nil.
-type MakePipe func() (c1, c2 net.Conn, stop func(), err error)
-
-// TestConn tests that a net.Conn implementation properly satisfies the interface.
-// The tests should not produce any false positives, but may experience
-// false negatives. Thus, some issues may only be detected when the test is
-// run multiple times. For maximal effectiveness, run the tests under the
-// race detector.
-func TestConn(t *testing.T, mp MakePipe) {
-	testConn(t, mp)
-}
-
-type connTester func(t *testing.T, c1, c2 net.Conn)
-
-func timeoutWrapper(t *testing.T, mp MakePipe, f connTester) {
-	c1, c2, stop, err := mp()
-	if err != nil {
-		t.Fatalf("unable to make pipe: %v", err)
-	}
-	var once sync.Once
-	defer once.Do(func() { stop() })
-	timer := time.AfterFunc(time.Minute, func() {
-		once.Do(func() {
-			t.Error("test timed out; terminating pipe")
-			stop()
-		})
-	})
-	defer timer.Stop()
-	f(t, c1, c2)
-}
-
-// testBasicIO tests that the data sent on c1 is properly received on c2.
-func testBasicIO(t *testing.T, c1, c2 net.Conn) {
-	want := make([]byte, 1<<20)
-	rand.New(rand.NewSource(0)).Read(want)
-
-	dataCh := make(chan []byte)
-	go func() {
-		rd := bytes.NewReader(want)
-		if err := chunkedCopy(c1, rd); err != nil {
-			t.Errorf("unexpected c1.Write error: %v", err)
-		}
-		if err := c1.Close(); err != nil {
-			t.Errorf("unexpected c1.Close error: %v", err)
-		}
-	}()
-
-	go func() {
-		wr := new(bytes.Buffer)
-		if err := chunkedCopy(wr, c2); err != nil {
-			t.Errorf("unexpected c2.Read error: %v", err)
-		}
-		if err := c2.Close(); err != nil {
-			t.Errorf("unexpected c2.Close error: %v", err)
-		}
-		dataCh <- wr.Bytes()
-	}()
-
-	if got := <-dataCh; !bytes.Equal(got, want) {
-		t.Errorf("transmitted data differs")
-	}
-}
-
-// testPingPong tests that the two endpoints can synchronously send data to
-// each other in a typical request-response pattern.
-func testPingPong(t *testing.T, c1, c2 net.Conn) {
-	var wg sync.WaitGroup
-	defer wg.Wait()
-
-	pingPonger := func(c net.Conn) {
-		defer wg.Done()
-		buf := make([]byte, 8)
-		var prev uint64
-		for {
-			if _, err := io.ReadFull(c, buf); err != nil {
-				if err == io.EOF {
-					break
-				}
-				t.Errorf("unexpected Read error: %v", err)
-			}
-
-			v := binary.LittleEndian.Uint64(buf)
-			binary.LittleEndian.PutUint64(buf, v+1)
-			if prev != 0 && prev+2 != v {
-				t.Errorf("mismatching value: got %d, want %d", v, prev+2)
-			}
-			prev = v
-			if v == 1000 {
-				break
-			}
-
-			if _, err := c.Write(buf); err != nil {
-				t.Errorf("unexpected Write error: %v", err)
-				break
-			}
-		}
-		if err := c.Close(); err != nil {
-			t.Errorf("unexpected Close error: %v", err)
-		}
-	}
-
-	wg.Add(2)
-	go pingPonger(c1)
-	go pingPonger(c2)
-
-	// Start off the chain reaction.
-	if _, err := c1.Write(make([]byte, 8)); err != nil {
-		t.Errorf("unexpected c1.Write error: %v", err)
-	}
-}
-
-// testRacyRead tests that it is safe to mutate the input Read buffer
-// immediately after cancelation has occurred.
-func testRacyRead(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(c2, rand.New(rand.NewSource(0)))
-
-	var wg sync.WaitGroup
-	defer wg.Wait()
-
-	c1.SetReadDeadline(time.Now().Add(time.Millisecond))
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
-			b1 := make([]byte, 1024)
-			b2 := make([]byte, 1024)
-			for j := 0; j < 100; j++ {
-				_, err := c1.Read(b1)
-				copy(b1, b2) // Mutate b1 to trigger potential race
-				if err != nil {
-					checkForTimeoutError(t, err)
-					c1.SetReadDeadline(time.Now().Add(time.Millisecond))
-				}
-			}
-		}()
-	}
-}
-
-// testRacyWrite tests that it is safe to mutate the input Write buffer
-// immediately after cancelation has occurred.
-func testRacyWrite(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(ioutil.Discard, c2)
-
-	var wg sync.WaitGroup
-	defer wg.Wait()
-
-	c1.SetWriteDeadline(time.Now().Add(time.Millisecond))
-	for i := 0; i < 10; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-
-			b1 := make([]byte, 1024)
-			b2 := make([]byte, 1024)
-			for j := 0; j < 100; j++ {
-				_, err := c1.Write(b1)
-				copy(b1, b2) // Mutate b1 to trigger potential race
-				if err != nil {
-					checkForTimeoutError(t, err)
-					c1.SetWriteDeadline(time.Now().Add(time.Millisecond))
-				}
-			}
-		}()
-	}
-}
-
-// testReadTimeout tests that Read timeouts do not affect Write.
-func testReadTimeout(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(ioutil.Discard, c2)
-
-	c1.SetReadDeadline(aLongTimeAgo)
-	_, err := c1.Read(make([]byte, 1024))
-	checkForTimeoutError(t, err)
-	if _, err := c1.Write(make([]byte, 1024)); err != nil {
-		t.Errorf("unexpected Write error: %v", err)
-	}
-}
-
-// testWriteTimeout tests that Write timeouts do not affect Read.
-func testWriteTimeout(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(c2, rand.New(rand.NewSource(0)))
-
-	c1.SetWriteDeadline(aLongTimeAgo)
-	_, err := c1.Write(make([]byte, 1024))
-	checkForTimeoutError(t, err)
-	if _, err := c1.Read(make([]byte, 1024)); err != nil {
-		t.Errorf("unexpected Read error: %v", err)
-	}
-}
-
-// testPastTimeout tests that a deadline set in the past immediately times out
-// Read and Write requests.
-func testPastTimeout(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(c2, c2)
-
-	testRoundtrip(t, c1)
-
-	c1.SetDeadline(aLongTimeAgo)
-	n, err := c1.Write(make([]byte, 1024))
-	if n != 0 {
-		t.Errorf("unexpected Write count: got %d, want 0", n)
-	}
-	checkForTimeoutError(t, err)
-	n, err = c1.Read(make([]byte, 1024))
-	if n != 0 {
-		t.Errorf("unexpected Read count: got %d, want 0", n)
-	}
-	checkForTimeoutError(t, err)
-
-	testRoundtrip(t, c1)
-}
-
-// testPresentTimeout tests that a deadline set while there are pending
-// Read and Write operations immediately times out those operations.
-func testPresentTimeout(t *testing.T, c1, c2 net.Conn) {
-	var wg sync.WaitGroup
-	defer wg.Wait()
-	wg.Add(3)
-
-	deadlineSet := make(chan bool, 1)
-	go func() {
-		defer wg.Done()
-		time.Sleep(100 * time.Millisecond)
-		deadlineSet <- true
-		c1.SetReadDeadline(aLongTimeAgo)
-		c1.SetWriteDeadline(aLongTimeAgo)
-	}()
-	go func() {
-		defer wg.Done()
-		n, err := c1.Read(make([]byte, 1024))
-		if n != 0 {
-			t.Errorf("unexpected Read count: got %d, want 0", n)
-		}
-		checkForTimeoutError(t, err)
-		if len(deadlineSet) == 0 {
-			t.Error("Read timed out before deadline is set")
-		}
-	}()
-	go func() {
-		defer wg.Done()
-		var err error
-		for err == nil {
-			_, err = c1.Write(make([]byte, 1024))
-		}
-		checkForTimeoutError(t, err)
-		if len(deadlineSet) == 0 {
-			t.Error("Write timed out before deadline is set")
-		}
-	}()
-}
-
-// testFutureTimeout tests that a future deadline will eventually time out
-// Read and Write operations.
-func testFutureTimeout(t *testing.T, c1, c2 net.Conn) {
-	var wg sync.WaitGroup
-	wg.Add(2)
-
-	c1.SetDeadline(time.Now().Add(100 * time.Millisecond))
-	go func() {
-		defer wg.Done()
-		_, err := c1.Read(make([]byte, 1024))
-		checkForTimeoutError(t, err)
-	}()
-	go func() {
-		defer wg.Done()
-		var err error
-		for err == nil {
-			_, err = c1.Write(make([]byte, 1024))
-		}
-		checkForTimeoutError(t, err)
-	}()
-	wg.Wait()
-
-	go chunkedCopy(c2, c2)
-	resyncConn(t, c1)
-	testRoundtrip(t, c1)
-}
-
-// testCloseTimeout tests that calling Close immediately times out pending
-// Read and Write operations.
-func testCloseTimeout(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(c2, c2)
-
-	var wg sync.WaitGroup
-	defer wg.Wait()
-	wg.Add(3)
-
-	// Test for cancelation upon connection closure.
-	c1.SetDeadline(neverTimeout)
-	go func() {
-		defer wg.Done()
-		time.Sleep(100 * time.Millisecond)
-		c1.Close()
-	}()
-	go func() {
-		defer wg.Done()
-		var err error
-		buf := make([]byte, 1024)
-		for err == nil {
-			_, err = c1.Read(buf)
-		}
-	}()
-	go func() {
-		defer wg.Done()
-		var err error
-		buf := make([]byte, 1024)
-		for err == nil {
-			_, err = c1.Write(buf)
-		}
-	}()
-}
-
-// testConcurrentMethods tests that the methods of net.Conn can safely
-// be called concurrently.
-func testConcurrentMethods(t *testing.T, c1, c2 net.Conn) {
-	go chunkedCopy(c2, c2)
-
-	// The results of the calls may be nonsensical, but this should
-	// not trigger a race detector warning.
-	var wg sync.WaitGroup
-	for i := 0; i < 100; i++ {
-		wg.Add(7)
-		go func() {
-			defer wg.Done()
-			c1.Read(make([]byte, 1024))
-		}()
-		go func() {
-			defer wg.Done()
-			c1.Write(make([]byte, 1024))
-		}()
-		go func() {
-			defer wg.Done()
-			c1.SetDeadline(time.Now().Add(10 * time.Millisecond))
-		}()
-		go func() {
-			defer wg.Done()
-			c1.SetReadDeadline(aLongTimeAgo)
-		}()
-		go func() {
-			defer wg.Done()
-			c1.SetWriteDeadline(aLongTimeAgo)
-		}()
-		go func() {
-			defer wg.Done()
-			c1.LocalAddr()
-		}()
-		go func() {
-			defer wg.Done()
-			c1.RemoteAddr()
-		}()
-	}
-	wg.Wait() // At worst, the deadline is set 10ms into the future
-
-	resyncConn(t, c1)
-	testRoundtrip(t, c1)
-}
-
-// checkForTimeoutError checks that the error satisfies the Error interface
-// and that Timeout returns true.
-func checkForTimeoutError(t *testing.T, err error) {
-	if nerr, ok := err.(net.Error); ok {
-		if !nerr.Timeout() {
-			t.Errorf("err.Timeout() = false, want true")
-		}
-	} else {
-		t.Errorf("got %T, want net.Error", err)
-	}
-}
-
-// testRoundtrip writes something into c and reads it back.
-// It assumes that everything written into c is echoed back to itself.
-func testRoundtrip(t *testing.T, c net.Conn) {
-	if err := c.SetDeadline(neverTimeout); err != nil {
-		t.Errorf("roundtrip SetDeadline error: %v", err)
-	}
-
-	const s = "Hello, world!"
-	buf := []byte(s)
-	if _, err := c.Write(buf); err != nil {
-		t.Errorf("roundtrip Write error: %v", err)
-	}
-	if _, err := io.ReadFull(c, buf); err != nil {
-		t.Errorf("roundtrip Read error: %v", err)
-	}
-	if string(buf) != s {
-		t.Errorf("roundtrip data mismatch: got %q, want %q", buf, s)
-	}
-}
-
-// resyncConn resynchronizes the connection into a sane state.
-// It assumes that everything written into c is echoed back to itself.
-// It assumes that 0xff is not currently on the wire or in the read buffer.
-func resyncConn(t *testing.T, c net.Conn) {
-	c.SetDeadline(neverTimeout)
-	errCh := make(chan error)
-	go func() {
-		_, err := c.Write([]byte{0xff})
-		errCh <- err
-	}()
-	buf := make([]byte, 1024)
-	for {
-		n, err := c.Read(buf)
-		if n > 0 && bytes.IndexByte(buf[:n], 0xff) == n-1 {
-			break
-		}
-		if err != nil {
-			t.Errorf("unexpected Read error: %v", err)
-		}
-	}
-	if err := <-errCh; err != nil {
-		t.Errorf("unexpected Write error: %v", err)
-	}
-}
-
-// chunkedCopy copies from r to w in fixed-width chunks to avoid
-// causing a Write that exceeds the maximum packet size for packet-based
-// connections like "unixpacket".
-// We assume that the maximum packet size is at least 1024.
-func chunkedCopy(w io.Writer, r io.Reader) error {
-	b := make([]byte, 1024)
-	_, err := io.CopyBuffer(struct{ io.Writer }{w}, struct{ io.Reader }{r}, b)
-	return err
-}
diff --git a/installer/vendor/golang.org/x/net/nettest/conntest_go16.go b/installer/vendor/golang.org/x/net/nettest/conntest_go16.go
deleted file mode 100644
index 4cbf48e35e..0000000000
--- a/installer/vendor/golang.org/x/net/nettest/conntest_go16.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package nettest
-
-import "testing"
-
-func testConn(t *testing.T, mp MakePipe) {
-	// Avoid using subtests on Go 1.6 and below.
-	timeoutWrapper(t, mp, testBasicIO)
-	timeoutWrapper(t, mp, testPingPong)
-	timeoutWrapper(t, mp, testRacyRead)
-	timeoutWrapper(t, mp, testRacyWrite)
-	timeoutWrapper(t, mp, testReadTimeout)
-	timeoutWrapper(t, mp, testWriteTimeout)
-	timeoutWrapper(t, mp, testPastTimeout)
-	timeoutWrapper(t, mp, testPresentTimeout)
-	timeoutWrapper(t, mp, testFutureTimeout)
-	timeoutWrapper(t, mp, testCloseTimeout)
-	timeoutWrapper(t, mp, testConcurrentMethods)
-}
diff --git a/installer/vendor/golang.org/x/net/nettest/conntest_go17.go b/installer/vendor/golang.org/x/net/nettest/conntest_go17.go
deleted file mode 100644
index fa039f03fc..0000000000
--- a/installer/vendor/golang.org/x/net/nettest/conntest_go17.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package nettest
-
-import "testing"
-
-func testConn(t *testing.T, mp MakePipe) {
-	// Use subtests on Go 1.7 and above since it is better organized.
-	t.Run("BasicIO", func(t *testing.T) { timeoutWrapper(t, mp, testBasicIO) })
-	t.Run("PingPong", func(t *testing.T) { timeoutWrapper(t, mp, testPingPong) })
-	t.Run("RacyRead", func(t *testing.T) { timeoutWrapper(t, mp, testRacyRead) })
-	t.Run("RacyWrite", func(t *testing.T) { timeoutWrapper(t, mp, testRacyWrite) })
-	t.Run("ReadTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testReadTimeout) })
-	t.Run("WriteTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testWriteTimeout) })
-	t.Run("PastTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testPastTimeout) })
-	t.Run("PresentTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testPresentTimeout) })
-	t.Run("FutureTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testFutureTimeout) })
-	t.Run("CloseTimeout", func(t *testing.T) { timeoutWrapper(t, mp, testCloseTimeout) })
-	t.Run("ConcurrentMethods", func(t *testing.T) { timeoutWrapper(t, mp, testConcurrentMethods) })
-}
diff --git a/installer/vendor/golang.org/x/net/nettest/conntest_test.go b/installer/vendor/golang.org/x/net/nettest/conntest_test.go
deleted file mode 100644
index 9f9453fb56..0000000000
--- a/installer/vendor/golang.org/x/net/nettest/conntest_test.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8
-
-package nettest
-
-import (
-	"net"
-	"os"
-	"runtime"
-	"testing"
-
-	"golang.org/x/net/internal/nettest"
-)
-
-func TestTestConn(t *testing.T) {
-	tests := []struct{ name, network string }{
-		{"TCP", "tcp"},
-		{"UnixPipe", "unix"},
-		{"UnixPacketPipe", "unixpacket"},
-	}
-
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			if !nettest.TestableNetwork(tt.network) {
-				t.Skipf("not supported on %s", runtime.GOOS)
-			}
-
-			mp := func() (c1, c2 net.Conn, stop func(), err error) {
-				ln, err := nettest.NewLocalListener(tt.network)
-				if err != nil {
-					return nil, nil, nil, err
-				}
-
-				// Start a connection between two endpoints.
-				var err1, err2 error
-				done := make(chan bool)
-				go func() {
-					c2, err2 = ln.Accept()
-					close(done)
-				}()
-				c1, err1 = net.Dial(ln.Addr().Network(), ln.Addr().String())
-				<-done
-
-				stop = func() {
-					if err1 == nil {
-						c1.Close()
-					}
-					if err2 == nil {
-						c2.Close()
-					}
-					ln.Close()
-					switch tt.network {
-					case "unix", "unixpacket":
-						os.Remove(ln.Addr().String())
-					}
-				}
-
-				switch {
-				case err1 != nil:
-					stop()
-					return nil, nil, nil, err1
-				case err2 != nil:
-					stop()
-					return nil, nil, nil, err2
-				default:
-					return c1, c2, stop, nil
-				}
-			}
-
-			TestConn(t, mp)
-		})
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/netutil/listen.go b/installer/vendor/golang.org/x/net/netutil/listen.go
deleted file mode 100644
index 56f43bf65b..0000000000
--- a/installer/vendor/golang.org/x/net/netutil/listen.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package netutil provides network utility functions, complementing the more
-// common ones in the net package.
-package netutil // import "golang.org/x/net/netutil"
-
-import (
-	"net"
-	"sync"
-)
-
-// LimitListener returns a Listener that accepts at most n simultaneous
-// connections from the provided Listener.
-func LimitListener(l net.Listener, n int) net.Listener {
-	return &limitListener{l, make(chan struct{}, n)}
-}
-
-type limitListener struct {
-	net.Listener
-	sem chan struct{}
-}
-
-func (l *limitListener) acquire() { l.sem <- struct{}{} }
-func (l *limitListener) release() { <-l.sem }
-
-func (l *limitListener) Accept() (net.Conn, error) {
-	l.acquire()
-	c, err := l.Listener.Accept()
-	if err != nil {
-		l.release()
-		return nil, err
-	}
-	return &limitListenerConn{Conn: c, release: l.release}, nil
-}
-
-type limitListenerConn struct {
-	net.Conn
-	releaseOnce sync.Once
-	release     func()
-}
-
-func (l *limitListenerConn) Close() error {
-	err := l.Conn.Close()
-	l.releaseOnce.Do(l.release)
-	return err
-}
diff --git a/installer/vendor/golang.org/x/net/netutil/listen_test.go b/installer/vendor/golang.org/x/net/netutil/listen_test.go
deleted file mode 100644
index 5e07d7bea1..0000000000
--- a/installer/vendor/golang.org/x/net/netutil/listen_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package netutil
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-
-	"golang.org/x/net/internal/nettest"
-)
-
-func TestLimitListener(t *testing.T) {
-	const max = 5
-	attempts := (nettest.MaxOpenFiles() - max) / 2
-	if attempts > 256 { // maximum length of accept queue is 128 by default
-		attempts = 256
-	}
-
-	l, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer l.Close()
-	l = LimitListener(l, max)
-
-	var open int32
-	go http.Serve(l, http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if n := atomic.AddInt32(&open, 1); n > max {
-			t.Errorf("%d open connections, want <= %d", n, max)
-		}
-		defer atomic.AddInt32(&open, -1)
-		time.Sleep(10 * time.Millisecond)
-		fmt.Fprint(w, "some body")
-	}))
-
-	var wg sync.WaitGroup
-	var failed int32
-	for i := 0; i < attempts; i++ {
-		wg.Add(1)
-		go func() {
-			defer wg.Done()
-			c := http.Client{Timeout: 3 * time.Second}
-			r, err := c.Get("http://" + l.Addr().String())
-			if err != nil {
-				t.Log(err)
-				atomic.AddInt32(&failed, 1)
-				return
-			}
-			defer r.Body.Close()
-			io.Copy(ioutil.Discard, r.Body)
-		}()
-	}
-	wg.Wait()
-
-	// We expect some Gets to fail as the kernel's accept queue is filled,
-	// but most should succeed.
-	if int(failed) >= attempts/2 {
-		t.Errorf("%d requests failed within %d attempts", failed, attempts)
-	}
-}
-
-type errorListener struct {
-	net.Listener
-}
-
-func (errorListener) Accept() (net.Conn, error) {
-	return nil, errFake
-}
-
-var errFake = errors.New("fake error from errorListener")
-
-// This used to hang.
-func TestLimitListenerError(t *testing.T) {
-	donec := make(chan bool, 1)
-	go func() {
-		const n = 2
-		ll := LimitListener(errorListener{}, n)
-		for i := 0; i < n+1; i++ {
-			_, err := ll.Accept()
-			if err != errFake {
-				t.Fatalf("Accept error = %v; want errFake", err)
-			}
-		}
-		donec <- true
-	}()
-	select {
-	case <-donec:
-	case <-time.After(5 * time.Second):
-		t.Fatal("timeout. deadlock?")
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/direct.go b/installer/vendor/golang.org/x/net/proxy/direct.go
deleted file mode 100644
index 4c5ad88b1e..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/direct.go
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"net"
-)
-
-type direct struct{}
-
-// Direct is a direct proxy: one that makes network connections directly.
-var Direct = direct{}
-
-func (direct) Dial(network, addr string) (net.Conn, error) {
-	return net.Dial(network, addr)
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/per_host.go b/installer/vendor/golang.org/x/net/proxy/per_host.go
deleted file mode 100644
index f540b196f7..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/per_host.go
+++ /dev/null
@@ -1,140 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"net"
-	"strings"
-)
-
-// A PerHost directs connections to a default Dialer unless the hostname
-// requested matches one of a number of exceptions.
-type PerHost struct {
-	def, bypass Dialer
-
-	bypassNetworks []*net.IPNet
-	bypassIPs      []net.IP
-	bypassZones    []string
-	bypassHosts    []string
-}
-
-// NewPerHost returns a PerHost Dialer that directs connections to either
-// defaultDialer or bypass, depending on whether the connection matches one of
-// the configured rules.
-func NewPerHost(defaultDialer, bypass Dialer) *PerHost {
-	return &PerHost{
-		def:    defaultDialer,
-		bypass: bypass,
-	}
-}
-
-// Dial connects to the address addr on the given network through either
-// defaultDialer or bypass.
-func (p *PerHost) Dial(network, addr string) (c net.Conn, err error) {
-	host, _, err := net.SplitHostPort(addr)
-	if err != nil {
-		return nil, err
-	}
-
-	return p.dialerForRequest(host).Dial(network, addr)
-}
-
-func (p *PerHost) dialerForRequest(host string) Dialer {
-	if ip := net.ParseIP(host); ip != nil {
-		for _, net := range p.bypassNetworks {
-			if net.Contains(ip) {
-				return p.bypass
-			}
-		}
-		for _, bypassIP := range p.bypassIPs {
-			if bypassIP.Equal(ip) {
-				return p.bypass
-			}
-		}
-		return p.def
-	}
-
-	for _, zone := range p.bypassZones {
-		if strings.HasSuffix(host, zone) {
-			return p.bypass
-		}
-		if host == zone[1:] {
-			// For a zone "example.com", we match "example.com"
-			// too.
-			return p.bypass
-		}
-	}
-	for _, bypassHost := range p.bypassHosts {
-		if bypassHost == host {
-			return p.bypass
-		}
-	}
-	return p.def
-}
-
-// AddFromString parses a string that contains comma-separated values
-// specifying hosts that should use the bypass proxy. Each value is either an
-// IP address, a CIDR range, a zone (*.example.com) or a hostname
-// (localhost). A best effort is made to parse the string and errors are
-// ignored.
-func (p *PerHost) AddFromString(s string) {
-	hosts := strings.Split(s, ",")
-	for _, host := range hosts {
-		host = strings.TrimSpace(host)
-		if len(host) == 0 {
-			continue
-		}
-		if strings.Contains(host, "/") {
-			// We assume that it's a CIDR address like 127.0.0.0/8
-			if _, net, err := net.ParseCIDR(host); err == nil {
-				p.AddNetwork(net)
-			}
-			continue
-		}
-		if ip := net.ParseIP(host); ip != nil {
-			p.AddIP(ip)
-			continue
-		}
-		if strings.HasPrefix(host, "*.") {
-			p.AddZone(host[1:])
-			continue
-		}
-		p.AddHost(host)
-	}
-}
-
-// AddIP specifies an IP address that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match an IP.
-func (p *PerHost) AddIP(ip net.IP) {
-	p.bypassIPs = append(p.bypassIPs, ip)
-}
-
-// AddNetwork specifies an IP range that will use the bypass proxy. Note that
-// this will only take effect if a literal IP address is dialed. A connection
-// to a named host will never match.
-func (p *PerHost) AddNetwork(net *net.IPNet) {
-	p.bypassNetworks = append(p.bypassNetworks, net)
-}
-
-// AddZone specifies a DNS suffix that will use the bypass proxy. A zone of
-// "example.com" matches "example.com" and all of its subdomains.
-func (p *PerHost) AddZone(zone string) {
-	if strings.HasSuffix(zone, ".") {
-		zone = zone[:len(zone)-1]
-	}
-	if !strings.HasPrefix(zone, ".") {
-		zone = "." + zone
-	}
-	p.bypassZones = append(p.bypassZones, zone)
-}
-
-// AddHost specifies a hostname that will use the bypass proxy.
-func (p *PerHost) AddHost(host string) {
-	if strings.HasSuffix(host, ".") {
-		host = host[:len(host)-1]
-	}
-	p.bypassHosts = append(p.bypassHosts, host)
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/per_host_test.go b/installer/vendor/golang.org/x/net/proxy/per_host_test.go
deleted file mode 100644
index a7d8095711..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/per_host_test.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"errors"
-	"net"
-	"reflect"
-	"testing"
-)
-
-type recordingProxy struct {
-	addrs []string
-}
-
-func (r *recordingProxy) Dial(network, addr string) (net.Conn, error) {
-	r.addrs = append(r.addrs, addr)
-	return nil, errors.New("recordingProxy")
-}
-
-func TestPerHost(t *testing.T) {
-	var def, bypass recordingProxy
-	perHost := NewPerHost(&def, &bypass)
-	perHost.AddFromString("localhost,*.zone,127.0.0.1,10.0.0.1/8,1000::/16")
-
-	expectedDef := []string{
-		"example.com:123",
-		"1.2.3.4:123",
-		"[1001::]:123",
-	}
-	expectedBypass := []string{
-		"localhost:123",
-		"zone:123",
-		"foo.zone:123",
-		"127.0.0.1:123",
-		"10.1.2.3:123",
-		"[1000::]:123",
-	}
-
-	for _, addr := range expectedDef {
-		perHost.Dial("tcp", addr)
-	}
-	for _, addr := range expectedBypass {
-		perHost.Dial("tcp", addr)
-	}
-
-	if !reflect.DeepEqual(expectedDef, def.addrs) {
-		t.Errorf("Hosts which went to the default proxy didn't match. Got %v, want %v", def.addrs, expectedDef)
-	}
-	if !reflect.DeepEqual(expectedBypass, bypass.addrs) {
-		t.Errorf("Hosts which went to the bypass proxy didn't match. Got %v, want %v", bypass.addrs, expectedBypass)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/proxy.go b/installer/vendor/golang.org/x/net/proxy/proxy.go
deleted file mode 100644
index 78a8b7bee9..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/proxy.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package proxy provides support for a variety of protocols to proxy network
-// data.
-package proxy // import "golang.org/x/net/proxy"
-
-import (
-	"errors"
-	"net"
-	"net/url"
-	"os"
-)
-
-// A Dialer is a means to establish a connection.
-type Dialer interface {
-	// Dial connects to the given address via the proxy.
-	Dial(network, addr string) (c net.Conn, err error)
-}
-
-// Auth contains authentication parameters that specific Dialers may require.
-type Auth struct {
-	User, Password string
-}
-
-// FromEnvironment returns the dialer specified by the proxy related variables in
-// the environment.
-func FromEnvironment() Dialer {
-	allProxy := os.Getenv("all_proxy")
-	if len(allProxy) == 0 {
-		return Direct
-	}
-
-	proxyURL, err := url.Parse(allProxy)
-	if err != nil {
-		return Direct
-	}
-	proxy, err := FromURL(proxyURL, Direct)
-	if err != nil {
-		return Direct
-	}
-
-	noProxy := os.Getenv("no_proxy")
-	if len(noProxy) == 0 {
-		return proxy
-	}
-
-	perHost := NewPerHost(proxy, Direct)
-	perHost.AddFromString(noProxy)
-	return perHost
-}
-
-// proxySchemes is a map from URL schemes to a function that creates a Dialer
-// from a URL with such a scheme.
-var proxySchemes map[string]func(*url.URL, Dialer) (Dialer, error)
-
-// RegisterDialerType takes a URL scheme and a function to generate Dialers from
-// a URL with that scheme and a forwarding Dialer. Registered schemes are used
-// by FromURL.
-func RegisterDialerType(scheme string, f func(*url.URL, Dialer) (Dialer, error)) {
-	if proxySchemes == nil {
-		proxySchemes = make(map[string]func(*url.URL, Dialer) (Dialer, error))
-	}
-	proxySchemes[scheme] = f
-}
-
-// FromURL returns a Dialer given a URL specification and an underlying
-// Dialer for it to make network requests.
-func FromURL(u *url.URL, forward Dialer) (Dialer, error) {
-	var auth *Auth
-	if u.User != nil {
-		auth = new(Auth)
-		auth.User = u.User.Username()
-		if p, ok := u.User.Password(); ok {
-			auth.Password = p
-		}
-	}
-
-	switch u.Scheme {
-	case "socks5":
-		return SOCKS5("tcp", u.Host, auth, forward)
-	}
-
-	// If the scheme doesn't match any of the built-in schemes, see if it
-	// was registered by another package.
-	if proxySchemes != nil {
-		if f, ok := proxySchemes[u.Scheme]; ok {
-			return f(u, forward)
-		}
-	}
-
-	return nil, errors.New("proxy: unknown scheme: " + u.Scheme)
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/proxy_test.go b/installer/vendor/golang.org/x/net/proxy/proxy_test.go
deleted file mode 100644
index c19a5c0635..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/proxy_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"io"
-	"net"
-	"net/url"
-	"strconv"
-	"sync"
-	"testing"
-)
-
-func TestFromURL(t *testing.T) {
-	endSystem, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
-	}
-	defer endSystem.Close()
-	gateway, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
-	}
-	defer gateway.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go socks5Gateway(t, gateway, endSystem, socks5Domain, &wg)
-
-	url, err := url.Parse("socks5://user:password@" + gateway.Addr().String())
-	if err != nil {
-		t.Fatalf("url.Parse failed: %v", err)
-	}
-	proxy, err := FromURL(url, Direct)
-	if err != nil {
-		t.Fatalf("FromURL failed: %v", err)
-	}
-	_, port, err := net.SplitHostPort(endSystem.Addr().String())
-	if err != nil {
-		t.Fatalf("net.SplitHostPort failed: %v", err)
-	}
-	if c, err := proxy.Dial("tcp", "localhost:"+port); err != nil {
-		t.Fatalf("FromURL.Dial failed: %v", err)
-	} else {
-		c.Close()
-	}
-
-	wg.Wait()
-}
-
-func TestSOCKS5(t *testing.T) {
-	endSystem, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
-	}
-	defer endSystem.Close()
-	gateway, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		t.Fatalf("net.Listen failed: %v", err)
-	}
-	defer gateway.Close()
-
-	var wg sync.WaitGroup
-	wg.Add(1)
-	go socks5Gateway(t, gateway, endSystem, socks5IP4, &wg)
-
-	proxy, err := SOCKS5("tcp", gateway.Addr().String(), nil, Direct)
-	if err != nil {
-		t.Fatalf("SOCKS5 failed: %v", err)
-	}
-	if c, err := proxy.Dial("tcp", endSystem.Addr().String()); err != nil {
-		t.Fatalf("SOCKS5.Dial failed: %v", err)
-	} else {
-		c.Close()
-	}
-
-	wg.Wait()
-}
-
-func socks5Gateway(t *testing.T, gateway, endSystem net.Listener, typ byte, wg *sync.WaitGroup) {
-	defer wg.Done()
-
-	c, err := gateway.Accept()
-	if err != nil {
-		t.Errorf("net.Listener.Accept failed: %v", err)
-		return
-	}
-	defer c.Close()
-
-	b := make([]byte, 32)
-	var n int
-	if typ == socks5Domain {
-		n = 4
-	} else {
-		n = 3
-	}
-	if _, err := io.ReadFull(c, b[:n]); err != nil {
-		t.Errorf("io.ReadFull failed: %v", err)
-		return
-	}
-	if _, err := c.Write([]byte{socks5Version, socks5AuthNone}); err != nil {
-		t.Errorf("net.Conn.Write failed: %v", err)
-		return
-	}
-	if typ == socks5Domain {
-		n = 16
-	} else {
-		n = 10
-	}
-	if _, err := io.ReadFull(c, b[:n]); err != nil {
-		t.Errorf("io.ReadFull failed: %v", err)
-		return
-	}
-	if b[0] != socks5Version || b[1] != socks5Connect || b[2] != 0x00 || b[3] != typ {
-		t.Errorf("got an unexpected packet: %#02x %#02x %#02x %#02x", b[0], b[1], b[2], b[3])
-		return
-	}
-	if typ == socks5Domain {
-		copy(b[:5], []byte{socks5Version, 0x00, 0x00, socks5Domain, 9})
-		b = append(b, []byte("localhost")...)
-	} else {
-		copy(b[:4], []byte{socks5Version, 0x00, 0x00, socks5IP4})
-	}
-	host, port, err := net.SplitHostPort(endSystem.Addr().String())
-	if err != nil {
-		t.Errorf("net.SplitHostPort failed: %v", err)
-		return
-	}
-	b = append(b, []byte(net.ParseIP(host).To4())...)
-	p, err := strconv.Atoi(port)
-	if err != nil {
-		t.Errorf("strconv.Atoi failed: %v", err)
-		return
-	}
-	b = append(b, []byte{byte(p >> 8), byte(p)}...)
-	if _, err := c.Write(b); err != nil {
-		t.Errorf("net.Conn.Write failed: %v", err)
-		return
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/proxy/socks5.go b/installer/vendor/golang.org/x/net/proxy/socks5.go
deleted file mode 100644
index 973f57f197..0000000000
--- a/installer/vendor/golang.org/x/net/proxy/socks5.go
+++ /dev/null
@@ -1,213 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package proxy
-
-import (
-	"errors"
-	"io"
-	"net"
-	"strconv"
-)
-
-// SOCKS5 returns a Dialer that makes SOCKSv5 connections to the given address
-// with an optional username and password. See RFC 1928.
-func SOCKS5(network, addr string, auth *Auth, forward Dialer) (Dialer, error) {
-	s := &socks5{
-		network: network,
-		addr:    addr,
-		forward: forward,
-	}
-	if auth != nil {
-		s.user = auth.User
-		s.password = auth.Password
-	}
-
-	return s, nil
-}
-
-type socks5 struct {
-	user, password string
-	network, addr  string
-	forward        Dialer
-}
-
-const socks5Version = 5
-
-const (
-	socks5AuthNone     = 0
-	socks5AuthPassword = 2
-)
-
-const socks5Connect = 1
-
-const (
-	socks5IP4    = 1
-	socks5Domain = 3
-	socks5IP6    = 4
-)
-
-var socks5Errors = []string{
-	"",
-	"general failure",
-	"connection forbidden",
-	"network unreachable",
-	"host unreachable",
-	"connection refused",
-	"TTL expired",
-	"command not supported",
-	"address type not supported",
-}
-
-// Dial connects to the address addr on the network net via the SOCKS5 proxy.
-func (s *socks5) Dial(network, addr string) (net.Conn, error) {
-	switch network {
-	case "tcp", "tcp6", "tcp4":
-	default:
-		return nil, errors.New("proxy: no support for SOCKS5 proxy connections of type " + network)
-	}
-
-	conn, err := s.forward.Dial(s.network, s.addr)
-	if err != nil {
-		return nil, err
-	}
-	if err := s.connect(conn, addr); err != nil {
-		conn.Close()
-		return nil, err
-	}
-	return conn, nil
-}
-
-// connect takes an existing connection to a socks5 proxy server,
-// and commands the server to extend that connection to target,
-// which must be a canonical address with a host and port.
-func (s *socks5) connect(conn net.Conn, target string) error {
-	host, portStr, err := net.SplitHostPort(target)
-	if err != nil {
-		return err
-	}
-
-	port, err := strconv.Atoi(portStr)
-	if err != nil {
-		return errors.New("proxy: failed to parse port number: " + portStr)
-	}
-	if port < 1 || port > 0xffff {
-		return errors.New("proxy: port number out of range: " + portStr)
-	}
-
-	// the size here is just an estimate
-	buf := make([]byte, 0, 6+len(host))
-
-	buf = append(buf, socks5Version)
-	if len(s.user) > 0 && len(s.user) < 256 && len(s.password) < 256 {
-		buf = append(buf, 2 /* num auth methods */, socks5AuthNone, socks5AuthPassword)
-	} else {
-		buf = append(buf, 1 /* num auth methods */, socks5AuthNone)
-	}
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write greeting to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read greeting from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-	if buf[0] != 5 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " has unexpected version " + strconv.Itoa(int(buf[0])))
-	}
-	if buf[1] == 0xff {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " requires authentication")
-	}
-
-	if buf[1] == socks5AuthPassword {
-		buf = buf[:0]
-		buf = append(buf, 1 /* password protocol version */)
-		buf = append(buf, uint8(len(s.user)))
-		buf = append(buf, s.user...)
-		buf = append(buf, uint8(len(s.password)))
-		buf = append(buf, s.password...)
-
-		if _, err := conn.Write(buf); err != nil {
-			return errors.New("proxy: failed to write authentication request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-			return errors.New("proxy: failed to read authentication reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-
-		if buf[1] != 0 {
-			return errors.New("proxy: SOCKS5 proxy at " + s.addr + " rejected username/password")
-		}
-	}
-
-	buf = buf[:0]
-	buf = append(buf, socks5Version, socks5Connect, 0 /* reserved */)
-
-	if ip := net.ParseIP(host); ip != nil {
-		if ip4 := ip.To4(); ip4 != nil {
-			buf = append(buf, socks5IP4)
-			ip = ip4
-		} else {
-			buf = append(buf, socks5IP6)
-		}
-		buf = append(buf, ip...)
-	} else {
-		if len(host) > 255 {
-			return errors.New("proxy: destination hostname too long: " + host)
-		}
-		buf = append(buf, socks5Domain)
-		buf = append(buf, byte(len(host)))
-		buf = append(buf, host...)
-	}
-	buf = append(buf, byte(port>>8), byte(port))
-
-	if _, err := conn.Write(buf); err != nil {
-		return errors.New("proxy: failed to write connect request to SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	if _, err := io.ReadFull(conn, buf[:4]); err != nil {
-		return errors.New("proxy: failed to read connect reply from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	failure := "unknown error"
-	if int(buf[1]) < len(socks5Errors) {
-		failure = socks5Errors[buf[1]]
-	}
-
-	if len(failure) > 0 {
-		return errors.New("proxy: SOCKS5 proxy at " + s.addr + " failed to connect: " + failure)
-	}
-
-	bytesToDiscard := 0
-	switch buf[3] {
-	case socks5IP4:
-		bytesToDiscard = net.IPv4len
-	case socks5IP6:
-		bytesToDiscard = net.IPv6len
-	case socks5Domain:
-		_, err := io.ReadFull(conn, buf[:1])
-		if err != nil {
-			return errors.New("proxy: failed to read domain length from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-		}
-		bytesToDiscard = int(buf[0])
-	default:
-		return errors.New("proxy: got unknown address type " + strconv.Itoa(int(buf[3])) + " from SOCKS5 proxy at " + s.addr)
-	}
-
-	if cap(buf) < bytesToDiscard {
-		buf = make([]byte, bytesToDiscard)
-	} else {
-		buf = buf[:bytesToDiscard]
-	}
-	if _, err := io.ReadFull(conn, buf); err != nil {
-		return errors.New("proxy: failed to read address from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	// Also need to discard the port number
-	if _, err := io.ReadFull(conn, buf[:2]); err != nil {
-		return errors.New("proxy: failed to read port from SOCKS5 proxy at " + s.addr + ": " + err.Error())
-	}
-
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/publicsuffix/gen.go b/installer/vendor/golang.org/x/net/publicsuffix/gen.go
deleted file mode 100644
index a2d4995292..0000000000
--- a/installer/vendor/golang.org/x/net/publicsuffix/gen.go
+++ /dev/null
@@ -1,713 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package main
-
-// This program generates table.go and table_test.go based on the authoritative
-// public suffix list at https://publicsuffix.org/list/effective_tld_names.dat
-//
-// The version is derived from
-// https://api.github.com/repos/publicsuffix/list/commits?path=public_suffix_list.dat
-// and a human-readable form is at
-// https://github.com/publicsuffix/list/commits/master/public_suffix_list.dat
-//
-// To fetch a particular git revision, such as 5c70ccd250, pass
-// -url "https://raw.githubusercontent.com/publicsuffix/list/5c70ccd250/public_suffix_list.dat"
-// and -version "an explicit version string".
-
-import (
-	"bufio"
-	"bytes"
-	"flag"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"regexp"
-	"sort"
-	"strings"
-
-	"golang.org/x/net/idna"
-)
-
-const (
-	// These sum of these four values must be no greater than 32.
-	nodesBitsChildren   = 9
-	nodesBitsICANN      = 1
-	nodesBitsTextOffset = 15
-	nodesBitsTextLength = 6
-
-	// These sum of these four values must be no greater than 32.
-	childrenBitsWildcard = 1
-	childrenBitsNodeType = 2
-	childrenBitsHi       = 14
-	childrenBitsLo       = 14
-)
-
-var (
-	maxChildren   int
-	maxTextOffset int
-	maxTextLength int
-	maxHi         uint32
-	maxLo         uint32
-)
-
-func max(a, b int) int {
-	if a < b {
-		return b
-	}
-	return a
-}
-
-func u32max(a, b uint32) uint32 {
-	if a < b {
-		return b
-	}
-	return a
-}
-
-const (
-	nodeTypeNormal     = 0
-	nodeTypeException  = 1
-	nodeTypeParentOnly = 2
-	numNodeType        = 3
-)
-
-func nodeTypeStr(n int) string {
-	switch n {
-	case nodeTypeNormal:
-		return "+"
-	case nodeTypeException:
-		return "!"
-	case nodeTypeParentOnly:
-		return "o"
-	}
-	panic("unreachable")
-}
-
-const (
-	defaultURL   = "https://publicsuffix.org/list/effective_tld_names.dat"
-	gitCommitURL = "https://api.github.com/repos/publicsuffix/list/commits?path=public_suffix_list.dat"
-)
-
-var (
-	labelEncoding = map[string]uint32{}
-	labelsList    = []string{}
-	labelsMap     = map[string]bool{}
-	rules         = []string{}
-
-	// validSuffixRE is used to check that the entries in the public suffix
-	// list are in canonical form (after Punycode encoding). Specifically,
-	// capital letters are not allowed.
-	validSuffixRE = regexp.MustCompile(`^[a-z0-9_\!\*\-\.]+$`)
-
-	shaRE  = regexp.MustCompile(`"sha":"([^"]+)"`)
-	dateRE = regexp.MustCompile(`"committer":{[^{]+"date":"([^"]+)"`)
-
-	comments = flag.Bool("comments", false, "generate table.go comments, for debugging")
-	subset   = flag.Bool("subset", false, "generate only a subset of the full table, for debugging")
-	url      = flag.String("url", defaultURL, "URL of the publicsuffix.org list. If empty, stdin is read instead")
-	v        = flag.Bool("v", false, "verbose output (to stderr)")
-	version  = flag.String("version", "", "the effective_tld_names.dat version")
-)
-
-func main() {
-	if err := main1(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func main1() error {
-	flag.Parse()
-	if nodesBitsTextLength+nodesBitsTextOffset+nodesBitsICANN+nodesBitsChildren > 32 {
-		return fmt.Errorf("not enough bits to encode the nodes table")
-	}
-	if childrenBitsLo+childrenBitsHi+childrenBitsNodeType+childrenBitsWildcard > 32 {
-		return fmt.Errorf("not enough bits to encode the children table")
-	}
-	if *version == "" {
-		if *url != defaultURL {
-			return fmt.Errorf("-version was not specified, and the -url is not the default one")
-		}
-		sha, date, err := gitCommit()
-		if err != nil {
-			return err
-		}
-		*version = fmt.Sprintf("publicsuffix.org's public_suffix_list.dat, git revision %s (%s)", sha, date)
-	}
-	var r io.Reader = os.Stdin
-	if *url != "" {
-		res, err := http.Get(*url)
-		if err != nil {
-			return err
-		}
-		if res.StatusCode != http.StatusOK {
-			return fmt.Errorf("bad GET status for %s: %d", *url, res.Status)
-		}
-		r = res.Body
-		defer res.Body.Close()
-	}
-
-	var root node
-	icann := false
-	br := bufio.NewReader(r)
-	for {
-		s, err := br.ReadString('\n')
-		if err != nil {
-			if err == io.EOF {
-				break
-			}
-			return err
-		}
-		s = strings.TrimSpace(s)
-		if strings.Contains(s, "BEGIN ICANN DOMAINS") {
-			icann = true
-			continue
-		}
-		if strings.Contains(s, "END ICANN DOMAINS") {
-			icann = false
-			continue
-		}
-		if s == "" || strings.HasPrefix(s, "//") {
-			continue
-		}
-		s, err = idna.ToASCII(s)
-		if err != nil {
-			return err
-		}
-		if !validSuffixRE.MatchString(s) {
-			return fmt.Errorf("bad publicsuffix.org list data: %q", s)
-		}
-
-		if *subset {
-			switch {
-			case s == "ac.jp" || strings.HasSuffix(s, ".ac.jp"):
-			case s == "ak.us" || strings.HasSuffix(s, ".ak.us"):
-			case s == "ao" || strings.HasSuffix(s, ".ao"):
-			case s == "ar" || strings.HasSuffix(s, ".ar"):
-			case s == "arpa" || strings.HasSuffix(s, ".arpa"):
-			case s == "cy" || strings.HasSuffix(s, ".cy"):
-			case s == "dyndns.org" || strings.HasSuffix(s, ".dyndns.org"):
-			case s == "jp":
-			case s == "kobe.jp" || strings.HasSuffix(s, ".kobe.jp"):
-			case s == "kyoto.jp" || strings.HasSuffix(s, ".kyoto.jp"):
-			case s == "om" || strings.HasSuffix(s, ".om"):
-			case s == "uk" || strings.HasSuffix(s, ".uk"):
-			case s == "uk.com" || strings.HasSuffix(s, ".uk.com"):
-			case s == "tw" || strings.HasSuffix(s, ".tw"):
-			case s == "zw" || strings.HasSuffix(s, ".zw"):
-			case s == "xn--p1ai" || strings.HasSuffix(s, ".xn--p1ai"):
-				// xn--p1ai is Russian-Cyrillic "рф".
-			default:
-				continue
-			}
-		}
-
-		rules = append(rules, s)
-
-		nt, wildcard := nodeTypeNormal, false
-		switch {
-		case strings.HasPrefix(s, "*."):
-			s, nt = s[2:], nodeTypeParentOnly
-			wildcard = true
-		case strings.HasPrefix(s, "!"):
-			s, nt = s[1:], nodeTypeException
-		}
-		labels := strings.Split(s, ".")
-		for n, i := &root, len(labels)-1; i >= 0; i-- {
-			label := labels[i]
-			n = n.child(label)
-			if i == 0 {
-				if nt != nodeTypeParentOnly && n.nodeType == nodeTypeParentOnly {
-					n.nodeType = nt
-				}
-				n.icann = n.icann && icann
-				n.wildcard = n.wildcard || wildcard
-			}
-			labelsMap[label] = true
-		}
-	}
-	labelsList = make([]string, 0, len(labelsMap))
-	for label := range labelsMap {
-		labelsList = append(labelsList, label)
-	}
-	sort.Strings(labelsList)
-
-	if err := generate(printReal, &root, "table.go"); err != nil {
-		return err
-	}
-	if err := generate(printTest, &root, "table_test.go"); err != nil {
-		return err
-	}
-	return nil
-}
-
-func generate(p func(io.Writer, *node) error, root *node, filename string) error {
-	buf := new(bytes.Buffer)
-	if err := p(buf, root); err != nil {
-		return err
-	}
-	b, err := format.Source(buf.Bytes())
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile(filename, b, 0644)
-}
-
-func gitCommit() (sha, date string, retErr error) {
-	res, err := http.Get(gitCommitURL)
-	if err != nil {
-		return "", "", err
-	}
-	if res.StatusCode != http.StatusOK {
-		return "", "", fmt.Errorf("bad GET status for %s: %d", gitCommitURL, res.Status)
-	}
-	defer res.Body.Close()
-	b, err := ioutil.ReadAll(res.Body)
-	if err != nil {
-		return "", "", err
-	}
-	if m := shaRE.FindSubmatch(b); m != nil {
-		sha = string(m[1])
-	}
-	if m := dateRE.FindSubmatch(b); m != nil {
-		date = string(m[1])
-	}
-	if sha == "" || date == "" {
-		retErr = fmt.Errorf("could not find commit SHA and date in %s", gitCommitURL)
-	}
-	return sha, date, retErr
-}
-
-func printTest(w io.Writer, n *node) error {
-	fmt.Fprintf(w, "// generated by go run gen.go; DO NOT EDIT\n\n")
-	fmt.Fprintf(w, "package publicsuffix\n\nvar rules = [...]string{\n")
-	for _, rule := range rules {
-		fmt.Fprintf(w, "%q,\n", rule)
-	}
-	fmt.Fprintf(w, "}\n\nvar nodeLabels = [...]string{\n")
-	if err := n.walk(w, printNodeLabel); err != nil {
-		return err
-	}
-	fmt.Fprintf(w, "}\n")
-	return nil
-}
-
-func printReal(w io.Writer, n *node) error {
-	const header = `// generated by go run gen.go; DO NOT EDIT
-
-package publicsuffix
-
-const version = %q
-
-const (
-	nodesBitsChildren   = %d
-	nodesBitsICANN      = %d
-	nodesBitsTextOffset = %d
-	nodesBitsTextLength = %d
-
-	childrenBitsWildcard = %d
-	childrenBitsNodeType = %d
-	childrenBitsHi       = %d
-	childrenBitsLo       = %d
-)
-
-const (
-	nodeTypeNormal     = %d
-	nodeTypeException  = %d
-	nodeTypeParentOnly = %d
-)
-
-// numTLD is the number of top level domains.
-const numTLD = %d
-
-`
-	fmt.Fprintf(w, header, *version,
-		nodesBitsChildren, nodesBitsICANN, nodesBitsTextOffset, nodesBitsTextLength,
-		childrenBitsWildcard, childrenBitsNodeType, childrenBitsHi, childrenBitsLo,
-		nodeTypeNormal, nodeTypeException, nodeTypeParentOnly, len(n.children))
-
-	text := combineText(labelsList)
-	if text == "" {
-		return fmt.Errorf("internal error: makeText returned no text")
-	}
-	for _, label := range labelsList {
-		offset, length := strings.Index(text, label), len(label)
-		if offset < 0 {
-			return fmt.Errorf("internal error: could not find %q in text %q", label, text)
-		}
-		maxTextOffset, maxTextLength = max(maxTextOffset, offset), max(maxTextLength, length)
-		if offset >= 1<<nodesBitsTextOffset {
-			return fmt.Errorf("text offset %d is too large, or nodeBitsTextOffset is too small", offset)
-		}
-		if length >= 1<<nodesBitsTextLength {
-			return fmt.Errorf("text length %d is too large, or nodeBitsTextLength is too small", length)
-		}
-		labelEncoding[label] = uint32(offset)<<nodesBitsTextLength | uint32(length)
-	}
-	fmt.Fprintf(w, "// Text is the combined text of all labels.\nconst text = ")
-	for len(text) > 0 {
-		n, plus := len(text), ""
-		if n > 64 {
-			n, plus = 64, " +"
-		}
-		fmt.Fprintf(w, "%q%s\n", text[:n], plus)
-		text = text[n:]
-	}
-
-	if err := n.walk(w, assignIndexes); err != nil {
-		return err
-	}
-
-	fmt.Fprintf(w, `
-
-// nodes is the list of nodes. Each node is represented as a uint32, which
-// encodes the node's children, wildcard bit and node type (as an index into
-// the children array), ICANN bit and text.
-//
-// If the table was generated with the -comments flag, there is a //-comment
-// after each node's data. In it is the nodes-array indexes of the children,
-// formatted as (n0x1234-n0x1256), with * denoting the wildcard bit. The
-// nodeType is printed as + for normal, ! for exception, and o for parent-only
-// nodes that have children but don't match a domain label in their own right.
-// An I denotes an ICANN domain.
-//
-// The layout within the uint32, from MSB to LSB, is:
-//	[%2d bits] unused
-//	[%2d bits] children index
-//	[%2d bits] ICANN bit
-//	[%2d bits] text index
-//	[%2d bits] text length
-var nodes = [...]uint32{
-`,
-		32-nodesBitsChildren-nodesBitsICANN-nodesBitsTextOffset-nodesBitsTextLength,
-		nodesBitsChildren, nodesBitsICANN, nodesBitsTextOffset, nodesBitsTextLength)
-	if err := n.walk(w, printNode); err != nil {
-		return err
-	}
-	fmt.Fprintf(w, `}
-
-// children is the list of nodes' children, the parent's wildcard bit and the
-// parent's node type. If a node has no children then their children index
-// will be in the range [0, 6), depending on the wildcard bit and node type.
-//
-// The layout within the uint32, from MSB to LSB, is:
-//	[%2d bits] unused
-//	[%2d bits] wildcard bit
-//	[%2d bits] node type
-//	[%2d bits] high nodes index (exclusive) of children
-//	[%2d bits] low nodes index (inclusive) of children
-var children=[...]uint32{
-`,
-		32-childrenBitsWildcard-childrenBitsNodeType-childrenBitsHi-childrenBitsLo,
-		childrenBitsWildcard, childrenBitsNodeType, childrenBitsHi, childrenBitsLo)
-	for i, c := range childrenEncoding {
-		s := "---------------"
-		lo := c & (1<<childrenBitsLo - 1)
-		hi := (c >> childrenBitsLo) & (1<<childrenBitsHi - 1)
-		if lo != hi {
-			s = fmt.Sprintf("n0x%04x-n0x%04x", lo, hi)
-		}
-		nodeType := int(c>>(childrenBitsLo+childrenBitsHi)) & (1<<childrenBitsNodeType - 1)
-		wildcard := c>>(childrenBitsLo+childrenBitsHi+childrenBitsNodeType) != 0
-		if *comments {
-			fmt.Fprintf(w, "0x%08x, // c0x%04x (%s)%s %s\n",
-				c, i, s, wildcardStr(wildcard), nodeTypeStr(nodeType))
-		} else {
-			fmt.Fprintf(w, "0x%x,\n", c)
-		}
-	}
-	fmt.Fprintf(w, "}\n\n")
-	fmt.Fprintf(w, "// max children %d (capacity %d)\n", maxChildren, 1<<nodesBitsChildren-1)
-	fmt.Fprintf(w, "// max text offset %d (capacity %d)\n", maxTextOffset, 1<<nodesBitsTextOffset-1)
-	fmt.Fprintf(w, "// max text length %d (capacity %d)\n", maxTextLength, 1<<nodesBitsTextLength-1)
-	fmt.Fprintf(w, "// max hi %d (capacity %d)\n", maxHi, 1<<childrenBitsHi-1)
-	fmt.Fprintf(w, "// max lo %d (capacity %d)\n", maxLo, 1<<childrenBitsLo-1)
-	return nil
-}
-
-type node struct {
-	label    string
-	nodeType int
-	icann    bool
-	wildcard bool
-	// nodesIndex and childrenIndex are the index of this node in the nodes
-	// and the index of its children offset/length in the children arrays.
-	nodesIndex, childrenIndex int
-	// firstChild is the index of this node's first child, or zero if this
-	// node has no children.
-	firstChild int
-	// children are the node's children, in strictly increasing node label order.
-	children []*node
-}
-
-func (n *node) walk(w io.Writer, f func(w1 io.Writer, n1 *node) error) error {
-	if err := f(w, n); err != nil {
-		return err
-	}
-	for _, c := range n.children {
-		if err := c.walk(w, f); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// child returns the child of n with the given label. The child is created if
-// it did not exist beforehand.
-func (n *node) child(label string) *node {
-	for _, c := range n.children {
-		if c.label == label {
-			return c
-		}
-	}
-	c := &node{
-		label:    label,
-		nodeType: nodeTypeParentOnly,
-		icann:    true,
-	}
-	n.children = append(n.children, c)
-	sort.Sort(byLabel(n.children))
-	return c
-}
-
-type byLabel []*node
-
-func (b byLabel) Len() int           { return len(b) }
-func (b byLabel) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b byLabel) Less(i, j int) bool { return b[i].label < b[j].label }
-
-var nextNodesIndex int
-
-// childrenEncoding are the encoded entries in the generated children array.
-// All these pre-defined entries have no children.
-var childrenEncoding = []uint32{
-	0 << (childrenBitsLo + childrenBitsHi), // Without wildcard bit, nodeTypeNormal.
-	1 << (childrenBitsLo + childrenBitsHi), // Without wildcard bit, nodeTypeException.
-	2 << (childrenBitsLo + childrenBitsHi), // Without wildcard bit, nodeTypeParentOnly.
-	4 << (childrenBitsLo + childrenBitsHi), // With wildcard bit, nodeTypeNormal.
-	5 << (childrenBitsLo + childrenBitsHi), // With wildcard bit, nodeTypeException.
-	6 << (childrenBitsLo + childrenBitsHi), // With wildcard bit, nodeTypeParentOnly.
-}
-
-var firstCallToAssignIndexes = true
-
-func assignIndexes(w io.Writer, n *node) error {
-	if len(n.children) != 0 {
-		// Assign nodesIndex.
-		n.firstChild = nextNodesIndex
-		for _, c := range n.children {
-			c.nodesIndex = nextNodesIndex
-			nextNodesIndex++
-		}
-
-		// The root node's children is implicit.
-		if firstCallToAssignIndexes {
-			firstCallToAssignIndexes = false
-			return nil
-		}
-
-		// Assign childrenIndex.
-		maxChildren = max(maxChildren, len(childrenEncoding))
-		if len(childrenEncoding) >= 1<<nodesBitsChildren {
-			return fmt.Errorf("children table size %d is too large, or nodeBitsChildren is too small", len(childrenEncoding))
-		}
-		n.childrenIndex = len(childrenEncoding)
-		lo := uint32(n.firstChild)
-		hi := lo + uint32(len(n.children))
-		maxLo, maxHi = u32max(maxLo, lo), u32max(maxHi, hi)
-		if lo >= 1<<childrenBitsLo {
-			return fmt.Errorf("children lo %d is too large, or childrenBitsLo is too small", lo)
-		}
-		if hi >= 1<<childrenBitsHi {
-			return fmt.Errorf("children hi %d is too large, or childrenBitsHi is too small", hi)
-		}
-		enc := hi<<childrenBitsLo | lo
-		enc |= uint32(n.nodeType) << (childrenBitsLo + childrenBitsHi)
-		if n.wildcard {
-			enc |= 1 << (childrenBitsLo + childrenBitsHi + childrenBitsNodeType)
-		}
-		childrenEncoding = append(childrenEncoding, enc)
-	} else {
-		n.childrenIndex = n.nodeType
-		if n.wildcard {
-			n.childrenIndex += numNodeType
-		}
-	}
-	return nil
-}
-
-func printNode(w io.Writer, n *node) error {
-	for _, c := range n.children {
-		s := "---------------"
-		if len(c.children) != 0 {
-			s = fmt.Sprintf("n0x%04x-n0x%04x", c.firstChild, c.firstChild+len(c.children))
-		}
-		encoding := labelEncoding[c.label]
-		if c.icann {
-			encoding |= 1 << (nodesBitsTextLength + nodesBitsTextOffset)
-		}
-		encoding |= uint32(c.childrenIndex) << (nodesBitsTextLength + nodesBitsTextOffset + nodesBitsICANN)
-		if *comments {
-			fmt.Fprintf(w, "0x%08x, // n0x%04x c0x%04x (%s)%s %s %s %s\n",
-				encoding, c.nodesIndex, c.childrenIndex, s, wildcardStr(c.wildcard),
-				nodeTypeStr(c.nodeType), icannStr(c.icann), c.label,
-			)
-		} else {
-			fmt.Fprintf(w, "0x%x,\n", encoding)
-		}
-	}
-	return nil
-}
-
-func printNodeLabel(w io.Writer, n *node) error {
-	for _, c := range n.children {
-		fmt.Fprintf(w, "%q,\n", c.label)
-	}
-	return nil
-}
-
-func icannStr(icann bool) string {
-	if icann {
-		return "I"
-	}
-	return " "
-}
-
-func wildcardStr(wildcard bool) string {
-	if wildcard {
-		return "*"
-	}
-	return " "
-}
-
-// combineText combines all the strings in labelsList to form one giant string.
-// Overlapping strings will be merged: "arpa" and "parliament" could yield
-// "arparliament".
-func combineText(labelsList []string) string {
-	beforeLength := 0
-	for _, s := range labelsList {
-		beforeLength += len(s)
-	}
-
-	text := crush(removeSubstrings(labelsList))
-	if *v {
-		fmt.Fprintf(os.Stderr, "crushed %d bytes to become %d bytes\n", beforeLength, len(text))
-	}
-	return text
-}
-
-type byLength []string
-
-func (s byLength) Len() int           { return len(s) }
-func (s byLength) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s byLength) Less(i, j int) bool { return len(s[i]) < len(s[j]) }
-
-// removeSubstrings returns a copy of its input with any strings removed
-// that are substrings of other provided strings.
-func removeSubstrings(input []string) []string {
-	// Make a copy of input.
-	ss := append(make([]string, 0, len(input)), input...)
-	sort.Sort(byLength(ss))
-
-	for i, shortString := range ss {
-		// For each string, only consider strings higher than it in sort order, i.e.
-		// of equal length or greater.
-		for _, longString := range ss[i+1:] {
-			if strings.Contains(longString, shortString) {
-				ss[i] = ""
-				break
-			}
-		}
-	}
-
-	// Remove the empty strings.
-	sort.Strings(ss)
-	for len(ss) > 0 && ss[0] == "" {
-		ss = ss[1:]
-	}
-	return ss
-}
-
-// crush combines a list of strings, taking advantage of overlaps. It returns a
-// single string that contains each input string as a substring.
-func crush(ss []string) string {
-	maxLabelLen := 0
-	for _, s := range ss {
-		if maxLabelLen < len(s) {
-			maxLabelLen = len(s)
-		}
-	}
-
-	for prefixLen := maxLabelLen; prefixLen > 0; prefixLen-- {
-		prefixes := makePrefixMap(ss, prefixLen)
-		for i, s := range ss {
-			if len(s) <= prefixLen {
-				continue
-			}
-			mergeLabel(ss, i, prefixLen, prefixes)
-		}
-	}
-
-	return strings.Join(ss, "")
-}
-
-// mergeLabel merges the label at ss[i] with the first available matching label
-// in prefixMap, where the last "prefixLen" characters in ss[i] match the first
-// "prefixLen" characters in the matching label.
-// It will merge ss[i] repeatedly until no more matches are available.
-// All matching labels merged into ss[i] are replaced by "".
-func mergeLabel(ss []string, i, prefixLen int, prefixes prefixMap) {
-	s := ss[i]
-	suffix := s[len(s)-prefixLen:]
-	for _, j := range prefixes[suffix] {
-		// Empty strings mean "already used." Also avoid merging with self.
-		if ss[j] == "" || i == j {
-			continue
-		}
-		if *v {
-			fmt.Fprintf(os.Stderr, "%d-length overlap at (%4d,%4d): %q and %q share %q\n",
-				prefixLen, i, j, ss[i], ss[j], suffix)
-		}
-		ss[i] += ss[j][prefixLen:]
-		ss[j] = ""
-		// ss[i] has a new suffix, so merge again if possible.
-		// Note: we only have to merge again at the same prefix length. Shorter
-		// prefix lengths will be handled in the next iteration of crush's for loop.
-		// Can there be matches for longer prefix lengths, introduced by the merge?
-		// I believe that any such matches would by necessity have been eliminated
-		// during substring removal or merged at a higher prefix length. For
-		// instance, in crush("abc", "cde", "bcdef"), combining "abc" and "cde"
-		// would yield "abcde", which could be merged with "bcdef." However, in
-		// practice "cde" would already have been elimintated by removeSubstrings.
-		mergeLabel(ss, i, prefixLen, prefixes)
-		return
-	}
-}
-
-// prefixMap maps from a prefix to a list of strings containing that prefix. The
-// list of strings is represented as indexes into a slice of strings stored
-// elsewhere.
-type prefixMap map[string][]int
-
-// makePrefixMap constructs a prefixMap from a slice of strings.
-func makePrefixMap(ss []string, prefixLen int) prefixMap {
-	prefixes := make(prefixMap)
-	for i, s := range ss {
-		// We use < rather than <= because if a label matches on a prefix equal to
-		// its full length, that's actually a substring match handled by
-		// removeSubstrings.
-		if prefixLen < len(s) {
-			prefix := s[:prefixLen]
-			prefixes[prefix] = append(prefixes[prefix], i)
-		}
-	}
-
-	return prefixes
-}
diff --git a/installer/vendor/golang.org/x/net/publicsuffix/list.go b/installer/vendor/golang.org/x/net/publicsuffix/list.go
deleted file mode 100644
index 8bbf3bcd7e..0000000000
--- a/installer/vendor/golang.org/x/net/publicsuffix/list.go
+++ /dev/null
@@ -1,135 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run gen.go
-
-// Package publicsuffix provides a public suffix list based on data from
-// http://publicsuffix.org/. A public suffix is one under which Internet users
-// can directly register names.
-package publicsuffix // import "golang.org/x/net/publicsuffix"
-
-// TODO: specify case sensitivity and leading/trailing dot behavior for
-// func PublicSuffix and func EffectiveTLDPlusOne.
-
-import (
-	"fmt"
-	"net/http/cookiejar"
-	"strings"
-)
-
-// List implements the cookiejar.PublicSuffixList interface by calling the
-// PublicSuffix function.
-var List cookiejar.PublicSuffixList = list{}
-
-type list struct{}
-
-func (list) PublicSuffix(domain string) string {
-	ps, _ := PublicSuffix(domain)
-	return ps
-}
-
-func (list) String() string {
-	return version
-}
-
-// PublicSuffix returns the public suffix of the domain using a copy of the
-// publicsuffix.org database compiled into the library.
-//
-// icann is whether the public suffix is managed by the Internet Corporation
-// for Assigned Names and Numbers. If not, the public suffix is privately
-// managed. For example, foo.org and foo.co.uk are ICANN domains,
-// foo.dyndns.org and foo.blogspot.co.uk are private domains.
-//
-// Use cases for distinguishing ICANN domains like foo.com from private
-// domains like foo.appspot.com can be found at
-// https://wiki.mozilla.org/Public_Suffix_List/Use_Cases
-func PublicSuffix(domain string) (publicSuffix string, icann bool) {
-	lo, hi := uint32(0), uint32(numTLD)
-	s, suffix, wildcard := domain, len(domain), false
-loop:
-	for {
-		dot := strings.LastIndex(s, ".")
-		if wildcard {
-			suffix = 1 + dot
-		}
-		if lo == hi {
-			break
-		}
-		f := find(s[1+dot:], lo, hi)
-		if f == notFound {
-			break
-		}
-
-		u := nodes[f] >> (nodesBitsTextOffset + nodesBitsTextLength)
-		icann = u&(1<<nodesBitsICANN-1) != 0
-		u >>= nodesBitsICANN
-		u = children[u&(1<<nodesBitsChildren-1)]
-		lo = u & (1<<childrenBitsLo - 1)
-		u >>= childrenBitsLo
-		hi = u & (1<<childrenBitsHi - 1)
-		u >>= childrenBitsHi
-		switch u & (1<<childrenBitsNodeType - 1) {
-		case nodeTypeNormal:
-			suffix = 1 + dot
-		case nodeTypeException:
-			suffix = 1 + len(s)
-			break loop
-		}
-		u >>= childrenBitsNodeType
-		wildcard = u&(1<<childrenBitsWildcard-1) != 0
-
-		if dot == -1 {
-			break
-		}
-		s = s[:dot]
-	}
-	if suffix == len(domain) {
-		// If no rules match, the prevailing rule is "*".
-		return domain[1+strings.LastIndex(domain, "."):], icann
-	}
-	return domain[suffix:], icann
-}
-
-const notFound uint32 = 1<<32 - 1
-
-// find returns the index of the node in the range [lo, hi) whose label equals
-// label, or notFound if there is no such node. The range is assumed to be in
-// strictly increasing node label order.
-func find(label string, lo, hi uint32) uint32 {
-	for lo < hi {
-		mid := lo + (hi-lo)/2
-		s := nodeLabel(mid)
-		if s < label {
-			lo = mid + 1
-		} else if s == label {
-			return mid
-		} else {
-			hi = mid
-		}
-	}
-	return notFound
-}
-
-// nodeLabel returns the label for the i'th node.
-func nodeLabel(i uint32) string {
-	x := nodes[i]
-	length := x & (1<<nodesBitsTextLength - 1)
-	x >>= nodesBitsTextLength
-	offset := x & (1<<nodesBitsTextOffset - 1)
-	return text[offset : offset+length]
-}
-
-// EffectiveTLDPlusOne returns the effective top level domain plus one more
-// label. For example, the eTLD+1 for "foo.bar.golang.org" is "golang.org".
-func EffectiveTLDPlusOne(domain string) (string, error) {
-	suffix, _ := PublicSuffix(domain)
-	if len(domain) <= len(suffix) {
-		return "", fmt.Errorf("publicsuffix: cannot derive eTLD+1 for domain %q", domain)
-	}
-	i := len(domain) - len(suffix) - 1
-	if domain[i] != '.' {
-		return "", fmt.Errorf("publicsuffix: invalid public suffix %q for domain %q", suffix, domain)
-	}
-	return domain[1+strings.LastIndex(domain[:i], "."):], nil
-}
diff --git a/installer/vendor/golang.org/x/net/publicsuffix/list_test.go b/installer/vendor/golang.org/x/net/publicsuffix/list_test.go
deleted file mode 100644
index a08e64eaf4..0000000000
--- a/installer/vendor/golang.org/x/net/publicsuffix/list_test.go
+++ /dev/null
@@ -1,416 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package publicsuffix
-
-import (
-	"sort"
-	"strings"
-	"testing"
-)
-
-func TestNodeLabel(t *testing.T) {
-	for i, want := range nodeLabels {
-		got := nodeLabel(uint32(i))
-		if got != want {
-			t.Errorf("%d: got %q, want %q", i, got, want)
-		}
-	}
-}
-
-func TestFind(t *testing.T) {
-	testCases := []string{
-		"",
-		"a",
-		"a0",
-		"aaaa",
-		"ao",
-		"ap",
-		"ar",
-		"aro",
-		"arp",
-		"arpa",
-		"arpaa",
-		"arpb",
-		"az",
-		"b",
-		"b0",
-		"ba",
-		"z",
-		"zu",
-		"zv",
-		"zw",
-		"zx",
-		"zy",
-		"zz",
-		"zzzz",
-	}
-	for _, tc := range testCases {
-		got := find(tc, 0, numTLD)
-		want := notFound
-		for i := uint32(0); i < numTLD; i++ {
-			if tc == nodeLabel(i) {
-				want = i
-				break
-			}
-		}
-		if got != want {
-			t.Errorf("%q: got %d, want %d", tc, got, want)
-		}
-	}
-}
-
-func TestICANN(t *testing.T) {
-	testCases := map[string]bool{
-		"foo.org":            true,
-		"foo.co.uk":          true,
-		"foo.dyndns.org":     false,
-		"foo.go.dyndns.org":  false,
-		"foo.blogspot.co.uk": false,
-		"foo.intranet":       false,
-	}
-	for domain, want := range testCases {
-		_, got := PublicSuffix(domain)
-		if got != want {
-			t.Errorf("%q: got %v, want %v", domain, got, want)
-		}
-	}
-}
-
-var publicSuffixTestCases = []struct {
-	domain, want string
-}{
-	// Empty string.
-	{"", ""},
-
-	// The .ao rules are:
-	// ao
-	// ed.ao
-	// gv.ao
-	// og.ao
-	// co.ao
-	// pb.ao
-	// it.ao
-	{"ao", "ao"},
-	{"www.ao", "ao"},
-	{"pb.ao", "pb.ao"},
-	{"www.pb.ao", "pb.ao"},
-	{"www.xxx.yyy.zzz.pb.ao", "pb.ao"},
-
-	// The .ar rules are:
-	// ar
-	// com.ar
-	// edu.ar
-	// gob.ar
-	// gov.ar
-	// int.ar
-	// mil.ar
-	// net.ar
-	// org.ar
-	// tur.ar
-	// blogspot.com.ar
-	{"ar", "ar"},
-	{"www.ar", "ar"},
-	{"nic.ar", "ar"},
-	{"www.nic.ar", "ar"},
-	{"com.ar", "com.ar"},
-	{"www.com.ar", "com.ar"},
-	{"blogspot.com.ar", "blogspot.com.ar"},
-	{"www.blogspot.com.ar", "blogspot.com.ar"},
-	{"www.xxx.yyy.zzz.blogspot.com.ar", "blogspot.com.ar"},
-	{"logspot.com.ar", "com.ar"},
-	{"zlogspot.com.ar", "com.ar"},
-	{"zblogspot.com.ar", "com.ar"},
-
-	// The .arpa rules are:
-	// arpa
-	// e164.arpa
-	// in-addr.arpa
-	// ip6.arpa
-	// iris.arpa
-	// uri.arpa
-	// urn.arpa
-	{"arpa", "arpa"},
-	{"www.arpa", "arpa"},
-	{"urn.arpa", "urn.arpa"},
-	{"www.urn.arpa", "urn.arpa"},
-	{"www.xxx.yyy.zzz.urn.arpa", "urn.arpa"},
-
-	// The relevant {kobe,kyoto}.jp rules are:
-	// jp
-	// *.kobe.jp
-	// !city.kobe.jp
-	// kyoto.jp
-	// ide.kyoto.jp
-	{"jp", "jp"},
-	{"kobe.jp", "jp"},
-	{"c.kobe.jp", "c.kobe.jp"},
-	{"b.c.kobe.jp", "c.kobe.jp"},
-	{"a.b.c.kobe.jp", "c.kobe.jp"},
-	{"city.kobe.jp", "kobe.jp"},
-	{"www.city.kobe.jp", "kobe.jp"},
-	{"kyoto.jp", "kyoto.jp"},
-	{"test.kyoto.jp", "kyoto.jp"},
-	{"ide.kyoto.jp", "ide.kyoto.jp"},
-	{"b.ide.kyoto.jp", "ide.kyoto.jp"},
-	{"a.b.ide.kyoto.jp", "ide.kyoto.jp"},
-
-	// The .tw rules are:
-	// tw
-	// edu.tw
-	// gov.tw
-	// mil.tw
-	// com.tw
-	// net.tw
-	// org.tw
-	// idv.tw
-	// game.tw
-	// ebiz.tw
-	// club.tw
-	// 網路.tw (xn--zf0ao64a.tw)
-	// 組織.tw (xn--uc0atv.tw)
-	// 商業.tw (xn--czrw28b.tw)
-	// blogspot.tw
-	{"tw", "tw"},
-	{"aaa.tw", "tw"},
-	{"www.aaa.tw", "tw"},
-	{"xn--czrw28b.aaa.tw", "tw"},
-	{"edu.tw", "edu.tw"},
-	{"www.edu.tw", "edu.tw"},
-	{"xn--czrw28b.edu.tw", "edu.tw"},
-	{"xn--czrw28b.tw", "xn--czrw28b.tw"},
-	{"www.xn--czrw28b.tw", "xn--czrw28b.tw"},
-	{"xn--uc0atv.xn--czrw28b.tw", "xn--czrw28b.tw"},
-	{"xn--kpry57d.tw", "tw"},
-
-	// The .uk rules are:
-	// uk
-	// ac.uk
-	// co.uk
-	// gov.uk
-	// ltd.uk
-	// me.uk
-	// net.uk
-	// nhs.uk
-	// org.uk
-	// plc.uk
-	// police.uk
-	// *.sch.uk
-	// blogspot.co.uk
-	{"uk", "uk"},
-	{"aaa.uk", "uk"},
-	{"www.aaa.uk", "uk"},
-	{"mod.uk", "uk"},
-	{"www.mod.uk", "uk"},
-	{"sch.uk", "uk"},
-	{"mod.sch.uk", "mod.sch.uk"},
-	{"www.sch.uk", "www.sch.uk"},
-	{"blogspot.co.uk", "blogspot.co.uk"},
-	{"blogspot.nic.uk", "uk"},
-	{"blogspot.sch.uk", "blogspot.sch.uk"},
-
-	// The .рф rules are
-	// рф (xn--p1ai)
-	{"xn--p1ai", "xn--p1ai"},
-	{"aaa.xn--p1ai", "xn--p1ai"},
-	{"www.xxx.yyy.xn--p1ai", "xn--p1ai"},
-
-	// The .zw rules are:
-	// *.zw
-	{"zw", "zw"},
-	{"www.zw", "www.zw"},
-	{"zzz.zw", "zzz.zw"},
-	{"www.zzz.zw", "zzz.zw"},
-	{"www.xxx.yyy.zzz.zw", "zzz.zw"},
-
-	// There are no .nosuchtld rules.
-	{"nosuchtld", "nosuchtld"},
-	{"foo.nosuchtld", "nosuchtld"},
-	{"bar.foo.nosuchtld", "nosuchtld"},
-}
-
-func BenchmarkPublicSuffix(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		for _, tc := range publicSuffixTestCases {
-			List.PublicSuffix(tc.domain)
-		}
-	}
-}
-
-func TestPublicSuffix(t *testing.T) {
-	for _, tc := range publicSuffixTestCases {
-		got := List.PublicSuffix(tc.domain)
-		if got != tc.want {
-			t.Errorf("%q: got %q, want %q", tc.domain, got, tc.want)
-		}
-	}
-}
-
-func TestSlowPublicSuffix(t *testing.T) {
-	for _, tc := range publicSuffixTestCases {
-		got := slowPublicSuffix(tc.domain)
-		if got != tc.want {
-			t.Errorf("%q: got %q, want %q", tc.domain, got, tc.want)
-		}
-	}
-}
-
-// slowPublicSuffix implements the canonical (but O(number of rules)) public
-// suffix algorithm described at http://publicsuffix.org/list/.
-//
-// 1. Match domain against all rules and take note of the matching ones.
-// 2. If no rules match, the prevailing rule is "*".
-// 3. If more than one rule matches, the prevailing rule is the one which is an exception rule.
-// 4. If there is no matching exception rule, the prevailing rule is the one with the most labels.
-// 5. If the prevailing rule is a exception rule, modify it by removing the leftmost label.
-// 6. The public suffix is the set of labels from the domain which directly match the labels of the prevailing rule (joined by dots).
-// 7. The registered or registrable domain is the public suffix plus one additional label.
-//
-// This function returns the public suffix, not the registrable domain, and so
-// it stops after step 6.
-func slowPublicSuffix(domain string) string {
-	match := func(rulePart, domainPart string) bool {
-		switch rulePart[0] {
-		case '*':
-			return true
-		case '!':
-			return rulePart[1:] == domainPart
-		}
-		return rulePart == domainPart
-	}
-
-	domainParts := strings.Split(domain, ".")
-	var matchingRules [][]string
-
-loop:
-	for _, rule := range rules {
-		ruleParts := strings.Split(rule, ".")
-		if len(domainParts) < len(ruleParts) {
-			continue
-		}
-		for i := range ruleParts {
-			rulePart := ruleParts[len(ruleParts)-1-i]
-			domainPart := domainParts[len(domainParts)-1-i]
-			if !match(rulePart, domainPart) {
-				continue loop
-			}
-		}
-		matchingRules = append(matchingRules, ruleParts)
-	}
-	if len(matchingRules) == 0 {
-		matchingRules = append(matchingRules, []string{"*"})
-	} else {
-		sort.Sort(byPriority(matchingRules))
-	}
-	prevailing := matchingRules[0]
-	if prevailing[0][0] == '!' {
-		prevailing = prevailing[1:]
-	}
-	if prevailing[0][0] == '*' {
-		replaced := domainParts[len(domainParts)-len(prevailing)]
-		prevailing = append([]string{replaced}, prevailing[1:]...)
-	}
-	return strings.Join(prevailing, ".")
-}
-
-type byPriority [][]string
-
-func (b byPriority) Len() int      { return len(b) }
-func (b byPriority) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
-func (b byPriority) Less(i, j int) bool {
-	if b[i][0][0] == '!' {
-		return true
-	}
-	if b[j][0][0] == '!' {
-		return false
-	}
-	return len(b[i]) > len(b[j])
-}
-
-// eTLDPlusOneTestCases come from
-// https://github.com/publicsuffix/list/blob/master/tests/test_psl.txt
-var eTLDPlusOneTestCases = []struct {
-	domain, want string
-}{
-	// Empty input.
-	{"", ""},
-	// Unlisted TLD.
-	{"example", ""},
-	{"example.example", "example.example"},
-	{"b.example.example", "example.example"},
-	{"a.b.example.example", "example.example"},
-	// TLD with only 1 rule.
-	{"biz", ""},
-	{"domain.biz", "domain.biz"},
-	{"b.domain.biz", "domain.biz"},
-	{"a.b.domain.biz", "domain.biz"},
-	// TLD with some 2-level rules.
-	{"com", ""},
-	{"example.com", "example.com"},
-	{"b.example.com", "example.com"},
-	{"a.b.example.com", "example.com"},
-	{"uk.com", ""},
-	{"example.uk.com", "example.uk.com"},
-	{"b.example.uk.com", "example.uk.com"},
-	{"a.b.example.uk.com", "example.uk.com"},
-	{"test.ac", "test.ac"},
-	// TLD with only 1 (wildcard) rule.
-	{"mm", ""},
-	{"c.mm", ""},
-	{"b.c.mm", "b.c.mm"},
-	{"a.b.c.mm", "b.c.mm"},
-	// More complex TLD.
-	{"jp", ""},
-	{"test.jp", "test.jp"},
-	{"www.test.jp", "test.jp"},
-	{"ac.jp", ""},
-	{"test.ac.jp", "test.ac.jp"},
-	{"www.test.ac.jp", "test.ac.jp"},
-	{"kyoto.jp", ""},
-	{"test.kyoto.jp", "test.kyoto.jp"},
-	{"ide.kyoto.jp", ""},
-	{"b.ide.kyoto.jp", "b.ide.kyoto.jp"},
-	{"a.b.ide.kyoto.jp", "b.ide.kyoto.jp"},
-	{"c.kobe.jp", ""},
-	{"b.c.kobe.jp", "b.c.kobe.jp"},
-	{"a.b.c.kobe.jp", "b.c.kobe.jp"},
-	{"city.kobe.jp", "city.kobe.jp"},
-	{"www.city.kobe.jp", "city.kobe.jp"},
-	// TLD with a wildcard rule and exceptions.
-	{"ck", ""},
-	{"test.ck", ""},
-	{"b.test.ck", "b.test.ck"},
-	{"a.b.test.ck", "b.test.ck"},
-	{"www.ck", "www.ck"},
-	{"www.www.ck", "www.ck"},
-	// US K12.
-	{"us", ""},
-	{"test.us", "test.us"},
-	{"www.test.us", "test.us"},
-	{"ak.us", ""},
-	{"test.ak.us", "test.ak.us"},
-	{"www.test.ak.us", "test.ak.us"},
-	{"k12.ak.us", ""},
-	{"test.k12.ak.us", "test.k12.ak.us"},
-	{"www.test.k12.ak.us", "test.k12.ak.us"},
-	// Punycoded IDN labels
-	{"xn--85x722f.com.cn", "xn--85x722f.com.cn"},
-	{"xn--85x722f.xn--55qx5d.cn", "xn--85x722f.xn--55qx5d.cn"},
-	{"www.xn--85x722f.xn--55qx5d.cn", "xn--85x722f.xn--55qx5d.cn"},
-	{"shishi.xn--55qx5d.cn", "shishi.xn--55qx5d.cn"},
-	{"xn--55qx5d.cn", ""},
-	{"xn--85x722f.xn--fiqs8s", "xn--85x722f.xn--fiqs8s"},
-	{"www.xn--85x722f.xn--fiqs8s", "xn--85x722f.xn--fiqs8s"},
-	{"shishi.xn--fiqs8s", "shishi.xn--fiqs8s"},
-	{"xn--fiqs8s", ""},
-}
-
-func TestEffectiveTLDPlusOne(t *testing.T) {
-	for _, tc := range eTLDPlusOneTestCases {
-		got, _ := EffectiveTLDPlusOne(tc.domain)
-		if got != tc.want {
-			t.Errorf("%q: got %q, want %q", tc.domain, got, tc.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/publicsuffix/table.go b/installer/vendor/golang.org/x/net/publicsuffix/table.go
deleted file mode 100644
index 5db1e69863..0000000000
--- a/installer/vendor/golang.org/x/net/publicsuffix/table.go
+++ /dev/null
@@ -1,9093 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package publicsuffix
-
-const version = "publicsuffix.org's public_suffix_list.dat, git revision 45a2bf8ef3e22000fbe4bfa5f9252db41d777001 (2017-01-18T01:04:06Z)"
-
-const (
-	nodesBitsChildren   = 9
-	nodesBitsICANN      = 1
-	nodesBitsTextOffset = 15
-	nodesBitsTextLength = 6
-
-	childrenBitsWildcard = 1
-	childrenBitsNodeType = 2
-	childrenBitsHi       = 14
-	childrenBitsLo       = 14
-)
-
-const (
-	nodeTypeNormal     = 0
-	nodeTypeException  = 1
-	nodeTypeParentOnly = 2
-)
-
-// numTLD is the number of top level domains.
-const numTLD = 1554
-
-// Text is the combined text of all labels.
-const text = "bikedagestangeorgeorgiaxagrocerybnikahokutobishimaizuruhreportar" +
-	"nobrzegyptianaturalhistorymuseumcentereviewskrakoweddinggfarmers" +
-	"einexus-2bilbaogakievenesalangenikiiyamanouchikuhokuryugasakitau" +
-	"rayasudabillustrationikkoebenhavnikolaevennodessagamiharabiomuta" +
-	"shinainfinitintuitattoolsztynsettlersalondonetskarpaczeladzjcbre" +
-	"mangerbirdartcenterprisesakikuchikuseikarugapartmentsaltdalimoli" +
-	"serniabirkenesoddtangenovaravennagasukeverbankaruizawabirthplace" +
-	"vje-og-hornnesalvadordalibabajddarchaeologyusuisserveexchangebja" +
-	"rkoyuufcfanikonantanangerbjerkreimbalsanagochihayaakasakawaharau" +
-	"malopolskanlandds3-us-west-1bjugninohekinannestadrangedalindasda" +
-	"burblockbusternidray-dnsupdaterbloombergbauerninomiyakonojosoyro" +
-	"rosalzburgjovikarumaifarmsteadraydnsamegawabloxcmsamnangerblueda" +
-	"ncebmoattachmentsamsclubindalindesnesamsungladell-ogliastraderbm" +
-	"sandvikcoromantovalle-d-aostatic-accessanfranciscofreakunemurora" +
-	"ngeiseiyoichiropracticasinordre-landrivelandrobaknoluoktabuseekl" +
-	"ogesurancertmgretachikawakkanaibetsubamericanfamilydscloudcontro" +
-	"lledekafjordrudunsangoppdalivornobmweirbnpparibaselburglassassin" +
-	"ationalheritagematsubarakawagoebnrwfarsundupontariobonnirasakinu" +
-	"yamashinashikitchenishiazainvestmentsanjournalismailillesandefjo" +
-	"rdurbanamexhibitionishigobookingliwicebootsannanishiharaboschaef" +
-	"flerdalomzaporizhzhegurinzais-a-bulls-fanishiizunazukis-a-candid" +
-	"atebostikasaokamiminersannohelplfinancialorenskoglobalashovhachi" +
-	"nohedmarkashibatakasakiyokawarabostonakijinsekikogentinglobodoes" +
-	"-itvedestrandurhamburglogowhalingloppenzaogashimadachicagoboatsa" +
-	"nokashiharabotanicalgardenishikatakayamatta-varjjataxihuanishika" +
-	"tsuragithubusercontentgoryuzawabotanicgardenishikawazukamitondab" +
-	"ayashiogamagoriziabotanybouncemerckmsdnipropetrovskjakdnepropetr" +
-	"ovskiervaapsteiermarkashiwarabounty-fullensakerrypropertiesantab" +
-	"arbaraboutiquebecngmbhartiffanybozentsujiiebradescorporationishi" +
-	"merabrandywinevalleybrasiliabresciabrindisibenikebristoloslocalh" +
-	"istoryggeelvinckashiwazakiyosatokashikiyosemitebritishcolumbialo" +
-	"wiezachpomorskienishinomiyashironobroadcastlefrakkestadvrcambrid" +
-	"gestonextdirectjeldsundvrdnsantacruzsantafedextraspacekitagataji" +
-	"rittogoldpoint2thisamitsukebroadwaybroke-itjmaxxxboxenapponazure" +
-	"-mobilebrokerbronnoysundwgminakamichiharabrothermesaverdeatnurem" +
-	"bergmodellingmxfinitybrowsersafetymarketsanukis-a-catererbrumund" +
-	"dalotenkawabrunelasticbeanstalkasukabedzin-the-bandaikawachinaga" +
-	"noharamcoalaskanittedallasalleasinglest-mon-blogueurovisionthewi" +
-	"fiat-band-campaniabrusselsaotomemergencyberlevagangaviikanonjis-" +
-	"a-celticsfanishinoomotegobruxellesapodlasiellakasamatsudovre-eik" +
-	"erbryanskjervoyagebrynewhampshirebungoonordlandyndns-at-workingg" +
-	"roupalacebuskerudinewjerseybuzenishinoshimattelefonicarbonia-igl" +
-	"esias-carboniaiglesiascarboniabuzzlgrimstadyndns-blogdnsapporobw" +
-	"hoswhokksundyndns-freebox-ostrowiecateringebuilderschmidtre-gaul" +
-	"dalottebzhitomirumalselvendrellottokonamegatakasugais-a-chefashi" +
-	"onishiokoppegardyndns-homednsardegnamsskoganeis-a-conservativefs" +
-	"nillfjordyndns-ipaleocondoshichinohealth-carereformitakeharaconf" +
-	"erenceconstructionconsuladoesntexistanbullensvanguardyndns-wikin" +
-	"dlegokasells-for-lessaudaconsultanthropologyconsultingvolluxuryc" +
-	"ontactoyookanmakiwakunigamifunecontemporaryarteducationalchikugo" +
-	"doharuovatoyosatoyakokonoecontractorskenconventureshinodesashibe" +
-	"tsuikinderoycookingchannelblagdenesnaaseralingenkainanaejrietisa" +
-	"latinabenonichernihivanovodkagoshimalvikasumigaurawa-mazowszexjc" +
-	"palermomahachijorpelandyndns-mailouvreisenishitosashimizunaminam" +
-	"iashigaracoolkuszkoladbrokesauheradyndns-workisboringrpamperedch" +
-	"efastlylbaltimore-og-romsdalwaysdatabaseballangenoamishirasatoch" +
-	"igiessenebakkeshibechambagriculturennebudejjudygarlandigitalavan" +
-	"genavigationavuotnaklodzkodairamusementarumizusawabruzzoologyeon" +
-	"gbuk12cooperaunitemasekatsushikabeeldengeluidyndns1copenhagencyc" +
-	"lopedichernivtsiciliacorsicagliarightathomeftpanamacorvettenriku" +
-	"zentakataitogliattiresavannahgacosenzaganquannakadomaritimekeepi" +
-	"ngatlantaijis-a-financialadvisor-aurdaluzerncosidnsfor-better-th" +
-	"anawawildlifedjeffersoncostumedio-campidano-mediocampidanomedioc" +
-	"ouchpotatofriesaves-the-whalessandria-trani-barletta-andriatrani" +
-	"barlettaandriacouncilvivano-frankivskatsuyamasfjordencouponsavon" +
-	"aplesaxocoursesbschokoladencq-acranbrookuwanalyticscholarshipsch" +
-	"oolcreditcardynnschulezajskydivingruecreditunioncremonashorokana" +
-	"iecrewilliamhillcricketrzyncrimeastcoastaldefencecrotonewyorkshi" +
-	"recipesaro-urbino-pesarourbinopesaromasvuotnaharimamurogawacrown" +
-	"providercrsvpanasonichernovtsykkylvenetogakushimotoganewportllig" +
-	"atjxn--0trq7p7nnishiwakis-a-cpadoval-daostavalleycruiseschwarzgw" +
-	"angjuegoshikiminokamoenairtraffichiryukyuragifuchungbukasuyaltak" +
-	"ashimaseratis-a-cubicle-slavellinowtvalleaostatoilowiczest-le-pa" +
-	"trondheimmobilienissandnessjoenissayokoshibahikariwanumatakazaki" +
-	"s-a-democratkmaxxn--11b4c3dyndns-office-on-the-webcampobassociat" +
-	"esardiniacryptonomichigangwoncuisinellahppiacenzakopanerairguard" +
-	"ynv6culturalcentertainmentoyotaris-a-geekgalaxycuneocupcakecxn--" +
-	"1ctwolominamatakkokaminokawanishiaizubangecymrussiacyonabarulsan" +
-	"doycyouthdfcbankaufenfiguerestaurantoyotomiyazakis-a-greenfilate" +
-	"liafilminamiawajikis-a-guruslivinghistoryfinalfinancefineartscie" +
-	"ntistoragefinlandfinnoyfirebaseapparliamentoyotsukaidownloadfire" +
-	"nzefirestonefirmdaleirfjordfishingolffanscjohnsonfitjarqhachioji" +
-	"yahikobeatscotlandfitnessettlementoyourafjalerflesbergushikamifu" +
-	"ranoshiroomuraflickragerotikakamigaharaflightscrapper-siteflirfl" +
-	"ogintogurafloraflorencefloridavvesiidazaifudaigojomedizinhistori" +
-	"schescrappingxn--1lqs71dfloristanohatakahamaniwakuratexascolipic" +
-	"enord-aurdalipayflorogerserveftparmaflowerservegame-serversaille" +
-	"servehalflifestyleflynnhubambleclercartoonartdecoldwarmiamibugat" +
-	"tipschlesisches3-us-west-2fndfoodnetworkshoppingfor-ourfor-somee" +
-	"thnologyfor-theaterforexrothruherecreationforgotdnservehttparoch" +
-	"erkasyno-dservehumourforli-cesena-forlicesenaforlikescandynamic-" +
-	"dnserveirchitachinakagawatchandclockaszubyforsaleirvikazoforsand" +
-	"asuoloftoystre-slidrettozawafortmissoulair-traffic-controlleyfor" +
-	"tworthachirogatakahatakaishimogosenforuminamibosogndalfosneserve" +
-	"minecraftozsdev-myqnapcloudcontrolappspotagerfotaruis-a-hard-wor" +
-	"kerfoxfordedyn-ip24freeboxoservemp3utilitiesquarezzoologicalvink" +
-	"lein-addrammenuernbergdyniabogadocscbnl-o-g-i-nativeamericananti" +
-	"ques3-ap-northeast-1kappchizippodhaleangaviikadenadexeterepbodyn" +
-	"athomebuilt3l3p0rtargets-itargiving12000emmafanconagawakayamadri" +
-	"dvagsoyericssonyoursidealerimo-i-ranaamesjevuemielno-ip6freemaso" +
-	"nryfreiburgfreightcminamidaitomangotsukisosakitagawafreseniuscou" +
-	"ntryestateofdelawaredstonefribourgfriuli-v-giuliafriuli-ve-giuli" +
-	"afriuli-vegiuliafriuli-venezia-giuliafriuli-veneziagiuliafriuli-" +
-	"vgiuliafriuliv-giuliafriulive-giuliafriulivegiuliafriulivenezia-" +
-	"giuliafriuliveneziagiuliafriulivgiuliafrlfroganservep2parservepi" +
-	"cservequakefrognfrolandfrom-akrehamnfrom-alfrom-arfrom-azwinbana" +
-	"narepublicasadelamonedatsunanjoburgjerstadotsuruokakegawasnesodd" +
-	"enmarkhangelskiptveterinairealtychyattorneyagawalmartatamotors3-" +
-	"ap-south-1from-capebretonamiastapleservesarcasmatartanddesignfro" +
-	"m-collectionfrom-ctrani-andria-barletta-trani-andriafrom-dchitos" +
-	"etogitsuldalucaniafrom-defenseljordfrom-flanderservicesettsurgeo" +
-	"nshalloffamemorialfrom-gausdalfrom-higashiagatsumagoizumizakiraf" +
-	"rom-iafrom-idfrom-ilfrom-incheonfrom-ksevastopolefrom-kyowariasa" +
-	"hikawafrom-lajollamericanexpressexyfrom-mannortonsbergfrom-mdfro" +
-	"m-megurokunohealthcareersevenassisicilyfrom-midoris-a-hunterfrom" +
-	"-mnfrom-mochizukirkenesewindmillfrom-msfranziskanerdpolicefrom-m" +
-	"tnfrom-nchloefrom-ndfrom-nefrom-nhktraniandriabarlettatraniandri" +
-	"afrom-njelenia-gorafrom-nminamiechizenfrom-nvalled-aostavangerfr" +
-	"om-nyfrom-ohkurafrom-oketohmansionshangrilanciafrom-orfrom-pader" +
-	"bornfrom-pratohnoshoooshikamaishimodatextileitungsenfrom-ris-a-k" +
-	"nightpointtokaizukameokameyamatotakadafrom-schoenbrunnfrom-sdfro" +
-	"m-tnfrom-txn--1qqw23afrom-utazuerichardlillehammerfeste-ipartis-" +
-	"a-landscaperfrom-vaksdalfrom-vtranoyfrom-wafrom-wielunnerfrom-wv" +
-	"alledaostavernfrom-wyfrosinonefrostalowa-wolawafroyahababyglandf" +
-	"stcgroupartnersharis-a-lawyerfujiiderafujikawaguchikonefujiminoh" +
-	"tawaramotoineppubolognakanotoddenfujinomiyadafujiokayamanxn--2m4" +
-	"a15efujisatoshonairportland-4-salernoboribetsucksharpartshawaiij" +
-	"imarugame-hostrodawarafujisawafujishiroishidakabiratoridegreefuj" +
-	"itsurugashimamateramodalenfujixeroxn--30rr7yfujiyoshidafukayabea" +
-	"rdubaiduckdnshellaspeziafukuchiyamadafukudominichocolatelevision" +
-	"issedaluccapitalonewmexicoffeedbackplaneapplinzis-a-designerimar" +
-	"umorimachidafukuis-a-liberalfukumitsubishigakirovogradoyfukuokaz" +
-	"akiryuohadanotaireshimojis-a-libertarianfukuroishikarikaturindal" +
-	"fukusakisarazurewebsiteshikagamiishibukawafukuyamagatakaharustka" +
-	"noyakagefunabashiriuchinadafunagatakahashimamakishiwadafunahashi" +
-	"kamiamakusatsumasendaisennangonohejis-a-linux-useranishiaritabas" +
-	"hijonawatefundaciofuoiskujukuriyamaoris-a-llamarylandfuosskoczow" +
-	"indowshimokawafurnituredumbrellanbibaidarfurubiraquarelleborkang" +
-	"erfurudonostiaarpartyfurukawairtelecityeatshimokitayamafusodegau" +
-	"rafussaikisofukushimapasadenamsosnowiechofunatorientexpressarluc" +
-	"ernefutabayamaguchinomigawafutboldlygoingnowhere-for-moregontrai" +
-	"lroadfuttsurugimperiafuturehostingfuturemailingfvgfyis-a-musicia" +
-	"nfylkesbiblackfridayfyresdalhangglidinghangoutsystemscloudfrontd" +
-	"oorhannanmokuizumodenakasatsunais-a-painteractivegarsheis-a-pats" +
-	"fanhannotteroyhanyuzenhapmirhareidsbergenharstadharvestcelebrati" +
-	"onhasamarnardalhasaminami-alpssells-itransportransurlhashbanghas" +
-	"udahasura-appassenger-associationhasvikazunohatogayahoohatoyamaz" +
-	"akitahiroshimarriottrapaniimimatakatoris-a-personaltrainerhatsuk" +
-	"aichikaiseis-a-photographerokuappaviancargodaddynaliascoli-picen" +
-	"oipirangamvikddielddanuorrissagaeroclubmedecincinnationwidealsta" +
-	"haugesunderseaportsinfolldalabamagasakishimabarackmazehattfjelld" +
-	"alhayashimamotobungotakadapliernewhollandhazuminobusellsyourhome" +
-	"goodshimotsumahboehringerikehelsinkitakamiizumisanofidelitysvard" +
-	"ollshinichinanhembygdsforbundhemneshinjournalistjohnhemsedalhepf" +
-	"orgeherokussldheroyhgtvallee-aosteroyhigashichichibunkyonanaoshi" +
-	"mageandsoundandvisionhigashihiroshimanehigashiizumozakitakatakam" +
-	"oriokalmykiahigashikagawahigashikagurasoedahigashikawakitaaikita" +
-	"kyushuaiahigashikurumeiwamarshallstatebankfhappouhigashimatsushi" +
-	"maritimodernhigashimatsuyamakitaakitadaitoigawahigashimurayamamo" +
-	"torcycleshinjukumanohigashinarusembokukitamidsundhigashinehigash" +
-	"iomihachimanchesterhigashiosakasayamanakakogawahigashishirakawam" +
-	"atakanabeautydalhigashisumiyoshikawaminamiaikitamotosumitakagild" +
-	"eskaliszhigashitsunowruzhgorodeohigashiurausukitanakagusukumodum" +
-	"inamiiselectravelchannelhigashiyamatokoriyamanashifteditchyourip" +
-	"fizerhigashiyodogawahigashiyoshinogaris-a-playerhiraizumisatohob" +
-	"by-sitehirakatashinagawahiranais-a-republicancerresearchaeologic" +
-	"aliforniahirarahiratsukagawahirayaitakanezawahistorichouseshinka" +
-	"migotoyohashimotoshimahitachiomiyaginankokubunjis-a-rockstaracho" +
-	"wicehitachiotagooglecodespotravelersinsurancehitraeumtgeradeloit" +
-	"tevadsoccertificationhjartdalhjelmelandholeckobierzyceholidayhom" +
-	"eipgfoggiahomelinkhakassiahomelinuxn--32vp30haebaruminamifuranoh" +
-	"omeofficehomesecuritymaceratakaokaluganskodjejuifminamiizukamiok" +
-	"amikitayamatsuris-a-socialistmein-vigorgehomesecuritypccwinnersh" +
-	"inshinotsurgeryhomesenseminehomeunixn--3bst00minamimakis-a-soxfa" +
-	"nhondahoneywellbeingzonehongopocznosegawahonjyoitakarazukamakura" +
-	"zakitashiobarahornindalhorseoulminamiminowahortendofinternet-dns" +
-	"hinshirohospitalhoteleshintokushimahotmailhoyangerhoylandetroits" +
-	"kolelhumanitieshintomikasaharahurdalhurumajis-a-studentalhyllest" +
-	"adhyogoris-a-teacherkassymantechnologyhyugawarahyundaiwafunehzch" +
-	"onanbuildingripescaravantaajlchoyodobashichikashukujitawarajlljm" +
-	"pharmacienshirakofuefukihaboromskoguchikuzenjnjeonnamerikawauejo" +
-	"yokaichibahcavuotnagaranzannefrankfurtrentino-alto-adigejpmorgan" +
-	"jpnjprshiranukamogawajuniperjurkoshunantokigawakosugekotohiradom" +
-	"ainsureggiocalabriakotourakouhokutamakis-an-artisteinkjerusalemb" +
-	"roiderykounosupplieshiraokanagawakouyamashikokuchuokouzushimasoy" +
-	"kozagawakozakis-an-engineeringkpnkppspdnshiratakahagivestbytomar" +
-	"idagawassamukawataricohdatingkrasnodarkredirectmeldalkristiansan" +
-	"dcatshishikuis-an-entertainerkristiansundkrodsheradkrokstadelval" +
-	"daostarostwodzislawioshisognekryminamisanrikubetsupportrentino-a" +
-	"ltoadigekumatorinokumejimasudakumenanyokkaichirurgiens-dentistes" +
-	"-en-francekunisakis-bykunitachiarailwaykunitomigusukumamotoyamas" +
-	"sa-carrara-massacarraramassabusinessebyklegallocus-1kunneppulawy" +
-	"kunstsammlungkunstunddesignkuokgrouphdkureggioemiliaromagnakayam" +
-	"atsumaebashikshacknetrentino-s-tirollagrigentomologyeonggiehtavu" +
-	"oatnagaivuotnagaokakyotambabia-goracleaningkurgankurobelaudibleb" +
-	"timnetzkurogimilanokuroisoftwarendalenugkuromatsunais-certifiedo" +
-	"gawarabikomaezakirunorthwesternmutualkurotakikawasakis-foundatio" +
-	"nkushirogawakusupplykutchanelkutnokuzumakis-gonekvafjordkvalsund" +
-	"kvamfamberkeleykvanangenkvinesdalkvinnheradkviteseidskogkvitsoyk" +
-	"wpspiegelkzmissilevangermisugitokorozawamitourismolancastermitoy" +
-	"oakemiuramiyazumiyotamanomjondalenmlbfanmonmouthagebostadmonster" +
-	"monticellombardiamondshisuifuelveruminamitanemontrealestatefarme" +
-	"quipmentrentino-stirolmonza-brianzaporizhzhiamonza-e-della-brian" +
-	"zapposhitaramamonzabrianzaptokuyamatsusakahoginowaniihamatamakaw" +
-	"ajimarburgmonzaebrianzaramonzaedellabrianzamoparachutingmordovia" +
-	"jessheiminamiuonumatsumotofukemoriyamatsushigemoriyoshimilitarym" +
-	"ormoneymoroyamatsuuramortgagemoscowitdkmpspbarcelonagasakijobser" +
-	"verisignieznord-odalaziobihirosakikamijimassnasaarlandd-dnshome-" +
-	"webservercellikes-piedmontblancomeeres3-ap-southeast-1moseushist" +
-	"orymosjoenmoskeneshizukuishimofusaitamatsukuris-into-gamessinats" +
-	"ukigatakasagotembaixadamosshizuokananporovigotpantheonsitemosvik" +
-	"nx-serveronakatsugawamoteginozawaonsenmoviemovistargardmtpchrist" +
-	"masakikugawatchesarufutsunomiyawakasaikaitakoelniyodogawamtranby" +
-	"muenstermugithubcloudusercontentrentino-sud-tirolmuikamisatokama" +
-	"chippubetsubetsugarumukochikushinonsenergymulhouservebeermunakat" +
-	"anemuncieszynmuosattemuphiladelphiaareadmyblogsitemurmanskolobrz" +
-	"egersundmurotorcraftrentino-sudtirolmusashimurayamatsuzakis-leet" +
-	"rdmusashinoharamuseetrentino-sued-tirolmuseumverenigingmutsuzawa" +
-	"mutuellewismillermy-vigorlicemy-wanggouvicenzamyactivedirectorym" +
-	"yasustor-elvdalmycdn77-securechtrainingmydissentrentino-suedtiro" +
-	"lmydrobofagemydshoujis-lostre-toteneis-a-techietis-a-therapistoi" +
-	"amyeffectrentinoa-adigemyfirewallonieruchomoscienceandindustrynm" +
-	"yfritzmyftpaccesshowamyfusionmyhome-serverrankoshigayamelhusgard" +
-	"enmykolaivaolbia-tempio-olbiatempioolbialystokkepnogiftshowtimet" +
-	"eorapphilatelymymediapchromedicaltanissettairamyokohamamatsudamy" +
-	"pepsongdalenviknakanojohanamakinoharamypetshriramlidlugolekagami" +
-	"nogatagajobojis-not-certifieducatorahimeshimakanegasakinkobayash" +
-	"ikaoirminamiogunicomcastresistancemyphotoshibahccavuotnagareyama" +
-	"lborkdalvdalcesienarashinomypsxn--3e0b707emysecuritycamerakermys" +
-	"hopblocksigdalmyvnchryslerpictetrentinoaadigepicturesimple-urlpi" +
-	"emontepilotsirdalpimientaketomisatolgapinkomakiyosunndalpioneerp" +
-	"ippuphoenixn--3oq18vl8pn36apiszpittsburghofauskedsmokorsetagayas" +
-	"ells-for-ulvikautokeinopiwatepizzapkomatsushimashikizunokunimiho" +
-	"boleslawiechristiansburgriwataraidyndns-picsarpsborgroks-thisaya" +
-	"manobeokakudamatsueplanetariuminamiyamashirokawanabellevuelosang" +
-	"elesjaguarchitecturealtorlandplantationplantslingplatforminanopl" +
-	"aystationplazaplchungnamdalseidfjordyndns-remotewdyndns-serverda" +
-	"luroyplombardynamisches-dnslupskomforbarclaycards3-website-ap-no" +
-	"rtheast-1plumbingopmnpodzonepohlpoivronpokerpokrovskommunalforbu" +
-	"ndpolitiendapolkowicepoltavalle-aostathellexusdecorativeartsnoas" +
-	"aitomobellunorddalpomorzeszowithgoogleapisa-hockeynutsiracusakat" +
-	"akinouepordenonepornporsangerporsanguidelmenhorstalbansokanazawa" +
-	"porsgrunnanpoznanpraxis-a-bookkeeperugiaprdpreservationpresidiop" +
-	"rgmrprimeloyalistockholmestrandprincipeprivatizehealthinsurancep" +
-	"rochowiceproductionsokndalprofbsbxn--1lqs03nprogressivegasiaproj" +
-	"ectrentinoalto-adigepromombetsurfbx-ostrowwlkpmgulenpropertyprot" +
-	"ectionprotonetrentinoaltoadigeprudentialpruszkowithyoutubentleyp" +
-	"rzeworskogptplusterpvtrentinos-tirolpwchurchaseljeepostfoldnavyp" +
-	"zqldqponqslgbtrentinostirolquicksytesolarssonqvcirclegnicafedera" +
-	"tionstufftoread-booksnesolundbeckommunestuttgartrentoyokawasusak" +
-	"is-slickharkovalleeaosteigensusonosuzakaneyamazoesuzukaniepcesuz" +
-	"ukis-uberleetrentino-a-adigesvalbardunloppacificircustomersveios" +
-	"velvikomvuxn--3ds443gsvizzeraswedenswidnicarrierswiebodzindianap" +
-	"olis-a-bloggerswiftcoversicherungswinoujscienceandhistoryswisshi" +
-	"kis-very-badaddjamisonsynology-dsolutionsolognetuscanytushuissie" +
-	"r-justicetuvalle-daostaticsootuxfamilyvenneslaskerrylogisticsopo" +
-	"trentinosud-tirolvestfoldvestnesor-odalvestre-slidreamhostersor-" +
-	"varangervestre-totennishiawakuravestvagoyvevelstadvibo-valentiav" +
-	"ibovalentiavideovillaskoyabearalvahkihokumakogengerdalpha-myqnap" +
-	"cloudapplebesbydgoszczecinemakeupowiathletajimabariakembuchikuma" +
-	"gayagawakuyabukicks-assedicitadeliveryvinnicartiervinnytsiavipsi" +
-	"naapphonefossilkomaganevirginiavirtualvirtueeldomeindianmarketin" +
-	"gvirtuelvisakegawavistaprinternationalfirearmsorfoldviterboltroa" +
-	"ndinosaurepaircraftrevisohughesomavivoldavlaanderenvladikavkazim" +
-	"ierz-dolnyvladimirvlogoiphotographysiovolkswagentsorreisahayakaw" +
-	"akamiichikawamisatotalvologdanskongsvingervolvolkenkundenvolyngd" +
-	"alvossevangenvotevotingvotoyonakagyokutoursortlandworldworse-tha" +
-	"ndawowiwatsukiyonowritesthisblogsytewroclawloclawekoninjavald-ao" +
-	"starnbergwtciticatholicheltenham-radio-opencraftranagatorodoywtf" +
-	"bxosciencecentersciencehistorywuozuwwwmflabsorumincommbanklabudh" +
-	"abikinokawabarthagakhanamigawawzmiuwajimaxn--4gq48lf9jetztrentin" +
-	"o-aadigexn--4it168dxn--4it797konsulatrobeepilepsydneyxn--4pvxsou" +
-	"thcarolinazawaxn--54b7fta0ccivilizationxn--55qw42gxn--55qx5dxn--" +
-	"5js045dxn--5rtp49civilwarmanagementmpalmspringsakerxn--5rtq34kon" +
-	"yvelolxn--5su34j936bgsgxn--5tzm5gxn--6btw5axn--6frz82gxn--6orx2r" +
-	"xn--6qq986b3xlxn--7t0a264claimsasayamaxn--80adxhksouthwestfalenx" +
-	"n--80ao21axn--80aqecdr1axn--80asehdbarefootballooningjesdalillyo" +
-	"mbondiscountysnes3-website-ap-southeast-2xn--80aswgxn--80audneda" +
-	"lnxn--8ltr62kooris-an-actorxn--8pvr4uxn--8y0a063axn--90a3academy" +
-	"-firewall-gatewayxn--90aishobaraomoriguchiharahkkeravjuedischesa" +
-	"peakebayernrtrogstadxn--90azhytomyrxn--9dbhblg6dietcimdbargainst" +
-	"itutelemarkaratsuginamikatagamiharuconnectatarantottoribestadisc" +
-	"overyomitanobirastronomy-gatewayokosukanzakiwienaturalsciencesna" +
-	"turelles3-ap-southeast-2xn--9dbq2axn--9et52uxn--9krt00axn--andy-" +
-	"iraxn--aroport-byanaizuxn--asky-iraxn--aurskog-hland-jnbarreauct" +
-	"ionayorovnobninskarelianceu-1xn--avery-yuasakuhokkaidontexistein" +
-	"geekopervikhmelnitskiyamashikexn--b-5gaxn--b4w605ferdxn--bck1b9a" +
-	"5dre4clickatowicexn--bdddj-mrabdxn--bearalvhki-y4axn--berlevg-jx" +
-	"axn--bhcavuotna-s4axn--bhccavuotna-k7axn--bidr-5nachikatsuuraxn-" +
-	"-bievt-0qa2xn--bjarky-fyandexn--3pxu8konskowolayangroupharmacysh" +
-	"iraois-an-accountantshinyoshitomiokamitsuexn--bjddar-ptamayufuet" +
-	"tertdasnetzxn--blt-elabourxn--bmlo-graingerxn--bod-2naroyxn--brn" +
-	"ny-wuaccident-investigation-aptibleaseating-organicbcn-north-1xn" +
-	"--brnnysund-m8accident-prevention-webhopenairbusantiquest-a-la-m" +
-	"aisondre-landebudapest-a-la-masionionjukudoyamagazineat-urlxn--b" +
-	"rum-voagatromsakakinokiaxn--btsfjord-9zaxn--c1avgxn--c2br7gxn--c" +
-	"3s14mintelligencexn--cck2b3barrel-of-knowledgemologicallyngenvir" +
-	"onmentalconservationflfanfshostrolekamisunagawaugustowadaegubs3-" +
-	"ca-central-1xn--cg4bkis-very-evillagexn--ciqpnxn--clchc0ea0b2g2a" +
-	"9gcdn77-sslattumisakis-into-carshioyanagawaxn--comunicaes-v6a2ox" +
-	"n--correios-e-telecomunicaes-ghc29axn--czr694barrell-of-knowledg" +
-	"eologyonagoyaukraanghkeymachineustarhubalestrandabergamoareke164" +
-	"xn--czrs0tromsojaworznoxn--czru2dxn--czrw28bashkiriaurskog-holan" +
-	"droverhalla-speziaeroportalaheadjudaicaaarborteaches-yogasawarac" +
-	"ingroks-theatree12xn--d1acj3basilicataniaustevollarvikarasjokara" +
-	"suyamarylhurstjordalshalsenaturbruksgymnaturhistorisches3-eu-cen" +
-	"tral-1xn--d1alfaromeoxn--d1atrusteexn--d5qv7z876clinichernigover" +
-	"nmentjometlifeinsurancexn--davvenjrga-y4axn--djrs72d6uyxn--djty4" +
-	"koryokamikawanehonbetsurutaharaxn--dnna-grajewolterskluwerxn--dr" +
-	"bak-wuaxn--dyry-iraxn--e1a4cliniquenoharaxn--eckvdtc9dxn--efvn9s" +
-	"owaxn--efvy88haibarakitahatakamatsukawaxn--ehqz56nxn--elqq16hair" +
-	"-surveillancexn--estv75gxn--eveni-0qa01gaxn--f6qx53axn--fct429ko" +
-	"saigawaxn--fhbeiarnxn--finny-yuaxn--fiq228c5hspjelkavikomonoxn--" +
-	"fiq64basketballfinanzgoraustinnatuurwetenschappenaumburgjemnes3-" +
-	"eu-west-1xn--fiqs8spreadbettingxn--fiqz9spydebergxn--fjord-lraxn" +
-	"--fjq720axn--fl-ziaxn--flor-jraxn--flw351exn--fpcrj9c3dxn--frde-" +
-	"grandrapidsrlxn--frna-woaraisaijotrvarggatritonxn--frya-hraxn--f" +
-	"zc2c9e2clintonoshoesaseboknowsitallutskypexn--fzys8d69uvgmailxn-" +
-	"-g2xx48clothingrondarxn--gckr3f0fermobilyxn--gecrj9cloudnsdojoet" +
-	"suwanouchikujogaszczytnore-og-uvdaluxembourgrongaxn--ggaviika-8y" +
-	"a47hakatanotogawaxn--gildeskl-g0axn--givuotna-8yaotsurreyxn--gjv" +
-	"ik-wuaxn--gk3at1exn--gls-elacaixaxn--gmq050is-very-goodhandsonxn" +
-	"--gmqw5axn--h-2failxn--h1aeghakodatexn--h2brj9cnsaskatchewanxn--" +
-	"hbmer-xqaxn--hcesuolo-7ya35batodayonaguniversityoriikariyakumold" +
-	"eltaiwanairlinedre-eikerxn--hery-iraxn--hgebostad-g3axn--hmmrfea" +
-	"sta-s4acctrysiljan-mayenxn--hnefoss-q1axn--hobl-iraxn--holtlen-h" +
-	"xaxn--hpmir-xqaxn--hxt814exn--hyanger-q1axn--hylandet-54axn--i1b" +
-	"6b1a6a2exn--imr513nxn--indery-fyasakaiminatoyonezawaxn--io0a7is-" +
-	"very-nicexn--j1aeferraraxn--j1amhakonexn--j6w193gxn--jlq61u9w7ba" +
-	"tsfjordishakotankarlsoyoshiokarasjohkamikoaniikappugliaustraliai" +
-	"sondriodejaneirochesterhcloudfunctions3-external-1xn--jlster-bya" +
-	"sugis-very-sweetpepperxn--jrpeland-54axn--jvr189misasaguris-into" +
-	"-cartoonshirahamatonbetsurnadalxn--k7yn95exn--karmy-yuaxn--kbrq7" +
-	"oxn--kcrx77d1x4axn--kfjord-iuaxn--klbu-woaxn--klt787dxn--kltp7dx" +
-	"n--kltx9axn--klty5xn--42c2d9axn--koluokta-7ya57hakubadajozorahol" +
-	"taleniwaizumiotsukumiyamazonawsabaerobaticketshimonosekikawaxn--" +
-	"kprw13dxn--kpry57dxn--kpu716ferrarivnexn--kput3is-with-thebandoo" +
-	"mdnsiskinkyotobetsumidatlantichoseiroumuenchenisshingugexn--krag" +
-	"er-gyasuokanraxn--kranghke-b0axn--krdsherad-m8axn--krehamn-dxaxn" +
-	"--krjohka-hwab49jevnakershuscultureggio-emilia-romagnakatombetsu" +
-	"my-routerxn--ksnes-uuaxn--kvfjord-nxaxn--kvitsy-fyatomitamamurax" +
-	"n--kvnangen-k0axn--l-1fairwindsrtrentinosudtirolxn--l1accenturek" +
-	"lamborghiniizaxn--laheadju-7yatsukanumazuryxn--langevg-jxaxn--lc" +
-	"vr32dxn--ldingen-q1axn--leagaviika-52bauhausposts-and-telecommun" +
-	"icationsncfdivtasvuodnakaiwamizawaustrheimatunduhrennesoyokotebi" +
-	"nagisochildrensgardenaustdalavagiskebinorfolkebibleikangerxn--le" +
-	"sund-huaxn--lgbbat1ad8jewelryxn--lgrd-poacoachampionshiphoptobam" +
-	"agentositelekommunikationlinebraskaunjargallupinbbcaseihichisobe" +
-	"tsuitainairforceoceanographics3-website-eu-west-1xn--lhppi-xqaxn" +
-	"--linds-pramericanartulangevagrarboretumbriamallamaintenancechir" +
-	"ealminnesotaketakatsukis-into-animelbournexn--lns-qlansrvareserv" +
-	"eblogspotrentinosued-tirolxn--loabt-0qaxn--lrdal-sraxn--lrenskog" +
-	"-54axn--lt-liacntoyonoxn--lten-granexn--lury-iraxn--mely-iraxn--" +
-	"merker-kuaxn--mgb2ddestordalxn--mgb9awbferreroticanonoichinomiya" +
-	"kexn--mgba3a3ejtunesomnaritakurashikis-savedunetbankharkivguccip" +
-	"rianiigataishinomakimobetsuliguriaxn--mgba3a4f16axn--mgba3a4fran" +
-	"amizuholdingsmileksvikosakaerodromegalsacebetsukubankhmelnytskyi" +
-	"vanylvenicexn--mgba7c0bbn0axn--mgbaakc7dvfetsundynvpnxn--mgbaam7" +
-	"a8hakuis-a-nascarfanxn--mgbab2bdxn--mgbai9a5eva00bbtateshinanoma" +
-	"chintaifun-dnsaliaskimitsubatamicable-modembetsukuibigawauthorda" +
-	"landroiddnskingjerdrumckinseyokozebizenakaniikawatanaguraetnagah" +
-	"amaroygardendoftheinternetflixilovecollegefantasyleaguernseyboml" +
-	"oans3-ap-northeast-2xn--mgbai9azgqp6jewishartgalleryxn--mgbayh7g" +
-	"padualstackspace-to-rentalstomakomaibaraxn--mgbb9fbpobanazawaxn-" +
-	"-mgbbh1a71exn--mgbc0a9azcgxn--mgbca7dzdoxn--mgberp4a5d4a87gxn--m" +
-	"gberp4a5d4arxn--mgbi4ecexposedxn--mgbpl2fhskleppiagetmyiphilipsy" +
-	"nology-diskstationxn--mgbqly7c0a67fbcolonialwilliamsburgrossetou" +
-	"chijiwadellogliastradingroundhandlingroznyxn--mgbqly7cvafredriks" +
-	"tadtvstoreitrentinosuedtirolxn--mgbt3dhdxn--mgbtf8flatangerxn--m" +
-	"gbtx2bbvacationswatch-and-clockerxn--mgbx4cd0abbottunkongsbergxn" +
-	"--mix082fgunmarcheaparisor-fronxn--mix891fhvalerxn--mjndalen-64a" +
-	"xn--mk0axindustriesteambulancexn--mk1bu44coloradoplateaudioxn--m" +
-	"kru45isleofmandalxn--mlatvuopmi-s4axn--mli-tlanxesstorfjordxn--m" +
-	"lselv-iuaxn--moreke-juaxn--mori-qsakuragawaxn--mosjen-eyatsushir" +
-	"oxn--mot-tlapyxn--mre-og-romsdal-qqbeppublishproxyzgorzeleccolog" +
-	"newspaperxn--msy-ula0hakusandiegoodyearthadselfipassagenshimonit" +
-	"ayanagitlaborxn--mtta-vrjjat-k7afamilycompanycolumbusheyxn--muos" +
-	"t-0qaxn--mxtq1misawaxn--ngbc5azdxn--ngbe9e0axn--ngbrxn--45brj9ci" +
-	"vilaviationxn--nit225koseis-an-actresshiojirishirifujiedaxn--nme" +
-	"sjevuemie-tcbalatinord-frontierxn--nnx388axn--nodexn--nqv7fs00em" +
-	"axn--nry-yla5gxn--ntso0iqx3axn--ntsq17gxn--nttery-byaeservecount" +
-	"erstrikexn--nvuotna-hwaxn--nyqy26axn--o1achattanooganordreisa-ge" +
-	"ekosherbrookegawaxn--o3cw4haldenxn--od0algxn--od0aq3bernuorockar" +
-	"tuzyukibmdivttasvuotnakamagayachts3-website-sa-east-1xn--ogbpf8f" +
-	"lekkefjordxn--oppegrd-ixaxn--ostery-fyawaraxn--osyro-wuaxn--p1ac" +
-	"fidonnakamuratajimicrolightinguovdageaidnunzenxn--p1aissmarterth" +
-	"anyouxn--pbt977communitysfjordyndns-weberlincolnxn--pgbs0dhlxn--" +
-	"porsgu-sta26fieldyroyrvikinguitarschweizparaglidingujolsterxn--p" +
-	"ssu33lxn--pssy2uxn--q9jyb4comobaraxn--qcka1pmcdonaldstpetersburg" +
-	"xn--qqqt11misconfusedxn--qxamuneuestreamsterdamnserverbaniaxn--r" +
-	"ady-iraxn--rdal-poaxn--rde-ulaquilancashirehabmerxn--rdy-0nabari" +
-	"wchoshibuyachiyodavvenjargaulardalukowiiheyaizuwakamatsubushikus" +
-	"akadogawaxn--rennesy-v1axn--rhkkervju-01aflakstadaokagakibichuox" +
-	"n--rholt-mragowoodsidexn--rhqv96gxn--rht27zxn--rht3dxn--rht61exn" +
-	"--risa-5narusawaxn--risr-iraxn--rland-uuaxn--rlingen-mxaxn--rmsk" +
-	"og-byawatahamaxn--rny31halsaintlouis-a-anarchistoireggio-calabri" +
-	"axn--rovu88beskidyn-vpncasertaipeiheijiinetnedalimanowarudautomo" +
-	"tivecodyn-o-saurlandes3-fips-us-gov-west-1xn--rros-granvindafjor" +
-	"dxn--rskog-uuaxn--rst-0narutokyotangovturystykannamihamadaxn--rs" +
-	"ta-francaiseharaxn--ryken-vuaxn--ryrvik-byaxn--s-1faitheguardian" +
-	"xn--s9brj9comparemarkerryhotelsassaris-a-doctorayxn--sandnessjen" +
-	"-ogbizxn--sandy-yuaxn--seral-lraxn--ses554gxn--sgne-gratangenxn-" +
-	"-skierv-utazaskvolloabathsbcompute-1xn--skjervy-v1axn--skjk-soax" +
-	"n--sknit-yqaxn--sknland-fxaxn--slat-5narviikamishihoronobeauxart" +
-	"sandcraftstudioxn--slt-elabbvieeexn--smla-hraxn--smna-gratis-a-b" +
-	"ruinsfanxn--snase-nraxn--sndre-land-0cbstudyndns-at-homedepotenz" +
-	"amamicrosoftbankomorotsukaminoyamaxunusualpersonxn--snes-poaxn--" +
-	"snsa-roaxn--sr-aurdal-l8axn--sr-fron-q1axn--sr-odal-q1axn--sr-va" +
-	"ranger-ggbestbuyshouses3-website-us-east-1xn--srfold-byaxn--srre" +
-	"isa-q1axn--srum-grazxn--stfold-9xaxn--stjrdal-s1axn--stjrdalshal" +
-	"sen-sqbetainaboxfusejnynysadodgeometre-experts-comptables3-websi" +
-	"te-us-west-1xn--stre-toten-zcbieigersundiyukuhashimoichinosekiga" +
-	"harautoscanadaejeonbukaratehimeji234xn--t60b56axn--tckweathercha" +
-	"nnelxn--tiq49xqyjfkhersonxn--tjme-hraxn--tn0agrinet-freakstuff-4" +
-	"-salexn--tnsberg-q1axn--tor131oxn--trany-yuaxn--trgstad-r1axn--t" +
-	"rna-woaxn--troms-zuaxn--tysvr-vraxn--uc0atvaroyxn--uc0ay4axn--ui" +
-	"st22hammarfeastafricapetownnews-stagingxn--uisz3gxn--unjrga-rtao" +
-	"baokinawashirosatochiokinoshimalatvuopmiasakuchinotsuchiurakawal" +
-	"brzycharternopilawalesundxn--unup4yxn--uuwu58axn--vads-jraxn--va" +
-	"rd-jraxn--vegrshei-c0axn--vermgensberater-ctbielawalterxn--vermg" +
-	"ensberatung-pwbiellaakesvuemielecceu-2xn--vestvgy-ixa6oxn--vg-yi" +
-	"abcgxn--vgan-qoaxn--vgsy-qoa0jgoraxn--vgu402computerhistoryofsci" +
-	"ence-fictionxn--vhquvbarclays3-website-ap-southeast-1xn--vler-qo" +
-	"axn--vre-eiker-k8axn--vrggt-xqadxn--vry-yla5gxn--vuq861bieszczad" +
-	"ygeyachimataikikonaioirasebastopologyeongnamegawakeisenbahnhlfan" +
-	"hs3-website-us-west-2xn--w4r85el8fhu5dnraxn--w4rs40lxn--wcvs22dx" +
-	"n--wgbh1comsecuritytacticsatxn--1ck2e1balsfjordgcahcesuolodingen" +
-	"aval-d-aosta-valleyolasitemrxn--wgbl6axn--xhq521bievatmallorcada" +
-	"quesakuraiitatebayashiibaghdadultateyamaveroykenglanddnss3-sa-ea" +
-	"st-1xn--xkc2al3hye2axn--xkc2dl3a5ee0hamurakamigoriginshimosuwalk" +
-	"is-a-nurservebbshimotsukexn--y9a3aquariumishimatsunoxn--yer-znar" +
-	"vikoshimizumakis-an-anarchistoricalsocietyxn--yfro4i67oxn--ygard" +
-	"en-p1axn--ygbi2ammxn--45q11civilisationxn--ystre-slidre-ujbifuka" +
-	"gawarszawashingtondclkarmoyurihonjoyentatsunoceanographiquevents" +
-	"akyotanabeneventoeidsvollimitednpagefrontappagespeedmobilizerodd" +
-	"avocatanzarowegroweibolzanordkappgafanpachigasakidsmynasushiobar" +
-	"agusarts3-us-east-2xn--zbx025dxn--zf0ao64axn--zf0avxn--4gbrimini" +
-	"ngxn--zfr164bihorologyusuharavoues3-us-gov-west-1xperiaxz"
-
-// nodes is the list of nodes. Each node is represented as a uint32, which
-// encodes the node's children, wildcard bit and node type (as an index into
-// the children array), ICANN bit and text.
-//
-// If the table was generated with the -comments flag, there is a //-comment
-// after each node's data. In it is the nodes-array indexes of the children,
-// formatted as (n0x1234-n0x1256), with * denoting the wildcard bit. The
-// nodeType is printed as + for normal, ! for exception, and o for parent-only
-// nodes that have children but don't match a domain label in their own right.
-// An I denotes an ICANN domain.
-//
-// The layout within the uint32, from MSB to LSB, is:
-//	[ 1 bits] unused
-//	[ 9 bits] children index
-//	[ 1 bits] ICANN bit
-//	[15 bits] text index
-//	[ 6 bits] text length
-var nodes = [...]uint32{
-	0x32f983,
-	0x28a344,
-	0x30e286,
-	0x371b43,
-	0x371b46,
-	0x394646,
-	0x3a5003,
-	0x367844,
-	0x260687,
-	0x30dec8,
-	0x1a04cc2,
-	0x316e47,
-	0x355d89,
-	0x32228a,
-	0x32228b,
-	0x22eec3,
-	0x28fac6,
-	0x2327c5,
-	0x1e04e02,
-	0x217c04,
-	0x2a90c3,
-	0x3ac705,
-	0x2203942,
-	0x329e03,
-	0x26957c4,
-	0x368e05,
-	0x2a10182,
-	0x3787ce,
-	0x253343,
-	0x3a03c6,
-	0x2e00142,
-	0x30e407,
-	0x23ae46,
-	0x3200c42,
-	0x22a343,
-	0x254b04,
-	0x325a86,
-	0x35c208,
-	0x28a706,
-	0x21ad04,
-	0x3601442,
-	0x332309,
-	0x207587,
-	0x256286,
-	0x339309,
-	0x29d788,
-	0x328d44,
-	0x364906,
-	0x36b606,
-	0x3a02942,
-	0x27144f,
-	0x20f94e,
-	0x2131c4,
-	0x2c6085,
-	0x367745,
-	0x385989,
-	0x241a89,
-	0x368047,
-	0x23c9c6,
-	0x273a43,
-	0x3e02342,
-	0x2df283,
-	0x205aca,
-	0x221d83,
-	0x303145,
-	0x289c02,
-	0x289c09,
-	0x4200f82,
-	0x203d84,
-	0x2250c6,
-	0x2eb205,
-	0x34cbc4,
-	0x4a04c04,
-	0x205283,
-	0x231ac4,
-	0x4e02e02,
-	0x209f04,
-	0x52f4e04,
-	0x24ae0a,
-	0x5601342,
-	0x303907,
-	0x26b8c8,
-	0x6202f82,
-	0x31cf07,
-	0x2c2e04,
-	0x2c2e07,
-	0x373d85,
-	0x357a47,
-	0x367e06,
-	0x2e8384,
-	0x39c0c5,
-	0x294847,
-	0x7206cc2,
-	0x34f703,
-	0x200582,
-	0x200583,
-	0x76125c2,
-	0x221ec5,
-	0x7a02302,
-	0x27bd84,
-	0x2810c5,
-	0x213107,
-	0x269f0e,
-	0x224bc4,
-	0x206a84,
-	0x211503,
-	0x2ceac9,
-	0x2ed94b,
-	0x3a6548,
-	0x3148c8,
-	0x318dc8,
-	0x237908,
-	0x33914a,
-	0x357947,
-	0x318146,
-	0x7ea4fc2,
-	0x35bc03,
-	0x366c43,
-	0x371144,
-	0x3a5043,
-	0x324cc3,
-	0x171f542,
-	0x8203682,
-	0x252185,
-	0x2a11c6,
-	0x2d6d44,
-	0x2f6e07,
-	0x382986,
-	0x319dc4,
-	0x398247,
-	0x20f7c3,
-	0x86c8902,
-	0x8b124c2,
-	0x8e1c502,
-	0x21c506,
-	0x9200002,
-	0x359b85,
-	0x320a83,
-	0x200004,
-	0x2ee344,
-	0x2ee345,
-	0x203e43,
-	0x9768883,
-	0x9a07f42,
-	0x28e245,
-	0x28e24b,
-	0x2d0686,
-	0x20a0cb,
-	0x225b04,
-	0x20a7c9,
-	0x20be84,
-	0x9e0c0c2,
-	0x20cf83,
-	0x210843,
-	0x1600802,
-	0x260903,
-	0x2109ca,
-	0xa211cc2,
-	0x217e85,
-	0x2983ca,
-	0x2dc184,
-	0x369f03,
-	0x315044,
-	0x213643,
-	0x213644,
-	0x213647,
-	0x213985,
-	0x213e05,
-	0x2150c6,
-	0x2167c6,
-	0x2182c3,
-	0x21c188,
-	0x221c43,
-	0xa601082,
-	0x21cac8,
-	0x21ff0b,
-	0x2216c8,
-	0x2221c6,
-	0x222a47,
-	0x226488,
-	0xb2413c2,
-	0xb6c2fc2,
-	0x326388,
-	0x257ec7,
-	0x22bac5,
-	0x22bac8,
-	0x2bf708,
-	0x3871c3,
-	0x22a784,
-	0x371182,
-	0xba2af82,
-	0xbe5ba02,
-	0xc62c1c2,
-	0x22c1c3,
-	0xca0e542,
-	0x367803,
-	0x2f8e04,
-	0x218443,
-	0x328d04,
-	0x25fe4b,
-	0x21fe43,
-	0x2e4d06,
-	0x226284,
-	0x2a5a8e,
-	0x361c05,
-	0x3a04c8,
-	0x282247,
-	0x28224a,
-	0x229d03,
-	0x2b3447,
-	0x2edb05,
-	0x22ea44,
-	0x272486,
-	0x272487,
-	0x32b704,
-	0x304ac7,
-	0x26a244,
-	0x35bc84,
-	0x35bc86,
-	0x386904,
-	0x20e546,
-	0x223c83,
-	0x22b888,
-	0x30c3c8,
-	0x24e2c3,
-	0x2608c3,
-	0x204f04,
-	0x395943,
-	0xce0d882,
-	0xd2db442,
-	0x20c043,
-	0x201806,
-	0x35c383,
-	0x28bfc4,
-	0xd6081c2,
-	0x2081c3,
-	0x358243,
-	0x219942,
-	0xda02ac2,
-	0x2c55c6,
-	0x2334c7,
-	0x2f7a85,
-	0x37da44,
-	0x3723c5,
-	0x367007,
-	0x274205,
-	0x2d3e89,
-	0x2e0586,
-	0x2e5488,
-	0x2f7986,
-	0xde0db42,
-	0x362f48,
-	0x2f8bc6,
-	0x20db45,
-	0x304687,
-	0x30c2c4,
-	0x30c2c5,
-	0x28a8c4,
-	0x28a8c8,
-	0xe20a182,
-	0xe60c502,
-	0x313646,
-	0x2c28c8,
-	0x31f145,
-	0x332c06,
-	0x3356c8,
-	0x33e1c8,
-	0xea0fd45,
-	0xee0c504,
-	0x2958c7,
-	0xf20bbc2,
-	0xf61c402,
-	0x1060d1c2,
-	0x35aa45,
-	0x2a8505,
-	0x282606,
-	0x3698c7,
-	0x376ec7,
-	0x10ed0783,
-	0x2e3447,
-	0x30dc88,
-	0x3823c9,
-	0x378987,
-	0x390287,
-	0x3a5b08,
-	0x3aa206,
-	0x22e546,
-	0x22f18c,
-	0x230b0a,
-	0x230fc7,
-	0x23268b,
-	0x233307,
-	0x23330e,
-	0x236244,
-	0x23a184,
-	0x23b547,
-	0x264f47,
-	0x240d46,
-	0x240d47,
-	0x241207,
-	0x18a20802,
-	0x2420c6,
-	0x2420ca,
-	0x24294b,
-	0x243407,
-	0x244ec5,
-	0x245203,
-	0x246c46,
-	0x246c47,
-	0x241c43,
-	0x18e38702,
-	0x24b74a,
-	0x19356fc2,
-	0x196acdc2,
-	0x19a4cec2,
-	0x19e26982,
-	0x24da85,
-	0x24e0c4,
-	0x1a604d02,
-	0x209f85,
-	0x294ac3,
-	0x20bf85,
-	0x237804,
-	0x20a684,
-	0x2ba5c6,
-	0x26a546,
-	0x28e443,
-	0x3b1484,
-	0x209383,
-	0x1aa03b02,
-	0x263544,
-	0x263546,
-	0x295e45,
-	0x27fdc6,
-	0x304788,
-	0x20cb44,
-	0x2a8e88,
-	0x343fc5,
-	0x24a108,
-	0x2b1cc6,
-	0x2bddc7,
-	0x26cdc4,
-	0x26cdc6,
-	0x25e303,
-	0x382e43,
-	0x2c9388,
-	0x318bc4,
-	0x238d47,
-	0x220246,
-	0x2dad89,
-	0x315108,
-	0x319f08,
-	0x349184,
-	0x39b9c3,
-	0x23e342,
-	0x1ba34682,
-	0x1be16102,
-	0x3b2783,
-	0x1c204a42,
-	0x2607c4,
-	0x390a46,
-	0x39a6c5,
-	0x2a4383,
-	0x232004,
-	0x2b6f47,
-	0x26aa43,
-	0x250d08,
-	0x20e8c5,
-	0x370083,
-	0x281045,
-	0x281184,
-	0x2fb8c6,
-	0x210384,
-	0x211a46,
-	0x213046,
-	0x263004,
-	0x21fd83,
-	0x2225c3,
-	0x1c604e42,
-	0x377905,
-	0x222e03,
-	0x1ca1c3c2,
-	0x22f143,
-	0x210085,
-	0x231b83,
-	0x231b89,
-	0x1ce07d02,
-	0x1d601142,
-	0x28d9c5,
-	0x21a746,
-	0x2d6906,
-	0x2b94c8,
-	0x2b94cb,
-	0x20538b,
-	0x2f7c85,
-	0x2e1045,
-	0x2c9fc9,
-	0x1600742,
-	0x2631c8,
-	0x206044,
-	0x1de001c2,
-	0x25fa83,
-	0x1e665106,
-	0x20f088,
-	0x1ea04782,
-	0x233ec8,
-	0x1ee01742,
-	0x225c4a,
-	0x1f2d0e43,
-	0x3b1e86,
-	0x206988,
-	0x207d48,
-	0x39a9c6,
-	0x36d5c7,
-	0x271647,
-	0x220b0a,
-	0x2dc204,
-	0x3423c4,
-	0x355589,
-	0x1fb8fc85,
-	0x20fb46,
-	0x208203,
-	0x251944,
-	0x201e44,
-	0x201e47,
-	0x22cec7,
-	0x237044,
-	0x220a45,
-	0x2826c8,
-	0x350707,
-	0x3619c7,
-	0x1fe041c2,
-	0x226004,
-	0x298cc8,
-	0x381004,
-	0x24f0c4,
-	0x24fa45,
-	0x24fb87,
-	0x215809,
-	0x2505c4,
-	0x2510c9,
-	0x251308,
-	0x2516c4,
-	0x2516c7,
-	0x20251c43,
-	0x252487,
-	0x16101c2,
-	0x179d442,
-	0x253386,
-	0x2539c7,
-	0x253e84,
-	0x255607,
-	0x256907,
-	0x257483,
-	0x2abc02,
-	0x229c02,
-	0x258743,
-	0x258744,
-	0x25874b,
-	0x3149c8,
-	0x25f184,
-	0x2594c5,
-	0x25ba87,
-	0x25d8c5,
-	0x2c4dca,
-	0x25f0c3,
-	0x2060da42,
-	0x22b484,
-	0x264d09,
-	0x268983,
-	0x268a47,
-	0x28ee89,
-	0x37b5c8,
-	0x2d8483,
-	0x27ff47,
-	0x280689,
-	0x2316c3,
-	0x288284,
-	0x289389,
-	0x28c6c6,
-	0x28dc83,
-	0x2023c2,
-	0x24ca43,
-	0x36ab47,
-	0x2bfa85,
-	0x35ba06,
-	0x256bc4,
-	0x2d1d45,
-	0x205a83,
-	0x218506,
-	0x20a9c2,
-	0x391084,
-	0x22ad02,
-	0x22ad03,
-	0x20a00182,
-	0x29b083,
-	0x216c44,
-	0x216c47,
-	0x200306,
-	0x201e02,
-	0x20e01dc2,
-	0x21e184,
-	0x2123b882,
-	0x21600502,
-	0x2dfcc4,
-	0x2dfcc5,
-	0x2b9cc5,
-	0x262746,
-	0x21a0ca82,
-	0x20ca85,
-	0x210d85,
-	0x225883,
-	0x215c06,
-	0x216dc5,
-	0x21c482,
-	0x33de05,
-	0x21c484,
-	0x2230c3,
-	0x223303,
-	0x21e097c2,
-	0x294a47,
-	0x221144,
-	0x221149,
-	0x251844,
-	0x228903,
-	0x341cc9,
-	0x3777c8,
-	0x2a8384,
-	0x2a8386,
-	0x210503,
-	0x259b43,
-	0x332ec3,
-	0x222ebc02,
-	0x30eb82,
-	0x22600642,
-	0x3238c8,
-	0x35c588,
-	0x394d86,
-	0x24ed45,
-	0x2b32c5,
-	0x200647,
-	0x228fc5,
-	0x2630c2,
-	0x22a9a502,
-	0x1614502,
-	0x38fe08,
-	0x362e85,
-	0x351d04,
-	0x2f18c5,
-	0x3836c7,
-	0x24f5c4,
-	0x246f82,
-	0x22e01182,
-	0x336f04,
-	0x2173c7,
-	0x28e9c7,
-	0x357a04,
-	0x298383,
-	0x24e204,
-	0x24e208,
-	0x22e886,
-	0x27230a,
-	0x2156c4,
-	0x298708,
-	0x259784,
-	0x222b46,
-	0x29a4c4,
-	0x35ad46,
-	0x221409,
-	0x25b287,
-	0x234483,
-	0x23274842,
-	0x274843,
-	0x20c2c2,
-	0x23651b02,
-	0x2f0b06,
-	0x364148,
-	0x2a9d87,
-	0x395d09,
-	0x297f09,
-	0x2ab245,
-	0x2ad3c9,
-	0x2ae045,
-	0x2ae189,
-	0x2af5c5,
-	0x2b0208,
-	0x27f284,
-	0x23a8d6c7,
-	0x294403,
-	0x2b0407,
-	0x390646,
-	0x2b08c7,
-	0x2a6d45,
-	0x2a7f83,
-	0x23e00dc2,
-	0x392604,
-	0x2423b8c2,
-	0x264403,
-	0x24618d82,
-	0x307646,
-	0x26b845,
-	0x2b2bc7,
-	0x37f183,
-	0x324c44,
-	0x2138c3,
-	0x2386c3,
-	0x24a0a3c2,
-	0x25201a02,
-	0x394744,
-	0x2abbc3,
-	0x38c985,
-	0x226d85,
-	0x25602282,
-	0x25e00bc2,
-	0x280286,
-	0x318d04,
-	0x2491c4,
-	0x2491ca,
-	0x26601d42,
-	0x37324a,
-	0x204148,
-	0x26a964c4,
-	0x201d43,
-	0x25ff43,
-	0x318f09,
-	0x2a8909,
-	0x2b7046,
-	0x26e04303,
-	0x328145,
-	0x30664d,
-	0x204306,
-	0x21268b,
-	0x27203482,
-	0x295048,
-	0x27e1c282,
-	0x282051c2,
-	0x37aa85,
-	0x28600b02,
-	0x2a3147,
-	0x212b87,
-	0x201503,
-	0x22f848,
-	0x28a02f02,
-	0x202f04,
-	0x217043,
-	0x38d045,
-	0x386fc3,
-	0x2eb106,
-	0x30bdc4,
-	0x204ec3,
-	0x234f83,
-	0x28e07042,
-	0x2f7c04,
-	0x30ed45,
-	0x35a587,
-	0x27dbc3,
-	0x2b36c3,
-	0x2b3ec3,
-	0x1621ac2,
-	0x2b3f83,
-	0x2b4b03,
-	0x2920ae42,
-	0x2cee84,
-	0x26a746,
-	0x33c7c3,
-	0x2b4f83,
-	0x296b5e02,
-	0x2b5e08,
-	0x2b60c4,
-	0x2470c6,
-	0x2b6547,
-	0x24e3c6,
-	0x295304,
-	0x37200082,
-	0x39050b,
-	0x2ffbce,
-	0x21bb0f,
-	0x29da43,
-	0x37a4ca02,
-	0x166b142,
-	0x37e02442,
-	0x29c243,
-	0x2472c3,
-	0x233106,
-	0x22ff46,
-	0x212307,
-	0x31aa84,
-	0x3821a882,
-	0x3860ec02,
-	0x2d4ac5,
-	0x2e88c7,
-	0x37e046,
-	0x38a82882,
-	0x2f5b04,
-	0x2b9783,
-	0x38e01b02,
-	0x39352883,
-	0x2ba984,
-	0x2c06c9,
-	0x16c6fc2,
-	0x39642682,
-	0x351245,
-	0x39ac7242,
-	0x39e02682,
-	0x341687,
-	0x2364c9,
-	0x35600b,
-	0x271405,
-	0x2c7c89,
-	0x276a46,
-	0x2d06c7,
-	0x3a2092c4,
-	0x32ef49,
-	0x374b07,
-	0x2255c7,
-	0x234003,
-	0x37b386,
-	0x30f887,
-	0x265383,
-	0x27c5c6,
-	0x3aa022c2,
-	0x3ae31e02,
-	0x220443,
-	0x324845,
-	0x257747,
-	0x21fac6,
-	0x2bfa05,
-	0x230044,
-	0x2efa45,
-	0x2f8284,
-	0x3b205e82,
-	0x349f07,
-	0x2e1c44,
-	0x23e244,
-	0x33328d,
-	0x257249,
-	0x381588,
-	0x25ac04,
-	0x314e85,
-	0x3b2607,
-	0x205e84,
-	0x382a47,
-	0x20c705,
-	0x3b6aa384,
-	0x36dec5,
-	0x267644,
-	0x24f706,
-	0x3696c5,
-	0x3ba24742,
-	0x369fc4,
-	0x369fc5,
-	0x3716c6,
-	0x2bfb45,
-	0x25c104,
-	0x3120c3,
-	0x204986,
-	0x22c085,
-	0x22c785,
-	0x3697c4,
-	0x215743,
-	0x21574c,
-	0x3be8d002,
-	0x3c2045c2,
-	0x3c605d82,
-	0x205d83,
-	0x205d84,
-	0x3ca032c2,
-	0x2f9648,
-	0x35bac5,
-	0x33f884,
-	0x230e46,
-	0x3ce073c2,
-	0x3d20fc42,
-	0x3d600c02,
-	0x321e85,
-	0x262ec6,
-	0x20b484,
-	0x325fc6,
-	0x3036c6,
-	0x202983,
-	0x3db1164a,
-	0x264785,
-	0x28b4c3,
-	0x223886,
-	0x305e09,
-	0x223887,
-	0x293308,
-	0x29d649,
-	0x248108,
-	0x229a46,
-	0x208843,
-	0x3de017c2,
-	0x384b03,
-	0x384b09,
-	0x368548,
-	0x3e2513c2,
-	0x3e601f02,
-	0x22d603,
-	0x2e0405,
-	0x258f44,
-	0x35e849,
-	0x226784,
-	0x26f288,
-	0x205c03,
-	0x2602c4,
-	0x2784c3,
-	0x21a788,
-	0x3331c7,
-	0x3ea0f302,
-	0x2432c2,
-	0x257d85,
-	0x3960c9,
-	0x20fbc3,
-	0x281ac4,
-	0x328104,
-	0x219e03,
-	0x28380a,
-	0x3ef73102,
-	0x3f2c0202,
-	0x2c8883,
-	0x374fc3,
-	0x1649202,
-	0x262a43,
-	0x3f60bcc2,
-	0x3fa05f02,
-	0x3fe22044,
-	0x222046,
-	0x33e8c6,
-	0x277844,
-	0x2474c3,
-	0x39bc83,
-	0x235143,
-	0x242cc6,
-	0x2ce085,
-	0x2c8e47,
-	0x2d0589,
-	0x2ccac5,
-	0x2cdfc6,
-	0x2ce548,
-	0x2ce746,
-	0x245bc4,
-	0x29ef8b,
-	0x2d3983,
-	0x2d3985,
-	0x2d3ac8,
-	0x226302,
-	0x341982,
-	0x4024db02,
-	0x4060b602,
-	0x21a8c3,
-	0x40a73fc2,
-	0x273fc3,
-	0x2d3dc4,
-	0x2d4e43,
-	0x41201682,
-	0x41601686,
-	0x2c47c6,
-	0x2da008,
-	0x41a95242,
-	0x41e10882,
-	0x42223342,
-	0x4265e402,
-	0x42a14202,
-	0x42e01302,
-	0x234103,
-	0x261c05,
-	0x32d1c6,
-	0x43213184,
-	0x295c4a,
-	0x201306,
-	0x2f7ec4,
-	0x269ec3,
-	0x43e0c002,
-	0x202082,
-	0x231743,
-	0x44204ac3,
-	0x362b47,
-	0x3695c7,
-	0x45a58847,
-	0x32d747,
-	0x228543,
-	0x2977ca,
-	0x377004,
-	0x220144,
-	0x22014a,
-	0x202085,
-	0x45e04182,
-	0x3294c3,
-	0x462002c2,
-	0x2104c3,
-	0x274803,
-	0x46a00842,
-	0x2e33c4,
-	0x21db44,
-	0x208285,
-	0x30bd05,
-	0x249406,
-	0x249786,
-	0x46e09282,
-	0x47201002,
-	0x3274c5,
-	0x2c44d2,
-	0x271ac6,
-	0x248803,
-	0x2a2486,
-	0x248805,
-	0x1610a02,
-	0x4f611802,
-	0x3522c3,
-	0x211803,
-	0x278203,
-	0x4fa11f82,
-	0x378ac3,
-	0x4fe14602,
-	0x200a83,
-	0x2ceec8,
-	0x24a843,
-	0x24a846,
-	0x3a1087,
-	0x321b06,
-	0x321b0b,
-	0x2f7e07,
-	0x392404,
-	0x50603ec2,
-	0x364805,
-	0x50a04a83,
-	0x239f83,
-	0x326805,
-	0x35b5c3,
-	0x35b5c6,
-	0x26334a,
-	0x2774c3,
-	0x23ad04,
-	0x2c2806,
-	0x20df46,
-	0x50e00383,
-	0x324b07,
-	0x28bb8d,
-	0x3adbc7,
-	0x2a0685,
-	0x250b46,
-	0x22c0c3,
-	0x52a15e43,
-	0x52e04c82,
-	0x3b2804,
-	0x236d8c,
-	0x245309,
-	0x24bcc7,
-	0x3724c5,
-	0x268d84,
-	0x27c1c8,
-	0x27ed05,
-	0x5328a405,
-	0x377c09,
-	0x256343,
-	0x2acd44,
-	0x53617902,
-	0x21aac3,
-	0x53a99f82,
-	0x2a3fc6,
-	0x16aa082,
-	0x53e943c2,
-	0x321d88,
-	0x2c08c3,
-	0x36de07,
-	0x305105,
-	0x2943c5,
-	0x30860b,
-	0x2e3906,
-	0x308806,
-	0x36dbc6,
-	0x268f84,
-	0x2e5686,
-	0x2e5b48,
-	0x23e943,
-	0x23cf83,
-	0x23cf84,
-	0x2e6984,
-	0x2e6e07,
-	0x2e8745,
-	0x542e8882,
-	0x54606ec2,
-	0x206ec5,
-	0x2a4a84,
-	0x2ebf8b,
-	0x2ee248,
-	0x2f7304,
-	0x290602,
-	0x54eb6042,
-	0x38c543,
-	0x2ee704,
-	0x2ee9c5,
-	0x2ef087,
-	0x2f1404,
-	0x2f7cc4,
-	0x552054c2,
-	0x35d209,
-	0x2f2445,
-	0x2716c5,
-	0x2f3105,
-	0x5561aa03,
-	0x2f4244,
-	0x2f424b,
-	0x2f4684,
-	0x2f4b0b,
-	0x2f5505,
-	0x21bc4a,
-	0x2f5d08,
-	0x2f5f0a,
-	0x2f6783,
-	0x2f678a,
-	0x55a1b282,
-	0x55e01202,
-	0x26a103,
-	0x562f7902,
-	0x2f7903,
-	0x5673aa42,
-	0x56b21202,
-	0x2f8104,
-	0x21c2c6,
-	0x325d05,
-	0x2f8b43,
-	0x32ff46,
-	0x30c845,
-	0x2e9784,
-	0x56e00e02,
-	0x2d7904,
-	0x2c9c4a,
-	0x2eb487,
-	0x26b686,
-	0x244007,
-	0x236ec3,
-	0x265488,
-	0x28954b,
-	0x386a45,
-	0x235905,
-	0x235906,
-	0x370204,
-	0x31d488,
-	0x215a83,
-	0x2b5984,
-	0x36b507,
-	0x307206,
-	0x200e06,
-	0x2a58ca,
-	0x24e684,
-	0x24e68a,
-	0x57201946,
-	0x201947,
-	0x259547,
-	0x279804,
-	0x279809,
-	0x2ba485,
-	0x23b80b,
-	0x2769c3,
-	0x211c03,
-	0x2a3f43,
-	0x22ec44,
-	0x57600682,
-	0x259f06,
-	0x2a7d05,
-	0x2a26c5,
-	0x2564c6,
-	0x2531c4,
-	0x57a01f82,
-	0x245244,
-	0x57e00d42,
-	0x200d44,
-	0x224303,
-	0x58211842,
-	0x3398c3,
-	0x2478c6,
-	0x58602602,
-	0x2cfb88,
-	0x223704,
-	0x223706,
-	0x375846,
-	0x25bb44,
-	0x204905,
-	0x20c408,
-	0x20c907,
-	0x20d007,
-	0x20d00f,
-	0x298bc6,
-	0x227843,
-	0x227844,
-	0x28be84,
-	0x210e83,
-	0x222c84,
-	0x241104,
-	0x58a36b82,
-	0x28e183,
-	0x241383,
-	0x58e0c4c2,
-	0x22a543,
-	0x260883,
-	0x213e8a,
-	0x22bc87,
-	0x241c8c,
-	0x241f46,
-	0x242406,
-	0x246dc7,
-	0x592ddb07,
-	0x251a09,
-	0x21cc04,
-	0x252284,
-	0x59609f42,
-	0x59a01702,
-	0x2a5c86,
-	0x324904,
-	0x2db5c6,
-	0x2ab348,
-	0x20eec4,
-	0x2a3186,
-	0x2d68c5,
-	0x26ebc8,
-	0x205583,
-	0x272605,
-	0x273583,
-	0x2717c3,
-	0x2717c4,
-	0x273983,
-	0x59edeec2,
-	0x5a200b42,
-	0x276889,
-	0x27ec05,
-	0x27ee04,
-	0x281305,
-	0x212504,
-	0x2c1247,
-	0x33d3c5,
-	0x258a04,
-	0x258a08,
-	0x2dc3c6,
-	0x2de404,
-	0x2dfdc8,
-	0x2e1a87,
-	0x5a60e5c2,
-	0x305304,
-	0x210f44,
-	0x2257c7,
-	0x5aa53d84,
-	0x249682,
-	0x5ae01ac2,
-	0x21b083,
-	0x351144,
-	0x242643,
-	0x33d945,
-	0x5b21de42,
-	0x2ebb05,
-	0x212bc2,
-	0x381dc5,
-	0x364305,
-	0x5b60c842,
-	0x3581c4,
-	0x5ba06342,
-	0x2a9146,
-	0x2ac506,
-	0x396208,
-	0x2c3608,
-	0x3075c4,
-	0x2f8905,
-	0x2fe809,
-	0x2e10c4,
-	0x263304,
-	0x20aec3,
-	0x5be20c45,
-	0x2c7087,
-	0x25e944,
-	0x33a48d,
-	0x33c282,
-	0x33c283,
-	0x355783,
-	0x5c200202,
-	0x388b45,
-	0x26c747,
-	0x2a7e04,
-	0x32d807,
-	0x29d849,
-	0x2c9d89,
-	0x248ac7,
-	0x243843,
-	0x27c008,
-	0x2f33c9,
-	0x2500c7,
-	0x370145,
-	0x385886,
-	0x394246,
-	0x3959c5,
-	0x257345,
-	0x5c603102,
-	0x27eb05,
-	0x2b8308,
-	0x2c5386,
-	0x2bcc07,
-	0x2f5744,
-	0x2ad207,
-	0x2faf46,
-	0x5ca2fb02,
-	0x3713c6,
-	0x2fd38a,
-	0x2fde45,
-	0x5cee4742,
-	0x5d245702,
-	0x30fbc6,
-	0x2b25c8,
-	0x5d68eb87,
-	0x5da04602,
-	0x20edc3,
-	0x38c706,
-	0x2246c4,
-	0x3a0f46,
-	0x262446,
-	0x26bd0a,
-	0x319a45,
-	0x204446,
-	0x218c83,
-	0x218c84,
-	0x205302,
-	0x30c283,
-	0x5de05dc2,
-	0x2ce903,
-	0x3734c4,
-	0x2b2704,
-	0x2b270a,
-	0x229b03,
-	0x28a7c8,
-	0x229b0a,
-	0x23a407,
-	0x301446,
-	0x2a9004,
-	0x296e42,
-	0x219542,
-	0x5e206e42,
-	0x24e1c3,
-	0x259307,
-	0x330207,
-	0x38fd4b,
-	0x28a2c4,
-	0x34f9c7,
-	0x2ef186,
-	0x21c607,
-	0x258004,
-	0x23c445,
-	0x2c17c5,
-	0x5e620382,
-	0x221a86,
-	0x246043,
-	0x24a2c2,
-	0x24a2c6,
-	0x5ea04802,
-	0x5ee05bc2,
-	0x3abd45,
-	0x5f222e82,
-	0x5f600a42,
-	0x343745,
-	0x38e6c5,
-	0x204505,
-	0x270ac3,
-	0x390b05,
-	0x2e39c7,
-	0x309445,
-	0x30a985,
-	0x3a05c4,
-	0x24c646,
-	0x25c1c4,
-	0x5fa03382,
-	0x6060ce05,
-	0x36f447,
-	0x2db7c8,
-	0x2a32c6,
-	0x2a32cd,
-	0x2a86c9,
-	0x2a86d2,
-	0x332705,
-	0x33c843,
-	0x60a044c2,
-	0x2f6d84,
-	0x204383,
-	0x3623c5,
-	0x2fed85,
-	0x60e17082,
-	0x3700c3,
-	0x6124d082,
-	0x616c3142,
-	0x61a18dc2,
-	0x364c05,
-	0x329ec3,
-	0x319888,
-	0x61e02d82,
-	0x62206902,
-	0x2e3386,
-	0x34398a,
-	0x272243,
-	0x25c083,
-	0x2ed703,
-	0x62e016c2,
-	0x71211fc2,
-	0x71a19682,
-	0x206602,
-	0x3711c9,
-	0x2c6404,
-	0x22fb48,
-	0x71ef8b82,
-	0x72202502,
-	0x2f4d45,
-	0x232ac8,
-	0x2cf008,
-	0x2fd54c,
-	0x23bd83,
-	0x267002,
-	0x726019c2,
-	0x2ccf46,
-	0x3022c5,
-	0x239103,
-	0x383586,
-	0x302406,
-	0x21e2c3,
-	0x304ec3,
-	0x3055c6,
-	0x306204,
-	0x225d46,
-	0x2d3b45,
-	0x30648a,
-	0x240544,
-	0x307884,
-	0x307a4a,
-	0x72a037c2,
-	0x234605,
-	0x30898a,
-	0x309a85,
-	0x30a344,
-	0x30a446,
-	0x30a5c4,
-	0x228306,
-	0x72e39342,
-	0x2eadc6,
-	0x3a2445,
-	0x26bb87,
-	0x3a3c46,
-	0x246fc4,
-	0x2da807,
-	0x311586,
-	0x25b5c5,
-	0x2d4287,
-	0x39cd87,
-	0x39cd8e,
-	0x24abc6,
-	0x382905,
-	0x285407,
-	0x201c43,
-	0x201c47,
-	0x3b3445,
-	0x2108c4,
-	0x211882,
-	0x22afc7,
-	0x31ab04,
-	0x22fec4,
-	0x24314b,
-	0x21d283,
-	0x288fc7,
-	0x21d284,
-	0x2ace07,
-	0x2824c3,
-	0x334b4d,
-	0x389388,
-	0x228e04,
-	0x258905,
-	0x30ac85,
-	0x30b0c3,
-	0x73201a82,
-	0x30c243,
-	0x30cf43,
-	0x221c04,
-	0x280785,
-	0x223387,
-	0x218d06,
-	0x373203,
-	0x24a40b,
-	0x3aa70b,
-	0x27928b,
-	0x28088a,
-	0x2ad8cb,
-	0x2fc28b,
-	0x2e478c,
-	0x2e7291,
-	0x32170a,
-	0x34e48b,
-	0x379d0b,
-	0x3b048a,
-	0x3b4cca,
-	0x30ea4d,
-	0x31038e,
-	0x3109cb,
-	0x310c8a,
-	0x312191,
-	0x3125ca,
-	0x312acb,
-	0x31300e,
-	0x31398c,
-	0x313fcb,
-	0x31428e,
-	0x31460c,
-	0x315a4a,
-	0x31694c,
-	0x73716c4a,
-	0x317449,
-	0x31b60a,
-	0x31b88a,
-	0x31bb0b,
-	0x31e9ce,
-	0x31ed51,
-	0x327a09,
-	0x327c4a,
-	0x32844b,
-	0x32a30a,
-	0x32ab96,
-	0x32c8cb,
-	0x32e00a,
-	0x32e5ca,
-	0x33048b,
-	0x332189,
-	0x3354c9,
-	0x335a4d,
-	0x3360cb,
-	0x33734b,
-	0x337d0b,
-	0x3381c9,
-	0x33880e,
-	0x338f0a,
-	0x33a24a,
-	0x33a7ca,
-	0x33af8b,
-	0x33b7cb,
-	0x33ba8d,
-	0x33cecd,
-	0x33da90,
-	0x33df4b,
-	0x33e54c,
-	0x33ea4b,
-	0x34118b,
-	0x34290b,
-	0x3463cb,
-	0x346e4f,
-	0x34720b,
-	0x347d0a,
-	0x348249,
-	0x348609,
-	0x34898b,
-	0x348c4e,
-	0x34b98b,
-	0x34d04f,
-	0x34ff0b,
-	0x3501cb,
-	0x35048b,
-	0x35098a,
-	0x355c09,
-	0x35a20f,
-	0x36128c,
-	0x36170c,
-	0x36208e,
-	0x36388f,
-	0x363c4e,
-	0x3652d0,
-	0x3656cf,
-	0x365d4e,
-	0x36650c,
-	0x366812,
-	0x36a511,
-	0x36ad0e,
-	0x36ba0e,
-	0x36bf4e,
-	0x36c2cf,
-	0x36c68e,
-	0x36ca13,
-	0x36ced1,
-	0x36d30e,
-	0x36d78c,
-	0x36e493,
-	0x36fa90,
-	0x37070c,
-	0x370a0c,
-	0x370ecb,
-	0x37184e,
-	0x371f8b,
-	0x3727cb,
-	0x37378c,
-	0x37914a,
-	0x37950c,
-	0x37980c,
-	0x379b09,
-	0x37b7cb,
-	0x37ba88,
-	0x37bc89,
-	0x37bc8f,
-	0x37d5cb,
-	0x37e44a,
-	0x37fd4c,
-	0x380e09,
-	0x381b88,
-	0x38214b,
-	0x382c0b,
-	0x38418a,
-	0x38440b,
-	0x38488c,
-	0x385548,
-	0x38958b,
-	0x38c04b,
-	0x39000b,
-	0x39180b,
-	0x39c90b,
-	0x39cbc9,
-	0x39d10d,
-	0x3a264a,
-	0x3a3597,
-	0x3a3dd8,
-	0x3a6309,
-	0x3a7b4b,
-	0x3a9554,
-	0x3a9a4b,
-	0x3a9fca,
-	0x3ab70a,
-	0x3ab98b,
-	0x3ad110,
-	0x3ad511,
-	0x3ae64a,
-	0x3afa8d,
-	0x3b018d,
-	0x3b508b,
-	0x3b5c46,
-	0x221b83,
-	0x73b76c03,
-	0x37f706,
-	0x292c85,
-	0x396787,
-	0x3215c6,
-	0x1639f02,
-	0x2b3809,
-	0x32fd44,
-	0x2e0bc8,
-	0x24e103,
-	0x2f6cc7,
-	0x241b82,
-	0x2b2c03,
-	0x73e06c82,
-	0x2cb006,
-	0x2cc544,
-	0x3b2e84,
-	0x2616c3,
-	0x2616c5,
-	0x746c7282,
-	0x74aae504,
-	0x279747,
-	0x1669e02,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x20abc3,
-	0x204cc2,
-	0x15f048,
-	0x20d1c2,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x324156,
-	0x325393,
-	0x34f849,
-	0x2957c8,
-	0x364689,
-	0x308b06,
-	0x336f50,
-	0x25c9d3,
-	0x3072c8,
-	0x344207,
-	0x27e407,
-	0x2475ca,
-	0x373549,
-	0x239789,
-	0x29258b,
-	0x367e06,
-	0x314aca,
-	0x2221c6,
-	0x32f943,
-	0x294985,
-	0x22b888,
-	0x2a920d,
-	0x35ab0c,
-	0x3a2107,
-	0x379f8d,
-	0x20c504,
-	0x22ef0a,
-	0x23064a,
-	0x230b0a,
-	0x20fe87,
-	0x240387,
-	0x243084,
-	0x26cdc6,
-	0x3aab84,
-	0x2e26c8,
-	0x2267c9,
-	0x2b94c6,
-	0x2b94c8,
-	0x24c34d,
-	0x2c9fc9,
-	0x207d48,
-	0x271647,
-	0x2f8e8a,
-	0x2539c6,
-	0x2642c7,
-	0x2c96c4,
-	0x28e807,
-	0x332eca,
-	0x36f5ce,
-	0x228fc5,
-	0x28e70b,
-	0x262089,
-	0x2a8909,
-	0x2129c7,
-	0x29998a,
-	0x225707,
-	0x2ffd09,
-	0x326b48,
-	0x35dc4b,
-	0x2e0405,
-	0x38144a,
-	0x223109,
-	0x23908a,
-	0x2ccb4b,
-	0x383a0b,
-	0x292315,
-	0x2e6185,
-	0x2716c5,
-	0x2f424a,
-	0x25980a,
-	0x261e07,
-	0x21d743,
-	0x2a5c08,
-	0x2d828a,
-	0x223706,
-	0x24ff09,
-	0x26ebc8,
-	0x2de404,
-	0x242649,
-	0x2c3608,
-	0x2b1c07,
-	0x20ce06,
-	0x36f447,
-	0x293cc7,
-	0x242ac5,
-	0x228e0c,
-	0x258905,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x2d0783,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x2d0783,
-	0x204ac3,
-	0x24a843,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x20d1c2,
-	0x2000c2,
-	0x230d42,
-	0x202f02,
-	0x202382,
-	0x261e82,
-	0x46d0783,
-	0x231b83,
-	0x2135c3,
-	0x332ec3,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x201383,
-	0x15f048,
-	0x32df04,
-	0x260087,
-	0x263d43,
-	0x37aa84,
-	0x214543,
-	0x212a43,
-	0x332ec3,
-	0x13ecc7,
-	0x204cc2,
-	0x168883,
-	0x5a0d1c2,
-	0x8d54d,
-	0x8d88d,
-	0x230d42,
-	0x964c4,
-	0x200382,
-	0x5e963c8,
-	0xf39c4,
-	0x15f048,
-	0x14020c2,
-	0x1509cc6,
-	0x20e443,
-	0x26ae03,
-	0x66d0783,
-	0x22ef04,
-	0x6a31b83,
-	0x6f32ec3,
-	0x20a3c2,
-	0x2964c4,
-	0x204ac3,
-	0x2fc883,
-	0x201882,
-	0x200383,
-	0x21c802,
-	0x2f8043,
-	0x202602,
-	0x203f83,
-	0x26ec83,
-	0x206d02,
-	0x15f048,
-	0x20e443,
-	0x2fc883,
-	0x201882,
-	0x2f8043,
-	0x202602,
-	0x203f83,
-	0x26ec83,
-	0x206d02,
-	0x2f8043,
-	0x202602,
-	0x203f83,
-	0x26ec83,
-	0x206d02,
-	0x2d0783,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x210582,
-	0x21aa03,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204ac3,
-	0x200383,
-	0x370145,
-	0x217082,
-	0x204cc2,
-	0x15f048,
-	0x1491b48,
-	0x332ec3,
-	0x2461c1,
-	0x2096c1,
-	0x202201,
-	0x209441,
-	0x24a5c1,
-	0x27e081,
-	0x24c0c1,
-	0x2462c1,
-	0x2e7481,
-	0x30ed01,
-	0x200141,
-	0x200001,
-	0x15f048,
-	0x200701,
-	0x200101,
-	0x2000c1,
-	0x201e41,
-	0x200181,
-	0x200941,
-	0x200041,
-	0x204ec1,
-	0x200081,
-	0x201481,
-	0x200c01,
-	0x2002c1,
-	0x200381,
-	0x200e81,
-	0x21c2c1,
-	0x2003c1,
-	0x200201,
-	0x200241,
-	0x200a01,
-	0x2019c1,
-	0x201a81,
-	0x2005c1,
-	0x2007c1,
-	0x200cc1,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x200382,
-	0x200383,
-	0x13ecc7,
-	0xfcc7,
-	0x28b86,
-	0x3dcca,
-	0x8cc48,
-	0x58dc8,
-	0x59207,
-	0x62a46,
-	0xde185,
-	0x63c85,
-	0x177ac6,
-	0x125886,
-	0x24ae04,
-	0x31cdc7,
-	0x15f048,
-	0x2da904,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x332ec3,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x217082,
-	0x2c8dc3,
-	0x21fd43,
-	0x200603,
-	0x202942,
-	0x251d43,
-	0x205283,
-	0x21e743,
-	0x200001,
-	0x203e43,
-	0x225b04,
-	0x37f1c3,
-	0x318cc3,
-	0x21c403,
-	0x360383,
-	0xaad0783,
-	0x23a184,
-	0x21c3c3,
-	0x22f143,
-	0x231b83,
-	0x2318c3,
-	0x23a943,
-	0x2a85c3,
-	0x318c43,
-	0x233ec3,
-	0x201e43,
-	0x253f84,
-	0x2abc02,
-	0x258683,
-	0x25eb43,
-	0x27bfc3,
-	0x262883,
-	0x201dc3,
-	0x332ec3,
-	0x208803,
-	0x209e43,
-	0x204143,
-	0x210203,
-	0x2ff083,
-	0xae30043,
-	0x2b1083,
-	0x2113c3,
-	0x22d603,
-	0x20fbc3,
-	0x226302,
-	0x201683,
-	0x204ac3,
-	0x160abc3,
-	0x27d643,
-	0x20ff03,
-	0x216ec3,
-	0x200383,
-	0x3b37c3,
-	0x21aa03,
-	0x241f03,
-	0x304f43,
-	0x2f8203,
-	0x30c845,
-	0x2202c3,
-	0x2f8243,
-	0x35ed83,
-	0x218c84,
-	0x265203,
-	0x311883,
-	0x2d8fc3,
-	0x201383,
-	0x217082,
-	0x23bd83,
-	0x308484,
-	0x22fec4,
-	0x22a843,
-	0x15f048,
-	0x4cc2,
-	0x1442,
-	0x2942,
-	0x5ac2,
-	0x2302,
-	0x702,
-	0x4e242,
-	0x1c2,
-	0x8a42,
-	0xc02,
-	0xf302,
-	0xb602,
-	0x73fc2,
-	0x4c82,
-	0x61e82,
-	0x17902,
-	0x3cf82,
-	0x54c2,
-	0x18b82,
-	0xfc2,
-	0x682,
-	0x1bb82,
-	0x1f82,
-	0xc4c2,
-	0x1702,
-	0x20c42,
-	0xa42,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x200383,
-	0xc2d0783,
-	0x332ec3,
-	0x20fbc3,
-	0x20dc42,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x6c82,
-	0x2031c2,
-	0x24ac42,
-	0x15f048,
-	0xd1c2,
-	0x233482,
-	0x208842,
-	0x22f942,
-	0x204182,
-	0x209282,
-	0x63c85,
-	0x204702,
-	0x201882,
-	0x211f82,
-	0x2034c2,
-	0x217902,
-	0x384982,
-	0x201ac2,
-	0x245742,
-	0x13ecc7,
-	0x169a8d,
-	0xde209,
-	0x56bcb,
-	0xe3888,
-	0x55109,
-	0x332ec3,
-	0x15f048,
-	0x15f048,
-	0x59b46,
-	0x204cc2,
-	0x24ae04,
-	0x20d1c2,
-	0x2d0783,
-	0x2000c2,
-	0x231b83,
-	0x208a42,
-	0x2da904,
-	0x204303,
-	0x2513c2,
-	0x204ac3,
-	0x200382,
-	0x200383,
-	0x2716c6,
-	0x31c0cf,
-	0x70d8c3,
-	0x15f048,
-	0x20d1c2,
-	0x2135c3,
-	0x332ec3,
-	0x20fbc3,
-	0x155afcb,
-	0xde548,
-	0x14ff507,
-	0x13ecc7,
-	0x20d1c2,
-	0x2d0783,
-	0x332ec3,
-	0x204ac3,
-	0x204cc2,
-	0x200902,
-	0x207f42,
-	0xfad0783,
-	0x2416c2,
-	0x231b83,
-	0x2101c2,
-	0x22ad02,
-	0x332ec3,
-	0x2630c2,
-	0x255302,
-	0x2ae4c2,
-	0x203742,
-	0x291e02,
-	0x209902,
-	0x200b82,
-	0x274842,
-	0x258142,
-	0x251b02,
-	0x2b36c2,
-	0x242602,
-	0x246082,
-	0x263c42,
-	0x20fbc3,
-	0x205f02,
-	0x204ac3,
-	0x231302,
-	0x27de02,
-	0x200383,
-	0x251dc2,
-	0x20c4c2,
-	0x209f42,
-	0x200b42,
-	0x20c842,
-	0x2e4742,
-	0x220382,
-	0x24d082,
-	0x234f42,
-	0x310c8a,
-	0x347d0a,
-	0x37e80a,
-	0x3b5dc2,
-	0x2046c2,
-	0x204e82,
-	0xff4f589,
-	0x10324d0a,
-	0x15926c7,
-	0x1410c43,
-	0x243d0,
-	0x9402,
-	0x24fe44,
-	0x10ad0783,
-	0x231b83,
-	0x251304,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x2202c3,
-	0x24abc3,
-	0x15f048,
-	0x14629c4,
-	0x614c5,
-	0x5f88a,
-	0x1168c2,
-	0x1a03c6,
-	0x102d11,
-	0x1134f589,
-	0x61548,
-	0x82a08,
-	0x5e887,
-	0xf82,
-	0x19a18a,
-	0x2ac47,
-	0x15f048,
-	0x10b708,
-	0xbac7,
-	0x16c1b74b,
-	0x1082,
-	0x15de87,
-	0xdb4a,
-	0x5e58f,
-	0xfd4f,
-	0x1c402,
-	0xd1c2,
-	0xa8508,
-	0x185b0a,
-	0x1681c8,
-	0x3b02,
-	0x5e30f,
-	0xa3d4b,
-	0x1672c8,
-	0x13edc7,
-	0x15104a,
-	0x2f64b,
-	0x11dd09,
-	0x150f47,
-	0x100c4c,
-	0x1b3c47,
-	0x18d18a,
-	0x94b88,
-	0x195a8e,
-	0x28b8e,
-	0x2aa8b,
-	0x2b2cb,
-	0x2d3cb,
-	0x2e209,
-	0x3558b,
-	0x4a68d,
-	0xe984b,
-	0xec8cd,
-	0xecc4d,
-	0x18274a,
-	0x2fd0b,
-	0x3688b,
-	0x42305,
-	0x14243d0,
-	0x125d8f,
-	0x1264cf,
-	0x48dcd,
-	0x25910,
-	0x1742,
-	0x17203988,
-	0xfb48,
-	0x176f4745,
-	0x505cb,
-	0x117050,
-	0x57488,
-	0x2b48a,
-	0x5f4c9,
-	0x695c7,
-	0x69907,
-	0x69ac7,
-	0x6c287,
-	0x6d307,
-	0x6dd07,
-	0x6e487,
-	0x6e8c7,
-	0x6f487,
-	0x6f787,
-	0x6ffc7,
-	0x70187,
-	0x70347,
-	0x70507,
-	0x70807,
-	0x70c47,
-	0x718c7,
-	0x71d87,
-	0x729c7,
-	0x72f07,
-	0x730c7,
-	0x73807,
-	0x73e87,
-	0x74087,
-	0x74347,
-	0x74507,
-	0x746c7,
-	0x75047,
-	0x754c7,
-	0x75987,
-	0x76147,
-	0x76407,
-	0x76bc7,
-	0x76d87,
-	0x77107,
-	0x77d07,
-	0x78987,
-	0x78d87,
-	0x78f47,
-	0x79107,
-	0x79547,
-	0x7a307,
-	0x7a607,
-	0x7a907,
-	0x7aac7,
-	0x7ae47,
-	0x7b387,
-	0xa9c2,
-	0x4c94a,
-	0x16dc87,
-	0x178d528b,
-	0x14d5296,
-	0x19151,
-	0xf080a,
-	0xa838a,
-	0x59b46,
-	0xd2acb,
-	0x642,
-	0x2e891,
-	0x94609,
-	0x9a109,
-	0x74842,
-	0xa4f4a,
-	0xaa689,
-	0xab24f,
-	0xaca4e,
-	0xad708,
-	0x18d82,
-	0x15da89,
-	0x18b88e,
-	0xfd08c,
-	0xf254f,
-	0x146ce,
-	0x23b4c,
-	0x2ccc9,
-	0x2db51,
-	0x465c8,
-	0x482d2,
-	0x49fcd,
-	0x82bcd,
-	0x19090b,
-	0x3d2d5,
-	0x4c809,
-	0x4ec0a,
-	0x4f489,
-	0x5ecd0,
-	0x72c4b,
-	0x79f4f,
-	0x7c48b,
-	0x8340c,
-	0x84610,
-	0x8894a,
-	0x8dd0d,
-	0x16618e,
-	0x1ae00a,
-	0x8f7cc,
-	0x93994,
-	0x94291,
-	0xa494b,
-	0xa578f,
-	0xa7bcd,
-	0xac3ce,
-	0xb1acc,
-	0xb220c,
-	0xdc90b,
-	0xdcc0e,
-	0x122110,
-	0x11640b,
-	0x17a64d,
-	0x1af38f,
-	0xb798c,
-	0xb934e,
-	0xbb311,
-	0xc3ccc,
-	0xc5a47,
-	0x15e58d,
-	0x12b50c,
-	0x14be50,
-	0xd1b4d,
-	0xd8e47,
-	0xe2350,
-	0xfa008,
-	0xfb08b,
-	0x150bcf,
-	0x17de88,
-	0xf0a0d,
-	0x181d50,
-	0x17fb1846,
-	0xb6003,
-	0x1b02,
-	0xd0309,
-	0x5ac0a,
-	0x1084c6,
-	0x180dff49,
-	0x13203,
-	0xdab91,
-	0xdafc9,
-	0xdc047,
-	0x5e40b,
-	0xe4a90,
-	0xe4f4c,
-	0xe5385,
-	0x126cc8,
-	0x19dc0a,
-	0x129607,
-	0x1002,
-	0x12464a,
-	0x25e49,
-	0x3a20a,
-	0x8eacf,
-	0x44f4b,
-	0x1b280c,
-	0x1b2ad2,
-	0xaa085,
-	0x2124a,
-	0x186f2fc5,
-	0x17698c,
-	0x121203,
-	0x184982,
-	0xf86ca,
-	0x96b88,
-	0xeca88,
-	0x14a587,
-	0xd42,
-	0x2602,
-	0x3f390,
-	0x1702,
-	0x1aa2cf,
-	0x177ac6,
-	0x301ce,
-	0xe7fcb,
-	0x1ae208,
-	0xd6c09,
-	0x17cd92,
-	0x7c0d,
-	0x56608,
-	0x56a89,
-	0x5700d,
-	0x59c89,
-	0x5a28b,
-	0x5b088,
-	0x5f6c8,
-	0x68bc8,
-	0x68e49,
-	0x6904a,
-	0x6c8cc,
-	0xe5d0a,
-	0x104f87,
-	0x16b2cd,
-	0xf910b,
-	0x12fb4c,
-	0x1a05d0,
-	0x6902,
-	0x1968cd,
-	0x16c2,
-	0x11fc2,
-	0x104eca,
-	0xf070a,
-	0xf6bcb,
-	0x36a4c,
-	0x10b48e,
-	0x21ccd,
-	0x1ab488,
-	0x6c82,
-	0x1166118e,
-	0x11f6a18e,
-	0x1266c00a,
-	0x12ed0a0e,
-	0x137156ce,
-	0x13f2a00c,
-	0x15926c7,
-	0x15926c9,
-	0x1410c43,
-	0x14731e8c,
-	0x14f3a009,
-	0x1409402,
-	0x610d1,
-	0x16a0d1,
-	0x6bf4d,
-	0xd0951,
-	0x11b1d1,
-	0x129f4f,
-	0x131dcf,
-	0x139f4c,
-	0x14a94d,
-	0x18d555,
-	0x1ace0c,
-	0x1b41cc,
-	0x1b5850,
-	0x940c,
-	0x5838c,
-	0xedc19,
-	0x1a6719,
-	0x115419,
-	0x15c754,
-	0x17f854,
-	0x198594,
-	0x19ae14,
-	0x1a9054,
-	0x1577fb09,
-	0x15d98849,
-	0x167b4289,
-	0x11b6b089,
-	0x9402,
-	0x1236b089,
-	0x9402,
-	0xedc0a,
-	0x9402,
-	0x12b6b089,
-	0x9402,
-	0xedc0a,
-	0x9402,
-	0x1336b089,
-	0x9402,
-	0x13b6b089,
-	0x9402,
-	0x1436b089,
-	0x9402,
-	0xedc0a,
-	0x9402,
-	0x14b6b089,
-	0x9402,
-	0xedc0a,
-	0x9402,
-	0x1536b089,
-	0x9402,
-	0x15b6b089,
-	0x9402,
-	0x1636b089,
-	0x9402,
-	0x16b6b089,
-	0x9402,
-	0xedc0a,
-	0x9402,
-	0x102d05,
-	0x19a184,
-	0x11d644,
-	0x1a4884,
-	0xbfc04,
-	0x2144,
-	0x5e884,
-	0x1482283,
-	0x1420183,
-	0xffd84,
-	0x1542b83,
-	0x1742,
-	0x21cc3,
-	0x204cc2,
-	0x20d1c2,
-	0x2000c2,
-	0x2041c2,
-	0x208a42,
-	0x200382,
-	0x202602,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204143,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x204ac3,
-	0x200383,
-	0x3b943,
-	0x332ec3,
-	0x204cc2,
-	0x368883,
-	0x1a2d0783,
-	0x20ef47,
-	0x332ec3,
-	0x205d83,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x25084a,
-	0x2716c5,
-	0x21aa03,
-	0x205bc2,
-	0x15f048,
-	0x15f048,
-	0xd1c2,
-	0x11f0c2,
-	0x15dfc5,
-	0x15f048,
-	0xd0783,
-	0x1ae3db07,
-	0xcfd46,
-	0x1b1acd05,
-	0xcfe07,
-	0xa54a,
-	0xa408,
-	0xb747,
-	0x5f2c8,
-	0x18c407,
-	0xed30f,
-	0x3ab07,
-	0x165bc6,
-	0x117050,
-	0x122f0f,
-	0x108544,
-	0x1b4cfece,
-	0xafd0c,
-	0x11de8a,
-	0xac687,
-	0x12d54a,
-	0x60989,
-	0xc2f4a,
-	0x77a8a,
-	0x1084c6,
-	0xac74a,
-	0x11a58a,
-	0x154009,
-	0xda448,
-	0xda746,
-	0xde74d,
-	0xb9905,
-	0x5a107,
-	0x16df94,
-	0xfe58b,
-	0x16710a,
-	0xa8bcd,
-	0x28b83,
-	0x28b83,
-	0x28b86,
-	0x28b83,
-	0x168883,
-	0x15f048,
-	0xd1c2,
-	0x51304,
-	0x8cdc3,
-	0x170145,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x205283,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x29a2c3,
-	0x24abc3,
-	0x205283,
-	0x24ae04,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x209103,
-	0x2d0783,
-	0x231b83,
-	0x2041c3,
-	0x2135c3,
-	0x332ec3,
-	0x2964c4,
-	0x23a0c3,
-	0x22d603,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0x38c743,
-	0x1d2d0783,
-	0x231b83,
-	0x2c3ec3,
-	0x332ec3,
-	0x2075c3,
-	0x22d603,
-	0x200383,
-	0x2054c3,
-	0x343c44,
-	0x15f048,
-	0x1dad0783,
-	0x231b83,
-	0x2ad7c3,
-	0x332ec3,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x21d7c3,
-	0x15f048,
-	0x1e2d0783,
-	0x231b83,
-	0x2135c3,
-	0x20abc3,
-	0x200383,
-	0x15f048,
-	0x15926c7,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x13ecc7,
-	0x16e1cb,
-	0xdb3c4,
-	0xb9905,
-	0x1491b48,
-	0xae2cd,
-	0x1f68a405,
-	0x192c4,
-	0x1a5c3,
-	0x367fc5,
-	0x15f048,
-	0x1d202,
-	0x2803,
-	0xf7286,
-	0x32f448,
-	0x304507,
-	0x24ae04,
-	0x3b3006,
-	0x3b5706,
-	0x15f048,
-	0x310683,
-	0x2384c9,
-	0x2bdad5,
-	0xbdadf,
-	0x2d0783,
-	0x39a9d2,
-	0xf5806,
-	0x10cfc5,
-	0x2b48a,
-	0x5f4c9,
-	0x39a78f,
-	0x2da904,
-	0x20f345,
-	0x2fee50,
-	0x2959c7,
-	0x20abc3,
-	0x2842c8,
-	0x1257c6,
-	0x2b400a,
-	0x200e84,
-	0x2f2a03,
-	0x2716c6,
-	0x205bc2,
-	0x26b44b,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x2f74c3,
-	0x20d1c2,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x205d83,
-	0x223103,
-	0x200383,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x204ac3,
-	0x200383,
-	0x204cc2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x24ae04,
-	0x2d0783,
-	0x231b83,
-	0x222044,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x209e43,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x262fc3,
-	0x1e303,
-	0x5d83,
-	0x204ac3,
-	0x200383,
-	0x310c8a,
-	0x32a949,
-	0x34184b,
-	0x341f8a,
-	0x347d0a,
-	0x356e8b,
-	0x37300a,
-	0x37914a,
-	0x37e80a,
-	0x37ea8b,
-	0x39d949,
-	0x39f84a,
-	0x39fbcb,
-	0x3a9d0b,
-	0x3b4a8a,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x10c9c9,
-	0x15f048,
-	0x2d0783,
-	0x2695c4,
-	0x200c82,
-	0x213184,
-	0x3ac705,
-	0x205283,
-	0x24ae04,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x251304,
-	0x2da904,
-	0x2964c4,
-	0x22d603,
-	0x204ac3,
-	0x200383,
-	0x293ac5,
-	0x209103,
-	0x21aa03,
-	0x22c6c3,
-	0x258a04,
-	0x262904,
-	0x35d705,
-	0x15f048,
-	0x306e44,
-	0x20e546,
-	0x28a8c4,
-	0x20d1c2,
-	0x361ac7,
-	0x253587,
-	0x24f0c4,
-	0x25d8c5,
-	0x2d1d45,
-	0x2b0405,
-	0x2964c4,
-	0x23cfc8,
-	0x33f306,
-	0x311f48,
-	0x227b05,
-	0x2e0405,
-	0x377004,
-	0x200383,
-	0x2f39c4,
-	0x355f46,
-	0x2717c3,
-	0x258a04,
-	0x291a45,
-	0x363644,
-	0x234e84,
-	0x205bc2,
-	0x25e206,
-	0x392206,
-	0x3022c5,
-	0x204cc2,
-	0x368883,
-	0x24e0d1c2,
-	0x232dc4,
-	0x208a42,
-	0x20fbc3,
-	0x25e402,
-	0x204ac3,
-	0x200382,
-	0x213e83,
-	0x24abc3,
-	0x15f048,
-	0x15f048,
-	0x332ec3,
-	0x204cc2,
-	0x25a0d1c2,
-	0x332ec3,
-	0x2702c3,
-	0x23a0c3,
-	0x32bc44,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x204cc2,
-	0x2620d1c2,
-	0x2d0783,
-	0x204ac3,
-	0x200383,
-	0x682,
-	0x2044c2,
-	0x217082,
-	0x205d83,
-	0x2ec383,
-	0x204cc2,
-	0x15f048,
-	0x13ecc7,
-	0x20d1c2,
-	0x231b83,
-	0x251304,
-	0x202743,
-	0x332ec3,
-	0x209e43,
-	0x20fbc3,
-	0x204ac3,
-	0x2183c3,
-	0x200383,
-	0x21d743,
-	0x1286d3,
-	0x12cb54,
-	0x13ecc7,
-	0x1fd86,
-	0x5ae0b,
-	0x28b86,
-	0x58c07,
-	0x130089,
-	0xe9cca,
-	0x8cb0d,
-	0x16978c,
-	0x13d64a,
-	0x63c85,
-	0xa588,
-	0x177ac6,
-	0x125886,
-	0x201742,
-	0x827cc,
-	0x19a347,
-	0x23551,
-	0x2d0783,
-	0x5f245,
-	0x102c4,
-	0x274341c6,
-	0x19146,
-	0x178146,
-	0x920ca,
-	0xb2f03,
-	0x27a5c984,
-	0x130045,
-	0xa383,
-	0xd2b8c,
-	0xf6188,
-	0xbaf48,
-	0xa3bc9,
-	0x20c48,
-	0x141dd06,
-	0xfbc88,
-	0x5e884,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x204cc2,
-	0x20d1c2,
-	0x332ec3,
-	0x20a3c2,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x36388f,
-	0x363c4e,
-	0x15f048,
-	0x2d0783,
-	0x4cd07,
-	0x231b83,
-	0x332ec3,
-	0x204303,
-	0x204ac3,
-	0x200383,
-	0x21d0c3,
-	0x239c47,
-	0x200142,
-	0x2c1949,
-	0x201442,
-	0x23f68b,
-	0x2b5b8a,
-	0x2bcfc9,
-	0x200282,
-	0x262b46,
-	0x26d615,
-	0x23f7d5,
-	0x274a13,
-	0x23fd53,
-	0x202342,
-	0x20d605,
-	0x3ab1cc,
-	0x24698b,
-	0x29a745,
-	0x205ac2,
-	0x289c02,
-	0x386746,
-	0x200f82,
-	0x25fb86,
-	0x294d0d,
-	0x255dcc,
-	0x224444,
-	0x201342,
-	0x203782,
-	0x248688,
-	0x202302,
-	0x208886,
-	0x303bc4,
-	0x26d7d5,
-	0x274b93,
-	0x210b83,
-	0x33070a,
-	0x2f0187,
-	0x3b2209,
-	0x32dc47,
-	0x3124c2,
-	0x200002,
-	0x3a4386,
-	0x20a0c2,
-	0x15f048,
-	0x200802,
-	0x211cc2,
-	0x27d407,
-	0x3b3507,
-	0x21c7c5,
-	0x201082,
-	0x21d707,
-	0x21d8c8,
-	0x2413c2,
-	0x2c2fc2,
-	0x22c1c2,
-	0x20e542,
-	0x23b688,
-	0x218443,
-	0x2b72c8,
-	0x2e078d,
-	0x21fe43,
-	0x226288,
-	0x23e88f,
-	0x23ec4e,
-	0x24ac8a,
-	0x229d11,
-	0x22a190,
-	0x2bf0cd,
-	0x2bf40c,
-	0x38c5c7,
-	0x330887,
-	0x3b30c9,
-	0x204f02,
-	0x200702,
-	0x25a6cc,
-	0x25a9cb,
-	0x202ac2,
-	0x2dcac6,
-	0x20db42,
-	0x20c502,
-	0x21c402,
-	0x20d1c2,
-	0x384684,
-	0x23c7c7,
-	0x220802,
-	0x242c07,
-	0x243c47,
-	0x2271c2,
-	0x20e482,
-	0x24cbc5,
-	0x204d02,
-	0x20cb4e,
-	0x36f1cd,
-	0x231b83,
-	0x353a0e,
-	0x2c0b8d,
-	0x3ab643,
-	0x201842,
-	0x206744,
-	0x208182,
-	0x220a42,
-	0x33e805,
-	0x348447,
-	0x372202,
-	0x2041c2,
-	0x250f07,
-	0x2543c8,
-	0x2abc02,
-	0x2aa106,
-	0x25a54c,
-	0x25a88b,
-	0x20da42,
-	0x26588f,
-	0x265c50,
-	0x26604f,
-	0x266415,
-	0x266954,
-	0x266e4e,
-	0x2671ce,
-	0x26754f,
-	0x26790e,
-	0x267c94,
-	0x268193,
-	0x26864d,
-	0x27b549,
-	0x28dbc3,
-	0x200182,
-	0x237b85,
-	0x206506,
-	0x208a42,
-	0x21a2c7,
-	0x332ec3,
-	0x200642,
-	0x36edc8,
-	0x229f51,
-	0x22a390,
-	0x200bc2,
-	0x28d387,
-	0x200b02,
-	0x205fc7,
-	0x201b02,
-	0x32f249,
-	0x386707,
-	0x281408,
-	0x234006,
-	0x2cf4c3,
-	0x2cf4c5,
-	0x231e02,
-	0x204842,
-	0x3a4785,
-	0x376e05,
-	0x205e82,
-	0x245f43,
-	0x3636c7,
-	0x210687,
-	0x204982,
-	0x3aae04,
-	0x214183,
-	0x2c9209,
-	0x2ed188,
-	0x205d82,
-	0x2032c2,
-	0x26e2c7,
-	0x282185,
-	0x2ab548,
-	0x20d2c7,
-	0x216143,
-	0x372306,
-	0x2bef4d,
-	0x2bf2cc,
-	0x280346,
-	0x208842,
-	0x2017c2,
-	0x201f02,
-	0x23e70f,
-	0x23eb0e,
-	0x2d1dc7,
-	0x203cc2,
-	0x2c3345,
-	0x2c3346,
-	0x20bcc2,
-	0x205f02,
-	0x28f406,
-	0x205f03,
-	0x205f06,
-	0x2ca585,
-	0x2ca58d,
-	0x2cab55,
-	0x2cb38c,
-	0x2cc28d,
-	0x2cc652,
-	0x20b602,
-	0x273fc2,
-	0x201302,
-	0x240fc6,
-	0x2fcf46,
-	0x201002,
-	0x206586,
-	0x211f82,
-	0x37edc5,
-	0x202382,
-	0x20cc89,
-	0x2df2cc,
-	0x2df60b,
-	0x200382,
-	0x255688,
-	0x213a02,
-	0x204c82,
-	0x246746,
-	0x36b005,
-	0x235007,
-	0x2567c5,
-	0x294805,
-	0x24cd82,
-	0x20a642,
-	0x217902,
-	0x2f2847,
-	0x24410d,
-	0x24448c,
-	0x2b3387,
-	0x2aa082,
-	0x23cf82,
-	0x24ba48,
-	0x2d0488,
-	0x2e5f88,
-	0x2f09c4,
-	0x2dce87,
-	0x2ee483,
-	0x2b6042,
-	0x200e82,
-	0x2f11c9,
-	0x395e87,
-	0x2054c2,
-	0x277245,
-	0x201202,
-	0x26a102,
-	0x349c43,
-	0x349c46,
-	0x2f74c2,
-	0x2f7fc2,
-	0x201402,
-	0x3b3fc6,
-	0x206687,
-	0x207842,
-	0x200e02,
-	0x38bc8f,
-	0x35384d,
-	0x2b714e,
-	0x2c0a0c,
-	0x2003c2,
-	0x205502,
-	0x233e45,
-	0x3b4e86,
-	0x201ec2,
-	0x200fc2,
-	0x200682,
-	0x20d244,
-	0x2e0604,
-	0x2d29c6,
-	0x202602,
-	0x27e787,
-	0x22d703,
-	0x22d708,
-	0x24b048,
-	0x390787,
-	0x240ec6,
-	0x20e5c2,
-	0x23b383,
-	0x23b387,
-	0x272846,
-	0x2e4385,
-	0x2f0d48,
-	0x206342,
-	0x34a007,
-	0x220c42,
-	0x33c282,
-	0x203b82,
-	0x2dbe09,
-	0x22fb02,
-	0x200242,
-	0x240183,
-	0x319ac7,
-	0x2018c2,
-	0x2df44c,
-	0x2df74b,
-	0x2803c6,
-	0x20a2c5,
-	0x222e82,
-	0x200a42,
-	0x2bd306,
-	0x235b83,
-	0x39c147,
-	0x23bb02,
-	0x203382,
-	0x26d495,
-	0x23f995,
-	0x2748d3,
-	0x23fed3,
-	0x2934c7,
-	0x2b5948,
-	0x2fb310,
-	0x30ee4f,
-	0x2b5953,
-	0x2bcd92,
-	0x2c1510,
-	0x2ca1cf,
-	0x2d57d2,
-	0x2d84d1,
-	0x2d9513,
-	0x2dbbd2,
-	0x2dd20f,
-	0x2e57ce,
-	0x2f5092,
-	0x2f6351,
-	0x2f754f,
-	0x2f834e,
-	0x300011,
-	0x355810,
-	0x35f212,
-	0x3702d1,
-	0x2f9bc6,
-	0x307487,
-	0x373387,
-	0x204b42,
-	0x284e05,
-	0x2febc7,
-	0x217082,
-	0x203142,
-	0x2293c5,
-	0x21ee43,
-	0x35d986,
-	0x2442cd,
-	0x24460c,
-	0x206602,
-	0x3ab04b,
-	0x24684a,
-	0x30be4a,
-	0x2bbf49,
-	0x2ef68b,
-	0x20d40d,
-	0x2ff2cc,
-	0x24890a,
-	0x275b0c,
-	0x27afcb,
-	0x29a58c,
-	0x2fa34b,
-	0x2df243,
-	0x35ee06,
-	0x3a6502,
-	0x2f8b82,
-	0x2db2c3,
-	0x202502,
-	0x202503,
-	0x245886,
-	0x2665c7,
-	0x365146,
-	0x385cc8,
-	0x2d0188,
-	0x2d3186,
-	0x2019c2,
-	0x301c8d,
-	0x301fcc,
-	0x2da9c7,
-	0x306d07,
-	0x21fdc2,
-	0x21ac02,
-	0x23b302,
-	0x254782,
-	0x20d1c2,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x204cc2,
-	0x204e02,
-	0x29a94005,
-	0x29e02e85,
-	0x2a3177c6,
-	0x15f048,
-	0x2a6b5145,
-	0x20d1c2,
-	0x2000c2,
-	0x2ab9c685,
-	0x2ae83305,
-	0x2b283e07,
-	0x2b68b309,
-	0x2ba47ac4,
-	0x208a42,
-	0x200642,
-	0x2bf72245,
-	0x2c293149,
-	0x2c71db88,
-	0x2cab2085,
-	0x2cf363c7,
-	0x2d219b08,
-	0x2d6e8605,
-	0x2da5b4c6,
-	0x2de346c9,
-	0x2e2b8648,
-	0x2e6c4b48,
-	0x2ea9cf0a,
-	0x2ee52104,
-	0x2f2d6585,
-	0x2f6becc8,
-	0x2fb51245,
-	0x2184c2,
-	0x2fe63b83,
-	0x302a7786,
-	0x3064ea48,
-	0x30a24f06,
-	0x30ecec88,
-	0x3132d1c6,
-	0x316e4444,
-	0x202082,
-	0x31b630c7,
-	0x31eaeb84,
-	0x3227dc47,
-	0x327a1087,
-	0x200382,
-	0x32aa0685,
-	0x32e03bc4,
-	0x332d1807,
-	0x3362adc7,
-	0x33a87406,
-	0x33e36085,
-	0x3429b807,
-	0x346d2688,
-	0x34a37f07,
-	0x34eb0689,
-	0x3538e6c5,
-	0x35719c07,
-	0x35a92e46,
-	0x35e62d48,
-	0x2460cd,
-	0x24cf09,
-	0x2f484b,
-	0x25534b,
-	0x27de4b,
-	0x2aa88b,
-	0x30f20b,
-	0x30f4cb,
-	0x30fd49,
-	0x310f0b,
-	0x3111cb,
-	0x311ccb,
-	0x31284a,
-	0x312d8a,
-	0x31338c,
-	0x31608b,
-	0x3166ca,
-	0x327eca,
-	0x3328ce,
-	0x333a4e,
-	0x333dca,
-	0x335d8a,
-	0x3369cb,
-	0x336c8b,
-	0x337a4b,
-	0x34c7cb,
-	0x34cdca,
-	0x34da8b,
-	0x34dd4a,
-	0x34dfca,
-	0x34e24a,
-	0x373ecb,
-	0x37a2cb,
-	0x37c38e,
-	0x37c70b,
-	0x383ecb,
-	0x38500b,
-	0x38984a,
-	0x389ac9,
-	0x389d0a,
-	0x38b38a,
-	0x39e50b,
-	0x39fe8b,
-	0x3a09ca,
-	0x3a28cb,
-	0x3a588b,
-	0x3b44cb,
-	0x36285b88,
-	0x3668c289,
-	0x36aa3a49,
-	0x36ee0bc8,
-	0x33c685,
-	0x202943,
-	0x212944,
-	0x206885,
-	0x247806,
-	0x25b245,
-	0x28adc4,
-	0x21a1c8,
-	0x30af85,
-	0x297a44,
-	0x209907,
-	0x2a280a,
-	0x361d8a,
-	0x3101c7,
-	0x211f47,
-	0x2fdec7,
-	0x255b47,
-	0x2fad45,
-	0x343d06,
-	0x22cb47,
-	0x26fec4,
-	0x2e6b46,
-	0x2e6a46,
-	0x208305,
-	0x3492c4,
-	0x38ec86,
-	0x2a1647,
-	0x22d046,
-	0x351b47,
-	0x26a783,
-	0x2b4846,
-	0x232045,
-	0x283f07,
-	0x270e0a,
-	0x26dfc4,
-	0x218ec8,
-	0x2affc9,
-	0x2cb147,
-	0x334646,
-	0x255908,
-	0x200a49,
-	0x3b23c4,
-	0x2210c4,
-	0x278285,
-	0x22c848,
-	0x2c7f47,
-	0x2a7109,
-	0x2f9cc8,
-	0x347a86,
-	0x24c646,
-	0x29de88,
-	0x354c46,
-	0x202e85,
-	0x2874c6,
-	0x27e108,
-	0x254b86,
-	0x25d14b,
-	0x29dac6,
-	0x29f50d,
-	0x3b1785,
-	0x2aea46,
-	0x20f505,
-	0x349909,
-	0x2abe87,
-	0x3195c8,
-	0x292986,
-	0x29e709,
-	0x364546,
-	0x270d85,
-	0x2a4dc6,
-	0x2c99c6,
-	0x2cdb89,
-	0x200846,
-	0x253087,
-	0x277885,
-	0x202383,
-	0x25d2c5,
-	0x29f7c7,
-	0x358e06,
-	0x3b1689,
-	0x3177c6,
-	0x287706,
-	0x215ec9,
-	0x286ec9,
-	0x2a5607,
-	0x2cf688,
-	0x377f89,
-	0x284a88,
-	0x379386,
-	0x2d9dc5,
-	0x23cb4a,
-	0x287786,
-	0x3a8506,
-	0x2cbbc5,
-	0x272188,
-	0x215587,
-	0x22e68a,
-	0x251746,
-	0x24d345,
-	0x329cc6,
-	0x2d6347,
-	0x334507,
-	0x2c4145,
-	0x270f45,
-	0x2b2f86,
-	0x351746,
-	0x387046,
-	0x2b8bc4,
-	0x286209,
-	0x28d146,
-	0x30e50a,
-	0x222848,
-	0x309148,
-	0x361d8a,
-	0x2145c5,
-	0x2a1585,
-	0x37f588,
-	0x2b6348,
-	0x21b507,
-	0x293846,
-	0x320d48,
-	0x3674c7,
-	0x285188,
-	0x2b9206,
-	0x2885c8,
-	0x29ad46,
-	0x227c87,
-	0x272b06,
-	0x38ec86,
-	0x25d9ca,
-	0x384706,
-	0x2d9dc9,
-	0x2b5446,
-	0x2e3d8a,
-	0x2e4449,
-	0x362586,
-	0x2ba844,
-	0x237c4d,
-	0x28c507,
-	0x3268c6,
-	0x2c4a05,
-	0x3645c5,
-	0x375846,
-	0x2d1649,
-	0x2b4287,
-	0x27f886,
-	0x2c9546,
-	0x28ae49,
-	0x264a04,
-	0x2d4a44,
-	0x3ac808,
-	0x245c46,
-	0x277308,
-	0x2e66c8,
-	0x202fc7,
-	0x3a80c9,
-	0x387247,
-	0x2b500a,
-	0x2498cf,
-	0x250b0a,
-	0x233c45,
-	0x27e345,
-	0x218745,
-	0x303b07,
-	0x20e183,
-	0x2cf888,
-	0x3028c6,
-	0x3029c9,
-	0x2d4006,
-	0x3aeb47,
-	0x29e4c9,
-	0x3194c8,
-	0x2cbc87,
-	0x30d803,
-	0x33c705,
-	0x20e105,
-	0x2b8a0b,
-	0x351304,
-	0x257984,
-	0x27cbc6,
-	0x30e887,
-	0x38b10a,
-	0x2757c7,
-	0x38c807,
-	0x283305,
-	0x200045,
-	0x240909,
-	0x38ec86,
-	0x27564d,
-	0x35af05,
-	0x29f4c3,
-	0x20ad83,
-	0x34f785,
-	0x347845,
-	0x255908,
-	0x280047,
-	0x2d47c6,
-	0x2a36c6,
-	0x2296c5,
-	0x231e47,
-	0x202ac7,
-	0x33f1c7,
-	0x2d660a,
-	0x2b4908,
-	0x2b8bc4,
-	0x254907,
-	0x281607,
-	0x3400c6,
-	0x26f8c7,
-	0x2eaa08,
-	0x2e9e88,
-	0x2abd86,
-	0x2d1ec8,
-	0x2008c4,
-	0x22cb46,
-	0x247d86,
-	0x216646,
-	0x3a8c46,
-	0x22d9c4,
-	0x255c06,
-	0x2c31c6,
-	0x29d406,
-	0x235ec6,
-	0x20ac46,
-	0x2ea846,
-	0x2d46c8,
-	0x3af1c8,
-	0x2d6e48,
-	0x25b448,
-	0x37f506,
-	0x212485,
-	0x2e2006,
-	0x2b2105,
-	0x388c87,
-	0x216605,
-	0x2136c3,
-	0x203ec5,
-	0x33fb44,
-	0x20ad85,
-	0x2266c3,
-	0x338007,
-	0x34bc88,
-	0x351c06,
-	0x32250d,
-	0x27e306,
-	0x29c985,
-	0x2d9743,
-	0x2be689,
-	0x264b86,
-	0x23c0c6,
-	0x2a4ec4,
-	0x250a87,
-	0x233006,
-	0x2b4545,
-	0x234a83,
-	0x207ac4,
-	0x2817c6,
-	0x2ded04,
-	0x32b8c8,
-	0x39ba49,
-	0x24d849,
-	0x2a4cca,
-	0x387acd,
-	0x208d07,
-	0x224bc6,
-	0x20a684,
-	0x28b309,
-	0x28a088,
-	0x28c106,
-	0x23dfc6,
-	0x26f8c7,
-	0x2b9a46,
-	0x21f706,
-	0x3ac246,
-	0x3a110a,
-	0x219b08,
-	0x2464c5,
-	0x26fd09,
-	0x28568a,
-	0x2fa988,
-	0x2a0ec8,
-	0x29bd48,
-	0x2af08c,
-	0x316305,
-	0x2a3948,
-	0x2e8e06,
-	0x319746,
-	0x3aea07,
-	0x2756c5,
-	0x287645,
-	0x24d709,
-	0x213487,
-	0x302985,
-	0x227487,
-	0x20ad83,
-	0x2c8485,
-	0x20b8c8,
-	0x25d647,
-	0x2a0d89,
-	0x2de405,
-	0x307784,
-	0x2a6508,
-	0x363207,
-	0x2cbe48,
-	0x368c48,
-	0x2dc805,
-	0x304286,
-	0x278686,
-	0x2ac1c9,
-	0x31c407,
-	0x2b29c6,
-	0x3b3907,
-	0x221d03,
-	0x247ac4,
-	0x2a7885,
-	0x231f84,
-	0x383c84,
-	0x286947,
-	0x35bdc7,
-	0x27fa44,
-	0x2a0bd0,
-	0x367c87,
-	0x200045,
-	0x2536cc,
-	0x225344,
-	0x2b1588,
-	0x227b89,
-	0x2b4e06,
-	0x220d88,
-	0x247344,
-	0x247348,
-	0x22ec86,
-	0x235d48,
-	0x2a1c06,
-	0x2d328b,
-	0x202385,
-	0x2cb988,
-	0x216ac4,
-	0x39be8a,
-	0x2a0d89,
-	0x381346,
-	0x218808,
-	0x25ebc5,
-	0x2b69c4,
-	0x2b1486,
-	0x33f088,
-	0x285b88,
-	0x340bc6,
-	0x31d104,
-	0x23cac6,
-	0x3872c7,
-	0x27db47,
-	0x26f8cf,
-	0x205547,
-	0x362647,
-	0x38eb45,
-	0x352245,
-	0x2a52c9,
-	0x30e1c6,
-	0x284045,
-	0x2871c7,
-	0x2c1108,
-	0x29d505,
-	0x272b06,
-	0x222688,
-	0x224f0a,
-	0x2e13c8,
-	0x28f187,
-	0x249d06,
-	0x26fcc6,
-	0x20df43,
-	0x218303,
-	0x285849,
-	0x377e09,
-	0x2b0586,
-	0x2de405,
-	0x2163c8,
-	0x218808,
-	0x354dc8,
-	0x3ac2cb,
-	0x322747,
-	0x30b249,
-	0x26fb48,
-	0x335844,
-	0x349588,
-	0x291409,
-	0x2b2cc5,
-	0x303a07,
-	0x247b45,
-	0x285a88,
-	0x293e8b,
-	0x29b550,
-	0x2ae605,
-	0x216a0c,
-	0x2d4985,
-	0x283383,
-	0x29f386,
-	0x2c0984,
-	0x203cc6,
-	0x2a1647,
-	0x222704,
-	0x24b388,
-	0x2cf74d,
-	0x35e245,
-	0x208d44,
-	0x233984,
-	0x287bc9,
-	0x2990c8,
-	0x317647,
-	0x22ed08,
-	0x2862c8,
-	0x27fb85,
-	0x20f747,
-	0x27fb07,
-	0x238287,
-	0x270f49,
-	0x232e89,
-	0x242d86,
-	0x2bf606,
-	0x26fb06,
-	0x289845,
-	0x39b744,
-	0x3b0e86,
-	0x3b5306,
-	0x27fbc8,
-	0x2d600b,
-	0x26de87,
-	0x20a684,
-	0x364a46,
-	0x367a47,
-	0x34f0c5,
-	0x263645,
-	0x212dc4,
-	0x232e06,
-	0x3b0f08,
-	0x28b309,
-	0x252f86,
-	0x289a48,
-	0x2b4606,
-	0x342708,
-	0x34c34c,
-	0x27fa46,
-	0x29c64d,
-	0x29cacb,
-	0x253145,
-	0x202c07,
-	0x200946,
-	0x3343c8,
-	0x242e09,
-	0x393c88,
-	0x200045,
-	0x2e2a87,
-	0x284b88,
-	0x358649,
-	0x344106,
-	0x252e8a,
-	0x334148,
-	0x393acb,
-	0x3298cc,
-	0x247448,
-	0x280e46,
-	0x303d08,
-	0x3a8347,
-	0x363489,
-	0x29304d,
-	0x29f986,
-	0x21e608,
-	0x3af089,
-	0x2bfd08,
-	0x2886c8,
-	0x2c3a0c,
-	0x2c5047,
-	0x2c5507,
-	0x270d85,
-	0x31e5c7,
-	0x2c0fc8,
-	0x2b1506,
-	0x2aaccc,
-	0x2f55c8,
-	0x2d0d88,
-	0x2ba286,
-	0x20de87,
-	0x242f84,
-	0x25b448,
-	0x28f50c,
-	0x353d0c,
-	0x233cc5,
-	0x2d2887,
-	0x31d086,
-	0x20de06,
-	0x349ac8,
-	0x2027c4,
-	0x22d04b,
-	0x27e8cb,
-	0x249d06,
-	0x2cf5c7,
-	0x31a2c5,
-	0x276545,
-	0x22d186,
-	0x25eb85,
-	0x3512c5,
-	0x2cd5c7,
-	0x27d1c9,
-	0x351904,
-	0x34ee05,
-	0x2e6fc5,
-	0x2dea88,
-	0x2287c5,
-	0x2bca49,
-	0x37aac7,
-	0x37aacb,
-	0x244806,
-	0x2d4409,
-	0x349208,
-	0x27c385,
-	0x238388,
-	0x232ec8,
-	0x23a6c7,
-	0x2e2f87,
-	0x2869c9,
-	0x235c87,
-	0x289149,
-	0x2acf8c,
-	0x2b0588,
-	0x2b6189,
-	0x321f87,
-	0x286389,
-	0x35bf07,
-	0x3299c8,
-	0x3a8285,
-	0x22cac6,
-	0x2c4a48,
-	0x2f0fc8,
-	0x285549,
-	0x351307,
-	0x276605,
-	0x36b6c9,
-	0x2b9ec6,
-	0x2323c4,
-	0x2323c6,
-	0x24e8c8,
-	0x252847,
-	0x2d6208,
-	0x2d1f89,
-	0x3a1e07,
-	0x2a29c6,
-	0x202cc4,
-	0x203f49,
-	0x20f5c8,
-	0x2ba147,
-	0x343e06,
-	0x20e1c6,
-	0x3a8484,
-	0x247f86,
-	0x201b83,
-	0x296789,
-	0x202346,
-	0x2d2205,
-	0x2a36c6,
-	0x24f305,
-	0x285008,
-	0x247187,
-	0x244b46,
-	0x39c6c6,
-	0x309148,
-	0x2a5447,
-	0x29f9c5,
-	0x2a09c8,
-	0x3ada88,
-	0x334148,
-	0x2d4845,
-	0x22cb46,
-	0x24d609,
-	0x2ac044,
-	0x24f18b,
-	0x21f40b,
-	0x2463c9,
-	0x20ad83,
-	0x25bf05,
-	0x213a86,
-	0x313788,
-	0x249844,
-	0x351c06,
-	0x2d6749,
-	0x2bc545,
-	0x2cd506,
-	0x363206,
-	0x2163c4,
-	0x2aec0a,
-	0x2d2148,
-	0x2f0fc6,
-	0x2c2585,
-	0x3b1987,
-	0x231147,
-	0x304284,
-	0x21f647,
-	0x2165c4,
-	0x2165c6,
-	0x203c83,
-	0x270f45,
-	0x350e85,
-	0x205788,
-	0x254ac5,
-	0x27f789,
-	0x25b287,
-	0x25b28b,
-	0x2a758c,
-	0x2a810a,
-	0x3363c7,
-	0x204083,
-	0x212188,
-	0x2d4a05,
-	0x29d585,
-	0x20ae44,
-	0x3298c6,
-	0x227b86,
-	0x247fc7,
-	0x2349cb,
-	0x22d9c4,
-	0x2e8f04,
-	0x219e04,
-	0x2cd786,
-	0x222704,
-	0x22c948,
-	0x33c5c5,
-	0x244d85,
-	0x354d07,
-	0x202d09,
-	0x347845,
-	0x37584a,
-	0x277789,
-	0x29810a,
-	0x3a1249,
-	0x335fc4,
-	0x2c9605,
-	0x2b9b48,
-	0x2d18cb,
-	0x278285,
-	0x2f0086,
-	0x2200c4,
-	0x27fcc6,
-	0x3a1c89,
-	0x364b07,
-	0x317988,
-	0x387e46,
-	0x387247,
-	0x285b88,
-	0x380946,
-	0x37f0c4,
-	0x363f87,
-	0x366085,
-	0x377547,
-	0x25b4c4,
-	0x2008c6,
-	0x2f1e08,
-	0x29cc88,
-	0x2e88c7,
-	0x27d548,
-	0x29ae05,
-	0x20abc4,
-	0x361c88,
-	0x27d644,
-	0x2186c5,
-	0x2fac44,
-	0x3675c7,
-	0x28d207,
-	0x2864c8,
-	0x2cbfc6,
-	0x254a45,
-	0x27f588,
-	0x2e15c8,
-	0x2a4c09,
-	0x21f706,
-	0x22e708,
-	0x39bd0a,
-	0x34f148,
-	0x2e8605,
-	0x2e2206,
-	0x277648,
-	0x2e2b4a,
-	0x20b387,
-	0x28a645,
-	0x298888,
-	0x2b3c44,
-	0x272206,
-	0x2c5888,
-	0x20ac46,
-	0x239a88,
-	0x29bfc7,
-	0x209806,
-	0x2ba844,
-	0x28ba07,
-	0x2b6804,
-	0x3a1c47,
-	0x23bf0d,
-	0x21b585,
-	0x2d144b,
-	0x2a1d06,
-	0x255788,
-	0x24b344,
-	0x27bc86,
-	0x2817c6,
-	0x304047,
-	0x29c30d,
-	0x226dc7,
-	0x2b6d48,
-	0x271a05,
-	0x27f048,
-	0x2c7ec6,
-	0x29ae88,
-	0x223a06,
-	0x26a9c7,
-	0x336689,
-	0x33d2c7,
-	0x28c3c8,
-	0x279685,
-	0x21c848,
-	0x20dd45,
-	0x396005,
-	0x3a14c5,
-	0x221443,
-	0x235984,
-	0x26fd05,
-	0x2346c9,
-	0x285f86,
-	0x2eab08,
-	0x2e2d45,
-	0x2b8847,
-	0x2aee8a,
-	0x2cd449,
-	0x2c98ca,
-	0x2d6ec8,
-	0x2272cc,
-	0x28724d,
-	0x2ff683,
-	0x239988,
-	0x207a85,
-	0x224cc6,
-	0x319346,
-	0x2e7f05,
-	0x3b3a09,
-	0x358f45,
-	0x27f588,
-	0x2841c6,
-	0x348806,
-	0x2a63c9,
-	0x38f247,
-	0x294146,
-	0x2aee08,
-	0x216548,
-	0x2e0dc7,
-	0x235ece,
-	0x2c8105,
-	0x358545,
-	0x20ab48,
-	0x27f3c7,
-	0x20e202,
-	0x2c3584,
-	0x203bca,
-	0x2ba208,
-	0x367b46,
-	0x29e608,
-	0x278686,
-	0x31a7c8,
-	0x2b29c8,
-	0x395fc4,
-	0x2b8d85,
-	0x68a8c4,
-	0x68a8c4,
-	0x68a8c4,
-	0x202403,
-	0x20e046,
-	0x27fa46,
-	0x2a220c,
-	0x209843,
-	0x285686,
-	0x215344,
-	0x264b08,
-	0x2d6585,
-	0x203cc6,
-	0x2bedc8,
-	0x2d8206,
-	0x244ac6,
-	0x381148,
-	0x2a7907,
-	0x235a49,
-	0x2d4bca,
-	0x208a84,
-	0x216605,
-	0x2a70c5,
-	0x264886,
-	0x208d46,
-	0x2a2dc6,
-	0x2f9ec6,
-	0x235b84,
-	0x235b8b,
-	0x231144,
-	0x2a23c5,
-	0x2b19c5,
-	0x203086,
-	0x3b5548,
-	0x287107,
-	0x317744,
-	0x2453c3,
-	0x2b3745,
-	0x30a847,
-	0x28700b,
-	0x205687,
-	0x2becc8,
-	0x2e8b47,
-	0x231646,
-	0x24d1c8,
-	0x2e318b,
-	0x2067c6,
-	0x213bc9,
-	0x2e3305,
-	0x30d803,
-	0x2cd506,
-	0x29bec8,
-	0x214cc3,
-	0x200a03,
-	0x285b86,
-	0x278686,
-	0x375dca,
-	0x280e85,
-	0x28160b,
-	0x2a360b,
-	0x245103,
-	0x202043,
-	0x2b4f84,
-	0x278447,
-	0x247444,
-	0x202ec4,
-	0x2e8c84,
-	0x34f448,
-	0x2c24c8,
-	0x3b2049,
-	0x38e748,
-	0x200c07,
-	0x235ec6,
-	0x2ea74f,
-	0x2c8246,
-	0x2d6504,
-	0x2c230a,
-	0x30a747,
-	0x208386,
-	0x292e89,
-	0x3b1fc5,
-	0x2058c5,
-	0x3b2106,
-	0x21c983,
-	0x2b3c89,
-	0x219c86,
-	0x212009,
-	0x38b106,
-	0x270f45,
-	0x2340c5,
-	0x205543,
-	0x278588,
-	0x211607,
-	0x3028c4,
-	0x264988,
-	0x2313c4,
-	0x338d86,
-	0x29f386,
-	0x2419c6,
-	0x2cb849,
-	0x29d505,
-	0x38ec86,
-	0x2a2fc9,
-	0x2c7606,
-	0x2ea846,
-	0x386e86,
-	0x200b45,
-	0x2fac46,
-	0x26a9c4,
-	0x3a8285,
-	0x2c4a44,
-	0x2b7846,
-	0x35aec4,
-	0x20f843,
-	0x28a145,
-	0x232bc8,
-	0x2e9687,
-	0x2bd949,
-	0x28a548,
-	0x29dc51,
-	0x36328a,
-	0x249c47,
-	0x2ea1c6,
-	0x215344,
-	0x2c4b48,
-	0x282f48,
-	0x29de0a,
-	0x2bc80d,
-	0x2a4dc6,
-	0x381246,
-	0x28bac6,
-	0x2c3fc7,
-	0x2b6e05,
-	0x262c07,
-	0x264a45,
-	0x37ac04,
-	0x2ad586,
-	0x216287,
-	0x2b398d,
-	0x277587,
-	0x21a0c8,
-	0x27f889,
-	0x2e2106,
-	0x344085,
-	0x226704,
-	0x24e9c6,
-	0x304186,
-	0x2ba386,
-	0x29ee88,
-	0x2179c3,
-	0x203043,
-	0x3598c5,
-	0x2300c6,
-	0x2b2985,
-	0x388048,
-	0x2a180a,
-	0x2cee04,
-	0x264b08,
-	0x29bd48,
-	0x202ec7,
-	0x2e2e09,
-	0x2be9c8,
-	0x28b387,
-	0x2936c6,
-	0x20ac4a,
-	0x24ea48,
-	0x396449,
-	0x299188,
-	0x21cec9,
-	0x2ea087,
-	0x2effc5,
-	0x3ac4c6,
-	0x2b1388,
-	0x285d08,
-	0x2a1048,
-	0x249e08,
-	0x2a23c5,
-	0x20f444,
-	0x211308,
-	0x208484,
-	0x3a1044,
-	0x270f45,
-	0x297a87,
-	0x202ac9,
-	0x303e47,
-	0x215f45,
-	0x27cdc6,
-	0x34ebc6,
-	0x203d44,
-	0x2a6706,
-	0x254884,
-	0x27ef46,
-	0x202886,
-	0x214b06,
-	0x200045,
-	0x387f07,
-	0x204083,
-	0x206b49,
-	0x308f48,
-	0x264984,
-	0x28b20d,
-	0x29cd88,
-	0x3053c8,
-	0x3963c6,
-	0x336789,
-	0x2cd449,
-	0x3a1985,
-	0x2a190a,
-	0x2adb4a,
-	0x2af7cc,
-	0x2af946,
-	0x27d9c6,
-	0x2c83c6,
-	0x273209,
-	0x224f06,
-	0x262c46,
-	0x359006,
-	0x25b448,
-	0x27d546,
-	0x2d36cb,
-	0x297c05,
-	0x244d85,
-	0x27dc45,
-	0x366f46,
-	0x20ac03,
-	0x241946,
-	0x277507,
-	0x2c4a05,
-	0x24c705,
-	0x3645c5,
-	0x327346,
-	0x31da84,
-	0x31da86,
-	0x3add49,
-	0x366dcc,
-	0x37a948,
-	0x33f004,
-	0x2fa886,
-	0x2a1e06,
-	0x29bec8,
-	0x218808,
-	0x366cc9,
-	0x3b1987,
-	0x245989,
-	0x254106,
-	0x22c2c4,
-	0x20bf04,
-	0x286cc4,
-	0x285b88,
-	0x20290a,
-	0x3477c6,
-	0x352107,
-	0x36f007,
-	0x2d4505,
-	0x2a7084,
-	0x2913c6,
-	0x2b6e46,
-	0x202803,
-	0x308d87,
-	0x368b48,
-	0x3a1aca,
-	0x2ce348,
-	0x2cec88,
-	0x35af05,
-	0x253245,
-	0x26df85,
-	0x2d48c6,
-	0x33d4c6,
-	0x35bd05,
-	0x2969c9,
-	0x2a6e8c,
-	0x26e047,
-	0x29de88,
-	0x381a45,
-	0x68a8c4,
-	0x24df84,
-	0x25d784,
-	0x214486,
-	0x2a450e,
-	0x205947,
-	0x2c41c5,
-	0x2abfcc,
-	0x231287,
-	0x216207,
-	0x218089,
-	0x218f89,
-	0x28a645,
-	0x308f48,
-	0x24d609,
-	0x334005,
-	0x2c4948,
-	0x322906,
-	0x361f06,
-	0x2e4444,
-	0x2ae848,
-	0x251f43,
-	0x303084,
-	0x2b37c5,
-	0x3ac0c7,
-	0x210445,
-	0x39bbc9,
-	0x28aa8d,
-	0x299886,
-	0x245404,
-	0x2937c8,
-	0x27d00a,
-	0x224107,
-	0x23be45,
-	0x203143,
-	0x2a37ce,
-	0x27868c,
-	0x2faa87,
-	0x2a46c7,
-	0x203c03,
-	0x224f45,
-	0x25d785,
-	0x29e9c8,
-	0x29bb89,
-	0x33ef06,
-	0x247444,
-	0x249b86,
-	0x21e3cb,
-	0x2cd1cc,
-	0x221507,
-	0x2d5c45,
-	0x3ad988,
-	0x2e0b85,
-	0x2c2307,
-	0x3630c7,
-	0x251f45,
-	0x20ac03,
-	0x39a644,
-	0x212905,
-	0x351805,
-	0x351806,
-	0x34fd08,
-	0x216287,
-	0x319646,
-	0x35c106,
-	0x3a1406,
-	0x2d5e89,
-	0x20f847,
-	0x26a5c6,
-	0x2cd346,
-	0x252006,
-	0x2aeb45,
-	0x219646,
-	0x3768c5,
-	0x228848,
-	0x2973cb,
-	0x291086,
-	0x36f044,
-	0x2e2909,
-	0x25b284,
-	0x322888,
-	0x2324c7,
-	0x2885c4,
-	0x2be288,
-	0x2c5304,
-	0x2aeb84,
-	0x28b145,
-	0x35e286,
-	0x34f387,
-	0x239b43,
-	0x2a2a85,
-	0x322e84,
-	0x358586,
-	0x3a1a08,
-	0x368885,
-	0x297089,
-	0x3363c5,
-	0x2e1e88,
-	0x215207,
-	0x388dc8,
-	0x2bd787,
-	0x362709,
-	0x255a86,
-	0x32b3c6,
-	0x359004,
-	0x293605,
-	0x30150c,
-	0x27dc47,
-	0x27e207,
-	0x36eec8,
-	0x299886,
-	0x277444,
-	0x32e344,
-	0x286849,
-	0x2c84c6,
-	0x240987,
-	0x3a8bc4,
-	0x286086,
-	0x343905,
-	0x2cbb07,
-	0x2d3646,
-	0x252d49,
-	0x2aab07,
-	0x26f8c7,
-	0x2a6246,
-	0x3879c5,
-	0x283988,
-	0x219b08,
-	0x2646c6,
-	0x3688c5,
-	0x261b06,
-	0x209983,
-	0x29e849,
-	0x2a2b4e,
-	0x2bd488,
-	0x2314c8,
-	0x2644cb,
-	0x2972c6,
-	0x2089c4,
-	0x244ac4,
-	0x2a2c4a,
-	0x216907,
-	0x26a685,
-	0x213bc9,
-	0x2c3285,
-	0x3a1087,
-	0x2b4c04,
-	0x284487,
-	0x2e65c8,
-	0x2cb206,
-	0x21e789,
-	0x2beaca,
-	0x216886,
-	0x29c8c6,
-	0x2b1945,
-	0x37ccc5,
-	0x31a107,
-	0x24dd08,
-	0x343848,
-	0x395fc6,
-	0x234145,
-	0x208ace,
-	0x2b8bc4,
-	0x264645,
-	0x27c749,
-	0x30dfc8,
-	0x28f0c6,
-	0x2a04cc,
-	0x2a1410,
-	0x2a414f,
-	0x2a51c8,
-	0x3363c7,
-	0x200045,
-	0x26fd05,
-	0x34f209,
-	0x298a89,
-	0x23cbc6,
-	0x278307,
-	0x2d2805,
-	0x21b509,
-	0x340146,
-	0x224d4d,
-	0x286b89,
-	0x202ec4,
-	0x2bd208,
-	0x2113c9,
-	0x347986,
-	0x27cec5,
-	0x32b3c6,
-	0x317849,
-	0x26ba08,
-	0x212485,
-	0x2ae844,
-	0x2a068b,
-	0x347845,
-	0x2a07c6,
-	0x287586,
-	0x26ed86,
-	0x287fcb,
-	0x297189,
-	0x35c045,
-	0x388b87,
-	0x363206,
-	0x220f06,
-	0x25d508,
-	0x35e389,
-	0x219e8c,
-	0x30a648,
-	0x360406,
-	0x340bc3,
-	0x303c06,
-	0x287e05,
-	0x281948,
-	0x233b46,
-	0x2cbd48,
-	0x275845,
-	0x29dfc5,
-	0x215348,
-	0x31a947,
-	0x319287,
-	0x247fc7,
-	0x220d88,
-	0x336508,
-	0x31e4c6,
-	0x2b7687,
-	0x247987,
-	0x287cca,
-	0x254003,
-	0x366f46,
-	0x202a45,
-	0x203bc4,
-	0x27f889,
-	0x362684,
-	0x2a7e44,
-	0x2a1c84,
-	0x2a46cb,
-	0x211547,
-	0x208d05,
-	0x29ab08,
-	0x27cdc6,
-	0x27cdc8,
-	0x280dc6,
-	0x2900c5,
-	0x290385,
-	0x291f46,
-	0x292b08,
-	0x292dc8,
-	0x27fa46,
-	0x29a94f,
-	0x29e310,
-	0x3b1785,
-	0x204083,
-	0x22c385,
-	0x30b188,
-	0x298989,
-	0x334148,
-	0x2d5d08,
-	0x224788,
-	0x211607,
-	0x27ca89,
-	0x2cbf48,
-	0x25bd44,
-	0x2a1b08,
-	0x2deb49,
-	0x2b81c7,
-	0x29f904,
-	0x303f08,
-	0x387cca,
-	0x2ebe06,
-	0x2a4dc6,
-	0x21f5c9,
-	0x2a1647,
-	0x2ce1c8,
-	0x30cc88,
-	0x3a8a48,
-	0x356245,
-	0x37dc45,
-	0x244d85,
-	0x25d745,
-	0x37e287,
-	0x20ac05,
-	0x2c4a05,
-	0x2b5546,
-	0x334087,
-	0x2d1807,
-	0x387fc6,
-	0x2d7405,
-	0x2a07c6,
-	0x212245,
-	0x2b84c8,
-	0x2f1d84,
-	0x2c7686,
-	0x343744,
-	0x2b69c8,
-	0x2c778a,
-	0x28004c,
-	0x234bc5,
-	0x2c4086,
-	0x21a046,
-	0x368706,
-	0x30b384,
-	0x343bc5,
-	0x280c07,
-	0x2a16c9,
-	0x2cdc87,
-	0x68a8c4,
-	0x68a8c4,
-	0x3175c5,
-	0x32dd04,
-	0x29fe8a,
-	0x27cc46,
-	0x24d404,
-	0x208305,
-	0x37a545,
-	0x2b6d44,
-	0x2871c7,
-	0x36b847,
-	0x2cd788,
-	0x368ec8,
-	0x212489,
-	0x340248,
-	0x2a004b,
-	0x250b44,
-	0x221005,
-	0x2840c5,
-	0x247f49,
-	0x35e389,
-	0x2e2808,
-	0x232248,
-	0x203084,
-	0x2a1e45,
-	0x202943,
-	0x264845,
-	0x38ed06,
-	0x29b9cc,
-	0x20f4c6,
-	0x247246,
-	0x28f345,
-	0x3273c8,
-	0x2bd606,
-	0x2ea346,
-	0x2a4dc6,
-	0x2297cc,
-	0x2ba544,
-	0x3a154a,
-	0x28f288,
-	0x29b807,
-	0x322d86,
-	0x33efc7,
-	0x2f2185,
-	0x343e06,
-	0x34af86,
-	0x356707,
-	0x2be7c4,
-	0x3676c5,
-	0x27c744,
-	0x37ac87,
-	0x27c988,
-	0x27d84a,
-	0x284a07,
-	0x2d22c7,
-	0x336347,
-	0x2e0cc9,
-	0x29b9ca,
-	0x219e43,
-	0x2e9645,
-	0x200c83,
-	0x2e8cc9,
-	0x26ac48,
-	0x38eb47,
-	0x334249,
-	0x219c06,
-	0x2d4108,
-	0x337f85,
-	0x2e16ca,
-	0x2d8c49,
-	0x2abc49,
-	0x3aea07,
-	0x283049,
-	0x214a08,
-	0x3568c6,
-	0x2c4248,
-	0x217b07,
-	0x235c87,
-	0x277787,
-	0x2d2688,
-	0x2fa706,
-	0x387a85,
-	0x280c07,
-	0x29c3c8,
-	0x3436c4,
-	0x30e3c4,
-	0x294047,
-	0x2b2d47,
-	0x24d48a,
-	0x356846,
-	0x330f0a,
-	0x2c34c7,
-	0x2b8987,
-	0x257e44,
-	0x289204,
-	0x2d3546,
-	0x3b3d44,
-	0x3b3d4c,
-	0x203505,
-	0x218649,
-	0x2dfc44,
-	0x2b6e05,
-	0x27cf88,
-	0x292e85,
-	0x375846,
-	0x217f84,
-	0x3ae3ca,
-	0x32b7c6,
-	0x2a68ca,
-	0x237f07,
-	0x2d3385,
-	0x21c985,
-	0x2d454a,
-	0x2a6805,
-	0x2a4cc6,
-	0x208484,
-	0x2b5106,
-	0x31a1c5,
-	0x233c06,
-	0x2e88cc,
-	0x2cd90a,
-	0x2936c4,
-	0x235ec6,
-	0x2a1647,
-	0x2d5204,
-	0x25b448,
-	0x38e5c6,
-	0x208949,
-	0x2bb109,
-	0x2b0689,
-	0x24f346,
-	0x217c06,
-	0x2c4387,
-	0x296908,
-	0x217a09,
-	0x211547,
-	0x29ac86,
-	0x3872c7,
-	0x28b985,
-	0x2b8bc4,
-	0x2c3f47,
-	0x247b45,
-	0x28b085,
-	0x235247,
-	0x251e08,
-	0x3ad906,
-	0x29d24d,
-	0x29ebcf,
-	0x2a360d,
-	0x215f84,
-	0x232cc6,
-	0x2d91c8,
-	0x358fc5,
-	0x287e88,
-	0x23a58a,
-	0x202ec4,
-	0x21e946,
-	0x239607,
-	0x22d9c7,
-	0x2a79c9,
-	0x2c4205,
-	0x2b6d44,
-	0x2b8cca,
-	0x2be589,
-	0x283147,
-	0x272086,
-	0x347986,
-	0x2a1d86,
-	0x364046,
-	0x2d890f,
-	0x2d9089,
-	0x27d546,
-	0x282e46,
-	0x32fd89,
-	0x2b7787,
-	0x226743,
-	0x229946,
-	0x218303,
-	0x2e7dc8,
-	0x387107,
-	0x2a53c9,
-	0x29f208,
-	0x3193c8,
-	0x351446,
-	0x20f409,
-	0x23c1c5,
-	0x2b7844,
-	0x2a73c7,
-	0x273285,
-	0x215f84,
-	0x208dc8,
-	0x216bc4,
-	0x2b74c7,
-	0x34bc06,
-	0x2b3045,
-	0x299188,
-	0x34784b,
-	0x319c07,
-	0x2d47c6,
-	0x2c82c4,
-	0x32d146,
-	0x270f45,
-	0x247b45,
-	0x283709,
-	0x286dc9,
-	0x235cc4,
-	0x235d05,
-	0x235f05,
-	0x2e1546,
-	0x309048,
-	0x2c2c46,
-	0x36898b,
-	0x2b4c8a,
-	0x2b6905,
-	0x290406,
-	0x3025c5,
-	0x2e0a45,
-	0x2ab6c7,
-	0x3ac808,
-	0x245984,
-	0x26c586,
-	0x292e46,
-	0x214bc7,
-	0x30d7c4,
-	0x2817c6,
-	0x2b9f85,
-	0x2b9f89,
-	0x2135c4,
-	0x2a7209,
-	0x27fa46,
-	0x2c5108,
-	0x235f05,
-	0x36f105,
-	0x233c06,
-	0x219d89,
-	0x218f89,
-	0x2472c6,
-	0x30e0c8,
-	0x28abc8,
-	0x302584,
-	0x2b9004,
-	0x2b9008,
-	0x3269c8,
-	0x245a89,
-	0x38ec86,
-	0x2a4dc6,
-	0x320c0d,
-	0x351c06,
-	0x34c209,
-	0x23d1c5,
-	0x3b2106,
-	0x262d48,
-	0x31d9c5,
-	0x2479c4,
-	0x270f45,
-	0x2866c8,
-	0x29fc49,
-	0x27c804,
-	0x2008c6,
-	0x39660a,
-	0x2fa988,
-	0x24d609,
-	0x244c4a,
-	0x3341c6,
-	0x29ed88,
-	0x2c20c5,
-	0x2c0e48,
-	0x2bd885,
-	0x219ac9,
-	0x36bd09,
-	0x203602,
-	0x2e3305,
-	0x276286,
-	0x27f987,
-	0x295705,
-	0x2f0ec6,
-	0x306288,
-	0x299886,
-	0x2b9a09,
-	0x27e306,
-	0x25d388,
-	0x2afb85,
-	0x25c586,
-	0x26aac8,
-	0x285b88,
-	0x2e9f88,
-	0x347b08,
-	0x219644,
-	0x209fc3,
-	0x2b9c44,
-	0x249b06,
-	0x28b9c4,
-	0x231407,
-	0x2ea249,
-	0x2c7a05,
-	0x30cc86,
-	0x229946,
-	0x34fb4b,
-	0x2b6846,
-	0x20edc6,
-	0x2cb6c8,
-	0x24c646,
-	0x2bcb03,
-	0x2080c3,
-	0x2b8bc4,
-	0x22e605,
-	0x2b4447,
-	0x27c988,
-	0x27c98f,
-	0x280b0b,
-	0x308e48,
-	0x200946,
-	0x30914e,
-	0x233c03,
-	0x2b43c4,
-	0x2b67c5,
-	0x2b6bc6,
-	0x2914cb,
-	0x297b46,
-	0x222709,
-	0x2b3045,
-	0x38a208,
-	0x211d88,
-	0x218e4c,
-	0x2a4706,
-	0x264886,
-	0x2de405,
-	0x28c188,
-	0x26aac5,
-	0x335848,
-	0x2a084a,
-	0x2a3a49,
-	0x68a8c4,
-	0x3760d1c2,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204ac3,
-	0x200383,
-	0x210e03,
-	0x24ae04,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x2da904,
-	0x332ec3,
-	0x2959c7,
-	0x20fbc3,
-	0x20abc3,
-	0x2842c8,
-	0x200383,
-	0x2b400b,
-	0x2f2a03,
-	0x2716c6,
-	0x205bc2,
-	0x26b44b,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x200383,
-	0x200e03,
-	0x203383,
-	0x204cc2,
-	0x15f048,
-	0x325b45,
-	0x247bc8,
-	0x2ec408,
-	0x20d1c2,
-	0x329dc5,
-	0x39c307,
-	0x2001c2,
-	0x24b587,
-	0x208a42,
-	0x246f87,
-	0x239ec9,
-	0x2c1c88,
-	0x3a88c9,
-	0x338b02,
-	0x270647,
-	0x2abac4,
-	0x39c3c7,
-	0x2b4b87,
-	0x24ca02,
-	0x20fbc3,
-	0x20b602,
-	0x202082,
-	0x200382,
-	0x217902,
-	0x200e02,
-	0x20c4c2,
-	0x2af685,
-	0x24dec5,
-	0xd1c2,
-	0x31b83,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x117c3,
-	0x701,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x204ac3,
-	0x200383,
-	0x21bd03,
-	0x3a40d686,
-	0x5e303,
-	0x854c5,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x8082,
-	0x15f048,
-	0x4dcc4,
-	0xe0f85,
-	0x204cc2,
-	0x2cfa44,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x236d03,
-	0x2b0405,
-	0x204303,
-	0x205d83,
-	0x204ac3,
-	0x2104c3,
-	0x200383,
-	0x213e83,
-	0x24ae83,
-	0x24abc3,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x20d1c2,
-	0x200383,
-	0x15f048,
-	0x332ec3,
-	0x15f048,
-	0x26ae03,
-	0x2d0783,
-	0x22ef04,
-	0x231b83,
-	0x332ec3,
-	0x20a3c2,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20a3c2,
-	0x22d603,
-	0x204ac3,
-	0x200383,
-	0x2ec383,
-	0x213e83,
-	0x204cc2,
-	0x20d1c2,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2716c5,
-	0x1540c6,
-	0x24ae04,
-	0x205bc2,
-	0x15f048,
-	0x204cc2,
-	0x1d508,
-	0x20d1c2,
-	0x97606,
-	0x1681c4,
-	0x16e1cb,
-	0x3dc06,
-	0xfcc7,
-	0x231b83,
-	0x332ec3,
-	0x15ae05,
-	0x19c804,
-	0x221543,
-	0x53fc7,
-	0xdc304,
-	0x204ac3,
-	0x94fc4,
-	0x200383,
-	0x2f39c4,
-	0xfe588,
-	0x125886,
-	0x114f85,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x20abc3,
-	0x200383,
-	0x2f2a03,
-	0x205bc2,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204143,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x2da904,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2716c6,
-	0x231b83,
-	0x332ec3,
-	0x178ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0xfcc7,
-	0x15f048,
-	0x332ec3,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x40ed0783,
-	0x231b83,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x204cc2,
-	0x20d1c2,
-	0x2d0783,
-	0x332ec3,
-	0x204ac3,
-	0x200382,
-	0x200383,
-	0x316e47,
-	0x23860b,
-	0x2396c3,
-	0x24be08,
-	0x296687,
-	0x225246,
-	0x2c6145,
-	0x373549,
-	0x20f948,
-	0x260d09,
-	0x260d10,
-	0x35d28b,
-	0x385989,
-	0x209303,
-	0x2b5649,
-	0x230806,
-	0x23080c,
-	0x260f08,
-	0x3ae848,
-	0x35d7c9,
-	0x2a5d0e,
-	0x20780b,
-	0x2eb20c,
-	0x205283,
-	0x26cc4c,
-	0x205289,
-	0x257a87,
-	0x231acc,
-	0x36aa8a,
-	0x24fe44,
-	0x393f4d,
-	0x26cb08,
-	0x210e0d,
-	0x272746,
-	0x29258b,
-	0x31a3c9,
-	0x23d087,
-	0x339606,
-	0x349d89,
-	0x38ce8a,
-	0x37a0c8,
-	0x2f24c4,
-	0x34ecc7,
-	0x3ac5c7,
-	0x3a8dc4,
-	0x32d984,
-	0x237209,
-	0x2ceac9,
-	0x237908,
-	0x210b85,
-	0x392545,
-	0x20aa06,
-	0x393e09,
-	0x23a80d,
-	0x2eac88,
-	0x20a907,
-	0x2c61c8,
-	0x382986,
-	0x37ed04,
-	0x359b85,
-	0x202246,
-	0x203204,
-	0x205187,
-	0x206d8a,
-	0x211cc4,
-	0x2167c6,
-	0x2182c9,
-	0x2182cf,
-	0x2197cd,
-	0x21a486,
-	0x21d110,
-	0x21d506,
-	0x21dc47,
-	0x21ebc7,
-	0x21ebcf,
-	0x21f889,
-	0x2242c6,
-	0x226487,
-	0x226488,
-	0x227649,
-	0x2b3108,
-	0x2e7907,
-	0x20a203,
-	0x378c86,
-	0x3abf08,
-	0x2a5fca,
-	0x21fe49,
-	0x20fa83,
-	0x39c206,
-	0x26c3ca,
-	0x2fca47,
-	0x2578ca,
-	0x26a24e,
-	0x21f9c6,
-	0x2e3507,
-	0x227086,
-	0x201806,
-	0x37da4b,
-	0x30c58a,
-	0x317ecd,
-	0x217cc7,
-	0x359188,
-	0x359189,
-	0x35918f,
-	0x20e28c,
-	0x281bc9,
-	0x2e928e,
-	0x295aca,
-	0x3035c6,
-	0x2fbbc6,
-	0x3b06cc,
-	0x3106cc,
-	0x311448,
-	0x33d1c7,
-	0x25b7c5,
-	0x2251c4,
-	0x2438ce,
-	0x38d104,
-	0x257bc7,
-	0x26d08a,
-	0x36e914,
-	0x373a4f,
-	0x21ed88,
-	0x378b48,
-	0x357e8d,
-	0x357e8e,
-	0x3823c9,
-	0x3a5b08,
-	0x3a5b0f,
-	0x2317cc,
-	0x2317cf,
-	0x232a07,
-	0x23acca,
-	0x21cc4b,
-	0x23bcc8,
-	0x23e5c7,
-	0x264f4d,
-	0x3151c6,
-	0x394106,
-	0x2417c9,
-	0x259888,
-	0x24c108,
-	0x24c10e,
-	0x238707,
-	0x226985,
-	0x24da85,
-	0x205e04,
-	0x225506,
-	0x237808,
-	0x260183,
-	0x2efb8e,
-	0x265308,
-	0x2f198b,
-	0x26afc7,
-	0x395e05,
-	0x26cdc6,
-	0x2b0e07,
-	0x307048,
-	0x319f09,
-	0x298fc5,
-	0x28a188,
-	0x217306,
-	0x3a02ca,
-	0x2437c9,
-	0x231b89,
-	0x231b8b,
-	0x201148,
-	0x3a8c89,
-	0x210c46,
-	0x22c54a,
-	0x2b7f4a,
-	0x23aecc,
-	0x3acb87,
-	0x2c1a8a,
-	0x328ecb,
-	0x328ed9,
-	0x30fa48,
-	0x271745,
-	0x265106,
-	0x258fc9,
-	0x261cc6,
-	0x21324a,
-	0x20fb46,
-	0x201e44,
-	0x2c9ecd,
-	0x201e47,
-	0x20b549,
-	0x383305,
-	0x24e548,
-	0x24ee89,
-	0x24f0c4,
-	0x24fd47,
-	0x24fd48,
-	0x250287,
-	0x26ea08,
-	0x2545c7,
-	0x35c2c5,
-	0x25c70c,
-	0x25cf49,
-	0x2c4dca,
-	0x38f0c9,
-	0x2b5749,
-	0x2739cc,
-	0x263e0b,
-	0x2640c8,
-	0x265688,
-	0x268a44,
-	0x288288,
-	0x289389,
-	0x36ab47,
-	0x218506,
-	0x317287,
-	0x21e1c9,
-	0x328b0b,
-	0x32cfc7,
-	0x200407,
-	0x238047,
-	0x210d84,
-	0x210d85,
-	0x2ac905,
-	0x33c00b,
-	0x399404,
-	0x369d08,
-	0x26f08a,
-	0x2173c7,
-	0x341dc7,
-	0x290c12,
-	0x27ee46,
-	0x22e886,
-	0x35898e,
-	0x281346,
-	0x298708,
-	0x29938f,
-	0x2111c8,
-	0x38bb08,
-	0x3af64a,
-	0x3af651,
-	0x2a6b4e,
-	0x254e4a,
-	0x254e4c,
-	0x2014c7,
-	0x3a5d10,
-	0x3b5388,
-	0x2a6d45,
-	0x2b114a,
-	0x20324c,
-	0x29afcd,
-	0x2fce06,
-	0x2fce07,
-	0x2fce0c,
-	0x305c8c,
-	0x32814c,
-	0x28f98b,
-	0x289b84,
-	0x21f744,
-	0x374149,
-	0x2fe3c7,
-	0x23e389,
-	0x2b7d89,
-	0x35a587,
-	0x36a906,
-	0x36a909,
-	0x39d403,
-	0x2129ca,
-	0x32f807,
-	0x238acb,
-	0x317d4a,
-	0x2abb44,
-	0x39c546,
-	0x284c89,
-	0x3b3bc4,
-	0x2035ca,
-	0x2d4ac5,
-	0x2c0005,
-	0x2c000d,
-	0x2c034e,
-	0x378205,
-	0x323506,
-	0x2712c7,
-	0x38684a,
-	0x38d406,
-	0x35ecc4,
-	0x2f8987,
-	0x2da18b,
-	0x382a47,
-	0x282ac4,
-	0x24f706,
-	0x24f70d,
-	0x21de8c,
-	0x204986,
-	0x2eae8a,
-	0x235806,
-	0x2f3248,
-	0x28bf47,
-	0x33f88a,
-	0x23d986,
-	0x217bc3,
-	0x262ec6,
-	0x3abd88,
-	0x2a024a,
-	0x2766c7,
-	0x2766c8,
-	0x27dd84,
-	0x2cc0c7,
-	0x23ccc8,
-	0x29e008,
-	0x288b48,
-	0x33110a,
-	0x2e0405,
-	0x2e0687,
-	0x254c93,
-	0x2d0806,
-	0x26f288,
-	0x222c09,
-	0x24b448,
-	0x3514cb,
-	0x2cddc8,
-	0x273704,
-	0x215446,
-	0x3b4f06,
-	0x35e0c9,
-	0x2c72c7,
-	0x25c808,
-	0x29e186,
-	0x235144,
-	0x2ce085,
-	0x2c8a08,
-	0x2c900a,
-	0x2c9b48,
-	0x2ce746,
-	0x29ef8a,
-	0x351988,
-	0x2d5008,
-	0x2d6a88,
-	0x2d70c6,
-	0x2d93c6,
-	0x20168c,
-	0x2d99d0,
-	0x28de45,
-	0x210fc8,
-	0x306790,
-	0x210fd0,
-	0x260b8e,
-	0x20130e,
-	0x201314,
-	0x31abcf,
-	0x31af86,
-	0x3319d1,
-	0x339793,
-	0x339c08,
-	0x3aafc5,
-	0x35b6c8,
-	0x385785,
-	0x22854c,
-	0x229489,
-	0x282449,
-	0x245d47,
-	0x377009,
-	0x243d87,
-	0x2fadc6,
-	0x359987,
-	0x261245,
-	0x211803,
-	0x260349,
-	0x222ec9,
-	0x378ac3,
-	0x39a544,
-	0x35c40d,
-	0x3b1b0f,
-	0x235185,
-	0x35b5c6,
-	0x211b07,
-	0x325987,
-	0x28cd86,
-	0x28cd8b,
-	0x2a82c5,
-	0x25f106,
-	0x2fba47,
-	0x276ec9,
-	0x2290c6,
-	0x22e405,
-	0x31190b,
-	0x23bb46,
-	0x3724c5,
-	0x28b548,
-	0x321d88,
-	0x2d75cc,
-	0x2d75d0,
-	0x2e0149,
-	0x2e7107,
-	0x30860b,
-	0x2e6186,
-	0x2e77ca,
-	0x2ea4cb,
-	0x2eb74a,
-	0x2eb9c6,
-	0x2ec245,
-	0x32f546,
-	0x27e4c8,
-	0x245e0a,
-	0x357b1c,
-	0x2f2acc,
-	0x2f2dc8,
-	0x2716c5,
-	0x2f4f07,
-	0x26a106,
-	0x27d385,
-	0x21c2c6,
-	0x28cf48,
-	0x2be807,
-	0x2a5c08,
-	0x2e360a,
-	0x34a10c,
-	0x34a389,
-	0x37ee87,
-	0x20d244,
-	0x24db46,
-	0x38b68a,
-	0x2b7e85,
-	0x20734c,
-	0x20b088,
-	0x377648,
-	0x20d98c,
-	0x21be8c,
-	0x2206c9,
-	0x220907,
-	0x342c0c,
-	0x3aa644,
-	0x23c54a,
-	0x2580cc,
-	0x278acb,
-	0x24140b,
-	0x241f46,
-	0x383847,
-	0x2ddb07,
-	0x3a5f4f,
-	0x2fda11,
-	0x2ddb12,
-	0x30d0cd,
-	0x30d0ce,
-	0x30d40e,
-	0x31ad88,
-	0x31ad92,
-	0x252288,
-	0x2962c7,
-	0x25260a,
-	0x204748,
-	0x281305,
-	0x37e0ca,
-	0x21da47,
-	0x305304,
-	0x21b083,
-	0x2b0fc5,
-	0x3af8c7,
-	0x2fea07,
-	0x29b1ce,
-	0x30ff4d,
-	0x313c49,
-	0x220c45,
-	0x33aa03,
-	0x25fac6,
-	0x36ffc5,
-	0x2f1bc8,
-	0x30c009,
-	0x265145,
-	0x26514f,
-	0x2ec087,
-	0x373485,
-	0x21b2ca,
-	0x299b86,
-	0x2f33c9,
-	0x384d0c,
-	0x2f99c9,
-	0x207b06,
-	0x26ee8c,
-	0x340cc6,
-	0x2fc548,
-	0x2fc746,
-	0x30fbc6,
-	0x349344,
-	0x264443,
-	0x2b270a,
-	0x35b211,
-	0x281d8a,
-	0x255d05,
-	0x277947,
-	0x259307,
-	0x23cdc4,
-	0x23cdcb,
-	0x3a8748,
-	0x2bd306,
-	0x36ef45,
-	0x3a05c4,
-	0x291949,
-	0x330304,
-	0x25cd87,
-	0x332705,
-	0x332707,
-	0x358bc5,
-	0x2af743,
-	0x296188,
-	0x34398a,
-	0x239b43,
-	0x325b8a,
-	0x3b4086,
-	0x264ecf,
-	0x353689,
-	0x2efb10,
-	0x2dee88,
-	0x2d0e89,
-	0x29d087,
-	0x24f68f,
-	0x334604,
-	0x2da984,
-	0x21d386,
-	0x2b3546,
-	0x256dca,
-	0x383586,
-	0x32a787,
-	0x3055c8,
-	0x3057c7,
-	0x306047,
-	0x307a4a,
-	0x309b4b,
-	0x3a2445,
-	0x2dd748,
-	0x2166c3,
-	0x3b120c,
-	0x37140f,
-	0x25b5cd,
-	0x2c4607,
-	0x313d89,
-	0x217687,
-	0x23e148,
-	0x36eb0c,
-	0x273608,
-	0x258908,
-	0x3188ce,
-	0x32bad4,
-	0x32bfe4,
-	0x3424ca,
-	0x35ea8b,
-	0x243e44,
-	0x243e49,
-	0x21e9c8,
-	0x24e105,
-	0x25fc8a,
-	0x239d87,
-	0x2957c4,
-	0x368883,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x20fbc3,
-	0x201686,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0x204cc2,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x332ec3,
-	0x204303,
-	0x201686,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x204cc2,
-	0x21fd43,
-	0x20d1c2,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x20e542,
-	0x20d882,
-	0x20d1c2,
-	0x2d0783,
-	0x209c02,
-	0x201d42,
-	0x2964c4,
-	0x222044,
-	0x223342,
-	0x213184,
-	0x200382,
-	0x200383,
-	0x21aa03,
-	0x241f46,
-	0x217082,
-	0x2016c2,
-	0x201a82,
-	0x436111c3,
-	0x43a014c3,
-	0x59a86,
-	0x59a86,
-	0x24ae04,
-	0x143768a,
-	0x2608c,
-	0x21ecc,
-	0x852cd,
-	0x2ac47,
-	0x1a608,
-	0x218c8,
-	0x19834a,
-	0x446db445,
-	0x12b089,
-	0x103008,
-	0x8ed4a,
-	0x14a60e,
-	0x144b24b,
-	0x1681c4,
-	0x1672c8,
-	0x13edc7,
-	0x16f07,
-	0x11dd09,
-	0x1b3c47,
-	0x94b88,
-	0x61f49,
-	0x4bfc5,
-	0x12494e,
-	0xafbcd,
-	0xfb48,
-	0x44a37046,
-	0x45437048,
-	0x79c88,
-	0x117050,
-	0x69c87,
-	0x6cf47,
-	0x71187,
-	0x75f87,
-	0xa9c2,
-	0x62507,
-	0x10c74c,
-	0x3b9c7,
-	0xa9f46,
-	0xaa689,
-	0xad708,
-	0x18d82,
-	0x1d42,
-	0x24a0b,
-	0x2ccc9,
-	0x4c809,
-	0x17de88,
-	0xb5e02,
-	0x104389,
-	0xd2fca,
-	0xdb9c9,
-	0xdd048,
-	0xddfc7,
-	0xe0389,
-	0xe4685,
-	0xe4a90,
-	0x1a8e86,
-	0x63c85,
-	0x4a84d,
-	0x1b3806,
-	0xee547,
-	0xf39d8,
-	0x96b88,
-	0xba9ca,
-	0x53b4d,
-	0x1702,
-	0x177ac6,
-	0x91788,
-	0x1ae208,
-	0x15ef09,
-	0x56608,
-	0x5dece,
-	0xd68d,
-	0xf8805,
-	0x62288,
-	0x59688,
-	0x6902,
-	0x125886,
-	0x6c82,
-	0x3c1,
-	0x8b4c3,
-	0x44ef4244,
-	0x4529a283,
-	0x141,
-	0x15c06,
-	0x141,
-	0x1,
-	0x15c06,
-	0x8b4c3,
-	0x14e4285,
-	0x24fe44,
-	0x2d0783,
-	0x251304,
-	0x2964c4,
-	0x204ac3,
-	0x222ac5,
-	0x21bd03,
-	0x2202c3,
-	0x370145,
-	0x24abc3,
-	0x466d0783,
-	0x231b83,
-	0x332ec3,
-	0x200041,
-	0x20fbc3,
-	0x222044,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x15f048,
-	0x204cc2,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x201d42,
-	0x2964c4,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x24abc3,
-	0x15f048,
-	0x371182,
-	0xd1c2,
-	0x1491b48,
-	0x10598e,
-	0x47608c42,
-	0x32f9c8,
-	0x233d86,
-	0x210186,
-	0x233707,
-	0x47a00902,
-	0x47f53508,
-	0x20ebca,
-	0x269708,
-	0x201442,
-	0x32f649,
-	0x3a2487,
-	0x218486,
-	0x295ec9,
-	0x247ec4,
-	0x2e4186,
-	0x2e1bc4,
-	0x26bdc4,
-	0x25bf49,
-	0x326286,
-	0x24df85,
-	0x291285,
-	0x390387,
-	0x2c3747,
-	0x2911c4,
-	0x233946,
-	0x2ffb45,
-	0x367445,
-	0x302505,
-	0x392307,
-	0x26ae05,
-	0x315e49,
-	0x32d305,
-	0x307184,
-	0x38d347,
-	0x32ecce,
-	0x330a09,
-	0x358849,
-	0x3ac9c6,
-	0x2fe248,
-	0x2b520b,
-	0x2e3b0c,
-	0x2898c6,
-	0x2076c7,
-	0x37b305,
-	0x32d98a,
-	0x237a09,
-	0x3aa989,
-	0x257646,
-	0x2fb805,
-	0x2aabc5,
-	0x348f89,
-	0x30268b,
-	0x280f46,
-	0x338346,
-	0x20a904,
-	0x2908c6,
-	0x226a08,
-	0x3abc06,
-	0x20c5c6,
-	0x206188,
-	0x207f47,
-	0x208649,
-	0x209705,
-	0x15f048,
-	0x216e84,
-	0x33d5c4,
-	0x369f05,
-	0x204f49,
-	0x222347,
-	0x22234b,
-	0x223e4a,
-	0x228485,
-	0x4820a002,
-	0x238987,
-	0x48629248,
-	0x27be07,
-	0x2bf945,
-	0x3aac0a,
-	0xd1c2,
-	0x38740b,
-	0x25470a,
-	0x222dc6,
-	0x395e03,
-	0x29538d,
-	0x3582cc,
-	0x37f24d,
-	0x381085,
-	0x227dc5,
-	0x2601c7,
-	0x209c09,
-	0x20eac6,
-	0x383405,
-	0x2d8008,
-	0x2907c3,
-	0x2ec708,
-	0x2907c8,
-	0x2c6c47,
-	0x3b2448,
-	0x39b7c9,
-	0x2c9747,
-	0x238187,
-	0x302b88,
-	0x38ca44,
-	0x38ca47,
-	0x272648,
-	0x2024c6,
-	0x206fcf,
-	0x2118c7,
-	0x2e7a86,
-	0x23e2c5,
-	0x223783,
-	0x365a47,
-	0x36da03,
-	0x250446,
-	0x251c46,
-	0x252a06,
-	0x296e85,
-	0x26ea03,
-	0x388a48,
-	0x370c89,
-	0x37ffcb,
-	0x252b88,
-	0x254285,
-	0x256405,
-	0x48aabc02,
-	0x359a49,
-	0x296547,
-	0x25f185,
-	0x25be47,
-	0x25dd86,
-	0x363f05,
-	0x36fe0b,
-	0x2640c4,
-	0x2692c5,
-	0x269407,
-	0x27b786,
-	0x27bbc5,
-	0x288487,
-	0x288d47,
-	0x2d1784,
-	0x28e04a,
-	0x28e508,
-	0x2c2149,
-	0x3648c5,
-	0x2951c6,
-	0x226bca,
-	0x387646,
-	0x26f5c7,
-	0x2c1e0d,
-	0x2a1f09,
-	0x3597c5,
-	0x339dc7,
-	0x368388,
-	0x26a888,
-	0x314d07,
-	0x20b246,
-	0x217807,
-	0x221143,
-	0x33c004,
-	0x3607c5,
-	0x38dcc7,
-	0x391d09,
-	0x22a8c8,
-	0x33fac5,
-	0x242844,
-	0x2f5bc5,
-	0x38174d,
-	0x203742,
-	0x386ac6,
-	0x377a06,
-	0x2c8bca,
-	0x37e686,
-	0x38b5c5,
-	0x368fc5,
-	0x368fc7,
-	0x3a010c,
-	0x279b0a,
-	0x290586,
-	0x225085,
-	0x290706,
-	0x290a47,
-	0x292846,
-	0x296d8c,
-	0x296009,
-	0x48e16087,
-	0x299745,
-	0x299746,
-	0x299d08,
-	0x236785,
-	0x2a8b45,
-	0x2a9548,
-	0x2a974a,
-	0x49258142,
-	0x4960c2c2,
-	0x2e8f85,
-	0x28b9c3,
-	0x22b108,
-	0x241d03,
-	0x2a99c4,
-	0x2f350b,
-	0x34ef48,
-	0x305148,
-	0x49b67ec9,
-	0x2af389,
-	0x2afac6,
-	0x2b0a88,
-	0x2b0c89,
-	0x2b1786,
-	0x2b1905,
-	0x372a86,
-	0x2b1e49,
-	0x319d87,
-	0x25c446,
-	0x233147,
-	0x20e947,
-	0x362e04,
-	0x49f453c9,
-	0x2cd008,
-	0x353408,
-	0x383d07,
-	0x2c8686,
-	0x235389,
-	0x210147,
-	0x34970a,
-	0x330d48,
-	0x349407,
-	0x3b1546,
-	0x2e834a,
-	0x2733c8,
-	0x30de45,
-	0x36dac5,
-	0x2f9807,
-	0x371d49,
-	0x3097cb,
-	0x31e0c8,
-	0x32d389,
-	0x253487,
-	0x2bad4c,
-	0x2bb74c,
-	0x2bba4a,
-	0x2bbccc,
-	0x2c5c08,
-	0x2c5e08,
-	0x2c6004,
-	0x2c63c9,
-	0x2c6609,
-	0x2c684a,
-	0x2c6ac9,
-	0x2c6e07,
-	0x3a448c,
-	0x24b946,
-	0x35d588,
-	0x387706,
-	0x330c06,
-	0x3596c7,
-	0x238ec8,
-	0x2618cb,
-	0x303207,
-	0x359c49,
-	0x251489,
-	0x25bbc7,
-	0x2e1e04,
-	0x3643c7,
-	0x2e1246,
-	0x214046,
-	0x2eb045,
-	0x2c7408,
-	0x2976c4,
-	0x2976c6,
-	0x2799cb,
-	0x212cc9,
-	0x209e06,
-	0x20c709,
-	0x392486,
-	0x3aae08,
-	0x214183,
-	0x2fb985,
-	0x215a09,
-	0x224085,
-	0x2f9644,
-	0x27acc6,
-	0x2ed005,
-	0x2f7346,
-	0x309ec7,
-	0x328dc6,
-	0x3a174b,
-	0x22c447,
-	0x234886,
-	0x3742c6,
-	0x390446,
-	0x291189,
-	0x240aca,
-	0x2b8ec5,
-	0x21898d,
-	0x2a9846,
-	0x2babc6,
-	0x2ded86,
-	0x2f31c5,
-	0x2e4d87,
-	0x29fa87,
-	0x22bd4e,
-	0x20fbc3,
-	0x2c8649,
-	0x263709,
-	0x32dd87,
-	0x2804c7,
-	0x2a2ec5,
-	0x343f05,
-	0x4a23734f,
-	0x2d10c7,
-	0x2d1288,
-	0x2d25c4,
-	0x2d2e86,
-	0x4a64db02,
-	0x2d7346,
-	0x201686,
-	0x2638ce,
-	0x2ec54a,
-	0x28b6c6,
-	0x22d88a,
-	0x209a09,
-	0x323d05,
-	0x393948,
-	0x3aef46,
-	0x359508,
-	0x2392c8,
-	0x34434b,
-	0x233805,
-	0x26ae88,
-	0x2062cc,
-	0x2bf807,
-	0x252546,
-	0x281fc8,
-	0x2253c8,
-	0x4aa09282,
-	0x25604b,
-	0x37b489,
-	0x2cf2c9,
-	0x2f02c7,
-	0x3b3648,
-	0x4ae289c8,
-	0x20e64b,
-	0x37dd09,
-	0x33f58d,
-	0x27d648,
-	0x290188,
-	0x4b201882,
-	0x3b2f44,
-	0x4b60dc42,
-	0x2f9486,
-	0x4ba038c2,
-	0x2448ca,
-	0x210546,
-	0x22d208,
-	0x289e88,
-	0x2e4086,
-	0x2eb5c6,
-	0x2f7106,
-	0x2f1b45,
-	0x23c804,
-	0x4be1de04,
-	0x20ae86,
-	0x29a787,
-	0x4c2f7d07,
-	0x2dc60b,
-	0x32f089,
-	0x227e0a,
-	0x263144,
-	0x369108,
-	0x25c20d,
-	0x2f1509,
-	0x2f1748,
-	0x2f2009,
-	0x2f39c4,
-	0x20ce44,
-	0x283cc5,
-	0x317b0b,
-	0x34eec6,
-	0x33c645,
-	0x21fb89,
-	0x233a08,
-	0x263844,
-	0x32db09,
-	0x208f45,
-	0x2c3788,
-	0x238847,
-	0x358c48,
-	0x284e86,
-	0x22b987,
-	0x2984c9,
-	0x311a89,
-	0x372545,
-	0x295645,
-	0x4c626a82,
-	0x306f44,
-	0x30ce05,
-	0x2c1846,
-	0x327285,
-	0x2b4707,
-	0x20af85,
-	0x27b7c4,
-	0x3aca86,
-	0x383487,
-	0x232106,
-	0x21e105,
-	0x202608,
-	0x233f85,
-	0x205d07,
-	0x20bc49,
-	0x212e0a,
-	0x2494c7,
-	0x2494cc,
-	0x24df46,
-	0x2e9ac9,
-	0x230505,
-	0x2366c8,
-	0x210c03,
-	0x210c05,
-	0x2f7b45,
-	0x26e707,
-	0x4ca27202,
-	0x227a07,
-	0x2e5206,
-	0x345306,
-	0x2e62c6,
-	0x225306,
-	0x2091c8,
-	0x35b805,
-	0x2e7b47,
-	0x2e7b4d,
-	0x21b083,
-	0x21f305,
-	0x21b087,
-	0x26b308,
-	0x21ac45,
-	0x2281c8,
-	0x2ab9c6,
-	0x32b247,
-	0x2c7bc5,
-	0x233886,
-	0x2cfac5,
-	0x22dfca,
-	0x2efec6,
-	0x25dbc7,
-	0x2bc605,
-	0x2f44c7,
-	0x2f8904,
-	0x2f95c6,
-	0x3624c5,
-	0x32608b,
-	0x2e10c9,
-	0x23d74a,
-	0x3725c8,
-	0x3007c8,
-	0x300f0c,
-	0x306b47,
-	0x308c48,
-	0x30aa88,
-	0x30dac5,
-	0x338b4a,
-	0x33aa09,
-	0x4ce00202,
-	0x200206,
-	0x20d684,
-	0x2ef889,
-	0x275d49,
-	0x27b1c7,
-	0x2fa547,
-	0x2b7c09,
-	0x331308,
-	0x33130f,
-	0x2dfa86,
-	0x2db10b,
-	0x361545,
-	0x361547,
-	0x374c89,
-	0x2171c6,
-	0x32da87,
-	0x2dde85,
-	0x22f544,
-	0x26e186,
-	0x211984,
-	0x2e6c47,
-	0x34c5c8,
-	0x4d2fb708,
-	0x2fbe85,
-	0x2fbfc7,
-	0x245709,
-	0x208444,
-	0x208448,
-	0x4d7190c8,
-	0x23cdc4,
-	0x230c88,
-	0x3396c4,
-	0x220389,
-	0x333105,
-	0x4da05bc2,
-	0x2dfac5,
-	0x2e6845,
-	0x271b88,
-	0x232847,
-	0x4de03382,
-	0x30cbc5,
-	0x2d4e86,
-	0x27a786,
-	0x306f08,
-	0x318308,
-	0x327246,
-	0x32e246,
-	0x249009,
-	0x345246,
-	0x21708b,
-	0x2a12c5,
-	0x204686,
-	0x382588,
-	0x3152c6,
-	0x298e46,
-	0x21b94a,
-	0x22f9ca,
-	0x2e8245,
-	0x35b8c7,
-	0x2f0cc6,
-	0x4e206602,
-	0x21b1c7,
-	0x2a9085,
-	0x226b44,
-	0x226b45,
-	0x263046,
-	0x27a447,
-	0x20d405,
-	0x22fb44,
-	0x365008,
-	0x298f05,
-	0x33c8c7,
-	0x39fa85,
-	0x22df05,
-	0x256b44,
-	0x28fbc9,
-	0x2ff988,
-	0x2ecec6,
-	0x2de9c6,
-	0x2b9d46,
-	0x4e700448,
-	0x300647,
-	0x3009cd,
-	0x30120c,
-	0x301809,
-	0x301a49,
-	0x4eb546c2,
-	0x3a5503,
-	0x20b303,
-	0x2e1305,
-	0x38ddca,
-	0x327106,
-	0x307905,
-	0x30a084,
-	0x30a08b,
-	0x31bdcc,
-	0x31c5cc,
-	0x31c8d5,
-	0x31d74d,
-	0x31f44f,
-	0x31f812,
-	0x31fc8f,
-	0x320052,
-	0x3204d3,
-	0x32098d,
-	0x320f4d,
-	0x3212ce,
-	0x322a8e,
-	0x3232cc,
-	0x32368c,
-	0x323acb,
-	0x323e4e,
-	0x324f92,
-	0x326ecc,
-	0x327610,
-	0x3335d2,
-	0x3347cc,
-	0x334e8d,
-	0x3351cc,
-	0x337611,
-	0x3384cd,
-	0x33ac4d,
-	0x33b24a,
-	0x33b4cc,
-	0x33bdcc,
-	0x33c34c,
-	0x33cbcc,
-	0x33fc53,
-	0x340450,
-	0x340850,
-	0x340e4d,
-	0x34144c,
-	0x342209,
-	0x342f0d,
-	0x343253,
-	0x344911,
-	0x344d53,
-	0x34560f,
-	0x3459cc,
-	0x345ccf,
-	0x34608d,
-	0x34668f,
-	0x346a50,
-	0x3474ce,
-	0x34ac8e,
-	0x34b590,
-	0x34ca8d,
-	0x34d40e,
-	0x34d78c,
-	0x34e753,
-	0x351e0e,
-	0x352390,
-	0x352791,
-	0x352bcf,
-	0x352f93,
-	0x35424d,
-	0x35458f,
-	0x35494e,
-	0x354fd0,
-	0x3553c9,
-	0x356390,
-	0x356acf,
-	0x35714f,
-	0x357512,
-	0x359e8e,
-	0x35a74d,
-	0x35cc4d,
-	0x35cf8d,
-	0x35f68d,
-	0x35f9cd,
-	0x35fd10,
-	0x36010b,
-	0x36058c,
-	0x36090c,
-	0x360c0c,
-	0x360f0e,
-	0x372c10,
-	0x374452,
-	0x3748cb,
-	0x374ece,
-	0x37524e,
-	0x375ace,
-	0x37604b,
-	0x4ef76396,
-	0x37724d,
-	0x378354,
-	0x378e0d,
-	0x37ae55,
-	0x37c04d,
-	0x37c9cf,
-	0x37d20f,
-	0x38028f,
-	0x38064e,
-	0x380acd,
-	0x382f11,
-	0x385ecc,
-	0x3861cc,
-	0x3864cb,
-	0x386c4c,
-	0x38824f,
-	0x388612,
-	0x388fcd,
-	0x389f8c,
-	0x38a40c,
-	0x38a70d,
-	0x38aa4f,
-	0x38ae0e,
-	0x38da8c,
-	0x38e04d,
-	0x38e38b,
-	0x38ee8c,
-	0x38f40d,
-	0x38f74e,
-	0x38fac9,
-	0x390c53,
-	0x39118d,
-	0x3914cd,
-	0x391acc,
-	0x391f4e,
-	0x39290f,
-	0x392ccc,
-	0x392fcd,
-	0x39330f,
-	0x3936cc,
-	0x3943cc,
-	0x39484c,
-	0x394b4c,
-	0x39520d,
-	0x395552,
-	0x396c0c,
-	0x396f0c,
-	0x397211,
-	0x39764f,
-	0x397a0f,
-	0x397dd3,
-	0x398a8e,
-	0x398e0f,
-	0x3991cc,
-	0x4f39950e,
-	0x39988f,
-	0x399c56,
-	0x39b312,
-	0x39d64c,
-	0x39e14f,
-	0x39e7cd,
-	0x39eb0f,
-	0x39eecc,
-	0x39f1cd,
-	0x39f50d,
-	0x3a0c4e,
-	0x3a2b8c,
-	0x3a2e8c,
-	0x3a3190,
-	0x3a4991,
-	0x3a4dcb,
-	0x3a510c,
-	0x3a540e,
-	0x3a7051,
-	0x3a748e,
-	0x3a780d,
-	0x3aed0b,
-	0x3afdcf,
-	0x3b09d4,
-	0x2630c2,
-	0x2630c2,
-	0x202583,
-	0x2630c2,
-	0x202583,
-	0x2630c2,
-	0x20ae82,
-	0x372ac5,
-	0x3a6d4c,
-	0x2630c2,
-	0x2630c2,
-	0x20ae82,
-	0x2630c2,
-	0x29a385,
-	0x212e05,
-	0x2630c2,
-	0x2630c2,
-	0x211cc2,
-	0x29a385,
-	0x31e789,
-	0x34460c,
-	0x2630c2,
-	0x2630c2,
-	0x2630c2,
-	0x2630c2,
-	0x372ac5,
-	0x2630c2,
-	0x2630c2,
-	0x2630c2,
-	0x2630c2,
-	0x211cc2,
-	0x31e789,
-	0x2630c2,
-	0x2630c2,
-	0x2630c2,
-	0x212e05,
-	0x2630c2,
-	0x212e05,
-	0x34460c,
-	0x3a6d4c,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204ac3,
-	0x200383,
-	0x1f08,
-	0x15444,
-	0xc1348,
-	0x204cc2,
-	0x5020d1c2,
-	0x243403,
-	0x24c944,
-	0x202743,
-	0x38e8c4,
-	0x22e886,
-	0x213843,
-	0x31aa84,
-	0x288845,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x25084a,
-	0x241f46,
-	0x3755cc,
-	0x15f048,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x22d603,
-	0x201686,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0xaa288,
-	0x3942,
-	0x513856c5,
-	0x2ac47,
-	0xd7a88,
-	0xc0ce,
-	0x8c792,
-	0x16780b,
-	0x516db445,
-	0x51adb44c,
-	0xf207,
-	0x13ecc7,
-	0x1698ca,
-	0x3efd0,
-	0x1acd05,
-	0x16e1cb,
-	0x1672c8,
-	0x13edc7,
-	0x2f64b,
-	0x11dd09,
-	0x150f47,
-	0x1b3c47,
-	0x81187,
-	0x20586,
-	0x94b88,
-	0x52028b86,
-	0xafbcd,
-	0x169290,
-	0x52401742,
-	0xfb48,
-	0x71f47,
-	0x7f149,
-	0x59b46,
-	0x99f08,
-	0x74842,
-	0xa4f4a,
-	0x2d587,
-	0x3b9c7,
-	0xaa689,
-	0xad708,
-	0x15ae05,
-	0x194e8e,
-	0x14d4e,
-	0x26f4f,
-	0x2ccc9,
-	0x4c809,
-	0x77e8b,
-	0x878cf,
-	0x8fdcc,
-	0xadd8b,
-	0xc4d08,
-	0xdc507,
-	0x162908,
-	0xfe04b,
-	0x12a54c,
-	0x141acc,
-	0x147f4c,
-	0x14b0cd,
-	0x17de88,
-	0x42602,
-	0x104389,
-	0x18528b,
-	0xc8886,
-	0x116f8b,
-	0xdd5ca,
-	0xde185,
-	0xe4a90,
-	0x1294c6,
-	0x63c85,
-	0xe6448,
-	0xee547,
-	0xee807,
-	0x5e987,
-	0xf92ca,
-	0xd790a,
-	0x177ac6,
-	0x97ccd,
-	0x1ae208,
-	0x56608,
-	0x56a89,
-	0xb9905,
-	0x19de4c,
-	0x14b2cb,
-	0x171c84,
-	0xff749,
-	0x8146,
-	0x16c2,
-	0x125886,
-	0x10d947,
-	0x6c82,
-	0xcb605,
-	0x29b04,
-	0x701,
-	0x2bc43,
-	0x51fadbc6,
-	0x9a283,
-	0x8a42,
-	0x2d584,
-	0x1442,
-	0x4ae04,
-	0x1342,
-	0x2f82,
-	0x3682,
-	0x1124c2,
-	0xe542,
-	0xdb442,
-	0x2ac2,
-	0x1c402,
-	0x26982,
-	0x4d02,
-	0x3b02,
-	0x34682,
-	0x31b83,
-	0x7d02,
-	0x1c2,
-	0x41c2,
-	0xda42,
-	0x642,
-	0xdc2,
-	0x18d82,
-	0x1a02,
-	0x2282,
-	0x1d42,
-	0x4303,
-	0xb02,
-	0x2f02,
-	0xb5e02,
-	0x1b02,
-	0x5d82,
-	0x32c2,
-	0x73c2,
-	0x17c2,
-	0x1f02,
-	0x173102,
-	0x73fc2,
-	0x5e402,
-	0x4ac3,
-	0x2c2,
-	0x9282,
-	0x1002,
-	0x14602,
-	0x1724c5,
-	0x6ec2,
-	0x1202,
-	0x41703,
-	0x682,
-	0xd42,
-	0x1702,
-	0xe5c2,
-	0x1ac2,
-	0x3382,
-	0x6902,
-	0x16c2,
-	0x73c07,
-	0x213dc3,
-	0x204cc2,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x201d43,
-	0x22d603,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x29a2c3,
-	0x1a5c3,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x20fbc3,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x200041,
-	0x20fbc3,
-	0x204ac3,
-	0x2104c3,
-	0x200383,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x20fb43,
-	0x2135c3,
-	0x2300c3,
-	0x287703,
-	0x210503,
-	0x234743,
-	0x332ec3,
-	0x2964c4,
-	0x204ac3,
-	0x200383,
-	0x24abc3,
-	0x200604,
-	0x250c83,
-	0x5283,
-	0x3abd03,
-	0x329b88,
-	0x2e8384,
-	0x2c264a,
-	0x224906,
-	0x10f9c4,
-	0x38c2c7,
-	0x21eeca,
-	0x2df949,
-	0x3a3b07,
-	0x3a7dca,
-	0x368883,
-	0x2e900b,
-	0x303349,
-	0x2b9e45,
-	0x2d7187,
-	0xd1c2,
-	0x2d0783,
-	0x204d07,
-	0x248d45,
-	0x2e1cc9,
-	0x231b83,
-	0x233606,
-	0x2c56c3,
-	0xe1183,
-	0x109686,
-	0x60546,
-	0x137c7,
-	0x217546,
-	0x222645,
-	0x2cf187,
-	0x2da587,
-	0x54b32ec3,
-	0x334a07,
-	0x3642c3,
-	0x3a2385,
-	0x2964c4,
-	0x32e3c8,
-	0x2751cc,
-	0x3a5745,
-	0x2a2086,
-	0x204bc7,
-	0x37ef47,
-	0x25b8c7,
-	0x31f248,
-	0x307ecf,
-	0x2dfb85,
-	0x243507,
-	0x2394c7,
-	0x2a9b0a,
-	0x2d7e49,
-	0x30bc85,
-	0x32194a,
-	0x1b06,
-	0x2c5745,
-	0x376284,
-	0x289dc6,
-	0x2f8cc7,
-	0x242507,
-	0x38cbc8,
-	0x214185,
-	0x248c46,
-	0x20c545,
-	0x387845,
-	0x212c04,
-	0x2e3f87,
-	0x20900a,
-	0x234d48,
-	0x356946,
-	0x2d603,
-	0x2e0405,
-	0x26c686,
-	0x3a46c6,
-	0x263b86,
-	0x20fbc3,
-	0x389247,
-	0x239445,
-	0x204ac3,
-	0x2dd88d,
-	0x20abc3,
-	0x38ccc8,
-	0x39a5c4,
-	0x27ba85,
-	0x2a9a06,
-	0x2362c6,
-	0x204587,
-	0x2ae707,
-	0x270b05,
-	0x200383,
-	0x27f2c7,
-	0x329709,
-	0x22b689,
-	0x2f590a,
-	0x24cd82,
-	0x3a2344,
-	0x2e76c4,
-	0x261787,
-	0x2278c8,
-	0x2ef309,
-	0x21f1c9,
-	0x2f0487,
-	0x303806,
-	0xf22c6,
-	0x2f39c4,
-	0x2f3fca,
-	0x2f6a08,
-	0x2f6fc9,
-	0x2bfe86,
-	0x2b6ec5,
-	0x234c08,
-	0x2c9c4a,
-	0x22c6c3,
-	0x200786,
-	0x2f0587,
-	0x217f85,
-	0x39a485,
-	0x2717c3,
-	0x258a04,
-	0x36da85,
-	0x288e47,
-	0x2ffac5,
-	0x2ed686,
-	0xfff05,
-	0x264a03,
-	0x28b789,
-	0x27b84c,
-	0x2a7e0c,
-	0x2d3bc8,
-	0x3ade87,
-	0x2fc8c8,
-	0x2fcc0a,
-	0x2fd84b,
-	0x303488,
-	0x33f408,
-	0x2363c6,
-	0x262685,
-	0x200f4a,
-	0x219545,
-	0x205bc2,
-	0x2c7a87,
-	0x2a32c6,
-	0x355ec5,
-	0x38e989,
-	0x26b785,
-	0x285ec5,
-	0x3a1f49,
-	0x257cc6,
-	0x3b1088,
-	0x23e0c3,
-	0x3b3306,
-	0x27ac06,
-	0x30ba85,
-	0x30ba89,
-	0x2bc289,
-	0x24d0c7,
-	0x10b904,
-	0x30b907,
-	0x21f0c9,
-	0x23c905,
-	0x4bbc8,
-	0x3b3205,
-	0x339505,
-	0x376c89,
-	0x205ac2,
-	0x2e95c4,
-	0x20d782,
-	0x200b02,
-	0x2ce985,
-	0x30f748,
-	0x2b9845,
-	0x2c6fc3,
-	0x2c6fc5,
-	0x2d7543,
-	0x210882,
-	0x2e30c4,
-	0x351903,
-	0x204c82,
-	0x35bb44,
-	0x2e85c3,
-	0x200e82,
-	0x25e903,
-	0x291704,
-	0x2e7083,
-	0x246f04,
-	0x202602,
-	0x21a903,
-	0x215b43,
-	0x206342,
-	0x33c282,
-	0x2bc0c9,
-	0x202d82,
-	0x28d304,
-	0x201782,
-	0x234a84,
-	0x3037c4,
-	0x2bcc44,
-	0x2016c2,
-	0x241a02,
-	0x220883,
-	0x225f83,
-	0x387944,
-	0x269e44,
-	0x2bc484,
-	0x2ce884,
-	0x30b143,
-	0x34f743,
-	0x201a84,
-	0x30d784,
-	0x30e786,
-	0x2e7782,
-	0x20d1c2,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x204cc2,
-	0x368883,
-	0x2d0783,
-	0x231b83,
-	0x2001c3,
-	0x332ec3,
-	0x2964c4,
-	0x2bc384,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0x2f4684,
-	0x32f983,
-	0x2bf3c3,
-	0x345184,
-	0x3b3006,
-	0x211503,
-	0x13ecc7,
-	0x234fc3,
-	0x23a943,
-	0x2b6703,
-	0x265383,
-	0x22d603,
-	0x2db6c5,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2ed143,
-	0x2ab343,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204303,
-	0x204ac3,
-	0x23ee04,
-	0x200383,
-	0x26a104,
-	0x2c2d45,
-	0x13ecc7,
-	0x20d1c2,
-	0x2000c2,
-	0x208a42,
-	0x202082,
-	0x200382,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x24ae04,
-	0x15f048,
-	0x2d0783,
-	0x20abc3,
-	0x1a5c3,
-	0x24fe44,
-	0x15f048,
-	0x2d0783,
-	0x251304,
-	0x2964c4,
-	0x20abc3,
-	0x201882,
-	0x200383,
-	0x2202c3,
-	0x58a04,
-	0x370145,
-	0x205bc2,
-	0x30d8c3,
-	0x204cc2,
-	0x15f048,
-	0x20d1c2,
-	0x231b83,
-	0x332ec3,
-	0x201d42,
-	0x200383,
-	0x204cc2,
-	0x15f048,
-	0x231b83,
-	0x332ec3,
-	0x204303,
-	0x20fbc3,
-	0x30b544,
-	0x204cc2,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x2da904,
-	0x332ec3,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x22d603,
-	0x204ac3,
-	0x200383,
-	0x26a103,
-	0x213e83,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x1a5c3,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x22d603,
-	0x204ac3,
-	0x200383,
-	0x217082,
-	0x200141,
-	0x204cc2,
-	0x200001,
-	0x31f542,
-	0x15f048,
-	0x21d105,
-	0x200701,
-	0xd0783,
-	0x200101,
-	0x2000c1,
-	0x201e41,
-	0x29da82,
-	0x36da04,
-	0x372a43,
-	0x200181,
-	0x200941,
-	0x200041,
-	0x200081,
-	0x2ed7c7,
-	0x2eeccf,
-	0x2fc146,
-	0x201481,
-	0x289786,
-	0x200c01,
-	0x2002c1,
-	0x33168e,
-	0x200381,
-	0x200383,
-	0x200e81,
-	0x279e45,
-	0x210582,
-	0x2716c5,
-	0x2003c1,
-	0x200201,
-	0x200241,
-	0x205bc2,
-	0x200a01,
-	0x201a81,
-	0x2005c1,
-	0x2007c1,
-	0x200cc1,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x21bd03,
-	0x2d0783,
-	0x332ec3,
-	0x91d48,
-	0x20fbc3,
-	0x204ac3,
-	0x48803,
-	0x200383,
-	0x14ebc48,
-	0x15f048,
-	0x4dcc4,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x204ac3,
-	0x200383,
-	0x205283,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x2da904,
-	0x200383,
-	0x293ac5,
-	0x343984,
-	0x2d0783,
-	0x204ac3,
-	0x200383,
-	0x16b18a,
-	0x20d1c2,
-	0x2d0783,
-	0x22f489,
-	0x231b83,
-	0x2d2389,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x2f37c8,
-	0x226647,
-	0x370145,
-	0x3a7f87,
-	0x26b0cb,
-	0x215cc8,
-	0x32eac9,
-	0x228087,
-	0x200108,
-	0x36f906,
-	0x2344c7,
-	0x29c108,
-	0x2ab806,
-	0x31d407,
-	0x2aa449,
-	0x2ba749,
-	0x2c2ac6,
-	0x2c38c5,
-	0x2cce08,
-	0x2b4783,
-	0x2d7c88,
-	0x231d87,
-	0x206583,
-	0x31d287,
-	0x217905,
-	0x2eeb08,
-	0x359105,
-	0x2cea43,
-	0x23c289,
-	0x2b0e87,
-	0x35d504,
-	0x2ff244,
-	0x307ccb,
-	0x308288,
-	0x309587,
-	0x2d0783,
-	0x231b83,
-	0x2135c3,
-	0x200383,
-	0x236ec3,
-	0x332ec3,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x77fcb,
-	0x204cc2,
-	0x20d1c2,
-	0x200383,
-	0x15f048,
-	0x204cc2,
-	0x20d1c2,
-	0x208a42,
-	0x201d42,
-	0x203cc2,
-	0x204ac3,
-	0x200382,
-	0x204cc2,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x208a42,
-	0x332ec3,
-	0x204303,
-	0x20fbc3,
-	0x213184,
-	0x204ac3,
-	0x2183c3,
-	0x200383,
-	0x30b544,
-	0x24abc3,
-	0x332ec3,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x20abc3,
-	0x200383,
-	0x39db07,
-	0x2d0783,
-	0x26e5c7,
-	0x362a86,
-	0x215ac3,
-	0x2041c3,
-	0x332ec3,
-	0x209e43,
-	0x2964c4,
-	0x38b704,
-	0x30dbc6,
-	0x201303,
-	0x204ac3,
-	0x200383,
-	0x293ac5,
-	0x318244,
-	0x369dc3,
-	0x37ed83,
-	0x2c7a87,
-	0x2387c5,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x203782,
-	0x3ae343,
-	0x2c2d43,
-	0x368883,
-	0x5fed0783,
-	0x209c02,
-	0x231b83,
-	0x202743,
-	0x332ec3,
-	0x2964c4,
-	0x23a0c3,
-	0x2dfb83,
-	0x20fbc3,
-	0x213184,
-	0x6020c002,
-	0x204ac3,
-	0x200383,
-	0x209103,
-	0x229b03,
-	0x217082,
-	0x24abc3,
-	0x15f048,
-	0x332ec3,
-	0x1a5c3,
-	0x2957c4,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x23a184,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x2cee84,
-	0x222044,
-	0x201686,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0x2a32c6,
-	0x3ddcb,
-	0x28b86,
-	0x4aa0a,
-	0x10adca,
-	0x15f048,
-	0x20c504,
-	0x2d0783,
-	0x368844,
-	0x231b83,
-	0x256bc4,
-	0x332ec3,
-	0x262fc3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x32e84b,
-	0x39f84a,
-	0x3b478c,
-	0x204cc2,
-	0x20d1c2,
-	0x208a42,
-	0x2b0405,
-	0x2964c4,
-	0x201f02,
-	0x20fbc3,
-	0x222044,
-	0x202082,
-	0x200382,
-	0x20c4c2,
-	0x217082,
-	0x168883,
-	0xd882,
-	0x2b2409,
-	0x259f88,
-	0x332d49,
-	0x234309,
-	0x23b18a,
-	0x24550a,
-	0x20a182,
-	0x21c402,
-	0xd1c2,
-	0x2d0783,
-	0x220802,
-	0x2436c6,
-	0x356fc2,
-	0x20a542,
-	0x21ad8e,
-	0x21a94e,
-	0x281a47,
-	0x204a47,
-	0x221202,
-	0x231b83,
-	0x332ec3,
-	0x20b502,
-	0x201d42,
-	0x4143,
-	0x24058f,
-	0x26b142,
-	0x362cc7,
-	0x2fa1c7,
-	0x39d487,
-	0x31e28c,
-	0x364d0c,
-	0x202444,
-	0x283b0a,
-	0x21a882,
-	0x201b02,
-	0x2bc744,
-	0x22b1c2,
-	0x2c5c02,
-	0x364f44,
-	0x2184c2,
-	0x205d82,
-	0x5d83,
-	0x2ab887,
-	0x33d885,
-	0x2073c2,
-	0x240504,
-	0x373102,
-	0x2df088,
-	0x204ac3,
-	0x203808,
-	0x203ac2,
-	0x232d85,
-	0x203ac6,
-	0x200383,
-	0x206ec2,
-	0x2ef547,
-	0x10582,
-	0x350845,
-	0x31d185,
-	0x207c82,
-	0x236b82,
-	0x3a860a,
-	0x27098a,
-	0x212bc2,
-	0x353f84,
-	0x2018c2,
-	0x3a2208,
-	0x219682,
-	0x2a2588,
-	0x304987,
-	0x304c89,
-	0x2037c2,
-	0x309e45,
-	0x247e85,
-	0x21424b,
-	0x2ca84c,
-	0x22c208,
-	0x3186c8,
-	0x2e7782,
-	0x204642,
-	0x204cc2,
-	0x15f048,
-	0x20d1c2,
-	0x2d0783,
-	0x208a42,
-	0x202082,
-	0x200382,
-	0x200383,
-	0x20c4c2,
-	0x204cc2,
-	0x6260d1c2,
-	0x62b32ec3,
-	0x205d83,
-	0x201f02,
-	0x204ac3,
-	0x3a8fc3,
-	0x200383,
-	0x2ec383,
-	0x273d06,
-	0x1613e83,
-	0x15f048,
-	0x63c85,
-	0xae2cd,
-	0xaafca,
-	0x6ebc7,
-	0x63201b82,
-	0x63601442,
-	0x63a00f82,
-	0x63e02e02,
-	0x642125c2,
-	0x6460e542,
-	0x13ecc7,
-	0x64a0d1c2,
-	0x64e0e482,
-	0x6520fe42,
-	0x65603b02,
-	0x21a943,
-	0x102c4,
-	0x220a43,
-	0x65a14002,
-	0x65e023c2,
-	0x51847,
-	0x66214502,
-	0x66600b82,
-	0x66a00542,
-	0x66e0a3c2,
-	0x67202282,
-	0x67601d42,
-	0xbe445,
-	0x221443,
-	0x3b3bc4,
-	0x67a2b1c2,
-	0x67e42682,
-	0x68202682,
-	0x7e5cb,
-	0x68600c02,
-	0x68e513c2,
-	0x69201f02,
-	0x69603cc2,
-	0x69a0bcc2,
-	0x69e05f02,
-	0x6a20b602,
-	0x6a673fc2,
-	0x6aa0c002,
-	0x6ae04a02,
-	0x6b202082,
-	0x6b603702,
-	0x6ba12982,
-	0x6be31302,
-	0x94fc4,
-	0x358183,
-	0x6c2126c2,
-	0x6c61a582,
-	0x6ca098c2,
-	0x6ce00982,
-	0x6d200382,
-	0x6d604c82,
-	0x78147,
-	0x6da054c2,
-	0x6de05502,
-	0x6e20c4c2,
-	0x6e609f42,
-	0x19de4c,
-	0x6ea22e82,
-	0x6ee79242,
-	0x6f200a02,
-	0x6f606602,
-	0x6fa019c2,
-	0x6fe3b302,
-	0x70206d02,
-	0x70613882,
-	0x70a7af82,
-	0x70e43e02,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x75c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x68a3a0c3,
-	0x2075c3,
-	0x2db744,
-	0x259e86,
-	0x2f74c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x20d882,
-	0x20d882,
-	0x23a0c3,
-	0x2075c3,
-	0x716d0783,
-	0x231b83,
-	0x329e83,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x15f048,
-	0x20d1c2,
-	0x2d0783,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x24fe44,
-	0x20d1c2,
-	0x2d0783,
-	0x3303c3,
-	0x231b83,
-	0x251304,
-	0x2135c3,
-	0x332ec3,
-	0x2964c4,
-	0x204303,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x2202c3,
-	0x370145,
-	0x2b2703,
-	0x24abc3,
-	0x20d1c2,
-	0x2d0783,
-	0x23a0c3,
-	0x204ac3,
-	0x200383,
-	0x204cc2,
-	0x368883,
-	0x15f048,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x22e886,
-	0x2964c4,
-	0x204303,
-	0x213184,
-	0x204ac3,
-	0x200383,
-	0x21aa03,
-	0x2d0783,
-	0x231b83,
-	0x204ac3,
-	0x200383,
-	0x2d0783,
-	0x28b86,
-	0x231b83,
-	0x332ec3,
-	0xe1946,
-	0x204ac3,
-	0x200383,
-	0x315cc8,
-	0x318509,
-	0x327a09,
-	0x332548,
-	0x37d888,
-	0x37d889,
-	0x9da85,
-	0x204cc2,
-	0x238605,
-	0x205d43,
-	0x7420d1c2,
-	0x231b83,
-	0x332ec3,
-	0x33e387,
-	0x265383,
-	0x20fbc3,
-	0x204ac3,
-	0x2104c3,
-	0x212483,
-	0x20abc3,
-	0x200383,
-	0x241f46,
-	0x205bc2,
-	0x24abc3,
-	0x15f048,
-	0x204cc2,
-	0x368883,
-	0x20d1c2,
-	0x2d0783,
-	0x231b83,
-	0x332ec3,
-	0x2964c4,
-	0x20fbc3,
-	0x204ac3,
-	0x200383,
-	0x213e83,
-	0x153ca46,
-}
-
-// children is the list of nodes' children, the parent's wildcard bit and the
-// parent's node type. If a node has no children then their children index
-// will be in the range [0, 6), depending on the wildcard bit and node type.
-//
-// The layout within the uint32, from MSB to LSB, is:
-//	[ 1 bits] unused
-//	[ 1 bits] wildcard bit
-//	[ 2 bits] node type
-//	[14 bits] high nodes index (exclusive) of children
-//	[14 bits] low nodes index (inclusive) of children
-var children = [...]uint32{
-	0x0,
-	0x10000000,
-	0x20000000,
-	0x40000000,
-	0x50000000,
-	0x60000000,
-	0x1860612,
-	0x1864618,
-	0x1884619,
-	0x19e0621,
-	0x19f4678,
-	0x1a0867d,
-	0x1a18682,
-	0x1a34686,
-	0x1a3868d,
-	0x1a5068e,
-	0x1a74694,
-	0x1a7869d,
-	0x1a9069e,
-	0x1a946a4,
-	0x1a986a5,
-	0x1ac06a6,
-	0x1ac46b0,
-	0x21acc6b1,
-	0x1b146b3,
-	0x1b186c5,
-	0x1b386c6,
-	0x1b4c6ce,
-	0x1b506d3,
-	0x1b806d4,
-	0x1b9c6e0,
-	0x1bc46e7,
-	0x1bd06f1,
-	0x1bd46f4,
-	0x1c686f5,
-	0x1c7c71a,
-	0x1c9071f,
-	0x1cc0724,
-	0x1cd0730,
-	0x1ce4734,
-	0x1d08739,
-	0x1e20742,
-	0x1e24788,
-	0x1e90789,
-	0x1ea47a4,
-	0x1eb87a9,
-	0x1ec07ae,
-	0x1ed07b0,
-	0x1ed47b4,
-	0x1eec7b5,
-	0x1f347bb,
-	0x1f4c7cd,
-	0x1f507d3,
-	0x1f547d4,
-	0x1f5c7d5,
-	0x1f987d7,
-	0x61f9c7e6,
-	0x1fb07e7,
-	0x1fbc7ec,
-	0x1fc07ef,
-	0x1fd07f0,
-	0x20807f4,
-	0x2084820,
-	0x22090821,
-	0x22098824,
-	0x20cc826,
-	0x20d0833,
-	0x2514834,
-	0x225ac945,
-	0x225b096b,
-	0x225b496c,
-	0x225c096d,
-	0x225c4970,
-	0x225d0971,
-	0x225d4974,
-	0x225d8975,
-	0x225dc976,
-	0x225e0977,
-	0x225e4978,
-	0x225f0979,
-	0x225f497c,
-	0x2260097d,
-	0x22604980,
-	0x22608981,
-	0x2260c982,
-	0x22610983,
-	0x22614984,
-	0x2618985,
-	0x2261c986,
-	0x22628987,
-	0x2262c98a,
-	0x263498b,
-	0x2264498d,
-	0x22648991,
-	0x2654992,
-	0x22658995,
-	0x265c996,
-	0x22660997,
-	0x267c998,
-	0x269499f,
-	0x26989a5,
-	0x26a89a6,
-	0x26b09aa,
-	0x26e49ac,
-	0x26e89b9,
-	0x26f89ba,
-	0x27909be,
-	0x227949e4,
-	0x279c9e5,
-	0x27a09e7,
-	0x27b89e8,
-	0x27cc9ee,
-	0x27f49f3,
-	0x28149fd,
-	0x2844a05,
-	0x286ca11,
-	0x2870a1b,
-	0x2894a1c,
-	0x2898a25,
-	0x28aca26,
-	0x28b0a2b,
-	0x28b4a2c,
-	0x28d4a2d,
-	0x28eca35,
-	0x28f0a3b,
-	0x228f4a3c,
-	0x28f8a3d,
-	0x2908a3e,
-	0x290ca42,
-	0x2984a43,
-	0x29a0a61,
-	0x29aca68,
-	0x29c0a6b,
-	0x29d8a70,
-	0x29eca76,
-	0x2a04a7b,
-	0x2a1ca81,
-	0x2a34a87,
-	0x2a50a8d,
-	0x2a68a94,
-	0x2ac8a9a,
-	0x2ae0ab2,
-	0x2ae4ab8,
-	0x2af8ab9,
-	0x2b3cabe,
-	0x2bbcacf,
-	0x2be8aef,
-	0x2becafa,
-	0x2bf4afb,
-	0x2c14afd,
-	0x2c18b05,
-	0x2c38b06,
-	0x2c40b0e,
-	0x2c78b10,
-	0x2cb8b1e,
-	0x2cbcb2e,
-	0x2d0cb2f,
-	0x2d10b43,
-	0x22d14b44,
-	0x2d2cb45,
-	0x2d50b4b,
-	0x2d70b54,
-	0x3334b5c,
-	0x3340ccd,
-	0x3360cd0,
-	0x351ccd8,
-	0x35ecd47,
-	0x365cd7b,
-	0x36b4d97,
-	0x379cdad,
-	0x37f4de7,
-	0x3830dfd,
-	0x392ce0c,
-	0x39f8e4b,
-	0x3a90e7e,
-	0x3b20ea4,
-	0x3b84ec8,
-	0x3dbcee1,
-	0x3e74f6f,
-	0x3f40f9d,
-	0x3f8cfd0,
-	0x4014fe3,
-	0x4051005,
-	0x40a1014,
-	0x4119028,
-	0x6411d046,
-	0x64121047,
-	0x64125048,
-	0x41a1049,
-	0x41fd068,
-	0x427907f,
-	0x42f109e,
-	0x43710bc,
-	0x43dd0dc,
-	0x45090f7,
-	0x4561142,
-	0x64565158,
-	0x45fd159,
-	0x468517f,
-	0x46d11a1,
-	0x47391b4,
-	0x47e11ce,
-	0x48a91f8,
-	0x491122a,
-	0x4a25244,
-	0x64a29289,
-	0x64a2d28a,
-	0x4a8928b,
-	0x4ae52a2,
-	0x4b752b9,
-	0x4bf12dd,
-	0x4c352fc,
-	0x4d1930d,
-	0x4d4d346,
-	0x4dad353,
-	0x4e2136b,
-	0x4ea9388,
-	0x4ee93aa,
-	0x4f593ba,
-	0x64f5d3d6,
-	0x64f613d7,
-	0x24f653d8,
-	0x4f7d3d9,
-	0x4f993df,
-	0x4fdd3e6,
-	0x4fed3f7,
-	0x50053fb,
-	0x507d401,
-	0x508541f,
-	0x5099421,
-	0x50b1426,
-	0x50d942c,
-	0x50dd436,
-	0x50e5437,
-	0x50f9439,
-	0x511543e,
-	0x5119445,
-	0x5121446,
-	0x515d448,
-	0x5171457,
-	0x517945c,
-	0x518145e,
-	0x5185460,
-	0x51a9461,
-	0x51cd46a,
-	0x51e5473,
-	0x51e9479,
-	0x51f147a,
-	0x51f547c,
-	0x524d47d,
-	0x5271493,
-	0x529149c,
-	0x52ad4a4,
-	0x52bd4ab,
-	0x52d14af,
-	0x52d54b4,
-	0x52dd4b5,
-	0x52f14b7,
-	0x53014bc,
-	0x53054c0,
-	0x53214c1,
-	0x5bb14c8,
-	0x5be96ec,
-	0x5c156fa,
-	0x5c2d705,
-	0x5c4d70b,
-	0x5c6d713,
-	0x5cb171b,
-	0x5cb972c,
-	0x25cbd72e,
-	0x25cc172f,
-	0x5cc5730,
-	0x5e01731,
-	0x25e05780,
-	0x25e11781,
-	0x25e19784,
-	0x25e25786,
-	0x5e29789,
-	0x5e2d78a,
-	0x5e5578b,
-	0x5e7d795,
-	0x5e8179f,
-	0x5eb97a0,
-	0x5ecd7ae,
-	0x6a257b3,
-	0x6a29a89,
-	0x6a2da8a,
-	0x26a31a8b,
-	0x6a35a8c,
-	0x26a39a8d,
-	0x6a3da8e,
-	0x26a49a8f,
-	0x6a4da92,
-	0x6a51a93,
-	0x26a55a94,
-	0x6a59a95,
-	0x26a61a96,
-	0x6a65a98,
-	0x6a69a99,
-	0x26a79a9a,
-	0x6a7da9e,
-	0x6a81a9f,
-	0x6a85aa0,
-	0x6a89aa1,
-	0x26a8daa2,
-	0x6a91aa3,
-	0x6a95aa4,
-	0x6a99aa5,
-	0x6a9daa6,
-	0x26aa5aa7,
-	0x6aa9aa9,
-	0x6aadaaa,
-	0x6ab1aab,
-	0x26ab5aac,
-	0x6ab9aad,
-	0x26ac1aae,
-	0x26ac5ab0,
-	0x6ae1ab1,
-	0x6aedab8,
-	0x6b2dabb,
-	0x6b31acb,
-	0x6b55acc,
-	0x6b59ad5,
-	0x6cc1ad6,
-	0x26cc5b30,
-	0x26ccdb31,
-	0x26cd1b33,
-	0x26cd5b34,
-	0x6cddb35,
-	0x6db9b37,
-	0x6dbdb6e,
-	0x6de9b6f,
-	0x6dedb7a,
-	0x6e0db7b,
-	0x6e19b83,
-	0x6e39b86,
-	0x6e71b8e,
-	0x7109b9c,
-	0x71c5c42,
-	0x71d9c71,
-	0x720dc76,
-	0x723dc83,
-	0x7259c8f,
-	0x727dc96,
-	0x7299c9f,
-	0x72b5ca6,
-	0x72d9cad,
-	0x72e9cb6,
-	0x72edcba,
-	0x7321cbb,
-	0x733dcc8,
-	0x7359ccf,
-	0x737dcd6,
-	0x739dcdf,
-	0x73b1ce7,
-	0x73c5cec,
-	0x73c9cf1,
-	0x73e9cf2,
-	0x748dcfa,
-	0x74a9d23,
-	0x74c9d2a,
-	0x74cdd32,
-	0x74d1d33,
-	0x74d5d34,
-	0x74e9d35,
-	0x7509d3a,
-	0x7515d42,
-	0x7519d45,
-	0x7549d46,
-	0x75c9d52,
-	0x75ddd72,
-	0x75e1d77,
-	0x75f9d78,
-	0x75fdd7e,
-	0x7609d7f,
-	0x760dd82,
-	0x7629d83,
-	0x7665d8a,
-	0x7669d99,
-	0x7689d9a,
-	0x76d9da2,
-	0x76f1db6,
-	0x7745dbc,
-	0x7749dd1,
-	0x774ddd2,
-	0x7751dd3,
-	0x7795dd4,
-	0x77a5de5,
-	0x77ddde9,
-	0x780ddf7,
-	0x7955e03,
-	0x7979e55,
-	0x79a5e5e,
-	0x79b1e69,
-	0x79b9e6c,
-	0x7ac9e6e,
-	0x7ad5eb2,
-	0x7ae1eb5,
-	0x7aedeb8,
-	0x7af9ebb,
-	0x7b05ebe,
-	0x7b11ec1,
-	0x7b1dec4,
-	0x7b29ec7,
-	0x7b35eca,
-	0x7b41ecd,
-	0x7b4ded0,
-	0x7b59ed3,
-	0x7b65ed6,
-	0x7b6ded9,
-	0x7b79edb,
-	0x7b85ede,
-	0x7b91ee1,
-	0x7b9dee4,
-	0x7ba9ee7,
-	0x7bb5eea,
-	0x7bc1eed,
-	0x7bcdef0,
-	0x7bd9ef3,
-	0x7be5ef6,
-	0x7bf1ef9,
-	0x7bfdefc,
-	0x7c09eff,
-	0x7c15f02,
-	0x7c21f05,
-	0x7c2df08,
-	0x7c39f0b,
-	0x7c41f0e,
-	0x7c4df10,
-	0x7c59f13,
-	0x7c65f16,
-	0x7c71f19,
-	0x7c7df1c,
-	0x7c89f1f,
-	0x7c95f22,
-	0x7ca1f25,
-	0x7cadf28,
-	0x7cb9f2b,
-	0x7cc5f2e,
-	0x7cd1f31,
-	0x7cddf34,
-	0x7ce5f37,
-	0x7cf1f39,
-	0x7cfdf3c,
-	0x7d09f3f,
-	0x7d15f42,
-	0x7d21f45,
-	0x7d2df48,
-	0x7d39f4b,
-	0x7d45f4e,
-	0x7d49f51,
-	0x7d55f52,
-	0x7d6df55,
-	0x7d71f5b,
-	0x7d81f5c,
-	0x7d99f60,
-	0x7dddf66,
-	0x7df1f77,
-	0x7e25f7c,
-	0x7e35f89,
-	0x7e51f8d,
-	0x7e69f94,
-	0x7e6df9a,
-	0x27eb1f9b,
-	0x7eb5fac,
-	0x7ee1fad,
-	0x7ee5fb8,
-}
-
-// max children 466 (capacity 511)
-// max text offset 28023 (capacity 32767)
-// max text length 36 (capacity 63)
-// max hi 8121 (capacity 16383)
-// max lo 8120 (capacity 16383)
diff --git a/installer/vendor/golang.org/x/net/publicsuffix/table_test.go b/installer/vendor/golang.org/x/net/publicsuffix/table_test.go
deleted file mode 100644
index f60c80e79a..0000000000
--- a/installer/vendor/golang.org/x/net/publicsuffix/table_test.go
+++ /dev/null
@@ -1,16196 +0,0 @@
-// generated by go run gen.go; DO NOT EDIT
-
-package publicsuffix
-
-var rules = [...]string{
-	"ac",
-	"com.ac",
-	"edu.ac",
-	"gov.ac",
-	"net.ac",
-	"mil.ac",
-	"org.ac",
-	"ad",
-	"nom.ad",
-	"ae",
-	"co.ae",
-	"net.ae",
-	"org.ae",
-	"sch.ae",
-	"ac.ae",
-	"gov.ae",
-	"mil.ae",
-	"aero",
-	"accident-investigation.aero",
-	"accident-prevention.aero",
-	"aerobatic.aero",
-	"aeroclub.aero",
-	"aerodrome.aero",
-	"agents.aero",
-	"aircraft.aero",
-	"airline.aero",
-	"airport.aero",
-	"air-surveillance.aero",
-	"airtraffic.aero",
-	"air-traffic-control.aero",
-	"ambulance.aero",
-	"amusement.aero",
-	"association.aero",
-	"author.aero",
-	"ballooning.aero",
-	"broker.aero",
-	"caa.aero",
-	"cargo.aero",
-	"catering.aero",
-	"certification.aero",
-	"championship.aero",
-	"charter.aero",
-	"civilaviation.aero",
-	"club.aero",
-	"conference.aero",
-	"consultant.aero",
-	"consulting.aero",
-	"control.aero",
-	"council.aero",
-	"crew.aero",
-	"design.aero",
-	"dgca.aero",
-	"educator.aero",
-	"emergency.aero",
-	"engine.aero",
-	"engineer.aero",
-	"entertainment.aero",
-	"equipment.aero",
-	"exchange.aero",
-	"express.aero",
-	"federation.aero",
-	"flight.aero",
-	"freight.aero",
-	"fuel.aero",
-	"gliding.aero",
-	"government.aero",
-	"groundhandling.aero",
-	"group.aero",
-	"hanggliding.aero",
-	"homebuilt.aero",
-	"insurance.aero",
-	"journal.aero",
-	"journalist.aero",
-	"leasing.aero",
-	"logistics.aero",
-	"magazine.aero",
-	"maintenance.aero",
-	"media.aero",
-	"microlight.aero",
-	"modelling.aero",
-	"navigation.aero",
-	"parachuting.aero",
-	"paragliding.aero",
-	"passenger-association.aero",
-	"pilot.aero",
-	"press.aero",
-	"production.aero",
-	"recreation.aero",
-	"repbody.aero",
-	"res.aero",
-	"research.aero",
-	"rotorcraft.aero",
-	"safety.aero",
-	"scientist.aero",
-	"services.aero",
-	"show.aero",
-	"skydiving.aero",
-	"software.aero",
-	"student.aero",
-	"trader.aero",
-	"trading.aero",
-	"trainer.aero",
-	"union.aero",
-	"workinggroup.aero",
-	"works.aero",
-	"af",
-	"gov.af",
-	"com.af",
-	"org.af",
-	"net.af",
-	"edu.af",
-	"ag",
-	"com.ag",
-	"org.ag",
-	"net.ag",
-	"co.ag",
-	"nom.ag",
-	"ai",
-	"off.ai",
-	"com.ai",
-	"net.ai",
-	"org.ai",
-	"al",
-	"com.al",
-	"edu.al",
-	"gov.al",
-	"mil.al",
-	"net.al",
-	"org.al",
-	"am",
-	"ao",
-	"ed.ao",
-	"gv.ao",
-	"og.ao",
-	"co.ao",
-	"pb.ao",
-	"it.ao",
-	"aq",
-	"ar",
-	"com.ar",
-	"edu.ar",
-	"gob.ar",
-	"gov.ar",
-	"int.ar",
-	"mil.ar",
-	"net.ar",
-	"org.ar",
-	"tur.ar",
-	"arpa",
-	"e164.arpa",
-	"in-addr.arpa",
-	"ip6.arpa",
-	"iris.arpa",
-	"uri.arpa",
-	"urn.arpa",
-	"as",
-	"gov.as",
-	"asia",
-	"at",
-	"ac.at",
-	"co.at",
-	"gv.at",
-	"or.at",
-	"au",
-	"com.au",
-	"net.au",
-	"org.au",
-	"edu.au",
-	"gov.au",
-	"asn.au",
-	"id.au",
-	"info.au",
-	"conf.au",
-	"oz.au",
-	"act.au",
-	"nsw.au",
-	"nt.au",
-	"qld.au",
-	"sa.au",
-	"tas.au",
-	"vic.au",
-	"wa.au",
-	"act.edu.au",
-	"nsw.edu.au",
-	"nt.edu.au",
-	"qld.edu.au",
-	"sa.edu.au",
-	"tas.edu.au",
-	"vic.edu.au",
-	"wa.edu.au",
-	"qld.gov.au",
-	"sa.gov.au",
-	"tas.gov.au",
-	"vic.gov.au",
-	"wa.gov.au",
-	"aw",
-	"com.aw",
-	"ax",
-	"az",
-	"com.az",
-	"net.az",
-	"int.az",
-	"gov.az",
-	"org.az",
-	"edu.az",
-	"info.az",
-	"pp.az",
-	"mil.az",
-	"name.az",
-	"pro.az",
-	"biz.az",
-	"ba",
-	"com.ba",
-	"edu.ba",
-	"gov.ba",
-	"mil.ba",
-	"net.ba",
-	"org.ba",
-	"bb",
-	"biz.bb",
-	"co.bb",
-	"com.bb",
-	"edu.bb",
-	"gov.bb",
-	"info.bb",
-	"net.bb",
-	"org.bb",
-	"store.bb",
-	"tv.bb",
-	"*.bd",
-	"be",
-	"ac.be",
-	"bf",
-	"gov.bf",
-	"bg",
-	"a.bg",
-	"b.bg",
-	"c.bg",
-	"d.bg",
-	"e.bg",
-	"f.bg",
-	"g.bg",
-	"h.bg",
-	"i.bg",
-	"j.bg",
-	"k.bg",
-	"l.bg",
-	"m.bg",
-	"n.bg",
-	"o.bg",
-	"p.bg",
-	"q.bg",
-	"r.bg",
-	"s.bg",
-	"t.bg",
-	"u.bg",
-	"v.bg",
-	"w.bg",
-	"x.bg",
-	"y.bg",
-	"z.bg",
-	"0.bg",
-	"1.bg",
-	"2.bg",
-	"3.bg",
-	"4.bg",
-	"5.bg",
-	"6.bg",
-	"7.bg",
-	"8.bg",
-	"9.bg",
-	"bh",
-	"com.bh",
-	"edu.bh",
-	"net.bh",
-	"org.bh",
-	"gov.bh",
-	"bi",
-	"co.bi",
-	"com.bi",
-	"edu.bi",
-	"or.bi",
-	"org.bi",
-	"biz",
-	"bj",
-	"asso.bj",
-	"barreau.bj",
-	"gouv.bj",
-	"bm",
-	"com.bm",
-	"edu.bm",
-	"gov.bm",
-	"net.bm",
-	"org.bm",
-	"*.bn",
-	"bo",
-	"com.bo",
-	"edu.bo",
-	"gov.bo",
-	"gob.bo",
-	"int.bo",
-	"org.bo",
-	"net.bo",
-	"mil.bo",
-	"tv.bo",
-	"br",
-	"adm.br",
-	"adv.br",
-	"agr.br",
-	"am.br",
-	"arq.br",
-	"art.br",
-	"ato.br",
-	"b.br",
-	"bio.br",
-	"blog.br",
-	"bmd.br",
-	"cim.br",
-	"cng.br",
-	"cnt.br",
-	"com.br",
-	"coop.br",
-	"ecn.br",
-	"eco.br",
-	"edu.br",
-	"emp.br",
-	"eng.br",
-	"esp.br",
-	"etc.br",
-	"eti.br",
-	"far.br",
-	"flog.br",
-	"fm.br",
-	"fnd.br",
-	"fot.br",
-	"fst.br",
-	"g12.br",
-	"ggf.br",
-	"gov.br",
-	"imb.br",
-	"ind.br",
-	"inf.br",
-	"jor.br",
-	"jus.br",
-	"leg.br",
-	"lel.br",
-	"mat.br",
-	"med.br",
-	"mil.br",
-	"mp.br",
-	"mus.br",
-	"net.br",
-	"*.nom.br",
-	"not.br",
-	"ntr.br",
-	"odo.br",
-	"org.br",
-	"ppg.br",
-	"pro.br",
-	"psc.br",
-	"psi.br",
-	"qsl.br",
-	"radio.br",
-	"rec.br",
-	"slg.br",
-	"srv.br",
-	"taxi.br",
-	"teo.br",
-	"tmp.br",
-	"trd.br",
-	"tur.br",
-	"tv.br",
-	"vet.br",
-	"vlog.br",
-	"wiki.br",
-	"zlg.br",
-	"bs",
-	"com.bs",
-	"net.bs",
-	"org.bs",
-	"edu.bs",
-	"gov.bs",
-	"bt",
-	"com.bt",
-	"edu.bt",
-	"gov.bt",
-	"net.bt",
-	"org.bt",
-	"bv",
-	"bw",
-	"co.bw",
-	"org.bw",
-	"by",
-	"gov.by",
-	"mil.by",
-	"com.by",
-	"of.by",
-	"bz",
-	"com.bz",
-	"net.bz",
-	"org.bz",
-	"edu.bz",
-	"gov.bz",
-	"ca",
-	"ab.ca",
-	"bc.ca",
-	"mb.ca",
-	"nb.ca",
-	"nf.ca",
-	"nl.ca",
-	"ns.ca",
-	"nt.ca",
-	"nu.ca",
-	"on.ca",
-	"pe.ca",
-	"qc.ca",
-	"sk.ca",
-	"yk.ca",
-	"gc.ca",
-	"cat",
-	"cc",
-	"cd",
-	"gov.cd",
-	"cf",
-	"cg",
-	"ch",
-	"ci",
-	"org.ci",
-	"or.ci",
-	"com.ci",
-	"co.ci",
-	"edu.ci",
-	"ed.ci",
-	"ac.ci",
-	"net.ci",
-	"go.ci",
-	"asso.ci",
-	"xn--aroport-bya.ci",
-	"int.ci",
-	"presse.ci",
-	"md.ci",
-	"gouv.ci",
-	"*.ck",
-	"!www.ck",
-	"cl",
-	"gov.cl",
-	"gob.cl",
-	"co.cl",
-	"mil.cl",
-	"cm",
-	"co.cm",
-	"com.cm",
-	"gov.cm",
-	"net.cm",
-	"cn",
-	"ac.cn",
-	"com.cn",
-	"edu.cn",
-	"gov.cn",
-	"net.cn",
-	"org.cn",
-	"mil.cn",
-	"xn--55qx5d.cn",
-	"xn--io0a7i.cn",
-	"xn--od0alg.cn",
-	"ah.cn",
-	"bj.cn",
-	"cq.cn",
-	"fj.cn",
-	"gd.cn",
-	"gs.cn",
-	"gz.cn",
-	"gx.cn",
-	"ha.cn",
-	"hb.cn",
-	"he.cn",
-	"hi.cn",
-	"hl.cn",
-	"hn.cn",
-	"jl.cn",
-	"js.cn",
-	"jx.cn",
-	"ln.cn",
-	"nm.cn",
-	"nx.cn",
-	"qh.cn",
-	"sc.cn",
-	"sd.cn",
-	"sh.cn",
-	"sn.cn",
-	"sx.cn",
-	"tj.cn",
-	"xj.cn",
-	"xz.cn",
-	"yn.cn",
-	"zj.cn",
-	"hk.cn",
-	"mo.cn",
-	"tw.cn",
-	"co",
-	"arts.co",
-	"com.co",
-	"edu.co",
-	"firm.co",
-	"gov.co",
-	"info.co",
-	"int.co",
-	"mil.co",
-	"net.co",
-	"nom.co",
-	"org.co",
-	"rec.co",
-	"web.co",
-	"com",
-	"coop",
-	"cr",
-	"ac.cr",
-	"co.cr",
-	"ed.cr",
-	"fi.cr",
-	"go.cr",
-	"or.cr",
-	"sa.cr",
-	"cu",
-	"com.cu",
-	"edu.cu",
-	"org.cu",
-	"net.cu",
-	"gov.cu",
-	"inf.cu",
-	"cv",
-	"cw",
-	"com.cw",
-	"edu.cw",
-	"net.cw",
-	"org.cw",
-	"cx",
-	"gov.cx",
-	"cy",
-	"ac.cy",
-	"biz.cy",
-	"com.cy",
-	"ekloges.cy",
-	"gov.cy",
-	"ltd.cy",
-	"name.cy",
-	"net.cy",
-	"org.cy",
-	"parliament.cy",
-	"press.cy",
-	"pro.cy",
-	"tm.cy",
-	"cz",
-	"de",
-	"dj",
-	"dk",
-	"dm",
-	"com.dm",
-	"net.dm",
-	"org.dm",
-	"edu.dm",
-	"gov.dm",
-	"do",
-	"art.do",
-	"com.do",
-	"edu.do",
-	"gob.do",
-	"gov.do",
-	"mil.do",
-	"net.do",
-	"org.do",
-	"sld.do",
-	"web.do",
-	"dz",
-	"com.dz",
-	"org.dz",
-	"net.dz",
-	"gov.dz",
-	"edu.dz",
-	"asso.dz",
-	"pol.dz",
-	"art.dz",
-	"ec",
-	"com.ec",
-	"info.ec",
-	"net.ec",
-	"fin.ec",
-	"k12.ec",
-	"med.ec",
-	"pro.ec",
-	"org.ec",
-	"edu.ec",
-	"gov.ec",
-	"gob.ec",
-	"mil.ec",
-	"edu",
-	"ee",
-	"edu.ee",
-	"gov.ee",
-	"riik.ee",
-	"lib.ee",
-	"med.ee",
-	"com.ee",
-	"pri.ee",
-	"aip.ee",
-	"org.ee",
-	"fie.ee",
-	"eg",
-	"com.eg",
-	"edu.eg",
-	"eun.eg",
-	"gov.eg",
-	"mil.eg",
-	"name.eg",
-	"net.eg",
-	"org.eg",
-	"sci.eg",
-	"*.er",
-	"es",
-	"com.es",
-	"nom.es",
-	"org.es",
-	"gob.es",
-	"edu.es",
-	"et",
-	"com.et",
-	"gov.et",
-	"org.et",
-	"edu.et",
-	"biz.et",
-	"name.et",
-	"info.et",
-	"net.et",
-	"eu",
-	"fi",
-	"aland.fi",
-	"*.fj",
-	"*.fk",
-	"fm",
-	"fo",
-	"fr",
-	"com.fr",
-	"asso.fr",
-	"nom.fr",
-	"prd.fr",
-	"presse.fr",
-	"tm.fr",
-	"aeroport.fr",
-	"assedic.fr",
-	"avocat.fr",
-	"avoues.fr",
-	"cci.fr",
-	"chambagri.fr",
-	"chirurgiens-dentistes.fr",
-	"experts-comptables.fr",
-	"geometre-expert.fr",
-	"gouv.fr",
-	"greta.fr",
-	"huissier-justice.fr",
-	"medecin.fr",
-	"notaires.fr",
-	"pharmacien.fr",
-	"port.fr",
-	"veterinaire.fr",
-	"ga",
-	"gb",
-	"gd",
-	"ge",
-	"com.ge",
-	"edu.ge",
-	"gov.ge",
-	"org.ge",
-	"mil.ge",
-	"net.ge",
-	"pvt.ge",
-	"gf",
-	"gg",
-	"co.gg",
-	"net.gg",
-	"org.gg",
-	"gh",
-	"com.gh",
-	"edu.gh",
-	"gov.gh",
-	"org.gh",
-	"mil.gh",
-	"gi",
-	"com.gi",
-	"ltd.gi",
-	"gov.gi",
-	"mod.gi",
-	"edu.gi",
-	"org.gi",
-	"gl",
-	"co.gl",
-	"com.gl",
-	"edu.gl",
-	"net.gl",
-	"org.gl",
-	"gm",
-	"gn",
-	"ac.gn",
-	"com.gn",
-	"edu.gn",
-	"gov.gn",
-	"org.gn",
-	"net.gn",
-	"gov",
-	"gp",
-	"com.gp",
-	"net.gp",
-	"mobi.gp",
-	"edu.gp",
-	"org.gp",
-	"asso.gp",
-	"gq",
-	"gr",
-	"com.gr",
-	"edu.gr",
-	"net.gr",
-	"org.gr",
-	"gov.gr",
-	"gs",
-	"gt",
-	"com.gt",
-	"edu.gt",
-	"gob.gt",
-	"ind.gt",
-	"mil.gt",
-	"net.gt",
-	"org.gt",
-	"*.gu",
-	"gw",
-	"gy",
-	"co.gy",
-	"com.gy",
-	"edu.gy",
-	"gov.gy",
-	"net.gy",
-	"org.gy",
-	"hk",
-	"com.hk",
-	"edu.hk",
-	"gov.hk",
-	"idv.hk",
-	"net.hk",
-	"org.hk",
-	"xn--55qx5d.hk",
-	"xn--wcvs22d.hk",
-	"xn--lcvr32d.hk",
-	"xn--mxtq1m.hk",
-	"xn--gmqw5a.hk",
-	"xn--ciqpn.hk",
-	"xn--gmq050i.hk",
-	"xn--zf0avx.hk",
-	"xn--io0a7i.hk",
-	"xn--mk0axi.hk",
-	"xn--od0alg.hk",
-	"xn--od0aq3b.hk",
-	"xn--tn0ag.hk",
-	"xn--uc0atv.hk",
-	"xn--uc0ay4a.hk",
-	"hm",
-	"hn",
-	"com.hn",
-	"edu.hn",
-	"org.hn",
-	"net.hn",
-	"mil.hn",
-	"gob.hn",
-	"hr",
-	"iz.hr",
-	"from.hr",
-	"name.hr",
-	"com.hr",
-	"ht",
-	"com.ht",
-	"shop.ht",
-	"firm.ht",
-	"info.ht",
-	"adult.ht",
-	"net.ht",
-	"pro.ht",
-	"org.ht",
-	"med.ht",
-	"art.ht",
-	"coop.ht",
-	"pol.ht",
-	"asso.ht",
-	"edu.ht",
-	"rel.ht",
-	"gouv.ht",
-	"perso.ht",
-	"hu",
-	"co.hu",
-	"info.hu",
-	"org.hu",
-	"priv.hu",
-	"sport.hu",
-	"tm.hu",
-	"2000.hu",
-	"agrar.hu",
-	"bolt.hu",
-	"casino.hu",
-	"city.hu",
-	"erotica.hu",
-	"erotika.hu",
-	"film.hu",
-	"forum.hu",
-	"games.hu",
-	"hotel.hu",
-	"ingatlan.hu",
-	"jogasz.hu",
-	"konyvelo.hu",
-	"lakas.hu",
-	"media.hu",
-	"news.hu",
-	"reklam.hu",
-	"sex.hu",
-	"shop.hu",
-	"suli.hu",
-	"szex.hu",
-	"tozsde.hu",
-	"utazas.hu",
-	"video.hu",
-	"id",
-	"ac.id",
-	"biz.id",
-	"co.id",
-	"desa.id",
-	"go.id",
-	"mil.id",
-	"my.id",
-	"net.id",
-	"or.id",
-	"sch.id",
-	"web.id",
-	"ie",
-	"gov.ie",
-	"il",
-	"ac.il",
-	"co.il",
-	"gov.il",
-	"idf.il",
-	"k12.il",
-	"muni.il",
-	"net.il",
-	"org.il",
-	"im",
-	"ac.im",
-	"co.im",
-	"com.im",
-	"ltd.co.im",
-	"net.im",
-	"org.im",
-	"plc.co.im",
-	"tt.im",
-	"tv.im",
-	"in",
-	"co.in",
-	"firm.in",
-	"net.in",
-	"org.in",
-	"gen.in",
-	"ind.in",
-	"nic.in",
-	"ac.in",
-	"edu.in",
-	"res.in",
-	"gov.in",
-	"mil.in",
-	"info",
-	"int",
-	"eu.int",
-	"io",
-	"com.io",
-	"iq",
-	"gov.iq",
-	"edu.iq",
-	"mil.iq",
-	"com.iq",
-	"org.iq",
-	"net.iq",
-	"ir",
-	"ac.ir",
-	"co.ir",
-	"gov.ir",
-	"id.ir",
-	"net.ir",
-	"org.ir",
-	"sch.ir",
-	"xn--mgba3a4f16a.ir",
-	"xn--mgba3a4fra.ir",
-	"is",
-	"net.is",
-	"com.is",
-	"edu.is",
-	"gov.is",
-	"org.is",
-	"int.is",
-	"it",
-	"gov.it",
-	"edu.it",
-	"abr.it",
-	"abruzzo.it",
-	"aosta-valley.it",
-	"aostavalley.it",
-	"bas.it",
-	"basilicata.it",
-	"cal.it",
-	"calabria.it",
-	"cam.it",
-	"campania.it",
-	"emilia-romagna.it",
-	"emiliaromagna.it",
-	"emr.it",
-	"friuli-v-giulia.it",
-	"friuli-ve-giulia.it",
-	"friuli-vegiulia.it",
-	"friuli-venezia-giulia.it",
-	"friuli-veneziagiulia.it",
-	"friuli-vgiulia.it",
-	"friuliv-giulia.it",
-	"friulive-giulia.it",
-	"friulivegiulia.it",
-	"friulivenezia-giulia.it",
-	"friuliveneziagiulia.it",
-	"friulivgiulia.it",
-	"fvg.it",
-	"laz.it",
-	"lazio.it",
-	"lig.it",
-	"liguria.it",
-	"lom.it",
-	"lombardia.it",
-	"lombardy.it",
-	"lucania.it",
-	"mar.it",
-	"marche.it",
-	"mol.it",
-	"molise.it",
-	"piedmont.it",
-	"piemonte.it",
-	"pmn.it",
-	"pug.it",
-	"puglia.it",
-	"sar.it",
-	"sardegna.it",
-	"sardinia.it",
-	"sic.it",
-	"sicilia.it",
-	"sicily.it",
-	"taa.it",
-	"tos.it",
-	"toscana.it",
-	"trentino-a-adige.it",
-	"trentino-aadige.it",
-	"trentino-alto-adige.it",
-	"trentino-altoadige.it",
-	"trentino-s-tirol.it",
-	"trentino-stirol.it",
-	"trentino-sud-tirol.it",
-	"trentino-sudtirol.it",
-	"trentino-sued-tirol.it",
-	"trentino-suedtirol.it",
-	"trentinoa-adige.it",
-	"trentinoaadige.it",
-	"trentinoalto-adige.it",
-	"trentinoaltoadige.it",
-	"trentinos-tirol.it",
-	"trentinostirol.it",
-	"trentinosud-tirol.it",
-	"trentinosudtirol.it",
-	"trentinosued-tirol.it",
-	"trentinosuedtirol.it",
-	"tuscany.it",
-	"umb.it",
-	"umbria.it",
-	"val-d-aosta.it",
-	"val-daosta.it",
-	"vald-aosta.it",
-	"valdaosta.it",
-	"valle-aosta.it",
-	"valle-d-aosta.it",
-	"valle-daosta.it",
-	"valleaosta.it",
-	"valled-aosta.it",
-	"valledaosta.it",
-	"vallee-aoste.it",
-	"valleeaoste.it",
-	"vao.it",
-	"vda.it",
-	"ven.it",
-	"veneto.it",
-	"ag.it",
-	"agrigento.it",
-	"al.it",
-	"alessandria.it",
-	"alto-adige.it",
-	"altoadige.it",
-	"an.it",
-	"ancona.it",
-	"andria-barletta-trani.it",
-	"andria-trani-barletta.it",
-	"andriabarlettatrani.it",
-	"andriatranibarletta.it",
-	"ao.it",
-	"aosta.it",
-	"aoste.it",
-	"ap.it",
-	"aq.it",
-	"aquila.it",
-	"ar.it",
-	"arezzo.it",
-	"ascoli-piceno.it",
-	"ascolipiceno.it",
-	"asti.it",
-	"at.it",
-	"av.it",
-	"avellino.it",
-	"ba.it",
-	"balsan.it",
-	"bari.it",
-	"barletta-trani-andria.it",
-	"barlettatraniandria.it",
-	"belluno.it",
-	"benevento.it",
-	"bergamo.it",
-	"bg.it",
-	"bi.it",
-	"biella.it",
-	"bl.it",
-	"bn.it",
-	"bo.it",
-	"bologna.it",
-	"bolzano.it",
-	"bozen.it",
-	"br.it",
-	"brescia.it",
-	"brindisi.it",
-	"bs.it",
-	"bt.it",
-	"bz.it",
-	"ca.it",
-	"cagliari.it",
-	"caltanissetta.it",
-	"campidano-medio.it",
-	"campidanomedio.it",
-	"campobasso.it",
-	"carbonia-iglesias.it",
-	"carboniaiglesias.it",
-	"carrara-massa.it",
-	"carraramassa.it",
-	"caserta.it",
-	"catania.it",
-	"catanzaro.it",
-	"cb.it",
-	"ce.it",
-	"cesena-forli.it",
-	"cesenaforli.it",
-	"ch.it",
-	"chieti.it",
-	"ci.it",
-	"cl.it",
-	"cn.it",
-	"co.it",
-	"como.it",
-	"cosenza.it",
-	"cr.it",
-	"cremona.it",
-	"crotone.it",
-	"cs.it",
-	"ct.it",
-	"cuneo.it",
-	"cz.it",
-	"dell-ogliastra.it",
-	"dellogliastra.it",
-	"en.it",
-	"enna.it",
-	"fc.it",
-	"fe.it",
-	"fermo.it",
-	"ferrara.it",
-	"fg.it",
-	"fi.it",
-	"firenze.it",
-	"florence.it",
-	"fm.it",
-	"foggia.it",
-	"forli-cesena.it",
-	"forlicesena.it",
-	"fr.it",
-	"frosinone.it",
-	"ge.it",
-	"genoa.it",
-	"genova.it",
-	"go.it",
-	"gorizia.it",
-	"gr.it",
-	"grosseto.it",
-	"iglesias-carbonia.it",
-	"iglesiascarbonia.it",
-	"im.it",
-	"imperia.it",
-	"is.it",
-	"isernia.it",
-	"kr.it",
-	"la-spezia.it",
-	"laquila.it",
-	"laspezia.it",
-	"latina.it",
-	"lc.it",
-	"le.it",
-	"lecce.it",
-	"lecco.it",
-	"li.it",
-	"livorno.it",
-	"lo.it",
-	"lodi.it",
-	"lt.it",
-	"lu.it",
-	"lucca.it",
-	"macerata.it",
-	"mantova.it",
-	"massa-carrara.it",
-	"massacarrara.it",
-	"matera.it",
-	"mb.it",
-	"mc.it",
-	"me.it",
-	"medio-campidano.it",
-	"mediocampidano.it",
-	"messina.it",
-	"mi.it",
-	"milan.it",
-	"milano.it",
-	"mn.it",
-	"mo.it",
-	"modena.it",
-	"monza-brianza.it",
-	"monza-e-della-brianza.it",
-	"monza.it",
-	"monzabrianza.it",
-	"monzaebrianza.it",
-	"monzaedellabrianza.it",
-	"ms.it",
-	"mt.it",
-	"na.it",
-	"naples.it",
-	"napoli.it",
-	"no.it",
-	"novara.it",
-	"nu.it",
-	"nuoro.it",
-	"og.it",
-	"ogliastra.it",
-	"olbia-tempio.it",
-	"olbiatempio.it",
-	"or.it",
-	"oristano.it",
-	"ot.it",
-	"pa.it",
-	"padova.it",
-	"padua.it",
-	"palermo.it",
-	"parma.it",
-	"pavia.it",
-	"pc.it",
-	"pd.it",
-	"pe.it",
-	"perugia.it",
-	"pesaro-urbino.it",
-	"pesarourbino.it",
-	"pescara.it",
-	"pg.it",
-	"pi.it",
-	"piacenza.it",
-	"pisa.it",
-	"pistoia.it",
-	"pn.it",
-	"po.it",
-	"pordenone.it",
-	"potenza.it",
-	"pr.it",
-	"prato.it",
-	"pt.it",
-	"pu.it",
-	"pv.it",
-	"pz.it",
-	"ra.it",
-	"ragusa.it",
-	"ravenna.it",
-	"rc.it",
-	"re.it",
-	"reggio-calabria.it",
-	"reggio-emilia.it",
-	"reggiocalabria.it",
-	"reggioemilia.it",
-	"rg.it",
-	"ri.it",
-	"rieti.it",
-	"rimini.it",
-	"rm.it",
-	"rn.it",
-	"ro.it",
-	"roma.it",
-	"rome.it",
-	"rovigo.it",
-	"sa.it",
-	"salerno.it",
-	"sassari.it",
-	"savona.it",
-	"si.it",
-	"siena.it",
-	"siracusa.it",
-	"so.it",
-	"sondrio.it",
-	"sp.it",
-	"sr.it",
-	"ss.it",
-	"suedtirol.it",
-	"sv.it",
-	"ta.it",
-	"taranto.it",
-	"te.it",
-	"tempio-olbia.it",
-	"tempioolbia.it",
-	"teramo.it",
-	"terni.it",
-	"tn.it",
-	"to.it",
-	"torino.it",
-	"tp.it",
-	"tr.it",
-	"trani-andria-barletta.it",
-	"trani-barletta-andria.it",
-	"traniandriabarletta.it",
-	"tranibarlettaandria.it",
-	"trapani.it",
-	"trentino.it",
-	"trento.it",
-	"treviso.it",
-	"trieste.it",
-	"ts.it",
-	"turin.it",
-	"tv.it",
-	"ud.it",
-	"udine.it",
-	"urbino-pesaro.it",
-	"urbinopesaro.it",
-	"va.it",
-	"varese.it",
-	"vb.it",
-	"vc.it",
-	"ve.it",
-	"venezia.it",
-	"venice.it",
-	"verbania.it",
-	"vercelli.it",
-	"verona.it",
-	"vi.it",
-	"vibo-valentia.it",
-	"vibovalentia.it",
-	"vicenza.it",
-	"viterbo.it",
-	"vr.it",
-	"vs.it",
-	"vt.it",
-	"vv.it",
-	"je",
-	"co.je",
-	"net.je",
-	"org.je",
-	"*.jm",
-	"jo",
-	"com.jo",
-	"org.jo",
-	"net.jo",
-	"edu.jo",
-	"sch.jo",
-	"gov.jo",
-	"mil.jo",
-	"name.jo",
-	"jobs",
-	"jp",
-	"ac.jp",
-	"ad.jp",
-	"co.jp",
-	"ed.jp",
-	"go.jp",
-	"gr.jp",
-	"lg.jp",
-	"ne.jp",
-	"or.jp",
-	"aichi.jp",
-	"akita.jp",
-	"aomori.jp",
-	"chiba.jp",
-	"ehime.jp",
-	"fukui.jp",
-	"fukuoka.jp",
-	"fukushima.jp",
-	"gifu.jp",
-	"gunma.jp",
-	"hiroshima.jp",
-	"hokkaido.jp",
-	"hyogo.jp",
-	"ibaraki.jp",
-	"ishikawa.jp",
-	"iwate.jp",
-	"kagawa.jp",
-	"kagoshima.jp",
-	"kanagawa.jp",
-	"kochi.jp",
-	"kumamoto.jp",
-	"kyoto.jp",
-	"mie.jp",
-	"miyagi.jp",
-	"miyazaki.jp",
-	"nagano.jp",
-	"nagasaki.jp",
-	"nara.jp",
-	"niigata.jp",
-	"oita.jp",
-	"okayama.jp",
-	"okinawa.jp",
-	"osaka.jp",
-	"saga.jp",
-	"saitama.jp",
-	"shiga.jp",
-	"shimane.jp",
-	"shizuoka.jp",
-	"tochigi.jp",
-	"tokushima.jp",
-	"tokyo.jp",
-	"tottori.jp",
-	"toyama.jp",
-	"wakayama.jp",
-	"yamagata.jp",
-	"yamaguchi.jp",
-	"yamanashi.jp",
-	"xn--4pvxs.jp",
-	"xn--vgu402c.jp",
-	"xn--c3s14m.jp",
-	"xn--f6qx53a.jp",
-	"xn--8pvr4u.jp",
-	"xn--uist22h.jp",
-	"xn--djrs72d6uy.jp",
-	"xn--mkru45i.jp",
-	"xn--0trq7p7nn.jp",
-	"xn--8ltr62k.jp",
-	"xn--2m4a15e.jp",
-	"xn--efvn9s.jp",
-	"xn--32vp30h.jp",
-	"xn--4it797k.jp",
-	"xn--1lqs71d.jp",
-	"xn--5rtp49c.jp",
-	"xn--5js045d.jp",
-	"xn--ehqz56n.jp",
-	"xn--1lqs03n.jp",
-	"xn--qqqt11m.jp",
-	"xn--kbrq7o.jp",
-	"xn--pssu33l.jp",
-	"xn--ntsq17g.jp",
-	"xn--uisz3g.jp",
-	"xn--6btw5a.jp",
-	"xn--1ctwo.jp",
-	"xn--6orx2r.jp",
-	"xn--rht61e.jp",
-	"xn--rht27z.jp",
-	"xn--djty4k.jp",
-	"xn--nit225k.jp",
-	"xn--rht3d.jp",
-	"xn--klty5x.jp",
-	"xn--kltx9a.jp",
-	"xn--kltp7d.jp",
-	"xn--uuwu58a.jp",
-	"xn--zbx025d.jp",
-	"xn--ntso0iqx3a.jp",
-	"xn--elqq16h.jp",
-	"xn--4it168d.jp",
-	"xn--klt787d.jp",
-	"xn--rny31h.jp",
-	"xn--7t0a264c.jp",
-	"xn--5rtq34k.jp",
-	"xn--k7yn95e.jp",
-	"xn--tor131o.jp",
-	"xn--d5qv7z876c.jp",
-	"*.kawasaki.jp",
-	"*.kitakyushu.jp",
-	"*.kobe.jp",
-	"*.nagoya.jp",
-	"*.sapporo.jp",
-	"*.sendai.jp",
-	"*.yokohama.jp",
-	"!city.kawasaki.jp",
-	"!city.kitakyushu.jp",
-	"!city.kobe.jp",
-	"!city.nagoya.jp",
-	"!city.sapporo.jp",
-	"!city.sendai.jp",
-	"!city.yokohama.jp",
-	"aisai.aichi.jp",
-	"ama.aichi.jp",
-	"anjo.aichi.jp",
-	"asuke.aichi.jp",
-	"chiryu.aichi.jp",
-	"chita.aichi.jp",
-	"fuso.aichi.jp",
-	"gamagori.aichi.jp",
-	"handa.aichi.jp",
-	"hazu.aichi.jp",
-	"hekinan.aichi.jp",
-	"higashiura.aichi.jp",
-	"ichinomiya.aichi.jp",
-	"inazawa.aichi.jp",
-	"inuyama.aichi.jp",
-	"isshiki.aichi.jp",
-	"iwakura.aichi.jp",
-	"kanie.aichi.jp",
-	"kariya.aichi.jp",
-	"kasugai.aichi.jp",
-	"kira.aichi.jp",
-	"kiyosu.aichi.jp",
-	"komaki.aichi.jp",
-	"konan.aichi.jp",
-	"kota.aichi.jp",
-	"mihama.aichi.jp",
-	"miyoshi.aichi.jp",
-	"nishio.aichi.jp",
-	"nisshin.aichi.jp",
-	"obu.aichi.jp",
-	"oguchi.aichi.jp",
-	"oharu.aichi.jp",
-	"okazaki.aichi.jp",
-	"owariasahi.aichi.jp",
-	"seto.aichi.jp",
-	"shikatsu.aichi.jp",
-	"shinshiro.aichi.jp",
-	"shitara.aichi.jp",
-	"tahara.aichi.jp",
-	"takahama.aichi.jp",
-	"tobishima.aichi.jp",
-	"toei.aichi.jp",
-	"togo.aichi.jp",
-	"tokai.aichi.jp",
-	"tokoname.aichi.jp",
-	"toyoake.aichi.jp",
-	"toyohashi.aichi.jp",
-	"toyokawa.aichi.jp",
-	"toyone.aichi.jp",
-	"toyota.aichi.jp",
-	"tsushima.aichi.jp",
-	"yatomi.aichi.jp",
-	"akita.akita.jp",
-	"daisen.akita.jp",
-	"fujisato.akita.jp",
-	"gojome.akita.jp",
-	"hachirogata.akita.jp",
-	"happou.akita.jp",
-	"higashinaruse.akita.jp",
-	"honjo.akita.jp",
-	"honjyo.akita.jp",
-	"ikawa.akita.jp",
-	"kamikoani.akita.jp",
-	"kamioka.akita.jp",
-	"katagami.akita.jp",
-	"kazuno.akita.jp",
-	"kitaakita.akita.jp",
-	"kosaka.akita.jp",
-	"kyowa.akita.jp",
-	"misato.akita.jp",
-	"mitane.akita.jp",
-	"moriyoshi.akita.jp",
-	"nikaho.akita.jp",
-	"noshiro.akita.jp",
-	"odate.akita.jp",
-	"oga.akita.jp",
-	"ogata.akita.jp",
-	"semboku.akita.jp",
-	"yokote.akita.jp",
-	"yurihonjo.akita.jp",
-	"aomori.aomori.jp",
-	"gonohe.aomori.jp",
-	"hachinohe.aomori.jp",
-	"hashikami.aomori.jp",
-	"hiranai.aomori.jp",
-	"hirosaki.aomori.jp",
-	"itayanagi.aomori.jp",
-	"kuroishi.aomori.jp",
-	"misawa.aomori.jp",
-	"mutsu.aomori.jp",
-	"nakadomari.aomori.jp",
-	"noheji.aomori.jp",
-	"oirase.aomori.jp",
-	"owani.aomori.jp",
-	"rokunohe.aomori.jp",
-	"sannohe.aomori.jp",
-	"shichinohe.aomori.jp",
-	"shingo.aomori.jp",
-	"takko.aomori.jp",
-	"towada.aomori.jp",
-	"tsugaru.aomori.jp",
-	"tsuruta.aomori.jp",
-	"abiko.chiba.jp",
-	"asahi.chiba.jp",
-	"chonan.chiba.jp",
-	"chosei.chiba.jp",
-	"choshi.chiba.jp",
-	"chuo.chiba.jp",
-	"funabashi.chiba.jp",
-	"futtsu.chiba.jp",
-	"hanamigawa.chiba.jp",
-	"ichihara.chiba.jp",
-	"ichikawa.chiba.jp",
-	"ichinomiya.chiba.jp",
-	"inzai.chiba.jp",
-	"isumi.chiba.jp",
-	"kamagaya.chiba.jp",
-	"kamogawa.chiba.jp",
-	"kashiwa.chiba.jp",
-	"katori.chiba.jp",
-	"katsuura.chiba.jp",
-	"kimitsu.chiba.jp",
-	"kisarazu.chiba.jp",
-	"kozaki.chiba.jp",
-	"kujukuri.chiba.jp",
-	"kyonan.chiba.jp",
-	"matsudo.chiba.jp",
-	"midori.chiba.jp",
-	"mihama.chiba.jp",
-	"minamiboso.chiba.jp",
-	"mobara.chiba.jp",
-	"mutsuzawa.chiba.jp",
-	"nagara.chiba.jp",
-	"nagareyama.chiba.jp",
-	"narashino.chiba.jp",
-	"narita.chiba.jp",
-	"noda.chiba.jp",
-	"oamishirasato.chiba.jp",
-	"omigawa.chiba.jp",
-	"onjuku.chiba.jp",
-	"otaki.chiba.jp",
-	"sakae.chiba.jp",
-	"sakura.chiba.jp",
-	"shimofusa.chiba.jp",
-	"shirako.chiba.jp",
-	"shiroi.chiba.jp",
-	"shisui.chiba.jp",
-	"sodegaura.chiba.jp",
-	"sosa.chiba.jp",
-	"tako.chiba.jp",
-	"tateyama.chiba.jp",
-	"togane.chiba.jp",
-	"tohnosho.chiba.jp",
-	"tomisato.chiba.jp",
-	"urayasu.chiba.jp",
-	"yachimata.chiba.jp",
-	"yachiyo.chiba.jp",
-	"yokaichiba.chiba.jp",
-	"yokoshibahikari.chiba.jp",
-	"yotsukaido.chiba.jp",
-	"ainan.ehime.jp",
-	"honai.ehime.jp",
-	"ikata.ehime.jp",
-	"imabari.ehime.jp",
-	"iyo.ehime.jp",
-	"kamijima.ehime.jp",
-	"kihoku.ehime.jp",
-	"kumakogen.ehime.jp",
-	"masaki.ehime.jp",
-	"matsuno.ehime.jp",
-	"matsuyama.ehime.jp",
-	"namikata.ehime.jp",
-	"niihama.ehime.jp",
-	"ozu.ehime.jp",
-	"saijo.ehime.jp",
-	"seiyo.ehime.jp",
-	"shikokuchuo.ehime.jp",
-	"tobe.ehime.jp",
-	"toon.ehime.jp",
-	"uchiko.ehime.jp",
-	"uwajima.ehime.jp",
-	"yawatahama.ehime.jp",
-	"echizen.fukui.jp",
-	"eiheiji.fukui.jp",
-	"fukui.fukui.jp",
-	"ikeda.fukui.jp",
-	"katsuyama.fukui.jp",
-	"mihama.fukui.jp",
-	"minamiechizen.fukui.jp",
-	"obama.fukui.jp",
-	"ohi.fukui.jp",
-	"ono.fukui.jp",
-	"sabae.fukui.jp",
-	"sakai.fukui.jp",
-	"takahama.fukui.jp",
-	"tsuruga.fukui.jp",
-	"wakasa.fukui.jp",
-	"ashiya.fukuoka.jp",
-	"buzen.fukuoka.jp",
-	"chikugo.fukuoka.jp",
-	"chikuho.fukuoka.jp",
-	"chikujo.fukuoka.jp",
-	"chikushino.fukuoka.jp",
-	"chikuzen.fukuoka.jp",
-	"chuo.fukuoka.jp",
-	"dazaifu.fukuoka.jp",
-	"fukuchi.fukuoka.jp",
-	"hakata.fukuoka.jp",
-	"higashi.fukuoka.jp",
-	"hirokawa.fukuoka.jp",
-	"hisayama.fukuoka.jp",
-	"iizuka.fukuoka.jp",
-	"inatsuki.fukuoka.jp",
-	"kaho.fukuoka.jp",
-	"kasuga.fukuoka.jp",
-	"kasuya.fukuoka.jp",
-	"kawara.fukuoka.jp",
-	"keisen.fukuoka.jp",
-	"koga.fukuoka.jp",
-	"kurate.fukuoka.jp",
-	"kurogi.fukuoka.jp",
-	"kurume.fukuoka.jp",
-	"minami.fukuoka.jp",
-	"miyako.fukuoka.jp",
-	"miyama.fukuoka.jp",
-	"miyawaka.fukuoka.jp",
-	"mizumaki.fukuoka.jp",
-	"munakata.fukuoka.jp",
-	"nakagawa.fukuoka.jp",
-	"nakama.fukuoka.jp",
-	"nishi.fukuoka.jp",
-	"nogata.fukuoka.jp",
-	"ogori.fukuoka.jp",
-	"okagaki.fukuoka.jp",
-	"okawa.fukuoka.jp",
-	"oki.fukuoka.jp",
-	"omuta.fukuoka.jp",
-	"onga.fukuoka.jp",
-	"onojo.fukuoka.jp",
-	"oto.fukuoka.jp",
-	"saigawa.fukuoka.jp",
-	"sasaguri.fukuoka.jp",
-	"shingu.fukuoka.jp",
-	"shinyoshitomi.fukuoka.jp",
-	"shonai.fukuoka.jp",
-	"soeda.fukuoka.jp",
-	"sue.fukuoka.jp",
-	"tachiarai.fukuoka.jp",
-	"tagawa.fukuoka.jp",
-	"takata.fukuoka.jp",
-	"toho.fukuoka.jp",
-	"toyotsu.fukuoka.jp",
-	"tsuiki.fukuoka.jp",
-	"ukiha.fukuoka.jp",
-	"umi.fukuoka.jp",
-	"usui.fukuoka.jp",
-	"yamada.fukuoka.jp",
-	"yame.fukuoka.jp",
-	"yanagawa.fukuoka.jp",
-	"yukuhashi.fukuoka.jp",
-	"aizubange.fukushima.jp",
-	"aizumisato.fukushima.jp",
-	"aizuwakamatsu.fukushima.jp",
-	"asakawa.fukushima.jp",
-	"bandai.fukushima.jp",
-	"date.fukushima.jp",
-	"fukushima.fukushima.jp",
-	"furudono.fukushima.jp",
-	"futaba.fukushima.jp",
-	"hanawa.fukushima.jp",
-	"higashi.fukushima.jp",
-	"hirata.fukushima.jp",
-	"hirono.fukushima.jp",
-	"iitate.fukushima.jp",
-	"inawashiro.fukushima.jp",
-	"ishikawa.fukushima.jp",
-	"iwaki.fukushima.jp",
-	"izumizaki.fukushima.jp",
-	"kagamiishi.fukushima.jp",
-	"kaneyama.fukushima.jp",
-	"kawamata.fukushima.jp",
-	"kitakata.fukushima.jp",
-	"kitashiobara.fukushima.jp",
-	"koori.fukushima.jp",
-	"koriyama.fukushima.jp",
-	"kunimi.fukushima.jp",
-	"miharu.fukushima.jp",
-	"mishima.fukushima.jp",
-	"namie.fukushima.jp",
-	"nango.fukushima.jp",
-	"nishiaizu.fukushima.jp",
-	"nishigo.fukushima.jp",
-	"okuma.fukushima.jp",
-	"omotego.fukushima.jp",
-	"ono.fukushima.jp",
-	"otama.fukushima.jp",
-	"samegawa.fukushima.jp",
-	"shimogo.fukushima.jp",
-	"shirakawa.fukushima.jp",
-	"showa.fukushima.jp",
-	"soma.fukushima.jp",
-	"sukagawa.fukushima.jp",
-	"taishin.fukushima.jp",
-	"tamakawa.fukushima.jp",
-	"tanagura.fukushima.jp",
-	"tenei.fukushima.jp",
-	"yabuki.fukushima.jp",
-	"yamato.fukushima.jp",
-	"yamatsuri.fukushima.jp",
-	"yanaizu.fukushima.jp",
-	"yugawa.fukushima.jp",
-	"anpachi.gifu.jp",
-	"ena.gifu.jp",
-	"gifu.gifu.jp",
-	"ginan.gifu.jp",
-	"godo.gifu.jp",
-	"gujo.gifu.jp",
-	"hashima.gifu.jp",
-	"hichiso.gifu.jp",
-	"hida.gifu.jp",
-	"higashishirakawa.gifu.jp",
-	"ibigawa.gifu.jp",
-	"ikeda.gifu.jp",
-	"kakamigahara.gifu.jp",
-	"kani.gifu.jp",
-	"kasahara.gifu.jp",
-	"kasamatsu.gifu.jp",
-	"kawaue.gifu.jp",
-	"kitagata.gifu.jp",
-	"mino.gifu.jp",
-	"minokamo.gifu.jp",
-	"mitake.gifu.jp",
-	"mizunami.gifu.jp",
-	"motosu.gifu.jp",
-	"nakatsugawa.gifu.jp",
-	"ogaki.gifu.jp",
-	"sakahogi.gifu.jp",
-	"seki.gifu.jp",
-	"sekigahara.gifu.jp",
-	"shirakawa.gifu.jp",
-	"tajimi.gifu.jp",
-	"takayama.gifu.jp",
-	"tarui.gifu.jp",
-	"toki.gifu.jp",
-	"tomika.gifu.jp",
-	"wanouchi.gifu.jp",
-	"yamagata.gifu.jp",
-	"yaotsu.gifu.jp",
-	"yoro.gifu.jp",
-	"annaka.gunma.jp",
-	"chiyoda.gunma.jp",
-	"fujioka.gunma.jp",
-	"higashiagatsuma.gunma.jp",
-	"isesaki.gunma.jp",
-	"itakura.gunma.jp",
-	"kanna.gunma.jp",
-	"kanra.gunma.jp",
-	"katashina.gunma.jp",
-	"kawaba.gunma.jp",
-	"kiryu.gunma.jp",
-	"kusatsu.gunma.jp",
-	"maebashi.gunma.jp",
-	"meiwa.gunma.jp",
-	"midori.gunma.jp",
-	"minakami.gunma.jp",
-	"naganohara.gunma.jp",
-	"nakanojo.gunma.jp",
-	"nanmoku.gunma.jp",
-	"numata.gunma.jp",
-	"oizumi.gunma.jp",
-	"ora.gunma.jp",
-	"ota.gunma.jp",
-	"shibukawa.gunma.jp",
-	"shimonita.gunma.jp",
-	"shinto.gunma.jp",
-	"showa.gunma.jp",
-	"takasaki.gunma.jp",
-	"takayama.gunma.jp",
-	"tamamura.gunma.jp",
-	"tatebayashi.gunma.jp",
-	"tomioka.gunma.jp",
-	"tsukiyono.gunma.jp",
-	"tsumagoi.gunma.jp",
-	"ueno.gunma.jp",
-	"yoshioka.gunma.jp",
-	"asaminami.hiroshima.jp",
-	"daiwa.hiroshima.jp",
-	"etajima.hiroshima.jp",
-	"fuchu.hiroshima.jp",
-	"fukuyama.hiroshima.jp",
-	"hatsukaichi.hiroshima.jp",
-	"higashihiroshima.hiroshima.jp",
-	"hongo.hiroshima.jp",
-	"jinsekikogen.hiroshima.jp",
-	"kaita.hiroshima.jp",
-	"kui.hiroshima.jp",
-	"kumano.hiroshima.jp",
-	"kure.hiroshima.jp",
-	"mihara.hiroshima.jp",
-	"miyoshi.hiroshima.jp",
-	"naka.hiroshima.jp",
-	"onomichi.hiroshima.jp",
-	"osakikamijima.hiroshima.jp",
-	"otake.hiroshima.jp",
-	"saka.hiroshima.jp",
-	"sera.hiroshima.jp",
-	"seranishi.hiroshima.jp",
-	"shinichi.hiroshima.jp",
-	"shobara.hiroshima.jp",
-	"takehara.hiroshima.jp",
-	"abashiri.hokkaido.jp",
-	"abira.hokkaido.jp",
-	"aibetsu.hokkaido.jp",
-	"akabira.hokkaido.jp",
-	"akkeshi.hokkaido.jp",
-	"asahikawa.hokkaido.jp",
-	"ashibetsu.hokkaido.jp",
-	"ashoro.hokkaido.jp",
-	"assabu.hokkaido.jp",
-	"atsuma.hokkaido.jp",
-	"bibai.hokkaido.jp",
-	"biei.hokkaido.jp",
-	"bifuka.hokkaido.jp",
-	"bihoro.hokkaido.jp",
-	"biratori.hokkaido.jp",
-	"chippubetsu.hokkaido.jp",
-	"chitose.hokkaido.jp",
-	"date.hokkaido.jp",
-	"ebetsu.hokkaido.jp",
-	"embetsu.hokkaido.jp",
-	"eniwa.hokkaido.jp",
-	"erimo.hokkaido.jp",
-	"esan.hokkaido.jp",
-	"esashi.hokkaido.jp",
-	"fukagawa.hokkaido.jp",
-	"fukushima.hokkaido.jp",
-	"furano.hokkaido.jp",
-	"furubira.hokkaido.jp",
-	"haboro.hokkaido.jp",
-	"hakodate.hokkaido.jp",
-	"hamatonbetsu.hokkaido.jp",
-	"hidaka.hokkaido.jp",
-	"higashikagura.hokkaido.jp",
-	"higashikawa.hokkaido.jp",
-	"hiroo.hokkaido.jp",
-	"hokuryu.hokkaido.jp",
-	"hokuto.hokkaido.jp",
-	"honbetsu.hokkaido.jp",
-	"horokanai.hokkaido.jp",
-	"horonobe.hokkaido.jp",
-	"ikeda.hokkaido.jp",
-	"imakane.hokkaido.jp",
-	"ishikari.hokkaido.jp",
-	"iwamizawa.hokkaido.jp",
-	"iwanai.hokkaido.jp",
-	"kamifurano.hokkaido.jp",
-	"kamikawa.hokkaido.jp",
-	"kamishihoro.hokkaido.jp",
-	"kamisunagawa.hokkaido.jp",
-	"kamoenai.hokkaido.jp",
-	"kayabe.hokkaido.jp",
-	"kembuchi.hokkaido.jp",
-	"kikonai.hokkaido.jp",
-	"kimobetsu.hokkaido.jp",
-	"kitahiroshima.hokkaido.jp",
-	"kitami.hokkaido.jp",
-	"kiyosato.hokkaido.jp",
-	"koshimizu.hokkaido.jp",
-	"kunneppu.hokkaido.jp",
-	"kuriyama.hokkaido.jp",
-	"kuromatsunai.hokkaido.jp",
-	"kushiro.hokkaido.jp",
-	"kutchan.hokkaido.jp",
-	"kyowa.hokkaido.jp",
-	"mashike.hokkaido.jp",
-	"matsumae.hokkaido.jp",
-	"mikasa.hokkaido.jp",
-	"minamifurano.hokkaido.jp",
-	"mombetsu.hokkaido.jp",
-	"moseushi.hokkaido.jp",
-	"mukawa.hokkaido.jp",
-	"muroran.hokkaido.jp",
-	"naie.hokkaido.jp",
-	"nakagawa.hokkaido.jp",
-	"nakasatsunai.hokkaido.jp",
-	"nakatombetsu.hokkaido.jp",
-	"nanae.hokkaido.jp",
-	"nanporo.hokkaido.jp",
-	"nayoro.hokkaido.jp",
-	"nemuro.hokkaido.jp",
-	"niikappu.hokkaido.jp",
-	"niki.hokkaido.jp",
-	"nishiokoppe.hokkaido.jp",
-	"noboribetsu.hokkaido.jp",
-	"numata.hokkaido.jp",
-	"obihiro.hokkaido.jp",
-	"obira.hokkaido.jp",
-	"oketo.hokkaido.jp",
-	"okoppe.hokkaido.jp",
-	"otaru.hokkaido.jp",
-	"otobe.hokkaido.jp",
-	"otofuke.hokkaido.jp",
-	"otoineppu.hokkaido.jp",
-	"oumu.hokkaido.jp",
-	"ozora.hokkaido.jp",
-	"pippu.hokkaido.jp",
-	"rankoshi.hokkaido.jp",
-	"rebun.hokkaido.jp",
-	"rikubetsu.hokkaido.jp",
-	"rishiri.hokkaido.jp",
-	"rishirifuji.hokkaido.jp",
-	"saroma.hokkaido.jp",
-	"sarufutsu.hokkaido.jp",
-	"shakotan.hokkaido.jp",
-	"shari.hokkaido.jp",
-	"shibecha.hokkaido.jp",
-	"shibetsu.hokkaido.jp",
-	"shikabe.hokkaido.jp",
-	"shikaoi.hokkaido.jp",
-	"shimamaki.hokkaido.jp",
-	"shimizu.hokkaido.jp",
-	"shimokawa.hokkaido.jp",
-	"shinshinotsu.hokkaido.jp",
-	"shintoku.hokkaido.jp",
-	"shiranuka.hokkaido.jp",
-	"shiraoi.hokkaido.jp",
-	"shiriuchi.hokkaido.jp",
-	"sobetsu.hokkaido.jp",
-	"sunagawa.hokkaido.jp",
-	"taiki.hokkaido.jp",
-	"takasu.hokkaido.jp",
-	"takikawa.hokkaido.jp",
-	"takinoue.hokkaido.jp",
-	"teshikaga.hokkaido.jp",
-	"tobetsu.hokkaido.jp",
-	"tohma.hokkaido.jp",
-	"tomakomai.hokkaido.jp",
-	"tomari.hokkaido.jp",
-	"toya.hokkaido.jp",
-	"toyako.hokkaido.jp",
-	"toyotomi.hokkaido.jp",
-	"toyoura.hokkaido.jp",
-	"tsubetsu.hokkaido.jp",
-	"tsukigata.hokkaido.jp",
-	"urakawa.hokkaido.jp",
-	"urausu.hokkaido.jp",
-	"uryu.hokkaido.jp",
-	"utashinai.hokkaido.jp",
-	"wakkanai.hokkaido.jp",
-	"wassamu.hokkaido.jp",
-	"yakumo.hokkaido.jp",
-	"yoichi.hokkaido.jp",
-	"aioi.hyogo.jp",
-	"akashi.hyogo.jp",
-	"ako.hyogo.jp",
-	"amagasaki.hyogo.jp",
-	"aogaki.hyogo.jp",
-	"asago.hyogo.jp",
-	"ashiya.hyogo.jp",
-	"awaji.hyogo.jp",
-	"fukusaki.hyogo.jp",
-	"goshiki.hyogo.jp",
-	"harima.hyogo.jp",
-	"himeji.hyogo.jp",
-	"ichikawa.hyogo.jp",
-	"inagawa.hyogo.jp",
-	"itami.hyogo.jp",
-	"kakogawa.hyogo.jp",
-	"kamigori.hyogo.jp",
-	"kamikawa.hyogo.jp",
-	"kasai.hyogo.jp",
-	"kasuga.hyogo.jp",
-	"kawanishi.hyogo.jp",
-	"miki.hyogo.jp",
-	"minamiawaji.hyogo.jp",
-	"nishinomiya.hyogo.jp",
-	"nishiwaki.hyogo.jp",
-	"ono.hyogo.jp",
-	"sanda.hyogo.jp",
-	"sannan.hyogo.jp",
-	"sasayama.hyogo.jp",
-	"sayo.hyogo.jp",
-	"shingu.hyogo.jp",
-	"shinonsen.hyogo.jp",
-	"shiso.hyogo.jp",
-	"sumoto.hyogo.jp",
-	"taishi.hyogo.jp",
-	"taka.hyogo.jp",
-	"takarazuka.hyogo.jp",
-	"takasago.hyogo.jp",
-	"takino.hyogo.jp",
-	"tamba.hyogo.jp",
-	"tatsuno.hyogo.jp",
-	"toyooka.hyogo.jp",
-	"yabu.hyogo.jp",
-	"yashiro.hyogo.jp",
-	"yoka.hyogo.jp",
-	"yokawa.hyogo.jp",
-	"ami.ibaraki.jp",
-	"asahi.ibaraki.jp",
-	"bando.ibaraki.jp",
-	"chikusei.ibaraki.jp",
-	"daigo.ibaraki.jp",
-	"fujishiro.ibaraki.jp",
-	"hitachi.ibaraki.jp",
-	"hitachinaka.ibaraki.jp",
-	"hitachiomiya.ibaraki.jp",
-	"hitachiota.ibaraki.jp",
-	"ibaraki.ibaraki.jp",
-	"ina.ibaraki.jp",
-	"inashiki.ibaraki.jp",
-	"itako.ibaraki.jp",
-	"iwama.ibaraki.jp",
-	"joso.ibaraki.jp",
-	"kamisu.ibaraki.jp",
-	"kasama.ibaraki.jp",
-	"kashima.ibaraki.jp",
-	"kasumigaura.ibaraki.jp",
-	"koga.ibaraki.jp",
-	"miho.ibaraki.jp",
-	"mito.ibaraki.jp",
-	"moriya.ibaraki.jp",
-	"naka.ibaraki.jp",
-	"namegata.ibaraki.jp",
-	"oarai.ibaraki.jp",
-	"ogawa.ibaraki.jp",
-	"omitama.ibaraki.jp",
-	"ryugasaki.ibaraki.jp",
-	"sakai.ibaraki.jp",
-	"sakuragawa.ibaraki.jp",
-	"shimodate.ibaraki.jp",
-	"shimotsuma.ibaraki.jp",
-	"shirosato.ibaraki.jp",
-	"sowa.ibaraki.jp",
-	"suifu.ibaraki.jp",
-	"takahagi.ibaraki.jp",
-	"tamatsukuri.ibaraki.jp",
-	"tokai.ibaraki.jp",
-	"tomobe.ibaraki.jp",
-	"tone.ibaraki.jp",
-	"toride.ibaraki.jp",
-	"tsuchiura.ibaraki.jp",
-	"tsukuba.ibaraki.jp",
-	"uchihara.ibaraki.jp",
-	"ushiku.ibaraki.jp",
-	"yachiyo.ibaraki.jp",
-	"yamagata.ibaraki.jp",
-	"yawara.ibaraki.jp",
-	"yuki.ibaraki.jp",
-	"anamizu.ishikawa.jp",
-	"hakui.ishikawa.jp",
-	"hakusan.ishikawa.jp",
-	"kaga.ishikawa.jp",
-	"kahoku.ishikawa.jp",
-	"kanazawa.ishikawa.jp",
-	"kawakita.ishikawa.jp",
-	"komatsu.ishikawa.jp",
-	"nakanoto.ishikawa.jp",
-	"nanao.ishikawa.jp",
-	"nomi.ishikawa.jp",
-	"nonoichi.ishikawa.jp",
-	"noto.ishikawa.jp",
-	"shika.ishikawa.jp",
-	"suzu.ishikawa.jp",
-	"tsubata.ishikawa.jp",
-	"tsurugi.ishikawa.jp",
-	"uchinada.ishikawa.jp",
-	"wajima.ishikawa.jp",
-	"fudai.iwate.jp",
-	"fujisawa.iwate.jp",
-	"hanamaki.iwate.jp",
-	"hiraizumi.iwate.jp",
-	"hirono.iwate.jp",
-	"ichinohe.iwate.jp",
-	"ichinoseki.iwate.jp",
-	"iwaizumi.iwate.jp",
-	"iwate.iwate.jp",
-	"joboji.iwate.jp",
-	"kamaishi.iwate.jp",
-	"kanegasaki.iwate.jp",
-	"karumai.iwate.jp",
-	"kawai.iwate.jp",
-	"kitakami.iwate.jp",
-	"kuji.iwate.jp",
-	"kunohe.iwate.jp",
-	"kuzumaki.iwate.jp",
-	"miyako.iwate.jp",
-	"mizusawa.iwate.jp",
-	"morioka.iwate.jp",
-	"ninohe.iwate.jp",
-	"noda.iwate.jp",
-	"ofunato.iwate.jp",
-	"oshu.iwate.jp",
-	"otsuchi.iwate.jp",
-	"rikuzentakata.iwate.jp",
-	"shiwa.iwate.jp",
-	"shizukuishi.iwate.jp",
-	"sumita.iwate.jp",
-	"tanohata.iwate.jp",
-	"tono.iwate.jp",
-	"yahaba.iwate.jp",
-	"yamada.iwate.jp",
-	"ayagawa.kagawa.jp",
-	"higashikagawa.kagawa.jp",
-	"kanonji.kagawa.jp",
-	"kotohira.kagawa.jp",
-	"manno.kagawa.jp",
-	"marugame.kagawa.jp",
-	"mitoyo.kagawa.jp",
-	"naoshima.kagawa.jp",
-	"sanuki.kagawa.jp",
-	"tadotsu.kagawa.jp",
-	"takamatsu.kagawa.jp",
-	"tonosho.kagawa.jp",
-	"uchinomi.kagawa.jp",
-	"utazu.kagawa.jp",
-	"zentsuji.kagawa.jp",
-	"akune.kagoshima.jp",
-	"amami.kagoshima.jp",
-	"hioki.kagoshima.jp",
-	"isa.kagoshima.jp",
-	"isen.kagoshima.jp",
-	"izumi.kagoshima.jp",
-	"kagoshima.kagoshima.jp",
-	"kanoya.kagoshima.jp",
-	"kawanabe.kagoshima.jp",
-	"kinko.kagoshima.jp",
-	"kouyama.kagoshima.jp",
-	"makurazaki.kagoshima.jp",
-	"matsumoto.kagoshima.jp",
-	"minamitane.kagoshima.jp",
-	"nakatane.kagoshima.jp",
-	"nishinoomote.kagoshima.jp",
-	"satsumasendai.kagoshima.jp",
-	"soo.kagoshima.jp",
-	"tarumizu.kagoshima.jp",
-	"yusui.kagoshima.jp",
-	"aikawa.kanagawa.jp",
-	"atsugi.kanagawa.jp",
-	"ayase.kanagawa.jp",
-	"chigasaki.kanagawa.jp",
-	"ebina.kanagawa.jp",
-	"fujisawa.kanagawa.jp",
-	"hadano.kanagawa.jp",
-	"hakone.kanagawa.jp",
-	"hiratsuka.kanagawa.jp",
-	"isehara.kanagawa.jp",
-	"kaisei.kanagawa.jp",
-	"kamakura.kanagawa.jp",
-	"kiyokawa.kanagawa.jp",
-	"matsuda.kanagawa.jp",
-	"minamiashigara.kanagawa.jp",
-	"miura.kanagawa.jp",
-	"nakai.kanagawa.jp",
-	"ninomiya.kanagawa.jp",
-	"odawara.kanagawa.jp",
-	"oi.kanagawa.jp",
-	"oiso.kanagawa.jp",
-	"sagamihara.kanagawa.jp",
-	"samukawa.kanagawa.jp",
-	"tsukui.kanagawa.jp",
-	"yamakita.kanagawa.jp",
-	"yamato.kanagawa.jp",
-	"yokosuka.kanagawa.jp",
-	"yugawara.kanagawa.jp",
-	"zama.kanagawa.jp",
-	"zushi.kanagawa.jp",
-	"aki.kochi.jp",
-	"geisei.kochi.jp",
-	"hidaka.kochi.jp",
-	"higashitsuno.kochi.jp",
-	"ino.kochi.jp",
-	"kagami.kochi.jp",
-	"kami.kochi.jp",
-	"kitagawa.kochi.jp",
-	"kochi.kochi.jp",
-	"mihara.kochi.jp",
-	"motoyama.kochi.jp",
-	"muroto.kochi.jp",
-	"nahari.kochi.jp",
-	"nakamura.kochi.jp",
-	"nankoku.kochi.jp",
-	"nishitosa.kochi.jp",
-	"niyodogawa.kochi.jp",
-	"ochi.kochi.jp",
-	"okawa.kochi.jp",
-	"otoyo.kochi.jp",
-	"otsuki.kochi.jp",
-	"sakawa.kochi.jp",
-	"sukumo.kochi.jp",
-	"susaki.kochi.jp",
-	"tosa.kochi.jp",
-	"tosashimizu.kochi.jp",
-	"toyo.kochi.jp",
-	"tsuno.kochi.jp",
-	"umaji.kochi.jp",
-	"yasuda.kochi.jp",
-	"yusuhara.kochi.jp",
-	"amakusa.kumamoto.jp",
-	"arao.kumamoto.jp",
-	"aso.kumamoto.jp",
-	"choyo.kumamoto.jp",
-	"gyokuto.kumamoto.jp",
-	"kamiamakusa.kumamoto.jp",
-	"kikuchi.kumamoto.jp",
-	"kumamoto.kumamoto.jp",
-	"mashiki.kumamoto.jp",
-	"mifune.kumamoto.jp",
-	"minamata.kumamoto.jp",
-	"minamioguni.kumamoto.jp",
-	"nagasu.kumamoto.jp",
-	"nishihara.kumamoto.jp",
-	"oguni.kumamoto.jp",
-	"ozu.kumamoto.jp",
-	"sumoto.kumamoto.jp",
-	"takamori.kumamoto.jp",
-	"uki.kumamoto.jp",
-	"uto.kumamoto.jp",
-	"yamaga.kumamoto.jp",
-	"yamato.kumamoto.jp",
-	"yatsushiro.kumamoto.jp",
-	"ayabe.kyoto.jp",
-	"fukuchiyama.kyoto.jp",
-	"higashiyama.kyoto.jp",
-	"ide.kyoto.jp",
-	"ine.kyoto.jp",
-	"joyo.kyoto.jp",
-	"kameoka.kyoto.jp",
-	"kamo.kyoto.jp",
-	"kita.kyoto.jp",
-	"kizu.kyoto.jp",
-	"kumiyama.kyoto.jp",
-	"kyotamba.kyoto.jp",
-	"kyotanabe.kyoto.jp",
-	"kyotango.kyoto.jp",
-	"maizuru.kyoto.jp",
-	"minami.kyoto.jp",
-	"minamiyamashiro.kyoto.jp",
-	"miyazu.kyoto.jp",
-	"muko.kyoto.jp",
-	"nagaokakyo.kyoto.jp",
-	"nakagyo.kyoto.jp",
-	"nantan.kyoto.jp",
-	"oyamazaki.kyoto.jp",
-	"sakyo.kyoto.jp",
-	"seika.kyoto.jp",
-	"tanabe.kyoto.jp",
-	"uji.kyoto.jp",
-	"ujitawara.kyoto.jp",
-	"wazuka.kyoto.jp",
-	"yamashina.kyoto.jp",
-	"yawata.kyoto.jp",
-	"asahi.mie.jp",
-	"inabe.mie.jp",
-	"ise.mie.jp",
-	"kameyama.mie.jp",
-	"kawagoe.mie.jp",
-	"kiho.mie.jp",
-	"kisosaki.mie.jp",
-	"kiwa.mie.jp",
-	"komono.mie.jp",
-	"kumano.mie.jp",
-	"kuwana.mie.jp",
-	"matsusaka.mie.jp",
-	"meiwa.mie.jp",
-	"mihama.mie.jp",
-	"minamiise.mie.jp",
-	"misugi.mie.jp",
-	"miyama.mie.jp",
-	"nabari.mie.jp",
-	"shima.mie.jp",
-	"suzuka.mie.jp",
-	"tado.mie.jp",
-	"taiki.mie.jp",
-	"taki.mie.jp",
-	"tamaki.mie.jp",
-	"toba.mie.jp",
-	"tsu.mie.jp",
-	"udono.mie.jp",
-	"ureshino.mie.jp",
-	"watarai.mie.jp",
-	"yokkaichi.mie.jp",
-	"furukawa.miyagi.jp",
-	"higashimatsushima.miyagi.jp",
-	"ishinomaki.miyagi.jp",
-	"iwanuma.miyagi.jp",
-	"kakuda.miyagi.jp",
-	"kami.miyagi.jp",
-	"kawasaki.miyagi.jp",
-	"marumori.miyagi.jp",
-	"matsushima.miyagi.jp",
-	"minamisanriku.miyagi.jp",
-	"misato.miyagi.jp",
-	"murata.miyagi.jp",
-	"natori.miyagi.jp",
-	"ogawara.miyagi.jp",
-	"ohira.miyagi.jp",
-	"onagawa.miyagi.jp",
-	"osaki.miyagi.jp",
-	"rifu.miyagi.jp",
-	"semine.miyagi.jp",
-	"shibata.miyagi.jp",
-	"shichikashuku.miyagi.jp",
-	"shikama.miyagi.jp",
-	"shiogama.miyagi.jp",
-	"shiroishi.miyagi.jp",
-	"tagajo.miyagi.jp",
-	"taiwa.miyagi.jp",
-	"tome.miyagi.jp",
-	"tomiya.miyagi.jp",
-	"wakuya.miyagi.jp",
-	"watari.miyagi.jp",
-	"yamamoto.miyagi.jp",
-	"zao.miyagi.jp",
-	"aya.miyazaki.jp",
-	"ebino.miyazaki.jp",
-	"gokase.miyazaki.jp",
-	"hyuga.miyazaki.jp",
-	"kadogawa.miyazaki.jp",
-	"kawaminami.miyazaki.jp",
-	"kijo.miyazaki.jp",
-	"kitagawa.miyazaki.jp",
-	"kitakata.miyazaki.jp",
-	"kitaura.miyazaki.jp",
-	"kobayashi.miyazaki.jp",
-	"kunitomi.miyazaki.jp",
-	"kushima.miyazaki.jp",
-	"mimata.miyazaki.jp",
-	"miyakonojo.miyazaki.jp",
-	"miyazaki.miyazaki.jp",
-	"morotsuka.miyazaki.jp",
-	"nichinan.miyazaki.jp",
-	"nishimera.miyazaki.jp",
-	"nobeoka.miyazaki.jp",
-	"saito.miyazaki.jp",
-	"shiiba.miyazaki.jp",
-	"shintomi.miyazaki.jp",
-	"takaharu.miyazaki.jp",
-	"takanabe.miyazaki.jp",
-	"takazaki.miyazaki.jp",
-	"tsuno.miyazaki.jp",
-	"achi.nagano.jp",
-	"agematsu.nagano.jp",
-	"anan.nagano.jp",
-	"aoki.nagano.jp",
-	"asahi.nagano.jp",
-	"azumino.nagano.jp",
-	"chikuhoku.nagano.jp",
-	"chikuma.nagano.jp",
-	"chino.nagano.jp",
-	"fujimi.nagano.jp",
-	"hakuba.nagano.jp",
-	"hara.nagano.jp",
-	"hiraya.nagano.jp",
-	"iida.nagano.jp",
-	"iijima.nagano.jp",
-	"iiyama.nagano.jp",
-	"iizuna.nagano.jp",
-	"ikeda.nagano.jp",
-	"ikusaka.nagano.jp",
-	"ina.nagano.jp",
-	"karuizawa.nagano.jp",
-	"kawakami.nagano.jp",
-	"kiso.nagano.jp",
-	"kisofukushima.nagano.jp",
-	"kitaaiki.nagano.jp",
-	"komagane.nagano.jp",
-	"komoro.nagano.jp",
-	"matsukawa.nagano.jp",
-	"matsumoto.nagano.jp",
-	"miasa.nagano.jp",
-	"minamiaiki.nagano.jp",
-	"minamimaki.nagano.jp",
-	"minamiminowa.nagano.jp",
-	"minowa.nagano.jp",
-	"miyada.nagano.jp",
-	"miyota.nagano.jp",
-	"mochizuki.nagano.jp",
-	"nagano.nagano.jp",
-	"nagawa.nagano.jp",
-	"nagiso.nagano.jp",
-	"nakagawa.nagano.jp",
-	"nakano.nagano.jp",
-	"nozawaonsen.nagano.jp",
-	"obuse.nagano.jp",
-	"ogawa.nagano.jp",
-	"okaya.nagano.jp",
-	"omachi.nagano.jp",
-	"omi.nagano.jp",
-	"ookuwa.nagano.jp",
-	"ooshika.nagano.jp",
-	"otaki.nagano.jp",
-	"otari.nagano.jp",
-	"sakae.nagano.jp",
-	"sakaki.nagano.jp",
-	"saku.nagano.jp",
-	"sakuho.nagano.jp",
-	"shimosuwa.nagano.jp",
-	"shinanomachi.nagano.jp",
-	"shiojiri.nagano.jp",
-	"suwa.nagano.jp",
-	"suzaka.nagano.jp",
-	"takagi.nagano.jp",
-	"takamori.nagano.jp",
-	"takayama.nagano.jp",
-	"tateshina.nagano.jp",
-	"tatsuno.nagano.jp",
-	"togakushi.nagano.jp",
-	"togura.nagano.jp",
-	"tomi.nagano.jp",
-	"ueda.nagano.jp",
-	"wada.nagano.jp",
-	"yamagata.nagano.jp",
-	"yamanouchi.nagano.jp",
-	"yasaka.nagano.jp",
-	"yasuoka.nagano.jp",
-	"chijiwa.nagasaki.jp",
-	"futsu.nagasaki.jp",
-	"goto.nagasaki.jp",
-	"hasami.nagasaki.jp",
-	"hirado.nagasaki.jp",
-	"iki.nagasaki.jp",
-	"isahaya.nagasaki.jp",
-	"kawatana.nagasaki.jp",
-	"kuchinotsu.nagasaki.jp",
-	"matsuura.nagasaki.jp",
-	"nagasaki.nagasaki.jp",
-	"obama.nagasaki.jp",
-	"omura.nagasaki.jp",
-	"oseto.nagasaki.jp",
-	"saikai.nagasaki.jp",
-	"sasebo.nagasaki.jp",
-	"seihi.nagasaki.jp",
-	"shimabara.nagasaki.jp",
-	"shinkamigoto.nagasaki.jp",
-	"togitsu.nagasaki.jp",
-	"tsushima.nagasaki.jp",
-	"unzen.nagasaki.jp",
-	"ando.nara.jp",
-	"gose.nara.jp",
-	"heguri.nara.jp",
-	"higashiyoshino.nara.jp",
-	"ikaruga.nara.jp",
-	"ikoma.nara.jp",
-	"kamikitayama.nara.jp",
-	"kanmaki.nara.jp",
-	"kashiba.nara.jp",
-	"kashihara.nara.jp",
-	"katsuragi.nara.jp",
-	"kawai.nara.jp",
-	"kawakami.nara.jp",
-	"kawanishi.nara.jp",
-	"koryo.nara.jp",
-	"kurotaki.nara.jp",
-	"mitsue.nara.jp",
-	"miyake.nara.jp",
-	"nara.nara.jp",
-	"nosegawa.nara.jp",
-	"oji.nara.jp",
-	"ouda.nara.jp",
-	"oyodo.nara.jp",
-	"sakurai.nara.jp",
-	"sango.nara.jp",
-	"shimoichi.nara.jp",
-	"shimokitayama.nara.jp",
-	"shinjo.nara.jp",
-	"soni.nara.jp",
-	"takatori.nara.jp",
-	"tawaramoto.nara.jp",
-	"tenkawa.nara.jp",
-	"tenri.nara.jp",
-	"uda.nara.jp",
-	"yamatokoriyama.nara.jp",
-	"yamatotakada.nara.jp",
-	"yamazoe.nara.jp",
-	"yoshino.nara.jp",
-	"aga.niigata.jp",
-	"agano.niigata.jp",
-	"gosen.niigata.jp",
-	"itoigawa.niigata.jp",
-	"izumozaki.niigata.jp",
-	"joetsu.niigata.jp",
-	"kamo.niigata.jp",
-	"kariwa.niigata.jp",
-	"kashiwazaki.niigata.jp",
-	"minamiuonuma.niigata.jp",
-	"mitsuke.niigata.jp",
-	"muika.niigata.jp",
-	"murakami.niigata.jp",
-	"myoko.niigata.jp",
-	"nagaoka.niigata.jp",
-	"niigata.niigata.jp",
-	"ojiya.niigata.jp",
-	"omi.niigata.jp",
-	"sado.niigata.jp",
-	"sanjo.niigata.jp",
-	"seiro.niigata.jp",
-	"seirou.niigata.jp",
-	"sekikawa.niigata.jp",
-	"shibata.niigata.jp",
-	"tagami.niigata.jp",
-	"tainai.niigata.jp",
-	"tochio.niigata.jp",
-	"tokamachi.niigata.jp",
-	"tsubame.niigata.jp",
-	"tsunan.niigata.jp",
-	"uonuma.niigata.jp",
-	"yahiko.niigata.jp",
-	"yoita.niigata.jp",
-	"yuzawa.niigata.jp",
-	"beppu.oita.jp",
-	"bungoono.oita.jp",
-	"bungotakada.oita.jp",
-	"hasama.oita.jp",
-	"hiji.oita.jp",
-	"himeshima.oita.jp",
-	"hita.oita.jp",
-	"kamitsue.oita.jp",
-	"kokonoe.oita.jp",
-	"kuju.oita.jp",
-	"kunisaki.oita.jp",
-	"kusu.oita.jp",
-	"oita.oita.jp",
-	"saiki.oita.jp",
-	"taketa.oita.jp",
-	"tsukumi.oita.jp",
-	"usa.oita.jp",
-	"usuki.oita.jp",
-	"yufu.oita.jp",
-	"akaiwa.okayama.jp",
-	"asakuchi.okayama.jp",
-	"bizen.okayama.jp",
-	"hayashima.okayama.jp",
-	"ibara.okayama.jp",
-	"kagamino.okayama.jp",
-	"kasaoka.okayama.jp",
-	"kibichuo.okayama.jp",
-	"kumenan.okayama.jp",
-	"kurashiki.okayama.jp",
-	"maniwa.okayama.jp",
-	"misaki.okayama.jp",
-	"nagi.okayama.jp",
-	"niimi.okayama.jp",
-	"nishiawakura.okayama.jp",
-	"okayama.okayama.jp",
-	"satosho.okayama.jp",
-	"setouchi.okayama.jp",
-	"shinjo.okayama.jp",
-	"shoo.okayama.jp",
-	"soja.okayama.jp",
-	"takahashi.okayama.jp",
-	"tamano.okayama.jp",
-	"tsuyama.okayama.jp",
-	"wake.okayama.jp",
-	"yakage.okayama.jp",
-	"aguni.okinawa.jp",
-	"ginowan.okinawa.jp",
-	"ginoza.okinawa.jp",
-	"gushikami.okinawa.jp",
-	"haebaru.okinawa.jp",
-	"higashi.okinawa.jp",
-	"hirara.okinawa.jp",
-	"iheya.okinawa.jp",
-	"ishigaki.okinawa.jp",
-	"ishikawa.okinawa.jp",
-	"itoman.okinawa.jp",
-	"izena.okinawa.jp",
-	"kadena.okinawa.jp",
-	"kin.okinawa.jp",
-	"kitadaito.okinawa.jp",
-	"kitanakagusuku.okinawa.jp",
-	"kumejima.okinawa.jp",
-	"kunigami.okinawa.jp",
-	"minamidaito.okinawa.jp",
-	"motobu.okinawa.jp",
-	"nago.okinawa.jp",
-	"naha.okinawa.jp",
-	"nakagusuku.okinawa.jp",
-	"nakijin.okinawa.jp",
-	"nanjo.okinawa.jp",
-	"nishihara.okinawa.jp",
-	"ogimi.okinawa.jp",
-	"okinawa.okinawa.jp",
-	"onna.okinawa.jp",
-	"shimoji.okinawa.jp",
-	"taketomi.okinawa.jp",
-	"tarama.okinawa.jp",
-	"tokashiki.okinawa.jp",
-	"tomigusuku.okinawa.jp",
-	"tonaki.okinawa.jp",
-	"urasoe.okinawa.jp",
-	"uruma.okinawa.jp",
-	"yaese.okinawa.jp",
-	"yomitan.okinawa.jp",
-	"yonabaru.okinawa.jp",
-	"yonaguni.okinawa.jp",
-	"zamami.okinawa.jp",
-	"abeno.osaka.jp",
-	"chihayaakasaka.osaka.jp",
-	"chuo.osaka.jp",
-	"daito.osaka.jp",
-	"fujiidera.osaka.jp",
-	"habikino.osaka.jp",
-	"hannan.osaka.jp",
-	"higashiosaka.osaka.jp",
-	"higashisumiyoshi.osaka.jp",
-	"higashiyodogawa.osaka.jp",
-	"hirakata.osaka.jp",
-	"ibaraki.osaka.jp",
-	"ikeda.osaka.jp",
-	"izumi.osaka.jp",
-	"izumiotsu.osaka.jp",
-	"izumisano.osaka.jp",
-	"kadoma.osaka.jp",
-	"kaizuka.osaka.jp",
-	"kanan.osaka.jp",
-	"kashiwara.osaka.jp",
-	"katano.osaka.jp",
-	"kawachinagano.osaka.jp",
-	"kishiwada.osaka.jp",
-	"kita.osaka.jp",
-	"kumatori.osaka.jp",
-	"matsubara.osaka.jp",
-	"minato.osaka.jp",
-	"minoh.osaka.jp",
-	"misaki.osaka.jp",
-	"moriguchi.osaka.jp",
-	"neyagawa.osaka.jp",
-	"nishi.osaka.jp",
-	"nose.osaka.jp",
-	"osakasayama.osaka.jp",
-	"sakai.osaka.jp",
-	"sayama.osaka.jp",
-	"sennan.osaka.jp",
-	"settsu.osaka.jp",
-	"shijonawate.osaka.jp",
-	"shimamoto.osaka.jp",
-	"suita.osaka.jp",
-	"tadaoka.osaka.jp",
-	"taishi.osaka.jp",
-	"tajiri.osaka.jp",
-	"takaishi.osaka.jp",
-	"takatsuki.osaka.jp",
-	"tondabayashi.osaka.jp",
-	"toyonaka.osaka.jp",
-	"toyono.osaka.jp",
-	"yao.osaka.jp",
-	"ariake.saga.jp",
-	"arita.saga.jp",
-	"fukudomi.saga.jp",
-	"genkai.saga.jp",
-	"hamatama.saga.jp",
-	"hizen.saga.jp",
-	"imari.saga.jp",
-	"kamimine.saga.jp",
-	"kanzaki.saga.jp",
-	"karatsu.saga.jp",
-	"kashima.saga.jp",
-	"kitagata.saga.jp",
-	"kitahata.saga.jp",
-	"kiyama.saga.jp",
-	"kouhoku.saga.jp",
-	"kyuragi.saga.jp",
-	"nishiarita.saga.jp",
-	"ogi.saga.jp",
-	"omachi.saga.jp",
-	"ouchi.saga.jp",
-	"saga.saga.jp",
-	"shiroishi.saga.jp",
-	"taku.saga.jp",
-	"tara.saga.jp",
-	"tosu.saga.jp",
-	"yoshinogari.saga.jp",
-	"arakawa.saitama.jp",
-	"asaka.saitama.jp",
-	"chichibu.saitama.jp",
-	"fujimi.saitama.jp",
-	"fujimino.saitama.jp",
-	"fukaya.saitama.jp",
-	"hanno.saitama.jp",
-	"hanyu.saitama.jp",
-	"hasuda.saitama.jp",
-	"hatogaya.saitama.jp",
-	"hatoyama.saitama.jp",
-	"hidaka.saitama.jp",
-	"higashichichibu.saitama.jp",
-	"higashimatsuyama.saitama.jp",
-	"honjo.saitama.jp",
-	"ina.saitama.jp",
-	"iruma.saitama.jp",
-	"iwatsuki.saitama.jp",
-	"kamiizumi.saitama.jp",
-	"kamikawa.saitama.jp",
-	"kamisato.saitama.jp",
-	"kasukabe.saitama.jp",
-	"kawagoe.saitama.jp",
-	"kawaguchi.saitama.jp",
-	"kawajima.saitama.jp",
-	"kazo.saitama.jp",
-	"kitamoto.saitama.jp",
-	"koshigaya.saitama.jp",
-	"kounosu.saitama.jp",
-	"kuki.saitama.jp",
-	"kumagaya.saitama.jp",
-	"matsubushi.saitama.jp",
-	"minano.saitama.jp",
-	"misato.saitama.jp",
-	"miyashiro.saitama.jp",
-	"miyoshi.saitama.jp",
-	"moroyama.saitama.jp",
-	"nagatoro.saitama.jp",
-	"namegawa.saitama.jp",
-	"niiza.saitama.jp",
-	"ogano.saitama.jp",
-	"ogawa.saitama.jp",
-	"ogose.saitama.jp",
-	"okegawa.saitama.jp",
-	"omiya.saitama.jp",
-	"otaki.saitama.jp",
-	"ranzan.saitama.jp",
-	"ryokami.saitama.jp",
-	"saitama.saitama.jp",
-	"sakado.saitama.jp",
-	"satte.saitama.jp",
-	"sayama.saitama.jp",
-	"shiki.saitama.jp",
-	"shiraoka.saitama.jp",
-	"soka.saitama.jp",
-	"sugito.saitama.jp",
-	"toda.saitama.jp",
-	"tokigawa.saitama.jp",
-	"tokorozawa.saitama.jp",
-	"tsurugashima.saitama.jp",
-	"urawa.saitama.jp",
-	"warabi.saitama.jp",
-	"yashio.saitama.jp",
-	"yokoze.saitama.jp",
-	"yono.saitama.jp",
-	"yorii.saitama.jp",
-	"yoshida.saitama.jp",
-	"yoshikawa.saitama.jp",
-	"yoshimi.saitama.jp",
-	"aisho.shiga.jp",
-	"gamo.shiga.jp",
-	"higashiomi.shiga.jp",
-	"hikone.shiga.jp",
-	"koka.shiga.jp",
-	"konan.shiga.jp",
-	"kosei.shiga.jp",
-	"koto.shiga.jp",
-	"kusatsu.shiga.jp",
-	"maibara.shiga.jp",
-	"moriyama.shiga.jp",
-	"nagahama.shiga.jp",
-	"nishiazai.shiga.jp",
-	"notogawa.shiga.jp",
-	"omihachiman.shiga.jp",
-	"otsu.shiga.jp",
-	"ritto.shiga.jp",
-	"ryuoh.shiga.jp",
-	"takashima.shiga.jp",
-	"takatsuki.shiga.jp",
-	"torahime.shiga.jp",
-	"toyosato.shiga.jp",
-	"yasu.shiga.jp",
-	"akagi.shimane.jp",
-	"ama.shimane.jp",
-	"gotsu.shimane.jp",
-	"hamada.shimane.jp",
-	"higashiizumo.shimane.jp",
-	"hikawa.shimane.jp",
-	"hikimi.shimane.jp",
-	"izumo.shimane.jp",
-	"kakinoki.shimane.jp",
-	"masuda.shimane.jp",
-	"matsue.shimane.jp",
-	"misato.shimane.jp",
-	"nishinoshima.shimane.jp",
-	"ohda.shimane.jp",
-	"okinoshima.shimane.jp",
-	"okuizumo.shimane.jp",
-	"shimane.shimane.jp",
-	"tamayu.shimane.jp",
-	"tsuwano.shimane.jp",
-	"unnan.shimane.jp",
-	"yakumo.shimane.jp",
-	"yasugi.shimane.jp",
-	"yatsuka.shimane.jp",
-	"arai.shizuoka.jp",
-	"atami.shizuoka.jp",
-	"fuji.shizuoka.jp",
-	"fujieda.shizuoka.jp",
-	"fujikawa.shizuoka.jp",
-	"fujinomiya.shizuoka.jp",
-	"fukuroi.shizuoka.jp",
-	"gotemba.shizuoka.jp",
-	"haibara.shizuoka.jp",
-	"hamamatsu.shizuoka.jp",
-	"higashiizu.shizuoka.jp",
-	"ito.shizuoka.jp",
-	"iwata.shizuoka.jp",
-	"izu.shizuoka.jp",
-	"izunokuni.shizuoka.jp",
-	"kakegawa.shizuoka.jp",
-	"kannami.shizuoka.jp",
-	"kawanehon.shizuoka.jp",
-	"kawazu.shizuoka.jp",
-	"kikugawa.shizuoka.jp",
-	"kosai.shizuoka.jp",
-	"makinohara.shizuoka.jp",
-	"matsuzaki.shizuoka.jp",
-	"minamiizu.shizuoka.jp",
-	"mishima.shizuoka.jp",
-	"morimachi.shizuoka.jp",
-	"nishiizu.shizuoka.jp",
-	"numazu.shizuoka.jp",
-	"omaezaki.shizuoka.jp",
-	"shimada.shizuoka.jp",
-	"shimizu.shizuoka.jp",
-	"shimoda.shizuoka.jp",
-	"shizuoka.shizuoka.jp",
-	"susono.shizuoka.jp",
-	"yaizu.shizuoka.jp",
-	"yoshida.shizuoka.jp",
-	"ashikaga.tochigi.jp",
-	"bato.tochigi.jp",
-	"haga.tochigi.jp",
-	"ichikai.tochigi.jp",
-	"iwafune.tochigi.jp",
-	"kaminokawa.tochigi.jp",
-	"kanuma.tochigi.jp",
-	"karasuyama.tochigi.jp",
-	"kuroiso.tochigi.jp",
-	"mashiko.tochigi.jp",
-	"mibu.tochigi.jp",
-	"moka.tochigi.jp",
-	"motegi.tochigi.jp",
-	"nasu.tochigi.jp",
-	"nasushiobara.tochigi.jp",
-	"nikko.tochigi.jp",
-	"nishikata.tochigi.jp",
-	"nogi.tochigi.jp",
-	"ohira.tochigi.jp",
-	"ohtawara.tochigi.jp",
-	"oyama.tochigi.jp",
-	"sakura.tochigi.jp",
-	"sano.tochigi.jp",
-	"shimotsuke.tochigi.jp",
-	"shioya.tochigi.jp",
-	"takanezawa.tochigi.jp",
-	"tochigi.tochigi.jp",
-	"tsuga.tochigi.jp",
-	"ujiie.tochigi.jp",
-	"utsunomiya.tochigi.jp",
-	"yaita.tochigi.jp",
-	"aizumi.tokushima.jp",
-	"anan.tokushima.jp",
-	"ichiba.tokushima.jp",
-	"itano.tokushima.jp",
-	"kainan.tokushima.jp",
-	"komatsushima.tokushima.jp",
-	"matsushige.tokushima.jp",
-	"mima.tokushima.jp",
-	"minami.tokushima.jp",
-	"miyoshi.tokushima.jp",
-	"mugi.tokushima.jp",
-	"nakagawa.tokushima.jp",
-	"naruto.tokushima.jp",
-	"sanagochi.tokushima.jp",
-	"shishikui.tokushima.jp",
-	"tokushima.tokushima.jp",
-	"wajiki.tokushima.jp",
-	"adachi.tokyo.jp",
-	"akiruno.tokyo.jp",
-	"akishima.tokyo.jp",
-	"aogashima.tokyo.jp",
-	"arakawa.tokyo.jp",
-	"bunkyo.tokyo.jp",
-	"chiyoda.tokyo.jp",
-	"chofu.tokyo.jp",
-	"chuo.tokyo.jp",
-	"edogawa.tokyo.jp",
-	"fuchu.tokyo.jp",
-	"fussa.tokyo.jp",
-	"hachijo.tokyo.jp",
-	"hachioji.tokyo.jp",
-	"hamura.tokyo.jp",
-	"higashikurume.tokyo.jp",
-	"higashimurayama.tokyo.jp",
-	"higashiyamato.tokyo.jp",
-	"hino.tokyo.jp",
-	"hinode.tokyo.jp",
-	"hinohara.tokyo.jp",
-	"inagi.tokyo.jp",
-	"itabashi.tokyo.jp",
-	"katsushika.tokyo.jp",
-	"kita.tokyo.jp",
-	"kiyose.tokyo.jp",
-	"kodaira.tokyo.jp",
-	"koganei.tokyo.jp",
-	"kokubunji.tokyo.jp",
-	"komae.tokyo.jp",
-	"koto.tokyo.jp",
-	"kouzushima.tokyo.jp",
-	"kunitachi.tokyo.jp",
-	"machida.tokyo.jp",
-	"meguro.tokyo.jp",
-	"minato.tokyo.jp",
-	"mitaka.tokyo.jp",
-	"mizuho.tokyo.jp",
-	"musashimurayama.tokyo.jp",
-	"musashino.tokyo.jp",
-	"nakano.tokyo.jp",
-	"nerima.tokyo.jp",
-	"ogasawara.tokyo.jp",
-	"okutama.tokyo.jp",
-	"ome.tokyo.jp",
-	"oshima.tokyo.jp",
-	"ota.tokyo.jp",
-	"setagaya.tokyo.jp",
-	"shibuya.tokyo.jp",
-	"shinagawa.tokyo.jp",
-	"shinjuku.tokyo.jp",
-	"suginami.tokyo.jp",
-	"sumida.tokyo.jp",
-	"tachikawa.tokyo.jp",
-	"taito.tokyo.jp",
-	"tama.tokyo.jp",
-	"toshima.tokyo.jp",
-	"chizu.tottori.jp",
-	"hino.tottori.jp",
-	"kawahara.tottori.jp",
-	"koge.tottori.jp",
-	"kotoura.tottori.jp",
-	"misasa.tottori.jp",
-	"nanbu.tottori.jp",
-	"nichinan.tottori.jp",
-	"sakaiminato.tottori.jp",
-	"tottori.tottori.jp",
-	"wakasa.tottori.jp",
-	"yazu.tottori.jp",
-	"yonago.tottori.jp",
-	"asahi.toyama.jp",
-	"fuchu.toyama.jp",
-	"fukumitsu.toyama.jp",
-	"funahashi.toyama.jp",
-	"himi.toyama.jp",
-	"imizu.toyama.jp",
-	"inami.toyama.jp",
-	"johana.toyama.jp",
-	"kamiichi.toyama.jp",
-	"kurobe.toyama.jp",
-	"nakaniikawa.toyama.jp",
-	"namerikawa.toyama.jp",
-	"nanto.toyama.jp",
-	"nyuzen.toyama.jp",
-	"oyabe.toyama.jp",
-	"taira.toyama.jp",
-	"takaoka.toyama.jp",
-	"tateyama.toyama.jp",
-	"toga.toyama.jp",
-	"tonami.toyama.jp",
-	"toyama.toyama.jp",
-	"unazuki.toyama.jp",
-	"uozu.toyama.jp",
-	"yamada.toyama.jp",
-	"arida.wakayama.jp",
-	"aridagawa.wakayama.jp",
-	"gobo.wakayama.jp",
-	"hashimoto.wakayama.jp",
-	"hidaka.wakayama.jp",
-	"hirogawa.wakayama.jp",
-	"inami.wakayama.jp",
-	"iwade.wakayama.jp",
-	"kainan.wakayama.jp",
-	"kamitonda.wakayama.jp",
-	"katsuragi.wakayama.jp",
-	"kimino.wakayama.jp",
-	"kinokawa.wakayama.jp",
-	"kitayama.wakayama.jp",
-	"koya.wakayama.jp",
-	"koza.wakayama.jp",
-	"kozagawa.wakayama.jp",
-	"kudoyama.wakayama.jp",
-	"kushimoto.wakayama.jp",
-	"mihama.wakayama.jp",
-	"misato.wakayama.jp",
-	"nachikatsuura.wakayama.jp",
-	"shingu.wakayama.jp",
-	"shirahama.wakayama.jp",
-	"taiji.wakayama.jp",
-	"tanabe.wakayama.jp",
-	"wakayama.wakayama.jp",
-	"yuasa.wakayama.jp",
-	"yura.wakayama.jp",
-	"asahi.yamagata.jp",
-	"funagata.yamagata.jp",
-	"higashine.yamagata.jp",
-	"iide.yamagata.jp",
-	"kahoku.yamagata.jp",
-	"kaminoyama.yamagata.jp",
-	"kaneyama.yamagata.jp",
-	"kawanishi.yamagata.jp",
-	"mamurogawa.yamagata.jp",
-	"mikawa.yamagata.jp",
-	"murayama.yamagata.jp",
-	"nagai.yamagata.jp",
-	"nakayama.yamagata.jp",
-	"nanyo.yamagata.jp",
-	"nishikawa.yamagata.jp",
-	"obanazawa.yamagata.jp",
-	"oe.yamagata.jp",
-	"oguni.yamagata.jp",
-	"ohkura.yamagata.jp",
-	"oishida.yamagata.jp",
-	"sagae.yamagata.jp",
-	"sakata.yamagata.jp",
-	"sakegawa.yamagata.jp",
-	"shinjo.yamagata.jp",
-	"shirataka.yamagata.jp",
-	"shonai.yamagata.jp",
-	"takahata.yamagata.jp",
-	"tendo.yamagata.jp",
-	"tozawa.yamagata.jp",
-	"tsuruoka.yamagata.jp",
-	"yamagata.yamagata.jp",
-	"yamanobe.yamagata.jp",
-	"yonezawa.yamagata.jp",
-	"yuza.yamagata.jp",
-	"abu.yamaguchi.jp",
-	"hagi.yamaguchi.jp",
-	"hikari.yamaguchi.jp",
-	"hofu.yamaguchi.jp",
-	"iwakuni.yamaguchi.jp",
-	"kudamatsu.yamaguchi.jp",
-	"mitou.yamaguchi.jp",
-	"nagato.yamaguchi.jp",
-	"oshima.yamaguchi.jp",
-	"shimonoseki.yamaguchi.jp",
-	"shunan.yamaguchi.jp",
-	"tabuse.yamaguchi.jp",
-	"tokuyama.yamaguchi.jp",
-	"toyota.yamaguchi.jp",
-	"ube.yamaguchi.jp",
-	"yuu.yamaguchi.jp",
-	"chuo.yamanashi.jp",
-	"doshi.yamanashi.jp",
-	"fuefuki.yamanashi.jp",
-	"fujikawa.yamanashi.jp",
-	"fujikawaguchiko.yamanashi.jp",
-	"fujiyoshida.yamanashi.jp",
-	"hayakawa.yamanashi.jp",
-	"hokuto.yamanashi.jp",
-	"ichikawamisato.yamanashi.jp",
-	"kai.yamanashi.jp",
-	"kofu.yamanashi.jp",
-	"koshu.yamanashi.jp",
-	"kosuge.yamanashi.jp",
-	"minami-alps.yamanashi.jp",
-	"minobu.yamanashi.jp",
-	"nakamichi.yamanashi.jp",
-	"nanbu.yamanashi.jp",
-	"narusawa.yamanashi.jp",
-	"nirasaki.yamanashi.jp",
-	"nishikatsura.yamanashi.jp",
-	"oshino.yamanashi.jp",
-	"otsuki.yamanashi.jp",
-	"showa.yamanashi.jp",
-	"tabayama.yamanashi.jp",
-	"tsuru.yamanashi.jp",
-	"uenohara.yamanashi.jp",
-	"yamanakako.yamanashi.jp",
-	"yamanashi.yamanashi.jp",
-	"*.ke",
-	"kg",
-	"org.kg",
-	"net.kg",
-	"com.kg",
-	"edu.kg",
-	"gov.kg",
-	"mil.kg",
-	"*.kh",
-	"ki",
-	"edu.ki",
-	"biz.ki",
-	"net.ki",
-	"org.ki",
-	"gov.ki",
-	"info.ki",
-	"com.ki",
-	"km",
-	"org.km",
-	"nom.km",
-	"gov.km",
-	"prd.km",
-	"tm.km",
-	"edu.km",
-	"mil.km",
-	"ass.km",
-	"com.km",
-	"coop.km",
-	"asso.km",
-	"presse.km",
-	"medecin.km",
-	"notaires.km",
-	"pharmaciens.km",
-	"veterinaire.km",
-	"gouv.km",
-	"kn",
-	"net.kn",
-	"org.kn",
-	"edu.kn",
-	"gov.kn",
-	"kp",
-	"com.kp",
-	"edu.kp",
-	"gov.kp",
-	"org.kp",
-	"rep.kp",
-	"tra.kp",
-	"kr",
-	"ac.kr",
-	"co.kr",
-	"es.kr",
-	"go.kr",
-	"hs.kr",
-	"kg.kr",
-	"mil.kr",
-	"ms.kr",
-	"ne.kr",
-	"or.kr",
-	"pe.kr",
-	"re.kr",
-	"sc.kr",
-	"busan.kr",
-	"chungbuk.kr",
-	"chungnam.kr",
-	"daegu.kr",
-	"daejeon.kr",
-	"gangwon.kr",
-	"gwangju.kr",
-	"gyeongbuk.kr",
-	"gyeonggi.kr",
-	"gyeongnam.kr",
-	"incheon.kr",
-	"jeju.kr",
-	"jeonbuk.kr",
-	"jeonnam.kr",
-	"seoul.kr",
-	"ulsan.kr",
-	"*.kw",
-	"ky",
-	"edu.ky",
-	"gov.ky",
-	"com.ky",
-	"org.ky",
-	"net.ky",
-	"kz",
-	"org.kz",
-	"edu.kz",
-	"net.kz",
-	"gov.kz",
-	"mil.kz",
-	"com.kz",
-	"la",
-	"int.la",
-	"net.la",
-	"info.la",
-	"edu.la",
-	"gov.la",
-	"per.la",
-	"com.la",
-	"org.la",
-	"lb",
-	"com.lb",
-	"edu.lb",
-	"gov.lb",
-	"net.lb",
-	"org.lb",
-	"lc",
-	"com.lc",
-	"net.lc",
-	"co.lc",
-	"org.lc",
-	"edu.lc",
-	"gov.lc",
-	"li",
-	"lk",
-	"gov.lk",
-	"sch.lk",
-	"net.lk",
-	"int.lk",
-	"com.lk",
-	"org.lk",
-	"edu.lk",
-	"ngo.lk",
-	"soc.lk",
-	"web.lk",
-	"ltd.lk",
-	"assn.lk",
-	"grp.lk",
-	"hotel.lk",
-	"ac.lk",
-	"lr",
-	"com.lr",
-	"edu.lr",
-	"gov.lr",
-	"org.lr",
-	"net.lr",
-	"ls",
-	"co.ls",
-	"org.ls",
-	"lt",
-	"gov.lt",
-	"lu",
-	"lv",
-	"com.lv",
-	"edu.lv",
-	"gov.lv",
-	"org.lv",
-	"mil.lv",
-	"id.lv",
-	"net.lv",
-	"asn.lv",
-	"conf.lv",
-	"ly",
-	"com.ly",
-	"net.ly",
-	"gov.ly",
-	"plc.ly",
-	"edu.ly",
-	"sch.ly",
-	"med.ly",
-	"org.ly",
-	"id.ly",
-	"ma",
-	"co.ma",
-	"net.ma",
-	"gov.ma",
-	"org.ma",
-	"ac.ma",
-	"press.ma",
-	"mc",
-	"tm.mc",
-	"asso.mc",
-	"md",
-	"me",
-	"co.me",
-	"net.me",
-	"org.me",
-	"edu.me",
-	"ac.me",
-	"gov.me",
-	"its.me",
-	"priv.me",
-	"mg",
-	"org.mg",
-	"nom.mg",
-	"gov.mg",
-	"prd.mg",
-	"tm.mg",
-	"edu.mg",
-	"mil.mg",
-	"com.mg",
-	"co.mg",
-	"mh",
-	"mil",
-	"mk",
-	"com.mk",
-	"org.mk",
-	"net.mk",
-	"edu.mk",
-	"gov.mk",
-	"inf.mk",
-	"name.mk",
-	"ml",
-	"com.ml",
-	"edu.ml",
-	"gouv.ml",
-	"gov.ml",
-	"net.ml",
-	"org.ml",
-	"presse.ml",
-	"*.mm",
-	"mn",
-	"gov.mn",
-	"edu.mn",
-	"org.mn",
-	"mo",
-	"com.mo",
-	"net.mo",
-	"org.mo",
-	"edu.mo",
-	"gov.mo",
-	"mobi",
-	"mp",
-	"mq",
-	"mr",
-	"gov.mr",
-	"ms",
-	"com.ms",
-	"edu.ms",
-	"gov.ms",
-	"net.ms",
-	"org.ms",
-	"mt",
-	"com.mt",
-	"edu.mt",
-	"net.mt",
-	"org.mt",
-	"mu",
-	"com.mu",
-	"net.mu",
-	"org.mu",
-	"gov.mu",
-	"ac.mu",
-	"co.mu",
-	"or.mu",
-	"museum",
-	"academy.museum",
-	"agriculture.museum",
-	"air.museum",
-	"airguard.museum",
-	"alabama.museum",
-	"alaska.museum",
-	"amber.museum",
-	"ambulance.museum",
-	"american.museum",
-	"americana.museum",
-	"americanantiques.museum",
-	"americanart.museum",
-	"amsterdam.museum",
-	"and.museum",
-	"annefrank.museum",
-	"anthro.museum",
-	"anthropology.museum",
-	"antiques.museum",
-	"aquarium.museum",
-	"arboretum.museum",
-	"archaeological.museum",
-	"archaeology.museum",
-	"architecture.museum",
-	"art.museum",
-	"artanddesign.museum",
-	"artcenter.museum",
-	"artdeco.museum",
-	"arteducation.museum",
-	"artgallery.museum",
-	"arts.museum",
-	"artsandcrafts.museum",
-	"asmatart.museum",
-	"assassination.museum",
-	"assisi.museum",
-	"association.museum",
-	"astronomy.museum",
-	"atlanta.museum",
-	"austin.museum",
-	"australia.museum",
-	"automotive.museum",
-	"aviation.museum",
-	"axis.museum",
-	"badajoz.museum",
-	"baghdad.museum",
-	"bahn.museum",
-	"bale.museum",
-	"baltimore.museum",
-	"barcelona.museum",
-	"baseball.museum",
-	"basel.museum",
-	"baths.museum",
-	"bauern.museum",
-	"beauxarts.museum",
-	"beeldengeluid.museum",
-	"bellevue.museum",
-	"bergbau.museum",
-	"berkeley.museum",
-	"berlin.museum",
-	"bern.museum",
-	"bible.museum",
-	"bilbao.museum",
-	"bill.museum",
-	"birdart.museum",
-	"birthplace.museum",
-	"bonn.museum",
-	"boston.museum",
-	"botanical.museum",
-	"botanicalgarden.museum",
-	"botanicgarden.museum",
-	"botany.museum",
-	"brandywinevalley.museum",
-	"brasil.museum",
-	"bristol.museum",
-	"british.museum",
-	"britishcolumbia.museum",
-	"broadcast.museum",
-	"brunel.museum",
-	"brussel.museum",
-	"brussels.museum",
-	"bruxelles.museum",
-	"building.museum",
-	"burghof.museum",
-	"bus.museum",
-	"bushey.museum",
-	"cadaques.museum",
-	"california.museum",
-	"cambridge.museum",
-	"can.museum",
-	"canada.museum",
-	"capebreton.museum",
-	"carrier.museum",
-	"cartoonart.museum",
-	"casadelamoneda.museum",
-	"castle.museum",
-	"castres.museum",
-	"celtic.museum",
-	"center.museum",
-	"chattanooga.museum",
-	"cheltenham.museum",
-	"chesapeakebay.museum",
-	"chicago.museum",
-	"children.museum",
-	"childrens.museum",
-	"childrensgarden.museum",
-	"chiropractic.museum",
-	"chocolate.museum",
-	"christiansburg.museum",
-	"cincinnati.museum",
-	"cinema.museum",
-	"circus.museum",
-	"civilisation.museum",
-	"civilization.museum",
-	"civilwar.museum",
-	"clinton.museum",
-	"clock.museum",
-	"coal.museum",
-	"coastaldefence.museum",
-	"cody.museum",
-	"coldwar.museum",
-	"collection.museum",
-	"colonialwilliamsburg.museum",
-	"coloradoplateau.museum",
-	"columbia.museum",
-	"columbus.museum",
-	"communication.museum",
-	"communications.museum",
-	"community.museum",
-	"computer.museum",
-	"computerhistory.museum",
-	"xn--comunicaes-v6a2o.museum",
-	"contemporary.museum",
-	"contemporaryart.museum",
-	"convent.museum",
-	"copenhagen.museum",
-	"corporation.museum",
-	"xn--correios-e-telecomunicaes-ghc29a.museum",
-	"corvette.museum",
-	"costume.museum",
-	"countryestate.museum",
-	"county.museum",
-	"crafts.museum",
-	"cranbrook.museum",
-	"creation.museum",
-	"cultural.museum",
-	"culturalcenter.museum",
-	"culture.museum",
-	"cyber.museum",
-	"cymru.museum",
-	"dali.museum",
-	"dallas.museum",
-	"database.museum",
-	"ddr.museum",
-	"decorativearts.museum",
-	"delaware.museum",
-	"delmenhorst.museum",
-	"denmark.museum",
-	"depot.museum",
-	"design.museum",
-	"detroit.museum",
-	"dinosaur.museum",
-	"discovery.museum",
-	"dolls.museum",
-	"donostia.museum",
-	"durham.museum",
-	"eastafrica.museum",
-	"eastcoast.museum",
-	"education.museum",
-	"educational.museum",
-	"egyptian.museum",
-	"eisenbahn.museum",
-	"elburg.museum",
-	"elvendrell.museum",
-	"embroidery.museum",
-	"encyclopedic.museum",
-	"england.museum",
-	"entomology.museum",
-	"environment.museum",
-	"environmentalconservation.museum",
-	"epilepsy.museum",
-	"essex.museum",
-	"estate.museum",
-	"ethnology.museum",
-	"exeter.museum",
-	"exhibition.museum",
-	"family.museum",
-	"farm.museum",
-	"farmequipment.museum",
-	"farmers.museum",
-	"farmstead.museum",
-	"field.museum",
-	"figueres.museum",
-	"filatelia.museum",
-	"film.museum",
-	"fineart.museum",
-	"finearts.museum",
-	"finland.museum",
-	"flanders.museum",
-	"florida.museum",
-	"force.museum",
-	"fortmissoula.museum",
-	"fortworth.museum",
-	"foundation.museum",
-	"francaise.museum",
-	"frankfurt.museum",
-	"franziskaner.museum",
-	"freemasonry.museum",
-	"freiburg.museum",
-	"fribourg.museum",
-	"frog.museum",
-	"fundacio.museum",
-	"furniture.museum",
-	"gallery.museum",
-	"garden.museum",
-	"gateway.museum",
-	"geelvinck.museum",
-	"gemological.museum",
-	"geology.museum",
-	"georgia.museum",
-	"giessen.museum",
-	"glas.museum",
-	"glass.museum",
-	"gorge.museum",
-	"grandrapids.museum",
-	"graz.museum",
-	"guernsey.museum",
-	"halloffame.museum",
-	"hamburg.museum",
-	"handson.museum",
-	"harvestcelebration.museum",
-	"hawaii.museum",
-	"health.museum",
-	"heimatunduhren.museum",
-	"hellas.museum",
-	"helsinki.museum",
-	"hembygdsforbund.museum",
-	"heritage.museum",
-	"histoire.museum",
-	"historical.museum",
-	"historicalsociety.museum",
-	"historichouses.museum",
-	"historisch.museum",
-	"historisches.museum",
-	"history.museum",
-	"historyofscience.museum",
-	"horology.museum",
-	"house.museum",
-	"humanities.museum",
-	"illustration.museum",
-	"imageandsound.museum",
-	"indian.museum",
-	"indiana.museum",
-	"indianapolis.museum",
-	"indianmarket.museum",
-	"intelligence.museum",
-	"interactive.museum",
-	"iraq.museum",
-	"iron.museum",
-	"isleofman.museum",
-	"jamison.museum",
-	"jefferson.museum",
-	"jerusalem.museum",
-	"jewelry.museum",
-	"jewish.museum",
-	"jewishart.museum",
-	"jfk.museum",
-	"journalism.museum",
-	"judaica.museum",
-	"judygarland.museum",
-	"juedisches.museum",
-	"juif.museum",
-	"karate.museum",
-	"karikatur.museum",
-	"kids.museum",
-	"koebenhavn.museum",
-	"koeln.museum",
-	"kunst.museum",
-	"kunstsammlung.museum",
-	"kunstunddesign.museum",
-	"labor.museum",
-	"labour.museum",
-	"lajolla.museum",
-	"lancashire.museum",
-	"landes.museum",
-	"lans.museum",
-	"xn--lns-qla.museum",
-	"larsson.museum",
-	"lewismiller.museum",
-	"lincoln.museum",
-	"linz.museum",
-	"living.museum",
-	"livinghistory.museum",
-	"localhistory.museum",
-	"london.museum",
-	"losangeles.museum",
-	"louvre.museum",
-	"loyalist.museum",
-	"lucerne.museum",
-	"luxembourg.museum",
-	"luzern.museum",
-	"mad.museum",
-	"madrid.museum",
-	"mallorca.museum",
-	"manchester.museum",
-	"mansion.museum",
-	"mansions.museum",
-	"manx.museum",
-	"marburg.museum",
-	"maritime.museum",
-	"maritimo.museum",
-	"maryland.museum",
-	"marylhurst.museum",
-	"media.museum",
-	"medical.museum",
-	"medizinhistorisches.museum",
-	"meeres.museum",
-	"memorial.museum",
-	"mesaverde.museum",
-	"michigan.museum",
-	"midatlantic.museum",
-	"military.museum",
-	"mill.museum",
-	"miners.museum",
-	"mining.museum",
-	"minnesota.museum",
-	"missile.museum",
-	"missoula.museum",
-	"modern.museum",
-	"moma.museum",
-	"money.museum",
-	"monmouth.museum",
-	"monticello.museum",
-	"montreal.museum",
-	"moscow.museum",
-	"motorcycle.museum",
-	"muenchen.museum",
-	"muenster.museum",
-	"mulhouse.museum",
-	"muncie.museum",
-	"museet.museum",
-	"museumcenter.museum",
-	"museumvereniging.museum",
-	"music.museum",
-	"national.museum",
-	"nationalfirearms.museum",
-	"nationalheritage.museum",
-	"nativeamerican.museum",
-	"naturalhistory.museum",
-	"naturalhistorymuseum.museum",
-	"naturalsciences.museum",
-	"nature.museum",
-	"naturhistorisches.museum",
-	"natuurwetenschappen.museum",
-	"naumburg.museum",
-	"naval.museum",
-	"nebraska.museum",
-	"neues.museum",
-	"newhampshire.museum",
-	"newjersey.museum",
-	"newmexico.museum",
-	"newport.museum",
-	"newspaper.museum",
-	"newyork.museum",
-	"niepce.museum",
-	"norfolk.museum",
-	"north.museum",
-	"nrw.museum",
-	"nuernberg.museum",
-	"nuremberg.museum",
-	"nyc.museum",
-	"nyny.museum",
-	"oceanographic.museum",
-	"oceanographique.museum",
-	"omaha.museum",
-	"online.museum",
-	"ontario.museum",
-	"openair.museum",
-	"oregon.museum",
-	"oregontrail.museum",
-	"otago.museum",
-	"oxford.museum",
-	"pacific.museum",
-	"paderborn.museum",
-	"palace.museum",
-	"paleo.museum",
-	"palmsprings.museum",
-	"panama.museum",
-	"paris.museum",
-	"pasadena.museum",
-	"pharmacy.museum",
-	"philadelphia.museum",
-	"philadelphiaarea.museum",
-	"philately.museum",
-	"phoenix.museum",
-	"photography.museum",
-	"pilots.museum",
-	"pittsburgh.museum",
-	"planetarium.museum",
-	"plantation.museum",
-	"plants.museum",
-	"plaza.museum",
-	"portal.museum",
-	"portland.museum",
-	"portlligat.museum",
-	"posts-and-telecommunications.museum",
-	"preservation.museum",
-	"presidio.museum",
-	"press.museum",
-	"project.museum",
-	"public.museum",
-	"pubol.museum",
-	"quebec.museum",
-	"railroad.museum",
-	"railway.museum",
-	"research.museum",
-	"resistance.museum",
-	"riodejaneiro.museum",
-	"rochester.museum",
-	"rockart.museum",
-	"roma.museum",
-	"russia.museum",
-	"saintlouis.museum",
-	"salem.museum",
-	"salvadordali.museum",
-	"salzburg.museum",
-	"sandiego.museum",
-	"sanfrancisco.museum",
-	"santabarbara.museum",
-	"santacruz.museum",
-	"santafe.museum",
-	"saskatchewan.museum",
-	"satx.museum",
-	"savannahga.museum",
-	"schlesisches.museum",
-	"schoenbrunn.museum",
-	"schokoladen.museum",
-	"school.museum",
-	"schweiz.museum",
-	"science.museum",
-	"scienceandhistory.museum",
-	"scienceandindustry.museum",
-	"sciencecenter.museum",
-	"sciencecenters.museum",
-	"science-fiction.museum",
-	"sciencehistory.museum",
-	"sciences.museum",
-	"sciencesnaturelles.museum",
-	"scotland.museum",
-	"seaport.museum",
-	"settlement.museum",
-	"settlers.museum",
-	"shell.museum",
-	"sherbrooke.museum",
-	"sibenik.museum",
-	"silk.museum",
-	"ski.museum",
-	"skole.museum",
-	"society.museum",
-	"sologne.museum",
-	"soundandvision.museum",
-	"southcarolina.museum",
-	"southwest.museum",
-	"space.museum",
-	"spy.museum",
-	"square.museum",
-	"stadt.museum",
-	"stalbans.museum",
-	"starnberg.museum",
-	"state.museum",
-	"stateofdelaware.museum",
-	"station.museum",
-	"steam.museum",
-	"steiermark.museum",
-	"stjohn.museum",
-	"stockholm.museum",
-	"stpetersburg.museum",
-	"stuttgart.museum",
-	"suisse.museum",
-	"surgeonshall.museum",
-	"surrey.museum",
-	"svizzera.museum",
-	"sweden.museum",
-	"sydney.museum",
-	"tank.museum",
-	"tcm.museum",
-	"technology.museum",
-	"telekommunikation.museum",
-	"television.museum",
-	"texas.museum",
-	"textile.museum",
-	"theater.museum",
-	"time.museum",
-	"timekeeping.museum",
-	"topology.museum",
-	"torino.museum",
-	"touch.museum",
-	"town.museum",
-	"transport.museum",
-	"tree.museum",
-	"trolley.museum",
-	"trust.museum",
-	"trustee.museum",
-	"uhren.museum",
-	"ulm.museum",
-	"undersea.museum",
-	"university.museum",
-	"usa.museum",
-	"usantiques.museum",
-	"usarts.museum",
-	"uscountryestate.museum",
-	"usculture.museum",
-	"usdecorativearts.museum",
-	"usgarden.museum",
-	"ushistory.museum",
-	"ushuaia.museum",
-	"uslivinghistory.museum",
-	"utah.museum",
-	"uvic.museum",
-	"valley.museum",
-	"vantaa.museum",
-	"versailles.museum",
-	"viking.museum",
-	"village.museum",
-	"virginia.museum",
-	"virtual.museum",
-	"virtuel.museum",
-	"vlaanderen.museum",
-	"volkenkunde.museum",
-	"wales.museum",
-	"wallonie.museum",
-	"war.museum",
-	"washingtondc.museum",
-	"watchandclock.museum",
-	"watch-and-clock.museum",
-	"western.museum",
-	"westfalen.museum",
-	"whaling.museum",
-	"wildlife.museum",
-	"williamsburg.museum",
-	"windmill.museum",
-	"workshop.museum",
-	"york.museum",
-	"yorkshire.museum",
-	"yosemite.museum",
-	"youth.museum",
-	"zoological.museum",
-	"zoology.museum",
-	"xn--9dbhblg6di.museum",
-	"xn--h1aegh.museum",
-	"mv",
-	"aero.mv",
-	"biz.mv",
-	"com.mv",
-	"coop.mv",
-	"edu.mv",
-	"gov.mv",
-	"info.mv",
-	"int.mv",
-	"mil.mv",
-	"museum.mv",
-	"name.mv",
-	"net.mv",
-	"org.mv",
-	"pro.mv",
-	"mw",
-	"ac.mw",
-	"biz.mw",
-	"co.mw",
-	"com.mw",
-	"coop.mw",
-	"edu.mw",
-	"gov.mw",
-	"int.mw",
-	"museum.mw",
-	"net.mw",
-	"org.mw",
-	"mx",
-	"com.mx",
-	"org.mx",
-	"gob.mx",
-	"edu.mx",
-	"net.mx",
-	"my",
-	"com.my",
-	"net.my",
-	"org.my",
-	"gov.my",
-	"edu.my",
-	"mil.my",
-	"name.my",
-	"mz",
-	"ac.mz",
-	"adv.mz",
-	"co.mz",
-	"edu.mz",
-	"gov.mz",
-	"mil.mz",
-	"net.mz",
-	"org.mz",
-	"na",
-	"info.na",
-	"pro.na",
-	"name.na",
-	"school.na",
-	"or.na",
-	"dr.na",
-	"us.na",
-	"mx.na",
-	"ca.na",
-	"in.na",
-	"cc.na",
-	"tv.na",
-	"ws.na",
-	"mobi.na",
-	"co.na",
-	"com.na",
-	"org.na",
-	"name",
-	"nc",
-	"asso.nc",
-	"ne",
-	"net",
-	"nf",
-	"com.nf",
-	"net.nf",
-	"per.nf",
-	"rec.nf",
-	"web.nf",
-	"arts.nf",
-	"firm.nf",
-	"info.nf",
-	"other.nf",
-	"store.nf",
-	"ng",
-	"com.ng",
-	"edu.ng",
-	"gov.ng",
-	"i.ng",
-	"mil.ng",
-	"mobi.ng",
-	"name.ng",
-	"net.ng",
-	"org.ng",
-	"sch.ng",
-	"ni",
-	"ac.ni",
-	"biz.ni",
-	"co.ni",
-	"com.ni",
-	"edu.ni",
-	"gob.ni",
-	"in.ni",
-	"info.ni",
-	"int.ni",
-	"mil.ni",
-	"net.ni",
-	"nom.ni",
-	"org.ni",
-	"web.ni",
-	"nl",
-	"bv.nl",
-	"no",
-	"fhs.no",
-	"vgs.no",
-	"fylkesbibl.no",
-	"folkebibl.no",
-	"museum.no",
-	"idrett.no",
-	"priv.no",
-	"mil.no",
-	"stat.no",
-	"dep.no",
-	"kommune.no",
-	"herad.no",
-	"aa.no",
-	"ah.no",
-	"bu.no",
-	"fm.no",
-	"hl.no",
-	"hm.no",
-	"jan-mayen.no",
-	"mr.no",
-	"nl.no",
-	"nt.no",
-	"of.no",
-	"ol.no",
-	"oslo.no",
-	"rl.no",
-	"sf.no",
-	"st.no",
-	"svalbard.no",
-	"tm.no",
-	"tr.no",
-	"va.no",
-	"vf.no",
-	"gs.aa.no",
-	"gs.ah.no",
-	"gs.bu.no",
-	"gs.fm.no",
-	"gs.hl.no",
-	"gs.hm.no",
-	"gs.jan-mayen.no",
-	"gs.mr.no",
-	"gs.nl.no",
-	"gs.nt.no",
-	"gs.of.no",
-	"gs.ol.no",
-	"gs.oslo.no",
-	"gs.rl.no",
-	"gs.sf.no",
-	"gs.st.no",
-	"gs.svalbard.no",
-	"gs.tm.no",
-	"gs.tr.no",
-	"gs.va.no",
-	"gs.vf.no",
-	"akrehamn.no",
-	"xn--krehamn-dxa.no",
-	"algard.no",
-	"xn--lgrd-poac.no",
-	"arna.no",
-	"brumunddal.no",
-	"bryne.no",
-	"bronnoysund.no",
-	"xn--brnnysund-m8ac.no",
-	"drobak.no",
-	"xn--drbak-wua.no",
-	"egersund.no",
-	"fetsund.no",
-	"floro.no",
-	"xn--flor-jra.no",
-	"fredrikstad.no",
-	"hokksund.no",
-	"honefoss.no",
-	"xn--hnefoss-q1a.no",
-	"jessheim.no",
-	"jorpeland.no",
-	"xn--jrpeland-54a.no",
-	"kirkenes.no",
-	"kopervik.no",
-	"krokstadelva.no",
-	"langevag.no",
-	"xn--langevg-jxa.no",
-	"leirvik.no",
-	"mjondalen.no",
-	"xn--mjndalen-64a.no",
-	"mo-i-rana.no",
-	"mosjoen.no",
-	"xn--mosjen-eya.no",
-	"nesoddtangen.no",
-	"orkanger.no",
-	"osoyro.no",
-	"xn--osyro-wua.no",
-	"raholt.no",
-	"xn--rholt-mra.no",
-	"sandnessjoen.no",
-	"xn--sandnessjen-ogb.no",
-	"skedsmokorset.no",
-	"slattum.no",
-	"spjelkavik.no",
-	"stathelle.no",
-	"stavern.no",
-	"stjordalshalsen.no",
-	"xn--stjrdalshalsen-sqb.no",
-	"tananger.no",
-	"tranby.no",
-	"vossevangen.no",
-	"afjord.no",
-	"xn--fjord-lra.no",
-	"agdenes.no",
-	"al.no",
-	"xn--l-1fa.no",
-	"alesund.no",
-	"xn--lesund-hua.no",
-	"alstahaug.no",
-	"alta.no",
-	"xn--lt-liac.no",
-	"alaheadju.no",
-	"xn--laheadju-7ya.no",
-	"alvdal.no",
-	"amli.no",
-	"xn--mli-tla.no",
-	"amot.no",
-	"xn--mot-tla.no",
-	"andebu.no",
-	"andoy.no",
-	"xn--andy-ira.no",
-	"andasuolo.no",
-	"ardal.no",
-	"xn--rdal-poa.no",
-	"aremark.no",
-	"arendal.no",
-	"xn--s-1fa.no",
-	"aseral.no",
-	"xn--seral-lra.no",
-	"asker.no",
-	"askim.no",
-	"askvoll.no",
-	"askoy.no",
-	"xn--asky-ira.no",
-	"asnes.no",
-	"xn--snes-poa.no",
-	"audnedaln.no",
-	"aukra.no",
-	"aure.no",
-	"aurland.no",
-	"aurskog-holand.no",
-	"xn--aurskog-hland-jnb.no",
-	"austevoll.no",
-	"austrheim.no",
-	"averoy.no",
-	"xn--avery-yua.no",
-	"balestrand.no",
-	"ballangen.no",
-	"balat.no",
-	"xn--blt-elab.no",
-	"balsfjord.no",
-	"bahccavuotna.no",
-	"xn--bhccavuotna-k7a.no",
-	"bamble.no",
-	"bardu.no",
-	"beardu.no",
-	"beiarn.no",
-	"bajddar.no",
-	"xn--bjddar-pta.no",
-	"baidar.no",
-	"xn--bidr-5nac.no",
-	"berg.no",
-	"bergen.no",
-	"berlevag.no",
-	"xn--berlevg-jxa.no",
-	"bearalvahki.no",
-	"xn--bearalvhki-y4a.no",
-	"bindal.no",
-	"birkenes.no",
-	"bjarkoy.no",
-	"xn--bjarky-fya.no",
-	"bjerkreim.no",
-	"bjugn.no",
-	"bodo.no",
-	"xn--bod-2na.no",
-	"badaddja.no",
-	"xn--bdddj-mrabd.no",
-	"budejju.no",
-	"bokn.no",
-	"bremanger.no",
-	"bronnoy.no",
-	"xn--brnny-wuac.no",
-	"bygland.no",
-	"bykle.no",
-	"barum.no",
-	"xn--brum-voa.no",
-	"bo.telemark.no",
-	"xn--b-5ga.telemark.no",
-	"bo.nordland.no",
-	"xn--b-5ga.nordland.no",
-	"bievat.no",
-	"xn--bievt-0qa.no",
-	"bomlo.no",
-	"xn--bmlo-gra.no",
-	"batsfjord.no",
-	"xn--btsfjord-9za.no",
-	"bahcavuotna.no",
-	"xn--bhcavuotna-s4a.no",
-	"dovre.no",
-	"drammen.no",
-	"drangedal.no",
-	"dyroy.no",
-	"xn--dyry-ira.no",
-	"donna.no",
-	"xn--dnna-gra.no",
-	"eid.no",
-	"eidfjord.no",
-	"eidsberg.no",
-	"eidskog.no",
-	"eidsvoll.no",
-	"eigersund.no",
-	"elverum.no",
-	"enebakk.no",
-	"engerdal.no",
-	"etne.no",
-	"etnedal.no",
-	"evenes.no",
-	"evenassi.no",
-	"xn--eveni-0qa01ga.no",
-	"evje-og-hornnes.no",
-	"farsund.no",
-	"fauske.no",
-	"fuossko.no",
-	"fuoisku.no",
-	"fedje.no",
-	"fet.no",
-	"finnoy.no",
-	"xn--finny-yua.no",
-	"fitjar.no",
-	"fjaler.no",
-	"fjell.no",
-	"flakstad.no",
-	"flatanger.no",
-	"flekkefjord.no",
-	"flesberg.no",
-	"flora.no",
-	"fla.no",
-	"xn--fl-zia.no",
-	"folldal.no",
-	"forsand.no",
-	"fosnes.no",
-	"frei.no",
-	"frogn.no",
-	"froland.no",
-	"frosta.no",
-	"frana.no",
-	"xn--frna-woa.no",
-	"froya.no",
-	"xn--frya-hra.no",
-	"fusa.no",
-	"fyresdal.no",
-	"forde.no",
-	"xn--frde-gra.no",
-	"gamvik.no",
-	"gangaviika.no",
-	"xn--ggaviika-8ya47h.no",
-	"gaular.no",
-	"gausdal.no",
-	"gildeskal.no",
-	"xn--gildeskl-g0a.no",
-	"giske.no",
-	"gjemnes.no",
-	"gjerdrum.no",
-	"gjerstad.no",
-	"gjesdal.no",
-	"gjovik.no",
-	"xn--gjvik-wua.no",
-	"gloppen.no",
-	"gol.no",
-	"gran.no",
-	"grane.no",
-	"granvin.no",
-	"gratangen.no",
-	"grimstad.no",
-	"grong.no",
-	"kraanghke.no",
-	"xn--kranghke-b0a.no",
-	"grue.no",
-	"gulen.no",
-	"hadsel.no",
-	"halden.no",
-	"halsa.no",
-	"hamar.no",
-	"hamaroy.no",
-	"habmer.no",
-	"xn--hbmer-xqa.no",
-	"hapmir.no",
-	"xn--hpmir-xqa.no",
-	"hammerfest.no",
-	"hammarfeasta.no",
-	"xn--hmmrfeasta-s4ac.no",
-	"haram.no",
-	"hareid.no",
-	"harstad.no",
-	"hasvik.no",
-	"aknoluokta.no",
-	"xn--koluokta-7ya57h.no",
-	"hattfjelldal.no",
-	"aarborte.no",
-	"haugesund.no",
-	"hemne.no",
-	"hemnes.no",
-	"hemsedal.no",
-	"heroy.more-og-romsdal.no",
-	"xn--hery-ira.xn--mre-og-romsdal-qqb.no",
-	"heroy.nordland.no",
-	"xn--hery-ira.nordland.no",
-	"hitra.no",
-	"hjartdal.no",
-	"hjelmeland.no",
-	"hobol.no",
-	"xn--hobl-ira.no",
-	"hof.no",
-	"hol.no",
-	"hole.no",
-	"holmestrand.no",
-	"holtalen.no",
-	"xn--holtlen-hxa.no",
-	"hornindal.no",
-	"horten.no",
-	"hurdal.no",
-	"hurum.no",
-	"hvaler.no",
-	"hyllestad.no",
-	"hagebostad.no",
-	"xn--hgebostad-g3a.no",
-	"hoyanger.no",
-	"xn--hyanger-q1a.no",
-	"hoylandet.no",
-	"xn--hylandet-54a.no",
-	"ha.no",
-	"xn--h-2fa.no",
-	"ibestad.no",
-	"inderoy.no",
-	"xn--indery-fya.no",
-	"iveland.no",
-	"jevnaker.no",
-	"jondal.no",
-	"jolster.no",
-	"xn--jlster-bya.no",
-	"karasjok.no",
-	"karasjohka.no",
-	"xn--krjohka-hwab49j.no",
-	"karlsoy.no",
-	"galsa.no",
-	"xn--gls-elac.no",
-	"karmoy.no",
-	"xn--karmy-yua.no",
-	"kautokeino.no",
-	"guovdageaidnu.no",
-	"klepp.no",
-	"klabu.no",
-	"xn--klbu-woa.no",
-	"kongsberg.no",
-	"kongsvinger.no",
-	"kragero.no",
-	"xn--krager-gya.no",
-	"kristiansand.no",
-	"kristiansund.no",
-	"krodsherad.no",
-	"xn--krdsherad-m8a.no",
-	"kvalsund.no",
-	"rahkkeravju.no",
-	"xn--rhkkervju-01af.no",
-	"kvam.no",
-	"kvinesdal.no",
-	"kvinnherad.no",
-	"kviteseid.no",
-	"kvitsoy.no",
-	"xn--kvitsy-fya.no",
-	"kvafjord.no",
-	"xn--kvfjord-nxa.no",
-	"giehtavuoatna.no",
-	"kvanangen.no",
-	"xn--kvnangen-k0a.no",
-	"navuotna.no",
-	"xn--nvuotna-hwa.no",
-	"kafjord.no",
-	"xn--kfjord-iua.no",
-	"gaivuotna.no",
-	"xn--givuotna-8ya.no",
-	"larvik.no",
-	"lavangen.no",
-	"lavagis.no",
-	"loabat.no",
-	"xn--loabt-0qa.no",
-	"lebesby.no",
-	"davvesiida.no",
-	"leikanger.no",
-	"leirfjord.no",
-	"leka.no",
-	"leksvik.no",
-	"lenvik.no",
-	"leangaviika.no",
-	"xn--leagaviika-52b.no",
-	"lesja.no",
-	"levanger.no",
-	"lier.no",
-	"lierne.no",
-	"lillehammer.no",
-	"lillesand.no",
-	"lindesnes.no",
-	"lindas.no",
-	"xn--linds-pra.no",
-	"lom.no",
-	"loppa.no",
-	"lahppi.no",
-	"xn--lhppi-xqa.no",
-	"lund.no",
-	"lunner.no",
-	"luroy.no",
-	"xn--lury-ira.no",
-	"luster.no",
-	"lyngdal.no",
-	"lyngen.no",
-	"ivgu.no",
-	"lardal.no",
-	"lerdal.no",
-	"xn--lrdal-sra.no",
-	"lodingen.no",
-	"xn--ldingen-q1a.no",
-	"lorenskog.no",
-	"xn--lrenskog-54a.no",
-	"loten.no",
-	"xn--lten-gra.no",
-	"malvik.no",
-	"masoy.no",
-	"xn--msy-ula0h.no",
-	"muosat.no",
-	"xn--muost-0qa.no",
-	"mandal.no",
-	"marker.no",
-	"marnardal.no",
-	"masfjorden.no",
-	"meland.no",
-	"meldal.no",
-	"melhus.no",
-	"meloy.no",
-	"xn--mely-ira.no",
-	"meraker.no",
-	"xn--merker-kua.no",
-	"moareke.no",
-	"xn--moreke-jua.no",
-	"midsund.no",
-	"midtre-gauldal.no",
-	"modalen.no",
-	"modum.no",
-	"molde.no",
-	"moskenes.no",
-	"moss.no",
-	"mosvik.no",
-	"malselv.no",
-	"xn--mlselv-iua.no",
-	"malatvuopmi.no",
-	"xn--mlatvuopmi-s4a.no",
-	"namdalseid.no",
-	"aejrie.no",
-	"namsos.no",
-	"namsskogan.no",
-	"naamesjevuemie.no",
-	"xn--nmesjevuemie-tcba.no",
-	"laakesvuemie.no",
-	"nannestad.no",
-	"narvik.no",
-	"narviika.no",
-	"naustdal.no",
-	"nedre-eiker.no",
-	"nes.akershus.no",
-	"nes.buskerud.no",
-	"nesna.no",
-	"nesodden.no",
-	"nesseby.no",
-	"unjarga.no",
-	"xn--unjrga-rta.no",
-	"nesset.no",
-	"nissedal.no",
-	"nittedal.no",
-	"nord-aurdal.no",
-	"nord-fron.no",
-	"nord-odal.no",
-	"norddal.no",
-	"nordkapp.no",
-	"davvenjarga.no",
-	"xn--davvenjrga-y4a.no",
-	"nordre-land.no",
-	"nordreisa.no",
-	"raisa.no",
-	"xn--risa-5na.no",
-	"nore-og-uvdal.no",
-	"notodden.no",
-	"naroy.no",
-	"xn--nry-yla5g.no",
-	"notteroy.no",
-	"xn--nttery-byae.no",
-	"odda.no",
-	"oksnes.no",
-	"xn--ksnes-uua.no",
-	"oppdal.no",
-	"oppegard.no",
-	"xn--oppegrd-ixa.no",
-	"orkdal.no",
-	"orland.no",
-	"xn--rland-uua.no",
-	"orskog.no",
-	"xn--rskog-uua.no",
-	"orsta.no",
-	"xn--rsta-fra.no",
-	"os.hedmark.no",
-	"os.hordaland.no",
-	"osen.no",
-	"osteroy.no",
-	"xn--ostery-fya.no",
-	"ostre-toten.no",
-	"xn--stre-toten-zcb.no",
-	"overhalla.no",
-	"ovre-eiker.no",
-	"xn--vre-eiker-k8a.no",
-	"oyer.no",
-	"xn--yer-zna.no",
-	"oygarden.no",
-	"xn--ygarden-p1a.no",
-	"oystre-slidre.no",
-	"xn--ystre-slidre-ujb.no",
-	"porsanger.no",
-	"porsangu.no",
-	"xn--porsgu-sta26f.no",
-	"porsgrunn.no",
-	"radoy.no",
-	"xn--rady-ira.no",
-	"rakkestad.no",
-	"rana.no",
-	"ruovat.no",
-	"randaberg.no",
-	"rauma.no",
-	"rendalen.no",
-	"rennebu.no",
-	"rennesoy.no",
-	"xn--rennesy-v1a.no",
-	"rindal.no",
-	"ringebu.no",
-	"ringerike.no",
-	"ringsaker.no",
-	"rissa.no",
-	"risor.no",
-	"xn--risr-ira.no",
-	"roan.no",
-	"rollag.no",
-	"rygge.no",
-	"ralingen.no",
-	"xn--rlingen-mxa.no",
-	"rodoy.no",
-	"xn--rdy-0nab.no",
-	"romskog.no",
-	"xn--rmskog-bya.no",
-	"roros.no",
-	"xn--rros-gra.no",
-	"rost.no",
-	"xn--rst-0na.no",
-	"royken.no",
-	"xn--ryken-vua.no",
-	"royrvik.no",
-	"xn--ryrvik-bya.no",
-	"rade.no",
-	"xn--rde-ula.no",
-	"salangen.no",
-	"siellak.no",
-	"saltdal.no",
-	"salat.no",
-	"xn--slt-elab.no",
-	"xn--slat-5na.no",
-	"samnanger.no",
-	"sande.more-og-romsdal.no",
-	"sande.xn--mre-og-romsdal-qqb.no",
-	"sande.vestfold.no",
-	"sandefjord.no",
-	"sandnes.no",
-	"sandoy.no",
-	"xn--sandy-yua.no",
-	"sarpsborg.no",
-	"sauda.no",
-	"sauherad.no",
-	"sel.no",
-	"selbu.no",
-	"selje.no",
-	"seljord.no",
-	"sigdal.no",
-	"siljan.no",
-	"sirdal.no",
-	"skaun.no",
-	"skedsmo.no",
-	"ski.no",
-	"skien.no",
-	"skiptvet.no",
-	"skjervoy.no",
-	"xn--skjervy-v1a.no",
-	"skierva.no",
-	"xn--skierv-uta.no",
-	"skjak.no",
-	"xn--skjk-soa.no",
-	"skodje.no",
-	"skanland.no",
-	"xn--sknland-fxa.no",
-	"skanit.no",
-	"xn--sknit-yqa.no",
-	"smola.no",
-	"xn--smla-hra.no",
-	"snillfjord.no",
-	"snasa.no",
-	"xn--snsa-roa.no",
-	"snoasa.no",
-	"snaase.no",
-	"xn--snase-nra.no",
-	"sogndal.no",
-	"sokndal.no",
-	"sola.no",
-	"solund.no",
-	"songdalen.no",
-	"sortland.no",
-	"spydeberg.no",
-	"stange.no",
-	"stavanger.no",
-	"steigen.no",
-	"steinkjer.no",
-	"stjordal.no",
-	"xn--stjrdal-s1a.no",
-	"stokke.no",
-	"stor-elvdal.no",
-	"stord.no",
-	"stordal.no",
-	"storfjord.no",
-	"omasvuotna.no",
-	"strand.no",
-	"stranda.no",
-	"stryn.no",
-	"sula.no",
-	"suldal.no",
-	"sund.no",
-	"sunndal.no",
-	"surnadal.no",
-	"sveio.no",
-	"svelvik.no",
-	"sykkylven.no",
-	"sogne.no",
-	"xn--sgne-gra.no",
-	"somna.no",
-	"xn--smna-gra.no",
-	"sondre-land.no",
-	"xn--sndre-land-0cb.no",
-	"sor-aurdal.no",
-	"xn--sr-aurdal-l8a.no",
-	"sor-fron.no",
-	"xn--sr-fron-q1a.no",
-	"sor-odal.no",
-	"xn--sr-odal-q1a.no",
-	"sor-varanger.no",
-	"xn--sr-varanger-ggb.no",
-	"matta-varjjat.no",
-	"xn--mtta-vrjjat-k7af.no",
-	"sorfold.no",
-	"xn--srfold-bya.no",
-	"sorreisa.no",
-	"xn--srreisa-q1a.no",
-	"sorum.no",
-	"xn--srum-gra.no",
-	"tana.no",
-	"deatnu.no",
-	"time.no",
-	"tingvoll.no",
-	"tinn.no",
-	"tjeldsund.no",
-	"dielddanuorri.no",
-	"tjome.no",
-	"xn--tjme-hra.no",
-	"tokke.no",
-	"tolga.no",
-	"torsken.no",
-	"tranoy.no",
-	"xn--trany-yua.no",
-	"tromso.no",
-	"xn--troms-zua.no",
-	"tromsa.no",
-	"romsa.no",
-	"trondheim.no",
-	"troandin.no",
-	"trysil.no",
-	"trana.no",
-	"xn--trna-woa.no",
-	"trogstad.no",
-	"xn--trgstad-r1a.no",
-	"tvedestrand.no",
-	"tydal.no",
-	"tynset.no",
-	"tysfjord.no",
-	"divtasvuodna.no",
-	"divttasvuotna.no",
-	"tysnes.no",
-	"tysvar.no",
-	"xn--tysvr-vra.no",
-	"tonsberg.no",
-	"xn--tnsberg-q1a.no",
-	"ullensaker.no",
-	"ullensvang.no",
-	"ulvik.no",
-	"utsira.no",
-	"vadso.no",
-	"xn--vads-jra.no",
-	"cahcesuolo.no",
-	"xn--hcesuolo-7ya35b.no",
-	"vaksdal.no",
-	"valle.no",
-	"vang.no",
-	"vanylven.no",
-	"vardo.no",
-	"xn--vard-jra.no",
-	"varggat.no",
-	"xn--vrggt-xqad.no",
-	"vefsn.no",
-	"vaapste.no",
-	"vega.no",
-	"vegarshei.no",
-	"xn--vegrshei-c0a.no",
-	"vennesla.no",
-	"verdal.no",
-	"verran.no",
-	"vestby.no",
-	"vestnes.no",
-	"vestre-slidre.no",
-	"vestre-toten.no",
-	"vestvagoy.no",
-	"xn--vestvgy-ixa6o.no",
-	"vevelstad.no",
-	"vik.no",
-	"vikna.no",
-	"vindafjord.no",
-	"volda.no",
-	"voss.no",
-	"varoy.no",
-	"xn--vry-yla5g.no",
-	"vagan.no",
-	"xn--vgan-qoa.no",
-	"voagat.no",
-	"vagsoy.no",
-	"xn--vgsy-qoa0j.no",
-	"vaga.no",
-	"xn--vg-yiab.no",
-	"valer.ostfold.no",
-	"xn--vler-qoa.xn--stfold-9xa.no",
-	"valer.hedmark.no",
-	"xn--vler-qoa.hedmark.no",
-	"*.np",
-	"nr",
-	"biz.nr",
-	"info.nr",
-	"gov.nr",
-	"edu.nr",
-	"org.nr",
-	"net.nr",
-	"com.nr",
-	"nu",
-	"nz",
-	"ac.nz",
-	"co.nz",
-	"cri.nz",
-	"geek.nz",
-	"gen.nz",
-	"govt.nz",
-	"health.nz",
-	"iwi.nz",
-	"kiwi.nz",
-	"maori.nz",
-	"mil.nz",
-	"xn--mori-qsa.nz",
-	"net.nz",
-	"org.nz",
-	"parliament.nz",
-	"school.nz",
-	"om",
-	"co.om",
-	"com.om",
-	"edu.om",
-	"gov.om",
-	"med.om",
-	"museum.om",
-	"net.om",
-	"org.om",
-	"pro.om",
-	"onion",
-	"org",
-	"pa",
-	"ac.pa",
-	"gob.pa",
-	"com.pa",
-	"org.pa",
-	"sld.pa",
-	"edu.pa",
-	"net.pa",
-	"ing.pa",
-	"abo.pa",
-	"med.pa",
-	"nom.pa",
-	"pe",
-	"edu.pe",
-	"gob.pe",
-	"nom.pe",
-	"mil.pe",
-	"org.pe",
-	"com.pe",
-	"net.pe",
-	"pf",
-	"com.pf",
-	"org.pf",
-	"edu.pf",
-	"*.pg",
-	"ph",
-	"com.ph",
-	"net.ph",
-	"org.ph",
-	"gov.ph",
-	"edu.ph",
-	"ngo.ph",
-	"mil.ph",
-	"i.ph",
-	"pk",
-	"com.pk",
-	"net.pk",
-	"edu.pk",
-	"org.pk",
-	"fam.pk",
-	"biz.pk",
-	"web.pk",
-	"gov.pk",
-	"gob.pk",
-	"gok.pk",
-	"gon.pk",
-	"gop.pk",
-	"gos.pk",
-	"info.pk",
-	"pl",
-	"com.pl",
-	"net.pl",
-	"org.pl",
-	"aid.pl",
-	"agro.pl",
-	"atm.pl",
-	"auto.pl",
-	"biz.pl",
-	"edu.pl",
-	"gmina.pl",
-	"gsm.pl",
-	"info.pl",
-	"mail.pl",
-	"miasta.pl",
-	"media.pl",
-	"mil.pl",
-	"nieruchomosci.pl",
-	"nom.pl",
-	"pc.pl",
-	"powiat.pl",
-	"priv.pl",
-	"realestate.pl",
-	"rel.pl",
-	"sex.pl",
-	"shop.pl",
-	"sklep.pl",
-	"sos.pl",
-	"szkola.pl",
-	"targi.pl",
-	"tm.pl",
-	"tourism.pl",
-	"travel.pl",
-	"turystyka.pl",
-	"gov.pl",
-	"ap.gov.pl",
-	"ic.gov.pl",
-	"is.gov.pl",
-	"us.gov.pl",
-	"kmpsp.gov.pl",
-	"kppsp.gov.pl",
-	"kwpsp.gov.pl",
-	"psp.gov.pl",
-	"wskr.gov.pl",
-	"kwp.gov.pl",
-	"mw.gov.pl",
-	"ug.gov.pl",
-	"um.gov.pl",
-	"umig.gov.pl",
-	"ugim.gov.pl",
-	"upow.gov.pl",
-	"uw.gov.pl",
-	"starostwo.gov.pl",
-	"pa.gov.pl",
-	"po.gov.pl",
-	"psse.gov.pl",
-	"pup.gov.pl",
-	"rzgw.gov.pl",
-	"sa.gov.pl",
-	"so.gov.pl",
-	"sr.gov.pl",
-	"wsa.gov.pl",
-	"sko.gov.pl",
-	"uzs.gov.pl",
-	"wiih.gov.pl",
-	"winb.gov.pl",
-	"pinb.gov.pl",
-	"wios.gov.pl",
-	"witd.gov.pl",
-	"wzmiuw.gov.pl",
-	"piw.gov.pl",
-	"wiw.gov.pl",
-	"griw.gov.pl",
-	"wif.gov.pl",
-	"oum.gov.pl",
-	"sdn.gov.pl",
-	"zp.gov.pl",
-	"uppo.gov.pl",
-	"mup.gov.pl",
-	"wuoz.gov.pl",
-	"konsulat.gov.pl",
-	"oirm.gov.pl",
-	"augustow.pl",
-	"babia-gora.pl",
-	"bedzin.pl",
-	"beskidy.pl",
-	"bialowieza.pl",
-	"bialystok.pl",
-	"bielawa.pl",
-	"bieszczady.pl",
-	"boleslawiec.pl",
-	"bydgoszcz.pl",
-	"bytom.pl",
-	"cieszyn.pl",
-	"czeladz.pl",
-	"czest.pl",
-	"dlugoleka.pl",
-	"elblag.pl",
-	"elk.pl",
-	"glogow.pl",
-	"gniezno.pl",
-	"gorlice.pl",
-	"grajewo.pl",
-	"ilawa.pl",
-	"jaworzno.pl",
-	"jelenia-gora.pl",
-	"jgora.pl",
-	"kalisz.pl",
-	"kazimierz-dolny.pl",
-	"karpacz.pl",
-	"kartuzy.pl",
-	"kaszuby.pl",
-	"katowice.pl",
-	"kepno.pl",
-	"ketrzyn.pl",
-	"klodzko.pl",
-	"kobierzyce.pl",
-	"kolobrzeg.pl",
-	"konin.pl",
-	"konskowola.pl",
-	"kutno.pl",
-	"lapy.pl",
-	"lebork.pl",
-	"legnica.pl",
-	"lezajsk.pl",
-	"limanowa.pl",
-	"lomza.pl",
-	"lowicz.pl",
-	"lubin.pl",
-	"lukow.pl",
-	"malbork.pl",
-	"malopolska.pl",
-	"mazowsze.pl",
-	"mazury.pl",
-	"mielec.pl",
-	"mielno.pl",
-	"mragowo.pl",
-	"naklo.pl",
-	"nowaruda.pl",
-	"nysa.pl",
-	"olawa.pl",
-	"olecko.pl",
-	"olkusz.pl",
-	"olsztyn.pl",
-	"opoczno.pl",
-	"opole.pl",
-	"ostroda.pl",
-	"ostroleka.pl",
-	"ostrowiec.pl",
-	"ostrowwlkp.pl",
-	"pila.pl",
-	"pisz.pl",
-	"podhale.pl",
-	"podlasie.pl",
-	"polkowice.pl",
-	"pomorze.pl",
-	"pomorskie.pl",
-	"prochowice.pl",
-	"pruszkow.pl",
-	"przeworsk.pl",
-	"pulawy.pl",
-	"radom.pl",
-	"rawa-maz.pl",
-	"rybnik.pl",
-	"rzeszow.pl",
-	"sanok.pl",
-	"sejny.pl",
-	"slask.pl",
-	"slupsk.pl",
-	"sosnowiec.pl",
-	"stalowa-wola.pl",
-	"skoczow.pl",
-	"starachowice.pl",
-	"stargard.pl",
-	"suwalki.pl",
-	"swidnica.pl",
-	"swiebodzin.pl",
-	"swinoujscie.pl",
-	"szczecin.pl",
-	"szczytno.pl",
-	"tarnobrzeg.pl",
-	"tgory.pl",
-	"turek.pl",
-	"tychy.pl",
-	"ustka.pl",
-	"walbrzych.pl",
-	"warmia.pl",
-	"warszawa.pl",
-	"waw.pl",
-	"wegrow.pl",
-	"wielun.pl",
-	"wlocl.pl",
-	"wloclawek.pl",
-	"wodzislaw.pl",
-	"wolomin.pl",
-	"wroclaw.pl",
-	"zachpomor.pl",
-	"zagan.pl",
-	"zarow.pl",
-	"zgora.pl",
-	"zgorzelec.pl",
-	"pm",
-	"pn",
-	"gov.pn",
-	"co.pn",
-	"org.pn",
-	"edu.pn",
-	"net.pn",
-	"post",
-	"pr",
-	"com.pr",
-	"net.pr",
-	"org.pr",
-	"gov.pr",
-	"edu.pr",
-	"isla.pr",
-	"pro.pr",
-	"biz.pr",
-	"info.pr",
-	"name.pr",
-	"est.pr",
-	"prof.pr",
-	"ac.pr",
-	"pro",
-	"aaa.pro",
-	"aca.pro",
-	"acct.pro",
-	"avocat.pro",
-	"bar.pro",
-	"cpa.pro",
-	"eng.pro",
-	"jur.pro",
-	"law.pro",
-	"med.pro",
-	"recht.pro",
-	"ps",
-	"edu.ps",
-	"gov.ps",
-	"sec.ps",
-	"plo.ps",
-	"com.ps",
-	"org.ps",
-	"net.ps",
-	"pt",
-	"net.pt",
-	"gov.pt",
-	"org.pt",
-	"edu.pt",
-	"int.pt",
-	"publ.pt",
-	"com.pt",
-	"nome.pt",
-	"pw",
-	"co.pw",
-	"ne.pw",
-	"or.pw",
-	"ed.pw",
-	"go.pw",
-	"belau.pw",
-	"py",
-	"com.py",
-	"coop.py",
-	"edu.py",
-	"gov.py",
-	"mil.py",
-	"net.py",
-	"org.py",
-	"qa",
-	"com.qa",
-	"edu.qa",
-	"gov.qa",
-	"mil.qa",
-	"name.qa",
-	"net.qa",
-	"org.qa",
-	"sch.qa",
-	"re",
-	"asso.re",
-	"com.re",
-	"nom.re",
-	"ro",
-	"arts.ro",
-	"com.ro",
-	"firm.ro",
-	"info.ro",
-	"nom.ro",
-	"nt.ro",
-	"org.ro",
-	"rec.ro",
-	"store.ro",
-	"tm.ro",
-	"www.ro",
-	"rs",
-	"ac.rs",
-	"co.rs",
-	"edu.rs",
-	"gov.rs",
-	"in.rs",
-	"org.rs",
-	"ru",
-	"ac.ru",
-	"edu.ru",
-	"gov.ru",
-	"int.ru",
-	"mil.ru",
-	"test.ru",
-	"rw",
-	"gov.rw",
-	"net.rw",
-	"edu.rw",
-	"ac.rw",
-	"com.rw",
-	"co.rw",
-	"int.rw",
-	"mil.rw",
-	"gouv.rw",
-	"sa",
-	"com.sa",
-	"net.sa",
-	"org.sa",
-	"gov.sa",
-	"med.sa",
-	"pub.sa",
-	"edu.sa",
-	"sch.sa",
-	"sb",
-	"com.sb",
-	"edu.sb",
-	"gov.sb",
-	"net.sb",
-	"org.sb",
-	"sc",
-	"com.sc",
-	"gov.sc",
-	"net.sc",
-	"org.sc",
-	"edu.sc",
-	"sd",
-	"com.sd",
-	"net.sd",
-	"org.sd",
-	"edu.sd",
-	"med.sd",
-	"tv.sd",
-	"gov.sd",
-	"info.sd",
-	"se",
-	"a.se",
-	"ac.se",
-	"b.se",
-	"bd.se",
-	"brand.se",
-	"c.se",
-	"d.se",
-	"e.se",
-	"f.se",
-	"fh.se",
-	"fhsk.se",
-	"fhv.se",
-	"g.se",
-	"h.se",
-	"i.se",
-	"k.se",
-	"komforb.se",
-	"kommunalforbund.se",
-	"komvux.se",
-	"l.se",
-	"lanbib.se",
-	"m.se",
-	"n.se",
-	"naturbruksgymn.se",
-	"o.se",
-	"org.se",
-	"p.se",
-	"parti.se",
-	"pp.se",
-	"press.se",
-	"r.se",
-	"s.se",
-	"t.se",
-	"tm.se",
-	"u.se",
-	"w.se",
-	"x.se",
-	"y.se",
-	"z.se",
-	"sg",
-	"com.sg",
-	"net.sg",
-	"org.sg",
-	"gov.sg",
-	"edu.sg",
-	"per.sg",
-	"sh",
-	"com.sh",
-	"net.sh",
-	"gov.sh",
-	"org.sh",
-	"mil.sh",
-	"si",
-	"sj",
-	"sk",
-	"sl",
-	"com.sl",
-	"net.sl",
-	"edu.sl",
-	"gov.sl",
-	"org.sl",
-	"sm",
-	"sn",
-	"art.sn",
-	"com.sn",
-	"edu.sn",
-	"gouv.sn",
-	"org.sn",
-	"perso.sn",
-	"univ.sn",
-	"so",
-	"com.so",
-	"net.so",
-	"org.so",
-	"sr",
-	"st",
-	"co.st",
-	"com.st",
-	"consulado.st",
-	"edu.st",
-	"embaixada.st",
-	"gov.st",
-	"mil.st",
-	"net.st",
-	"org.st",
-	"principe.st",
-	"saotome.st",
-	"store.st",
-	"su",
-	"adygeya.su",
-	"arkhangelsk.su",
-	"balashov.su",
-	"bashkiria.su",
-	"bryansk.su",
-	"dagestan.su",
-	"grozny.su",
-	"ivanovo.su",
-	"kalmykia.su",
-	"kaluga.su",
-	"karelia.su",
-	"khakassia.su",
-	"krasnodar.su",
-	"kurgan.su",
-	"lenug.su",
-	"mordovia.su",
-	"msk.su",
-	"murmansk.su",
-	"nalchik.su",
-	"nov.su",
-	"obninsk.su",
-	"penza.su",
-	"pokrovsk.su",
-	"sochi.su",
-	"spb.su",
-	"togliatti.su",
-	"troitsk.su",
-	"tula.su",
-	"tuva.su",
-	"vladikavkaz.su",
-	"vladimir.su",
-	"vologda.su",
-	"sv",
-	"com.sv",
-	"edu.sv",
-	"gob.sv",
-	"org.sv",
-	"red.sv",
-	"sx",
-	"gov.sx",
-	"sy",
-	"edu.sy",
-	"gov.sy",
-	"net.sy",
-	"mil.sy",
-	"com.sy",
-	"org.sy",
-	"sz",
-	"co.sz",
-	"ac.sz",
-	"org.sz",
-	"tc",
-	"td",
-	"tel",
-	"tf",
-	"tg",
-	"th",
-	"ac.th",
-	"co.th",
-	"go.th",
-	"in.th",
-	"mi.th",
-	"net.th",
-	"or.th",
-	"tj",
-	"ac.tj",
-	"biz.tj",
-	"co.tj",
-	"com.tj",
-	"edu.tj",
-	"go.tj",
-	"gov.tj",
-	"int.tj",
-	"mil.tj",
-	"name.tj",
-	"net.tj",
-	"nic.tj",
-	"org.tj",
-	"test.tj",
-	"web.tj",
-	"tk",
-	"tl",
-	"gov.tl",
-	"tm",
-	"com.tm",
-	"co.tm",
-	"org.tm",
-	"net.tm",
-	"nom.tm",
-	"gov.tm",
-	"mil.tm",
-	"edu.tm",
-	"tn",
-	"com.tn",
-	"ens.tn",
-	"fin.tn",
-	"gov.tn",
-	"ind.tn",
-	"intl.tn",
-	"nat.tn",
-	"net.tn",
-	"org.tn",
-	"info.tn",
-	"perso.tn",
-	"tourism.tn",
-	"edunet.tn",
-	"rnrt.tn",
-	"rns.tn",
-	"rnu.tn",
-	"mincom.tn",
-	"agrinet.tn",
-	"defense.tn",
-	"turen.tn",
-	"to",
-	"com.to",
-	"gov.to",
-	"net.to",
-	"org.to",
-	"edu.to",
-	"mil.to",
-	"tr",
-	"com.tr",
-	"info.tr",
-	"biz.tr",
-	"net.tr",
-	"org.tr",
-	"web.tr",
-	"gen.tr",
-	"tv.tr",
-	"av.tr",
-	"dr.tr",
-	"bbs.tr",
-	"name.tr",
-	"tel.tr",
-	"gov.tr",
-	"bel.tr",
-	"pol.tr",
-	"mil.tr",
-	"k12.tr",
-	"edu.tr",
-	"kep.tr",
-	"nc.tr",
-	"gov.nc.tr",
-	"travel",
-	"tt",
-	"co.tt",
-	"com.tt",
-	"org.tt",
-	"net.tt",
-	"biz.tt",
-	"info.tt",
-	"pro.tt",
-	"int.tt",
-	"coop.tt",
-	"jobs.tt",
-	"mobi.tt",
-	"travel.tt",
-	"museum.tt",
-	"aero.tt",
-	"name.tt",
-	"gov.tt",
-	"edu.tt",
-	"tv",
-	"tw",
-	"edu.tw",
-	"gov.tw",
-	"mil.tw",
-	"com.tw",
-	"net.tw",
-	"org.tw",
-	"idv.tw",
-	"game.tw",
-	"ebiz.tw",
-	"club.tw",
-	"xn--zf0ao64a.tw",
-	"xn--uc0atv.tw",
-	"xn--czrw28b.tw",
-	"tz",
-	"ac.tz",
-	"co.tz",
-	"go.tz",
-	"hotel.tz",
-	"info.tz",
-	"me.tz",
-	"mil.tz",
-	"mobi.tz",
-	"ne.tz",
-	"or.tz",
-	"sc.tz",
-	"tv.tz",
-	"ua",
-	"com.ua",
-	"edu.ua",
-	"gov.ua",
-	"in.ua",
-	"net.ua",
-	"org.ua",
-	"cherkassy.ua",
-	"cherkasy.ua",
-	"chernigov.ua",
-	"chernihiv.ua",
-	"chernivtsi.ua",
-	"chernovtsy.ua",
-	"ck.ua",
-	"cn.ua",
-	"cr.ua",
-	"crimea.ua",
-	"cv.ua",
-	"dn.ua",
-	"dnepropetrovsk.ua",
-	"dnipropetrovsk.ua",
-	"dominic.ua",
-	"donetsk.ua",
-	"dp.ua",
-	"if.ua",
-	"ivano-frankivsk.ua",
-	"kh.ua",
-	"kharkiv.ua",
-	"kharkov.ua",
-	"kherson.ua",
-	"khmelnitskiy.ua",
-	"khmelnytskyi.ua",
-	"kiev.ua",
-	"kirovograd.ua",
-	"km.ua",
-	"kr.ua",
-	"krym.ua",
-	"ks.ua",
-	"kv.ua",
-	"kyiv.ua",
-	"lg.ua",
-	"lt.ua",
-	"lugansk.ua",
-	"lutsk.ua",
-	"lv.ua",
-	"lviv.ua",
-	"mk.ua",
-	"mykolaiv.ua",
-	"nikolaev.ua",
-	"od.ua",
-	"odesa.ua",
-	"odessa.ua",
-	"pl.ua",
-	"poltava.ua",
-	"rivne.ua",
-	"rovno.ua",
-	"rv.ua",
-	"sb.ua",
-	"sebastopol.ua",
-	"sevastopol.ua",
-	"sm.ua",
-	"sumy.ua",
-	"te.ua",
-	"ternopil.ua",
-	"uz.ua",
-	"uzhgorod.ua",
-	"vinnica.ua",
-	"vinnytsia.ua",
-	"vn.ua",
-	"volyn.ua",
-	"yalta.ua",
-	"zaporizhzhe.ua",
-	"zaporizhzhia.ua",
-	"zhitomir.ua",
-	"zhytomyr.ua",
-	"zp.ua",
-	"zt.ua",
-	"ug",
-	"co.ug",
-	"or.ug",
-	"ac.ug",
-	"sc.ug",
-	"go.ug",
-	"ne.ug",
-	"com.ug",
-	"org.ug",
-	"uk",
-	"ac.uk",
-	"co.uk",
-	"gov.uk",
-	"ltd.uk",
-	"me.uk",
-	"net.uk",
-	"nhs.uk",
-	"org.uk",
-	"plc.uk",
-	"police.uk",
-	"*.sch.uk",
-	"us",
-	"dni.us",
-	"fed.us",
-	"isa.us",
-	"kids.us",
-	"nsn.us",
-	"ak.us",
-	"al.us",
-	"ar.us",
-	"as.us",
-	"az.us",
-	"ca.us",
-	"co.us",
-	"ct.us",
-	"dc.us",
-	"de.us",
-	"fl.us",
-	"ga.us",
-	"gu.us",
-	"hi.us",
-	"ia.us",
-	"id.us",
-	"il.us",
-	"in.us",
-	"ks.us",
-	"ky.us",
-	"la.us",
-	"ma.us",
-	"md.us",
-	"me.us",
-	"mi.us",
-	"mn.us",
-	"mo.us",
-	"ms.us",
-	"mt.us",
-	"nc.us",
-	"nd.us",
-	"ne.us",
-	"nh.us",
-	"nj.us",
-	"nm.us",
-	"nv.us",
-	"ny.us",
-	"oh.us",
-	"ok.us",
-	"or.us",
-	"pa.us",
-	"pr.us",
-	"ri.us",
-	"sc.us",
-	"sd.us",
-	"tn.us",
-	"tx.us",
-	"ut.us",
-	"vi.us",
-	"vt.us",
-	"va.us",
-	"wa.us",
-	"wi.us",
-	"wv.us",
-	"wy.us",
-	"k12.ak.us",
-	"k12.al.us",
-	"k12.ar.us",
-	"k12.as.us",
-	"k12.az.us",
-	"k12.ca.us",
-	"k12.co.us",
-	"k12.ct.us",
-	"k12.dc.us",
-	"k12.de.us",
-	"k12.fl.us",
-	"k12.ga.us",
-	"k12.gu.us",
-	"k12.ia.us",
-	"k12.id.us",
-	"k12.il.us",
-	"k12.in.us",
-	"k12.ks.us",
-	"k12.ky.us",
-	"k12.la.us",
-	"k12.ma.us",
-	"k12.md.us",
-	"k12.me.us",
-	"k12.mi.us",
-	"k12.mn.us",
-	"k12.mo.us",
-	"k12.ms.us",
-	"k12.mt.us",
-	"k12.nc.us",
-	"k12.ne.us",
-	"k12.nh.us",
-	"k12.nj.us",
-	"k12.nm.us",
-	"k12.nv.us",
-	"k12.ny.us",
-	"k12.oh.us",
-	"k12.ok.us",
-	"k12.or.us",
-	"k12.pa.us",
-	"k12.pr.us",
-	"k12.ri.us",
-	"k12.sc.us",
-	"k12.tn.us",
-	"k12.tx.us",
-	"k12.ut.us",
-	"k12.vi.us",
-	"k12.vt.us",
-	"k12.va.us",
-	"k12.wa.us",
-	"k12.wi.us",
-	"k12.wy.us",
-	"cc.ak.us",
-	"cc.al.us",
-	"cc.ar.us",
-	"cc.as.us",
-	"cc.az.us",
-	"cc.ca.us",
-	"cc.co.us",
-	"cc.ct.us",
-	"cc.dc.us",
-	"cc.de.us",
-	"cc.fl.us",
-	"cc.ga.us",
-	"cc.gu.us",
-	"cc.hi.us",
-	"cc.ia.us",
-	"cc.id.us",
-	"cc.il.us",
-	"cc.in.us",
-	"cc.ks.us",
-	"cc.ky.us",
-	"cc.la.us",
-	"cc.ma.us",
-	"cc.md.us",
-	"cc.me.us",
-	"cc.mi.us",
-	"cc.mn.us",
-	"cc.mo.us",
-	"cc.ms.us",
-	"cc.mt.us",
-	"cc.nc.us",
-	"cc.nd.us",
-	"cc.ne.us",
-	"cc.nh.us",
-	"cc.nj.us",
-	"cc.nm.us",
-	"cc.nv.us",
-	"cc.ny.us",
-	"cc.oh.us",
-	"cc.ok.us",
-	"cc.or.us",
-	"cc.pa.us",
-	"cc.pr.us",
-	"cc.ri.us",
-	"cc.sc.us",
-	"cc.sd.us",
-	"cc.tn.us",
-	"cc.tx.us",
-	"cc.ut.us",
-	"cc.vi.us",
-	"cc.vt.us",
-	"cc.va.us",
-	"cc.wa.us",
-	"cc.wi.us",
-	"cc.wv.us",
-	"cc.wy.us",
-	"lib.ak.us",
-	"lib.al.us",
-	"lib.ar.us",
-	"lib.as.us",
-	"lib.az.us",
-	"lib.ca.us",
-	"lib.co.us",
-	"lib.ct.us",
-	"lib.dc.us",
-	"lib.fl.us",
-	"lib.ga.us",
-	"lib.gu.us",
-	"lib.hi.us",
-	"lib.ia.us",
-	"lib.id.us",
-	"lib.il.us",
-	"lib.in.us",
-	"lib.ks.us",
-	"lib.ky.us",
-	"lib.la.us",
-	"lib.ma.us",
-	"lib.md.us",
-	"lib.me.us",
-	"lib.mi.us",
-	"lib.mn.us",
-	"lib.mo.us",
-	"lib.ms.us",
-	"lib.mt.us",
-	"lib.nc.us",
-	"lib.nd.us",
-	"lib.ne.us",
-	"lib.nh.us",
-	"lib.nj.us",
-	"lib.nm.us",
-	"lib.nv.us",
-	"lib.ny.us",
-	"lib.oh.us",
-	"lib.ok.us",
-	"lib.or.us",
-	"lib.pa.us",
-	"lib.pr.us",
-	"lib.ri.us",
-	"lib.sc.us",
-	"lib.sd.us",
-	"lib.tn.us",
-	"lib.tx.us",
-	"lib.ut.us",
-	"lib.vi.us",
-	"lib.vt.us",
-	"lib.va.us",
-	"lib.wa.us",
-	"lib.wi.us",
-	"lib.wy.us",
-	"pvt.k12.ma.us",
-	"chtr.k12.ma.us",
-	"paroch.k12.ma.us",
-	"uy",
-	"com.uy",
-	"edu.uy",
-	"gub.uy",
-	"mil.uy",
-	"net.uy",
-	"org.uy",
-	"uz",
-	"co.uz",
-	"com.uz",
-	"net.uz",
-	"org.uz",
-	"va",
-	"vc",
-	"com.vc",
-	"net.vc",
-	"org.vc",
-	"gov.vc",
-	"mil.vc",
-	"edu.vc",
-	"ve",
-	"arts.ve",
-	"co.ve",
-	"com.ve",
-	"e12.ve",
-	"edu.ve",
-	"firm.ve",
-	"gob.ve",
-	"gov.ve",
-	"info.ve",
-	"int.ve",
-	"mil.ve",
-	"net.ve",
-	"org.ve",
-	"rec.ve",
-	"store.ve",
-	"tec.ve",
-	"web.ve",
-	"vg",
-	"vi",
-	"co.vi",
-	"com.vi",
-	"k12.vi",
-	"net.vi",
-	"org.vi",
-	"vn",
-	"com.vn",
-	"net.vn",
-	"org.vn",
-	"edu.vn",
-	"gov.vn",
-	"int.vn",
-	"ac.vn",
-	"biz.vn",
-	"info.vn",
-	"name.vn",
-	"pro.vn",
-	"health.vn",
-	"vu",
-	"com.vu",
-	"edu.vu",
-	"net.vu",
-	"org.vu",
-	"wf",
-	"ws",
-	"com.ws",
-	"net.ws",
-	"org.ws",
-	"gov.ws",
-	"edu.ws",
-	"yt",
-	"xn--mgbaam7a8h",
-	"xn--y9a3aq",
-	"xn--54b7fta0cc",
-	"xn--90ais",
-	"xn--fiqs8s",
-	"xn--fiqz9s",
-	"xn--lgbbat1ad8j",
-	"xn--wgbh1c",
-	"xn--e1a4c",
-	"xn--node",
-	"xn--qxam",
-	"xn--j6w193g",
-	"xn--h2brj9c",
-	"xn--mgbbh1a71e",
-	"xn--fpcrj9c3d",
-	"xn--gecrj9c",
-	"xn--s9brj9c",
-	"xn--45brj9c",
-	"xn--xkc2dl3a5ee0h",
-	"xn--mgba3a4f16a",
-	"xn--mgba3a4fra",
-	"xn--mgbtx2b",
-	"xn--mgbayh7gpa",
-	"xn--3e0b707e",
-	"xn--80ao21a",
-	"xn--fzc2c9e2c",
-	"xn--xkc2al3hye2a",
-	"xn--mgbc0a9azcg",
-	"xn--d1alf",
-	"xn--l1acc",
-	"xn--mix891f",
-	"xn--mix082f",
-	"xn--mgbx4cd0ab",
-	"xn--mgb9awbf",
-	"xn--mgbai9azgqp6j",
-	"xn--mgbai9a5eva00b",
-	"xn--ygbi2ammx",
-	"xn--90a3ac",
-	"xn--o1ac.xn--90a3ac",
-	"xn--c1avg.xn--90a3ac",
-	"xn--90azh.xn--90a3ac",
-	"xn--d1at.xn--90a3ac",
-	"xn--o1ach.xn--90a3ac",
-	"xn--80au.xn--90a3ac",
-	"xn--p1ai",
-	"xn--wgbl6a",
-	"xn--mgberp4a5d4ar",
-	"xn--mgberp4a5d4a87g",
-	"xn--mgbqly7c0a67fbc",
-	"xn--mgbqly7cvafr",
-	"xn--mgbpl2fh",
-	"xn--yfro4i67o",
-	"xn--clchc0ea0b2g2a9gcd",
-	"xn--ogbpf8fl",
-	"xn--mgbtf8fl",
-	"xn--o3cw4h",
-	"xn--pgbs0dh",
-	"xn--kpry57d",
-	"xn--kprw13d",
-	"xn--nnx388a",
-	"xn--j1amh",
-	"xn--mgb2ddes",
-	"xxx",
-	"*.ye",
-	"ac.za",
-	"agric.za",
-	"alt.za",
-	"co.za",
-	"edu.za",
-	"gov.za",
-	"grondar.za",
-	"law.za",
-	"mil.za",
-	"net.za",
-	"ngo.za",
-	"nis.za",
-	"nom.za",
-	"org.za",
-	"school.za",
-	"tm.za",
-	"web.za",
-	"zm",
-	"ac.zm",
-	"biz.zm",
-	"co.zm",
-	"com.zm",
-	"edu.zm",
-	"gov.zm",
-	"info.zm",
-	"mil.zm",
-	"net.zm",
-	"org.zm",
-	"sch.zm",
-	"*.zw",
-	"aaa",
-	"aarp",
-	"abarth",
-	"abb",
-	"abbott",
-	"abbvie",
-	"abc",
-	"able",
-	"abogado",
-	"abudhabi",
-	"academy",
-	"accenture",
-	"accountant",
-	"accountants",
-	"aco",
-	"active",
-	"actor",
-	"adac",
-	"ads",
-	"adult",
-	"aeg",
-	"aetna",
-	"afamilycompany",
-	"afl",
-	"africa",
-	"agakhan",
-	"agency",
-	"aig",
-	"aigo",
-	"airbus",
-	"airforce",
-	"airtel",
-	"akdn",
-	"alfaromeo",
-	"alibaba",
-	"alipay",
-	"allfinanz",
-	"allstate",
-	"ally",
-	"alsace",
-	"alstom",
-	"americanexpress",
-	"americanfamily",
-	"amex",
-	"amfam",
-	"amica",
-	"amsterdam",
-	"analytics",
-	"android",
-	"anquan",
-	"anz",
-	"aol",
-	"apartments",
-	"app",
-	"apple",
-	"aquarelle",
-	"arab",
-	"aramco",
-	"archi",
-	"army",
-	"art",
-	"arte",
-	"asda",
-	"associates",
-	"athleta",
-	"attorney",
-	"auction",
-	"audi",
-	"audible",
-	"audio",
-	"auspost",
-	"author",
-	"auto",
-	"autos",
-	"avianca",
-	"aws",
-	"axa",
-	"azure",
-	"baby",
-	"baidu",
-	"banamex",
-	"bananarepublic",
-	"band",
-	"bank",
-	"bar",
-	"barcelona",
-	"barclaycard",
-	"barclays",
-	"barefoot",
-	"bargains",
-	"baseball",
-	"basketball",
-	"bauhaus",
-	"bayern",
-	"bbc",
-	"bbt",
-	"bbva",
-	"bcg",
-	"bcn",
-	"beats",
-	"beauty",
-	"beer",
-	"bentley",
-	"berlin",
-	"best",
-	"bestbuy",
-	"bet",
-	"bharti",
-	"bible",
-	"bid",
-	"bike",
-	"bing",
-	"bingo",
-	"bio",
-	"black",
-	"blackfriday",
-	"blanco",
-	"blockbuster",
-	"blog",
-	"bloomberg",
-	"blue",
-	"bms",
-	"bmw",
-	"bnl",
-	"bnpparibas",
-	"boats",
-	"boehringer",
-	"bofa",
-	"bom",
-	"bond",
-	"boo",
-	"book",
-	"booking",
-	"boots",
-	"bosch",
-	"bostik",
-	"boston",
-	"bot",
-	"boutique",
-	"box",
-	"bradesco",
-	"bridgestone",
-	"broadway",
-	"broker",
-	"brother",
-	"brussels",
-	"budapest",
-	"bugatti",
-	"build",
-	"builders",
-	"business",
-	"buy",
-	"buzz",
-	"bzh",
-	"cab",
-	"cafe",
-	"cal",
-	"call",
-	"calvinklein",
-	"cam",
-	"camera",
-	"camp",
-	"cancerresearch",
-	"canon",
-	"capetown",
-	"capital",
-	"capitalone",
-	"car",
-	"caravan",
-	"cards",
-	"care",
-	"career",
-	"careers",
-	"cars",
-	"cartier",
-	"casa",
-	"case",
-	"caseih",
-	"cash",
-	"casino",
-	"catering",
-	"catholic",
-	"cba",
-	"cbn",
-	"cbre",
-	"cbs",
-	"ceb",
-	"center",
-	"ceo",
-	"cern",
-	"cfa",
-	"cfd",
-	"chanel",
-	"channel",
-	"chase",
-	"chat",
-	"cheap",
-	"chintai",
-	"chloe",
-	"christmas",
-	"chrome",
-	"chrysler",
-	"church",
-	"cipriani",
-	"circle",
-	"cisco",
-	"citadel",
-	"citi",
-	"citic",
-	"city",
-	"cityeats",
-	"claims",
-	"cleaning",
-	"click",
-	"clinic",
-	"clinique",
-	"clothing",
-	"cloud",
-	"club",
-	"clubmed",
-	"coach",
-	"codes",
-	"coffee",
-	"college",
-	"cologne",
-	"comcast",
-	"commbank",
-	"community",
-	"company",
-	"compare",
-	"computer",
-	"comsec",
-	"condos",
-	"construction",
-	"consulting",
-	"contact",
-	"contractors",
-	"cooking",
-	"cookingchannel",
-	"cool",
-	"corsica",
-	"country",
-	"coupon",
-	"coupons",
-	"courses",
-	"credit",
-	"creditcard",
-	"creditunion",
-	"cricket",
-	"crown",
-	"crs",
-	"cruise",
-	"cruises",
-	"csc",
-	"cuisinella",
-	"cymru",
-	"cyou",
-	"dabur",
-	"dad",
-	"dance",
-	"data",
-	"date",
-	"dating",
-	"datsun",
-	"day",
-	"dclk",
-	"dds",
-	"deal",
-	"dealer",
-	"deals",
-	"degree",
-	"delivery",
-	"dell",
-	"deloitte",
-	"delta",
-	"democrat",
-	"dental",
-	"dentist",
-	"desi",
-	"design",
-	"dev",
-	"dhl",
-	"diamonds",
-	"diet",
-	"digital",
-	"direct",
-	"directory",
-	"discount",
-	"discover",
-	"dish",
-	"diy",
-	"dnp",
-	"docs",
-	"doctor",
-	"dodge",
-	"dog",
-	"doha",
-	"domains",
-	"dot",
-	"download",
-	"drive",
-	"dtv",
-	"dubai",
-	"duck",
-	"dunlop",
-	"duns",
-	"dupont",
-	"durban",
-	"dvag",
-	"dvr",
-	"dwg",
-	"earth",
-	"eat",
-	"eco",
-	"edeka",
-	"education",
-	"email",
-	"emerck",
-	"energy",
-	"engineer",
-	"engineering",
-	"enterprises",
-	"epost",
-	"epson",
-	"equipment",
-	"ericsson",
-	"erni",
-	"esq",
-	"estate",
-	"esurance",
-	"etisalat",
-	"eurovision",
-	"eus",
-	"events",
-	"everbank",
-	"exchange",
-	"expert",
-	"exposed",
-	"express",
-	"extraspace",
-	"fage",
-	"fail",
-	"fairwinds",
-	"faith",
-	"family",
-	"fan",
-	"fans",
-	"farm",
-	"farmers",
-	"fashion",
-	"fast",
-	"fedex",
-	"feedback",
-	"ferrari",
-	"ferrero",
-	"fiat",
-	"fidelity",
-	"fido",
-	"film",
-	"final",
-	"finance",
-	"financial",
-	"fire",
-	"firestone",
-	"firmdale",
-	"fish",
-	"fishing",
-	"fit",
-	"fitness",
-	"flickr",
-	"flights",
-	"flir",
-	"florist",
-	"flowers",
-	"fly",
-	"foo",
-	"food",
-	"foodnetwork",
-	"football",
-	"ford",
-	"forex",
-	"forsale",
-	"forum",
-	"foundation",
-	"fox",
-	"free",
-	"fresenius",
-	"frl",
-	"frogans",
-	"frontdoor",
-	"frontier",
-	"ftr",
-	"fujitsu",
-	"fujixerox",
-	"fun",
-	"fund",
-	"furniture",
-	"futbol",
-	"fyi",
-	"gal",
-	"gallery",
-	"gallo",
-	"gallup",
-	"game",
-	"games",
-	"gap",
-	"garden",
-	"gbiz",
-	"gdn",
-	"gea",
-	"gent",
-	"genting",
-	"george",
-	"ggee",
-	"gift",
-	"gifts",
-	"gives",
-	"giving",
-	"glade",
-	"glass",
-	"gle",
-	"global",
-	"globo",
-	"gmail",
-	"gmbh",
-	"gmo",
-	"gmx",
-	"godaddy",
-	"gold",
-	"goldpoint",
-	"golf",
-	"goo",
-	"goodhands",
-	"goodyear",
-	"goog",
-	"google",
-	"gop",
-	"got",
-	"grainger",
-	"graphics",
-	"gratis",
-	"green",
-	"gripe",
-	"grocery",
-	"group",
-	"guardian",
-	"gucci",
-	"guge",
-	"guide",
-	"guitars",
-	"guru",
-	"hair",
-	"hamburg",
-	"hangout",
-	"haus",
-	"hbo",
-	"hdfc",
-	"hdfcbank",
-	"health",
-	"healthcare",
-	"help",
-	"helsinki",
-	"here",
-	"hermes",
-	"hgtv",
-	"hiphop",
-	"hisamitsu",
-	"hitachi",
-	"hiv",
-	"hkt",
-	"hockey",
-	"holdings",
-	"holiday",
-	"homedepot",
-	"homegoods",
-	"homes",
-	"homesense",
-	"honda",
-	"honeywell",
-	"horse",
-	"hospital",
-	"host",
-	"hosting",
-	"hot",
-	"hoteles",
-	"hotels",
-	"hotmail",
-	"house",
-	"how",
-	"hsbc",
-	"htc",
-	"hughes",
-	"hyatt",
-	"hyundai",
-	"ibm",
-	"icbc",
-	"ice",
-	"icu",
-	"ieee",
-	"ifm",
-	"iinet",
-	"ikano",
-	"imamat",
-	"imdb",
-	"immo",
-	"immobilien",
-	"industries",
-	"infiniti",
-	"ing",
-	"ink",
-	"institute",
-	"insurance",
-	"insure",
-	"intel",
-	"international",
-	"intuit",
-	"investments",
-	"ipiranga",
-	"irish",
-	"iselect",
-	"ismaili",
-	"ist",
-	"istanbul",
-	"itau",
-	"itv",
-	"iveco",
-	"iwc",
-	"jaguar",
-	"java",
-	"jcb",
-	"jcp",
-	"jeep",
-	"jetzt",
-	"jewelry",
-	"jio",
-	"jlc",
-	"jll",
-	"jmp",
-	"jnj",
-	"joburg",
-	"jot",
-	"joy",
-	"jpmorgan",
-	"jprs",
-	"juegos",
-	"juniper",
-	"kaufen",
-	"kddi",
-	"kerryhotels",
-	"kerrylogistics",
-	"kerryproperties",
-	"kfh",
-	"kia",
-	"kim",
-	"kinder",
-	"kindle",
-	"kitchen",
-	"kiwi",
-	"koeln",
-	"komatsu",
-	"kosher",
-	"kpmg",
-	"kpn",
-	"krd",
-	"kred",
-	"kuokgroup",
-	"kyoto",
-	"lacaixa",
-	"ladbrokes",
-	"lamborghini",
-	"lamer",
-	"lancaster",
-	"lancia",
-	"lancome",
-	"land",
-	"landrover",
-	"lanxess",
-	"lasalle",
-	"lat",
-	"latino",
-	"latrobe",
-	"law",
-	"lawyer",
-	"lds",
-	"lease",
-	"leclerc",
-	"lefrak",
-	"legal",
-	"lego",
-	"lexus",
-	"lgbt",
-	"liaison",
-	"lidl",
-	"life",
-	"lifeinsurance",
-	"lifestyle",
-	"lighting",
-	"like",
-	"lilly",
-	"limited",
-	"limo",
-	"lincoln",
-	"linde",
-	"link",
-	"lipsy",
-	"live",
-	"living",
-	"lixil",
-	"loan",
-	"loans",
-	"locker",
-	"locus",
-	"loft",
-	"lol",
-	"london",
-	"lotte",
-	"lotto",
-	"love",
-	"lpl",
-	"lplfinancial",
-	"ltd",
-	"ltda",
-	"lundbeck",
-	"lupin",
-	"luxe",
-	"luxury",
-	"macys",
-	"madrid",
-	"maif",
-	"maison",
-	"makeup",
-	"man",
-	"management",
-	"mango",
-	"map",
-	"market",
-	"marketing",
-	"markets",
-	"marriott",
-	"marshalls",
-	"maserati",
-	"mattel",
-	"mba",
-	"mcd",
-	"mcdonalds",
-	"mckinsey",
-	"med",
-	"media",
-	"meet",
-	"melbourne",
-	"meme",
-	"memorial",
-	"men",
-	"menu",
-	"meo",
-	"merckmsd",
-	"metlife",
-	"miami",
-	"microsoft",
-	"mini",
-	"mint",
-	"mit",
-	"mitsubishi",
-	"mlb",
-	"mls",
-	"mma",
-	"mobile",
-	"mobily",
-	"moda",
-	"moe",
-	"moi",
-	"mom",
-	"monash",
-	"money",
-	"monster",
-	"montblanc",
-	"mopar",
-	"mormon",
-	"mortgage",
-	"moscow",
-	"moto",
-	"motorcycles",
-	"mov",
-	"movie",
-	"movistar",
-	"msd",
-	"mtn",
-	"mtpc",
-	"mtr",
-	"mutual",
-	"mutuelle",
-	"nab",
-	"nadex",
-	"nagoya",
-	"nationwide",
-	"natura",
-	"navy",
-	"nba",
-	"nec",
-	"netbank",
-	"netflix",
-	"network",
-	"neustar",
-	"new",
-	"newholland",
-	"news",
-	"next",
-	"nextdirect",
-	"nexus",
-	"nfl",
-	"ngo",
-	"nhk",
-	"nico",
-	"nike",
-	"nikon",
-	"ninja",
-	"nissan",
-	"nissay",
-	"nokia",
-	"northwesternmutual",
-	"norton",
-	"now",
-	"nowruz",
-	"nowtv",
-	"nra",
-	"nrw",
-	"ntt",
-	"nyc",
-	"obi",
-	"observer",
-	"off",
-	"office",
-	"okinawa",
-	"olayan",
-	"olayangroup",
-	"oldnavy",
-	"ollo",
-	"omega",
-	"one",
-	"ong",
-	"onl",
-	"online",
-	"onyourside",
-	"ooo",
-	"open",
-	"oracle",
-	"orange",
-	"organic",
-	"orientexpress",
-	"origins",
-	"osaka",
-	"otsuka",
-	"ott",
-	"ovh",
-	"page",
-	"pamperedchef",
-	"panasonic",
-	"panerai",
-	"paris",
-	"pars",
-	"partners",
-	"parts",
-	"party",
-	"passagens",
-	"pay",
-	"pccw",
-	"pet",
-	"pfizer",
-	"pharmacy",
-	"phd",
-	"philips",
-	"phone",
-	"photo",
-	"photography",
-	"photos",
-	"physio",
-	"piaget",
-	"pics",
-	"pictet",
-	"pictures",
-	"pid",
-	"pin",
-	"ping",
-	"pink",
-	"pioneer",
-	"pizza",
-	"place",
-	"play",
-	"playstation",
-	"plumbing",
-	"plus",
-	"pnc",
-	"pohl",
-	"poker",
-	"politie",
-	"porn",
-	"pramerica",
-	"praxi",
-	"press",
-	"prime",
-	"prod",
-	"productions",
-	"prof",
-	"progressive",
-	"promo",
-	"properties",
-	"property",
-	"protection",
-	"pru",
-	"prudential",
-	"pub",
-	"pwc",
-	"qpon",
-	"quebec",
-	"quest",
-	"qvc",
-	"racing",
-	"radio",
-	"raid",
-	"read",
-	"realestate",
-	"realtor",
-	"realty",
-	"recipes",
-	"red",
-	"redstone",
-	"redumbrella",
-	"rehab",
-	"reise",
-	"reisen",
-	"reit",
-	"reliance",
-	"ren",
-	"rent",
-	"rentals",
-	"repair",
-	"report",
-	"republican",
-	"rest",
-	"restaurant",
-	"review",
-	"reviews",
-	"rexroth",
-	"rich",
-	"richardli",
-	"ricoh",
-	"rightathome",
-	"ril",
-	"rio",
-	"rip",
-	"rmit",
-	"rocher",
-	"rocks",
-	"rodeo",
-	"rogers",
-	"room",
-	"rsvp",
-	"ruhr",
-	"run",
-	"rwe",
-	"ryukyu",
-	"saarland",
-	"safe",
-	"safety",
-	"sakura",
-	"sale",
-	"salon",
-	"samsclub",
-	"samsung",
-	"sandvik",
-	"sandvikcoromant",
-	"sanofi",
-	"sap",
-	"sapo",
-	"sarl",
-	"sas",
-	"save",
-	"saxo",
-	"sbi",
-	"sbs",
-	"sca",
-	"scb",
-	"schaeffler",
-	"schmidt",
-	"scholarships",
-	"school",
-	"schule",
-	"schwarz",
-	"science",
-	"scjohnson",
-	"scor",
-	"scot",
-	"search",
-	"seat",
-	"secure",
-	"security",
-	"seek",
-	"select",
-	"sener",
-	"services",
-	"ses",
-	"seven",
-	"sew",
-	"sex",
-	"sexy",
-	"sfr",
-	"shangrila",
-	"sharp",
-	"shaw",
-	"shell",
-	"shia",
-	"shiksha",
-	"shoes",
-	"shop",
-	"shopping",
-	"shouji",
-	"show",
-	"showtime",
-	"shriram",
-	"silk",
-	"sina",
-	"singles",
-	"site",
-	"ski",
-	"skin",
-	"sky",
-	"skype",
-	"sling",
-	"smart",
-	"smile",
-	"sncf",
-	"soccer",
-	"social",
-	"softbank",
-	"software",
-	"sohu",
-	"solar",
-	"solutions",
-	"song",
-	"sony",
-	"soy",
-	"space",
-	"spiegel",
-	"spot",
-	"spreadbetting",
-	"srl",
-	"srt",
-	"stada",
-	"staples",
-	"star",
-	"starhub",
-	"statebank",
-	"statefarm",
-	"statoil",
-	"stc",
-	"stcgroup",
-	"stockholm",
-	"storage",
-	"store",
-	"stream",
-	"studio",
-	"study",
-	"style",
-	"sucks",
-	"supplies",
-	"supply",
-	"support",
-	"surf",
-	"surgery",
-	"suzuki",
-	"swatch",
-	"swiftcover",
-	"swiss",
-	"sydney",
-	"symantec",
-	"systems",
-	"tab",
-	"taipei",
-	"talk",
-	"taobao",
-	"target",
-	"tatamotors",
-	"tatar",
-	"tattoo",
-	"tax",
-	"taxi",
-	"tci",
-	"tdk",
-	"team",
-	"tech",
-	"technology",
-	"telecity",
-	"telefonica",
-	"temasek",
-	"tennis",
-	"teva",
-	"thd",
-	"theater",
-	"theatre",
-	"theguardian",
-	"tiaa",
-	"tickets",
-	"tienda",
-	"tiffany",
-	"tips",
-	"tires",
-	"tirol",
-	"tjmaxx",
-	"tjx",
-	"tkmaxx",
-	"tmall",
-	"today",
-	"tokyo",
-	"tools",
-	"top",
-	"toray",
-	"toshiba",
-	"total",
-	"tours",
-	"town",
-	"toyota",
-	"toys",
-	"trade",
-	"trading",
-	"training",
-	"travelchannel",
-	"travelers",
-	"travelersinsurance",
-	"trust",
-	"trv",
-	"tube",
-	"tui",
-	"tunes",
-	"tushu",
-	"tvs",
-	"ubank",
-	"ubs",
-	"uconnect",
-	"unicom",
-	"university",
-	"uno",
-	"uol",
-	"ups",
-	"vacations",
-	"vana",
-	"vanguard",
-	"vegas",
-	"ventures",
-	"verisign",
-	"versicherung",
-	"vet",
-	"viajes",
-	"video",
-	"vig",
-	"viking",
-	"villas",
-	"vin",
-	"vip",
-	"virgin",
-	"visa",
-	"vision",
-	"vista",
-	"vistaprint",
-	"viva",
-	"vivo",
-	"vlaanderen",
-	"vodka",
-	"volkswagen",
-	"volvo",
-	"vote",
-	"voting",
-	"voto",
-	"voyage",
-	"vuelos",
-	"wales",
-	"walmart",
-	"walter",
-	"wang",
-	"wanggou",
-	"warman",
-	"watch",
-	"watches",
-	"weather",
-	"weatherchannel",
-	"webcam",
-	"weber",
-	"website",
-	"wed",
-	"wedding",
-	"weibo",
-	"weir",
-	"whoswho",
-	"wien",
-	"wiki",
-	"williamhill",
-	"win",
-	"windows",
-	"wine",
-	"winners",
-	"wme",
-	"wolterskluwer",
-	"woodside",
-	"work",
-	"works",
-	"world",
-	"wow",
-	"wtc",
-	"wtf",
-	"xbox",
-	"xerox",
-	"xfinity",
-	"xihuan",
-	"xin",
-	"xn--11b4c3d",
-	"xn--1ck2e1b",
-	"xn--1qqw23a",
-	"xn--30rr7y",
-	"xn--3bst00m",
-	"xn--3ds443g",
-	"xn--3oq18vl8pn36a",
-	"xn--3pxu8k",
-	"xn--42c2d9a",
-	"xn--45q11c",
-	"xn--4gbrim",
-	"xn--4gq48lf9j",
-	"xn--55qw42g",
-	"xn--55qx5d",
-	"xn--5su34j936bgsg",
-	"xn--5tzm5g",
-	"xn--6frz82g",
-	"xn--6qq986b3xl",
-	"xn--80adxhks",
-	"xn--80aqecdr1a",
-	"xn--80asehdb",
-	"xn--80aswg",
-	"xn--8y0a063a",
-	"xn--9dbq2a",
-	"xn--9et52u",
-	"xn--9krt00a",
-	"xn--b4w605ferd",
-	"xn--bck1b9a5dre4c",
-	"xn--c1avg",
-	"xn--c2br7g",
-	"xn--cck2b3b",
-	"xn--cg4bki",
-	"xn--czr694b",
-	"xn--czrs0t",
-	"xn--czru2d",
-	"xn--d1acj3b",
-	"xn--eckvdtc9d",
-	"xn--efvy88h",
-	"xn--estv75g",
-	"xn--fct429k",
-	"xn--fhbei",
-	"xn--fiq228c5hs",
-	"xn--fiq64b",
-	"xn--fjq720a",
-	"xn--flw351e",
-	"xn--fzys8d69uvgm",
-	"xn--g2xx48c",
-	"xn--gckr3f0f",
-	"xn--gk3at1e",
-	"xn--hxt814e",
-	"xn--i1b6b1a6a2e",
-	"xn--imr513n",
-	"xn--io0a7i",
-	"xn--j1aef",
-	"xn--jlq61u9w7b",
-	"xn--jvr189m",
-	"xn--kcrx77d1x4a",
-	"xn--kpu716f",
-	"xn--kput3i",
-	"xn--mgba3a3ejt",
-	"xn--mgba7c0bbn0a",
-	"xn--mgbaakc7dvf",
-	"xn--mgbab2bd",
-	"xn--mgbb9fbpob",
-	"xn--mgbca7dzdo",
-	"xn--mgbi4ecexp",
-	"xn--mgbt3dhd",
-	"xn--mk1bu44c",
-	"xn--mxtq1m",
-	"xn--ngbc5azd",
-	"xn--ngbe9e0a",
-	"xn--ngbrx",
-	"xn--nqv7f",
-	"xn--nqv7fs00ema",
-	"xn--nyqy26a",
-	"xn--p1acf",
-	"xn--pbt977c",
-	"xn--pssy2u",
-	"xn--q9jyb4c",
-	"xn--qcka1pmc",
-	"xn--rhqv96g",
-	"xn--rovu88b",
-	"xn--ses554g",
-	"xn--t60b56a",
-	"xn--tckwe",
-	"xn--tiq49xqyj",
-	"xn--unup4y",
-	"xn--vermgensberater-ctb",
-	"xn--vermgensberatung-pwb",
-	"xn--vhquv",
-	"xn--vuq861b",
-	"xn--w4r85el8fhu5dnra",
-	"xn--w4rs40l",
-	"xn--xhq521b",
-	"xn--zfr164b",
-	"xperia",
-	"xyz",
-	"yachts",
-	"yahoo",
-	"yamaxun",
-	"yandex",
-	"yodobashi",
-	"yoga",
-	"yokohama",
-	"you",
-	"youtube",
-	"yun",
-	"zappos",
-	"zara",
-	"zero",
-	"zip",
-	"zippo",
-	"zone",
-	"zuerich",
-	"beep.pl",
-	"*.compute.estate",
-	"*.alces.network",
-	"*.alwaysdata.net",
-	"cloudfront.net",
-	"*.compute.amazonaws.com",
-	"*.compute-1.amazonaws.com",
-	"*.compute.amazonaws.com.cn",
-	"us-east-1.amazonaws.com",
-	"elasticbeanstalk.cn-north-1.amazonaws.com.cn",
-	"*.elasticbeanstalk.com",
-	"*.elb.amazonaws.com",
-	"*.elb.amazonaws.com.cn",
-	"*.s3.amazonaws.com",
-	"s3-ap-northeast-1.amazonaws.com",
-	"s3-ap-northeast-2.amazonaws.com",
-	"s3-ap-south-1.amazonaws.com",
-	"s3-ap-southeast-1.amazonaws.com",
-	"s3-ap-southeast-2.amazonaws.com",
-	"s3-ca-central-1.amazonaws.com",
-	"s3-eu-central-1.amazonaws.com",
-	"s3-eu-west-1.amazonaws.com",
-	"s3-external-1.amazonaws.com",
-	"s3-fips-us-gov-west-1.amazonaws.com",
-	"s3-sa-east-1.amazonaws.com",
-	"s3-us-gov-west-1.amazonaws.com",
-	"s3-us-east-2.amazonaws.com",
-	"s3-us-west-1.amazonaws.com",
-	"s3-us-west-2.amazonaws.com",
-	"s3.ap-northeast-2.amazonaws.com",
-	"s3.ap-south-1.amazonaws.com",
-	"s3.cn-north-1.amazonaws.com.cn",
-	"s3.ca-central-1.amazonaws.com",
-	"s3.eu-central-1.amazonaws.com",
-	"s3.us-east-2.amazonaws.com",
-	"s3.dualstack.ap-northeast-1.amazonaws.com",
-	"s3.dualstack.ap-northeast-2.amazonaws.com",
-	"s3.dualstack.ap-south-1.amazonaws.com",
-	"s3.dualstack.ap-southeast-1.amazonaws.com",
-	"s3.dualstack.ap-southeast-2.amazonaws.com",
-	"s3.dualstack.ca-central-1.amazonaws.com",
-	"s3.dualstack.eu-central-1.amazonaws.com",
-	"s3.dualstack.eu-west-1.amazonaws.com",
-	"s3.dualstack.sa-east-1.amazonaws.com",
-	"s3.dualstack.us-east-1.amazonaws.com",
-	"s3.dualstack.us-east-2.amazonaws.com",
-	"s3-website-us-east-1.amazonaws.com",
-	"s3-website-us-west-1.amazonaws.com",
-	"s3-website-us-west-2.amazonaws.com",
-	"s3-website-ap-northeast-1.amazonaws.com",
-	"s3-website-ap-southeast-1.amazonaws.com",
-	"s3-website-ap-southeast-2.amazonaws.com",
-	"s3-website-eu-west-1.amazonaws.com",
-	"s3-website-sa-east-1.amazonaws.com",
-	"s3-website.ap-northeast-2.amazonaws.com",
-	"s3-website.ap-south-1.amazonaws.com",
-	"s3-website.ca-central-1.amazonaws.com",
-	"s3-website.eu-central-1.amazonaws.com",
-	"s3-website.us-east-2.amazonaws.com",
-	"t3l3p0rt.net",
-	"tele.amune.org",
-	"on-aptible.com",
-	"user.party.eus",
-	"pimienta.org",
-	"poivron.org",
-	"potager.org",
-	"sweetpepper.org",
-	"myasustor.com",
-	"myfritz.net",
-	"backplaneapp.io",
-	"betainabox.com",
-	"bnr.la",
-	"boxfuse.io",
-	"browsersafetymark.io",
-	"mycd.eu",
-	"ae.org",
-	"ar.com",
-	"br.com",
-	"cn.com",
-	"com.de",
-	"com.se",
-	"de.com",
-	"eu.com",
-	"gb.com",
-	"gb.net",
-	"hu.com",
-	"hu.net",
-	"jp.net",
-	"jpn.com",
-	"kr.com",
-	"mex.com",
-	"no.com",
-	"qc.com",
-	"ru.com",
-	"sa.com",
-	"se.com",
-	"se.net",
-	"uk.com",
-	"uk.net",
-	"us.com",
-	"uy.com",
-	"za.bz",
-	"za.com",
-	"africa.com",
-	"gr.com",
-	"in.net",
-	"us.org",
-	"co.com",
-	"c.la",
-	"certmgr.org",
-	"xenapponazure.com",
-	"virtueeldomein.nl",
-	"cloudcontrolled.com",
-	"cloudcontrolapp.com",
-	"co.ca",
-	"co.cz",
-	"c.cdn77.org",
-	"cdn77-ssl.net",
-	"r.cdn77.net",
-	"rsc.cdn77.org",
-	"ssl.origin.cdn77-secure.org",
-	"cloudns.asia",
-	"cloudns.biz",
-	"cloudns.club",
-	"cloudns.cc",
-	"cloudns.eu",
-	"cloudns.in",
-	"cloudns.info",
-	"cloudns.org",
-	"cloudns.pro",
-	"cloudns.pw",
-	"cloudns.us",
-	"co.nl",
-	"co.no",
-	"*.platform.sh",
-	"dyn.cosidns.de",
-	"dynamisches-dns.de",
-	"dnsupdater.de",
-	"internet-dns.de",
-	"l-o-g-i-n.de",
-	"dynamic-dns.info",
-	"feste-ip.net",
-	"knx-server.net",
-	"static-access.net",
-	"realm.cz",
-	"*.cryptonomic.net",
-	"cupcake.is",
-	"cyon.link",
-	"cyon.site",
-	"daplie.me",
-	"biz.dk",
-	"co.dk",
-	"firm.dk",
-	"reg.dk",
-	"store.dk",
-	"dedyn.io",
-	"dnshome.de",
-	"dreamhosters.com",
-	"mydrobo.com",
-	"drud.io",
-	"drud.us",
-	"duckdns.org",
-	"dy.fi",
-	"tunk.org",
-	"dyndns-at-home.com",
-	"dyndns-at-work.com",
-	"dyndns-blog.com",
-	"dyndns-free.com",
-	"dyndns-home.com",
-	"dyndns-ip.com",
-	"dyndns-mail.com",
-	"dyndns-office.com",
-	"dyndns-pics.com",
-	"dyndns-remote.com",
-	"dyndns-server.com",
-	"dyndns-web.com",
-	"dyndns-wiki.com",
-	"dyndns-work.com",
-	"dyndns.biz",
-	"dyndns.info",
-	"dyndns.org",
-	"dyndns.tv",
-	"at-band-camp.net",
-	"ath.cx",
-	"barrel-of-knowledge.info",
-	"barrell-of-knowledge.info",
-	"better-than.tv",
-	"blogdns.com",
-	"blogdns.net",
-	"blogdns.org",
-	"blogsite.org",
-	"boldlygoingnowhere.org",
-	"broke-it.net",
-	"buyshouses.net",
-	"cechire.com",
-	"dnsalias.com",
-	"dnsalias.net",
-	"dnsalias.org",
-	"dnsdojo.com",
-	"dnsdojo.net",
-	"dnsdojo.org",
-	"does-it.net",
-	"doesntexist.com",
-	"doesntexist.org",
-	"dontexist.com",
-	"dontexist.net",
-	"dontexist.org",
-	"doomdns.com",
-	"doomdns.org",
-	"dvrdns.org",
-	"dyn-o-saur.com",
-	"dynalias.com",
-	"dynalias.net",
-	"dynalias.org",
-	"dynathome.net",
-	"dyndns.ws",
-	"endofinternet.net",
-	"endofinternet.org",
-	"endoftheinternet.org",
-	"est-a-la-maison.com",
-	"est-a-la-masion.com",
-	"est-le-patron.com",
-	"est-mon-blogueur.com",
-	"for-better.biz",
-	"for-more.biz",
-	"for-our.info",
-	"for-some.biz",
-	"for-the.biz",
-	"forgot.her.name",
-	"forgot.his.name",
-	"from-ak.com",
-	"from-al.com",
-	"from-ar.com",
-	"from-az.net",
-	"from-ca.com",
-	"from-co.net",
-	"from-ct.com",
-	"from-dc.com",
-	"from-de.com",
-	"from-fl.com",
-	"from-ga.com",
-	"from-hi.com",
-	"from-ia.com",
-	"from-id.com",
-	"from-il.com",
-	"from-in.com",
-	"from-ks.com",
-	"from-ky.com",
-	"from-la.net",
-	"from-ma.com",
-	"from-md.com",
-	"from-me.org",
-	"from-mi.com",
-	"from-mn.com",
-	"from-mo.com",
-	"from-ms.com",
-	"from-mt.com",
-	"from-nc.com",
-	"from-nd.com",
-	"from-ne.com",
-	"from-nh.com",
-	"from-nj.com",
-	"from-nm.com",
-	"from-nv.com",
-	"from-ny.net",
-	"from-oh.com",
-	"from-ok.com",
-	"from-or.com",
-	"from-pa.com",
-	"from-pr.com",
-	"from-ri.com",
-	"from-sc.com",
-	"from-sd.com",
-	"from-tn.com",
-	"from-tx.com",
-	"from-ut.com",
-	"from-va.com",
-	"from-vt.com",
-	"from-wa.com",
-	"from-wi.com",
-	"from-wv.com",
-	"from-wy.com",
-	"ftpaccess.cc",
-	"fuettertdasnetz.de",
-	"game-host.org",
-	"game-server.cc",
-	"getmyip.com",
-	"gets-it.net",
-	"go.dyndns.org",
-	"gotdns.com",
-	"gotdns.org",
-	"groks-the.info",
-	"groks-this.info",
-	"ham-radio-op.net",
-	"here-for-more.info",
-	"hobby-site.com",
-	"hobby-site.org",
-	"home.dyndns.org",
-	"homedns.org",
-	"homeftp.net",
-	"homeftp.org",
-	"homeip.net",
-	"homelinux.com",
-	"homelinux.net",
-	"homelinux.org",
-	"homeunix.com",
-	"homeunix.net",
-	"homeunix.org",
-	"iamallama.com",
-	"in-the-band.net",
-	"is-a-anarchist.com",
-	"is-a-blogger.com",
-	"is-a-bookkeeper.com",
-	"is-a-bruinsfan.org",
-	"is-a-bulls-fan.com",
-	"is-a-candidate.org",
-	"is-a-caterer.com",
-	"is-a-celticsfan.org",
-	"is-a-chef.com",
-	"is-a-chef.net",
-	"is-a-chef.org",
-	"is-a-conservative.com",
-	"is-a-cpa.com",
-	"is-a-cubicle-slave.com",
-	"is-a-democrat.com",
-	"is-a-designer.com",
-	"is-a-doctor.com",
-	"is-a-financialadvisor.com",
-	"is-a-geek.com",
-	"is-a-geek.net",
-	"is-a-geek.org",
-	"is-a-green.com",
-	"is-a-guru.com",
-	"is-a-hard-worker.com",
-	"is-a-hunter.com",
-	"is-a-knight.org",
-	"is-a-landscaper.com",
-	"is-a-lawyer.com",
-	"is-a-liberal.com",
-	"is-a-libertarian.com",
-	"is-a-linux-user.org",
-	"is-a-llama.com",
-	"is-a-musician.com",
-	"is-a-nascarfan.com",
-	"is-a-nurse.com",
-	"is-a-painter.com",
-	"is-a-patsfan.org",
-	"is-a-personaltrainer.com",
-	"is-a-photographer.com",
-	"is-a-player.com",
-	"is-a-republican.com",
-	"is-a-rockstar.com",
-	"is-a-socialist.com",
-	"is-a-soxfan.org",
-	"is-a-student.com",
-	"is-a-teacher.com",
-	"is-a-techie.com",
-	"is-a-therapist.com",
-	"is-an-accountant.com",
-	"is-an-actor.com",
-	"is-an-actress.com",
-	"is-an-anarchist.com",
-	"is-an-artist.com",
-	"is-an-engineer.com",
-	"is-an-entertainer.com",
-	"is-by.us",
-	"is-certified.com",
-	"is-found.org",
-	"is-gone.com",
-	"is-into-anime.com",
-	"is-into-cars.com",
-	"is-into-cartoons.com",
-	"is-into-games.com",
-	"is-leet.com",
-	"is-lost.org",
-	"is-not-certified.com",
-	"is-saved.org",
-	"is-slick.com",
-	"is-uberleet.com",
-	"is-very-bad.org",
-	"is-very-evil.org",
-	"is-very-good.org",
-	"is-very-nice.org",
-	"is-very-sweet.org",
-	"is-with-theband.com",
-	"isa-geek.com",
-	"isa-geek.net",
-	"isa-geek.org",
-	"isa-hockeynut.com",
-	"issmarterthanyou.com",
-	"isteingeek.de",
-	"istmein.de",
-	"kicks-ass.net",
-	"kicks-ass.org",
-	"knowsitall.info",
-	"land-4-sale.us",
-	"lebtimnetz.de",
-	"leitungsen.de",
-	"likes-pie.com",
-	"likescandy.com",
-	"merseine.nu",
-	"mine.nu",
-	"misconfused.org",
-	"mypets.ws",
-	"myphotos.cc",
-	"neat-url.com",
-	"office-on-the.net",
-	"on-the-web.tv",
-	"podzone.net",
-	"podzone.org",
-	"readmyblog.org",
-	"saves-the-whales.com",
-	"scrapper-site.net",
-	"scrapping.cc",
-	"selfip.biz",
-	"selfip.com",
-	"selfip.info",
-	"selfip.net",
-	"selfip.org",
-	"sells-for-less.com",
-	"sells-for-u.com",
-	"sells-it.net",
-	"sellsyourhome.org",
-	"servebbs.com",
-	"servebbs.net",
-	"servebbs.org",
-	"serveftp.net",
-	"serveftp.org",
-	"servegame.org",
-	"shacknet.nu",
-	"simple-url.com",
-	"space-to-rent.com",
-	"stuff-4-sale.org",
-	"stuff-4-sale.us",
-	"teaches-yoga.com",
-	"thruhere.net",
-	"traeumtgerade.de",
-	"webhop.biz",
-	"webhop.info",
-	"webhop.net",
-	"webhop.org",
-	"worse-than.tv",
-	"writesthisblog.com",
-	"ddnss.de",
-	"dyn.ddnss.de",
-	"dyndns.ddnss.de",
-	"dyndns1.de",
-	"dyn-ip24.de",
-	"home-webserver.de",
-	"dyn.home-webserver.de",
-	"myhome-server.de",
-	"ddnss.org",
-	"dynv6.net",
-	"e4.cz",
-	"enonic.io",
-	"customer.enonic.io",
-	"eu.org",
-	"al.eu.org",
-	"asso.eu.org",
-	"at.eu.org",
-	"au.eu.org",
-	"be.eu.org",
-	"bg.eu.org",
-	"ca.eu.org",
-	"cd.eu.org",
-	"ch.eu.org",
-	"cn.eu.org",
-	"cy.eu.org",
-	"cz.eu.org",
-	"de.eu.org",
-	"dk.eu.org",
-	"edu.eu.org",
-	"ee.eu.org",
-	"es.eu.org",
-	"fi.eu.org",
-	"fr.eu.org",
-	"gr.eu.org",
-	"hr.eu.org",
-	"hu.eu.org",
-	"ie.eu.org",
-	"il.eu.org",
-	"in.eu.org",
-	"int.eu.org",
-	"is.eu.org",
-	"it.eu.org",
-	"jp.eu.org",
-	"kr.eu.org",
-	"lt.eu.org",
-	"lu.eu.org",
-	"lv.eu.org",
-	"mc.eu.org",
-	"me.eu.org",
-	"mk.eu.org",
-	"mt.eu.org",
-	"my.eu.org",
-	"net.eu.org",
-	"ng.eu.org",
-	"nl.eu.org",
-	"no.eu.org",
-	"nz.eu.org",
-	"paris.eu.org",
-	"pl.eu.org",
-	"pt.eu.org",
-	"q-a.eu.org",
-	"ro.eu.org",
-	"ru.eu.org",
-	"se.eu.org",
-	"si.eu.org",
-	"sk.eu.org",
-	"tr.eu.org",
-	"uk.eu.org",
-	"us.eu.org",
-	"eu-1.evennode.com",
-	"eu-2.evennode.com",
-	"us-1.evennode.com",
-	"us-2.evennode.com",
-	"apps.fbsbx.com",
-	"map.fastly.net",
-	"a.prod.fastly.net",
-	"global.prod.fastly.net",
-	"a.ssl.fastly.net",
-	"b.ssl.fastly.net",
-	"global.ssl.fastly.net",
-	"fastlylb.net",
-	"map.fastlylb.net",
-	"fhapp.xyz",
-	"firebaseapp.com",
-	"flynnhub.com",
-	"freebox-os.com",
-	"freeboxos.com",
-	"fbx-os.fr",
-	"fbxos.fr",
-	"freebox-os.fr",
-	"freeboxos.fr",
-	"myfusion.cloud",
-	"futurehosting.at",
-	"futuremailing.at",
-	"*.ex.ortsinfo.at",
-	"*.kunden.ortsinfo.at",
-	"*.statics.cloud",
-	"service.gov.uk",
-	"github.io",
-	"githubusercontent.com",
-	"githubcloud.com",
-	"*.api.githubcloud.com",
-	"*.ext.githubcloud.com",
-	"gist.githubcloud.com",
-	"*.githubcloudusercontent.com",
-	"gitlab.io",
-	"homeoffice.gov.uk",
-	"ro.im",
-	"shop.ro",
-	"goip.de",
-	"*.0emm.com",
-	"appspot.com",
-	"blogspot.ae",
-	"blogspot.al",
-	"blogspot.am",
-	"blogspot.ba",
-	"blogspot.be",
-	"blogspot.bg",
-	"blogspot.bj",
-	"blogspot.ca",
-	"blogspot.cf",
-	"blogspot.ch",
-	"blogspot.cl",
-	"blogspot.co.at",
-	"blogspot.co.id",
-	"blogspot.co.il",
-	"blogspot.co.ke",
-	"blogspot.co.nz",
-	"blogspot.co.uk",
-	"blogspot.co.za",
-	"blogspot.com",
-	"blogspot.com.ar",
-	"blogspot.com.au",
-	"blogspot.com.br",
-	"blogspot.com.by",
-	"blogspot.com.co",
-	"blogspot.com.cy",
-	"blogspot.com.ee",
-	"blogspot.com.eg",
-	"blogspot.com.es",
-	"blogspot.com.mt",
-	"blogspot.com.ng",
-	"blogspot.com.tr",
-	"blogspot.com.uy",
-	"blogspot.cv",
-	"blogspot.cz",
-	"blogspot.de",
-	"blogspot.dk",
-	"blogspot.fi",
-	"blogspot.fr",
-	"blogspot.gr",
-	"blogspot.hk",
-	"blogspot.hr",
-	"blogspot.hu",
-	"blogspot.ie",
-	"blogspot.in",
-	"blogspot.is",
-	"blogspot.it",
-	"blogspot.jp",
-	"blogspot.kr",
-	"blogspot.li",
-	"blogspot.lt",
-	"blogspot.lu",
-	"blogspot.md",
-	"blogspot.mk",
-	"blogspot.mr",
-	"blogspot.mx",
-	"blogspot.my",
-	"blogspot.nl",
-	"blogspot.no",
-	"blogspot.pe",
-	"blogspot.pt",
-	"blogspot.qa",
-	"blogspot.re",
-	"blogspot.ro",
-	"blogspot.rs",
-	"blogspot.ru",
-	"blogspot.se",
-	"blogspot.sg",
-	"blogspot.si",
-	"blogspot.sk",
-	"blogspot.sn",
-	"blogspot.td",
-	"blogspot.tw",
-	"blogspot.ug",
-	"blogspot.vn",
-	"cloudfunctions.net",
-	"codespot.com",
-	"googleapis.com",
-	"googlecode.com",
-	"pagespeedmobilizer.com",
-	"publishproxy.com",
-	"withgoogle.com",
-	"withyoutube.com",
-	"hashbang.sh",
-	"hasura-app.io",
-	"hepforge.org",
-	"herokuapp.com",
-	"herokussl.com",
-	"iki.fi",
-	"biz.at",
-	"info.at",
-	"ac.leg.br",
-	"al.leg.br",
-	"am.leg.br",
-	"ap.leg.br",
-	"ba.leg.br",
-	"ce.leg.br",
-	"df.leg.br",
-	"es.leg.br",
-	"go.leg.br",
-	"ma.leg.br",
-	"mg.leg.br",
-	"ms.leg.br",
-	"mt.leg.br",
-	"pa.leg.br",
-	"pb.leg.br",
-	"pe.leg.br",
-	"pi.leg.br",
-	"pr.leg.br",
-	"rj.leg.br",
-	"rn.leg.br",
-	"ro.leg.br",
-	"rr.leg.br",
-	"rs.leg.br",
-	"sc.leg.br",
-	"se.leg.br",
-	"sp.leg.br",
-	"to.leg.br",
-	"*.triton.zone",
-	"*.cns.joyent.com",
-	"js.org",
-	"keymachine.de",
-	"knightpoint.systems",
-	"co.krd",
-	"edu.krd",
-	"*.magentosite.cloud",
-	"meteorapp.com",
-	"eu.meteorapp.com",
-	"co.pl",
-	"azurewebsites.net",
-	"azure-mobile.net",
-	"cloudapp.net",
-	"bmoattachments.org",
-	"4u.com",
-	"ngrok.io",
-	"nfshost.com",
-	"nsupdate.info",
-	"nerdpol.ovh",
-	"blogsyte.com",
-	"brasilia.me",
-	"cable-modem.org",
-	"ciscofreak.com",
-	"collegefan.org",
-	"couchpotatofries.org",
-	"damnserver.com",
-	"ddns.me",
-	"ditchyourip.com",
-	"dnsfor.me",
-	"dnsiskinky.com",
-	"dvrcam.info",
-	"dynns.com",
-	"eating-organic.net",
-	"fantasyleague.cc",
-	"geekgalaxy.com",
-	"golffan.us",
-	"health-carereform.com",
-	"homesecuritymac.com",
-	"homesecuritypc.com",
-	"hopto.me",
-	"ilovecollege.info",
-	"loginto.me",
-	"mlbfan.org",
-	"mmafan.biz",
-	"myactivedirectory.com",
-	"mydissent.net",
-	"myeffect.net",
-	"mymediapc.net",
-	"mypsx.net",
-	"mysecuritycamera.com",
-	"mysecuritycamera.net",
-	"mysecuritycamera.org",
-	"net-freaks.com",
-	"nflfan.org",
-	"nhlfan.net",
-	"no-ip.ca",
-	"no-ip.co.uk",
-	"no-ip.net",
-	"noip.us",
-	"onthewifi.com",
-	"pgafan.net",
-	"point2this.com",
-	"pointto.us",
-	"privatizehealthinsurance.net",
-	"quicksytes.com",
-	"read-books.org",
-	"securitytactics.com",
-	"serveexchange.com",
-	"servehumour.com",
-	"servep2p.com",
-	"servesarcasm.com",
-	"stufftoread.com",
-	"ufcfan.org",
-	"unusualperson.com",
-	"workisboring.com",
-	"3utilities.com",
-	"bounceme.net",
-	"ddns.net",
-	"ddnsking.com",
-	"gotdns.ch",
-	"hopto.org",
-	"myftp.biz",
-	"myftp.org",
-	"myvnc.com",
-	"no-ip.biz",
-	"no-ip.info",
-	"no-ip.org",
-	"noip.me",
-	"redirectme.net",
-	"servebeer.com",
-	"serveblog.net",
-	"servecounterstrike.com",
-	"serveftp.com",
-	"servegame.com",
-	"servehalflife.com",
-	"servehttp.com",
-	"serveirc.com",
-	"serveminecraft.net",
-	"servemp3.com",
-	"servepics.com",
-	"servequake.com",
-	"sytes.net",
-	"webhop.me",
-	"zapto.org",
-	"nyc.mn",
-	"nid.io",
-	"opencraft.hosting",
-	"operaunite.com",
-	"outsystemscloud.com",
-	"ownprovider.com",
-	"oy.lc",
-	"pgfog.com",
-	"pagefrontapp.com",
-	"art.pl",
-	"gliwice.pl",
-	"krakow.pl",
-	"poznan.pl",
-	"wroc.pl",
-	"zakopane.pl",
-	"pantheonsite.io",
-	"gotpantheon.com",
-	"mypep.link",
-	"on-web.fr",
-	"xen.prgmr.com",
-	"priv.at",
-	"protonet.io",
-	"chirurgiens-dentistes-en-france.fr",
-	"qa2.com",
-	"dev-myqnapcloud.com",
-	"alpha-myqnapcloud.com",
-	"myqnapcloud.com",
-	"rackmaze.com",
-	"rackmaze.net",
-	"rhcloud.com",
-	"hzc.io",
-	"wellbeingzone.eu",
-	"ptplus.fit",
-	"wellbeingzone.co.uk",
-	"sandcats.io",
-	"logoip.de",
-	"logoip.com",
-	"firewall-gateway.com",
-	"firewall-gateway.de",
-	"my-gateway.de",
-	"my-router.de",
-	"spdns.de",
-	"spdns.eu",
-	"firewall-gateway.net",
-	"my-firewall.org",
-	"myfirewall.org",
-	"spdns.org",
-	"biz.ua",
-	"co.ua",
-	"pp.ua",
-	"shiftedit.io",
-	"myshopblocks.com",
-	"1kapp.com",
-	"appchizi.com",
-	"applinzi.com",
-	"sinaapp.com",
-	"vipsinaapp.com",
-	"bounty-full.com",
-	"alpha.bounty-full.com",
-	"beta.bounty-full.com",
-	"static.land",
-	"dev.static.land",
-	"sites.static.land",
-	"apps.lair.io",
-	"*.stolos.io",
-	"spacekit.io",
-	"stackspace.space",
-	"diskstation.me",
-	"dscloud.biz",
-	"dscloud.me",
-	"dscloud.mobi",
-	"dsmynas.com",
-	"dsmynas.net",
-	"dsmynas.org",
-	"familyds.com",
-	"familyds.net",
-	"familyds.org",
-	"i234.me",
-	"myds.me",
-	"synology.me",
-	"taifun-dns.de",
-	"gda.pl",
-	"gdansk.pl",
-	"gdynia.pl",
-	"med.pl",
-	"sopot.pl",
-	"bloxcms.com",
-	"townnews-staging.com",
-	"*.transurl.be",
-	"*.transurl.eu",
-	"*.transurl.nl",
-	"tuxfamily.org",
-	"dd-dns.de",
-	"diskstation.eu",
-	"diskstation.org",
-	"dray-dns.de",
-	"draydns.de",
-	"dyn-vpn.de",
-	"dynvpn.de",
-	"mein-vigor.de",
-	"my-vigor.de",
-	"my-wan.de",
-	"syno-ds.de",
-	"synology-diskstation.de",
-	"synology-ds.de",
-	"hk.com",
-	"hk.org",
-	"ltd.hk",
-	"inc.hk",
-	"lib.de.us",
-	"router.management",
-	"remotewd.com",
-	"wmflabs.org",
-	"yolasite.com",
-	"ybo.faith",
-	"yombo.me",
-	"homelink.one",
-	"ybo.party",
-	"ybo.review",
-	"ybo.science",
-	"ybo.trade",
-	"za.net",
-	"za.org",
-	"now.sh",
-	"cc.ua",
-	"inf.ua",
-	"ltd.ua",
-}
-
-var nodeLabels = [...]string{
-	"aaa",
-	"aarp",
-	"abarth",
-	"abb",
-	"abbott",
-	"abbvie",
-	"abc",
-	"able",
-	"abogado",
-	"abudhabi",
-	"ac",
-	"academy",
-	"accenture",
-	"accountant",
-	"accountants",
-	"aco",
-	"active",
-	"actor",
-	"ad",
-	"adac",
-	"ads",
-	"adult",
-	"ae",
-	"aeg",
-	"aero",
-	"aetna",
-	"af",
-	"afamilycompany",
-	"afl",
-	"africa",
-	"ag",
-	"agakhan",
-	"agency",
-	"ai",
-	"aig",
-	"aigo",
-	"airbus",
-	"airforce",
-	"airtel",
-	"akdn",
-	"al",
-	"alfaromeo",
-	"alibaba",
-	"alipay",
-	"allfinanz",
-	"allstate",
-	"ally",
-	"alsace",
-	"alstom",
-	"am",
-	"americanexpress",
-	"americanfamily",
-	"amex",
-	"amfam",
-	"amica",
-	"amsterdam",
-	"analytics",
-	"android",
-	"anquan",
-	"anz",
-	"ao",
-	"aol",
-	"apartments",
-	"app",
-	"apple",
-	"aq",
-	"aquarelle",
-	"ar",
-	"arab",
-	"aramco",
-	"archi",
-	"army",
-	"arpa",
-	"art",
-	"arte",
-	"as",
-	"asda",
-	"asia",
-	"associates",
-	"at",
-	"athleta",
-	"attorney",
-	"au",
-	"auction",
-	"audi",
-	"audible",
-	"audio",
-	"auspost",
-	"author",
-	"auto",
-	"autos",
-	"avianca",
-	"aw",
-	"aws",
-	"ax",
-	"axa",
-	"az",
-	"azure",
-	"ba",
-	"baby",
-	"baidu",
-	"banamex",
-	"bananarepublic",
-	"band",
-	"bank",
-	"bar",
-	"barcelona",
-	"barclaycard",
-	"barclays",
-	"barefoot",
-	"bargains",
-	"baseball",
-	"basketball",
-	"bauhaus",
-	"bayern",
-	"bb",
-	"bbc",
-	"bbt",
-	"bbva",
-	"bcg",
-	"bcn",
-	"bd",
-	"be",
-	"beats",
-	"beauty",
-	"beer",
-	"bentley",
-	"berlin",
-	"best",
-	"bestbuy",
-	"bet",
-	"bf",
-	"bg",
-	"bh",
-	"bharti",
-	"bi",
-	"bible",
-	"bid",
-	"bike",
-	"bing",
-	"bingo",
-	"bio",
-	"biz",
-	"bj",
-	"black",
-	"blackfriday",
-	"blanco",
-	"blockbuster",
-	"blog",
-	"bloomberg",
-	"blue",
-	"bm",
-	"bms",
-	"bmw",
-	"bn",
-	"bnl",
-	"bnpparibas",
-	"bo",
-	"boats",
-	"boehringer",
-	"bofa",
-	"bom",
-	"bond",
-	"boo",
-	"book",
-	"booking",
-	"boots",
-	"bosch",
-	"bostik",
-	"boston",
-	"bot",
-	"boutique",
-	"box",
-	"br",
-	"bradesco",
-	"bridgestone",
-	"broadway",
-	"broker",
-	"brother",
-	"brussels",
-	"bs",
-	"bt",
-	"budapest",
-	"bugatti",
-	"build",
-	"builders",
-	"business",
-	"buy",
-	"buzz",
-	"bv",
-	"bw",
-	"by",
-	"bz",
-	"bzh",
-	"ca",
-	"cab",
-	"cafe",
-	"cal",
-	"call",
-	"calvinklein",
-	"cam",
-	"camera",
-	"camp",
-	"cancerresearch",
-	"canon",
-	"capetown",
-	"capital",
-	"capitalone",
-	"car",
-	"caravan",
-	"cards",
-	"care",
-	"career",
-	"careers",
-	"cars",
-	"cartier",
-	"casa",
-	"case",
-	"caseih",
-	"cash",
-	"casino",
-	"cat",
-	"catering",
-	"catholic",
-	"cba",
-	"cbn",
-	"cbre",
-	"cbs",
-	"cc",
-	"cd",
-	"ceb",
-	"center",
-	"ceo",
-	"cern",
-	"cf",
-	"cfa",
-	"cfd",
-	"cg",
-	"ch",
-	"chanel",
-	"channel",
-	"chase",
-	"chat",
-	"cheap",
-	"chintai",
-	"chloe",
-	"christmas",
-	"chrome",
-	"chrysler",
-	"church",
-	"ci",
-	"cipriani",
-	"circle",
-	"cisco",
-	"citadel",
-	"citi",
-	"citic",
-	"city",
-	"cityeats",
-	"ck",
-	"cl",
-	"claims",
-	"cleaning",
-	"click",
-	"clinic",
-	"clinique",
-	"clothing",
-	"cloud",
-	"club",
-	"clubmed",
-	"cm",
-	"cn",
-	"co",
-	"coach",
-	"codes",
-	"coffee",
-	"college",
-	"cologne",
-	"com",
-	"comcast",
-	"commbank",
-	"community",
-	"company",
-	"compare",
-	"computer",
-	"comsec",
-	"condos",
-	"construction",
-	"consulting",
-	"contact",
-	"contractors",
-	"cooking",
-	"cookingchannel",
-	"cool",
-	"coop",
-	"corsica",
-	"country",
-	"coupon",
-	"coupons",
-	"courses",
-	"cr",
-	"credit",
-	"creditcard",
-	"creditunion",
-	"cricket",
-	"crown",
-	"crs",
-	"cruise",
-	"cruises",
-	"csc",
-	"cu",
-	"cuisinella",
-	"cv",
-	"cw",
-	"cx",
-	"cy",
-	"cymru",
-	"cyou",
-	"cz",
-	"dabur",
-	"dad",
-	"dance",
-	"data",
-	"date",
-	"dating",
-	"datsun",
-	"day",
-	"dclk",
-	"dds",
-	"de",
-	"deal",
-	"dealer",
-	"deals",
-	"degree",
-	"delivery",
-	"dell",
-	"deloitte",
-	"delta",
-	"democrat",
-	"dental",
-	"dentist",
-	"desi",
-	"design",
-	"dev",
-	"dhl",
-	"diamonds",
-	"diet",
-	"digital",
-	"direct",
-	"directory",
-	"discount",
-	"discover",
-	"dish",
-	"diy",
-	"dj",
-	"dk",
-	"dm",
-	"dnp",
-	"do",
-	"docs",
-	"doctor",
-	"dodge",
-	"dog",
-	"doha",
-	"domains",
-	"dot",
-	"download",
-	"drive",
-	"dtv",
-	"dubai",
-	"duck",
-	"dunlop",
-	"duns",
-	"dupont",
-	"durban",
-	"dvag",
-	"dvr",
-	"dwg",
-	"dz",
-	"earth",
-	"eat",
-	"ec",
-	"eco",
-	"edeka",
-	"edu",
-	"education",
-	"ee",
-	"eg",
-	"email",
-	"emerck",
-	"energy",
-	"engineer",
-	"engineering",
-	"enterprises",
-	"epost",
-	"epson",
-	"equipment",
-	"er",
-	"ericsson",
-	"erni",
-	"es",
-	"esq",
-	"estate",
-	"esurance",
-	"et",
-	"etisalat",
-	"eu",
-	"eurovision",
-	"eus",
-	"events",
-	"everbank",
-	"exchange",
-	"expert",
-	"exposed",
-	"express",
-	"extraspace",
-	"fage",
-	"fail",
-	"fairwinds",
-	"faith",
-	"family",
-	"fan",
-	"fans",
-	"farm",
-	"farmers",
-	"fashion",
-	"fast",
-	"fedex",
-	"feedback",
-	"ferrari",
-	"ferrero",
-	"fi",
-	"fiat",
-	"fidelity",
-	"fido",
-	"film",
-	"final",
-	"finance",
-	"financial",
-	"fire",
-	"firestone",
-	"firmdale",
-	"fish",
-	"fishing",
-	"fit",
-	"fitness",
-	"fj",
-	"fk",
-	"flickr",
-	"flights",
-	"flir",
-	"florist",
-	"flowers",
-	"fly",
-	"fm",
-	"fo",
-	"foo",
-	"food",
-	"foodnetwork",
-	"football",
-	"ford",
-	"forex",
-	"forsale",
-	"forum",
-	"foundation",
-	"fox",
-	"fr",
-	"free",
-	"fresenius",
-	"frl",
-	"frogans",
-	"frontdoor",
-	"frontier",
-	"ftr",
-	"fujitsu",
-	"fujixerox",
-	"fun",
-	"fund",
-	"furniture",
-	"futbol",
-	"fyi",
-	"ga",
-	"gal",
-	"gallery",
-	"gallo",
-	"gallup",
-	"game",
-	"games",
-	"gap",
-	"garden",
-	"gb",
-	"gbiz",
-	"gd",
-	"gdn",
-	"ge",
-	"gea",
-	"gent",
-	"genting",
-	"george",
-	"gf",
-	"gg",
-	"ggee",
-	"gh",
-	"gi",
-	"gift",
-	"gifts",
-	"gives",
-	"giving",
-	"gl",
-	"glade",
-	"glass",
-	"gle",
-	"global",
-	"globo",
-	"gm",
-	"gmail",
-	"gmbh",
-	"gmo",
-	"gmx",
-	"gn",
-	"godaddy",
-	"gold",
-	"goldpoint",
-	"golf",
-	"goo",
-	"goodhands",
-	"goodyear",
-	"goog",
-	"google",
-	"gop",
-	"got",
-	"gov",
-	"gp",
-	"gq",
-	"gr",
-	"grainger",
-	"graphics",
-	"gratis",
-	"green",
-	"gripe",
-	"grocery",
-	"group",
-	"gs",
-	"gt",
-	"gu",
-	"guardian",
-	"gucci",
-	"guge",
-	"guide",
-	"guitars",
-	"guru",
-	"gw",
-	"gy",
-	"hair",
-	"hamburg",
-	"hangout",
-	"haus",
-	"hbo",
-	"hdfc",
-	"hdfcbank",
-	"health",
-	"healthcare",
-	"help",
-	"helsinki",
-	"here",
-	"hermes",
-	"hgtv",
-	"hiphop",
-	"hisamitsu",
-	"hitachi",
-	"hiv",
-	"hk",
-	"hkt",
-	"hm",
-	"hn",
-	"hockey",
-	"holdings",
-	"holiday",
-	"homedepot",
-	"homegoods",
-	"homes",
-	"homesense",
-	"honda",
-	"honeywell",
-	"horse",
-	"hospital",
-	"host",
-	"hosting",
-	"hot",
-	"hoteles",
-	"hotels",
-	"hotmail",
-	"house",
-	"how",
-	"hr",
-	"hsbc",
-	"ht",
-	"htc",
-	"hu",
-	"hughes",
-	"hyatt",
-	"hyundai",
-	"ibm",
-	"icbc",
-	"ice",
-	"icu",
-	"id",
-	"ie",
-	"ieee",
-	"ifm",
-	"iinet",
-	"ikano",
-	"il",
-	"im",
-	"imamat",
-	"imdb",
-	"immo",
-	"immobilien",
-	"in",
-	"industries",
-	"infiniti",
-	"info",
-	"ing",
-	"ink",
-	"institute",
-	"insurance",
-	"insure",
-	"int",
-	"intel",
-	"international",
-	"intuit",
-	"investments",
-	"io",
-	"ipiranga",
-	"iq",
-	"ir",
-	"irish",
-	"is",
-	"iselect",
-	"ismaili",
-	"ist",
-	"istanbul",
-	"it",
-	"itau",
-	"itv",
-	"iveco",
-	"iwc",
-	"jaguar",
-	"java",
-	"jcb",
-	"jcp",
-	"je",
-	"jeep",
-	"jetzt",
-	"jewelry",
-	"jio",
-	"jlc",
-	"jll",
-	"jm",
-	"jmp",
-	"jnj",
-	"jo",
-	"jobs",
-	"joburg",
-	"jot",
-	"joy",
-	"jp",
-	"jpmorgan",
-	"jprs",
-	"juegos",
-	"juniper",
-	"kaufen",
-	"kddi",
-	"ke",
-	"kerryhotels",
-	"kerrylogistics",
-	"kerryproperties",
-	"kfh",
-	"kg",
-	"kh",
-	"ki",
-	"kia",
-	"kim",
-	"kinder",
-	"kindle",
-	"kitchen",
-	"kiwi",
-	"km",
-	"kn",
-	"koeln",
-	"komatsu",
-	"kosher",
-	"kp",
-	"kpmg",
-	"kpn",
-	"kr",
-	"krd",
-	"kred",
-	"kuokgroup",
-	"kw",
-	"ky",
-	"kyoto",
-	"kz",
-	"la",
-	"lacaixa",
-	"ladbrokes",
-	"lamborghini",
-	"lamer",
-	"lancaster",
-	"lancia",
-	"lancome",
-	"land",
-	"landrover",
-	"lanxess",
-	"lasalle",
-	"lat",
-	"latino",
-	"latrobe",
-	"law",
-	"lawyer",
-	"lb",
-	"lc",
-	"lds",
-	"lease",
-	"leclerc",
-	"lefrak",
-	"legal",
-	"lego",
-	"lexus",
-	"lgbt",
-	"li",
-	"liaison",
-	"lidl",
-	"life",
-	"lifeinsurance",
-	"lifestyle",
-	"lighting",
-	"like",
-	"lilly",
-	"limited",
-	"limo",
-	"lincoln",
-	"linde",
-	"link",
-	"lipsy",
-	"live",
-	"living",
-	"lixil",
-	"lk",
-	"loan",
-	"loans",
-	"locker",
-	"locus",
-	"loft",
-	"lol",
-	"london",
-	"lotte",
-	"lotto",
-	"love",
-	"lpl",
-	"lplfinancial",
-	"lr",
-	"ls",
-	"lt",
-	"ltd",
-	"ltda",
-	"lu",
-	"lundbeck",
-	"lupin",
-	"luxe",
-	"luxury",
-	"lv",
-	"ly",
-	"ma",
-	"macys",
-	"madrid",
-	"maif",
-	"maison",
-	"makeup",
-	"man",
-	"management",
-	"mango",
-	"map",
-	"market",
-	"marketing",
-	"markets",
-	"marriott",
-	"marshalls",
-	"maserati",
-	"mattel",
-	"mba",
-	"mc",
-	"mcd",
-	"mcdonalds",
-	"mckinsey",
-	"md",
-	"me",
-	"med",
-	"media",
-	"meet",
-	"melbourne",
-	"meme",
-	"memorial",
-	"men",
-	"menu",
-	"meo",
-	"merckmsd",
-	"metlife",
-	"mg",
-	"mh",
-	"miami",
-	"microsoft",
-	"mil",
-	"mini",
-	"mint",
-	"mit",
-	"mitsubishi",
-	"mk",
-	"ml",
-	"mlb",
-	"mls",
-	"mm",
-	"mma",
-	"mn",
-	"mo",
-	"mobi",
-	"mobile",
-	"mobily",
-	"moda",
-	"moe",
-	"moi",
-	"mom",
-	"monash",
-	"money",
-	"monster",
-	"montblanc",
-	"mopar",
-	"mormon",
-	"mortgage",
-	"moscow",
-	"moto",
-	"motorcycles",
-	"mov",
-	"movie",
-	"movistar",
-	"mp",
-	"mq",
-	"mr",
-	"ms",
-	"msd",
-	"mt",
-	"mtn",
-	"mtpc",
-	"mtr",
-	"mu",
-	"museum",
-	"mutual",
-	"mutuelle",
-	"mv",
-	"mw",
-	"mx",
-	"my",
-	"mz",
-	"na",
-	"nab",
-	"nadex",
-	"nagoya",
-	"name",
-	"nationwide",
-	"natura",
-	"navy",
-	"nba",
-	"nc",
-	"ne",
-	"nec",
-	"net",
-	"netbank",
-	"netflix",
-	"network",
-	"neustar",
-	"new",
-	"newholland",
-	"news",
-	"next",
-	"nextdirect",
-	"nexus",
-	"nf",
-	"nfl",
-	"ng",
-	"ngo",
-	"nhk",
-	"ni",
-	"nico",
-	"nike",
-	"nikon",
-	"ninja",
-	"nissan",
-	"nissay",
-	"nl",
-	"no",
-	"nokia",
-	"northwesternmutual",
-	"norton",
-	"now",
-	"nowruz",
-	"nowtv",
-	"np",
-	"nr",
-	"nra",
-	"nrw",
-	"ntt",
-	"nu",
-	"nyc",
-	"nz",
-	"obi",
-	"observer",
-	"off",
-	"office",
-	"okinawa",
-	"olayan",
-	"olayangroup",
-	"oldnavy",
-	"ollo",
-	"om",
-	"omega",
-	"one",
-	"ong",
-	"onion",
-	"onl",
-	"online",
-	"onyourside",
-	"ooo",
-	"open",
-	"oracle",
-	"orange",
-	"org",
-	"organic",
-	"orientexpress",
-	"origins",
-	"osaka",
-	"otsuka",
-	"ott",
-	"ovh",
-	"pa",
-	"page",
-	"pamperedchef",
-	"panasonic",
-	"panerai",
-	"paris",
-	"pars",
-	"partners",
-	"parts",
-	"party",
-	"passagens",
-	"pay",
-	"pccw",
-	"pe",
-	"pet",
-	"pf",
-	"pfizer",
-	"pg",
-	"ph",
-	"pharmacy",
-	"phd",
-	"philips",
-	"phone",
-	"photo",
-	"photography",
-	"photos",
-	"physio",
-	"piaget",
-	"pics",
-	"pictet",
-	"pictures",
-	"pid",
-	"pin",
-	"ping",
-	"pink",
-	"pioneer",
-	"pizza",
-	"pk",
-	"pl",
-	"place",
-	"play",
-	"playstation",
-	"plumbing",
-	"plus",
-	"pm",
-	"pn",
-	"pnc",
-	"pohl",
-	"poker",
-	"politie",
-	"porn",
-	"post",
-	"pr",
-	"pramerica",
-	"praxi",
-	"press",
-	"prime",
-	"pro",
-	"prod",
-	"productions",
-	"prof",
-	"progressive",
-	"promo",
-	"properties",
-	"property",
-	"protection",
-	"pru",
-	"prudential",
-	"ps",
-	"pt",
-	"pub",
-	"pw",
-	"pwc",
-	"py",
-	"qa",
-	"qpon",
-	"quebec",
-	"quest",
-	"qvc",
-	"racing",
-	"radio",
-	"raid",
-	"re",
-	"read",
-	"realestate",
-	"realtor",
-	"realty",
-	"recipes",
-	"red",
-	"redstone",
-	"redumbrella",
-	"rehab",
-	"reise",
-	"reisen",
-	"reit",
-	"reliance",
-	"ren",
-	"rent",
-	"rentals",
-	"repair",
-	"report",
-	"republican",
-	"rest",
-	"restaurant",
-	"review",
-	"reviews",
-	"rexroth",
-	"rich",
-	"richardli",
-	"ricoh",
-	"rightathome",
-	"ril",
-	"rio",
-	"rip",
-	"rmit",
-	"ro",
-	"rocher",
-	"rocks",
-	"rodeo",
-	"rogers",
-	"room",
-	"rs",
-	"rsvp",
-	"ru",
-	"ruhr",
-	"run",
-	"rw",
-	"rwe",
-	"ryukyu",
-	"sa",
-	"saarland",
-	"safe",
-	"safety",
-	"sakura",
-	"sale",
-	"salon",
-	"samsclub",
-	"samsung",
-	"sandvik",
-	"sandvikcoromant",
-	"sanofi",
-	"sap",
-	"sapo",
-	"sarl",
-	"sas",
-	"save",
-	"saxo",
-	"sb",
-	"sbi",
-	"sbs",
-	"sc",
-	"sca",
-	"scb",
-	"schaeffler",
-	"schmidt",
-	"scholarships",
-	"school",
-	"schule",
-	"schwarz",
-	"science",
-	"scjohnson",
-	"scor",
-	"scot",
-	"sd",
-	"se",
-	"search",
-	"seat",
-	"secure",
-	"security",
-	"seek",
-	"select",
-	"sener",
-	"services",
-	"ses",
-	"seven",
-	"sew",
-	"sex",
-	"sexy",
-	"sfr",
-	"sg",
-	"sh",
-	"shangrila",
-	"sharp",
-	"shaw",
-	"shell",
-	"shia",
-	"shiksha",
-	"shoes",
-	"shop",
-	"shopping",
-	"shouji",
-	"show",
-	"showtime",
-	"shriram",
-	"si",
-	"silk",
-	"sina",
-	"singles",
-	"site",
-	"sj",
-	"sk",
-	"ski",
-	"skin",
-	"sky",
-	"skype",
-	"sl",
-	"sling",
-	"sm",
-	"smart",
-	"smile",
-	"sn",
-	"sncf",
-	"so",
-	"soccer",
-	"social",
-	"softbank",
-	"software",
-	"sohu",
-	"solar",
-	"solutions",
-	"song",
-	"sony",
-	"soy",
-	"space",
-	"spiegel",
-	"spot",
-	"spreadbetting",
-	"sr",
-	"srl",
-	"srt",
-	"st",
-	"stada",
-	"staples",
-	"star",
-	"starhub",
-	"statebank",
-	"statefarm",
-	"statoil",
-	"stc",
-	"stcgroup",
-	"stockholm",
-	"storage",
-	"store",
-	"stream",
-	"studio",
-	"study",
-	"style",
-	"su",
-	"sucks",
-	"supplies",
-	"supply",
-	"support",
-	"surf",
-	"surgery",
-	"suzuki",
-	"sv",
-	"swatch",
-	"swiftcover",
-	"swiss",
-	"sx",
-	"sy",
-	"sydney",
-	"symantec",
-	"systems",
-	"sz",
-	"tab",
-	"taipei",
-	"talk",
-	"taobao",
-	"target",
-	"tatamotors",
-	"tatar",
-	"tattoo",
-	"tax",
-	"taxi",
-	"tc",
-	"tci",
-	"td",
-	"tdk",
-	"team",
-	"tech",
-	"technology",
-	"tel",
-	"telecity",
-	"telefonica",
-	"temasek",
-	"tennis",
-	"teva",
-	"tf",
-	"tg",
-	"th",
-	"thd",
-	"theater",
-	"theatre",
-	"theguardian",
-	"tiaa",
-	"tickets",
-	"tienda",
-	"tiffany",
-	"tips",
-	"tires",
-	"tirol",
-	"tj",
-	"tjmaxx",
-	"tjx",
-	"tk",
-	"tkmaxx",
-	"tl",
-	"tm",
-	"tmall",
-	"tn",
-	"to",
-	"today",
-	"tokyo",
-	"tools",
-	"top",
-	"toray",
-	"toshiba",
-	"total",
-	"tours",
-	"town",
-	"toyota",
-	"toys",
-	"tr",
-	"trade",
-	"trading",
-	"training",
-	"travel",
-	"travelchannel",
-	"travelers",
-	"travelersinsurance",
-	"trust",
-	"trv",
-	"tt",
-	"tube",
-	"tui",
-	"tunes",
-	"tushu",
-	"tv",
-	"tvs",
-	"tw",
-	"tz",
-	"ua",
-	"ubank",
-	"ubs",
-	"uconnect",
-	"ug",
-	"uk",
-	"unicom",
-	"university",
-	"uno",
-	"uol",
-	"ups",
-	"us",
-	"uy",
-	"uz",
-	"va",
-	"vacations",
-	"vana",
-	"vanguard",
-	"vc",
-	"ve",
-	"vegas",
-	"ventures",
-	"verisign",
-	"versicherung",
-	"vet",
-	"vg",
-	"vi",
-	"viajes",
-	"video",
-	"vig",
-	"viking",
-	"villas",
-	"vin",
-	"vip",
-	"virgin",
-	"visa",
-	"vision",
-	"vista",
-	"vistaprint",
-	"viva",
-	"vivo",
-	"vlaanderen",
-	"vn",
-	"vodka",
-	"volkswagen",
-	"volvo",
-	"vote",
-	"voting",
-	"voto",
-	"voyage",
-	"vu",
-	"vuelos",
-	"wales",
-	"walmart",
-	"walter",
-	"wang",
-	"wanggou",
-	"warman",
-	"watch",
-	"watches",
-	"weather",
-	"weatherchannel",
-	"webcam",
-	"weber",
-	"website",
-	"wed",
-	"wedding",
-	"weibo",
-	"weir",
-	"wf",
-	"whoswho",
-	"wien",
-	"wiki",
-	"williamhill",
-	"win",
-	"windows",
-	"wine",
-	"winners",
-	"wme",
-	"wolterskluwer",
-	"woodside",
-	"work",
-	"works",
-	"world",
-	"wow",
-	"ws",
-	"wtc",
-	"wtf",
-	"xbox",
-	"xerox",
-	"xfinity",
-	"xihuan",
-	"xin",
-	"xn--11b4c3d",
-	"xn--1ck2e1b",
-	"xn--1qqw23a",
-	"xn--30rr7y",
-	"xn--3bst00m",
-	"xn--3ds443g",
-	"xn--3e0b707e",
-	"xn--3oq18vl8pn36a",
-	"xn--3pxu8k",
-	"xn--42c2d9a",
-	"xn--45brj9c",
-	"xn--45q11c",
-	"xn--4gbrim",
-	"xn--4gq48lf9j",
-	"xn--54b7fta0cc",
-	"xn--55qw42g",
-	"xn--55qx5d",
-	"xn--5su34j936bgsg",
-	"xn--5tzm5g",
-	"xn--6frz82g",
-	"xn--6qq986b3xl",
-	"xn--80adxhks",
-	"xn--80ao21a",
-	"xn--80aqecdr1a",
-	"xn--80asehdb",
-	"xn--80aswg",
-	"xn--8y0a063a",
-	"xn--90a3ac",
-	"xn--90ais",
-	"xn--9dbq2a",
-	"xn--9et52u",
-	"xn--9krt00a",
-	"xn--b4w605ferd",
-	"xn--bck1b9a5dre4c",
-	"xn--c1avg",
-	"xn--c2br7g",
-	"xn--cck2b3b",
-	"xn--cg4bki",
-	"xn--clchc0ea0b2g2a9gcd",
-	"xn--czr694b",
-	"xn--czrs0t",
-	"xn--czru2d",
-	"xn--d1acj3b",
-	"xn--d1alf",
-	"xn--e1a4c",
-	"xn--eckvdtc9d",
-	"xn--efvy88h",
-	"xn--estv75g",
-	"xn--fct429k",
-	"xn--fhbei",
-	"xn--fiq228c5hs",
-	"xn--fiq64b",
-	"xn--fiqs8s",
-	"xn--fiqz9s",
-	"xn--fjq720a",
-	"xn--flw351e",
-	"xn--fpcrj9c3d",
-	"xn--fzc2c9e2c",
-	"xn--fzys8d69uvgm",
-	"xn--g2xx48c",
-	"xn--gckr3f0f",
-	"xn--gecrj9c",
-	"xn--gk3at1e",
-	"xn--h2brj9c",
-	"xn--hxt814e",
-	"xn--i1b6b1a6a2e",
-	"xn--imr513n",
-	"xn--io0a7i",
-	"xn--j1aef",
-	"xn--j1amh",
-	"xn--j6w193g",
-	"xn--jlq61u9w7b",
-	"xn--jvr189m",
-	"xn--kcrx77d1x4a",
-	"xn--kprw13d",
-	"xn--kpry57d",
-	"xn--kpu716f",
-	"xn--kput3i",
-	"xn--l1acc",
-	"xn--lgbbat1ad8j",
-	"xn--mgb2ddes",
-	"xn--mgb9awbf",
-	"xn--mgba3a3ejt",
-	"xn--mgba3a4f16a",
-	"xn--mgba3a4fra",
-	"xn--mgba7c0bbn0a",
-	"xn--mgbaakc7dvf",
-	"xn--mgbaam7a8h",
-	"xn--mgbab2bd",
-	"xn--mgbai9a5eva00b",
-	"xn--mgbai9azgqp6j",
-	"xn--mgbayh7gpa",
-	"xn--mgbb9fbpob",
-	"xn--mgbbh1a71e",
-	"xn--mgbc0a9azcg",
-	"xn--mgbca7dzdo",
-	"xn--mgberp4a5d4a87g",
-	"xn--mgberp4a5d4ar",
-	"xn--mgbi4ecexp",
-	"xn--mgbpl2fh",
-	"xn--mgbqly7c0a67fbc",
-	"xn--mgbqly7cvafr",
-	"xn--mgbt3dhd",
-	"xn--mgbtf8fl",
-	"xn--mgbtx2b",
-	"xn--mgbx4cd0ab",
-	"xn--mix082f",
-	"xn--mix891f",
-	"xn--mk1bu44c",
-	"xn--mxtq1m",
-	"xn--ngbc5azd",
-	"xn--ngbe9e0a",
-	"xn--ngbrx",
-	"xn--nnx388a",
-	"xn--node",
-	"xn--nqv7f",
-	"xn--nqv7fs00ema",
-	"xn--nyqy26a",
-	"xn--o3cw4h",
-	"xn--ogbpf8fl",
-	"xn--p1acf",
-	"xn--p1ai",
-	"xn--pbt977c",
-	"xn--pgbs0dh",
-	"xn--pssy2u",
-	"xn--q9jyb4c",
-	"xn--qcka1pmc",
-	"xn--qxam",
-	"xn--rhqv96g",
-	"xn--rovu88b",
-	"xn--s9brj9c",
-	"xn--ses554g",
-	"xn--t60b56a",
-	"xn--tckwe",
-	"xn--tiq49xqyj",
-	"xn--unup4y",
-	"xn--vermgensberater-ctb",
-	"xn--vermgensberatung-pwb",
-	"xn--vhquv",
-	"xn--vuq861b",
-	"xn--w4r85el8fhu5dnra",
-	"xn--w4rs40l",
-	"xn--wgbh1c",
-	"xn--wgbl6a",
-	"xn--xhq521b",
-	"xn--xkc2al3hye2a",
-	"xn--xkc2dl3a5ee0h",
-	"xn--y9a3aq",
-	"xn--yfro4i67o",
-	"xn--ygbi2ammx",
-	"xn--zfr164b",
-	"xperia",
-	"xxx",
-	"xyz",
-	"yachts",
-	"yahoo",
-	"yamaxun",
-	"yandex",
-	"ye",
-	"yodobashi",
-	"yoga",
-	"yokohama",
-	"you",
-	"youtube",
-	"yt",
-	"yun",
-	"za",
-	"zappos",
-	"zara",
-	"zero",
-	"zip",
-	"zippo",
-	"zm",
-	"zone",
-	"zuerich",
-	"zw",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"nom",
-	"ac",
-	"blogspot",
-	"co",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"sch",
-	"accident-investigation",
-	"accident-prevention",
-	"aerobatic",
-	"aeroclub",
-	"aerodrome",
-	"agents",
-	"air-surveillance",
-	"air-traffic-control",
-	"aircraft",
-	"airline",
-	"airport",
-	"airtraffic",
-	"ambulance",
-	"amusement",
-	"association",
-	"author",
-	"ballooning",
-	"broker",
-	"caa",
-	"cargo",
-	"catering",
-	"certification",
-	"championship",
-	"charter",
-	"civilaviation",
-	"club",
-	"conference",
-	"consultant",
-	"consulting",
-	"control",
-	"council",
-	"crew",
-	"design",
-	"dgca",
-	"educator",
-	"emergency",
-	"engine",
-	"engineer",
-	"entertainment",
-	"equipment",
-	"exchange",
-	"express",
-	"federation",
-	"flight",
-	"freight",
-	"fuel",
-	"gliding",
-	"government",
-	"groundhandling",
-	"group",
-	"hanggliding",
-	"homebuilt",
-	"insurance",
-	"journal",
-	"journalist",
-	"leasing",
-	"logistics",
-	"magazine",
-	"maintenance",
-	"media",
-	"microlight",
-	"modelling",
-	"navigation",
-	"parachuting",
-	"paragliding",
-	"passenger-association",
-	"pilot",
-	"press",
-	"production",
-	"recreation",
-	"repbody",
-	"res",
-	"research",
-	"rotorcraft",
-	"safety",
-	"scientist",
-	"services",
-	"show",
-	"skydiving",
-	"software",
-	"student",
-	"trader",
-	"trading",
-	"trainer",
-	"union",
-	"workinggroup",
-	"works",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"co",
-	"com",
-	"net",
-	"nom",
-	"org",
-	"com",
-	"net",
-	"off",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"blogspot",
-	"co",
-	"ed",
-	"gv",
-	"it",
-	"og",
-	"pb",
-	"com",
-	"edu",
-	"gob",
-	"gov",
-	"int",
-	"mil",
-	"net",
-	"org",
-	"tur",
-	"blogspot",
-	"e164",
-	"in-addr",
-	"ip6",
-	"iris",
-	"uri",
-	"urn",
-	"gov",
-	"cloudns",
-	"ac",
-	"biz",
-	"co",
-	"futurehosting",
-	"futuremailing",
-	"gv",
-	"info",
-	"or",
-	"ortsinfo",
-	"priv",
-	"blogspot",
-	"ex",
-	"kunden",
-	"act",
-	"asn",
-	"com",
-	"conf",
-	"edu",
-	"gov",
-	"id",
-	"info",
-	"net",
-	"nsw",
-	"nt",
-	"org",
-	"oz",
-	"qld",
-	"sa",
-	"tas",
-	"vic",
-	"wa",
-	"blogspot",
-	"act",
-	"nsw",
-	"nt",
-	"qld",
-	"sa",
-	"tas",
-	"vic",
-	"wa",
-	"qld",
-	"sa",
-	"tas",
-	"vic",
-	"wa",
-	"com",
-	"biz",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"int",
-	"mil",
-	"name",
-	"net",
-	"org",
-	"pp",
-	"pro",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"biz",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"net",
-	"org",
-	"store",
-	"tv",
-	"ac",
-	"blogspot",
-	"transurl",
-	"gov",
-	"0",
-	"1",
-	"2",
-	"3",
-	"4",
-	"5",
-	"6",
-	"7",
-	"8",
-	"9",
-	"a",
-	"b",
-	"blogspot",
-	"c",
-	"d",
-	"e",
-	"f",
-	"g",
-	"h",
-	"i",
-	"j",
-	"k",
-	"l",
-	"m",
-	"n",
-	"o",
-	"p",
-	"q",
-	"r",
-	"s",
-	"t",
-	"u",
-	"v",
-	"w",
-	"x",
-	"y",
-	"z",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"co",
-	"com",
-	"edu",
-	"or",
-	"org",
-	"cloudns",
-	"dscloud",
-	"dyndns",
-	"for-better",
-	"for-more",
-	"for-some",
-	"for-the",
-	"mmafan",
-	"myftp",
-	"no-ip",
-	"selfip",
-	"webhop",
-	"asso",
-	"barreau",
-	"blogspot",
-	"gouv",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gob",
-	"gov",
-	"int",
-	"mil",
-	"net",
-	"org",
-	"tv",
-	"adm",
-	"adv",
-	"agr",
-	"am",
-	"arq",
-	"art",
-	"ato",
-	"b",
-	"bio",
-	"blog",
-	"bmd",
-	"cim",
-	"cng",
-	"cnt",
-	"com",
-	"coop",
-	"ecn",
-	"eco",
-	"edu",
-	"emp",
-	"eng",
-	"esp",
-	"etc",
-	"eti",
-	"far",
-	"flog",
-	"fm",
-	"fnd",
-	"fot",
-	"fst",
-	"g12",
-	"ggf",
-	"gov",
-	"imb",
-	"ind",
-	"inf",
-	"jor",
-	"jus",
-	"leg",
-	"lel",
-	"mat",
-	"med",
-	"mil",
-	"mp",
-	"mus",
-	"net",
-	"nom",
-	"not",
-	"ntr",
-	"odo",
-	"org",
-	"ppg",
-	"pro",
-	"psc",
-	"psi",
-	"qsl",
-	"radio",
-	"rec",
-	"slg",
-	"srv",
-	"taxi",
-	"teo",
-	"tmp",
-	"trd",
-	"tur",
-	"tv",
-	"vet",
-	"vlog",
-	"wiki",
-	"zlg",
-	"blogspot",
-	"ac",
-	"al",
-	"am",
-	"ap",
-	"ba",
-	"ce",
-	"df",
-	"es",
-	"go",
-	"ma",
-	"mg",
-	"ms",
-	"mt",
-	"pa",
-	"pb",
-	"pe",
-	"pi",
-	"pr",
-	"rj",
-	"rn",
-	"ro",
-	"rr",
-	"rs",
-	"sc",
-	"se",
-	"sp",
-	"to",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"co",
-	"org",
-	"com",
-	"gov",
-	"mil",
-	"of",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"za",
-	"ab",
-	"bc",
-	"blogspot",
-	"co",
-	"gc",
-	"mb",
-	"nb",
-	"nf",
-	"nl",
-	"no-ip",
-	"ns",
-	"nt",
-	"nu",
-	"on",
-	"pe",
-	"qc",
-	"sk",
-	"yk",
-	"cloudns",
-	"fantasyleague",
-	"ftpaccess",
-	"game-server",
-	"myphotos",
-	"scrapping",
-	"gov",
-	"blogspot",
-	"blogspot",
-	"gotdns",
-	"ac",
-	"asso",
-	"co",
-	"com",
-	"ed",
-	"edu",
-	"go",
-	"gouv",
-	"int",
-	"md",
-	"net",
-	"or",
-	"org",
-	"presse",
-	"xn--aroport-bya",
-	"www",
-	"blogspot",
-	"co",
-	"gob",
-	"gov",
-	"mil",
-	"magentosite",
-	"myfusion",
-	"statics",
-	"cloudns",
-	"co",
-	"com",
-	"gov",
-	"net",
-	"ac",
-	"ah",
-	"bj",
-	"com",
-	"cq",
-	"edu",
-	"fj",
-	"gd",
-	"gov",
-	"gs",
-	"gx",
-	"gz",
-	"ha",
-	"hb",
-	"he",
-	"hi",
-	"hk",
-	"hl",
-	"hn",
-	"jl",
-	"js",
-	"jx",
-	"ln",
-	"mil",
-	"mo",
-	"net",
-	"nm",
-	"nx",
-	"org",
-	"qh",
-	"sc",
-	"sd",
-	"sh",
-	"sn",
-	"sx",
-	"tj",
-	"tw",
-	"xj",
-	"xn--55qx5d",
-	"xn--io0a7i",
-	"xn--od0alg",
-	"xz",
-	"yn",
-	"zj",
-	"amazonaws",
-	"cn-north-1",
-	"compute",
-	"elb",
-	"elasticbeanstalk",
-	"s3",
-	"arts",
-	"com",
-	"edu",
-	"firm",
-	"gov",
-	"info",
-	"int",
-	"mil",
-	"net",
-	"nom",
-	"org",
-	"rec",
-	"web",
-	"blogspot",
-	"0emm",
-	"1kapp",
-	"3utilities",
-	"4u",
-	"africa",
-	"alpha-myqnapcloud",
-	"amazonaws",
-	"appchizi",
-	"applinzi",
-	"appspot",
-	"ar",
-	"betainabox",
-	"blogdns",
-	"blogspot",
-	"blogsyte",
-	"bloxcms",
-	"bounty-full",
-	"br",
-	"cechire",
-	"ciscofreak",
-	"cloudcontrolapp",
-	"cloudcontrolled",
-	"cn",
-	"co",
-	"codespot",
-	"damnserver",
-	"ddnsking",
-	"de",
-	"dev-myqnapcloud",
-	"ditchyourip",
-	"dnsalias",
-	"dnsdojo",
-	"dnsiskinky",
-	"doesntexist",
-	"dontexist",
-	"doomdns",
-	"dreamhosters",
-	"dsmynas",
-	"dyn-o-saur",
-	"dynalias",
-	"dyndns-at-home",
-	"dyndns-at-work",
-	"dyndns-blog",
-	"dyndns-free",
-	"dyndns-home",
-	"dyndns-ip",
-	"dyndns-mail",
-	"dyndns-office",
-	"dyndns-pics",
-	"dyndns-remote",
-	"dyndns-server",
-	"dyndns-web",
-	"dyndns-wiki",
-	"dyndns-work",
-	"dynns",
-	"elasticbeanstalk",
-	"est-a-la-maison",
-	"est-a-la-masion",
-	"est-le-patron",
-	"est-mon-blogueur",
-	"eu",
-	"evennode",
-	"familyds",
-	"fbsbx",
-	"firebaseapp",
-	"firewall-gateway",
-	"flynnhub",
-	"freebox-os",
-	"freeboxos",
-	"from-ak",
-	"from-al",
-	"from-ar",
-	"from-ca",
-	"from-ct",
-	"from-dc",
-	"from-de",
-	"from-fl",
-	"from-ga",
-	"from-hi",
-	"from-ia",
-	"from-id",
-	"from-il",
-	"from-in",
-	"from-ks",
-	"from-ky",
-	"from-ma",
-	"from-md",
-	"from-mi",
-	"from-mn",
-	"from-mo",
-	"from-ms",
-	"from-mt",
-	"from-nc",
-	"from-nd",
-	"from-ne",
-	"from-nh",
-	"from-nj",
-	"from-nm",
-	"from-nv",
-	"from-oh",
-	"from-ok",
-	"from-or",
-	"from-pa",
-	"from-pr",
-	"from-ri",
-	"from-sc",
-	"from-sd",
-	"from-tn",
-	"from-tx",
-	"from-ut",
-	"from-va",
-	"from-vt",
-	"from-wa",
-	"from-wi",
-	"from-wv",
-	"from-wy",
-	"gb",
-	"geekgalaxy",
-	"getmyip",
-	"githubcloud",
-	"githubcloudusercontent",
-	"githubusercontent",
-	"googleapis",
-	"googlecode",
-	"gotdns",
-	"gotpantheon",
-	"gr",
-	"health-carereform",
-	"herokuapp",
-	"herokussl",
-	"hk",
-	"hobby-site",
-	"homelinux",
-	"homesecuritymac",
-	"homesecuritypc",
-	"homeunix",
-	"hu",
-	"iamallama",
-	"is-a-anarchist",
-	"is-a-blogger",
-	"is-a-bookkeeper",
-	"is-a-bulls-fan",
-	"is-a-caterer",
-	"is-a-chef",
-	"is-a-conservative",
-	"is-a-cpa",
-	"is-a-cubicle-slave",
-	"is-a-democrat",
-	"is-a-designer",
-	"is-a-doctor",
-	"is-a-financialadvisor",
-	"is-a-geek",
-	"is-a-green",
-	"is-a-guru",
-	"is-a-hard-worker",
-	"is-a-hunter",
-	"is-a-landscaper",
-	"is-a-lawyer",
-	"is-a-liberal",
-	"is-a-libertarian",
-	"is-a-llama",
-	"is-a-musician",
-	"is-a-nascarfan",
-	"is-a-nurse",
-	"is-a-painter",
-	"is-a-personaltrainer",
-	"is-a-photographer",
-	"is-a-player",
-	"is-a-republican",
-	"is-a-rockstar",
-	"is-a-socialist",
-	"is-a-student",
-	"is-a-teacher",
-	"is-a-techie",
-	"is-a-therapist",
-	"is-an-accountant",
-	"is-an-actor",
-	"is-an-actress",
-	"is-an-anarchist",
-	"is-an-artist",
-	"is-an-engineer",
-	"is-an-entertainer",
-	"is-certified",
-	"is-gone",
-	"is-into-anime",
-	"is-into-cars",
-	"is-into-cartoons",
-	"is-into-games",
-	"is-leet",
-	"is-not-certified",
-	"is-slick",
-	"is-uberleet",
-	"is-with-theband",
-	"isa-geek",
-	"isa-hockeynut",
-	"issmarterthanyou",
-	"joyent",
-	"jpn",
-	"kr",
-	"likes-pie",
-	"likescandy",
-	"logoip",
-	"meteorapp",
-	"mex",
-	"myactivedirectory",
-	"myasustor",
-	"mydrobo",
-	"myqnapcloud",
-	"mysecuritycamera",
-	"myshopblocks",
-	"myvnc",
-	"neat-url",
-	"net-freaks",
-	"nfshost",
-	"no",
-	"on-aptible",
-	"onthewifi",
-	"operaunite",
-	"outsystemscloud",
-	"ownprovider",
-	"pagefrontapp",
-	"pagespeedmobilizer",
-	"pgfog",
-	"point2this",
-	"prgmr",
-	"publishproxy",
-	"qa2",
-	"qc",
-	"quicksytes",
-	"rackmaze",
-	"remotewd",
-	"rhcloud",
-	"ru",
-	"sa",
-	"saves-the-whales",
-	"se",
-	"securitytactics",
-	"selfip",
-	"sells-for-less",
-	"sells-for-u",
-	"servebbs",
-	"servebeer",
-	"servecounterstrike",
-	"serveexchange",
-	"serveftp",
-	"servegame",
-	"servehalflife",
-	"servehttp",
-	"servehumour",
-	"serveirc",
-	"servemp3",
-	"servep2p",
-	"servepics",
-	"servequake",
-	"servesarcasm",
-	"simple-url",
-	"sinaapp",
-	"space-to-rent",
-	"stufftoread",
-	"teaches-yoga",
-	"townnews-staging",
-	"uk",
-	"unusualperson",
-	"us",
-	"uy",
-	"vipsinaapp",
-	"withgoogle",
-	"withyoutube",
-	"workisboring",
-	"writesthisblog",
-	"xenapponazure",
-	"yolasite",
-	"za",
-	"ap-northeast-1",
-	"ap-northeast-2",
-	"ap-south-1",
-	"ap-southeast-1",
-	"ap-southeast-2",
-	"ca-central-1",
-	"compute",
-	"compute-1",
-	"elb",
-	"eu-central-1",
-	"eu-west-1",
-	"s3",
-	"s3-ap-northeast-1",
-	"s3-ap-northeast-2",
-	"s3-ap-south-1",
-	"s3-ap-southeast-1",
-	"s3-ap-southeast-2",
-	"s3-ca-central-1",
-	"s3-eu-central-1",
-	"s3-eu-west-1",
-	"s3-external-1",
-	"s3-fips-us-gov-west-1",
-	"s3-sa-east-1",
-	"s3-us-east-2",
-	"s3-us-gov-west-1",
-	"s3-us-west-1",
-	"s3-us-west-2",
-	"s3-website-ap-northeast-1",
-	"s3-website-ap-southeast-1",
-	"s3-website-ap-southeast-2",
-	"s3-website-eu-west-1",
-	"s3-website-sa-east-1",
-	"s3-website-us-east-1",
-	"s3-website-us-west-1",
-	"s3-website-us-west-2",
-	"sa-east-1",
-	"us-east-1",
-	"us-east-2",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"s3-website",
-	"s3",
-	"dualstack",
-	"s3",
-	"s3-website",
-	"s3",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"s3-website",
-	"s3",
-	"dualstack",
-	"s3",
-	"s3-website",
-	"s3",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"dualstack",
-	"s3",
-	"s3-website",
-	"s3",
-	"alpha",
-	"beta",
-	"eu-1",
-	"eu-2",
-	"us-1",
-	"us-2",
-	"apps",
-	"api",
-	"ext",
-	"gist",
-	"cns",
-	"eu",
-	"xen",
-	"ac",
-	"co",
-	"ed",
-	"fi",
-	"go",
-	"or",
-	"sa",
-	"com",
-	"edu",
-	"gov",
-	"inf",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"net",
-	"org",
-	"ath",
-	"gov",
-	"ac",
-	"biz",
-	"com",
-	"ekloges",
-	"gov",
-	"ltd",
-	"name",
-	"net",
-	"org",
-	"parliament",
-	"press",
-	"pro",
-	"tm",
-	"blogspot",
-	"blogspot",
-	"co",
-	"e4",
-	"realm",
-	"blogspot",
-	"com",
-	"cosidns",
-	"dd-dns",
-	"ddnss",
-	"dnshome",
-	"dnsupdater",
-	"dray-dns",
-	"draydns",
-	"dyn-ip24",
-	"dyn-vpn",
-	"dynamisches-dns",
-	"dyndns1",
-	"dynvpn",
-	"firewall-gateway",
-	"fuettertdasnetz",
-	"goip",
-	"home-webserver",
-	"internet-dns",
-	"isteingeek",
-	"istmein",
-	"keymachine",
-	"l-o-g-i-n",
-	"lebtimnetz",
-	"leitungsen",
-	"logoip",
-	"mein-vigor",
-	"my-gateway",
-	"my-router",
-	"my-vigor",
-	"my-wan",
-	"myhome-server",
-	"spdns",
-	"syno-ds",
-	"synology-diskstation",
-	"synology-ds",
-	"taifun-dns",
-	"traeumtgerade",
-	"dyn",
-	"dyn",
-	"dyndns",
-	"dyn",
-	"biz",
-	"blogspot",
-	"co",
-	"firm",
-	"reg",
-	"store",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"art",
-	"com",
-	"edu",
-	"gob",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"sld",
-	"web",
-	"art",
-	"asso",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"pol",
-	"com",
-	"edu",
-	"fin",
-	"gob",
-	"gov",
-	"info",
-	"k12",
-	"med",
-	"mil",
-	"net",
-	"org",
-	"pro",
-	"aip",
-	"com",
-	"edu",
-	"fie",
-	"gov",
-	"lib",
-	"med",
-	"org",
-	"pri",
-	"riik",
-	"blogspot",
-	"com",
-	"edu",
-	"eun",
-	"gov",
-	"mil",
-	"name",
-	"net",
-	"org",
-	"sci",
-	"blogspot",
-	"com",
-	"edu",
-	"gob",
-	"nom",
-	"org",
-	"blogspot",
-	"compute",
-	"biz",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"name",
-	"net",
-	"org",
-	"cloudns",
-	"diskstation",
-	"mycd",
-	"spdns",
-	"transurl",
-	"wellbeingzone",
-	"party",
-	"user",
-	"ybo",
-	"aland",
-	"blogspot",
-	"dy",
-	"iki",
-	"ptplus",
-	"aeroport",
-	"assedic",
-	"asso",
-	"avocat",
-	"avoues",
-	"blogspot",
-	"cci",
-	"chambagri",
-	"chirurgiens-dentistes",
-	"chirurgiens-dentistes-en-france",
-	"com",
-	"experts-comptables",
-	"fbx-os",
-	"fbxos",
-	"freebox-os",
-	"freeboxos",
-	"geometre-expert",
-	"gouv",
-	"greta",
-	"huissier-justice",
-	"medecin",
-	"nom",
-	"notaires",
-	"on-web",
-	"pharmacien",
-	"port",
-	"prd",
-	"presse",
-	"tm",
-	"veterinaire",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"pvt",
-	"co",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"ltd",
-	"mod",
-	"org",
-	"co",
-	"com",
-	"edu",
-	"net",
-	"org",
-	"ac",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"asso",
-	"com",
-	"edu",
-	"mobi",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gob",
-	"ind",
-	"mil",
-	"net",
-	"org",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"idv",
-	"inc",
-	"ltd",
-	"net",
-	"org",
-	"xn--55qx5d",
-	"xn--ciqpn",
-	"xn--gmq050i",
-	"xn--gmqw5a",
-	"xn--io0a7i",
-	"xn--lcvr32d",
-	"xn--mk0axi",
-	"xn--mxtq1m",
-	"xn--od0alg",
-	"xn--od0aq3b",
-	"xn--tn0ag",
-	"xn--uc0atv",
-	"xn--uc0ay4a",
-	"xn--wcvs22d",
-	"xn--zf0avx",
-	"com",
-	"edu",
-	"gob",
-	"mil",
-	"net",
-	"org",
-	"opencraft",
-	"blogspot",
-	"com",
-	"from",
-	"iz",
-	"name",
-	"adult",
-	"art",
-	"asso",
-	"com",
-	"coop",
-	"edu",
-	"firm",
-	"gouv",
-	"info",
-	"med",
-	"net",
-	"org",
-	"perso",
-	"pol",
-	"pro",
-	"rel",
-	"shop",
-	"2000",
-	"agrar",
-	"blogspot",
-	"bolt",
-	"casino",
-	"city",
-	"co",
-	"erotica",
-	"erotika",
-	"film",
-	"forum",
-	"games",
-	"hotel",
-	"info",
-	"ingatlan",
-	"jogasz",
-	"konyvelo",
-	"lakas",
-	"media",
-	"news",
-	"org",
-	"priv",
-	"reklam",
-	"sex",
-	"shop",
-	"sport",
-	"suli",
-	"szex",
-	"tm",
-	"tozsde",
-	"utazas",
-	"video",
-	"ac",
-	"biz",
-	"co",
-	"desa",
-	"go",
-	"mil",
-	"my",
-	"net",
-	"or",
-	"sch",
-	"web",
-	"blogspot",
-	"blogspot",
-	"gov",
-	"ac",
-	"co",
-	"gov",
-	"idf",
-	"k12",
-	"muni",
-	"net",
-	"org",
-	"blogspot",
-	"ac",
-	"co",
-	"com",
-	"net",
-	"org",
-	"ro",
-	"tt",
-	"tv",
-	"ltd",
-	"plc",
-	"ac",
-	"blogspot",
-	"cloudns",
-	"co",
-	"edu",
-	"firm",
-	"gen",
-	"gov",
-	"ind",
-	"mil",
-	"net",
-	"nic",
-	"org",
-	"res",
-	"barrel-of-knowledge",
-	"barrell-of-knowledge",
-	"cloudns",
-	"dvrcam",
-	"dynamic-dns",
-	"dyndns",
-	"for-our",
-	"groks-the",
-	"groks-this",
-	"here-for-more",
-	"ilovecollege",
-	"knowsitall",
-	"no-ip",
-	"nsupdate",
-	"selfip",
-	"webhop",
-	"eu",
-	"backplaneapp",
-	"boxfuse",
-	"browsersafetymark",
-	"com",
-	"dedyn",
-	"drud",
-	"enonic",
-	"github",
-	"gitlab",
-	"hasura-app",
-	"hzc",
-	"lair",
-	"ngrok",
-	"nid",
-	"pantheonsite",
-	"protonet",
-	"sandcats",
-	"shiftedit",
-	"spacekit",
-	"stolos",
-	"customer",
-	"apps",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"ac",
-	"co",
-	"gov",
-	"id",
-	"net",
-	"org",
-	"sch",
-	"xn--mgba3a4f16a",
-	"xn--mgba3a4fra",
-	"blogspot",
-	"com",
-	"cupcake",
-	"edu",
-	"gov",
-	"int",
-	"net",
-	"org",
-	"abr",
-	"abruzzo",
-	"ag",
-	"agrigento",
-	"al",
-	"alessandria",
-	"alto-adige",
-	"altoadige",
-	"an",
-	"ancona",
-	"andria-barletta-trani",
-	"andria-trani-barletta",
-	"andriabarlettatrani",
-	"andriatranibarletta",
-	"ao",
-	"aosta",
-	"aosta-valley",
-	"aostavalley",
-	"aoste",
-	"ap",
-	"aq",
-	"aquila",
-	"ar",
-	"arezzo",
-	"ascoli-piceno",
-	"ascolipiceno",
-	"asti",
-	"at",
-	"av",
-	"avellino",
-	"ba",
-	"balsan",
-	"bari",
-	"barletta-trani-andria",
-	"barlettatraniandria",
-	"bas",
-	"basilicata",
-	"belluno",
-	"benevento",
-	"bergamo",
-	"bg",
-	"bi",
-	"biella",
-	"bl",
-	"blogspot",
-	"bn",
-	"bo",
-	"bologna",
-	"bolzano",
-	"bozen",
-	"br",
-	"brescia",
-	"brindisi",
-	"bs",
-	"bt",
-	"bz",
-	"ca",
-	"cagliari",
-	"cal",
-	"calabria",
-	"caltanissetta",
-	"cam",
-	"campania",
-	"campidano-medio",
-	"campidanomedio",
-	"campobasso",
-	"carbonia-iglesias",
-	"carboniaiglesias",
-	"carrara-massa",
-	"carraramassa",
-	"caserta",
-	"catania",
-	"catanzaro",
-	"cb",
-	"ce",
-	"cesena-forli",
-	"cesenaforli",
-	"ch",
-	"chieti",
-	"ci",
-	"cl",
-	"cn",
-	"co",
-	"como",
-	"cosenza",
-	"cr",
-	"cremona",
-	"crotone",
-	"cs",
-	"ct",
-	"cuneo",
-	"cz",
-	"dell-ogliastra",
-	"dellogliastra",
-	"edu",
-	"emilia-romagna",
-	"emiliaromagna",
-	"emr",
-	"en",
-	"enna",
-	"fc",
-	"fe",
-	"fermo",
-	"ferrara",
-	"fg",
-	"fi",
-	"firenze",
-	"florence",
-	"fm",
-	"foggia",
-	"forli-cesena",
-	"forlicesena",
-	"fr",
-	"friuli-v-giulia",
-	"friuli-ve-giulia",
-	"friuli-vegiulia",
-	"friuli-venezia-giulia",
-	"friuli-veneziagiulia",
-	"friuli-vgiulia",
-	"friuliv-giulia",
-	"friulive-giulia",
-	"friulivegiulia",
-	"friulivenezia-giulia",
-	"friuliveneziagiulia",
-	"friulivgiulia",
-	"frosinone",
-	"fvg",
-	"ge",
-	"genoa",
-	"genova",
-	"go",
-	"gorizia",
-	"gov",
-	"gr",
-	"grosseto",
-	"iglesias-carbonia",
-	"iglesiascarbonia",
-	"im",
-	"imperia",
-	"is",
-	"isernia",
-	"kr",
-	"la-spezia",
-	"laquila",
-	"laspezia",
-	"latina",
-	"laz",
-	"lazio",
-	"lc",
-	"le",
-	"lecce",
-	"lecco",
-	"li",
-	"lig",
-	"liguria",
-	"livorno",
-	"lo",
-	"lodi",
-	"lom",
-	"lombardia",
-	"lombardy",
-	"lt",
-	"lu",
-	"lucania",
-	"lucca",
-	"macerata",
-	"mantova",
-	"mar",
-	"marche",
-	"massa-carrara",
-	"massacarrara",
-	"matera",
-	"mb",
-	"mc",
-	"me",
-	"medio-campidano",
-	"mediocampidano",
-	"messina",
-	"mi",
-	"milan",
-	"milano",
-	"mn",
-	"mo",
-	"modena",
-	"mol",
-	"molise",
-	"monza",
-	"monza-brianza",
-	"monza-e-della-brianza",
-	"monzabrianza",
-	"monzaebrianza",
-	"monzaedellabrianza",
-	"ms",
-	"mt",
-	"na",
-	"naples",
-	"napoli",
-	"no",
-	"novara",
-	"nu",
-	"nuoro",
-	"og",
-	"ogliastra",
-	"olbia-tempio",
-	"olbiatempio",
-	"or",
-	"oristano",
-	"ot",
-	"pa",
-	"padova",
-	"padua",
-	"palermo",
-	"parma",
-	"pavia",
-	"pc",
-	"pd",
-	"pe",
-	"perugia",
-	"pesaro-urbino",
-	"pesarourbino",
-	"pescara",
-	"pg",
-	"pi",
-	"piacenza",
-	"piedmont",
-	"piemonte",
-	"pisa",
-	"pistoia",
-	"pmn",
-	"pn",
-	"po",
-	"pordenone",
-	"potenza",
-	"pr",
-	"prato",
-	"pt",
-	"pu",
-	"pug",
-	"puglia",
-	"pv",
-	"pz",
-	"ra",
-	"ragusa",
-	"ravenna",
-	"rc",
-	"re",
-	"reggio-calabria",
-	"reggio-emilia",
-	"reggiocalabria",
-	"reggioemilia",
-	"rg",
-	"ri",
-	"rieti",
-	"rimini",
-	"rm",
-	"rn",
-	"ro",
-	"roma",
-	"rome",
-	"rovigo",
-	"sa",
-	"salerno",
-	"sar",
-	"sardegna",
-	"sardinia",
-	"sassari",
-	"savona",
-	"si",
-	"sic",
-	"sicilia",
-	"sicily",
-	"siena",
-	"siracusa",
-	"so",
-	"sondrio",
-	"sp",
-	"sr",
-	"ss",
-	"suedtirol",
-	"sv",
-	"ta",
-	"taa",
-	"taranto",
-	"te",
-	"tempio-olbia",
-	"tempioolbia",
-	"teramo",
-	"terni",
-	"tn",
-	"to",
-	"torino",
-	"tos",
-	"toscana",
-	"tp",
-	"tr",
-	"trani-andria-barletta",
-	"trani-barletta-andria",
-	"traniandriabarletta",
-	"tranibarlettaandria",
-	"trapani",
-	"trentino",
-	"trentino-a-adige",
-	"trentino-aadige",
-	"trentino-alto-adige",
-	"trentino-altoadige",
-	"trentino-s-tirol",
-	"trentino-stirol",
-	"trentino-sud-tirol",
-	"trentino-sudtirol",
-	"trentino-sued-tirol",
-	"trentino-suedtirol",
-	"trentinoa-adige",
-	"trentinoaadige",
-	"trentinoalto-adige",
-	"trentinoaltoadige",
-	"trentinos-tirol",
-	"trentinostirol",
-	"trentinosud-tirol",
-	"trentinosudtirol",
-	"trentinosued-tirol",
-	"trentinosuedtirol",
-	"trento",
-	"treviso",
-	"trieste",
-	"ts",
-	"turin",
-	"tuscany",
-	"tv",
-	"ud",
-	"udine",
-	"umb",
-	"umbria",
-	"urbino-pesaro",
-	"urbinopesaro",
-	"va",
-	"val-d-aosta",
-	"val-daosta",
-	"vald-aosta",
-	"valdaosta",
-	"valle-aosta",
-	"valle-d-aosta",
-	"valle-daosta",
-	"valleaosta",
-	"valled-aosta",
-	"valledaosta",
-	"vallee-aoste",
-	"valleeaoste",
-	"vao",
-	"varese",
-	"vb",
-	"vc",
-	"vda",
-	"ve",
-	"ven",
-	"veneto",
-	"venezia",
-	"venice",
-	"verbania",
-	"vercelli",
-	"verona",
-	"vi",
-	"vibo-valentia",
-	"vibovalentia",
-	"vicenza",
-	"viterbo",
-	"vr",
-	"vs",
-	"vt",
-	"vv",
-	"co",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"name",
-	"net",
-	"org",
-	"sch",
-	"ac",
-	"ad",
-	"aichi",
-	"akita",
-	"aomori",
-	"blogspot",
-	"chiba",
-	"co",
-	"ed",
-	"ehime",
-	"fukui",
-	"fukuoka",
-	"fukushima",
-	"gifu",
-	"go",
-	"gr",
-	"gunma",
-	"hiroshima",
-	"hokkaido",
-	"hyogo",
-	"ibaraki",
-	"ishikawa",
-	"iwate",
-	"kagawa",
-	"kagoshima",
-	"kanagawa",
-	"kawasaki",
-	"kitakyushu",
-	"kobe",
-	"kochi",
-	"kumamoto",
-	"kyoto",
-	"lg",
-	"mie",
-	"miyagi",
-	"miyazaki",
-	"nagano",
-	"nagasaki",
-	"nagoya",
-	"nara",
-	"ne",
-	"niigata",
-	"oita",
-	"okayama",
-	"okinawa",
-	"or",
-	"osaka",
-	"saga",
-	"saitama",
-	"sapporo",
-	"sendai",
-	"shiga",
-	"shimane",
-	"shizuoka",
-	"tochigi",
-	"tokushima",
-	"tokyo",
-	"tottori",
-	"toyama",
-	"wakayama",
-	"xn--0trq7p7nn",
-	"xn--1ctwo",
-	"xn--1lqs03n",
-	"xn--1lqs71d",
-	"xn--2m4a15e",
-	"xn--32vp30h",
-	"xn--4it168d",
-	"xn--4it797k",
-	"xn--4pvxs",
-	"xn--5js045d",
-	"xn--5rtp49c",
-	"xn--5rtq34k",
-	"xn--6btw5a",
-	"xn--6orx2r",
-	"xn--7t0a264c",
-	"xn--8ltr62k",
-	"xn--8pvr4u",
-	"xn--c3s14m",
-	"xn--d5qv7z876c",
-	"xn--djrs72d6uy",
-	"xn--djty4k",
-	"xn--efvn9s",
-	"xn--ehqz56n",
-	"xn--elqq16h",
-	"xn--f6qx53a",
-	"xn--k7yn95e",
-	"xn--kbrq7o",
-	"xn--klt787d",
-	"xn--kltp7d",
-	"xn--kltx9a",
-	"xn--klty5x",
-	"xn--mkru45i",
-	"xn--nit225k",
-	"xn--ntso0iqx3a",
-	"xn--ntsq17g",
-	"xn--pssu33l",
-	"xn--qqqt11m",
-	"xn--rht27z",
-	"xn--rht3d",
-	"xn--rht61e",
-	"xn--rny31h",
-	"xn--tor131o",
-	"xn--uist22h",
-	"xn--uisz3g",
-	"xn--uuwu58a",
-	"xn--vgu402c",
-	"xn--zbx025d",
-	"yamagata",
-	"yamaguchi",
-	"yamanashi",
-	"yokohama",
-	"aisai",
-	"ama",
-	"anjo",
-	"asuke",
-	"chiryu",
-	"chita",
-	"fuso",
-	"gamagori",
-	"handa",
-	"hazu",
-	"hekinan",
-	"higashiura",
-	"ichinomiya",
-	"inazawa",
-	"inuyama",
-	"isshiki",
-	"iwakura",
-	"kanie",
-	"kariya",
-	"kasugai",
-	"kira",
-	"kiyosu",
-	"komaki",
-	"konan",
-	"kota",
-	"mihama",
-	"miyoshi",
-	"nishio",
-	"nisshin",
-	"obu",
-	"oguchi",
-	"oharu",
-	"okazaki",
-	"owariasahi",
-	"seto",
-	"shikatsu",
-	"shinshiro",
-	"shitara",
-	"tahara",
-	"takahama",
-	"tobishima",
-	"toei",
-	"togo",
-	"tokai",
-	"tokoname",
-	"toyoake",
-	"toyohashi",
-	"toyokawa",
-	"toyone",
-	"toyota",
-	"tsushima",
-	"yatomi",
-	"akita",
-	"daisen",
-	"fujisato",
-	"gojome",
-	"hachirogata",
-	"happou",
-	"higashinaruse",
-	"honjo",
-	"honjyo",
-	"ikawa",
-	"kamikoani",
-	"kamioka",
-	"katagami",
-	"kazuno",
-	"kitaakita",
-	"kosaka",
-	"kyowa",
-	"misato",
-	"mitane",
-	"moriyoshi",
-	"nikaho",
-	"noshiro",
-	"odate",
-	"oga",
-	"ogata",
-	"semboku",
-	"yokote",
-	"yurihonjo",
-	"aomori",
-	"gonohe",
-	"hachinohe",
-	"hashikami",
-	"hiranai",
-	"hirosaki",
-	"itayanagi",
-	"kuroishi",
-	"misawa",
-	"mutsu",
-	"nakadomari",
-	"noheji",
-	"oirase",
-	"owani",
-	"rokunohe",
-	"sannohe",
-	"shichinohe",
-	"shingo",
-	"takko",
-	"towada",
-	"tsugaru",
-	"tsuruta",
-	"abiko",
-	"asahi",
-	"chonan",
-	"chosei",
-	"choshi",
-	"chuo",
-	"funabashi",
-	"futtsu",
-	"hanamigawa",
-	"ichihara",
-	"ichikawa",
-	"ichinomiya",
-	"inzai",
-	"isumi",
-	"kamagaya",
-	"kamogawa",
-	"kashiwa",
-	"katori",
-	"katsuura",
-	"kimitsu",
-	"kisarazu",
-	"kozaki",
-	"kujukuri",
-	"kyonan",
-	"matsudo",
-	"midori",
-	"mihama",
-	"minamiboso",
-	"mobara",
-	"mutsuzawa",
-	"nagara",
-	"nagareyama",
-	"narashino",
-	"narita",
-	"noda",
-	"oamishirasato",
-	"omigawa",
-	"onjuku",
-	"otaki",
-	"sakae",
-	"sakura",
-	"shimofusa",
-	"shirako",
-	"shiroi",
-	"shisui",
-	"sodegaura",
-	"sosa",
-	"tako",
-	"tateyama",
-	"togane",
-	"tohnosho",
-	"tomisato",
-	"urayasu",
-	"yachimata",
-	"yachiyo",
-	"yokaichiba",
-	"yokoshibahikari",
-	"yotsukaido",
-	"ainan",
-	"honai",
-	"ikata",
-	"imabari",
-	"iyo",
-	"kamijima",
-	"kihoku",
-	"kumakogen",
-	"masaki",
-	"matsuno",
-	"matsuyama",
-	"namikata",
-	"niihama",
-	"ozu",
-	"saijo",
-	"seiyo",
-	"shikokuchuo",
-	"tobe",
-	"toon",
-	"uchiko",
-	"uwajima",
-	"yawatahama",
-	"echizen",
-	"eiheiji",
-	"fukui",
-	"ikeda",
-	"katsuyama",
-	"mihama",
-	"minamiechizen",
-	"obama",
-	"ohi",
-	"ono",
-	"sabae",
-	"sakai",
-	"takahama",
-	"tsuruga",
-	"wakasa",
-	"ashiya",
-	"buzen",
-	"chikugo",
-	"chikuho",
-	"chikujo",
-	"chikushino",
-	"chikuzen",
-	"chuo",
-	"dazaifu",
-	"fukuchi",
-	"hakata",
-	"higashi",
-	"hirokawa",
-	"hisayama",
-	"iizuka",
-	"inatsuki",
-	"kaho",
-	"kasuga",
-	"kasuya",
-	"kawara",
-	"keisen",
-	"koga",
-	"kurate",
-	"kurogi",
-	"kurume",
-	"minami",
-	"miyako",
-	"miyama",
-	"miyawaka",
-	"mizumaki",
-	"munakata",
-	"nakagawa",
-	"nakama",
-	"nishi",
-	"nogata",
-	"ogori",
-	"okagaki",
-	"okawa",
-	"oki",
-	"omuta",
-	"onga",
-	"onojo",
-	"oto",
-	"saigawa",
-	"sasaguri",
-	"shingu",
-	"shinyoshitomi",
-	"shonai",
-	"soeda",
-	"sue",
-	"tachiarai",
-	"tagawa",
-	"takata",
-	"toho",
-	"toyotsu",
-	"tsuiki",
-	"ukiha",
-	"umi",
-	"usui",
-	"yamada",
-	"yame",
-	"yanagawa",
-	"yukuhashi",
-	"aizubange",
-	"aizumisato",
-	"aizuwakamatsu",
-	"asakawa",
-	"bandai",
-	"date",
-	"fukushima",
-	"furudono",
-	"futaba",
-	"hanawa",
-	"higashi",
-	"hirata",
-	"hirono",
-	"iitate",
-	"inawashiro",
-	"ishikawa",
-	"iwaki",
-	"izumizaki",
-	"kagamiishi",
-	"kaneyama",
-	"kawamata",
-	"kitakata",
-	"kitashiobara",
-	"koori",
-	"koriyama",
-	"kunimi",
-	"miharu",
-	"mishima",
-	"namie",
-	"nango",
-	"nishiaizu",
-	"nishigo",
-	"okuma",
-	"omotego",
-	"ono",
-	"otama",
-	"samegawa",
-	"shimogo",
-	"shirakawa",
-	"showa",
-	"soma",
-	"sukagawa",
-	"taishin",
-	"tamakawa",
-	"tanagura",
-	"tenei",
-	"yabuki",
-	"yamato",
-	"yamatsuri",
-	"yanaizu",
-	"yugawa",
-	"anpachi",
-	"ena",
-	"gifu",
-	"ginan",
-	"godo",
-	"gujo",
-	"hashima",
-	"hichiso",
-	"hida",
-	"higashishirakawa",
-	"ibigawa",
-	"ikeda",
-	"kakamigahara",
-	"kani",
-	"kasahara",
-	"kasamatsu",
-	"kawaue",
-	"kitagata",
-	"mino",
-	"minokamo",
-	"mitake",
-	"mizunami",
-	"motosu",
-	"nakatsugawa",
-	"ogaki",
-	"sakahogi",
-	"seki",
-	"sekigahara",
-	"shirakawa",
-	"tajimi",
-	"takayama",
-	"tarui",
-	"toki",
-	"tomika",
-	"wanouchi",
-	"yamagata",
-	"yaotsu",
-	"yoro",
-	"annaka",
-	"chiyoda",
-	"fujioka",
-	"higashiagatsuma",
-	"isesaki",
-	"itakura",
-	"kanna",
-	"kanra",
-	"katashina",
-	"kawaba",
-	"kiryu",
-	"kusatsu",
-	"maebashi",
-	"meiwa",
-	"midori",
-	"minakami",
-	"naganohara",
-	"nakanojo",
-	"nanmoku",
-	"numata",
-	"oizumi",
-	"ora",
-	"ota",
-	"shibukawa",
-	"shimonita",
-	"shinto",
-	"showa",
-	"takasaki",
-	"takayama",
-	"tamamura",
-	"tatebayashi",
-	"tomioka",
-	"tsukiyono",
-	"tsumagoi",
-	"ueno",
-	"yoshioka",
-	"asaminami",
-	"daiwa",
-	"etajima",
-	"fuchu",
-	"fukuyama",
-	"hatsukaichi",
-	"higashihiroshima",
-	"hongo",
-	"jinsekikogen",
-	"kaita",
-	"kui",
-	"kumano",
-	"kure",
-	"mihara",
-	"miyoshi",
-	"naka",
-	"onomichi",
-	"osakikamijima",
-	"otake",
-	"saka",
-	"sera",
-	"seranishi",
-	"shinichi",
-	"shobara",
-	"takehara",
-	"abashiri",
-	"abira",
-	"aibetsu",
-	"akabira",
-	"akkeshi",
-	"asahikawa",
-	"ashibetsu",
-	"ashoro",
-	"assabu",
-	"atsuma",
-	"bibai",
-	"biei",
-	"bifuka",
-	"bihoro",
-	"biratori",
-	"chippubetsu",
-	"chitose",
-	"date",
-	"ebetsu",
-	"embetsu",
-	"eniwa",
-	"erimo",
-	"esan",
-	"esashi",
-	"fukagawa",
-	"fukushima",
-	"furano",
-	"furubira",
-	"haboro",
-	"hakodate",
-	"hamatonbetsu",
-	"hidaka",
-	"higashikagura",
-	"higashikawa",
-	"hiroo",
-	"hokuryu",
-	"hokuto",
-	"honbetsu",
-	"horokanai",
-	"horonobe",
-	"ikeda",
-	"imakane",
-	"ishikari",
-	"iwamizawa",
-	"iwanai",
-	"kamifurano",
-	"kamikawa",
-	"kamishihoro",
-	"kamisunagawa",
-	"kamoenai",
-	"kayabe",
-	"kembuchi",
-	"kikonai",
-	"kimobetsu",
-	"kitahiroshima",
-	"kitami",
-	"kiyosato",
-	"koshimizu",
-	"kunneppu",
-	"kuriyama",
-	"kuromatsunai",
-	"kushiro",
-	"kutchan",
-	"kyowa",
-	"mashike",
-	"matsumae",
-	"mikasa",
-	"minamifurano",
-	"mombetsu",
-	"moseushi",
-	"mukawa",
-	"muroran",
-	"naie",
-	"nakagawa",
-	"nakasatsunai",
-	"nakatombetsu",
-	"nanae",
-	"nanporo",
-	"nayoro",
-	"nemuro",
-	"niikappu",
-	"niki",
-	"nishiokoppe",
-	"noboribetsu",
-	"numata",
-	"obihiro",
-	"obira",
-	"oketo",
-	"okoppe",
-	"otaru",
-	"otobe",
-	"otofuke",
-	"otoineppu",
-	"oumu",
-	"ozora",
-	"pippu",
-	"rankoshi",
-	"rebun",
-	"rikubetsu",
-	"rishiri",
-	"rishirifuji",
-	"saroma",
-	"sarufutsu",
-	"shakotan",
-	"shari",
-	"shibecha",
-	"shibetsu",
-	"shikabe",
-	"shikaoi",
-	"shimamaki",
-	"shimizu",
-	"shimokawa",
-	"shinshinotsu",
-	"shintoku",
-	"shiranuka",
-	"shiraoi",
-	"shiriuchi",
-	"sobetsu",
-	"sunagawa",
-	"taiki",
-	"takasu",
-	"takikawa",
-	"takinoue",
-	"teshikaga",
-	"tobetsu",
-	"tohma",
-	"tomakomai",
-	"tomari",
-	"toya",
-	"toyako",
-	"toyotomi",
-	"toyoura",
-	"tsubetsu",
-	"tsukigata",
-	"urakawa",
-	"urausu",
-	"uryu",
-	"utashinai",
-	"wakkanai",
-	"wassamu",
-	"yakumo",
-	"yoichi",
-	"aioi",
-	"akashi",
-	"ako",
-	"amagasaki",
-	"aogaki",
-	"asago",
-	"ashiya",
-	"awaji",
-	"fukusaki",
-	"goshiki",
-	"harima",
-	"himeji",
-	"ichikawa",
-	"inagawa",
-	"itami",
-	"kakogawa",
-	"kamigori",
-	"kamikawa",
-	"kasai",
-	"kasuga",
-	"kawanishi",
-	"miki",
-	"minamiawaji",
-	"nishinomiya",
-	"nishiwaki",
-	"ono",
-	"sanda",
-	"sannan",
-	"sasayama",
-	"sayo",
-	"shingu",
-	"shinonsen",
-	"shiso",
-	"sumoto",
-	"taishi",
-	"taka",
-	"takarazuka",
-	"takasago",
-	"takino",
-	"tamba",
-	"tatsuno",
-	"toyooka",
-	"yabu",
-	"yashiro",
-	"yoka",
-	"yokawa",
-	"ami",
-	"asahi",
-	"bando",
-	"chikusei",
-	"daigo",
-	"fujishiro",
-	"hitachi",
-	"hitachinaka",
-	"hitachiomiya",
-	"hitachiota",
-	"ibaraki",
-	"ina",
-	"inashiki",
-	"itako",
-	"iwama",
-	"joso",
-	"kamisu",
-	"kasama",
-	"kashima",
-	"kasumigaura",
-	"koga",
-	"miho",
-	"mito",
-	"moriya",
-	"naka",
-	"namegata",
-	"oarai",
-	"ogawa",
-	"omitama",
-	"ryugasaki",
-	"sakai",
-	"sakuragawa",
-	"shimodate",
-	"shimotsuma",
-	"shirosato",
-	"sowa",
-	"suifu",
-	"takahagi",
-	"tamatsukuri",
-	"tokai",
-	"tomobe",
-	"tone",
-	"toride",
-	"tsuchiura",
-	"tsukuba",
-	"uchihara",
-	"ushiku",
-	"yachiyo",
-	"yamagata",
-	"yawara",
-	"yuki",
-	"anamizu",
-	"hakui",
-	"hakusan",
-	"kaga",
-	"kahoku",
-	"kanazawa",
-	"kawakita",
-	"komatsu",
-	"nakanoto",
-	"nanao",
-	"nomi",
-	"nonoichi",
-	"noto",
-	"shika",
-	"suzu",
-	"tsubata",
-	"tsurugi",
-	"uchinada",
-	"wajima",
-	"fudai",
-	"fujisawa",
-	"hanamaki",
-	"hiraizumi",
-	"hirono",
-	"ichinohe",
-	"ichinoseki",
-	"iwaizumi",
-	"iwate",
-	"joboji",
-	"kamaishi",
-	"kanegasaki",
-	"karumai",
-	"kawai",
-	"kitakami",
-	"kuji",
-	"kunohe",
-	"kuzumaki",
-	"miyako",
-	"mizusawa",
-	"morioka",
-	"ninohe",
-	"noda",
-	"ofunato",
-	"oshu",
-	"otsuchi",
-	"rikuzentakata",
-	"shiwa",
-	"shizukuishi",
-	"sumita",
-	"tanohata",
-	"tono",
-	"yahaba",
-	"yamada",
-	"ayagawa",
-	"higashikagawa",
-	"kanonji",
-	"kotohira",
-	"manno",
-	"marugame",
-	"mitoyo",
-	"naoshima",
-	"sanuki",
-	"tadotsu",
-	"takamatsu",
-	"tonosho",
-	"uchinomi",
-	"utazu",
-	"zentsuji",
-	"akune",
-	"amami",
-	"hioki",
-	"isa",
-	"isen",
-	"izumi",
-	"kagoshima",
-	"kanoya",
-	"kawanabe",
-	"kinko",
-	"kouyama",
-	"makurazaki",
-	"matsumoto",
-	"minamitane",
-	"nakatane",
-	"nishinoomote",
-	"satsumasendai",
-	"soo",
-	"tarumizu",
-	"yusui",
-	"aikawa",
-	"atsugi",
-	"ayase",
-	"chigasaki",
-	"ebina",
-	"fujisawa",
-	"hadano",
-	"hakone",
-	"hiratsuka",
-	"isehara",
-	"kaisei",
-	"kamakura",
-	"kiyokawa",
-	"matsuda",
-	"minamiashigara",
-	"miura",
-	"nakai",
-	"ninomiya",
-	"odawara",
-	"oi",
-	"oiso",
-	"sagamihara",
-	"samukawa",
-	"tsukui",
-	"yamakita",
-	"yamato",
-	"yokosuka",
-	"yugawara",
-	"zama",
-	"zushi",
-	"city",
-	"city",
-	"city",
-	"aki",
-	"geisei",
-	"hidaka",
-	"higashitsuno",
-	"ino",
-	"kagami",
-	"kami",
-	"kitagawa",
-	"kochi",
-	"mihara",
-	"motoyama",
-	"muroto",
-	"nahari",
-	"nakamura",
-	"nankoku",
-	"nishitosa",
-	"niyodogawa",
-	"ochi",
-	"okawa",
-	"otoyo",
-	"otsuki",
-	"sakawa",
-	"sukumo",
-	"susaki",
-	"tosa",
-	"tosashimizu",
-	"toyo",
-	"tsuno",
-	"umaji",
-	"yasuda",
-	"yusuhara",
-	"amakusa",
-	"arao",
-	"aso",
-	"choyo",
-	"gyokuto",
-	"kamiamakusa",
-	"kikuchi",
-	"kumamoto",
-	"mashiki",
-	"mifune",
-	"minamata",
-	"minamioguni",
-	"nagasu",
-	"nishihara",
-	"oguni",
-	"ozu",
-	"sumoto",
-	"takamori",
-	"uki",
-	"uto",
-	"yamaga",
-	"yamato",
-	"yatsushiro",
-	"ayabe",
-	"fukuchiyama",
-	"higashiyama",
-	"ide",
-	"ine",
-	"joyo",
-	"kameoka",
-	"kamo",
-	"kita",
-	"kizu",
-	"kumiyama",
-	"kyotamba",
-	"kyotanabe",
-	"kyotango",
-	"maizuru",
-	"minami",
-	"minamiyamashiro",
-	"miyazu",
-	"muko",
-	"nagaokakyo",
-	"nakagyo",
-	"nantan",
-	"oyamazaki",
-	"sakyo",
-	"seika",
-	"tanabe",
-	"uji",
-	"ujitawara",
-	"wazuka",
-	"yamashina",
-	"yawata",
-	"asahi",
-	"inabe",
-	"ise",
-	"kameyama",
-	"kawagoe",
-	"kiho",
-	"kisosaki",
-	"kiwa",
-	"komono",
-	"kumano",
-	"kuwana",
-	"matsusaka",
-	"meiwa",
-	"mihama",
-	"minamiise",
-	"misugi",
-	"miyama",
-	"nabari",
-	"shima",
-	"suzuka",
-	"tado",
-	"taiki",
-	"taki",
-	"tamaki",
-	"toba",
-	"tsu",
-	"udono",
-	"ureshino",
-	"watarai",
-	"yokkaichi",
-	"furukawa",
-	"higashimatsushima",
-	"ishinomaki",
-	"iwanuma",
-	"kakuda",
-	"kami",
-	"kawasaki",
-	"marumori",
-	"matsushima",
-	"minamisanriku",
-	"misato",
-	"murata",
-	"natori",
-	"ogawara",
-	"ohira",
-	"onagawa",
-	"osaki",
-	"rifu",
-	"semine",
-	"shibata",
-	"shichikashuku",
-	"shikama",
-	"shiogama",
-	"shiroishi",
-	"tagajo",
-	"taiwa",
-	"tome",
-	"tomiya",
-	"wakuya",
-	"watari",
-	"yamamoto",
-	"zao",
-	"aya",
-	"ebino",
-	"gokase",
-	"hyuga",
-	"kadogawa",
-	"kawaminami",
-	"kijo",
-	"kitagawa",
-	"kitakata",
-	"kitaura",
-	"kobayashi",
-	"kunitomi",
-	"kushima",
-	"mimata",
-	"miyakonojo",
-	"miyazaki",
-	"morotsuka",
-	"nichinan",
-	"nishimera",
-	"nobeoka",
-	"saito",
-	"shiiba",
-	"shintomi",
-	"takaharu",
-	"takanabe",
-	"takazaki",
-	"tsuno",
-	"achi",
-	"agematsu",
-	"anan",
-	"aoki",
-	"asahi",
-	"azumino",
-	"chikuhoku",
-	"chikuma",
-	"chino",
-	"fujimi",
-	"hakuba",
-	"hara",
-	"hiraya",
-	"iida",
-	"iijima",
-	"iiyama",
-	"iizuna",
-	"ikeda",
-	"ikusaka",
-	"ina",
-	"karuizawa",
-	"kawakami",
-	"kiso",
-	"kisofukushima",
-	"kitaaiki",
-	"komagane",
-	"komoro",
-	"matsukawa",
-	"matsumoto",
-	"miasa",
-	"minamiaiki",
-	"minamimaki",
-	"minamiminowa",
-	"minowa",
-	"miyada",
-	"miyota",
-	"mochizuki",
-	"nagano",
-	"nagawa",
-	"nagiso",
-	"nakagawa",
-	"nakano",
-	"nozawaonsen",
-	"obuse",
-	"ogawa",
-	"okaya",
-	"omachi",
-	"omi",
-	"ookuwa",
-	"ooshika",
-	"otaki",
-	"otari",
-	"sakae",
-	"sakaki",
-	"saku",
-	"sakuho",
-	"shimosuwa",
-	"shinanomachi",
-	"shiojiri",
-	"suwa",
-	"suzaka",
-	"takagi",
-	"takamori",
-	"takayama",
-	"tateshina",
-	"tatsuno",
-	"togakushi",
-	"togura",
-	"tomi",
-	"ueda",
-	"wada",
-	"yamagata",
-	"yamanouchi",
-	"yasaka",
-	"yasuoka",
-	"chijiwa",
-	"futsu",
-	"goto",
-	"hasami",
-	"hirado",
-	"iki",
-	"isahaya",
-	"kawatana",
-	"kuchinotsu",
-	"matsuura",
-	"nagasaki",
-	"obama",
-	"omura",
-	"oseto",
-	"saikai",
-	"sasebo",
-	"seihi",
-	"shimabara",
-	"shinkamigoto",
-	"togitsu",
-	"tsushima",
-	"unzen",
-	"city",
-	"ando",
-	"gose",
-	"heguri",
-	"higashiyoshino",
-	"ikaruga",
-	"ikoma",
-	"kamikitayama",
-	"kanmaki",
-	"kashiba",
-	"kashihara",
-	"katsuragi",
-	"kawai",
-	"kawakami",
-	"kawanishi",
-	"koryo",
-	"kurotaki",
-	"mitsue",
-	"miyake",
-	"nara",
-	"nosegawa",
-	"oji",
-	"ouda",
-	"oyodo",
-	"sakurai",
-	"sango",
-	"shimoichi",
-	"shimokitayama",
-	"shinjo",
-	"soni",
-	"takatori",
-	"tawaramoto",
-	"tenkawa",
-	"tenri",
-	"uda",
-	"yamatokoriyama",
-	"yamatotakada",
-	"yamazoe",
-	"yoshino",
-	"aga",
-	"agano",
-	"gosen",
-	"itoigawa",
-	"izumozaki",
-	"joetsu",
-	"kamo",
-	"kariwa",
-	"kashiwazaki",
-	"minamiuonuma",
-	"mitsuke",
-	"muika",
-	"murakami",
-	"myoko",
-	"nagaoka",
-	"niigata",
-	"ojiya",
-	"omi",
-	"sado",
-	"sanjo",
-	"seiro",
-	"seirou",
-	"sekikawa",
-	"shibata",
-	"tagami",
-	"tainai",
-	"tochio",
-	"tokamachi",
-	"tsubame",
-	"tsunan",
-	"uonuma",
-	"yahiko",
-	"yoita",
-	"yuzawa",
-	"beppu",
-	"bungoono",
-	"bungotakada",
-	"hasama",
-	"hiji",
-	"himeshima",
-	"hita",
-	"kamitsue",
-	"kokonoe",
-	"kuju",
-	"kunisaki",
-	"kusu",
-	"oita",
-	"saiki",
-	"taketa",
-	"tsukumi",
-	"usa",
-	"usuki",
-	"yufu",
-	"akaiwa",
-	"asakuchi",
-	"bizen",
-	"hayashima",
-	"ibara",
-	"kagamino",
-	"kasaoka",
-	"kibichuo",
-	"kumenan",
-	"kurashiki",
-	"maniwa",
-	"misaki",
-	"nagi",
-	"niimi",
-	"nishiawakura",
-	"okayama",
-	"satosho",
-	"setouchi",
-	"shinjo",
-	"shoo",
-	"soja",
-	"takahashi",
-	"tamano",
-	"tsuyama",
-	"wake",
-	"yakage",
-	"aguni",
-	"ginowan",
-	"ginoza",
-	"gushikami",
-	"haebaru",
-	"higashi",
-	"hirara",
-	"iheya",
-	"ishigaki",
-	"ishikawa",
-	"itoman",
-	"izena",
-	"kadena",
-	"kin",
-	"kitadaito",
-	"kitanakagusuku",
-	"kumejima",
-	"kunigami",
-	"minamidaito",
-	"motobu",
-	"nago",
-	"naha",
-	"nakagusuku",
-	"nakijin",
-	"nanjo",
-	"nishihara",
-	"ogimi",
-	"okinawa",
-	"onna",
-	"shimoji",
-	"taketomi",
-	"tarama",
-	"tokashiki",
-	"tomigusuku",
-	"tonaki",
-	"urasoe",
-	"uruma",
-	"yaese",
-	"yomitan",
-	"yonabaru",
-	"yonaguni",
-	"zamami",
-	"abeno",
-	"chihayaakasaka",
-	"chuo",
-	"daito",
-	"fujiidera",
-	"habikino",
-	"hannan",
-	"higashiosaka",
-	"higashisumiyoshi",
-	"higashiyodogawa",
-	"hirakata",
-	"ibaraki",
-	"ikeda",
-	"izumi",
-	"izumiotsu",
-	"izumisano",
-	"kadoma",
-	"kaizuka",
-	"kanan",
-	"kashiwara",
-	"katano",
-	"kawachinagano",
-	"kishiwada",
-	"kita",
-	"kumatori",
-	"matsubara",
-	"minato",
-	"minoh",
-	"misaki",
-	"moriguchi",
-	"neyagawa",
-	"nishi",
-	"nose",
-	"osakasayama",
-	"sakai",
-	"sayama",
-	"sennan",
-	"settsu",
-	"shijonawate",
-	"shimamoto",
-	"suita",
-	"tadaoka",
-	"taishi",
-	"tajiri",
-	"takaishi",
-	"takatsuki",
-	"tondabayashi",
-	"toyonaka",
-	"toyono",
-	"yao",
-	"ariake",
-	"arita",
-	"fukudomi",
-	"genkai",
-	"hamatama",
-	"hizen",
-	"imari",
-	"kamimine",
-	"kanzaki",
-	"karatsu",
-	"kashima",
-	"kitagata",
-	"kitahata",
-	"kiyama",
-	"kouhoku",
-	"kyuragi",
-	"nishiarita",
-	"ogi",
-	"omachi",
-	"ouchi",
-	"saga",
-	"shiroishi",
-	"taku",
-	"tara",
-	"tosu",
-	"yoshinogari",
-	"arakawa",
-	"asaka",
-	"chichibu",
-	"fujimi",
-	"fujimino",
-	"fukaya",
-	"hanno",
-	"hanyu",
-	"hasuda",
-	"hatogaya",
-	"hatoyama",
-	"hidaka",
-	"higashichichibu",
-	"higashimatsuyama",
-	"honjo",
-	"ina",
-	"iruma",
-	"iwatsuki",
-	"kamiizumi",
-	"kamikawa",
-	"kamisato",
-	"kasukabe",
-	"kawagoe",
-	"kawaguchi",
-	"kawajima",
-	"kazo",
-	"kitamoto",
-	"koshigaya",
-	"kounosu",
-	"kuki",
-	"kumagaya",
-	"matsubushi",
-	"minano",
-	"misato",
-	"miyashiro",
-	"miyoshi",
-	"moroyama",
-	"nagatoro",
-	"namegawa",
-	"niiza",
-	"ogano",
-	"ogawa",
-	"ogose",
-	"okegawa",
-	"omiya",
-	"otaki",
-	"ranzan",
-	"ryokami",
-	"saitama",
-	"sakado",
-	"satte",
-	"sayama",
-	"shiki",
-	"shiraoka",
-	"soka",
-	"sugito",
-	"toda",
-	"tokigawa",
-	"tokorozawa",
-	"tsurugashima",
-	"urawa",
-	"warabi",
-	"yashio",
-	"yokoze",
-	"yono",
-	"yorii",
-	"yoshida",
-	"yoshikawa",
-	"yoshimi",
-	"city",
-	"city",
-	"aisho",
-	"gamo",
-	"higashiomi",
-	"hikone",
-	"koka",
-	"konan",
-	"kosei",
-	"koto",
-	"kusatsu",
-	"maibara",
-	"moriyama",
-	"nagahama",
-	"nishiazai",
-	"notogawa",
-	"omihachiman",
-	"otsu",
-	"ritto",
-	"ryuoh",
-	"takashima",
-	"takatsuki",
-	"torahime",
-	"toyosato",
-	"yasu",
-	"akagi",
-	"ama",
-	"gotsu",
-	"hamada",
-	"higashiizumo",
-	"hikawa",
-	"hikimi",
-	"izumo",
-	"kakinoki",
-	"masuda",
-	"matsue",
-	"misato",
-	"nishinoshima",
-	"ohda",
-	"okinoshima",
-	"okuizumo",
-	"shimane",
-	"tamayu",
-	"tsuwano",
-	"unnan",
-	"yakumo",
-	"yasugi",
-	"yatsuka",
-	"arai",
-	"atami",
-	"fuji",
-	"fujieda",
-	"fujikawa",
-	"fujinomiya",
-	"fukuroi",
-	"gotemba",
-	"haibara",
-	"hamamatsu",
-	"higashiizu",
-	"ito",
-	"iwata",
-	"izu",
-	"izunokuni",
-	"kakegawa",
-	"kannami",
-	"kawanehon",
-	"kawazu",
-	"kikugawa",
-	"kosai",
-	"makinohara",
-	"matsuzaki",
-	"minamiizu",
-	"mishima",
-	"morimachi",
-	"nishiizu",
-	"numazu",
-	"omaezaki",
-	"shimada",
-	"shimizu",
-	"shimoda",
-	"shizuoka",
-	"susono",
-	"yaizu",
-	"yoshida",
-	"ashikaga",
-	"bato",
-	"haga",
-	"ichikai",
-	"iwafune",
-	"kaminokawa",
-	"kanuma",
-	"karasuyama",
-	"kuroiso",
-	"mashiko",
-	"mibu",
-	"moka",
-	"motegi",
-	"nasu",
-	"nasushiobara",
-	"nikko",
-	"nishikata",
-	"nogi",
-	"ohira",
-	"ohtawara",
-	"oyama",
-	"sakura",
-	"sano",
-	"shimotsuke",
-	"shioya",
-	"takanezawa",
-	"tochigi",
-	"tsuga",
-	"ujiie",
-	"utsunomiya",
-	"yaita",
-	"aizumi",
-	"anan",
-	"ichiba",
-	"itano",
-	"kainan",
-	"komatsushima",
-	"matsushige",
-	"mima",
-	"minami",
-	"miyoshi",
-	"mugi",
-	"nakagawa",
-	"naruto",
-	"sanagochi",
-	"shishikui",
-	"tokushima",
-	"wajiki",
-	"adachi",
-	"akiruno",
-	"akishima",
-	"aogashima",
-	"arakawa",
-	"bunkyo",
-	"chiyoda",
-	"chofu",
-	"chuo",
-	"edogawa",
-	"fuchu",
-	"fussa",
-	"hachijo",
-	"hachioji",
-	"hamura",
-	"higashikurume",
-	"higashimurayama",
-	"higashiyamato",
-	"hino",
-	"hinode",
-	"hinohara",
-	"inagi",
-	"itabashi",
-	"katsushika",
-	"kita",
-	"kiyose",
-	"kodaira",
-	"koganei",
-	"kokubunji",
-	"komae",
-	"koto",
-	"kouzushima",
-	"kunitachi",
-	"machida",
-	"meguro",
-	"minato",
-	"mitaka",
-	"mizuho",
-	"musashimurayama",
-	"musashino",
-	"nakano",
-	"nerima",
-	"ogasawara",
-	"okutama",
-	"ome",
-	"oshima",
-	"ota",
-	"setagaya",
-	"shibuya",
-	"shinagawa",
-	"shinjuku",
-	"suginami",
-	"sumida",
-	"tachikawa",
-	"taito",
-	"tama",
-	"toshima",
-	"chizu",
-	"hino",
-	"kawahara",
-	"koge",
-	"kotoura",
-	"misasa",
-	"nanbu",
-	"nichinan",
-	"sakaiminato",
-	"tottori",
-	"wakasa",
-	"yazu",
-	"yonago",
-	"asahi",
-	"fuchu",
-	"fukumitsu",
-	"funahashi",
-	"himi",
-	"imizu",
-	"inami",
-	"johana",
-	"kamiichi",
-	"kurobe",
-	"nakaniikawa",
-	"namerikawa",
-	"nanto",
-	"nyuzen",
-	"oyabe",
-	"taira",
-	"takaoka",
-	"tateyama",
-	"toga",
-	"tonami",
-	"toyama",
-	"unazuki",
-	"uozu",
-	"yamada",
-	"arida",
-	"aridagawa",
-	"gobo",
-	"hashimoto",
-	"hidaka",
-	"hirogawa",
-	"inami",
-	"iwade",
-	"kainan",
-	"kamitonda",
-	"katsuragi",
-	"kimino",
-	"kinokawa",
-	"kitayama",
-	"koya",
-	"koza",
-	"kozagawa",
-	"kudoyama",
-	"kushimoto",
-	"mihama",
-	"misato",
-	"nachikatsuura",
-	"shingu",
-	"shirahama",
-	"taiji",
-	"tanabe",
-	"wakayama",
-	"yuasa",
-	"yura",
-	"asahi",
-	"funagata",
-	"higashine",
-	"iide",
-	"kahoku",
-	"kaminoyama",
-	"kaneyama",
-	"kawanishi",
-	"mamurogawa",
-	"mikawa",
-	"murayama",
-	"nagai",
-	"nakayama",
-	"nanyo",
-	"nishikawa",
-	"obanazawa",
-	"oe",
-	"oguni",
-	"ohkura",
-	"oishida",
-	"sagae",
-	"sakata",
-	"sakegawa",
-	"shinjo",
-	"shirataka",
-	"shonai",
-	"takahata",
-	"tendo",
-	"tozawa",
-	"tsuruoka",
-	"yamagata",
-	"yamanobe",
-	"yonezawa",
-	"yuza",
-	"abu",
-	"hagi",
-	"hikari",
-	"hofu",
-	"iwakuni",
-	"kudamatsu",
-	"mitou",
-	"nagato",
-	"oshima",
-	"shimonoseki",
-	"shunan",
-	"tabuse",
-	"tokuyama",
-	"toyota",
-	"ube",
-	"yuu",
-	"chuo",
-	"doshi",
-	"fuefuki",
-	"fujikawa",
-	"fujikawaguchiko",
-	"fujiyoshida",
-	"hayakawa",
-	"hokuto",
-	"ichikawamisato",
-	"kai",
-	"kofu",
-	"koshu",
-	"kosuge",
-	"minami-alps",
-	"minobu",
-	"nakamichi",
-	"nanbu",
-	"narusawa",
-	"nirasaki",
-	"nishikatsura",
-	"oshino",
-	"otsuki",
-	"showa",
-	"tabayama",
-	"tsuru",
-	"uenohara",
-	"yamanakako",
-	"yamanashi",
-	"city",
-	"co",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"biz",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"net",
-	"org",
-	"ass",
-	"asso",
-	"com",
-	"coop",
-	"edu",
-	"gouv",
-	"gov",
-	"medecin",
-	"mil",
-	"nom",
-	"notaires",
-	"org",
-	"pharmaciens",
-	"prd",
-	"presse",
-	"tm",
-	"veterinaire",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"org",
-	"rep",
-	"tra",
-	"ac",
-	"blogspot",
-	"busan",
-	"chungbuk",
-	"chungnam",
-	"co",
-	"daegu",
-	"daejeon",
-	"es",
-	"gangwon",
-	"go",
-	"gwangju",
-	"gyeongbuk",
-	"gyeonggi",
-	"gyeongnam",
-	"hs",
-	"incheon",
-	"jeju",
-	"jeonbuk",
-	"jeonnam",
-	"kg",
-	"mil",
-	"ms",
-	"ne",
-	"or",
-	"pe",
-	"re",
-	"sc",
-	"seoul",
-	"ulsan",
-	"co",
-	"edu",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"bnr",
-	"c",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"int",
-	"net",
-	"org",
-	"per",
-	"static",
-	"dev",
-	"sites",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"oy",
-	"blogspot",
-	"cyon",
-	"mypep",
-	"ac",
-	"assn",
-	"com",
-	"edu",
-	"gov",
-	"grp",
-	"hotel",
-	"int",
-	"ltd",
-	"net",
-	"ngo",
-	"org",
-	"sch",
-	"soc",
-	"web",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"co",
-	"org",
-	"blogspot",
-	"gov",
-	"blogspot",
-	"asn",
-	"com",
-	"conf",
-	"edu",
-	"gov",
-	"id",
-	"mil",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"id",
-	"med",
-	"net",
-	"org",
-	"plc",
-	"sch",
-	"ac",
-	"co",
-	"gov",
-	"net",
-	"org",
-	"press",
-	"router",
-	"asso",
-	"tm",
-	"blogspot",
-	"ac",
-	"brasilia",
-	"co",
-	"daplie",
-	"ddns",
-	"diskstation",
-	"dnsfor",
-	"dscloud",
-	"edu",
-	"gov",
-	"hopto",
-	"i234",
-	"its",
-	"loginto",
-	"myds",
-	"net",
-	"noip",
-	"org",
-	"priv",
-	"synology",
-	"webhop",
-	"yombo",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"nom",
-	"org",
-	"prd",
-	"tm",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"inf",
-	"name",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gouv",
-	"gov",
-	"net",
-	"org",
-	"presse",
-	"edu",
-	"gov",
-	"nyc",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"dscloud",
-	"blogspot",
-	"gov",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"net",
-	"org",
-	"blogspot",
-	"ac",
-	"co",
-	"com",
-	"gov",
-	"net",
-	"or",
-	"org",
-	"academy",
-	"agriculture",
-	"air",
-	"airguard",
-	"alabama",
-	"alaska",
-	"amber",
-	"ambulance",
-	"american",
-	"americana",
-	"americanantiques",
-	"americanart",
-	"amsterdam",
-	"and",
-	"annefrank",
-	"anthro",
-	"anthropology",
-	"antiques",
-	"aquarium",
-	"arboretum",
-	"archaeological",
-	"archaeology",
-	"architecture",
-	"art",
-	"artanddesign",
-	"artcenter",
-	"artdeco",
-	"arteducation",
-	"artgallery",
-	"arts",
-	"artsandcrafts",
-	"asmatart",
-	"assassination",
-	"assisi",
-	"association",
-	"astronomy",
-	"atlanta",
-	"austin",
-	"australia",
-	"automotive",
-	"aviation",
-	"axis",
-	"badajoz",
-	"baghdad",
-	"bahn",
-	"bale",
-	"baltimore",
-	"barcelona",
-	"baseball",
-	"basel",
-	"baths",
-	"bauern",
-	"beauxarts",
-	"beeldengeluid",
-	"bellevue",
-	"bergbau",
-	"berkeley",
-	"berlin",
-	"bern",
-	"bible",
-	"bilbao",
-	"bill",
-	"birdart",
-	"birthplace",
-	"bonn",
-	"boston",
-	"botanical",
-	"botanicalgarden",
-	"botanicgarden",
-	"botany",
-	"brandywinevalley",
-	"brasil",
-	"bristol",
-	"british",
-	"britishcolumbia",
-	"broadcast",
-	"brunel",
-	"brussel",
-	"brussels",
-	"bruxelles",
-	"building",
-	"burghof",
-	"bus",
-	"bushey",
-	"cadaques",
-	"california",
-	"cambridge",
-	"can",
-	"canada",
-	"capebreton",
-	"carrier",
-	"cartoonart",
-	"casadelamoneda",
-	"castle",
-	"castres",
-	"celtic",
-	"center",
-	"chattanooga",
-	"cheltenham",
-	"chesapeakebay",
-	"chicago",
-	"children",
-	"childrens",
-	"childrensgarden",
-	"chiropractic",
-	"chocolate",
-	"christiansburg",
-	"cincinnati",
-	"cinema",
-	"circus",
-	"civilisation",
-	"civilization",
-	"civilwar",
-	"clinton",
-	"clock",
-	"coal",
-	"coastaldefence",
-	"cody",
-	"coldwar",
-	"collection",
-	"colonialwilliamsburg",
-	"coloradoplateau",
-	"columbia",
-	"columbus",
-	"communication",
-	"communications",
-	"community",
-	"computer",
-	"computerhistory",
-	"contemporary",
-	"contemporaryart",
-	"convent",
-	"copenhagen",
-	"corporation",
-	"corvette",
-	"costume",
-	"countryestate",
-	"county",
-	"crafts",
-	"cranbrook",
-	"creation",
-	"cultural",
-	"culturalcenter",
-	"culture",
-	"cyber",
-	"cymru",
-	"dali",
-	"dallas",
-	"database",
-	"ddr",
-	"decorativearts",
-	"delaware",
-	"delmenhorst",
-	"denmark",
-	"depot",
-	"design",
-	"detroit",
-	"dinosaur",
-	"discovery",
-	"dolls",
-	"donostia",
-	"durham",
-	"eastafrica",
-	"eastcoast",
-	"education",
-	"educational",
-	"egyptian",
-	"eisenbahn",
-	"elburg",
-	"elvendrell",
-	"embroidery",
-	"encyclopedic",
-	"england",
-	"entomology",
-	"environment",
-	"environmentalconservation",
-	"epilepsy",
-	"essex",
-	"estate",
-	"ethnology",
-	"exeter",
-	"exhibition",
-	"family",
-	"farm",
-	"farmequipment",
-	"farmers",
-	"farmstead",
-	"field",
-	"figueres",
-	"filatelia",
-	"film",
-	"fineart",
-	"finearts",
-	"finland",
-	"flanders",
-	"florida",
-	"force",
-	"fortmissoula",
-	"fortworth",
-	"foundation",
-	"francaise",
-	"frankfurt",
-	"franziskaner",
-	"freemasonry",
-	"freiburg",
-	"fribourg",
-	"frog",
-	"fundacio",
-	"furniture",
-	"gallery",
-	"garden",
-	"gateway",
-	"geelvinck",
-	"gemological",
-	"geology",
-	"georgia",
-	"giessen",
-	"glas",
-	"glass",
-	"gorge",
-	"grandrapids",
-	"graz",
-	"guernsey",
-	"halloffame",
-	"hamburg",
-	"handson",
-	"harvestcelebration",
-	"hawaii",
-	"health",
-	"heimatunduhren",
-	"hellas",
-	"helsinki",
-	"hembygdsforbund",
-	"heritage",
-	"histoire",
-	"historical",
-	"historicalsociety",
-	"historichouses",
-	"historisch",
-	"historisches",
-	"history",
-	"historyofscience",
-	"horology",
-	"house",
-	"humanities",
-	"illustration",
-	"imageandsound",
-	"indian",
-	"indiana",
-	"indianapolis",
-	"indianmarket",
-	"intelligence",
-	"interactive",
-	"iraq",
-	"iron",
-	"isleofman",
-	"jamison",
-	"jefferson",
-	"jerusalem",
-	"jewelry",
-	"jewish",
-	"jewishart",
-	"jfk",
-	"journalism",
-	"judaica",
-	"judygarland",
-	"juedisches",
-	"juif",
-	"karate",
-	"karikatur",
-	"kids",
-	"koebenhavn",
-	"koeln",
-	"kunst",
-	"kunstsammlung",
-	"kunstunddesign",
-	"labor",
-	"labour",
-	"lajolla",
-	"lancashire",
-	"landes",
-	"lans",
-	"larsson",
-	"lewismiller",
-	"lincoln",
-	"linz",
-	"living",
-	"livinghistory",
-	"localhistory",
-	"london",
-	"losangeles",
-	"louvre",
-	"loyalist",
-	"lucerne",
-	"luxembourg",
-	"luzern",
-	"mad",
-	"madrid",
-	"mallorca",
-	"manchester",
-	"mansion",
-	"mansions",
-	"manx",
-	"marburg",
-	"maritime",
-	"maritimo",
-	"maryland",
-	"marylhurst",
-	"media",
-	"medical",
-	"medizinhistorisches",
-	"meeres",
-	"memorial",
-	"mesaverde",
-	"michigan",
-	"midatlantic",
-	"military",
-	"mill",
-	"miners",
-	"mining",
-	"minnesota",
-	"missile",
-	"missoula",
-	"modern",
-	"moma",
-	"money",
-	"monmouth",
-	"monticello",
-	"montreal",
-	"moscow",
-	"motorcycle",
-	"muenchen",
-	"muenster",
-	"mulhouse",
-	"muncie",
-	"museet",
-	"museumcenter",
-	"museumvereniging",
-	"music",
-	"national",
-	"nationalfirearms",
-	"nationalheritage",
-	"nativeamerican",
-	"naturalhistory",
-	"naturalhistorymuseum",
-	"naturalsciences",
-	"nature",
-	"naturhistorisches",
-	"natuurwetenschappen",
-	"naumburg",
-	"naval",
-	"nebraska",
-	"neues",
-	"newhampshire",
-	"newjersey",
-	"newmexico",
-	"newport",
-	"newspaper",
-	"newyork",
-	"niepce",
-	"norfolk",
-	"north",
-	"nrw",
-	"nuernberg",
-	"nuremberg",
-	"nyc",
-	"nyny",
-	"oceanographic",
-	"oceanographique",
-	"omaha",
-	"online",
-	"ontario",
-	"openair",
-	"oregon",
-	"oregontrail",
-	"otago",
-	"oxford",
-	"pacific",
-	"paderborn",
-	"palace",
-	"paleo",
-	"palmsprings",
-	"panama",
-	"paris",
-	"pasadena",
-	"pharmacy",
-	"philadelphia",
-	"philadelphiaarea",
-	"philately",
-	"phoenix",
-	"photography",
-	"pilots",
-	"pittsburgh",
-	"planetarium",
-	"plantation",
-	"plants",
-	"plaza",
-	"portal",
-	"portland",
-	"portlligat",
-	"posts-and-telecommunications",
-	"preservation",
-	"presidio",
-	"press",
-	"project",
-	"public",
-	"pubol",
-	"quebec",
-	"railroad",
-	"railway",
-	"research",
-	"resistance",
-	"riodejaneiro",
-	"rochester",
-	"rockart",
-	"roma",
-	"russia",
-	"saintlouis",
-	"salem",
-	"salvadordali",
-	"salzburg",
-	"sandiego",
-	"sanfrancisco",
-	"santabarbara",
-	"santacruz",
-	"santafe",
-	"saskatchewan",
-	"satx",
-	"savannahga",
-	"schlesisches",
-	"schoenbrunn",
-	"schokoladen",
-	"school",
-	"schweiz",
-	"science",
-	"science-fiction",
-	"scienceandhistory",
-	"scienceandindustry",
-	"sciencecenter",
-	"sciencecenters",
-	"sciencehistory",
-	"sciences",
-	"sciencesnaturelles",
-	"scotland",
-	"seaport",
-	"settlement",
-	"settlers",
-	"shell",
-	"sherbrooke",
-	"sibenik",
-	"silk",
-	"ski",
-	"skole",
-	"society",
-	"sologne",
-	"soundandvision",
-	"southcarolina",
-	"southwest",
-	"space",
-	"spy",
-	"square",
-	"stadt",
-	"stalbans",
-	"starnberg",
-	"state",
-	"stateofdelaware",
-	"station",
-	"steam",
-	"steiermark",
-	"stjohn",
-	"stockholm",
-	"stpetersburg",
-	"stuttgart",
-	"suisse",
-	"surgeonshall",
-	"surrey",
-	"svizzera",
-	"sweden",
-	"sydney",
-	"tank",
-	"tcm",
-	"technology",
-	"telekommunikation",
-	"television",
-	"texas",
-	"textile",
-	"theater",
-	"time",
-	"timekeeping",
-	"topology",
-	"torino",
-	"touch",
-	"town",
-	"transport",
-	"tree",
-	"trolley",
-	"trust",
-	"trustee",
-	"uhren",
-	"ulm",
-	"undersea",
-	"university",
-	"usa",
-	"usantiques",
-	"usarts",
-	"uscountryestate",
-	"usculture",
-	"usdecorativearts",
-	"usgarden",
-	"ushistory",
-	"ushuaia",
-	"uslivinghistory",
-	"utah",
-	"uvic",
-	"valley",
-	"vantaa",
-	"versailles",
-	"viking",
-	"village",
-	"virginia",
-	"virtual",
-	"virtuel",
-	"vlaanderen",
-	"volkenkunde",
-	"wales",
-	"wallonie",
-	"war",
-	"washingtondc",
-	"watch-and-clock",
-	"watchandclock",
-	"western",
-	"westfalen",
-	"whaling",
-	"wildlife",
-	"williamsburg",
-	"windmill",
-	"workshop",
-	"xn--9dbhblg6di",
-	"xn--comunicaes-v6a2o",
-	"xn--correios-e-telecomunicaes-ghc29a",
-	"xn--h1aegh",
-	"xn--lns-qla",
-	"york",
-	"yorkshire",
-	"yosemite",
-	"youth",
-	"zoological",
-	"zoology",
-	"aero",
-	"biz",
-	"com",
-	"coop",
-	"edu",
-	"gov",
-	"info",
-	"int",
-	"mil",
-	"museum",
-	"name",
-	"net",
-	"org",
-	"pro",
-	"ac",
-	"biz",
-	"co",
-	"com",
-	"coop",
-	"edu",
-	"gov",
-	"int",
-	"museum",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gob",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"name",
-	"net",
-	"org",
-	"ac",
-	"adv",
-	"co",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"ca",
-	"cc",
-	"co",
-	"com",
-	"dr",
-	"in",
-	"info",
-	"mobi",
-	"mx",
-	"name",
-	"or",
-	"org",
-	"pro",
-	"school",
-	"tv",
-	"us",
-	"ws",
-	"her",
-	"his",
-	"forgot",
-	"forgot",
-	"asso",
-	"alwaysdata",
-	"at-band-camp",
-	"azure-mobile",
-	"azurewebsites",
-	"blogdns",
-	"bounceme",
-	"broke-it",
-	"buyshouses",
-	"cdn77",
-	"cdn77-ssl",
-	"cloudapp",
-	"cloudfront",
-	"cloudfunctions",
-	"cryptonomic",
-	"ddns",
-	"dnsalias",
-	"dnsdojo",
-	"does-it",
-	"dontexist",
-	"dsmynas",
-	"dynalias",
-	"dynathome",
-	"dynv6",
-	"eating-organic",
-	"endofinternet",
-	"familyds",
-	"fastly",
-	"fastlylb",
-	"feste-ip",
-	"firewall-gateway",
-	"from-az",
-	"from-co",
-	"from-la",
-	"from-ny",
-	"gb",
-	"gets-it",
-	"ham-radio-op",
-	"homeftp",
-	"homeip",
-	"homelinux",
-	"homeunix",
-	"hu",
-	"in",
-	"in-the-band",
-	"is-a-chef",
-	"is-a-geek",
-	"isa-geek",
-	"jp",
-	"kicks-ass",
-	"knx-server",
-	"mydissent",
-	"myeffect",
-	"myfritz",
-	"mymediapc",
-	"mypsx",
-	"mysecuritycamera",
-	"nhlfan",
-	"no-ip",
-	"office-on-the",
-	"pgafan",
-	"podzone",
-	"privatizehealthinsurance",
-	"rackmaze",
-	"redirectme",
-	"scrapper-site",
-	"se",
-	"selfip",
-	"sells-it",
-	"servebbs",
-	"serveblog",
-	"serveftp",
-	"serveminecraft",
-	"static-access",
-	"sytes",
-	"t3l3p0rt",
-	"thruhere",
-	"uk",
-	"webhop",
-	"za",
-	"r",
-	"map",
-	"prod",
-	"ssl",
-	"a",
-	"global",
-	"a",
-	"b",
-	"global",
-	"map",
-	"alces",
-	"arts",
-	"com",
-	"firm",
-	"info",
-	"net",
-	"other",
-	"per",
-	"rec",
-	"store",
-	"web",
-	"com",
-	"edu",
-	"gov",
-	"i",
-	"mil",
-	"mobi",
-	"name",
-	"net",
-	"org",
-	"sch",
-	"blogspot",
-	"ac",
-	"biz",
-	"co",
-	"com",
-	"edu",
-	"gob",
-	"in",
-	"info",
-	"int",
-	"mil",
-	"net",
-	"nom",
-	"org",
-	"web",
-	"blogspot",
-	"bv",
-	"co",
-	"transurl",
-	"virtueeldomein",
-	"aa",
-	"aarborte",
-	"aejrie",
-	"afjord",
-	"agdenes",
-	"ah",
-	"akershus",
-	"aknoluokta",
-	"akrehamn",
-	"al",
-	"alaheadju",
-	"alesund",
-	"algard",
-	"alstahaug",
-	"alta",
-	"alvdal",
-	"amli",
-	"amot",
-	"andasuolo",
-	"andebu",
-	"andoy",
-	"ardal",
-	"aremark",
-	"arendal",
-	"arna",
-	"aseral",
-	"asker",
-	"askim",
-	"askoy",
-	"askvoll",
-	"asnes",
-	"audnedaln",
-	"aukra",
-	"aure",
-	"aurland",
-	"aurskog-holand",
-	"austevoll",
-	"austrheim",
-	"averoy",
-	"badaddja",
-	"bahcavuotna",
-	"bahccavuotna",
-	"baidar",
-	"bajddar",
-	"balat",
-	"balestrand",
-	"ballangen",
-	"balsfjord",
-	"bamble",
-	"bardu",
-	"barum",
-	"batsfjord",
-	"bearalvahki",
-	"beardu",
-	"beiarn",
-	"berg",
-	"bergen",
-	"berlevag",
-	"bievat",
-	"bindal",
-	"birkenes",
-	"bjarkoy",
-	"bjerkreim",
-	"bjugn",
-	"blogspot",
-	"bodo",
-	"bokn",
-	"bomlo",
-	"bremanger",
-	"bronnoy",
-	"bronnoysund",
-	"brumunddal",
-	"bryne",
-	"bu",
-	"budejju",
-	"buskerud",
-	"bygland",
-	"bykle",
-	"cahcesuolo",
-	"co",
-	"davvenjarga",
-	"davvesiida",
-	"deatnu",
-	"dep",
-	"dielddanuorri",
-	"divtasvuodna",
-	"divttasvuotna",
-	"donna",
-	"dovre",
-	"drammen",
-	"drangedal",
-	"drobak",
-	"dyroy",
-	"egersund",
-	"eid",
-	"eidfjord",
-	"eidsberg",
-	"eidskog",
-	"eidsvoll",
-	"eigersund",
-	"elverum",
-	"enebakk",
-	"engerdal",
-	"etne",
-	"etnedal",
-	"evenassi",
-	"evenes",
-	"evje-og-hornnes",
-	"farsund",
-	"fauske",
-	"fedje",
-	"fet",
-	"fetsund",
-	"fhs",
-	"finnoy",
-	"fitjar",
-	"fjaler",
-	"fjell",
-	"fla",
-	"flakstad",
-	"flatanger",
-	"flekkefjord",
-	"flesberg",
-	"flora",
-	"floro",
-	"fm",
-	"folkebibl",
-	"folldal",
-	"forde",
-	"forsand",
-	"fosnes",
-	"frana",
-	"fredrikstad",
-	"frei",
-	"frogn",
-	"froland",
-	"frosta",
-	"froya",
-	"fuoisku",
-	"fuossko",
-	"fusa",
-	"fylkesbibl",
-	"fyresdal",
-	"gaivuotna",
-	"galsa",
-	"gamvik",
-	"gangaviika",
-	"gaular",
-	"gausdal",
-	"giehtavuoatna",
-	"gildeskal",
-	"giske",
-	"gjemnes",
-	"gjerdrum",
-	"gjerstad",
-	"gjesdal",
-	"gjovik",
-	"gloppen",
-	"gol",
-	"gran",
-	"grane",
-	"granvin",
-	"gratangen",
-	"grimstad",
-	"grong",
-	"grue",
-	"gulen",
-	"guovdageaidnu",
-	"ha",
-	"habmer",
-	"hadsel",
-	"hagebostad",
-	"halden",
-	"halsa",
-	"hamar",
-	"hamaroy",
-	"hammarfeasta",
-	"hammerfest",
-	"hapmir",
-	"haram",
-	"hareid",
-	"harstad",
-	"hasvik",
-	"hattfjelldal",
-	"haugesund",
-	"hedmark",
-	"hemne",
-	"hemnes",
-	"hemsedal",
-	"herad",
-	"hitra",
-	"hjartdal",
-	"hjelmeland",
-	"hl",
-	"hm",
-	"hobol",
-	"hof",
-	"hokksund",
-	"hol",
-	"hole",
-	"holmestrand",
-	"holtalen",
-	"honefoss",
-	"hordaland",
-	"hornindal",
-	"horten",
-	"hoyanger",
-	"hoylandet",
-	"hurdal",
-	"hurum",
-	"hvaler",
-	"hyllestad",
-	"ibestad",
-	"idrett",
-	"inderoy",
-	"iveland",
-	"ivgu",
-	"jan-mayen",
-	"jessheim",
-	"jevnaker",
-	"jolster",
-	"jondal",
-	"jorpeland",
-	"kafjord",
-	"karasjohka",
-	"karasjok",
-	"karlsoy",
-	"karmoy",
-	"kautokeino",
-	"kirkenes",
-	"klabu",
-	"klepp",
-	"kommune",
-	"kongsberg",
-	"kongsvinger",
-	"kopervik",
-	"kraanghke",
-	"kragero",
-	"kristiansand",
-	"kristiansund",
-	"krodsherad",
-	"krokstadelva",
-	"kvafjord",
-	"kvalsund",
-	"kvam",
-	"kvanangen",
-	"kvinesdal",
-	"kvinnherad",
-	"kviteseid",
-	"kvitsoy",
-	"laakesvuemie",
-	"lahppi",
-	"langevag",
-	"lardal",
-	"larvik",
-	"lavagis",
-	"lavangen",
-	"leangaviika",
-	"lebesby",
-	"leikanger",
-	"leirfjord",
-	"leirvik",
-	"leka",
-	"leksvik",
-	"lenvik",
-	"lerdal",
-	"lesja",
-	"levanger",
-	"lier",
-	"lierne",
-	"lillehammer",
-	"lillesand",
-	"lindas",
-	"lindesnes",
-	"loabat",
-	"lodingen",
-	"lom",
-	"loppa",
-	"lorenskog",
-	"loten",
-	"lund",
-	"lunner",
-	"luroy",
-	"luster",
-	"lyngdal",
-	"lyngen",
-	"malatvuopmi",
-	"malselv",
-	"malvik",
-	"mandal",
-	"marker",
-	"marnardal",
-	"masfjorden",
-	"masoy",
-	"matta-varjjat",
-	"meland",
-	"meldal",
-	"melhus",
-	"meloy",
-	"meraker",
-	"midsund",
-	"midtre-gauldal",
-	"mil",
-	"mjondalen",
-	"mo-i-rana",
-	"moareke",
-	"modalen",
-	"modum",
-	"molde",
-	"more-og-romsdal",
-	"mosjoen",
-	"moskenes",
-	"moss",
-	"mosvik",
-	"mr",
-	"muosat",
-	"museum",
-	"naamesjevuemie",
-	"namdalseid",
-	"namsos",
-	"namsskogan",
-	"nannestad",
-	"naroy",
-	"narviika",
-	"narvik",
-	"naustdal",
-	"navuotna",
-	"nedre-eiker",
-	"nesna",
-	"nesodden",
-	"nesoddtangen",
-	"nesseby",
-	"nesset",
-	"nissedal",
-	"nittedal",
-	"nl",
-	"nord-aurdal",
-	"nord-fron",
-	"nord-odal",
-	"norddal",
-	"nordkapp",
-	"nordland",
-	"nordre-land",
-	"nordreisa",
-	"nore-og-uvdal",
-	"notodden",
-	"notteroy",
-	"nt",
-	"odda",
-	"of",
-	"oksnes",
-	"ol",
-	"omasvuotna",
-	"oppdal",
-	"oppegard",
-	"orkanger",
-	"orkdal",
-	"orland",
-	"orskog",
-	"orsta",
-	"osen",
-	"oslo",
-	"osoyro",
-	"osteroy",
-	"ostfold",
-	"ostre-toten",
-	"overhalla",
-	"ovre-eiker",
-	"oyer",
-	"oygarden",
-	"oystre-slidre",
-	"porsanger",
-	"porsangu",
-	"porsgrunn",
-	"priv",
-	"rade",
-	"radoy",
-	"rahkkeravju",
-	"raholt",
-	"raisa",
-	"rakkestad",
-	"ralingen",
-	"rana",
-	"randaberg",
-	"rauma",
-	"rendalen",
-	"rennebu",
-	"rennesoy",
-	"rindal",
-	"ringebu",
-	"ringerike",
-	"ringsaker",
-	"risor",
-	"rissa",
-	"rl",
-	"roan",
-	"rodoy",
-	"rollag",
-	"romsa",
-	"romskog",
-	"roros",
-	"rost",
-	"royken",
-	"royrvik",
-	"ruovat",
-	"rygge",
-	"salangen",
-	"salat",
-	"saltdal",
-	"samnanger",
-	"sandefjord",
-	"sandnes",
-	"sandnessjoen",
-	"sandoy",
-	"sarpsborg",
-	"sauda",
-	"sauherad",
-	"sel",
-	"selbu",
-	"selje",
-	"seljord",
-	"sf",
-	"siellak",
-	"sigdal",
-	"siljan",
-	"sirdal",
-	"skanit",
-	"skanland",
-	"skaun",
-	"skedsmo",
-	"skedsmokorset",
-	"ski",
-	"skien",
-	"skierva",
-	"skiptvet",
-	"skjak",
-	"skjervoy",
-	"skodje",
-	"slattum",
-	"smola",
-	"snaase",
-	"snasa",
-	"snillfjord",
-	"snoasa",
-	"sogndal",
-	"sogne",
-	"sokndal",
-	"sola",
-	"solund",
-	"somna",
-	"sondre-land",
-	"songdalen",
-	"sor-aurdal",
-	"sor-fron",
-	"sor-odal",
-	"sor-varanger",
-	"sorfold",
-	"sorreisa",
-	"sortland",
-	"sorum",
-	"spjelkavik",
-	"spydeberg",
-	"st",
-	"stange",
-	"stat",
-	"stathelle",
-	"stavanger",
-	"stavern",
-	"steigen",
-	"steinkjer",
-	"stjordal",
-	"stjordalshalsen",
-	"stokke",
-	"stor-elvdal",
-	"stord",
-	"stordal",
-	"storfjord",
-	"strand",
-	"stranda",
-	"stryn",
-	"sula",
-	"suldal",
-	"sund",
-	"sunndal",
-	"surnadal",
-	"svalbard",
-	"sveio",
-	"svelvik",
-	"sykkylven",
-	"tana",
-	"tananger",
-	"telemark",
-	"time",
-	"tingvoll",
-	"tinn",
-	"tjeldsund",
-	"tjome",
-	"tm",
-	"tokke",
-	"tolga",
-	"tonsberg",
-	"torsken",
-	"tr",
-	"trana",
-	"tranby",
-	"tranoy",
-	"troandin",
-	"trogstad",
-	"tromsa",
-	"tromso",
-	"trondheim",
-	"trysil",
-	"tvedestrand",
-	"tydal",
-	"tynset",
-	"tysfjord",
-	"tysnes",
-	"tysvar",
-	"ullensaker",
-	"ullensvang",
-	"ulvik",
-	"unjarga",
-	"utsira",
-	"va",
-	"vaapste",
-	"vadso",
-	"vaga",
-	"vagan",
-	"vagsoy",
-	"vaksdal",
-	"valle",
-	"vang",
-	"vanylven",
-	"vardo",
-	"varggat",
-	"varoy",
-	"vefsn",
-	"vega",
-	"vegarshei",
-	"vennesla",
-	"verdal",
-	"verran",
-	"vestby",
-	"vestfold",
-	"vestnes",
-	"vestre-slidre",
-	"vestre-toten",
-	"vestvagoy",
-	"vevelstad",
-	"vf",
-	"vgs",
-	"vik",
-	"vikna",
-	"vindafjord",
-	"voagat",
-	"volda",
-	"voss",
-	"vossevangen",
-	"xn--andy-ira",
-	"xn--asky-ira",
-	"xn--aurskog-hland-jnb",
-	"xn--avery-yua",
-	"xn--bdddj-mrabd",
-	"xn--bearalvhki-y4a",
-	"xn--berlevg-jxa",
-	"xn--bhcavuotna-s4a",
-	"xn--bhccavuotna-k7a",
-	"xn--bidr-5nac",
-	"xn--bievt-0qa",
-	"xn--bjarky-fya",
-	"xn--bjddar-pta",
-	"xn--blt-elab",
-	"xn--bmlo-gra",
-	"xn--bod-2na",
-	"xn--brnny-wuac",
-	"xn--brnnysund-m8ac",
-	"xn--brum-voa",
-	"xn--btsfjord-9za",
-	"xn--davvenjrga-y4a",
-	"xn--dnna-gra",
-	"xn--drbak-wua",
-	"xn--dyry-ira",
-	"xn--eveni-0qa01ga",
-	"xn--finny-yua",
-	"xn--fjord-lra",
-	"xn--fl-zia",
-	"xn--flor-jra",
-	"xn--frde-gra",
-	"xn--frna-woa",
-	"xn--frya-hra",
-	"xn--ggaviika-8ya47h",
-	"xn--gildeskl-g0a",
-	"xn--givuotna-8ya",
-	"xn--gjvik-wua",
-	"xn--gls-elac",
-	"xn--h-2fa",
-	"xn--hbmer-xqa",
-	"xn--hcesuolo-7ya35b",
-	"xn--hgebostad-g3a",
-	"xn--hmmrfeasta-s4ac",
-	"xn--hnefoss-q1a",
-	"xn--hobl-ira",
-	"xn--holtlen-hxa",
-	"xn--hpmir-xqa",
-	"xn--hyanger-q1a",
-	"xn--hylandet-54a",
-	"xn--indery-fya",
-	"xn--jlster-bya",
-	"xn--jrpeland-54a",
-	"xn--karmy-yua",
-	"xn--kfjord-iua",
-	"xn--klbu-woa",
-	"xn--koluokta-7ya57h",
-	"xn--krager-gya",
-	"xn--kranghke-b0a",
-	"xn--krdsherad-m8a",
-	"xn--krehamn-dxa",
-	"xn--krjohka-hwab49j",
-	"xn--ksnes-uua",
-	"xn--kvfjord-nxa",
-	"xn--kvitsy-fya",
-	"xn--kvnangen-k0a",
-	"xn--l-1fa",
-	"xn--laheadju-7ya",
-	"xn--langevg-jxa",
-	"xn--ldingen-q1a",
-	"xn--leagaviika-52b",
-	"xn--lesund-hua",
-	"xn--lgrd-poac",
-	"xn--lhppi-xqa",
-	"xn--linds-pra",
-	"xn--loabt-0qa",
-	"xn--lrdal-sra",
-	"xn--lrenskog-54a",
-	"xn--lt-liac",
-	"xn--lten-gra",
-	"xn--lury-ira",
-	"xn--mely-ira",
-	"xn--merker-kua",
-	"xn--mjndalen-64a",
-	"xn--mlatvuopmi-s4a",
-	"xn--mli-tla",
-	"xn--mlselv-iua",
-	"xn--moreke-jua",
-	"xn--mosjen-eya",
-	"xn--mot-tla",
-	"xn--mre-og-romsdal-qqb",
-	"xn--msy-ula0h",
-	"xn--mtta-vrjjat-k7af",
-	"xn--muost-0qa",
-	"xn--nmesjevuemie-tcba",
-	"xn--nry-yla5g",
-	"xn--nttery-byae",
-	"xn--nvuotna-hwa",
-	"xn--oppegrd-ixa",
-	"xn--ostery-fya",
-	"xn--osyro-wua",
-	"xn--porsgu-sta26f",
-	"xn--rady-ira",
-	"xn--rdal-poa",
-	"xn--rde-ula",
-	"xn--rdy-0nab",
-	"xn--rennesy-v1a",
-	"xn--rhkkervju-01af",
-	"xn--rholt-mra",
-	"xn--risa-5na",
-	"xn--risr-ira",
-	"xn--rland-uua",
-	"xn--rlingen-mxa",
-	"xn--rmskog-bya",
-	"xn--rros-gra",
-	"xn--rskog-uua",
-	"xn--rst-0na",
-	"xn--rsta-fra",
-	"xn--ryken-vua",
-	"xn--ryrvik-bya",
-	"xn--s-1fa",
-	"xn--sandnessjen-ogb",
-	"xn--sandy-yua",
-	"xn--seral-lra",
-	"xn--sgne-gra",
-	"xn--skierv-uta",
-	"xn--skjervy-v1a",
-	"xn--skjk-soa",
-	"xn--sknit-yqa",
-	"xn--sknland-fxa",
-	"xn--slat-5na",
-	"xn--slt-elab",
-	"xn--smla-hra",
-	"xn--smna-gra",
-	"xn--snase-nra",
-	"xn--sndre-land-0cb",
-	"xn--snes-poa",
-	"xn--snsa-roa",
-	"xn--sr-aurdal-l8a",
-	"xn--sr-fron-q1a",
-	"xn--sr-odal-q1a",
-	"xn--sr-varanger-ggb",
-	"xn--srfold-bya",
-	"xn--srreisa-q1a",
-	"xn--srum-gra",
-	"xn--stfold-9xa",
-	"xn--stjrdal-s1a",
-	"xn--stjrdalshalsen-sqb",
-	"xn--stre-toten-zcb",
-	"xn--tjme-hra",
-	"xn--tnsberg-q1a",
-	"xn--trany-yua",
-	"xn--trgstad-r1a",
-	"xn--trna-woa",
-	"xn--troms-zua",
-	"xn--tysvr-vra",
-	"xn--unjrga-rta",
-	"xn--vads-jra",
-	"xn--vard-jra",
-	"xn--vegrshei-c0a",
-	"xn--vestvgy-ixa6o",
-	"xn--vg-yiab",
-	"xn--vgan-qoa",
-	"xn--vgsy-qoa0j",
-	"xn--vre-eiker-k8a",
-	"xn--vrggt-xqad",
-	"xn--vry-yla5g",
-	"xn--yer-zna",
-	"xn--ygarden-p1a",
-	"xn--ystre-slidre-ujb",
-	"gs",
-	"gs",
-	"nes",
-	"gs",
-	"nes",
-	"gs",
-	"os",
-	"valer",
-	"xn--vler-qoa",
-	"gs",
-	"gs",
-	"os",
-	"gs",
-	"heroy",
-	"sande",
-	"gs",
-	"gs",
-	"bo",
-	"heroy",
-	"xn--b-5ga",
-	"xn--hery-ira",
-	"gs",
-	"gs",
-	"gs",
-	"gs",
-	"valer",
-	"gs",
-	"gs",
-	"gs",
-	"gs",
-	"bo",
-	"xn--b-5ga",
-	"gs",
-	"gs",
-	"gs",
-	"sande",
-	"gs",
-	"sande",
-	"xn--hery-ira",
-	"xn--vler-qoa",
-	"biz",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"net",
-	"org",
-	"merseine",
-	"mine",
-	"shacknet",
-	"ac",
-	"co",
-	"cri",
-	"geek",
-	"gen",
-	"govt",
-	"health",
-	"iwi",
-	"kiwi",
-	"maori",
-	"mil",
-	"net",
-	"org",
-	"parliament",
-	"school",
-	"xn--mori-qsa",
-	"blogspot",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"med",
-	"museum",
-	"net",
-	"org",
-	"pro",
-	"homelink",
-	"ae",
-	"amune",
-	"blogdns",
-	"blogsite",
-	"bmoattachments",
-	"boldlygoingnowhere",
-	"cable-modem",
-	"cdn77",
-	"cdn77-secure",
-	"certmgr",
-	"cloudns",
-	"collegefan",
-	"couchpotatofries",
-	"ddnss",
-	"diskstation",
-	"dnsalias",
-	"dnsdojo",
-	"doesntexist",
-	"dontexist",
-	"doomdns",
-	"dsmynas",
-	"duckdns",
-	"dvrdns",
-	"dynalias",
-	"dyndns",
-	"endofinternet",
-	"endoftheinternet",
-	"eu",
-	"familyds",
-	"from-me",
-	"game-host",
-	"gotdns",
-	"hepforge",
-	"hk",
-	"hobby-site",
-	"homedns",
-	"homeftp",
-	"homelinux",
-	"homeunix",
-	"hopto",
-	"is-a-bruinsfan",
-	"is-a-candidate",
-	"is-a-celticsfan",
-	"is-a-chef",
-	"is-a-geek",
-	"is-a-knight",
-	"is-a-linux-user",
-	"is-a-patsfan",
-	"is-a-soxfan",
-	"is-found",
-	"is-lost",
-	"is-saved",
-	"is-very-bad",
-	"is-very-evil",
-	"is-very-good",
-	"is-very-nice",
-	"is-very-sweet",
-	"isa-geek",
-	"js",
-	"kicks-ass",
-	"misconfused",
-	"mlbfan",
-	"my-firewall",
-	"myfirewall",
-	"myftp",
-	"mysecuritycamera",
-	"nflfan",
-	"no-ip",
-	"pimienta",
-	"podzone",
-	"poivron",
-	"potager",
-	"read-books",
-	"readmyblog",
-	"selfip",
-	"sellsyourhome",
-	"servebbs",
-	"serveftp",
-	"servegame",
-	"spdns",
-	"stuff-4-sale",
-	"sweetpepper",
-	"tunk",
-	"tuxfamily",
-	"ufcfan",
-	"us",
-	"webhop",
-	"wmflabs",
-	"za",
-	"zapto",
-	"tele",
-	"c",
-	"rsc",
-	"origin",
-	"ssl",
-	"go",
-	"home",
-	"al",
-	"asso",
-	"at",
-	"au",
-	"be",
-	"bg",
-	"ca",
-	"cd",
-	"ch",
-	"cn",
-	"cy",
-	"cz",
-	"de",
-	"dk",
-	"edu",
-	"ee",
-	"es",
-	"fi",
-	"fr",
-	"gr",
-	"hr",
-	"hu",
-	"ie",
-	"il",
-	"in",
-	"int",
-	"is",
-	"it",
-	"jp",
-	"kr",
-	"lt",
-	"lu",
-	"lv",
-	"mc",
-	"me",
-	"mk",
-	"mt",
-	"my",
-	"net",
-	"ng",
-	"nl",
-	"no",
-	"nz",
-	"paris",
-	"pl",
-	"pt",
-	"q-a",
-	"ro",
-	"ru",
-	"se",
-	"si",
-	"sk",
-	"tr",
-	"uk",
-	"us",
-	"nerdpol",
-	"abo",
-	"ac",
-	"com",
-	"edu",
-	"gob",
-	"ing",
-	"med",
-	"net",
-	"nom",
-	"org",
-	"sld",
-	"ybo",
-	"blogspot",
-	"com",
-	"edu",
-	"gob",
-	"mil",
-	"net",
-	"nom",
-	"org",
-	"com",
-	"edu",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"i",
-	"mil",
-	"net",
-	"ngo",
-	"org",
-	"biz",
-	"com",
-	"edu",
-	"fam",
-	"gob",
-	"gok",
-	"gon",
-	"gop",
-	"gos",
-	"gov",
-	"info",
-	"net",
-	"org",
-	"web",
-	"agro",
-	"aid",
-	"art",
-	"atm",
-	"augustow",
-	"auto",
-	"babia-gora",
-	"bedzin",
-	"beep",
-	"beskidy",
-	"bialowieza",
-	"bialystok",
-	"bielawa",
-	"bieszczady",
-	"biz",
-	"boleslawiec",
-	"bydgoszcz",
-	"bytom",
-	"cieszyn",
-	"co",
-	"com",
-	"czeladz",
-	"czest",
-	"dlugoleka",
-	"edu",
-	"elblag",
-	"elk",
-	"gda",
-	"gdansk",
-	"gdynia",
-	"gliwice",
-	"glogow",
-	"gmina",
-	"gniezno",
-	"gorlice",
-	"gov",
-	"grajewo",
-	"gsm",
-	"ilawa",
-	"info",
-	"jaworzno",
-	"jelenia-gora",
-	"jgora",
-	"kalisz",
-	"karpacz",
-	"kartuzy",
-	"kaszuby",
-	"katowice",
-	"kazimierz-dolny",
-	"kepno",
-	"ketrzyn",
-	"klodzko",
-	"kobierzyce",
-	"kolobrzeg",
-	"konin",
-	"konskowola",
-	"krakow",
-	"kutno",
-	"lapy",
-	"lebork",
-	"legnica",
-	"lezajsk",
-	"limanowa",
-	"lomza",
-	"lowicz",
-	"lubin",
-	"lukow",
-	"mail",
-	"malbork",
-	"malopolska",
-	"mazowsze",
-	"mazury",
-	"med",
-	"media",
-	"miasta",
-	"mielec",
-	"mielno",
-	"mil",
-	"mragowo",
-	"naklo",
-	"net",
-	"nieruchomosci",
-	"nom",
-	"nowaruda",
-	"nysa",
-	"olawa",
-	"olecko",
-	"olkusz",
-	"olsztyn",
-	"opoczno",
-	"opole",
-	"org",
-	"ostroda",
-	"ostroleka",
-	"ostrowiec",
-	"ostrowwlkp",
-	"pc",
-	"pila",
-	"pisz",
-	"podhale",
-	"podlasie",
-	"polkowice",
-	"pomorskie",
-	"pomorze",
-	"powiat",
-	"poznan",
-	"priv",
-	"prochowice",
-	"pruszkow",
-	"przeworsk",
-	"pulawy",
-	"radom",
-	"rawa-maz",
-	"realestate",
-	"rel",
-	"rybnik",
-	"rzeszow",
-	"sanok",
-	"sejny",
-	"sex",
-	"shop",
-	"sklep",
-	"skoczow",
-	"slask",
-	"slupsk",
-	"sopot",
-	"sos",
-	"sosnowiec",
-	"stalowa-wola",
-	"starachowice",
-	"stargard",
-	"suwalki",
-	"swidnica",
-	"swiebodzin",
-	"swinoujscie",
-	"szczecin",
-	"szczytno",
-	"szkola",
-	"targi",
-	"tarnobrzeg",
-	"tgory",
-	"tm",
-	"tourism",
-	"travel",
-	"turek",
-	"turystyka",
-	"tychy",
-	"ustka",
-	"walbrzych",
-	"warmia",
-	"warszawa",
-	"waw",
-	"wegrow",
-	"wielun",
-	"wlocl",
-	"wloclawek",
-	"wodzislaw",
-	"wolomin",
-	"wroc",
-	"wroclaw",
-	"zachpomor",
-	"zagan",
-	"zakopane",
-	"zarow",
-	"zgora",
-	"zgorzelec",
-	"ap",
-	"griw",
-	"ic",
-	"is",
-	"kmpsp",
-	"konsulat",
-	"kppsp",
-	"kwp",
-	"kwpsp",
-	"mup",
-	"mw",
-	"oirm",
-	"oum",
-	"pa",
-	"pinb",
-	"piw",
-	"po",
-	"psp",
-	"psse",
-	"pup",
-	"rzgw",
-	"sa",
-	"sdn",
-	"sko",
-	"so",
-	"sr",
-	"starostwo",
-	"ug",
-	"ugim",
-	"um",
-	"umig",
-	"upow",
-	"uppo",
-	"us",
-	"uw",
-	"uzs",
-	"wif",
-	"wiih",
-	"winb",
-	"wios",
-	"witd",
-	"wiw",
-	"wsa",
-	"wskr",
-	"wuoz",
-	"wzmiuw",
-	"zp",
-	"co",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"ac",
-	"biz",
-	"com",
-	"edu",
-	"est",
-	"gov",
-	"info",
-	"isla",
-	"name",
-	"net",
-	"org",
-	"pro",
-	"prof",
-	"aaa",
-	"aca",
-	"acct",
-	"avocat",
-	"bar",
-	"cloudns",
-	"cpa",
-	"eng",
-	"jur",
-	"law",
-	"med",
-	"recht",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"plo",
-	"sec",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"int",
-	"net",
-	"nome",
-	"org",
-	"publ",
-	"belau",
-	"cloudns",
-	"co",
-	"ed",
-	"go",
-	"ne",
-	"or",
-	"com",
-	"coop",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"name",
-	"net",
-	"org",
-	"sch",
-	"asso",
-	"blogspot",
-	"com",
-	"nom",
-	"ybo",
-	"arts",
-	"blogspot",
-	"com",
-	"firm",
-	"info",
-	"nom",
-	"nt",
-	"org",
-	"rec",
-	"shop",
-	"store",
-	"tm",
-	"www",
-	"ac",
-	"blogspot",
-	"co",
-	"edu",
-	"gov",
-	"in",
-	"org",
-	"ac",
-	"blogspot",
-	"edu",
-	"gov",
-	"int",
-	"mil",
-	"test",
-	"ac",
-	"co",
-	"com",
-	"edu",
-	"gouv",
-	"gov",
-	"int",
-	"mil",
-	"net",
-	"com",
-	"edu",
-	"gov",
-	"med",
-	"net",
-	"org",
-	"pub",
-	"sch",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"ybo",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"med",
-	"net",
-	"org",
-	"tv",
-	"a",
-	"ac",
-	"b",
-	"bd",
-	"blogspot",
-	"brand",
-	"c",
-	"com",
-	"d",
-	"e",
-	"f",
-	"fh",
-	"fhsk",
-	"fhv",
-	"g",
-	"h",
-	"i",
-	"k",
-	"komforb",
-	"kommunalforbund",
-	"komvux",
-	"l",
-	"lanbib",
-	"m",
-	"n",
-	"naturbruksgymn",
-	"o",
-	"org",
-	"p",
-	"parti",
-	"pp",
-	"press",
-	"r",
-	"s",
-	"t",
-	"tm",
-	"u",
-	"w",
-	"x",
-	"y",
-	"z",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"per",
-	"com",
-	"gov",
-	"hashbang",
-	"mil",
-	"net",
-	"now",
-	"org",
-	"platform",
-	"blogspot",
-	"cyon",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"net",
-	"org",
-	"art",
-	"blogspot",
-	"com",
-	"edu",
-	"gouv",
-	"org",
-	"perso",
-	"univ",
-	"com",
-	"net",
-	"org",
-	"stackspace",
-	"co",
-	"com",
-	"consulado",
-	"edu",
-	"embaixada",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"principe",
-	"saotome",
-	"store",
-	"adygeya",
-	"arkhangelsk",
-	"balashov",
-	"bashkiria",
-	"bryansk",
-	"dagestan",
-	"grozny",
-	"ivanovo",
-	"kalmykia",
-	"kaluga",
-	"karelia",
-	"khakassia",
-	"krasnodar",
-	"kurgan",
-	"lenug",
-	"mordovia",
-	"msk",
-	"murmansk",
-	"nalchik",
-	"nov",
-	"obninsk",
-	"penza",
-	"pokrovsk",
-	"sochi",
-	"spb",
-	"togliatti",
-	"troitsk",
-	"tula",
-	"tuva",
-	"vladikavkaz",
-	"vladimir",
-	"vologda",
-	"com",
-	"edu",
-	"gob",
-	"org",
-	"red",
-	"gov",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"knightpoint",
-	"ac",
-	"co",
-	"org",
-	"blogspot",
-	"ac",
-	"co",
-	"go",
-	"in",
-	"mi",
-	"net",
-	"or",
-	"ac",
-	"biz",
-	"co",
-	"com",
-	"edu",
-	"go",
-	"gov",
-	"int",
-	"mil",
-	"name",
-	"net",
-	"nic",
-	"org",
-	"test",
-	"web",
-	"gov",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"nom",
-	"org",
-	"agrinet",
-	"com",
-	"defense",
-	"edunet",
-	"ens",
-	"fin",
-	"gov",
-	"ind",
-	"info",
-	"intl",
-	"mincom",
-	"nat",
-	"net",
-	"org",
-	"perso",
-	"rnrt",
-	"rns",
-	"rnu",
-	"tourism",
-	"turen",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"av",
-	"bbs",
-	"bel",
-	"biz",
-	"com",
-	"dr",
-	"edu",
-	"gen",
-	"gov",
-	"info",
-	"k12",
-	"kep",
-	"mil",
-	"name",
-	"nc",
-	"net",
-	"org",
-	"pol",
-	"tel",
-	"tv",
-	"web",
-	"blogspot",
-	"gov",
-	"ybo",
-	"aero",
-	"biz",
-	"co",
-	"com",
-	"coop",
-	"edu",
-	"gov",
-	"info",
-	"int",
-	"jobs",
-	"mobi",
-	"museum",
-	"name",
-	"net",
-	"org",
-	"pro",
-	"travel",
-	"better-than",
-	"dyndns",
-	"on-the-web",
-	"worse-than",
-	"blogspot",
-	"club",
-	"com",
-	"ebiz",
-	"edu",
-	"game",
-	"gov",
-	"idv",
-	"mil",
-	"net",
-	"org",
-	"xn--czrw28b",
-	"xn--uc0atv",
-	"xn--zf0ao64a",
-	"ac",
-	"co",
-	"go",
-	"hotel",
-	"info",
-	"me",
-	"mil",
-	"mobi",
-	"ne",
-	"or",
-	"sc",
-	"tv",
-	"biz",
-	"cc",
-	"cherkassy",
-	"cherkasy",
-	"chernigov",
-	"chernihiv",
-	"chernivtsi",
-	"chernovtsy",
-	"ck",
-	"cn",
-	"co",
-	"com",
-	"cr",
-	"crimea",
-	"cv",
-	"dn",
-	"dnepropetrovsk",
-	"dnipropetrovsk",
-	"dominic",
-	"donetsk",
-	"dp",
-	"edu",
-	"gov",
-	"if",
-	"in",
-	"inf",
-	"ivano-frankivsk",
-	"kh",
-	"kharkiv",
-	"kharkov",
-	"kherson",
-	"khmelnitskiy",
-	"khmelnytskyi",
-	"kiev",
-	"kirovograd",
-	"km",
-	"kr",
-	"krym",
-	"ks",
-	"kv",
-	"kyiv",
-	"lg",
-	"lt",
-	"ltd",
-	"lugansk",
-	"lutsk",
-	"lv",
-	"lviv",
-	"mk",
-	"mykolaiv",
-	"net",
-	"nikolaev",
-	"od",
-	"odesa",
-	"odessa",
-	"org",
-	"pl",
-	"poltava",
-	"pp",
-	"rivne",
-	"rovno",
-	"rv",
-	"sb",
-	"sebastopol",
-	"sevastopol",
-	"sm",
-	"sumy",
-	"te",
-	"ternopil",
-	"uz",
-	"uzhgorod",
-	"vinnica",
-	"vinnytsia",
-	"vn",
-	"volyn",
-	"yalta",
-	"zaporizhzhe",
-	"zaporizhzhia",
-	"zhitomir",
-	"zhytomyr",
-	"zp",
-	"zt",
-	"ac",
-	"blogspot",
-	"co",
-	"com",
-	"go",
-	"ne",
-	"or",
-	"org",
-	"sc",
-	"ac",
-	"co",
-	"gov",
-	"ltd",
-	"me",
-	"net",
-	"nhs",
-	"org",
-	"plc",
-	"police",
-	"sch",
-	"blogspot",
-	"no-ip",
-	"wellbeingzone",
-	"homeoffice",
-	"service",
-	"ak",
-	"al",
-	"ar",
-	"as",
-	"az",
-	"ca",
-	"cloudns",
-	"co",
-	"ct",
-	"dc",
-	"de",
-	"dni",
-	"drud",
-	"fed",
-	"fl",
-	"ga",
-	"golffan",
-	"gu",
-	"hi",
-	"ia",
-	"id",
-	"il",
-	"in",
-	"is-by",
-	"isa",
-	"kids",
-	"ks",
-	"ky",
-	"la",
-	"land-4-sale",
-	"ma",
-	"md",
-	"me",
-	"mi",
-	"mn",
-	"mo",
-	"ms",
-	"mt",
-	"nc",
-	"nd",
-	"ne",
-	"nh",
-	"nj",
-	"nm",
-	"noip",
-	"nsn",
-	"nv",
-	"ny",
-	"oh",
-	"ok",
-	"or",
-	"pa",
-	"pointto",
-	"pr",
-	"ri",
-	"sc",
-	"sd",
-	"stuff-4-sale",
-	"tn",
-	"tx",
-	"ut",
-	"va",
-	"vi",
-	"vt",
-	"wa",
-	"wi",
-	"wv",
-	"wy",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"chtr",
-	"paroch",
-	"pvt",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"k12",
-	"lib",
-	"cc",
-	"cc",
-	"k12",
-	"lib",
-	"com",
-	"edu",
-	"gub",
-	"mil",
-	"net",
-	"org",
-	"blogspot",
-	"co",
-	"com",
-	"net",
-	"org",
-	"com",
-	"edu",
-	"gov",
-	"mil",
-	"net",
-	"org",
-	"arts",
-	"co",
-	"com",
-	"e12",
-	"edu",
-	"firm",
-	"gob",
-	"gov",
-	"info",
-	"int",
-	"mil",
-	"net",
-	"org",
-	"rec",
-	"store",
-	"tec",
-	"web",
-	"co",
-	"com",
-	"k12",
-	"net",
-	"org",
-	"ac",
-	"biz",
-	"blogspot",
-	"com",
-	"edu",
-	"gov",
-	"health",
-	"info",
-	"int",
-	"name",
-	"net",
-	"org",
-	"pro",
-	"com",
-	"edu",
-	"net",
-	"org",
-	"com",
-	"dyndns",
-	"edu",
-	"gov",
-	"mypets",
-	"net",
-	"org",
-	"xn--80au",
-	"xn--90azh",
-	"xn--c1avg",
-	"xn--d1at",
-	"xn--o1ac",
-	"xn--o1ach",
-	"fhapp",
-	"ac",
-	"agric",
-	"alt",
-	"co",
-	"edu",
-	"gov",
-	"grondar",
-	"law",
-	"mil",
-	"net",
-	"ngo",
-	"nis",
-	"nom",
-	"org",
-	"school",
-	"tm",
-	"web",
-	"blogspot",
-	"ac",
-	"biz",
-	"co",
-	"com",
-	"edu",
-	"gov",
-	"info",
-	"mil",
-	"net",
-	"org",
-	"sch",
-	"triton",
-}
diff --git a/installer/vendor/golang.org/x/net/route/address.go b/installer/vendor/golang.org/x/net/route/address.go
deleted file mode 100644
index e6bfa39e93..0000000000
--- a/installer/vendor/golang.org/x/net/route/address.go
+++ /dev/null
@@ -1,425 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import "runtime"
-
-// An Addr represents an address associated with packet routing.
-type Addr interface {
-	// Family returns an address family.
-	Family() int
-}
-
-// A LinkAddr represents a link-layer address.
-type LinkAddr struct {
-	Index int    // interface index when attached
-	Name  string // interface name when attached
-	Addr  []byte // link-layer address when attached
-}
-
-// Family implements the Family method of Addr interface.
-func (a *LinkAddr) Family() int { return sysAF_LINK }
-
-func (a *LinkAddr) lenAndSpace() (int, int) {
-	l := 8 + len(a.Name) + len(a.Addr)
-	return l, roundup(l)
-}
-
-func (a *LinkAddr) marshal(b []byte) (int, error) {
-	l, ll := a.lenAndSpace()
-	if len(b) < ll {
-		return 0, errShortBuffer
-	}
-	nlen, alen := len(a.Name), len(a.Addr)
-	if nlen > 255 || alen > 255 {
-		return 0, errInvalidAddr
-	}
-	b[0] = byte(l)
-	b[1] = sysAF_LINK
-	if a.Index > 0 {
-		nativeEndian.PutUint16(b[2:4], uint16(a.Index))
-	}
-	data := b[8:]
-	if nlen > 0 {
-		b[5] = byte(nlen)
-		copy(data[:nlen], a.Addr)
-		data = data[nlen:]
-	}
-	if alen > 0 {
-		b[6] = byte(alen)
-		copy(data[:alen], a.Name)
-		data = data[alen:]
-	}
-	return ll, nil
-}
-
-func parseLinkAddr(b []byte) (Addr, error) {
-	if len(b) < 8 {
-		return nil, errInvalidAddr
-	}
-	_, a, err := parseKernelLinkAddr(sysAF_LINK, b[4:])
-	if err != nil {
-		return nil, err
-	}
-	a.(*LinkAddr).Index = int(nativeEndian.Uint16(b[2:4]))
-	return a, nil
-}
-
-// parseKernelLinkAddr parses b as a link-layer address in
-// conventional BSD kernel form.
-func parseKernelLinkAddr(_ int, b []byte) (int, Addr, error) {
-	// The encoding looks like the following:
-	// +----------------------------+
-	// | Type             (1 octet) |
-	// +----------------------------+
-	// | Name length      (1 octet) |
-	// +----------------------------+
-	// | Address length   (1 octet) |
-	// +----------------------------+
-	// | Selector length  (1 octet) |
-	// +----------------------------+
-	// | Data            (variable) |
-	// +----------------------------+
-	//
-	// On some platforms, all-bit-one of length field means "don't
-	// care".
-	nlen, alen, slen := int(b[1]), int(b[2]), int(b[3])
-	if nlen == 0xff {
-		nlen = 0
-	}
-	if alen == 0xff {
-		alen = 0
-	}
-	if slen == 0xff {
-		slen = 0
-	}
-	l := 4 + nlen + alen + slen
-	if len(b) < l {
-		return 0, nil, errInvalidAddr
-	}
-	data := b[4:]
-	var name string
-	var addr []byte
-	if nlen > 0 {
-		name = string(data[:nlen])
-		data = data[nlen:]
-	}
-	if alen > 0 {
-		addr = data[:alen]
-		data = data[alen:]
-	}
-	return l, &LinkAddr{Name: name, Addr: addr}, nil
-}
-
-// An Inet4Addr represents an internet address for IPv4.
-type Inet4Addr struct {
-	IP [4]byte // IP address
-}
-
-// Family implements the Family method of Addr interface.
-func (a *Inet4Addr) Family() int { return sysAF_INET }
-
-func (a *Inet4Addr) lenAndSpace() (int, int) {
-	return sizeofSockaddrInet, roundup(sizeofSockaddrInet)
-}
-
-func (a *Inet4Addr) marshal(b []byte) (int, error) {
-	l, ll := a.lenAndSpace()
-	if len(b) < ll {
-		return 0, errShortBuffer
-	}
-	b[0] = byte(l)
-	b[1] = sysAF_INET
-	copy(b[4:8], a.IP[:])
-	return ll, nil
-}
-
-// An Inet6Addr represents an internet address for IPv6.
-type Inet6Addr struct {
-	IP     [16]byte // IP address
-	ZoneID int      // zone identifier
-}
-
-// Family implements the Family method of Addr interface.
-func (a *Inet6Addr) Family() int { return sysAF_INET6 }
-
-func (a *Inet6Addr) lenAndSpace() (int, int) {
-	return sizeofSockaddrInet6, roundup(sizeofSockaddrInet6)
-}
-
-func (a *Inet6Addr) marshal(b []byte) (int, error) {
-	l, ll := a.lenAndSpace()
-	if len(b) < ll {
-		return 0, errShortBuffer
-	}
-	b[0] = byte(l)
-	b[1] = sysAF_INET6
-	copy(b[8:24], a.IP[:])
-	if a.ZoneID > 0 {
-		nativeEndian.PutUint32(b[24:28], uint32(a.ZoneID))
-	}
-	return ll, nil
-}
-
-// parseInetAddr parses b as an internet address for IPv4 or IPv6.
-func parseInetAddr(af int, b []byte) (Addr, error) {
-	switch af {
-	case sysAF_INET:
-		if len(b) < sizeofSockaddrInet {
-			return nil, errInvalidAddr
-		}
-		a := &Inet4Addr{}
-		copy(a.IP[:], b[4:8])
-		return a, nil
-	case sysAF_INET6:
-		if len(b) < sizeofSockaddrInet6 {
-			return nil, errInvalidAddr
-		}
-		a := &Inet6Addr{ZoneID: int(nativeEndian.Uint32(b[24:28]))}
-		copy(a.IP[:], b[8:24])
-		if a.IP[0] == 0xfe && a.IP[1]&0xc0 == 0x80 || a.IP[0] == 0xff && (a.IP[1]&0x0f == 0x01 || a.IP[1]&0x0f == 0x02) {
-			// KAME based IPv6 protocol stack usually
-			// embeds the interface index in the
-			// interface-local or link-local address as
-			// the kernel-internal form.
-			id := int(bigEndian.Uint16(a.IP[2:4]))
-			if id != 0 {
-				a.ZoneID = id
-				a.IP[2], a.IP[3] = 0, 0
-			}
-		}
-		return a, nil
-	default:
-		return nil, errInvalidAddr
-	}
-}
-
-// parseKernelInetAddr parses b as an internet address in conventional
-// BSD kernel form.
-func parseKernelInetAddr(af int, b []byte) (int, Addr, error) {
-	// The encoding looks similar to the NLRI encoding.
-	// +----------------------------+
-	// | Length           (1 octet) |
-	// +----------------------------+
-	// | Address prefix  (variable) |
-	// +----------------------------+
-	//
-	// The differences between the kernel form and the NLRI
-	// encoding are:
-	//
-	// - The length field of the kernel form indicates the prefix
-	//   length in bytes, not in bits
-	//
-	// - In the kernel form, zero value of the length field
-	//   doesn't mean 0.0.0.0/0 or ::/0
-	//
-	// - The kernel form appends leading bytes to the prefix field
-	//   to make the <length, prefix> tuple to be conformed with
-	//   the routing message boundary
-	l := int(b[0])
-	if runtime.GOOS == "darwin" {
-		// On Darwn, an address in the kernel form is also
-		// used as a message filler.
-		if l == 0 || len(b) > roundup(l) {
-			l = roundup(l)
-		}
-	} else {
-		l = roundup(l)
-	}
-	if len(b) < l {
-		return 0, nil, errInvalidAddr
-	}
-	// Don't reorder case expressions.
-	// The case expressions for IPv6 must come first.
-	const (
-		off4 = 4 // offset of in_addr
-		off6 = 8 // offset of in6_addr
-	)
-	switch {
-	case b[0] == sizeofSockaddrInet6:
-		a := &Inet6Addr{}
-		copy(a.IP[:], b[off6:off6+16])
-		return int(b[0]), a, nil
-	case af == sysAF_INET6:
-		a := &Inet6Addr{}
-		if l-1 < off6 {
-			copy(a.IP[:], b[1:l])
-		} else {
-			copy(a.IP[:], b[l-off6:l])
-		}
-		return int(b[0]), a, nil
-	case b[0] == sizeofSockaddrInet:
-		a := &Inet4Addr{}
-		copy(a.IP[:], b[off4:off4+4])
-		return int(b[0]), a, nil
-	default: // an old fashion, AF_UNSPEC or unknown means AF_INET
-		a := &Inet4Addr{}
-		if l-1 < off4 {
-			copy(a.IP[:], b[1:l])
-		} else {
-			copy(a.IP[:], b[l-off4:l])
-		}
-		return int(b[0]), a, nil
-	}
-}
-
-// A DefaultAddr represents an address of various operating
-// system-specific features.
-type DefaultAddr struct {
-	af  int
-	Raw []byte // raw format of address
-}
-
-// Family implements the Family method of Addr interface.
-func (a *DefaultAddr) Family() int { return a.af }
-
-func (a *DefaultAddr) lenAndSpace() (int, int) {
-	l := len(a.Raw)
-	return l, roundup(l)
-}
-
-func (a *DefaultAddr) marshal(b []byte) (int, error) {
-	l, ll := a.lenAndSpace()
-	if len(b) < ll {
-		return 0, errShortBuffer
-	}
-	if l > 255 {
-		return 0, errInvalidAddr
-	}
-	b[1] = byte(l)
-	copy(b[:l], a.Raw)
-	return ll, nil
-}
-
-func parseDefaultAddr(b []byte) (Addr, error) {
-	if len(b) < 2 || len(b) < int(b[0]) {
-		return nil, errInvalidAddr
-	}
-	a := &DefaultAddr{af: int(b[1]), Raw: b[:b[0]]}
-	return a, nil
-}
-
-func addrsSpace(as []Addr) int {
-	var l int
-	for _, a := range as {
-		switch a := a.(type) {
-		case *LinkAddr:
-			_, ll := a.lenAndSpace()
-			l += ll
-		case *Inet4Addr:
-			_, ll := a.lenAndSpace()
-			l += ll
-		case *Inet6Addr:
-			_, ll := a.lenAndSpace()
-			l += ll
-		case *DefaultAddr:
-			_, ll := a.lenAndSpace()
-			l += ll
-		}
-	}
-	return l
-}
-
-// marshalAddrs marshals as and returns a bitmap indicating which
-// address is stored in b.
-func marshalAddrs(b []byte, as []Addr) (uint, error) {
-	var attrs uint
-	for i, a := range as {
-		switch a := a.(type) {
-		case *LinkAddr:
-			l, err := a.marshal(b)
-			if err != nil {
-				return 0, err
-			}
-			b = b[l:]
-			attrs |= 1 << uint(i)
-		case *Inet4Addr:
-			l, err := a.marshal(b)
-			if err != nil {
-				return 0, err
-			}
-			b = b[l:]
-			attrs |= 1 << uint(i)
-		case *Inet6Addr:
-			l, err := a.marshal(b)
-			if err != nil {
-				return 0, err
-			}
-			b = b[l:]
-			attrs |= 1 << uint(i)
-		case *DefaultAddr:
-			l, err := a.marshal(b)
-			if err != nil {
-				return 0, err
-			}
-			b = b[l:]
-			attrs |= 1 << uint(i)
-		}
-	}
-	return attrs, nil
-}
-
-func parseAddrs(attrs uint, fn func(int, []byte) (int, Addr, error), b []byte) ([]Addr, error) {
-	var as [sysRTAX_MAX]Addr
-	af := int(sysAF_UNSPEC)
-	for i := uint(0); i < sysRTAX_MAX && len(b) >= roundup(0); i++ {
-		if attrs&(1<<i) == 0 {
-			continue
-		}
-		if i <= sysRTAX_BRD {
-			switch b[1] {
-			case sysAF_LINK:
-				a, err := parseLinkAddr(b)
-				if err != nil {
-					return nil, err
-				}
-				as[i] = a
-				l := roundup(int(b[0]))
-				if len(b) < l {
-					return nil, errMessageTooShort
-				}
-				b = b[l:]
-			case sysAF_INET, sysAF_INET6:
-				af = int(b[1])
-				a, err := parseInetAddr(af, b)
-				if err != nil {
-					return nil, err
-				}
-				as[i] = a
-				l := roundup(int(b[0]))
-				if len(b) < l {
-					return nil, errMessageTooShort
-				}
-				b = b[l:]
-			default:
-				l, a, err := fn(af, b)
-				if err != nil {
-					return nil, err
-				}
-				as[i] = a
-				ll := roundup(l)
-				if len(b) < ll {
-					b = b[l:]
-				} else {
-					b = b[ll:]
-				}
-			}
-		} else {
-			a, err := parseDefaultAddr(b)
-			if err != nil {
-				return nil, err
-			}
-			as[i] = a
-			l := roundup(int(b[0]))
-			if len(b) < l {
-				return nil, errMessageTooShort
-			}
-			b = b[l:]
-		}
-	}
-	return as[:], nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/address_darwin_test.go b/installer/vendor/golang.org/x/net/route/address_darwin_test.go
deleted file mode 100644
index b86bd3df1f..0000000000
--- a/installer/vendor/golang.org/x/net/route/address_darwin_test.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import (
-	"reflect"
-	"testing"
-)
-
-type parseAddrsOnDarwinTest struct {
-	attrs uint
-	fn    func(int, []byte) (int, Addr, error)
-	b     []byte
-	as    []Addr
-}
-
-var parseAddrsOnDarwinLittleEndianTests = []parseAddrsOnDarwinTest{
-	{
-		sysRTA_DST | sysRTA_GATEWAY | sysRTA_NETMASK,
-		parseKernelInetAddr,
-		[]byte{
-			0x10, 0x2, 0x0, 0x0, 0xc0, 0xa8, 0x56, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-			0x14, 0x12, 0x4, 0x0, 0x6, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0,
-
-			0x7, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-		},
-		[]Addr{
-			&Inet4Addr{IP: [4]byte{192, 168, 86, 0}},
-			&LinkAddr{Index: 4},
-			&Inet4Addr{IP: [4]byte{255, 255, 255, 255}},
-			nil,
-			nil,
-			nil,
-			nil,
-			nil,
-		},
-	},
-}
-
-func TestParseAddrsOnDarwin(t *testing.T) {
-	tests := parseAddrsOnDarwinLittleEndianTests
-	if nativeEndian != littleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	for i, tt := range tests {
-		as, err := parseAddrs(tt.attrs, tt.fn, tt.b)
-		if err != nil {
-			t.Error(i, err)
-			continue
-		}
-		if !reflect.DeepEqual(as, tt.as) {
-			t.Errorf("#%d: got %+v; want %+v", i, as, tt.as)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/address_test.go b/installer/vendor/golang.org/x/net/route/address_test.go
deleted file mode 100644
index 2005ef7c20..0000000000
--- a/installer/vendor/golang.org/x/net/route/address_test.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import (
-	"reflect"
-	"testing"
-)
-
-type parseAddrsTest struct {
-	attrs uint
-	fn    func(int, []byte) (int, Addr, error)
-	b     []byte
-	as    []Addr
-}
-
-var parseAddrsLittleEndianTests = []parseAddrsTest{
-	{
-		sysRTA_DST | sysRTA_GATEWAY | sysRTA_NETMASK | sysRTA_BRD,
-		parseKernelInetAddr,
-		[]byte{
-			0x38, 0x12, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-			0x38, 0x12, 0x2, 0x0, 0x6, 0x3, 0x6, 0x0,
-			0x65, 0x6d, 0x31, 0x0, 0xc, 0x29, 0x66, 0x2c,
-			0xdc, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-			0x10, 0x2, 0x0, 0x0, 0xac, 0x10, 0xdc, 0xb4,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-			0x10, 0x2, 0x0, 0x0, 0xac, 0x10, 0xdc, 0xff,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-		},
-		[]Addr{
-			&LinkAddr{Index: 0},
-			&LinkAddr{Index: 2, Name: "em1", Addr: []byte{0x00, 0x0c, 0x29, 0x66, 0x2c, 0xdc}},
-			&Inet4Addr{IP: [4]byte{172, 16, 220, 180}},
-			nil,
-			nil,
-			nil,
-			nil,
-			&Inet4Addr{IP: [4]byte{172, 16, 220, 255}},
-		},
-	},
-	{
-		sysRTA_NETMASK | sysRTA_IFP | sysRTA_IFA,
-		parseKernelInetAddr,
-		[]byte{
-			0x7, 0x0, 0x0, 0x0, 0xff, 0xff, 0xff, 0x0,
-
-			0x18, 0x12, 0xa, 0x0, 0x87, 0x8, 0x0, 0x0,
-			0x76, 0x6c, 0x61, 0x6e, 0x35, 0x36, 0x38, 0x32,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-
-			0x10, 0x2, 0x0, 0x0, 0xa9, 0xfe, 0x0, 0x1,
-			0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0, 0x0,
-		},
-		[]Addr{
-			nil,
-			nil,
-			&Inet4Addr{IP: [4]byte{255, 255, 255, 0}},
-			nil,
-			&LinkAddr{Index: 10, Name: "vlan5682"},
-			&Inet4Addr{IP: [4]byte{169, 254, 0, 1}},
-			nil,
-			nil,
-		},
-	},
-}
-
-func TestParseAddrs(t *testing.T) {
-	tests := parseAddrsLittleEndianTests
-	if nativeEndian != littleEndian {
-		t.Skip("no test for non-little endian machine yet")
-	}
-
-	for i, tt := range tests {
-		as, err := parseAddrs(tt.attrs, tt.fn, tt.b)
-		if err != nil {
-			t.Error(i, err)
-			continue
-		}
-		as = as[:8] // the list varies between operating systems
-		if !reflect.DeepEqual(as, tt.as) {
-			t.Errorf("#%d: got %+v; want %+v", i, as, tt.as)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/binary.go b/installer/vendor/golang.org/x/net/route/binary.go
deleted file mode 100644
index 6910520eca..0000000000
--- a/installer/vendor/golang.org/x/net/route/binary.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-// This file contains duplicates of encoding/binary package.
-//
-// This package is supposed to be used by the net package of standard
-// library. Therefore the package set used in the package must be the
-// same as net package.
-
-var (
-	littleEndian binaryLittleEndian
-	bigEndian    binaryBigEndian
-)
-
-type binaryByteOrder interface {
-	Uint16([]byte) uint16
-	Uint32([]byte) uint32
-	PutUint16([]byte, uint16)
-	PutUint32([]byte, uint32)
-	Uint64([]byte) uint64
-}
-
-type binaryLittleEndian struct{}
-
-func (binaryLittleEndian) Uint16(b []byte) uint16 {
-	_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint16(b[0]) | uint16(b[1])<<8
-}
-
-func (binaryLittleEndian) PutUint16(b []byte, v uint16) {
-	_ = b[1] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-}
-
-func (binaryLittleEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-}
-
-func (binaryLittleEndian) PutUint32(b []byte, v uint32) {
-	_ = b[3] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-}
-
-func (binaryLittleEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[0]) | uint64(b[1])<<8 | uint64(b[2])<<16 | uint64(b[3])<<24 |
-		uint64(b[4])<<32 | uint64(b[5])<<40 | uint64(b[6])<<48 | uint64(b[7])<<56
-}
-
-type binaryBigEndian struct{}
-
-func (binaryBigEndian) Uint16(b []byte) uint16 {
-	_ = b[1] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint16(b[1]) | uint16(b[0])<<8
-}
-
-func (binaryBigEndian) PutUint16(b []byte, v uint16) {
-	_ = b[1] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v >> 8)
-	b[1] = byte(v)
-}
-
-func (binaryBigEndian) Uint32(b []byte) uint32 {
-	_ = b[3] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint32(b[3]) | uint32(b[2])<<8 | uint32(b[1])<<16 | uint32(b[0])<<24
-}
-
-func (binaryBigEndian) PutUint32(b []byte, v uint32) {
-	_ = b[3] // early bounds check to guarantee safety of writes below
-	b[0] = byte(v >> 24)
-	b[1] = byte(v >> 16)
-	b[2] = byte(v >> 8)
-	b[3] = byte(v)
-}
-
-func (binaryBigEndian) Uint64(b []byte) uint64 {
-	_ = b[7] // bounds check hint to compiler; see golang.org/issue/14808
-	return uint64(b[7]) | uint64(b[6])<<8 | uint64(b[5])<<16 | uint64(b[4])<<24 |
-		uint64(b[3])<<32 | uint64(b[2])<<40 | uint64(b[1])<<48 | uint64(b[0])<<56
-}
diff --git a/installer/vendor/golang.org/x/net/route/defs_darwin.go b/installer/vendor/golang.org/x/net/route/defs_darwin.go
deleted file mode 100644
index e7716442d2..0000000000
--- a/installer/vendor/golang.org/x/net/route/defs_darwin.go
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package route
-
-/*
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_ROUTE  = C.AF_ROUTE
-	sysAF_LINK   = C.AF_LINK
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_RAW = C.SOCK_RAW
-
-	sysNET_RT_DUMP    = C.NET_RT_DUMP
-	sysNET_RT_FLAGS   = C.NET_RT_FLAGS
-	sysNET_RT_IFLIST  = C.NET_RT_IFLIST
-	sysNET_RT_STAT    = C.NET_RT_STAT
-	sysNET_RT_TRASH   = C.NET_RT_TRASH
-	sysNET_RT_IFLIST2 = C.NET_RT_IFLIST2
-	sysNET_RT_DUMP2   = C.NET_RT_DUMP2
-	sysNET_RT_MAXID   = C.NET_RT_MAXID
-)
-
-const (
-	sysCTL_MAXNAME = C.CTL_MAXNAME
-
-	sysCTL_UNSPEC  = C.CTL_UNSPEC
-	sysCTL_KERN    = C.CTL_KERN
-	sysCTL_VM      = C.CTL_VM
-	sysCTL_VFS     = C.CTL_VFS
-	sysCTL_NET     = C.CTL_NET
-	sysCTL_DEBUG   = C.CTL_DEBUG
-	sysCTL_HW      = C.CTL_HW
-	sysCTL_MACHDEP = C.CTL_MACHDEP
-	sysCTL_USER    = C.CTL_USER
-	sysCTL_MAXID   = C.CTL_MAXID
-)
-
-const (
-	sysRTM_VERSION = C.RTM_VERSION
-
-	sysRTM_ADD       = C.RTM_ADD
-	sysRTM_DELETE    = C.RTM_DELETE
-	sysRTM_CHANGE    = C.RTM_CHANGE
-	sysRTM_GET       = C.RTM_GET
-	sysRTM_LOSING    = C.RTM_LOSING
-	sysRTM_REDIRECT  = C.RTM_REDIRECT
-	sysRTM_MISS      = C.RTM_MISS
-	sysRTM_LOCK      = C.RTM_LOCK
-	sysRTM_OLDADD    = C.RTM_OLDADD
-	sysRTM_OLDDEL    = C.RTM_OLDDEL
-	sysRTM_RESOLVE   = C.RTM_RESOLVE
-	sysRTM_NEWADDR   = C.RTM_NEWADDR
-	sysRTM_DELADDR   = C.RTM_DELADDR
-	sysRTM_IFINFO    = C.RTM_IFINFO
-	sysRTM_NEWMADDR  = C.RTM_NEWMADDR
-	sysRTM_DELMADDR  = C.RTM_DELMADDR
-	sysRTM_IFINFO2   = C.RTM_IFINFO2
-	sysRTM_NEWMADDR2 = C.RTM_NEWMADDR2
-	sysRTM_GET2      = C.RTM_GET2
-
-	sysRTA_DST     = C.RTA_DST
-	sysRTA_GATEWAY = C.RTA_GATEWAY
-	sysRTA_NETMASK = C.RTA_NETMASK
-	sysRTA_GENMASK = C.RTA_GENMASK
-	sysRTA_IFP     = C.RTA_IFP
-	sysRTA_IFA     = C.RTA_IFA
-	sysRTA_AUTHOR  = C.RTA_AUTHOR
-	sysRTA_BRD     = C.RTA_BRD
-
-	sysRTAX_DST     = C.RTAX_DST
-	sysRTAX_GATEWAY = C.RTAX_GATEWAY
-	sysRTAX_NETMASK = C.RTAX_NETMASK
-	sysRTAX_GENMASK = C.RTAX_GENMASK
-	sysRTAX_IFP     = C.RTAX_IFP
-	sysRTAX_IFA     = C.RTAX_IFA
-	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
-	sysRTAX_BRD     = C.RTAX_BRD
-	sysRTAX_MAX     = C.RTAX_MAX
-)
-
-const (
-	sizeofIfMsghdrDarwin15    = C.sizeof_struct_if_msghdr
-	sizeofIfaMsghdrDarwin15   = C.sizeof_struct_ifa_msghdr
-	sizeofIfmaMsghdrDarwin15  = C.sizeof_struct_ifma_msghdr
-	sizeofIfMsghdr2Darwin15   = C.sizeof_struct_if_msghdr2
-	sizeofIfmaMsghdr2Darwin15 = C.sizeof_struct_ifma_msghdr2
-	sizeofIfDataDarwin15      = C.sizeof_struct_if_data
-	sizeofIfData64Darwin15    = C.sizeof_struct_if_data64
-
-	sizeofRtMsghdrDarwin15  = C.sizeof_struct_rt_msghdr
-	sizeofRtMsghdr2Darwin15 = C.sizeof_struct_rt_msghdr2
-	sizeofRtMetricsDarwin15 = C.sizeof_struct_rt_metrics
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-)
diff --git a/installer/vendor/golang.org/x/net/route/defs_dragonfly.go b/installer/vendor/golang.org/x/net/route/defs_dragonfly.go
deleted file mode 100644
index dd31de269a..0000000000
--- a/installer/vendor/golang.org/x/net/route/defs_dragonfly.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package route
-
-/*
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_ROUTE  = C.AF_ROUTE
-	sysAF_LINK   = C.AF_LINK
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_RAW = C.SOCK_RAW
-
-	sysNET_RT_DUMP   = C.NET_RT_DUMP
-	sysNET_RT_FLAGS  = C.NET_RT_FLAGS
-	sysNET_RT_IFLIST = C.NET_RT_IFLIST
-	sysNET_RT_MAXID  = C.NET_RT_MAXID
-)
-
-const (
-	sysCTL_MAXNAME = C.CTL_MAXNAME
-
-	sysCTL_UNSPEC   = C.CTL_UNSPEC
-	sysCTL_KERN     = C.CTL_KERN
-	sysCTL_VM       = C.CTL_VM
-	sysCTL_VFS      = C.CTL_VFS
-	sysCTL_NET      = C.CTL_NET
-	sysCTL_DEBUG    = C.CTL_DEBUG
-	sysCTL_HW       = C.CTL_HW
-	sysCTL_MACHDEP  = C.CTL_MACHDEP
-	sysCTL_USER     = C.CTL_USER
-	sysCTL_P1003_1B = C.CTL_P1003_1B
-	sysCTL_LWKT     = C.CTL_LWKT
-	sysCTL_MAXID    = C.CTL_MAXID
-)
-
-const (
-	sysRTM_VERSION = C.RTM_VERSION
-
-	sysRTM_ADD        = C.RTM_ADD
-	sysRTM_DELETE     = C.RTM_DELETE
-	sysRTM_CHANGE     = C.RTM_CHANGE
-	sysRTM_GET        = C.RTM_GET
-	sysRTM_LOSING     = C.RTM_LOSING
-	sysRTM_REDIRECT   = C.RTM_REDIRECT
-	sysRTM_MISS       = C.RTM_MISS
-	sysRTM_LOCK       = C.RTM_LOCK
-	sysRTM_OLDADD     = C.RTM_OLDADD
-	sysRTM_OLDDEL     = C.RTM_OLDDEL
-	sysRTM_RESOLVE    = C.RTM_RESOLVE
-	sysRTM_NEWADDR    = C.RTM_NEWADDR
-	sysRTM_DELADDR    = C.RTM_DELADDR
-	sysRTM_IFINFO     = C.RTM_IFINFO
-	sysRTM_NEWMADDR   = C.RTM_NEWMADDR
-	sysRTM_DELMADDR   = C.RTM_DELMADDR
-	sysRTM_IFANNOUNCE = C.RTM_IFANNOUNCE
-	sysRTM_IEEE80211  = C.RTM_IEEE80211
-
-	sysRTA_DST     = C.RTA_DST
-	sysRTA_GATEWAY = C.RTA_GATEWAY
-	sysRTA_NETMASK = C.RTA_NETMASK
-	sysRTA_GENMASK = C.RTA_GENMASK
-	sysRTA_IFP     = C.RTA_IFP
-	sysRTA_IFA     = C.RTA_IFA
-	sysRTA_AUTHOR  = C.RTA_AUTHOR
-	sysRTA_BRD     = C.RTA_BRD
-	sysRTA_MPLS1   = C.RTA_MPLS1
-	sysRTA_MPLS2   = C.RTA_MPLS2
-	sysRTA_MPLS3   = C.RTA_MPLS3
-
-	sysRTAX_DST     = C.RTAX_DST
-	sysRTAX_GATEWAY = C.RTAX_GATEWAY
-	sysRTAX_NETMASK = C.RTAX_NETMASK
-	sysRTAX_GENMASK = C.RTAX_GENMASK
-	sysRTAX_IFP     = C.RTAX_IFP
-	sysRTAX_IFA     = C.RTAX_IFA
-	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
-	sysRTAX_BRD     = C.RTAX_BRD
-	sysRTAX_MPLS1   = C.RTAX_MPLS1
-	sysRTAX_MPLS2   = C.RTAX_MPLS2
-	sysRTAX_MPLS3   = C.RTAX_MPLS3
-	sysRTAX_MAX     = C.RTAX_MAX
-)
-
-const (
-	sizeofIfMsghdrDragonFlyBSD4         = C.sizeof_struct_if_msghdr
-	sizeofIfaMsghdrDragonFlyBSD4        = C.sizeof_struct_ifa_msghdr
-	sizeofIfmaMsghdrDragonFlyBSD4       = C.sizeof_struct_ifma_msghdr
-	sizeofIfAnnouncemsghdrDragonFlyBSD4 = C.sizeof_struct_if_announcemsghdr
-
-	sizeofRtMsghdrDragonFlyBSD4  = C.sizeof_struct_rt_msghdr
-	sizeofRtMetricsDragonFlyBSD4 = C.sizeof_struct_rt_metrics
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-)
diff --git a/installer/vendor/golang.org/x/net/route/defs_freebsd.go b/installer/vendor/golang.org/x/net/route/defs_freebsd.go
deleted file mode 100644
index d95594d8ea..0000000000
--- a/installer/vendor/golang.org/x/net/route/defs_freebsd.go
+++ /dev/null
@@ -1,337 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package route
-
-/*
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-
-struct if_data_freebsd7 {
-	u_char ifi_type;
-	u_char ifi_physical;
-	u_char ifi_addrlen;
-	u_char ifi_hdrlen;
-	u_char ifi_link_state;
-	u_char ifi_spare_char1;
-	u_char ifi_spare_char2;
-	u_char ifi_datalen;
-	u_long ifi_mtu;
-	u_long ifi_metric;
-	u_long ifi_baudrate;
-	u_long ifi_ipackets;
-	u_long ifi_ierrors;
-	u_long ifi_opackets;
-	u_long ifi_oerrors;
-	u_long ifi_collisions;
-	u_long ifi_ibytes;
-	u_long ifi_obytes;
-	u_long ifi_imcasts;
-	u_long ifi_omcasts;
-	u_long ifi_iqdrops;
-	u_long ifi_noproto;
-	u_long ifi_hwassist;
-	time_t __ifi_epoch;
-	struct timeval __ifi_lastchange;
-};
-
-struct if_data_freebsd8 {
-	u_char ifi_type;
-	u_char ifi_physical;
-	u_char ifi_addrlen;
-	u_char ifi_hdrlen;
-	u_char ifi_link_state;
-	u_char ifi_spare_char1;
-	u_char ifi_spare_char2;
-	u_char ifi_datalen;
-	u_long ifi_mtu;
-	u_long ifi_metric;
-	u_long ifi_baudrate;
-	u_long ifi_ipackets;
-	u_long ifi_ierrors;
-	u_long ifi_opackets;
-	u_long ifi_oerrors;
-	u_long ifi_collisions;
-	u_long ifi_ibytes;
-	u_long ifi_obytes;
-	u_long ifi_imcasts;
-	u_long ifi_omcasts;
-	u_long ifi_iqdrops;
-	u_long ifi_noproto;
-	u_long ifi_hwassist;
-	time_t __ifi_epoch;
-	struct timeval __ifi_lastchange;
-};
-
-struct if_data_freebsd9 {
-	u_char ifi_type;
-	u_char ifi_physical;
-	u_char ifi_addrlen;
-	u_char ifi_hdrlen;
-	u_char ifi_link_state;
-	u_char ifi_spare_char1;
-	u_char ifi_spare_char2;
-	u_char ifi_datalen;
-	u_long ifi_mtu;
-	u_long ifi_metric;
-	u_long ifi_baudrate;
-	u_long ifi_ipackets;
-	u_long ifi_ierrors;
-	u_long ifi_opackets;
-	u_long ifi_oerrors;
-	u_long ifi_collisions;
-	u_long ifi_ibytes;
-	u_long ifi_obytes;
-	u_long ifi_imcasts;
-	u_long ifi_omcasts;
-	u_long ifi_iqdrops;
-	u_long ifi_noproto;
-	u_long ifi_hwassist;
-	time_t __ifi_epoch;
-	struct timeval __ifi_lastchange;
-};
-
-struct if_data_freebsd10 {
-	u_char ifi_type;
-	u_char ifi_physical;
-	u_char ifi_addrlen;
-	u_char ifi_hdrlen;
-	u_char ifi_link_state;
-	u_char ifi_vhid;
-	u_char ifi_baudrate_pf;
-	u_char ifi_datalen;
-	u_long ifi_mtu;
-	u_long ifi_metric;
-	u_long ifi_baudrate;
-	u_long ifi_ipackets;
-	u_long ifi_ierrors;
-	u_long ifi_opackets;
-	u_long ifi_oerrors;
-	u_long ifi_collisions;
-	u_long ifi_ibytes;
-	u_long ifi_obytes;
-	u_long ifi_imcasts;
-	u_long ifi_omcasts;
-	u_long ifi_iqdrops;
-	u_long ifi_noproto;
-	uint64_t ifi_hwassist;
-	time_t __ifi_epoch;
-	struct timeval __ifi_lastchange;
-};
-
-struct if_data_freebsd11 {
-	uint8_t ifi_type;
-	uint8_t ifi_physical;
-	uint8_t ifi_addrlen;
-	uint8_t ifi_hdrlen;
-	uint8_t ifi_link_state;
-	uint8_t ifi_vhid;
-	uint16_t ifi_datalen;
-	uint32_t ifi_mtu;
-	uint32_t ifi_metric;
-	uint64_t ifi_baudrate;
-	uint64_t ifi_ipackets;
-	uint64_t ifi_ierrors;
-	uint64_t ifi_opackets;
-	uint64_t ifi_oerrors;
-	uint64_t ifi_collisions;
-	uint64_t ifi_ibytes;
-	uint64_t ifi_obytes;
-	uint64_t ifi_imcasts;
-	uint64_t ifi_omcasts;
-	uint64_t ifi_iqdrops;
-	uint64_t ifi_oqdrops;
-	uint64_t ifi_noproto;
-	uint64_t ifi_hwassist;
-	union {
-		time_t tt;
-		uint64_t ph;
-	} __ifi_epoch;
-	union {
-		struct timeval tv;
-		struct {
-			uint64_t ph1;
-			uint64_t ph2;
-		} ph;
-	} __ifi_lastchange;
-};
-
-struct if_msghdr_freebsd7 {
-	u_short ifm_msglen;
-	u_char ifm_version;
-	u_char ifm_type;
-	int ifm_addrs;
-	int ifm_flags;
-	u_short ifm_index;
-	struct if_data_freebsd7 ifm_data;
-};
-
-struct if_msghdr_freebsd8 {
-	u_short ifm_msglen;
-	u_char ifm_version;
-	u_char ifm_type;
-	int ifm_addrs;
-	int ifm_flags;
-	u_short ifm_index;
-	struct if_data_freebsd8 ifm_data;
-};
-
-struct if_msghdr_freebsd9 {
-	u_short ifm_msglen;
-	u_char ifm_version;
-	u_char ifm_type;
-	int ifm_addrs;
-	int ifm_flags;
-	u_short ifm_index;
-	struct if_data_freebsd9 ifm_data;
-};
-
-struct if_msghdr_freebsd10 {
-	u_short ifm_msglen;
-	u_char ifm_version;
-	u_char ifm_type;
-	int ifm_addrs;
-	int ifm_flags;
-	u_short ifm_index;
-	struct if_data_freebsd10 ifm_data;
-};
-
-struct if_msghdr_freebsd11 {
-	u_short ifm_msglen;
-	u_char ifm_version;
-	u_char ifm_type;
-	int ifm_addrs;
-	int ifm_flags;
-	u_short ifm_index;
-	struct if_data_freebsd11 ifm_data;
-};
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_ROUTE  = C.AF_ROUTE
-	sysAF_LINK   = C.AF_LINK
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_RAW = C.SOCK_RAW
-
-	sysNET_RT_DUMP     = C.NET_RT_DUMP
-	sysNET_RT_FLAGS    = C.NET_RT_FLAGS
-	sysNET_RT_IFLIST   = C.NET_RT_IFLIST
-	sysNET_RT_IFMALIST = C.NET_RT_IFMALIST
-	sysNET_RT_IFLISTL  = C.NET_RT_IFLISTL
-)
-
-const (
-	sysCTL_MAXNAME = C.CTL_MAXNAME
-
-	sysCTL_UNSPEC   = C.CTL_UNSPEC
-	sysCTL_KERN     = C.CTL_KERN
-	sysCTL_VM       = C.CTL_VM
-	sysCTL_VFS      = C.CTL_VFS
-	sysCTL_NET      = C.CTL_NET
-	sysCTL_DEBUG    = C.CTL_DEBUG
-	sysCTL_HW       = C.CTL_HW
-	sysCTL_MACHDEP  = C.CTL_MACHDEP
-	sysCTL_USER     = C.CTL_USER
-	sysCTL_P1003_1B = C.CTL_P1003_1B
-)
-
-const (
-	sysRTM_VERSION = C.RTM_VERSION
-
-	sysRTM_ADD        = C.RTM_ADD
-	sysRTM_DELETE     = C.RTM_DELETE
-	sysRTM_CHANGE     = C.RTM_CHANGE
-	sysRTM_GET        = C.RTM_GET
-	sysRTM_LOSING     = C.RTM_LOSING
-	sysRTM_REDIRECT   = C.RTM_REDIRECT
-	sysRTM_MISS       = C.RTM_MISS
-	sysRTM_LOCK       = C.RTM_LOCK
-	sysRTM_RESOLVE    = C.RTM_RESOLVE
-	sysRTM_NEWADDR    = C.RTM_NEWADDR
-	sysRTM_DELADDR    = C.RTM_DELADDR
-	sysRTM_IFINFO     = C.RTM_IFINFO
-	sysRTM_NEWMADDR   = C.RTM_NEWMADDR
-	sysRTM_DELMADDR   = C.RTM_DELMADDR
-	sysRTM_IFANNOUNCE = C.RTM_IFANNOUNCE
-	sysRTM_IEEE80211  = C.RTM_IEEE80211
-
-	sysRTA_DST     = C.RTA_DST
-	sysRTA_GATEWAY = C.RTA_GATEWAY
-	sysRTA_NETMASK = C.RTA_NETMASK
-	sysRTA_GENMASK = C.RTA_GENMASK
-	sysRTA_IFP     = C.RTA_IFP
-	sysRTA_IFA     = C.RTA_IFA
-	sysRTA_AUTHOR  = C.RTA_AUTHOR
-	sysRTA_BRD     = C.RTA_BRD
-
-	sysRTAX_DST     = C.RTAX_DST
-	sysRTAX_GATEWAY = C.RTAX_GATEWAY
-	sysRTAX_NETMASK = C.RTAX_NETMASK
-	sysRTAX_GENMASK = C.RTAX_GENMASK
-	sysRTAX_IFP     = C.RTAX_IFP
-	sysRTAX_IFA     = C.RTAX_IFA
-	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
-	sysRTAX_BRD     = C.RTAX_BRD
-	sysRTAX_MAX     = C.RTAX_MAX
-)
-
-const (
-	sizeofIfMsghdrlFreeBSD10        = C.sizeof_struct_if_msghdrl
-	sizeofIfaMsghdrFreeBSD10        = C.sizeof_struct_ifa_msghdr
-	sizeofIfaMsghdrlFreeBSD10       = C.sizeof_struct_ifa_msghdrl
-	sizeofIfmaMsghdrFreeBSD10       = C.sizeof_struct_ifma_msghdr
-	sizeofIfAnnouncemsghdrFreeBSD10 = C.sizeof_struct_if_announcemsghdr
-
-	sizeofRtMsghdrFreeBSD10  = C.sizeof_struct_rt_msghdr
-	sizeofRtMetricsFreeBSD10 = C.sizeof_struct_rt_metrics
-
-	sizeofIfMsghdrFreeBSD7  = C.sizeof_struct_if_msghdr_freebsd7
-	sizeofIfMsghdrFreeBSD8  = C.sizeof_struct_if_msghdr_freebsd8
-	sizeofIfMsghdrFreeBSD9  = C.sizeof_struct_if_msghdr_freebsd9
-	sizeofIfMsghdrFreeBSD10 = C.sizeof_struct_if_msghdr_freebsd10
-	sizeofIfMsghdrFreeBSD11 = C.sizeof_struct_if_msghdr_freebsd11
-
-	sizeofIfDataFreeBSD7  = C.sizeof_struct_if_data_freebsd7
-	sizeofIfDataFreeBSD8  = C.sizeof_struct_if_data_freebsd8
-	sizeofIfDataFreeBSD9  = C.sizeof_struct_if_data_freebsd9
-	sizeofIfDataFreeBSD10 = C.sizeof_struct_if_data_freebsd10
-	sizeofIfDataFreeBSD11 = C.sizeof_struct_if_data_freebsd11
-
-	sizeofIfMsghdrlFreeBSD10Emu        = C.sizeof_struct_if_msghdrl
-	sizeofIfaMsghdrFreeBSD10Emu        = C.sizeof_struct_ifa_msghdr
-	sizeofIfaMsghdrlFreeBSD10Emu       = C.sizeof_struct_ifa_msghdrl
-	sizeofIfmaMsghdrFreeBSD10Emu       = C.sizeof_struct_ifma_msghdr
-	sizeofIfAnnouncemsghdrFreeBSD10Emu = C.sizeof_struct_if_announcemsghdr
-
-	sizeofRtMsghdrFreeBSD10Emu  = C.sizeof_struct_rt_msghdr
-	sizeofRtMetricsFreeBSD10Emu = C.sizeof_struct_rt_metrics
-
-	sizeofIfMsghdrFreeBSD7Emu  = C.sizeof_struct_if_msghdr_freebsd7
-	sizeofIfMsghdrFreeBSD8Emu  = C.sizeof_struct_if_msghdr_freebsd8
-	sizeofIfMsghdrFreeBSD9Emu  = C.sizeof_struct_if_msghdr_freebsd9
-	sizeofIfMsghdrFreeBSD10Emu = C.sizeof_struct_if_msghdr_freebsd10
-	sizeofIfMsghdrFreeBSD11Emu = C.sizeof_struct_if_msghdr_freebsd11
-
-	sizeofIfDataFreeBSD7Emu  = C.sizeof_struct_if_data_freebsd7
-	sizeofIfDataFreeBSD8Emu  = C.sizeof_struct_if_data_freebsd8
-	sizeofIfDataFreeBSD9Emu  = C.sizeof_struct_if_data_freebsd9
-	sizeofIfDataFreeBSD10Emu = C.sizeof_struct_if_data_freebsd10
-	sizeofIfDataFreeBSD11Emu = C.sizeof_struct_if_data_freebsd11
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-)
diff --git a/installer/vendor/golang.org/x/net/route/defs_netbsd.go b/installer/vendor/golang.org/x/net/route/defs_netbsd.go
deleted file mode 100644
index b0abd549a0..0000000000
--- a/installer/vendor/golang.org/x/net/route/defs_netbsd.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package route
-
-/*
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_ROUTE  = C.AF_ROUTE
-	sysAF_LINK   = C.AF_LINK
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_RAW = C.SOCK_RAW
-
-	sysNET_RT_DUMP   = C.NET_RT_DUMP
-	sysNET_RT_FLAGS  = C.NET_RT_FLAGS
-	sysNET_RT_IFLIST = C.NET_RT_IFLIST
-	sysNET_RT_MAXID  = C.NET_RT_MAXID
-)
-
-const (
-	sysCTL_MAXNAME = C.CTL_MAXNAME
-
-	sysCTL_UNSPEC   = C.CTL_UNSPEC
-	sysCTL_KERN     = C.CTL_KERN
-	sysCTL_VM       = C.CTL_VM
-	sysCTL_VFS      = C.CTL_VFS
-	sysCTL_NET      = C.CTL_NET
-	sysCTL_DEBUG    = C.CTL_DEBUG
-	sysCTL_HW       = C.CTL_HW
-	sysCTL_MACHDEP  = C.CTL_MACHDEP
-	sysCTL_USER     = C.CTL_USER
-	sysCTL_DDB      = C.CTL_DDB
-	sysCTL_PROC     = C.CTL_PROC
-	sysCTL_VENDOR   = C.CTL_VENDOR
-	sysCTL_EMUL     = C.CTL_EMUL
-	sysCTL_SECURITY = C.CTL_SECURITY
-	sysCTL_MAXID    = C.CTL_MAXID
-)
-
-const (
-	sysRTM_VERSION = C.RTM_VERSION
-
-	sysRTM_ADD        = C.RTM_ADD
-	sysRTM_DELETE     = C.RTM_DELETE
-	sysRTM_CHANGE     = C.RTM_CHANGE
-	sysRTM_GET        = C.RTM_GET
-	sysRTM_LOSING     = C.RTM_LOSING
-	sysRTM_REDIRECT   = C.RTM_REDIRECT
-	sysRTM_MISS       = C.RTM_MISS
-	sysRTM_LOCK       = C.RTM_LOCK
-	sysRTM_OLDADD     = C.RTM_OLDADD
-	sysRTM_OLDDEL     = C.RTM_OLDDEL
-	sysRTM_RESOLVE    = C.RTM_RESOLVE
-	sysRTM_NEWADDR    = C.RTM_NEWADDR
-	sysRTM_DELADDR    = C.RTM_DELADDR
-	sysRTM_IFANNOUNCE = C.RTM_IFANNOUNCE
-	sysRTM_IEEE80211  = C.RTM_IEEE80211
-	sysRTM_SETGATE    = C.RTM_SETGATE
-	sysRTM_LLINFO_UPD = C.RTM_LLINFO_UPD
-	sysRTM_IFINFO     = C.RTM_IFINFO
-	sysRTM_CHGADDR    = C.RTM_CHGADDR
-
-	sysRTA_DST     = C.RTA_DST
-	sysRTA_GATEWAY = C.RTA_GATEWAY
-	sysRTA_NETMASK = C.RTA_NETMASK
-	sysRTA_GENMASK = C.RTA_GENMASK
-	sysRTA_IFP     = C.RTA_IFP
-	sysRTA_IFA     = C.RTA_IFA
-	sysRTA_AUTHOR  = C.RTA_AUTHOR
-	sysRTA_BRD     = C.RTA_BRD
-	sysRTA_TAG     = C.RTA_TAG
-
-	sysRTAX_DST     = C.RTAX_DST
-	sysRTAX_GATEWAY = C.RTAX_GATEWAY
-	sysRTAX_NETMASK = C.RTAX_NETMASK
-	sysRTAX_GENMASK = C.RTAX_GENMASK
-	sysRTAX_IFP     = C.RTAX_IFP
-	sysRTAX_IFA     = C.RTAX_IFA
-	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
-	sysRTAX_BRD     = C.RTAX_BRD
-	sysRTAX_TAG     = C.RTAX_TAG
-	sysRTAX_MAX     = C.RTAX_MAX
-)
-
-const (
-	sizeofIfMsghdrNetBSD7         = C.sizeof_struct_if_msghdr
-	sizeofIfaMsghdrNetBSD7        = C.sizeof_struct_ifa_msghdr
-	sizeofIfAnnouncemsghdrNetBSD7 = C.sizeof_struct_if_announcemsghdr
-
-	sizeofRtMsghdrNetBSD7  = C.sizeof_struct_rt_msghdr
-	sizeofRtMetricsNetBSD7 = C.sizeof_struct_rt_metrics
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-)
diff --git a/installer/vendor/golang.org/x/net/route/defs_openbsd.go b/installer/vendor/golang.org/x/net/route/defs_openbsd.go
deleted file mode 100644
index 0f66d3619c..0000000000
--- a/installer/vendor/golang.org/x/net/route/defs_openbsd.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-package route
-
-/*
-#include <sys/socket.h>
-#include <sys/sysctl.h>
-
-#include <net/if.h>
-#include <net/if_dl.h>
-#include <net/route.h>
-
-#include <netinet/in.h>
-*/
-import "C"
-
-const (
-	sysAF_UNSPEC = C.AF_UNSPEC
-	sysAF_INET   = C.AF_INET
-	sysAF_ROUTE  = C.AF_ROUTE
-	sysAF_LINK   = C.AF_LINK
-	sysAF_INET6  = C.AF_INET6
-
-	sysSOCK_RAW = C.SOCK_RAW
-
-	sysNET_RT_DUMP    = C.NET_RT_DUMP
-	sysNET_RT_FLAGS   = C.NET_RT_FLAGS
-	sysNET_RT_IFLIST  = C.NET_RT_IFLIST
-	sysNET_RT_STATS   = C.NET_RT_STATS
-	sysNET_RT_TABLE   = C.NET_RT_TABLE
-	sysNET_RT_IFNAMES = C.NET_RT_IFNAMES
-	sysNET_RT_MAXID   = C.NET_RT_MAXID
-)
-
-const (
-	sysCTL_MAXNAME = C.CTL_MAXNAME
-
-	sysCTL_UNSPEC  = C.CTL_UNSPEC
-	sysCTL_KERN    = C.CTL_KERN
-	sysCTL_VM      = C.CTL_VM
-	sysCTL_FS      = C.CTL_FS
-	sysCTL_NET     = C.CTL_NET
-	sysCTL_DEBUG   = C.CTL_DEBUG
-	sysCTL_HW      = C.CTL_HW
-	sysCTL_MACHDEP = C.CTL_MACHDEP
-	sysCTL_DDB     = C.CTL_DDB
-	sysCTL_VFS     = C.CTL_VFS
-	sysCTL_MAXID   = C.CTL_MAXID
-)
-
-const (
-	sysRTM_VERSION = C.RTM_VERSION
-
-	sysRTM_ADD        = C.RTM_ADD
-	sysRTM_DELETE     = C.RTM_DELETE
-	sysRTM_CHANGE     = C.RTM_CHANGE
-	sysRTM_GET        = C.RTM_GET
-	sysRTM_LOSING     = C.RTM_LOSING
-	sysRTM_REDIRECT   = C.RTM_REDIRECT
-	sysRTM_MISS       = C.RTM_MISS
-	sysRTM_LOCK       = C.RTM_LOCK
-	sysRTM_RESOLVE    = C.RTM_RESOLVE
-	sysRTM_NEWADDR    = C.RTM_NEWADDR
-	sysRTM_DELADDR    = C.RTM_DELADDR
-	sysRTM_IFINFO     = C.RTM_IFINFO
-	sysRTM_IFANNOUNCE = C.RTM_IFANNOUNCE
-	sysRTM_DESYNC     = C.RTM_DESYNC
-
-	sysRTA_DST     = C.RTA_DST
-	sysRTA_GATEWAY = C.RTA_GATEWAY
-	sysRTA_NETMASK = C.RTA_NETMASK
-	sysRTA_GENMASK = C.RTA_GENMASK
-	sysRTA_IFP     = C.RTA_IFP
-	sysRTA_IFA     = C.RTA_IFA
-	sysRTA_AUTHOR  = C.RTA_AUTHOR
-	sysRTA_BRD     = C.RTA_BRD
-	sysRTA_SRC     = C.RTA_SRC
-	sysRTA_SRCMASK = C.RTA_SRCMASK
-	sysRTA_LABEL   = C.RTA_LABEL
-
-	sysRTAX_DST     = C.RTAX_DST
-	sysRTAX_GATEWAY = C.RTAX_GATEWAY
-	sysRTAX_NETMASK = C.RTAX_NETMASK
-	sysRTAX_GENMASK = C.RTAX_GENMASK
-	sysRTAX_IFP     = C.RTAX_IFP
-	sysRTAX_IFA     = C.RTAX_IFA
-	sysRTAX_AUTHOR  = C.RTAX_AUTHOR
-	sysRTAX_BRD     = C.RTAX_BRD
-	sysRTAX_SRC     = C.RTAX_SRC
-	sysRTAX_SRCMASK = C.RTAX_SRCMASK
-	sysRTAX_LABEL   = C.RTAX_LABEL
-	sysRTAX_MAX     = C.RTAX_MAX
-)
-
-const (
-	sizeofRtMsghdr = C.sizeof_struct_rt_msghdr
-
-	sizeofSockaddrStorage = C.sizeof_struct_sockaddr_storage
-	sizeofSockaddrInet    = C.sizeof_struct_sockaddr_in
-	sizeofSockaddrInet6   = C.sizeof_struct_sockaddr_in6
-)
diff --git a/installer/vendor/golang.org/x/net/route/interface.go b/installer/vendor/golang.org/x/net/route/interface.go
deleted file mode 100644
index 854906d9c4..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-// An InterfaceMessage represents an interface message.
-type InterfaceMessage struct {
-	Version int    // message version
-	Type    int    // message type
-	Flags   int    // interface flags
-	Index   int    // interface index
-	Name    string // interface name
-	Addrs   []Addr // addresses
-
-	extOff int    // offset of header extension
-	raw    []byte // raw message
-}
-
-// An InterfaceAddrMessage represents an interface address message.
-type InterfaceAddrMessage struct {
-	Version int    // message version
-	Type    int    // message type
-	Flags   int    // interface flags
-	Index   int    // interface index
-	Addrs   []Addr // addresses
-
-	raw []byte // raw message
-}
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceAddrMessage) Sys() []Sys { return nil }
-
-// An InterfaceMulticastAddrMessage represents an interface multicast
-// address message.
-type InterfaceMulticastAddrMessage struct {
-	Version int    // message version
-	Type    int    // messsage type
-	Flags   int    // interface flags
-	Index   int    // interface index
-	Addrs   []Addr // addresses
-
-	raw []byte // raw message
-}
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMulticastAddrMessage) Sys() []Sys { return nil }
-
-// An InterfaceAnnounceMessage represents an interface announcement
-// message.
-type InterfaceAnnounceMessage struct {
-	Version int    // message version
-	Type    int    // message type
-	Index   int    // interface index
-	Name    string // interface name
-	What    int    // what type of announcement
-
-	raw []byte // raw message
-}
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceAnnounceMessage) Sys() []Sys { return nil }
diff --git a/installer/vendor/golang.org/x/net/route/interface_announce.go b/installer/vendor/golang.org/x/net/route/interface_announce.go
deleted file mode 100644
index 520d657b57..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface_announce.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly freebsd netbsd
-
-package route
-
-func (w *wireFormat) parseInterfaceAnnounceMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < w.bodyOff {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceAnnounceMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Index:   int(nativeEndian.Uint16(b[4:6])),
-		What:    int(nativeEndian.Uint16(b[22:24])),
-		raw:     b[:l],
-	}
-	for i := 0; i < 16; i++ {
-		if b[6+i] != 0 {
-			continue
-		}
-		m.Name = string(b[6 : 6+i])
-		break
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/interface_classic.go b/installer/vendor/golang.org/x/net/route/interface_classic.go
deleted file mode 100644
index ac4e7a6805..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface_classic.go
+++ /dev/null
@@ -1,66 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly netbsd
-
-package route
-
-import "runtime"
-
-func (w *wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < w.bodyOff {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	attrs := uint(nativeEndian.Uint32(b[4:8]))
-	if attrs&sysRTA_IFP == 0 {
-		return nil, nil
-	}
-	m := &InterfaceMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Addrs:   make([]Addr, sysRTAX_MAX),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		Index:   int(nativeEndian.Uint16(b[12:14])),
-		extOff:  w.extOff,
-		raw:     b[:l],
-	}
-	a, err := parseLinkAddr(b[w.bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	m.Addrs[sysRTAX_IFP] = a
-	m.Name = a.(*LinkAddr).Name
-	return m, nil
-}
-
-func (w *wireFormat) parseInterfaceAddrMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < w.bodyOff {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceAddrMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		raw:     b[:l],
-	}
-	if runtime.GOOS == "netbsd" {
-		m.Index = int(nativeEndian.Uint16(b[16:18]))
-	} else {
-		m.Index = int(nativeEndian.Uint16(b[12:14]))
-	}
-	var err error
-	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[4:8])), parseKernelInetAddr, b[w.bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/interface_freebsd.go b/installer/vendor/golang.org/x/net/route/interface_freebsd.go
deleted file mode 100644
index 9f6f50c00f..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface_freebsd.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-func (w *wireFormat) parseInterfaceMessage(typ RIBType, b []byte) (Message, error) {
-	var extOff, bodyOff int
-	if typ == sysNET_RT_IFLISTL {
-		if len(b) < 20 {
-			return nil, errMessageTooShort
-		}
-		extOff = int(nativeEndian.Uint16(b[18:20]))
-		bodyOff = int(nativeEndian.Uint16(b[16:18]))
-	} else {
-		extOff = w.extOff
-		bodyOff = w.bodyOff
-	}
-	if len(b) < extOff || len(b) < bodyOff {
-		return nil, errInvalidMessage
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	attrs := uint(nativeEndian.Uint32(b[4:8]))
-	if attrs&sysRTA_IFP == 0 {
-		return nil, nil
-	}
-	m := &InterfaceMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		Index:   int(nativeEndian.Uint16(b[12:14])),
-		Addrs:   make([]Addr, sysRTAX_MAX),
-		extOff:  extOff,
-		raw:     b[:l],
-	}
-	a, err := parseLinkAddr(b[bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	m.Addrs[sysRTAX_IFP] = a
-	m.Name = a.(*LinkAddr).Name
-	return m, nil
-}
-
-func (w *wireFormat) parseInterfaceAddrMessage(typ RIBType, b []byte) (Message, error) {
-	var bodyOff int
-	if typ == sysNET_RT_IFLISTL {
-		if len(b) < 24 {
-			return nil, errMessageTooShort
-		}
-		bodyOff = int(nativeEndian.Uint16(b[16:18]))
-	} else {
-		bodyOff = w.bodyOff
-	}
-	if len(b) < bodyOff {
-		return nil, errInvalidMessage
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceAddrMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		Index:   int(nativeEndian.Uint16(b[12:14])),
-		raw:     b[:l],
-	}
-	var err error
-	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[4:8])), parseKernelInetAddr, b[bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/interface_multicast.go b/installer/vendor/golang.org/x/net/route/interface_multicast.go
deleted file mode 100644
index 1e99a9cc64..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface_multicast.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd
-
-package route
-
-func (w *wireFormat) parseInterfaceMulticastAddrMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < w.bodyOff {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceMulticastAddrMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		Index:   int(nativeEndian.Uint16(b[12:14])),
-		raw:     b[:l],
-	}
-	var err error
-	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[4:8])), parseKernelInetAddr, b[w.bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/interface_openbsd.go b/installer/vendor/golang.org/x/net/route/interface_openbsd.go
deleted file mode 100644
index e4a143c1c7..0000000000
--- a/installer/vendor/golang.org/x/net/route/interface_openbsd.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-func (*wireFormat) parseInterfaceMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < 32 {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	attrs := uint(nativeEndian.Uint32(b[12:16]))
-	if attrs&sysRTA_IFP == 0 {
-		return nil, nil
-	}
-	m := &InterfaceMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[16:20])),
-		Index:   int(nativeEndian.Uint16(b[6:8])),
-		Addrs:   make([]Addr, sysRTAX_MAX),
-		raw:     b[:l],
-	}
-	ll := int(nativeEndian.Uint16(b[4:6]))
-	if len(b) < ll {
-		return nil, errInvalidMessage
-	}
-	a, err := parseLinkAddr(b[ll:])
-	if err != nil {
-		return nil, err
-	}
-	m.Addrs[sysRTAX_IFP] = a
-	m.Name = a.(*LinkAddr).Name
-	return m, nil
-}
-
-func (*wireFormat) parseInterfaceAddrMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < 24 {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	bodyOff := int(nativeEndian.Uint16(b[4:6]))
-	if len(b) < bodyOff {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceAddrMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[12:16])),
-		Index:   int(nativeEndian.Uint16(b[6:8])),
-		raw:     b[:l],
-	}
-	var err error
-	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[12:16])), parseKernelInetAddr, b[bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
-
-func (*wireFormat) parseInterfaceAnnounceMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < 26 {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &InterfaceAnnounceMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Index:   int(nativeEndian.Uint16(b[6:8])),
-		What:    int(nativeEndian.Uint16(b[8:10])),
-		raw:     b[:l],
-	}
-	for i := 0; i < 16; i++ {
-		if b[10+i] != 0 {
-			continue
-		}
-		m.Name = string(b[10 : 10+i])
-		break
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/message.go b/installer/vendor/golang.org/x/net/route/message.go
deleted file mode 100644
index 0fa7e09f46..0000000000
--- a/installer/vendor/golang.org/x/net/route/message.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-// A Message represents a routing message.
-type Message interface {
-	// Sys returns operating system-specific information.
-	Sys() []Sys
-}
-
-// A Sys reprensents operating system-specific information.
-type Sys interface {
-	// SysType returns a type of operating system-specific
-	// information.
-	SysType() SysType
-}
-
-// A SysType represents a type of operating system-specific
-// information.
-type SysType int
-
-const (
-	SysMetrics SysType = iota
-	SysStats
-)
-
-// ParseRIB parses b as a routing information base and returns a list
-// of routing messages.
-func ParseRIB(typ RIBType, b []byte) ([]Message, error) {
-	if !typ.parseable() {
-		return nil, errUnsupportedMessage
-	}
-	var msgs []Message
-	nmsgs, nskips := 0, 0
-	for len(b) > 4 {
-		nmsgs++
-		l := int(nativeEndian.Uint16(b[:2]))
-		if l == 0 {
-			return nil, errInvalidMessage
-		}
-		if len(b) < l {
-			return nil, errMessageTooShort
-		}
-		if b[2] != sysRTM_VERSION {
-			b = b[l:]
-			continue
-		}
-		if w, ok := wireFormats[int(b[3])]; !ok {
-			nskips++
-		} else {
-			m, err := w.parse(typ, b)
-			if err != nil {
-				return nil, err
-			}
-			if m == nil {
-				nskips++
-			} else {
-				msgs = append(msgs, m)
-			}
-		}
-		b = b[l:]
-	}
-	// We failed to parse any of the messages - version mismatch?
-	if nmsgs != len(msgs)+nskips {
-		return nil, errMessageMismatch
-	}
-	return msgs, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/message_darwin_test.go b/installer/vendor/golang.org/x/net/route/message_darwin_test.go
deleted file mode 100644
index 3fdd12df55..0000000000
--- a/installer/vendor/golang.org/x/net/route/message_darwin_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import "testing"
-
-func TestFetchAndParseRIBOnDarwin(t *testing.T) {
-	for _, af := range []int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		for _, typ := range []RIBType{sysNET_RT_FLAGS, sysNET_RT_DUMP2, sysNET_RT_IFLIST2} {
-			ms, err := fetchAndParseRIB(af, typ)
-			if err != nil {
-				t.Error(err)
-				continue
-			}
-			ss, err := msgs(ms).validate()
-			if err != nil {
-				t.Errorf("%v %d %v", addrFamily(af), typ, err)
-				continue
-			}
-			for _, s := range ss {
-				t.Log(s)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/message_freebsd_test.go b/installer/vendor/golang.org/x/net/route/message_freebsd_test.go
deleted file mode 100644
index 785c273f65..0000000000
--- a/installer/vendor/golang.org/x/net/route/message_freebsd_test.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import (
-	"testing"
-	"time"
-	"unsafe"
-)
-
-func TestFetchAndParseRIBOnFreeBSD(t *testing.T) {
-	for _, af := range []int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		for _, typ := range []RIBType{sysNET_RT_IFMALIST} {
-			ms, err := fetchAndParseRIB(af, typ)
-			if err != nil {
-				t.Error(err)
-				continue
-			}
-			ss, err := msgs(ms).validate()
-			if err != nil {
-				t.Errorf("%v %d %v", addrFamily(af), typ, err)
-				continue
-			}
-			for _, s := range ss {
-				t.Log(s)
-			}
-		}
-	}
-}
-
-func TestFetchAndParseRIBOnFreeBSD10AndAbove(t *testing.T) {
-	if _, err := FetchRIB(sysAF_UNSPEC, sysNET_RT_IFLISTL, 0); err != nil {
-		t.Skip("NET_RT_IFLISTL not supported")
-	}
-	var p uintptr
-	if kernelAlign != int(unsafe.Sizeof(p)) {
-		t.Skip("NET_RT_IFLIST vs. NET_RT_IFLISTL doesn't work for 386 emulation on amd64")
-	}
-
-	var tests = [2]struct {
-		typ  RIBType
-		b    []byte
-		msgs []Message
-		ss   []string
-	}{
-		{typ: sysNET_RT_IFLIST},
-		{typ: sysNET_RT_IFLISTL},
-	}
-	for _, af := range []int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		var lastErr error
-		for i := 0; i < 3; i++ {
-			for j := range tests {
-				var err error
-				if tests[j].b, err = FetchRIB(af, tests[j].typ, 0); err != nil {
-					lastErr = err
-					time.Sleep(10 * time.Millisecond)
-				}
-			}
-			if lastErr == nil {
-				break
-			}
-		}
-		if lastErr != nil {
-			t.Error(af, lastErr)
-			continue
-		}
-		for i := range tests {
-			var err error
-			if tests[i].msgs, err = ParseRIB(tests[i].typ, tests[i].b); err != nil {
-				lastErr = err
-				t.Error(af, err)
-			}
-		}
-		if lastErr != nil {
-			continue
-		}
-		for i := range tests {
-			var err error
-			tests[i].ss, err = msgs(tests[i].msgs).validate()
-			if err != nil {
-				lastErr = err
-				t.Error(af, err)
-			}
-			for _, s := range tests[i].ss {
-				t.Log(s)
-			}
-		}
-		if lastErr != nil {
-			continue
-		}
-		for i := len(tests) - 1; i > 0; i-- {
-			if len(tests[i].ss) != len(tests[i-1].ss) {
-				t.Errorf("got %v; want %v", tests[i].ss, tests[i-1].ss)
-				continue
-			}
-			for j, s1 := range tests[i].ss {
-				s0 := tests[i-1].ss[j]
-				if s1 != s0 {
-					t.Errorf("got %s; want %s", s1, s0)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/message_test.go b/installer/vendor/golang.org/x/net/route/message_test.go
deleted file mode 100644
index b3bc60c626..0000000000
--- a/installer/vendor/golang.org/x/net/route/message_test.go
+++ /dev/null
@@ -1,233 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import (
-	"os"
-	"syscall"
-	"testing"
-	"time"
-)
-
-func TestFetchAndParseRIB(t *testing.T) {
-	for _, af := range []int{sysAF_UNSPEC, sysAF_INET, sysAF_INET6} {
-		for _, typ := range []RIBType{sysNET_RT_DUMP, sysNET_RT_IFLIST} {
-			ms, err := fetchAndParseRIB(af, typ)
-			if err != nil {
-				t.Error(err)
-				continue
-			}
-			ss, err := msgs(ms).validate()
-			if err != nil {
-				t.Errorf("%v %d %v", addrFamily(af), typ, err)
-				continue
-			}
-			for _, s := range ss {
-				t.Log(s)
-			}
-		}
-	}
-}
-
-var (
-	rtmonSock int
-	rtmonErr  error
-)
-
-func init() {
-	// We need to keep rtmonSock alive to avoid treading on
-	// recycled socket descriptors.
-	rtmonSock, rtmonErr = syscall.Socket(sysAF_ROUTE, sysSOCK_RAW, sysAF_UNSPEC)
-}
-
-// TestMonitorAndParseRIB leaks a worker goroutine and a socket
-// descriptor but that's intentional.
-func TestMonitorAndParseRIB(t *testing.T) {
-	if testing.Short() || os.Getuid() != 0 {
-		t.Skip("must be root")
-	}
-
-	if rtmonErr != nil {
-		t.Fatal(rtmonErr)
-	}
-
-	// We suppose that using an IPv4 link-local address and the
-	// dot1Q ID for Token Ring and FDDI doesn't harm anyone.
-	pv := &propVirtual{addr: "169.254.0.1", mask: "255.255.255.0"}
-	if err := pv.configure(1002); err != nil {
-		t.Skip(err)
-	}
-	if err := pv.setup(); err != nil {
-		t.Skip(err)
-	}
-	pv.teardown()
-
-	go func() {
-		b := make([]byte, os.Getpagesize())
-		for {
-			// There's no easy way to unblock this read
-			// call because the routing message exchange
-			// over routing socket is a connectionless
-			// message-oriented protocol, no control plane
-			// for signaling connectivity, and we cannot
-			// use the net package of standard library due
-			// to the lack of support for routing socket
-			// and circular dependency.
-			n, err := syscall.Read(rtmonSock, b)
-			if err != nil {
-				return
-			}
-			ms, err := ParseRIB(0, b[:n])
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			ss, err := msgs(ms).validate()
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			for _, s := range ss {
-				t.Log(s)
-			}
-		}
-	}()
-
-	for _, vid := range []int{1002, 1003, 1004, 1005} {
-		pv := &propVirtual{addr: "169.254.0.1", mask: "255.255.255.0"}
-		if err := pv.configure(vid); err != nil {
-			t.Fatal(err)
-		}
-		if err := pv.setup(); err != nil {
-			t.Fatal(err)
-		}
-		time.Sleep(200 * time.Millisecond)
-		if err := pv.teardown(); err != nil {
-			t.Fatal(err)
-		}
-		time.Sleep(200 * time.Millisecond)
-	}
-}
-
-func TestParseRIBWithFuzz(t *testing.T) {
-	for _, fuzz := range []string{
-		"0\x00\x05\x050000000000000000" +
-			"00000000000000000000" +
-			"00000000000000000000" +
-			"00000000000000000000" +
-			"0000000000000\x02000000" +
-			"00000000",
-		"\x02\x00\x05\f0000000000000000" +
-			"0\x0200000000000000",
-		"\x02\x00\x05\x100000000000000\x1200" +
-			"0\x00\xff\x00",
-		"\x02\x00\x05\f0000000000000000" +
-			"0\x12000\x00\x02\x0000",
-		"\x00\x00\x00\x01\x00",
-		"00000",
-	} {
-		for typ := RIBType(0); typ < 256; typ++ {
-			ParseRIB(typ, []byte(fuzz))
-		}
-	}
-}
-
-func TestRouteMessage(t *testing.T) {
-	s, err := syscall.Socket(sysAF_ROUTE, sysSOCK_RAW, sysAF_UNSPEC)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer syscall.Close(s)
-
-	var ms []RouteMessage
-	for _, af := range []int{sysAF_INET, sysAF_INET6} {
-		rs, err := fetchAndParseRIB(af, sysNET_RT_DUMP)
-		if err != nil || len(rs) == 0 {
-			continue
-		}
-		switch af {
-		case sysAF_INET:
-			ms = append(ms, []RouteMessage{
-				{
-					Type: sysRTM_GET,
-					Addrs: []Addr{
-						&Inet4Addr{IP: [4]byte{127, 0, 0, 1}},
-						nil,
-						nil,
-						nil,
-						&LinkAddr{},
-						&Inet4Addr{},
-						nil,
-						&Inet4Addr{},
-					},
-				},
-				{
-					Type: sysRTM_GET,
-					Addrs: []Addr{
-						&Inet4Addr{IP: [4]byte{127, 0, 0, 1}},
-					},
-				},
-			}...)
-		case sysAF_INET6:
-			ms = append(ms, []RouteMessage{
-				{
-					Type: sysRTM_GET,
-					Addrs: []Addr{
-						&Inet6Addr{IP: [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}},
-						nil,
-						nil,
-						nil,
-						&LinkAddr{},
-						&Inet6Addr{},
-						nil,
-						&Inet6Addr{},
-					},
-				},
-				{
-					Type: sysRTM_GET,
-					Addrs: []Addr{
-						&Inet6Addr{IP: [16]byte{0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1}},
-					},
-				},
-			}...)
-		}
-	}
-	for i, m := range ms {
-		m.ID = uintptr(os.Getpid())
-		m.Seq = i + 1
-		wb, err := m.Marshal()
-		if err != nil {
-			t.Fatalf("%v: %v", m, err)
-		}
-		if _, err := syscall.Write(s, wb); err != nil {
-			t.Fatalf("%v: %v", m, err)
-		}
-		rb := make([]byte, os.Getpagesize())
-		n, err := syscall.Read(s, rb)
-		if err != nil {
-			t.Fatalf("%v: %v", m, err)
-		}
-		rms, err := ParseRIB(0, rb[:n])
-		if err != nil {
-			t.Fatalf("%v: %v", m, err)
-		}
-		for _, rm := range rms {
-			err := rm.(*RouteMessage).Err
-			if err != nil {
-				t.Errorf("%v: %v", m, err)
-			}
-		}
-		ss, err := msgs(rms).validate()
-		if err != nil {
-			t.Fatalf("%v: %v", m, err)
-		}
-		for _, s := range ss {
-			t.Log(s)
-		}
-
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/route.go b/installer/vendor/golang.org/x/net/route/route.go
deleted file mode 100644
index 081da0d5c1..0000000000
--- a/installer/vendor/golang.org/x/net/route/route.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-// Package route provides basic functions for the manipulation of
-// packet routing facilities on BSD variants.
-//
-// The package supports any version of Darwin, any version of
-// DragonFly BSD, FreeBSD 7 through 11, NetBSD 6 and above, and
-// OpenBSD 5.6 and above.
-package route
-
-import (
-	"errors"
-	"os"
-	"syscall"
-)
-
-var (
-	errUnsupportedMessage = errors.New("unsupported message")
-	errMessageMismatch    = errors.New("message mismatch")
-	errMessageTooShort    = errors.New("message too short")
-	errInvalidMessage     = errors.New("invalid message")
-	errInvalidAddr        = errors.New("invalid address")
-	errShortBuffer        = errors.New("short buffer")
-)
-
-// A RouteMessage represents a message conveying an address prefix, a
-// nexthop address and an output interface.
-//
-// Unlike other messages, this message can be used to query adjacency
-// information for the given address prefix, to add a new route, and
-// to delete or modify the existing route from the routing information
-// base inside the kernel by writing and reading route messages on a
-// routing socket.
-//
-// For the manipulation of routing information, the route message must
-// contain appropriate fields that include:
-//
-//	Version       = <must be specified>
-//	Type          = <must be specified>
-//	Flags         = <must be specified>
-//	Index         = <must be specified if necessary>
-//	ID            = <must be specified>
-//	Seq           = <must be specified>
-//	Addrs         = <must be specified>
-//
-// The Type field specifies a type of manipulation, the Flags field
-// specifies a class of target information and the Addrs field
-// specifies target information like the following:
-//
-//	route.RouteMessage{
-//		Version: RTM_VERSION,
-//		Type: RTM_GET,
-//		Flags: RTF_UP | RTF_HOST,
-//		ID: uintptr(os.Getpid()),
-//		Seq: 1,
-//		Addrs: []route.Addrs{
-//			RTAX_DST: &route.Inet4Addr{ ... },
-//			RTAX_IFP: &route.LinkAddr{ ... },
-//			RTAX_BRD: &route.Inet4Addr{ ... },
-//		},
-//	}
-//
-// The values for the above fields depend on the implementation of
-// each operating system.
-//
-// The Err field on a response message contains an error value on the
-// requested operation. If non-nil, the requested operation is failed.
-type RouteMessage struct {
-	Version int     // message version
-	Type    int     // message type
-	Flags   int     // route flags
-	Index   int     // interface index when atatched
-	ID      uintptr // sender's identifier; usually process ID
-	Seq     int     // sequence number
-	Err     error   // error on requested operation
-	Addrs   []Addr  // addresses
-
-	extOff int    // offset of header extension
-	raw    []byte // raw message
-}
-
-// Marshal returns the binary encoding of m.
-func (m *RouteMessage) Marshal() ([]byte, error) {
-	return m.marshal()
-}
-
-// A RIBType reprensents a type of routing information base.
-type RIBType int
-
-const (
-	RIBTypeRoute     RIBType = syscall.NET_RT_DUMP
-	RIBTypeInterface RIBType = syscall.NET_RT_IFLIST
-)
-
-// FetchRIB fetches a routing information base from the operating
-// system.
-//
-// The provided af must be an address family.
-//
-// The provided arg must be a RIBType-specific argument.
-// When RIBType is related to routes, arg might be a set of route
-// flags. When RIBType is related to network interfaces, arg might be
-// an interface index or a set of interface flags. In most cases, zero
-// means a wildcard.
-func FetchRIB(af int, typ RIBType, arg int) ([]byte, error) {
-	mib := [6]int32{sysCTL_NET, sysAF_ROUTE, 0, int32(af), int32(typ), int32(arg)}
-	n := uintptr(0)
-	if err := sysctl(mib[:], nil, &n, nil, 0); err != nil {
-		return nil, os.NewSyscallError("sysctl", err)
-	}
-	if n == 0 {
-		return nil, nil
-	}
-	b := make([]byte, n)
-	if err := sysctl(mib[:], &b[0], &n, nil, 0); err != nil {
-		return nil, os.NewSyscallError("sysctl", err)
-	}
-	return b[:n], nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/route_classic.go b/installer/vendor/golang.org/x/net/route/route_classic.go
deleted file mode 100644
index 61b2bb4add..0000000000
--- a/installer/vendor/golang.org/x/net/route/route_classic.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd
-
-package route
-
-import "syscall"
-
-func (m *RouteMessage) marshal() ([]byte, error) {
-	w, ok := wireFormats[m.Type]
-	if !ok {
-		return nil, errUnsupportedMessage
-	}
-	l := w.bodyOff + addrsSpace(m.Addrs)
-	b := make([]byte, l)
-	nativeEndian.PutUint16(b[:2], uint16(l))
-	if m.Version == 0 {
-		b[2] = sysRTM_VERSION
-	} else {
-		b[2] = byte(m.Version)
-	}
-	b[3] = byte(m.Type)
-	nativeEndian.PutUint32(b[8:12], uint32(m.Flags))
-	nativeEndian.PutUint16(b[4:6], uint16(m.Index))
-	nativeEndian.PutUint32(b[16:20], uint32(m.ID))
-	nativeEndian.PutUint32(b[20:24], uint32(m.Seq))
-	attrs, err := marshalAddrs(b[w.bodyOff:], m.Addrs)
-	if err != nil {
-		return nil, err
-	}
-	if attrs > 0 {
-		nativeEndian.PutUint32(b[12:16], uint32(attrs))
-	}
-	return b, nil
-}
-
-func (w *wireFormat) parseRouteMessage(typ RIBType, b []byte) (Message, error) {
-	if len(b) < w.bodyOff {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &RouteMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[8:12])),
-		Index:   int(nativeEndian.Uint16(b[4:6])),
-		ID:      uintptr(nativeEndian.Uint32(b[16:20])),
-		Seq:     int(nativeEndian.Uint32(b[20:24])),
-		extOff:  w.extOff,
-		raw:     b[:l],
-	}
-	errno := syscall.Errno(nativeEndian.Uint32(b[28:32]))
-	if errno != 0 {
-		m.Err = errno
-	}
-	var err error
-	m.Addrs, err = parseAddrs(uint(nativeEndian.Uint32(b[12:16])), parseKernelInetAddr, b[w.bodyOff:])
-	if err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/route_openbsd.go b/installer/vendor/golang.org/x/net/route/route_openbsd.go
deleted file mode 100644
index daf2e90c47..0000000000
--- a/installer/vendor/golang.org/x/net/route/route_openbsd.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import "syscall"
-
-func (m *RouteMessage) marshal() ([]byte, error) {
-	l := sizeofRtMsghdr + addrsSpace(m.Addrs)
-	b := make([]byte, l)
-	nativeEndian.PutUint16(b[:2], uint16(l))
-	if m.Version == 0 {
-		b[2] = sysRTM_VERSION
-	} else {
-		b[2] = byte(m.Version)
-	}
-	b[3] = byte(m.Type)
-	nativeEndian.PutUint16(b[4:6], uint16(sizeofRtMsghdr))
-	nativeEndian.PutUint32(b[16:20], uint32(m.Flags))
-	nativeEndian.PutUint16(b[6:8], uint16(m.Index))
-	nativeEndian.PutUint32(b[24:28], uint32(m.ID))
-	nativeEndian.PutUint32(b[28:32], uint32(m.Seq))
-	attrs, err := marshalAddrs(b[sizeofRtMsghdr:], m.Addrs)
-	if err != nil {
-		return nil, err
-	}
-	if attrs > 0 {
-		nativeEndian.PutUint32(b[12:16], uint32(attrs))
-	}
-	return b, nil
-}
-
-func (*wireFormat) parseRouteMessage(_ RIBType, b []byte) (Message, error) {
-	if len(b) < sizeofRtMsghdr {
-		return nil, errMessageTooShort
-	}
-	l := int(nativeEndian.Uint16(b[:2]))
-	if len(b) < l {
-		return nil, errInvalidMessage
-	}
-	m := &RouteMessage{
-		Version: int(b[2]),
-		Type:    int(b[3]),
-		Flags:   int(nativeEndian.Uint32(b[16:20])),
-		Index:   int(nativeEndian.Uint16(b[6:8])),
-		ID:      uintptr(nativeEndian.Uint32(b[24:28])),
-		Seq:     int(nativeEndian.Uint32(b[28:32])),
-		raw:     b[:l],
-	}
-	ll := int(nativeEndian.Uint16(b[4:6]))
-	if len(b) < ll {
-		return nil, errInvalidMessage
-	}
-	errno := syscall.Errno(nativeEndian.Uint32(b[32:36]))
-	if errno != 0 {
-		m.Err = errno
-	}
-	as, err := parseAddrs(uint(nativeEndian.Uint32(b[12:16])), parseKernelInetAddr, b[ll:])
-	if err != nil {
-		return nil, err
-	}
-	m.Addrs = as
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/route_test.go b/installer/vendor/golang.org/x/net/route/route_test.go
deleted file mode 100644
index 63fd8c5618..0000000000
--- a/installer/vendor/golang.org/x/net/route/route_test.go
+++ /dev/null
@@ -1,386 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import (
-	"fmt"
-	"os/exec"
-	"runtime"
-	"time"
-)
-
-func (m *RouteMessage) String() string {
-	return fmt.Sprintf("%s", addrAttrs(nativeEndian.Uint32(m.raw[12:16])))
-}
-
-func (m *InterfaceMessage) String() string {
-	var attrs addrAttrs
-	if runtime.GOOS == "openbsd" {
-		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
-	} else {
-		attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
-	}
-	return fmt.Sprintf("%s", attrs)
-}
-
-func (m *InterfaceAddrMessage) String() string {
-	var attrs addrAttrs
-	if runtime.GOOS == "openbsd" {
-		attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
-	} else {
-		attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
-	}
-	return fmt.Sprintf("%s", attrs)
-}
-
-func (m *InterfaceMulticastAddrMessage) String() string {
-	return fmt.Sprintf("%s", addrAttrs(nativeEndian.Uint32(m.raw[4:8])))
-}
-
-func (m *InterfaceAnnounceMessage) String() string {
-	what := "<nil>"
-	switch m.What {
-	case 0:
-		what = "arrival"
-	case 1:
-		what = "departure"
-	}
-	return fmt.Sprintf("(%d %s %s)", m.Index, m.Name, what)
-}
-
-func (m *InterfaceMetrics) String() string {
-	return fmt.Sprintf("(type=%d mtu=%d)", m.Type, m.MTU)
-}
-
-func (m *RouteMetrics) String() string {
-	return fmt.Sprintf("(pmtu=%d)", m.PathMTU)
-}
-
-type addrAttrs uint
-
-var addrAttrNames = [...]string{
-	"dst",
-	"gateway",
-	"netmask",
-	"genmask",
-	"ifp",
-	"ifa",
-	"author",
-	"brd",
-	"df:mpls1-n:tag-o:src", // mpls1 for dragonfly, tag for netbsd, src for openbsd
-	"df:mpls2-o:srcmask",   // mpls2 for dragonfly, srcmask for openbsd
-	"df:mpls3-o:label",     // mpls3 for dragonfly, label for openbsd
-}
-
-func (attrs addrAttrs) String() string {
-	var s string
-	for i, name := range addrAttrNames {
-		if attrs&(1<<uint(i)) != 0 {
-			if s != "" {
-				s += "|"
-			}
-			s += name
-		}
-	}
-	if s == "" {
-		return "<nil>"
-	}
-	return s
-}
-
-type msgs []Message
-
-func (ms msgs) validate() ([]string, error) {
-	var ss []string
-	for _, m := range ms {
-		switch m := m.(type) {
-		case *RouteMessage:
-			if err := addrs(m.Addrs).match(addrAttrs(nativeEndian.Uint32(m.raw[12:16]))); err != nil {
-				return nil, err
-			}
-			sys := m.Sys()
-			if sys == nil {
-				return nil, fmt.Errorf("no sys for %s", m.String())
-			}
-			ss = append(ss, m.String()+" "+syss(sys).String()+" "+addrs(m.Addrs).String())
-		case *InterfaceMessage:
-			var attrs addrAttrs
-			if runtime.GOOS == "openbsd" {
-				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
-			} else {
-				attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
-			}
-			if err := addrs(m.Addrs).match(attrs); err != nil {
-				return nil, err
-			}
-			sys := m.Sys()
-			if sys == nil {
-				return nil, fmt.Errorf("no sys for %s", m.String())
-			}
-			ss = append(ss, m.String()+" "+syss(sys).String()+" "+addrs(m.Addrs).String())
-		case *InterfaceAddrMessage:
-			var attrs addrAttrs
-			if runtime.GOOS == "openbsd" {
-				attrs = addrAttrs(nativeEndian.Uint32(m.raw[12:16]))
-			} else {
-				attrs = addrAttrs(nativeEndian.Uint32(m.raw[4:8]))
-			}
-			if err := addrs(m.Addrs).match(attrs); err != nil {
-				return nil, err
-			}
-			ss = append(ss, m.String()+" "+addrs(m.Addrs).String())
-		case *InterfaceMulticastAddrMessage:
-			if err := addrs(m.Addrs).match(addrAttrs(nativeEndian.Uint32(m.raw[4:8]))); err != nil {
-				return nil, err
-			}
-			ss = append(ss, m.String()+" "+addrs(m.Addrs).String())
-		case *InterfaceAnnounceMessage:
-			ss = append(ss, m.String())
-		default:
-			ss = append(ss, fmt.Sprintf("%+v", m))
-		}
-	}
-	return ss, nil
-}
-
-type syss []Sys
-
-func (sys syss) String() string {
-	var s string
-	for _, sy := range sys {
-		switch sy := sy.(type) {
-		case *InterfaceMetrics:
-			if len(s) > 0 {
-				s += " "
-			}
-			s += sy.String()
-		case *RouteMetrics:
-			if len(s) > 0 {
-				s += " "
-			}
-			s += sy.String()
-		}
-	}
-	return s
-}
-
-type addrFamily int
-
-func (af addrFamily) String() string {
-	switch af {
-	case sysAF_UNSPEC:
-		return "unspec"
-	case sysAF_LINK:
-		return "link"
-	case sysAF_INET:
-		return "inet4"
-	case sysAF_INET6:
-		return "inet6"
-	default:
-		return fmt.Sprintf("%d", af)
-	}
-}
-
-const hexDigit = "0123456789abcdef"
-
-type llAddr []byte
-
-func (a llAddr) String() string {
-	if len(a) == 0 {
-		return ""
-	}
-	buf := make([]byte, 0, len(a)*3-1)
-	for i, b := range a {
-		if i > 0 {
-			buf = append(buf, ':')
-		}
-		buf = append(buf, hexDigit[b>>4])
-		buf = append(buf, hexDigit[b&0xF])
-	}
-	return string(buf)
-}
-
-type ipAddr []byte
-
-func (a ipAddr) String() string {
-	if len(a) == 0 {
-		return "<nil>"
-	}
-	if len(a) == 4 {
-		return fmt.Sprintf("%d.%d.%d.%d", a[0], a[1], a[2], a[3])
-	}
-	if len(a) == 16 {
-		return fmt.Sprintf("%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x:%02x%02x", a[0], a[1], a[2], a[3], a[4], a[5], a[6], a[7], a[8], a[9], a[10], a[11], a[12], a[13], a[14], a[15])
-	}
-	s := make([]byte, len(a)*2)
-	for i, tn := range a {
-		s[i*2], s[i*2+1] = hexDigit[tn>>4], hexDigit[tn&0xf]
-	}
-	return string(s)
-}
-
-func (a *LinkAddr) String() string {
-	name := a.Name
-	if name == "" {
-		name = "<nil>"
-	}
-	lla := llAddr(a.Addr).String()
-	if lla == "" {
-		lla = "<nil>"
-	}
-	return fmt.Sprintf("(%v %d %s %s)", addrFamily(a.Family()), a.Index, name, lla)
-}
-
-func (a *Inet4Addr) String() string {
-	return fmt.Sprintf("(%v %v)", addrFamily(a.Family()), ipAddr(a.IP[:]))
-}
-
-func (a *Inet6Addr) String() string {
-	return fmt.Sprintf("(%v %v %d)", addrFamily(a.Family()), ipAddr(a.IP[:]), a.ZoneID)
-}
-
-func (a *DefaultAddr) String() string {
-	return fmt.Sprintf("(%v %s)", addrFamily(a.Family()), ipAddr(a.Raw[2:]).String())
-}
-
-type addrs []Addr
-
-func (as addrs) String() string {
-	var s string
-	for _, a := range as {
-		if a == nil {
-			continue
-		}
-		if len(s) > 0 {
-			s += " "
-		}
-		switch a := a.(type) {
-		case *LinkAddr:
-			s += a.String()
-		case *Inet4Addr:
-			s += a.String()
-		case *Inet6Addr:
-			s += a.String()
-		case *DefaultAddr:
-			s += a.String()
-		}
-	}
-	if s == "" {
-		return "<nil>"
-	}
-	return s
-}
-
-func (as addrs) match(attrs addrAttrs) error {
-	var ts addrAttrs
-	af := sysAF_UNSPEC
-	for i := range as {
-		if as[i] != nil {
-			ts |= 1 << uint(i)
-		}
-		switch as[i].(type) {
-		case *Inet4Addr:
-			if af == sysAF_UNSPEC {
-				af = sysAF_INET
-			}
-			if af != sysAF_INET {
-				return fmt.Errorf("got %v; want %v", addrs(as), addrFamily(af))
-			}
-		case *Inet6Addr:
-			if af == sysAF_UNSPEC {
-				af = sysAF_INET6
-			}
-			if af != sysAF_INET6 {
-				return fmt.Errorf("got %v; want %v", addrs(as), addrFamily(af))
-			}
-		}
-	}
-	if ts != attrs && ts > attrs {
-		return fmt.Errorf("%v not included in %v", ts, attrs)
-	}
-	return nil
-}
-
-func fetchAndParseRIB(af int, typ RIBType) ([]Message, error) {
-	var err error
-	var b []byte
-	for i := 0; i < 3; i++ {
-		if b, err = FetchRIB(af, typ, 0); err != nil {
-			time.Sleep(10 * time.Millisecond)
-			continue
-		}
-		break
-	}
-	if err != nil {
-		return nil, fmt.Errorf("%v %d %v", addrFamily(af), typ, err)
-	}
-	ms, err := ParseRIB(typ, b)
-	if err != nil {
-		return nil, fmt.Errorf("%v %d %v", addrFamily(af), typ, err)
-	}
-	return ms, nil
-}
-
-// propVirtual is a proprietary virtual network interface.
-type propVirtual struct {
-	name         string
-	addr, mask   string
-	setupCmds    []*exec.Cmd
-	teardownCmds []*exec.Cmd
-}
-
-func (pv *propVirtual) setup() error {
-	for _, cmd := range pv.setupCmds {
-		if err := cmd.Run(); err != nil {
-			pv.teardown()
-			return err
-		}
-	}
-	return nil
-}
-
-func (pv *propVirtual) teardown() error {
-	for _, cmd := range pv.teardownCmds {
-		if err := cmd.Run(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (pv *propVirtual) configure(suffix int) error {
-	if runtime.GOOS == "openbsd" {
-		pv.name = fmt.Sprintf("vether%d", suffix)
-	} else {
-		pv.name = fmt.Sprintf("vlan%d", suffix)
-	}
-	xname, err := exec.LookPath("ifconfig")
-	if err != nil {
-		return err
-	}
-	pv.setupCmds = append(pv.setupCmds, &exec.Cmd{
-		Path: xname,
-		Args: []string{"ifconfig", pv.name, "create"},
-	})
-	if runtime.GOOS == "netbsd" {
-		// NetBSD requires an underlying dot1Q-capable network
-		// interface.
-		pv.setupCmds = append(pv.setupCmds, &exec.Cmd{
-			Path: xname,
-			Args: []string{"ifconfig", pv.name, "vlan", fmt.Sprintf("%d", suffix&0xfff), "vlanif", "wm0"},
-		})
-	}
-	pv.setupCmds = append(pv.setupCmds, &exec.Cmd{
-		Path: xname,
-		Args: []string{"ifconfig", pv.name, "inet", pv.addr, "netmask", pv.mask},
-	})
-	pv.teardownCmds = append(pv.teardownCmds, &exec.Cmd{
-		Path: xname,
-		Args: []string{"ifconfig", pv.name, "destroy"},
-	})
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys.go b/installer/vendor/golang.org/x/net/route/sys.go
deleted file mode 100644
index 3d0ee9b148..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import "unsafe"
-
-var (
-	nativeEndian binaryByteOrder
-	kernelAlign  int
-	wireFormats  map[int]*wireFormat
-)
-
-func init() {
-	i := uint32(1)
-	b := (*[4]byte)(unsafe.Pointer(&i))
-	if b[0] == 1 {
-		nativeEndian = littleEndian
-	} else {
-		nativeEndian = bigEndian
-	}
-	kernelAlign, wireFormats = probeRoutingStack()
-}
-
-func roundup(l int) int {
-	if l == 0 {
-		return kernelAlign
-	}
-	return (l + kernelAlign - 1) & ^(kernelAlign - 1)
-}
-
-type wireFormat struct {
-	extOff  int // offset of header extension
-	bodyOff int // offset of message body
-	parse   func(RIBType, []byte) (Message, error)
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys_darwin.go b/installer/vendor/golang.org/x/net/route/sys_darwin.go
deleted file mode 100644
index e742c919db..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys_darwin.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-func (typ RIBType) parseable() bool {
-	switch typ {
-	case sysNET_RT_STAT, sysNET_RT_TRASH:
-		return false
-	default:
-		return true
-	}
-}
-
-// A RouteMetrics represents route metrics.
-type RouteMetrics struct {
-	PathMTU int // path maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *RouteMessage) Sys() []Sys {
-	return []Sys{
-		&RouteMetrics{
-			PathMTU: int(nativeEndian.Uint32(m.raw[m.extOff+4 : m.extOff+8])),
-		},
-	}
-}
-
-// A InterfaceMetrics represents interface metrics.
-type InterfaceMetrics struct {
-	Type int // interface type
-	MTU  int // maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMessage) Sys() []Sys {
-	return []Sys{
-		&InterfaceMetrics{
-			Type: int(m.raw[m.extOff]),
-			MTU:  int(nativeEndian.Uint32(m.raw[m.extOff+8 : m.extOff+12])),
-		},
-	}
-}
-
-func probeRoutingStack() (int, map[int]*wireFormat) {
-	rtm := &wireFormat{extOff: 36, bodyOff: sizeofRtMsghdrDarwin15}
-	rtm.parse = rtm.parseRouteMessage
-	rtm2 := &wireFormat{extOff: 36, bodyOff: sizeofRtMsghdr2Darwin15}
-	rtm2.parse = rtm2.parseRouteMessage
-	ifm := &wireFormat{extOff: 16, bodyOff: sizeofIfMsghdrDarwin15}
-	ifm.parse = ifm.parseInterfaceMessage
-	ifm2 := &wireFormat{extOff: 32, bodyOff: sizeofIfMsghdr2Darwin15}
-	ifm2.parse = ifm2.parseInterfaceMessage
-	ifam := &wireFormat{extOff: sizeofIfaMsghdrDarwin15, bodyOff: sizeofIfaMsghdrDarwin15}
-	ifam.parse = ifam.parseInterfaceAddrMessage
-	ifmam := &wireFormat{extOff: sizeofIfmaMsghdrDarwin15, bodyOff: sizeofIfmaMsghdrDarwin15}
-	ifmam.parse = ifmam.parseInterfaceMulticastAddrMessage
-	ifmam2 := &wireFormat{extOff: sizeofIfmaMsghdr2Darwin15, bodyOff: sizeofIfmaMsghdr2Darwin15}
-	ifmam2.parse = ifmam2.parseInterfaceMulticastAddrMessage
-	// Darwin kernels require 32-bit aligned access to routing facilities.
-	return 4, map[int]*wireFormat{
-		sysRTM_ADD:       rtm,
-		sysRTM_DELETE:    rtm,
-		sysRTM_CHANGE:    rtm,
-		sysRTM_GET:       rtm,
-		sysRTM_LOSING:    rtm,
-		sysRTM_REDIRECT:  rtm,
-		sysRTM_MISS:      rtm,
-		sysRTM_LOCK:      rtm,
-		sysRTM_RESOLVE:   rtm,
-		sysRTM_NEWADDR:   ifam,
-		sysRTM_DELADDR:   ifam,
-		sysRTM_IFINFO:    ifm,
-		sysRTM_NEWMADDR:  ifmam,
-		sysRTM_DELMADDR:  ifmam,
-		sysRTM_IFINFO2:   ifm2,
-		sysRTM_NEWMADDR2: ifmam2,
-		sysRTM_GET2:      rtm2,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys_dragonfly.go b/installer/vendor/golang.org/x/net/route/sys_dragonfly.go
deleted file mode 100644
index b175cb18ce..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys_dragonfly.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import "unsafe"
-
-func (typ RIBType) parseable() bool { return true }
-
-// A RouteMetrics represents route metrics.
-type RouteMetrics struct {
-	PathMTU int // path maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *RouteMessage) Sys() []Sys {
-	return []Sys{
-		&RouteMetrics{
-			PathMTU: int(nativeEndian.Uint64(m.raw[m.extOff+8 : m.extOff+16])),
-		},
-	}
-}
-
-// A InterfaceMetrics represents interface metrics.
-type InterfaceMetrics struct {
-	Type int // interface type
-	MTU  int // maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMessage) Sys() []Sys {
-	return []Sys{
-		&InterfaceMetrics{
-			Type: int(m.raw[m.extOff]),
-			MTU:  int(nativeEndian.Uint32(m.raw[m.extOff+8 : m.extOff+12])),
-		},
-	}
-}
-
-func probeRoutingStack() (int, map[int]*wireFormat) {
-	var p uintptr
-	rtm := &wireFormat{extOff: 40, bodyOff: sizeofRtMsghdrDragonFlyBSD4}
-	rtm.parse = rtm.parseRouteMessage
-	ifm := &wireFormat{extOff: 16, bodyOff: sizeofIfMsghdrDragonFlyBSD4}
-	ifm.parse = ifm.parseInterfaceMessage
-	ifam := &wireFormat{extOff: sizeofIfaMsghdrDragonFlyBSD4, bodyOff: sizeofIfaMsghdrDragonFlyBSD4}
-	ifam.parse = ifam.parseInterfaceAddrMessage
-	ifmam := &wireFormat{extOff: sizeofIfmaMsghdrDragonFlyBSD4, bodyOff: sizeofIfmaMsghdrDragonFlyBSD4}
-	ifmam.parse = ifmam.parseInterfaceMulticastAddrMessage
-	ifanm := &wireFormat{extOff: sizeofIfAnnouncemsghdrDragonFlyBSD4, bodyOff: sizeofIfAnnouncemsghdrDragonFlyBSD4}
-	ifanm.parse = ifanm.parseInterfaceAnnounceMessage
-	return int(unsafe.Sizeof(p)), map[int]*wireFormat{
-		sysRTM_ADD:        rtm,
-		sysRTM_DELETE:     rtm,
-		sysRTM_CHANGE:     rtm,
-		sysRTM_GET:        rtm,
-		sysRTM_LOSING:     rtm,
-		sysRTM_REDIRECT:   rtm,
-		sysRTM_MISS:       rtm,
-		sysRTM_LOCK:       rtm,
-		sysRTM_RESOLVE:    rtm,
-		sysRTM_NEWADDR:    ifam,
-		sysRTM_DELADDR:    ifam,
-		sysRTM_IFINFO:     ifm,
-		sysRTM_NEWMADDR:   ifmam,
-		sysRTM_DELMADDR:   ifmam,
-		sysRTM_IFANNOUNCE: ifanm,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys_freebsd.go b/installer/vendor/golang.org/x/net/route/sys_freebsd.go
deleted file mode 100644
index 010d4ae782..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys_freebsd.go
+++ /dev/null
@@ -1,155 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-func (typ RIBType) parseable() bool { return true }
-
-// A RouteMetrics represents route metrics.
-type RouteMetrics struct {
-	PathMTU int // path maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *RouteMessage) Sys() []Sys {
-	if kernelAlign == 8 {
-		return []Sys{
-			&RouteMetrics{
-				PathMTU: int(nativeEndian.Uint64(m.raw[m.extOff+8 : m.extOff+16])),
-			},
-		}
-	}
-	return []Sys{
-		&RouteMetrics{
-			PathMTU: int(nativeEndian.Uint32(m.raw[m.extOff+4 : m.extOff+8])),
-		},
-	}
-}
-
-// A InterfaceMetrics represents interface metrics.
-type InterfaceMetrics struct {
-	Type int // interface type
-	MTU  int // maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMessage) Sys() []Sys {
-	return []Sys{
-		&InterfaceMetrics{
-			Type: int(m.raw[m.extOff]),
-			MTU:  int(nativeEndian.Uint32(m.raw[m.extOff+8 : m.extOff+12])),
-		},
-	}
-}
-
-func probeRoutingStack() (int, map[int]*wireFormat) {
-	var p uintptr
-	wordSize := int(unsafe.Sizeof(p))
-	align := int(unsafe.Sizeof(p))
-	// In the case of kern.supported_archs="amd64 i386", we need
-	// to know the underlying kernel's architecture because the
-	// alignment for routing facilities are set at the build time
-	// of the kernel.
-	conf, _ := syscall.Sysctl("kern.conftxt")
-	for i, j := 0, 0; j < len(conf); j++ {
-		if conf[j] != '\n' {
-			continue
-		}
-		s := conf[i:j]
-		i = j + 1
-		if len(s) > len("machine") && s[:len("machine")] == "machine" {
-			s = s[len("machine"):]
-			for k := 0; k < len(s); k++ {
-				if s[k] == ' ' || s[k] == '\t' {
-					s = s[1:]
-				}
-				break
-			}
-			if s == "amd64" {
-				align = 8
-			}
-			break
-		}
-	}
-	var rtm, ifm, ifam, ifmam, ifanm *wireFormat
-	if align != wordSize { // 386 emulation on amd64
-		rtm = &wireFormat{extOff: sizeofRtMsghdrFreeBSD10Emu - sizeofRtMetricsFreeBSD10Emu, bodyOff: sizeofRtMsghdrFreeBSD10Emu}
-		ifm = &wireFormat{extOff: 16}
-		ifam = &wireFormat{extOff: sizeofIfaMsghdrFreeBSD10Emu, bodyOff: sizeofIfaMsghdrFreeBSD10Emu}
-		ifmam = &wireFormat{extOff: sizeofIfmaMsghdrFreeBSD10Emu, bodyOff: sizeofIfmaMsghdrFreeBSD10Emu}
-		ifanm = &wireFormat{extOff: sizeofIfAnnouncemsghdrFreeBSD10Emu, bodyOff: sizeofIfAnnouncemsghdrFreeBSD10Emu}
-	} else {
-		rtm = &wireFormat{extOff: sizeofRtMsghdrFreeBSD10 - sizeofRtMetricsFreeBSD10, bodyOff: sizeofRtMsghdrFreeBSD10}
-		ifm = &wireFormat{extOff: 16}
-		ifam = &wireFormat{extOff: sizeofIfaMsghdrFreeBSD10, bodyOff: sizeofIfaMsghdrFreeBSD10}
-		ifmam = &wireFormat{extOff: sizeofIfmaMsghdrFreeBSD10, bodyOff: sizeofIfmaMsghdrFreeBSD10}
-		ifanm = &wireFormat{extOff: sizeofIfAnnouncemsghdrFreeBSD10, bodyOff: sizeofIfAnnouncemsghdrFreeBSD10}
-	}
-	rel, _ := syscall.SysctlUint32("kern.osreldate")
-	switch {
-	case rel < 800000:
-		if align != wordSize { // 386 emulation on amd64
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD7Emu
-		} else {
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD7
-		}
-	case 800000 <= rel && rel < 900000:
-		if align != wordSize { // 386 emulation on amd64
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD8Emu
-		} else {
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD8
-		}
-	case 900000 <= rel && rel < 1000000:
-		if align != wordSize { // 386 emulation on amd64
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD9Emu
-		} else {
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD9
-		}
-	case 1000000 <= rel && rel < 1100000:
-		if align != wordSize { // 386 emulation on amd64
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD10Emu
-		} else {
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD10
-		}
-	default:
-		if align != wordSize { // 386 emulation on amd64
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD11Emu
-		} else {
-			ifm.bodyOff = sizeofIfMsghdrFreeBSD11
-		}
-	}
-	rtm.parse = rtm.parseRouteMessage
-	ifm.parse = ifm.parseInterfaceMessage
-	ifam.parse = ifam.parseInterfaceAddrMessage
-	ifmam.parse = ifmam.parseInterfaceMulticastAddrMessage
-	ifanm.parse = ifanm.parseInterfaceAnnounceMessage
-	return align, map[int]*wireFormat{
-		sysRTM_ADD:        rtm,
-		sysRTM_DELETE:     rtm,
-		sysRTM_CHANGE:     rtm,
-		sysRTM_GET:        rtm,
-		sysRTM_LOSING:     rtm,
-		sysRTM_REDIRECT:   rtm,
-		sysRTM_MISS:       rtm,
-		sysRTM_LOCK:       rtm,
-		sysRTM_RESOLVE:    rtm,
-		sysRTM_NEWADDR:    ifam,
-		sysRTM_DELADDR:    ifam,
-		sysRTM_IFINFO:     ifm,
-		sysRTM_NEWMADDR:   ifmam,
-		sysRTM_DELMADDR:   ifmam,
-		sysRTM_IFANNOUNCE: ifanm,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys_netbsd.go b/installer/vendor/golang.org/x/net/route/sys_netbsd.go
deleted file mode 100644
index b4e3301403..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys_netbsd.go
+++ /dev/null
@@ -1,71 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-func (typ RIBType) parseable() bool { return true }
-
-// A RouteMetrics represents route metrics.
-type RouteMetrics struct {
-	PathMTU int // path maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *RouteMessage) Sys() []Sys {
-	return []Sys{
-		&RouteMetrics{
-			PathMTU: int(nativeEndian.Uint64(m.raw[m.extOff+8 : m.extOff+16])),
-		},
-	}
-}
-
-// A InterfaceMetrics represents interface metrics.
-type InterfaceMetrics struct {
-	Type int // interface type
-	MTU  int // maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMessage) Sys() []Sys {
-	return []Sys{
-		&InterfaceMetrics{
-			Type: int(m.raw[m.extOff]),
-			MTU:  int(nativeEndian.Uint32(m.raw[m.extOff+8 : m.extOff+12])),
-		},
-	}
-}
-
-func probeRoutingStack() (int, map[int]*wireFormat) {
-	rtm := &wireFormat{extOff: 40, bodyOff: sizeofRtMsghdrNetBSD7}
-	rtm.parse = rtm.parseRouteMessage
-	ifm := &wireFormat{extOff: 16, bodyOff: sizeofIfMsghdrNetBSD7}
-	ifm.parse = ifm.parseInterfaceMessage
-	ifam := &wireFormat{extOff: sizeofIfaMsghdrNetBSD7, bodyOff: sizeofIfaMsghdrNetBSD7}
-	ifam.parse = ifam.parseInterfaceAddrMessage
-	ifanm := &wireFormat{extOff: sizeofIfAnnouncemsghdrNetBSD7, bodyOff: sizeofIfAnnouncemsghdrNetBSD7}
-	ifanm.parse = ifanm.parseInterfaceAnnounceMessage
-	// NetBSD 6 and above kernels require 64-bit aligned access to
-	// routing facilities.
-	return 8, map[int]*wireFormat{
-		sysRTM_ADD:        rtm,
-		sysRTM_DELETE:     rtm,
-		sysRTM_CHANGE:     rtm,
-		sysRTM_GET:        rtm,
-		sysRTM_LOSING:     rtm,
-		sysRTM_REDIRECT:   rtm,
-		sysRTM_MISS:       rtm,
-		sysRTM_LOCK:       rtm,
-		sysRTM_RESOLVE:    rtm,
-		sysRTM_NEWADDR:    ifam,
-		sysRTM_DELADDR:    ifam,
-		sysRTM_IFANNOUNCE: ifanm,
-		sysRTM_IFINFO:     ifm,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/sys_openbsd.go b/installer/vendor/golang.org/x/net/route/sys_openbsd.go
deleted file mode 100644
index 8798dc4ca3..0000000000
--- a/installer/vendor/golang.org/x/net/route/sys_openbsd.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package route
-
-import "unsafe"
-
-func (typ RIBType) parseable() bool {
-	switch typ {
-	case sysNET_RT_STATS, sysNET_RT_TABLE:
-		return false
-	default:
-		return true
-	}
-}
-
-// A RouteMetrics represents route metrics.
-type RouteMetrics struct {
-	PathMTU int // path maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (rmx *RouteMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *RouteMessage) Sys() []Sys {
-	return []Sys{
-		&RouteMetrics{
-			PathMTU: int(nativeEndian.Uint32(m.raw[60:64])),
-		},
-	}
-}
-
-// A InterfaceMetrics represents interface metrics.
-type InterfaceMetrics struct {
-	Type int // interface type
-	MTU  int // maximum transmission unit
-}
-
-// SysType implements the SysType method of Sys interface.
-func (imx *InterfaceMetrics) SysType() SysType { return SysMetrics }
-
-// Sys implements the Sys method of Message interface.
-func (m *InterfaceMessage) Sys() []Sys {
-	return []Sys{
-		&InterfaceMetrics{
-			Type: int(m.raw[24]),
-			MTU:  int(nativeEndian.Uint32(m.raw[28:32])),
-		},
-	}
-}
-
-func probeRoutingStack() (int, map[int]*wireFormat) {
-	var p uintptr
-	rtm := &wireFormat{extOff: -1, bodyOff: -1}
-	rtm.parse = rtm.parseRouteMessage
-	ifm := &wireFormat{extOff: -1, bodyOff: -1}
-	ifm.parse = ifm.parseInterfaceMessage
-	ifam := &wireFormat{extOff: -1, bodyOff: -1}
-	ifam.parse = ifam.parseInterfaceAddrMessage
-	ifanm := &wireFormat{extOff: -1, bodyOff: -1}
-	ifanm.parse = ifanm.parseInterfaceAnnounceMessage
-	return int(unsafe.Sizeof(p)), map[int]*wireFormat{
-		sysRTM_ADD:        rtm,
-		sysRTM_DELETE:     rtm,
-		sysRTM_CHANGE:     rtm,
-		sysRTM_GET:        rtm,
-		sysRTM_LOSING:     rtm,
-		sysRTM_REDIRECT:   rtm,
-		sysRTM_MISS:       rtm,
-		sysRTM_LOCK:       rtm,
-		sysRTM_RESOLVE:    rtm,
-		sysRTM_NEWADDR:    ifam,
-		sysRTM_DELADDR:    ifam,
-		sysRTM_IFINFO:     ifm,
-		sysRTM_IFANNOUNCE: ifanm,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/route/syscall.go b/installer/vendor/golang.org/x/net/route/syscall.go
deleted file mode 100644
index c211188b10..0000000000
--- a/installer/vendor/golang.org/x/net/route/syscall.go
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd netbsd openbsd
-
-package route
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var zero uintptr
-
-func sysctl(mib []int32, old *byte, oldlen *uintptr, new *byte, newlen uintptr) error {
-	var p unsafe.Pointer
-	if len(mib) > 0 {
-		p = unsafe.Pointer(&mib[0])
-	} else {
-		p = unsafe.Pointer(&zero)
-	}
-	_, _, errno := syscall.Syscall6(syscall.SYS___SYSCTL, uintptr(p), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
-	if errno != 0 {
-		return error(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/route/zsys_darwin.go b/installer/vendor/golang.org/x/net/route/zsys_darwin.go
deleted file mode 100644
index 4e2e1ab090..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_darwin.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_darwin.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x1e
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP    = 0x1
-	sysNET_RT_FLAGS   = 0x2
-	sysNET_RT_IFLIST  = 0x3
-	sysNET_RT_STAT    = 0x4
-	sysNET_RT_TRASH   = 0x5
-	sysNET_RT_IFLIST2 = 0x6
-	sysNET_RT_DUMP2   = 0x7
-	sysNET_RT_MAXID   = 0xa
-)
-
-const (
-	sysCTL_MAXNAME = 0xc
-
-	sysCTL_UNSPEC  = 0x0
-	sysCTL_KERN    = 0x1
-	sysCTL_VM      = 0x2
-	sysCTL_VFS     = 0x3
-	sysCTL_NET     = 0x4
-	sysCTL_DEBUG   = 0x5
-	sysCTL_HW      = 0x6
-	sysCTL_MACHDEP = 0x7
-	sysCTL_USER    = 0x8
-	sysCTL_MAXID   = 0x9
-)
-
-const (
-	sysRTM_VERSION = 0x5
-
-	sysRTM_ADD       = 0x1
-	sysRTM_DELETE    = 0x2
-	sysRTM_CHANGE    = 0x3
-	sysRTM_GET       = 0x4
-	sysRTM_LOSING    = 0x5
-	sysRTM_REDIRECT  = 0x6
-	sysRTM_MISS      = 0x7
-	sysRTM_LOCK      = 0x8
-	sysRTM_OLDADD    = 0x9
-	sysRTM_OLDDEL    = 0xa
-	sysRTM_RESOLVE   = 0xb
-	sysRTM_NEWADDR   = 0xc
-	sysRTM_DELADDR   = 0xd
-	sysRTM_IFINFO    = 0xe
-	sysRTM_NEWMADDR  = 0xf
-	sysRTM_DELMADDR  = 0x10
-	sysRTM_IFINFO2   = 0x12
-	sysRTM_NEWMADDR2 = 0x13
-	sysRTM_GET2      = 0x14
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_MAX     = 0x8
-)
-
-const (
-	sizeofIfMsghdrDarwin15    = 0x70
-	sizeofIfaMsghdrDarwin15   = 0x14
-	sizeofIfmaMsghdrDarwin15  = 0x10
-	sizeofIfMsghdr2Darwin15   = 0xa0
-	sizeofIfmaMsghdr2Darwin15 = 0x14
-	sizeofIfDataDarwin15      = 0x60
-	sizeofIfData64Darwin15    = 0x80
-
-	sizeofRtMsghdrDarwin15  = 0x5c
-	sizeofRtMsghdr2Darwin15 = 0x5c
-	sizeofRtMetricsDarwin15 = 0x38
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_dragonfly.go b/installer/vendor/golang.org/x/net/route/zsys_dragonfly.go
deleted file mode 100644
index 719c88d11f..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_dragonfly.go
+++ /dev/null
@@ -1,98 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_dragonfly.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x1c
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP   = 0x1
-	sysNET_RT_FLAGS  = 0x2
-	sysNET_RT_IFLIST = 0x3
-	sysNET_RT_MAXID  = 0x4
-)
-
-const (
-	sysCTL_MAXNAME = 0xc
-
-	sysCTL_UNSPEC   = 0x0
-	sysCTL_KERN     = 0x1
-	sysCTL_VM       = 0x2
-	sysCTL_VFS      = 0x3
-	sysCTL_NET      = 0x4
-	sysCTL_DEBUG    = 0x5
-	sysCTL_HW       = 0x6
-	sysCTL_MACHDEP  = 0x7
-	sysCTL_USER     = 0x8
-	sysCTL_P1003_1B = 0x9
-	sysCTL_LWKT     = 0xa
-	sysCTL_MAXID    = 0xb
-)
-
-const (
-	sysRTM_VERSION = 0x6
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_OLDADD     = 0x9
-	sysRTM_OLDDEL     = 0xa
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFINFO     = 0xe
-	sysRTM_NEWMADDR   = 0xf
-	sysRTM_DELMADDR   = 0x10
-	sysRTM_IFANNOUNCE = 0x11
-	sysRTM_IEEE80211  = 0x12
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-	sysRTA_MPLS1   = 0x100
-	sysRTA_MPLS2   = 0x200
-	sysRTA_MPLS3   = 0x400
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_MPLS1   = 0x8
-	sysRTAX_MPLS2   = 0x9
-	sysRTAX_MPLS3   = 0xa
-	sysRTAX_MAX     = 0xb
-)
-
-const (
-	sizeofIfMsghdrDragonFlyBSD4         = 0xb0
-	sizeofIfaMsghdrDragonFlyBSD4        = 0x14
-	sizeofIfmaMsghdrDragonFlyBSD4       = 0x10
-	sizeofIfAnnouncemsghdrDragonFlyBSD4 = 0x18
-
-	sizeofRtMsghdrDragonFlyBSD4  = 0x98
-	sizeofRtMetricsDragonFlyBSD4 = 0x70
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_freebsd_386.go b/installer/vendor/golang.org/x/net/route/zsys_freebsd_386.go
deleted file mode 100644
index b03bc01f65..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_freebsd_386.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x1c
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP     = 0x1
-	sysNET_RT_FLAGS    = 0x2
-	sysNET_RT_IFLIST   = 0x3
-	sysNET_RT_IFMALIST = 0x4
-	sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-	sysCTL_MAXNAME = 0x18
-
-	sysCTL_UNSPEC   = 0x0
-	sysCTL_KERN     = 0x1
-	sysCTL_VM       = 0x2
-	sysCTL_VFS      = 0x3
-	sysCTL_NET      = 0x4
-	sysCTL_DEBUG    = 0x5
-	sysCTL_HW       = 0x6
-	sysCTL_MACHDEP  = 0x7
-	sysCTL_USER     = 0x8
-	sysCTL_P1003_1B = 0x9
-)
-
-const (
-	sysRTM_VERSION = 0x5
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFINFO     = 0xe
-	sysRTM_NEWMADDR   = 0xf
-	sysRTM_DELMADDR   = 0x10
-	sysRTM_IFANNOUNCE = 0x11
-	sysRTM_IEEE80211  = 0x12
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_MAX     = 0x8
-)
-
-const (
-	sizeofIfMsghdrlFreeBSD10        = 0x68
-	sizeofIfaMsghdrFreeBSD10        = 0x14
-	sizeofIfaMsghdrlFreeBSD10       = 0x6c
-	sizeofIfmaMsghdrFreeBSD10       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10 = 0x18
-
-	sizeofRtMsghdrFreeBSD10  = 0x5c
-	sizeofRtMetricsFreeBSD10 = 0x38
-
-	sizeofIfMsghdrFreeBSD7  = 0x60
-	sizeofIfMsghdrFreeBSD8  = 0x60
-	sizeofIfMsghdrFreeBSD9  = 0x60
-	sizeofIfMsghdrFreeBSD10 = 0x64
-	sizeofIfMsghdrFreeBSD11 = 0xa8
-
-	sizeofIfDataFreeBSD7  = 0x50
-	sizeofIfDataFreeBSD8  = 0x50
-	sizeofIfDataFreeBSD9  = 0x50
-	sizeofIfDataFreeBSD10 = 0x54
-	sizeofIfDataFreeBSD11 = 0x98
-
-	// MODIFIED BY HAND FOR 386 EMULATION ON AMD64
-	// 386 EMULATION USES THE UNDERLYING RAW DATA LAYOUT
-
-	sizeofIfMsghdrlFreeBSD10Emu        = 0xb0
-	sizeofIfaMsghdrFreeBSD10Emu        = 0x14
-	sizeofIfaMsghdrlFreeBSD10Emu       = 0xb0
-	sizeofIfmaMsghdrFreeBSD10Emu       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10Emu = 0x18
-
-	sizeofRtMsghdrFreeBSD10Emu  = 0x98
-	sizeofRtMetricsFreeBSD10Emu = 0x70
-
-	sizeofIfMsghdrFreeBSD7Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD8Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD9Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD10Emu = 0xa8
-	sizeofIfMsghdrFreeBSD11Emu = 0xa8
-
-	sizeofIfDataFreeBSD7Emu  = 0x98
-	sizeofIfDataFreeBSD8Emu  = 0x98
-	sizeofIfDataFreeBSD9Emu  = 0x98
-	sizeofIfDataFreeBSD10Emu = 0x98
-	sizeofIfDataFreeBSD11Emu = 0x98
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go b/installer/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go
deleted file mode 100644
index 0b675b3d3f..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_freebsd_amd64.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x1c
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP     = 0x1
-	sysNET_RT_FLAGS    = 0x2
-	sysNET_RT_IFLIST   = 0x3
-	sysNET_RT_IFMALIST = 0x4
-	sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-	sysCTL_MAXNAME = 0x18
-
-	sysCTL_UNSPEC   = 0x0
-	sysCTL_KERN     = 0x1
-	sysCTL_VM       = 0x2
-	sysCTL_VFS      = 0x3
-	sysCTL_NET      = 0x4
-	sysCTL_DEBUG    = 0x5
-	sysCTL_HW       = 0x6
-	sysCTL_MACHDEP  = 0x7
-	sysCTL_USER     = 0x8
-	sysCTL_P1003_1B = 0x9
-)
-
-const (
-	sysRTM_VERSION = 0x5
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFINFO     = 0xe
-	sysRTM_NEWMADDR   = 0xf
-	sysRTM_DELMADDR   = 0x10
-	sysRTM_IFANNOUNCE = 0x11
-	sysRTM_IEEE80211  = 0x12
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_MAX     = 0x8
-)
-
-const (
-	sizeofIfMsghdrlFreeBSD10        = 0xb0
-	sizeofIfaMsghdrFreeBSD10        = 0x14
-	sizeofIfaMsghdrlFreeBSD10       = 0xb0
-	sizeofIfmaMsghdrFreeBSD10       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10 = 0x18
-
-	sizeofRtMsghdrFreeBSD10  = 0x98
-	sizeofRtMetricsFreeBSD10 = 0x70
-
-	sizeofIfMsghdrFreeBSD7  = 0xa8
-	sizeofIfMsghdrFreeBSD8  = 0xa8
-	sizeofIfMsghdrFreeBSD9  = 0xa8
-	sizeofIfMsghdrFreeBSD10 = 0xa8
-	sizeofIfMsghdrFreeBSD11 = 0xa8
-
-	sizeofIfDataFreeBSD7  = 0x98
-	sizeofIfDataFreeBSD8  = 0x98
-	sizeofIfDataFreeBSD9  = 0x98
-	sizeofIfDataFreeBSD10 = 0x98
-	sizeofIfDataFreeBSD11 = 0x98
-
-	sizeofIfMsghdrlFreeBSD10Emu        = 0xb0
-	sizeofIfaMsghdrFreeBSD10Emu        = 0x14
-	sizeofIfaMsghdrlFreeBSD10Emu       = 0xb0
-	sizeofIfmaMsghdrFreeBSD10Emu       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10Emu = 0x18
-
-	sizeofRtMsghdrFreeBSD10Emu  = 0x98
-	sizeofRtMetricsFreeBSD10Emu = 0x70
-
-	sizeofIfMsghdrFreeBSD7Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD8Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD9Emu  = 0xa8
-	sizeofIfMsghdrFreeBSD10Emu = 0xa8
-	sizeofIfMsghdrFreeBSD11Emu = 0xa8
-
-	sizeofIfDataFreeBSD7Emu  = 0x98
-	sizeofIfDataFreeBSD8Emu  = 0x98
-	sizeofIfDataFreeBSD9Emu  = 0x98
-	sizeofIfDataFreeBSD10Emu = 0x98
-	sizeofIfDataFreeBSD11Emu = 0x98
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_freebsd_arm.go b/installer/vendor/golang.org/x/net/route/zsys_freebsd_arm.go
deleted file mode 100644
index 58f8ea16f2..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_freebsd_arm.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_freebsd.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x1c
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP     = 0x1
-	sysNET_RT_FLAGS    = 0x2
-	sysNET_RT_IFLIST   = 0x3
-	sysNET_RT_IFMALIST = 0x4
-	sysNET_RT_IFLISTL  = 0x5
-)
-
-const (
-	sysCTL_MAXNAME = 0x18
-
-	sysCTL_UNSPEC   = 0x0
-	sysCTL_KERN     = 0x1
-	sysCTL_VM       = 0x2
-	sysCTL_VFS      = 0x3
-	sysCTL_NET      = 0x4
-	sysCTL_DEBUG    = 0x5
-	sysCTL_HW       = 0x6
-	sysCTL_MACHDEP  = 0x7
-	sysCTL_USER     = 0x8
-	sysCTL_P1003_1B = 0x9
-)
-
-const (
-	sysRTM_VERSION = 0x5
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFINFO     = 0xe
-	sysRTM_NEWMADDR   = 0xf
-	sysRTM_DELMADDR   = 0x10
-	sysRTM_IFANNOUNCE = 0x11
-	sysRTM_IEEE80211  = 0x12
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_MAX     = 0x8
-)
-
-const (
-	sizeofIfMsghdrlFreeBSD10        = 0x68
-	sizeofIfaMsghdrFreeBSD10        = 0x14
-	sizeofIfaMsghdrlFreeBSD10       = 0x6c
-	sizeofIfmaMsghdrFreeBSD10       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10 = 0x18
-
-	sizeofRtMsghdrFreeBSD10  = 0x5c
-	sizeofRtMetricsFreeBSD10 = 0x38
-
-	sizeofIfMsghdrFreeBSD7  = 0x70
-	sizeofIfMsghdrFreeBSD8  = 0x70
-	sizeofIfMsghdrFreeBSD9  = 0x70
-	sizeofIfMsghdrFreeBSD10 = 0x70
-	sizeofIfMsghdrFreeBSD11 = 0xa8
-
-	sizeofIfDataFreeBSD7  = 0x60
-	sizeofIfDataFreeBSD8  = 0x60
-	sizeofIfDataFreeBSD9  = 0x60
-	sizeofIfDataFreeBSD10 = 0x60
-	sizeofIfDataFreeBSD11 = 0x98
-
-	sizeofIfMsghdrlFreeBSD10Emu        = 0x68
-	sizeofIfaMsghdrFreeBSD10Emu        = 0x14
-	sizeofIfaMsghdrlFreeBSD10Emu       = 0x6c
-	sizeofIfmaMsghdrFreeBSD10Emu       = 0x10
-	sizeofIfAnnouncemsghdrFreeBSD10Emu = 0x18
-
-	sizeofRtMsghdrFreeBSD10Emu  = 0x5c
-	sizeofRtMetricsFreeBSD10Emu = 0x38
-
-	sizeofIfMsghdrFreeBSD7Emu  = 0x70
-	sizeofIfMsghdrFreeBSD8Emu  = 0x70
-	sizeofIfMsghdrFreeBSD9Emu  = 0x70
-	sizeofIfMsghdrFreeBSD10Emu = 0x70
-	sizeofIfMsghdrFreeBSD11Emu = 0xa8
-
-	sizeofIfDataFreeBSD7Emu  = 0x60
-	sizeofIfDataFreeBSD8Emu  = 0x60
-	sizeofIfDataFreeBSD9Emu  = 0x60
-	sizeofIfDataFreeBSD10Emu = 0x60
-	sizeofIfDataFreeBSD11Emu = 0x98
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_netbsd.go b/installer/vendor/golang.org/x/net/route/zsys_netbsd.go
deleted file mode 100644
index e0df45e8b5..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_netbsd.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_netbsd.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x22
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x18
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP   = 0x1
-	sysNET_RT_FLAGS  = 0x2
-	sysNET_RT_IFLIST = 0x5
-	sysNET_RT_MAXID  = 0x6
-)
-
-const (
-	sysCTL_MAXNAME = 0xc
-
-	sysCTL_UNSPEC   = 0x0
-	sysCTL_KERN     = 0x1
-	sysCTL_VM       = 0x2
-	sysCTL_VFS      = 0x3
-	sysCTL_NET      = 0x4
-	sysCTL_DEBUG    = 0x5
-	sysCTL_HW       = 0x6
-	sysCTL_MACHDEP  = 0x7
-	sysCTL_USER     = 0x8
-	sysCTL_DDB      = 0x9
-	sysCTL_PROC     = 0xa
-	sysCTL_VENDOR   = 0xb
-	sysCTL_EMUL     = 0xc
-	sysCTL_SECURITY = 0xd
-	sysCTL_MAXID    = 0xe
-)
-
-const (
-	sysRTM_VERSION = 0x4
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_OLDADD     = 0x9
-	sysRTM_OLDDEL     = 0xa
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFANNOUNCE = 0x10
-	sysRTM_IEEE80211  = 0x11
-	sysRTM_SETGATE    = 0x12
-	sysRTM_LLINFO_UPD = 0x13
-	sysRTM_IFINFO     = 0x14
-	sysRTM_CHGADDR    = 0x15
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-	sysRTA_TAG     = 0x100
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_TAG     = 0x8
-	sysRTAX_MAX     = 0x9
-)
-
-const (
-	sizeofIfMsghdrNetBSD7         = 0x98
-	sizeofIfaMsghdrNetBSD7        = 0x18
-	sizeofIfAnnouncemsghdrNetBSD7 = 0x18
-
-	sizeofRtMsghdrNetBSD7  = 0x78
-	sizeofRtMetricsNetBSD7 = 0x50
-
-	sizeofSockaddrStorage = 0x80
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/route/zsys_openbsd.go b/installer/vendor/golang.org/x/net/route/zsys_openbsd.go
deleted file mode 100644
index f5a1ff9673..0000000000
--- a/installer/vendor/golang.org/x/net/route/zsys_openbsd.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs defs_openbsd.go
-
-package route
-
-const (
-	sysAF_UNSPEC = 0x0
-	sysAF_INET   = 0x2
-	sysAF_ROUTE  = 0x11
-	sysAF_LINK   = 0x12
-	sysAF_INET6  = 0x18
-
-	sysSOCK_RAW = 0x3
-
-	sysNET_RT_DUMP    = 0x1
-	sysNET_RT_FLAGS   = 0x2
-	sysNET_RT_IFLIST  = 0x3
-	sysNET_RT_STATS   = 0x4
-	sysNET_RT_TABLE   = 0x5
-	sysNET_RT_IFNAMES = 0x6
-	sysNET_RT_MAXID   = 0x7
-)
-
-const (
-	sysCTL_MAXNAME = 0xc
-
-	sysCTL_UNSPEC  = 0x0
-	sysCTL_KERN    = 0x1
-	sysCTL_VM      = 0x2
-	sysCTL_FS      = 0x3
-	sysCTL_NET     = 0x4
-	sysCTL_DEBUG   = 0x5
-	sysCTL_HW      = 0x6
-	sysCTL_MACHDEP = 0x7
-	sysCTL_DDB     = 0x9
-	sysCTL_VFS     = 0xa
-	sysCTL_MAXID   = 0xb
-)
-
-const (
-	sysRTM_VERSION = 0x5
-
-	sysRTM_ADD        = 0x1
-	sysRTM_DELETE     = 0x2
-	sysRTM_CHANGE     = 0x3
-	sysRTM_GET        = 0x4
-	sysRTM_LOSING     = 0x5
-	sysRTM_REDIRECT   = 0x6
-	sysRTM_MISS       = 0x7
-	sysRTM_LOCK       = 0x8
-	sysRTM_RESOLVE    = 0xb
-	sysRTM_NEWADDR    = 0xc
-	sysRTM_DELADDR    = 0xd
-	sysRTM_IFINFO     = 0xe
-	sysRTM_IFANNOUNCE = 0xf
-	sysRTM_DESYNC     = 0x10
-
-	sysRTA_DST     = 0x1
-	sysRTA_GATEWAY = 0x2
-	sysRTA_NETMASK = 0x4
-	sysRTA_GENMASK = 0x8
-	sysRTA_IFP     = 0x10
-	sysRTA_IFA     = 0x20
-	sysRTA_AUTHOR  = 0x40
-	sysRTA_BRD     = 0x80
-	sysRTA_SRC     = 0x100
-	sysRTA_SRCMASK = 0x200
-	sysRTA_LABEL   = 0x400
-
-	sysRTAX_DST     = 0x0
-	sysRTAX_GATEWAY = 0x1
-	sysRTAX_NETMASK = 0x2
-	sysRTAX_GENMASK = 0x3
-	sysRTAX_IFP     = 0x4
-	sysRTAX_IFA     = 0x5
-	sysRTAX_AUTHOR  = 0x6
-	sysRTAX_BRD     = 0x7
-	sysRTAX_SRC     = 0x8
-	sysRTAX_SRCMASK = 0x9
-	sysRTAX_LABEL   = 0xa
-	sysRTAX_MAX     = 0xb
-)
-
-const (
-	sizeofRtMsghdr = 0x60
-
-	sizeofSockaddrStorage = 0x100
-	sizeofSockaddrInet    = 0x10
-	sizeofSockaddrInet6   = 0x1c
-)
diff --git a/installer/vendor/golang.org/x/net/trace/events.go b/installer/vendor/golang.org/x/net/trace/events.go
deleted file mode 100644
index d8daec1a79..0000000000
--- a/installer/vendor/golang.org/x/net/trace/events.go
+++ /dev/null
@@ -1,532 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"io"
-	"log"
-	"net/http"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"sync/atomic"
-	"text/tabwriter"
-	"time"
-)
-
-const maxEventsPerLog = 100
-
-type bucket struct {
-	MaxErrAge time.Duration
-	String    string
-}
-
-var buckets = []bucket{
-	{0, "total"},
-	{10 * time.Second, "errs<10s"},
-	{1 * time.Minute, "errs<1m"},
-	{10 * time.Minute, "errs<10m"},
-	{1 * time.Hour, "errs<1h"},
-	{10 * time.Hour, "errs<10h"},
-	{24000 * time.Hour, "errors"},
-}
-
-// RenderEvents renders the HTML page typically served at /debug/events.
-// It does not do any auth checking; see AuthRequest for the default auth check
-// used by the handler registered on http.DefaultServeMux.
-// req may be nil.
-func RenderEvents(w http.ResponseWriter, req *http.Request, sensitive bool) {
-	now := time.Now()
-	data := &struct {
-		Families []string // family names
-		Buckets  []bucket
-		Counts   [][]int // eventLog count per family/bucket
-
-		// Set when a bucket has been selected.
-		Family    string
-		Bucket    int
-		EventLogs eventLogs
-		Expanded  bool
-	}{
-		Buckets: buckets,
-	}
-
-	data.Families = make([]string, 0, len(families))
-	famMu.RLock()
-	for name := range families {
-		data.Families = append(data.Families, name)
-	}
-	famMu.RUnlock()
-	sort.Strings(data.Families)
-
-	// Count the number of eventLogs in each family for each error age.
-	data.Counts = make([][]int, len(data.Families))
-	for i, name := range data.Families {
-		// TODO(sameer): move this loop under the family lock.
-		f := getEventFamily(name)
-		data.Counts[i] = make([]int, len(data.Buckets))
-		for j, b := range data.Buckets {
-			data.Counts[i][j] = f.Count(now, b.MaxErrAge)
-		}
-	}
-
-	if req != nil {
-		var ok bool
-		data.Family, data.Bucket, ok = parseEventsArgs(req)
-		if !ok {
-			// No-op
-		} else {
-			data.EventLogs = getEventFamily(data.Family).Copy(now, buckets[data.Bucket].MaxErrAge)
-		}
-		if data.EventLogs != nil {
-			defer data.EventLogs.Free()
-			sort.Sort(data.EventLogs)
-		}
-		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
-			data.Expanded = exp
-		}
-	}
-
-	famMu.RLock()
-	defer famMu.RUnlock()
-	if err := eventsTmpl().Execute(w, data); err != nil {
-		log.Printf("net/trace: Failed executing template: %v", err)
-	}
-}
-
-func parseEventsArgs(req *http.Request) (fam string, b int, ok bool) {
-	fam, bStr := req.FormValue("fam"), req.FormValue("b")
-	if fam == "" || bStr == "" {
-		return "", 0, false
-	}
-	b, err := strconv.Atoi(bStr)
-	if err != nil || b < 0 || b >= len(buckets) {
-		return "", 0, false
-	}
-	return fam, b, true
-}
-
-// An EventLog provides a log of events associated with a specific object.
-type EventLog interface {
-	// Printf formats its arguments with fmt.Sprintf and adds the
-	// result to the event log.
-	Printf(format string, a ...interface{})
-
-	// Errorf is like Printf, but it marks this event as an error.
-	Errorf(format string, a ...interface{})
-
-	// Finish declares that this event log is complete.
-	// The event log should not be used after calling this method.
-	Finish()
-}
-
-// NewEventLog returns a new EventLog with the specified family name
-// and title.
-func NewEventLog(family, title string) EventLog {
-	el := newEventLog()
-	el.ref()
-	el.Family, el.Title = family, title
-	el.Start = time.Now()
-	el.events = make([]logEntry, 0, maxEventsPerLog)
-	el.stack = make([]uintptr, 32)
-	n := runtime.Callers(2, el.stack)
-	el.stack = el.stack[:n]
-
-	getEventFamily(family).add(el)
-	return el
-}
-
-func (el *eventLog) Finish() {
-	getEventFamily(el.Family).remove(el)
-	el.unref() // matches ref in New
-}
-
-var (
-	famMu    sync.RWMutex
-	families = make(map[string]*eventFamily) // family name => family
-)
-
-func getEventFamily(fam string) *eventFamily {
-	famMu.Lock()
-	defer famMu.Unlock()
-	f := families[fam]
-	if f == nil {
-		f = &eventFamily{}
-		families[fam] = f
-	}
-	return f
-}
-
-type eventFamily struct {
-	mu        sync.RWMutex
-	eventLogs eventLogs
-}
-
-func (f *eventFamily) add(el *eventLog) {
-	f.mu.Lock()
-	f.eventLogs = append(f.eventLogs, el)
-	f.mu.Unlock()
-}
-
-func (f *eventFamily) remove(el *eventLog) {
-	f.mu.Lock()
-	defer f.mu.Unlock()
-	for i, el0 := range f.eventLogs {
-		if el == el0 {
-			copy(f.eventLogs[i:], f.eventLogs[i+1:])
-			f.eventLogs = f.eventLogs[:len(f.eventLogs)-1]
-			return
-		}
-	}
-}
-
-func (f *eventFamily) Count(now time.Time, maxErrAge time.Duration) (n int) {
-	f.mu.RLock()
-	defer f.mu.RUnlock()
-	for _, el := range f.eventLogs {
-		if el.hasRecentError(now, maxErrAge) {
-			n++
-		}
-	}
-	return
-}
-
-func (f *eventFamily) Copy(now time.Time, maxErrAge time.Duration) (els eventLogs) {
-	f.mu.RLock()
-	defer f.mu.RUnlock()
-	els = make(eventLogs, 0, len(f.eventLogs))
-	for _, el := range f.eventLogs {
-		if el.hasRecentError(now, maxErrAge) {
-			el.ref()
-			els = append(els, el)
-		}
-	}
-	return
-}
-
-type eventLogs []*eventLog
-
-// Free calls unref on each element of the list.
-func (els eventLogs) Free() {
-	for _, el := range els {
-		el.unref()
-	}
-}
-
-// eventLogs may be sorted in reverse chronological order.
-func (els eventLogs) Len() int           { return len(els) }
-func (els eventLogs) Less(i, j int) bool { return els[i].Start.After(els[j].Start) }
-func (els eventLogs) Swap(i, j int)      { els[i], els[j] = els[j], els[i] }
-
-// A logEntry is a timestamped log entry in an event log.
-type logEntry struct {
-	When    time.Time
-	Elapsed time.Duration // since previous event in log
-	NewDay  bool          // whether this event is on a different day to the previous event
-	What    string
-	IsErr   bool
-}
-
-// WhenString returns a string representation of the elapsed time of the event.
-// It will include the date if midnight was crossed.
-func (e logEntry) WhenString() string {
-	if e.NewDay {
-		return e.When.Format("2006/01/02 15:04:05.000000")
-	}
-	return e.When.Format("15:04:05.000000")
-}
-
-// An eventLog represents an active event log.
-type eventLog struct {
-	// Family is the top-level grouping of event logs to which this belongs.
-	Family string
-
-	// Title is the title of this event log.
-	Title string
-
-	// Timing information.
-	Start time.Time
-
-	// Call stack where this event log was created.
-	stack []uintptr
-
-	// Append-only sequence of events.
-	//
-	// TODO(sameer): change this to a ring buffer to avoid the array copy
-	// when we hit maxEventsPerLog.
-	mu            sync.RWMutex
-	events        []logEntry
-	LastErrorTime time.Time
-	discarded     int
-
-	refs int32 // how many buckets this is in
-}
-
-func (el *eventLog) reset() {
-	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
-	el.Family = ""
-	el.Title = ""
-	el.Start = time.Time{}
-	el.stack = nil
-	el.events = nil
-	el.LastErrorTime = time.Time{}
-	el.discarded = 0
-	el.refs = 0
-}
-
-func (el *eventLog) hasRecentError(now time.Time, maxErrAge time.Duration) bool {
-	if maxErrAge == 0 {
-		return true
-	}
-	el.mu.RLock()
-	defer el.mu.RUnlock()
-	return now.Sub(el.LastErrorTime) < maxErrAge
-}
-
-// delta returns the elapsed time since the last event or the log start,
-// and whether it spans midnight.
-// L >= el.mu
-func (el *eventLog) delta(t time.Time) (time.Duration, bool) {
-	if len(el.events) == 0 {
-		return t.Sub(el.Start), false
-	}
-	prev := el.events[len(el.events)-1].When
-	return t.Sub(prev), prev.Day() != t.Day()
-
-}
-
-func (el *eventLog) Printf(format string, a ...interface{}) {
-	el.printf(false, format, a...)
-}
-
-func (el *eventLog) Errorf(format string, a ...interface{}) {
-	el.printf(true, format, a...)
-}
-
-func (el *eventLog) printf(isErr bool, format string, a ...interface{}) {
-	e := logEntry{When: time.Now(), IsErr: isErr, What: fmt.Sprintf(format, a...)}
-	el.mu.Lock()
-	e.Elapsed, e.NewDay = el.delta(e.When)
-	if len(el.events) < maxEventsPerLog {
-		el.events = append(el.events, e)
-	} else {
-		// Discard the oldest event.
-		if el.discarded == 0 {
-			// el.discarded starts at two to count for the event it
-			// is replacing, plus the next one that we are about to
-			// drop.
-			el.discarded = 2
-		} else {
-			el.discarded++
-		}
-		// TODO(sameer): if this causes allocations on a critical path,
-		// change eventLog.What to be a fmt.Stringer, as in trace.go.
-		el.events[0].What = fmt.Sprintf("(%d events discarded)", el.discarded)
-		// The timestamp of the discarded meta-event should be
-		// the time of the last event it is representing.
-		el.events[0].When = el.events[1].When
-		copy(el.events[1:], el.events[2:])
-		el.events[maxEventsPerLog-1] = e
-	}
-	if e.IsErr {
-		el.LastErrorTime = e.When
-	}
-	el.mu.Unlock()
-}
-
-func (el *eventLog) ref() {
-	atomic.AddInt32(&el.refs, 1)
-}
-
-func (el *eventLog) unref() {
-	if atomic.AddInt32(&el.refs, -1) == 0 {
-		freeEventLog(el)
-	}
-}
-
-func (el *eventLog) When() string {
-	return el.Start.Format("2006/01/02 15:04:05.000000")
-}
-
-func (el *eventLog) ElapsedTime() string {
-	elapsed := time.Since(el.Start)
-	return fmt.Sprintf("%.6f", elapsed.Seconds())
-}
-
-func (el *eventLog) Stack() string {
-	buf := new(bytes.Buffer)
-	tw := tabwriter.NewWriter(buf, 1, 8, 1, '\t', 0)
-	printStackRecord(tw, el.stack)
-	tw.Flush()
-	return buf.String()
-}
-
-// printStackRecord prints the function + source line information
-// for a single stack trace.
-// Adapted from runtime/pprof/pprof.go.
-func printStackRecord(w io.Writer, stk []uintptr) {
-	for _, pc := range stk {
-		f := runtime.FuncForPC(pc)
-		if f == nil {
-			continue
-		}
-		file, line := f.FileLine(pc)
-		name := f.Name()
-		// Hide runtime.goexit and any runtime functions at the beginning.
-		if strings.HasPrefix(name, "runtime.") {
-			continue
-		}
-		fmt.Fprintf(w, "#   %s\t%s:%d\n", name, file, line)
-	}
-}
-
-func (el *eventLog) Events() []logEntry {
-	el.mu.RLock()
-	defer el.mu.RUnlock()
-	return el.events
-}
-
-// freeEventLogs is a freelist of *eventLog
-var freeEventLogs = make(chan *eventLog, 1000)
-
-// newEventLog returns a event log ready to use.
-func newEventLog() *eventLog {
-	select {
-	case el := <-freeEventLogs:
-		return el
-	default:
-		return new(eventLog)
-	}
-}
-
-// freeEventLog adds el to freeEventLogs if there's room.
-// This is non-blocking.
-func freeEventLog(el *eventLog) {
-	el.reset()
-	select {
-	case freeEventLogs <- el:
-	default:
-	}
-}
-
-var eventsTmplCache *template.Template
-var eventsTmplOnce sync.Once
-
-func eventsTmpl() *template.Template {
-	eventsTmplOnce.Do(func() {
-		eventsTmplCache = template.Must(template.New("events").Funcs(template.FuncMap{
-			"elapsed":   elapsed,
-			"trimSpace": strings.TrimSpace,
-		}).Parse(eventsHTML))
-	})
-	return eventsTmplCache
-}
-
-const eventsHTML = `
-<html>
-	<head>
-		<title>events</title>
-	</head>
-	<style type="text/css">
-		body {
-			font-family: sans-serif;
-		}
-		table#req-status td.family {
-			padding-right: 2em;
-		}
-		table#req-status td.active {
-			padding-right: 1em;
-		}
-		table#req-status td.empty {
-			color: #aaa;
-		}
-		table#reqs {
-			margin-top: 1em;
-		}
-		table#reqs tr.first {
-			{{if $.Expanded}}font-weight: bold;{{end}}
-		}
-		table#reqs td {
-			font-family: monospace;
-		}
-		table#reqs td.when {
-			text-align: right;
-			white-space: nowrap;
-		}
-		table#reqs td.elapsed {
-			padding: 0 0.5em;
-			text-align: right;
-			white-space: pre;
-			width: 10em;
-		}
-		address {
-			font-size: smaller;
-			margin-top: 5em;
-		}
-	</style>
-	<body>
-
-<h1>/debug/events</h1>
-
-<table id="req-status">
-	{{range $i, $fam := .Families}}
-	<tr>
-		<td class="family">{{$fam}}</td>
-
-	        {{range $j, $bucket := $.Buckets}}
-	        {{$n := index $.Counts $i $j}}
-		<td class="{{if not $bucket.MaxErrAge}}active{{end}}{{if not $n}}empty{{end}}">
-	                {{if $n}}<a href="?fam={{$fam}}&b={{$j}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
-		        [{{$n}} {{$bucket.String}}]
-			{{if $n}}</a>{{end}}
-		</td>
-                {{end}}
-
-	</tr>{{end}}
-</table>
-
-{{if $.EventLogs}}
-<hr />
-<h3>Family: {{$.Family}}</h3>
-
-{{if $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}">{{end}}
-[Summary]{{if $.Expanded}}</a>{{end}}
-
-{{if not $.Expanded}}<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">{{end}}
-[Expanded]{{if not $.Expanded}}</a>{{end}}
-
-<table id="reqs">
-	<tr><th>When</th><th>Elapsed</th></tr>
-	{{range $el := $.EventLogs}}
-	<tr class="first">
-		<td class="when">{{$el.When}}</td>
-		<td class="elapsed">{{$el.ElapsedTime}}</td>
-		<td>{{$el.Title}}
-	</tr>
-	{{if $.Expanded}}
-	<tr>
-		<td class="when"></td>
-		<td class="elapsed"></td>
-		<td><pre>{{$el.Stack|trimSpace}}</pre></td>
-	</tr>
-	{{range $el.Events}}
-	<tr>
-		<td class="when">{{.WhenString}}</td>
-		<td class="elapsed">{{elapsed .Elapsed}}</td>
-		<td>.{{if .IsErr}}E{{else}}.{{end}}. {{.What}}</td>
-	</tr>
-	{{end}}
-	{{end}}
-	{{end}}
-</table>
-{{end}}
-	</body>
-</html>
-`
diff --git a/installer/vendor/golang.org/x/net/trace/histogram.go b/installer/vendor/golang.org/x/net/trace/histogram.go
deleted file mode 100644
index 9bf4286c79..0000000000
--- a/installer/vendor/golang.org/x/net/trace/histogram.go
+++ /dev/null
@@ -1,365 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-// This file implements histogramming for RPC statistics collection.
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"log"
-	"math"
-	"sync"
-
-	"golang.org/x/net/internal/timeseries"
-)
-
-const (
-	bucketCount = 38
-)
-
-// histogram keeps counts of values in buckets that are spaced
-// out in powers of 2: 0-1, 2-3, 4-7...
-// histogram implements timeseries.Observable
-type histogram struct {
-	sum          int64   // running total of measurements
-	sumOfSquares float64 // square of running total
-	buckets      []int64 // bucketed values for histogram
-	value        int     // holds a single value as an optimization
-	valueCount   int64   // number of values recorded for single value
-}
-
-// AddMeasurement records a value measurement observation to the histogram.
-func (h *histogram) addMeasurement(value int64) {
-	// TODO: assert invariant
-	h.sum += value
-	h.sumOfSquares += float64(value) * float64(value)
-
-	bucketIndex := getBucket(value)
-
-	if h.valueCount == 0 || (h.valueCount > 0 && h.value == bucketIndex) {
-		h.value = bucketIndex
-		h.valueCount++
-	} else {
-		h.allocateBuckets()
-		h.buckets[bucketIndex]++
-	}
-}
-
-func (h *histogram) allocateBuckets() {
-	if h.buckets == nil {
-		h.buckets = make([]int64, bucketCount)
-		h.buckets[h.value] = h.valueCount
-		h.value = 0
-		h.valueCount = -1
-	}
-}
-
-func log2(i int64) int {
-	n := 0
-	for ; i >= 0x100; i >>= 8 {
-		n += 8
-	}
-	for ; i > 0; i >>= 1 {
-		n += 1
-	}
-	return n
-}
-
-func getBucket(i int64) (index int) {
-	index = log2(i) - 1
-	if index < 0 {
-		index = 0
-	}
-	if index >= bucketCount {
-		index = bucketCount - 1
-	}
-	return
-}
-
-// Total returns the number of recorded observations.
-func (h *histogram) total() (total int64) {
-	if h.valueCount >= 0 {
-		total = h.valueCount
-	}
-	for _, val := range h.buckets {
-		total += int64(val)
-	}
-	return
-}
-
-// Average returns the average value of recorded observations.
-func (h *histogram) average() float64 {
-	t := h.total()
-	if t == 0 {
-		return 0
-	}
-	return float64(h.sum) / float64(t)
-}
-
-// Variance returns the variance of recorded observations.
-func (h *histogram) variance() float64 {
-	t := float64(h.total())
-	if t == 0 {
-		return 0
-	}
-	s := float64(h.sum) / t
-	return h.sumOfSquares/t - s*s
-}
-
-// StandardDeviation returns the standard deviation of recorded observations.
-func (h *histogram) standardDeviation() float64 {
-	return math.Sqrt(h.variance())
-}
-
-// PercentileBoundary estimates the value that the given fraction of recorded
-// observations are less than.
-func (h *histogram) percentileBoundary(percentile float64) int64 {
-	total := h.total()
-
-	// Corner cases (make sure result is strictly less than Total())
-	if total == 0 {
-		return 0
-	} else if total == 1 {
-		return int64(h.average())
-	}
-
-	percentOfTotal := round(float64(total) * percentile)
-	var runningTotal int64
-
-	for i := range h.buckets {
-		value := h.buckets[i]
-		runningTotal += value
-		if runningTotal == percentOfTotal {
-			// We hit an exact bucket boundary. If the next bucket has data, it is a
-			// good estimate of the value. If the bucket is empty, we interpolate the
-			// midpoint between the next bucket's boundary and the next non-zero
-			// bucket. If the remaining buckets are all empty, then we use the
-			// boundary for the next bucket as the estimate.
-			j := uint8(i + 1)
-			min := bucketBoundary(j)
-			if runningTotal < total {
-				for h.buckets[j] == 0 {
-					j++
-				}
-			}
-			max := bucketBoundary(j)
-			return min + round(float64(max-min)/2)
-		} else if runningTotal > percentOfTotal {
-			// The value is in this bucket. Interpolate the value.
-			delta := runningTotal - percentOfTotal
-			percentBucket := float64(value-delta) / float64(value)
-			bucketMin := bucketBoundary(uint8(i))
-			nextBucketMin := bucketBoundary(uint8(i + 1))
-			bucketSize := nextBucketMin - bucketMin
-			return bucketMin + round(percentBucket*float64(bucketSize))
-		}
-	}
-	return bucketBoundary(bucketCount - 1)
-}
-
-// Median returns the estimated median of the observed values.
-func (h *histogram) median() int64 {
-	return h.percentileBoundary(0.5)
-}
-
-// Add adds other to h.
-func (h *histogram) Add(other timeseries.Observable) {
-	o := other.(*histogram)
-	if o.valueCount == 0 {
-		// Other histogram is empty
-	} else if h.valueCount >= 0 && o.valueCount > 0 && h.value == o.value {
-		// Both have a single bucketed value, aggregate them
-		h.valueCount += o.valueCount
-	} else {
-		// Two different values necessitate buckets in this histogram
-		h.allocateBuckets()
-		if o.valueCount >= 0 {
-			h.buckets[o.value] += o.valueCount
-		} else {
-			for i := range h.buckets {
-				h.buckets[i] += o.buckets[i]
-			}
-		}
-	}
-	h.sumOfSquares += o.sumOfSquares
-	h.sum += o.sum
-}
-
-// Clear resets the histogram to an empty state, removing all observed values.
-func (h *histogram) Clear() {
-	h.buckets = nil
-	h.value = 0
-	h.valueCount = 0
-	h.sum = 0
-	h.sumOfSquares = 0
-}
-
-// CopyFrom copies from other, which must be a *histogram, into h.
-func (h *histogram) CopyFrom(other timeseries.Observable) {
-	o := other.(*histogram)
-	if o.valueCount == -1 {
-		h.allocateBuckets()
-		copy(h.buckets, o.buckets)
-	}
-	h.sum = o.sum
-	h.sumOfSquares = o.sumOfSquares
-	h.value = o.value
-	h.valueCount = o.valueCount
-}
-
-// Multiply scales the histogram by the specified ratio.
-func (h *histogram) Multiply(ratio float64) {
-	if h.valueCount == -1 {
-		for i := range h.buckets {
-			h.buckets[i] = int64(float64(h.buckets[i]) * ratio)
-		}
-	} else {
-		h.valueCount = int64(float64(h.valueCount) * ratio)
-	}
-	h.sum = int64(float64(h.sum) * ratio)
-	h.sumOfSquares = h.sumOfSquares * ratio
-}
-
-// New creates a new histogram.
-func (h *histogram) New() timeseries.Observable {
-	r := new(histogram)
-	r.Clear()
-	return r
-}
-
-func (h *histogram) String() string {
-	return fmt.Sprintf("%d, %f, %d, %d, %v",
-		h.sum, h.sumOfSquares, h.value, h.valueCount, h.buckets)
-}
-
-// round returns the closest int64 to the argument
-func round(in float64) int64 {
-	return int64(math.Floor(in + 0.5))
-}
-
-// bucketBoundary returns the first value in the bucket.
-func bucketBoundary(bucket uint8) int64 {
-	if bucket == 0 {
-		return 0
-	}
-	return 1 << bucket
-}
-
-// bucketData holds data about a specific bucket for use in distTmpl.
-type bucketData struct {
-	Lower, Upper       int64
-	N                  int64
-	Pct, CumulativePct float64
-	GraphWidth         int
-}
-
-// data holds data about a Distribution for use in distTmpl.
-type data struct {
-	Buckets                 []*bucketData
-	Count, Median           int64
-	Mean, StandardDeviation float64
-}
-
-// maxHTMLBarWidth is the maximum width of the HTML bar for visualizing buckets.
-const maxHTMLBarWidth = 350.0
-
-// newData returns data representing h for use in distTmpl.
-func (h *histogram) newData() *data {
-	// Force the allocation of buckets to simplify the rendering implementation
-	h.allocateBuckets()
-	// We scale the bars on the right so that the largest bar is
-	// maxHTMLBarWidth pixels in width.
-	maxBucket := int64(0)
-	for _, n := range h.buckets {
-		if n > maxBucket {
-			maxBucket = n
-		}
-	}
-	total := h.total()
-	barsizeMult := maxHTMLBarWidth / float64(maxBucket)
-	var pctMult float64
-	if total == 0 {
-		pctMult = 1.0
-	} else {
-		pctMult = 100.0 / float64(total)
-	}
-
-	buckets := make([]*bucketData, len(h.buckets))
-	runningTotal := int64(0)
-	for i, n := range h.buckets {
-		if n == 0 {
-			continue
-		}
-		runningTotal += n
-		var upperBound int64
-		if i < bucketCount-1 {
-			upperBound = bucketBoundary(uint8(i + 1))
-		} else {
-			upperBound = math.MaxInt64
-		}
-		buckets[i] = &bucketData{
-			Lower:         bucketBoundary(uint8(i)),
-			Upper:         upperBound,
-			N:             n,
-			Pct:           float64(n) * pctMult,
-			CumulativePct: float64(runningTotal) * pctMult,
-			GraphWidth:    int(float64(n) * barsizeMult),
-		}
-	}
-	return &data{
-		Buckets:           buckets,
-		Count:             total,
-		Median:            h.median(),
-		Mean:              h.average(),
-		StandardDeviation: h.standardDeviation(),
-	}
-}
-
-func (h *histogram) html() template.HTML {
-	buf := new(bytes.Buffer)
-	if err := distTmpl().Execute(buf, h.newData()); err != nil {
-		buf.Reset()
-		log.Printf("net/trace: couldn't execute template: %v", err)
-	}
-	return template.HTML(buf.String())
-}
-
-var distTmplCache *template.Template
-var distTmplOnce sync.Once
-
-func distTmpl() *template.Template {
-	distTmplOnce.Do(func() {
-		// Input: data
-		distTmplCache = template.Must(template.New("distTmpl").Parse(`
-<table>
-<tr>
-    <td style="padding:0.25em">Count: {{.Count}}</td>
-    <td style="padding:0.25em">Mean: {{printf "%.0f" .Mean}}</td>
-    <td style="padding:0.25em">StdDev: {{printf "%.0f" .StandardDeviation}}</td>
-    <td style="padding:0.25em">Median: {{.Median}}</td>
-</tr>
-</table>
-<hr>
-<table>
-{{range $b := .Buckets}}
-{{if $b}}
-  <tr>
-    <td style="padding:0 0 0 0.25em">[</td>
-    <td style="text-align:right;padding:0 0.25em">{{.Lower}},</td>
-    <td style="text-align:right;padding:0 0.25em">{{.Upper}})</td>
-    <td style="text-align:right;padding:0 0.25em">{{.N}}</td>
-    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .Pct}}%</td>
-    <td style="text-align:right;padding:0 0.25em">{{printf "%#.3f" .CumulativePct}}%</td>
-    <td><div style="background-color: blue; height: 1em; width: {{.GraphWidth}};"></div></td>
-  </tr>
-{{end}}
-{{end}}
-</table>
-`))
-	})
-	return distTmplCache
-}
diff --git a/installer/vendor/golang.org/x/net/trace/histogram_test.go b/installer/vendor/golang.org/x/net/trace/histogram_test.go
deleted file mode 100644
index d384b9332d..0000000000
--- a/installer/vendor/golang.org/x/net/trace/histogram_test.go
+++ /dev/null
@@ -1,325 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-import (
-	"math"
-	"testing"
-)
-
-type sumTest struct {
-	value        int64
-	sum          int64
-	sumOfSquares float64
-	total        int64
-}
-
-var sumTests = []sumTest{
-	{100, 100, 10000, 1},
-	{50, 150, 12500, 2},
-	{50, 200, 15000, 3},
-	{50, 250, 17500, 4},
-}
-
-type bucketingTest struct {
-	in     int64
-	log    int
-	bucket int
-}
-
-var bucketingTests = []bucketingTest{
-	{0, 0, 0},
-	{1, 1, 0},
-	{2, 2, 1},
-	{3, 2, 1},
-	{4, 3, 2},
-	{1000, 10, 9},
-	{1023, 10, 9},
-	{1024, 11, 10},
-	{1000000, 20, 19},
-}
-
-type multiplyTest struct {
-	in                   int64
-	ratio                float64
-	expectedSum          int64
-	expectedTotal        int64
-	expectedSumOfSquares float64
-}
-
-var multiplyTests = []multiplyTest{
-	{15, 2.5, 37, 2, 562.5},
-	{128, 4.6, 758, 13, 77953.9},
-}
-
-type percentileTest struct {
-	fraction float64
-	expected int64
-}
-
-var percentileTests = []percentileTest{
-	{0.25, 48},
-	{0.5, 96},
-	{0.6, 109},
-	{0.75, 128},
-	{0.90, 205},
-	{0.95, 230},
-	{0.99, 256},
-}
-
-func TestSum(t *testing.T) {
-	var h histogram
-
-	for _, test := range sumTests {
-		h.addMeasurement(test.value)
-		sum := h.sum
-		if sum != test.sum {
-			t.Errorf("h.Sum = %v WANT: %v", sum, test.sum)
-		}
-
-		sumOfSquares := h.sumOfSquares
-		if sumOfSquares != test.sumOfSquares {
-			t.Errorf("h.SumOfSquares = %v WANT: %v", sumOfSquares, test.sumOfSquares)
-		}
-
-		total := h.total()
-		if total != test.total {
-			t.Errorf("h.Total = %v WANT: %v", total, test.total)
-		}
-	}
-}
-
-func TestMultiply(t *testing.T) {
-	var h histogram
-	for i, test := range multiplyTests {
-		h.addMeasurement(test.in)
-		h.Multiply(test.ratio)
-		if h.sum != test.expectedSum {
-			t.Errorf("#%v: h.sum = %v WANT: %v", i, h.sum, test.expectedSum)
-		}
-		if h.total() != test.expectedTotal {
-			t.Errorf("#%v: h.total = %v WANT: %v", i, h.total(), test.expectedTotal)
-		}
-		if h.sumOfSquares != test.expectedSumOfSquares {
-			t.Errorf("#%v: h.SumOfSquares = %v WANT: %v", i, test.expectedSumOfSquares, h.sumOfSquares)
-		}
-	}
-}
-
-func TestBucketingFunctions(t *testing.T) {
-	for _, test := range bucketingTests {
-		log := log2(test.in)
-		if log != test.log {
-			t.Errorf("log2 = %v WANT: %v", log, test.log)
-		}
-
-		bucket := getBucket(test.in)
-		if bucket != test.bucket {
-			t.Errorf("getBucket = %v WANT: %v", bucket, test.bucket)
-		}
-	}
-}
-
-func TestAverage(t *testing.T) {
-	a := new(histogram)
-	average := a.average()
-	if average != 0 {
-		t.Errorf("Average of empty histogram was %v WANT: 0", average)
-	}
-
-	a.addMeasurement(1)
-	a.addMeasurement(1)
-	a.addMeasurement(3)
-	const expected = float64(5) / float64(3)
-	average = a.average()
-
-	if !isApproximate(average, expected) {
-		t.Errorf("Average = %g WANT: %v", average, expected)
-	}
-}
-
-func TestStandardDeviation(t *testing.T) {
-	a := new(histogram)
-	add(a, 10, 1<<4)
-	add(a, 10, 1<<5)
-	add(a, 10, 1<<6)
-	stdDev := a.standardDeviation()
-	const expected = 19.95
-
-	if !isApproximate(stdDev, expected) {
-		t.Errorf("StandardDeviation = %v WANT: %v", stdDev, expected)
-	}
-
-	// No values
-	a = new(histogram)
-	stdDev = a.standardDeviation()
-
-	if !isApproximate(stdDev, 0) {
-		t.Errorf("StandardDeviation = %v WANT: 0", stdDev)
-	}
-
-	add(a, 1, 1<<4)
-	if !isApproximate(stdDev, 0) {
-		t.Errorf("StandardDeviation = %v WANT: 0", stdDev)
-	}
-
-	add(a, 10, 1<<4)
-	if !isApproximate(stdDev, 0) {
-		t.Errorf("StandardDeviation = %v WANT: 0", stdDev)
-	}
-}
-
-func TestPercentileBoundary(t *testing.T) {
-	a := new(histogram)
-	add(a, 5, 1<<4)
-	add(a, 10, 1<<6)
-	add(a, 5, 1<<7)
-
-	for _, test := range percentileTests {
-		percentile := a.percentileBoundary(test.fraction)
-		if percentile != test.expected {
-			t.Errorf("h.PercentileBoundary (fraction=%v) = %v WANT: %v", test.fraction, percentile, test.expected)
-		}
-	}
-}
-
-func TestCopyFrom(t *testing.T) {
-	a := histogram{5, 25, []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-		19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38}, 4, -1}
-	b := histogram{6, 36, []int64{2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19,
-		20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39}, 5, -1}
-
-	a.CopyFrom(&b)
-
-	if a.String() != b.String() {
-		t.Errorf("a.String = %s WANT: %s", a.String(), b.String())
-	}
-}
-
-func TestClear(t *testing.T) {
-	a := histogram{5, 25, []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-		19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38}, 4, -1}
-
-	a.Clear()
-
-	expected := "0, 0.000000, 0, 0, []"
-	if a.String() != expected {
-		t.Errorf("a.String = %s WANT %s", a.String(), expected)
-	}
-}
-
-func TestNew(t *testing.T) {
-	a := histogram{5, 25, []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-		19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38}, 4, -1}
-	b := a.New()
-
-	expected := "0, 0.000000, 0, 0, []"
-	if b.(*histogram).String() != expected {
-		t.Errorf("b.(*histogram).String = %s WANT: %s", b.(*histogram).String(), expected)
-	}
-}
-
-func TestAdd(t *testing.T) {
-	// The tests here depend on the associativity of addMeasurement and Add.
-	// Add empty observation
-	a := histogram{5, 25, []int64{1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18,
-		19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38}, 4, -1}
-	b := a.New()
-
-	expected := a.String()
-	a.Add(b)
-	if a.String() != expected {
-		t.Errorf("a.String = %s WANT: %s", a.String(), expected)
-	}
-
-	// Add same bucketed value, no new buckets
-	c := new(histogram)
-	d := new(histogram)
-	e := new(histogram)
-	c.addMeasurement(12)
-	d.addMeasurement(11)
-	e.addMeasurement(12)
-	e.addMeasurement(11)
-	c.Add(d)
-	if c.String() != e.String() {
-		t.Errorf("c.String = %s WANT: %s", c.String(), e.String())
-	}
-
-	// Add bucketed values
-	f := new(histogram)
-	g := new(histogram)
-	h := new(histogram)
-	f.addMeasurement(4)
-	f.addMeasurement(12)
-	f.addMeasurement(100)
-	g.addMeasurement(18)
-	g.addMeasurement(36)
-	g.addMeasurement(255)
-	h.addMeasurement(4)
-	h.addMeasurement(12)
-	h.addMeasurement(100)
-	h.addMeasurement(18)
-	h.addMeasurement(36)
-	h.addMeasurement(255)
-	f.Add(g)
-	if f.String() != h.String() {
-		t.Errorf("f.String = %q WANT: %q", f.String(), h.String())
-	}
-
-	// add buckets to no buckets
-	i := new(histogram)
-	j := new(histogram)
-	k := new(histogram)
-	j.addMeasurement(18)
-	j.addMeasurement(36)
-	j.addMeasurement(255)
-	k.addMeasurement(18)
-	k.addMeasurement(36)
-	k.addMeasurement(255)
-	i.Add(j)
-	if i.String() != k.String() {
-		t.Errorf("i.String = %q WANT: %q", i.String(), k.String())
-	}
-
-	// add buckets to single value (no overlap)
-	l := new(histogram)
-	m := new(histogram)
-	n := new(histogram)
-	l.addMeasurement(0)
-	m.addMeasurement(18)
-	m.addMeasurement(36)
-	m.addMeasurement(255)
-	n.addMeasurement(0)
-	n.addMeasurement(18)
-	n.addMeasurement(36)
-	n.addMeasurement(255)
-	l.Add(m)
-	if l.String() != n.String() {
-		t.Errorf("l.String = %q WANT: %q", l.String(), n.String())
-	}
-
-	// mixed order
-	o := new(histogram)
-	p := new(histogram)
-	o.addMeasurement(0)
-	o.addMeasurement(2)
-	o.addMeasurement(0)
-	p.addMeasurement(0)
-	p.addMeasurement(0)
-	p.addMeasurement(2)
-	if o.String() != p.String() {
-		t.Errorf("o.String = %q WANT: %q", o.String(), p.String())
-	}
-}
-
-func add(h *histogram, times int, val int64) {
-	for i := 0; i < times; i++ {
-		h.addMeasurement(val)
-	}
-}
-
-func isApproximate(x, y float64) bool {
-	return math.Abs(x-y) < 1e-2
-}
diff --git a/installer/vendor/golang.org/x/net/trace/trace.go b/installer/vendor/golang.org/x/net/trace/trace.go
deleted file mode 100644
index 64f56a3736..0000000000
--- a/installer/vendor/golang.org/x/net/trace/trace.go
+++ /dev/null
@@ -1,1079 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Package trace implements tracing of requests and long-lived objects.
-It exports HTTP interfaces on /debug/requests and /debug/events.
-
-A trace.Trace provides tracing for short-lived objects, usually requests.
-A request handler might be implemented like this:
-
-	func fooHandler(w http.ResponseWriter, req *http.Request) {
-		tr := trace.New("mypkg.Foo", req.URL.Path)
-		defer tr.Finish()
-		...
-		tr.LazyPrintf("some event %q happened", str)
-		...
-		if err := somethingImportant(); err != nil {
-			tr.LazyPrintf("somethingImportant failed: %v", err)
-			tr.SetError()
-		}
-	}
-
-The /debug/requests HTTP endpoint organizes the traces by family,
-errors, and duration.  It also provides histogram of request duration
-for each family.
-
-A trace.EventLog provides tracing for long-lived objects, such as RPC
-connections.
-
-	// A Fetcher fetches URL paths for a single domain.
-	type Fetcher struct {
-		domain string
-		events trace.EventLog
-	}
-
-	func NewFetcher(domain string) *Fetcher {
-		return &Fetcher{
-			domain,
-			trace.NewEventLog("mypkg.Fetcher", domain),
-		}
-	}
-
-	func (f *Fetcher) Fetch(path string) (string, error) {
-		resp, err := http.Get("http://" + f.domain + "/" + path)
-		if err != nil {
-			f.events.Errorf("Get(%q) = %v", path, err)
-			return "", err
-		}
-		f.events.Printf("Get(%q) = %s", path, resp.Status)
-		...
-	}
-
-	func (f *Fetcher) Close() error {
-		f.events.Finish()
-		return nil
-	}
-
-The /debug/events HTTP endpoint organizes the event logs by family and
-by time since the last error.  The expanded view displays recent log
-entries and the log's call stack.
-*/
-package trace // import "golang.org/x/net/trace"
-
-import (
-	"bytes"
-	"fmt"
-	"html/template"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"runtime"
-	"sort"
-	"strconv"
-	"sync"
-	"sync/atomic"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/net/internal/timeseries"
-)
-
-// DebugUseAfterFinish controls whether to debug uses of Trace values after finishing.
-// FOR DEBUGGING ONLY. This will slow down the program.
-var DebugUseAfterFinish = false
-
-// AuthRequest determines whether a specific request is permitted to load the
-// /debug/requests or /debug/events pages.
-//
-// It returns two bools; the first indicates whether the page may be viewed at all,
-// and the second indicates whether sensitive events will be shown.
-//
-// AuthRequest may be replaced by a program to customize its authorization requirements.
-//
-// The default AuthRequest function returns (true, true) if and only if the request
-// comes from localhost/127.0.0.1/[::1].
-var AuthRequest = func(req *http.Request) (any, sensitive bool) {
-	// RemoteAddr is commonly in the form "IP" or "IP:port".
-	// If it is in the form "IP:port", split off the port.
-	host, _, err := net.SplitHostPort(req.RemoteAddr)
-	if err != nil {
-		host = req.RemoteAddr
-	}
-	switch host {
-	case "localhost", "127.0.0.1", "::1":
-		return true, true
-	default:
-		return false, false
-	}
-}
-
-func init() {
-	http.HandleFunc("/debug/requests", func(w http.ResponseWriter, req *http.Request) {
-		any, sensitive := AuthRequest(req)
-		if !any {
-			http.Error(w, "not allowed", http.StatusUnauthorized)
-			return
-		}
-		w.Header().Set("Content-Type", "text/html; charset=utf-8")
-		Render(w, req, sensitive)
-	})
-	http.HandleFunc("/debug/events", func(w http.ResponseWriter, req *http.Request) {
-		any, sensitive := AuthRequest(req)
-		if !any {
-			http.Error(w, "not allowed", http.StatusUnauthorized)
-			return
-		}
-		w.Header().Set("Content-Type", "text/html; charset=utf-8")
-		RenderEvents(w, req, sensitive)
-	})
-}
-
-// Render renders the HTML page typically served at /debug/requests.
-// It does not do any auth checking; see AuthRequest for the default auth check
-// used by the handler registered on http.DefaultServeMux.
-// req may be nil.
-func Render(w io.Writer, req *http.Request, sensitive bool) {
-	data := &struct {
-		Families         []string
-		ActiveTraceCount map[string]int
-		CompletedTraces  map[string]*family
-
-		// Set when a bucket has been selected.
-		Traces        traceList
-		Family        string
-		Bucket        int
-		Expanded      bool
-		Traced        bool
-		Active        bool
-		ShowSensitive bool // whether to show sensitive events
-
-		Histogram       template.HTML
-		HistogramWindow string // e.g. "last minute", "last hour", "all time"
-
-		// If non-zero, the set of traces is a partial set,
-		// and this is the total number.
-		Total int
-	}{
-		CompletedTraces: completedTraces,
-	}
-
-	data.ShowSensitive = sensitive
-	if req != nil {
-		// Allow show_sensitive=0 to force hiding of sensitive data for testing.
-		// This only goes one way; you can't use show_sensitive=1 to see things.
-		if req.FormValue("show_sensitive") == "0" {
-			data.ShowSensitive = false
-		}
-
-		if exp, err := strconv.ParseBool(req.FormValue("exp")); err == nil {
-			data.Expanded = exp
-		}
-		if exp, err := strconv.ParseBool(req.FormValue("rtraced")); err == nil {
-			data.Traced = exp
-		}
-	}
-
-	completedMu.RLock()
-	data.Families = make([]string, 0, len(completedTraces))
-	for fam := range completedTraces {
-		data.Families = append(data.Families, fam)
-	}
-	completedMu.RUnlock()
-	sort.Strings(data.Families)
-
-	// We are careful here to minimize the time spent locking activeMu,
-	// since that lock is required every time an RPC starts and finishes.
-	data.ActiveTraceCount = make(map[string]int, len(data.Families))
-	activeMu.RLock()
-	for fam, s := range activeTraces {
-		data.ActiveTraceCount[fam] = s.Len()
-	}
-	activeMu.RUnlock()
-
-	var ok bool
-	data.Family, data.Bucket, ok = parseArgs(req)
-	switch {
-	case !ok:
-		// No-op
-	case data.Bucket == -1:
-		data.Active = true
-		n := data.ActiveTraceCount[data.Family]
-		data.Traces = getActiveTraces(data.Family)
-		if len(data.Traces) < n {
-			data.Total = n
-		}
-	case data.Bucket < bucketsPerFamily:
-		if b := lookupBucket(data.Family, data.Bucket); b != nil {
-			data.Traces = b.Copy(data.Traced)
-		}
-	default:
-		if f := getFamily(data.Family, false); f != nil {
-			var obs timeseries.Observable
-			f.LatencyMu.RLock()
-			switch o := data.Bucket - bucketsPerFamily; o {
-			case 0:
-				obs = f.Latency.Minute()
-				data.HistogramWindow = "last minute"
-			case 1:
-				obs = f.Latency.Hour()
-				data.HistogramWindow = "last hour"
-			case 2:
-				obs = f.Latency.Total()
-				data.HistogramWindow = "all time"
-			}
-			f.LatencyMu.RUnlock()
-			if obs != nil {
-				data.Histogram = obs.(*histogram).html()
-			}
-		}
-	}
-
-	if data.Traces != nil {
-		defer data.Traces.Free()
-		sort.Sort(data.Traces)
-	}
-
-	completedMu.RLock()
-	defer completedMu.RUnlock()
-	if err := pageTmpl().ExecuteTemplate(w, "Page", data); err != nil {
-		log.Printf("net/trace: Failed executing template: %v", err)
-	}
-}
-
-func parseArgs(req *http.Request) (fam string, b int, ok bool) {
-	if req == nil {
-		return "", 0, false
-	}
-	fam, bStr := req.FormValue("fam"), req.FormValue("b")
-	if fam == "" || bStr == "" {
-		return "", 0, false
-	}
-	b, err := strconv.Atoi(bStr)
-	if err != nil || b < -1 {
-		return "", 0, false
-	}
-
-	return fam, b, true
-}
-
-func lookupBucket(fam string, b int) *traceBucket {
-	f := getFamily(fam, false)
-	if f == nil || b < 0 || b >= len(f.Buckets) {
-		return nil
-	}
-	return f.Buckets[b]
-}
-
-type contextKeyT string
-
-var contextKey = contextKeyT("golang.org/x/net/trace.Trace")
-
-// NewContext returns a copy of the parent context
-// and associates it with a Trace.
-func NewContext(ctx context.Context, tr Trace) context.Context {
-	return context.WithValue(ctx, contextKey, tr)
-}
-
-// FromContext returns the Trace bound to the context, if any.
-func FromContext(ctx context.Context) (tr Trace, ok bool) {
-	tr, ok = ctx.Value(contextKey).(Trace)
-	return
-}
-
-// Trace represents an active request.
-type Trace interface {
-	// LazyLog adds x to the event log. It will be evaluated each time the
-	// /debug/requests page is rendered. Any memory referenced by x will be
-	// pinned until the trace is finished and later discarded.
-	LazyLog(x fmt.Stringer, sensitive bool)
-
-	// LazyPrintf evaluates its arguments with fmt.Sprintf each time the
-	// /debug/requests page is rendered. Any memory referenced by a will be
-	// pinned until the trace is finished and later discarded.
-	LazyPrintf(format string, a ...interface{})
-
-	// SetError declares that this trace resulted in an error.
-	SetError()
-
-	// SetRecycler sets a recycler for the trace.
-	// f will be called for each event passed to LazyLog at a time when
-	// it is no longer required, whether while the trace is still active
-	// and the event is discarded, or when a completed trace is discarded.
-	SetRecycler(f func(interface{}))
-
-	// SetTraceInfo sets the trace info for the trace.
-	// This is currently unused.
-	SetTraceInfo(traceID, spanID uint64)
-
-	// SetMaxEvents sets the maximum number of events that will be stored
-	// in the trace. This has no effect if any events have already been
-	// added to the trace.
-	SetMaxEvents(m int)
-
-	// Finish declares that this trace is complete.
-	// The trace should not be used after calling this method.
-	Finish()
-}
-
-type lazySprintf struct {
-	format string
-	a      []interface{}
-}
-
-func (l *lazySprintf) String() string {
-	return fmt.Sprintf(l.format, l.a...)
-}
-
-// New returns a new Trace with the specified family and title.
-func New(family, title string) Trace {
-	tr := newTrace()
-	tr.ref()
-	tr.Family, tr.Title = family, title
-	tr.Start = time.Now()
-	tr.maxEvents = maxEventsPerTrace
-	tr.events = tr.eventsBuf[:0]
-
-	activeMu.RLock()
-	s := activeTraces[tr.Family]
-	activeMu.RUnlock()
-	if s == nil {
-		activeMu.Lock()
-		s = activeTraces[tr.Family] // check again
-		if s == nil {
-			s = new(traceSet)
-			activeTraces[tr.Family] = s
-		}
-		activeMu.Unlock()
-	}
-	s.Add(tr)
-
-	// Trigger allocation of the completed trace structure for this family.
-	// This will cause the family to be present in the request page during
-	// the first trace of this family. We don't care about the return value,
-	// nor is there any need for this to run inline, so we execute it in its
-	// own goroutine, but only if the family isn't allocated yet.
-	completedMu.RLock()
-	if _, ok := completedTraces[tr.Family]; !ok {
-		go allocFamily(tr.Family)
-	}
-	completedMu.RUnlock()
-
-	return tr
-}
-
-func (tr *trace) Finish() {
-	tr.Elapsed = time.Now().Sub(tr.Start)
-	if DebugUseAfterFinish {
-		buf := make([]byte, 4<<10) // 4 KB should be enough
-		n := runtime.Stack(buf, false)
-		tr.finishStack = buf[:n]
-	}
-
-	activeMu.RLock()
-	m := activeTraces[tr.Family]
-	activeMu.RUnlock()
-	m.Remove(tr)
-
-	f := getFamily(tr.Family, true)
-	for _, b := range f.Buckets {
-		if b.Cond.match(tr) {
-			b.Add(tr)
-		}
-	}
-	// Add a sample of elapsed time as microseconds to the family's timeseries
-	h := new(histogram)
-	h.addMeasurement(tr.Elapsed.Nanoseconds() / 1e3)
-	f.LatencyMu.Lock()
-	f.Latency.Add(h)
-	f.LatencyMu.Unlock()
-
-	tr.unref() // matches ref in New
-}
-
-const (
-	bucketsPerFamily    = 9
-	tracesPerBucket     = 10
-	maxActiveTraces     = 20 // Maximum number of active traces to show.
-	maxEventsPerTrace   = 10
-	numHistogramBuckets = 38
-)
-
-var (
-	// The active traces.
-	activeMu     sync.RWMutex
-	activeTraces = make(map[string]*traceSet) // family -> traces
-
-	// Families of completed traces.
-	completedMu     sync.RWMutex
-	completedTraces = make(map[string]*family) // family -> traces
-)
-
-type traceSet struct {
-	mu sync.RWMutex
-	m  map[*trace]bool
-
-	// We could avoid the entire map scan in FirstN by having a slice of all the traces
-	// ordered by start time, and an index into that from the trace struct, with a periodic
-	// repack of the slice after enough traces finish; we could also use a skip list or similar.
-	// However, that would shift some of the expense from /debug/requests time to RPC time,
-	// which is probably the wrong trade-off.
-}
-
-func (ts *traceSet) Len() int {
-	ts.mu.RLock()
-	defer ts.mu.RUnlock()
-	return len(ts.m)
-}
-
-func (ts *traceSet) Add(tr *trace) {
-	ts.mu.Lock()
-	if ts.m == nil {
-		ts.m = make(map[*trace]bool)
-	}
-	ts.m[tr] = true
-	ts.mu.Unlock()
-}
-
-func (ts *traceSet) Remove(tr *trace) {
-	ts.mu.Lock()
-	delete(ts.m, tr)
-	ts.mu.Unlock()
-}
-
-// FirstN returns the first n traces ordered by time.
-func (ts *traceSet) FirstN(n int) traceList {
-	ts.mu.RLock()
-	defer ts.mu.RUnlock()
-
-	if n > len(ts.m) {
-		n = len(ts.m)
-	}
-	trl := make(traceList, 0, n)
-
-	// Fast path for when no selectivity is needed.
-	if n == len(ts.m) {
-		for tr := range ts.m {
-			tr.ref()
-			trl = append(trl, tr)
-		}
-		sort.Sort(trl)
-		return trl
-	}
-
-	// Pick the oldest n traces.
-	// This is inefficient. See the comment in the traceSet struct.
-	for tr := range ts.m {
-		// Put the first n traces into trl in the order they occur.
-		// When we have n, sort trl, and thereafter maintain its order.
-		if len(trl) < n {
-			tr.ref()
-			trl = append(trl, tr)
-			if len(trl) == n {
-				// This is guaranteed to happen exactly once during this loop.
-				sort.Sort(trl)
-			}
-			continue
-		}
-		if tr.Start.After(trl[n-1].Start) {
-			continue
-		}
-
-		// Find where to insert this one.
-		tr.ref()
-		i := sort.Search(n, func(i int) bool { return trl[i].Start.After(tr.Start) })
-		trl[n-1].unref()
-		copy(trl[i+1:], trl[i:])
-		trl[i] = tr
-	}
-
-	return trl
-}
-
-func getActiveTraces(fam string) traceList {
-	activeMu.RLock()
-	s := activeTraces[fam]
-	activeMu.RUnlock()
-	if s == nil {
-		return nil
-	}
-	return s.FirstN(maxActiveTraces)
-}
-
-func getFamily(fam string, allocNew bool) *family {
-	completedMu.RLock()
-	f := completedTraces[fam]
-	completedMu.RUnlock()
-	if f == nil && allocNew {
-		f = allocFamily(fam)
-	}
-	return f
-}
-
-func allocFamily(fam string) *family {
-	completedMu.Lock()
-	defer completedMu.Unlock()
-	f := completedTraces[fam]
-	if f == nil {
-		f = newFamily()
-		completedTraces[fam] = f
-	}
-	return f
-}
-
-// family represents a set of trace buckets and associated latency information.
-type family struct {
-	// traces may occur in multiple buckets.
-	Buckets [bucketsPerFamily]*traceBucket
-
-	// latency time series
-	LatencyMu sync.RWMutex
-	Latency   *timeseries.MinuteHourSeries
-}
-
-func newFamily() *family {
-	return &family{
-		Buckets: [bucketsPerFamily]*traceBucket{
-			{Cond: minCond(0)},
-			{Cond: minCond(50 * time.Millisecond)},
-			{Cond: minCond(100 * time.Millisecond)},
-			{Cond: minCond(200 * time.Millisecond)},
-			{Cond: minCond(500 * time.Millisecond)},
-			{Cond: minCond(1 * time.Second)},
-			{Cond: minCond(10 * time.Second)},
-			{Cond: minCond(100 * time.Second)},
-			{Cond: errorCond{}},
-		},
-		Latency: timeseries.NewMinuteHourSeries(func() timeseries.Observable { return new(histogram) }),
-	}
-}
-
-// traceBucket represents a size-capped bucket of historic traces,
-// along with a condition for a trace to belong to the bucket.
-type traceBucket struct {
-	Cond cond
-
-	// Ring buffer implementation of a fixed-size FIFO queue.
-	mu     sync.RWMutex
-	buf    [tracesPerBucket]*trace
-	start  int // < tracesPerBucket
-	length int // <= tracesPerBucket
-}
-
-func (b *traceBucket) Add(tr *trace) {
-	b.mu.Lock()
-	defer b.mu.Unlock()
-
-	i := b.start + b.length
-	if i >= tracesPerBucket {
-		i -= tracesPerBucket
-	}
-	if b.length == tracesPerBucket {
-		// "Remove" an element from the bucket.
-		b.buf[i].unref()
-		b.start++
-		if b.start == tracesPerBucket {
-			b.start = 0
-		}
-	}
-	b.buf[i] = tr
-	if b.length < tracesPerBucket {
-		b.length++
-	}
-	tr.ref()
-}
-
-// Copy returns a copy of the traces in the bucket.
-// If tracedOnly is true, only the traces with trace information will be returned.
-// The logs will be ref'd before returning; the caller should call
-// the Free method when it is done with them.
-// TODO(dsymonds): keep track of traced requests in separate buckets.
-func (b *traceBucket) Copy(tracedOnly bool) traceList {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-
-	trl := make(traceList, 0, b.length)
-	for i, x := 0, b.start; i < b.length; i++ {
-		tr := b.buf[x]
-		if !tracedOnly || tr.spanID != 0 {
-			tr.ref()
-			trl = append(trl, tr)
-		}
-		x++
-		if x == b.length {
-			x = 0
-		}
-	}
-	return trl
-}
-
-func (b *traceBucket) Empty() bool {
-	b.mu.RLock()
-	defer b.mu.RUnlock()
-	return b.length == 0
-}
-
-// cond represents a condition on a trace.
-type cond interface {
-	match(t *trace) bool
-	String() string
-}
-
-type minCond time.Duration
-
-func (m minCond) match(t *trace) bool { return t.Elapsed >= time.Duration(m) }
-func (m minCond) String() string      { return fmt.Sprintf("≥%gs", time.Duration(m).Seconds()) }
-
-type errorCond struct{}
-
-func (e errorCond) match(t *trace) bool { return t.IsError }
-func (e errorCond) String() string      { return "errors" }
-
-type traceList []*trace
-
-// Free calls unref on each element of the list.
-func (trl traceList) Free() {
-	for _, t := range trl {
-		t.unref()
-	}
-}
-
-// traceList may be sorted in reverse chronological order.
-func (trl traceList) Len() int           { return len(trl) }
-func (trl traceList) Less(i, j int) bool { return trl[i].Start.After(trl[j].Start) }
-func (trl traceList) Swap(i, j int)      { trl[i], trl[j] = trl[j], trl[i] }
-
-// An event is a timestamped log entry in a trace.
-type event struct {
-	When       time.Time
-	Elapsed    time.Duration // since previous event in trace
-	NewDay     bool          // whether this event is on a different day to the previous event
-	Recyclable bool          // whether this event was passed via LazyLog
-	Sensitive  bool          // whether this event contains sensitive information
-	What       interface{}   // string or fmt.Stringer
-}
-
-// WhenString returns a string representation of the elapsed time of the event.
-// It will include the date if midnight was crossed.
-func (e event) WhenString() string {
-	if e.NewDay {
-		return e.When.Format("2006/01/02 15:04:05.000000")
-	}
-	return e.When.Format("15:04:05.000000")
-}
-
-// discarded represents a number of discarded events.
-// It is stored as *discarded to make it easier to update in-place.
-type discarded int
-
-func (d *discarded) String() string {
-	return fmt.Sprintf("(%d events discarded)", int(*d))
-}
-
-// trace represents an active or complete request,
-// either sent or received by this program.
-type trace struct {
-	// Family is the top-level grouping of traces to which this belongs.
-	Family string
-
-	// Title is the title of this trace.
-	Title string
-
-	// Timing information.
-	Start   time.Time
-	Elapsed time.Duration // zero while active
-
-	// Trace information if non-zero.
-	traceID uint64
-	spanID  uint64
-
-	// Whether this trace resulted in an error.
-	IsError bool
-
-	// Append-only sequence of events (modulo discards).
-	mu        sync.RWMutex
-	events    []event
-	maxEvents int
-
-	refs     int32 // how many buckets this is in
-	recycler func(interface{})
-	disc     discarded // scratch space to avoid allocation
-
-	finishStack []byte // where finish was called, if DebugUseAfterFinish is set
-
-	eventsBuf [4]event // preallocated buffer in case we only log a few events
-}
-
-func (tr *trace) reset() {
-	// Clear all but the mutex. Mutexes may not be copied, even when unlocked.
-	tr.Family = ""
-	tr.Title = ""
-	tr.Start = time.Time{}
-	tr.Elapsed = 0
-	tr.traceID = 0
-	tr.spanID = 0
-	tr.IsError = false
-	tr.maxEvents = 0
-	tr.events = nil
-	tr.refs = 0
-	tr.recycler = nil
-	tr.disc = 0
-	tr.finishStack = nil
-	for i := range tr.eventsBuf {
-		tr.eventsBuf[i] = event{}
-	}
-}
-
-// delta returns the elapsed time since the last event or the trace start,
-// and whether it spans midnight.
-// L >= tr.mu
-func (tr *trace) delta(t time.Time) (time.Duration, bool) {
-	if len(tr.events) == 0 {
-		return t.Sub(tr.Start), false
-	}
-	prev := tr.events[len(tr.events)-1].When
-	return t.Sub(prev), prev.Day() != t.Day()
-}
-
-func (tr *trace) addEvent(x interface{}, recyclable, sensitive bool) {
-	if DebugUseAfterFinish && tr.finishStack != nil {
-		buf := make([]byte, 4<<10) // 4 KB should be enough
-		n := runtime.Stack(buf, false)
-		log.Printf("net/trace: trace used after finish:\nFinished at:\n%s\nUsed at:\n%s", tr.finishStack, buf[:n])
-	}
-
-	/*
-		NOTE TO DEBUGGERS
-
-		If you are here because your program panicked in this code,
-		it is almost definitely the fault of code using this package,
-		and very unlikely to be the fault of this code.
-
-		The most likely scenario is that some code elsewhere is using
-		a trace.Trace after its Finish method is called.
-		You can temporarily set the DebugUseAfterFinish var
-		to help discover where that is; do not leave that var set,
-		since it makes this package much less efficient.
-	*/
-
-	e := event{When: time.Now(), What: x, Recyclable: recyclable, Sensitive: sensitive}
-	tr.mu.Lock()
-	e.Elapsed, e.NewDay = tr.delta(e.When)
-	if len(tr.events) < tr.maxEvents {
-		tr.events = append(tr.events, e)
-	} else {
-		// Discard the middle events.
-		di := int((tr.maxEvents - 1) / 2)
-		if d, ok := tr.events[di].What.(*discarded); ok {
-			(*d)++
-		} else {
-			// disc starts at two to count for the event it is replacing,
-			// plus the next one that we are about to drop.
-			tr.disc = 2
-			if tr.recycler != nil && tr.events[di].Recyclable {
-				go tr.recycler(tr.events[di].What)
-			}
-			tr.events[di].What = &tr.disc
-		}
-		// The timestamp of the discarded meta-event should be
-		// the time of the last event it is representing.
-		tr.events[di].When = tr.events[di+1].When
-
-		if tr.recycler != nil && tr.events[di+1].Recyclable {
-			go tr.recycler(tr.events[di+1].What)
-		}
-		copy(tr.events[di+1:], tr.events[di+2:])
-		tr.events[tr.maxEvents-1] = e
-	}
-	tr.mu.Unlock()
-}
-
-func (tr *trace) LazyLog(x fmt.Stringer, sensitive bool) {
-	tr.addEvent(x, true, sensitive)
-}
-
-func (tr *trace) LazyPrintf(format string, a ...interface{}) {
-	tr.addEvent(&lazySprintf{format, a}, false, false)
-}
-
-func (tr *trace) SetError() { tr.IsError = true }
-
-func (tr *trace) SetRecycler(f func(interface{})) {
-	tr.recycler = f
-}
-
-func (tr *trace) SetTraceInfo(traceID, spanID uint64) {
-	tr.traceID, tr.spanID = traceID, spanID
-}
-
-func (tr *trace) SetMaxEvents(m int) {
-	// Always keep at least three events: first, discarded count, last.
-	if len(tr.events) == 0 && m > 3 {
-		tr.maxEvents = m
-	}
-}
-
-func (tr *trace) ref() {
-	atomic.AddInt32(&tr.refs, 1)
-}
-
-func (tr *trace) unref() {
-	if atomic.AddInt32(&tr.refs, -1) == 0 {
-		if tr.recycler != nil {
-			// freeTrace clears tr, so we hold tr.recycler and tr.events here.
-			go func(f func(interface{}), es []event) {
-				for _, e := range es {
-					if e.Recyclable {
-						f(e.What)
-					}
-				}
-			}(tr.recycler, tr.events)
-		}
-
-		freeTrace(tr)
-	}
-}
-
-func (tr *trace) When() string {
-	return tr.Start.Format("2006/01/02 15:04:05.000000")
-}
-
-func (tr *trace) ElapsedTime() string {
-	t := tr.Elapsed
-	if t == 0 {
-		// Active trace.
-		t = time.Since(tr.Start)
-	}
-	return fmt.Sprintf("%.6f", t.Seconds())
-}
-
-func (tr *trace) Events() []event {
-	tr.mu.RLock()
-	defer tr.mu.RUnlock()
-	return tr.events
-}
-
-var traceFreeList = make(chan *trace, 1000) // TODO(dsymonds): Use sync.Pool?
-
-// newTrace returns a trace ready to use.
-func newTrace() *trace {
-	select {
-	case tr := <-traceFreeList:
-		return tr
-	default:
-		return new(trace)
-	}
-}
-
-// freeTrace adds tr to traceFreeList if there's room.
-// This is non-blocking.
-func freeTrace(tr *trace) {
-	if DebugUseAfterFinish {
-		return // never reuse
-	}
-	tr.reset()
-	select {
-	case traceFreeList <- tr:
-	default:
-	}
-}
-
-func elapsed(d time.Duration) string {
-	b := []byte(fmt.Sprintf("%.6f", d.Seconds()))
-
-	// For subsecond durations, blank all zeros before decimal point,
-	// and all zeros between the decimal point and the first non-zero digit.
-	if d < time.Second {
-		dot := bytes.IndexByte(b, '.')
-		for i := 0; i < dot; i++ {
-			b[i] = ' '
-		}
-		for i := dot + 1; i < len(b); i++ {
-			if b[i] == '0' {
-				b[i] = ' '
-			} else {
-				break
-			}
-		}
-	}
-
-	return string(b)
-}
-
-var pageTmplCache *template.Template
-var pageTmplOnce sync.Once
-
-func pageTmpl() *template.Template {
-	pageTmplOnce.Do(func() {
-		pageTmplCache = template.Must(template.New("Page").Funcs(template.FuncMap{
-			"elapsed": elapsed,
-			"add":     func(a, b int) int { return a + b },
-		}).Parse(pageHTML))
-	})
-	return pageTmplCache
-}
-
-const pageHTML = `
-{{template "Prolog" .}}
-{{template "StatusTable" .}}
-{{template "Epilog" .}}
-
-{{define "Prolog"}}
-<html>
-	<head>
-	<title>/debug/requests</title>
-	<style type="text/css">
-		body {
-			font-family: sans-serif;
-		}
-		table#tr-status td.family {
-			padding-right: 2em;
-		}
-		table#tr-status td.active {
-			padding-right: 1em;
-		}
-		table#tr-status td.latency-first {
-			padding-left: 1em;
-		}
-		table#tr-status td.empty {
-			color: #aaa;
-		}
-		table#reqs {
-			margin-top: 1em;
-		}
-		table#reqs tr.first {
-			{{if $.Expanded}}font-weight: bold;{{end}}
-		}
-		table#reqs td {
-			font-family: monospace;
-		}
-		table#reqs td.when {
-			text-align: right;
-			white-space: nowrap;
-		}
-		table#reqs td.elapsed {
-			padding: 0 0.5em;
-			text-align: right;
-			white-space: pre;
-			width: 10em;
-		}
-		address {
-			font-size: smaller;
-			margin-top: 5em;
-		}
-	</style>
-	</head>
-	<body>
-
-<h1>/debug/requests</h1>
-{{end}} {{/* end of Prolog */}}
-
-{{define "StatusTable"}}
-<table id="tr-status">
-	{{range $fam := .Families}}
-	<tr>
-		<td class="family">{{$fam}}</td>
-
-		{{$n := index $.ActiveTraceCount $fam}}
-		<td class="active {{if not $n}}empty{{end}}">
-			{{if $n}}<a href="?fam={{$fam}}&b=-1{{if $.Expanded}}&exp=1{{end}}">{{end}}
-			[{{$n}} active]
-			{{if $n}}</a>{{end}}
-		</td>
-
-		{{$f := index $.CompletedTraces $fam}}
-		{{range $i, $b := $f.Buckets}}
-		{{$empty := $b.Empty}}
-		<td {{if $empty}}class="empty"{{end}}>
-		{{if not $empty}}<a href="?fam={{$fam}}&b={{$i}}{{if $.Expanded}}&exp=1{{end}}">{{end}}
-		[{{.Cond}}]
-		{{if not $empty}}</a>{{end}}
-		</td>
-		{{end}}
-
-		{{$nb := len $f.Buckets}}
-		<td class="latency-first">
-		<a href="?fam={{$fam}}&b={{$nb}}">[minute]</a>
-		</td>
-		<td>
-		<a href="?fam={{$fam}}&b={{add $nb 1}}">[hour]</a>
-		</td>
-		<td>
-		<a href="?fam={{$fam}}&b={{add $nb 2}}">[total]</a>
-		</td>
-
-	</tr>
-	{{end}}
-</table>
-{{end}} {{/* end of StatusTable */}}
-
-{{define "Epilog"}}
-{{if $.Traces}}
-<hr />
-<h3>Family: {{$.Family}}</h3>
-
-{{if or $.Expanded $.Traced}}
-  <a href="?fam={{$.Family}}&b={{$.Bucket}}">[Normal/Summary]</a>
-{{else}}
-  [Normal/Summary]
-{{end}}
-
-{{if or (not $.Expanded) $.Traced}}
-  <a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1">[Normal/Expanded]</a>
-{{else}}
-  [Normal/Expanded]
-{{end}}
-
-{{if not $.Active}}
-	{{if or $.Expanded (not $.Traced)}}
-	<a href="?fam={{$.Family}}&b={{$.Bucket}}&rtraced=1">[Traced/Summary]</a>
-	{{else}}
-	[Traced/Summary]
-	{{end}}
-	{{if or (not $.Expanded) (not $.Traced)}}
-	<a href="?fam={{$.Family}}&b={{$.Bucket}}&exp=1&rtraced=1">[Traced/Expanded]</a>
-        {{else}}
-	[Traced/Expanded]
-	{{end}}
-{{end}}
-
-{{if $.Total}}
-<p><em>Showing <b>{{len $.Traces}}</b> of <b>{{$.Total}}</b> traces.</em></p>
-{{end}}
-
-<table id="reqs">
-	<caption>
-		{{if $.Active}}Active{{else}}Completed{{end}} Requests
-	</caption>
-	<tr><th>When</th><th>Elapsed&nbsp;(s)</th></tr>
-	{{range $tr := $.Traces}}
-	<tr class="first">
-		<td class="when">{{$tr.When}}</td>
-		<td class="elapsed">{{$tr.ElapsedTime}}</td>
-		<td>{{$tr.Title}}</td>
-		{{/* TODO: include traceID/spanID */}}
-	</tr>
-	{{if $.Expanded}}
-	{{range $tr.Events}}
-	<tr>
-		<td class="when">{{.WhenString}}</td>
-		<td class="elapsed">{{elapsed .Elapsed}}</td>
-		<td>{{if or $.ShowSensitive (not .Sensitive)}}... {{.What}}{{else}}<em>[redacted]</em>{{end}}</td>
-	</tr>
-	{{end}}
-	{{end}}
-	{{end}}
-</table>
-{{end}} {{/* if $.Traces */}}
-
-{{if $.Histogram}}
-<h4>Latency (&micro;s) of {{$.Family}} over {{$.HistogramWindow}}</h4>
-{{$.Histogram}}
-{{end}} {{/* if $.Histogram */}}
-
-	</body>
-</html>
-{{end}} {{/* end of Epilog */}}
-`
diff --git a/installer/vendor/golang.org/x/net/trace/trace_test.go b/installer/vendor/golang.org/x/net/trace/trace_test.go
deleted file mode 100644
index bfd9dfe947..0000000000
--- a/installer/vendor/golang.org/x/net/trace/trace_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package trace
-
-import (
-	"net/http"
-	"reflect"
-	"testing"
-)
-
-type s struct{}
-
-func (s) String() string { return "lazy string" }
-
-// TestReset checks whether all the fields are zeroed after reset.
-func TestReset(t *testing.T) {
-	tr := New("foo", "bar")
-	tr.LazyLog(s{}, false)
-	tr.LazyPrintf("%d", 1)
-	tr.SetRecycler(func(_ interface{}) {})
-	tr.SetTraceInfo(3, 4)
-	tr.SetMaxEvents(100)
-	tr.SetError()
-	tr.Finish()
-
-	tr.(*trace).reset()
-
-	if !reflect.DeepEqual(tr, new(trace)) {
-		t.Errorf("reset didn't clear all fields: %+v", tr)
-	}
-}
-
-// TestResetLog checks whether all the fields are zeroed after reset.
-func TestResetLog(t *testing.T) {
-	el := NewEventLog("foo", "bar")
-	el.Printf("message")
-	el.Errorf("error")
-	el.Finish()
-
-	el.(*eventLog).reset()
-
-	if !reflect.DeepEqual(el, new(eventLog)) {
-		t.Errorf("reset didn't clear all fields: %+v", el)
-	}
-}
-
-func TestAuthRequest(t *testing.T) {
-	testCases := []struct {
-		host string
-		want bool
-	}{
-		{host: "192.168.23.1", want: false},
-		{host: "192.168.23.1:8080", want: false},
-		{host: "malformed remote addr", want: false},
-		{host: "localhost", want: true},
-		{host: "localhost:8080", want: true},
-		{host: "127.0.0.1", want: true},
-		{host: "127.0.0.1:8080", want: true},
-		{host: "::1", want: true},
-		{host: "[::1]:8080", want: true},
-	}
-	for _, tt := range testCases {
-		req := &http.Request{RemoteAddr: tt.host}
-		any, sensitive := AuthRequest(req)
-		if any != tt.want || sensitive != tt.want {
-			t.Errorf("AuthRequest(%q) = %t, %t; want %t, %t", tt.host, any, sensitive, tt.want, tt.want)
-		}
-	}
-}
-
-// TestParseTemplate checks that all templates used by this package are valid
-// as they are parsed on first usage
-func TestParseTemplate(t *testing.T) {
-	if tmpl := distTmpl(); tmpl == nil {
-		t.Error("invalid template returned from distTmpl()")
-	}
-	if tmpl := pageTmpl(); tmpl == nil {
-		t.Error("invalid template returned from pageTmpl()")
-	}
-	if tmpl := eventsTmpl(); tmpl == nil {
-		t.Error("invalid template returned from eventsTmpl()")
-	}
-}
-
-func benchmarkTrace(b *testing.B, maxEvents, numEvents int) {
-	numSpans := (b.N + numEvents + 1) / numEvents
-
-	for i := 0; i < numSpans; i++ {
-		tr := New("test", "test")
-		tr.SetMaxEvents(maxEvents)
-		for j := 0; j < numEvents; j++ {
-			tr.LazyPrintf("%d", j)
-		}
-		tr.Finish()
-	}
-}
-
-func BenchmarkTrace_Default_2(b *testing.B) {
-	benchmarkTrace(b, 0, 2)
-}
-
-func BenchmarkTrace_Default_10(b *testing.B) {
-	benchmarkTrace(b, 0, 10)
-}
-
-func BenchmarkTrace_Default_100(b *testing.B) {
-	benchmarkTrace(b, 0, 100)
-}
-
-func BenchmarkTrace_Default_1000(b *testing.B) {
-	benchmarkTrace(b, 0, 1000)
-}
-
-func BenchmarkTrace_Default_10000(b *testing.B) {
-	benchmarkTrace(b, 0, 10000)
-}
-
-func BenchmarkTrace_10_2(b *testing.B) {
-	benchmarkTrace(b, 10, 2)
-}
-
-func BenchmarkTrace_10_10(b *testing.B) {
-	benchmarkTrace(b, 10, 10)
-}
-
-func BenchmarkTrace_10_100(b *testing.B) {
-	benchmarkTrace(b, 10, 100)
-}
-
-func BenchmarkTrace_10_1000(b *testing.B) {
-	benchmarkTrace(b, 10, 1000)
-}
-
-func BenchmarkTrace_10_10000(b *testing.B) {
-	benchmarkTrace(b, 10, 10000)
-}
-
-func BenchmarkTrace_100_2(b *testing.B) {
-	benchmarkTrace(b, 100, 2)
-}
-
-func BenchmarkTrace_100_10(b *testing.B) {
-	benchmarkTrace(b, 100, 10)
-}
-
-func BenchmarkTrace_100_100(b *testing.B) {
-	benchmarkTrace(b, 100, 100)
-}
-
-func BenchmarkTrace_100_1000(b *testing.B) {
-	benchmarkTrace(b, 100, 1000)
-}
-
-func BenchmarkTrace_100_10000(b *testing.B) {
-	benchmarkTrace(b, 100, 10000)
-}
-
-func BenchmarkTrace_1000_2(b *testing.B) {
-	benchmarkTrace(b, 1000, 2)
-}
-
-func BenchmarkTrace_1000_10(b *testing.B) {
-	benchmarkTrace(b, 1000, 10)
-}
-
-func BenchmarkTrace_1000_100(b *testing.B) {
-	benchmarkTrace(b, 1000, 100)
-}
-
-func BenchmarkTrace_1000_1000(b *testing.B) {
-	benchmarkTrace(b, 1000, 1000)
-}
-
-func BenchmarkTrace_1000_10000(b *testing.B) {
-	benchmarkTrace(b, 1000, 10000)
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/file.go b/installer/vendor/golang.org/x/net/webdav/file.go
deleted file mode 100644
index 748118dd38..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/file.go
+++ /dev/null
@@ -1,796 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"encoding/xml"
-	"io"
-	"net/http"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-)
-
-// slashClean is equivalent to but slightly more efficient than
-// path.Clean("/" + name).
-func slashClean(name string) string {
-	if name == "" || name[0] != '/' {
-		name = "/" + name
-	}
-	return path.Clean(name)
-}
-
-// A FileSystem implements access to a collection of named files. The elements
-// in a file path are separated by slash ('/', U+002F) characters, regardless
-// of host operating system convention.
-//
-// Each method has the same semantics as the os package's function of the same
-// name.
-//
-// Note that the os.Rename documentation says that "OS-specific restrictions
-// might apply". In particular, whether or not renaming a file or directory
-// overwriting another existing file or directory is an error is OS-dependent.
-type FileSystem interface {
-	Mkdir(ctx context.Context, name string, perm os.FileMode) error
-	OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (File, error)
-	RemoveAll(ctx context.Context, name string) error
-	Rename(ctx context.Context, oldName, newName string) error
-	Stat(ctx context.Context, name string) (os.FileInfo, error)
-}
-
-// A File is returned by a FileSystem's OpenFile method and can be served by a
-// Handler.
-//
-// A File may optionally implement the DeadPropsHolder interface, if it can
-// load and save dead properties.
-type File interface {
-	http.File
-	io.Writer
-}
-
-// A Dir implements FileSystem using the native file system restricted to a
-// specific directory tree.
-//
-// While the FileSystem.OpenFile method takes '/'-separated paths, a Dir's
-// string value is a filename on the native file system, not a URL, so it is
-// separated by filepath.Separator, which isn't necessarily '/'.
-//
-// An empty Dir is treated as ".".
-type Dir string
-
-func (d Dir) resolve(name string) string {
-	// This implementation is based on Dir.Open's code in the standard net/http package.
-	if filepath.Separator != '/' && strings.IndexRune(name, filepath.Separator) >= 0 ||
-		strings.Contains(name, "\x00") {
-		return ""
-	}
-	dir := string(d)
-	if dir == "" {
-		dir = "."
-	}
-	return filepath.Join(dir, filepath.FromSlash(slashClean(name)))
-}
-
-func (d Dir) Mkdir(ctx context.Context, name string, perm os.FileMode) error {
-	if name = d.resolve(name); name == "" {
-		return os.ErrNotExist
-	}
-	return os.Mkdir(name, perm)
-}
-
-func (d Dir) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (File, error) {
-	if name = d.resolve(name); name == "" {
-		return nil, os.ErrNotExist
-	}
-	f, err := os.OpenFile(name, flag, perm)
-	if err != nil {
-		return nil, err
-	}
-	return f, nil
-}
-
-func (d Dir) RemoveAll(ctx context.Context, name string) error {
-	if name = d.resolve(name); name == "" {
-		return os.ErrNotExist
-	}
-	if name == filepath.Clean(string(d)) {
-		// Prohibit removing the virtual root directory.
-		return os.ErrInvalid
-	}
-	return os.RemoveAll(name)
-}
-
-func (d Dir) Rename(ctx context.Context, oldName, newName string) error {
-	if oldName = d.resolve(oldName); oldName == "" {
-		return os.ErrNotExist
-	}
-	if newName = d.resolve(newName); newName == "" {
-		return os.ErrNotExist
-	}
-	if root := filepath.Clean(string(d)); root == oldName || root == newName {
-		// Prohibit renaming from or to the virtual root directory.
-		return os.ErrInvalid
-	}
-	return os.Rename(oldName, newName)
-}
-
-func (d Dir) Stat(ctx context.Context, name string) (os.FileInfo, error) {
-	if name = d.resolve(name); name == "" {
-		return nil, os.ErrNotExist
-	}
-	return os.Stat(name)
-}
-
-// NewMemFS returns a new in-memory FileSystem implementation.
-func NewMemFS() FileSystem {
-	return &memFS{
-		root: memFSNode{
-			children: make(map[string]*memFSNode),
-			mode:     0660 | os.ModeDir,
-			modTime:  time.Now(),
-		},
-	}
-}
-
-// A memFS implements FileSystem, storing all metadata and actual file data
-// in-memory. No limits on filesystem size are used, so it is not recommended
-// this be used where the clients are untrusted.
-//
-// Concurrent access is permitted. The tree structure is protected by a mutex,
-// and each node's contents and metadata are protected by a per-node mutex.
-//
-// TODO: Enforce file permissions.
-type memFS struct {
-	mu   sync.Mutex
-	root memFSNode
-}
-
-// TODO: clean up and rationalize the walk/find code.
-
-// walk walks the directory tree for the fullname, calling f at each step. If f
-// returns an error, the walk will be aborted and return that same error.
-//
-// dir is the directory at that step, frag is the name fragment, and final is
-// whether it is the final step. For example, walking "/foo/bar/x" will result
-// in 3 calls to f:
-//   - "/", "foo", false
-//   - "/foo/", "bar", false
-//   - "/foo/bar/", "x", true
-// The frag argument will be empty only if dir is the root node and the walk
-// ends at that root node.
-func (fs *memFS) walk(op, fullname string, f func(dir *memFSNode, frag string, final bool) error) error {
-	original := fullname
-	fullname = slashClean(fullname)
-
-	// Strip any leading "/"s to make fullname a relative path, as the walk
-	// starts at fs.root.
-	if fullname[0] == '/' {
-		fullname = fullname[1:]
-	}
-	dir := &fs.root
-
-	for {
-		frag, remaining := fullname, ""
-		i := strings.IndexRune(fullname, '/')
-		final := i < 0
-		if !final {
-			frag, remaining = fullname[:i], fullname[i+1:]
-		}
-		if frag == "" && dir != &fs.root {
-			panic("webdav: empty path fragment for a clean path")
-		}
-		if err := f(dir, frag, final); err != nil {
-			return &os.PathError{
-				Op:   op,
-				Path: original,
-				Err:  err,
-			}
-		}
-		if final {
-			break
-		}
-		child := dir.children[frag]
-		if child == nil {
-			return &os.PathError{
-				Op:   op,
-				Path: original,
-				Err:  os.ErrNotExist,
-			}
-		}
-		if !child.mode.IsDir() {
-			return &os.PathError{
-				Op:   op,
-				Path: original,
-				Err:  os.ErrInvalid,
-			}
-		}
-		dir, fullname = child, remaining
-	}
-	return nil
-}
-
-// find returns the parent of the named node and the relative name fragment
-// from the parent to the child. For example, if finding "/foo/bar/baz" then
-// parent will be the node for "/foo/bar" and frag will be "baz".
-//
-// If the fullname names the root node, then parent, frag and err will be zero.
-//
-// find returns an error if the parent does not already exist or the parent
-// isn't a directory, but it will not return an error per se if the child does
-// not already exist. The error returned is either nil or an *os.PathError
-// whose Op is op.
-func (fs *memFS) find(op, fullname string) (parent *memFSNode, frag string, err error) {
-	err = fs.walk(op, fullname, func(parent0 *memFSNode, frag0 string, final bool) error {
-		if !final {
-			return nil
-		}
-		if frag0 != "" {
-			parent, frag = parent0, frag0
-		}
-		return nil
-	})
-	return parent, frag, err
-}
-
-func (fs *memFS) Mkdir(ctx context.Context, name string, perm os.FileMode) error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	dir, frag, err := fs.find("mkdir", name)
-	if err != nil {
-		return err
-	}
-	if dir == nil {
-		// We can't create the root.
-		return os.ErrInvalid
-	}
-	if _, ok := dir.children[frag]; ok {
-		return os.ErrExist
-	}
-	dir.children[frag] = &memFSNode{
-		children: make(map[string]*memFSNode),
-		mode:     perm.Perm() | os.ModeDir,
-		modTime:  time.Now(),
-	}
-	return nil
-}
-
-func (fs *memFS) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (File, error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	dir, frag, err := fs.find("open", name)
-	if err != nil {
-		return nil, err
-	}
-	var n *memFSNode
-	if dir == nil {
-		// We're opening the root.
-		if flag&(os.O_WRONLY|os.O_RDWR) != 0 {
-			return nil, os.ErrPermission
-		}
-		n, frag = &fs.root, "/"
-
-	} else {
-		n = dir.children[frag]
-		if flag&(os.O_SYNC|os.O_APPEND) != 0 {
-			// memFile doesn't support these flags yet.
-			return nil, os.ErrInvalid
-		}
-		if flag&os.O_CREATE != 0 {
-			if flag&os.O_EXCL != 0 && n != nil {
-				return nil, os.ErrExist
-			}
-			if n == nil {
-				n = &memFSNode{
-					mode: perm.Perm(),
-				}
-				dir.children[frag] = n
-			}
-		}
-		if n == nil {
-			return nil, os.ErrNotExist
-		}
-		if flag&(os.O_WRONLY|os.O_RDWR) != 0 && flag&os.O_TRUNC != 0 {
-			n.mu.Lock()
-			n.data = nil
-			n.mu.Unlock()
-		}
-	}
-
-	children := make([]os.FileInfo, 0, len(n.children))
-	for cName, c := range n.children {
-		children = append(children, c.stat(cName))
-	}
-	return &memFile{
-		n:                n,
-		nameSnapshot:     frag,
-		childrenSnapshot: children,
-	}, nil
-}
-
-func (fs *memFS) RemoveAll(ctx context.Context, name string) error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	dir, frag, err := fs.find("remove", name)
-	if err != nil {
-		return err
-	}
-	if dir == nil {
-		// We can't remove the root.
-		return os.ErrInvalid
-	}
-	delete(dir.children, frag)
-	return nil
-}
-
-func (fs *memFS) Rename(ctx context.Context, oldName, newName string) error {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	oldName = slashClean(oldName)
-	newName = slashClean(newName)
-	if oldName == newName {
-		return nil
-	}
-	if strings.HasPrefix(newName, oldName+"/") {
-		// We can't rename oldName to be a sub-directory of itself.
-		return os.ErrInvalid
-	}
-
-	oDir, oFrag, err := fs.find("rename", oldName)
-	if err != nil {
-		return err
-	}
-	if oDir == nil {
-		// We can't rename from the root.
-		return os.ErrInvalid
-	}
-
-	nDir, nFrag, err := fs.find("rename", newName)
-	if err != nil {
-		return err
-	}
-	if nDir == nil {
-		// We can't rename to the root.
-		return os.ErrInvalid
-	}
-
-	oNode, ok := oDir.children[oFrag]
-	if !ok {
-		return os.ErrNotExist
-	}
-	if oNode.children != nil {
-		if nNode, ok := nDir.children[nFrag]; ok {
-			if nNode.children == nil {
-				return errNotADirectory
-			}
-			if len(nNode.children) != 0 {
-				return errDirectoryNotEmpty
-			}
-		}
-	}
-	delete(oDir.children, oFrag)
-	nDir.children[nFrag] = oNode
-	return nil
-}
-
-func (fs *memFS) Stat(ctx context.Context, name string) (os.FileInfo, error) {
-	fs.mu.Lock()
-	defer fs.mu.Unlock()
-
-	dir, frag, err := fs.find("stat", name)
-	if err != nil {
-		return nil, err
-	}
-	if dir == nil {
-		// We're stat'ting the root.
-		return fs.root.stat("/"), nil
-	}
-	if n, ok := dir.children[frag]; ok {
-		return n.stat(path.Base(name)), nil
-	}
-	return nil, os.ErrNotExist
-}
-
-// A memFSNode represents a single entry in the in-memory filesystem and also
-// implements os.FileInfo.
-type memFSNode struct {
-	// children is protected by memFS.mu.
-	children map[string]*memFSNode
-
-	mu        sync.Mutex
-	data      []byte
-	mode      os.FileMode
-	modTime   time.Time
-	deadProps map[xml.Name]Property
-}
-
-func (n *memFSNode) stat(name string) *memFileInfo {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-	return &memFileInfo{
-		name:    name,
-		size:    int64(len(n.data)),
-		mode:    n.mode,
-		modTime: n.modTime,
-	}
-}
-
-func (n *memFSNode) DeadProps() (map[xml.Name]Property, error) {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-	if len(n.deadProps) == 0 {
-		return nil, nil
-	}
-	ret := make(map[xml.Name]Property, len(n.deadProps))
-	for k, v := range n.deadProps {
-		ret[k] = v
-	}
-	return ret, nil
-}
-
-func (n *memFSNode) Patch(patches []Proppatch) ([]Propstat, error) {
-	n.mu.Lock()
-	defer n.mu.Unlock()
-	pstat := Propstat{Status: http.StatusOK}
-	for _, patch := range patches {
-		for _, p := range patch.Props {
-			pstat.Props = append(pstat.Props, Property{XMLName: p.XMLName})
-			if patch.Remove {
-				delete(n.deadProps, p.XMLName)
-				continue
-			}
-			if n.deadProps == nil {
-				n.deadProps = map[xml.Name]Property{}
-			}
-			n.deadProps[p.XMLName] = p
-		}
-	}
-	return []Propstat{pstat}, nil
-}
-
-type memFileInfo struct {
-	name    string
-	size    int64
-	mode    os.FileMode
-	modTime time.Time
-}
-
-func (f *memFileInfo) Name() string       { return f.name }
-func (f *memFileInfo) Size() int64        { return f.size }
-func (f *memFileInfo) Mode() os.FileMode  { return f.mode }
-func (f *memFileInfo) ModTime() time.Time { return f.modTime }
-func (f *memFileInfo) IsDir() bool        { return f.mode.IsDir() }
-func (f *memFileInfo) Sys() interface{}   { return nil }
-
-// A memFile is a File implementation for a memFSNode. It is a per-file (not
-// per-node) read/write position, and a snapshot of the memFS' tree structure
-// (a node's name and children) for that node.
-type memFile struct {
-	n                *memFSNode
-	nameSnapshot     string
-	childrenSnapshot []os.FileInfo
-	// pos is protected by n.mu.
-	pos int
-}
-
-// A *memFile implements the optional DeadPropsHolder interface.
-var _ DeadPropsHolder = (*memFile)(nil)
-
-func (f *memFile) DeadProps() (map[xml.Name]Property, error)     { return f.n.DeadProps() }
-func (f *memFile) Patch(patches []Proppatch) ([]Propstat, error) { return f.n.Patch(patches) }
-
-func (f *memFile) Close() error {
-	return nil
-}
-
-func (f *memFile) Read(p []byte) (int, error) {
-	f.n.mu.Lock()
-	defer f.n.mu.Unlock()
-	if f.n.mode.IsDir() {
-		return 0, os.ErrInvalid
-	}
-	if f.pos >= len(f.n.data) {
-		return 0, io.EOF
-	}
-	n := copy(p, f.n.data[f.pos:])
-	f.pos += n
-	return n, nil
-}
-
-func (f *memFile) Readdir(count int) ([]os.FileInfo, error) {
-	f.n.mu.Lock()
-	defer f.n.mu.Unlock()
-	if !f.n.mode.IsDir() {
-		return nil, os.ErrInvalid
-	}
-	old := f.pos
-	if old >= len(f.childrenSnapshot) {
-		// The os.File Readdir docs say that at the end of a directory,
-		// the error is io.EOF if count > 0 and nil if count <= 0.
-		if count > 0 {
-			return nil, io.EOF
-		}
-		return nil, nil
-	}
-	if count > 0 {
-		f.pos += count
-		if f.pos > len(f.childrenSnapshot) {
-			f.pos = len(f.childrenSnapshot)
-		}
-	} else {
-		f.pos = len(f.childrenSnapshot)
-		old = 0
-	}
-	return f.childrenSnapshot[old:f.pos], nil
-}
-
-func (f *memFile) Seek(offset int64, whence int) (int64, error) {
-	f.n.mu.Lock()
-	defer f.n.mu.Unlock()
-	npos := f.pos
-	// TODO: How to handle offsets greater than the size of system int?
-	switch whence {
-	case os.SEEK_SET:
-		npos = int(offset)
-	case os.SEEK_CUR:
-		npos += int(offset)
-	case os.SEEK_END:
-		npos = len(f.n.data) + int(offset)
-	default:
-		npos = -1
-	}
-	if npos < 0 {
-		return 0, os.ErrInvalid
-	}
-	f.pos = npos
-	return int64(f.pos), nil
-}
-
-func (f *memFile) Stat() (os.FileInfo, error) {
-	return f.n.stat(f.nameSnapshot), nil
-}
-
-func (f *memFile) Write(p []byte) (int, error) {
-	lenp := len(p)
-	f.n.mu.Lock()
-	defer f.n.mu.Unlock()
-
-	if f.n.mode.IsDir() {
-		return 0, os.ErrInvalid
-	}
-	if f.pos < len(f.n.data) {
-		n := copy(f.n.data[f.pos:], p)
-		f.pos += n
-		p = p[n:]
-	} else if f.pos > len(f.n.data) {
-		// Write permits the creation of holes, if we've seek'ed past the
-		// existing end of file.
-		if f.pos <= cap(f.n.data) {
-			oldLen := len(f.n.data)
-			f.n.data = f.n.data[:f.pos]
-			hole := f.n.data[oldLen:]
-			for i := range hole {
-				hole[i] = 0
-			}
-		} else {
-			d := make([]byte, f.pos, f.pos+len(p))
-			copy(d, f.n.data)
-			f.n.data = d
-		}
-	}
-
-	if len(p) > 0 {
-		// We should only get here if f.pos == len(f.n.data).
-		f.n.data = append(f.n.data, p...)
-		f.pos = len(f.n.data)
-	}
-	f.n.modTime = time.Now()
-	return lenp, nil
-}
-
-// moveFiles moves files and/or directories from src to dst.
-//
-// See section 9.9.4 for when various HTTP status codes apply.
-func moveFiles(ctx context.Context, fs FileSystem, src, dst string, overwrite bool) (status int, err error) {
-	created := false
-	if _, err := fs.Stat(ctx, dst); err != nil {
-		if !os.IsNotExist(err) {
-			return http.StatusForbidden, err
-		}
-		created = true
-	} else if overwrite {
-		// Section 9.9.3 says that "If a resource exists at the destination
-		// and the Overwrite header is "T", then prior to performing the move,
-		// the server must perform a DELETE with "Depth: infinity" on the
-		// destination resource.
-		if err := fs.RemoveAll(ctx, dst); err != nil {
-			return http.StatusForbidden, err
-		}
-	} else {
-		return http.StatusPreconditionFailed, os.ErrExist
-	}
-	if err := fs.Rename(ctx, src, dst); err != nil {
-		return http.StatusForbidden, err
-	}
-	if created {
-		return http.StatusCreated, nil
-	}
-	return http.StatusNoContent, nil
-}
-
-func copyProps(dst, src File) error {
-	d, ok := dst.(DeadPropsHolder)
-	if !ok {
-		return nil
-	}
-	s, ok := src.(DeadPropsHolder)
-	if !ok {
-		return nil
-	}
-	m, err := s.DeadProps()
-	if err != nil {
-		return err
-	}
-	props := make([]Property, 0, len(m))
-	for _, prop := range m {
-		props = append(props, prop)
-	}
-	_, err = d.Patch([]Proppatch{{Props: props}})
-	return err
-}
-
-// copyFiles copies files and/or directories from src to dst.
-//
-// See section 9.8.5 for when various HTTP status codes apply.
-func copyFiles(ctx context.Context, fs FileSystem, src, dst string, overwrite bool, depth int, recursion int) (status int, err error) {
-	if recursion == 1000 {
-		return http.StatusInternalServerError, errRecursionTooDeep
-	}
-	recursion++
-
-	// TODO: section 9.8.3 says that "Note that an infinite-depth COPY of /A/
-	// into /A/B/ could lead to infinite recursion if not handled correctly."
-
-	srcFile, err := fs.OpenFile(ctx, src, os.O_RDONLY, 0)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusNotFound, err
-		}
-		return http.StatusInternalServerError, err
-	}
-	defer srcFile.Close()
-	srcStat, err := srcFile.Stat()
-	if err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusNotFound, err
-		}
-		return http.StatusInternalServerError, err
-	}
-	srcPerm := srcStat.Mode() & os.ModePerm
-
-	created := false
-	if _, err := fs.Stat(ctx, dst); err != nil {
-		if os.IsNotExist(err) {
-			created = true
-		} else {
-			return http.StatusForbidden, err
-		}
-	} else {
-		if !overwrite {
-			return http.StatusPreconditionFailed, os.ErrExist
-		}
-		if err := fs.RemoveAll(ctx, dst); err != nil && !os.IsNotExist(err) {
-			return http.StatusForbidden, err
-		}
-	}
-
-	if srcStat.IsDir() {
-		if err := fs.Mkdir(ctx, dst, srcPerm); err != nil {
-			return http.StatusForbidden, err
-		}
-		if depth == infiniteDepth {
-			children, err := srcFile.Readdir(-1)
-			if err != nil {
-				return http.StatusForbidden, err
-			}
-			for _, c := range children {
-				name := c.Name()
-				s := path.Join(src, name)
-				d := path.Join(dst, name)
-				cStatus, cErr := copyFiles(ctx, fs, s, d, overwrite, depth, recursion)
-				if cErr != nil {
-					// TODO: MultiStatus.
-					return cStatus, cErr
-				}
-			}
-		}
-
-	} else {
-		dstFile, err := fs.OpenFile(ctx, dst, os.O_RDWR|os.O_CREATE|os.O_TRUNC, srcPerm)
-		if err != nil {
-			if os.IsNotExist(err) {
-				return http.StatusConflict, err
-			}
-			return http.StatusForbidden, err
-
-		}
-		_, copyErr := io.Copy(dstFile, srcFile)
-		propsErr := copyProps(dstFile, srcFile)
-		closeErr := dstFile.Close()
-		if copyErr != nil {
-			return http.StatusInternalServerError, copyErr
-		}
-		if propsErr != nil {
-			return http.StatusInternalServerError, propsErr
-		}
-		if closeErr != nil {
-			return http.StatusInternalServerError, closeErr
-		}
-	}
-
-	if created {
-		return http.StatusCreated, nil
-	}
-	return http.StatusNoContent, nil
-}
-
-// walkFS traverses filesystem fs starting at name up to depth levels.
-//
-// Allowed values for depth are 0, 1 or infiniteDepth. For each visited node,
-// walkFS calls walkFn. If a visited file system node is a directory and
-// walkFn returns filepath.SkipDir, walkFS will skip traversal of this node.
-func walkFS(ctx context.Context, fs FileSystem, depth int, name string, info os.FileInfo, walkFn filepath.WalkFunc) error {
-	// This implementation is based on Walk's code in the standard path/filepath package.
-	err := walkFn(name, info, nil)
-	if err != nil {
-		if info.IsDir() && err == filepath.SkipDir {
-			return nil
-		}
-		return err
-	}
-	if !info.IsDir() || depth == 0 {
-		return nil
-	}
-	if depth == 1 {
-		depth = 0
-	}
-
-	// Read directory names.
-	f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
-	if err != nil {
-		return walkFn(name, info, err)
-	}
-	fileInfos, err := f.Readdir(0)
-	f.Close()
-	if err != nil {
-		return walkFn(name, info, err)
-	}
-
-	for _, fileInfo := range fileInfos {
-		filename := path.Join(name, fileInfo.Name())
-		fileInfo, err := fs.Stat(ctx, filename)
-		if err != nil {
-			if err := walkFn(filename, fileInfo, err); err != nil && err != filepath.SkipDir {
-				return err
-			}
-		} else {
-			err = walkFS(ctx, fs, depth, filename, fileInfo, walkFn)
-			if err != nil {
-				if !fileInfo.IsDir() || err != filepath.SkipDir {
-					return err
-				}
-			}
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/file_go1.6.go b/installer/vendor/golang.org/x/net/webdav/file_go1.6.go
deleted file mode 100644
index fa387700d1..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/file_go1.6.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.7
-
-package webdav
-
-import (
-	"net/http"
-
-	"golang.org/x/net/context"
-)
-
-func getContext(r *http.Request) context.Context {
-	return context.Background()
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/file_go1.7.go b/installer/vendor/golang.org/x/net/webdav/file_go1.7.go
deleted file mode 100644
index d1c3de8327..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/file_go1.7.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package webdav
-
-import (
-	"context"
-	"net/http"
-)
-
-func getContext(r *http.Request) context.Context {
-	return r.Context()
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/file_test.go b/installer/vendor/golang.org/x/net/webdav/file_test.go
deleted file mode 100644
index bfd96e1935..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/file_test.go
+++ /dev/null
@@ -1,1184 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestSlashClean(t *testing.T) {
-	testCases := []string{
-		"",
-		".",
-		"/",
-		"/./",
-		"//",
-		"//.",
-		"//a",
-		"/a",
-		"/a/b/c",
-		"/a//b/./../c/d/",
-		"a",
-		"a/b/c",
-	}
-	for _, tc := range testCases {
-		got := slashClean(tc)
-		want := path.Clean("/" + tc)
-		if got != want {
-			t.Errorf("tc=%q: got %q, want %q", tc, got, want)
-		}
-	}
-}
-
-func TestDirResolve(t *testing.T) {
-	testCases := []struct {
-		dir, name, want string
-	}{
-		{"/", "", "/"},
-		{"/", "/", "/"},
-		{"/", ".", "/"},
-		{"/", "./a", "/a"},
-		{"/", "..", "/"},
-		{"/", "..", "/"},
-		{"/", "../", "/"},
-		{"/", "../.", "/"},
-		{"/", "../a", "/a"},
-		{"/", "../..", "/"},
-		{"/", "../bar/a", "/bar/a"},
-		{"/", "../baz/a", "/baz/a"},
-		{"/", "...", "/..."},
-		{"/", ".../a", "/.../a"},
-		{"/", ".../..", "/"},
-		{"/", "a", "/a"},
-		{"/", "a/./b", "/a/b"},
-		{"/", "a/../../b", "/b"},
-		{"/", "a/../b", "/b"},
-		{"/", "a/b", "/a/b"},
-		{"/", "a/b/c/../../d", "/a/d"},
-		{"/", "a/b/c/../../../d", "/d"},
-		{"/", "a/b/c/../../../../d", "/d"},
-		{"/", "a/b/c/d", "/a/b/c/d"},
-
-		{"/foo/bar", "", "/foo/bar"},
-		{"/foo/bar", "/", "/foo/bar"},
-		{"/foo/bar", ".", "/foo/bar"},
-		{"/foo/bar", "./a", "/foo/bar/a"},
-		{"/foo/bar", "..", "/foo/bar"},
-		{"/foo/bar", "../", "/foo/bar"},
-		{"/foo/bar", "../.", "/foo/bar"},
-		{"/foo/bar", "../a", "/foo/bar/a"},
-		{"/foo/bar", "../..", "/foo/bar"},
-		{"/foo/bar", "../bar/a", "/foo/bar/bar/a"},
-		{"/foo/bar", "../baz/a", "/foo/bar/baz/a"},
-		{"/foo/bar", "...", "/foo/bar/..."},
-		{"/foo/bar", ".../a", "/foo/bar/.../a"},
-		{"/foo/bar", ".../..", "/foo/bar"},
-		{"/foo/bar", "a", "/foo/bar/a"},
-		{"/foo/bar", "a/./b", "/foo/bar/a/b"},
-		{"/foo/bar", "a/../../b", "/foo/bar/b"},
-		{"/foo/bar", "a/../b", "/foo/bar/b"},
-		{"/foo/bar", "a/b", "/foo/bar/a/b"},
-		{"/foo/bar", "a/b/c/../../d", "/foo/bar/a/d"},
-		{"/foo/bar", "a/b/c/../../../d", "/foo/bar/d"},
-		{"/foo/bar", "a/b/c/../../../../d", "/foo/bar/d"},
-		{"/foo/bar", "a/b/c/d", "/foo/bar/a/b/c/d"},
-
-		{"/foo/bar/", "", "/foo/bar"},
-		{"/foo/bar/", "/", "/foo/bar"},
-		{"/foo/bar/", ".", "/foo/bar"},
-		{"/foo/bar/", "./a", "/foo/bar/a"},
-		{"/foo/bar/", "..", "/foo/bar"},
-
-		{"/foo//bar///", "", "/foo/bar"},
-		{"/foo//bar///", "/", "/foo/bar"},
-		{"/foo//bar///", ".", "/foo/bar"},
-		{"/foo//bar///", "./a", "/foo/bar/a"},
-		{"/foo//bar///", "..", "/foo/bar"},
-
-		{"/x/y/z", "ab/c\x00d/ef", ""},
-
-		{".", "", "."},
-		{".", "/", "."},
-		{".", ".", "."},
-		{".", "./a", "a"},
-		{".", "..", "."},
-		{".", "..", "."},
-		{".", "../", "."},
-		{".", "../.", "."},
-		{".", "../a", "a"},
-		{".", "../..", "."},
-		{".", "../bar/a", "bar/a"},
-		{".", "../baz/a", "baz/a"},
-		{".", "...", "..."},
-		{".", ".../a", ".../a"},
-		{".", ".../..", "."},
-		{".", "a", "a"},
-		{".", "a/./b", "a/b"},
-		{".", "a/../../b", "b"},
-		{".", "a/../b", "b"},
-		{".", "a/b", "a/b"},
-		{".", "a/b/c/../../d", "a/d"},
-		{".", "a/b/c/../../../d", "d"},
-		{".", "a/b/c/../../../../d", "d"},
-		{".", "a/b/c/d", "a/b/c/d"},
-
-		{"", "", "."},
-		{"", "/", "."},
-		{"", ".", "."},
-		{"", "./a", "a"},
-		{"", "..", "."},
-	}
-
-	for _, tc := range testCases {
-		d := Dir(filepath.FromSlash(tc.dir))
-		if got := filepath.ToSlash(d.resolve(tc.name)); got != tc.want {
-			t.Errorf("dir=%q, name=%q: got %q, want %q", tc.dir, tc.name, got, tc.want)
-		}
-	}
-}
-
-func TestWalk(t *testing.T) {
-	type walkStep struct {
-		name, frag string
-		final      bool
-	}
-
-	testCases := []struct {
-		dir  string
-		want []walkStep
-	}{
-		{"", []walkStep{
-			{"", "", true},
-		}},
-		{"/", []walkStep{
-			{"", "", true},
-		}},
-		{"/a", []walkStep{
-			{"", "a", true},
-		}},
-		{"/a/", []walkStep{
-			{"", "a", true},
-		}},
-		{"/a/b", []walkStep{
-			{"", "a", false},
-			{"a", "b", true},
-		}},
-		{"/a/b/", []walkStep{
-			{"", "a", false},
-			{"a", "b", true},
-		}},
-		{"/a/b/c", []walkStep{
-			{"", "a", false},
-			{"a", "b", false},
-			{"b", "c", true},
-		}},
-		// The following test case is the one mentioned explicitly
-		// in the method description.
-		{"/foo/bar/x", []walkStep{
-			{"", "foo", false},
-			{"foo", "bar", false},
-			{"bar", "x", true},
-		}},
-	}
-
-	ctx := context.Background()
-
-	for _, tc := range testCases {
-		fs := NewMemFS().(*memFS)
-
-		parts := strings.Split(tc.dir, "/")
-		for p := 2; p < len(parts); p++ {
-			d := strings.Join(parts[:p], "/")
-			if err := fs.Mkdir(ctx, d, 0666); err != nil {
-				t.Errorf("tc.dir=%q: mkdir: %q: %v", tc.dir, d, err)
-			}
-		}
-
-		i, prevFrag := 0, ""
-		err := fs.walk("test", tc.dir, func(dir *memFSNode, frag string, final bool) error {
-			got := walkStep{
-				name:  prevFrag,
-				frag:  frag,
-				final: final,
-			}
-			want := tc.want[i]
-
-			if got != want {
-				return fmt.Errorf("got %+v, want %+v", got, want)
-			}
-			i, prevFrag = i+1, frag
-			return nil
-		})
-		if err != nil {
-			t.Errorf("tc.dir=%q: %v", tc.dir, err)
-		}
-	}
-}
-
-// find appends to ss the names of the named file and its children. It is
-// analogous to the Unix find command.
-//
-// The returned strings are not guaranteed to be in any particular order.
-func find(ctx context.Context, ss []string, fs FileSystem, name string) ([]string, error) {
-	stat, err := fs.Stat(ctx, name)
-	if err != nil {
-		return nil, err
-	}
-	ss = append(ss, name)
-	if stat.IsDir() {
-		f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		children, err := f.Readdir(-1)
-		if err != nil {
-			return nil, err
-		}
-		for _, c := range children {
-			ss, err = find(ctx, ss, fs, path.Join(name, c.Name()))
-			if err != nil {
-				return nil, err
-			}
-		}
-	}
-	return ss, nil
-}
-
-func testFS(t *testing.T, fs FileSystem) {
-	errStr := func(err error) string {
-		switch {
-		case os.IsExist(err):
-			return "errExist"
-		case os.IsNotExist(err):
-			return "errNotExist"
-		case err != nil:
-			return "err"
-		}
-		return "ok"
-	}
-
-	// The non-"find" non-"stat" test cases should change the file system state. The
-	// indentation of the "find"s and "stat"s helps distinguish such test cases.
-	testCases := []string{
-		"  stat / want dir",
-		"  stat /a want errNotExist",
-		"  stat /d want errNotExist",
-		"  stat /d/e want errNotExist",
-		"create /a A want ok",
-		"  stat /a want 1",
-		"create /d/e EEE want errNotExist",
-		"mk-dir /a want errExist",
-		"mk-dir /d/m want errNotExist",
-		"mk-dir /d want ok",
-		"  stat /d want dir",
-		"create /d/e EEE want ok",
-		"  stat /d/e want 3",
-		"  find / /a /d /d/e",
-		"create /d/f FFFF want ok",
-		"create /d/g GGGGGGG want ok",
-		"mk-dir /d/m want ok",
-		"mk-dir /d/m want errExist",
-		"create /d/m/p PPPPP want ok",
-		"  stat /d/e want 3",
-		"  stat /d/f want 4",
-		"  stat /d/g want 7",
-		"  stat /d/h want errNotExist",
-		"  stat /d/m want dir",
-		"  stat /d/m/p want 5",
-		"  find / /a /d /d/e /d/f /d/g /d/m /d/m/p",
-		"rm-all /d want ok",
-		"  stat /a want 1",
-		"  stat /d want errNotExist",
-		"  stat /d/e want errNotExist",
-		"  stat /d/f want errNotExist",
-		"  stat /d/g want errNotExist",
-		"  stat /d/m want errNotExist",
-		"  stat /d/m/p want errNotExist",
-		"  find / /a",
-		"mk-dir /d/m want errNotExist",
-		"mk-dir /d want ok",
-		"create /d/f FFFF want ok",
-		"rm-all /d/f want ok",
-		"mk-dir /d/m want ok",
-		"rm-all /z want ok",
-		"rm-all / want err",
-		"create /b BB want ok",
-		"  stat / want dir",
-		"  stat /a want 1",
-		"  stat /b want 2",
-		"  stat /c want errNotExist",
-		"  stat /d want dir",
-		"  stat /d/m want dir",
-		"  find / /a /b /d /d/m",
-		"move__ o=F /b /c want ok",
-		"  stat /b want errNotExist",
-		"  stat /c want 2",
-		"  stat /d/m want dir",
-		"  stat /d/n want errNotExist",
-		"  find / /a /c /d /d/m",
-		"move__ o=F /d/m /d/n want ok",
-		"create /d/n/q QQQQ want ok",
-		"  stat /d/m want errNotExist",
-		"  stat /d/n want dir",
-		"  stat /d/n/q want 4",
-		"move__ o=F /d /d/n/z want err",
-		"move__ o=T /c /d/n/q want ok",
-		"  stat /c want errNotExist",
-		"  stat /d/n/q want 2",
-		"  find / /a /d /d/n /d/n/q",
-		"create /d/n/r RRRRR want ok",
-		"mk-dir /u want ok",
-		"mk-dir /u/v want ok",
-		"move__ o=F /d/n /u want errExist",
-		"create /t TTTTTT want ok",
-		"move__ o=F /d/n /t want errExist",
-		"rm-all /t want ok",
-		"move__ o=F /d/n /t want ok",
-		"  stat /d want dir",
-		"  stat /d/n want errNotExist",
-		"  stat /d/n/r want errNotExist",
-		"  stat /t want dir",
-		"  stat /t/q want 2",
-		"  stat /t/r want 5",
-		"  find / /a /d /t /t/q /t/r /u /u/v",
-		"move__ o=F /t / want errExist",
-		"move__ o=T /t /u/v want ok",
-		"  stat /u/v/r want 5",
-		"move__ o=F / /z want err",
-		"  find / /a /d /u /u/v /u/v/q /u/v/r",
-		"  stat /a want 1",
-		"  stat /b want errNotExist",
-		"  stat /c want errNotExist",
-		"  stat /u/v/r want 5",
-		"copy__ o=F d=0 /a /b want ok",
-		"copy__ o=T d=0 /a /c want ok",
-		"  stat /a want 1",
-		"  stat /b want 1",
-		"  stat /c want 1",
-		"  stat /u/v/r want 5",
-		"copy__ o=F d=0 /u/v/r /b want errExist",
-		"  stat /b want 1",
-		"copy__ o=T d=0 /u/v/r /b want ok",
-		"  stat /a want 1",
-		"  stat /b want 5",
-		"  stat /u/v/r want 5",
-		"rm-all /a want ok",
-		"rm-all /b want ok",
-		"mk-dir /u/v/w want ok",
-		"create /u/v/w/s SSSSSSSS want ok",
-		"  stat /d want dir",
-		"  stat /d/x want errNotExist",
-		"  stat /d/y want errNotExist",
-		"  stat /u/v/r want 5",
-		"  stat /u/v/w/s want 8",
-		"  find / /c /d /u /u/v /u/v/q /u/v/r /u/v/w /u/v/w/s",
-		"copy__ o=T d=0 /u/v /d/x want ok",
-		"copy__ o=T d=∞ /u/v /d/y want ok",
-		"rm-all /u want ok",
-		"  stat /d/x want dir",
-		"  stat /d/x/q want errNotExist",
-		"  stat /d/x/r want errNotExist",
-		"  stat /d/x/w want errNotExist",
-		"  stat /d/x/w/s want errNotExist",
-		"  stat /d/y want dir",
-		"  stat /d/y/q want 2",
-		"  stat /d/y/r want 5",
-		"  stat /d/y/w want dir",
-		"  stat /d/y/w/s want 8",
-		"  stat /u want errNotExist",
-		"  find / /c /d /d/x /d/y /d/y/q /d/y/r /d/y/w /d/y/w/s",
-		"copy__ o=F d=∞ /d/y /d/x want errExist",
-	}
-
-	ctx := context.Background()
-
-	for i, tc := range testCases {
-		tc = strings.TrimSpace(tc)
-		j := strings.IndexByte(tc, ' ')
-		if j < 0 {
-			t.Fatalf("test case #%d %q: invalid command", i, tc)
-		}
-		op, arg := tc[:j], tc[j+1:]
-
-		switch op {
-		default:
-			t.Fatalf("test case #%d %q: invalid operation %q", i, tc, op)
-
-		case "create":
-			parts := strings.Split(arg, " ")
-			if len(parts) != 4 || parts[2] != "want" {
-				t.Fatalf("test case #%d %q: invalid write", i, tc)
-			}
-			f, opErr := fs.OpenFile(ctx, parts[0], os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-			if got := errStr(opErr); got != parts[3] {
-				t.Fatalf("test case #%d %q: OpenFile: got %q (%v), want %q", i, tc, got, opErr, parts[3])
-			}
-			if f != nil {
-				if _, err := f.Write([]byte(parts[1])); err != nil {
-					t.Fatalf("test case #%d %q: Write: %v", i, tc, err)
-				}
-				if err := f.Close(); err != nil {
-					t.Fatalf("test case #%d %q: Close: %v", i, tc, err)
-				}
-			}
-
-		case "find":
-			got, err := find(ctx, nil, fs, "/")
-			if err != nil {
-				t.Fatalf("test case #%d %q: find: %v", i, tc, err)
-			}
-			sort.Strings(got)
-			want := strings.Split(arg, " ")
-			if !reflect.DeepEqual(got, want) {
-				t.Fatalf("test case #%d %q:\ngot  %s\nwant %s", i, tc, got, want)
-			}
-
-		case "copy__", "mk-dir", "move__", "rm-all", "stat":
-			nParts := 3
-			switch op {
-			case "copy__":
-				nParts = 6
-			case "move__":
-				nParts = 5
-			}
-			parts := strings.Split(arg, " ")
-			if len(parts) != nParts {
-				t.Fatalf("test case #%d %q: invalid %s", i, tc, op)
-			}
-
-			got, opErr := "", error(nil)
-			switch op {
-			case "copy__":
-				depth := 0
-				if parts[1] == "d=∞" {
-					depth = infiniteDepth
-				}
-				_, opErr = copyFiles(ctx, fs, parts[2], parts[3], parts[0] == "o=T", depth, 0)
-			case "mk-dir":
-				opErr = fs.Mkdir(ctx, parts[0], 0777)
-			case "move__":
-				_, opErr = moveFiles(ctx, fs, parts[1], parts[2], parts[0] == "o=T")
-			case "rm-all":
-				opErr = fs.RemoveAll(ctx, parts[0])
-			case "stat":
-				var stat os.FileInfo
-				fileName := parts[0]
-				if stat, opErr = fs.Stat(ctx, fileName); opErr == nil {
-					if stat.IsDir() {
-						got = "dir"
-					} else {
-						got = strconv.Itoa(int(stat.Size()))
-					}
-
-					if fileName == "/" {
-						// For a Dir FileSystem, the virtual file system root maps to a
-						// real file system name like "/tmp/webdav-test012345", which does
-						// not end with "/". We skip such cases.
-					} else if statName := stat.Name(); path.Base(fileName) != statName {
-						t.Fatalf("test case #%d %q: file name %q inconsistent with stat name %q",
-							i, tc, fileName, statName)
-					}
-				}
-			}
-			if got == "" {
-				got = errStr(opErr)
-			}
-
-			if parts[len(parts)-2] != "want" {
-				t.Fatalf("test case #%d %q: invalid %s", i, tc, op)
-			}
-			if want := parts[len(parts)-1]; got != want {
-				t.Fatalf("test case #%d %q: got %q (%v), want %q", i, tc, got, opErr, want)
-			}
-		}
-	}
-}
-
-func TestDir(t *testing.T) {
-	switch runtime.GOOS {
-	case "nacl":
-		t.Skip("see golang.org/issue/12004")
-	case "plan9":
-		t.Skip("see golang.org/issue/11453")
-	}
-
-	td, err := ioutil.TempDir("", "webdav-test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(td)
-	testFS(t, Dir(td))
-}
-
-func TestMemFS(t *testing.T) {
-	testFS(t, NewMemFS())
-}
-
-func TestMemFSRoot(t *testing.T) {
-	ctx := context.Background()
-	fs := NewMemFS()
-	for i := 0; i < 5; i++ {
-		stat, err := fs.Stat(ctx, "/")
-		if err != nil {
-			t.Fatalf("i=%d: Stat: %v", i, err)
-		}
-		if !stat.IsDir() {
-			t.Fatalf("i=%d: Stat.IsDir is false, want true", i)
-		}
-
-		f, err := fs.OpenFile(ctx, "/", os.O_RDONLY, 0)
-		if err != nil {
-			t.Fatalf("i=%d: OpenFile: %v", i, err)
-		}
-		defer f.Close()
-		children, err := f.Readdir(-1)
-		if err != nil {
-			t.Fatalf("i=%d: Readdir: %v", i, err)
-		}
-		if len(children) != i {
-			t.Fatalf("i=%d: got %d children, want %d", i, len(children), i)
-		}
-
-		if _, err := f.Write(make([]byte, 1)); err == nil {
-			t.Fatalf("i=%d: Write: got nil error, want non-nil", i)
-		}
-
-		if err := fs.Mkdir(ctx, fmt.Sprintf("/dir%d", i), 0777); err != nil {
-			t.Fatalf("i=%d: Mkdir: %v", i, err)
-		}
-	}
-}
-
-func TestMemFileReaddir(t *testing.T) {
-	ctx := context.Background()
-	fs := NewMemFS()
-	if err := fs.Mkdir(ctx, "/foo", 0777); err != nil {
-		t.Fatalf("Mkdir: %v", err)
-	}
-	readdir := func(count int) ([]os.FileInfo, error) {
-		f, err := fs.OpenFile(ctx, "/foo", os.O_RDONLY, 0)
-		if err != nil {
-			t.Fatalf("OpenFile: %v", err)
-		}
-		defer f.Close()
-		return f.Readdir(count)
-	}
-	if got, err := readdir(-1); len(got) != 0 || err != nil {
-		t.Fatalf("readdir(-1): got %d fileInfos with err=%v, want 0, <nil>", len(got), err)
-	}
-	if got, err := readdir(+1); len(got) != 0 || err != io.EOF {
-		t.Fatalf("readdir(+1): got %d fileInfos with err=%v, want 0, EOF", len(got), err)
-	}
-}
-
-func TestMemFile(t *testing.T) {
-	testCases := []string{
-		"wantData ",
-		"wantSize 0",
-		"write abc",
-		"wantData abc",
-		"write de",
-		"wantData abcde",
-		"wantSize 5",
-		"write 5*x",
-		"write 4*y+2*z",
-		"write 3*st",
-		"wantData abcdexxxxxyyyyzzststst",
-		"wantSize 22",
-		"seek set 4 want 4",
-		"write EFG",
-		"wantData abcdEFGxxxyyyyzzststst",
-		"wantSize 22",
-		"seek set 2 want 2",
-		"read cdEF",
-		"read Gx",
-		"seek cur 0 want 8",
-		"seek cur 2 want 10",
-		"seek cur -1 want 9",
-		"write J",
-		"wantData abcdEFGxxJyyyyzzststst",
-		"wantSize 22",
-		"seek cur -4 want 6",
-		"write ghijk",
-		"wantData abcdEFghijkyyyzzststst",
-		"wantSize 22",
-		"read yyyz",
-		"seek cur 0 want 15",
-		"write ",
-		"seek cur 0 want 15",
-		"read ",
-		"seek cur 0 want 15",
-		"seek end -3 want 19",
-		"write ZZ",
-		"wantData abcdEFghijkyyyzzstsZZt",
-		"wantSize 22",
-		"write 4*A",
-		"wantData abcdEFghijkyyyzzstsZZAAAA",
-		"wantSize 25",
-		"seek end 0 want 25",
-		"seek end -5 want 20",
-		"read Z+4*A",
-		"write 5*B",
-		"wantData abcdEFghijkyyyzzstsZZAAAABBBBB",
-		"wantSize 30",
-		"seek end 10 want 40",
-		"write C",
-		"wantData abcdEFghijkyyyzzstsZZAAAABBBBB..........C",
-		"wantSize 41",
-		"write D",
-		"wantData abcdEFghijkyyyzzstsZZAAAABBBBB..........CD",
-		"wantSize 42",
-		"seek set 43 want 43",
-		"write E",
-		"wantData abcdEFghijkyyyzzstsZZAAAABBBBB..........CD.E",
-		"wantSize 44",
-		"seek set 0 want 0",
-		"write 5*123456789_",
-		"wantData 123456789_123456789_123456789_123456789_123456789_",
-		"wantSize 50",
-		"seek cur 0 want 50",
-		"seek cur -99 want err",
-	}
-
-	ctx := context.Background()
-
-	const filename = "/foo"
-	fs := NewMemFS()
-	f, err := fs.OpenFile(ctx, filename, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		t.Fatalf("OpenFile: %v", err)
-	}
-	defer f.Close()
-
-	for i, tc := range testCases {
-		j := strings.IndexByte(tc, ' ')
-		if j < 0 {
-			t.Fatalf("test case #%d %q: invalid command", i, tc)
-		}
-		op, arg := tc[:j], tc[j+1:]
-
-		// Expand an arg like "3*a+2*b" to "aaabb".
-		parts := strings.Split(arg, "+")
-		for j, part := range parts {
-			if k := strings.IndexByte(part, '*'); k >= 0 {
-				repeatCount, repeatStr := part[:k], part[k+1:]
-				n, err := strconv.Atoi(repeatCount)
-				if err != nil {
-					t.Fatalf("test case #%d %q: invalid repeat count %q", i, tc, repeatCount)
-				}
-				parts[j] = strings.Repeat(repeatStr, n)
-			}
-		}
-		arg = strings.Join(parts, "")
-
-		switch op {
-		default:
-			t.Fatalf("test case #%d %q: invalid operation %q", i, tc, op)
-
-		case "read":
-			buf := make([]byte, len(arg))
-			if _, err := io.ReadFull(f, buf); err != nil {
-				t.Fatalf("test case #%d %q: ReadFull: %v", i, tc, err)
-			}
-			if got := string(buf); got != arg {
-				t.Fatalf("test case #%d %q:\ngot  %q\nwant %q", i, tc, got, arg)
-			}
-
-		case "seek":
-			parts := strings.Split(arg, " ")
-			if len(parts) != 4 {
-				t.Fatalf("test case #%d %q: invalid seek", i, tc)
-			}
-
-			whence := 0
-			switch parts[0] {
-			default:
-				t.Fatalf("test case #%d %q: invalid seek whence", i, tc)
-			case "set":
-				whence = os.SEEK_SET
-			case "cur":
-				whence = os.SEEK_CUR
-			case "end":
-				whence = os.SEEK_END
-			}
-			offset, err := strconv.Atoi(parts[1])
-			if err != nil {
-				t.Fatalf("test case #%d %q: invalid offset %q", i, tc, parts[1])
-			}
-
-			if parts[2] != "want" {
-				t.Fatalf("test case #%d %q: invalid seek", i, tc)
-			}
-			if parts[3] == "err" {
-				_, err := f.Seek(int64(offset), whence)
-				if err == nil {
-					t.Fatalf("test case #%d %q: Seek returned nil error, want non-nil", i, tc)
-				}
-			} else {
-				got, err := f.Seek(int64(offset), whence)
-				if err != nil {
-					t.Fatalf("test case #%d %q: Seek: %v", i, tc, err)
-				}
-				want, err := strconv.Atoi(parts[3])
-				if err != nil {
-					t.Fatalf("test case #%d %q: invalid want %q", i, tc, parts[3])
-				}
-				if got != int64(want) {
-					t.Fatalf("test case #%d %q: got %d, want %d", i, tc, got, want)
-				}
-			}
-
-		case "write":
-			n, err := f.Write([]byte(arg))
-			if err != nil {
-				t.Fatalf("test case #%d %q: write: %v", i, tc, err)
-			}
-			if n != len(arg) {
-				t.Fatalf("test case #%d %q: write returned %d bytes, want %d", i, tc, n, len(arg))
-			}
-
-		case "wantData":
-			g, err := fs.OpenFile(ctx, filename, os.O_RDONLY, 0666)
-			if err != nil {
-				t.Fatalf("test case #%d %q: OpenFile: %v", i, tc, err)
-			}
-			gotBytes, err := ioutil.ReadAll(g)
-			if err != nil {
-				t.Fatalf("test case #%d %q: ReadAll: %v", i, tc, err)
-			}
-			for i, c := range gotBytes {
-				if c == '\x00' {
-					gotBytes[i] = '.'
-				}
-			}
-			got := string(gotBytes)
-			if got != arg {
-				t.Fatalf("test case #%d %q:\ngot  %q\nwant %q", i, tc, got, arg)
-			}
-			if err := g.Close(); err != nil {
-				t.Fatalf("test case #%d %q: Close: %v", i, tc, err)
-			}
-
-		case "wantSize":
-			n, err := strconv.Atoi(arg)
-			if err != nil {
-				t.Fatalf("test case #%d %q: invalid size %q", i, tc, arg)
-			}
-			fi, err := fs.Stat(ctx, filename)
-			if err != nil {
-				t.Fatalf("test case #%d %q: Stat: %v", i, tc, err)
-			}
-			if got, want := fi.Size(), int64(n); got != want {
-				t.Fatalf("test case #%d %q: got %d, want %d", i, tc, got, want)
-			}
-		}
-	}
-}
-
-// TestMemFileWriteAllocs tests that writing N consecutive 1KiB chunks to a
-// memFile doesn't allocate a new buffer for each of those N times. Otherwise,
-// calling io.Copy(aMemFile, src) is likely to have quadratic complexity.
-func TestMemFileWriteAllocs(t *testing.T) {
-	if runtime.Compiler == "gccgo" {
-		t.Skip("gccgo allocates here")
-	}
-	ctx := context.Background()
-	fs := NewMemFS()
-	f, err := fs.OpenFile(ctx, "/xxx", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		t.Fatalf("OpenFile: %v", err)
-	}
-	defer f.Close()
-
-	xxx := make([]byte, 1024)
-	for i := range xxx {
-		xxx[i] = 'x'
-	}
-
-	a := testing.AllocsPerRun(100, func() {
-		f.Write(xxx)
-	})
-	// AllocsPerRun returns an integral value, so we compare the rounded-down
-	// number to zero.
-	if a > 0 {
-		t.Fatalf("%v allocs per run, want 0", a)
-	}
-}
-
-func BenchmarkMemFileWrite(b *testing.B) {
-	ctx := context.Background()
-	fs := NewMemFS()
-	xxx := make([]byte, 1024)
-	for i := range xxx {
-		xxx[i] = 'x'
-	}
-
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		f, err := fs.OpenFile(ctx, "/xxx", os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-		if err != nil {
-			b.Fatalf("OpenFile: %v", err)
-		}
-		for j := 0; j < 100; j++ {
-			f.Write(xxx)
-		}
-		if err := f.Close(); err != nil {
-			b.Fatalf("Close: %v", err)
-		}
-		if err := fs.RemoveAll(ctx, "/xxx"); err != nil {
-			b.Fatalf("RemoveAll: %v", err)
-		}
-	}
-}
-
-func TestCopyMoveProps(t *testing.T) {
-	ctx := context.Background()
-	fs := NewMemFS()
-	create := func(name string) error {
-		f, err := fs.OpenFile(ctx, name, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-		if err != nil {
-			return err
-		}
-		_, wErr := f.Write([]byte("contents"))
-		cErr := f.Close()
-		if wErr != nil {
-			return wErr
-		}
-		return cErr
-	}
-	patch := func(name string, patches ...Proppatch) error {
-		f, err := fs.OpenFile(ctx, name, os.O_RDWR, 0666)
-		if err != nil {
-			return err
-		}
-		_, pErr := f.(DeadPropsHolder).Patch(patches)
-		cErr := f.Close()
-		if pErr != nil {
-			return pErr
-		}
-		return cErr
-	}
-	props := func(name string) (map[xml.Name]Property, error) {
-		f, err := fs.OpenFile(ctx, name, os.O_RDWR, 0666)
-		if err != nil {
-			return nil, err
-		}
-		m, pErr := f.(DeadPropsHolder).DeadProps()
-		cErr := f.Close()
-		if pErr != nil {
-			return nil, pErr
-		}
-		if cErr != nil {
-			return nil, cErr
-		}
-		return m, nil
-	}
-
-	p0 := Property{
-		XMLName:  xml.Name{Space: "x:", Local: "boat"},
-		InnerXML: []byte("pea-green"),
-	}
-	p1 := Property{
-		XMLName:  xml.Name{Space: "x:", Local: "ring"},
-		InnerXML: []byte("1 shilling"),
-	}
-	p2 := Property{
-		XMLName:  xml.Name{Space: "x:", Local: "spoon"},
-		InnerXML: []byte("runcible"),
-	}
-	p3 := Property{
-		XMLName:  xml.Name{Space: "x:", Local: "moon"},
-		InnerXML: []byte("light"),
-	}
-
-	if err := create("/src"); err != nil {
-		t.Fatalf("create /src: %v", err)
-	}
-	if err := patch("/src", Proppatch{Props: []Property{p0, p1}}); err != nil {
-		t.Fatalf("patch /src +p0 +p1: %v", err)
-	}
-	if _, err := copyFiles(ctx, fs, "/src", "/tmp", true, infiniteDepth, 0); err != nil {
-		t.Fatalf("copyFiles /src /tmp: %v", err)
-	}
-	if _, err := moveFiles(ctx, fs, "/tmp", "/dst", true); err != nil {
-		t.Fatalf("moveFiles /tmp /dst: %v", err)
-	}
-	if err := patch("/src", Proppatch{Props: []Property{p0}, Remove: true}); err != nil {
-		t.Fatalf("patch /src -p0: %v", err)
-	}
-	if err := patch("/src", Proppatch{Props: []Property{p2}}); err != nil {
-		t.Fatalf("patch /src +p2: %v", err)
-	}
-	if err := patch("/dst", Proppatch{Props: []Property{p1}, Remove: true}); err != nil {
-		t.Fatalf("patch /dst -p1: %v", err)
-	}
-	if err := patch("/dst", Proppatch{Props: []Property{p3}}); err != nil {
-		t.Fatalf("patch /dst +p3: %v", err)
-	}
-
-	gotSrc, err := props("/src")
-	if err != nil {
-		t.Fatalf("props /src: %v", err)
-	}
-	wantSrc := map[xml.Name]Property{
-		p1.XMLName: p1,
-		p2.XMLName: p2,
-	}
-	if !reflect.DeepEqual(gotSrc, wantSrc) {
-		t.Fatalf("props /src:\ngot  %v\nwant %v", gotSrc, wantSrc)
-	}
-
-	gotDst, err := props("/dst")
-	if err != nil {
-		t.Fatalf("props /dst: %v", err)
-	}
-	wantDst := map[xml.Name]Property{
-		p0.XMLName: p0,
-		p3.XMLName: p3,
-	}
-	if !reflect.DeepEqual(gotDst, wantDst) {
-		t.Fatalf("props /dst:\ngot  %v\nwant %v", gotDst, wantDst)
-	}
-}
-
-func TestWalkFS(t *testing.T) {
-	testCases := []struct {
-		desc    string
-		buildfs []string
-		startAt string
-		depth   int
-		walkFn  filepath.WalkFunc
-		want    []string
-	}{{
-		"just root",
-		[]string{},
-		"/",
-		infiniteDepth,
-		nil,
-		[]string{
-			"/",
-		},
-	}, {
-		"infinite walk from root",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/d",
-			"mkdir /e",
-			"touch /f",
-		},
-		"/",
-		infiniteDepth,
-		nil,
-		[]string{
-			"/",
-			"/a",
-			"/a/b",
-			"/a/b/c",
-			"/a/d",
-			"/e",
-			"/f",
-		},
-	}, {
-		"infinite walk from subdir",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/d",
-			"mkdir /e",
-			"touch /f",
-		},
-		"/a",
-		infiniteDepth,
-		nil,
-		[]string{
-			"/a",
-			"/a/b",
-			"/a/b/c",
-			"/a/d",
-		},
-	}, {
-		"depth 1 walk from root",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/d",
-			"mkdir /e",
-			"touch /f",
-		},
-		"/",
-		1,
-		nil,
-		[]string{
-			"/",
-			"/a",
-			"/e",
-			"/f",
-		},
-	}, {
-		"depth 1 walk from subdir",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/b/g",
-			"mkdir /a/b/g/h",
-			"touch /a/b/g/i",
-			"touch /a/b/g/h/j",
-		},
-		"/a/b",
-		1,
-		nil,
-		[]string{
-			"/a/b",
-			"/a/b/c",
-			"/a/b/g",
-		},
-	}, {
-		"depth 0 walk from subdir",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/b/g",
-			"mkdir /a/b/g/h",
-			"touch /a/b/g/i",
-			"touch /a/b/g/h/j",
-		},
-		"/a/b",
-		0,
-		nil,
-		[]string{
-			"/a/b",
-		},
-	}, {
-		"infinite walk from file",
-		[]string{
-			"mkdir /a",
-			"touch /a/b",
-			"touch /a/c",
-		},
-		"/a/b",
-		0,
-		nil,
-		[]string{
-			"/a/b",
-		},
-	}, {
-		"infinite walk with skipped subdir",
-		[]string{
-			"mkdir /a",
-			"mkdir /a/b",
-			"touch /a/b/c",
-			"mkdir /a/b/g",
-			"mkdir /a/b/g/h",
-			"touch /a/b/g/i",
-			"touch /a/b/g/h/j",
-			"touch /a/b/z",
-		},
-		"/",
-		infiniteDepth,
-		func(path string, info os.FileInfo, err error) error {
-			if path == "/a/b/g" {
-				return filepath.SkipDir
-			}
-			return nil
-		},
-		[]string{
-			"/",
-			"/a",
-			"/a/b",
-			"/a/b/c",
-			"/a/b/z",
-		},
-	}}
-	ctx := context.Background()
-	for _, tc := range testCases {
-		fs, err := buildTestFS(tc.buildfs)
-		if err != nil {
-			t.Fatalf("%s: cannot create test filesystem: %v", tc.desc, err)
-		}
-		var got []string
-		traceFn := func(path string, info os.FileInfo, err error) error {
-			if tc.walkFn != nil {
-				err = tc.walkFn(path, info, err)
-				if err != nil {
-					return err
-				}
-			}
-			got = append(got, path)
-			return nil
-		}
-		fi, err := fs.Stat(ctx, tc.startAt)
-		if err != nil {
-			t.Fatalf("%s: cannot stat: %v", tc.desc, err)
-		}
-		err = walkFS(ctx, fs, tc.depth, tc.startAt, fi, traceFn)
-		if err != nil {
-			t.Errorf("%s:\ngot error %v, want nil", tc.desc, err)
-			continue
-		}
-		sort.Strings(got)
-		sort.Strings(tc.want)
-		if !reflect.DeepEqual(got, tc.want) {
-			t.Errorf("%s:\ngot  %q\nwant %q", tc.desc, got, tc.want)
-			continue
-		}
-	}
-}
-
-func buildTestFS(buildfs []string) (FileSystem, error) {
-	// TODO: Could this be merged with the build logic in TestFS?
-
-	ctx := context.Background()
-	fs := NewMemFS()
-	for _, b := range buildfs {
-		op := strings.Split(b, " ")
-		switch op[0] {
-		case "mkdir":
-			err := fs.Mkdir(ctx, op[1], os.ModeDir|0777)
-			if err != nil {
-				return nil, err
-			}
-		case "touch":
-			f, err := fs.OpenFile(ctx, op[1], os.O_RDWR|os.O_CREATE, 0666)
-			if err != nil {
-				return nil, err
-			}
-			f.Close()
-		case "write":
-			f, err := fs.OpenFile(ctx, op[1], os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-			if err != nil {
-				return nil, err
-			}
-			_, err = f.Write([]byte(op[2]))
-			f.Close()
-			if err != nil {
-				return nil, err
-			}
-		default:
-			return nil, fmt.Errorf("unknown file operation %q", op[0])
-		}
-	}
-	return fs, nil
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/if.go b/installer/vendor/golang.org/x/net/webdav/if.go
deleted file mode 100644
index 416e81cdfd..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/if.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-// The If header is covered by Section 10.4.
-// http://www.webdav.org/specs/rfc4918.html#HEADER_If
-
-import (
-	"strings"
-)
-
-// ifHeader is a disjunction (OR) of ifLists.
-type ifHeader struct {
-	lists []ifList
-}
-
-// ifList is a conjunction (AND) of Conditions, and an optional resource tag.
-type ifList struct {
-	resourceTag string
-	conditions  []Condition
-}
-
-// parseIfHeader parses the "If: foo bar" HTTP header. The httpHeader string
-// should omit the "If:" prefix and have any "\r\n"s collapsed to a " ", as is
-// returned by req.Header.Get("If") for a http.Request req.
-func parseIfHeader(httpHeader string) (h ifHeader, ok bool) {
-	s := strings.TrimSpace(httpHeader)
-	switch tokenType, _, _ := lex(s); tokenType {
-	case '(':
-		return parseNoTagLists(s)
-	case angleTokenType:
-		return parseTaggedLists(s)
-	default:
-		return ifHeader{}, false
-	}
-}
-
-func parseNoTagLists(s string) (h ifHeader, ok bool) {
-	for {
-		l, remaining, ok := parseList(s)
-		if !ok {
-			return ifHeader{}, false
-		}
-		h.lists = append(h.lists, l)
-		if remaining == "" {
-			return h, true
-		}
-		s = remaining
-	}
-}
-
-func parseTaggedLists(s string) (h ifHeader, ok bool) {
-	resourceTag, n := "", 0
-	for first := true; ; first = false {
-		tokenType, tokenStr, remaining := lex(s)
-		switch tokenType {
-		case angleTokenType:
-			if !first && n == 0 {
-				return ifHeader{}, false
-			}
-			resourceTag, n = tokenStr, 0
-			s = remaining
-		case '(':
-			n++
-			l, remaining, ok := parseList(s)
-			if !ok {
-				return ifHeader{}, false
-			}
-			l.resourceTag = resourceTag
-			h.lists = append(h.lists, l)
-			if remaining == "" {
-				return h, true
-			}
-			s = remaining
-		default:
-			return ifHeader{}, false
-		}
-	}
-}
-
-func parseList(s string) (l ifList, remaining string, ok bool) {
-	tokenType, _, s := lex(s)
-	if tokenType != '(' {
-		return ifList{}, "", false
-	}
-	for {
-		tokenType, _, remaining = lex(s)
-		if tokenType == ')' {
-			if len(l.conditions) == 0 {
-				return ifList{}, "", false
-			}
-			return l, remaining, true
-		}
-		c, remaining, ok := parseCondition(s)
-		if !ok {
-			return ifList{}, "", false
-		}
-		l.conditions = append(l.conditions, c)
-		s = remaining
-	}
-}
-
-func parseCondition(s string) (c Condition, remaining string, ok bool) {
-	tokenType, tokenStr, s := lex(s)
-	if tokenType == notTokenType {
-		c.Not = true
-		tokenType, tokenStr, s = lex(s)
-	}
-	switch tokenType {
-	case strTokenType, angleTokenType:
-		c.Token = tokenStr
-	case squareTokenType:
-		c.ETag = tokenStr
-	default:
-		return Condition{}, "", false
-	}
-	return c, s, true
-}
-
-// Single-rune tokens like '(' or ')' have a token type equal to their rune.
-// All other tokens have a negative token type.
-const (
-	errTokenType    = rune(-1)
-	eofTokenType    = rune(-2)
-	strTokenType    = rune(-3)
-	notTokenType    = rune(-4)
-	angleTokenType  = rune(-5)
-	squareTokenType = rune(-6)
-)
-
-func lex(s string) (tokenType rune, tokenStr string, remaining string) {
-	// The net/textproto Reader that parses the HTTP header will collapse
-	// Linear White Space that spans multiple "\r\n" lines to a single " ",
-	// so we don't need to look for '\r' or '\n'.
-	for len(s) > 0 && (s[0] == '\t' || s[0] == ' ') {
-		s = s[1:]
-	}
-	if len(s) == 0 {
-		return eofTokenType, "", ""
-	}
-	i := 0
-loop:
-	for ; i < len(s); i++ {
-		switch s[i] {
-		case '\t', ' ', '(', ')', '<', '>', '[', ']':
-			break loop
-		}
-	}
-
-	if i != 0 {
-		tokenStr, remaining = s[:i], s[i:]
-		if tokenStr == "Not" {
-			return notTokenType, "", remaining
-		}
-		return strTokenType, tokenStr, remaining
-	}
-
-	j := 0
-	switch s[0] {
-	case '<':
-		j, tokenType = strings.IndexByte(s, '>'), angleTokenType
-	case '[':
-		j, tokenType = strings.IndexByte(s, ']'), squareTokenType
-	default:
-		return rune(s[0]), "", s[1:]
-	}
-	if j < 0 {
-		return errTokenType, "", ""
-	}
-	return tokenType, s[1:j], s[j+1:]
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/if_test.go b/installer/vendor/golang.org/x/net/webdav/if_test.go
deleted file mode 100644
index aad61a4010..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/if_test.go
+++ /dev/null
@@ -1,322 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestParseIfHeader(t *testing.T) {
-	// The "section x.y.z" test cases come from section x.y.z of the spec at
-	// http://www.webdav.org/specs/rfc4918.html
-	testCases := []struct {
-		desc  string
-		input string
-		want  ifHeader
-	}{{
-		"bad: empty",
-		``,
-		ifHeader{},
-	}, {
-		"bad: no parens",
-		`foobar`,
-		ifHeader{},
-	}, {
-		"bad: empty list #1",
-		`()`,
-		ifHeader{},
-	}, {
-		"bad: empty list #2",
-		`(a) (b c) () (d)`,
-		ifHeader{},
-	}, {
-		"bad: no list after resource #1",
-		`<foo>`,
-		ifHeader{},
-	}, {
-		"bad: no list after resource #2",
-		`<foo> <bar> (a)`,
-		ifHeader{},
-	}, {
-		"bad: no list after resource #3",
-		`<foo> (a) (b) <bar>`,
-		ifHeader{},
-	}, {
-		"bad: no-tag-list followed by tagged-list",
-		`(a) (b) <foo> (c)`,
-		ifHeader{},
-	}, {
-		"bad: unfinished list",
-		`(a`,
-		ifHeader{},
-	}, {
-		"bad: unfinished ETag",
-		`([b`,
-		ifHeader{},
-	}, {
-		"bad: unfinished Notted list",
-		`(Not a`,
-		ifHeader{},
-	}, {
-		"bad: double Not",
-		`(Not Not a)`,
-		ifHeader{},
-	}, {
-		"good: one list with a Token",
-		`(a)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `a`,
-				}},
-			}},
-		},
-	}, {
-		"good: one list with an ETag",
-		`([a])`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					ETag: `a`,
-				}},
-			}},
-		},
-	}, {
-		"good: one list with three Nots",
-		`(Not a Not b Not [d])`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Not:   true,
-					Token: `a`,
-				}, {
-					Not:   true,
-					Token: `b`,
-				}, {
-					Not:  true,
-					ETag: `d`,
-				}},
-			}},
-		},
-	}, {
-		"good: two lists",
-		`(a) (b)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `a`,
-				}},
-			}, {
-				conditions: []Condition{{
-					Token: `b`,
-				}},
-			}},
-		},
-	}, {
-		"good: two Notted lists",
-		`(Not a) (Not b)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Not:   true,
-					Token: `a`,
-				}},
-			}, {
-				conditions: []Condition{{
-					Not:   true,
-					Token: `b`,
-				}},
-			}},
-		},
-	}, {
-		"section 7.5.1",
-		`<http://www.example.com/users/f/fielding/index.html> 
-			(<urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6>)`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `http://www.example.com/users/f/fielding/index.html`,
-				conditions: []Condition{{
-					Token: `urn:uuid:f81d4fae-7dec-11d0-a765-00a0c91e6bf6`,
-				}},
-			}},
-		},
-	}, {
-		"section 7.5.2 #1",
-		`(<urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf>)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf`,
-				}},
-			}},
-		},
-	}, {
-		"section 7.5.2 #2",
-		`<http://example.com/locked/>
-			(<urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf>)`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `http://example.com/locked/`,
-				conditions: []Condition{{
-					Token: `urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf`,
-				}},
-			}},
-		},
-	}, {
-		"section 7.5.2 #3",
-		`<http://example.com/locked/member>
-			(<urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf>)`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `http://example.com/locked/member`,
-				conditions: []Condition{{
-					Token: `urn:uuid:150852e2-3847-42d5-8cbe-0f4f296f26cf`,
-				}},
-			}},
-		},
-	}, {
-		"section 9.9.6",
-		`(<urn:uuid:fe184f2e-6eec-41d0-c765-01adc56e6bb4>) 
-			(<urn:uuid:e454f3f3-acdc-452a-56c7-00a5c91e4b77>)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `urn:uuid:fe184f2e-6eec-41d0-c765-01adc56e6bb4`,
-				}},
-			}, {
-				conditions: []Condition{{
-					Token: `urn:uuid:e454f3f3-acdc-452a-56c7-00a5c91e4b77`,
-				}},
-			}},
-		},
-	}, {
-		"section 9.10.8",
-		`(<urn:uuid:e71d4fae-5dec-22d6-fea5-00a0c91e6be4>)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `urn:uuid:e71d4fae-5dec-22d6-fea5-00a0c91e6be4`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.6",
-		`(<urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2> 
-			["I am an ETag"])
-			(["I am another ETag"])`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2`,
-				}, {
-					ETag: `"I am an ETag"`,
-				}},
-			}, {
-				conditions: []Condition{{
-					ETag: `"I am another ETag"`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.7",
-		`(Not <urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2> 
-			<urn:uuid:58f202ac-22cf-11d1-b12d-002035b29092>)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Not:   true,
-					Token: `urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2`,
-				}, {
-					Token: `urn:uuid:58f202ac-22cf-11d1-b12d-002035b29092`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.8",
-		`(<urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2>) 
-			(Not <DAV:no-lock>)`,
-		ifHeader{
-			lists: []ifList{{
-				conditions: []Condition{{
-					Token: `urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2`,
-				}},
-			}, {
-				conditions: []Condition{{
-					Not:   true,
-					Token: `DAV:no-lock`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.9",
-		`</resource1> 
-			(<urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2> 
-			[W/"A weak ETag"]) (["strong ETag"])`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `/resource1`,
-				conditions: []Condition{{
-					Token: `urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2`,
-				}, {
-					ETag: `W/"A weak ETag"`,
-				}},
-			}, {
-				resourceTag: `/resource1`,
-				conditions: []Condition{{
-					ETag: `"strong ETag"`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.10",
-		`<http://www.example.com/specs/> 
-			(<urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2>)`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `http://www.example.com/specs/`,
-				conditions: []Condition{{
-					Token: `urn:uuid:181d4fae-7d8c-11d0-a765-00a0c91e6bf2`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.11 #1",
-		`</specs/rfc2518.doc> (["4217"])`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `/specs/rfc2518.doc`,
-				conditions: []Condition{{
-					ETag: `"4217"`,
-				}},
-			}},
-		},
-	}, {
-		"section 10.4.11 #2",
-		`</specs/rfc2518.doc> (Not ["4217"])`,
-		ifHeader{
-			lists: []ifList{{
-				resourceTag: `/specs/rfc2518.doc`,
-				conditions: []Condition{{
-					Not:  true,
-					ETag: `"4217"`,
-				}},
-			}},
-		},
-	}}
-
-	for _, tc := range testCases {
-		got, ok := parseIfHeader(strings.Replace(tc.input, "\n", "", -1))
-		if gotEmpty := reflect.DeepEqual(got, ifHeader{}); gotEmpty == ok {
-			t.Errorf("%s: should be different: empty header == %t, ok == %t", tc.desc, gotEmpty, ok)
-			continue
-		}
-		if !reflect.DeepEqual(got, tc.want) {
-			t.Errorf("%s:\ngot  %v\nwant %v", tc.desc, got, tc.want)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/README b/installer/vendor/golang.org/x/net/webdav/internal/xml/README
deleted file mode 100644
index 89656f4896..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/README
+++ /dev/null
@@ -1,11 +0,0 @@
-This is a fork of the encoding/xml package at ca1d6c4, the last commit before
-https://go.googlesource.com/go/+/c0d6d33 "encoding/xml: restore Go 1.4 name
-space behavior" made late in the lead-up to the Go 1.5 release.
-
-The list of encoding/xml changes is at
-https://go.googlesource.com/go/+log/master/src/encoding/xml
-
-This fork is temporary, and I (nigeltao) expect to revert it after Go 1.6 is
-released.
-
-See http://golang.org/issue/11841
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/atom_test.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/atom_test.go
deleted file mode 100644
index a71284312a..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/atom_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import "time"
-
-var atomValue = &Feed{
-	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
-	Title:   "Example Feed",
-	Link:    []Link{{Href: "http://example.org/"}},
-	Updated: ParseTime("2003-12-13T18:30:02Z"),
-	Author:  Person{Name: "John Doe"},
-	Id:      "urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6",
-
-	Entry: []Entry{
-		{
-			Title:   "Atom-Powered Robots Run Amok",
-			Link:    []Link{{Href: "http://example.org/2003/12/13/atom03"}},
-			Id:      "urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a",
-			Updated: ParseTime("2003-12-13T18:30:02Z"),
-			Summary: NewText("Some text."),
-		},
-	},
-}
-
-var atomXml = `` +
-	`<feed xmlns="http://www.w3.org/2005/Atom" updated="2003-12-13T18:30:02Z">` +
-	`<title>Example Feed</title>` +
-	`<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>` +
-	`<link href="http://example.org/"></link>` +
-	`<author><name>John Doe</name><uri></uri><email></email></author>` +
-	`<entry>` +
-	`<title>Atom-Powered Robots Run Amok</title>` +
-	`<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>` +
-	`<link href="http://example.org/2003/12/13/atom03"></link>` +
-	`<updated>2003-12-13T18:30:02Z</updated>` +
-	`<author><name></name><uri></uri><email></email></author>` +
-	`<summary>Some text.</summary>` +
-	`</entry>` +
-	`</feed>`
-
-func ParseTime(str string) time.Time {
-	t, err := time.Parse(time.RFC3339, str)
-	if err != nil {
-		panic(err)
-	}
-	return t
-}
-
-func NewText(text string) Text {
-	return Text{
-		Body: text,
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/example_test.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/example_test.go
deleted file mode 100644
index 21b48dea53..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/example_test.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml_test
-
-import (
-	"encoding/xml"
-	"fmt"
-	"os"
-)
-
-func ExampleMarshalIndent() {
-	type Address struct {
-		City, State string
-	}
-	type Person struct {
-		XMLName   xml.Name `xml:"person"`
-		Id        int      `xml:"id,attr"`
-		FirstName string   `xml:"name>first"`
-		LastName  string   `xml:"name>last"`
-		Age       int      `xml:"age"`
-		Height    float32  `xml:"height,omitempty"`
-		Married   bool
-		Address
-		Comment string `xml:",comment"`
-	}
-
-	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
-	v.Comment = " Need more details. "
-	v.Address = Address{"Hanga Roa", "Easter Island"}
-
-	output, err := xml.MarshalIndent(v, "  ", "    ")
-	if err != nil {
-		fmt.Printf("error: %v\n", err)
-	}
-
-	os.Stdout.Write(output)
-	// Output:
-	//   <person id="13">
-	//       <name>
-	//           <first>John</first>
-	//           <last>Doe</last>
-	//       </name>
-	//       <age>42</age>
-	//       <Married>false</Married>
-	//       <City>Hanga Roa</City>
-	//       <State>Easter Island</State>
-	//       <!-- Need more details. -->
-	//   </person>
-}
-
-func ExampleEncoder() {
-	type Address struct {
-		City, State string
-	}
-	type Person struct {
-		XMLName   xml.Name `xml:"person"`
-		Id        int      `xml:"id,attr"`
-		FirstName string   `xml:"name>first"`
-		LastName  string   `xml:"name>last"`
-		Age       int      `xml:"age"`
-		Height    float32  `xml:"height,omitempty"`
-		Married   bool
-		Address
-		Comment string `xml:",comment"`
-	}
-
-	v := &Person{Id: 13, FirstName: "John", LastName: "Doe", Age: 42}
-	v.Comment = " Need more details. "
-	v.Address = Address{"Hanga Roa", "Easter Island"}
-
-	enc := xml.NewEncoder(os.Stdout)
-	enc.Indent("  ", "    ")
-	if err := enc.Encode(v); err != nil {
-		fmt.Printf("error: %v\n", err)
-	}
-
-	// Output:
-	//   <person id="13">
-	//       <name>
-	//           <first>John</first>
-	//           <last>Doe</last>
-	//       </name>
-	//       <age>42</age>
-	//       <Married>false</Married>
-	//       <City>Hanga Roa</City>
-	//       <State>Easter Island</State>
-	//       <!-- Need more details. -->
-	//   </person>
-}
-
-// This example demonstrates unmarshaling an XML excerpt into a value with
-// some preset fields. Note that the Phone field isn't modified and that
-// the XML <Company> element is ignored. Also, the Groups field is assigned
-// considering the element path provided in its tag.
-func ExampleUnmarshal() {
-	type Email struct {
-		Where string `xml:"where,attr"`
-		Addr  string
-	}
-	type Address struct {
-		City, State string
-	}
-	type Result struct {
-		XMLName xml.Name `xml:"Person"`
-		Name    string   `xml:"FullName"`
-		Phone   string
-		Email   []Email
-		Groups  []string `xml:"Group>Value"`
-		Address
-	}
-	v := Result{Name: "none", Phone: "none"}
-
-	data := `
-		<Person>
-			<FullName>Grace R. Emlin</FullName>
-			<Company>Example Inc.</Company>
-			<Email where="home">
-				<Addr>gre@example.com</Addr>
-			</Email>
-			<Email where='work'>
-				<Addr>gre@work.com</Addr>
-			</Email>
-			<Group>
-				<Value>Friends</Value>
-				<Value>Squash</Value>
-			</Group>
-			<City>Hanga Roa</City>
-			<State>Easter Island</State>
-		</Person>
-	`
-	err := xml.Unmarshal([]byte(data), &v)
-	if err != nil {
-		fmt.Printf("error: %v", err)
-		return
-	}
-	fmt.Printf("XMLName: %#v\n", v.XMLName)
-	fmt.Printf("Name: %q\n", v.Name)
-	fmt.Printf("Phone: %q\n", v.Phone)
-	fmt.Printf("Email: %v\n", v.Email)
-	fmt.Printf("Groups: %v\n", v.Groups)
-	fmt.Printf("Address: %v\n", v.Address)
-	// Output:
-	// XMLName: xml.Name{Space:"", Local:"Person"}
-	// Name: "Grace R. Emlin"
-	// Phone: "none"
-	// Email: [{home gre@example.com} {work gre@work.com}]
-	// Groups: [Friends Squash]
-	// Address: {Hanga Roa Easter Island}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal.go
deleted file mode 100644
index cb82ec2143..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal.go
+++ /dev/null
@@ -1,1223 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bufio"
-	"bytes"
-	"encoding"
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-const (
-	// A generic XML header suitable for use with the output of Marshal.
-	// This is not automatically added to any output of this package,
-	// it is provided as a convenience.
-	Header = `<?xml version="1.0" encoding="UTF-8"?>` + "\n"
-)
-
-// Marshal returns the XML encoding of v.
-//
-// Marshal handles an array or slice by marshalling each of the elements.
-// Marshal handles a pointer by marshalling the value it points at or, if the
-// pointer is nil, by writing nothing. Marshal handles an interface value by
-// marshalling the value it contains or, if the interface value is nil, by
-// writing nothing. Marshal handles all other data by writing one or more XML
-// elements containing the data.
-//
-// The name for the XML elements is taken from, in order of preference:
-//     - the tag on the XMLName field, if the data is a struct
-//     - the value of the XMLName field of type xml.Name
-//     - the tag of the struct field used to obtain the data
-//     - the name of the struct field used to obtain the data
-//     - the name of the marshalled type
-//
-// The XML element for a struct contains marshalled elements for each of the
-// exported fields of the struct, with these exceptions:
-//     - the XMLName field, described above, is omitted.
-//     - a field with tag "-" is omitted.
-//     - a field with tag "name,attr" becomes an attribute with
-//       the given name in the XML element.
-//     - a field with tag ",attr" becomes an attribute with the
-//       field name in the XML element.
-//     - a field with tag ",chardata" is written as character data,
-//       not as an XML element.
-//     - a field with tag ",innerxml" is written verbatim, not subject
-//       to the usual marshalling procedure.
-//     - a field with tag ",comment" is written as an XML comment, not
-//       subject to the usual marshalling procedure. It must not contain
-//       the "--" string within it.
-//     - a field with a tag including the "omitempty" option is omitted
-//       if the field value is empty. The empty values are false, 0, any
-//       nil pointer or interface value, and any array, slice, map, or
-//       string of length zero.
-//     - an anonymous struct field is handled as if the fields of its
-//       value were part of the outer struct.
-//
-// If a field uses a tag "a>b>c", then the element c will be nested inside
-// parent elements a and b. Fields that appear next to each other that name
-// the same parent will be enclosed in one XML element.
-//
-// See MarshalIndent for an example.
-//
-// Marshal will return an error if asked to marshal a channel, function, or map.
-func Marshal(v interface{}) ([]byte, error) {
-	var b bytes.Buffer
-	if err := NewEncoder(&b).Encode(v); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-// Marshaler is the interface implemented by objects that can marshal
-// themselves into valid XML elements.
-//
-// MarshalXML encodes the receiver as zero or more XML elements.
-// By convention, arrays or slices are typically encoded as a sequence
-// of elements, one per entry.
-// Using start as the element tag is not required, but doing so
-// will enable Unmarshal to match the XML elements to the correct
-// struct field.
-// One common implementation strategy is to construct a separate
-// value with a layout corresponding to the desired XML and then
-// to encode it using e.EncodeElement.
-// Another common strategy is to use repeated calls to e.EncodeToken
-// to generate the XML output one token at a time.
-// The sequence of encoded tokens must make up zero or more valid
-// XML elements.
-type Marshaler interface {
-	MarshalXML(e *Encoder, start StartElement) error
-}
-
-// MarshalerAttr is the interface implemented by objects that can marshal
-// themselves into valid XML attributes.
-//
-// MarshalXMLAttr returns an XML attribute with the encoded value of the receiver.
-// Using name as the attribute name is not required, but doing so
-// will enable Unmarshal to match the attribute to the correct
-// struct field.
-// If MarshalXMLAttr returns the zero attribute Attr{}, no attribute
-// will be generated in the output.
-// MarshalXMLAttr is used only for struct fields with the
-// "attr" option in the field tag.
-type MarshalerAttr interface {
-	MarshalXMLAttr(name Name) (Attr, error)
-}
-
-// MarshalIndent works like Marshal, but each XML element begins on a new
-// indented line that starts with prefix and is followed by one or more
-// copies of indent according to the nesting depth.
-func MarshalIndent(v interface{}, prefix, indent string) ([]byte, error) {
-	var b bytes.Buffer
-	enc := NewEncoder(&b)
-	enc.Indent(prefix, indent)
-	if err := enc.Encode(v); err != nil {
-		return nil, err
-	}
-	return b.Bytes(), nil
-}
-
-// An Encoder writes XML data to an output stream.
-type Encoder struct {
-	p printer
-}
-
-// NewEncoder returns a new encoder that writes to w.
-func NewEncoder(w io.Writer) *Encoder {
-	e := &Encoder{printer{Writer: bufio.NewWriter(w)}}
-	e.p.encoder = e
-	return e
-}
-
-// Indent sets the encoder to generate XML in which each element
-// begins on a new indented line that starts with prefix and is followed by
-// one or more copies of indent according to the nesting depth.
-func (enc *Encoder) Indent(prefix, indent string) {
-	enc.p.prefix = prefix
-	enc.p.indent = indent
-}
-
-// Encode writes the XML encoding of v to the stream.
-//
-// See the documentation for Marshal for details about the conversion
-// of Go values to XML.
-//
-// Encode calls Flush before returning.
-func (enc *Encoder) Encode(v interface{}) error {
-	err := enc.p.marshalValue(reflect.ValueOf(v), nil, nil)
-	if err != nil {
-		return err
-	}
-	return enc.p.Flush()
-}
-
-// EncodeElement writes the XML encoding of v to the stream,
-// using start as the outermost tag in the encoding.
-//
-// See the documentation for Marshal for details about the conversion
-// of Go values to XML.
-//
-// EncodeElement calls Flush before returning.
-func (enc *Encoder) EncodeElement(v interface{}, start StartElement) error {
-	err := enc.p.marshalValue(reflect.ValueOf(v), nil, &start)
-	if err != nil {
-		return err
-	}
-	return enc.p.Flush()
-}
-
-var (
-	begComment   = []byte("<!--")
-	endComment   = []byte("-->")
-	endProcInst  = []byte("?>")
-	endDirective = []byte(">")
-)
-
-// EncodeToken writes the given XML token to the stream.
-// It returns an error if StartElement and EndElement tokens are not
-// properly matched.
-//
-// EncodeToken does not call Flush, because usually it is part of a
-// larger operation such as Encode or EncodeElement (or a custom
-// Marshaler's MarshalXML invoked during those), and those will call
-// Flush when finished. Callers that create an Encoder and then invoke
-// EncodeToken directly, without using Encode or EncodeElement, need to
-// call Flush when finished to ensure that the XML is written to the
-// underlying writer.
-//
-// EncodeToken allows writing a ProcInst with Target set to "xml" only
-// as the first token in the stream.
-//
-// When encoding a StartElement holding an XML namespace prefix
-// declaration for a prefix that is not already declared, contained
-// elements (including the StartElement itself) will use the declared
-// prefix when encoding names with matching namespace URIs.
-func (enc *Encoder) EncodeToken(t Token) error {
-
-	p := &enc.p
-	switch t := t.(type) {
-	case StartElement:
-		if err := p.writeStart(&t); err != nil {
-			return err
-		}
-	case EndElement:
-		if err := p.writeEnd(t.Name); err != nil {
-			return err
-		}
-	case CharData:
-		escapeText(p, t, false)
-	case Comment:
-		if bytes.Contains(t, endComment) {
-			return fmt.Errorf("xml: EncodeToken of Comment containing --> marker")
-		}
-		p.WriteString("<!--")
-		p.Write(t)
-		p.WriteString("-->")
-		return p.cachedWriteError()
-	case ProcInst:
-		// First token to be encoded which is also a ProcInst with target of xml
-		// is the xml declaration. The only ProcInst where target of xml is allowed.
-		if t.Target == "xml" && p.Buffered() != 0 {
-			return fmt.Errorf("xml: EncodeToken of ProcInst xml target only valid for xml declaration, first token encoded")
-		}
-		if !isNameString(t.Target) {
-			return fmt.Errorf("xml: EncodeToken of ProcInst with invalid Target")
-		}
-		if bytes.Contains(t.Inst, endProcInst) {
-			return fmt.Errorf("xml: EncodeToken of ProcInst containing ?> marker")
-		}
-		p.WriteString("<?")
-		p.WriteString(t.Target)
-		if len(t.Inst) > 0 {
-			p.WriteByte(' ')
-			p.Write(t.Inst)
-		}
-		p.WriteString("?>")
-	case Directive:
-		if !isValidDirective(t) {
-			return fmt.Errorf("xml: EncodeToken of Directive containing wrong < or > markers")
-		}
-		p.WriteString("<!")
-		p.Write(t)
-		p.WriteString(">")
-	default:
-		return fmt.Errorf("xml: EncodeToken of invalid token type")
-
-	}
-	return p.cachedWriteError()
-}
-
-// isValidDirective reports whether dir is a valid directive text,
-// meaning angle brackets are matched, ignoring comments and strings.
-func isValidDirective(dir Directive) bool {
-	var (
-		depth     int
-		inquote   uint8
-		incomment bool
-	)
-	for i, c := range dir {
-		switch {
-		case incomment:
-			if c == '>' {
-				if n := 1 + i - len(endComment); n >= 0 && bytes.Equal(dir[n:i+1], endComment) {
-					incomment = false
-				}
-			}
-			// Just ignore anything in comment
-		case inquote != 0:
-			if c == inquote {
-				inquote = 0
-			}
-			// Just ignore anything within quotes
-		case c == '\'' || c == '"':
-			inquote = c
-		case c == '<':
-			if i+len(begComment) < len(dir) && bytes.Equal(dir[i:i+len(begComment)], begComment) {
-				incomment = true
-			} else {
-				depth++
-			}
-		case c == '>':
-			if depth == 0 {
-				return false
-			}
-			depth--
-		}
-	}
-	return depth == 0 && inquote == 0 && !incomment
-}
-
-// Flush flushes any buffered XML to the underlying writer.
-// See the EncodeToken documentation for details about when it is necessary.
-func (enc *Encoder) Flush() error {
-	return enc.p.Flush()
-}
-
-type printer struct {
-	*bufio.Writer
-	encoder    *Encoder
-	seq        int
-	indent     string
-	prefix     string
-	depth      int
-	indentedIn bool
-	putNewline bool
-	defaultNS  string
-	attrNS     map[string]string // map prefix -> name space
-	attrPrefix map[string]string // map name space -> prefix
-	prefixes   []printerPrefix
-	tags       []Name
-}
-
-// printerPrefix holds a namespace undo record.
-// When an element is popped, the prefix record
-// is set back to the recorded URL. The empty
-// prefix records the URL for the default name space.
-//
-// The start of an element is recorded with an element
-// that has mark=true.
-type printerPrefix struct {
-	prefix string
-	url    string
-	mark   bool
-}
-
-func (p *printer) prefixForNS(url string, isAttr bool) string {
-	// The "http://www.w3.org/XML/1998/namespace" name space is predefined as "xml"
-	// and must be referred to that way.
-	// (The "http://www.w3.org/2000/xmlns/" name space is also predefined as "xmlns",
-	// but users should not be trying to use that one directly - that's our job.)
-	if url == xmlURL {
-		return "xml"
-	}
-	if !isAttr && url == p.defaultNS {
-		// We can use the default name space.
-		return ""
-	}
-	return p.attrPrefix[url]
-}
-
-// defineNS pushes any namespace definition found in the given attribute.
-// If ignoreNonEmptyDefault is true, an xmlns="nonempty"
-// attribute will be ignored.
-func (p *printer) defineNS(attr Attr, ignoreNonEmptyDefault bool) error {
-	var prefix string
-	if attr.Name.Local == "xmlns" {
-		if attr.Name.Space != "" && attr.Name.Space != "xml" && attr.Name.Space != xmlURL {
-			return fmt.Errorf("xml: cannot redefine xmlns attribute prefix")
-		}
-	} else if attr.Name.Space == "xmlns" && attr.Name.Local != "" {
-		prefix = attr.Name.Local
-		if attr.Value == "" {
-			// Technically, an empty XML namespace is allowed for an attribute.
-			// From http://www.w3.org/TR/xml-names11/#scoping-defaulting:
-			//
-			// 	The attribute value in a namespace declaration for a prefix may be
-			//	empty. This has the effect, within the scope of the declaration, of removing
-			//	any association of the prefix with a namespace name.
-			//
-			// However our namespace prefixes here are used only as hints. There's
-			// no need to respect the removal of a namespace prefix, so we ignore it.
-			return nil
-		}
-	} else {
-		// Ignore: it's not a namespace definition
-		return nil
-	}
-	if prefix == "" {
-		if attr.Value == p.defaultNS {
-			// No need for redefinition.
-			return nil
-		}
-		if attr.Value != "" && ignoreNonEmptyDefault {
-			// We have an xmlns="..." value but
-			// it can't define a name space in this context,
-			// probably because the element has an empty
-			// name space. In this case, we just ignore
-			// the name space declaration.
-			return nil
-		}
-	} else if _, ok := p.attrPrefix[attr.Value]; ok {
-		// There's already a prefix for the given name space,
-		// so use that. This prevents us from
-		// having two prefixes for the same name space
-		// so attrNS and attrPrefix can remain bijective.
-		return nil
-	}
-	p.pushPrefix(prefix, attr.Value)
-	return nil
-}
-
-// createNSPrefix creates a name space prefix attribute
-// to use for the given name space, defining a new prefix
-// if necessary.
-// If isAttr is true, the prefix is to be created for an attribute
-// prefix, which means that the default name space cannot
-// be used.
-func (p *printer) createNSPrefix(url string, isAttr bool) {
-	if _, ok := p.attrPrefix[url]; ok {
-		// We already have a prefix for the given URL.
-		return
-	}
-	switch {
-	case !isAttr && url == p.defaultNS:
-		// We can use the default name space.
-		return
-	case url == "":
-		// The only way we can encode names in the empty
-		// name space is by using the default name space,
-		// so we must use that.
-		if p.defaultNS != "" {
-			// The default namespace is non-empty, so we
-			// need to set it to empty.
-			p.pushPrefix("", "")
-		}
-		return
-	case url == xmlURL:
-		return
-	}
-	// TODO If the URL is an existing prefix, we could
-	// use it as is. That would enable the
-	// marshaling of elements that had been unmarshaled
-	// and with a name space prefix that was not found.
-	// although technically it would be incorrect.
-
-	// Pick a name. We try to use the final element of the path
-	// but fall back to _.
-	prefix := strings.TrimRight(url, "/")
-	if i := strings.LastIndex(prefix, "/"); i >= 0 {
-		prefix = prefix[i+1:]
-	}
-	if prefix == "" || !isName([]byte(prefix)) || strings.Contains(prefix, ":") {
-		prefix = "_"
-	}
-	if strings.HasPrefix(prefix, "xml") {
-		// xmlanything is reserved.
-		prefix = "_" + prefix
-	}
-	if p.attrNS[prefix] != "" {
-		// Name is taken. Find a better one.
-		for p.seq++; ; p.seq++ {
-			if id := prefix + "_" + strconv.Itoa(p.seq); p.attrNS[id] == "" {
-				prefix = id
-				break
-			}
-		}
-	}
-
-	p.pushPrefix(prefix, url)
-}
-
-// writeNamespaces writes xmlns attributes for all the
-// namespace prefixes that have been defined in
-// the current element.
-func (p *printer) writeNamespaces() {
-	for i := len(p.prefixes) - 1; i >= 0; i-- {
-		prefix := p.prefixes[i]
-		if prefix.mark {
-			return
-		}
-		p.WriteString(" ")
-		if prefix.prefix == "" {
-			// Default name space.
-			p.WriteString(`xmlns="`)
-		} else {
-			p.WriteString("xmlns:")
-			p.WriteString(prefix.prefix)
-			p.WriteString(`="`)
-		}
-		EscapeText(p, []byte(p.nsForPrefix(prefix.prefix)))
-		p.WriteString(`"`)
-	}
-}
-
-// pushPrefix pushes a new prefix on the prefix stack
-// without checking to see if it is already defined.
-func (p *printer) pushPrefix(prefix, url string) {
-	p.prefixes = append(p.prefixes, printerPrefix{
-		prefix: prefix,
-		url:    p.nsForPrefix(prefix),
-	})
-	p.setAttrPrefix(prefix, url)
-}
-
-// nsForPrefix returns the name space for the given
-// prefix. Note that this is not valid for the
-// empty attribute prefix, which always has an empty
-// name space.
-func (p *printer) nsForPrefix(prefix string) string {
-	if prefix == "" {
-		return p.defaultNS
-	}
-	return p.attrNS[prefix]
-}
-
-// markPrefix marks the start of an element on the prefix
-// stack.
-func (p *printer) markPrefix() {
-	p.prefixes = append(p.prefixes, printerPrefix{
-		mark: true,
-	})
-}
-
-// popPrefix pops all defined prefixes for the current
-// element.
-func (p *printer) popPrefix() {
-	for len(p.prefixes) > 0 {
-		prefix := p.prefixes[len(p.prefixes)-1]
-		p.prefixes = p.prefixes[:len(p.prefixes)-1]
-		if prefix.mark {
-			break
-		}
-		p.setAttrPrefix(prefix.prefix, prefix.url)
-	}
-}
-
-// setAttrPrefix sets an attribute name space prefix.
-// If url is empty, the attribute is removed.
-// If prefix is empty, the default name space is set.
-func (p *printer) setAttrPrefix(prefix, url string) {
-	if prefix == "" {
-		p.defaultNS = url
-		return
-	}
-	if url == "" {
-		delete(p.attrPrefix, p.attrNS[prefix])
-		delete(p.attrNS, prefix)
-		return
-	}
-	if p.attrPrefix == nil {
-		// Need to define a new name space.
-		p.attrPrefix = make(map[string]string)
-		p.attrNS = make(map[string]string)
-	}
-	// Remove any old prefix value. This is OK because we maintain a
-	// strict one-to-one mapping between prefix and URL (see
-	// defineNS)
-	delete(p.attrPrefix, p.attrNS[prefix])
-	p.attrPrefix[url] = prefix
-	p.attrNS[prefix] = url
-}
-
-var (
-	marshalerType     = reflect.TypeOf((*Marshaler)(nil)).Elem()
-	marshalerAttrType = reflect.TypeOf((*MarshalerAttr)(nil)).Elem()
-	textMarshalerType = reflect.TypeOf((*encoding.TextMarshaler)(nil)).Elem()
-)
-
-// marshalValue writes one or more XML elements representing val.
-// If val was obtained from a struct field, finfo must have its details.
-func (p *printer) marshalValue(val reflect.Value, finfo *fieldInfo, startTemplate *StartElement) error {
-	if startTemplate != nil && startTemplate.Name.Local == "" {
-		return fmt.Errorf("xml: EncodeElement of StartElement with missing name")
-	}
-
-	if !val.IsValid() {
-		return nil
-	}
-	if finfo != nil && finfo.flags&fOmitEmpty != 0 && isEmptyValue(val) {
-		return nil
-	}
-
-	// Drill into interfaces and pointers.
-	// This can turn into an infinite loop given a cyclic chain,
-	// but it matches the Go 1 behavior.
-	for val.Kind() == reflect.Interface || val.Kind() == reflect.Ptr {
-		if val.IsNil() {
-			return nil
-		}
-		val = val.Elem()
-	}
-
-	kind := val.Kind()
-	typ := val.Type()
-
-	// Check for marshaler.
-	if val.CanInterface() && typ.Implements(marshalerType) {
-		return p.marshalInterface(val.Interface().(Marshaler), p.defaultStart(typ, finfo, startTemplate))
-	}
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(marshalerType) {
-			return p.marshalInterface(pv.Interface().(Marshaler), p.defaultStart(pv.Type(), finfo, startTemplate))
-		}
-	}
-
-	// Check for text marshaler.
-	if val.CanInterface() && typ.Implements(textMarshalerType) {
-		return p.marshalTextInterface(val.Interface().(encoding.TextMarshaler), p.defaultStart(typ, finfo, startTemplate))
-	}
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
-			return p.marshalTextInterface(pv.Interface().(encoding.TextMarshaler), p.defaultStart(pv.Type(), finfo, startTemplate))
-		}
-	}
-
-	// Slices and arrays iterate over the elements. They do not have an enclosing tag.
-	if (kind == reflect.Slice || kind == reflect.Array) && typ.Elem().Kind() != reflect.Uint8 {
-		for i, n := 0, val.Len(); i < n; i++ {
-			if err := p.marshalValue(val.Index(i), finfo, startTemplate); err != nil {
-				return err
-			}
-		}
-		return nil
-	}
-
-	tinfo, err := getTypeInfo(typ)
-	if err != nil {
-		return err
-	}
-
-	// Create start element.
-	// Precedence for the XML element name is:
-	// 0. startTemplate
-	// 1. XMLName field in underlying struct;
-	// 2. field name/tag in the struct field; and
-	// 3. type name
-	var start StartElement
-
-	// explicitNS records whether the element's name space has been
-	// explicitly set (for example an XMLName field).
-	explicitNS := false
-
-	if startTemplate != nil {
-		start.Name = startTemplate.Name
-		explicitNS = true
-		start.Attr = append(start.Attr, startTemplate.Attr...)
-	} else if tinfo.xmlname != nil {
-		xmlname := tinfo.xmlname
-		if xmlname.name != "" {
-			start.Name.Space, start.Name.Local = xmlname.xmlns, xmlname.name
-		} else if v, ok := xmlname.value(val).Interface().(Name); ok && v.Local != "" {
-			start.Name = v
-		}
-		explicitNS = true
-	}
-	if start.Name.Local == "" && finfo != nil {
-		start.Name.Local = finfo.name
-		if finfo.xmlns != "" {
-			start.Name.Space = finfo.xmlns
-			explicitNS = true
-		}
-	}
-	if start.Name.Local == "" {
-		name := typ.Name()
-		if name == "" {
-			return &UnsupportedTypeError{typ}
-		}
-		start.Name.Local = name
-	}
-
-	// defaultNS records the default name space as set by a xmlns="..."
-	// attribute. We don't set p.defaultNS because we want to let
-	// the attribute writing code (in p.defineNS) be solely responsible
-	// for maintaining that.
-	defaultNS := p.defaultNS
-
-	// Attributes
-	for i := range tinfo.fields {
-		finfo := &tinfo.fields[i]
-		if finfo.flags&fAttr == 0 {
-			continue
-		}
-		attr, err := p.fieldAttr(finfo, val)
-		if err != nil {
-			return err
-		}
-		if attr.Name.Local == "" {
-			continue
-		}
-		start.Attr = append(start.Attr, attr)
-		if attr.Name.Space == "" && attr.Name.Local == "xmlns" {
-			defaultNS = attr.Value
-		}
-	}
-	if !explicitNS {
-		// Historic behavior: elements use the default name space
-		// they are contained in by default.
-		start.Name.Space = defaultNS
-	}
-	// Historic behaviour: an element that's in a namespace sets
-	// the default namespace for all elements contained within it.
-	start.setDefaultNamespace()
-
-	if err := p.writeStart(&start); err != nil {
-		return err
-	}
-
-	if val.Kind() == reflect.Struct {
-		err = p.marshalStruct(tinfo, val)
-	} else {
-		s, b, err1 := p.marshalSimple(typ, val)
-		if err1 != nil {
-			err = err1
-		} else if b != nil {
-			EscapeText(p, b)
-		} else {
-			p.EscapeString(s)
-		}
-	}
-	if err != nil {
-		return err
-	}
-
-	if err := p.writeEnd(start.Name); err != nil {
-		return err
-	}
-
-	return p.cachedWriteError()
-}
-
-// fieldAttr returns the attribute of the given field.
-// If the returned attribute has an empty Name.Local,
-// it should not be used.
-// The given value holds the value containing the field.
-func (p *printer) fieldAttr(finfo *fieldInfo, val reflect.Value) (Attr, error) {
-	fv := finfo.value(val)
-	name := Name{Space: finfo.xmlns, Local: finfo.name}
-	if finfo.flags&fOmitEmpty != 0 && isEmptyValue(fv) {
-		return Attr{}, nil
-	}
-	if fv.Kind() == reflect.Interface && fv.IsNil() {
-		return Attr{}, nil
-	}
-	if fv.CanInterface() && fv.Type().Implements(marshalerAttrType) {
-		attr, err := fv.Interface().(MarshalerAttr).MarshalXMLAttr(name)
-		return attr, err
-	}
-	if fv.CanAddr() {
-		pv := fv.Addr()
-		if pv.CanInterface() && pv.Type().Implements(marshalerAttrType) {
-			attr, err := pv.Interface().(MarshalerAttr).MarshalXMLAttr(name)
-			return attr, err
-		}
-	}
-	if fv.CanInterface() && fv.Type().Implements(textMarshalerType) {
-		text, err := fv.Interface().(encoding.TextMarshaler).MarshalText()
-		if err != nil {
-			return Attr{}, err
-		}
-		return Attr{name, string(text)}, nil
-	}
-	if fv.CanAddr() {
-		pv := fv.Addr()
-		if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
-			text, err := pv.Interface().(encoding.TextMarshaler).MarshalText()
-			if err != nil {
-				return Attr{}, err
-			}
-			return Attr{name, string(text)}, nil
-		}
-	}
-	// Dereference or skip nil pointer, interface values.
-	switch fv.Kind() {
-	case reflect.Ptr, reflect.Interface:
-		if fv.IsNil() {
-			return Attr{}, nil
-		}
-		fv = fv.Elem()
-	}
-	s, b, err := p.marshalSimple(fv.Type(), fv)
-	if err != nil {
-		return Attr{}, err
-	}
-	if b != nil {
-		s = string(b)
-	}
-	return Attr{name, s}, nil
-}
-
-// defaultStart returns the default start element to use,
-// given the reflect type, field info, and start template.
-func (p *printer) defaultStart(typ reflect.Type, finfo *fieldInfo, startTemplate *StartElement) StartElement {
-	var start StartElement
-	// Precedence for the XML element name is as above,
-	// except that we do not look inside structs for the first field.
-	if startTemplate != nil {
-		start.Name = startTemplate.Name
-		start.Attr = append(start.Attr, startTemplate.Attr...)
-	} else if finfo != nil && finfo.name != "" {
-		start.Name.Local = finfo.name
-		start.Name.Space = finfo.xmlns
-	} else if typ.Name() != "" {
-		start.Name.Local = typ.Name()
-	} else {
-		// Must be a pointer to a named type,
-		// since it has the Marshaler methods.
-		start.Name.Local = typ.Elem().Name()
-	}
-	// Historic behaviour: elements use the name space of
-	// the element they are contained in by default.
-	if start.Name.Space == "" {
-		start.Name.Space = p.defaultNS
-	}
-	start.setDefaultNamespace()
-	return start
-}
-
-// marshalInterface marshals a Marshaler interface value.
-func (p *printer) marshalInterface(val Marshaler, start StartElement) error {
-	// Push a marker onto the tag stack so that MarshalXML
-	// cannot close the XML tags that it did not open.
-	p.tags = append(p.tags, Name{})
-	n := len(p.tags)
-
-	err := val.MarshalXML(p.encoder, start)
-	if err != nil {
-		return err
-	}
-
-	// Make sure MarshalXML closed all its tags. p.tags[n-1] is the mark.
-	if len(p.tags) > n {
-		return fmt.Errorf("xml: %s.MarshalXML wrote invalid XML: <%s> not closed", receiverType(val), p.tags[len(p.tags)-1].Local)
-	}
-	p.tags = p.tags[:n-1]
-	return nil
-}
-
-// marshalTextInterface marshals a TextMarshaler interface value.
-func (p *printer) marshalTextInterface(val encoding.TextMarshaler, start StartElement) error {
-	if err := p.writeStart(&start); err != nil {
-		return err
-	}
-	text, err := val.MarshalText()
-	if err != nil {
-		return err
-	}
-	EscapeText(p, text)
-	return p.writeEnd(start.Name)
-}
-
-// writeStart writes the given start element.
-func (p *printer) writeStart(start *StartElement) error {
-	if start.Name.Local == "" {
-		return fmt.Errorf("xml: start tag with no name")
-	}
-
-	p.tags = append(p.tags, start.Name)
-	p.markPrefix()
-	// Define any name spaces explicitly declared in the attributes.
-	// We do this as a separate pass so that explicitly declared prefixes
-	// will take precedence over implicitly declared prefixes
-	// regardless of the order of the attributes.
-	ignoreNonEmptyDefault := start.Name.Space == ""
-	for _, attr := range start.Attr {
-		if err := p.defineNS(attr, ignoreNonEmptyDefault); err != nil {
-			return err
-		}
-	}
-	// Define any new name spaces implied by the attributes.
-	for _, attr := range start.Attr {
-		name := attr.Name
-		// From http://www.w3.org/TR/xml-names11/#defaulting
-		// "Default namespace declarations do not apply directly
-		// to attribute names; the interpretation of unprefixed
-		// attributes is determined by the element on which they
-		// appear."
-		// This means we don't need to create a new namespace
-		// when an attribute name space is empty.
-		if name.Space != "" && !name.isNamespace() {
-			p.createNSPrefix(name.Space, true)
-		}
-	}
-	p.createNSPrefix(start.Name.Space, false)
-
-	p.writeIndent(1)
-	p.WriteByte('<')
-	p.writeName(start.Name, false)
-	p.writeNamespaces()
-	for _, attr := range start.Attr {
-		name := attr.Name
-		if name.Local == "" || name.isNamespace() {
-			// Namespaces have already been written by writeNamespaces above.
-			continue
-		}
-		p.WriteByte(' ')
-		p.writeName(name, true)
-		p.WriteString(`="`)
-		p.EscapeString(attr.Value)
-		p.WriteByte('"')
-	}
-	p.WriteByte('>')
-	return nil
-}
-
-// writeName writes the given name. It assumes
-// that p.createNSPrefix(name) has already been called.
-func (p *printer) writeName(name Name, isAttr bool) {
-	if prefix := p.prefixForNS(name.Space, isAttr); prefix != "" {
-		p.WriteString(prefix)
-		p.WriteByte(':')
-	}
-	p.WriteString(name.Local)
-}
-
-func (p *printer) writeEnd(name Name) error {
-	if name.Local == "" {
-		return fmt.Errorf("xml: end tag with no name")
-	}
-	if len(p.tags) == 0 || p.tags[len(p.tags)-1].Local == "" {
-		return fmt.Errorf("xml: end tag </%s> without start tag", name.Local)
-	}
-	if top := p.tags[len(p.tags)-1]; top != name {
-		if top.Local != name.Local {
-			return fmt.Errorf("xml: end tag </%s> does not match start tag <%s>", name.Local, top.Local)
-		}
-		return fmt.Errorf("xml: end tag </%s> in namespace %s does not match start tag <%s> in namespace %s", name.Local, name.Space, top.Local, top.Space)
-	}
-	p.tags = p.tags[:len(p.tags)-1]
-
-	p.writeIndent(-1)
-	p.WriteByte('<')
-	p.WriteByte('/')
-	p.writeName(name, false)
-	p.WriteByte('>')
-	p.popPrefix()
-	return nil
-}
-
-func (p *printer) marshalSimple(typ reflect.Type, val reflect.Value) (string, []byte, error) {
-	switch val.Kind() {
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return strconv.FormatInt(val.Int(), 10), nil, nil
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return strconv.FormatUint(val.Uint(), 10), nil, nil
-	case reflect.Float32, reflect.Float64:
-		return strconv.FormatFloat(val.Float(), 'g', -1, val.Type().Bits()), nil, nil
-	case reflect.String:
-		return val.String(), nil, nil
-	case reflect.Bool:
-		return strconv.FormatBool(val.Bool()), nil, nil
-	case reflect.Array:
-		if typ.Elem().Kind() != reflect.Uint8 {
-			break
-		}
-		// [...]byte
-		var bytes []byte
-		if val.CanAddr() {
-			bytes = val.Slice(0, val.Len()).Bytes()
-		} else {
-			bytes = make([]byte, val.Len())
-			reflect.Copy(reflect.ValueOf(bytes), val)
-		}
-		return "", bytes, nil
-	case reflect.Slice:
-		if typ.Elem().Kind() != reflect.Uint8 {
-			break
-		}
-		// []byte
-		return "", val.Bytes(), nil
-	}
-	return "", nil, &UnsupportedTypeError{typ}
-}
-
-var ddBytes = []byte("--")
-
-func (p *printer) marshalStruct(tinfo *typeInfo, val reflect.Value) error {
-	s := parentStack{p: p}
-	for i := range tinfo.fields {
-		finfo := &tinfo.fields[i]
-		if finfo.flags&fAttr != 0 {
-			continue
-		}
-		vf := finfo.value(val)
-
-		// Dereference or skip nil pointer, interface values.
-		switch vf.Kind() {
-		case reflect.Ptr, reflect.Interface:
-			if !vf.IsNil() {
-				vf = vf.Elem()
-			}
-		}
-
-		switch finfo.flags & fMode {
-		case fCharData:
-			if err := s.setParents(&noField, reflect.Value{}); err != nil {
-				return err
-			}
-			if vf.CanInterface() && vf.Type().Implements(textMarshalerType) {
-				data, err := vf.Interface().(encoding.TextMarshaler).MarshalText()
-				if err != nil {
-					return err
-				}
-				Escape(p, data)
-				continue
-			}
-			if vf.CanAddr() {
-				pv := vf.Addr()
-				if pv.CanInterface() && pv.Type().Implements(textMarshalerType) {
-					data, err := pv.Interface().(encoding.TextMarshaler).MarshalText()
-					if err != nil {
-						return err
-					}
-					Escape(p, data)
-					continue
-				}
-			}
-			var scratch [64]byte
-			switch vf.Kind() {
-			case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-				Escape(p, strconv.AppendInt(scratch[:0], vf.Int(), 10))
-			case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-				Escape(p, strconv.AppendUint(scratch[:0], vf.Uint(), 10))
-			case reflect.Float32, reflect.Float64:
-				Escape(p, strconv.AppendFloat(scratch[:0], vf.Float(), 'g', -1, vf.Type().Bits()))
-			case reflect.Bool:
-				Escape(p, strconv.AppendBool(scratch[:0], vf.Bool()))
-			case reflect.String:
-				if err := EscapeText(p, []byte(vf.String())); err != nil {
-					return err
-				}
-			case reflect.Slice:
-				if elem, ok := vf.Interface().([]byte); ok {
-					if err := EscapeText(p, elem); err != nil {
-						return err
-					}
-				}
-			}
-			continue
-
-		case fComment:
-			if err := s.setParents(&noField, reflect.Value{}); err != nil {
-				return err
-			}
-			k := vf.Kind()
-			if !(k == reflect.String || k == reflect.Slice && vf.Type().Elem().Kind() == reflect.Uint8) {
-				return fmt.Errorf("xml: bad type for comment field of %s", val.Type())
-			}
-			if vf.Len() == 0 {
-				continue
-			}
-			p.writeIndent(0)
-			p.WriteString("<!--")
-			dashDash := false
-			dashLast := false
-			switch k {
-			case reflect.String:
-				s := vf.String()
-				dashDash = strings.Index(s, "--") >= 0
-				dashLast = s[len(s)-1] == '-'
-				if !dashDash {
-					p.WriteString(s)
-				}
-			case reflect.Slice:
-				b := vf.Bytes()
-				dashDash = bytes.Index(b, ddBytes) >= 0
-				dashLast = b[len(b)-1] == '-'
-				if !dashDash {
-					p.Write(b)
-				}
-			default:
-				panic("can't happen")
-			}
-			if dashDash {
-				return fmt.Errorf(`xml: comments must not contain "--"`)
-			}
-			if dashLast {
-				// "--->" is invalid grammar. Make it "- -->"
-				p.WriteByte(' ')
-			}
-			p.WriteString("-->")
-			continue
-
-		case fInnerXml:
-			iface := vf.Interface()
-			switch raw := iface.(type) {
-			case []byte:
-				p.Write(raw)
-				continue
-			case string:
-				p.WriteString(raw)
-				continue
-			}
-
-		case fElement, fElement | fAny:
-			if err := s.setParents(finfo, vf); err != nil {
-				return err
-			}
-		}
-		if err := p.marshalValue(vf, finfo, nil); err != nil {
-			return err
-		}
-	}
-	if err := s.setParents(&noField, reflect.Value{}); err != nil {
-		return err
-	}
-	return p.cachedWriteError()
-}
-
-var noField fieldInfo
-
-// return the bufio Writer's cached write error
-func (p *printer) cachedWriteError() error {
-	_, err := p.Write(nil)
-	return err
-}
-
-func (p *printer) writeIndent(depthDelta int) {
-	if len(p.prefix) == 0 && len(p.indent) == 0 {
-		return
-	}
-	if depthDelta < 0 {
-		p.depth--
-		if p.indentedIn {
-			p.indentedIn = false
-			return
-		}
-		p.indentedIn = false
-	}
-	if p.putNewline {
-		p.WriteByte('\n')
-	} else {
-		p.putNewline = true
-	}
-	if len(p.prefix) > 0 {
-		p.WriteString(p.prefix)
-	}
-	if len(p.indent) > 0 {
-		for i := 0; i < p.depth; i++ {
-			p.WriteString(p.indent)
-		}
-	}
-	if depthDelta > 0 {
-		p.depth++
-		p.indentedIn = true
-	}
-}
-
-type parentStack struct {
-	p       *printer
-	xmlns   string
-	parents []string
-}
-
-// setParents sets the stack of current parents to those found in finfo.
-// It only writes the start elements if vf holds a non-nil value.
-// If finfo is &noField, it pops all elements.
-func (s *parentStack) setParents(finfo *fieldInfo, vf reflect.Value) error {
-	xmlns := s.p.defaultNS
-	if finfo.xmlns != "" {
-		xmlns = finfo.xmlns
-	}
-	commonParents := 0
-	if xmlns == s.xmlns {
-		for ; commonParents < len(finfo.parents) && commonParents < len(s.parents); commonParents++ {
-			if finfo.parents[commonParents] != s.parents[commonParents] {
-				break
-			}
-		}
-	}
-	// Pop off any parents that aren't in common with the previous field.
-	for i := len(s.parents) - 1; i >= commonParents; i-- {
-		if err := s.p.writeEnd(Name{
-			Space: s.xmlns,
-			Local: s.parents[i],
-		}); err != nil {
-			return err
-		}
-	}
-	s.parents = finfo.parents
-	s.xmlns = xmlns
-	if commonParents >= len(s.parents) {
-		// No new elements to push.
-		return nil
-	}
-	if (vf.Kind() == reflect.Ptr || vf.Kind() == reflect.Interface) && vf.IsNil() {
-		// The element is nil, so no need for the start elements.
-		s.parents = s.parents[:commonParents]
-		return nil
-	}
-	// Push any new parents required.
-	for _, name := range s.parents[commonParents:] {
-		start := &StartElement{
-			Name: Name{
-				Space: s.xmlns,
-				Local: name,
-			},
-		}
-		// Set the default name space for parent elements
-		// to match what we do with other elements.
-		if s.xmlns != s.p.defaultNS {
-			start.setDefaultNamespace()
-		}
-		if err := s.p.writeStart(start); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// A MarshalXMLError is returned when Marshal encounters a type
-// that cannot be converted into XML.
-type UnsupportedTypeError struct {
-	Type reflect.Type
-}
-
-func (e *UnsupportedTypeError) Error() string {
-	return "xml: unsupported type: " + e.Type.String()
-}
-
-func isEmptyValue(v reflect.Value) bool {
-	switch v.Kind() {
-	case reflect.Array, reflect.Map, reflect.Slice, reflect.String:
-		return v.Len() == 0
-	case reflect.Bool:
-		return !v.Bool()
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		return v.Int() == 0
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		return v.Uint() == 0
-	case reflect.Float32, reflect.Float64:
-		return v.Float() == 0
-	case reflect.Interface, reflect.Ptr:
-		return v.IsNil()
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal_test.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal_test.go
deleted file mode 100644
index 226cfd013f..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/marshal_test.go
+++ /dev/null
@@ -1,1939 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"reflect"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-type DriveType int
-
-const (
-	HyperDrive DriveType = iota
-	ImprobabilityDrive
-)
-
-type Passenger struct {
-	Name   []string `xml:"name"`
-	Weight float32  `xml:"weight"`
-}
-
-type Ship struct {
-	XMLName struct{} `xml:"spaceship"`
-
-	Name      string       `xml:"name,attr"`
-	Pilot     string       `xml:"pilot,attr"`
-	Drive     DriveType    `xml:"drive"`
-	Age       uint         `xml:"age"`
-	Passenger []*Passenger `xml:"passenger"`
-	secret    string
-}
-
-type NamedType string
-
-type Port struct {
-	XMLName struct{} `xml:"port"`
-	Type    string   `xml:"type,attr,omitempty"`
-	Comment string   `xml:",comment"`
-	Number  string   `xml:",chardata"`
-}
-
-type Domain struct {
-	XMLName struct{} `xml:"domain"`
-	Country string   `xml:",attr,omitempty"`
-	Name    []byte   `xml:",chardata"`
-	Comment []byte   `xml:",comment"`
-}
-
-type Book struct {
-	XMLName struct{} `xml:"book"`
-	Title   string   `xml:",chardata"`
-}
-
-type Event struct {
-	XMLName struct{} `xml:"event"`
-	Year    int      `xml:",chardata"`
-}
-
-type Movie struct {
-	XMLName struct{} `xml:"movie"`
-	Length  uint     `xml:",chardata"`
-}
-
-type Pi struct {
-	XMLName       struct{} `xml:"pi"`
-	Approximation float32  `xml:",chardata"`
-}
-
-type Universe struct {
-	XMLName struct{} `xml:"universe"`
-	Visible float64  `xml:",chardata"`
-}
-
-type Particle struct {
-	XMLName struct{} `xml:"particle"`
-	HasMass bool     `xml:",chardata"`
-}
-
-type Departure struct {
-	XMLName struct{}  `xml:"departure"`
-	When    time.Time `xml:",chardata"`
-}
-
-type SecretAgent struct {
-	XMLName   struct{} `xml:"agent"`
-	Handle    string   `xml:"handle,attr"`
-	Identity  string
-	Obfuscate string `xml:",innerxml"`
-}
-
-type NestedItems struct {
-	XMLName struct{} `xml:"result"`
-	Items   []string `xml:">item"`
-	Item1   []string `xml:"Items>item1"`
-}
-
-type NestedOrder struct {
-	XMLName struct{} `xml:"result"`
-	Field1  string   `xml:"parent>c"`
-	Field2  string   `xml:"parent>b"`
-	Field3  string   `xml:"parent>a"`
-}
-
-type MixedNested struct {
-	XMLName struct{} `xml:"result"`
-	A       string   `xml:"parent1>a"`
-	B       string   `xml:"b"`
-	C       string   `xml:"parent1>parent2>c"`
-	D       string   `xml:"parent1>d"`
-}
-
-type NilTest struct {
-	A interface{} `xml:"parent1>parent2>a"`
-	B interface{} `xml:"parent1>b"`
-	C interface{} `xml:"parent1>parent2>c"`
-}
-
-type Service struct {
-	XMLName struct{} `xml:"service"`
-	Domain  *Domain  `xml:"host>domain"`
-	Port    *Port    `xml:"host>port"`
-	Extra1  interface{}
-	Extra2  interface{} `xml:"host>extra2"`
-}
-
-var nilStruct *Ship
-
-type EmbedA struct {
-	EmbedC
-	EmbedB EmbedB
-	FieldA string
-}
-
-type EmbedB struct {
-	FieldB string
-	*EmbedC
-}
-
-type EmbedC struct {
-	FieldA1 string `xml:"FieldA>A1"`
-	FieldA2 string `xml:"FieldA>A2"`
-	FieldB  string
-	FieldC  string
-}
-
-type NameCasing struct {
-	XMLName struct{} `xml:"casing"`
-	Xy      string
-	XY      string
-	XyA     string `xml:"Xy,attr"`
-	XYA     string `xml:"XY,attr"`
-}
-
-type NamePrecedence struct {
-	XMLName     Name              `xml:"Parent"`
-	FromTag     XMLNameWithoutTag `xml:"InTag"`
-	FromNameVal XMLNameWithoutTag
-	FromNameTag XMLNameWithTag
-	InFieldName string
-}
-
-type XMLNameWithTag struct {
-	XMLName Name   `xml:"InXMLNameTag"`
-	Value   string `xml:",chardata"`
-}
-
-type XMLNameWithNSTag struct {
-	XMLName Name   `xml:"ns InXMLNameWithNSTag"`
-	Value   string `xml:",chardata"`
-}
-
-type XMLNameWithoutTag struct {
-	XMLName Name
-	Value   string `xml:",chardata"`
-}
-
-type NameInField struct {
-	Foo Name `xml:"ns foo"`
-}
-
-type AttrTest struct {
-	Int   int     `xml:",attr"`
-	Named int     `xml:"int,attr"`
-	Float float64 `xml:",attr"`
-	Uint8 uint8   `xml:",attr"`
-	Bool  bool    `xml:",attr"`
-	Str   string  `xml:",attr"`
-	Bytes []byte  `xml:",attr"`
-}
-
-type OmitAttrTest struct {
-	Int   int     `xml:",attr,omitempty"`
-	Named int     `xml:"int,attr,omitempty"`
-	Float float64 `xml:",attr,omitempty"`
-	Uint8 uint8   `xml:",attr,omitempty"`
-	Bool  bool    `xml:",attr,omitempty"`
-	Str   string  `xml:",attr,omitempty"`
-	Bytes []byte  `xml:",attr,omitempty"`
-}
-
-type OmitFieldTest struct {
-	Int   int           `xml:",omitempty"`
-	Named int           `xml:"int,omitempty"`
-	Float float64       `xml:",omitempty"`
-	Uint8 uint8         `xml:",omitempty"`
-	Bool  bool          `xml:",omitempty"`
-	Str   string        `xml:",omitempty"`
-	Bytes []byte        `xml:",omitempty"`
-	Ptr   *PresenceTest `xml:",omitempty"`
-}
-
-type AnyTest struct {
-	XMLName  struct{}  `xml:"a"`
-	Nested   string    `xml:"nested>value"`
-	AnyField AnyHolder `xml:",any"`
-}
-
-type AnyOmitTest struct {
-	XMLName  struct{}   `xml:"a"`
-	Nested   string     `xml:"nested>value"`
-	AnyField *AnyHolder `xml:",any,omitempty"`
-}
-
-type AnySliceTest struct {
-	XMLName  struct{}    `xml:"a"`
-	Nested   string      `xml:"nested>value"`
-	AnyField []AnyHolder `xml:",any"`
-}
-
-type AnyHolder struct {
-	XMLName Name
-	XML     string `xml:",innerxml"`
-}
-
-type RecurseA struct {
-	A string
-	B *RecurseB
-}
-
-type RecurseB struct {
-	A *RecurseA
-	B string
-}
-
-type PresenceTest struct {
-	Exists *struct{}
-}
-
-type IgnoreTest struct {
-	PublicSecret string `xml:"-"`
-}
-
-type MyBytes []byte
-
-type Data struct {
-	Bytes  []byte
-	Attr   []byte `xml:",attr"`
-	Custom MyBytes
-}
-
-type Plain struct {
-	V interface{}
-}
-
-type MyInt int
-
-type EmbedInt struct {
-	MyInt
-}
-
-type Strings struct {
-	X []string `xml:"A>B,omitempty"`
-}
-
-type PointerFieldsTest struct {
-	XMLName  Name    `xml:"dummy"`
-	Name     *string `xml:"name,attr"`
-	Age      *uint   `xml:"age,attr"`
-	Empty    *string `xml:"empty,attr"`
-	Contents *string `xml:",chardata"`
-}
-
-type ChardataEmptyTest struct {
-	XMLName  Name    `xml:"test"`
-	Contents *string `xml:",chardata"`
-}
-
-type MyMarshalerTest struct {
-}
-
-var _ Marshaler = (*MyMarshalerTest)(nil)
-
-func (m *MyMarshalerTest) MarshalXML(e *Encoder, start StartElement) error {
-	e.EncodeToken(start)
-	e.EncodeToken(CharData([]byte("hello world")))
-	e.EncodeToken(EndElement{start.Name})
-	return nil
-}
-
-type MyMarshalerAttrTest struct{}
-
-var _ MarshalerAttr = (*MyMarshalerAttrTest)(nil)
-
-func (m *MyMarshalerAttrTest) MarshalXMLAttr(name Name) (Attr, error) {
-	return Attr{name, "hello world"}, nil
-}
-
-type MyMarshalerValueAttrTest struct{}
-
-var _ MarshalerAttr = MyMarshalerValueAttrTest{}
-
-func (m MyMarshalerValueAttrTest) MarshalXMLAttr(name Name) (Attr, error) {
-	return Attr{name, "hello world"}, nil
-}
-
-type MarshalerStruct struct {
-	Foo MyMarshalerAttrTest `xml:",attr"`
-}
-
-type MarshalerValueStruct struct {
-	Foo MyMarshalerValueAttrTest `xml:",attr"`
-}
-
-type InnerStruct struct {
-	XMLName Name `xml:"testns outer"`
-}
-
-type OuterStruct struct {
-	InnerStruct
-	IntAttr int `xml:"int,attr"`
-}
-
-type OuterNamedStruct struct {
-	InnerStruct
-	XMLName Name `xml:"outerns test"`
-	IntAttr int  `xml:"int,attr"`
-}
-
-type OuterNamedOrderedStruct struct {
-	XMLName Name `xml:"outerns test"`
-	InnerStruct
-	IntAttr int `xml:"int,attr"`
-}
-
-type OuterOuterStruct struct {
-	OuterStruct
-}
-
-type NestedAndChardata struct {
-	AB       []string `xml:"A>B"`
-	Chardata string   `xml:",chardata"`
-}
-
-type NestedAndComment struct {
-	AB      []string `xml:"A>B"`
-	Comment string   `xml:",comment"`
-}
-
-type XMLNSFieldStruct struct {
-	Ns   string `xml:"xmlns,attr"`
-	Body string
-}
-
-type NamedXMLNSFieldStruct struct {
-	XMLName struct{} `xml:"testns test"`
-	Ns      string   `xml:"xmlns,attr"`
-	Body    string
-}
-
-type XMLNSFieldStructWithOmitEmpty struct {
-	Ns   string `xml:"xmlns,attr,omitempty"`
-	Body string
-}
-
-type NamedXMLNSFieldStructWithEmptyNamespace struct {
-	XMLName struct{} `xml:"test"`
-	Ns      string   `xml:"xmlns,attr"`
-	Body    string
-}
-
-type RecursiveXMLNSFieldStruct struct {
-	Ns   string                     `xml:"xmlns,attr"`
-	Body *RecursiveXMLNSFieldStruct `xml:",omitempty"`
-	Text string                     `xml:",omitempty"`
-}
-
-func ifaceptr(x interface{}) interface{} {
-	return &x
-}
-
-var (
-	nameAttr     = "Sarah"
-	ageAttr      = uint(12)
-	contentsAttr = "lorem ipsum"
-)
-
-// Unless explicitly stated as such (or *Plain), all of the
-// tests below are two-way tests. When introducing new tests,
-// please try to make them two-way as well to ensure that
-// marshalling and unmarshalling are as symmetrical as feasible.
-var marshalTests = []struct {
-	Value         interface{}
-	ExpectXML     string
-	MarshalOnly   bool
-	UnmarshalOnly bool
-}{
-	// Test nil marshals to nothing
-	{Value: nil, ExpectXML: ``, MarshalOnly: true},
-	{Value: nilStruct, ExpectXML: ``, MarshalOnly: true},
-
-	// Test value types
-	{Value: &Plain{true}, ExpectXML: `<Plain><V>true</V></Plain>`},
-	{Value: &Plain{false}, ExpectXML: `<Plain><V>false</V></Plain>`},
-	{Value: &Plain{int(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{int32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint8(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint16(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{uint32(42)}, ExpectXML: `<Plain><V>42</V></Plain>`},
-	{Value: &Plain{float32(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
-	{Value: &Plain{float64(1.25)}, ExpectXML: `<Plain><V>1.25</V></Plain>`},
-	{Value: &Plain{uintptr(0xFFDD)}, ExpectXML: `<Plain><V>65501</V></Plain>`},
-	{Value: &Plain{"gopher"}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
-	{Value: &Plain{[]byte("gopher")}, ExpectXML: `<Plain><V>gopher</V></Plain>`},
-	{Value: &Plain{"</>"}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{[]byte("</>")}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{[3]byte{'<', '/', '>'}}, ExpectXML: `<Plain><V>&lt;/&gt;</V></Plain>`},
-	{Value: &Plain{NamedType("potato")}, ExpectXML: `<Plain><V>potato</V></Plain>`},
-	{Value: &Plain{[]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
-	{Value: &Plain{[3]int{1, 2, 3}}, ExpectXML: `<Plain><V>1</V><V>2</V><V>3</V></Plain>`},
-	{Value: ifaceptr(true), MarshalOnly: true, ExpectXML: `<bool>true</bool>`},
-
-	// Test time.
-	{
-		Value:     &Plain{time.Unix(1e9, 123456789).UTC()},
-		ExpectXML: `<Plain><V>2001-09-09T01:46:40.123456789Z</V></Plain>`,
-	},
-
-	// A pointer to struct{} may be used to test for an element's presence.
-	{
-		Value:     &PresenceTest{new(struct{})},
-		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
-	},
-	{
-		Value:     &PresenceTest{},
-		ExpectXML: `<PresenceTest></PresenceTest>`,
-	},
-
-	// A pointer to struct{} may be used to test for an element's presence.
-	{
-		Value:     &PresenceTest{new(struct{})},
-		ExpectXML: `<PresenceTest><Exists></Exists></PresenceTest>`,
-	},
-	{
-		Value:     &PresenceTest{},
-		ExpectXML: `<PresenceTest></PresenceTest>`,
-	},
-
-	// A []byte field is only nil if the element was not found.
-	{
-		Value:         &Data{},
-		ExpectXML:     `<Data></Data>`,
-		UnmarshalOnly: true,
-	},
-	{
-		Value:         &Data{Bytes: []byte{}, Custom: MyBytes{}, Attr: []byte{}},
-		ExpectXML:     `<Data Attr=""><Bytes></Bytes><Custom></Custom></Data>`,
-		UnmarshalOnly: true,
-	},
-
-	// Check that []byte works, including named []byte types.
-	{
-		Value:     &Data{Bytes: []byte("ab"), Custom: MyBytes("cd"), Attr: []byte{'v'}},
-		ExpectXML: `<Data Attr="v"><Bytes>ab</Bytes><Custom>cd</Custom></Data>`,
-	},
-
-	// Test innerxml
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<redacted/>",
-		},
-		ExpectXML:   `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<Identity>James Bond</Identity><redacted/>",
-		},
-		ExpectXML:     `<agent handle="007"><Identity>James Bond</Identity><redacted/></agent>`,
-		UnmarshalOnly: true,
-	},
-
-	// Test structs
-	{Value: &Port{Type: "ssl", Number: "443"}, ExpectXML: `<port type="ssl">443</port>`},
-	{Value: &Port{Number: "443"}, ExpectXML: `<port>443</port>`},
-	{Value: &Port{Type: "<unix>"}, ExpectXML: `<port type="&lt;unix&gt;"></port>`},
-	{Value: &Port{Number: "443", Comment: "https"}, ExpectXML: `<port><!--https-->443</port>`},
-	{Value: &Port{Number: "443", Comment: "add space-"}, ExpectXML: `<port><!--add space- -->443</port>`, MarshalOnly: true},
-	{Value: &Domain{Name: []byte("google.com&friends")}, ExpectXML: `<domain>google.com&amp;friends</domain>`},
-	{Value: &Domain{Name: []byte("google.com"), Comment: []byte(" &friends ")}, ExpectXML: `<domain>google.com<!-- &friends --></domain>`},
-	{Value: &Book{Title: "Pride & Prejudice"}, ExpectXML: `<book>Pride &amp; Prejudice</book>`},
-	{Value: &Event{Year: -3114}, ExpectXML: `<event>-3114</event>`},
-	{Value: &Movie{Length: 13440}, ExpectXML: `<movie>13440</movie>`},
-	{Value: &Pi{Approximation: 3.14159265}, ExpectXML: `<pi>3.1415927</pi>`},
-	{Value: &Universe{Visible: 9.3e13}, ExpectXML: `<universe>9.3e+13</universe>`},
-	{Value: &Particle{HasMass: true}, ExpectXML: `<particle>true</particle>`},
-	{Value: &Departure{When: ParseTime("2013-01-09T00:15:00-09:00")}, ExpectXML: `<departure>2013-01-09T00:15:00-09:00</departure>`},
-	{Value: atomValue, ExpectXML: atomXml},
-	{
-		Value: &Ship{
-			Name:  "Heart of Gold",
-			Pilot: "Computer",
-			Age:   1,
-			Drive: ImprobabilityDrive,
-			Passenger: []*Passenger{
-				{
-					Name:   []string{"Zaphod", "Beeblebrox"},
-					Weight: 7.25,
-				},
-				{
-					Name:   []string{"Trisha", "McMillen"},
-					Weight: 5.5,
-				},
-				{
-					Name:   []string{"Ford", "Prefect"},
-					Weight: 7,
-				},
-				{
-					Name:   []string{"Arthur", "Dent"},
-					Weight: 6.75,
-				},
-			},
-		},
-		ExpectXML: `<spaceship name="Heart of Gold" pilot="Computer">` +
-			`<drive>` + strconv.Itoa(int(ImprobabilityDrive)) + `</drive>` +
-			`<age>1</age>` +
-			`<passenger>` +
-			`<name>Zaphod</name>` +
-			`<name>Beeblebrox</name>` +
-			`<weight>7.25</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Trisha</name>` +
-			`<name>McMillen</name>` +
-			`<weight>5.5</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Ford</name>` +
-			`<name>Prefect</name>` +
-			`<weight>7</weight>` +
-			`</passenger>` +
-			`<passenger>` +
-			`<name>Arthur</name>` +
-			`<name>Dent</name>` +
-			`<weight>6.75</weight>` +
-			`</passenger>` +
-			`</spaceship>`,
-	},
-
-	// Test a>b
-	{
-		Value: &NestedItems{Items: nil, Item1: nil},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{}, Item1: []string{}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`</Items>` +
-			`</result>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &NestedItems{Items: nil, Item1: []string{"A"}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item1>A</item1>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{"A", "B"}, Item1: nil},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item>A</item>` +
-			`<item>B</item>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedItems{Items: []string{"A", "B"}, Item1: []string{"C"}},
-		ExpectXML: `<result>` +
-			`<Items>` +
-			`<item>A</item>` +
-			`<item>B</item>` +
-			`<item1>C</item1>` +
-			`</Items>` +
-			`</result>`,
-	},
-	{
-		Value: &NestedOrder{Field1: "C", Field2: "B", Field3: "A"},
-		ExpectXML: `<result>` +
-			`<parent>` +
-			`<c>C</c>` +
-			`<b>B</b>` +
-			`<a>A</a>` +
-			`</parent>` +
-			`</result>`,
-	},
-	{
-		Value: &NilTest{A: "A", B: nil, C: "C"},
-		ExpectXML: `<NilTest>` +
-			`<parent1>` +
-			`<parent2><a>A</a></parent2>` +
-			`<parent2><c>C</c></parent2>` +
-			`</parent1>` +
-			`</NilTest>`,
-		MarshalOnly: true, // Uses interface{}
-	},
-	{
-		Value: &MixedNested{A: "A", B: "B", C: "C", D: "D"},
-		ExpectXML: `<result>` +
-			`<parent1><a>A</a></parent1>` +
-			`<b>B</b>` +
-			`<parent1>` +
-			`<parent2><c>C</c></parent2>` +
-			`<d>D</d>` +
-			`</parent1>` +
-			`</result>`,
-	},
-	{
-		Value:     &Service{Port: &Port{Number: "80"}},
-		ExpectXML: `<service><host><port>80</port></host></service>`,
-	},
-	{
-		Value:     &Service{},
-		ExpectXML: `<service></service>`,
-	},
-	{
-		Value: &Service{Port: &Port{Number: "80"}, Extra1: "A", Extra2: "B"},
-		ExpectXML: `<service>` +
-			`<host><port>80</port></host>` +
-			`<Extra1>A</Extra1>` +
-			`<host><extra2>B</extra2></host>` +
-			`</service>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &Service{Port: &Port{Number: "80"}, Extra2: "example"},
-		ExpectXML: `<service>` +
-			`<host><port>80</port></host>` +
-			`<host><extra2>example</extra2></host>` +
-			`</service>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &struct {
-			XMLName struct{} `xml:"space top"`
-			A       string   `xml:"x>a"`
-			B       string   `xml:"x>b"`
-			C       string   `xml:"space x>c"`
-			C1      string   `xml:"space1 x>c"`
-			D1      string   `xml:"space1 x>d"`
-			E1      string   `xml:"x>e"`
-		}{
-			A:  "a",
-			B:  "b",
-			C:  "c",
-			C1: "c1",
-			D1: "d1",
-			E1: "e1",
-		},
-		ExpectXML: `<top xmlns="space">` +
-			`<x><a>a</a><b>b</b><c>c</c></x>` +
-			`<x xmlns="space1">` +
-			`<c>c1</c>` +
-			`<d>d1</d>` +
-			`</x>` +
-			`<x>` +
-			`<e>e1</e>` +
-			`</x>` +
-			`</top>`,
-	},
-	{
-		Value: &struct {
-			XMLName Name
-			A       string `xml:"x>a"`
-			B       string `xml:"x>b"`
-			C       string `xml:"space x>c"`
-			C1      string `xml:"space1 x>c"`
-			D1      string `xml:"space1 x>d"`
-		}{
-			XMLName: Name{
-				Space: "space0",
-				Local: "top",
-			},
-			A:  "a",
-			B:  "b",
-			C:  "c",
-			C1: "c1",
-			D1: "d1",
-		},
-		ExpectXML: `<top xmlns="space0">` +
-			`<x><a>a</a><b>b</b></x>` +
-			`<x xmlns="space"><c>c</c></x>` +
-			`<x xmlns="space1">` +
-			`<c>c1</c>` +
-			`<d>d1</d>` +
-			`</x>` +
-			`</top>`,
-	},
-	{
-		Value: &struct {
-			XMLName struct{} `xml:"top"`
-			B       string   `xml:"space x>b"`
-			B1      string   `xml:"space1 x>b"`
-		}{
-			B:  "b",
-			B1: "b1",
-		},
-		ExpectXML: `<top>` +
-			`<x xmlns="space"><b>b</b></x>` +
-			`<x xmlns="space1"><b>b1</b></x>` +
-			`</top>`,
-	},
-
-	// Test struct embedding
-	{
-		Value: &EmbedA{
-			EmbedC: EmbedC{
-				FieldA1: "", // Shadowed by A.A
-				FieldA2: "", // Shadowed by A.A
-				FieldB:  "A.C.B",
-				FieldC:  "A.C.C",
-			},
-			EmbedB: EmbedB{
-				FieldB: "A.B.B",
-				EmbedC: &EmbedC{
-					FieldA1: "A.B.C.A1",
-					FieldA2: "A.B.C.A2",
-					FieldB:  "", // Shadowed by A.B.B
-					FieldC:  "A.B.C.C",
-				},
-			},
-			FieldA: "A.A",
-		},
-		ExpectXML: `<EmbedA>` +
-			`<FieldB>A.C.B</FieldB>` +
-			`<FieldC>A.C.C</FieldC>` +
-			`<EmbedB>` +
-			`<FieldB>A.B.B</FieldB>` +
-			`<FieldA>` +
-			`<A1>A.B.C.A1</A1>` +
-			`<A2>A.B.C.A2</A2>` +
-			`</FieldA>` +
-			`<FieldC>A.B.C.C</FieldC>` +
-			`</EmbedB>` +
-			`<FieldA>A.A</FieldA>` +
-			`</EmbedA>`,
-	},
-
-	// Test that name casing matters
-	{
-		Value:     &NameCasing{Xy: "mixed", XY: "upper", XyA: "mixedA", XYA: "upperA"},
-		ExpectXML: `<casing Xy="mixedA" XY="upperA"><Xy>mixed</Xy><XY>upper</XY></casing>`,
-	},
-
-	// Test the order in which the XML element name is chosen
-	{
-		Value: &NamePrecedence{
-			FromTag:     XMLNameWithoutTag{Value: "A"},
-			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "InXMLName"}, Value: "B"},
-			FromNameTag: XMLNameWithTag{Value: "C"},
-			InFieldName: "D",
-		},
-		ExpectXML: `<Parent>` +
-			`<InTag>A</InTag>` +
-			`<InXMLName>B</InXMLName>` +
-			`<InXMLNameTag>C</InXMLNameTag>` +
-			`<InFieldName>D</InFieldName>` +
-			`</Parent>`,
-		MarshalOnly: true,
-	},
-	{
-		Value: &NamePrecedence{
-			XMLName:     Name{Local: "Parent"},
-			FromTag:     XMLNameWithoutTag{XMLName: Name{Local: "InTag"}, Value: "A"},
-			FromNameVal: XMLNameWithoutTag{XMLName: Name{Local: "FromNameVal"}, Value: "B"},
-			FromNameTag: XMLNameWithTag{XMLName: Name{Local: "InXMLNameTag"}, Value: "C"},
-			InFieldName: "D",
-		},
-		ExpectXML: `<Parent>` +
-			`<InTag>A</InTag>` +
-			`<FromNameVal>B</FromNameVal>` +
-			`<InXMLNameTag>C</InXMLNameTag>` +
-			`<InFieldName>D</InFieldName>` +
-			`</Parent>`,
-		UnmarshalOnly: true,
-	},
-
-	// xml.Name works in a plain field as well.
-	{
-		Value:     &NameInField{Name{Space: "ns", Local: "foo"}},
-		ExpectXML: `<NameInField><foo xmlns="ns"></foo></NameInField>`,
-	},
-	{
-		Value:         &NameInField{Name{Space: "ns", Local: "foo"}},
-		ExpectXML:     `<NameInField><foo xmlns="ns"><ignore></ignore></foo></NameInField>`,
-		UnmarshalOnly: true,
-	},
-
-	// Marshaling zero xml.Name uses the tag or field name.
-	{
-		Value:       &NameInField{},
-		ExpectXML:   `<NameInField><foo xmlns="ns"></foo></NameInField>`,
-		MarshalOnly: true,
-	},
-
-	// Test attributes
-	{
-		Value: &AttrTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-		},
-		ExpectXML: `<AttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
-			` Bool="true" Str="str" Bytes="byt"></AttrTest>`,
-	},
-	{
-		Value: &AttrTest{Bytes: []byte{}},
-		ExpectXML: `<AttrTest Int="0" int="0" Float="0" Uint8="0"` +
-			` Bool="false" Str="" Bytes=""></AttrTest>`,
-	},
-	{
-		Value: &OmitAttrTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-		},
-		ExpectXML: `<OmitAttrTest Int="8" int="9" Float="23.5" Uint8="255"` +
-			` Bool="true" Str="str" Bytes="byt"></OmitAttrTest>`,
-	},
-	{
-		Value:     &OmitAttrTest{},
-		ExpectXML: `<OmitAttrTest></OmitAttrTest>`,
-	},
-
-	// pointer fields
-	{
-		Value:       &PointerFieldsTest{Name: &nameAttr, Age: &ageAttr, Contents: &contentsAttr},
-		ExpectXML:   `<dummy name="Sarah" age="12">lorem ipsum</dummy>`,
-		MarshalOnly: true,
-	},
-
-	// empty chardata pointer field
-	{
-		Value:       &ChardataEmptyTest{},
-		ExpectXML:   `<test></test>`,
-		MarshalOnly: true,
-	},
-
-	// omitempty on fields
-	{
-		Value: &OmitFieldTest{
-			Int:   8,
-			Named: 9,
-			Float: 23.5,
-			Uint8: 255,
-			Bool:  true,
-			Str:   "str",
-			Bytes: []byte("byt"),
-			Ptr:   &PresenceTest{},
-		},
-		ExpectXML: `<OmitFieldTest>` +
-			`<Int>8</Int>` +
-			`<int>9</int>` +
-			`<Float>23.5</Float>` +
-			`<Uint8>255</Uint8>` +
-			`<Bool>true</Bool>` +
-			`<Str>str</Str>` +
-			`<Bytes>byt</Bytes>` +
-			`<Ptr></Ptr>` +
-			`</OmitFieldTest>`,
-	},
-	{
-		Value:     &OmitFieldTest{},
-		ExpectXML: `<OmitFieldTest></OmitFieldTest>`,
-	},
-
-	// Test ",any"
-	{
-		ExpectXML: `<a><nested><value>known</value></nested><other><sub>unknown</sub></other></a>`,
-		Value: &AnyTest{
-			Nested: "known",
-			AnyField: AnyHolder{
-				XMLName: Name{Local: "other"},
-				XML:     "<sub>unknown</sub>",
-			},
-		},
-	},
-	{
-		Value: &AnyTest{Nested: "known",
-			AnyField: AnyHolder{
-				XML:     "<unknown/>",
-				XMLName: Name{Local: "AnyField"},
-			},
-		},
-		ExpectXML: `<a><nested><value>known</value></nested><AnyField><unknown/></AnyField></a>`,
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested></a>`,
-		Value: &AnyOmitTest{
-			Nested: "b",
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested><c><d>e</d></c><g xmlns="f"><h>i</h></g></a>`,
-		Value: &AnySliceTest{
-			Nested: "b",
-			AnyField: []AnyHolder{
-				{
-					XMLName: Name{Local: "c"},
-					XML:     "<d>e</d>",
-				},
-				{
-					XMLName: Name{Space: "f", Local: "g"},
-					XML:     "<h>i</h>",
-				},
-			},
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>b</value></nested></a>`,
-		Value: &AnySliceTest{
-			Nested: "b",
-		},
-	},
-
-	// Test recursive types.
-	{
-		Value: &RecurseA{
-			A: "a1",
-			B: &RecurseB{
-				A: &RecurseA{"a2", nil},
-				B: "b1",
-			},
-		},
-		ExpectXML: `<RecurseA><A>a1</A><B><A><A>a2</A></A><B>b1</B></B></RecurseA>`,
-	},
-
-	// Test ignoring fields via "-" tag
-	{
-		ExpectXML: `<IgnoreTest></IgnoreTest>`,
-		Value:     &IgnoreTest{},
-	},
-	{
-		ExpectXML:   `<IgnoreTest></IgnoreTest>`,
-		Value:       &IgnoreTest{PublicSecret: "can't tell"},
-		MarshalOnly: true,
-	},
-	{
-		ExpectXML:     `<IgnoreTest><PublicSecret>ignore me</PublicSecret></IgnoreTest>`,
-		Value:         &IgnoreTest{},
-		UnmarshalOnly: true,
-	},
-
-	// Test escaping.
-	{
-		ExpectXML: `<a><nested><value>dquote: &#34;; squote: &#39;; ampersand: &amp;; less: &lt;; greater: &gt;;</value></nested><empty></empty></a>`,
-		Value: &AnyTest{
-			Nested:   `dquote: "; squote: '; ampersand: &; less: <; greater: >;`,
-			AnyField: AnyHolder{XMLName: Name{Local: "empty"}},
-		},
-	},
-	{
-		ExpectXML: `<a><nested><value>newline: &#xA;; cr: &#xD;; tab: &#x9;;</value></nested><AnyField></AnyField></a>`,
-		Value: &AnyTest{
-			Nested:   "newline: \n; cr: \r; tab: \t;",
-			AnyField: AnyHolder{XMLName: Name{Local: "AnyField"}},
-		},
-	},
-	{
-		ExpectXML: "<a><nested><value>1\r2\r\n3\n\r4\n5</value></nested></a>",
-		Value: &AnyTest{
-			Nested: "1\n2\n3\n\n4\n5",
-		},
-		UnmarshalOnly: true,
-	},
-	{
-		ExpectXML: `<EmbedInt><MyInt>42</MyInt></EmbedInt>`,
-		Value: &EmbedInt{
-			MyInt: 42,
-		},
-	},
-	// Test omitempty with parent chain; see golang.org/issue/4168.
-	{
-		ExpectXML: `<Strings><A></A></Strings>`,
-		Value:     &Strings{},
-	},
-	// Custom marshalers.
-	{
-		ExpectXML: `<MyMarshalerTest>hello world</MyMarshalerTest>`,
-		Value:     &MyMarshalerTest{},
-	},
-	{
-		ExpectXML: `<MarshalerStruct Foo="hello world"></MarshalerStruct>`,
-		Value:     &MarshalerStruct{},
-	},
-	{
-		ExpectXML: `<MarshalerValueStruct Foo="hello world"></MarshalerValueStruct>`,
-		Value:     &MarshalerValueStruct{},
-	},
-	{
-		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
-		Value:     &OuterStruct{IntAttr: 10},
-	},
-	{
-		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
-		Value:     &OuterNamedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
-	},
-	{
-		ExpectXML: `<test xmlns="outerns" int="10"></test>`,
-		Value:     &OuterNamedOrderedStruct{XMLName: Name{Space: "outerns", Local: "test"}, IntAttr: 10},
-	},
-	{
-		ExpectXML: `<outer xmlns="testns" int="10"></outer>`,
-		Value:     &OuterOuterStruct{OuterStruct{IntAttr: 10}},
-	},
-	{
-		ExpectXML: `<NestedAndChardata><A><B></B><B></B></A>test</NestedAndChardata>`,
-		Value:     &NestedAndChardata{AB: make([]string, 2), Chardata: "test"},
-	},
-	{
-		ExpectXML: `<NestedAndComment><A><B></B><B></B></A><!--test--></NestedAndComment>`,
-		Value:     &NestedAndComment{AB: make([]string, 2), Comment: "test"},
-	},
-	{
-		ExpectXML: `<XMLNSFieldStruct xmlns="http://example.com/ns"><Body>hello world</Body></XMLNSFieldStruct>`,
-		Value:     &XMLNSFieldStruct{Ns: "http://example.com/ns", Body: "hello world"},
-	},
-	{
-		ExpectXML: `<testns:test xmlns:testns="testns" xmlns="http://example.com/ns"><Body>hello world</Body></testns:test>`,
-		Value:     &NamedXMLNSFieldStruct{Ns: "http://example.com/ns", Body: "hello world"},
-	},
-	{
-		ExpectXML: `<testns:test xmlns:testns="testns"><Body>hello world</Body></testns:test>`,
-		Value:     &NamedXMLNSFieldStruct{Ns: "", Body: "hello world"},
-	},
-	{
-		ExpectXML: `<XMLNSFieldStructWithOmitEmpty><Body>hello world</Body></XMLNSFieldStructWithOmitEmpty>`,
-		Value:     &XMLNSFieldStructWithOmitEmpty{Body: "hello world"},
-	},
-	{
-		// The xmlns attribute must be ignored because the <test>
-		// element is in the empty namespace, so it's not possible
-		// to set the default namespace to something non-empty.
-		ExpectXML:   `<test><Body>hello world</Body></test>`,
-		Value:       &NamedXMLNSFieldStructWithEmptyNamespace{Ns: "foo", Body: "hello world"},
-		MarshalOnly: true,
-	},
-	{
-		ExpectXML: `<RecursiveXMLNSFieldStruct xmlns="foo"><Body xmlns=""><Text>hello world</Text></Body></RecursiveXMLNSFieldStruct>`,
-		Value: &RecursiveXMLNSFieldStruct{
-			Ns: "foo",
-			Body: &RecursiveXMLNSFieldStruct{
-				Text: "hello world",
-			},
-		},
-	},
-}
-
-func TestMarshal(t *testing.T) {
-	for idx, test := range marshalTests {
-		if test.UnmarshalOnly {
-			continue
-		}
-		data, err := Marshal(test.Value)
-		if err != nil {
-			t.Errorf("#%d: marshal(%#v): %s", idx, test.Value, err)
-			continue
-		}
-		if got, want := string(data), test.ExpectXML; got != want {
-			if strings.Contains(want, "\n") {
-				t.Errorf("#%d: marshal(%#v):\nHAVE:\n%s\nWANT:\n%s", idx, test.Value, got, want)
-			} else {
-				t.Errorf("#%d: marshal(%#v):\nhave %#q\nwant %#q", idx, test.Value, got, want)
-			}
-		}
-	}
-}
-
-type AttrParent struct {
-	X string `xml:"X>Y,attr"`
-}
-
-type BadAttr struct {
-	Name []string `xml:"name,attr"`
-}
-
-var marshalErrorTests = []struct {
-	Value interface{}
-	Err   string
-	Kind  reflect.Kind
-}{
-	{
-		Value: make(chan bool),
-		Err:   "xml: unsupported type: chan bool",
-		Kind:  reflect.Chan,
-	},
-	{
-		Value: map[string]string{
-			"question": "What do you get when you multiply six by nine?",
-			"answer":   "42",
-		},
-		Err:  "xml: unsupported type: map[string]string",
-		Kind: reflect.Map,
-	},
-	{
-		Value: map[*Ship]bool{nil: false},
-		Err:   "xml: unsupported type: map[*xml.Ship]bool",
-		Kind:  reflect.Map,
-	},
-	{
-		Value: &Domain{Comment: []byte("f--bar")},
-		Err:   `xml: comments must not contain "--"`,
-	},
-	// Reject parent chain with attr, never worked; see golang.org/issue/5033.
-	{
-		Value: &AttrParent{},
-		Err:   `xml: X>Y chain not valid with attr flag`,
-	},
-	{
-		Value: BadAttr{[]string{"X", "Y"}},
-		Err:   `xml: unsupported type: []string`,
-	},
-}
-
-var marshalIndentTests = []struct {
-	Value     interface{}
-	Prefix    string
-	Indent    string
-	ExpectXML string
-}{
-	{
-		Value: &SecretAgent{
-			Handle:    "007",
-			Identity:  "James Bond",
-			Obfuscate: "<redacted/>",
-		},
-		Prefix:    "",
-		Indent:    "\t",
-		ExpectXML: fmt.Sprintf("<agent handle=\"007\">\n\t<Identity>James Bond</Identity><redacted/>\n</agent>"),
-	},
-}
-
-func TestMarshalErrors(t *testing.T) {
-	for idx, test := range marshalErrorTests {
-		data, err := Marshal(test.Value)
-		if err == nil {
-			t.Errorf("#%d: marshal(%#v) = [success] %q, want error %v", idx, test.Value, data, test.Err)
-			continue
-		}
-		if err.Error() != test.Err {
-			t.Errorf("#%d: marshal(%#v) = [error] %v, want %v", idx, test.Value, err, test.Err)
-		}
-		if test.Kind != reflect.Invalid {
-			if kind := err.(*UnsupportedTypeError).Type.Kind(); kind != test.Kind {
-				t.Errorf("#%d: marshal(%#v) = [error kind] %s, want %s", idx, test.Value, kind, test.Kind)
-			}
-		}
-	}
-}
-
-// Do invertibility testing on the various structures that we test
-func TestUnmarshal(t *testing.T) {
-	for i, test := range marshalTests {
-		if test.MarshalOnly {
-			continue
-		}
-		if _, ok := test.Value.(*Plain); ok {
-			continue
-		}
-		vt := reflect.TypeOf(test.Value)
-		dest := reflect.New(vt.Elem()).Interface()
-		err := Unmarshal([]byte(test.ExpectXML), dest)
-
-		switch fix := dest.(type) {
-		case *Feed:
-			fix.Author.InnerXML = ""
-			for i := range fix.Entry {
-				fix.Entry[i].Author.InnerXML = ""
-			}
-		}
-
-		if err != nil {
-			t.Errorf("#%d: unexpected error: %#v", i, err)
-		} else if got, want := dest, test.Value; !reflect.DeepEqual(got, want) {
-			t.Errorf("#%d: unmarshal(%q):\nhave %#v\nwant %#v", i, test.ExpectXML, got, want)
-		}
-	}
-}
-
-func TestMarshalIndent(t *testing.T) {
-	for i, test := range marshalIndentTests {
-		data, err := MarshalIndent(test.Value, test.Prefix, test.Indent)
-		if err != nil {
-			t.Errorf("#%d: Error: %s", i, err)
-			continue
-		}
-		if got, want := string(data), test.ExpectXML; got != want {
-			t.Errorf("#%d: MarshalIndent:\nGot:%s\nWant:\n%s", i, got, want)
-		}
-	}
-}
-
-type limitedBytesWriter struct {
-	w      io.Writer
-	remain int // until writes fail
-}
-
-func (lw *limitedBytesWriter) Write(p []byte) (n int, err error) {
-	if lw.remain <= 0 {
-		println("error")
-		return 0, errors.New("write limit hit")
-	}
-	if len(p) > lw.remain {
-		p = p[:lw.remain]
-		n, _ = lw.w.Write(p)
-		lw.remain = 0
-		return n, errors.New("write limit hit")
-	}
-	n, err = lw.w.Write(p)
-	lw.remain -= n
-	return n, err
-}
-
-func TestMarshalWriteErrors(t *testing.T) {
-	var buf bytes.Buffer
-	const writeCap = 1024
-	w := &limitedBytesWriter{&buf, writeCap}
-	enc := NewEncoder(w)
-	var err error
-	var i int
-	const n = 4000
-	for i = 1; i <= n; i++ {
-		err = enc.Encode(&Passenger{
-			Name:   []string{"Alice", "Bob"},
-			Weight: 5,
-		})
-		if err != nil {
-			break
-		}
-	}
-	if err == nil {
-		t.Error("expected an error")
-	}
-	if i == n {
-		t.Errorf("expected to fail before the end")
-	}
-	if buf.Len() != writeCap {
-		t.Errorf("buf.Len() = %d; want %d", buf.Len(), writeCap)
-	}
-}
-
-func TestMarshalWriteIOErrors(t *testing.T) {
-	enc := NewEncoder(errWriter{})
-
-	expectErr := "unwritable"
-	err := enc.Encode(&Passenger{})
-	if err == nil || err.Error() != expectErr {
-		t.Errorf("EscapeTest = [error] %v, want %v", err, expectErr)
-	}
-}
-
-func TestMarshalFlush(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	if err := enc.EncodeToken(CharData("hello world")); err != nil {
-		t.Fatalf("enc.EncodeToken: %v", err)
-	}
-	if buf.Len() > 0 {
-		t.Fatalf("enc.EncodeToken caused actual write: %q", buf.Bytes())
-	}
-	if err := enc.Flush(); err != nil {
-		t.Fatalf("enc.Flush: %v", err)
-	}
-	if buf.String() != "hello world" {
-		t.Fatalf("after enc.Flush, buf.String() = %q, want %q", buf.String(), "hello world")
-	}
-}
-
-var encodeElementTests = []struct {
-	desc      string
-	value     interface{}
-	start     StartElement
-	expectXML string
-}{{
-	desc:  "simple string",
-	value: "hello",
-	start: StartElement{
-		Name: Name{Local: "a"},
-	},
-	expectXML: `<a>hello</a>`,
-}, {
-	desc:  "string with added attributes",
-	value: "hello",
-	start: StartElement{
-		Name: Name{Local: "a"},
-		Attr: []Attr{{
-			Name:  Name{Local: "x"},
-			Value: "y",
-		}, {
-			Name:  Name{Local: "foo"},
-			Value: "bar",
-		}},
-	},
-	expectXML: `<a x="y" foo="bar">hello</a>`,
-}, {
-	desc: "start element with default name space",
-	value: struct {
-		Foo XMLNameWithNSTag
-	}{
-		Foo: XMLNameWithNSTag{
-			Value: "hello",
-		},
-	},
-	start: StartElement{
-		Name: Name{Space: "ns", Local: "a"},
-		Attr: []Attr{{
-			Name: Name{Local: "xmlns"},
-			// "ns" is the name space defined in XMLNameWithNSTag
-			Value: "ns",
-		}},
-	},
-	expectXML: `<a xmlns="ns"><InXMLNameWithNSTag>hello</InXMLNameWithNSTag></a>`,
-}, {
-	desc: "start element in name space with different default name space",
-	value: struct {
-		Foo XMLNameWithNSTag
-	}{
-		Foo: XMLNameWithNSTag{
-			Value: "hello",
-		},
-	},
-	start: StartElement{
-		Name: Name{Space: "ns2", Local: "a"},
-		Attr: []Attr{{
-			Name: Name{Local: "xmlns"},
-			// "ns" is the name space defined in XMLNameWithNSTag
-			Value: "ns",
-		}},
-	},
-	expectXML: `<ns2:a xmlns:ns2="ns2" xmlns="ns"><InXMLNameWithNSTag>hello</InXMLNameWithNSTag></ns2:a>`,
-}, {
-	desc:  "XMLMarshaler with start element with default name space",
-	value: &MyMarshalerTest{},
-	start: StartElement{
-		Name: Name{Space: "ns2", Local: "a"},
-		Attr: []Attr{{
-			Name: Name{Local: "xmlns"},
-			// "ns" is the name space defined in XMLNameWithNSTag
-			Value: "ns",
-		}},
-	},
-	expectXML: `<ns2:a xmlns:ns2="ns2" xmlns="ns">hello world</ns2:a>`,
-}}
-
-func TestEncodeElement(t *testing.T) {
-	for idx, test := range encodeElementTests {
-		var buf bytes.Buffer
-		enc := NewEncoder(&buf)
-		err := enc.EncodeElement(test.value, test.start)
-		if err != nil {
-			t.Fatalf("enc.EncodeElement: %v", err)
-		}
-		err = enc.Flush()
-		if err != nil {
-			t.Fatalf("enc.Flush: %v", err)
-		}
-		if got, want := buf.String(), test.expectXML; got != want {
-			t.Errorf("#%d(%s): EncodeElement(%#v, %#v):\nhave %#q\nwant %#q", idx, test.desc, test.value, test.start, got, want)
-		}
-	}
-}
-
-func BenchmarkMarshal(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		Marshal(atomValue)
-	}
-}
-
-func BenchmarkUnmarshal(b *testing.B) {
-	b.ReportAllocs()
-	xml := []byte(atomXml)
-	for i := 0; i < b.N; i++ {
-		Unmarshal(xml, &Feed{})
-	}
-}
-
-// golang.org/issue/6556
-func TestStructPointerMarshal(t *testing.T) {
-	type A struct {
-		XMLName string `xml:"a"`
-		B       []interface{}
-	}
-	type C struct {
-		XMLName Name
-		Value   string `xml:"value"`
-	}
-
-	a := new(A)
-	a.B = append(a.B, &C{
-		XMLName: Name{Local: "c"},
-		Value:   "x",
-	})
-
-	b, err := Marshal(a)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if x := string(b); x != "<a><c><value>x</value></c></a>" {
-		t.Fatal(x)
-	}
-	var v A
-	err = Unmarshal(b, &v)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-var encodeTokenTests = []struct {
-	desc string
-	toks []Token
-	want string
-	err  string
-}{{
-	desc: "start element with name space",
-	toks: []Token{
-		StartElement{Name{"space", "local"}, nil},
-	},
-	want: `<space:local xmlns:space="space">`,
-}, {
-	desc: "start element with no name",
-	toks: []Token{
-		StartElement{Name{"space", ""}, nil},
-	},
-	err: "xml: start tag with no name",
-}, {
-	desc: "end element with no name",
-	toks: []Token{
-		EndElement{Name{"space", ""}},
-	},
-	err: "xml: end tag with no name",
-}, {
-	desc: "char data",
-	toks: []Token{
-		CharData("foo"),
-	},
-	want: `foo`,
-}, {
-	desc: "char data with escaped chars",
-	toks: []Token{
-		CharData(" \t\n"),
-	},
-	want: " &#x9;\n",
-}, {
-	desc: "comment",
-	toks: []Token{
-		Comment("foo"),
-	},
-	want: `<!--foo-->`,
-}, {
-	desc: "comment with invalid content",
-	toks: []Token{
-		Comment("foo-->"),
-	},
-	err: "xml: EncodeToken of Comment containing --> marker",
-}, {
-	desc: "proc instruction",
-	toks: []Token{
-		ProcInst{"Target", []byte("Instruction")},
-	},
-	want: `<?Target Instruction?>`,
-}, {
-	desc: "proc instruction with empty target",
-	toks: []Token{
-		ProcInst{"", []byte("Instruction")},
-	},
-	err: "xml: EncodeToken of ProcInst with invalid Target",
-}, {
-	desc: "proc instruction with bad content",
-	toks: []Token{
-		ProcInst{"", []byte("Instruction?>")},
-	},
-	err: "xml: EncodeToken of ProcInst with invalid Target",
-}, {
-	desc: "directive",
-	toks: []Token{
-		Directive("foo"),
-	},
-	want: `<!foo>`,
-}, {
-	desc: "more complex directive",
-	toks: []Token{
-		Directive("DOCTYPE doc [ <!ELEMENT doc '>'> <!-- com>ment --> ]"),
-	},
-	want: `<!DOCTYPE doc [ <!ELEMENT doc '>'> <!-- com>ment --> ]>`,
-}, {
-	desc: "directive instruction with bad name",
-	toks: []Token{
-		Directive("foo>"),
-	},
-	err: "xml: EncodeToken of Directive containing wrong < or > markers",
-}, {
-	desc: "end tag without start tag",
-	toks: []Token{
-		EndElement{Name{"foo", "bar"}},
-	},
-	err: "xml: end tag </bar> without start tag",
-}, {
-	desc: "mismatching end tag local name",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, nil},
-		EndElement{Name{"", "bar"}},
-	},
-	err:  "xml: end tag </bar> does not match start tag <foo>",
-	want: `<foo>`,
-}, {
-	desc: "mismatching end tag namespace",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, nil},
-		EndElement{Name{"another", "foo"}},
-	},
-	err:  "xml: end tag </foo> in namespace another does not match start tag <foo> in namespace space",
-	want: `<space:foo xmlns:space="space">`,
-}, {
-	desc: "start element with explicit namespace",
-	toks: []Token{
-		StartElement{Name{"space", "local"}, []Attr{
-			{Name{"xmlns", "x"}, "space"},
-			{Name{"space", "foo"}, "value"},
-		}},
-	},
-	want: `<x:local xmlns:x="space" x:foo="value">`,
-}, {
-	desc: "start element with explicit namespace and colliding prefix",
-	toks: []Token{
-		StartElement{Name{"space", "local"}, []Attr{
-			{Name{"xmlns", "x"}, "space"},
-			{Name{"space", "foo"}, "value"},
-			{Name{"x", "bar"}, "other"},
-		}},
-	},
-	want: `<x:local xmlns:x_1="x" xmlns:x="space" x:foo="value" x_1:bar="other">`,
-}, {
-	desc: "start element using previously defined namespace",
-	toks: []Token{
-		StartElement{Name{"", "local"}, []Attr{
-			{Name{"xmlns", "x"}, "space"},
-		}},
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"space", "x"}, "y"},
-		}},
-	},
-	want: `<local xmlns:x="space"><x:foo x:x="y">`,
-}, {
-	desc: "nested name space with same prefix",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"xmlns", "x"}, "space1"},
-		}},
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"xmlns", "x"}, "space2"},
-		}},
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"space1", "a"}, "space1 value"},
-			{Name{"space2", "b"}, "space2 value"},
-		}},
-		EndElement{Name{"", "foo"}},
-		EndElement{Name{"", "foo"}},
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"space1", "a"}, "space1 value"},
-			{Name{"space2", "b"}, "space2 value"},
-		}},
-	},
-	want: `<foo xmlns:x="space1"><foo xmlns:x="space2"><foo xmlns:space1="space1" space1:a="space1 value" x:b="space2 value"></foo></foo><foo xmlns:space2="space2" x:a="space1 value" space2:b="space2 value">`,
-}, {
-	desc: "start element defining several prefixes for the same name space",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"xmlns", "a"}, "space"},
-			{Name{"xmlns", "b"}, "space"},
-			{Name{"space", "x"}, "value"},
-		}},
-	},
-	want: `<a:foo xmlns:a="space" a:x="value">`,
-}, {
-	desc: "nested element redefines name space",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"xmlns", "x"}, "space"},
-		}},
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"xmlns", "y"}, "space"},
-			{Name{"space", "a"}, "value"},
-		}},
-	},
-	want: `<foo xmlns:x="space"><x:foo x:a="value">`,
-}, {
-	desc: "nested element creates alias for default name space",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-		}},
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"xmlns", "y"}, "space"},
-			{Name{"space", "a"}, "value"},
-		}},
-	},
-	want: `<foo xmlns="space"><foo xmlns:y="space" y:a="value">`,
-}, {
-	desc: "nested element defines default name space with existing prefix",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"xmlns", "x"}, "space"},
-		}},
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-			{Name{"space", "a"}, "value"},
-		}},
-	},
-	want: `<foo xmlns:x="space"><foo xmlns="space" x:a="value">`,
-}, {
-	desc: "nested element uses empty attribute name space when default ns defined",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-		}},
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "attr"}, "value"},
-		}},
-	},
-	want: `<foo xmlns="space"><foo attr="value">`,
-}, {
-	desc: "redefine xmlns",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"foo", "xmlns"}, "space"},
-		}},
-	},
-	err: `xml: cannot redefine xmlns attribute prefix`,
-}, {
-	desc: "xmlns with explicit name space #1",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"xml", "xmlns"}, "space"},
-		}},
-	},
-	want: `<foo xmlns="space">`,
-}, {
-	desc: "xmlns with explicit name space #2",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{xmlURL, "xmlns"}, "space"},
-		}},
-	},
-	want: `<foo xmlns="space">`,
-}, {
-	desc: "empty name space declaration is ignored",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"xmlns", "foo"}, ""},
-		}},
-	},
-	want: `<foo>`,
-}, {
-	desc: "attribute with no name is ignored",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"", ""}, "value"},
-		}},
-	},
-	want: `<foo>`,
-}, {
-	desc: "namespace URL with non-valid name",
-	toks: []Token{
-		StartElement{Name{"/34", "foo"}, []Attr{
-			{Name{"/34", "x"}, "value"},
-		}},
-	},
-	want: `<_:foo xmlns:_="/34" _:x="value">`,
-}, {
-	desc: "nested element resets default namespace to empty",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-		}},
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"", "xmlns"}, ""},
-			{Name{"", "x"}, "value"},
-			{Name{"space", "x"}, "value"},
-		}},
-	},
-	want: `<foo xmlns="space"><foo xmlns:space="space" xmlns="" x="value" space:x="value">`,
-}, {
-	desc: "nested element requires empty default name space",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-		}},
-		StartElement{Name{"", "foo"}, nil},
-	},
-	want: `<foo xmlns="space"><foo xmlns="">`,
-}, {
-	desc: "attribute uses name space from xmlns",
-	toks: []Token{
-		StartElement{Name{"some/space", "foo"}, []Attr{
-			{Name{"", "attr"}, "value"},
-			{Name{"some/space", "other"}, "other value"},
-		}},
-	},
-	want: `<space:foo xmlns:space="some/space" attr="value" space:other="other value">`,
-}, {
-	desc: "default name space should not be used by attributes",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-			{Name{"xmlns", "bar"}, "space"},
-			{Name{"space", "baz"}, "foo"},
-		}},
-		StartElement{Name{"space", "baz"}, nil},
-		EndElement{Name{"space", "baz"}},
-		EndElement{Name{"space", "foo"}},
-	},
-	want: `<foo xmlns:bar="space" xmlns="space" bar:baz="foo"><baz></baz></foo>`,
-}, {
-	desc: "default name space not used by attributes, not explicitly defined",
-	toks: []Token{
-		StartElement{Name{"space", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-			{Name{"space", "baz"}, "foo"},
-		}},
-		StartElement{Name{"space", "baz"}, nil},
-		EndElement{Name{"space", "baz"}},
-		EndElement{Name{"space", "foo"}},
-	},
-	want: `<foo xmlns:space="space" xmlns="space" space:baz="foo"><baz></baz></foo>`,
-}, {
-	desc: "impossible xmlns declaration",
-	toks: []Token{
-		StartElement{Name{"", "foo"}, []Attr{
-			{Name{"", "xmlns"}, "space"},
-		}},
-		StartElement{Name{"space", "bar"}, []Attr{
-			{Name{"space", "attr"}, "value"},
-		}},
-	},
-	want: `<foo><space:bar xmlns:space="space" space:attr="value">`,
-}}
-
-func TestEncodeToken(t *testing.T) {
-loop:
-	for i, tt := range encodeTokenTests {
-		var buf bytes.Buffer
-		enc := NewEncoder(&buf)
-		var err error
-		for j, tok := range tt.toks {
-			err = enc.EncodeToken(tok)
-			if err != nil && j < len(tt.toks)-1 {
-				t.Errorf("#%d %s token #%d: %v", i, tt.desc, j, err)
-				continue loop
-			}
-		}
-		errorf := func(f string, a ...interface{}) {
-			t.Errorf("#%d %s token #%d:%s", i, tt.desc, len(tt.toks)-1, fmt.Sprintf(f, a...))
-		}
-		switch {
-		case tt.err != "" && err == nil:
-			errorf(" expected error; got none")
-			continue
-		case tt.err == "" && err != nil:
-			errorf(" got error: %v", err)
-			continue
-		case tt.err != "" && err != nil && tt.err != err.Error():
-			errorf(" error mismatch; got %v, want %v", err, tt.err)
-			continue
-		}
-		if err := enc.Flush(); err != nil {
-			errorf(" %v", err)
-			continue
-		}
-		if got := buf.String(); got != tt.want {
-			errorf("\ngot  %v\nwant %v", got, tt.want)
-			continue
-		}
-	}
-}
-
-func TestProcInstEncodeToken(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-
-	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err != nil {
-		t.Fatalf("enc.EncodeToken: expected to be able to encode xml target ProcInst as first token, %s", err)
-	}
-
-	if err := enc.EncodeToken(ProcInst{"Target", []byte("Instruction")}); err != nil {
-		t.Fatalf("enc.EncodeToken: expected to be able to add non-xml target ProcInst")
-	}
-
-	if err := enc.EncodeToken(ProcInst{"xml", []byte("Instruction")}); err == nil {
-		t.Fatalf("enc.EncodeToken: expected to not be allowed to encode xml target ProcInst when not first token")
-	}
-}
-
-func TestDecodeEncode(t *testing.T) {
-	var in, out bytes.Buffer
-	in.WriteString(`<?xml version="1.0" encoding="UTF-8"?>
-<?Target Instruction?>
-<root>
-</root>	
-`)
-	dec := NewDecoder(&in)
-	enc := NewEncoder(&out)
-	for tok, err := dec.Token(); err == nil; tok, err = dec.Token() {
-		err = enc.EncodeToken(tok)
-		if err != nil {
-			t.Fatalf("enc.EncodeToken: Unable to encode token (%#v), %v", tok, err)
-		}
-	}
-}
-
-// Issue 9796. Used to fail with GORACE="halt_on_error=1" -race.
-func TestRace9796(t *testing.T) {
-	type A struct{}
-	type B struct {
-		C []A `xml:"X>Y"`
-	}
-	var wg sync.WaitGroup
-	for i := 0; i < 2; i++ {
-		wg.Add(1)
-		go func() {
-			Marshal(B{[]A{{}}})
-			wg.Done()
-		}()
-	}
-	wg.Wait()
-}
-
-func TestIsValidDirective(t *testing.T) {
-	testOK := []string{
-		"<>",
-		"< < > >",
-		"<!DOCTYPE '<' '>' '>' <!--nothing-->>",
-		"<!DOCTYPE doc [ <!ELEMENT doc ANY> <!ELEMENT doc ANY> ]>",
-		"<!DOCTYPE doc [ <!ELEMENT doc \"ANY> '<' <!E\" LEMENT '>' doc ANY> ]>",
-		"<!DOCTYPE doc <!-- just>>>> a < comment --> [ <!ITEM anything> ] >",
-	}
-	testKO := []string{
-		"<",
-		">",
-		"<!--",
-		"-->",
-		"< > > < < >",
-		"<!dummy <!-- > -->",
-		"<!DOCTYPE doc '>",
-		"<!DOCTYPE doc '>'",
-		"<!DOCTYPE doc <!--comment>",
-	}
-	for _, s := range testOK {
-		if !isValidDirective(Directive(s)) {
-			t.Errorf("Directive %q is expected to be valid", s)
-		}
-	}
-	for _, s := range testKO {
-		if isValidDirective(Directive(s)) {
-			t.Errorf("Directive %q is expected to be invalid", s)
-		}
-	}
-}
-
-// Issue 11719. EncodeToken used to silently eat tokens with an invalid type.
-func TestSimpleUseOfEncodeToken(t *testing.T) {
-	var buf bytes.Buffer
-	enc := NewEncoder(&buf)
-	if err := enc.EncodeToken(&StartElement{Name: Name{"", "object1"}}); err == nil {
-		t.Errorf("enc.EncodeToken: pointer type should be rejected")
-	}
-	if err := enc.EncodeToken(&EndElement{Name: Name{"", "object1"}}); err == nil {
-		t.Errorf("enc.EncodeToken: pointer type should be rejected")
-	}
-	if err := enc.EncodeToken(StartElement{Name: Name{"", "object2"}}); err != nil {
-		t.Errorf("enc.EncodeToken: StartElement %s", err)
-	}
-	if err := enc.EncodeToken(EndElement{Name: Name{"", "object2"}}); err != nil {
-		t.Errorf("enc.EncodeToken: EndElement %s", err)
-	}
-	if err := enc.EncodeToken(Universe{}); err == nil {
-		t.Errorf("enc.EncodeToken: invalid type not caught")
-	}
-	if err := enc.Flush(); err != nil {
-		t.Errorf("enc.Flush: %s", err)
-	}
-	if buf.Len() == 0 {
-		t.Errorf("enc.EncodeToken: empty buffer")
-	}
-	want := "<object2></object2>"
-	if buf.String() != want {
-		t.Errorf("enc.EncodeToken: expected %q; got %q", want, buf.String())
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/read.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/read.go
deleted file mode 100644
index 4089056a1f..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/read.go
+++ /dev/null
@@ -1,692 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"encoding"
-	"errors"
-	"fmt"
-	"reflect"
-	"strconv"
-	"strings"
-)
-
-// BUG(rsc): Mapping between XML elements and data structures is inherently flawed:
-// an XML element is an order-dependent collection of anonymous
-// values, while a data structure is an order-independent collection
-// of named values.
-// See package json for a textual representation more suitable
-// to data structures.
-
-// Unmarshal parses the XML-encoded data and stores the result in
-// the value pointed to by v, which must be an arbitrary struct,
-// slice, or string. Well-formed data that does not fit into v is
-// discarded.
-//
-// Because Unmarshal uses the reflect package, it can only assign
-// to exported (upper case) fields. Unmarshal uses a case-sensitive
-// comparison to match XML element names to tag values and struct
-// field names.
-//
-// Unmarshal maps an XML element to a struct using the following rules.
-// In the rules, the tag of a field refers to the value associated with the
-// key 'xml' in the struct field's tag (see the example above).
-//
-//   * If the struct has a field of type []byte or string with tag
-//      ",innerxml", Unmarshal accumulates the raw XML nested inside the
-//      element in that field. The rest of the rules still apply.
-//
-//   * If the struct has a field named XMLName of type xml.Name,
-//      Unmarshal records the element name in that field.
-//
-//   * If the XMLName field has an associated tag of the form
-//      "name" or "namespace-URL name", the XML element must have
-//      the given name (and, optionally, name space) or else Unmarshal
-//      returns an error.
-//
-//   * If the XML element has an attribute whose name matches a
-//      struct field name with an associated tag containing ",attr" or
-//      the explicit name in a struct field tag of the form "name,attr",
-//      Unmarshal records the attribute value in that field.
-//
-//   * If the XML element contains character data, that data is
-//      accumulated in the first struct field that has tag ",chardata".
-//      The struct field may have type []byte or string.
-//      If there is no such field, the character data is discarded.
-//
-//   * If the XML element contains comments, they are accumulated in
-//      the first struct field that has tag ",comment".  The struct
-//      field may have type []byte or string. If there is no such
-//      field, the comments are discarded.
-//
-//   * If the XML element contains a sub-element whose name matches
-//      the prefix of a tag formatted as "a" or "a>b>c", unmarshal
-//      will descend into the XML structure looking for elements with the
-//      given names, and will map the innermost elements to that struct
-//      field. A tag starting with ">" is equivalent to one starting
-//      with the field name followed by ">".
-//
-//   * If the XML element contains a sub-element whose name matches
-//      a struct field's XMLName tag and the struct field has no
-//      explicit name tag as per the previous rule, unmarshal maps
-//      the sub-element to that struct field.
-//
-//   * If the XML element contains a sub-element whose name matches a
-//      field without any mode flags (",attr", ",chardata", etc), Unmarshal
-//      maps the sub-element to that struct field.
-//
-//   * If the XML element contains a sub-element that hasn't matched any
-//      of the above rules and the struct has a field with tag ",any",
-//      unmarshal maps the sub-element to that struct field.
-//
-//   * An anonymous struct field is handled as if the fields of its
-//      value were part of the outer struct.
-//
-//   * A struct field with tag "-" is never unmarshalled into.
-//
-// Unmarshal maps an XML element to a string or []byte by saving the
-// concatenation of that element's character data in the string or
-// []byte. The saved []byte is never nil.
-//
-// Unmarshal maps an attribute value to a string or []byte by saving
-// the value in the string or slice.
-//
-// Unmarshal maps an XML element to a slice by extending the length of
-// the slice and mapping the element to the newly created value.
-//
-// Unmarshal maps an XML element or attribute value to a bool by
-// setting it to the boolean value represented by the string.
-//
-// Unmarshal maps an XML element or attribute value to an integer or
-// floating-point field by setting the field to the result of
-// interpreting the string value in decimal. There is no check for
-// overflow.
-//
-// Unmarshal maps an XML element to an xml.Name by recording the
-// element name.
-//
-// Unmarshal maps an XML element to a pointer by setting the pointer
-// to a freshly allocated value and then mapping the element to that value.
-//
-func Unmarshal(data []byte, v interface{}) error {
-	return NewDecoder(bytes.NewReader(data)).Decode(v)
-}
-
-// Decode works like xml.Unmarshal, except it reads the decoder
-// stream to find the start element.
-func (d *Decoder) Decode(v interface{}) error {
-	return d.DecodeElement(v, nil)
-}
-
-// DecodeElement works like xml.Unmarshal except that it takes
-// a pointer to the start XML element to decode into v.
-// It is useful when a client reads some raw XML tokens itself
-// but also wants to defer to Unmarshal for some elements.
-func (d *Decoder) DecodeElement(v interface{}, start *StartElement) error {
-	val := reflect.ValueOf(v)
-	if val.Kind() != reflect.Ptr {
-		return errors.New("non-pointer passed to Unmarshal")
-	}
-	return d.unmarshal(val.Elem(), start)
-}
-
-// An UnmarshalError represents an error in the unmarshalling process.
-type UnmarshalError string
-
-func (e UnmarshalError) Error() string { return string(e) }
-
-// Unmarshaler is the interface implemented by objects that can unmarshal
-// an XML element description of themselves.
-//
-// UnmarshalXML decodes a single XML element
-// beginning with the given start element.
-// If it returns an error, the outer call to Unmarshal stops and
-// returns that error.
-// UnmarshalXML must consume exactly one XML element.
-// One common implementation strategy is to unmarshal into
-// a separate value with a layout matching the expected XML
-// using d.DecodeElement,  and then to copy the data from
-// that value into the receiver.
-// Another common strategy is to use d.Token to process the
-// XML object one token at a time.
-// UnmarshalXML may not use d.RawToken.
-type Unmarshaler interface {
-	UnmarshalXML(d *Decoder, start StartElement) error
-}
-
-// UnmarshalerAttr is the interface implemented by objects that can unmarshal
-// an XML attribute description of themselves.
-//
-// UnmarshalXMLAttr decodes a single XML attribute.
-// If it returns an error, the outer call to Unmarshal stops and
-// returns that error.
-// UnmarshalXMLAttr is used only for struct fields with the
-// "attr" option in the field tag.
-type UnmarshalerAttr interface {
-	UnmarshalXMLAttr(attr Attr) error
-}
-
-// receiverType returns the receiver type to use in an expression like "%s.MethodName".
-func receiverType(val interface{}) string {
-	t := reflect.TypeOf(val)
-	if t.Name() != "" {
-		return t.String()
-	}
-	return "(" + t.String() + ")"
-}
-
-// unmarshalInterface unmarshals a single XML element into val.
-// start is the opening tag of the element.
-func (p *Decoder) unmarshalInterface(val Unmarshaler, start *StartElement) error {
-	// Record that decoder must stop at end tag corresponding to start.
-	p.pushEOF()
-
-	p.unmarshalDepth++
-	err := val.UnmarshalXML(p, *start)
-	p.unmarshalDepth--
-	if err != nil {
-		p.popEOF()
-		return err
-	}
-
-	if !p.popEOF() {
-		return fmt.Errorf("xml: %s.UnmarshalXML did not consume entire <%s> element", receiverType(val), start.Name.Local)
-	}
-
-	return nil
-}
-
-// unmarshalTextInterface unmarshals a single XML element into val.
-// The chardata contained in the element (but not its children)
-// is passed to the text unmarshaler.
-func (p *Decoder) unmarshalTextInterface(val encoding.TextUnmarshaler, start *StartElement) error {
-	var buf []byte
-	depth := 1
-	for depth > 0 {
-		t, err := p.Token()
-		if err != nil {
-			return err
-		}
-		switch t := t.(type) {
-		case CharData:
-			if depth == 1 {
-				buf = append(buf, t...)
-			}
-		case StartElement:
-			depth++
-		case EndElement:
-			depth--
-		}
-	}
-	return val.UnmarshalText(buf)
-}
-
-// unmarshalAttr unmarshals a single XML attribute into val.
-func (p *Decoder) unmarshalAttr(val reflect.Value, attr Attr) error {
-	if val.Kind() == reflect.Ptr {
-		if val.IsNil() {
-			val.Set(reflect.New(val.Type().Elem()))
-		}
-		val = val.Elem()
-	}
-
-	if val.CanInterface() && val.Type().Implements(unmarshalerAttrType) {
-		// This is an unmarshaler with a non-pointer receiver,
-		// so it's likely to be incorrect, but we do what we're told.
-		return val.Interface().(UnmarshalerAttr).UnmarshalXMLAttr(attr)
-	}
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(unmarshalerAttrType) {
-			return pv.Interface().(UnmarshalerAttr).UnmarshalXMLAttr(attr)
-		}
-	}
-
-	// Not an UnmarshalerAttr; try encoding.TextUnmarshaler.
-	if val.CanInterface() && val.Type().Implements(textUnmarshalerType) {
-		// This is an unmarshaler with a non-pointer receiver,
-		// so it's likely to be incorrect, but we do what we're told.
-		return val.Interface().(encoding.TextUnmarshaler).UnmarshalText([]byte(attr.Value))
-	}
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
-			return pv.Interface().(encoding.TextUnmarshaler).UnmarshalText([]byte(attr.Value))
-		}
-	}
-
-	copyValue(val, []byte(attr.Value))
-	return nil
-}
-
-var (
-	unmarshalerType     = reflect.TypeOf((*Unmarshaler)(nil)).Elem()
-	unmarshalerAttrType = reflect.TypeOf((*UnmarshalerAttr)(nil)).Elem()
-	textUnmarshalerType = reflect.TypeOf((*encoding.TextUnmarshaler)(nil)).Elem()
-)
-
-// Unmarshal a single XML element into val.
-func (p *Decoder) unmarshal(val reflect.Value, start *StartElement) error {
-	// Find start element if we need it.
-	if start == nil {
-		for {
-			tok, err := p.Token()
-			if err != nil {
-				return err
-			}
-			if t, ok := tok.(StartElement); ok {
-				start = &t
-				break
-			}
-		}
-	}
-
-	// Load value from interface, but only if the result will be
-	// usefully addressable.
-	if val.Kind() == reflect.Interface && !val.IsNil() {
-		e := val.Elem()
-		if e.Kind() == reflect.Ptr && !e.IsNil() {
-			val = e
-		}
-	}
-
-	if val.Kind() == reflect.Ptr {
-		if val.IsNil() {
-			val.Set(reflect.New(val.Type().Elem()))
-		}
-		val = val.Elem()
-	}
-
-	if val.CanInterface() && val.Type().Implements(unmarshalerType) {
-		// This is an unmarshaler with a non-pointer receiver,
-		// so it's likely to be incorrect, but we do what we're told.
-		return p.unmarshalInterface(val.Interface().(Unmarshaler), start)
-	}
-
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(unmarshalerType) {
-			return p.unmarshalInterface(pv.Interface().(Unmarshaler), start)
-		}
-	}
-
-	if val.CanInterface() && val.Type().Implements(textUnmarshalerType) {
-		return p.unmarshalTextInterface(val.Interface().(encoding.TextUnmarshaler), start)
-	}
-
-	if val.CanAddr() {
-		pv := val.Addr()
-		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
-			return p.unmarshalTextInterface(pv.Interface().(encoding.TextUnmarshaler), start)
-		}
-	}
-
-	var (
-		data         []byte
-		saveData     reflect.Value
-		comment      []byte
-		saveComment  reflect.Value
-		saveXML      reflect.Value
-		saveXMLIndex int
-		saveXMLData  []byte
-		saveAny      reflect.Value
-		sv           reflect.Value
-		tinfo        *typeInfo
-		err          error
-	)
-
-	switch v := val; v.Kind() {
-	default:
-		return errors.New("unknown type " + v.Type().String())
-
-	case reflect.Interface:
-		// TODO: For now, simply ignore the field. In the near
-		//       future we may choose to unmarshal the start
-		//       element on it, if not nil.
-		return p.Skip()
-
-	case reflect.Slice:
-		typ := v.Type()
-		if typ.Elem().Kind() == reflect.Uint8 {
-			// []byte
-			saveData = v
-			break
-		}
-
-		// Slice of element values.
-		// Grow slice.
-		n := v.Len()
-		if n >= v.Cap() {
-			ncap := 2 * n
-			if ncap < 4 {
-				ncap = 4
-			}
-			new := reflect.MakeSlice(typ, n, ncap)
-			reflect.Copy(new, v)
-			v.Set(new)
-		}
-		v.SetLen(n + 1)
-
-		// Recur to read element into slice.
-		if err := p.unmarshal(v.Index(n), start); err != nil {
-			v.SetLen(n)
-			return err
-		}
-		return nil
-
-	case reflect.Bool, reflect.Float32, reflect.Float64, reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64, reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr, reflect.String:
-		saveData = v
-
-	case reflect.Struct:
-		typ := v.Type()
-		if typ == nameType {
-			v.Set(reflect.ValueOf(start.Name))
-			break
-		}
-
-		sv = v
-		tinfo, err = getTypeInfo(typ)
-		if err != nil {
-			return err
-		}
-
-		// Validate and assign element name.
-		if tinfo.xmlname != nil {
-			finfo := tinfo.xmlname
-			if finfo.name != "" && finfo.name != start.Name.Local {
-				return UnmarshalError("expected element type <" + finfo.name + "> but have <" + start.Name.Local + ">")
-			}
-			if finfo.xmlns != "" && finfo.xmlns != start.Name.Space {
-				e := "expected element <" + finfo.name + "> in name space " + finfo.xmlns + " but have "
-				if start.Name.Space == "" {
-					e += "no name space"
-				} else {
-					e += start.Name.Space
-				}
-				return UnmarshalError(e)
-			}
-			fv := finfo.value(sv)
-			if _, ok := fv.Interface().(Name); ok {
-				fv.Set(reflect.ValueOf(start.Name))
-			}
-		}
-
-		// Assign attributes.
-		// Also, determine whether we need to save character data or comments.
-		for i := range tinfo.fields {
-			finfo := &tinfo.fields[i]
-			switch finfo.flags & fMode {
-			case fAttr:
-				strv := finfo.value(sv)
-				// Look for attribute.
-				for _, a := range start.Attr {
-					if a.Name.Local == finfo.name && (finfo.xmlns == "" || finfo.xmlns == a.Name.Space) {
-						if err := p.unmarshalAttr(strv, a); err != nil {
-							return err
-						}
-						break
-					}
-				}
-
-			case fCharData:
-				if !saveData.IsValid() {
-					saveData = finfo.value(sv)
-				}
-
-			case fComment:
-				if !saveComment.IsValid() {
-					saveComment = finfo.value(sv)
-				}
-
-			case fAny, fAny | fElement:
-				if !saveAny.IsValid() {
-					saveAny = finfo.value(sv)
-				}
-
-			case fInnerXml:
-				if !saveXML.IsValid() {
-					saveXML = finfo.value(sv)
-					if p.saved == nil {
-						saveXMLIndex = 0
-						p.saved = new(bytes.Buffer)
-					} else {
-						saveXMLIndex = p.savedOffset()
-					}
-				}
-			}
-		}
-	}
-
-	// Find end element.
-	// Process sub-elements along the way.
-Loop:
-	for {
-		var savedOffset int
-		if saveXML.IsValid() {
-			savedOffset = p.savedOffset()
-		}
-		tok, err := p.Token()
-		if err != nil {
-			return err
-		}
-		switch t := tok.(type) {
-		case StartElement:
-			consumed := false
-			if sv.IsValid() {
-				consumed, err = p.unmarshalPath(tinfo, sv, nil, &t)
-				if err != nil {
-					return err
-				}
-				if !consumed && saveAny.IsValid() {
-					consumed = true
-					if err := p.unmarshal(saveAny, &t); err != nil {
-						return err
-					}
-				}
-			}
-			if !consumed {
-				if err := p.Skip(); err != nil {
-					return err
-				}
-			}
-
-		case EndElement:
-			if saveXML.IsValid() {
-				saveXMLData = p.saved.Bytes()[saveXMLIndex:savedOffset]
-				if saveXMLIndex == 0 {
-					p.saved = nil
-				}
-			}
-			break Loop
-
-		case CharData:
-			if saveData.IsValid() {
-				data = append(data, t...)
-			}
-
-		case Comment:
-			if saveComment.IsValid() {
-				comment = append(comment, t...)
-			}
-		}
-	}
-
-	if saveData.IsValid() && saveData.CanInterface() && saveData.Type().Implements(textUnmarshalerType) {
-		if err := saveData.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
-			return err
-		}
-		saveData = reflect.Value{}
-	}
-
-	if saveData.IsValid() && saveData.CanAddr() {
-		pv := saveData.Addr()
-		if pv.CanInterface() && pv.Type().Implements(textUnmarshalerType) {
-			if err := pv.Interface().(encoding.TextUnmarshaler).UnmarshalText(data); err != nil {
-				return err
-			}
-			saveData = reflect.Value{}
-		}
-	}
-
-	if err := copyValue(saveData, data); err != nil {
-		return err
-	}
-
-	switch t := saveComment; t.Kind() {
-	case reflect.String:
-		t.SetString(string(comment))
-	case reflect.Slice:
-		t.Set(reflect.ValueOf(comment))
-	}
-
-	switch t := saveXML; t.Kind() {
-	case reflect.String:
-		t.SetString(string(saveXMLData))
-	case reflect.Slice:
-		t.Set(reflect.ValueOf(saveXMLData))
-	}
-
-	return nil
-}
-
-func copyValue(dst reflect.Value, src []byte) (err error) {
-	dst0 := dst
-
-	if dst.Kind() == reflect.Ptr {
-		if dst.IsNil() {
-			dst.Set(reflect.New(dst.Type().Elem()))
-		}
-		dst = dst.Elem()
-	}
-
-	// Save accumulated data.
-	switch dst.Kind() {
-	case reflect.Invalid:
-		// Probably a comment.
-	default:
-		return errors.New("cannot unmarshal into " + dst0.Type().String())
-	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
-		itmp, err := strconv.ParseInt(string(src), 10, dst.Type().Bits())
-		if err != nil {
-			return err
-		}
-		dst.SetInt(itmp)
-	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
-		utmp, err := strconv.ParseUint(string(src), 10, dst.Type().Bits())
-		if err != nil {
-			return err
-		}
-		dst.SetUint(utmp)
-	case reflect.Float32, reflect.Float64:
-		ftmp, err := strconv.ParseFloat(string(src), dst.Type().Bits())
-		if err != nil {
-			return err
-		}
-		dst.SetFloat(ftmp)
-	case reflect.Bool:
-		value, err := strconv.ParseBool(strings.TrimSpace(string(src)))
-		if err != nil {
-			return err
-		}
-		dst.SetBool(value)
-	case reflect.String:
-		dst.SetString(string(src))
-	case reflect.Slice:
-		if len(src) == 0 {
-			// non-nil to flag presence
-			src = []byte{}
-		}
-		dst.SetBytes(src)
-	}
-	return nil
-}
-
-// unmarshalPath walks down an XML structure looking for wanted
-// paths, and calls unmarshal on them.
-// The consumed result tells whether XML elements have been consumed
-// from the Decoder until start's matching end element, or if it's
-// still untouched because start is uninteresting for sv's fields.
-func (p *Decoder) unmarshalPath(tinfo *typeInfo, sv reflect.Value, parents []string, start *StartElement) (consumed bool, err error) {
-	recurse := false
-Loop:
-	for i := range tinfo.fields {
-		finfo := &tinfo.fields[i]
-		if finfo.flags&fElement == 0 || len(finfo.parents) < len(parents) || finfo.xmlns != "" && finfo.xmlns != start.Name.Space {
-			continue
-		}
-		for j := range parents {
-			if parents[j] != finfo.parents[j] {
-				continue Loop
-			}
-		}
-		if len(finfo.parents) == len(parents) && finfo.name == start.Name.Local {
-			// It's a perfect match, unmarshal the field.
-			return true, p.unmarshal(finfo.value(sv), start)
-		}
-		if len(finfo.parents) > len(parents) && finfo.parents[len(parents)] == start.Name.Local {
-			// It's a prefix for the field. Break and recurse
-			// since it's not ok for one field path to be itself
-			// the prefix for another field path.
-			recurse = true
-
-			// We can reuse the same slice as long as we
-			// don't try to append to it.
-			parents = finfo.parents[:len(parents)+1]
-			break
-		}
-	}
-	if !recurse {
-		// We have no business with this element.
-		return false, nil
-	}
-	// The element is not a perfect match for any field, but one
-	// or more fields have the path to this element as a parent
-	// prefix. Recurse and attempt to match these.
-	for {
-		var tok Token
-		tok, err = p.Token()
-		if err != nil {
-			return true, err
-		}
-		switch t := tok.(type) {
-		case StartElement:
-			consumed2, err := p.unmarshalPath(tinfo, sv, parents, &t)
-			if err != nil {
-				return true, err
-			}
-			if !consumed2 {
-				if err := p.Skip(); err != nil {
-					return true, err
-				}
-			}
-		case EndElement:
-			return true, nil
-		}
-	}
-}
-
-// Skip reads tokens until it has consumed the end element
-// matching the most recent start element already consumed.
-// It recurs if it encounters a start element, so it can be used to
-// skip nested structures.
-// It returns nil if it finds an end element matching the start
-// element; otherwise it returns an error describing the problem.
-func (d *Decoder) Skip() error {
-	for {
-		tok, err := d.Token()
-		if err != nil {
-			return err
-		}
-		switch tok.(type) {
-		case StartElement:
-			if err := d.Skip(); err != nil {
-				return err
-			}
-		case EndElement:
-			return nil
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/read_test.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/read_test.go
deleted file mode 100644
index 02f1e10c33..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/read_test.go
+++ /dev/null
@@ -1,744 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"time"
-)
-
-// Stripped down Atom feed data structures.
-
-func TestUnmarshalFeed(t *testing.T) {
-	var f Feed
-	if err := Unmarshal([]byte(atomFeedString), &f); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if !reflect.DeepEqual(f, atomFeed) {
-		t.Fatalf("have %#v\nwant %#v", f, atomFeed)
-	}
-}
-
-// hget http://codereview.appspot.com/rss/mine/rsc
-const atomFeedString = `
-<?xml version="1.0" encoding="utf-8"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:lang="en-us" updated="2009-10-04T01:35:58+00:00"><title>Code Review - My issues</title><link href="http://codereview.appspot.com/" rel="alternate"></link><link href="http://codereview.appspot.com/rss/mine/rsc" rel="self"></link><id>http://codereview.appspot.com/</id><author><name>rietveld&lt;&gt;</name></author><entry><title>rietveld: an attempt at pubsubhubbub
-</title><link href="http://codereview.appspot.com/126085" rel="alternate"></link><updated>2009-10-04T01:35:58+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:134d9179c41f806be79b3a5f7877d19a</id><summary type="html">
-  An attempt at adding pubsubhubbub support to Rietveld.
-http://code.google.com/p/pubsubhubbub
-http://code.google.com/p/rietveld/issues/detail?id=155
-
-The server side of the protocol is trivial:
-  1. add a &amp;lt;link rel=&amp;quot;hub&amp;quot; href=&amp;quot;hub-server&amp;quot;&amp;gt; tag to all
-     feeds that will be pubsubhubbubbed.
-  2. every time one of those feeds changes, tell the hub
-     with a simple POST request.
-
-I have tested this by adding debug prints to a local hub
-server and checking that the server got the right publish
-requests.
-
-I can&amp;#39;t quite get the server to work, but I think the bug
-is not in my code.  I think that the server expects to be
-able to grab the feed and see the feed&amp;#39;s actual URL in
-the link rel=&amp;quot;self&amp;quot;, but the default value for that drops
-the :port from the URL, and I cannot for the life of me
-figure out how to get the Atom generator deep inside
-django not to do that, or even where it is doing that,
-or even what code is running to generate the Atom feed.
-(I thought I knew but I added some assert False statements
-and it kept running!)
-
-Ignoring that particular problem, I would appreciate
-feedback on the right way to get the two values at
-the top of feeds.py marked NOTE(rsc).
-
-
-</summary></entry><entry><title>rietveld: correct tab handling
-</title><link href="http://codereview.appspot.com/124106" rel="alternate"></link><updated>2009-10-03T23:02:17+00:00</updated><author><name>email-address-removed</name></author><id>urn:md5:0a2a4f19bb815101f0ba2904aed7c35a</id><summary type="html">
-  This fixes the buggy tab rendering that can be seen at
-http://codereview.appspot.com/116075/diff/1/2
-
-The fundamental problem was that the tab code was
-not being told what column the text began in, so it
-didn&amp;#39;t know where to put the tab stops.  Another problem
-was that some of the code assumed that string byte
-offsets were the same as column offsets, which is only
-true if there are no tabs.
-
-In the process of fixing this, I cleaned up the arguments
-to Fold and ExpandTabs and renamed them Break and
-_ExpandTabs so that I could be sure that I found all the
-call sites.  I also wanted to verify that ExpandTabs was
-not being used from outside intra_region_diff.py.
-
-
-</summary></entry></feed> 	   `
-
-type Feed struct {
-	XMLName Name      `xml:"http://www.w3.org/2005/Atom feed"`
-	Title   string    `xml:"title"`
-	Id      string    `xml:"id"`
-	Link    []Link    `xml:"link"`
-	Updated time.Time `xml:"updated,attr"`
-	Author  Person    `xml:"author"`
-	Entry   []Entry   `xml:"entry"`
-}
-
-type Entry struct {
-	Title   string    `xml:"title"`
-	Id      string    `xml:"id"`
-	Link    []Link    `xml:"link"`
-	Updated time.Time `xml:"updated"`
-	Author  Person    `xml:"author"`
-	Summary Text      `xml:"summary"`
-}
-
-type Link struct {
-	Rel  string `xml:"rel,attr,omitempty"`
-	Href string `xml:"href,attr"`
-}
-
-type Person struct {
-	Name     string `xml:"name"`
-	URI      string `xml:"uri"`
-	Email    string `xml:"email"`
-	InnerXML string `xml:",innerxml"`
-}
-
-type Text struct {
-	Type string `xml:"type,attr,omitempty"`
-	Body string `xml:",chardata"`
-}
-
-var atomFeed = Feed{
-	XMLName: Name{"http://www.w3.org/2005/Atom", "feed"},
-	Title:   "Code Review - My issues",
-	Link: []Link{
-		{Rel: "alternate", Href: "http://codereview.appspot.com/"},
-		{Rel: "self", Href: "http://codereview.appspot.com/rss/mine/rsc"},
-	},
-	Id:      "http://codereview.appspot.com/",
-	Updated: ParseTime("2009-10-04T01:35:58+00:00"),
-	Author: Person{
-		Name:     "rietveld<>",
-		InnerXML: "<name>rietveld&lt;&gt;</name>",
-	},
-	Entry: []Entry{
-		{
-			Title: "rietveld: an attempt at pubsubhubbub\n",
-			Link: []Link{
-				{Rel: "alternate", Href: "http://codereview.appspot.com/126085"},
-			},
-			Updated: ParseTime("2009-10-04T01:35:58+00:00"),
-			Author: Person{
-				Name:     "email-address-removed",
-				InnerXML: "<name>email-address-removed</name>",
-			},
-			Id: "urn:md5:134d9179c41f806be79b3a5f7877d19a",
-			Summary: Text{
-				Type: "html",
-				Body: `
-  An attempt at adding pubsubhubbub support to Rietveld.
-http://code.google.com/p/pubsubhubbub
-http://code.google.com/p/rietveld/issues/detail?id=155
-
-The server side of the protocol is trivial:
-  1. add a &lt;link rel=&quot;hub&quot; href=&quot;hub-server&quot;&gt; tag to all
-     feeds that will be pubsubhubbubbed.
-  2. every time one of those feeds changes, tell the hub
-     with a simple POST request.
-
-I have tested this by adding debug prints to a local hub
-server and checking that the server got the right publish
-requests.
-
-I can&#39;t quite get the server to work, but I think the bug
-is not in my code.  I think that the server expects to be
-able to grab the feed and see the feed&#39;s actual URL in
-the link rel=&quot;self&quot;, but the default value for that drops
-the :port from the URL, and I cannot for the life of me
-figure out how to get the Atom generator deep inside
-django not to do that, or even where it is doing that,
-or even what code is running to generate the Atom feed.
-(I thought I knew but I added some assert False statements
-and it kept running!)
-
-Ignoring that particular problem, I would appreciate
-feedback on the right way to get the two values at
-the top of feeds.py marked NOTE(rsc).
-
-
-`,
-			},
-		},
-		{
-			Title: "rietveld: correct tab handling\n",
-			Link: []Link{
-				{Rel: "alternate", Href: "http://codereview.appspot.com/124106"},
-			},
-			Updated: ParseTime("2009-10-03T23:02:17+00:00"),
-			Author: Person{
-				Name:     "email-address-removed",
-				InnerXML: "<name>email-address-removed</name>",
-			},
-			Id: "urn:md5:0a2a4f19bb815101f0ba2904aed7c35a",
-			Summary: Text{
-				Type: "html",
-				Body: `
-  This fixes the buggy tab rendering that can be seen at
-http://codereview.appspot.com/116075/diff/1/2
-
-The fundamental problem was that the tab code was
-not being told what column the text began in, so it
-didn&#39;t know where to put the tab stops.  Another problem
-was that some of the code assumed that string byte
-offsets were the same as column offsets, which is only
-true if there are no tabs.
-
-In the process of fixing this, I cleaned up the arguments
-to Fold and ExpandTabs and renamed them Break and
-_ExpandTabs so that I could be sure that I found all the
-call sites.  I also wanted to verify that ExpandTabs was
-not being used from outside intra_region_diff.py.
-
-
-`,
-			},
-		},
-	},
-}
-
-const pathTestString = `
-<Result>
-    <Before>1</Before>
-    <Items>
-        <Item1>
-            <Value>A</Value>
-        </Item1>
-        <Item2>
-            <Value>B</Value>
-        </Item2>
-        <Item1>
-            <Value>C</Value>
-            <Value>D</Value>
-        </Item1>
-        <_>
-            <Value>E</Value>
-        </_>
-    </Items>
-    <After>2</After>
-</Result>
-`
-
-type PathTestItem struct {
-	Value string
-}
-
-type PathTestA struct {
-	Items         []PathTestItem `xml:">Item1"`
-	Before, After string
-}
-
-type PathTestB struct {
-	Other         []PathTestItem `xml:"Items>Item1"`
-	Before, After string
-}
-
-type PathTestC struct {
-	Values1       []string `xml:"Items>Item1>Value"`
-	Values2       []string `xml:"Items>Item2>Value"`
-	Before, After string
-}
-
-type PathTestSet struct {
-	Item1 []PathTestItem
-}
-
-type PathTestD struct {
-	Other         PathTestSet `xml:"Items"`
-	Before, After string
-}
-
-type PathTestE struct {
-	Underline     string `xml:"Items>_>Value"`
-	Before, After string
-}
-
-var pathTests = []interface{}{
-	&PathTestA{Items: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
-	&PathTestB{Other: []PathTestItem{{"A"}, {"D"}}, Before: "1", After: "2"},
-	&PathTestC{Values1: []string{"A", "C", "D"}, Values2: []string{"B"}, Before: "1", After: "2"},
-	&PathTestD{Other: PathTestSet{Item1: []PathTestItem{{"A"}, {"D"}}}, Before: "1", After: "2"},
-	&PathTestE{Underline: "E", Before: "1", After: "2"},
-}
-
-func TestUnmarshalPaths(t *testing.T) {
-	for _, pt := range pathTests {
-		v := reflect.New(reflect.TypeOf(pt).Elem()).Interface()
-		if err := Unmarshal([]byte(pathTestString), v); err != nil {
-			t.Fatalf("Unmarshal: %s", err)
-		}
-		if !reflect.DeepEqual(v, pt) {
-			t.Fatalf("have %#v\nwant %#v", v, pt)
-		}
-	}
-}
-
-type BadPathTestA struct {
-	First  string `xml:"items>item1"`
-	Other  string `xml:"items>item2"`
-	Second string `xml:"items"`
-}
-
-type BadPathTestB struct {
-	Other  string `xml:"items>item2>value"`
-	First  string `xml:"items>item1"`
-	Second string `xml:"items>item1>value"`
-}
-
-type BadPathTestC struct {
-	First  string
-	Second string `xml:"First"`
-}
-
-type BadPathTestD struct {
-	BadPathEmbeddedA
-	BadPathEmbeddedB
-}
-
-type BadPathEmbeddedA struct {
-	First string
-}
-
-type BadPathEmbeddedB struct {
-	Second string `xml:"First"`
-}
-
-var badPathTests = []struct {
-	v, e interface{}
-}{
-	{&BadPathTestA{}, &TagPathError{reflect.TypeOf(BadPathTestA{}), "First", "items>item1", "Second", "items"}},
-	{&BadPathTestB{}, &TagPathError{reflect.TypeOf(BadPathTestB{}), "First", "items>item1", "Second", "items>item1>value"}},
-	{&BadPathTestC{}, &TagPathError{reflect.TypeOf(BadPathTestC{}), "First", "", "Second", "First"}},
-	{&BadPathTestD{}, &TagPathError{reflect.TypeOf(BadPathTestD{}), "First", "", "Second", "First"}},
-}
-
-func TestUnmarshalBadPaths(t *testing.T) {
-	for _, tt := range badPathTests {
-		err := Unmarshal([]byte(pathTestString), tt.v)
-		if !reflect.DeepEqual(err, tt.e) {
-			t.Fatalf("Unmarshal with %#v didn't fail properly:\nhave %#v,\nwant %#v", tt.v, err, tt.e)
-		}
-	}
-}
-
-const OK = "OK"
-const withoutNameTypeData = `
-<?xml version="1.0" charset="utf-8"?>
-<Test3 Attr="OK" />`
-
-type TestThree struct {
-	XMLName Name   `xml:"Test3"`
-	Attr    string `xml:",attr"`
-}
-
-func TestUnmarshalWithoutNameType(t *testing.T) {
-	var x TestThree
-	if err := Unmarshal([]byte(withoutNameTypeData), &x); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if x.Attr != OK {
-		t.Fatalf("have %v\nwant %v", x.Attr, OK)
-	}
-}
-
-func TestUnmarshalAttr(t *testing.T) {
-	type ParamVal struct {
-		Int int `xml:"int,attr"`
-	}
-
-	type ParamPtr struct {
-		Int *int `xml:"int,attr"`
-	}
-
-	type ParamStringPtr struct {
-		Int *string `xml:"int,attr"`
-	}
-
-	x := []byte(`<Param int="1" />`)
-
-	p1 := &ParamPtr{}
-	if err := Unmarshal(x, p1); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p1.Int == nil {
-		t.Fatalf("Unmarshal failed in to *int field")
-	} else if *p1.Int != 1 {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p1.Int, 1)
-	}
-
-	p2 := &ParamVal{}
-	if err := Unmarshal(x, p2); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p2.Int != 1 {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p2.Int, 1)
-	}
-
-	p3 := &ParamStringPtr{}
-	if err := Unmarshal(x, p3); err != nil {
-		t.Fatalf("Unmarshal: %s", err)
-	}
-	if p3.Int == nil {
-		t.Fatalf("Unmarshal failed in to *string field")
-	} else if *p3.Int != "1" {
-		t.Fatalf("Unmarshal with %s failed:\nhave %#v,\n want %#v", x, p3.Int, 1)
-	}
-}
-
-type Tables struct {
-	HTable string `xml:"http://www.w3.org/TR/html4/ table"`
-	FTable string `xml:"http://www.w3schools.com/furniture table"`
-}
-
-var tables = []struct {
-	xml string
-	tab Tables
-	ns  string
-}{
-	{
-		xml: `<Tables>` +
-			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
-			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables>` +
-			`<table xmlns="http://www.w3schools.com/furniture">world</table>` +
-			`<table xmlns="http://www.w3.org/TR/html4/">hello</table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/">` +
-			`<f:table>world</f:table>` +
-			`<h:table>hello</h:table>` +
-			`</Tables>`,
-		tab: Tables{"hello", "world"},
-	},
-	{
-		xml: `<Tables>` +
-			`<table>bogus</table>` +
-			`</Tables>`,
-		tab: Tables{},
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{HTable: "only"},
-		ns:  "http://www.w3.org/TR/html4/",
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{FTable: "only"},
-		ns:  "http://www.w3schools.com/furniture",
-	},
-	{
-		xml: `<Tables>` +
-			`<table>only</table>` +
-			`</Tables>`,
-		tab: Tables{},
-		ns:  "something else entirely",
-	},
-}
-
-func TestUnmarshalNS(t *testing.T) {
-	for i, tt := range tables {
-		var dst Tables
-		var err error
-		if tt.ns != "" {
-			d := NewDecoder(strings.NewReader(tt.xml))
-			d.DefaultSpace = tt.ns
-			err = d.Decode(&dst)
-		} else {
-			err = Unmarshal([]byte(tt.xml), &dst)
-		}
-		if err != nil {
-			t.Errorf("#%d: Unmarshal: %v", i, err)
-			continue
-		}
-		want := tt.tab
-		if dst != want {
-			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
-		}
-	}
-}
-
-func TestRoundTrip(t *testing.T) {
-	// From issue 7535
-	const s = `<ex:element xmlns:ex="http://example.com/schema"></ex:element>`
-	in := bytes.NewBufferString(s)
-	for i := 0; i < 10; i++ {
-		out := &bytes.Buffer{}
-		d := NewDecoder(in)
-		e := NewEncoder(out)
-
-		for {
-			t, err := d.Token()
-			if err == io.EOF {
-				break
-			}
-			if err != nil {
-				fmt.Println("failed:", err)
-				return
-			}
-			e.EncodeToken(t)
-		}
-		e.Flush()
-		in = out
-	}
-	if got := in.String(); got != s {
-		t.Errorf("have: %q\nwant: %q\n", got, s)
-	}
-}
-
-func TestMarshalNS(t *testing.T) {
-	dst := Tables{"hello", "world"}
-	data, err := Marshal(&dst)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	want := `<Tables><table xmlns="http://www.w3.org/TR/html4/">hello</table><table xmlns="http://www.w3schools.com/furniture">world</table></Tables>`
-	str := string(data)
-	if str != want {
-		t.Errorf("have: %q\nwant: %q\n", str, want)
-	}
-}
-
-type TableAttrs struct {
-	TAttr TAttr
-}
-
-type TAttr struct {
-	HTable string `xml:"http://www.w3.org/TR/html4/ table,attr"`
-	FTable string `xml:"http://www.w3schools.com/furniture table,attr"`
-	Lang   string `xml:"http://www.w3.org/XML/1998/namespace lang,attr,omitempty"`
-	Other1 string `xml:"http://golang.org/xml/ other,attr,omitempty"`
-	Other2 string `xml:"http://golang.org/xmlfoo/ other,attr,omitempty"`
-	Other3 string `xml:"http://golang.org/json/ other,attr,omitempty"`
-	Other4 string `xml:"http://golang.org/2/json/ other,attr,omitempty"`
-}
-
-var tableAttrs = []struct {
-	xml string
-	tab TableAttrs
-	ns  string
-}{
-	{
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
-			`h:table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`h:table="hello" f:table="world" xmlns:f="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: "world"}},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns="http://www.w3schools.com/furniture" xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr xmlns="http://www.w3.org/TR/html4/" ` +
-			`table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`table="bogus" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{},
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:h="http://www.w3.org/TR/html4/"><TAttr ` +
-			`h:table="hello" table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "hello", FTable: ""}},
-		ns:  "http://www.w3schools.com/furniture",
-	},
-	{
-		// Default space does not apply to attribute names.
-		xml: `<TableAttrs xmlns:f="http://www.w3schools.com/furniture"><TAttr ` +
-			`table="hello" f:table="world" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{TAttr{HTable: "", FTable: "world"}},
-		ns:  "http://www.w3.org/TR/html4/",
-	},
-	{
-		xml: `<TableAttrs><TAttr ` +
-			`table="bogus" ` +
-			`/></TableAttrs>`,
-		tab: TableAttrs{},
-		ns:  "something else entirely",
-	},
-}
-
-func TestUnmarshalNSAttr(t *testing.T) {
-	for i, tt := range tableAttrs {
-		var dst TableAttrs
-		var err error
-		if tt.ns != "" {
-			d := NewDecoder(strings.NewReader(tt.xml))
-			d.DefaultSpace = tt.ns
-			err = d.Decode(&dst)
-		} else {
-			err = Unmarshal([]byte(tt.xml), &dst)
-		}
-		if err != nil {
-			t.Errorf("#%d: Unmarshal: %v", i, err)
-			continue
-		}
-		want := tt.tab
-		if dst != want {
-			t.Errorf("#%d: dst=%+v, want %+v", i, dst, want)
-		}
-	}
-}
-
-func TestMarshalNSAttr(t *testing.T) {
-	src := TableAttrs{TAttr{"hello", "world", "en_US", "other1", "other2", "other3", "other4"}}
-	data, err := Marshal(&src)
-	if err != nil {
-		t.Fatalf("Marshal: %v", err)
-	}
-	want := `<TableAttrs><TAttr xmlns:json_1="http://golang.org/2/json/" xmlns:json="http://golang.org/json/" xmlns:_xmlfoo="http://golang.org/xmlfoo/" xmlns:_xml="http://golang.org/xml/" xmlns:furniture="http://www.w3schools.com/furniture" xmlns:html4="http://www.w3.org/TR/html4/" html4:table="hello" furniture:table="world" xml:lang="en_US" _xml:other="other1" _xmlfoo:other="other2" json:other="other3" json_1:other="other4"></TAttr></TableAttrs>`
-	str := string(data)
-	if str != want {
-		t.Errorf("Marshal:\nhave: %#q\nwant: %#q\n", str, want)
-	}
-
-	var dst TableAttrs
-	if err := Unmarshal(data, &dst); err != nil {
-		t.Errorf("Unmarshal: %v", err)
-	}
-
-	if dst != src {
-		t.Errorf("Unmarshal = %q, want %q", dst, src)
-	}
-}
-
-type MyCharData struct {
-	body string
-}
-
-func (m *MyCharData) UnmarshalXML(d *Decoder, start StartElement) error {
-	for {
-		t, err := d.Token()
-		if err == io.EOF { // found end of element
-			break
-		}
-		if err != nil {
-			return err
-		}
-		if char, ok := t.(CharData); ok {
-			m.body += string(char)
-		}
-	}
-	return nil
-}
-
-var _ Unmarshaler = (*MyCharData)(nil)
-
-func (m *MyCharData) UnmarshalXMLAttr(attr Attr) error {
-	panic("must not call")
-}
-
-type MyAttr struct {
-	attr string
-}
-
-func (m *MyAttr) UnmarshalXMLAttr(attr Attr) error {
-	m.attr = attr.Value
-	return nil
-}
-
-var _ UnmarshalerAttr = (*MyAttr)(nil)
-
-type MyStruct struct {
-	Data *MyCharData
-	Attr *MyAttr `xml:",attr"`
-
-	Data2 MyCharData
-	Attr2 MyAttr `xml:",attr"`
-}
-
-func TestUnmarshaler(t *testing.T) {
-	xml := `<?xml version="1.0" encoding="utf-8"?>
-		<MyStruct Attr="attr1" Attr2="attr2">
-		<Data>hello <!-- comment -->world</Data>
-		<Data2>howdy <!-- comment -->world</Data2>
-		</MyStruct>
-	`
-
-	var m MyStruct
-	if err := Unmarshal([]byte(xml), &m); err != nil {
-		t.Fatal(err)
-	}
-
-	if m.Data == nil || m.Attr == nil || m.Data.body != "hello world" || m.Attr.attr != "attr1" || m.Data2.body != "howdy world" || m.Attr2.attr != "attr2" {
-		t.Errorf("m=%#+v\n", m)
-	}
-}
-
-type Pea struct {
-	Cotelydon string
-}
-
-type Pod struct {
-	Pea interface{} `xml:"Pea"`
-}
-
-// https://golang.org/issue/6836
-func TestUnmarshalIntoInterface(t *testing.T) {
-	pod := new(Pod)
-	pod.Pea = new(Pea)
-	xml := `<Pod><Pea><Cotelydon>Green stuff</Cotelydon></Pea></Pod>`
-	err := Unmarshal([]byte(xml), pod)
-	if err != nil {
-		t.Fatalf("failed to unmarshal %q: %v", xml, err)
-	}
-	pea, ok := pod.Pea.(*Pea)
-	if !ok {
-		t.Fatalf("unmarshalled into wrong type: have %T want *Pea", pod.Pea)
-	}
-	have, want := pea.Cotelydon, "Green stuff"
-	if have != want {
-		t.Errorf("failed to unmarshal into interface, have %q want %q", have, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/typeinfo.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/typeinfo.go
deleted file mode 100644
index fdde288bc3..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/typeinfo.go
+++ /dev/null
@@ -1,371 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"sync"
-)
-
-// typeInfo holds details for the xml representation of a type.
-type typeInfo struct {
-	xmlname *fieldInfo
-	fields  []fieldInfo
-}
-
-// fieldInfo holds details for the xml representation of a single field.
-type fieldInfo struct {
-	idx     []int
-	name    string
-	xmlns   string
-	flags   fieldFlags
-	parents []string
-}
-
-type fieldFlags int
-
-const (
-	fElement fieldFlags = 1 << iota
-	fAttr
-	fCharData
-	fInnerXml
-	fComment
-	fAny
-
-	fOmitEmpty
-
-	fMode = fElement | fAttr | fCharData | fInnerXml | fComment | fAny
-)
-
-var tinfoMap = make(map[reflect.Type]*typeInfo)
-var tinfoLock sync.RWMutex
-
-var nameType = reflect.TypeOf(Name{})
-
-// getTypeInfo returns the typeInfo structure with details necessary
-// for marshalling and unmarshalling typ.
-func getTypeInfo(typ reflect.Type) (*typeInfo, error) {
-	tinfoLock.RLock()
-	tinfo, ok := tinfoMap[typ]
-	tinfoLock.RUnlock()
-	if ok {
-		return tinfo, nil
-	}
-	tinfo = &typeInfo{}
-	if typ.Kind() == reflect.Struct && typ != nameType {
-		n := typ.NumField()
-		for i := 0; i < n; i++ {
-			f := typ.Field(i)
-			if f.PkgPath != "" || f.Tag.Get("xml") == "-" {
-				continue // Private field
-			}
-
-			// For embedded structs, embed its fields.
-			if f.Anonymous {
-				t := f.Type
-				if t.Kind() == reflect.Ptr {
-					t = t.Elem()
-				}
-				if t.Kind() == reflect.Struct {
-					inner, err := getTypeInfo(t)
-					if err != nil {
-						return nil, err
-					}
-					if tinfo.xmlname == nil {
-						tinfo.xmlname = inner.xmlname
-					}
-					for _, finfo := range inner.fields {
-						finfo.idx = append([]int{i}, finfo.idx...)
-						if err := addFieldInfo(typ, tinfo, &finfo); err != nil {
-							return nil, err
-						}
-					}
-					continue
-				}
-			}
-
-			finfo, err := structFieldInfo(typ, &f)
-			if err != nil {
-				return nil, err
-			}
-
-			if f.Name == "XMLName" {
-				tinfo.xmlname = finfo
-				continue
-			}
-
-			// Add the field if it doesn't conflict with other fields.
-			if err := addFieldInfo(typ, tinfo, finfo); err != nil {
-				return nil, err
-			}
-		}
-	}
-	tinfoLock.Lock()
-	tinfoMap[typ] = tinfo
-	tinfoLock.Unlock()
-	return tinfo, nil
-}
-
-// structFieldInfo builds and returns a fieldInfo for f.
-func structFieldInfo(typ reflect.Type, f *reflect.StructField) (*fieldInfo, error) {
-	finfo := &fieldInfo{idx: f.Index}
-
-	// Split the tag from the xml namespace if necessary.
-	tag := f.Tag.Get("xml")
-	if i := strings.Index(tag, " "); i >= 0 {
-		finfo.xmlns, tag = tag[:i], tag[i+1:]
-	}
-
-	// Parse flags.
-	tokens := strings.Split(tag, ",")
-	if len(tokens) == 1 {
-		finfo.flags = fElement
-	} else {
-		tag = tokens[0]
-		for _, flag := range tokens[1:] {
-			switch flag {
-			case "attr":
-				finfo.flags |= fAttr
-			case "chardata":
-				finfo.flags |= fCharData
-			case "innerxml":
-				finfo.flags |= fInnerXml
-			case "comment":
-				finfo.flags |= fComment
-			case "any":
-				finfo.flags |= fAny
-			case "omitempty":
-				finfo.flags |= fOmitEmpty
-			}
-		}
-
-		// Validate the flags used.
-		valid := true
-		switch mode := finfo.flags & fMode; mode {
-		case 0:
-			finfo.flags |= fElement
-		case fAttr, fCharData, fInnerXml, fComment, fAny:
-			if f.Name == "XMLName" || tag != "" && mode != fAttr {
-				valid = false
-			}
-		default:
-			// This will also catch multiple modes in a single field.
-			valid = false
-		}
-		if finfo.flags&fMode == fAny {
-			finfo.flags |= fElement
-		}
-		if finfo.flags&fOmitEmpty != 0 && finfo.flags&(fElement|fAttr) == 0 {
-			valid = false
-		}
-		if !valid {
-			return nil, fmt.Errorf("xml: invalid tag in field %s of type %s: %q",
-				f.Name, typ, f.Tag.Get("xml"))
-		}
-	}
-
-	// Use of xmlns without a name is not allowed.
-	if finfo.xmlns != "" && tag == "" {
-		return nil, fmt.Errorf("xml: namespace without name in field %s of type %s: %q",
-			f.Name, typ, f.Tag.Get("xml"))
-	}
-
-	if f.Name == "XMLName" {
-		// The XMLName field records the XML element name. Don't
-		// process it as usual because its name should default to
-		// empty rather than to the field name.
-		finfo.name = tag
-		return finfo, nil
-	}
-
-	if tag == "" {
-		// If the name part of the tag is completely empty, get
-		// default from XMLName of underlying struct if feasible,
-		// or field name otherwise.
-		if xmlname := lookupXMLName(f.Type); xmlname != nil {
-			finfo.xmlns, finfo.name = xmlname.xmlns, xmlname.name
-		} else {
-			finfo.name = f.Name
-		}
-		return finfo, nil
-	}
-
-	if finfo.xmlns == "" && finfo.flags&fAttr == 0 {
-		// If it's an element no namespace specified, get the default
-		// from the XMLName of enclosing struct if possible.
-		if xmlname := lookupXMLName(typ); xmlname != nil {
-			finfo.xmlns = xmlname.xmlns
-		}
-	}
-
-	// Prepare field name and parents.
-	parents := strings.Split(tag, ">")
-	if parents[0] == "" {
-		parents[0] = f.Name
-	}
-	if parents[len(parents)-1] == "" {
-		return nil, fmt.Errorf("xml: trailing '>' in field %s of type %s", f.Name, typ)
-	}
-	finfo.name = parents[len(parents)-1]
-	if len(parents) > 1 {
-		if (finfo.flags & fElement) == 0 {
-			return nil, fmt.Errorf("xml: %s chain not valid with %s flag", tag, strings.Join(tokens[1:], ","))
-		}
-		finfo.parents = parents[:len(parents)-1]
-	}
-
-	// If the field type has an XMLName field, the names must match
-	// so that the behavior of both marshalling and unmarshalling
-	// is straightforward and unambiguous.
-	if finfo.flags&fElement != 0 {
-		ftyp := f.Type
-		xmlname := lookupXMLName(ftyp)
-		if xmlname != nil && xmlname.name != finfo.name {
-			return nil, fmt.Errorf("xml: name %q in tag of %s.%s conflicts with name %q in %s.XMLName",
-				finfo.name, typ, f.Name, xmlname.name, ftyp)
-		}
-	}
-	return finfo, nil
-}
-
-// lookupXMLName returns the fieldInfo for typ's XMLName field
-// in case it exists and has a valid xml field tag, otherwise
-// it returns nil.
-func lookupXMLName(typ reflect.Type) (xmlname *fieldInfo) {
-	for typ.Kind() == reflect.Ptr {
-		typ = typ.Elem()
-	}
-	if typ.Kind() != reflect.Struct {
-		return nil
-	}
-	for i, n := 0, typ.NumField(); i < n; i++ {
-		f := typ.Field(i)
-		if f.Name != "XMLName" {
-			continue
-		}
-		finfo, err := structFieldInfo(typ, &f)
-		if finfo.name != "" && err == nil {
-			return finfo
-		}
-		// Also consider errors as a non-existent field tag
-		// and let getTypeInfo itself report the error.
-		break
-	}
-	return nil
-}
-
-func min(a, b int) int {
-	if a <= b {
-		return a
-	}
-	return b
-}
-
-// addFieldInfo adds finfo to tinfo.fields if there are no
-// conflicts, or if conflicts arise from previous fields that were
-// obtained from deeper embedded structures than finfo. In the latter
-// case, the conflicting entries are dropped.
-// A conflict occurs when the path (parent + name) to a field is
-// itself a prefix of another path, or when two paths match exactly.
-// It is okay for field paths to share a common, shorter prefix.
-func addFieldInfo(typ reflect.Type, tinfo *typeInfo, newf *fieldInfo) error {
-	var conflicts []int
-Loop:
-	// First, figure all conflicts. Most working code will have none.
-	for i := range tinfo.fields {
-		oldf := &tinfo.fields[i]
-		if oldf.flags&fMode != newf.flags&fMode {
-			continue
-		}
-		if oldf.xmlns != "" && newf.xmlns != "" && oldf.xmlns != newf.xmlns {
-			continue
-		}
-		minl := min(len(newf.parents), len(oldf.parents))
-		for p := 0; p < minl; p++ {
-			if oldf.parents[p] != newf.parents[p] {
-				continue Loop
-			}
-		}
-		if len(oldf.parents) > len(newf.parents) {
-			if oldf.parents[len(newf.parents)] == newf.name {
-				conflicts = append(conflicts, i)
-			}
-		} else if len(oldf.parents) < len(newf.parents) {
-			if newf.parents[len(oldf.parents)] == oldf.name {
-				conflicts = append(conflicts, i)
-			}
-		} else {
-			if newf.name == oldf.name {
-				conflicts = append(conflicts, i)
-			}
-		}
-	}
-	// Without conflicts, add the new field and return.
-	if conflicts == nil {
-		tinfo.fields = append(tinfo.fields, *newf)
-		return nil
-	}
-
-	// If any conflict is shallower, ignore the new field.
-	// This matches the Go field resolution on embedding.
-	for _, i := range conflicts {
-		if len(tinfo.fields[i].idx) < len(newf.idx) {
-			return nil
-		}
-	}
-
-	// Otherwise, if any of them is at the same depth level, it's an error.
-	for _, i := range conflicts {
-		oldf := &tinfo.fields[i]
-		if len(oldf.idx) == len(newf.idx) {
-			f1 := typ.FieldByIndex(oldf.idx)
-			f2 := typ.FieldByIndex(newf.idx)
-			return &TagPathError{typ, f1.Name, f1.Tag.Get("xml"), f2.Name, f2.Tag.Get("xml")}
-		}
-	}
-
-	// Otherwise, the new field is shallower, and thus takes precedence,
-	// so drop the conflicting fields from tinfo and append the new one.
-	for c := len(conflicts) - 1; c >= 0; c-- {
-		i := conflicts[c]
-		copy(tinfo.fields[i:], tinfo.fields[i+1:])
-		tinfo.fields = tinfo.fields[:len(tinfo.fields)-1]
-	}
-	tinfo.fields = append(tinfo.fields, *newf)
-	return nil
-}
-
-// A TagPathError represents an error in the unmarshalling process
-// caused by the use of field tags with conflicting paths.
-type TagPathError struct {
-	Struct       reflect.Type
-	Field1, Tag1 string
-	Field2, Tag2 string
-}
-
-func (e *TagPathError) Error() string {
-	return fmt.Sprintf("%s field %q with tag %q conflicts with field %q with tag %q", e.Struct, e.Field1, e.Tag1, e.Field2, e.Tag2)
-}
-
-// value returns v's field value corresponding to finfo.
-// It's equivalent to v.FieldByIndex(finfo.idx), but initializes
-// and dereferences pointers as necessary.
-func (finfo *fieldInfo) value(v reflect.Value) reflect.Value {
-	for i, x := range finfo.idx {
-		if i > 0 {
-			t := v.Type()
-			if t.Kind() == reflect.Ptr && t.Elem().Kind() == reflect.Struct {
-				if v.IsNil() {
-					v.Set(reflect.New(v.Type().Elem()))
-				}
-				v = v.Elem()
-			}
-		}
-		v = v.Field(x)
-	}
-	return v
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/xml.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/xml.go
deleted file mode 100644
index 5b79cbecb4..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/xml.go
+++ /dev/null
@@ -1,1998 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package xml implements a simple XML 1.0 parser that
-// understands XML name spaces.
-package xml
-
-// References:
-//    Annotated XML spec: http://www.xml.com/axml/testaxml.htm
-//    XML name spaces: http://www.w3.org/TR/REC-xml-names/
-
-// TODO(rsc):
-//	Test error handling.
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-// A SyntaxError represents a syntax error in the XML input stream.
-type SyntaxError struct {
-	Msg  string
-	Line int
-}
-
-func (e *SyntaxError) Error() string {
-	return "XML syntax error on line " + strconv.Itoa(e.Line) + ": " + e.Msg
-}
-
-// A Name represents an XML name (Local) annotated with a name space
-// identifier (Space). In tokens returned by Decoder.Token, the Space
-// identifier is given as a canonical URL, not the short prefix used in
-// the document being parsed.
-//
-// As a special case, XML namespace declarations will use the literal
-// string "xmlns" for the Space field instead of the fully resolved URL.
-// See Encoder.EncodeToken for more information on namespace encoding
-// behaviour.
-type Name struct {
-	Space, Local string
-}
-
-// isNamespace reports whether the name is a namespace-defining name.
-func (name Name) isNamespace() bool {
-	return name.Local == "xmlns" || name.Space == "xmlns"
-}
-
-// An Attr represents an attribute in an XML element (Name=Value).
-type Attr struct {
-	Name  Name
-	Value string
-}
-
-// A Token is an interface holding one of the token types:
-// StartElement, EndElement, CharData, Comment, ProcInst, or Directive.
-type Token interface{}
-
-// A StartElement represents an XML start element.
-type StartElement struct {
-	Name Name
-	Attr []Attr
-}
-
-func (e StartElement) Copy() StartElement {
-	attrs := make([]Attr, len(e.Attr))
-	copy(attrs, e.Attr)
-	e.Attr = attrs
-	return e
-}
-
-// End returns the corresponding XML end element.
-func (e StartElement) End() EndElement {
-	return EndElement{e.Name}
-}
-
-// setDefaultNamespace sets the namespace of the element
-// as the default for all elements contained within it.
-func (e *StartElement) setDefaultNamespace() {
-	if e.Name.Space == "" {
-		// If there's no namespace on the element, don't
-		// set the default. Strictly speaking this might be wrong, as
-		// we can't tell if the element had no namespace set
-		// or was just using the default namespace.
-		return
-	}
-	// Don't add a default name space if there's already one set.
-	for _, attr := range e.Attr {
-		if attr.Name.Space == "" && attr.Name.Local == "xmlns" {
-			return
-		}
-	}
-	e.Attr = append(e.Attr, Attr{
-		Name: Name{
-			Local: "xmlns",
-		},
-		Value: e.Name.Space,
-	})
-}
-
-// An EndElement represents an XML end element.
-type EndElement struct {
-	Name Name
-}
-
-// A CharData represents XML character data (raw text),
-// in which XML escape sequences have been replaced by
-// the characters they represent.
-type CharData []byte
-
-func makeCopy(b []byte) []byte {
-	b1 := make([]byte, len(b))
-	copy(b1, b)
-	return b1
-}
-
-func (c CharData) Copy() CharData { return CharData(makeCopy(c)) }
-
-// A Comment represents an XML comment of the form <!--comment-->.
-// The bytes do not include the <!-- and --> comment markers.
-type Comment []byte
-
-func (c Comment) Copy() Comment { return Comment(makeCopy(c)) }
-
-// A ProcInst represents an XML processing instruction of the form <?target inst?>
-type ProcInst struct {
-	Target string
-	Inst   []byte
-}
-
-func (p ProcInst) Copy() ProcInst {
-	p.Inst = makeCopy(p.Inst)
-	return p
-}
-
-// A Directive represents an XML directive of the form <!text>.
-// The bytes do not include the <! and > markers.
-type Directive []byte
-
-func (d Directive) Copy() Directive { return Directive(makeCopy(d)) }
-
-// CopyToken returns a copy of a Token.
-func CopyToken(t Token) Token {
-	switch v := t.(type) {
-	case CharData:
-		return v.Copy()
-	case Comment:
-		return v.Copy()
-	case Directive:
-		return v.Copy()
-	case ProcInst:
-		return v.Copy()
-	case StartElement:
-		return v.Copy()
-	}
-	return t
-}
-
-// A Decoder represents an XML parser reading a particular input stream.
-// The parser assumes that its input is encoded in UTF-8.
-type Decoder struct {
-	// Strict defaults to true, enforcing the requirements
-	// of the XML specification.
-	// If set to false, the parser allows input containing common
-	// mistakes:
-	//	* If an element is missing an end tag, the parser invents
-	//	  end tags as necessary to keep the return values from Token
-	//	  properly balanced.
-	//	* In attribute values and character data, unknown or malformed
-	//	  character entities (sequences beginning with &) are left alone.
-	//
-	// Setting:
-	//
-	//	d.Strict = false;
-	//	d.AutoClose = HTMLAutoClose;
-	//	d.Entity = HTMLEntity
-	//
-	// creates a parser that can handle typical HTML.
-	//
-	// Strict mode does not enforce the requirements of the XML name spaces TR.
-	// In particular it does not reject name space tags using undefined prefixes.
-	// Such tags are recorded with the unknown prefix as the name space URL.
-	Strict bool
-
-	// When Strict == false, AutoClose indicates a set of elements to
-	// consider closed immediately after they are opened, regardless
-	// of whether an end element is present.
-	AutoClose []string
-
-	// Entity can be used to map non-standard entity names to string replacements.
-	// The parser behaves as if these standard mappings are present in the map,
-	// regardless of the actual map content:
-	//
-	//	"lt": "<",
-	//	"gt": ">",
-	//	"amp": "&",
-	//	"apos": "'",
-	//	"quot": `"`,
-	Entity map[string]string
-
-	// CharsetReader, if non-nil, defines a function to generate
-	// charset-conversion readers, converting from the provided
-	// non-UTF-8 charset into UTF-8. If CharsetReader is nil or
-	// returns an error, parsing stops with an error. One of the
-	// the CharsetReader's result values must be non-nil.
-	CharsetReader func(charset string, input io.Reader) (io.Reader, error)
-
-	// DefaultSpace sets the default name space used for unadorned tags,
-	// as if the entire XML stream were wrapped in an element containing
-	// the attribute xmlns="DefaultSpace".
-	DefaultSpace string
-
-	r              io.ByteReader
-	buf            bytes.Buffer
-	saved          *bytes.Buffer
-	stk            *stack
-	free           *stack
-	needClose      bool
-	toClose        Name
-	nextToken      Token
-	nextByte       int
-	ns             map[string]string
-	err            error
-	line           int
-	offset         int64
-	unmarshalDepth int
-}
-
-// NewDecoder creates a new XML parser reading from r.
-// If r does not implement io.ByteReader, NewDecoder will
-// do its own buffering.
-func NewDecoder(r io.Reader) *Decoder {
-	d := &Decoder{
-		ns:       make(map[string]string),
-		nextByte: -1,
-		line:     1,
-		Strict:   true,
-	}
-	d.switchToReader(r)
-	return d
-}
-
-// Token returns the next XML token in the input stream.
-// At the end of the input stream, Token returns nil, io.EOF.
-//
-// Slices of bytes in the returned token data refer to the
-// parser's internal buffer and remain valid only until the next
-// call to Token. To acquire a copy of the bytes, call CopyToken
-// or the token's Copy method.
-//
-// Token expands self-closing elements such as <br/>
-// into separate start and end elements returned by successive calls.
-//
-// Token guarantees that the StartElement and EndElement
-// tokens it returns are properly nested and matched:
-// if Token encounters an unexpected end element,
-// it will return an error.
-//
-// Token implements XML name spaces as described by
-// http://www.w3.org/TR/REC-xml-names/.  Each of the
-// Name structures contained in the Token has the Space
-// set to the URL identifying its name space when known.
-// If Token encounters an unrecognized name space prefix,
-// it uses the prefix as the Space rather than report an error.
-func (d *Decoder) Token() (t Token, err error) {
-	if d.stk != nil && d.stk.kind == stkEOF {
-		err = io.EOF
-		return
-	}
-	if d.nextToken != nil {
-		t = d.nextToken
-		d.nextToken = nil
-	} else if t, err = d.rawToken(); err != nil {
-		return
-	}
-
-	if !d.Strict {
-		if t1, ok := d.autoClose(t); ok {
-			d.nextToken = t
-			t = t1
-		}
-	}
-	switch t1 := t.(type) {
-	case StartElement:
-		// In XML name spaces, the translations listed in the
-		// attributes apply to the element name and
-		// to the other attribute names, so process
-		// the translations first.
-		for _, a := range t1.Attr {
-			if a.Name.Space == "xmlns" {
-				v, ok := d.ns[a.Name.Local]
-				d.pushNs(a.Name.Local, v, ok)
-				d.ns[a.Name.Local] = a.Value
-			}
-			if a.Name.Space == "" && a.Name.Local == "xmlns" {
-				// Default space for untagged names
-				v, ok := d.ns[""]
-				d.pushNs("", v, ok)
-				d.ns[""] = a.Value
-			}
-		}
-
-		d.translate(&t1.Name, true)
-		for i := range t1.Attr {
-			d.translate(&t1.Attr[i].Name, false)
-		}
-		d.pushElement(t1.Name)
-		t = t1
-
-	case EndElement:
-		d.translate(&t1.Name, true)
-		if !d.popElement(&t1) {
-			return nil, d.err
-		}
-		t = t1
-	}
-	return
-}
-
-const xmlURL = "http://www.w3.org/XML/1998/namespace"
-
-// Apply name space translation to name n.
-// The default name space (for Space=="")
-// applies only to element names, not to attribute names.
-func (d *Decoder) translate(n *Name, isElementName bool) {
-	switch {
-	case n.Space == "xmlns":
-		return
-	case n.Space == "" && !isElementName:
-		return
-	case n.Space == "xml":
-		n.Space = xmlURL
-	case n.Space == "" && n.Local == "xmlns":
-		return
-	}
-	if v, ok := d.ns[n.Space]; ok {
-		n.Space = v
-	} else if n.Space == "" {
-		n.Space = d.DefaultSpace
-	}
-}
-
-func (d *Decoder) switchToReader(r io.Reader) {
-	// Get efficient byte at a time reader.
-	// Assume that if reader has its own
-	// ReadByte, it's efficient enough.
-	// Otherwise, use bufio.
-	if rb, ok := r.(io.ByteReader); ok {
-		d.r = rb
-	} else {
-		d.r = bufio.NewReader(r)
-	}
-}
-
-// Parsing state - stack holds old name space translations
-// and the current set of open elements. The translations to pop when
-// ending a given tag are *below* it on the stack, which is
-// more work but forced on us by XML.
-type stack struct {
-	next *stack
-	kind int
-	name Name
-	ok   bool
-}
-
-const (
-	stkStart = iota
-	stkNs
-	stkEOF
-)
-
-func (d *Decoder) push(kind int) *stack {
-	s := d.free
-	if s != nil {
-		d.free = s.next
-	} else {
-		s = new(stack)
-	}
-	s.next = d.stk
-	s.kind = kind
-	d.stk = s
-	return s
-}
-
-func (d *Decoder) pop() *stack {
-	s := d.stk
-	if s != nil {
-		d.stk = s.next
-		s.next = d.free
-		d.free = s
-	}
-	return s
-}
-
-// Record that after the current element is finished
-// (that element is already pushed on the stack)
-// Token should return EOF until popEOF is called.
-func (d *Decoder) pushEOF() {
-	// Walk down stack to find Start.
-	// It might not be the top, because there might be stkNs
-	// entries above it.
-	start := d.stk
-	for start.kind != stkStart {
-		start = start.next
-	}
-	// The stkNs entries below a start are associated with that
-	// element too; skip over them.
-	for start.next != nil && start.next.kind == stkNs {
-		start = start.next
-	}
-	s := d.free
-	if s != nil {
-		d.free = s.next
-	} else {
-		s = new(stack)
-	}
-	s.kind = stkEOF
-	s.next = start.next
-	start.next = s
-}
-
-// Undo a pushEOF.
-// The element must have been finished, so the EOF should be at the top of the stack.
-func (d *Decoder) popEOF() bool {
-	if d.stk == nil || d.stk.kind != stkEOF {
-		return false
-	}
-	d.pop()
-	return true
-}
-
-// Record that we are starting an element with the given name.
-func (d *Decoder) pushElement(name Name) {
-	s := d.push(stkStart)
-	s.name = name
-}
-
-// Record that we are changing the value of ns[local].
-// The old value is url, ok.
-func (d *Decoder) pushNs(local string, url string, ok bool) {
-	s := d.push(stkNs)
-	s.name.Local = local
-	s.name.Space = url
-	s.ok = ok
-}
-
-// Creates a SyntaxError with the current line number.
-func (d *Decoder) syntaxError(msg string) error {
-	return &SyntaxError{Msg: msg, Line: d.line}
-}
-
-// Record that we are ending an element with the given name.
-// The name must match the record at the top of the stack,
-// which must be a pushElement record.
-// After popping the element, apply any undo records from
-// the stack to restore the name translations that existed
-// before we saw this element.
-func (d *Decoder) popElement(t *EndElement) bool {
-	s := d.pop()
-	name := t.Name
-	switch {
-	case s == nil || s.kind != stkStart:
-		d.err = d.syntaxError("unexpected end element </" + name.Local + ">")
-		return false
-	case s.name.Local != name.Local:
-		if !d.Strict {
-			d.needClose = true
-			d.toClose = t.Name
-			t.Name = s.name
-			return true
-		}
-		d.err = d.syntaxError("element <" + s.name.Local + "> closed by </" + name.Local + ">")
-		return false
-	case s.name.Space != name.Space:
-		d.err = d.syntaxError("element <" + s.name.Local + "> in space " + s.name.Space +
-			"closed by </" + name.Local + "> in space " + name.Space)
-		return false
-	}
-
-	// Pop stack until a Start or EOF is on the top, undoing the
-	// translations that were associated with the element we just closed.
-	for d.stk != nil && d.stk.kind != stkStart && d.stk.kind != stkEOF {
-		s := d.pop()
-		if s.ok {
-			d.ns[s.name.Local] = s.name.Space
-		} else {
-			delete(d.ns, s.name.Local)
-		}
-	}
-
-	return true
-}
-
-// If the top element on the stack is autoclosing and
-// t is not the end tag, invent the end tag.
-func (d *Decoder) autoClose(t Token) (Token, bool) {
-	if d.stk == nil || d.stk.kind != stkStart {
-		return nil, false
-	}
-	name := strings.ToLower(d.stk.name.Local)
-	for _, s := range d.AutoClose {
-		if strings.ToLower(s) == name {
-			// This one should be auto closed if t doesn't close it.
-			et, ok := t.(EndElement)
-			if !ok || et.Name.Local != name {
-				return EndElement{d.stk.name}, true
-			}
-			break
-		}
-	}
-	return nil, false
-}
-
-var errRawToken = errors.New("xml: cannot use RawToken from UnmarshalXML method")
-
-// RawToken is like Token but does not verify that
-// start and end elements match and does not translate
-// name space prefixes to their corresponding URLs.
-func (d *Decoder) RawToken() (Token, error) {
-	if d.unmarshalDepth > 0 {
-		return nil, errRawToken
-	}
-	return d.rawToken()
-}
-
-func (d *Decoder) rawToken() (Token, error) {
-	if d.err != nil {
-		return nil, d.err
-	}
-	if d.needClose {
-		// The last element we read was self-closing and
-		// we returned just the StartElement half.
-		// Return the EndElement half now.
-		d.needClose = false
-		return EndElement{d.toClose}, nil
-	}
-
-	b, ok := d.getc()
-	if !ok {
-		return nil, d.err
-	}
-
-	if b != '<' {
-		// Text section.
-		d.ungetc(b)
-		data := d.text(-1, false)
-		if data == nil {
-			return nil, d.err
-		}
-		return CharData(data), nil
-	}
-
-	if b, ok = d.mustgetc(); !ok {
-		return nil, d.err
-	}
-	switch b {
-	case '/':
-		// </: End element
-		var name Name
-		if name, ok = d.nsname(); !ok {
-			if d.err == nil {
-				d.err = d.syntaxError("expected element name after </")
-			}
-			return nil, d.err
-		}
-		d.space()
-		if b, ok = d.mustgetc(); !ok {
-			return nil, d.err
-		}
-		if b != '>' {
-			d.err = d.syntaxError("invalid characters between </" + name.Local + " and >")
-			return nil, d.err
-		}
-		return EndElement{name}, nil
-
-	case '?':
-		// <?: Processing instruction.
-		var target string
-		if target, ok = d.name(); !ok {
-			if d.err == nil {
-				d.err = d.syntaxError("expected target name after <?")
-			}
-			return nil, d.err
-		}
-		d.space()
-		d.buf.Reset()
-		var b0 byte
-		for {
-			if b, ok = d.mustgetc(); !ok {
-				return nil, d.err
-			}
-			d.buf.WriteByte(b)
-			if b0 == '?' && b == '>' {
-				break
-			}
-			b0 = b
-		}
-		data := d.buf.Bytes()
-		data = data[0 : len(data)-2] // chop ?>
-
-		if target == "xml" {
-			content := string(data)
-			ver := procInst("version", content)
-			if ver != "" && ver != "1.0" {
-				d.err = fmt.Errorf("xml: unsupported version %q; only version 1.0 is supported", ver)
-				return nil, d.err
-			}
-			enc := procInst("encoding", content)
-			if enc != "" && enc != "utf-8" && enc != "UTF-8" {
-				if d.CharsetReader == nil {
-					d.err = fmt.Errorf("xml: encoding %q declared but Decoder.CharsetReader is nil", enc)
-					return nil, d.err
-				}
-				newr, err := d.CharsetReader(enc, d.r.(io.Reader))
-				if err != nil {
-					d.err = fmt.Errorf("xml: opening charset %q: %v", enc, err)
-					return nil, d.err
-				}
-				if newr == nil {
-					panic("CharsetReader returned a nil Reader for charset " + enc)
-				}
-				d.switchToReader(newr)
-			}
-		}
-		return ProcInst{target, data}, nil
-
-	case '!':
-		// <!: Maybe comment, maybe CDATA.
-		if b, ok = d.mustgetc(); !ok {
-			return nil, d.err
-		}
-		switch b {
-		case '-': // <!-
-			// Probably <!-- for a comment.
-			if b, ok = d.mustgetc(); !ok {
-				return nil, d.err
-			}
-			if b != '-' {
-				d.err = d.syntaxError("invalid sequence <!- not part of <!--")
-				return nil, d.err
-			}
-			// Look for terminator.
-			d.buf.Reset()
-			var b0, b1 byte
-			for {
-				if b, ok = d.mustgetc(); !ok {
-					return nil, d.err
-				}
-				d.buf.WriteByte(b)
-				if b0 == '-' && b1 == '-' && b == '>' {
-					break
-				}
-				b0, b1 = b1, b
-			}
-			data := d.buf.Bytes()
-			data = data[0 : len(data)-3] // chop -->
-			return Comment(data), nil
-
-		case '[': // <![
-			// Probably <![CDATA[.
-			for i := 0; i < 6; i++ {
-				if b, ok = d.mustgetc(); !ok {
-					return nil, d.err
-				}
-				if b != "CDATA["[i] {
-					d.err = d.syntaxError("invalid <![ sequence")
-					return nil, d.err
-				}
-			}
-			// Have <![CDATA[.  Read text until ]]>.
-			data := d.text(-1, true)
-			if data == nil {
-				return nil, d.err
-			}
-			return CharData(data), nil
-		}
-
-		// Probably a directive: <!DOCTYPE ...>, <!ENTITY ...>, etc.
-		// We don't care, but accumulate for caller. Quoted angle
-		// brackets do not count for nesting.
-		d.buf.Reset()
-		d.buf.WriteByte(b)
-		inquote := uint8(0)
-		depth := 0
-		for {
-			if b, ok = d.mustgetc(); !ok {
-				return nil, d.err
-			}
-			if inquote == 0 && b == '>' && depth == 0 {
-				break
-			}
-		HandleB:
-			d.buf.WriteByte(b)
-			switch {
-			case b == inquote:
-				inquote = 0
-
-			case inquote != 0:
-				// in quotes, no special action
-
-			case b == '\'' || b == '"':
-				inquote = b
-
-			case b == '>' && inquote == 0:
-				depth--
-
-			case b == '<' && inquote == 0:
-				// Look for <!-- to begin comment.
-				s := "!--"
-				for i := 0; i < len(s); i++ {
-					if b, ok = d.mustgetc(); !ok {
-						return nil, d.err
-					}
-					if b != s[i] {
-						for j := 0; j < i; j++ {
-							d.buf.WriteByte(s[j])
-						}
-						depth++
-						goto HandleB
-					}
-				}
-
-				// Remove < that was written above.
-				d.buf.Truncate(d.buf.Len() - 1)
-
-				// Look for terminator.
-				var b0, b1 byte
-				for {
-					if b, ok = d.mustgetc(); !ok {
-						return nil, d.err
-					}
-					if b0 == '-' && b1 == '-' && b == '>' {
-						break
-					}
-					b0, b1 = b1, b
-				}
-			}
-		}
-		return Directive(d.buf.Bytes()), nil
-	}
-
-	// Must be an open element like <a href="foo">
-	d.ungetc(b)
-
-	var (
-		name  Name
-		empty bool
-		attr  []Attr
-	)
-	if name, ok = d.nsname(); !ok {
-		if d.err == nil {
-			d.err = d.syntaxError("expected element name after <")
-		}
-		return nil, d.err
-	}
-
-	attr = []Attr{}
-	for {
-		d.space()
-		if b, ok = d.mustgetc(); !ok {
-			return nil, d.err
-		}
-		if b == '/' {
-			empty = true
-			if b, ok = d.mustgetc(); !ok {
-				return nil, d.err
-			}
-			if b != '>' {
-				d.err = d.syntaxError("expected /> in element")
-				return nil, d.err
-			}
-			break
-		}
-		if b == '>' {
-			break
-		}
-		d.ungetc(b)
-
-		n := len(attr)
-		if n >= cap(attr) {
-			nCap := 2 * cap(attr)
-			if nCap == 0 {
-				nCap = 4
-			}
-			nattr := make([]Attr, n, nCap)
-			copy(nattr, attr)
-			attr = nattr
-		}
-		attr = attr[0 : n+1]
-		a := &attr[n]
-		if a.Name, ok = d.nsname(); !ok {
-			if d.err == nil {
-				d.err = d.syntaxError("expected attribute name in element")
-			}
-			return nil, d.err
-		}
-		d.space()
-		if b, ok = d.mustgetc(); !ok {
-			return nil, d.err
-		}
-		if b != '=' {
-			if d.Strict {
-				d.err = d.syntaxError("attribute name without = in element")
-				return nil, d.err
-			} else {
-				d.ungetc(b)
-				a.Value = a.Name.Local
-			}
-		} else {
-			d.space()
-			data := d.attrval()
-			if data == nil {
-				return nil, d.err
-			}
-			a.Value = string(data)
-		}
-	}
-	if empty {
-		d.needClose = true
-		d.toClose = name
-	}
-	return StartElement{name, attr}, nil
-}
-
-func (d *Decoder) attrval() []byte {
-	b, ok := d.mustgetc()
-	if !ok {
-		return nil
-	}
-	// Handle quoted attribute values
-	if b == '"' || b == '\'' {
-		return d.text(int(b), false)
-	}
-	// Handle unquoted attribute values for strict parsers
-	if d.Strict {
-		d.err = d.syntaxError("unquoted or missing attribute value in element")
-		return nil
-	}
-	// Handle unquoted attribute values for unstrict parsers
-	d.ungetc(b)
-	d.buf.Reset()
-	for {
-		b, ok = d.mustgetc()
-		if !ok {
-			return nil
-		}
-		// http://www.w3.org/TR/REC-html40/intro/sgmltut.html#h-3.2.2
-		if 'a' <= b && b <= 'z' || 'A' <= b && b <= 'Z' ||
-			'0' <= b && b <= '9' || b == '_' || b == ':' || b == '-' {
-			d.buf.WriteByte(b)
-		} else {
-			d.ungetc(b)
-			break
-		}
-	}
-	return d.buf.Bytes()
-}
-
-// Skip spaces if any
-func (d *Decoder) space() {
-	for {
-		b, ok := d.getc()
-		if !ok {
-			return
-		}
-		switch b {
-		case ' ', '\r', '\n', '\t':
-		default:
-			d.ungetc(b)
-			return
-		}
-	}
-}
-
-// Read a single byte.
-// If there is no byte to read, return ok==false
-// and leave the error in d.err.
-// Maintain line number.
-func (d *Decoder) getc() (b byte, ok bool) {
-	if d.err != nil {
-		return 0, false
-	}
-	if d.nextByte >= 0 {
-		b = byte(d.nextByte)
-		d.nextByte = -1
-	} else {
-		b, d.err = d.r.ReadByte()
-		if d.err != nil {
-			return 0, false
-		}
-		if d.saved != nil {
-			d.saved.WriteByte(b)
-		}
-	}
-	if b == '\n' {
-		d.line++
-	}
-	d.offset++
-	return b, true
-}
-
-// InputOffset returns the input stream byte offset of the current decoder position.
-// The offset gives the location of the end of the most recently returned token
-// and the beginning of the next token.
-func (d *Decoder) InputOffset() int64 {
-	return d.offset
-}
-
-// Return saved offset.
-// If we did ungetc (nextByte >= 0), have to back up one.
-func (d *Decoder) savedOffset() int {
-	n := d.saved.Len()
-	if d.nextByte >= 0 {
-		n--
-	}
-	return n
-}
-
-// Must read a single byte.
-// If there is no byte to read,
-// set d.err to SyntaxError("unexpected EOF")
-// and return ok==false
-func (d *Decoder) mustgetc() (b byte, ok bool) {
-	if b, ok = d.getc(); !ok {
-		if d.err == io.EOF {
-			d.err = d.syntaxError("unexpected EOF")
-		}
-	}
-	return
-}
-
-// Unread a single byte.
-func (d *Decoder) ungetc(b byte) {
-	if b == '\n' {
-		d.line--
-	}
-	d.nextByte = int(b)
-	d.offset--
-}
-
-var entity = map[string]int{
-	"lt":   '<',
-	"gt":   '>',
-	"amp":  '&',
-	"apos": '\'',
-	"quot": '"',
-}
-
-// Read plain text section (XML calls it character data).
-// If quote >= 0, we are in a quoted string and need to find the matching quote.
-// If cdata == true, we are in a <![CDATA[ section and need to find ]]>.
-// On failure return nil and leave the error in d.err.
-func (d *Decoder) text(quote int, cdata bool) []byte {
-	var b0, b1 byte
-	var trunc int
-	d.buf.Reset()
-Input:
-	for {
-		b, ok := d.getc()
-		if !ok {
-			if cdata {
-				if d.err == io.EOF {
-					d.err = d.syntaxError("unexpected EOF in CDATA section")
-				}
-				return nil
-			}
-			break Input
-		}
-
-		// <![CDATA[ section ends with ]]>.
-		// It is an error for ]]> to appear in ordinary text.
-		if b0 == ']' && b1 == ']' && b == '>' {
-			if cdata {
-				trunc = 2
-				break Input
-			}
-			d.err = d.syntaxError("unescaped ]]> not in CDATA section")
-			return nil
-		}
-
-		// Stop reading text if we see a <.
-		if b == '<' && !cdata {
-			if quote >= 0 {
-				d.err = d.syntaxError("unescaped < inside quoted string")
-				return nil
-			}
-			d.ungetc('<')
-			break Input
-		}
-		if quote >= 0 && b == byte(quote) {
-			break Input
-		}
-		if b == '&' && !cdata {
-			// Read escaped character expression up to semicolon.
-			// XML in all its glory allows a document to define and use
-			// its own character names with <!ENTITY ...> directives.
-			// Parsers are required to recognize lt, gt, amp, apos, and quot
-			// even if they have not been declared.
-			before := d.buf.Len()
-			d.buf.WriteByte('&')
-			var ok bool
-			var text string
-			var haveText bool
-			if b, ok = d.mustgetc(); !ok {
-				return nil
-			}
-			if b == '#' {
-				d.buf.WriteByte(b)
-				if b, ok = d.mustgetc(); !ok {
-					return nil
-				}
-				base := 10
-				if b == 'x' {
-					base = 16
-					d.buf.WriteByte(b)
-					if b, ok = d.mustgetc(); !ok {
-						return nil
-					}
-				}
-				start := d.buf.Len()
-				for '0' <= b && b <= '9' ||
-					base == 16 && 'a' <= b && b <= 'f' ||
-					base == 16 && 'A' <= b && b <= 'F' {
-					d.buf.WriteByte(b)
-					if b, ok = d.mustgetc(); !ok {
-						return nil
-					}
-				}
-				if b != ';' {
-					d.ungetc(b)
-				} else {
-					s := string(d.buf.Bytes()[start:])
-					d.buf.WriteByte(';')
-					n, err := strconv.ParseUint(s, base, 64)
-					if err == nil && n <= unicode.MaxRune {
-						text = string(n)
-						haveText = true
-					}
-				}
-			} else {
-				d.ungetc(b)
-				if !d.readName() {
-					if d.err != nil {
-						return nil
-					}
-					ok = false
-				}
-				if b, ok = d.mustgetc(); !ok {
-					return nil
-				}
-				if b != ';' {
-					d.ungetc(b)
-				} else {
-					name := d.buf.Bytes()[before+1:]
-					d.buf.WriteByte(';')
-					if isName(name) {
-						s := string(name)
-						if r, ok := entity[s]; ok {
-							text = string(r)
-							haveText = true
-						} else if d.Entity != nil {
-							text, haveText = d.Entity[s]
-						}
-					}
-				}
-			}
-
-			if haveText {
-				d.buf.Truncate(before)
-				d.buf.Write([]byte(text))
-				b0, b1 = 0, 0
-				continue Input
-			}
-			if !d.Strict {
-				b0, b1 = 0, 0
-				continue Input
-			}
-			ent := string(d.buf.Bytes()[before:])
-			if ent[len(ent)-1] != ';' {
-				ent += " (no semicolon)"
-			}
-			d.err = d.syntaxError("invalid character entity " + ent)
-			return nil
-		}
-
-		// We must rewrite unescaped \r and \r\n into \n.
-		if b == '\r' {
-			d.buf.WriteByte('\n')
-		} else if b1 == '\r' && b == '\n' {
-			// Skip \r\n--we already wrote \n.
-		} else {
-			d.buf.WriteByte(b)
-		}
-
-		b0, b1 = b1, b
-	}
-	data := d.buf.Bytes()
-	data = data[0 : len(data)-trunc]
-
-	// Inspect each rune for being a disallowed character.
-	buf := data
-	for len(buf) > 0 {
-		r, size := utf8.DecodeRune(buf)
-		if r == utf8.RuneError && size == 1 {
-			d.err = d.syntaxError("invalid UTF-8")
-			return nil
-		}
-		buf = buf[size:]
-		if !isInCharacterRange(r) {
-			d.err = d.syntaxError(fmt.Sprintf("illegal character code %U", r))
-			return nil
-		}
-	}
-
-	return data
-}
-
-// Decide whether the given rune is in the XML Character Range, per
-// the Char production of http://www.xml.com/axml/testaxml.htm,
-// Section 2.2 Characters.
-func isInCharacterRange(r rune) (inrange bool) {
-	return r == 0x09 ||
-		r == 0x0A ||
-		r == 0x0D ||
-		r >= 0x20 && r <= 0xDF77 ||
-		r >= 0xE000 && r <= 0xFFFD ||
-		r >= 0x10000 && r <= 0x10FFFF
-}
-
-// Get name space name: name with a : stuck in the middle.
-// The part before the : is the name space identifier.
-func (d *Decoder) nsname() (name Name, ok bool) {
-	s, ok := d.name()
-	if !ok {
-		return
-	}
-	i := strings.Index(s, ":")
-	if i < 0 {
-		name.Local = s
-	} else {
-		name.Space = s[0:i]
-		name.Local = s[i+1:]
-	}
-	return name, true
-}
-
-// Get name: /first(first|second)*/
-// Do not set d.err if the name is missing (unless unexpected EOF is received):
-// let the caller provide better context.
-func (d *Decoder) name() (s string, ok bool) {
-	d.buf.Reset()
-	if !d.readName() {
-		return "", false
-	}
-
-	// Now we check the characters.
-	b := d.buf.Bytes()
-	if !isName(b) {
-		d.err = d.syntaxError("invalid XML name: " + string(b))
-		return "", false
-	}
-	return string(b), true
-}
-
-// Read a name and append its bytes to d.buf.
-// The name is delimited by any single-byte character not valid in names.
-// All multi-byte characters are accepted; the caller must check their validity.
-func (d *Decoder) readName() (ok bool) {
-	var b byte
-	if b, ok = d.mustgetc(); !ok {
-		return
-	}
-	if b < utf8.RuneSelf && !isNameByte(b) {
-		d.ungetc(b)
-		return false
-	}
-	d.buf.WriteByte(b)
-
-	for {
-		if b, ok = d.mustgetc(); !ok {
-			return
-		}
-		if b < utf8.RuneSelf && !isNameByte(b) {
-			d.ungetc(b)
-			break
-		}
-		d.buf.WriteByte(b)
-	}
-	return true
-}
-
-func isNameByte(c byte) bool {
-	return 'A' <= c && c <= 'Z' ||
-		'a' <= c && c <= 'z' ||
-		'0' <= c && c <= '9' ||
-		c == '_' || c == ':' || c == '.' || c == '-'
-}
-
-func isName(s []byte) bool {
-	if len(s) == 0 {
-		return false
-	}
-	c, n := utf8.DecodeRune(s)
-	if c == utf8.RuneError && n == 1 {
-		return false
-	}
-	if !unicode.Is(first, c) {
-		return false
-	}
-	for n < len(s) {
-		s = s[n:]
-		c, n = utf8.DecodeRune(s)
-		if c == utf8.RuneError && n == 1 {
-			return false
-		}
-		if !unicode.Is(first, c) && !unicode.Is(second, c) {
-			return false
-		}
-	}
-	return true
-}
-
-func isNameString(s string) bool {
-	if len(s) == 0 {
-		return false
-	}
-	c, n := utf8.DecodeRuneInString(s)
-	if c == utf8.RuneError && n == 1 {
-		return false
-	}
-	if !unicode.Is(first, c) {
-		return false
-	}
-	for n < len(s) {
-		s = s[n:]
-		c, n = utf8.DecodeRuneInString(s)
-		if c == utf8.RuneError && n == 1 {
-			return false
-		}
-		if !unicode.Is(first, c) && !unicode.Is(second, c) {
-			return false
-		}
-	}
-	return true
-}
-
-// These tables were generated by cut and paste from Appendix B of
-// the XML spec at http://www.xml.com/axml/testaxml.htm
-// and then reformatting. First corresponds to (Letter | '_' | ':')
-// and second corresponds to NameChar.
-
-var first = &unicode.RangeTable{
-	R16: []unicode.Range16{
-		{0x003A, 0x003A, 1},
-		{0x0041, 0x005A, 1},
-		{0x005F, 0x005F, 1},
-		{0x0061, 0x007A, 1},
-		{0x00C0, 0x00D6, 1},
-		{0x00D8, 0x00F6, 1},
-		{0x00F8, 0x00FF, 1},
-		{0x0100, 0x0131, 1},
-		{0x0134, 0x013E, 1},
-		{0x0141, 0x0148, 1},
-		{0x014A, 0x017E, 1},
-		{0x0180, 0x01C3, 1},
-		{0x01CD, 0x01F0, 1},
-		{0x01F4, 0x01F5, 1},
-		{0x01FA, 0x0217, 1},
-		{0x0250, 0x02A8, 1},
-		{0x02BB, 0x02C1, 1},
-		{0x0386, 0x0386, 1},
-		{0x0388, 0x038A, 1},
-		{0x038C, 0x038C, 1},
-		{0x038E, 0x03A1, 1},
-		{0x03A3, 0x03CE, 1},
-		{0x03D0, 0x03D6, 1},
-		{0x03DA, 0x03E0, 2},
-		{0x03E2, 0x03F3, 1},
-		{0x0401, 0x040C, 1},
-		{0x040E, 0x044F, 1},
-		{0x0451, 0x045C, 1},
-		{0x045E, 0x0481, 1},
-		{0x0490, 0x04C4, 1},
-		{0x04C7, 0x04C8, 1},
-		{0x04CB, 0x04CC, 1},
-		{0x04D0, 0x04EB, 1},
-		{0x04EE, 0x04F5, 1},
-		{0x04F8, 0x04F9, 1},
-		{0x0531, 0x0556, 1},
-		{0x0559, 0x0559, 1},
-		{0x0561, 0x0586, 1},
-		{0x05D0, 0x05EA, 1},
-		{0x05F0, 0x05F2, 1},
-		{0x0621, 0x063A, 1},
-		{0x0641, 0x064A, 1},
-		{0x0671, 0x06B7, 1},
-		{0x06BA, 0x06BE, 1},
-		{0x06C0, 0x06CE, 1},
-		{0x06D0, 0x06D3, 1},
-		{0x06D5, 0x06D5, 1},
-		{0x06E5, 0x06E6, 1},
-		{0x0905, 0x0939, 1},
-		{0x093D, 0x093D, 1},
-		{0x0958, 0x0961, 1},
-		{0x0985, 0x098C, 1},
-		{0x098F, 0x0990, 1},
-		{0x0993, 0x09A8, 1},
-		{0x09AA, 0x09B0, 1},
-		{0x09B2, 0x09B2, 1},
-		{0x09B6, 0x09B9, 1},
-		{0x09DC, 0x09DD, 1},
-		{0x09DF, 0x09E1, 1},
-		{0x09F0, 0x09F1, 1},
-		{0x0A05, 0x0A0A, 1},
-		{0x0A0F, 0x0A10, 1},
-		{0x0A13, 0x0A28, 1},
-		{0x0A2A, 0x0A30, 1},
-		{0x0A32, 0x0A33, 1},
-		{0x0A35, 0x0A36, 1},
-		{0x0A38, 0x0A39, 1},
-		{0x0A59, 0x0A5C, 1},
-		{0x0A5E, 0x0A5E, 1},
-		{0x0A72, 0x0A74, 1},
-		{0x0A85, 0x0A8B, 1},
-		{0x0A8D, 0x0A8D, 1},
-		{0x0A8F, 0x0A91, 1},
-		{0x0A93, 0x0AA8, 1},
-		{0x0AAA, 0x0AB0, 1},
-		{0x0AB2, 0x0AB3, 1},
-		{0x0AB5, 0x0AB9, 1},
-		{0x0ABD, 0x0AE0, 0x23},
-		{0x0B05, 0x0B0C, 1},
-		{0x0B0F, 0x0B10, 1},
-		{0x0B13, 0x0B28, 1},
-		{0x0B2A, 0x0B30, 1},
-		{0x0B32, 0x0B33, 1},
-		{0x0B36, 0x0B39, 1},
-		{0x0B3D, 0x0B3D, 1},
-		{0x0B5C, 0x0B5D, 1},
-		{0x0B5F, 0x0B61, 1},
-		{0x0B85, 0x0B8A, 1},
-		{0x0B8E, 0x0B90, 1},
-		{0x0B92, 0x0B95, 1},
-		{0x0B99, 0x0B9A, 1},
-		{0x0B9C, 0x0B9C, 1},
-		{0x0B9E, 0x0B9F, 1},
-		{0x0BA3, 0x0BA4, 1},
-		{0x0BA8, 0x0BAA, 1},
-		{0x0BAE, 0x0BB5, 1},
-		{0x0BB7, 0x0BB9, 1},
-		{0x0C05, 0x0C0C, 1},
-		{0x0C0E, 0x0C10, 1},
-		{0x0C12, 0x0C28, 1},
-		{0x0C2A, 0x0C33, 1},
-		{0x0C35, 0x0C39, 1},
-		{0x0C60, 0x0C61, 1},
-		{0x0C85, 0x0C8C, 1},
-		{0x0C8E, 0x0C90, 1},
-		{0x0C92, 0x0CA8, 1},
-		{0x0CAA, 0x0CB3, 1},
-		{0x0CB5, 0x0CB9, 1},
-		{0x0CDE, 0x0CDE, 1},
-		{0x0CE0, 0x0CE1, 1},
-		{0x0D05, 0x0D0C, 1},
-		{0x0D0E, 0x0D10, 1},
-		{0x0D12, 0x0D28, 1},
-		{0x0D2A, 0x0D39, 1},
-		{0x0D60, 0x0D61, 1},
-		{0x0E01, 0x0E2E, 1},
-		{0x0E30, 0x0E30, 1},
-		{0x0E32, 0x0E33, 1},
-		{0x0E40, 0x0E45, 1},
-		{0x0E81, 0x0E82, 1},
-		{0x0E84, 0x0E84, 1},
-		{0x0E87, 0x0E88, 1},
-		{0x0E8A, 0x0E8D, 3},
-		{0x0E94, 0x0E97, 1},
-		{0x0E99, 0x0E9F, 1},
-		{0x0EA1, 0x0EA3, 1},
-		{0x0EA5, 0x0EA7, 2},
-		{0x0EAA, 0x0EAB, 1},
-		{0x0EAD, 0x0EAE, 1},
-		{0x0EB0, 0x0EB0, 1},
-		{0x0EB2, 0x0EB3, 1},
-		{0x0EBD, 0x0EBD, 1},
-		{0x0EC0, 0x0EC4, 1},
-		{0x0F40, 0x0F47, 1},
-		{0x0F49, 0x0F69, 1},
-		{0x10A0, 0x10C5, 1},
-		{0x10D0, 0x10F6, 1},
-		{0x1100, 0x1100, 1},
-		{0x1102, 0x1103, 1},
-		{0x1105, 0x1107, 1},
-		{0x1109, 0x1109, 1},
-		{0x110B, 0x110C, 1},
-		{0x110E, 0x1112, 1},
-		{0x113C, 0x1140, 2},
-		{0x114C, 0x1150, 2},
-		{0x1154, 0x1155, 1},
-		{0x1159, 0x1159, 1},
-		{0x115F, 0x1161, 1},
-		{0x1163, 0x1169, 2},
-		{0x116D, 0x116E, 1},
-		{0x1172, 0x1173, 1},
-		{0x1175, 0x119E, 0x119E - 0x1175},
-		{0x11A8, 0x11AB, 0x11AB - 0x11A8},
-		{0x11AE, 0x11AF, 1},
-		{0x11B7, 0x11B8, 1},
-		{0x11BA, 0x11BA, 1},
-		{0x11BC, 0x11C2, 1},
-		{0x11EB, 0x11F0, 0x11F0 - 0x11EB},
-		{0x11F9, 0x11F9, 1},
-		{0x1E00, 0x1E9B, 1},
-		{0x1EA0, 0x1EF9, 1},
-		{0x1F00, 0x1F15, 1},
-		{0x1F18, 0x1F1D, 1},
-		{0x1F20, 0x1F45, 1},
-		{0x1F48, 0x1F4D, 1},
-		{0x1F50, 0x1F57, 1},
-		{0x1F59, 0x1F5B, 0x1F5B - 0x1F59},
-		{0x1F5D, 0x1F5D, 1},
-		{0x1F5F, 0x1F7D, 1},
-		{0x1F80, 0x1FB4, 1},
-		{0x1FB6, 0x1FBC, 1},
-		{0x1FBE, 0x1FBE, 1},
-		{0x1FC2, 0x1FC4, 1},
-		{0x1FC6, 0x1FCC, 1},
-		{0x1FD0, 0x1FD3, 1},
-		{0x1FD6, 0x1FDB, 1},
-		{0x1FE0, 0x1FEC, 1},
-		{0x1FF2, 0x1FF4, 1},
-		{0x1FF6, 0x1FFC, 1},
-		{0x2126, 0x2126, 1},
-		{0x212A, 0x212B, 1},
-		{0x212E, 0x212E, 1},
-		{0x2180, 0x2182, 1},
-		{0x3007, 0x3007, 1},
-		{0x3021, 0x3029, 1},
-		{0x3041, 0x3094, 1},
-		{0x30A1, 0x30FA, 1},
-		{0x3105, 0x312C, 1},
-		{0x4E00, 0x9FA5, 1},
-		{0xAC00, 0xD7A3, 1},
-	},
-}
-
-var second = &unicode.RangeTable{
-	R16: []unicode.Range16{
-		{0x002D, 0x002E, 1},
-		{0x0030, 0x0039, 1},
-		{0x00B7, 0x00B7, 1},
-		{0x02D0, 0x02D1, 1},
-		{0x0300, 0x0345, 1},
-		{0x0360, 0x0361, 1},
-		{0x0387, 0x0387, 1},
-		{0x0483, 0x0486, 1},
-		{0x0591, 0x05A1, 1},
-		{0x05A3, 0x05B9, 1},
-		{0x05BB, 0x05BD, 1},
-		{0x05BF, 0x05BF, 1},
-		{0x05C1, 0x05C2, 1},
-		{0x05C4, 0x0640, 0x0640 - 0x05C4},
-		{0x064B, 0x0652, 1},
-		{0x0660, 0x0669, 1},
-		{0x0670, 0x0670, 1},
-		{0x06D6, 0x06DC, 1},
-		{0x06DD, 0x06DF, 1},
-		{0x06E0, 0x06E4, 1},
-		{0x06E7, 0x06E8, 1},
-		{0x06EA, 0x06ED, 1},
-		{0x06F0, 0x06F9, 1},
-		{0x0901, 0x0903, 1},
-		{0x093C, 0x093C, 1},
-		{0x093E, 0x094C, 1},
-		{0x094D, 0x094D, 1},
-		{0x0951, 0x0954, 1},
-		{0x0962, 0x0963, 1},
-		{0x0966, 0x096F, 1},
-		{0x0981, 0x0983, 1},
-		{0x09BC, 0x09BC, 1},
-		{0x09BE, 0x09BF, 1},
-		{0x09C0, 0x09C4, 1},
-		{0x09C7, 0x09C8, 1},
-		{0x09CB, 0x09CD, 1},
-		{0x09D7, 0x09D7, 1},
-		{0x09E2, 0x09E3, 1},
-		{0x09E6, 0x09EF, 1},
-		{0x0A02, 0x0A3C, 0x3A},
-		{0x0A3E, 0x0A3F, 1},
-		{0x0A40, 0x0A42, 1},
-		{0x0A47, 0x0A48, 1},
-		{0x0A4B, 0x0A4D, 1},
-		{0x0A66, 0x0A6F, 1},
-		{0x0A70, 0x0A71, 1},
-		{0x0A81, 0x0A83, 1},
-		{0x0ABC, 0x0ABC, 1},
-		{0x0ABE, 0x0AC5, 1},
-		{0x0AC7, 0x0AC9, 1},
-		{0x0ACB, 0x0ACD, 1},
-		{0x0AE6, 0x0AEF, 1},
-		{0x0B01, 0x0B03, 1},
-		{0x0B3C, 0x0B3C, 1},
-		{0x0B3E, 0x0B43, 1},
-		{0x0B47, 0x0B48, 1},
-		{0x0B4B, 0x0B4D, 1},
-		{0x0B56, 0x0B57, 1},
-		{0x0B66, 0x0B6F, 1},
-		{0x0B82, 0x0B83, 1},
-		{0x0BBE, 0x0BC2, 1},
-		{0x0BC6, 0x0BC8, 1},
-		{0x0BCA, 0x0BCD, 1},
-		{0x0BD7, 0x0BD7, 1},
-		{0x0BE7, 0x0BEF, 1},
-		{0x0C01, 0x0C03, 1},
-		{0x0C3E, 0x0C44, 1},
-		{0x0C46, 0x0C48, 1},
-		{0x0C4A, 0x0C4D, 1},
-		{0x0C55, 0x0C56, 1},
-		{0x0C66, 0x0C6F, 1},
-		{0x0C82, 0x0C83, 1},
-		{0x0CBE, 0x0CC4, 1},
-		{0x0CC6, 0x0CC8, 1},
-		{0x0CCA, 0x0CCD, 1},
-		{0x0CD5, 0x0CD6, 1},
-		{0x0CE6, 0x0CEF, 1},
-		{0x0D02, 0x0D03, 1},
-		{0x0D3E, 0x0D43, 1},
-		{0x0D46, 0x0D48, 1},
-		{0x0D4A, 0x0D4D, 1},
-		{0x0D57, 0x0D57, 1},
-		{0x0D66, 0x0D6F, 1},
-		{0x0E31, 0x0E31, 1},
-		{0x0E34, 0x0E3A, 1},
-		{0x0E46, 0x0E46, 1},
-		{0x0E47, 0x0E4E, 1},
-		{0x0E50, 0x0E59, 1},
-		{0x0EB1, 0x0EB1, 1},
-		{0x0EB4, 0x0EB9, 1},
-		{0x0EBB, 0x0EBC, 1},
-		{0x0EC6, 0x0EC6, 1},
-		{0x0EC8, 0x0ECD, 1},
-		{0x0ED0, 0x0ED9, 1},
-		{0x0F18, 0x0F19, 1},
-		{0x0F20, 0x0F29, 1},
-		{0x0F35, 0x0F39, 2},
-		{0x0F3E, 0x0F3F, 1},
-		{0x0F71, 0x0F84, 1},
-		{0x0F86, 0x0F8B, 1},
-		{0x0F90, 0x0F95, 1},
-		{0x0F97, 0x0F97, 1},
-		{0x0F99, 0x0FAD, 1},
-		{0x0FB1, 0x0FB7, 1},
-		{0x0FB9, 0x0FB9, 1},
-		{0x20D0, 0x20DC, 1},
-		{0x20E1, 0x3005, 0x3005 - 0x20E1},
-		{0x302A, 0x302F, 1},
-		{0x3031, 0x3035, 1},
-		{0x3099, 0x309A, 1},
-		{0x309D, 0x309E, 1},
-		{0x30FC, 0x30FE, 1},
-	},
-}
-
-// HTMLEntity is an entity map containing translations for the
-// standard HTML entity characters.
-var HTMLEntity = htmlEntity
-
-var htmlEntity = map[string]string{
-	/*
-		hget http://www.w3.org/TR/html4/sgml/entities.html |
-		ssam '
-			,y /\&gt;/ x/\&lt;(.|\n)+/ s/\n/ /g
-			,x v/^\&lt;!ENTITY/d
-			,s/\&lt;!ENTITY ([^ ]+) .*U\+([0-9A-F][0-9A-F][0-9A-F][0-9A-F]) .+/	"\1": "\\u\2",/g
-		'
-	*/
-	"nbsp":     "\u00A0",
-	"iexcl":    "\u00A1",
-	"cent":     "\u00A2",
-	"pound":    "\u00A3",
-	"curren":   "\u00A4",
-	"yen":      "\u00A5",
-	"brvbar":   "\u00A6",
-	"sect":     "\u00A7",
-	"uml":      "\u00A8",
-	"copy":     "\u00A9",
-	"ordf":     "\u00AA",
-	"laquo":    "\u00AB",
-	"not":      "\u00AC",
-	"shy":      "\u00AD",
-	"reg":      "\u00AE",
-	"macr":     "\u00AF",
-	"deg":      "\u00B0",
-	"plusmn":   "\u00B1",
-	"sup2":     "\u00B2",
-	"sup3":     "\u00B3",
-	"acute":    "\u00B4",
-	"micro":    "\u00B5",
-	"para":     "\u00B6",
-	"middot":   "\u00B7",
-	"cedil":    "\u00B8",
-	"sup1":     "\u00B9",
-	"ordm":     "\u00BA",
-	"raquo":    "\u00BB",
-	"frac14":   "\u00BC",
-	"frac12":   "\u00BD",
-	"frac34":   "\u00BE",
-	"iquest":   "\u00BF",
-	"Agrave":   "\u00C0",
-	"Aacute":   "\u00C1",
-	"Acirc":    "\u00C2",
-	"Atilde":   "\u00C3",
-	"Auml":     "\u00C4",
-	"Aring":    "\u00C5",
-	"AElig":    "\u00C6",
-	"Ccedil":   "\u00C7",
-	"Egrave":   "\u00C8",
-	"Eacute":   "\u00C9",
-	"Ecirc":    "\u00CA",
-	"Euml":     "\u00CB",
-	"Igrave":   "\u00CC",
-	"Iacute":   "\u00CD",
-	"Icirc":    "\u00CE",
-	"Iuml":     "\u00CF",
-	"ETH":      "\u00D0",
-	"Ntilde":   "\u00D1",
-	"Ograve":   "\u00D2",
-	"Oacute":   "\u00D3",
-	"Ocirc":    "\u00D4",
-	"Otilde":   "\u00D5",
-	"Ouml":     "\u00D6",
-	"times":    "\u00D7",
-	"Oslash":   "\u00D8",
-	"Ugrave":   "\u00D9",
-	"Uacute":   "\u00DA",
-	"Ucirc":    "\u00DB",
-	"Uuml":     "\u00DC",
-	"Yacute":   "\u00DD",
-	"THORN":    "\u00DE",
-	"szlig":    "\u00DF",
-	"agrave":   "\u00E0",
-	"aacute":   "\u00E1",
-	"acirc":    "\u00E2",
-	"atilde":   "\u00E3",
-	"auml":     "\u00E4",
-	"aring":    "\u00E5",
-	"aelig":    "\u00E6",
-	"ccedil":   "\u00E7",
-	"egrave":   "\u00E8",
-	"eacute":   "\u00E9",
-	"ecirc":    "\u00EA",
-	"euml":     "\u00EB",
-	"igrave":   "\u00EC",
-	"iacute":   "\u00ED",
-	"icirc":    "\u00EE",
-	"iuml":     "\u00EF",
-	"eth":      "\u00F0",
-	"ntilde":   "\u00F1",
-	"ograve":   "\u00F2",
-	"oacute":   "\u00F3",
-	"ocirc":    "\u00F4",
-	"otilde":   "\u00F5",
-	"ouml":     "\u00F6",
-	"divide":   "\u00F7",
-	"oslash":   "\u00F8",
-	"ugrave":   "\u00F9",
-	"uacute":   "\u00FA",
-	"ucirc":    "\u00FB",
-	"uuml":     "\u00FC",
-	"yacute":   "\u00FD",
-	"thorn":    "\u00FE",
-	"yuml":     "\u00FF",
-	"fnof":     "\u0192",
-	"Alpha":    "\u0391",
-	"Beta":     "\u0392",
-	"Gamma":    "\u0393",
-	"Delta":    "\u0394",
-	"Epsilon":  "\u0395",
-	"Zeta":     "\u0396",
-	"Eta":      "\u0397",
-	"Theta":    "\u0398",
-	"Iota":     "\u0399",
-	"Kappa":    "\u039A",
-	"Lambda":   "\u039B",
-	"Mu":       "\u039C",
-	"Nu":       "\u039D",
-	"Xi":       "\u039E",
-	"Omicron":  "\u039F",
-	"Pi":       "\u03A0",
-	"Rho":      "\u03A1",
-	"Sigma":    "\u03A3",
-	"Tau":      "\u03A4",
-	"Upsilon":  "\u03A5",
-	"Phi":      "\u03A6",
-	"Chi":      "\u03A7",
-	"Psi":      "\u03A8",
-	"Omega":    "\u03A9",
-	"alpha":    "\u03B1",
-	"beta":     "\u03B2",
-	"gamma":    "\u03B3",
-	"delta":    "\u03B4",
-	"epsilon":  "\u03B5",
-	"zeta":     "\u03B6",
-	"eta":      "\u03B7",
-	"theta":    "\u03B8",
-	"iota":     "\u03B9",
-	"kappa":    "\u03BA",
-	"lambda":   "\u03BB",
-	"mu":       "\u03BC",
-	"nu":       "\u03BD",
-	"xi":       "\u03BE",
-	"omicron":  "\u03BF",
-	"pi":       "\u03C0",
-	"rho":      "\u03C1",
-	"sigmaf":   "\u03C2",
-	"sigma":    "\u03C3",
-	"tau":      "\u03C4",
-	"upsilon":  "\u03C5",
-	"phi":      "\u03C6",
-	"chi":      "\u03C7",
-	"psi":      "\u03C8",
-	"omega":    "\u03C9",
-	"thetasym": "\u03D1",
-	"upsih":    "\u03D2",
-	"piv":      "\u03D6",
-	"bull":     "\u2022",
-	"hellip":   "\u2026",
-	"prime":    "\u2032",
-	"Prime":    "\u2033",
-	"oline":    "\u203E",
-	"frasl":    "\u2044",
-	"weierp":   "\u2118",
-	"image":    "\u2111",
-	"real":     "\u211C",
-	"trade":    "\u2122",
-	"alefsym":  "\u2135",
-	"larr":     "\u2190",
-	"uarr":     "\u2191",
-	"rarr":     "\u2192",
-	"darr":     "\u2193",
-	"harr":     "\u2194",
-	"crarr":    "\u21B5",
-	"lArr":     "\u21D0",
-	"uArr":     "\u21D1",
-	"rArr":     "\u21D2",
-	"dArr":     "\u21D3",
-	"hArr":     "\u21D4",
-	"forall":   "\u2200",
-	"part":     "\u2202",
-	"exist":    "\u2203",
-	"empty":    "\u2205",
-	"nabla":    "\u2207",
-	"isin":     "\u2208",
-	"notin":    "\u2209",
-	"ni":       "\u220B",
-	"prod":     "\u220F",
-	"sum":      "\u2211",
-	"minus":    "\u2212",
-	"lowast":   "\u2217",
-	"radic":    "\u221A",
-	"prop":     "\u221D",
-	"infin":    "\u221E",
-	"ang":      "\u2220",
-	"and":      "\u2227",
-	"or":       "\u2228",
-	"cap":      "\u2229",
-	"cup":      "\u222A",
-	"int":      "\u222B",
-	"there4":   "\u2234",
-	"sim":      "\u223C",
-	"cong":     "\u2245",
-	"asymp":    "\u2248",
-	"ne":       "\u2260",
-	"equiv":    "\u2261",
-	"le":       "\u2264",
-	"ge":       "\u2265",
-	"sub":      "\u2282",
-	"sup":      "\u2283",
-	"nsub":     "\u2284",
-	"sube":     "\u2286",
-	"supe":     "\u2287",
-	"oplus":    "\u2295",
-	"otimes":   "\u2297",
-	"perp":     "\u22A5",
-	"sdot":     "\u22C5",
-	"lceil":    "\u2308",
-	"rceil":    "\u2309",
-	"lfloor":   "\u230A",
-	"rfloor":   "\u230B",
-	"lang":     "\u2329",
-	"rang":     "\u232A",
-	"loz":      "\u25CA",
-	"spades":   "\u2660",
-	"clubs":    "\u2663",
-	"hearts":   "\u2665",
-	"diams":    "\u2666",
-	"quot":     "\u0022",
-	"amp":      "\u0026",
-	"lt":       "\u003C",
-	"gt":       "\u003E",
-	"OElig":    "\u0152",
-	"oelig":    "\u0153",
-	"Scaron":   "\u0160",
-	"scaron":   "\u0161",
-	"Yuml":     "\u0178",
-	"circ":     "\u02C6",
-	"tilde":    "\u02DC",
-	"ensp":     "\u2002",
-	"emsp":     "\u2003",
-	"thinsp":   "\u2009",
-	"zwnj":     "\u200C",
-	"zwj":      "\u200D",
-	"lrm":      "\u200E",
-	"rlm":      "\u200F",
-	"ndash":    "\u2013",
-	"mdash":    "\u2014",
-	"lsquo":    "\u2018",
-	"rsquo":    "\u2019",
-	"sbquo":    "\u201A",
-	"ldquo":    "\u201C",
-	"rdquo":    "\u201D",
-	"bdquo":    "\u201E",
-	"dagger":   "\u2020",
-	"Dagger":   "\u2021",
-	"permil":   "\u2030",
-	"lsaquo":   "\u2039",
-	"rsaquo":   "\u203A",
-	"euro":     "\u20AC",
-}
-
-// HTMLAutoClose is the set of HTML elements that
-// should be considered to close automatically.
-var HTMLAutoClose = htmlAutoClose
-
-var htmlAutoClose = []string{
-	/*
-		hget http://www.w3.org/TR/html4/loose.dtd |
-		9 sed -n 's/<!ELEMENT ([^ ]*) +- O EMPTY.+/	"\1",/p' | tr A-Z a-z
-	*/
-	"basefont",
-	"br",
-	"area",
-	"link",
-	"img",
-	"param",
-	"hr",
-	"input",
-	"col",
-	"frame",
-	"isindex",
-	"base",
-	"meta",
-}
-
-var (
-	esc_quot = []byte("&#34;") // shorter than "&quot;"
-	esc_apos = []byte("&#39;") // shorter than "&apos;"
-	esc_amp  = []byte("&amp;")
-	esc_lt   = []byte("&lt;")
-	esc_gt   = []byte("&gt;")
-	esc_tab  = []byte("&#x9;")
-	esc_nl   = []byte("&#xA;")
-	esc_cr   = []byte("&#xD;")
-	esc_fffd = []byte("\uFFFD") // Unicode replacement character
-)
-
-// EscapeText writes to w the properly escaped XML equivalent
-// of the plain text data s.
-func EscapeText(w io.Writer, s []byte) error {
-	return escapeText(w, s, true)
-}
-
-// escapeText writes to w the properly escaped XML equivalent
-// of the plain text data s. If escapeNewline is true, newline
-// characters will be escaped.
-func escapeText(w io.Writer, s []byte, escapeNewline bool) error {
-	var esc []byte
-	last := 0
-	for i := 0; i < len(s); {
-		r, width := utf8.DecodeRune(s[i:])
-		i += width
-		switch r {
-		case '"':
-			esc = esc_quot
-		case '\'':
-			esc = esc_apos
-		case '&':
-			esc = esc_amp
-		case '<':
-			esc = esc_lt
-		case '>':
-			esc = esc_gt
-		case '\t':
-			esc = esc_tab
-		case '\n':
-			if !escapeNewline {
-				continue
-			}
-			esc = esc_nl
-		case '\r':
-			esc = esc_cr
-		default:
-			if !isInCharacterRange(r) || (r == 0xFFFD && width == 1) {
-				esc = esc_fffd
-				break
-			}
-			continue
-		}
-		if _, err := w.Write(s[last : i-width]); err != nil {
-			return err
-		}
-		if _, err := w.Write(esc); err != nil {
-			return err
-		}
-		last = i
-	}
-	if _, err := w.Write(s[last:]); err != nil {
-		return err
-	}
-	return nil
-}
-
-// EscapeString writes to p the properly escaped XML equivalent
-// of the plain text data s.
-func (p *printer) EscapeString(s string) {
-	var esc []byte
-	last := 0
-	for i := 0; i < len(s); {
-		r, width := utf8.DecodeRuneInString(s[i:])
-		i += width
-		switch r {
-		case '"':
-			esc = esc_quot
-		case '\'':
-			esc = esc_apos
-		case '&':
-			esc = esc_amp
-		case '<':
-			esc = esc_lt
-		case '>':
-			esc = esc_gt
-		case '\t':
-			esc = esc_tab
-		case '\n':
-			esc = esc_nl
-		case '\r':
-			esc = esc_cr
-		default:
-			if !isInCharacterRange(r) || (r == 0xFFFD && width == 1) {
-				esc = esc_fffd
-				break
-			}
-			continue
-		}
-		p.WriteString(s[last : i-width])
-		p.Write(esc)
-		last = i
-	}
-	p.WriteString(s[last:])
-}
-
-// Escape is like EscapeText but omits the error return value.
-// It is provided for backwards compatibility with Go 1.0.
-// Code targeting Go 1.1 or later should use EscapeText.
-func Escape(w io.Writer, s []byte) {
-	EscapeText(w, s)
-}
-
-// procInst parses the `param="..."` or `param='...'`
-// value out of the provided string, returning "" if not found.
-func procInst(param, s string) string {
-	// TODO: this parsing is somewhat lame and not exact.
-	// It works for all actual cases, though.
-	param = param + "="
-	idx := strings.Index(s, param)
-	if idx == -1 {
-		return ""
-	}
-	v := s[idx+len(param):]
-	if v == "" {
-		return ""
-	}
-	if v[0] != '\'' && v[0] != '"' {
-		return ""
-	}
-	idx = strings.IndexRune(v[1:], rune(v[0]))
-	if idx == -1 {
-		return ""
-	}
-	return v[1 : idx+1]
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/internal/xml/xml_test.go b/installer/vendor/golang.org/x/net/webdav/internal/xml/xml_test.go
deleted file mode 100644
index af4cf8ea8c..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/internal/xml/xml_test.go
+++ /dev/null
@@ -1,752 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xml
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"reflect"
-	"strings"
-	"testing"
-	"unicode/utf8"
-)
-
-const testInput = `
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<body xmlns:foo="ns1" xmlns="ns2" xmlns:tag="ns3" ` +
-	"\r\n\t" + `  >
-  <hello lang="en">World &lt;&gt;&apos;&quot; &#x767d;&#40300;翔</hello>
-  <query>&何; &is-it;</query>
-  <goodbye />
-  <outer foo:attr="value" xmlns:tag="ns4">
-    <inner/>
-  </outer>
-  <tag:name>
-    <![CDATA[Some text here.]]>
-  </tag:name>
-</body><!-- missing final newline -->`
-
-var testEntity = map[string]string{"何": "What", "is-it": "is it?"}
-
-var rawTokens = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
-	CharData("\n"),
-	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
-	CharData("\n"),
-	StartElement{Name{"", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
-	CharData("\n  "),
-	StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
-	CharData("World <>'\" 白鵬翔"),
-	EndElement{Name{"", "hello"}},
-	CharData("\n  "),
-	StartElement{Name{"", "query"}, []Attr{}},
-	CharData("What is it?"),
-	EndElement{Name{"", "query"}},
-	CharData("\n  "),
-	StartElement{Name{"", "goodbye"}, []Attr{}},
-	EndElement{Name{"", "goodbye"}},
-	CharData("\n  "),
-	StartElement{Name{"", "outer"}, []Attr{{Name{"foo", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
-	CharData("\n    "),
-	StartElement{Name{"", "inner"}, []Attr{}},
-	EndElement{Name{"", "inner"}},
-	CharData("\n  "),
-	EndElement{Name{"", "outer"}},
-	CharData("\n  "),
-	StartElement{Name{"tag", "name"}, []Attr{}},
-	CharData("\n    "),
-	CharData("Some text here."),
-	CharData("\n  "),
-	EndElement{Name{"tag", "name"}},
-	CharData("\n"),
-	EndElement{Name{"", "body"}},
-	Comment(" missing final newline "),
-}
-
-var cookedTokens = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="UTF-8"`)},
-	CharData("\n"),
-	Directive(`DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
-  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"`),
-	CharData("\n"),
-	StartElement{Name{"ns2", "body"}, []Attr{{Name{"xmlns", "foo"}, "ns1"}, {Name{"", "xmlns"}, "ns2"}, {Name{"xmlns", "tag"}, "ns3"}}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "hello"}, []Attr{{Name{"", "lang"}, "en"}}},
-	CharData("World <>'\" 白鵬翔"),
-	EndElement{Name{"ns2", "hello"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "query"}, []Attr{}},
-	CharData("What is it?"),
-	EndElement{Name{"ns2", "query"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "goodbye"}, []Attr{}},
-	EndElement{Name{"ns2", "goodbye"}},
-	CharData("\n  "),
-	StartElement{Name{"ns2", "outer"}, []Attr{{Name{"ns1", "attr"}, "value"}, {Name{"xmlns", "tag"}, "ns4"}}},
-	CharData("\n    "),
-	StartElement{Name{"ns2", "inner"}, []Attr{}},
-	EndElement{Name{"ns2", "inner"}},
-	CharData("\n  "),
-	EndElement{Name{"ns2", "outer"}},
-	CharData("\n  "),
-	StartElement{Name{"ns3", "name"}, []Attr{}},
-	CharData("\n    "),
-	CharData("Some text here."),
-	CharData("\n  "),
-	EndElement{Name{"ns3", "name"}},
-	CharData("\n"),
-	EndElement{Name{"ns2", "body"}},
-	Comment(" missing final newline "),
-}
-
-const testInputAltEncoding = `
-<?xml version="1.0" encoding="x-testing-uppercase"?>
-<TAG>VALUE</TAG>`
-
-var rawTokensAltEncoding = []Token{
-	CharData("\n"),
-	ProcInst{"xml", []byte(`version="1.0" encoding="x-testing-uppercase"`)},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("value"),
-	EndElement{Name{"", "tag"}},
-}
-
-var xmlInput = []string{
-	// unexpected EOF cases
-	"<",
-	"<t",
-	"<t ",
-	"<t/",
-	"<!",
-	"<!-",
-	"<!--",
-	"<!--c-",
-	"<!--c--",
-	"<!d",
-	"<t></",
-	"<t></t",
-	"<?",
-	"<?p",
-	"<t a",
-	"<t a=",
-	"<t a='",
-	"<t a=''",
-	"<t/><![",
-	"<t/><![C",
-	"<t/><![CDATA[d",
-	"<t/><![CDATA[d]",
-	"<t/><![CDATA[d]]",
-
-	// other Syntax errors
-	"<>",
-	"<t/a",
-	"<0 />",
-	"<?0 >",
-	//	"<!0 >",	// let the Token() caller handle
-	"</0>",
-	"<t 0=''>",
-	"<t a='&'>",
-	"<t a='<'>",
-	"<t>&nbspc;</t>",
-	"<t a>",
-	"<t a=>",
-	"<t a=v>",
-	//	"<![CDATA[d]]>",	// let the Token() caller handle
-	"<t></e>",
-	"<t></>",
-	"<t></t!",
-	"<t>cdata]]></t>",
-}
-
-func TestRawToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInput))
-	d.Entity = testEntity
-	testRawToken(t, d, testInput, rawTokens)
-}
-
-const nonStrictInput = `
-<tag>non&entity</tag>
-<tag>&unknown;entity</tag>
-<tag>&#123</tag>
-<tag>&#zzz;</tag>
-<tag>&なまえ3;</tag>
-<tag>&lt-gt;</tag>
-<tag>&;</tag>
-<tag>&0a;</tag>
-`
-
-var nonStringEntity = map[string]string{"": "oops!", "0a": "oops!"}
-
-var nonStrictTokens = []Token{
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("non&entity"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&unknown;entity"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&#123"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&#zzz;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&なまえ3;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&lt-gt;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-	StartElement{Name{"", "tag"}, []Attr{}},
-	CharData("&0a;"),
-	EndElement{Name{"", "tag"}},
-	CharData("\n"),
-}
-
-func TestNonStrictRawToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(nonStrictInput))
-	d.Strict = false
-	testRawToken(t, d, nonStrictInput, nonStrictTokens)
-}
-
-type downCaser struct {
-	t *testing.T
-	r io.ByteReader
-}
-
-func (d *downCaser) ReadByte() (c byte, err error) {
-	c, err = d.r.ReadByte()
-	if c >= 'A' && c <= 'Z' {
-		c += 'a' - 'A'
-	}
-	return
-}
-
-func (d *downCaser) Read(p []byte) (int, error) {
-	d.t.Fatalf("unexpected Read call on downCaser reader")
-	panic("unreachable")
-}
-
-func TestRawTokenAltEncoding(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInputAltEncoding))
-	d.CharsetReader = func(charset string, input io.Reader) (io.Reader, error) {
-		if charset != "x-testing-uppercase" {
-			t.Fatalf("unexpected charset %q", charset)
-		}
-		return &downCaser{t, input.(io.ByteReader)}, nil
-	}
-	testRawToken(t, d, testInputAltEncoding, rawTokensAltEncoding)
-}
-
-func TestRawTokenAltEncodingNoConverter(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInputAltEncoding))
-	token, err := d.RawToken()
-	if token == nil {
-		t.Fatalf("expected a token on first RawToken call")
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	token, err = d.RawToken()
-	if token != nil {
-		t.Errorf("expected a nil token; got %#v", token)
-	}
-	if err == nil {
-		t.Fatalf("expected an error on second RawToken call")
-	}
-	const encoding = "x-testing-uppercase"
-	if !strings.Contains(err.Error(), encoding) {
-		t.Errorf("expected error to contain %q; got error: %v",
-			encoding, err)
-	}
-}
-
-func testRawToken(t *testing.T, d *Decoder, raw string, rawTokens []Token) {
-	lastEnd := int64(0)
-	for i, want := range rawTokens {
-		start := d.InputOffset()
-		have, err := d.RawToken()
-		end := d.InputOffset()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			var shave, swant string
-			if _, ok := have.(CharData); ok {
-				shave = fmt.Sprintf("CharData(%q)", have)
-			} else {
-				shave = fmt.Sprintf("%#v", have)
-			}
-			if _, ok := want.(CharData); ok {
-				swant = fmt.Sprintf("CharData(%q)", want)
-			} else {
-				swant = fmt.Sprintf("%#v", want)
-			}
-			t.Errorf("token %d = %s, want %s", i, shave, swant)
-		}
-
-		// Check that InputOffset returned actual token.
-		switch {
-		case start < lastEnd:
-			t.Errorf("token %d: position [%d,%d) for %T is before previous token", i, start, end, have)
-		case start >= end:
-			// Special case: EndElement can be synthesized.
-			if start == end && end == lastEnd {
-				break
-			}
-			t.Errorf("token %d: position [%d,%d) for %T is empty", i, start, end, have)
-		case end > int64(len(raw)):
-			t.Errorf("token %d: position [%d,%d) for %T extends beyond input", i, start, end, have)
-		default:
-			text := raw[start:end]
-			if strings.ContainsAny(text, "<>") && (!strings.HasPrefix(text, "<") || !strings.HasSuffix(text, ">")) {
-				t.Errorf("token %d: misaligned raw token %#q for %T", i, text, have)
-			}
-		}
-		lastEnd = end
-	}
-}
-
-// Ensure that directives (specifically !DOCTYPE) include the complete
-// text of any nested directives, noting that < and > do not change
-// nesting depth if they are in single or double quotes.
-
-var nestedDirectivesInput = `
-<!DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
-<!DOCTYPE [<!ENTITY xlt ">">]>
-<!DOCTYPE [<!ENTITY xlt "<">]>
-<!DOCTYPE [<!ENTITY xlt '>'>]>
-<!DOCTYPE [<!ENTITY xlt '<'>]>
-<!DOCTYPE [<!ENTITY xlt '">'>]>
-<!DOCTYPE [<!ENTITY xlt "'<">]>
-`
-
-var nestedDirectivesTokens = []Token{
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt ">">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt "<">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '>'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '<'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt '">'>]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY xlt "'<">]`),
-	CharData("\n"),
-}
-
-func TestNestedDirectives(t *testing.T) {
-	d := NewDecoder(strings.NewReader(nestedDirectivesInput))
-
-	for i, want := range nestedDirectivesTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-func TestToken(t *testing.T) {
-	d := NewDecoder(strings.NewReader(testInput))
-	d.Entity = testEntity
-
-	for i, want := range cookedTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-func TestSyntax(t *testing.T) {
-	for i := range xmlInput {
-		d := NewDecoder(strings.NewReader(xmlInput[i]))
-		var err error
-		for _, err = d.Token(); err == nil; _, err = d.Token() {
-		}
-		if _, ok := err.(*SyntaxError); !ok {
-			t.Fatalf(`xmlInput "%s": expected SyntaxError not received`, xmlInput[i])
-		}
-	}
-}
-
-type allScalars struct {
-	True1     bool
-	True2     bool
-	False1    bool
-	False2    bool
-	Int       int
-	Int8      int8
-	Int16     int16
-	Int32     int32
-	Int64     int64
-	Uint      int
-	Uint8     uint8
-	Uint16    uint16
-	Uint32    uint32
-	Uint64    uint64
-	Uintptr   uintptr
-	Float32   float32
-	Float64   float64
-	String    string
-	PtrString *string
-}
-
-var all = allScalars{
-	True1:     true,
-	True2:     true,
-	False1:    false,
-	False2:    false,
-	Int:       1,
-	Int8:      -2,
-	Int16:     3,
-	Int32:     -4,
-	Int64:     5,
-	Uint:      6,
-	Uint8:     7,
-	Uint16:    8,
-	Uint32:    9,
-	Uint64:    10,
-	Uintptr:   11,
-	Float32:   13.0,
-	Float64:   14.0,
-	String:    "15",
-	PtrString: &sixteen,
-}
-
-var sixteen = "16"
-
-const testScalarsInput = `<allscalars>
-	<True1>true</True1>
-	<True2>1</True2>
-	<False1>false</False1>
-	<False2>0</False2>
-	<Int>1</Int>
-	<Int8>-2</Int8>
-	<Int16>3</Int16>
-	<Int32>-4</Int32>
-	<Int64>5</Int64>
-	<Uint>6</Uint>
-	<Uint8>7</Uint8>
-	<Uint16>8</Uint16>
-	<Uint32>9</Uint32>
-	<Uint64>10</Uint64>
-	<Uintptr>11</Uintptr>
-	<Float>12.0</Float>
-	<Float32>13.0</Float32>
-	<Float64>14.0</Float64>
-	<String>15</String>
-	<PtrString>16</PtrString>
-</allscalars>`
-
-func TestAllScalars(t *testing.T) {
-	var a allScalars
-	err := Unmarshal([]byte(testScalarsInput), &a)
-
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !reflect.DeepEqual(a, all) {
-		t.Errorf("have %+v want %+v", a, all)
-	}
-}
-
-type item struct {
-	Field_a string
-}
-
-func TestIssue569(t *testing.T) {
-	data := `<item><Field_a>abcd</Field_a></item>`
-	var i item
-	err := Unmarshal([]byte(data), &i)
-
-	if err != nil || i.Field_a != "abcd" {
-		t.Fatal("Expecting abcd")
-	}
-}
-
-func TestUnquotedAttrs(t *testing.T) {
-	data := "<tag attr=azAZ09:-_\t>"
-	d := NewDecoder(strings.NewReader(data))
-	d.Strict = false
-	token, err := d.Token()
-	if _, ok := err.(*SyntaxError); ok {
-		t.Errorf("Unexpected error: %v", err)
-	}
-	if token.(StartElement).Name.Local != "tag" {
-		t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
-	}
-	attr := token.(StartElement).Attr[0]
-	if attr.Value != "azAZ09:-_" {
-		t.Errorf("Unexpected attribute value: %v", attr.Value)
-	}
-	if attr.Name.Local != "attr" {
-		t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
-	}
-}
-
-func TestValuelessAttrs(t *testing.T) {
-	tests := [][3]string{
-		{"<p nowrap>", "p", "nowrap"},
-		{"<p nowrap >", "p", "nowrap"},
-		{"<input checked/>", "input", "checked"},
-		{"<input checked />", "input", "checked"},
-	}
-	for _, test := range tests {
-		d := NewDecoder(strings.NewReader(test[0]))
-		d.Strict = false
-		token, err := d.Token()
-		if _, ok := err.(*SyntaxError); ok {
-			t.Errorf("Unexpected error: %v", err)
-		}
-		if token.(StartElement).Name.Local != test[1] {
-			t.Errorf("Unexpected tag name: %v", token.(StartElement).Name.Local)
-		}
-		attr := token.(StartElement).Attr[0]
-		if attr.Value != test[2] {
-			t.Errorf("Unexpected attribute value: %v", attr.Value)
-		}
-		if attr.Name.Local != test[2] {
-			t.Errorf("Unexpected attribute name: %v", attr.Name.Local)
-		}
-	}
-}
-
-func TestCopyTokenCharData(t *testing.T) {
-	data := []byte("same data")
-	var tok1 Token = CharData(data)
-	tok2 := CopyToken(tok1)
-	if !reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) != CharData")
-	}
-	data[1] = 'o'
-	if reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) uses same buffer.")
-	}
-}
-
-func TestCopyTokenStartElement(t *testing.T) {
-	elt := StartElement{Name{"", "hello"}, []Attr{{Name{"", "lang"}, "en"}}}
-	var tok1 Token = elt
-	tok2 := CopyToken(tok1)
-	if tok1.(StartElement).Attr[0].Value != "en" {
-		t.Error("CopyToken overwrote Attr[0]")
-	}
-	if !reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(StartElement) != StartElement")
-	}
-	tok1.(StartElement).Attr[0] = Attr{Name{"", "lang"}, "de"}
-	if reflect.DeepEqual(tok1, tok2) {
-		t.Error("CopyToken(CharData) uses same buffer.")
-	}
-}
-
-func TestSyntaxErrorLineNum(t *testing.T) {
-	testInput := "<P>Foo<P>\n\n<P>Bar</>\n"
-	d := NewDecoder(strings.NewReader(testInput))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	synerr, ok := err.(*SyntaxError)
-	if !ok {
-		t.Error("Expected SyntaxError.")
-	}
-	if synerr.Line != 3 {
-		t.Error("SyntaxError didn't have correct line number.")
-	}
-}
-
-func TestTrailingRawToken(t *testing.T) {
-	input := `<FOO></FOO>  `
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.RawToken(); err == nil; _, err = d.RawToken() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.RawToken() = _, %v, want _, io.EOF", err)
-	}
-}
-
-func TestTrailingToken(t *testing.T) {
-	input := `<FOO></FOO>  `
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
-	}
-}
-
-func TestEntityInsideCDATA(t *testing.T) {
-	input := `<test><![CDATA[ &val=foo ]]></test>`
-	d := NewDecoder(strings.NewReader(input))
-	var err error
-	for _, err = d.Token(); err == nil; _, err = d.Token() {
-	}
-	if err != io.EOF {
-		t.Fatalf("d.Token() = _, %v, want _, io.EOF", err)
-	}
-}
-
-var characterTests = []struct {
-	in  string
-	err string
-}{
-	{"\x12<doc/>", "illegal character code U+0012"},
-	{"<?xml version=\"1.0\"?>\x0b<doc/>", "illegal character code U+000B"},
-	{"\xef\xbf\xbe<doc/>", "illegal character code U+FFFE"},
-	{"<?xml version=\"1.0\"?><doc>\r\n<hiya/>\x07<toots/></doc>", "illegal character code U+0007"},
-	{"<?xml version=\"1.0\"?><doc \x12='value'>what's up</doc>", "expected attribute name in element"},
-	{"<doc>&abc\x01;</doc>", "invalid character entity &abc (no semicolon)"},
-	{"<doc>&\x01;</doc>", "invalid character entity & (no semicolon)"},
-	{"<doc>&\xef\xbf\xbe;</doc>", "invalid character entity &\uFFFE;"},
-	{"<doc>&hello;</doc>", "invalid character entity &hello;"},
-}
-
-func TestDisallowedCharacters(t *testing.T) {
-
-	for i, tt := range characterTests {
-		d := NewDecoder(strings.NewReader(tt.in))
-		var err error
-
-		for err == nil {
-			_, err = d.Token()
-		}
-		synerr, ok := err.(*SyntaxError)
-		if !ok {
-			t.Fatalf("input %d d.Token() = _, %v, want _, *SyntaxError", i, err)
-		}
-		if synerr.Msg != tt.err {
-			t.Fatalf("input %d synerr.Msg wrong: want %q, got %q", i, tt.err, synerr.Msg)
-		}
-	}
-}
-
-type procInstEncodingTest struct {
-	expect, got string
-}
-
-var procInstTests = []struct {
-	input  string
-	expect [2]string
-}{
-	{`version="1.0" encoding="utf-8"`, [2]string{"1.0", "utf-8"}},
-	{`version="1.0" encoding='utf-8'`, [2]string{"1.0", "utf-8"}},
-	{`version="1.0" encoding='utf-8' `, [2]string{"1.0", "utf-8"}},
-	{`version="1.0" encoding=utf-8`, [2]string{"1.0", ""}},
-	{`encoding="FOO" `, [2]string{"", "FOO"}},
-}
-
-func TestProcInstEncoding(t *testing.T) {
-	for _, test := range procInstTests {
-		if got := procInst("version", test.input); got != test.expect[0] {
-			t.Errorf("procInst(version, %q) = %q; want %q", test.input, got, test.expect[0])
-		}
-		if got := procInst("encoding", test.input); got != test.expect[1] {
-			t.Errorf("procInst(encoding, %q) = %q; want %q", test.input, got, test.expect[1])
-		}
-	}
-}
-
-// Ensure that directives with comments include the complete
-// text of any nested directives.
-
-var directivesWithCommentsInput = `
-<!DOCTYPE [<!-- a comment --><!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]>
-<!DOCTYPE [<!ENTITY go "Golang"><!-- a comment-->]>
-<!DOCTYPE <!-> <!> <!----> <!-->--> <!--->--> [<!ENTITY go "Golang"><!-- a comment-->]>
-`
-
-var directivesWithCommentsTokens = []Token{
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY rdf "http://www.w3.org/1999/02/22-rdf-syntax-ns#">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE [<!ENTITY go "Golang">]`),
-	CharData("\n"),
-	Directive(`DOCTYPE <!-> <!>    [<!ENTITY go "Golang">]`),
-	CharData("\n"),
-}
-
-func TestDirectivesWithComments(t *testing.T) {
-	d := NewDecoder(strings.NewReader(directivesWithCommentsInput))
-
-	for i, want := range directivesWithCommentsTokens {
-		have, err := d.Token()
-		if err != nil {
-			t.Fatalf("token %d: unexpected error: %s", i, err)
-		}
-		if !reflect.DeepEqual(have, want) {
-			t.Errorf("token %d = %#v want %#v", i, have, want)
-		}
-	}
-}
-
-// Writer whose Write method always returns an error.
-type errWriter struct{}
-
-func (errWriter) Write(p []byte) (n int, err error) { return 0, fmt.Errorf("unwritable") }
-
-func TestEscapeTextIOErrors(t *testing.T) {
-	expectErr := "unwritable"
-	err := EscapeText(errWriter{}, []byte{'A'})
-
-	if err == nil || err.Error() != expectErr {
-		t.Errorf("have %v, want %v", err, expectErr)
-	}
-}
-
-func TestEscapeTextInvalidChar(t *testing.T) {
-	input := []byte("A \x00 terminated string.")
-	expected := "A \uFFFD terminated string."
-
-	buff := new(bytes.Buffer)
-	if err := EscapeText(buff, input); err != nil {
-		t.Fatalf("have %v, want nil", err)
-	}
-	text := buff.String()
-
-	if text != expected {
-		t.Errorf("have %v, want %v", text, expected)
-	}
-}
-
-func TestIssue5880(t *testing.T) {
-	type T []byte
-	data, err := Marshal(T{192, 168, 0, 1})
-	if err != nil {
-		t.Errorf("Marshal error: %v", err)
-	}
-	if !utf8.Valid(data) {
-		t.Errorf("Marshal generated invalid UTF-8: %x", data)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/litmus_test_server.go b/installer/vendor/golang.org/x/net/webdav/litmus_test_server.go
deleted file mode 100644
index 514db5dd19..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/litmus_test_server.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-This program is a server for the WebDAV 'litmus' compliance test at
-http://www.webdav.org/neon/litmus/
-To run the test:
-
-go run litmus_test_server.go
-
-and separately, from the downloaded litmus-xxx directory:
-
-make URL=http://localhost:9999/ check
-*/
-package main
-
-import (
-	"flag"
-	"fmt"
-	"log"
-	"net/http"
-	"net/url"
-
-	"golang.org/x/net/webdav"
-)
-
-var port = flag.Int("port", 9999, "server port")
-
-func main() {
-	flag.Parse()
-	log.SetFlags(0)
-	h := &webdav.Handler{
-		FileSystem: webdav.NewMemFS(),
-		LockSystem: webdav.NewMemLS(),
-		Logger: func(r *http.Request, err error) {
-			litmus := r.Header.Get("X-Litmus")
-			if len(litmus) > 19 {
-				litmus = litmus[:16] + "..."
-			}
-
-			switch r.Method {
-			case "COPY", "MOVE":
-				dst := ""
-				if u, err := url.Parse(r.Header.Get("Destination")); err == nil {
-					dst = u.Path
-				}
-				o := r.Header.Get("Overwrite")
-				log.Printf("%-20s%-10s%-30s%-30so=%-2s%v", litmus, r.Method, r.URL.Path, dst, o, err)
-			default:
-				log.Printf("%-20s%-10s%-30s%v", litmus, r.Method, r.URL.Path, err)
-			}
-		},
-	}
-
-	// The next line would normally be:
-	//	http.Handle("/", h)
-	// but we wrap that HTTP handler h to cater for a special case.
-	//
-	// The propfind_invalid2 litmus test case expects an empty namespace prefix
-	// declaration to be an error. The FAQ in the webdav litmus test says:
-	//
-	// "What does the "propfind_invalid2" test check for?...
-	//
-	// If a request was sent with an XML body which included an empty namespace
-	// prefix declaration (xmlns:ns1=""), then the server must reject that with
-	// a "400 Bad Request" response, as it is invalid according to the XML
-	// Namespace specification."
-	//
-	// On the other hand, the Go standard library's encoding/xml package
-	// accepts an empty xmlns namespace, as per the discussion at
-	// https://github.com/golang/go/issues/8068
-	//
-	// Empty namespaces seem disallowed in the second (2006) edition of the XML
-	// standard, but allowed in a later edition. The grammar differs between
-	// http://www.w3.org/TR/2006/REC-xml-names-20060816/#ns-decl and
-	// http://www.w3.org/TR/REC-xml-names/#dt-prefix
-	//
-	// Thus, we assume that the propfind_invalid2 test is obsolete, and
-	// hard-code the 400 Bad Request response that the test expects.
-	http.Handle("/", http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if r.Header.Get("X-Litmus") == "props: 3 (propfind_invalid2)" {
-			http.Error(w, "400 Bad Request", http.StatusBadRequest)
-			return
-		}
-		h.ServeHTTP(w, r)
-	}))
-
-	addr := fmt.Sprintf(":%d", *port)
-	log.Printf("Serving %v", addr)
-	log.Fatal(http.ListenAndServe(addr, nil))
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/lock.go b/installer/vendor/golang.org/x/net/webdav/lock.go
deleted file mode 100644
index 344ac5ceaf..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/lock.go
+++ /dev/null
@@ -1,445 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"container/heap"
-	"errors"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-)
-
-var (
-	// ErrConfirmationFailed is returned by a LockSystem's Confirm method.
-	ErrConfirmationFailed = errors.New("webdav: confirmation failed")
-	// ErrForbidden is returned by a LockSystem's Unlock method.
-	ErrForbidden = errors.New("webdav: forbidden")
-	// ErrLocked is returned by a LockSystem's Create, Refresh and Unlock methods.
-	ErrLocked = errors.New("webdav: locked")
-	// ErrNoSuchLock is returned by a LockSystem's Refresh and Unlock methods.
-	ErrNoSuchLock = errors.New("webdav: no such lock")
-)
-
-// Condition can match a WebDAV resource, based on a token or ETag.
-// Exactly one of Token and ETag should be non-empty.
-type Condition struct {
-	Not   bool
-	Token string
-	ETag  string
-}
-
-// LockSystem manages access to a collection of named resources. The elements
-// in a lock name are separated by slash ('/', U+002F) characters, regardless
-// of host operating system convention.
-type LockSystem interface {
-	// Confirm confirms that the caller can claim all of the locks specified by
-	// the given conditions, and that holding the union of all of those locks
-	// gives exclusive access to all of the named resources. Up to two resources
-	// can be named. Empty names are ignored.
-	//
-	// Exactly one of release and err will be non-nil. If release is non-nil,
-	// all of the requested locks are held until release is called. Calling
-	// release does not unlock the lock, in the WebDAV UNLOCK sense, but once
-	// Confirm has confirmed that a lock claim is valid, that lock cannot be
-	// Confirmed again until it has been released.
-	//
-	// If Confirm returns ErrConfirmationFailed then the Handler will continue
-	// to try any other set of locks presented (a WebDAV HTTP request can
-	// present more than one set of locks). If it returns any other non-nil
-	// error, the Handler will write a "500 Internal Server Error" HTTP status.
-	Confirm(now time.Time, name0, name1 string, conditions ...Condition) (release func(), err error)
-
-	// Create creates a lock with the given depth, duration, owner and root
-	// (name). The depth will either be negative (meaning infinite) or zero.
-	//
-	// If Create returns ErrLocked then the Handler will write a "423 Locked"
-	// HTTP status. If it returns any other non-nil error, the Handler will
-	// write a "500 Internal Server Error" HTTP status.
-	//
-	// See http://www.webdav.org/specs/rfc4918.html#rfc.section.9.10.6 for
-	// when to use each error.
-	//
-	// The token returned identifies the created lock. It should be an absolute
-	// URI as defined by RFC 3986, Section 4.3. In particular, it should not
-	// contain whitespace.
-	Create(now time.Time, details LockDetails) (token string, err error)
-
-	// Refresh refreshes the lock with the given token.
-	//
-	// If Refresh returns ErrLocked then the Handler will write a "423 Locked"
-	// HTTP Status. If Refresh returns ErrNoSuchLock then the Handler will write
-	// a "412 Precondition Failed" HTTP Status. If it returns any other non-nil
-	// error, the Handler will write a "500 Internal Server Error" HTTP status.
-	//
-	// See http://www.webdav.org/specs/rfc4918.html#rfc.section.9.10.6 for
-	// when to use each error.
-	Refresh(now time.Time, token string, duration time.Duration) (LockDetails, error)
-
-	// Unlock unlocks the lock with the given token.
-	//
-	// If Unlock returns ErrForbidden then the Handler will write a "403
-	// Forbidden" HTTP Status. If Unlock returns ErrLocked then the Handler
-	// will write a "423 Locked" HTTP status. If Unlock returns ErrNoSuchLock
-	// then the Handler will write a "409 Conflict" HTTP Status. If it returns
-	// any other non-nil error, the Handler will write a "500 Internal Server
-	// Error" HTTP status.
-	//
-	// See http://www.webdav.org/specs/rfc4918.html#rfc.section.9.11.1 for
-	// when to use each error.
-	Unlock(now time.Time, token string) error
-}
-
-// LockDetails are a lock's metadata.
-type LockDetails struct {
-	// Root is the root resource name being locked. For a zero-depth lock, the
-	// root is the only resource being locked.
-	Root string
-	// Duration is the lock timeout. A negative duration means infinite.
-	Duration time.Duration
-	// OwnerXML is the verbatim <owner> XML given in a LOCK HTTP request.
-	//
-	// TODO: does the "verbatim" nature play well with XML namespaces?
-	// Does the OwnerXML field need to have more structure? See
-	// https://codereview.appspot.com/175140043/#msg2
-	OwnerXML string
-	// ZeroDepth is whether the lock has zero depth. If it does not have zero
-	// depth, it has infinite depth.
-	ZeroDepth bool
-}
-
-// NewMemLS returns a new in-memory LockSystem.
-func NewMemLS() LockSystem {
-	return &memLS{
-		byName:  make(map[string]*memLSNode),
-		byToken: make(map[string]*memLSNode),
-		gen:     uint64(time.Now().Unix()),
-	}
-}
-
-type memLS struct {
-	mu      sync.Mutex
-	byName  map[string]*memLSNode
-	byToken map[string]*memLSNode
-	gen     uint64
-	// byExpiry only contains those nodes whose LockDetails have a finite
-	// Duration and are yet to expire.
-	byExpiry byExpiry
-}
-
-func (m *memLS) nextToken() string {
-	m.gen++
-	return strconv.FormatUint(m.gen, 10)
-}
-
-func (m *memLS) collectExpiredNodes(now time.Time) {
-	for len(m.byExpiry) > 0 {
-		if now.Before(m.byExpiry[0].expiry) {
-			break
-		}
-		m.remove(m.byExpiry[0])
-	}
-}
-
-func (m *memLS) Confirm(now time.Time, name0, name1 string, conditions ...Condition) (func(), error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.collectExpiredNodes(now)
-
-	var n0, n1 *memLSNode
-	if name0 != "" {
-		if n0 = m.lookup(slashClean(name0), conditions...); n0 == nil {
-			return nil, ErrConfirmationFailed
-		}
-	}
-	if name1 != "" {
-		if n1 = m.lookup(slashClean(name1), conditions...); n1 == nil {
-			return nil, ErrConfirmationFailed
-		}
-	}
-
-	// Don't hold the same node twice.
-	if n1 == n0 {
-		n1 = nil
-	}
-
-	if n0 != nil {
-		m.hold(n0)
-	}
-	if n1 != nil {
-		m.hold(n1)
-	}
-	return func() {
-		m.mu.Lock()
-		defer m.mu.Unlock()
-		if n1 != nil {
-			m.unhold(n1)
-		}
-		if n0 != nil {
-			m.unhold(n0)
-		}
-	}, nil
-}
-
-// lookup returns the node n that locks the named resource, provided that n
-// matches at least one of the given conditions and that lock isn't held by
-// another party. Otherwise, it returns nil.
-//
-// n may be a parent of the named resource, if n is an infinite depth lock.
-func (m *memLS) lookup(name string, conditions ...Condition) (n *memLSNode) {
-	// TODO: support Condition.Not and Condition.ETag.
-	for _, c := range conditions {
-		n = m.byToken[c.Token]
-		if n == nil || n.held {
-			continue
-		}
-		if name == n.details.Root {
-			return n
-		}
-		if n.details.ZeroDepth {
-			continue
-		}
-		if n.details.Root == "/" || strings.HasPrefix(name, n.details.Root+"/") {
-			return n
-		}
-	}
-	return nil
-}
-
-func (m *memLS) hold(n *memLSNode) {
-	if n.held {
-		panic("webdav: memLS inconsistent held state")
-	}
-	n.held = true
-	if n.details.Duration >= 0 && n.byExpiryIndex >= 0 {
-		heap.Remove(&m.byExpiry, n.byExpiryIndex)
-	}
-}
-
-func (m *memLS) unhold(n *memLSNode) {
-	if !n.held {
-		panic("webdav: memLS inconsistent held state")
-	}
-	n.held = false
-	if n.details.Duration >= 0 {
-		heap.Push(&m.byExpiry, n)
-	}
-}
-
-func (m *memLS) Create(now time.Time, details LockDetails) (string, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.collectExpiredNodes(now)
-	details.Root = slashClean(details.Root)
-
-	if !m.canCreate(details.Root, details.ZeroDepth) {
-		return "", ErrLocked
-	}
-	n := m.create(details.Root)
-	n.token = m.nextToken()
-	m.byToken[n.token] = n
-	n.details = details
-	if n.details.Duration >= 0 {
-		n.expiry = now.Add(n.details.Duration)
-		heap.Push(&m.byExpiry, n)
-	}
-	return n.token, nil
-}
-
-func (m *memLS) Refresh(now time.Time, token string, duration time.Duration) (LockDetails, error) {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.collectExpiredNodes(now)
-
-	n := m.byToken[token]
-	if n == nil {
-		return LockDetails{}, ErrNoSuchLock
-	}
-	if n.held {
-		return LockDetails{}, ErrLocked
-	}
-	if n.byExpiryIndex >= 0 {
-		heap.Remove(&m.byExpiry, n.byExpiryIndex)
-	}
-	n.details.Duration = duration
-	if n.details.Duration >= 0 {
-		n.expiry = now.Add(n.details.Duration)
-		heap.Push(&m.byExpiry, n)
-	}
-	return n.details, nil
-}
-
-func (m *memLS) Unlock(now time.Time, token string) error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-	m.collectExpiredNodes(now)
-
-	n := m.byToken[token]
-	if n == nil {
-		return ErrNoSuchLock
-	}
-	if n.held {
-		return ErrLocked
-	}
-	m.remove(n)
-	return nil
-}
-
-func (m *memLS) canCreate(name string, zeroDepth bool) bool {
-	return walkToRoot(name, func(name0 string, first bool) bool {
-		n := m.byName[name0]
-		if n == nil {
-			return true
-		}
-		if first {
-			if n.token != "" {
-				// The target node is already locked.
-				return false
-			}
-			if !zeroDepth {
-				// The requested lock depth is infinite, and the fact that n exists
-				// (n != nil) means that a descendent of the target node is locked.
-				return false
-			}
-		} else if n.token != "" && !n.details.ZeroDepth {
-			// An ancestor of the target node is locked with infinite depth.
-			return false
-		}
-		return true
-	})
-}
-
-func (m *memLS) create(name string) (ret *memLSNode) {
-	walkToRoot(name, func(name0 string, first bool) bool {
-		n := m.byName[name0]
-		if n == nil {
-			n = &memLSNode{
-				details: LockDetails{
-					Root: name0,
-				},
-				byExpiryIndex: -1,
-			}
-			m.byName[name0] = n
-		}
-		n.refCount++
-		if first {
-			ret = n
-		}
-		return true
-	})
-	return ret
-}
-
-func (m *memLS) remove(n *memLSNode) {
-	delete(m.byToken, n.token)
-	n.token = ""
-	walkToRoot(n.details.Root, func(name0 string, first bool) bool {
-		x := m.byName[name0]
-		x.refCount--
-		if x.refCount == 0 {
-			delete(m.byName, name0)
-		}
-		return true
-	})
-	if n.byExpiryIndex >= 0 {
-		heap.Remove(&m.byExpiry, n.byExpiryIndex)
-	}
-}
-
-func walkToRoot(name string, f func(name0 string, first bool) bool) bool {
-	for first := true; ; first = false {
-		if !f(name, first) {
-			return false
-		}
-		if name == "/" {
-			break
-		}
-		name = name[:strings.LastIndex(name, "/")]
-		if name == "" {
-			name = "/"
-		}
-	}
-	return true
-}
-
-type memLSNode struct {
-	// details are the lock metadata. Even if this node's name is not explicitly locked,
-	// details.Root will still equal the node's name.
-	details LockDetails
-	// token is the unique identifier for this node's lock. An empty token means that
-	// this node is not explicitly locked.
-	token string
-	// refCount is the number of self-or-descendent nodes that are explicitly locked.
-	refCount int
-	// expiry is when this node's lock expires.
-	expiry time.Time
-	// byExpiryIndex is the index of this node in memLS.byExpiry. It is -1
-	// if this node does not expire, or has expired.
-	byExpiryIndex int
-	// held is whether this node's lock is actively held by a Confirm call.
-	held bool
-}
-
-type byExpiry []*memLSNode
-
-func (b *byExpiry) Len() int {
-	return len(*b)
-}
-
-func (b *byExpiry) Less(i, j int) bool {
-	return (*b)[i].expiry.Before((*b)[j].expiry)
-}
-
-func (b *byExpiry) Swap(i, j int) {
-	(*b)[i], (*b)[j] = (*b)[j], (*b)[i]
-	(*b)[i].byExpiryIndex = i
-	(*b)[j].byExpiryIndex = j
-}
-
-func (b *byExpiry) Push(x interface{}) {
-	n := x.(*memLSNode)
-	n.byExpiryIndex = len(*b)
-	*b = append(*b, n)
-}
-
-func (b *byExpiry) Pop() interface{} {
-	i := len(*b) - 1
-	n := (*b)[i]
-	(*b)[i] = nil
-	n.byExpiryIndex = -1
-	*b = (*b)[:i]
-	return n
-}
-
-const infiniteTimeout = -1
-
-// parseTimeout parses the Timeout HTTP header, as per section 10.7. If s is
-// empty, an infiniteTimeout is returned.
-func parseTimeout(s string) (time.Duration, error) {
-	if s == "" {
-		return infiniteTimeout, nil
-	}
-	if i := strings.IndexByte(s, ','); i >= 0 {
-		s = s[:i]
-	}
-	s = strings.TrimSpace(s)
-	if s == "Infinite" {
-		return infiniteTimeout, nil
-	}
-	const pre = "Second-"
-	if !strings.HasPrefix(s, pre) {
-		return 0, errInvalidTimeout
-	}
-	s = s[len(pre):]
-	if s == "" || s[0] < '0' || '9' < s[0] {
-		return 0, errInvalidTimeout
-	}
-	n, err := strconv.ParseInt(s, 10, 64)
-	if err != nil || 1<<32-1 < n {
-		return 0, errInvalidTimeout
-	}
-	return time.Duration(n) * time.Second, nil
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/lock_test.go b/installer/vendor/golang.org/x/net/webdav/lock_test.go
deleted file mode 100644
index 116d6c0d7e..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/lock_test.go
+++ /dev/null
@@ -1,731 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"fmt"
-	"math/rand"
-	"path"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-	"testing"
-	"time"
-)
-
-func TestWalkToRoot(t *testing.T) {
-	testCases := []struct {
-		name string
-		want []string
-	}{{
-		"/a/b/c/d",
-		[]string{
-			"/a/b/c/d",
-			"/a/b/c",
-			"/a/b",
-			"/a",
-			"/",
-		},
-	}, {
-		"/a",
-		[]string{
-			"/a",
-			"/",
-		},
-	}, {
-		"/",
-		[]string{
-			"/",
-		},
-	}}
-
-	for _, tc := range testCases {
-		var got []string
-		if !walkToRoot(tc.name, func(name0 string, first bool) bool {
-			if first != (len(got) == 0) {
-				t.Errorf("name=%q: first=%t but len(got)==%d", tc.name, first, len(got))
-				return false
-			}
-			got = append(got, name0)
-			return true
-		}) {
-			continue
-		}
-		if !reflect.DeepEqual(got, tc.want) {
-			t.Errorf("name=%q:\ngot  %q\nwant %q", tc.name, got, tc.want)
-		}
-	}
-}
-
-var lockTestDurations = []time.Duration{
-	infiniteTimeout, // infiniteTimeout means to never expire.
-	0,               // A zero duration means to expire immediately.
-	100 * time.Hour, // A very large duration will not expire in these tests.
-}
-
-// lockTestNames are the names of a set of mutually compatible locks. For each
-// name fragment:
-//	- _ means no explicit lock.
-//	- i means a infinite-depth lock,
-//	- z means a zero-depth lock,
-var lockTestNames = []string{
-	"/_/_/_/_/z",
-	"/_/_/i",
-	"/_/z",
-	"/_/z/i",
-	"/_/z/z",
-	"/_/z/_/i",
-	"/_/z/_/z",
-	"/i",
-	"/z",
-	"/z/_/i",
-	"/z/_/z",
-}
-
-func lockTestZeroDepth(name string) bool {
-	switch name[len(name)-1] {
-	case 'i':
-		return false
-	case 'z':
-		return true
-	}
-	panic(fmt.Sprintf("lock name %q did not end with 'i' or 'z'", name))
-}
-
-func TestMemLSCanCreate(t *testing.T) {
-	now := time.Unix(0, 0)
-	m := NewMemLS().(*memLS)
-
-	for _, name := range lockTestNames {
-		_, err := m.Create(now, LockDetails{
-			Root:      name,
-			Duration:  infiniteTimeout,
-			ZeroDepth: lockTestZeroDepth(name),
-		})
-		if err != nil {
-			t.Fatalf("creating lock for %q: %v", name, err)
-		}
-	}
-
-	wantCanCreate := func(name string, zeroDepth bool) bool {
-		for _, n := range lockTestNames {
-			switch {
-			case n == name:
-				// An existing lock has the same name as the proposed lock.
-				return false
-			case strings.HasPrefix(n, name):
-				// An existing lock would be a child of the proposed lock,
-				// which conflicts if the proposed lock has infinite depth.
-				if !zeroDepth {
-					return false
-				}
-			case strings.HasPrefix(name, n):
-				// An existing lock would be an ancestor of the proposed lock,
-				// which conflicts if the ancestor has infinite depth.
-				if n[len(n)-1] == 'i' {
-					return false
-				}
-			}
-		}
-		return true
-	}
-
-	var check func(int, string)
-	check = func(recursion int, name string) {
-		for _, zeroDepth := range []bool{false, true} {
-			got := m.canCreate(name, zeroDepth)
-			want := wantCanCreate(name, zeroDepth)
-			if got != want {
-				t.Errorf("canCreate name=%q zeroDepth=%t: got %t, want %t", name, zeroDepth, got, want)
-			}
-		}
-		if recursion == 6 {
-			return
-		}
-		if name != "/" {
-			name += "/"
-		}
-		for _, c := range "_iz" {
-			check(recursion+1, name+string(c))
-		}
-	}
-	check(0, "/")
-}
-
-func TestMemLSLookup(t *testing.T) {
-	now := time.Unix(0, 0)
-	m := NewMemLS().(*memLS)
-
-	badToken := m.nextToken()
-	t.Logf("badToken=%q", badToken)
-
-	for _, name := range lockTestNames {
-		token, err := m.Create(now, LockDetails{
-			Root:      name,
-			Duration:  infiniteTimeout,
-			ZeroDepth: lockTestZeroDepth(name),
-		})
-		if err != nil {
-			t.Fatalf("creating lock for %q: %v", name, err)
-		}
-		t.Logf("%-15q -> node=%p token=%q", name, m.byName[name], token)
-	}
-
-	baseNames := append([]string{"/a", "/b/c"}, lockTestNames...)
-	for _, baseName := range baseNames {
-		for _, suffix := range []string{"", "/0", "/1/2/3"} {
-			name := baseName + suffix
-
-			goodToken := ""
-			base := m.byName[baseName]
-			if base != nil && (suffix == "" || !lockTestZeroDepth(baseName)) {
-				goodToken = base.token
-			}
-
-			for _, token := range []string{badToken, goodToken} {
-				if token == "" {
-					continue
-				}
-
-				got := m.lookup(name, Condition{Token: token})
-				want := base
-				if token == badToken {
-					want = nil
-				}
-				if got != want {
-					t.Errorf("name=%-20qtoken=%q (bad=%t): got %p, want %p",
-						name, token, token == badToken, got, want)
-				}
-			}
-		}
-	}
-}
-
-func TestMemLSConfirm(t *testing.T) {
-	now := time.Unix(0, 0)
-	m := NewMemLS().(*memLS)
-	alice, err := m.Create(now, LockDetails{
-		Root:      "/alice",
-		Duration:  infiniteTimeout,
-		ZeroDepth: false,
-	})
-	tweedle, err := m.Create(now, LockDetails{
-		Root:      "/tweedle",
-		Duration:  infiniteTimeout,
-		ZeroDepth: false,
-	})
-	if err != nil {
-		t.Fatalf("Create: %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Create: inconsistent state: %v", err)
-	}
-
-	// Test a mismatch between name and condition.
-	_, err = m.Confirm(now, "/tweedle/dee", "", Condition{Token: alice})
-	if err != ErrConfirmationFailed {
-		t.Fatalf("Confirm (mismatch): got %v, want ErrConfirmationFailed", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Confirm (mismatch): inconsistent state: %v", err)
-	}
-
-	// Test two names (that fall under the same lock) in the one Confirm call.
-	release, err := m.Confirm(now, "/tweedle/dee", "/tweedle/dum", Condition{Token: tweedle})
-	if err != nil {
-		t.Fatalf("Confirm (twins): %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Confirm (twins): inconsistent state: %v", err)
-	}
-	release()
-	if err := m.consistent(); err != nil {
-		t.Fatalf("release (twins): inconsistent state: %v", err)
-	}
-
-	// Test the same two names in overlapping Confirm / release calls.
-	releaseDee, err := m.Confirm(now, "/tweedle/dee", "", Condition{Token: tweedle})
-	if err != nil {
-		t.Fatalf("Confirm (sequence #0): %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Confirm (sequence #0): inconsistent state: %v", err)
-	}
-
-	_, err = m.Confirm(now, "/tweedle/dum", "", Condition{Token: tweedle})
-	if err != ErrConfirmationFailed {
-		t.Fatalf("Confirm (sequence #1): got %v, want ErrConfirmationFailed", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Confirm (sequence #1): inconsistent state: %v", err)
-	}
-
-	releaseDee()
-	if err := m.consistent(); err != nil {
-		t.Fatalf("release (sequence #2): inconsistent state: %v", err)
-	}
-
-	releaseDum, err := m.Confirm(now, "/tweedle/dum", "", Condition{Token: tweedle})
-	if err != nil {
-		t.Fatalf("Confirm (sequence #3): %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Confirm (sequence #3): inconsistent state: %v", err)
-	}
-
-	// Test that you can't unlock a held lock.
-	err = m.Unlock(now, tweedle)
-	if err != ErrLocked {
-		t.Fatalf("Unlock (sequence #4): got %v, want ErrLocked", err)
-	}
-
-	releaseDum()
-	if err := m.consistent(); err != nil {
-		t.Fatalf("release (sequence #5): inconsistent state: %v", err)
-	}
-
-	err = m.Unlock(now, tweedle)
-	if err != nil {
-		t.Fatalf("Unlock (sequence #6): %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Unlock (sequence #6): inconsistent state: %v", err)
-	}
-}
-
-func TestMemLSNonCanonicalRoot(t *testing.T) {
-	now := time.Unix(0, 0)
-	m := NewMemLS().(*memLS)
-	token, err := m.Create(now, LockDetails{
-		Root:     "/foo/./bar//",
-		Duration: 1 * time.Second,
-	})
-	if err != nil {
-		t.Fatalf("Create: %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Create: inconsistent state: %v", err)
-	}
-	if err := m.Unlock(now, token); err != nil {
-		t.Fatalf("Unlock: %v", err)
-	}
-	if err := m.consistent(); err != nil {
-		t.Fatalf("Unlock: inconsistent state: %v", err)
-	}
-}
-
-func TestMemLSExpiry(t *testing.T) {
-	m := NewMemLS().(*memLS)
-	testCases := []string{
-		"setNow 0",
-		"create /a.5",
-		"want /a.5",
-		"create /c.6",
-		"want /a.5 /c.6",
-		"create /a/b.7",
-		"want /a.5 /a/b.7 /c.6",
-		"setNow 4",
-		"want /a.5 /a/b.7 /c.6",
-		"setNow 5",
-		"want /a/b.7 /c.6",
-		"setNow 6",
-		"want /a/b.7",
-		"setNow 7",
-		"want ",
-		"setNow 8",
-		"want ",
-		"create /a.12",
-		"create /b.13",
-		"create /c.15",
-		"create /a/d.16",
-		"want /a.12 /a/d.16 /b.13 /c.15",
-		"refresh /a.14",
-		"want /a.14 /a/d.16 /b.13 /c.15",
-		"setNow 12",
-		"want /a.14 /a/d.16 /b.13 /c.15",
-		"setNow 13",
-		"want /a.14 /a/d.16 /c.15",
-		"setNow 14",
-		"want /a/d.16 /c.15",
-		"refresh /a/d.20",
-		"refresh /c.20",
-		"want /a/d.20 /c.20",
-		"setNow 20",
-		"want ",
-	}
-
-	tokens := map[string]string{}
-	zTime := time.Unix(0, 0)
-	now := zTime
-	for i, tc := range testCases {
-		j := strings.IndexByte(tc, ' ')
-		if j < 0 {
-			t.Fatalf("test case #%d %q: invalid command", i, tc)
-		}
-		op, arg := tc[:j], tc[j+1:]
-		switch op {
-		default:
-			t.Fatalf("test case #%d %q: invalid operation %q", i, tc, op)
-
-		case "create", "refresh":
-			parts := strings.Split(arg, ".")
-			if len(parts) != 2 {
-				t.Fatalf("test case #%d %q: invalid create", i, tc)
-			}
-			root := parts[0]
-			d, err := strconv.Atoi(parts[1])
-			if err != nil {
-				t.Fatalf("test case #%d %q: invalid duration", i, tc)
-			}
-			dur := time.Unix(0, 0).Add(time.Duration(d) * time.Second).Sub(now)
-
-			switch op {
-			case "create":
-				token, err := m.Create(now, LockDetails{
-					Root:      root,
-					Duration:  dur,
-					ZeroDepth: true,
-				})
-				if err != nil {
-					t.Fatalf("test case #%d %q: Create: %v", i, tc, err)
-				}
-				tokens[root] = token
-
-			case "refresh":
-				token := tokens[root]
-				if token == "" {
-					t.Fatalf("test case #%d %q: no token for %q", i, tc, root)
-				}
-				got, err := m.Refresh(now, token, dur)
-				if err != nil {
-					t.Fatalf("test case #%d %q: Refresh: %v", i, tc, err)
-				}
-				want := LockDetails{
-					Root:      root,
-					Duration:  dur,
-					ZeroDepth: true,
-				}
-				if got != want {
-					t.Fatalf("test case #%d %q:\ngot  %v\nwant %v", i, tc, got, want)
-				}
-			}
-
-		case "setNow":
-			d, err := strconv.Atoi(arg)
-			if err != nil {
-				t.Fatalf("test case #%d %q: invalid duration", i, tc)
-			}
-			now = time.Unix(0, 0).Add(time.Duration(d) * time.Second)
-
-		case "want":
-			m.mu.Lock()
-			m.collectExpiredNodes(now)
-			got := make([]string, 0, len(m.byToken))
-			for _, n := range m.byToken {
-				got = append(got, fmt.Sprintf("%s.%d",
-					n.details.Root, n.expiry.Sub(zTime)/time.Second))
-			}
-			m.mu.Unlock()
-			sort.Strings(got)
-			want := []string{}
-			if arg != "" {
-				want = strings.Split(arg, " ")
-			}
-			if !reflect.DeepEqual(got, want) {
-				t.Fatalf("test case #%d %q:\ngot  %q\nwant %q", i, tc, got, want)
-			}
-		}
-
-		if err := m.consistent(); err != nil {
-			t.Fatalf("test case #%d %q: inconsistent state: %v", i, tc, err)
-		}
-	}
-}
-
-func TestMemLS(t *testing.T) {
-	now := time.Unix(0, 0)
-	m := NewMemLS().(*memLS)
-	rng := rand.New(rand.NewSource(0))
-	tokens := map[string]string{}
-	nConfirm, nCreate, nRefresh, nUnlock := 0, 0, 0, 0
-	const N = 2000
-
-	for i := 0; i < N; i++ {
-		name := lockTestNames[rng.Intn(len(lockTestNames))]
-		duration := lockTestDurations[rng.Intn(len(lockTestDurations))]
-		confirmed, unlocked := false, false
-
-		// If the name was already locked, we randomly confirm/release, refresh
-		// or unlock it. Otherwise, we create a lock.
-		token := tokens[name]
-		if token != "" {
-			switch rng.Intn(3) {
-			case 0:
-				confirmed = true
-				nConfirm++
-				release, err := m.Confirm(now, name, "", Condition{Token: token})
-				if err != nil {
-					t.Fatalf("iteration #%d: Confirm %q: %v", i, name, err)
-				}
-				if err := m.consistent(); err != nil {
-					t.Fatalf("iteration #%d: inconsistent state: %v", i, err)
-				}
-				release()
-
-			case 1:
-				nRefresh++
-				if _, err := m.Refresh(now, token, duration); err != nil {
-					t.Fatalf("iteration #%d: Refresh %q: %v", i, name, err)
-				}
-
-			case 2:
-				unlocked = true
-				nUnlock++
-				if err := m.Unlock(now, token); err != nil {
-					t.Fatalf("iteration #%d: Unlock %q: %v", i, name, err)
-				}
-			}
-
-		} else {
-			nCreate++
-			var err error
-			token, err = m.Create(now, LockDetails{
-				Root:      name,
-				Duration:  duration,
-				ZeroDepth: lockTestZeroDepth(name),
-			})
-			if err != nil {
-				t.Fatalf("iteration #%d: Create %q: %v", i, name, err)
-			}
-		}
-
-		if !confirmed {
-			if duration == 0 || unlocked {
-				// A zero-duration lock should expire immediately and is
-				// effectively equivalent to being unlocked.
-				tokens[name] = ""
-			} else {
-				tokens[name] = token
-			}
-		}
-
-		if err := m.consistent(); err != nil {
-			t.Fatalf("iteration #%d: inconsistent state: %v", i, err)
-		}
-	}
-
-	if nConfirm < N/10 {
-		t.Fatalf("too few Confirm calls: got %d, want >= %d", nConfirm, N/10)
-	}
-	if nCreate < N/10 {
-		t.Fatalf("too few Create calls: got %d, want >= %d", nCreate, N/10)
-	}
-	if nRefresh < N/10 {
-		t.Fatalf("too few Refresh calls: got %d, want >= %d", nRefresh, N/10)
-	}
-	if nUnlock < N/10 {
-		t.Fatalf("too few Unlock calls: got %d, want >= %d", nUnlock, N/10)
-	}
-}
-
-func (m *memLS) consistent() error {
-	m.mu.Lock()
-	defer m.mu.Unlock()
-
-	// If m.byName is non-empty, then it must contain an entry for the root "/",
-	// and its refCount should equal the number of locked nodes.
-	if len(m.byName) > 0 {
-		n := m.byName["/"]
-		if n == nil {
-			return fmt.Errorf(`non-empty m.byName does not contain the root "/"`)
-		}
-		if n.refCount != len(m.byToken) {
-			return fmt.Errorf("root node refCount=%d, differs from len(m.byToken)=%d", n.refCount, len(m.byToken))
-		}
-	}
-
-	for name, n := range m.byName {
-		// The map keys should be consistent with the node's copy of the key.
-		if n.details.Root != name {
-			return fmt.Errorf("node name %q != byName map key %q", n.details.Root, name)
-		}
-
-		// A name must be clean, and start with a "/".
-		if len(name) == 0 || name[0] != '/' {
-			return fmt.Errorf(`node name %q does not start with "/"`, name)
-		}
-		if name != path.Clean(name) {
-			return fmt.Errorf(`node name %q is not clean`, name)
-		}
-
-		// A node's refCount should be positive.
-		if n.refCount <= 0 {
-			return fmt.Errorf("non-positive refCount for node at name %q", name)
-		}
-
-		// A node's refCount should be the number of self-or-descendents that
-		// are locked (i.e. have a non-empty token).
-		var list []string
-		for name0, n0 := range m.byName {
-			// All of lockTestNames' name fragments are one byte long: '_', 'i' or 'z',
-			// so strings.HasPrefix is equivalent to self-or-descendent name match.
-			// We don't have to worry about "/foo/bar" being a false positive match
-			// for "/foo/b".
-			if strings.HasPrefix(name0, name) && n0.token != "" {
-				list = append(list, name0)
-			}
-		}
-		if n.refCount != len(list) {
-			sort.Strings(list)
-			return fmt.Errorf("node at name %q has refCount %d but locked self-or-descendents are %q (len=%d)",
-				name, n.refCount, list, len(list))
-		}
-
-		// A node n is in m.byToken if it has a non-empty token.
-		if n.token != "" {
-			if _, ok := m.byToken[n.token]; !ok {
-				return fmt.Errorf("node at name %q has token %q but not in m.byToken", name, n.token)
-			}
-		}
-
-		// A node n is in m.byExpiry if it has a non-negative byExpiryIndex.
-		if n.byExpiryIndex >= 0 {
-			if n.byExpiryIndex >= len(m.byExpiry) {
-				return fmt.Errorf("node at name %q has byExpiryIndex %d but m.byExpiry has length %d", name, n.byExpiryIndex, len(m.byExpiry))
-			}
-			if n != m.byExpiry[n.byExpiryIndex] {
-				return fmt.Errorf("node at name %q has byExpiryIndex %d but that indexes a different node", name, n.byExpiryIndex)
-			}
-		}
-	}
-
-	for token, n := range m.byToken {
-		// The map keys should be consistent with the node's copy of the key.
-		if n.token != token {
-			return fmt.Errorf("node token %q != byToken map key %q", n.token, token)
-		}
-
-		// Every node in m.byToken is in m.byName.
-		if _, ok := m.byName[n.details.Root]; !ok {
-			return fmt.Errorf("node at name %q in m.byToken but not in m.byName", n.details.Root)
-		}
-	}
-
-	for i, n := range m.byExpiry {
-		// The slice indices should be consistent with the node's copy of the index.
-		if n.byExpiryIndex != i {
-			return fmt.Errorf("node byExpiryIndex %d != byExpiry slice index %d", n.byExpiryIndex, i)
-		}
-
-		// Every node in m.byExpiry is in m.byName.
-		if _, ok := m.byName[n.details.Root]; !ok {
-			return fmt.Errorf("node at name %q in m.byExpiry but not in m.byName", n.details.Root)
-		}
-
-		// No node in m.byExpiry should be held.
-		if n.held {
-			return fmt.Errorf("node at name %q in m.byExpiry is held", n.details.Root)
-		}
-	}
-	return nil
-}
-
-func TestParseTimeout(t *testing.T) {
-	testCases := []struct {
-		s       string
-		want    time.Duration
-		wantErr error
-	}{{
-		"",
-		infiniteTimeout,
-		nil,
-	}, {
-		"Infinite",
-		infiniteTimeout,
-		nil,
-	}, {
-		"Infinitesimal",
-		0,
-		errInvalidTimeout,
-	}, {
-		"infinite",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second-0",
-		0 * time.Second,
-		nil,
-	}, {
-		"Second-123",
-		123 * time.Second,
-		nil,
-	}, {
-		"  Second-456    ",
-		456 * time.Second,
-		nil,
-	}, {
-		"Second-4100000000",
-		4100000000 * time.Second,
-		nil,
-	}, {
-		"junk",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second-",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second--1",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second--123",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second-+123",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second-0x123",
-		0,
-		errInvalidTimeout,
-	}, {
-		"second-123",
-		0,
-		errInvalidTimeout,
-	}, {
-		"Second-4294967295",
-		4294967295 * time.Second,
-		nil,
-	}, {
-		// Section 10.7 says that "The timeout value for TimeType "Second"
-		// must not be greater than 2^32-1."
-		"Second-4294967296",
-		0,
-		errInvalidTimeout,
-	}, {
-		// This test case comes from section 9.10.9 of the spec. It says,
-		//
-		// "In this request, the client has specified that it desires an
-		// infinite-length lock, if available, otherwise a timeout of 4.1
-		// billion seconds, if available."
-		//
-		// The Go WebDAV package always supports infinite length locks,
-		// and ignores the fallback after the comma.
-		"Infinite, Second-4100000000",
-		infiniteTimeout,
-		nil,
-	}}
-
-	for _, tc := range testCases {
-		got, gotErr := parseTimeout(tc.s)
-		if got != tc.want || gotErr != tc.wantErr {
-			t.Errorf("parsing %q:\ngot  %v, %v\nwant %v, %v", tc.s, got, gotErr, tc.want, tc.wantErr)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/prop.go b/installer/vendor/golang.org/x/net/webdav/prop.go
deleted file mode 100644
index e36a3b31d2..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/prop.go
+++ /dev/null
@@ -1,418 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"mime"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strconv"
-
-	"golang.org/x/net/context"
-)
-
-// Proppatch describes a property update instruction as defined in RFC 4918.
-// See http://www.webdav.org/specs/rfc4918.html#METHOD_PROPPATCH
-type Proppatch struct {
-	// Remove specifies whether this patch removes properties. If it does not
-	// remove them, it sets them.
-	Remove bool
-	// Props contains the properties to be set or removed.
-	Props []Property
-}
-
-// Propstat describes a XML propstat element as defined in RFC 4918.
-// See http://www.webdav.org/specs/rfc4918.html#ELEMENT_propstat
-type Propstat struct {
-	// Props contains the properties for which Status applies.
-	Props []Property
-
-	// Status defines the HTTP status code of the properties in Prop.
-	// Allowed values include, but are not limited to the WebDAV status
-	// code extensions for HTTP/1.1.
-	// http://www.webdav.org/specs/rfc4918.html#status.code.extensions.to.http11
-	Status int
-
-	// XMLError contains the XML representation of the optional error element.
-	// XML content within this field must not rely on any predefined
-	// namespace declarations or prefixes. If empty, the XML error element
-	// is omitted.
-	XMLError string
-
-	// ResponseDescription contains the contents of the optional
-	// responsedescription field. If empty, the XML element is omitted.
-	ResponseDescription string
-}
-
-// makePropstats returns a slice containing those of x and y whose Props slice
-// is non-empty. If both are empty, it returns a slice containing an otherwise
-// zero Propstat whose HTTP status code is 200 OK.
-func makePropstats(x, y Propstat) []Propstat {
-	pstats := make([]Propstat, 0, 2)
-	if len(x.Props) != 0 {
-		pstats = append(pstats, x)
-	}
-	if len(y.Props) != 0 {
-		pstats = append(pstats, y)
-	}
-	if len(pstats) == 0 {
-		pstats = append(pstats, Propstat{
-			Status: http.StatusOK,
-		})
-	}
-	return pstats
-}
-
-// DeadPropsHolder holds the dead properties of a resource.
-//
-// Dead properties are those properties that are explicitly defined. In
-// comparison, live properties, such as DAV:getcontentlength, are implicitly
-// defined by the underlying resource, and cannot be explicitly overridden or
-// removed. See the Terminology section of
-// http://www.webdav.org/specs/rfc4918.html#rfc.section.3
-//
-// There is a whitelist of the names of live properties. This package handles
-// all live properties, and will only pass non-whitelisted names to the Patch
-// method of DeadPropsHolder implementations.
-type DeadPropsHolder interface {
-	// DeadProps returns a copy of the dead properties held.
-	DeadProps() (map[xml.Name]Property, error)
-
-	// Patch patches the dead properties held.
-	//
-	// Patching is atomic; either all or no patches succeed. It returns (nil,
-	// non-nil) if an internal server error occurred, otherwise the Propstats
-	// collectively contain one Property for each proposed patch Property. If
-	// all patches succeed, Patch returns a slice of length one and a Propstat
-	// element with a 200 OK HTTP status code. If none succeed, for reasons
-	// other than an internal server error, no Propstat has status 200 OK.
-	//
-	// For more details on when various HTTP status codes apply, see
-	// http://www.webdav.org/specs/rfc4918.html#PROPPATCH-status
-	Patch([]Proppatch) ([]Propstat, error)
-}
-
-// liveProps contains all supported, protected DAV: properties.
-var liveProps = map[xml.Name]struct {
-	// findFn implements the propfind function of this property. If nil,
-	// it indicates a hidden property.
-	findFn func(context.Context, FileSystem, LockSystem, string, os.FileInfo) (string, error)
-	// dir is true if the property applies to directories.
-	dir bool
-}{
-	{Space: "DAV:", Local: "resourcetype"}: {
-		findFn: findResourceType,
-		dir:    true,
-	},
-	{Space: "DAV:", Local: "displayname"}: {
-		findFn: findDisplayName,
-		dir:    true,
-	},
-	{Space: "DAV:", Local: "getcontentlength"}: {
-		findFn: findContentLength,
-		dir:    false,
-	},
-	{Space: "DAV:", Local: "getlastmodified"}: {
-		findFn: findLastModified,
-		// http://webdav.org/specs/rfc4918.html#PROPERTY_getlastmodified
-		// suggests that getlastmodified should only apply to GETable
-		// resources, and this package does not support GET on directories.
-		//
-		// Nonetheless, some WebDAV clients expect child directories to be
-		// sortable by getlastmodified date, so this value is true, not false.
-		// See golang.org/issue/15334.
-		dir: true,
-	},
-	{Space: "DAV:", Local: "creationdate"}: {
-		findFn: nil,
-		dir:    false,
-	},
-	{Space: "DAV:", Local: "getcontentlanguage"}: {
-		findFn: nil,
-		dir:    false,
-	},
-	{Space: "DAV:", Local: "getcontenttype"}: {
-		findFn: findContentType,
-		dir:    false,
-	},
-	{Space: "DAV:", Local: "getetag"}: {
-		findFn: findETag,
-		// findETag implements ETag as the concatenated hex values of a file's
-		// modification time and size. This is not a reliable synchronization
-		// mechanism for directories, so we do not advertise getetag for DAV
-		// collections.
-		dir: false,
-	},
-
-	// TODO: The lockdiscovery property requires LockSystem to list the
-	// active locks on a resource.
-	{Space: "DAV:", Local: "lockdiscovery"}: {},
-	{Space: "DAV:", Local: "supportedlock"}: {
-		findFn: findSupportedLock,
-		dir:    true,
-	},
-}
-
-// TODO(nigeltao) merge props and allprop?
-
-// Props returns the status of the properties named pnames for resource name.
-//
-// Each Propstat has a unique status and each property name will only be part
-// of one Propstat element.
-func props(ctx context.Context, fs FileSystem, ls LockSystem, name string, pnames []xml.Name) ([]Propstat, error) {
-	f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	isDir := fi.IsDir()
-
-	var deadProps map[xml.Name]Property
-	if dph, ok := f.(DeadPropsHolder); ok {
-		deadProps, err = dph.DeadProps()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	pstatOK := Propstat{Status: http.StatusOK}
-	pstatNotFound := Propstat{Status: http.StatusNotFound}
-	for _, pn := range pnames {
-		// If this file has dead properties, check if they contain pn.
-		if dp, ok := deadProps[pn]; ok {
-			pstatOK.Props = append(pstatOK.Props, dp)
-			continue
-		}
-		// Otherwise, it must either be a live property or we don't know it.
-		if prop := liveProps[pn]; prop.findFn != nil && (prop.dir || !isDir) {
-			innerXML, err := prop.findFn(ctx, fs, ls, name, fi)
-			if err != nil {
-				return nil, err
-			}
-			pstatOK.Props = append(pstatOK.Props, Property{
-				XMLName:  pn,
-				InnerXML: []byte(innerXML),
-			})
-		} else {
-			pstatNotFound.Props = append(pstatNotFound.Props, Property{
-				XMLName: pn,
-			})
-		}
-	}
-	return makePropstats(pstatOK, pstatNotFound), nil
-}
-
-// Propnames returns the property names defined for resource name.
-func propnames(ctx context.Context, fs FileSystem, ls LockSystem, name string) ([]xml.Name, error) {
-	f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	isDir := fi.IsDir()
-
-	var deadProps map[xml.Name]Property
-	if dph, ok := f.(DeadPropsHolder); ok {
-		deadProps, err = dph.DeadProps()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	pnames := make([]xml.Name, 0, len(liveProps)+len(deadProps))
-	for pn, prop := range liveProps {
-		if prop.findFn != nil && (prop.dir || !isDir) {
-			pnames = append(pnames, pn)
-		}
-	}
-	for pn := range deadProps {
-		pnames = append(pnames, pn)
-	}
-	return pnames, nil
-}
-
-// Allprop returns the properties defined for resource name and the properties
-// named in include.
-//
-// Note that RFC 4918 defines 'allprop' to return the DAV: properties defined
-// within the RFC plus dead properties. Other live properties should only be
-// returned if they are named in 'include'.
-//
-// See http://www.webdav.org/specs/rfc4918.html#METHOD_PROPFIND
-func allprop(ctx context.Context, fs FileSystem, ls LockSystem, name string, include []xml.Name) ([]Propstat, error) {
-	pnames, err := propnames(ctx, fs, ls, name)
-	if err != nil {
-		return nil, err
-	}
-	// Add names from include if they are not already covered in pnames.
-	nameset := make(map[xml.Name]bool)
-	for _, pn := range pnames {
-		nameset[pn] = true
-	}
-	for _, pn := range include {
-		if !nameset[pn] {
-			pnames = append(pnames, pn)
-		}
-	}
-	return props(ctx, fs, ls, name, pnames)
-}
-
-// Patch patches the properties of resource name. The return values are
-// constrained in the same manner as DeadPropsHolder.Patch.
-func patch(ctx context.Context, fs FileSystem, ls LockSystem, name string, patches []Proppatch) ([]Propstat, error) {
-	conflict := false
-loop:
-	for _, patch := range patches {
-		for _, p := range patch.Props {
-			if _, ok := liveProps[p.XMLName]; ok {
-				conflict = true
-				break loop
-			}
-		}
-	}
-	if conflict {
-		pstatForbidden := Propstat{
-			Status:   http.StatusForbidden,
-			XMLError: `<D:cannot-modify-protected-property xmlns:D="DAV:"/>`,
-		}
-		pstatFailedDep := Propstat{
-			Status: StatusFailedDependency,
-		}
-		for _, patch := range patches {
-			for _, p := range patch.Props {
-				if _, ok := liveProps[p.XMLName]; ok {
-					pstatForbidden.Props = append(pstatForbidden.Props, Property{XMLName: p.XMLName})
-				} else {
-					pstatFailedDep.Props = append(pstatFailedDep.Props, Property{XMLName: p.XMLName})
-				}
-			}
-		}
-		return makePropstats(pstatForbidden, pstatFailedDep), nil
-	}
-
-	f, err := fs.OpenFile(ctx, name, os.O_RDWR, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	if dph, ok := f.(DeadPropsHolder); ok {
-		ret, err := dph.Patch(patches)
-		if err != nil {
-			return nil, err
-		}
-		// http://www.webdav.org/specs/rfc4918.html#ELEMENT_propstat says that
-		// "The contents of the prop XML element must only list the names of
-		// properties to which the result in the status element applies."
-		for _, pstat := range ret {
-			for i, p := range pstat.Props {
-				pstat.Props[i] = Property{XMLName: p.XMLName}
-			}
-		}
-		return ret, nil
-	}
-	// The file doesn't implement the optional DeadPropsHolder interface, so
-	// all patches are forbidden.
-	pstat := Propstat{Status: http.StatusForbidden}
-	for _, patch := range patches {
-		for _, p := range patch.Props {
-			pstat.Props = append(pstat.Props, Property{XMLName: p.XMLName})
-		}
-	}
-	return []Propstat{pstat}, nil
-}
-
-func escapeXML(s string) string {
-	for i := 0; i < len(s); i++ {
-		// As an optimization, if s contains only ASCII letters, digits or a
-		// few special characters, the escaped value is s itself and we don't
-		// need to allocate a buffer and convert between string and []byte.
-		switch c := s[i]; {
-		case c == ' ' || c == '_' ||
-			('+' <= c && c <= '9') || // Digits as well as + , - . and /
-			('A' <= c && c <= 'Z') ||
-			('a' <= c && c <= 'z'):
-			continue
-		}
-		// Otherwise, go through the full escaping process.
-		var buf bytes.Buffer
-		xml.EscapeText(&buf, []byte(s))
-		return buf.String()
-	}
-	return s
-}
-
-func findResourceType(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	if fi.IsDir() {
-		return `<D:collection xmlns:D="DAV:"/>`, nil
-	}
-	return "", nil
-}
-
-func findDisplayName(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	if slashClean(name) == "/" {
-		// Hide the real name of a possibly prefixed root directory.
-		return "", nil
-	}
-	return escapeXML(fi.Name()), nil
-}
-
-func findContentLength(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	return strconv.FormatInt(fi.Size(), 10), nil
-}
-
-func findLastModified(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	return fi.ModTime().Format(http.TimeFormat), nil
-}
-
-func findContentType(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	f, err := fs.OpenFile(ctx, name, os.O_RDONLY, 0)
-	if err != nil {
-		return "", err
-	}
-	defer f.Close()
-	// This implementation is based on serveContent's code in the standard net/http package.
-	ctype := mime.TypeByExtension(filepath.Ext(name))
-	if ctype != "" {
-		return ctype, nil
-	}
-	// Read a chunk to decide between utf-8 text and binary.
-	var buf [512]byte
-	n, err := io.ReadFull(f, buf[:])
-	if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-		return "", err
-	}
-	ctype = http.DetectContentType(buf[:n])
-	// Rewind file.
-	_, err = f.Seek(0, os.SEEK_SET)
-	return ctype, err
-}
-
-func findETag(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	// The Apache http 2.4 web server by default concatenates the
-	// modification time and size of a file. We replicate the heuristic
-	// with nanosecond granularity.
-	return fmt.Sprintf(`"%x%x"`, fi.ModTime().UnixNano(), fi.Size()), nil
-}
-
-func findSupportedLock(ctx context.Context, fs FileSystem, ls LockSystem, name string, fi os.FileInfo) (string, error) {
-	return `` +
-		`<D:lockentry xmlns:D="DAV:">` +
-		`<D:lockscope><D:exclusive/></D:lockscope>` +
-		`<D:locktype><D:write/></D:locktype>` +
-		`</D:lockentry>`, nil
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/prop_test.go b/installer/vendor/golang.org/x/net/webdav/prop_test.go
deleted file mode 100644
index 57d0e826f3..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/prop_test.go
+++ /dev/null
@@ -1,613 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"encoding/xml"
-	"fmt"
-	"net/http"
-	"os"
-	"reflect"
-	"sort"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-func TestMemPS(t *testing.T) {
-	ctx := context.Background()
-	// calcProps calculates the getlastmodified and getetag DAV: property
-	// values in pstats for resource name in file-system fs.
-	calcProps := func(name string, fs FileSystem, ls LockSystem, pstats []Propstat) error {
-		fi, err := fs.Stat(ctx, name)
-		if err != nil {
-			return err
-		}
-		for _, pst := range pstats {
-			for i, p := range pst.Props {
-				switch p.XMLName {
-				case xml.Name{Space: "DAV:", Local: "getlastmodified"}:
-					p.InnerXML = []byte(fi.ModTime().Format(http.TimeFormat))
-					pst.Props[i] = p
-				case xml.Name{Space: "DAV:", Local: "getetag"}:
-					if fi.IsDir() {
-						continue
-					}
-					etag, err := findETag(ctx, fs, ls, name, fi)
-					if err != nil {
-						return err
-					}
-					p.InnerXML = []byte(etag)
-					pst.Props[i] = p
-				}
-			}
-		}
-		return nil
-	}
-
-	const (
-		lockEntry = `` +
-			`<D:lockentry xmlns:D="DAV:">` +
-			`<D:lockscope><D:exclusive/></D:lockscope>` +
-			`<D:locktype><D:write/></D:locktype>` +
-			`</D:lockentry>`
-		statForbiddenError = `<D:cannot-modify-protected-property xmlns:D="DAV:"/>`
-	)
-
-	type propOp struct {
-		op            string
-		name          string
-		pnames        []xml.Name
-		patches       []Proppatch
-		wantPnames    []xml.Name
-		wantPropstats []Propstat
-	}
-
-	testCases := []struct {
-		desc        string
-		noDeadProps bool
-		buildfs     []string
-		propOp      []propOp
-	}{{
-		desc:    "propname",
-		buildfs: []string{"mkdir /dir", "touch /file"},
-		propOp: []propOp{{
-			op:   "propname",
-			name: "/dir",
-			wantPnames: []xml.Name{
-				{Space: "DAV:", Local: "resourcetype"},
-				{Space: "DAV:", Local: "displayname"},
-				{Space: "DAV:", Local: "supportedlock"},
-				{Space: "DAV:", Local: "getlastmodified"},
-			},
-		}, {
-			op:   "propname",
-			name: "/file",
-			wantPnames: []xml.Name{
-				{Space: "DAV:", Local: "resourcetype"},
-				{Space: "DAV:", Local: "displayname"},
-				{Space: "DAV:", Local: "getcontentlength"},
-				{Space: "DAV:", Local: "getlastmodified"},
-				{Space: "DAV:", Local: "getcontenttype"},
-				{Space: "DAV:", Local: "getetag"},
-				{Space: "DAV:", Local: "supportedlock"},
-			},
-		}},
-	}, {
-		desc:    "allprop dir and file",
-		buildfs: []string{"mkdir /dir", "write /file foobarbaz"},
-		propOp: []propOp{{
-			op:   "allprop",
-			name: "/dir",
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "resourcetype"},
-					InnerXML: []byte(`<D:collection xmlns:D="DAV:"/>`),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "displayname"},
-					InnerXML: []byte("dir"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getlastmodified"},
-					InnerXML: nil, // Calculated during test.
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "supportedlock"},
-					InnerXML: []byte(lockEntry),
-				}},
-			}},
-		}, {
-			op:   "allprop",
-			name: "/file",
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "resourcetype"},
-					InnerXML: []byte(""),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "displayname"},
-					InnerXML: []byte("file"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getcontentlength"},
-					InnerXML: []byte("9"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getlastmodified"},
-					InnerXML: nil, // Calculated during test.
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getcontenttype"},
-					InnerXML: []byte("text/plain; charset=utf-8"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getetag"},
-					InnerXML: nil, // Calculated during test.
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "supportedlock"},
-					InnerXML: []byte(lockEntry),
-				}},
-			}},
-		}, {
-			op:   "allprop",
-			name: "/file",
-			pnames: []xml.Name{
-				{"DAV:", "resourcetype"},
-				{"foo", "bar"},
-			},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "resourcetype"},
-					InnerXML: []byte(""),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "displayname"},
-					InnerXML: []byte("file"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getcontentlength"},
-					InnerXML: []byte("9"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getlastmodified"},
-					InnerXML: nil, // Calculated during test.
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getcontenttype"},
-					InnerXML: []byte("text/plain; charset=utf-8"),
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "getetag"},
-					InnerXML: nil, // Calculated during test.
-				}, {
-					XMLName:  xml.Name{Space: "DAV:", Local: "supportedlock"},
-					InnerXML: []byte(lockEntry),
-				}}}, {
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}}},
-			},
-		}},
-	}, {
-		desc:    "propfind DAV:resourcetype",
-		buildfs: []string{"mkdir /dir", "touch /file"},
-		propOp: []propOp{{
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{"DAV:", "resourcetype"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "resourcetype"},
-					InnerXML: []byte(`<D:collection xmlns:D="DAV:"/>`),
-				}},
-			}},
-		}, {
-			op:     "propfind",
-			name:   "/file",
-			pnames: []xml.Name{{"DAV:", "resourcetype"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "resourcetype"},
-					InnerXML: []byte(""),
-				}},
-			}},
-		}},
-	}, {
-		desc:    "propfind unsupported DAV properties",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{"DAV:", "getcontentlanguage"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "getcontentlanguage"},
-				}},
-			}},
-		}, {
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{"DAV:", "creationdate"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "creationdate"},
-				}},
-			}},
-		}},
-	}, {
-		desc:    "propfind getetag for files but not for directories",
-		buildfs: []string{"mkdir /dir", "touch /file"},
-		propOp: []propOp{{
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{"DAV:", "getetag"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "getetag"},
-				}},
-			}},
-		}, {
-			op:     "propfind",
-			name:   "/file",
-			pnames: []xml.Name{{"DAV:", "getetag"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "getetag"},
-					InnerXML: nil, // Calculated during test.
-				}},
-			}},
-		}},
-	}, {
-		desc:        "proppatch property on no-dead-properties file system",
-		buildfs:     []string{"mkdir /dir"},
-		noDeadProps: true,
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusForbidden,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}, {
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "getetag"},
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status:   http.StatusForbidden,
-				XMLError: statForbiddenError,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "getetag"},
-				}},
-			}},
-		}},
-	}, {
-		desc:    "proppatch dead property",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}, {
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{Space: "foo", Local: "bar"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}},
-			}},
-		}},
-	}, {
-		desc:    "proppatch dead property with failed dependency",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}},
-			}, {
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "DAV:", Local: "displayname"},
-					InnerXML: []byte("xxx"),
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status:   http.StatusForbidden,
-				XMLError: statForbiddenError,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "DAV:", Local: "displayname"},
-				}},
-			}, {
-				Status: StatusFailedDependency,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}, {
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{Space: "foo", Local: "bar"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}},
-	}, {
-		desc:    "proppatch remove dead property",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}, {
-					XMLName:  xml.Name{Space: "spam", Local: "ham"},
-					InnerXML: []byte("eggs"),
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}, {
-					XMLName: xml.Name{Space: "spam", Local: "ham"},
-				}},
-			}},
-		}, {
-			op:   "propfind",
-			name: "/dir",
-			pnames: []xml.Name{
-				{Space: "foo", Local: "bar"},
-				{Space: "spam", Local: "ham"},
-			},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}, {
-					XMLName:  xml.Name{Space: "spam", Local: "ham"},
-					InnerXML: []byte("eggs"),
-				}},
-			}},
-		}, {
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Remove: true,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}, {
-			op:   "propfind",
-			name: "/dir",
-			pnames: []xml.Name{
-				{Space: "foo", Local: "bar"},
-				{Space: "spam", Local: "ham"},
-			},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}, {
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "spam", Local: "ham"},
-					InnerXML: []byte("eggs"),
-				}},
-			}},
-		}},
-	}, {
-		desc:    "propname with dead property",
-		buildfs: []string{"touch /file"},
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/file",
-			patches: []Proppatch{{
-				Props: []Property{{
-					XMLName:  xml.Name{Space: "foo", Local: "bar"},
-					InnerXML: []byte("baz"),
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}, {
-			op:   "propname",
-			name: "/file",
-			wantPnames: []xml.Name{
-				{Space: "DAV:", Local: "resourcetype"},
-				{Space: "DAV:", Local: "displayname"},
-				{Space: "DAV:", Local: "getcontentlength"},
-				{Space: "DAV:", Local: "getlastmodified"},
-				{Space: "DAV:", Local: "getcontenttype"},
-				{Space: "DAV:", Local: "getetag"},
-				{Space: "DAV:", Local: "supportedlock"},
-				{Space: "foo", Local: "bar"},
-			},
-		}},
-	}, {
-		desc:    "proppatch remove unknown dead property",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:   "proppatch",
-			name: "/dir",
-			patches: []Proppatch{{
-				Remove: true,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusOK,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo", Local: "bar"},
-				}},
-			}},
-		}},
-	}, {
-		desc:    "bad: propfind unknown property",
-		buildfs: []string{"mkdir /dir"},
-		propOp: []propOp{{
-			op:     "propfind",
-			name:   "/dir",
-			pnames: []xml.Name{{"foo:", "bar"}},
-			wantPropstats: []Propstat{{
-				Status: http.StatusNotFound,
-				Props: []Property{{
-					XMLName: xml.Name{Space: "foo:", Local: "bar"},
-				}},
-			}},
-		}},
-	}}
-
-	for _, tc := range testCases {
-		fs, err := buildTestFS(tc.buildfs)
-		if err != nil {
-			t.Fatalf("%s: cannot create test filesystem: %v", tc.desc, err)
-		}
-		if tc.noDeadProps {
-			fs = noDeadPropsFS{fs}
-		}
-		ls := NewMemLS()
-		for _, op := range tc.propOp {
-			desc := fmt.Sprintf("%s: %s %s", tc.desc, op.op, op.name)
-			if err = calcProps(op.name, fs, ls, op.wantPropstats); err != nil {
-				t.Fatalf("%s: calcProps: %v", desc, err)
-			}
-
-			// Call property system.
-			var propstats []Propstat
-			switch op.op {
-			case "propname":
-				pnames, err := propnames(ctx, fs, ls, op.name)
-				if err != nil {
-					t.Errorf("%s: got error %v, want nil", desc, err)
-					continue
-				}
-				sort.Sort(byXMLName(pnames))
-				sort.Sort(byXMLName(op.wantPnames))
-				if !reflect.DeepEqual(pnames, op.wantPnames) {
-					t.Errorf("%s: pnames\ngot  %q\nwant %q", desc, pnames, op.wantPnames)
-				}
-				continue
-			case "allprop":
-				propstats, err = allprop(ctx, fs, ls, op.name, op.pnames)
-			case "propfind":
-				propstats, err = props(ctx, fs, ls, op.name, op.pnames)
-			case "proppatch":
-				propstats, err = patch(ctx, fs, ls, op.name, op.patches)
-			default:
-				t.Fatalf("%s: %s not implemented", desc, op.op)
-			}
-			if err != nil {
-				t.Errorf("%s: got error %v, want nil", desc, err)
-				continue
-			}
-			// Compare return values from allprop, propfind or proppatch.
-			for _, pst := range propstats {
-				sort.Sort(byPropname(pst.Props))
-			}
-			for _, pst := range op.wantPropstats {
-				sort.Sort(byPropname(pst.Props))
-			}
-			sort.Sort(byStatus(propstats))
-			sort.Sort(byStatus(op.wantPropstats))
-			if !reflect.DeepEqual(propstats, op.wantPropstats) {
-				t.Errorf("%s: propstat\ngot  %q\nwant %q", desc, propstats, op.wantPropstats)
-			}
-		}
-	}
-}
-
-func cmpXMLName(a, b xml.Name) bool {
-	if a.Space != b.Space {
-		return a.Space < b.Space
-	}
-	return a.Local < b.Local
-}
-
-type byXMLName []xml.Name
-
-func (b byXMLName) Len() int           { return len(b) }
-func (b byXMLName) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b byXMLName) Less(i, j int) bool { return cmpXMLName(b[i], b[j]) }
-
-type byPropname []Property
-
-func (b byPropname) Len() int           { return len(b) }
-func (b byPropname) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b byPropname) Less(i, j int) bool { return cmpXMLName(b[i].XMLName, b[j].XMLName) }
-
-type byStatus []Propstat
-
-func (b byStatus) Len() int           { return len(b) }
-func (b byStatus) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-func (b byStatus) Less(i, j int) bool { return b[i].Status < b[j].Status }
-
-type noDeadPropsFS struct {
-	FileSystem
-}
-
-func (fs noDeadPropsFS) OpenFile(ctx context.Context, name string, flag int, perm os.FileMode) (File, error) {
-	f, err := fs.FileSystem.OpenFile(ctx, name, flag, perm)
-	if err != nil {
-		return nil, err
-	}
-	return noDeadPropsFile{f}, nil
-}
-
-// noDeadPropsFile wraps a File but strips any optional DeadPropsHolder methods
-// provided by the underlying File implementation.
-type noDeadPropsFile struct {
-	f File
-}
-
-func (f noDeadPropsFile) Close() error                              { return f.f.Close() }
-func (f noDeadPropsFile) Read(p []byte) (int, error)                { return f.f.Read(p) }
-func (f noDeadPropsFile) Readdir(count int) ([]os.FileInfo, error)  { return f.f.Readdir(count) }
-func (f noDeadPropsFile) Seek(off int64, whence int) (int64, error) { return f.f.Seek(off, whence) }
-func (f noDeadPropsFile) Stat() (os.FileInfo, error)                { return f.f.Stat() }
-func (f noDeadPropsFile) Write(p []byte) (int, error)               { return f.f.Write(p) }
diff --git a/installer/vendor/golang.org/x/net/webdav/webdav.go b/installer/vendor/golang.org/x/net/webdav/webdav.go
deleted file mode 100644
index 7b56687fc2..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/webdav.go
+++ /dev/null
@@ -1,702 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package webdav provides a WebDAV server implementation.
-package webdav // import "golang.org/x/net/webdav"
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"os"
-	"path"
-	"strings"
-	"time"
-)
-
-type Handler struct {
-	// Prefix is the URL path prefix to strip from WebDAV resource paths.
-	Prefix string
-	// FileSystem is the virtual file system.
-	FileSystem FileSystem
-	// LockSystem is the lock management system.
-	LockSystem LockSystem
-	// Logger is an optional error logger. If non-nil, it will be called
-	// for all HTTP requests.
-	Logger func(*http.Request, error)
-}
-
-func (h *Handler) stripPrefix(p string) (string, int, error) {
-	if h.Prefix == "" {
-		return p, http.StatusOK, nil
-	}
-	if r := strings.TrimPrefix(p, h.Prefix); len(r) < len(p) {
-		return r, http.StatusOK, nil
-	}
-	return p, http.StatusNotFound, errPrefixMismatch
-}
-
-func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	status, err := http.StatusBadRequest, errUnsupportedMethod
-	if h.FileSystem == nil {
-		status, err = http.StatusInternalServerError, errNoFileSystem
-	} else if h.LockSystem == nil {
-		status, err = http.StatusInternalServerError, errNoLockSystem
-	} else {
-		switch r.Method {
-		case "OPTIONS":
-			status, err = h.handleOptions(w, r)
-		case "GET", "HEAD", "POST":
-			status, err = h.handleGetHeadPost(w, r)
-		case "DELETE":
-			status, err = h.handleDelete(w, r)
-		case "PUT":
-			status, err = h.handlePut(w, r)
-		case "MKCOL":
-			status, err = h.handleMkcol(w, r)
-		case "COPY", "MOVE":
-			status, err = h.handleCopyMove(w, r)
-		case "LOCK":
-			status, err = h.handleLock(w, r)
-		case "UNLOCK":
-			status, err = h.handleUnlock(w, r)
-		case "PROPFIND":
-			status, err = h.handlePropfind(w, r)
-		case "PROPPATCH":
-			status, err = h.handleProppatch(w, r)
-		}
-	}
-
-	if status != 0 {
-		w.WriteHeader(status)
-		if status != http.StatusNoContent {
-			w.Write([]byte(StatusText(status)))
-		}
-	}
-	if h.Logger != nil {
-		h.Logger(r, err)
-	}
-}
-
-func (h *Handler) lock(now time.Time, root string) (token string, status int, err error) {
-	token, err = h.LockSystem.Create(now, LockDetails{
-		Root:      root,
-		Duration:  infiniteTimeout,
-		ZeroDepth: true,
-	})
-	if err != nil {
-		if err == ErrLocked {
-			return "", StatusLocked, err
-		}
-		return "", http.StatusInternalServerError, err
-	}
-	return token, 0, nil
-}
-
-func (h *Handler) confirmLocks(r *http.Request, src, dst string) (release func(), status int, err error) {
-	hdr := r.Header.Get("If")
-	if hdr == "" {
-		// An empty If header means that the client hasn't previously created locks.
-		// Even if this client doesn't care about locks, we still need to check that
-		// the resources aren't locked by another client, so we create temporary
-		// locks that would conflict with another client's locks. These temporary
-		// locks are unlocked at the end of the HTTP request.
-		now, srcToken, dstToken := time.Now(), "", ""
-		if src != "" {
-			srcToken, status, err = h.lock(now, src)
-			if err != nil {
-				return nil, status, err
-			}
-		}
-		if dst != "" {
-			dstToken, status, err = h.lock(now, dst)
-			if err != nil {
-				if srcToken != "" {
-					h.LockSystem.Unlock(now, srcToken)
-				}
-				return nil, status, err
-			}
-		}
-
-		return func() {
-			if dstToken != "" {
-				h.LockSystem.Unlock(now, dstToken)
-			}
-			if srcToken != "" {
-				h.LockSystem.Unlock(now, srcToken)
-			}
-		}, 0, nil
-	}
-
-	ih, ok := parseIfHeader(hdr)
-	if !ok {
-		return nil, http.StatusBadRequest, errInvalidIfHeader
-	}
-	// ih is a disjunction (OR) of ifLists, so any ifList will do.
-	for _, l := range ih.lists {
-		lsrc := l.resourceTag
-		if lsrc == "" {
-			lsrc = src
-		} else {
-			u, err := url.Parse(lsrc)
-			if err != nil {
-				continue
-			}
-			if u.Host != r.Host {
-				continue
-			}
-			lsrc, status, err = h.stripPrefix(u.Path)
-			if err != nil {
-				return nil, status, err
-			}
-		}
-		release, err = h.LockSystem.Confirm(time.Now(), lsrc, dst, l.conditions...)
-		if err == ErrConfirmationFailed {
-			continue
-		}
-		if err != nil {
-			return nil, http.StatusInternalServerError, err
-		}
-		return release, 0, nil
-	}
-	// Section 10.4.1 says that "If this header is evaluated and all state lists
-	// fail, then the request must fail with a 412 (Precondition Failed) status."
-	// We follow the spec even though the cond_put_corrupt_token test case from
-	// the litmus test warns on seeing a 412 instead of a 423 (Locked).
-	return nil, http.StatusPreconditionFailed, ErrLocked
-}
-
-func (h *Handler) handleOptions(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	ctx := getContext(r)
-	allow := "OPTIONS, LOCK, PUT, MKCOL"
-	if fi, err := h.FileSystem.Stat(ctx, reqPath); err == nil {
-		if fi.IsDir() {
-			allow = "OPTIONS, LOCK, DELETE, PROPPATCH, COPY, MOVE, UNLOCK, PROPFIND"
-		} else {
-			allow = "OPTIONS, LOCK, GET, HEAD, POST, DELETE, PROPPATCH, COPY, MOVE, UNLOCK, PROPFIND, PUT"
-		}
-	}
-	w.Header().Set("Allow", allow)
-	// http://www.webdav.org/specs/rfc4918.html#dav.compliance.classes
-	w.Header().Set("DAV", "1, 2")
-	// http://msdn.microsoft.com/en-au/library/cc250217.aspx
-	w.Header().Set("MS-Author-Via", "DAV")
-	return 0, nil
-}
-
-func (h *Handler) handleGetHeadPost(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	// TODO: check locks for read-only access??
-	ctx := getContext(r)
-	f, err := h.FileSystem.OpenFile(ctx, reqPath, os.O_RDONLY, 0)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	defer f.Close()
-	fi, err := f.Stat()
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	if fi.IsDir() {
-		return http.StatusMethodNotAllowed, nil
-	}
-	etag, err := findETag(ctx, h.FileSystem, h.LockSystem, reqPath, fi)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	w.Header().Set("ETag", etag)
-	// Let ServeContent determine the Content-Type header.
-	http.ServeContent(w, r, reqPath, fi.ModTime(), f)
-	return 0, nil
-}
-
-func (h *Handler) handleDelete(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	release, status, err := h.confirmLocks(r, reqPath, "")
-	if err != nil {
-		return status, err
-	}
-	defer release()
-
-	ctx := getContext(r)
-
-	// TODO: return MultiStatus where appropriate.
-
-	// "godoc os RemoveAll" says that "If the path does not exist, RemoveAll
-	// returns nil (no error)." WebDAV semantics are that it should return a
-	// "404 Not Found". We therefore have to Stat before we RemoveAll.
-	if _, err := h.FileSystem.Stat(ctx, reqPath); err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusNotFound, err
-		}
-		return http.StatusMethodNotAllowed, err
-	}
-	if err := h.FileSystem.RemoveAll(ctx, reqPath); err != nil {
-		return http.StatusMethodNotAllowed, err
-	}
-	return http.StatusNoContent, nil
-}
-
-func (h *Handler) handlePut(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	release, status, err := h.confirmLocks(r, reqPath, "")
-	if err != nil {
-		return status, err
-	}
-	defer release()
-	// TODO(rost): Support the If-Match, If-None-Match headers? See bradfitz'
-	// comments in http.checkEtag.
-	ctx := getContext(r)
-
-	f, err := h.FileSystem.OpenFile(ctx, reqPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-	if err != nil {
-		return http.StatusNotFound, err
-	}
-	_, copyErr := io.Copy(f, r.Body)
-	fi, statErr := f.Stat()
-	closeErr := f.Close()
-	// TODO(rost): Returning 405 Method Not Allowed might not be appropriate.
-	if copyErr != nil {
-		return http.StatusMethodNotAllowed, copyErr
-	}
-	if statErr != nil {
-		return http.StatusMethodNotAllowed, statErr
-	}
-	if closeErr != nil {
-		return http.StatusMethodNotAllowed, closeErr
-	}
-	etag, err := findETag(ctx, h.FileSystem, h.LockSystem, reqPath, fi)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	w.Header().Set("ETag", etag)
-	return http.StatusCreated, nil
-}
-
-func (h *Handler) handleMkcol(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	release, status, err := h.confirmLocks(r, reqPath, "")
-	if err != nil {
-		return status, err
-	}
-	defer release()
-
-	ctx := getContext(r)
-
-	if r.ContentLength > 0 {
-		return http.StatusUnsupportedMediaType, nil
-	}
-	if err := h.FileSystem.Mkdir(ctx, reqPath, 0777); err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusConflict, err
-		}
-		return http.StatusMethodNotAllowed, err
-	}
-	return http.StatusCreated, nil
-}
-
-func (h *Handler) handleCopyMove(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	hdr := r.Header.Get("Destination")
-	if hdr == "" {
-		return http.StatusBadRequest, errInvalidDestination
-	}
-	u, err := url.Parse(hdr)
-	if err != nil {
-		return http.StatusBadRequest, errInvalidDestination
-	}
-	if u.Host != r.Host {
-		return http.StatusBadGateway, errInvalidDestination
-	}
-
-	src, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-
-	dst, status, err := h.stripPrefix(u.Path)
-	if err != nil {
-		return status, err
-	}
-
-	if dst == "" {
-		return http.StatusBadGateway, errInvalidDestination
-	}
-	if dst == src {
-		return http.StatusForbidden, errDestinationEqualsSource
-	}
-
-	ctx := getContext(r)
-
-	if r.Method == "COPY" {
-		// Section 7.5.1 says that a COPY only needs to lock the destination,
-		// not both destination and source. Strictly speaking, this is racy,
-		// even though a COPY doesn't modify the source, if a concurrent
-		// operation modifies the source. However, the litmus test explicitly
-		// checks that COPYing a locked-by-another source is OK.
-		release, status, err := h.confirmLocks(r, "", dst)
-		if err != nil {
-			return status, err
-		}
-		defer release()
-
-		// Section 9.8.3 says that "The COPY method on a collection without a Depth
-		// header must act as if a Depth header with value "infinity" was included".
-		depth := infiniteDepth
-		if hdr := r.Header.Get("Depth"); hdr != "" {
-			depth = parseDepth(hdr)
-			if depth != 0 && depth != infiniteDepth {
-				// Section 9.8.3 says that "A client may submit a Depth header on a
-				// COPY on a collection with a value of "0" or "infinity"."
-				return http.StatusBadRequest, errInvalidDepth
-			}
-		}
-		return copyFiles(ctx, h.FileSystem, src, dst, r.Header.Get("Overwrite") != "F", depth, 0)
-	}
-
-	release, status, err := h.confirmLocks(r, src, dst)
-	if err != nil {
-		return status, err
-	}
-	defer release()
-
-	// Section 9.9.2 says that "The MOVE method on a collection must act as if
-	// a "Depth: infinity" header was used on it. A client must not submit a
-	// Depth header on a MOVE on a collection with any value but "infinity"."
-	if hdr := r.Header.Get("Depth"); hdr != "" {
-		if parseDepth(hdr) != infiniteDepth {
-			return http.StatusBadRequest, errInvalidDepth
-		}
-	}
-	return moveFiles(ctx, h.FileSystem, src, dst, r.Header.Get("Overwrite") == "T")
-}
-
-func (h *Handler) handleLock(w http.ResponseWriter, r *http.Request) (retStatus int, retErr error) {
-	duration, err := parseTimeout(r.Header.Get("Timeout"))
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-	li, status, err := readLockInfo(r.Body)
-	if err != nil {
-		return status, err
-	}
-
-	ctx := getContext(r)
-	token, ld, now, created := "", LockDetails{}, time.Now(), false
-	if li == (lockInfo{}) {
-		// An empty lockInfo means to refresh the lock.
-		ih, ok := parseIfHeader(r.Header.Get("If"))
-		if !ok {
-			return http.StatusBadRequest, errInvalidIfHeader
-		}
-		if len(ih.lists) == 1 && len(ih.lists[0].conditions) == 1 {
-			token = ih.lists[0].conditions[0].Token
-		}
-		if token == "" {
-			return http.StatusBadRequest, errInvalidLockToken
-		}
-		ld, err = h.LockSystem.Refresh(now, token, duration)
-		if err != nil {
-			if err == ErrNoSuchLock {
-				return http.StatusPreconditionFailed, err
-			}
-			return http.StatusInternalServerError, err
-		}
-
-	} else {
-		// Section 9.10.3 says that "If no Depth header is submitted on a LOCK request,
-		// then the request MUST act as if a "Depth:infinity" had been submitted."
-		depth := infiniteDepth
-		if hdr := r.Header.Get("Depth"); hdr != "" {
-			depth = parseDepth(hdr)
-			if depth != 0 && depth != infiniteDepth {
-				// Section 9.10.3 says that "Values other than 0 or infinity must not be
-				// used with the Depth header on a LOCK method".
-				return http.StatusBadRequest, errInvalidDepth
-			}
-		}
-		reqPath, status, err := h.stripPrefix(r.URL.Path)
-		if err != nil {
-			return status, err
-		}
-		ld = LockDetails{
-			Root:      reqPath,
-			Duration:  duration,
-			OwnerXML:  li.Owner.InnerXML,
-			ZeroDepth: depth == 0,
-		}
-		token, err = h.LockSystem.Create(now, ld)
-		if err != nil {
-			if err == ErrLocked {
-				return StatusLocked, err
-			}
-			return http.StatusInternalServerError, err
-		}
-		defer func() {
-			if retErr != nil {
-				h.LockSystem.Unlock(now, token)
-			}
-		}()
-
-		// Create the resource if it didn't previously exist.
-		if _, err := h.FileSystem.Stat(ctx, reqPath); err != nil {
-			f, err := h.FileSystem.OpenFile(ctx, reqPath, os.O_RDWR|os.O_CREATE|os.O_TRUNC, 0666)
-			if err != nil {
-				// TODO: detect missing intermediate dirs and return http.StatusConflict?
-				return http.StatusInternalServerError, err
-			}
-			f.Close()
-			created = true
-		}
-
-		// http://www.webdav.org/specs/rfc4918.html#HEADER_Lock-Token says that the
-		// Lock-Token value is a Coded-URL. We add angle brackets.
-		w.Header().Set("Lock-Token", "<"+token+">")
-	}
-
-	w.Header().Set("Content-Type", "application/xml; charset=utf-8")
-	if created {
-		// This is "w.WriteHeader(http.StatusCreated)" and not "return
-		// http.StatusCreated, nil" because we write our own (XML) response to w
-		// and Handler.ServeHTTP would otherwise write "Created".
-		w.WriteHeader(http.StatusCreated)
-	}
-	writeLockInfo(w, token, ld)
-	return 0, nil
-}
-
-func (h *Handler) handleUnlock(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	// http://www.webdav.org/specs/rfc4918.html#HEADER_Lock-Token says that the
-	// Lock-Token value is a Coded-URL. We strip its angle brackets.
-	t := r.Header.Get("Lock-Token")
-	if len(t) < 2 || t[0] != '<' || t[len(t)-1] != '>' {
-		return http.StatusBadRequest, errInvalidLockToken
-	}
-	t = t[1 : len(t)-1]
-
-	switch err = h.LockSystem.Unlock(time.Now(), t); err {
-	case nil:
-		return http.StatusNoContent, err
-	case ErrForbidden:
-		return http.StatusForbidden, err
-	case ErrLocked:
-		return StatusLocked, err
-	case ErrNoSuchLock:
-		return http.StatusConflict, err
-	default:
-		return http.StatusInternalServerError, err
-	}
-}
-
-func (h *Handler) handlePropfind(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	ctx := getContext(r)
-	fi, err := h.FileSystem.Stat(ctx, reqPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusNotFound, err
-		}
-		return http.StatusMethodNotAllowed, err
-	}
-	depth := infiniteDepth
-	if hdr := r.Header.Get("Depth"); hdr != "" {
-		depth = parseDepth(hdr)
-		if depth == invalidDepth {
-			return http.StatusBadRequest, errInvalidDepth
-		}
-	}
-	pf, status, err := readPropfind(r.Body)
-	if err != nil {
-		return status, err
-	}
-
-	mw := multistatusWriter{w: w}
-
-	walkFn := func(reqPath string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		var pstats []Propstat
-		if pf.Propname != nil {
-			pnames, err := propnames(ctx, h.FileSystem, h.LockSystem, reqPath)
-			if err != nil {
-				return err
-			}
-			pstat := Propstat{Status: http.StatusOK}
-			for _, xmlname := range pnames {
-				pstat.Props = append(pstat.Props, Property{XMLName: xmlname})
-			}
-			pstats = append(pstats, pstat)
-		} else if pf.Allprop != nil {
-			pstats, err = allprop(ctx, h.FileSystem, h.LockSystem, reqPath, pf.Prop)
-		} else {
-			pstats, err = props(ctx, h.FileSystem, h.LockSystem, reqPath, pf.Prop)
-		}
-		if err != nil {
-			return err
-		}
-		return mw.write(makePropstatResponse(path.Join(h.Prefix, reqPath), pstats))
-	}
-
-	walkErr := walkFS(ctx, h.FileSystem, depth, reqPath, fi, walkFn)
-	closeErr := mw.close()
-	if walkErr != nil {
-		return http.StatusInternalServerError, walkErr
-	}
-	if closeErr != nil {
-		return http.StatusInternalServerError, closeErr
-	}
-	return 0, nil
-}
-
-func (h *Handler) handleProppatch(w http.ResponseWriter, r *http.Request) (status int, err error) {
-	reqPath, status, err := h.stripPrefix(r.URL.Path)
-	if err != nil {
-		return status, err
-	}
-	release, status, err := h.confirmLocks(r, reqPath, "")
-	if err != nil {
-		return status, err
-	}
-	defer release()
-
-	ctx := getContext(r)
-
-	if _, err := h.FileSystem.Stat(ctx, reqPath); err != nil {
-		if os.IsNotExist(err) {
-			return http.StatusNotFound, err
-		}
-		return http.StatusMethodNotAllowed, err
-	}
-	patches, status, err := readProppatch(r.Body)
-	if err != nil {
-		return status, err
-	}
-	pstats, err := patch(ctx, h.FileSystem, h.LockSystem, reqPath, patches)
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	mw := multistatusWriter{w: w}
-	writeErr := mw.write(makePropstatResponse(r.URL.Path, pstats))
-	closeErr := mw.close()
-	if writeErr != nil {
-		return http.StatusInternalServerError, writeErr
-	}
-	if closeErr != nil {
-		return http.StatusInternalServerError, closeErr
-	}
-	return 0, nil
-}
-
-func makePropstatResponse(href string, pstats []Propstat) *response {
-	resp := response{
-		Href:     []string{(&url.URL{Path: href}).EscapedPath()},
-		Propstat: make([]propstat, 0, len(pstats)),
-	}
-	for _, p := range pstats {
-		var xmlErr *xmlError
-		if p.XMLError != "" {
-			xmlErr = &xmlError{InnerXML: []byte(p.XMLError)}
-		}
-		resp.Propstat = append(resp.Propstat, propstat{
-			Status:              fmt.Sprintf("HTTP/1.1 %d %s", p.Status, StatusText(p.Status)),
-			Prop:                p.Props,
-			ResponseDescription: p.ResponseDescription,
-			Error:               xmlErr,
-		})
-	}
-	return &resp
-}
-
-const (
-	infiniteDepth = -1
-	invalidDepth  = -2
-)
-
-// parseDepth maps the strings "0", "1" and "infinity" to 0, 1 and
-// infiniteDepth. Parsing any other string returns invalidDepth.
-//
-// Different WebDAV methods have further constraints on valid depths:
-//	- PROPFIND has no further restrictions, as per section 9.1.
-//	- COPY accepts only "0" or "infinity", as per section 9.8.3.
-//	- MOVE accepts only "infinity", as per section 9.9.2.
-//	- LOCK accepts only "0" or "infinity", as per section 9.10.3.
-// These constraints are enforced by the handleXxx methods.
-func parseDepth(s string) int {
-	switch s {
-	case "0":
-		return 0
-	case "1":
-		return 1
-	case "infinity":
-		return infiniteDepth
-	}
-	return invalidDepth
-}
-
-// http://www.webdav.org/specs/rfc4918.html#status.code.extensions.to.http11
-const (
-	StatusMulti               = 207
-	StatusUnprocessableEntity = 422
-	StatusLocked              = 423
-	StatusFailedDependency    = 424
-	StatusInsufficientStorage = 507
-)
-
-func StatusText(code int) string {
-	switch code {
-	case StatusMulti:
-		return "Multi-Status"
-	case StatusUnprocessableEntity:
-		return "Unprocessable Entity"
-	case StatusLocked:
-		return "Locked"
-	case StatusFailedDependency:
-		return "Failed Dependency"
-	case StatusInsufficientStorage:
-		return "Insufficient Storage"
-	}
-	return http.StatusText(code)
-}
-
-var (
-	errDestinationEqualsSource = errors.New("webdav: destination equals source")
-	errDirectoryNotEmpty       = errors.New("webdav: directory not empty")
-	errInvalidDepth            = errors.New("webdav: invalid depth")
-	errInvalidDestination      = errors.New("webdav: invalid destination")
-	errInvalidIfHeader         = errors.New("webdav: invalid If header")
-	errInvalidLockInfo         = errors.New("webdav: invalid lock info")
-	errInvalidLockToken        = errors.New("webdav: invalid lock token")
-	errInvalidPropfind         = errors.New("webdav: invalid propfind")
-	errInvalidProppatch        = errors.New("webdav: invalid proppatch")
-	errInvalidResponse         = errors.New("webdav: invalid response")
-	errInvalidTimeout          = errors.New("webdav: invalid timeout")
-	errNoFileSystem            = errors.New("webdav: no file system")
-	errNoLockSystem            = errors.New("webdav: no lock system")
-	errNotADirectory           = errors.New("webdav: not a directory")
-	errPrefixMismatch          = errors.New("webdav: prefix mismatch")
-	errRecursionTooDeep        = errors.New("webdav: recursion too deep")
-	errUnsupportedLockInfo     = errors.New("webdav: unsupported lock info")
-	errUnsupportedMethod       = errors.New("webdav: unsupported method")
-)
diff --git a/installer/vendor/golang.org/x/net/webdav/webdav_test.go b/installer/vendor/golang.org/x/net/webdav/webdav_test.go
deleted file mode 100644
index 25e0d54214..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/webdav_test.go
+++ /dev/null
@@ -1,344 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"os"
-	"reflect"
-	"regexp"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/net/context"
-)
-
-// TODO: add tests to check XML responses with the expected prefix path
-func TestPrefix(t *testing.T) {
-	const dst, blah = "Destination", "blah blah blah"
-
-	// createLockBody comes from the example in Section 9.10.7.
-	const createLockBody = `<?xml version="1.0" encoding="utf-8" ?>
-		<D:lockinfo xmlns:D='DAV:'>
-			<D:lockscope><D:exclusive/></D:lockscope>
-			<D:locktype><D:write/></D:locktype>
-			<D:owner>
-				<D:href>http://example.org/~ejw/contact.html</D:href>
-			</D:owner>
-		</D:lockinfo>
-	`
-
-	do := func(method, urlStr string, body string, wantStatusCode int, headers ...string) (http.Header, error) {
-		var bodyReader io.Reader
-		if body != "" {
-			bodyReader = strings.NewReader(body)
-		}
-		req, err := http.NewRequest(method, urlStr, bodyReader)
-		if err != nil {
-			return nil, err
-		}
-		for len(headers) >= 2 {
-			req.Header.Add(headers[0], headers[1])
-			headers = headers[2:]
-		}
-		res, err := http.DefaultTransport.RoundTrip(req)
-		if err != nil {
-			return nil, err
-		}
-		defer res.Body.Close()
-		if res.StatusCode != wantStatusCode {
-			return nil, fmt.Errorf("got status code %d, want %d", res.StatusCode, wantStatusCode)
-		}
-		return res.Header, nil
-	}
-
-	prefixes := []string{
-		"/",
-		"/a/",
-		"/a/b/",
-		"/a/b/c/",
-	}
-	ctx := context.Background()
-	for _, prefix := range prefixes {
-		fs := NewMemFS()
-		h := &Handler{
-			FileSystem: fs,
-			LockSystem: NewMemLS(),
-		}
-		mux := http.NewServeMux()
-		if prefix != "/" {
-			h.Prefix = prefix
-		}
-		mux.Handle(prefix, h)
-		srv := httptest.NewServer(mux)
-		defer srv.Close()
-
-		// The script is:
-		//	MKCOL /a
-		//	MKCOL /a/b
-		//	PUT   /a/b/c
-		//	COPY  /a/b/c /a/b/d
-		//	MKCOL /a/b/e
-		//	MOVE  /a/b/d /a/b/e/f
-		//	LOCK  /a/b/e/g
-		//	PUT   /a/b/e/g
-		// which should yield the (possibly stripped) filenames /a/b/c,
-		// /a/b/e/f and /a/b/e/g, plus their parent directories.
-
-		wantA := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusMovedPermanently,
-			"/a/b/":   http.StatusNotFound,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if _, err := do("MKCOL", srv.URL+"/a", "", wantA); err != nil {
-			t.Errorf("prefix=%-9q MKCOL /a: %v", prefix, err)
-			continue
-		}
-
-		wantB := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusMovedPermanently,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if _, err := do("MKCOL", srv.URL+"/a/b", "", wantB); err != nil {
-			t.Errorf("prefix=%-9q MKCOL /a/b: %v", prefix, err)
-			continue
-		}
-
-		wantC := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusMovedPermanently,
-		}[prefix]
-		if _, err := do("PUT", srv.URL+"/a/b/c", blah, wantC); err != nil {
-			t.Errorf("prefix=%-9q PUT /a/b/c: %v", prefix, err)
-			continue
-		}
-
-		wantD := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusMovedPermanently,
-		}[prefix]
-		if _, err := do("COPY", srv.URL+"/a/b/c", "", wantD, dst, srv.URL+"/a/b/d"); err != nil {
-			t.Errorf("prefix=%-9q COPY /a/b/c /a/b/d: %v", prefix, err)
-			continue
-		}
-
-		wantE := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if _, err := do("MKCOL", srv.URL+"/a/b/e", "", wantE); err != nil {
-			t.Errorf("prefix=%-9q MKCOL /a/b/e: %v", prefix, err)
-			continue
-		}
-
-		wantF := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if _, err := do("MOVE", srv.URL+"/a/b/d", "", wantF, dst, srv.URL+"/a/b/e/f"); err != nil {
-			t.Errorf("prefix=%-9q MOVE /a/b/d /a/b/e/f: %v", prefix, err)
-			continue
-		}
-
-		var lockToken string
-		wantG := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if h, err := do("LOCK", srv.URL+"/a/b/e/g", createLockBody, wantG); err != nil {
-			t.Errorf("prefix=%-9q LOCK /a/b/e/g: %v", prefix, err)
-			continue
-		} else {
-			lockToken = h.Get("Lock-Token")
-		}
-
-		ifHeader := fmt.Sprintf("<%s/a/b/e/g> (%s)", srv.URL, lockToken)
-		wantH := map[string]int{
-			"/":       http.StatusCreated,
-			"/a/":     http.StatusCreated,
-			"/a/b/":   http.StatusCreated,
-			"/a/b/c/": http.StatusNotFound,
-		}[prefix]
-		if _, err := do("PUT", srv.URL+"/a/b/e/g", blah, wantH, "If", ifHeader); err != nil {
-			t.Errorf("prefix=%-9q PUT /a/b/e/g: %v", prefix, err)
-			continue
-		}
-
-		got, err := find(ctx, nil, fs, "/")
-		if err != nil {
-			t.Errorf("prefix=%-9q find: %v", prefix, err)
-			continue
-		}
-		sort.Strings(got)
-		want := map[string][]string{
-			"/":       {"/", "/a", "/a/b", "/a/b/c", "/a/b/e", "/a/b/e/f", "/a/b/e/g"},
-			"/a/":     {"/", "/b", "/b/c", "/b/e", "/b/e/f", "/b/e/g"},
-			"/a/b/":   {"/", "/c", "/e", "/e/f", "/e/g"},
-			"/a/b/c/": {"/"},
-		}[prefix]
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("prefix=%-9q find:\ngot  %v\nwant %v", prefix, got, want)
-			continue
-		}
-	}
-}
-
-func TestEscapeXML(t *testing.T) {
-	// These test cases aren't exhaustive, and there is more than one way to
-	// escape e.g. a quot (as "&#34;" or "&quot;") or an apos. We presume that
-	// the encoding/xml package tests xml.EscapeText more thoroughly. This test
-	// here is just a sanity check for this package's escapeXML function, and
-	// its attempt to provide a fast path (and avoid a bytes.Buffer allocation)
-	// when escaping filenames is obviously a no-op.
-	testCases := map[string]string{
-		"":              "",
-		" ":             " ",
-		"&":             "&amp;",
-		"*":             "*",
-		"+":             "+",
-		",":             ",",
-		"-":             "-",
-		".":             ".",
-		"/":             "/",
-		"0":             "0",
-		"9":             "9",
-		":":             ":",
-		"<":             "&lt;",
-		">":             "&gt;",
-		"A":             "A",
-		"_":             "_",
-		"a":             "a",
-		"~":             "~",
-		"\u0201":        "\u0201",
-		"&amp;":         "&amp;amp;",
-		"foo&<b/ar>baz": "foo&amp;&lt;b/ar&gt;baz",
-	}
-
-	for in, want := range testCases {
-		if got := escapeXML(in); got != want {
-			t.Errorf("in=%q: got %q, want %q", in, got, want)
-		}
-	}
-}
-
-func TestFilenameEscape(t *testing.T) {
-	hrefRe := regexp.MustCompile(`<D:href>([^<]*)</D:href>`)
-	displayNameRe := regexp.MustCompile(`<D:displayname>([^<]*)</D:displayname>`)
-	do := func(method, urlStr string) (string, string, error) {
-		req, err := http.NewRequest(method, urlStr, nil)
-		if err != nil {
-			return "", "", err
-		}
-		res, err := http.DefaultClient.Do(req)
-		if err != nil {
-			return "", "", err
-		}
-		defer res.Body.Close()
-
-		b, err := ioutil.ReadAll(res.Body)
-		if err != nil {
-			return "", "", err
-		}
-		hrefMatch := hrefRe.FindStringSubmatch(string(b))
-		if len(hrefMatch) != 2 {
-			return "", "", errors.New("D:href not found")
-		}
-		displayNameMatch := displayNameRe.FindStringSubmatch(string(b))
-		if len(displayNameMatch) != 2 {
-			return "", "", errors.New("D:displayname not found")
-		}
-
-		return hrefMatch[1], displayNameMatch[1], nil
-	}
-
-	testCases := []struct {
-		name, wantHref, wantDisplayName string
-	}{{
-		name:            `/foo%bar`,
-		wantHref:        `/foo%25bar`,
-		wantDisplayName: `foo%bar`,
-	}, {
-		name:            `/こんにちわ世界`,
-		wantHref:        `/%E3%81%93%E3%82%93%E3%81%AB%E3%81%A1%E3%82%8F%E4%B8%96%E7%95%8C`,
-		wantDisplayName: `こんにちわ世界`,
-	}, {
-		name:            `/Program Files/`,
-		wantHref:        `/Program%20Files`,
-		wantDisplayName: `Program Files`,
-	}, {
-		name:            `/go+lang`,
-		wantHref:        `/go+lang`,
-		wantDisplayName: `go+lang`,
-	}, {
-		name:            `/go&lang`,
-		wantHref:        `/go&amp;lang`,
-		wantDisplayName: `go&amp;lang`,
-	}, {
-		name:            `/go<lang`,
-		wantHref:        `/go%3Clang`,
-		wantDisplayName: `go&lt;lang`,
-	}}
-	ctx := context.Background()
-	fs := NewMemFS()
-	for _, tc := range testCases {
-		if strings.HasSuffix(tc.name, "/") {
-			if err := fs.Mkdir(ctx, tc.name, 0755); err != nil {
-				t.Fatalf("name=%q: Mkdir: %v", tc.name, err)
-			}
-		} else {
-			f, err := fs.OpenFile(ctx, tc.name, os.O_CREATE, 0644)
-			if err != nil {
-				t.Fatalf("name=%q: OpenFile: %v", tc.name, err)
-			}
-			f.Close()
-		}
-	}
-
-	srv := httptest.NewServer(&Handler{
-		FileSystem: fs,
-		LockSystem: NewMemLS(),
-	})
-	defer srv.Close()
-
-	u, err := url.Parse(srv.URL)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, tc := range testCases {
-		u.Path = tc.name
-		gotHref, gotDisplayName, err := do("PROPFIND", u.String())
-		if err != nil {
-			t.Errorf("name=%q: PROPFIND: %v", tc.name, err)
-			continue
-		}
-		if gotHref != tc.wantHref {
-			t.Errorf("name=%q: got href %q, want %q", tc.name, gotHref, tc.wantHref)
-		}
-		if gotDisplayName != tc.wantDisplayName {
-			t.Errorf("name=%q: got dispayname %q, want %q", tc.name, gotDisplayName, tc.wantDisplayName)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/xml.go b/installer/vendor/golang.org/x/net/webdav/xml.go
deleted file mode 100644
index 790dc81696..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/xml.go
+++ /dev/null
@@ -1,519 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-// The XML encoding is covered by Section 14.
-// http://www.webdav.org/specs/rfc4918.html#xml.element.definitions
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"net/http"
-	"time"
-
-	// As of https://go-review.googlesource.com/#/c/12772/ which was submitted
-	// in July 2015, this package uses an internal fork of the standard
-	// library's encoding/xml package, due to changes in the way namespaces
-	// were encoded. Such changes were introduced in the Go 1.5 cycle, but were
-	// rolled back in response to https://github.com/golang/go/issues/11841
-	//
-	// However, this package's exported API, specifically the Property and
-	// DeadPropsHolder types, need to refer to the standard library's version
-	// of the xml.Name type, as code that imports this package cannot refer to
-	// the internal version.
-	//
-	// This file therefore imports both the internal and external versions, as
-	// ixml and xml, and converts between them.
-	//
-	// In the long term, this package should use the standard library's version
-	// only, and the internal fork deleted, once
-	// https://github.com/golang/go/issues/13400 is resolved.
-	ixml "golang.org/x/net/webdav/internal/xml"
-)
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_lockinfo
-type lockInfo struct {
-	XMLName   ixml.Name `xml:"lockinfo"`
-	Exclusive *struct{} `xml:"lockscope>exclusive"`
-	Shared    *struct{} `xml:"lockscope>shared"`
-	Write     *struct{} `xml:"locktype>write"`
-	Owner     owner     `xml:"owner"`
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_owner
-type owner struct {
-	InnerXML string `xml:",innerxml"`
-}
-
-func readLockInfo(r io.Reader) (li lockInfo, status int, err error) {
-	c := &countingReader{r: r}
-	if err = ixml.NewDecoder(c).Decode(&li); err != nil {
-		if err == io.EOF {
-			if c.n == 0 {
-				// An empty body means to refresh the lock.
-				// http://www.webdav.org/specs/rfc4918.html#refreshing-locks
-				return lockInfo{}, 0, nil
-			}
-			err = errInvalidLockInfo
-		}
-		return lockInfo{}, http.StatusBadRequest, err
-	}
-	// We only support exclusive (non-shared) write locks. In practice, these are
-	// the only types of locks that seem to matter.
-	if li.Exclusive == nil || li.Shared != nil || li.Write == nil {
-		return lockInfo{}, http.StatusNotImplemented, errUnsupportedLockInfo
-	}
-	return li, 0, nil
-}
-
-type countingReader struct {
-	n int
-	r io.Reader
-}
-
-func (c *countingReader) Read(p []byte) (int, error) {
-	n, err := c.r.Read(p)
-	c.n += n
-	return n, err
-}
-
-func writeLockInfo(w io.Writer, token string, ld LockDetails) (int, error) {
-	depth := "infinity"
-	if ld.ZeroDepth {
-		depth = "0"
-	}
-	timeout := ld.Duration / time.Second
-	return fmt.Fprintf(w, "<?xml version=\"1.0\" encoding=\"utf-8\"?>\n"+
-		"<D:prop xmlns:D=\"DAV:\"><D:lockdiscovery><D:activelock>\n"+
-		"	<D:locktype><D:write/></D:locktype>\n"+
-		"	<D:lockscope><D:exclusive/></D:lockscope>\n"+
-		"	<D:depth>%s</D:depth>\n"+
-		"	<D:owner>%s</D:owner>\n"+
-		"	<D:timeout>Second-%d</D:timeout>\n"+
-		"	<D:locktoken><D:href>%s</D:href></D:locktoken>\n"+
-		"	<D:lockroot><D:href>%s</D:href></D:lockroot>\n"+
-		"</D:activelock></D:lockdiscovery></D:prop>",
-		depth, ld.OwnerXML, timeout, escape(token), escape(ld.Root),
-	)
-}
-
-func escape(s string) string {
-	for i := 0; i < len(s); i++ {
-		switch s[i] {
-		case '"', '&', '\'', '<', '>':
-			b := bytes.NewBuffer(nil)
-			ixml.EscapeText(b, []byte(s))
-			return b.String()
-		}
-	}
-	return s
-}
-
-// Next returns the next token, if any, in the XML stream of d.
-// RFC 4918 requires to ignore comments, processing instructions
-// and directives.
-// http://www.webdav.org/specs/rfc4918.html#property_values
-// http://www.webdav.org/specs/rfc4918.html#xml-extensibility
-func next(d *ixml.Decoder) (ixml.Token, error) {
-	for {
-		t, err := d.Token()
-		if err != nil {
-			return t, err
-		}
-		switch t.(type) {
-		case ixml.Comment, ixml.Directive, ixml.ProcInst:
-			continue
-		default:
-			return t, nil
-		}
-	}
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_prop (for propfind)
-type propfindProps []xml.Name
-
-// UnmarshalXML appends the property names enclosed within start to pn.
-//
-// It returns an error if start does not contain any properties or if
-// properties contain values. Character data between properties is ignored.
-func (pn *propfindProps) UnmarshalXML(d *ixml.Decoder, start ixml.StartElement) error {
-	for {
-		t, err := next(d)
-		if err != nil {
-			return err
-		}
-		switch t.(type) {
-		case ixml.EndElement:
-			if len(*pn) == 0 {
-				return fmt.Errorf("%s must not be empty", start.Name.Local)
-			}
-			return nil
-		case ixml.StartElement:
-			name := t.(ixml.StartElement).Name
-			t, err = next(d)
-			if err != nil {
-				return err
-			}
-			if _, ok := t.(ixml.EndElement); !ok {
-				return fmt.Errorf("unexpected token %T", t)
-			}
-			*pn = append(*pn, xml.Name(name))
-		}
-	}
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_propfind
-type propfind struct {
-	XMLName  ixml.Name     `xml:"DAV: propfind"`
-	Allprop  *struct{}     `xml:"DAV: allprop"`
-	Propname *struct{}     `xml:"DAV: propname"`
-	Prop     propfindProps `xml:"DAV: prop"`
-	Include  propfindProps `xml:"DAV: include"`
-}
-
-func readPropfind(r io.Reader) (pf propfind, status int, err error) {
-	c := countingReader{r: r}
-	if err = ixml.NewDecoder(&c).Decode(&pf); err != nil {
-		if err == io.EOF {
-			if c.n == 0 {
-				// An empty body means to propfind allprop.
-				// http://www.webdav.org/specs/rfc4918.html#METHOD_PROPFIND
-				return propfind{Allprop: new(struct{})}, 0, nil
-			}
-			err = errInvalidPropfind
-		}
-		return propfind{}, http.StatusBadRequest, err
-	}
-
-	if pf.Allprop == nil && pf.Include != nil {
-		return propfind{}, http.StatusBadRequest, errInvalidPropfind
-	}
-	if pf.Allprop != nil && (pf.Prop != nil || pf.Propname != nil) {
-		return propfind{}, http.StatusBadRequest, errInvalidPropfind
-	}
-	if pf.Prop != nil && pf.Propname != nil {
-		return propfind{}, http.StatusBadRequest, errInvalidPropfind
-	}
-	if pf.Propname == nil && pf.Allprop == nil && pf.Prop == nil {
-		return propfind{}, http.StatusBadRequest, errInvalidPropfind
-	}
-	return pf, 0, nil
-}
-
-// Property represents a single DAV resource property as defined in RFC 4918.
-// See http://www.webdav.org/specs/rfc4918.html#data.model.for.resource.properties
-type Property struct {
-	// XMLName is the fully qualified name that identifies this property.
-	XMLName xml.Name
-
-	// Lang is an optional xml:lang attribute.
-	Lang string `xml:"xml:lang,attr,omitempty"`
-
-	// InnerXML contains the XML representation of the property value.
-	// See http://www.webdav.org/specs/rfc4918.html#property_values
-	//
-	// Property values of complex type or mixed-content must have fully
-	// expanded XML namespaces or be self-contained with according
-	// XML namespace declarations. They must not rely on any XML
-	// namespace declarations within the scope of the XML document,
-	// even including the DAV: namespace.
-	InnerXML []byte `xml:",innerxml"`
-}
-
-// ixmlProperty is the same as the Property type except it holds an ixml.Name
-// instead of an xml.Name.
-type ixmlProperty struct {
-	XMLName  ixml.Name
-	Lang     string `xml:"xml:lang,attr,omitempty"`
-	InnerXML []byte `xml:",innerxml"`
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_error
-// See multistatusWriter for the "D:" namespace prefix.
-type xmlError struct {
-	XMLName  ixml.Name `xml:"D:error"`
-	InnerXML []byte    `xml:",innerxml"`
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_propstat
-// See multistatusWriter for the "D:" namespace prefix.
-type propstat struct {
-	Prop                []Property `xml:"D:prop>_ignored_"`
-	Status              string     `xml:"D:status"`
-	Error               *xmlError  `xml:"D:error"`
-	ResponseDescription string     `xml:"D:responsedescription,omitempty"`
-}
-
-// ixmlPropstat is the same as the propstat type except it holds an ixml.Name
-// instead of an xml.Name.
-type ixmlPropstat struct {
-	Prop                []ixmlProperty `xml:"D:prop>_ignored_"`
-	Status              string         `xml:"D:status"`
-	Error               *xmlError      `xml:"D:error"`
-	ResponseDescription string         `xml:"D:responsedescription,omitempty"`
-}
-
-// MarshalXML prepends the "D:" namespace prefix on properties in the DAV: namespace
-// before encoding. See multistatusWriter.
-func (ps propstat) MarshalXML(e *ixml.Encoder, start ixml.StartElement) error {
-	// Convert from a propstat to an ixmlPropstat.
-	ixmlPs := ixmlPropstat{
-		Prop:                make([]ixmlProperty, len(ps.Prop)),
-		Status:              ps.Status,
-		Error:               ps.Error,
-		ResponseDescription: ps.ResponseDescription,
-	}
-	for k, prop := range ps.Prop {
-		ixmlPs.Prop[k] = ixmlProperty{
-			XMLName:  ixml.Name(prop.XMLName),
-			Lang:     prop.Lang,
-			InnerXML: prop.InnerXML,
-		}
-	}
-
-	for k, prop := range ixmlPs.Prop {
-		if prop.XMLName.Space == "DAV:" {
-			prop.XMLName = ixml.Name{Space: "", Local: "D:" + prop.XMLName.Local}
-			ixmlPs.Prop[k] = prop
-		}
-	}
-	// Distinct type to avoid infinite recursion of MarshalXML.
-	type newpropstat ixmlPropstat
-	return e.EncodeElement(newpropstat(ixmlPs), start)
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_response
-// See multistatusWriter for the "D:" namespace prefix.
-type response struct {
-	XMLName             ixml.Name  `xml:"D:response"`
-	Href                []string   `xml:"D:href"`
-	Propstat            []propstat `xml:"D:propstat"`
-	Status              string     `xml:"D:status,omitempty"`
-	Error               *xmlError  `xml:"D:error"`
-	ResponseDescription string     `xml:"D:responsedescription,omitempty"`
-}
-
-// MultistatusWriter marshals one or more Responses into a XML
-// multistatus response.
-// See http://www.webdav.org/specs/rfc4918.html#ELEMENT_multistatus
-// TODO(rsto, mpl): As a workaround, the "D:" namespace prefix, defined as
-// "DAV:" on this element, is prepended on the nested response, as well as on all
-// its nested elements. All property names in the DAV: namespace are prefixed as
-// well. This is because some versions of Mini-Redirector (on windows 7) ignore
-// elements with a default namespace (no prefixed namespace). A less intrusive fix
-// should be possible after golang.org/cl/11074. See https://golang.org/issue/11177
-type multistatusWriter struct {
-	// ResponseDescription contains the optional responsedescription
-	// of the multistatus XML element. Only the latest content before
-	// close will be emitted. Empty response descriptions are not
-	// written.
-	responseDescription string
-
-	w   http.ResponseWriter
-	enc *ixml.Encoder
-}
-
-// Write validates and emits a DAV response as part of a multistatus response
-// element.
-//
-// It sets the HTTP status code of its underlying http.ResponseWriter to 207
-// (Multi-Status) and populates the Content-Type header. If r is the
-// first, valid response to be written, Write prepends the XML representation
-// of r with a multistatus tag. Callers must call close after the last response
-// has been written.
-func (w *multistatusWriter) write(r *response) error {
-	switch len(r.Href) {
-	case 0:
-		return errInvalidResponse
-	case 1:
-		if len(r.Propstat) > 0 != (r.Status == "") {
-			return errInvalidResponse
-		}
-	default:
-		if len(r.Propstat) > 0 || r.Status == "" {
-			return errInvalidResponse
-		}
-	}
-	err := w.writeHeader()
-	if err != nil {
-		return err
-	}
-	return w.enc.Encode(r)
-}
-
-// writeHeader writes a XML multistatus start element on w's underlying
-// http.ResponseWriter and returns the result of the write operation.
-// After the first write attempt, writeHeader becomes a no-op.
-func (w *multistatusWriter) writeHeader() error {
-	if w.enc != nil {
-		return nil
-	}
-	w.w.Header().Add("Content-Type", "text/xml; charset=utf-8")
-	w.w.WriteHeader(StatusMulti)
-	_, err := fmt.Fprintf(w.w, `<?xml version="1.0" encoding="UTF-8"?>`)
-	if err != nil {
-		return err
-	}
-	w.enc = ixml.NewEncoder(w.w)
-	return w.enc.EncodeToken(ixml.StartElement{
-		Name: ixml.Name{
-			Space: "DAV:",
-			Local: "multistatus",
-		},
-		Attr: []ixml.Attr{{
-			Name:  ixml.Name{Space: "xmlns", Local: "D"},
-			Value: "DAV:",
-		}},
-	})
-}
-
-// Close completes the marshalling of the multistatus response. It returns
-// an error if the multistatus response could not be completed. If both the
-// return value and field enc of w are nil, then no multistatus response has
-// been written.
-func (w *multistatusWriter) close() error {
-	if w.enc == nil {
-		return nil
-	}
-	var end []ixml.Token
-	if w.responseDescription != "" {
-		name := ixml.Name{Space: "DAV:", Local: "responsedescription"}
-		end = append(end,
-			ixml.StartElement{Name: name},
-			ixml.CharData(w.responseDescription),
-			ixml.EndElement{Name: name},
-		)
-	}
-	end = append(end, ixml.EndElement{
-		Name: ixml.Name{Space: "DAV:", Local: "multistatus"},
-	})
-	for _, t := range end {
-		err := w.enc.EncodeToken(t)
-		if err != nil {
-			return err
-		}
-	}
-	return w.enc.Flush()
-}
-
-var xmlLangName = ixml.Name{Space: "http://www.w3.org/XML/1998/namespace", Local: "lang"}
-
-func xmlLang(s ixml.StartElement, d string) string {
-	for _, attr := range s.Attr {
-		if attr.Name == xmlLangName {
-			return attr.Value
-		}
-	}
-	return d
-}
-
-type xmlValue []byte
-
-func (v *xmlValue) UnmarshalXML(d *ixml.Decoder, start ixml.StartElement) error {
-	// The XML value of a property can be arbitrary, mixed-content XML.
-	// To make sure that the unmarshalled value contains all required
-	// namespaces, we encode all the property value XML tokens into a
-	// buffer. This forces the encoder to redeclare any used namespaces.
-	var b bytes.Buffer
-	e := ixml.NewEncoder(&b)
-	for {
-		t, err := next(d)
-		if err != nil {
-			return err
-		}
-		if e, ok := t.(ixml.EndElement); ok && e.Name == start.Name {
-			break
-		}
-		if err = e.EncodeToken(t); err != nil {
-			return err
-		}
-	}
-	err := e.Flush()
-	if err != nil {
-		return err
-	}
-	*v = b.Bytes()
-	return nil
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_prop (for proppatch)
-type proppatchProps []Property
-
-// UnmarshalXML appends the property names and values enclosed within start
-// to ps.
-//
-// An xml:lang attribute that is defined either on the DAV:prop or property
-// name XML element is propagated to the property's Lang field.
-//
-// UnmarshalXML returns an error if start does not contain any properties or if
-// property values contain syntactically incorrect XML.
-func (ps *proppatchProps) UnmarshalXML(d *ixml.Decoder, start ixml.StartElement) error {
-	lang := xmlLang(start, "")
-	for {
-		t, err := next(d)
-		if err != nil {
-			return err
-		}
-		switch elem := t.(type) {
-		case ixml.EndElement:
-			if len(*ps) == 0 {
-				return fmt.Errorf("%s must not be empty", start.Name.Local)
-			}
-			return nil
-		case ixml.StartElement:
-			p := Property{
-				XMLName: xml.Name(t.(ixml.StartElement).Name),
-				Lang:    xmlLang(t.(ixml.StartElement), lang),
-			}
-			err = d.DecodeElement(((*xmlValue)(&p.InnerXML)), &elem)
-			if err != nil {
-				return err
-			}
-			*ps = append(*ps, p)
-		}
-	}
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_set
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_remove
-type setRemove struct {
-	XMLName ixml.Name
-	Lang    string         `xml:"xml:lang,attr,omitempty"`
-	Prop    proppatchProps `xml:"DAV: prop"`
-}
-
-// http://www.webdav.org/specs/rfc4918.html#ELEMENT_propertyupdate
-type propertyupdate struct {
-	XMLName   ixml.Name   `xml:"DAV: propertyupdate"`
-	Lang      string      `xml:"xml:lang,attr,omitempty"`
-	SetRemove []setRemove `xml:",any"`
-}
-
-func readProppatch(r io.Reader) (patches []Proppatch, status int, err error) {
-	var pu propertyupdate
-	if err = ixml.NewDecoder(r).Decode(&pu); err != nil {
-		return nil, http.StatusBadRequest, err
-	}
-	for _, op := range pu.SetRemove {
-		remove := false
-		switch op.XMLName {
-		case ixml.Name{Space: "DAV:", Local: "set"}:
-			// No-op.
-		case ixml.Name{Space: "DAV:", Local: "remove"}:
-			for _, p := range op.Prop {
-				if len(p.InnerXML) > 0 {
-					return nil, http.StatusBadRequest, errInvalidProppatch
-				}
-			}
-			remove = true
-		default:
-			return nil, http.StatusBadRequest, errInvalidProppatch
-		}
-		patches = append(patches, Proppatch{Remove: remove, Props: op.Prop})
-	}
-	return patches, 0, nil
-}
diff --git a/installer/vendor/golang.org/x/net/webdav/xml_test.go b/installer/vendor/golang.org/x/net/webdav/xml_test.go
deleted file mode 100644
index a3d9e1ed89..0000000000
--- a/installer/vendor/golang.org/x/net/webdav/xml_test.go
+++ /dev/null
@@ -1,906 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package webdav
-
-import (
-	"bytes"
-	"encoding/xml"
-	"fmt"
-	"io"
-	"net/http"
-	"net/http/httptest"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-
-	ixml "golang.org/x/net/webdav/internal/xml"
-)
-
-func TestReadLockInfo(t *testing.T) {
-	// The "section x.y.z" test cases come from section x.y.z of the spec at
-	// http://www.webdav.org/specs/rfc4918.html
-	testCases := []struct {
-		desc       string
-		input      string
-		wantLI     lockInfo
-		wantStatus int
-	}{{
-		"bad: junk",
-		"xxx",
-		lockInfo{},
-		http.StatusBadRequest,
-	}, {
-		"bad: invalid owner XML",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n" +
-			"  <D:owner>\n" +
-			"    <D:href>   no end tag   \n" +
-			"  </D:owner>\n" +
-			"</D:lockinfo>",
-		lockInfo{},
-		http.StatusBadRequest,
-	}, {
-		"bad: invalid UTF-8",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n" +
-			"  <D:owner>\n" +
-			"    <D:href>   \xff   </D:href>\n" +
-			"  </D:owner>\n" +
-			"</D:lockinfo>",
-		lockInfo{},
-		http.StatusBadRequest,
-	}, {
-		"bad: unfinished XML #1",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n",
-		lockInfo{},
-		http.StatusBadRequest,
-	}, {
-		"bad: unfinished XML #2",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n" +
-			"  <D:owner>\n",
-		lockInfo{},
-		http.StatusBadRequest,
-	}, {
-		"good: empty",
-		"",
-		lockInfo{},
-		0,
-	}, {
-		"good: plain-text owner",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n" +
-			"  <D:owner>gopher</D:owner>\n" +
-			"</D:lockinfo>",
-		lockInfo{
-			XMLName:   ixml.Name{Space: "DAV:", Local: "lockinfo"},
-			Exclusive: new(struct{}),
-			Write:     new(struct{}),
-			Owner: owner{
-				InnerXML: "gopher",
-			},
-		},
-		0,
-	}, {
-		"section 9.10.7",
-		"" +
-			"<D:lockinfo xmlns:D='DAV:'>\n" +
-			"  <D:lockscope><D:exclusive/></D:lockscope>\n" +
-			"  <D:locktype><D:write/></D:locktype>\n" +
-			"  <D:owner>\n" +
-			"    <D:href>http://example.org/~ejw/contact.html</D:href>\n" +
-			"  </D:owner>\n" +
-			"</D:lockinfo>",
-		lockInfo{
-			XMLName:   ixml.Name{Space: "DAV:", Local: "lockinfo"},
-			Exclusive: new(struct{}),
-			Write:     new(struct{}),
-			Owner: owner{
-				InnerXML: "\n    <D:href>http://example.org/~ejw/contact.html</D:href>\n  ",
-			},
-		},
-		0,
-	}}
-
-	for _, tc := range testCases {
-		li, status, err := readLockInfo(strings.NewReader(tc.input))
-		if tc.wantStatus != 0 {
-			if err == nil {
-				t.Errorf("%s: got nil error, want non-nil", tc.desc)
-				continue
-			}
-		} else if err != nil {
-			t.Errorf("%s: %v", tc.desc, err)
-			continue
-		}
-		if !reflect.DeepEqual(li, tc.wantLI) || status != tc.wantStatus {
-			t.Errorf("%s:\ngot  lockInfo=%v, status=%v\nwant lockInfo=%v, status=%v",
-				tc.desc, li, status, tc.wantLI, tc.wantStatus)
-			continue
-		}
-	}
-}
-
-func TestReadPropfind(t *testing.T) {
-	testCases := []struct {
-		desc       string
-		input      string
-		wantPF     propfind
-		wantStatus int
-	}{{
-		desc: "propfind: propname",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:propname/>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName:  ixml.Name{Space: "DAV:", Local: "propfind"},
-			Propname: new(struct{}),
-		},
-	}, {
-		desc:  "propfind: empty body means allprop",
-		input: "",
-		wantPF: propfind{
-			Allprop: new(struct{}),
-		},
-	}, {
-		desc: "propfind: allprop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"   <A:allprop/>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Allprop: new(struct{}),
-		},
-	}, {
-		desc: "propfind: allprop followed by include",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:allprop/>\n" +
-			"  <A:include><A:displayname/></A:include>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Allprop: new(struct{}),
-			Include: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: include followed by allprop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:include><A:displayname/></A:include>\n" +
-			"  <A:allprop/>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Allprop: new(struct{}),
-			Include: propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: propfind",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:displayname/></A:prop>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Prop:    propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: prop with ignored comments",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop>\n" +
-			"    <!-- ignore -->\n" +
-			"    <A:displayname><!-- ignore --></A:displayname>\n" +
-			"  </A:prop>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Prop:    propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: propfind with ignored whitespace",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop>   <A:displayname/></A:prop>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Prop:    propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: propfind with ignored mixed-content",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop>foo<A:displayname/>bar</A:prop>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName: ixml.Name{Space: "DAV:", Local: "propfind"},
-			Prop:    propfindProps{xml.Name{Space: "DAV:", Local: "displayname"}},
-		},
-	}, {
-		desc: "propfind: propname with ignored element (section A.4)",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:propname/>\n" +
-			"  <E:leave-out xmlns:E='E:'>*boss*</E:leave-out>\n" +
-			"</A:propfind>",
-		wantPF: propfind{
-			XMLName:  ixml.Name{Space: "DAV:", Local: "propfind"},
-			Propname: new(struct{}),
-		},
-	}, {
-		desc:       "propfind: bad: junk",
-		input:      "xxx",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: propname and allprop (section A.3)",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:propname/>" +
-			"  <A:allprop/>" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: propname and prop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:displayname/></A:prop>\n" +
-			"  <A:propname/>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: allprop and prop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:allprop/>\n" +
-			"  <A:prop><A:foo/><A:/prop>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: empty propfind with ignored element (section A.4)",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <E:expired-props/>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: empty prop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop/>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: prop with just chardata",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop>foo</A:prop>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "bad: interrupted prop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:foo></A:prop>\n",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "bad: malformed end element prop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:foo/></A:bar></A:prop>\n",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: property with chardata value",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:foo>bar</A:foo></A:prop>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: property with whitespace value",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:prop><A:foo> </A:foo></A:prop>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "propfind: bad: include without allprop",
-		input: "" +
-			"<A:propfind xmlns:A='DAV:'>\n" +
-			"  <A:include><A:foo/></A:include>\n" +
-			"</A:propfind>",
-		wantStatus: http.StatusBadRequest,
-	}}
-
-	for _, tc := range testCases {
-		pf, status, err := readPropfind(strings.NewReader(tc.input))
-		if tc.wantStatus != 0 {
-			if err == nil {
-				t.Errorf("%s: got nil error, want non-nil", tc.desc)
-				continue
-			}
-		} else if err != nil {
-			t.Errorf("%s: %v", tc.desc, err)
-			continue
-		}
-		if !reflect.DeepEqual(pf, tc.wantPF) || status != tc.wantStatus {
-			t.Errorf("%s:\ngot  propfind=%v, status=%v\nwant propfind=%v, status=%v",
-				tc.desc, pf, status, tc.wantPF, tc.wantStatus)
-			continue
-		}
-	}
-}
-
-func TestMultistatusWriter(t *testing.T) {
-	///The "section x.y.z" test cases come from section x.y.z of the spec at
-	// http://www.webdav.org/specs/rfc4918.html
-	testCases := []struct {
-		desc        string
-		responses   []response
-		respdesc    string
-		writeHeader bool
-		wantXML     string
-		wantCode    int
-		wantErr     error
-	}{{
-		desc: "section 9.2.2 (failed dependency)",
-		responses: []response{{
-			Href: []string{"http://example.com/foo"},
-			Propstat: []propstat{{
-				Prop: []Property{{
-					XMLName: xml.Name{
-						Space: "http://ns.example.com/",
-						Local: "Authors",
-					},
-				}},
-				Status: "HTTP/1.1 424 Failed Dependency",
-			}, {
-				Prop: []Property{{
-					XMLName: xml.Name{
-						Space: "http://ns.example.com/",
-						Local: "Copyright-Owner",
-					},
-				}},
-				Status: "HTTP/1.1 409 Conflict",
-			}},
-			ResponseDescription: "Copyright Owner cannot be deleted or altered.",
-		}},
-		wantXML: `` +
-			`<?xml version="1.0" encoding="UTF-8"?>` +
-			`<multistatus xmlns="DAV:">` +
-			`  <response>` +
-			`    <href>http://example.com/foo</href>` +
-			`    <propstat>` +
-			`      <prop>` +
-			`        <Authors xmlns="http://ns.example.com/"></Authors>` +
-			`      </prop>` +
-			`      <status>HTTP/1.1 424 Failed Dependency</status>` +
-			`    </propstat>` +
-			`    <propstat xmlns="DAV:">` +
-			`      <prop>` +
-			`        <Copyright-Owner xmlns="http://ns.example.com/"></Copyright-Owner>` +
-			`      </prop>` +
-			`      <status>HTTP/1.1 409 Conflict</status>` +
-			`    </propstat>` +
-			`  <responsedescription>Copyright Owner cannot be deleted or altered.</responsedescription>` +
-			`</response>` +
-			`</multistatus>`,
-		wantCode: StatusMulti,
-	}, {
-		desc: "section 9.6.2 (lock-token-submitted)",
-		responses: []response{{
-			Href:   []string{"http://example.com/foo"},
-			Status: "HTTP/1.1 423 Locked",
-			Error: &xmlError{
-				InnerXML: []byte(`<lock-token-submitted xmlns="DAV:"/>`),
-			},
-		}},
-		wantXML: `` +
-			`<?xml version="1.0" encoding="UTF-8"?>` +
-			`<multistatus xmlns="DAV:">` +
-			`  <response>` +
-			`    <href>http://example.com/foo</href>` +
-			`    <status>HTTP/1.1 423 Locked</status>` +
-			`    <error><lock-token-submitted xmlns="DAV:"/></error>` +
-			`  </response>` +
-			`</multistatus>`,
-		wantCode: StatusMulti,
-	}, {
-		desc: "section 9.1.3",
-		responses: []response{{
-			Href: []string{"http://example.com/foo"},
-			Propstat: []propstat{{
-				Prop: []Property{{
-					XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "bigbox"},
-					InnerXML: []byte(`` +
-						`<BoxType xmlns="http://ns.example.com/boxschema/">` +
-						`Box type A` +
-						`</BoxType>`),
-				}, {
-					XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "author"},
-					InnerXML: []byte(`` +
-						`<Name xmlns="http://ns.example.com/boxschema/">` +
-						`J.J. Johnson` +
-						`</Name>`),
-				}},
-				Status: "HTTP/1.1 200 OK",
-			}, {
-				Prop: []Property{{
-					XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "DingALing"},
-				}, {
-					XMLName: xml.Name{Space: "http://ns.example.com/boxschema/", Local: "Random"},
-				}},
-				Status:              "HTTP/1.1 403 Forbidden",
-				ResponseDescription: "The user does not have access to the DingALing property.",
-			}},
-		}},
-		respdesc: "There has been an access violation error.",
-		wantXML: `` +
-			`<?xml version="1.0" encoding="UTF-8"?>` +
-			`<multistatus xmlns="DAV:" xmlns:B="http://ns.example.com/boxschema/">` +
-			`  <response>` +
-			`    <href>http://example.com/foo</href>` +
-			`    <propstat>` +
-			`      <prop>` +
-			`        <B:bigbox><B:BoxType>Box type A</B:BoxType></B:bigbox>` +
-			`        <B:author><B:Name>J.J. Johnson</B:Name></B:author>` +
-			`      </prop>` +
-			`      <status>HTTP/1.1 200 OK</status>` +
-			`    </propstat>` +
-			`    <propstat>` +
-			`      <prop>` +
-			`        <B:DingALing/>` +
-			`        <B:Random/>` +
-			`      </prop>` +
-			`      <status>HTTP/1.1 403 Forbidden</status>` +
-			`      <responsedescription>The user does not have access to the DingALing property.</responsedescription>` +
-			`    </propstat>` +
-			`  </response>` +
-			`  <responsedescription>There has been an access violation error.</responsedescription>` +
-			`</multistatus>`,
-		wantCode: StatusMulti,
-	}, {
-		desc: "no response written",
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc:     "no response written (with description)",
-		respdesc: "too bad",
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc:        "empty multistatus with header",
-		writeHeader: true,
-		wantXML:     `<multistatus xmlns="DAV:"></multistatus>`,
-		wantCode:    StatusMulti,
-	}, {
-		desc: "bad: no href",
-		responses: []response{{
-			Propstat: []propstat{{
-				Prop: []Property{{
-					XMLName: xml.Name{
-						Space: "http://example.com/",
-						Local: "foo",
-					},
-				}},
-				Status: "HTTP/1.1 200 OK",
-			}},
-		}},
-		wantErr: errInvalidResponse,
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc: "bad: multiple hrefs and no status",
-		responses: []response{{
-			Href: []string{"http://example.com/foo", "http://example.com/bar"},
-		}},
-		wantErr: errInvalidResponse,
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc: "bad: one href and no propstat",
-		responses: []response{{
-			Href: []string{"http://example.com/foo"},
-		}},
-		wantErr: errInvalidResponse,
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc: "bad: status with one href and propstat",
-		responses: []response{{
-			Href: []string{"http://example.com/foo"},
-			Propstat: []propstat{{
-				Prop: []Property{{
-					XMLName: xml.Name{
-						Space: "http://example.com/",
-						Local: "foo",
-					},
-				}},
-				Status: "HTTP/1.1 200 OK",
-			}},
-			Status: "HTTP/1.1 200 OK",
-		}},
-		wantErr: errInvalidResponse,
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}, {
-		desc: "bad: multiple hrefs and propstat",
-		responses: []response{{
-			Href: []string{
-				"http://example.com/foo",
-				"http://example.com/bar",
-			},
-			Propstat: []propstat{{
-				Prop: []Property{{
-					XMLName: xml.Name{
-						Space: "http://example.com/",
-						Local: "foo",
-					},
-				}},
-				Status: "HTTP/1.1 200 OK",
-			}},
-		}},
-		wantErr: errInvalidResponse,
-		// default of http.responseWriter
-		wantCode: http.StatusOK,
-	}}
-
-	n := xmlNormalizer{omitWhitespace: true}
-loop:
-	for _, tc := range testCases {
-		rec := httptest.NewRecorder()
-		w := multistatusWriter{w: rec, responseDescription: tc.respdesc}
-		if tc.writeHeader {
-			if err := w.writeHeader(); err != nil {
-				t.Errorf("%s: got writeHeader error %v, want nil", tc.desc, err)
-				continue
-			}
-		}
-		for _, r := range tc.responses {
-			if err := w.write(&r); err != nil {
-				if err != tc.wantErr {
-					t.Errorf("%s: got write error %v, want %v",
-						tc.desc, err, tc.wantErr)
-				}
-				continue loop
-			}
-		}
-		if err := w.close(); err != tc.wantErr {
-			t.Errorf("%s: got close error %v, want %v",
-				tc.desc, err, tc.wantErr)
-			continue
-		}
-		if rec.Code != tc.wantCode {
-			t.Errorf("%s: got HTTP status code %d, want %d\n",
-				tc.desc, rec.Code, tc.wantCode)
-			continue
-		}
-		gotXML := rec.Body.String()
-		eq, err := n.equalXML(strings.NewReader(gotXML), strings.NewReader(tc.wantXML))
-		if err != nil {
-			t.Errorf("%s: equalXML: %v", tc.desc, err)
-			continue
-		}
-		if !eq {
-			t.Errorf("%s: XML body\ngot  %s\nwant %s", tc.desc, gotXML, tc.wantXML)
-		}
-	}
-}
-
-func TestReadProppatch(t *testing.T) {
-	ppStr := func(pps []Proppatch) string {
-		var outer []string
-		for _, pp := range pps {
-			var inner []string
-			for _, p := range pp.Props {
-				inner = append(inner, fmt.Sprintf("{XMLName: %q, Lang: %q, InnerXML: %q}",
-					p.XMLName, p.Lang, p.InnerXML))
-			}
-			outer = append(outer, fmt.Sprintf("{Remove: %t, Props: [%s]}",
-				pp.Remove, strings.Join(inner, ", ")))
-		}
-		return "[" + strings.Join(outer, ", ") + "]"
-	}
-
-	testCases := []struct {
-		desc       string
-		input      string
-		wantPP     []Proppatch
-		wantStatus int
-	}{{
-		desc: "proppatch: section 9.2 (with simple property value)",
-		input: `` +
-			`<?xml version="1.0" encoding="utf-8" ?>` +
-			`<D:propertyupdate xmlns:D="DAV:"` +
-			`                  xmlns:Z="http://ns.example.com/z/">` +
-			`    <D:set>` +
-			`         <D:prop><Z:Authors>somevalue</Z:Authors></D:prop>` +
-			`    </D:set>` +
-			`    <D:remove>` +
-			`         <D:prop><Z:Copyright-Owner/></D:prop>` +
-			`    </D:remove>` +
-			`</D:propertyupdate>`,
-		wantPP: []Proppatch{{
-			Props: []Property{{
-				xml.Name{Space: "http://ns.example.com/z/", Local: "Authors"},
-				"",
-				[]byte(`somevalue`),
-			}},
-		}, {
-			Remove: true,
-			Props: []Property{{
-				xml.Name{Space: "http://ns.example.com/z/", Local: "Copyright-Owner"},
-				"",
-				nil,
-			}},
-		}},
-	}, {
-		desc: "proppatch: lang attribute on prop",
-		input: `` +
-			`<?xml version="1.0" encoding="utf-8" ?>` +
-			`<D:propertyupdate xmlns:D="DAV:">` +
-			`    <D:set>` +
-			`         <D:prop xml:lang="en">` +
-			`              <foo xmlns="http://example.com/ns"/>` +
-			`         </D:prop>` +
-			`    </D:set>` +
-			`</D:propertyupdate>`,
-		wantPP: []Proppatch{{
-			Props: []Property{{
-				xml.Name{Space: "http://example.com/ns", Local: "foo"},
-				"en",
-				nil,
-			}},
-		}},
-	}, {
-		desc: "bad: remove with value",
-		input: `` +
-			`<?xml version="1.0" encoding="utf-8" ?>` +
-			`<D:propertyupdate xmlns:D="DAV:"` +
-			`                  xmlns:Z="http://ns.example.com/z/">` +
-			`    <D:remove>` +
-			`         <D:prop>` +
-			`              <Z:Authors>` +
-			`              <Z:Author>Jim Whitehead</Z:Author>` +
-			`              </Z:Authors>` +
-			`         </D:prop>` +
-			`    </D:remove>` +
-			`</D:propertyupdate>`,
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "bad: empty propertyupdate",
-		input: `` +
-			`<?xml version="1.0" encoding="utf-8" ?>` +
-			`<D:propertyupdate xmlns:D="DAV:"` +
-			`</D:propertyupdate>`,
-		wantStatus: http.StatusBadRequest,
-	}, {
-		desc: "bad: empty prop",
-		input: `` +
-			`<?xml version="1.0" encoding="utf-8" ?>` +
-			`<D:propertyupdate xmlns:D="DAV:"` +
-			`                  xmlns:Z="http://ns.example.com/z/">` +
-			`    <D:remove>` +
-			`        <D:prop/>` +
-			`    </D:remove>` +
-			`</D:propertyupdate>`,
-		wantStatus: http.StatusBadRequest,
-	}}
-
-	for _, tc := range testCases {
-		pp, status, err := readProppatch(strings.NewReader(tc.input))
-		if tc.wantStatus != 0 {
-			if err == nil {
-				t.Errorf("%s: got nil error, want non-nil", tc.desc)
-				continue
-			}
-		} else if err != nil {
-			t.Errorf("%s: %v", tc.desc, err)
-			continue
-		}
-		if status != tc.wantStatus {
-			t.Errorf("%s: got status %d, want %d", tc.desc, status, tc.wantStatus)
-			continue
-		}
-		if !reflect.DeepEqual(pp, tc.wantPP) || status != tc.wantStatus {
-			t.Errorf("%s: proppatch\ngot  %v\nwant %v", tc.desc, ppStr(pp), ppStr(tc.wantPP))
-		}
-	}
-}
-
-func TestUnmarshalXMLValue(t *testing.T) {
-	testCases := []struct {
-		desc    string
-		input   string
-		wantVal string
-	}{{
-		desc:    "simple char data",
-		input:   "<root>foo</root>",
-		wantVal: "foo",
-	}, {
-		desc:    "empty element",
-		input:   "<root><foo/></root>",
-		wantVal: "<foo/>",
-	}, {
-		desc:    "preserve namespace",
-		input:   `<root><foo xmlns="bar"/></root>`,
-		wantVal: `<foo xmlns="bar"/>`,
-	}, {
-		desc:    "preserve root element namespace",
-		input:   `<root xmlns:bar="bar"><bar:foo/></root>`,
-		wantVal: `<foo xmlns="bar"/>`,
-	}, {
-		desc:    "preserve whitespace",
-		input:   "<root>  \t </root>",
-		wantVal: "  \t ",
-	}, {
-		desc:    "preserve mixed content",
-		input:   `<root xmlns="bar">  <foo>a<bam xmlns="baz"/> </foo> </root>`,
-		wantVal: `  <foo xmlns="bar">a<bam xmlns="baz"/> </foo> `,
-	}, {
-		desc: "section 9.2",
-		input: `` +
-			`<Z:Authors xmlns:Z="http://ns.example.com/z/">` +
-			`  <Z:Author>Jim Whitehead</Z:Author>` +
-			`  <Z:Author>Roy Fielding</Z:Author>` +
-			`</Z:Authors>`,
-		wantVal: `` +
-			`  <Author xmlns="http://ns.example.com/z/">Jim Whitehead</Author>` +
-			`  <Author xmlns="http://ns.example.com/z/">Roy Fielding</Author>`,
-	}, {
-		desc: "section 4.3.1 (mixed content)",
-		input: `` +
-			`<x:author ` +
-			`    xmlns:x='http://example.com/ns' ` +
-			`    xmlns:D="DAV:">` +
-			`  <x:name>Jane Doe</x:name>` +
-			`  <!-- Jane's contact info -->` +
-			`  <x:uri type='email'` +
-			`         added='2005-11-26'>mailto:jane.doe@example.com</x:uri>` +
-			`  <x:uri type='web'` +
-			`         added='2005-11-27'>http://www.example.com</x:uri>` +
-			`  <x:notes xmlns:h='http://www.w3.org/1999/xhtml'>` +
-			`    Jane has been working way <h:em>too</h:em> long on the` +
-			`    long-awaited revision of <![CDATA[<RFC2518>]]>.` +
-			`  </x:notes>` +
-			`</x:author>`,
-		wantVal: `` +
-			`  <name xmlns="http://example.com/ns">Jane Doe</name>` +
-			`  ` +
-			`  <uri type='email'` +
-			`       xmlns="http://example.com/ns" ` +
-			`       added='2005-11-26'>mailto:jane.doe@example.com</uri>` +
-			`  <uri added='2005-11-27'` +
-			`       type='web'` +
-			`       xmlns="http://example.com/ns">http://www.example.com</uri>` +
-			`  <notes xmlns="http://example.com/ns" ` +
-			`         xmlns:h="http://www.w3.org/1999/xhtml">` +
-			`    Jane has been working way <h:em>too</h:em> long on the` +
-			`    long-awaited revision of &lt;RFC2518&gt;.` +
-			`  </notes>`,
-	}}
-
-	var n xmlNormalizer
-	for _, tc := range testCases {
-		d := ixml.NewDecoder(strings.NewReader(tc.input))
-		var v xmlValue
-		if err := d.Decode(&v); err != nil {
-			t.Errorf("%s: got error %v, want nil", tc.desc, err)
-			continue
-		}
-		eq, err := n.equalXML(bytes.NewReader(v), strings.NewReader(tc.wantVal))
-		if err != nil {
-			t.Errorf("%s: equalXML: %v", tc.desc, err)
-			continue
-		}
-		if !eq {
-			t.Errorf("%s:\ngot  %s\nwant %s", tc.desc, string(v), tc.wantVal)
-		}
-	}
-}
-
-// xmlNormalizer normalizes XML.
-type xmlNormalizer struct {
-	// omitWhitespace instructs to ignore whitespace between element tags.
-	omitWhitespace bool
-	// omitComments instructs to ignore XML comments.
-	omitComments bool
-}
-
-// normalize writes the normalized XML content of r to w. It applies the
-// following rules
-//
-//     * Rename namespace prefixes according to an internal heuristic.
-//     * Remove unnecessary namespace declarations.
-//     * Sort attributes in XML start elements in lexical order of their
-//       fully qualified name.
-//     * Remove XML directives and processing instructions.
-//     * Remove CDATA between XML tags that only contains whitespace, if
-//       instructed to do so.
-//     * Remove comments, if instructed to do so.
-//
-func (n *xmlNormalizer) normalize(w io.Writer, r io.Reader) error {
-	d := ixml.NewDecoder(r)
-	e := ixml.NewEncoder(w)
-	for {
-		t, err := d.Token()
-		if err != nil {
-			if t == nil && err == io.EOF {
-				break
-			}
-			return err
-		}
-		switch val := t.(type) {
-		case ixml.Directive, ixml.ProcInst:
-			continue
-		case ixml.Comment:
-			if n.omitComments {
-				continue
-			}
-		case ixml.CharData:
-			if n.omitWhitespace && len(bytes.TrimSpace(val)) == 0 {
-				continue
-			}
-		case ixml.StartElement:
-			start, _ := ixml.CopyToken(val).(ixml.StartElement)
-			attr := start.Attr[:0]
-			for _, a := range start.Attr {
-				if a.Name.Space == "xmlns" || a.Name.Local == "xmlns" {
-					continue
-				}
-				attr = append(attr, a)
-			}
-			sort.Sort(byName(attr))
-			start.Attr = attr
-			t = start
-		}
-		err = e.EncodeToken(t)
-		if err != nil {
-			return err
-		}
-	}
-	return e.Flush()
-}
-
-// equalXML tests for equality of the normalized XML contents of a and b.
-func (n *xmlNormalizer) equalXML(a, b io.Reader) (bool, error) {
-	var buf bytes.Buffer
-	if err := n.normalize(&buf, a); err != nil {
-		return false, err
-	}
-	normA := buf.String()
-	buf.Reset()
-	if err := n.normalize(&buf, b); err != nil {
-		return false, err
-	}
-	normB := buf.String()
-	return normA == normB, nil
-}
-
-type byName []ixml.Attr
-
-func (a byName) Len() int      { return len(a) }
-func (a byName) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-func (a byName) Less(i, j int) bool {
-	if a[i].Name.Space != a[j].Name.Space {
-		return a[i].Name.Space < a[j].Name.Space
-	}
-	return a[i].Name.Local < a[j].Name.Local
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/client.go b/installer/vendor/golang.org/x/net/websocket/client.go
deleted file mode 100644
index 69a4ac7eef..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/client.go
+++ /dev/null
@@ -1,106 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"bufio"
-	"io"
-	"net"
-	"net/http"
-	"net/url"
-)
-
-// DialError is an error that occurs while dialling a websocket server.
-type DialError struct {
-	*Config
-	Err error
-}
-
-func (e *DialError) Error() string {
-	return "websocket.Dial " + e.Config.Location.String() + ": " + e.Err.Error()
-}
-
-// NewConfig creates a new WebSocket config for client connection.
-func NewConfig(server, origin string) (config *Config, err error) {
-	config = new(Config)
-	config.Version = ProtocolVersionHybi13
-	config.Location, err = url.ParseRequestURI(server)
-	if err != nil {
-		return
-	}
-	config.Origin, err = url.ParseRequestURI(origin)
-	if err != nil {
-		return
-	}
-	config.Header = http.Header(make(map[string][]string))
-	return
-}
-
-// NewClient creates a new WebSocket client connection over rwc.
-func NewClient(config *Config, rwc io.ReadWriteCloser) (ws *Conn, err error) {
-	br := bufio.NewReader(rwc)
-	bw := bufio.NewWriter(rwc)
-	err = hybiClientHandshake(config, br, bw)
-	if err != nil {
-		return
-	}
-	buf := bufio.NewReadWriter(br, bw)
-	ws = newHybiClientConn(config, buf, rwc)
-	return
-}
-
-// Dial opens a new client connection to a WebSocket.
-func Dial(url_, protocol, origin string) (ws *Conn, err error) {
-	config, err := NewConfig(url_, origin)
-	if err != nil {
-		return nil, err
-	}
-	if protocol != "" {
-		config.Protocol = []string{protocol}
-	}
-	return DialConfig(config)
-}
-
-var portMap = map[string]string{
-	"ws":  "80",
-	"wss": "443",
-}
-
-func parseAuthority(location *url.URL) string {
-	if _, ok := portMap[location.Scheme]; ok {
-		if _, _, err := net.SplitHostPort(location.Host); err != nil {
-			return net.JoinHostPort(location.Host, portMap[location.Scheme])
-		}
-	}
-	return location.Host
-}
-
-// DialConfig opens a new client connection to a WebSocket with a config.
-func DialConfig(config *Config) (ws *Conn, err error) {
-	var client net.Conn
-	if config.Location == nil {
-		return nil, &DialError{config, ErrBadWebSocketLocation}
-	}
-	if config.Origin == nil {
-		return nil, &DialError{config, ErrBadWebSocketOrigin}
-	}
-	dialer := config.Dialer
-	if dialer == nil {
-		dialer = &net.Dialer{}
-	}
-	client, err = dialWithDialer(dialer, config)
-	if err != nil {
-		goto Error
-	}
-	ws, err = NewClient(config, client)
-	if err != nil {
-		client.Close()
-		goto Error
-	}
-	return
-
-Error:
-	return nil, &DialError{config, err}
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/dial.go b/installer/vendor/golang.org/x/net/websocket/dial.go
deleted file mode 100644
index 2dab943a48..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/dial.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"crypto/tls"
-	"net"
-)
-
-func dialWithDialer(dialer *net.Dialer, config *Config) (conn net.Conn, err error) {
-	switch config.Location.Scheme {
-	case "ws":
-		conn, err = dialer.Dial("tcp", parseAuthority(config.Location))
-
-	case "wss":
-		conn, err = tls.DialWithDialer(dialer, "tcp", parseAuthority(config.Location), config.TlsConfig)
-
-	default:
-		err = ErrBadScheme
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/dial_test.go b/installer/vendor/golang.org/x/net/websocket/dial_test.go
deleted file mode 100644
index aa03e30dd1..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/dial_test.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"crypto/tls"
-	"fmt"
-	"log"
-	"net"
-	"net/http/httptest"
-	"testing"
-	"time"
-)
-
-// This test depend on Go 1.3+ because in earlier versions the Dialer won't be
-// used in TLS connections and a timeout won't be triggered.
-func TestDialConfigTLSWithDialer(t *testing.T) {
-	tlsServer := httptest.NewTLSServer(nil)
-	tlsServerAddr := tlsServer.Listener.Addr().String()
-	log.Print("Test TLS WebSocket server listening on ", tlsServerAddr)
-	defer tlsServer.Close()
-	config, _ := NewConfig(fmt.Sprintf("wss://%s/echo", tlsServerAddr), "http://localhost")
-	config.Dialer = &net.Dialer{
-		Deadline: time.Now().Add(-time.Minute),
-	}
-	config.TlsConfig = &tls.Config{
-		InsecureSkipVerify: true,
-	}
-	_, err := DialConfig(config)
-	dialerr, ok := err.(*DialError)
-	if !ok {
-		t.Fatalf("DialError expected, got %#v", err)
-	}
-	neterr, ok := dialerr.Err.(*net.OpError)
-	if !ok {
-		t.Fatalf("net.OpError error expected, got %#v", dialerr.Err)
-	}
-	if !neterr.Timeout() {
-		t.Fatalf("expected timeout error, got %#v", neterr)
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/exampledial_test.go b/installer/vendor/golang.org/x/net/websocket/exampledial_test.go
deleted file mode 100644
index 72bb9d48eb..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/exampledial_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket_test
-
-import (
-	"fmt"
-	"log"
-
-	"golang.org/x/net/websocket"
-)
-
-// This example demonstrates a trivial client.
-func ExampleDial() {
-	origin := "http://localhost/"
-	url := "ws://localhost:12345/ws"
-	ws, err := websocket.Dial(url, "", origin)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if _, err := ws.Write([]byte("hello, world!\n")); err != nil {
-		log.Fatal(err)
-	}
-	var msg = make([]byte, 512)
-	var n int
-	if n, err = ws.Read(msg); err != nil {
-		log.Fatal(err)
-	}
-	fmt.Printf("Received: %s.\n", msg[:n])
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/examplehandler_test.go b/installer/vendor/golang.org/x/net/websocket/examplehandler_test.go
deleted file mode 100644
index f22a98fcd4..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/examplehandler_test.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket_test
-
-import (
-	"io"
-	"net/http"
-
-	"golang.org/x/net/websocket"
-)
-
-// Echo the data received on the WebSocket.
-func EchoServer(ws *websocket.Conn) {
-	io.Copy(ws, ws)
-}
-
-// This example demonstrates a trivial echo server.
-func ExampleHandler() {
-	http.Handle("/echo", websocket.Handler(EchoServer))
-	err := http.ListenAndServe(":12345", nil)
-	if err != nil {
-		panic("ListenAndServe: " + err.Error())
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/hybi.go b/installer/vendor/golang.org/x/net/websocket/hybi.go
deleted file mode 100644
index 8cffdd16c9..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/hybi.go
+++ /dev/null
@@ -1,583 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-// This file implements a protocol of hybi draft.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-
-import (
-	"bufio"
-	"bytes"
-	"crypto/rand"
-	"crypto/sha1"
-	"encoding/base64"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"strings"
-)
-
-const (
-	websocketGUID = "258EAFA5-E914-47DA-95CA-C5AB0DC85B11"
-
-	closeStatusNormal            = 1000
-	closeStatusGoingAway         = 1001
-	closeStatusProtocolError     = 1002
-	closeStatusUnsupportedData   = 1003
-	closeStatusFrameTooLarge     = 1004
-	closeStatusNoStatusRcvd      = 1005
-	closeStatusAbnormalClosure   = 1006
-	closeStatusBadMessageData    = 1007
-	closeStatusPolicyViolation   = 1008
-	closeStatusTooBigData        = 1009
-	closeStatusExtensionMismatch = 1010
-
-	maxControlFramePayloadLength = 125
-)
-
-var (
-	ErrBadMaskingKey         = &ProtocolError{"bad masking key"}
-	ErrBadPongMessage        = &ProtocolError{"bad pong message"}
-	ErrBadClosingStatus      = &ProtocolError{"bad closing status"}
-	ErrUnsupportedExtensions = &ProtocolError{"unsupported extensions"}
-	ErrNotImplemented        = &ProtocolError{"not implemented"}
-
-	handshakeHeader = map[string]bool{
-		"Host":                   true,
-		"Upgrade":                true,
-		"Connection":             true,
-		"Sec-Websocket-Key":      true,
-		"Sec-Websocket-Origin":   true,
-		"Sec-Websocket-Version":  true,
-		"Sec-Websocket-Protocol": true,
-		"Sec-Websocket-Accept":   true,
-	}
-)
-
-// A hybiFrameHeader is a frame header as defined in hybi draft.
-type hybiFrameHeader struct {
-	Fin        bool
-	Rsv        [3]bool
-	OpCode     byte
-	Length     int64
-	MaskingKey []byte
-
-	data *bytes.Buffer
-}
-
-// A hybiFrameReader is a reader for hybi frame.
-type hybiFrameReader struct {
-	reader io.Reader
-
-	header hybiFrameHeader
-	pos    int64
-	length int
-}
-
-func (frame *hybiFrameReader) Read(msg []byte) (n int, err error) {
-	n, err = frame.reader.Read(msg)
-	if frame.header.MaskingKey != nil {
-		for i := 0; i < n; i++ {
-			msg[i] = msg[i] ^ frame.header.MaskingKey[frame.pos%4]
-			frame.pos++
-		}
-	}
-	return n, err
-}
-
-func (frame *hybiFrameReader) PayloadType() byte { return frame.header.OpCode }
-
-func (frame *hybiFrameReader) HeaderReader() io.Reader {
-	if frame.header.data == nil {
-		return nil
-	}
-	if frame.header.data.Len() == 0 {
-		return nil
-	}
-	return frame.header.data
-}
-
-func (frame *hybiFrameReader) TrailerReader() io.Reader { return nil }
-
-func (frame *hybiFrameReader) Len() (n int) { return frame.length }
-
-// A hybiFrameReaderFactory creates new frame reader based on its frame type.
-type hybiFrameReaderFactory struct {
-	*bufio.Reader
-}
-
-// NewFrameReader reads a frame header from the connection, and creates new reader for the frame.
-// See Section 5.2 Base Framing protocol for detail.
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17#section-5.2
-func (buf hybiFrameReaderFactory) NewFrameReader() (frame frameReader, err error) {
-	hybiFrame := new(hybiFrameReader)
-	frame = hybiFrame
-	var header []byte
-	var b byte
-	// First byte. FIN/RSV1/RSV2/RSV3/OpCode(4bits)
-	b, err = buf.ReadByte()
-	if err != nil {
-		return
-	}
-	header = append(header, b)
-	hybiFrame.header.Fin = ((header[0] >> 7) & 1) != 0
-	for i := 0; i < 3; i++ {
-		j := uint(6 - i)
-		hybiFrame.header.Rsv[i] = ((header[0] >> j) & 1) != 0
-	}
-	hybiFrame.header.OpCode = header[0] & 0x0f
-
-	// Second byte. Mask/Payload len(7bits)
-	b, err = buf.ReadByte()
-	if err != nil {
-		return
-	}
-	header = append(header, b)
-	mask := (b & 0x80) != 0
-	b &= 0x7f
-	lengthFields := 0
-	switch {
-	case b <= 125: // Payload length 7bits.
-		hybiFrame.header.Length = int64(b)
-	case b == 126: // Payload length 7+16bits
-		lengthFields = 2
-	case b == 127: // Payload length 7+64bits
-		lengthFields = 8
-	}
-	for i := 0; i < lengthFields; i++ {
-		b, err = buf.ReadByte()
-		if err != nil {
-			return
-		}
-		if lengthFields == 8 && i == 0 { // MSB must be zero when 7+64 bits
-			b &= 0x7f
-		}
-		header = append(header, b)
-		hybiFrame.header.Length = hybiFrame.header.Length*256 + int64(b)
-	}
-	if mask {
-		// Masking key. 4 bytes.
-		for i := 0; i < 4; i++ {
-			b, err = buf.ReadByte()
-			if err != nil {
-				return
-			}
-			header = append(header, b)
-			hybiFrame.header.MaskingKey = append(hybiFrame.header.MaskingKey, b)
-		}
-	}
-	hybiFrame.reader = io.LimitReader(buf.Reader, hybiFrame.header.Length)
-	hybiFrame.header.data = bytes.NewBuffer(header)
-	hybiFrame.length = len(header) + int(hybiFrame.header.Length)
-	return
-}
-
-// A HybiFrameWriter is a writer for hybi frame.
-type hybiFrameWriter struct {
-	writer *bufio.Writer
-
-	header *hybiFrameHeader
-}
-
-func (frame *hybiFrameWriter) Write(msg []byte) (n int, err error) {
-	var header []byte
-	var b byte
-	if frame.header.Fin {
-		b |= 0x80
-	}
-	for i := 0; i < 3; i++ {
-		if frame.header.Rsv[i] {
-			j := uint(6 - i)
-			b |= 1 << j
-		}
-	}
-	b |= frame.header.OpCode
-	header = append(header, b)
-	if frame.header.MaskingKey != nil {
-		b = 0x80
-	} else {
-		b = 0
-	}
-	lengthFields := 0
-	length := len(msg)
-	switch {
-	case length <= 125:
-		b |= byte(length)
-	case length < 65536:
-		b |= 126
-		lengthFields = 2
-	default:
-		b |= 127
-		lengthFields = 8
-	}
-	header = append(header, b)
-	for i := 0; i < lengthFields; i++ {
-		j := uint((lengthFields - i - 1) * 8)
-		b = byte((length >> j) & 0xff)
-		header = append(header, b)
-	}
-	if frame.header.MaskingKey != nil {
-		if len(frame.header.MaskingKey) != 4 {
-			return 0, ErrBadMaskingKey
-		}
-		header = append(header, frame.header.MaskingKey...)
-		frame.writer.Write(header)
-		data := make([]byte, length)
-		for i := range data {
-			data[i] = msg[i] ^ frame.header.MaskingKey[i%4]
-		}
-		frame.writer.Write(data)
-		err = frame.writer.Flush()
-		return length, err
-	}
-	frame.writer.Write(header)
-	frame.writer.Write(msg)
-	err = frame.writer.Flush()
-	return length, err
-}
-
-func (frame *hybiFrameWriter) Close() error { return nil }
-
-type hybiFrameWriterFactory struct {
-	*bufio.Writer
-	needMaskingKey bool
-}
-
-func (buf hybiFrameWriterFactory) NewFrameWriter(payloadType byte) (frame frameWriter, err error) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: payloadType}
-	if buf.needMaskingKey {
-		frameHeader.MaskingKey, err = generateMaskingKey()
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &hybiFrameWriter{writer: buf.Writer, header: frameHeader}, nil
-}
-
-type hybiFrameHandler struct {
-	conn        *Conn
-	payloadType byte
-}
-
-func (handler *hybiFrameHandler) HandleFrame(frame frameReader) (frameReader, error) {
-	if handler.conn.IsServerConn() {
-		// The client MUST mask all frames sent to the server.
-		if frame.(*hybiFrameReader).header.MaskingKey == nil {
-			handler.WriteClose(closeStatusProtocolError)
-			return nil, io.EOF
-		}
-	} else {
-		// The server MUST NOT mask all frames.
-		if frame.(*hybiFrameReader).header.MaskingKey != nil {
-			handler.WriteClose(closeStatusProtocolError)
-			return nil, io.EOF
-		}
-	}
-	if header := frame.HeaderReader(); header != nil {
-		io.Copy(ioutil.Discard, header)
-	}
-	switch frame.PayloadType() {
-	case ContinuationFrame:
-		frame.(*hybiFrameReader).header.OpCode = handler.payloadType
-	case TextFrame, BinaryFrame:
-		handler.payloadType = frame.PayloadType()
-	case CloseFrame:
-		return nil, io.EOF
-	case PingFrame, PongFrame:
-		b := make([]byte, maxControlFramePayloadLength)
-		n, err := io.ReadFull(frame, b)
-		if err != nil && err != io.EOF && err != io.ErrUnexpectedEOF {
-			return nil, err
-		}
-		io.Copy(ioutil.Discard, frame)
-		if frame.PayloadType() == PingFrame {
-			if _, err := handler.WritePong(b[:n]); err != nil {
-				return nil, err
-			}
-		}
-		return nil, nil
-	}
-	return frame, nil
-}
-
-func (handler *hybiFrameHandler) WriteClose(status int) (err error) {
-	handler.conn.wio.Lock()
-	defer handler.conn.wio.Unlock()
-	w, err := handler.conn.frameWriterFactory.NewFrameWriter(CloseFrame)
-	if err != nil {
-		return err
-	}
-	msg := make([]byte, 2)
-	binary.BigEndian.PutUint16(msg, uint16(status))
-	_, err = w.Write(msg)
-	w.Close()
-	return err
-}
-
-func (handler *hybiFrameHandler) WritePong(msg []byte) (n int, err error) {
-	handler.conn.wio.Lock()
-	defer handler.conn.wio.Unlock()
-	w, err := handler.conn.frameWriterFactory.NewFrameWriter(PongFrame)
-	if err != nil {
-		return 0, err
-	}
-	n, err = w.Write(msg)
-	w.Close()
-	return n, err
-}
-
-// newHybiConn creates a new WebSocket connection speaking hybi draft protocol.
-func newHybiConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	if buf == nil {
-		br := bufio.NewReader(rwc)
-		bw := bufio.NewWriter(rwc)
-		buf = bufio.NewReadWriter(br, bw)
-	}
-	ws := &Conn{config: config, request: request, buf: buf, rwc: rwc,
-		frameReaderFactory: hybiFrameReaderFactory{buf.Reader},
-		frameWriterFactory: hybiFrameWriterFactory{
-			buf.Writer, request == nil},
-		PayloadType:        TextFrame,
-		defaultCloseStatus: closeStatusNormal}
-	ws.frameHandler = &hybiFrameHandler{conn: ws}
-	return ws
-}
-
-// generateMaskingKey generates a masking key for a frame.
-func generateMaskingKey() (maskingKey []byte, err error) {
-	maskingKey = make([]byte, 4)
-	if _, err = io.ReadFull(rand.Reader, maskingKey); err != nil {
-		return
-	}
-	return
-}
-
-// generateNonce generates a nonce consisting of a randomly selected 16-byte
-// value that has been base64-encoded.
-func generateNonce() (nonce []byte) {
-	key := make([]byte, 16)
-	if _, err := io.ReadFull(rand.Reader, key); err != nil {
-		panic(err)
-	}
-	nonce = make([]byte, 24)
-	base64.StdEncoding.Encode(nonce, key)
-	return
-}
-
-// removeZone removes IPv6 zone identifer from host.
-// E.g., "[fe80::1%en0]:8080" to "[fe80::1]:8080"
-func removeZone(host string) string {
-	if !strings.HasPrefix(host, "[") {
-		return host
-	}
-	i := strings.LastIndex(host, "]")
-	if i < 0 {
-		return host
-	}
-	j := strings.LastIndex(host[:i], "%")
-	if j < 0 {
-		return host
-	}
-	return host[:j] + host[i:]
-}
-
-// getNonceAccept computes the base64-encoded SHA-1 of the concatenation of
-// the nonce ("Sec-WebSocket-Key" value) with the websocket GUID string.
-func getNonceAccept(nonce []byte) (expected []byte, err error) {
-	h := sha1.New()
-	if _, err = h.Write(nonce); err != nil {
-		return
-	}
-	if _, err = h.Write([]byte(websocketGUID)); err != nil {
-		return
-	}
-	expected = make([]byte, 28)
-	base64.StdEncoding.Encode(expected, h.Sum(nil))
-	return
-}
-
-// Client handshake described in draft-ietf-hybi-thewebsocket-protocol-17
-func hybiClientHandshake(config *Config, br *bufio.Reader, bw *bufio.Writer) (err error) {
-	bw.WriteString("GET " + config.Location.RequestURI() + " HTTP/1.1\r\n")
-
-	// According to RFC 6874, an HTTP client, proxy, or other
-	// intermediary must remove any IPv6 zone identifier attached
-	// to an outgoing URI.
-	bw.WriteString("Host: " + removeZone(config.Location.Host) + "\r\n")
-	bw.WriteString("Upgrade: websocket\r\n")
-	bw.WriteString("Connection: Upgrade\r\n")
-	nonce := generateNonce()
-	if config.handshakeData != nil {
-		nonce = []byte(config.handshakeData["key"])
-	}
-	bw.WriteString("Sec-WebSocket-Key: " + string(nonce) + "\r\n")
-	bw.WriteString("Origin: " + strings.ToLower(config.Origin.String()) + "\r\n")
-
-	if config.Version != ProtocolVersionHybi13 {
-		return ErrBadProtocolVersion
-	}
-
-	bw.WriteString("Sec-WebSocket-Version: " + fmt.Sprintf("%d", config.Version) + "\r\n")
-	if len(config.Protocol) > 0 {
-		bw.WriteString("Sec-WebSocket-Protocol: " + strings.Join(config.Protocol, ", ") + "\r\n")
-	}
-	// TODO(ukai): send Sec-WebSocket-Extensions.
-	err = config.Header.WriteSubset(bw, handshakeHeader)
-	if err != nil {
-		return err
-	}
-
-	bw.WriteString("\r\n")
-	if err = bw.Flush(); err != nil {
-		return err
-	}
-
-	resp, err := http.ReadResponse(br, &http.Request{Method: "GET"})
-	if err != nil {
-		return err
-	}
-	if resp.StatusCode != 101 {
-		return ErrBadStatus
-	}
-	if strings.ToLower(resp.Header.Get("Upgrade")) != "websocket" ||
-		strings.ToLower(resp.Header.Get("Connection")) != "upgrade" {
-		return ErrBadUpgrade
-	}
-	expectedAccept, err := getNonceAccept(nonce)
-	if err != nil {
-		return err
-	}
-	if resp.Header.Get("Sec-WebSocket-Accept") != string(expectedAccept) {
-		return ErrChallengeResponse
-	}
-	if resp.Header.Get("Sec-WebSocket-Extensions") != "" {
-		return ErrUnsupportedExtensions
-	}
-	offeredProtocol := resp.Header.Get("Sec-WebSocket-Protocol")
-	if offeredProtocol != "" {
-		protocolMatched := false
-		for i := 0; i < len(config.Protocol); i++ {
-			if config.Protocol[i] == offeredProtocol {
-				protocolMatched = true
-				break
-			}
-		}
-		if !protocolMatched {
-			return ErrBadWebSocketProtocol
-		}
-		config.Protocol = []string{offeredProtocol}
-	}
-
-	return nil
-}
-
-// newHybiClientConn creates a client WebSocket connection after handshake.
-func newHybiClientConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser) *Conn {
-	return newHybiConn(config, buf, rwc, nil)
-}
-
-// A HybiServerHandshaker performs a server handshake using hybi draft protocol.
-type hybiServerHandshaker struct {
-	*Config
-	accept []byte
-}
-
-func (c *hybiServerHandshaker) ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error) {
-	c.Version = ProtocolVersionHybi13
-	if req.Method != "GET" {
-		return http.StatusMethodNotAllowed, ErrBadRequestMethod
-	}
-	// HTTP version can be safely ignored.
-
-	if strings.ToLower(req.Header.Get("Upgrade")) != "websocket" ||
-		!strings.Contains(strings.ToLower(req.Header.Get("Connection")), "upgrade") {
-		return http.StatusBadRequest, ErrNotWebSocket
-	}
-
-	key := req.Header.Get("Sec-Websocket-Key")
-	if key == "" {
-		return http.StatusBadRequest, ErrChallengeResponse
-	}
-	version := req.Header.Get("Sec-Websocket-Version")
-	switch version {
-	case "13":
-		c.Version = ProtocolVersionHybi13
-	default:
-		return http.StatusBadRequest, ErrBadWebSocketVersion
-	}
-	var scheme string
-	if req.TLS != nil {
-		scheme = "wss"
-	} else {
-		scheme = "ws"
-	}
-	c.Location, err = url.ParseRequestURI(scheme + "://" + req.Host + req.URL.RequestURI())
-	if err != nil {
-		return http.StatusBadRequest, err
-	}
-	protocol := strings.TrimSpace(req.Header.Get("Sec-Websocket-Protocol"))
-	if protocol != "" {
-		protocols := strings.Split(protocol, ",")
-		for i := 0; i < len(protocols); i++ {
-			c.Protocol = append(c.Protocol, strings.TrimSpace(protocols[i]))
-		}
-	}
-	c.accept, err = getNonceAccept([]byte(key))
-	if err != nil {
-		return http.StatusInternalServerError, err
-	}
-	return http.StatusSwitchingProtocols, nil
-}
-
-// Origin parses the Origin header in req.
-// If the Origin header is not set, it returns nil and nil.
-func Origin(config *Config, req *http.Request) (*url.URL, error) {
-	var origin string
-	switch config.Version {
-	case ProtocolVersionHybi13:
-		origin = req.Header.Get("Origin")
-	}
-	if origin == "" {
-		return nil, nil
-	}
-	return url.ParseRequestURI(origin)
-}
-
-func (c *hybiServerHandshaker) AcceptHandshake(buf *bufio.Writer) (err error) {
-	if len(c.Protocol) > 0 {
-		if len(c.Protocol) != 1 {
-			// You need choose a Protocol in Handshake func in Server.
-			return ErrBadWebSocketProtocol
-		}
-	}
-	buf.WriteString("HTTP/1.1 101 Switching Protocols\r\n")
-	buf.WriteString("Upgrade: websocket\r\n")
-	buf.WriteString("Connection: Upgrade\r\n")
-	buf.WriteString("Sec-WebSocket-Accept: " + string(c.accept) + "\r\n")
-	if len(c.Protocol) > 0 {
-		buf.WriteString("Sec-WebSocket-Protocol: " + c.Protocol[0] + "\r\n")
-	}
-	// TODO(ukai): send Sec-WebSocket-Extensions.
-	if c.Header != nil {
-		err := c.Header.WriteSubset(buf, handshakeHeader)
-		if err != nil {
-			return err
-		}
-	}
-	buf.WriteString("\r\n")
-	return buf.Flush()
-}
-
-func (c *hybiServerHandshaker) NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	return newHybiServerConn(c.Config, buf, rwc, request)
-}
-
-// newHybiServerConn returns a new WebSocket connection speaking hybi draft protocol.
-func newHybiServerConn(config *Config, buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) *Conn {
-	return newHybiConn(config, buf, rwc, request)
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/hybi_test.go b/installer/vendor/golang.org/x/net/websocket/hybi_test.go
deleted file mode 100644
index 9504aa2d30..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/hybi_test.go
+++ /dev/null
@@ -1,608 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"net/http"
-	"net/url"
-	"strings"
-	"testing"
-)
-
-// Test the getNonceAccept function with values in
-// http://tools.ietf.org/html/draft-ietf-hybi-thewebsocketprotocol-17
-func TestSecWebSocketAccept(t *testing.T) {
-	nonce := []byte("dGhlIHNhbXBsZSBub25jZQ==")
-	expected := []byte("s3pPLMBiTxaQ9kYGzzhZRbK+xOo=")
-	accept, err := getNonceAccept(nonce)
-	if err != nil {
-		t.Errorf("getNonceAccept: returned error %v", err)
-		return
-	}
-	if !bytes.Equal(expected, accept) {
-		t.Errorf("getNonceAccept: expected %q got %q", expected, accept)
-	}
-}
-
-func TestHybiClientHandshake(t *testing.T) {
-	type test struct {
-		url, host string
-	}
-	tests := []test{
-		{"ws://server.example.com/chat", "server.example.com"},
-		{"ws://127.0.0.1/chat", "127.0.0.1"},
-	}
-	if _, err := url.ParseRequestURI("http://[fe80::1%25lo0]"); err == nil {
-		tests = append(tests, test{"ws://[fe80::1%25lo0]/chat", "[fe80::1]"})
-	}
-
-	for _, tt := range tests {
-		var b bytes.Buffer
-		bw := bufio.NewWriter(&b)
-		br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-Sec-WebSocket-Protocol: chat
-
-`))
-		var err error
-		var config Config
-		config.Location, err = url.ParseRequestURI(tt.url)
-		if err != nil {
-			t.Fatal("location url", err)
-		}
-		config.Origin, err = url.ParseRequestURI("http://example.com")
-		if err != nil {
-			t.Fatal("origin url", err)
-		}
-		config.Protocol = append(config.Protocol, "chat")
-		config.Protocol = append(config.Protocol, "superchat")
-		config.Version = ProtocolVersionHybi13
-		config.handshakeData = map[string]string{
-			"key": "dGhlIHNhbXBsZSBub25jZQ==",
-		}
-		if err := hybiClientHandshake(&config, br, bw); err != nil {
-			t.Fatal("handshake", err)
-		}
-		req, err := http.ReadRequest(bufio.NewReader(&b))
-		if err != nil {
-			t.Fatal("read request", err)
-		}
-		if req.Method != "GET" {
-			t.Errorf("request method expected GET, but got %s", req.Method)
-		}
-		if req.URL.Path != "/chat" {
-			t.Errorf("request path expected /chat, but got %s", req.URL.Path)
-		}
-		if req.Proto != "HTTP/1.1" {
-			t.Errorf("request proto expected HTTP/1.1, but got %s", req.Proto)
-		}
-		if req.Host != tt.host {
-			t.Errorf("request host expected %s, but got %s", tt.host, req.Host)
-		}
-		var expectedHeader = map[string]string{
-			"Connection":             "Upgrade",
-			"Upgrade":                "websocket",
-			"Sec-Websocket-Key":      config.handshakeData["key"],
-			"Origin":                 config.Origin.String(),
-			"Sec-Websocket-Protocol": "chat, superchat",
-			"Sec-Websocket-Version":  fmt.Sprintf("%d", ProtocolVersionHybi13),
-		}
-		for k, v := range expectedHeader {
-			if req.Header.Get(k) != v {
-				t.Errorf("%s expected %s, but got %v", k, v, req.Header.Get(k))
-			}
-		}
-	}
-}
-
-func TestHybiClientHandshakeWithHeader(t *testing.T) {
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-	br := bufio.NewReader(strings.NewReader(`HTTP/1.1 101 Switching Protocols
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=
-Sec-WebSocket-Protocol: chat
-
-`))
-	var err error
-	config := new(Config)
-	config.Location, err = url.ParseRequestURI("ws://server.example.com/chat")
-	if err != nil {
-		t.Fatal("location url", err)
-	}
-	config.Origin, err = url.ParseRequestURI("http://example.com")
-	if err != nil {
-		t.Fatal("origin url", err)
-	}
-	config.Protocol = append(config.Protocol, "chat")
-	config.Protocol = append(config.Protocol, "superchat")
-	config.Version = ProtocolVersionHybi13
-	config.Header = http.Header(make(map[string][]string))
-	config.Header.Add("User-Agent", "test")
-
-	config.handshakeData = map[string]string{
-		"key": "dGhlIHNhbXBsZSBub25jZQ==",
-	}
-	err = hybiClientHandshake(config, br, bw)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	req, err := http.ReadRequest(bufio.NewReader(b))
-	if err != nil {
-		t.Fatalf("read request: %v", err)
-	}
-	if req.Method != "GET" {
-		t.Errorf("request method expected GET, but got %q", req.Method)
-	}
-	if req.URL.Path != "/chat" {
-		t.Errorf("request path expected /chat, but got %q", req.URL.Path)
-	}
-	if req.Proto != "HTTP/1.1" {
-		t.Errorf("request proto expected HTTP/1.1, but got %q", req.Proto)
-	}
-	if req.Host != "server.example.com" {
-		t.Errorf("request Host expected server.example.com, but got %v", req.Host)
-	}
-	var expectedHeader = map[string]string{
-		"Connection":             "Upgrade",
-		"Upgrade":                "websocket",
-		"Sec-Websocket-Key":      config.handshakeData["key"],
-		"Origin":                 config.Origin.String(),
-		"Sec-Websocket-Protocol": "chat, superchat",
-		"Sec-Websocket-Version":  fmt.Sprintf("%d", ProtocolVersionHybi13),
-		"User-Agent":             "test",
-	}
-	for k, v := range expectedHeader {
-		if req.Header.Get(k) != v {
-			t.Errorf(fmt.Sprintf("%s expected %q but got %q", k, v, req.Header.Get(k)))
-		}
-	}
-}
-
-func TestHybiServerHandshake(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	expectedProtocols := []string{"chat", "superchat"}
-	if fmt.Sprintf("%v", config.Protocol) != fmt.Sprintf("%v", expectedProtocols) {
-		t.Errorf("protocol expected %q but got %q", expectedProtocols, config.Protocol)
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	config.Protocol = config.Protocol[:1]
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"Sec-WebSocket-Protocol: chat",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
-
-func TestHybiServerHandshakeNoSubProtocol(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	if len(config.Protocol) != 0 {
-		t.Errorf("len(config.Protocol) expected 0, but got %q", len(config.Protocol))
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
-
-func TestHybiServerHandshakeHybiBadVersion(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: Upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Sec-WebSocket-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 9
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != ErrBadWebSocketVersion {
-		t.Errorf("handshake expected err %q but got %q", ErrBadWebSocketVersion, err)
-	}
-	if code != http.StatusBadRequest {
-		t.Errorf("status expected %q but got %q", http.StatusBadRequest, code)
-	}
-}
-
-func testHybiFrame(t *testing.T, testHeader, testPayload, testMaskedPayload []byte, frameHeader *hybiFrameHeader) {
-	b := bytes.NewBuffer([]byte{})
-	frameWriterFactory := &hybiFrameWriterFactory{bufio.NewWriter(b), false}
-	w, _ := frameWriterFactory.NewFrameWriter(TextFrame)
-	w.(*hybiFrameWriter).header = frameHeader
-	_, err := w.Write(testPayload)
-	w.Close()
-	if err != nil {
-		t.Errorf("Write error %q", err)
-	}
-	var expectedFrame []byte
-	expectedFrame = append(expectedFrame, testHeader...)
-	expectedFrame = append(expectedFrame, testMaskedPayload...)
-	if !bytes.Equal(expectedFrame, b.Bytes()) {
-		t.Errorf("frame expected %q got %q", expectedFrame, b.Bytes())
-	}
-	frameReaderFactory := &hybiFrameReaderFactory{bufio.NewReader(b)}
-	r, err := frameReaderFactory.NewFrameReader()
-	if err != nil {
-		t.Errorf("Read error %q", err)
-	}
-	if header := r.HeaderReader(); header == nil {
-		t.Errorf("no header")
-	} else {
-		actualHeader := make([]byte, r.Len())
-		n, err := header.Read(actualHeader)
-		if err != nil {
-			t.Errorf("Read header error %q", err)
-		} else {
-			if n < len(testHeader) {
-				t.Errorf("header too short %q got %q", testHeader, actualHeader[:n])
-			}
-			if !bytes.Equal(testHeader, actualHeader[:n]) {
-				t.Errorf("header expected %q got %q", testHeader, actualHeader[:n])
-			}
-		}
-	}
-	if trailer := r.TrailerReader(); trailer != nil {
-		t.Errorf("unexpected trailer %q", trailer)
-	}
-	frame := r.(*hybiFrameReader)
-	if frameHeader.Fin != frame.header.Fin ||
-		frameHeader.OpCode != frame.header.OpCode ||
-		len(testPayload) != int(frame.header.Length) {
-		t.Errorf("mismatch %v (%d) vs %v", frameHeader, len(testPayload), frame)
-	}
-	payload := make([]byte, len(testPayload))
-	_, err = r.Read(payload)
-	if err != nil && err != io.EOF {
-		t.Errorf("read %v", err)
-	}
-	if !bytes.Equal(testPayload, payload) {
-		t.Errorf("payload %q vs %q", testPayload, payload)
-	}
-}
-
-func TestHybiShortTextFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-	payload := []byte("hello")
-	testHybiFrame(t, []byte{0x81, 0x05}, payload, payload, frameHeader)
-
-	payload = make([]byte, 125)
-	testHybiFrame(t, []byte{0x81, 125}, payload, payload, frameHeader)
-}
-
-func TestHybiShortMaskedTextFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame,
-		MaskingKey: []byte{0xcc, 0x55, 0x80, 0x20}}
-	payload := []byte("hello")
-	maskedPayload := []byte{0xa4, 0x30, 0xec, 0x4c, 0xa3}
-	header := []byte{0x81, 0x85}
-	header = append(header, frameHeader.MaskingKey...)
-	testHybiFrame(t, header, payload, maskedPayload, frameHeader)
-}
-
-func TestHybiShortBinaryFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: BinaryFrame}
-	payload := []byte("hello")
-	testHybiFrame(t, []byte{0x82, 0x05}, payload, payload, frameHeader)
-
-	payload = make([]byte, 125)
-	testHybiFrame(t, []byte{0x82, 125}, payload, payload, frameHeader)
-}
-
-func TestHybiControlFrame(t *testing.T) {
-	payload := []byte("hello")
-
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: PingFrame}
-	testHybiFrame(t, []byte{0x89, 0x05}, payload, payload, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PingFrame}
-	testHybiFrame(t, []byte{0x89, 0x00}, nil, nil, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
-	testHybiFrame(t, []byte{0x8A, 0x05}, payload, payload, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: PongFrame}
-	testHybiFrame(t, []byte{0x8A, 0x00}, nil, nil, frameHeader)
-
-	frameHeader = &hybiFrameHeader{Fin: true, OpCode: CloseFrame}
-	payload = []byte{0x03, 0xe8} // 1000
-	testHybiFrame(t, []byte{0x88, 0x02}, payload, payload, frameHeader)
-}
-
-func TestHybiLongFrame(t *testing.T) {
-	frameHeader := &hybiFrameHeader{Fin: true, OpCode: TextFrame}
-	payload := make([]byte, 126)
-	testHybiFrame(t, []byte{0x81, 126, 0x00, 126}, payload, payload, frameHeader)
-
-	payload = make([]byte, 65535)
-	testHybiFrame(t, []byte{0x81, 126, 0xff, 0xff}, payload, payload, frameHeader)
-
-	payload = make([]byte, 65536)
-	testHybiFrame(t, []byte{0x81, 127, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00}, payload, payload, frameHeader)
-}
-
-func TestHybiClientRead(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-		0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-		0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	msg := make([]byte, 512)
-	n, err := conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 1st frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 1st frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(wireData[2:7], msg[:n]) {
-		t.Errorf("read 1st frame %v, got %v", wireData[2:7], msg[:n])
-	}
-	n, err = conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 2nd frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 2nd frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(wireData[16:21], msg[:n]) {
-		t.Errorf("read 2nd frame %v, got %v", wireData[16:21], msg[:n])
-	}
-	n, err = conn.Read(msg)
-	if err == nil {
-		t.Errorf("read not EOF")
-	}
-	if n != 0 {
-		t.Errorf("expect read 0, got %d", n)
-	}
-}
-
-func TestHybiShortRead(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o',
-		0x89, 0x05, 'h', 'e', 'l', 'l', 'o', // ping
-		0x81, 0x05, 'w', 'o', 'r', 'l', 'd'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	step := 0
-	pos := 0
-	expectedPos := []int{2, 5, 16, 19}
-	expectedLen := []int{3, 2, 3, 2}
-	for {
-		msg := make([]byte, 3)
-		n, err := conn.Read(msg)
-		if step >= len(expectedPos) {
-			if err == nil {
-				t.Errorf("read not EOF")
-			}
-			if n != 0 {
-				t.Errorf("expect read 0, got %d", n)
-			}
-			return
-		}
-		pos = expectedPos[step]
-		endPos := pos + expectedLen[step]
-		if err != nil {
-			t.Errorf("read from %d, got error %q", pos, err)
-			return
-		}
-		if n != endPos-pos {
-			t.Errorf("read from %d, expect %d, got %d", pos, endPos-pos, n)
-		}
-		if !bytes.Equal(wireData[pos:endPos], msg[:n]) {
-			t.Errorf("read from %d, frame %v, got %v", pos, wireData[pos:endPos], msg[:n])
-		}
-		step++
-	}
-}
-
-func TestHybiServerRead(t *testing.T) {
-	wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-		0x89, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // ping: hello
-		0x81, 0x85, 0xed, 0x83, 0xb4, 0x24,
-		0x9a, 0xec, 0xc6, 0x48, 0x89, // world
-	}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
-
-	expected := [][]byte{[]byte("hello"), []byte("world")}
-
-	msg := make([]byte, 512)
-	n, err := conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 1st frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 1st frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(expected[0], msg[:n]) {
-		t.Errorf("read 1st frame %q, got %q", expected[0], msg[:n])
-	}
-
-	n, err = conn.Read(msg)
-	if err != nil {
-		t.Errorf("read 2nd frame, error %q", err)
-	}
-	if n != 5 {
-		t.Errorf("read 2nd frame, expect 5, got %d", n)
-	}
-	if !bytes.Equal(expected[1], msg[:n]) {
-		t.Errorf("read 2nd frame %q, got %q", expected[1], msg[:n])
-	}
-
-	n, err = conn.Read(msg)
-	if err == nil {
-		t.Errorf("read not EOF")
-	}
-	if n != 0 {
-		t.Errorf("expect read 0, got %d", n)
-	}
-}
-
-func TestHybiServerReadWithoutMasking(t *testing.T) {
-	wireData := []byte{0x81, 0x05, 'h', 'e', 'l', 'l', 'o'}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, new(http.Request))
-	// server MUST close the connection upon receiving a non-masked frame.
-	msg := make([]byte, 512)
-	_, err := conn.Read(msg)
-	if err != io.EOF {
-		t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-	}
-}
-
-func TestHybiClientReadWithMasking(t *testing.T) {
-	wireData := []byte{0x81, 0x85, 0xcc, 0x55, 0x80, 0x20,
-		0xa4, 0x30, 0xec, 0x4c, 0xa3, // hello
-	}
-	br := bufio.NewReader(bytes.NewBuffer(wireData))
-	bw := bufio.NewWriter(bytes.NewBuffer([]byte{}))
-	conn := newHybiConn(newConfig(t, "/"), bufio.NewReadWriter(br, bw), nil, nil)
-
-	// client MUST close the connection upon receiving a masked frame.
-	msg := make([]byte, 512)
-	_, err := conn.Read(msg)
-	if err != io.EOF {
-		t.Errorf("read 1st frame, expect %q, but got %q", io.EOF, err)
-	}
-}
-
-// Test the hybiServerHandshaker supports firefox implementation and
-// checks Connection request header include (but it's not necessary
-// equal to) "upgrade"
-func TestHybiServerFirefoxHandshake(t *testing.T) {
-	config := new(Config)
-	handshaker := &hybiServerHandshaker{Config: config}
-	br := bufio.NewReader(strings.NewReader(`GET /chat HTTP/1.1
-Host: server.example.com
-Upgrade: websocket
-Connection: keep-alive, upgrade
-Sec-WebSocket-Key: dGhlIHNhbXBsZSBub25jZQ==
-Origin: http://example.com
-Sec-WebSocket-Protocol: chat, superchat
-Sec-WebSocket-Version: 13
-
-`))
-	req, err := http.ReadRequest(br)
-	if err != nil {
-		t.Fatal("request", err)
-	}
-	code, err := handshaker.ReadHandshake(br, req)
-	if err != nil {
-		t.Errorf("handshake failed: %v", err)
-	}
-	if code != http.StatusSwitchingProtocols {
-		t.Errorf("status expected %q but got %q", http.StatusSwitchingProtocols, code)
-	}
-	b := bytes.NewBuffer([]byte{})
-	bw := bufio.NewWriter(b)
-
-	config.Protocol = []string{"chat"}
-
-	err = handshaker.AcceptHandshake(bw)
-	if err != nil {
-		t.Errorf("handshake response failed: %v", err)
-	}
-	expectedResponse := strings.Join([]string{
-		"HTTP/1.1 101 Switching Protocols",
-		"Upgrade: websocket",
-		"Connection: Upgrade",
-		"Sec-WebSocket-Accept: s3pPLMBiTxaQ9kYGzzhZRbK+xOo=",
-		"Sec-WebSocket-Protocol: chat",
-		"", ""}, "\r\n")
-
-	if b.String() != expectedResponse {
-		t.Errorf("handshake expected %q but got %q", expectedResponse, b.String())
-	}
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/server.go b/installer/vendor/golang.org/x/net/websocket/server.go
deleted file mode 100644
index 0895dea190..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/server.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"bufio"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-func newServerConn(rwc io.ReadWriteCloser, buf *bufio.ReadWriter, req *http.Request, config *Config, handshake func(*Config, *http.Request) error) (conn *Conn, err error) {
-	var hs serverHandshaker = &hybiServerHandshaker{Config: config}
-	code, err := hs.ReadHandshake(buf.Reader, req)
-	if err == ErrBadWebSocketVersion {
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		fmt.Fprintf(buf, "Sec-WebSocket-Version: %s\r\n", SupportedProtocolVersion)
-		buf.WriteString("\r\n")
-		buf.WriteString(err.Error())
-		buf.Flush()
-		return
-	}
-	if err != nil {
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		buf.WriteString("\r\n")
-		buf.WriteString(err.Error())
-		buf.Flush()
-		return
-	}
-	if handshake != nil {
-		err = handshake(config, req)
-		if err != nil {
-			code = http.StatusForbidden
-			fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-			buf.WriteString("\r\n")
-			buf.Flush()
-			return
-		}
-	}
-	err = hs.AcceptHandshake(buf.Writer)
-	if err != nil {
-		code = http.StatusBadRequest
-		fmt.Fprintf(buf, "HTTP/1.1 %03d %s\r\n", code, http.StatusText(code))
-		buf.WriteString("\r\n")
-		buf.Flush()
-		return
-	}
-	conn = hs.NewServerConn(buf, rwc, req)
-	return
-}
-
-// Server represents a server of a WebSocket.
-type Server struct {
-	// Config is a WebSocket configuration for new WebSocket connection.
-	Config
-
-	// Handshake is an optional function in WebSocket handshake.
-	// For example, you can check, or don't check Origin header.
-	// Another example, you can select config.Protocol.
-	Handshake func(*Config, *http.Request) error
-
-	// Handler handles a WebSocket connection.
-	Handler
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (s Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s.serveWebSocket(w, req)
-}
-
-func (s Server) serveWebSocket(w http.ResponseWriter, req *http.Request) {
-	rwc, buf, err := w.(http.Hijacker).Hijack()
-	if err != nil {
-		panic("Hijack failed: " + err.Error())
-	}
-	// The server should abort the WebSocket connection if it finds
-	// the client did not send a handshake that matches with protocol
-	// specification.
-	defer rwc.Close()
-	conn, err := newServerConn(rwc, buf, req, &s.Config, s.Handshake)
-	if err != nil {
-		return
-	}
-	if conn == nil {
-		panic("unexpected nil conn")
-	}
-	s.Handler(conn)
-}
-
-// Handler is a simple interface to a WebSocket browser client.
-// It checks if Origin header is valid URL by default.
-// You might want to verify websocket.Conn.Config().Origin in the func.
-// If you use Server instead of Handler, you could call websocket.Origin and
-// check the origin in your Handshake func. So, if you want to accept
-// non-browser clients, which do not send an Origin header, set a
-// Server.Handshake that does not check the origin.
-type Handler func(*Conn)
-
-func checkOrigin(config *Config, req *http.Request) (err error) {
-	config.Origin, err = Origin(config, req)
-	if err == nil && config.Origin == nil {
-		return fmt.Errorf("null origin")
-	}
-	return err
-}
-
-// ServeHTTP implements the http.Handler interface for a WebSocket
-func (h Handler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
-	s := Server{Handler: h, Handshake: checkOrigin}
-	s.serveWebSocket(w, req)
-}
diff --git a/installer/vendor/golang.org/x/net/websocket/websocket.go b/installer/vendor/golang.org/x/net/websocket/websocket.go
deleted file mode 100644
index e242c89a7a..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/websocket.go
+++ /dev/null
@@ -1,448 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package websocket implements a client and server for the WebSocket protocol
-// as specified in RFC 6455.
-//
-// This package currently lacks some features found in an alternative
-// and more actively maintained WebSocket package:
-//
-//     https://godoc.org/github.com/gorilla/websocket
-//
-package websocket // import "golang.org/x/net/websocket"
-
-import (
-	"bufio"
-	"crypto/tls"
-	"encoding/json"
-	"errors"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"net/url"
-	"sync"
-	"time"
-)
-
-const (
-	ProtocolVersionHybi13    = 13
-	ProtocolVersionHybi      = ProtocolVersionHybi13
-	SupportedProtocolVersion = "13"
-
-	ContinuationFrame = 0
-	TextFrame         = 1
-	BinaryFrame       = 2
-	CloseFrame        = 8
-	PingFrame         = 9
-	PongFrame         = 10
-	UnknownFrame      = 255
-
-	DefaultMaxPayloadBytes = 32 << 20 // 32MB
-)
-
-// ProtocolError represents WebSocket protocol errors.
-type ProtocolError struct {
-	ErrorString string
-}
-
-func (err *ProtocolError) Error() string { return err.ErrorString }
-
-var (
-	ErrBadProtocolVersion   = &ProtocolError{"bad protocol version"}
-	ErrBadScheme            = &ProtocolError{"bad scheme"}
-	ErrBadStatus            = &ProtocolError{"bad status"}
-	ErrBadUpgrade           = &ProtocolError{"missing or bad upgrade"}
-	ErrBadWebSocketOrigin   = &ProtocolError{"missing or bad WebSocket-Origin"}
-	ErrBadWebSocketLocation = &ProtocolError{"missing or bad WebSocket-Location"}
-	ErrBadWebSocketProtocol = &ProtocolError{"missing or bad WebSocket-Protocol"}
-	ErrBadWebSocketVersion  = &ProtocolError{"missing or bad WebSocket Version"}
-	ErrChallengeResponse    = &ProtocolError{"mismatch challenge/response"}
-	ErrBadFrame             = &ProtocolError{"bad frame"}
-	ErrBadFrameBoundary     = &ProtocolError{"not on frame boundary"}
-	ErrNotWebSocket         = &ProtocolError{"not websocket protocol"}
-	ErrBadRequestMethod     = &ProtocolError{"bad method"}
-	ErrNotSupported         = &ProtocolError{"not supported"}
-)
-
-// ErrFrameTooLarge is returned by Codec's Receive method if payload size
-// exceeds limit set by Conn.MaxPayloadBytes
-var ErrFrameTooLarge = errors.New("websocket: frame payload size exceeds limit")
-
-// Addr is an implementation of net.Addr for WebSocket.
-type Addr struct {
-	*url.URL
-}
-
-// Network returns the network type for a WebSocket, "websocket".
-func (addr *Addr) Network() string { return "websocket" }
-
-// Config is a WebSocket configuration
-type Config struct {
-	// A WebSocket server address.
-	Location *url.URL
-
-	// A Websocket client origin.
-	Origin *url.URL
-
-	// WebSocket subprotocols.
-	Protocol []string
-
-	// WebSocket protocol version.
-	Version int
-
-	// TLS config for secure WebSocket (wss).
-	TlsConfig *tls.Config
-
-	// Additional header fields to be sent in WebSocket opening handshake.
-	Header http.Header
-
-	// Dialer used when opening websocket connections.
-	Dialer *net.Dialer
-
-	handshakeData map[string]string
-}
-
-// serverHandshaker is an interface to handle WebSocket server side handshake.
-type serverHandshaker interface {
-	// ReadHandshake reads handshake request message from client.
-	// Returns http response code and error if any.
-	ReadHandshake(buf *bufio.Reader, req *http.Request) (code int, err error)
-
-	// AcceptHandshake accepts the client handshake request and sends
-	// handshake response back to client.
-	AcceptHandshake(buf *bufio.Writer) (err error)
-
-	// NewServerConn creates a new WebSocket connection.
-	NewServerConn(buf *bufio.ReadWriter, rwc io.ReadWriteCloser, request *http.Request) (conn *Conn)
-}
-
-// frameReader is an interface to read a WebSocket frame.
-type frameReader interface {
-	// Reader is to read payload of the frame.
-	io.Reader
-
-	// PayloadType returns payload type.
-	PayloadType() byte
-
-	// HeaderReader returns a reader to read header of the frame.
-	HeaderReader() io.Reader
-
-	// TrailerReader returns a reader to read trailer of the frame.
-	// If it returns nil, there is no trailer in the frame.
-	TrailerReader() io.Reader
-
-	// Len returns total length of the frame, including header and trailer.
-	Len() int
-}
-
-// frameReaderFactory is an interface to creates new frame reader.
-type frameReaderFactory interface {
-	NewFrameReader() (r frameReader, err error)
-}
-
-// frameWriter is an interface to write a WebSocket frame.
-type frameWriter interface {
-	// Writer is to write payload of the frame.
-	io.WriteCloser
-}
-
-// frameWriterFactory is an interface to create new frame writer.
-type frameWriterFactory interface {
-	NewFrameWriter(payloadType byte) (w frameWriter, err error)
-}
-
-type frameHandler interface {
-	HandleFrame(frame frameReader) (r frameReader, err error)
-	WriteClose(status int) (err error)
-}
-
-// Conn represents a WebSocket connection.
-//
-// Multiple goroutines may invoke methods on a Conn simultaneously.
-type Conn struct {
-	config  *Config
-	request *http.Request
-
-	buf *bufio.ReadWriter
-	rwc io.ReadWriteCloser
-
-	rio sync.Mutex
-	frameReaderFactory
-	frameReader
-
-	wio sync.Mutex
-	frameWriterFactory
-
-	frameHandler
-	PayloadType        byte
-	defaultCloseStatus int
-
-	// MaxPayloadBytes limits the size of frame payload received over Conn
-	// by Codec's Receive method. If zero, DefaultMaxPayloadBytes is used.
-	MaxPayloadBytes int
-}
-
-// Read implements the io.Reader interface:
-// it reads data of a frame from the WebSocket connection.
-// if msg is not large enough for the frame data, it fills the msg and next Read
-// will read the rest of the frame data.
-// it reads Text frame or Binary frame.
-func (ws *Conn) Read(msg []byte) (n int, err error) {
-	ws.rio.Lock()
-	defer ws.rio.Unlock()
-again:
-	if ws.frameReader == nil {
-		frame, err := ws.frameReaderFactory.NewFrameReader()
-		if err != nil {
-			return 0, err
-		}
-		ws.frameReader, err = ws.frameHandler.HandleFrame(frame)
-		if err != nil {
-			return 0, err
-		}
-		if ws.frameReader == nil {
-			goto again
-		}
-	}
-	n, err = ws.frameReader.Read(msg)
-	if err == io.EOF {
-		if trailer := ws.frameReader.TrailerReader(); trailer != nil {
-			io.Copy(ioutil.Discard, trailer)
-		}
-		ws.frameReader = nil
-		goto again
-	}
-	return n, err
-}
-
-// Write implements the io.Writer interface:
-// it writes data as a frame to the WebSocket connection.
-func (ws *Conn) Write(msg []byte) (n int, err error) {
-	ws.wio.Lock()
-	defer ws.wio.Unlock()
-	w, err := ws.frameWriterFactory.NewFrameWriter(ws.PayloadType)
-	if err != nil {
-		return 0, err
-	}
-	n, err = w.Write(msg)
-	w.Close()
-	return n, err
-}
-
-// Close implements the io.Closer interface.
-func (ws *Conn) Close() error {
-	err := ws.frameHandler.WriteClose(ws.defaultCloseStatus)
-	err1 := ws.rwc.Close()
-	if err != nil {
-		return err
-	}
-	return err1
-}
-
-func (ws *Conn) IsClientConn() bool { return ws.request == nil }
-func (ws *Conn) IsServerConn() bool { return ws.request != nil }
-
-// LocalAddr returns the WebSocket Origin for the connection for client, or
-// the WebSocket location for server.
-func (ws *Conn) LocalAddr() net.Addr {
-	if ws.IsClientConn() {
-		return &Addr{ws.config.Origin}
-	}
-	return &Addr{ws.config.Location}
-}
-
-// RemoteAddr returns the WebSocket location for the connection for client, or
-// the Websocket Origin for server.
-func (ws *Conn) RemoteAddr() net.Addr {
-	if ws.IsClientConn() {
-		return &Addr{ws.config.Location}
-	}
-	return &Addr{ws.config.Origin}
-}
-
-var errSetDeadline = errors.New("websocket: cannot set deadline: not using a net.Conn")
-
-// SetDeadline sets the connection's network read & write deadlines.
-func (ws *Conn) SetDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// SetReadDeadline sets the connection's network read deadline.
-func (ws *Conn) SetReadDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetReadDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// SetWriteDeadline sets the connection's network write deadline.
-func (ws *Conn) SetWriteDeadline(t time.Time) error {
-	if conn, ok := ws.rwc.(net.Conn); ok {
-		return conn.SetWriteDeadline(t)
-	}
-	return errSetDeadline
-}
-
-// Config returns the WebSocket config.
-func (ws *Conn) Config() *Config { return ws.config }
-
-// Request returns the http request upgraded to the WebSocket.
-// It is nil for client side.
-func (ws *Conn) Request() *http.Request { return ws.request }
-
-// Codec represents a symmetric pair of functions that implement a codec.
-type Codec struct {
-	Marshal   func(v interface{}) (data []byte, payloadType byte, err error)
-	Unmarshal func(data []byte, payloadType byte, v interface{}) (err error)
-}
-
-// Send sends v marshaled by cd.Marshal as single frame to ws.
-func (cd Codec) Send(ws *Conn, v interface{}) (err error) {
-	data, payloadType, err := cd.Marshal(v)
-	if err != nil {
-		return err
-	}
-	ws.wio.Lock()
-	defer ws.wio.Unlock()
-	w, err := ws.frameWriterFactory.NewFrameWriter(payloadType)
-	if err != nil {
-		return err
-	}
-	_, err = w.Write(data)
-	w.Close()
-	return err
-}
-
-// Receive receives single frame from ws, unmarshaled by cd.Unmarshal and stores
-// in v. The whole frame payload is read to an in-memory buffer; max size of
-// payload is defined by ws.MaxPayloadBytes. If frame payload size exceeds
-// limit, ErrFrameTooLarge is returned; in this case frame is not read off wire
-// completely. The next call to Receive would read and discard leftover data of
-// previous oversized frame before processing next frame.
-func (cd Codec) Receive(ws *Conn, v interface{}) (err error) {
-	ws.rio.Lock()
-	defer ws.rio.Unlock()
-	if ws.frameReader != nil {
-		_, err = io.Copy(ioutil.Discard, ws.frameReader)
-		if err != nil {
-			return err
-		}
-		ws.frameReader = nil
-	}
-again:
-	frame, err := ws.frameReaderFactory.NewFrameReader()
-	if err != nil {
-		return err
-	}
-	frame, err = ws.frameHandler.HandleFrame(frame)
-	if err != nil {
-		return err
-	}
-	if frame == nil {
-		goto again
-	}
-	maxPayloadBytes := ws.MaxPayloadBytes
-	if maxPayloadBytes == 0 {
-		maxPayloadBytes = DefaultMaxPayloadBytes
-	}
-	if hf, ok := frame.(*hybiFrameReader); ok && hf.header.Length > int64(maxPayloadBytes) {
-		// payload size exceeds limit, no need to call Unmarshal
-		//
-		// set frameReader to current oversized frame so that
-		// the next call to this function can drain leftover
-		// data before processing the next frame
-		ws.frameReader = frame
-		return ErrFrameTooLarge
-	}
-	payloadType := frame.PayloadType()
-	data, err := ioutil.ReadAll(frame)
-	if err != nil {
-		return err
-	}
-	return cd.Unmarshal(data, payloadType, v)
-}
-
-func marshal(v interface{}) (msg []byte, payloadType byte, err error) {
-	switch data := v.(type) {
-	case string:
-		return []byte(data), TextFrame, nil
-	case []byte:
-		return data, BinaryFrame, nil
-	}
-	return nil, UnknownFrame, ErrNotSupported
-}
-
-func unmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-	switch data := v.(type) {
-	case *string:
-		*data = string(msg)
-		return nil
-	case *[]byte:
-		*data = msg
-		return nil
-	}
-	return ErrNotSupported
-}
-
-/*
-Message is a codec to send/receive text/binary data in a frame on WebSocket connection.
-To send/receive text frame, use string type.
-To send/receive binary frame, use []byte type.
-
-Trivial usage:
-
-	import "websocket"
-
-	// receive text frame
-	var message string
-	websocket.Message.Receive(ws, &message)
-
-	// send text frame
-	message = "hello"
-	websocket.Message.Send(ws, message)
-
-	// receive binary frame
-	var data []byte
-	websocket.Message.Receive(ws, &data)
-
-	// send binary frame
-	data = []byte{0, 1, 2}
-	websocket.Message.Send(ws, data)
-
-*/
-var Message = Codec{marshal, unmarshal}
-
-func jsonMarshal(v interface{}) (msg []byte, payloadType byte, err error) {
-	msg, err = json.Marshal(v)
-	return msg, TextFrame, err
-}
-
-func jsonUnmarshal(msg []byte, payloadType byte, v interface{}) (err error) {
-	return json.Unmarshal(msg, v)
-}
-
-/*
-JSON is a codec to send/receive JSON data in a frame from a WebSocket connection.
-
-Trivial usage:
-
-	import "websocket"
-
-	type T struct {
-		Msg string
-		Count int
-	}
-
-	// receive JSON type T
-	var data T
-	websocket.JSON.Receive(ws, &data)
-
-	// send JSON type T
-	websocket.JSON.Send(ws, data)
-*/
-var JSON = Codec{jsonMarshal, jsonUnmarshal}
diff --git a/installer/vendor/golang.org/x/net/websocket/websocket_test.go b/installer/vendor/golang.org/x/net/websocket/websocket_test.go
deleted file mode 100644
index 2054ce85a6..0000000000
--- a/installer/vendor/golang.org/x/net/websocket/websocket_test.go
+++ /dev/null
@@ -1,665 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package websocket
-
-import (
-	"bytes"
-	"crypto/rand"
-	"fmt"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"net/http/httptest"
-	"net/url"
-	"reflect"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-	"time"
-)
-
-var serverAddr string
-var once sync.Once
-
-func echoServer(ws *Conn) {
-	defer ws.Close()
-	io.Copy(ws, ws)
-}
-
-type Count struct {
-	S string
-	N int
-}
-
-func countServer(ws *Conn) {
-	defer ws.Close()
-	for {
-		var count Count
-		err := JSON.Receive(ws, &count)
-		if err != nil {
-			return
-		}
-		count.N++
-		count.S = strings.Repeat(count.S, count.N)
-		err = JSON.Send(ws, count)
-		if err != nil {
-			return
-		}
-	}
-}
-
-type testCtrlAndDataHandler struct {
-	hybiFrameHandler
-}
-
-func (h *testCtrlAndDataHandler) WritePing(b []byte) (int, error) {
-	h.hybiFrameHandler.conn.wio.Lock()
-	defer h.hybiFrameHandler.conn.wio.Unlock()
-	w, err := h.hybiFrameHandler.conn.frameWriterFactory.NewFrameWriter(PingFrame)
-	if err != nil {
-		return 0, err
-	}
-	n, err := w.Write(b)
-	w.Close()
-	return n, err
-}
-
-func ctrlAndDataServer(ws *Conn) {
-	defer ws.Close()
-	h := &testCtrlAndDataHandler{hybiFrameHandler: hybiFrameHandler{conn: ws}}
-	ws.frameHandler = h
-
-	go func() {
-		for i := 0; ; i++ {
-			var b []byte
-			if i%2 != 0 { // with or without payload
-				b = []byte(fmt.Sprintf("#%d-CONTROL-FRAME-FROM-SERVER", i))
-			}
-			if _, err := h.WritePing(b); err != nil {
-				break
-			}
-			if _, err := h.WritePong(b); err != nil { // unsolicited pong
-				break
-			}
-			time.Sleep(10 * time.Millisecond)
-		}
-	}()
-
-	b := make([]byte, 128)
-	for {
-		n, err := ws.Read(b)
-		if err != nil {
-			break
-		}
-		if _, err := ws.Write(b[:n]); err != nil {
-			break
-		}
-	}
-}
-
-func subProtocolHandshake(config *Config, req *http.Request) error {
-	for _, proto := range config.Protocol {
-		if proto == "chat" {
-			config.Protocol = []string{proto}
-			return nil
-		}
-	}
-	return ErrBadWebSocketProtocol
-}
-
-func subProtoServer(ws *Conn) {
-	for _, proto := range ws.Config().Protocol {
-		io.WriteString(ws, proto)
-	}
-}
-
-func startServer() {
-	http.Handle("/echo", Handler(echoServer))
-	http.Handle("/count", Handler(countServer))
-	http.Handle("/ctrldata", Handler(ctrlAndDataServer))
-	subproto := Server{
-		Handshake: subProtocolHandshake,
-		Handler:   Handler(subProtoServer),
-	}
-	http.Handle("/subproto", subproto)
-	server := httptest.NewServer(nil)
-	serverAddr = server.Listener.Addr().String()
-	log.Print("Test WebSocket server listening on ", serverAddr)
-}
-
-func newConfig(t *testing.T, path string) *Config {
-	config, _ := NewConfig(fmt.Sprintf("ws://%s%s", serverAddr, path), "http://localhost")
-	return config
-}
-
-func TestEcho(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	msg := []byte("hello, world\n")
-	if _, err := conn.Write(msg); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	var actual_msg = make([]byte, 512)
-	n, err := conn.Read(actual_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	actual_msg = actual_msg[0:n]
-	if !bytes.Equal(msg, actual_msg) {
-		t.Errorf("Echo: expected %q got %q", msg, actual_msg)
-	}
-	conn.Close()
-}
-
-func TestAddr(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	ra := conn.RemoteAddr().String()
-	if !strings.HasPrefix(ra, "ws://") || !strings.HasSuffix(ra, "/echo") {
-		t.Errorf("Bad remote addr: %v", ra)
-	}
-	la := conn.LocalAddr().String()
-	if !strings.HasPrefix(la, "http://") {
-		t.Errorf("Bad local addr: %v", la)
-	}
-	conn.Close()
-}
-
-func TestCount(t *testing.T) {
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/count"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	var count Count
-	count.S = "hello"
-	if err := JSON.Send(conn, count); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	if err := JSON.Receive(conn, &count); err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if count.N != 1 {
-		t.Errorf("count: expected %d got %d", 1, count.N)
-	}
-	if count.S != "hello" {
-		t.Errorf("count: expected %q got %q", "hello", count.S)
-	}
-	if err := JSON.Send(conn, count); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	if err := JSON.Receive(conn, &count); err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if count.N != 2 {
-		t.Errorf("count: expected %d got %d", 2, count.N)
-	}
-	if count.S != "hellohello" {
-		t.Errorf("count: expected %q got %q", "hellohello", count.S)
-	}
-	conn.Close()
-}
-
-func TestWithQuery(t *testing.T) {
-	once.Do(startServer)
-
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	config := newConfig(t, "/echo")
-	config.Location, err = url.ParseRequestURI(fmt.Sprintf("ws://%s/echo?q=v", serverAddr))
-	if err != nil {
-		t.Fatal("location url", err)
-	}
-
-	ws, err := NewClient(config, client)
-	if err != nil {
-		t.Errorf("WebSocket handshake: %v", err)
-		return
-	}
-	ws.Close()
-}
-
-func testWithProtocol(t *testing.T, subproto []string) (string, error) {
-	once.Do(startServer)
-
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	config := newConfig(t, "/subproto")
-	config.Protocol = subproto
-
-	ws, err := NewClient(config, client)
-	if err != nil {
-		return "", err
-	}
-	msg := make([]byte, 16)
-	n, err := ws.Read(msg)
-	if err != nil {
-		return "", err
-	}
-	ws.Close()
-	return string(msg[:n]), nil
-}
-
-func TestWithProtocol(t *testing.T) {
-	proto, err := testWithProtocol(t, []string{"chat"})
-	if err != nil {
-		t.Errorf("SubProto: unexpected error: %v", err)
-	}
-	if proto != "chat" {
-		t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-	}
-}
-
-func TestWithTwoProtocol(t *testing.T) {
-	proto, err := testWithProtocol(t, []string{"test", "chat"})
-	if err != nil {
-		t.Errorf("SubProto: unexpected error: %v", err)
-	}
-	if proto != "chat" {
-		t.Errorf("SubProto: expected %q, got %q", "chat", proto)
-	}
-}
-
-func TestWithBadProtocol(t *testing.T) {
-	_, err := testWithProtocol(t, []string{"test"})
-	if err != ErrBadStatus {
-		t.Errorf("SubProto: expected %v, got %v", ErrBadStatus, err)
-	}
-}
-
-func TestHTTP(t *testing.T) {
-	once.Do(startServer)
-
-	// If the client did not send a handshake that matches the protocol
-	// specification, the server MUST return an HTTP response with an
-	// appropriate error code (such as 400 Bad Request)
-	resp, err := http.Get(fmt.Sprintf("http://%s/echo", serverAddr))
-	if err != nil {
-		t.Errorf("Get: error %#v", err)
-		return
-	}
-	if resp == nil {
-		t.Error("Get: resp is null")
-		return
-	}
-	if resp.StatusCode != http.StatusBadRequest {
-		t.Errorf("Get: expected %q got %q", http.StatusBadRequest, resp.StatusCode)
-	}
-}
-
-func TestTrailingSpaces(t *testing.T) {
-	// http://code.google.com/p/go/issues/detail?id=955
-	// The last runs of this create keys with trailing spaces that should not be
-	// generated by the client.
-	once.Do(startServer)
-	config := newConfig(t, "/echo")
-	for i := 0; i < 30; i++ {
-		// body
-		ws, err := DialConfig(config)
-		if err != nil {
-			t.Errorf("Dial #%d failed: %v", i, err)
-			break
-		}
-		ws.Close()
-	}
-}
-
-func TestDialConfigBadVersion(t *testing.T) {
-	once.Do(startServer)
-	config := newConfig(t, "/echo")
-	config.Version = 1234
-
-	_, err := DialConfig(config)
-
-	if dialerr, ok := err.(*DialError); ok {
-		if dialerr.Err != ErrBadProtocolVersion {
-			t.Errorf("dial expected err %q but got %q", ErrBadProtocolVersion, dialerr.Err)
-		}
-	}
-}
-
-func TestDialConfigWithDialer(t *testing.T) {
-	once.Do(startServer)
-	config := newConfig(t, "/echo")
-	config.Dialer = &net.Dialer{
-		Deadline: time.Now().Add(-time.Minute),
-	}
-	_, err := DialConfig(config)
-	dialerr, ok := err.(*DialError)
-	if !ok {
-		t.Fatalf("DialError expected, got %#v", err)
-	}
-	neterr, ok := dialerr.Err.(*net.OpError)
-	if !ok {
-		t.Fatalf("net.OpError error expected, got %#v", dialerr.Err)
-	}
-	if !neterr.Timeout() {
-		t.Fatalf("expected timeout error, got %#v", neterr)
-	}
-}
-
-func TestSmallBuffer(t *testing.T) {
-	// http://code.google.com/p/go/issues/detail?id=1145
-	// Read should be able to handle reading a fragment of a frame.
-	once.Do(startServer)
-
-	// websocket.Dial()
-	client, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-	conn, err := NewClient(newConfig(t, "/echo"), client)
-	if err != nil {
-		t.Errorf("WebSocket handshake error: %v", err)
-		return
-	}
-
-	msg := []byte("hello, world\n")
-	if _, err := conn.Write(msg); err != nil {
-		t.Errorf("Write: %v", err)
-	}
-	var small_msg = make([]byte, 8)
-	n, err := conn.Read(small_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	if !bytes.Equal(msg[:len(small_msg)], small_msg) {
-		t.Errorf("Echo: expected %q got %q", msg[:len(small_msg)], small_msg)
-	}
-	var second_msg = make([]byte, len(msg))
-	n, err = conn.Read(second_msg)
-	if err != nil {
-		t.Errorf("Read: %v", err)
-	}
-	second_msg = second_msg[0:n]
-	if !bytes.Equal(msg[len(small_msg):], second_msg) {
-		t.Errorf("Echo: expected %q got %q", msg[len(small_msg):], second_msg)
-	}
-	conn.Close()
-}
-
-var parseAuthorityTests = []struct {
-	in  *url.URL
-	out string
-}{
-	{
-		&url.URL{
-			Scheme: "ws",
-			Host:   "www.google.com",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "wss",
-			Host:   "www.google.com",
-		},
-		"www.google.com:443",
-	},
-	{
-		&url.URL{
-			Scheme: "ws",
-			Host:   "www.google.com:80",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "wss",
-			Host:   "www.google.com:443",
-		},
-		"www.google.com:443",
-	},
-	// some invalid ones for parseAuthority. parseAuthority doesn't
-	// concern itself with the scheme unless it actually knows about it
-	{
-		&url.URL{
-			Scheme: "http",
-			Host:   "www.google.com",
-		},
-		"www.google.com",
-	},
-	{
-		&url.URL{
-			Scheme: "http",
-			Host:   "www.google.com:80",
-		},
-		"www.google.com:80",
-	},
-	{
-		&url.URL{
-			Scheme: "asdf",
-			Host:   "127.0.0.1",
-		},
-		"127.0.0.1",
-	},
-	{
-		&url.URL{
-			Scheme: "asdf",
-			Host:   "www.google.com",
-		},
-		"www.google.com",
-	},
-}
-
-func TestParseAuthority(t *testing.T) {
-	for _, tt := range parseAuthorityTests {
-		out := parseAuthority(tt.in)
-		if out != tt.out {
-			t.Errorf("got %v; want %v", out, tt.out)
-		}
-	}
-}
-
-type closerConn struct {
-	net.Conn
-	closed int // count of the number of times Close was called
-}
-
-func (c *closerConn) Close() error {
-	c.closed++
-	return c.Conn.Close()
-}
-
-func TestClose(t *testing.T) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("see golang.org/issue/11454")
-	}
-
-	once.Do(startServer)
-
-	conn, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal("dialing", err)
-	}
-
-	cc := closerConn{Conn: conn}
-
-	client, err := NewClient(newConfig(t, "/echo"), &cc)
-	if err != nil {
-		t.Fatalf("WebSocket handshake: %v", err)
-	}
-
-	// set the deadline to ten minutes ago, which will have expired by the time
-	// client.Close sends the close status frame.
-	conn.SetDeadline(time.Now().Add(-10 * time.Minute))
-
-	if err := client.Close(); err == nil {
-		t.Errorf("ws.Close(): expected error, got %v", err)
-	}
-	if cc.closed < 1 {
-		t.Fatalf("ws.Close(): expected underlying ws.rwc.Close to be called > 0 times, got: %v", cc.closed)
-	}
-}
-
-var originTests = []struct {
-	req    *http.Request
-	origin *url.URL
-}{
-	{
-		req: &http.Request{
-			Header: http.Header{
-				"Origin": []string{"http://www.example.com"},
-			},
-		},
-		origin: &url.URL{
-			Scheme: "http",
-			Host:   "www.example.com",
-		},
-	},
-	{
-		req: &http.Request{},
-	},
-}
-
-func TestOrigin(t *testing.T) {
-	conf := newConfig(t, "/echo")
-	conf.Version = ProtocolVersionHybi13
-	for i, tt := range originTests {
-		origin, err := Origin(conf, tt.req)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		if !reflect.DeepEqual(origin, tt.origin) {
-			t.Errorf("#%d: got origin %v; want %v", i, origin, tt.origin)
-			continue
-		}
-	}
-}
-
-func TestCtrlAndData(t *testing.T) {
-	once.Do(startServer)
-
-	c, err := net.Dial("tcp", serverAddr)
-	if err != nil {
-		t.Fatal(err)
-	}
-	ws, err := NewClient(newConfig(t, "/ctrldata"), c)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ws.Close()
-
-	h := &testCtrlAndDataHandler{hybiFrameHandler: hybiFrameHandler{conn: ws}}
-	ws.frameHandler = h
-
-	b := make([]byte, 128)
-	for i := 0; i < 2; i++ {
-		data := []byte(fmt.Sprintf("#%d-DATA-FRAME-FROM-CLIENT", i))
-		if _, err := ws.Write(data); err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		var ctrl []byte
-		if i%2 != 0 { // with or without payload
-			ctrl = []byte(fmt.Sprintf("#%d-CONTROL-FRAME-FROM-CLIENT", i))
-		}
-		if _, err := h.WritePing(ctrl); err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		n, err := ws.Read(b)
-		if err != nil {
-			t.Fatalf("#%d: %v", i, err)
-		}
-		if !bytes.Equal(b[:n], data) {
-			t.Fatalf("#%d: got %v; want %v", i, b[:n], data)
-		}
-	}
-}
-
-func TestCodec_ReceiveLimited(t *testing.T) {
-	const limit = 2048
-	var payloads [][]byte
-	for _, size := range []int{
-		1024,
-		2048,
-		4096, // receive of this message would be interrupted due to limit
-		2048, // this one is to make sure next receive recovers discarding leftovers
-	} {
-		b := make([]byte, size)
-		rand.Read(b)
-		payloads = append(payloads, b)
-	}
-	handlerDone := make(chan struct{})
-	limitedHandler := func(ws *Conn) {
-		defer close(handlerDone)
-		ws.MaxPayloadBytes = limit
-		defer ws.Close()
-		for i, p := range payloads {
-			t.Logf("payload #%d (size %d, exceeds limit: %v)", i, len(p), len(p) > limit)
-			var recv []byte
-			err := Message.Receive(ws, &recv)
-			switch err {
-			case nil:
-			case ErrFrameTooLarge:
-				if len(p) <= limit {
-					t.Fatalf("unexpected frame size limit: expected %d bytes of payload having limit at %d", len(p), limit)
-				}
-				continue
-			default:
-				t.Fatalf("unexpected error: %v (want either nil or ErrFrameTooLarge)", err)
-			}
-			if len(recv) > limit {
-				t.Fatalf("received %d bytes of payload having limit at %d", len(recv), limit)
-			}
-			if !bytes.Equal(p, recv) {
-				t.Fatalf("received payload differs:\ngot:\t%v\nwant:\t%v", recv, p)
-			}
-		}
-	}
-	server := httptest.NewServer(Handler(limitedHandler))
-	defer server.CloseClientConnections()
-	defer server.Close()
-	addr := server.Listener.Addr().String()
-	ws, err := Dial("ws://"+addr+"/", "", "http://localhost/")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ws.Close()
-	for i, p := range payloads {
-		if err := Message.Send(ws, p); err != nil {
-			t.Fatalf("payload #%d (size %d): %v", i, len(p), err)
-		}
-	}
-	<-handlerDone
-}
diff --git a/installer/vendor/golang.org/x/net/xsrftoken/xsrf.go b/installer/vendor/golang.org/x/net/xsrftoken/xsrf.go
deleted file mode 100644
index 881bf199fd..0000000000
--- a/installer/vendor/golang.org/x/net/xsrftoken/xsrf.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package xsrftoken provides methods for generating and validating secure XSRF tokens.
-package xsrftoken // import "golang.org/x/net/xsrftoken"
-
-import (
-	"crypto/hmac"
-	"crypto/sha1"
-	"crypto/subtle"
-	"encoding/base64"
-	"fmt"
-	"strconv"
-	"strings"
-	"time"
-)
-
-// Timeout is the duration for which XSRF tokens are valid.
-// It is exported so clients may set cookie timeouts that match generated tokens.
-const Timeout = 24 * time.Hour
-
-// clean sanitizes a string for inclusion in a token by replacing all ":"s.
-func clean(s string) string {
-	return strings.Replace(s, ":", "_", -1)
-}
-
-// Generate returns a URL-safe secure XSRF token that expires in 24 hours.
-//
-// key is a secret key for your application.
-// userID is a unique identifier for the user.
-// actionID is the action the user is taking (e.g. POSTing to a particular path).
-func Generate(key, userID, actionID string) string {
-	return generateTokenAtTime(key, userID, actionID, time.Now())
-}
-
-// generateTokenAtTime is like Generate, but returns a token that expires 24 hours from now.
-func generateTokenAtTime(key, userID, actionID string, now time.Time) string {
-	// Round time up and convert to milliseconds.
-	milliTime := (now.UnixNano() + 1e6 - 1) / 1e6
-
-	h := hmac.New(sha1.New, []byte(key))
-	fmt.Fprintf(h, "%s:%s:%d", clean(userID), clean(actionID), milliTime)
-
-	// Get the padded base64 string then removing the padding.
-	tok := string(h.Sum(nil))
-	tok = base64.URLEncoding.EncodeToString([]byte(tok))
-	tok = strings.TrimRight(tok, "=")
-
-	return fmt.Sprintf("%s:%d", tok, milliTime)
-}
-
-// Valid reports whether a token is a valid, unexpired token returned by Generate.
-func Valid(token, key, userID, actionID string) bool {
-	return validTokenAtTime(token, key, userID, actionID, time.Now())
-}
-
-// validTokenAtTime reports whether a token is valid at the given time.
-func validTokenAtTime(token, key, userID, actionID string, now time.Time) bool {
-	// Extract the issue time of the token.
-	sep := strings.LastIndex(token, ":")
-	if sep < 0 {
-		return false
-	}
-	millis, err := strconv.ParseInt(token[sep+1:], 10, 64)
-	if err != nil {
-		return false
-	}
-	issueTime := time.Unix(0, millis*1e6)
-
-	// Check that the token is not expired.
-	if now.Sub(issueTime) >= Timeout {
-		return false
-	}
-
-	// Check that the token is not from the future.
-	// Allow 1 minute grace period in case the token is being verified on a
-	// machine whose clock is behind the machine that issued the token.
-	if issueTime.After(now.Add(1 * time.Minute)) {
-		return false
-	}
-
-	expected := generateTokenAtTime(key, userID, actionID, issueTime)
-
-	// Check that the token matches the expected value.
-	// Use constant time comparison to avoid timing attacks.
-	return subtle.ConstantTimeCompare([]byte(token), []byte(expected)) == 1
-}
diff --git a/installer/vendor/golang.org/x/net/xsrftoken/xsrf_test.go b/installer/vendor/golang.org/x/net/xsrftoken/xsrf_test.go
deleted file mode 100644
index 6c8e7d9b53..0000000000
--- a/installer/vendor/golang.org/x/net/xsrftoken/xsrf_test.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package xsrftoken
-
-import (
-	"encoding/base64"
-	"testing"
-	"time"
-)
-
-const (
-	key      = "quay"
-	userID   = "12345678"
-	actionID = "POST /form"
-)
-
-var (
-	now              = time.Now()
-	oneMinuteFromNow = now.Add(1 * time.Minute)
-)
-
-func TestValidToken(t *testing.T) {
-	tok := generateTokenAtTime(key, userID, actionID, now)
-	if !validTokenAtTime(tok, key, userID, actionID, oneMinuteFromNow) {
-		t.Error("One second later: Expected token to be valid")
-	}
-	if !validTokenAtTime(tok, key, userID, actionID, now.Add(Timeout-1*time.Nanosecond)) {
-		t.Error("Just before timeout: Expected token to be valid")
-	}
-	if !validTokenAtTime(tok, key, userID, actionID, now.Add(-1*time.Minute+1*time.Millisecond)) {
-		t.Error("One minute in the past: Expected token to be valid")
-	}
-}
-
-// TestSeparatorReplacement tests that separators are being correctly substituted
-func TestSeparatorReplacement(t *testing.T) {
-	tok := generateTokenAtTime("foo:bar", "baz", "wah", now)
-	tok2 := generateTokenAtTime("foo", "bar:baz", "wah", now)
-	if tok == tok2 {
-		t.Errorf("Expected generated tokens to be different")
-	}
-}
-
-func TestInvalidToken(t *testing.T) {
-	invalidTokenTests := []struct {
-		name, key, userID, actionID string
-		t                           time.Time
-	}{
-		{"Bad key", "foobar", userID, actionID, oneMinuteFromNow},
-		{"Bad userID", key, "foobar", actionID, oneMinuteFromNow},
-		{"Bad actionID", key, userID, "foobar", oneMinuteFromNow},
-		{"Expired", key, userID, actionID, now.Add(Timeout + 1*time.Millisecond)},
-		{"More than 1 minute from the future", key, userID, actionID, now.Add(-1*time.Nanosecond - 1*time.Minute)},
-	}
-
-	tok := generateTokenAtTime(key, userID, actionID, now)
-	for _, itt := range invalidTokenTests {
-		if validTokenAtTime(tok, itt.key, itt.userID, itt.actionID, itt.t) {
-			t.Errorf("%v: Expected token to be invalid", itt.name)
-		}
-	}
-}
-
-// TestValidateBadData primarily tests that no unexpected panics are triggered
-// during parsing
-func TestValidateBadData(t *testing.T) {
-	badDataTests := []struct {
-		name, tok string
-	}{
-		{"Invalid Base64", "ASDab24(@)$*=="},
-		{"No delimiter", base64.URLEncoding.EncodeToString([]byte("foobar12345678"))},
-		{"Invalid time", base64.URLEncoding.EncodeToString([]byte("foobar:foobar"))},
-		{"Wrong length", "1234" + generateTokenAtTime(key, userID, actionID, now)},
-	}
-
-	for _, bdt := range badDataTests {
-		if validTokenAtTime(bdt.tok, key, userID, actionID, oneMinuteFromNow) {
-			t.Errorf("%v: Expected token to be invalid", bdt.name)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/sync/CONTRIBUTING.md b/installer/vendor/golang.org/x/sync/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/sync/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/sync/README.md b/installer/vendor/golang.org/x/sync/README.md
deleted file mode 100644
index 1f8436cc9c..0000000000
--- a/installer/vendor/golang.org/x/sync/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# Go Sync
-
-This repository provides Go concurrency primitives in addition to the
-ones provided by the language and "sync" and "sync/atomic" packages.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/sync`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/sync`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the sync repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/sync:" in the
-subject line, so it is easy to find.
diff --git a/installer/vendor/golang.org/x/sync/codereview.cfg b/installer/vendor/golang.org/x/sync/codereview.cfg
deleted file mode 100644
index 3f8b14b64e..0000000000
--- a/installer/vendor/golang.org/x/sync/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/installer/vendor/golang.org/x/sync/errgroup/errgroup_example_md5all_test.go b/installer/vendor/golang.org/x/sync/errgroup/errgroup_example_md5all_test.go
deleted file mode 100644
index 714b5aea77..0000000000
--- a/installer/vendor/golang.org/x/sync/errgroup/errgroup_example_md5all_test.go
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package errgroup_test
-
-import (
-	"crypto/md5"
-	"fmt"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-
-	"golang.org/x/net/context"
-	"golang.org/x/sync/errgroup"
-)
-
-// Pipeline demonstrates the use of a Group to implement a multi-stage
-// pipeline: a version of the MD5All function with bounded parallelism from
-// https://blog.golang.org/pipelines.
-func ExampleGroup_pipeline() {
-	m, err := MD5All(context.Background(), ".")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for k, sum := range m {
-		fmt.Printf("%s:\t%x\n", k, sum)
-	}
-}
-
-type result struct {
-	path string
-	sum  [md5.Size]byte
-}
-
-// MD5All reads all the files in the file tree rooted at root and returns a map
-// from file path to the MD5 sum of the file's contents. If the directory walk
-// fails or any read operation fails, MD5All returns an error.
-func MD5All(ctx context.Context, root string) (map[string][md5.Size]byte, error) {
-	// ctx is canceled when g.Wait() returns. When this version of MD5All returns
-	// - even in case of error! - we know that all of the goroutines have finished
-	// and the memory they were using can be garbage-collected.
-	g, ctx := errgroup.WithContext(ctx)
-	paths := make(chan string)
-
-	g.Go(func() error {
-		defer close(paths)
-		return filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
-			if err != nil {
-				return err
-			}
-			if !info.Mode().IsRegular() {
-				return nil
-			}
-			select {
-			case paths <- path:
-			case <-ctx.Done():
-				return ctx.Err()
-			}
-			return nil
-		})
-	})
-
-	// Start a fixed number of goroutines to read and digest files.
-	c := make(chan result)
-	const numDigesters = 20
-	for i := 0; i < numDigesters; i++ {
-		g.Go(func() error {
-			for path := range paths {
-				data, err := ioutil.ReadFile(path)
-				if err != nil {
-					return err
-				}
-				select {
-				case c <- result{path, md5.Sum(data)}:
-				case <-ctx.Done():
-					return ctx.Err()
-				}
-			}
-			return nil
-		})
-	}
-	go func() {
-		g.Wait()
-		close(c)
-	}()
-
-	m := make(map[string][md5.Size]byte)
-	for r := range c {
-		m[r.path] = r.sum
-	}
-	// Check whether any of the goroutines failed. Since g is accumulating the
-	// errors, we don't need to send them (or check for them) in the individual
-	// results sent on the channel.
-	if err := g.Wait(); err != nil {
-		return nil, err
-	}
-	return m, nil
-}
diff --git a/installer/vendor/golang.org/x/sync/errgroup/errgroup_test.go b/installer/vendor/golang.org/x/sync/errgroup/errgroup_test.go
deleted file mode 100644
index 6a9696efc6..0000000000
--- a/installer/vendor/golang.org/x/sync/errgroup/errgroup_test.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package errgroup_test
-
-import (
-	"errors"
-	"fmt"
-	"net/http"
-	"os"
-	"testing"
-
-	"golang.org/x/net/context"
-	"golang.org/x/sync/errgroup"
-)
-
-var (
-	Web   = fakeSearch("web")
-	Image = fakeSearch("image")
-	Video = fakeSearch("video")
-)
-
-type Result string
-type Search func(ctx context.Context, query string) (Result, error)
-
-func fakeSearch(kind string) Search {
-	return func(_ context.Context, query string) (Result, error) {
-		return Result(fmt.Sprintf("%s result for %q", kind, query)), nil
-	}
-}
-
-// JustErrors illustrates the use of a Group in place of a sync.WaitGroup to
-// simplify goroutine counting and error handling. This example is derived from
-// the sync.WaitGroup example at https://golang.org/pkg/sync/#example_WaitGroup.
-func ExampleGroup_justErrors() {
-	var g errgroup.Group
-	var urls = []string{
-		"http://www.golang.org/",
-		"http://www.google.com/",
-		"http://www.somestupidname.com/",
-	}
-	for _, url := range urls {
-		// Launch a goroutine to fetch the URL.
-		url := url // https://golang.org/doc/faq#closures_and_goroutines
-		g.Go(func() error {
-			// Fetch the URL.
-			resp, err := http.Get(url)
-			if err == nil {
-				resp.Body.Close()
-			}
-			return err
-		})
-	}
-	// Wait for all HTTP fetches to complete.
-	if err := g.Wait(); err == nil {
-		fmt.Println("Successfully fetched all URLs.")
-	}
-}
-
-// Parallel illustrates the use of a Group for synchronizing a simple parallel
-// task: the "Google Search 2.0" function from
-// https://talks.golang.org/2012/concurrency.slide#46, augmented with a Context
-// and error-handling.
-func ExampleGroup_parallel() {
-	Google := func(ctx context.Context, query string) ([]Result, error) {
-		g, ctx := errgroup.WithContext(ctx)
-
-		searches := []Search{Web, Image, Video}
-		results := make([]Result, len(searches))
-		for i, search := range searches {
-			i, search := i, search // https://golang.org/doc/faq#closures_and_goroutines
-			g.Go(func() error {
-				result, err := search(ctx, query)
-				if err == nil {
-					results[i] = result
-				}
-				return err
-			})
-		}
-		if err := g.Wait(); err != nil {
-			return nil, err
-		}
-		return results, nil
-	}
-
-	results, err := Google(context.Background(), "golang")
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		return
-	}
-	for _, result := range results {
-		fmt.Println(result)
-	}
-
-	// Output:
-	// web result for "golang"
-	// image result for "golang"
-	// video result for "golang"
-}
-
-func TestZeroGroup(t *testing.T) {
-	err1 := errors.New("errgroup_test: 1")
-	err2 := errors.New("errgroup_test: 2")
-
-	cases := []struct {
-		errs []error
-	}{
-		{errs: []error{}},
-		{errs: []error{nil}},
-		{errs: []error{err1}},
-		{errs: []error{err1, nil}},
-		{errs: []error{err1, nil, err2}},
-	}
-
-	for _, tc := range cases {
-		var g errgroup.Group
-
-		var firstErr error
-		for i, err := range tc.errs {
-			err := err
-			g.Go(func() error { return err })
-
-			if firstErr == nil && err != nil {
-				firstErr = err
-			}
-
-			if gErr := g.Wait(); gErr != firstErr {
-				t.Errorf("after %T.Go(func() error { return err }) for err in %v\n"+
-					"g.Wait() = %v; want %v",
-					g, tc.errs[:i+1], err, firstErr)
-			}
-		}
-	}
-}
-
-func TestWithContext(t *testing.T) {
-	errDoom := errors.New("group_test: doomed")
-
-	cases := []struct {
-		errs []error
-		want error
-	}{
-		{want: nil},
-		{errs: []error{nil}, want: nil},
-		{errs: []error{errDoom}, want: errDoom},
-		{errs: []error{errDoom, nil}, want: errDoom},
-	}
-
-	for _, tc := range cases {
-		g, ctx := errgroup.WithContext(context.Background())
-
-		for _, err := range tc.errs {
-			err := err
-			g.Go(func() error { return err })
-		}
-
-		if err := g.Wait(); err != tc.want {
-			t.Errorf("after %T.Go(func() error { return err }) for err in %v\n"+
-				"g.Wait() = %v; want %v",
-				g, tc.errs, err, tc.want)
-		}
-
-		canceled := false
-		select {
-		case <-ctx.Done():
-			canceled = true
-		default:
-		}
-		if !canceled {
-			t.Errorf("after %T.Go(func() error { return err }) for err in %v\n"+
-				"ctx.Done() was not closed",
-				g, tc.errs)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/sync/semaphore/semaphore.go b/installer/vendor/golang.org/x/sync/semaphore/semaphore.go
deleted file mode 100644
index e9d2d79a97..0000000000
--- a/installer/vendor/golang.org/x/sync/semaphore/semaphore.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package semaphore provides a weighted semaphore implementation.
-package semaphore // import "golang.org/x/sync/semaphore"
-
-import (
-	"container/list"
-	"sync"
-
-	// Use the old context because packages that depend on this one
-	// (e.g. cloud.google.com/go/...) must run on Go 1.6.
-	// TODO(jba): update to "context" when possible.
-	"golang.org/x/net/context"
-)
-
-type waiter struct {
-	n     int64
-	ready chan<- struct{} // Closed when semaphore acquired.
-}
-
-// NewWeighted creates a new weighted semaphore with the given
-// maximum combined weight for concurrent access.
-func NewWeighted(n int64) *Weighted {
-	w := &Weighted{size: n}
-	return w
-}
-
-// Weighted provides a way to bound concurrent access to a resource.
-// The callers can request access with a given weight.
-type Weighted struct {
-	size    int64
-	cur     int64
-	mu      sync.Mutex
-	waiters list.List
-}
-
-// Acquire acquires the semaphore with a weight of n, blocking only until ctx
-// is done. On success, returns nil. On failure, returns ctx.Err() and leaves
-// the semaphore unchanged.
-//
-// If ctx is already done, Acquire may still succeed without blocking.
-func (s *Weighted) Acquire(ctx context.Context, n int64) error {
-	s.mu.Lock()
-	if s.size-s.cur >= n && s.waiters.Len() == 0 {
-		s.cur += n
-		s.mu.Unlock()
-		return nil
-	}
-
-	if n > s.size {
-		// Don't make other Acquire calls block on one that's doomed to fail.
-		s.mu.Unlock()
-		<-ctx.Done()
-		return ctx.Err()
-	}
-
-	ready := make(chan struct{})
-	w := waiter{n: n, ready: ready}
-	elem := s.waiters.PushBack(w)
-	s.mu.Unlock()
-
-	select {
-	case <-ctx.Done():
-		err := ctx.Err()
-		s.mu.Lock()
-		select {
-		case <-ready:
-			// Acquired the semaphore after we were canceled.  Rather than trying to
-			// fix up the queue, just pretend we didn't notice the cancelation.
-			err = nil
-		default:
-			s.waiters.Remove(elem)
-		}
-		s.mu.Unlock()
-		return err
-
-	case <-ready:
-		return nil
-	}
-}
-
-// TryAcquire acquires the semaphore with a weight of n without blocking.
-// On success, returns true. On failure, returns false and leaves the semaphore unchanged.
-func (s *Weighted) TryAcquire(n int64) bool {
-	s.mu.Lock()
-	success := s.size-s.cur >= n && s.waiters.Len() == 0
-	if success {
-		s.cur += n
-	}
-	s.mu.Unlock()
-	return success
-}
-
-// Release releases the semaphore with a weight of n.
-func (s *Weighted) Release(n int64) {
-	s.mu.Lock()
-	s.cur -= n
-	if s.cur < 0 {
-		s.mu.Unlock()
-		panic("semaphore: bad release")
-	}
-	for {
-		next := s.waiters.Front()
-		if next == nil {
-			break // No more waiters blocked.
-		}
-
-		w := next.Value.(waiter)
-		if s.size-s.cur < w.n {
-			// Not enough tokens for the next waiter.  We could keep going (to try to
-			// find a waiter with a smaller request), but under load that could cause
-			// starvation for large requests; instead, we leave all remaining waiters
-			// blocked.
-			//
-			// Consider a semaphore used as a read-write lock, with N tokens, N
-			// readers, and one writer.  Each reader can Acquire(1) to obtain a read
-			// lock.  The writer can Acquire(N) to obtain a write lock, excluding all
-			// of the readers.  If we allow the readers to jump ahead in the queue,
-			// the writer will starve — there is always one token available for every
-			// reader.
-			break
-		}
-
-		s.cur += w.n
-		s.waiters.Remove(next)
-		close(w.ready)
-	}
-	s.mu.Unlock()
-}
diff --git a/installer/vendor/golang.org/x/sync/semaphore/semaphore_bench_test.go b/installer/vendor/golang.org/x/sync/semaphore/semaphore_bench_test.go
deleted file mode 100644
index 1e3ab75f5d..0000000000
--- a/installer/vendor/golang.org/x/sync/semaphore/semaphore_bench_test.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package semaphore_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/net/context"
-	"golang.org/x/sync/semaphore"
-)
-
-// weighted is an interface matching a subset of *Weighted.  It allows
-// alternate implementations for testing and benchmarking.
-type weighted interface {
-	Acquire(context.Context, int64) error
-	TryAcquire(int64) bool
-	Release(int64)
-}
-
-// semChan implements Weighted using a channel for
-// comparing against the condition variable-based implementation.
-type semChan chan struct{}
-
-func newSemChan(n int64) semChan {
-	return semChan(make(chan struct{}, n))
-}
-
-func (s semChan) Acquire(_ context.Context, n int64) error {
-	for i := int64(0); i < n; i++ {
-		s <- struct{}{}
-	}
-	return nil
-}
-
-func (s semChan) TryAcquire(n int64) bool {
-	if int64(len(s))+n > int64(cap(s)) {
-		return false
-	}
-
-	for i := int64(0); i < n; i++ {
-		s <- struct{}{}
-	}
-	return true
-}
-
-func (s semChan) Release(n int64) {
-	for i := int64(0); i < n; i++ {
-		<-s
-	}
-}
-
-// acquireN calls Acquire(size) on sem N times and then calls Release(size) N times.
-func acquireN(b *testing.B, sem weighted, size int64, N int) {
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < N; j++ {
-			sem.Acquire(context.Background(), size)
-		}
-		for j := 0; j < N; j++ {
-			sem.Release(size)
-		}
-	}
-}
-
-// tryAcquireN calls TryAcquire(size) on sem N times and then calls Release(size) N times.
-func tryAcquireN(b *testing.B, sem weighted, size int64, N int) {
-	b.ResetTimer()
-	for i := 0; i < b.N; i++ {
-		for j := 0; j < N; j++ {
-			if !sem.TryAcquire(size) {
-				b.Fatalf("TryAcquire(%v) = false, want true", size)
-			}
-		}
-		for j := 0; j < N; j++ {
-			sem.Release(size)
-		}
-	}
-}
-
-func BenchmarkNewSeq(b *testing.B) {
-	for _, cap := range []int64{1, 128} {
-		b.Run(fmt.Sprintf("Weighted-%d", cap), func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				_ = semaphore.NewWeighted(cap)
-			}
-		})
-		b.Run(fmt.Sprintf("semChan-%d", cap), func(b *testing.B) {
-			for i := 0; i < b.N; i++ {
-				_ = newSemChan(cap)
-			}
-		})
-	}
-}
-
-func BenchmarkAcquireSeq(b *testing.B) {
-	for _, c := range []struct {
-		cap, size int64
-		N         int
-	}{
-		{1, 1, 1},
-		{2, 1, 1},
-		{16, 1, 1},
-		{128, 1, 1},
-		{2, 2, 1},
-		{16, 2, 8},
-		{128, 2, 64},
-		{2, 1, 2},
-		{16, 8, 2},
-		{128, 64, 2},
-	} {
-		for _, w := range []struct {
-			name string
-			w    weighted
-		}{
-			{"Weighted", semaphore.NewWeighted(c.cap)},
-			{"semChan", newSemChan(c.cap)},
-		} {
-			b.Run(fmt.Sprintf("%s-acquire-%d-%d-%d", w.name, c.cap, c.size, c.N), func(b *testing.B) {
-				acquireN(b, w.w, c.size, c.N)
-			})
-			b.Run(fmt.Sprintf("%s-tryAcquire-%d-%d-%d", w.name, c.cap, c.size, c.N), func(b *testing.B) {
-				tryAcquireN(b, w.w, c.size, c.N)
-			})
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/sync/semaphore/semaphore_example_test.go b/installer/vendor/golang.org/x/sync/semaphore/semaphore_example_test.go
deleted file mode 100644
index e75cd79f5b..0000000000
--- a/installer/vendor/golang.org/x/sync/semaphore/semaphore_example_test.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package semaphore_test
-
-import (
-	"context"
-	"fmt"
-	"log"
-	"runtime"
-
-	"golang.org/x/sync/semaphore"
-)
-
-// Example_workerPool demonstrates how to use a semaphore to limit the number of
-// goroutines working on parallel tasks.
-//
-// This use of a semaphore mimics a typical “worker pool” pattern, but without
-// the need to explicitly shut down idle workers when the work is done.
-func Example_workerPool() {
-	ctx := context.TODO()
-
-	var (
-		maxWorkers = runtime.GOMAXPROCS(0)
-		sem        = semaphore.NewWeighted(int64(maxWorkers))
-		out        = make([]int, 32)
-	)
-
-	// Compute the output using up to maxWorkers goroutines at a time.
-	for i := range out {
-		// When maxWorkers goroutines are in flight, Acquire blocks until one of the
-		// workers finishes.
-		if err := sem.Acquire(ctx, 1); err != nil {
-			log.Printf("Failed to acquire semaphore: %v", err)
-			break
-		}
-
-		go func(i int) {
-			defer sem.Release(1)
-			out[i] = collatzSteps(i + 1)
-		}(i)
-	}
-
-	// Acquire all of the tokens to wait for any remaining workers to finish.
-	//
-	// If you are already waiting for the workers by some other means (such as an
-	// errgroup.Group), you can omit this final Acquire call.
-	if err := sem.Acquire(ctx, int64(maxWorkers)); err != nil {
-		log.Printf("Failed to acquire semaphore: %v", err)
-	}
-
-	fmt.Println(out)
-
-	// Output:
-	// [0 1 7 2 5 8 16 3 19 6 14 9 9 17 17 4 12 20 20 7 7 15 15 10 23 10 111 18 18 18 106 5]
-}
-
-// collatzSteps computes the number of steps to reach 1 under the Collatz
-// conjecture. (See https://en.wikipedia.org/wiki/Collatz_conjecture.)
-func collatzSteps(n int) (steps int) {
-	if n <= 0 {
-		panic("nonpositive input")
-	}
-
-	for ; n > 1; steps++ {
-		if steps < 0 {
-			panic("too many steps")
-		}
-
-		if n%2 == 0 {
-			n /= 2
-			continue
-		}
-
-		const maxInt = int(^uint(0) >> 1)
-		if n > (maxInt-1)/3 {
-			panic("overflow")
-		}
-		n = 3*n + 1
-	}
-
-	return steps
-}
diff --git a/installer/vendor/golang.org/x/sync/semaphore/semaphore_test.go b/installer/vendor/golang.org/x/sync/semaphore/semaphore_test.go
deleted file mode 100644
index 2541b9068f..0000000000
--- a/installer/vendor/golang.org/x/sync/semaphore/semaphore_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package semaphore_test
-
-import (
-	"math/rand"
-	"runtime"
-	"sync"
-	"testing"
-	"time"
-
-	"golang.org/x/net/context"
-	"golang.org/x/sync/errgroup"
-	"golang.org/x/sync/semaphore"
-)
-
-const maxSleep = 1 * time.Millisecond
-
-func HammerWeighted(sem *semaphore.Weighted, n int64, loops int) {
-	for i := 0; i < loops; i++ {
-		sem.Acquire(context.Background(), n)
-		time.Sleep(time.Duration(rand.Int63n(int64(maxSleep/time.Nanosecond))) * time.Nanosecond)
-		sem.Release(n)
-	}
-}
-
-func TestWeighted(t *testing.T) {
-	t.Parallel()
-
-	n := runtime.GOMAXPROCS(0)
-	loops := 10000 / n
-	sem := semaphore.NewWeighted(int64(n))
-	var wg sync.WaitGroup
-	wg.Add(n)
-	for i := 0; i < n; i++ {
-		i := i
-		go func() {
-			defer wg.Done()
-			HammerWeighted(sem, int64(i), loops)
-		}()
-	}
-	wg.Wait()
-}
-
-func TestWeightedPanic(t *testing.T) {
-	t.Parallel()
-
-	defer func() {
-		if recover() == nil {
-			t.Fatal("release of an unacquired weighted semaphore did not panic")
-		}
-	}()
-	w := semaphore.NewWeighted(1)
-	w.Release(1)
-}
-
-func TestWeightedTryAcquire(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-	sem := semaphore.NewWeighted(2)
-	tries := []bool{}
-	sem.Acquire(ctx, 1)
-	tries = append(tries, sem.TryAcquire(1))
-	tries = append(tries, sem.TryAcquire(1))
-
-	sem.Release(2)
-
-	tries = append(tries, sem.TryAcquire(1))
-	sem.Acquire(ctx, 1)
-	tries = append(tries, sem.TryAcquire(1))
-
-	want := []bool{true, false, true, false}
-	for i := range tries {
-		if tries[i] != want[i] {
-			t.Errorf("tries[%d]: got %t, want %t", i, tries[i], want[i])
-		}
-	}
-}
-
-func TestWeightedAcquire(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-	sem := semaphore.NewWeighted(2)
-	tryAcquire := func(n int64) bool {
-		ctx, cancel := context.WithTimeout(ctx, 10*time.Millisecond)
-		defer cancel()
-		return sem.Acquire(ctx, n) == nil
-	}
-
-	tries := []bool{}
-	sem.Acquire(ctx, 1)
-	tries = append(tries, tryAcquire(1))
-	tries = append(tries, tryAcquire(1))
-
-	sem.Release(2)
-
-	tries = append(tries, tryAcquire(1))
-	sem.Acquire(ctx, 1)
-	tries = append(tries, tryAcquire(1))
-
-	want := []bool{true, false, true, false}
-	for i := range tries {
-		if tries[i] != want[i] {
-			t.Errorf("tries[%d]: got %t, want %t", i, tries[i], want[i])
-		}
-	}
-}
-
-func TestWeightedDoesntBlockIfTooBig(t *testing.T) {
-	t.Parallel()
-
-	const n = 2
-	sem := semaphore.NewWeighted(n)
-	{
-		ctx, cancel := context.WithCancel(context.Background())
-		defer cancel()
-		go sem.Acquire(ctx, n+1)
-	}
-
-	g, ctx := errgroup.WithContext(context.Background())
-	for i := n * 3; i > 0; i-- {
-		g.Go(func() error {
-			err := sem.Acquire(ctx, 1)
-			if err == nil {
-				time.Sleep(1 * time.Millisecond)
-				sem.Release(1)
-			}
-			return err
-		})
-	}
-	if err := g.Wait(); err != nil {
-		t.Errorf("semaphore.NewWeighted(%v) failed to AcquireCtx(_, 1) with AcquireCtx(_, %v) pending", n, n+1)
-	}
-}
-
-// TestLargeAcquireDoesntStarve times out if a large call to Acquire starves.
-// Merely returning from the test function indicates success.
-func TestLargeAcquireDoesntStarve(t *testing.T) {
-	t.Parallel()
-
-	ctx := context.Background()
-	n := int64(runtime.GOMAXPROCS(0))
-	sem := semaphore.NewWeighted(n)
-	running := true
-
-	var wg sync.WaitGroup
-	wg.Add(int(n))
-	for i := n; i > 0; i-- {
-		sem.Acquire(ctx, 1)
-		go func() {
-			defer func() {
-				sem.Release(1)
-				wg.Done()
-			}()
-			for running {
-				time.Sleep(1 * time.Millisecond)
-				sem.Release(1)
-				sem.Acquire(ctx, 1)
-			}
-		}()
-	}
-
-	sem.Acquire(ctx, n)
-	running = false
-	sem.Release(n)
-	wg.Wait()
-}
diff --git a/installer/vendor/golang.org/x/sync/singleflight/singleflight.go b/installer/vendor/golang.org/x/sync/singleflight/singleflight.go
deleted file mode 100644
index 9a4f8d59e0..0000000000
--- a/installer/vendor/golang.org/x/sync/singleflight/singleflight.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package singleflight provides a duplicate function call suppression
-// mechanism.
-package singleflight // import "golang.org/x/sync/singleflight"
-
-import "sync"
-
-// call is an in-flight or completed singleflight.Do call
-type call struct {
-	wg sync.WaitGroup
-
-	// These fields are written once before the WaitGroup is done
-	// and are only read after the WaitGroup is done.
-	val interface{}
-	err error
-
-	// These fields are read and written with the singleflight
-	// mutex held before the WaitGroup is done, and are read but
-	// not written after the WaitGroup is done.
-	dups  int
-	chans []chan<- Result
-}
-
-// Group represents a class of work and forms a namespace in
-// which units of work can be executed with duplicate suppression.
-type Group struct {
-	mu sync.Mutex       // protects m
-	m  map[string]*call // lazily initialized
-}
-
-// Result holds the results of Do, so they can be passed
-// on a channel.
-type Result struct {
-	Val    interface{}
-	Err    error
-	Shared bool
-}
-
-// Do executes and returns the results of the given function, making
-// sure that only one execution is in-flight for a given key at a
-// time. If a duplicate comes in, the duplicate caller waits for the
-// original to complete and receives the same results.
-// The return value shared indicates whether v was given to multiple callers.
-func (g *Group) Do(key string, fn func() (interface{}, error)) (v interface{}, err error, shared bool) {
-	g.mu.Lock()
-	if g.m == nil {
-		g.m = make(map[string]*call)
-	}
-	if c, ok := g.m[key]; ok {
-		c.dups++
-		g.mu.Unlock()
-		c.wg.Wait()
-		return c.val, c.err, true
-	}
-	c := new(call)
-	c.wg.Add(1)
-	g.m[key] = c
-	g.mu.Unlock()
-
-	g.doCall(c, key, fn)
-	return c.val, c.err, c.dups > 0
-}
-
-// DoChan is like Do but returns a channel that will receive the
-// results when they are ready.
-func (g *Group) DoChan(key string, fn func() (interface{}, error)) <-chan Result {
-	ch := make(chan Result, 1)
-	g.mu.Lock()
-	if g.m == nil {
-		g.m = make(map[string]*call)
-	}
-	if c, ok := g.m[key]; ok {
-		c.dups++
-		c.chans = append(c.chans, ch)
-		g.mu.Unlock()
-		return ch
-	}
-	c := &call{chans: []chan<- Result{ch}}
-	c.wg.Add(1)
-	g.m[key] = c
-	g.mu.Unlock()
-
-	go g.doCall(c, key, fn)
-
-	return ch
-}
-
-// doCall handles the single call for a key.
-func (g *Group) doCall(c *call, key string, fn func() (interface{}, error)) {
-	c.val, c.err = fn()
-	c.wg.Done()
-
-	g.mu.Lock()
-	delete(g.m, key)
-	for _, ch := range c.chans {
-		ch <- Result{c.val, c.err, c.dups > 0}
-	}
-	g.mu.Unlock()
-}
-
-// Forget tells the singleflight to forget about a key.  Future calls
-// to Do for this key will call the function rather than waiting for
-// an earlier call to complete.
-func (g *Group) Forget(key string) {
-	g.mu.Lock()
-	delete(g.m, key)
-	g.mu.Unlock()
-}
diff --git a/installer/vendor/golang.org/x/sync/singleflight/singleflight_test.go b/installer/vendor/golang.org/x/sync/singleflight/singleflight_test.go
deleted file mode 100644
index 5e6f1b328e..0000000000
--- a/installer/vendor/golang.org/x/sync/singleflight/singleflight_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package singleflight
-
-import (
-	"errors"
-	"fmt"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestDo(t *testing.T) {
-	var g Group
-	v, err, _ := g.Do("key", func() (interface{}, error) {
-		return "bar", nil
-	})
-	if got, want := fmt.Sprintf("%v (%T)", v, v), "bar (string)"; got != want {
-		t.Errorf("Do = %v; want %v", got, want)
-	}
-	if err != nil {
-		t.Errorf("Do error = %v", err)
-	}
-}
-
-func TestDoErr(t *testing.T) {
-	var g Group
-	someErr := errors.New("Some error")
-	v, err, _ := g.Do("key", func() (interface{}, error) {
-		return nil, someErr
-	})
-	if err != someErr {
-		t.Errorf("Do error = %v; want someErr %v", err, someErr)
-	}
-	if v != nil {
-		t.Errorf("unexpected non-nil value %#v", v)
-	}
-}
-
-func TestDoDupSuppress(t *testing.T) {
-	var g Group
-	var wg1, wg2 sync.WaitGroup
-	c := make(chan string, 1)
-	var calls int32
-	fn := func() (interface{}, error) {
-		if atomic.AddInt32(&calls, 1) == 1 {
-			// First invocation.
-			wg1.Done()
-		}
-		v := <-c
-		c <- v // pump; make available for any future calls
-
-		time.Sleep(10 * time.Millisecond) // let more goroutines enter Do
-
-		return v, nil
-	}
-
-	const n = 10
-	wg1.Add(1)
-	for i := 0; i < n; i++ {
-		wg1.Add(1)
-		wg2.Add(1)
-		go func() {
-			defer wg2.Done()
-			wg1.Done()
-			v, err, _ := g.Do("key", fn)
-			if err != nil {
-				t.Errorf("Do error: %v", err)
-				return
-			}
-			if s, _ := v.(string); s != "bar" {
-				t.Errorf("Do = %T %v; want %q", v, v, "bar")
-			}
-		}()
-	}
-	wg1.Wait()
-	// At least one goroutine is in fn now and all of them have at
-	// least reached the line before the Do.
-	c <- "bar"
-	wg2.Wait()
-	if got := atomic.LoadInt32(&calls); got <= 0 || got >= n {
-		t.Errorf("number of calls = %d; want over 0 and less than %d", got, n)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sync/syncmap/map.go b/installer/vendor/golang.org/x/sync/syncmap/map.go
deleted file mode 100644
index 80e15847ef..0000000000
--- a/installer/vendor/golang.org/x/sync/syncmap/map.go
+++ /dev/null
@@ -1,372 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package syncmap provides a concurrent map implementation.
-// It is a prototype for a proposed addition to the sync package
-// in the standard library.
-// (https://golang.org/issue/18177)
-package syncmap
-
-import (
-	"sync"
-	"sync/atomic"
-	"unsafe"
-)
-
-// Map is a concurrent map with amortized-constant-time loads, stores, and deletes.
-// It is safe for multiple goroutines to call a Map's methods concurrently.
-//
-// The zero Map is valid and empty.
-//
-// A Map must not be copied after first use.
-type Map struct {
-	mu sync.Mutex
-
-	// read contains the portion of the map's contents that are safe for
-	// concurrent access (with or without mu held).
-	//
-	// The read field itself is always safe to load, but must only be stored with
-	// mu held.
-	//
-	// Entries stored in read may be updated concurrently without mu, but updating
-	// a previously-expunged entry requires that the entry be copied to the dirty
-	// map and unexpunged with mu held.
-	read atomic.Value // readOnly
-
-	// dirty contains the portion of the map's contents that require mu to be
-	// held. To ensure that the dirty map can be promoted to the read map quickly,
-	// it also includes all of the non-expunged entries in the read map.
-	//
-	// Expunged entries are not stored in the dirty map. An expunged entry in the
-	// clean map must be unexpunged and added to the dirty map before a new value
-	// can be stored to it.
-	//
-	// If the dirty map is nil, the next write to the map will initialize it by
-	// making a shallow copy of the clean map, omitting stale entries.
-	dirty map[interface{}]*entry
-
-	// misses counts the number of loads since the read map was last updated that
-	// needed to lock mu to determine whether the key was present.
-	//
-	// Once enough misses have occurred to cover the cost of copying the dirty
-	// map, the dirty map will be promoted to the read map (in the unamended
-	// state) and the next store to the map will make a new dirty copy.
-	misses int
-}
-
-// readOnly is an immutable struct stored atomically in the Map.read field.
-type readOnly struct {
-	m       map[interface{}]*entry
-	amended bool // true if the dirty map contains some key not in m.
-}
-
-// expunged is an arbitrary pointer that marks entries which have been deleted
-// from the dirty map.
-var expunged = unsafe.Pointer(new(interface{}))
-
-// An entry is a slot in the map corresponding to a particular key.
-type entry struct {
-	// p points to the interface{} value stored for the entry.
-	//
-	// If p == nil, the entry has been deleted and m.dirty == nil.
-	//
-	// If p == expunged, the entry has been deleted, m.dirty != nil, and the entry
-	// is missing from m.dirty.
-	//
-	// Otherwise, the entry is valid and recorded in m.read.m[key] and, if m.dirty
-	// != nil, in m.dirty[key].
-	//
-	// An entry can be deleted by atomic replacement with nil: when m.dirty is
-	// next created, it will atomically replace nil with expunged and leave
-	// m.dirty[key] unset.
-	//
-	// An entry's associated value can be updated by atomic replacement, provided
-	// p != expunged. If p == expunged, an entry's associated value can be updated
-	// only after first setting m.dirty[key] = e so that lookups using the dirty
-	// map find the entry.
-	p unsafe.Pointer // *interface{}
-}
-
-func newEntry(i interface{}) *entry {
-	return &entry{p: unsafe.Pointer(&i)}
-}
-
-// Load returns the value stored in the map for a key, or nil if no
-// value is present.
-// The ok result indicates whether value was found in the map.
-func (m *Map) Load(key interface{}) (value interface{}, ok bool) {
-	read, _ := m.read.Load().(readOnly)
-	e, ok := read.m[key]
-	if !ok && read.amended {
-		m.mu.Lock()
-		// Avoid reporting a spurious miss if m.dirty got promoted while we were
-		// blocked on m.mu. (If further loads of the same key will not miss, it's
-		// not worth copying the dirty map for this key.)
-		read, _ = m.read.Load().(readOnly)
-		e, ok = read.m[key]
-		if !ok && read.amended {
-			e, ok = m.dirty[key]
-			// Regardless of whether the entry was present, record a miss: this key
-			// will take the slow path until the dirty map is promoted to the read
-			// map.
-			m.missLocked()
-		}
-		m.mu.Unlock()
-	}
-	if !ok {
-		return nil, false
-	}
-	return e.load()
-}
-
-func (e *entry) load() (value interface{}, ok bool) {
-	p := atomic.LoadPointer(&e.p)
-	if p == nil || p == expunged {
-		return nil, false
-	}
-	return *(*interface{})(p), true
-}
-
-// Store sets the value for a key.
-func (m *Map) Store(key, value interface{}) {
-	read, _ := m.read.Load().(readOnly)
-	if e, ok := read.m[key]; ok && e.tryStore(&value) {
-		return
-	}
-
-	m.mu.Lock()
-	read, _ = m.read.Load().(readOnly)
-	if e, ok := read.m[key]; ok {
-		if e.unexpungeLocked() {
-			// The entry was previously expunged, which implies that there is a
-			// non-nil dirty map and this entry is not in it.
-			m.dirty[key] = e
-		}
-		e.storeLocked(&value)
-	} else if e, ok := m.dirty[key]; ok {
-		e.storeLocked(&value)
-	} else {
-		if !read.amended {
-			// We're adding the first new key to the dirty map.
-			// Make sure it is allocated and mark the read-only map as incomplete.
-			m.dirtyLocked()
-			m.read.Store(readOnly{m: read.m, amended: true})
-		}
-		m.dirty[key] = newEntry(value)
-	}
-	m.mu.Unlock()
-}
-
-// tryStore stores a value if the entry has not been expunged.
-//
-// If the entry is expunged, tryStore returns false and leaves the entry
-// unchanged.
-func (e *entry) tryStore(i *interface{}) bool {
-	p := atomic.LoadPointer(&e.p)
-	if p == expunged {
-		return false
-	}
-	for {
-		if atomic.CompareAndSwapPointer(&e.p, p, unsafe.Pointer(i)) {
-			return true
-		}
-		p = atomic.LoadPointer(&e.p)
-		if p == expunged {
-			return false
-		}
-	}
-}
-
-// unexpungeLocked ensures that the entry is not marked as expunged.
-//
-// If the entry was previously expunged, it must be added to the dirty map
-// before m.mu is unlocked.
-func (e *entry) unexpungeLocked() (wasExpunged bool) {
-	return atomic.CompareAndSwapPointer(&e.p, expunged, nil)
-}
-
-// storeLocked unconditionally stores a value to the entry.
-//
-// The entry must be known not to be expunged.
-func (e *entry) storeLocked(i *interface{}) {
-	atomic.StorePointer(&e.p, unsafe.Pointer(i))
-}
-
-// LoadOrStore returns the existing value for the key if present.
-// Otherwise, it stores and returns the given value.
-// The loaded result is true if the value was loaded, false if stored.
-func (m *Map) LoadOrStore(key, value interface{}) (actual interface{}, loaded bool) {
-	// Avoid locking if it's a clean hit.
-	read, _ := m.read.Load().(readOnly)
-	if e, ok := read.m[key]; ok {
-		actual, loaded, ok := e.tryLoadOrStore(value)
-		if ok {
-			return actual, loaded
-		}
-	}
-
-	m.mu.Lock()
-	read, _ = m.read.Load().(readOnly)
-	if e, ok := read.m[key]; ok {
-		if e.unexpungeLocked() {
-			m.dirty[key] = e
-		}
-		actual, loaded, _ = e.tryLoadOrStore(value)
-	} else if e, ok := m.dirty[key]; ok {
-		actual, loaded, _ = e.tryLoadOrStore(value)
-		m.missLocked()
-	} else {
-		if !read.amended {
-			// We're adding the first new key to the dirty map.
-			// Make sure it is allocated and mark the read-only map as incomplete.
-			m.dirtyLocked()
-			m.read.Store(readOnly{m: read.m, amended: true})
-		}
-		m.dirty[key] = newEntry(value)
-		actual, loaded = value, false
-	}
-	m.mu.Unlock()
-
-	return actual, loaded
-}
-
-// tryLoadOrStore atomically loads or stores a value if the entry is not
-// expunged.
-//
-// If the entry is expunged, tryLoadOrStore leaves the entry unchanged and
-// returns with ok==false.
-func (e *entry) tryLoadOrStore(i interface{}) (actual interface{}, loaded, ok bool) {
-	p := atomic.LoadPointer(&e.p)
-	if p == expunged {
-		return nil, false, false
-	}
-	if p != nil {
-		return *(*interface{})(p), true, true
-	}
-
-	// Copy the interface after the first load to make this method more amenable
-	// to escape analysis: if we hit the "load" path or the entry is expunged, we
-	// shouldn't bother heap-allocating.
-	ic := i
-	for {
-		if atomic.CompareAndSwapPointer(&e.p, nil, unsafe.Pointer(&ic)) {
-			return i, false, true
-		}
-		p = atomic.LoadPointer(&e.p)
-		if p == expunged {
-			return nil, false, false
-		}
-		if p != nil {
-			return *(*interface{})(p), true, true
-		}
-	}
-}
-
-// Delete deletes the value for a key.
-func (m *Map) Delete(key interface{}) {
-	read, _ := m.read.Load().(readOnly)
-	e, ok := read.m[key]
-	if !ok && read.amended {
-		m.mu.Lock()
-		read, _ = m.read.Load().(readOnly)
-		e, ok = read.m[key]
-		if !ok && read.amended {
-			delete(m.dirty, key)
-		}
-		m.mu.Unlock()
-	}
-	if ok {
-		e.delete()
-	}
-}
-
-func (e *entry) delete() (hadValue bool) {
-	for {
-		p := atomic.LoadPointer(&e.p)
-		if p == nil || p == expunged {
-			return false
-		}
-		if atomic.CompareAndSwapPointer(&e.p, p, nil) {
-			return true
-		}
-	}
-}
-
-// Range calls f sequentially for each key and value present in the map.
-// If f returns false, range stops the iteration.
-//
-// Range does not necessarily correspond to any consistent snapshot of the Map's
-// contents: no key will be visited more than once, but if the value for any key
-// is stored or deleted concurrently, Range may reflect any mapping for that key
-// from any point during the Range call.
-//
-// Range may be O(N) with the number of elements in the map even if f returns
-// false after a constant number of calls.
-func (m *Map) Range(f func(key, value interface{}) bool) {
-	// We need to be able to iterate over all of the keys that were already
-	// present at the start of the call to Range.
-	// If read.amended is false, then read.m satisfies that property without
-	// requiring us to hold m.mu for a long time.
-	read, _ := m.read.Load().(readOnly)
-	if read.amended {
-		// m.dirty contains keys not in read.m. Fortunately, Range is already O(N)
-		// (assuming the caller does not break out early), so a call to Range
-		// amortizes an entire copy of the map: we can promote the dirty copy
-		// immediately!
-		m.mu.Lock()
-		read, _ = m.read.Load().(readOnly)
-		if read.amended {
-			read = readOnly{m: m.dirty}
-			m.read.Store(read)
-			m.dirty = nil
-			m.misses = 0
-		}
-		m.mu.Unlock()
-	}
-
-	for k, e := range read.m {
-		v, ok := e.load()
-		if !ok {
-			continue
-		}
-		if !f(k, v) {
-			break
-		}
-	}
-}
-
-func (m *Map) missLocked() {
-	m.misses++
-	if m.misses < len(m.dirty) {
-		return
-	}
-	m.read.Store(readOnly{m: m.dirty})
-	m.dirty = nil
-	m.misses = 0
-}
-
-func (m *Map) dirtyLocked() {
-	if m.dirty != nil {
-		return
-	}
-
-	read, _ := m.read.Load().(readOnly)
-	m.dirty = make(map[interface{}]*entry, len(read.m))
-	for k, e := range read.m {
-		if !e.tryExpungeLocked() {
-			m.dirty[k] = e
-		}
-	}
-}
-
-func (e *entry) tryExpungeLocked() (isExpunged bool) {
-	p := atomic.LoadPointer(&e.p)
-	for p == nil {
-		if atomic.CompareAndSwapPointer(&e.p, nil, expunged) {
-			return true
-		}
-		p = atomic.LoadPointer(&e.p)
-	}
-	return p == expunged
-}
diff --git a/installer/vendor/golang.org/x/sync/syncmap/map_bench_test.go b/installer/vendor/golang.org/x/sync/syncmap/map_bench_test.go
deleted file mode 100644
index b279b4f749..0000000000
--- a/installer/vendor/golang.org/x/sync/syncmap/map_bench_test.go
+++ /dev/null
@@ -1,216 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syncmap_test
-
-import (
-	"fmt"
-	"reflect"
-	"sync/atomic"
-	"testing"
-
-	"golang.org/x/sync/syncmap"
-)
-
-type bench struct {
-	setup func(*testing.B, mapInterface)
-	perG  func(b *testing.B, pb *testing.PB, i int, m mapInterface)
-}
-
-func benchMap(b *testing.B, bench bench) {
-	for _, m := range [...]mapInterface{&DeepCopyMap{}, &RWMutexMap{}, &syncmap.Map{}} {
-		b.Run(fmt.Sprintf("%T", m), func(b *testing.B) {
-			m = reflect.New(reflect.TypeOf(m).Elem()).Interface().(mapInterface)
-			if bench.setup != nil {
-				bench.setup(b, m)
-			}
-
-			b.ResetTimer()
-
-			var i int64
-			b.RunParallel(func(pb *testing.PB) {
-				id := int(atomic.AddInt64(&i, 1) - 1)
-				bench.perG(b, pb, id*b.N, m)
-			})
-		})
-	}
-}
-
-func BenchmarkLoadMostlyHits(b *testing.B) {
-	const hits, misses = 1023, 1
-
-	benchMap(b, bench{
-		setup: func(_ *testing.B, m mapInterface) {
-			for i := 0; i < hits; i++ {
-				m.LoadOrStore(i, i)
-			}
-			// Prime the map to get it into a steady state.
-			for i := 0; i < hits*2; i++ {
-				m.Load(i % hits)
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.Load(i % (hits + misses))
-			}
-		},
-	})
-}
-
-func BenchmarkLoadMostlyMisses(b *testing.B) {
-	const hits, misses = 1, 1023
-
-	benchMap(b, bench{
-		setup: func(_ *testing.B, m mapInterface) {
-			for i := 0; i < hits; i++ {
-				m.LoadOrStore(i, i)
-			}
-			// Prime the map to get it into a steady state.
-			for i := 0; i < hits*2; i++ {
-				m.Load(i % hits)
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.Load(i % (hits + misses))
-			}
-		},
-	})
-}
-
-func BenchmarkLoadOrStoreBalanced(b *testing.B) {
-	const hits, misses = 128, 128
-
-	benchMap(b, bench{
-		setup: func(b *testing.B, m mapInterface) {
-			if _, ok := m.(*DeepCopyMap); ok {
-				b.Skip("DeepCopyMap has quadratic running time.")
-			}
-			for i := 0; i < hits; i++ {
-				m.LoadOrStore(i, i)
-			}
-			// Prime the map to get it into a steady state.
-			for i := 0; i < hits*2; i++ {
-				m.Load(i % hits)
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				j := i % (hits + misses)
-				if j < hits {
-					if _, ok := m.LoadOrStore(j, i); !ok {
-						b.Fatalf("unexpected miss for %v", j)
-					}
-				} else {
-					if v, loaded := m.LoadOrStore(i, i); loaded {
-						b.Fatalf("failed to store %v: existing value %v", i, v)
-					}
-				}
-			}
-		},
-	})
-}
-
-func BenchmarkLoadOrStoreUnique(b *testing.B) {
-	benchMap(b, bench{
-		setup: func(b *testing.B, m mapInterface) {
-			if _, ok := m.(*DeepCopyMap); ok {
-				b.Skip("DeepCopyMap has quadratic running time.")
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.LoadOrStore(i, i)
-			}
-		},
-	})
-}
-
-func BenchmarkLoadOrStoreCollision(b *testing.B) {
-	benchMap(b, bench{
-		setup: func(_ *testing.B, m mapInterface) {
-			m.LoadOrStore(0, 0)
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.LoadOrStore(0, 0)
-			}
-		},
-	})
-}
-
-func BenchmarkRange(b *testing.B) {
-	const mapSize = 1 << 10
-
-	benchMap(b, bench{
-		setup: func(_ *testing.B, m mapInterface) {
-			for i := 0; i < mapSize; i++ {
-				m.Store(i, i)
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.Range(func(_, _ interface{}) bool { return true })
-			}
-		},
-	})
-}
-
-// BenchmarkAdversarialAlloc tests performance when we store a new value
-// immediately whenever the map is promoted to clean and otherwise load a
-// unique, missing key.
-//
-// This forces the Load calls to always acquire the map's mutex.
-func BenchmarkAdversarialAlloc(b *testing.B) {
-	benchMap(b, bench{
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			var stores, loadsSinceStore int64
-			for ; pb.Next(); i++ {
-				m.Load(i)
-				if loadsSinceStore++; loadsSinceStore > stores {
-					m.LoadOrStore(i, stores)
-					loadsSinceStore = 0
-					stores++
-				}
-			}
-		},
-	})
-}
-
-// BenchmarkAdversarialDelete tests performance when we periodically delete
-// one key and add a different one in a large map.
-//
-// This forces the Load calls to always acquire the map's mutex and periodically
-// makes a full copy of the map despite changing only one entry.
-func BenchmarkAdversarialDelete(b *testing.B) {
-	const mapSize = 1 << 10
-
-	benchMap(b, bench{
-		setup: func(_ *testing.B, m mapInterface) {
-			for i := 0; i < mapSize; i++ {
-				m.Store(i, i)
-			}
-		},
-
-		perG: func(b *testing.B, pb *testing.PB, i int, m mapInterface) {
-			for ; pb.Next(); i++ {
-				m.Load(i)
-
-				if i%mapSize == 0 {
-					m.Range(func(k, _ interface{}) bool {
-						m.Delete(k)
-						return false
-					})
-					m.Store(i, i)
-				}
-			}
-		},
-	})
-}
diff --git a/installer/vendor/golang.org/x/sync/syncmap/map_reference_test.go b/installer/vendor/golang.org/x/sync/syncmap/map_reference_test.go
deleted file mode 100644
index 923c51b70e..0000000000
--- a/installer/vendor/golang.org/x/sync/syncmap/map_reference_test.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syncmap_test
-
-import (
-	"sync"
-	"sync/atomic"
-)
-
-// This file contains reference map implementations for unit-tests.
-
-// mapInterface is the interface Map implements.
-type mapInterface interface {
-	Load(interface{}) (interface{}, bool)
-	Store(key, value interface{})
-	LoadOrStore(key, value interface{}) (actual interface{}, loaded bool)
-	Delete(interface{})
-	Range(func(key, value interface{}) (shouldContinue bool))
-}
-
-// RWMutexMap is an implementation of mapInterface using a sync.RWMutex.
-type RWMutexMap struct {
-	mu    sync.RWMutex
-	dirty map[interface{}]interface{}
-}
-
-func (m *RWMutexMap) Load(key interface{}) (value interface{}, ok bool) {
-	m.mu.RLock()
-	value, ok = m.dirty[key]
-	m.mu.RUnlock()
-	return
-}
-
-func (m *RWMutexMap) Store(key, value interface{}) {
-	m.mu.Lock()
-	if m.dirty == nil {
-		m.dirty = make(map[interface{}]interface{})
-	}
-	m.dirty[key] = value
-	m.mu.Unlock()
-}
-
-func (m *RWMutexMap) LoadOrStore(key, value interface{}) (actual interface{}, loaded bool) {
-	m.mu.Lock()
-	actual, loaded = m.dirty[key]
-	if !loaded {
-		actual = value
-		if m.dirty == nil {
-			m.dirty = make(map[interface{}]interface{})
-		}
-		m.dirty[key] = value
-	}
-	m.mu.Unlock()
-	return actual, loaded
-}
-
-func (m *RWMutexMap) Delete(key interface{}) {
-	m.mu.Lock()
-	delete(m.dirty, key)
-	m.mu.Unlock()
-}
-
-func (m *RWMutexMap) Range(f func(key, value interface{}) (shouldContinue bool)) {
-	m.mu.RLock()
-	keys := make([]interface{}, 0, len(m.dirty))
-	for k := range m.dirty {
-		keys = append(keys, k)
-	}
-	m.mu.RUnlock()
-
-	for _, k := range keys {
-		v, ok := m.Load(k)
-		if !ok {
-			continue
-		}
-		if !f(k, v) {
-			break
-		}
-	}
-}
-
-// DeepCopyMap is an implementation of mapInterface using a Mutex and
-// atomic.Value.  It makes deep copies of the map on every write to avoid
-// acquiring the Mutex in Load.
-type DeepCopyMap struct {
-	mu    sync.Mutex
-	clean atomic.Value
-}
-
-func (m *DeepCopyMap) Load(key interface{}) (value interface{}, ok bool) {
-	clean, _ := m.clean.Load().(map[interface{}]interface{})
-	value, ok = clean[key]
-	return value, ok
-}
-
-func (m *DeepCopyMap) Store(key, value interface{}) {
-	m.mu.Lock()
-	dirty := m.dirty()
-	dirty[key] = value
-	m.clean.Store(dirty)
-	m.mu.Unlock()
-}
-
-func (m *DeepCopyMap) LoadOrStore(key, value interface{}) (actual interface{}, loaded bool) {
-	clean, _ := m.clean.Load().(map[interface{}]interface{})
-	actual, loaded = clean[key]
-	if loaded {
-		return actual, loaded
-	}
-
-	m.mu.Lock()
-	// Reload clean in case it changed while we were waiting on m.mu.
-	clean, _ = m.clean.Load().(map[interface{}]interface{})
-	actual, loaded = clean[key]
-	if !loaded {
-		dirty := m.dirty()
-		dirty[key] = value
-		actual = value
-		m.clean.Store(dirty)
-	}
-	m.mu.Unlock()
-	return actual, loaded
-}
-
-func (m *DeepCopyMap) Delete(key interface{}) {
-	m.mu.Lock()
-	dirty := m.dirty()
-	delete(dirty, key)
-	m.clean.Store(dirty)
-	m.mu.Unlock()
-}
-
-func (m *DeepCopyMap) Range(f func(key, value interface{}) (shouldContinue bool)) {
-	clean, _ := m.clean.Load().(map[interface{}]interface{})
-	for k, v := range clean {
-		if !f(k, v) {
-			break
-		}
-	}
-}
-
-func (m *DeepCopyMap) dirty() map[interface{}]interface{} {
-	clean, _ := m.clean.Load().(map[interface{}]interface{})
-	dirty := make(map[interface{}]interface{}, len(clean)+1)
-	for k, v := range clean {
-		dirty[k] = v
-	}
-	return dirty
-}
diff --git a/installer/vendor/golang.org/x/sync/syncmap/map_test.go b/installer/vendor/golang.org/x/sync/syncmap/map_test.go
deleted file mode 100644
index c883f176f5..0000000000
--- a/installer/vendor/golang.org/x/sync/syncmap/map_test.go
+++ /dev/null
@@ -1,172 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package syncmap_test
-
-import (
-	"math/rand"
-	"reflect"
-	"runtime"
-	"sync"
-	"testing"
-	"testing/quick"
-
-	"golang.org/x/sync/syncmap"
-)
-
-type mapOp string
-
-const (
-	opLoad        = mapOp("Load")
-	opStore       = mapOp("Store")
-	opLoadOrStore = mapOp("LoadOrStore")
-	opDelete      = mapOp("Delete")
-)
-
-var mapOps = [...]mapOp{opLoad, opStore, opLoadOrStore, opDelete}
-
-// mapCall is a quick.Generator for calls on mapInterface.
-type mapCall struct {
-	op   mapOp
-	k, v interface{}
-}
-
-func (c mapCall) apply(m mapInterface) (interface{}, bool) {
-	switch c.op {
-	case opLoad:
-		return m.Load(c.k)
-	case opStore:
-		m.Store(c.k, c.v)
-		return nil, false
-	case opLoadOrStore:
-		return m.LoadOrStore(c.k, c.v)
-	case opDelete:
-		m.Delete(c.k)
-		return nil, false
-	default:
-		panic("invalid mapOp")
-	}
-}
-
-type mapResult struct {
-	value interface{}
-	ok    bool
-}
-
-func randValue(r *rand.Rand) interface{} {
-	b := make([]byte, r.Intn(4))
-	for i := range b {
-		b[i] = 'a' + byte(rand.Intn(26))
-	}
-	return string(b)
-}
-
-func (mapCall) Generate(r *rand.Rand, size int) reflect.Value {
-	c := mapCall{op: mapOps[rand.Intn(len(mapOps))], k: randValue(r)}
-	switch c.op {
-	case opStore, opLoadOrStore:
-		c.v = randValue(r)
-	}
-	return reflect.ValueOf(c)
-}
-
-func applyCalls(m mapInterface, calls []mapCall) (results []mapResult, final map[interface{}]interface{}) {
-	for _, c := range calls {
-		v, ok := c.apply(m)
-		results = append(results, mapResult{v, ok})
-	}
-
-	final = make(map[interface{}]interface{})
-	m.Range(func(k, v interface{}) bool {
-		final[k] = v
-		return true
-	})
-
-	return results, final
-}
-
-func applyMap(calls []mapCall) ([]mapResult, map[interface{}]interface{}) {
-	return applyCalls(new(syncmap.Map), calls)
-}
-
-func applyRWMutexMap(calls []mapCall) ([]mapResult, map[interface{}]interface{}) {
-	return applyCalls(new(RWMutexMap), calls)
-}
-
-func applyDeepCopyMap(calls []mapCall) ([]mapResult, map[interface{}]interface{}) {
-	return applyCalls(new(DeepCopyMap), calls)
-}
-
-func TestMapMatchesRWMutex(t *testing.T) {
-	if err := quick.CheckEqual(applyMap, applyRWMutexMap, nil); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestMapMatchesDeepCopy(t *testing.T) {
-	if err := quick.CheckEqual(applyMap, applyDeepCopyMap, nil); err != nil {
-		t.Error(err)
-	}
-}
-
-func TestConcurrentRange(t *testing.T) {
-	const mapSize = 1 << 10
-
-	m := new(syncmap.Map)
-	for n := int64(1); n <= mapSize; n++ {
-		m.Store(n, int64(n))
-	}
-
-	done := make(chan struct{})
-	var wg sync.WaitGroup
-	defer func() {
-		close(done)
-		wg.Wait()
-	}()
-	for g := int64(runtime.GOMAXPROCS(0)); g > 0; g-- {
-		r := rand.New(rand.NewSource(g))
-		wg.Add(1)
-		go func(g int64) {
-			defer wg.Done()
-			for i := int64(0); ; i++ {
-				select {
-				case <-done:
-					return
-				default:
-				}
-				for n := int64(1); n < mapSize; n++ {
-					if r.Int63n(mapSize) == 0 {
-						m.Store(n, n*i*g)
-					} else {
-						m.Load(n)
-					}
-				}
-			}
-		}(g)
-	}
-
-	iters := 1 << 10
-	if testing.Short() {
-		iters = 16
-	}
-	for n := iters; n > 0; n-- {
-		seen := make(map[int64]bool, mapSize)
-
-		m.Range(func(ki, vi interface{}) bool {
-			k, v := ki.(int64), vi.(int64)
-			if v%k != 0 {
-				t.Fatalf("while Storing multiples of %v, Range saw value %v", k, v)
-			}
-			if seen[k] {
-				t.Fatalf("Range visited key %v twice", k)
-			}
-			seen[k] = true
-			return true
-		})
-
-		if len(seen) != mapSize {
-			t.Fatalf("Range visited %v elements of %v-element Map", len(seen), mapSize)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/.gitattributes b/installer/vendor/golang.org/x/sys/.gitattributes
deleted file mode 100644
index d2f212e5da..0000000000
--- a/installer/vendor/golang.org/x/sys/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/installer/vendor/golang.org/x/sys/.gitignore b/installer/vendor/golang.org/x/sys/.gitignore
deleted file mode 100644
index 8339fd61d3..0000000000
--- a/installer/vendor/golang.org/x/sys/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .hgignore except for files generated by the build.
-last-change
diff --git a/installer/vendor/golang.org/x/sys/CONTRIBUTING.md b/installer/vendor/golang.org/x/sys/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/sys/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/sys/README b/installer/vendor/golang.org/x/sys/README
deleted file mode 100644
index bd422b40c2..0000000000
--- a/installer/vendor/golang.org/x/sys/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This repository holds supplemental Go packages for low-level interactions with the operating system.
-
-To submit changes to this repository, see http://golang.org/doc/contribute.html.
diff --git a/installer/vendor/golang.org/x/sys/codereview.cfg b/installer/vendor/golang.org/x/sys/codereview.cfg
deleted file mode 100644
index 3f8b14b64e..0000000000
--- a/installer/vendor/golang.org/x/sys/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/installer/vendor/golang.org/x/sys/plan9/asm.s b/installer/vendor/golang.org/x/sys/plan9/asm.s
deleted file mode 100644
index d4ca868f17..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/asm.s
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-TEXT ·use(SB),NOSPLIT,$0
-	RET
diff --git a/installer/vendor/golang.org/x/sys/plan9/asm_plan9_386.s b/installer/vendor/golang.org/x/sys/plan9/asm_plan9_386.s
deleted file mode 100644
index bc5cab1f34..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/asm_plan9_386.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-//
-// System call support for 386, Plan 9
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-32
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-44
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-28
-	JMP	syscall·RawSyscall(SB)
-
-TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-36
-	JMP	syscall·seek(SB)
-
-TEXT ·exit(SB),NOSPLIT,$4-4
-	JMP	syscall·exit(SB)
diff --git a/installer/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s b/installer/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
deleted file mode 100644
index d3448e6750..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/asm_plan9_amd64.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-#include "textflag.h"
-
-//
-// System call support for amd64, Plan 9
-//
-
-// Just jump to package syscall's implementation for all these functions.
-// The runtime may know about them.
-
-TEXT	·Syscall(SB),NOSPLIT,$0-64
-	JMP	syscall·Syscall(SB)
-
-TEXT	·Syscall6(SB),NOSPLIT,$0-88
-	JMP	syscall·Syscall6(SB)
-
-TEXT ·RawSyscall(SB),NOSPLIT,$0-56
-	JMP	syscall·RawSyscall(SB)
-
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
-	JMP	syscall·RawSyscall6(SB)
-
-TEXT ·seek(SB),NOSPLIT,$0-56
-	JMP	syscall·seek(SB)
-
-TEXT ·exit(SB),NOSPLIT,$8-8
-	JMP	syscall·exit(SB)
diff --git a/installer/vendor/golang.org/x/sys/plan9/const_plan9.go b/installer/vendor/golang.org/x/sys/plan9/const_plan9.go
deleted file mode 100644
index b4e85a3a9d..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/const_plan9.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package plan9
-
-// Plan 9 Constants
-
-// Open modes
-const (
-	O_RDONLY  = 0
-	O_WRONLY  = 1
-	O_RDWR    = 2
-	O_TRUNC   = 16
-	O_CLOEXEC = 32
-	O_EXCL    = 0x1000
-)
-
-// Rfork flags
-const (
-	RFNAMEG  = 1 << 0
-	RFENVG   = 1 << 1
-	RFFDG    = 1 << 2
-	RFNOTEG  = 1 << 3
-	RFPROC   = 1 << 4
-	RFMEM    = 1 << 5
-	RFNOWAIT = 1 << 6
-	RFCNAMEG = 1 << 10
-	RFCENVG  = 1 << 11
-	RFCFDG   = 1 << 12
-	RFREND   = 1 << 13
-	RFNOMNT  = 1 << 14
-)
-
-// Qid.Type bits
-const (
-	QTDIR    = 0x80
-	QTAPPEND = 0x40
-	QTEXCL   = 0x20
-	QTMOUNT  = 0x10
-	QTAUTH   = 0x08
-	QTTMP    = 0x04
-	QTFILE   = 0x00
-)
-
-// Dir.Mode bits
-const (
-	DMDIR    = 0x80000000
-	DMAPPEND = 0x40000000
-	DMEXCL   = 0x20000000
-	DMMOUNT  = 0x10000000
-	DMAUTH   = 0x08000000
-	DMTMP    = 0x04000000
-	DMREAD   = 0x4
-	DMWRITE  = 0x2
-	DMEXEC   = 0x1
-)
-
-const (
-	STATMAX    = 65535
-	ERRMAX     = 128
-	STATFIXLEN = 49
-)
-
-// Mount and bind flags
-const (
-	MREPL   = 0x0000
-	MBEFORE = 0x0001
-	MAFTER  = 0x0002
-	MORDER  = 0x0003
-	MCREATE = 0x0004
-	MCACHE  = 0x0010
-	MMASK   = 0x0017
-)
diff --git a/installer/vendor/golang.org/x/sys/plan9/dir_plan9.go b/installer/vendor/golang.org/x/sys/plan9/dir_plan9.go
deleted file mode 100644
index 0955e0c53e..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/dir_plan9.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Plan 9 directory marshalling. See intro(5).
-
-package plan9
-
-import "errors"
-
-var (
-	ErrShortStat = errors.New("stat buffer too short")
-	ErrBadStat   = errors.New("malformed stat buffer")
-	ErrBadName   = errors.New("bad character in file name")
-)
-
-// A Qid represents a 9P server's unique identification for a file.
-type Qid struct {
-	Path uint64 // the file server's unique identification for the file
-	Vers uint32 // version number for given Path
-	Type uint8  // the type of the file (plan9.QTDIR for example)
-}
-
-// A Dir contains the metadata for a file.
-type Dir struct {
-	// system-modified data
-	Type uint16 // server type
-	Dev  uint32 // server subtype
-
-	// file data
-	Qid    Qid    // unique id from server
-	Mode   uint32 // permissions
-	Atime  uint32 // last read time
-	Mtime  uint32 // last write time
-	Length int64  // file length
-	Name   string // last element of path
-	Uid    string // owner name
-	Gid    string // group name
-	Muid   string // last modifier name
-}
-
-var nullDir = Dir{
-	Type: ^uint16(0),
-	Dev:  ^uint32(0),
-	Qid: Qid{
-		Path: ^uint64(0),
-		Vers: ^uint32(0),
-		Type: ^uint8(0),
-	},
-	Mode:   ^uint32(0),
-	Atime:  ^uint32(0),
-	Mtime:  ^uint32(0),
-	Length: ^int64(0),
-}
-
-// Null assigns special "don't touch" values to members of d to
-// avoid modifying them during plan9.Wstat.
-func (d *Dir) Null() { *d = nullDir }
-
-// Marshal encodes a 9P stat message corresponding to d into b
-//
-// If there isn't enough space in b for a stat message, ErrShortStat is returned.
-func (d *Dir) Marshal(b []byte) (n int, err error) {
-	n = STATFIXLEN + len(d.Name) + len(d.Uid) + len(d.Gid) + len(d.Muid)
-	if n > len(b) {
-		return n, ErrShortStat
-	}
-
-	for _, c := range d.Name {
-		if c == '/' {
-			return n, ErrBadName
-		}
-	}
-
-	b = pbit16(b, uint16(n)-2)
-	b = pbit16(b, d.Type)
-	b = pbit32(b, d.Dev)
-	b = pbit8(b, d.Qid.Type)
-	b = pbit32(b, d.Qid.Vers)
-	b = pbit64(b, d.Qid.Path)
-	b = pbit32(b, d.Mode)
-	b = pbit32(b, d.Atime)
-	b = pbit32(b, d.Mtime)
-	b = pbit64(b, uint64(d.Length))
-	b = pstring(b, d.Name)
-	b = pstring(b, d.Uid)
-	b = pstring(b, d.Gid)
-	b = pstring(b, d.Muid)
-
-	return n, nil
-}
-
-// UnmarshalDir decodes a single 9P stat message from b and returns the resulting Dir.
-//
-// If b is too small to hold a valid stat message, ErrShortStat is returned.
-//
-// If the stat message itself is invalid, ErrBadStat is returned.
-func UnmarshalDir(b []byte) (*Dir, error) {
-	if len(b) < STATFIXLEN {
-		return nil, ErrShortStat
-	}
-	size, buf := gbit16(b)
-	if len(b) != int(size)+2 {
-		return nil, ErrBadStat
-	}
-	b = buf
-
-	var d Dir
-	d.Type, b = gbit16(b)
-	d.Dev, b = gbit32(b)
-	d.Qid.Type, b = gbit8(b)
-	d.Qid.Vers, b = gbit32(b)
-	d.Qid.Path, b = gbit64(b)
-	d.Mode, b = gbit32(b)
-	d.Atime, b = gbit32(b)
-	d.Mtime, b = gbit32(b)
-
-	n, b := gbit64(b)
-	d.Length = int64(n)
-
-	var ok bool
-	if d.Name, b, ok = gstring(b); !ok {
-		return nil, ErrBadStat
-	}
-	if d.Uid, b, ok = gstring(b); !ok {
-		return nil, ErrBadStat
-	}
-	if d.Gid, b, ok = gstring(b); !ok {
-		return nil, ErrBadStat
-	}
-	if d.Muid, b, ok = gstring(b); !ok {
-		return nil, ErrBadStat
-	}
-
-	return &d, nil
-}
-
-// pbit8 copies the 8-bit number v to b and returns the remaining slice of b.
-func pbit8(b []byte, v uint8) []byte {
-	b[0] = byte(v)
-	return b[1:]
-}
-
-// pbit16 copies the 16-bit number v to b in little-endian order and returns the remaining slice of b.
-func pbit16(b []byte, v uint16) []byte {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	return b[2:]
-}
-
-// pbit32 copies the 32-bit number v to b in little-endian order and returns the remaining slice of b.
-func pbit32(b []byte, v uint32) []byte {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	return b[4:]
-}
-
-// pbit64 copies the 64-bit number v to b in little-endian order and returns the remaining slice of b.
-func pbit64(b []byte, v uint64) []byte {
-	b[0] = byte(v)
-	b[1] = byte(v >> 8)
-	b[2] = byte(v >> 16)
-	b[3] = byte(v >> 24)
-	b[4] = byte(v >> 32)
-	b[5] = byte(v >> 40)
-	b[6] = byte(v >> 48)
-	b[7] = byte(v >> 56)
-	return b[8:]
-}
-
-// pstring copies the string s to b, prepending it with a 16-bit length in little-endian order, and
-// returning the remaining slice of b..
-func pstring(b []byte, s string) []byte {
-	b = pbit16(b, uint16(len(s)))
-	n := copy(b, s)
-	return b[n:]
-}
-
-// gbit8 reads an 8-bit number from b and returns it with the remaining slice of b.
-func gbit8(b []byte) (uint8, []byte) {
-	return uint8(b[0]), b[1:]
-}
-
-// gbit16 reads a 16-bit number in little-endian order from b and returns it with the remaining slice of b.
-func gbit16(b []byte) (uint16, []byte) {
-	return uint16(b[0]) | uint16(b[1])<<8, b[2:]
-}
-
-// gbit32 reads a 32-bit number in little-endian order from b and returns it with the remaining slice of b.
-func gbit32(b []byte) (uint32, []byte) {
-	return uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24, b[4:]
-}
-
-// gbit64 reads a 64-bit number in little-endian order from b and returns it with the remaining slice of b.
-func gbit64(b []byte) (uint64, []byte) {
-	lo := uint32(b[0]) | uint32(b[1])<<8 | uint32(b[2])<<16 | uint32(b[3])<<24
-	hi := uint32(b[4]) | uint32(b[5])<<8 | uint32(b[6])<<16 | uint32(b[7])<<24
-	return uint64(lo) | uint64(hi)<<32, b[8:]
-}
-
-// gstring reads a string from b, prefixed with a 16-bit length in little-endian order.
-// It returns the string with the remaining slice of b and a boolean. If the length is
-// greater than the number of bytes in b, the boolean will be false.
-func gstring(b []byte) (string, []byte, bool) {
-	n, b := gbit16(b)
-	if int(n) > len(b) {
-		return "", b, false
-	}
-	return string(b[:n]), b[n:], true
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/env_plan9.go b/installer/vendor/golang.org/x/sys/plan9/env_plan9.go
deleted file mode 100644
index 25a96e7ea9..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/env_plan9.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Plan 9 environment variables.
-
-package plan9
-
-import (
-	"syscall"
-)
-
-func Getenv(key string) (value string, found bool) {
-	return syscall.Getenv(key)
-}
-
-func Setenv(key, value string) error {
-	return syscall.Setenv(key, value)
-}
-
-func Clearenv() {
-	syscall.Clearenv()
-}
-
-func Environ() []string {
-	return syscall.Environ()
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/env_unset.go b/installer/vendor/golang.org/x/sys/plan9/env_unset.go
deleted file mode 100644
index c37fc26e44..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/env_unset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package plan9
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/errors_plan9.go b/installer/vendor/golang.org/x/sys/plan9/errors_plan9.go
deleted file mode 100644
index 110cf6a302..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/errors_plan9.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package plan9
-
-import "syscall"
-
-// Constants
-const (
-	// Invented values to support what package os expects.
-	O_CREAT    = 0x02000
-	O_APPEND   = 0x00400
-	O_NOCTTY   = 0x00000
-	O_NONBLOCK = 0x00000
-	O_SYNC     = 0x00000
-	O_ASYNC    = 0x00000
-
-	S_IFMT   = 0x1f000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-)
-
-// Errors
-var (
-	EINVAL       = syscall.NewError("bad arg in system call")
-	ENOTDIR      = syscall.NewError("not a directory")
-	EISDIR       = syscall.NewError("file is a directory")
-	ENOENT       = syscall.NewError("file does not exist")
-	EEXIST       = syscall.NewError("file already exists")
-	EMFILE       = syscall.NewError("no free file descriptors")
-	EIO          = syscall.NewError("i/o error")
-	ENAMETOOLONG = syscall.NewError("file name too long")
-	EINTR        = syscall.NewError("interrupted")
-	EPERM        = syscall.NewError("permission denied")
-	EBUSY        = syscall.NewError("no free devices")
-	ETIMEDOUT    = syscall.NewError("connection timed out")
-	EPLAN9       = syscall.NewError("not supported by plan 9")
-
-	// The following errors do not correspond to any
-	// Plan 9 system messages. Invented to support
-	// what package os and others expect.
-	EACCES       = syscall.NewError("access permission denied")
-	EAFNOSUPPORT = syscall.NewError("address family not supported by protocol")
-)
diff --git a/installer/vendor/golang.org/x/sys/plan9/mkall.sh b/installer/vendor/golang.org/x/sys/plan9/mkall.sh
deleted file mode 100755
index 9f73c60660..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/mkall.sh
+++ /dev/null
@@ -1,138 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# The plan9 package provides access to the raw system call
-# interface of the underlying operating system.  Porting Go to
-# a new architecture/operating system combination requires
-# some manual effort, though there are tools that automate
-# much of the process.  The auto-generated files have names
-# beginning with z.
-#
-# This script runs or (given -n) prints suggested commands to generate z files
-# for the current system.  Running those commands is not automatic.
-# This script is documentation more than anything else.
-#
-# * asm_${GOOS}_${GOARCH}.s
-#
-# This hand-written assembly file implements system call dispatch.
-# There are three entry points:
-#
-# 	func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-# 	func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
-# 	func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-#
-# The first and second are the standard ones; they differ only in
-# how many arguments can be passed to the kernel.
-# The third is for low-level use by the ForkExec wrapper;
-# unlike the first two, it does not call into the scheduler to
-# let it know that a system call is running.
-#
-# * syscall_${GOOS}.go
-#
-# This hand-written Go file implements system calls that need
-# special handling and lists "//sys" comments giving prototypes
-# for ones that can be auto-generated.  Mksyscall reads those
-# comments to generate the stubs.
-#
-# * syscall_${GOOS}_${GOARCH}.go
-#
-# Same as syscall_${GOOS}.go except that it contains code specific
-# to ${GOOS} on one particular architecture.
-#
-# * types_${GOOS}.c
-#
-# This hand-written C file includes standard C headers and then
-# creates typedef or enum names beginning with a dollar sign
-# (use of $ in variable names is a gcc extension).  The hardest
-# part about preparing this file is figuring out which headers to
-# include and which symbols need to be #defined to get the
-# actual data structures that pass through to the kernel system calls.
-# Some C libraries present alternate versions for binary compatibility
-# and translate them on the way in and out of system calls, but
-# there is almost always a #define that can get the real ones.
-# See types_darwin.c and types_linux.c for examples.
-#
-# * zerror_${GOOS}_${GOARCH}.go
-#
-# This machine-generated file defines the system's error numbers,
-# error strings, and signal numbers.  The generator is "mkerrors.sh".
-# Usually no arguments are needed, but mkerrors.sh will pass its
-# arguments on to godefs.
-#
-# * zsyscall_${GOOS}_${GOARCH}.go
-#
-# Generated by mksyscall.pl; see syscall_${GOOS}.go above.
-#
-# * zsysnum_${GOOS}_${GOARCH}.go
-#
-# Generated by mksysnum_${GOOS}.
-#
-# * ztypes_${GOOS}_${GOARCH}.go
-#
-# Generated by godefs; see types_${GOOS}.c above.
-
-GOOSARCH="${GOOS}_${GOARCH}"
-
-# defaults
-mksyscall="./mksyscall.pl"
-mkerrors="./mkerrors.sh"
-zerrors="zerrors_$GOOSARCH.go"
-mksysctl=""
-zsysctl="zsysctl_$GOOSARCH.go"
-mksysnum=
-mktypes=
-run="sh"
-
-case "$1" in
--syscalls)
-	for i in zsyscall*go
-	do
-		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
-		rm _$i
-	done
-	exit 0
-	;;
--n)
-	run="cat"
-	shift
-esac
-
-case "$#" in
-0)
-	;;
-*)
-	echo 'usage: mkall.sh [-n]' 1>&2
-	exit 2
-esac
-
-case "$GOOSARCH" in
-_* | *_ | _)
-	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-plan9_386)
-	mkerrors=
-	mksyscall="./mksyscall.pl -l32 -plan9"
-	mksysnum="./mksysnum_plan9.sh /n/sources/plan9/sys/src/libc/9syscall/sys.h"
-	mktypes="XXX"
-	;;
-*)
-	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-esac
-
-(
-	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
-	case "$GOOS" in
-	plan9)
-		syscall_goos="syscall_$GOOS.go"
-		if [ -n "$mksyscall" ]; then echo "$mksyscall $syscall_goos syscall_$GOOSARCH.go |gofmt >zsyscall_$GOOSARCH.go"; fi
-		;;
-	esac
-	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
-	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
-	if [ -n "$mktypes" ]; then echo "$mktypes types_$GOOS.go |gofmt >ztypes_$GOOSARCH.go"; fi
-) | $run
diff --git a/installer/vendor/golang.org/x/sys/plan9/mkerrors.sh b/installer/vendor/golang.org/x/sys/plan9/mkerrors.sh
deleted file mode 100755
index 052c86d947..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/mkerrors.sh
+++ /dev/null
@@ -1,246 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Generate Go code listing errors and other #defined constant
-# values (ENAMETOOLONG etc.), by asking the preprocessor
-# about the definitions.
-
-unset LANG
-export LC_ALL=C
-export LC_CTYPE=C
-
-CC=${CC:-gcc}
-
-uname=$(uname)
-
-includes='
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <signal.h>
-#include <sys/resource.h>
-'
-
-ccflags="$@"
-
-# Write go tool cgo -godefs input.
-(
-	echo package plan9
-	echo
-	echo '/*'
-	indirect="includes_$(uname)"
-	echo "${!indirect} $includes"
-	echo '*/'
-	echo 'import "C"'
-	echo
-	echo 'const ('
-
-	# The gcc command line prints all the #defines
-	# it encounters while processing the input
-	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
-	awk '
-		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
-
-		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
-		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
-		$2 ~ /^(SCM_SRCRT)$/ {next}
-		$2 ~ /^(MAP_FAILED)$/ {next}
-
-		$2 !~ /^ETH_/ &&
-		$2 !~ /^EPROC_/ &&
-		$2 !~ /^EQUIV_/ &&
-		$2 !~ /^EXPR_/ &&
-		$2 ~ /^E[A-Z0-9_]+$/ ||
-		$2 ~ /^B[0-9_]+$/ ||
-		$2 ~ /^V[A-Z0-9]+$/ ||
-		$2 ~ /^CS[A-Z0-9]/ ||
-		$2 ~ /^I(SIG|CANON|CRNL|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
-		$2 ~ /^IGN/ ||
-		$2 ~ /^IX(ON|ANY|OFF)$/ ||
-		$2 ~ /^IN(LCR|PCK)$/ ||
-		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
-		$2 ~ /^C(LOCAL|READ)$/ ||
-		$2 == "BRKINT" ||
-		$2 == "HUPCL" ||
-		$2 == "PENDIN" ||
-		$2 == "TOSTOP" ||
-		$2 ~ /^PAR/ ||
-		$2 ~ /^SIG[^_]/ ||
-		$2 ~ /^O[CNPFP][A-Z]+[^_][A-Z]+$/ ||
-		$2 ~ /^IN_/ ||
-		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
-		$2 == "ICMPV6_FILTER" ||
-		$2 == "SOMAXCONN" ||
-		$2 == "NAME_MAX" ||
-		$2 == "IFNAMSIZ" ||
-		$2 ~ /^CTL_(MAXNAME|NET|QUERY)$/ ||
-		$2 ~ /^SYSCTL_VERS/ ||
-		$2 ~ /^(MS|MNT)_/ ||
-		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
-		$2 ~ /^(O|F|FD|NAME|S|PTRACE|PT)_/ ||
-		$2 ~ /^LINUX_REBOOT_CMD_/ ||
-		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
-		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
-		$2 ~ /^SIOC/ ||
-		$2 ~ /^TIOC/ ||
-		$2 !~ "RTF_BITS" &&
-		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
-		$2 ~ /^BIOC/ ||
-		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
-		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|NOFILE|STACK)|RLIM_INFINITY/ ||
-		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
-		$2 ~ /^CLONE_[A-Z_]+/ ||
-		$2 !~ /^(BPF_TIMEVAL)$/ &&
-		$2 ~ /^(BPF|DLT)_/ ||
-		$2 !~ "WMESGLEN" &&
-		$2 ~ /^W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", $2, $2)}
-		$2 ~ /^__WCOREFLAG$/ {next}
-		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
-
-		{next}
-	' | sort
-
-	echo ')'
-) >_const.go
-
-# Pull out the error names for later.
-errors=$(
-	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
-	sort
-)
-
-# Pull out the signal names for later.
-signals=$(
-	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort
-)
-
-# Again, writing regexps to a file.
-echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	sort >_error.grep
-echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort >_signal.grep
-
-echo '// mkerrors.sh' "$@"
-echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
-echo
-go tool cgo -godefs -- "$@" _const.go >_error.out
-cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
-echo
-echo '// Errors'
-echo 'const ('
-cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= Errno(\1)/'
-echo ')'
-
-echo
-echo '// Signals'
-echo 'const ('
-cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= Signal(\1)/'
-echo ')'
-
-# Run C program to print error and syscall strings.
-(
-	echo -E "
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <signal.h>
-
-#define nelem(x) (sizeof(x)/sizeof((x)[0]))
-
-enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
-
-int errors[] = {
-"
-	for i in $errors
-	do
-		echo -E '	'$i,
-	done
-
-	echo -E "
-};
-
-int signals[] = {
-"
-	for i in $signals
-	do
-		echo -E '	'$i,
-	done
-
-	# Use -E because on some systems bash builtin interprets \n itself.
-	echo -E '
-};
-
-static int
-intcmp(const void *a, const void *b)
-{
-	return *(int*)a - *(int*)b;
-}
-
-int
-main(void)
-{
-	int i, j, e;
-	char buf[1024], *p;
-
-	printf("\n\n// Error table\n");
-	printf("var errors = [...]string {\n");
-	qsort(errors, nelem(errors), sizeof errors[0], intcmp);
-	for(i=0; i<nelem(errors); i++) {
-		e = errors[i];
-		if(i > 0 && errors[i-1] == e)
-			continue;
-		strcpy(buf, strerror(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-	
-	printf("\n\n// Signal table\n");
-	printf("var signals = [...]string {\n");
-	qsort(signals, nelem(signals), sizeof signals[0], intcmp);
-	for(i=0; i<nelem(signals); i++) {
-		e = signals[i];
-		if(i > 0 && signals[i-1] == e)
-			continue;
-		strcpy(buf, strsignal(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		// cut trailing : number.
-		p = strrchr(buf, ":"[0]);
-		if(p)
-			*p = '\0';
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	return 0;
-}
-
-'
-) >_errors.c
-
-$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/installer/vendor/golang.org/x/sys/plan9/mksyscall.pl b/installer/vendor/golang.org/x/sys/plan9/mksyscall.pl
deleted file mode 100755
index ce8e1e4f33..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/mksyscall.pl
+++ /dev/null
@@ -1,319 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_plan9.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named errno.
-
-# A line beginning with //sysnb is like //sys, except that the
-# goroutine will not be suspended during the execution of the system
-# call.  This must only be used for system calls which can never
-# block, as otherwise the system call could cause all goroutines to
-# hang.
-
-use strict;
-
-my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $plan9 = 0;
-my $openbsd = 0;
-my $netbsd = 0;
-my $dragonfly = 0;
-my $nacl = 0;
-my $arm = 0; # 64-bit value should use (even, odd)-pair
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-plan9") {
-	$plan9 = 1;
-	shift;
-}
-if($ARGV[0] eq "-openbsd") {
-	$openbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-netbsd") {
-	$netbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-dragonfly") {
-	$dragonfly = 1;
-	shift;
-}
-if($ARGV[0] eq "-nacl") {
-	$nacl = 1;
-	shift;
-}
-if($ARGV[0] eq "-arm") {
-	$arm = 1;
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall.pl [-b32 | -l32] [file ...]\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $text = "";
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, errno error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# Try in vain to keep people from editing this file.
-	# The theory is that they jump into the middle of the file
-	# without reading the header.
-	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
-
-	# Go function header.
-	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my @uses = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			push @uses, "use(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass dummy pointer in that case.
-			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
-			$text .= "\tvar _p$n unsafe.Pointer\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
-			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
-			$text .= "\n";
-			push @args, "uintptr(_p$n)", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
-			push @args, "0";
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $dragonfly) {
-			if ($func !~ /^extp(read|write)/i) {
-				push @args, "0";
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if(@args % 2 && $arm) {
-				# arm abi specifies 64-bit argument uses 
-				# (even, odd) pair
-				push @args, "0"
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			}
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "Syscall";
-	if ($nonblock) {
-		$asm = "RawSyscall";
-	}
-	if(@args <= 3) {
-		while(@args < 3) {
-			push @args, "0";
-		}
-	} elsif(@args <= 6) {
-		$asm .= "6";
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} elsif(@args <= 9) {
-		$asm .= "9";
-		while(@args < 9) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# System call number.
-	if($sysname eq "") {
-		$sysname = "SYS_$func";
-		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
-		$sysname =~ y/a-z/A-Z/;
-		if($nacl) {
-			$sysname =~ y/A-Z/a-z/;
-		}
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm($sysname, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my @ret = ("_", "_", "_");
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err" && !$plan9) {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} elsif($name eq "err" && $plan9) {
-			$ret[0] = "r0";
-			$ret[2] = "e1";
-			next;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1" || $plan9) {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	foreach my $use (@uses) {
-		$text .= "\t$use\n";
-	}
-	$text .= $body;
-	
-	if ($plan9 && $ret[2] eq "e1") {
-		$text .= "\tif int32(r0) == -1 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	} elsif ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n\n";
-}
-
-chomp $text;
-chomp $text;
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package plan9
-
-import "unsafe"
-
-$text
-EOF
-exit 0;
diff --git a/installer/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh b/installer/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh
deleted file mode 100755
index 3c3ab05810..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/mksysnum_plan9.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/sh
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-COMMAND="mksysnum_plan9.sh $@"
-
-cat <<EOF
-// $COMMAND
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-package plan9
-
-const(
-EOF
-
-SP='[ 	]' # space or tab
-sed "s/^#define${SP}\\([A-Z0-9_][A-Z0-9_]*\\)${SP}${SP}*\\([0-9][0-9]*\\)/SYS_\\1=\\2/g" \
-	< $1 | grep -v SYS__
-
-cat <<EOF
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go b/installer/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
deleted file mode 100644
index 87ae9d2a33..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/pwd_go15_plan9.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.5
-
-package plan9
-
-import "syscall"
-
-func fixwd() {
-	syscall.Fixwd()
-}
-
-func Getwd() (wd string, err error) {
-	return syscall.Getwd()
-}
-
-func Chdir(path string) error {
-	return syscall.Chdir(path)
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/pwd_plan9.go b/installer/vendor/golang.org/x/sys/plan9/pwd_plan9.go
deleted file mode 100644
index c07c798bc5..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/pwd_plan9.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.5
-
-package plan9
-
-func fixwd() {
-}
-
-func Getwd() (wd string, err error) {
-	fd, err := open(".", O_RDONLY)
-	if err != nil {
-		return "", err
-	}
-	defer Close(fd)
-	return Fd2path(fd)
-}
-
-func Chdir(path string) error {
-	return chdir(path)
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/race.go b/installer/vendor/golang.org/x/sys/plan9/race.go
deleted file mode 100644
index c7ff5df2e6..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/race.go
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9,race
-
-package plan9
-
-import (
-	"runtime"
-	"unsafe"
-)
-
-const raceenabled = true
-
-func raceAcquire(addr unsafe.Pointer) {
-	runtime.RaceAcquire(addr)
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-	runtime.RaceReleaseMerge(addr)
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-	runtime.RaceReadRange(addr, len)
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-	runtime.RaceWriteRange(addr, len)
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/race0.go b/installer/vendor/golang.org/x/sys/plan9/race0.go
deleted file mode 100644
index 06cabcc762..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/race0.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9,!race
-
-package plan9
-
-import (
-	"unsafe"
-)
-
-const raceenabled = false
-
-func raceAcquire(addr unsafe.Pointer) {
-}
-
-func raceReleaseMerge(addr unsafe.Pointer) {
-}
-
-func raceReadRange(addr unsafe.Pointer, len int) {
-}
-
-func raceWriteRange(addr unsafe.Pointer, len int) {
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/str.go b/installer/vendor/golang.org/x/sys/plan9/str.go
deleted file mode 100644
index 4f7f9ad7c8..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/str.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9
-
-package plan9
-
-func itoa(val int) string { // do it here rather than with fmt to avoid dependency
-	if val < 0 {
-		return "-" + itoa(-val)
-	}
-	var buf [32]byte // big enough for int64
-	i := len(buf) - 1
-	for val >= 10 {
-		buf[i] = byte(val%10 + '0')
-		i--
-		val /= 10
-	}
-	buf[i] = byte(val + '0')
-	return string(buf[i:])
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/syscall.go b/installer/vendor/golang.org/x/sys/plan9/syscall.go
deleted file mode 100644
index df6f8c5b92..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/syscall.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9
-
-// Package plan9 contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
-// by default, godoc will display the OS-specific documentation for the current
-// system.  If you want godoc to display documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
-// you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
-// to freebsd and $GOARCH to arm.
-// The primary use of this package is inside other packages that provide a more
-// portable interface to the system, such as "os", "time" and "net".  Use
-// those packages rather than this one if you can.
-// For details of the functions and data types in this package consult
-// the manuals for the appropriate operating system.
-// These calls return err == nil to indicate success; otherwise
-// err represents an operating system error describing the failure and
-// holds a value of type syscall.ErrorString.
-package plan9 // import "golang.org/x/sys/plan9"
-
-import "unsafe"
-
-// ByteSliceFromString returns a NUL-terminated slice of bytes
-// containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func ByteSliceFromString(s string) ([]byte, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, EINVAL
-		}
-	}
-	a := make([]byte, len(s)+1)
-	copy(a, s)
-	return a, nil
-}
-
-// BytePtrFromString returns a pointer to a NUL-terminated array of
-// bytes containing the text of s. If s contains a NUL byte at any
-// location, it returns (nil, EINVAL).
-func BytePtrFromString(s string) (*byte, error) {
-	a, err := ByteSliceFromString(s)
-	if err != nil {
-		return nil, err
-	}
-	return &a[0], nil
-}
-
-// Single-word zero for use when we need a valid pointer to 0 bytes.
-// See mksyscall.pl.
-var _zero uintptr
-
-func (ts *Timespec) Unix() (sec int64, nsec int64) {
-	return int64(ts.Sec), int64(ts.Nsec)
-}
-
-func (tv *Timeval) Unix() (sec int64, nsec int64) {
-	return int64(tv.Sec), int64(tv.Usec) * 1000
-}
-
-func (ts *Timespec) Nano() int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
-}
-
-func (tv *Timeval) Nano() int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
-}
-
-// use is a no-op, but the compiler cannot see that it is.
-// Calling use(p) ensures that p is kept live until that point.
-//go:noescape
-func use(p unsafe.Pointer)
diff --git a/installer/vendor/golang.org/x/sys/plan9/syscall_plan9.go b/installer/vendor/golang.org/x/sys/plan9/syscall_plan9.go
deleted file mode 100644
index d39d07de1e..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/syscall_plan9.go
+++ /dev/null
@@ -1,349 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Plan 9 system calls.
-// This file is compiled as ordinary Go code,
-// but it is also input to mksyscall,
-// which parses the //sys lines and generates system call stubs.
-// Note that sometimes we use a lowercase //sys name and
-// wrap it in our own nicer implementation.
-
-package plan9
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-// A Note is a string describing a process note.
-// It implements the os.Signal interface.
-type Note string
-
-func (n Note) Signal() {}
-
-func (n Note) String() string {
-	return string(n)
-}
-
-var (
-	Stdin  = 0
-	Stdout = 1
-	Stderr = 2
-)
-
-// For testing: clients can set this flag to force
-// creation of IPv6 sockets to return EAFNOSUPPORT.
-var SocketDisableIPv6 bool
-
-func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.ErrorString)
-func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.ErrorString)
-func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr)
-func RawSyscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr)
-
-func atoi(b []byte) (n uint) {
-	n = 0
-	for i := 0; i < len(b); i++ {
-		n = n*10 + uint(b[i]-'0')
-	}
-	return
-}
-
-func cstring(s []byte) string {
-	for i := range s {
-		if s[i] == 0 {
-			return string(s[0:i])
-		}
-	}
-	return string(s)
-}
-
-func errstr() string {
-	var buf [ERRMAX]byte
-
-	RawSyscall(SYS_ERRSTR, uintptr(unsafe.Pointer(&buf[0])), uintptr(len(buf)), 0)
-
-	buf[len(buf)-1] = 0
-	return cstring(buf[:])
-}
-
-// Implemented in assembly to import from runtime.
-func exit(code int)
-
-func Exit(code int) { exit(code) }
-
-func readnum(path string) (uint, error) {
-	var b [12]byte
-
-	fd, e := Open(path, O_RDONLY)
-	if e != nil {
-		return 0, e
-	}
-	defer Close(fd)
-
-	n, e := Pread(fd, b[:], 0)
-
-	if e != nil {
-		return 0, e
-	}
-
-	m := 0
-	for ; m < n && b[m] == ' '; m++ {
-	}
-
-	return atoi(b[m : n-1]), nil
-}
-
-func Getpid() (pid int) {
-	n, _ := readnum("#c/pid")
-	return int(n)
-}
-
-func Getppid() (ppid int) {
-	n, _ := readnum("#c/ppid")
-	return int(n)
-}
-
-func Read(fd int, p []byte) (n int, err error) {
-	return Pread(fd, p, -1)
-}
-
-func Write(fd int, p []byte) (n int, err error) {
-	return Pwrite(fd, p, -1)
-}
-
-var ioSync int64
-
-//sys	fd2path(fd int, buf []byte) (err error)
-func Fd2path(fd int) (path string, err error) {
-	var buf [512]byte
-
-	e := fd2path(fd, buf[:])
-	if e != nil {
-		return "", e
-	}
-	return cstring(buf[:]), nil
-}
-
-//sys	pipe(p *[2]int32) (err error)
-func Pipe(p []int) (err error) {
-	if len(p) != 2 {
-		return syscall.ErrorString("bad arg in system call")
-	}
-	var pp [2]int32
-	err = pipe(&pp)
-	p[0] = int(pp[0])
-	p[1] = int(pp[1])
-	return
-}
-
-// Underlying system call writes to newoffset via pointer.
-// Implemented in assembly to avoid allocation.
-func seek(placeholder uintptr, fd int, offset int64, whence int) (newoffset int64, err string)
-
-func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
-	newoffset, e := seek(0, fd, offset, whence)
-
-	if newoffset == -1 {
-		err = syscall.ErrorString(e)
-	}
-	return
-}
-
-func Mkdir(path string, mode uint32) (err error) {
-	fd, err := Create(path, O_RDONLY, DMDIR|mode)
-
-	if fd != -1 {
-		Close(fd)
-	}
-
-	return
-}
-
-type Waitmsg struct {
-	Pid  int
-	Time [3]uint32
-	Msg  string
-}
-
-func (w Waitmsg) Exited() bool   { return true }
-func (w Waitmsg) Signaled() bool { return false }
-
-func (w Waitmsg) ExitStatus() int {
-	if len(w.Msg) == 0 {
-		// a normal exit returns no message
-		return 0
-	}
-	return 1
-}
-
-//sys	await(s []byte) (n int, err error)
-func Await(w *Waitmsg) (err error) {
-	var buf [512]byte
-	var f [5][]byte
-
-	n, err := await(buf[:])
-
-	if err != nil || w == nil {
-		return
-	}
-
-	nf := 0
-	p := 0
-	for i := 0; i < n && nf < len(f)-1; i++ {
-		if buf[i] == ' ' {
-			f[nf] = buf[p:i]
-			p = i + 1
-			nf++
-		}
-	}
-	f[nf] = buf[p:]
-	nf++
-
-	if nf != len(f) {
-		return syscall.ErrorString("invalid wait message")
-	}
-	w.Pid = int(atoi(f[0]))
-	w.Time[0] = uint32(atoi(f[1]))
-	w.Time[1] = uint32(atoi(f[2]))
-	w.Time[2] = uint32(atoi(f[3]))
-	w.Msg = cstring(f[4])
-	if w.Msg == "''" {
-		// await() returns '' for no error
-		w.Msg = ""
-	}
-	return
-}
-
-func Unmount(name, old string) (err error) {
-	fixwd()
-	oldp, err := BytePtrFromString(old)
-	if err != nil {
-		return err
-	}
-	oldptr := uintptr(unsafe.Pointer(oldp))
-
-	var r0 uintptr
-	var e syscall.ErrorString
-
-	// bind(2) man page: If name is zero, everything bound or mounted upon old is unbound or unmounted.
-	if name == "" {
-		r0, _, e = Syscall(SYS_UNMOUNT, _zero, oldptr, 0)
-	} else {
-		namep, err := BytePtrFromString(name)
-		if err != nil {
-			return err
-		}
-		r0, _, e = Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(namep)), oldptr, 0)
-	}
-
-	if int32(r0) == -1 {
-		err = e
-	}
-	return
-}
-
-func Fchdir(fd int) (err error) {
-	path, err := Fd2path(fd)
-
-	if err != nil {
-		return
-	}
-
-	return Chdir(path)
-}
-
-type Timespec struct {
-	Sec  int32
-	Nsec int32
-}
-
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
-}
-
-func nsec() int64 {
-	var scratch int64
-
-	r0, _, _ := Syscall(SYS_NSEC, uintptr(unsafe.Pointer(&scratch)), 0, 0)
-	// TODO(aram): remove hack after I fix _nsec in the pc64 kernel.
-	if r0 == 0 {
-		return scratch
-	}
-	return int64(r0)
-}
-
-func Gettimeofday(tv *Timeval) error {
-	nsec := nsec()
-	*tv = NsecToTimeval(nsec)
-	return nil
-}
-
-func Getpagesize() int { return 0x1000 }
-
-func Getegid() (egid int) { return -1 }
-func Geteuid() (euid int) { return -1 }
-func Getgid() (gid int)   { return -1 }
-func Getuid() (uid int)   { return -1 }
-
-func Getgroups() (gids []int, err error) {
-	return make([]int, 0), nil
-}
-
-//sys	open(path string, mode int) (fd int, err error)
-func Open(path string, mode int) (fd int, err error) {
-	fixwd()
-	return open(path, mode)
-}
-
-//sys	create(path string, mode int, perm uint32) (fd int, err error)
-func Create(path string, mode int, perm uint32) (fd int, err error) {
-	fixwd()
-	return create(path, mode, perm)
-}
-
-//sys	remove(path string) (err error)
-func Remove(path string) error {
-	fixwd()
-	return remove(path)
-}
-
-//sys	stat(path string, edir []byte) (n int, err error)
-func Stat(path string, edir []byte) (n int, err error) {
-	fixwd()
-	return stat(path, edir)
-}
-
-//sys	bind(name string, old string, flag int) (err error)
-func Bind(name string, old string, flag int) (err error) {
-	fixwd()
-	return bind(name, old, flag)
-}
-
-//sys	mount(fd int, afd int, old string, flag int, aname string) (err error)
-func Mount(fd int, afd int, old string, flag int, aname string) (err error) {
-	fixwd()
-	return mount(fd, afd, old, flag, aname)
-}
-
-//sys	wstat(path string, edir []byte) (err error)
-func Wstat(path string, edir []byte) (err error) {
-	fixwd()
-	return wstat(path, edir)
-}
-
-//sys	chdir(path string) (err error)
-//sys	Dup(oldfd int, newfd int) (fd int, err error)
-//sys	Pread(fd int, p []byte, offset int64) (n int, err error)
-//sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
-//sys	Close(fd int) (err error)
-//sys	Fstat(fd int, edir []byte) (n int, err error)
-//sys	Fwstat(fd int, edir []byte) (err error)
diff --git a/installer/vendor/golang.org/x/sys/plan9/syscall_test.go b/installer/vendor/golang.org/x/sys/plan9/syscall_test.go
deleted file mode 100644
index 8f829bad01..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/syscall_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build plan9
-
-package plan9_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/plan9"
-)
-
-func testSetGetenv(t *testing.T, key, value string) {
-	err := plan9.Setenv(key, value)
-	if err != nil {
-		t.Fatalf("Setenv failed to set %q: %v", value, err)
-	}
-	newvalue, found := plan9.Getenv(key)
-	if !found {
-		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
-	}
-	if newvalue != value {
-		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
-	}
-}
-
-func TestEnv(t *testing.T) {
-	testSetGetenv(t, "TESTENV", "AVALUE")
-	// make sure TESTENV gets set to "", not deleted
-	testSetGetenv(t, "TESTENV", "")
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go b/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
deleted file mode 100644
index b35598ad94..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_386.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// mksyscall.pl -l32 -plan9 syscall_plan9.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package plan9
-
-import "unsafe"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fd2path(fd int, buf []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]int32) (err error) {
-	r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func await(s []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(s) > 0 {
-		_p0 = unsafe.Pointer(&s[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func open(path string, mode int) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func create(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func remove(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, edir []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(edir) > 0 {
-		_p1 = unsafe.Pointer(&edir[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(name string, old string, flag int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(old)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(fd int, afd int, old string, flag int, aname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(old)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(aname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(_p0)), uintptr(flag), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wstat(path string, edir []byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(edir) > 0 {
-		_p1 = unsafe.Pointer(&edir[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int, newfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0)
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, edir []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(edir) > 0 {
-		_p0 = unsafe.Pointer(&edir[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fwstat(fd int, edir []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(edir) > 0 {
-		_p0 = unsafe.Pointer(&edir[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go b/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
deleted file mode 100644
index b35598ad94..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/zsyscall_plan9_amd64.go
+++ /dev/null
@@ -1,292 +0,0 @@
-// mksyscall.pl -l32 -plan9 syscall_plan9.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-package plan9
-
-import "unsafe"
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func fd2path(fd int, buf []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(buf) > 0 {
-		_p0 = unsafe.Pointer(&buf[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FD2PATH, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func pipe(p *[2]int32) (err error) {
-	r0, _, e1 := Syscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func await(s []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(s) > 0 {
-		_p0 = unsafe.Pointer(&s[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_AWAIT, uintptr(_p0), uintptr(len(s)), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func open(path string, mode int) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func create(path string, mode int, perm uint32) (fd int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CREATE, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
-	use(unsafe.Pointer(_p0))
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func remove(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_REMOVE, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func stat(path string, edir []byte) (n int, err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(edir) > 0 {
-		_p1 = unsafe.Pointer(&edir[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
-	use(unsafe.Pointer(_p0))
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func bind(name string, old string, flag int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(name)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(old)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_BIND, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(flag))
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func mount(fd int, afd int, old string, flag int, aname string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(old)
-	if err != nil {
-		return
-	}
-	var _p1 *byte
-	_p1, err = BytePtrFromString(aname)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall6(SYS_MOUNT, uintptr(fd), uintptr(afd), uintptr(unsafe.Pointer(_p0)), uintptr(flag), uintptr(unsafe.Pointer(_p1)), 0)
-	use(unsafe.Pointer(_p0))
-	use(unsafe.Pointer(_p1))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func wstat(path string, edir []byte) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	var _p1 unsafe.Pointer
-	if len(edir) > 0 {
-		_p1 = unsafe.Pointer(&edir[0])
-	} else {
-		_p1 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_WSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(edir)))
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func chdir(path string) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	r0, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
-	use(unsafe.Pointer(_p0))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Dup(oldfd int, newfd int) (fd int, err error) {
-	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), uintptr(newfd), 0)
-	fd = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pread(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(p) > 0 {
-		_p0 = unsafe.Pointer(&p[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(offset), uintptr(offset>>32), 0)
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Close(fd int) (err error) {
-	r0, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fstat(fd int, edir []byte) (n int, err error) {
-	var _p0 unsafe.Pointer
-	if len(edir) > 0 {
-		_p0 = unsafe.Pointer(&edir[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
-	n = int(r0)
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Fwstat(fd int, edir []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(edir) > 0 {
-		_p0 = unsafe.Pointer(&edir[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	r0, _, e1 := Syscall(SYS_FWSTAT, uintptr(fd), uintptr(_p0), uintptr(len(edir)))
-	if int32(r0) == -1 {
-		err = e1
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go b/installer/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go
deleted file mode 100644
index 22e8abd43d..0000000000
--- a/installer/vendor/golang.org/x/sys/plan9/zsysnum_plan9.go
+++ /dev/null
@@ -1,49 +0,0 @@
-// mksysnum_plan9.sh /opt/plan9/sys/src/libc/9syscall/sys.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-package plan9
-
-const (
-	SYS_SYSR1       = 0
-	SYS_BIND        = 2
-	SYS_CHDIR       = 3
-	SYS_CLOSE       = 4
-	SYS_DUP         = 5
-	SYS_ALARM       = 6
-	SYS_EXEC        = 7
-	SYS_EXITS       = 8
-	SYS_FAUTH       = 10
-	SYS_SEGBRK      = 12
-	SYS_OPEN        = 14
-	SYS_OSEEK       = 16
-	SYS_SLEEP       = 17
-	SYS_RFORK       = 19
-	SYS_PIPE        = 21
-	SYS_CREATE      = 22
-	SYS_FD2PATH     = 23
-	SYS_BRK_        = 24
-	SYS_REMOVE      = 25
-	SYS_NOTIFY      = 28
-	SYS_NOTED       = 29
-	SYS_SEGATTACH   = 30
-	SYS_SEGDETACH   = 31
-	SYS_SEGFREE     = 32
-	SYS_SEGFLUSH    = 33
-	SYS_RENDEZVOUS  = 34
-	SYS_UNMOUNT     = 35
-	SYS_SEMACQUIRE  = 37
-	SYS_SEMRELEASE  = 38
-	SYS_SEEK        = 39
-	SYS_FVERSION    = 40
-	SYS_ERRSTR      = 41
-	SYS_STAT        = 42
-	SYS_FSTAT       = 43
-	SYS_WSTAT       = 44
-	SYS_FWSTAT      = 45
-	SYS_MOUNT       = 46
-	SYS_AWAIT       = 47
-	SYS_PREAD       = 50
-	SYS_PWRITE      = 51
-	SYS_TSEMACQUIRE = 52
-	SYS_NSEC        = 53
-)
diff --git a/installer/vendor/golang.org/x/sys/unix/.gitignore b/installer/vendor/golang.org/x/sys/unix/.gitignore
deleted file mode 100644
index e482715909..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_obj/
diff --git a/installer/vendor/golang.org/x/sys/unix/affinity_linux.go b/installer/vendor/golang.org/x/sys/unix/affinity_linux.go
new file mode 100644
index 0000000000..72afe3338c
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/affinity_linux.go
@@ -0,0 +1,124 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// CPU affinity functions
+
+package unix
+
+import (
+	"unsafe"
+)
+
+const cpuSetSize = _CPU_SETSIZE / _NCPUBITS
+
+// CPUSet represents a CPU affinity mask.
+type CPUSet [cpuSetSize]cpuMask
+
+func schedAffinity(trap uintptr, pid int, set *CPUSet) error {
+	_, _, e := RawSyscall(trap, uintptr(pid), uintptr(unsafe.Sizeof(*set)), uintptr(unsafe.Pointer(set)))
+	if e != 0 {
+		return errnoErr(e)
+	}
+	return nil
+}
+
+// SchedGetaffinity gets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedGetaffinity(pid int, set *CPUSet) error {
+	return schedAffinity(SYS_SCHED_GETAFFINITY, pid, set)
+}
+
+// SchedSetaffinity sets the CPU affinity mask of the thread specified by pid.
+// If pid is 0 the calling thread is used.
+func SchedSetaffinity(pid int, set *CPUSet) error {
+	return schedAffinity(SYS_SCHED_SETAFFINITY, pid, set)
+}
+
+// Zero clears the set s, so that it contains no CPUs.
+func (s *CPUSet) Zero() {
+	for i := range s {
+		s[i] = 0
+	}
+}
+
+func cpuBitsIndex(cpu int) int {
+	return cpu / _NCPUBITS
+}
+
+func cpuBitsMask(cpu int) cpuMask {
+	return cpuMask(1 << (uint(cpu) % _NCPUBITS))
+}
+
+// Set adds cpu to the set s.
+func (s *CPUSet) Set(cpu int) {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		s[i] |= cpuBitsMask(cpu)
+	}
+}
+
+// Clear removes cpu from the set s.
+func (s *CPUSet) Clear(cpu int) {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		s[i] &^= cpuBitsMask(cpu)
+	}
+}
+
+// IsSet reports whether cpu is in the set s.
+func (s *CPUSet) IsSet(cpu int) bool {
+	i := cpuBitsIndex(cpu)
+	if i < len(s) {
+		return s[i]&cpuBitsMask(cpu) != 0
+	}
+	return false
+}
+
+// Count returns the number of CPUs in the set s.
+func (s *CPUSet) Count() int {
+	c := 0
+	for _, b := range s {
+		c += onesCount64(uint64(b))
+	}
+	return c
+}
+
+// onesCount64 is a copy of Go 1.9's math/bits.OnesCount64.
+// Once this package can require Go 1.9, we can delete this
+// and update the caller to use bits.OnesCount64.
+func onesCount64(x uint64) int {
+	const m0 = 0x5555555555555555 // 01010101 ...
+	const m1 = 0x3333333333333333 // 00110011 ...
+	const m2 = 0x0f0f0f0f0f0f0f0f // 00001111 ...
+	const m3 = 0x00ff00ff00ff00ff // etc.
+	const m4 = 0x0000ffff0000ffff
+
+	// Implementation: Parallel summing of adjacent bits.
+	// See "Hacker's Delight", Chap. 5: Counting Bits.
+	// The following pattern shows the general approach:
+	//
+	//   x = x>>1&(m0&m) + x&(m0&m)
+	//   x = x>>2&(m1&m) + x&(m1&m)
+	//   x = x>>4&(m2&m) + x&(m2&m)
+	//   x = x>>8&(m3&m) + x&(m3&m)
+	//   x = x>>16&(m4&m) + x&(m4&m)
+	//   x = x>>32&(m5&m) + x&(m5&m)
+	//   return int(x)
+	//
+	// Masking (& operations) can be left away when there's no
+	// danger that a field's sum will carry over into the next
+	// field: Since the result cannot be > 64, 8 bits is enough
+	// and we can ignore the masks for the shifts by 8 and up.
+	// Per "Hacker's Delight", the first line can be simplified
+	// more, but it saves at best one instruction, so we leave
+	// it alone for clarity.
+	const m = 1<<64 - 1
+	x = x>>1&(m0&m) + x&(m0&m)
+	x = x>>2&(m1&m) + x&(m1&m)
+	x = (x>>4 + x) & (m2 & m)
+	x += x >> 8
+	x += x >> 16
+	x += x >> 32
+	return int(x) & (1<<7 - 1)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s b/installer/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
index d5ed6726cc..603dd5728c 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_dragonfly_amd64.s
@@ -13,17 +13,17 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-64
+TEXT	·Syscall(SB),NOSPLIT,$0-56
 	JMP	syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-88
+TEXT	·Syscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·Syscall6(SB)
 
-TEXT	·Syscall9(SB),NOSPLIT,$0-112
+TEXT	·Syscall9(SB),NOSPLIT,$0-104
 	JMP	syscall·Syscall9(SB)
 
-TEXT ·RawSyscall(SB),NOSPLIT,$0-64
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	JMP	syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-88
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·RawSyscall6(SB)
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_386.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_386.s
index 4db2909323..448bebbb59 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_386.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_386.s
@@ -10,21 +10,51 @@
 // System calls for 386, Linux
 //
 
+// See ../runtime/sys_linux_386.s for the reason why we always use int 0x80
+// instead of the glibc-specific "CALL 0x10(GS)".
+#define INVOKE_SYSCALL	INT	$0x80
+
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
 	JMP	syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
 	JMP	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	CALL	runtime·entersyscall(SB)
+	MOVL	trap+0(FP), AX  // syscall entry
+	MOVL	a1+4(FP), BX
+	MOVL	a2+8(FP), CX
+	MOVL	a3+12(FP), DX
+	MOVL	$0, SI
+	MOVL	$0, DI
+	INVOKE_SYSCALL
+	MOVL	AX, r1+16(FP)
+	MOVL	DX, r2+20(FP)
+	CALL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-28
 	JMP	syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
 	JMP	syscall·RawSyscall6(SB)
 
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVL	trap+0(FP), AX  // syscall entry
+	MOVL	a1+4(FP), BX
+	MOVL	a2+8(FP), CX
+	MOVL	a3+12(FP), DX
+	MOVL	$0, SI
+	MOVL	$0, DI
+	INVOKE_SYSCALL
+	MOVL	AX, r1+16(FP)
+	MOVL	DX, r2+20(FP)
+	RET
+
 TEXT ·socketcall(SB),NOSPLIT,$0-36
 	JMP	syscall·socketcall(SB)
 
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_amd64.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
index 44e25c62f9..c6468a9588 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_amd64.s
@@ -13,17 +13,45 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
 	JMP	syscall·Syscall(SB)
 
 TEXT ·Syscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	CALL	runtime·entersyscall(SB)
+	MOVQ	a1+8(FP), DI
+	MOVQ	a2+16(FP), SI
+	MOVQ	a3+24(FP), DX
+	MOVQ	$0, R10
+	MOVQ	$0, R8
+	MOVQ	$0, R9
+	MOVQ	trap+0(FP), AX	// syscall entry
+	SYSCALL
+	MOVQ	AX, r1+32(FP)
+	MOVQ	DX, r2+40(FP)
+	CALL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	JMP	syscall·RawSyscall(SB)
 
 TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·RawSyscall6(SB)
 
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVQ	a1+8(FP), DI
+	MOVQ	a2+16(FP), SI
+	MOVQ	a3+24(FP), DX
+	MOVQ	$0, R10
+	MOVQ	$0, R8
+	MOVQ	$0, R9
+	MOVQ	trap+0(FP), AX	// syscall entry
+	SYSCALL
+	MOVQ	AX, r1+32(FP)
+	MOVQ	DX, r2+40(FP)
+	RET
+
 TEXT ·gettimeofday(SB),NOSPLIT,$0-16
 	JMP	syscall·gettimeofday(SB)
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_arm.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_arm.s
index cf0b574658..cf0f3575c1 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_arm.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_arm.s
@@ -13,17 +13,44 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
 	B	syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
 	B	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	BL	runtime·entersyscall(SB)
+	MOVW	trap+0(FP), R7
+	MOVW	a1+4(FP), R0
+	MOVW	a2+8(FP), R1
+	MOVW	a3+12(FP), R2
+	MOVW	$0, R3
+	MOVW	$0, R4
+	MOVW	$0, R5
+	SWI	$0
+	MOVW	R0, r1+16(FP)
+	MOVW	$0, R0
+	MOVW	R0, r2+20(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-28
 	B	syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
 	B	syscall·RawSyscall6(SB)
 
-TEXT ·seek(SB),NOSPLIT,$0-32
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVW	trap+0(FP), R7	// syscall entry
+	MOVW	a1+4(FP), R0
+	MOVW	a2+8(FP), R1
+	MOVW	a3+12(FP), R2
+	SWI	$0
+	MOVW	R0, r1+16(FP)
+	MOVW	$0, R0
+	MOVW	R0, r2+20(FP)
+	RET
+
+TEXT ·seek(SB),NOSPLIT,$0-28
 	B	syscall·seek(SB)
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_arm64.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
index 4be9bfedea..afe6fdf6b1 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_arm64.s
@@ -11,14 +11,42 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
 	B	syscall·Syscall(SB)
 
 TEXT ·Syscall6(SB),NOSPLIT,$0-80
 	B	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R0
+	MOVD	a2+16(FP), R1
+	MOVD	a3+24(FP), R2
+	MOVD	$0, R3
+	MOVD	$0, R4
+	MOVD	$0, R5
+	MOVD	trap+0(FP), R8	// syscall entry
+	SVC
+	MOVD	R0, r1+32(FP)	// r1
+	MOVD	R1, r2+40(FP)	// r2
+	BL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	B	syscall·RawSyscall(SB)
 
 TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
 	B	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R0
+	MOVD	a2+16(FP), R1
+	MOVD	a3+24(FP), R2
+	MOVD	$0, R3
+	MOVD	$0, R4
+	MOVD	$0, R5
+	MOVD	trap+0(FP), R8	// syscall entry
+	SVC
+	MOVD	R0, r1+32(FP)
+	MOVD	R1, r2+40(FP)
+	RET
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
index 724e580c4e..ab9d63831a 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_mips64x.s
@@ -15,14 +15,42 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
 	JMP	syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-80
+TEXT ·Syscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·Syscall6(SB)
 
-TEXT	·RawSyscall(SB),NOSPLIT,$0-56
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	JAL	runtime·entersyscall(SB)
+	MOVV	a1+8(FP), R4
+	MOVV	a2+16(FP), R5
+	MOVV	a3+24(FP), R6
+	MOVV	R0, R7
+	MOVV	R0, R8
+	MOVV	R0, R9
+	MOVV	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVV	R2, r1+32(FP)
+	MOVV	R3, r2+40(FP)
+	JAL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	JMP	syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-80
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
 	JMP	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVV	a1+8(FP), R4
+	MOVV	a2+16(FP), R5
+	MOVV	a3+24(FP), R6
+	MOVV	R0, R7
+	MOVV	R0, R8
+	MOVV	R0, R9
+	MOVV	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVV	R2, r1+32(FP)
+	MOVV	R3, r2+40(FP)
+	RET
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
index 2ea425755e..99e5399045 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_mipsx.s
@@ -15,17 +15,40 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-28
+TEXT ·Syscall(SB),NOSPLIT,$0-28
 	JMP syscall·Syscall(SB)
 
-TEXT	·Syscall6(SB),NOSPLIT,$0-40
+TEXT ·Syscall6(SB),NOSPLIT,$0-40
 	JMP syscall·Syscall6(SB)
 
-TEXT	·Syscall9(SB),NOSPLIT,$0-52
+TEXT ·Syscall9(SB),NOSPLIT,$0-52
 	JMP syscall·Syscall9(SB)
 
-TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-24
+	JAL	runtime·entersyscall(SB)
+	MOVW	a1+4(FP), R4
+	MOVW	a2+8(FP), R5
+	MOVW	a3+12(FP), R6
+	MOVW	R0, R7
+	MOVW	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVW	R2, r1+16(FP)	// r1
+	MOVW	R3, r2+20(FP)	// r2
+	JAL	runtime·exitsyscall(SB)
+	RET
+
+TEXT ·RawSyscall(SB),NOSPLIT,$0-28
 	JMP syscall·RawSyscall(SB)
 
-TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+TEXT ·RawSyscall6(SB),NOSPLIT,$0-40
 	JMP syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-24
+	MOVW	a1+4(FP), R4
+	MOVW	a2+8(FP), R5
+	MOVW	a3+12(FP), R6
+	MOVW	trap+0(FP), R2	// syscall entry
+	SYSCALL
+	MOVW	R2, r1+16(FP)
+	MOVW	R3, r2+20(FP)
+	RET
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
index 8d231feb4b..649e58714d 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_ppc64x.s
@@ -15,14 +15,42 @@
 // Just jump to package syscall's implementation for all these functions.
 // The runtime may know about them.
 
-TEXT	·Syscall(SB),NOSPLIT,$0-56
+TEXT ·Syscall(SB),NOSPLIT,$0-56
 	BR	syscall·Syscall(SB)
 
 TEXT ·Syscall6(SB),NOSPLIT,$0-80
 	BR	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R3
+	MOVD	a2+16(FP), R4
+	MOVD	a3+24(FP), R5
+	MOVD	R0, R6
+	MOVD	R0, R7
+	MOVD	R0, R8
+	MOVD	trap+0(FP), R9	// syscall entry
+	SYSCALL R9
+	MOVD	R3, r1+32(FP)
+	MOVD	R4, r2+40(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	BR	syscall·RawSyscall(SB)
 
 TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
 	BR	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R3
+	MOVD	a2+16(FP), R4
+	MOVD	a3+24(FP), R5
+	MOVD	R0, R6
+	MOVD	R0, R7
+	MOVD	R0, R8
+	MOVD	trap+0(FP), R9	// syscall entry
+	SYSCALL R9
+	MOVD	R3, r1+32(FP)
+	MOVD	R4, r2+40(FP)
+	RET
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_linux_s390x.s b/installer/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
index 11889859fb..a5a863c6bd 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_linux_s390x.s
@@ -21,8 +21,36 @@ TEXT ·Syscall(SB),NOSPLIT,$0-56
 TEXT ·Syscall6(SB),NOSPLIT,$0-80
 	BR	syscall·Syscall6(SB)
 
+TEXT ·SyscallNoError(SB),NOSPLIT,$0-48
+	BL	runtime·entersyscall(SB)
+	MOVD	a1+8(FP), R2
+	MOVD	a2+16(FP), R3
+	MOVD	a3+24(FP), R4
+	MOVD	$0, R5
+	MOVD	$0, R6
+	MOVD	$0, R7
+	MOVD	trap+0(FP), R1	// syscall entry
+	SYSCALL
+	MOVD	R2, r1+32(FP)
+	MOVD	R3, r2+40(FP)
+	BL	runtime·exitsyscall(SB)
+	RET
+
 TEXT ·RawSyscall(SB),NOSPLIT,$0-56
 	BR	syscall·RawSyscall(SB)
 
 TEXT ·RawSyscall6(SB),NOSPLIT,$0-80
 	BR	syscall·RawSyscall6(SB)
+
+TEXT ·RawSyscallNoError(SB),NOSPLIT,$0-48
+	MOVD	a1+8(FP), R2
+	MOVD	a2+16(FP), R3
+	MOVD	a3+24(FP), R4
+	MOVD	$0, R5
+	MOVD	$0, R6
+	MOVD	$0, R7
+	MOVD	trap+0(FP), R1	// syscall entry
+	SYSCALL
+	MOVD	R2, r1+32(FP)
+	MOVD	R3, r2+40(FP)
+	RET
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s b/installer/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s
new file mode 100644
index 0000000000..469bfa1003
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/asm_openbsd_arm.s
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build !gccgo
+
+#include "textflag.h"
+
+//
+// System call support for ARM, OpenBSD
+//
+
+// Just jump to package syscall's implementation for all these functions.
+// The runtime may know about them.
+
+TEXT	·Syscall(SB),NOSPLIT,$0-28
+	B	syscall·Syscall(SB)
+
+TEXT	·Syscall6(SB),NOSPLIT,$0-40
+	B	syscall·Syscall6(SB)
+
+TEXT	·Syscall9(SB),NOSPLIT,$0-52
+	B	syscall·Syscall9(SB)
+
+TEXT	·RawSyscall(SB),NOSPLIT,$0-28
+	B	syscall·RawSyscall(SB)
+
+TEXT	·RawSyscall6(SB),NOSPLIT,$0-40
+	B	syscall·RawSyscall6(SB)
diff --git a/installer/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s b/installer/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
index 43ed17a05f..ded8260f3e 100644
--- a/installer/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
+++ b/installer/vendor/golang.org/x/sys/unix/asm_solaris_amd64.s
@@ -10,8 +10,8 @@
 // System calls for amd64, Solaris are implemented in runtime/syscall_solaris.go
 //
 
-TEXT ·sysvicall6(SB),NOSPLIT,$0-64
+TEXT ·sysvicall6(SB),NOSPLIT,$0-88
 	JMP	syscall·sysvicall6(SB)
 
-TEXT ·rawSysvicall6(SB),NOSPLIT,$0-64
+TEXT ·rawSysvicall6(SB),NOSPLIT,$0-88
 	JMP	syscall·rawSysvicall6(SB)
diff --git a/installer/vendor/golang.org/x/sys/unix/cap_freebsd.go b/installer/vendor/golang.org/x/sys/unix/cap_freebsd.go
new file mode 100644
index 0000000000..df52048773
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/cap_freebsd.go
@@ -0,0 +1,195 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build freebsd
+
+package unix
+
+import (
+	"errors"
+	"fmt"
+)
+
+// Go implementation of C mostly found in /usr/src/sys/kern/subr_capability.c
+
+const (
+	// This is the version of CapRights this package understands. See C implementation for parallels.
+	capRightsGoVersion = CAP_RIGHTS_VERSION_00
+	capArSizeMin       = CAP_RIGHTS_VERSION_00 + 2
+	capArSizeMax       = capRightsGoVersion + 2
+)
+
+var (
+	bit2idx = []int{
+		-1, 0, 1, -1, 2, -1, -1, -1, 3, -1, -1, -1, -1, -1, -1, -1,
+		4, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1, -1,
+	}
+)
+
+func capidxbit(right uint64) int {
+	return int((right >> 57) & 0x1f)
+}
+
+func rightToIndex(right uint64) (int, error) {
+	idx := capidxbit(right)
+	if idx < 0 || idx >= len(bit2idx) {
+		return -2, fmt.Errorf("index for right 0x%x out of range", right)
+	}
+	return bit2idx[idx], nil
+}
+
+func caprver(right uint64) int {
+	return int(right >> 62)
+}
+
+func capver(rights *CapRights) int {
+	return caprver(rights.Rights[0])
+}
+
+func caparsize(rights *CapRights) int {
+	return capver(rights) + 2
+}
+
+// CapRightsSet sets the permissions in setrights in rights.
+func CapRightsSet(rights *CapRights, setrights []uint64) error {
+	// This is essentially a copy of cap_rights_vset()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return errors.New("bad rights size")
+	}
+
+	for _, right := range setrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return err
+		}
+		if i >= n {
+			return errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch")
+		}
+		rights.Rights[i] |= right
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch (after assign)")
+		}
+	}
+
+	return nil
+}
+
+// CapRightsClear clears the permissions in clearrights from rights.
+func CapRightsClear(rights *CapRights, clearrights []uint64) error {
+	// This is essentially a copy of cap_rights_vclear()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return errors.New("bad rights size")
+	}
+
+	for _, right := range clearrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return err
+		}
+		if i >= n {
+			return errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch")
+		}
+		rights.Rights[i] &= ^(right & 0x01FFFFFFFFFFFFFF)
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return errors.New("index mismatch (after assign)")
+		}
+	}
+
+	return nil
+}
+
+// CapRightsIsSet checks whether all the permissions in setrights are present in rights.
+func CapRightsIsSet(rights *CapRights, setrights []uint64) (bool, error) {
+	// This is essentially a copy of cap_rights_is_vset()
+	if capver(rights) != CAP_RIGHTS_VERSION_00 {
+		return false, fmt.Errorf("bad rights version %d", capver(rights))
+	}
+
+	n := caparsize(rights)
+	if n < capArSizeMin || n > capArSizeMax {
+		return false, errors.New("bad rights size")
+	}
+
+	for _, right := range setrights {
+		if caprver(right) != CAP_RIGHTS_VERSION_00 {
+			return false, errors.New("bad right version")
+		}
+		i, err := rightToIndex(right)
+		if err != nil {
+			return false, err
+		}
+		if i >= n {
+			return false, errors.New("index overflow")
+		}
+		if capidxbit(rights.Rights[i]) != capidxbit(right) {
+			return false, errors.New("index mismatch")
+		}
+		if (rights.Rights[i] & right) != right {
+			return false, nil
+		}
+	}
+
+	return true, nil
+}
+
+func capright(idx uint64, bit uint64) uint64 {
+	return ((1 << (57 + idx)) | bit)
+}
+
+// CapRightsInit returns a pointer to an initialised CapRights structure filled with rights.
+// See man cap_rights_init(3) and rights(4).
+func CapRightsInit(rights []uint64) (*CapRights, error) {
+	var r CapRights
+	r.Rights[0] = (capRightsGoVersion << 62) | capright(0, 0)
+	r.Rights[1] = capright(1, 0)
+
+	err := CapRightsSet(&r, rights)
+	if err != nil {
+		return nil, err
+	}
+	return &r, nil
+}
+
+// CapRightsLimit reduces the operations permitted on fd to at most those contained in rights.
+// The capability rights on fd can never be increased by CapRightsLimit.
+// See man cap_rights_limit(2) and rights(4).
+func CapRightsLimit(fd uintptr, rights *CapRights) error {
+	return capRightsLimit(int(fd), rights)
+}
+
+// CapRightsGet returns a CapRights structure containing the operations permitted on fd.
+// See man cap_rights_get(3) and rights(4).
+func CapRightsGet(fd uintptr) (*CapRights, error) {
+	r, err := CapRightsInit(nil)
+	if err != nil {
+		return nil, err
+	}
+	err = capRightsGet(capRightsGoVersion, int(fd), r)
+	if err != nil {
+		return nil, err
+	}
+	return r, nil
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/creds_test.go b/installer/vendor/golang.org/x/sys/unix/creds_test.go
deleted file mode 100644
index eaae7c367f..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/creds_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package unix_test
-
-import (
-	"bytes"
-	"net"
-	"os"
-	"syscall"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-// TestSCMCredentials tests the sending and receiving of credentials
-// (PID, UID, GID) in an ancillary message between two UNIX
-// sockets. The SO_PASSCRED socket option is enabled on the sending
-// socket for this to work.
-func TestSCMCredentials(t *testing.T) {
-	fds, err := unix.Socketpair(unix.AF_LOCAL, unix.SOCK_STREAM, 0)
-	if err != nil {
-		t.Fatalf("Socketpair: %v", err)
-	}
-	defer unix.Close(fds[0])
-	defer unix.Close(fds[1])
-
-	err = unix.SetsockoptInt(fds[0], unix.SOL_SOCKET, unix.SO_PASSCRED, 1)
-	if err != nil {
-		t.Fatalf("SetsockoptInt: %v", err)
-	}
-
-	srvFile := os.NewFile(uintptr(fds[0]), "server")
-	defer srvFile.Close()
-	srv, err := net.FileConn(srvFile)
-	if err != nil {
-		t.Errorf("FileConn: %v", err)
-		return
-	}
-	defer srv.Close()
-
-	cliFile := os.NewFile(uintptr(fds[1]), "client")
-	defer cliFile.Close()
-	cli, err := net.FileConn(cliFile)
-	if err != nil {
-		t.Errorf("FileConn: %v", err)
-		return
-	}
-	defer cli.Close()
-
-	var ucred unix.Ucred
-	if os.Getuid() != 0 {
-		ucred.Pid = int32(os.Getpid())
-		ucred.Uid = 0
-		ucred.Gid = 0
-		oob := unix.UnixCredentials(&ucred)
-		_, _, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)
-		if op, ok := err.(*net.OpError); ok {
-			err = op.Err
-		}
-		if sys, ok := err.(*os.SyscallError); ok {
-			err = sys.Err
-		}
-		if err != syscall.EPERM {
-			t.Fatalf("WriteMsgUnix failed with %v, want EPERM", err)
-		}
-	}
-
-	ucred.Pid = int32(os.Getpid())
-	ucred.Uid = uint32(os.Getuid())
-	ucred.Gid = uint32(os.Getgid())
-	oob := unix.UnixCredentials(&ucred)
-
-	// this is going to send a dummy byte
-	n, oobn, err := cli.(*net.UnixConn).WriteMsgUnix(nil, oob, nil)
-	if err != nil {
-		t.Fatalf("WriteMsgUnix: %v", err)
-	}
-	if n != 0 {
-		t.Fatalf("WriteMsgUnix n = %d, want 0", n)
-	}
-	if oobn != len(oob) {
-		t.Fatalf("WriteMsgUnix oobn = %d, want %d", oobn, len(oob))
-	}
-
-	oob2 := make([]byte, 10*len(oob))
-	n, oobn2, flags, _, err := srv.(*net.UnixConn).ReadMsgUnix(nil, oob2)
-	if err != nil {
-		t.Fatalf("ReadMsgUnix: %v", err)
-	}
-	if flags != 0 {
-		t.Fatalf("ReadMsgUnix flags = 0x%x, want 0", flags)
-	}
-	if n != 1 {
-		t.Fatalf("ReadMsgUnix n = %d, want 1 (dummy byte)", n)
-	}
-	if oobn2 != oobn {
-		// without SO_PASSCRED set on the socket, ReadMsgUnix will
-		// return zero oob bytes
-		t.Fatalf("ReadMsgUnix oobn = %d, want %d", oobn2, oobn)
-	}
-	oob2 = oob2[:oobn2]
-	if !bytes.Equal(oob, oob2) {
-		t.Fatal("ReadMsgUnix oob bytes don't match")
-	}
-
-	scm, err := unix.ParseSocketControlMessage(oob2)
-	if err != nil {
-		t.Fatalf("ParseSocketControlMessage: %v", err)
-	}
-	newUcred, err := unix.ParseUnixCredentials(&scm[0])
-	if err != nil {
-		t.Fatalf("ParseUnixCredentials: %v", err)
-	}
-	if *newUcred != ucred {
-		t.Fatalf("ParseUnixCredentials = %+v, want %+v", newUcred, ucred)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_darwin.go b/installer/vendor/golang.org/x/sys/unix/dev_darwin.go
new file mode 100644
index 0000000000..8d1dc0fa3d
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_darwin.go
@@ -0,0 +1,24 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in Darwin's sys/types.h header.
+
+package unix
+
+// Major returns the major component of a Darwin device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 24) & 0xff)
+}
+
+// Minor returns the minor component of a Darwin device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffffff)
+}
+
+// Mkdev returns a Darwin device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 24) | uint64(minor)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_dragonfly.go b/installer/vendor/golang.org/x/sys/unix/dev_dragonfly.go
new file mode 100644
index 0000000000..8502f202ce
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_dragonfly.go
@@ -0,0 +1,30 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in Dragonfly's sys/types.h header.
+//
+// The information below is extracted and adapted from sys/types.h:
+//
+// Minor gives a cookie instead of an index since in order to avoid changing the
+// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for
+// devices that don't use them.
+
+package unix
+
+// Major returns the major component of a DragonFlyBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 8) & 0xff)
+}
+
+// Minor returns the minor component of a DragonFlyBSD device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffff00ff)
+}
+
+// Mkdev returns a DragonFlyBSD device number generated from the given major and
+// minor components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 8) | uint64(minor)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_freebsd.go b/installer/vendor/golang.org/x/sys/unix/dev_freebsd.go
new file mode 100644
index 0000000000..eba3b4bd38
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_freebsd.go
@@ -0,0 +1,30 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in FreeBSD's sys/types.h header.
+//
+// The information below is extracted and adapted from sys/types.h:
+//
+// Minor gives a cookie instead of an index since in order to avoid changing the
+// meanings of bits 0-15 or wasting time and space shifting bits 16-31 for
+// devices that don't use them.
+
+package unix
+
+// Major returns the major component of a FreeBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev >> 8) & 0xff)
+}
+
+// Minor returns the minor component of a FreeBSD device number.
+func Minor(dev uint64) uint32 {
+	return uint32(dev & 0xffff00ff)
+}
+
+// Mkdev returns a FreeBSD device number generated from the given major and
+// minor components.
+func Mkdev(major, minor uint32) uint64 {
+	return (uint64(major) << 8) | uint64(minor)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_linux.go b/installer/vendor/golang.org/x/sys/unix/dev_linux.go
new file mode 100644
index 0000000000..d165d6f308
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_linux.go
@@ -0,0 +1,42 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used by the Linux kernel and glibc.
+//
+// The information below is extracted and adapted from bits/sysmacros.h in the
+// glibc sources:
+//
+// dev_t in glibc is 64-bit, with 32-bit major and minor numbers. glibc's
+// default encoding is MMMM Mmmm mmmM MMmm, where M is a hex digit of the major
+// number and m is a hex digit of the minor number. This is backward compatible
+// with legacy systems where dev_t is 16 bits wide, encoded as MMmm. It is also
+// backward compatible with the Linux kernel, which for some architectures uses
+// 32-bit dev_t, encoded as mmmM MMmm.
+
+package unix
+
+// Major returns the major component of a Linux device number.
+func Major(dev uint64) uint32 {
+	major := uint32((dev & 0x00000000000fff00) >> 8)
+	major |= uint32((dev & 0xfffff00000000000) >> 32)
+	return major
+}
+
+// Minor returns the minor component of a Linux device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x00000000000000ff) >> 0)
+	minor |= uint32((dev & 0x00000ffffff00000) >> 12)
+	return minor
+}
+
+// Mkdev returns a Linux device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) & 0x00000fff) << 8
+	dev |= (uint64(major) & 0xfffff000) << 32
+	dev |= (uint64(minor) & 0x000000ff) << 0
+	dev |= (uint64(minor) & 0xffffff00) << 12
+	return dev
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_netbsd.go b/installer/vendor/golang.org/x/sys/unix/dev_netbsd.go
new file mode 100644
index 0000000000..b4a203d0c5
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_netbsd.go
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in NetBSD's sys/types.h header.
+
+package unix
+
+// Major returns the major component of a NetBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev & 0x000fff00) >> 8)
+}
+
+// Minor returns the minor component of a NetBSD device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x000000ff) >> 0)
+	minor |= uint32((dev & 0xfff00000) >> 12)
+	return minor
+}
+
+// Mkdev returns a NetBSD device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) << 8) & 0x000fff00
+	dev |= (uint64(minor) << 12) & 0xfff00000
+	dev |= (uint64(minor) << 0) & 0x000000ff
+	return dev
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dev_openbsd.go b/installer/vendor/golang.org/x/sys/unix/dev_openbsd.go
new file mode 100644
index 0000000000..f3430c42ff
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dev_openbsd.go
@@ -0,0 +1,29 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Functions to access/create device major and minor numbers matching the
+// encoding used in OpenBSD's sys/types.h header.
+
+package unix
+
+// Major returns the major component of an OpenBSD device number.
+func Major(dev uint64) uint32 {
+	return uint32((dev & 0x0000ff00) >> 8)
+}
+
+// Minor returns the minor component of an OpenBSD device number.
+func Minor(dev uint64) uint32 {
+	minor := uint32((dev & 0x000000ff) >> 0)
+	minor |= uint32((dev & 0xffff0000) >> 8)
+	return minor
+}
+
+// Mkdev returns an OpenBSD device number generated from the given major and minor
+// components.
+func Mkdev(major, minor uint32) uint64 {
+	dev := (uint64(major) << 8) & 0x0000ff00
+	dev |= (uint64(minor) << 8) & 0xffff0000
+	dev |= (uint64(minor) << 0) & 0x000000ff
+	return dev
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/dirent.go b/installer/vendor/golang.org/x/sys/unix/dirent.go
new file mode 100644
index 0000000000..95fd353171
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/dirent.go
@@ -0,0 +1,17 @@
+// Copyright 2009 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
+
+package unix
+
+import "syscall"
+
+// ParseDirent parses up to max directory entries in buf,
+// appending the names to names. It returns the number of
+// bytes consumed from buf, the number of entries added
+// to names, and the new names slice.
+func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
+	return syscall.ParseDirent(buf, max, names)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/endian_big.go b/installer/vendor/golang.org/x/sys/unix/endian_big.go
new file mode 100644
index 0000000000..5e9269063f
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/endian_big.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// +build ppc64 s390x mips mips64
+
+package unix
+
+const isBigEndian = true
diff --git a/installer/vendor/golang.org/x/sys/unix/endian_little.go b/installer/vendor/golang.org/x/sys/unix/endian_little.go
new file mode 100644
index 0000000000..085df2d8dd
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/endian_little.go
@@ -0,0 +1,9 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+//
+// +build 386 amd64 amd64p32 arm arm64 ppc64le mipsle mips64le
+
+package unix
+
+const isBigEndian = false
diff --git a/installer/vendor/golang.org/x/sys/unix/env_unix.go b/installer/vendor/golang.org/x/sys/unix/env_unix.go
index 45e281a047..706b3cd1dd 100644
--- a/installer/vendor/golang.org/x/sys/unix/env_unix.go
+++ b/installer/vendor/golang.org/x/sys/unix/env_unix.go
@@ -1,4 +1,4 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
+// Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -25,3 +25,7 @@ func Clearenv() {
 func Environ() []string {
 	return syscall.Environ()
 }
+
+func Unsetenv(key string) error {
+	return syscall.Unsetenv(key)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/env_unset.go b/installer/vendor/golang.org/x/sys/unix/env_unset.go
deleted file mode 100644
index 9222262559..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/env_unset.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.4
-
-package unix
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/errors_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
new file mode 100644
index 0000000000..c56bc8b05e
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_386.go
@@ -0,0 +1,227 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IP_FAITH                          = 0x16
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	SIOCADDRT                         = 0x8030720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8030720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
new file mode 100644
index 0000000000..3e9771175a
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_amd64.go
@@ -0,0 +1,227 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Constants that were deprecated or moved to enums in the FreeBSD headers. Keep
+// them here for backwards compatibility.
+
+package unix
+
+const (
+	IFF_SMART                         = 0x20
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf2
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_IPXIP                         = 0xf9
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IPPROTO_MAXID                     = 0x34
+	IPV6_FAITH                        = 0x1d
+	IP_FAITH                          = 0x16
+	MAP_NORESERVE                     = 0x40
+	MAP_RENAME                        = 0x20
+	NET_RT_MAXID                      = 0x6
+	RTF_PRCLONING                     = 0x10000
+	RTM_OLDADD                        = 0x9
+	RTM_OLDDEL                        = 0xa
+	SIOCADDRT                         = 0x8040720a
+	SIOCALIFADDR                      = 0x8118691b
+	SIOCDELRT                         = 0x8040720b
+	SIOCDLIFADDR                      = 0x8118691d
+	SIOCGLIFADDR                      = 0xc118691c
+	SIOCGLIFPHYADDR                   = 0xc118694b
+	SIOCSLIFPHYADDR                   = 0x8118694a
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
new file mode 100644
index 0000000000..856dca3254
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/errors_freebsd_arm.go
@@ -0,0 +1,226 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package unix
+
+const (
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BSC                           = 0x53
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf6
+	IFT_PFSYNC                        = 0xf7
+	IFT_PLC                           = 0xae
+	IFT_POS                           = 0xab
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf1
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_STF                           = 0xd7
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+
+	// missing constants on FreeBSD-11.1-RELEASE, copied from old values in ztypes_freebsd_arm.go
+	IFF_SMART       = 0x20
+	IFT_FAITH       = 0xf2
+	IFT_IPXIP       = 0xf9
+	IPPROTO_MAXID   = 0x34
+	IPV6_FAITH      = 0x1d
+	IP_FAITH        = 0x16
+	MAP_NORESERVE   = 0x40
+	MAP_RENAME      = 0x20
+	NET_RT_MAXID    = 0x6
+	RTF_PRCLONING   = 0x10000
+	RTM_OLDADD      = 0x9
+	RTM_OLDDEL      = 0xa
+	SIOCADDRT       = 0x8030720a
+	SIOCALIFADDR    = 0x8118691b
+	SIOCDELRT       = 0x8030720b
+	SIOCDLIFADDR    = 0x8118691d
+	SIOCGLIFADDR    = 0xc118691c
+	SIOCGLIFPHYADDR = 0xc118694b
+	SIOCSLIFPHYADDR = 0x8118694a
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/export_test.go b/installer/vendor/golang.org/x/sys/unix/export_test.go
deleted file mode 100644
index b4fdd970b6..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/export_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix
-
-var Itoa = itoa
diff --git a/installer/vendor/golang.org/x/sys/unix/fcntl.go b/installer/vendor/golang.org/x/sys/unix/fcntl.go
new file mode 100644
index 0000000000..0c58c7e1e5
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/fcntl.go
@@ -0,0 +1,28 @@
+// Copyright 2014 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd
+
+package unix
+
+import "unsafe"
+
+// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
+// systems by flock_linux_32bit.go to be SYS_FCNTL64.
+var fcntl64Syscall uintptr = SYS_FCNTL
+
+// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
+	valptr, _, err := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(arg))
+	return int(valptr), err
+}
+
+// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
+func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
+	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
+	if errno == 0 {
+		return nil
+	}
+	return errno
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/flock_linux_32bit.go b/installer/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
similarity index 100%
rename from installer/vendor/golang.org/x/sys/unix/flock_linux_32bit.go
rename to installer/vendor/golang.org/x/sys/unix/fcntl_linux_32bit.go
diff --git a/installer/vendor/golang.org/x/sys/unix/flock.go b/installer/vendor/golang.org/x/sys/unix/flock.go
deleted file mode 100644
index ce67a59528..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/flock.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build linux darwin freebsd openbsd netbsd dragonfly
-
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd
-
-package unix
-
-import "unsafe"
-
-// fcntl64Syscall is usually SYS_FCNTL, but is overridden on 32-bit Linux
-// systems by flock_linux_32bit.go to be SYS_FCNTL64.
-var fcntl64Syscall uintptr = SYS_FCNTL
-
-// FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
-func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
-	_, _, errno := Syscall(fcntl64Syscall, fd, uintptr(cmd), uintptr(unsafe.Pointer(lk)))
-	if errno == 0 {
-		return nil
-	}
-	return errno
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/gccgo.go b/installer/vendor/golang.org/x/sys/unix/gccgo.go
index 94c8232124..50062e3c74 100644
--- a/installer/vendor/golang.org/x/sys/unix/gccgo.go
+++ b/installer/vendor/golang.org/x/sys/unix/gccgo.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
+// Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -8,12 +8,22 @@ package unix
 
 import "syscall"
 
-// We can't use the gc-syntax .s files for gccgo.  On the plus side
+// We can't use the gc-syntax .s files for gccgo. On the plus side
 // much of the functionality can be written directly in Go.
 
+//extern gccgoRealSyscallNoError
+func realSyscallNoError(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r uintptr)
+
 //extern gccgoRealSyscall
 func realSyscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r, errno uintptr)
 
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+	syscall.Entersyscall()
+	r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	syscall.Exitsyscall()
+	return r, 0
+}
+
 func Syscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
 	syscall.Entersyscall()
 	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
@@ -35,6 +45,11 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 	return r, 0, syscall.Errno(errno)
 }
 
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr) {
+	r := realSyscallNoError(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
+	return r, 0
+}
+
 func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2 uintptr, err syscall.Errno) {
 	r, errno := realSyscall(trap, a1, a2, a3, 0, 0, 0, 0, 0, 0)
 	return r, 0, syscall.Errno(errno)
diff --git a/installer/vendor/golang.org/x/sys/unix/gccgo_c.c b/installer/vendor/golang.org/x/sys/unix/gccgo_c.c
index 07f6be0392..24e96b1198 100644
--- a/installer/vendor/golang.org/x/sys/unix/gccgo_c.c
+++ b/installer/vendor/golang.org/x/sys/unix/gccgo_c.c
@@ -1,4 +1,4 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
+// Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -31,6 +31,12 @@ gccgoRealSyscall(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintp
 	return r;
 }
 
+uintptr_t
+gccgoRealSyscallNoError(uintptr_t trap, uintptr_t a1, uintptr_t a2, uintptr_t a3, uintptr_t a4, uintptr_t a5, uintptr_t a6, uintptr_t a7, uintptr_t a8, uintptr_t a9)
+{
+	return syscall(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9);
+}
+
 // Define the use function in C so that it is not inlined.
 
 extern void use(void *) __asm__ (GOSYM_PREFIX GOPKGPATH ".use") __attribute__((noinline));
diff --git a/installer/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
index bffe1a77db..251a977a81 100644
--- a/installer/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/gccgo_linux_amd64.go
@@ -1,4 +1,4 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
+// Copyright 2015 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go b/installer/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go
deleted file mode 100644
index 56332692c4..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/gccgo_linux_sparc64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2016 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo,linux,sparc64
-
-package unix
-
-import "syscall"
-
-//extern sysconf
-func realSysconf(name int) int64
-
-func sysconf(name int) (n int64, err syscall.Errno) {
-	r := realSysconf(name)
-	if r < 0 {
-		return 0, syscall.GetErrno()
-	}
-	return r, 0
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/mkall.sh b/installer/vendor/golang.org/x/sys/unix/mkall.sh
deleted file mode 100755
index c1fc2adb88..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mkall.sh
+++ /dev/null
@@ -1,294 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# The unix package provides access to the raw system call
-# interface of the underlying operating system.  Porting Go to
-# a new architecture/operating system combination requires
-# some manual effort, though there are tools that automate
-# much of the process.  The auto-generated files have names
-# beginning with z.
-#
-# This script runs or (given -n) prints suggested commands to generate z files
-# for the current system.  Running those commands is not automatic.
-# This script is documentation more than anything else.
-#
-# * asm_${GOOS}_${GOARCH}.s
-#
-# This hand-written assembly file implements system call dispatch.
-# There are three entry points:
-#
-# 	func Syscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-# 	func Syscall6(trap, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2, err uintptr);
-# 	func RawSyscall(trap, a1, a2, a3 uintptr) (r1, r2, err uintptr);
-#
-# The first and second are the standard ones; they differ only in
-# how many arguments can be passed to the kernel.
-# The third is for low-level use by the ForkExec wrapper;
-# unlike the first two, it does not call into the scheduler to
-# let it know that a system call is running.
-#
-# * syscall_${GOOS}.go
-#
-# This hand-written Go file implements system calls that need
-# special handling and lists "//sys" comments giving prototypes
-# for ones that can be auto-generated.  Mksyscall reads those
-# comments to generate the stubs.
-#
-# * syscall_${GOOS}_${GOARCH}.go
-#
-# Same as syscall_${GOOS}.go except that it contains code specific
-# to ${GOOS} on one particular architecture.
-#
-# * types_${GOOS}.c
-#
-# This hand-written C file includes standard C headers and then
-# creates typedef or enum names beginning with a dollar sign
-# (use of $ in variable names is a gcc extension).  The hardest
-# part about preparing this file is figuring out which headers to
-# include and which symbols need to be #defined to get the
-# actual data structures that pass through to the kernel system calls.
-# Some C libraries present alternate versions for binary compatibility
-# and translate them on the way in and out of system calls, but
-# there is almost always a #define that can get the real ones.
-# See types_darwin.c and types_linux.c for examples.
-#
-# * zerror_${GOOS}_${GOARCH}.go
-#
-# This machine-generated file defines the system's error numbers,
-# error strings, and signal numbers.  The generator is "mkerrors.sh".
-# Usually no arguments are needed, but mkerrors.sh will pass its
-# arguments on to godefs.
-#
-# * zsyscall_${GOOS}_${GOARCH}.go
-#
-# Generated by mksyscall.pl; see syscall_${GOOS}.go above.
-#
-# * zsysnum_${GOOS}_${GOARCH}.go
-#
-# Generated by mksysnum_${GOOS}.
-#
-# * ztypes_${GOOS}_${GOARCH}.go
-#
-# Generated by godefs; see types_${GOOS}.c above.
-
-GOOSARCH="${GOOS}_${GOARCH}"
-
-# defaults
-mksyscall="./mksyscall.pl"
-mkerrors="./mkerrors.sh"
-zerrors="zerrors_$GOOSARCH.go"
-mksysctl=""
-zsysctl="zsysctl_$GOOSARCH.go"
-mksysnum=
-mktypes=
-run="sh"
-
-case "$1" in
--syscalls)
-	for i in zsyscall*go
-	do
-		# Run the command line that appears in the first line
-		# of the generated file to regenerate it.
-		sed 1q $i | sed 's;^// ;;' | sh > _$i && gofmt < _$i > $i
-		rm _$i
-	done
-	exit 0
-	;;
--n)
-	run="cat"
-	shift
-esac
-
-case "$#" in
-0)
-	;;
-*)
-	echo 'usage: mkall.sh [-n]' 1>&2
-	exit 2
-esac
-
-GOOSARCH_in=syscall_$GOOSARCH.go
-case "$GOOSARCH" in
-_* | *_ | _)
-	echo 'undefined $GOOS_$GOARCH:' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-darwin_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk macosx)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm)
-	mkerrors="$mkerrors"
-	mksysnum="./mksysnum_darwin.pl /usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-darwin_arm64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_darwin.pl $(xcrun --show-sdk-path --sdk iphoneos)/usr/include/sys/syscall.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-dragonfly_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -dragonfly"
-	mksysnum="curl -s 'http://gitweb.dragonflybsd.org/dragonfly.git/blob_plain/HEAD:/sys/kern/syscalls.master' | ./mksysnum_dragonfly.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-freebsd_arm)
-	mkerrors="$mkerrors"
-	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://svn.freebsd.org/base/stable/10/sys/kern/syscalls.master' | ./mksysnum_freebsd.pl"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across over platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32"
-	mksysnum="./mksysnum_linux.pl /usr/include/asm/unistd_32.h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_amd64)
-	unistd_h=$(ls -1 /usr/include/asm/unistd_64.h /usr/include/x86_64-linux-gnu/asm/unistd_64.h 2>/dev/null | head -1)
-	if [ "$unistd_h" = "" ]; then
-		echo >&2 cannot find unistd_64.h
-		exit 1
-	fi
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_arm)
-	mkerrors="$mkerrors"
-	mksyscall="./mksyscall.pl -l32 -arm"
-	mksysnum="curl -s 'http://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/plain/arch/arm/include/uapi/asm/unistd.h' | ./mksysnum_linux.pl -"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_arm64)
-	unistd_h=$(ls -1 /usr/include/asm/unistd.h /usr/include/asm-generic/unistd.h 2>/dev/null | head -1)
-	if [ "$unistd_h" = "" ]; then
-		echo >&2 cannot find unistd_64.h
-		exit 1
-	fi
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	# Let the type of C char be signed for making the bare syscall
-	# API consistent across over platforms.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_ppc64)
-	GOOSARCH_in=syscall_linux_ppc64x.go
-	unistd_h=/usr/include/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_ppc64le)
-	GOOSARCH_in=syscall_linux_ppc64x.go
-	unistd_h=/usr/include/powerpc64le-linux-gnu/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-linux_s390x)
-	GOOSARCH_in=syscall_linux_s390x.go
-	unistd_h=/usr/include/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	# Let the type of C char be signed to make the bare sys
-	# API more consistent between platforms.
-	# This is a deliberate departure from the way the syscall
-	# package generates its version of the types file.
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs -- -fsigned-char"
-	;;
-linux_sparc64)
-	GOOSARCH_in=syscall_linux_sparc64.go
-	unistd_h=/usr/include/sparc64-linux-gnu/asm/unistd.h
-	mkerrors="$mkerrors -m64"
-	mksysnum="./mksysnum_linux.pl $unistd_h"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-netbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-netbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -netbsd"
-	mksysnum="curl -s 'http://cvsweb.netbsd.org/bsdweb.cgi/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_netbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_386)
-	mkerrors="$mkerrors -m32"
-	mksyscall="./mksyscall.pl -l32 -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-openbsd_amd64)
-	mkerrors="$mkerrors -m64"
-	mksyscall="./mksyscall.pl -openbsd"
-	mksysctl="./mksysctl_openbsd.pl"
-	zsysctl="zsysctl_openbsd.go"
-	mksysnum="curl -s 'http://cvsweb.openbsd.org/cgi-bin/cvsweb/~checkout~/src/sys/kern/syscalls.master' | ./mksysnum_openbsd.pl"
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-solaris_amd64)
-	mksyscall="./mksyscall_solaris.pl"
-	mkerrors="$mkerrors -m64"
-	mksysnum=
-	mktypes="GOARCH=$GOARCH go tool cgo -godefs"
-	;;
-*)
-	echo 'unrecognized $GOOS_$GOARCH: ' "$GOOSARCH" 1>&2
-	exit 1
-	;;
-esac
-
-(
-	if [ -n "$mkerrors" ]; then echo "$mkerrors |gofmt >$zerrors"; fi
-	case "$GOOS" in
-	*)
-		syscall_goos="syscall_$GOOS.go"
-		case "$GOOS" in
-		darwin | dragonfly | freebsd | netbsd | openbsd)
-			syscall_goos="syscall_bsd.go $syscall_goos"
-			;;
-		esac
-		if [ -n "$mksyscall" ]; then echo "$mksyscall -tags $GOOS,$GOARCH $syscall_goos $GOOSARCH_in |gofmt >zsyscall_$GOOSARCH.go"; fi
-		;;
-	esac
-	if [ -n "$mksysctl" ]; then echo "$mksysctl |gofmt >$zsysctl"; fi
-	if [ -n "$mksysnum" ]; then echo "$mksysnum |gofmt >zsysnum_$GOOSARCH.go"; fi
-	if [ -n "$mktypes" ]; then
-		echo "echo // +build $GOARCH,$GOOS > ztypes_$GOOSARCH.go";
-		echo "$mktypes types_$GOOS.go | go run mkpost.go >>ztypes_$GOOSARCH.go";
-	fi
-) | $run
diff --git a/installer/vendor/golang.org/x/sys/unix/mkerrors.sh b/installer/vendor/golang.org/x/sys/unix/mkerrors.sh
deleted file mode 100755
index 8da63576a3..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mkerrors.sh
+++ /dev/null
@@ -1,499 +0,0 @@
-#!/usr/bin/env bash
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# Generate Go code listing errors and other #defined constant
-# values (ENAMETOOLONG etc.), by asking the preprocessor
-# about the definitions.
-
-unset LANG
-export LC_ALL=C
-export LC_CTYPE=C
-
-if test -z "$GOARCH" -o -z "$GOOS"; then
-	echo 1>&2 "GOARCH or GOOS not defined in environment"
-	exit 1
-fi
-
-CC=${CC:-cc}
-
-if [[ "$GOOS" -eq "solaris" ]]; then
-	# Assumes GNU versions of utilities in PATH.
-	export PATH=/usr/gnu/bin:$PATH
-fi
-
-uname=$(uname)
-
-includes_Darwin='
-#define _DARWIN_C_SOURCE
-#define KERNEL
-#define _DARWIN_USE_64_BIT_INODE
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/ptrace.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <termios.h>
-'
-
-includes_DragonFly='
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <net/ip_mroute/ip_mroute.h>
-'
-
-includes_FreeBSD='
-#include <sys/param.h>
-#include <sys/types.h>
-#include <sys/event.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <sys/extattr.h>
-
-#if __FreeBSD__ >= 10
-#define IFT_CARP	0xf8	// IFT_CARP is deprecated in FreeBSD 10
-#undef SIOCAIFADDR
-#define SIOCAIFADDR	_IOW(105, 26, struct oifaliasreq)	// ifaliasreq contains if_data
-#undef SIOCSIFPHYADDR
-#define SIOCSIFPHYADDR	_IOW(105, 70, struct oifaliasreq)	// ifaliasreq contains if_data
-#endif
-'
-
-includes_Linux='
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#ifndef __LP64__
-#define _FILE_OFFSET_BITS 64
-#endif
-#define _GNU_SOURCE
-
-#include <bits/sockaddr.h>
-#include <sys/epoll.h>
-#include <sys/inotify.h>
-#include <sys/ioctl.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/prctl.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <linux/if.h>
-#include <linux/if_alg.h>
-#include <linux/if_arp.h>
-#include <linux/if_ether.h>
-#include <linux/if_tun.h>
-#include <linux/if_packet.h>
-#include <linux/if_addr.h>
-#include <linux/falloc.h>
-#include <linux/filter.h>
-#include <linux/netlink.h>
-#include <linux/random.h>
-#include <linux/reboot.h>
-#include <linux/rtnetlink.h>
-#include <linux/ptrace.h>
-#include <linux/sched.h>
-#include <linux/wait.h>
-#include <linux/icmpv6.h>
-#include <linux/serial.h>
-#include <linux/can.h>
-#include <linux/vm_sockets.h>
-#include <net/route.h>
-#include <asm/termbits.h>
-
-#ifndef MSG_FASTOPEN
-#define MSG_FASTOPEN    0x20000000
-#endif
-
-#ifndef PTRACE_GETREGS
-#define PTRACE_GETREGS	0xc
-#endif
-
-#ifndef PTRACE_SETREGS
-#define PTRACE_SETREGS	0xd
-#endif
-
-#ifndef SOL_NETLINK
-#define SOL_NETLINK	270
-#endif
-
-#ifdef SOL_BLUETOOTH
-// SPARC includes this in /usr/include/sparc64-linux-gnu/bits/socket.h
-// but it is already in bluetooth_linux.go
-#undef SOL_BLUETOOTH
-#endif
-'
-
-includes_NetBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-
-// Needed since <sys/param.h> refers to it...
-#define schedppq 1
-'
-
-includes_OpenBSD='
-#include <sys/types.h>
-#include <sys/param.h>
-#include <sys/event.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/sysctl.h>
-#include <sys/termios.h>
-#include <sys/ttycom.h>
-#include <sys/wait.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_types.h>
-#include <net/if_var.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-#include <netinet/if_ether.h>
-#include <net/if_bridge.h>
-
-// We keep some constants not supported in OpenBSD 5.5 and beyond for
-// the promise of compatibility.
-#define EMUL_ENABLED		0x1
-#define EMUL_NATIVE		0x2
-#define IPV6_FAITH		0x1d
-#define IPV6_OPTIONS		0x1
-#define IPV6_RTHDR_STRICT	0x1
-#define IPV6_SOCKOPT_RESERVED1	0x3
-#define SIOCGIFGENERIC		0xc020693a
-#define SIOCSIFGENERIC		0x80206939
-#define WALTSIG			0x4
-'
-
-includes_SunOS='
-#include <limits.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <sys/sockio.h>
-#include <sys/mman.h>
-#include <sys/wait.h>
-#include <sys/ioctl.h>
-#include <net/bpf.h>
-#include <net/if.h>
-#include <net/if_arp.h>
-#include <net/if_types.h>
-#include <net/route.h>
-#include <netinet/in.h>
-#include <termios.h>
-#include <netinet/ip.h>
-#include <netinet/ip_mroute.h>
-'
-
-
-includes='
-#include <sys/types.h>
-#include <sys/file.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <sys/socket.h>
-#include <netinet/in.h>
-#include <netinet/ip.h>
-#include <netinet/ip6.h>
-#include <netinet/tcp.h>
-#include <errno.h>
-#include <sys/signal.h>
-#include <signal.h>
-#include <sys/resource.h>
-#include <time.h>
-'
-ccflags="$@"
-
-# Write go tool cgo -godefs input.
-(
-	echo package unix
-	echo
-	echo '/*'
-	indirect="includes_$(uname)"
-	echo "${!indirect} $includes"
-	echo '*/'
-	echo 'import "C"'
-	echo 'import "syscall"'
-	echo
-	echo 'const ('
-
-	# The gcc command line prints all the #defines
-	# it encounters while processing the input
-	echo "${!indirect} $includes" | $CC -x c - -E -dM $ccflags |
-	awk '
-		$1 != "#define" || $2 ~ /\(/ || $3 == "" {next}
-
-		$2 ~ /^E([ABCD]X|[BIS]P|[SD]I|S|FL)$/ {next}  # 386 registers
-		$2 ~ /^(SIGEV_|SIGSTKSZ|SIGRT(MIN|MAX))/ {next}
-		$2 ~ /^(SCM_SRCRT)$/ {next}
-		$2 ~ /^(MAP_FAILED)$/ {next}
-		$2 ~ /^ELF_.*$/ {next}# <asm/elf.h> contains ELF_ARCH, etc.
-
-		$2 ~ /^EXTATTR_NAMESPACE_NAMES/ ||
-		$2 ~ /^EXTATTR_NAMESPACE_[A-Z]+_STRING/ {next}
-
-		$2 !~ /^ETH_/ &&
-		$2 !~ /^EPROC_/ &&
-		$2 !~ /^EQUIV_/ &&
-		$2 !~ /^EXPR_/ &&
-		$2 ~ /^E[A-Z0-9_]+$/ ||
-		$2 ~ /^B[0-9_]+$/ ||
-		$2 == "BOTHER" ||
-		$2 ~ /^CI?BAUD(EX)?$/ ||
-		$2 == "IBSHIFT" ||
-		$2 ~ /^V[A-Z0-9]+$/ ||
-		$2 ~ /^CS[A-Z0-9]/ ||
-		$2 ~ /^I(SIG|CANON|CRNL|UCLC|EXTEN|MAXBEL|STRIP|UTF8)$/ ||
-		$2 ~ /^IGN/ ||
-		$2 ~ /^IX(ON|ANY|OFF)$/ ||
-		$2 ~ /^IN(LCR|PCK)$/ ||
-		$2 ~ /(^FLU?SH)|(FLU?SH$)/ ||
-		$2 ~ /^C(LOCAL|READ|MSPAR|RTSCTS)$/ ||
-		$2 == "BRKINT" ||
-		$2 == "HUPCL" ||
-		$2 == "PENDIN" ||
-		$2 == "TOSTOP" ||
-		$2 == "XCASE" ||
-		$2 == "ALTWERASE" ||
-		$2 == "NOKERNINFO" ||
-		$2 ~ /^PAR/ ||
-		$2 ~ /^SIG[^_]/ ||
-		$2 ~ /^O[CNPFPL][A-Z]+[^_][A-Z]+$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)DLY$/ ||
-		$2 ~ /^(NL|CR|TAB|BS|VT|FF)[0-9]$/ ||
-		$2 ~ /^O?XTABS$/ ||
-		$2 ~ /^TC[IO](ON|OFF)$/ ||
-		$2 ~ /^IN_/ ||
-		$2 ~ /^LOCK_(SH|EX|NB|UN)$/ ||
-		$2 ~ /^(AF|SOCK|SO|SOL|IPPROTO|IP|IPV6|ICMP6|TCP|EVFILT|NOTE|EV|SHUT|PROT|MAP|PACKET|MSG|SCM|MCL|DT|MADV|PR)_/ ||
-		$2 ~ /^FALLOC_/ ||
-		$2 == "ICMPV6_FILTER" ||
-		$2 == "SOMAXCONN" ||
-		$2 == "NAME_MAX" ||
-		$2 == "IFNAMSIZ" ||
-		$2 ~ /^CTL_(MAXNAME|NET|QUERY)$/ ||
-		$2 ~ /^SYSCTL_VERS/ ||
-		$2 ~ /^(MS|MNT)_/ ||
-		$2 ~ /^TUN(SET|GET|ATTACH|DETACH)/ ||
-		$2 ~ /^(O|F|FD|NAME|S|PTRACE|PT)_/ ||
-		$2 ~ /^LINUX_REBOOT_CMD_/ ||
-		$2 ~ /^LINUX_REBOOT_MAGIC[12]$/ ||
-		$2 !~ "NLA_TYPE_MASK" &&
-		$2 ~ /^(NETLINK|NLM|NLMSG|NLA|IFA|IFAN|RT|RTCF|RTN|RTPROT|RTNH|ARPHRD|ETH_P)_/ ||
-		$2 ~ /^SIOC/ ||
-		$2 ~ /^TIOC/ ||
-		$2 ~ /^TCGET/ ||
-		$2 ~ /^TCSET/ ||
-		$2 ~ /^TC(FLSH|SBRKP?|XONC)$/ ||
-		$2 !~ "RTF_BITS" &&
-		$2 ~ /^(IFF|IFT|NET_RT|RTM|RTF|RTV|RTA|RTAX)_/ ||
-		$2 ~ /^BIOC/ ||
-		$2 ~ /^RUSAGE_(SELF|CHILDREN|THREAD)/ ||
-		$2 ~ /^RLIMIT_(AS|CORE|CPU|DATA|FSIZE|NOFILE|STACK)|RLIM_INFINITY/ ||
-		$2 ~ /^PRIO_(PROCESS|PGRP|USER)/ ||
-		$2 ~ /^CLONE_[A-Z_]+/ ||
-		$2 !~ /^(BPF_TIMEVAL)$/ &&
-		$2 ~ /^(BPF|DLT)_/ ||
-		$2 ~ /^CLOCK_/ ||
-		$2 ~ /^CAN_/ ||
-		$2 ~ /^ALG_/ ||
-		$2 ~ /^GRND_/ ||
-		$2 ~ /^SPLICE_/ ||
-		$2 ~ /^(VM|VMADDR)_/ ||
-		$2 !~ "WMESGLEN" &&
-		$2 ~ /^W[A-Z0-9]+$/ ||
-		$2 ~ /^BLK/ {printf("\t%s = C.%s\n", $2, $2)}
-		$2 ~ /^__WCOREFLAG$/ {next}
-		$2 ~ /^__W[A-Z0-9]+$/ {printf("\t%s = C.%s\n", substr($2,3), $2)}
-
-		{next}
-	' | sort
-
-	echo ')'
-) >_const.go
-
-# Pull out the error names for later.
-errors=$(
-	echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print $2 }' |
-	sort
-)
-
-# Pull out the signal names for later.
-signals=$(
-	echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort
-)
-
-# Again, writing regexps to a file.
-echo '#include <errno.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^E[A-Z0-9_]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	sort >_error.grep
-echo '#include <signal.h>' | $CC -x c - -E -dM $ccflags |
-	awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' |
-	egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' |
-	sort >_signal.grep
-
-echo '// mkerrors.sh' "$@"
-echo '// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT'
-echo
-echo "// +build ${GOARCH},${GOOS}"
-echo
-go tool cgo -godefs -- "$@" _const.go >_error.out
-cat _error.out | grep -vf _error.grep | grep -vf _signal.grep
-echo
-echo '// Errors'
-echo 'const ('
-cat _error.out | grep -f _error.grep | sed 's/=\(.*\)/= syscall.Errno(\1)/'
-echo ')'
-
-echo
-echo '// Signals'
-echo 'const ('
-cat _error.out | grep -f _signal.grep | sed 's/=\(.*\)/= syscall.Signal(\1)/'
-echo ')'
-
-# Run C program to print error and syscall strings.
-(
-	echo -E "
-#include <stdio.h>
-#include <stdlib.h>
-#include <errno.h>
-#include <ctype.h>
-#include <string.h>
-#include <signal.h>
-
-#define nelem(x) (sizeof(x)/sizeof((x)[0]))
-
-enum { A = 'A', Z = 'Z', a = 'a', z = 'z' }; // avoid need for single quotes below
-
-int errors[] = {
-"
-	for i in $errors
-	do
-		echo -E '	'$i,
-	done
-
-	echo -E "
-};
-
-int signals[] = {
-"
-	for i in $signals
-	do
-		echo -E '	'$i,
-	done
-
-	# Use -E because on some systems bash builtin interprets \n itself.
-	echo -E '
-};
-
-static int
-intcmp(const void *a, const void *b)
-{
-	return *(int*)a - *(int*)b;
-}
-
-int
-main(void)
-{
-	int i, j, e;
-	char buf[1024], *p;
-
-	printf("\n\n// Error table\n");
-	printf("var errors = [...]string {\n");
-	qsort(errors, nelem(errors), sizeof errors[0], intcmp);
-	for(i=0; i<nelem(errors); i++) {
-		e = errors[i];
-		if(i > 0 && errors[i-1] == e)
-			continue;
-		strcpy(buf, strerror(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	printf("\n\n// Signal table\n");
-	printf("var signals = [...]string {\n");
-	qsort(signals, nelem(signals), sizeof signals[0], intcmp);
-	for(i=0; i<nelem(signals); i++) {
-		e = signals[i];
-		if(i > 0 && signals[i-1] == e)
-			continue;
-		strcpy(buf, strsignal(e));
-		// lowercase first letter: Bad -> bad, but STREAM -> STREAM.
-		if(A <= buf[0] && buf[0] <= Z && a <= buf[1] && buf[1] <= z)
-			buf[0] += a - A;
-		// cut trailing : number.
-		p = strrchr(buf, ":"[0]);
-		if(p)
-			*p = '\0';
-		printf("\t%d: \"%s\",\n", e, buf);
-	}
-	printf("}\n\n");
-
-	return 0;
-}
-
-'
-) >_errors.c
-
-$CC $ccflags -o _errors _errors.c && $GORUN ./_errors && rm -f _errors.c _errors _const.go _error.grep _signal.grep _error.out
diff --git a/installer/vendor/golang.org/x/sys/unix/mkpost.go b/installer/vendor/golang.org/x/sys/unix/mkpost.go
index ed50d902af..7e5c22c473 100644
--- a/installer/vendor/golang.org/x/sys/unix/mkpost.go
+++ b/installer/vendor/golang.org/x/sys/unix/mkpost.go
@@ -8,10 +8,11 @@
 // modify the generated types. It is used to clean up
 // the sys API in an architecture specific manner.
 //
-// mkpost is run after cgo -godefs by mkall.sh.
+// mkpost is run after cgo -godefs; see README.md.
 package main
 
 import (
+	"bytes"
 	"fmt"
 	"go/format"
 	"io/ioutil"
@@ -21,42 +22,77 @@ import (
 )
 
 func main() {
+	// Get the OS and architecture (using GOARCH_TARGET if it exists)
+	goos := os.Getenv("GOOS")
+	goarch := os.Getenv("GOARCH_TARGET")
+	if goarch == "" {
+		goarch = os.Getenv("GOARCH")
+	}
+	// Check that we are using the new build system if we should be.
+	if goos == "linux" && goarch != "sparc64" {
+		if os.Getenv("GOLANG_SYS_BUILD") != "docker" {
+			os.Stderr.WriteString("In the new build system, mkpost should not be called directly.\n")
+			os.Stderr.WriteString("See README.md\n")
+			os.Exit(1)
+		}
+	}
+
 	b, err := ioutil.ReadAll(os.Stdin)
 	if err != nil {
 		log.Fatal(err)
 	}
-	s := string(b)
 
-	goarch := os.Getenv("GOARCH")
-	goos := os.Getenv("GOOS")
-	if goarch == "s390x" && goos == "linux" {
-		// Export the types of PtraceRegs fields.
-		re := regexp.MustCompile("ptrace(Psw|Fpregs|Per)")
-		s = re.ReplaceAllString(s, "Ptrace$1")
-
-		// Replace padding fields inserted by cgo with blank identifiers.
-		re = regexp.MustCompile("Pad_cgo[A-Za-z0-9_]*")
-		s = re.ReplaceAllString(s, "_")
-
-		// Replace other unwanted fields with blank identifiers.
-		re = regexp.MustCompile("X_[A-Za-z0-9_]*")
-		s = re.ReplaceAllString(s, "_")
-
-		// Replace the control_regs union with a blank identifier for now.
-		re = regexp.MustCompile("(Control_regs)\\s+\\[0\\]uint64")
-		s = re.ReplaceAllString(s, "_ [0]uint64")
-	}
+	// Intentionally export __val fields in Fsid and Sigset_t
+	valRegex := regexp.MustCompile(`type (Fsid|Sigset_t) struct {(\s+)X__val(\s+\S+\s+)}`)
+	b = valRegex.ReplaceAll(b, []byte("type $1 struct {${2}Val$3}"))
+
+	// If we have empty Ptrace structs, we should delete them. Only s390x emits
+	// nonempty Ptrace structs.
+	ptraceRexexp := regexp.MustCompile(`type Ptrace((Psw|Fpregs|Per) struct {\s*})`)
+	b = ptraceRexexp.ReplaceAll(b, nil)
+
+	// Replace the control_regs union with a blank identifier for now.
+	controlRegsRegex := regexp.MustCompile(`(Control_regs)\s+\[0\]uint64`)
+	b = controlRegsRegex.ReplaceAll(b, []byte("_ [0]uint64"))
+
+	// Remove fields that are added by glibc
+	// Note that this is unstable as the identifers are private.
+	removeFieldsRegex := regexp.MustCompile(`X__glibc\S*`)
+	b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Convert [65]int8 to [65]byte in Utsname members to simplify
+	// conversion to string; see golang.org/issue/20753
+	convertUtsnameRegex := regexp.MustCompile(`((Sys|Node|Domain)name|Release|Version|Machine)(\s+)\[(\d+)\]u?int8`)
+	b = convertUtsnameRegex.ReplaceAll(b, []byte("$1$3[$4]byte"))
+
+	// Remove spare fields (e.g. in Statx_t)
+	spareFieldsRegex := regexp.MustCompile(`X__spare\S*`)
+	b = spareFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove cgo padding fields
+	removePaddingFieldsRegex := regexp.MustCompile(`Pad_cgo_\d+`)
+	b = removePaddingFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove padding, hidden, or unused fields
+	removeFieldsRegex = regexp.MustCompile(`\b(X_\S+|Padding)`)
+	b = removeFieldsRegex.ReplaceAll(b, []byte("_"))
+
+	// Remove the first line of warning from cgo
+	b = b[bytes.IndexByte(b, '\n')+1:]
+	// Modify the command in the header to include:
+	//  mkpost, our own warning, and a build tag.
+	replacement := fmt.Sprintf(`$1 | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build %s,%s`, goarch, goos)
+	cgoCommandRegex := regexp.MustCompile(`(cgo -godefs .*)`)
+	b = cgoCommandRegex.ReplaceAll(b, []byte(replacement))
 
 	// gofmt
-	b, err = format.Source([]byte(s))
+	b, err = format.Source(b)
 	if err != nil {
 		log.Fatal(err)
 	}
 
-	// Append this command to the header to show where the new file
-	// came from.
-	re := regexp.MustCompile("(cgo -godefs [a-zA-Z0-9_]+\\.go.*)")
-	b = re.ReplaceAll(b, []byte("$1 | go run mkpost.go"))
-
-	fmt.Printf("%s", b)
+	os.Stdout.Write(b)
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/mksyscall.pl b/installer/vendor/golang.org/x/sys/unix/mksyscall.pl
deleted file mode 100755
index 34f8ef829b..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksyscall.pl
+++ /dev/null
@@ -1,318 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_darwin.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named errno.
-
-# A line beginning with //sysnb is like //sys, except that the
-# goroutine will not be suspended during the execution of the system
-# call.  This must only be used for system calls which can never
-# block, as otherwise the system call could cause all goroutines to
-# hang.
-
-use strict;
-
-my $cmdline = "mksyscall.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $plan9 = 0;
-my $openbsd = 0;
-my $netbsd = 0;
-my $dragonfly = 0;
-my $arm = 0; # 64-bit value should use (even, odd)-pair
-my $tags = "";  # build tags
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-plan9") {
-	$plan9 = 1;
-	shift;
-}
-if($ARGV[0] eq "-openbsd") {
-	$openbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-netbsd") {
-	$netbsd = 1;
-	shift;
-}
-if($ARGV[0] eq "-dragonfly") {
-	$dragonfly = 1;
-	shift;
-}
-if($ARGV[0] eq "-arm") {
-	$arm = 1;
-	shift;
-}
-if($ARGV[0] eq "-tags") {
-	shift;
-	$tags = $ARGV[0];
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $text = "";
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, errno error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*((?i)SYS_[A-Z0-9_]+))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($func, $in, $out, $sysname) = ($2, $3, $4, $5);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# Try in vain to keep people from editing this file.
-	# The theory is that they jump into the middle of the file
-	# without reading the header.
-	$text .= "// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT\n\n";
-
-	# Go function header.
-	my $out_decl = @out ? sprintf(" (%s)", join(', ', @out)) : "";
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out_decl;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, $errvar = BytePtrFromString($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n *byte\n";
-			$text .= "\t_p$n, _ = BytePtrFromString($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass dummy pointer in that case.
-			# Used to pass nil, but some OSes or simulators reject write(fd, nil, 0).
-			$text .= "\tvar _p$n unsafe.Pointer\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = unsafe.Pointer(\&${name}[0])\n\t}";
-			$text .= " else {\n\t\t_p$n = unsafe.Pointer(&_zero)\n\t}";
-			$text .= "\n";
-			push @args, "uintptr(_p$n)", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && ($openbsd || $netbsd)) {
-			push @args, "0";
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $dragonfly) {
-			if ($func !~ /^extp(read|write)/i) {
-				push @args, "0";
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} elsif($_32bit eq "little-endian") {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			} else {
-				push @args, "uintptr($name)";
-			}
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if(@args % 2 && $arm) {
-				# arm abi specifies 64-bit argument uses
-				# (even, odd) pair
-				push @args, "0"
-			}
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name>>32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name>>32)";
-			}
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "Syscall";
-	if ($nonblock) {
-		$asm = "RawSyscall";
-	}
-	if(@args <= 3) {
-		while(@args < 3) {
-			push @args, "0";
-		}
-	} elsif(@args <= 6) {
-		$asm .= "6";
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} elsif(@args <= 9) {
-		$asm .= "9";
-		while(@args < 9) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# System call number.
-	if($sysname eq "") {
-		$sysname = "SYS_$func";
-		$sysname =~ s/([a-z])([A-Z])/${1}_$2/g;	# turn FooBar into Foo_Bar
-		$sysname =~ y/a-z/A-Z/;
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm($sysname, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my @ret = ("_", "_", "_");
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err" && !$plan9) {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} elsif($name eq "err" && $plan9) {
-			$ret[0] = "r0";
-			$ret[2] = "e1";
-			next;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1" || $plan9) {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	$text .= $body;
-
-	if ($plan9 && $ret[2] eq "e1") {
-		$text .= "\tif int32(r0) == -1 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	} elsif ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = errnoErr(e1)\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n\n";
-}
-
-chomp $text;
-chomp $text;
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build $tags
-
-package unix
-
-import (
-	"syscall"
-	"unsafe"
-)
-
-var _ syscall.Errno
-
-$text
-EOF
-exit 0;
diff --git a/installer/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl b/installer/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
deleted file mode 100755
index 939c8a7915..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksyscall_solaris.pl
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This program reads a file containing function prototypes
-# (like syscall_solaris.go) and generates system call bodies.
-# The prototypes are marked by lines beginning with "//sys"
-# and read like func declarations if //sys is replaced by func, but:
-#	* The parameter lists must give a name for each argument.
-#	  This includes return parameters.
-#	* The parameter lists must give a type for each argument:
-#	  the (x, y, z int) shorthand is not allowed.
-#	* If the return parameter is an error number, it must be named err.
-#	* If go func name needs to be different than its libc name,
-#	* or the function is not in libc, name could be specified
-#	* at the end, after "=" sign, like
-#	  //sys getsockopt(s int, level int, name int, val uintptr, vallen *_Socklen) (err error) = libsocket.getsockopt
-
-use strict;
-
-my $cmdline = "mksyscall_solaris.pl " . join(' ', @ARGV);
-my $errors = 0;
-my $_32bit = "";
-my $tags = "";  # build tags
-
-binmode STDOUT;
-
-if($ARGV[0] eq "-b32") {
-	$_32bit = "big-endian";
-	shift;
-} elsif($ARGV[0] eq "-l32") {
-	$_32bit = "little-endian";
-	shift;
-}
-if($ARGV[0] eq "-tags") {
-	shift;
-	$tags = $ARGV[0];
-	shift;
-}
-
-if($ARGV[0] =~ /^-/) {
-	print STDERR "usage: mksyscall_solaris.pl [-b32 | -l32] [-tags x,y] [file ...]\n";
-	exit 1;
-}
-
-sub parseparamlist($) {
-	my ($list) = @_;
-	$list =~ s/^\s*//;
-	$list =~ s/\s*$//;
-	if($list eq "") {
-		return ();
-	}
-	return split(/\s*,\s*/, $list);
-}
-
-sub parseparam($) {
-	my ($p) = @_;
-	if($p !~ /^(\S*) (\S*)$/) {
-		print STDERR "$ARGV:$.: malformed parameter: $p\n";
-		$errors = 1;
-		return ("xx", "int");
-	}
-	return ($1, $2);
-}
-
-my $package = "";
-my $text = "";
-my $dynimports = "";
-my $linknames = "";
-my @vars = ();
-while(<>) {
-	chomp;
-	s/\s+/ /g;
-	s/^\s+//;
-	s/\s+$//;
-	$package = $1 if !$package && /^package (\S+)$/;
-	my $nonblock = /^\/\/sysnb /;
-	next if !/^\/\/sys / && !$nonblock;
-
-	# Line must be of the form
-	#	func Open(path string, mode int, perm int) (fd int, err error)
-	# Split into name, in params, out params.
-	if(!/^\/\/sys(nb)? (\w+)\(([^()]*)\)\s*(?:\(([^()]+)\))?\s*(?:=\s*(?:(\w*)\.)?(\w*))?$/) {
-		print STDERR "$ARGV:$.: malformed //sys declaration\n";
-		$errors = 1;
-		next;
-	}
-	my ($nb, $func, $in, $out, $modname, $sysname) = ($1, $2, $3, $4, $5, $6);
-
-	# Split argument lists on comma.
-	my @in = parseparamlist($in);
-	my @out = parseparamlist($out);
-
-	# So file name.
-	if($modname eq "") {
-		$modname = "libc";
-	}
-
-	# System call name.
-	if($sysname eq "") {
-		$sysname = "$func";
-	}
-
-	# System call pointer variable name.
-	my $sysvarname = "proc$sysname";
-
-	my $strconvfunc = "BytePtrFromString";
-	my $strconvtype = "*byte";
-
-	$sysname =~ y/A-Z/a-z/; # All libc functions are lowercase.
-
-	# Runtime import of function to allow cross-platform builds.
-	$dynimports .= "//go:cgo_import_dynamic libc_${sysname} ${sysname} \"$modname.so\"\n";
-	# Link symbol to proc address variable.
-	$linknames .= "//go:linkname ${sysvarname} libc_${sysname}\n";
-	# Library proc address variable.
-	push @vars, $sysvarname;
-
-	# Go function header.
-	$out = join(', ', @out);
-	if($out ne "") {
-		$out = " ($out)";
-	}
-	if($text ne "") {
-		$text .= "\n"
-	}
-	$text .= sprintf "func %s(%s)%s {\n", $func, join(', ', @in), $out;
-
-	# Check if err return available
-	my $errvar = "";
-	foreach my $p (@out) {
-		my ($name, $type) = parseparam($p);
-		if($type eq "error") {
-			$errvar = $name;
-			last;
-		}
-	}
-
-	# Prepare arguments to Syscall.
-	my @args = ();
-	my $n = 0;
-	foreach my $p (@in) {
-		my ($name, $type) = parseparam($p);
-		if($type =~ /^\*/) {
-			push @args, "uintptr(unsafe.Pointer($name))";
-		} elsif($type eq "string" && $errvar ne "") {
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, $errvar = $strconvfunc($name)\n";
-			$text .= "\tif $errvar != nil {\n\t\treturn\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type eq "string") {
-			print STDERR "$ARGV:$.: $func uses string arguments, but has no error return\n";
-			$text .= "\tvar _p$n $strconvtype\n";
-			$text .= "\t_p$n, _ = $strconvfunc($name)\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))";
-			$n++;
-		} elsif($type =~ /^\[\](.*)/) {
-			# Convert slice into pointer, length.
-			# Have to be careful not to take address of &a[0] if len == 0:
-			# pass nil in that case.
-			$text .= "\tvar _p$n *$1\n";
-			$text .= "\tif len($name) > 0 {\n\t\t_p$n = \&$name\[0]\n\t}\n";
-			push @args, "uintptr(unsafe.Pointer(_p$n))", "uintptr(len($name))";
-			$n++;
-		} elsif($type eq "int64" && $_32bit ne "") {
-			if($_32bit eq "big-endian") {
-				push @args, "uintptr($name >> 32)", "uintptr($name)";
-			} else {
-				push @args, "uintptr($name)", "uintptr($name >> 32)";
-			}
-		} elsif($type eq "bool") {
- 			$text .= "\tvar _p$n uint32\n";
-			$text .= "\tif $name {\n\t\t_p$n = 1\n\t} else {\n\t\t_p$n = 0\n\t}\n";
-			push @args, "uintptr(_p$n)";
-			$n++;
-		} else {
-			push @args, "uintptr($name)";
-		}
-	}
-	my $nargs = @args;
-
-	# Determine which form to use; pad args with zeros.
-	my $asm = "sysvicall6";
-	if ($nonblock) {
-		$asm = "rawSysvicall6";
-	}
-	if(@args <= 6) {
-		while(@args < 6) {
-			push @args, "0";
-		}
-	} else {
-		print STDERR "$ARGV:$.: too many arguments to system call\n";
-	}
-
-	# Actual call.
-	my $args = join(', ', @args);
-	my $call = "$asm(uintptr(unsafe.Pointer(&$sysvarname)), $nargs, $args)";
-
-	# Assign return values.
-	my $body = "";
-	my $failexpr = "";
-	my @ret = ("_", "_", "_");
-	my @pout= ();
-	my $do_errno = 0;
-	for(my $i=0; $i<@out; $i++) {
-		my $p = $out[$i];
-		my ($name, $type) = parseparam($p);
-		my $reg = "";
-		if($name eq "err") {
-			$reg = "e1";
-			$ret[2] = $reg;
-			$do_errno = 1;
-		} else {
-			$reg = sprintf("r%d", $i);
-			$ret[$i] = $reg;
-		}
-		if($type eq "bool") {
-			$reg = "$reg != 0";
-		}
-		if($type eq "int64" && $_32bit ne "") {
-			# 64-bit number in r1:r0 or r0:r1.
-			if($i+2 > @out) {
-				print STDERR "$ARGV:$.: not enough registers for int64 return\n";
-			}
-			if($_32bit eq "big-endian") {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i, $i+1);
-			} else {
-				$reg = sprintf("int64(r%d)<<32 | int64(r%d)", $i+1, $i);
-			}
-			$ret[$i] = sprintf("r%d", $i);
-			$ret[$i+1] = sprintf("r%d", $i+1);
-		}
-		if($reg ne "e1") {
-			$body .= "\t$name = $type($reg)\n";
-		}
-	}
-	if ($ret[0] eq "_" && $ret[1] eq "_" && $ret[2] eq "_") {
-		$text .= "\t$call\n";
-	} else {
-		$text .= "\t$ret[0], $ret[1], $ret[2] := $call\n";
-	}
-	$text .= $body;
-
-	if ($do_errno) {
-		$text .= "\tif e1 != 0 {\n";
-		$text .= "\t\terr = e1\n";
-		$text .= "\t}\n";
-	}
-	$text .= "\treturn\n";
-	$text .= "}\n";
-}
-
-if($errors) {
-	exit 1;
-}
-
-print <<EOF;
-// $cmdline
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
-
-// +build $tags
-
-package $package
-
-import (
-	"syscall"
-	"unsafe"
-)
-EOF
-
-print "import \"golang.org/x/sys/unix\"\n" if $package ne "unix";
-
-my $vardecls = "\t" . join(",\n\t", @vars);
-$vardecls .= " syscallFunc";
-
-chomp($_=<<EOF);
-
-$dynimports
-$linknames
-var (
-$vardecls
-)
-
-$text
-EOF
-print $_;
-exit 0;
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl b/installer/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
deleted file mode 100755
index be67afa417..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysctl_openbsd.pl
+++ /dev/null
@@ -1,264 +0,0 @@
-#!/usr/bin/env perl
-
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-#
-# Parse the header files for OpenBSD and generate a Go usable sysctl MIB.
-#
-# Build a MIB with each entry being an array containing the level, type and
-# a hash that will contain additional entries if the current entry is a node.
-# We then walk this MIB and create a flattened sysctl name to OID hash.
-#
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $debug = 0;
-my %ctls = ();
-
-my @headers = qw (
-	sys/sysctl.h
-	sys/socket.h
-	sys/tty.h
-	sys/malloc.h
-	sys/mount.h
-	sys/namei.h
-	sys/sem.h
-	sys/shm.h
-	sys/vmmeter.h
-	uvm/uvm_param.h
-	uvm/uvm_swap_encrypt.h
-	ddb/db_var.h
-	net/if.h
-	net/if_pfsync.h
-	net/pipex.h
-	netinet/in.h
-	netinet/icmp_var.h
-	netinet/igmp_var.h
-	netinet/ip_ah.h
-	netinet/ip_carp.h
-	netinet/ip_divert.h
-	netinet/ip_esp.h
-	netinet/ip_ether.h
-	netinet/ip_gre.h
-	netinet/ip_ipcomp.h
-	netinet/ip_ipip.h
-	netinet/pim_var.h
-	netinet/tcp_var.h
-	netinet/udp_var.h
-	netinet6/in6.h
-	netinet6/ip6_divert.h
-	netinet6/pim6_var.h
-	netinet/icmp6.h
-	netmpls/mpls.h
-);
-
-my @ctls = qw (
-	kern
-	vm
-	fs
-	net
-	#debug				# Special handling required
-	hw
-	#machdep			# Arch specific
-	user
-	ddb
-	#vfs				# Special handling required
-	fs.posix
-	kern.forkstat
-	kern.intrcnt
-	kern.malloc
-	kern.nchstats
-	kern.seminfo
-	kern.shminfo
-	kern.timecounter
-	kern.tty
-	kern.watchdog
-	net.bpf
-	net.ifq
-	net.inet
-	net.inet.ah
-	net.inet.carp
-	net.inet.divert
-	net.inet.esp
-	net.inet.etherip
-	net.inet.gre
-	net.inet.icmp
-	net.inet.igmp
-	net.inet.ip
-	net.inet.ip.ifq
-	net.inet.ipcomp
-	net.inet.ipip
-	net.inet.mobileip
-	net.inet.pfsync
-	net.inet.pim
-	net.inet.tcp
-	net.inet.udp
-	net.inet6
-	net.inet6.divert
-	net.inet6.ip6
-	net.inet6.icmp6
-	net.inet6.pim6
-	net.inet6.tcp6
-	net.inet6.udp6
-	net.mpls
-	net.mpls.ifq
-	net.key
-	net.pflow
-	net.pfsync
-	net.pipex
-	net.rt
-	vm.swapencrypt
-	#vfsgenctl			# Special handling required
-);
-
-# Node name "fixups"
-my %ctl_map = (
-	"ipproto" => "net.inet",
-	"net.inet.ipproto" => "net.inet",
-	"net.inet6.ipv6proto" => "net.inet6",
-	"net.inet6.ipv6" => "net.inet6.ip6",
-	"net.inet.icmpv6" => "net.inet6.icmp6",
-	"net.inet6.divert6" => "net.inet6.divert",
-	"net.inet6.tcp6" => "net.inet.tcp",
-	"net.inet6.udp6" => "net.inet.udp",
-	"mpls" => "net.mpls",
-	"swpenc" => "vm.swapencrypt"
-);
-
-# Node mappings
-my %node_map = (
-	"net.inet.ip.ifq" => "net.ifq",
-	"net.inet.pfsync" => "net.pfsync",
-	"net.mpls.ifq" => "net.ifq"
-);
-
-my $ctlname;
-my %mib = ();
-my %sysctl = ();
-my $node;
-
-sub debug() {
-	print STDERR "$_[0]\n" if $debug;
-}
-
-# Walk the MIB and build a sysctl name to OID mapping.
-sub build_sysctl() {
-	my ($node, $name, $oid) = @_;
-	my %node = %{$node};
-	my @oid = @{$oid};
-
-	foreach my $key (sort keys %node) {
-		my @node = @{$node{$key}};
-		my $nodename = $name.($name ne '' ? '.' : '').$key;
-		my @nodeoid = (@oid, $node[0]);
-		if ($node[1] eq 'CTLTYPE_NODE') {
-			if (exists $node_map{$nodename}) {
-				$node = \%mib;
-				$ctlname = $node_map{$nodename};
-				foreach my $part (split /\./, $ctlname) {
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			} else {
-				$node = $node[2];
-			}
-			&build_sysctl($node, $nodename, \@nodeoid);
-		} elsif ($node[1] ne '') {
-			$sysctl{$nodename} = \@nodeoid;
-		}
-	}
-}
-
-foreach my $ctl (@ctls) {
-	$ctls{$ctl} = $ctl;
-}
-
-# Build MIB
-foreach my $header (@headers) {
-	&debug("Processing $header...");
-	open HEADER, "/usr/include/$header" ||
-	    print STDERR "Failed to open $header\n";
-	while (<HEADER>) {
-		if ($_ =~ /^#define\s+(CTL_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+(CTL_(.*)_NAMES)\s+{/ ||
-		    $_ =~ /^#define\s+((.*)CTL_NAMES)\s+{/) {
-			if ($1 eq 'CTL_NAMES') {
-				# Top level.
-				$node = \%mib;
-			} else {
-				# Node.
-				my $nodename = lc($2);
-				if ($header =~ /^netinet\//) {
-					$ctlname = "net.inet.$nodename";
-				} elsif ($header =~ /^netinet6\//) {
-					$ctlname = "net.inet6.$nodename";
-				} elsif ($header =~ /^net\//) {
-					$ctlname = "net.$nodename";
-				} else {
-					$ctlname = "$nodename";
-					$ctlname =~ s/^(fs|net|kern)_/$1\./;
-				}
-				if (exists $ctl_map{$ctlname}) {
-					$ctlname = $ctl_map{$ctlname};
-				}
-				if (not exists $ctls{$ctlname}) {
-					&debug("Ignoring $ctlname...");
-					next;
-				}
-
-				# Walk down from the top of the MIB.
-				$node = \%mib;
-				foreach my $part (split /\./, $ctlname) {
-					if (not exists $$node{$part}) {
-						&debug("Missing node $part");
-						$$node{$part} = [ 0, '', {} ];
-					}
-					$node = \%{@{$$node{$part}}[2]};
-				}
-			}
-
-			# Populate current node with entries.
-			my $i = -1;
-			while (defined($_) && $_ !~ /^}/) {
-				$_ = <HEADER>;
-				$i++ if $_ =~ /{.*}/;
-				next if $_ !~ /{\s+"(\w+)",\s+(CTLTYPE_[A-Z]+)\s+}/;
-				$$node{$1} = [ $i, $2, {} ];
-			}
-		}
-	}
-	close HEADER;
-}
-
-&build_sysctl(\%mib, "", []);
-
-print <<EOF;
-// mksysctl_openbsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix;
-
-type mibentry struct {
-	ctlname string
-	ctloid []_C_int
-}
-
-var sysctlMib = []mibentry {
-EOF
-
-foreach my $name (sort keys %sysctl) {
-	my @oid = @{$sysctl{$name}};
-	print "\t{ \"$name\", []_C_int{ ", join(', ', @oid), " } }, \n";
-}
-
-print <<EOF;
-}
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
deleted file mode 100755
index d3e5147fcb..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_darwin.pl
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for Darwin from sys/syscall.h
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_darwin.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^#define\s+SYS_(\w+)\s+([0-9]+)/){
-		my $name = $1;
-		my $num = $2;
-		$name =~ y/a-z/A-Z/;
-		print "	SYS_$name = $num;"
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
deleted file mode 100755
index 266a248c75..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_dragonfly.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for DragonFly from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_dragonfly.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
deleted file mode 100755
index b767e124cc..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_freebsd.pl
+++ /dev/null
@@ -1,63 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for FreeBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_freebsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+\S+\s+STD\s+({ \S+\s+(\w+).*)$/){
-		my $num = $1;
-		my $proto = $2;
-		my $name = "SYS_$3";
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-		if($name =~ /^SYS_CAP_+/ || $name =~ /^SYS___CAP_+/){
-			next
-		}
-
-		print "	$name = $num;  // $proto\n";
-
-		# We keep Capsicum syscall numbers for FreeBSD
-		# 9-STABLE here because we are not sure whether they
-		# are mature and stable.
-		if($num == 513){
-			print " SYS_CAP_NEW = 514 // { int cap_new(int fd, uint64_t rights); }\n";
-			print " SYS_CAP_GETRIGHTS = 515 // { int cap_getrights(int fd, \\\n";
-			print " SYS_CAP_ENTER = 516 // { int cap_enter(void); }\n";
-			print " SYS_CAP_GETMODE = 517 // { int cap_getmode(u_int *modep); }\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_linux.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_linux.pl
deleted file mode 100755
index 872ae8c520..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_linux.pl
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_linux.pl ". join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const(
-EOF
-
-my $offset = 0;
-
-sub fmt {
-	my ($name, $num) = @_;
-	if($num > 999){
-		# ignore deprecated syscalls that are no longer implemented
-		# https://git.kernel.org/cgit/linux/kernel/git/torvalds/linux.git/tree/include/uapi/asm-generic/unistd.h?id=refs/heads/master#n716
-		return;
-	}
-	$name =~ y/a-z/A-Z/;
-	$num = $num + $offset;
-	print "	SYS_$name = $num;\n";
-}
-
-my $prev;
-open(GCC, "gcc -E -dD @ARGV |") || die "can't run gcc";
-while(<GCC>){
-	if(/^#define __NR_Linux\s+([0-9]+)/){
-		# mips/mips64: extract offset
-		$offset = $1;
-	}
-	elsif(/^#define __NR(\w*)_SYSCALL_BASE\s+([0-9]+)/){
-		# arm: extract offset
-		$offset = $1;
-	}
-	elsif(/^#define __NR_syscalls\s+/) {
-		# ignore redefinitions of __NR_syscalls
-	}
-	elsif(/^#define __NR_(\w*)Linux_syscalls\s+/) {
-		# mips/mips64: ignore definitions about the number of syscalls
-	}
-	elsif(/^#define __NR_(\w+)\s+([0-9]+)/){
-		$prev = $2;
-		fmt($1, $2);
-	}
-	elsif(/^#define __NR3264_(\w+)\s+([0-9]+)/){
-		$prev = $2;
-		fmt($1, $2);
-	}
-	elsif(/^#define __NR_(\w+)\s+\(\w+\+\s*([0-9]+)\)/){
-		fmt($1, $prev+$2)
-	}
-	elsif(/^#define __NR_(\w+)\s+\(__NR_Linux \+ ([0-9]+)/){
-		fmt($1, $2);
-	}
-	elsif(/^#define __NR_(\w+)\s+\(__NR_SYSCALL_BASE \+ ([0-9]+)/){
-		fmt($1, $2);
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
deleted file mode 100755
index e74616a65a..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_netbsd.pl
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_netbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-my $line = '';
-while(<>){
-	if($line =~ /^(.*)\\$/) {
-		# Handle continuation
-		$line = $1;
-		$_ =~ s/^\s+//;
-		$line .= $_;
-	} else {
-		# New line
-		$line = $_;
-	}
-	next if $line =~ /\\$/;
-	if($line =~ /^([0-9]+)\s+((STD)|(NOERR))\s+(RUMP\s+)?({\s+\S+\s*\*?\s*\|(\S+)\|(\S*)\|(\w+).*\s+})(\s+(\S+))?$/) {
-		my $num = $1;
-		my $proto = $6;
-		my $compat = $8;
-		my $name = "$7_$9";
-
-		$name = "$7_$11" if $11 ne '';
-		$name =~ y/a-z/A-Z/;
-
-		if($compat eq '' || $compat eq '30' || $compat eq '50') {
-			print "	$name = $num;  // $proto\n";
-		}
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl b/installer/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
deleted file mode 100755
index ae5aad5866..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mksysnum_openbsd.pl
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Copyright 2009 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-#
-# Generate system call table for OpenBSD from master list
-# (for example, /usr/src/sys/kern/syscalls.master).
-
-use strict;
-
-if($ENV{'GOARCH'} eq "" || $ENV{'GOOS'} eq "") {
-	print STDERR "GOARCH or GOOS not defined in environment\n";
-	exit 1;
-}
-
-my $command = "mksysnum_openbsd.pl " . join(' ', @ARGV);
-
-print <<EOF;
-// $command
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
-
-// +build $ENV{'GOARCH'},$ENV{'GOOS'}
-
-package unix
-
-const (
-EOF
-
-while(<>){
-	if(/^([0-9]+)\s+STD\s+(NOLOCK\s+)?({ \S+\s+\*?(\w+).*)$/){
-		my $num = $1;
-		my $proto = $3;
-		my $name = $4;
-		$name =~ y/a-z/A-Z/;
-
-		# There are multiple entries for enosys and nosys, so comment them out.
-		if($name =~ /^SYS_E?NOSYS$/){
-			$name = "// $name";
-		}
-		if($name eq 'SYS_SYS_EXIT'){
-			$name = 'SYS_EXIT';
-		}
-
-		print "	$name = $num;  // $proto\n";
-	}
-}
-
-print <<EOF;
-)
-EOF
diff --git a/installer/vendor/golang.org/x/sys/unix/mmap_unix_test.go b/installer/vendor/golang.org/x/sys/unix/mmap_unix_test.go
deleted file mode 100644
index 18ccec05f1..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/mmap_unix_test.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestMmap(t *testing.T) {
-	b, err := unix.Mmap(-1, 0, unix.Getpagesize(), unix.PROT_NONE, unix.MAP_ANON|unix.MAP_PRIVATE)
-	if err != nil {
-		t.Fatalf("Mmap: %v", err)
-	}
-	if err := unix.Munmap(b); err != nil {
-		t.Fatalf("Munmap: %v", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/openbsd_pledge.go b/installer/vendor/golang.org/x/sys/unix/openbsd_pledge.go
new file mode 100644
index 0000000000..db4f72ea9c
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/openbsd_pledge.go
@@ -0,0 +1,38 @@
+// Copyright 2016 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build openbsd
+// +build 386 amd64 arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+const (
+	SYS_PLEDGE = 108
+)
+
+// Pledge implements the pledge syscall. For more information see pledge(2).
+func Pledge(promises string, paths []string) error {
+	promisesPtr, err := syscall.BytePtrFromString(promises)
+	if err != nil {
+		return err
+	}
+	promisesUnsafe, pathsUnsafe := unsafe.Pointer(promisesPtr), unsafe.Pointer(nil)
+	if paths != nil {
+		var pathsPtr []*byte
+		if pathsPtr, err = syscall.SlicePtrFromStrings(paths); err != nil {
+			return err
+		}
+		pathsUnsafe = unsafe.Pointer(&pathsPtr[0])
+	}
+	_, _, e := syscall.Syscall(SYS_PLEDGE, uintptr(promisesUnsafe), uintptr(pathsUnsafe), 0)
+	if e != 0 {
+		return e
+	}
+	return nil
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/pagesize_unix.go b/installer/vendor/golang.org/x/sys/unix/pagesize_unix.go
new file mode 100644
index 0000000000..83c85e0196
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/pagesize_unix.go
@@ -0,0 +1,15 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+// For Unix, get the pagesize from the runtime.
+
+package unix
+
+import "syscall"
+
+func Getpagesize() int {
+	return syscall.Getpagesize()
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/race.go b/installer/vendor/golang.org/x/sys/unix/race.go
index 3c7627eb5c..61712b51c9 100644
--- a/installer/vendor/golang.org/x/sys/unix/race.go
+++ b/installer/vendor/golang.org/x/sys/unix/race.go
@@ -1,4 +1,4 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/unix/race0.go b/installer/vendor/golang.org/x/sys/unix/race0.go
index f8678e0d21..dd0820431e 100644
--- a/installer/vendor/golang.org/x/sys/unix/race0.go
+++ b/installer/vendor/golang.org/x/sys/unix/race0.go
@@ -1,4 +1,4 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/unix/sockcmsg_linux.go b/installer/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
index d9ff4731a2..6079eb4ac1 100644
--- a/installer/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
+++ b/installer/vendor/golang.org/x/sys/unix/sockcmsg_linux.go
@@ -1,4 +1,4 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
+// Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/unix/sockcmsg_unix.go b/installer/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
index f1493a3e6f..bb756ece15 100644
--- a/installer/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
+++ b/installer/vendor/golang.org/x/sys/unix/sockcmsg_unix.go
@@ -1,4 +1,4 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
+// Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -13,9 +13,10 @@ import "unsafe"
 // Round the length of a raw sockaddr up to align it properly.
 func cmsgAlignOf(salen int) int {
 	salign := sizeofPtr
-	// NOTE: It seems like 64-bit Darwin and DragonFly BSD kernels
-	// still require 32-bit aligned access to network subsystem.
-	if darwin64Bit || dragonfly64Bit {
+	// NOTE: It seems like 64-bit Darwin, DragonFly BSD and
+	// Solaris kernels still require 32-bit aligned access to
+	// network subsystem.
+	if darwin64Bit || dragonfly64Bit || solaris64Bit {
 		salign = 4
 	}
 	return (salen + salign - 1) & ^(salign - 1)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall.go b/installer/vendor/golang.org/x/sys/unix/syscall.go
index 85e35020e2..ef35fce804 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall.go
@@ -5,30 +5,33 @@
 // +build darwin dragonfly freebsd linux netbsd openbsd solaris
 
 // Package unix contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
+// primitives. OS details vary depending on the underlying system, and
 // by default, godoc will display OS-specific documentation for the current
-// system.  If you want godoc to display OS documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
+// system. If you want godoc to display OS documentation for another
+// system, set $GOOS and $GOARCH to the desired system. For example, if
 // you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
 // to freebsd and $GOARCH to arm.
+//
 // The primary use of this package is inside other packages that provide a more
 // portable interface to the system, such as "os", "time" and "net".  Use
 // those packages rather than this one if you can.
+//
 // For details of the functions and data types in this package consult
 // the manuals for the appropriate operating system.
+//
 // These calls return err == nil to indicate success; otherwise
 // err represents an operating system error describing the failure and
 // holds a value of type syscall.Errno.
 package unix // import "golang.org/x/sys/unix"
 
+import "strings"
+
 // ByteSliceFromString returns a NUL-terminated slice of bytes
 // containing the text of s. If s contains a NUL byte at any
 // location, it returns (nil, EINVAL).
 func ByteSliceFromString(s string) ([]byte, error) {
-	for i := 0; i < len(s); i++ {
-		if s[i] == 0 {
-			return nil, EINVAL
-		}
+	if strings.IndexByte(s, 0) != -1 {
+		return nil, EINVAL
 	}
 	a := make([]byte, len(s)+1)
 	copy(a, s)
@@ -49,21 +52,3 @@ func BytePtrFromString(s string) (*byte, error) {
 // Single-word zero for use when we need a valid pointer to 0 bytes.
 // See mkunix.pl.
 var _zero uintptr
-
-func (ts *Timespec) Unix() (sec int64, nsec int64) {
-	return int64(ts.Sec), int64(ts.Nsec)
-}
-
-func (tv *Timeval) Unix() (sec int64, nsec int64) {
-	return int64(tv.Sec), int64(tv.Usec) * 1000
-}
-
-func (ts *Timespec) Nano() int64 {
-	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
-}
-
-func (tv *Timeval) Nano() int64 {
-	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
-}
-
-func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_bsd.go b/installer/vendor/golang.org/x/sys/unix/syscall_bsd.go
index ccb29c75c4..53fb851823 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_bsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_bsd.go
@@ -34,7 +34,7 @@ func Getgroups() (gids []int, err error) {
 		return nil, nil
 	}
 
-	// Sanity check group count.  Max is 16 on BSD.
+	// Sanity check group count. Max is 16 on BSD.
 	if n < 0 || n > 1000 {
 		return nil, EINVAL
 	}
@@ -311,45 +311,16 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 
 //sysnb socketpair(domain int, typ int, proto int, fd *[2]int32) (err error)
 
-func GetsockoptByte(fd, level, opt int) (value byte, err error) {
-	var n byte
-	vallen := _Socklen(1)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
-	return n, err
-}
-
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		return "", err
+	}
+	return string(buf[:vallen-1]), nil
 }
 
 //sys   recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error)
@@ -561,13 +532,24 @@ func Utimes(path string, tv []Timeval) error {
 
 func UtimesNano(path string, ts []Timespec) error {
 	if ts == nil {
+		err := utimensat(AT_FDCWD, path, nil, 0)
+		if err != ENOSYS {
+			return err
+		}
 		return utimes(path, nil)
 	}
-	// TODO: The BSDs can do utimensat with SYS_UTIMENSAT but it
-	// isn't supported by darwin so this uses utimes instead
 	if len(ts) != 2 {
 		return EINVAL
 	}
+	// Darwin setattrlist can set nanosecond timestamps
+	err := setattrlistTimes(path, ts, 0)
+	if err != ENOSYS {
+		return err
+	}
+	err = utimensat(AT_FDCWD, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), 0)
+	if err != ENOSYS {
+		return err
+	}
 	// Not as efficient as it could be because Timespec and
 	// Timeval have different types in the different OSes
 	tv := [2]Timeval{
@@ -577,6 +559,20 @@ func UtimesNano(path string, ts []Timespec) error {
 	return utimes(path, (*[2]Timeval)(unsafe.Pointer(&tv[0])))
 }
 
+func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
+	if ts == nil {
+		return utimensat(dirfd, path, nil, flags)
+	}
+	if len(ts) != 2 {
+		return EINVAL
+	}
+	err := setattrlistTimes(path, ts, flags)
+	if err != ENOSYS {
+		return err
+	}
+	return utimensat(dirfd, path, (*[2]Timespec)(unsafe.Pointer(&ts[0])), flags)
+}
+
 //sys	futimes(fd int, timeval *[2]Timeval) (err error)
 
 func Futimes(fd int, tv []Timeval) error {
@@ -591,12 +587,18 @@ func Futimes(fd int, tv []Timeval) error {
 
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 
+//sys   poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 // TODO: wrap
 //	Acct(name nil-string) (err error)
 //	Gethostuuid(uuid *byte, timeout *Timespec) (err error)
-//	Madvise(addr *byte, len int, behav int) (err error)
-//	Mprotect(addr *byte, len int, prot int) (err error)
-//	Msync(addr *byte, len int, flags int) (err error)
 //	Ptrace(req int, pid int, addr uintptr, data int) (ret uintptr, err error)
 
 var mapper = &mmapper{
@@ -612,3 +614,11 @@ func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, e
 func Munmap(b []byte) (err error) {
 	return mapper.Munmap(b)
 }
+
+//sys	Madvise(b []byte, behav int) (err error)
+//sys	Mlock(b []byte) (err error)
+//sys	Mlockall(flags int) (err error)
+//sys	Mprotect(b []byte, prot int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
+//sys	Munlock(b []byte) (err error)
+//sys	Munlockall() (err error)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_bsd_test.go b/installer/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
deleted file mode 100644
index d8085a0729..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_bsd_test.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd openbsd
-
-package unix_test
-
-import (
-	"os/exec"
-	"runtime"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-const MNT_WAIT = 1
-const MNT_NOWAIT = 2
-
-func TestGetfsstat(t *testing.T) {
-	const flags = MNT_NOWAIT // see golang.org/issue/16937
-	n, err := unix.Getfsstat(nil, flags)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	data := make([]unix.Statfs_t, n)
-	n2, err := unix.Getfsstat(data, flags)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if n != n2 {
-		t.Errorf("Getfsstat(nil) = %d, but subsequent Getfsstat(slice) = %d", n, n2)
-	}
-	for i, stat := range data {
-		if stat == (unix.Statfs_t{}) {
-			t.Errorf("index %v is an empty Statfs_t struct", i)
-		}
-	}
-	if t.Failed() {
-		for i, stat := range data[:n2] {
-			t.Logf("data[%v] = %+v", i, stat)
-		}
-		mount, err := exec.Command("mount").CombinedOutput()
-		if err != nil {
-			t.Logf("mount: %v\n%s", err, mount)
-		} else {
-			t.Logf("mount: %s", mount)
-		}
-	}
-}
-
-func TestSysctlRaw(t *testing.T) {
-	if runtime.GOOS == "openbsd" {
-		t.Skip("kern.proc.pid does not exist on OpenBSD")
-	}
-
-	_, err := unix.SysctlRaw("kern.proc.pid", unix.Getpid())
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_darwin.go b/installer/vendor/golang.org/x/sys/unix/syscall_darwin.go
index 0d1771c3fc..693be791cf 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_darwin.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_darwin.go
@@ -13,7 +13,7 @@
 package unix
 
 import (
-	errorspkg "errors"
+	"errors"
 	"syscall"
 	"unsafe"
 )
@@ -36,6 +36,7 @@ func Getwd() (string, error) {
 	return "", ENOTSUP
 }
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
 	Family uint8
@@ -54,7 +55,7 @@ func nametomib(name string) (mib []_C_int, err error) {
 
 	// NOTE(rsc): It seems strange to set the buffer to have
 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
+	// as the size. I don't know why the +2 is here, but the
 	// kernel uses +2 for its own implementation of this function.
 	// I am scared that if we don't include the +2 here, the kernel
 	// will silently write 2 words farther than we specify
@@ -76,34 +77,6 @@ func nametomib(name string) (mib []_C_int, err error) {
 	return buf[0 : n/siz], nil
 }
 
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sys   ptrace(request int, pid int, addr uintptr, data uintptr) (err error)
 func PtraceAttach(pid int) (err error) { return ptrace(PT_ATTACH, pid, 0, 0) }
 func PtraceDetach(pid int) (err error) { return ptrace(PT_DETACH, pid, 0, 0) }
@@ -125,7 +98,7 @@ type attrList struct {
 
 func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (attrs [][]byte, err error) {
 	if len(attrBuf) < 4 {
-		return nil, errorspkg.New("attrBuf too small")
+		return nil, errors.New("attrBuf too small")
 	}
 	attrList.bitmapCount = attrBitMapCount
 
@@ -161,12 +134,12 @@ func getAttrList(path string, attrList attrList, attrBuf []byte, options uint) (
 	for i := uint32(0); int(i) < len(dat); {
 		header := dat[i:]
 		if len(header) < 8 {
-			return attrs, errorspkg.New("truncated attribute header")
+			return attrs, errors.New("truncated attribute header")
 		}
 		datOff := *(*int32)(unsafe.Pointer(&header[0]))
 		attrLen := *(*uint32)(unsafe.Pointer(&header[4]))
 		if datOff < 0 || uint32(datOff)+attrLen > uint32(len(dat)) {
-			return attrs, errorspkg.New("truncated results; attrBuf too small")
+			return attrs, errors.New("truncated results; attrBuf too small")
 		}
 		end := uint32(datOff) + attrLen
 		attrs = append(attrs, dat[datOff:end])
@@ -203,6 +176,42 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	_p0, err := BytePtrFromString(path)
+	if err != nil {
+		return err
+	}
+
+	var attrList attrList
+	attrList.bitmapCount = ATTR_BIT_MAP_COUNT
+	attrList.CommonAttr = ATTR_CMN_MODTIME | ATTR_CMN_ACCTIME
+
+	// order is mtime, atime: the opposite of Chtimes
+	attributes := [2]Timespec{times[1], times[0]}
+	options := 0
+	if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		options |= FSOPT_NOFOLLOW
+	}
+	_, _, e1 := Syscall6(
+		SYS_SETATTRLIST,
+		uintptr(unsafe.Pointer(_p0)),
+		uintptr(unsafe.Pointer(&attrList)),
+		uintptr(unsafe.Pointer(&attributes)),
+		uintptr(unsafe.Sizeof(attributes)),
+		uintptr(options),
+		0,
+	)
+	if e1 != 0 {
+		return e1
+	}
+	return nil
+}
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) error {
+	// Darwin doesn't support SYS_UTIMENSAT
+	return ENOSYS
+}
+
 /*
  * Wrapped
  */
@@ -211,6 +220,91 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 
 func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(signum), 1) }
 
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 /*
  * Exposed directly
  */
@@ -226,13 +320,17 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 //sys	Dup2(from int, to int) (err error)
 //sys	Exchangedata(path1 string, path2 string, options int) (err error)
 //sys	Exit(code int)
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchdir(fd int) (err error)
 //sys	Fchflags(fd int, flags int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
 //sys	Fstatfs(fd int, stat *Statfs_t) (err error) = SYS_FSTATFS64
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
@@ -254,23 +352,23 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 //sys	Kqueue() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Link(path string, link string) (err error)
+//sys	Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error)
 //sys	Listen(s int, backlog int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
 //sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
 //sys	Rename(from string, to string) (err error)
+//sys	Renameat(fromfd int, from string, tofd int, to string) (err error)
 //sys	Revoke(path string) (err error)
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
@@ -291,11 +389,13 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
 //sys	Statfs(path string, stat *Statfs_t) (err error) = SYS_STATFS64
 //sys	Symlink(path string, link string) (err error)
+//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
 //sys	Sync() (err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Umask(newmask int) (oldmask int)
 //sys	Undelete(path string) (err error)
 //sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
 //sys	Unmount(path string, flags int) (err error)
 //sys	write(fd int, p []byte) (n int, err error)
 //sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
@@ -335,9 +435,6 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 // Add_profil
 // Kdebug_trace
 // Sigreturn
-// Mmap
-// Mlock
-// Munlock
 // Atsocket
 // Kqueue_from_portset_np
 // Kqueue_portset
@@ -347,7 +444,6 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 // Searchfs
 // Delete
 // Copyfile
-// Poll
 // Watchevent
 // Waitevent
 // Modwatch
@@ -430,8 +526,6 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 // Lio_listio
 // __pthread_cond_wait
 // Iopolicysys
-// Mlockall
-// Munlockall
 // __pthread_kill
 // __pthread_sigmask
 // __sigwait
@@ -485,7 +579,6 @@ func Kill(pid int, signum syscall.Signal) (err error) { return kill(pid, int(sig
 // Sendmsg_nocancel
 // Recvfrom_nocancel
 // Accept_nocancel
-// Msync_nocancel
 // Fcntl_nocancel
 // Select_nocancel
 // Fsync_nocancel
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_386.go b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
index c172a3da5a..b3ac109a2f 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_386.go
@@ -11,27 +11,18 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 //sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
 func Gettimeofday(tv *Timeval) (err error) {
 	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
+	// but is otherwise unused. The answers come back
 	// in the two registers.
 	sec, usec, err := gettimeofday(tv)
 	tv.Sec = int32(sec)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
index fc1e5a4a82..75219444a8 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_amd64.go
@@ -11,29 +11,18 @@ import (
 	"unsafe"
 )
 
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
-
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
 func Gettimeofday(tv *Timeval) (err error) {
 	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
+	// but is otherwise unused. The answers come back
 	// in the two registers.
 	sec, usec, err := gettimeofday(tv)
 	tv.Sec = sec
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
index d286cf408d..faae207a47 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm.go
@@ -9,27 +9,18 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 //sysnb	gettimeofday(tp *Timeval) (sec int32, usec int32, err error)
 func Gettimeofday(tv *Timeval) (err error) {
 	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
+	// but is otherwise unused. The answers come back
 	// in the two registers.
 	sec, usec, err := gettimeofday(tv)
 	tv.Sec = int32(sec)
@@ -69,3 +60,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 }
 
 func Syscall9(num, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno) // sic
+
+// SYS___SYSCTL is used by syscall_bsd.go for all BSDs, but in modern versions
+// of darwin/arm the syscall is called sysctl instead of __sysctl.
+const SYS___SYSCTL = SYS_SYSCTL
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
index c33905cdcd..d6d9628014 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_darwin_arm64.go
@@ -11,27 +11,18 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 16384 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 //sysnb	gettimeofday(tp *Timeval) (sec int64, usec int32, err error)
 func Gettimeofday(tv *Timeval) (err error) {
 	// The tv passed to gettimeofday must be non-nil
-	// but is otherwise unused.  The answers come back
+	// but is otherwise unused. The answers come back
 	// in the two registers.
 	sec, usec, err := gettimeofday(tv)
 	tv.Sec = sec
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly.go b/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
index fbbe0dce25..b5072de285 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly.go
@@ -1,8 +1,8 @@
-// Copyright 2009,2010 The Go Authors. All rights reserved.
+// Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// FreeBSD system calls.
+// DragonFly BSD system calls.
 // This file is compiled as ordinary Go code,
 // but it is also input to mksyscall,
 // which parses the //sys lines and generates system call stubs.
@@ -14,6 +14,7 @@ package unix
 
 import "unsafe"
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
 	Family uint8
@@ -34,7 +35,7 @@ func nametomib(name string) (mib []_C_int, err error) {
 
 	// NOTE(rsc): It seems strange to set the buffer to have
 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
+	// as the size. I don't know why the +2 is here, but the
 	// kernel uses +2 for its own implementation of this function.
 	// I am scared that if we don't include the +2 here, the kernel
 	// will silently write 2 words farther than we specify
@@ -56,31 +57,6 @@ func nametomib(name string) (mib []_C_int, err error) {
 	return buf[0 : n/siz], nil
 }
 
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		reclen := int(16+dirent.Namlen+1+7) & ^7
-		buf = buf[reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sysnb pipe() (r int, w int, err error)
 
 func Pipe(p []int) (err error) {
@@ -101,6 +77,41 @@ func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
 	return extpwrite(fd, p, 0, offset)
 }
 
+func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
+	var rsa RawSockaddrAny
+	var len _Socklen = SizeofSockaddrAny
+	nfd, err = accept4(fd, &rsa, &len, flags)
+	if err != nil {
+		return
+	}
+	if len > SizeofSockaddrAny {
+		panic("RawSockaddrAny too small")
+	}
+	sa, err = anyToSockaddr(&rsa)
+	if err != nil {
+		Close(nfd)
+		nfd = 0
+	}
+	return
+}
+
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	var bufsize uintptr
@@ -116,6 +127,113 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func sysctlUname(mib []_C_int, old *byte, oldlen *uintptr) error {
+	err := sysctl(mib, old, oldlen, nil, 0)
+	if err != nil {
+		// Utsname members on Dragonfly are only 32 bytes and
+		// the syscall returns ENOMEM in case the actual value
+		// is longer.
+		if err == ENOMEM {
+			err = nil
+		}
+	}
+	return err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctlUname(mib, &uname.Sysname[0], &n); err != nil {
+		return err
+	}
+	uname.Sysname[unsafe.Sizeof(uname.Sysname)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctlUname(mib, &uname.Nodename[0], &n); err != nil {
+		return err
+	}
+	uname.Nodename[unsafe.Sizeof(uname.Nodename)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctlUname(mib, &uname.Release[0], &n); err != nil {
+		return err
+	}
+	uname.Release[unsafe.Sizeof(uname.Release)-1] = 0
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctlUname(mib, &uname.Version[0], &n); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctlUname(mib, &uname.Machine[0], &n); err != nil {
+		return err
+	}
+	uname.Machine[unsafe.Sizeof(uname.Machine)-1] = 0
+
+	return nil
+}
+
 /*
  * Exposed directly
  */
@@ -133,10 +251,12 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys	Fchdir(fd int) (err error)
 //sys	Fchflags(fd int, flags int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
 //sys	Fstatfs(fd int, stat *Statfs_t) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
@@ -165,11 +285,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys	Mkdir(path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
@@ -208,6 +323,8 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys   munmap(addr uintptr, length uintptr) (err error)
 //sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
 //sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
 /*
  * Unimplemented
@@ -219,7 +336,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // Getlogin
 // Sigpending
 // Sigaltstack
-// Ioctl
 // Reboot
 // Execve
 // Vfork
@@ -242,7 +358,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // Add_profil
 // Kdebug_trace
 // Sigreturn
-// Mmap
 // Atsocket
 // Kqueue_from_portset_np
 // Kqueue_portset
@@ -252,7 +367,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // Searchfs
 // Delete
 // Copyfile
-// Poll
 // Watchevent
 // Waitevent
 // Modwatch
@@ -387,7 +501,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // Sendmsg_nocancel
 // Recvfrom_nocancel
 // Accept_nocancel
-// Msync_nocancel
 // Fcntl_nocancel
 // Select_nocancel
 // Fsync_nocancel
@@ -399,7 +512,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // Pread_nocancel
 // Pwrite_nocancel
 // Waitid_nocancel
-// Poll_nocancel
 // Msgsnd_nocancel
 // Msgrcv_nocancel
 // Sem_wait_nocancel
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
index da7cb7982c..9babb31ea7 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_dragonfly_amd64.go
@@ -11,21 +11,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd.go b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd.go
index ec56ed608a..ba9df4ac12 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd.go
@@ -12,8 +12,12 @@
 
 package unix
 
-import "unsafe"
+import (
+	"strings"
+	"unsafe"
+)
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
 	Family uint8
@@ -32,7 +36,7 @@ func nametomib(name string) (mib []_C_int, err error) {
 
 	// NOTE(rsc): It seems strange to set the buffer to have
 	// size CTL_MAXNAME+2 but use only CTL_MAXNAME
-	// as the size.  I don't know why the +2 is here, but the
+	// as the size. I don't know why the +2 is here, but the
 	// kernel uses +2 for its own implementation of this function.
 	// I am scared that if we don't include the +2 here, the kernel
 	// will silently write 2 words farther than we specify
@@ -54,34 +58,6 @@ func nametomib(name string) (mib []_C_int, err error) {
 	return buf[0 : n/siz], nil
 }
 
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sysnb pipe() (r int, w int, err error)
 
 func Pipe(p []int) (err error) {
@@ -121,6 +97,23 @@ func Accept4(fd, flags int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
 func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	var bufsize uintptr
@@ -136,17 +129,15 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
 // Derive extattr namespace and attribute name
 
 func xattrnamespace(fullattr string) (ns int, attr string, err error) {
-	s := -1
-	for idx, val := range fullattr {
-		if val == '.' {
-			s = idx
-			break
-		}
-	}
-
+	s := strings.IndexByte(fullattr, '.')
 	if s == -1 {
 		return -1, "", ENOATTR
 	}
@@ -287,7 +278,6 @@ func Listxattr(file string, dest []byte) (sz int, err error) {
 
 	// FreeBSD won't allow you to list xattrs from multiple namespaces
 	s := 0
-	var e error
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
 		stmp, e := ExtattrListFile(file, nsid, uintptr(d), destsiz)
 
@@ -299,7 +289,6 @@ func Listxattr(file string, dest []byte) (sz int, err error) {
 		 * we don't have read permissions on, so don't ignore those errors
 		 */
 		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
 			continue
 		} else if e != nil {
 			return s, e
@@ -313,7 +302,7 @@ func Listxattr(file string, dest []byte) (sz int, err error) {
 		d = initxattrdest(dest, s)
 	}
 
-	return s, e
+	return s, nil
 }
 
 func Flistxattr(fd int, dest []byte) (sz int, err error) {
@@ -321,11 +310,9 @@ func Flistxattr(fd int, dest []byte) (sz int, err error) {
 	destsiz := len(dest)
 
 	s := 0
-	var e error
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
 		stmp, e := ExtattrListFd(fd, nsid, uintptr(d), destsiz)
 		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
 			continue
 		} else if e != nil {
 			return s, e
@@ -339,7 +326,7 @@ func Flistxattr(fd int, dest []byte) (sz int, err error) {
 		d = initxattrdest(dest, s)
 	}
 
-	return s, e
+	return s, nil
 }
 
 func Llistxattr(link string, dest []byte) (sz int, err error) {
@@ -347,11 +334,9 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 	destsiz := len(dest)
 
 	s := 0
-	var e error
 	for _, nsid := range [...]int{EXTATTR_NAMESPACE_USER, EXTATTR_NAMESPACE_SYSTEM} {
 		stmp, e := ExtattrListLink(link, nsid, uintptr(d), destsiz)
 		if e != nil && e == EPERM && nsid != EXTATTR_NAMESPACE_USER {
-			e = nil
 			continue
 		} else if e != nil {
 			return s, e
@@ -365,7 +350,92 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 		d = initxattrdest(dest, s)
 	}
 
-	return s, e
+	return s, nil
+}
+
+//sys   ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
 }
 
 /*
@@ -373,6 +443,9 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
  */
 //sys	Access(path string, mode uint32) (err error)
 //sys	Adjtime(delta *Timeval, olddelta *Timeval) (err error)
+//sys	CapEnter() (err error)
+//sys	capRightsGet(version int, fd int, rightsp *CapRights) (err error) = SYS___CAP_RIGHTS_GET
+//sys	capRightsLimit(fd int, rightsp *CapRights) (err error)
 //sys	Chdir(path string) (err error)
 //sys	Chflags(path string, flags int) (err error)
 //sys	Chmod(path string, mode uint32) (err error)
@@ -395,16 +468,21 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 //sys	ExtattrDeleteLink(link string, attrnamespace int, attrname string) (err error)
 //sys	ExtattrListLink(link string, attrnamespace int, data uintptr, nbytes int) (ret int, err error)
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
+//sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchdir(fd int) (err error)
 //sys	Fchflags(fd int, flags int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
 //sys	Fstatfs(fd int, stat *Statfs_t) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
+//sys	Getdents(fd int, buf []byte) (n int, err error)
 //sys	Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error)
 //sys	Getdtablesize() (size int)
 //sysnb	Getegid() (egid int)
@@ -425,24 +503,24 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 //sys	Kqueue() (fd int, err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Link(path string, link string) (err error)
+//sys	Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error)
 //sys	Listen(s int, backlog int) (err error)
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	Mkdir(path string, mode uint32) (err error)
+//sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
+//sys	Openat(fdat int, path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error)
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error)
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Readlink(path string, buf []byte) (n int, err error)
+//sys	Readlinkat(dirfd int, path string, buf []byte) (n int, err error)
 //sys	Rename(from string, to string) (err error)
+//sys	Renameat(fromfd int, from string, tofd int, to string) (err error)
 //sys	Revoke(path string) (err error)
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = SYS_LSEEK
@@ -464,11 +542,13 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 //sys	Stat(path string, stat *Stat_t) (err error)
 //sys	Statfs(path string, stat *Statfs_t) (err error)
 //sys	Symlink(path string, link string) (err error)
+//sys	Symlinkat(oldpath string, newdirfd int, newpath string) (err error)
 //sys	Sync() (err error)
 //sys	Truncate(path string, length int64) (err error)
 //sys	Umask(newmask int) (oldmask int)
 //sys	Undelete(path string) (err error)
 //sys	Unlink(path string) (err error)
+//sys	Unlinkat(dirfd int, path string, flags int) (err error)
 //sys	Unmount(path string, flags int) (err error)
 //sys	write(fd int, p []byte) (n int, err error)
 //sys   mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
@@ -476,6 +556,7 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 //sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
 //sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
 //sys	accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error)
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
 /*
  * Unimplemented
@@ -509,9 +590,6 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 // Add_profil
 // Kdebug_trace
 // Sigreturn
-// Mmap
-// Mlock
-// Munlock
 // Atsocket
 // Kqueue_from_portset_np
 // Kqueue_portset
@@ -521,7 +599,6 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 // Searchfs
 // Delete
 // Copyfile
-// Poll
 // Watchevent
 // Waitevent
 // Modwatch
@@ -604,8 +681,6 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 // Lio_listio
 // __pthread_cond_wait
 // Iopolicysys
-// Mlockall
-// Munlockall
 // __pthread_kill
 // __pthread_sigmask
 // __sigwait
@@ -658,7 +733,6 @@ func Llistxattr(link string, dest []byte) (sz int, err error) {
 // Sendmsg_nocancel
 // Recvfrom_nocancel
 // Accept_nocancel
-// Msync_nocancel
 // Fcntl_nocancel
 // Select_nocancel
 // Fsync_nocancel
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
index 6a0cd804d8..21e03958cd 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_386.go
@@ -11,21 +11,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int32(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
index e142540efa..9c945a6579 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_amd64.go
@@ -11,21 +11,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
index 5504cb1255..5cd6243f2a 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_arm.go
@@ -11,21 +11,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return ts.Sec*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = nsec / 1e9
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go b/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
deleted file mode 100644
index 3c3d825869..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_freebsd_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build freebsd
-
-package unix_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestSysctlUint64(t *testing.T) {
-	_, err := unix.SysctlUint64("security.mac.labeled")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux.go
index 1ff45e9f63..04f38c53ee 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux.go
@@ -36,6 +36,59 @@ func Creat(path string, mode uint32) (fd int, err error) {
 	return Open(path, O_CREAT|O_WRONLY|O_TRUNC, mode)
 }
 
+//sys	fchmodat(dirfd int, path string, mode uint32) (err error)
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	// Linux fchmodat doesn't support the flags parameter. Mimick glibc's behavior
+	// and check the flags. Otherwise the mode would be applied to the symlink
+	// destination which is not what the user expects.
+	if flags&^AT_SYMLINK_NOFOLLOW != 0 {
+		return EINVAL
+	} else if flags&AT_SYMLINK_NOFOLLOW != 0 {
+		return EOPNOTSUPP
+	}
+	return fchmodat(dirfd, path, mode)
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
 //sys	Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error)
 
 func Link(oldpath string, newpath string) (err error) {
@@ -202,7 +255,7 @@ func Getgroups() (gids []int, err error) {
 		return nil, nil
 	}
 
-	// Sanity check group count.  Max is 1<<16 on Linux.
+	// Sanity check group count. Max is 1<<16 on Linux.
 	if n < 0 || n > 1<<20 {
 		return nil, EINVAL
 	}
@@ -237,8 +290,8 @@ type WaitStatus uint32
 // 0x7F (stopped), or a signal number that caused an exit.
 // The 0x80 bit is whether there was a core dump.
 // An extra number (exit code, signal causing a stop)
-// is in the high bits.  At least that's the idea.
-// There are various irregularities.  For example, the
+// is in the high bits. At least that's the idea.
+// There are various irregularities. For example, the
 // "continued" status is 0xFFFF, distinguishing itself
 // from stopped via the core dump bit.
 
@@ -299,10 +352,14 @@ func Wait4(pid int, wstatus *WaitStatus, options int, rusage *Rusage) (wpid int,
 	return
 }
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkfifo(path string, mode uint32) error {
 	return Mknod(path, mode|S_IFIFO, 0)
 }
 
+func Mkfifoat(dirfd int, path string, mode uint32) error {
+	return Mknodat(dirfd, path, mode|S_IFIFO, 0)
+}
+
 func (sa *SockaddrInet4) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	if sa.Port < 0 || sa.Port > 0xFFFF {
 		return nil, 0, EINVAL
@@ -356,6 +413,7 @@ func (sa *SockaddrUnix) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), sl, nil
 }
 
+// SockaddrLinklayer implements the Sockaddr interface for AF_PACKET type sockets.
 type SockaddrLinklayer struct {
 	Protocol uint16
 	Ifindex  int
@@ -382,6 +440,7 @@ func (sa *SockaddrLinklayer) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrLinklayer, nil
 }
 
+// SockaddrNetlink implements the Sockaddr interface for AF_NETLINK type sockets.
 type SockaddrNetlink struct {
 	Family uint16
 	Pad    uint16
@@ -398,6 +457,8 @@ func (sa *SockaddrNetlink) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrNetlink, nil
 }
 
+// SockaddrHCI implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the HCI protocol.
 type SockaddrHCI struct {
 	Dev     uint16
 	Channel uint16
@@ -411,6 +472,31 @@ func (sa *SockaddrHCI) sockaddr() (unsafe.Pointer, _Socklen, error) {
 	return unsafe.Pointer(&sa.raw), SizeofSockaddrHCI, nil
 }
 
+// SockaddrL2 implements the Sockaddr interface for AF_BLUETOOTH type sockets
+// using the L2CAP protocol.
+type SockaddrL2 struct {
+	PSM      uint16
+	CID      uint16
+	Addr     [6]uint8
+	AddrType uint8
+	raw      RawSockaddrL2
+}
+
+func (sa *SockaddrL2) sockaddr() (unsafe.Pointer, _Socklen, error) {
+	sa.raw.Family = AF_BLUETOOTH
+	psm := (*[2]byte)(unsafe.Pointer(&sa.raw.Psm))
+	psm[0] = byte(sa.PSM)
+	psm[1] = byte(sa.PSM >> 8)
+	for i := 0; i < len(sa.Addr); i++ {
+		sa.raw.Bdaddr[i] = sa.Addr[len(sa.Addr)-1-i]
+	}
+	cid := (*[2]byte)(unsafe.Pointer(&sa.raw.Cid))
+	cid[0] = byte(sa.CID)
+	cid[1] = byte(sa.CID >> 8)
+	sa.raw.Bdaddr_type = sa.AddrType
+	return unsafe.Pointer(&sa.raw), SizeofSockaddrL2, nil
+}
+
 // SockaddrCAN implements the Sockaddr interface for AF_CAN type sockets.
 // The RxID and TxID fields are used for transport protocol addressing in
 // (CAN_TP16, CAN_TP20, CAN_MCNET, and CAN_ISOTP), they can be left with
@@ -696,19 +782,6 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 	return anyToSockaddr(&rsa)
 }
 
-func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
-	vallen := _Socklen(4)
-	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
-	return value, err
-}
-
-func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
-	var value IPMreq
-	vallen := _Socklen(SizeofIPMreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
 func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
 	var value IPMreqn
 	vallen := _Socklen(SizeofIPMreqn)
@@ -716,38 +789,149 @@ func GetsockoptIPMreqn(fd, level, opt int) (*IPMreqn, error) {
 	return &value, err
 }
 
-func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
-	var value IPv6Mreq
-	vallen := _Socklen(SizeofIPv6Mreq)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
-}
-
-func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
-	var value IPv6MTUInfo
-	vallen := _Socklen(SizeofIPv6MTUInfo)
+func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
+	var value Ucred
+	vallen := _Socklen(SizeofUcred)
 	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
 	return &value, err
 }
 
-func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
-	var value ICMPv6Filter
-	vallen := _Socklen(SizeofICMPv6Filter)
+func GetsockoptTCPInfo(fd, level, opt int) (*TCPInfo, error) {
+	var value TCPInfo
+	vallen := _Socklen(SizeofTCPInfo)
 	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
 	return &value, err
 }
 
-func GetsockoptUcred(fd, level, opt int) (*Ucred, error) {
-	var value Ucred
-	vallen := _Socklen(SizeofUcred)
-	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
-	return &value, err
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		if err == ERANGE {
+			buf = make([]byte, vallen)
+			err = getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+		}
+		if err != nil {
+			return "", err
+		}
+	}
+	return string(buf[:vallen-1]), nil
 }
 
 func SetsockoptIPMreqn(fd, level, opt int, mreq *IPMreqn) (err error) {
 	return setsockopt(fd, level, opt, unsafe.Pointer(mreq), unsafe.Sizeof(*mreq))
 }
 
+// Keyctl Commands (http://man7.org/linux/man-pages/man2/keyctl.2.html)
+
+// KeyctlInt calls keyctl commands in which each argument is an int.
+// These commands are KEYCTL_REVOKE, KEYCTL_CHOWN, KEYCTL_CLEAR, KEYCTL_LINK,
+// KEYCTL_UNLINK, KEYCTL_NEGATE, KEYCTL_SET_REQKEY_KEYRING, KEYCTL_SET_TIMEOUT,
+// KEYCTL_ASSUME_AUTHORITY, KEYCTL_SESSION_TO_PARENT, KEYCTL_REJECT,
+// KEYCTL_INVALIDATE, and KEYCTL_GET_PERSISTENT.
+//sys	KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlBuffer calls keyctl commands in which the third and fourth
+// arguments are a buffer and its length, respectively.
+// These commands are KEYCTL_UPDATE, KEYCTL_READ, and KEYCTL_INSTANTIATE.
+//sys	KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlString calls keyctl commands which return a string.
+// These commands are KEYCTL_DESCRIBE and KEYCTL_GET_SECURITY.
+func KeyctlString(cmd int, id int) (string, error) {
+	// We must loop as the string data may change in between the syscalls.
+	// We could allocate a large buffer here to reduce the chance that the
+	// syscall needs to be called twice; however, this is unnecessary as
+	// the performance loss is negligible.
+	var buffer []byte
+	for {
+		// Try to fill the buffer with data
+		length, err := KeyctlBuffer(cmd, id, buffer, 0)
+		if err != nil {
+			return "", err
+		}
+
+		// Check if the data was written
+		if length <= len(buffer) {
+			// Exclude the null terminator
+			return string(buffer[:length-1]), nil
+		}
+
+		// Make a bigger buffer if needed
+		buffer = make([]byte, length)
+	}
+}
+
+// Keyctl commands with special signatures.
+
+// KeyctlGetKeyringID implements the KEYCTL_GET_KEYRING_ID command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_get_keyring_ID.3.html
+func KeyctlGetKeyringID(id int, create bool) (ringid int, err error) {
+	createInt := 0
+	if create {
+		createInt = 1
+	}
+	return KeyctlInt(KEYCTL_GET_KEYRING_ID, id, createInt, 0, 0)
+}
+
+// KeyctlSetperm implements the KEYCTL_SETPERM command. The perm value is the
+// key handle permission mask as described in the "keyctl setperm" section of
+// http://man7.org/linux/man-pages/man1/keyctl.1.html.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_setperm.3.html
+func KeyctlSetperm(id int, perm uint32) error {
+	_, err := KeyctlInt(KEYCTL_SETPERM, id, int(perm), 0, 0)
+	return err
+}
+
+//sys	keyctlJoin(cmd int, arg2 string) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlJoinSessionKeyring implements the KEYCTL_JOIN_SESSION_KEYRING command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_join_session_keyring.3.html
+func KeyctlJoinSessionKeyring(name string) (ringid int, err error) {
+	return keyctlJoin(KEYCTL_JOIN_SESSION_KEYRING, name)
+}
+
+//sys	keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlSearch implements the KEYCTL_SEARCH command.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_search.3.html
+func KeyctlSearch(ringid int, keyType, description string, destRingid int) (id int, err error) {
+	return keyctlSearch(KEYCTL_SEARCH, ringid, keyType, description, destRingid)
+}
+
+//sys	keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) = SYS_KEYCTL
+
+// KeyctlInstantiateIOV implements the KEYCTL_INSTANTIATE_IOV command. This
+// command is similar to KEYCTL_INSTANTIATE, except that the payload is a slice
+// of Iovec (each of which represents a buffer) instead of a single buffer.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_instantiate_iov.3.html
+func KeyctlInstantiateIOV(id int, payload []Iovec, ringid int) error {
+	return keyctlIOV(KEYCTL_INSTANTIATE_IOV, id, payload, ringid)
+}
+
+//sys	keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) = SYS_KEYCTL
+
+// KeyctlDHCompute implements the KEYCTL_DH_COMPUTE command. This command
+// computes a Diffie-Hellman shared secret based on the provide params. The
+// secret is written to the provided buffer and the returned size is the number
+// of bytes written (returning an error if there is insufficient space in the
+// buffer). If a nil buffer is passed in, this function returns the minimum
+// buffer length needed to store the appropriate data. Note that this differs
+// from KEYCTL_READ's behavior which always returns the requested payload size.
+// See the full documentation at:
+// http://man7.org/linux/man-pages/man3/keyctl_dh_compute.3.html
+func KeyctlDHCompute(params *KeyctlDHParams, buffer []byte) (size int, err error) {
+	return keyctlDH(KEYCTL_DH_COMPUTE, params, buffer)
+}
+
 func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
 	var rsa RawSockaddrAny
@@ -755,17 +939,24 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 	msg.Namelen = uint32(SizeofSockaddrAny)
 	var iov Iovec
 	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.Base = &p[0]
 		iov.SetLen(len(p))
 	}
 	var dummy byte
 	if len(oob) > 0 {
-		// receive at least one normal byte
 		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
+			var sockType int
+			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
+			if err != nil {
+				return
+			}
+			// receive at least one normal byte
+			if sockType != SOCK_DGRAM {
+				iov.Base = &dummy
+				iov.SetLen(1)
+			}
 		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.Control = &oob[0]
 		msg.SetControllen(len(oob))
 	}
 	msg.Iov = &iov
@@ -798,21 +989,28 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 		}
 	}
 	var msg Msghdr
-	msg.Name = (*byte)(unsafe.Pointer(ptr))
+	msg.Name = (*byte)(ptr)
 	msg.Namelen = uint32(salen)
 	var iov Iovec
 	if len(p) > 0 {
-		iov.Base = (*byte)(unsafe.Pointer(&p[0]))
+		iov.Base = &p[0]
 		iov.SetLen(len(p))
 	}
 	var dummy byte
 	if len(oob) > 0 {
-		// send at least one normal byte
 		if len(p) == 0 {
-			iov.Base = &dummy
-			iov.SetLen(1)
+			var sockType int
+			sockType, err = GetsockoptInt(fd, SOL_SOCKET, SO_TYPE)
+			if err != nil {
+				return 0, err
+			}
+			// send at least one normal byte
+			if sockType != SOCK_DGRAM {
+				iov.Base = &dummy
+				iov.SetLen(1)
+			}
 		}
-		msg.Control = (*byte)(unsafe.Pointer(&oob[0]))
+		msg.Control = &oob[0]
 		msg.SetControllen(len(oob))
 	}
 	msg.Iov = &iov
@@ -842,7 +1040,7 @@ func ptracePeek(req int, pid int, addr uintptr, out []byte) (count int, err erro
 
 	var buf [sizeofPtr]byte
 
-	// Leading edge.  PEEKTEXT/PEEKDATA don't require aligned
+	// Leading edge. PEEKTEXT/PEEKDATA don't require aligned
 	// access (PEEKUSER warns that it might), but if we don't
 	// align our reads, we might straddle an unmapped page
 	// boundary and not get the bytes leading up to the page
@@ -881,6 +1079,10 @@ func PtracePeekData(pid int, addr uintptr, out []byte) (count int, err error) {
 	return ptracePeek(PTRACE_PEEKDATA, pid, addr, out)
 }
 
+func PtracePeekUser(pid int, addr uintptr, out []byte) (count int, err error) {
+	return ptracePeek(PTRACE_PEEKUSR, pid, addr, out)
+}
+
 func ptracePoke(pokeReq int, peekReq int, pid int, addr uintptr, data []byte) (count int, err error) {
 	// As for ptracePeek, we need to align our accesses to deal
 	// with the possibility of straddling an invalid page.
@@ -940,6 +1142,10 @@ func PtracePokeData(pid int, addr uintptr, data []byte) (count int, err error) {
 	return ptracePoke(PTRACE_POKEDATA, PTRACE_PEEKDATA, pid, addr, data)
 }
 
+func PtracePokeUser(pid int, addr uintptr, data []byte) (count int, err error) {
+	return ptracePoke(PTRACE_POKEUSR, PTRACE_PEEKUSR, pid, addr, data)
+}
+
 func PtraceGetRegs(pid int, regsout *PtraceRegs) (err error) {
 	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
 }
@@ -979,40 +1185,10 @@ func Reboot(cmd int) (err error) {
 	return reboot(LINUX_REBOOT_MAGIC1, LINUX_REBOOT_MAGIC2, cmd, "")
 }
 
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
 func ReadDirent(fd int, buf []byte) (n int, err error) {
 	return Getdents(fd, buf)
 }
 
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	count = 0
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sys	mount(source string, target string, fstype string, flags uintptr, data *byte) (err error)
 
 func Mount(source string, target string, fstype string, flags uintptr, data string) (err error) {
@@ -1036,22 +1212,24 @@ func Mount(source string, target string, fstype string, flags uintptr, data stri
  * Direct access
  */
 //sys	Acct(path string) (err error)
+//sys	AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error)
 //sys	Adjtimex(buf *Timex) (state int, err error)
 //sys	Chdir(path string) (err error)
 //sys	Chroot(path string) (err error)
 //sys	ClockGettime(clockid int32, time *Timespec) (err error)
 //sys	Close(fd int) (err error)
+//sys	CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 //sys	Dup(oldfd int) (fd int, err error)
 //sys	Dup3(oldfd int, newfd int, flags int) (err error)
 //sysnb	EpollCreate(size int) (fd int, err error)
 //sysnb	EpollCreate1(flag int) (fd int, err error)
 //sysnb	EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error)
+//sys	Eventfd(initval uint, flags int) (fd int, err error) = SYS_EVENTFD2
 //sys	Exit(code int) = SYS_EXIT_GROUP
 //sys	Faccessat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fallocate(fd int, mode uint32, off int64, len int64) (err error)
 //sys	Fchdir(fd int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
-//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 //sys	Fdatasync(fd int) (err error)
@@ -1078,16 +1256,23 @@ func Getpgrp() (pid int) {
 //sysnb	InotifyRmWatch(fd int, watchdesc uint32) (success int, err error)
 //sysnb	Kill(pid int, sig syscall.Signal) (err error)
 //sys	Klogctl(typ int, buf []byte) (n int, err error) = SYS_SYSLOG
+//sys	Lgetxattr(path string, attr string, dest []byte) (sz int, err error)
 //sys	Listxattr(path string, dest []byte) (sz int, err error)
+//sys	Llistxattr(path string, dest []byte) (sz int, err error)
+//sys	Lremovexattr(path string, attr string) (err error)
+//sys	Lsetxattr(path string, attr string, data []byte, flags int) (err error)
 //sys	Mkdirat(dirfd int, path string, mode uint32) (err error)
 //sys	Mknodat(dirfd int, path string, mode uint32, dev int) (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
+//sys	PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error)
 //sys	PivotRoot(newroot string, putold string) (err error) = SYS_PIVOT_ROOT
 //sysnb prlimit(pid int, resource int, newlimit *Rlimit, old *Rlimit) (err error) = SYS_PRLIMIT64
 //sys   Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (err error)
+//sys	Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) = SYS_PSELECT6
 //sys	read(fd int, p []byte) (n int, err error)
 //sys	Removexattr(path string, attr string) (err error)
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
+//sys	RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error)
 //sys	Setdomainname(p []byte) (err error)
 //sys	Sethostname(p []byte) (err error)
 //sysnb	Setpgid(pid int, pgid int) (err error)
@@ -1110,7 +1295,9 @@ func Setgid(uid int) (err error) {
 
 //sys	Setpriority(which int, who int, prio int) (err error)
 //sys	Setxattr(path string, attr string, data []byte, flags int) (err error)
+//sys	Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error)
 //sys	Sync()
+//sys	Syncfs(fd int) (err error)
 //sysnb	Sysinfo(info *Sysinfo_t) (err error)
 //sys	Tee(rfd int, wfd int, len int, flags int) (n int64, err error)
 //sysnb	Tgkill(tgid int, tid int, sig syscall.Signal) (err error)
@@ -1145,8 +1332,9 @@ func Munmap(b []byte) (err error) {
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
 //sys	Mlock(b []byte) (err error)
-//sys	Munlock(b []byte) (err error)
 //sys	Mlockall(flags int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
+//sys	Munlock(b []byte) (err error)
 //sys	Munlockall() (err error)
 
 // Vmsplice splices user pages from a slice of Iovecs into a pipe specified by fd,
@@ -1171,7 +1359,6 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 /*
  * Unimplemented
  */
-// AddKey
 // AfsSyscall
 // Alarm
 // ArchPrctl
@@ -1187,7 +1374,6 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 // EpollCtlOld
 // EpollPwait
 // EpollWaitOld
-// Eventfd
 // Execve
 // Fgetxattr
 // Flistxattr
@@ -1206,23 +1392,16 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 // IoGetevents
 // IoSetup
 // IoSubmit
-// Ioctl
 // IoprioGet
 // IoprioSet
 // KexecLoad
-// Keyctl
-// Lgetxattr
-// Llistxattr
 // LookupDcookie
-// Lremovexattr
-// Lsetxattr
 // Mbind
 // MigratePages
 // Mincore
 // ModifyLdt
 // Mount
 // MovePages
-// Mprotect
 // MqGetsetattr
 // MqNotify
 // MqOpen
@@ -1234,8 +1413,6 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 // Msgget
 // Msgrcv
 // Msgsnd
-// Msync
-// Newfstatat
 // Nfsservctl
 // Personality
 // Pselect6
@@ -1246,7 +1423,6 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 // Readahead
 // Readv
 // RemapFilePages
-// RequestKey
 // RestartSyscall
 // RtSigaction
 // RtSigpending
@@ -1257,11 +1433,9 @@ func Vmsplice(fd int, iovs []Iovec, flags int) (int, error) {
 // RtSigtimedwait
 // SchedGetPriorityMax
 // SchedGetPriorityMin
-// SchedGetaffinity
 // SchedGetparam
 // SchedGetscheduler
 // SchedRrGetInterval
-// SchedSetaffinity
 // SchedSetparam
 // SchedYield
 // Security
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_386.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_386.go
index 2b881b9793..bb8e4fbd86 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_386.go
@@ -14,21 +14,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 //sysnb	pipe(p *[2]_C_int) (err error)
@@ -63,6 +54,7 @@ func Pipe2(p []int, flags int) (err error) {
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64_64
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
 //sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
 //sysnb	Getegid() (egid int) = SYS_GETEGID32
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
@@ -185,9 +177,9 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 
 // On x86 Linux, all the socket calls go through an extra indirection,
 // I think because the 5-register system call interface can't handle
-// the 6-argument calls like sendto and recvfrom.  Instead the
+// the 6-argument calls like sendto and recvfrom. Instead the
 // arguments to the underlying system call are the number below
-// and a pointer to an array of uintptr.  We hide the pointer in the
+// and a pointer to an array of uintptr. We hide the pointer in the
 // socketcall assembly to avoid allocation on every system call.
 
 const (
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
index 9516a3fd7e..d121106323 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_amd64.go
@@ -11,6 +11,7 @@ package unix
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -28,7 +29,15 @@ package unix
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	Setfsgid(gid int) (err error)
 //sys	Setfsuid(uid int) (err error)
@@ -39,7 +48,12 @@ package unix
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
 //sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
-//sys	Stat(path string, stat *Stat_t) (err error)
+
+func Stat(path string, stat *Stat_t) (err error) {
+	// Use fstatat, because Android's seccomp policy blocks stat.
+	return Fstatat(AT_FDCWD, path, stat, 0)
+}
+
 //sys	Statfs(path string, buf *Statfs_t) (err error)
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error)
@@ -69,8 +83,6 @@ func Gettimeofday(tv *Timeval) (err error) {
 	return nil
 }
 
-func Getpagesize() int { return 4096 }
-
 func Time(t *Time_t) (tt Time_t, err error) {
 	var tv Timeval
 	errno := gettimeofday(&tv)
@@ -85,19 +97,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 //sysnb	pipe(p *[2]_C_int) (err error)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
index 71d8702289..c59f8588f1 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm.go
@@ -11,21 +11,12 @@ import (
 	"unsafe"
 )
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 func Pipe(p []int) (err error) {
@@ -86,6 +77,7 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 //sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error) = SYS_FCHOWN32
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
 //sysnb	Getegid() (egid int) = SYS_GETEGID32
 //sysnb	Geteuid() (euid int) = SYS_GETEUID32
 //sysnb	Getgid() (gid int) = SYS_GETGID32
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
index 4a136396cd..a1e8a609b2 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_arm64.go
@@ -7,6 +7,7 @@
 package unix
 
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) = SYS_EPOLL_PWAIT
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
 //sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
@@ -21,7 +22,15 @@ package unix
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	Setfsgid(gid int) (err error)
 //sys	Setfsuid(uid int) (err error)
@@ -66,23 +75,14 @@ func Lstat(path string, stat *Stat_t) (err error) {
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
 
-func Getpagesize() int { return 65536 }
-
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func Time(t *Time_t) (Time_t, error) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_gc.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
new file mode 100644
index 0000000000..c26e6ec231
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_gc.go
@@ -0,0 +1,14 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux,!gccgo
+
+package unix
+
+// SyscallNoError may be used instead of Syscall for syscalls that don't fail.
+func SyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
+
+// RawSyscallNoError may be used instead of RawSyscall for syscalls that don't
+// fail.
+func RawSyscallNoError(trap, a1, a2, a3 uintptr) (r1, r2 uintptr)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_gccgo.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_gccgo.go
new file mode 100644
index 0000000000..df9c123718
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_gccgo.go
@@ -0,0 +1,21 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build linux
+// +build gccgo
+// +build 386 arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+func seek(fd int, offset int64, whence int) (newoffset int64, err syscall.Errno) {
+	offsetLow := uint32(offset & 0xffffffff)
+	offsetHigh := uint32((offset >> 32) & 0xffffffff)
+	_, _, err = Syscall6(SYS__LLSEEK, uintptr(fd), uintptr(offsetHigh), uintptr(offsetLow), uintptr(unsafe.Pointer(&newoffset)), uintptr(whence), 0)
+	return newoffset, err
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
index 8119fde376..090ed404ab 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_mips64x.go
@@ -7,8 +7,11 @@
 
 package unix
 
+//sys	Dup2(oldfd int, newfd int) (err error)
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -22,7 +25,15 @@ package unix
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS_PSELECT6
+
+func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
+	var ts *Timespec
+	if timeout != nil {
+		ts = &Timespec{Sec: timeout.Sec, Nsec: timeout.Usec * 1000}
+	}
+	return Pselect(nfd, r, w, e, ts, nil)
+}
+
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	Setfsgid(gid int) (err error)
 //sys	Setfsuid(uid int) (err error)
@@ -54,8 +65,6 @@ package unix
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
 
-func Getpagesize() int { return 65536 }
-
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 
 func Time(t *Time_t) (tt Time_t, err error) {
@@ -72,19 +81,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func Pipe(p []int) (err error) {
@@ -182,9 +184,9 @@ func fillStat_t(s *Stat_t, st *stat_t) {
 	s.Blocks = st.Blocks
 }
 
-func (r *PtraceRegs) PC() uint64 { return r.Regs[64] }
+func (r *PtraceRegs) PC() uint64 { return r.Epc }
 
-func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = pc }
+func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
 
 func (iov *Iovec) SetLen(length int) {
 	iov.Len = uint64(length)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
index be77d24a4a..9e16cc9d14 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_mipsx.go
@@ -15,6 +15,7 @@ import (
 func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 //sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error) = SYS_FTRUNCATE64
 //sysnb	Getegid() (egid int)
@@ -35,7 +36,7 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 
 //sysnb	Setreuid(ruid int, euid int) (err error)
 //sys	Shutdown(fd int, how int) (err error)
-//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error)
+//sys	Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error)
 
 //sys	SyncFileRange(fd int, off int64, n int64, flags int) (err error)
 //sys	Truncate(path string, length int64) (err error) = SYS_TRUNCATE64
@@ -65,6 +66,7 @@ func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr,
 
 //sys	Lstat(path string, stat *Stat_t) (err error) = SYS_LSTAT64
 //sys	Fstat(fd int, stat *Stat_t) (err error) = SYS_FSTAT64
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
 //sys	Stat(path string, stat *Stat_t) (err error) = SYS_STAT64
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
@@ -99,19 +101,12 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 	return
 }
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int32(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: int32(sec), Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: int32(sec), Usec: int32(usec)}
 }
 
 //sysnb pipe2(p *[2]_C_int, flags int) (err error)
@@ -211,9 +206,9 @@ func Setrlimit(resource int, rlim *Rlimit) (err error) {
 	return setrlimit(resource, &rl)
 }
 
-func (r *PtraceRegs) PC() uint64 { return uint64(r.Regs[64]) }
+func (r *PtraceRegs) PC() uint64 { return r.Epc }
 
-func (r *PtraceRegs) SetPC(pc uint64) { r.Regs[64] = uint32(pc) }
+func (r *PtraceRegs) SetPC(pc uint64) { r.Epc = pc }
 
 func (iov *Iovec) SetLen(length int) {
 	iov.Len = uint32(length)
@@ -235,5 +230,3 @@ func Poll(fds []PollFd, timeout int) (n int, err error) {
 	}
 	return poll(&fds[0], len(fds), timeout)
 }
-
-func Getpagesize() int { return 4096 }
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
index 60770f627c..6fb8733d67 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_ppc64x.go
@@ -9,8 +9,10 @@ package unix
 
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
 //sys	Dup2(oldfd int, newfd int) (err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -28,7 +30,7 @@ package unix
 //sys	Pread(fd int, p []byte, offset int64) (n int, err error) = SYS_PREAD64
 //sys	Pwrite(fd int, p []byte, offset int64) (n int, err error) = SYS_PWRITE64
 //sys	Seek(fd int, offset int64, whence int) (off int64, err error) = SYS_LSEEK
-//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error)
+//sys	Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) = SYS__NEWSELECT
 //sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error)
 //sys	Setfsgid(gid int) (err error)
 //sys	Setfsuid(uid int) (err error)
@@ -61,26 +63,17 @@ package unix
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
 
-func Getpagesize() int { return 65536 }
-
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 //sysnb	Time(t *Time_t) (tt Time_t, err error)
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func (r *PtraceRegs) PC() uint64 { return r.Nip }
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
index 1708a4bbf9..c0d86e722b 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_s390x.go
@@ -15,6 +15,7 @@ import (
 //sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_NEWFSTATAT
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -46,8 +47,6 @@ import (
 //sysnb	getgroups(n int, list *_Gid_t) (nn int, err error)
 //sysnb	setgroups(n int, list *_Gid_t) (err error)
 
-func Getpagesize() int { return 4096 }
-
 //sysnb	Gettimeofday(tv *Timeval) (err error)
 
 func Time(t *Time_t) (tt Time_t, err error) {
@@ -64,19 +63,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = nsec % 1e9 / 1e3
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 //sysnb pipe2(p *[2]_C_int, flags int) (err error)
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
index 20b7454d77..78c1e0df1d 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_linux_sparc64.go
@@ -6,15 +6,12 @@
 
 package unix
 
-import (
-	"sync/atomic"
-	"syscall"
-)
-
 //sys	EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_FADVISE64
 //sys	Dup2(oldfd int, newfd int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) = SYS_FSTATAT64
 //sys	Fstatfs(fd int, buf *Statfs_t) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -63,21 +60,6 @@ import (
 //sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error)
 //sys	mmap(addr uintptr, length uintptr, prot int, flags int, fd int, offset int64) (xaddr uintptr, err error)
 
-func sysconf(name int) (n int64, err syscall.Errno)
-
-// pageSize caches the value of Getpagesize, since it can't change
-// once the system is booted.
-var pageSize int64 // accessed atomically
-
-func Getpagesize() int {
-	n := atomic.LoadInt64(&pageSize)
-	if n == 0 {
-		n, _ = sysconf(_SC_PAGESIZE)
-		atomic.StoreInt64(&pageSize, n)
-	}
-	return int(n)
-}
-
 func Ioperm(from int, num int, on int) (err error) {
 	return ENOSYS
 }
@@ -102,19 +84,12 @@ func Time(t *Time_t) (tt Time_t, err error) {
 
 //sys	Utime(path string, buf *Utimbuf) (err error)
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Sec = nsec / 1e9
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func (r *PtraceRegs) PC() uint64 { return r.Tpc }
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_linux_test.go b/installer/vendor/golang.org/x/sys/unix/syscall_linux_test.go
deleted file mode 100644
index 91184cae06..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_linux_test.go
+++ /dev/null
@@ -1,186 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux
-
-package unix_test
-
-import (
-	"io/ioutil"
-	"os"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-func TestPoll(t *testing.T) {
-	f, cleanup := mktmpfifo(t)
-	defer cleanup()
-
-	const timeout = 100
-
-	ok := make(chan bool, 1)
-	go func() {
-		select {
-		case <-time.After(10 * timeout * time.Millisecond):
-			t.Errorf("Poll: failed to timeout after %d milliseconds", 10*timeout)
-		case <-ok:
-		}
-	}()
-
-	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
-	n, err := unix.Poll(fds, timeout)
-	ok <- true
-	if err != nil {
-		t.Errorf("Poll: unexpected error: %v", err)
-		return
-	}
-	if n != 0 {
-		t.Errorf("Poll: wrong number of events: got %v, expected %v", n, 0)
-		return
-	}
-}
-
-func TestPpoll(t *testing.T) {
-	f, cleanup := mktmpfifo(t)
-	defer cleanup()
-
-	const timeout = 100 * time.Millisecond
-
-	ok := make(chan bool, 1)
-	go func() {
-		select {
-		case <-time.After(10 * timeout):
-			t.Errorf("Ppoll: failed to timeout after %d", 10*timeout)
-		case <-ok:
-		}
-	}()
-
-	fds := []unix.PollFd{{Fd: int32(f.Fd()), Events: unix.POLLIN}}
-	timeoutTs := unix.NsecToTimespec(int64(timeout))
-	n, err := unix.Ppoll(fds, &timeoutTs, nil)
-	ok <- true
-	if err != nil {
-		t.Errorf("Ppoll: unexpected error: %v", err)
-		return
-	}
-	if n != 0 {
-		t.Errorf("Ppoll: wrong number of events: got %v, expected %v", n, 0)
-		return
-	}
-}
-
-// mktmpfifo creates a temporary FIFO and provides a cleanup function.
-func mktmpfifo(t *testing.T) (*os.File, func()) {
-	err := unix.Mkfifo("fifo", 0666)
-	if err != nil {
-		t.Fatalf("mktmpfifo: failed to create FIFO: %v", err)
-	}
-
-	f, err := os.OpenFile("fifo", os.O_RDWR, 0666)
-	if err != nil {
-		os.Remove("fifo")
-		t.Fatalf("mktmpfifo: failed to open FIFO: %v", err)
-	}
-
-	return f, func() {
-		f.Close()
-		os.Remove("fifo")
-	}
-}
-
-func TestTime(t *testing.T) {
-	var ut unix.Time_t
-	ut2, err := unix.Time(&ut)
-	if err != nil {
-		t.Fatalf("Time: %v", err)
-	}
-	if ut != ut2 {
-		t.Errorf("Time: return value %v should be equal to argument %v", ut2, ut)
-	}
-
-	var now time.Time
-
-	for i := 0; i < 10; i++ {
-		ut, err = unix.Time(nil)
-		if err != nil {
-			t.Fatalf("Time: %v", err)
-		}
-
-		now = time.Now()
-
-		if int64(ut) == now.Unix() {
-			return
-		}
-	}
-
-	t.Errorf("Time: return value %v should be nearly equal to time.Now().Unix() %v", ut, now.Unix())
-}
-
-func TestUtime(t *testing.T) {
-	defer chtmpdir(t)()
-
-	touch(t, "file1")
-
-	buf := &unix.Utimbuf{
-		Modtime: 12345,
-	}
-
-	err := unix.Utime("file1", buf)
-	if err != nil {
-		t.Fatalf("Utime: %v", err)
-	}
-
-	fi, err := os.Stat("file1")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if fi.ModTime().Unix() != 12345 {
-		t.Errorf("Utime: failed to change modtime: expected %v, got %v", 12345, fi.ModTime().Unix())
-	}
-}
-
-func TestGetrlimit(t *testing.T) {
-	var rlim unix.Rlimit
-	err := unix.Getrlimit(unix.RLIMIT_AS, &rlim)
-	if err != nil {
-		t.Fatalf("Getrlimit: %v", err)
-	}
-}
-
-// utilities taken from os/os_test.go
-
-func touch(t *testing.T, name string) {
-	f, err := os.Create(name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if err := f.Close(); err != nil {
-		t.Fatal(err)
-	}
-}
-
-// chtmpdir changes the working directory to a new temporary directory and
-// provides a cleanup function. Used when PWD is read-only.
-func chtmpdir(t *testing.T) func() {
-	oldwd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	d, err := ioutil.TempDir("", "test")
-	if err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	if err := os.Chdir(d); err != nil {
-		t.Fatalf("chtmpdir: %v", err)
-	}
-	return func() {
-		if err := os.Chdir(oldwd); err != nil {
-			t.Fatalf("chtmpdir: %v", err)
-		}
-		os.RemoveAll(d)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd.go b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd.go
index c4e945cd69..e1a3baa237 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd.go
@@ -17,6 +17,7 @@ import (
 	"unsafe"
 )
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
 	Family uint8
@@ -55,7 +56,6 @@ func sysctlNodes(mib []_C_int) (nodes []Sysctlnode, err error) {
 }
 
 func nametomib(name string) (mib []_C_int, err error) {
-
 	// Split name into components.
 	var parts []string
 	last := 0
@@ -93,34 +93,6 @@ func nametomib(name string) (mib []_C_int, err error) {
 	return mib, nil
 }
 
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names. It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sysnb pipe() (fd1 int, fd2 int, err error)
 func Pipe(p []int) (err error) {
 	if len(p) != 2 {
@@ -135,11 +107,118 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	return getdents(fd, buf)
 }
 
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
 // TODO
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	return -1, ENOSYS
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 /*
  * Exposed directly
  */
@@ -154,13 +233,16 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Dup(fd int) (nfd int, err error)
 //sys	Dup2(from int, to int) (err error)
 //sys	Exit(code int)
+//sys	Fadvise(fd int, offset int64, length int64, advice int) (err error) = SYS_POSIX_FADVISE
 //sys	Fchdir(fd int) (err error)
 //sys	Fchflags(fd int, flags int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
 //sysnb	Getegid() (egid int)
@@ -186,11 +268,6 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	Mkdir(path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
@@ -226,6 +303,7 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 //sys	munmap(addr uintptr, length uintptr) (err error)
 //sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
 //sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
 /*
  * Unimplemented
@@ -245,7 +323,6 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 // __msync13
 // __ntp_gettime30
 // __posix_chown
-// __posix_fadvise50
 // __posix_fchown
 // __posix_lchown
 // __posix_rename
@@ -404,7 +481,6 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 // getitimer
 // getvfsstat
 // getxattr
-// ioctl
 // ktrace
 // lchflags
 // lchmod
@@ -442,7 +518,6 @@ func sendfile(outfd int, infd int, offset *int64, count int) (written int, err e
 // ntp_adjtime
 // pmc_control
 // pmc_get_info
-// poll
 // pollts
 // preadv
 // profil
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
index afaca09838..24f74e58ce 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_386.go
@@ -6,21 +6,12 @@
 
 package unix
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
index a6ff04ce5b..6878bf7ff9 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_amd64.go
@@ -6,21 +6,12 @@
 
 package unix
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int64(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
index 68a6969b28..dbbfcf71db 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_netbsd_arm.go
@@ -6,21 +6,12 @@
 
 package unix
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_no_getwd.go b/installer/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
deleted file mode 100644
index 530792ea93..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_no_getwd.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build dragonfly freebsd netbsd openbsd
-
-package unix
-
-const ImplementsGetwd = false
-
-func Getwd() (string, error) { return "", ENOTSUP }
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd.go b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd.go
index 246131d2af..614fcf0494 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd.go
@@ -13,10 +13,12 @@
 package unix
 
 import (
+	"sort"
 	"syscall"
 	"unsafe"
 )
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Len    uint8
 	Family uint8
@@ -32,55 +34,15 @@ type SockaddrDatalink struct {
 func Syscall9(trap, a1, a2, a3, a4, a5, a6, a7, a8, a9 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
 func nametomib(name string) (mib []_C_int, err error) {
-
-	// Perform lookup via a binary search
-	left := 0
-	right := len(sysctlMib) - 1
-	for {
-		idx := left + (right-left)/2
-		switch {
-		case name == sysctlMib[idx].ctlname:
-			return sysctlMib[idx].ctloid, nil
-		case name > sysctlMib[idx].ctlname:
-			left = idx + 1
-		default:
-			right = idx - 1
-		}
-		if left > right {
-			break
-		}
+	i := sort.Search(len(sysctlMib), func(i int) bool {
+		return sysctlMib[i].ctlname >= name
+	})
+	if i < len(sysctlMib) && sysctlMib[i].ctlname == name {
+		return sysctlMib[i].ctloid, nil
 	}
 	return nil, EINVAL
 }
 
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names. It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Fileno == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:dirent.Namlen])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sysnb pipe(p *[2]_C_int) (err error)
 func Pipe(p []int) (err error) {
 	if len(p) != 2 {
@@ -98,6 +60,23 @@ func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	return getdents(fd, buf)
 }
 
+const ImplementsGetwd = true
+
+//sys	Getcwd(buf []byte) (n int, err error) = SYS___GETCWD
+
+func Getwd() (string, error) {
+	var buf [PathMax]byte
+	_, err := Getcwd(buf[0:])
+	if err != nil {
+		return "", err
+	}
+	n := clen(buf[:])
+	if n < 1 {
+		return "", EINVAL
+	}
+	return string(buf[:n]), nil
+}
+
 // TODO
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	return -1, ENOSYS
@@ -118,6 +97,96 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 	return
 }
 
+func setattrlistTimes(path string, times []Timespec, flags int) error {
+	// used on Darwin for UtimesNano
+	return ENOSYS
+}
+
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
+
+// ioctl itself should not be exposed directly, but additional get/set
+// functions for specific types are permissible.
+
+// IoctlSetInt performs an ioctl operation which sets an integer value
+// on fd, using the specified request number.
+func IoctlSetInt(fd int, req uint, value int) error {
+	return ioctl(fd, req, uintptr(value))
+}
+
+func IoctlSetWinsize(fd int, req uint, value *Winsize) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+func IoctlSetTermios(fd int, req uint, value *Termios) error {
+	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
+}
+
+// IoctlGetInt performs an ioctl operation which gets an integer value
+// from fd, using the specified request number.
+func IoctlGetInt(fd int, req uint) (int, error) {
+	var value int
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return value, err
+}
+
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
+	var value Winsize
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
+	var value Termios
+	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
+	return &value, err
+}
+
+func Uname(uname *Utsname) error {
+	mib := []_C_int{CTL_KERN, KERN_OSTYPE}
+	n := unsafe.Sizeof(uname.Sysname)
+	if err := sysctl(mib, &uname.Sysname[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_HOSTNAME}
+	n = unsafe.Sizeof(uname.Nodename)
+	if err := sysctl(mib, &uname.Nodename[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_OSRELEASE}
+	n = unsafe.Sizeof(uname.Release)
+	if err := sysctl(mib, &uname.Release[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	mib = []_C_int{CTL_KERN, KERN_VERSION}
+	n = unsafe.Sizeof(uname.Version)
+	if err := sysctl(mib, &uname.Version[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	// The version might have newlines or tabs in it, convert them to
+	// spaces.
+	for i, b := range uname.Version {
+		if b == '\n' || b == '\t' {
+			if i == len(uname.Version)-1 {
+				uname.Version[i] = 0
+			} else {
+				uname.Version[i] = ' '
+			}
+		}
+	}
+
+	mib = []_C_int{CTL_HW, HW_MACHINE}
+	n = unsafe.Sizeof(uname.Machine)
+	if err := sysctl(mib, &uname.Machine[0], &n, nil, 0); err != nil {
+		return err
+	}
+
+	return nil
+}
+
 /*
  * Exposed directly
  */
@@ -135,10 +204,12 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys	Fchdir(fd int) (err error)
 //sys	Fchflags(fd int, flags int) (err error)
 //sys	Fchmod(fd int, mode uint32) (err error)
+//sys	Fchmodat(dirfd int, path string, mode uint32, flags int) (err error)
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
 //sys	Fstatfs(fd int, stat *Statfs_t) (err error)
 //sys	Fsync(fd int) (err error)
 //sys	Ftruncate(fd int, length int64) (err error)
@@ -151,6 +222,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sysnb	Getppid() (ppid int)
 //sys	Getpriority(which int, who int) (prio int, err error)
 //sysnb	Getrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Getrtable() (rtable int, err error)
 //sysnb	Getrusage(who int, rusage *Rusage) (err error)
 //sysnb	Getsid(pid int) (sid int, err error)
 //sysnb	Gettimeofday(tv *Timeval) (err error)
@@ -165,11 +237,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys	Mkdir(path string, mode uint32) (err error)
 //sys	Mkfifo(path string, mode uint32) (err error)
 //sys	Mknod(path string, mode uint32, dev int) (err error)
-//sys	Mlock(b []byte) (err error)
-//sys	Mlockall(flags int) (err error)
-//sys	Mprotect(b []byte, prot int) (err error)
-//sys	Munlock(b []byte) (err error)
-//sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
 //sys	Open(path string, mode int, perm uint32) (fd int, err error)
 //sys	Pathconf(path string, name int) (val int, err error)
@@ -193,6 +260,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sysnb	Setresgid(rgid int, egid int, sgid int) (err error)
 //sysnb	Setresuid(ruid int, euid int, suid int) (err error)
 //sysnb	Setrlimit(which int, lim *Rlimit) (err error)
+//sysnb	Setrtable(rtable int) (err error)
 //sysnb	Setsid() (pid int, err error)
 //sysnb	Settimeofday(tp *Timeval) (err error)
 //sysnb	Setuid(uid int) (err error)
@@ -209,6 +277,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 //sys	munmap(addr uintptr, length uintptr) (err error)
 //sys	readlen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_READ
 //sys	writelen(fd int, buf *byte, nbuf int) (n int, err error) = SYS_WRITE
+//sys	utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error)
 
 /*
  * Unimplemented
@@ -240,9 +309,7 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // getlogin
 // getresgid
 // getresuid
-// getrtable
 // getthrid
-// ioctl
 // ktrace
 // lfs_bmapv
 // lfs_markv
@@ -263,7 +330,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // nfssvc
 // nnpfspioctl
 // openat
-// poll
 // preadv
 // profil
 // pwritev
@@ -278,7 +344,6 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // semop
 // setgroups
 // setitimer
-// setrtable
 // setsockopt
 // shmat
 // shmctl
@@ -298,6 +363,5 @@ func Getfsstat(buf []Statfs_t, flags int) (n int, err error) {
 // thrsleep
 // thrwakeup
 // unlinkat
-// utimensat
 // vfork
 // writev
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
index a66ddc59ce..994964a916 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_386.go
@@ -6,21 +6,12 @@
 
 package unix
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = int64(nsec / 1e9)
-	ts.Nsec = int32(nsec % 1e9)
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
index 0776c1faf9..649e67fccc 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_amd64.go
@@ -6,21 +6,12 @@
 
 package unix
 
-func Getpagesize() int { return 4096 }
-
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = nsec / 1e9
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func SetKevent(k *Kevent_t, fd, mode, flags int) {
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
new file mode 100644
index 0000000000..59844f5041
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_openbsd_arm.go
@@ -0,0 +1,33 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build arm,openbsd
+
+package unix
+
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: int32(nsec)}
+}
+
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: int32(usec)}
+}
+
+func SetKevent(k *Kevent_t, fd, mode, flags int) {
+	k.Ident = uint32(fd)
+	k.Filter = int16(mode)
+	k.Flags = uint16(flags)
+}
+
+func (iov *Iovec) SetLen(length int) {
+	iov.Len = uint32(length)
+}
+
+func (msghdr *Msghdr) SetControllen(length int) {
+	msghdr.Controllen = uint32(length)
+}
+
+func (cmsg *Cmsghdr) SetLen(length int) {
+	cmsg.Len = uint32(length)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_solaris.go b/installer/vendor/golang.org/x/sys/unix/syscall_solaris.go
index acb74b1d15..b7629529b3 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_solaris.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_solaris.go
@@ -13,7 +13,6 @@
 package unix
 
 import (
-	"sync/atomic"
 	"syscall"
 	"unsafe"
 )
@@ -24,6 +23,7 @@ type syscallFunc uintptr
 func rawSysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
 func sysvicall6(trap, nargs, a1, a2, a3, a4, a5, a6 uintptr) (r1, r2 uintptr, err syscall.Errno)
 
+// SockaddrDatalink implements the Sockaddr interface for AF_LINK type sockets.
 type SockaddrDatalink struct {
 	Family uint16
 	Index  uint16
@@ -35,43 +35,6 @@ type SockaddrDatalink struct {
 	raw    RawSockaddrDatalink
 }
 
-func clen(n []byte) int {
-	for i := 0; i < len(n); i++ {
-		if n[i] == 0 {
-			return i
-		}
-	}
-	return len(n)
-}
-
-// ParseDirent parses up to max directory entries in buf,
-// appending the names to names.  It returns the number
-// bytes consumed from buf, the number of entries added
-// to names, and the new names slice.
-func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string) {
-	origlen := len(buf)
-	for max != 0 && len(buf) > 0 {
-		dirent := (*Dirent)(unsafe.Pointer(&buf[0]))
-		if dirent.Reclen == 0 {
-			buf = nil
-			break
-		}
-		buf = buf[dirent.Reclen:]
-		if dirent.Ino == 0 { // File absent in directory.
-			continue
-		}
-		bytes := (*[10000]byte)(unsafe.Pointer(&dirent.Name[0]))
-		var name = string(bytes[0:clen(bytes[:])])
-		if name == "." || name == ".." { // Useless names
-			continue
-		}
-		max--
-		count++
-		names = append(names, name)
-	}
-	return origlen - len(buf), count, names
-}
-
 //sysnb	pipe(p *[2]_C_int) (n int, err error)
 
 func Pipe(p []int) (err error) {
@@ -152,6 +115,18 @@ func Getsockname(fd int) (sa Sockaddr, err error) {
 	return anyToSockaddr(&rsa)
 }
 
+// GetsockoptString returns the string value of the socket option opt for the
+// socket associated with fd at the given socket level.
+func GetsockoptString(fd, level, opt int) (string, error) {
+	buf := make([]byte, 256)
+	vallen := _Socklen(len(buf))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&buf[0]), &vallen)
+	if err != nil {
+		return "", err
+	}
+	return string(buf[:vallen-1]), nil
+}
+
 const ImplementsGetwd = true
 
 //sys	Getcwd(buf []byte) (n int, err error)
@@ -179,7 +154,7 @@ func Getwd() (wd string, err error) {
 
 func Getgroups() (gids []int, err error) {
 	n, err := getgroups(0, nil)
-	// Check for error and sanity check group count.  Newer versions of
+	// Check for error and sanity check group count. Newer versions of
 	// Solaris allow up to 1024 (NGROUPS_MAX).
 	if n < 0 || n > 1024 {
 		if err != nil {
@@ -337,6 +312,12 @@ func UtimesNanoAt(dirfd int, path string, ts []Timespec, flags int) error {
 
 //sys	fcntl(fd int, cmd int, arg int) (val int, err error)
 
+// FcntlInt performs a fcntl syscall on fd with the provided command and argument.
+func FcntlInt(fd uintptr, cmd, arg int) (int, error) {
+	valptr, _, err := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(arg), 0, 0, 0)
+	return int(valptr), err
+}
+
 // FcntlFlock performs a fcntl syscall for the F_GETLK, F_SETLK or F_SETLKW command.
 func FcntlFlock(fd uintptr, cmd int, lk *Flock_t) error {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procfcntl)), 3, uintptr(fd), uintptr(cmd), uintptr(unsafe.Pointer(lk)), 0, 0, 0)
@@ -363,7 +344,7 @@ func Futimesat(dirfd int, path string, tv []Timeval) error {
 }
 
 // Solaris doesn't have an futimes function because it allows NULL to be
-// specified as the path for futimesat.  However, Go doesn't like
+// specified as the path for futimesat. However, Go doesn't like
 // NULL-style string interfaces, so this simple wrapper is provided.
 func Futimes(fd int, tv []Timeval) error {
 	if tv == nil {
@@ -434,7 +415,7 @@ func Accept(fd int) (nfd int, sa Sockaddr, err error) {
 	return
 }
 
-//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.recvmsg
+//sys	recvmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_recvmsg
 
 func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from Sockaddr, err error) {
 	var msg Msghdr
@@ -453,7 +434,7 @@ func Recvmsg(fd int, p, oob []byte, flags int) (n, oobn int, recvflags int, from
 			iov.Base = &dummy
 			iov.SetLen(1)
 		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
+		msg.Accrightslen = int32(len(oob))
 	}
 	msg.Iov = &iov
 	msg.Iovlen = 1
@@ -473,7 +454,7 @@ func Sendmsg(fd int, p, oob []byte, to Sockaddr, flags int) (err error) {
 	return
 }
 
-//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.sendmsg
+//sys	sendmsg(s int, msg *Msghdr, flags int) (n int, err error) = libsocket.__xnet_sendmsg
 
 func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error) {
 	var ptr unsafe.Pointer
@@ -499,7 +480,7 @@ func SendmsgN(fd int, p, oob []byte, to Sockaddr, flags int) (n int, err error)
 			iov.Base = &dummy
 			iov.SetLen(1)
 		}
-		msg.Accrights = (*int8)(unsafe.Pointer(&oob[0]))
+		msg.Accrightslen = int32(len(oob))
 	}
 	msg.Iov = &iov
 	msg.Iovlen = 1
@@ -527,52 +508,79 @@ func Acct(path string) (err error) {
 	return acct(pathp)
 }
 
+//sys	__makedev(version int, major uint, minor uint) (val uint64)
+
+func Mkdev(major, minor uint32) uint64 {
+	return __makedev(NEWDEV, uint(major), uint(minor))
+}
+
+//sys	__major(version int, dev uint64) (val uint)
+
+func Major(dev uint64) uint32 {
+	return uint32(__major(NEWDEV, dev))
+}
+
+//sys	__minor(version int, dev uint64) (val uint)
+
+func Minor(dev uint64) uint32 {
+	return uint32(__minor(NEWDEV, dev))
+}
+
 /*
  * Expose the ioctl function
  */
 
-//sys	ioctl(fd int, req int, arg uintptr) (err error)
+//sys	ioctl(fd int, req uint, arg uintptr) (err error)
 
-func IoctlSetInt(fd int, req int, value int) (err error) {
+func IoctlSetInt(fd int, req uint, value int) (err error) {
 	return ioctl(fd, req, uintptr(value))
 }
 
-func IoctlSetWinsize(fd int, req int, value *Winsize) (err error) {
+func IoctlSetWinsize(fd int, req uint, value *Winsize) (err error) {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermios(fd int, req int, value *Termios) (err error) {
+func IoctlSetTermios(fd int, req uint, value *Termios) (err error) {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlSetTermio(fd int, req int, value *Termio) (err error) {
+func IoctlSetTermio(fd int, req uint, value *Termio) (err error) {
 	return ioctl(fd, req, uintptr(unsafe.Pointer(value)))
 }
 
-func IoctlGetInt(fd int, req int) (int, error) {
+func IoctlGetInt(fd int, req uint) (int, error) {
 	var value int
 	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return value, err
 }
 
-func IoctlGetWinsize(fd int, req int) (*Winsize, error) {
+func IoctlGetWinsize(fd int, req uint) (*Winsize, error) {
 	var value Winsize
 	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
-func IoctlGetTermios(fd int, req int) (*Termios, error) {
+func IoctlGetTermios(fd int, req uint) (*Termios, error) {
 	var value Termios
 	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
-func IoctlGetTermio(fd int, req int) (*Termio, error) {
+func IoctlGetTermio(fd int, req uint) (*Termio, error) {
 	var value Termio
 	err := ioctl(fd, req, uintptr(unsafe.Pointer(&value)))
 	return &value, err
 }
 
+//sys   poll(fds *PollFd, nfds int, timeout int) (n int, err error)
+
+func Poll(fds []PollFd, timeout int) (n int, err error) {
+	if len(fds) == 0 {
+		return poll(nil, 0, timeout)
+	}
+	return poll(&fds[0], len(fds), timeout)
+}
+
 /*
  * Exposed directly
  */
@@ -593,8 +601,11 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sys	Fchown(fd int, uid int, gid int) (err error)
 //sys	Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error)
 //sys	Fdatasync(fd int) (err error)
+//sys	Flock(fd int, how int) (err error)
 //sys	Fpathconf(fd int, name int) (val int, err error)
 //sys	Fstat(fd int, stat *Stat_t) (err error)
+//sys	Fstatat(fd int, path string, stat *Stat_t, flags int) (err error)
+//sys	Fstatvfs(fd int, vfsstat *Statvfs_t) (err error)
 //sys	Getdents(fd int, buf []byte, basep *uintptr) (n int, err error)
 //sysnb	Getgid() (gid int)
 //sysnb	Getpid() (pid int)
@@ -611,7 +622,7 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sys	Kill(pid int, signum syscall.Signal) (err error)
 //sys	Lchown(path string, uid int, gid int) (err error)
 //sys	Link(path string, link string) (err error)
-//sys	Listen(s int, backlog int) (err error) = libsocket.listen
+//sys	Listen(s int, backlog int) (err error) = libsocket.__xnet_llisten
 //sys	Lstat(path string, stat *Stat_t) (err error)
 //sys	Madvise(b []byte, advice int) (err error)
 //sys	Mkdir(path string, mode uint32) (err error)
@@ -623,6 +634,7 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sys	Mlock(b []byte) (err error)
 //sys	Mlockall(flags int) (err error)
 //sys	Mprotect(b []byte, prot int) (err error)
+//sys	Msync(b []byte, flags int) (err error)
 //sys	Munlock(b []byte) (err error)
 //sys	Munlockall() (err error)
 //sys	Nanosleep(time *Timespec, leftover *Timespec) (err error)
@@ -638,6 +650,7 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sys	Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err error)
 //sys	Rmdir(path string) (err error)
 //sys	Seek(fd int, offset int64, whence int) (newoffset int64, err error) = lseek
+//sys	Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error)
 //sysnb	Setegid(egid int) (err error)
 //sysnb	Seteuid(euid int) (err error)
 //sysnb	Setgid(gid int) (err error)
@@ -651,6 +664,7 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sysnb	Setuid(uid int) (err error)
 //sys	Shutdown(s int, how int) (err error) = libsocket.shutdown
 //sys	Stat(path string, stat *Stat_t) (err error)
+//sys	Statvfs(path string, vfsstat *Statvfs_t) (err error)
 //sys	Symlink(path string, link string) (err error)
 //sys	Sync() (err error)
 //sysnb	Times(tms *Tms) (ticks uintptr, err error)
@@ -664,15 +678,16 @@ func IoctlGetTermio(fd int, req int) (*Termio, error) {
 //sys	Unlinkat(dirfd int, path string, flags int) (err error)
 //sys	Ustat(dev int, ubuf *Ustat_t) (err error)
 //sys	Utime(path string, buf *Utimbuf) (err error)
-//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.bind
-//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.connect
+//sys	bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_bind
+//sys	connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_connect
 //sys	mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error)
 //sys	munmap(addr uintptr, length uintptr) (err error)
-//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.sendto
-//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.socket
-//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.socketpair
+//sys	sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) = libsendfile.sendfile
+//sys	sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) = libsocket.__xnet_sendto
+//sys	socket(domain int, typ int, proto int) (fd int, err error) = libsocket.__xnet_socket
+//sysnb	socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) = libsocket.__xnet_socketpair
 //sys	write(fd int, p []byte) (n int, err error)
-//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.getsockopt
+//sys	getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) = libsocket.__xnet_getsockopt
 //sysnb	getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) = libsocket.getpeername
 //sys	setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) = libsocket.setsockopt
 //sys	recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) = libsocket.recvfrom
@@ -708,18 +723,3 @@ func Mmap(fd int, offset int64, length int, prot int, flags int) (data []byte, e
 func Munmap(b []byte) (err error) {
 	return mapper.Munmap(b)
 }
-
-//sys	sysconf(name int) (n int64, err error)
-
-// pageSize caches the value of Getpagesize, since it can't change
-// once the system is booted.
-var pageSize int64 // accessed atomically
-
-func Getpagesize() int {
-	n := atomic.LoadInt64(&pageSize)
-	if n == 0 {
-		n, _ = sysconf(_SC_PAGESIZE)
-		atomic.StoreInt64(&pageSize, n)
-	}
-	return int(n)
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go b/installer/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
index 5aff62c3bb..91c32ddf02 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_solaris_amd64.go
@@ -6,19 +6,12 @@
 
 package unix
 
-func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
-
-func NsecToTimespec(nsec int64) (ts Timespec) {
-	ts.Sec = nsec / 1e9
-	ts.Nsec = nsec % 1e9
-	return
+func setTimespec(sec, nsec int64) Timespec {
+	return Timespec{Sec: sec, Nsec: nsec}
 }
 
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	nsec += 999 // round up to microsecond
-	tv.Usec = nsec % 1e9 / 1e3
-	tv.Sec = int64(nsec / 1e9)
-	return
+func setTimeval(sec, usec int64) Timeval {
+	return Timeval{Sec: sec, Usec: usec}
 }
 
 func (iov *Iovec) SetLen(length int) {
@@ -28,8 +21,3 @@ func (iov *Iovec) SetLen(length int) {
 func (cmsg *Cmsghdr) SetLen(length int) {
 	cmsg.Len = uint32(length)
 }
-
-func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
-	// TODO(aram): implement this, see issue 5847.
-	panic("unimplemented")
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_test.go b/installer/vendor/golang.org/x/sys/unix/syscall_test.go
deleted file mode 100644
index 95eac92aca..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_test.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"fmt"
-	"testing"
-
-	"golang.org/x/sys/unix"
-)
-
-func testSetGetenv(t *testing.T, key, value string) {
-	err := unix.Setenv(key, value)
-	if err != nil {
-		t.Fatalf("Setenv failed to set %q: %v", value, err)
-	}
-	newvalue, found := unix.Getenv(key)
-	if !found {
-		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
-	}
-	if newvalue != value {
-		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
-	}
-}
-
-func TestEnv(t *testing.T) {
-	testSetGetenv(t, "TESTENV", "AVALUE")
-	// make sure TESTENV gets set to "", not deleted
-	testSetGetenv(t, "TESTENV", "")
-}
-
-func TestItoa(t *testing.T) {
-	// Make most negative integer: 0x8000...
-	i := 1
-	for i<<1 != 0 {
-		i <<= 1
-	}
-	if i >= 0 {
-		t.Fatal("bad math")
-	}
-	s := unix.Itoa(i)
-	f := fmt.Sprint(i)
-	if s != f {
-		t.Fatalf("itoa(%d) = %s, want %s", i, s, f)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_unix.go b/installer/vendor/golang.org/x/sys/unix/syscall_unix.go
index 8a5237de8a..b835bad0fe 100644
--- a/installer/vendor/golang.org/x/sys/unix/syscall_unix.go
+++ b/installer/vendor/golang.org/x/sys/unix/syscall_unix.go
@@ -7,7 +7,9 @@
 package unix
 
 import (
+	"bytes"
 	"runtime"
+	"sort"
 	"sync"
 	"syscall"
 	"unsafe"
@@ -23,6 +25,7 @@ const (
 	darwin64Bit    = runtime.GOOS == "darwin" && sizeofPtr == 8
 	dragonfly64Bit = runtime.GOOS == "dragonfly" && sizeofPtr == 8
 	netbsd32Bit    = runtime.GOOS == "netbsd" && sizeofPtr == 4
+	solaris64Bit   = runtime.GOOS == "solaris" && sizeofPtr == 8
 )
 
 // Do the interface allocations only once for common
@@ -49,6 +52,37 @@ func errnoErr(e syscall.Errno) error {
 	return e
 }
 
+// ErrnoName returns the error name for error number e.
+func ErrnoName(e syscall.Errno) string {
+	i := sort.Search(len(errorList), func(i int) bool {
+		return errorList[i].num >= e
+	})
+	if i < len(errorList) && errorList[i].num == e {
+		return errorList[i].name
+	}
+	return ""
+}
+
+// SignalName returns the signal name for signal number s.
+func SignalName(s syscall.Signal) string {
+	i := sort.Search(len(signalList), func(i int) bool {
+		return signalList[i].num >= s
+	})
+	if i < len(signalList) && signalList[i].num == s {
+		return signalList[i].name
+	}
+	return ""
+}
+
+// clen returns the index of the first NULL byte in n or len(n) if n contains no NULL byte.
+func clen(n []byte) int {
+	i := bytes.IndexByte(n, 0)
+	if i == -1 {
+		i = len(n)
+	}
+	return i
+}
+
 // Mmap manager, for use by operating system-specific implementations.
 
 type mmapper struct {
@@ -137,16 +171,19 @@ func Write(fd int, p []byte) (n int, err error) {
 // creation of IPv6 sockets to return EAFNOSUPPORT.
 var SocketDisableIPv6 bool
 
+// Sockaddr represents a socket address.
 type Sockaddr interface {
 	sockaddr() (ptr unsafe.Pointer, len _Socklen, err error) // lowercase; only we can define Sockaddrs
 }
 
+// SockaddrInet4 implements the Sockaddr interface for AF_INET type sockets.
 type SockaddrInet4 struct {
 	Port int
 	Addr [4]byte
 	raw  RawSockaddrInet4
 }
 
+// SockaddrInet6 implements the Sockaddr interface for AF_INET6 type sockets.
 type SockaddrInet6 struct {
 	Port   int
 	ZoneId uint32
@@ -154,6 +191,7 @@ type SockaddrInet6 struct {
 	raw    RawSockaddrInet6
 }
 
+// SockaddrUnix implements the Sockaddr interface for AF_UNIX type sockets.
 type SockaddrUnix struct {
 	Name string
 	raw  RawSockaddrUnix
@@ -184,6 +222,13 @@ func Getpeername(fd int) (sa Sockaddr, err error) {
 	return anyToSockaddr(&rsa)
 }
 
+func GetsockoptByte(fd, level, opt int) (value byte, err error) {
+	var n byte
+	vallen := _Socklen(1)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&n), &vallen)
+	return n, err
+}
+
 func GetsockoptInt(fd, level, opt int) (value int, err error) {
 	var n int32
 	vallen := _Socklen(4)
@@ -191,6 +236,54 @@ func GetsockoptInt(fd, level, opt int) (value int, err error) {
 	return int(n), err
 }
 
+func GetsockoptInet4Addr(fd, level, opt int) (value [4]byte, err error) {
+	vallen := _Socklen(4)
+	err = getsockopt(fd, level, opt, unsafe.Pointer(&value[0]), &vallen)
+	return value, err
+}
+
+func GetsockoptIPMreq(fd, level, opt int) (*IPMreq, error) {
+	var value IPMreq
+	vallen := _Socklen(SizeofIPMreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6Mreq(fd, level, opt int) (*IPv6Mreq, error) {
+	var value IPv6Mreq
+	vallen := _Socklen(SizeofIPv6Mreq)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptIPv6MTUInfo(fd, level, opt int) (*IPv6MTUInfo, error) {
+	var value IPv6MTUInfo
+	vallen := _Socklen(SizeofIPv6MTUInfo)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptICMPv6Filter(fd, level, opt int) (*ICMPv6Filter, error) {
+	var value ICMPv6Filter
+	vallen := _Socklen(SizeofICMPv6Filter)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&value), &vallen)
+	return &value, err
+}
+
+func GetsockoptLinger(fd, level, opt int) (*Linger, error) {
+	var linger Linger
+	vallen := _Socklen(SizeofLinger)
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&linger), &vallen)
+	return &linger, err
+}
+
+func GetsockoptTimeval(fd, level, opt int) (*Timeval, error) {
+	var tv Timeval
+	vallen := _Socklen(unsafe.Sizeof(tv))
+	err := getsockopt(fd, level, opt, unsafe.Pointer(&tv), &vallen)
+	return &tv, err
+}
+
 func Recvfrom(fd int, p []byte, flags int) (n int, from Sockaddr, err error) {
 	var rsa RawSockaddrAny
 	var len _Socklen = SizeofSockaddrAny
@@ -290,3 +383,12 @@ func SetNonblock(fd int, nonblocking bool) (err error) {
 	_, err = fcntl(fd, F_SETFL, flag)
 	return err
 }
+
+// Exec calls execve(2), which replaces the calling executable in the process
+// tree. argv0 should be the full path to an executable ("/bin/ls") and the
+// executable name should also be the first argument in argv (["ls", "-l"]).
+// envv are the environment variables that should be passed to the new
+// process (["USER=go", "PWD=/tmp"]).
+func Exec(argv0 string, argv []string, envv []string) error {
+	return syscall.Exec(argv0, argv, envv)
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/syscall_unix_test.go b/installer/vendor/golang.org/x/sys/unix/syscall_unix_test.go
deleted file mode 100644
index 49208a000d..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/syscall_unix_test.go
+++ /dev/null
@@ -1,353 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package unix_test
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/unix"
-)
-
-// Tests that below functions, structures and constants are consistent
-// on all Unix-like systems.
-func _() {
-	// program scheduling priority functions and constants
-	var (
-		_ func(int, int, int) error   = unix.Setpriority
-		_ func(int, int) (int, error) = unix.Getpriority
-	)
-	const (
-		_ int = unix.PRIO_USER
-		_ int = unix.PRIO_PROCESS
-		_ int = unix.PRIO_PGRP
-	)
-
-	// termios constants
-	const (
-		_ int = unix.TCIFLUSH
-		_ int = unix.TCIOFLUSH
-		_ int = unix.TCOFLUSH
-	)
-
-	// fcntl file locking structure and constants
-	var (
-		_ = unix.Flock_t{
-			Type:   int16(0),
-			Whence: int16(0),
-			Start:  int64(0),
-			Len:    int64(0),
-			Pid:    int32(0),
-		}
-	)
-	const (
-		_ = unix.F_GETLK
-		_ = unix.F_SETLK
-		_ = unix.F_SETLKW
-	)
-}
-
-// TestFcntlFlock tests whether the file locking structure matches
-// the calling convention of each kernel.
-func TestFcntlFlock(t *testing.T) {
-	name := filepath.Join(os.TempDir(), "TestFcntlFlock")
-	fd, err := unix.Open(name, unix.O_CREAT|unix.O_RDWR|unix.O_CLOEXEC, 0)
-	if err != nil {
-		t.Fatalf("Open failed: %v", err)
-	}
-	defer unix.Unlink(name)
-	defer unix.Close(fd)
-	flock := unix.Flock_t{
-		Type:  unix.F_RDLCK,
-		Start: 0, Len: 0, Whence: 1,
-	}
-	if err := unix.FcntlFlock(uintptr(fd), unix.F_GETLK, &flock); err != nil {
-		t.Fatalf("FcntlFlock failed: %v", err)
-	}
-}
-
-// TestPassFD tests passing a file descriptor over a Unix socket.
-//
-// This test involved both a parent and child process. The parent
-// process is invoked as a normal test, with "go test", which then
-// runs the child process by running the current test binary with args
-// "-test.run=^TestPassFD$" and an environment variable used to signal
-// that the test should become the child process instead.
-func TestPassFD(t *testing.T) {
-	switch runtime.GOOS {
-	case "dragonfly":
-		// TODO(jsing): Figure out why sendmsg is returning EINVAL.
-		t.Skip("skipping test on dragonfly")
-	case "solaris":
-		// TODO(aram): Figure out why ReadMsgUnix is returning empty message.
-		t.Skip("skipping test on solaris, see issue 7402")
-	}
-	if os.Getenv("GO_WANT_HELPER_PROCESS") == "1" {
-		passFDChild()
-		return
-	}
-
-	tempDir, err := ioutil.TempDir("", "TestPassFD")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	fds, err := unix.Socketpair(unix.AF_LOCAL, unix.SOCK_STREAM, 0)
-	if err != nil {
-		t.Fatalf("Socketpair: %v", err)
-	}
-	defer unix.Close(fds[0])
-	defer unix.Close(fds[1])
-	writeFile := os.NewFile(uintptr(fds[0]), "child-writes")
-	readFile := os.NewFile(uintptr(fds[1]), "parent-reads")
-	defer writeFile.Close()
-	defer readFile.Close()
-
-	cmd := exec.Command(os.Args[0], "-test.run=^TestPassFD$", "--", tempDir)
-	cmd.Env = []string{"GO_WANT_HELPER_PROCESS=1"}
-	if lp := os.Getenv("LD_LIBRARY_PATH"); lp != "" {
-		cmd.Env = append(cmd.Env, "LD_LIBRARY_PATH="+lp)
-	}
-	cmd.ExtraFiles = []*os.File{writeFile}
-
-	out, err := cmd.CombinedOutput()
-	if len(out) > 0 || err != nil {
-		t.Fatalf("child process: %q, %v", out, err)
-	}
-
-	c, err := net.FileConn(readFile)
-	if err != nil {
-		t.Fatalf("FileConn: %v", err)
-	}
-	defer c.Close()
-
-	uc, ok := c.(*net.UnixConn)
-	if !ok {
-		t.Fatalf("unexpected FileConn type; expected UnixConn, got %T", c)
-	}
-
-	buf := make([]byte, 32) // expect 1 byte
-	oob := make([]byte, 32) // expect 24 bytes
-	closeUnix := time.AfterFunc(5*time.Second, func() {
-		t.Logf("timeout reading from unix socket")
-		uc.Close()
-	})
-	_, oobn, _, _, err := uc.ReadMsgUnix(buf, oob)
-	closeUnix.Stop()
-
-	scms, err := unix.ParseSocketControlMessage(oob[:oobn])
-	if err != nil {
-		t.Fatalf("ParseSocketControlMessage: %v", err)
-	}
-	if len(scms) != 1 {
-		t.Fatalf("expected 1 SocketControlMessage; got scms = %#v", scms)
-	}
-	scm := scms[0]
-	gotFds, err := unix.ParseUnixRights(&scm)
-	if err != nil {
-		t.Fatalf("unix.ParseUnixRights: %v", err)
-	}
-	if len(gotFds) != 1 {
-		t.Fatalf("wanted 1 fd; got %#v", gotFds)
-	}
-
-	f := os.NewFile(uintptr(gotFds[0]), "fd-from-child")
-	defer f.Close()
-
-	got, err := ioutil.ReadAll(f)
-	want := "Hello from child process!\n"
-	if string(got) != want {
-		t.Errorf("child process ReadAll: %q, %v; want %q", got, err, want)
-	}
-}
-
-// passFDChild is the child process used by TestPassFD.
-func passFDChild() {
-	defer os.Exit(0)
-
-	// Look for our fd. It should be fd 3, but we work around an fd leak
-	// bug here (http://golang.org/issue/2603) to let it be elsewhere.
-	var uc *net.UnixConn
-	for fd := uintptr(3); fd <= 10; fd++ {
-		f := os.NewFile(fd, "unix-conn")
-		var ok bool
-		netc, _ := net.FileConn(f)
-		uc, ok = netc.(*net.UnixConn)
-		if ok {
-			break
-		}
-	}
-	if uc == nil {
-		fmt.Println("failed to find unix fd")
-		return
-	}
-
-	// Make a file f to send to our parent process on uc.
-	// We make it in tempDir, which our parent will clean up.
-	flag.Parse()
-	tempDir := flag.Arg(0)
-	f, err := ioutil.TempFile(tempDir, "")
-	if err != nil {
-		fmt.Printf("TempFile: %v", err)
-		return
-	}
-
-	f.Write([]byte("Hello from child process!\n"))
-	f.Seek(0, 0)
-
-	rights := unix.UnixRights(int(f.Fd()))
-	dummyByte := []byte("x")
-	n, oobn, err := uc.WriteMsgUnix(dummyByte, rights, nil)
-	if err != nil {
-		fmt.Printf("WriteMsgUnix: %v", err)
-		return
-	}
-	if n != 1 || oobn != len(rights) {
-		fmt.Printf("WriteMsgUnix = %d, %d; want 1, %d", n, oobn, len(rights))
-		return
-	}
-}
-
-// TestUnixRightsRoundtrip tests that UnixRights, ParseSocketControlMessage,
-// and ParseUnixRights are able to successfully round-trip lists of file descriptors.
-func TestUnixRightsRoundtrip(t *testing.T) {
-	testCases := [...][][]int{
-		{{42}},
-		{{1, 2}},
-		{{3, 4, 5}},
-		{{}},
-		{{1, 2}, {3, 4, 5}, {}, {7}},
-	}
-	for _, testCase := range testCases {
-		b := []byte{}
-		var n int
-		for _, fds := range testCase {
-			// Last assignment to n wins
-			n = len(b) + unix.CmsgLen(4*len(fds))
-			b = append(b, unix.UnixRights(fds...)...)
-		}
-		// Truncate b
-		b = b[:n]
-
-		scms, err := unix.ParseSocketControlMessage(b)
-		if err != nil {
-			t.Fatalf("ParseSocketControlMessage: %v", err)
-		}
-		if len(scms) != len(testCase) {
-			t.Fatalf("expected %v SocketControlMessage; got scms = %#v", len(testCase), scms)
-		}
-		for i, scm := range scms {
-			gotFds, err := unix.ParseUnixRights(&scm)
-			if err != nil {
-				t.Fatalf("ParseUnixRights: %v", err)
-			}
-			wantFds := testCase[i]
-			if len(gotFds) != len(wantFds) {
-				t.Fatalf("expected %v fds, got %#v", len(wantFds), gotFds)
-			}
-			for j, fd := range gotFds {
-				if fd != wantFds[j] {
-					t.Fatalf("expected fd %v, got %v", wantFds[j], fd)
-				}
-			}
-		}
-	}
-}
-
-func TestRlimit(t *testing.T) {
-	var rlimit, zero unix.Rlimit
-	err := unix.Getrlimit(unix.RLIMIT_NOFILE, &rlimit)
-	if err != nil {
-		t.Fatalf("Getrlimit: save failed: %v", err)
-	}
-	if zero == rlimit {
-		t.Fatalf("Getrlimit: save failed: got zero value %#v", rlimit)
-	}
-	set := rlimit
-	set.Cur = set.Max - 1
-	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &set)
-	if err != nil {
-		t.Fatalf("Setrlimit: set failed: %#v %v", set, err)
-	}
-	var get unix.Rlimit
-	err = unix.Getrlimit(unix.RLIMIT_NOFILE, &get)
-	if err != nil {
-		t.Fatalf("Getrlimit: get failed: %v", err)
-	}
-	set = rlimit
-	set.Cur = set.Max - 1
-	if set != get {
-		// Seems like Darwin requires some privilege to
-		// increase the soft limit of rlimit sandbox, though
-		// Setrlimit never reports an error.
-		switch runtime.GOOS {
-		case "darwin":
-		default:
-			t.Fatalf("Rlimit: change failed: wanted %#v got %#v", set, get)
-		}
-	}
-	err = unix.Setrlimit(unix.RLIMIT_NOFILE, &rlimit)
-	if err != nil {
-		t.Fatalf("Setrlimit: restore failed: %#v %v", rlimit, err)
-	}
-}
-
-func TestSeekFailure(t *testing.T) {
-	_, err := unix.Seek(-1, 0, 0)
-	if err == nil {
-		t.Fatalf("Seek(-1, 0, 0) did not fail")
-	}
-	str := err.Error() // used to crash on Linux
-	t.Logf("Seek: %v", str)
-	if str == "" {
-		t.Fatalf("Seek(-1, 0, 0) return error with empty message")
-	}
-}
-
-func TestDup(t *testing.T) {
-	file, err := ioutil.TempFile("", "TestDup")
-	if err != nil {
-		t.Fatalf("Tempfile failed: %v", err)
-	}
-	defer os.Remove(file.Name())
-	defer file.Close()
-	f := int(file.Fd())
-
-	newFd, err := unix.Dup(f)
-	if err != nil {
-		t.Fatalf("Dup: %v", err)
-	}
-
-	err = unix.Dup2(newFd, newFd+1)
-	if err != nil {
-		t.Fatalf("Dup2: %v", err)
-	}
-
-	b1 := []byte("Test123")
-	b2 := make([]byte, 7)
-	_, err = unix.Write(newFd+1, b1)
-	if err != nil {
-		t.Fatalf("Write to dup2 fd failed: %v", err)
-	}
-	_, err = unix.Seek(f, 0, 0)
-	_, err = unix.Read(f, b2)
-	if err != nil {
-		t.Fatalf("Read back failed: %v", err)
-	}
-	if string(b1) != string(b2) {
-		t.Errorf("Dup: stdout write not in file, expected %v, got %v", string(b1), string(b2))
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/timestruct.go b/installer/vendor/golang.org/x/sys/unix/timestruct.go
new file mode 100644
index 0000000000..47b9011ee9
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/timestruct.go
@@ -0,0 +1,82 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// +build darwin dragonfly freebsd linux netbsd openbsd solaris
+
+package unix
+
+import "time"
+
+// TimespecToNsec converts a Timespec value into a number of
+// nanoseconds since the Unix epoch.
+func TimespecToNsec(ts Timespec) int64 { return int64(ts.Sec)*1e9 + int64(ts.Nsec) }
+
+// NsecToTimespec takes a number of nanoseconds since the Unix epoch
+// and returns the corresponding Timespec value.
+func NsecToTimespec(nsec int64) Timespec {
+	sec := nsec / 1e9
+	nsec = nsec % 1e9
+	if nsec < 0 {
+		nsec += 1e9
+		sec--
+	}
+	return setTimespec(sec, nsec)
+}
+
+// TimeToTimespec converts t into a Timespec.
+// On some 32-bit systems the range of valid Timespec values are smaller
+// than that of time.Time values.  So if t is out of the valid range of
+// Timespec, it returns a zero Timespec and ERANGE.
+func TimeToTimespec(t time.Time) (Timespec, error) {
+	sec := t.Unix()
+	nsec := int64(t.Nanosecond())
+	ts := setTimespec(sec, nsec)
+
+	// Currently all targets have either int32 or int64 for Timespec.Sec.
+	// If there were a new target with floating point type for it, we have
+	// to consider the rounding error.
+	if int64(ts.Sec) != sec {
+		return Timespec{}, ERANGE
+	}
+	return ts, nil
+}
+
+// TimevalToNsec converts a Timeval value into a number of nanoseconds
+// since the Unix epoch.
+func TimevalToNsec(tv Timeval) int64 { return int64(tv.Sec)*1e9 + int64(tv.Usec)*1e3 }
+
+// NsecToTimeval takes a number of nanoseconds since the Unix epoch
+// and returns the corresponding Timeval value.
+func NsecToTimeval(nsec int64) Timeval {
+	nsec += 999 // round up to microsecond
+	usec := nsec % 1e9 / 1e3
+	sec := nsec / 1e9
+	if usec < 0 {
+		usec += 1e6
+		sec--
+	}
+	return setTimeval(sec, usec)
+}
+
+// Unix returns ts as the number of seconds and nanoseconds elapsed since the
+// Unix epoch.
+func (ts *Timespec) Unix() (sec int64, nsec int64) {
+	return int64(ts.Sec), int64(ts.Nsec)
+}
+
+// Unix returns tv as the number of seconds and nanoseconds elapsed since the
+// Unix epoch.
+func (tv *Timeval) Unix() (sec int64, nsec int64) {
+	return int64(tv.Sec), int64(tv.Usec) * 1000
+}
+
+// Nano returns ts as the number of nanoseconds elapsed since the Unix epoch.
+func (ts *Timespec) Nano() int64 {
+	return int64(ts.Sec)*1e9 + int64(ts.Nsec)
+}
+
+// Nano returns tv as the number of nanoseconds elapsed since the Unix epoch.
+func (tv *Timeval) Nano() int64 {
+	return int64(tv.Sec)*1e9 + int64(tv.Usec)*1000
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/types_darwin.go b/installer/vendor/golang.org/x/sys/unix/types_darwin.go
index 1153261822..46b9908e03 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_darwin.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_darwin.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -19,6 +19,7 @@ package unix
 #define _DARWIN_USE_64_BIT_INODE
 #include <dirent.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <unistd.h>
@@ -38,6 +39,7 @@ package unix
 #include <sys/types.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -242,9 +244,34 @@ type BpfHdr C.struct_bpf_hdr
 
 type Termios C.struct_termios
 
+type Winsize C.struct_winsize
+
 // fchmodat-like syscalls.
 
 const (
 	AT_FDCWD            = C.AT_FDCWD
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
 	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
 )
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// uname
+
+type Utsname C.struct_utsname
diff --git a/installer/vendor/golang.org/x/sys/unix/types_dragonfly.go b/installer/vendor/golang.org/x/sys/unix/types_dragonfly.go
index f3c971dffd..0c63304839 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_dragonfly.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_dragonfly.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -17,6 +17,7 @@ package unix
 #define KERNEL
 #include <dirent.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <stdio.h>
@@ -34,6 +35,7 @@ package unix
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -125,6 +127,12 @@ type Dirent C.struct_dirent
 
 type Fsid C.struct_fsid
 
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
 // Sockets
 
 type RawSockaddrInet4 C.struct_sockaddr_in
@@ -240,3 +248,33 @@ type BpfHdr C.struct_bpf_hdr
 // Terminal handling
 
 type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/installer/vendor/golang.org/x/sys/unix/types_freebsd.go b/installer/vendor/golang.org/x/sys/unix/types_freebsd.go
index ae24557ad1..4eb02cd4da 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_freebsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_freebsd.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -17,10 +17,12 @@ package unix
 #define KERNEL
 #include <dirent.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <stdio.h>
 #include <unistd.h>
+#include <sys/capability.h>
 #include <sys/event.h>
 #include <sys/mman.h>
 #include <sys/mount.h>
@@ -34,6 +36,7 @@ package unix
 #include <sys/time.h>
 #include <sys/types.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -130,7 +133,10 @@ struct if_data8 {
 	u_long  ifi_iqdrops;
 	u_long  ifi_noproto;
 	u_long  ifi_hwassist;
+// FIXME: these are now unions, so maybe need to change definitions?
+#undef ifi_epoch
 	time_t  ifi_epoch;
+#undef ifi_lastchange
 	struct  timeval ifi_lastchange;
 };
 
@@ -210,6 +216,12 @@ type Dirent C.struct_dirent
 
 type Fsid C.struct_fsid
 
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
 // Advice to Fadvise
 
 const (
@@ -351,3 +363,40 @@ type BpfZbufHeader C.struct_bpf_zbuf_header
 // Terminal handling
 
 type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_REMOVEDIR        = C.AT_REMOVEDIR
+	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR      = C.POLLERR
+	POLLHUP      = C.POLLHUP
+	POLLIN       = C.POLLIN
+	POLLINIGNEOF = C.POLLINIGNEOF
+	POLLNVAL     = C.POLLNVAL
+	POLLOUT      = C.POLLOUT
+	POLLPRI      = C.POLLPRI
+	POLLRDBAND   = C.POLLRDBAND
+	POLLRDNORM   = C.POLLRDNORM
+	POLLWRBAND   = C.POLLWRBAND
+	POLLWRNORM   = C.POLLWRNORM
+)
+
+// Capabilities
+
+type CapRights C.struct_cap_rights
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/installer/vendor/golang.org/x/sys/unix/types_linux.go b/installer/vendor/golang.org/x/sys/unix/types_linux.go
deleted file mode 100644
index ae79779ed3..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/types_linux.go
+++ /dev/null
@@ -1,469 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-/*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
-*/
-
-// +godefs map struct_in_addr [4]byte /* in_addr */
-// +godefs map struct_in6_addr [16]byte /* in6_addr */
-
-package unix
-
-/*
-#define _LARGEFILE_SOURCE
-#define _LARGEFILE64_SOURCE
-#define _FILE_OFFSET_BITS 64
-#define _GNU_SOURCE
-
-#include <dirent.h>
-#include <fcntl.h>
-#include <netinet/in.h>
-#include <netinet/tcp.h>
-#include <netpacket/packet.h>
-#include <poll.h>
-#include <signal.h>
-#include <stdio.h>
-#include <sys/epoll.h>
-#include <sys/inotify.h>
-#include <sys/mman.h>
-#include <sys/mount.h>
-#include <sys/param.h>
-#include <sys/ptrace.h>
-#include <sys/resource.h>
-#include <sys/select.h>
-#include <sys/signal.h>
-#include <sys/stat.h>
-#include <sys/statfs.h>
-#include <sys/sysinfo.h>
-#include <sys/time.h>
-#include <sys/times.h>
-#include <sys/timex.h>
-#include <sys/types.h>
-#include <sys/un.h>
-#include <sys/user.h>
-#include <sys/utsname.h>
-#include <sys/wait.h>
-#include <linux/filter.h>
-#include <linux/netlink.h>
-#include <linux/rtnetlink.h>
-#include <linux/icmpv6.h>
-#include <asm/termbits.h>
-#include <time.h>
-#include <unistd.h>
-#include <ustat.h>
-#include <utime.h>
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#include <linux/can.h>
-#include <linux/if_alg.h>
-#include <linux/vm_sockets.h>
-
-#ifdef TCSETS2
-// On systems that have "struct termios2" use this as type Termios.
-typedef struct termios2 termios_t;
-#else
-typedef struct termios termios_t;
-#endif
-
-enum {
-	sizeofPtr = sizeof(void*),
-};
-
-union sockaddr_all {
-	struct sockaddr s1;	// this one gets used for fields
-	struct sockaddr_in s2;	// these pad it out
-	struct sockaddr_in6 s3;
-	struct sockaddr_un s4;
-	struct sockaddr_ll s5;
-	struct sockaddr_nl s6;
-};
-
-struct sockaddr_any {
-	struct sockaddr addr;
-	char pad[sizeof(union sockaddr_all) - sizeof(struct sockaddr)];
-};
-
-// copied from /usr/include/linux/un.h
-struct my_sockaddr_un {
-	sa_family_t sun_family;
-#if defined(__ARM_EABI__) || defined(__powerpc64__)
-	// on ARM char is by default unsigned
-	signed char sun_path[108];
-#else
-	char sun_path[108];
-#endif
-};
-
-#ifdef __ARM_EABI__
-typedef struct user_regs PtraceRegs;
-#elif defined(__aarch64__)
-typedef struct user_pt_regs PtraceRegs;
-#elif defined(__powerpc64__)
-typedef struct pt_regs PtraceRegs;
-#elif defined(__mips__)
-typedef struct user PtraceRegs;
-#elif defined(__s390x__)
-typedef struct _user_regs_struct PtraceRegs;
-#elif defined(__sparc__)
-#include <asm/ptrace.h>
-typedef struct pt_regs PtraceRegs;
-#else
-typedef struct user_regs_struct PtraceRegs;
-#endif
-
-#if defined(__s390x__)
-typedef struct _user_psw_struct ptracePsw;
-typedef struct _user_fpregs_struct ptraceFpregs;
-typedef struct _user_per_struct ptracePer;
-#else
-typedef struct {} ptracePsw;
-typedef struct {} ptraceFpregs;
-typedef struct {} ptracePer;
-#endif
-
-// The real epoll_event is a union, and godefs doesn't handle it well.
-struct my_epoll_event {
-	uint32_t events;
-#if defined(__ARM_EABI__) || defined(__aarch64__) || (defined(__mips__) && _MIPS_SIM == _ABIO32)
-	// padding is not specified in linux/eventpoll.h but added to conform to the
-	// alignment requirements of EABI
-	int32_t padFd;
-#elif defined(__powerpc64__) || defined(__s390x__) || defined(__sparc__)
-	int32_t _padFd;
-#endif
-	int32_t fd;
-	int32_t pad;
-};
-
-*/
-import "C"
-
-// Machine characteristics; for internal use.
-
-const (
-	sizeofPtr      = C.sizeofPtr
-	sizeofShort    = C.sizeof_short
-	sizeofInt      = C.sizeof_int
-	sizeofLong     = C.sizeof_long
-	sizeofLongLong = C.sizeof_longlong
-	PathMax        = C.PATH_MAX
-)
-
-// Basic types
-
-type (
-	_C_short     C.short
-	_C_int       C.int
-	_C_long      C.long
-	_C_long_long C.longlong
-)
-
-// Time
-
-type Timespec C.struct_timespec
-
-type Timeval C.struct_timeval
-
-type Timex C.struct_timex
-
-type Time_t C.time_t
-
-type Tms C.struct_tms
-
-type Utimbuf C.struct_utimbuf
-
-// Processes
-
-type Rusage C.struct_rusage
-
-type Rlimit C.struct_rlimit
-
-type _Gid_t C.gid_t
-
-// Files
-
-type Stat_t C.struct_stat
-
-type Statfs_t C.struct_statfs
-
-type Dirent C.struct_dirent
-
-type Fsid C.fsid_t
-
-type Flock_t C.struct_flock
-
-// Advice to Fadvise
-
-const (
-	FADV_NORMAL     = C.POSIX_FADV_NORMAL
-	FADV_RANDOM     = C.POSIX_FADV_RANDOM
-	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
-	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
-	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
-	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
-)
-
-// Sockets
-
-type RawSockaddrInet4 C.struct_sockaddr_in
-
-type RawSockaddrInet6 C.struct_sockaddr_in6
-
-type RawSockaddrUnix C.struct_my_sockaddr_un
-
-type RawSockaddrLinklayer C.struct_sockaddr_ll
-
-type RawSockaddrNetlink C.struct_sockaddr_nl
-
-type RawSockaddrHCI C.struct_sockaddr_hci
-
-type RawSockaddrCAN C.struct_sockaddr_can
-
-type RawSockaddrALG C.struct_sockaddr_alg
-
-type RawSockaddrVM C.struct_sockaddr_vm
-
-type RawSockaddr C.struct_sockaddr
-
-type RawSockaddrAny C.struct_sockaddr_any
-
-type _Socklen C.socklen_t
-
-type Linger C.struct_linger
-
-type Iovec C.struct_iovec
-
-type IPMreq C.struct_ip_mreq
-
-type IPMreqn C.struct_ip_mreqn
-
-type IPv6Mreq C.struct_ipv6_mreq
-
-type Msghdr C.struct_msghdr
-
-type Cmsghdr C.struct_cmsghdr
-
-type Inet4Pktinfo C.struct_in_pktinfo
-
-type Inet6Pktinfo C.struct_in6_pktinfo
-
-type IPv6MTUInfo C.struct_ip6_mtuinfo
-
-type ICMPv6Filter C.struct_icmp6_filter
-
-type Ucred C.struct_ucred
-
-type TCPInfo C.struct_tcp_info
-
-const (
-	SizeofSockaddrInet4     = C.sizeof_struct_sockaddr_in
-	SizeofSockaddrInet6     = C.sizeof_struct_sockaddr_in6
-	SizeofSockaddrAny       = C.sizeof_struct_sockaddr_any
-	SizeofSockaddrUnix      = C.sizeof_struct_sockaddr_un
-	SizeofSockaddrLinklayer = C.sizeof_struct_sockaddr_ll
-	SizeofSockaddrNetlink   = C.sizeof_struct_sockaddr_nl
-	SizeofSockaddrHCI       = C.sizeof_struct_sockaddr_hci
-	SizeofSockaddrCAN       = C.sizeof_struct_sockaddr_can
-	SizeofSockaddrALG       = C.sizeof_struct_sockaddr_alg
-	SizeofSockaddrVM        = C.sizeof_struct_sockaddr_vm
-	SizeofLinger            = C.sizeof_struct_linger
-	SizeofIPMreq            = C.sizeof_struct_ip_mreq
-	SizeofIPMreqn           = C.sizeof_struct_ip_mreqn
-	SizeofIPv6Mreq          = C.sizeof_struct_ipv6_mreq
-	SizeofMsghdr            = C.sizeof_struct_msghdr
-	SizeofCmsghdr           = C.sizeof_struct_cmsghdr
-	SizeofInet4Pktinfo      = C.sizeof_struct_in_pktinfo
-	SizeofInet6Pktinfo      = C.sizeof_struct_in6_pktinfo
-	SizeofIPv6MTUInfo       = C.sizeof_struct_ip6_mtuinfo
-	SizeofICMPv6Filter      = C.sizeof_struct_icmp6_filter
-	SizeofUcred             = C.sizeof_struct_ucred
-	SizeofTCPInfo           = C.sizeof_struct_tcp_info
-)
-
-// Netlink routing and interface messages
-
-const (
-	IFA_UNSPEC          = C.IFA_UNSPEC
-	IFA_ADDRESS         = C.IFA_ADDRESS
-	IFA_LOCAL           = C.IFA_LOCAL
-	IFA_LABEL           = C.IFA_LABEL
-	IFA_BROADCAST       = C.IFA_BROADCAST
-	IFA_ANYCAST         = C.IFA_ANYCAST
-	IFA_CACHEINFO       = C.IFA_CACHEINFO
-	IFA_MULTICAST       = C.IFA_MULTICAST
-	IFLA_UNSPEC         = C.IFLA_UNSPEC
-	IFLA_ADDRESS        = C.IFLA_ADDRESS
-	IFLA_BROADCAST      = C.IFLA_BROADCAST
-	IFLA_IFNAME         = C.IFLA_IFNAME
-	IFLA_MTU            = C.IFLA_MTU
-	IFLA_LINK           = C.IFLA_LINK
-	IFLA_QDISC          = C.IFLA_QDISC
-	IFLA_STATS          = C.IFLA_STATS
-	IFLA_COST           = C.IFLA_COST
-	IFLA_PRIORITY       = C.IFLA_PRIORITY
-	IFLA_MASTER         = C.IFLA_MASTER
-	IFLA_WIRELESS       = C.IFLA_WIRELESS
-	IFLA_PROTINFO       = C.IFLA_PROTINFO
-	IFLA_TXQLEN         = C.IFLA_TXQLEN
-	IFLA_MAP            = C.IFLA_MAP
-	IFLA_WEIGHT         = C.IFLA_WEIGHT
-	IFLA_OPERSTATE      = C.IFLA_OPERSTATE
-	IFLA_LINKMODE       = C.IFLA_LINKMODE
-	IFLA_LINKINFO       = C.IFLA_LINKINFO
-	IFLA_NET_NS_PID     = C.IFLA_NET_NS_PID
-	IFLA_IFALIAS        = C.IFLA_IFALIAS
-	IFLA_MAX            = C.IFLA_MAX
-	RT_SCOPE_UNIVERSE   = C.RT_SCOPE_UNIVERSE
-	RT_SCOPE_SITE       = C.RT_SCOPE_SITE
-	RT_SCOPE_LINK       = C.RT_SCOPE_LINK
-	RT_SCOPE_HOST       = C.RT_SCOPE_HOST
-	RT_SCOPE_NOWHERE    = C.RT_SCOPE_NOWHERE
-	RT_TABLE_UNSPEC     = C.RT_TABLE_UNSPEC
-	RT_TABLE_COMPAT     = C.RT_TABLE_COMPAT
-	RT_TABLE_DEFAULT    = C.RT_TABLE_DEFAULT
-	RT_TABLE_MAIN       = C.RT_TABLE_MAIN
-	RT_TABLE_LOCAL      = C.RT_TABLE_LOCAL
-	RT_TABLE_MAX        = C.RT_TABLE_MAX
-	RTA_UNSPEC          = C.RTA_UNSPEC
-	RTA_DST             = C.RTA_DST
-	RTA_SRC             = C.RTA_SRC
-	RTA_IIF             = C.RTA_IIF
-	RTA_OIF             = C.RTA_OIF
-	RTA_GATEWAY         = C.RTA_GATEWAY
-	RTA_PRIORITY        = C.RTA_PRIORITY
-	RTA_PREFSRC         = C.RTA_PREFSRC
-	RTA_METRICS         = C.RTA_METRICS
-	RTA_MULTIPATH       = C.RTA_MULTIPATH
-	RTA_FLOW            = C.RTA_FLOW
-	RTA_CACHEINFO       = C.RTA_CACHEINFO
-	RTA_TABLE           = C.RTA_TABLE
-	RTN_UNSPEC          = C.RTN_UNSPEC
-	RTN_UNICAST         = C.RTN_UNICAST
-	RTN_LOCAL           = C.RTN_LOCAL
-	RTN_BROADCAST       = C.RTN_BROADCAST
-	RTN_ANYCAST         = C.RTN_ANYCAST
-	RTN_MULTICAST       = C.RTN_MULTICAST
-	RTN_BLACKHOLE       = C.RTN_BLACKHOLE
-	RTN_UNREACHABLE     = C.RTN_UNREACHABLE
-	RTN_PROHIBIT        = C.RTN_PROHIBIT
-	RTN_THROW           = C.RTN_THROW
-	RTN_NAT             = C.RTN_NAT
-	RTN_XRESOLVE        = C.RTN_XRESOLVE
-	RTNLGRP_NONE        = C.RTNLGRP_NONE
-	RTNLGRP_LINK        = C.RTNLGRP_LINK
-	RTNLGRP_NOTIFY      = C.RTNLGRP_NOTIFY
-	RTNLGRP_NEIGH       = C.RTNLGRP_NEIGH
-	RTNLGRP_TC          = C.RTNLGRP_TC
-	RTNLGRP_IPV4_IFADDR = C.RTNLGRP_IPV4_IFADDR
-	RTNLGRP_IPV4_MROUTE = C.RTNLGRP_IPV4_MROUTE
-	RTNLGRP_IPV4_ROUTE  = C.RTNLGRP_IPV4_ROUTE
-	RTNLGRP_IPV4_RULE   = C.RTNLGRP_IPV4_RULE
-	RTNLGRP_IPV6_IFADDR = C.RTNLGRP_IPV6_IFADDR
-	RTNLGRP_IPV6_MROUTE = C.RTNLGRP_IPV6_MROUTE
-	RTNLGRP_IPV6_ROUTE  = C.RTNLGRP_IPV6_ROUTE
-	RTNLGRP_IPV6_IFINFO = C.RTNLGRP_IPV6_IFINFO
-	RTNLGRP_IPV6_PREFIX = C.RTNLGRP_IPV6_PREFIX
-	RTNLGRP_IPV6_RULE   = C.RTNLGRP_IPV6_RULE
-	RTNLGRP_ND_USEROPT  = C.RTNLGRP_ND_USEROPT
-	SizeofNlMsghdr      = C.sizeof_struct_nlmsghdr
-	SizeofNlMsgerr      = C.sizeof_struct_nlmsgerr
-	SizeofRtGenmsg      = C.sizeof_struct_rtgenmsg
-	SizeofNlAttr        = C.sizeof_struct_nlattr
-	SizeofRtAttr        = C.sizeof_struct_rtattr
-	SizeofIfInfomsg     = C.sizeof_struct_ifinfomsg
-	SizeofIfAddrmsg     = C.sizeof_struct_ifaddrmsg
-	SizeofRtMsg         = C.sizeof_struct_rtmsg
-	SizeofRtNexthop     = C.sizeof_struct_rtnexthop
-)
-
-type NlMsghdr C.struct_nlmsghdr
-
-type NlMsgerr C.struct_nlmsgerr
-
-type RtGenmsg C.struct_rtgenmsg
-
-type NlAttr C.struct_nlattr
-
-type RtAttr C.struct_rtattr
-
-type IfInfomsg C.struct_ifinfomsg
-
-type IfAddrmsg C.struct_ifaddrmsg
-
-type RtMsg C.struct_rtmsg
-
-type RtNexthop C.struct_rtnexthop
-
-// Linux socket filter
-
-const (
-	SizeofSockFilter = C.sizeof_struct_sock_filter
-	SizeofSockFprog  = C.sizeof_struct_sock_fprog
-)
-
-type SockFilter C.struct_sock_filter
-
-type SockFprog C.struct_sock_fprog
-
-// Inotify
-
-type InotifyEvent C.struct_inotify_event
-
-const SizeofInotifyEvent = C.sizeof_struct_inotify_event
-
-// Ptrace
-
-// Register structures
-type PtraceRegs C.PtraceRegs
-
-// Structures contained in PtraceRegs on s390x (exported by mkpost.go)
-type ptracePsw C.ptracePsw
-
-type ptraceFpregs C.ptraceFpregs
-
-type ptracePer C.ptracePer
-
-// Misc
-
-type FdSet C.fd_set
-
-type Sysinfo_t C.struct_sysinfo
-
-type Utsname C.struct_utsname
-
-type Ustat_t C.struct_ustat
-
-type EpollEvent C.struct_my_epoll_event
-
-const (
-	AT_FDCWD            = C.AT_FDCWD
-	AT_REMOVEDIR        = C.AT_REMOVEDIR
-	AT_SYMLINK_FOLLOW   = C.AT_SYMLINK_FOLLOW
-	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
-)
-
-type PollFd C.struct_pollfd
-
-const (
-	POLLIN    = C.POLLIN
-	POLLPRI   = C.POLLPRI
-	POLLOUT   = C.POLLOUT
-	POLLRDHUP = C.POLLRDHUP
-	POLLERR   = C.POLLERR
-	POLLHUP   = C.POLLHUP
-	POLLNVAL  = C.POLLNVAL
-)
-
-type Sigset_t C.sigset_t
-
-// sysconf information
-
-const _SC_PAGESIZE = C._SC_PAGESIZE
-
-// Terminal handling
-
-type Termios C.termios_t
diff --git a/installer/vendor/golang.org/x/sys/unix/types_netbsd.go b/installer/vendor/golang.org/x/sys/unix/types_netbsd.go
index d15f93d192..1494aafcbb 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_netbsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_netbsd.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -17,6 +17,7 @@ package unix
 #define KERNEL
 #include <dirent.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <stdio.h>
@@ -36,6 +37,7 @@ package unix
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -110,6 +112,23 @@ type Dirent C.struct_dirent
 
 type Fsid C.fsid_t
 
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
+// Advice to Fadvise
+
+const (
+	FADV_NORMAL     = C.POSIX_FADV_NORMAL
+	FADV_RANDOM     = C.POSIX_FADV_RANDOM
+	FADV_SEQUENTIAL = C.POSIX_FADV_SEQUENTIAL
+	FADV_WILLNEED   = C.POSIX_FADV_WILLNEED
+	FADV_DONTNEED   = C.POSIX_FADV_DONTNEED
+	FADV_NOREUSE    = C.POSIX_FADV_NOREUSE
+)
+
 // Sockets
 
 type RawSockaddrInet4 C.struct_sockaddr_in
@@ -227,6 +246,36 @@ type BpfTimeval C.struct_bpf_timeval
 
 type Termios C.struct_termios
 
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
 // Sysctl
 
 type Sysctlnode C.struct_sysctlnode
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/installer/vendor/golang.org/x/sys/unix/types_openbsd.go b/installer/vendor/golang.org/x/sys/unix/types_openbsd.go
index b66fe25f73..649e55998f 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_openbsd.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_openbsd.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -17,6 +17,7 @@ package unix
 #define KERNEL
 #include <dirent.h>
 #include <fcntl.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <stdio.h>
@@ -35,6 +36,7 @@ package unix
 #include <sys/time.h>
 #include <sys/uio.h>
 #include <sys/un.h>
+#include <sys/utsname.h>
 #include <sys/wait.h>
 #include <net/bpf.h>
 #include <net/if.h>
@@ -126,6 +128,12 @@ type Dirent C.struct_dirent
 
 type Fsid C.fsid_t
 
+// File system limits
+
+const (
+	PathMax = C.PATH_MAX
+)
+
 // Sockets
 
 type RawSockaddrInet4 C.struct_sockaddr_in
@@ -242,3 +250,33 @@ type BpfTimeval C.struct_bpf_timeval
 // Terminal handling
 
 type Termios C.struct_termios
+
+type Winsize C.struct_winsize
+
+// fchmodat-like syscalls.
+
+const (
+	AT_FDCWD            = C.AT_FDCWD
+	AT_SYMLINK_NOFOLLOW = C.AT_SYMLINK_NOFOLLOW
+)
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
+
+// Uname
+
+type Utsname C.struct_utsname
diff --git a/installer/vendor/golang.org/x/sys/unix/types_solaris.go b/installer/vendor/golang.org/x/sys/unix/types_solaris.go
index c5d5c8f16a..f777155442 100644
--- a/installer/vendor/golang.org/x/sys/unix/types_solaris.go
+++ b/installer/vendor/golang.org/x/sys/unix/types_solaris.go
@@ -5,7 +5,7 @@
 // +build ignore
 
 /*
-Input to cgo -godefs.  See also mkerrors.sh and mkall.sh
+Input to cgo -godefs.  See README.md
 */
 
 // +godefs map struct_in_addr [4]byte /* in_addr */
@@ -24,6 +24,7 @@ package unix
 #include <fcntl.h>
 #include <netdb.h>
 #include <limits.h>
+#include <poll.h>
 #include <signal.h>
 #include <termios.h>
 #include <termio.h>
@@ -37,6 +38,7 @@ package unix
 #include <sys/signal.h>
 #include <sys/socket.h>
 #include <sys/stat.h>
+#include <sys/statvfs.h>
 #include <sys/time.h>
 #include <sys/times.h>
 #include <sys/types.h>
@@ -139,6 +141,12 @@ type Flock_t C.struct_flock
 
 type Dirent C.struct_dirent
 
+// Filesystems
+
+type _Fsblkcnt_t C.fsblkcnt_t
+
+type Statvfs_t C.struct_statvfs
+
 // Sockets
 
 type RawSockaddrInet4 C.struct_sockaddr_in
@@ -249,10 +257,6 @@ type BpfTimeval C.struct_bpf_timeval
 
 type BpfHdr C.struct_bpf_hdr
 
-// sysconf information
-
-const _SC_PAGESIZE = C._SC_PAGESIZE
-
 // Terminal handling
 
 type Termios C.struct_termios
@@ -260,3 +264,20 @@ type Termios C.struct_termios
 type Termio C.struct_termio
 
 type Winsize C.struct_winsize
+
+// poll
+
+type PollFd C.struct_pollfd
+
+const (
+	POLLERR    = C.POLLERR
+	POLLHUP    = C.POLLHUP
+	POLLIN     = C.POLLIN
+	POLLNVAL   = C.POLLNVAL
+	POLLOUT    = C.POLLOUT
+	POLLPRI    = C.POLLPRI
+	POLLRDBAND = C.POLLRDBAND
+	POLLRDNORM = C.POLLRDNORM
+	POLLWRBAND = C.POLLWRBAND
+	POLLWRNORM = C.POLLWRNORM
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
index 8e63888351..c5a9b73dc8 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_386.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,darwin
 
@@ -48,6 +48,87 @@ const (
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
 	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -138,9 +219,26 @@ const (
 	BPF_W                             = 0x0
 	BPF_X                             = 0x8
 	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -151,6 +249,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DLT_A429                          = 0xb8
@@ -332,13 +432,14 @@ const (
 	ECHONL                            = 0x10
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
 	EVFILT_FS                         = -0x9
 	EVFILT_MACHPORT                   = -0x8
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
 	EVFILT_TIMER                      = -0x7
 	EVFILT_USER                       = -0xa
 	EVFILT_VM                         = -0xc
@@ -349,6 +450,7 @@ const (
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
 	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
@@ -359,16 +461,30 @@ const (
 	EV_POLL                           = 0x1000
 	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
 	FD_CLOEXEC                        = 0x1
 	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
 	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
 	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
 	F_ADDSIGS                         = 0x3b
 	F_ALLOCATEALL                     = 0x4
 	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
 	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
 	F_DUPFD_CLOEXEC                   = 0x43
@@ -396,6 +512,7 @@ const (
 	F_PATHPKG_CHECK                   = 0x34
 	F_PEOFPOSMODE                     = 0x3
 	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
 	F_RDADVISE                        = 0x2c
 	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
@@ -412,10 +529,12 @@ const (
 	F_SINGLE_WRITER                   = 0x4c
 	F_THAW_FS                         = 0x36
 	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
 	F_UNLCK                           = 0x2
 	F_VOLPOSMODE                      = 0x4
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -652,6 +771,7 @@ const (
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
 	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
@@ -742,6 +862,7 @@ const (
 	IP_RECVOPTS                       = 0x5
 	IP_RECVPKTINFO                    = 0x1a
 	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
 	IP_RECVTTL                        = 0x18
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
@@ -760,6 +881,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -770,11 +895,13 @@ const (
 	MADV_FREE_REUSABLE                = 0x7
 	MADV_FREE_REUSE                   = 0x8
 	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
 	MADV_RANDOM                       = 0x1
 	MADV_SEQUENTIAL                   = 0x2
 	MADV_WILLNEED                     = 0x3
 	MADV_ZERO_WIRED_PAGES             = 0x6
 	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
@@ -786,9 +913,43 @@ const (
 	MAP_PRIVATE                       = 0x2
 	MAP_RENAME                        = 0x20
 	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
 	MAP_SHARED                        = 0x1
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -819,7 +980,13 @@ const (
 	NET_RT_MAXID                      = 0xa
 	NET_RT_STAT                       = 0x4
 	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
 	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
 	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
 	NOTE_BACKGROUND                   = 0x40
@@ -843,11 +1010,14 @@ const (
 	NOTE_FFNOP                        = 0x0
 	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
 	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
 	NOTE_NONE                         = 0x80
 	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
 	NOTE_PCTRLMASK                    = -0x100000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_REAP                         = 0x10000000
@@ -872,6 +1042,7 @@ const (
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
+	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_ALERT                           = 0x20000000
 	O_APPEND                          = 0x8
@@ -880,6 +1051,7 @@ const (
 	O_CREAT                           = 0x200
 	O_DIRECTORY                       = 0x100000
 	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
 	O_DSYNC                           = 0x400000
 	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
@@ -932,7 +1104,10 @@ const (
 	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
 	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
@@ -1102,6 +1277,8 @@ const (
 	SO_LABEL                          = 0x1010
 	SO_LINGER                         = 0x80
 	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
 	SO_NKE                            = 0x1021
 	SO_NOADDRERR                      = 0x1023
 	SO_NOSIGPIPE                      = 0x1022
@@ -1157,11 +1334,22 @@ const (
 	S_IXGRP                           = 0x8
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
 	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
 	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
 	TCP_KEEPALIVE                     = 0x10
 	TCP_KEEPCNT                       = 0x102
 	TCP_KEEPINTVL                     = 0x101
@@ -1261,6 +1449,11 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1431,146 +1624,154 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
index 9594f93817..7de222b652 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,darwin
 
@@ -48,6 +48,87 @@ const (
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
 	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -138,9 +219,26 @@ const (
 	BPF_W                             = 0x0
 	BPF_X                             = 0x8
 	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -151,6 +249,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DLT_A429                          = 0xb8
@@ -332,13 +432,14 @@ const (
 	ECHONL                            = 0x10
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
 	EVFILT_FS                         = -0x9
 	EVFILT_MACHPORT                   = -0x8
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
 	EVFILT_TIMER                      = -0x7
 	EVFILT_USER                       = -0xa
 	EVFILT_VM                         = -0xc
@@ -349,6 +450,7 @@ const (
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
 	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
@@ -359,16 +461,30 @@ const (
 	EV_POLL                           = 0x1000
 	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
 	FD_CLOEXEC                        = 0x1
 	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
 	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
 	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
 	F_ADDSIGS                         = 0x3b
 	F_ALLOCATEALL                     = 0x4
 	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
 	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
 	F_DUPFD_CLOEXEC                   = 0x43
@@ -396,6 +512,7 @@ const (
 	F_PATHPKG_CHECK                   = 0x34
 	F_PEOFPOSMODE                     = 0x3
 	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
 	F_RDADVISE                        = 0x2c
 	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
@@ -412,10 +529,12 @@ const (
 	F_SINGLE_WRITER                   = 0x4c
 	F_THAW_FS                         = 0x36
 	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
 	F_UNLCK                           = 0x2
 	F_VOLPOSMODE                      = 0x4
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -652,6 +771,7 @@ const (
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
 	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
@@ -742,6 +862,7 @@ const (
 	IP_RECVOPTS                       = 0x5
 	IP_RECVPKTINFO                    = 0x1a
 	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
 	IP_RECVTTL                        = 0x18
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
@@ -760,6 +881,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -770,11 +895,13 @@ const (
 	MADV_FREE_REUSABLE                = 0x7
 	MADV_FREE_REUSE                   = 0x8
 	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
 	MADV_RANDOM                       = 0x1
 	MADV_SEQUENTIAL                   = 0x2
 	MADV_WILLNEED                     = 0x3
 	MADV_ZERO_WIRED_PAGES             = 0x6
 	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
@@ -786,9 +913,43 @@ const (
 	MAP_PRIVATE                       = 0x2
 	MAP_RENAME                        = 0x20
 	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
 	MAP_SHARED                        = 0x1
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -819,7 +980,13 @@ const (
 	NET_RT_MAXID                      = 0xa
 	NET_RT_STAT                       = 0x4
 	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
 	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
 	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
 	NOTE_BACKGROUND                   = 0x40
@@ -843,11 +1010,14 @@ const (
 	NOTE_FFNOP                        = 0x0
 	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
 	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
 	NOTE_NONE                         = 0x80
 	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
 	NOTE_PCTRLMASK                    = -0x100000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_REAP                         = 0x10000000
@@ -872,6 +1042,7 @@ const (
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
+	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_ALERT                           = 0x20000000
 	O_APPEND                          = 0x8
@@ -880,6 +1051,7 @@ const (
 	O_CREAT                           = 0x200
 	O_DIRECTORY                       = 0x100000
 	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
 	O_DSYNC                           = 0x400000
 	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
@@ -932,7 +1104,10 @@ const (
 	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
 	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
@@ -1102,6 +1277,8 @@ const (
 	SO_LABEL                          = 0x1010
 	SO_LINGER                         = 0x80
 	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
 	SO_NKE                            = 0x1021
 	SO_NOADDRERR                      = 0x1023
 	SO_NOSIGPIPE                      = 0x1022
@@ -1157,11 +1334,22 @@ const (
 	S_IXGRP                           = 0x8
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
 	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
 	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
 	TCP_KEEPALIVE                     = 0x10
 	TCP_KEEPCNT                       = 0x102
 	TCP_KEEPINTVL                     = 0x101
@@ -1261,6 +1449,11 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1431,146 +1624,154 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
index a410e88edd..33a42e78a2 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm.go
@@ -1,11 +1,11 @@
 // mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,darwin
 
 // Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs -- _const.go
 
-// +build arm,darwin
-
 package unix
 
 import "syscall"
@@ -48,6 +48,87 @@ const (
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
 	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -86,6 +167,7 @@ const (
 	BIOCSBLEN                         = 0xc0044266
 	BIOCSDLT                          = 0x80044278
 	BIOCSETF                          = 0x80104267
+	BIOCSETFNR                        = 0x8010427e
 	BIOCSETIF                         = 0x8020426c
 	BIOCSHDRCMPLT                     = 0x80044275
 	BIOCSRSIG                         = 0x80044273
@@ -137,9 +219,26 @@ const (
 	BPF_W                             = 0x0
 	BPF_X                             = 0x8
 	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -150,35 +249,172 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
+	DLT_A429                          = 0xb8
+	DLT_A653_ICM                      = 0xb9
+	DLT_AIRONET_HEADER                = 0x78
+	DLT_AOS                           = 0xde
 	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
 	DLT_ARCNET                        = 0x7
+	DLT_ARCNET_LINUX                  = 0x81
 	DLT_ATM_CLIP                      = 0x13
 	DLT_ATM_RFC1483                   = 0xb
+	DLT_AURORA                        = 0x7e
 	DLT_AX25                          = 0x3
+	DLT_AX25_KISS                     = 0xca
+	DLT_BACNET_MS_TP                  = 0xa5
+	DLT_BLUETOOTH_HCI_H4              = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
+	DLT_CAN20B                        = 0xbe
+	DLT_CAN_SOCKETCAN                 = 0xe3
 	DLT_CHAOS                         = 0x5
 	DLT_CHDLC                         = 0x68
+	DLT_CISCO_IOS                     = 0x76
 	DLT_C_HDLC                        = 0x68
+	DLT_C_HDLC_WITH_DIR               = 0xcd
+	DLT_DBUS                          = 0xe7
+	DLT_DECT                          = 0xdd
+	DLT_DOCSIS                        = 0x8f
+	DLT_DVB_CI                        = 0xeb
+	DLT_ECONET                        = 0x73
 	DLT_EN10MB                        = 0x1
 	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0x6d
+	DLT_ERF                           = 0xc5
+	DLT_ERF_ETH                       = 0xaf
+	DLT_ERF_POS                       = 0xb0
+	DLT_FC_2                          = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
 	DLT_FDDI                          = 0xa
+	DLT_FLEXRAY                       = 0xd2
+	DLT_FRELAY                        = 0x6b
+	DLT_FRELAY_WITH_DIR               = 0xce
+	DLT_GCOM_SERIAL                   = 0xad
+	DLT_GCOM_T1E1                     = 0xac
+	DLT_GPF_F                         = 0xab
+	DLT_GPF_T                         = 0xaa
+	DLT_GPRS_LLC                      = 0xa9
+	DLT_GSMTAP_ABIS                   = 0xda
+	DLT_GSMTAP_UM                     = 0xd9
+	DLT_HHDLC                         = 0x79
+	DLT_IBM_SN                        = 0x92
+	DLT_IBM_SP                        = 0x91
 	DLT_IEEE802                       = 0x6
 	DLT_IEEE802_11                    = 0x69
 	DLT_IEEE802_11_RADIO              = 0x7f
 	DLT_IEEE802_11_RADIO_AVS          = 0xa3
+	DLT_IEEE802_15_4                  = 0xc3
+	DLT_IEEE802_15_4_LINUX            = 0xbf
+	DLT_IEEE802_15_4_NOFCS            = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
+	DLT_IEEE802_16_MAC_CPS            = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
+	DLT_IPFILTER                      = 0x74
+	DLT_IPMB                          = 0xc7
+	DLT_IPMB_LINUX                    = 0xd1
+	DLT_IPNET                         = 0xe2
+	DLT_IPOIB                         = 0xf2
+	DLT_IPV4                          = 0xe4
+	DLT_IPV6                          = 0xe5
+	DLT_IP_OVER_FC                    = 0x7a
+	DLT_JUNIPER_ATM1                  = 0x89
+	DLT_JUNIPER_ATM2                  = 0x87
+	DLT_JUNIPER_ATM_CEMIC             = 0xee
+	DLT_JUNIPER_CHDLC                 = 0xb5
+	DLT_JUNIPER_ES                    = 0x84
+	DLT_JUNIPER_ETHER                 = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL          = 0xea
+	DLT_JUNIPER_FRELAY                = 0xb4
+	DLT_JUNIPER_GGSN                  = 0x85
+	DLT_JUNIPER_ISM                   = 0xc2
+	DLT_JUNIPER_MFR                   = 0x86
+	DLT_JUNIPER_MLFR                  = 0x83
+	DLT_JUNIPER_MLPPP                 = 0x82
+	DLT_JUNIPER_MONITOR               = 0xa4
+	DLT_JUNIPER_PIC_PEER              = 0xae
+	DLT_JUNIPER_PPP                   = 0xb3
+	DLT_JUNIPER_PPPOE                 = 0xa7
+	DLT_JUNIPER_PPPOE_ATM             = 0xa8
+	DLT_JUNIPER_SERVICES              = 0x88
+	DLT_JUNIPER_SRX_E2E               = 0xe9
+	DLT_JUNIPER_ST                    = 0xc8
+	DLT_JUNIPER_VP                    = 0xb7
+	DLT_JUNIPER_VS                    = 0xe8
+	DLT_LAPB_WITH_DIR                 = 0xcf
+	DLT_LAPD                          = 0xcb
+	DLT_LIN                           = 0xd4
+	DLT_LINUX_EVDEV                   = 0xd8
+	DLT_LINUX_IRDA                    = 0x90
+	DLT_LINUX_LAPD                    = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
 	DLT_LINUX_SLL                     = 0x71
 	DLT_LOOP                          = 0x6c
+	DLT_LTALK                         = 0x72
+	DLT_MATCHING_MAX                  = 0xf5
+	DLT_MATCHING_MIN                  = 0x68
+	DLT_MFR                           = 0xb6
+	DLT_MOST                          = 0xd3
+	DLT_MPEG_2_TS                     = 0xf3
+	DLT_MPLS                          = 0xdb
+	DLT_MTP2                          = 0x8c
+	DLT_MTP2_WITH_PHDR                = 0x8b
+	DLT_MTP3                          = 0x8d
+	DLT_MUX27010                      = 0xec
+	DLT_NETANALYZER                   = 0xf0
+	DLT_NETANALYZER_TRANSPARENT       = 0xf1
+	DLT_NFC_LLCP                      = 0xf5
+	DLT_NFLOG                         = 0xef
+	DLT_NG40                          = 0xf4
 	DLT_NULL                          = 0x0
+	DLT_PCI_EXP                       = 0x7d
 	DLT_PFLOG                         = 0x75
 	DLT_PFSYNC                        = 0x12
+	DLT_PPI                           = 0xc0
 	DLT_PPP                           = 0x9
 	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_PPPD                      = 0xa6
 	DLT_PPP_SERIAL                    = 0x32
+	DLT_PPP_WITH_DIR                  = 0xcc
+	DLT_PPP_WITH_DIRECTION            = 0xa6
+	DLT_PRISM_HEADER                  = 0x77
 	DLT_PRONET                        = 0x4
+	DLT_RAIF1                         = 0xc6
 	DLT_RAW                           = 0xc
+	DLT_RIO                           = 0x7c
+	DLT_SCCP                          = 0x8e
+	DLT_SITA                          = 0xc4
 	DLT_SLIP                          = 0x8
 	DLT_SLIP_BSDOS                    = 0xf
+	DLT_STANAG_5066_D_PDU             = 0xed
+	DLT_SUNATM                        = 0x7b
+	DLT_SYMANTEC_FIREWALL             = 0x63
+	DLT_TZSP                          = 0x80
+	DLT_USB                           = 0xba
+	DLT_USB_LINUX                     = 0xbd
+	DLT_USB_LINUX_MMAPPED             = 0xdc
+	DLT_USER0                         = 0x93
+	DLT_USER1                         = 0x94
+	DLT_USER10                        = 0x9d
+	DLT_USER11                        = 0x9e
+	DLT_USER12                        = 0x9f
+	DLT_USER13                        = 0xa0
+	DLT_USER14                        = 0xa1
+	DLT_USER15                        = 0xa2
+	DLT_USER2                         = 0x95
+	DLT_USER3                         = 0x96
+	DLT_USER4                         = 0x97
+	DLT_USER5                         = 0x98
+	DLT_USER6                         = 0x99
+	DLT_USER7                         = 0x9a
+	DLT_USER8                         = 0x9b
+	DLT_USER9                         = 0x9c
+	DLT_WIHART                        = 0xdf
+	DLT_X2E_SERIAL                    = 0xd5
+	DLT_X2E_XORAYA                    = 0xd6
 	DT_BLK                            = 0x6
 	DT_CHR                            = 0x2
 	DT_DIR                            = 0x4
@@ -196,13 +432,14 @@ const (
 	ECHONL                            = 0x10
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
 	EVFILT_FS                         = -0x9
 	EVFILT_MACHPORT                   = -0x8
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
 	EVFILT_TIMER                      = -0x7
 	EVFILT_USER                       = -0xa
 	EVFILT_VM                         = -0xc
@@ -213,6 +450,7 @@ const (
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
 	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
@@ -223,16 +461,30 @@ const (
 	EV_POLL                           = 0x1000
 	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
 	FD_CLOEXEC                        = 0x1
 	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
 	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
 	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
 	F_ADDSIGS                         = 0x3b
 	F_ALLOCATEALL                     = 0x4
 	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
 	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
 	F_DUPFD_CLOEXEC                   = 0x43
@@ -260,6 +512,7 @@ const (
 	F_PATHPKG_CHECK                   = 0x34
 	F_PEOFPOSMODE                     = 0x3
 	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
 	F_RDADVISE                        = 0x2c
 	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
@@ -276,10 +529,12 @@ const (
 	F_SINGLE_WRITER                   = 0x4c
 	F_THAW_FS                         = 0x36
 	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
 	F_UNLCK                           = 0x2
 	F_VOLPOSMODE                      = 0x4
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -347,6 +602,7 @@ const (
 	IFT_PDP                           = 0xff
 	IFT_PFLOG                         = 0xf5
 	IFT_PFSYNC                        = 0xf6
+	IFT_PKTAP                         = 0xfe
 	IFT_PPP                           = 0x17
 	IFT_PROPMUX                       = 0x36
 	IFT_PROPVIRTUAL                   = 0x35
@@ -515,7 +771,8 @@ const (
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
+	IPV6_FLOW_ECN_MASK                = 0x300
+	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
 	IPV6_FW_FLUSH                     = 0x20
@@ -605,6 +862,7 @@ const (
 	IP_RECVOPTS                       = 0x5
 	IP_RECVPKTINFO                    = 0x1a
 	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
 	IP_RECVTTL                        = 0x18
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
@@ -623,6 +881,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -633,11 +895,13 @@ const (
 	MADV_FREE_REUSABLE                = 0x7
 	MADV_FREE_REUSE                   = 0x8
 	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
 	MADV_RANDOM                       = 0x1
 	MADV_SEQUENTIAL                   = 0x2
 	MADV_WILLNEED                     = 0x3
 	MADV_ZERO_WIRED_PAGES             = 0x6
 	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
@@ -649,9 +913,43 @@ const (
 	MAP_PRIVATE                       = 0x2
 	MAP_RENAME                        = 0x20
 	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
 	MAP_SHARED                        = 0x1
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -682,7 +980,13 @@ const (
 	NET_RT_MAXID                      = 0xa
 	NET_RT_STAT                       = 0x4
 	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
 	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
 	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
 	NOTE_BACKGROUND                   = 0x40
@@ -706,11 +1010,14 @@ const (
 	NOTE_FFNOP                        = 0x0
 	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
 	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
 	NOTE_NONE                         = 0x80
 	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
 	NOTE_PCTRLMASK                    = -0x100000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_REAP                         = 0x10000000
@@ -735,6 +1042,7 @@ const (
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
+	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_ALERT                           = 0x20000000
 	O_APPEND                          = 0x8
@@ -743,6 +1051,7 @@ const (
 	O_CREAT                           = 0x200
 	O_DIRECTORY                       = 0x100000
 	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
 	O_DSYNC                           = 0x400000
 	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
@@ -795,7 +1104,10 @@ const (
 	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
 	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
@@ -830,6 +1142,7 @@ const (
 	RTF_LOCAL                         = 0x200000
 	RTF_MODIFIED                      = 0x20
 	RTF_MULTICAST                     = 0x800000
+	RTF_NOIFREF                       = 0x2000
 	RTF_PINNED                        = 0x100000
 	RTF_PRCLONING                     = 0x10000
 	RTF_PROTO1                        = 0x8000
@@ -964,6 +1277,8 @@ const (
 	SO_LABEL                          = 0x1010
 	SO_LINGER                         = 0x80
 	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
 	SO_NKE                            = 0x1021
 	SO_NOADDRERR                      = 0x1023
 	SO_NOSIGPIPE                      = 0x1022
@@ -1019,11 +1334,22 @@ const (
 	S_IXGRP                           = 0x8
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
 	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
 	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
 	TCP_KEEPALIVE                     = 0x10
 	TCP_KEEPCNT                       = 0x102
 	TCP_KEEPINTVL                     = 0x101
@@ -1123,6 +1449,11 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1291,3 +1622,156 @@ const (
 	SIGXCPU   = syscall.Signal(0x18)
 	SIGXFSZ   = syscall.Signal(0x19)
 )
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
index 3189c6b345..71805155bc 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_darwin_arm64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm64,darwin
 
@@ -48,6 +48,87 @@ const (
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
 	AF_UTUN                           = 0x26
+	ALTWERASE                         = 0x200
+	ATTR_BIT_MAP_COUNT                = 0x5
+	ATTR_CMN_ACCESSMASK               = 0x20000
+	ATTR_CMN_ACCTIME                  = 0x1000
+	ATTR_CMN_ADDEDTIME                = 0x10000000
+	ATTR_CMN_BKUPTIME                 = 0x2000
+	ATTR_CMN_CHGTIME                  = 0x800
+	ATTR_CMN_CRTIME                   = 0x200
+	ATTR_CMN_DATA_PROTECT_FLAGS       = 0x40000000
+	ATTR_CMN_DEVID                    = 0x2
+	ATTR_CMN_DOCUMENT_ID              = 0x100000
+	ATTR_CMN_ERROR                    = 0x20000000
+	ATTR_CMN_EXTENDED_SECURITY        = 0x400000
+	ATTR_CMN_FILEID                   = 0x2000000
+	ATTR_CMN_FLAGS                    = 0x40000
+	ATTR_CMN_FNDRINFO                 = 0x4000
+	ATTR_CMN_FSID                     = 0x4
+	ATTR_CMN_FULLPATH                 = 0x8000000
+	ATTR_CMN_GEN_COUNT                = 0x80000
+	ATTR_CMN_GRPID                    = 0x10000
+	ATTR_CMN_GRPUUID                  = 0x1000000
+	ATTR_CMN_MODTIME                  = 0x400
+	ATTR_CMN_NAME                     = 0x1
+	ATTR_CMN_NAMEDATTRCOUNT           = 0x80000
+	ATTR_CMN_NAMEDATTRLIST            = 0x100000
+	ATTR_CMN_OBJID                    = 0x20
+	ATTR_CMN_OBJPERMANENTID           = 0x40
+	ATTR_CMN_OBJTAG                   = 0x10
+	ATTR_CMN_OBJTYPE                  = 0x8
+	ATTR_CMN_OWNERID                  = 0x8000
+	ATTR_CMN_PARENTID                 = 0x4000000
+	ATTR_CMN_PAROBJID                 = 0x80
+	ATTR_CMN_RETURNED_ATTRS           = 0x80000000
+	ATTR_CMN_SCRIPT                   = 0x100
+	ATTR_CMN_SETMASK                  = 0x41c7ff00
+	ATTR_CMN_USERACCESS               = 0x200000
+	ATTR_CMN_UUID                     = 0x800000
+	ATTR_CMN_VALIDMASK                = 0xffffffff
+	ATTR_CMN_VOLSETMASK               = 0x6700
+	ATTR_FILE_ALLOCSIZE               = 0x4
+	ATTR_FILE_CLUMPSIZE               = 0x10
+	ATTR_FILE_DATAALLOCSIZE           = 0x400
+	ATTR_FILE_DATAEXTENTS             = 0x800
+	ATTR_FILE_DATALENGTH              = 0x200
+	ATTR_FILE_DEVTYPE                 = 0x20
+	ATTR_FILE_FILETYPE                = 0x40
+	ATTR_FILE_FORKCOUNT               = 0x80
+	ATTR_FILE_FORKLIST                = 0x100
+	ATTR_FILE_IOBLOCKSIZE             = 0x8
+	ATTR_FILE_LINKCOUNT               = 0x1
+	ATTR_FILE_RSRCALLOCSIZE           = 0x2000
+	ATTR_FILE_RSRCEXTENTS             = 0x4000
+	ATTR_FILE_RSRCLENGTH              = 0x1000
+	ATTR_FILE_SETMASK                 = 0x20
+	ATTR_FILE_TOTALSIZE               = 0x2
+	ATTR_FILE_VALIDMASK               = 0x37ff
+	ATTR_VOL_ALLOCATIONCLUMP          = 0x40
+	ATTR_VOL_ATTRIBUTES               = 0x40000000
+	ATTR_VOL_CAPABILITIES             = 0x20000
+	ATTR_VOL_DIRCOUNT                 = 0x400
+	ATTR_VOL_ENCODINGSUSED            = 0x10000
+	ATTR_VOL_FILECOUNT                = 0x200
+	ATTR_VOL_FSTYPE                   = 0x1
+	ATTR_VOL_INFO                     = 0x80000000
+	ATTR_VOL_IOBLOCKSIZE              = 0x80
+	ATTR_VOL_MAXOBJCOUNT              = 0x800
+	ATTR_VOL_MINALLOCATION            = 0x20
+	ATTR_VOL_MOUNTEDDEVICE            = 0x8000
+	ATTR_VOL_MOUNTFLAGS               = 0x4000
+	ATTR_VOL_MOUNTPOINT               = 0x1000
+	ATTR_VOL_NAME                     = 0x2000
+	ATTR_VOL_OBJCOUNT                 = 0x100
+	ATTR_VOL_QUOTA_SIZE               = 0x10000000
+	ATTR_VOL_RESERVED_SIZE            = 0x20000000
+	ATTR_VOL_SETMASK                  = 0x80002000
+	ATTR_VOL_SIGNATURE                = 0x2
+	ATTR_VOL_SIZE                     = 0x4
+	ATTR_VOL_SPACEAVAIL               = 0x10
+	ATTR_VOL_SPACEFREE                = 0x8
+	ATTR_VOL_UUID                     = 0x40000
+	ATTR_VOL_VALIDMASK                = 0xf007ffff
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -138,9 +219,26 @@ const (
 	BPF_W                             = 0x0
 	BPF_X                             = 0x8
 	BRKINT                            = 0x2
+	BS0                               = 0x0
+	BS1                               = 0x8000
+	BSDLY                             = 0x8000
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x6
+	CLOCK_MONOTONIC_RAW               = 0x4
+	CLOCK_MONOTONIC_RAW_APPROX        = 0x5
+	CLOCK_PROCESS_CPUTIME_ID          = 0xc
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_THREAD_CPUTIME_ID           = 0x10
+	CLOCK_UPTIME_RAW                  = 0x8
+	CLOCK_UPTIME_RAW_APPROX           = 0x9
+	CR0                               = 0x0
+	CR1                               = 0x1000
+	CR2                               = 0x2000
+	CR3                               = 0x3000
+	CRDLY                             = 0x3000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -151,6 +249,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DLT_A429                          = 0xb8
@@ -332,13 +432,14 @@ const (
 	ECHONL                            = 0x10
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
+	EVFILT_EXCEPT                     = -0xf
 	EVFILT_FS                         = -0x9
 	EVFILT_MACHPORT                   = -0x8
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xe
-	EVFILT_THREADMARKER               = 0xe
+	EVFILT_SYSCOUNT                   = 0xf
+	EVFILT_THREADMARKER               = 0xf
 	EVFILT_TIMER                      = -0x7
 	EVFILT_USER                       = -0xa
 	EVFILT_VM                         = -0xc
@@ -349,6 +450,7 @@ const (
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
 	EV_DISPATCH                       = 0x80
+	EV_DISPATCH2                      = 0x180
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
@@ -359,16 +461,30 @@ const (
 	EV_POLL                           = 0x1000
 	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
+	EV_UDATA_SPECIFIC                 = 0x100
+	EV_VANISHED                       = 0x200
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
 	EXTPROC                           = 0x800
 	FD_CLOEXEC                        = 0x1
 	FD_SETSIZE                        = 0x400
+	FF0                               = 0x0
+	FF1                               = 0x4000
+	FFDLY                             = 0x4000
 	FLUSHO                            = 0x800000
+	FSOPT_ATTR_CMN_EXTENDED           = 0x20
+	FSOPT_NOFOLLOW                    = 0x1
+	FSOPT_NOINMEMUPDATE               = 0x2
+	FSOPT_PACK_INVAL_ATTRS            = 0x8
+	FSOPT_REPORT_FULLSIZE             = 0x4
 	F_ADDFILESIGS                     = 0x3d
+	F_ADDFILESIGS_FOR_DYLD_SIM        = 0x53
+	F_ADDFILESIGS_RETURN              = 0x61
 	F_ADDSIGS                         = 0x3b
 	F_ALLOCATEALL                     = 0x4
 	F_ALLOCATECONTIG                  = 0x2
+	F_BARRIERFSYNC                    = 0x55
+	F_CHECK_LV                        = 0x62
 	F_CHKCLEAN                        = 0x29
 	F_DUPFD                           = 0x0
 	F_DUPFD_CLOEXEC                   = 0x43
@@ -396,6 +512,7 @@ const (
 	F_PATHPKG_CHECK                   = 0x34
 	F_PEOFPOSMODE                     = 0x3
 	F_PREALLOCATE                     = 0x2a
+	F_PUNCHHOLE                       = 0x63
 	F_RDADVISE                        = 0x2c
 	F_RDAHEAD                         = 0x2d
 	F_RDLCK                           = 0x1
@@ -412,10 +529,12 @@ const (
 	F_SINGLE_WRITER                   = 0x4c
 	F_THAW_FS                         = 0x36
 	F_TRANSCODEKEY                    = 0x4b
+	F_TRIM_ACTIVE_FILE                = 0x64
 	F_UNLCK                           = 0x2
 	F_VOLPOSMODE                      = 0x4
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -652,6 +771,7 @@ const (
 	IPV6_FAITH                        = 0x1d
 	IPV6_FLOWINFO_MASK                = 0xffffff0f
 	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FLOW_ECN_MASK                = 0x300
 	IPV6_FRAGTTL                      = 0x3c
 	IPV6_FW_ADD                       = 0x1e
 	IPV6_FW_DEL                       = 0x1f
@@ -742,6 +862,7 @@ const (
 	IP_RECVOPTS                       = 0x5
 	IP_RECVPKTINFO                    = 0x1a
 	IP_RECVRETOPTS                    = 0x6
+	IP_RECVTOS                        = 0x1b
 	IP_RECVTTL                        = 0x18
 	IP_RETOPTS                        = 0x8
 	IP_RF                             = 0x8000
@@ -760,6 +881,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -770,11 +895,13 @@ const (
 	MADV_FREE_REUSABLE                = 0x7
 	MADV_FREE_REUSE                   = 0x8
 	MADV_NORMAL                       = 0x0
+	MADV_PAGEOUT                      = 0xa
 	MADV_RANDOM                       = 0x1
 	MADV_SEQUENTIAL                   = 0x2
 	MADV_WILLNEED                     = 0x3
 	MADV_ZERO_WIRED_PAGES             = 0x6
 	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
@@ -786,9 +913,43 @@ const (
 	MAP_PRIVATE                       = 0x2
 	MAP_RENAME                        = 0x20
 	MAP_RESERVED0080                  = 0x80
+	MAP_RESILIENT_CODESIGN            = 0x2000
+	MAP_RESILIENT_MEDIA               = 0x4000
 	MAP_SHARED                        = 0x1
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
+	MNT_ASYNC                         = 0x40
+	MNT_AUTOMOUNTED                   = 0x400000
+	MNT_CMDFLAGS                      = 0xf0000
+	MNT_CPROTECT                      = 0x80
+	MNT_DEFWRITE                      = 0x2000000
+	MNT_DONTBROWSE                    = 0x100000
+	MNT_DOVOLFS                       = 0x8000
+	MNT_DWAIT                         = 0x4
+	MNT_EXPORTED                      = 0x100
+	MNT_FORCE                         = 0x80000
+	MNT_IGNORE_OWNERSHIP              = 0x200000
+	MNT_JOURNALED                     = 0x800000
+	MNT_LOCAL                         = 0x1000
+	MNT_MULTILABEL                    = 0x4000000
+	MNT_NOATIME                       = 0x10000000
+	MNT_NOBLOCK                       = 0x20000
+	MNT_NODEV                         = 0x10
+	MNT_NOEXEC                        = 0x4
+	MNT_NOSUID                        = 0x8
+	MNT_NOUSERXATTR                   = 0x1000000
+	MNT_NOWAIT                        = 0x2
+	MNT_QUARANTINE                    = 0x400
+	MNT_QUOTA                         = 0x2000
+	MNT_RDONLY                        = 0x1
+	MNT_RELOAD                        = 0x40000
+	MNT_ROOTFS                        = 0x4000
+	MNT_SYNCHRONOUS                   = 0x2
+	MNT_UNION                         = 0x20
+	MNT_UNKNOWNPERMISSIONS            = 0x200000
+	MNT_UPDATE                        = 0x10000
+	MNT_VISFLAGMASK                   = 0x17f0f5ff
+	MNT_WAIT                          = 0x1
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -819,7 +980,13 @@ const (
 	NET_RT_MAXID                      = 0xa
 	NET_RT_STAT                       = 0x4
 	NET_RT_TRASH                      = 0x5
+	NL0                               = 0x0
+	NL1                               = 0x100
+	NL2                               = 0x200
+	NL3                               = 0x300
+	NLDLY                             = 0x300
 	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
 	NOTE_ABSOLUTE                     = 0x8
 	NOTE_ATTRIB                       = 0x8
 	NOTE_BACKGROUND                   = 0x40
@@ -843,11 +1010,14 @@ const (
 	NOTE_FFNOP                        = 0x0
 	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
+	NOTE_FUNLOCK                      = 0x100
 	NOTE_LEEWAY                       = 0x10
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
+	NOTE_MACH_CONTINUOUS_TIME         = 0x80
 	NOTE_NONE                         = 0x80
 	NOTE_NSECONDS                     = 0x4
+	NOTE_OOB                          = 0x2
 	NOTE_PCTRLMASK                    = -0x100000
 	NOTE_PDATAMASK                    = 0xfffff
 	NOTE_REAP                         = 0x10000000
@@ -872,6 +1042,7 @@ const (
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
+	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_ALERT                           = 0x20000000
 	O_APPEND                          = 0x8
@@ -880,6 +1051,7 @@ const (
 	O_CREAT                           = 0x200
 	O_DIRECTORY                       = 0x100000
 	O_DP_GETRAWENCRYPTED              = 0x1
+	O_DP_GETRAWUNENCRYPTED            = 0x2
 	O_DSYNC                           = 0x400000
 	O_EVTONLY                         = 0x8000
 	O_EXCL                            = 0x800
@@ -932,7 +1104,10 @@ const (
 	RLIMIT_CPU_USAGE_MONITOR          = 0x2
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
 	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
@@ -1102,6 +1277,8 @@ const (
 	SO_LABEL                          = 0x1010
 	SO_LINGER                         = 0x80
 	SO_LINGER_SEC                     = 0x1080
+	SO_NETSVC_MARKING_LEVEL           = 0x1119
+	SO_NET_SERVICE_TYPE               = 0x1116
 	SO_NKE                            = 0x1021
 	SO_NOADDRERR                      = 0x1023
 	SO_NOSIGPIPE                      = 0x1022
@@ -1157,11 +1334,22 @@ const (
 	S_IXGRP                           = 0x8
 	S_IXOTH                           = 0x1
 	S_IXUSR                           = 0x40
+	TAB0                              = 0x0
+	TAB1                              = 0x400
+	TAB2                              = 0x800
+	TAB3                              = 0x4
+	TABDLY                            = 0xc04
 	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
 	TCP_CONNECTIONTIMEOUT             = 0x20
+	TCP_CONNECTION_INFO               = 0x106
 	TCP_ENABLE_ECN                    = 0x104
+	TCP_FASTOPEN                      = 0x105
 	TCP_KEEPALIVE                     = 0x10
 	TCP_KEEPCNT                       = 0x102
 	TCP_KEEPINTVL                     = 0x101
@@ -1261,6 +1449,11 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
+	VM_LOADAVG                        = 0x2
+	VM_MACHFACTOR                     = 0x4
+	VM_MAXID                          = 0x6
+	VM_METER                          = 0x1
+	VM_SWAPUSAGE                      = 0x5
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1431,146 +1624,154 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "device not configured",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource deadlock avoided",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "resource busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "operation not supported by device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "result too large",
-	35:  "resource temporarily unavailable",
-	36:  "operation now in progress",
-	37:  "operation already in progress",
-	38:  "socket operation on non-socket",
-	39:  "destination address required",
-	40:  "message too long",
-	41:  "protocol wrong type for socket",
-	42:  "protocol not available",
-	43:  "protocol not supported",
-	44:  "socket type not supported",
-	45:  "operation not supported",
-	46:  "protocol family not supported",
-	47:  "address family not supported by protocol family",
-	48:  "address already in use",
-	49:  "can't assign requested address",
-	50:  "network is down",
-	51:  "network is unreachable",
-	52:  "network dropped connection on reset",
-	53:  "software caused connection abort",
-	54:  "connection reset by peer",
-	55:  "no buffer space available",
-	56:  "socket is already connected",
-	57:  "socket is not connected",
-	58:  "can't send after socket shutdown",
-	59:  "too many references: can't splice",
-	60:  "operation timed out",
-	61:  "connection refused",
-	62:  "too many levels of symbolic links",
-	63:  "file name too long",
-	64:  "host is down",
-	65:  "no route to host",
-	66:  "directory not empty",
-	67:  "too many processes",
-	68:  "too many users",
-	69:  "disc quota exceeded",
-	70:  "stale NFS file handle",
-	71:  "too many levels of remote in path",
-	72:  "RPC struct is bad",
-	73:  "RPC version wrong",
-	74:  "RPC prog. not avail",
-	75:  "program version wrong",
-	76:  "bad procedure for program",
-	77:  "no locks available",
-	78:  "function not implemented",
-	79:  "inappropriate file type or format",
-	80:  "authentication error",
-	81:  "need authenticator",
-	82:  "device power is off",
-	83:  "device error",
-	84:  "value too large to be stored in data type",
-	85:  "bad executable (or shared library)",
-	86:  "bad CPU type in executable",
-	87:  "shared library version mismatch",
-	88:  "malformed Mach-o file",
-	89:  "operation canceled",
-	90:  "identifier removed",
-	91:  "no message of desired type",
-	92:  "illegal byte sequence",
-	93:  "attribute not found",
-	94:  "bad message",
-	95:  "EMULTIHOP (Reserved)",
-	96:  "no message available on STREAM",
-	97:  "ENOLINK (Reserved)",
-	98:  "no STREAM resources",
-	99:  "not a STREAM",
-	100: "protocol error",
-	101: "STREAM ioctl timeout",
-	102: "operation not supported on socket",
-	103: "policy not found",
-	104: "state not recoverable",
-	105: "previous owner died",
-	106: "interface output queue is full",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "ENOTSUP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EPWROFF", "device power is off"},
+	{83, "EDEVERR", "device error"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EBADEXEC", "bad executable (or shared library)"},
+	{86, "EBADARCH", "bad CPU type in executable"},
+	{87, "ESHLIBVERS", "shared library version mismatch"},
+	{88, "EBADMACHO", "malformed Mach-o file"},
+	{89, "ECANCELED", "operation canceled"},
+	{90, "EIDRM", "identifier removed"},
+	{91, "ENOMSG", "no message of desired type"},
+	{92, "EILSEQ", "illegal byte sequence"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EBADMSG", "bad message"},
+	{95, "EMULTIHOP", "EMULTIHOP (Reserved)"},
+	{96, "ENODATA", "no message available on STREAM"},
+	{97, "ENOLINK", "ENOLINK (Reserved)"},
+	{98, "ENOSR", "no STREAM resources"},
+	{99, "ENOSTR", "not a STREAM"},
+	{100, "EPROTO", "protocol error"},
+	{101, "ETIME", "STREAM ioctl timeout"},
+	{102, "EOPNOTSUPP", "operation not supported on socket"},
+	{103, "ENOPOLICY", "policy not found"},
+	{104, "ENOTRECOVERABLE", "state not recoverable"},
+	{105, "EOWNERDEAD", "previous owner died"},
+	{106, "EQFULL", "interface output queue is full"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
index 0feceee151..46a082b6d5 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_dragonfly_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,dragonfly
 
@@ -37,8 +37,8 @@ const (
 	AF_MAX                            = 0x24
 	AF_MPLS                           = 0x22
 	AF_NATM                           = 0x1d
+	AF_NETBIOS                        = 0x6
 	AF_NETGRAPH                       = 0x20
-	AF_NS                             = 0x6
 	AF_OSI                            = 0x7
 	AF_PUP                            = 0x4
 	AF_ROUTE                          = 0x11
@@ -46,6 +46,7 @@ const (
 	AF_SNA                            = 0xb
 	AF_UNIX                           = 0x1
 	AF_UNSPEC                         = 0x0
+	ALTWERASE                         = 0x200
 	B0                                = 0x0
 	B110                              = 0x6e
 	B115200                           = 0x1c200
@@ -141,7 +142,22 @@ const (
 	BRKINT                            = 0x2
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
+	CLOCK_MONOTONIC                   = 0x4
+	CLOCK_MONOTONIC_FAST              = 0xc
+	CLOCK_MONOTONIC_PRECISE           = 0xb
+	CLOCK_PROCESS_CPUTIME_ID          = 0xf
+	CLOCK_PROF                        = 0x2
+	CLOCK_REALTIME                    = 0x0
+	CLOCK_REALTIME_FAST               = 0xa
+	CLOCK_REALTIME_PRECISE            = 0x9
+	CLOCK_SECOND                      = 0xd
+	CLOCK_THREAD_CPUTIME_ID           = 0xe
+	CLOCK_UPTIME                      = 0x5
+	CLOCK_UPTIME_FAST                 = 0x8
+	CLOCK_UPTIME_PRECISE              = 0x7
+	CLOCK_VIRTUAL                     = 0x1
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x30000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -152,6 +168,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DLT_A429                          = 0xb8
@@ -286,24 +304,28 @@ const (
 	ECHOPRT                           = 0x20
 	EVFILT_AIO                        = -0x3
 	EVFILT_EXCEPT                     = -0x8
+	EVFILT_FS                         = -0xa
 	EVFILT_MARKER                     = 0xf
 	EVFILT_PROC                       = -0x5
 	EVFILT_READ                       = -0x1
 	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0x8
+	EVFILT_SYSCOUNT                   = 0xa
 	EVFILT_TIMER                      = -0x7
+	EVFILT_USER                       = -0x9
 	EVFILT_VNODE                      = -0x4
 	EVFILT_WRITE                      = -0x2
 	EV_ADD                            = 0x1
 	EV_CLEAR                          = 0x20
 	EV_DELETE                         = 0x2
 	EV_DISABLE                        = 0x8
+	EV_DISPATCH                       = 0x80
 	EV_ENABLE                         = 0x4
 	EV_EOF                            = 0x8000
 	EV_ERROR                          = 0x4000
 	EV_FLAG1                          = 0x2000
 	EV_NODATA                         = 0x1000
 	EV_ONESHOT                        = 0x10
+	EV_RECEIPT                        = 0x40
 	EV_SYSFLAGS                       = 0xf000
 	EXTA                              = 0x4b00
 	EXTB                              = 0x9600
@@ -333,6 +355,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -679,7 +702,6 @@ const (
 	IPPROTO_SATEXPAK                  = 0x40
 	IPPROTO_SATMON                    = 0x45
 	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
 	IPPROTO_SDRP                      = 0x2a
 	IPPROTO_SEP                       = 0x21
 	IPPROTO_SKIP                      = 0x39
@@ -730,6 +752,7 @@ const (
 	IPV6_LEAVE_GROUP                  = 0xd
 	IPV6_MAXHLIM                      = 0xff
 	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MINHLIM                      = 0x28
 	IPV6_MMTU                         = 0x500
 	IPV6_MSFILTER                     = 0x4a
 	IPV6_MULTICAST_HOPS               = 0xa
@@ -778,6 +801,7 @@ const (
 	IP_FW_FLUSH                       = 0x34
 	IP_FW_GET                         = 0x36
 	IP_FW_RESETLOG                    = 0x37
+	IP_FW_X                           = 0x31
 	IP_FW_ZERO                        = 0x35
 	IP_HDRINCL                        = 0x2
 	IP_IPSEC_POLICY                   = 0x15
@@ -814,6 +838,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -833,6 +861,7 @@ const (
 	MADV_SETMAP                       = 0xb
 	MADV_WILLNEED                     = 0x3
 	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
 	MAP_COPY                          = 0x2
 	MAP_FILE                          = 0x0
 	MAP_FIXED                         = 0x10
@@ -851,6 +880,7 @@ const (
 	MAP_VPAGETABLE                    = 0x2000
 	MCL_CURRENT                       = 0x1
 	MCL_FUTURE                        = 0x2
+	MSG_CMSG_CLOEXEC                  = 0x1000
 	MSG_CTRUNC                        = 0x20
 	MSG_DONTROUTE                     = 0x4
 	MSG_DONTWAIT                      = 0x80
@@ -860,11 +890,11 @@ const (
 	MSG_FMASK                         = 0xffff0000
 	MSG_FNONBLOCKING                  = 0x20000
 	MSG_NOSIGNAL                      = 0x400
-	MSG_NOTIFICATION                  = 0x200
 	MSG_OOB                           = 0x1
 	MSG_PEEK                          = 0x2
 	MSG_SYNC                          = 0x800
 	MSG_TRUNC                         = 0x10
+	MSG_UNUSED09                      = 0x200
 	MSG_WAITALL                       = 0x40
 	MS_ASYNC                          = 0x1
 	MS_INVALIDATE                     = 0x2
@@ -875,12 +905,19 @@ const (
 	NET_RT_IFLIST                     = 0x3
 	NET_RT_MAXID                      = 0x4
 	NOFLSH                            = 0x80000000
+	NOKERNINFO                        = 0x2000000
 	NOTE_ATTRIB                       = 0x8
 	NOTE_CHILD                        = 0x4
 	NOTE_DELETE                       = 0x1
 	NOTE_EXEC                         = 0x20000000
 	NOTE_EXIT                         = 0x80000000
 	NOTE_EXTEND                       = 0x4
+	NOTE_FFAND                        = 0x40000000
+	NOTE_FFCOPY                       = 0xc0000000
+	NOTE_FFCTRLMASK                   = 0xc0000000
+	NOTE_FFLAGSMASK                   = 0xffffff
+	NOTE_FFNOP                        = 0x0
+	NOTE_FFOR                         = 0x80000000
 	NOTE_FORK                         = 0x40000000
 	NOTE_LINK                         = 0x10
 	NOTE_LOWAT                        = 0x1
@@ -891,6 +928,7 @@ const (
 	NOTE_REVOKE                       = 0x40
 	NOTE_TRACK                        = 0x1
 	NOTE_TRACKERR                     = 0x2
+	NOTE_TRIGGER                      = 0x1000000
 	NOTE_WRITE                        = 0x2
 	OCRNL                             = 0x10
 	ONLCR                             = 0x2
@@ -898,6 +936,7 @@ const (
 	ONOCR                             = 0x20
 	ONOEOT                            = 0x8
 	OPOST                             = 0x1
+	OXTABS                            = 0x4
 	O_ACCMODE                         = 0x3
 	O_APPEND                          = 0x8
 	O_ASYNC                           = 0x40
@@ -910,14 +949,11 @@ const (
 	O_FAPPEND                         = 0x100000
 	O_FASYNCWRITE                     = 0x800000
 	O_FBLOCKING                       = 0x40000
-	O_FBUFFERED                       = 0x2000000
-	O_FMASK                           = 0x7fc0000
+	O_FMASK                           = 0xfc0000
 	O_FNONBLOCKING                    = 0x80000
 	O_FOFFSET                         = 0x200000
 	O_FSYNC                           = 0x80
 	O_FSYNCWRITE                      = 0x400000
-	O_FUNBUFFERED                     = 0x1000000
-	O_MAPONREAD                       = 0x4000000
 	O_NDELAY                          = 0x4
 	O_NOCTTY                          = 0x8000
 	O_NOFOLLOW                        = 0x100
@@ -944,7 +980,10 @@ const (
 	RLIMIT_CPU                        = 0x0
 	RLIMIT_DATA                       = 0x2
 	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_MEMLOCK                    = 0x6
 	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_NPROC                      = 0x7
+	RLIMIT_RSS                        = 0x5
 	RLIMIT_STACK                      = 0x3
 	RLIM_INFINITY                     = 0x7fffffffffffffff
 	RTAX_AUTHOR                       = 0x6
@@ -1096,8 +1135,10 @@ const (
 	SIOCSLIFPHYADDR                   = 0x8118694a
 	SIOCSLOWAT                        = 0x80047302
 	SIOCSPGRP                         = 0x80047308
+	SOCK_CLOEXEC                      = 0x10000000
 	SOCK_DGRAM                        = 0x2
 	SOCK_MAXADDRLEN                   = 0xff
+	SOCK_NONBLOCK                     = 0x20000000
 	SOCK_RAW                          = 0x3
 	SOCK_RDM                          = 0x4
 	SOCK_SEQPACKET                    = 0x5
@@ -1107,6 +1148,7 @@ const (
 	SO_ACCEPTCONN                     = 0x2
 	SO_ACCEPTFILTER                   = 0x1000
 	SO_BROADCAST                      = 0x20
+	SO_CPUHINT                        = 0x1030
 	SO_DEBUG                          = 0x1
 	SO_DONTROUTE                      = 0x10
 	SO_ERROR                          = 0x1007
@@ -1127,8 +1169,12 @@ const (
 	SO_TYPE                           = 0x1008
 	SO_USELOOPBACK                    = 0x40
 	TCIFLUSH                          = 0x1
+	TCIOFF                            = 0x3
 	TCIOFLUSH                         = 0x3
+	TCION                             = 0x4
 	TCOFLUSH                          = 0x2
+	TCOOFF                            = 0x1
+	TCOON                             = 0x2
 	TCP_FASTKEEP                      = 0x80
 	TCP_KEEPCNT                       = 0x400
 	TCP_KEEPIDLE                      = 0x100
@@ -1227,6 +1273,8 @@ const (
 	VKILL                             = 0x5
 	VLNEXT                            = 0xe
 	VMIN                              = 0x10
+	VM_BCACHE_SIZE_MAX                = 0x0
+	VM_SWZONE_SIZE_MAX                = 0x4000000000
 	VQUIT                             = 0x9
 	VREPRINT                          = 0x6
 	VSTART                            = 0xc
@@ -1389,142 +1437,150 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "no medium found",
-	94: "unknown error: 94",
-	95: "unknown error: 95",
-	96: "unknown error: 96",
-	97: "unknown error: 97",
-	98: "unknown error: 98",
-	99: "unknown error: 99",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOMEDIUM", "no medium found"},
+	{94, "EUNUSED94", "unknown error: 94"},
+	{95, "EUNUSED95", "unknown error: 95"},
+	{96, "EUNUSED96", "unknown error: 96"},
+	{97, "EUNUSED97", "unknown error: 97"},
+	{98, "EUNUSED98", "unknown error: 98"},
+	{99, "ELAST", "unknown error: 99"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread Scheduler",
-	33: "checkPoint",
-	34: "checkPointExit",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread Scheduler"},
+	{33, "SIGCKPT", "checkPoint"},
+	{34, "SIGCKPTEXIT", "checkPointExit"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
index 7b95751c3d..2947dc0382 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_386.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,freebsd
 
@@ -11,1456 +11,1469 @@ package unix
 import "syscall"
 
 const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0084279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4004427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4008426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x400c4280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80084267
+	BIOCSETFNR                     = 0x80084282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8008427b
+	BIOCSETZBUF                    = 0x800c4281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8008426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x4
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_HHDLC                      = 0x79
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x104
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0x10
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xf
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80246987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80246989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc01c697b
+	SIOCGETSGCNT                   = 0xc0147210
+	SIOCGETVIFCNT                  = 0xc014720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0086924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc024698a
+	SIOCGIFGROUP                   = 0xc0246988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0286938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc028698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc00c6978
+	SIOCSDRVSPEC                   = 0x801c697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40087459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
 )
 
 // Errors
@@ -1606,138 +1619,146 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
index e48e7799a1..c600d012d0 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,freebsd
 
@@ -11,1461 +11,1470 @@ package unix
 import "syscall"
 
 const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0104279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4008427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4010426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x40184280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80104267
-	BIOCSETFNR                        = 0x80104282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8010427b
-	BIOCSETZBUF                       = 0x80184281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8010426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x8
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CLOCK_MONOTONIC                   = 0x4
-	CLOCK_MONOTONIC_FAST              = 0xc
-	CLOCK_MONOTONIC_PRECISE           = 0xb
-	CLOCK_PROCESS_CPUTIME_ID          = 0xf
-	CLOCK_PROF                        = 0x2
-	CLOCK_REALTIME                    = 0x0
-	CLOCK_REALTIME_FAST               = 0xa
-	CLOCK_REALTIME_PRECISE            = 0x9
-	CLOCK_SECOND                      = 0xd
-	CLOCK_THREAD_CPUTIME_ID           = 0xe
-	CLOCK_UPTIME                      = 0x5
-	CLOCK_UPTIME_FAST                 = 0x8
-	CLOCK_UPTIME_PRECISE              = 0x7
-	CLOCK_VIRTUAL                     = 0x1
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_32BIT                         = 0x80000
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_MSECONDS                     = 0x2
-	NOTE_NSECONDS                     = 0x8
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_SECONDS                      = 0x1
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_USECONDS                     = 0x4
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8040720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80286987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8040720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80286989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc028697b
-	SIOCGETSGCNT                      = 0xc0207210
-	SIOCGETVIFCNT                     = 0xc028720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0106924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc028698a
-	SIOCGIFGROUP                      = 0xc0286988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0306938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc0106978
-	SIOCSDRVSPEC                      = 0x8028697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40107459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0104279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4008427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4010426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x40184280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80104267
+	BIOCSETFNR                     = 0x80104282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8010427b
+	BIOCSETZBUF                    = 0x80184281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8010426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x8
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffffffffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_HHDLC                      = 0x79
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x104
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0x10
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xf
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_32BIT                      = 0x80000
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80286987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80286989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc028697b
+	SIOCGETSGCNT                   = 0xc0207210
+	SIOCGETVIFCNT                  = 0xc028720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0106924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc028698a
+	SIOCGIFGROUP                   = 0xc0286988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0306938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc030698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc0106978
+	SIOCSDRVSPEC                   = 0x8028697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40107459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
 )
 
 // Errors
@@ -1611,138 +1620,146 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
index 2afbe2d5ed..e8240d2397 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_freebsd_arm.go
@@ -1,5 +1,5 @@
 // mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,freebsd
 
@@ -11,1442 +11,1478 @@ package unix
 import "syscall"
 
 const (
-	AF_APPLETALK                      = 0x10
-	AF_ARP                            = 0x23
-	AF_ATM                            = 0x1e
-	AF_BLUETOOTH                      = 0x24
-	AF_CCITT                          = 0xa
-	AF_CHAOS                          = 0x5
-	AF_CNT                            = 0x15
-	AF_COIP                           = 0x14
-	AF_DATAKIT                        = 0x9
-	AF_DECnet                         = 0xc
-	AF_DLI                            = 0xd
-	AF_E164                           = 0x1a
-	AF_ECMA                           = 0x8
-	AF_HYLINK                         = 0xf
-	AF_IEEE80211                      = 0x25
-	AF_IMPLINK                        = 0x3
-	AF_INET                           = 0x2
-	AF_INET6                          = 0x1c
-	AF_INET6_SDP                      = 0x2a
-	AF_INET_SDP                       = 0x28
-	AF_IPX                            = 0x17
-	AF_ISDN                           = 0x1a
-	AF_ISO                            = 0x7
-	AF_LAT                            = 0xe
-	AF_LINK                           = 0x12
-	AF_LOCAL                          = 0x1
-	AF_MAX                            = 0x2a
-	AF_NATM                           = 0x1d
-	AF_NETBIOS                        = 0x6
-	AF_NETGRAPH                       = 0x20
-	AF_OSI                            = 0x7
-	AF_PUP                            = 0x4
-	AF_ROUTE                          = 0x11
-	AF_SCLUSTER                       = 0x22
-	AF_SIP                            = 0x18
-	AF_SLOW                           = 0x21
-	AF_SNA                            = 0xb
-	AF_UNIX                           = 0x1
-	AF_UNSPEC                         = 0x0
-	AF_VENDOR00                       = 0x27
-	AF_VENDOR01                       = 0x29
-	AF_VENDOR02                       = 0x2b
-	AF_VENDOR03                       = 0x2d
-	AF_VENDOR04                       = 0x2f
-	AF_VENDOR05                       = 0x31
-	AF_VENDOR06                       = 0x33
-	AF_VENDOR07                       = 0x35
-	AF_VENDOR08                       = 0x37
-	AF_VENDOR09                       = 0x39
-	AF_VENDOR10                       = 0x3b
-	AF_VENDOR11                       = 0x3d
-	AF_VENDOR12                       = 0x3f
-	AF_VENDOR13                       = 0x41
-	AF_VENDOR14                       = 0x43
-	AF_VENDOR15                       = 0x45
-	AF_VENDOR16                       = 0x47
-	AF_VENDOR17                       = 0x49
-	AF_VENDOR18                       = 0x4b
-	AF_VENDOR19                       = 0x4d
-	AF_VENDOR20                       = 0x4f
-	AF_VENDOR21                       = 0x51
-	AF_VENDOR22                       = 0x53
-	AF_VENDOR23                       = 0x55
-	AF_VENDOR24                       = 0x57
-	AF_VENDOR25                       = 0x59
-	AF_VENDOR26                       = 0x5b
-	AF_VENDOR27                       = 0x5d
-	AF_VENDOR28                       = 0x5f
-	AF_VENDOR29                       = 0x61
-	AF_VENDOR30                       = 0x63
-	AF_VENDOR31                       = 0x65
-	AF_VENDOR32                       = 0x67
-	AF_VENDOR33                       = 0x69
-	AF_VENDOR34                       = 0x6b
-	AF_VENDOR35                       = 0x6d
-	AF_VENDOR36                       = 0x6f
-	AF_VENDOR37                       = 0x71
-	AF_VENDOR38                       = 0x73
-	AF_VENDOR39                       = 0x75
-	AF_VENDOR40                       = 0x77
-	AF_VENDOR41                       = 0x79
-	AF_VENDOR42                       = 0x7b
-	AF_VENDOR43                       = 0x7d
-	AF_VENDOR44                       = 0x7f
-	AF_VENDOR45                       = 0x81
-	AF_VENDOR46                       = 0x83
-	AF_VENDOR47                       = 0x85
-	B0                                = 0x0
-	B110                              = 0x6e
-	B115200                           = 0x1c200
-	B1200                             = 0x4b0
-	B134                              = 0x86
-	B14400                            = 0x3840
-	B150                              = 0x96
-	B1800                             = 0x708
-	B19200                            = 0x4b00
-	B200                              = 0xc8
-	B230400                           = 0x38400
-	B2400                             = 0x960
-	B28800                            = 0x7080
-	B300                              = 0x12c
-	B38400                            = 0x9600
-	B460800                           = 0x70800
-	B4800                             = 0x12c0
-	B50                               = 0x32
-	B57600                            = 0xe100
-	B600                              = 0x258
-	B7200                             = 0x1c20
-	B75                               = 0x4b
-	B76800                            = 0x12c00
-	B921600                           = 0xe1000
-	B9600                             = 0x2580
-	BIOCFEEDBACK                      = 0x8004427c
-	BIOCFLUSH                         = 0x20004268
-	BIOCGBLEN                         = 0x40044266
-	BIOCGDIRECTION                    = 0x40044276
-	BIOCGDLT                          = 0x4004426a
-	BIOCGDLTLIST                      = 0xc0084279
-	BIOCGETBUFMODE                    = 0x4004427d
-	BIOCGETIF                         = 0x4020426b
-	BIOCGETZMAX                       = 0x4004427f
-	BIOCGHDRCMPLT                     = 0x40044274
-	BIOCGRSIG                         = 0x40044272
-	BIOCGRTIMEOUT                     = 0x4008426e
-	BIOCGSEESENT                      = 0x40044276
-	BIOCGSTATS                        = 0x4008426f
-	BIOCGTSTAMP                       = 0x40044283
-	BIOCIMMEDIATE                     = 0x80044270
-	BIOCLOCK                          = 0x2000427a
-	BIOCPROMISC                       = 0x20004269
-	BIOCROTZBUF                       = 0x400c4280
-	BIOCSBLEN                         = 0xc0044266
-	BIOCSDIRECTION                    = 0x80044277
-	BIOCSDLT                          = 0x80044278
-	BIOCSETBUFMODE                    = 0x8004427e
-	BIOCSETF                          = 0x80084267
-	BIOCSETFNR                        = 0x80084282
-	BIOCSETIF                         = 0x8020426c
-	BIOCSETWF                         = 0x8008427b
-	BIOCSETZBUF                       = 0x800c4281
-	BIOCSHDRCMPLT                     = 0x80044275
-	BIOCSRSIG                         = 0x80044273
-	BIOCSRTIMEOUT                     = 0x8008426d
-	BIOCSSEESENT                      = 0x80044277
-	BIOCSTSTAMP                       = 0x80044284
-	BIOCVERSION                       = 0x40044271
-	BPF_A                             = 0x10
-	BPF_ABS                           = 0x20
-	BPF_ADD                           = 0x0
-	BPF_ALIGNMENT                     = 0x4
-	BPF_ALU                           = 0x4
-	BPF_AND                           = 0x50
-	BPF_B                             = 0x10
-	BPF_BUFMODE_BUFFER                = 0x1
-	BPF_BUFMODE_ZBUF                  = 0x2
-	BPF_DIV                           = 0x30
-	BPF_H                             = 0x8
-	BPF_IMM                           = 0x0
-	BPF_IND                           = 0x40
-	BPF_JA                            = 0x0
-	BPF_JEQ                           = 0x10
-	BPF_JGE                           = 0x30
-	BPF_JGT                           = 0x20
-	BPF_JMP                           = 0x5
-	BPF_JSET                          = 0x40
-	BPF_K                             = 0x0
-	BPF_LD                            = 0x0
-	BPF_LDX                           = 0x1
-	BPF_LEN                           = 0x80
-	BPF_LSH                           = 0x60
-	BPF_MAJOR_VERSION                 = 0x1
-	BPF_MAXBUFSIZE                    = 0x80000
-	BPF_MAXINSNS                      = 0x200
-	BPF_MEM                           = 0x60
-	BPF_MEMWORDS                      = 0x10
-	BPF_MINBUFSIZE                    = 0x20
-	BPF_MINOR_VERSION                 = 0x1
-	BPF_MISC                          = 0x7
-	BPF_MSH                           = 0xa0
-	BPF_MUL                           = 0x20
-	BPF_NEG                           = 0x80
-	BPF_OR                            = 0x40
-	BPF_RELEASE                       = 0x30bb6
-	BPF_RET                           = 0x6
-	BPF_RSH                           = 0x70
-	BPF_ST                            = 0x2
-	BPF_STX                           = 0x3
-	BPF_SUB                           = 0x10
-	BPF_TAX                           = 0x0
-	BPF_TXA                           = 0x80
-	BPF_T_BINTIME                     = 0x2
-	BPF_T_BINTIME_FAST                = 0x102
-	BPF_T_BINTIME_MONOTONIC           = 0x202
-	BPF_T_BINTIME_MONOTONIC_FAST      = 0x302
-	BPF_T_FAST                        = 0x100
-	BPF_T_FLAG_MASK                   = 0x300
-	BPF_T_FORMAT_MASK                 = 0x3
-	BPF_T_MICROTIME                   = 0x0
-	BPF_T_MICROTIME_FAST              = 0x100
-	BPF_T_MICROTIME_MONOTONIC         = 0x200
-	BPF_T_MICROTIME_MONOTONIC_FAST    = 0x300
-	BPF_T_MONOTONIC                   = 0x200
-	BPF_T_MONOTONIC_FAST              = 0x300
-	BPF_T_NANOTIME                    = 0x1
-	BPF_T_NANOTIME_FAST               = 0x101
-	BPF_T_NANOTIME_MONOTONIC          = 0x201
-	BPF_T_NANOTIME_MONOTONIC_FAST     = 0x301
-	BPF_T_NONE                        = 0x3
-	BPF_T_NORMAL                      = 0x0
-	BPF_W                             = 0x0
-	BPF_X                             = 0x8
-	BRKINT                            = 0x2
-	CFLUSH                            = 0xf
-	CLOCAL                            = 0x8000
-	CREAD                             = 0x800
-	CS5                               = 0x0
-	CS6                               = 0x100
-	CS7                               = 0x200
-	CS8                               = 0x300
-	CSIZE                             = 0x300
-	CSTART                            = 0x11
-	CSTATUS                           = 0x14
-	CSTOP                             = 0x13
-	CSTOPB                            = 0x400
-	CSUSP                             = 0x1a
-	CTL_MAXNAME                       = 0x18
-	CTL_NET                           = 0x4
-	DLT_A429                          = 0xb8
-	DLT_A653_ICM                      = 0xb9
-	DLT_AIRONET_HEADER                = 0x78
-	DLT_AOS                           = 0xde
-	DLT_APPLE_IP_OVER_IEEE1394        = 0x8a
-	DLT_ARCNET                        = 0x7
-	DLT_ARCNET_LINUX                  = 0x81
-	DLT_ATM_CLIP                      = 0x13
-	DLT_ATM_RFC1483                   = 0xb
-	DLT_AURORA                        = 0x7e
-	DLT_AX25                          = 0x3
-	DLT_AX25_KISS                     = 0xca
-	DLT_BACNET_MS_TP                  = 0xa5
-	DLT_BLUETOOTH_HCI_H4              = 0xbb
-	DLT_BLUETOOTH_HCI_H4_WITH_PHDR    = 0xc9
-	DLT_CAN20B                        = 0xbe
-	DLT_CAN_SOCKETCAN                 = 0xe3
-	DLT_CHAOS                         = 0x5
-	DLT_CHDLC                         = 0x68
-	DLT_CISCO_IOS                     = 0x76
-	DLT_C_HDLC                        = 0x68
-	DLT_C_HDLC_WITH_DIR               = 0xcd
-	DLT_DBUS                          = 0xe7
-	DLT_DECT                          = 0xdd
-	DLT_DOCSIS                        = 0x8f
-	DLT_DVB_CI                        = 0xeb
-	DLT_ECONET                        = 0x73
-	DLT_EN10MB                        = 0x1
-	DLT_EN3MB                         = 0x2
-	DLT_ENC                           = 0x6d
-	DLT_ERF                           = 0xc5
-	DLT_ERF_ETH                       = 0xaf
-	DLT_ERF_POS                       = 0xb0
-	DLT_FC_2                          = 0xe0
-	DLT_FC_2_WITH_FRAME_DELIMS        = 0xe1
-	DLT_FDDI                          = 0xa
-	DLT_FLEXRAY                       = 0xd2
-	DLT_FRELAY                        = 0x6b
-	DLT_FRELAY_WITH_DIR               = 0xce
-	DLT_GCOM_SERIAL                   = 0xad
-	DLT_GCOM_T1E1                     = 0xac
-	DLT_GPF_F                         = 0xab
-	DLT_GPF_T                         = 0xaa
-	DLT_GPRS_LLC                      = 0xa9
-	DLT_GSMTAP_ABIS                   = 0xda
-	DLT_GSMTAP_UM                     = 0xd9
-	DLT_HHDLC                         = 0x79
-	DLT_IBM_SN                        = 0x92
-	DLT_IBM_SP                        = 0x91
-	DLT_IEEE802                       = 0x6
-	DLT_IEEE802_11                    = 0x69
-	DLT_IEEE802_11_RADIO              = 0x7f
-	DLT_IEEE802_11_RADIO_AVS          = 0xa3
-	DLT_IEEE802_15_4                  = 0xc3
-	DLT_IEEE802_15_4_LINUX            = 0xbf
-	DLT_IEEE802_15_4_NOFCS            = 0xe6
-	DLT_IEEE802_15_4_NONASK_PHY       = 0xd7
-	DLT_IEEE802_16_MAC_CPS            = 0xbc
-	DLT_IEEE802_16_MAC_CPS_RADIO      = 0xc1
-	DLT_IPFILTER                      = 0x74
-	DLT_IPMB                          = 0xc7
-	DLT_IPMB_LINUX                    = 0xd1
-	DLT_IPNET                         = 0xe2
-	DLT_IPOIB                         = 0xf2
-	DLT_IPV4                          = 0xe4
-	DLT_IPV6                          = 0xe5
-	DLT_IP_OVER_FC                    = 0x7a
-	DLT_JUNIPER_ATM1                  = 0x89
-	DLT_JUNIPER_ATM2                  = 0x87
-	DLT_JUNIPER_ATM_CEMIC             = 0xee
-	DLT_JUNIPER_CHDLC                 = 0xb5
-	DLT_JUNIPER_ES                    = 0x84
-	DLT_JUNIPER_ETHER                 = 0xb2
-	DLT_JUNIPER_FIBRECHANNEL          = 0xea
-	DLT_JUNIPER_FRELAY                = 0xb4
-	DLT_JUNIPER_GGSN                  = 0x85
-	DLT_JUNIPER_ISM                   = 0xc2
-	DLT_JUNIPER_MFR                   = 0x86
-	DLT_JUNIPER_MLFR                  = 0x83
-	DLT_JUNIPER_MLPPP                 = 0x82
-	DLT_JUNIPER_MONITOR               = 0xa4
-	DLT_JUNIPER_PIC_PEER              = 0xae
-	DLT_JUNIPER_PPP                   = 0xb3
-	DLT_JUNIPER_PPPOE                 = 0xa7
-	DLT_JUNIPER_PPPOE_ATM             = 0xa8
-	DLT_JUNIPER_SERVICES              = 0x88
-	DLT_JUNIPER_SRX_E2E               = 0xe9
-	DLT_JUNIPER_ST                    = 0xc8
-	DLT_JUNIPER_VP                    = 0xb7
-	DLT_JUNIPER_VS                    = 0xe8
-	DLT_LAPB_WITH_DIR                 = 0xcf
-	DLT_LAPD                          = 0xcb
-	DLT_LIN                           = 0xd4
-	DLT_LINUX_EVDEV                   = 0xd8
-	DLT_LINUX_IRDA                    = 0x90
-	DLT_LINUX_LAPD                    = 0xb1
-	DLT_LINUX_PPP_WITHDIRECTION       = 0xa6
-	DLT_LINUX_SLL                     = 0x71
-	DLT_LOOP                          = 0x6c
-	DLT_LTALK                         = 0x72
-	DLT_MATCHING_MAX                  = 0xf6
-	DLT_MATCHING_MIN                  = 0x68
-	DLT_MFR                           = 0xb6
-	DLT_MOST                          = 0xd3
-	DLT_MPEG_2_TS                     = 0xf3
-	DLT_MPLS                          = 0xdb
-	DLT_MTP2                          = 0x8c
-	DLT_MTP2_WITH_PHDR                = 0x8b
-	DLT_MTP3                          = 0x8d
-	DLT_MUX27010                      = 0xec
-	DLT_NETANALYZER                   = 0xf0
-	DLT_NETANALYZER_TRANSPARENT       = 0xf1
-	DLT_NFC_LLCP                      = 0xf5
-	DLT_NFLOG                         = 0xef
-	DLT_NG40                          = 0xf4
-	DLT_NULL                          = 0x0
-	DLT_PCI_EXP                       = 0x7d
-	DLT_PFLOG                         = 0x75
-	DLT_PFSYNC                        = 0x79
-	DLT_PPI                           = 0xc0
-	DLT_PPP                           = 0x9
-	DLT_PPP_BSDOS                     = 0x10
-	DLT_PPP_ETHER                     = 0x33
-	DLT_PPP_PPPD                      = 0xa6
-	DLT_PPP_SERIAL                    = 0x32
-	DLT_PPP_WITH_DIR                  = 0xcc
-	DLT_PPP_WITH_DIRECTION            = 0xa6
-	DLT_PRISM_HEADER                  = 0x77
-	DLT_PRONET                        = 0x4
-	DLT_RAIF1                         = 0xc6
-	DLT_RAW                           = 0xc
-	DLT_RIO                           = 0x7c
-	DLT_SCCP                          = 0x8e
-	DLT_SITA                          = 0xc4
-	DLT_SLIP                          = 0x8
-	DLT_SLIP_BSDOS                    = 0xf
-	DLT_STANAG_5066_D_PDU             = 0xed
-	DLT_SUNATM                        = 0x7b
-	DLT_SYMANTEC_FIREWALL             = 0x63
-	DLT_TZSP                          = 0x80
-	DLT_USB                           = 0xba
-	DLT_USB_LINUX                     = 0xbd
-	DLT_USB_LINUX_MMAPPED             = 0xdc
-	DLT_USER0                         = 0x93
-	DLT_USER1                         = 0x94
-	DLT_USER10                        = 0x9d
-	DLT_USER11                        = 0x9e
-	DLT_USER12                        = 0x9f
-	DLT_USER13                        = 0xa0
-	DLT_USER14                        = 0xa1
-	DLT_USER15                        = 0xa2
-	DLT_USER2                         = 0x95
-	DLT_USER3                         = 0x96
-	DLT_USER4                         = 0x97
-	DLT_USER5                         = 0x98
-	DLT_USER6                         = 0x99
-	DLT_USER7                         = 0x9a
-	DLT_USER8                         = 0x9b
-	DLT_USER9                         = 0x9c
-	DLT_WIHART                        = 0xdf
-	DLT_X2E_SERIAL                    = 0xd5
-	DLT_X2E_XORAYA                    = 0xd6
-	DT_BLK                            = 0x6
-	DT_CHR                            = 0x2
-	DT_DIR                            = 0x4
-	DT_FIFO                           = 0x1
-	DT_LNK                            = 0xa
-	DT_REG                            = 0x8
-	DT_SOCK                           = 0xc
-	DT_UNKNOWN                        = 0x0
-	DT_WHT                            = 0xe
-	ECHO                              = 0x8
-	ECHOCTL                           = 0x40
-	ECHOE                             = 0x2
-	ECHOK                             = 0x4
-	ECHOKE                            = 0x1
-	ECHONL                            = 0x10
-	ECHOPRT                           = 0x20
-	EVFILT_AIO                        = -0x3
-	EVFILT_FS                         = -0x9
-	EVFILT_LIO                        = -0xa
-	EVFILT_PROC                       = -0x5
-	EVFILT_READ                       = -0x1
-	EVFILT_SIGNAL                     = -0x6
-	EVFILT_SYSCOUNT                   = 0xb
-	EVFILT_TIMER                      = -0x7
-	EVFILT_USER                       = -0xb
-	EVFILT_VNODE                      = -0x4
-	EVFILT_WRITE                      = -0x2
-	EV_ADD                            = 0x1
-	EV_CLEAR                          = 0x20
-	EV_DELETE                         = 0x2
-	EV_DISABLE                        = 0x8
-	EV_DISPATCH                       = 0x80
-	EV_DROP                           = 0x1000
-	EV_ENABLE                         = 0x4
-	EV_EOF                            = 0x8000
-	EV_ERROR                          = 0x4000
-	EV_FLAG1                          = 0x2000
-	EV_ONESHOT                        = 0x10
-	EV_RECEIPT                        = 0x40
-	EV_SYSFLAGS                       = 0xf000
-	EXTA                              = 0x4b00
-	EXTATTR_NAMESPACE_EMPTY           = 0x0
-	EXTATTR_NAMESPACE_SYSTEM          = 0x2
-	EXTATTR_NAMESPACE_USER            = 0x1
-	EXTB                              = 0x9600
-	EXTPROC                           = 0x800
-	FD_CLOEXEC                        = 0x1
-	FD_SETSIZE                        = 0x400
-	FLUSHO                            = 0x800000
-	F_CANCEL                          = 0x5
-	F_DUP2FD                          = 0xa
-	F_DUP2FD_CLOEXEC                  = 0x12
-	F_DUPFD                           = 0x0
-	F_DUPFD_CLOEXEC                   = 0x11
-	F_GETFD                           = 0x1
-	F_GETFL                           = 0x3
-	F_GETLK                           = 0xb
-	F_GETOWN                          = 0x5
-	F_OGETLK                          = 0x7
-	F_OK                              = 0x0
-	F_OSETLK                          = 0x8
-	F_OSETLKW                         = 0x9
-	F_RDAHEAD                         = 0x10
-	F_RDLCK                           = 0x1
-	F_READAHEAD                       = 0xf
-	F_SETFD                           = 0x2
-	F_SETFL                           = 0x4
-	F_SETLK                           = 0xc
-	F_SETLKW                          = 0xd
-	F_SETLK_REMOTE                    = 0xe
-	F_SETOWN                          = 0x6
-	F_UNLCK                           = 0x2
-	F_UNLCKSYS                        = 0x4
-	F_WRLCK                           = 0x3
-	HUPCL                             = 0x4000
-	ICANON                            = 0x100
-	ICMP6_FILTER                      = 0x12
-	ICRNL                             = 0x100
-	IEXTEN                            = 0x400
-	IFAN_ARRIVAL                      = 0x0
-	IFAN_DEPARTURE                    = 0x1
-	IFF_ALLMULTI                      = 0x200
-	IFF_ALTPHYS                       = 0x4000
-	IFF_BROADCAST                     = 0x2
-	IFF_CANTCHANGE                    = 0x218f72
-	IFF_CANTCONFIG                    = 0x10000
-	IFF_DEBUG                         = 0x4
-	IFF_DRV_OACTIVE                   = 0x400
-	IFF_DRV_RUNNING                   = 0x40
-	IFF_DYING                         = 0x200000
-	IFF_LINK0                         = 0x1000
-	IFF_LINK1                         = 0x2000
-	IFF_LINK2                         = 0x4000
-	IFF_LOOPBACK                      = 0x8
-	IFF_MONITOR                       = 0x40000
-	IFF_MULTICAST                     = 0x8000
-	IFF_NOARP                         = 0x80
-	IFF_OACTIVE                       = 0x400
-	IFF_POINTOPOINT                   = 0x10
-	IFF_PPROMISC                      = 0x20000
-	IFF_PROMISC                       = 0x100
-	IFF_RENAMING                      = 0x400000
-	IFF_RUNNING                       = 0x40
-	IFF_SIMPLEX                       = 0x800
-	IFF_SMART                         = 0x20
-	IFF_STATICARP                     = 0x80000
-	IFF_UP                            = 0x1
-	IFNAMSIZ                          = 0x10
-	IFT_1822                          = 0x2
-	IFT_A12MPPSWITCH                  = 0x82
-	IFT_AAL2                          = 0xbb
-	IFT_AAL5                          = 0x31
-	IFT_ADSL                          = 0x5e
-	IFT_AFLANE8023                    = 0x3b
-	IFT_AFLANE8025                    = 0x3c
-	IFT_ARAP                          = 0x58
-	IFT_ARCNET                        = 0x23
-	IFT_ARCNETPLUS                    = 0x24
-	IFT_ASYNC                         = 0x54
-	IFT_ATM                           = 0x25
-	IFT_ATMDXI                        = 0x69
-	IFT_ATMFUNI                       = 0x6a
-	IFT_ATMIMA                        = 0x6b
-	IFT_ATMLOGICAL                    = 0x50
-	IFT_ATMRADIO                      = 0xbd
-	IFT_ATMSUBINTERFACE               = 0x86
-	IFT_ATMVCIENDPT                   = 0xc2
-	IFT_ATMVIRTUAL                    = 0x95
-	IFT_BGPPOLICYACCOUNTING           = 0xa2
-	IFT_BRIDGE                        = 0xd1
-	IFT_BSC                           = 0x53
-	IFT_CARP                          = 0xf8
-	IFT_CCTEMUL                       = 0x3d
-	IFT_CEPT                          = 0x13
-	IFT_CES                           = 0x85
-	IFT_CHANNEL                       = 0x46
-	IFT_CNR                           = 0x55
-	IFT_COFFEE                        = 0x84
-	IFT_COMPOSITELINK                 = 0x9b
-	IFT_DCN                           = 0x8d
-	IFT_DIGITALPOWERLINE              = 0x8a
-	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
-	IFT_DLSW                          = 0x4a
-	IFT_DOCSCABLEDOWNSTREAM           = 0x80
-	IFT_DOCSCABLEMACLAYER             = 0x7f
-	IFT_DOCSCABLEUPSTREAM             = 0x81
-	IFT_DS0                           = 0x51
-	IFT_DS0BUNDLE                     = 0x52
-	IFT_DS1FDL                        = 0xaa
-	IFT_DS3                           = 0x1e
-	IFT_DTM                           = 0x8c
-	IFT_DVBASILN                      = 0xac
-	IFT_DVBASIOUT                     = 0xad
-	IFT_DVBRCCDOWNSTREAM              = 0x93
-	IFT_DVBRCCMACLAYER                = 0x92
-	IFT_DVBRCCUPSTREAM                = 0x94
-	IFT_ENC                           = 0xf4
-	IFT_EON                           = 0x19
-	IFT_EPLRS                         = 0x57
-	IFT_ESCON                         = 0x49
-	IFT_ETHER                         = 0x6
-	IFT_FAITH                         = 0xf2
-	IFT_FAST                          = 0x7d
-	IFT_FASTETHER                     = 0x3e
-	IFT_FASTETHERFX                   = 0x45
-	IFT_FDDI                          = 0xf
-	IFT_FIBRECHANNEL                  = 0x38
-	IFT_FRAMERELAYINTERCONNECT        = 0x3a
-	IFT_FRAMERELAYMPI                 = 0x5c
-	IFT_FRDLCIENDPT                   = 0xc1
-	IFT_FRELAY                        = 0x20
-	IFT_FRELAYDCE                     = 0x2c
-	IFT_FRF16MFRBUNDLE                = 0xa3
-	IFT_FRFORWARD                     = 0x9e
-	IFT_G703AT2MB                     = 0x43
-	IFT_G703AT64K                     = 0x42
-	IFT_GIF                           = 0xf0
-	IFT_GIGABITETHERNET               = 0x75
-	IFT_GR303IDT                      = 0xb2
-	IFT_GR303RDT                      = 0xb1
-	IFT_H323GATEKEEPER                = 0xa4
-	IFT_H323PROXY                     = 0xa5
-	IFT_HDH1822                       = 0x3
-	IFT_HDLC                          = 0x76
-	IFT_HDSL2                         = 0xa8
-	IFT_HIPERLAN2                     = 0xb7
-	IFT_HIPPI                         = 0x2f
-	IFT_HIPPIINTERFACE                = 0x39
-	IFT_HOSTPAD                       = 0x5a
-	IFT_HSSI                          = 0x2e
-	IFT_HY                            = 0xe
-	IFT_IBM370PARCHAN                 = 0x48
-	IFT_IDSL                          = 0x9a
-	IFT_IEEE1394                      = 0x90
-	IFT_IEEE80211                     = 0x47
-	IFT_IEEE80212                     = 0x37
-	IFT_IEEE8023ADLAG                 = 0xa1
-	IFT_IFGSN                         = 0x91
-	IFT_IMT                           = 0xbe
-	IFT_INFINIBAND                    = 0xc7
-	IFT_INTERLEAVE                    = 0x7c
-	IFT_IP                            = 0x7e
-	IFT_IPFORWARD                     = 0x8e
-	IFT_IPOVERATM                     = 0x72
-	IFT_IPOVERCDLC                    = 0x6d
-	IFT_IPOVERCLAW                    = 0x6e
-	IFT_IPSWITCH                      = 0x4e
-	IFT_IPXIP                         = 0xf9
-	IFT_ISDN                          = 0x3f
-	IFT_ISDNBASIC                     = 0x14
-	IFT_ISDNPRIMARY                   = 0x15
-	IFT_ISDNS                         = 0x4b
-	IFT_ISDNU                         = 0x4c
-	IFT_ISO88022LLC                   = 0x29
-	IFT_ISO88023                      = 0x7
-	IFT_ISO88024                      = 0x8
-	IFT_ISO88025                      = 0x9
-	IFT_ISO88025CRFPINT               = 0x62
-	IFT_ISO88025DTR                   = 0x56
-	IFT_ISO88025FIBER                 = 0x73
-	IFT_ISO88026                      = 0xa
-	IFT_ISUP                          = 0xb3
-	IFT_L2VLAN                        = 0x87
-	IFT_L3IPVLAN                      = 0x88
-	IFT_L3IPXVLAN                     = 0x89
-	IFT_LAPB                          = 0x10
-	IFT_LAPD                          = 0x4d
-	IFT_LAPF                          = 0x77
-	IFT_LOCALTALK                     = 0x2a
-	IFT_LOOP                          = 0x18
-	IFT_MEDIAMAILOVERIP               = 0x8b
-	IFT_MFSIGLINK                     = 0xa7
-	IFT_MIOX25                        = 0x26
-	IFT_MODEM                         = 0x30
-	IFT_MPC                           = 0x71
-	IFT_MPLS                          = 0xa6
-	IFT_MPLSTUNNEL                    = 0x96
-	IFT_MSDSL                         = 0x8f
-	IFT_MVL                           = 0xbf
-	IFT_MYRINET                       = 0x63
-	IFT_NFAS                          = 0xaf
-	IFT_NSIP                          = 0x1b
-	IFT_OPTICALCHANNEL                = 0xc3
-	IFT_OPTICALTRANSPORT              = 0xc4
-	IFT_OTHER                         = 0x1
-	IFT_P10                           = 0xc
-	IFT_P80                           = 0xd
-	IFT_PARA                          = 0x22
-	IFT_PFLOG                         = 0xf6
-	IFT_PFSYNC                        = 0xf7
-	IFT_PLC                           = 0xae
-	IFT_POS                           = 0xab
-	IFT_PPP                           = 0x17
-	IFT_PPPMULTILINKBUNDLE            = 0x6c
-	IFT_PROPBWAP2MP                   = 0xb8
-	IFT_PROPCNLS                      = 0x59
-	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
-	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
-	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
-	IFT_PROPMUX                       = 0x36
-	IFT_PROPVIRTUAL                   = 0x35
-	IFT_PROPWIRELESSP2P               = 0x9d
-	IFT_PTPSERIAL                     = 0x16
-	IFT_PVC                           = 0xf1
-	IFT_QLLC                          = 0x44
-	IFT_RADIOMAC                      = 0xbc
-	IFT_RADSL                         = 0x5f
-	IFT_REACHDSL                      = 0xc0
-	IFT_RFC1483                       = 0x9f
-	IFT_RS232                         = 0x21
-	IFT_RSRB                          = 0x4f
-	IFT_SDLC                          = 0x11
-	IFT_SDSL                          = 0x60
-	IFT_SHDSL                         = 0xa9
-	IFT_SIP                           = 0x1f
-	IFT_SLIP                          = 0x1c
-	IFT_SMDSDXI                       = 0x2b
-	IFT_SMDSICIP                      = 0x34
-	IFT_SONET                         = 0x27
-	IFT_SONETOVERHEADCHANNEL          = 0xb9
-	IFT_SONETPATH                     = 0x32
-	IFT_SONETVT                       = 0x33
-	IFT_SRP                           = 0x97
-	IFT_SS7SIGLINK                    = 0x9c
-	IFT_STACKTOSTACK                  = 0x6f
-	IFT_STARLAN                       = 0xb
-	IFT_STF                           = 0xd7
-	IFT_T1                            = 0x12
-	IFT_TDLC                          = 0x74
-	IFT_TERMPAD                       = 0x5b
-	IFT_TR008                         = 0xb0
-	IFT_TRANSPHDLC                    = 0x7b
-	IFT_TUNNEL                        = 0x83
-	IFT_ULTRA                         = 0x1d
-	IFT_USB                           = 0xa0
-	IFT_V11                           = 0x40
-	IFT_V35                           = 0x2d
-	IFT_V36                           = 0x41
-	IFT_V37                           = 0x78
-	IFT_VDSL                          = 0x61
-	IFT_VIRTUALIPADDRESS              = 0x70
-	IFT_VOICEEM                       = 0x64
-	IFT_VOICEENCAP                    = 0x67
-	IFT_VOICEFXO                      = 0x65
-	IFT_VOICEFXS                      = 0x66
-	IFT_VOICEOVERATM                  = 0x98
-	IFT_VOICEOVERFRAMERELAY           = 0x99
-	IFT_VOICEOVERIP                   = 0x68
-	IFT_X213                          = 0x5d
-	IFT_X25                           = 0x5
-	IFT_X25DDN                        = 0x4
-	IFT_X25HUNTGROUP                  = 0x7a
-	IFT_X25MLP                        = 0x79
-	IFT_X25PLE                        = 0x28
-	IFT_XETHER                        = 0x1a
-	IGNBRK                            = 0x1
-	IGNCR                             = 0x80
-	IGNPAR                            = 0x4
-	IMAXBEL                           = 0x2000
-	INLCR                             = 0x40
-	INPCK                             = 0x10
-	IN_CLASSA_HOST                    = 0xffffff
-	IN_CLASSA_MAX                     = 0x80
-	IN_CLASSA_NET                     = 0xff000000
-	IN_CLASSA_NSHIFT                  = 0x18
-	IN_CLASSB_HOST                    = 0xffff
-	IN_CLASSB_MAX                     = 0x10000
-	IN_CLASSB_NET                     = 0xffff0000
-	IN_CLASSB_NSHIFT                  = 0x10
-	IN_CLASSC_HOST                    = 0xff
-	IN_CLASSC_NET                     = 0xffffff00
-	IN_CLASSC_NSHIFT                  = 0x8
-	IN_CLASSD_HOST                    = 0xfffffff
-	IN_CLASSD_NET                     = 0xf0000000
-	IN_CLASSD_NSHIFT                  = 0x1c
-	IN_LOOPBACKNET                    = 0x7f
-	IN_RFC3021_MASK                   = 0xfffffffe
-	IPPROTO_3PC                       = 0x22
-	IPPROTO_ADFS                      = 0x44
-	IPPROTO_AH                        = 0x33
-	IPPROTO_AHIP                      = 0x3d
-	IPPROTO_APES                      = 0x63
-	IPPROTO_ARGUS                     = 0xd
-	IPPROTO_AX25                      = 0x5d
-	IPPROTO_BHA                       = 0x31
-	IPPROTO_BLT                       = 0x1e
-	IPPROTO_BRSATMON                  = 0x4c
-	IPPROTO_CARP                      = 0x70
-	IPPROTO_CFTP                      = 0x3e
-	IPPROTO_CHAOS                     = 0x10
-	IPPROTO_CMTP                      = 0x26
-	IPPROTO_CPHB                      = 0x49
-	IPPROTO_CPNX                      = 0x48
-	IPPROTO_DDP                       = 0x25
-	IPPROTO_DGP                       = 0x56
-	IPPROTO_DIVERT                    = 0x102
-	IPPROTO_DONE                      = 0x101
-	IPPROTO_DSTOPTS                   = 0x3c
-	IPPROTO_EGP                       = 0x8
-	IPPROTO_EMCON                     = 0xe
-	IPPROTO_ENCAP                     = 0x62
-	IPPROTO_EON                       = 0x50
-	IPPROTO_ESP                       = 0x32
-	IPPROTO_ETHERIP                   = 0x61
-	IPPROTO_FRAGMENT                  = 0x2c
-	IPPROTO_GGP                       = 0x3
-	IPPROTO_GMTP                      = 0x64
-	IPPROTO_GRE                       = 0x2f
-	IPPROTO_HELLO                     = 0x3f
-	IPPROTO_HIP                       = 0x8b
-	IPPROTO_HMP                       = 0x14
-	IPPROTO_HOPOPTS                   = 0x0
-	IPPROTO_ICMP                      = 0x1
-	IPPROTO_ICMPV6                    = 0x3a
-	IPPROTO_IDP                       = 0x16
-	IPPROTO_IDPR                      = 0x23
-	IPPROTO_IDRP                      = 0x2d
-	IPPROTO_IGMP                      = 0x2
-	IPPROTO_IGP                       = 0x55
-	IPPROTO_IGRP                      = 0x58
-	IPPROTO_IL                        = 0x28
-	IPPROTO_INLSP                     = 0x34
-	IPPROTO_INP                       = 0x20
-	IPPROTO_IP                        = 0x0
-	IPPROTO_IPCOMP                    = 0x6c
-	IPPROTO_IPCV                      = 0x47
-	IPPROTO_IPEIP                     = 0x5e
-	IPPROTO_IPIP                      = 0x4
-	IPPROTO_IPPC                      = 0x43
-	IPPROTO_IPV4                      = 0x4
-	IPPROTO_IPV6                      = 0x29
-	IPPROTO_IRTP                      = 0x1c
-	IPPROTO_KRYPTOLAN                 = 0x41
-	IPPROTO_LARP                      = 0x5b
-	IPPROTO_LEAF1                     = 0x19
-	IPPROTO_LEAF2                     = 0x1a
-	IPPROTO_MAX                       = 0x100
-	IPPROTO_MAXID                     = 0x34
-	IPPROTO_MEAS                      = 0x13
-	IPPROTO_MH                        = 0x87
-	IPPROTO_MHRP                      = 0x30
-	IPPROTO_MICP                      = 0x5f
-	IPPROTO_MOBILE                    = 0x37
-	IPPROTO_MPLS                      = 0x89
-	IPPROTO_MTP                       = 0x5c
-	IPPROTO_MUX                       = 0x12
-	IPPROTO_ND                        = 0x4d
-	IPPROTO_NHRP                      = 0x36
-	IPPROTO_NONE                      = 0x3b
-	IPPROTO_NSP                       = 0x1f
-	IPPROTO_NVPII                     = 0xb
-	IPPROTO_OLD_DIVERT                = 0xfe
-	IPPROTO_OSPFIGP                   = 0x59
-	IPPROTO_PFSYNC                    = 0xf0
-	IPPROTO_PGM                       = 0x71
-	IPPROTO_PIGP                      = 0x9
-	IPPROTO_PIM                       = 0x67
-	IPPROTO_PRM                       = 0x15
-	IPPROTO_PUP                       = 0xc
-	IPPROTO_PVP                       = 0x4b
-	IPPROTO_RAW                       = 0xff
-	IPPROTO_RCCMON                    = 0xa
-	IPPROTO_RDP                       = 0x1b
-	IPPROTO_RESERVED_253              = 0xfd
-	IPPROTO_RESERVED_254              = 0xfe
-	IPPROTO_ROUTING                   = 0x2b
-	IPPROTO_RSVP                      = 0x2e
-	IPPROTO_RVD                       = 0x42
-	IPPROTO_SATEXPAK                  = 0x40
-	IPPROTO_SATMON                    = 0x45
-	IPPROTO_SCCSP                     = 0x60
-	IPPROTO_SCTP                      = 0x84
-	IPPROTO_SDRP                      = 0x2a
-	IPPROTO_SEND                      = 0x103
-	IPPROTO_SEP                       = 0x21
-	IPPROTO_SHIM6                     = 0x8c
-	IPPROTO_SKIP                      = 0x39
-	IPPROTO_SPACER                    = 0x7fff
-	IPPROTO_SRPC                      = 0x5a
-	IPPROTO_ST                        = 0x7
-	IPPROTO_SVMTP                     = 0x52
-	IPPROTO_SWIPE                     = 0x35
-	IPPROTO_TCF                       = 0x57
-	IPPROTO_TCP                       = 0x6
-	IPPROTO_TLSP                      = 0x38
-	IPPROTO_TP                        = 0x1d
-	IPPROTO_TPXX                      = 0x27
-	IPPROTO_TRUNK1                    = 0x17
-	IPPROTO_TRUNK2                    = 0x18
-	IPPROTO_TTP                       = 0x54
-	IPPROTO_UDP                       = 0x11
-	IPPROTO_UDPLITE                   = 0x88
-	IPPROTO_VINES                     = 0x53
-	IPPROTO_VISA                      = 0x46
-	IPPROTO_VMTP                      = 0x51
-	IPPROTO_WBEXPAK                   = 0x4f
-	IPPROTO_WBMON                     = 0x4e
-	IPPROTO_WSN                       = 0x4a
-	IPPROTO_XNET                      = 0xf
-	IPPROTO_XTP                       = 0x24
-	IPV6_AUTOFLOWLABEL                = 0x3b
-	IPV6_BINDANY                      = 0x40
-	IPV6_BINDV6ONLY                   = 0x1b
-	IPV6_CHECKSUM                     = 0x1a
-	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
-	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
-	IPV6_DEFHLIM                      = 0x40
-	IPV6_DONTFRAG                     = 0x3e
-	IPV6_DSTOPTS                      = 0x32
-	IPV6_FAITH                        = 0x1d
-	IPV6_FLOWINFO_MASK                = 0xffffff0f
-	IPV6_FLOWLABEL_MASK               = 0xffff0f00
-	IPV6_FRAGTTL                      = 0x78
-	IPV6_FW_ADD                       = 0x1e
-	IPV6_FW_DEL                       = 0x1f
-	IPV6_FW_FLUSH                     = 0x20
-	IPV6_FW_GET                       = 0x22
-	IPV6_FW_ZERO                      = 0x21
-	IPV6_HLIMDEC                      = 0x1
-	IPV6_HOPLIMIT                     = 0x2f
-	IPV6_HOPOPTS                      = 0x31
-	IPV6_IPSEC_POLICY                 = 0x1c
-	IPV6_JOIN_GROUP                   = 0xc
-	IPV6_LEAVE_GROUP                  = 0xd
-	IPV6_MAXHLIM                      = 0xff
-	IPV6_MAXOPTHDR                    = 0x800
-	IPV6_MAXPACKET                    = 0xffff
-	IPV6_MAX_GROUP_SRC_FILTER         = 0x200
-	IPV6_MAX_MEMBERSHIPS              = 0xfff
-	IPV6_MAX_SOCK_SRC_FILTER          = 0x80
-	IPV6_MIN_MEMBERSHIPS              = 0x1f
-	IPV6_MMTU                         = 0x500
-	IPV6_MSFILTER                     = 0x4a
-	IPV6_MULTICAST_HOPS               = 0xa
-	IPV6_MULTICAST_IF                 = 0x9
-	IPV6_MULTICAST_LOOP               = 0xb
-	IPV6_NEXTHOP                      = 0x30
-	IPV6_PATHMTU                      = 0x2c
-	IPV6_PKTINFO                      = 0x2e
-	IPV6_PORTRANGE                    = 0xe
-	IPV6_PORTRANGE_DEFAULT            = 0x0
-	IPV6_PORTRANGE_HIGH               = 0x1
-	IPV6_PORTRANGE_LOW                = 0x2
-	IPV6_PREFER_TEMPADDR              = 0x3f
-	IPV6_RECVDSTOPTS                  = 0x28
-	IPV6_RECVHOPLIMIT                 = 0x25
-	IPV6_RECVHOPOPTS                  = 0x27
-	IPV6_RECVPATHMTU                  = 0x2b
-	IPV6_RECVPKTINFO                  = 0x24
-	IPV6_RECVRTHDR                    = 0x26
-	IPV6_RECVTCLASS                   = 0x39
-	IPV6_RTHDR                        = 0x33
-	IPV6_RTHDRDSTOPTS                 = 0x23
-	IPV6_RTHDR_LOOSE                  = 0x0
-	IPV6_RTHDR_STRICT                 = 0x1
-	IPV6_RTHDR_TYPE_0                 = 0x0
-	IPV6_SOCKOPT_RESERVED1            = 0x3
-	IPV6_TCLASS                       = 0x3d
-	IPV6_UNICAST_HOPS                 = 0x4
-	IPV6_USE_MIN_MTU                  = 0x2a
-	IPV6_V6ONLY                       = 0x1b
-	IPV6_VERSION                      = 0x60
-	IPV6_VERSION_MASK                 = 0xf0
-	IP_ADD_MEMBERSHIP                 = 0xc
-	IP_ADD_SOURCE_MEMBERSHIP          = 0x46
-	IP_BINDANY                        = 0x18
-	IP_BLOCK_SOURCE                   = 0x48
-	IP_DEFAULT_MULTICAST_LOOP         = 0x1
-	IP_DEFAULT_MULTICAST_TTL          = 0x1
-	IP_DF                             = 0x4000
-	IP_DONTFRAG                       = 0x43
-	IP_DROP_MEMBERSHIP                = 0xd
-	IP_DROP_SOURCE_MEMBERSHIP         = 0x47
-	IP_DUMMYNET3                      = 0x31
-	IP_DUMMYNET_CONFIGURE             = 0x3c
-	IP_DUMMYNET_DEL                   = 0x3d
-	IP_DUMMYNET_FLUSH                 = 0x3e
-	IP_DUMMYNET_GET                   = 0x40
-	IP_FAITH                          = 0x16
-	IP_FW3                            = 0x30
-	IP_FW_ADD                         = 0x32
-	IP_FW_DEL                         = 0x33
-	IP_FW_FLUSH                       = 0x34
-	IP_FW_GET                         = 0x36
-	IP_FW_NAT_CFG                     = 0x38
-	IP_FW_NAT_DEL                     = 0x39
-	IP_FW_NAT_GET_CONFIG              = 0x3a
-	IP_FW_NAT_GET_LOG                 = 0x3b
-	IP_FW_RESETLOG                    = 0x37
-	IP_FW_TABLE_ADD                   = 0x28
-	IP_FW_TABLE_DEL                   = 0x29
-	IP_FW_TABLE_FLUSH                 = 0x2a
-	IP_FW_TABLE_GETSIZE               = 0x2b
-	IP_FW_TABLE_LIST                  = 0x2c
-	IP_FW_ZERO                        = 0x35
-	IP_HDRINCL                        = 0x2
-	IP_IPSEC_POLICY                   = 0x15
-	IP_MAXPACKET                      = 0xffff
-	IP_MAX_GROUP_SRC_FILTER           = 0x200
-	IP_MAX_MEMBERSHIPS                = 0xfff
-	IP_MAX_SOCK_MUTE_FILTER           = 0x80
-	IP_MAX_SOCK_SRC_FILTER            = 0x80
-	IP_MAX_SOURCE_FILTER              = 0x400
-	IP_MF                             = 0x2000
-	IP_MINTTL                         = 0x42
-	IP_MIN_MEMBERSHIPS                = 0x1f
-	IP_MSFILTER                       = 0x4a
-	IP_MSS                            = 0x240
-	IP_MULTICAST_IF                   = 0x9
-	IP_MULTICAST_LOOP                 = 0xb
-	IP_MULTICAST_TTL                  = 0xa
-	IP_MULTICAST_VIF                  = 0xe
-	IP_OFFMASK                        = 0x1fff
-	IP_ONESBCAST                      = 0x17
-	IP_OPTIONS                        = 0x1
-	IP_PORTRANGE                      = 0x13
-	IP_PORTRANGE_DEFAULT              = 0x0
-	IP_PORTRANGE_HIGH                 = 0x1
-	IP_PORTRANGE_LOW                  = 0x2
-	IP_RECVDSTADDR                    = 0x7
-	IP_RECVIF                         = 0x14
-	IP_RECVOPTS                       = 0x5
-	IP_RECVRETOPTS                    = 0x6
-	IP_RECVTOS                        = 0x44
-	IP_RECVTTL                        = 0x41
-	IP_RETOPTS                        = 0x8
-	IP_RF                             = 0x8000
-	IP_RSVP_OFF                       = 0x10
-	IP_RSVP_ON                        = 0xf
-	IP_RSVP_VIF_OFF                   = 0x12
-	IP_RSVP_VIF_ON                    = 0x11
-	IP_SENDSRCADDR                    = 0x7
-	IP_TOS                            = 0x3
-	IP_TTL                            = 0x4
-	IP_UNBLOCK_SOURCE                 = 0x49
-	ISIG                              = 0x80
-	ISTRIP                            = 0x20
-	IXANY                             = 0x800
-	IXOFF                             = 0x400
-	IXON                              = 0x200
-	LOCK_EX                           = 0x2
-	LOCK_NB                           = 0x4
-	LOCK_SH                           = 0x1
-	LOCK_UN                           = 0x8
-	MADV_AUTOSYNC                     = 0x7
-	MADV_CORE                         = 0x9
-	MADV_DONTNEED                     = 0x4
-	MADV_FREE                         = 0x5
-	MADV_NOCORE                       = 0x8
-	MADV_NORMAL                       = 0x0
-	MADV_NOSYNC                       = 0x6
-	MADV_PROTECT                      = 0xa
-	MADV_RANDOM                       = 0x1
-	MADV_SEQUENTIAL                   = 0x2
-	MADV_WILLNEED                     = 0x3
-	MAP_ALIGNED_SUPER                 = 0x1000000
-	MAP_ALIGNMENT_MASK                = -0x1000000
-	MAP_ALIGNMENT_SHIFT               = 0x18
-	MAP_ANON                          = 0x1000
-	MAP_ANONYMOUS                     = 0x1000
-	MAP_COPY                          = 0x2
-	MAP_EXCL                          = 0x4000
-	MAP_FILE                          = 0x0
-	MAP_FIXED                         = 0x10
-	MAP_HASSEMAPHORE                  = 0x200
-	MAP_NOCORE                        = 0x20000
-	MAP_NORESERVE                     = 0x40
-	MAP_NOSYNC                        = 0x800
-	MAP_PREFAULT_READ                 = 0x40000
-	MAP_PRIVATE                       = 0x2
-	MAP_RENAME                        = 0x20
-	MAP_RESERVED0080                  = 0x80
-	MAP_RESERVED0100                  = 0x100
-	MAP_SHARED                        = 0x1
-	MAP_STACK                         = 0x400
-	MCL_CURRENT                       = 0x1
-	MCL_FUTURE                        = 0x2
-	MSG_CMSG_CLOEXEC                  = 0x40000
-	MSG_COMPAT                        = 0x8000
-	MSG_CTRUNC                        = 0x20
-	MSG_DONTROUTE                     = 0x4
-	MSG_DONTWAIT                      = 0x80
-	MSG_EOF                           = 0x100
-	MSG_EOR                           = 0x8
-	MSG_NBIO                          = 0x4000
-	MSG_NOSIGNAL                      = 0x20000
-	MSG_NOTIFICATION                  = 0x2000
-	MSG_OOB                           = 0x1
-	MSG_PEEK                          = 0x2
-	MSG_TRUNC                         = 0x10
-	MSG_WAITALL                       = 0x40
-	MS_ASYNC                          = 0x1
-	MS_INVALIDATE                     = 0x2
-	MS_SYNC                           = 0x0
-	NAME_MAX                          = 0xff
-	NET_RT_DUMP                       = 0x1
-	NET_RT_FLAGS                      = 0x2
-	NET_RT_IFLIST                     = 0x3
-	NET_RT_IFLISTL                    = 0x5
-	NET_RT_IFMALIST                   = 0x4
-	NET_RT_MAXID                      = 0x6
-	NOFLSH                            = 0x80000000
-	NOTE_ATTRIB                       = 0x8
-	NOTE_CHILD                        = 0x4
-	NOTE_DELETE                       = 0x1
-	NOTE_EXEC                         = 0x20000000
-	NOTE_EXIT                         = 0x80000000
-	NOTE_EXTEND                       = 0x4
-	NOTE_FFAND                        = 0x40000000
-	NOTE_FFCOPY                       = 0xc0000000
-	NOTE_FFCTRLMASK                   = 0xc0000000
-	NOTE_FFLAGSMASK                   = 0xffffff
-	NOTE_FFNOP                        = 0x0
-	NOTE_FFOR                         = 0x80000000
-	NOTE_FORK                         = 0x40000000
-	NOTE_LINK                         = 0x10
-	NOTE_LOWAT                        = 0x1
-	NOTE_PCTRLMASK                    = 0xf0000000
-	NOTE_PDATAMASK                    = 0xfffff
-	NOTE_RENAME                       = 0x20
-	NOTE_REVOKE                       = 0x40
-	NOTE_TRACK                        = 0x1
-	NOTE_TRACKERR                     = 0x2
-	NOTE_TRIGGER                      = 0x1000000
-	NOTE_WRITE                        = 0x2
-	OCRNL                             = 0x10
-	ONLCR                             = 0x2
-	ONLRET                            = 0x40
-	ONOCR                             = 0x20
-	ONOEOT                            = 0x8
-	OPOST                             = 0x1
-	O_ACCMODE                         = 0x3
-	O_APPEND                          = 0x8
-	O_ASYNC                           = 0x40
-	O_CLOEXEC                         = 0x100000
-	O_CREAT                           = 0x200
-	O_DIRECT                          = 0x10000
-	O_DIRECTORY                       = 0x20000
-	O_EXCL                            = 0x800
-	O_EXEC                            = 0x40000
-	O_EXLOCK                          = 0x20
-	O_FSYNC                           = 0x80
-	O_NDELAY                          = 0x4
-	O_NOCTTY                          = 0x8000
-	O_NOFOLLOW                        = 0x100
-	O_NONBLOCK                        = 0x4
-	O_RDONLY                          = 0x0
-	O_RDWR                            = 0x2
-	O_SHLOCK                          = 0x10
-	O_SYNC                            = 0x80
-	O_TRUNC                           = 0x400
-	O_TTY_INIT                        = 0x80000
-	O_WRONLY                          = 0x1
-	PARENB                            = 0x1000
-	PARMRK                            = 0x8
-	PARODD                            = 0x2000
-	PENDIN                            = 0x20000000
-	PRIO_PGRP                         = 0x1
-	PRIO_PROCESS                      = 0x0
-	PRIO_USER                         = 0x2
-	PROT_EXEC                         = 0x4
-	PROT_NONE                         = 0x0
-	PROT_READ                         = 0x1
-	PROT_WRITE                        = 0x2
-	RLIMIT_AS                         = 0xa
-	RLIMIT_CORE                       = 0x4
-	RLIMIT_CPU                        = 0x0
-	RLIMIT_DATA                       = 0x2
-	RLIMIT_FSIZE                      = 0x1
-	RLIMIT_NOFILE                     = 0x8
-	RLIMIT_STACK                      = 0x3
-	RLIM_INFINITY                     = 0x7fffffffffffffff
-	RTAX_AUTHOR                       = 0x6
-	RTAX_BRD                          = 0x7
-	RTAX_DST                          = 0x0
-	RTAX_GATEWAY                      = 0x1
-	RTAX_GENMASK                      = 0x3
-	RTAX_IFA                          = 0x5
-	RTAX_IFP                          = 0x4
-	RTAX_MAX                          = 0x8
-	RTAX_NETMASK                      = 0x2
-	RTA_AUTHOR                        = 0x40
-	RTA_BRD                           = 0x80
-	RTA_DST                           = 0x1
-	RTA_GATEWAY                       = 0x2
-	RTA_GENMASK                       = 0x8
-	RTA_IFA                           = 0x20
-	RTA_IFP                           = 0x10
-	RTA_NETMASK                       = 0x4
-	RTF_BLACKHOLE                     = 0x1000
-	RTF_BROADCAST                     = 0x400000
-	RTF_DONE                          = 0x40
-	RTF_DYNAMIC                       = 0x10
-	RTF_FMASK                         = 0x1004d808
-	RTF_GATEWAY                       = 0x2
-	RTF_GWFLAG_COMPAT                 = 0x80000000
-	RTF_HOST                          = 0x4
-	RTF_LLDATA                        = 0x400
-	RTF_LLINFO                        = 0x400
-	RTF_LOCAL                         = 0x200000
-	RTF_MODIFIED                      = 0x20
-	RTF_MULTICAST                     = 0x800000
-	RTF_PINNED                        = 0x100000
-	RTF_PRCLONING                     = 0x10000
-	RTF_PROTO1                        = 0x8000
-	RTF_PROTO2                        = 0x4000
-	RTF_PROTO3                        = 0x40000
-	RTF_REJECT                        = 0x8
-	RTF_RNH_LOCKED                    = 0x40000000
-	RTF_STATIC                        = 0x800
-	RTF_STICKY                        = 0x10000000
-	RTF_UP                            = 0x1
-	RTF_XRESOLVE                      = 0x200
-	RTM_ADD                           = 0x1
-	RTM_CHANGE                        = 0x3
-	RTM_DELADDR                       = 0xd
-	RTM_DELETE                        = 0x2
-	RTM_DELMADDR                      = 0x10
-	RTM_GET                           = 0x4
-	RTM_IEEE80211                     = 0x12
-	RTM_IFANNOUNCE                    = 0x11
-	RTM_IFINFO                        = 0xe
-	RTM_LOCK                          = 0x8
-	RTM_LOSING                        = 0x5
-	RTM_MISS                          = 0x7
-	RTM_NEWADDR                       = 0xc
-	RTM_NEWMADDR                      = 0xf
-	RTM_OLDADD                        = 0x9
-	RTM_OLDDEL                        = 0xa
-	RTM_REDIRECT                      = 0x6
-	RTM_RESOLVE                       = 0xb
-	RTM_RTTUNIT                       = 0xf4240
-	RTM_VERSION                       = 0x5
-	RTV_EXPIRE                        = 0x4
-	RTV_HOPCOUNT                      = 0x2
-	RTV_MTU                           = 0x1
-	RTV_RPIPE                         = 0x8
-	RTV_RTT                           = 0x40
-	RTV_RTTVAR                        = 0x80
-	RTV_SPIPE                         = 0x10
-	RTV_SSTHRESH                      = 0x20
-	RTV_WEIGHT                        = 0x100
-	RT_ALL_FIBS                       = -0x1
-	RT_CACHING_CONTEXT                = 0x1
-	RT_DEFAULT_FIB                    = 0x0
-	RT_NORTREF                        = 0x2
-	RUSAGE_CHILDREN                   = -0x1
-	RUSAGE_SELF                       = 0x0
-	RUSAGE_THREAD                     = 0x1
-	SCM_BINTIME                       = 0x4
-	SCM_CREDS                         = 0x3
-	SCM_RIGHTS                        = 0x1
-	SCM_TIMESTAMP                     = 0x2
-	SHUT_RD                           = 0x0
-	SHUT_RDWR                         = 0x2
-	SHUT_WR                           = 0x1
-	SIOCADDMULTI                      = 0x80206931
-	SIOCADDRT                         = 0x8030720a
-	SIOCAIFADDR                       = 0x8040691a
-	SIOCAIFGROUP                      = 0x80246987
-	SIOCALIFADDR                      = 0x8118691b
-	SIOCATMARK                        = 0x40047307
-	SIOCDELMULTI                      = 0x80206932
-	SIOCDELRT                         = 0x8030720b
-	SIOCDIFADDR                       = 0x80206919
-	SIOCDIFGROUP                      = 0x80246989
-	SIOCDIFPHYADDR                    = 0x80206949
-	SIOCDLIFADDR                      = 0x8118691d
-	SIOCGDRVSPEC                      = 0xc01c697b
-	SIOCGETSGCNT                      = 0xc0147210
-	SIOCGETVIFCNT                     = 0xc014720f
-	SIOCGHIWAT                        = 0x40047301
-	SIOCGIFADDR                       = 0xc0206921
-	SIOCGIFBRDADDR                    = 0xc0206923
-	SIOCGIFCAP                        = 0xc020691f
-	SIOCGIFCONF                       = 0xc0086924
-	SIOCGIFDESCR                      = 0xc020692a
-	SIOCGIFDSTADDR                    = 0xc0206922
-	SIOCGIFFIB                        = 0xc020695c
-	SIOCGIFFLAGS                      = 0xc0206911
-	SIOCGIFGENERIC                    = 0xc020693a
-	SIOCGIFGMEMB                      = 0xc024698a
-	SIOCGIFGROUP                      = 0xc0246988
-	SIOCGIFINDEX                      = 0xc0206920
-	SIOCGIFMAC                        = 0xc0206926
-	SIOCGIFMEDIA                      = 0xc0286938
-	SIOCGIFMETRIC                     = 0xc0206917
-	SIOCGIFMTU                        = 0xc0206933
-	SIOCGIFNETMASK                    = 0xc0206925
-	SIOCGIFPDSTADDR                   = 0xc0206948
-	SIOCGIFPHYS                       = 0xc0206935
-	SIOCGIFPSRCADDR                   = 0xc0206947
-	SIOCGIFSTATUS                     = 0xc331693b
-	SIOCGLIFADDR                      = 0xc118691c
-	SIOCGLIFPHYADDR                   = 0xc118694b
-	SIOCGLOWAT                        = 0x40047303
-	SIOCGPGRP                         = 0x40047309
-	SIOCGPRIVATE_0                    = 0xc0206950
-	SIOCGPRIVATE_1                    = 0xc0206951
-	SIOCIFCREATE                      = 0xc020697a
-	SIOCIFCREATE2                     = 0xc020697c
-	SIOCIFDESTROY                     = 0x80206979
-	SIOCIFGCLONERS                    = 0xc00c6978
-	SIOCSDRVSPEC                      = 0x801c697b
-	SIOCSHIWAT                        = 0x80047300
-	SIOCSIFADDR                       = 0x8020690c
-	SIOCSIFBRDADDR                    = 0x80206913
-	SIOCSIFCAP                        = 0x8020691e
-	SIOCSIFDESCR                      = 0x80206929
-	SIOCSIFDSTADDR                    = 0x8020690e
-	SIOCSIFFIB                        = 0x8020695d
-	SIOCSIFFLAGS                      = 0x80206910
-	SIOCSIFGENERIC                    = 0x80206939
-	SIOCSIFLLADDR                     = 0x8020693c
-	SIOCSIFMAC                        = 0x80206927
-	SIOCSIFMEDIA                      = 0xc0206937
-	SIOCSIFMETRIC                     = 0x80206918
-	SIOCSIFMTU                        = 0x80206934
-	SIOCSIFNAME                       = 0x80206928
-	SIOCSIFNETMASK                    = 0x80206916
-	SIOCSIFPHYADDR                    = 0x80406946
-	SIOCSIFPHYS                       = 0x80206936
-	SIOCSIFRVNET                      = 0xc020695b
-	SIOCSIFVNET                       = 0xc020695a
-	SIOCSLIFPHYADDR                   = 0x8118694a
-	SIOCSLOWAT                        = 0x80047302
-	SIOCSPGRP                         = 0x80047308
-	SOCK_CLOEXEC                      = 0x10000000
-	SOCK_DGRAM                        = 0x2
-	SOCK_MAXADDRLEN                   = 0xff
-	SOCK_NONBLOCK                     = 0x20000000
-	SOCK_RAW                          = 0x3
-	SOCK_RDM                          = 0x4
-	SOCK_SEQPACKET                    = 0x5
-	SOCK_STREAM                       = 0x1
-	SOL_SOCKET                        = 0xffff
-	SOMAXCONN                         = 0x80
-	SO_ACCEPTCONN                     = 0x2
-	SO_ACCEPTFILTER                   = 0x1000
-	SO_BINTIME                        = 0x2000
-	SO_BROADCAST                      = 0x20
-	SO_DEBUG                          = 0x1
-	SO_DONTROUTE                      = 0x10
-	SO_ERROR                          = 0x1007
-	SO_KEEPALIVE                      = 0x8
-	SO_LABEL                          = 0x1009
-	SO_LINGER                         = 0x80
-	SO_LISTENINCQLEN                  = 0x1013
-	SO_LISTENQLEN                     = 0x1012
-	SO_LISTENQLIMIT                   = 0x1011
-	SO_NOSIGPIPE                      = 0x800
-	SO_NO_DDP                         = 0x8000
-	SO_NO_OFFLOAD                     = 0x4000
-	SO_OOBINLINE                      = 0x100
-	SO_PEERLABEL                      = 0x1010
-	SO_PROTOCOL                       = 0x1016
-	SO_PROTOTYPE                      = 0x1016
-	SO_RCVBUF                         = 0x1002
-	SO_RCVLOWAT                       = 0x1004
-	SO_RCVTIMEO                       = 0x1006
-	SO_REUSEADDR                      = 0x4
-	SO_REUSEPORT                      = 0x200
-	SO_SETFIB                         = 0x1014
-	SO_SNDBUF                         = 0x1001
-	SO_SNDLOWAT                       = 0x1003
-	SO_SNDTIMEO                       = 0x1005
-	SO_TIMESTAMP                      = 0x400
-	SO_TYPE                           = 0x1008
-	SO_USELOOPBACK                    = 0x40
-	SO_USER_COOKIE                    = 0x1015
-	SO_VENDOR                         = 0x80000000
-	TCIFLUSH                          = 0x1
-	TCIOFLUSH                         = 0x3
-	TCOFLUSH                          = 0x2
-	TCP_CA_NAME_MAX                   = 0x10
-	TCP_CONGESTION                    = 0x40
-	TCP_INFO                          = 0x20
-	TCP_KEEPCNT                       = 0x400
-	TCP_KEEPIDLE                      = 0x100
-	TCP_KEEPINIT                      = 0x80
-	TCP_KEEPINTVL                     = 0x200
-	TCP_MAXBURST                      = 0x4
-	TCP_MAXHLEN                       = 0x3c
-	TCP_MAXOLEN                       = 0x28
-	TCP_MAXSEG                        = 0x2
-	TCP_MAXWIN                        = 0xffff
-	TCP_MAX_SACK                      = 0x4
-	TCP_MAX_WINSHIFT                  = 0xe
-	TCP_MD5SIG                        = 0x10
-	TCP_MINMSS                        = 0xd8
-	TCP_MSS                           = 0x218
-	TCP_NODELAY                       = 0x1
-	TCP_NOOPT                         = 0x8
-	TCP_NOPUSH                        = 0x4
-	TCP_VENDOR                        = 0x80000000
-	TCSAFLUSH                         = 0x2
-	TIOCCBRK                          = 0x2000747a
-	TIOCCDTR                          = 0x20007478
-	TIOCCONS                          = 0x80047462
-	TIOCDRAIN                         = 0x2000745e
-	TIOCEXCL                          = 0x2000740d
-	TIOCEXT                           = 0x80047460
-	TIOCFLUSH                         = 0x80047410
-	TIOCGDRAINWAIT                    = 0x40047456
-	TIOCGETA                          = 0x402c7413
-	TIOCGETD                          = 0x4004741a
-	TIOCGPGRP                         = 0x40047477
-	TIOCGPTN                          = 0x4004740f
-	TIOCGSID                          = 0x40047463
-	TIOCGWINSZ                        = 0x40087468
-	TIOCMBIC                          = 0x8004746b
-	TIOCMBIS                          = 0x8004746c
-	TIOCMGDTRWAIT                     = 0x4004745a
-	TIOCMGET                          = 0x4004746a
-	TIOCMSDTRWAIT                     = 0x8004745b
-	TIOCMSET                          = 0x8004746d
-	TIOCM_CAR                         = 0x40
-	TIOCM_CD                          = 0x40
-	TIOCM_CTS                         = 0x20
-	TIOCM_DCD                         = 0x40
-	TIOCM_DSR                         = 0x100
-	TIOCM_DTR                         = 0x2
-	TIOCM_LE                          = 0x1
-	TIOCM_RI                          = 0x80
-	TIOCM_RNG                         = 0x80
-	TIOCM_RTS                         = 0x4
-	TIOCM_SR                          = 0x10
-	TIOCM_ST                          = 0x8
-	TIOCNOTTY                         = 0x20007471
-	TIOCNXCL                          = 0x2000740e
-	TIOCOUTQ                          = 0x40047473
-	TIOCPKT                           = 0x80047470
-	TIOCPKT_DATA                      = 0x0
-	TIOCPKT_DOSTOP                    = 0x20
-	TIOCPKT_FLUSHREAD                 = 0x1
-	TIOCPKT_FLUSHWRITE                = 0x2
-	TIOCPKT_IOCTL                     = 0x40
-	TIOCPKT_NOSTOP                    = 0x10
-	TIOCPKT_START                     = 0x8
-	TIOCPKT_STOP                      = 0x4
-	TIOCPTMASTER                      = 0x2000741c
-	TIOCSBRK                          = 0x2000747b
-	TIOCSCTTY                         = 0x20007461
-	TIOCSDRAINWAIT                    = 0x80047457
-	TIOCSDTR                          = 0x20007479
-	TIOCSETA                          = 0x802c7414
-	TIOCSETAF                         = 0x802c7416
-	TIOCSETAW                         = 0x802c7415
-	TIOCSETD                          = 0x8004741b
-	TIOCSIG                           = 0x2004745f
-	TIOCSPGRP                         = 0x80047476
-	TIOCSTART                         = 0x2000746e
-	TIOCSTAT                          = 0x20007465
-	TIOCSTI                           = 0x80017472
-	TIOCSTOP                          = 0x2000746f
-	TIOCSWINSZ                        = 0x80087467
-	TIOCTIMESTAMP                     = 0x40087459
-	TIOCUCNTL                         = 0x80047466
-	TOSTOP                            = 0x400000
-	VDISCARD                          = 0xf
-	VDSUSP                            = 0xb
-	VEOF                              = 0x0
-	VEOL                              = 0x1
-	VEOL2                             = 0x2
-	VERASE                            = 0x3
-	VERASE2                           = 0x7
-	VINTR                             = 0x8
-	VKILL                             = 0x5
-	VLNEXT                            = 0xe
-	VMIN                              = 0x10
-	VQUIT                             = 0x9
-	VREPRINT                          = 0x6
-	VSTART                            = 0xc
-	VSTATUS                           = 0x12
-	VSTOP                             = 0xd
-	VSUSP                             = 0xa
-	VTIME                             = 0x11
-	VWERASE                           = 0x4
-	WCONTINUED                        = 0x4
-	WCOREFLAG                         = 0x80
-	WEXITED                           = 0x10
-	WLINUXCLONE                       = 0x80000000
-	WNOHANG                           = 0x1
-	WNOWAIT                           = 0x8
-	WSTOPPED                          = 0x2
-	WTRAPPED                          = 0x20
-	WUNTRACED                         = 0x2
+	AF_APPLETALK                   = 0x10
+	AF_ARP                         = 0x23
+	AF_ATM                         = 0x1e
+	AF_BLUETOOTH                   = 0x24
+	AF_CCITT                       = 0xa
+	AF_CHAOS                       = 0x5
+	AF_CNT                         = 0x15
+	AF_COIP                        = 0x14
+	AF_DATAKIT                     = 0x9
+	AF_DECnet                      = 0xc
+	AF_DLI                         = 0xd
+	AF_E164                        = 0x1a
+	AF_ECMA                        = 0x8
+	AF_HYLINK                      = 0xf
+	AF_IEEE80211                   = 0x25
+	AF_IMPLINK                     = 0x3
+	AF_INET                        = 0x2
+	AF_INET6                       = 0x1c
+	AF_INET6_SDP                   = 0x2a
+	AF_INET_SDP                    = 0x28
+	AF_IPX                         = 0x17
+	AF_ISDN                        = 0x1a
+	AF_ISO                         = 0x7
+	AF_LAT                         = 0xe
+	AF_LINK                        = 0x12
+	AF_LOCAL                       = 0x1
+	AF_MAX                         = 0x2a
+	AF_NATM                        = 0x1d
+	AF_NETBIOS                     = 0x6
+	AF_NETGRAPH                    = 0x20
+	AF_OSI                         = 0x7
+	AF_PUP                         = 0x4
+	AF_ROUTE                       = 0x11
+	AF_SCLUSTER                    = 0x22
+	AF_SIP                         = 0x18
+	AF_SLOW                        = 0x21
+	AF_SNA                         = 0xb
+	AF_UNIX                        = 0x1
+	AF_UNSPEC                      = 0x0
+	AF_VENDOR00                    = 0x27
+	AF_VENDOR01                    = 0x29
+	AF_VENDOR02                    = 0x2b
+	AF_VENDOR03                    = 0x2d
+	AF_VENDOR04                    = 0x2f
+	AF_VENDOR05                    = 0x31
+	AF_VENDOR06                    = 0x33
+	AF_VENDOR07                    = 0x35
+	AF_VENDOR08                    = 0x37
+	AF_VENDOR09                    = 0x39
+	AF_VENDOR10                    = 0x3b
+	AF_VENDOR11                    = 0x3d
+	AF_VENDOR12                    = 0x3f
+	AF_VENDOR13                    = 0x41
+	AF_VENDOR14                    = 0x43
+	AF_VENDOR15                    = 0x45
+	AF_VENDOR16                    = 0x47
+	AF_VENDOR17                    = 0x49
+	AF_VENDOR18                    = 0x4b
+	AF_VENDOR19                    = 0x4d
+	AF_VENDOR20                    = 0x4f
+	AF_VENDOR21                    = 0x51
+	AF_VENDOR22                    = 0x53
+	AF_VENDOR23                    = 0x55
+	AF_VENDOR24                    = 0x57
+	AF_VENDOR25                    = 0x59
+	AF_VENDOR26                    = 0x5b
+	AF_VENDOR27                    = 0x5d
+	AF_VENDOR28                    = 0x5f
+	AF_VENDOR29                    = 0x61
+	AF_VENDOR30                    = 0x63
+	AF_VENDOR31                    = 0x65
+	AF_VENDOR32                    = 0x67
+	AF_VENDOR33                    = 0x69
+	AF_VENDOR34                    = 0x6b
+	AF_VENDOR35                    = 0x6d
+	AF_VENDOR36                    = 0x6f
+	AF_VENDOR37                    = 0x71
+	AF_VENDOR38                    = 0x73
+	AF_VENDOR39                    = 0x75
+	AF_VENDOR40                    = 0x77
+	AF_VENDOR41                    = 0x79
+	AF_VENDOR42                    = 0x7b
+	AF_VENDOR43                    = 0x7d
+	AF_VENDOR44                    = 0x7f
+	AF_VENDOR45                    = 0x81
+	AF_VENDOR46                    = 0x83
+	AF_VENDOR47                    = 0x85
+	ALTWERASE                      = 0x200
+	B0                             = 0x0
+	B110                           = 0x6e
+	B115200                        = 0x1c200
+	B1200                          = 0x4b0
+	B134                           = 0x86
+	B14400                         = 0x3840
+	B150                           = 0x96
+	B1800                          = 0x708
+	B19200                         = 0x4b00
+	B200                           = 0xc8
+	B230400                        = 0x38400
+	B2400                          = 0x960
+	B28800                         = 0x7080
+	B300                           = 0x12c
+	B38400                         = 0x9600
+	B460800                        = 0x70800
+	B4800                          = 0x12c0
+	B50                            = 0x32
+	B57600                         = 0xe100
+	B600                           = 0x258
+	B7200                          = 0x1c20
+	B75                            = 0x4b
+	B76800                         = 0x12c00
+	B921600                        = 0xe1000
+	B9600                          = 0x2580
+	BIOCFEEDBACK                   = 0x8004427c
+	BIOCFLUSH                      = 0x20004268
+	BIOCGBLEN                      = 0x40044266
+	BIOCGDIRECTION                 = 0x40044276
+	BIOCGDLT                       = 0x4004426a
+	BIOCGDLTLIST                   = 0xc0084279
+	BIOCGETBUFMODE                 = 0x4004427d
+	BIOCGETIF                      = 0x4020426b
+	BIOCGETZMAX                    = 0x4004427f
+	BIOCGHDRCMPLT                  = 0x40044274
+	BIOCGRSIG                      = 0x40044272
+	BIOCGRTIMEOUT                  = 0x4010426e
+	BIOCGSEESENT                   = 0x40044276
+	BIOCGSTATS                     = 0x4008426f
+	BIOCGTSTAMP                    = 0x40044283
+	BIOCIMMEDIATE                  = 0x80044270
+	BIOCLOCK                       = 0x2000427a
+	BIOCPROMISC                    = 0x20004269
+	BIOCROTZBUF                    = 0x400c4280
+	BIOCSBLEN                      = 0xc0044266
+	BIOCSDIRECTION                 = 0x80044277
+	BIOCSDLT                       = 0x80044278
+	BIOCSETBUFMODE                 = 0x8004427e
+	BIOCSETF                       = 0x80084267
+	BIOCSETFNR                     = 0x80084282
+	BIOCSETIF                      = 0x8020426c
+	BIOCSETWF                      = 0x8008427b
+	BIOCSETZBUF                    = 0x800c4281
+	BIOCSHDRCMPLT                  = 0x80044275
+	BIOCSRSIG                      = 0x80044273
+	BIOCSRTIMEOUT                  = 0x8010426d
+	BIOCSSEESENT                   = 0x80044277
+	BIOCSTSTAMP                    = 0x80044284
+	BIOCVERSION                    = 0x40044271
+	BPF_A                          = 0x10
+	BPF_ABS                        = 0x20
+	BPF_ADD                        = 0x0
+	BPF_ALIGNMENT                  = 0x4
+	BPF_ALU                        = 0x4
+	BPF_AND                        = 0x50
+	BPF_B                          = 0x10
+	BPF_BUFMODE_BUFFER             = 0x1
+	BPF_BUFMODE_ZBUF               = 0x2
+	BPF_DIV                        = 0x30
+	BPF_H                          = 0x8
+	BPF_IMM                        = 0x0
+	BPF_IND                        = 0x40
+	BPF_JA                         = 0x0
+	BPF_JEQ                        = 0x10
+	BPF_JGE                        = 0x30
+	BPF_JGT                        = 0x20
+	BPF_JMP                        = 0x5
+	BPF_JSET                       = 0x40
+	BPF_K                          = 0x0
+	BPF_LD                         = 0x0
+	BPF_LDX                        = 0x1
+	BPF_LEN                        = 0x80
+	BPF_LSH                        = 0x60
+	BPF_MAJOR_VERSION              = 0x1
+	BPF_MAXBUFSIZE                 = 0x80000
+	BPF_MAXINSNS                   = 0x200
+	BPF_MEM                        = 0x60
+	BPF_MEMWORDS                   = 0x10
+	BPF_MINBUFSIZE                 = 0x20
+	BPF_MINOR_VERSION              = 0x1
+	BPF_MISC                       = 0x7
+	BPF_MOD                        = 0x90
+	BPF_MSH                        = 0xa0
+	BPF_MUL                        = 0x20
+	BPF_NEG                        = 0x80
+	BPF_OR                         = 0x40
+	BPF_RELEASE                    = 0x30bb6
+	BPF_RET                        = 0x6
+	BPF_RSH                        = 0x70
+	BPF_ST                         = 0x2
+	BPF_STX                        = 0x3
+	BPF_SUB                        = 0x10
+	BPF_TAX                        = 0x0
+	BPF_TXA                        = 0x80
+	BPF_T_BINTIME                  = 0x2
+	BPF_T_BINTIME_FAST             = 0x102
+	BPF_T_BINTIME_MONOTONIC        = 0x202
+	BPF_T_BINTIME_MONOTONIC_FAST   = 0x302
+	BPF_T_FAST                     = 0x100
+	BPF_T_FLAG_MASK                = 0x300
+	BPF_T_FORMAT_MASK              = 0x3
+	BPF_T_MICROTIME                = 0x0
+	BPF_T_MICROTIME_FAST           = 0x100
+	BPF_T_MICROTIME_MONOTONIC      = 0x200
+	BPF_T_MICROTIME_MONOTONIC_FAST = 0x300
+	BPF_T_MONOTONIC                = 0x200
+	BPF_T_MONOTONIC_FAST           = 0x300
+	BPF_T_NANOTIME                 = 0x1
+	BPF_T_NANOTIME_FAST            = 0x101
+	BPF_T_NANOTIME_MONOTONIC       = 0x201
+	BPF_T_NANOTIME_MONOTONIC_FAST  = 0x301
+	BPF_T_NONE                     = 0x3
+	BPF_T_NORMAL                   = 0x0
+	BPF_W                          = 0x0
+	BPF_X                          = 0x8
+	BPF_XOR                        = 0xa0
+	BRKINT                         = 0x2
+	CAP_ACCEPT                     = 0x200000020000000
+	CAP_ACL_CHECK                  = 0x400000000010000
+	CAP_ACL_DELETE                 = 0x400000000020000
+	CAP_ACL_GET                    = 0x400000000040000
+	CAP_ACL_SET                    = 0x400000000080000
+	CAP_ALL0                       = 0x20007ffffffffff
+	CAP_ALL1                       = 0x4000000001fffff
+	CAP_BIND                       = 0x200000040000000
+	CAP_BINDAT                     = 0x200008000000400
+	CAP_CHFLAGSAT                  = 0x200000000001400
+	CAP_CONNECT                    = 0x200000080000000
+	CAP_CONNECTAT                  = 0x200010000000400
+	CAP_CREATE                     = 0x200000000000040
+	CAP_EVENT                      = 0x400000000000020
+	CAP_EXTATTR_DELETE             = 0x400000000001000
+	CAP_EXTATTR_GET                = 0x400000000002000
+	CAP_EXTATTR_LIST               = 0x400000000004000
+	CAP_EXTATTR_SET                = 0x400000000008000
+	CAP_FCHDIR                     = 0x200000000000800
+	CAP_FCHFLAGS                   = 0x200000000001000
+	CAP_FCHMOD                     = 0x200000000002000
+	CAP_FCHMODAT                   = 0x200000000002400
+	CAP_FCHOWN                     = 0x200000000004000
+	CAP_FCHOWNAT                   = 0x200000000004400
+	CAP_FCNTL                      = 0x200000000008000
+	CAP_FCNTL_ALL                  = 0x78
+	CAP_FCNTL_GETFL                = 0x8
+	CAP_FCNTL_GETOWN               = 0x20
+	CAP_FCNTL_SETFL                = 0x10
+	CAP_FCNTL_SETOWN               = 0x40
+	CAP_FEXECVE                    = 0x200000000000080
+	CAP_FLOCK                      = 0x200000000010000
+	CAP_FPATHCONF                  = 0x200000000020000
+	CAP_FSCK                       = 0x200000000040000
+	CAP_FSTAT                      = 0x200000000080000
+	CAP_FSTATAT                    = 0x200000000080400
+	CAP_FSTATFS                    = 0x200000000100000
+	CAP_FSYNC                      = 0x200000000000100
+	CAP_FTRUNCATE                  = 0x200000000000200
+	CAP_FUTIMES                    = 0x200000000200000
+	CAP_FUTIMESAT                  = 0x200000000200400
+	CAP_GETPEERNAME                = 0x200000100000000
+	CAP_GETSOCKNAME                = 0x200000200000000
+	CAP_GETSOCKOPT                 = 0x200000400000000
+	CAP_IOCTL                      = 0x400000000000080
+	CAP_IOCTLS_ALL                 = 0x7fffffff
+	CAP_KQUEUE                     = 0x400000000100040
+	CAP_KQUEUE_CHANGE              = 0x400000000100000
+	CAP_KQUEUE_EVENT               = 0x400000000000040
+	CAP_LINKAT_SOURCE              = 0x200020000000400
+	CAP_LINKAT_TARGET              = 0x200000000400400
+	CAP_LISTEN                     = 0x200000800000000
+	CAP_LOOKUP                     = 0x200000000000400
+	CAP_MAC_GET                    = 0x400000000000001
+	CAP_MAC_SET                    = 0x400000000000002
+	CAP_MKDIRAT                    = 0x200000000800400
+	CAP_MKFIFOAT                   = 0x200000001000400
+	CAP_MKNODAT                    = 0x200000002000400
+	CAP_MMAP                       = 0x200000000000010
+	CAP_MMAP_R                     = 0x20000000000001d
+	CAP_MMAP_RW                    = 0x20000000000001f
+	CAP_MMAP_RWX                   = 0x20000000000003f
+	CAP_MMAP_RX                    = 0x20000000000003d
+	CAP_MMAP_W                     = 0x20000000000001e
+	CAP_MMAP_WX                    = 0x20000000000003e
+	CAP_MMAP_X                     = 0x20000000000003c
+	CAP_PDGETPID                   = 0x400000000000200
+	CAP_PDKILL                     = 0x400000000000800
+	CAP_PDWAIT                     = 0x400000000000400
+	CAP_PEELOFF                    = 0x200001000000000
+	CAP_POLL_EVENT                 = 0x400000000000020
+	CAP_PREAD                      = 0x20000000000000d
+	CAP_PWRITE                     = 0x20000000000000e
+	CAP_READ                       = 0x200000000000001
+	CAP_RECV                       = 0x200000000000001
+	CAP_RENAMEAT_SOURCE            = 0x200000004000400
+	CAP_RENAMEAT_TARGET            = 0x200040000000400
+	CAP_RIGHTS_VERSION             = 0x0
+	CAP_RIGHTS_VERSION_00          = 0x0
+	CAP_SEEK                       = 0x20000000000000c
+	CAP_SEEK_TELL                  = 0x200000000000004
+	CAP_SEM_GETVALUE               = 0x400000000000004
+	CAP_SEM_POST                   = 0x400000000000008
+	CAP_SEM_WAIT                   = 0x400000000000010
+	CAP_SEND                       = 0x200000000000002
+	CAP_SETSOCKOPT                 = 0x200002000000000
+	CAP_SHUTDOWN                   = 0x200004000000000
+	CAP_SOCK_CLIENT                = 0x200007780000003
+	CAP_SOCK_SERVER                = 0x200007f60000003
+	CAP_SYMLINKAT                  = 0x200000008000400
+	CAP_TTYHOOK                    = 0x400000000000100
+	CAP_UNLINKAT                   = 0x200000010000400
+	CAP_UNUSED0_44                 = 0x200080000000000
+	CAP_UNUSED0_57                 = 0x300000000000000
+	CAP_UNUSED1_22                 = 0x400000000200000
+	CAP_UNUSED1_57                 = 0x500000000000000
+	CAP_WRITE                      = 0x200000000000002
+	CFLUSH                         = 0xf
+	CLOCAL                         = 0x8000
+	CLOCK_MONOTONIC                = 0x4
+	CLOCK_MONOTONIC_FAST           = 0xc
+	CLOCK_MONOTONIC_PRECISE        = 0xb
+	CLOCK_PROCESS_CPUTIME_ID       = 0xf
+	CLOCK_PROF                     = 0x2
+	CLOCK_REALTIME                 = 0x0
+	CLOCK_REALTIME_FAST            = 0xa
+	CLOCK_REALTIME_PRECISE         = 0x9
+	CLOCK_SECOND                   = 0xd
+	CLOCK_THREAD_CPUTIME_ID        = 0xe
+	CLOCK_UPTIME                   = 0x5
+	CLOCK_UPTIME_FAST              = 0x8
+	CLOCK_UPTIME_PRECISE           = 0x7
+	CLOCK_VIRTUAL                  = 0x1
+	CREAD                          = 0x800
+	CRTSCTS                        = 0x30000
+	CS5                            = 0x0
+	CS6                            = 0x100
+	CS7                            = 0x200
+	CS8                            = 0x300
+	CSIZE                          = 0x300
+	CSTART                         = 0x11
+	CSTATUS                        = 0x14
+	CSTOP                          = 0x13
+	CSTOPB                         = 0x400
+	CSUSP                          = 0x1a
+	CTL_HW                         = 0x6
+	CTL_KERN                       = 0x1
+	CTL_MAXNAME                    = 0x18
+	CTL_NET                        = 0x4
+	DLT_A429                       = 0xb8
+	DLT_A653_ICM                   = 0xb9
+	DLT_AIRONET_HEADER             = 0x78
+	DLT_AOS                        = 0xde
+	DLT_APPLE_IP_OVER_IEEE1394     = 0x8a
+	DLT_ARCNET                     = 0x7
+	DLT_ARCNET_LINUX               = 0x81
+	DLT_ATM_CLIP                   = 0x13
+	DLT_ATM_RFC1483                = 0xb
+	DLT_AURORA                     = 0x7e
+	DLT_AX25                       = 0x3
+	DLT_AX25_KISS                  = 0xca
+	DLT_BACNET_MS_TP               = 0xa5
+	DLT_BLUETOOTH_BREDR_BB         = 0xff
+	DLT_BLUETOOTH_HCI_H4           = 0xbb
+	DLT_BLUETOOTH_HCI_H4_WITH_PHDR = 0xc9
+	DLT_BLUETOOTH_LE_LL            = 0xfb
+	DLT_BLUETOOTH_LE_LL_WITH_PHDR  = 0x100
+	DLT_BLUETOOTH_LINUX_MONITOR    = 0xfe
+	DLT_CAN20B                     = 0xbe
+	DLT_CAN_SOCKETCAN              = 0xe3
+	DLT_CHAOS                      = 0x5
+	DLT_CHDLC                      = 0x68
+	DLT_CISCO_IOS                  = 0x76
+	DLT_CLASS_NETBSD_RAWAF         = 0x2240000
+	DLT_C_HDLC                     = 0x68
+	DLT_C_HDLC_WITH_DIR            = 0xcd
+	DLT_DBUS                       = 0xe7
+	DLT_DECT                       = 0xdd
+	DLT_DOCSIS                     = 0x8f
+	DLT_DVB_CI                     = 0xeb
+	DLT_ECONET                     = 0x73
+	DLT_EN10MB                     = 0x1
+	DLT_EN3MB                      = 0x2
+	DLT_ENC                        = 0x6d
+	DLT_EPON                       = 0x103
+	DLT_ERF                        = 0xc5
+	DLT_ERF_ETH                    = 0xaf
+	DLT_ERF_POS                    = 0xb0
+	DLT_FC_2                       = 0xe0
+	DLT_FC_2_WITH_FRAME_DELIMS     = 0xe1
+	DLT_FDDI                       = 0xa
+	DLT_FLEXRAY                    = 0xd2
+	DLT_FRELAY                     = 0x6b
+	DLT_FRELAY_WITH_DIR            = 0xce
+	DLT_GCOM_SERIAL                = 0xad
+	DLT_GCOM_T1E1                  = 0xac
+	DLT_GPF_F                      = 0xab
+	DLT_GPF_T                      = 0xaa
+	DLT_GPRS_LLC                   = 0xa9
+	DLT_GSMTAP_ABIS                = 0xda
+	DLT_GSMTAP_UM                  = 0xd9
+	DLT_IBM_SN                     = 0x92
+	DLT_IBM_SP                     = 0x91
+	DLT_IEEE802                    = 0x6
+	DLT_IEEE802_11                 = 0x69
+	DLT_IEEE802_11_RADIO           = 0x7f
+	DLT_IEEE802_11_RADIO_AVS       = 0xa3
+	DLT_IEEE802_15_4               = 0xc3
+	DLT_IEEE802_15_4_LINUX         = 0xbf
+	DLT_IEEE802_15_4_NOFCS         = 0xe6
+	DLT_IEEE802_15_4_NONASK_PHY    = 0xd7
+	DLT_IEEE802_16_MAC_CPS         = 0xbc
+	DLT_IEEE802_16_MAC_CPS_RADIO   = 0xc1
+	DLT_INFINIBAND                 = 0xf7
+	DLT_IPFILTER                   = 0x74
+	DLT_IPMB                       = 0xc7
+	DLT_IPMB_LINUX                 = 0xd1
+	DLT_IPMI_HPM_2                 = 0x104
+	DLT_IPNET                      = 0xe2
+	DLT_IPOIB                      = 0xf2
+	DLT_IPV4                       = 0xe4
+	DLT_IPV6                       = 0xe5
+	DLT_IP_OVER_FC                 = 0x7a
+	DLT_ISO_14443                  = 0x108
+	DLT_JUNIPER_ATM1               = 0x89
+	DLT_JUNIPER_ATM2               = 0x87
+	DLT_JUNIPER_ATM_CEMIC          = 0xee
+	DLT_JUNIPER_CHDLC              = 0xb5
+	DLT_JUNIPER_ES                 = 0x84
+	DLT_JUNIPER_ETHER              = 0xb2
+	DLT_JUNIPER_FIBRECHANNEL       = 0xea
+	DLT_JUNIPER_FRELAY             = 0xb4
+	DLT_JUNIPER_GGSN               = 0x85
+	DLT_JUNIPER_ISM                = 0xc2
+	DLT_JUNIPER_MFR                = 0x86
+	DLT_JUNIPER_MLFR               = 0x83
+	DLT_JUNIPER_MLPPP              = 0x82
+	DLT_JUNIPER_MONITOR            = 0xa4
+	DLT_JUNIPER_PIC_PEER           = 0xae
+	DLT_JUNIPER_PPP                = 0xb3
+	DLT_JUNIPER_PPPOE              = 0xa7
+	DLT_JUNIPER_PPPOE_ATM          = 0xa8
+	DLT_JUNIPER_SERVICES           = 0x88
+	DLT_JUNIPER_SRX_E2E            = 0xe9
+	DLT_JUNIPER_ST                 = 0xc8
+	DLT_JUNIPER_VP                 = 0xb7
+	DLT_JUNIPER_VS                 = 0xe8
+	DLT_LAPB_WITH_DIR              = 0xcf
+	DLT_LAPD                       = 0xcb
+	DLT_LIN                        = 0xd4
+	DLT_LINUX_EVDEV                = 0xd8
+	DLT_LINUX_IRDA                 = 0x90
+	DLT_LINUX_LAPD                 = 0xb1
+	DLT_LINUX_PPP_WITHDIRECTION    = 0xa6
+	DLT_LINUX_SLL                  = 0x71
+	DLT_LOOP                       = 0x6c
+	DLT_LTALK                      = 0x72
+	DLT_MATCHING_MAX               = 0x109
+	DLT_MATCHING_MIN               = 0x68
+	DLT_MFR                        = 0xb6
+	DLT_MOST                       = 0xd3
+	DLT_MPEG_2_TS                  = 0xf3
+	DLT_MPLS                       = 0xdb
+	DLT_MTP2                       = 0x8c
+	DLT_MTP2_WITH_PHDR             = 0x8b
+	DLT_MTP3                       = 0x8d
+	DLT_MUX27010                   = 0xec
+	DLT_NETANALYZER                = 0xf0
+	DLT_NETANALYZER_TRANSPARENT    = 0xf1
+	DLT_NETLINK                    = 0xfd
+	DLT_NFC_LLCP                   = 0xf5
+	DLT_NFLOG                      = 0xef
+	DLT_NG40                       = 0xf4
+	DLT_NULL                       = 0x0
+	DLT_PCI_EXP                    = 0x7d
+	DLT_PFLOG                      = 0x75
+	DLT_PFSYNC                     = 0x79
+	DLT_PKTAP                      = 0x102
+	DLT_PPI                        = 0xc0
+	DLT_PPP                        = 0x9
+	DLT_PPP_BSDOS                  = 0xe
+	DLT_PPP_ETHER                  = 0x33
+	DLT_PPP_PPPD                   = 0xa6
+	DLT_PPP_SERIAL                 = 0x32
+	DLT_PPP_WITH_DIR               = 0xcc
+	DLT_PPP_WITH_DIRECTION         = 0xa6
+	DLT_PRISM_HEADER               = 0x77
+	DLT_PROFIBUS_DL                = 0x101
+	DLT_PRONET                     = 0x4
+	DLT_RAIF1                      = 0xc6
+	DLT_RAW                        = 0xc
+	DLT_RDS                        = 0x109
+	DLT_REDBACK_SMARTEDGE          = 0x20
+	DLT_RIO                        = 0x7c
+	DLT_RTAC_SERIAL                = 0xfa
+	DLT_SCCP                       = 0x8e
+	DLT_SCTP                       = 0xf8
+	DLT_SITA                       = 0xc4
+	DLT_SLIP                       = 0x8
+	DLT_SLIP_BSDOS                 = 0xd
+	DLT_STANAG_5066_D_PDU          = 0xed
+	DLT_SUNATM                     = 0x7b
+	DLT_SYMANTEC_FIREWALL          = 0x63
+	DLT_TZSP                       = 0x80
+	DLT_USB                        = 0xba
+	DLT_USBPCAP                    = 0xf9
+	DLT_USB_FREEBSD                = 0xba
+	DLT_USB_LINUX                  = 0xbd
+	DLT_USB_LINUX_MMAPPED          = 0xdc
+	DLT_USER0                      = 0x93
+	DLT_USER1                      = 0x94
+	DLT_USER10                     = 0x9d
+	DLT_USER11                     = 0x9e
+	DLT_USER12                     = 0x9f
+	DLT_USER13                     = 0xa0
+	DLT_USER14                     = 0xa1
+	DLT_USER15                     = 0xa2
+	DLT_USER2                      = 0x95
+	DLT_USER3                      = 0x96
+	DLT_USER4                      = 0x97
+	DLT_USER5                      = 0x98
+	DLT_USER6                      = 0x99
+	DLT_USER7                      = 0x9a
+	DLT_USER8                      = 0x9b
+	DLT_USER9                      = 0x9c
+	DLT_WATTSTOPPER_DLM            = 0x107
+	DLT_WIHART                     = 0xdf
+	DLT_WIRESHARK_UPPER_PDU        = 0xfc
+	DLT_X2E_SERIAL                 = 0xd5
+	DLT_X2E_XORAYA                 = 0xd6
+	DLT_ZWAVE_R1_R2                = 0x105
+	DLT_ZWAVE_R3                   = 0x106
+	DT_BLK                         = 0x6
+	DT_CHR                         = 0x2
+	DT_DIR                         = 0x4
+	DT_FIFO                        = 0x1
+	DT_LNK                         = 0xa
+	DT_REG                         = 0x8
+	DT_SOCK                        = 0xc
+	DT_UNKNOWN                     = 0x0
+	DT_WHT                         = 0xe
+	ECHO                           = 0x8
+	ECHOCTL                        = 0x40
+	ECHOE                          = 0x2
+	ECHOK                          = 0x4
+	ECHOKE                         = 0x1
+	ECHONL                         = 0x10
+	ECHOPRT                        = 0x20
+	EVFILT_AIO                     = -0x3
+	EVFILT_FS                      = -0x9
+	EVFILT_LIO                     = -0xa
+	EVFILT_PROC                    = -0x5
+	EVFILT_PROCDESC                = -0x8
+	EVFILT_READ                    = -0x1
+	EVFILT_SENDFILE                = -0xc
+	EVFILT_SIGNAL                  = -0x6
+	EVFILT_SYSCOUNT                = 0xc
+	EVFILT_TIMER                   = -0x7
+	EVFILT_USER                    = -0xb
+	EVFILT_VNODE                   = -0x4
+	EVFILT_WRITE                   = -0x2
+	EV_ADD                         = 0x1
+	EV_CLEAR                       = 0x20
+	EV_DELETE                      = 0x2
+	EV_DISABLE                     = 0x8
+	EV_DISPATCH                    = 0x80
+	EV_DROP                        = 0x1000
+	EV_ENABLE                      = 0x4
+	EV_EOF                         = 0x8000
+	EV_ERROR                       = 0x4000
+	EV_FLAG1                       = 0x2000
+	EV_FLAG2                       = 0x4000
+	EV_FORCEONESHOT                = 0x100
+	EV_ONESHOT                     = 0x10
+	EV_RECEIPT                     = 0x40
+	EV_SYSFLAGS                    = 0xf000
+	EXTA                           = 0x4b00
+	EXTATTR_NAMESPACE_EMPTY        = 0x0
+	EXTATTR_NAMESPACE_SYSTEM       = 0x2
+	EXTATTR_NAMESPACE_USER         = 0x1
+	EXTB                           = 0x9600
+	EXTPROC                        = 0x800
+	FD_CLOEXEC                     = 0x1
+	FD_SETSIZE                     = 0x400
+	FLUSHO                         = 0x800000
+	F_CANCEL                       = 0x5
+	F_DUP2FD                       = 0xa
+	F_DUP2FD_CLOEXEC               = 0x12
+	F_DUPFD                        = 0x0
+	F_DUPFD_CLOEXEC                = 0x11
+	F_GETFD                        = 0x1
+	F_GETFL                        = 0x3
+	F_GETLK                        = 0xb
+	F_GETOWN                       = 0x5
+	F_OGETLK                       = 0x7
+	F_OK                           = 0x0
+	F_OSETLK                       = 0x8
+	F_OSETLKW                      = 0x9
+	F_RDAHEAD                      = 0x10
+	F_RDLCK                        = 0x1
+	F_READAHEAD                    = 0xf
+	F_SETFD                        = 0x2
+	F_SETFL                        = 0x4
+	F_SETLK                        = 0xc
+	F_SETLKW                       = 0xd
+	F_SETLK_REMOTE                 = 0xe
+	F_SETOWN                       = 0x6
+	F_UNLCK                        = 0x2
+	F_UNLCKSYS                     = 0x4
+	F_WRLCK                        = 0x3
+	HUPCL                          = 0x4000
+	HW_MACHINE                     = 0x1
+	ICANON                         = 0x100
+	ICMP6_FILTER                   = 0x12
+	ICRNL                          = 0x100
+	IEXTEN                         = 0x400
+	IFAN_ARRIVAL                   = 0x0
+	IFAN_DEPARTURE                 = 0x1
+	IFF_ALLMULTI                   = 0x200
+	IFF_ALTPHYS                    = 0x4000
+	IFF_BROADCAST                  = 0x2
+	IFF_CANTCHANGE                 = 0x218f52
+	IFF_CANTCONFIG                 = 0x10000
+	IFF_DEBUG                      = 0x4
+	IFF_DRV_OACTIVE                = 0x400
+	IFF_DRV_RUNNING                = 0x40
+	IFF_DYING                      = 0x200000
+	IFF_LINK0                      = 0x1000
+	IFF_LINK1                      = 0x2000
+	IFF_LINK2                      = 0x4000
+	IFF_LOOPBACK                   = 0x8
+	IFF_MONITOR                    = 0x40000
+	IFF_MULTICAST                  = 0x8000
+	IFF_NOARP                      = 0x80
+	IFF_OACTIVE                    = 0x400
+	IFF_POINTOPOINT                = 0x10
+	IFF_PPROMISC                   = 0x20000
+	IFF_PROMISC                    = 0x100
+	IFF_RENAMING                   = 0x400000
+	IFF_RUNNING                    = 0x40
+	IFF_SIMPLEX                    = 0x800
+	IFF_STATICARP                  = 0x80000
+	IFF_UP                         = 0x1
+	IFNAMSIZ                       = 0x10
+	IFT_BRIDGE                     = 0xd1
+	IFT_CARP                       = 0xf8
+	IFT_IEEE1394                   = 0x90
+	IFT_INFINIBAND                 = 0xc7
+	IFT_L2VLAN                     = 0x87
+	IFT_L3IPVLAN                   = 0x88
+	IFT_PPP                        = 0x17
+	IFT_PROPVIRTUAL                = 0x35
+	IGNBRK                         = 0x1
+	IGNCR                          = 0x80
+	IGNPAR                         = 0x4
+	IMAXBEL                        = 0x2000
+	INLCR                          = 0x40
+	INPCK                          = 0x10
+	IN_CLASSA_HOST                 = 0xffffff
+	IN_CLASSA_MAX                  = 0x80
+	IN_CLASSA_NET                  = 0xff000000
+	IN_CLASSA_NSHIFT               = 0x18
+	IN_CLASSB_HOST                 = 0xffff
+	IN_CLASSB_MAX                  = 0x10000
+	IN_CLASSB_NET                  = 0xffff0000
+	IN_CLASSB_NSHIFT               = 0x10
+	IN_CLASSC_HOST                 = 0xff
+	IN_CLASSC_NET                  = 0xffffff00
+	IN_CLASSC_NSHIFT               = 0x8
+	IN_CLASSD_HOST                 = 0xfffffff
+	IN_CLASSD_NET                  = 0xf0000000
+	IN_CLASSD_NSHIFT               = 0x1c
+	IN_LOOPBACKNET                 = 0x7f
+	IN_RFC3021_MASK                = 0xfffffffe
+	IPPROTO_3PC                    = 0x22
+	IPPROTO_ADFS                   = 0x44
+	IPPROTO_AH                     = 0x33
+	IPPROTO_AHIP                   = 0x3d
+	IPPROTO_APES                   = 0x63
+	IPPROTO_ARGUS                  = 0xd
+	IPPROTO_AX25                   = 0x5d
+	IPPROTO_BHA                    = 0x31
+	IPPROTO_BLT                    = 0x1e
+	IPPROTO_BRSATMON               = 0x4c
+	IPPROTO_CARP                   = 0x70
+	IPPROTO_CFTP                   = 0x3e
+	IPPROTO_CHAOS                  = 0x10
+	IPPROTO_CMTP                   = 0x26
+	IPPROTO_CPHB                   = 0x49
+	IPPROTO_CPNX                   = 0x48
+	IPPROTO_DDP                    = 0x25
+	IPPROTO_DGP                    = 0x56
+	IPPROTO_DIVERT                 = 0x102
+	IPPROTO_DONE                   = 0x101
+	IPPROTO_DSTOPTS                = 0x3c
+	IPPROTO_EGP                    = 0x8
+	IPPROTO_EMCON                  = 0xe
+	IPPROTO_ENCAP                  = 0x62
+	IPPROTO_EON                    = 0x50
+	IPPROTO_ESP                    = 0x32
+	IPPROTO_ETHERIP                = 0x61
+	IPPROTO_FRAGMENT               = 0x2c
+	IPPROTO_GGP                    = 0x3
+	IPPROTO_GMTP                   = 0x64
+	IPPROTO_GRE                    = 0x2f
+	IPPROTO_HELLO                  = 0x3f
+	IPPROTO_HIP                    = 0x8b
+	IPPROTO_HMP                    = 0x14
+	IPPROTO_HOPOPTS                = 0x0
+	IPPROTO_ICMP                   = 0x1
+	IPPROTO_ICMPV6                 = 0x3a
+	IPPROTO_IDP                    = 0x16
+	IPPROTO_IDPR                   = 0x23
+	IPPROTO_IDRP                   = 0x2d
+	IPPROTO_IGMP                   = 0x2
+	IPPROTO_IGP                    = 0x55
+	IPPROTO_IGRP                   = 0x58
+	IPPROTO_IL                     = 0x28
+	IPPROTO_INLSP                  = 0x34
+	IPPROTO_INP                    = 0x20
+	IPPROTO_IP                     = 0x0
+	IPPROTO_IPCOMP                 = 0x6c
+	IPPROTO_IPCV                   = 0x47
+	IPPROTO_IPEIP                  = 0x5e
+	IPPROTO_IPIP                   = 0x4
+	IPPROTO_IPPC                   = 0x43
+	IPPROTO_IPV4                   = 0x4
+	IPPROTO_IPV6                   = 0x29
+	IPPROTO_IRTP                   = 0x1c
+	IPPROTO_KRYPTOLAN              = 0x41
+	IPPROTO_LARP                   = 0x5b
+	IPPROTO_LEAF1                  = 0x19
+	IPPROTO_LEAF2                  = 0x1a
+	IPPROTO_MAX                    = 0x100
+	IPPROTO_MEAS                   = 0x13
+	IPPROTO_MH                     = 0x87
+	IPPROTO_MHRP                   = 0x30
+	IPPROTO_MICP                   = 0x5f
+	IPPROTO_MOBILE                 = 0x37
+	IPPROTO_MPLS                   = 0x89
+	IPPROTO_MTP                    = 0x5c
+	IPPROTO_MUX                    = 0x12
+	IPPROTO_ND                     = 0x4d
+	IPPROTO_NHRP                   = 0x36
+	IPPROTO_NONE                   = 0x3b
+	IPPROTO_NSP                    = 0x1f
+	IPPROTO_NVPII                  = 0xb
+	IPPROTO_OLD_DIVERT             = 0xfe
+	IPPROTO_OSPFIGP                = 0x59
+	IPPROTO_PFSYNC                 = 0xf0
+	IPPROTO_PGM                    = 0x71
+	IPPROTO_PIGP                   = 0x9
+	IPPROTO_PIM                    = 0x67
+	IPPROTO_PRM                    = 0x15
+	IPPROTO_PUP                    = 0xc
+	IPPROTO_PVP                    = 0x4b
+	IPPROTO_RAW                    = 0xff
+	IPPROTO_RCCMON                 = 0xa
+	IPPROTO_RDP                    = 0x1b
+	IPPROTO_RESERVED_253           = 0xfd
+	IPPROTO_RESERVED_254           = 0xfe
+	IPPROTO_ROUTING                = 0x2b
+	IPPROTO_RSVP                   = 0x2e
+	IPPROTO_RVD                    = 0x42
+	IPPROTO_SATEXPAK               = 0x40
+	IPPROTO_SATMON                 = 0x45
+	IPPROTO_SCCSP                  = 0x60
+	IPPROTO_SCTP                   = 0x84
+	IPPROTO_SDRP                   = 0x2a
+	IPPROTO_SEND                   = 0x103
+	IPPROTO_SEP                    = 0x21
+	IPPROTO_SHIM6                  = 0x8c
+	IPPROTO_SKIP                   = 0x39
+	IPPROTO_SPACER                 = 0x7fff
+	IPPROTO_SRPC                   = 0x5a
+	IPPROTO_ST                     = 0x7
+	IPPROTO_SVMTP                  = 0x52
+	IPPROTO_SWIPE                  = 0x35
+	IPPROTO_TCF                    = 0x57
+	IPPROTO_TCP                    = 0x6
+	IPPROTO_TLSP                   = 0x38
+	IPPROTO_TP                     = 0x1d
+	IPPROTO_TPXX                   = 0x27
+	IPPROTO_TRUNK1                 = 0x17
+	IPPROTO_TRUNK2                 = 0x18
+	IPPROTO_TTP                    = 0x54
+	IPPROTO_UDP                    = 0x11
+	IPPROTO_UDPLITE                = 0x88
+	IPPROTO_VINES                  = 0x53
+	IPPROTO_VISA                   = 0x46
+	IPPROTO_VMTP                   = 0x51
+	IPPROTO_WBEXPAK                = 0x4f
+	IPPROTO_WBMON                  = 0x4e
+	IPPROTO_WSN                    = 0x4a
+	IPPROTO_XNET                   = 0xf
+	IPPROTO_XTP                    = 0x24
+	IPV6_AUTOFLOWLABEL             = 0x3b
+	IPV6_BINDANY                   = 0x40
+	IPV6_BINDMULTI                 = 0x41
+	IPV6_BINDV6ONLY                = 0x1b
+	IPV6_CHECKSUM                  = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS    = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP    = 0x1
+	IPV6_DEFHLIM                   = 0x40
+	IPV6_DONTFRAG                  = 0x3e
+	IPV6_DSTOPTS                   = 0x32
+	IPV6_FLOWID                    = 0x43
+	IPV6_FLOWINFO_MASK             = 0xffffff0f
+	IPV6_FLOWLABEL_MASK            = 0xffff0f00
+	IPV6_FLOWTYPE                  = 0x44
+	IPV6_FRAGTTL                   = 0x78
+	IPV6_FW_ADD                    = 0x1e
+	IPV6_FW_DEL                    = 0x1f
+	IPV6_FW_FLUSH                  = 0x20
+	IPV6_FW_GET                    = 0x22
+	IPV6_FW_ZERO                   = 0x21
+	IPV6_HLIMDEC                   = 0x1
+	IPV6_HOPLIMIT                  = 0x2f
+	IPV6_HOPOPTS                   = 0x31
+	IPV6_IPSEC_POLICY              = 0x1c
+	IPV6_JOIN_GROUP                = 0xc
+	IPV6_LEAVE_GROUP               = 0xd
+	IPV6_MAXHLIM                   = 0xff
+	IPV6_MAXOPTHDR                 = 0x800
+	IPV6_MAXPACKET                 = 0xffff
+	IPV6_MAX_GROUP_SRC_FILTER      = 0x200
+	IPV6_MAX_MEMBERSHIPS           = 0xfff
+	IPV6_MAX_SOCK_SRC_FILTER       = 0x80
+	IPV6_MIN_MEMBERSHIPS           = 0x1f
+	IPV6_MMTU                      = 0x500
+	IPV6_MSFILTER                  = 0x4a
+	IPV6_MULTICAST_HOPS            = 0xa
+	IPV6_MULTICAST_IF              = 0x9
+	IPV6_MULTICAST_LOOP            = 0xb
+	IPV6_NEXTHOP                   = 0x30
+	IPV6_PATHMTU                   = 0x2c
+	IPV6_PKTINFO                   = 0x2e
+	IPV6_PORTRANGE                 = 0xe
+	IPV6_PORTRANGE_DEFAULT         = 0x0
+	IPV6_PORTRANGE_HIGH            = 0x1
+	IPV6_PORTRANGE_LOW             = 0x2
+	IPV6_PREFER_TEMPADDR           = 0x3f
+	IPV6_RECVDSTOPTS               = 0x28
+	IPV6_RECVFLOWID                = 0x46
+	IPV6_RECVHOPLIMIT              = 0x25
+	IPV6_RECVHOPOPTS               = 0x27
+	IPV6_RECVPATHMTU               = 0x2b
+	IPV6_RECVPKTINFO               = 0x24
+	IPV6_RECVRSSBUCKETID           = 0x47
+	IPV6_RECVRTHDR                 = 0x26
+	IPV6_RECVTCLASS                = 0x39
+	IPV6_RSSBUCKETID               = 0x45
+	IPV6_RSS_LISTEN_BUCKET         = 0x42
+	IPV6_RTHDR                     = 0x33
+	IPV6_RTHDRDSTOPTS              = 0x23
+	IPV6_RTHDR_LOOSE               = 0x0
+	IPV6_RTHDR_STRICT              = 0x1
+	IPV6_RTHDR_TYPE_0              = 0x0
+	IPV6_SOCKOPT_RESERVED1         = 0x3
+	IPV6_TCLASS                    = 0x3d
+	IPV6_UNICAST_HOPS              = 0x4
+	IPV6_USE_MIN_MTU               = 0x2a
+	IPV6_V6ONLY                    = 0x1b
+	IPV6_VERSION                   = 0x60
+	IPV6_VERSION_MASK              = 0xf0
+	IP_ADD_MEMBERSHIP              = 0xc
+	IP_ADD_SOURCE_MEMBERSHIP       = 0x46
+	IP_BINDANY                     = 0x18
+	IP_BINDMULTI                   = 0x19
+	IP_BLOCK_SOURCE                = 0x48
+	IP_DEFAULT_MULTICAST_LOOP      = 0x1
+	IP_DEFAULT_MULTICAST_TTL       = 0x1
+	IP_DF                          = 0x4000
+	IP_DONTFRAG                    = 0x43
+	IP_DROP_MEMBERSHIP             = 0xd
+	IP_DROP_SOURCE_MEMBERSHIP      = 0x47
+	IP_DUMMYNET3                   = 0x31
+	IP_DUMMYNET_CONFIGURE          = 0x3c
+	IP_DUMMYNET_DEL                = 0x3d
+	IP_DUMMYNET_FLUSH              = 0x3e
+	IP_DUMMYNET_GET                = 0x40
+	IP_FLOWID                      = 0x5a
+	IP_FLOWTYPE                    = 0x5b
+	IP_FW3                         = 0x30
+	IP_FW_ADD                      = 0x32
+	IP_FW_DEL                      = 0x33
+	IP_FW_FLUSH                    = 0x34
+	IP_FW_GET                      = 0x36
+	IP_FW_NAT_CFG                  = 0x38
+	IP_FW_NAT_DEL                  = 0x39
+	IP_FW_NAT_GET_CONFIG           = 0x3a
+	IP_FW_NAT_GET_LOG              = 0x3b
+	IP_FW_RESETLOG                 = 0x37
+	IP_FW_TABLE_ADD                = 0x28
+	IP_FW_TABLE_DEL                = 0x29
+	IP_FW_TABLE_FLUSH              = 0x2a
+	IP_FW_TABLE_GETSIZE            = 0x2b
+	IP_FW_TABLE_LIST               = 0x2c
+	IP_FW_ZERO                     = 0x35
+	IP_HDRINCL                     = 0x2
+	IP_IPSEC_POLICY                = 0x15
+	IP_MAXPACKET                   = 0xffff
+	IP_MAX_GROUP_SRC_FILTER        = 0x200
+	IP_MAX_MEMBERSHIPS             = 0xfff
+	IP_MAX_SOCK_MUTE_FILTER        = 0x80
+	IP_MAX_SOCK_SRC_FILTER         = 0x80
+	IP_MAX_SOURCE_FILTER           = 0x400
+	IP_MF                          = 0x2000
+	IP_MINTTL                      = 0x42
+	IP_MIN_MEMBERSHIPS             = 0x1f
+	IP_MSFILTER                    = 0x4a
+	IP_MSS                         = 0x240
+	IP_MULTICAST_IF                = 0x9
+	IP_MULTICAST_LOOP              = 0xb
+	IP_MULTICAST_TTL               = 0xa
+	IP_MULTICAST_VIF               = 0xe
+	IP_OFFMASK                     = 0x1fff
+	IP_ONESBCAST                   = 0x17
+	IP_OPTIONS                     = 0x1
+	IP_PORTRANGE                   = 0x13
+	IP_PORTRANGE_DEFAULT           = 0x0
+	IP_PORTRANGE_HIGH              = 0x1
+	IP_PORTRANGE_LOW               = 0x2
+	IP_RECVDSTADDR                 = 0x7
+	IP_RECVFLOWID                  = 0x5d
+	IP_RECVIF                      = 0x14
+	IP_RECVOPTS                    = 0x5
+	IP_RECVRETOPTS                 = 0x6
+	IP_RECVRSSBUCKETID             = 0x5e
+	IP_RECVTOS                     = 0x44
+	IP_RECVTTL                     = 0x41
+	IP_RETOPTS                     = 0x8
+	IP_RF                          = 0x8000
+	IP_RSSBUCKETID                 = 0x5c
+	IP_RSS_LISTEN_BUCKET           = 0x1a
+	IP_RSVP_OFF                    = 0x10
+	IP_RSVP_ON                     = 0xf
+	IP_RSVP_VIF_OFF                = 0x12
+	IP_RSVP_VIF_ON                 = 0x11
+	IP_SENDSRCADDR                 = 0x7
+	IP_TOS                         = 0x3
+	IP_TTL                         = 0x4
+	IP_UNBLOCK_SOURCE              = 0x49
+	ISIG                           = 0x80
+	ISTRIP                         = 0x20
+	IXANY                          = 0x800
+	IXOFF                          = 0x400
+	IXON                           = 0x200
+	KERN_HOSTNAME                  = 0xa
+	KERN_OSRELEASE                 = 0x2
+	KERN_OSTYPE                    = 0x1
+	KERN_VERSION                   = 0x4
+	LOCK_EX                        = 0x2
+	LOCK_NB                        = 0x4
+	LOCK_SH                        = 0x1
+	LOCK_UN                        = 0x8
+	MADV_AUTOSYNC                  = 0x7
+	MADV_CORE                      = 0x9
+	MADV_DONTNEED                  = 0x4
+	MADV_FREE                      = 0x5
+	MADV_NOCORE                    = 0x8
+	MADV_NORMAL                    = 0x0
+	MADV_NOSYNC                    = 0x6
+	MADV_PROTECT                   = 0xa
+	MADV_RANDOM                    = 0x1
+	MADV_SEQUENTIAL                = 0x2
+	MADV_WILLNEED                  = 0x3
+	MAP_ALIGNED_SUPER              = 0x1000000
+	MAP_ALIGNMENT_MASK             = -0x1000000
+	MAP_ALIGNMENT_SHIFT            = 0x18
+	MAP_ANON                       = 0x1000
+	MAP_ANONYMOUS                  = 0x1000
+	MAP_COPY                       = 0x2
+	MAP_EXCL                       = 0x4000
+	MAP_FILE                       = 0x0
+	MAP_FIXED                      = 0x10
+	MAP_GUARD                      = 0x2000
+	MAP_HASSEMAPHORE               = 0x200
+	MAP_NOCORE                     = 0x20000
+	MAP_NOSYNC                     = 0x800
+	MAP_PREFAULT_READ              = 0x40000
+	MAP_PRIVATE                    = 0x2
+	MAP_RESERVED0020               = 0x20
+	MAP_RESERVED0040               = 0x40
+	MAP_RESERVED0080               = 0x80
+	MAP_RESERVED0100               = 0x100
+	MAP_SHARED                     = 0x1
+	MAP_STACK                      = 0x400
+	MCL_CURRENT                    = 0x1
+	MCL_FUTURE                     = 0x2
+	MNT_ACLS                       = 0x8000000
+	MNT_ASYNC                      = 0x40
+	MNT_AUTOMOUNTED                = 0x200000000
+	MNT_BYFSID                     = 0x8000000
+	MNT_CMDFLAGS                   = 0xd0f0000
+	MNT_DEFEXPORTED                = 0x200
+	MNT_DELEXPORT                  = 0x20000
+	MNT_EXKERB                     = 0x800
+	MNT_EXPORTANON                 = 0x400
+	MNT_EXPORTED                   = 0x100
+	MNT_EXPUBLIC                   = 0x20000000
+	MNT_EXRDONLY                   = 0x80
+	MNT_FORCE                      = 0x80000
+	MNT_GJOURNAL                   = 0x2000000
+	MNT_IGNORE                     = 0x800000
+	MNT_LAZY                       = 0x3
+	MNT_LOCAL                      = 0x1000
+	MNT_MULTILABEL                 = 0x4000000
+	MNT_NFS4ACLS                   = 0x10
+	MNT_NOATIME                    = 0x10000000
+	MNT_NOCLUSTERR                 = 0x40000000
+	MNT_NOCLUSTERW                 = 0x80000000
+	MNT_NOEXEC                     = 0x4
+	MNT_NONBUSY                    = 0x4000000
+	MNT_NOSUID                     = 0x8
+	MNT_NOSYMFOLLOW                = 0x400000
+	MNT_NOWAIT                     = 0x2
+	MNT_QUOTA                      = 0x2000
+	MNT_RDONLY                     = 0x1
+	MNT_RELOAD                     = 0x40000
+	MNT_ROOTFS                     = 0x4000
+	MNT_SNAPSHOT                   = 0x1000000
+	MNT_SOFTDEP                    = 0x200000
+	MNT_SUIDDIR                    = 0x100000
+	MNT_SUJ                        = 0x100000000
+	MNT_SUSPEND                    = 0x4
+	MNT_SYNCHRONOUS                = 0x2
+	MNT_UNION                      = 0x20
+	MNT_UPDATE                     = 0x10000
+	MNT_UPDATEMASK                 = 0x2d8d0807e
+	MNT_USER                       = 0x8000
+	MNT_VISFLAGMASK                = 0x3fef0ffff
+	MNT_WAIT                       = 0x1
+	MSG_CMSG_CLOEXEC               = 0x40000
+	MSG_COMPAT                     = 0x8000
+	MSG_CTRUNC                     = 0x20
+	MSG_DONTROUTE                  = 0x4
+	MSG_DONTWAIT                   = 0x80
+	MSG_EOF                        = 0x100
+	MSG_EOR                        = 0x8
+	MSG_NBIO                       = 0x4000
+	MSG_NOSIGNAL                   = 0x20000
+	MSG_NOTIFICATION               = 0x2000
+	MSG_OOB                        = 0x1
+	MSG_PEEK                       = 0x2
+	MSG_TRUNC                      = 0x10
+	MSG_WAITALL                    = 0x40
+	MSG_WAITFORONE                 = 0x80000
+	MS_ASYNC                       = 0x1
+	MS_INVALIDATE                  = 0x2
+	MS_SYNC                        = 0x0
+	NAME_MAX                       = 0xff
+	NET_RT_DUMP                    = 0x1
+	NET_RT_FLAGS                   = 0x2
+	NET_RT_IFLIST                  = 0x3
+	NET_RT_IFLISTL                 = 0x5
+	NET_RT_IFMALIST                = 0x4
+	NOFLSH                         = 0x80000000
+	NOKERNINFO                     = 0x2000000
+	NOTE_ATTRIB                    = 0x8
+	NOTE_CHILD                     = 0x4
+	NOTE_CLOSE                     = 0x100
+	NOTE_CLOSE_WRITE               = 0x200
+	NOTE_DELETE                    = 0x1
+	NOTE_EXEC                      = 0x20000000
+	NOTE_EXIT                      = 0x80000000
+	NOTE_EXTEND                    = 0x4
+	NOTE_FFAND                     = 0x40000000
+	NOTE_FFCOPY                    = 0xc0000000
+	NOTE_FFCTRLMASK                = 0xc0000000
+	NOTE_FFLAGSMASK                = 0xffffff
+	NOTE_FFNOP                     = 0x0
+	NOTE_FFOR                      = 0x80000000
+	NOTE_FILE_POLL                 = 0x2
+	NOTE_FORK                      = 0x40000000
+	NOTE_LINK                      = 0x10
+	NOTE_LOWAT                     = 0x1
+	NOTE_MSECONDS                  = 0x2
+	NOTE_NSECONDS                  = 0x8
+	NOTE_OPEN                      = 0x80
+	NOTE_PCTRLMASK                 = 0xf0000000
+	NOTE_PDATAMASK                 = 0xfffff
+	NOTE_READ                      = 0x400
+	NOTE_RENAME                    = 0x20
+	NOTE_REVOKE                    = 0x40
+	NOTE_SECONDS                   = 0x1
+	NOTE_TRACK                     = 0x1
+	NOTE_TRACKERR                  = 0x2
+	NOTE_TRIGGER                   = 0x1000000
+	NOTE_USECONDS                  = 0x4
+	NOTE_WRITE                     = 0x2
+	OCRNL                          = 0x10
+	ONLCR                          = 0x2
+	ONLRET                         = 0x40
+	ONOCR                          = 0x20
+	ONOEOT                         = 0x8
+	OPOST                          = 0x1
+	OXTABS                         = 0x4
+	O_ACCMODE                      = 0x3
+	O_APPEND                       = 0x8
+	O_ASYNC                        = 0x40
+	O_CLOEXEC                      = 0x100000
+	O_CREAT                        = 0x200
+	O_DIRECT                       = 0x10000
+	O_DIRECTORY                    = 0x20000
+	O_EXCL                         = 0x800
+	O_EXEC                         = 0x40000
+	O_EXLOCK                       = 0x20
+	O_FSYNC                        = 0x80
+	O_NDELAY                       = 0x4
+	O_NOCTTY                       = 0x8000
+	O_NOFOLLOW                     = 0x100
+	O_NONBLOCK                     = 0x4
+	O_RDONLY                       = 0x0
+	O_RDWR                         = 0x2
+	O_SHLOCK                       = 0x10
+	O_SYNC                         = 0x80
+	O_TRUNC                        = 0x400
+	O_TTY_INIT                     = 0x80000
+	O_VERIFY                       = 0x200000
+	O_WRONLY                       = 0x1
+	PARENB                         = 0x1000
+	PARMRK                         = 0x8
+	PARODD                         = 0x2000
+	PENDIN                         = 0x20000000
+	PRIO_PGRP                      = 0x1
+	PRIO_PROCESS                   = 0x0
+	PRIO_USER                      = 0x2
+	PROT_EXEC                      = 0x4
+	PROT_NONE                      = 0x0
+	PROT_READ                      = 0x1
+	PROT_WRITE                     = 0x2
+	RLIMIT_AS                      = 0xa
+	RLIMIT_CORE                    = 0x4
+	RLIMIT_CPU                     = 0x0
+	RLIMIT_DATA                    = 0x2
+	RLIMIT_FSIZE                   = 0x1
+	RLIMIT_MEMLOCK                 = 0x6
+	RLIMIT_NOFILE                  = 0x8
+	RLIMIT_NPROC                   = 0x7
+	RLIMIT_RSS                     = 0x5
+	RLIMIT_STACK                   = 0x3
+	RLIM_INFINITY                  = 0x7fffffffffffffff
+	RTAX_AUTHOR                    = 0x6
+	RTAX_BRD                       = 0x7
+	RTAX_DST                       = 0x0
+	RTAX_GATEWAY                   = 0x1
+	RTAX_GENMASK                   = 0x3
+	RTAX_IFA                       = 0x5
+	RTAX_IFP                       = 0x4
+	RTAX_MAX                       = 0x8
+	RTAX_NETMASK                   = 0x2
+	RTA_AUTHOR                     = 0x40
+	RTA_BRD                        = 0x80
+	RTA_DST                        = 0x1
+	RTA_GATEWAY                    = 0x2
+	RTA_GENMASK                    = 0x8
+	RTA_IFA                        = 0x20
+	RTA_IFP                        = 0x10
+	RTA_NETMASK                    = 0x4
+	RTF_BLACKHOLE                  = 0x1000
+	RTF_BROADCAST                  = 0x400000
+	RTF_DONE                       = 0x40
+	RTF_DYNAMIC                    = 0x10
+	RTF_FIXEDMTU                   = 0x80000
+	RTF_FMASK                      = 0x1004d808
+	RTF_GATEWAY                    = 0x2
+	RTF_GWFLAG_COMPAT              = 0x80000000
+	RTF_HOST                       = 0x4
+	RTF_LLDATA                     = 0x400
+	RTF_LLINFO                     = 0x400
+	RTF_LOCAL                      = 0x200000
+	RTF_MODIFIED                   = 0x20
+	RTF_MULTICAST                  = 0x800000
+	RTF_PINNED                     = 0x100000
+	RTF_PROTO1                     = 0x8000
+	RTF_PROTO2                     = 0x4000
+	RTF_PROTO3                     = 0x40000
+	RTF_REJECT                     = 0x8
+	RTF_RNH_LOCKED                 = 0x40000000
+	RTF_STATIC                     = 0x800
+	RTF_STICKY                     = 0x10000000
+	RTF_UP                         = 0x1
+	RTF_XRESOLVE                   = 0x200
+	RTM_ADD                        = 0x1
+	RTM_CHANGE                     = 0x3
+	RTM_DELADDR                    = 0xd
+	RTM_DELETE                     = 0x2
+	RTM_DELMADDR                   = 0x10
+	RTM_GET                        = 0x4
+	RTM_IEEE80211                  = 0x12
+	RTM_IFANNOUNCE                 = 0x11
+	RTM_IFINFO                     = 0xe
+	RTM_LOCK                       = 0x8
+	RTM_LOSING                     = 0x5
+	RTM_MISS                       = 0x7
+	RTM_NEWADDR                    = 0xc
+	RTM_NEWMADDR                   = 0xf
+	RTM_REDIRECT                   = 0x6
+	RTM_RESOLVE                    = 0xb
+	RTM_RTTUNIT                    = 0xf4240
+	RTM_VERSION                    = 0x5
+	RTV_EXPIRE                     = 0x4
+	RTV_HOPCOUNT                   = 0x2
+	RTV_MTU                        = 0x1
+	RTV_RPIPE                      = 0x8
+	RTV_RTT                        = 0x40
+	RTV_RTTVAR                     = 0x80
+	RTV_SPIPE                      = 0x10
+	RTV_SSTHRESH                   = 0x20
+	RTV_WEIGHT                     = 0x100
+	RT_ALL_FIBS                    = -0x1
+	RT_BLACKHOLE                   = 0x40
+	RT_CACHING_CONTEXT             = 0x1
+	RT_DEFAULT_FIB                 = 0x0
+	RT_HAS_GW                      = 0x80
+	RT_HAS_HEADER                  = 0x10
+	RT_HAS_HEADER_BIT              = 0x4
+	RT_L2_ME                       = 0x4
+	RT_L2_ME_BIT                   = 0x2
+	RT_LLE_CACHE                   = 0x100
+	RT_MAY_LOOP                    = 0x8
+	RT_MAY_LOOP_BIT                = 0x3
+	RT_NORTREF                     = 0x2
+	RT_REJECT                      = 0x20
+	RUSAGE_CHILDREN                = -0x1
+	RUSAGE_SELF                    = 0x0
+	RUSAGE_THREAD                  = 0x1
+	SCM_BINTIME                    = 0x4
+	SCM_CREDS                      = 0x3
+	SCM_RIGHTS                     = 0x1
+	SCM_TIMESTAMP                  = 0x2
+	SHUT_RD                        = 0x0
+	SHUT_RDWR                      = 0x2
+	SHUT_WR                        = 0x1
+	SIOCADDMULTI                   = 0x80206931
+	SIOCAIFADDR                    = 0x8040691a
+	SIOCAIFGROUP                   = 0x80246987
+	SIOCATMARK                     = 0x40047307
+	SIOCDELMULTI                   = 0x80206932
+	SIOCDIFADDR                    = 0x80206919
+	SIOCDIFGROUP                   = 0x80246989
+	SIOCDIFPHYADDR                 = 0x80206949
+	SIOCGDRVSPEC                   = 0xc01c697b
+	SIOCGETSGCNT                   = 0xc0147210
+	SIOCGETVIFCNT                  = 0xc014720f
+	SIOCGHIWAT                     = 0x40047301
+	SIOCGHWADDR                    = 0xc020693e
+	SIOCGI2C                       = 0xc020693d
+	SIOCGIFADDR                    = 0xc0206921
+	SIOCGIFBRDADDR                 = 0xc0206923
+	SIOCGIFCAP                     = 0xc020691f
+	SIOCGIFCONF                    = 0xc0086924
+	SIOCGIFDESCR                   = 0xc020692a
+	SIOCGIFDSTADDR                 = 0xc0206922
+	SIOCGIFFIB                     = 0xc020695c
+	SIOCGIFFLAGS                   = 0xc0206911
+	SIOCGIFGENERIC                 = 0xc020693a
+	SIOCGIFGMEMB                   = 0xc024698a
+	SIOCGIFGROUP                   = 0xc0246988
+	SIOCGIFINDEX                   = 0xc0206920
+	SIOCGIFMAC                     = 0xc0206926
+	SIOCGIFMEDIA                   = 0xc0286938
+	SIOCGIFMETRIC                  = 0xc0206917
+	SIOCGIFMTU                     = 0xc0206933
+	SIOCGIFNETMASK                 = 0xc0206925
+	SIOCGIFPDSTADDR                = 0xc0206948
+	SIOCGIFPHYS                    = 0xc0206935
+	SIOCGIFPSRCADDR                = 0xc0206947
+	SIOCGIFSTATUS                  = 0xc331693b
+	SIOCGIFXMEDIA                  = 0xc028698b
+	SIOCGLOWAT                     = 0x40047303
+	SIOCGPGRP                      = 0x40047309
+	SIOCGPRIVATE_0                 = 0xc0206950
+	SIOCGPRIVATE_1                 = 0xc0206951
+	SIOCGTUNFIB                    = 0xc020695e
+	SIOCIFCREATE                   = 0xc020697a
+	SIOCIFCREATE2                  = 0xc020697c
+	SIOCIFDESTROY                  = 0x80206979
+	SIOCIFGCLONERS                 = 0xc00c6978
+	SIOCSDRVSPEC                   = 0x801c697b
+	SIOCSHIWAT                     = 0x80047300
+	SIOCSIFADDR                    = 0x8020690c
+	SIOCSIFBRDADDR                 = 0x80206913
+	SIOCSIFCAP                     = 0x8020691e
+	SIOCSIFDESCR                   = 0x80206929
+	SIOCSIFDSTADDR                 = 0x8020690e
+	SIOCSIFFIB                     = 0x8020695d
+	SIOCSIFFLAGS                   = 0x80206910
+	SIOCSIFGENERIC                 = 0x80206939
+	SIOCSIFLLADDR                  = 0x8020693c
+	SIOCSIFMAC                     = 0x80206927
+	SIOCSIFMEDIA                   = 0xc0206937
+	SIOCSIFMETRIC                  = 0x80206918
+	SIOCSIFMTU                     = 0x80206934
+	SIOCSIFNAME                    = 0x80206928
+	SIOCSIFNETMASK                 = 0x80206916
+	SIOCSIFPHYADDR                 = 0x80406946
+	SIOCSIFPHYS                    = 0x80206936
+	SIOCSIFRVNET                   = 0xc020695b
+	SIOCSIFVNET                    = 0xc020695a
+	SIOCSLOWAT                     = 0x80047302
+	SIOCSPGRP                      = 0x80047308
+	SIOCSTUNFIB                    = 0x8020695f
+	SOCK_CLOEXEC                   = 0x10000000
+	SOCK_DGRAM                     = 0x2
+	SOCK_MAXADDRLEN                = 0xff
+	SOCK_NONBLOCK                  = 0x20000000
+	SOCK_RAW                       = 0x3
+	SOCK_RDM                       = 0x4
+	SOCK_SEQPACKET                 = 0x5
+	SOCK_STREAM                    = 0x1
+	SOL_SOCKET                     = 0xffff
+	SOMAXCONN                      = 0x80
+	SO_ACCEPTCONN                  = 0x2
+	SO_ACCEPTFILTER                = 0x1000
+	SO_BINTIME                     = 0x2000
+	SO_BROADCAST                   = 0x20
+	SO_DEBUG                       = 0x1
+	SO_DONTROUTE                   = 0x10
+	SO_ERROR                       = 0x1007
+	SO_KEEPALIVE                   = 0x8
+	SO_LABEL                       = 0x1009
+	SO_LINGER                      = 0x80
+	SO_LISTENINCQLEN               = 0x1013
+	SO_LISTENQLEN                  = 0x1012
+	SO_LISTENQLIMIT                = 0x1011
+	SO_NOSIGPIPE                   = 0x800
+	SO_NO_DDP                      = 0x8000
+	SO_NO_OFFLOAD                  = 0x4000
+	SO_OOBINLINE                   = 0x100
+	SO_PEERLABEL                   = 0x1010
+	SO_PROTOCOL                    = 0x1016
+	SO_PROTOTYPE                   = 0x1016
+	SO_RCVBUF                      = 0x1002
+	SO_RCVLOWAT                    = 0x1004
+	SO_RCVTIMEO                    = 0x1006
+	SO_REUSEADDR                   = 0x4
+	SO_REUSEPORT                   = 0x200
+	SO_SETFIB                      = 0x1014
+	SO_SNDBUF                      = 0x1001
+	SO_SNDLOWAT                    = 0x1003
+	SO_SNDTIMEO                    = 0x1005
+	SO_TIMESTAMP                   = 0x400
+	SO_TYPE                        = 0x1008
+	SO_USELOOPBACK                 = 0x40
+	SO_USER_COOKIE                 = 0x1015
+	SO_VENDOR                      = 0x80000000
+	TAB0                           = 0x0
+	TAB3                           = 0x4
+	TABDLY                         = 0x4
+	TCIFLUSH                       = 0x1
+	TCIOFF                         = 0x3
+	TCIOFLUSH                      = 0x3
+	TCION                          = 0x4
+	TCOFLUSH                       = 0x2
+	TCOOFF                         = 0x1
+	TCOON                          = 0x2
+	TCP_CA_NAME_MAX                = 0x10
+	TCP_CCALGOOPT                  = 0x41
+	TCP_CONGESTION                 = 0x40
+	TCP_FASTOPEN                   = 0x401
+	TCP_FUNCTION_BLK               = 0x2000
+	TCP_FUNCTION_NAME_LEN_MAX      = 0x20
+	TCP_INFO                       = 0x20
+	TCP_KEEPCNT                    = 0x400
+	TCP_KEEPIDLE                   = 0x100
+	TCP_KEEPINIT                   = 0x80
+	TCP_KEEPINTVL                  = 0x200
+	TCP_MAXBURST                   = 0x4
+	TCP_MAXHLEN                    = 0x3c
+	TCP_MAXOLEN                    = 0x28
+	TCP_MAXSEG                     = 0x2
+	TCP_MAXWIN                     = 0xffff
+	TCP_MAX_SACK                   = 0x4
+	TCP_MAX_WINSHIFT               = 0xe
+	TCP_MD5SIG                     = 0x10
+	TCP_MINMSS                     = 0xd8
+	TCP_MSS                        = 0x218
+	TCP_NODELAY                    = 0x1
+	TCP_NOOPT                      = 0x8
+	TCP_NOPUSH                     = 0x4
+	TCP_PCAP_IN                    = 0x1000
+	TCP_PCAP_OUT                   = 0x800
+	TCP_VENDOR                     = 0x80000000
+	TCSAFLUSH                      = 0x2
+	TIOCCBRK                       = 0x2000747a
+	TIOCCDTR                       = 0x20007478
+	TIOCCONS                       = 0x80047462
+	TIOCDRAIN                      = 0x2000745e
+	TIOCEXCL                       = 0x2000740d
+	TIOCEXT                        = 0x80047460
+	TIOCFLUSH                      = 0x80047410
+	TIOCGDRAINWAIT                 = 0x40047456
+	TIOCGETA                       = 0x402c7413
+	TIOCGETD                       = 0x4004741a
+	TIOCGPGRP                      = 0x40047477
+	TIOCGPTN                       = 0x4004740f
+	TIOCGSID                       = 0x40047463
+	TIOCGWINSZ                     = 0x40087468
+	TIOCMBIC                       = 0x8004746b
+	TIOCMBIS                       = 0x8004746c
+	TIOCMGDTRWAIT                  = 0x4004745a
+	TIOCMGET                       = 0x4004746a
+	TIOCMSDTRWAIT                  = 0x8004745b
+	TIOCMSET                       = 0x8004746d
+	TIOCM_CAR                      = 0x40
+	TIOCM_CD                       = 0x40
+	TIOCM_CTS                      = 0x20
+	TIOCM_DCD                      = 0x40
+	TIOCM_DSR                      = 0x100
+	TIOCM_DTR                      = 0x2
+	TIOCM_LE                       = 0x1
+	TIOCM_RI                       = 0x80
+	TIOCM_RNG                      = 0x80
+	TIOCM_RTS                      = 0x4
+	TIOCM_SR                       = 0x10
+	TIOCM_ST                       = 0x8
+	TIOCNOTTY                      = 0x20007471
+	TIOCNXCL                       = 0x2000740e
+	TIOCOUTQ                       = 0x40047473
+	TIOCPKT                        = 0x80047470
+	TIOCPKT_DATA                   = 0x0
+	TIOCPKT_DOSTOP                 = 0x20
+	TIOCPKT_FLUSHREAD              = 0x1
+	TIOCPKT_FLUSHWRITE             = 0x2
+	TIOCPKT_IOCTL                  = 0x40
+	TIOCPKT_NOSTOP                 = 0x10
+	TIOCPKT_START                  = 0x8
+	TIOCPKT_STOP                   = 0x4
+	TIOCPTMASTER                   = 0x2000741c
+	TIOCSBRK                       = 0x2000747b
+	TIOCSCTTY                      = 0x20007461
+	TIOCSDRAINWAIT                 = 0x80047457
+	TIOCSDTR                       = 0x20007479
+	TIOCSETA                       = 0x802c7414
+	TIOCSETAF                      = 0x802c7416
+	TIOCSETAW                      = 0x802c7415
+	TIOCSETD                       = 0x8004741b
+	TIOCSIG                        = 0x2004745f
+	TIOCSPGRP                      = 0x80047476
+	TIOCSTART                      = 0x2000746e
+	TIOCSTAT                       = 0x20007465
+	TIOCSTI                        = 0x80017472
+	TIOCSTOP                       = 0x2000746f
+	TIOCSWINSZ                     = 0x80087467
+	TIOCTIMESTAMP                  = 0x40107459
+	TIOCUCNTL                      = 0x80047466
+	TOSTOP                         = 0x400000
+	VDISCARD                       = 0xf
+	VDSUSP                         = 0xb
+	VEOF                           = 0x0
+	VEOL                           = 0x1
+	VEOL2                          = 0x2
+	VERASE                         = 0x3
+	VERASE2                        = 0x7
+	VINTR                          = 0x8
+	VKILL                          = 0x5
+	VLNEXT                         = 0xe
+	VMIN                           = 0x10
+	VQUIT                          = 0x9
+	VREPRINT                       = 0x6
+	VSTART                         = 0xc
+	VSTATUS                        = 0x12
+	VSTOP                          = 0xd
+	VSUSP                          = 0xa
+	VTIME                          = 0x11
+	VWERASE                        = 0x4
+	WCONTINUED                     = 0x4
+	WCOREFLAG                      = 0x80
+	WEXITED                        = 0x10
+	WLINUXCLONE                    = 0x80000000
+	WNOHANG                        = 0x1
+	WNOWAIT                        = 0x8
+	WSTOPPED                       = 0x2
+	WTRAPPED                       = 0x20
+	WUNTRACED                      = 0x2
 )
 
 // Errors
@@ -1592,138 +1628,146 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "operation timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "operation canceled",
-	86: "illegal byte sequence",
-	87: "attribute not found",
-	88: "programming error",
-	89: "bad message",
-	90: "multihop attempted",
-	91: "link has been severed",
-	92: "protocol error",
-	93: "capabilities insufficient",
-	94: "not permitted in capability mode",
-	95: "state not recoverable",
-	96: "previous owner died",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "ECANCELED", "operation canceled"},
+	{86, "EILSEQ", "illegal byte sequence"},
+	{87, "ENOATTR", "attribute not found"},
+	{88, "EDOOFUS", "programming error"},
+	{89, "EBADMSG", "bad message"},
+	{90, "EMULTIHOP", "multihop attempted"},
+	{91, "ENOLINK", "link has been severed"},
+	{92, "EPROTO", "protocol error"},
+	{93, "ENOTCAPABLE", "capabilities insufficient"},
+	{94, "ECAPMODE", "not permitted in capability mode"},
+	{95, "ENOTRECOVERABLE", "state not recoverable"},
+	{96, "EOWNERDEAD", "previous owner died"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "suspended (signal)",
-	18: "suspended",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "unknown signal",
-	33: "unknown signal",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "unknown signal"},
+	{33, "SIGLIBRT", "unknown signal"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_386.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
index 2d02caf0e4..9dbd0eff02 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_386.go
@@ -1,1542 +1,2184 @@
-// mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m32
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m32 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x28
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80041270
-	BLKBSZSET                        = 0x40041271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80041272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x8000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0xff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SEIZE_DEVEL               = 0x80000000
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80041270
+	BLKBSZSET                            = 0x40041271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80041272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FP_XSTATE_MAGIC2                     = 0x46505845
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xc
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0xd
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0xe
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_32BIT                            = 0x40
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x8000
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80042407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETFPXREGS                    = 0x12
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETFPXREGS                    = 0x13
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x21
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_SYSEMU                        = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP             = 0x20
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x400854d5
+	TUNDETACHFILTER                      = 0x400854d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x800854db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	X86_FXSR_MAGIC                       = 0x0
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1706,7 +2348,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1717,171 +2358,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
index f21dcd9dc7..a9ace38e0d 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_amd64.go
@@ -1,1550 +1,2184 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -m64
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x28
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_32BIT                        = 0x40
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ARCH_PRCTL                = 0x1e
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETFPXREGS                = 0x12
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0xff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SEIZE_DEVEL               = 0x80000000
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETFPXREGS                = 0x13
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x21
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_SYSEMU                    = 0x1f
-	PTRACE_SYSEMU_SINGLESTEP         = 0x20
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VM_SOCKETS_INVALID_VERSION       = 0xffffffff
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FP_XSTATE_MAGIC2                     = 0x46505845
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_32BIT                            = 0x40
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ARCH_PRCTL                    = 0x1e
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETFPXREGS                    = 0x12
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETFPXREGS                    = 0x13
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x21
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_SYSEMU                        = 0x1f
+	PTRACE_SYSEMU_SINGLESTEP             = 0x20
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1714,7 +2348,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1725,171 +2358,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
index 7889e6477c..fe394471b9 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm.go
@@ -1,1470 +1,2190 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x27
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_PHY            = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ELF_NGREG                        = 0x12
-	ELF_PRARGSZ                      = 0x50
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	EPOLLERR                         = 0x8
-	EPOLLET                          = -0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x800
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xc
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0xd
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0xe
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DYNAMIC                      = 0x8000
-	IFF_LOOPBACK                     = 0x8
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x1000
-	O_LARGEFILE                      = 0x20000
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x1000
-	O_SYNC                           = 0x1000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_BROADCAST                 = 0x1
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MULTICAST                 = 0x2
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PARENB                           = 0x100
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CLEAR_SECCOMP_FILTER          = 0x25
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECCOMP_FILTER            = 0x23
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SECCOMP_FILTER_EVENT          = 0x1
-	PR_SECCOMP_FILTER_SYSCALL        = 0x0
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_NAME                      = 0xf
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECCOMP_FILTER            = 0x24
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETCRUNCHREGS             = 0x19
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETHBPREGS                = 0x1d
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETVFPREGS                = 0x1b
-	PTRACE_GETWMMXREGS               = 0x12
-	PTRACE_GET_THREAD_AREA           = 0x16
-	PTRACE_KILL                      = 0x8
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0x7f
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SETCRUNCHREGS             = 0x1a
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETHBPREGS                = 0x1e
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETVFPREGS                = 0x1c
-	PTRACE_SETWMMXREGS               = 0x13
-	PTRACE_SET_SYSCALL               = 0x17
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_DATA_ADDR                     = 0x10004
-	PT_TEXT_ADDR                     = 0x10000
-	PT_TEXT_END_ADDR                 = 0x10008
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x400854d5
-	TUNDETACHFILTER                  = 0x400854d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80041270
+	BLKBSZSET                            = 0x40041271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80041272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xc
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0xd
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0xe
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x10000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x20000
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80042407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETCRUNCHREGS                 = 0x19
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFDPIC                      = 0x1f
+	PTRACE_GETFDPIC_EXEC                 = 0x0
+	PTRACE_GETFDPIC_INTERP               = 0x1
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETHBPREGS                    = 0x1d
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVFPREGS                    = 0x1b
+	PTRACE_GETWMMXREGS                   = 0x12
+	PTRACE_GET_THREAD_AREA               = 0x16
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETCRUNCHREGS                 = 0x1a
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETHBPREGS                    = 0x1e
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVFPREGS                    = 0x1c
+	PTRACE_SETWMMXREGS                   = 0x13
+	PTRACE_SET_SYSCALL                   = 0x17
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_DATA_ADDR                         = 0x10004
+	PT_TEXT_ADDR                         = 0x10000
+	PT_TEXT_END_ADDR                     = 0x10008
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x400854d5
+	TUNDETACHFILTER                      = 0x400854d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x800854db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1634,7 +2354,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1645,171 +2364,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale NFS file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "unknown error 133",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
index 16a18f595b..dbe9a5192b 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_arm64.go
@@ -1,1622 +1,2175 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm64,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ELF_NGREG                        = 0x22
-	ELF_PRARGSZ                      = 0x50
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LIVE_ADDR_CHANGE             = 0x100000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN                      = 0x200000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_SUPP_NOFCS                   = 0x80000
-	IFF_TAP                          = 0x2
-	IFF_TEAM_PORT                    = 0x40000
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x10000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ESR_MAGIC                            = 0x45535201
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	EXTRA_MAGIC                          = 0x45585401
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FPSIMD_MAGIC                         = 0x46508001
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x10000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SVE_MAGIC                            = 0x53564501
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1786,7 +2339,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1797,171 +2349,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
index 80e69e4cb0..fb9075317f 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips.go
@@ -1,1520 +1,2187 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x27
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MCNET                        = 0x5
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = -0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	EPOLL_NONBLOCK                   = 0x80
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x21
-	F_GETLK64                        = 0x21
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x22
-	F_SETLK64                        = 0x22
-	F_SETLKW                         = 0x23
-	F_SETLKW64                       = 0x23
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_NOARP                        = 0x80
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DOFORK                      = 0xb
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x2000
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_NAME                      = 0xf
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_STOP                = 0x7
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_MASK                    = 0x7f
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SEIZE_DEVEL               = 0x80000000
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = 0x7fffffffffffffff
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xe
-	RTAX_MTU                         = 0x2
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x10
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x4f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x10
-	RTM_NR_MSGTYPES                  = 0x40
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_CAN_BASE                     = 0x64
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_MARK                          = 0x24
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_NODELAY                      = 0x1
-	TCP_QUICKACK                     = 0xc
-	TCP_SYNCNT                       = 0x7
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPTN                         = 0x40045430
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x800854d5
-	TUNDETACHFILTER                  = 0x800854d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40041270
+	BLKBSZSET                            = 0x80041271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40041272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x21
+	F_GETLK64                            = 0x21
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x22
+	F_SETLK64                            = 0x22
+	F_SETLKW                             = 0x23
+	F_SETLKW64                           = 0x23
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x2000
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40042407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x800854d5
+	TUNDETACHFILTER                      = 0x800854d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x400854db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1696,174 +2363,182 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale NFS file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "unknown error 168",
-	1133: "disk quota exceeded",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
index 9c91dbf601..aa6f319934 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64.go
@@ -1,1616 +1,2187 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips64,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	CFLUSH                           = 0xf
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CREAD                            = 0x80
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TCFLSH                           = 0x5407
-	TCIFLUSH                         = 0x0
-	TCIOFLUSH                        = 0x2
-	TCOFLUSH                         = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xe
+	F_GETLK64                            = 0xe
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1792,174 +2363,182 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
index fb15b41ed2..9d716e2dde 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mips64le.go
@@ -1,1616 +1,2187 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips64le,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	CFLUSH                           = 0xf
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CREAD                            = 0x80
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0xe
-	F_GETLK64                        = 0xe
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TCFLSH                           = 0x5407
-	TCIFLUSH                         = 0x0
-	TCIOFLUSH                        = 0x2
-	TCOFLUSH                         = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0xe
+	F_GETLK64                            = 0xe
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1792,174 +2363,182 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
index 9a3a73766c..98aa7ad243 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_mipsle.go
@@ -1,1717 +1,2187 @@
-// mkerrors.sh
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mipsle,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KCM                           = 0x29
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x2a
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLEXCLUSIVE                   = 0x10000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_HSR                        = 0x892f
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MACSEC                     = 0x88e5
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x2000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x21
-	F_GETLK64                        = 0x21
-	F_GETOWN                         = 0x17
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x22
-	F_SETLK64                        = 0x22
-	F_SETLKW                         = 0x23
-	F_SETLKW64                       = 0x23
-	F_SETOWN                         = 0x18
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x100
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x80
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HDRINCL                     = 0x24
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_FREE                        = 0x8
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x800
-	MAP_ANONYMOUS                    = 0x800
-	MAP_DENYWRITE                    = 0x2000
-	MAP_EXECUTABLE                   = 0x4000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x1000
-	MAP_HUGETLB                      = 0x80000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x8000
-	MAP_NONBLOCK                     = 0x20000
-	MAP_NORESERVE                    = 0x400
-	MAP_POPULATE                     = 0x10000
-	MAP_PRIVATE                      = 0x2
-	MAP_RENAME                       = 0x800
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x40000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_BATCH                        = 0x40000
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x8
-	O_ASYNC                          = 0x1000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x100
-	O_DIRECT                         = 0x8000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x10
-	O_EXCL                           = 0x400
-	O_FSYNC                          = 0x4010
-	O_LARGEFILE                      = 0x2000
-	O_NDELAY                         = 0x80
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x800
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x80
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x4010
-	O_SYNC                           = 0x4010
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = 0xffffffff
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_THREAD_AREA           = 0x19
-	PTRACE_GET_THREAD_AREA_3264      = 0xc4
-	PTRACE_GET_WATCH_REGS            = 0xd0
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_3264             = 0xc1
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_3264             = 0xc0
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_3264             = 0xc3
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_3264             = 0xc2
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SET_THREAD_AREA           = 0x1a
-	PTRACE_SET_WATCH_REGS            = 0xd1
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	RLIMIT_AS                        = 0x6
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x5
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x18
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETSTATS                     = 0x5e
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5f
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWSTATS                     = 0x5c
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x14
-	RTM_NR_MSGTYPES                  = 0x50
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x40047307
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x40047309
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x80047308
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x1
-	SOCK_NONBLOCK                    = 0x80
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x2
-	SOL_AAL                          = 0x109
-	SOL_ALG                          = 0x117
-	SOL_ATM                          = 0x108
-	SOL_CAIF                         = 0x116
-	SOL_CAN_BASE                     = 0x64
-	SOL_DCCP                         = 0x10d
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_IUCV                         = 0x115
-	SOL_KCM                          = 0x119
-	SOL_LLC                          = 0x10c
-	SOL_NETBEUI                      = 0x10b
-	SOL_NETLINK                      = 0x10e
-	SOL_NFC                          = 0x118
-	SOL_PACKET                       = 0x107
-	SOL_PNPIPE                       = 0x113
-	SOL_PPPOL2TP                     = 0x111
-	SOL_RAW                          = 0xff
-	SOL_RDS                          = 0x114
-	SOL_RXRPC                        = 0x110
-	SOL_SOCKET                       = 0xffff
-	SOL_TCP                          = 0x6
-	SOL_TIPC                         = 0x10f
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1009
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_ATTACH_REUSEPORT_CBPF         = 0x33
-	SO_ATTACH_REUSEPORT_EBPF         = 0x34
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x20
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_CNX_ADVICE                    = 0x35
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x1029
-	SO_DONTROUTE                     = 0x10
-	SO_ERROR                         = 0x1007
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x8
-	SO_LINGER                        = 0x80
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0x100
-	SO_PASSCRED                      = 0x11
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x12
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1e
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x1028
-	SO_RCVBUF                        = 0x1002
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x1004
-	SO_RCVTIMEO                      = 0x1006
-	SO_REUSEADDR                     = 0x4
-	SO_REUSEPORT                     = 0x200
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x1001
-	SO_SNDBUFFORCE                   = 0x1f
-	SO_SNDLOWAT                      = 0x1003
-	SO_SNDTIMEO                      = 0x1005
-	SO_STYLE                         = 0x1008
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x1008
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x5407
-	TCGETA                           = 0x5401
-	TCGETS                           = 0x540d
-	TCGETS2                          = 0x4030542a
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x5410
-	TCSBRK                           = 0x5405
-	TCSBRKP                          = 0x5486
-	TCSETA                           = 0x5402
-	TCSETAF                          = 0x5404
-	TCSETAW                          = 0x5403
-	TCSETS                           = 0x540e
-	TCSETS2                          = 0x8030542b
-	TCSETSF                          = 0x5410
-	TCSETSF2                         = 0x8030542d
-	TCSETSW                          = 0x540f
-	TCSETSW2                         = 0x8030542c
-	TCXONC                           = 0x5406
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x80047478
-	TIOCEXCL                         = 0x740d
-	TIOCGDEV                         = 0x40045432
-	TIOCGETD                         = 0x7400
-	TIOCGETP                         = 0x7408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x5492
-	TIOCGLCKTRMIOS                   = 0x548b
-	TIOCGLTC                         = 0x7474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x4020542e
-	TIOCGSERIAL                      = 0x5484
-	TIOCGSID                         = 0x7416
-	TIOCGSOFTCAR                     = 0x5481
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x467f
-	TIOCLINUX                        = 0x5483
-	TIOCMBIC                         = 0x741c
-	TIOCMBIS                         = 0x741b
-	TIOCMGET                         = 0x741d
-	TIOCMIWAIT                       = 0x5491
-	TIOCMSET                         = 0x741a
-	TIOCM_CAR                        = 0x100
-	TIOCM_CD                         = 0x100
-	TIOCM_CTS                        = 0x40
-	TIOCM_DSR                        = 0x400
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x200
-	TIOCM_RNG                        = 0x200
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x20
-	TIOCM_ST                         = 0x10
-	TIOCNOTTY                        = 0x5471
-	TIOCNXCL                         = 0x740e
-	TIOCOUTQ                         = 0x7472
-	TIOCPKT                          = 0x5470
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x5480
-	TIOCSERCONFIG                    = 0x5488
-	TIOCSERGETLSR                    = 0x548e
-	TIOCSERGETMULTI                  = 0x548f
-	TIOCSERGSTRUCT                   = 0x548d
-	TIOCSERGWILD                     = 0x5489
-	TIOCSERSETMULTI                  = 0x5490
-	TIOCSERSWILD                     = 0x548a
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x7401
-	TIOCSETN                         = 0x740a
-	TIOCSETP                         = 0x7409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x548c
-	TIOCSLTC                         = 0x7475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0xc020542f
-	TIOCSSERIAL                      = 0x5485
-	TIOCSSOFTCAR                     = 0x5482
-	TIOCSTI                          = 0x5472
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x8000
-	TUNATTACHFILTER                  = 0x800854d5
-	TUNDETACHFILTER                  = 0x800854d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x400854db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETBE                     = 0x400454df
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNGETVNETLE                     = 0x400454dd
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETBE                     = 0x800454de
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	TUNSETVNETLE                     = 0x800454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x10
-	VEOL                             = 0x11
-	VEOL2                            = 0x6
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x4
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VSWTCH                           = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x20
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40041270
+	BLKBSZSET                            = 0x80041271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40041272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x80
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x2000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x21
+	F_GETLK64                            = 0x21
+	F_GETOWN                             = 0x17
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x22
+	F_SETLK64                            = 0x22
+	F_SETLKW                             = 0x23
+	F_SETLKW64                           = 0x23
+	F_SETOWN                             = 0x18
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x100
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x80
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x800
+	MAP_ANONYMOUS                        = 0x800
+	MAP_DENYWRITE                        = 0x2000
+	MAP_EXECUTABLE                       = 0x4000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x1000
+	MAP_HUGETLB                          = 0x80000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x8000
+	MAP_NONBLOCK                         = 0x20000
+	MAP_NORESERVE                        = 0x400
+	MAP_POPULATE                         = 0x10000
+	MAP_PRIVATE                          = 0x2
+	MAP_RENAME                           = 0x800
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x40000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x8
+	O_ASYNC                              = 0x1000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x100
+	O_DIRECT                             = 0x8000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x10
+	O_EXCL                               = 0x400
+	O_FSYNC                              = 0x4010
+	O_LARGEFILE                          = 0x2000
+	O_NDELAY                             = 0x80
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x800
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x80
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x4010
+	O_SYNC                               = 0x4010
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40042407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc004240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80042406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_THREAD_AREA               = 0x19
+	PTRACE_GET_THREAD_AREA_3264          = 0xc4
+	PTRACE_GET_WATCH_REGS                = 0xd0
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_3264                 = 0xc1
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_3264                 = 0xc0
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_3264                 = 0xc3
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_3264                 = 0xc2
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SET_THREAD_AREA               = 0x1a
+	PTRACE_SET_WATCH_REGS                = 0xd1
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x6
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x9
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x5
+	RLIMIT_NPROC                         = 0x8
+	RLIMIT_RSS                           = 0x7
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x40047307
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x40047309
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x467f
+	SIOCOUTQ                             = 0x7472
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x80047308
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x1
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x80
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x2
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0xffff
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1009
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x20
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x1029
+	SO_DONTROUTE                         = 0x10
+	SO_ERROR                             = 0x1007
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x8
+	SO_LINGER                            = 0x80
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0x100
+	SO_PASSCRED                          = 0x11
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x12
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1e
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x1028
+	SO_RCVBUF                            = 0x1002
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x1004
+	SO_RCVTIMEO                          = 0x1006
+	SO_REUSEADDR                         = 0x4
+	SO_REUSEPORT                         = 0x200
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x1001
+	SO_SNDBUFFORCE                       = 0x1f
+	SO_SNDLOWAT                          = 0x1003
+	SO_SNDTIMEO                          = 0x1005
+	SO_STYLE                             = 0x1008
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x1008
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x5407
+	TCGETA                               = 0x5401
+	TCGETS                               = 0x540d
+	TCGETS2                              = 0x4030542a
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x5410
+	TCSBRK                               = 0x5405
+	TCSBRKP                              = 0x5486
+	TCSETA                               = 0x5402
+	TCSETAF                              = 0x5404
+	TCSETAW                              = 0x5403
+	TCSETS                               = 0x540e
+	TCSETS2                              = 0x8030542b
+	TCSETSF                              = 0x5410
+	TCSETSF2                             = 0x8030542d
+	TCSETSW                              = 0x540f
+	TCSETSW2                             = 0x8030542c
+	TCXONC                               = 0x5406
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x80047478
+	TIOCEXCL                             = 0x740d
+	TIOCGDEV                             = 0x40045432
+	TIOCGETD                             = 0x7400
+	TIOCGETP                             = 0x7408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x5492
+	TIOCGLCKTRMIOS                       = 0x548b
+	TIOCGLTC                             = 0x7474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x4020542e
+	TIOCGSERIAL                          = 0x5484
+	TIOCGSID                             = 0x7416
+	TIOCGSOFTCAR                         = 0x5481
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x467f
+	TIOCLINUX                            = 0x5483
+	TIOCMBIC                             = 0x741c
+	TIOCMBIS                             = 0x741b
+	TIOCMGET                             = 0x741d
+	TIOCMIWAIT                           = 0x5491
+	TIOCMSET                             = 0x741a
+	TIOCM_CAR                            = 0x100
+	TIOCM_CD                             = 0x100
+	TIOCM_CTS                            = 0x40
+	TIOCM_DSR                            = 0x400
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x200
+	TIOCM_RNG                            = 0x200
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x20
+	TIOCM_ST                             = 0x10
+	TIOCNOTTY                            = 0x5471
+	TIOCNXCL                             = 0x740e
+	TIOCOUTQ                             = 0x7472
+	TIOCPKT                              = 0x5470
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x5480
+	TIOCSERCONFIG                        = 0x5488
+	TIOCSERGETLSR                        = 0x548e
+	TIOCSERGETMULTI                      = 0x548f
+	TIOCSERGSTRUCT                       = 0x548d
+	TIOCSERGWILD                         = 0x5489
+	TIOCSERSETMULTI                      = 0x5490
+	TIOCSERSWILD                         = 0x548a
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x7401
+	TIOCSETN                             = 0x740a
+	TIOCSETP                             = 0x7409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x548c
+	TIOCSLTC                             = 0x7475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0xc020542f
+	TIOCSSERIAL                          = 0x5485
+	TIOCSSOFTCAR                         = 0x5482
+	TIOCSTI                              = 0x5472
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x8000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x800854d5
+	TUNDETACHFILTER                      = 0x800854d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x400854db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x10
+	VEOL                                 = 0x11
+	VEOL2                                = 0x6
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x4
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VSWTCH                               = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x20
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1893,174 +2363,182 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:    "operation not permitted",
-	2:    "no such file or directory",
-	3:    "no such process",
-	4:    "interrupted system call",
-	5:    "input/output error",
-	6:    "no such device or address",
-	7:    "argument list too long",
-	8:    "exec format error",
-	9:    "bad file descriptor",
-	10:   "no child processes",
-	11:   "resource temporarily unavailable",
-	12:   "cannot allocate memory",
-	13:   "permission denied",
-	14:   "bad address",
-	15:   "block device required",
-	16:   "device or resource busy",
-	17:   "file exists",
-	18:   "invalid cross-device link",
-	19:   "no such device",
-	20:   "not a directory",
-	21:   "is a directory",
-	22:   "invalid argument",
-	23:   "too many open files in system",
-	24:   "too many open files",
-	25:   "inappropriate ioctl for device",
-	26:   "text file busy",
-	27:   "file too large",
-	28:   "no space left on device",
-	29:   "illegal seek",
-	30:   "read-only file system",
-	31:   "too many links",
-	32:   "broken pipe",
-	33:   "numerical argument out of domain",
-	34:   "numerical result out of range",
-	35:   "no message of desired type",
-	36:   "identifier removed",
-	37:   "channel number out of range",
-	38:   "level 2 not synchronized",
-	39:   "level 3 halted",
-	40:   "level 3 reset",
-	41:   "link number out of range",
-	42:   "protocol driver not attached",
-	43:   "no CSI structure available",
-	44:   "level 2 halted",
-	45:   "resource deadlock avoided",
-	46:   "no locks available",
-	50:   "invalid exchange",
-	51:   "invalid request descriptor",
-	52:   "exchange full",
-	53:   "no anode",
-	54:   "invalid request code",
-	55:   "invalid slot",
-	56:   "file locking deadlock error",
-	59:   "bad font file format",
-	60:   "device not a stream",
-	61:   "no data available",
-	62:   "timer expired",
-	63:   "out of streams resources",
-	64:   "machine is not on the network",
-	65:   "package not installed",
-	66:   "object is remote",
-	67:   "link has been severed",
-	68:   "advertise error",
-	69:   "srmount error",
-	70:   "communication error on send",
-	71:   "protocol error",
-	73:   "RFS specific error",
-	74:   "multihop attempted",
-	77:   "bad message",
-	78:   "file name too long",
-	79:   "value too large for defined data type",
-	80:   "name not unique on network",
-	81:   "file descriptor in bad state",
-	82:   "remote address changed",
-	83:   "can not access a needed shared library",
-	84:   "accessing a corrupted shared library",
-	85:   ".lib section in a.out corrupted",
-	86:   "attempting to link in too many shared libraries",
-	87:   "cannot exec a shared library directly",
-	88:   "invalid or incomplete multibyte or wide character",
-	89:   "function not implemented",
-	90:   "too many levels of symbolic links",
-	91:   "interrupted system call should be restarted",
-	92:   "streams pipe error",
-	93:   "directory not empty",
-	94:   "too many users",
-	95:   "socket operation on non-socket",
-	96:   "destination address required",
-	97:   "message too long",
-	98:   "protocol wrong type for socket",
-	99:   "protocol not available",
-	120:  "protocol not supported",
-	121:  "socket type not supported",
-	122:  "operation not supported",
-	123:  "protocol family not supported",
-	124:  "address family not supported by protocol",
-	125:  "address already in use",
-	126:  "cannot assign requested address",
-	127:  "network is down",
-	128:  "network is unreachable",
-	129:  "network dropped connection on reset",
-	130:  "software caused connection abort",
-	131:  "connection reset by peer",
-	132:  "no buffer space available",
-	133:  "transport endpoint is already connected",
-	134:  "transport endpoint is not connected",
-	135:  "structure needs cleaning",
-	137:  "not a XENIX named type file",
-	138:  "no XENIX semaphores available",
-	139:  "is a named type file",
-	140:  "remote I/O error",
-	141:  "unknown error 141",
-	142:  "unknown error 142",
-	143:  "cannot send after transport endpoint shutdown",
-	144:  "too many references: cannot splice",
-	145:  "connection timed out",
-	146:  "connection refused",
-	147:  "host is down",
-	148:  "no route to host",
-	149:  "operation already in progress",
-	150:  "operation now in progress",
-	151:  "stale file handle",
-	158:  "operation canceled",
-	159:  "no medium found",
-	160:  "wrong medium type",
-	161:  "required key not available",
-	162:  "key has expired",
-	163:  "key has been revoked",
-	164:  "key was rejected by service",
-	165:  "owner died",
-	166:  "state not recoverable",
-	167:  "operation not possible due to RF-kill",
-	168:  "memory page has hardware error",
-	1133: "disk quota exceeded",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "resource deadlock avoided"},
+	{46, "ENOLCK", "no locks available"},
+	{50, "EBADE", "invalid exchange"},
+	{51, "EBADR", "invalid request descriptor"},
+	{52, "EXFULL", "exchange full"},
+	{53, "ENOANO", "no anode"},
+	{54, "EBADRQC", "invalid request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "bad message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{87, "ELIBEXEC", "cannot exec a shared library directly"},
+	{88, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{89, "ENOSYS", "function not implemented"},
+	{90, "ELOOP", "too many levels of symbolic links"},
+	{91, "ERESTART", "interrupted system call should be restarted"},
+	{92, "ESTRPIPE", "streams pipe error"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "protocol not available"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "ENOTSUP", "operation not supported"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection on reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{135, "EUCLEAN", "structure needs cleaning"},
+	{137, "ENOTNAM", "not a XENIX named type file"},
+	{138, "ENAVAIL", "no XENIX semaphores available"},
+	{139, "EISNAM", "is a named type file"},
+	{140, "EREMOTEIO", "remote I/O error"},
+	{141, "EINIT", "unknown error 141"},
+	{142, "EREMDEV", "unknown error 142"},
+	{143, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale file handle"},
+	{158, "ECANCELED", "operation canceled"},
+	{159, "ENOMEDIUM", "no medium found"},
+	{160, "EMEDIUMTYPE", "wrong medium type"},
+	{161, "ENOKEY", "required key not available"},
+	{162, "EKEYEXPIRED", "key has expired"},
+	{163, "EKEYREVOKED", "key has been revoked"},
+	{164, "EKEYREJECTED", "key was rejected by service"},
+	{165, "EOWNERDEAD", "owner died"},
+	{166, "ENOTRECOVERABLE", "state not recoverable"},
+	{167, "ERFKILL", "operation not possible due to RF-kill"},
+	{168, "EHWPOISON", "memory page has hardware error"},
+	{1133, "EDQUOT", "disk quota exceeded"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "user defined signal 1",
-	17: "user defined signal 2",
-	18: "child exited",
-	19: "power failure",
-	20: "window changed",
-	21: "urgent I/O condition",
-	22: "I/O possible",
-	23: "stopped (signal)",
-	24: "stopped",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual timer expired",
-	29: "profiling timer expired",
-	30: "CPU time limit exceeded",
-	31: "file size limit exceeded",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user defined signal 1"},
+	{17, "SIGUSR2", "user defined signal 2"},
+	{18, "SIGCHLD", "child exited"},
+	{19, "SIGPWR", "power failure"},
+	{20, "SIGWINCH", "window changed"},
+	{21, "SIGURG", "urgent I/O condition"},
+	{22, "SIGIO", "I/O possible"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual timer expired"},
+	{29, "SIGPROF", "profiling timer expired"},
+	{30, "SIGXCPU", "CPU time limit exceeded"},
+	{31, "SIGXFSZ", "file size limit exceeded"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
index 4d602e6d2b..d545e0d7c0 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64.go
@@ -1,1694 +1,2244 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build ppc64,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x5
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x17
+	B110                                 = 0x3
+	B115200                              = 0x11
+	B1152000                             = 0x18
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x19
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x1a
+	B230400                              = 0x12
+	B2400                                = 0xb
+	B2500000                             = 0x1b
+	B300                                 = 0x7
+	B3000000                             = 0x1c
+	B3500000                             = 0x1d
+	B38400                               = 0xf
+	B4000000                             = 0x1e
+	B460800                              = 0x13
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x14
+	B57600                               = 0x10
+	B576000                              = 0x15
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x16
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1f
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x8000
+	BSDLY                                = 0x8000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0xff
+	CBAUDEX                              = 0x0
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0xff0000
+	CLOCAL                               = 0x8000
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x1000
+	CR2                                  = 0x2000
+	CR3                                  = 0x3000
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x3000
+	CREAD                                = 0x800
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x100
+	CS7                                  = 0x200
+	CS8                                  = 0x300
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x300
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x400
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x40
+	ECHOE                                = 0x2
+	ECHOK                                = 0x4
+	ECHOKE                               = 0x1
+	ECHONL                               = 0x10
+	ECHOPRT                              = 0x20
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x4000
+	FFDLY                                = 0x4000
+	FLUSHO                               = 0x800000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x4000
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x100
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x400
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x80
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x1000
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x400
+	IXON                                 = 0x200
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x80
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x40
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x2000
+	MCL_FUTURE                           = 0x4000
+	MCL_ONFAULT                          = 0x8000
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NL2                                  = 0x200
+	NL3                                  = 0x300
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x300
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80000000
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x4
+	ONLCR                                = 0x2
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x20000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x1000
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x2000
+	PENDIN                               = 0x20000000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_SAO                             = 0x10
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETEVRREGS                    = 0x14
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGS64                     = 0x16
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVRREGS                     = 0x12
+	PTRACE_GETVSRREGS                    = 0x1b
+	PTRACE_GET_DEBUGREG                  = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETEVRREGS                    = 0x15
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGS64                     = 0x17
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVRREGS                     = 0x13
+	PTRACE_SETVSRREGS                    = 0x1c
+	PTRACE_SET_DEBUGREG                  = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x100
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_CCR                               = 0x26
+	PT_CTR                               = 0x23
+	PT_DAR                               = 0x29
+	PT_DSCR                              = 0x2c
+	PT_DSISR                             = 0x2a
+	PT_FPR0                              = 0x30
+	PT_FPSCR                             = 0x50
+	PT_LNK                               = 0x24
+	PT_MSR                               = 0x21
+	PT_NIP                               = 0x20
+	PT_ORIG_R3                           = 0x22
+	PT_R0                                = 0x0
+	PT_R1                                = 0x1
+	PT_R10                               = 0xa
+	PT_R11                               = 0xb
+	PT_R12                               = 0xc
+	PT_R13                               = 0xd
+	PT_R14                               = 0xe
+	PT_R15                               = 0xf
+	PT_R16                               = 0x10
+	PT_R17                               = 0x11
+	PT_R18                               = 0x12
+	PT_R19                               = 0x13
+	PT_R2                                = 0x2
+	PT_R20                               = 0x14
+	PT_R21                               = 0x15
+	PT_R22                               = 0x16
+	PT_R23                               = 0x17
+	PT_R24                               = 0x18
+	PT_R25                               = 0x19
+	PT_R26                               = 0x1a
+	PT_R27                               = 0x1b
+	PT_R28                               = 0x1c
+	PT_R29                               = 0x1d
+	PT_R3                                = 0x3
+	PT_R30                               = 0x1e
+	PT_R31                               = 0x1f
+	PT_R4                                = 0x4
+	PT_R5                                = 0x5
+	PT_R6                                = 0x6
+	PT_R7                                = 0x7
+	PT_R8                                = 0x8
+	PT_R9                                = 0x9
+	PT_REGS_COUNT                        = 0x2c
+	PT_RESULT                            = 0x2b
+	PT_SOFTE                             = 0x27
+	PT_TRAP                              = 0x28
+	PT_VR0                               = 0x52
+	PT_VRSAVE                            = 0x94
+	PT_VSCR                              = 0x93
+	PT_VSR0                              = 0x96
+	PT_VSR31                             = 0xd4
+	PT_XER                               = 0x25
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x4004667f
+	SIOCOUTQ                             = 0x40047473
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x14
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x15
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x10
+	SO_RCVTIMEO                          = 0x12
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x11
+	SO_SNDTIMEO                          = 0x13
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x400
+	TAB2                                 = 0x800
+	TAB3                                 = 0xc00
+	TABDLY                               = 0xc00
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x2000741f
+	TCGETA                               = 0x40147417
+	TCGETS                               = 0x402c7413
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x2000741d
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x80147418
+	TCSETAF                              = 0x8014741c
+	TCSETAW                              = 0x80147419
+	TCSETS                               = 0x802c7414
+	TCSETSF                              = 0x802c7416
+	TCSETSW                              = 0x802c7415
+	TCXONC                               = 0x2000741e
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x40045432
+	TIOCGETC                             = 0x40067412
+	TIOCGETD                             = 0x5424
+	TIOCGETP                             = 0x40067408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGLTC                             = 0x40067474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x4004667f
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_LOOP                           = 0x8000
+	TIOCM_OUT1                           = 0x2000
+	TIOCM_OUT2                           = 0x4000
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x40047473
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETC                             = 0x80067411
+	TIOCSETD                             = 0x5423
+	TIOCSETN                             = 0x8006740a
+	TIOCSETP                             = 0x80067409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSLTC                             = 0x80067475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTART                            = 0x2000746e
+	TIOCSTI                              = 0x5412
+	TIOCSTOP                             = 0x2000746f
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x400000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0x10
+	VEOF                                 = 0x4
+	VEOL                                 = 0x6
+	VEOL2                                = 0x8
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x5
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xb
+	VSTART                               = 0xd
+	VSTOP                                = 0xe
+	VSUSP                                = 0xc
+	VSWTC                                = 0x9
+	VT0                                  = 0x0
+	VT1                                  = 0x10000
+	VTDLY                                = 0x10000
+	VTIME                                = 0x7
+	VWERASE                              = 0xa
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4000
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0xc00
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1858,7 +2408,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1869,172 +2418,180 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{58, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
index 5280d9e8c0..102f09ee16 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_ppc64le.go
@@ -1,1690 +1,2244 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build ppc64le,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x17
-	B110                             = 0x3
-	B115200                          = 0x11
-	B1152000                         = 0x18
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x19
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x1a
-	B230400                          = 0x12
-	B2400                            = 0xb
-	B2500000                         = 0x1b
-	B300                             = 0x7
-	B3000000                         = 0x1c
-	B3500000                         = 0x1d
-	B38400                           = 0xf
-	B4000000                         = 0x1e
-	B460800                          = 0x13
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x14
-	B57600                           = 0x10
-	B576000                          = 0x15
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x16
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1f
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x8000
-	BSDLY                            = 0x8000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0xff
-	CBAUDEX                          = 0x0
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0xff0000
-	CLOCAL                           = 0x8000
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x1000
-	CR2                              = 0x2000
-	CR3                              = 0x3000
-	CRDLY                            = 0x3000
-	CREAD                            = 0x800
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x100
-	CS7                              = 0x200
-	CS8                              = 0x300
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x300
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x400
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x40
-	ECHOE                            = 0x2
-	ECHOK                            = 0x4
-	ECHOKE                           = 0x1
-	ECHONL                           = 0x10
-	ECHOPRT                          = 0x20
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x4000
-	FFDLY                            = 0x4000
-	FLUSHO                           = 0x800000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0xc
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0xd
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0xe
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x4000
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x100
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x400
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_NODAD                      = 0x2
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x7
-	IFF_802_1Q_VLAN                  = 0x1
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BONDING                      = 0x20
-	IFF_BRIDGE_PORT                  = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DISABLE_NETPOLL              = 0x1000
-	IFF_DONT_BRIDGE                  = 0x800
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_EBRIDGE                      = 0x2
-	IFF_ECHO                         = 0x40000
-	IFF_ISATAP                       = 0x80
-	IFF_LIVE_ADDR_CHANGE             = 0x100000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MACVLAN                      = 0x200000
-	IFF_MACVLAN_PORT                 = 0x2000
-	IFF_MASTER                       = 0x400
-	IFF_MASTER_8023AD                = 0x8
-	IFF_MASTER_ALB                   = 0x10
-	IFF_MASTER_ARPMON                = 0x100
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_OVS_DATAPATH                 = 0x8000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_SLAVE_INACTIVE               = 0x4
-	IFF_SLAVE_NEEDARP                = 0x40
-	IFF_SUPP_NOFCS                   = 0x80000
-	IFF_TAP                          = 0x2
-	IFF_TEAM_PORT                    = 0x40000
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_TX_SKB_SHARING               = 0x10000
-	IFF_UNICAST_FLT                  = 0x20000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFF_WAN_HDLC                     = 0x200
-	IFF_XMIT_DST_RELEASE             = 0x400
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x80
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x1000
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x400
-	IXON                             = 0x200
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x80
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x40
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x2000
-	MCL_FUTURE                       = 0x4000
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NL2                              = 0x200
-	NL3                              = 0x300
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x300
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80000000
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x4
-	ONLCR                            = 0x2
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x20000
-	O_DIRECTORY                      = 0x4000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x8000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x1000
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x2000
-	PENDIN                           = 0x20000000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_SAO                         = 0x10
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETEVRREGS                = 0x14
-	PTRACE_GETFPREGS                 = 0xe
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGS64                 = 0x16
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GETVRREGS                 = 0x12
-	PTRACE_GETVSRREGS                = 0x1b
-	PTRACE_GET_DEBUGREG              = 0x19
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x1000ff
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETEVRREGS                = 0x15
-	PTRACE_SETFPREGS                 = 0xf
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGS64                 = 0x17
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SETVRREGS                 = 0x13
-	PTRACE_SETVSRREGS                = 0x1c
-	PTRACE_SET_DEBUGREG              = 0x1a
-	PTRACE_SINGLEBLOCK               = 0x100
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TRACEME                   = 0x0
-	PT_CCR                           = 0x26
-	PT_CTR                           = 0x23
-	PT_DAR                           = 0x29
-	PT_DSCR                          = 0x2c
-	PT_DSISR                         = 0x2a
-	PT_FPR0                          = 0x30
-	PT_FPSCR                         = 0x50
-	PT_LNK                           = 0x24
-	PT_MSR                           = 0x21
-	PT_NIP                           = 0x20
-	PT_ORIG_R3                       = 0x22
-	PT_R0                            = 0x0
-	PT_R1                            = 0x1
-	PT_R10                           = 0xa
-	PT_R11                           = 0xb
-	PT_R12                           = 0xc
-	PT_R13                           = 0xd
-	PT_R14                           = 0xe
-	PT_R15                           = 0xf
-	PT_R16                           = 0x10
-	PT_R17                           = 0x11
-	PT_R18                           = 0x12
-	PT_R19                           = 0x13
-	PT_R2                            = 0x2
-	PT_R20                           = 0x14
-	PT_R21                           = 0x15
-	PT_R22                           = 0x16
-	PT_R23                           = 0x17
-	PT_R24                           = 0x18
-	PT_R25                           = 0x19
-	PT_R26                           = 0x1a
-	PT_R27                           = 0x1b
-	PT_R28                           = 0x1c
-	PT_R29                           = 0x1d
-	PT_R3                            = 0x3
-	PT_R30                           = 0x1e
-	PT_R31                           = 0x1f
-	PT_R4                            = 0x4
-	PT_R5                            = 0x5
-	PT_R6                            = 0x6
-	PT_R7                            = 0x7
-	PT_R8                            = 0x8
-	PT_R9                            = 0x9
-	PT_REGS_COUNT                    = 0x2c
-	PT_RESULT                        = 0x2b
-	PT_SOFTE                         = 0x27
-	PT_TRAP                          = 0x28
-	PT_VR0                           = 0x52
-	PT_VRSAVE                        = 0x94
-	PT_VSCR                          = 0x93
-	PT_VSR0                          = 0x96
-	PT_VSR31                         = 0xd4
-	PT_XER                           = 0x25
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0xf
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x11
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x57
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x12
-	RTM_NR_MSGTYPES                  = 0x48
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x14
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x15
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x10
-	SO_RCVTIMEO                      = 0x12
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x11
-	SO_SNDTIMEO                      = 0x13
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x400
-	TAB2                             = 0x800
-	TAB3                             = 0xc00
-	TABDLY                           = 0xc00
-	TCFLSH                           = 0x2000741f
-	TCGETA                           = 0x40147417
-	TCGETS                           = 0x402c7413
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x2000741d
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x80147418
-	TCSETAF                          = 0x8014741c
-	TCSETAW                          = 0x80147419
-	TCSETS                           = 0x802c7414
-	TCSETSF                          = 0x802c7416
-	TCSETSW                          = 0x802c7415
-	TCXONC                           = 0x2000741e
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x40045432
-	TIOCGETC                         = 0x40067412
-	TIOCGETD                         = 0x5424
-	TIOCGETP                         = 0x40067408
-	TIOCGEXCL                        = 0x40045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGLTC                         = 0x40067474
-	TIOCGPGRP                        = 0x40047477
-	TIOCGPKT                         = 0x40045438
-	TIOCGPTLCK                       = 0x40045439
-	TIOCGPTN                         = 0x40045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x40087468
-	TIOCINQ                          = 0x4004667f
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_LOOP                       = 0x8000
-	TIOCM_OUT1                       = 0x2000
-	TIOCM_OUT2                       = 0x4000
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x40047473
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETC                         = 0x80067411
-	TIOCSETD                         = 0x5423
-	TIOCSETN                         = 0x8006740a
-	TIOCSETP                         = 0x80067409
-	TIOCSIG                          = 0x80045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSLTC                         = 0x80067475
-	TIOCSPGRP                        = 0x80047476
-	TIOCSPTLCK                       = 0x80045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTART                        = 0x2000746e
-	TIOCSTI                          = 0x5412
-	TIOCSTOP                         = 0x2000746f
-	TIOCSWINSZ                       = 0x80087467
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x400000
-	TUNATTACHFILTER                  = 0x801054d5
-	TUNDETACHFILTER                  = 0x801054d6
-	TUNGETFEATURES                   = 0x400454cf
-	TUNGETFILTER                     = 0x401054db
-	TUNGETIFF                        = 0x400454d2
-	TUNGETSNDBUF                     = 0x400454d3
-	TUNGETVNETHDRSZ                  = 0x400454d7
-	TUNSETDEBUG                      = 0x800454c9
-	TUNSETGROUP                      = 0x800454ce
-	TUNSETIFF                        = 0x800454ca
-	TUNSETIFINDEX                    = 0x800454da
-	TUNSETLINK                       = 0x800454cd
-	TUNSETNOCSUM                     = 0x800454c8
-	TUNSETOFFLOAD                    = 0x800454d0
-	TUNSETOWNER                      = 0x800454cc
-	TUNSETPERSIST                    = 0x800454cb
-	TUNSETQUEUE                      = 0x800454d9
-	TUNSETSNDBUF                     = 0x800454d4
-	TUNSETTXFILTER                   = 0x800454d1
-	TUNSETVNETHDRSZ                  = 0x800454d8
-	VDISCARD                         = 0x10
-	VEOF                             = 0x4
-	VEOL                             = 0x6
-	VEOL2                            = 0x8
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x5
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xb
-	VSTART                           = 0xd
-	VSTOP                            = 0xe
-	VSUSP                            = 0xc
-	VSWTC                            = 0x9
-	VT0                              = 0x0
-	VT1                              = 0x10000
-	VTDLY                            = 0x10000
-	VTIME                            = 0x7
-	VWERASE                          = 0xa
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4000
-	XTABS                            = 0xc00
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x17
+	B110                                 = 0x3
+	B115200                              = 0x11
+	B1152000                             = 0x18
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x19
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x1a
+	B230400                              = 0x12
+	B2400                                = 0xb
+	B2500000                             = 0x1b
+	B300                                 = 0x7
+	B3000000                             = 0x1c
+	B3500000                             = 0x1d
+	B38400                               = 0xf
+	B4000000                             = 0x1e
+	B460800                              = 0x13
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x14
+	B57600                               = 0x10
+	B576000                              = 0x15
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x16
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x40081270
+	BLKBSZSET                            = 0x80081271
+	BLKFLSBUF                            = 0x20001261
+	BLKFRAGET                            = 0x20001265
+	BLKFRASET                            = 0x20001264
+	BLKGETSIZE                           = 0x20001260
+	BLKGETSIZE64                         = 0x40081272
+	BLKPBSZGET                           = 0x2000127b
+	BLKRAGET                             = 0x20001263
+	BLKRASET                             = 0x20001262
+	BLKROGET                             = 0x2000125e
+	BLKROSET                             = 0x2000125d
+	BLKRRPART                            = 0x2000125f
+	BLKSECTGET                           = 0x20001267
+	BLKSECTSET                           = 0x20001266
+	BLKSSZGET                            = 0x20001268
+	BOTHER                               = 0x1f
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x8000
+	BSDLY                                = 0x8000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0xff
+	CBAUDEX                              = 0x0
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0xff0000
+	CLOCAL                               = 0x8000
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x1000
+	CR2                                  = 0x2000
+	CR3                                  = 0x3000
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x3000
+	CREAD                                = 0x800
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x100
+	CS7                                  = 0x200
+	CS8                                  = 0x300
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x300
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x400
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x40
+	ECHOE                                = 0x2
+	ECHOK                                = 0x4
+	ECHOKE                               = 0x1
+	ECHONL                               = 0x10
+	ECHOPRT                              = 0x20
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x4000
+	FFDLY                                = 0x4000
+	FLUSHO                               = 0x800000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x800c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x80106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x400c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0xc
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0xd
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0xe
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x4000
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x100
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x400
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x200007b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x80
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x1000
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x400
+	IXON                                 = 0x200
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x80
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x40
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x2000
+	MCL_FUTURE                           = 0x4000
+	MCL_ONFAULT                          = 0x8000
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NL2                                  = 0x200
+	NL3                                  = 0x300
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x300
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80000000
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x4
+	ONLCR                                = 0x2
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x20000
+	O_DIRECTORY                          = 0x4000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x8000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x404000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x1000
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x2000
+	PENDIN                               = 0x20000000
+	PERF_EVENT_IOC_DISABLE               = 0x20002401
+	PERF_EVENT_IOC_ENABLE                = 0x20002400
+	PERF_EVENT_IOC_ID                    = 0x40082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x80042409
+	PERF_EVENT_IOC_PERIOD                = 0x80082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x20002402
+	PERF_EVENT_IOC_RESET                 = 0x20002403
+	PERF_EVENT_IOC_SET_BPF               = 0x80042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x80082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x20002405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_SAO                             = 0x10
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETEVRREGS                    = 0x14
+	PTRACE_GETFPREGS                     = 0xe
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGS64                     = 0x16
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GETVRREGS                     = 0x12
+	PTRACE_GETVSRREGS                    = 0x1b
+	PTRACE_GET_DEBUGREG                  = 0x19
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETEVRREGS                    = 0x15
+	PTRACE_SETFPREGS                     = 0xf
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGS64                     = 0x17
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SETVRREGS                     = 0x13
+	PTRACE_SETVSRREGS                    = 0x1c
+	PTRACE_SET_DEBUGREG                  = 0x1a
+	PTRACE_SINGLEBLOCK                   = 0x100
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TRACEME                       = 0x0
+	PT_CCR                               = 0x26
+	PT_CTR                               = 0x23
+	PT_DAR                               = 0x29
+	PT_DSCR                              = 0x2c
+	PT_DSISR                             = 0x2a
+	PT_FPR0                              = 0x30
+	PT_FPSCR                             = 0x50
+	PT_LNK                               = 0x24
+	PT_MSR                               = 0x21
+	PT_NIP                               = 0x20
+	PT_ORIG_R3                           = 0x22
+	PT_R0                                = 0x0
+	PT_R1                                = 0x1
+	PT_R10                               = 0xa
+	PT_R11                               = 0xb
+	PT_R12                               = 0xc
+	PT_R13                               = 0xd
+	PT_R14                               = 0xe
+	PT_R15                               = 0xf
+	PT_R16                               = 0x10
+	PT_R17                               = 0x11
+	PT_R18                               = 0x12
+	PT_R19                               = 0x13
+	PT_R2                                = 0x2
+	PT_R20                               = 0x14
+	PT_R21                               = 0x15
+	PT_R22                               = 0x16
+	PT_R23                               = 0x17
+	PT_R24                               = 0x18
+	PT_R25                               = 0x19
+	PT_R26                               = 0x1a
+	PT_R27                               = 0x1b
+	PT_R28                               = 0x1c
+	PT_R29                               = 0x1d
+	PT_R3                                = 0x3
+	PT_R30                               = 0x1e
+	PT_R31                               = 0x1f
+	PT_R4                                = 0x4
+	PT_R5                                = 0x5
+	PT_R6                                = 0x6
+	PT_R7                                = 0x7
+	PT_R8                                = 0x8
+	PT_R9                                = 0x9
+	PT_REGS_COUNT                        = 0x2c
+	PT_RESULT                            = 0x2b
+	PT_SOFTE                             = 0x27
+	PT_TRAP                              = 0x28
+	PT_VR0                               = 0x52
+	PT_VRSAVE                            = 0x94
+	PT_VSCR                              = 0x93
+	PT_VSR0                              = 0x96
+	PT_VSR31                             = 0xd4
+	PT_XER                               = 0x25
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x4004667f
+	SIOCOUTQ                             = 0x40047473
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x14
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x15
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x10
+	SO_RCVTIMEO                          = 0x12
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x11
+	SO_SNDTIMEO                          = 0x13
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x400
+	TAB2                                 = 0x800
+	TAB3                                 = 0xc00
+	TABDLY                               = 0xc00
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x2000741f
+	TCGETA                               = 0x40147417
+	TCGETS                               = 0x402c7413
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x2000741d
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x80147418
+	TCSETAF                              = 0x8014741c
+	TCSETAW                              = 0x80147419
+	TCSETS                               = 0x802c7414
+	TCSETSF                              = 0x802c7416
+	TCSETSW                              = 0x802c7415
+	TCXONC                               = 0x2000741e
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x40045432
+	TIOCGETC                             = 0x40067412
+	TIOCGETD                             = 0x5424
+	TIOCGETP                             = 0x40067408
+	TIOCGEXCL                            = 0x40045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGLTC                             = 0x40067474
+	TIOCGPGRP                            = 0x40047477
+	TIOCGPKT                             = 0x40045438
+	TIOCGPTLCK                           = 0x40045439
+	TIOCGPTN                             = 0x40045430
+	TIOCGPTPEER                          = 0x20005441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x40087468
+	TIOCINQ                              = 0x4004667f
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_LOOP                           = 0x8000
+	TIOCM_OUT1                           = 0x2000
+	TIOCM_OUT2                           = 0x4000
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x40047473
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETC                             = 0x80067411
+	TIOCSETD                             = 0x5423
+	TIOCSETN                             = 0x8006740a
+	TIOCSETP                             = 0x80067409
+	TIOCSIG                              = 0x80045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSLTC                             = 0x80067475
+	TIOCSPGRP                            = 0x80047476
+	TIOCSPTLCK                           = 0x80045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTART                            = 0x2000746e
+	TIOCSTI                              = 0x5412
+	TIOCSTOP                             = 0x2000746f
+	TIOCSWINSZ                           = 0x80087467
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x400000
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x801054d5
+	TUNDETACHFILTER                      = 0x801054d6
+	TUNGETFEATURES                       = 0x400454cf
+	TUNGETFILTER                         = 0x401054db
+	TUNGETIFF                            = 0x400454d2
+	TUNGETSNDBUF                         = 0x400454d3
+	TUNGETVNETBE                         = 0x400454df
+	TUNGETVNETHDRSZ                      = 0x400454d7
+	TUNGETVNETLE                         = 0x400454dd
+	TUNSETDEBUG                          = 0x800454c9
+	TUNSETFILTEREBPF                     = 0x400454e1
+	TUNSETGROUP                          = 0x800454ce
+	TUNSETIFF                            = 0x800454ca
+	TUNSETIFINDEX                        = 0x800454da
+	TUNSETLINK                           = 0x800454cd
+	TUNSETNOCSUM                         = 0x800454c8
+	TUNSETOFFLOAD                        = 0x800454d0
+	TUNSETOWNER                          = 0x800454cc
+	TUNSETPERSIST                        = 0x800454cb
+	TUNSETQUEUE                          = 0x800454d9
+	TUNSETSNDBUF                         = 0x800454d4
+	TUNSETSTEERINGEBPF                   = 0x400454e0
+	TUNSETTXFILTER                       = 0x800454d1
+	TUNSETVNETBE                         = 0x800454de
+	TUNSETVNETHDRSZ                      = 0x800454d8
+	TUNSETVNETLE                         = 0x800454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0x10
+	VEOF                                 = 0x4
+	VEOL                                 = 0x6
+	VEOL2                                = 0x8
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x5
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xb
+	VSTART                               = 0xd
+	VSTOP                                = 0xe
+	VSUSP                                = 0xc
+	VSWTC                                = 0x9
+	VT0                                  = 0x0
+	VT1                                  = 0x10000
+	VTDLY                                = 0x10000
+	VTIME                                = 0x7
+	VWERASE                              = 0xa
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x40045702
+	WDIOC_GETPRETIMEOUT                  = 0x40045709
+	WDIOC_GETSTATUS                      = 0x40045701
+	WDIOC_GETSUPPORT                     = 0x40285700
+	WDIOC_GETTEMP                        = 0x40045703
+	WDIOC_GETTIMELEFT                    = 0x4004570a
+	WDIOC_GETTIMEOUT                     = 0x40045707
+	WDIOC_KEEPALIVE                      = 0x40045705
+	WDIOC_SETOPTIONS                     = 0x40045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4000
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0xc00
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1854,7 +2408,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1865,172 +2418,180 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	58:  "file locking deadlock error",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{58, "EDEADLOCK", "file locking deadlock error"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
index 81ad7a8760..e8326c1083 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_linux_s390x.go
@@ -1,1748 +1,2244 @@
-// mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mkerrors.sh -Wall -Werror -static -I/tmp/include -fsigned-char
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build s390x,linux
 
 // Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -m64 _const.go
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char _const.go
 
 package unix
 
 import "syscall"
 
 const (
-	AF_ALG                           = 0x26
-	AF_APPLETALK                     = 0x5
-	AF_ASH                           = 0x12
-	AF_ATMPVC                        = 0x8
-	AF_ATMSVC                        = 0x14
-	AF_AX25                          = 0x3
-	AF_BLUETOOTH                     = 0x1f
-	AF_BRIDGE                        = 0x7
-	AF_CAIF                          = 0x25
-	AF_CAN                           = 0x1d
-	AF_DECnet                        = 0xc
-	AF_ECONET                        = 0x13
-	AF_FILE                          = 0x1
-	AF_IB                            = 0x1b
-	AF_IEEE802154                    = 0x24
-	AF_INET                          = 0x2
-	AF_INET6                         = 0xa
-	AF_IPX                           = 0x4
-	AF_IRDA                          = 0x17
-	AF_ISDN                          = 0x22
-	AF_IUCV                          = 0x20
-	AF_KEY                           = 0xf
-	AF_LLC                           = 0x1a
-	AF_LOCAL                         = 0x1
-	AF_MAX                           = 0x29
-	AF_MPLS                          = 0x1c
-	AF_NETBEUI                       = 0xd
-	AF_NETLINK                       = 0x10
-	AF_NETROM                        = 0x6
-	AF_NFC                           = 0x27
-	AF_PACKET                        = 0x11
-	AF_PHONET                        = 0x23
-	AF_PPPOX                         = 0x18
-	AF_RDS                           = 0x15
-	AF_ROSE                          = 0xb
-	AF_ROUTE                         = 0x10
-	AF_RXRPC                         = 0x21
-	AF_SECURITY                      = 0xe
-	AF_SNA                           = 0x16
-	AF_TIPC                          = 0x1e
-	AF_UNIX                          = 0x1
-	AF_UNSPEC                        = 0x0
-	AF_VSOCK                         = 0x28
-	AF_WANPIPE                       = 0x19
-	AF_X25                           = 0x9
-	ALG_OP_DECRYPT                   = 0x0
-	ALG_OP_ENCRYPT                   = 0x1
-	ALG_SET_AEAD_ASSOCLEN            = 0x4
-	ALG_SET_AEAD_AUTHSIZE            = 0x5
-	ALG_SET_IV                       = 0x2
-	ALG_SET_KEY                      = 0x1
-	ALG_SET_OP                       = 0x3
-	ARPHRD_6LOWPAN                   = 0x339
-	ARPHRD_ADAPT                     = 0x108
-	ARPHRD_APPLETLK                  = 0x8
-	ARPHRD_ARCNET                    = 0x7
-	ARPHRD_ASH                       = 0x30d
-	ARPHRD_ATM                       = 0x13
-	ARPHRD_AX25                      = 0x3
-	ARPHRD_BIF                       = 0x307
-	ARPHRD_CAIF                      = 0x336
-	ARPHRD_CAN                       = 0x118
-	ARPHRD_CHAOS                     = 0x5
-	ARPHRD_CISCO                     = 0x201
-	ARPHRD_CSLIP                     = 0x101
-	ARPHRD_CSLIP6                    = 0x103
-	ARPHRD_DDCMP                     = 0x205
-	ARPHRD_DLCI                      = 0xf
-	ARPHRD_ECONET                    = 0x30e
-	ARPHRD_EETHER                    = 0x2
-	ARPHRD_ETHER                     = 0x1
-	ARPHRD_EUI64                     = 0x1b
-	ARPHRD_FCAL                      = 0x311
-	ARPHRD_FCFABRIC                  = 0x313
-	ARPHRD_FCPL                      = 0x312
-	ARPHRD_FCPP                      = 0x310
-	ARPHRD_FDDI                      = 0x306
-	ARPHRD_FRAD                      = 0x302
-	ARPHRD_HDLC                      = 0x201
-	ARPHRD_HIPPI                     = 0x30c
-	ARPHRD_HWX25                     = 0x110
-	ARPHRD_IEEE1394                  = 0x18
-	ARPHRD_IEEE802                   = 0x6
-	ARPHRD_IEEE80211                 = 0x321
-	ARPHRD_IEEE80211_PRISM           = 0x322
-	ARPHRD_IEEE80211_RADIOTAP        = 0x323
-	ARPHRD_IEEE802154                = 0x324
-	ARPHRD_IEEE802154_MONITOR        = 0x325
-	ARPHRD_IEEE802_TR                = 0x320
-	ARPHRD_INFINIBAND                = 0x20
-	ARPHRD_IP6GRE                    = 0x337
-	ARPHRD_IPDDP                     = 0x309
-	ARPHRD_IPGRE                     = 0x30a
-	ARPHRD_IRDA                      = 0x30f
-	ARPHRD_LAPB                      = 0x204
-	ARPHRD_LOCALTLK                  = 0x305
-	ARPHRD_LOOPBACK                  = 0x304
-	ARPHRD_METRICOM                  = 0x17
-	ARPHRD_NETLINK                   = 0x338
-	ARPHRD_NETROM                    = 0x0
-	ARPHRD_NONE                      = 0xfffe
-	ARPHRD_PHONET                    = 0x334
-	ARPHRD_PHONET_PIPE               = 0x335
-	ARPHRD_PIMREG                    = 0x30b
-	ARPHRD_PPP                       = 0x200
-	ARPHRD_PRONET                    = 0x4
-	ARPHRD_RAWHDLC                   = 0x206
-	ARPHRD_ROSE                      = 0x10e
-	ARPHRD_RSRVD                     = 0x104
-	ARPHRD_SIT                       = 0x308
-	ARPHRD_SKIP                      = 0x303
-	ARPHRD_SLIP                      = 0x100
-	ARPHRD_SLIP6                     = 0x102
-	ARPHRD_TUNNEL                    = 0x300
-	ARPHRD_TUNNEL6                   = 0x301
-	ARPHRD_VOID                      = 0xffff
-	ARPHRD_X25                       = 0x10f
-	B0                               = 0x0
-	B1000000                         = 0x1008
-	B110                             = 0x3
-	B115200                          = 0x1002
-	B1152000                         = 0x1009
-	B1200                            = 0x9
-	B134                             = 0x4
-	B150                             = 0x5
-	B1500000                         = 0x100a
-	B1800                            = 0xa
-	B19200                           = 0xe
-	B200                             = 0x6
-	B2000000                         = 0x100b
-	B230400                          = 0x1003
-	B2400                            = 0xb
-	B2500000                         = 0x100c
-	B300                             = 0x7
-	B3000000                         = 0x100d
-	B3500000                         = 0x100e
-	B38400                           = 0xf
-	B4000000                         = 0x100f
-	B460800                          = 0x1004
-	B4800                            = 0xc
-	B50                              = 0x1
-	B500000                          = 0x1005
-	B57600                           = 0x1001
-	B576000                          = 0x1006
-	B600                             = 0x8
-	B75                              = 0x2
-	B921600                          = 0x1007
-	B9600                            = 0xd
-	BLKBSZGET                        = 0x80081270
-	BLKBSZSET                        = 0x40081271
-	BLKFLSBUF                        = 0x1261
-	BLKFRAGET                        = 0x1265
-	BLKFRASET                        = 0x1264
-	BLKGETSIZE                       = 0x1260
-	BLKGETSIZE64                     = 0x80081272
-	BLKRAGET                         = 0x1263
-	BLKRASET                         = 0x1262
-	BLKROGET                         = 0x125e
-	BLKROSET                         = 0x125d
-	BLKRRPART                        = 0x125f
-	BLKSECTGET                       = 0x1267
-	BLKSECTSET                       = 0x1266
-	BLKSSZGET                        = 0x1268
-	BOTHER                           = 0x1000
-	BPF_A                            = 0x10
-	BPF_ABS                          = 0x20
-	BPF_ADD                          = 0x0
-	BPF_ALU                          = 0x4
-	BPF_AND                          = 0x50
-	BPF_B                            = 0x10
-	BPF_DIV                          = 0x30
-	BPF_H                            = 0x8
-	BPF_IMM                          = 0x0
-	BPF_IND                          = 0x40
-	BPF_JA                           = 0x0
-	BPF_JEQ                          = 0x10
-	BPF_JGE                          = 0x30
-	BPF_JGT                          = 0x20
-	BPF_JMP                          = 0x5
-	BPF_JSET                         = 0x40
-	BPF_K                            = 0x0
-	BPF_LD                           = 0x0
-	BPF_LDX                          = 0x1
-	BPF_LEN                          = 0x80
-	BPF_LL_OFF                       = -0x200000
-	BPF_LSH                          = 0x60
-	BPF_MAJOR_VERSION                = 0x1
-	BPF_MAXINSNS                     = 0x1000
-	BPF_MEM                          = 0x60
-	BPF_MEMWORDS                     = 0x10
-	BPF_MINOR_VERSION                = 0x1
-	BPF_MISC                         = 0x7
-	BPF_MOD                          = 0x90
-	BPF_MSH                          = 0xa0
-	BPF_MUL                          = 0x20
-	BPF_NEG                          = 0x80
-	BPF_NET_OFF                      = -0x100000
-	BPF_OR                           = 0x40
-	BPF_RET                          = 0x6
-	BPF_RSH                          = 0x70
-	BPF_ST                           = 0x2
-	BPF_STX                          = 0x3
-	BPF_SUB                          = 0x10
-	BPF_TAX                          = 0x0
-	BPF_TXA                          = 0x80
-	BPF_W                            = 0x0
-	BPF_X                            = 0x8
-	BPF_XOR                          = 0xa0
-	BRKINT                           = 0x2
-	BS0                              = 0x0
-	BS1                              = 0x2000
-	BSDLY                            = 0x2000
-	CAN_BCM                          = 0x2
-	CAN_EFF_FLAG                     = 0x80000000
-	CAN_EFF_ID_BITS                  = 0x1d
-	CAN_EFF_MASK                     = 0x1fffffff
-	CAN_ERR_FLAG                     = 0x20000000
-	CAN_ERR_MASK                     = 0x1fffffff
-	CAN_INV_FILTER                   = 0x20000000
-	CAN_ISOTP                        = 0x6
-	CAN_MAX_DLC                      = 0x8
-	CAN_MAX_DLEN                     = 0x8
-	CAN_MCNET                        = 0x5
-	CAN_MTU                          = 0x10
-	CAN_NPROTO                       = 0x7
-	CAN_RAW                          = 0x1
-	CAN_RTR_FLAG                     = 0x40000000
-	CAN_SFF_ID_BITS                  = 0xb
-	CAN_SFF_MASK                     = 0x7ff
-	CAN_TP16                         = 0x3
-	CAN_TP20                         = 0x4
-	CBAUD                            = 0x100f
-	CBAUDEX                          = 0x1000
-	CFLUSH                           = 0xf
-	CIBAUD                           = 0x100f0000
-	CLOCAL                           = 0x800
-	CLOCK_BOOTTIME                   = 0x7
-	CLOCK_BOOTTIME_ALARM             = 0x9
-	CLOCK_DEFAULT                    = 0x0
-	CLOCK_EXT                        = 0x1
-	CLOCK_INT                        = 0x2
-	CLOCK_MONOTONIC                  = 0x1
-	CLOCK_MONOTONIC_COARSE           = 0x6
-	CLOCK_MONOTONIC_RAW              = 0x4
-	CLOCK_PROCESS_CPUTIME_ID         = 0x2
-	CLOCK_REALTIME                   = 0x0
-	CLOCK_REALTIME_ALARM             = 0x8
-	CLOCK_REALTIME_COARSE            = 0x5
-	CLOCK_TAI                        = 0xb
-	CLOCK_THREAD_CPUTIME_ID          = 0x3
-	CLOCK_TXFROMRX                   = 0x4
-	CLOCK_TXINT                      = 0x3
-	CLONE_CHILD_CLEARTID             = 0x200000
-	CLONE_CHILD_SETTID               = 0x1000000
-	CLONE_DETACHED                   = 0x400000
-	CLONE_FILES                      = 0x400
-	CLONE_FS                         = 0x200
-	CLONE_IO                         = 0x80000000
-	CLONE_NEWCGROUP                  = 0x2000000
-	CLONE_NEWIPC                     = 0x8000000
-	CLONE_NEWNET                     = 0x40000000
-	CLONE_NEWNS                      = 0x20000
-	CLONE_NEWPID                     = 0x20000000
-	CLONE_NEWUSER                    = 0x10000000
-	CLONE_NEWUTS                     = 0x4000000
-	CLONE_PARENT                     = 0x8000
-	CLONE_PARENT_SETTID              = 0x100000
-	CLONE_PTRACE                     = 0x2000
-	CLONE_SETTLS                     = 0x80000
-	CLONE_SIGHAND                    = 0x800
-	CLONE_SYSVSEM                    = 0x40000
-	CLONE_THREAD                     = 0x10000
-	CLONE_UNTRACED                   = 0x800000
-	CLONE_VFORK                      = 0x4000
-	CLONE_VM                         = 0x100
-	CMSPAR                           = 0x40000000
-	CR0                              = 0x0
-	CR1                              = 0x200
-	CR2                              = 0x400
-	CR3                              = 0x600
-	CRDLY                            = 0x600
-	CREAD                            = 0x80
-	CRTSCTS                          = 0x80000000
-	CS5                              = 0x0
-	CS6                              = 0x10
-	CS7                              = 0x20
-	CS8                              = 0x30
-	CSIGNAL                          = 0xff
-	CSIZE                            = 0x30
-	CSTART                           = 0x11
-	CSTATUS                          = 0x0
-	CSTOP                            = 0x13
-	CSTOPB                           = 0x40
-	CSUSP                            = 0x1a
-	DT_BLK                           = 0x6
-	DT_CHR                           = 0x2
-	DT_DIR                           = 0x4
-	DT_FIFO                          = 0x1
-	DT_LNK                           = 0xa
-	DT_REG                           = 0x8
-	DT_SOCK                          = 0xc
-	DT_UNKNOWN                       = 0x0
-	DT_WHT                           = 0xe
-	ECHO                             = 0x8
-	ECHOCTL                          = 0x200
-	ECHOE                            = 0x10
-	ECHOK                            = 0x20
-	ECHOKE                           = 0x800
-	ECHONL                           = 0x40
-	ECHOPRT                          = 0x400
-	ENCODING_DEFAULT                 = 0x0
-	ENCODING_FM_MARK                 = 0x3
-	ENCODING_FM_SPACE                = 0x4
-	ENCODING_MANCHESTER              = 0x5
-	ENCODING_NRZ                     = 0x1
-	ENCODING_NRZI                    = 0x2
-	EPOLLERR                         = 0x8
-	EPOLLET                          = 0x80000000
-	EPOLLHUP                         = 0x10
-	EPOLLIN                          = 0x1
-	EPOLLMSG                         = 0x400
-	EPOLLONESHOT                     = 0x40000000
-	EPOLLOUT                         = 0x4
-	EPOLLPRI                         = 0x2
-	EPOLLRDBAND                      = 0x80
-	EPOLLRDHUP                       = 0x2000
-	EPOLLRDNORM                      = 0x40
-	EPOLLWAKEUP                      = 0x20000000
-	EPOLLWRBAND                      = 0x200
-	EPOLLWRNORM                      = 0x100
-	EPOLL_CLOEXEC                    = 0x80000
-	EPOLL_CTL_ADD                    = 0x1
-	EPOLL_CTL_DEL                    = 0x2
-	EPOLL_CTL_MOD                    = 0x3
-	ETH_P_1588                       = 0x88f7
-	ETH_P_8021AD                     = 0x88a8
-	ETH_P_8021AH                     = 0x88e7
-	ETH_P_8021Q                      = 0x8100
-	ETH_P_80221                      = 0x8917
-	ETH_P_802_2                      = 0x4
-	ETH_P_802_3                      = 0x1
-	ETH_P_802_3_MIN                  = 0x600
-	ETH_P_802_EX1                    = 0x88b5
-	ETH_P_AARP                       = 0x80f3
-	ETH_P_AF_IUCV                    = 0xfbfb
-	ETH_P_ALL                        = 0x3
-	ETH_P_AOE                        = 0x88a2
-	ETH_P_ARCNET                     = 0x1a
-	ETH_P_ARP                        = 0x806
-	ETH_P_ATALK                      = 0x809b
-	ETH_P_ATMFATE                    = 0x8884
-	ETH_P_ATMMPOA                    = 0x884c
-	ETH_P_AX25                       = 0x2
-	ETH_P_BATMAN                     = 0x4305
-	ETH_P_BPQ                        = 0x8ff
-	ETH_P_CAIF                       = 0xf7
-	ETH_P_CAN                        = 0xc
-	ETH_P_CANFD                      = 0xd
-	ETH_P_CONTROL                    = 0x16
-	ETH_P_CUST                       = 0x6006
-	ETH_P_DDCMP                      = 0x6
-	ETH_P_DEC                        = 0x6000
-	ETH_P_DIAG                       = 0x6005
-	ETH_P_DNA_DL                     = 0x6001
-	ETH_P_DNA_RC                     = 0x6002
-	ETH_P_DNA_RT                     = 0x6003
-	ETH_P_DSA                        = 0x1b
-	ETH_P_ECONET                     = 0x18
-	ETH_P_EDSA                       = 0xdada
-	ETH_P_FCOE                       = 0x8906
-	ETH_P_FIP                        = 0x8914
-	ETH_P_HDLC                       = 0x19
-	ETH_P_IEEE802154                 = 0xf6
-	ETH_P_IEEEPUP                    = 0xa00
-	ETH_P_IEEEPUPAT                  = 0xa01
-	ETH_P_IP                         = 0x800
-	ETH_P_IPV6                       = 0x86dd
-	ETH_P_IPX                        = 0x8137
-	ETH_P_IRDA                       = 0x17
-	ETH_P_LAT                        = 0x6004
-	ETH_P_LINK_CTL                   = 0x886c
-	ETH_P_LOCALTALK                  = 0x9
-	ETH_P_LOOP                       = 0x60
-	ETH_P_LOOPBACK                   = 0x9000
-	ETH_P_MOBITEX                    = 0x15
-	ETH_P_MPLS_MC                    = 0x8848
-	ETH_P_MPLS_UC                    = 0x8847
-	ETH_P_MVRP                       = 0x88f5
-	ETH_P_PAE                        = 0x888e
-	ETH_P_PAUSE                      = 0x8808
-	ETH_P_PHONET                     = 0xf5
-	ETH_P_PPPTALK                    = 0x10
-	ETH_P_PPP_DISC                   = 0x8863
-	ETH_P_PPP_MP                     = 0x8
-	ETH_P_PPP_SES                    = 0x8864
-	ETH_P_PRP                        = 0x88fb
-	ETH_P_PUP                        = 0x200
-	ETH_P_PUPAT                      = 0x201
-	ETH_P_QINQ1                      = 0x9100
-	ETH_P_QINQ2                      = 0x9200
-	ETH_P_QINQ3                      = 0x9300
-	ETH_P_RARP                       = 0x8035
-	ETH_P_SCA                        = 0x6007
-	ETH_P_SLOW                       = 0x8809
-	ETH_P_SNAP                       = 0x5
-	ETH_P_TDLS                       = 0x890d
-	ETH_P_TEB                        = 0x6558
-	ETH_P_TIPC                       = 0x88ca
-	ETH_P_TRAILER                    = 0x1c
-	ETH_P_TR_802_2                   = 0x11
-	ETH_P_TSN                        = 0x22f0
-	ETH_P_WAN_PPP                    = 0x7
-	ETH_P_WCCP                       = 0x883e
-	ETH_P_X25                        = 0x805
-	ETH_P_XDSA                       = 0xf8
-	EXTA                             = 0xe
-	EXTB                             = 0xf
-	EXTPROC                          = 0x10000
-	FALLOC_FL_COLLAPSE_RANGE         = 0x8
-	FALLOC_FL_INSERT_RANGE           = 0x20
-	FALLOC_FL_KEEP_SIZE              = 0x1
-	FALLOC_FL_NO_HIDE_STALE          = 0x4
-	FALLOC_FL_PUNCH_HOLE             = 0x2
-	FALLOC_FL_ZERO_RANGE             = 0x10
-	FD_CLOEXEC                       = 0x1
-	FD_SETSIZE                       = 0x400
-	FF0                              = 0x0
-	FF1                              = 0x8000
-	FFDLY                            = 0x8000
-	FLUSHO                           = 0x1000
-	F_DUPFD                          = 0x0
-	F_DUPFD_CLOEXEC                  = 0x406
-	F_EXLCK                          = 0x4
-	F_GETFD                          = 0x1
-	F_GETFL                          = 0x3
-	F_GETLEASE                       = 0x401
-	F_GETLK                          = 0x5
-	F_GETLK64                        = 0x5
-	F_GETOWN                         = 0x9
-	F_GETOWN_EX                      = 0x10
-	F_GETPIPE_SZ                     = 0x408
-	F_GETSIG                         = 0xb
-	F_LOCK                           = 0x1
-	F_NOTIFY                         = 0x402
-	F_OFD_GETLK                      = 0x24
-	F_OFD_SETLK                      = 0x25
-	F_OFD_SETLKW                     = 0x26
-	F_OK                             = 0x0
-	F_RDLCK                          = 0x0
-	F_SETFD                          = 0x2
-	F_SETFL                          = 0x4
-	F_SETLEASE                       = 0x400
-	F_SETLK                          = 0x6
-	F_SETLK64                        = 0x6
-	F_SETLKW                         = 0x7
-	F_SETLKW64                       = 0x7
-	F_SETOWN                         = 0x8
-	F_SETOWN_EX                      = 0xf
-	F_SETPIPE_SZ                     = 0x407
-	F_SETSIG                         = 0xa
-	F_SHLCK                          = 0x8
-	F_TEST                           = 0x3
-	F_TLOCK                          = 0x2
-	F_ULOCK                          = 0x0
-	F_UNLCK                          = 0x2
-	F_WRLCK                          = 0x1
-	GRND_NONBLOCK                    = 0x1
-	GRND_RANDOM                      = 0x2
-	HUPCL                            = 0x400
-	IBSHIFT                          = 0x10
-	ICANON                           = 0x2
-	ICMPV6_FILTER                    = 0x1
-	ICRNL                            = 0x100
-	IEXTEN                           = 0x8000
-	IFA_F_DADFAILED                  = 0x8
-	IFA_F_DEPRECATED                 = 0x20
-	IFA_F_HOMEADDRESS                = 0x10
-	IFA_F_MANAGETEMPADDR             = 0x100
-	IFA_F_MCAUTOJOIN                 = 0x400
-	IFA_F_NODAD                      = 0x2
-	IFA_F_NOPREFIXROUTE              = 0x200
-	IFA_F_OPTIMISTIC                 = 0x4
-	IFA_F_PERMANENT                  = 0x80
-	IFA_F_SECONDARY                  = 0x1
-	IFA_F_STABLE_PRIVACY             = 0x800
-	IFA_F_TEMPORARY                  = 0x1
-	IFA_F_TENTATIVE                  = 0x40
-	IFA_MAX                          = 0x8
-	IFF_ALLMULTI                     = 0x200
-	IFF_ATTACH_QUEUE                 = 0x200
-	IFF_AUTOMEDIA                    = 0x4000
-	IFF_BROADCAST                    = 0x2
-	IFF_DEBUG                        = 0x4
-	IFF_DETACH_QUEUE                 = 0x400
-	IFF_DORMANT                      = 0x20000
-	IFF_DYNAMIC                      = 0x8000
-	IFF_ECHO                         = 0x40000
-	IFF_LOOPBACK                     = 0x8
-	IFF_LOWER_UP                     = 0x10000
-	IFF_MASTER                       = 0x400
-	IFF_MULTICAST                    = 0x1000
-	IFF_MULTI_QUEUE                  = 0x100
-	IFF_NOARP                        = 0x80
-	IFF_NOFILTER                     = 0x1000
-	IFF_NOTRAILERS                   = 0x20
-	IFF_NO_PI                        = 0x1000
-	IFF_ONE_QUEUE                    = 0x2000
-	IFF_PERSIST                      = 0x800
-	IFF_POINTOPOINT                  = 0x10
-	IFF_PORTSEL                      = 0x2000
-	IFF_PROMISC                      = 0x100
-	IFF_RUNNING                      = 0x40
-	IFF_SLAVE                        = 0x800
-	IFF_TAP                          = 0x2
-	IFF_TUN                          = 0x1
-	IFF_TUN_EXCL                     = 0x8000
-	IFF_UP                           = 0x1
-	IFF_VNET_HDR                     = 0x4000
-	IFF_VOLATILE                     = 0x70c5a
-	IFNAMSIZ                         = 0x10
-	IGNBRK                           = 0x1
-	IGNCR                            = 0x80
-	IGNPAR                           = 0x4
-	IMAXBEL                          = 0x2000
-	INLCR                            = 0x40
-	INPCK                            = 0x10
-	IN_ACCESS                        = 0x1
-	IN_ALL_EVENTS                    = 0xfff
-	IN_ATTRIB                        = 0x4
-	IN_CLASSA_HOST                   = 0xffffff
-	IN_CLASSA_MAX                    = 0x80
-	IN_CLASSA_NET                    = 0xff000000
-	IN_CLASSA_NSHIFT                 = 0x18
-	IN_CLASSB_HOST                   = 0xffff
-	IN_CLASSB_MAX                    = 0x10000
-	IN_CLASSB_NET                    = 0xffff0000
-	IN_CLASSB_NSHIFT                 = 0x10
-	IN_CLASSC_HOST                   = 0xff
-	IN_CLASSC_NET                    = 0xffffff00
-	IN_CLASSC_NSHIFT                 = 0x8
-	IN_CLOEXEC                       = 0x80000
-	IN_CLOSE                         = 0x18
-	IN_CLOSE_NOWRITE                 = 0x10
-	IN_CLOSE_WRITE                   = 0x8
-	IN_CREATE                        = 0x100
-	IN_DELETE                        = 0x200
-	IN_DELETE_SELF                   = 0x400
-	IN_DONT_FOLLOW                   = 0x2000000
-	IN_EXCL_UNLINK                   = 0x4000000
-	IN_IGNORED                       = 0x8000
-	IN_ISDIR                         = 0x40000000
-	IN_LOOPBACKNET                   = 0x7f
-	IN_MASK_ADD                      = 0x20000000
-	IN_MODIFY                        = 0x2
-	IN_MOVE                          = 0xc0
-	IN_MOVED_FROM                    = 0x40
-	IN_MOVED_TO                      = 0x80
-	IN_MOVE_SELF                     = 0x800
-	IN_NONBLOCK                      = 0x800
-	IN_ONESHOT                       = 0x80000000
-	IN_ONLYDIR                       = 0x1000000
-	IN_OPEN                          = 0x20
-	IN_Q_OVERFLOW                    = 0x4000
-	IN_UNMOUNT                       = 0x2000
-	IPPROTO_AH                       = 0x33
-	IPPROTO_BEETPH                   = 0x5e
-	IPPROTO_COMP                     = 0x6c
-	IPPROTO_DCCP                     = 0x21
-	IPPROTO_DSTOPTS                  = 0x3c
-	IPPROTO_EGP                      = 0x8
-	IPPROTO_ENCAP                    = 0x62
-	IPPROTO_ESP                      = 0x32
-	IPPROTO_FRAGMENT                 = 0x2c
-	IPPROTO_GRE                      = 0x2f
-	IPPROTO_HOPOPTS                  = 0x0
-	IPPROTO_ICMP                     = 0x1
-	IPPROTO_ICMPV6                   = 0x3a
-	IPPROTO_IDP                      = 0x16
-	IPPROTO_IGMP                     = 0x2
-	IPPROTO_IP                       = 0x0
-	IPPROTO_IPIP                     = 0x4
-	IPPROTO_IPV6                     = 0x29
-	IPPROTO_MH                       = 0x87
-	IPPROTO_MPLS                     = 0x89
-	IPPROTO_MTP                      = 0x5c
-	IPPROTO_NONE                     = 0x3b
-	IPPROTO_PIM                      = 0x67
-	IPPROTO_PUP                      = 0xc
-	IPPROTO_RAW                      = 0xff
-	IPPROTO_ROUTING                  = 0x2b
-	IPPROTO_RSVP                     = 0x2e
-	IPPROTO_SCTP                     = 0x84
-	IPPROTO_TCP                      = 0x6
-	IPPROTO_TP                       = 0x1d
-	IPPROTO_UDP                      = 0x11
-	IPPROTO_UDPLITE                  = 0x88
-	IPV6_2292DSTOPTS                 = 0x4
-	IPV6_2292HOPLIMIT                = 0x8
-	IPV6_2292HOPOPTS                 = 0x3
-	IPV6_2292PKTINFO                 = 0x2
-	IPV6_2292PKTOPTIONS              = 0x6
-	IPV6_2292RTHDR                   = 0x5
-	IPV6_ADDRFORM                    = 0x1
-	IPV6_ADD_MEMBERSHIP              = 0x14
-	IPV6_AUTHHDR                     = 0xa
-	IPV6_CHECKSUM                    = 0x7
-	IPV6_DONTFRAG                    = 0x3e
-	IPV6_DROP_MEMBERSHIP             = 0x15
-	IPV6_DSTOPTS                     = 0x3b
-	IPV6_HOPLIMIT                    = 0x34
-	IPV6_HOPOPTS                     = 0x36
-	IPV6_IPSEC_POLICY                = 0x22
-	IPV6_JOIN_ANYCAST                = 0x1b
-	IPV6_JOIN_GROUP                  = 0x14
-	IPV6_LEAVE_ANYCAST               = 0x1c
-	IPV6_LEAVE_GROUP                 = 0x15
-	IPV6_MTU                         = 0x18
-	IPV6_MTU_DISCOVER                = 0x17
-	IPV6_MULTICAST_HOPS              = 0x12
-	IPV6_MULTICAST_IF                = 0x11
-	IPV6_MULTICAST_LOOP              = 0x13
-	IPV6_NEXTHOP                     = 0x9
-	IPV6_PATHMTU                     = 0x3d
-	IPV6_PKTINFO                     = 0x32
-	IPV6_PMTUDISC_DO                 = 0x2
-	IPV6_PMTUDISC_DONT               = 0x0
-	IPV6_PMTUDISC_INTERFACE          = 0x4
-	IPV6_PMTUDISC_OMIT               = 0x5
-	IPV6_PMTUDISC_PROBE              = 0x3
-	IPV6_PMTUDISC_WANT               = 0x1
-	IPV6_RECVDSTOPTS                 = 0x3a
-	IPV6_RECVERR                     = 0x19
-	IPV6_RECVHOPLIMIT                = 0x33
-	IPV6_RECVHOPOPTS                 = 0x35
-	IPV6_RECVPATHMTU                 = 0x3c
-	IPV6_RECVPKTINFO                 = 0x31
-	IPV6_RECVRTHDR                   = 0x38
-	IPV6_RECVTCLASS                  = 0x42
-	IPV6_ROUTER_ALERT                = 0x16
-	IPV6_RTHDR                       = 0x39
-	IPV6_RTHDRDSTOPTS                = 0x37
-	IPV6_RTHDR_LOOSE                 = 0x0
-	IPV6_RTHDR_STRICT                = 0x1
-	IPV6_RTHDR_TYPE_0                = 0x0
-	IPV6_RXDSTOPTS                   = 0x3b
-	IPV6_RXHOPOPTS                   = 0x36
-	IPV6_TCLASS                      = 0x43
-	IPV6_UNICAST_HOPS                = 0x10
-	IPV6_V6ONLY                      = 0x1a
-	IPV6_XFRM_POLICY                 = 0x23
-	IP_ADD_MEMBERSHIP                = 0x23
-	IP_ADD_SOURCE_MEMBERSHIP         = 0x27
-	IP_BIND_ADDRESS_NO_PORT          = 0x18
-	IP_BLOCK_SOURCE                  = 0x26
-	IP_CHECKSUM                      = 0x17
-	IP_DEFAULT_MULTICAST_LOOP        = 0x1
-	IP_DEFAULT_MULTICAST_TTL         = 0x1
-	IP_DF                            = 0x4000
-	IP_DROP_MEMBERSHIP               = 0x24
-	IP_DROP_SOURCE_MEMBERSHIP        = 0x28
-	IP_FREEBIND                      = 0xf
-	IP_HDRINCL                       = 0x3
-	IP_IPSEC_POLICY                  = 0x10
-	IP_MAXPACKET                     = 0xffff
-	IP_MAX_MEMBERSHIPS               = 0x14
-	IP_MF                            = 0x2000
-	IP_MINTTL                        = 0x15
-	IP_MSFILTER                      = 0x29
-	IP_MSS                           = 0x240
-	IP_MTU                           = 0xe
-	IP_MTU_DISCOVER                  = 0xa
-	IP_MULTICAST_ALL                 = 0x31
-	IP_MULTICAST_IF                  = 0x20
-	IP_MULTICAST_LOOP                = 0x22
-	IP_MULTICAST_TTL                 = 0x21
-	IP_NODEFRAG                      = 0x16
-	IP_OFFMASK                       = 0x1fff
-	IP_OPTIONS                       = 0x4
-	IP_ORIGDSTADDR                   = 0x14
-	IP_PASSSEC                       = 0x12
-	IP_PKTINFO                       = 0x8
-	IP_PKTOPTIONS                    = 0x9
-	IP_PMTUDISC                      = 0xa
-	IP_PMTUDISC_DO                   = 0x2
-	IP_PMTUDISC_DONT                 = 0x0
-	IP_PMTUDISC_INTERFACE            = 0x4
-	IP_PMTUDISC_OMIT                 = 0x5
-	IP_PMTUDISC_PROBE                = 0x3
-	IP_PMTUDISC_WANT                 = 0x1
-	IP_RECVERR                       = 0xb
-	IP_RECVOPTS                      = 0x6
-	IP_RECVORIGDSTADDR               = 0x14
-	IP_RECVRETOPTS                   = 0x7
-	IP_RECVTOS                       = 0xd
-	IP_RECVTTL                       = 0xc
-	IP_RETOPTS                       = 0x7
-	IP_RF                            = 0x8000
-	IP_ROUTER_ALERT                  = 0x5
-	IP_TOS                           = 0x1
-	IP_TRANSPARENT                   = 0x13
-	IP_TTL                           = 0x2
-	IP_UNBLOCK_SOURCE                = 0x25
-	IP_UNICAST_IF                    = 0x32
-	IP_XFRM_POLICY                   = 0x11
-	ISIG                             = 0x1
-	ISTRIP                           = 0x20
-	IUCLC                            = 0x200
-	IUTF8                            = 0x4000
-	IXANY                            = 0x800
-	IXOFF                            = 0x1000
-	IXON                             = 0x400
-	LINUX_REBOOT_CMD_CAD_OFF         = 0x0
-	LINUX_REBOOT_CMD_CAD_ON          = 0x89abcdef
-	LINUX_REBOOT_CMD_HALT            = 0xcdef0123
-	LINUX_REBOOT_CMD_KEXEC           = 0x45584543
-	LINUX_REBOOT_CMD_POWER_OFF       = 0x4321fedc
-	LINUX_REBOOT_CMD_RESTART         = 0x1234567
-	LINUX_REBOOT_CMD_RESTART2        = 0xa1b2c3d4
-	LINUX_REBOOT_CMD_SW_SUSPEND      = 0xd000fce2
-	LINUX_REBOOT_MAGIC1              = 0xfee1dead
-	LINUX_REBOOT_MAGIC2              = 0x28121969
-	LOCK_EX                          = 0x2
-	LOCK_NB                          = 0x4
-	LOCK_SH                          = 0x1
-	LOCK_UN                          = 0x8
-	MADV_DODUMP                      = 0x11
-	MADV_DOFORK                      = 0xb
-	MADV_DONTDUMP                    = 0x10
-	MADV_DONTFORK                    = 0xa
-	MADV_DONTNEED                    = 0x4
-	MADV_HUGEPAGE                    = 0xe
-	MADV_HWPOISON                    = 0x64
-	MADV_MERGEABLE                   = 0xc
-	MADV_NOHUGEPAGE                  = 0xf
-	MADV_NORMAL                      = 0x0
-	MADV_RANDOM                      = 0x1
-	MADV_REMOVE                      = 0x9
-	MADV_SEQUENTIAL                  = 0x2
-	MADV_UNMERGEABLE                 = 0xd
-	MADV_WILLNEED                    = 0x3
-	MAP_ANON                         = 0x20
-	MAP_ANONYMOUS                    = 0x20
-	MAP_DENYWRITE                    = 0x800
-	MAP_EXECUTABLE                   = 0x1000
-	MAP_FILE                         = 0x0
-	MAP_FIXED                        = 0x10
-	MAP_GROWSDOWN                    = 0x100
-	MAP_HUGETLB                      = 0x40000
-	MAP_HUGE_MASK                    = 0x3f
-	MAP_HUGE_SHIFT                   = 0x1a
-	MAP_LOCKED                       = 0x2000
-	MAP_NONBLOCK                     = 0x10000
-	MAP_NORESERVE                    = 0x4000
-	MAP_POPULATE                     = 0x8000
-	MAP_PRIVATE                      = 0x2
-	MAP_SHARED                       = 0x1
-	MAP_STACK                        = 0x20000
-	MAP_TYPE                         = 0xf
-	MCL_CURRENT                      = 0x1
-	MCL_FUTURE                       = 0x2
-	MCL_ONFAULT                      = 0x4
-	MNT_DETACH                       = 0x2
-	MNT_EXPIRE                       = 0x4
-	MNT_FORCE                        = 0x1
-	MSG_CMSG_CLOEXEC                 = 0x40000000
-	MSG_CONFIRM                      = 0x800
-	MSG_CTRUNC                       = 0x8
-	MSG_DONTROUTE                    = 0x4
-	MSG_DONTWAIT                     = 0x40
-	MSG_EOR                          = 0x80
-	MSG_ERRQUEUE                     = 0x2000
-	MSG_FASTOPEN                     = 0x20000000
-	MSG_FIN                          = 0x200
-	MSG_MORE                         = 0x8000
-	MSG_NOSIGNAL                     = 0x4000
-	MSG_OOB                          = 0x1
-	MSG_PEEK                         = 0x2
-	MSG_PROXY                        = 0x10
-	MSG_RST                          = 0x1000
-	MSG_SYN                          = 0x400
-	MSG_TRUNC                        = 0x20
-	MSG_TRYHARD                      = 0x4
-	MSG_WAITALL                      = 0x100
-	MSG_WAITFORONE                   = 0x10000
-	MS_ACTIVE                        = 0x40000000
-	MS_ASYNC                         = 0x1
-	MS_BIND                          = 0x1000
-	MS_DIRSYNC                       = 0x80
-	MS_INVALIDATE                    = 0x2
-	MS_I_VERSION                     = 0x800000
-	MS_KERNMOUNT                     = 0x400000
-	MS_LAZYTIME                      = 0x2000000
-	MS_MANDLOCK                      = 0x40
-	MS_MGC_MSK                       = 0xffff0000
-	MS_MGC_VAL                       = 0xc0ed0000
-	MS_MOVE                          = 0x2000
-	MS_NOATIME                       = 0x400
-	MS_NODEV                         = 0x4
-	MS_NODIRATIME                    = 0x800
-	MS_NOEXEC                        = 0x8
-	MS_NOSUID                        = 0x2
-	MS_NOUSER                        = -0x80000000
-	MS_POSIXACL                      = 0x10000
-	MS_PRIVATE                       = 0x40000
-	MS_RDONLY                        = 0x1
-	MS_REC                           = 0x4000
-	MS_RELATIME                      = 0x200000
-	MS_REMOUNT                       = 0x20
-	MS_RMT_MASK                      = 0x2800051
-	MS_SHARED                        = 0x100000
-	MS_SILENT                        = 0x8000
-	MS_SLAVE                         = 0x80000
-	MS_STRICTATIME                   = 0x1000000
-	MS_SYNC                          = 0x4
-	MS_SYNCHRONOUS                   = 0x10
-	MS_UNBINDABLE                    = 0x20000
-	NAME_MAX                         = 0xff
-	NETLINK_ADD_MEMBERSHIP           = 0x1
-	NETLINK_AUDIT                    = 0x9
-	NETLINK_BROADCAST_ERROR          = 0x4
-	NETLINK_CAP_ACK                  = 0xa
-	NETLINK_CONNECTOR                = 0xb
-	NETLINK_CRYPTO                   = 0x15
-	NETLINK_DNRTMSG                  = 0xe
-	NETLINK_DROP_MEMBERSHIP          = 0x2
-	NETLINK_ECRYPTFS                 = 0x13
-	NETLINK_FIB_LOOKUP               = 0xa
-	NETLINK_FIREWALL                 = 0x3
-	NETLINK_GENERIC                  = 0x10
-	NETLINK_INET_DIAG                = 0x4
-	NETLINK_IP6_FW                   = 0xd
-	NETLINK_ISCSI                    = 0x8
-	NETLINK_KOBJECT_UEVENT           = 0xf
-	NETLINK_LISTEN_ALL_NSID          = 0x8
-	NETLINK_LIST_MEMBERSHIPS         = 0x9
-	NETLINK_NETFILTER                = 0xc
-	NETLINK_NFLOG                    = 0x5
-	NETLINK_NO_ENOBUFS               = 0x5
-	NETLINK_PKTINFO                  = 0x3
-	NETLINK_RDMA                     = 0x14
-	NETLINK_ROUTE                    = 0x0
-	NETLINK_RX_RING                  = 0x6
-	NETLINK_SCSITRANSPORT            = 0x12
-	NETLINK_SELINUX                  = 0x7
-	NETLINK_SOCK_DIAG                = 0x4
-	NETLINK_TX_RING                  = 0x7
-	NETLINK_UNUSED                   = 0x1
-	NETLINK_USERSOCK                 = 0x2
-	NETLINK_XFRM                     = 0x6
-	NL0                              = 0x0
-	NL1                              = 0x100
-	NLA_ALIGNTO                      = 0x4
-	NLA_F_NESTED                     = 0x8000
-	NLA_F_NET_BYTEORDER              = 0x4000
-	NLA_HDRLEN                       = 0x4
-	NLDLY                            = 0x100
-	NLMSG_ALIGNTO                    = 0x4
-	NLMSG_DONE                       = 0x3
-	NLMSG_ERROR                      = 0x2
-	NLMSG_HDRLEN                     = 0x10
-	NLMSG_MIN_TYPE                   = 0x10
-	NLMSG_NOOP                       = 0x1
-	NLMSG_OVERRUN                    = 0x4
-	NLM_F_ACK                        = 0x4
-	NLM_F_APPEND                     = 0x800
-	NLM_F_ATOMIC                     = 0x400
-	NLM_F_CREATE                     = 0x400
-	NLM_F_DUMP                       = 0x300
-	NLM_F_DUMP_FILTERED              = 0x20
-	NLM_F_DUMP_INTR                  = 0x10
-	NLM_F_ECHO                       = 0x8
-	NLM_F_EXCL                       = 0x200
-	NLM_F_MATCH                      = 0x200
-	NLM_F_MULTI                      = 0x2
-	NLM_F_REPLACE                    = 0x100
-	NLM_F_REQUEST                    = 0x1
-	NLM_F_ROOT                       = 0x100
-	NOFLSH                           = 0x80
-	OCRNL                            = 0x8
-	OFDEL                            = 0x80
-	OFILL                            = 0x40
-	OLCUC                            = 0x2
-	ONLCR                            = 0x4
-	ONLRET                           = 0x20
-	ONOCR                            = 0x10
-	OPOST                            = 0x1
-	O_ACCMODE                        = 0x3
-	O_APPEND                         = 0x400
-	O_ASYNC                          = 0x2000
-	O_CLOEXEC                        = 0x80000
-	O_CREAT                          = 0x40
-	O_DIRECT                         = 0x4000
-	O_DIRECTORY                      = 0x10000
-	O_DSYNC                          = 0x1000
-	O_EXCL                           = 0x80
-	O_FSYNC                          = 0x101000
-	O_LARGEFILE                      = 0x0
-	O_NDELAY                         = 0x800
-	O_NOATIME                        = 0x40000
-	O_NOCTTY                         = 0x100
-	O_NOFOLLOW                       = 0x20000
-	O_NONBLOCK                       = 0x800
-	O_PATH                           = 0x200000
-	O_RDONLY                         = 0x0
-	O_RDWR                           = 0x2
-	O_RSYNC                          = 0x101000
-	O_SYNC                           = 0x101000
-	O_TMPFILE                        = 0x410000
-	O_TRUNC                          = 0x200
-	O_WRONLY                         = 0x1
-	PACKET_ADD_MEMBERSHIP            = 0x1
-	PACKET_AUXDATA                   = 0x8
-	PACKET_BROADCAST                 = 0x1
-	PACKET_COPY_THRESH               = 0x7
-	PACKET_DROP_MEMBERSHIP           = 0x2
-	PACKET_FANOUT                    = 0x12
-	PACKET_FANOUT_CBPF               = 0x6
-	PACKET_FANOUT_CPU                = 0x2
-	PACKET_FANOUT_DATA               = 0x16
-	PACKET_FANOUT_EBPF               = 0x7
-	PACKET_FANOUT_FLAG_DEFRAG        = 0x8000
-	PACKET_FANOUT_FLAG_ROLLOVER      = 0x1000
-	PACKET_FANOUT_HASH               = 0x0
-	PACKET_FANOUT_LB                 = 0x1
-	PACKET_FANOUT_QM                 = 0x5
-	PACKET_FANOUT_RND                = 0x4
-	PACKET_FANOUT_ROLLOVER           = 0x3
-	PACKET_FASTROUTE                 = 0x6
-	PACKET_HDRLEN                    = 0xb
-	PACKET_HOST                      = 0x0
-	PACKET_KERNEL                    = 0x7
-	PACKET_LOOPBACK                  = 0x5
-	PACKET_LOSS                      = 0xe
-	PACKET_MR_ALLMULTI               = 0x2
-	PACKET_MR_MULTICAST              = 0x0
-	PACKET_MR_PROMISC                = 0x1
-	PACKET_MR_UNICAST                = 0x3
-	PACKET_MULTICAST                 = 0x2
-	PACKET_ORIGDEV                   = 0x9
-	PACKET_OTHERHOST                 = 0x3
-	PACKET_OUTGOING                  = 0x4
-	PACKET_QDISC_BYPASS              = 0x14
-	PACKET_RECV_OUTPUT               = 0x3
-	PACKET_RESERVE                   = 0xc
-	PACKET_ROLLOVER_STATS            = 0x15
-	PACKET_RX_RING                   = 0x5
-	PACKET_STATISTICS                = 0x6
-	PACKET_TIMESTAMP                 = 0x11
-	PACKET_TX_HAS_OFF                = 0x13
-	PACKET_TX_RING                   = 0xd
-	PACKET_TX_TIMESTAMP              = 0x10
-	PACKET_USER                      = 0x6
-	PACKET_VERSION                   = 0xa
-	PACKET_VNET_HDR                  = 0xf
-	PARENB                           = 0x100
-	PARITY_CRC16_PR0                 = 0x2
-	PARITY_CRC16_PR0_CCITT           = 0x4
-	PARITY_CRC16_PR1                 = 0x3
-	PARITY_CRC16_PR1_CCITT           = 0x5
-	PARITY_CRC32_PR0_CCITT           = 0x6
-	PARITY_CRC32_PR1_CCITT           = 0x7
-	PARITY_DEFAULT                   = 0x0
-	PARITY_NONE                      = 0x1
-	PARMRK                           = 0x8
-	PARODD                           = 0x200
-	PENDIN                           = 0x4000
-	PRIO_PGRP                        = 0x1
-	PRIO_PROCESS                     = 0x0
-	PRIO_USER                        = 0x2
-	PROT_EXEC                        = 0x4
-	PROT_GROWSDOWN                   = 0x1000000
-	PROT_GROWSUP                     = 0x2000000
-	PROT_NONE                        = 0x0
-	PROT_READ                        = 0x1
-	PROT_WRITE                       = 0x2
-	PR_CAPBSET_DROP                  = 0x18
-	PR_CAPBSET_READ                  = 0x17
-	PR_CAP_AMBIENT                   = 0x2f
-	PR_CAP_AMBIENT_CLEAR_ALL         = 0x4
-	PR_CAP_AMBIENT_IS_SET            = 0x1
-	PR_CAP_AMBIENT_LOWER             = 0x3
-	PR_CAP_AMBIENT_RAISE             = 0x2
-	PR_ENDIAN_BIG                    = 0x0
-	PR_ENDIAN_LITTLE                 = 0x1
-	PR_ENDIAN_PPC_LITTLE             = 0x2
-	PR_FPEMU_NOPRINT                 = 0x1
-	PR_FPEMU_SIGFPE                  = 0x2
-	PR_FP_EXC_ASYNC                  = 0x2
-	PR_FP_EXC_DISABLED               = 0x0
-	PR_FP_EXC_DIV                    = 0x10000
-	PR_FP_EXC_INV                    = 0x100000
-	PR_FP_EXC_NONRECOV               = 0x1
-	PR_FP_EXC_OVF                    = 0x20000
-	PR_FP_EXC_PRECISE                = 0x3
-	PR_FP_EXC_RES                    = 0x80000
-	PR_FP_EXC_SW_ENABLE              = 0x80
-	PR_FP_EXC_UND                    = 0x40000
-	PR_FP_MODE_FR                    = 0x1
-	PR_FP_MODE_FRE                   = 0x2
-	PR_GET_CHILD_SUBREAPER           = 0x25
-	PR_GET_DUMPABLE                  = 0x3
-	PR_GET_ENDIAN                    = 0x13
-	PR_GET_FPEMU                     = 0x9
-	PR_GET_FPEXC                     = 0xb
-	PR_GET_FP_MODE                   = 0x2e
-	PR_GET_KEEPCAPS                  = 0x7
-	PR_GET_NAME                      = 0x10
-	PR_GET_NO_NEW_PRIVS              = 0x27
-	PR_GET_PDEATHSIG                 = 0x2
-	PR_GET_SECCOMP                   = 0x15
-	PR_GET_SECUREBITS                = 0x1b
-	PR_GET_THP_DISABLE               = 0x2a
-	PR_GET_TID_ADDRESS               = 0x28
-	PR_GET_TIMERSLACK                = 0x1e
-	PR_GET_TIMING                    = 0xd
-	PR_GET_TSC                       = 0x19
-	PR_GET_UNALIGN                   = 0x5
-	PR_MCE_KILL                      = 0x21
-	PR_MCE_KILL_CLEAR                = 0x0
-	PR_MCE_KILL_DEFAULT              = 0x2
-	PR_MCE_KILL_EARLY                = 0x1
-	PR_MCE_KILL_GET                  = 0x22
-	PR_MCE_KILL_LATE                 = 0x0
-	PR_MCE_KILL_SET                  = 0x1
-	PR_MPX_DISABLE_MANAGEMENT        = 0x2c
-	PR_MPX_ENABLE_MANAGEMENT         = 0x2b
-	PR_SET_CHILD_SUBREAPER           = 0x24
-	PR_SET_DUMPABLE                  = 0x4
-	PR_SET_ENDIAN                    = 0x14
-	PR_SET_FPEMU                     = 0xa
-	PR_SET_FPEXC                     = 0xc
-	PR_SET_FP_MODE                   = 0x2d
-	PR_SET_KEEPCAPS                  = 0x8
-	PR_SET_MM                        = 0x23
-	PR_SET_MM_ARG_END                = 0x9
-	PR_SET_MM_ARG_START              = 0x8
-	PR_SET_MM_AUXV                   = 0xc
-	PR_SET_MM_BRK                    = 0x7
-	PR_SET_MM_END_CODE               = 0x2
-	PR_SET_MM_END_DATA               = 0x4
-	PR_SET_MM_ENV_END                = 0xb
-	PR_SET_MM_ENV_START              = 0xa
-	PR_SET_MM_EXE_FILE               = 0xd
-	PR_SET_MM_MAP                    = 0xe
-	PR_SET_MM_MAP_SIZE               = 0xf
-	PR_SET_MM_START_BRK              = 0x6
-	PR_SET_MM_START_CODE             = 0x1
-	PR_SET_MM_START_DATA             = 0x3
-	PR_SET_MM_START_STACK            = 0x5
-	PR_SET_NAME                      = 0xf
-	PR_SET_NO_NEW_PRIVS              = 0x26
-	PR_SET_PDEATHSIG                 = 0x1
-	PR_SET_PTRACER                   = 0x59616d61
-	PR_SET_PTRACER_ANY               = -0x1
-	PR_SET_SECCOMP                   = 0x16
-	PR_SET_SECUREBITS                = 0x1c
-	PR_SET_THP_DISABLE               = 0x29
-	PR_SET_TIMERSLACK                = 0x1d
-	PR_SET_TIMING                    = 0xe
-	PR_SET_TSC                       = 0x1a
-	PR_SET_UNALIGN                   = 0x6
-	PR_TASK_PERF_EVENTS_DISABLE      = 0x1f
-	PR_TASK_PERF_EVENTS_ENABLE       = 0x20
-	PR_TIMING_STATISTICAL            = 0x0
-	PR_TIMING_TIMESTAMP              = 0x1
-	PR_TSC_ENABLE                    = 0x1
-	PR_TSC_SIGSEGV                   = 0x2
-	PR_UNALIGN_NOPRINT               = 0x1
-	PR_UNALIGN_SIGBUS                = 0x2
-	PTRACE_ATTACH                    = 0x10
-	PTRACE_CONT                      = 0x7
-	PTRACE_DETACH                    = 0x11
-	PTRACE_DISABLE_TE                = 0x5010
-	PTRACE_ENABLE_TE                 = 0x5009
-	PTRACE_EVENT_CLONE               = 0x3
-	PTRACE_EVENT_EXEC                = 0x4
-	PTRACE_EVENT_EXIT                = 0x6
-	PTRACE_EVENT_FORK                = 0x1
-	PTRACE_EVENT_SECCOMP             = 0x7
-	PTRACE_EVENT_STOP                = 0x80
-	PTRACE_EVENT_VFORK               = 0x2
-	PTRACE_EVENT_VFORK_DONE          = 0x5
-	PTRACE_GETEVENTMSG               = 0x4201
-	PTRACE_GETREGS                   = 0xc
-	PTRACE_GETREGSET                 = 0x4204
-	PTRACE_GETSIGINFO                = 0x4202
-	PTRACE_GETSIGMASK                = 0x420a
-	PTRACE_GET_LAST_BREAK            = 0x5006
-	PTRACE_INTERRUPT                 = 0x4207
-	PTRACE_KILL                      = 0x8
-	PTRACE_LISTEN                    = 0x4208
-	PTRACE_OLDSETOPTIONS             = 0x15
-	PTRACE_O_EXITKILL                = 0x100000
-	PTRACE_O_MASK                    = 0x3000ff
-	PTRACE_O_SUSPEND_SECCOMP         = 0x200000
-	PTRACE_O_TRACECLONE              = 0x8
-	PTRACE_O_TRACEEXEC               = 0x10
-	PTRACE_O_TRACEEXIT               = 0x40
-	PTRACE_O_TRACEFORK               = 0x2
-	PTRACE_O_TRACESECCOMP            = 0x80
-	PTRACE_O_TRACESYSGOOD            = 0x1
-	PTRACE_O_TRACEVFORK              = 0x4
-	PTRACE_O_TRACEVFORKDONE          = 0x20
-	PTRACE_PEEKDATA                  = 0x2
-	PTRACE_PEEKDATA_AREA             = 0x5003
-	PTRACE_PEEKSIGINFO               = 0x4209
-	PTRACE_PEEKSIGINFO_SHARED        = 0x1
-	PTRACE_PEEKTEXT                  = 0x1
-	PTRACE_PEEKTEXT_AREA             = 0x5002
-	PTRACE_PEEKUSR                   = 0x3
-	PTRACE_PEEKUSR_AREA              = 0x5000
-	PTRACE_PEEK_SYSTEM_CALL          = 0x5007
-	PTRACE_POKEDATA                  = 0x5
-	PTRACE_POKEDATA_AREA             = 0x5005
-	PTRACE_POKETEXT                  = 0x4
-	PTRACE_POKETEXT_AREA             = 0x5004
-	PTRACE_POKEUSR                   = 0x6
-	PTRACE_POKEUSR_AREA              = 0x5001
-	PTRACE_POKE_SYSTEM_CALL          = 0x5008
-	PTRACE_PROT                      = 0x15
-	PTRACE_SECCOMP_GET_FILTER        = 0x420c
-	PTRACE_SEIZE                     = 0x4206
-	PTRACE_SETOPTIONS                = 0x4200
-	PTRACE_SETREGS                   = 0xd
-	PTRACE_SETREGSET                 = 0x4205
-	PTRACE_SETSIGINFO                = 0x4203
-	PTRACE_SETSIGMASK                = 0x420b
-	PTRACE_SINGLEBLOCK               = 0xc
-	PTRACE_SINGLESTEP                = 0x9
-	PTRACE_SYSCALL                   = 0x18
-	PTRACE_TE_ABORT_RAND             = 0x5011
-	PTRACE_TRACEME                   = 0x0
-	PT_ACR0                          = 0x90
-	PT_ACR1                          = 0x94
-	PT_ACR10                         = 0xb8
-	PT_ACR11                         = 0xbc
-	PT_ACR12                         = 0xc0
-	PT_ACR13                         = 0xc4
-	PT_ACR14                         = 0xc8
-	PT_ACR15                         = 0xcc
-	PT_ACR2                          = 0x98
-	PT_ACR3                          = 0x9c
-	PT_ACR4                          = 0xa0
-	PT_ACR5                          = 0xa4
-	PT_ACR6                          = 0xa8
-	PT_ACR7                          = 0xac
-	PT_ACR8                          = 0xb0
-	PT_ACR9                          = 0xb4
-	PT_CR_10                         = 0x168
-	PT_CR_11                         = 0x170
-	PT_CR_9                          = 0x160
-	PT_ENDREGS                       = 0x1af
-	PT_FPC                           = 0xd8
-	PT_FPR0                          = 0xe0
-	PT_FPR1                          = 0xe8
-	PT_FPR10                         = 0x130
-	PT_FPR11                         = 0x138
-	PT_FPR12                         = 0x140
-	PT_FPR13                         = 0x148
-	PT_FPR14                         = 0x150
-	PT_FPR15                         = 0x158
-	PT_FPR2                          = 0xf0
-	PT_FPR3                          = 0xf8
-	PT_FPR4                          = 0x100
-	PT_FPR5                          = 0x108
-	PT_FPR6                          = 0x110
-	PT_FPR7                          = 0x118
-	PT_FPR8                          = 0x120
-	PT_FPR9                          = 0x128
-	PT_GPR0                          = 0x10
-	PT_GPR1                          = 0x18
-	PT_GPR10                         = 0x60
-	PT_GPR11                         = 0x68
-	PT_GPR12                         = 0x70
-	PT_GPR13                         = 0x78
-	PT_GPR14                         = 0x80
-	PT_GPR15                         = 0x88
-	PT_GPR2                          = 0x20
-	PT_GPR3                          = 0x28
-	PT_GPR4                          = 0x30
-	PT_GPR5                          = 0x38
-	PT_GPR6                          = 0x40
-	PT_GPR7                          = 0x48
-	PT_GPR8                          = 0x50
-	PT_GPR9                          = 0x58
-	PT_IEEE_IP                       = 0x1a8
-	PT_LASTOFF                       = 0x1a8
-	PT_ORIGGPR2                      = 0xd0
-	PT_PSWADDR                       = 0x8
-	PT_PSWMASK                       = 0x0
-	RLIMIT_AS                        = 0x9
-	RLIMIT_CORE                      = 0x4
-	RLIMIT_CPU                       = 0x0
-	RLIMIT_DATA                      = 0x2
-	RLIMIT_FSIZE                     = 0x1
-	RLIMIT_NOFILE                    = 0x7
-	RLIMIT_STACK                     = 0x3
-	RLIM_INFINITY                    = -0x1
-	RTAX_ADVMSS                      = 0x8
-	RTAX_CC_ALGO                     = 0x10
-	RTAX_CWND                        = 0x7
-	RTAX_FEATURES                    = 0xc
-	RTAX_FEATURE_ALLFRAG             = 0x8
-	RTAX_FEATURE_ECN                 = 0x1
-	RTAX_FEATURE_MASK                = 0xf
-	RTAX_FEATURE_SACK                = 0x2
-	RTAX_FEATURE_TIMESTAMP           = 0x4
-	RTAX_HOPLIMIT                    = 0xa
-	RTAX_INITCWND                    = 0xb
-	RTAX_INITRWND                    = 0xe
-	RTAX_LOCK                        = 0x1
-	RTAX_MAX                         = 0x10
-	RTAX_MTU                         = 0x2
-	RTAX_QUICKACK                    = 0xf
-	RTAX_REORDERING                  = 0x9
-	RTAX_RTO_MIN                     = 0xd
-	RTAX_RTT                         = 0x4
-	RTAX_RTTVAR                      = 0x5
-	RTAX_SSTHRESH                    = 0x6
-	RTAX_UNSPEC                      = 0x0
-	RTAX_WINDOW                      = 0x3
-	RTA_ALIGNTO                      = 0x4
-	RTA_MAX                          = 0x16
-	RTCF_DIRECTSRC                   = 0x4000000
-	RTCF_DOREDIRECT                  = 0x1000000
-	RTCF_LOG                         = 0x2000000
-	RTCF_MASQ                        = 0x400000
-	RTCF_NAT                         = 0x800000
-	RTCF_VALVE                       = 0x200000
-	RTF_ADDRCLASSMASK                = 0xf8000000
-	RTF_ADDRCONF                     = 0x40000
-	RTF_ALLONLINK                    = 0x20000
-	RTF_BROADCAST                    = 0x10000000
-	RTF_CACHE                        = 0x1000000
-	RTF_DEFAULT                      = 0x10000
-	RTF_DYNAMIC                      = 0x10
-	RTF_FLOW                         = 0x2000000
-	RTF_GATEWAY                      = 0x2
-	RTF_HOST                         = 0x4
-	RTF_INTERFACE                    = 0x40000000
-	RTF_IRTT                         = 0x100
-	RTF_LINKRT                       = 0x100000
-	RTF_LOCAL                        = 0x80000000
-	RTF_MODIFIED                     = 0x20
-	RTF_MSS                          = 0x40
-	RTF_MTU                          = 0x40
-	RTF_MULTICAST                    = 0x20000000
-	RTF_NAT                          = 0x8000000
-	RTF_NOFORWARD                    = 0x1000
-	RTF_NONEXTHOP                    = 0x200000
-	RTF_NOPMTUDISC                   = 0x4000
-	RTF_POLICY                       = 0x4000000
-	RTF_REINSTATE                    = 0x8
-	RTF_REJECT                       = 0x200
-	RTF_STATIC                       = 0x400
-	RTF_THROW                        = 0x2000
-	RTF_UP                           = 0x1
-	RTF_WINDOW                       = 0x80
-	RTF_XRESOLVE                     = 0x800
-	RTM_BASE                         = 0x10
-	RTM_DELACTION                    = 0x31
-	RTM_DELADDR                      = 0x15
-	RTM_DELADDRLABEL                 = 0x49
-	RTM_DELLINK                      = 0x11
-	RTM_DELMDB                       = 0x55
-	RTM_DELNEIGH                     = 0x1d
-	RTM_DELNSID                      = 0x59
-	RTM_DELQDISC                     = 0x25
-	RTM_DELROUTE                     = 0x19
-	RTM_DELRULE                      = 0x21
-	RTM_DELTCLASS                    = 0x29
-	RTM_DELTFILTER                   = 0x2d
-	RTM_F_CLONED                     = 0x200
-	RTM_F_EQUALIZE                   = 0x400
-	RTM_F_LOOKUP_TABLE               = 0x1000
-	RTM_F_NOTIFY                     = 0x100
-	RTM_F_PREFIX                     = 0x800
-	RTM_GETACTION                    = 0x32
-	RTM_GETADDR                      = 0x16
-	RTM_GETADDRLABEL                 = 0x4a
-	RTM_GETANYCAST                   = 0x3e
-	RTM_GETDCB                       = 0x4e
-	RTM_GETLINK                      = 0x12
-	RTM_GETMDB                       = 0x56
-	RTM_GETMULTICAST                 = 0x3a
-	RTM_GETNEIGH                     = 0x1e
-	RTM_GETNEIGHTBL                  = 0x42
-	RTM_GETNETCONF                   = 0x52
-	RTM_GETNSID                      = 0x5a
-	RTM_GETQDISC                     = 0x26
-	RTM_GETROUTE                     = 0x1a
-	RTM_GETRULE                      = 0x22
-	RTM_GETTCLASS                    = 0x2a
-	RTM_GETTFILTER                   = 0x2e
-	RTM_MAX                          = 0x5b
-	RTM_NEWACTION                    = 0x30
-	RTM_NEWADDR                      = 0x14
-	RTM_NEWADDRLABEL                 = 0x48
-	RTM_NEWLINK                      = 0x10
-	RTM_NEWMDB                       = 0x54
-	RTM_NEWNDUSEROPT                 = 0x44
-	RTM_NEWNEIGH                     = 0x1c
-	RTM_NEWNEIGHTBL                  = 0x40
-	RTM_NEWNETCONF                   = 0x50
-	RTM_NEWNSID                      = 0x58
-	RTM_NEWPREFIX                    = 0x34
-	RTM_NEWQDISC                     = 0x24
-	RTM_NEWROUTE                     = 0x18
-	RTM_NEWRULE                      = 0x20
-	RTM_NEWTCLASS                    = 0x28
-	RTM_NEWTFILTER                   = 0x2c
-	RTM_NR_FAMILIES                  = 0x13
-	RTM_NR_MSGTYPES                  = 0x4c
-	RTM_SETDCB                       = 0x4f
-	RTM_SETLINK                      = 0x13
-	RTM_SETNEIGHTBL                  = 0x43
-	RTNH_ALIGNTO                     = 0x4
-	RTNH_COMPARE_MASK                = 0x11
-	RTNH_F_DEAD                      = 0x1
-	RTNH_F_LINKDOWN                  = 0x10
-	RTNH_F_OFFLOAD                   = 0x8
-	RTNH_F_ONLINK                    = 0x4
-	RTNH_F_PERVASIVE                 = 0x2
-	RTN_MAX                          = 0xb
-	RTPROT_BABEL                     = 0x2a
-	RTPROT_BIRD                      = 0xc
-	RTPROT_BOOT                      = 0x3
-	RTPROT_DHCP                      = 0x10
-	RTPROT_DNROUTED                  = 0xd
-	RTPROT_GATED                     = 0x8
-	RTPROT_KERNEL                    = 0x2
-	RTPROT_MROUTED                   = 0x11
-	RTPROT_MRT                       = 0xa
-	RTPROT_NTK                       = 0xf
-	RTPROT_RA                        = 0x9
-	RTPROT_REDIRECT                  = 0x1
-	RTPROT_STATIC                    = 0x4
-	RTPROT_UNSPEC                    = 0x0
-	RTPROT_XORP                      = 0xe
-	RTPROT_ZEBRA                     = 0xb
-	RT_CLASS_DEFAULT                 = 0xfd
-	RT_CLASS_LOCAL                   = 0xff
-	RT_CLASS_MAIN                    = 0xfe
-	RT_CLASS_MAX                     = 0xff
-	RT_CLASS_UNSPEC                  = 0x0
-	RUSAGE_CHILDREN                  = -0x1
-	RUSAGE_SELF                      = 0x0
-	RUSAGE_THREAD                    = 0x1
-	SCM_CREDENTIALS                  = 0x2
-	SCM_RIGHTS                       = 0x1
-	SCM_TIMESTAMP                    = 0x1d
-	SCM_TIMESTAMPING                 = 0x25
-	SCM_TIMESTAMPNS                  = 0x23
-	SCM_WIFI_STATUS                  = 0x29
-	SHUT_RD                          = 0x0
-	SHUT_RDWR                        = 0x2
-	SHUT_WR                          = 0x1
-	SIOCADDDLCI                      = 0x8980
-	SIOCADDMULTI                     = 0x8931
-	SIOCADDRT                        = 0x890b
-	SIOCATMARK                       = 0x8905
-	SIOCDARP                         = 0x8953
-	SIOCDELDLCI                      = 0x8981
-	SIOCDELMULTI                     = 0x8932
-	SIOCDELRT                        = 0x890c
-	SIOCDEVPRIVATE                   = 0x89f0
-	SIOCDIFADDR                      = 0x8936
-	SIOCDRARP                        = 0x8960
-	SIOCGARP                         = 0x8954
-	SIOCGIFADDR                      = 0x8915
-	SIOCGIFBR                        = 0x8940
-	SIOCGIFBRDADDR                   = 0x8919
-	SIOCGIFCONF                      = 0x8912
-	SIOCGIFCOUNT                     = 0x8938
-	SIOCGIFDSTADDR                   = 0x8917
-	SIOCGIFENCAP                     = 0x8925
-	SIOCGIFFLAGS                     = 0x8913
-	SIOCGIFHWADDR                    = 0x8927
-	SIOCGIFINDEX                     = 0x8933
-	SIOCGIFMAP                       = 0x8970
-	SIOCGIFMEM                       = 0x891f
-	SIOCGIFMETRIC                    = 0x891d
-	SIOCGIFMTU                       = 0x8921
-	SIOCGIFNAME                      = 0x8910
-	SIOCGIFNETMASK                   = 0x891b
-	SIOCGIFPFLAGS                    = 0x8935
-	SIOCGIFSLAVE                     = 0x8929
-	SIOCGIFTXQLEN                    = 0x8942
-	SIOCGPGRP                        = 0x8904
-	SIOCGRARP                        = 0x8961
-	SIOCGSTAMP                       = 0x8906
-	SIOCGSTAMPNS                     = 0x8907
-	SIOCPROTOPRIVATE                 = 0x89e0
-	SIOCRTMSG                        = 0x890d
-	SIOCSARP                         = 0x8955
-	SIOCSIFADDR                      = 0x8916
-	SIOCSIFBR                        = 0x8941
-	SIOCSIFBRDADDR                   = 0x891a
-	SIOCSIFDSTADDR                   = 0x8918
-	SIOCSIFENCAP                     = 0x8926
-	SIOCSIFFLAGS                     = 0x8914
-	SIOCSIFHWADDR                    = 0x8924
-	SIOCSIFHWBROADCAST               = 0x8937
-	SIOCSIFLINK                      = 0x8911
-	SIOCSIFMAP                       = 0x8971
-	SIOCSIFMEM                       = 0x8920
-	SIOCSIFMETRIC                    = 0x891e
-	SIOCSIFMTU                       = 0x8922
-	SIOCSIFNAME                      = 0x8923
-	SIOCSIFNETMASK                   = 0x891c
-	SIOCSIFPFLAGS                    = 0x8934
-	SIOCSIFSLAVE                     = 0x8930
-	SIOCSIFTXQLEN                    = 0x8943
-	SIOCSPGRP                        = 0x8902
-	SIOCSRARP                        = 0x8962
-	SOCK_CLOEXEC                     = 0x80000
-	SOCK_DCCP                        = 0x6
-	SOCK_DGRAM                       = 0x2
-	SOCK_NONBLOCK                    = 0x800
-	SOCK_PACKET                      = 0xa
-	SOCK_RAW                         = 0x3
-	SOCK_RDM                         = 0x4
-	SOCK_SEQPACKET                   = 0x5
-	SOCK_STREAM                      = 0x1
-	SOL_AAL                          = 0x109
-	SOL_ATM                          = 0x108
-	SOL_DECNET                       = 0x105
-	SOL_ICMPV6                       = 0x3a
-	SOL_IP                           = 0x0
-	SOL_IPV6                         = 0x29
-	SOL_IRDA                         = 0x10a
-	SOL_NETLINK                      = 0x10e
-	SOL_PACKET                       = 0x107
-	SOL_RAW                          = 0xff
-	SOL_SOCKET                       = 0x1
-	SOL_TCP                          = 0x6
-	SOL_X25                          = 0x106
-	SOMAXCONN                        = 0x80
-	SO_ACCEPTCONN                    = 0x1e
-	SO_ATTACH_BPF                    = 0x32
-	SO_ATTACH_FILTER                 = 0x1a
-	SO_BINDTODEVICE                  = 0x19
-	SO_BPF_EXTENSIONS                = 0x30
-	SO_BROADCAST                     = 0x6
-	SO_BSDCOMPAT                     = 0xe
-	SO_BUSY_POLL                     = 0x2e
-	SO_DEBUG                         = 0x1
-	SO_DETACH_BPF                    = 0x1b
-	SO_DETACH_FILTER                 = 0x1b
-	SO_DOMAIN                        = 0x27
-	SO_DONTROUTE                     = 0x5
-	SO_ERROR                         = 0x4
-	SO_GET_FILTER                    = 0x1a
-	SO_INCOMING_CPU                  = 0x31
-	SO_KEEPALIVE                     = 0x9
-	SO_LINGER                        = 0xd
-	SO_LOCK_FILTER                   = 0x2c
-	SO_MARK                          = 0x24
-	SO_MAX_PACING_RATE               = 0x2f
-	SO_NOFCS                         = 0x2b
-	SO_NO_CHECK                      = 0xb
-	SO_OOBINLINE                     = 0xa
-	SO_PASSCRED                      = 0x10
-	SO_PASSSEC                       = 0x22
-	SO_PEEK_OFF                      = 0x2a
-	SO_PEERCRED                      = 0x11
-	SO_PEERNAME                      = 0x1c
-	SO_PEERSEC                       = 0x1f
-	SO_PRIORITY                      = 0xc
-	SO_PROTOCOL                      = 0x26
-	SO_RCVBUF                        = 0x8
-	SO_RCVBUFFORCE                   = 0x21
-	SO_RCVLOWAT                      = 0x12
-	SO_RCVTIMEO                      = 0x14
-	SO_REUSEADDR                     = 0x2
-	SO_REUSEPORT                     = 0xf
-	SO_RXQ_OVFL                      = 0x28
-	SO_SECURITY_AUTHENTICATION       = 0x16
-	SO_SECURITY_ENCRYPTION_NETWORK   = 0x18
-	SO_SECURITY_ENCRYPTION_TRANSPORT = 0x17
-	SO_SELECT_ERR_QUEUE              = 0x2d
-	SO_SNDBUF                        = 0x7
-	SO_SNDBUFFORCE                   = 0x20
-	SO_SNDLOWAT                      = 0x13
-	SO_SNDTIMEO                      = 0x15
-	SO_TIMESTAMP                     = 0x1d
-	SO_TIMESTAMPING                  = 0x25
-	SO_TIMESTAMPNS                   = 0x23
-	SO_TYPE                          = 0x3
-	SO_VM_SOCKETS_BUFFER_MAX_SIZE    = 0x2
-	SO_VM_SOCKETS_BUFFER_MIN_SIZE    = 0x1
-	SO_VM_SOCKETS_BUFFER_SIZE        = 0x0
-	SO_VM_SOCKETS_CONNECT_TIMEOUT    = 0x6
-	SO_VM_SOCKETS_NONBLOCK_TXRX      = 0x7
-	SO_VM_SOCKETS_PEER_HOST_VM_ID    = 0x3
-	SO_VM_SOCKETS_TRUSTED            = 0x5
-	SO_WIFI_STATUS                   = 0x29
-	SPLICE_F_GIFT                    = 0x8
-	SPLICE_F_MORE                    = 0x4
-	SPLICE_F_MOVE                    = 0x1
-	SPLICE_F_NONBLOCK                = 0x2
-	S_BLKSIZE                        = 0x200
-	S_IEXEC                          = 0x40
-	S_IFBLK                          = 0x6000
-	S_IFCHR                          = 0x2000
-	S_IFDIR                          = 0x4000
-	S_IFIFO                          = 0x1000
-	S_IFLNK                          = 0xa000
-	S_IFMT                           = 0xf000
-	S_IFREG                          = 0x8000
-	S_IFSOCK                         = 0xc000
-	S_IREAD                          = 0x100
-	S_IRGRP                          = 0x20
-	S_IROTH                          = 0x4
-	S_IRUSR                          = 0x100
-	S_IRWXG                          = 0x38
-	S_IRWXO                          = 0x7
-	S_IRWXU                          = 0x1c0
-	S_ISGID                          = 0x400
-	S_ISUID                          = 0x800
-	S_ISVTX                          = 0x200
-	S_IWGRP                          = 0x10
-	S_IWOTH                          = 0x2
-	S_IWRITE                         = 0x80
-	S_IWUSR                          = 0x80
-	S_IXGRP                          = 0x8
-	S_IXOTH                          = 0x1
-	S_IXUSR                          = 0x40
-	TAB0                             = 0x0
-	TAB1                             = 0x800
-	TAB2                             = 0x1000
-	TAB3                             = 0x1800
-	TABDLY                           = 0x1800
-	TCFLSH                           = 0x540b
-	TCGETA                           = 0x5405
-	TCGETS                           = 0x5401
-	TCGETS2                          = 0x802c542a
-	TCGETX                           = 0x5432
-	TCIFLUSH                         = 0x0
-	TCIOFF                           = 0x2
-	TCIOFLUSH                        = 0x2
-	TCION                            = 0x3
-	TCOFLUSH                         = 0x1
-	TCOOFF                           = 0x0
-	TCOON                            = 0x1
-	TCP_CC_INFO                      = 0x1a
-	TCP_CONGESTION                   = 0xd
-	TCP_COOKIE_IN_ALWAYS             = 0x1
-	TCP_COOKIE_MAX                   = 0x10
-	TCP_COOKIE_MIN                   = 0x8
-	TCP_COOKIE_OUT_NEVER             = 0x2
-	TCP_COOKIE_PAIR_SIZE             = 0x20
-	TCP_COOKIE_TRANSACTIONS          = 0xf
-	TCP_CORK                         = 0x3
-	TCP_DEFER_ACCEPT                 = 0x9
-	TCP_FASTOPEN                     = 0x17
-	TCP_INFO                         = 0xb
-	TCP_KEEPCNT                      = 0x6
-	TCP_KEEPIDLE                     = 0x4
-	TCP_KEEPINTVL                    = 0x5
-	TCP_LINGER2                      = 0x8
-	TCP_MAXSEG                       = 0x2
-	TCP_MAXWIN                       = 0xffff
-	TCP_MAX_WINSHIFT                 = 0xe
-	TCP_MD5SIG                       = 0xe
-	TCP_MD5SIG_MAXKEYLEN             = 0x50
-	TCP_MSS                          = 0x200
-	TCP_MSS_DEFAULT                  = 0x218
-	TCP_MSS_DESIRED                  = 0x4c4
-	TCP_NODELAY                      = 0x1
-	TCP_NOTSENT_LOWAT                = 0x19
-	TCP_QUEUE_SEQ                    = 0x15
-	TCP_QUICKACK                     = 0xc
-	TCP_REPAIR                       = 0x13
-	TCP_REPAIR_OPTIONS               = 0x16
-	TCP_REPAIR_QUEUE                 = 0x14
-	TCP_SAVED_SYN                    = 0x1c
-	TCP_SAVE_SYN                     = 0x1b
-	TCP_SYNCNT                       = 0x7
-	TCP_S_DATA_IN                    = 0x4
-	TCP_S_DATA_OUT                   = 0x8
-	TCP_THIN_DUPACK                  = 0x11
-	TCP_THIN_LINEAR_TIMEOUTS         = 0x10
-	TCP_TIMESTAMP                    = 0x18
-	TCP_USER_TIMEOUT                 = 0x12
-	TCP_WINDOW_CLAMP                 = 0xa
-	TCSAFLUSH                        = 0x2
-	TCSBRK                           = 0x5409
-	TCSBRKP                          = 0x5425
-	TCSETA                           = 0x5406
-	TCSETAF                          = 0x5408
-	TCSETAW                          = 0x5407
-	TCSETS                           = 0x5402
-	TCSETS2                          = 0x402c542b
-	TCSETSF                          = 0x5404
-	TCSETSF2                         = 0x402c542d
-	TCSETSW                          = 0x5403
-	TCSETSW2                         = 0x402c542c
-	TCSETX                           = 0x5433
-	TCSETXF                          = 0x5434
-	TCSETXW                          = 0x5435
-	TCXONC                           = 0x540a
-	TIOCCBRK                         = 0x5428
-	TIOCCONS                         = 0x541d
-	TIOCEXCL                         = 0x540c
-	TIOCGDEV                         = 0x80045432
-	TIOCGETD                         = 0x5424
-	TIOCGEXCL                        = 0x80045440
-	TIOCGICOUNT                      = 0x545d
-	TIOCGLCKTRMIOS                   = 0x5456
-	TIOCGPGRP                        = 0x540f
-	TIOCGPKT                         = 0x80045438
-	TIOCGPTLCK                       = 0x80045439
-	TIOCGPTN                         = 0x80045430
-	TIOCGRS485                       = 0x542e
-	TIOCGSERIAL                      = 0x541e
-	TIOCGSID                         = 0x5429
-	TIOCGSOFTCAR                     = 0x5419
-	TIOCGWINSZ                       = 0x5413
-	TIOCINQ                          = 0x541b
-	TIOCLINUX                        = 0x541c
-	TIOCMBIC                         = 0x5417
-	TIOCMBIS                         = 0x5416
-	TIOCMGET                         = 0x5415
-	TIOCMIWAIT                       = 0x545c
-	TIOCMSET                         = 0x5418
-	TIOCM_CAR                        = 0x40
-	TIOCM_CD                         = 0x40
-	TIOCM_CTS                        = 0x20
-	TIOCM_DSR                        = 0x100
-	TIOCM_DTR                        = 0x2
-	TIOCM_LE                         = 0x1
-	TIOCM_RI                         = 0x80
-	TIOCM_RNG                        = 0x80
-	TIOCM_RTS                        = 0x4
-	TIOCM_SR                         = 0x10
-	TIOCM_ST                         = 0x8
-	TIOCNOTTY                        = 0x5422
-	TIOCNXCL                         = 0x540d
-	TIOCOUTQ                         = 0x5411
-	TIOCPKT                          = 0x5420
-	TIOCPKT_DATA                     = 0x0
-	TIOCPKT_DOSTOP                   = 0x20
-	TIOCPKT_FLUSHREAD                = 0x1
-	TIOCPKT_FLUSHWRITE               = 0x2
-	TIOCPKT_IOCTL                    = 0x40
-	TIOCPKT_NOSTOP                   = 0x10
-	TIOCPKT_START                    = 0x8
-	TIOCPKT_STOP                     = 0x4
-	TIOCSBRK                         = 0x5427
-	TIOCSCTTY                        = 0x540e
-	TIOCSERCONFIG                    = 0x5453
-	TIOCSERGETLSR                    = 0x5459
-	TIOCSERGETMULTI                  = 0x545a
-	TIOCSERGSTRUCT                   = 0x5458
-	TIOCSERGWILD                     = 0x5454
-	TIOCSERSETMULTI                  = 0x545b
-	TIOCSERSWILD                     = 0x5455
-	TIOCSER_TEMT                     = 0x1
-	TIOCSETD                         = 0x5423
-	TIOCSIG                          = 0x40045436
-	TIOCSLCKTRMIOS                   = 0x5457
-	TIOCSPGRP                        = 0x5410
-	TIOCSPTLCK                       = 0x40045431
-	TIOCSRS485                       = 0x542f
-	TIOCSSERIAL                      = 0x541f
-	TIOCSSOFTCAR                     = 0x541a
-	TIOCSTI                          = 0x5412
-	TIOCSWINSZ                       = 0x5414
-	TIOCVHANGUP                      = 0x5437
-	TOSTOP                           = 0x100
-	TUNATTACHFILTER                  = 0x401054d5
-	TUNDETACHFILTER                  = 0x401054d6
-	TUNGETFEATURES                   = 0x800454cf
-	TUNGETFILTER                     = 0x801054db
-	TUNGETIFF                        = 0x800454d2
-	TUNGETSNDBUF                     = 0x800454d3
-	TUNGETVNETBE                     = 0x800454df
-	TUNGETVNETHDRSZ                  = 0x800454d7
-	TUNGETVNETLE                     = 0x800454dd
-	TUNSETDEBUG                      = 0x400454c9
-	TUNSETGROUP                      = 0x400454ce
-	TUNSETIFF                        = 0x400454ca
-	TUNSETIFINDEX                    = 0x400454da
-	TUNSETLINK                       = 0x400454cd
-	TUNSETNOCSUM                     = 0x400454c8
-	TUNSETOFFLOAD                    = 0x400454d0
-	TUNSETOWNER                      = 0x400454cc
-	TUNSETPERSIST                    = 0x400454cb
-	TUNSETQUEUE                      = 0x400454d9
-	TUNSETSNDBUF                     = 0x400454d4
-	TUNSETTXFILTER                   = 0x400454d1
-	TUNSETVNETBE                     = 0x400454de
-	TUNSETVNETHDRSZ                  = 0x400454d8
-	TUNSETVNETLE                     = 0x400454dc
-	VDISCARD                         = 0xd
-	VEOF                             = 0x4
-	VEOL                             = 0xb
-	VEOL2                            = 0x10
-	VERASE                           = 0x2
-	VINTR                            = 0x0
-	VKILL                            = 0x3
-	VLNEXT                           = 0xf
-	VMADDR_CID_ANY                   = 0xffffffff
-	VMADDR_CID_HOST                  = 0x2
-	VMADDR_CID_HYPERVISOR            = 0x0
-	VMADDR_CID_RESERVED              = 0x1
-	VMADDR_PORT_ANY                  = 0xffffffff
-	VMIN                             = 0x6
-	VQUIT                            = 0x1
-	VREPRINT                         = 0xc
-	VSTART                           = 0x8
-	VSTOP                            = 0x9
-	VSUSP                            = 0xa
-	VSWTC                            = 0x7
-	VT0                              = 0x0
-	VT1                              = 0x4000
-	VTDLY                            = 0x4000
-	VTIME                            = 0x5
-	VWERASE                          = 0xe
-	WALL                             = 0x40000000
-	WCLONE                           = 0x80000000
-	WCONTINUED                       = 0x8
-	WEXITED                          = 0x4
-	WNOHANG                          = 0x1
-	WNOTHREAD                        = 0x20000000
-	WNOWAIT                          = 0x1000000
-	WORDSIZE                         = 0x40
-	WSTOPPED                         = 0x2
-	WUNTRACED                        = 0x2
-	XCASE                            = 0x4
-	XTABS                            = 0x1800
+	AAFS_MAGIC                           = 0x5a3c69f0
+	ADFS_SUPER_MAGIC                     = 0xadf5
+	AFFS_SUPER_MAGIC                     = 0xadff
+	AFS_FS_MAGIC                         = 0x6b414653
+	AFS_SUPER_MAGIC                      = 0x5346414f
+	AF_ALG                               = 0x26
+	AF_APPLETALK                         = 0x5
+	AF_ASH                               = 0x12
+	AF_ATMPVC                            = 0x8
+	AF_ATMSVC                            = 0x14
+	AF_AX25                              = 0x3
+	AF_BLUETOOTH                         = 0x1f
+	AF_BRIDGE                            = 0x7
+	AF_CAIF                              = 0x25
+	AF_CAN                               = 0x1d
+	AF_DECnet                            = 0xc
+	AF_ECONET                            = 0x13
+	AF_FILE                              = 0x1
+	AF_IB                                = 0x1b
+	AF_IEEE802154                        = 0x24
+	AF_INET                              = 0x2
+	AF_INET6                             = 0xa
+	AF_IPX                               = 0x4
+	AF_IRDA                              = 0x17
+	AF_ISDN                              = 0x22
+	AF_IUCV                              = 0x20
+	AF_KCM                               = 0x29
+	AF_KEY                               = 0xf
+	AF_LLC                               = 0x1a
+	AF_LOCAL                             = 0x1
+	AF_MAX                               = 0x2c
+	AF_MPLS                              = 0x1c
+	AF_NETBEUI                           = 0xd
+	AF_NETLINK                           = 0x10
+	AF_NETROM                            = 0x6
+	AF_NFC                               = 0x27
+	AF_PACKET                            = 0x11
+	AF_PHONET                            = 0x23
+	AF_PPPOX                             = 0x18
+	AF_QIPCRTR                           = 0x2a
+	AF_RDS                               = 0x15
+	AF_ROSE                              = 0xb
+	AF_ROUTE                             = 0x10
+	AF_RXRPC                             = 0x21
+	AF_SECURITY                          = 0xe
+	AF_SMC                               = 0x2b
+	AF_SNA                               = 0x16
+	AF_TIPC                              = 0x1e
+	AF_UNIX                              = 0x1
+	AF_UNSPEC                            = 0x0
+	AF_VSOCK                             = 0x28
+	AF_WANPIPE                           = 0x19
+	AF_X25                               = 0x9
+	ALG_OP_DECRYPT                       = 0x0
+	ALG_OP_ENCRYPT                       = 0x1
+	ALG_SET_AEAD_ASSOCLEN                = 0x4
+	ALG_SET_AEAD_AUTHSIZE                = 0x5
+	ALG_SET_IV                           = 0x2
+	ALG_SET_KEY                          = 0x1
+	ALG_SET_OP                           = 0x3
+	ANON_INODE_FS_MAGIC                  = 0x9041934
+	ARPHRD_6LOWPAN                       = 0x339
+	ARPHRD_ADAPT                         = 0x108
+	ARPHRD_APPLETLK                      = 0x8
+	ARPHRD_ARCNET                        = 0x7
+	ARPHRD_ASH                           = 0x30d
+	ARPHRD_ATM                           = 0x13
+	ARPHRD_AX25                          = 0x3
+	ARPHRD_BIF                           = 0x307
+	ARPHRD_CAIF                          = 0x336
+	ARPHRD_CAN                           = 0x118
+	ARPHRD_CHAOS                         = 0x5
+	ARPHRD_CISCO                         = 0x201
+	ARPHRD_CSLIP                         = 0x101
+	ARPHRD_CSLIP6                        = 0x103
+	ARPHRD_DDCMP                         = 0x205
+	ARPHRD_DLCI                          = 0xf
+	ARPHRD_ECONET                        = 0x30e
+	ARPHRD_EETHER                        = 0x2
+	ARPHRD_ETHER                         = 0x1
+	ARPHRD_EUI64                         = 0x1b
+	ARPHRD_FCAL                          = 0x311
+	ARPHRD_FCFABRIC                      = 0x313
+	ARPHRD_FCPL                          = 0x312
+	ARPHRD_FCPP                          = 0x310
+	ARPHRD_FDDI                          = 0x306
+	ARPHRD_FRAD                          = 0x302
+	ARPHRD_HDLC                          = 0x201
+	ARPHRD_HIPPI                         = 0x30c
+	ARPHRD_HWX25                         = 0x110
+	ARPHRD_IEEE1394                      = 0x18
+	ARPHRD_IEEE802                       = 0x6
+	ARPHRD_IEEE80211                     = 0x321
+	ARPHRD_IEEE80211_PRISM               = 0x322
+	ARPHRD_IEEE80211_RADIOTAP            = 0x323
+	ARPHRD_IEEE802154                    = 0x324
+	ARPHRD_IEEE802154_MONITOR            = 0x325
+	ARPHRD_IEEE802_TR                    = 0x320
+	ARPHRD_INFINIBAND                    = 0x20
+	ARPHRD_IP6GRE                        = 0x337
+	ARPHRD_IPDDP                         = 0x309
+	ARPHRD_IPGRE                         = 0x30a
+	ARPHRD_IRDA                          = 0x30f
+	ARPHRD_LAPB                          = 0x204
+	ARPHRD_LOCALTLK                      = 0x305
+	ARPHRD_LOOPBACK                      = 0x304
+	ARPHRD_METRICOM                      = 0x17
+	ARPHRD_NETLINK                       = 0x338
+	ARPHRD_NETROM                        = 0x0
+	ARPHRD_NONE                          = 0xfffe
+	ARPHRD_PHONET                        = 0x334
+	ARPHRD_PHONET_PIPE                   = 0x335
+	ARPHRD_PIMREG                        = 0x30b
+	ARPHRD_PPP                           = 0x200
+	ARPHRD_PRONET                        = 0x4
+	ARPHRD_RAWHDLC                       = 0x206
+	ARPHRD_RAWIP                         = 0x207
+	ARPHRD_ROSE                          = 0x10e
+	ARPHRD_RSRVD                         = 0x104
+	ARPHRD_SIT                           = 0x308
+	ARPHRD_SKIP                          = 0x303
+	ARPHRD_SLIP                          = 0x100
+	ARPHRD_SLIP6                         = 0x102
+	ARPHRD_TUNNEL                        = 0x300
+	ARPHRD_TUNNEL6                       = 0x301
+	ARPHRD_VOID                          = 0xffff
+	ARPHRD_VSOCKMON                      = 0x33a
+	ARPHRD_X25                           = 0x10f
+	AUTOFS_SUPER_MAGIC                   = 0x187
+	B0                                   = 0x0
+	B1000000                             = 0x1008
+	B110                                 = 0x3
+	B115200                              = 0x1002
+	B1152000                             = 0x1009
+	B1200                                = 0x9
+	B134                                 = 0x4
+	B150                                 = 0x5
+	B1500000                             = 0x100a
+	B1800                                = 0xa
+	B19200                               = 0xe
+	B200                                 = 0x6
+	B2000000                             = 0x100b
+	B230400                              = 0x1003
+	B2400                                = 0xb
+	B2500000                             = 0x100c
+	B300                                 = 0x7
+	B3000000                             = 0x100d
+	B3500000                             = 0x100e
+	B38400                               = 0xf
+	B4000000                             = 0x100f
+	B460800                              = 0x1004
+	B4800                                = 0xc
+	B50                                  = 0x1
+	B500000                              = 0x1005
+	B57600                               = 0x1001
+	B576000                              = 0x1006
+	B600                                 = 0x8
+	B75                                  = 0x2
+	B921600                              = 0x1007
+	B9600                                = 0xd
+	BALLOON_KVM_MAGIC                    = 0x13661366
+	BDEVFS_MAGIC                         = 0x62646576
+	BINFMTFS_MAGIC                       = 0x42494e4d
+	BLKBSZGET                            = 0x80081270
+	BLKBSZSET                            = 0x40081271
+	BLKFLSBUF                            = 0x1261
+	BLKFRAGET                            = 0x1265
+	BLKFRASET                            = 0x1264
+	BLKGETSIZE                           = 0x1260
+	BLKGETSIZE64                         = 0x80081272
+	BLKPBSZGET                           = 0x127b
+	BLKRAGET                             = 0x1263
+	BLKRASET                             = 0x1262
+	BLKROGET                             = 0x125e
+	BLKROSET                             = 0x125d
+	BLKRRPART                            = 0x125f
+	BLKSECTGET                           = 0x1267
+	BLKSECTSET                           = 0x1266
+	BLKSSZGET                            = 0x1268
+	BOTHER                               = 0x1000
+	BPF_A                                = 0x10
+	BPF_ABS                              = 0x20
+	BPF_ADD                              = 0x0
+	BPF_ALU                              = 0x4
+	BPF_AND                              = 0x50
+	BPF_B                                = 0x10
+	BPF_DIV                              = 0x30
+	BPF_FS_MAGIC                         = 0xcafe4a11
+	BPF_H                                = 0x8
+	BPF_IMM                              = 0x0
+	BPF_IND                              = 0x40
+	BPF_JA                               = 0x0
+	BPF_JEQ                              = 0x10
+	BPF_JGE                              = 0x30
+	BPF_JGT                              = 0x20
+	BPF_JMP                              = 0x5
+	BPF_JSET                             = 0x40
+	BPF_K                                = 0x0
+	BPF_LD                               = 0x0
+	BPF_LDX                              = 0x1
+	BPF_LEN                              = 0x80
+	BPF_LL_OFF                           = -0x200000
+	BPF_LSH                              = 0x60
+	BPF_MAJOR_VERSION                    = 0x1
+	BPF_MAXINSNS                         = 0x1000
+	BPF_MEM                              = 0x60
+	BPF_MEMWORDS                         = 0x10
+	BPF_MINOR_VERSION                    = 0x1
+	BPF_MISC                             = 0x7
+	BPF_MOD                              = 0x90
+	BPF_MSH                              = 0xa0
+	BPF_MUL                              = 0x20
+	BPF_NEG                              = 0x80
+	BPF_NET_OFF                          = -0x100000
+	BPF_OR                               = 0x40
+	BPF_RET                              = 0x6
+	BPF_RSH                              = 0x70
+	BPF_ST                               = 0x2
+	BPF_STX                              = 0x3
+	BPF_SUB                              = 0x10
+	BPF_TAX                              = 0x0
+	BPF_TXA                              = 0x80
+	BPF_W                                = 0x0
+	BPF_X                                = 0x8
+	BPF_XOR                              = 0xa0
+	BRKINT                               = 0x2
+	BS0                                  = 0x0
+	BS1                                  = 0x2000
+	BSDLY                                = 0x2000
+	BTRFS_SUPER_MAGIC                    = 0x9123683e
+	BTRFS_TEST_MAGIC                     = 0x73727279
+	CAN_BCM                              = 0x2
+	CAN_EFF_FLAG                         = 0x80000000
+	CAN_EFF_ID_BITS                      = 0x1d
+	CAN_EFF_MASK                         = 0x1fffffff
+	CAN_ERR_FLAG                         = 0x20000000
+	CAN_ERR_MASK                         = 0x1fffffff
+	CAN_INV_FILTER                       = 0x20000000
+	CAN_ISOTP                            = 0x6
+	CAN_MAX_DLC                          = 0x8
+	CAN_MAX_DLEN                         = 0x8
+	CAN_MCNET                            = 0x5
+	CAN_MTU                              = 0x10
+	CAN_NPROTO                           = 0x7
+	CAN_RAW                              = 0x1
+	CAN_RAW_FILTER_MAX                   = 0x200
+	CAN_RTR_FLAG                         = 0x40000000
+	CAN_SFF_ID_BITS                      = 0xb
+	CAN_SFF_MASK                         = 0x7ff
+	CAN_TP16                             = 0x3
+	CAN_TP20                             = 0x4
+	CBAUD                                = 0x100f
+	CBAUDEX                              = 0x1000
+	CFLUSH                               = 0xf
+	CGROUP2_SUPER_MAGIC                  = 0x63677270
+	CGROUP_SUPER_MAGIC                   = 0x27e0eb
+	CIBAUD                               = 0x100f0000
+	CLOCAL                               = 0x800
+	CLOCK_BOOTTIME                       = 0x7
+	CLOCK_BOOTTIME_ALARM                 = 0x9
+	CLOCK_DEFAULT                        = 0x0
+	CLOCK_EXT                            = 0x1
+	CLOCK_INT                            = 0x2
+	CLOCK_MONOTONIC                      = 0x1
+	CLOCK_MONOTONIC_COARSE               = 0x6
+	CLOCK_MONOTONIC_RAW                  = 0x4
+	CLOCK_PROCESS_CPUTIME_ID             = 0x2
+	CLOCK_REALTIME                       = 0x0
+	CLOCK_REALTIME_ALARM                 = 0x8
+	CLOCK_REALTIME_COARSE                = 0x5
+	CLOCK_TAI                            = 0xb
+	CLOCK_THREAD_CPUTIME_ID              = 0x3
+	CLOCK_TXFROMRX                       = 0x4
+	CLOCK_TXINT                          = 0x3
+	CLONE_CHILD_CLEARTID                 = 0x200000
+	CLONE_CHILD_SETTID                   = 0x1000000
+	CLONE_DETACHED                       = 0x400000
+	CLONE_FILES                          = 0x400
+	CLONE_FS                             = 0x200
+	CLONE_IO                             = 0x80000000
+	CLONE_NEWCGROUP                      = 0x2000000
+	CLONE_NEWIPC                         = 0x8000000
+	CLONE_NEWNET                         = 0x40000000
+	CLONE_NEWNS                          = 0x20000
+	CLONE_NEWPID                         = 0x20000000
+	CLONE_NEWUSER                        = 0x10000000
+	CLONE_NEWUTS                         = 0x4000000
+	CLONE_PARENT                         = 0x8000
+	CLONE_PARENT_SETTID                  = 0x100000
+	CLONE_PTRACE                         = 0x2000
+	CLONE_SETTLS                         = 0x80000
+	CLONE_SIGHAND                        = 0x800
+	CLONE_SYSVSEM                        = 0x40000
+	CLONE_THREAD                         = 0x10000
+	CLONE_UNTRACED                       = 0x800000
+	CLONE_VFORK                          = 0x4000
+	CLONE_VM                             = 0x100
+	CMSPAR                               = 0x40000000
+	CODA_SUPER_MAGIC                     = 0x73757245
+	CR0                                  = 0x0
+	CR1                                  = 0x200
+	CR2                                  = 0x400
+	CR3                                  = 0x600
+	CRAMFS_MAGIC                         = 0x28cd3d45
+	CRDLY                                = 0x600
+	CREAD                                = 0x80
+	CRTSCTS                              = 0x80000000
+	CS5                                  = 0x0
+	CS6                                  = 0x10
+	CS7                                  = 0x20
+	CS8                                  = 0x30
+	CSIGNAL                              = 0xff
+	CSIZE                                = 0x30
+	CSTART                               = 0x11
+	CSTATUS                              = 0x0
+	CSTOP                                = 0x13
+	CSTOPB                               = 0x40
+	CSUSP                                = 0x1a
+	DAXFS_MAGIC                          = 0x64646178
+	DEBUGFS_MAGIC                        = 0x64626720
+	DEVPTS_SUPER_MAGIC                   = 0x1cd1
+	DT_BLK                               = 0x6
+	DT_CHR                               = 0x2
+	DT_DIR                               = 0x4
+	DT_FIFO                              = 0x1
+	DT_LNK                               = 0xa
+	DT_REG                               = 0x8
+	DT_SOCK                              = 0xc
+	DT_UNKNOWN                           = 0x0
+	DT_WHT                               = 0xe
+	ECHO                                 = 0x8
+	ECHOCTL                              = 0x200
+	ECHOE                                = 0x10
+	ECHOK                                = 0x20
+	ECHOKE                               = 0x800
+	ECHONL                               = 0x40
+	ECHOPRT                              = 0x400
+	ECRYPTFS_SUPER_MAGIC                 = 0xf15f
+	EFD_CLOEXEC                          = 0x80000
+	EFD_NONBLOCK                         = 0x800
+	EFD_SEMAPHORE                        = 0x1
+	EFIVARFS_MAGIC                       = 0xde5e81e4
+	EFS_SUPER_MAGIC                      = 0x414a53
+	ENCODING_DEFAULT                     = 0x0
+	ENCODING_FM_MARK                     = 0x3
+	ENCODING_FM_SPACE                    = 0x4
+	ENCODING_MANCHESTER                  = 0x5
+	ENCODING_NRZ                         = 0x1
+	ENCODING_NRZI                        = 0x2
+	EPOLLERR                             = 0x8
+	EPOLLET                              = 0x80000000
+	EPOLLEXCLUSIVE                       = 0x10000000
+	EPOLLHUP                             = 0x10
+	EPOLLIN                              = 0x1
+	EPOLLMSG                             = 0x400
+	EPOLLONESHOT                         = 0x40000000
+	EPOLLOUT                             = 0x4
+	EPOLLPRI                             = 0x2
+	EPOLLRDBAND                          = 0x80
+	EPOLLRDHUP                           = 0x2000
+	EPOLLRDNORM                          = 0x40
+	EPOLLWAKEUP                          = 0x20000000
+	EPOLLWRBAND                          = 0x200
+	EPOLLWRNORM                          = 0x100
+	EPOLL_CLOEXEC                        = 0x80000
+	EPOLL_CTL_ADD                        = 0x1
+	EPOLL_CTL_DEL                        = 0x2
+	EPOLL_CTL_MOD                        = 0x3
+	ETH_P_1588                           = 0x88f7
+	ETH_P_8021AD                         = 0x88a8
+	ETH_P_8021AH                         = 0x88e7
+	ETH_P_8021Q                          = 0x8100
+	ETH_P_80221                          = 0x8917
+	ETH_P_802_2                          = 0x4
+	ETH_P_802_3                          = 0x1
+	ETH_P_802_3_MIN                      = 0x600
+	ETH_P_802_EX1                        = 0x88b5
+	ETH_P_AARP                           = 0x80f3
+	ETH_P_AF_IUCV                        = 0xfbfb
+	ETH_P_ALL                            = 0x3
+	ETH_P_AOE                            = 0x88a2
+	ETH_P_ARCNET                         = 0x1a
+	ETH_P_ARP                            = 0x806
+	ETH_P_ATALK                          = 0x809b
+	ETH_P_ATMFATE                        = 0x8884
+	ETH_P_ATMMPOA                        = 0x884c
+	ETH_P_AX25                           = 0x2
+	ETH_P_BATMAN                         = 0x4305
+	ETH_P_BPQ                            = 0x8ff
+	ETH_P_CAIF                           = 0xf7
+	ETH_P_CAN                            = 0xc
+	ETH_P_CANFD                          = 0xd
+	ETH_P_CONTROL                        = 0x16
+	ETH_P_CUST                           = 0x6006
+	ETH_P_DDCMP                          = 0x6
+	ETH_P_DEC                            = 0x6000
+	ETH_P_DIAG                           = 0x6005
+	ETH_P_DNA_DL                         = 0x6001
+	ETH_P_DNA_RC                         = 0x6002
+	ETH_P_DNA_RT                         = 0x6003
+	ETH_P_DSA                            = 0x1b
+	ETH_P_ECONET                         = 0x18
+	ETH_P_EDSA                           = 0xdada
+	ETH_P_ERSPAN                         = 0x88be
+	ETH_P_ERSPAN2                        = 0x22eb
+	ETH_P_FCOE                           = 0x8906
+	ETH_P_FIP                            = 0x8914
+	ETH_P_HDLC                           = 0x19
+	ETH_P_HSR                            = 0x892f
+	ETH_P_IBOE                           = 0x8915
+	ETH_P_IEEE802154                     = 0xf6
+	ETH_P_IEEEPUP                        = 0xa00
+	ETH_P_IEEEPUPAT                      = 0xa01
+	ETH_P_IFE                            = 0xed3e
+	ETH_P_IP                             = 0x800
+	ETH_P_IPV6                           = 0x86dd
+	ETH_P_IPX                            = 0x8137
+	ETH_P_IRDA                           = 0x17
+	ETH_P_LAT                            = 0x6004
+	ETH_P_LINK_CTL                       = 0x886c
+	ETH_P_LOCALTALK                      = 0x9
+	ETH_P_LOOP                           = 0x60
+	ETH_P_LOOPBACK                       = 0x9000
+	ETH_P_MACSEC                         = 0x88e5
+	ETH_P_MAP                            = 0xf9
+	ETH_P_MOBITEX                        = 0x15
+	ETH_P_MPLS_MC                        = 0x8848
+	ETH_P_MPLS_UC                        = 0x8847
+	ETH_P_MVRP                           = 0x88f5
+	ETH_P_NCSI                           = 0x88f8
+	ETH_P_NSH                            = 0x894f
+	ETH_P_PAE                            = 0x888e
+	ETH_P_PAUSE                          = 0x8808
+	ETH_P_PHONET                         = 0xf5
+	ETH_P_PPPTALK                        = 0x10
+	ETH_P_PPP_DISC                       = 0x8863
+	ETH_P_PPP_MP                         = 0x8
+	ETH_P_PPP_SES                        = 0x8864
+	ETH_P_PRP                            = 0x88fb
+	ETH_P_PUP                            = 0x200
+	ETH_P_PUPAT                          = 0x201
+	ETH_P_QINQ1                          = 0x9100
+	ETH_P_QINQ2                          = 0x9200
+	ETH_P_QINQ3                          = 0x9300
+	ETH_P_RARP                           = 0x8035
+	ETH_P_SCA                            = 0x6007
+	ETH_P_SLOW                           = 0x8809
+	ETH_P_SNAP                           = 0x5
+	ETH_P_TDLS                           = 0x890d
+	ETH_P_TEB                            = 0x6558
+	ETH_P_TIPC                           = 0x88ca
+	ETH_P_TRAILER                        = 0x1c
+	ETH_P_TR_802_2                       = 0x11
+	ETH_P_TSN                            = 0x22f0
+	ETH_P_WAN_PPP                        = 0x7
+	ETH_P_WCCP                           = 0x883e
+	ETH_P_X25                            = 0x805
+	ETH_P_XDSA                           = 0xf8
+	EXABYTE_ENABLE_NEST                  = 0xf0
+	EXT2_SUPER_MAGIC                     = 0xef53
+	EXT3_SUPER_MAGIC                     = 0xef53
+	EXT4_SUPER_MAGIC                     = 0xef53
+	EXTA                                 = 0xe
+	EXTB                                 = 0xf
+	EXTPROC                              = 0x10000
+	F2FS_SUPER_MAGIC                     = 0xf2f52010
+	FALLOC_FL_COLLAPSE_RANGE             = 0x8
+	FALLOC_FL_INSERT_RANGE               = 0x20
+	FALLOC_FL_KEEP_SIZE                  = 0x1
+	FALLOC_FL_NO_HIDE_STALE              = 0x4
+	FALLOC_FL_PUNCH_HOLE                 = 0x2
+	FALLOC_FL_UNSHARE_RANGE              = 0x40
+	FALLOC_FL_ZERO_RANGE                 = 0x10
+	FD_CLOEXEC                           = 0x1
+	FD_SETSIZE                           = 0x400
+	FF0                                  = 0x0
+	FF1                                  = 0x8000
+	FFDLY                                = 0x8000
+	FLUSHO                               = 0x1000
+	FS_ENCRYPTION_MODE_AES_128_CBC       = 0x5
+	FS_ENCRYPTION_MODE_AES_128_CTS       = 0x6
+	FS_ENCRYPTION_MODE_AES_256_CBC       = 0x3
+	FS_ENCRYPTION_MODE_AES_256_CTS       = 0x4
+	FS_ENCRYPTION_MODE_AES_256_GCM       = 0x2
+	FS_ENCRYPTION_MODE_AES_256_XTS       = 0x1
+	FS_ENCRYPTION_MODE_INVALID           = 0x0
+	FS_IOC_GET_ENCRYPTION_POLICY         = 0x400c6615
+	FS_IOC_GET_ENCRYPTION_PWSALT         = 0x40106614
+	FS_IOC_SET_ENCRYPTION_POLICY         = 0x800c6613
+	FS_KEY_DESCRIPTOR_SIZE               = 0x8
+	FS_KEY_DESC_PREFIX                   = "fscrypt:"
+	FS_KEY_DESC_PREFIX_SIZE              = 0x8
+	FS_MAX_KEY_SIZE                      = 0x40
+	FS_POLICY_FLAGS_PAD_16               = 0x2
+	FS_POLICY_FLAGS_PAD_32               = 0x3
+	FS_POLICY_FLAGS_PAD_4                = 0x0
+	FS_POLICY_FLAGS_PAD_8                = 0x1
+	FS_POLICY_FLAGS_PAD_MASK             = 0x3
+	FS_POLICY_FLAGS_VALID                = 0x3
+	FUTEXFS_SUPER_MAGIC                  = 0xbad1dea
+	F_ADD_SEALS                          = 0x409
+	F_DUPFD                              = 0x0
+	F_DUPFD_CLOEXEC                      = 0x406
+	F_EXLCK                              = 0x4
+	F_GETFD                              = 0x1
+	F_GETFL                              = 0x3
+	F_GETLEASE                           = 0x401
+	F_GETLK                              = 0x5
+	F_GETLK64                            = 0x5
+	F_GETOWN                             = 0x9
+	F_GETOWN_EX                          = 0x10
+	F_GETPIPE_SZ                         = 0x408
+	F_GETSIG                             = 0xb
+	F_GET_FILE_RW_HINT                   = 0x40d
+	F_GET_RW_HINT                        = 0x40b
+	F_GET_SEALS                          = 0x40a
+	F_LOCK                               = 0x1
+	F_NOTIFY                             = 0x402
+	F_OFD_GETLK                          = 0x24
+	F_OFD_SETLK                          = 0x25
+	F_OFD_SETLKW                         = 0x26
+	F_OK                                 = 0x0
+	F_RDLCK                              = 0x0
+	F_SEAL_GROW                          = 0x4
+	F_SEAL_SEAL                          = 0x1
+	F_SEAL_SHRINK                        = 0x2
+	F_SEAL_WRITE                         = 0x8
+	F_SETFD                              = 0x2
+	F_SETFL                              = 0x4
+	F_SETLEASE                           = 0x400
+	F_SETLK                              = 0x6
+	F_SETLK64                            = 0x6
+	F_SETLKW                             = 0x7
+	F_SETLKW64                           = 0x7
+	F_SETOWN                             = 0x8
+	F_SETOWN_EX                          = 0xf
+	F_SETPIPE_SZ                         = 0x407
+	F_SETSIG                             = 0xa
+	F_SET_FILE_RW_HINT                   = 0x40e
+	F_SET_RW_HINT                        = 0x40c
+	F_SHLCK                              = 0x8
+	F_TEST                               = 0x3
+	F_TLOCK                              = 0x2
+	F_ULOCK                              = 0x0
+	F_UNLCK                              = 0x2
+	F_WRLCK                              = 0x1
+	GENL_ADMIN_PERM                      = 0x1
+	GENL_CMD_CAP_DO                      = 0x2
+	GENL_CMD_CAP_DUMP                    = 0x4
+	GENL_CMD_CAP_HASPOL                  = 0x8
+	GENL_HDRLEN                          = 0x4
+	GENL_ID_CTRL                         = 0x10
+	GENL_ID_PMCRAID                      = 0x12
+	GENL_ID_VFS_DQUOT                    = 0x11
+	GENL_MAX_ID                          = 0x3ff
+	GENL_MIN_ID                          = 0x10
+	GENL_NAMSIZ                          = 0x10
+	GENL_START_ALLOC                     = 0x13
+	GENL_UNS_ADMIN_PERM                  = 0x10
+	GRND_NONBLOCK                        = 0x1
+	GRND_RANDOM                          = 0x2
+	HDIO_DRIVE_CMD                       = 0x31f
+	HDIO_DRIVE_CMD_AEB                   = 0x31e
+	HDIO_DRIVE_CMD_HDR_SIZE              = 0x4
+	HDIO_DRIVE_HOB_HDR_SIZE              = 0x8
+	HDIO_DRIVE_RESET                     = 0x31c
+	HDIO_DRIVE_TASK                      = 0x31e
+	HDIO_DRIVE_TASKFILE                  = 0x31d
+	HDIO_DRIVE_TASK_HDR_SIZE             = 0x8
+	HDIO_GETGEO                          = 0x301
+	HDIO_GET_32BIT                       = 0x309
+	HDIO_GET_ACOUSTIC                    = 0x30f
+	HDIO_GET_ADDRESS                     = 0x310
+	HDIO_GET_BUSSTATE                    = 0x31a
+	HDIO_GET_DMA                         = 0x30b
+	HDIO_GET_IDENTITY                    = 0x30d
+	HDIO_GET_KEEPSETTINGS                = 0x308
+	HDIO_GET_MULTCOUNT                   = 0x304
+	HDIO_GET_NICE                        = 0x30c
+	HDIO_GET_NOWERR                      = 0x30a
+	HDIO_GET_QDMA                        = 0x305
+	HDIO_GET_UNMASKINTR                  = 0x302
+	HDIO_GET_WCACHE                      = 0x30e
+	HDIO_OBSOLETE_IDENTITY               = 0x307
+	HDIO_SCAN_HWIF                       = 0x328
+	HDIO_SET_32BIT                       = 0x324
+	HDIO_SET_ACOUSTIC                    = 0x32c
+	HDIO_SET_ADDRESS                     = 0x32f
+	HDIO_SET_BUSSTATE                    = 0x32d
+	HDIO_SET_DMA                         = 0x326
+	HDIO_SET_KEEPSETTINGS                = 0x323
+	HDIO_SET_MULTCOUNT                   = 0x321
+	HDIO_SET_NICE                        = 0x329
+	HDIO_SET_NOWERR                      = 0x325
+	HDIO_SET_PIO_MODE                    = 0x327
+	HDIO_SET_QDMA                        = 0x32e
+	HDIO_SET_UNMASKINTR                  = 0x322
+	HDIO_SET_WCACHE                      = 0x32b
+	HDIO_SET_XFER                        = 0x306
+	HDIO_TRISTATE_HWIF                   = 0x31b
+	HDIO_UNREGISTER_HWIF                 = 0x32a
+	HOSTFS_SUPER_MAGIC                   = 0xc0ffee
+	HPFS_SUPER_MAGIC                     = 0xf995e849
+	HUGETLBFS_MAGIC                      = 0x958458f6
+	HUPCL                                = 0x400
+	IBSHIFT                              = 0x10
+	ICANON                               = 0x2
+	ICMPV6_FILTER                        = 0x1
+	ICRNL                                = 0x100
+	IEXTEN                               = 0x8000
+	IFA_F_DADFAILED                      = 0x8
+	IFA_F_DEPRECATED                     = 0x20
+	IFA_F_HOMEADDRESS                    = 0x10
+	IFA_F_MANAGETEMPADDR                 = 0x100
+	IFA_F_MCAUTOJOIN                     = 0x400
+	IFA_F_NODAD                          = 0x2
+	IFA_F_NOPREFIXROUTE                  = 0x200
+	IFA_F_OPTIMISTIC                     = 0x4
+	IFA_F_PERMANENT                      = 0x80
+	IFA_F_SECONDARY                      = 0x1
+	IFA_F_STABLE_PRIVACY                 = 0x800
+	IFA_F_TEMPORARY                      = 0x1
+	IFA_F_TENTATIVE                      = 0x40
+	IFA_MAX                              = 0x8
+	IFF_ALLMULTI                         = 0x200
+	IFF_ATTACH_QUEUE                     = 0x200
+	IFF_AUTOMEDIA                        = 0x4000
+	IFF_BROADCAST                        = 0x2
+	IFF_DEBUG                            = 0x4
+	IFF_DETACH_QUEUE                     = 0x400
+	IFF_DORMANT                          = 0x20000
+	IFF_DYNAMIC                          = 0x8000
+	IFF_ECHO                             = 0x40000
+	IFF_LOOPBACK                         = 0x8
+	IFF_LOWER_UP                         = 0x10000
+	IFF_MASTER                           = 0x400
+	IFF_MULTICAST                        = 0x1000
+	IFF_MULTI_QUEUE                      = 0x100
+	IFF_NAPI                             = 0x10
+	IFF_NAPI_FRAGS                       = 0x20
+	IFF_NOARP                            = 0x80
+	IFF_NOFILTER                         = 0x1000
+	IFF_NOTRAILERS                       = 0x20
+	IFF_NO_PI                            = 0x1000
+	IFF_ONE_QUEUE                        = 0x2000
+	IFF_PERSIST                          = 0x800
+	IFF_POINTOPOINT                      = 0x10
+	IFF_PORTSEL                          = 0x2000
+	IFF_PROMISC                          = 0x100
+	IFF_RUNNING                          = 0x40
+	IFF_SLAVE                            = 0x800
+	IFF_TAP                              = 0x2
+	IFF_TUN                              = 0x1
+	IFF_TUN_EXCL                         = 0x8000
+	IFF_UP                               = 0x1
+	IFF_VNET_HDR                         = 0x4000
+	IFF_VOLATILE                         = 0x70c5a
+	IFNAMSIZ                             = 0x10
+	IGNBRK                               = 0x1
+	IGNCR                                = 0x80
+	IGNPAR                               = 0x4
+	IMAXBEL                              = 0x2000
+	INLCR                                = 0x40
+	INPCK                                = 0x10
+	IN_ACCESS                            = 0x1
+	IN_ALL_EVENTS                        = 0xfff
+	IN_ATTRIB                            = 0x4
+	IN_CLASSA_HOST                       = 0xffffff
+	IN_CLASSA_MAX                        = 0x80
+	IN_CLASSA_NET                        = 0xff000000
+	IN_CLASSA_NSHIFT                     = 0x18
+	IN_CLASSB_HOST                       = 0xffff
+	IN_CLASSB_MAX                        = 0x10000
+	IN_CLASSB_NET                        = 0xffff0000
+	IN_CLASSB_NSHIFT                     = 0x10
+	IN_CLASSC_HOST                       = 0xff
+	IN_CLASSC_NET                        = 0xffffff00
+	IN_CLASSC_NSHIFT                     = 0x8
+	IN_CLOEXEC                           = 0x80000
+	IN_CLOSE                             = 0x18
+	IN_CLOSE_NOWRITE                     = 0x10
+	IN_CLOSE_WRITE                       = 0x8
+	IN_CREATE                            = 0x100
+	IN_DELETE                            = 0x200
+	IN_DELETE_SELF                       = 0x400
+	IN_DONT_FOLLOW                       = 0x2000000
+	IN_EXCL_UNLINK                       = 0x4000000
+	IN_IGNORED                           = 0x8000
+	IN_ISDIR                             = 0x40000000
+	IN_LOOPBACKNET                       = 0x7f
+	IN_MASK_ADD                          = 0x20000000
+	IN_MODIFY                            = 0x2
+	IN_MOVE                              = 0xc0
+	IN_MOVED_FROM                        = 0x40
+	IN_MOVED_TO                          = 0x80
+	IN_MOVE_SELF                         = 0x800
+	IN_NONBLOCK                          = 0x800
+	IN_ONESHOT                           = 0x80000000
+	IN_ONLYDIR                           = 0x1000000
+	IN_OPEN                              = 0x20
+	IN_Q_OVERFLOW                        = 0x4000
+	IN_UNMOUNT                           = 0x2000
+	IOCTL_VM_SOCKETS_GET_LOCAL_CID       = 0x7b9
+	IPPROTO_AH                           = 0x33
+	IPPROTO_BEETPH                       = 0x5e
+	IPPROTO_COMP                         = 0x6c
+	IPPROTO_DCCP                         = 0x21
+	IPPROTO_DSTOPTS                      = 0x3c
+	IPPROTO_EGP                          = 0x8
+	IPPROTO_ENCAP                        = 0x62
+	IPPROTO_ESP                          = 0x32
+	IPPROTO_FRAGMENT                     = 0x2c
+	IPPROTO_GRE                          = 0x2f
+	IPPROTO_HOPOPTS                      = 0x0
+	IPPROTO_ICMP                         = 0x1
+	IPPROTO_ICMPV6                       = 0x3a
+	IPPROTO_IDP                          = 0x16
+	IPPROTO_IGMP                         = 0x2
+	IPPROTO_IP                           = 0x0
+	IPPROTO_IPIP                         = 0x4
+	IPPROTO_IPV6                         = 0x29
+	IPPROTO_MH                           = 0x87
+	IPPROTO_MPLS                         = 0x89
+	IPPROTO_MTP                          = 0x5c
+	IPPROTO_NONE                         = 0x3b
+	IPPROTO_PIM                          = 0x67
+	IPPROTO_PUP                          = 0xc
+	IPPROTO_RAW                          = 0xff
+	IPPROTO_ROUTING                      = 0x2b
+	IPPROTO_RSVP                         = 0x2e
+	IPPROTO_SCTP                         = 0x84
+	IPPROTO_TCP                          = 0x6
+	IPPROTO_TP                           = 0x1d
+	IPPROTO_UDP                          = 0x11
+	IPPROTO_UDPLITE                      = 0x88
+	IPV6_2292DSTOPTS                     = 0x4
+	IPV6_2292HOPLIMIT                    = 0x8
+	IPV6_2292HOPOPTS                     = 0x3
+	IPV6_2292PKTINFO                     = 0x2
+	IPV6_2292PKTOPTIONS                  = 0x6
+	IPV6_2292RTHDR                       = 0x5
+	IPV6_ADDRFORM                        = 0x1
+	IPV6_ADDR_PREFERENCES                = 0x48
+	IPV6_ADD_MEMBERSHIP                  = 0x14
+	IPV6_AUTHHDR                         = 0xa
+	IPV6_AUTOFLOWLABEL                   = 0x46
+	IPV6_CHECKSUM                        = 0x7
+	IPV6_DONTFRAG                        = 0x3e
+	IPV6_DROP_MEMBERSHIP                 = 0x15
+	IPV6_DSTOPTS                         = 0x3b
+	IPV6_HDRINCL                         = 0x24
+	IPV6_HOPLIMIT                        = 0x34
+	IPV6_HOPOPTS                         = 0x36
+	IPV6_IPSEC_POLICY                    = 0x22
+	IPV6_JOIN_ANYCAST                    = 0x1b
+	IPV6_JOIN_GROUP                      = 0x14
+	IPV6_LEAVE_ANYCAST                   = 0x1c
+	IPV6_LEAVE_GROUP                     = 0x15
+	IPV6_MINHOPCOUNT                     = 0x49
+	IPV6_MTU                             = 0x18
+	IPV6_MTU_DISCOVER                    = 0x17
+	IPV6_MULTICAST_HOPS                  = 0x12
+	IPV6_MULTICAST_IF                    = 0x11
+	IPV6_MULTICAST_LOOP                  = 0x13
+	IPV6_NEXTHOP                         = 0x9
+	IPV6_ORIGDSTADDR                     = 0x4a
+	IPV6_PATHMTU                         = 0x3d
+	IPV6_PKTINFO                         = 0x32
+	IPV6_PMTUDISC_DO                     = 0x2
+	IPV6_PMTUDISC_DONT                   = 0x0
+	IPV6_PMTUDISC_INTERFACE              = 0x4
+	IPV6_PMTUDISC_OMIT                   = 0x5
+	IPV6_PMTUDISC_PROBE                  = 0x3
+	IPV6_PMTUDISC_WANT                   = 0x1
+	IPV6_RECVDSTOPTS                     = 0x3a
+	IPV6_RECVERR                         = 0x19
+	IPV6_RECVFRAGSIZE                    = 0x4d
+	IPV6_RECVHOPLIMIT                    = 0x33
+	IPV6_RECVHOPOPTS                     = 0x35
+	IPV6_RECVORIGDSTADDR                 = 0x4a
+	IPV6_RECVPATHMTU                     = 0x3c
+	IPV6_RECVPKTINFO                     = 0x31
+	IPV6_RECVRTHDR                       = 0x38
+	IPV6_RECVTCLASS                      = 0x42
+	IPV6_ROUTER_ALERT                    = 0x16
+	IPV6_RTHDR                           = 0x39
+	IPV6_RTHDRDSTOPTS                    = 0x37
+	IPV6_RTHDR_LOOSE                     = 0x0
+	IPV6_RTHDR_STRICT                    = 0x1
+	IPV6_RTHDR_TYPE_0                    = 0x0
+	IPV6_RXDSTOPTS                       = 0x3b
+	IPV6_RXHOPOPTS                       = 0x36
+	IPV6_TCLASS                          = 0x43
+	IPV6_TRANSPARENT                     = 0x4b
+	IPV6_UNICAST_HOPS                    = 0x10
+	IPV6_UNICAST_IF                      = 0x4c
+	IPV6_V6ONLY                          = 0x1a
+	IPV6_XFRM_POLICY                     = 0x23
+	IP_ADD_MEMBERSHIP                    = 0x23
+	IP_ADD_SOURCE_MEMBERSHIP             = 0x27
+	IP_BIND_ADDRESS_NO_PORT              = 0x18
+	IP_BLOCK_SOURCE                      = 0x26
+	IP_CHECKSUM                          = 0x17
+	IP_DEFAULT_MULTICAST_LOOP            = 0x1
+	IP_DEFAULT_MULTICAST_TTL             = 0x1
+	IP_DF                                = 0x4000
+	IP_DROP_MEMBERSHIP                   = 0x24
+	IP_DROP_SOURCE_MEMBERSHIP            = 0x28
+	IP_FREEBIND                          = 0xf
+	IP_HDRINCL                           = 0x3
+	IP_IPSEC_POLICY                      = 0x10
+	IP_MAXPACKET                         = 0xffff
+	IP_MAX_MEMBERSHIPS                   = 0x14
+	IP_MF                                = 0x2000
+	IP_MINTTL                            = 0x15
+	IP_MSFILTER                          = 0x29
+	IP_MSS                               = 0x240
+	IP_MTU                               = 0xe
+	IP_MTU_DISCOVER                      = 0xa
+	IP_MULTICAST_ALL                     = 0x31
+	IP_MULTICAST_IF                      = 0x20
+	IP_MULTICAST_LOOP                    = 0x22
+	IP_MULTICAST_TTL                     = 0x21
+	IP_NODEFRAG                          = 0x16
+	IP_OFFMASK                           = 0x1fff
+	IP_OPTIONS                           = 0x4
+	IP_ORIGDSTADDR                       = 0x14
+	IP_PASSSEC                           = 0x12
+	IP_PKTINFO                           = 0x8
+	IP_PKTOPTIONS                        = 0x9
+	IP_PMTUDISC                          = 0xa
+	IP_PMTUDISC_DO                       = 0x2
+	IP_PMTUDISC_DONT                     = 0x0
+	IP_PMTUDISC_INTERFACE                = 0x4
+	IP_PMTUDISC_OMIT                     = 0x5
+	IP_PMTUDISC_PROBE                    = 0x3
+	IP_PMTUDISC_WANT                     = 0x1
+	IP_RECVERR                           = 0xb
+	IP_RECVFRAGSIZE                      = 0x19
+	IP_RECVOPTS                          = 0x6
+	IP_RECVORIGDSTADDR                   = 0x14
+	IP_RECVRETOPTS                       = 0x7
+	IP_RECVTOS                           = 0xd
+	IP_RECVTTL                           = 0xc
+	IP_RETOPTS                           = 0x7
+	IP_RF                                = 0x8000
+	IP_ROUTER_ALERT                      = 0x5
+	IP_TOS                               = 0x1
+	IP_TRANSPARENT                       = 0x13
+	IP_TTL                               = 0x2
+	IP_UNBLOCK_SOURCE                    = 0x25
+	IP_UNICAST_IF                        = 0x32
+	IP_XFRM_POLICY                       = 0x11
+	ISIG                                 = 0x1
+	ISOFS_SUPER_MAGIC                    = 0x9660
+	ISTRIP                               = 0x20
+	IUCLC                                = 0x200
+	IUTF8                                = 0x4000
+	IXANY                                = 0x800
+	IXOFF                                = 0x1000
+	IXON                                 = 0x400
+	JFFS2_SUPER_MAGIC                    = 0x72b6
+	KEYCTL_ASSUME_AUTHORITY              = 0x10
+	KEYCTL_CHOWN                         = 0x4
+	KEYCTL_CLEAR                         = 0x7
+	KEYCTL_DESCRIBE                      = 0x6
+	KEYCTL_DH_COMPUTE                    = 0x17
+	KEYCTL_GET_KEYRING_ID                = 0x0
+	KEYCTL_GET_PERSISTENT                = 0x16
+	KEYCTL_GET_SECURITY                  = 0x11
+	KEYCTL_INSTANTIATE                   = 0xc
+	KEYCTL_INSTANTIATE_IOV               = 0x14
+	KEYCTL_INVALIDATE                    = 0x15
+	KEYCTL_JOIN_SESSION_KEYRING          = 0x1
+	KEYCTL_LINK                          = 0x8
+	KEYCTL_NEGATE                        = 0xd
+	KEYCTL_READ                          = 0xb
+	KEYCTL_REJECT                        = 0x13
+	KEYCTL_RESTRICT_KEYRING              = 0x1d
+	KEYCTL_REVOKE                        = 0x3
+	KEYCTL_SEARCH                        = 0xa
+	KEYCTL_SESSION_TO_PARENT             = 0x12
+	KEYCTL_SETPERM                       = 0x5
+	KEYCTL_SET_REQKEY_KEYRING            = 0xe
+	KEYCTL_SET_TIMEOUT                   = 0xf
+	KEYCTL_UNLINK                        = 0x9
+	KEYCTL_UPDATE                        = 0x2
+	KEY_REQKEY_DEFL_DEFAULT              = 0x0
+	KEY_REQKEY_DEFL_GROUP_KEYRING        = 0x6
+	KEY_REQKEY_DEFL_NO_CHANGE            = -0x1
+	KEY_REQKEY_DEFL_PROCESS_KEYRING      = 0x2
+	KEY_REQKEY_DEFL_REQUESTOR_KEYRING    = 0x7
+	KEY_REQKEY_DEFL_SESSION_KEYRING      = 0x3
+	KEY_REQKEY_DEFL_THREAD_KEYRING       = 0x1
+	KEY_REQKEY_DEFL_USER_KEYRING         = 0x4
+	KEY_REQKEY_DEFL_USER_SESSION_KEYRING = 0x5
+	KEY_SPEC_GROUP_KEYRING               = -0x6
+	KEY_SPEC_PROCESS_KEYRING             = -0x2
+	KEY_SPEC_REQKEY_AUTH_KEY             = -0x7
+	KEY_SPEC_REQUESTOR_KEYRING           = -0x8
+	KEY_SPEC_SESSION_KEYRING             = -0x3
+	KEY_SPEC_THREAD_KEYRING              = -0x1
+	KEY_SPEC_USER_KEYRING                = -0x4
+	KEY_SPEC_USER_SESSION_KEYRING        = -0x5
+	LINUX_REBOOT_CMD_CAD_OFF             = 0x0
+	LINUX_REBOOT_CMD_CAD_ON              = 0x89abcdef
+	LINUX_REBOOT_CMD_HALT                = 0xcdef0123
+	LINUX_REBOOT_CMD_KEXEC               = 0x45584543
+	LINUX_REBOOT_CMD_POWER_OFF           = 0x4321fedc
+	LINUX_REBOOT_CMD_RESTART             = 0x1234567
+	LINUX_REBOOT_CMD_RESTART2            = 0xa1b2c3d4
+	LINUX_REBOOT_CMD_SW_SUSPEND          = 0xd000fce2
+	LINUX_REBOOT_MAGIC1                  = 0xfee1dead
+	LINUX_REBOOT_MAGIC2                  = 0x28121969
+	LOCK_EX                              = 0x2
+	LOCK_NB                              = 0x4
+	LOCK_SH                              = 0x1
+	LOCK_UN                              = 0x8
+	MADV_DODUMP                          = 0x11
+	MADV_DOFORK                          = 0xb
+	MADV_DONTDUMP                        = 0x10
+	MADV_DONTFORK                        = 0xa
+	MADV_DONTNEED                        = 0x4
+	MADV_FREE                            = 0x8
+	MADV_HUGEPAGE                        = 0xe
+	MADV_HWPOISON                        = 0x64
+	MADV_KEEPONFORK                      = 0x13
+	MADV_MERGEABLE                       = 0xc
+	MADV_NOHUGEPAGE                      = 0xf
+	MADV_NORMAL                          = 0x0
+	MADV_RANDOM                          = 0x1
+	MADV_REMOVE                          = 0x9
+	MADV_SEQUENTIAL                      = 0x2
+	MADV_UNMERGEABLE                     = 0xd
+	MADV_WILLNEED                        = 0x3
+	MADV_WIPEONFORK                      = 0x12
+	MAP_ANON                             = 0x20
+	MAP_ANONYMOUS                        = 0x20
+	MAP_DENYWRITE                        = 0x800
+	MAP_EXECUTABLE                       = 0x1000
+	MAP_FILE                             = 0x0
+	MAP_FIXED                            = 0x10
+	MAP_GROWSDOWN                        = 0x100
+	MAP_HUGETLB                          = 0x40000
+	MAP_HUGE_MASK                        = 0x3f
+	MAP_HUGE_SHIFT                       = 0x1a
+	MAP_LOCKED                           = 0x2000
+	MAP_NONBLOCK                         = 0x10000
+	MAP_NORESERVE                        = 0x4000
+	MAP_POPULATE                         = 0x8000
+	MAP_PRIVATE                          = 0x2
+	MAP_SHARED                           = 0x1
+	MAP_STACK                            = 0x20000
+	MAP_TYPE                             = 0xf
+	MCL_CURRENT                          = 0x1
+	MCL_FUTURE                           = 0x2
+	MCL_ONFAULT                          = 0x4
+	MINIX2_SUPER_MAGIC                   = 0x2468
+	MINIX2_SUPER_MAGIC2                  = 0x2478
+	MINIX3_SUPER_MAGIC                   = 0x4d5a
+	MINIX_SUPER_MAGIC                    = 0x137f
+	MINIX_SUPER_MAGIC2                   = 0x138f
+	MNT_DETACH                           = 0x2
+	MNT_EXPIRE                           = 0x4
+	MNT_FORCE                            = 0x1
+	MSDOS_SUPER_MAGIC                    = 0x4d44
+	MSG_BATCH                            = 0x40000
+	MSG_CMSG_CLOEXEC                     = 0x40000000
+	MSG_CONFIRM                          = 0x800
+	MSG_CTRUNC                           = 0x8
+	MSG_DONTROUTE                        = 0x4
+	MSG_DONTWAIT                         = 0x40
+	MSG_EOR                              = 0x80
+	MSG_ERRQUEUE                         = 0x2000
+	MSG_FASTOPEN                         = 0x20000000
+	MSG_FIN                              = 0x200
+	MSG_MORE                             = 0x8000
+	MSG_NOSIGNAL                         = 0x4000
+	MSG_OOB                              = 0x1
+	MSG_PEEK                             = 0x2
+	MSG_PROXY                            = 0x10
+	MSG_RST                              = 0x1000
+	MSG_SYN                              = 0x400
+	MSG_TRUNC                            = 0x20
+	MSG_TRYHARD                          = 0x4
+	MSG_WAITALL                          = 0x100
+	MSG_WAITFORONE                       = 0x10000
+	MSG_ZEROCOPY                         = 0x4000000
+	MS_ACTIVE                            = 0x40000000
+	MS_ASYNC                             = 0x1
+	MS_BIND                              = 0x1000
+	MS_BORN                              = 0x20000000
+	MS_DIRSYNC                           = 0x80
+	MS_INVALIDATE                        = 0x2
+	MS_I_VERSION                         = 0x800000
+	MS_KERNMOUNT                         = 0x400000
+	MS_LAZYTIME                          = 0x2000000
+	MS_MANDLOCK                          = 0x40
+	MS_MGC_MSK                           = 0xffff0000
+	MS_MGC_VAL                           = 0xc0ed0000
+	MS_MOVE                              = 0x2000
+	MS_NOATIME                           = 0x400
+	MS_NODEV                             = 0x4
+	MS_NODIRATIME                        = 0x800
+	MS_NOEXEC                            = 0x8
+	MS_NOREMOTELOCK                      = 0x8000000
+	MS_NOSEC                             = 0x10000000
+	MS_NOSUID                            = 0x2
+	MS_NOUSER                            = -0x80000000
+	MS_POSIXACL                          = 0x10000
+	MS_PRIVATE                           = 0x40000
+	MS_RDONLY                            = 0x1
+	MS_REC                               = 0x4000
+	MS_RELATIME                          = 0x200000
+	MS_REMOUNT                           = 0x20
+	MS_RMT_MASK                          = 0x2800051
+	MS_SHARED                            = 0x100000
+	MS_SILENT                            = 0x8000
+	MS_SLAVE                             = 0x80000
+	MS_STRICTATIME                       = 0x1000000
+	MS_SUBMOUNT                          = 0x4000000
+	MS_SYNC                              = 0x4
+	MS_SYNCHRONOUS                       = 0x10
+	MS_UNBINDABLE                        = 0x20000
+	MS_VERBOSE                           = 0x8000
+	MTD_INODE_FS_MAGIC                   = 0x11307854
+	NAME_MAX                             = 0xff
+	NCP_SUPER_MAGIC                      = 0x564c
+	NETLINK_ADD_MEMBERSHIP               = 0x1
+	NETLINK_AUDIT                        = 0x9
+	NETLINK_BROADCAST_ERROR              = 0x4
+	NETLINK_CAP_ACK                      = 0xa
+	NETLINK_CONNECTOR                    = 0xb
+	NETLINK_CRYPTO                       = 0x15
+	NETLINK_DNRTMSG                      = 0xe
+	NETLINK_DROP_MEMBERSHIP              = 0x2
+	NETLINK_ECRYPTFS                     = 0x13
+	NETLINK_EXT_ACK                      = 0xb
+	NETLINK_FIB_LOOKUP                   = 0xa
+	NETLINK_FIREWALL                     = 0x3
+	NETLINK_GENERIC                      = 0x10
+	NETLINK_INET_DIAG                    = 0x4
+	NETLINK_IP6_FW                       = 0xd
+	NETLINK_ISCSI                        = 0x8
+	NETLINK_KOBJECT_UEVENT               = 0xf
+	NETLINK_LISTEN_ALL_NSID              = 0x8
+	NETLINK_LIST_MEMBERSHIPS             = 0x9
+	NETLINK_NETFILTER                    = 0xc
+	NETLINK_NFLOG                        = 0x5
+	NETLINK_NO_ENOBUFS                   = 0x5
+	NETLINK_PKTINFO                      = 0x3
+	NETLINK_RDMA                         = 0x14
+	NETLINK_ROUTE                        = 0x0
+	NETLINK_RX_RING                      = 0x6
+	NETLINK_SCSITRANSPORT                = 0x12
+	NETLINK_SELINUX                      = 0x7
+	NETLINK_SMC                          = 0x16
+	NETLINK_SOCK_DIAG                    = 0x4
+	NETLINK_TX_RING                      = 0x7
+	NETLINK_UNUSED                       = 0x1
+	NETLINK_USERSOCK                     = 0x2
+	NETLINK_XFRM                         = 0x6
+	NFS_SUPER_MAGIC                      = 0x6969
+	NILFS_SUPER_MAGIC                    = 0x3434
+	NL0                                  = 0x0
+	NL1                                  = 0x100
+	NLA_ALIGNTO                          = 0x4
+	NLA_F_NESTED                         = 0x8000
+	NLA_F_NET_BYTEORDER                  = 0x4000
+	NLA_HDRLEN                           = 0x4
+	NLDLY                                = 0x100
+	NLMSG_ALIGNTO                        = 0x4
+	NLMSG_DONE                           = 0x3
+	NLMSG_ERROR                          = 0x2
+	NLMSG_HDRLEN                         = 0x10
+	NLMSG_MIN_TYPE                       = 0x10
+	NLMSG_NOOP                           = 0x1
+	NLMSG_OVERRUN                        = 0x4
+	NLM_F_ACK                            = 0x4
+	NLM_F_ACK_TLVS                       = 0x200
+	NLM_F_APPEND                         = 0x800
+	NLM_F_ATOMIC                         = 0x400
+	NLM_F_CAPPED                         = 0x100
+	NLM_F_CREATE                         = 0x400
+	NLM_F_DUMP                           = 0x300
+	NLM_F_DUMP_FILTERED                  = 0x20
+	NLM_F_DUMP_INTR                      = 0x10
+	NLM_F_ECHO                           = 0x8
+	NLM_F_EXCL                           = 0x200
+	NLM_F_MATCH                          = 0x200
+	NLM_F_MULTI                          = 0x2
+	NLM_F_NONREC                         = 0x100
+	NLM_F_REPLACE                        = 0x100
+	NLM_F_REQUEST                        = 0x1
+	NLM_F_ROOT                           = 0x100
+	NOFLSH                               = 0x80
+	NSFS_MAGIC                           = 0x6e736673
+	OCFS2_SUPER_MAGIC                    = 0x7461636f
+	OCRNL                                = 0x8
+	OFDEL                                = 0x80
+	OFILL                                = 0x40
+	OLCUC                                = 0x2
+	ONLCR                                = 0x4
+	ONLRET                               = 0x20
+	ONOCR                                = 0x10
+	OPENPROM_SUPER_MAGIC                 = 0x9fa1
+	OPOST                                = 0x1
+	OVERLAYFS_SUPER_MAGIC                = 0x794c7630
+	O_ACCMODE                            = 0x3
+	O_APPEND                             = 0x400
+	O_ASYNC                              = 0x2000
+	O_CLOEXEC                            = 0x80000
+	O_CREAT                              = 0x40
+	O_DIRECT                             = 0x4000
+	O_DIRECTORY                          = 0x10000
+	O_DSYNC                              = 0x1000
+	O_EXCL                               = 0x80
+	O_FSYNC                              = 0x101000
+	O_LARGEFILE                          = 0x0
+	O_NDELAY                             = 0x800
+	O_NOATIME                            = 0x40000
+	O_NOCTTY                             = 0x100
+	O_NOFOLLOW                           = 0x20000
+	O_NONBLOCK                           = 0x800
+	O_PATH                               = 0x200000
+	O_RDONLY                             = 0x0
+	O_RDWR                               = 0x2
+	O_RSYNC                              = 0x101000
+	O_SYNC                               = 0x101000
+	O_TMPFILE                            = 0x410000
+	O_TRUNC                              = 0x200
+	O_WRONLY                             = 0x1
+	PACKET_ADD_MEMBERSHIP                = 0x1
+	PACKET_AUXDATA                       = 0x8
+	PACKET_BROADCAST                     = 0x1
+	PACKET_COPY_THRESH                   = 0x7
+	PACKET_DROP_MEMBERSHIP               = 0x2
+	PACKET_FANOUT                        = 0x12
+	PACKET_FANOUT_CBPF                   = 0x6
+	PACKET_FANOUT_CPU                    = 0x2
+	PACKET_FANOUT_DATA                   = 0x16
+	PACKET_FANOUT_EBPF                   = 0x7
+	PACKET_FANOUT_FLAG_DEFRAG            = 0x8000
+	PACKET_FANOUT_FLAG_ROLLOVER          = 0x1000
+	PACKET_FANOUT_FLAG_UNIQUEID          = 0x2000
+	PACKET_FANOUT_HASH                   = 0x0
+	PACKET_FANOUT_LB                     = 0x1
+	PACKET_FANOUT_QM                     = 0x5
+	PACKET_FANOUT_RND                    = 0x4
+	PACKET_FANOUT_ROLLOVER               = 0x3
+	PACKET_FASTROUTE                     = 0x6
+	PACKET_HDRLEN                        = 0xb
+	PACKET_HOST                          = 0x0
+	PACKET_KERNEL                        = 0x7
+	PACKET_LOOPBACK                      = 0x5
+	PACKET_LOSS                          = 0xe
+	PACKET_MR_ALLMULTI                   = 0x2
+	PACKET_MR_MULTICAST                  = 0x0
+	PACKET_MR_PROMISC                    = 0x1
+	PACKET_MR_UNICAST                    = 0x3
+	PACKET_MULTICAST                     = 0x2
+	PACKET_ORIGDEV                       = 0x9
+	PACKET_OTHERHOST                     = 0x3
+	PACKET_OUTGOING                      = 0x4
+	PACKET_QDISC_BYPASS                  = 0x14
+	PACKET_RECV_OUTPUT                   = 0x3
+	PACKET_RESERVE                       = 0xc
+	PACKET_ROLLOVER_STATS                = 0x15
+	PACKET_RX_RING                       = 0x5
+	PACKET_STATISTICS                    = 0x6
+	PACKET_TIMESTAMP                     = 0x11
+	PACKET_TX_HAS_OFF                    = 0x13
+	PACKET_TX_RING                       = 0xd
+	PACKET_TX_TIMESTAMP                  = 0x10
+	PACKET_USER                          = 0x6
+	PACKET_VERSION                       = 0xa
+	PACKET_VNET_HDR                      = 0xf
+	PARENB                               = 0x100
+	PARITY_CRC16_PR0                     = 0x2
+	PARITY_CRC16_PR0_CCITT               = 0x4
+	PARITY_CRC16_PR1                     = 0x3
+	PARITY_CRC16_PR1_CCITT               = 0x5
+	PARITY_CRC32_PR0_CCITT               = 0x6
+	PARITY_CRC32_PR1_CCITT               = 0x7
+	PARITY_DEFAULT                       = 0x0
+	PARITY_NONE                          = 0x1
+	PARMRK                               = 0x8
+	PARODD                               = 0x200
+	PENDIN                               = 0x4000
+	PERF_EVENT_IOC_DISABLE               = 0x2401
+	PERF_EVENT_IOC_ENABLE                = 0x2400
+	PERF_EVENT_IOC_ID                    = 0x80082407
+	PERF_EVENT_IOC_PAUSE_OUTPUT          = 0x40042409
+	PERF_EVENT_IOC_PERIOD                = 0x40082404
+	PERF_EVENT_IOC_QUERY_BPF             = 0xc008240a
+	PERF_EVENT_IOC_REFRESH               = 0x2402
+	PERF_EVENT_IOC_RESET                 = 0x2403
+	PERF_EVENT_IOC_SET_BPF               = 0x40042408
+	PERF_EVENT_IOC_SET_FILTER            = 0x40082406
+	PERF_EVENT_IOC_SET_OUTPUT            = 0x2405
+	PIPEFS_MAGIC                         = 0x50495045
+	PRIO_PGRP                            = 0x1
+	PRIO_PROCESS                         = 0x0
+	PRIO_USER                            = 0x2
+	PROC_SUPER_MAGIC                     = 0x9fa0
+	PROT_EXEC                            = 0x4
+	PROT_GROWSDOWN                       = 0x1000000
+	PROT_GROWSUP                         = 0x2000000
+	PROT_NONE                            = 0x0
+	PROT_READ                            = 0x1
+	PROT_WRITE                           = 0x2
+	PR_CAPBSET_DROP                      = 0x18
+	PR_CAPBSET_READ                      = 0x17
+	PR_CAP_AMBIENT                       = 0x2f
+	PR_CAP_AMBIENT_CLEAR_ALL             = 0x4
+	PR_CAP_AMBIENT_IS_SET                = 0x1
+	PR_CAP_AMBIENT_LOWER                 = 0x3
+	PR_CAP_AMBIENT_RAISE                 = 0x2
+	PR_ENDIAN_BIG                        = 0x0
+	PR_ENDIAN_LITTLE                     = 0x1
+	PR_ENDIAN_PPC_LITTLE                 = 0x2
+	PR_FPEMU_NOPRINT                     = 0x1
+	PR_FPEMU_SIGFPE                      = 0x2
+	PR_FP_EXC_ASYNC                      = 0x2
+	PR_FP_EXC_DISABLED                   = 0x0
+	PR_FP_EXC_DIV                        = 0x10000
+	PR_FP_EXC_INV                        = 0x100000
+	PR_FP_EXC_NONRECOV                   = 0x1
+	PR_FP_EXC_OVF                        = 0x20000
+	PR_FP_EXC_PRECISE                    = 0x3
+	PR_FP_EXC_RES                        = 0x80000
+	PR_FP_EXC_SW_ENABLE                  = 0x80
+	PR_FP_EXC_UND                        = 0x40000
+	PR_FP_MODE_FR                        = 0x1
+	PR_FP_MODE_FRE                       = 0x2
+	PR_GET_CHILD_SUBREAPER               = 0x25
+	PR_GET_DUMPABLE                      = 0x3
+	PR_GET_ENDIAN                        = 0x13
+	PR_GET_FPEMU                         = 0x9
+	PR_GET_FPEXC                         = 0xb
+	PR_GET_FP_MODE                       = 0x2e
+	PR_GET_KEEPCAPS                      = 0x7
+	PR_GET_NAME                          = 0x10
+	PR_GET_NO_NEW_PRIVS                  = 0x27
+	PR_GET_PDEATHSIG                     = 0x2
+	PR_GET_SECCOMP                       = 0x15
+	PR_GET_SECUREBITS                    = 0x1b
+	PR_GET_THP_DISABLE                   = 0x2a
+	PR_GET_TID_ADDRESS                   = 0x28
+	PR_GET_TIMERSLACK                    = 0x1e
+	PR_GET_TIMING                        = 0xd
+	PR_GET_TSC                           = 0x19
+	PR_GET_UNALIGN                       = 0x5
+	PR_MCE_KILL                          = 0x21
+	PR_MCE_KILL_CLEAR                    = 0x0
+	PR_MCE_KILL_DEFAULT                  = 0x2
+	PR_MCE_KILL_EARLY                    = 0x1
+	PR_MCE_KILL_GET                      = 0x22
+	PR_MCE_KILL_LATE                     = 0x0
+	PR_MCE_KILL_SET                      = 0x1
+	PR_MPX_DISABLE_MANAGEMENT            = 0x2c
+	PR_MPX_ENABLE_MANAGEMENT             = 0x2b
+	PR_SET_CHILD_SUBREAPER               = 0x24
+	PR_SET_DUMPABLE                      = 0x4
+	PR_SET_ENDIAN                        = 0x14
+	PR_SET_FPEMU                         = 0xa
+	PR_SET_FPEXC                         = 0xc
+	PR_SET_FP_MODE                       = 0x2d
+	PR_SET_KEEPCAPS                      = 0x8
+	PR_SET_MM                            = 0x23
+	PR_SET_MM_ARG_END                    = 0x9
+	PR_SET_MM_ARG_START                  = 0x8
+	PR_SET_MM_AUXV                       = 0xc
+	PR_SET_MM_BRK                        = 0x7
+	PR_SET_MM_END_CODE                   = 0x2
+	PR_SET_MM_END_DATA                   = 0x4
+	PR_SET_MM_ENV_END                    = 0xb
+	PR_SET_MM_ENV_START                  = 0xa
+	PR_SET_MM_EXE_FILE                   = 0xd
+	PR_SET_MM_MAP                        = 0xe
+	PR_SET_MM_MAP_SIZE                   = 0xf
+	PR_SET_MM_START_BRK                  = 0x6
+	PR_SET_MM_START_CODE                 = 0x1
+	PR_SET_MM_START_DATA                 = 0x3
+	PR_SET_MM_START_STACK                = 0x5
+	PR_SET_NAME                          = 0xf
+	PR_SET_NO_NEW_PRIVS                  = 0x26
+	PR_SET_PDEATHSIG                     = 0x1
+	PR_SET_PTRACER                       = 0x59616d61
+	PR_SET_PTRACER_ANY                   = 0xffffffffffffffff
+	PR_SET_SECCOMP                       = 0x16
+	PR_SET_SECUREBITS                    = 0x1c
+	PR_SET_THP_DISABLE                   = 0x29
+	PR_SET_TIMERSLACK                    = 0x1d
+	PR_SET_TIMING                        = 0xe
+	PR_SET_TSC                           = 0x1a
+	PR_SET_UNALIGN                       = 0x6
+	PR_SVE_GET_VL                        = 0x33
+	PR_SVE_SET_VL                        = 0x32
+	PR_SVE_SET_VL_ONEXEC                 = 0x40000
+	PR_SVE_VL_INHERIT                    = 0x20000
+	PR_SVE_VL_LEN_MASK                   = 0xffff
+	PR_TASK_PERF_EVENTS_DISABLE          = 0x1f
+	PR_TASK_PERF_EVENTS_ENABLE           = 0x20
+	PR_TIMING_STATISTICAL                = 0x0
+	PR_TIMING_TIMESTAMP                  = 0x1
+	PR_TSC_ENABLE                        = 0x1
+	PR_TSC_SIGSEGV                       = 0x2
+	PR_UNALIGN_NOPRINT                   = 0x1
+	PR_UNALIGN_SIGBUS                    = 0x2
+	PSTOREFS_MAGIC                       = 0x6165676c
+	PTRACE_ATTACH                        = 0x10
+	PTRACE_CONT                          = 0x7
+	PTRACE_DETACH                        = 0x11
+	PTRACE_DISABLE_TE                    = 0x5010
+	PTRACE_ENABLE_TE                     = 0x5009
+	PTRACE_EVENT_CLONE                   = 0x3
+	PTRACE_EVENT_EXEC                    = 0x4
+	PTRACE_EVENT_EXIT                    = 0x6
+	PTRACE_EVENT_FORK                    = 0x1
+	PTRACE_EVENT_SECCOMP                 = 0x7
+	PTRACE_EVENT_STOP                    = 0x80
+	PTRACE_EVENT_VFORK                   = 0x2
+	PTRACE_EVENT_VFORK_DONE              = 0x5
+	PTRACE_GETEVENTMSG                   = 0x4201
+	PTRACE_GETREGS                       = 0xc
+	PTRACE_GETREGSET                     = 0x4204
+	PTRACE_GETSIGINFO                    = 0x4202
+	PTRACE_GETSIGMASK                    = 0x420a
+	PTRACE_GET_LAST_BREAK                = 0x5006
+	PTRACE_INTERRUPT                     = 0x4207
+	PTRACE_KILL                          = 0x8
+	PTRACE_LISTEN                        = 0x4208
+	PTRACE_OLDSETOPTIONS                 = 0x15
+	PTRACE_O_EXITKILL                    = 0x100000
+	PTRACE_O_MASK                        = 0x3000ff
+	PTRACE_O_SUSPEND_SECCOMP             = 0x200000
+	PTRACE_O_TRACECLONE                  = 0x8
+	PTRACE_O_TRACEEXEC                   = 0x10
+	PTRACE_O_TRACEEXIT                   = 0x40
+	PTRACE_O_TRACEFORK                   = 0x2
+	PTRACE_O_TRACESECCOMP                = 0x80
+	PTRACE_O_TRACESYSGOOD                = 0x1
+	PTRACE_O_TRACEVFORK                  = 0x4
+	PTRACE_O_TRACEVFORKDONE              = 0x20
+	PTRACE_PEEKDATA                      = 0x2
+	PTRACE_PEEKDATA_AREA                 = 0x5003
+	PTRACE_PEEKSIGINFO                   = 0x4209
+	PTRACE_PEEKSIGINFO_SHARED            = 0x1
+	PTRACE_PEEKTEXT                      = 0x1
+	PTRACE_PEEKTEXT_AREA                 = 0x5002
+	PTRACE_PEEKUSR                       = 0x3
+	PTRACE_PEEKUSR_AREA                  = 0x5000
+	PTRACE_PEEK_SYSTEM_CALL              = 0x5007
+	PTRACE_POKEDATA                      = 0x5
+	PTRACE_POKEDATA_AREA                 = 0x5005
+	PTRACE_POKETEXT                      = 0x4
+	PTRACE_POKETEXT_AREA                 = 0x5004
+	PTRACE_POKEUSR                       = 0x6
+	PTRACE_POKEUSR_AREA                  = 0x5001
+	PTRACE_POKE_SYSTEM_CALL              = 0x5008
+	PTRACE_PROT                          = 0x15
+	PTRACE_SECCOMP_GET_FILTER            = 0x420c
+	PTRACE_SECCOMP_GET_METADATA          = 0x420d
+	PTRACE_SEIZE                         = 0x4206
+	PTRACE_SETOPTIONS                    = 0x4200
+	PTRACE_SETREGS                       = 0xd
+	PTRACE_SETREGSET                     = 0x4205
+	PTRACE_SETSIGINFO                    = 0x4203
+	PTRACE_SETSIGMASK                    = 0x420b
+	PTRACE_SINGLEBLOCK                   = 0xc
+	PTRACE_SINGLESTEP                    = 0x9
+	PTRACE_SYSCALL                       = 0x18
+	PTRACE_TE_ABORT_RAND                 = 0x5011
+	PTRACE_TRACEME                       = 0x0
+	PT_ACR0                              = 0x90
+	PT_ACR1                              = 0x94
+	PT_ACR10                             = 0xb8
+	PT_ACR11                             = 0xbc
+	PT_ACR12                             = 0xc0
+	PT_ACR13                             = 0xc4
+	PT_ACR14                             = 0xc8
+	PT_ACR15                             = 0xcc
+	PT_ACR2                              = 0x98
+	PT_ACR3                              = 0x9c
+	PT_ACR4                              = 0xa0
+	PT_ACR5                              = 0xa4
+	PT_ACR6                              = 0xa8
+	PT_ACR7                              = 0xac
+	PT_ACR8                              = 0xb0
+	PT_ACR9                              = 0xb4
+	PT_CR_10                             = 0x168
+	PT_CR_11                             = 0x170
+	PT_CR_9                              = 0x160
+	PT_ENDREGS                           = 0x1af
+	PT_FPC                               = 0xd8
+	PT_FPR0                              = 0xe0
+	PT_FPR1                              = 0xe8
+	PT_FPR10                             = 0x130
+	PT_FPR11                             = 0x138
+	PT_FPR12                             = 0x140
+	PT_FPR13                             = 0x148
+	PT_FPR14                             = 0x150
+	PT_FPR15                             = 0x158
+	PT_FPR2                              = 0xf0
+	PT_FPR3                              = 0xf8
+	PT_FPR4                              = 0x100
+	PT_FPR5                              = 0x108
+	PT_FPR6                              = 0x110
+	PT_FPR7                              = 0x118
+	PT_FPR8                              = 0x120
+	PT_FPR9                              = 0x128
+	PT_GPR0                              = 0x10
+	PT_GPR1                              = 0x18
+	PT_GPR10                             = 0x60
+	PT_GPR11                             = 0x68
+	PT_GPR12                             = 0x70
+	PT_GPR13                             = 0x78
+	PT_GPR14                             = 0x80
+	PT_GPR15                             = 0x88
+	PT_GPR2                              = 0x20
+	PT_GPR3                              = 0x28
+	PT_GPR4                              = 0x30
+	PT_GPR5                              = 0x38
+	PT_GPR6                              = 0x40
+	PT_GPR7                              = 0x48
+	PT_GPR8                              = 0x50
+	PT_GPR9                              = 0x58
+	PT_IEEE_IP                           = 0x1a8
+	PT_LASTOFF                           = 0x1a8
+	PT_ORIGGPR2                          = 0xd0
+	PT_PSWADDR                           = 0x8
+	PT_PSWMASK                           = 0x0
+	QNX4_SUPER_MAGIC                     = 0x2f
+	QNX6_SUPER_MAGIC                     = 0x68191122
+	RAMFS_MAGIC                          = 0x858458f6
+	RDTGROUP_SUPER_MAGIC                 = 0x7655821
+	REISERFS_SUPER_MAGIC                 = 0x52654973
+	RLIMIT_AS                            = 0x9
+	RLIMIT_CORE                          = 0x4
+	RLIMIT_CPU                           = 0x0
+	RLIMIT_DATA                          = 0x2
+	RLIMIT_FSIZE                         = 0x1
+	RLIMIT_LOCKS                         = 0xa
+	RLIMIT_MEMLOCK                       = 0x8
+	RLIMIT_MSGQUEUE                      = 0xc
+	RLIMIT_NICE                          = 0xd
+	RLIMIT_NOFILE                        = 0x7
+	RLIMIT_NPROC                         = 0x6
+	RLIMIT_RSS                           = 0x5
+	RLIMIT_RTPRIO                        = 0xe
+	RLIMIT_RTTIME                        = 0xf
+	RLIMIT_SIGPENDING                    = 0xb
+	RLIMIT_STACK                         = 0x3
+	RLIM_INFINITY                        = 0xffffffffffffffff
+	RTAX_ADVMSS                          = 0x8
+	RTAX_CC_ALGO                         = 0x10
+	RTAX_CWND                            = 0x7
+	RTAX_FASTOPEN_NO_COOKIE              = 0x11
+	RTAX_FEATURES                        = 0xc
+	RTAX_FEATURE_ALLFRAG                 = 0x8
+	RTAX_FEATURE_ECN                     = 0x1
+	RTAX_FEATURE_MASK                    = 0xf
+	RTAX_FEATURE_SACK                    = 0x2
+	RTAX_FEATURE_TIMESTAMP               = 0x4
+	RTAX_HOPLIMIT                        = 0xa
+	RTAX_INITCWND                        = 0xb
+	RTAX_INITRWND                        = 0xe
+	RTAX_LOCK                            = 0x1
+	RTAX_MAX                             = 0x11
+	RTAX_MTU                             = 0x2
+	RTAX_QUICKACK                        = 0xf
+	RTAX_REORDERING                      = 0x9
+	RTAX_RTO_MIN                         = 0xd
+	RTAX_RTT                             = 0x4
+	RTAX_RTTVAR                          = 0x5
+	RTAX_SSTHRESH                        = 0x6
+	RTAX_UNSPEC                          = 0x0
+	RTAX_WINDOW                          = 0x3
+	RTA_ALIGNTO                          = 0x4
+	RTA_MAX                              = 0x1a
+	RTCF_DIRECTSRC                       = 0x4000000
+	RTCF_DOREDIRECT                      = 0x1000000
+	RTCF_LOG                             = 0x2000000
+	RTCF_MASQ                            = 0x400000
+	RTCF_NAT                             = 0x800000
+	RTCF_VALVE                           = 0x200000
+	RTF_ADDRCLASSMASK                    = 0xf8000000
+	RTF_ADDRCONF                         = 0x40000
+	RTF_ALLONLINK                        = 0x20000
+	RTF_BROADCAST                        = 0x10000000
+	RTF_CACHE                            = 0x1000000
+	RTF_DEFAULT                          = 0x10000
+	RTF_DYNAMIC                          = 0x10
+	RTF_FLOW                             = 0x2000000
+	RTF_GATEWAY                          = 0x2
+	RTF_HOST                             = 0x4
+	RTF_INTERFACE                        = 0x40000000
+	RTF_IRTT                             = 0x100
+	RTF_LINKRT                           = 0x100000
+	RTF_LOCAL                            = 0x80000000
+	RTF_MODIFIED                         = 0x20
+	RTF_MSS                              = 0x40
+	RTF_MTU                              = 0x40
+	RTF_MULTICAST                        = 0x20000000
+	RTF_NAT                              = 0x8000000
+	RTF_NOFORWARD                        = 0x1000
+	RTF_NONEXTHOP                        = 0x200000
+	RTF_NOPMTUDISC                       = 0x4000
+	RTF_POLICY                           = 0x4000000
+	RTF_REINSTATE                        = 0x8
+	RTF_REJECT                           = 0x200
+	RTF_STATIC                           = 0x400
+	RTF_THROW                            = 0x2000
+	RTF_UP                               = 0x1
+	RTF_WINDOW                           = 0x80
+	RTF_XRESOLVE                         = 0x800
+	RTM_BASE                             = 0x10
+	RTM_DELACTION                        = 0x31
+	RTM_DELADDR                          = 0x15
+	RTM_DELADDRLABEL                     = 0x49
+	RTM_DELLINK                          = 0x11
+	RTM_DELMDB                           = 0x55
+	RTM_DELNEIGH                         = 0x1d
+	RTM_DELNETCONF                       = 0x51
+	RTM_DELNSID                          = 0x59
+	RTM_DELQDISC                         = 0x25
+	RTM_DELROUTE                         = 0x19
+	RTM_DELRULE                          = 0x21
+	RTM_DELTCLASS                        = 0x29
+	RTM_DELTFILTER                       = 0x2d
+	RTM_F_CLONED                         = 0x200
+	RTM_F_EQUALIZE                       = 0x400
+	RTM_F_FIB_MATCH                      = 0x2000
+	RTM_F_LOOKUP_TABLE                   = 0x1000
+	RTM_F_NOTIFY                         = 0x100
+	RTM_F_PREFIX                         = 0x800
+	RTM_GETACTION                        = 0x32
+	RTM_GETADDR                          = 0x16
+	RTM_GETADDRLABEL                     = 0x4a
+	RTM_GETANYCAST                       = 0x3e
+	RTM_GETDCB                           = 0x4e
+	RTM_GETLINK                          = 0x12
+	RTM_GETMDB                           = 0x56
+	RTM_GETMULTICAST                     = 0x3a
+	RTM_GETNEIGH                         = 0x1e
+	RTM_GETNEIGHTBL                      = 0x42
+	RTM_GETNETCONF                       = 0x52
+	RTM_GETNSID                          = 0x5a
+	RTM_GETQDISC                         = 0x26
+	RTM_GETROUTE                         = 0x1a
+	RTM_GETRULE                          = 0x22
+	RTM_GETSTATS                         = 0x5e
+	RTM_GETTCLASS                        = 0x2a
+	RTM_GETTFILTER                       = 0x2e
+	RTM_MAX                              = 0x63
+	RTM_NEWACTION                        = 0x30
+	RTM_NEWADDR                          = 0x14
+	RTM_NEWADDRLABEL                     = 0x48
+	RTM_NEWCACHEREPORT                   = 0x60
+	RTM_NEWLINK                          = 0x10
+	RTM_NEWMDB                           = 0x54
+	RTM_NEWNDUSEROPT                     = 0x44
+	RTM_NEWNEIGH                         = 0x1c
+	RTM_NEWNEIGHTBL                      = 0x40
+	RTM_NEWNETCONF                       = 0x50
+	RTM_NEWNSID                          = 0x58
+	RTM_NEWPREFIX                        = 0x34
+	RTM_NEWQDISC                         = 0x24
+	RTM_NEWROUTE                         = 0x18
+	RTM_NEWRULE                          = 0x20
+	RTM_NEWSTATS                         = 0x5c
+	RTM_NEWTCLASS                        = 0x28
+	RTM_NEWTFILTER                       = 0x2c
+	RTM_NR_FAMILIES                      = 0x15
+	RTM_NR_MSGTYPES                      = 0x54
+	RTM_SETDCB                           = 0x4f
+	RTM_SETLINK                          = 0x13
+	RTM_SETNEIGHTBL                      = 0x43
+	RTNH_ALIGNTO                         = 0x4
+	RTNH_COMPARE_MASK                    = 0x19
+	RTNH_F_DEAD                          = 0x1
+	RTNH_F_LINKDOWN                      = 0x10
+	RTNH_F_OFFLOAD                       = 0x8
+	RTNH_F_ONLINK                        = 0x4
+	RTNH_F_PERVASIVE                     = 0x2
+	RTNH_F_UNRESOLVED                    = 0x20
+	RTN_MAX                              = 0xb
+	RTPROT_BABEL                         = 0x2a
+	RTPROT_BIRD                          = 0xc
+	RTPROT_BOOT                          = 0x3
+	RTPROT_DHCP                          = 0x10
+	RTPROT_DNROUTED                      = 0xd
+	RTPROT_GATED                         = 0x8
+	RTPROT_KERNEL                        = 0x2
+	RTPROT_MROUTED                       = 0x11
+	RTPROT_MRT                           = 0xa
+	RTPROT_NTK                           = 0xf
+	RTPROT_RA                            = 0x9
+	RTPROT_REDIRECT                      = 0x1
+	RTPROT_STATIC                        = 0x4
+	RTPROT_UNSPEC                        = 0x0
+	RTPROT_XORP                          = 0xe
+	RTPROT_ZEBRA                         = 0xb
+	RT_CLASS_DEFAULT                     = 0xfd
+	RT_CLASS_LOCAL                       = 0xff
+	RT_CLASS_MAIN                        = 0xfe
+	RT_CLASS_MAX                         = 0xff
+	RT_CLASS_UNSPEC                      = 0x0
+	RUSAGE_CHILDREN                      = -0x1
+	RUSAGE_SELF                          = 0x0
+	RUSAGE_THREAD                        = 0x1
+	SCM_CREDENTIALS                      = 0x2
+	SCM_RIGHTS                           = 0x1
+	SCM_TIMESTAMP                        = 0x1d
+	SCM_TIMESTAMPING                     = 0x25
+	SCM_TIMESTAMPING_OPT_STATS           = 0x36
+	SCM_TIMESTAMPING_PKTINFO             = 0x3a
+	SCM_TIMESTAMPNS                      = 0x23
+	SCM_WIFI_STATUS                      = 0x29
+	SECCOMP_MODE_DISABLED                = 0x0
+	SECCOMP_MODE_FILTER                  = 0x2
+	SECCOMP_MODE_STRICT                  = 0x1
+	SECURITYFS_MAGIC                     = 0x73636673
+	SELINUX_MAGIC                        = 0xf97cff8c
+	SHUT_RD                              = 0x0
+	SHUT_RDWR                            = 0x2
+	SHUT_WR                              = 0x1
+	SIOCADDDLCI                          = 0x8980
+	SIOCADDMULTI                         = 0x8931
+	SIOCADDRT                            = 0x890b
+	SIOCATMARK                           = 0x8905
+	SIOCBONDCHANGEACTIVE                 = 0x8995
+	SIOCBONDENSLAVE                      = 0x8990
+	SIOCBONDINFOQUERY                    = 0x8994
+	SIOCBONDRELEASE                      = 0x8991
+	SIOCBONDSETHWADDR                    = 0x8992
+	SIOCBONDSLAVEINFOQUERY               = 0x8993
+	SIOCBRADDBR                          = 0x89a0
+	SIOCBRADDIF                          = 0x89a2
+	SIOCBRDELBR                          = 0x89a1
+	SIOCBRDELIF                          = 0x89a3
+	SIOCDARP                             = 0x8953
+	SIOCDELDLCI                          = 0x8981
+	SIOCDELMULTI                         = 0x8932
+	SIOCDELRT                            = 0x890c
+	SIOCDEVPRIVATE                       = 0x89f0
+	SIOCDIFADDR                          = 0x8936
+	SIOCDRARP                            = 0x8960
+	SIOCETHTOOL                          = 0x8946
+	SIOCGARP                             = 0x8954
+	SIOCGHWTSTAMP                        = 0x89b1
+	SIOCGIFADDR                          = 0x8915
+	SIOCGIFBR                            = 0x8940
+	SIOCGIFBRDADDR                       = 0x8919
+	SIOCGIFCONF                          = 0x8912
+	SIOCGIFCOUNT                         = 0x8938
+	SIOCGIFDSTADDR                       = 0x8917
+	SIOCGIFENCAP                         = 0x8925
+	SIOCGIFFLAGS                         = 0x8913
+	SIOCGIFHWADDR                        = 0x8927
+	SIOCGIFINDEX                         = 0x8933
+	SIOCGIFMAP                           = 0x8970
+	SIOCGIFMEM                           = 0x891f
+	SIOCGIFMETRIC                        = 0x891d
+	SIOCGIFMTU                           = 0x8921
+	SIOCGIFNAME                          = 0x8910
+	SIOCGIFNETMASK                       = 0x891b
+	SIOCGIFPFLAGS                        = 0x8935
+	SIOCGIFSLAVE                         = 0x8929
+	SIOCGIFTXQLEN                        = 0x8942
+	SIOCGIFVLAN                          = 0x8982
+	SIOCGMIIPHY                          = 0x8947
+	SIOCGMIIREG                          = 0x8948
+	SIOCGPGRP                            = 0x8904
+	SIOCGRARP                            = 0x8961
+	SIOCGSKNS                            = 0x894c
+	SIOCGSTAMP                           = 0x8906
+	SIOCGSTAMPNS                         = 0x8907
+	SIOCINQ                              = 0x541b
+	SIOCOUTQ                             = 0x5411
+	SIOCOUTQNSD                          = 0x894b
+	SIOCPROTOPRIVATE                     = 0x89e0
+	SIOCRTMSG                            = 0x890d
+	SIOCSARP                             = 0x8955
+	SIOCSHWTSTAMP                        = 0x89b0
+	SIOCSIFADDR                          = 0x8916
+	SIOCSIFBR                            = 0x8941
+	SIOCSIFBRDADDR                       = 0x891a
+	SIOCSIFDSTADDR                       = 0x8918
+	SIOCSIFENCAP                         = 0x8926
+	SIOCSIFFLAGS                         = 0x8914
+	SIOCSIFHWADDR                        = 0x8924
+	SIOCSIFHWBROADCAST                   = 0x8937
+	SIOCSIFLINK                          = 0x8911
+	SIOCSIFMAP                           = 0x8971
+	SIOCSIFMEM                           = 0x8920
+	SIOCSIFMETRIC                        = 0x891e
+	SIOCSIFMTU                           = 0x8922
+	SIOCSIFNAME                          = 0x8923
+	SIOCSIFNETMASK                       = 0x891c
+	SIOCSIFPFLAGS                        = 0x8934
+	SIOCSIFSLAVE                         = 0x8930
+	SIOCSIFTXQLEN                        = 0x8943
+	SIOCSIFVLAN                          = 0x8983
+	SIOCSMIIREG                          = 0x8949
+	SIOCSPGRP                            = 0x8902
+	SIOCSRARP                            = 0x8962
+	SIOCWANDEV                           = 0x894a
+	SMACK_MAGIC                          = 0x43415d53
+	SMART_AUTOSAVE                       = 0xd2
+	SMART_AUTO_OFFLINE                   = 0xdb
+	SMART_DISABLE                        = 0xd9
+	SMART_ENABLE                         = 0xd8
+	SMART_HCYL_PASS                      = 0xc2
+	SMART_IMMEDIATE_OFFLINE              = 0xd4
+	SMART_LCYL_PASS                      = 0x4f
+	SMART_READ_LOG_SECTOR                = 0xd5
+	SMART_READ_THRESHOLDS                = 0xd1
+	SMART_READ_VALUES                    = 0xd0
+	SMART_SAVE                           = 0xd3
+	SMART_STATUS                         = 0xda
+	SMART_WRITE_LOG_SECTOR               = 0xd6
+	SMART_WRITE_THRESHOLDS               = 0xd7
+	SMB_SUPER_MAGIC                      = 0x517b
+	SOCKFS_MAGIC                         = 0x534f434b
+	SOCK_CLOEXEC                         = 0x80000
+	SOCK_DCCP                            = 0x6
+	SOCK_DGRAM                           = 0x2
+	SOCK_IOC_TYPE                        = 0x89
+	SOCK_NONBLOCK                        = 0x800
+	SOCK_PACKET                          = 0xa
+	SOCK_RAW                             = 0x3
+	SOCK_RDM                             = 0x4
+	SOCK_SEQPACKET                       = 0x5
+	SOCK_STREAM                          = 0x1
+	SOL_AAL                              = 0x109
+	SOL_ALG                              = 0x117
+	SOL_ATM                              = 0x108
+	SOL_CAIF                             = 0x116
+	SOL_CAN_BASE                         = 0x64
+	SOL_DCCP                             = 0x10d
+	SOL_DECNET                           = 0x105
+	SOL_ICMPV6                           = 0x3a
+	SOL_IP                               = 0x0
+	SOL_IPV6                             = 0x29
+	SOL_IRDA                             = 0x10a
+	SOL_IUCV                             = 0x115
+	SOL_KCM                              = 0x119
+	SOL_LLC                              = 0x10c
+	SOL_NETBEUI                          = 0x10b
+	SOL_NETLINK                          = 0x10e
+	SOL_NFC                              = 0x118
+	SOL_PACKET                           = 0x107
+	SOL_PNPIPE                           = 0x113
+	SOL_PPPOL2TP                         = 0x111
+	SOL_RAW                              = 0xff
+	SOL_RDS                              = 0x114
+	SOL_RXRPC                            = 0x110
+	SOL_SOCKET                           = 0x1
+	SOL_TCP                              = 0x6
+	SOL_TIPC                             = 0x10f
+	SOL_TLS                              = 0x11a
+	SOL_X25                              = 0x106
+	SOMAXCONN                            = 0x80
+	SO_ACCEPTCONN                        = 0x1e
+	SO_ATTACH_BPF                        = 0x32
+	SO_ATTACH_FILTER                     = 0x1a
+	SO_ATTACH_REUSEPORT_CBPF             = 0x33
+	SO_ATTACH_REUSEPORT_EBPF             = 0x34
+	SO_BINDTODEVICE                      = 0x19
+	SO_BPF_EXTENSIONS                    = 0x30
+	SO_BROADCAST                         = 0x6
+	SO_BSDCOMPAT                         = 0xe
+	SO_BUSY_POLL                         = 0x2e
+	SO_CNX_ADVICE                        = 0x35
+	SO_COOKIE                            = 0x39
+	SO_DEBUG                             = 0x1
+	SO_DETACH_BPF                        = 0x1b
+	SO_DETACH_FILTER                     = 0x1b
+	SO_DOMAIN                            = 0x27
+	SO_DONTROUTE                         = 0x5
+	SO_ERROR                             = 0x4
+	SO_GET_FILTER                        = 0x1a
+	SO_INCOMING_CPU                      = 0x31
+	SO_INCOMING_NAPI_ID                  = 0x38
+	SO_KEEPALIVE                         = 0x9
+	SO_LINGER                            = 0xd
+	SO_LOCK_FILTER                       = 0x2c
+	SO_MARK                              = 0x24
+	SO_MAX_PACING_RATE                   = 0x2f
+	SO_MEMINFO                           = 0x37
+	SO_NOFCS                             = 0x2b
+	SO_NO_CHECK                          = 0xb
+	SO_OOBINLINE                         = 0xa
+	SO_PASSCRED                          = 0x10
+	SO_PASSSEC                           = 0x22
+	SO_PEEK_OFF                          = 0x2a
+	SO_PEERCRED                          = 0x11
+	SO_PEERGROUPS                        = 0x3b
+	SO_PEERNAME                          = 0x1c
+	SO_PEERSEC                           = 0x1f
+	SO_PRIORITY                          = 0xc
+	SO_PROTOCOL                          = 0x26
+	SO_RCVBUF                            = 0x8
+	SO_RCVBUFFORCE                       = 0x21
+	SO_RCVLOWAT                          = 0x12
+	SO_RCVTIMEO                          = 0x14
+	SO_REUSEADDR                         = 0x2
+	SO_REUSEPORT                         = 0xf
+	SO_RXQ_OVFL                          = 0x28
+	SO_SECURITY_AUTHENTICATION           = 0x16
+	SO_SECURITY_ENCRYPTION_NETWORK       = 0x18
+	SO_SECURITY_ENCRYPTION_TRANSPORT     = 0x17
+	SO_SELECT_ERR_QUEUE                  = 0x2d
+	SO_SNDBUF                            = 0x7
+	SO_SNDBUFFORCE                       = 0x20
+	SO_SNDLOWAT                          = 0x13
+	SO_SNDTIMEO                          = 0x15
+	SO_TIMESTAMP                         = 0x1d
+	SO_TIMESTAMPING                      = 0x25
+	SO_TIMESTAMPNS                       = 0x23
+	SO_TYPE                              = 0x3
+	SO_VM_SOCKETS_BUFFER_MAX_SIZE        = 0x2
+	SO_VM_SOCKETS_BUFFER_MIN_SIZE        = 0x1
+	SO_VM_SOCKETS_BUFFER_SIZE            = 0x0
+	SO_VM_SOCKETS_CONNECT_TIMEOUT        = 0x6
+	SO_VM_SOCKETS_NONBLOCK_TXRX          = 0x7
+	SO_VM_SOCKETS_PEER_HOST_VM_ID        = 0x3
+	SO_VM_SOCKETS_TRUSTED                = 0x5
+	SO_WIFI_STATUS                       = 0x29
+	SO_ZEROCOPY                          = 0x3c
+	SPLICE_F_GIFT                        = 0x8
+	SPLICE_F_MORE                        = 0x4
+	SPLICE_F_MOVE                        = 0x1
+	SPLICE_F_NONBLOCK                    = 0x2
+	SQUASHFS_MAGIC                       = 0x73717368
+	STACK_END_MAGIC                      = 0x57ac6e9d
+	STATX_ALL                            = 0xfff
+	STATX_ATIME                          = 0x20
+	STATX_ATTR_APPEND                    = 0x20
+	STATX_ATTR_AUTOMOUNT                 = 0x1000
+	STATX_ATTR_COMPRESSED                = 0x4
+	STATX_ATTR_ENCRYPTED                 = 0x800
+	STATX_ATTR_IMMUTABLE                 = 0x10
+	STATX_ATTR_NODUMP                    = 0x40
+	STATX_BASIC_STATS                    = 0x7ff
+	STATX_BLOCKS                         = 0x400
+	STATX_BTIME                          = 0x800
+	STATX_CTIME                          = 0x80
+	STATX_GID                            = 0x10
+	STATX_INO                            = 0x100
+	STATX_MODE                           = 0x2
+	STATX_MTIME                          = 0x40
+	STATX_NLINK                          = 0x4
+	STATX_SIZE                           = 0x200
+	STATX_TYPE                           = 0x1
+	STATX_UID                            = 0x8
+	STATX__RESERVED                      = 0x80000000
+	SYSFS_MAGIC                          = 0x62656572
+	S_BLKSIZE                            = 0x200
+	S_IEXEC                              = 0x40
+	S_IFBLK                              = 0x6000
+	S_IFCHR                              = 0x2000
+	S_IFDIR                              = 0x4000
+	S_IFIFO                              = 0x1000
+	S_IFLNK                              = 0xa000
+	S_IFMT                               = 0xf000
+	S_IFREG                              = 0x8000
+	S_IFSOCK                             = 0xc000
+	S_IREAD                              = 0x100
+	S_IRGRP                              = 0x20
+	S_IROTH                              = 0x4
+	S_IRUSR                              = 0x100
+	S_IRWXG                              = 0x38
+	S_IRWXO                              = 0x7
+	S_IRWXU                              = 0x1c0
+	S_ISGID                              = 0x400
+	S_ISUID                              = 0x800
+	S_ISVTX                              = 0x200
+	S_IWGRP                              = 0x10
+	S_IWOTH                              = 0x2
+	S_IWRITE                             = 0x80
+	S_IWUSR                              = 0x80
+	S_IXGRP                              = 0x8
+	S_IXOTH                              = 0x1
+	S_IXUSR                              = 0x40
+	TAB0                                 = 0x0
+	TAB1                                 = 0x800
+	TAB2                                 = 0x1000
+	TAB3                                 = 0x1800
+	TABDLY                               = 0x1800
+	TASKSTATS_CMD_ATTR_MAX               = 0x4
+	TASKSTATS_CMD_MAX                    = 0x2
+	TASKSTATS_GENL_NAME                  = "TASKSTATS"
+	TASKSTATS_GENL_VERSION               = 0x1
+	TASKSTATS_TYPE_MAX                   = 0x6
+	TASKSTATS_VERSION                    = 0x8
+	TCFLSH                               = 0x540b
+	TCGETA                               = 0x5405
+	TCGETS                               = 0x5401
+	TCGETS2                              = 0x802c542a
+	TCGETX                               = 0x5432
+	TCIFLUSH                             = 0x0
+	TCIOFF                               = 0x2
+	TCIOFLUSH                            = 0x2
+	TCION                                = 0x3
+	TCOFLUSH                             = 0x1
+	TCOOFF                               = 0x0
+	TCOON                                = 0x1
+	TCP_CC_INFO                          = 0x1a
+	TCP_CONGESTION                       = 0xd
+	TCP_COOKIE_IN_ALWAYS                 = 0x1
+	TCP_COOKIE_MAX                       = 0x10
+	TCP_COOKIE_MIN                       = 0x8
+	TCP_COOKIE_OUT_NEVER                 = 0x2
+	TCP_COOKIE_PAIR_SIZE                 = 0x20
+	TCP_COOKIE_TRANSACTIONS              = 0xf
+	TCP_CORK                             = 0x3
+	TCP_DEFER_ACCEPT                     = 0x9
+	TCP_FASTOPEN                         = 0x17
+	TCP_FASTOPEN_CONNECT                 = 0x1e
+	TCP_INFO                             = 0xb
+	TCP_KEEPCNT                          = 0x6
+	TCP_KEEPIDLE                         = 0x4
+	TCP_KEEPINTVL                        = 0x5
+	TCP_LINGER2                          = 0x8
+	TCP_MAXSEG                           = 0x2
+	TCP_MAXWIN                           = 0xffff
+	TCP_MAX_WINSHIFT                     = 0xe
+	TCP_MD5SIG                           = 0xe
+	TCP_MD5SIG_EXT                       = 0x20
+	TCP_MD5SIG_FLAG_PREFIX               = 0x1
+	TCP_MD5SIG_MAXKEYLEN                 = 0x50
+	TCP_MSS                              = 0x200
+	TCP_MSS_DEFAULT                      = 0x218
+	TCP_MSS_DESIRED                      = 0x4c4
+	TCP_NODELAY                          = 0x1
+	TCP_NOTSENT_LOWAT                    = 0x19
+	TCP_QUEUE_SEQ                        = 0x15
+	TCP_QUICKACK                         = 0xc
+	TCP_REPAIR                           = 0x13
+	TCP_REPAIR_OPTIONS                   = 0x16
+	TCP_REPAIR_QUEUE                     = 0x14
+	TCP_REPAIR_WINDOW                    = 0x1d
+	TCP_SAVED_SYN                        = 0x1c
+	TCP_SAVE_SYN                         = 0x1b
+	TCP_SYNCNT                           = 0x7
+	TCP_S_DATA_IN                        = 0x4
+	TCP_S_DATA_OUT                       = 0x8
+	TCP_THIN_DUPACK                      = 0x11
+	TCP_THIN_LINEAR_TIMEOUTS             = 0x10
+	TCP_TIMESTAMP                        = 0x18
+	TCP_ULP                              = 0x1f
+	TCP_USER_TIMEOUT                     = 0x12
+	TCP_WINDOW_CLAMP                     = 0xa
+	TCSAFLUSH                            = 0x2
+	TCSBRK                               = 0x5409
+	TCSBRKP                              = 0x5425
+	TCSETA                               = 0x5406
+	TCSETAF                              = 0x5408
+	TCSETAW                              = 0x5407
+	TCSETS                               = 0x5402
+	TCSETS2                              = 0x402c542b
+	TCSETSF                              = 0x5404
+	TCSETSF2                             = 0x402c542d
+	TCSETSW                              = 0x5403
+	TCSETSW2                             = 0x402c542c
+	TCSETX                               = 0x5433
+	TCSETXF                              = 0x5434
+	TCSETXW                              = 0x5435
+	TCXONC                               = 0x540a
+	TIOCCBRK                             = 0x5428
+	TIOCCONS                             = 0x541d
+	TIOCEXCL                             = 0x540c
+	TIOCGDEV                             = 0x80045432
+	TIOCGETD                             = 0x5424
+	TIOCGEXCL                            = 0x80045440
+	TIOCGICOUNT                          = 0x545d
+	TIOCGLCKTRMIOS                       = 0x5456
+	TIOCGPGRP                            = 0x540f
+	TIOCGPKT                             = 0x80045438
+	TIOCGPTLCK                           = 0x80045439
+	TIOCGPTN                             = 0x80045430
+	TIOCGPTPEER                          = 0x5441
+	TIOCGRS485                           = 0x542e
+	TIOCGSERIAL                          = 0x541e
+	TIOCGSID                             = 0x5429
+	TIOCGSOFTCAR                         = 0x5419
+	TIOCGWINSZ                           = 0x5413
+	TIOCINQ                              = 0x541b
+	TIOCLINUX                            = 0x541c
+	TIOCMBIC                             = 0x5417
+	TIOCMBIS                             = 0x5416
+	TIOCMGET                             = 0x5415
+	TIOCMIWAIT                           = 0x545c
+	TIOCMSET                             = 0x5418
+	TIOCM_CAR                            = 0x40
+	TIOCM_CD                             = 0x40
+	TIOCM_CTS                            = 0x20
+	TIOCM_DSR                            = 0x100
+	TIOCM_DTR                            = 0x2
+	TIOCM_LE                             = 0x1
+	TIOCM_RI                             = 0x80
+	TIOCM_RNG                            = 0x80
+	TIOCM_RTS                            = 0x4
+	TIOCM_SR                             = 0x10
+	TIOCM_ST                             = 0x8
+	TIOCNOTTY                            = 0x5422
+	TIOCNXCL                             = 0x540d
+	TIOCOUTQ                             = 0x5411
+	TIOCPKT                              = 0x5420
+	TIOCPKT_DATA                         = 0x0
+	TIOCPKT_DOSTOP                       = 0x20
+	TIOCPKT_FLUSHREAD                    = 0x1
+	TIOCPKT_FLUSHWRITE                   = 0x2
+	TIOCPKT_IOCTL                        = 0x40
+	TIOCPKT_NOSTOP                       = 0x10
+	TIOCPKT_START                        = 0x8
+	TIOCPKT_STOP                         = 0x4
+	TIOCSBRK                             = 0x5427
+	TIOCSCTTY                            = 0x540e
+	TIOCSERCONFIG                        = 0x5453
+	TIOCSERGETLSR                        = 0x5459
+	TIOCSERGETMULTI                      = 0x545a
+	TIOCSERGSTRUCT                       = 0x5458
+	TIOCSERGWILD                         = 0x5454
+	TIOCSERSETMULTI                      = 0x545b
+	TIOCSERSWILD                         = 0x5455
+	TIOCSER_TEMT                         = 0x1
+	TIOCSETD                             = 0x5423
+	TIOCSIG                              = 0x40045436
+	TIOCSLCKTRMIOS                       = 0x5457
+	TIOCSPGRP                            = 0x5410
+	TIOCSPTLCK                           = 0x40045431
+	TIOCSRS485                           = 0x542f
+	TIOCSSERIAL                          = 0x541f
+	TIOCSSOFTCAR                         = 0x541a
+	TIOCSTI                              = 0x5412
+	TIOCSWINSZ                           = 0x5414
+	TIOCVHANGUP                          = 0x5437
+	TMPFS_MAGIC                          = 0x1021994
+	TOSTOP                               = 0x100
+	TPACKET_ALIGNMENT                    = 0x10
+	TPACKET_HDRLEN                       = 0x34
+	TP_STATUS_AVAILABLE                  = 0x0
+	TP_STATUS_BLK_TMO                    = 0x20
+	TP_STATUS_COPY                       = 0x2
+	TP_STATUS_CSUMNOTREADY               = 0x8
+	TP_STATUS_CSUM_VALID                 = 0x80
+	TP_STATUS_KERNEL                     = 0x0
+	TP_STATUS_LOSING                     = 0x4
+	TP_STATUS_SENDING                    = 0x2
+	TP_STATUS_SEND_REQUEST               = 0x1
+	TP_STATUS_TS_RAW_HARDWARE            = -0x80000000
+	TP_STATUS_TS_SOFTWARE                = 0x20000000
+	TP_STATUS_TS_SYS_HARDWARE            = 0x40000000
+	TP_STATUS_USER                       = 0x1
+	TP_STATUS_VLAN_TPID_VALID            = 0x40
+	TP_STATUS_VLAN_VALID                 = 0x10
+	TP_STATUS_WRONG_FORMAT               = 0x4
+	TRACEFS_MAGIC                        = 0x74726163
+	TS_COMM_LEN                          = 0x20
+	TUNATTACHFILTER                      = 0x401054d5
+	TUNDETACHFILTER                      = 0x401054d6
+	TUNGETFEATURES                       = 0x800454cf
+	TUNGETFILTER                         = 0x801054db
+	TUNGETIFF                            = 0x800454d2
+	TUNGETSNDBUF                         = 0x800454d3
+	TUNGETVNETBE                         = 0x800454df
+	TUNGETVNETHDRSZ                      = 0x800454d7
+	TUNGETVNETLE                         = 0x800454dd
+	TUNSETDEBUG                          = 0x400454c9
+	TUNSETFILTEREBPF                     = 0x800454e1
+	TUNSETGROUP                          = 0x400454ce
+	TUNSETIFF                            = 0x400454ca
+	TUNSETIFINDEX                        = 0x400454da
+	TUNSETLINK                           = 0x400454cd
+	TUNSETNOCSUM                         = 0x400454c8
+	TUNSETOFFLOAD                        = 0x400454d0
+	TUNSETOWNER                          = 0x400454cc
+	TUNSETPERSIST                        = 0x400454cb
+	TUNSETQUEUE                          = 0x400454d9
+	TUNSETSNDBUF                         = 0x400454d4
+	TUNSETSTEERINGEBPF                   = 0x800454e0
+	TUNSETTXFILTER                       = 0x400454d1
+	TUNSETVNETBE                         = 0x400454de
+	TUNSETVNETHDRSZ                      = 0x400454d8
+	TUNSETVNETLE                         = 0x400454dc
+	UDF_SUPER_MAGIC                      = 0x15013346
+	UMOUNT_NOFOLLOW                      = 0x8
+	USBDEVICE_SUPER_MAGIC                = 0x9fa2
+	UTIME_NOW                            = 0x3fffffff
+	UTIME_OMIT                           = 0x3ffffffe
+	V9FS_MAGIC                           = 0x1021997
+	VDISCARD                             = 0xd
+	VEOF                                 = 0x4
+	VEOL                                 = 0xb
+	VEOL2                                = 0x10
+	VERASE                               = 0x2
+	VINTR                                = 0x0
+	VKILL                                = 0x3
+	VLNEXT                               = 0xf
+	VMADDR_CID_ANY                       = 0xffffffff
+	VMADDR_CID_HOST                      = 0x2
+	VMADDR_CID_HYPERVISOR                = 0x0
+	VMADDR_CID_RESERVED                  = 0x1
+	VMADDR_PORT_ANY                      = 0xffffffff
+	VMIN                                 = 0x6
+	VM_SOCKETS_INVALID_VERSION           = 0xffffffff
+	VQUIT                                = 0x1
+	VREPRINT                             = 0xc
+	VSTART                               = 0x8
+	VSTOP                                = 0x9
+	VSUSP                                = 0xa
+	VSWTC                                = 0x7
+	VT0                                  = 0x0
+	VT1                                  = 0x4000
+	VTDLY                                = 0x4000
+	VTIME                                = 0x5
+	VWERASE                              = 0xe
+	WALL                                 = 0x40000000
+	WCLONE                               = 0x80000000
+	WCONTINUED                           = 0x8
+	WDIOC_GETBOOTSTATUS                  = 0x80045702
+	WDIOC_GETPRETIMEOUT                  = 0x80045709
+	WDIOC_GETSTATUS                      = 0x80045701
+	WDIOC_GETSUPPORT                     = 0x80285700
+	WDIOC_GETTEMP                        = 0x80045703
+	WDIOC_GETTIMELEFT                    = 0x8004570a
+	WDIOC_GETTIMEOUT                     = 0x80045707
+	WDIOC_KEEPALIVE                      = 0x80045705
+	WDIOC_SETOPTIONS                     = 0x80045704
+	WDIOC_SETPRETIMEOUT                  = 0xc0045708
+	WDIOC_SETTIMEOUT                     = 0xc0045706
+	WEXITED                              = 0x4
+	WIN_ACKMEDIACHANGE                   = 0xdb
+	WIN_CHECKPOWERMODE1                  = 0xe5
+	WIN_CHECKPOWERMODE2                  = 0x98
+	WIN_DEVICE_RESET                     = 0x8
+	WIN_DIAGNOSE                         = 0x90
+	WIN_DOORLOCK                         = 0xde
+	WIN_DOORUNLOCK                       = 0xdf
+	WIN_DOWNLOAD_MICROCODE               = 0x92
+	WIN_FLUSH_CACHE                      = 0xe7
+	WIN_FLUSH_CACHE_EXT                  = 0xea
+	WIN_FORMAT                           = 0x50
+	WIN_GETMEDIASTATUS                   = 0xda
+	WIN_IDENTIFY                         = 0xec
+	WIN_IDENTIFY_DMA                     = 0xee
+	WIN_IDLEIMMEDIATE                    = 0xe1
+	WIN_INIT                             = 0x60
+	WIN_MEDIAEJECT                       = 0xed
+	WIN_MULTREAD                         = 0xc4
+	WIN_MULTREAD_EXT                     = 0x29
+	WIN_MULTWRITE                        = 0xc5
+	WIN_MULTWRITE_EXT                    = 0x39
+	WIN_NOP                              = 0x0
+	WIN_PACKETCMD                        = 0xa0
+	WIN_PIDENTIFY                        = 0xa1
+	WIN_POSTBOOT                         = 0xdc
+	WIN_PREBOOT                          = 0xdd
+	WIN_QUEUED_SERVICE                   = 0xa2
+	WIN_READ                             = 0x20
+	WIN_READDMA                          = 0xc8
+	WIN_READDMA_EXT                      = 0x25
+	WIN_READDMA_ONCE                     = 0xc9
+	WIN_READDMA_QUEUED                   = 0xc7
+	WIN_READDMA_QUEUED_EXT               = 0x26
+	WIN_READ_BUFFER                      = 0xe4
+	WIN_READ_EXT                         = 0x24
+	WIN_READ_LONG                        = 0x22
+	WIN_READ_LONG_ONCE                   = 0x23
+	WIN_READ_NATIVE_MAX                  = 0xf8
+	WIN_READ_NATIVE_MAX_EXT              = 0x27
+	WIN_READ_ONCE                        = 0x21
+	WIN_RECAL                            = 0x10
+	WIN_RESTORE                          = 0x10
+	WIN_SECURITY_DISABLE                 = 0xf6
+	WIN_SECURITY_ERASE_PREPARE           = 0xf3
+	WIN_SECURITY_ERASE_UNIT              = 0xf4
+	WIN_SECURITY_FREEZE_LOCK             = 0xf5
+	WIN_SECURITY_SET_PASS                = 0xf1
+	WIN_SECURITY_UNLOCK                  = 0xf2
+	WIN_SEEK                             = 0x70
+	WIN_SETFEATURES                      = 0xef
+	WIN_SETIDLE1                         = 0xe3
+	WIN_SETIDLE2                         = 0x97
+	WIN_SETMULT                          = 0xc6
+	WIN_SET_MAX                          = 0xf9
+	WIN_SET_MAX_EXT                      = 0x37
+	WIN_SLEEPNOW1                        = 0xe6
+	WIN_SLEEPNOW2                        = 0x99
+	WIN_SMART                            = 0xb0
+	WIN_SPECIFY                          = 0x91
+	WIN_SRST                             = 0x8
+	WIN_STANDBY                          = 0xe2
+	WIN_STANDBY2                         = 0x96
+	WIN_STANDBYNOW1                      = 0xe0
+	WIN_STANDBYNOW2                      = 0x94
+	WIN_VERIFY                           = 0x40
+	WIN_VERIFY_EXT                       = 0x42
+	WIN_VERIFY_ONCE                      = 0x41
+	WIN_WRITE                            = 0x30
+	WIN_WRITEDMA                         = 0xca
+	WIN_WRITEDMA_EXT                     = 0x35
+	WIN_WRITEDMA_ONCE                    = 0xcb
+	WIN_WRITEDMA_QUEUED                  = 0xcc
+	WIN_WRITEDMA_QUEUED_EXT              = 0x36
+	WIN_WRITE_BUFFER                     = 0xe8
+	WIN_WRITE_EXT                        = 0x34
+	WIN_WRITE_LONG                       = 0x32
+	WIN_WRITE_LONG_ONCE                  = 0x33
+	WIN_WRITE_ONCE                       = 0x31
+	WIN_WRITE_SAME                       = 0xe9
+	WIN_WRITE_VERIFY                     = 0x3c
+	WNOHANG                              = 0x1
+	WNOTHREAD                            = 0x20000000
+	WNOWAIT                              = 0x1000000
+	WORDSIZE                             = 0x40
+	WSTOPPED                             = 0x2
+	WUNTRACED                            = 0x2
+	XATTR_CREATE                         = 0x1
+	XATTR_REPLACE                        = 0x2
+	XCASE                                = 0x4
+	XENFS_SUPER_MAGIC                    = 0xabba1974
+	XTABS                                = 0x1800
+	ZSMALLOC_MAGIC                       = 0x58295829
 )
 
 // Errors
@@ -1912,7 +2408,6 @@ const (
 	SIGTSTP   = syscall.Signal(0x14)
 	SIGTTIN   = syscall.Signal(0x15)
 	SIGTTOU   = syscall.Signal(0x16)
-	SIGUNUSED = syscall.Signal(0x1f)
 	SIGURG    = syscall.Signal(0x17)
 	SIGUSR1   = syscall.Signal(0xa)
 	SIGUSR2   = syscall.Signal(0xc)
@@ -1923,171 +2418,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "operation not permitted",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "input/output error",
-	6:   "no such device or address",
-	7:   "argument list too long",
-	8:   "exec format error",
-	9:   "bad file descriptor",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "cannot allocate memory",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device or resource busy",
-	17:  "file exists",
-	18:  "invalid cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "too many open files in system",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "numerical argument out of domain",
-	34:  "numerical result out of range",
-	35:  "resource deadlock avoided",
-	36:  "file name too long",
-	37:  "no locks available",
-	38:  "function not implemented",
-	39:  "directory not empty",
-	40:  "too many levels of symbolic links",
-	42:  "no message of desired type",
-	43:  "identifier removed",
-	44:  "channel number out of range",
-	45:  "level 2 not synchronized",
-	46:  "level 3 halted",
-	47:  "level 3 reset",
-	48:  "link number out of range",
-	49:  "protocol driver not attached",
-	50:  "no CSI structure available",
-	51:  "level 2 halted",
-	52:  "invalid exchange",
-	53:  "invalid request descriptor",
-	54:  "exchange full",
-	55:  "no anode",
-	56:  "invalid request code",
-	57:  "invalid slot",
-	59:  "bad font file format",
-	60:  "device not a stream",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of streams resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "multihop attempted",
-	73:  "RFS specific error",
-	74:  "bad message",
-	75:  "value too large for defined data type",
-	76:  "name not unique on network",
-	77:  "file descriptor in bad state",
-	78:  "remote address changed",
-	79:  "can not access a needed shared library",
-	80:  "accessing a corrupted shared library",
-	81:  ".lib section in a.out corrupted",
-	82:  "attempting to link in too many shared libraries",
-	83:  "cannot exec a shared library directly",
-	84:  "invalid or incomplete multibyte or wide character",
-	85:  "interrupted system call should be restarted",
-	86:  "streams pipe error",
-	87:  "too many users",
-	88:  "socket operation on non-socket",
-	89:  "destination address required",
-	90:  "message too long",
-	91:  "protocol wrong type for socket",
-	92:  "protocol not available",
-	93:  "protocol not supported",
-	94:  "socket type not supported",
-	95:  "operation not supported",
-	96:  "protocol family not supported",
-	97:  "address family not supported by protocol",
-	98:  "address already in use",
-	99:  "cannot assign requested address",
-	100: "network is down",
-	101: "network is unreachable",
-	102: "network dropped connection on reset",
-	103: "software caused connection abort",
-	104: "connection reset by peer",
-	105: "no buffer space available",
-	106: "transport endpoint is already connected",
-	107: "transport endpoint is not connected",
-	108: "cannot send after transport endpoint shutdown",
-	109: "too many references: cannot splice",
-	110: "connection timed out",
-	111: "connection refused",
-	112: "host is down",
-	113: "no route to host",
-	114: "operation already in progress",
-	115: "operation now in progress",
-	116: "stale file handle",
-	117: "structure needs cleaning",
-	118: "not a XENIX named type file",
-	119: "no XENIX semaphores available",
-	120: "is a named type file",
-	121: "remote I/O error",
-	122: "disk quota exceeded",
-	123: "no medium found",
-	124: "wrong medium type",
-	125: "operation canceled",
-	126: "required key not available",
-	127: "key has expired",
-	128: "key has been revoked",
-	129: "key was rejected by service",
-	130: "owner died",
-	131: "state not recoverable",
-	132: "operation not possible due to RF-kill",
-	133: "memory page has hardware error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device or resource busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "invalid cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "numerical result out of range"},
+	{35, "EDEADLK", "resource deadlock avoided"},
+	{36, "ENAMETOOLONG", "file name too long"},
+	{37, "ENOLCK", "no locks available"},
+	{38, "ENOSYS", "function not implemented"},
+	{39, "ENOTEMPTY", "directory not empty"},
+	{40, "ELOOP", "too many levels of symbolic links"},
+	{42, "ENOMSG", "no message of desired type"},
+	{43, "EIDRM", "identifier removed"},
+	{44, "ECHRNG", "channel number out of range"},
+	{45, "EL2NSYNC", "level 2 not synchronized"},
+	{46, "EL3HLT", "level 3 halted"},
+	{47, "EL3RST", "level 3 reset"},
+	{48, "ELNRNG", "link number out of range"},
+	{49, "EUNATCH", "protocol driver not attached"},
+	{50, "ENOCSI", "no CSI structure available"},
+	{51, "EL2HLT", "level 2 halted"},
+	{52, "EBADE", "invalid exchange"},
+	{53, "EBADR", "invalid request descriptor"},
+	{54, "EXFULL", "exchange full"},
+	{55, "ENOANO", "no anode"},
+	{56, "EBADRQC", "invalid request code"},
+	{57, "EBADSLT", "invalid slot"},
+	{59, "EBFONT", "bad font file format"},
+	{60, "ENOSTR", "device not a stream"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of streams resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "EMULTIHOP", "multihop attempted"},
+	{73, "EDOTDOT", "RFS specific error"},
+	{74, "EBADMSG", "bad message"},
+	{75, "EOVERFLOW", "value too large for defined data type"},
+	{76, "ENOTUNIQ", "name not unique on network"},
+	{77, "EBADFD", "file descriptor in bad state"},
+	{78, "EREMCHG", "remote address changed"},
+	{79, "ELIBACC", "can not access a needed shared library"},
+	{80, "ELIBBAD", "accessing a corrupted shared library"},
+	{81, "ELIBSCN", ".lib section in a.out corrupted"},
+	{82, "ELIBMAX", "attempting to link in too many shared libraries"},
+	{83, "ELIBEXEC", "cannot exec a shared library directly"},
+	{84, "EILSEQ", "invalid or incomplete multibyte or wide character"},
+	{85, "ERESTART", "interrupted system call should be restarted"},
+	{86, "ESTRPIPE", "streams pipe error"},
+	{87, "EUSERS", "too many users"},
+	{88, "ENOTSOCK", "socket operation on non-socket"},
+	{89, "EDESTADDRREQ", "destination address required"},
+	{90, "EMSGSIZE", "message too long"},
+	{91, "EPROTOTYPE", "protocol wrong type for socket"},
+	{92, "ENOPROTOOPT", "protocol not available"},
+	{93, "EPROTONOSUPPORT", "protocol not supported"},
+	{94, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{95, "ENOTSUP", "operation not supported"},
+	{96, "EPFNOSUPPORT", "protocol family not supported"},
+	{97, "EAFNOSUPPORT", "address family not supported by protocol"},
+	{98, "EADDRINUSE", "address already in use"},
+	{99, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{100, "ENETDOWN", "network is down"},
+	{101, "ENETUNREACH", "network is unreachable"},
+	{102, "ENETRESET", "network dropped connection on reset"},
+	{103, "ECONNABORTED", "software caused connection abort"},
+	{104, "ECONNRESET", "connection reset by peer"},
+	{105, "ENOBUFS", "no buffer space available"},
+	{106, "EISCONN", "transport endpoint is already connected"},
+	{107, "ENOTCONN", "transport endpoint is not connected"},
+	{108, "ESHUTDOWN", "cannot send after transport endpoint shutdown"},
+	{109, "ETOOMANYREFS", "too many references: cannot splice"},
+	{110, "ETIMEDOUT", "connection timed out"},
+	{111, "ECONNREFUSED", "connection refused"},
+	{112, "EHOSTDOWN", "host is down"},
+	{113, "EHOSTUNREACH", "no route to host"},
+	{114, "EALREADY", "operation already in progress"},
+	{115, "EINPROGRESS", "operation now in progress"},
+	{116, "ESTALE", "stale file handle"},
+	{117, "EUCLEAN", "structure needs cleaning"},
+	{118, "ENOTNAM", "not a XENIX named type file"},
+	{119, "ENAVAIL", "no XENIX semaphores available"},
+	{120, "EISNAM", "is a named type file"},
+	{121, "EREMOTEIO", "remote I/O error"},
+	{122, "EDQUOT", "disk quota exceeded"},
+	{123, "ENOMEDIUM", "no medium found"},
+	{124, "EMEDIUMTYPE", "wrong medium type"},
+	{125, "ECANCELED", "operation canceled"},
+	{126, "ENOKEY", "required key not available"},
+	{127, "EKEYEXPIRED", "key has expired"},
+	{128, "EKEYREVOKED", "key has been revoked"},
+	{129, "EKEYREJECTED", "key was rejected by service"},
+	{130, "EOWNERDEAD", "owner died"},
+	{131, "ENOTRECOVERABLE", "state not recoverable"},
+	{132, "ERFKILL", "operation not possible due to RF-kill"},
+	{133, "EHWPOISON", "memory page has hardware error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "stack fault",
-	17: "child exited",
-	18: "continued",
-	19: "stopped (signal)",
-	20: "stopped",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "urgent I/O condition",
-	24: "CPU time limit exceeded",
-	25: "file size limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window changed",
-	29: "I/O possible",
-	30: "power failure",
-	31: "bad system call",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/breakpoint trap"},
+	{6, "SIGABRT", "aborted"},
+	{7, "SIGBUS", "bus error"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGUSR1", "user defined signal 1"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGUSR2", "user defined signal 2"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGSTKFLT", "stack fault"},
+	{17, "SIGCHLD", "child exited"},
+	{18, "SIGCONT", "continued"},
+	{19, "SIGSTOP", "stopped (signal)"},
+	{20, "SIGTSTP", "stopped"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGURG", "urgent I/O condition"},
+	{24, "SIGXCPU", "CPU time limit exceeded"},
+	{25, "SIGXFSZ", "file size limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window changed"},
+	{29, "SIGIO", "I/O possible"},
+	{30, "SIGPWR", "power failure"},
+	{31, "SIGSYS", "bad system call"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
index b4338d5f26..cd93ce0d85 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_386.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,netbsd
 
@@ -159,6 +159,7 @@ const (
 	CLONE_VFORK                       = 0x4000
 	CLONE_VM                          = 0x100
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -169,6 +170,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	CTL_QUERY                         = -0x2
@@ -581,6 +584,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -970,6 +974,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -1576,137 +1584,145 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
index 4994437b63..071701c411 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,netbsd
 
@@ -159,6 +159,7 @@ const (
 	CLONE_VFORK                       = 0x4000
 	CLONE_VM                          = 0x100
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -169,6 +170,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	CTL_QUERY                         = -0x2
@@ -571,6 +574,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -960,6 +964,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -1566,137 +1574,145 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
index ac85ca6452..5fe56ae8c7 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_netbsd_arm.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -marm
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,netbsd
 
@@ -151,6 +151,7 @@ const (
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -161,6 +162,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	CTL_QUERY                         = -0x2
@@ -563,6 +566,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -952,6 +956,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
 	LOCK_SH                           = 0x1
@@ -1006,6 +1014,9 @@ const (
 	MSG_TRUNC                         = 0x10
 	MSG_USERFLAGS                     = 0xffffff
 	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x2
+	MS_SYNC                           = 0x4
 	NAME_MAX                          = 0x1ff
 	NET_RT_DUMP                       = 0x1
 	NET_RT_FLAGS                      = 0x2
@@ -1552,137 +1563,145 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large or too small",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol option not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "identifier removed",
-	83: "no message of desired type",
-	84: "value too large to be stored in data type",
-	85: "illegal byte sequence",
-	86: "not supported",
-	87: "operation Canceled",
-	88: "bad or Corrupt message",
-	89: "no message available",
-	90: "no STREAM resources",
-	91: "not a STREAM",
-	92: "STREAM ioctl timeout",
-	93: "attribute not found",
-	94: "multihop attempted",
-	95: "link has been severed",
-	96: "protocol error",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large or too small"},
+	{35, "EAGAIN", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol option not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "connection timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disc quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC prog. not avail"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIDRM", "identifier removed"},
+	{83, "ENOMSG", "no message of desired type"},
+	{84, "EOVERFLOW", "value too large to be stored in data type"},
+	{85, "EILSEQ", "illegal byte sequence"},
+	{86, "ENOTSUP", "not supported"},
+	{87, "ECANCELED", "operation Canceled"},
+	{88, "EBADMSG", "bad or Corrupt message"},
+	{89, "ENODATA", "no message available"},
+	{90, "ENOSR", "no STREAM resources"},
+	{91, "ENOSTR", "not a STREAM"},
+	{92, "ETIME", "STREAM ioctl timeout"},
+	{93, "ENOATTR", "attribute not found"},
+	{94, "EMULTIHOP", "multihop attempted"},
+	{95, "ENOLINK", "link has been severed"},
+	{96, "ELAST", "protocol error"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "power fail/restart",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGIOT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "stopped (signal)"},
+	{18, "SIGTSTP", "stopped"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGPWR", "power fail/restart"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
index 3322e998d3..0a1c3e7e8c 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_386.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m32
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,openbsd
 
@@ -147,6 +147,7 @@ const (
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -157,6 +158,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DIOCOSFPFLUSH                     = 0x2000444e
@@ -442,6 +445,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -860,6 +864,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LCNT_OVERLOAD_FLUSH               = 0x6
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
@@ -1453,132 +1461,140 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ELAST", "not supported"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
index 1758ecca93..0d50f6b093 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,openbsd
 
@@ -147,6 +147,7 @@ const (
 	CFLUSH                            = 0xf
 	CLOCAL                            = 0x8000
 	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
 	CS5                               = 0x0
 	CS6                               = 0x100
 	CS7                               = 0x200
@@ -157,6 +158,8 @@ const (
 	CSTOP                             = 0x13
 	CSTOPB                            = 0x400
 	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
 	CTL_MAXNAME                       = 0xc
 	CTL_NET                           = 0x4
 	DIOCOSFPFLUSH                     = 0x2000444e
@@ -442,6 +445,7 @@ const (
 	F_UNLCK                           = 0x2
 	F_WRLCK                           = 0x3
 	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
 	ICANON                            = 0x100
 	ICMP6_FILTER                      = 0x12
 	ICRNL                             = 0x100
@@ -860,6 +864,10 @@ const (
 	IXANY                             = 0x800
 	IXOFF                             = 0x400
 	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
 	LCNT_OVERLOAD_FLUSH               = 0x6
 	LOCK_EX                           = 0x2
 	LOCK_NB                           = 0x4
@@ -1452,132 +1460,140 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:  "operation not permitted",
-	2:  "no such file or directory",
-	3:  "no such process",
-	4:  "interrupted system call",
-	5:  "input/output error",
-	6:  "device not configured",
-	7:  "argument list too long",
-	8:  "exec format error",
-	9:  "bad file descriptor",
-	10: "no child processes",
-	11: "resource deadlock avoided",
-	12: "cannot allocate memory",
-	13: "permission denied",
-	14: "bad address",
-	15: "block device required",
-	16: "device busy",
-	17: "file exists",
-	18: "cross-device link",
-	19: "operation not supported by device",
-	20: "not a directory",
-	21: "is a directory",
-	22: "invalid argument",
-	23: "too many open files in system",
-	24: "too many open files",
-	25: "inappropriate ioctl for device",
-	26: "text file busy",
-	27: "file too large",
-	28: "no space left on device",
-	29: "illegal seek",
-	30: "read-only file system",
-	31: "too many links",
-	32: "broken pipe",
-	33: "numerical argument out of domain",
-	34: "result too large",
-	35: "resource temporarily unavailable",
-	36: "operation now in progress",
-	37: "operation already in progress",
-	38: "socket operation on non-socket",
-	39: "destination address required",
-	40: "message too long",
-	41: "protocol wrong type for socket",
-	42: "protocol not available",
-	43: "protocol not supported",
-	44: "socket type not supported",
-	45: "operation not supported",
-	46: "protocol family not supported",
-	47: "address family not supported by protocol family",
-	48: "address already in use",
-	49: "can't assign requested address",
-	50: "network is down",
-	51: "network is unreachable",
-	52: "network dropped connection on reset",
-	53: "software caused connection abort",
-	54: "connection reset by peer",
-	55: "no buffer space available",
-	56: "socket is already connected",
-	57: "socket is not connected",
-	58: "can't send after socket shutdown",
-	59: "too many references: can't splice",
-	60: "connection timed out",
-	61: "connection refused",
-	62: "too many levels of symbolic links",
-	63: "file name too long",
-	64: "host is down",
-	65: "no route to host",
-	66: "directory not empty",
-	67: "too many processes",
-	68: "too many users",
-	69: "disc quota exceeded",
-	70: "stale NFS file handle",
-	71: "too many levels of remote in path",
-	72: "RPC struct is bad",
-	73: "RPC version wrong",
-	74: "RPC prog. not avail",
-	75: "program version wrong",
-	76: "bad procedure for program",
-	77: "no locks available",
-	78: "function not implemented",
-	79: "inappropriate file type or format",
-	80: "authentication error",
-	81: "need authenticator",
-	82: "IPsec processing failure",
-	83: "attribute not found",
-	84: "illegal byte sequence",
-	85: "no medium found",
-	86: "wrong medium type",
-	87: "value too large to be stored in data type",
-	88: "operation canceled",
-	89: "identifier removed",
-	90: "no message of desired type",
-	91: "not supported",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ELAST", "not supported"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/BPT trap",
-	6:  "abort trap",
-	7:  "EMT trap",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "bus error",
-	11: "segmentation fault",
-	12: "bad system call",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-	16: "urgent I/O condition",
-	17: "stopped (signal)",
-	18: "stopped",
-	19: "continued",
-	20: "child exited",
-	21: "stopped (tty input)",
-	22: "stopped (tty output)",
-	23: "I/O possible",
-	24: "cputime limit exceeded",
-	25: "filesize limit exceeded",
-	26: "virtual timer expired",
-	27: "profiling timer expired",
-	28: "window size changes",
-	29: "information request",
-	30: "user defined signal 1",
-	31: "user defined signal 2",
-	32: "thread AST",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
new file mode 100644
index 0000000000..93e37c4b28
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_openbsd_arm.go
@@ -0,0 +1,1602 @@
+// mkerrors.sh
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// Created by cgo -godefs - DO NOT EDIT
+// cgo -godefs -- _const.go
+
+// +build arm,openbsd
+
+package unix
+
+import "syscall"
+
+const (
+	AF_APPLETALK                      = 0x10
+	AF_BLUETOOTH                      = 0x20
+	AF_CCITT                          = 0xa
+	AF_CHAOS                          = 0x5
+	AF_CNT                            = 0x15
+	AF_COIP                           = 0x14
+	AF_DATAKIT                        = 0x9
+	AF_DECnet                         = 0xc
+	AF_DLI                            = 0xd
+	AF_E164                           = 0x1a
+	AF_ECMA                           = 0x8
+	AF_ENCAP                          = 0x1c
+	AF_HYLINK                         = 0xf
+	AF_IMPLINK                        = 0x3
+	AF_INET                           = 0x2
+	AF_INET6                          = 0x18
+	AF_IPX                            = 0x17
+	AF_ISDN                           = 0x1a
+	AF_ISO                            = 0x7
+	AF_KEY                            = 0x1e
+	AF_LAT                            = 0xe
+	AF_LINK                           = 0x12
+	AF_LOCAL                          = 0x1
+	AF_MAX                            = 0x24
+	AF_MPLS                           = 0x21
+	AF_NATM                           = 0x1b
+	AF_NS                             = 0x6
+	AF_OSI                            = 0x7
+	AF_PUP                            = 0x4
+	AF_ROUTE                          = 0x11
+	AF_SIP                            = 0x1d
+	AF_SNA                            = 0xb
+	AF_UNIX                           = 0x1
+	AF_UNSPEC                         = 0x0
+	ARPHRD_ETHER                      = 0x1
+	ARPHRD_FRELAY                     = 0xf
+	ARPHRD_IEEE1394                   = 0x18
+	ARPHRD_IEEE802                    = 0x6
+	B0                                = 0x0
+	B110                              = 0x6e
+	B115200                           = 0x1c200
+	B1200                             = 0x4b0
+	B134                              = 0x86
+	B14400                            = 0x3840
+	B150                              = 0x96
+	B1800                             = 0x708
+	B19200                            = 0x4b00
+	B200                              = 0xc8
+	B230400                           = 0x38400
+	B2400                             = 0x960
+	B28800                            = 0x7080
+	B300                              = 0x12c
+	B38400                            = 0x9600
+	B4800                             = 0x12c0
+	B50                               = 0x32
+	B57600                            = 0xe100
+	B600                              = 0x258
+	B7200                             = 0x1c20
+	B75                               = 0x4b
+	B76800                            = 0x12c00
+	B9600                             = 0x2580
+	BIOCFLUSH                         = 0x20004268
+	BIOCGBLEN                         = 0x40044266
+	BIOCGDIRFILT                      = 0x4004427c
+	BIOCGDLT                          = 0x4004426a
+	BIOCGDLTLIST                      = 0xc008427b
+	BIOCGETIF                         = 0x4020426b
+	BIOCGFILDROP                      = 0x40044278
+	BIOCGHDRCMPLT                     = 0x40044274
+	BIOCGRSIG                         = 0x40044273
+	BIOCGRTIMEOUT                     = 0x400c426e
+	BIOCGSTATS                        = 0x4008426f
+	BIOCIMMEDIATE                     = 0x80044270
+	BIOCLOCK                          = 0x20004276
+	BIOCPROMISC                       = 0x20004269
+	BIOCSBLEN                         = 0xc0044266
+	BIOCSDIRFILT                      = 0x8004427d
+	BIOCSDLT                          = 0x8004427a
+	BIOCSETF                          = 0x80084267
+	BIOCSETIF                         = 0x8020426c
+	BIOCSETWF                         = 0x80084277
+	BIOCSFILDROP                      = 0x80044279
+	BIOCSHDRCMPLT                     = 0x80044275
+	BIOCSRSIG                         = 0x80044272
+	BIOCSRTIMEOUT                     = 0x800c426d
+	BIOCVERSION                       = 0x40044271
+	BPF_A                             = 0x10
+	BPF_ABS                           = 0x20
+	BPF_ADD                           = 0x0
+	BPF_ALIGNMENT                     = 0x4
+	BPF_ALU                           = 0x4
+	BPF_AND                           = 0x50
+	BPF_B                             = 0x10
+	BPF_DIRECTION_IN                  = 0x1
+	BPF_DIRECTION_OUT                 = 0x2
+	BPF_DIV                           = 0x30
+	BPF_H                             = 0x8
+	BPF_IMM                           = 0x0
+	BPF_IND                           = 0x40
+	BPF_JA                            = 0x0
+	BPF_JEQ                           = 0x10
+	BPF_JGE                           = 0x30
+	BPF_JGT                           = 0x20
+	BPF_JMP                           = 0x5
+	BPF_JSET                          = 0x40
+	BPF_K                             = 0x0
+	BPF_LD                            = 0x0
+	BPF_LDX                           = 0x1
+	BPF_LEN                           = 0x80
+	BPF_LSH                           = 0x60
+	BPF_MAJOR_VERSION                 = 0x1
+	BPF_MAXBUFSIZE                    = 0x200000
+	BPF_MAXINSNS                      = 0x200
+	BPF_MEM                           = 0x60
+	BPF_MEMWORDS                      = 0x10
+	BPF_MINBUFSIZE                    = 0x20
+	BPF_MINOR_VERSION                 = 0x1
+	BPF_MISC                          = 0x7
+	BPF_MSH                           = 0xa0
+	BPF_MUL                           = 0x20
+	BPF_NEG                           = 0x80
+	BPF_OR                            = 0x40
+	BPF_RELEASE                       = 0x30bb6
+	BPF_RET                           = 0x6
+	BPF_RSH                           = 0x70
+	BPF_ST                            = 0x2
+	BPF_STX                           = 0x3
+	BPF_SUB                           = 0x10
+	BPF_TAX                           = 0x0
+	BPF_TXA                           = 0x80
+	BPF_W                             = 0x0
+	BPF_X                             = 0x8
+	BRKINT                            = 0x2
+	CFLUSH                            = 0xf
+	CLOCAL                            = 0x8000
+	CREAD                             = 0x800
+	CRTSCTS                           = 0x10000
+	CS5                               = 0x0
+	CS6                               = 0x100
+	CS7                               = 0x200
+	CS8                               = 0x300
+	CSIZE                             = 0x300
+	CSTART                            = 0x11
+	CSTATUS                           = 0xff
+	CSTOP                             = 0x13
+	CSTOPB                            = 0x400
+	CSUSP                             = 0x1a
+	CTL_HW                            = 0x6
+	CTL_KERN                          = 0x1
+	CTL_MAXNAME                       = 0xc
+	CTL_NET                           = 0x4
+	DIOCOSFPFLUSH                     = 0x2000444e
+	DLT_ARCNET                        = 0x7
+	DLT_ATM_RFC1483                   = 0xb
+	DLT_AX25                          = 0x3
+	DLT_CHAOS                         = 0x5
+	DLT_C_HDLC                        = 0x68
+	DLT_EN10MB                        = 0x1
+	DLT_EN3MB                         = 0x2
+	DLT_ENC                           = 0xd
+	DLT_FDDI                          = 0xa
+	DLT_IEEE802                       = 0x6
+	DLT_IEEE802_11                    = 0x69
+	DLT_IEEE802_11_RADIO              = 0x7f
+	DLT_LOOP                          = 0xc
+	DLT_MPLS                          = 0xdb
+	DLT_NULL                          = 0x0
+	DLT_PFLOG                         = 0x75
+	DLT_PFSYNC                        = 0x12
+	DLT_PPP                           = 0x9
+	DLT_PPP_BSDOS                     = 0x10
+	DLT_PPP_ETHER                     = 0x33
+	DLT_PPP_SERIAL                    = 0x32
+	DLT_PRONET                        = 0x4
+	DLT_RAW                           = 0xe
+	DLT_SLIP                          = 0x8
+	DLT_SLIP_BSDOS                    = 0xf
+	DT_BLK                            = 0x6
+	DT_CHR                            = 0x2
+	DT_DIR                            = 0x4
+	DT_FIFO                           = 0x1
+	DT_LNK                            = 0xa
+	DT_REG                            = 0x8
+	DT_SOCK                           = 0xc
+	DT_UNKNOWN                        = 0x0
+	ECHO                              = 0x8
+	ECHOCTL                           = 0x40
+	ECHOE                             = 0x2
+	ECHOK                             = 0x4
+	ECHOKE                            = 0x1
+	ECHONL                            = 0x10
+	ECHOPRT                           = 0x20
+	EMT_TAGOVF                        = 0x1
+	EMUL_ENABLED                      = 0x1
+	EMUL_NATIVE                       = 0x2
+	ENDRUNDISC                        = 0x9
+	ETHERMIN                          = 0x2e
+	ETHERMTU                          = 0x5dc
+	ETHERTYPE_8023                    = 0x4
+	ETHERTYPE_AARP                    = 0x80f3
+	ETHERTYPE_ACCTON                  = 0x8390
+	ETHERTYPE_AEONIC                  = 0x8036
+	ETHERTYPE_ALPHA                   = 0x814a
+	ETHERTYPE_AMBER                   = 0x6008
+	ETHERTYPE_AMOEBA                  = 0x8145
+	ETHERTYPE_AOE                     = 0x88a2
+	ETHERTYPE_APOLLO                  = 0x80f7
+	ETHERTYPE_APOLLODOMAIN            = 0x8019
+	ETHERTYPE_APPLETALK               = 0x809b
+	ETHERTYPE_APPLITEK                = 0x80c7
+	ETHERTYPE_ARGONAUT                = 0x803a
+	ETHERTYPE_ARP                     = 0x806
+	ETHERTYPE_AT                      = 0x809b
+	ETHERTYPE_ATALK                   = 0x809b
+	ETHERTYPE_ATOMIC                  = 0x86df
+	ETHERTYPE_ATT                     = 0x8069
+	ETHERTYPE_ATTSTANFORD             = 0x8008
+	ETHERTYPE_AUTOPHON                = 0x806a
+	ETHERTYPE_AXIS                    = 0x8856
+	ETHERTYPE_BCLOOP                  = 0x9003
+	ETHERTYPE_BOFL                    = 0x8102
+	ETHERTYPE_CABLETRON               = 0x7034
+	ETHERTYPE_CHAOS                   = 0x804
+	ETHERTYPE_COMDESIGN               = 0x806c
+	ETHERTYPE_COMPUGRAPHIC            = 0x806d
+	ETHERTYPE_COUNTERPOINT            = 0x8062
+	ETHERTYPE_CRONUS                  = 0x8004
+	ETHERTYPE_CRONUSVLN               = 0x8003
+	ETHERTYPE_DCA                     = 0x1234
+	ETHERTYPE_DDE                     = 0x807b
+	ETHERTYPE_DEBNI                   = 0xaaaa
+	ETHERTYPE_DECAM                   = 0x8048
+	ETHERTYPE_DECCUST                 = 0x6006
+	ETHERTYPE_DECDIAG                 = 0x6005
+	ETHERTYPE_DECDNS                  = 0x803c
+	ETHERTYPE_DECDTS                  = 0x803e
+	ETHERTYPE_DECEXPER                = 0x6000
+	ETHERTYPE_DECLAST                 = 0x8041
+	ETHERTYPE_DECLTM                  = 0x803f
+	ETHERTYPE_DECMUMPS                = 0x6009
+	ETHERTYPE_DECNETBIOS              = 0x8040
+	ETHERTYPE_DELTACON                = 0x86de
+	ETHERTYPE_DIDDLE                  = 0x4321
+	ETHERTYPE_DLOG1                   = 0x660
+	ETHERTYPE_DLOG2                   = 0x661
+	ETHERTYPE_DN                      = 0x6003
+	ETHERTYPE_DOGFIGHT                = 0x1989
+	ETHERTYPE_DSMD                    = 0x8039
+	ETHERTYPE_ECMA                    = 0x803
+	ETHERTYPE_ENCRYPT                 = 0x803d
+	ETHERTYPE_ES                      = 0x805d
+	ETHERTYPE_EXCELAN                 = 0x8010
+	ETHERTYPE_EXPERDATA               = 0x8049
+	ETHERTYPE_FLIP                    = 0x8146
+	ETHERTYPE_FLOWCONTROL             = 0x8808
+	ETHERTYPE_FRARP                   = 0x808
+	ETHERTYPE_GENDYN                  = 0x8068
+	ETHERTYPE_HAYES                   = 0x8130
+	ETHERTYPE_HIPPI_FP                = 0x8180
+	ETHERTYPE_HITACHI                 = 0x8820
+	ETHERTYPE_HP                      = 0x8005
+	ETHERTYPE_IEEEPUP                 = 0xa00
+	ETHERTYPE_IEEEPUPAT               = 0xa01
+	ETHERTYPE_IMLBL                   = 0x4c42
+	ETHERTYPE_IMLBLDIAG               = 0x424c
+	ETHERTYPE_IP                      = 0x800
+	ETHERTYPE_IPAS                    = 0x876c
+	ETHERTYPE_IPV6                    = 0x86dd
+	ETHERTYPE_IPX                     = 0x8137
+	ETHERTYPE_IPXNEW                  = 0x8037
+	ETHERTYPE_KALPANA                 = 0x8582
+	ETHERTYPE_LANBRIDGE               = 0x8038
+	ETHERTYPE_LANPROBE                = 0x8888
+	ETHERTYPE_LAT                     = 0x6004
+	ETHERTYPE_LBACK                   = 0x9000
+	ETHERTYPE_LITTLE                  = 0x8060
+	ETHERTYPE_LLDP                    = 0x88cc
+	ETHERTYPE_LOGICRAFT               = 0x8148
+	ETHERTYPE_LOOPBACK                = 0x9000
+	ETHERTYPE_MATRA                   = 0x807a
+	ETHERTYPE_MAX                     = 0xffff
+	ETHERTYPE_MERIT                   = 0x807c
+	ETHERTYPE_MICP                    = 0x873a
+	ETHERTYPE_MOPDL                   = 0x6001
+	ETHERTYPE_MOPRC                   = 0x6002
+	ETHERTYPE_MOTOROLA                = 0x818d
+	ETHERTYPE_MPLS                    = 0x8847
+	ETHERTYPE_MPLS_MCAST              = 0x8848
+	ETHERTYPE_MUMPS                   = 0x813f
+	ETHERTYPE_NBPCC                   = 0x3c04
+	ETHERTYPE_NBPCLAIM                = 0x3c09
+	ETHERTYPE_NBPCLREQ                = 0x3c05
+	ETHERTYPE_NBPCLRSP                = 0x3c06
+	ETHERTYPE_NBPCREQ                 = 0x3c02
+	ETHERTYPE_NBPCRSP                 = 0x3c03
+	ETHERTYPE_NBPDG                   = 0x3c07
+	ETHERTYPE_NBPDGB                  = 0x3c08
+	ETHERTYPE_NBPDLTE                 = 0x3c0a
+	ETHERTYPE_NBPRAR                  = 0x3c0c
+	ETHERTYPE_NBPRAS                  = 0x3c0b
+	ETHERTYPE_NBPRST                  = 0x3c0d
+	ETHERTYPE_NBPSCD                  = 0x3c01
+	ETHERTYPE_NBPVCD                  = 0x3c00
+	ETHERTYPE_NBS                     = 0x802
+	ETHERTYPE_NCD                     = 0x8149
+	ETHERTYPE_NESTAR                  = 0x8006
+	ETHERTYPE_NETBEUI                 = 0x8191
+	ETHERTYPE_NOVELL                  = 0x8138
+	ETHERTYPE_NS                      = 0x600
+	ETHERTYPE_NSAT                    = 0x601
+	ETHERTYPE_NSCOMPAT                = 0x807
+	ETHERTYPE_NTRAILER                = 0x10
+	ETHERTYPE_OS9                     = 0x7007
+	ETHERTYPE_OS9NET                  = 0x7009
+	ETHERTYPE_PACER                   = 0x80c6
+	ETHERTYPE_PAE                     = 0x888e
+	ETHERTYPE_PCS                     = 0x4242
+	ETHERTYPE_PLANNING                = 0x8044
+	ETHERTYPE_PPP                     = 0x880b
+	ETHERTYPE_PPPOE                   = 0x8864
+	ETHERTYPE_PPPOEDISC               = 0x8863
+	ETHERTYPE_PRIMENTS                = 0x7031
+	ETHERTYPE_PUP                     = 0x200
+	ETHERTYPE_PUPAT                   = 0x200
+	ETHERTYPE_QINQ                    = 0x88a8
+	ETHERTYPE_RACAL                   = 0x7030
+	ETHERTYPE_RATIONAL                = 0x8150
+	ETHERTYPE_RAWFR                   = 0x6559
+	ETHERTYPE_RCL                     = 0x1995
+	ETHERTYPE_RDP                     = 0x8739
+	ETHERTYPE_RETIX                   = 0x80f2
+	ETHERTYPE_REVARP                  = 0x8035
+	ETHERTYPE_SCA                     = 0x6007
+	ETHERTYPE_SECTRA                  = 0x86db
+	ETHERTYPE_SECUREDATA              = 0x876d
+	ETHERTYPE_SGITW                   = 0x817e
+	ETHERTYPE_SG_BOUNCE               = 0x8016
+	ETHERTYPE_SG_DIAG                 = 0x8013
+	ETHERTYPE_SG_NETGAMES             = 0x8014
+	ETHERTYPE_SG_RESV                 = 0x8015
+	ETHERTYPE_SIMNET                  = 0x5208
+	ETHERTYPE_SLOW                    = 0x8809
+	ETHERTYPE_SNA                     = 0x80d5
+	ETHERTYPE_SNMP                    = 0x814c
+	ETHERTYPE_SONIX                   = 0xfaf5
+	ETHERTYPE_SPIDER                  = 0x809f
+	ETHERTYPE_SPRITE                  = 0x500
+	ETHERTYPE_STP                     = 0x8181
+	ETHERTYPE_TALARIS                 = 0x812b
+	ETHERTYPE_TALARISMC               = 0x852b
+	ETHERTYPE_TCPCOMP                 = 0x876b
+	ETHERTYPE_TCPSM                   = 0x9002
+	ETHERTYPE_TEC                     = 0x814f
+	ETHERTYPE_TIGAN                   = 0x802f
+	ETHERTYPE_TRAIL                   = 0x1000
+	ETHERTYPE_TRANSETHER              = 0x6558
+	ETHERTYPE_TYMSHARE                = 0x802e
+	ETHERTYPE_UBBST                   = 0x7005
+	ETHERTYPE_UBDEBUG                 = 0x900
+	ETHERTYPE_UBDIAGLOOP              = 0x7002
+	ETHERTYPE_UBDL                    = 0x7000
+	ETHERTYPE_UBNIU                   = 0x7001
+	ETHERTYPE_UBNMC                   = 0x7003
+	ETHERTYPE_VALID                   = 0x1600
+	ETHERTYPE_VARIAN                  = 0x80dd
+	ETHERTYPE_VAXELN                  = 0x803b
+	ETHERTYPE_VEECO                   = 0x8067
+	ETHERTYPE_VEXP                    = 0x805b
+	ETHERTYPE_VGLAB                   = 0x8131
+	ETHERTYPE_VINES                   = 0xbad
+	ETHERTYPE_VINESECHO               = 0xbaf
+	ETHERTYPE_VINESLOOP               = 0xbae
+	ETHERTYPE_VITAL                   = 0xff00
+	ETHERTYPE_VLAN                    = 0x8100
+	ETHERTYPE_VLTLMAN                 = 0x8080
+	ETHERTYPE_VPROD                   = 0x805c
+	ETHERTYPE_VURESERVED              = 0x8147
+	ETHERTYPE_WATERLOO                = 0x8130
+	ETHERTYPE_WELLFLEET               = 0x8103
+	ETHERTYPE_X25                     = 0x805
+	ETHERTYPE_X75                     = 0x801
+	ETHERTYPE_XNSSM                   = 0x9001
+	ETHERTYPE_XTP                     = 0x817d
+	ETHER_ADDR_LEN                    = 0x6
+	ETHER_ALIGN                       = 0x2
+	ETHER_CRC_LEN                     = 0x4
+	ETHER_CRC_POLY_BE                 = 0x4c11db6
+	ETHER_CRC_POLY_LE                 = 0xedb88320
+	ETHER_HDR_LEN                     = 0xe
+	ETHER_MAX_DIX_LEN                 = 0x600
+	ETHER_MAX_LEN                     = 0x5ee
+	ETHER_MIN_LEN                     = 0x40
+	ETHER_TYPE_LEN                    = 0x2
+	ETHER_VLAN_ENCAP_LEN              = 0x4
+	EVFILT_AIO                        = -0x3
+	EVFILT_PROC                       = -0x5
+	EVFILT_READ                       = -0x1
+	EVFILT_SIGNAL                     = -0x6
+	EVFILT_SYSCOUNT                   = 0x7
+	EVFILT_TIMER                      = -0x7
+	EVFILT_VNODE                      = -0x4
+	EVFILT_WRITE                      = -0x2
+	EV_ADD                            = 0x1
+	EV_CLEAR                          = 0x20
+	EV_DELETE                         = 0x2
+	EV_DISABLE                        = 0x8
+	EV_ENABLE                         = 0x4
+	EV_EOF                            = 0x8000
+	EV_ERROR                          = 0x4000
+	EV_FLAG1                          = 0x2000
+	EV_ONESHOT                        = 0x10
+	EV_SYSFLAGS                       = 0xf000
+	EXTA                              = 0x4b00
+	EXTB                              = 0x9600
+	EXTPROC                           = 0x800
+	FD_CLOEXEC                        = 0x1
+	FD_SETSIZE                        = 0x400
+	FLUSHO                            = 0x800000
+	F_DUPFD                           = 0x0
+	F_DUPFD_CLOEXEC                   = 0xa
+	F_GETFD                           = 0x1
+	F_GETFL                           = 0x3
+	F_GETLK                           = 0x7
+	F_GETOWN                          = 0x5
+	F_RDLCK                           = 0x1
+	F_SETFD                           = 0x2
+	F_SETFL                           = 0x4
+	F_SETLK                           = 0x8
+	F_SETLKW                          = 0x9
+	F_SETOWN                          = 0x6
+	F_UNLCK                           = 0x2
+	F_WRLCK                           = 0x3
+	HUPCL                             = 0x4000
+	HW_MACHINE                        = 0x1
+	ICANON                            = 0x100
+	ICMP6_FILTER                      = 0x12
+	ICRNL                             = 0x100
+	IEXTEN                            = 0x400
+	IFAN_ARRIVAL                      = 0x0
+	IFAN_DEPARTURE                    = 0x1
+	IFA_ROUTE                         = 0x1
+	IFF_ALLMULTI                      = 0x200
+	IFF_BROADCAST                     = 0x2
+	IFF_CANTCHANGE                    = 0x8e52
+	IFF_DEBUG                         = 0x4
+	IFF_LINK0                         = 0x1000
+	IFF_LINK1                         = 0x2000
+	IFF_LINK2                         = 0x4000
+	IFF_LOOPBACK                      = 0x8
+	IFF_MULTICAST                     = 0x8000
+	IFF_NOARP                         = 0x80
+	IFF_NOTRAILERS                    = 0x20
+	IFF_OACTIVE                       = 0x400
+	IFF_POINTOPOINT                   = 0x10
+	IFF_PROMISC                       = 0x100
+	IFF_RUNNING                       = 0x40
+	IFF_SIMPLEX                       = 0x800
+	IFF_UP                            = 0x1
+	IFNAMSIZ                          = 0x10
+	IFT_1822                          = 0x2
+	IFT_A12MPPSWITCH                  = 0x82
+	IFT_AAL2                          = 0xbb
+	IFT_AAL5                          = 0x31
+	IFT_ADSL                          = 0x5e
+	IFT_AFLANE8023                    = 0x3b
+	IFT_AFLANE8025                    = 0x3c
+	IFT_ARAP                          = 0x58
+	IFT_ARCNET                        = 0x23
+	IFT_ARCNETPLUS                    = 0x24
+	IFT_ASYNC                         = 0x54
+	IFT_ATM                           = 0x25
+	IFT_ATMDXI                        = 0x69
+	IFT_ATMFUNI                       = 0x6a
+	IFT_ATMIMA                        = 0x6b
+	IFT_ATMLOGICAL                    = 0x50
+	IFT_ATMRADIO                      = 0xbd
+	IFT_ATMSUBINTERFACE               = 0x86
+	IFT_ATMVCIENDPT                   = 0xc2
+	IFT_ATMVIRTUAL                    = 0x95
+	IFT_BGPPOLICYACCOUNTING           = 0xa2
+	IFT_BLUETOOTH                     = 0xf8
+	IFT_BRIDGE                        = 0xd1
+	IFT_BSC                           = 0x53
+	IFT_CARP                          = 0xf7
+	IFT_CCTEMUL                       = 0x3d
+	IFT_CEPT                          = 0x13
+	IFT_CES                           = 0x85
+	IFT_CHANNEL                       = 0x46
+	IFT_CNR                           = 0x55
+	IFT_COFFEE                        = 0x84
+	IFT_COMPOSITELINK                 = 0x9b
+	IFT_DCN                           = 0x8d
+	IFT_DIGITALPOWERLINE              = 0x8a
+	IFT_DIGITALWRAPPEROVERHEADCHANNEL = 0xba
+	IFT_DLSW                          = 0x4a
+	IFT_DOCSCABLEDOWNSTREAM           = 0x80
+	IFT_DOCSCABLEMACLAYER             = 0x7f
+	IFT_DOCSCABLEUPSTREAM             = 0x81
+	IFT_DOCSCABLEUPSTREAMCHANNEL      = 0xcd
+	IFT_DS0                           = 0x51
+	IFT_DS0BUNDLE                     = 0x52
+	IFT_DS1FDL                        = 0xaa
+	IFT_DS3                           = 0x1e
+	IFT_DTM                           = 0x8c
+	IFT_DUMMY                         = 0xf1
+	IFT_DVBASILN                      = 0xac
+	IFT_DVBASIOUT                     = 0xad
+	IFT_DVBRCCDOWNSTREAM              = 0x93
+	IFT_DVBRCCMACLAYER                = 0x92
+	IFT_DVBRCCUPSTREAM                = 0x94
+	IFT_ECONET                        = 0xce
+	IFT_ENC                           = 0xf4
+	IFT_EON                           = 0x19
+	IFT_EPLRS                         = 0x57
+	IFT_ESCON                         = 0x49
+	IFT_ETHER                         = 0x6
+	IFT_FAITH                         = 0xf3
+	IFT_FAST                          = 0x7d
+	IFT_FASTETHER                     = 0x3e
+	IFT_FASTETHERFX                   = 0x45
+	IFT_FDDI                          = 0xf
+	IFT_FIBRECHANNEL                  = 0x38
+	IFT_FRAMERELAYINTERCONNECT        = 0x3a
+	IFT_FRAMERELAYMPI                 = 0x5c
+	IFT_FRDLCIENDPT                   = 0xc1
+	IFT_FRELAY                        = 0x20
+	IFT_FRELAYDCE                     = 0x2c
+	IFT_FRF16MFRBUNDLE                = 0xa3
+	IFT_FRFORWARD                     = 0x9e
+	IFT_G703AT2MB                     = 0x43
+	IFT_G703AT64K                     = 0x42
+	IFT_GIF                           = 0xf0
+	IFT_GIGABITETHERNET               = 0x75
+	IFT_GR303IDT                      = 0xb2
+	IFT_GR303RDT                      = 0xb1
+	IFT_H323GATEKEEPER                = 0xa4
+	IFT_H323PROXY                     = 0xa5
+	IFT_HDH1822                       = 0x3
+	IFT_HDLC                          = 0x76
+	IFT_HDSL2                         = 0xa8
+	IFT_HIPERLAN2                     = 0xb7
+	IFT_HIPPI                         = 0x2f
+	IFT_HIPPIINTERFACE                = 0x39
+	IFT_HOSTPAD                       = 0x5a
+	IFT_HSSI                          = 0x2e
+	IFT_HY                            = 0xe
+	IFT_IBM370PARCHAN                 = 0x48
+	IFT_IDSL                          = 0x9a
+	IFT_IEEE1394                      = 0x90
+	IFT_IEEE80211                     = 0x47
+	IFT_IEEE80212                     = 0x37
+	IFT_IEEE8023ADLAG                 = 0xa1
+	IFT_IFGSN                         = 0x91
+	IFT_IMT                           = 0xbe
+	IFT_INFINIBAND                    = 0xc7
+	IFT_INTERLEAVE                    = 0x7c
+	IFT_IP                            = 0x7e
+	IFT_IPFORWARD                     = 0x8e
+	IFT_IPOVERATM                     = 0x72
+	IFT_IPOVERCDLC                    = 0x6d
+	IFT_IPOVERCLAW                    = 0x6e
+	IFT_IPSWITCH                      = 0x4e
+	IFT_ISDN                          = 0x3f
+	IFT_ISDNBASIC                     = 0x14
+	IFT_ISDNPRIMARY                   = 0x15
+	IFT_ISDNS                         = 0x4b
+	IFT_ISDNU                         = 0x4c
+	IFT_ISO88022LLC                   = 0x29
+	IFT_ISO88023                      = 0x7
+	IFT_ISO88024                      = 0x8
+	IFT_ISO88025                      = 0x9
+	IFT_ISO88025CRFPINT               = 0x62
+	IFT_ISO88025DTR                   = 0x56
+	IFT_ISO88025FIBER                 = 0x73
+	IFT_ISO88026                      = 0xa
+	IFT_ISUP                          = 0xb3
+	IFT_L2VLAN                        = 0x87
+	IFT_L3IPVLAN                      = 0x88
+	IFT_L3IPXVLAN                     = 0x89
+	IFT_LAPB                          = 0x10
+	IFT_LAPD                          = 0x4d
+	IFT_LAPF                          = 0x77
+	IFT_LINEGROUP                     = 0xd2
+	IFT_LOCALTALK                     = 0x2a
+	IFT_LOOP                          = 0x18
+	IFT_MEDIAMAILOVERIP               = 0x8b
+	IFT_MFSIGLINK                     = 0xa7
+	IFT_MIOX25                        = 0x26
+	IFT_MODEM                         = 0x30
+	IFT_MPC                           = 0x71
+	IFT_MPLS                          = 0xa6
+	IFT_MPLSTUNNEL                    = 0x96
+	IFT_MSDSL                         = 0x8f
+	IFT_MVL                           = 0xbf
+	IFT_MYRINET                       = 0x63
+	IFT_NFAS                          = 0xaf
+	IFT_NSIP                          = 0x1b
+	IFT_OPTICALCHANNEL                = 0xc3
+	IFT_OPTICALTRANSPORT              = 0xc4
+	IFT_OTHER                         = 0x1
+	IFT_P10                           = 0xc
+	IFT_P80                           = 0xd
+	IFT_PARA                          = 0x22
+	IFT_PFLOG                         = 0xf5
+	IFT_PFLOW                         = 0xf9
+	IFT_PFSYNC                        = 0xf6
+	IFT_PLC                           = 0xae
+	IFT_PON155                        = 0xcf
+	IFT_PON622                        = 0xd0
+	IFT_POS                           = 0xab
+	IFT_PPP                           = 0x17
+	IFT_PPPMULTILINKBUNDLE            = 0x6c
+	IFT_PROPATM                       = 0xc5
+	IFT_PROPBWAP2MP                   = 0xb8
+	IFT_PROPCNLS                      = 0x59
+	IFT_PROPDOCSWIRELESSDOWNSTREAM    = 0xb5
+	IFT_PROPDOCSWIRELESSMACLAYER      = 0xb4
+	IFT_PROPDOCSWIRELESSUPSTREAM      = 0xb6
+	IFT_PROPMUX                       = 0x36
+	IFT_PROPVIRTUAL                   = 0x35
+	IFT_PROPWIRELESSP2P               = 0x9d
+	IFT_PTPSERIAL                     = 0x16
+	IFT_PVC                           = 0xf2
+	IFT_Q2931                         = 0xc9
+	IFT_QLLC                          = 0x44
+	IFT_RADIOMAC                      = 0xbc
+	IFT_RADSL                         = 0x5f
+	IFT_REACHDSL                      = 0xc0
+	IFT_RFC1483                       = 0x9f
+	IFT_RS232                         = 0x21
+	IFT_RSRB                          = 0x4f
+	IFT_SDLC                          = 0x11
+	IFT_SDSL                          = 0x60
+	IFT_SHDSL                         = 0xa9
+	IFT_SIP                           = 0x1f
+	IFT_SIPSIG                        = 0xcc
+	IFT_SIPTG                         = 0xcb
+	IFT_SLIP                          = 0x1c
+	IFT_SMDSDXI                       = 0x2b
+	IFT_SMDSICIP                      = 0x34
+	IFT_SONET                         = 0x27
+	IFT_SONETOVERHEADCHANNEL          = 0xb9
+	IFT_SONETPATH                     = 0x32
+	IFT_SONETVT                       = 0x33
+	IFT_SRP                           = 0x97
+	IFT_SS7SIGLINK                    = 0x9c
+	IFT_STACKTOSTACK                  = 0x6f
+	IFT_STARLAN                       = 0xb
+	IFT_T1                            = 0x12
+	IFT_TDLC                          = 0x74
+	IFT_TELINK                        = 0xc8
+	IFT_TERMPAD                       = 0x5b
+	IFT_TR008                         = 0xb0
+	IFT_TRANSPHDLC                    = 0x7b
+	IFT_TUNNEL                        = 0x83
+	IFT_ULTRA                         = 0x1d
+	IFT_USB                           = 0xa0
+	IFT_V11                           = 0x40
+	IFT_V35                           = 0x2d
+	IFT_V36                           = 0x41
+	IFT_V37                           = 0x78
+	IFT_VDSL                          = 0x61
+	IFT_VIRTUALIPADDRESS              = 0x70
+	IFT_VIRTUALTG                     = 0xca
+	IFT_VOICEDID                      = 0xd5
+	IFT_VOICEEM                       = 0x64
+	IFT_VOICEEMFGD                    = 0xd3
+	IFT_VOICEENCAP                    = 0x67
+	IFT_VOICEFGDEANA                  = 0xd4
+	IFT_VOICEFXO                      = 0x65
+	IFT_VOICEFXS                      = 0x66
+	IFT_VOICEOVERATM                  = 0x98
+	IFT_VOICEOVERCABLE                = 0xc6
+	IFT_VOICEOVERFRAMERELAY           = 0x99
+	IFT_VOICEOVERIP                   = 0x68
+	IFT_X213                          = 0x5d
+	IFT_X25                           = 0x5
+	IFT_X25DDN                        = 0x4
+	IFT_X25HUNTGROUP                  = 0x7a
+	IFT_X25MLP                        = 0x79
+	IFT_X25PLE                        = 0x28
+	IFT_XETHER                        = 0x1a
+	IGNBRK                            = 0x1
+	IGNCR                             = 0x80
+	IGNPAR                            = 0x4
+	IMAXBEL                           = 0x2000
+	INLCR                             = 0x40
+	INPCK                             = 0x10
+	IN_CLASSA_HOST                    = 0xffffff
+	IN_CLASSA_MAX                     = 0x80
+	IN_CLASSA_NET                     = 0xff000000
+	IN_CLASSA_NSHIFT                  = 0x18
+	IN_CLASSB_HOST                    = 0xffff
+	IN_CLASSB_MAX                     = 0x10000
+	IN_CLASSB_NET                     = 0xffff0000
+	IN_CLASSB_NSHIFT                  = 0x10
+	IN_CLASSC_HOST                    = 0xff
+	IN_CLASSC_NET                     = 0xffffff00
+	IN_CLASSC_NSHIFT                  = 0x8
+	IN_CLASSD_HOST                    = 0xfffffff
+	IN_CLASSD_NET                     = 0xf0000000
+	IN_CLASSD_NSHIFT                  = 0x1c
+	IN_LOOPBACKNET                    = 0x7f
+	IN_RFC3021_HOST                   = 0x1
+	IN_RFC3021_NET                    = 0xfffffffe
+	IN_RFC3021_NSHIFT                 = 0x1f
+	IPPROTO_AH                        = 0x33
+	IPPROTO_CARP                      = 0x70
+	IPPROTO_DIVERT                    = 0x102
+	IPPROTO_DIVERT_INIT               = 0x2
+	IPPROTO_DIVERT_RESP               = 0x1
+	IPPROTO_DONE                      = 0x101
+	IPPROTO_DSTOPTS                   = 0x3c
+	IPPROTO_EGP                       = 0x8
+	IPPROTO_ENCAP                     = 0x62
+	IPPROTO_EON                       = 0x50
+	IPPROTO_ESP                       = 0x32
+	IPPROTO_ETHERIP                   = 0x61
+	IPPROTO_FRAGMENT                  = 0x2c
+	IPPROTO_GGP                       = 0x3
+	IPPROTO_GRE                       = 0x2f
+	IPPROTO_HOPOPTS                   = 0x0
+	IPPROTO_ICMP                      = 0x1
+	IPPROTO_ICMPV6                    = 0x3a
+	IPPROTO_IDP                       = 0x16
+	IPPROTO_IGMP                      = 0x2
+	IPPROTO_IP                        = 0x0
+	IPPROTO_IPCOMP                    = 0x6c
+	IPPROTO_IPIP                      = 0x4
+	IPPROTO_IPV4                      = 0x4
+	IPPROTO_IPV6                      = 0x29
+	IPPROTO_MAX                       = 0x100
+	IPPROTO_MAXID                     = 0x103
+	IPPROTO_MOBILE                    = 0x37
+	IPPROTO_MPLS                      = 0x89
+	IPPROTO_NONE                      = 0x3b
+	IPPROTO_PFSYNC                    = 0xf0
+	IPPROTO_PIM                       = 0x67
+	IPPROTO_PUP                       = 0xc
+	IPPROTO_RAW                       = 0xff
+	IPPROTO_ROUTING                   = 0x2b
+	IPPROTO_RSVP                      = 0x2e
+	IPPROTO_TCP                       = 0x6
+	IPPROTO_TP                        = 0x1d
+	IPPROTO_UDP                       = 0x11
+	IPV6_AUTH_LEVEL                   = 0x35
+	IPV6_AUTOFLOWLABEL                = 0x3b
+	IPV6_CHECKSUM                     = 0x1a
+	IPV6_DEFAULT_MULTICAST_HOPS       = 0x1
+	IPV6_DEFAULT_MULTICAST_LOOP       = 0x1
+	IPV6_DEFHLIM                      = 0x40
+	IPV6_DONTFRAG                     = 0x3e
+	IPV6_DSTOPTS                      = 0x32
+	IPV6_ESP_NETWORK_LEVEL            = 0x37
+	IPV6_ESP_TRANS_LEVEL              = 0x36
+	IPV6_FAITH                        = 0x1d
+	IPV6_FLOWINFO_MASK                = 0xffffff0f
+	IPV6_FLOWLABEL_MASK               = 0xffff0f00
+	IPV6_FRAGTTL                      = 0x78
+	IPV6_HLIMDEC                      = 0x1
+	IPV6_HOPLIMIT                     = 0x2f
+	IPV6_HOPOPTS                      = 0x31
+	IPV6_IPCOMP_LEVEL                 = 0x3c
+	IPV6_JOIN_GROUP                   = 0xc
+	IPV6_LEAVE_GROUP                  = 0xd
+	IPV6_MAXHLIM                      = 0xff
+	IPV6_MAXPACKET                    = 0xffff
+	IPV6_MMTU                         = 0x500
+	IPV6_MULTICAST_HOPS               = 0xa
+	IPV6_MULTICAST_IF                 = 0x9
+	IPV6_MULTICAST_LOOP               = 0xb
+	IPV6_NEXTHOP                      = 0x30
+	IPV6_OPTIONS                      = 0x1
+	IPV6_PATHMTU                      = 0x2c
+	IPV6_PIPEX                        = 0x3f
+	IPV6_PKTINFO                      = 0x2e
+	IPV6_PORTRANGE                    = 0xe
+	IPV6_PORTRANGE_DEFAULT            = 0x0
+	IPV6_PORTRANGE_HIGH               = 0x1
+	IPV6_PORTRANGE_LOW                = 0x2
+	IPV6_RECVDSTOPTS                  = 0x28
+	IPV6_RECVDSTPORT                  = 0x40
+	IPV6_RECVHOPLIMIT                 = 0x25
+	IPV6_RECVHOPOPTS                  = 0x27
+	IPV6_RECVPATHMTU                  = 0x2b
+	IPV6_RECVPKTINFO                  = 0x24
+	IPV6_RECVRTHDR                    = 0x26
+	IPV6_RECVTCLASS                   = 0x39
+	IPV6_RTABLE                       = 0x1021
+	IPV6_RTHDR                        = 0x33
+	IPV6_RTHDRDSTOPTS                 = 0x23
+	IPV6_RTHDR_LOOSE                  = 0x0
+	IPV6_RTHDR_STRICT                 = 0x1
+	IPV6_RTHDR_TYPE_0                 = 0x0
+	IPV6_SOCKOPT_RESERVED1            = 0x3
+	IPV6_TCLASS                       = 0x3d
+	IPV6_UNICAST_HOPS                 = 0x4
+	IPV6_USE_MIN_MTU                  = 0x2a
+	IPV6_V6ONLY                       = 0x1b
+	IPV6_VERSION                      = 0x60
+	IPV6_VERSION_MASK                 = 0xf0
+	IP_ADD_MEMBERSHIP                 = 0xc
+	IP_AUTH_LEVEL                     = 0x14
+	IP_DEFAULT_MULTICAST_LOOP         = 0x1
+	IP_DEFAULT_MULTICAST_TTL          = 0x1
+	IP_DF                             = 0x4000
+	IP_DIVERTFL                       = 0x1022
+	IP_DROP_MEMBERSHIP                = 0xd
+	IP_ESP_NETWORK_LEVEL              = 0x16
+	IP_ESP_TRANS_LEVEL                = 0x15
+	IP_HDRINCL                        = 0x2
+	IP_IPCOMP_LEVEL                   = 0x1d
+	IP_IPSECFLOWINFO                  = 0x24
+	IP_IPSEC_LOCAL_AUTH               = 0x1b
+	IP_IPSEC_LOCAL_CRED               = 0x19
+	IP_IPSEC_LOCAL_ID                 = 0x17
+	IP_IPSEC_REMOTE_AUTH              = 0x1c
+	IP_IPSEC_REMOTE_CRED              = 0x1a
+	IP_IPSEC_REMOTE_ID                = 0x18
+	IP_MAXPACKET                      = 0xffff
+	IP_MAX_MEMBERSHIPS                = 0xfff
+	IP_MF                             = 0x2000
+	IP_MINTTL                         = 0x20
+	IP_MIN_MEMBERSHIPS                = 0xf
+	IP_MSS                            = 0x240
+	IP_MULTICAST_IF                   = 0x9
+	IP_MULTICAST_LOOP                 = 0xb
+	IP_MULTICAST_TTL                  = 0xa
+	IP_OFFMASK                        = 0x1fff
+	IP_OPTIONS                        = 0x1
+	IP_PIPEX                          = 0x22
+	IP_PORTRANGE                      = 0x13
+	IP_PORTRANGE_DEFAULT              = 0x0
+	IP_PORTRANGE_HIGH                 = 0x1
+	IP_PORTRANGE_LOW                  = 0x2
+	IP_RECVDSTADDR                    = 0x7
+	IP_RECVDSTPORT                    = 0x21
+	IP_RECVIF                         = 0x1e
+	IP_RECVOPTS                       = 0x5
+	IP_RECVRETOPTS                    = 0x6
+	IP_RECVRTABLE                     = 0x23
+	IP_RECVTTL                        = 0x1f
+	IP_RETOPTS                        = 0x8
+	IP_RF                             = 0x8000
+	IP_RTABLE                         = 0x1021
+	IP_TOS                            = 0x3
+	IP_TTL                            = 0x4
+	ISIG                              = 0x80
+	ISTRIP                            = 0x20
+	IXANY                             = 0x800
+	IXOFF                             = 0x400
+	IXON                              = 0x200
+	KERN_HOSTNAME                     = 0xa
+	KERN_OSRELEASE                    = 0x2
+	KERN_OSTYPE                       = 0x1
+	KERN_VERSION                      = 0x4
+	LCNT_OVERLOAD_FLUSH               = 0x6
+	LOCK_EX                           = 0x2
+	LOCK_NB                           = 0x4
+	LOCK_SH                           = 0x1
+	LOCK_UN                           = 0x8
+	MADV_DONTNEED                     = 0x4
+	MADV_FREE                         = 0x6
+	MADV_NORMAL                       = 0x0
+	MADV_RANDOM                       = 0x1
+	MADV_SEQUENTIAL                   = 0x2
+	MADV_SPACEAVAIL                   = 0x5
+	MADV_WILLNEED                     = 0x3
+	MAP_ANON                          = 0x1000
+	MAP_ANONYMOUS                     = 0x1000
+	MAP_COPY                          = 0x2
+	MAP_FILE                          = 0x0
+	MAP_FIXED                         = 0x10
+	MAP_FLAGMASK                      = 0x3ff7
+	MAP_HASSEMAPHORE                  = 0x0
+	MAP_INHERIT                       = 0x0
+	MAP_INHERIT_COPY                  = 0x1
+	MAP_INHERIT_NONE                  = 0x2
+	MAP_INHERIT_SHARE                 = 0x0
+	MAP_INHERIT_ZERO                  = 0x3
+	MAP_NOEXTEND                      = 0x0
+	MAP_NORESERVE                     = 0x0
+	MAP_PRIVATE                       = 0x2
+	MAP_RENAME                        = 0x0
+	MAP_SHARED                        = 0x1
+	MAP_TRYFIXED                      = 0x0
+	MCL_CURRENT                       = 0x1
+	MCL_FUTURE                        = 0x2
+	MSG_BCAST                         = 0x100
+	MSG_CMSG_CLOEXEC                  = 0x800
+	MSG_CTRUNC                        = 0x20
+	MSG_DONTROUTE                     = 0x4
+	MSG_DONTWAIT                      = 0x80
+	MSG_EOR                           = 0x8
+	MSG_MCAST                         = 0x200
+	MSG_NOSIGNAL                      = 0x400
+	MSG_OOB                           = 0x1
+	MSG_PEEK                          = 0x2
+	MSG_TRUNC                         = 0x10
+	MSG_WAITALL                       = 0x40
+	MS_ASYNC                          = 0x1
+	MS_INVALIDATE                     = 0x4
+	MS_SYNC                           = 0x2
+	NAME_MAX                          = 0xff
+	NET_RT_DUMP                       = 0x1
+	NET_RT_FLAGS                      = 0x2
+	NET_RT_IFLIST                     = 0x3
+	NET_RT_MAXID                      = 0x6
+	NET_RT_STATS                      = 0x4
+	NET_RT_TABLE                      = 0x5
+	NOFLSH                            = 0x80000000
+	NOTE_ATTRIB                       = 0x8
+	NOTE_CHILD                        = 0x4
+	NOTE_DELETE                       = 0x1
+	NOTE_EOF                          = 0x2
+	NOTE_EXEC                         = 0x20000000
+	NOTE_EXIT                         = 0x80000000
+	NOTE_EXTEND                       = 0x4
+	NOTE_FORK                         = 0x40000000
+	NOTE_LINK                         = 0x10
+	NOTE_LOWAT                        = 0x1
+	NOTE_PCTRLMASK                    = 0xf0000000
+	NOTE_PDATAMASK                    = 0xfffff
+	NOTE_RENAME                       = 0x20
+	NOTE_REVOKE                       = 0x40
+	NOTE_TRACK                        = 0x1
+	NOTE_TRACKERR                     = 0x2
+	NOTE_TRUNCATE                     = 0x80
+	NOTE_WRITE                        = 0x2
+	OCRNL                             = 0x10
+	ONLCR                             = 0x2
+	ONLRET                            = 0x80
+	ONOCR                             = 0x40
+	ONOEOT                            = 0x8
+	OPOST                             = 0x1
+	O_ACCMODE                         = 0x3
+	O_APPEND                          = 0x8
+	O_ASYNC                           = 0x40
+	O_CLOEXEC                         = 0x10000
+	O_CREAT                           = 0x200
+	O_DIRECTORY                       = 0x20000
+	O_DSYNC                           = 0x80
+	O_EXCL                            = 0x800
+	O_EXLOCK                          = 0x20
+	O_FSYNC                           = 0x80
+	O_NDELAY                          = 0x4
+	O_NOCTTY                          = 0x8000
+	O_NOFOLLOW                        = 0x100
+	O_NONBLOCK                        = 0x4
+	O_RDONLY                          = 0x0
+	O_RDWR                            = 0x2
+	O_RSYNC                           = 0x80
+	O_SHLOCK                          = 0x10
+	O_SYNC                            = 0x80
+	O_TRUNC                           = 0x400
+	O_WRONLY                          = 0x1
+	PARENB                            = 0x1000
+	PARMRK                            = 0x8
+	PARODD                            = 0x2000
+	PENDIN                            = 0x20000000
+	PF_FLUSH                          = 0x1
+	PRIO_PGRP                         = 0x1
+	PRIO_PROCESS                      = 0x0
+	PRIO_USER                         = 0x2
+	PROT_EXEC                         = 0x4
+	PROT_NONE                         = 0x0
+	PROT_READ                         = 0x1
+	PROT_WRITE                        = 0x2
+	RLIMIT_CORE                       = 0x4
+	RLIMIT_CPU                        = 0x0
+	RLIMIT_DATA                       = 0x2
+	RLIMIT_FSIZE                      = 0x1
+	RLIMIT_NOFILE                     = 0x8
+	RLIMIT_STACK                      = 0x3
+	RLIM_INFINITY                     = 0x7fffffffffffffff
+	RTAX_AUTHOR                       = 0x6
+	RTAX_BRD                          = 0x7
+	RTAX_DST                          = 0x0
+	RTAX_GATEWAY                      = 0x1
+	RTAX_GENMASK                      = 0x3
+	RTAX_IFA                          = 0x5
+	RTAX_IFP                          = 0x4
+	RTAX_LABEL                        = 0xa
+	RTAX_MAX                          = 0xb
+	RTAX_NETMASK                      = 0x2
+	RTAX_SRC                          = 0x8
+	RTAX_SRCMASK                      = 0x9
+	RTA_AUTHOR                        = 0x40
+	RTA_BRD                           = 0x80
+	RTA_DST                           = 0x1
+	RTA_GATEWAY                       = 0x2
+	RTA_GENMASK                       = 0x8
+	RTA_IFA                           = 0x20
+	RTA_IFP                           = 0x10
+	RTA_LABEL                         = 0x400
+	RTA_NETMASK                       = 0x4
+	RTA_SRC                           = 0x100
+	RTA_SRCMASK                       = 0x200
+	RTF_ANNOUNCE                      = 0x4000
+	RTF_BLACKHOLE                     = 0x1000
+	RTF_BROADCAST                     = 0x400000
+	RTF_CLONED                        = 0x10000
+	RTF_CLONING                       = 0x100
+	RTF_DONE                          = 0x40
+	RTF_DYNAMIC                       = 0x10
+	RTF_FMASK                         = 0x70f808
+	RTF_GATEWAY                       = 0x2
+	RTF_HOST                          = 0x4
+	RTF_LLINFO                        = 0x400
+	RTF_LOCAL                         = 0x200000
+	RTF_MASK                          = 0x80
+	RTF_MODIFIED                      = 0x20
+	RTF_MPATH                         = 0x40000
+	RTF_MPLS                          = 0x100000
+	RTF_PERMANENT_ARP                 = 0x2000
+	RTF_PROTO1                        = 0x8000
+	RTF_PROTO2                        = 0x4000
+	RTF_PROTO3                        = 0x2000
+	RTF_REJECT                        = 0x8
+	RTF_STATIC                        = 0x800
+	RTF_UP                            = 0x1
+	RTF_USETRAILERS                   = 0x8000
+	RTF_XRESOLVE                      = 0x200
+	RTM_ADD                           = 0x1
+	RTM_CHANGE                        = 0x3
+	RTM_DELADDR                       = 0xd
+	RTM_DELETE                        = 0x2
+	RTM_DESYNC                        = 0x10
+	RTM_GET                           = 0x4
+	RTM_IFANNOUNCE                    = 0xf
+	RTM_IFINFO                        = 0xe
+	RTM_LOCK                          = 0x8
+	RTM_LOSING                        = 0x5
+	RTM_MAXSIZE                       = 0x800
+	RTM_MISS                          = 0x7
+	RTM_NEWADDR                       = 0xc
+	RTM_REDIRECT                      = 0x6
+	RTM_RESOLVE                       = 0xb
+	RTM_RTTUNIT                       = 0xf4240
+	RTM_VERSION                       = 0x5
+	RTV_EXPIRE                        = 0x4
+	RTV_HOPCOUNT                      = 0x2
+	RTV_MTU                           = 0x1
+	RTV_RPIPE                         = 0x8
+	RTV_RTT                           = 0x40
+	RTV_RTTVAR                        = 0x80
+	RTV_SPIPE                         = 0x10
+	RTV_SSTHRESH                      = 0x20
+	RT_TABLEID_MAX                    = 0xff
+	RUSAGE_CHILDREN                   = -0x1
+	RUSAGE_SELF                       = 0x0
+	RUSAGE_THREAD                     = 0x1
+	SCM_RIGHTS                        = 0x1
+	SCM_TIMESTAMP                     = 0x4
+	SHUT_RD                           = 0x0
+	SHUT_RDWR                         = 0x2
+	SHUT_WR                           = 0x1
+	SIOCADDMULTI                      = 0x80206931
+	SIOCAIFADDR                       = 0x8040691a
+	SIOCAIFGROUP                      = 0x80246987
+	SIOCALIFADDR                      = 0x8218691c
+	SIOCATMARK                        = 0x40047307
+	SIOCBRDGADD                       = 0x8054693c
+	SIOCBRDGADDS                      = 0x80546941
+	SIOCBRDGARL                       = 0x806e694d
+	SIOCBRDGDADDR                     = 0x81286947
+	SIOCBRDGDEL                       = 0x8054693d
+	SIOCBRDGDELS                      = 0x80546942
+	SIOCBRDGFLUSH                     = 0x80546948
+	SIOCBRDGFRL                       = 0x806e694e
+	SIOCBRDGGCACHE                    = 0xc0146941
+	SIOCBRDGGFD                       = 0xc0146952
+	SIOCBRDGGHT                       = 0xc0146951
+	SIOCBRDGGIFFLGS                   = 0xc054693e
+	SIOCBRDGGMA                       = 0xc0146953
+	SIOCBRDGGPARAM                    = 0xc03c6958
+	SIOCBRDGGPRI                      = 0xc0146950
+	SIOCBRDGGRL                       = 0xc028694f
+	SIOCBRDGGSIFS                     = 0xc054693c
+	SIOCBRDGGTO                       = 0xc0146946
+	SIOCBRDGIFS                       = 0xc0546942
+	SIOCBRDGRTS                       = 0xc0186943
+	SIOCBRDGSADDR                     = 0xc1286944
+	SIOCBRDGSCACHE                    = 0x80146940
+	SIOCBRDGSFD                       = 0x80146952
+	SIOCBRDGSHT                       = 0x80146951
+	SIOCBRDGSIFCOST                   = 0x80546955
+	SIOCBRDGSIFFLGS                   = 0x8054693f
+	SIOCBRDGSIFPRIO                   = 0x80546954
+	SIOCBRDGSMA                       = 0x80146953
+	SIOCBRDGSPRI                      = 0x80146950
+	SIOCBRDGSPROTO                    = 0x8014695a
+	SIOCBRDGSTO                       = 0x80146945
+	SIOCBRDGSTXHC                     = 0x80146959
+	SIOCDELMULTI                      = 0x80206932
+	SIOCDIFADDR                       = 0x80206919
+	SIOCDIFGROUP                      = 0x80246989
+	SIOCDIFPHYADDR                    = 0x80206949
+	SIOCDLIFADDR                      = 0x8218691e
+	SIOCGETKALIVE                     = 0xc01869a4
+	SIOCGETLABEL                      = 0x8020699a
+	SIOCGETPFLOW                      = 0xc02069fe
+	SIOCGETPFSYNC                     = 0xc02069f8
+	SIOCGETSGCNT                      = 0xc0147534
+	SIOCGETVIFCNT                     = 0xc0147533
+	SIOCGETVLAN                       = 0xc0206990
+	SIOCGHIWAT                        = 0x40047301
+	SIOCGIFADDR                       = 0xc0206921
+	SIOCGIFASYNCMAP                   = 0xc020697c
+	SIOCGIFBRDADDR                    = 0xc0206923
+	SIOCGIFCONF                       = 0xc0086924
+	SIOCGIFDATA                       = 0xc020691b
+	SIOCGIFDESCR                      = 0xc0206981
+	SIOCGIFDSTADDR                    = 0xc0206922
+	SIOCGIFFLAGS                      = 0xc0206911
+	SIOCGIFGATTR                      = 0xc024698b
+	SIOCGIFGENERIC                    = 0xc020693a
+	SIOCGIFGMEMB                      = 0xc024698a
+	SIOCGIFGROUP                      = 0xc0246988
+	SIOCGIFHARDMTU                    = 0xc02069a5
+	SIOCGIFMEDIA                      = 0xc0286936
+	SIOCGIFMETRIC                     = 0xc0206917
+	SIOCGIFMTU                        = 0xc020697e
+	SIOCGIFNETMASK                    = 0xc0206925
+	SIOCGIFPDSTADDR                   = 0xc0206948
+	SIOCGIFPRIORITY                   = 0xc020699c
+	SIOCGIFPSRCADDR                   = 0xc0206947
+	SIOCGIFRDOMAIN                    = 0xc02069a0
+	SIOCGIFRTLABEL                    = 0xc0206983
+	SIOCGIFRXR                        = 0x802069aa
+	SIOCGIFTIMESLOT                   = 0xc0206986
+	SIOCGIFXFLAGS                     = 0xc020699e
+	SIOCGLIFADDR                      = 0xc218691d
+	SIOCGLIFPHYADDR                   = 0xc218694b
+	SIOCGLIFPHYRTABLE                 = 0xc02069a2
+	SIOCGLIFPHYTTL                    = 0xc02069a9
+	SIOCGLOWAT                        = 0x40047303
+	SIOCGPGRP                         = 0x40047309
+	SIOCGSPPPPARAMS                   = 0xc0206994
+	SIOCGVH                           = 0xc02069f6
+	SIOCGVNETID                       = 0xc02069a7
+	SIOCIFCREATE                      = 0x8020697a
+	SIOCIFDESTROY                     = 0x80206979
+	SIOCIFGCLONERS                    = 0xc00c6978
+	SIOCSETKALIVE                     = 0x801869a3
+	SIOCSETLABEL                      = 0x80206999
+	SIOCSETPFLOW                      = 0x802069fd
+	SIOCSETPFSYNC                     = 0x802069f7
+	SIOCSETVLAN                       = 0x8020698f
+	SIOCSHIWAT                        = 0x80047300
+	SIOCSIFADDR                       = 0x8020690c
+	SIOCSIFASYNCMAP                   = 0x8020697d
+	SIOCSIFBRDADDR                    = 0x80206913
+	SIOCSIFDESCR                      = 0x80206980
+	SIOCSIFDSTADDR                    = 0x8020690e
+	SIOCSIFFLAGS                      = 0x80206910
+	SIOCSIFGATTR                      = 0x8024698c
+	SIOCSIFGENERIC                    = 0x80206939
+	SIOCSIFLLADDR                     = 0x8020691f
+	SIOCSIFMEDIA                      = 0xc0206935
+	SIOCSIFMETRIC                     = 0x80206918
+	SIOCSIFMTU                        = 0x8020697f
+	SIOCSIFNETMASK                    = 0x80206916
+	SIOCSIFPHYADDR                    = 0x80406946
+	SIOCSIFPRIORITY                   = 0x8020699b
+	SIOCSIFRDOMAIN                    = 0x8020699f
+	SIOCSIFRTLABEL                    = 0x80206982
+	SIOCSIFTIMESLOT                   = 0x80206985
+	SIOCSIFXFLAGS                     = 0x8020699d
+	SIOCSLIFPHYADDR                   = 0x8218694a
+	SIOCSLIFPHYRTABLE                 = 0x802069a1
+	SIOCSLIFPHYTTL                    = 0x802069a8
+	SIOCSLOWAT                        = 0x80047302
+	SIOCSPGRP                         = 0x80047308
+	SIOCSSPPPPARAMS                   = 0x80206993
+	SIOCSVH                           = 0xc02069f5
+	SIOCSVNETID                       = 0x802069a6
+	SOCK_CLOEXEC                      = 0x8000
+	SOCK_DGRAM                        = 0x2
+	SOCK_NONBLOCK                     = 0x4000
+	SOCK_RAW                          = 0x3
+	SOCK_RDM                          = 0x4
+	SOCK_SEQPACKET                    = 0x5
+	SOCK_STREAM                       = 0x1
+	SOL_SOCKET                        = 0xffff
+	SOMAXCONN                         = 0x80
+	SO_ACCEPTCONN                     = 0x2
+	SO_BINDANY                        = 0x1000
+	SO_BROADCAST                      = 0x20
+	SO_DEBUG                          = 0x1
+	SO_DONTROUTE                      = 0x10
+	SO_ERROR                          = 0x1007
+	SO_KEEPALIVE                      = 0x8
+	SO_LINGER                         = 0x80
+	SO_NETPROC                        = 0x1020
+	SO_OOBINLINE                      = 0x100
+	SO_PEERCRED                       = 0x1022
+	SO_RCVBUF                         = 0x1002
+	SO_RCVLOWAT                       = 0x1004
+	SO_RCVTIMEO                       = 0x1006
+	SO_REUSEADDR                      = 0x4
+	SO_REUSEPORT                      = 0x200
+	SO_RTABLE                         = 0x1021
+	SO_SNDBUF                         = 0x1001
+	SO_SNDLOWAT                       = 0x1003
+	SO_SNDTIMEO                       = 0x1005
+	SO_SPLICE                         = 0x1023
+	SO_TIMESTAMP                      = 0x800
+	SO_TYPE                           = 0x1008
+	SO_USELOOPBACK                    = 0x40
+	TCIFLUSH                          = 0x1
+	TCIOFLUSH                         = 0x3
+	TCOFLUSH                          = 0x2
+	TCP_MAXBURST                      = 0x4
+	TCP_MAXSEG                        = 0x2
+	TCP_MAXWIN                        = 0xffff
+	TCP_MAX_SACK                      = 0x3
+	TCP_MAX_WINSHIFT                  = 0xe
+	TCP_MD5SIG                        = 0x4
+	TCP_MSS                           = 0x200
+	TCP_NODELAY                       = 0x1
+	TCP_NOPUSH                        = 0x10
+	TCP_NSTATES                       = 0xb
+	TCP_SACK_ENABLE                   = 0x8
+	TCSAFLUSH                         = 0x2
+	TIOCCBRK                          = 0x2000747a
+	TIOCCDTR                          = 0x20007478
+	TIOCCONS                          = 0x80047462
+	TIOCDRAIN                         = 0x2000745e
+	TIOCEXCL                          = 0x2000740d
+	TIOCEXT                           = 0x80047460
+	TIOCFLAG_CLOCAL                   = 0x2
+	TIOCFLAG_CRTSCTS                  = 0x4
+	TIOCFLAG_MDMBUF                   = 0x8
+	TIOCFLAG_PPS                      = 0x10
+	TIOCFLAG_SOFTCAR                  = 0x1
+	TIOCFLUSH                         = 0x80047410
+	TIOCGETA                          = 0x402c7413
+	TIOCGETD                          = 0x4004741a
+	TIOCGFLAGS                        = 0x4004745d
+	TIOCGPGRP                         = 0x40047477
+	TIOCGSID                          = 0x40047463
+	TIOCGTSTAMP                       = 0x400c745b
+	TIOCGWINSZ                        = 0x40087468
+	TIOCMBIC                          = 0x8004746b
+	TIOCMBIS                          = 0x8004746c
+	TIOCMGET                          = 0x4004746a
+	TIOCMODG                          = 0x4004746a
+	TIOCMODS                          = 0x8004746d
+	TIOCMSET                          = 0x8004746d
+	TIOCM_CAR                         = 0x40
+	TIOCM_CD                          = 0x40
+	TIOCM_CTS                         = 0x20
+	TIOCM_DSR                         = 0x100
+	TIOCM_DTR                         = 0x2
+	TIOCM_LE                          = 0x1
+	TIOCM_RI                          = 0x80
+	TIOCM_RNG                         = 0x80
+	TIOCM_RTS                         = 0x4
+	TIOCM_SR                          = 0x10
+	TIOCM_ST                          = 0x8
+	TIOCNOTTY                         = 0x20007471
+	TIOCNXCL                          = 0x2000740e
+	TIOCOUTQ                          = 0x40047473
+	TIOCPKT                           = 0x80047470
+	TIOCPKT_DATA                      = 0x0
+	TIOCPKT_DOSTOP                    = 0x20
+	TIOCPKT_FLUSHREAD                 = 0x1
+	TIOCPKT_FLUSHWRITE                = 0x2
+	TIOCPKT_IOCTL                     = 0x40
+	TIOCPKT_NOSTOP                    = 0x10
+	TIOCPKT_START                     = 0x8
+	TIOCPKT_STOP                      = 0x4
+	TIOCREMOTE                        = 0x80047469
+	TIOCSBRK                          = 0x2000747b
+	TIOCSCTTY                         = 0x20007461
+	TIOCSDTR                          = 0x20007479
+	TIOCSETA                          = 0x802c7414
+	TIOCSETAF                         = 0x802c7416
+	TIOCSETAW                         = 0x802c7415
+	TIOCSETD                          = 0x8004741b
+	TIOCSFLAGS                        = 0x8004745c
+	TIOCSIG                           = 0x8004745f
+	TIOCSPGRP                         = 0x80047476
+	TIOCSTART                         = 0x2000746e
+	TIOCSTAT                          = 0x80047465
+	TIOCSTI                           = 0x80017472
+	TIOCSTOP                          = 0x2000746f
+	TIOCSTSTAMP                       = 0x8008745a
+	TIOCSWINSZ                        = 0x80087467
+	TIOCUCNTL                         = 0x80047466
+	TOSTOP                            = 0x400000
+	VDISCARD                          = 0xf
+	VDSUSP                            = 0xb
+	VEOF                              = 0x0
+	VEOL                              = 0x1
+	VEOL2                             = 0x2
+	VERASE                            = 0x3
+	VINTR                             = 0x8
+	VKILL                             = 0x5
+	VLNEXT                            = 0xe
+	VMIN                              = 0x10
+	VQUIT                             = 0x9
+	VREPRINT                          = 0x6
+	VSTART                            = 0xc
+	VSTATUS                           = 0x12
+	VSTOP                             = 0xd
+	VSUSP                             = 0xa
+	VTIME                             = 0x11
+	VWERASE                           = 0x4
+	WALTSIG                           = 0x4
+	WCONTINUED                        = 0x8
+	WCOREFLAG                         = 0x80
+	WNOHANG                           = 0x1
+	WUNTRACED                         = 0x2
+)
+
+// Errors
+const (
+	E2BIG           = syscall.Errno(0x7)
+	EACCES          = syscall.Errno(0xd)
+	EADDRINUSE      = syscall.Errno(0x30)
+	EADDRNOTAVAIL   = syscall.Errno(0x31)
+	EAFNOSUPPORT    = syscall.Errno(0x2f)
+	EAGAIN          = syscall.Errno(0x23)
+	EALREADY        = syscall.Errno(0x25)
+	EAUTH           = syscall.Errno(0x50)
+	EBADF           = syscall.Errno(0x9)
+	EBADRPC         = syscall.Errno(0x48)
+	EBUSY           = syscall.Errno(0x10)
+	ECANCELED       = syscall.Errno(0x58)
+	ECHILD          = syscall.Errno(0xa)
+	ECONNABORTED    = syscall.Errno(0x35)
+	ECONNREFUSED    = syscall.Errno(0x3d)
+	ECONNRESET      = syscall.Errno(0x36)
+	EDEADLK         = syscall.Errno(0xb)
+	EDESTADDRREQ    = syscall.Errno(0x27)
+	EDOM            = syscall.Errno(0x21)
+	EDQUOT          = syscall.Errno(0x45)
+	EEXIST          = syscall.Errno(0x11)
+	EFAULT          = syscall.Errno(0xe)
+	EFBIG           = syscall.Errno(0x1b)
+	EFTYPE          = syscall.Errno(0x4f)
+	EHOSTDOWN       = syscall.Errno(0x40)
+	EHOSTUNREACH    = syscall.Errno(0x41)
+	EIDRM           = syscall.Errno(0x59)
+	EILSEQ          = syscall.Errno(0x54)
+	EINPROGRESS     = syscall.Errno(0x24)
+	EINTR           = syscall.Errno(0x4)
+	EINVAL          = syscall.Errno(0x16)
+	EIO             = syscall.Errno(0x5)
+	EIPSEC          = syscall.Errno(0x52)
+	EISCONN         = syscall.Errno(0x38)
+	EISDIR          = syscall.Errno(0x15)
+	ELAST           = syscall.Errno(0x5b)
+	ELOOP           = syscall.Errno(0x3e)
+	EMEDIUMTYPE     = syscall.Errno(0x56)
+	EMFILE          = syscall.Errno(0x18)
+	EMLINK          = syscall.Errno(0x1f)
+	EMSGSIZE        = syscall.Errno(0x28)
+	ENAMETOOLONG    = syscall.Errno(0x3f)
+	ENEEDAUTH       = syscall.Errno(0x51)
+	ENETDOWN        = syscall.Errno(0x32)
+	ENETRESET       = syscall.Errno(0x34)
+	ENETUNREACH     = syscall.Errno(0x33)
+	ENFILE          = syscall.Errno(0x17)
+	ENOATTR         = syscall.Errno(0x53)
+	ENOBUFS         = syscall.Errno(0x37)
+	ENODEV          = syscall.Errno(0x13)
+	ENOENT          = syscall.Errno(0x2)
+	ENOEXEC         = syscall.Errno(0x8)
+	ENOLCK          = syscall.Errno(0x4d)
+	ENOMEDIUM       = syscall.Errno(0x55)
+	ENOMEM          = syscall.Errno(0xc)
+	ENOMSG          = syscall.Errno(0x5a)
+	ENOPROTOOPT     = syscall.Errno(0x2a)
+	ENOSPC          = syscall.Errno(0x1c)
+	ENOSYS          = syscall.Errno(0x4e)
+	ENOTBLK         = syscall.Errno(0xf)
+	ENOTCONN        = syscall.Errno(0x39)
+	ENOTDIR         = syscall.Errno(0x14)
+	ENOTEMPTY       = syscall.Errno(0x42)
+	ENOTSOCK        = syscall.Errno(0x26)
+	ENOTSUP         = syscall.Errno(0x5b)
+	ENOTTY          = syscall.Errno(0x19)
+	ENXIO           = syscall.Errno(0x6)
+	EOPNOTSUPP      = syscall.Errno(0x2d)
+	EOVERFLOW       = syscall.Errno(0x57)
+	EPERM           = syscall.Errno(0x1)
+	EPFNOSUPPORT    = syscall.Errno(0x2e)
+	EPIPE           = syscall.Errno(0x20)
+	EPROCLIM        = syscall.Errno(0x43)
+	EPROCUNAVAIL    = syscall.Errno(0x4c)
+	EPROGMISMATCH   = syscall.Errno(0x4b)
+	EPROGUNAVAIL    = syscall.Errno(0x4a)
+	EPROTONOSUPPORT = syscall.Errno(0x2b)
+	EPROTOTYPE      = syscall.Errno(0x29)
+	ERANGE          = syscall.Errno(0x22)
+	EREMOTE         = syscall.Errno(0x47)
+	EROFS           = syscall.Errno(0x1e)
+	ERPCMISMATCH    = syscall.Errno(0x49)
+	ESHUTDOWN       = syscall.Errno(0x3a)
+	ESOCKTNOSUPPORT = syscall.Errno(0x2c)
+	ESPIPE          = syscall.Errno(0x1d)
+	ESRCH           = syscall.Errno(0x3)
+	ESTALE          = syscall.Errno(0x46)
+	ETIMEDOUT       = syscall.Errno(0x3c)
+	ETOOMANYREFS    = syscall.Errno(0x3b)
+	ETXTBSY         = syscall.Errno(0x1a)
+	EUSERS          = syscall.Errno(0x44)
+	EWOULDBLOCK     = syscall.Errno(0x23)
+	EXDEV           = syscall.Errno(0x12)
+)
+
+// Signals
+const (
+	SIGABRT   = syscall.Signal(0x6)
+	SIGALRM   = syscall.Signal(0xe)
+	SIGBUS    = syscall.Signal(0xa)
+	SIGCHLD   = syscall.Signal(0x14)
+	SIGCONT   = syscall.Signal(0x13)
+	SIGEMT    = syscall.Signal(0x7)
+	SIGFPE    = syscall.Signal(0x8)
+	SIGHUP    = syscall.Signal(0x1)
+	SIGILL    = syscall.Signal(0x4)
+	SIGINFO   = syscall.Signal(0x1d)
+	SIGINT    = syscall.Signal(0x2)
+	SIGIO     = syscall.Signal(0x17)
+	SIGIOT    = syscall.Signal(0x6)
+	SIGKILL   = syscall.Signal(0x9)
+	SIGPIPE   = syscall.Signal(0xd)
+	SIGPROF   = syscall.Signal(0x1b)
+	SIGQUIT   = syscall.Signal(0x3)
+	SIGSEGV   = syscall.Signal(0xb)
+	SIGSTOP   = syscall.Signal(0x11)
+	SIGSYS    = syscall.Signal(0xc)
+	SIGTERM   = syscall.Signal(0xf)
+	SIGTHR    = syscall.Signal(0x20)
+	SIGTRAP   = syscall.Signal(0x5)
+	SIGTSTP   = syscall.Signal(0x12)
+	SIGTTIN   = syscall.Signal(0x15)
+	SIGTTOU   = syscall.Signal(0x16)
+	SIGURG    = syscall.Signal(0x10)
+	SIGUSR1   = syscall.Signal(0x1e)
+	SIGUSR2   = syscall.Signal(0x1f)
+	SIGVTALRM = syscall.Signal(0x1a)
+	SIGWINCH  = syscall.Signal(0x1c)
+	SIGXCPU   = syscall.Signal(0x18)
+	SIGXFSZ   = syscall.Signal(0x19)
+)
+
+// Error table
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "operation not permitted"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "input/output error"},
+	{6, "ENXIO", "device not configured"},
+	{7, "E2BIG", "argument list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file descriptor"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EDEADLK", "resource deadlock avoided"},
+	{12, "ENOMEM", "cannot allocate memory"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "operation not supported by device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "too many open files in system"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "numerical argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "EWOULDBLOCK", "resource temporarily unavailable"},
+	{36, "EINPROGRESS", "operation now in progress"},
+	{37, "EALREADY", "operation already in progress"},
+	{38, "ENOTSOCK", "socket operation on non-socket"},
+	{39, "EDESTADDRREQ", "destination address required"},
+	{40, "EMSGSIZE", "message too long"},
+	{41, "EPROTOTYPE", "protocol wrong type for socket"},
+	{42, "ENOPROTOOPT", "protocol not available"},
+	{43, "EPROTONOSUPPORT", "protocol not supported"},
+	{44, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{45, "EOPNOTSUPP", "operation not supported"},
+	{46, "EPFNOSUPPORT", "protocol family not supported"},
+	{47, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{48, "EADDRINUSE", "address already in use"},
+	{49, "EADDRNOTAVAIL", "can't assign requested address"},
+	{50, "ENETDOWN", "network is down"},
+	{51, "ENETUNREACH", "network is unreachable"},
+	{52, "ENETRESET", "network dropped connection on reset"},
+	{53, "ECONNABORTED", "software caused connection abort"},
+	{54, "ECONNRESET", "connection reset by peer"},
+	{55, "ENOBUFS", "no buffer space available"},
+	{56, "EISCONN", "socket is already connected"},
+	{57, "ENOTCONN", "socket is not connected"},
+	{58, "ESHUTDOWN", "can't send after socket shutdown"},
+	{59, "ETOOMANYREFS", "too many references: can't splice"},
+	{60, "ETIMEDOUT", "operation timed out"},
+	{61, "ECONNREFUSED", "connection refused"},
+	{62, "ELOOP", "too many levels of symbolic links"},
+	{63, "ENAMETOOLONG", "file name too long"},
+	{64, "EHOSTDOWN", "host is down"},
+	{65, "EHOSTUNREACH", "no route to host"},
+	{66, "ENOTEMPTY", "directory not empty"},
+	{67, "EPROCLIM", "too many processes"},
+	{68, "EUSERS", "too many users"},
+	{69, "EDQUOT", "disk quota exceeded"},
+	{70, "ESTALE", "stale NFS file handle"},
+	{71, "EREMOTE", "too many levels of remote in path"},
+	{72, "EBADRPC", "RPC struct is bad"},
+	{73, "ERPCMISMATCH", "RPC version wrong"},
+	{74, "EPROGUNAVAIL", "RPC program not available"},
+	{75, "EPROGMISMATCH", "program version wrong"},
+	{76, "EPROCUNAVAIL", "bad procedure for program"},
+	{77, "ENOLCK", "no locks available"},
+	{78, "ENOSYS", "function not implemented"},
+	{79, "EFTYPE", "inappropriate file type or format"},
+	{80, "EAUTH", "authentication error"},
+	{81, "ENEEDAUTH", "need authenticator"},
+	{82, "EIPSEC", "IPsec processing failure"},
+	{83, "ENOATTR", "attribute not found"},
+	{84, "EILSEQ", "illegal byte sequence"},
+	{85, "ENOMEDIUM", "no medium found"},
+	{86, "EMEDIUMTYPE", "wrong medium type"},
+	{87, "EOVERFLOW", "value too large to be stored in data type"},
+	{88, "ECANCELED", "operation canceled"},
+	{89, "EIDRM", "identifier removed"},
+	{90, "ENOMSG", "no message of desired type"},
+	{91, "ELAST", "not supported"},
+}
+
+// Signal table
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal instruction"},
+	{5, "SIGTRAP", "trace/BPT trap"},
+	{6, "SIGABRT", "abort trap"},
+	{7, "SIGEMT", "EMT trap"},
+	{8, "SIGFPE", "floating point exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus error"},
+	{11, "SIGSEGV", "segmentation fault"},
+	{12, "SIGSYS", "bad system call"},
+	{13, "SIGPIPE", "broken pipe"},
+	{14, "SIGALRM", "alarm clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGURG", "urgent I/O condition"},
+	{17, "SIGSTOP", "suspended (signal)"},
+	{18, "SIGTSTP", "suspended"},
+	{19, "SIGCONT", "continued"},
+	{20, "SIGCHLD", "child exited"},
+	{21, "SIGTTIN", "stopped (tty input)"},
+	{22, "SIGTTOU", "stopped (tty output)"},
+	{23, "SIGIO", "I/O possible"},
+	{24, "SIGXCPU", "cputime limit exceeded"},
+	{25, "SIGXFSZ", "filesize limit exceeded"},
+	{26, "SIGVTALRM", "virtual timer expired"},
+	{27, "SIGPROF", "profiling timer expired"},
+	{28, "SIGWINCH", "window size changes"},
+	{29, "SIGINFO", "information request"},
+	{30, "SIGUSR1", "user defined signal 1"},
+	{31, "SIGUSR2", "user defined signal 2"},
+	{32, "SIGTHR", "thread AST"},
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go b/installer/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
index a08922b981..be42830cf3 100644
--- a/installer/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zerrors_solaris_amd64.go
@@ -1,5 +1,5 @@
 // mkerrors.sh -m64
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,solaris
 
@@ -159,7 +159,12 @@ const (
 	BPF_W                         = 0x0
 	BPF_X                         = 0x8
 	BRKINT                        = 0x2
+	BS0                           = 0x0
+	BS1                           = 0x2000
+	BSDLY                         = 0x2000
+	CBAUD                         = 0xf
 	CFLUSH                        = 0xf
+	CIBAUD                        = 0xf0000
 	CLOCAL                        = 0x800
 	CLOCK_HIGHRES                 = 0x4
 	CLOCK_LEVEL                   = 0xa
@@ -169,7 +174,13 @@ const (
 	CLOCK_REALTIME                = 0x3
 	CLOCK_THREAD_CPUTIME_ID       = 0x2
 	CLOCK_VIRTUAL                 = 0x1
+	CR0                           = 0x0
+	CR1                           = 0x200
+	CR2                           = 0x400
+	CR3                           = 0x600
+	CRDLY                         = 0x600
 	CREAD                         = 0x80
+	CRTSCTS                       = 0x80000000
 	CS5                           = 0x0
 	CS6                           = 0x10
 	CS7                           = 0x20
@@ -276,6 +287,9 @@ const (
 	FD_CLOEXEC                    = 0x1
 	FD_NFDBITS                    = 0x40
 	FD_SETSIZE                    = 0x10000
+	FF0                           = 0x0
+	FF1                           = 0x8000
+	FFDLY                         = 0x8000
 	FLUSHALL                      = 0x1
 	FLUSHDATA                     = 0x0
 	FLUSHO                        = 0x2000
@@ -290,6 +304,10 @@ const (
 	F_DUP2FD_CLOEXEC              = 0x24
 	F_DUPFD                       = 0x0
 	F_DUPFD_CLOEXEC               = 0x25
+	F_FLOCK                       = 0x35
+	F_FLOCK64                     = 0x35
+	F_FLOCKW                      = 0x36
+	F_FLOCKW64                    = 0x36
 	F_FREESP                      = 0xb
 	F_FREESP64                    = 0xb
 	F_GETFD                       = 0x1
@@ -304,6 +322,12 @@ const (
 	F_MDACC                       = 0x20
 	F_NODNY                       = 0x0
 	F_NPRIV                       = 0x10
+	F_OFD_GETLK                   = 0x2f
+	F_OFD_GETLK64                 = 0x2f
+	F_OFD_SETLK                   = 0x30
+	F_OFD_SETLK64                 = 0x30
+	F_OFD_SETLKW                  = 0x31
+	F_OFD_SETLKW64                = 0x31
 	F_PRIV                        = 0xf
 	F_QUOTACTL                    = 0x11
 	F_RDACC                       = 0x1
@@ -332,6 +356,7 @@ const (
 	F_WRDNY                       = 0x2
 	F_WRLCK                       = 0x2
 	HUPCL                         = 0x400
+	IBSHIFT                       = 0x10
 	ICANON                        = 0x2
 	ICRNL                         = 0x100
 	IEXTEN                        = 0x8000
@@ -589,15 +614,21 @@ const (
 	IP_UNSPEC_SRC                 = 0x42
 	ISIG                          = 0x1
 	ISTRIP                        = 0x20
+	IUCLC                         = 0x200
 	IXANY                         = 0x800
 	IXOFF                         = 0x1000
 	IXON                          = 0x400
+	LOCK_EX                       = 0x2
+	LOCK_NB                       = 0x4
+	LOCK_SH                       = 0x1
+	LOCK_UN                       = 0x8
 	MADV_ACCESS_DEFAULT           = 0x6
 	MADV_ACCESS_LWP               = 0x7
 	MADV_ACCESS_MANY              = 0x8
 	MADV_DONTNEED                 = 0x4
 	MADV_FREE                     = 0x5
 	MADV_NORMAL                   = 0x0
+	MADV_PURGE                    = 0x9
 	MADV_RANDOM                   = 0x1
 	MADV_SEQUENTIAL               = 0x2
 	MADV_WILLNEED                 = 0x3
@@ -605,6 +636,7 @@ const (
 	MAP_ALIGN                     = 0x200
 	MAP_ANON                      = 0x100
 	MAP_ANONYMOUS                 = 0x100
+	MAP_FILE                      = 0x0
 	MAP_FIXED                     = 0x10
 	MAP_INITDATA                  = 0x800
 	MAP_NORESERVE                 = 0x40
@@ -632,10 +664,19 @@ const (
 	MS_OLDSYNC                    = 0x0
 	MS_SYNC                       = 0x4
 	M_FLUSH                       = 0x86
+	NAME_MAX                      = 0xff
+	NEWDEV                        = 0x1
+	NL0                           = 0x0
+	NL1                           = 0x100
+	NLDLY                         = 0x100
 	NOFLSH                        = 0x80
 	OCRNL                         = 0x8
 	OFDEL                         = 0x80
 	OFILL                         = 0x40
+	OLCUC                         = 0x2
+	OLDDEV                        = 0x0
+	ONBITSMAJOR                   = 0x7
+	ONBITSMINOR                   = 0x8
 	ONLCR                         = 0x4
 	ONLRET                        = 0x20
 	ONOCR                         = 0x10
@@ -955,12 +996,21 @@ const (
 	SO_USELOOPBACK                = 0x40
 	SO_VRRP                       = 0x1017
 	SO_WROFF                      = 0x2
+	TAB0                          = 0x0
+	TAB1                          = 0x800
+	TAB2                          = 0x1000
+	TAB3                          = 0x1800
+	TABDLY                        = 0x1800
 	TCFLSH                        = 0x5407
 	TCGETA                        = 0x5401
 	TCGETS                        = 0x540d
 	TCIFLUSH                      = 0x0
+	TCIOFF                        = 0x2
 	TCIOFLUSH                     = 0x2
+	TCION                         = 0x3
 	TCOFLUSH                      = 0x1
+	TCOOFF                        = 0x0
+	TCOON                         = 0x1
 	TCP_ABORT_THRESHOLD           = 0x11
 	TCP_ANONPRIVBIND              = 0x20
 	TCP_CONN_ABORT_THRESHOLD      = 0x13
@@ -1060,6 +1110,7 @@ const (
 	VEOL                          = 0x5
 	VEOL2                         = 0x6
 	VERASE                        = 0x2
+	VERASE2                       = 0x11
 	VINTR                         = 0x0
 	VKILL                         = 0x3
 	VLNEXT                        = 0xf
@@ -1089,6 +1140,8 @@ const (
 	WSTOPPED                      = 0x4
 	WTRAPPED                      = 0x2
 	WUNTRACED                     = 0x4
+	XCASE                         = 0x4
+	XTABS                         = 0x1800
 )
 
 // Errors
@@ -1266,171 +1319,179 @@ const (
 )
 
 // Error table
-var errors = [...]string{
-	1:   "not owner",
-	2:   "no such file or directory",
-	3:   "no such process",
-	4:   "interrupted system call",
-	5:   "I/O error",
-	6:   "no such device or address",
-	7:   "arg list too long",
-	8:   "exec format error",
-	9:   "bad file number",
-	10:  "no child processes",
-	11:  "resource temporarily unavailable",
-	12:  "not enough space",
-	13:  "permission denied",
-	14:  "bad address",
-	15:  "block device required",
-	16:  "device busy",
-	17:  "file exists",
-	18:  "cross-device link",
-	19:  "no such device",
-	20:  "not a directory",
-	21:  "is a directory",
-	22:  "invalid argument",
-	23:  "file table overflow",
-	24:  "too many open files",
-	25:  "inappropriate ioctl for device",
-	26:  "text file busy",
-	27:  "file too large",
-	28:  "no space left on device",
-	29:  "illegal seek",
-	30:  "read-only file system",
-	31:  "too many links",
-	32:  "broken pipe",
-	33:  "argument out of domain",
-	34:  "result too large",
-	35:  "no message of desired type",
-	36:  "identifier removed",
-	37:  "channel number out of range",
-	38:  "level 2 not synchronized",
-	39:  "level 3 halted",
-	40:  "level 3 reset",
-	41:  "link number out of range",
-	42:  "protocol driver not attached",
-	43:  "no CSI structure available",
-	44:  "level 2 halted",
-	45:  "deadlock situation detected/avoided",
-	46:  "no record locks available",
-	47:  "operation canceled",
-	48:  "operation not supported",
-	49:  "disc quota exceeded",
-	50:  "bad exchange descriptor",
-	51:  "bad request descriptor",
-	52:  "message tables full",
-	53:  "anode table overflow",
-	54:  "bad request code",
-	55:  "invalid slot",
-	56:  "file locking deadlock",
-	57:  "bad font file format",
-	58:  "owner of the lock died",
-	59:  "lock is not recoverable",
-	60:  "not a stream device",
-	61:  "no data available",
-	62:  "timer expired",
-	63:  "out of stream resources",
-	64:  "machine is not on the network",
-	65:  "package not installed",
-	66:  "object is remote",
-	67:  "link has been severed",
-	68:  "advertise error",
-	69:  "srmount error",
-	70:  "communication error on send",
-	71:  "protocol error",
-	72:  "locked lock was unmapped ",
-	73:  "facility is not active",
-	74:  "multihop attempted",
-	77:  "not a data message",
-	78:  "file name too long",
-	79:  "value too large for defined data type",
-	80:  "name not unique on network",
-	81:  "file descriptor in bad state",
-	82:  "remote address changed",
-	83:  "can not access a needed shared library",
-	84:  "accessing a corrupted shared library",
-	85:  ".lib section in a.out corrupted",
-	86:  "attempting to link in more shared libraries than system limit",
-	87:  "can not exec a shared library directly",
-	88:  "illegal byte sequence",
-	89:  "operation not applicable",
-	90:  "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS",
-	91:  "error 91",
-	92:  "error 92",
-	93:  "directory not empty",
-	94:  "too many users",
-	95:  "socket operation on non-socket",
-	96:  "destination address required",
-	97:  "message too long",
-	98:  "protocol wrong type for socket",
-	99:  "option not supported by protocol",
-	120: "protocol not supported",
-	121: "socket type not supported",
-	122: "operation not supported on transport endpoint",
-	123: "protocol family not supported",
-	124: "address family not supported by protocol family",
-	125: "address already in use",
-	126: "cannot assign requested address",
-	127: "network is down",
-	128: "network is unreachable",
-	129: "network dropped connection because of reset",
-	130: "software caused connection abort",
-	131: "connection reset by peer",
-	132: "no buffer space available",
-	133: "transport endpoint is already connected",
-	134: "transport endpoint is not connected",
-	143: "cannot send after socket shutdown",
-	144: "too many references: cannot splice",
-	145: "connection timed out",
-	146: "connection refused",
-	147: "host is down",
-	148: "no route to host",
-	149: "operation already in progress",
-	150: "operation now in progress",
-	151: "stale NFS file handle",
+var errorList = [...]struct {
+	num  syscall.Errno
+	name string
+	desc string
+}{
+	{1, "EPERM", "not owner"},
+	{2, "ENOENT", "no such file or directory"},
+	{3, "ESRCH", "no such process"},
+	{4, "EINTR", "interrupted system call"},
+	{5, "EIO", "I/O error"},
+	{6, "ENXIO", "no such device or address"},
+	{7, "E2BIG", "arg list too long"},
+	{8, "ENOEXEC", "exec format error"},
+	{9, "EBADF", "bad file number"},
+	{10, "ECHILD", "no child processes"},
+	{11, "EAGAIN", "resource temporarily unavailable"},
+	{12, "ENOMEM", "not enough space"},
+	{13, "EACCES", "permission denied"},
+	{14, "EFAULT", "bad address"},
+	{15, "ENOTBLK", "block device required"},
+	{16, "EBUSY", "device busy"},
+	{17, "EEXIST", "file exists"},
+	{18, "EXDEV", "cross-device link"},
+	{19, "ENODEV", "no such device"},
+	{20, "ENOTDIR", "not a directory"},
+	{21, "EISDIR", "is a directory"},
+	{22, "EINVAL", "invalid argument"},
+	{23, "ENFILE", "file table overflow"},
+	{24, "EMFILE", "too many open files"},
+	{25, "ENOTTY", "inappropriate ioctl for device"},
+	{26, "ETXTBSY", "text file busy"},
+	{27, "EFBIG", "file too large"},
+	{28, "ENOSPC", "no space left on device"},
+	{29, "ESPIPE", "illegal seek"},
+	{30, "EROFS", "read-only file system"},
+	{31, "EMLINK", "too many links"},
+	{32, "EPIPE", "broken pipe"},
+	{33, "EDOM", "argument out of domain"},
+	{34, "ERANGE", "result too large"},
+	{35, "ENOMSG", "no message of desired type"},
+	{36, "EIDRM", "identifier removed"},
+	{37, "ECHRNG", "channel number out of range"},
+	{38, "EL2NSYNC", "level 2 not synchronized"},
+	{39, "EL3HLT", "level 3 halted"},
+	{40, "EL3RST", "level 3 reset"},
+	{41, "ELNRNG", "link number out of range"},
+	{42, "EUNATCH", "protocol driver not attached"},
+	{43, "ENOCSI", "no CSI structure available"},
+	{44, "EL2HLT", "level 2 halted"},
+	{45, "EDEADLK", "deadlock situation detected/avoided"},
+	{46, "ENOLCK", "no record locks available"},
+	{47, "ECANCELED", "operation canceled"},
+	{48, "ENOTSUP", "operation not supported"},
+	{49, "EDQUOT", "disc quota exceeded"},
+	{50, "EBADE", "bad exchange descriptor"},
+	{51, "EBADR", "bad request descriptor"},
+	{52, "EXFULL", "message tables full"},
+	{53, "ENOANO", "anode table overflow"},
+	{54, "EBADRQC", "bad request code"},
+	{55, "EBADSLT", "invalid slot"},
+	{56, "EDEADLOCK", "file locking deadlock"},
+	{57, "EBFONT", "bad font file format"},
+	{58, "EOWNERDEAD", "owner of the lock died"},
+	{59, "ENOTRECOVERABLE", "lock is not recoverable"},
+	{60, "ENOSTR", "not a stream device"},
+	{61, "ENODATA", "no data available"},
+	{62, "ETIME", "timer expired"},
+	{63, "ENOSR", "out of stream resources"},
+	{64, "ENONET", "machine is not on the network"},
+	{65, "ENOPKG", "package not installed"},
+	{66, "EREMOTE", "object is remote"},
+	{67, "ENOLINK", "link has been severed"},
+	{68, "EADV", "advertise error"},
+	{69, "ESRMNT", "srmount error"},
+	{70, "ECOMM", "communication error on send"},
+	{71, "EPROTO", "protocol error"},
+	{72, "ELOCKUNMAPPED", "locked lock was unmapped "},
+	{73, "ENOTACTIVE", "facility is not active"},
+	{74, "EMULTIHOP", "multihop attempted"},
+	{77, "EBADMSG", "not a data message"},
+	{78, "ENAMETOOLONG", "file name too long"},
+	{79, "EOVERFLOW", "value too large for defined data type"},
+	{80, "ENOTUNIQ", "name not unique on network"},
+	{81, "EBADFD", "file descriptor in bad state"},
+	{82, "EREMCHG", "remote address changed"},
+	{83, "ELIBACC", "can not access a needed shared library"},
+	{84, "ELIBBAD", "accessing a corrupted shared library"},
+	{85, "ELIBSCN", ".lib section in a.out corrupted"},
+	{86, "ELIBMAX", "attempting to link in more shared libraries than system limit"},
+	{87, "ELIBEXEC", "can not exec a shared library directly"},
+	{88, "EILSEQ", "illegal byte sequence"},
+	{89, "ENOSYS", "operation not applicable"},
+	{90, "ELOOP", "number of symbolic links encountered during path name traversal exceeds MAXSYMLINKS"},
+	{91, "ERESTART", "error 91"},
+	{92, "ESTRPIPE", "error 92"},
+	{93, "ENOTEMPTY", "directory not empty"},
+	{94, "EUSERS", "too many users"},
+	{95, "ENOTSOCK", "socket operation on non-socket"},
+	{96, "EDESTADDRREQ", "destination address required"},
+	{97, "EMSGSIZE", "message too long"},
+	{98, "EPROTOTYPE", "protocol wrong type for socket"},
+	{99, "ENOPROTOOPT", "option not supported by protocol"},
+	{120, "EPROTONOSUPPORT", "protocol not supported"},
+	{121, "ESOCKTNOSUPPORT", "socket type not supported"},
+	{122, "EOPNOTSUPP", "operation not supported on transport endpoint"},
+	{123, "EPFNOSUPPORT", "protocol family not supported"},
+	{124, "EAFNOSUPPORT", "address family not supported by protocol family"},
+	{125, "EADDRINUSE", "address already in use"},
+	{126, "EADDRNOTAVAIL", "cannot assign requested address"},
+	{127, "ENETDOWN", "network is down"},
+	{128, "ENETUNREACH", "network is unreachable"},
+	{129, "ENETRESET", "network dropped connection because of reset"},
+	{130, "ECONNABORTED", "software caused connection abort"},
+	{131, "ECONNRESET", "connection reset by peer"},
+	{132, "ENOBUFS", "no buffer space available"},
+	{133, "EISCONN", "transport endpoint is already connected"},
+	{134, "ENOTCONN", "transport endpoint is not connected"},
+	{143, "ESHUTDOWN", "cannot send after socket shutdown"},
+	{144, "ETOOMANYREFS", "too many references: cannot splice"},
+	{145, "ETIMEDOUT", "connection timed out"},
+	{146, "ECONNREFUSED", "connection refused"},
+	{147, "EHOSTDOWN", "host is down"},
+	{148, "EHOSTUNREACH", "no route to host"},
+	{149, "EALREADY", "operation already in progress"},
+	{150, "EINPROGRESS", "operation now in progress"},
+	{151, "ESTALE", "stale NFS file handle"},
 }
 
 // Signal table
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal Instruction",
-	5:  "trace/Breakpoint Trap",
-	6:  "abort",
-	7:  "emulation Trap",
-	8:  "arithmetic Exception",
-	9:  "killed",
-	10: "bus Error",
-	11: "segmentation Fault",
-	12: "bad System Call",
-	13: "broken Pipe",
-	14: "alarm Clock",
-	15: "terminated",
-	16: "user Signal 1",
-	17: "user Signal 2",
-	18: "child Status Changed",
-	19: "power-Fail/Restart",
-	20: "window Size Change",
-	21: "urgent Socket Condition",
-	22: "pollable Event",
-	23: "stopped (signal)",
-	24: "stopped (user)",
-	25: "continued",
-	26: "stopped (tty input)",
-	27: "stopped (tty output)",
-	28: "virtual Timer Expired",
-	29: "profiling Timer Expired",
-	30: "cpu Limit Exceeded",
-	31: "file Size Limit Exceeded",
-	32: "no runnable lwp",
-	33: "inter-lwp signal",
-	34: "checkpoint Freeze",
-	35: "checkpoint Thaw",
-	36: "thread Cancellation",
-	37: "resource Lost",
-	38: "resource Control Exceeded",
-	39: "reserved for JVM 1",
-	40: "reserved for JVM 2",
-	41: "information Request",
+var signalList = [...]struct {
+	num  syscall.Signal
+	name string
+	desc string
+}{
+	{1, "SIGHUP", "hangup"},
+	{2, "SIGINT", "interrupt"},
+	{3, "SIGQUIT", "quit"},
+	{4, "SIGILL", "illegal Instruction"},
+	{5, "SIGTRAP", "trace/Breakpoint Trap"},
+	{6, "SIGABRT", "abort"},
+	{7, "SIGEMT", "emulation Trap"},
+	{8, "SIGFPE", "arithmetic Exception"},
+	{9, "SIGKILL", "killed"},
+	{10, "SIGBUS", "bus Error"},
+	{11, "SIGSEGV", "segmentation Fault"},
+	{12, "SIGSYS", "bad System Call"},
+	{13, "SIGPIPE", "broken Pipe"},
+	{14, "SIGALRM", "alarm Clock"},
+	{15, "SIGTERM", "terminated"},
+	{16, "SIGUSR1", "user Signal 1"},
+	{17, "SIGUSR2", "user Signal 2"},
+	{18, "SIGCHLD", "child Status Changed"},
+	{19, "SIGPWR", "power-Fail/Restart"},
+	{20, "SIGWINCH", "window Size Change"},
+	{21, "SIGURG", "urgent Socket Condition"},
+	{22, "SIGIO", "pollable Event"},
+	{23, "SIGSTOP", "stopped (signal)"},
+	{24, "SIGTSTP", "stopped (user)"},
+	{25, "SIGCONT", "continued"},
+	{26, "SIGTTIN", "stopped (tty input)"},
+	{27, "SIGTTOU", "stopped (tty output)"},
+	{28, "SIGVTALRM", "virtual Timer Expired"},
+	{29, "SIGPROF", "profiling Timer Expired"},
+	{30, "SIGXCPU", "cpu Limit Exceeded"},
+	{31, "SIGXFSZ", "file Size Limit Exceeded"},
+	{32, "SIGWAITING", "no runnable lwp"},
+	{33, "SIGLWP", "inter-lwp signal"},
+	{34, "SIGFREEZE", "checkpoint Freeze"},
+	{35, "SIGTHAW", "checkpoint Thaw"},
+	{36, "SIGCANCEL", "thread Cancellation"},
+	{37, "SIGLOST", "resource Lost"},
+	{38, "SIGXRES", "resource Control Exceeded"},
+	{39, "SIGJVM1", "reserved for JVM 1"},
+	{40, "SIGJVM2", "reserved for JVM 2"},
+	{41, "SIGINFO", "information Request"},
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zptrace386_linux.go b/installer/vendor/golang.org/x/sys/unix/zptrace386_linux.go
new file mode 100644
index 0000000000..2d21c49e12
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zptrace386_linux.go
@@ -0,0 +1,80 @@
+// Code generated by linux/mkall.go generatePtracePair(386, amd64). DO NOT EDIT.
+
+// +build linux
+// +build 386 amd64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegs386 is the registers used by 386 binaries.
+type PtraceRegs386 struct {
+	Ebx      int32
+	Ecx      int32
+	Edx      int32
+	Esi      int32
+	Edi      int32
+	Ebp      int32
+	Eax      int32
+	Xds      int32
+	Xes      int32
+	Xfs      int32
+	Xgs      int32
+	Orig_eax int32
+	Eip      int32
+	Xcs      int32
+	Eflags   int32
+	Esp      int32
+	Xss      int32
+}
+
+// PtraceGetRegs386 fetches the registers used by 386 binaries.
+func PtraceGetRegs386(pid int, regsout *PtraceRegs386) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegs386 sets the registers used by 386 binaries.
+func PtraceSetRegs386(pid int, regs *PtraceRegs386) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsAmd64 is the registers used by amd64 binaries.
+type PtraceRegsAmd64 struct {
+	R15      uint64
+	R14      uint64
+	R13      uint64
+	R12      uint64
+	Rbp      uint64
+	Rbx      uint64
+	R11      uint64
+	R10      uint64
+	R9       uint64
+	R8       uint64
+	Rax      uint64
+	Rcx      uint64
+	Rdx      uint64
+	Rsi      uint64
+	Rdi      uint64
+	Orig_rax uint64
+	Rip      uint64
+	Cs       uint64
+	Eflags   uint64
+	Rsp      uint64
+	Ss       uint64
+	Fs_base  uint64
+	Gs_base  uint64
+	Ds       uint64
+	Es       uint64
+	Fs       uint64
+	Gs       uint64
+}
+
+// PtraceGetRegsAmd64 fetches the registers used by amd64 binaries.
+func PtraceGetRegsAmd64(pid int, regsout *PtraceRegsAmd64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsAmd64 sets the registers used by amd64 binaries.
+func PtraceSetRegsAmd64(pid int, regs *PtraceRegsAmd64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zptracearm_linux.go b/installer/vendor/golang.org/x/sys/unix/zptracearm_linux.go
new file mode 100644
index 0000000000..faf23bbed9
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zptracearm_linux.go
@@ -0,0 +1,41 @@
+// Code generated by linux/mkall.go generatePtracePair(arm, arm64). DO NOT EDIT.
+
+// +build linux
+// +build arm arm64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsArm is the registers used by arm binaries.
+type PtraceRegsArm struct {
+	Uregs [18]uint32
+}
+
+// PtraceGetRegsArm fetches the registers used by arm binaries.
+func PtraceGetRegsArm(pid int, regsout *PtraceRegsArm) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsArm sets the registers used by arm binaries.
+func PtraceSetRegsArm(pid int, regs *PtraceRegsArm) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsArm64 is the registers used by arm64 binaries.
+type PtraceRegsArm64 struct {
+	Regs   [31]uint64
+	Sp     uint64
+	Pc     uint64
+	Pstate uint64
+}
+
+// PtraceGetRegsArm64 fetches the registers used by arm64 binaries.
+func PtraceGetRegsArm64(pid int, regsout *PtraceRegsArm64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsArm64 sets the registers used by arm64 binaries.
+func PtraceSetRegsArm64(pid int, regs *PtraceRegsArm64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zptracemips_linux.go b/installer/vendor/golang.org/x/sys/unix/zptracemips_linux.go
new file mode 100644
index 0000000000..c431131e63
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zptracemips_linux.go
@@ -0,0 +1,50 @@
+// Code generated by linux/mkall.go generatePtracePair(mips, mips64). DO NOT EDIT.
+
+// +build linux
+// +build mips mips64
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsMips is the registers used by mips binaries.
+type PtraceRegsMips struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips fetches the registers used by mips binaries.
+func PtraceGetRegsMips(pid int, regsout *PtraceRegsMips) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips sets the registers used by mips binaries.
+func PtraceSetRegsMips(pid int, regs *PtraceRegsMips) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsMips64 is the registers used by mips64 binaries.
+type PtraceRegsMips64 struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips64 fetches the registers used by mips64 binaries.
+func PtraceGetRegsMips64(pid int, regsout *PtraceRegsMips64) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips64 sets the registers used by mips64 binaries.
+func PtraceSetRegsMips64(pid int, regs *PtraceRegsMips64) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go b/installer/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go
new file mode 100644
index 0000000000..dc3d6d3732
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zptracemipsle_linux.go
@@ -0,0 +1,50 @@
+// Code generated by linux/mkall.go generatePtracePair(mipsle, mips64le). DO NOT EDIT.
+
+// +build linux
+// +build mipsle mips64le
+
+package unix
+
+import "unsafe"
+
+// PtraceRegsMipsle is the registers used by mipsle binaries.
+type PtraceRegsMipsle struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMipsle fetches the registers used by mipsle binaries.
+func PtraceGetRegsMipsle(pid int, regsout *PtraceRegsMipsle) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMipsle sets the registers used by mipsle binaries.
+func PtraceSetRegsMipsle(pid int, regs *PtraceRegsMipsle) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
+
+// PtraceRegsMips64le is the registers used by mips64le binaries.
+type PtraceRegsMips64le struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
+}
+
+// PtraceGetRegsMips64le fetches the registers used by mips64le binaries.
+func PtraceGetRegsMips64le(pid int, regsout *PtraceRegsMips64le) error {
+	return ptrace(PTRACE_GETREGS, pid, 0, uintptr(unsafe.Pointer(regsout)))
+}
+
+// PtraceSetRegsMips64le sets the registers used by mips64le binaries.
+func PtraceSetRegsMips64le(pid int, regs *PtraceRegsMips64le) error {
+	return ptrace(PTRACE_SETREGS, pid, 0, uintptr(unsafe.Pointer(regs)))
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
index e48f4a5c1c..4c9f72756b 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_386.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -tags darwin,386 syscall_bsd.go syscall_darwin.go syscall_darwin_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build darwin,386
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -298,6 +409,16 @@ func kill(pid int, signum int, posix int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -456,6 +577,21 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -486,6 +622,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -496,6 +647,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -527,6 +693,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -745,6 +926,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -785,13 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -800,39 +1001,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -841,14 +1016,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -857,24 +1031,14 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -883,13 +1047,13 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -988,6 +1152,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1008,6 +1194,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1245,6 +1451,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1308,6 +1534,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
index 672ada0e44..2562377738 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags darwin,amd64 syscall_bsd.go syscall_darwin.go syscall_darwin_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build darwin,amd64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -298,6 +409,16 @@ func kill(pid int, signum int, posix int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -456,6 +577,21 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -486,6 +622,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -496,6 +647,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -527,6 +693,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -745,6 +926,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -785,13 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -800,39 +1001,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -841,14 +1016,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -857,24 +1031,14 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -883,13 +1047,13 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -988,6 +1152,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1008,6 +1194,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1245,6 +1451,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1308,6 +1534,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1383,21 +1624,6 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func gettimeofday(tp *Timeval) (sec int64, usec int32, err error) {
 	r0, r1, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
 	sec = int64(r0)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
index d516409dbe..4ae787e491 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm.go
@@ -1,5 +1,5 @@
-// mksyscall.pl -l32 -tags darwin,arm syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mksyscall.pl -tags darwin,arm syscall_bsd.go syscall_darwin.go syscall_darwin_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build darwin,arm
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -298,6 +409,16 @@ func kill(pid int, signum int, posix int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -456,6 +577,21 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -486,6 +622,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -496,6 +647,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -527,6 +693,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -745,6 +926,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -785,13 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -800,39 +1001,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -841,14 +1016,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -857,24 +1031,14 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -883,13 +1047,13 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -988,6 +1152,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1008,6 +1194,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1245,6 +1451,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1308,6 +1534,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
index e97759c357..14ed6886c7 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_darwin_arm64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags darwin,arm64 syscall_bsd.go syscall_darwin.go syscall_darwin_arm64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build darwin,arm64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -298,6 +409,16 @@ func kill(pid int, signum int, posix int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -456,6 +577,21 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -486,6 +622,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -496,6 +647,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -527,6 +693,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS64, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -745,6 +926,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -785,13 +986,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -800,39 +1001,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -841,14 +1016,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -857,24 +1031,14 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -883,13 +1047,13 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(dirfd int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -988,6 +1152,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1008,6 +1194,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1245,6 +1451,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1308,6 +1534,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
index 3e9d82a27e..91f36e9ec3 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_dragonfly_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -dragonfly -tags dragonfly,amd64 syscall_bsd.go syscall_dragonfly.go syscall_dragonfly_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build dragonfly,amd64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	r = int(r0)
@@ -312,6 +423,33 @@ func extpwrite(fd int, p []byte, flags int, offset int64) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -480,6 +618,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -521,6 +674,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -829,74 +997,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1380,3 +1480,29 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int, err error) {
+	r0, _, e1 := Syscall6(SYS_ACCEPT4, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)), uintptr(flags), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
index f53801ceef..a86434a7ba 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_386.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -tags freebsd,386 syscall_bsd.go syscall_freebsd.go syscall_freebsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build freebsd,386
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	r = int(r0)
@@ -278,6 +389,33 @@ func pipe() (r int, w int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -303,6 +441,36 @@ func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Chdir(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -640,6 +808,21 @@ func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -670,6 +853,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -680,6 +878,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -711,6 +924,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -741,6 +969,23 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
@@ -949,6 +1194,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -989,13 +1254,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1004,39 +1269,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1045,14 +1284,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1061,14 +1299,8 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1077,18 +1309,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1097,13 +1325,13 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1202,6 +1430,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1222,6 +1472,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1469,6 +1739,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1532,6 +1822,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1615,3 +1920,18 @@ func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
index 55b07412cb..040e2f760c 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags freebsd,amd64 syscall_bsd.go syscall_freebsd.go syscall_freebsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build freebsd,amd64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	r = int(r0)
@@ -278,6 +389,33 @@ func pipe() (r int, w int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -303,6 +441,36 @@ func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Chdir(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -640,6 +808,21 @@ func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -670,6 +853,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -680,6 +878,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -711,6 +924,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -741,6 +969,23 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
@@ -949,6 +1194,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -989,13 +1254,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1004,39 +1269,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1045,14 +1284,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1061,14 +1299,8 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1077,18 +1309,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1097,13 +1325,13 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1202,6 +1430,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1222,6 +1472,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1469,6 +1739,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1532,6 +1822,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1615,3 +1920,18 @@ func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
index 0e9b42bf4f..cddc5e86b1 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_freebsd_arm.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -arm -tags freebsd,arm syscall_bsd.go syscall_freebsd.go syscall_freebsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build freebsd,arm
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (r int, w int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	r = int(r0)
@@ -278,6 +389,33 @@ func pipe() (r int, w int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -303,6 +441,36 @@ func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CapEnter() (err error) {
+	_, _, e1 := Syscall(SYS_CAP_ENTER, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsGet(version int, fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS___CAP_RIGHTS_GET, uintptr(version), uintptr(fd), uintptr(unsafe.Pointer(rightsp)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func capRightsLimit(fd int, rightsp *CapRights) (err error) {
+	_, _, e1 := Syscall(SYS_CAP_RIGHTS_LIMIT, uintptr(fd), uintptr(unsafe.Pointer(rightsp)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Chdir(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -640,6 +808,21 @@ func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Faccessat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FACCESSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -670,6 +853,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -680,6 +878,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHOWNAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Flock(fd int, how int) (err error) {
 	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
 	if e1 != 0 {
@@ -711,6 +924,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -741,6 +969,23 @@ func Ftruncate(fd int, length int64) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getdirentries(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(buf) > 0 {
@@ -949,6 +1194,26 @@ func Link(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Linkat(pathfd int, path string, linkfd int, link string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_LINKAT, uintptr(pathfd), uintptr(unsafe.Pointer(_p0)), uintptr(linkfd), uintptr(unsafe.Pointer(_p1)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listen(s int, backlog int) (err error) {
 	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
 	if e1 != 0 {
@@ -989,13 +1254,13 @@ func Mkdir(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mkfifo(path string, mode uint32) (err error) {
+func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	_, _, e1 := Syscall(SYS_MKDIRAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1004,39 +1269,13 @@ func Mkfifo(path string, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mknod(path string, mode uint32, dev int) (err error) {
+func Mkfifo(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1045,14 +1284,13 @@ func Mlockall(flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1061,14 +1299,8 @@ func Mprotect(b []byte, prot int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1077,18 +1309,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
 	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
-	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1097,13 +1325,13 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Open(path string, mode int, perm uint32) (fd int, err error) {
+func Openat(fdat int, path string, mode int, perm uint32) (fd int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
 	if err != nil {
 		return
 	}
-	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	r0, _, e1 := Syscall6(SYS_OPENAT, uintptr(fdat), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm), 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
@@ -1202,6 +1430,28 @@ func Readlink(path string, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Readlinkat(dirfd int, path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_READLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)), 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Rename(from string, to string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(from)
@@ -1222,6 +1472,26 @@ func Rename(from string, to string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Renameat(fromfd int, from string, tofd int, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_RENAMEAT, uintptr(fromfd), uintptr(unsafe.Pointer(_p0)), uintptr(tofd), uintptr(unsafe.Pointer(_p1)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Revoke(path string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1469,6 +1739,26 @@ func Symlink(path string, link string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Symlinkat(oldpath string, newdirfd int, newpath string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(oldpath)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(newpath)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINKAT, uintptr(unsafe.Pointer(_p0)), uintptr(newdirfd), uintptr(unsafe.Pointer(_p1)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() (err error) {
 	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
 	if e1 != 0 {
@@ -1532,6 +1822,21 @@ func Unlink(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Unlinkat(dirfd int, path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINKAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Unmount(path string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1615,3 +1920,18 @@ func accept4(fd int, rsa *RawSockaddrAny, addrlen *_Socklen, flags int) (nfd int
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
index d4ec806db8..433becfd02 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_386.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -tags linux,386 syscall_linux.go syscall_linux_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,386
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1254,6 +1595,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Ftruncate(fd int, length int64) (err error) {
 	_, _, e1 := Syscall(SYS_FTRUNCATE64, uintptr(fd), uintptr(length), uintptr(length>>32))
 	if e1 != 0 {
@@ -1265,7 +1621,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1273,7 +1629,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1281,7 +1637,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1289,7 +1645,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
 	uid = int(r0)
 	return
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
index 8b2e87dfc8..33c02b2695 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,amd64 syscall_linux.go syscall_linux_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,amd64
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1251,6 +1592,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1272,7 +1628,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1280,7 +1636,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1288,7 +1644,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1306,7 +1662,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1439,17 +1795,6 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
 	written = int(r0)
@@ -1552,21 +1897,6 @@ func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n i
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Stat(path string, stat *Stat_t) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Statfs(path string, buf *Statfs_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
index 82d36a411b..f91b56c217 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -arm -tags linux,arm syscall_linux.go syscall_linux_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,arm
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1413,8 +1754,23 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID32, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1422,7 +1778,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID32, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1430,7 +1786,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID32, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1438,7 +1794,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID32, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID32, 0, 0, 0)
 	uid = int(r0)
 	return
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
index f6cc3200d2..52d7595250 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_arm64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,arm64 syscall_linux.go syscall_linux_arm64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,arm64
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1211,6 +1552,16 @@ func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1267,7 +1618,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1275,7 +1626,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1283,7 +1634,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1301,7 +1652,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1363,17 +1714,6 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
 	written = int(r0)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
index f91afb481e..970a5c132d 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -b32 -arm -tags linux,mips syscall_linux.go syscall_linux_mipsx.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,mips
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1204,6 +1545,16 @@ func Dup2(oldfd int, newfd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset>>32), uintptr(offset), uintptr(length>>32), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1225,7 +1576,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1233,7 +1584,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1241,7 +1592,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1249,7 +1600,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1407,9 +1758,9 @@ func Shutdown(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(int64(r0)<<32 | int64(r1))
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1699,6 +2050,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Stat(path string, stat *Stat_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
index 657d11eff9..b989d0f282 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,mips64 syscall_linux.go syscall_linux_mips64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,mips64
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1194,6 +1535,16 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -1211,6 +1562,16 @@ func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1221,6 +1582,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1242,7 +1618,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1250,7 +1626,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1258,7 +1634,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1276,7 +1652,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1363,17 +1739,6 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
 	written = int(r0)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
index 31ff1774c3..1f8d14cacc 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mips64le.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,mips64le syscall_linux.go syscall_linux_mips64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,mips64le
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1194,6 +1535,16 @@ func Munlockall() (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Dup2(oldfd int, newfd int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(events) > 0 {
@@ -1211,6 +1562,16 @@ func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1221,6 +1582,21 @@ func Fchown(fd int, uid int, gid int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1242,7 +1618,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1250,7 +1626,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1258,7 +1634,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1276,7 +1652,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1363,17 +1739,6 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
-	n = int(r0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
 	r0, _, e1 := Syscall6(SYS_SENDFILE, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
 	written = int(r0)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
index 797e6336e3..a9c7e520e4 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_mipsle.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -arm -tags linux,mipsle syscall_linux.go syscall_linux_mipsx.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,mipsle
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1204,6 +1545,16 @@ func Dup2(oldfd int, newfd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_FADVISE64, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(length), uintptr(length>>32), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1225,7 +1576,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1233,7 +1584,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1241,7 +1592,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1249,7 +1600,7 @@ func Getgid() (gid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1407,9 +1758,9 @@ func Shutdown(fd int, how int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int64, err error) {
-	r0, r1, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
-	n = int64(int64(r1)<<32 | int64(r0))
+func Splice(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_SPLICE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1699,6 +2050,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT64, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Stat(path string, stat *Stat_t) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
index 307dbb5bde..3bb9a20992 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,ppc64 syscall_linux.go syscall_linux_ppc64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,ppc64
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1221,6 +1562,16 @@ func Dup2(oldfd int, newfd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1241,6 +1592,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1262,7 +1628,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1270,7 +1636,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1278,7 +1644,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1296,7 +1662,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1430,7 +1796,7 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
index f458a63ad5..56116623d6 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_ppc64le.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,ppc64le syscall_linux.go syscall_linux_ppc64x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,ppc64le
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1221,6 +1562,16 @@ func Dup2(oldfd int, newfd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -1241,6 +1592,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1262,7 +1628,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1270,7 +1636,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1278,7 +1644,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1296,7 +1662,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
@@ -1430,7 +1796,7 @@ func Seek(fd int, offset int64, whence int) (off int64, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Select(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (n int, err error) {
-	r0, _, e1 := Syscall6(SYS_SELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	r0, _, e1 := Syscall6(SYS__NEWSELECT, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = errnoErr(e1)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
index b1d5a9bc35..9696a0199d 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_s390x.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,s390x syscall_linux.go syscall_linux_s390x.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,s390x
 
@@ -14,6 +14,31 @@ var _ syscall.Errno
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func fchmodat(dirfd int, path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Linkat(olddirfd int, oldpath string, newdirfd int, newpath string, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(oldpath)
@@ -186,6 +211,104 @@ func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func KeyctlInt(cmd int, arg2 int, arg3 int, arg4 int, arg5 int) (ret int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(arg3), uintptr(arg4), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func KeyctlBuffer(cmd int, arg2 int, buf []byte, arg5 int) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(buf)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlJoin(cmd int, arg2 string) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg2)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(_p0)), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlSearch(cmd int, arg2 int, arg3 string, arg4 string, arg5 int) (ret int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(arg3)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(arg4)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(arg5), 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlIOV(cmd int, arg2 int, payload []Iovec, arg5 int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(payload) > 0 {
+		_p0 = unsafe.Pointer(&payload[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(arg2), uintptr(_p0), uintptr(len(payload)), uintptr(arg5), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func keyctlDH(cmd int, arg2 *KeyctlDHParams, buf []byte) (ret int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_KEYCTL, uintptr(cmd), uintptr(unsafe.Pointer(arg2)), uintptr(_p0), uintptr(len(buf)), 0, 0)
+	ret = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func ptrace(request int, pid int, addr uintptr, data uintptr) (err error) {
 	_, _, e1 := Syscall6(SYS_PTRACE, uintptr(request), uintptr(pid), uintptr(addr), uintptr(data), 0, 0)
 	if e1 != 0 {
@@ -251,6 +374,33 @@ func Acct(path string) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func AddKey(keyType string, description string, payload []byte, ringid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(payload) > 0 {
+		_p2 = unsafe.Pointer(&payload[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_ADD_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(payload)), uintptr(ringid), 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Adjtimex(buf *Timex) (state int, err error) {
 	r0, _, e1 := Syscall(SYS_ADJTIMEX, uintptr(unsafe.Pointer(buf)), 0, 0)
 	state = int(r0)
@@ -312,6 +462,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -365,8 +526,19 @@ func EpollCtl(epfd int, op int, fd int, event *EpollEvent) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Eventfd(initval uint, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_EVENTFD2, uintptr(initval), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Exit(code int) {
-	Syscall(SYS_EXIT_GROUP, uintptr(code), 0, 0)
+	SyscallNoError(SYS_EXIT_GROUP, uintptr(code), 0, 0)
 	return
 }
 
@@ -417,21 +589,6 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
-	var _p0 *byte
-	_p0, err = BytePtrFromString(path)
-	if err != nil {
-		return
-	}
-	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Fchownat(dirfd int, path string, uid int, gid int, flags int) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -517,7 +674,7 @@ func Getpgid(pid int) (pgid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getpid() (pid int) {
-	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPID, 0, 0, 0)
 	pid = int(r0)
 	return
 }
@@ -525,7 +682,7 @@ func Getpid() (pid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getppid() (ppid int) {
-	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETPPID, 0, 0, 0)
 	ppid = int(r0)
 	return
 }
@@ -582,7 +739,7 @@ func Getsid(pid int) (sid int, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Gettid() (tid int) {
-	r0, _, _ := RawSyscall(SYS_GETTID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETTID, 0, 0, 0)
 	tid = int(r0)
 	return
 }
@@ -681,6 +838,33 @@ func Klogctl(typ int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Lgetxattr(path string, attr string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(dest) > 0 {
+		_p2 = unsafe.Pointer(&dest[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_LGETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(dest)), 0, 0)
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Listxattr(path string, dest []byte) (sz int, err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -703,6 +887,74 @@ func Listxattr(path string, dest []byte) (sz int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Llistxattr(path string, dest []byte) (sz int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(dest) > 0 {
+		_p1 = unsafe.Pointer(&dest[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_LLISTXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(dest)))
+	sz = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lremovexattr(path string, attr string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LREMOVEXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lsetxattr(path string, attr string, data []byte, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(attr)
+	if err != nil {
+		return
+	}
+	var _p2 unsafe.Pointer
+	if len(data) > 0 {
+		_p2 = unsafe.Pointer(&data[0])
+	} else {
+		_p2 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_LSETXATTR, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(_p2), uintptr(len(data)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Mkdirat(dirfd int, path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -743,6 +995,17 @@ func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func PerfEventOpen(attr *PerfEventAttr, pid int, cpu int, groupFd int, flags int) (fd int, err error) {
+	r0, _, e1 := Syscall6(SYS_PERF_EVENT_OPEN, uintptr(unsafe.Pointer(attr)), uintptr(pid), uintptr(cpu), uintptr(groupFd), uintptr(flags), 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func PivotRoot(newroot string, putold string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(newroot)
@@ -783,6 +1046,17 @@ func Prctl(option int, arg2 uintptr, arg3 uintptr, arg4 uintptr, arg5 uintptr) (
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Pselect(nfd int, r *FdSet, w *FdSet, e *FdSet, timeout *Timespec, sigmask *Sigset_t) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_PSELECT6, uintptr(nfd), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), uintptr(unsafe.Pointer(sigmask)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func read(fd int, p []byte) (n int, err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -840,6 +1114,32 @@ func Renameat(olddirfd int, oldpath string, newdirfd int, newpath string) (err e
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func RequestKey(keyType string, description string, callback string, destRingid int) (id int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(keyType)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(description)
+	if err != nil {
+		return
+	}
+	var _p2 *byte
+	_p2, err = BytePtrFromString(callback)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall6(SYS_REQUEST_KEY, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), uintptr(unsafe.Pointer(_p2)), uintptr(destRingid), 0, 0)
+	id = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setdomainname(p []byte) (err error) {
 	var _p0 unsafe.Pointer
 	if len(p) > 0 {
@@ -949,8 +1249,33 @@ func Setxattr(path string, attr string, data []byte, flags int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Statx(dirfd int, path string, flags int, mask int, stat *Statx_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_STATX, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(flags), uintptr(mask), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Sync() {
-	Syscall(SYS_SYNC, 0, 0, 0)
+	SyscallNoError(SYS_SYNC, 0, 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Syncfs(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_SYNCFS, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
 	return
 }
 
@@ -999,7 +1324,7 @@ func Times(tms *Tms) (ticks uintptr, err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Umask(mask int) (oldmask int) {
-	r0, _, _ := RawSyscall(SYS_UMASK, uintptr(mask), 0, 0)
+	r0, _ := RawSyscallNoError(SYS_UMASK, uintptr(mask), 0, 0)
 	oldmask = int(r0)
 	return
 }
@@ -1158,14 +1483,24 @@ func Mlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Munlock(b []byte) (err error) {
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
 	var _p0 unsafe.Pointer
 	if len(b) > 0 {
 		_p0 = unsafe.Pointer(&b[0])
 	} else {
 		_p0 = unsafe.Pointer(&_zero)
 	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1174,8 +1509,14 @@ func Munlock(b []byte) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
 	if e1 != 0 {
 		err = errnoErr(e1)
 	}
@@ -1251,6 +1592,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(dirfd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_NEWFSTATAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, buf *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(buf)), 0)
 	if e1 != 0 {
@@ -1272,7 +1628,7 @@ func Ftruncate(fd int, length int64) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getegid() (egid int) {
-	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEGID, 0, 0, 0)
 	egid = int(r0)
 	return
 }
@@ -1280,7 +1636,7 @@ func Getegid() (egid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Geteuid() (euid int) {
-	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETEUID, 0, 0, 0)
 	euid = int(r0)
 	return
 }
@@ -1288,7 +1644,7 @@ func Geteuid() (euid int) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getgid() (gid int) {
-	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETGID, 0, 0, 0)
 	gid = int(r0)
 	return
 }
@@ -1306,7 +1662,7 @@ func Getrlimit(resource int, rlim *Rlimit) (err error) {
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
 func Getuid() (uid int) {
-	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	r0, _ := RawSyscallNoError(SYS_GETUID, 0, 0, 0)
 	uid = int(r0)
 	return
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
index ce3ec585b6..c01b3b6bab 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_linux_sparc64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -tags linux,sparc64 syscall_linux.go syscall_linux_sparc64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build linux,sparc64
 
@@ -312,6 +312,17 @@ func Close(fd int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func CopyFileRange(rfd int, roff *int64, wfd int, woff *int64, len int, flags int) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_COPY_FILE_RANGE, uintptr(rfd), uintptr(unsafe.Pointer(roff)), uintptr(wfd), uintptr(unsafe.Pointer(woff)), uintptr(len), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup(oldfd int) (fd int, err error) {
 	r0, _, e1 := Syscall(SYS_DUP, uintptr(oldfd), 0, 0)
 	fd = int(r0)
@@ -1211,6 +1222,16 @@ func EpollWait(epfd int, events []EpollEvent, msec int) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_FADVISE64, uintptr(fd), uintptr(offset), uintptr(length), uintptr(advice), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Dup2(oldfd int, newfd int) (err error) {
 	_, _, e1 := Syscall(SYS_DUP2, uintptr(oldfd), uintptr(newfd), 0)
 	if e1 != 0 {
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
index 3182345ece..fb4b962782 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_386.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -netbsd -tags netbsd,386 syscall_bsd.go syscall_netbsd.go syscall_netbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build netbsd,386
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (fd1 int, fd2 int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	fd1 = int(r0)
@@ -295,6 +406,33 @@ func getdents(fd int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -433,6 +571,16 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), 0, uintptr(length), uintptr(length>>32), uintptr(advice), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -463,6 +611,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -504,6 +667,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -777,74 +955,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1297,3 +1407,18 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
index 74ba8189a5..beac82ef86 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -netbsd -tags netbsd,amd64 syscall_bsd.go syscall_netbsd.go syscall_netbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build netbsd,amd64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (fd1 int, fd2 int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	fd1 = int(r0)
@@ -295,6 +406,33 @@ func getdents(fd int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -433,6 +571,16 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall6(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), 0, uintptr(length), uintptr(advice))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -463,6 +611,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -504,6 +667,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -777,74 +955,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1297,3 +1407,18 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
index 1f346e2f52..7bd5f60b00 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_netbsd_arm.go
@@ -1,5 +1,5 @@
-// mksyscall.pl -l32 -arm -tags netbsd,arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// mksyscall.pl -l32 -netbsd -arm -tags netbsd,arm syscall_bsd.go syscall_netbsd.go syscall_netbsd_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build netbsd,arm
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe() (fd1 int, fd2 int, err error) {
 	r0, r1, e1 := RawSyscall(SYS_PIPE, 0, 0, 0)
 	fd1 = int(r0)
@@ -295,6 +406,33 @@ func getdents(fd int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -433,6 +571,16 @@ func Exit(code int) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fadvise(fd int, offset int64, length int64, advice int) (err error) {
+	_, _, e1 := Syscall9(SYS_POSIX_FADVISE, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), 0, uintptr(length), uintptr(length>>32), uintptr(advice), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchdir(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -463,6 +611,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -504,6 +667,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fsync(fd int) (err error) {
 	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
 	if e1 != 0 {
@@ -777,74 +955,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1297,3 +1407,18 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
index ca3e813926..49b3b5e8a4 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_386.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -l32 -openbsd -tags openbsd,386 syscall_bsd.go syscall_openbsd.go syscall_openbsd_386.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build openbsd,386
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe(p *[2]_C_int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
 	if e1 != 0 {
@@ -293,6 +404,33 @@ func getdents(fd int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -461,6 +599,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -502,6 +655,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -612,6 +780,17 @@ func Getrlimit(which int, lim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getrusage(who int, rusage *Rusage) (err error) {
 	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
@@ -785,74 +964,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1154,6 +1265,16 @@ func Setrlimit(which int, lim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1355,3 +1476,18 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
index bf63d552ed..c4c7d8540c 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall.pl -openbsd -tags openbsd,amd64 syscall_bsd.go syscall_openbsd.go syscall_openbsd_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build openbsd,amd64
 
@@ -266,6 +266,117 @@ func fcntl(fd int, cmd int, arg int) (val int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func pipe(p *[2]_C_int) (err error) {
 	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
 	if e1 != 0 {
@@ -293,6 +404,33 @@ func getdents(fd int, buf []byte) (n int, err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -461,6 +599,21 @@ func Fchmod(fd int, mode uint32) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fchown(fd int, uid int, gid int) (err error) {
 	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
 	if e1 != 0 {
@@ -502,6 +655,21 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Fstatfs(fd int, stat *Statfs_t) (err error) {
 	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
 	if e1 != 0 {
@@ -612,6 +780,17 @@ func Getrlimit(which int, lim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Getrusage(who int, rusage *Rusage) (err error) {
 	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
 	if e1 != 0 {
@@ -785,74 +964,6 @@ func Mknod(path string, mode uint32, dev int) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
-func Mlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mlockall(flags int) (err error) {
-	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Mprotect(b []byte, prot int) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlock(b []byte) (err error) {
-	var _p0 unsafe.Pointer
-	if len(b) > 0 {
-		_p0 = unsafe.Pointer(&b[0])
-	} else {
-		_p0 = unsafe.Pointer(&_zero)
-	}
-	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
-func Munlockall() (err error) {
-	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
-	if e1 != 0 {
-		err = errnoErr(e1)
-	}
-	return
-}
-
-// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
-
 func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
 	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
 	if e1 != 0 {
@@ -1154,6 +1265,16 @@ func Setrlimit(which int, lim *Rlimit) (err error) {
 
 // THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
 
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
 func Setsid() (pid int, err error) {
 	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
 	pid = int(r0)
@@ -1355,3 +1476,18 @@ func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
 	}
 	return
 }
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
new file mode 100644
index 0000000000..210285b0ba
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_openbsd_arm.go
@@ -0,0 +1,1493 @@
+// mksyscall.pl -l32 -openbsd -arm -tags openbsd,arm syscall_bsd.go syscall_openbsd.go syscall_openbsd_arm.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build openbsd,arm
+
+package unix
+
+import (
+	"syscall"
+	"unsafe"
+)
+
+var _ syscall.Errno
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getgroups(ngid int, gid *_Gid_t) (n int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setgroups(ngid int, gid *_Gid_t) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGROUPS, uintptr(ngid), uintptr(unsafe.Pointer(gid)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func wait4(pid int, wstatus *_C_int, options int, rusage *Rusage) (wpid int, err error) {
+	r0, _, e1 := Syscall6(SYS_WAIT4, uintptr(pid), uintptr(unsafe.Pointer(wstatus)), uintptr(options), uintptr(unsafe.Pointer(rusage)), 0, 0)
+	wpid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_ACCEPT, uintptr(s), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_BIND, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
+	_, _, e1 := Syscall(SYS_CONNECT, uintptr(s), uintptr(addr), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socket(domain int, typ int, proto int) (fd int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SOCKET, uintptr(domain), uintptr(typ), uintptr(proto))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
+	_, _, e1 := Syscall6(SYS_GETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func setsockopt(s int, level int, name int, val unsafe.Pointer, vallen uintptr) (err error) {
+	_, _, e1 := Syscall6(SYS_SETSOCKOPT, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(vallen), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getpeername(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETPEERNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getsockname(fd int, rsa *RawSockaddrAny, addrlen *_Socklen) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETSOCKNAME, uintptr(fd), uintptr(unsafe.Pointer(rsa)), uintptr(unsafe.Pointer(addrlen)))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Shutdown(s int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_SHUTDOWN, uintptr(s), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
+	_, _, e1 := RawSyscall6(SYS_SOCKETPAIR, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Socklen) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_RECVFROM, uintptr(fd), uintptr(_p0), uintptr(len(p)), uintptr(flags), uintptr(unsafe.Pointer(from)), uintptr(unsafe.Pointer(fromlen)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS_SENDTO, uintptr(s), uintptr(_p0), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_RECVMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_SENDMSG, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func kevent(kq int, change unsafe.Pointer, nchange int, event unsafe.Pointer, nevent int, timeout *Timespec) (n int, err error) {
+	r0, _, e1 := Syscall6(SYS_KEVENT, uintptr(kq), uintptr(change), uintptr(nchange), uintptr(event), uintptr(nevent), uintptr(unsafe.Pointer(timeout)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func sysctl(mib []_C_int, old *byte, oldlen *uintptr, new *byte, newlen uintptr) (err error) {
+	var _p0 unsafe.Pointer
+	if len(mib) > 0 {
+		_p0 = unsafe.Pointer(&mib[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall6(SYS___SYSCTL, uintptr(_p0), uintptr(len(mib)), uintptr(unsafe.Pointer(old)), uintptr(unsafe.Pointer(oldlen)), uintptr(unsafe.Pointer(new)), uintptr(newlen))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimes(path string, timeval *[2]Timeval) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UTIMES, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func futimes(fd int, timeval *[2]Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_FUTIMES, uintptr(fd), uintptr(unsafe.Pointer(timeval)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func fcntl(fd int, cmd int, arg int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FCNTL, uintptr(fd), uintptr(cmd), uintptr(arg))
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_POLL, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Madvise(b []byte, behav int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MADVISE, uintptr(_p0), uintptr(len(b)), uintptr(behav))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mlockall(flags int) (err error) {
+	_, _, e1 := Syscall(SYS_MLOCKALL, uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mprotect(b []byte, prot int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MPROTECT, uintptr(_p0), uintptr(len(b)), uintptr(prot))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Msync(b []byte, flags int) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MSYNC, uintptr(_p0), uintptr(len(b)), uintptr(flags))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlock(b []byte) (err error) {
+	var _p0 unsafe.Pointer
+	if len(b) > 0 {
+		_p0 = unsafe.Pointer(&b[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	_, _, e1 := Syscall(SYS_MUNLOCK, uintptr(_p0), uintptr(len(b)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Munlockall() (err error) {
+	_, _, e1 := Syscall(SYS_MUNLOCKALL, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func pipe(p *[2]_C_int) (err error) {
+	_, _, e1 := RawSyscall(SYS_PIPE, uintptr(unsafe.Pointer(p)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func getdents(fd int, buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_GETDENTS, uintptr(fd), uintptr(_p0), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getcwd(buf []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(buf) > 0 {
+		_p0 = unsafe.Pointer(&buf[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS___GETCWD, uintptr(_p0), uintptr(len(buf)), 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_IOCTL, uintptr(fd), uintptr(req), uintptr(arg))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Access(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_ACCESS, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Adjtime(delta *Timeval, olddelta *Timeval) (err error) {
+	_, _, e1 := Syscall(SYS_ADJTIME, uintptr(unsafe.Pointer(delta)), uintptr(unsafe.Pointer(olddelta)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chflags(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHFLAGS, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chmod(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHMOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Chroot(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_CHROOT, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Close(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_CLOSE, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup(fd int) (nfd int, err error) {
+	r0, _, e1 := Syscall(SYS_DUP, uintptr(fd), 0, 0)
+	nfd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Dup2(from int, to int) (err error) {
+	_, _, e1 := Syscall(SYS_DUP2, uintptr(from), uintptr(to), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Exit(code int) {
+	Syscall(SYS_EXIT, uintptr(code), 0, 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchdir(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHDIR, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchflags(fd int, flags int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHFLAGS, uintptr(fd), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmod(fd int, mode uint32) (err error) {
+	_, _, e1 := Syscall(SYS_FCHMOD, uintptr(fd), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchmodat(dirfd int, path string, mode uint32, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FCHMODAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fchown(fd int, uid int, gid int) (err error) {
+	_, _, e1 := Syscall(SYS_FCHOWN, uintptr(fd), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := Syscall(SYS_FLOCK, uintptr(fd), uintptr(how), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fpathconf(fd int, name int) (val int, err error) {
+	r0, _, e1 := Syscall(SYS_FPATHCONF, uintptr(fd), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstat(fd int, stat *Stat_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTAT, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_FSTATAT, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fstatfs(fd int, stat *Statfs_t) (err error) {
+	_, _, e1 := Syscall(SYS_FSTATFS, uintptr(fd), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Fsync(fd int) (err error) {
+	_, _, e1 := Syscall(SYS_FSYNC, uintptr(fd), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Ftruncate(fd int, length int64) (err error) {
+	_, _, e1 := Syscall6(SYS_FTRUNCATE, uintptr(fd), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getegid() (egid int) {
+	r0, _, _ := RawSyscall(SYS_GETEGID, 0, 0, 0)
+	egid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Geteuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETEUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getgid() (gid int) {
+	r0, _, _ := RawSyscall(SYS_GETGID, 0, 0, 0)
+	gid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgid(pid int) (pgid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETPGID, uintptr(pid), 0, 0)
+	pgid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpgrp() (pgrp int) {
+	r0, _, _ := RawSyscall(SYS_GETPGRP, 0, 0, 0)
+	pgrp = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpid() (pid int) {
+	r0, _, _ := RawSyscall(SYS_GETPID, 0, 0, 0)
+	pid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getppid() (ppid int) {
+	r0, _, _ := RawSyscall(SYS_GETPPID, 0, 0, 0)
+	ppid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getpriority(which int, who int) (prio int, err error) {
+	r0, _, e1 := Syscall(SYS_GETPRIORITY, uintptr(which), uintptr(who), 0)
+	prio = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrtable() (rtable int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETRTABLE, 0, 0, 0)
+	rtable = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getrusage(who int, rusage *Rusage) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETRUSAGE, uintptr(who), uintptr(unsafe.Pointer(rusage)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getsid(pid int) (sid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_GETSID, uintptr(pid), 0, 0)
+	sid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Gettimeofday(tv *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_GETTIMEOFDAY, uintptr(unsafe.Pointer(tv)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Getuid() (uid int) {
+	r0, _, _ := RawSyscall(SYS_GETUID, 0, 0, 0)
+	uid = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Issetugid() (tainted bool) {
+	r0, _, _ := Syscall(SYS_ISSETUGID, 0, 0, 0)
+	tainted = bool(r0 != 0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kill(pid int, signum syscall.Signal) (err error) {
+	_, _, e1 := Syscall(SYS_KILL, uintptr(pid), uintptr(signum), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Kqueue() (fd int, err error) {
+	r0, _, e1 := Syscall(SYS_KQUEUE, 0, 0, 0)
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lchown(path string, uid int, gid int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LCHOWN, uintptr(unsafe.Pointer(_p0)), uintptr(uid), uintptr(gid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Link(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Listen(s int, backlog int) (err error) {
+	_, _, e1 := Syscall(SYS_LISTEN, uintptr(s), uintptr(backlog), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Lstat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_LSTAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkdir(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKDIR, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mkfifo(path string, mode uint32) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKFIFO, uintptr(unsafe.Pointer(_p0)), uintptr(mode), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Mknod(path string, mode uint32, dev int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_MKNOD, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(dev))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Nanosleep(time *Timespec, leftover *Timespec) (err error) {
+	_, _, e1 := Syscall(SYS_NANOSLEEP, uintptr(unsafe.Pointer(time)), uintptr(unsafe.Pointer(leftover)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Open(path string, mode int, perm uint32) (fd int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_OPEN, uintptr(unsafe.Pointer(_p0)), uintptr(mode), uintptr(perm))
+	fd = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pathconf(path string, name int) (val int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	r0, _, e1 := Syscall(SYS_PATHCONF, uintptr(unsafe.Pointer(_p0)), uintptr(name), 0)
+	val = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pread(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PREAD, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Pwrite(fd int, p []byte, offset int64) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall6(SYS_PWRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)), 0, uintptr(offset), uintptr(offset>>32))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func read(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Readlink(path string, buf []byte) (n int, err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 unsafe.Pointer
+	if len(buf) > 0 {
+		_p1 = unsafe.Pointer(&buf[0])
+	} else {
+		_p1 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_READLINK, uintptr(unsafe.Pointer(_p0)), uintptr(_p1), uintptr(len(buf)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rename(from string, to string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(from)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(to)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RENAME, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Revoke(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_REVOKE, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Rmdir(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_RMDIR, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
+	r0, r1, e1 := Syscall6(SYS_LSEEK, uintptr(fd), 0, uintptr(offset), uintptr(offset>>32), uintptr(whence), 0)
+	newoffset = int64(int64(r1)<<32 | int64(r0))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := Syscall6(SYS_SELECT, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setegid(egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEGID, uintptr(egid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Seteuid(euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETEUID, uintptr(euid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setgid(gid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETGID, uintptr(gid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setlogin(name string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(name)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SETLOGIN, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpgid(pid int, pgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETPGID, uintptr(pid), uintptr(pgid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setpriority(which int, who int, prio int) (err error) {
+	_, _, e1 := Syscall(SYS_SETPRIORITY, uintptr(which), uintptr(who), uintptr(prio))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setregid(rgid int, egid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREGID, uintptr(rgid), uintptr(egid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setreuid(ruid int, euid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETREUID, uintptr(ruid), uintptr(euid), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresgid(rgid int, egid int, sgid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESGID, uintptr(rgid), uintptr(egid), uintptr(sgid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setresuid(ruid int, euid int, suid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRESUID, uintptr(ruid), uintptr(euid), uintptr(suid))
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrlimit(which int, lim *Rlimit) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRLIMIT, uintptr(which), uintptr(unsafe.Pointer(lim)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setrtable(rtable int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETRTABLE, uintptr(rtable), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setsid() (pid int, err error) {
+	r0, _, e1 := RawSyscall(SYS_SETSID, 0, 0, 0)
+	pid = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Settimeofday(tp *Timeval) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETTIMEOFDAY, uintptr(unsafe.Pointer(tp)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Setuid(uid int) (err error) {
+	_, _, e1 := RawSyscall(SYS_SETUID, uintptr(uid), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Stat(path string, stat *Stat_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STAT, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Statfs(path string, stat *Statfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_STATFS, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Symlink(path string, link string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	var _p1 *byte
+	_p1, err = BytePtrFromString(link)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_SYMLINK, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(_p1)), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Sync() (err error) {
+	_, _, e1 := Syscall(SYS_SYNC, 0, 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Truncate(path string, length int64) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_TRUNCATE, uintptr(unsafe.Pointer(_p0)), 0, uintptr(length), uintptr(length>>32), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Umask(newmask int) (oldmask int) {
+	r0, _, _ := Syscall(SYS_UMASK, uintptr(newmask), 0, 0)
+	oldmask = int(r0)
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unlink(path string) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNLINK, uintptr(unsafe.Pointer(_p0)), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func Unmount(path string, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall(SYS_UNMOUNT, uintptr(unsafe.Pointer(_p0)), uintptr(flags), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func write(fd int, p []byte) (n int, err error) {
+	var _p0 unsafe.Pointer
+	if len(p) > 0 {
+		_p0 = unsafe.Pointer(&p[0])
+	} else {
+		_p0 = unsafe.Pointer(&_zero)
+	}
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(_p0), uintptr(len(p)))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func mmap(addr uintptr, length uintptr, prot int, flag int, fd int, pos int64) (ret uintptr, err error) {
+	r0, _, e1 := Syscall9(SYS_MMAP, uintptr(addr), uintptr(length), uintptr(prot), uintptr(flag), uintptr(fd), 0, uintptr(pos), uintptr(pos>>32), 0)
+	ret = uintptr(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func munmap(addr uintptr, length uintptr) (err error) {
+	_, _, e1 := Syscall(SYS_MUNMAP, uintptr(addr), uintptr(length), 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func readlen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_READ, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func writelen(fd int, buf *byte, nbuf int) (n int, err error) {
+	r0, _, e1 := Syscall(SYS_WRITE, uintptr(fd), uintptr(unsafe.Pointer(buf)), uintptr(nbuf))
+	n = int(r0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
+
+// THIS FILE IS GENERATED BY THE COMMAND AT THE TOP; DO NOT EDIT
+
+func utimensat(dirfd int, path string, times *[2]Timespec, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := Syscall6(SYS_UTIMENSAT, uintptr(dirfd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(times)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = errnoErr(e1)
+	}
+	return
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
index bdf140b180..397896300d 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsyscall_solaris_amd64.go
@@ -1,5 +1,5 @@
 // mksyscall_solaris.pl -tags solaris,amd64 syscall_solaris.go syscall_solaris_amd64.go
-// MACHINE GENERATED BY THE COMMAND ABOVE; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build solaris,amd64
 
@@ -22,10 +22,14 @@ import (
 //go:cgo_import_dynamic libc_fcntl fcntl "libc.so"
 //go:cgo_import_dynamic libc_futimesat futimesat "libc.so"
 //go:cgo_import_dynamic libc_accept accept "libsocket.so"
-//go:cgo_import_dynamic libc_recvmsg recvmsg "libsocket.so"
-//go:cgo_import_dynamic libc_sendmsg sendmsg "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_recvmsg __xnet_recvmsg "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_sendmsg __xnet_sendmsg "libsocket.so"
 //go:cgo_import_dynamic libc_acct acct "libc.so"
+//go:cgo_import_dynamic libc___makedev __makedev "libc.so"
+//go:cgo_import_dynamic libc___major __major "libc.so"
+//go:cgo_import_dynamic libc___minor __minor "libc.so"
 //go:cgo_import_dynamic libc_ioctl ioctl "libc.so"
+//go:cgo_import_dynamic libc_poll poll "libc.so"
 //go:cgo_import_dynamic libc_access access "libc.so"
 //go:cgo_import_dynamic libc_adjtime adjtime "libc.so"
 //go:cgo_import_dynamic libc_chdir chdir "libc.so"
@@ -43,8 +47,11 @@ import (
 //go:cgo_import_dynamic libc_fchown fchown "libc.so"
 //go:cgo_import_dynamic libc_fchownat fchownat "libc.so"
 //go:cgo_import_dynamic libc_fdatasync fdatasync "libc.so"
+//go:cgo_import_dynamic libc_flock flock "libc.so"
 //go:cgo_import_dynamic libc_fpathconf fpathconf "libc.so"
 //go:cgo_import_dynamic libc_fstat fstat "libc.so"
+//go:cgo_import_dynamic libc_fstatat fstatat "libc.so"
+//go:cgo_import_dynamic libc_fstatvfs fstatvfs "libc.so"
 //go:cgo_import_dynamic libc_getdents getdents "libc.so"
 //go:cgo_import_dynamic libc_getgid getgid "libc.so"
 //go:cgo_import_dynamic libc_getpid getpid "libc.so"
@@ -61,7 +68,7 @@ import (
 //go:cgo_import_dynamic libc_kill kill "libc.so"
 //go:cgo_import_dynamic libc_lchown lchown "libc.so"
 //go:cgo_import_dynamic libc_link link "libc.so"
-//go:cgo_import_dynamic libc_listen listen "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_llisten __xnet_llisten "libsocket.so"
 //go:cgo_import_dynamic libc_lstat lstat "libc.so"
 //go:cgo_import_dynamic libc_madvise madvise "libc.so"
 //go:cgo_import_dynamic libc_mkdir mkdir "libc.so"
@@ -73,6 +80,7 @@ import (
 //go:cgo_import_dynamic libc_mlock mlock "libc.so"
 //go:cgo_import_dynamic libc_mlockall mlockall "libc.so"
 //go:cgo_import_dynamic libc_mprotect mprotect "libc.so"
+//go:cgo_import_dynamic libc_msync msync "libc.so"
 //go:cgo_import_dynamic libc_munlock munlock "libc.so"
 //go:cgo_import_dynamic libc_munlockall munlockall "libc.so"
 //go:cgo_import_dynamic libc_nanosleep nanosleep "libc.so"
@@ -88,6 +96,7 @@ import (
 //go:cgo_import_dynamic libc_renameat renameat "libc.so"
 //go:cgo_import_dynamic libc_rmdir rmdir "libc.so"
 //go:cgo_import_dynamic libc_lseek lseek "libc.so"
+//go:cgo_import_dynamic libc_select select "libc.so"
 //go:cgo_import_dynamic libc_setegid setegid "libc.so"
 //go:cgo_import_dynamic libc_seteuid seteuid "libc.so"
 //go:cgo_import_dynamic libc_setgid setgid "libc.so"
@@ -101,6 +110,7 @@ import (
 //go:cgo_import_dynamic libc_setuid setuid "libc.so"
 //go:cgo_import_dynamic libc_shutdown shutdown "libsocket.so"
 //go:cgo_import_dynamic libc_stat stat "libc.so"
+//go:cgo_import_dynamic libc_statvfs statvfs "libc.so"
 //go:cgo_import_dynamic libc_symlink symlink "libc.so"
 //go:cgo_import_dynamic libc_sync sync "libc.so"
 //go:cgo_import_dynamic libc_times times "libc.so"
@@ -114,19 +124,19 @@ import (
 //go:cgo_import_dynamic libc_unlinkat unlinkat "libc.so"
 //go:cgo_import_dynamic libc_ustat ustat "libc.so"
 //go:cgo_import_dynamic libc_utime utime "libc.so"
-//go:cgo_import_dynamic libc_bind bind "libsocket.so"
-//go:cgo_import_dynamic libc_connect connect "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_bind __xnet_bind "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_connect __xnet_connect "libsocket.so"
 //go:cgo_import_dynamic libc_mmap mmap "libc.so"
 //go:cgo_import_dynamic libc_munmap munmap "libc.so"
-//go:cgo_import_dynamic libc_sendto sendto "libsocket.so"
-//go:cgo_import_dynamic libc_socket socket "libsocket.so"
-//go:cgo_import_dynamic libc_socketpair socketpair "libsocket.so"
+//go:cgo_import_dynamic libc_sendfile sendfile "libsendfile.so"
+//go:cgo_import_dynamic libc___xnet_sendto __xnet_sendto "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_socket __xnet_socket "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_socketpair __xnet_socketpair "libsocket.so"
 //go:cgo_import_dynamic libc_write write "libc.so"
-//go:cgo_import_dynamic libc_getsockopt getsockopt "libsocket.so"
+//go:cgo_import_dynamic libc___xnet_getsockopt __xnet_getsockopt "libsocket.so"
 //go:cgo_import_dynamic libc_getpeername getpeername "libsocket.so"
 //go:cgo_import_dynamic libc_setsockopt setsockopt "libsocket.so"
 //go:cgo_import_dynamic libc_recvfrom recvfrom "libsocket.so"
-//go:cgo_import_dynamic libc_sysconf sysconf "libc.so"
 
 //go:linkname procpipe libc_pipe
 //go:linkname procgetsockname libc_getsockname
@@ -140,10 +150,14 @@ import (
 //go:linkname procfcntl libc_fcntl
 //go:linkname procfutimesat libc_futimesat
 //go:linkname procaccept libc_accept
-//go:linkname procrecvmsg libc_recvmsg
-//go:linkname procsendmsg libc_sendmsg
+//go:linkname proc__xnet_recvmsg libc___xnet_recvmsg
+//go:linkname proc__xnet_sendmsg libc___xnet_sendmsg
 //go:linkname procacct libc_acct
+//go:linkname proc__makedev libc___makedev
+//go:linkname proc__major libc___major
+//go:linkname proc__minor libc___minor
 //go:linkname procioctl libc_ioctl
+//go:linkname procpoll libc_poll
 //go:linkname procAccess libc_access
 //go:linkname procAdjtime libc_adjtime
 //go:linkname procChdir libc_chdir
@@ -161,8 +175,11 @@ import (
 //go:linkname procFchown libc_fchown
 //go:linkname procFchownat libc_fchownat
 //go:linkname procFdatasync libc_fdatasync
+//go:linkname procFlock libc_flock
 //go:linkname procFpathconf libc_fpathconf
 //go:linkname procFstat libc_fstat
+//go:linkname procFstatat libc_fstatat
+//go:linkname procFstatvfs libc_fstatvfs
 //go:linkname procGetdents libc_getdents
 //go:linkname procGetgid libc_getgid
 //go:linkname procGetpid libc_getpid
@@ -179,7 +196,7 @@ import (
 //go:linkname procKill libc_kill
 //go:linkname procLchown libc_lchown
 //go:linkname procLink libc_link
-//go:linkname proclisten libc_listen
+//go:linkname proc__xnet_llisten libc___xnet_llisten
 //go:linkname procLstat libc_lstat
 //go:linkname procMadvise libc_madvise
 //go:linkname procMkdir libc_mkdir
@@ -191,6 +208,7 @@ import (
 //go:linkname procMlock libc_mlock
 //go:linkname procMlockall libc_mlockall
 //go:linkname procMprotect libc_mprotect
+//go:linkname procMsync libc_msync
 //go:linkname procMunlock libc_munlock
 //go:linkname procMunlockall libc_munlockall
 //go:linkname procNanosleep libc_nanosleep
@@ -206,6 +224,7 @@ import (
 //go:linkname procRenameat libc_renameat
 //go:linkname procRmdir libc_rmdir
 //go:linkname proclseek libc_lseek
+//go:linkname procSelect libc_select
 //go:linkname procSetegid libc_setegid
 //go:linkname procSeteuid libc_seteuid
 //go:linkname procSetgid libc_setgid
@@ -219,6 +238,7 @@ import (
 //go:linkname procSetuid libc_setuid
 //go:linkname procshutdown libc_shutdown
 //go:linkname procStat libc_stat
+//go:linkname procStatvfs libc_statvfs
 //go:linkname procSymlink libc_symlink
 //go:linkname procSync libc_sync
 //go:linkname procTimes libc_times
@@ -232,19 +252,19 @@ import (
 //go:linkname procUnlinkat libc_unlinkat
 //go:linkname procUstat libc_ustat
 //go:linkname procUtime libc_utime
-//go:linkname procbind libc_bind
-//go:linkname procconnect libc_connect
+//go:linkname proc__xnet_bind libc___xnet_bind
+//go:linkname proc__xnet_connect libc___xnet_connect
 //go:linkname procmmap libc_mmap
 //go:linkname procmunmap libc_munmap
-//go:linkname procsendto libc_sendto
-//go:linkname procsocket libc_socket
-//go:linkname procsocketpair libc_socketpair
+//go:linkname procsendfile libc_sendfile
+//go:linkname proc__xnet_sendto libc___xnet_sendto
+//go:linkname proc__xnet_socket libc___xnet_socket
+//go:linkname proc__xnet_socketpair libc___xnet_socketpair
 //go:linkname procwrite libc_write
-//go:linkname procgetsockopt libc_getsockopt
+//go:linkname proc__xnet_getsockopt libc___xnet_getsockopt
 //go:linkname procgetpeername libc_getpeername
 //go:linkname procsetsockopt libc_setsockopt
 //go:linkname procrecvfrom libc_recvfrom
-//go:linkname procsysconf libc_sysconf
 
 var (
 	procpipe,
@@ -259,10 +279,14 @@ var (
 	procfcntl,
 	procfutimesat,
 	procaccept,
-	procrecvmsg,
-	procsendmsg,
+	proc__xnet_recvmsg,
+	proc__xnet_sendmsg,
 	procacct,
+	proc__makedev,
+	proc__major,
+	proc__minor,
 	procioctl,
+	procpoll,
 	procAccess,
 	procAdjtime,
 	procChdir,
@@ -280,8 +304,11 @@ var (
 	procFchown,
 	procFchownat,
 	procFdatasync,
+	procFlock,
 	procFpathconf,
 	procFstat,
+	procFstatat,
+	procFstatvfs,
 	procGetdents,
 	procGetgid,
 	procGetpid,
@@ -298,7 +325,7 @@ var (
 	procKill,
 	procLchown,
 	procLink,
-	proclisten,
+	proc__xnet_llisten,
 	procLstat,
 	procMadvise,
 	procMkdir,
@@ -310,6 +337,7 @@ var (
 	procMlock,
 	procMlockall,
 	procMprotect,
+	procMsync,
 	procMunlock,
 	procMunlockall,
 	procNanosleep,
@@ -325,6 +353,7 @@ var (
 	procRenameat,
 	procRmdir,
 	proclseek,
+	procSelect,
 	procSetegid,
 	procSeteuid,
 	procSetgid,
@@ -338,6 +367,7 @@ var (
 	procSetuid,
 	procshutdown,
 	procStat,
+	procStatvfs,
 	procSymlink,
 	procSync,
 	procTimes,
@@ -351,19 +381,19 @@ var (
 	procUnlinkat,
 	procUstat,
 	procUtime,
-	procbind,
-	procconnect,
+	proc__xnet_bind,
+	proc__xnet_connect,
 	procmmap,
 	procmunmap,
-	procsendto,
-	procsocket,
-	procsocketpair,
+	procsendfile,
+	proc__xnet_sendto,
+	proc__xnet_socket,
+	proc__xnet_socketpair,
 	procwrite,
-	procgetsockopt,
+	proc__xnet_getsockopt,
 	procgetpeername,
 	procsetsockopt,
-	procrecvfrom,
-	procsysconf syscallFunc
+	procrecvfrom syscallFunc
 )
 
 func pipe(p *[2]_C_int) (n int, err error) {
@@ -488,7 +518,7 @@ func accept(s int, rsa *RawSockaddrAny, addrlen *_Socklen) (fd int, err error) {
 }
 
 func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procrecvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_recvmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -497,7 +527,7 @@ func recvmsg(s int, msg *Msghdr, flags int) (n int, err error) {
 }
 
 func sendmsg(s int, msg *Msghdr, flags int) (n int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendmsg)), 3, uintptr(s), uintptr(unsafe.Pointer(msg)), uintptr(flags), 0, 0, 0)
 	n = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -513,7 +543,25 @@ func acct(path *byte) (err error) {
 	return
 }
 
-func ioctl(fd int, req int, arg uintptr) (err error) {
+func __makedev(version int, major uint, minor uint) (val uint64) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__makedev)), 3, uintptr(version), uintptr(major), uintptr(minor), 0, 0, 0)
+	val = uint64(r0)
+	return
+}
+
+func __major(version int, dev uint64) (val uint) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__major)), 2, uintptr(version), uintptr(dev), 0, 0, 0, 0)
+	val = uint(r0)
+	return
+}
+
+func __minor(version int, dev uint64) (val uint) {
+	r0, _, _ := sysvicall6(uintptr(unsafe.Pointer(&proc__minor)), 2, uintptr(version), uintptr(dev), 0, 0, 0, 0)
+	val = uint(r0)
+	return
+}
+
+func ioctl(fd int, req uint, arg uintptr) (err error) {
 	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procioctl)), 3, uintptr(fd), uintptr(req), uintptr(arg), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
@@ -521,6 +569,15 @@ func ioctl(fd int, req int, arg uintptr) (err error) {
 	return
 }
 
+func poll(fds *PollFd, nfds int, timeout int) (n int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procpoll)), 3, uintptr(unsafe.Pointer(fds)), uintptr(nfds), uintptr(timeout), 0, 0, 0)
+	n = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Access(path string, mode uint32) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -696,6 +753,14 @@ func Fdatasync(fd int) (err error) {
 	return
 }
 
+func Flock(fd int, how int) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFlock)), 2, uintptr(fd), uintptr(how), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Fpathconf(fd int, name int) (val int, err error) {
 	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFpathconf)), 2, uintptr(fd), uintptr(name), 0, 0, 0, 0)
 	val = int(r0)
@@ -713,6 +778,27 @@ func Fstat(fd int, stat *Stat_t) (err error) {
 	return
 }
 
+func Fstatat(fd int, path string, stat *Stat_t, flags int) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatat)), 4, uintptr(fd), uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(stat)), uintptr(flags), 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
+func Fstatvfs(fd int, vfsstat *Statvfs_t) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procFstatvfs)), 2, uintptr(fd), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Getdents(fd int, buf []byte, basep *uintptr) (n int, err error) {
 	var _p0 *byte
 	if len(buf) > 0 {
@@ -853,7 +939,7 @@ func Link(path string, link string) (err error) {
 }
 
 func Listen(s int, backlog int) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proclisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_llisten)), 2, uintptr(s), uintptr(backlog), 0, 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -995,6 +1081,18 @@ func Mprotect(b []byte, prot int) (err error) {
 	return
 }
 
+func Msync(b []byte, flags int) (err error) {
+	var _p0 *byte
+	if len(b) > 0 {
+		_p0 = &b[0]
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procMsync)), 3, uintptr(unsafe.Pointer(_p0)), uintptr(len(b)), uintptr(flags), 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Munlock(b []byte) (err error) {
 	var _p0 *byte
 	if len(b) > 0 {
@@ -1188,6 +1286,14 @@ func Seek(fd int, offset int64, whence int) (newoffset int64, err error) {
 	return
 }
 
+func Select(n int, r *FdSet, w *FdSet, e *FdSet, timeout *Timeval) (err error) {
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procSelect)), 5, uintptr(n), uintptr(unsafe.Pointer(r)), uintptr(unsafe.Pointer(w)), uintptr(unsafe.Pointer(e)), uintptr(unsafe.Pointer(timeout)), 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Setegid(egid int) (err error) {
 	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procSetegid)), 1, uintptr(egid), 0, 0, 0, 0, 0)
 	if e1 != 0 {
@@ -1302,6 +1408,19 @@ func Stat(path string, stat *Stat_t) (err error) {
 	return
 }
 
+func Statvfs(path string, vfsstat *Statvfs_t) (err error) {
+	var _p0 *byte
+	_p0, err = BytePtrFromString(path)
+	if err != nil {
+		return
+	}
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procStatvfs)), 2, uintptr(unsafe.Pointer(_p0)), uintptr(unsafe.Pointer(vfsstat)), 0, 0, 0, 0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func Symlink(path string, link string) (err error) {
 	var _p0 *byte
 	_p0, err = BytePtrFromString(path)
@@ -1441,7 +1560,7 @@ func Utime(path string, buf *Utimbuf) (err error) {
 }
 
 func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procbind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_bind)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -1449,7 +1568,7 @@ func bind(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
 }
 
 func connect(s int, addr unsafe.Pointer, addrlen _Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procconnect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_connect)), 3, uintptr(s), uintptr(addr), uintptr(addrlen), 0, 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -1473,12 +1592,21 @@ func munmap(addr uintptr, length uintptr) (err error) {
 	return
 }
 
+func sendfile(outfd int, infd int, offset *int64, count int) (written int, err error) {
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendfile)), 4, uintptr(outfd), uintptr(infd), uintptr(unsafe.Pointer(offset)), uintptr(count), 0, 0)
+	written = int(r0)
+	if e1 != 0 {
+		err = e1
+	}
+	return
+}
+
 func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (err error) {
 	var _p0 *byte
 	if len(buf) > 0 {
 		_p0 = &buf[0]
 	}
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_sendto)), 6, uintptr(s), uintptr(unsafe.Pointer(_p0)), uintptr(len(buf)), uintptr(flags), uintptr(to), uintptr(addrlen))
 	if e1 != 0 {
 		err = e1
 	}
@@ -1486,7 +1614,7 @@ func sendto(s int, buf []byte, flags int, to unsafe.Pointer, addrlen _Socklen) (
 }
 
 func socket(domain int, typ int, proto int) (fd int, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsocket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
+	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socket)), 3, uintptr(domain), uintptr(typ), uintptr(proto), 0, 0, 0)
 	fd = int(r0)
 	if e1 != 0 {
 		err = e1
@@ -1495,7 +1623,7 @@ func socket(domain int, typ int, proto int) (fd int, err error) {
 }
 
 func socketpair(domain int, typ int, proto int, fd *[2]int32) (err error) {
-	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&procsocketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
+	_, _, e1 := rawSysvicall6(uintptr(unsafe.Pointer(&proc__xnet_socketpair)), 4, uintptr(domain), uintptr(typ), uintptr(proto), uintptr(unsafe.Pointer(fd)), 0, 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -1516,7 +1644,7 @@ func write(fd int, p []byte) (n int, err error) {
 }
 
 func getsockopt(s int, level int, name int, val unsafe.Pointer, vallen *_Socklen) (err error) {
-	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procgetsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
+	_, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&proc__xnet_getsockopt)), 5, uintptr(s), uintptr(level), uintptr(name), uintptr(val), uintptr(unsafe.Pointer(vallen)), 0)
 	if e1 != 0 {
 		err = e1
 	}
@@ -1551,12 +1679,3 @@ func recvfrom(fd int, p []byte, flags int, from *RawSockaddrAny, fromlen *_Sockl
 	}
 	return
 }
-
-func sysconf(name int) (n int64, err error) {
-	r0, _, e1 := sysvicall6(uintptr(unsafe.Pointer(&procsysconf)), 1, uintptr(name), 0, 0, 0, 0, 0)
-	n = int64(r0)
-	if e1 != 0 {
-		err = e1
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go b/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
similarity index 100%
rename from installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd.go
rename to installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_386.go
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
new file mode 100644
index 0000000000..83bb935b91
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_amd64.go
@@ -0,0 +1,270 @@
+// mksysctl_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.arandom", []_C_int{1, 37}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.vnode", []_C_int{1, 13}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+	{"vm.anonmin", []_C_int{2, 7}},
+	{"vm.loadavg", []_C_int{2, 2}},
+	{"vm.maxslp", []_C_int{2, 10}},
+	{"vm.nkmempages", []_C_int{2, 6}},
+	{"vm.psstrings", []_C_int{2, 3}},
+	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
+	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
+	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
+	{"vm.uspace", []_C_int{2, 11}},
+	{"vm.uvmexp", []_C_int{2, 4}},
+	{"vm.vmmeter", []_C_int{2, 1}},
+	{"vm.vnodemin", []_C_int{2, 9}},
+	{"vm.vtextmin", []_C_int{2, 8}},
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
new file mode 100644
index 0000000000..83bb935b91
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zsysctl_openbsd_arm.go
@@ -0,0 +1,270 @@
+// mksysctl_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+package unix
+
+type mibentry struct {
+	ctlname string
+	ctloid  []_C_int
+}
+
+var sysctlMib = []mibentry{
+	{"ddb.console", []_C_int{9, 6}},
+	{"ddb.log", []_C_int{9, 7}},
+	{"ddb.max_line", []_C_int{9, 3}},
+	{"ddb.max_width", []_C_int{9, 2}},
+	{"ddb.panic", []_C_int{9, 5}},
+	{"ddb.radix", []_C_int{9, 1}},
+	{"ddb.tab_stop_width", []_C_int{9, 4}},
+	{"ddb.trigger", []_C_int{9, 8}},
+	{"fs.posix.setuid", []_C_int{3, 1, 1}},
+	{"hw.allowpowerdown", []_C_int{6, 22}},
+	{"hw.byteorder", []_C_int{6, 4}},
+	{"hw.cpuspeed", []_C_int{6, 12}},
+	{"hw.diskcount", []_C_int{6, 10}},
+	{"hw.disknames", []_C_int{6, 8}},
+	{"hw.diskstats", []_C_int{6, 9}},
+	{"hw.machine", []_C_int{6, 1}},
+	{"hw.model", []_C_int{6, 2}},
+	{"hw.ncpu", []_C_int{6, 3}},
+	{"hw.ncpufound", []_C_int{6, 21}},
+	{"hw.pagesize", []_C_int{6, 7}},
+	{"hw.physmem", []_C_int{6, 19}},
+	{"hw.product", []_C_int{6, 15}},
+	{"hw.serialno", []_C_int{6, 17}},
+	{"hw.setperf", []_C_int{6, 13}},
+	{"hw.usermem", []_C_int{6, 20}},
+	{"hw.uuid", []_C_int{6, 18}},
+	{"hw.vendor", []_C_int{6, 14}},
+	{"hw.version", []_C_int{6, 16}},
+	{"kern.arandom", []_C_int{1, 37}},
+	{"kern.argmax", []_C_int{1, 8}},
+	{"kern.boottime", []_C_int{1, 21}},
+	{"kern.bufcachepercent", []_C_int{1, 72}},
+	{"kern.ccpu", []_C_int{1, 45}},
+	{"kern.clockrate", []_C_int{1, 12}},
+	{"kern.consdev", []_C_int{1, 75}},
+	{"kern.cp_time", []_C_int{1, 40}},
+	{"kern.cp_time2", []_C_int{1, 71}},
+	{"kern.cryptodevallowsoft", []_C_int{1, 53}},
+	{"kern.domainname", []_C_int{1, 22}},
+	{"kern.file", []_C_int{1, 73}},
+	{"kern.forkstat", []_C_int{1, 42}},
+	{"kern.fscale", []_C_int{1, 46}},
+	{"kern.fsync", []_C_int{1, 33}},
+	{"kern.hostid", []_C_int{1, 11}},
+	{"kern.hostname", []_C_int{1, 10}},
+	{"kern.intrcnt.nintrcnt", []_C_int{1, 63, 1}},
+	{"kern.job_control", []_C_int{1, 19}},
+	{"kern.malloc.buckets", []_C_int{1, 39, 1}},
+	{"kern.malloc.kmemnames", []_C_int{1, 39, 3}},
+	{"kern.maxclusters", []_C_int{1, 67}},
+	{"kern.maxfiles", []_C_int{1, 7}},
+	{"kern.maxlocksperuid", []_C_int{1, 70}},
+	{"kern.maxpartitions", []_C_int{1, 23}},
+	{"kern.maxproc", []_C_int{1, 6}},
+	{"kern.maxthread", []_C_int{1, 25}},
+	{"kern.maxvnodes", []_C_int{1, 5}},
+	{"kern.mbstat", []_C_int{1, 59}},
+	{"kern.msgbuf", []_C_int{1, 48}},
+	{"kern.msgbufsize", []_C_int{1, 38}},
+	{"kern.nchstats", []_C_int{1, 41}},
+	{"kern.netlivelocks", []_C_int{1, 76}},
+	{"kern.nfiles", []_C_int{1, 56}},
+	{"kern.ngroups", []_C_int{1, 18}},
+	{"kern.nosuidcoredump", []_C_int{1, 32}},
+	{"kern.nprocs", []_C_int{1, 47}},
+	{"kern.nselcoll", []_C_int{1, 43}},
+	{"kern.nthreads", []_C_int{1, 26}},
+	{"kern.numvnodes", []_C_int{1, 58}},
+	{"kern.osrelease", []_C_int{1, 2}},
+	{"kern.osrevision", []_C_int{1, 3}},
+	{"kern.ostype", []_C_int{1, 1}},
+	{"kern.osversion", []_C_int{1, 27}},
+	{"kern.pool_debug", []_C_int{1, 77}},
+	{"kern.posix1version", []_C_int{1, 17}},
+	{"kern.proc", []_C_int{1, 66}},
+	{"kern.random", []_C_int{1, 31}},
+	{"kern.rawpartition", []_C_int{1, 24}},
+	{"kern.saved_ids", []_C_int{1, 20}},
+	{"kern.securelevel", []_C_int{1, 9}},
+	{"kern.seminfo", []_C_int{1, 61}},
+	{"kern.shminfo", []_C_int{1, 62}},
+	{"kern.somaxconn", []_C_int{1, 28}},
+	{"kern.sominconn", []_C_int{1, 29}},
+	{"kern.splassert", []_C_int{1, 54}},
+	{"kern.stackgap_random", []_C_int{1, 50}},
+	{"kern.sysvipc_info", []_C_int{1, 51}},
+	{"kern.sysvmsg", []_C_int{1, 34}},
+	{"kern.sysvsem", []_C_int{1, 35}},
+	{"kern.sysvshm", []_C_int{1, 36}},
+	{"kern.timecounter.choice", []_C_int{1, 69, 4}},
+	{"kern.timecounter.hardware", []_C_int{1, 69, 3}},
+	{"kern.timecounter.tick", []_C_int{1, 69, 1}},
+	{"kern.timecounter.timestepwarnings", []_C_int{1, 69, 2}},
+	{"kern.tty.maxptys", []_C_int{1, 44, 6}},
+	{"kern.tty.nptys", []_C_int{1, 44, 7}},
+	{"kern.tty.tk_cancc", []_C_int{1, 44, 4}},
+	{"kern.tty.tk_nin", []_C_int{1, 44, 1}},
+	{"kern.tty.tk_nout", []_C_int{1, 44, 2}},
+	{"kern.tty.tk_rawcc", []_C_int{1, 44, 3}},
+	{"kern.tty.ttyinfo", []_C_int{1, 44, 5}},
+	{"kern.ttycount", []_C_int{1, 57}},
+	{"kern.userasymcrypto", []_C_int{1, 60}},
+	{"kern.usercrypto", []_C_int{1, 52}},
+	{"kern.usermount", []_C_int{1, 30}},
+	{"kern.version", []_C_int{1, 4}},
+	{"kern.vnode", []_C_int{1, 13}},
+	{"kern.watchdog.auto", []_C_int{1, 64, 2}},
+	{"kern.watchdog.period", []_C_int{1, 64, 1}},
+	{"net.bpf.bufsize", []_C_int{4, 31, 1}},
+	{"net.bpf.maxbufsize", []_C_int{4, 31, 2}},
+	{"net.inet.ah.enable", []_C_int{4, 2, 51, 1}},
+	{"net.inet.ah.stats", []_C_int{4, 2, 51, 2}},
+	{"net.inet.carp.allow", []_C_int{4, 2, 112, 1}},
+	{"net.inet.carp.log", []_C_int{4, 2, 112, 3}},
+	{"net.inet.carp.preempt", []_C_int{4, 2, 112, 2}},
+	{"net.inet.carp.stats", []_C_int{4, 2, 112, 4}},
+	{"net.inet.divert.recvspace", []_C_int{4, 2, 258, 1}},
+	{"net.inet.divert.sendspace", []_C_int{4, 2, 258, 2}},
+	{"net.inet.divert.stats", []_C_int{4, 2, 258, 3}},
+	{"net.inet.esp.enable", []_C_int{4, 2, 50, 1}},
+	{"net.inet.esp.stats", []_C_int{4, 2, 50, 4}},
+	{"net.inet.esp.udpencap", []_C_int{4, 2, 50, 2}},
+	{"net.inet.esp.udpencap_port", []_C_int{4, 2, 50, 3}},
+	{"net.inet.etherip.allow", []_C_int{4, 2, 97, 1}},
+	{"net.inet.etherip.stats", []_C_int{4, 2, 97, 2}},
+	{"net.inet.gre.allow", []_C_int{4, 2, 47, 1}},
+	{"net.inet.gre.wccp", []_C_int{4, 2, 47, 2}},
+	{"net.inet.icmp.bmcastecho", []_C_int{4, 2, 1, 2}},
+	{"net.inet.icmp.errppslimit", []_C_int{4, 2, 1, 3}},
+	{"net.inet.icmp.maskrepl", []_C_int{4, 2, 1, 1}},
+	{"net.inet.icmp.rediraccept", []_C_int{4, 2, 1, 4}},
+	{"net.inet.icmp.redirtimeout", []_C_int{4, 2, 1, 5}},
+	{"net.inet.icmp.stats", []_C_int{4, 2, 1, 7}},
+	{"net.inet.icmp.tstamprepl", []_C_int{4, 2, 1, 6}},
+	{"net.inet.igmp.stats", []_C_int{4, 2, 2, 1}},
+	{"net.inet.ip.arpqueued", []_C_int{4, 2, 0, 36}},
+	{"net.inet.ip.encdebug", []_C_int{4, 2, 0, 12}},
+	{"net.inet.ip.forwarding", []_C_int{4, 2, 0, 1}},
+	{"net.inet.ip.ifq.congestion", []_C_int{4, 2, 0, 30, 4}},
+	{"net.inet.ip.ifq.drops", []_C_int{4, 2, 0, 30, 3}},
+	{"net.inet.ip.ifq.len", []_C_int{4, 2, 0, 30, 1}},
+	{"net.inet.ip.ifq.maxlen", []_C_int{4, 2, 0, 30, 2}},
+	{"net.inet.ip.maxqueue", []_C_int{4, 2, 0, 11}},
+	{"net.inet.ip.mforwarding", []_C_int{4, 2, 0, 31}},
+	{"net.inet.ip.mrtproto", []_C_int{4, 2, 0, 34}},
+	{"net.inet.ip.mrtstats", []_C_int{4, 2, 0, 35}},
+	{"net.inet.ip.mtu", []_C_int{4, 2, 0, 4}},
+	{"net.inet.ip.mtudisc", []_C_int{4, 2, 0, 27}},
+	{"net.inet.ip.mtudisctimeout", []_C_int{4, 2, 0, 28}},
+	{"net.inet.ip.multipath", []_C_int{4, 2, 0, 32}},
+	{"net.inet.ip.portfirst", []_C_int{4, 2, 0, 7}},
+	{"net.inet.ip.porthifirst", []_C_int{4, 2, 0, 9}},
+	{"net.inet.ip.porthilast", []_C_int{4, 2, 0, 10}},
+	{"net.inet.ip.portlast", []_C_int{4, 2, 0, 8}},
+	{"net.inet.ip.redirect", []_C_int{4, 2, 0, 2}},
+	{"net.inet.ip.sourceroute", []_C_int{4, 2, 0, 5}},
+	{"net.inet.ip.stats", []_C_int{4, 2, 0, 33}},
+	{"net.inet.ip.ttl", []_C_int{4, 2, 0, 3}},
+	{"net.inet.ipcomp.enable", []_C_int{4, 2, 108, 1}},
+	{"net.inet.ipcomp.stats", []_C_int{4, 2, 108, 2}},
+	{"net.inet.ipip.allow", []_C_int{4, 2, 4, 1}},
+	{"net.inet.ipip.stats", []_C_int{4, 2, 4, 2}},
+	{"net.inet.mobileip.allow", []_C_int{4, 2, 55, 1}},
+	{"net.inet.pfsync.stats", []_C_int{4, 2, 240, 1}},
+	{"net.inet.pim.stats", []_C_int{4, 2, 103, 1}},
+	{"net.inet.tcp.ackonpush", []_C_int{4, 2, 6, 13}},
+	{"net.inet.tcp.always_keepalive", []_C_int{4, 2, 6, 22}},
+	{"net.inet.tcp.baddynamic", []_C_int{4, 2, 6, 6}},
+	{"net.inet.tcp.drop", []_C_int{4, 2, 6, 19}},
+	{"net.inet.tcp.ecn", []_C_int{4, 2, 6, 14}},
+	{"net.inet.tcp.ident", []_C_int{4, 2, 6, 9}},
+	{"net.inet.tcp.keepidle", []_C_int{4, 2, 6, 3}},
+	{"net.inet.tcp.keepinittime", []_C_int{4, 2, 6, 2}},
+	{"net.inet.tcp.keepintvl", []_C_int{4, 2, 6, 4}},
+	{"net.inet.tcp.mssdflt", []_C_int{4, 2, 6, 11}},
+	{"net.inet.tcp.reasslimit", []_C_int{4, 2, 6, 18}},
+	{"net.inet.tcp.rfc1323", []_C_int{4, 2, 6, 1}},
+	{"net.inet.tcp.rfc3390", []_C_int{4, 2, 6, 17}},
+	{"net.inet.tcp.rstppslimit", []_C_int{4, 2, 6, 12}},
+	{"net.inet.tcp.sack", []_C_int{4, 2, 6, 10}},
+	{"net.inet.tcp.sackholelimit", []_C_int{4, 2, 6, 20}},
+	{"net.inet.tcp.slowhz", []_C_int{4, 2, 6, 5}},
+	{"net.inet.tcp.stats", []_C_int{4, 2, 6, 21}},
+	{"net.inet.tcp.synbucketlimit", []_C_int{4, 2, 6, 16}},
+	{"net.inet.tcp.syncachelimit", []_C_int{4, 2, 6, 15}},
+	{"net.inet.udp.baddynamic", []_C_int{4, 2, 17, 2}},
+	{"net.inet.udp.checksum", []_C_int{4, 2, 17, 1}},
+	{"net.inet.udp.recvspace", []_C_int{4, 2, 17, 3}},
+	{"net.inet.udp.sendspace", []_C_int{4, 2, 17, 4}},
+	{"net.inet.udp.stats", []_C_int{4, 2, 17, 5}},
+	{"net.inet6.divert.recvspace", []_C_int{4, 24, 86, 1}},
+	{"net.inet6.divert.sendspace", []_C_int{4, 24, 86, 2}},
+	{"net.inet6.divert.stats", []_C_int{4, 24, 86, 3}},
+	{"net.inet6.icmp6.errppslimit", []_C_int{4, 24, 30, 14}},
+	{"net.inet6.icmp6.mtudisc_hiwat", []_C_int{4, 24, 30, 16}},
+	{"net.inet6.icmp6.mtudisc_lowat", []_C_int{4, 24, 30, 17}},
+	{"net.inet6.icmp6.nd6_debug", []_C_int{4, 24, 30, 18}},
+	{"net.inet6.icmp6.nd6_delay", []_C_int{4, 24, 30, 8}},
+	{"net.inet6.icmp6.nd6_maxnudhint", []_C_int{4, 24, 30, 15}},
+	{"net.inet6.icmp6.nd6_mmaxtries", []_C_int{4, 24, 30, 10}},
+	{"net.inet6.icmp6.nd6_prune", []_C_int{4, 24, 30, 6}},
+	{"net.inet6.icmp6.nd6_umaxtries", []_C_int{4, 24, 30, 9}},
+	{"net.inet6.icmp6.nd6_useloopback", []_C_int{4, 24, 30, 11}},
+	{"net.inet6.icmp6.nodeinfo", []_C_int{4, 24, 30, 13}},
+	{"net.inet6.icmp6.rediraccept", []_C_int{4, 24, 30, 2}},
+	{"net.inet6.icmp6.redirtimeout", []_C_int{4, 24, 30, 3}},
+	{"net.inet6.ip6.accept_rtadv", []_C_int{4, 24, 17, 12}},
+	{"net.inet6.ip6.auto_flowlabel", []_C_int{4, 24, 17, 17}},
+	{"net.inet6.ip6.dad_count", []_C_int{4, 24, 17, 16}},
+	{"net.inet6.ip6.dad_pending", []_C_int{4, 24, 17, 49}},
+	{"net.inet6.ip6.defmcasthlim", []_C_int{4, 24, 17, 18}},
+	{"net.inet6.ip6.forwarding", []_C_int{4, 24, 17, 1}},
+	{"net.inet6.ip6.forwsrcrt", []_C_int{4, 24, 17, 5}},
+	{"net.inet6.ip6.hdrnestlimit", []_C_int{4, 24, 17, 15}},
+	{"net.inet6.ip6.hlim", []_C_int{4, 24, 17, 3}},
+	{"net.inet6.ip6.log_interval", []_C_int{4, 24, 17, 14}},
+	{"net.inet6.ip6.maxdynroutes", []_C_int{4, 24, 17, 48}},
+	{"net.inet6.ip6.maxfragpackets", []_C_int{4, 24, 17, 9}},
+	{"net.inet6.ip6.maxfrags", []_C_int{4, 24, 17, 41}},
+	{"net.inet6.ip6.maxifdefrouters", []_C_int{4, 24, 17, 47}},
+	{"net.inet6.ip6.maxifprefixes", []_C_int{4, 24, 17, 46}},
+	{"net.inet6.ip6.mforwarding", []_C_int{4, 24, 17, 42}},
+	{"net.inet6.ip6.mrtproto", []_C_int{4, 24, 17, 8}},
+	{"net.inet6.ip6.mtudisctimeout", []_C_int{4, 24, 17, 50}},
+	{"net.inet6.ip6.multicast_mtudisc", []_C_int{4, 24, 17, 44}},
+	{"net.inet6.ip6.multipath", []_C_int{4, 24, 17, 43}},
+	{"net.inet6.ip6.neighborgcthresh", []_C_int{4, 24, 17, 45}},
+	{"net.inet6.ip6.redirect", []_C_int{4, 24, 17, 2}},
+	{"net.inet6.ip6.rr_prune", []_C_int{4, 24, 17, 22}},
+	{"net.inet6.ip6.sourcecheck", []_C_int{4, 24, 17, 10}},
+	{"net.inet6.ip6.sourcecheck_logint", []_C_int{4, 24, 17, 11}},
+	{"net.inet6.ip6.use_deprecated", []_C_int{4, 24, 17, 21}},
+	{"net.inet6.ip6.v6only", []_C_int{4, 24, 17, 24}},
+	{"net.key.sadb_dump", []_C_int{4, 30, 1}},
+	{"net.key.spd_dump", []_C_int{4, 30, 2}},
+	{"net.mpls.ifq.congestion", []_C_int{4, 33, 3, 4}},
+	{"net.mpls.ifq.drops", []_C_int{4, 33, 3, 3}},
+	{"net.mpls.ifq.len", []_C_int{4, 33, 3, 1}},
+	{"net.mpls.ifq.maxlen", []_C_int{4, 33, 3, 2}},
+	{"net.mpls.mapttl_ip", []_C_int{4, 33, 5}},
+	{"net.mpls.mapttl_ip6", []_C_int{4, 33, 6}},
+	{"net.mpls.maxloop_inkernel", []_C_int{4, 33, 4}},
+	{"net.mpls.ttl", []_C_int{4, 33, 2}},
+	{"net.pflow.stats", []_C_int{4, 34, 1}},
+	{"net.pipex.enable", []_C_int{4, 35, 1}},
+	{"vm.anonmin", []_C_int{2, 7}},
+	{"vm.loadavg", []_C_int{2, 2}},
+	{"vm.maxslp", []_C_int{2, 10}},
+	{"vm.nkmempages", []_C_int{2, 6}},
+	{"vm.psstrings", []_C_int{2, 3}},
+	{"vm.swapencrypt.enable", []_C_int{2, 5, 0}},
+	{"vm.swapencrypt.keyscreated", []_C_int{2, 5, 1}},
+	{"vm.swapencrypt.keysdeleted", []_C_int{2, 5, 2}},
+	{"vm.uspace", []_C_int{2, 11}},
+	{"vm.uvmexp", []_C_int{2, 4}},
+	{"vm.vmmeter", []_C_int{2, 1}},
+	{"vm.vnodemin", []_C_int{2, 9}},
+	{"vm.vtextmin", []_C_int{2, 8}},
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
index 2786773ba3..d1d36da3f5 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_386.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,darwin
 
@@ -121,13 +121,15 @@ const (
 	SYS_CSOPS                          = 169
 	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
 	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
 	SYS_SETEUID                        = 183
 	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
+	SYS_THREAD_SELFCOUNTS              = 186
 	SYS_FDATASYNC                      = 187
 	SYS_STAT                           = 188
 	SYS_FSTAT                          = 189
@@ -278,7 +280,6 @@ const (
 	SYS_KQUEUE                         = 362
 	SYS_KEVENT                         = 363
 	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
 	SYS_BSDTHREAD_REGISTER             = 366
 	SYS_WORKQ_OPEN                     = 367
 	SYS_WORKQ_KERNRETURN               = 368
@@ -287,6 +288,8 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
 	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -298,11 +301,8 @@ const (
 	SYS___MAC_GET_FD                   = 388
 	SYS___MAC_SET_FD                   = 389
 	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
 	SYS_READ_NOCANCEL                  = 396
 	SYS_WRITE_NOCANCEL                 = 397
 	SYS_OPEN_NOCANCEL                  = 398
@@ -351,6 +351,7 @@ const (
 	SYS_GUARDED_CLOSE_NP               = 442
 	SYS_GUARDED_KQUEUE_NP              = 443
 	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
 	SYS_PROC_RLIMIT_CONTROL            = 446
 	SYS_CONNECTX                       = 447
 	SYS_DISCONNECTX                    = 448
@@ -367,6 +368,7 @@ const (
 	SYS_COALITION_INFO                 = 459
 	SYS_NECP_MATCH_POLICY              = 460
 	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
 	SYS_OPENAT                         = 463
 	SYS_OPENAT_NOCANCEL                = 464
 	SYS_RENAMEAT                       = 465
@@ -392,7 +394,43 @@ const (
 	SYS_GUARDED_WRITE_NP               = 485
 	SYS_GUARDED_PWRITE_NP              = 486
 	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
+	SYS_RENAMEATX_NP                   = 488
 	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
index 09de240c8f..e35de4145e 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_amd64.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,darwin
 
@@ -121,13 +121,15 @@ const (
 	SYS_CSOPS                          = 169
 	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
 	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
 	SYS_SETEUID                        = 183
 	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
+	SYS_THREAD_SELFCOUNTS              = 186
 	SYS_FDATASYNC                      = 187
 	SYS_STAT                           = 188
 	SYS_FSTAT                          = 189
@@ -278,7 +280,6 @@ const (
 	SYS_KQUEUE                         = 362
 	SYS_KEVENT                         = 363
 	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
 	SYS_BSDTHREAD_REGISTER             = 366
 	SYS_WORKQ_OPEN                     = 367
 	SYS_WORKQ_KERNRETURN               = 368
@@ -287,6 +288,8 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
 	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -298,11 +301,8 @@ const (
 	SYS___MAC_GET_FD                   = 388
 	SYS___MAC_SET_FD                   = 389
 	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
 	SYS_READ_NOCANCEL                  = 396
 	SYS_WRITE_NOCANCEL                 = 397
 	SYS_OPEN_NOCANCEL                  = 398
@@ -351,6 +351,7 @@ const (
 	SYS_GUARDED_CLOSE_NP               = 442
 	SYS_GUARDED_KQUEUE_NP              = 443
 	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
 	SYS_PROC_RLIMIT_CONTROL            = 446
 	SYS_CONNECTX                       = 447
 	SYS_DISCONNECTX                    = 448
@@ -367,6 +368,7 @@ const (
 	SYS_COALITION_INFO                 = 459
 	SYS_NECP_MATCH_POLICY              = 460
 	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
 	SYS_OPENAT                         = 463
 	SYS_OPENAT_NOCANCEL                = 464
 	SYS_RENAMEAT                       = 465
@@ -392,7 +394,43 @@ const (
 	SYS_GUARDED_WRITE_NP               = 485
 	SYS_GUARDED_PWRITE_NP              = 486
 	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
+	SYS_RENAMEATX_NP                   = 488
 	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
index b8c9aea852..f2df27db2c 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,darwin
 
@@ -121,12 +121,15 @@ const (
 	SYS_CSOPS                          = 169
 	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
+	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
 	SYS_SETEUID                        = 183
 	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
+	SYS_THREAD_SELFCOUNTS              = 186
 	SYS_FDATASYNC                      = 187
 	SYS_STAT                           = 188
 	SYS_FSTAT                          = 189
@@ -140,17 +143,10 @@ const (
 	SYS_LSEEK                          = 199
 	SYS_TRUNCATE                       = 200
 	SYS_FTRUNCATE                      = 201
-	SYS___SYSCTL                       = 202
+	SYS_SYSCTL                         = 202
 	SYS_MLOCK                          = 203
 	SYS_MUNLOCK                        = 204
 	SYS_UNDELETE                       = 205
-	SYS_ATSOCKET                       = 206
-	SYS_ATGETMSG                       = 207
-	SYS_ATPUTMSG                       = 208
-	SYS_ATPSNDREQ                      = 209
-	SYS_ATPSNDRSP                      = 210
-	SYS_ATPGETREQ                      = 211
-	SYS_ATPGETRSP                      = 212
 	SYS_OPEN_DPROTECTED_NP             = 216
 	SYS_GETATTRLIST                    = 220
 	SYS_SETATTRLIST                    = 221
@@ -202,9 +198,7 @@ const (
 	SYS_SEM_WAIT                       = 271
 	SYS_SEM_TRYWAIT                    = 272
 	SYS_SEM_POST                       = 273
-	SYS_SEM_GETVALUE                   = 274
-	SYS_SEM_INIT                       = 275
-	SYS_SEM_DESTROY                    = 276
+	SYS_SYSCTLBYNAME                   = 274
 	SYS_OPEN_EXTENDED                  = 277
 	SYS_UMASK_EXTENDED                 = 278
 	SYS_STAT_EXTENDED                  = 279
@@ -286,7 +280,6 @@ const (
 	SYS_KQUEUE                         = 362
 	SYS_KEVENT                         = 363
 	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
 	SYS_BSDTHREAD_REGISTER             = 366
 	SYS_WORKQ_OPEN                     = 367
 	SYS_WORKQ_KERNRETURN               = 368
@@ -295,6 +288,8 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
 	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -306,11 +301,8 @@ const (
 	SYS___MAC_GET_FD                   = 388
 	SYS___MAC_SET_FD                   = 389
 	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
 	SYS_READ_NOCANCEL                  = 396
 	SYS_WRITE_NOCANCEL                 = 397
 	SYS_OPEN_NOCANCEL                  = 398
@@ -354,5 +346,91 @@ const (
 	SYS_PID_SHUTDOWN_SOCKETS           = 436
 	SYS_SHARED_REGION_MAP_AND_SLIDE_NP = 438
 	SYS_KAS_INFO                       = 439
-	SYS_MAXSYSCALL                     = 440
+	SYS_MEMORYSTATUS_CONTROL           = 440
+	SYS_GUARDED_OPEN_NP                = 441
+	SYS_GUARDED_CLOSE_NP               = 442
+	SYS_GUARDED_KQUEUE_NP              = 443
+	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
+	SYS_PROC_RLIMIT_CONTROL            = 446
+	SYS_CONNECTX                       = 447
+	SYS_DISCONNECTX                    = 448
+	SYS_PEELOFF                        = 449
+	SYS_SOCKET_DELEGATE                = 450
+	SYS_TELEMETRY                      = 451
+	SYS_PROC_UUID_POLICY               = 452
+	SYS_MEMORYSTATUS_GET_LEVEL         = 453
+	SYS_SYSTEM_OVERRIDE                = 454
+	SYS_VFS_PURGE                      = 455
+	SYS_SFI_CTL                        = 456
+	SYS_SFI_PIDCTL                     = 457
+	SYS_COALITION                      = 458
+	SYS_COALITION_INFO                 = 459
+	SYS_NECP_MATCH_POLICY              = 460
+	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
+	SYS_OPENAT                         = 463
+	SYS_OPENAT_NOCANCEL                = 464
+	SYS_RENAMEAT                       = 465
+	SYS_FACCESSAT                      = 466
+	SYS_FCHMODAT                       = 467
+	SYS_FCHOWNAT                       = 468
+	SYS_FSTATAT                        = 469
+	SYS_FSTATAT64                      = 470
+	SYS_LINKAT                         = 471
+	SYS_UNLINKAT                       = 472
+	SYS_READLINKAT                     = 473
+	SYS_SYMLINKAT                      = 474
+	SYS_MKDIRAT                        = 475
+	SYS_GETATTRLISTAT                  = 476
+	SYS_PROC_TRACE_LOG                 = 477
+	SYS_BSDTHREAD_CTL                  = 478
+	SYS_OPENBYID_NP                    = 479
+	SYS_RECVMSG_X                      = 480
+	SYS_SENDMSG_X                      = 481
+	SYS_THREAD_SELFUSAGE               = 482
+	SYS_CSRCTL                         = 483
+	SYS_GUARDED_OPEN_DPROTECTED_NP     = 484
+	SYS_GUARDED_WRITE_NP               = 485
+	SYS_GUARDED_PWRITE_NP              = 486
+	SYS_GUARDED_WRITEV_NP              = 487
+	SYS_RENAMEATX_NP                   = 488
+	SYS_MREMAP_ENCRYPTED               = 489
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
index 26677ebbf5..9694630232 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_darwin_arm64.go
@@ -1,5 +1,5 @@
-// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS8.4.sdk/usr/include/sys/syscall.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// mksysnum_darwin.pl /Applications/Xcode.app/Contents/Developer/Platforms/iPhoneOS.platform/Developer/SDKs/iPhoneOS11.1.sdk/usr/include/sys/syscall.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm64,darwin
 
@@ -121,13 +121,15 @@ const (
 	SYS_CSOPS                          = 169
 	SYS_CSOPS_AUDITTOKEN               = 170
 	SYS_WAITID                         = 173
+	SYS_KDEBUG_TYPEFILTER              = 177
+	SYS_KDEBUG_TRACE_STRING            = 178
 	SYS_KDEBUG_TRACE64                 = 179
 	SYS_KDEBUG_TRACE                   = 180
 	SYS_SETGID                         = 181
 	SYS_SETEGID                        = 182
 	SYS_SETEUID                        = 183
 	SYS_SIGRETURN                      = 184
-	SYS_CHUD                           = 185
+	SYS_THREAD_SELFCOUNTS              = 186
 	SYS_FDATASYNC                      = 187
 	SYS_STAT                           = 188
 	SYS_FSTAT                          = 189
@@ -278,7 +280,6 @@ const (
 	SYS_KQUEUE                         = 362
 	SYS_KEVENT                         = 363
 	SYS_LCHOWN                         = 364
-	SYS_STACK_SNAPSHOT                 = 365
 	SYS_BSDTHREAD_REGISTER             = 366
 	SYS_WORKQ_OPEN                     = 367
 	SYS_WORKQ_KERNRETURN               = 368
@@ -287,6 +288,8 @@ const (
 	SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL  = 371
 	SYS_THREAD_SELFID                  = 372
 	SYS_LEDGER                         = 373
+	SYS_KEVENT_QOS                     = 374
+	SYS_KEVENT_ID                      = 375
 	SYS___MAC_EXECVE                   = 380
 	SYS___MAC_SYSCALL                  = 381
 	SYS___MAC_GET_FILE                 = 382
@@ -298,11 +301,8 @@ const (
 	SYS___MAC_GET_FD                   = 388
 	SYS___MAC_SET_FD                   = 389
 	SYS___MAC_GET_PID                  = 390
-	SYS___MAC_GET_LCID                 = 391
-	SYS___MAC_GET_LCTX                 = 392
-	SYS___MAC_SET_LCTX                 = 393
-	SYS_SETLCID                        = 394
-	SYS_GETLCID                        = 395
+	SYS_PSELECT                        = 394
+	SYS_PSELECT_NOCANCEL               = 395
 	SYS_READ_NOCANCEL                  = 396
 	SYS_WRITE_NOCANCEL                 = 397
 	SYS_OPEN_NOCANCEL                  = 398
@@ -351,6 +351,7 @@ const (
 	SYS_GUARDED_CLOSE_NP               = 442
 	SYS_GUARDED_KQUEUE_NP              = 443
 	SYS_CHANGE_FDGUARD_NP              = 444
+	SYS_USRCTL                         = 445
 	SYS_PROC_RLIMIT_CONTROL            = 446
 	SYS_CONNECTX                       = 447
 	SYS_DISCONNECTX                    = 448
@@ -367,6 +368,7 @@ const (
 	SYS_COALITION_INFO                 = 459
 	SYS_NECP_MATCH_POLICY              = 460
 	SYS_GETATTRLISTBULK                = 461
+	SYS_CLONEFILEAT                    = 462
 	SYS_OPENAT                         = 463
 	SYS_OPENAT_NOCANCEL                = 464
 	SYS_RENAMEAT                       = 465
@@ -392,7 +394,43 @@ const (
 	SYS_GUARDED_WRITE_NP               = 485
 	SYS_GUARDED_PWRITE_NP              = 486
 	SYS_GUARDED_WRITEV_NP              = 487
-	SYS_RENAME_EXT                     = 488
+	SYS_RENAMEATX_NP                   = 488
 	SYS_MREMAP_ENCRYPTED               = 489
-	SYS_MAXSYSCALL                     = 490
+	SYS_NETAGENT_TRIGGER               = 490
+	SYS_STACK_SNAPSHOT_WITH_CONFIG     = 491
+	SYS_MICROSTACKSHOT                 = 492
+	SYS_GRAB_PGO_DATA                  = 493
+	SYS_PERSONA                        = 494
+	SYS_WORK_INTERVAL_CTL              = 499
+	SYS_GETENTROPY                     = 500
+	SYS_NECP_OPEN                      = 501
+	SYS_NECP_CLIENT_ACTION             = 502
+	SYS___NEXUS_OPEN                   = 503
+	SYS___NEXUS_REGISTER               = 504
+	SYS___NEXUS_DEREGISTER             = 505
+	SYS___NEXUS_CREATE                 = 506
+	SYS___NEXUS_DESTROY                = 507
+	SYS___NEXUS_GET_OPT                = 508
+	SYS___NEXUS_SET_OPT                = 509
+	SYS___CHANNEL_OPEN                 = 510
+	SYS___CHANNEL_GET_INFO             = 511
+	SYS___CHANNEL_SYNC                 = 512
+	SYS___CHANNEL_GET_OPT              = 513
+	SYS___CHANNEL_SET_OPT              = 514
+	SYS_ULOCK_WAIT                     = 515
+	SYS_ULOCK_WAKE                     = 516
+	SYS_FCLONEFILEAT                   = 517
+	SYS_FS_SNAPSHOT                    = 518
+	SYS_TERMINATE_WITH_PAYLOAD         = 520
+	SYS_ABORT_WITH_PAYLOAD             = 521
+	SYS_NECP_SESSION_OPEN              = 522
+	SYS_NECP_SESSION_ACTION            = 523
+	SYS_SETATTRLISTAT                  = 524
+	SYS_NET_QOS_GUIDELINE              = 525
+	SYS_FMOUNT                         = 526
+	SYS_NTP_ADJTIME                    = 527
+	SYS_NTP_GETTIME                    = 528
+	SYS_OS_FAULT_WITH_PAYLOAD          = 529
+	SYS_MAXSYSCALL                     = 530
+	SYS_INVALID                        = 63
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
index d6038fa9b0..b2c9ef81b8 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_dragonfly_amd64.go
@@ -1,5 +1,5 @@
 // mksysnum_dragonfly.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,dragonfly
 
@@ -42,7 +42,7 @@ const (
 	SYS_SYNC          = 36  // { int sync(void); }
 	SYS_KILL          = 37  // { int kill(int pid, int signum); }
 	SYS_GETPPID       = 39  // { pid_t getppid(void); }
-	SYS_DUP           = 41  // { int dup(u_int fd); }
+	SYS_DUP           = 41  // { int dup(int fd); }
 	SYS_PIPE          = 42  // { int pipe(void); }
 	SYS_GETEGID       = 43  // { gid_t getegid(void); }
 	SYS_PROFIL        = 44  // { int profil(caddr_t samples, size_t size, \
@@ -76,7 +76,7 @@ const (
 	SYS_SWAPON        = 85  // { int swapon(char *name); }
 	SYS_GETITIMER     = 86  // { int getitimer(u_int which, struct itimerval *itv); }
 	SYS_GETDTABLESIZE = 89  // { int getdtablesize(void); }
-	SYS_DUP2          = 90  // { int dup2(u_int from, u_int to); }
+	SYS_DUP2          = 90  // { int dup2(int from, int to); }
 	SYS_FCNTL         = 92  // { int fcntl(int fd, int cmd, long arg); }
 	SYS_SELECT        = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
 	SYS_FSYNC         = 95  // { int fsync(int fd); }
@@ -144,7 +144,7 @@ const (
 	SYS_SEMOP                  = 222 // { int semop(int semid, struct sembuf *sops, \
 	SYS_MSGCTL                 = 224 // { int msgctl(int msqid, int cmd, \
 	SYS_MSGGET                 = 225 // { int msgget(key_t key, int msgflg); }
-	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, void *msgp, size_t msgsz, \
+	SYS_MSGSND                 = 226 // { int msgsnd(int msqid, const void *msgp, size_t msgsz, \
 	SYS_MSGRCV                 = 227 // { int msgrcv(int msqid, void *msgp, size_t msgsz, \
 	SYS_SHMAT                  = 228 // { caddr_t shmat(int shmid, const void *shmaddr, \
 	SYS_SHMCTL                 = 229 // { int shmctl(int shmid, int cmd, \
@@ -224,7 +224,7 @@ const (
 	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, gid_t *sgid); }
 	SYS_KQUEUE                 = 362 // { int kqueue(void); }
 	SYS_KEVENT                 = 363 // { int kevent(int fd, \
-	SYS_SCTP_PEELOFF           = 364 // { int sctp_peeloff(int sd, caddr_t name ); }
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, char *value, int len); }
 	SYS_LCHFLAGS               = 391 // { int lchflags(char *path, int flags); }
 	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, int count); }
 	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, size_t nbytes, \
@@ -301,4 +301,15 @@ const (
 	SYS_LPATHCONF              = 533 // { int lpathconf(char *path, int name); }
 	SYS_VMM_GUEST_CTL          = 534 // { int vmm_guest_ctl(int op, struct vmm_guest_options *options); }
 	SYS_VMM_GUEST_SYNC_ADDR    = 535 // { int vmm_guest_sync_addr(long *dstaddr, long *srcaddr); }
+	SYS_PROCCTL                = 536 // { int procctl(idtype_t idtype, id_t id, int cmd, void *data); }
+	SYS_CHFLAGSAT              = 537 // { int chflagsat(int fd, const char *path, int flags, int atflags);}
+	SYS_PIPE2                  = 538 // { int pipe2(int *fildes, int flags); }
+	SYS_UTIMENSAT              = 539 // { int utimensat(int fd, const char *path, const struct timespec *ts, int flags); }
+	SYS_FUTIMENS               = 540 // { int futimens(int fd, const struct timespec *ts); }
+	SYS_ACCEPT4                = 541 // { int accept4(int s, caddr_t name, int *anamelen, int flags); }
+	SYS_LWP_SETNAME            = 542 // { int lwp_setname(lwpid_t tid, const char *name); }
+	SYS_PPOLL                  = 543 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_LWP_SETAFFINITY        = 544 // { int lwp_setaffinity(pid_t pid, lwpid_t tid, const cpumask_t *mask); }
+	SYS_LWP_GETAFFINITY        = 545 // { int lwp_getaffinity(pid_t pid, lwpid_t tid, cpumask_t *mask); }
+	SYS_LWP_CREATE2            = 546 // { int lwp_create2(struct lwp_params *params, const cpumask_t *mask); }
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
index 262a84536a..b64a8122ce 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_386.go
@@ -1,5 +1,5 @@
 // mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,freebsd
 
@@ -7,345 +7,347 @@ package unix
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
index 57a60ea126..81722ac9f3 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_amd64.go
@@ -1,5 +1,5 @@
 // mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,freebsd
 
@@ -7,345 +7,347 @@ package unix
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
index 206b9f612d..4488314181 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_freebsd_arm.go
@@ -1,5 +1,5 @@
 // mksysnum_freebsd.pl
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,freebsd
 
@@ -7,345 +7,347 @@ package unix
 
 const (
 	// SYS_NOSYS = 0;  // { int nosys(void); } syscall nosys_args int
-	SYS_EXIT                     = 1   // { void sys_exit(int rval); } exit \
-	SYS_FORK                     = 2   // { int fork(void); }
-	SYS_READ                     = 3   // { ssize_t read(int fd, void *buf, \
-	SYS_WRITE                    = 4   // { ssize_t write(int fd, const void *buf, \
-	SYS_OPEN                     = 5   // { int open(char *path, int flags, int mode); }
-	SYS_CLOSE                    = 6   // { int close(int fd); }
-	SYS_WAIT4                    = 7   // { int wait4(int pid, int *status, \
-	SYS_LINK                     = 9   // { int link(char *path, char *link); }
-	SYS_UNLINK                   = 10  // { int unlink(char *path); }
-	SYS_CHDIR                    = 12  // { int chdir(char *path); }
-	SYS_FCHDIR                   = 13  // { int fchdir(int fd); }
-	SYS_MKNOD                    = 14  // { int mknod(char *path, int mode, int dev); }
-	SYS_CHMOD                    = 15  // { int chmod(char *path, int mode); }
-	SYS_CHOWN                    = 16  // { int chown(char *path, int uid, int gid); }
-	SYS_OBREAK                   = 17  // { int obreak(char *nsize); } break \
-	SYS_GETPID                   = 20  // { pid_t getpid(void); }
-	SYS_MOUNT                    = 21  // { int mount(char *type, char *path, \
-	SYS_UNMOUNT                  = 22  // { int unmount(char *path, int flags); }
-	SYS_SETUID                   = 23  // { int setuid(uid_t uid); }
-	SYS_GETUID                   = 24  // { uid_t getuid(void); }
-	SYS_GETEUID                  = 25  // { uid_t geteuid(void); }
-	SYS_PTRACE                   = 26  // { int ptrace(int req, pid_t pid, \
-	SYS_RECVMSG                  = 27  // { int recvmsg(int s, struct msghdr *msg, \
-	SYS_SENDMSG                  = 28  // { int sendmsg(int s, struct msghdr *msg, \
-	SYS_RECVFROM                 = 29  // { int recvfrom(int s, caddr_t buf, \
-	SYS_ACCEPT                   = 30  // { int accept(int s, \
-	SYS_GETPEERNAME              = 31  // { int getpeername(int fdes, \
-	SYS_GETSOCKNAME              = 32  // { int getsockname(int fdes, \
-	SYS_ACCESS                   = 33  // { int access(char *path, int amode); }
-	SYS_CHFLAGS                  = 34  // { int chflags(const char *path, u_long flags); }
-	SYS_FCHFLAGS                 = 35  // { int fchflags(int fd, u_long flags); }
-	SYS_SYNC                     = 36  // { int sync(void); }
-	SYS_KILL                     = 37  // { int kill(int pid, int signum); }
-	SYS_GETPPID                  = 39  // { pid_t getppid(void); }
-	SYS_DUP                      = 41  // { int dup(u_int fd); }
-	SYS_PIPE                     = 42  // { int pipe(void); }
-	SYS_GETEGID                  = 43  // { gid_t getegid(void); }
-	SYS_PROFIL                   = 44  // { int profil(caddr_t samples, size_t size, \
-	SYS_KTRACE                   = 45  // { int ktrace(const char *fname, int ops, \
-	SYS_GETGID                   = 47  // { gid_t getgid(void); }
-	SYS_GETLOGIN                 = 49  // { int getlogin(char *namebuf, u_int \
-	SYS_SETLOGIN                 = 50  // { int setlogin(char *namebuf); }
-	SYS_ACCT                     = 51  // { int acct(char *path); }
-	SYS_SIGALTSTACK              = 53  // { int sigaltstack(stack_t *ss, \
-	SYS_IOCTL                    = 54  // { int ioctl(int fd, u_long com, \
-	SYS_REBOOT                   = 55  // { int reboot(int opt); }
-	SYS_REVOKE                   = 56  // { int revoke(char *path); }
-	SYS_SYMLINK                  = 57  // { int symlink(char *path, char *link); }
-	SYS_READLINK                 = 58  // { ssize_t readlink(char *path, char *buf, \
-	SYS_EXECVE                   = 59  // { int execve(char *fname, char **argv, \
-	SYS_UMASK                    = 60  // { int umask(int newmask); } umask umask_args \
-	SYS_CHROOT                   = 61  // { int chroot(char *path); }
-	SYS_MSYNC                    = 65  // { int msync(void *addr, size_t len, \
-	SYS_VFORK                    = 66  // { int vfork(void); }
-	SYS_SBRK                     = 69  // { int sbrk(int incr); }
-	SYS_SSTK                     = 70  // { int sstk(int incr); }
-	SYS_OVADVISE                 = 72  // { int ovadvise(int anom); } vadvise \
-	SYS_MUNMAP                   = 73  // { int munmap(void *addr, size_t len); }
-	SYS_MPROTECT                 = 74  // { int mprotect(const void *addr, size_t len, \
-	SYS_MADVISE                  = 75  // { int madvise(void *addr, size_t len, \
-	SYS_MINCORE                  = 78  // { int mincore(const void *addr, size_t len, \
-	SYS_GETGROUPS                = 79  // { int getgroups(u_int gidsetsize, \
-	SYS_SETGROUPS                = 80  // { int setgroups(u_int gidsetsize, \
-	SYS_GETPGRP                  = 81  // { int getpgrp(void); }
-	SYS_SETPGID                  = 82  // { int setpgid(int pid, int pgid); }
-	SYS_SETITIMER                = 83  // { int setitimer(u_int which, struct \
-	SYS_SWAPON                   = 85  // { int swapon(char *name); }
-	SYS_GETITIMER                = 86  // { int getitimer(u_int which, \
-	SYS_GETDTABLESIZE            = 89  // { int getdtablesize(void); }
-	SYS_DUP2                     = 90  // { int dup2(u_int from, u_int to); }
-	SYS_FCNTL                    = 92  // { int fcntl(int fd, int cmd, long arg); }
-	SYS_SELECT                   = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
-	SYS_FSYNC                    = 95  // { int fsync(int fd); }
-	SYS_SETPRIORITY              = 96  // { int setpriority(int which, int who, \
-	SYS_SOCKET                   = 97  // { int socket(int domain, int type, \
-	SYS_CONNECT                  = 98  // { int connect(int s, caddr_t name, \
-	SYS_GETPRIORITY              = 100 // { int getpriority(int which, int who); }
-	SYS_BIND                     = 104 // { int bind(int s, caddr_t name, \
-	SYS_SETSOCKOPT               = 105 // { int setsockopt(int s, int level, int name, \
-	SYS_LISTEN                   = 106 // { int listen(int s, int backlog); }
-	SYS_GETTIMEOFDAY             = 116 // { int gettimeofday(struct timeval *tp, \
-	SYS_GETRUSAGE                = 117 // { int getrusage(int who, \
-	SYS_GETSOCKOPT               = 118 // { int getsockopt(int s, int level, int name, \
-	SYS_READV                    = 120 // { int readv(int fd, struct iovec *iovp, \
-	SYS_WRITEV                   = 121 // { int writev(int fd, struct iovec *iovp, \
-	SYS_SETTIMEOFDAY             = 122 // { int settimeofday(struct timeval *tv, \
-	SYS_FCHOWN                   = 123 // { int fchown(int fd, int uid, int gid); }
-	SYS_FCHMOD                   = 124 // { int fchmod(int fd, int mode); }
-	SYS_SETREUID                 = 126 // { int setreuid(int ruid, int euid); }
-	SYS_SETREGID                 = 127 // { int setregid(int rgid, int egid); }
-	SYS_RENAME                   = 128 // { int rename(char *from, char *to); }
-	SYS_FLOCK                    = 131 // { int flock(int fd, int how); }
-	SYS_MKFIFO                   = 132 // { int mkfifo(char *path, int mode); }
-	SYS_SENDTO                   = 133 // { int sendto(int s, caddr_t buf, size_t len, \
-	SYS_SHUTDOWN                 = 134 // { int shutdown(int s, int how); }
-	SYS_SOCKETPAIR               = 135 // { int socketpair(int domain, int type, \
-	SYS_MKDIR                    = 136 // { int mkdir(char *path, int mode); }
-	SYS_RMDIR                    = 137 // { int rmdir(char *path); }
-	SYS_UTIMES                   = 138 // { int utimes(char *path, \
-	SYS_ADJTIME                  = 140 // { int adjtime(struct timeval *delta, \
-	SYS_SETSID                   = 147 // { int setsid(void); }
-	SYS_QUOTACTL                 = 148 // { int quotactl(char *path, int cmd, int uid, \
-	SYS_LGETFH                   = 160 // { int lgetfh(char *fname, \
-	SYS_GETFH                    = 161 // { int getfh(char *fname, \
-	SYS_SYSARCH                  = 165 // { int sysarch(int op, char *parms); }
-	SYS_RTPRIO                   = 166 // { int rtprio(int function, pid_t pid, \
-	SYS_FREEBSD6_PREAD           = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
-	SYS_FREEBSD6_PWRITE          = 174 // { ssize_t freebsd6_pwrite(int fd, \
-	SYS_SETFIB                   = 175 // { int setfib(int fibnum); }
-	SYS_NTP_ADJTIME              = 176 // { int ntp_adjtime(struct timex *tp); }
-	SYS_SETGID                   = 181 // { int setgid(gid_t gid); }
-	SYS_SETEGID                  = 182 // { int setegid(gid_t egid); }
-	SYS_SETEUID                  = 183 // { int seteuid(uid_t euid); }
-	SYS_STAT                     = 188 // { int stat(char *path, struct stat *ub); }
-	SYS_FSTAT                    = 189 // { int fstat(int fd, struct stat *sb); }
-	SYS_LSTAT                    = 190 // { int lstat(char *path, struct stat *ub); }
-	SYS_PATHCONF                 = 191 // { int pathconf(char *path, int name); }
-	SYS_FPATHCONF                = 192 // { int fpathconf(int fd, int name); }
-	SYS_GETRLIMIT                = 194 // { int getrlimit(u_int which, \
-	SYS_SETRLIMIT                = 195 // { int setrlimit(u_int which, \
-	SYS_GETDIRENTRIES            = 196 // { int getdirentries(int fd, char *buf, \
-	SYS_FREEBSD6_MMAP            = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
-	SYS_FREEBSD6_LSEEK           = 199 // { off_t freebsd6_lseek(int fd, int pad, \
-	SYS_FREEBSD6_TRUNCATE        = 200 // { int freebsd6_truncate(char *path, int pad, \
-	SYS_FREEBSD6_FTRUNCATE       = 201 // { int freebsd6_ftruncate(int fd, int pad, \
-	SYS___SYSCTL                 = 202 // { int __sysctl(int *name, u_int namelen, \
-	SYS_MLOCK                    = 203 // { int mlock(const void *addr, size_t len); }
-	SYS_MUNLOCK                  = 204 // { int munlock(const void *addr, size_t len); }
-	SYS_UNDELETE                 = 205 // { int undelete(char *path); }
-	SYS_FUTIMES                  = 206 // { int futimes(int fd, struct timeval *tptr); }
-	SYS_GETPGID                  = 207 // { int getpgid(pid_t pid); }
-	SYS_POLL                     = 209 // { int poll(struct pollfd *fds, u_int nfds, \
-	SYS_CLOCK_GETTIME            = 232 // { int clock_gettime(clockid_t clock_id, \
-	SYS_CLOCK_SETTIME            = 233 // { int clock_settime( \
-	SYS_CLOCK_GETRES             = 234 // { int clock_getres(clockid_t clock_id, \
-	SYS_KTIMER_CREATE            = 235 // { int ktimer_create(clockid_t clock_id, \
-	SYS_KTIMER_DELETE            = 236 // { int ktimer_delete(int timerid); }
-	SYS_KTIMER_SETTIME           = 237 // { int ktimer_settime(int timerid, int flags, \
-	SYS_KTIMER_GETTIME           = 238 // { int ktimer_gettime(int timerid, struct \
-	SYS_KTIMER_GETOVERRUN        = 239 // { int ktimer_getoverrun(int timerid); }
-	SYS_NANOSLEEP                = 240 // { int nanosleep(const struct timespec *rqtp, \
-	SYS_FFCLOCK_GETCOUNTER       = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
-	SYS_FFCLOCK_SETESTIMATE      = 242 // { int ffclock_setestimate( \
-	SYS_FFCLOCK_GETESTIMATE      = 243 // { int ffclock_getestimate( \
-	SYS_CLOCK_GETCPUCLOCKID2     = 247 // { int clock_getcpuclockid2(id_t id,\
-	SYS_NTP_GETTIME              = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
-	SYS_MINHERIT                 = 250 // { int minherit(void *addr, size_t len, \
-	SYS_RFORK                    = 251 // { int rfork(int flags); }
-	SYS_OPENBSD_POLL             = 252 // { int openbsd_poll(struct pollfd *fds, \
-	SYS_ISSETUGID                = 253 // { int issetugid(void); }
-	SYS_LCHOWN                   = 254 // { int lchown(char *path, int uid, int gid); }
-	SYS_GETDENTS                 = 272 // { int getdents(int fd, char *buf, \
-	SYS_LCHMOD                   = 274 // { int lchmod(char *path, mode_t mode); }
-	SYS_LUTIMES                  = 276 // { int lutimes(char *path, \
-	SYS_NSTAT                    = 278 // { int nstat(char *path, struct nstat *ub); }
-	SYS_NFSTAT                   = 279 // { int nfstat(int fd, struct nstat *sb); }
-	SYS_NLSTAT                   = 280 // { int nlstat(char *path, struct nstat *ub); }
-	SYS_PREADV                   = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
-	SYS_PWRITEV                  = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
-	SYS_FHOPEN                   = 298 // { int fhopen(const struct fhandle *u_fhp, \
-	SYS_FHSTAT                   = 299 // { int fhstat(const struct fhandle *u_fhp, \
-	SYS_MODNEXT                  = 300 // { int modnext(int modid); }
-	SYS_MODSTAT                  = 301 // { int modstat(int modid, \
-	SYS_MODFNEXT                 = 302 // { int modfnext(int modid); }
-	SYS_MODFIND                  = 303 // { int modfind(const char *name); }
-	SYS_KLDLOAD                  = 304 // { int kldload(const char *file); }
-	SYS_KLDUNLOAD                = 305 // { int kldunload(int fileid); }
-	SYS_KLDFIND                  = 306 // { int kldfind(const char *file); }
-	SYS_KLDNEXT                  = 307 // { int kldnext(int fileid); }
-	SYS_KLDSTAT                  = 308 // { int kldstat(int fileid, struct \
-	SYS_KLDFIRSTMOD              = 309 // { int kldfirstmod(int fileid); }
-	SYS_GETSID                   = 310 // { int getsid(pid_t pid); }
-	SYS_SETRESUID                = 311 // { int setresuid(uid_t ruid, uid_t euid, \
-	SYS_SETRESGID                = 312 // { int setresgid(gid_t rgid, gid_t egid, \
-	SYS_YIELD                    = 321 // { int yield(void); }
-	SYS_MLOCKALL                 = 324 // { int mlockall(int how); }
-	SYS_MUNLOCKALL               = 325 // { int munlockall(void); }
-	SYS___GETCWD                 = 326 // { int __getcwd(char *buf, u_int buflen); }
-	SYS_SCHED_SETPARAM           = 327 // { int sched_setparam (pid_t pid, \
-	SYS_SCHED_GETPARAM           = 328 // { int sched_getparam (pid_t pid, struct \
-	SYS_SCHED_SETSCHEDULER       = 329 // { int sched_setscheduler (pid_t pid, int \
-	SYS_SCHED_GETSCHEDULER       = 330 // { int sched_getscheduler (pid_t pid); }
-	SYS_SCHED_YIELD              = 331 // { int sched_yield (void); }
-	SYS_SCHED_GET_PRIORITY_MAX   = 332 // { int sched_get_priority_max (int policy); }
-	SYS_SCHED_GET_PRIORITY_MIN   = 333 // { int sched_get_priority_min (int policy); }
-	SYS_SCHED_RR_GET_INTERVAL    = 334 // { int sched_rr_get_interval (pid_t pid, \
-	SYS_UTRACE                   = 335 // { int utrace(const void *addr, size_t len); }
-	SYS_KLDSYM                   = 337 // { int kldsym(int fileid, int cmd, \
-	SYS_JAIL                     = 338 // { int jail(struct jail *jail); }
-	SYS_SIGPROCMASK              = 340 // { int sigprocmask(int how, \
-	SYS_SIGSUSPEND               = 341 // { int sigsuspend(const sigset_t *sigmask); }
-	SYS_SIGPENDING               = 343 // { int sigpending(sigset_t *set); }
-	SYS_SIGTIMEDWAIT             = 345 // { int sigtimedwait(const sigset_t *set, \
-	SYS_SIGWAITINFO              = 346 // { int sigwaitinfo(const sigset_t *set, \
-	SYS___ACL_GET_FILE           = 347 // { int __acl_get_file(const char *path, \
-	SYS___ACL_SET_FILE           = 348 // { int __acl_set_file(const char *path, \
-	SYS___ACL_GET_FD             = 349 // { int __acl_get_fd(int filedes, \
-	SYS___ACL_SET_FD             = 350 // { int __acl_set_fd(int filedes, \
-	SYS___ACL_DELETE_FILE        = 351 // { int __acl_delete_file(const char *path, \
-	SYS___ACL_DELETE_FD          = 352 // { int __acl_delete_fd(int filedes, \
-	SYS___ACL_ACLCHECK_FILE      = 353 // { int __acl_aclcheck_file(const char *path, \
-	SYS___ACL_ACLCHECK_FD        = 354 // { int __acl_aclcheck_fd(int filedes, \
-	SYS_EXTATTRCTL               = 355 // { int extattrctl(const char *path, int cmd, \
-	SYS_EXTATTR_SET_FILE         = 356 // { ssize_t extattr_set_file( \
-	SYS_EXTATTR_GET_FILE         = 357 // { ssize_t extattr_get_file( \
-	SYS_EXTATTR_DELETE_FILE      = 358 // { int extattr_delete_file(const char *path, \
-	SYS_GETRESUID                = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
-	SYS_GETRESGID                = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
-	SYS_KQUEUE                   = 362 // { int kqueue(void); }
-	SYS_KEVENT                   = 363 // { int kevent(int fd, \
-	SYS_EXTATTR_SET_FD           = 371 // { ssize_t extattr_set_fd(int fd, \
-	SYS_EXTATTR_GET_FD           = 372 // { ssize_t extattr_get_fd(int fd, \
-	SYS_EXTATTR_DELETE_FD        = 373 // { int extattr_delete_fd(int fd, \
-	SYS___SETUGID                = 374 // { int __setugid(int flag); }
-	SYS_EACCESS                  = 376 // { int eaccess(char *path, int amode); }
-	SYS_NMOUNT                   = 378 // { int nmount(struct iovec *iovp, \
-	SYS___MAC_GET_PROC           = 384 // { int __mac_get_proc(struct mac *mac_p); }
-	SYS___MAC_SET_PROC           = 385 // { int __mac_set_proc(struct mac *mac_p); }
-	SYS___MAC_GET_FD             = 386 // { int __mac_get_fd(int fd, \
-	SYS___MAC_GET_FILE           = 387 // { int __mac_get_file(const char *path_p, \
-	SYS___MAC_SET_FD             = 388 // { int __mac_set_fd(int fd, \
-	SYS___MAC_SET_FILE           = 389 // { int __mac_set_file(const char *path_p, \
-	SYS_KENV                     = 390 // { int kenv(int what, const char *name, \
-	SYS_LCHFLAGS                 = 391 // { int lchflags(const char *path, \
-	SYS_UUIDGEN                  = 392 // { int uuidgen(struct uuid *store, \
-	SYS_SENDFILE                 = 393 // { int sendfile(int fd, int s, off_t offset, \
-	SYS_MAC_SYSCALL              = 394 // { int mac_syscall(const char *policy, \
-	SYS_GETFSSTAT                = 395 // { int getfsstat(struct statfs *buf, \
-	SYS_STATFS                   = 396 // { int statfs(char *path, \
-	SYS_FSTATFS                  = 397 // { int fstatfs(int fd, struct statfs *buf); }
-	SYS_FHSTATFS                 = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
-	SYS___MAC_GET_PID            = 409 // { int __mac_get_pid(pid_t pid, \
-	SYS___MAC_GET_LINK           = 410 // { int __mac_get_link(const char *path_p, \
-	SYS___MAC_SET_LINK           = 411 // { int __mac_set_link(const char *path_p, \
-	SYS_EXTATTR_SET_LINK         = 412 // { ssize_t extattr_set_link( \
-	SYS_EXTATTR_GET_LINK         = 413 // { ssize_t extattr_get_link( \
-	SYS_EXTATTR_DELETE_LINK      = 414 // { int extattr_delete_link( \
-	SYS___MAC_EXECVE             = 415 // { int __mac_execve(char *fname, char **argv, \
-	SYS_SIGACTION                = 416 // { int sigaction(int sig, \
-	SYS_SIGRETURN                = 417 // { int sigreturn( \
-	SYS_GETCONTEXT               = 421 // { int getcontext(struct __ucontext *ucp); }
-	SYS_SETCONTEXT               = 422 // { int setcontext( \
-	SYS_SWAPCONTEXT              = 423 // { int swapcontext(struct __ucontext *oucp, \
-	SYS_SWAPOFF                  = 424 // { int swapoff(const char *name); }
-	SYS___ACL_GET_LINK           = 425 // { int __acl_get_link(const char *path, \
-	SYS___ACL_SET_LINK           = 426 // { int __acl_set_link(const char *path, \
-	SYS___ACL_DELETE_LINK        = 427 // { int __acl_delete_link(const char *path, \
-	SYS___ACL_ACLCHECK_LINK      = 428 // { int __acl_aclcheck_link(const char *path, \
-	SYS_SIGWAIT                  = 429 // { int sigwait(const sigset_t *set, \
-	SYS_THR_CREATE               = 430 // { int thr_create(ucontext_t *ctx, long *id, \
-	SYS_THR_EXIT                 = 431 // { void thr_exit(long *state); }
-	SYS_THR_SELF                 = 432 // { int thr_self(long *id); }
-	SYS_THR_KILL                 = 433 // { int thr_kill(long id, int sig); }
-	SYS__UMTX_LOCK               = 434 // { int _umtx_lock(struct umtx *umtx); }
-	SYS__UMTX_UNLOCK             = 435 // { int _umtx_unlock(struct umtx *umtx); }
-	SYS_JAIL_ATTACH              = 436 // { int jail_attach(int jid); }
-	SYS_EXTATTR_LIST_FD          = 437 // { ssize_t extattr_list_fd(int fd, \
-	SYS_EXTATTR_LIST_FILE        = 438 // { ssize_t extattr_list_file( \
-	SYS_EXTATTR_LIST_LINK        = 439 // { ssize_t extattr_list_link( \
-	SYS_THR_SUSPEND              = 442 // { int thr_suspend( \
-	SYS_THR_WAKE                 = 443 // { int thr_wake(long id); }
-	SYS_KLDUNLOADF               = 444 // { int kldunloadf(int fileid, int flags); }
-	SYS_AUDIT                    = 445 // { int audit(const void *record, \
-	SYS_AUDITON                  = 446 // { int auditon(int cmd, void *data, \
-	SYS_GETAUID                  = 447 // { int getauid(uid_t *auid); }
-	SYS_SETAUID                  = 448 // { int setauid(uid_t *auid); }
-	SYS_GETAUDIT                 = 449 // { int getaudit(struct auditinfo *auditinfo); }
-	SYS_SETAUDIT                 = 450 // { int setaudit(struct auditinfo *auditinfo); }
-	SYS_GETAUDIT_ADDR            = 451 // { int getaudit_addr( \
-	SYS_SETAUDIT_ADDR            = 452 // { int setaudit_addr( \
-	SYS_AUDITCTL                 = 453 // { int auditctl(char *path); }
-	SYS__UMTX_OP                 = 454 // { int _umtx_op(void *obj, int op, \
-	SYS_THR_NEW                  = 455 // { int thr_new(struct thr_param *param, \
-	SYS_SIGQUEUE                 = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
-	SYS_ABORT2                   = 463 // { int abort2(const char *why, int nargs, void **args); }
-	SYS_THR_SET_NAME             = 464 // { int thr_set_name(long id, const char *name); }
-	SYS_RTPRIO_THREAD            = 466 // { int rtprio_thread(int function, \
-	SYS_SCTP_PEELOFF             = 471 // { int sctp_peeloff(int sd, uint32_t name); }
-	SYS_SCTP_GENERIC_SENDMSG     = 472 // { int sctp_generic_sendmsg(int sd, caddr_t msg, int mlen, \
-	SYS_SCTP_GENERIC_SENDMSG_IOV = 473 // { int sctp_generic_sendmsg_iov(int sd, struct iovec *iov, int iovlen, \
-	SYS_SCTP_GENERIC_RECVMSG     = 474 // { int sctp_generic_recvmsg(int sd, struct iovec *iov, int iovlen, \
-	SYS_PREAD                    = 475 // { ssize_t pread(int fd, void *buf, \
-	SYS_PWRITE                   = 476 // { ssize_t pwrite(int fd, const void *buf, \
-	SYS_MMAP                     = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
-	SYS_LSEEK                    = 478 // { off_t lseek(int fd, off_t offset, \
-	SYS_TRUNCATE                 = 479 // { int truncate(char *path, off_t length); }
-	SYS_FTRUNCATE                = 480 // { int ftruncate(int fd, off_t length); }
-	SYS_THR_KILL2                = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
-	SYS_SHM_OPEN                 = 482 // { int shm_open(const char *path, int flags, \
-	SYS_SHM_UNLINK               = 483 // { int shm_unlink(const char *path); }
-	SYS_CPUSET                   = 484 // { int cpuset(cpusetid_t *setid); }
-	SYS_CPUSET_SETID             = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
-	SYS_CPUSET_GETID             = 486 // { int cpuset_getid(cpulevel_t level, \
-	SYS_CPUSET_GETAFFINITY       = 487 // { int cpuset_getaffinity(cpulevel_t level, \
-	SYS_CPUSET_SETAFFINITY       = 488 // { int cpuset_setaffinity(cpulevel_t level, \
-	SYS_FACCESSAT                = 489 // { int faccessat(int fd, char *path, int amode, \
-	SYS_FCHMODAT                 = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
-	SYS_FCHOWNAT                 = 491 // { int fchownat(int fd, char *path, uid_t uid, \
-	SYS_FEXECVE                  = 492 // { int fexecve(int fd, char **argv, \
-	SYS_FSTATAT                  = 493 // { int fstatat(int fd, char *path, \
-	SYS_FUTIMESAT                = 494 // { int futimesat(int fd, char *path, \
-	SYS_LINKAT                   = 495 // { int linkat(int fd1, char *path1, int fd2, \
-	SYS_MKDIRAT                  = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
-	SYS_MKFIFOAT                 = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
-	SYS_MKNODAT                  = 498 // { int mknodat(int fd, char *path, mode_t mode, \
-	SYS_OPENAT                   = 499 // { int openat(int fd, char *path, int flag, \
-	SYS_READLINKAT               = 500 // { int readlinkat(int fd, char *path, char *buf, \
-	SYS_RENAMEAT                 = 501 // { int renameat(int oldfd, char *old, int newfd, \
-	SYS_SYMLINKAT                = 502 // { int symlinkat(char *path1, int fd, \
-	SYS_UNLINKAT                 = 503 // { int unlinkat(int fd, char *path, int flag); }
-	SYS_POSIX_OPENPT             = 504 // { int posix_openpt(int flags); }
-	SYS_JAIL_GET                 = 506 // { int jail_get(struct iovec *iovp, \
-	SYS_JAIL_SET                 = 507 // { int jail_set(struct iovec *iovp, \
-	SYS_JAIL_REMOVE              = 508 // { int jail_remove(int jid); }
-	SYS_CLOSEFROM                = 509 // { int closefrom(int lowfd); }
-	SYS_LPATHCONF                = 513 // { int lpathconf(char *path, int name); }
-	SYS_CAP_NEW                  = 514 // { int cap_new(int fd, uint64_t rights); }
-	SYS_CAP_GETRIGHTS            = 515 // { int cap_getrights(int fd, \
-	SYS_CAP_ENTER                = 516 // { int cap_enter(void); }
-	SYS_CAP_GETMODE              = 517 // { int cap_getmode(u_int *modep); }
-	SYS_PDFORK                   = 518 // { int pdfork(int *fdp, int flags); }
-	SYS_PDKILL                   = 519 // { int pdkill(int fd, int signum); }
-	SYS_PDGETPID                 = 520 // { int pdgetpid(int fd, pid_t *pidp); }
-	SYS_PSELECT                  = 522 // { int pselect(int nd, fd_set *in, \
-	SYS_GETLOGINCLASS            = 523 // { int getloginclass(char *namebuf, \
-	SYS_SETLOGINCLASS            = 524 // { int setloginclass(const char *namebuf); }
-	SYS_RCTL_GET_RACCT           = 525 // { int rctl_get_racct(const void *inbufp, \
-	SYS_RCTL_GET_RULES           = 526 // { int rctl_get_rules(const void *inbufp, \
-	SYS_RCTL_GET_LIMITS          = 527 // { int rctl_get_limits(const void *inbufp, \
-	SYS_RCTL_ADD_RULE            = 528 // { int rctl_add_rule(const void *inbufp, \
-	SYS_RCTL_REMOVE_RULE         = 529 // { int rctl_remove_rule(const void *inbufp, \
-	SYS_POSIX_FALLOCATE          = 530 // { int posix_fallocate(int fd, \
-	SYS_POSIX_FADVISE            = 531 // { int posix_fadvise(int fd, off_t offset, \
-	SYS_WAIT6                    = 532 // { int wait6(idtype_t idtype, id_t id, \
-	SYS_BINDAT                   = 538 // { int bindat(int fd, int s, caddr_t name, \
-	SYS_CONNECTAT                = 539 // { int connectat(int fd, int s, caddr_t name, \
-	SYS_CHFLAGSAT                = 540 // { int chflagsat(int fd, const char *path, \
-	SYS_ACCEPT4                  = 541 // { int accept4(int s, \
-	SYS_PIPE2                    = 542 // { int pipe2(int *fildes, int flags); }
-	SYS_PROCCTL                  = 544 // { int procctl(idtype_t idtype, id_t id, \
-	SYS_PPOLL                    = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_EXIT                   = 1   // { void sys_exit(int rval); } exit \
+	SYS_FORK                   = 2   // { int fork(void); }
+	SYS_READ                   = 3   // { ssize_t read(int fd, void *buf, \
+	SYS_WRITE                  = 4   // { ssize_t write(int fd, const void *buf, \
+	SYS_OPEN                   = 5   // { int open(char *path, int flags, int mode); }
+	SYS_CLOSE                  = 6   // { int close(int fd); }
+	SYS_WAIT4                  = 7   // { int wait4(int pid, int *status, \
+	SYS_LINK                   = 9   // { int link(char *path, char *link); }
+	SYS_UNLINK                 = 10  // { int unlink(char *path); }
+	SYS_CHDIR                  = 12  // { int chdir(char *path); }
+	SYS_FCHDIR                 = 13  // { int fchdir(int fd); }
+	SYS_MKNOD                  = 14  // { int mknod(char *path, int mode, int dev); }
+	SYS_CHMOD                  = 15  // { int chmod(char *path, int mode); }
+	SYS_CHOWN                  = 16  // { int chown(char *path, int uid, int gid); }
+	SYS_OBREAK                 = 17  // { int obreak(char *nsize); } break \
+	SYS_GETPID                 = 20  // { pid_t getpid(void); }
+	SYS_MOUNT                  = 21  // { int mount(char *type, char *path, \
+	SYS_UNMOUNT                = 22  // { int unmount(char *path, int flags); }
+	SYS_SETUID                 = 23  // { int setuid(uid_t uid); }
+	SYS_GETUID                 = 24  // { uid_t getuid(void); }
+	SYS_GETEUID                = 25  // { uid_t geteuid(void); }
+	SYS_PTRACE                 = 26  // { int ptrace(int req, pid_t pid, \
+	SYS_RECVMSG                = 27  // { int recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG                = 28  // { int sendmsg(int s, struct msghdr *msg, \
+	SYS_RECVFROM               = 29  // { int recvfrom(int s, caddr_t buf, \
+	SYS_ACCEPT                 = 30  // { int accept(int s, \
+	SYS_GETPEERNAME            = 31  // { int getpeername(int fdes, \
+	SYS_GETSOCKNAME            = 32  // { int getsockname(int fdes, \
+	SYS_ACCESS                 = 33  // { int access(char *path, int amode); }
+	SYS_CHFLAGS                = 34  // { int chflags(const char *path, u_long flags); }
+	SYS_FCHFLAGS               = 35  // { int fchflags(int fd, u_long flags); }
+	SYS_SYNC                   = 36  // { int sync(void); }
+	SYS_KILL                   = 37  // { int kill(int pid, int signum); }
+	SYS_GETPPID                = 39  // { pid_t getppid(void); }
+	SYS_DUP                    = 41  // { int dup(u_int fd); }
+	SYS_PIPE                   = 42  // { int pipe(void); }
+	SYS_GETEGID                = 43  // { gid_t getegid(void); }
+	SYS_PROFIL                 = 44  // { int profil(caddr_t samples, size_t size, \
+	SYS_KTRACE                 = 45  // { int ktrace(const char *fname, int ops, \
+	SYS_GETGID                 = 47  // { gid_t getgid(void); }
+	SYS_GETLOGIN               = 49  // { int getlogin(char *namebuf, u_int \
+	SYS_SETLOGIN               = 50  // { int setlogin(char *namebuf); }
+	SYS_ACCT                   = 51  // { int acct(char *path); }
+	SYS_SIGALTSTACK            = 53  // { int sigaltstack(stack_t *ss, \
+	SYS_IOCTL                  = 54  // { int ioctl(int fd, u_long com, \
+	SYS_REBOOT                 = 55  // { int reboot(int opt); }
+	SYS_REVOKE                 = 56  // { int revoke(char *path); }
+	SYS_SYMLINK                = 57  // { int symlink(char *path, char *link); }
+	SYS_READLINK               = 58  // { ssize_t readlink(char *path, char *buf, \
+	SYS_EXECVE                 = 59  // { int execve(char *fname, char **argv, \
+	SYS_UMASK                  = 60  // { int umask(int newmask); } umask umask_args \
+	SYS_CHROOT                 = 61  // { int chroot(char *path); }
+	SYS_MSYNC                  = 65  // { int msync(void *addr, size_t len, \
+	SYS_VFORK                  = 66  // { int vfork(void); }
+	SYS_SBRK                   = 69  // { int sbrk(int incr); }
+	SYS_SSTK                   = 70  // { int sstk(int incr); }
+	SYS_OVADVISE               = 72  // { int ovadvise(int anom); } vadvise \
+	SYS_MUNMAP                 = 73  // { int munmap(void *addr, size_t len); }
+	SYS_MPROTECT               = 74  // { int mprotect(const void *addr, size_t len, \
+	SYS_MADVISE                = 75  // { int madvise(void *addr, size_t len, \
+	SYS_MINCORE                = 78  // { int mincore(const void *addr, size_t len, \
+	SYS_GETGROUPS              = 79  // { int getgroups(u_int gidsetsize, \
+	SYS_SETGROUPS              = 80  // { int setgroups(u_int gidsetsize, \
+	SYS_GETPGRP                = 81  // { int getpgrp(void); }
+	SYS_SETPGID                = 82  // { int setpgid(int pid, int pgid); }
+	SYS_SETITIMER              = 83  // { int setitimer(u_int which, struct \
+	SYS_SWAPON                 = 85  // { int swapon(char *name); }
+	SYS_GETITIMER              = 86  // { int getitimer(u_int which, \
+	SYS_GETDTABLESIZE          = 89  // { int getdtablesize(void); }
+	SYS_DUP2                   = 90  // { int dup2(u_int from, u_int to); }
+	SYS_FCNTL                  = 92  // { int fcntl(int fd, int cmd, long arg); }
+	SYS_SELECT                 = 93  // { int select(int nd, fd_set *in, fd_set *ou, \
+	SYS_FSYNC                  = 95  // { int fsync(int fd); }
+	SYS_SETPRIORITY            = 96  // { int setpriority(int which, int who, \
+	SYS_SOCKET                 = 97  // { int socket(int domain, int type, \
+	SYS_CONNECT                = 98  // { int connect(int s, caddr_t name, \
+	SYS_GETPRIORITY            = 100 // { int getpriority(int which, int who); }
+	SYS_BIND                   = 104 // { int bind(int s, caddr_t name, \
+	SYS_SETSOCKOPT             = 105 // { int setsockopt(int s, int level, int name, \
+	SYS_LISTEN                 = 106 // { int listen(int s, int backlog); }
+	SYS_GETTIMEOFDAY           = 116 // { int gettimeofday(struct timeval *tp, \
+	SYS_GETRUSAGE              = 117 // { int getrusage(int who, \
+	SYS_GETSOCKOPT             = 118 // { int getsockopt(int s, int level, int name, \
+	SYS_READV                  = 120 // { int readv(int fd, struct iovec *iovp, \
+	SYS_WRITEV                 = 121 // { int writev(int fd, struct iovec *iovp, \
+	SYS_SETTIMEOFDAY           = 122 // { int settimeofday(struct timeval *tv, \
+	SYS_FCHOWN                 = 123 // { int fchown(int fd, int uid, int gid); }
+	SYS_FCHMOD                 = 124 // { int fchmod(int fd, int mode); }
+	SYS_SETREUID               = 126 // { int setreuid(int ruid, int euid); }
+	SYS_SETREGID               = 127 // { int setregid(int rgid, int egid); }
+	SYS_RENAME                 = 128 // { int rename(char *from, char *to); }
+	SYS_FLOCK                  = 131 // { int flock(int fd, int how); }
+	SYS_MKFIFO                 = 132 // { int mkfifo(char *path, int mode); }
+	SYS_SENDTO                 = 133 // { int sendto(int s, caddr_t buf, size_t len, \
+	SYS_SHUTDOWN               = 134 // { int shutdown(int s, int how); }
+	SYS_SOCKETPAIR             = 135 // { int socketpair(int domain, int type, \
+	SYS_MKDIR                  = 136 // { int mkdir(char *path, int mode); }
+	SYS_RMDIR                  = 137 // { int rmdir(char *path); }
+	SYS_UTIMES                 = 138 // { int utimes(char *path, \
+	SYS_ADJTIME                = 140 // { int adjtime(struct timeval *delta, \
+	SYS_SETSID                 = 147 // { int setsid(void); }
+	SYS_QUOTACTL               = 148 // { int quotactl(char *path, int cmd, int uid, \
+	SYS_LGETFH                 = 160 // { int lgetfh(char *fname, \
+	SYS_GETFH                  = 161 // { int getfh(char *fname, \
+	SYS_SYSARCH                = 165 // { int sysarch(int op, char *parms); }
+	SYS_RTPRIO                 = 166 // { int rtprio(int function, pid_t pid, \
+	SYS_FREEBSD6_PREAD         = 173 // { ssize_t freebsd6_pread(int fd, void *buf, \
+	SYS_FREEBSD6_PWRITE        = 174 // { ssize_t freebsd6_pwrite(int fd, \
+	SYS_SETFIB                 = 175 // { int setfib(int fibnum); }
+	SYS_NTP_ADJTIME            = 176 // { int ntp_adjtime(struct timex *tp); }
+	SYS_SETGID                 = 181 // { int setgid(gid_t gid); }
+	SYS_SETEGID                = 182 // { int setegid(gid_t egid); }
+	SYS_SETEUID                = 183 // { int seteuid(uid_t euid); }
+	SYS_STAT                   = 188 // { int stat(char *path, struct stat *ub); }
+	SYS_FSTAT                  = 189 // { int fstat(int fd, struct stat *sb); }
+	SYS_LSTAT                  = 190 // { int lstat(char *path, struct stat *ub); }
+	SYS_PATHCONF               = 191 // { int pathconf(char *path, int name); }
+	SYS_FPATHCONF              = 192 // { int fpathconf(int fd, int name); }
+	SYS_GETRLIMIT              = 194 // { int getrlimit(u_int which, \
+	SYS_SETRLIMIT              = 195 // { int setrlimit(u_int which, \
+	SYS_GETDIRENTRIES          = 196 // { int getdirentries(int fd, char *buf, \
+	SYS_FREEBSD6_MMAP          = 197 // { caddr_t freebsd6_mmap(caddr_t addr, \
+	SYS_FREEBSD6_LSEEK         = 199 // { off_t freebsd6_lseek(int fd, int pad, \
+	SYS_FREEBSD6_TRUNCATE      = 200 // { int freebsd6_truncate(char *path, int pad, \
+	SYS_FREEBSD6_FTRUNCATE     = 201 // { int freebsd6_ftruncate(int fd, int pad, \
+	SYS___SYSCTL               = 202 // { int __sysctl(int *name, u_int namelen, \
+	SYS_MLOCK                  = 203 // { int mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK                = 204 // { int munlock(const void *addr, size_t len); }
+	SYS_UNDELETE               = 205 // { int undelete(char *path); }
+	SYS_FUTIMES                = 206 // { int futimes(int fd, struct timeval *tptr); }
+	SYS_GETPGID                = 207 // { int getpgid(pid_t pid); }
+	SYS_POLL                   = 209 // { int poll(struct pollfd *fds, u_int nfds, \
+	SYS_CLOCK_GETTIME          = 232 // { int clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME          = 233 // { int clock_settime( \
+	SYS_CLOCK_GETRES           = 234 // { int clock_getres(clockid_t clock_id, \
+	SYS_KTIMER_CREATE          = 235 // { int ktimer_create(clockid_t clock_id, \
+	SYS_KTIMER_DELETE          = 236 // { int ktimer_delete(int timerid); }
+	SYS_KTIMER_SETTIME         = 237 // { int ktimer_settime(int timerid, int flags, \
+	SYS_KTIMER_GETTIME         = 238 // { int ktimer_gettime(int timerid, struct \
+	SYS_KTIMER_GETOVERRUN      = 239 // { int ktimer_getoverrun(int timerid); }
+	SYS_NANOSLEEP              = 240 // { int nanosleep(const struct timespec *rqtp, \
+	SYS_FFCLOCK_GETCOUNTER     = 241 // { int ffclock_getcounter(ffcounter *ffcount); }
+	SYS_FFCLOCK_SETESTIMATE    = 242 // { int ffclock_setestimate( \
+	SYS_FFCLOCK_GETESTIMATE    = 243 // { int ffclock_getestimate( \
+	SYS_CLOCK_GETCPUCLOCKID2   = 247 // { int clock_getcpuclockid2(id_t id,\
+	SYS_NTP_GETTIME            = 248 // { int ntp_gettime(struct ntptimeval *ntvp); }
+	SYS_MINHERIT               = 250 // { int minherit(void *addr, size_t len, \
+	SYS_RFORK                  = 251 // { int rfork(int flags); }
+	SYS_OPENBSD_POLL           = 252 // { int openbsd_poll(struct pollfd *fds, \
+	SYS_ISSETUGID              = 253 // { int issetugid(void); }
+	SYS_LCHOWN                 = 254 // { int lchown(char *path, int uid, int gid); }
+	SYS_GETDENTS               = 272 // { int getdents(int fd, char *buf, \
+	SYS_LCHMOD                 = 274 // { int lchmod(char *path, mode_t mode); }
+	SYS_LUTIMES                = 276 // { int lutimes(char *path, \
+	SYS_NSTAT                  = 278 // { int nstat(char *path, struct nstat *ub); }
+	SYS_NFSTAT                 = 279 // { int nfstat(int fd, struct nstat *sb); }
+	SYS_NLSTAT                 = 280 // { int nlstat(char *path, struct nstat *ub); }
+	SYS_PREADV                 = 289 // { ssize_t preadv(int fd, struct iovec *iovp, \
+	SYS_PWRITEV                = 290 // { ssize_t pwritev(int fd, struct iovec *iovp, \
+	SYS_FHOPEN                 = 298 // { int fhopen(const struct fhandle *u_fhp, \
+	SYS_FHSTAT                 = 299 // { int fhstat(const struct fhandle *u_fhp, \
+	SYS_MODNEXT                = 300 // { int modnext(int modid); }
+	SYS_MODSTAT                = 301 // { int modstat(int modid, \
+	SYS_MODFNEXT               = 302 // { int modfnext(int modid); }
+	SYS_MODFIND                = 303 // { int modfind(const char *name); }
+	SYS_KLDLOAD                = 304 // { int kldload(const char *file); }
+	SYS_KLDUNLOAD              = 305 // { int kldunload(int fileid); }
+	SYS_KLDFIND                = 306 // { int kldfind(const char *file); }
+	SYS_KLDNEXT                = 307 // { int kldnext(int fileid); }
+	SYS_KLDSTAT                = 308 // { int kldstat(int fileid, struct \
+	SYS_KLDFIRSTMOD            = 309 // { int kldfirstmod(int fileid); }
+	SYS_GETSID                 = 310 // { int getsid(pid_t pid); }
+	SYS_SETRESUID              = 311 // { int setresuid(uid_t ruid, uid_t euid, \
+	SYS_SETRESGID              = 312 // { int setresgid(gid_t rgid, gid_t egid, \
+	SYS_YIELD                  = 321 // { int yield(void); }
+	SYS_MLOCKALL               = 324 // { int mlockall(int how); }
+	SYS_MUNLOCKALL             = 325 // { int munlockall(void); }
+	SYS___GETCWD               = 326 // { int __getcwd(char *buf, u_int buflen); }
+	SYS_SCHED_SETPARAM         = 327 // { int sched_setparam (pid_t pid, \
+	SYS_SCHED_GETPARAM         = 328 // { int sched_getparam (pid_t pid, struct \
+	SYS_SCHED_SETSCHEDULER     = 329 // { int sched_setscheduler (pid_t pid, int \
+	SYS_SCHED_GETSCHEDULER     = 330 // { int sched_getscheduler (pid_t pid); }
+	SYS_SCHED_YIELD            = 331 // { int sched_yield (void); }
+	SYS_SCHED_GET_PRIORITY_MAX = 332 // { int sched_get_priority_max (int policy); }
+	SYS_SCHED_GET_PRIORITY_MIN = 333 // { int sched_get_priority_min (int policy); }
+	SYS_SCHED_RR_GET_INTERVAL  = 334 // { int sched_rr_get_interval (pid_t pid, \
+	SYS_UTRACE                 = 335 // { int utrace(const void *addr, size_t len); }
+	SYS_KLDSYM                 = 337 // { int kldsym(int fileid, int cmd, \
+	SYS_JAIL                   = 338 // { int jail(struct jail *jail); }
+	SYS_SIGPROCMASK            = 340 // { int sigprocmask(int how, \
+	SYS_SIGSUSPEND             = 341 // { int sigsuspend(const sigset_t *sigmask); }
+	SYS_SIGPENDING             = 343 // { int sigpending(sigset_t *set); }
+	SYS_SIGTIMEDWAIT           = 345 // { int sigtimedwait(const sigset_t *set, \
+	SYS_SIGWAITINFO            = 346 // { int sigwaitinfo(const sigset_t *set, \
+	SYS___ACL_GET_FILE         = 347 // { int __acl_get_file(const char *path, \
+	SYS___ACL_SET_FILE         = 348 // { int __acl_set_file(const char *path, \
+	SYS___ACL_GET_FD           = 349 // { int __acl_get_fd(int filedes, \
+	SYS___ACL_SET_FD           = 350 // { int __acl_set_fd(int filedes, \
+	SYS___ACL_DELETE_FILE      = 351 // { int __acl_delete_file(const char *path, \
+	SYS___ACL_DELETE_FD        = 352 // { int __acl_delete_fd(int filedes, \
+	SYS___ACL_ACLCHECK_FILE    = 353 // { int __acl_aclcheck_file(const char *path, \
+	SYS___ACL_ACLCHECK_FD      = 354 // { int __acl_aclcheck_fd(int filedes, \
+	SYS_EXTATTRCTL             = 355 // { int extattrctl(const char *path, int cmd, \
+	SYS_EXTATTR_SET_FILE       = 356 // { ssize_t extattr_set_file( \
+	SYS_EXTATTR_GET_FILE       = 357 // { ssize_t extattr_get_file( \
+	SYS_EXTATTR_DELETE_FILE    = 358 // { int extattr_delete_file(const char *path, \
+	SYS_GETRESUID              = 360 // { int getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_GETRESGID              = 361 // { int getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_KQUEUE                 = 362 // { int kqueue(void); }
+	SYS_KEVENT                 = 363 // { int kevent(int fd, \
+	SYS_EXTATTR_SET_FD         = 371 // { ssize_t extattr_set_fd(int fd, \
+	SYS_EXTATTR_GET_FD         = 372 // { ssize_t extattr_get_fd(int fd, \
+	SYS_EXTATTR_DELETE_FD      = 373 // { int extattr_delete_fd(int fd, \
+	SYS___SETUGID              = 374 // { int __setugid(int flag); }
+	SYS_EACCESS                = 376 // { int eaccess(char *path, int amode); }
+	SYS_NMOUNT                 = 378 // { int nmount(struct iovec *iovp, \
+	SYS___MAC_GET_PROC         = 384 // { int __mac_get_proc(struct mac *mac_p); }
+	SYS___MAC_SET_PROC         = 385 // { int __mac_set_proc(struct mac *mac_p); }
+	SYS___MAC_GET_FD           = 386 // { int __mac_get_fd(int fd, \
+	SYS___MAC_GET_FILE         = 387 // { int __mac_get_file(const char *path_p, \
+	SYS___MAC_SET_FD           = 388 // { int __mac_set_fd(int fd, \
+	SYS___MAC_SET_FILE         = 389 // { int __mac_set_file(const char *path_p, \
+	SYS_KENV                   = 390 // { int kenv(int what, const char *name, \
+	SYS_LCHFLAGS               = 391 // { int lchflags(const char *path, \
+	SYS_UUIDGEN                = 392 // { int uuidgen(struct uuid *store, \
+	SYS_SENDFILE               = 393 // { int sendfile(int fd, int s, off_t offset, \
+	SYS_MAC_SYSCALL            = 394 // { int mac_syscall(const char *policy, \
+	SYS_GETFSSTAT              = 395 // { int getfsstat(struct statfs *buf, \
+	SYS_STATFS                 = 396 // { int statfs(char *path, \
+	SYS_FSTATFS                = 397 // { int fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS               = 398 // { int fhstatfs(const struct fhandle *u_fhp, \
+	SYS___MAC_GET_PID          = 409 // { int __mac_get_pid(pid_t pid, \
+	SYS___MAC_GET_LINK         = 410 // { int __mac_get_link(const char *path_p, \
+	SYS___MAC_SET_LINK         = 411 // { int __mac_set_link(const char *path_p, \
+	SYS_EXTATTR_SET_LINK       = 412 // { ssize_t extattr_set_link( \
+	SYS_EXTATTR_GET_LINK       = 413 // { ssize_t extattr_get_link( \
+	SYS_EXTATTR_DELETE_LINK    = 414 // { int extattr_delete_link( \
+	SYS___MAC_EXECVE           = 415 // { int __mac_execve(char *fname, char **argv, \
+	SYS_SIGACTION              = 416 // { int sigaction(int sig, \
+	SYS_SIGRETURN              = 417 // { int sigreturn( \
+	SYS_GETCONTEXT             = 421 // { int getcontext(struct __ucontext *ucp); }
+	SYS_SETCONTEXT             = 422 // { int setcontext( \
+	SYS_SWAPCONTEXT            = 423 // { int swapcontext(struct __ucontext *oucp, \
+	SYS_SWAPOFF                = 424 // { int swapoff(const char *name); }
+	SYS___ACL_GET_LINK         = 425 // { int __acl_get_link(const char *path, \
+	SYS___ACL_SET_LINK         = 426 // { int __acl_set_link(const char *path, \
+	SYS___ACL_DELETE_LINK      = 427 // { int __acl_delete_link(const char *path, \
+	SYS___ACL_ACLCHECK_LINK    = 428 // { int __acl_aclcheck_link(const char *path, \
+	SYS_SIGWAIT                = 429 // { int sigwait(const sigset_t *set, \
+	SYS_THR_CREATE             = 430 // { int thr_create(ucontext_t *ctx, long *id, \
+	SYS_THR_EXIT               = 431 // { void thr_exit(long *state); }
+	SYS_THR_SELF               = 432 // { int thr_self(long *id); }
+	SYS_THR_KILL               = 433 // { int thr_kill(long id, int sig); }
+	SYS__UMTX_LOCK             = 434 // { int _umtx_lock(struct umtx *umtx); }
+	SYS__UMTX_UNLOCK           = 435 // { int _umtx_unlock(struct umtx *umtx); }
+	SYS_JAIL_ATTACH            = 436 // { int jail_attach(int jid); }
+	SYS_EXTATTR_LIST_FD        = 437 // { ssize_t extattr_list_fd(int fd, \
+	SYS_EXTATTR_LIST_FILE      = 438 // { ssize_t extattr_list_file( \
+	SYS_EXTATTR_LIST_LINK      = 439 // { ssize_t extattr_list_link( \
+	SYS_THR_SUSPEND            = 442 // { int thr_suspend( \
+	SYS_THR_WAKE               = 443 // { int thr_wake(long id); }
+	SYS_KLDUNLOADF             = 444 // { int kldunloadf(int fileid, int flags); }
+	SYS_AUDIT                  = 445 // { int audit(const void *record, \
+	SYS_AUDITON                = 446 // { int auditon(int cmd, void *data, \
+	SYS_GETAUID                = 447 // { int getauid(uid_t *auid); }
+	SYS_SETAUID                = 448 // { int setauid(uid_t *auid); }
+	SYS_GETAUDIT               = 449 // { int getaudit(struct auditinfo *auditinfo); }
+	SYS_SETAUDIT               = 450 // { int setaudit(struct auditinfo *auditinfo); }
+	SYS_GETAUDIT_ADDR          = 451 // { int getaudit_addr( \
+	SYS_SETAUDIT_ADDR          = 452 // { int setaudit_addr( \
+	SYS_AUDITCTL               = 453 // { int auditctl(char *path); }
+	SYS__UMTX_OP               = 454 // { int _umtx_op(void *obj, int op, \
+	SYS_THR_NEW                = 455 // { int thr_new(struct thr_param *param, \
+	SYS_SIGQUEUE               = 456 // { int sigqueue(pid_t pid, int signum, void *value); }
+	SYS_ABORT2                 = 463 // { int abort2(const char *why, int nargs, void **args); }
+	SYS_THR_SET_NAME           = 464 // { int thr_set_name(long id, const char *name); }
+	SYS_RTPRIO_THREAD          = 466 // { int rtprio_thread(int function, \
+	SYS_PREAD                  = 475 // { ssize_t pread(int fd, void *buf, \
+	SYS_PWRITE                 = 476 // { ssize_t pwrite(int fd, const void *buf, \
+	SYS_MMAP                   = 477 // { caddr_t mmap(caddr_t addr, size_t len, \
+	SYS_LSEEK                  = 478 // { off_t lseek(int fd, off_t offset, \
+	SYS_TRUNCATE               = 479 // { int truncate(char *path, off_t length); }
+	SYS_FTRUNCATE              = 480 // { int ftruncate(int fd, off_t length); }
+	SYS_THR_KILL2              = 481 // { int thr_kill2(pid_t pid, long id, int sig); }
+	SYS_SHM_OPEN               = 482 // { int shm_open(const char *path, int flags, \
+	SYS_SHM_UNLINK             = 483 // { int shm_unlink(const char *path); }
+	SYS_CPUSET                 = 484 // { int cpuset(cpusetid_t *setid); }
+	SYS_CPUSET_SETID           = 485 // { int cpuset_setid(cpuwhich_t which, id_t id, \
+	SYS_CPUSET_GETID           = 486 // { int cpuset_getid(cpulevel_t level, \
+	SYS_CPUSET_GETAFFINITY     = 487 // { int cpuset_getaffinity(cpulevel_t level, \
+	SYS_CPUSET_SETAFFINITY     = 488 // { int cpuset_setaffinity(cpulevel_t level, \
+	SYS_FACCESSAT              = 489 // { int faccessat(int fd, char *path, int amode, \
+	SYS_FCHMODAT               = 490 // { int fchmodat(int fd, char *path, mode_t mode, \
+	SYS_FCHOWNAT               = 491 // { int fchownat(int fd, char *path, uid_t uid, \
+	SYS_FEXECVE                = 492 // { int fexecve(int fd, char **argv, \
+	SYS_FSTATAT                = 493 // { int fstatat(int fd, char *path, \
+	SYS_FUTIMESAT              = 494 // { int futimesat(int fd, char *path, \
+	SYS_LINKAT                 = 495 // { int linkat(int fd1, char *path1, int fd2, \
+	SYS_MKDIRAT                = 496 // { int mkdirat(int fd, char *path, mode_t mode); }
+	SYS_MKFIFOAT               = 497 // { int mkfifoat(int fd, char *path, mode_t mode); }
+	SYS_MKNODAT                = 498 // { int mknodat(int fd, char *path, mode_t mode, \
+	SYS_OPENAT                 = 499 // { int openat(int fd, char *path, int flag, \
+	SYS_READLINKAT             = 500 // { int readlinkat(int fd, char *path, char *buf, \
+	SYS_RENAMEAT               = 501 // { int renameat(int oldfd, char *old, int newfd, \
+	SYS_SYMLINKAT              = 502 // { int symlinkat(char *path1, int fd, \
+	SYS_UNLINKAT               = 503 // { int unlinkat(int fd, char *path, int flag); }
+	SYS_POSIX_OPENPT           = 504 // { int posix_openpt(int flags); }
+	SYS_JAIL_GET               = 506 // { int jail_get(struct iovec *iovp, \
+	SYS_JAIL_SET               = 507 // { int jail_set(struct iovec *iovp, \
+	SYS_JAIL_REMOVE            = 508 // { int jail_remove(int jid); }
+	SYS_CLOSEFROM              = 509 // { int closefrom(int lowfd); }
+	SYS_LPATHCONF              = 513 // { int lpathconf(char *path, int name); }
+	SYS___CAP_RIGHTS_GET       = 515 // { int __cap_rights_get(int version, \
+	SYS_CAP_ENTER              = 516 // { int cap_enter(void); }
+	SYS_CAP_GETMODE            = 517 // { int cap_getmode(u_int *modep); }
+	SYS_PDFORK                 = 518 // { int pdfork(int *fdp, int flags); }
+	SYS_PDKILL                 = 519 // { int pdkill(int fd, int signum); }
+	SYS_PDGETPID               = 520 // { int pdgetpid(int fd, pid_t *pidp); }
+	SYS_PSELECT                = 522 // { int pselect(int nd, fd_set *in, \
+	SYS_GETLOGINCLASS          = 523 // { int getloginclass(char *namebuf, \
+	SYS_SETLOGINCLASS          = 524 // { int setloginclass(const char *namebuf); }
+	SYS_RCTL_GET_RACCT         = 525 // { int rctl_get_racct(const void *inbufp, \
+	SYS_RCTL_GET_RULES         = 526 // { int rctl_get_rules(const void *inbufp, \
+	SYS_RCTL_GET_LIMITS        = 527 // { int rctl_get_limits(const void *inbufp, \
+	SYS_RCTL_ADD_RULE          = 528 // { int rctl_add_rule(const void *inbufp, \
+	SYS_RCTL_REMOVE_RULE       = 529 // { int rctl_remove_rule(const void *inbufp, \
+	SYS_POSIX_FALLOCATE        = 530 // { int posix_fallocate(int fd, \
+	SYS_POSIX_FADVISE          = 531 // { int posix_fadvise(int fd, off_t offset, \
+	SYS_WAIT6                  = 532 // { int wait6(idtype_t idtype, id_t id, \
+	SYS_CAP_RIGHTS_LIMIT       = 533 // { int cap_rights_limit(int fd, \
+	SYS_CAP_IOCTLS_LIMIT       = 534 // { int cap_ioctls_limit(int fd, \
+	SYS_CAP_IOCTLS_GET         = 535 // { ssize_t cap_ioctls_get(int fd, \
+	SYS_CAP_FCNTLS_LIMIT       = 536 // { int cap_fcntls_limit(int fd, \
+	SYS_CAP_FCNTLS_GET         = 537 // { int cap_fcntls_get(int fd, \
+	SYS_BINDAT                 = 538 // { int bindat(int fd, int s, caddr_t name, \
+	SYS_CONNECTAT              = 539 // { int connectat(int fd, int s, caddr_t name, \
+	SYS_CHFLAGSAT              = 540 // { int chflagsat(int fd, const char *path, \
+	SYS_ACCEPT4                = 541 // { int accept4(int s, \
+	SYS_PIPE2                  = 542 // { int pipe2(int *fildes, int flags); }
+	SYS_PROCCTL                = 544 // { int procctl(idtype_t idtype, id_t id, \
+	SYS_PPOLL                  = 545 // { int ppoll(struct pollfd *fds, u_int nfds, \
+	SYS_FUTIMENS               = 546 // { int futimens(int fd, \
+	SYS_UTIMENSAT              = 547 // { int utimensat(int fd, \
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
index 206b3c2815..95ab12903e 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_386.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m32 -D__i386__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m32 /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,linux
 
@@ -385,4 +385,6 @@ const (
 	SYS_PKEY_MPROTECT          = 380
 	SYS_PKEY_ALLOC             = 381
 	SYS_PKEY_FREE              = 382
+	SYS_STATX                  = 383
+	SYS_ARCH_PRCTL             = 384
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
index 904231736a..c5dabf2e45 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_amd64.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -m64 /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,linux
 
@@ -338,4 +338,5 @@ const (
 	SYS_PKEY_MPROTECT          = 329
 	SYS_PKEY_ALLOC             = 330
 	SYS_PKEY_FREE              = 331
+	SYS_STATX                  = 332
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
index e3e6745629..ab7fa5fd39 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m32 -D__ARM_EABI__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,linux
 
@@ -358,4 +358,5 @@ const (
 	SYS_PKEY_MPROTECT          = 394
 	SYS_PKEY_ALLOC             = 395
 	SYS_PKEY_FREE              = 396
+	SYS_STATX                  = 397
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
index 90e43d0061..b1c6b4bd3b 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_arm64.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm64,linux
 
@@ -282,4 +282,5 @@ const (
 	SYS_PKEY_MPROTECT          = 288
 	SYS_PKEY_ALLOC             = 289
 	SYS_PKEY_FREE              = 290
+	SYS_STATX                  = 291
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
index 77ff644d7d..2e9aa7a3e7 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m32 -D_MIPS_SIM=_MIPS_SIM_ABI32 -D__MIPSEB__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips,linux
 
@@ -371,4 +371,5 @@ const (
 	SYS_PKEY_MPROTECT          = 4363
 	SYS_PKEY_ALLOC             = 4364
 	SYS_PKEY_FREE              = 4365
+	SYS_STATX                  = 4366
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
index fc86fcdb6b..92827635aa 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D_MIPS_SIM=_MIPS_SIM_ABI64 -D__MIPSEB__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips64,linux
 
@@ -331,4 +331,5 @@ const (
 	SYS_PKEY_MPROTECT          = 5323
 	SYS_PKEY_ALLOC             = 5324
 	SYS_PKEY_FREE              = 5325
+	SYS_STATX                  = 5326
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
index 993873c379..45bd3fd6c8 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mips64le.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D_MIPS_SIM=_MIPS_SIM_ABI64 -D__MIPSEL__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mips64le,linux
 
@@ -331,4 +331,5 @@ const (
 	SYS_PKEY_MPROTECT          = 5323
 	SYS_PKEY_ALLOC             = 5324
 	SYS_PKEY_FREE              = 5325
+	SYS_STATX                  = 5326
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
index f0155ba5a6..62ccac4b74 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_mipsle.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m32 -D_MIPS_SIM=_MIPS_SIM_ABI32 -D__MIPSEL__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build mipsle,linux
 
@@ -371,4 +371,5 @@ const (
 	SYS_PKEY_MPROTECT          = 4363
 	SYS_PKEY_ALLOC             = 4364
 	SYS_PKEY_FREE              = 4365
+	SYS_STATX                  = 4366
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
index 0deec82c7c..384d49bfa5 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D__powerpc64__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build ppc64,linux
 
@@ -366,4 +366,8 @@ const (
 	SYS_PREADV2                = 380
 	SYS_PWRITEV2               = 381
 	SYS_KEXEC_FILE_LOAD        = 382
+	SYS_STATX                  = 383
+	SYS_PKEY_ALLOC             = 384
+	SYS_PKEY_FREE              = 385
+	SYS_PKEY_MPROTECT          = 386
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
index 3f701be7ca..9623248a5e 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_ppc64le.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D__powerpc64__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build ppc64le,linux
 
@@ -366,4 +366,8 @@ const (
 	SYS_PREADV2                = 380
 	SYS_PWRITEV2               = 381
 	SYS_KEXEC_FILE_LOAD        = 382
+	SYS_STATX                  = 383
+	SYS_PKEY_ALLOC             = 384
+	SYS_PKEY_FREE              = 385
+	SYS_PKEY_MPROTECT          = 386
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
index 8b35997d6e..ed92409d97 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_linux_s390x.go
@@ -1,5 +1,5 @@
-// mksysnum_linux.pl -Ilinux/usr/include -m64 -D__s390x__ linux/usr/include/asm/unistd.h
-// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+// linux/mksysnum.pl -Wall -Werror -static -I/tmp/include -fsigned-char /tmp/include/asm/unistd.h
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build s390x,linux
 
@@ -109,6 +109,7 @@ const (
 	SYS_PERSONALITY            = 136
 	SYS_AFS_SYSCALL            = 137
 	SYS_GETDENTS               = 141
+	SYS_SELECT                 = 142
 	SYS_FLOCK                  = 143
 	SYS_MSYNC                  = 144
 	SYS_READV                  = 145
@@ -151,6 +152,26 @@ const (
 	SYS_GETPMSG                = 188
 	SYS_PUTPMSG                = 189
 	SYS_VFORK                  = 190
+	SYS_GETRLIMIT              = 191
+	SYS_LCHOWN                 = 198
+	SYS_GETUID                 = 199
+	SYS_GETGID                 = 200
+	SYS_GETEUID                = 201
+	SYS_GETEGID                = 202
+	SYS_SETREUID               = 203
+	SYS_SETREGID               = 204
+	SYS_GETGROUPS              = 205
+	SYS_SETGROUPS              = 206
+	SYS_FCHOWN                 = 207
+	SYS_SETRESUID              = 208
+	SYS_GETRESUID              = 209
+	SYS_SETRESGID              = 210
+	SYS_GETRESGID              = 211
+	SYS_CHOWN                  = 212
+	SYS_SETUID                 = 213
+	SYS_SETGID                 = 214
+	SYS_SETFSUID               = 215
+	SYS_SETFSGID               = 216
 	SYS_PIVOT_ROOT             = 217
 	SYS_MINCORE                = 218
 	SYS_MADVISE                = 219
@@ -222,6 +243,7 @@ const (
 	SYS_MKNODAT                = 290
 	SYS_FCHOWNAT               = 291
 	SYS_FUTIMESAT              = 292
+	SYS_NEWFSTATAT             = 293
 	SYS_UNLINKAT               = 294
 	SYS_RENAMEAT               = 295
 	SYS_LINKAT                 = 296
@@ -306,26 +328,7 @@ const (
 	SYS_COPY_FILE_RANGE        = 375
 	SYS_PREADV2                = 376
 	SYS_PWRITEV2               = 377
-	SYS_SELECT                 = 142
-	SYS_GETRLIMIT              = 191
-	SYS_LCHOWN                 = 198
-	SYS_GETUID                 = 199
-	SYS_GETGID                 = 200
-	SYS_GETEUID                = 201
-	SYS_GETEGID                = 202
-	SYS_SETREUID               = 203
-	SYS_SETREGID               = 204
-	SYS_GETGROUPS              = 205
-	SYS_SETGROUPS              = 206
-	SYS_FCHOWN                 = 207
-	SYS_SETRESUID              = 208
-	SYS_GETRESUID              = 209
-	SYS_SETRESGID              = 210
-	SYS_GETRESGID              = 211
-	SYS_CHOWN                  = 212
-	SYS_SETUID                 = 213
-	SYS_SETGID                 = 214
-	SYS_SETFSUID               = 215
-	SYS_SETFSGID               = 216
-	SYS_NEWFSTATAT             = 293
+	SYS_S390_GUARDED_STORAGE   = 378
+	SYS_STATX                  = 379
+	SYS_S390_STHYI             = 380
 )
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
index f60d8f9882..8afda9c451 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_386.go
@@ -134,6 +134,7 @@ const (
 	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
 	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
 	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
 	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
 	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
 	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
index 48a91d4646..aea8dbec43 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_amd64.go
@@ -134,6 +134,7 @@ const (
 	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
 	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
 	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
 	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
 	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
 	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
index 612ba662cb..c6158a7ef9 100644
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_netbsd_arm.go
@@ -134,6 +134,7 @@ const (
 	SYS_MINHERIT             = 273 // { int|sys||minherit(void *addr, size_t len, int inherit); }
 	SYS_LCHMOD               = 274 // { int|sys||lchmod(const char *path, mode_t mode); }
 	SYS_LCHOWN               = 275 // { int|sys||lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_MSYNC                = 277 // { int|sys|13|msync(void *addr, size_t len, int flags); }
 	SYS___POSIX_CHOWN        = 283 // { int|sys||__posix_chown(const char *path, uid_t uid, gid_t gid); }
 	SYS___POSIX_FCHOWN       = 284 // { int|sys||__posix_fchown(int fd, uid_t uid, gid_t gid); }
 	SYS___POSIX_LCHOWN       = 285 // { int|sys||__posix_lchown(const char *path, uid_t uid, gid_t gid); }
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
new file mode 100644
index 0000000000..32653e53c7
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/zsysnum_openbsd_arm.go
@@ -0,0 +1,213 @@
+// mksysnum_openbsd.pl
+// MACHINE GENERATED BY THE ABOVE COMMAND; DO NOT EDIT
+
+// +build arm,openbsd
+
+package unix
+
+const (
+	SYS_EXIT           = 1   // { void sys_exit(int rval); }
+	SYS_FORK           = 2   // { int sys_fork(void); }
+	SYS_READ           = 3   // { ssize_t sys_read(int fd, void *buf, size_t nbyte); }
+	SYS_WRITE          = 4   // { ssize_t sys_write(int fd, const void *buf, \
+	SYS_OPEN           = 5   // { int sys_open(const char *path, \
+	SYS_CLOSE          = 6   // { int sys_close(int fd); }
+	SYS_GETENTROPY     = 7   // { int sys_getentropy(void *buf, size_t nbyte); }
+	SYS___TFORK        = 8   // { int sys___tfork(const struct __tfork *param, \
+	SYS_LINK           = 9   // { int sys_link(const char *path, const char *link); }
+	SYS_UNLINK         = 10  // { int sys_unlink(const char *path); }
+	SYS_WAIT4          = 11  // { pid_t sys_wait4(pid_t pid, int *status, \
+	SYS_CHDIR          = 12  // { int sys_chdir(const char *path); }
+	SYS_FCHDIR         = 13  // { int sys_fchdir(int fd); }
+	SYS_MKNOD          = 14  // { int sys_mknod(const char *path, mode_t mode, \
+	SYS_CHMOD          = 15  // { int sys_chmod(const char *path, mode_t mode); }
+	SYS_CHOWN          = 16  // { int sys_chown(const char *path, uid_t uid, \
+	SYS_OBREAK         = 17  // { int sys_obreak(char *nsize); } break
+	SYS_GETDTABLECOUNT = 18  // { int sys_getdtablecount(void); }
+	SYS_GETRUSAGE      = 19  // { int sys_getrusage(int who, \
+	SYS_GETPID         = 20  // { pid_t sys_getpid(void); }
+	SYS_MOUNT          = 21  // { int sys_mount(const char *type, const char *path, \
+	SYS_UNMOUNT        = 22  // { int sys_unmount(const char *path, int flags); }
+	SYS_SETUID         = 23  // { int sys_setuid(uid_t uid); }
+	SYS_GETUID         = 24  // { uid_t sys_getuid(void); }
+	SYS_GETEUID        = 25  // { uid_t sys_geteuid(void); }
+	SYS_PTRACE         = 26  // { int sys_ptrace(int req, pid_t pid, caddr_t addr, \
+	SYS_RECVMSG        = 27  // { ssize_t sys_recvmsg(int s, struct msghdr *msg, \
+	SYS_SENDMSG        = 28  // { ssize_t sys_sendmsg(int s, \
+	SYS_RECVFROM       = 29  // { ssize_t sys_recvfrom(int s, void *buf, size_t len, \
+	SYS_ACCEPT         = 30  // { int sys_accept(int s, struct sockaddr *name, \
+	SYS_GETPEERNAME    = 31  // { int sys_getpeername(int fdes, struct sockaddr *asa, \
+	SYS_GETSOCKNAME    = 32  // { int sys_getsockname(int fdes, struct sockaddr *asa, \
+	SYS_ACCESS         = 33  // { int sys_access(const char *path, int amode); }
+	SYS_CHFLAGS        = 34  // { int sys_chflags(const char *path, u_int flags); }
+	SYS_FCHFLAGS       = 35  // { int sys_fchflags(int fd, u_int flags); }
+	SYS_SYNC           = 36  // { void sys_sync(void); }
+	SYS_STAT           = 38  // { int sys_stat(const char *path, struct stat *ub); }
+	SYS_GETPPID        = 39  // { pid_t sys_getppid(void); }
+	SYS_LSTAT          = 40  // { int sys_lstat(const char *path, struct stat *ub); }
+	SYS_DUP            = 41  // { int sys_dup(int fd); }
+	SYS_FSTATAT        = 42  // { int sys_fstatat(int fd, const char *path, \
+	SYS_GETEGID        = 43  // { gid_t sys_getegid(void); }
+	SYS_PROFIL         = 44  // { int sys_profil(caddr_t samples, size_t size, \
+	SYS_KTRACE         = 45  // { int sys_ktrace(const char *fname, int ops, \
+	SYS_SIGACTION      = 46  // { int sys_sigaction(int signum, \
+	SYS_GETGID         = 47  // { gid_t sys_getgid(void); }
+	SYS_SIGPROCMASK    = 48  // { int sys_sigprocmask(int how, sigset_t mask); }
+	SYS_GETLOGIN       = 49  // { int sys_getlogin(char *namebuf, u_int namelen); }
+	SYS_SETLOGIN       = 50  // { int sys_setlogin(const char *namebuf); }
+	SYS_ACCT           = 51  // { int sys_acct(const char *path); }
+	SYS_SIGPENDING     = 52  // { int sys_sigpending(void); }
+	SYS_FSTAT          = 53  // { int sys_fstat(int fd, struct stat *sb); }
+	SYS_IOCTL          = 54  // { int sys_ioctl(int fd, \
+	SYS_REBOOT         = 55  // { int sys_reboot(int opt); }
+	SYS_REVOKE         = 56  // { int sys_revoke(const char *path); }
+	SYS_SYMLINK        = 57  // { int sys_symlink(const char *path, \
+	SYS_READLINK       = 58  // { ssize_t sys_readlink(const char *path, \
+	SYS_EXECVE         = 59  // { int sys_execve(const char *path, \
+	SYS_UMASK          = 60  // { mode_t sys_umask(mode_t newmask); }
+	SYS_CHROOT         = 61  // { int sys_chroot(const char *path); }
+	SYS_GETFSSTAT      = 62  // { int sys_getfsstat(struct statfs *buf, size_t bufsize, \
+	SYS_STATFS         = 63  // { int sys_statfs(const char *path, \
+	SYS_FSTATFS        = 64  // { int sys_fstatfs(int fd, struct statfs *buf); }
+	SYS_FHSTATFS       = 65  // { int sys_fhstatfs(const fhandle_t *fhp, \
+	SYS_VFORK          = 66  // { int sys_vfork(void); }
+	SYS_GETTIMEOFDAY   = 67  // { int sys_gettimeofday(struct timeval *tp, \
+	SYS_SETTIMEOFDAY   = 68  // { int sys_settimeofday(const struct timeval *tv, \
+	SYS_SETITIMER      = 69  // { int sys_setitimer(int which, \
+	SYS_GETITIMER      = 70  // { int sys_getitimer(int which, \
+	SYS_SELECT         = 71  // { int sys_select(int nd, fd_set *in, fd_set *ou, \
+	SYS_KEVENT         = 72  // { int sys_kevent(int fd, \
+	SYS_MUNMAP         = 73  // { int sys_munmap(void *addr, size_t len); }
+	SYS_MPROTECT       = 74  // { int sys_mprotect(void *addr, size_t len, \
+	SYS_MADVISE        = 75  // { int sys_madvise(void *addr, size_t len, \
+	SYS_UTIMES         = 76  // { int sys_utimes(const char *path, \
+	SYS_FUTIMES        = 77  // { int sys_futimes(int fd, \
+	SYS_MINCORE        = 78  // { int sys_mincore(void *addr, size_t len, \
+	SYS_GETGROUPS      = 79  // { int sys_getgroups(int gidsetsize, \
+	SYS_SETGROUPS      = 80  // { int sys_setgroups(int gidsetsize, \
+	SYS_GETPGRP        = 81  // { int sys_getpgrp(void); }
+	SYS_SETPGID        = 82  // { int sys_setpgid(pid_t pid, pid_t pgid); }
+	SYS_SENDSYSLOG     = 83  // { int sys_sendsyslog(const void *buf, size_t nbyte); }
+	SYS_UTIMENSAT      = 84  // { int sys_utimensat(int fd, const char *path, \
+	SYS_FUTIMENS       = 85  // { int sys_futimens(int fd, \
+	SYS_CLOCK_GETTIME  = 87  // { int sys_clock_gettime(clockid_t clock_id, \
+	SYS_CLOCK_SETTIME  = 88  // { int sys_clock_settime(clockid_t clock_id, \
+	SYS_CLOCK_GETRES   = 89  // { int sys_clock_getres(clockid_t clock_id, \
+	SYS_DUP2           = 90  // { int sys_dup2(int from, int to); }
+	SYS_NANOSLEEP      = 91  // { int sys_nanosleep(const struct timespec *rqtp, \
+	SYS_FCNTL          = 92  // { int sys_fcntl(int fd, int cmd, ... void *arg); }
+	SYS_ACCEPT4        = 93  // { int sys_accept4(int s, struct sockaddr *name, \
+	SYS___THRSLEEP     = 94  // { int sys___thrsleep(const volatile void *ident, \
+	SYS_FSYNC          = 95  // { int sys_fsync(int fd); }
+	SYS_SETPRIORITY    = 96  // { int sys_setpriority(int which, id_t who, int prio); }
+	SYS_SOCKET         = 97  // { int sys_socket(int domain, int type, int protocol); }
+	SYS_CONNECT        = 98  // { int sys_connect(int s, const struct sockaddr *name, \
+	SYS_GETDENTS       = 99  // { int sys_getdents(int fd, void *buf, size_t buflen); }
+	SYS_GETPRIORITY    = 100 // { int sys_getpriority(int which, id_t who); }
+	SYS_PIPE2          = 101 // { int sys_pipe2(int *fdp, int flags); }
+	SYS_DUP3           = 102 // { int sys_dup3(int from, int to, int flags); }
+	SYS_SIGRETURN      = 103 // { int sys_sigreturn(struct sigcontext *sigcntxp); }
+	SYS_BIND           = 104 // { int sys_bind(int s, const struct sockaddr *name, \
+	SYS_SETSOCKOPT     = 105 // { int sys_setsockopt(int s, int level, int name, \
+	SYS_LISTEN         = 106 // { int sys_listen(int s, int backlog); }
+	SYS_CHFLAGSAT      = 107 // { int sys_chflagsat(int fd, const char *path, \
+	SYS_PPOLL          = 109 // { int sys_ppoll(struct pollfd *fds, \
+	SYS_PSELECT        = 110 // { int sys_pselect(int nd, fd_set *in, fd_set *ou, \
+	SYS_SIGSUSPEND     = 111 // { int sys_sigsuspend(int mask); }
+	SYS_GETSOCKOPT     = 118 // { int sys_getsockopt(int s, int level, int name, \
+	SYS_READV          = 120 // { ssize_t sys_readv(int fd, \
+	SYS_WRITEV         = 121 // { ssize_t sys_writev(int fd, \
+	SYS_KILL           = 122 // { int sys_kill(int pid, int signum); }
+	SYS_FCHOWN         = 123 // { int sys_fchown(int fd, uid_t uid, gid_t gid); }
+	SYS_FCHMOD         = 124 // { int sys_fchmod(int fd, mode_t mode); }
+	SYS_SETREUID       = 126 // { int sys_setreuid(uid_t ruid, uid_t euid); }
+	SYS_SETREGID       = 127 // { int sys_setregid(gid_t rgid, gid_t egid); }
+	SYS_RENAME         = 128 // { int sys_rename(const char *from, const char *to); }
+	SYS_FLOCK          = 131 // { int sys_flock(int fd, int how); }
+	SYS_MKFIFO         = 132 // { int sys_mkfifo(const char *path, mode_t mode); }
+	SYS_SENDTO         = 133 // { ssize_t sys_sendto(int s, const void *buf, \
+	SYS_SHUTDOWN       = 134 // { int sys_shutdown(int s, int how); }
+	SYS_SOCKETPAIR     = 135 // { int sys_socketpair(int domain, int type, \
+	SYS_MKDIR          = 136 // { int sys_mkdir(const char *path, mode_t mode); }
+	SYS_RMDIR          = 137 // { int sys_rmdir(const char *path); }
+	SYS_ADJTIME        = 140 // { int sys_adjtime(const struct timeval *delta, \
+	SYS_SETSID         = 147 // { int sys_setsid(void); }
+	SYS_QUOTACTL       = 148 // { int sys_quotactl(const char *path, int cmd, \
+	SYS_NFSSVC         = 155 // { int sys_nfssvc(int flag, void *argp); }
+	SYS_GETFH          = 161 // { int sys_getfh(const char *fname, fhandle_t *fhp); }
+	SYS_SYSARCH        = 165 // { int sys_sysarch(int op, void *parms); }
+	SYS_PREAD          = 173 // { ssize_t sys_pread(int fd, void *buf, \
+	SYS_PWRITE         = 174 // { ssize_t sys_pwrite(int fd, const void *buf, \
+	SYS_SETGID         = 181 // { int sys_setgid(gid_t gid); }
+	SYS_SETEGID        = 182 // { int sys_setegid(gid_t egid); }
+	SYS_SETEUID        = 183 // { int sys_seteuid(uid_t euid); }
+	SYS_PATHCONF       = 191 // { long sys_pathconf(const char *path, int name); }
+	SYS_FPATHCONF      = 192 // { long sys_fpathconf(int fd, int name); }
+	SYS_SWAPCTL        = 193 // { int sys_swapctl(int cmd, const void *arg, int misc); }
+	SYS_GETRLIMIT      = 194 // { int sys_getrlimit(int which, \
+	SYS_SETRLIMIT      = 195 // { int sys_setrlimit(int which, \
+	SYS_MMAP           = 197 // { void *sys_mmap(void *addr, size_t len, int prot, \
+	SYS_LSEEK          = 199 // { off_t sys_lseek(int fd, int pad, off_t offset, \
+	SYS_TRUNCATE       = 200 // { int sys_truncate(const char *path, int pad, \
+	SYS_FTRUNCATE      = 201 // { int sys_ftruncate(int fd, int pad, off_t length); }
+	SYS___SYSCTL       = 202 // { int sys___sysctl(const int *name, u_int namelen, \
+	SYS_MLOCK          = 203 // { int sys_mlock(const void *addr, size_t len); }
+	SYS_MUNLOCK        = 204 // { int sys_munlock(const void *addr, size_t len); }
+	SYS_GETPGID        = 207 // { pid_t sys_getpgid(pid_t pid); }
+	SYS_UTRACE         = 209 // { int sys_utrace(const char *label, const void *addr, \
+	SYS_SEMGET         = 221 // { int sys_semget(key_t key, int nsems, int semflg); }
+	SYS_MSGGET         = 225 // { int sys_msgget(key_t key, int msgflg); }
+	SYS_MSGSND         = 226 // { int sys_msgsnd(int msqid, const void *msgp, size_t msgsz, \
+	SYS_MSGRCV         = 227 // { int sys_msgrcv(int msqid, void *msgp, size_t msgsz, \
+	SYS_SHMAT          = 228 // { void *sys_shmat(int shmid, const void *shmaddr, \
+	SYS_SHMDT          = 230 // { int sys_shmdt(const void *shmaddr); }
+	SYS_MINHERIT       = 250 // { int sys_minherit(void *addr, size_t len, \
+	SYS_POLL           = 252 // { int sys_poll(struct pollfd *fds, \
+	SYS_ISSETUGID      = 253 // { int sys_issetugid(void); }
+	SYS_LCHOWN         = 254 // { int sys_lchown(const char *path, uid_t uid, gid_t gid); }
+	SYS_GETSID         = 255 // { pid_t sys_getsid(pid_t pid); }
+	SYS_MSYNC          = 256 // { int sys_msync(void *addr, size_t len, int flags); }
+	SYS_PIPE           = 263 // { int sys_pipe(int *fdp); }
+	SYS_FHOPEN         = 264 // { int sys_fhopen(const fhandle_t *fhp, int flags); }
+	SYS_PREADV         = 267 // { ssize_t sys_preadv(int fd, \
+	SYS_PWRITEV        = 268 // { ssize_t sys_pwritev(int fd, \
+	SYS_KQUEUE         = 269 // { int sys_kqueue(void); }
+	SYS_MLOCKALL       = 271 // { int sys_mlockall(int flags); }
+	SYS_MUNLOCKALL     = 272 // { int sys_munlockall(void); }
+	SYS_GETRESUID      = 281 // { int sys_getresuid(uid_t *ruid, uid_t *euid, \
+	SYS_SETRESUID      = 282 // { int sys_setresuid(uid_t ruid, uid_t euid, \
+	SYS_GETRESGID      = 283 // { int sys_getresgid(gid_t *rgid, gid_t *egid, \
+	SYS_SETRESGID      = 284 // { int sys_setresgid(gid_t rgid, gid_t egid, \
+	SYS_MQUERY         = 286 // { void *sys_mquery(void *addr, size_t len, int prot, \
+	SYS_CLOSEFROM      = 287 // { int sys_closefrom(int fd); }
+	SYS_SIGALTSTACK    = 288 // { int sys_sigaltstack(const struct sigaltstack *nss, \
+	SYS_SHMGET         = 289 // { int sys_shmget(key_t key, size_t size, int shmflg); }
+	SYS_SEMOP          = 290 // { int sys_semop(int semid, struct sembuf *sops, \
+	SYS_FHSTAT         = 294 // { int sys_fhstat(const fhandle_t *fhp, \
+	SYS___SEMCTL       = 295 // { int sys___semctl(int semid, int semnum, int cmd, \
+	SYS_SHMCTL         = 296 // { int sys_shmctl(int shmid, int cmd, \
+	SYS_MSGCTL         = 297 // { int sys_msgctl(int msqid, int cmd, \
+	SYS_SCHED_YIELD    = 298 // { int sys_sched_yield(void); }
+	SYS_GETTHRID       = 299 // { pid_t sys_getthrid(void); }
+	SYS___THRWAKEUP    = 301 // { int sys___thrwakeup(const volatile void *ident, \
+	SYS___THREXIT      = 302 // { void sys___threxit(pid_t *notdead); }
+	SYS___THRSIGDIVERT = 303 // { int sys___thrsigdivert(sigset_t sigmask, \
+	SYS___GETCWD       = 304 // { int sys___getcwd(char *buf, size_t len); }
+	SYS_ADJFREQ        = 305 // { int sys_adjfreq(const int64_t *freq, \
+	SYS_SETRTABLE      = 310 // { int sys_setrtable(int rtableid); }
+	SYS_GETRTABLE      = 311 // { int sys_getrtable(void); }
+	SYS_FACCESSAT      = 313 // { int sys_faccessat(int fd, const char *path, \
+	SYS_FCHMODAT       = 314 // { int sys_fchmodat(int fd, const char *path, \
+	SYS_FCHOWNAT       = 315 // { int sys_fchownat(int fd, const char *path, \
+	SYS_LINKAT         = 317 // { int sys_linkat(int fd1, const char *path1, int fd2, \
+	SYS_MKDIRAT        = 318 // { int sys_mkdirat(int fd, const char *path, \
+	SYS_MKFIFOAT       = 319 // { int sys_mkfifoat(int fd, const char *path, \
+	SYS_MKNODAT        = 320 // { int sys_mknodat(int fd, const char *path, \
+	SYS_OPENAT         = 321 // { int sys_openat(int fd, const char *path, int flags, \
+	SYS_READLINKAT     = 322 // { ssize_t sys_readlinkat(int fd, const char *path, \
+	SYS_RENAMEAT       = 323 // { int sys_renameat(int fromfd, const char *from, \
+	SYS_SYMLINKAT      = 324 // { int sys_symlinkat(const char *path, int fd, \
+	SYS_UNLINKAT       = 325 // { int sys_unlinkat(int fd, const char *path, \
+	SYS___SET_TCB      = 329 // { void sys___set_tcb(void *tcb); }
+	SYS___GET_TCB      = 330 // { void *sys___get_tcb(void); }
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go b/installer/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
deleted file mode 100644
index c708659859..0000000000
--- a/installer/vendor/golang.org/x/sys/unix/zsysnum_solaris_amd64.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,solaris
-
-package unix
-
-// TODO(aram): remove these before Go 1.3.
-const (
-	SYS_EXECVE = 59
-	SYS_FCNTL  = 62
-)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
index 2de1d44e28..327af5fba1 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_386.go
@@ -1,6 +1,7 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build 386,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
 
 package unix
 
@@ -135,13 +136,13 @@ type Fsid struct {
 }
 
 type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
 }
 
 type RawSockaddrInet4 struct {
@@ -294,14 +295,14 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
@@ -337,51 +338,51 @@ type IfData struct {
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
 }
 
 type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -429,11 +430,11 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
 }
 
 type Termios struct {
@@ -445,3 +446,44 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
index 044657878c..116e6e0757 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_amd64.go
@@ -1,6 +1,7 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build amd64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
 
 package unix
 
@@ -25,9 +26,9 @@ type Timespec struct {
 }
 
 type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
+	Sec  int64
+	Usec int32
+	_    [4]byte
 }
 
 type Timeval32 struct {
@@ -69,7 +70,7 @@ type Stat_t struct {
 	Uid           uint32
 	Gid           uint32
 	Rdev          int32
-	Pad_cgo_0     [4]byte
+	_             [4]byte
 	Atimespec     Timespec
 	Mtimespec     Timespec
 	Ctimespec     Timespec
@@ -119,9 +120,9 @@ type Fstore_t struct {
 }
 
 type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
+	Offset int64
+	Count  int32
+	_      [4]byte
 }
 
 type Fbootstraptransfer_t struct {
@@ -131,9 +132,9 @@ type Fbootstraptransfer_t struct {
 }
 
 type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
+	Flags uint32
+	_     [8]byte
+	_     [8]byte
 }
 
 type Fsid struct {
@@ -141,13 +142,13 @@ type Fsid struct {
 }
 
 type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
 }
 
 type RawSockaddrInet4 struct {
@@ -220,10 +221,10 @@ type IPv6Mreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 	Control    *byte
 	Controllen uint32
 	Flags      int32
@@ -302,14 +303,14 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
@@ -345,51 +346,51 @@ type IfData struct {
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
 }
 
 type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -425,9 +426,9 @@ type BpfStat struct {
 }
 
 type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
 }
 
 type BpfInsn struct {
@@ -438,25 +439,61 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
+	Tstamp  Timeval32
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
 }
 
 type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
+	Iflag  uint64
+	Oflag  uint64
+	Cflag  uint64
+	Lflag  uint64
+	Cc     [20]uint8
+	_      [4]byte
+	Ispeed uint64
+	Ospeed uint64
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
 }
 
 const (
 	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
 	AT_SYMLINK_NOFOLLOW = 0x20
 )
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
index 66df363ce5..2750ad7607 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm.go
@@ -137,13 +137,13 @@ type Fsid struct {
 }
 
 type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
 }
 
 type RawSockaddrInet4 struct {
@@ -296,14 +296,14 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
@@ -339,51 +339,51 @@ type IfData struct {
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
 }
 
 type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -431,11 +431,11 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
 }
 
 type Termios struct {
@@ -447,3 +447,44 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
index 85d56eabd3..8cead0996c 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_darwin_arm64.go
@@ -1,6 +1,7 @@
+// cgo -godefs types_darwin.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build arm64,darwin
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_darwin.go
 
 package unix
 
@@ -25,9 +26,9 @@ type Timespec struct {
 }
 
 type Timeval struct {
-	Sec       int64
-	Usec      int32
-	Pad_cgo_0 [4]byte
+	Sec  int64
+	Usec int32
+	_    [4]byte
 }
 
 type Timeval32 struct {
@@ -69,7 +70,7 @@ type Stat_t struct {
 	Uid           uint32
 	Gid           uint32
 	Rdev          int32
-	Pad_cgo_0     [4]byte
+	_             [4]byte
 	Atimespec     Timespec
 	Mtimespec     Timespec
 	Ctimespec     Timespec
@@ -119,9 +120,9 @@ type Fstore_t struct {
 }
 
 type Radvisory_t struct {
-	Offset    int64
-	Count     int32
-	Pad_cgo_0 [4]byte
+	Offset int64
+	Count  int32
+	_      [4]byte
 }
 
 type Fbootstraptransfer_t struct {
@@ -131,9 +132,9 @@ type Fbootstraptransfer_t struct {
 }
 
 type Log2phys_t struct {
-	Flags     uint32
-	Pad_cgo_0 [8]byte
-	Pad_cgo_1 [8]byte
+	Flags uint32
+	_     [8]byte
+	_     [8]byte
 }
 
 type Fsid struct {
@@ -141,13 +142,13 @@ type Fsid struct {
 }
 
 type Dirent struct {
-	Ino       uint64
-	Seekoff   uint64
-	Reclen    uint16
-	Namlen    uint16
-	Type      uint8
-	Name      [1024]int8
-	Pad_cgo_0 [3]byte
+	Ino     uint64
+	Seekoff uint64
+	Reclen  uint16
+	Namlen  uint16
+	Type    uint8
+	Name    [1024]int8
+	_       [3]byte
 }
 
 type RawSockaddrInet4 struct {
@@ -220,10 +221,10 @@ type IPv6Mreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 	Control    *byte
 	Controllen uint32
 	Flags      int32
@@ -302,14 +303,14 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
@@ -345,51 +346,51 @@ type IfData struct {
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
 }
 
 type IfmaMsghdr2 struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Refcount  int32
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Addrs    int32
+	Flags    int32
+	Index    uint16
+	_        [2]byte
+	Refcount int32
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -425,9 +426,9 @@ type BpfStat struct {
 }
 
 type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
 }
 
 type BpfInsn struct {
@@ -438,20 +439,61 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp    Timeval32
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
+	Tstamp  Timeval32
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
 }
 
 type Termios struct {
-	Iflag     uint64
-	Oflag     uint64
-	Cflag     uint64
-	Lflag     uint64
-	Cc        [20]uint8
-	Pad_cgo_0 [4]byte
-	Ispeed    uint64
-	Ospeed    uint64
+	Iflag  uint64
+	Oflag  uint64
+	Cflag  uint64
+	Lflag  uint64
+	Cc     [20]uint8
+	_      [4]byte
+	Ispeed uint64
+	Ospeed uint64
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x2
+	AT_REMOVEDIR        = 0x80
+	AT_SYMLINK_FOLLOW   = 0x40
+	AT_SYMLINK_NOFOLLOW = 0x20
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
 }
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
index 8a6f4e1ce3..315a553bd5 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_dragonfly_amd64.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_dragonfly.go
+// cgo -godefs types_dragonfly.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,dragonfly
 
@@ -108,7 +108,7 @@ type Statfs_t struct {
 	Owner       uint32
 	Type        int32
 	Flags       int32
-	Pad_cgo_0   [4]byte
+	_           [4]byte
 	Syncwrites  int64
 	Asyncwrites int64
 	Fstypename  [16]int8
@@ -118,7 +118,7 @@ type Statfs_t struct {
 	Spares1     int16
 	Mntfromname [80]int8
 	Spares2     int16
-	Pad_cgo_1   [4]byte
+	_           [4]byte
 	Spare       [2]int64
 }
 
@@ -143,6 +143,10 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -215,10 +219,10 @@ type IPv6Mreq struct {
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 	Control    *byte
 	Controllen uint32
 	Flags      int32
@@ -290,14 +294,14 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
@@ -307,7 +311,7 @@ type IfData struct {
 	Hdrlen     uint8
 	Recvquota  uint8
 	Xmitquota  uint8
-	Pad_cgo_0  [2]byte
+	_          [2]byte
 	Mtu        uint64
 	Metric     uint64
 	Link_state uint64
@@ -324,29 +328,29 @@ type IfData struct {
 	Iqdrops    uint64
 	Noproto    uint64
 	Hwassist   uint64
-	Unused     uint64
+	Oqdrops    uint64
 	Lastchange Timeval
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type IfmaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
 }
 
 type IfAnnounceMsghdr struct {
@@ -359,19 +363,19 @@ type IfAnnounceMsghdr struct {
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint64
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint64
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -387,7 +391,7 @@ type RtMetrics struct {
 	Hopcount  uint64
 	Mssopt    uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Msl       uint64
 	Iwmaxsegs uint64
 	Iwcapsegs uint64
@@ -412,9 +416,9 @@ type BpfStat struct {
 }
 
 type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
 }
 
 type BpfInsn struct {
@@ -425,11 +429,11 @@ type BpfInsn struct {
 }
 
 type BpfHdr struct {
-	Tstamp    Timeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [6]byte
+	Tstamp  Timeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [6]byte
 }
 
 type Termios struct {
@@ -441,3 +445,42 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = 0xfffafdcd
+	AT_SYMLINK_NOFOLLOW = 0x1
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [32]byte
+	Nodename [32]byte
+	Release  [32]byte
+	Version  [32]byte
+	Machine  [32]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
index 8cf30947b4..878a21ad6d 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_386.go
@@ -1,6 +1,7 @@
+// cgo -godefs types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build 386,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
 
 package unix
 
@@ -85,7 +86,7 @@ type Stat_t struct {
 	Ctimespec     Timespec
 	Size          int64
 	Blocks        int64
-	Blksize       uint32
+	Blksize       int32
 	Flags         uint32
 	Gen           uint32
 	Lspare        int32
@@ -139,6 +140,10 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
 const (
 	FADV_NORMAL     = 0x0
 	FADV_RANDOM     = 0x1
@@ -288,9 +293,9 @@ type FdSet struct {
 }
 
 const (
-	sizeofIfMsghdr         = 0x64
+	sizeofIfMsghdr         = 0xa8
 	SizeofIfMsghdr         = 0x60
-	sizeofIfData           = 0x54
+	sizeofIfData           = 0x98
 	SizeofIfData           = 0x50
 	SizeofIfaMsghdr        = 0x14
 	SizeofIfmaMsghdr       = 0x10
@@ -322,31 +327,31 @@ type IfMsghdr struct {
 }
 
 type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int32
-	Lastchange  Timeval
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
 }
 
 type IfData struct {
@@ -500,3 +505,49 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
index e5feb207be..8408af1250 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_amd64.go
@@ -1,6 +1,7 @@
+// cgo -godefs types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build amd64,freebsd
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_freebsd.go
 
 package unix
 
@@ -85,7 +86,7 @@ type Stat_t struct {
 	Ctimespec     Timespec
 	Size          int64
 	Blocks        int64
-	Blksize       uint32
+	Blksize       int32
 	Flags         uint32
 	Gen           uint32
 	Lspare        int32
@@ -139,6 +140,10 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
 const (
 	FADV_NORMAL     = 0x0
 	FADV_RANDOM     = 0x1
@@ -324,31 +329,31 @@ type IfMsghdr struct {
 }
 
 type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint64
-	Metric      uint64
-	Baudrate    uint64
-	Ipackets    uint64
-	Ierrors     uint64
-	Opackets    uint64
-	Oerrors     uint64
-	Collisions  uint64
-	Ibytes      uint64
-	Obytes      uint64
-	Imcasts     uint64
-	Omcasts     uint64
-	Iqdrops     uint64
-	Noproto     uint64
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
 }
 
 type IfData struct {
@@ -503,3 +508,49 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
index 5472b54284..4b2d9a4839 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_freebsd_arm.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_freebsd.go
+// cgo -godefs -- -fsigned-char types_freebsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,freebsd
 
@@ -88,7 +88,7 @@ type Stat_t struct {
 	Ctimespec     Timespec
 	Size          int64
 	Blocks        int64
-	Blksize       uint32
+	Blksize       int32
 	Flags         uint32
 	Gen           uint32
 	Lspare        int32
@@ -142,6 +142,19 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -282,9 +295,9 @@ type FdSet struct {
 }
 
 const (
-	sizeofIfMsghdr         = 0x70
+	sizeofIfMsghdr         = 0xa8
 	SizeofIfMsghdr         = 0x70
-	sizeofIfData           = 0x60
+	sizeofIfData           = 0x98
 	SizeofIfData           = 0x60
 	SizeofIfaMsghdr        = 0x14
 	SizeofIfmaMsghdr       = 0x10
@@ -316,31 +329,31 @@ type IfMsghdr struct {
 }
 
 type ifData struct {
-	Type        uint8
-	Physical    uint8
-	Addrlen     uint8
-	Hdrlen      uint8
-	Link_state  uint8
-	Vhid        uint8
-	Baudrate_pf uint8
-	Datalen     uint8
-	Mtu         uint32
-	Metric      uint32
-	Baudrate    uint32
-	Ipackets    uint32
-	Ierrors     uint32
-	Opackets    uint32
-	Oerrors     uint32
-	Collisions  uint32
-	Ibytes      uint32
-	Obytes      uint32
-	Imcasts     uint32
-	Omcasts     uint32
-	Iqdrops     uint32
-	Noproto     uint32
-	Hwassist    uint64
-	Epoch       int64
-	Lastchange  Timeval
+	Type              uint8
+	Physical          uint8
+	Addrlen           uint8
+	Hdrlen            uint8
+	Link_state        uint8
+	Vhid              uint8
+	Datalen           uint16
+	Mtu               uint32
+	Metric            uint32
+	Baudrate          uint64
+	Ipackets          uint64
+	Ierrors           uint64
+	Opackets          uint64
+	Oerrors           uint64
+	Collisions        uint64
+	Ibytes            uint64
+	Obytes            uint64
+	Imcasts           uint64
+	Omcasts           uint64
+	Iqdrops           uint64
+	Oqdrops           uint64
+	Noproto           uint64
+	Hwassist          uint64
+	X__ifi_epoch      [8]byte
+	X__ifi_lastchange [16]byte
 }
 
 type IfData struct {
@@ -495,3 +508,49 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_REMOVEDIR        = 0x800
+	AT_SYMLINK_FOLLOW   = 0x400
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR      = 0x8
+	POLLHUP      = 0x10
+	POLLIN       = 0x1
+	POLLINIGNEOF = 0x2000
+	POLLNVAL     = 0x20
+	POLLOUT      = 0x4
+	POLLPRI      = 0x2
+	POLLRDBAND   = 0x80
+	POLLRDNORM   = 0x40
+	POLLWRBAND   = 0x100
+	POLLWRNORM   = 0x4
+)
+
+type CapRights struct {
+	Rights [2]uint64
+}
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_386.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
index 99dfd588ad..84a90fa79a 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_386.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m32 linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build 386,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -51,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -95,52 +96,67 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [2]byte
-	Size      int64
-	Blksize   int32
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
+	Dev     uint64
+	_       uint16
+	_       [2]byte
+	_       uint32
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint16
+	_       [2]byte
+	Size    int64
+	Blksize int32
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Ino     uint64
 }
 
-type Statfs_t struct {
-	Type    int32
-	Bsize   int32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int32
-	Frsize  int32
-	Flags   int32
-	Spare   [4]int32
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [1]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [1]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
@@ -151,6 +167,26 @@ type Flock_t struct {
 	Pid    int32
 }
 
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
 const (
 	FADV_NORMAL     = 0x0
 	FADV_RANDOM     = 0x1
@@ -203,11 +239,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -264,6 +309,13 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
@@ -275,10 +327,9 @@ type Msghdr struct {
 }
 
 type Cmsghdr struct {
-	Len          uint32
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -314,7 +365,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -349,13 +400,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x1c
 	SizeofCmsghdr           = 0xc
 	SizeofInet4Pktinfo      = 0xc
@@ -367,97 +421,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -488,12 +568,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -536,9 +616,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -546,7 +626,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]int8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -589,16 +668,16 @@ type Sysinfo_t struct {
 	Totalhigh uint32
 	Freehigh  uint32
 	Unit      uint32
-	X_f       [8]int8
+	_         [8]int8
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -615,8 +694,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -638,9 +724,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [32]uint32
 }
 
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -651,3 +741,617 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int32
+	Frsize  int32
+	Flags   int32
+	Spare   [4]int32
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
index c9e1e64a2c..1a81adc59f 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_amd64.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -m64 linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build amd64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -98,59 +99,94 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev       uint64
-	Ino       uint64
-	Nlink     uint64
-	Mode      uint32
-	Uid       uint32
-	Gid       uint32
-	X__pad0   int32
-	Rdev      uint64
-	Size      int64
-	Blksize   int64
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	X__unused [3]int64
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       [3]int64
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -205,11 +241,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -266,23 +311,29 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint64
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -318,7 +369,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -353,13 +404,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -371,97 +425,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -492,12 +572,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -540,9 +620,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -550,7 +630,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]int8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -600,30 +679,30 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [0]int8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -633,8 +712,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -656,9 +742,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -669,3 +759,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
index 4bfba2a9e2..9746e31609 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build arm,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go | go run mkpost.go
 
 package unix
 
@@ -51,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -95,64 +96,98 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev       uint64
-	X__pad1   uint16
-	Pad_cgo_0 [2]byte
-	X__st_ino uint32
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	X__pad2   uint16
-	Pad_cgo_1 [6]byte
-	Size      int64
-	Blksize   int32
-	Pad_cgo_2 [4]byte
-	Blocks    int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Ino       uint64
+	Dev     uint64
+	_       uint16
+	_       [2]byte
+	_       uint32
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint16
+	_       [6]byte
+	Size    int64
+	Blksize int32
+	_       [4]byte
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Ino     uint64
 }
 
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Blocks    uint64
-	Bfree     uint64
-	Bavail    uint64
-	Files     uint64
-	Ffree     uint64
-	Fsid      Fsid
-	Namelen   int32
-	Frsize    int32
-	Flags     int32
-	Spare     [4]int32
-	Pad_cgo_0 [4]byte
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -207,11 +242,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -268,6 +312,13 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
@@ -279,10 +330,9 @@ type Msghdr struct {
 }
 
 type Cmsghdr struct {
-	Len          uint32
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint32
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -318,7 +368,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -353,13 +403,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x1c
 	SizeofCmsghdr           = 0xc
 	SizeofInet4Pktinfo      = 0xc
@@ -371,97 +424,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -492,12 +571,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -540,9 +619,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -550,7 +629,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]uint8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -577,16 +655,16 @@ type Sysinfo_t struct {
 	Totalhigh uint32
 	Freehigh  uint32
 	Unit      uint32
-	X_f       [8]uint8
+	_         [8]uint8
 }
 
 type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -604,8 +682,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -627,9 +712,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [32]uint32
 }
 
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -640,3 +729,618 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]uint8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int32
+	Frsize  int32
+	Flags   int32
+	Spare   [4]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
index e58c500c11..6e588f7aec 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_arm64.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build arm64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -98,60 +99,95 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev               uint64
-	Ino               uint64
-	Mode              uint32
-	Nlink             uint32
-	Uid               uint32
-	Gid               uint32
-	Rdev              uint64
-	X__pad1           uint64
-	Size              int64
-	Blksize           int32
-	X__pad2           int32
-	Blocks            int64
-	Atim              Timespec
-	Mtim              Timespec
-	Ctim              Timespec
-	X__glibc_reserved [2]int32
+	Dev     uint64
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	_       uint64
+	Size    int64
+	Blksize int32
+	_       int32
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       [2]int32
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -206,11 +242,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,23 +312,29 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint64
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -319,7 +370,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -354,13 +405,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -372,97 +426,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x22
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -493,12 +573,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -541,9 +621,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -551,7 +631,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]int8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -578,30 +657,30 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [0]int8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -612,8 +691,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -635,9 +721,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -648,3 +738,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
index a960085f82..27f7768563 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build mips,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go | go run mkpost.go
 
 package unix
 
@@ -51,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -114,44 +115,77 @@ type Stat_t struct {
 	Pad5    [14]int32
 }
 
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Frsize    int32
-	Pad_cgo_0 [4]byte
-	Blocks    uint64
-	Bfree     uint64
-	Files     uint64
-	Ffree     uint64
-	Bavail    uint64
-	Fsid      Fsid
-	Namelen   int32
-	Flags     int32
-	Spare     [5]int32
-	Pad_cgo_1 [4]byte
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -206,11 +240,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,6 +310,13 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
@@ -316,7 +366,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -351,13 +401,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x1c
 	SizeofCmsghdr           = 0xc
 	SizeofInet4Pktinfo      = 0xc
@@ -369,97 +422,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x1d
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -490,12 +569,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -538,9 +617,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -553,26 +632,13 @@ type InotifyEvent struct {
 const SizeofInotifyEvent = 0x10
 
 type PtraceRegs struct {
-	Regs        [109]uint32
-	U_tsize     uint32
-	U_dsize     uint32
-	U_ssize     uint32
-	Start_code  uint32
-	Start_data  uint32
-	Start_stack uint32
-	Signal      int32
-	U_ar0       *byte
-	Magic       uint32
-	U_comm      [32]int8
-}
-
-type ptracePsw struct {
-}
-
-type ptraceFpregs struct {
-}
-
-type ptracePer struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
 }
 
 type FdSet struct {
@@ -593,16 +659,16 @@ type Sysinfo_t struct {
 	Totalhigh uint32
 	Freehigh  uint32
 	Unit      uint32
-	X_f       [8]int8
+	_         [8]int8
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -620,8 +686,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -643,10 +716,12 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [32]uint32
+	Val [32]uint32
 }
 
-const _SC_PAGESIZE = 0x1e
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
 
 type Termios struct {
 	Iflag  uint32
@@ -658,3 +733,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Frsize  int32
+	_       [4]byte
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int32
+	Flags   int32
+	Spare   [5]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
index 9d46a62c74..069bcdd8ad 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build mips64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -99,7 +100,7 @@ type _Gid_t uint32
 
 type Stat_t struct {
 	Dev     uint32
-	Pad1    [3]int32
+	Pad1    [3]uint32
 	Ino     uint64
 	Mode    uint32
 	Nlink   uint32
@@ -116,42 +117,77 @@ type Stat_t struct {
 	Blocks  int64
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -206,11 +242,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,16 +312,23 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -318,7 +370,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -353,13 +405,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -371,97 +426,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -492,12 +573,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -540,9 +621,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -555,17 +636,13 @@ type InotifyEvent struct {
 const SizeofInotifyEvent = 0x10
 
 type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
 }
 
 type FdSet struct {
@@ -583,30 +660,30 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [0]int8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -616,8 +693,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -639,15 +723,636 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
index 267bfe903d..f8bbca8f5a 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mips64le.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build mips64le,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -99,7 +100,7 @@ type _Gid_t uint32
 
 type Stat_t struct {
 	Dev     uint32
-	Pad1    [3]int32
+	Pad1    [3]uint32
 	Ino     uint64
 	Mode    uint32
 	Nlink   uint32
@@ -116,42 +117,77 @@ type Stat_t struct {
 	Blocks  int64
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Frsize  int64
-	Blocks  uint64
-	Bfree   uint64
-	Files   uint64
-	Ffree   uint64
-	Bavail  uint64
-	Fsid    Fsid
-	Namelen int64
-	Flags   int64
-	Spare   [5]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -206,11 +242,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,16 +312,23 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
@@ -318,7 +370,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -353,13 +405,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -371,97 +426,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -492,12 +573,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -540,9 +621,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -555,17 +636,13 @@ type InotifyEvent struct {
 const SizeofInotifyEvent = 0x10
 
 type PtraceRegs struct {
-	Regs        [102]uint64
-	U_tsize     uint64
-	U_dsize     uint64
-	U_ssize     uint64
-	Start_code  uint64
-	Start_data  uint64
-	Start_stack uint64
-	Signal      int64
-	U_ar0       uint64
-	Magic       uint64
-	U_comm      [32]int8
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
 }
 
 type FdSet struct {
@@ -583,30 +660,30 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]int8
-	Pad_cgo_1 [4]byte
+	_         [0]int8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
 }
 
 type EpollEvent struct {
@@ -616,8 +693,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -639,15 +723,636 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Line      uint8
-	Cc        [32]uint8
-	Pad_cgo_0 [3]byte
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Line   uint8
+	Cc     [23]uint8
+	Ispeed uint32
+	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Frsize  int64
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int64
+	Flags   int64
+	Spare   [5]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
index 950515a8ee..d35bb0e670 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_mipsle.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build mipsle,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go | go run mkpost.go
 
 package unix
 
@@ -51,7 +52,7 @@ type Timex struct {
 	Errcnt    int32
 	Stbcnt    int32
 	Tai       int32
-	Pad_cgo_0 [44]byte
+	_         [44]byte
 }
 
 type Time_t int32
@@ -114,44 +115,77 @@ type Stat_t struct {
 	Pad5    [14]int32
 }
 
-type Statfs_t struct {
-	Type      int32
-	Bsize     int32
-	Frsize    int32
-	Pad_cgo_0 [4]byte
-	Blocks    uint64
-	Bfree     uint64
-	Files     uint64
-	Ffree     uint64
-	Bavail    uint64
-	Fsid      Fsid
-	Namelen   int32
-	Flags     int32
-	Spare     [5]int32
-	Pad_cgo_1 [4]byte
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]int8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -206,11 +240,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,6 +310,13 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
@@ -316,7 +366,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -351,13 +401,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x8
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x1c
 	SizeofCmsghdr           = 0xc
 	SizeofInet4Pktinfo      = 0xc
@@ -369,97 +422,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2a
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -490,12 +569,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -538,9 +617,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [2]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [2]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -553,26 +632,13 @@ type InotifyEvent struct {
 const SizeofInotifyEvent = 0x10
 
 type PtraceRegs struct {
-	Regs        [109]uint32
-	U_tsize     uint32
-	U_dsize     uint32
-	U_ssize     uint32
-	Start_code  uint32
-	Start_data  uint32
-	Start_stack uint32
-	Signal      int32
-	U_ar0       *byte
-	Magic       uint32
-	U_comm      [32]int8
-}
-
-type ptracePsw struct {
-}
-
-type ptraceFpregs struct {
-}
-
-type ptracePer struct {
+	Regs     [32]uint64
+	Lo       uint64
+	Hi       uint64
+	Epc      uint64
+	Badvaddr uint64
+	Status   uint64
+	Cause    uint64
 }
 
 type FdSet struct {
@@ -593,16 +659,16 @@ type Sysinfo_t struct {
 	Totalhigh uint32
 	Freehigh  uint32
 	Unit      uint32
-	X_f       [8]int8
+	_         [8]int8
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -620,8 +686,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -643,10 +716,12 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [32]uint32
+	Val [32]uint32
 }
 
-const _SC_PAGESIZE = 0x1e
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
 
 type Termios struct {
 	Iflag  uint32
@@ -658,3 +733,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint32
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x20
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [122]int8
+	_      uint32
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	Start     uint32
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int32
+	Bsize   int32
+	Frsize  int32
+	_       [4]byte
+	Blocks  uint64
+	Bfree   uint64
+	Files   uint64
+	Ffree   uint64
+	Bavail  uint64
+	Fsid    Fsid
+	Namelen int32
+	Flags   int32
+	Spare   [5]int32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint32
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x18
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
index 88538cbdc4..b709a519e4 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build ppc64,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -98,61 +99,96 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev                uint64
-	Ino                uint64
-	Nlink              uint64
-	Mode               uint32
-	Uid                uint32
-	Gid                uint32
-	X__pad2            int32
-	Rdev               uint64
-	Size               int64
-	Blksize            int64
-	Blocks             int64
-	Atim               Timespec
-	Mtim               Timespec
-	Ctim               Timespec
-	X__glibc_reserved4 uint64
-	X__glibc_reserved5 uint64
-	X__glibc_reserved6 uint64
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       uint64
+	_       uint64
+	_       uint64
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -207,11 +243,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -268,23 +313,29 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint64
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -320,7 +371,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -355,13 +406,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -373,97 +427,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x23
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -494,12 +574,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -542,9 +622,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -552,7 +632,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]uint8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -588,42 +667,49 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
+	_         [0]uint8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]uint8
+	Fpack  [6]uint8
+	_      [4]byte
 }
 
 type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -645,9 +731,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -658,3 +748,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]uint8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
index 2f63bc0326..698eb2603a 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_ppc64le.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build ppc64le,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_linux.go
 
 package unix
 
@@ -32,13 +33,13 @@ type Timeval struct {
 
 type Timex struct {
 	Modes     uint32
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Offset    int64
 	Freq      int64
 	Maxerror  int64
 	Esterror  int64
 	Status    int32
-	Pad_cgo_1 [4]byte
+	_         [4]byte
 	Constant  int64
 	Precision int64
 	Tolerance int64
@@ -47,14 +48,14 @@ type Timex struct {
 	Ppsfreq   int64
 	Jitter    int64
 	Shift     int32
-	Pad_cgo_2 [4]byte
+	_         [4]byte
 	Stabil    int64
 	Jitcnt    int64
 	Calcnt    int64
 	Errcnt    int64
 	Stbcnt    int64
 	Tai       int32
-	Pad_cgo_3 [44]byte
+	_         [44]byte
 }
 
 type Time_t int64
@@ -98,61 +99,96 @@ type Rlimit struct {
 type _Gid_t uint32
 
 type Stat_t struct {
-	Dev                uint64
-	Ino                uint64
-	Nlink              uint64
-	Mode               uint32
-	Uid                uint32
-	Gid                uint32
-	X__pad2            int32
-	Rdev               uint64
-	Size               int64
-	Blksize            int64
-	Blocks             int64
-	Atim               Timespec
-	Mtim               Timespec
-	Ctim               Timespec
-	X__glibc_reserved4 uint64
-	X__glibc_reserved5 uint64
-	X__glibc_reserved6 uint64
+	Dev     uint64
+	Ino     uint64
+	Nlink   uint64
+	Mode    uint32
+	Uid     uint32
+	Gid     uint32
+	_       int32
+	Rdev    uint64
+	Size    int64
+	Blksize int64
+	Blocks  int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	_       uint64
+	_       uint64
+	_       uint64
 }
 
-type Statfs_t struct {
-	Type    int64
-	Bsize   int64
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen int64
-	Frsize  int64
-	Flags   int64
-	Spare   [4]int64
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Type      uint8
-	Name      [256]uint8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Type   uint8
+	Name   [256]uint8
+	_      [5]byte
 }
 
 type Fsid struct {
-	X__val [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Pid       int32
-	Pad_cgo_1 [4]byte
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Pid    int32
+	_      [4]byte
+}
+
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
 }
 
 const (
@@ -207,11 +243,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -268,23 +313,29 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
-	Pad_cgo_0  [4]byte
+	_          [4]byte
 	Iov        *Iovec
 	Iovlen     uint64
 	Control    *byte
 	Controllen uint64
 	Flags      int32
-	Pad_cgo_1  [4]byte
+	_          [4]byte
 }
 
 type Cmsghdr struct {
-	Len          uint64
-	Level        int32
-	Type         int32
-	X__cmsg_data [0]uint8
+	Len   uint64
+	Level int32
+	Type  int32
 }
 
 type Inet4Pktinfo struct {
@@ -320,7 +371,7 @@ type TCPInfo struct {
 	Probes         uint8
 	Backoff        uint8
 	Options        uint8
-	Pad_cgo_0      [2]byte
+	_              [2]byte
 	Rto            uint32
 	Ato            uint32
 	Snd_mss        uint32
@@ -355,13 +406,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -373,97 +427,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x22
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -494,12 +574,12 @@ type RtAttr struct {
 }
 
 type IfInfomsg struct {
-	Family     uint8
-	X__ifi_pad uint8
-	Type       uint16
-	Index      int32
-	Flags      uint32
-	Change     uint32
+	Family uint8
+	_      uint8
+	Type   uint16
+	Index  int32
+	Flags  uint32
+	Change uint32
 }
 
 type IfAddrmsg struct {
@@ -542,9 +622,9 @@ type SockFilter struct {
 }
 
 type SockFprog struct {
-	Len       uint16
-	Pad_cgo_0 [6]byte
-	Filter    *SockFilter
+	Len    uint16
+	_      [6]byte
+	Filter *SockFilter
 }
 
 type InotifyEvent struct {
@@ -552,7 +632,6 @@ type InotifyEvent struct {
 	Mask   uint32
 	Cookie uint32
 	Len    uint32
-	Name   [0]uint8
 }
 
 const SizeofInotifyEvent = 0x10
@@ -588,42 +667,49 @@ type Sysinfo_t struct {
 	Freeswap  uint64
 	Procs     uint16
 	Pad       uint16
-	Pad_cgo_0 [4]byte
+	_         [4]byte
 	Totalhigh uint64
 	Freehigh  uint64
 	Unit      uint32
-	X_f       [0]uint8
-	Pad_cgo_1 [4]byte
+	_         [0]uint8
+	_         [4]byte
 }
 
 type Utsname struct {
-	Sysname    [65]uint8
-	Nodename   [65]uint8
-	Release    [65]uint8
-	Version    [65]uint8
-	Machine    [65]uint8
-	Domainname [65]uint8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
-	Tfree     int32
-	Pad_cgo_0 [4]byte
-	Tinode    uint64
-	Fname     [6]uint8
-	Fpack     [6]uint8
-	Pad_cgo_1 [4]byte
+	Tfree  int32
+	_      [4]byte
+	Tinode uint64
+	Fname  [6]uint8
+	Fpack  [6]uint8
+	_      [4]byte
 }
 
 type EpollEvent struct {
-	Events  uint32
-	X_padFd int32
-	Fd      int32
-	Pad     int32
+	Events uint32
+	_      int32
+	Fd     int32
+	Pad    int32
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -645,9 +731,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x40045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -658,3 +748,619 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]uint8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x1
+	CBitFieldMaskBit1  = 0x2
+	CBitFieldMaskBit2  = 0x4
+	CBitFieldMaskBit3  = 0x8
+	CBitFieldMaskBit4  = 0x10
+	CBitFieldMaskBit5  = 0x20
+	CBitFieldMaskBit6  = 0x40
+	CBitFieldMaskBit7  = 0x80
+	CBitFieldMaskBit8  = 0x100
+	CBitFieldMaskBit9  = 0x200
+	CBitFieldMaskBit10 = 0x400
+	CBitFieldMaskBit11 = 0x800
+	CBitFieldMaskBit12 = 0x1000
+	CBitFieldMaskBit13 = 0x2000
+	CBitFieldMaskBit14 = 0x4000
+	CBitFieldMaskBit15 = 0x8000
+	CBitFieldMaskBit16 = 0x10000
+	CBitFieldMaskBit17 = 0x20000
+	CBitFieldMaskBit18 = 0x40000
+	CBitFieldMaskBit19 = 0x80000
+	CBitFieldMaskBit20 = 0x100000
+	CBitFieldMaskBit21 = 0x200000
+	CBitFieldMaskBit22 = 0x400000
+	CBitFieldMaskBit23 = 0x800000
+	CBitFieldMaskBit24 = 0x1000000
+	CBitFieldMaskBit25 = 0x2000000
+	CBitFieldMaskBit26 = 0x4000000
+	CBitFieldMaskBit27 = 0x8000000
+	CBitFieldMaskBit28 = 0x10000000
+	CBitFieldMaskBit29 = 0x20000000
+	CBitFieldMaskBit30 = 0x40000000
+	CBitFieldMaskBit31 = 0x80000000
+	CBitFieldMaskBit32 = 0x100000000
+	CBitFieldMaskBit33 = 0x200000000
+	CBitFieldMaskBit34 = 0x400000000
+	CBitFieldMaskBit35 = 0x800000000
+	CBitFieldMaskBit36 = 0x1000000000
+	CBitFieldMaskBit37 = 0x2000000000
+	CBitFieldMaskBit38 = 0x4000000000
+	CBitFieldMaskBit39 = 0x8000000000
+	CBitFieldMaskBit40 = 0x10000000000
+	CBitFieldMaskBit41 = 0x20000000000
+	CBitFieldMaskBit42 = 0x40000000000
+	CBitFieldMaskBit43 = 0x80000000000
+	CBitFieldMaskBit44 = 0x100000000000
+	CBitFieldMaskBit45 = 0x200000000000
+	CBitFieldMaskBit46 = 0x400000000000
+	CBitFieldMaskBit47 = 0x800000000000
+	CBitFieldMaskBit48 = 0x1000000000000
+	CBitFieldMaskBit49 = 0x2000000000000
+	CBitFieldMaskBit50 = 0x4000000000000
+	CBitFieldMaskBit51 = 0x8000000000000
+	CBitFieldMaskBit52 = 0x10000000000000
+	CBitFieldMaskBit53 = 0x20000000000000
+	CBitFieldMaskBit54 = 0x40000000000000
+	CBitFieldMaskBit55 = 0x80000000000000
+	CBitFieldMaskBit56 = 0x100000000000000
+	CBitFieldMaskBit57 = 0x200000000000000
+	CBitFieldMaskBit58 = 0x400000000000000
+	CBitFieldMaskBit59 = 0x800000000000000
+	CBitFieldMaskBit60 = 0x1000000000000000
+	CBitFieldMaskBit61 = 0x2000000000000000
+	CBitFieldMaskBit62 = 0x4000000000000000
+	CBitFieldMaskBit63 = 0x8000000000000000
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]uint8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    int64
+	Bsize   int64
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen int64
+	Frsize  int64
+	Flags   int64
+	Spare   [4]int64
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
index 2c5bb05d1b..c2088bf919 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_s390x.go
@@ -1,6 +1,7 @@
+// cgo -godefs -- -Wall -Werror -static -I/tmp/include -fsigned-char linux/types.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
 // +build s390x,linux
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs -- -fsigned-char types_linux.go
 
 package unix
 
@@ -115,20 +116,34 @@ type Stat_t struct {
 	_       [3]int64
 }
 
-type Statfs_t struct {
-	Type    uint32
-	Bsize   uint32
-	Blocks  uint64
-	Bfree   uint64
-	Bavail  uint64
-	Files   uint64
-	Ffree   uint64
-	Fsid    Fsid
-	Namelen uint32
-	Frsize  uint32
-	Flags   uint32
-	Spare   [4]uint32
-	_       [4]byte
+type StatxTimestamp struct {
+	Sec  int64
+	Nsec uint32
+	_    int32
+}
+
+type Statx_t struct {
+	Mask            uint32
+	Blksize         uint32
+	Attributes      uint64
+	Nlink           uint32
+	Uid             uint32
+	Gid             uint32
+	Mode            uint16
+	_               [1]uint16
+	Ino             uint64
+	Size            uint64
+	Blocks          uint64
+	Attributes_mask uint64
+	Atime           StatxTimestamp
+	Btime           StatxTimestamp
+	Ctime           StatxTimestamp
+	Mtime           StatxTimestamp
+	Rdev_major      uint32
+	Rdev_minor      uint32
+	Dev_major       uint32
+	Dev_minor       uint32
+	_               [14]uint64
 }
 
 type Dirent struct {
@@ -141,7 +156,7 @@ type Dirent struct {
 }
 
 type Fsid struct {
-	_ [2]int32
+	Val [2]int32
 }
 
 type Flock_t struct {
@@ -154,6 +169,26 @@ type Flock_t struct {
 	_      [4]byte
 }
 
+type FscryptPolicy struct {
+	Version                   uint8
+	Contents_encryption_mode  uint8
+	Filenames_encryption_mode uint8
+	Flags                     uint8
+	Master_key_descriptor     [8]uint8
+}
+
+type FscryptKey struct {
+	Mode uint32
+	Raw  [64]uint8
+	Size uint32
+}
+
+type KeyctlDHParams struct {
+	Private int32
+	Prime   int32
+	Base    int32
+}
+
 const (
 	FADV_NORMAL     = 0x0
 	FADV_RANDOM     = 0x1
@@ -206,11 +241,20 @@ type RawSockaddrHCI struct {
 	Channel uint16
 }
 
+type RawSockaddrL2 struct {
+	Family      uint16
+	Psm         uint16
+	Bdaddr      [6]uint8
+	Cid         uint16
+	Bdaddr_type uint8
+	_           [1]byte
+}
+
 type RawSockaddrCAN struct {
-	Family    uint16
-	Pad_cgo_0 [2]byte
-	Ifindex   int32
-	Addr      [8]byte
+	Family  uint16
+	_       [2]byte
+	Ifindex int32
+	Addr    [8]byte
 }
 
 type RawSockaddrALG struct {
@@ -267,6 +311,13 @@ type IPv6Mreq struct {
 	Interface uint32
 }
 
+type PacketMreq struct {
+	Ifindex int32
+	Type    uint16
+	Alen    uint16
+	Address [8]uint8
+}
+
 type Msghdr struct {
 	Name       *byte
 	Namelen    uint32
@@ -353,13 +404,16 @@ const (
 	SizeofSockaddrLinklayer = 0x14
 	SizeofSockaddrNetlink   = 0xc
 	SizeofSockaddrHCI       = 0x6
+	SizeofSockaddrL2        = 0xe
 	SizeofSockaddrCAN       = 0x10
 	SizeofSockaddrALG       = 0x58
 	SizeofSockaddrVM        = 0x10
 	SizeofLinger            = 0x8
+	SizeofIovec             = 0x10
 	SizeofIPMreq            = 0x8
 	SizeofIPMreqn           = 0xc
 	SizeofIPv6Mreq          = 0x14
+	SizeofPacketMreq        = 0x10
 	SizeofMsghdr            = 0x38
 	SizeofCmsghdr           = 0x10
 	SizeofInet4Pktinfo      = 0xc
@@ -371,97 +425,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x27
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x31
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -612,12 +692,12 @@ type Sysinfo_t struct {
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -637,8 +717,15 @@ type EpollEvent struct {
 }
 
 const (
-	AT_FDCWD            = -0x64
-	AT_REMOVEDIR        = 0x200
+	AT_EMPTY_PATH   = 0x1000
+	AT_FDCWD        = -0x64
+	AT_NO_AUTOMOUNT = 0x800
+	AT_REMOVEDIR    = 0x200
+
+	AT_STATX_SYNC_AS_STAT = 0x0
+	AT_STATX_FORCE_SYNC   = 0x2000
+	AT_STATX_DONT_SYNC    = 0x4000
+
 	AT_SYMLINK_FOLLOW   = 0x400
 	AT_SYMLINK_NOFOLLOW = 0x100
 )
@@ -660,9 +747,13 @@ const (
 )
 
 type Sigset_t struct {
-	X__val [16]uint64
+	Val [16]uint64
 }
 
+const RNDGETENTCNT = 0x80045200
+
+const PERF_IOC_FLAG_GROUP = 0x1
+
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
@@ -673,3 +764,620 @@ type Termios struct {
 	Ispeed uint32
 	Ospeed uint32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+type Taskstats struct {
+	Version                   uint16
+	_                         [2]byte
+	Ac_exitcode               uint32
+	Ac_flag                   uint8
+	Ac_nice                   uint8
+	_                         [6]byte
+	Cpu_count                 uint64
+	Cpu_delay_total           uint64
+	Blkio_count               uint64
+	Blkio_delay_total         uint64
+	Swapin_count              uint64
+	Swapin_delay_total        uint64
+	Cpu_run_real_total        uint64
+	Cpu_run_virtual_total     uint64
+	Ac_comm                   [32]int8
+	Ac_sched                  uint8
+	Ac_pad                    [3]uint8
+	_                         [4]byte
+	Ac_uid                    uint32
+	Ac_gid                    uint32
+	Ac_pid                    uint32
+	Ac_ppid                   uint32
+	Ac_btime                  uint32
+	_                         [4]byte
+	Ac_etime                  uint64
+	Ac_utime                  uint64
+	Ac_stime                  uint64
+	Ac_minflt                 uint64
+	Ac_majflt                 uint64
+	Coremem                   uint64
+	Virtmem                   uint64
+	Hiwater_rss               uint64
+	Hiwater_vm                uint64
+	Read_char                 uint64
+	Write_char                uint64
+	Read_syscalls             uint64
+	Write_syscalls            uint64
+	Read_bytes                uint64
+	Write_bytes               uint64
+	Cancelled_write_bytes     uint64
+	Nvcsw                     uint64
+	Nivcsw                    uint64
+	Ac_utimescaled            uint64
+	Ac_stimescaled            uint64
+	Cpu_scaled_run_real_total uint64
+	Freepages_count           uint64
+	Freepages_delay_total     uint64
+}
+
+const (
+	TASKSTATS_CMD_UNSPEC                  = 0x0
+	TASKSTATS_CMD_GET                     = 0x1
+	TASKSTATS_CMD_NEW                     = 0x2
+	TASKSTATS_TYPE_UNSPEC                 = 0x0
+	TASKSTATS_TYPE_PID                    = 0x1
+	TASKSTATS_TYPE_TGID                   = 0x2
+	TASKSTATS_TYPE_STATS                  = 0x3
+	TASKSTATS_TYPE_AGGR_PID               = 0x4
+	TASKSTATS_TYPE_AGGR_TGID              = 0x5
+	TASKSTATS_TYPE_NULL                   = 0x6
+	TASKSTATS_CMD_ATTR_UNSPEC             = 0x0
+	TASKSTATS_CMD_ATTR_PID                = 0x1
+	TASKSTATS_CMD_ATTR_TGID               = 0x2
+	TASKSTATS_CMD_ATTR_REGISTER_CPUMASK   = 0x3
+	TASKSTATS_CMD_ATTR_DEREGISTER_CPUMASK = 0x4
+)
+
+type CGroupStats struct {
+	Sleeping        uint64
+	Running         uint64
+	Stopped         uint64
+	Uninterruptible uint64
+	Io_wait         uint64
+}
+
+const (
+	CGROUPSTATS_CMD_UNSPEC        = 0x3
+	CGROUPSTATS_CMD_GET           = 0x4
+	CGROUPSTATS_CMD_NEW           = 0x5
+	CGROUPSTATS_TYPE_UNSPEC       = 0x0
+	CGROUPSTATS_TYPE_CGROUP_STATS = 0x1
+	CGROUPSTATS_CMD_ATTR_UNSPEC   = 0x0
+	CGROUPSTATS_CMD_ATTR_FD       = 0x1
+)
+
+type Genlmsghdr struct {
+	Cmd      uint8
+	Version  uint8
+	Reserved uint16
+}
+
+const (
+	CTRL_CMD_UNSPEC            = 0x0
+	CTRL_CMD_NEWFAMILY         = 0x1
+	CTRL_CMD_DELFAMILY         = 0x2
+	CTRL_CMD_GETFAMILY         = 0x3
+	CTRL_CMD_NEWOPS            = 0x4
+	CTRL_CMD_DELOPS            = 0x5
+	CTRL_CMD_GETOPS            = 0x6
+	CTRL_CMD_NEWMCAST_GRP      = 0x7
+	CTRL_CMD_DELMCAST_GRP      = 0x8
+	CTRL_CMD_GETMCAST_GRP      = 0x9
+	CTRL_ATTR_UNSPEC           = 0x0
+	CTRL_ATTR_FAMILY_ID        = 0x1
+	CTRL_ATTR_FAMILY_NAME      = 0x2
+	CTRL_ATTR_VERSION          = 0x3
+	CTRL_ATTR_HDRSIZE          = 0x4
+	CTRL_ATTR_MAXATTR          = 0x5
+	CTRL_ATTR_OPS              = 0x6
+	CTRL_ATTR_MCAST_GROUPS     = 0x7
+	CTRL_ATTR_OP_UNSPEC        = 0x0
+	CTRL_ATTR_OP_ID            = 0x1
+	CTRL_ATTR_OP_FLAGS         = 0x2
+	CTRL_ATTR_MCAST_GRP_UNSPEC = 0x0
+	CTRL_ATTR_MCAST_GRP_NAME   = 0x1
+	CTRL_ATTR_MCAST_GRP_ID     = 0x2
+)
+
+type cpuMask uint64
+
+const (
+	_CPU_SETSIZE = 0x400
+	_NCPUBITS    = 0x40
+)
+
+const (
+	BDADDR_BREDR     = 0x0
+	BDADDR_LE_PUBLIC = 0x1
+	BDADDR_LE_RANDOM = 0x2
+)
+
+type PerfEventAttr struct {
+	Type               uint32
+	Size               uint32
+	Config             uint64
+	Sample             uint64
+	Sample_type        uint64
+	Read_format        uint64
+	Bits               uint64
+	Wakeup             uint32
+	Bp_type            uint32
+	Ext1               uint64
+	Ext2               uint64
+	Branch_sample_type uint64
+	Sample_regs_user   uint64
+	Sample_stack_user  uint32
+	Clockid            int32
+	Sample_regs_intr   uint64
+	Aux_watermark      uint32
+	_                  uint32
+}
+
+type PerfEventMmapPage struct {
+	Version        uint32
+	Compat_version uint32
+	Lock           uint32
+	Index          uint32
+	Offset         int64
+	Time_enabled   uint64
+	Time_running   uint64
+	Capabilities   uint64
+	Pmc_width      uint16
+	Time_shift     uint16
+	Time_mult      uint32
+	Time_offset    uint64
+	Time_zero      uint64
+	Size           uint32
+	_              [948]uint8
+	Data_head      uint64
+	Data_tail      uint64
+	Data_offset    uint64
+	Data_size      uint64
+	Aux_head       uint64
+	Aux_tail       uint64
+	Aux_offset     uint64
+	Aux_size       uint64
+}
+
+const (
+	PerfBitDisabled               uint64 = CBitFieldMaskBit0
+	PerfBitInherit                       = CBitFieldMaskBit1
+	PerfBitPinned                        = CBitFieldMaskBit2
+	PerfBitExclusive                     = CBitFieldMaskBit3
+	PerfBitExcludeUser                   = CBitFieldMaskBit4
+	PerfBitExcludeKernel                 = CBitFieldMaskBit5
+	PerfBitExcludeHv                     = CBitFieldMaskBit6
+	PerfBitExcludeIdle                   = CBitFieldMaskBit7
+	PerfBitMmap                          = CBitFieldMaskBit8
+	PerfBitComm                          = CBitFieldMaskBit9
+	PerfBitFreq                          = CBitFieldMaskBit10
+	PerfBitInheritStat                   = CBitFieldMaskBit11
+	PerfBitEnableOnExec                  = CBitFieldMaskBit12
+	PerfBitTask                          = CBitFieldMaskBit13
+	PerfBitWatermark                     = CBitFieldMaskBit14
+	PerfBitPreciseIPBit1                 = CBitFieldMaskBit15
+	PerfBitPreciseIPBit2                 = CBitFieldMaskBit16
+	PerfBitMmapData                      = CBitFieldMaskBit17
+	PerfBitSampleIDAll                   = CBitFieldMaskBit18
+	PerfBitExcludeHost                   = CBitFieldMaskBit19
+	PerfBitExcludeGuest                  = CBitFieldMaskBit20
+	PerfBitExcludeCallchainKernel        = CBitFieldMaskBit21
+	PerfBitExcludeCallchainUser          = CBitFieldMaskBit22
+	PerfBitMmap2                         = CBitFieldMaskBit23
+	PerfBitCommExec                      = CBitFieldMaskBit24
+	PerfBitUseClockID                    = CBitFieldMaskBit25
+	PerfBitContextSwitch                 = CBitFieldMaskBit26
+)
+
+const (
+	PERF_TYPE_HARDWARE   = 0x0
+	PERF_TYPE_SOFTWARE   = 0x1
+	PERF_TYPE_TRACEPOINT = 0x2
+	PERF_TYPE_HW_CACHE   = 0x3
+	PERF_TYPE_RAW        = 0x4
+	PERF_TYPE_BREAKPOINT = 0x5
+
+	PERF_COUNT_HW_CPU_CYCLES              = 0x0
+	PERF_COUNT_HW_INSTRUCTIONS            = 0x1
+	PERF_COUNT_HW_CACHE_REFERENCES        = 0x2
+	PERF_COUNT_HW_CACHE_MISSES            = 0x3
+	PERF_COUNT_HW_BRANCH_INSTRUCTIONS     = 0x4
+	PERF_COUNT_HW_BRANCH_MISSES           = 0x5
+	PERF_COUNT_HW_BUS_CYCLES              = 0x6
+	PERF_COUNT_HW_STALLED_CYCLES_FRONTEND = 0x7
+	PERF_COUNT_HW_STALLED_CYCLES_BACKEND  = 0x8
+	PERF_COUNT_HW_REF_CPU_CYCLES          = 0x9
+
+	PERF_COUNT_HW_CACHE_L1D  = 0x0
+	PERF_COUNT_HW_CACHE_L1I  = 0x1
+	PERF_COUNT_HW_CACHE_LL   = 0x2
+	PERF_COUNT_HW_CACHE_DTLB = 0x3
+	PERF_COUNT_HW_CACHE_ITLB = 0x4
+	PERF_COUNT_HW_CACHE_BPU  = 0x5
+	PERF_COUNT_HW_CACHE_NODE = 0x6
+
+	PERF_COUNT_HW_CACHE_OP_READ     = 0x0
+	PERF_COUNT_HW_CACHE_OP_WRITE    = 0x1
+	PERF_COUNT_HW_CACHE_OP_PREFETCH = 0x2
+
+	PERF_COUNT_HW_CACHE_RESULT_ACCESS = 0x0
+	PERF_COUNT_HW_CACHE_RESULT_MISS   = 0x1
+
+	PERF_COUNT_SW_CPU_CLOCK        = 0x0
+	PERF_COUNT_SW_TASK_CLOCK       = 0x1
+	PERF_COUNT_SW_PAGE_FAULTS      = 0x2
+	PERF_COUNT_SW_CONTEXT_SWITCHES = 0x3
+	PERF_COUNT_SW_CPU_MIGRATIONS   = 0x4
+	PERF_COUNT_SW_PAGE_FAULTS_MIN  = 0x5
+	PERF_COUNT_SW_PAGE_FAULTS_MAJ  = 0x6
+	PERF_COUNT_SW_ALIGNMENT_FAULTS = 0x7
+	PERF_COUNT_SW_EMULATION_FAULTS = 0x8
+	PERF_COUNT_SW_DUMMY            = 0x9
+
+	PERF_SAMPLE_IP           = 0x1
+	PERF_SAMPLE_TID          = 0x2
+	PERF_SAMPLE_TIME         = 0x4
+	PERF_SAMPLE_ADDR         = 0x8
+	PERF_SAMPLE_READ         = 0x10
+	PERF_SAMPLE_CALLCHAIN    = 0x20
+	PERF_SAMPLE_ID           = 0x40
+	PERF_SAMPLE_CPU          = 0x80
+	PERF_SAMPLE_PERIOD       = 0x100
+	PERF_SAMPLE_STREAM_ID    = 0x200
+	PERF_SAMPLE_RAW          = 0x400
+	PERF_SAMPLE_BRANCH_STACK = 0x800
+
+	PERF_SAMPLE_BRANCH_USER       = 0x1
+	PERF_SAMPLE_BRANCH_KERNEL     = 0x2
+	PERF_SAMPLE_BRANCH_HV         = 0x4
+	PERF_SAMPLE_BRANCH_ANY        = 0x8
+	PERF_SAMPLE_BRANCH_ANY_CALL   = 0x10
+	PERF_SAMPLE_BRANCH_ANY_RETURN = 0x20
+	PERF_SAMPLE_BRANCH_IND_CALL   = 0x40
+
+	PERF_FORMAT_TOTAL_TIME_ENABLED = 0x1
+	PERF_FORMAT_TOTAL_TIME_RUNNING = 0x2
+	PERF_FORMAT_ID                 = 0x4
+	PERF_FORMAT_GROUP              = 0x8
+
+	PERF_RECORD_MMAP       = 0x1
+	PERF_RECORD_LOST       = 0x2
+	PERF_RECORD_COMM       = 0x3
+	PERF_RECORD_EXIT       = 0x4
+	PERF_RECORD_THROTTLE   = 0x5
+	PERF_RECORD_UNTHROTTLE = 0x6
+	PERF_RECORD_FORK       = 0x7
+	PERF_RECORD_READ       = 0x8
+	PERF_RECORD_SAMPLE     = 0x9
+
+	PERF_CONTEXT_HV     = -0x20
+	PERF_CONTEXT_KERNEL = -0x80
+	PERF_CONTEXT_USER   = -0x200
+
+	PERF_CONTEXT_GUEST        = -0x800
+	PERF_CONTEXT_GUEST_KERNEL = -0x880
+	PERF_CONTEXT_GUEST_USER   = -0xa00
+
+	PERF_FLAG_FD_NO_GROUP = 0x1
+	PERF_FLAG_FD_OUTPUT   = 0x2
+	PERF_FLAG_PID_CGROUP  = 0x4
+)
+
+const (
+	CBitFieldMaskBit0  = 0x8000000000000000
+	CBitFieldMaskBit1  = 0x4000000000000000
+	CBitFieldMaskBit2  = 0x2000000000000000
+	CBitFieldMaskBit3  = 0x1000000000000000
+	CBitFieldMaskBit4  = 0x800000000000000
+	CBitFieldMaskBit5  = 0x400000000000000
+	CBitFieldMaskBit6  = 0x200000000000000
+	CBitFieldMaskBit7  = 0x100000000000000
+	CBitFieldMaskBit8  = 0x80000000000000
+	CBitFieldMaskBit9  = 0x40000000000000
+	CBitFieldMaskBit10 = 0x20000000000000
+	CBitFieldMaskBit11 = 0x10000000000000
+	CBitFieldMaskBit12 = 0x8000000000000
+	CBitFieldMaskBit13 = 0x4000000000000
+	CBitFieldMaskBit14 = 0x2000000000000
+	CBitFieldMaskBit15 = 0x1000000000000
+	CBitFieldMaskBit16 = 0x800000000000
+	CBitFieldMaskBit17 = 0x400000000000
+	CBitFieldMaskBit18 = 0x200000000000
+	CBitFieldMaskBit19 = 0x100000000000
+	CBitFieldMaskBit20 = 0x80000000000
+	CBitFieldMaskBit21 = 0x40000000000
+	CBitFieldMaskBit22 = 0x20000000000
+	CBitFieldMaskBit23 = 0x10000000000
+	CBitFieldMaskBit24 = 0x8000000000
+	CBitFieldMaskBit25 = 0x4000000000
+	CBitFieldMaskBit26 = 0x2000000000
+	CBitFieldMaskBit27 = 0x1000000000
+	CBitFieldMaskBit28 = 0x800000000
+	CBitFieldMaskBit29 = 0x400000000
+	CBitFieldMaskBit30 = 0x200000000
+	CBitFieldMaskBit31 = 0x100000000
+	CBitFieldMaskBit32 = 0x80000000
+	CBitFieldMaskBit33 = 0x40000000
+	CBitFieldMaskBit34 = 0x20000000
+	CBitFieldMaskBit35 = 0x10000000
+	CBitFieldMaskBit36 = 0x8000000
+	CBitFieldMaskBit37 = 0x4000000
+	CBitFieldMaskBit38 = 0x2000000
+	CBitFieldMaskBit39 = 0x1000000
+	CBitFieldMaskBit40 = 0x800000
+	CBitFieldMaskBit41 = 0x400000
+	CBitFieldMaskBit42 = 0x200000
+	CBitFieldMaskBit43 = 0x100000
+	CBitFieldMaskBit44 = 0x80000
+	CBitFieldMaskBit45 = 0x40000
+	CBitFieldMaskBit46 = 0x20000
+	CBitFieldMaskBit47 = 0x10000
+	CBitFieldMaskBit48 = 0x8000
+	CBitFieldMaskBit49 = 0x4000
+	CBitFieldMaskBit50 = 0x2000
+	CBitFieldMaskBit51 = 0x1000
+	CBitFieldMaskBit52 = 0x800
+	CBitFieldMaskBit53 = 0x400
+	CBitFieldMaskBit54 = 0x200
+	CBitFieldMaskBit55 = 0x100
+	CBitFieldMaskBit56 = 0x80
+	CBitFieldMaskBit57 = 0x40
+	CBitFieldMaskBit58 = 0x20
+	CBitFieldMaskBit59 = 0x10
+	CBitFieldMaskBit60 = 0x8
+	CBitFieldMaskBit61 = 0x4
+	CBitFieldMaskBit62 = 0x2
+	CBitFieldMaskBit63 = 0x1
+)
+
+type SockaddrStorage struct {
+	Family uint16
+	_      [118]int8
+	_      uint64
+}
+
+type TCPMD5Sig struct {
+	Addr      SockaddrStorage
+	Flags     uint8
+	Prefixlen uint8
+	Keylen    uint16
+	_         uint32
+	Key       [80]uint8
+}
+
+type HDDriveCmdHdr struct {
+	Command uint8
+	Number  uint8
+	Feature uint8
+	Count   uint8
+}
+
+type HDGeometry struct {
+	Heads     uint8
+	Sectors   uint8
+	Cylinders uint16
+	_         [4]byte
+	Start     uint64
+}
+
+type HDDriveID struct {
+	Config         uint16
+	Cyls           uint16
+	Reserved2      uint16
+	Heads          uint16
+	Track_bytes    uint16
+	Sector_bytes   uint16
+	Sectors        uint16
+	Vendor0        uint16
+	Vendor1        uint16
+	Vendor2        uint16
+	Serial_no      [20]uint8
+	Buf_type       uint16
+	Buf_size       uint16
+	Ecc_bytes      uint16
+	Fw_rev         [8]uint8
+	Model          [40]uint8
+	Max_multsect   uint8
+	Vendor3        uint8
+	Dword_io       uint16
+	Vendor4        uint8
+	Capability     uint8
+	Reserved50     uint16
+	Vendor5        uint8
+	TPIO           uint8
+	Vendor6        uint8
+	TDMA           uint8
+	Field_valid    uint16
+	Cur_cyls       uint16
+	Cur_heads      uint16
+	Cur_sectors    uint16
+	Cur_capacity0  uint16
+	Cur_capacity1  uint16
+	Multsect       uint8
+	Multsect_valid uint8
+	Lba_capacity   uint32
+	Dma_1word      uint16
+	Dma_mword      uint16
+	Eide_pio_modes uint16
+	Eide_dma_min   uint16
+	Eide_dma_time  uint16
+	Eide_pio       uint16
+	Eide_pio_iordy uint16
+	Words69_70     [2]uint16
+	Words71_74     [4]uint16
+	Queue_depth    uint16
+	Words76_79     [4]uint16
+	Major_rev_num  uint16
+	Minor_rev_num  uint16
+	Command_set_1  uint16
+	Command_set_2  uint16
+	Cfsse          uint16
+	Cfs_enable_1   uint16
+	Cfs_enable_2   uint16
+	Csf_default    uint16
+	Dma_ultra      uint16
+	Trseuc         uint16
+	TrsEuc         uint16
+	CurAPMvalues   uint16
+	Mprc           uint16
+	Hw_config      uint16
+	Acoustic       uint16
+	Msrqs          uint16
+	Sxfert         uint16
+	Sal            uint16
+	Spg            uint32
+	Lba_capacity_2 uint64
+	Words104_125   [22]uint16
+	Last_lun       uint16
+	Word127        uint16
+	Dlf            uint16
+	Csfo           uint16
+	Words130_155   [26]uint16
+	Word156        uint16
+	Words157_159   [3]uint16
+	Cfa_power      uint16
+	Words161_175   [15]uint16
+	Words176_205   [30]uint16
+	Words206_254   [49]uint16
+	Integrity_word uint16
+}
+
+type Statfs_t struct {
+	Type    uint32
+	Bsize   uint32
+	Blocks  uint64
+	Bfree   uint64
+	Bavail  uint64
+	Files   uint64
+	Ffree   uint64
+	Fsid    Fsid
+	Namelen uint32
+	Frsize  uint32
+	Flags   uint32
+	Spare   [4]uint32
+	_       [4]byte
+}
+
+const (
+	ST_MANDLOCK    = 0x40
+	ST_NOATIME     = 0x400
+	ST_NODEV       = 0x4
+	ST_NODIRATIME  = 0x800
+	ST_NOEXEC      = 0x8
+	ST_NOSUID      = 0x2
+	ST_RDONLY      = 0x1
+	ST_RELATIME    = 0x1000
+	ST_SYNCHRONOUS = 0x10
+)
+
+type TpacketHdr struct {
+	Status  uint64
+	Len     uint32
+	Snaplen uint32
+	Mac     uint16
+	Net     uint16
+	Sec     uint32
+	Usec    uint32
+	_       [4]byte
+}
+
+type Tpacket2Hdr struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Sec       uint32
+	Nsec      uint32
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+	_         [4]uint8
+}
+
+type Tpacket3Hdr struct {
+	Next_offset uint32
+	Sec         uint32
+	Nsec        uint32
+	Snaplen     uint32
+	Len         uint32
+	Status      uint32
+	Mac         uint16
+	Net         uint16
+	Hv1         TpacketHdrVariant1
+	_           [8]uint8
+}
+
+type TpacketHdrVariant1 struct {
+	Rxhash    uint32
+	Vlan_tci  uint32
+	Vlan_tpid uint16
+	_         uint16
+}
+
+type TpacketBlockDesc struct {
+	Version uint32
+	To_priv uint32
+	Hdr     [40]byte
+}
+
+type TpacketReq struct {
+	Block_size uint32
+	Block_nr   uint32
+	Frame_size uint32
+	Frame_nr   uint32
+}
+
+type TpacketReq3 struct {
+	Block_size       uint32
+	Block_nr         uint32
+	Frame_size       uint32
+	Frame_nr         uint32
+	Retire_blk_tov   uint32
+	Sizeof_priv      uint32
+	Feature_req_word uint32
+}
+
+type TpacketStats struct {
+	Packets uint32
+	Drops   uint32
+}
+
+type TpacketStatsV3 struct {
+	Packets      uint32
+	Drops        uint32
+	Freeze_q_cnt uint32
+}
+
+type TpacketAuxdata struct {
+	Status    uint32
+	Len       uint32
+	Snaplen   uint32
+	Mac       uint16
+	Net       uint16
+	Vlan_tci  uint16
+	Vlan_tpid uint16
+}
+
+const (
+	TPACKET_V1 = 0x0
+	TPACKET_V2 = 0x1
+	TPACKET_V3 = 0x2
+)
+
+const (
+	SizeofTpacketHdr  = 0x20
+	SizeofTpacket2Hdr = 0x20
+	SizeofTpacket3Hdr = 0x30
+)
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
index 22bdab9614..8e7384b89c 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_linux_sparc64.go
@@ -376,97 +376,123 @@ const (
 )
 
 const (
-	IFA_UNSPEC          = 0x0
-	IFA_ADDRESS         = 0x1
-	IFA_LOCAL           = 0x2
-	IFA_LABEL           = 0x3
-	IFA_BROADCAST       = 0x4
-	IFA_ANYCAST         = 0x5
-	IFA_CACHEINFO       = 0x6
-	IFA_MULTICAST       = 0x7
-	IFLA_UNSPEC         = 0x0
-	IFLA_ADDRESS        = 0x1
-	IFLA_BROADCAST      = 0x2
-	IFLA_IFNAME         = 0x3
-	IFLA_MTU            = 0x4
-	IFLA_LINK           = 0x5
-	IFLA_QDISC          = 0x6
-	IFLA_STATS          = 0x7
-	IFLA_COST           = 0x8
-	IFLA_PRIORITY       = 0x9
-	IFLA_MASTER         = 0xa
-	IFLA_WIRELESS       = 0xb
-	IFLA_PROTINFO       = 0xc
-	IFLA_TXQLEN         = 0xd
-	IFLA_MAP            = 0xe
-	IFLA_WEIGHT         = 0xf
-	IFLA_OPERSTATE      = 0x10
-	IFLA_LINKMODE       = 0x11
-	IFLA_LINKINFO       = 0x12
-	IFLA_NET_NS_PID     = 0x13
-	IFLA_IFALIAS        = 0x14
-	IFLA_MAX            = 0x2a
-	RT_SCOPE_UNIVERSE   = 0x0
-	RT_SCOPE_SITE       = 0xc8
-	RT_SCOPE_LINK       = 0xfd
-	RT_SCOPE_HOST       = 0xfe
-	RT_SCOPE_NOWHERE    = 0xff
-	RT_TABLE_UNSPEC     = 0x0
-	RT_TABLE_COMPAT     = 0xfc
-	RT_TABLE_DEFAULT    = 0xfd
-	RT_TABLE_MAIN       = 0xfe
-	RT_TABLE_LOCAL      = 0xff
-	RT_TABLE_MAX        = 0xffffffff
-	RTA_UNSPEC          = 0x0
-	RTA_DST             = 0x1
-	RTA_SRC             = 0x2
-	RTA_IIF             = 0x3
-	RTA_OIF             = 0x4
-	RTA_GATEWAY         = 0x5
-	RTA_PRIORITY        = 0x6
-	RTA_PREFSRC         = 0x7
-	RTA_METRICS         = 0x8
-	RTA_MULTIPATH       = 0x9
-	RTA_FLOW            = 0xb
-	RTA_CACHEINFO       = 0xc
-	RTA_TABLE           = 0xf
-	RTN_UNSPEC          = 0x0
-	RTN_UNICAST         = 0x1
-	RTN_LOCAL           = 0x2
-	RTN_BROADCAST       = 0x3
-	RTN_ANYCAST         = 0x4
-	RTN_MULTICAST       = 0x5
-	RTN_BLACKHOLE       = 0x6
-	RTN_UNREACHABLE     = 0x7
-	RTN_PROHIBIT        = 0x8
-	RTN_THROW           = 0x9
-	RTN_NAT             = 0xa
-	RTN_XRESOLVE        = 0xb
-	RTNLGRP_NONE        = 0x0
-	RTNLGRP_LINK        = 0x1
-	RTNLGRP_NOTIFY      = 0x2
-	RTNLGRP_NEIGH       = 0x3
-	RTNLGRP_TC          = 0x4
-	RTNLGRP_IPV4_IFADDR = 0x5
-	RTNLGRP_IPV4_MROUTE = 0x6
-	RTNLGRP_IPV4_ROUTE  = 0x7
-	RTNLGRP_IPV4_RULE   = 0x8
-	RTNLGRP_IPV6_IFADDR = 0x9
-	RTNLGRP_IPV6_MROUTE = 0xa
-	RTNLGRP_IPV6_ROUTE  = 0xb
-	RTNLGRP_IPV6_IFINFO = 0xc
-	RTNLGRP_IPV6_PREFIX = 0x12
-	RTNLGRP_IPV6_RULE   = 0x13
-	RTNLGRP_ND_USEROPT  = 0x14
-	SizeofNlMsghdr      = 0x10
-	SizeofNlMsgerr      = 0x14
-	SizeofRtGenmsg      = 0x1
-	SizeofNlAttr        = 0x4
-	SizeofRtAttr        = 0x4
-	SizeofIfInfomsg     = 0x10
-	SizeofIfAddrmsg     = 0x8
-	SizeofRtMsg         = 0xc
-	SizeofRtNexthop     = 0x8
+	IFA_UNSPEC           = 0x0
+	IFA_ADDRESS          = 0x1
+	IFA_LOCAL            = 0x2
+	IFA_LABEL            = 0x3
+	IFA_BROADCAST        = 0x4
+	IFA_ANYCAST          = 0x5
+	IFA_CACHEINFO        = 0x6
+	IFA_MULTICAST        = 0x7
+	IFLA_UNSPEC          = 0x0
+	IFLA_ADDRESS         = 0x1
+	IFLA_BROADCAST       = 0x2
+	IFLA_IFNAME          = 0x3
+	IFLA_MTU             = 0x4
+	IFLA_LINK            = 0x5
+	IFLA_QDISC           = 0x6
+	IFLA_STATS           = 0x7
+	IFLA_COST            = 0x8
+	IFLA_PRIORITY        = 0x9
+	IFLA_MASTER          = 0xa
+	IFLA_WIRELESS        = 0xb
+	IFLA_PROTINFO        = 0xc
+	IFLA_TXQLEN          = 0xd
+	IFLA_MAP             = 0xe
+	IFLA_WEIGHT          = 0xf
+	IFLA_OPERSTATE       = 0x10
+	IFLA_LINKMODE        = 0x11
+	IFLA_LINKINFO        = 0x12
+	IFLA_NET_NS_PID      = 0x13
+	IFLA_IFALIAS         = 0x14
+	IFLA_NUM_VF          = 0x15
+	IFLA_VFINFO_LIST     = 0x16
+	IFLA_STATS64         = 0x17
+	IFLA_VF_PORTS        = 0x18
+	IFLA_PORT_SELF       = 0x19
+	IFLA_AF_SPEC         = 0x1a
+	IFLA_GROUP           = 0x1b
+	IFLA_NET_NS_FD       = 0x1c
+	IFLA_EXT_MASK        = 0x1d
+	IFLA_PROMISCUITY     = 0x1e
+	IFLA_NUM_TX_QUEUES   = 0x1f
+	IFLA_NUM_RX_QUEUES   = 0x20
+	IFLA_CARRIER         = 0x21
+	IFLA_PHYS_PORT_ID    = 0x22
+	IFLA_CARRIER_CHANGES = 0x23
+	IFLA_PHYS_SWITCH_ID  = 0x24
+	IFLA_LINK_NETNSID    = 0x25
+	IFLA_PHYS_PORT_NAME  = 0x26
+	IFLA_PROTO_DOWN      = 0x27
+	IFLA_GSO_MAX_SEGS    = 0x28
+	IFLA_GSO_MAX_SIZE    = 0x29
+	IFLA_PAD             = 0x2a
+	IFLA_XDP             = 0x2b
+	IFLA_EVENT           = 0x2c
+	IFLA_NEW_NETNSID     = 0x2d
+	IFLA_IF_NETNSID      = 0x2e
+	IFLA_MAX             = 0x2e
+	RT_SCOPE_UNIVERSE    = 0x0
+	RT_SCOPE_SITE        = 0xc8
+	RT_SCOPE_LINK        = 0xfd
+	RT_SCOPE_HOST        = 0xfe
+	RT_SCOPE_NOWHERE     = 0xff
+	RT_TABLE_UNSPEC      = 0x0
+	RT_TABLE_COMPAT      = 0xfc
+	RT_TABLE_DEFAULT     = 0xfd
+	RT_TABLE_MAIN        = 0xfe
+	RT_TABLE_LOCAL       = 0xff
+	RT_TABLE_MAX         = 0xffffffff
+	RTA_UNSPEC           = 0x0
+	RTA_DST              = 0x1
+	RTA_SRC              = 0x2
+	RTA_IIF              = 0x3
+	RTA_OIF              = 0x4
+	RTA_GATEWAY          = 0x5
+	RTA_PRIORITY         = 0x6
+	RTA_PREFSRC          = 0x7
+	RTA_METRICS          = 0x8
+	RTA_MULTIPATH        = 0x9
+	RTA_FLOW             = 0xb
+	RTA_CACHEINFO        = 0xc
+	RTA_TABLE            = 0xf
+	RTN_UNSPEC           = 0x0
+	RTN_UNICAST          = 0x1
+	RTN_LOCAL            = 0x2
+	RTN_BROADCAST        = 0x3
+	RTN_ANYCAST          = 0x4
+	RTN_MULTICAST        = 0x5
+	RTN_BLACKHOLE        = 0x6
+	RTN_UNREACHABLE      = 0x7
+	RTN_PROHIBIT         = 0x8
+	RTN_THROW            = 0x9
+	RTN_NAT              = 0xa
+	RTN_XRESOLVE         = 0xb
+	RTNLGRP_NONE         = 0x0
+	RTNLGRP_LINK         = 0x1
+	RTNLGRP_NOTIFY       = 0x2
+	RTNLGRP_NEIGH        = 0x3
+	RTNLGRP_TC           = 0x4
+	RTNLGRP_IPV4_IFADDR  = 0x5
+	RTNLGRP_IPV4_MROUTE  = 0x6
+	RTNLGRP_IPV4_ROUTE   = 0x7
+	RTNLGRP_IPV4_RULE    = 0x8
+	RTNLGRP_IPV6_IFADDR  = 0x9
+	RTNLGRP_IPV6_MROUTE  = 0xa
+	RTNLGRP_IPV6_ROUTE   = 0xb
+	RTNLGRP_IPV6_IFINFO  = 0xc
+	RTNLGRP_IPV6_PREFIX  = 0x12
+	RTNLGRP_IPV6_RULE    = 0x13
+	RTNLGRP_ND_USEROPT   = 0x14
+	SizeofNlMsghdr       = 0x10
+	SizeofNlMsgerr       = 0x14
+	SizeofRtGenmsg       = 0x1
+	SizeofNlAttr         = 0x4
+	SizeofRtAttr         = 0x4
+	SizeofIfInfomsg      = 0x10
+	SizeofIfAddrmsg      = 0x8
+	SizeofRtMsg          = 0xc
+	SizeofRtNexthop      = 0x8
 )
 
 type NlMsghdr struct {
@@ -601,12 +627,12 @@ type Sysinfo_t struct {
 }
 
 type Utsname struct {
-	Sysname    [65]int8
-	Nodename   [65]int8
-	Release    [65]int8
-	Version    [65]int8
-	Machine    [65]int8
-	Domainname [65]int8
+	Sysname    [65]byte
+	Nodename   [65]byte
+	Release    [65]byte
+	Version    [65]byte
+	Machine    [65]byte
+	Domainname [65]byte
 }
 
 type Ustat_t struct {
@@ -652,8 +678,6 @@ type Sigset_t struct {
 	X__val [16]uint64
 }
 
-const _SC_PAGESIZE = 0x1e
-
 type Termios struct {
 	Iflag  uint32
 	Oflag  uint32
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
index caf755fb86..4b86fb2b33 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_386.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,netbsd
 
@@ -99,6 +99,19 @@ type Fsid struct {
 	X__fsid_val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -382,6 +395,37 @@ type Termios struct {
 	Ospeed int32
 }
 
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
 type Sysctlnode struct {
 	Flags           uint32
 	Num             int32
@@ -394,3 +438,11 @@ type Sysctlnode struct {
 	X_sysctl_parent [8]byte
 	X_sysctl_desc   [8]byte
 }
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
index 91b4a5305a..9048a509d0 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_amd64.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,netbsd
 
@@ -103,6 +103,19 @@ type Fsid struct {
 	X__fsid_val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -389,6 +402,37 @@ type Termios struct {
 	Ospeed int32
 }
 
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
 type Sysctlnode struct {
 	Flags           uint32
 	Num             int32
@@ -401,3 +445,11 @@ type Sysctlnode struct {
 	X_sysctl_parent [8]byte
 	X_sysctl_desc   [8]byte
 }
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
index c0758f9d3f..00525e7b02 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_netbsd_arm.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_netbsd.go
+// cgo -godefs types_netbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build arm,netbsd
 
@@ -104,6 +104,19 @@ type Fsid struct {
 	X__fsid_val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
+const (
+	FADV_NORMAL     = 0x0
+	FADV_RANDOM     = 0x1
+	FADV_SEQUENTIAL = 0x2
+	FADV_WILLNEED   = 0x3
+	FADV_DONTNEED   = 0x4
+	FADV_NOREUSE    = 0x5
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -387,6 +400,37 @@ type Termios struct {
 	Ospeed int32
 }
 
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x200
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
 type Sysctlnode struct {
 	Flags           uint32
 	Num             int32
@@ -399,3 +443,11 @@ type Sysctlnode struct {
 	X_sysctl_parent [8]byte
 	X_sysctl_desc   [8]byte
 }
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
index 860a469796..d5a2d75da3 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_386.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build 386,openbsd
 
@@ -140,6 +140,10 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -439,3 +443,42 @@ type Termios struct {
 	Ispeed int32
 	Ospeed int32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
index 23c52727f7..d53141085a 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_amd64.go
@@ -1,5 +1,5 @@
-// Created by cgo -godefs - DO NOT EDIT
-// cgo -godefs types_openbsd.go
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
 
 // +build amd64,openbsd
 
@@ -142,6 +142,10 @@ type Fsid struct {
 	Val [2]int32
 }
 
+const (
+	PathMax = 0x400
+)
+
 type RawSockaddrInet4 struct {
 	Len    uint8
 	Family uint8
@@ -446,3 +450,42 @@ type Termios struct {
 	Ispeed int32
 	Ospeed int32
 }
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
new file mode 100644
index 0000000000..e35b13b6fc
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_openbsd_arm.go
@@ -0,0 +1,477 @@
+// cgo -godefs types_openbsd.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build arm,openbsd
+
+package unix
+
+const (
+	sizeofPtr      = 0x4
+	sizeofShort    = 0x2
+	sizeofInt      = 0x4
+	sizeofLong     = 0x4
+	sizeofLongLong = 0x8
+)
+
+type (
+	_C_short     int16
+	_C_int       int32
+	_C_long      int32
+	_C_long_long int64
+)
+
+type Timespec struct {
+	Sec  int64
+	Nsec int32
+}
+
+type Timeval struct {
+	Sec  int64
+	Usec int32
+}
+
+type Rusage struct {
+	Utime    Timeval
+	Stime    Timeval
+	Maxrss   int32
+	Ixrss    int32
+	Idrss    int32
+	Isrss    int32
+	Minflt   int32
+	Majflt   int32
+	Nswap    int32
+	Inblock  int32
+	Oublock  int32
+	Msgsnd   int32
+	Msgrcv   int32
+	Nsignals int32
+	Nvcsw    int32
+	Nivcsw   int32
+}
+
+type Rlimit struct {
+	Cur uint64
+	Max uint64
+}
+
+type _Gid_t uint32
+
+const (
+	S_IFMT   = 0xf000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+type Stat_t struct {
+	Mode           uint32
+	Dev            int32
+	Ino            uint64
+	Nlink          uint32
+	Uid            uint32
+	Gid            uint32
+	Rdev           int32
+	Atim           Timespec
+	Mtim           Timespec
+	Ctim           Timespec
+	Size           int64
+	Blocks         int64
+	Blksize        int32
+	Flags          uint32
+	Gen            uint32
+	X__st_birthtim Timespec
+}
+
+type Statfs_t struct {
+	F_flags       uint32
+	F_bsize       uint32
+	F_iosize      uint32
+	F_blocks      uint64
+	F_bfree       uint64
+	F_bavail      int64
+	F_files       uint64
+	F_ffree       uint64
+	F_favail      int64
+	F_syncwrites  uint64
+	F_syncreads   uint64
+	F_asyncwrites uint64
+	F_asyncreads  uint64
+	F_fsid        Fsid
+	F_namemax     uint32
+	F_owner       uint32
+	F_ctime       uint64
+	F_fstypename  [16]uint8
+	F_mntonname   [90]uint8
+	F_mntfromname [90]uint8
+	F_mntfromspec [90]uint8
+	Pad_cgo_0     [2]byte
+	Mount_info    [160]byte
+}
+
+type Flock_t struct {
+	Start  int64
+	Len    int64
+	Pid    int32
+	Type   int16
+	Whence int16
+}
+
+type Dirent struct {
+	Fileno       uint64
+	Off          int64
+	Reclen       uint16
+	Type         uint8
+	Namlen       uint8
+	X__d_padding [4]uint8
+	Name         [256]uint8
+}
+
+type Fsid struct {
+	Val [2]int32
+}
+
+const (
+	PathMax = 0x400
+)
+
+type RawSockaddrInet4 struct {
+	Len    uint8
+	Family uint8
+	Port   uint16
+	Addr   [4]byte /* in_addr */
+	Zero   [8]int8
+}
+
+type RawSockaddrInet6 struct {
+	Len      uint8
+	Family   uint8
+	Port     uint16
+	Flowinfo uint32
+	Addr     [16]byte /* in6_addr */
+	Scope_id uint32
+}
+
+type RawSockaddrUnix struct {
+	Len    uint8
+	Family uint8
+	Path   [104]int8
+}
+
+type RawSockaddrDatalink struct {
+	Len    uint8
+	Family uint8
+	Index  uint16
+	Type   uint8
+	Nlen   uint8
+	Alen   uint8
+	Slen   uint8
+	Data   [24]int8
+}
+
+type RawSockaddr struct {
+	Len    uint8
+	Family uint8
+	Data   [14]int8
+}
+
+type RawSockaddrAny struct {
+	Addr RawSockaddr
+	Pad  [92]int8
+}
+
+type _Socklen uint32
+
+type Linger struct {
+	Onoff  int32
+	Linger int32
+}
+
+type Iovec struct {
+	Base *byte
+	Len  uint32
+}
+
+type IPMreq struct {
+	Multiaddr [4]byte /* in_addr */
+	Interface [4]byte /* in_addr */
+}
+
+type IPv6Mreq struct {
+	Multiaddr [16]byte /* in6_addr */
+	Interface uint32
+}
+
+type Msghdr struct {
+	Name       *byte
+	Namelen    uint32
+	Iov        *Iovec
+	Iovlen     uint32
+	Control    *byte
+	Controllen uint32
+	Flags      int32
+}
+
+type Cmsghdr struct {
+	Len   uint32
+	Level int32
+	Type  int32
+}
+
+type Inet6Pktinfo struct {
+	Addr    [16]byte /* in6_addr */
+	Ifindex uint32
+}
+
+type IPv6MTUInfo struct {
+	Addr RawSockaddrInet6
+	Mtu  uint32
+}
+
+type ICMPv6Filter struct {
+	Filt [8]uint32
+}
+
+const (
+	SizeofSockaddrInet4    = 0x10
+	SizeofSockaddrInet6    = 0x1c
+	SizeofSockaddrAny      = 0x6c
+	SizeofSockaddrUnix     = 0x6a
+	SizeofSockaddrDatalink = 0x20
+	SizeofLinger           = 0x8
+	SizeofIPMreq           = 0x8
+	SizeofIPv6Mreq         = 0x14
+	SizeofMsghdr           = 0x1c
+	SizeofCmsghdr          = 0xc
+	SizeofInet6Pktinfo     = 0x14
+	SizeofIPv6MTUInfo      = 0x20
+	SizeofICMPv6Filter     = 0x20
+)
+
+const (
+	PTRACE_TRACEME = 0x0
+	PTRACE_CONT    = 0x7
+	PTRACE_KILL    = 0x8
+)
+
+type Kevent_t struct {
+	Ident  uint32
+	Filter int16
+	Flags  uint16
+	Fflags uint32
+	Data   int64
+	Udata  *byte
+}
+
+type FdSet struct {
+	Bits [32]uint32
+}
+
+const (
+	SizeofIfMsghdr         = 0x98
+	SizeofIfData           = 0x80
+	SizeofIfaMsghdr        = 0x18
+	SizeofIfAnnounceMsghdr = 0x1a
+	SizeofRtMsghdr         = 0x60
+	SizeofRtMetrics        = 0x38
+)
+
+type IfMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Xflags  int32
+	Data    IfData
+}
+
+type IfData struct {
+	Type         uint8
+	Addrlen      uint8
+	Hdrlen       uint8
+	Link_state   uint8
+	Mtu          uint32
+	Metric       uint32
+	Pad          uint32
+	Baudrate     uint64
+	Ipackets     uint64
+	Ierrors      uint64
+	Opackets     uint64
+	Oerrors      uint64
+	Collisions   uint64
+	Ibytes       uint64
+	Obytes       uint64
+	Imcasts      uint64
+	Omcasts      uint64
+	Iqdrops      uint64
+	Noproto      uint64
+	Capabilities uint32
+	Lastchange   Timeval
+}
+
+type IfaMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	Tableid uint16
+	Pad1    uint8
+	Pad2    uint8
+	Addrs   int32
+	Flags   int32
+	Metric  int32
+}
+
+type IfAnnounceMsghdr struct {
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Hdrlen  uint16
+	Index   uint16
+	What    uint16
+	Name    [16]uint8
+}
+
+type RtMsghdr struct {
+	Msglen   uint16
+	Version  uint8
+	Type     uint8
+	Hdrlen   uint16
+	Index    uint16
+	Tableid  uint16
+	Priority uint8
+	Mpls     uint8
+	Addrs    int32
+	Flags    int32
+	Fmask    int32
+	Pid      int32
+	Seq      int32
+	Errno    int32
+	Inits    uint32
+	Rmx      RtMetrics
+}
+
+type RtMetrics struct {
+	Pksent   uint64
+	Expire   int64
+	Locks    uint32
+	Mtu      uint32
+	Refcnt   uint32
+	Hopcount uint32
+	Recvpipe uint32
+	Sendpipe uint32
+	Ssthresh uint32
+	Rtt      uint32
+	Rttvar   uint32
+	Pad      uint32
+}
+
+type Mclpool struct{}
+
+const (
+	SizeofBpfVersion = 0x4
+	SizeofBpfStat    = 0x8
+	SizeofBpfProgram = 0x8
+	SizeofBpfInsn    = 0x8
+	SizeofBpfHdr     = 0x14
+)
+
+type BpfVersion struct {
+	Major uint16
+	Minor uint16
+}
+
+type BpfStat struct {
+	Recv uint32
+	Drop uint32
+}
+
+type BpfProgram struct {
+	Len   uint32
+	Insns *BpfInsn
+}
+
+type BpfInsn struct {
+	Code uint16
+	Jt   uint8
+	Jf   uint8
+	K    uint32
+}
+
+type BpfHdr struct {
+	Tstamp    BpfTimeval
+	Caplen    uint32
+	Datalen   uint32
+	Hdrlen    uint16
+	Pad_cgo_0 [2]byte
+}
+
+type BpfTimeval struct {
+	Sec  uint32
+	Usec uint32
+}
+
+type Termios struct {
+	Iflag  uint32
+	Oflag  uint32
+	Cflag  uint32
+	Lflag  uint32
+	Cc     [20]uint8
+	Ispeed int32
+	Ospeed int32
+}
+
+type Winsize struct {
+	Row    uint16
+	Col    uint16
+	Xpixel uint16
+	Ypixel uint16
+}
+
+const (
+	AT_FDCWD            = -0x64
+	AT_SYMLINK_NOFOLLOW = 0x2
+)
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
+
+type Utsname struct {
+	Sysname  [256]byte
+	Nodename [256]byte
+	Release  [256]byte
+	Version  [256]byte
+	Machine  [256]byte
+}
diff --git a/installer/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go b/installer/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
index 02777e4d8d..2248598d03 100644
--- a/installer/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
+++ b/installer/vendor/golang.org/x/sys/unix/ztypes_solaris_amd64.go
@@ -1,6 +1,7 @@
-// +build amd64,solaris
-// Created by cgo -godefs - DO NOT EDIT
 // cgo -godefs types_solaris.go | go run mkpost.go
+// Code generated by the command above; see README.md. DO NOT EDIT.
+
+// +build amd64,solaris
 
 package unix
 
@@ -92,40 +93,58 @@ const (
 )
 
 type Stat_t struct {
-	Dev       uint64
-	Ino       uint64
-	Mode      uint32
-	Nlink     uint32
-	Uid       uint32
-	Gid       uint32
-	Rdev      uint64
-	Size      int64
-	Atim      Timespec
-	Mtim      Timespec
-	Ctim      Timespec
-	Blksize   int32
-	Pad_cgo_0 [4]byte
-	Blocks    int64
-	Fstype    [16]int8
+	Dev     uint64
+	Ino     uint64
+	Mode    uint32
+	Nlink   uint32
+	Uid     uint32
+	Gid     uint32
+	Rdev    uint64
+	Size    int64
+	Atim    Timespec
+	Mtim    Timespec
+	Ctim    Timespec
+	Blksize int32
+	_       [4]byte
+	Blocks  int64
+	Fstype  [16]int8
 }
 
 type Flock_t struct {
-	Type      int16
-	Whence    int16
-	Pad_cgo_0 [4]byte
-	Start     int64
-	Len       int64
-	Sysid     int32
-	Pid       int32
-	Pad       [4]int64
+	Type   int16
+	Whence int16
+	_      [4]byte
+	Start  int64
+	Len    int64
+	Sysid  int32
+	Pid    int32
+	Pad    [4]int64
 }
 
 type Dirent struct {
-	Ino       uint64
-	Off       int64
-	Reclen    uint16
-	Name      [1]int8
-	Pad_cgo_0 [5]byte
+	Ino    uint64
+	Off    int64
+	Reclen uint16
+	Name   [1]int8
+	_      [5]byte
+}
+
+type _Fsblkcnt_t uint64
+
+type Statvfs_t struct {
+	Bsize    uint64
+	Frsize   uint64
+	Blocks   uint64
+	Bfree    uint64
+	Bavail   uint64
+	Files    uint64
+	Ffree    uint64
+	Favail   uint64
+	Fsid     uint64
+	Basetype [16]int8
+	Flag     uint64
+	Namemax  uint64
+	Fstr     [32]int8
 }
 
 type RawSockaddrInet4 struct {
@@ -194,13 +213,13 @@ type IPv6Mreq struct {
 type Msghdr struct {
 	Name         *byte
 	Namelen      uint32
-	Pad_cgo_0    [4]byte
+	_            [4]byte
 	Iov          *Iovec
 	Iovlen       int32
-	Pad_cgo_1    [4]byte
+	_            [4]byte
 	Accrights    *int8
 	Accrightslen int32
-	Pad_cgo_2    [4]byte
+	_            [4]byte
 }
 
 type Cmsghdr struct {
@@ -244,19 +263,19 @@ type FdSet struct {
 }
 
 type Utsname struct {
-	Sysname  [257]int8
-	Nodename [257]int8
-	Release  [257]int8
-	Version  [257]int8
-	Machine  [257]int8
+	Sysname  [257]byte
+	Nodename [257]byte
+	Release  [257]byte
+	Version  [257]byte
+	Machine  [257]byte
 }
 
 type Ustat_t struct {
-	Tfree     int64
-	Tinode    uint64
-	Fname     [6]int8
-	Fpack     [6]int8
-	Pad_cgo_0 [4]byte
+	Tfree  int64
+	Tinode uint64
+	Fname  [6]int8
+	Fpack  [6]int8
+	_      [4]byte
 }
 
 const (
@@ -276,21 +295,21 @@ const (
 )
 
 type IfMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Data      IfData
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Data    IfData
 }
 
 type IfData struct {
 	Type       uint8
 	Addrlen    uint8
 	Hdrlen     uint8
-	Pad_cgo_0  [1]byte
+	_          [1]byte
 	Mtu        uint32
 	Metric     uint32
 	Baudrate   uint32
@@ -309,30 +328,30 @@ type IfData struct {
 }
 
 type IfaMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Addrs     int32
-	Flags     int32
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Metric    int32
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Addrs   int32
+	Flags   int32
+	Index   uint16
+	_       [2]byte
+	Metric  int32
 }
 
 type RtMsghdr struct {
-	Msglen    uint16
-	Version   uint8
-	Type      uint8
-	Index     uint16
-	Pad_cgo_0 [2]byte
-	Flags     int32
-	Addrs     int32
-	Pid       int32
-	Seq       int32
-	Errno     int32
-	Use       int32
-	Inits     uint32
-	Rmx       RtMetrics
+	Msglen  uint16
+	Version uint8
+	Type    uint8
+	Index   uint16
+	_       [2]byte
+	Flags   int32
+	Addrs   int32
+	Pid     int32
+	Seq     int32
+	Errno   int32
+	Use     int32
+	Inits   uint32
+	Rmx     RtMetrics
 }
 
 type RtMetrics struct {
@@ -369,9 +388,9 @@ type BpfStat struct {
 }
 
 type BpfProgram struct {
-	Len       uint32
-	Pad_cgo_0 [4]byte
-	Insns     *BpfInsn
+	Len   uint32
+	_     [4]byte
+	Insns *BpfInsn
 }
 
 type BpfInsn struct {
@@ -387,32 +406,30 @@ type BpfTimeval struct {
 }
 
 type BpfHdr struct {
-	Tstamp    BpfTimeval
-	Caplen    uint32
-	Datalen   uint32
-	Hdrlen    uint16
-	Pad_cgo_0 [2]byte
+	Tstamp  BpfTimeval
+	Caplen  uint32
+	Datalen uint32
+	Hdrlen  uint16
+	_       [2]byte
 }
 
-const _SC_PAGESIZE = 0xb
-
 type Termios struct {
-	Iflag     uint32
-	Oflag     uint32
-	Cflag     uint32
-	Lflag     uint32
-	Cc        [19]uint8
-	Pad_cgo_0 [1]byte
+	Iflag uint32
+	Oflag uint32
+	Cflag uint32
+	Lflag uint32
+	Cc    [19]uint8
+	_     [1]byte
 }
 
 type Termio struct {
-	Iflag     uint16
-	Oflag     uint16
-	Cflag     uint16
-	Lflag     uint16
-	Line      int8
-	Cc        [8]uint8
-	Pad_cgo_0 [1]byte
+	Iflag uint16
+	Oflag uint16
+	Cflag uint16
+	Lflag uint16
+	Line  int8
+	Cc    [8]uint8
+	_     [1]byte
 }
 
 type Winsize struct {
@@ -421,3 +438,22 @@ type Winsize struct {
 	Xpixel uint16
 	Ypixel uint16
 }
+
+type PollFd struct {
+	Fd      int32
+	Events  int16
+	Revents int16
+}
+
+const (
+	POLLERR    = 0x8
+	POLLHUP    = 0x10
+	POLLIN     = 0x1
+	POLLNVAL   = 0x20
+	POLLOUT    = 0x4
+	POLLPRI    = 0x2
+	POLLRDBAND = 0x80
+	POLLRDNORM = 0x40
+	POLLWRBAND = 0x100
+	POLLWRNORM = 0x4
+)
diff --git a/installer/vendor/golang.org/x/sys/windows/asm_windows_386.s b/installer/vendor/golang.org/x/sys/windows/asm_windows_386.s
index 1c20dd2f89..21d994d318 100644
--- a/installer/vendor/golang.org/x/sys/windows/asm_windows_386.s
+++ b/installer/vendor/golang.org/x/sys/windows/asm_windows_386.s
@@ -6,8 +6,8 @@
 // System calls for 386, Windows are implemented in runtime/syscall_windows.goc
 //
 
-TEXT ·getprocaddress(SB), 7, $0-8
+TEXT ·getprocaddress(SB), 7, $0-16
 	JMP	syscall·getprocaddress(SB)
 
-TEXT ·loadlibrary(SB), 7, $0-4
+TEXT ·loadlibrary(SB), 7, $0-12
 	JMP	syscall·loadlibrary(SB)
diff --git a/installer/vendor/golang.org/x/sys/windows/dll_windows.go b/installer/vendor/golang.org/x/sys/windows/dll_windows.go
index 0f62046748..e92c05b213 100644
--- a/installer/vendor/golang.org/x/sys/windows/dll_windows.go
+++ b/installer/vendor/golang.org/x/sys/windows/dll_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
+// Copyright 2011 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -116,7 +116,7 @@ func (p *Proc) Addr() uintptr {
 
 //go:uintptrescapes
 
-// Call executes procedure p with arguments a. It will panic, if more then 15 arguments
+// Call executes procedure p with arguments a. It will panic, if more than 15 arguments
 // are supplied.
 //
 // The returned error is always non-nil, constructed from the result of GetLastError.
@@ -160,7 +160,6 @@ func (p *Proc) Call(a ...uintptr) (r1, r2 uintptr, lastErr error) {
 	default:
 		panic("Call " + p.Name + " with too many arguments " + itoa(len(a)) + ".")
 	}
-	return
 }
 
 // A LazyDLL implements access to a single DLL.
@@ -290,6 +289,7 @@ func (p *LazyProc) mustFind() {
 
 // Addr returns the address of the procedure represented by p.
 // The return value can be passed to Syscall to run the procedure.
+// It will panic if the procedure cannot be found.
 func (p *LazyProc) Addr() uintptr {
 	p.mustFind()
 	return p.proc.Addr()
@@ -297,8 +297,8 @@ func (p *LazyProc) Addr() uintptr {
 
 //go:uintptrescapes
 
-// Call executes procedure p with arguments a. It will panic, if more then 15 arguments
-// are supplied.
+// Call executes procedure p with arguments a. It will panic, if more than 15 arguments
+// are supplied. It will also panic if the procedure cannot be found.
 //
 // The returned error is always non-nil, constructed from the result of GetLastError.
 // Callers must inspect the primary return value to decide whether an error occurred
diff --git a/installer/vendor/golang.org/x/sys/windows/env_unset.go b/installer/vendor/golang.org/x/sys/windows/env_unset.go
deleted file mode 100644
index 4ed03aeefc..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/env_unset.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build go1.4
-
-package windows
-
-import "syscall"
-
-func Unsetenv(key string) error {
-	// This was added in Go 1.4.
-	return syscall.Unsetenv(key)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/env_windows.go b/installer/vendor/golang.org/x/sys/windows/env_windows.go
index a9d8ef4b7d..bdc71e241e 100644
--- a/installer/vendor/golang.org/x/sys/windows/env_windows.go
+++ b/installer/vendor/golang.org/x/sys/windows/env_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2010 The Go Authors.  All rights reserved.
+// Copyright 2010 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -23,3 +23,7 @@ func Clearenv() {
 func Environ() []string {
 	return syscall.Environ()
 }
+
+func Unsetenv(key string) error {
+	return syscall.Unsetenv(key)
+}
diff --git a/installer/vendor/golang.org/x/sys/windows/memory_windows.go b/installer/vendor/golang.org/x/sys/windows/memory_windows.go
new file mode 100644
index 0000000000..f80a4204f0
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/windows/memory_windows.go
@@ -0,0 +1,26 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+const (
+	MEM_COMMIT      = 0x00001000
+	MEM_RESERVE     = 0x00002000
+	MEM_DECOMMIT    = 0x00004000
+	MEM_RELEASE     = 0x00008000
+	MEM_RESET       = 0x00080000
+	MEM_TOP_DOWN    = 0x00100000
+	MEM_WRITE_WATCH = 0x00200000
+	MEM_PHYSICAL    = 0x00400000
+	MEM_RESET_UNDO  = 0x01000000
+	MEM_LARGE_PAGES = 0x20000000
+
+	PAGE_NOACCESS          = 0x01
+	PAGE_READONLY          = 0x02
+	PAGE_READWRITE         = 0x04
+	PAGE_WRITECOPY         = 0x08
+	PAGE_EXECUTE_READ      = 0x20
+	PAGE_EXECUTE_READWRITE = 0x40
+	PAGE_EXECUTE_WRITECOPY = 0x80
+)
diff --git a/installer/vendor/golang.org/x/sys/windows/mksyscall.go b/installer/vendor/golang.org/x/sys/windows/mksyscall.go
index e1c88c9c71..fb7db0ef8d 100644
--- a/installer/vendor/golang.org/x/sys/windows/mksyscall.go
+++ b/installer/vendor/golang.org/x/sys/windows/mksyscall.go
@@ -1,4 +1,4 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
+// Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/windows/race.go b/installer/vendor/golang.org/x/sys/windows/race.go
index 343e18ab69..a74e3e24b5 100644
--- a/installer/vendor/golang.org/x/sys/windows/race.go
+++ b/installer/vendor/golang.org/x/sys/windows/race.go
@@ -1,4 +1,4 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/windows/race0.go b/installer/vendor/golang.org/x/sys/windows/race0.go
index 17af843b91..e44a3cbf67 100644
--- a/installer/vendor/golang.org/x/sys/windows/race0.go
+++ b/installer/vendor/golang.org/x/sys/windows/race0.go
@@ -1,4 +1,4 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/export_test.go b/installer/vendor/golang.org/x/sys/windows/registry/export_test.go
deleted file mode 100644
index 8badf6fdcf..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/export_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry
-
-func (k Key) SetValue(name string, valtype uint32, data []byte) error {
-	return k.setValue(name, valtype, data)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/key.go b/installer/vendor/golang.org/x/sys/windows/registry/key.go
deleted file mode 100644
index d0beb19564..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/key.go
+++ /dev/null
@@ -1,200 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package registry provides access to the Windows registry.
-//
-// Here is a simple example, opening a registry key and reading a string value from it.
-//
-//	k, err := registry.OpenKey(registry.LOCAL_MACHINE, `SOFTWARE\Microsoft\Windows NT\CurrentVersion`, registry.QUERY_VALUE)
-//	if err != nil {
-//		log.Fatal(err)
-//	}
-//	defer k.Close()
-//
-//	s, _, err := k.GetStringValue("SystemRoot")
-//	if err != nil {
-//		log.Fatal(err)
-//	}
-//	fmt.Printf("Windows system root is %q\n", s)
-//
-package registry
-
-import (
-	"io"
-	"syscall"
-	"time"
-)
-
-const (
-	// Registry key security and access rights.
-	// See https://msdn.microsoft.com/en-us/library/windows/desktop/ms724878.aspx
-	// for details.
-	ALL_ACCESS         = 0xf003f
-	CREATE_LINK        = 0x00020
-	CREATE_SUB_KEY     = 0x00004
-	ENUMERATE_SUB_KEYS = 0x00008
-	EXECUTE            = 0x20019
-	NOTIFY             = 0x00010
-	QUERY_VALUE        = 0x00001
-	READ               = 0x20019
-	SET_VALUE          = 0x00002
-	WOW64_32KEY        = 0x00200
-	WOW64_64KEY        = 0x00100
-	WRITE              = 0x20006
-)
-
-// Key is a handle to an open Windows registry key.
-// Keys can be obtained by calling OpenKey; there are
-// also some predefined root keys such as CURRENT_USER.
-// Keys can be used directly in the Windows API.
-type Key syscall.Handle
-
-const (
-	// Windows defines some predefined root keys that are always open.
-	// An application can use these keys as entry points to the registry.
-	// Normally these keys are used in OpenKey to open new keys,
-	// but they can also be used anywhere a Key is required.
-	CLASSES_ROOT     = Key(syscall.HKEY_CLASSES_ROOT)
-	CURRENT_USER     = Key(syscall.HKEY_CURRENT_USER)
-	LOCAL_MACHINE    = Key(syscall.HKEY_LOCAL_MACHINE)
-	USERS            = Key(syscall.HKEY_USERS)
-	CURRENT_CONFIG   = Key(syscall.HKEY_CURRENT_CONFIG)
-	PERFORMANCE_DATA = Key(syscall.HKEY_PERFORMANCE_DATA)
-)
-
-// Close closes open key k.
-func (k Key) Close() error {
-	return syscall.RegCloseKey(syscall.Handle(k))
-}
-
-// OpenKey opens a new key with path name relative to key k.
-// It accepts any open key, including CURRENT_USER and others,
-// and returns the new key and an error.
-// The access parameter specifies desired access rights to the
-// key to be opened.
-func OpenKey(k Key, path string, access uint32) (Key, error) {
-	p, err := syscall.UTF16PtrFromString(path)
-	if err != nil {
-		return 0, err
-	}
-	var subkey syscall.Handle
-	err = syscall.RegOpenKeyEx(syscall.Handle(k), p, 0, access, &subkey)
-	if err != nil {
-		return 0, err
-	}
-	return Key(subkey), nil
-}
-
-// OpenRemoteKey opens a predefined registry key on another
-// computer pcname. The key to be opened is specified by k, but
-// can only be one of LOCAL_MACHINE, PERFORMANCE_DATA or USERS.
-// If pcname is "", OpenRemoteKey returns local computer key.
-func OpenRemoteKey(pcname string, k Key) (Key, error) {
-	var err error
-	var p *uint16
-	if pcname != "" {
-		p, err = syscall.UTF16PtrFromString(`\\` + pcname)
-		if err != nil {
-			return 0, err
-		}
-	}
-	var remoteKey syscall.Handle
-	err = regConnectRegistry(p, syscall.Handle(k), &remoteKey)
-	if err != nil {
-		return 0, err
-	}
-	return Key(remoteKey), nil
-}
-
-// ReadSubKeyNames returns the names of subkeys of key k.
-// The parameter n controls the number of returned names,
-// analogous to the way os.File.Readdirnames works.
-func (k Key) ReadSubKeyNames(n int) ([]string, error) {
-	ki, err := k.Stat()
-	if err != nil {
-		return nil, err
-	}
-	names := make([]string, 0, ki.SubKeyCount)
-	buf := make([]uint16, ki.MaxSubKeyLen+1) // extra room for terminating zero byte
-loopItems:
-	for i := uint32(0); ; i++ {
-		if n > 0 {
-			if len(names) == n {
-				return names, nil
-			}
-		}
-		l := uint32(len(buf))
-		for {
-			err := syscall.RegEnumKeyEx(syscall.Handle(k), i, &buf[0], &l, nil, nil, nil, nil)
-			if err == nil {
-				break
-			}
-			if err == syscall.ERROR_MORE_DATA {
-				// Double buffer size and try again.
-				l = uint32(2 * len(buf))
-				buf = make([]uint16, l)
-				continue
-			}
-			if err == _ERROR_NO_MORE_ITEMS {
-				break loopItems
-			}
-			return names, err
-		}
-		names = append(names, syscall.UTF16ToString(buf[:l]))
-	}
-	if n > len(names) {
-		return names, io.EOF
-	}
-	return names, nil
-}
-
-// CreateKey creates a key named path under open key k.
-// CreateKey returns the new key and a boolean flag that reports
-// whether the key already existed.
-// The access parameter specifies the access rights for the key
-// to be created.
-func CreateKey(k Key, path string, access uint32) (newk Key, openedExisting bool, err error) {
-	var h syscall.Handle
-	var d uint32
-	err = regCreateKeyEx(syscall.Handle(k), syscall.StringToUTF16Ptr(path),
-		0, nil, _REG_OPTION_NON_VOLATILE, access, nil, &h, &d)
-	if err != nil {
-		return 0, false, err
-	}
-	return Key(h), d == _REG_OPENED_EXISTING_KEY, nil
-}
-
-// DeleteKey deletes the subkey path of key k and its values.
-func DeleteKey(k Key, path string) error {
-	return regDeleteKey(syscall.Handle(k), syscall.StringToUTF16Ptr(path))
-}
-
-// A KeyInfo describes the statistics of a key. It is returned by Stat.
-type KeyInfo struct {
-	SubKeyCount     uint32
-	MaxSubKeyLen    uint32 // size of the key's subkey with the longest name, in Unicode characters, not including the terminating zero byte
-	ValueCount      uint32
-	MaxValueNameLen uint32 // size of the key's longest value name, in Unicode characters, not including the terminating zero byte
-	MaxValueLen     uint32 // longest data component among the key's values, in bytes
-	lastWriteTime   syscall.Filetime
-}
-
-// ModTime returns the key's last write time.
-func (ki *KeyInfo) ModTime() time.Time {
-	return time.Unix(0, ki.lastWriteTime.Nanoseconds())
-}
-
-// Stat retrieves information about the open key k.
-func (k Key) Stat() (*KeyInfo, error) {
-	var ki KeyInfo
-	err := syscall.RegQueryInfoKey(syscall.Handle(k), nil, nil, nil,
-		&ki.SubKeyCount, &ki.MaxSubKeyLen, nil, &ki.ValueCount,
-		&ki.MaxValueNameLen, &ki.MaxValueLen, nil, &ki.lastWriteTime)
-	if err != nil {
-		return nil, err
-	}
-	return &ki, nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/mksyscall.go b/installer/vendor/golang.org/x/sys/windows/registry/mksyscall.go
deleted file mode 100644
index 0ac95ffe73..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/mksyscall.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package registry
-
-//go:generate go run $GOROOT/src/syscall/mksyscall_windows.go -output zsyscall_windows.go syscall.go
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/registry_test.go b/installer/vendor/golang.org/x/sys/windows/registry/registry_test.go
deleted file mode 100644
index 9c1b7820e9..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/registry_test.go
+++ /dev/null
@@ -1,756 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry_test
-
-import (
-	"bytes"
-	"crypto/rand"
-	"os"
-	"syscall"
-	"testing"
-	"time"
-	"unsafe"
-
-	"golang.org/x/sys/windows/registry"
-)
-
-func randKeyName(prefix string) string {
-	const numbers = "0123456789"
-	buf := make([]byte, 10)
-	rand.Read(buf)
-	for i, b := range buf {
-		buf[i] = numbers[b%byte(len(numbers))]
-	}
-	return prefix + string(buf)
-}
-
-func TestReadSubKeyNames(t *testing.T) {
-	k, err := registry.OpenKey(registry.CLASSES_ROOT, "TypeLib", registry.ENUMERATE_SUB_KEYS|registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	names, err := k.ReadSubKeyNames(-1)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var foundStdOle bool
-	for _, name := range names {
-		// Every PC has "stdole 2.0 OLE Automation" library installed.
-		if name == "{00020430-0000-0000-C000-000000000046}" {
-			foundStdOle = true
-		}
-	}
-	if !foundStdOle {
-		t.Fatal("could not find stdole 2.0 OLE Automation")
-	}
-}
-
-func TestCreateOpenDeleteKey(t *testing.T) {
-	k, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	testKName := randKeyName("TestCreateOpenDeleteKey_")
-
-	testK, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testK.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	testKAgain, exist, err := registry.CreateKey(k, testKName, registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testKAgain.Close()
-
-	if !exist {
-		t.Fatalf("key %q should already exist", testKName)
-	}
-
-	testKOpened, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer testKOpened.Close()
-
-	err = registry.DeleteKey(k, testKName)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testKOpenedAgain, err := registry.OpenKey(k, testKName, registry.ENUMERATE_SUB_KEYS)
-	if err == nil {
-		defer testKOpenedAgain.Close()
-		t.Fatalf("key %q should already been deleted", testKName)
-	}
-	if err != registry.ErrNotExist {
-		t.Fatalf(`unexpected error ("not exist" expected): %v`, err)
-	}
-}
-
-func equalStringSlice(a, b []string) bool {
-	if len(a) != len(b) {
-		return false
-	}
-	if a == nil {
-		return true
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}
-
-type ValueTest struct {
-	Type     uint32
-	Name     string
-	Value    interface{}
-	WillFail bool
-}
-
-var ValueTests = []ValueTest{
-	{Type: registry.SZ, Name: "String1", Value: ""},
-	{Type: registry.SZ, Name: "String2", Value: "\000", WillFail: true},
-	{Type: registry.SZ, Name: "String3", Value: "Hello World"},
-	{Type: registry.SZ, Name: "String4", Value: "Hello World\000", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString1", Value: ""},
-	{Type: registry.EXPAND_SZ, Name: "ExpString2", Value: "\000", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString3", Value: "Hello World"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString4", Value: "Hello\000World", WillFail: true},
-	{Type: registry.EXPAND_SZ, Name: "ExpString5", Value: "%PATH%"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString6", Value: "%NO_SUCH_VARIABLE%"},
-	{Type: registry.EXPAND_SZ, Name: "ExpString7", Value: "%PATH%;."},
-	{Type: registry.BINARY, Name: "Binary1", Value: []byte{}},
-	{Type: registry.BINARY, Name: "Binary2", Value: []byte{1, 2, 3}},
-	{Type: registry.BINARY, Name: "Binary3", Value: []byte{3, 2, 1, 0, 1, 2, 3}},
-	{Type: registry.DWORD, Name: "Dword1", Value: uint64(0)},
-	{Type: registry.DWORD, Name: "Dword2", Value: uint64(1)},
-	{Type: registry.DWORD, Name: "Dword3", Value: uint64(0xff)},
-	{Type: registry.DWORD, Name: "Dword4", Value: uint64(0xffff)},
-	{Type: registry.QWORD, Name: "Qword1", Value: uint64(0)},
-	{Type: registry.QWORD, Name: "Qword2", Value: uint64(1)},
-	{Type: registry.QWORD, Name: "Qword3", Value: uint64(0xff)},
-	{Type: registry.QWORD, Name: "Qword4", Value: uint64(0xffff)},
-	{Type: registry.QWORD, Name: "Qword5", Value: uint64(0xffffff)},
-	{Type: registry.QWORD, Name: "Qword6", Value: uint64(0xffffffff)},
-	{Type: registry.MULTI_SZ, Name: "MultiString1", Value: []string{"a", "b", "c"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString2", Value: []string{"abc", "", "cba"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString3", Value: []string{""}},
-	{Type: registry.MULTI_SZ, Name: "MultiString4", Value: []string{"abcdef"}},
-	{Type: registry.MULTI_SZ, Name: "MultiString5", Value: []string{"\000"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString6", Value: []string{"a\000b"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString7", Value: []string{"ab", "\000", "cd"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString8", Value: []string{"\000", "cd"}, WillFail: true},
-	{Type: registry.MULTI_SZ, Name: "MultiString9", Value: []string{"ab", "\000"}, WillFail: true},
-}
-
-func setValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		var err error
-		switch test.Type {
-		case registry.SZ:
-			err = k.SetStringValue(test.Name, test.Value.(string))
-		case registry.EXPAND_SZ:
-			err = k.SetExpandStringValue(test.Name, test.Value.(string))
-		case registry.MULTI_SZ:
-			err = k.SetStringsValue(test.Name, test.Value.([]string))
-		case registry.BINARY:
-			err = k.SetBinaryValue(test.Name, test.Value.([]byte))
-		case registry.DWORD:
-			err = k.SetDWordValue(test.Name, uint32(test.Value.(uint64)))
-		case registry.QWORD:
-			err = k.SetQWordValue(test.Name, test.Value.(uint64))
-		default:
-			t.Fatalf("unsupported type %d for %s value", test.Type, test.Name)
-		}
-		if test.WillFail {
-			if err == nil {
-				t.Fatalf("setting %s value %q should fail, but succeeded", test.Name, test.Value)
-			}
-		} else {
-			if err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-}
-
-func enumerateValues(t *testing.T, k registry.Key) {
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	haveNames := make(map[string]bool)
-	for _, n := range names {
-		haveNames[n] = false
-	}
-	for _, test := range ValueTests {
-		wantFound := !test.WillFail
-		_, haveFound := haveNames[test.Name]
-		if wantFound && !haveFound {
-			t.Errorf("value %s is not found while enumerating", test.Name)
-		}
-		if haveFound && !wantFound {
-			t.Errorf("value %s is found while enumerating, but expected to fail", test.Name)
-		}
-		if haveFound {
-			delete(haveNames, test.Name)
-		}
-	}
-	for n, v := range haveNames {
-		t.Errorf("value %s (%v) is found while enumerating, but has not been cretaed", n, v)
-	}
-}
-
-func testErrNotExist(t *testing.T, name string, err error) {
-	if err == nil {
-		t.Errorf("%s value should not exist", name)
-		return
-	}
-	if err != registry.ErrNotExist {
-		t.Errorf("reading %s value should return 'not exist' error, but got: %s", name, err)
-		return
-	}
-}
-
-func testErrUnexpectedType(t *testing.T, test ValueTest, gottype uint32, err error) {
-	if err == nil {
-		t.Errorf("GetXValue(%q) should not succeed", test.Name)
-		return
-	}
-	if err != registry.ErrUnexpectedType {
-		t.Errorf("reading %s value should return 'unexpected key value type' error, but got: %s", test.Name, err)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetStringValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetStringValue(test.Name)
-	if err != nil {
-		t.Errorf("GetStringValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if got != test.Value {
-		t.Errorf("want %s value %q, got %q", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	if gottype == registry.EXPAND_SZ {
-		_, err = registry.ExpandString(got)
-		if err != nil {
-			t.Errorf("ExpandString(%s) failed: %v", got, err)
-			return
-		}
-	}
-}
-
-func testGetIntegerValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetIntegerValue(test.Name)
-	if err != nil {
-		t.Errorf("GetIntegerValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if got != test.Value.(uint64) {
-		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetBinaryValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetBinaryValue(test.Name)
-	if err != nil {
-		t.Errorf("GetBinaryValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if !bytes.Equal(got, test.Value.([]byte)) {
-		t.Errorf("want %s value %v, got %v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetStringsValue(t *testing.T, k registry.Key, test ValueTest) {
-	got, gottype, err := k.GetStringsValue(test.Name)
-	if err != nil {
-		t.Errorf("GetStringsValue(%s) failed: %v", test.Name, err)
-		return
-	}
-	if !equalStringSlice(got, test.Value.([]string)) {
-		t.Errorf("want %s value %#v, got %#v", test.Name, test.Value, got)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-}
-
-func testGetValue(t *testing.T, k registry.Key, test ValueTest, size int) {
-	if size <= 0 {
-		return
-	}
-	// read data with no buffer
-	gotsize, gottype, err := k.GetValue(test.Name, nil)
-	if err != nil {
-		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// read data with short buffer
-	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size-1))
-	if err == nil {
-		t.Errorf("GetValue(%s, [%d]byte) should fail, but suceeded", test.Name, size-1)
-		return
-	}
-	if err != registry.ErrShortBuffer {
-		t.Errorf("reading %s value should return 'short buffer' error, but got: %s", test.Name, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// read full data
-	gotsize, gottype, err = k.GetValue(test.Name, make([]byte, size))
-	if err != nil {
-		t.Errorf("GetValue(%s, [%d]byte) failed: %v", test.Name, size, err)
-		return
-	}
-	if gotsize != size {
-		t.Errorf("want %s value size of %d, got %v", test.Name, size, gotsize)
-		return
-	}
-	if gottype != test.Type {
-		t.Errorf("want %s value type %v, got %v", test.Name, test.Type, gottype)
-		return
-	}
-	// check GetValue returns ErrNotExist as required
-	_, _, err = k.GetValue(test.Name+"_not_there", make([]byte, size))
-	if err == nil {
-		t.Errorf("GetValue(%q) should not succeed", test.Name)
-		return
-	}
-	if err != registry.ErrNotExist {
-		t.Errorf("GetValue(%q) should return 'not exist' error, but got: %s", test.Name, err)
-		return
-	}
-}
-
-func testValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		switch test.Type {
-		case registry.SZ, registry.EXPAND_SZ:
-			if test.WillFail {
-				_, _, err := k.GetStringValue(test.Name)
-				testErrNotExist(t, test.Name, err)
-			} else {
-				testGetStringValue(t, k, test)
-				_, gottype, err := k.GetIntegerValue(test.Name)
-				testErrUnexpectedType(t, test, gottype, err)
-				// Size of utf16 string in bytes is not perfect,
-				// but correct for current test values.
-				// Size also includes terminating 0.
-				testGetValue(t, k, test, (len(test.Value.(string))+1)*2)
-			}
-			_, _, err := k.GetStringValue(test.Name + "_string_not_created")
-			testErrNotExist(t, test.Name+"_string_not_created", err)
-		case registry.DWORD, registry.QWORD:
-			testGetIntegerValue(t, k, test)
-			_, gottype, err := k.GetBinaryValue(test.Name)
-			testErrUnexpectedType(t, test, gottype, err)
-			_, _, err = k.GetIntegerValue(test.Name + "_int_not_created")
-			testErrNotExist(t, test.Name+"_int_not_created", err)
-			size := 8
-			if test.Type == registry.DWORD {
-				size = 4
-			}
-			testGetValue(t, k, test, size)
-		case registry.BINARY:
-			testGetBinaryValue(t, k, test)
-			_, gottype, err := k.GetStringsValue(test.Name)
-			testErrUnexpectedType(t, test, gottype, err)
-			_, _, err = k.GetBinaryValue(test.Name + "_byte_not_created")
-			testErrNotExist(t, test.Name+"_byte_not_created", err)
-			testGetValue(t, k, test, len(test.Value.([]byte)))
-		case registry.MULTI_SZ:
-			if test.WillFail {
-				_, _, err := k.GetStringsValue(test.Name)
-				testErrNotExist(t, test.Name, err)
-			} else {
-				testGetStringsValue(t, k, test)
-				_, gottype, err := k.GetStringValue(test.Name)
-				testErrUnexpectedType(t, test, gottype, err)
-				size := 0
-				for _, s := range test.Value.([]string) {
-					size += len(s) + 1 // nil terminated
-				}
-				size += 1 // extra nil at the end
-				size *= 2 // count bytes, not uint16
-				testGetValue(t, k, test, size)
-			}
-			_, _, err := k.GetStringsValue(test.Name + "_strings_not_created")
-			testErrNotExist(t, test.Name+"_strings_not_created", err)
-		default:
-			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
-			continue
-		}
-	}
-}
-
-func testStat(t *testing.T, k registry.Key) {
-	subk, _, err := registry.CreateKey(k, "subkey", registry.CREATE_SUB_KEY)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	defer subk.Close()
-
-	defer registry.DeleteKey(k, "subkey")
-
-	ki, err := k.Stat()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if ki.SubKeyCount != 1 {
-		t.Error("key must have 1 subkey")
-	}
-	if ki.MaxSubKeyLen != 6 {
-		t.Error("key max subkey name length must be 6")
-	}
-	if ki.ValueCount != 24 {
-		t.Errorf("key must have 24 values, but is %d", ki.ValueCount)
-	}
-	if ki.MaxValueNameLen != 12 {
-		t.Errorf("key max value name length must be 10, but is %d", ki.MaxValueNameLen)
-	}
-	if ki.MaxValueLen != 38 {
-		t.Errorf("key max value length must be 38, but is %d", ki.MaxValueLen)
-	}
-	if mt, ct := ki.ModTime(), time.Now(); ct.Sub(mt) > 100*time.Millisecond {
-		t.Errorf("key mod time is not close to current time: mtime=%v current=%v delta=%v", mt, ct, ct.Sub(mt))
-	}
-}
-
-func deleteValues(t *testing.T, k registry.Key) {
-	for _, test := range ValueTests {
-		if test.WillFail {
-			continue
-		}
-		err := k.DeleteValue(test.Name)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-	}
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	if len(names) != 0 {
-		t.Errorf("some values remain after deletion: %v", names)
-	}
-}
-
-func TestValues(t *testing.T) {
-	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer softwareK.Close()
-
-	testKName := randKeyName("TestValues_")
-
-	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	defer registry.DeleteKey(softwareK, testKName)
-
-	setValues(t, k)
-
-	enumerateValues(t, k)
-
-	testValues(t, k)
-
-	testStat(t, k)
-
-	deleteValues(t, k)
-}
-
-func walkKey(t *testing.T, k registry.Key, kname string) {
-	names, err := k.ReadValueNames(-1)
-	if err != nil {
-		t.Fatalf("reading value names of %s failed: %v", kname, err)
-	}
-	for _, name := range names {
-		_, valtype, err := k.GetValue(name, nil)
-		if err != nil {
-			t.Fatalf("reading value type of %s of %s failed: %v", name, kname, err)
-		}
-		switch valtype {
-		case registry.NONE:
-		case registry.SZ:
-			_, _, err := k.GetStringValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.EXPAND_SZ:
-			s, _, err := k.GetStringValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-			_, err = registry.ExpandString(s)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.DWORD, registry.QWORD:
-			_, _, err := k.GetIntegerValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.BINARY:
-			_, _, err := k.GetBinaryValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.MULTI_SZ:
-			_, _, err := k.GetStringsValue(name)
-			if err != nil {
-				t.Error(err)
-			}
-		case registry.FULL_RESOURCE_DESCRIPTOR, registry.RESOURCE_LIST, registry.RESOURCE_REQUIREMENTS_LIST:
-			// TODO: not implemented
-		default:
-			t.Fatalf("value type %d of %s of %s failed: %v", valtype, name, kname, err)
-		}
-	}
-
-	names, err = k.ReadSubKeyNames(-1)
-	if err != nil {
-		t.Fatalf("reading sub-keys of %s failed: %v", kname, err)
-	}
-	for _, name := range names {
-		func() {
-			subk, err := registry.OpenKey(k, name, registry.ENUMERATE_SUB_KEYS|registry.QUERY_VALUE)
-			if err != nil {
-				if err == syscall.ERROR_ACCESS_DENIED {
-					// ignore error, if we are not allowed to access this key
-					return
-				}
-				t.Fatalf("opening sub-keys %s of %s failed: %v", name, kname, err)
-			}
-			defer subk.Close()
-
-			walkKey(t, subk, kname+`\`+name)
-		}()
-	}
-}
-
-func TestWalkFullRegistry(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping long running test in short mode")
-	}
-	walkKey(t, registry.CLASSES_ROOT, "CLASSES_ROOT")
-	walkKey(t, registry.CURRENT_USER, "CURRENT_USER")
-	walkKey(t, registry.LOCAL_MACHINE, "LOCAL_MACHINE")
-	walkKey(t, registry.USERS, "USERS")
-	walkKey(t, registry.CURRENT_CONFIG, "CURRENT_CONFIG")
-}
-
-func TestExpandString(t *testing.T) {
-	got, err := registry.ExpandString("%PATH%")
-	if err != nil {
-		t.Fatal(err)
-	}
-	want := os.Getenv("PATH")
-	if got != want {
-		t.Errorf("want %q string expanded, got %q", want, got)
-	}
-}
-
-func TestInvalidValues(t *testing.T) {
-	softwareK, err := registry.OpenKey(registry.CURRENT_USER, "Software", registry.QUERY_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer softwareK.Close()
-
-	testKName := randKeyName("TestInvalidValues_")
-
-	k, exist, err := registry.CreateKey(softwareK, testKName, registry.CREATE_SUB_KEY|registry.QUERY_VALUE|registry.SET_VALUE)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer k.Close()
-
-	if exist {
-		t.Fatalf("key %q already exists", testKName)
-	}
-
-	defer registry.DeleteKey(softwareK, testKName)
-
-	var tests = []struct {
-		Type uint32
-		Name string
-		Data []byte
-	}{
-		{registry.DWORD, "Dword1", nil},
-		{registry.DWORD, "Dword2", []byte{1, 2, 3}},
-		{registry.QWORD, "Qword1", nil},
-		{registry.QWORD, "Qword2", []byte{1, 2, 3}},
-		{registry.QWORD, "Qword3", []byte{1, 2, 3, 4, 5, 6, 7}},
-		{registry.MULTI_SZ, "MultiString1", nil},
-		{registry.MULTI_SZ, "MultiString2", []byte{0}},
-		{registry.MULTI_SZ, "MultiString3", []byte{'a', 'b', 0}},
-		{registry.MULTI_SZ, "MultiString4", []byte{'a', 0, 0, 'b', 0}},
-		{registry.MULTI_SZ, "MultiString5", []byte{'a', 0, 0}},
-	}
-
-	for _, test := range tests {
-		err := k.SetValue(test.Name, test.Type, test.Data)
-		if err != nil {
-			t.Fatalf("SetValue for %q failed: %v", test.Name, err)
-		}
-	}
-
-	for _, test := range tests {
-		switch test.Type {
-		case registry.DWORD, registry.QWORD:
-			value, valType, err := k.GetIntegerValue(test.Name)
-			if err == nil {
-				t.Errorf("GetIntegerValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
-			}
-		case registry.MULTI_SZ:
-			value, valType, err := k.GetStringsValue(test.Name)
-			if err == nil {
-				if len(value) != 0 {
-					t.Errorf("GetStringsValue(%q) succeeded. Returns type=%d value=%v", test.Name, valType, value)
-				}
-			}
-		default:
-			t.Errorf("unsupported type %d for %s value", test.Type, test.Name)
-		}
-	}
-}
-
-func TestGetMUIStringValue(t *testing.T) {
-	if err := registry.LoadRegLoadMUIString(); err != nil {
-		t.Skip("regLoadMUIString not supported; skipping")
-	}
-	if err := procGetDynamicTimeZoneInformation.Find(); err != nil {
-		t.Skipf("%s not supported; skipping", procGetDynamicTimeZoneInformation.Name)
-	}
-	var dtzi DynamicTimezoneinformation
-	if _, err := GetDynamicTimeZoneInformation(&dtzi); err != nil {
-		t.Fatal(err)
-	}
-	tzKeyName := syscall.UTF16ToString(dtzi.TimeZoneKeyName[:])
-	timezoneK, err := registry.OpenKey(registry.LOCAL_MACHINE,
-		`SOFTWARE\Microsoft\Windows NT\CurrentVersion\Time Zones\`+tzKeyName, registry.READ)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer timezoneK.Close()
-
-	type testType struct {
-		name string
-		want string
-	}
-	var tests = []testType{
-		{"MUI_Std", syscall.UTF16ToString(dtzi.StandardName[:])},
-	}
-	if dtzi.DynamicDaylightTimeDisabled == 0 {
-		tests = append(tests, testType{"MUI_Dlt", syscall.UTF16ToString(dtzi.DaylightName[:])})
-	}
-
-	for _, test := range tests {
-		got, err := timezoneK.GetMUIStringValue(test.name)
-		if err != nil {
-			t.Error("GetMUIStringValue:", err)
-		}
-
-		if got != test.want {
-			t.Errorf("GetMUIStringValue: %s: Got %q, want %q", test.name, got, test.want)
-		}
-	}
-}
-
-type DynamicTimezoneinformation struct {
-	Bias                        int32
-	StandardName                [32]uint16
-	StandardDate                syscall.Systemtime
-	StandardBias                int32
-	DaylightName                [32]uint16
-	DaylightDate                syscall.Systemtime
-	DaylightBias                int32
-	TimeZoneKeyName             [128]uint16
-	DynamicDaylightTimeDisabled uint8
-}
-
-var (
-	kernel32DLL = syscall.NewLazyDLL("kernel32")
-
-	procGetDynamicTimeZoneInformation = kernel32DLL.NewProc("GetDynamicTimeZoneInformation")
-)
-
-func GetDynamicTimeZoneInformation(dtzi *DynamicTimezoneinformation) (rc uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procGetDynamicTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(dtzi)), 0, 0)
-	rc = uint32(r0)
-	if rc == 0xffffffff {
-		if e1 != 0 {
-			err = error(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/syscall.go b/installer/vendor/golang.org/x/sys/windows/registry/syscall.go
deleted file mode 100644
index e66643cbaa..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/syscall.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry
-
-import "syscall"
-
-const (
-	_REG_OPTION_NON_VOLATILE = 0
-
-	_REG_CREATED_NEW_KEY     = 1
-	_REG_OPENED_EXISTING_KEY = 2
-
-	_ERROR_NO_MORE_ITEMS syscall.Errno = 259
-)
-
-func LoadRegLoadMUIString() error {
-	return procRegLoadMUIStringW.Find()
-}
-
-//sys	regCreateKeyEx(key syscall.Handle, subkey *uint16, reserved uint32, class *uint16, options uint32, desired uint32, sa *syscall.SecurityAttributes, result *syscall.Handle, disposition *uint32) (regerrno error) = advapi32.RegCreateKeyExW
-//sys	regDeleteKey(key syscall.Handle, subkey *uint16) (regerrno error) = advapi32.RegDeleteKeyW
-//sys	regSetValueEx(key syscall.Handle, valueName *uint16, reserved uint32, vtype uint32, buf *byte, bufsize uint32) (regerrno error) = advapi32.RegSetValueExW
-//sys	regEnumValue(key syscall.Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegEnumValueW
-//sys	regDeleteValue(key syscall.Handle, name *uint16) (regerrno error) = advapi32.RegDeleteValueW
-//sys   regLoadMUIString(key syscall.Handle, name *uint16, buf *uint16, buflen uint32, buflenCopied *uint32, flags uint32, dir *uint16) (regerrno error) = advapi32.RegLoadMUIStringW
-//sys	regConnectRegistry(machinename *uint16, key syscall.Handle, result *syscall.Handle) (regerrno error) = advapi32.RegConnectRegistryW
-
-//sys	expandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) = kernel32.ExpandEnvironmentStringsW
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/value.go b/installer/vendor/golang.org/x/sys/windows/registry/value.go
deleted file mode 100644
index 71d4e15bab..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/value.go
+++ /dev/null
@@ -1,384 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package registry
-
-import (
-	"errors"
-	"io"
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-)
-
-const (
-	// Registry value types.
-	NONE                       = 0
-	SZ                         = 1
-	EXPAND_SZ                  = 2
-	BINARY                     = 3
-	DWORD                      = 4
-	DWORD_BIG_ENDIAN           = 5
-	LINK                       = 6
-	MULTI_SZ                   = 7
-	RESOURCE_LIST              = 8
-	FULL_RESOURCE_DESCRIPTOR   = 9
-	RESOURCE_REQUIREMENTS_LIST = 10
-	QWORD                      = 11
-)
-
-var (
-	// ErrShortBuffer is returned when the buffer was too short for the operation.
-	ErrShortBuffer = syscall.ERROR_MORE_DATA
-
-	// ErrNotExist is returned when a registry key or value does not exist.
-	ErrNotExist = syscall.ERROR_FILE_NOT_FOUND
-
-	// ErrUnexpectedType is returned by Get*Value when the value's type was unexpected.
-	ErrUnexpectedType = errors.New("unexpected key value type")
-)
-
-// GetValue retrieves the type and data for the specified value associated
-// with an open key k. It fills up buffer buf and returns the retrieved
-// byte count n. If buf is too small to fit the stored value it returns
-// ErrShortBuffer error along with the required buffer size n.
-// If no buffer is provided, it returns true and actual buffer size n.
-// If no buffer is provided, GetValue returns the value's type only.
-// If the value does not exist, the error returned is ErrNotExist.
-//
-// GetValue is a low level function. If value's type is known, use the appropriate
-// Get*Value function instead.
-func (k Key) GetValue(name string, buf []byte) (n int, valtype uint32, err error) {
-	pname, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return 0, 0, err
-	}
-	var pbuf *byte
-	if len(buf) > 0 {
-		pbuf = (*byte)(unsafe.Pointer(&buf[0]))
-	}
-	l := uint32(len(buf))
-	err = syscall.RegQueryValueEx(syscall.Handle(k), pname, nil, &valtype, pbuf, &l)
-	if err != nil {
-		return int(l), valtype, err
-	}
-	return int(l), valtype, nil
-}
-
-func (k Key) getValue(name string, buf []byte) (date []byte, valtype uint32, err error) {
-	p, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return nil, 0, err
-	}
-	var t uint32
-	n := uint32(len(buf))
-	for {
-		err = syscall.RegQueryValueEx(syscall.Handle(k), p, nil, &t, (*byte)(unsafe.Pointer(&buf[0])), &n)
-		if err == nil {
-			return buf[:n], t, nil
-		}
-		if err != syscall.ERROR_MORE_DATA {
-			return nil, 0, err
-		}
-		if n <= uint32(len(buf)) {
-			return nil, 0, err
-		}
-		buf = make([]byte, n)
-	}
-}
-
-// GetStringValue retrieves the string value for the specified
-// value name associated with an open key k. It also returns the value's type.
-// If value does not exist, GetStringValue returns ErrNotExist.
-// If value is not SZ or EXPAND_SZ, it will return the correct value
-// type and ErrUnexpectedType.
-func (k Key) GetStringValue(name string) (val string, valtype uint32, err error) {
-	data, typ, err2 := k.getValue(name, make([]byte, 64))
-	if err2 != nil {
-		return "", typ, err2
-	}
-	switch typ {
-	case SZ, EXPAND_SZ:
-	default:
-		return "", typ, ErrUnexpectedType
-	}
-	if len(data) == 0 {
-		return "", typ, nil
-	}
-	u := (*[1 << 29]uint16)(unsafe.Pointer(&data[0]))[:]
-	return syscall.UTF16ToString(u), typ, nil
-}
-
-// GetMUIStringValue retrieves the localized string value for
-// the specified value name associated with an open key k.
-// If the value name doesn't exist or the localized string value
-// can't be resolved, GetMUIStringValue returns ErrNotExist.
-// GetMUIStringValue panics if the system doesn't support
-// regLoadMUIString; use LoadRegLoadMUIString to check if
-// regLoadMUIString is supported before calling this function.
-func (k Key) GetMUIStringValue(name string) (string, error) {
-	pname, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return "", err
-	}
-
-	buf := make([]uint16, 1024)
-	var buflen uint32
-	var pdir *uint16
-
-	err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
-	if err == syscall.ERROR_FILE_NOT_FOUND { // Try fallback path
-
-		// Try to resolve the string value using the system directory as
-		// a DLL search path; this assumes the string value is of the form
-		// @[path]\dllname,-strID but with no path given, e.g. @tzres.dll,-320.
-
-		// This approach works with tzres.dll but may have to be revised
-		// in the future to allow callers to provide custom search paths.
-
-		var s string
-		s, err = ExpandString("%SystemRoot%\\system32\\")
-		if err != nil {
-			return "", err
-		}
-		pdir, err = syscall.UTF16PtrFromString(s)
-		if err != nil {
-			return "", err
-		}
-
-		err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
-	}
-
-	for err == syscall.ERROR_MORE_DATA { // Grow buffer if needed
-		if buflen <= uint32(len(buf)) {
-			break // Buffer not growing, assume race; break
-		}
-		buf = make([]uint16, buflen)
-		err = regLoadMUIString(syscall.Handle(k), pname, &buf[0], uint32(len(buf)), &buflen, 0, pdir)
-	}
-
-	if err != nil {
-		return "", err
-	}
-
-	return syscall.UTF16ToString(buf), nil
-}
-
-// ExpandString expands environment-variable strings and replaces
-// them with the values defined for the current user.
-// Use ExpandString to expand EXPAND_SZ strings.
-func ExpandString(value string) (string, error) {
-	if value == "" {
-		return "", nil
-	}
-	p, err := syscall.UTF16PtrFromString(value)
-	if err != nil {
-		return "", err
-	}
-	r := make([]uint16, 100)
-	for {
-		n, err := expandEnvironmentStrings(p, &r[0], uint32(len(r)))
-		if err != nil {
-			return "", err
-		}
-		if n <= uint32(len(r)) {
-			u := (*[1 << 29]uint16)(unsafe.Pointer(&r[0]))[:]
-			return syscall.UTF16ToString(u), nil
-		}
-		r = make([]uint16, n)
-	}
-}
-
-// GetStringsValue retrieves the []string value for the specified
-// value name associated with an open key k. It also returns the value's type.
-// If value does not exist, GetStringsValue returns ErrNotExist.
-// If value is not MULTI_SZ, it will return the correct value
-// type and ErrUnexpectedType.
-func (k Key) GetStringsValue(name string) (val []string, valtype uint32, err error) {
-	data, typ, err2 := k.getValue(name, make([]byte, 64))
-	if err2 != nil {
-		return nil, typ, err2
-	}
-	if typ != MULTI_SZ {
-		return nil, typ, ErrUnexpectedType
-	}
-	if len(data) == 0 {
-		return nil, typ, nil
-	}
-	p := (*[1 << 29]uint16)(unsafe.Pointer(&data[0]))[:len(data)/2]
-	if len(p) == 0 {
-		return nil, typ, nil
-	}
-	if p[len(p)-1] == 0 {
-		p = p[:len(p)-1] // remove terminating null
-	}
-	val = make([]string, 0, 5)
-	from := 0
-	for i, c := range p {
-		if c == 0 {
-			val = append(val, string(utf16.Decode(p[from:i])))
-			from = i + 1
-		}
-	}
-	return val, typ, nil
-}
-
-// GetIntegerValue retrieves the integer value for the specified
-// value name associated with an open key k. It also returns the value's type.
-// If value does not exist, GetIntegerValue returns ErrNotExist.
-// If value is not DWORD or QWORD, it will return the correct value
-// type and ErrUnexpectedType.
-func (k Key) GetIntegerValue(name string) (val uint64, valtype uint32, err error) {
-	data, typ, err2 := k.getValue(name, make([]byte, 8))
-	if err2 != nil {
-		return 0, typ, err2
-	}
-	switch typ {
-	case DWORD:
-		if len(data) != 4 {
-			return 0, typ, errors.New("DWORD value is not 4 bytes long")
-		}
-		return uint64(*(*uint32)(unsafe.Pointer(&data[0]))), DWORD, nil
-	case QWORD:
-		if len(data) != 8 {
-			return 0, typ, errors.New("QWORD value is not 8 bytes long")
-		}
-		return uint64(*(*uint64)(unsafe.Pointer(&data[0]))), QWORD, nil
-	default:
-		return 0, typ, ErrUnexpectedType
-	}
-}
-
-// GetBinaryValue retrieves the binary value for the specified
-// value name associated with an open key k. It also returns the value's type.
-// If value does not exist, GetBinaryValue returns ErrNotExist.
-// If value is not BINARY, it will return the correct value
-// type and ErrUnexpectedType.
-func (k Key) GetBinaryValue(name string) (val []byte, valtype uint32, err error) {
-	data, typ, err2 := k.getValue(name, make([]byte, 64))
-	if err2 != nil {
-		return nil, typ, err2
-	}
-	if typ != BINARY {
-		return nil, typ, ErrUnexpectedType
-	}
-	return data, typ, nil
-}
-
-func (k Key) setValue(name string, valtype uint32, data []byte) error {
-	p, err := syscall.UTF16PtrFromString(name)
-	if err != nil {
-		return err
-	}
-	if len(data) == 0 {
-		return regSetValueEx(syscall.Handle(k), p, 0, valtype, nil, 0)
-	}
-	return regSetValueEx(syscall.Handle(k), p, 0, valtype, &data[0], uint32(len(data)))
-}
-
-// SetDWordValue sets the data and type of a name value
-// under key k to value and DWORD.
-func (k Key) SetDWordValue(name string, value uint32) error {
-	return k.setValue(name, DWORD, (*[4]byte)(unsafe.Pointer(&value))[:])
-}
-
-// SetQWordValue sets the data and type of a name value
-// under key k to value and QWORD.
-func (k Key) SetQWordValue(name string, value uint64) error {
-	return k.setValue(name, QWORD, (*[8]byte)(unsafe.Pointer(&value))[:])
-}
-
-func (k Key) setStringValue(name string, valtype uint32, value string) error {
-	v, err := syscall.UTF16FromString(value)
-	if err != nil {
-		return err
-	}
-	buf := (*[1 << 29]byte)(unsafe.Pointer(&v[0]))[:len(v)*2]
-	return k.setValue(name, valtype, buf)
-}
-
-// SetStringValue sets the data and type of a name value
-// under key k to value and SZ. The value must not contain a zero byte.
-func (k Key) SetStringValue(name, value string) error {
-	return k.setStringValue(name, SZ, value)
-}
-
-// SetExpandStringValue sets the data and type of a name value
-// under key k to value and EXPAND_SZ. The value must not contain a zero byte.
-func (k Key) SetExpandStringValue(name, value string) error {
-	return k.setStringValue(name, EXPAND_SZ, value)
-}
-
-// SetStringsValue sets the data and type of a name value
-// under key k to value and MULTI_SZ. The value strings
-// must not contain a zero byte.
-func (k Key) SetStringsValue(name string, value []string) error {
-	ss := ""
-	for _, s := range value {
-		for i := 0; i < len(s); i++ {
-			if s[i] == 0 {
-				return errors.New("string cannot have 0 inside")
-			}
-		}
-		ss += s + "\x00"
-	}
-	v := utf16.Encode([]rune(ss + "\x00"))
-	buf := (*[1 << 29]byte)(unsafe.Pointer(&v[0]))[:len(v)*2]
-	return k.setValue(name, MULTI_SZ, buf)
-}
-
-// SetBinaryValue sets the data and type of a name value
-// under key k to value and BINARY.
-func (k Key) SetBinaryValue(name string, value []byte) error {
-	return k.setValue(name, BINARY, value)
-}
-
-// DeleteValue removes a named value from the key k.
-func (k Key) DeleteValue(name string) error {
-	return regDeleteValue(syscall.Handle(k), syscall.StringToUTF16Ptr(name))
-}
-
-// ReadValueNames returns the value names of key k.
-// The parameter n controls the number of returned names,
-// analogous to the way os.File.Readdirnames works.
-func (k Key) ReadValueNames(n int) ([]string, error) {
-	ki, err := k.Stat()
-	if err != nil {
-		return nil, err
-	}
-	names := make([]string, 0, ki.ValueCount)
-	buf := make([]uint16, ki.MaxValueNameLen+1) // extra room for terminating null character
-loopItems:
-	for i := uint32(0); ; i++ {
-		if n > 0 {
-			if len(names) == n {
-				return names, nil
-			}
-		}
-		l := uint32(len(buf))
-		for {
-			err := regEnumValue(syscall.Handle(k), i, &buf[0], &l, nil, nil, nil, nil)
-			if err == nil {
-				break
-			}
-			if err == syscall.ERROR_MORE_DATA {
-				// Double buffer size and try again.
-				l = uint32(2 * len(buf))
-				buf = make([]uint16, l)
-				continue
-			}
-			if err == _ERROR_NO_MORE_ITEMS {
-				break loopItems
-			}
-			return names, err
-		}
-		names = append(names, syscall.UTF16ToString(buf[:l]))
-	}
-	if n > len(names) {
-		return names, io.EOF
-	}
-	return names, nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go b/installer/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
deleted file mode 100644
index ceebdd7726..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/registry/zsyscall_windows.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// MACHINE GENERATED BY 'go generate' COMMAND; DO NOT EDIT
-
-package registry
-
-import (
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-var _ unsafe.Pointer
-
-// Do the interface allocations only once for common
-// Errno values.
-const (
-	errnoERROR_IO_PENDING = 997
-)
-
-var (
-	errERROR_IO_PENDING error = syscall.Errno(errnoERROR_IO_PENDING)
-)
-
-// errnoErr returns common boxed Errno values, to prevent
-// allocations at runtime.
-func errnoErr(e syscall.Errno) error {
-	switch e {
-	case 0:
-		return nil
-	case errnoERROR_IO_PENDING:
-		return errERROR_IO_PENDING
-	}
-	// TODO: add more here, after collecting data on the common
-	// error values see on Windows. (perhaps when running
-	// all.bat?)
-	return e
-}
-
-var (
-	modadvapi32 = windows.NewLazySystemDLL("advapi32.dll")
-	modkernel32 = windows.NewLazySystemDLL("kernel32.dll")
-
-	procRegCreateKeyExW           = modadvapi32.NewProc("RegCreateKeyExW")
-	procRegDeleteKeyW             = modadvapi32.NewProc("RegDeleteKeyW")
-	procRegSetValueExW            = modadvapi32.NewProc("RegSetValueExW")
-	procRegEnumValueW             = modadvapi32.NewProc("RegEnumValueW")
-	procRegDeleteValueW           = modadvapi32.NewProc("RegDeleteValueW")
-	procRegLoadMUIStringW         = modadvapi32.NewProc("RegLoadMUIStringW")
-	procRegConnectRegistryW       = modadvapi32.NewProc("RegConnectRegistryW")
-	procExpandEnvironmentStringsW = modkernel32.NewProc("ExpandEnvironmentStringsW")
-)
-
-func regCreateKeyEx(key syscall.Handle, subkey *uint16, reserved uint32, class *uint16, options uint32, desired uint32, sa *syscall.SecurityAttributes, result *syscall.Handle, disposition *uint32) (regerrno error) {
-	r0, _, _ := syscall.Syscall9(procRegCreateKeyExW.Addr(), 9, uintptr(key), uintptr(unsafe.Pointer(subkey)), uintptr(reserved), uintptr(unsafe.Pointer(class)), uintptr(options), uintptr(desired), uintptr(unsafe.Pointer(sa)), uintptr(unsafe.Pointer(result)), uintptr(unsafe.Pointer(disposition)))
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regDeleteKey(key syscall.Handle, subkey *uint16) (regerrno error) {
-	r0, _, _ := syscall.Syscall(procRegDeleteKeyW.Addr(), 2, uintptr(key), uintptr(unsafe.Pointer(subkey)), 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regSetValueEx(key syscall.Handle, valueName *uint16, reserved uint32, vtype uint32, buf *byte, bufsize uint32) (regerrno error) {
-	r0, _, _ := syscall.Syscall6(procRegSetValueExW.Addr(), 6, uintptr(key), uintptr(unsafe.Pointer(valueName)), uintptr(reserved), uintptr(vtype), uintptr(unsafe.Pointer(buf)), uintptr(bufsize))
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regEnumValue(key syscall.Handle, index uint32, name *uint16, nameLen *uint32, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) {
-	r0, _, _ := syscall.Syscall9(procRegEnumValueW.Addr(), 8, uintptr(key), uintptr(index), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(nameLen)), uintptr(unsafe.Pointer(reserved)), uintptr(unsafe.Pointer(valtype)), uintptr(unsafe.Pointer(buf)), uintptr(unsafe.Pointer(buflen)), 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regDeleteValue(key syscall.Handle, name *uint16) (regerrno error) {
-	r0, _, _ := syscall.Syscall(procRegDeleteValueW.Addr(), 2, uintptr(key), uintptr(unsafe.Pointer(name)), 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regLoadMUIString(key syscall.Handle, name *uint16, buf *uint16, buflen uint32, buflenCopied *uint32, flags uint32, dir *uint16) (regerrno error) {
-	r0, _, _ := syscall.Syscall9(procRegLoadMUIStringW.Addr(), 7, uintptr(key), uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(buf)), uintptr(buflen), uintptr(unsafe.Pointer(buflenCopied)), uintptr(flags), uintptr(unsafe.Pointer(dir)), 0, 0)
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func regConnectRegistry(machinename *uint16, key syscall.Handle, result *syscall.Handle) (regerrno error) {
-	r0, _, _ := syscall.Syscall(procRegConnectRegistryW.Addr(), 3, uintptr(unsafe.Pointer(machinename)), uintptr(key), uintptr(unsafe.Pointer(result)))
-	if r0 != 0 {
-		regerrno = syscall.Errno(r0)
-	}
-	return
-}
-
-func expandEnvironmentStrings(src *uint16, dst *uint16, size uint32) (n uint32, err error) {
-	r0, _, e1 := syscall.Syscall(procExpandEnvironmentStringsW.Addr(), 3, uintptr(unsafe.Pointer(src)), uintptr(unsafe.Pointer(dst)), uintptr(size))
-	n = uint32(r0)
-	if n == 0 {
-		if e1 != 0 {
-			err = errnoErr(e1)
-		} else {
-			err = syscall.EINVAL
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/security_windows.go b/installer/vendor/golang.org/x/sys/windows/security_windows.go
index ca09bdd701..f1ec5dc4ee 100644
--- a/installer/vendor/golang.org/x/sys/windows/security_windows.go
+++ b/installer/vendor/golang.org/x/sys/windows/security_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
+// Copyright 2012 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -132,6 +132,36 @@ const (
 	SECURITY_NT_NON_UNIQUE_RID          = 0x15
 )
 
+// Predefined domain-relative RIDs for local groups.
+// See https://msdn.microsoft.com/en-us/library/windows/desktop/aa379649(v=vs.85).aspx
+const (
+	DOMAIN_ALIAS_RID_ADMINS                         = 0x220
+	DOMAIN_ALIAS_RID_USERS                          = 0x221
+	DOMAIN_ALIAS_RID_GUESTS                         = 0x222
+	DOMAIN_ALIAS_RID_POWER_USERS                    = 0x223
+	DOMAIN_ALIAS_RID_ACCOUNT_OPS                    = 0x224
+	DOMAIN_ALIAS_RID_SYSTEM_OPS                     = 0x225
+	DOMAIN_ALIAS_RID_PRINT_OPS                      = 0x226
+	DOMAIN_ALIAS_RID_BACKUP_OPS                     = 0x227
+	DOMAIN_ALIAS_RID_REPLICATOR                     = 0x228
+	DOMAIN_ALIAS_RID_RAS_SERVERS                    = 0x229
+	DOMAIN_ALIAS_RID_PREW2KCOMPACCESS               = 0x22a
+	DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS           = 0x22b
+	DOMAIN_ALIAS_RID_NETWORK_CONFIGURATION_OPS      = 0x22c
+	DOMAIN_ALIAS_RID_INCOMING_FOREST_TRUST_BUILDERS = 0x22d
+	DOMAIN_ALIAS_RID_MONITORING_USERS               = 0X22e
+	DOMAIN_ALIAS_RID_LOGGING_USERS                  = 0x22f
+	DOMAIN_ALIAS_RID_AUTHORIZATIONACCESS            = 0x230
+	DOMAIN_ALIAS_RID_TS_LICENSE_SERVERS             = 0x231
+	DOMAIN_ALIAS_RID_DCOM_USERS                     = 0x232
+	DOMAIN_ALIAS_RID_IUSERS                         = 0x238
+	DOMAIN_ALIAS_RID_CRYPTO_OPERATORS               = 0x239
+	DOMAIN_ALIAS_RID_CACHEABLE_PRINCIPALS_GROUP     = 0x23b
+	DOMAIN_ALIAS_RID_NON_CACHEABLE_PRINCIPALS_GROUP = 0x23c
+	DOMAIN_ALIAS_RID_EVENT_LOG_READERS_GROUP        = 0x23d
+	DOMAIN_ALIAS_RID_CERTSVC_DCOM_ACCESS_GROUP      = 0x23e
+)
+
 //sys	LookupAccountSid(systemName *uint16, sid *SID, name *uint16, nameLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountSidW
 //sys	LookupAccountName(systemName *uint16, accountName *uint16, sid *SID, sidLen *uint32, refdDomainName *uint16, refdDomainNameLen *uint32, use *uint32) (err error) = advapi32.LookupAccountNameW
 //sys	ConvertSidToStringSid(sid *SID, stringSid **uint16) (err error) = advapi32.ConvertSidToStringSidW
@@ -335,6 +365,8 @@ type Tokengroups struct {
 	Groups     [1]SIDAndAttributes
 }
 
+// Authorization Functions
+//sys checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) = advapi32.CheckTokenMembership
 //sys	OpenProcessToken(h Handle, access uint32, token *Token) (err error) = advapi32.OpenProcessToken
 //sys	GetTokenInformation(t Token, infoClass uint32, info *byte, infoLen uint32, returnedLen *uint32) (err error) = advapi32.GetTokenInformation
 //sys	GetUserProfileDirectory(t Token, dir *uint16, dirLen *uint32) (err error) = userenv.GetUserProfileDirectoryW
@@ -433,3 +465,12 @@ func (t Token) GetUserProfileDirectory() (string, error) {
 		}
 	}
 }
+
+// IsMember reports whether the access token t is a member of the provided SID.
+func (t Token) IsMember(sid *SID) (bool, error) {
+	var b int32
+	if e := checkTokenMembership(t, sid, &b); e != nil {
+		return false, e
+	}
+	return b != 0, nil
+}
diff --git a/installer/vendor/golang.org/x/sys/windows/service.go b/installer/vendor/golang.org/x/sys/windows/service.go
index 1c11d392f0..a500dd7dfc 100644
--- a/installer/vendor/golang.org/x/sys/windows/service.go
+++ b/installer/vendor/golang.org/x/sys/windows/service.go
@@ -95,6 +95,8 @@ const (
 	SERVICE_CONFIG_FAILURE_ACTIONS = 2
 
 	NO_ERROR = 0
+
+	SC_ENUM_PROCESS_INFO = 0
 )
 
 type SERVICE_STATUS struct {
@@ -128,6 +130,24 @@ type SERVICE_DESCRIPTION struct {
 	Description *uint16
 }
 
+type SERVICE_STATUS_PROCESS struct {
+	ServiceType             uint32
+	CurrentState            uint32
+	ControlsAccepted        uint32
+	Win32ExitCode           uint32
+	ServiceSpecificExitCode uint32
+	CheckPoint              uint32
+	WaitHint                uint32
+	ProcessId               uint32
+	ServiceFlags            uint32
+}
+
+type ENUM_SERVICE_STATUS_PROCESS struct {
+	ServiceName          *uint16
+	DisplayName          *uint16
+	ServiceStatusProcess SERVICE_STATUS_PROCESS
+}
+
 //sys	CloseServiceHandle(handle Handle) (err error) = advapi32.CloseServiceHandle
 //sys	CreateService(mgr Handle, serviceName *uint16, displayName *uint16, access uint32, srvType uint32, startType uint32, errCtl uint32, pathName *uint16, loadOrderGroup *uint16, tagId *uint32, dependencies *uint16, serviceStartName *uint16, password *uint16) (handle Handle, err error) [failretval==0] = advapi32.CreateServiceW
 //sys	OpenService(mgr Handle, serviceName *uint16, access uint32) (handle Handle, err error) [failretval==0] = advapi32.OpenServiceW
@@ -141,3 +161,4 @@ type SERVICE_DESCRIPTION struct {
 //sys	QueryServiceConfig(service Handle, serviceConfig *QUERY_SERVICE_CONFIG, bufSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfigW
 //sys	ChangeServiceConfig2(service Handle, infoLevel uint32, info *byte) (err error) = advapi32.ChangeServiceConfig2W
 //sys	QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize uint32, bytesNeeded *uint32) (err error) = advapi32.QueryServiceConfig2W
+//sys	EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) = advapi32.EnumServicesStatusExW
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/debug/log.go b/installer/vendor/golang.org/x/sys/windows/svc/debug/log.go
deleted file mode 100644
index e51ab42a1a..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/debug/log.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package debug
-
-import (
-	"os"
-	"strconv"
-)
-
-// Log interface allows different log implementations to be used.
-type Log interface {
-	Close() error
-	Info(eid uint32, msg string) error
-	Warning(eid uint32, msg string) error
-	Error(eid uint32, msg string) error
-}
-
-// ConsoleLog provides access to the console.
-type ConsoleLog struct {
-	Name string
-}
-
-// New creates new ConsoleLog.
-func New(source string) *ConsoleLog {
-	return &ConsoleLog{Name: source}
-}
-
-// Close closes console log l.
-func (l *ConsoleLog) Close() error {
-	return nil
-}
-
-func (l *ConsoleLog) report(kind string, eid uint32, msg string) error {
-	s := l.Name + "." + kind + "(" + strconv.Itoa(int(eid)) + "): " + msg + "\n"
-	_, err := os.Stdout.Write([]byte(s))
-	return err
-}
-
-// Info writes an information event msg with event id eid to the console l.
-func (l *ConsoleLog) Info(eid uint32, msg string) error {
-	return l.report("info", eid, msg)
-}
-
-// Warning writes an warning event msg with event id eid to the console l.
-func (l *ConsoleLog) Warning(eid uint32, msg string) error {
-	return l.report("warn", eid, msg)
-}
-
-// Error writes an error event msg with event id eid to the console l.
-func (l *ConsoleLog) Error(eid uint32, msg string) error {
-	return l.report("error", eid, msg)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/debug/service.go b/installer/vendor/golang.org/x/sys/windows/svc/debug/service.go
deleted file mode 100644
index d5ab94b2c7..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/debug/service.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package debug provides facilities to execute svc.Handler on console.
-//
-package debug
-
-import (
-	"os"
-	"os/signal"
-	"syscall"
-
-	"golang.org/x/sys/windows/svc"
-)
-
-// Run executes service name by calling appropriate handler function.
-// The process is running on console, unlike real service. Use Ctrl+C to
-// send "Stop" command to your service.
-func Run(name string, handler svc.Handler) error {
-	cmds := make(chan svc.ChangeRequest)
-	changes := make(chan svc.Status)
-
-	sig := make(chan os.Signal)
-	signal.Notify(sig)
-
-	go func() {
-		status := svc.Status{State: svc.Stopped}
-		for {
-			select {
-			case <-sig:
-				cmds <- svc.ChangeRequest{svc.Stop, status}
-			case status = <-changes:
-			}
-		}
-	}()
-
-	_, errno := handler.Execute([]string{name}, cmds, changes)
-	if errno != 0 {
-		return syscall.Errno(errno)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/event.go b/installer/vendor/golang.org/x/sys/windows/svc/event.go
deleted file mode 100644
index 0508e22881..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/event.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package svc
-
-import (
-	"errors"
-
-	"golang.org/x/sys/windows"
-)
-
-// event represents auto-reset, initially non-signaled Windows event.
-// It is used to communicate between go and asm parts of this package.
-type event struct {
-	h windows.Handle
-}
-
-func newEvent() (*event, error) {
-	h, err := windows.CreateEvent(nil, 0, 0, nil)
-	if err != nil {
-		return nil, err
-	}
-	return &event{h: h}, nil
-}
-
-func (e *event) Close() error {
-	return windows.CloseHandle(e.h)
-}
-
-func (e *event) Set() error {
-	return windows.SetEvent(e.h)
-}
-
-func (e *event) Wait() error {
-	s, err := windows.WaitForSingleObject(e.h, windows.INFINITE)
-	switch s {
-	case windows.WAIT_OBJECT_0:
-		break
-	case windows.WAIT_FAILED:
-		return err
-	default:
-		return errors.New("unexpected result from WaitForSingleObject")
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/install.go b/installer/vendor/golang.org/x/sys/windows/svc/eventlog/install.go
deleted file mode 100644
index c76a3760a4..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/install.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package eventlog
-
-import (
-	"errors"
-
-	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/registry"
-)
-
-const (
-	// Log levels.
-	Info    = windows.EVENTLOG_INFORMATION_TYPE
-	Warning = windows.EVENTLOG_WARNING_TYPE
-	Error   = windows.EVENTLOG_ERROR_TYPE
-)
-
-const addKeyName = `SYSTEM\CurrentControlSet\Services\EventLog\Application`
-
-// Install modifies PC registry to allow logging with an event source src.
-// It adds all required keys and values to the event log registry key.
-// Install uses msgFile as the event message file. If useExpandKey is true,
-// the event message file is installed as REG_EXPAND_SZ value,
-// otherwise as REG_SZ. Use bitwise of log.Error, log.Warning and
-// log.Info to specify events supported by the new event source.
-func Install(src, msgFile string, useExpandKey bool, eventsSupported uint32) error {
-	appkey, err := registry.OpenKey(registry.LOCAL_MACHINE, addKeyName, registry.CREATE_SUB_KEY)
-	if err != nil {
-		return err
-	}
-	defer appkey.Close()
-
-	sk, alreadyExist, err := registry.CreateKey(appkey, src, registry.SET_VALUE)
-	if err != nil {
-		return err
-	}
-	defer sk.Close()
-	if alreadyExist {
-		return errors.New(addKeyName + `\` + src + " registry key already exists")
-	}
-
-	err = sk.SetDWordValue("CustomSource", 1)
-	if err != nil {
-		return err
-	}
-	if useExpandKey {
-		err = sk.SetExpandStringValue("EventMessageFile", msgFile)
-	} else {
-		err = sk.SetStringValue("EventMessageFile", msgFile)
-	}
-	if err != nil {
-		return err
-	}
-	err = sk.SetDWordValue("TypesSupported", eventsSupported)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-// InstallAsEventCreate is the same as Install, but uses
-// %SystemRoot%\System32\EventCreate.exe as the event message file.
-func InstallAsEventCreate(src string, eventsSupported uint32) error {
-	return Install(src, "%SystemRoot%\\System32\\EventCreate.exe", true, eventsSupported)
-}
-
-// Remove deletes all registry elements installed by the correspondent Install.
-func Remove(src string) error {
-	appkey, err := registry.OpenKey(registry.LOCAL_MACHINE, addKeyName, registry.SET_VALUE)
-	if err != nil {
-		return err
-	}
-	defer appkey.Close()
-	return registry.DeleteKey(appkey, src)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log.go b/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log.go
deleted file mode 100644
index 46e5153d02..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package eventlog implements access to Windows event log.
-//
-package eventlog
-
-import (
-	"errors"
-	"syscall"
-
-	"golang.org/x/sys/windows"
-)
-
-// Log provides access to the system log.
-type Log struct {
-	Handle windows.Handle
-}
-
-// Open retrieves a handle to the specified event log.
-func Open(source string) (*Log, error) {
-	return OpenRemote("", source)
-}
-
-// OpenRemote does the same as Open, but on different computer host.
-func OpenRemote(host, source string) (*Log, error) {
-	if source == "" {
-		return nil, errors.New("Specify event log source")
-	}
-	var s *uint16
-	if host != "" {
-		s = syscall.StringToUTF16Ptr(host)
-	}
-	h, err := windows.RegisterEventSource(s, syscall.StringToUTF16Ptr(source))
-	if err != nil {
-		return nil, err
-	}
-	return &Log{Handle: h}, nil
-}
-
-// Close closes event log l.
-func (l *Log) Close() error {
-	return windows.DeregisterEventSource(l.Handle)
-}
-
-func (l *Log) report(etype uint16, eid uint32, msg string) error {
-	ss := []*uint16{syscall.StringToUTF16Ptr(msg)}
-	return windows.ReportEvent(l.Handle, etype, 0, eid, 0, 1, 0, &ss[0], nil)
-}
-
-// Info writes an information event msg with event id eid to the end of event log l.
-// When EventCreate.exe is used, eid must be between 1 and 1000.
-func (l *Log) Info(eid uint32, msg string) error {
-	return l.report(windows.EVENTLOG_INFORMATION_TYPE, eid, msg)
-}
-
-// Warning writes an warning event msg with event id eid to the end of event log l.
-// When EventCreate.exe is used, eid must be between 1 and 1000.
-func (l *Log) Warning(eid uint32, msg string) error {
-	return l.report(windows.EVENTLOG_WARNING_TYPE, eid, msg)
-}
-
-// Error writes an error event msg with event id eid to the end of event log l.
-// When EventCreate.exe is used, eid must be between 1 and 1000.
-func (l *Log) Error(eid uint32, msg string) error {
-	return l.report(windows.EVENTLOG_ERROR_TYPE, eid, msg)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go b/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
deleted file mode 100644
index 4dd8ad9e74..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/eventlog/log_test.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package eventlog_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/windows/svc/eventlog"
-)
-
-func TestLog(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system logs")
-	}
-
-	const name = "mylog"
-	const supports = eventlog.Error | eventlog.Warning | eventlog.Info
-	err := eventlog.InstallAsEventCreate(name, supports)
-	if err != nil {
-		t.Fatalf("Install failed: %s", err)
-	}
-	defer func() {
-		err = eventlog.Remove(name)
-		if err != nil {
-			t.Fatalf("Remove failed: %s", err)
-		}
-	}()
-
-	l, err := eventlog.Open(name)
-	if err != nil {
-		t.Fatalf("Open failed: %s", err)
-	}
-	defer l.Close()
-
-	err = l.Info(1, "info")
-	if err != nil {
-		t.Fatalf("Info failed: %s", err)
-	}
-	err = l.Warning(2, "warning")
-	if err != nil {
-		t.Fatalf("Warning failed: %s", err)
-	}
-	err = l.Error(3, "error")
-	if err != nil {
-		t.Fatalf("Error failed: %s", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/example/beep.go b/installer/vendor/golang.org/x/sys/windows/svc/example/beep.go
deleted file mode 100644
index dcf23408d3..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/example/beep.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package main
-
-import (
-	"syscall"
-)
-
-// BUG(brainman): MessageBeep Windows api is broken on Windows 7,
-// so this example does not beep when runs as service on Windows 7.
-
-var (
-	beepFunc = syscall.MustLoadDLL("user32.dll").MustFindProc("MessageBeep")
-)
-
-func beep() {
-	beepFunc.Call(0xffffffff)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/example/install.go b/installer/vendor/golang.org/x/sys/windows/svc/example/install.go
deleted file mode 100644
index 39cb00d2ad..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/example/install.go
+++ /dev/null
@@ -1,92 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package main
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"golang.org/x/sys/windows/svc/eventlog"
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func exePath() (string, error) {
-	prog := os.Args[0]
-	p, err := filepath.Abs(prog)
-	if err != nil {
-		return "", err
-	}
-	fi, err := os.Stat(p)
-	if err == nil {
-		if !fi.Mode().IsDir() {
-			return p, nil
-		}
-		err = fmt.Errorf("%s is directory", p)
-	}
-	if filepath.Ext(p) == "" {
-		p += ".exe"
-		fi, err := os.Stat(p)
-		if err == nil {
-			if !fi.Mode().IsDir() {
-				return p, nil
-			}
-			err = fmt.Errorf("%s is directory", p)
-		}
-	}
-	return "", err
-}
-
-func installService(name, desc string) error {
-	exepath, err := exePath()
-	if err != nil {
-		return err
-	}
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-	s, err := m.OpenService(name)
-	if err == nil {
-		s.Close()
-		return fmt.Errorf("service %s already exists", name)
-	}
-	s, err = m.CreateService(name, exepath, mgr.Config{DisplayName: desc}, "is", "auto-started")
-	if err != nil {
-		return err
-	}
-	defer s.Close()
-	err = eventlog.InstallAsEventCreate(name, eventlog.Error|eventlog.Warning|eventlog.Info)
-	if err != nil {
-		s.Delete()
-		return fmt.Errorf("SetupEventLogSource() failed: %s", err)
-	}
-	return nil
-}
-
-func removeService(name string) error {
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-	s, err := m.OpenService(name)
-	if err != nil {
-		return fmt.Errorf("service %s is not installed", name)
-	}
-	defer s.Close()
-	err = s.Delete()
-	if err != nil {
-		return err
-	}
-	err = eventlog.Remove(name)
-	if err != nil {
-		return fmt.Errorf("RemoveEventLogSource() failed: %s", err)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/example/main.go b/installer/vendor/golang.org/x/sys/windows/svc/example/main.go
deleted file mode 100644
index dc96c081af..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/example/main.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Example service program that beeps.
-//
-// The program demonstrates how to create Windows service and
-// install / remove it on a computer. It also shows how to
-// stop / start / pause / continue any service, and how to
-// write to event log. It also shows how to use debug
-// facilities available in debug package.
-//
-package main
-
-import (
-	"fmt"
-	"log"
-	"os"
-	"strings"
-
-	"golang.org/x/sys/windows/svc"
-)
-
-func usage(errmsg string) {
-	fmt.Fprintf(os.Stderr,
-		"%s\n\n"+
-			"usage: %s <command>\n"+
-			"       where <command> is one of\n"+
-			"       install, remove, debug, start, stop, pause or continue.\n",
-		errmsg, os.Args[0])
-	os.Exit(2)
-}
-
-func main() {
-	const svcName = "myservice"
-
-	isIntSess, err := svc.IsAnInteractiveSession()
-	if err != nil {
-		log.Fatalf("failed to determine if we are running in an interactive session: %v", err)
-	}
-	if !isIntSess {
-		runService(svcName, false)
-		return
-	}
-
-	if len(os.Args) < 2 {
-		usage("no command specified")
-	}
-
-	cmd := strings.ToLower(os.Args[1])
-	switch cmd {
-	case "debug":
-		runService(svcName, true)
-		return
-	case "install":
-		err = installService(svcName, "my service")
-	case "remove":
-		err = removeService(svcName)
-	case "start":
-		err = startService(svcName)
-	case "stop":
-		err = controlService(svcName, svc.Stop, svc.Stopped)
-	case "pause":
-		err = controlService(svcName, svc.Pause, svc.Paused)
-	case "continue":
-		err = controlService(svcName, svc.Continue, svc.Running)
-	default:
-		usage(fmt.Sprintf("invalid command %s", cmd))
-	}
-	if err != nil {
-		log.Fatalf("failed to %s %s: %v", cmd, svcName, err)
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/example/manage.go b/installer/vendor/golang.org/x/sys/windows/svc/example/manage.go
deleted file mode 100644
index 782dbd96ca..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/example/manage.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package main
-
-import (
-	"fmt"
-	"time"
-
-	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func startService(name string) error {
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-	s, err := m.OpenService(name)
-	if err != nil {
-		return fmt.Errorf("could not access service: %v", err)
-	}
-	defer s.Close()
-	err = s.Start("is", "manual-started")
-	if err != nil {
-		return fmt.Errorf("could not start service: %v", err)
-	}
-	return nil
-}
-
-func controlService(name string, c svc.Cmd, to svc.State) error {
-	m, err := mgr.Connect()
-	if err != nil {
-		return err
-	}
-	defer m.Disconnect()
-	s, err := m.OpenService(name)
-	if err != nil {
-		return fmt.Errorf("could not access service: %v", err)
-	}
-	defer s.Close()
-	status, err := s.Control(c)
-	if err != nil {
-		return fmt.Errorf("could not send control=%d: %v", c, err)
-	}
-	timeout := time.Now().Add(10 * time.Second)
-	for status.State != to {
-		if timeout.Before(time.Now()) {
-			return fmt.Errorf("timeout waiting for service to go to state=%d", to)
-		}
-		time.Sleep(300 * time.Millisecond)
-		status, err = s.Query()
-		if err != nil {
-			return fmt.Errorf("could not retrieve service status: %v", err)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/example/service.go b/installer/vendor/golang.org/x/sys/windows/svc/example/service.go
deleted file mode 100644
index 237e80984d..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/example/service.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package main
-
-import (
-	"fmt"
-	"time"
-
-	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/debug"
-	"golang.org/x/sys/windows/svc/eventlog"
-)
-
-var elog debug.Log
-
-type myservice struct{}
-
-func (m *myservice) Execute(args []string, r <-chan svc.ChangeRequest, changes chan<- svc.Status) (ssec bool, errno uint32) {
-	const cmdsAccepted = svc.AcceptStop | svc.AcceptShutdown | svc.AcceptPauseAndContinue
-	changes <- svc.Status{State: svc.StartPending}
-	fasttick := time.Tick(500 * time.Millisecond)
-	slowtick := time.Tick(2 * time.Second)
-	tick := fasttick
-	changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
-loop:
-	for {
-		select {
-		case <-tick:
-			beep()
-			elog.Info(1, "beep")
-		case c := <-r:
-			switch c.Cmd {
-			case svc.Interrogate:
-				changes <- c.CurrentStatus
-				// Testing deadlock from https://code.google.com/p/winsvc/issues/detail?id=4
-				time.Sleep(100 * time.Millisecond)
-				changes <- c.CurrentStatus
-			case svc.Stop, svc.Shutdown:
-				break loop
-			case svc.Pause:
-				changes <- svc.Status{State: svc.Paused, Accepts: cmdsAccepted}
-				tick = slowtick
-			case svc.Continue:
-				changes <- svc.Status{State: svc.Running, Accepts: cmdsAccepted}
-				tick = fasttick
-			default:
-				elog.Error(1, fmt.Sprintf("unexpected control request #%d", c))
-			}
-		}
-	}
-	changes <- svc.Status{State: svc.StopPending}
-	return
-}
-
-func runService(name string, isDebug bool) {
-	var err error
-	if isDebug {
-		elog = debug.New(name)
-	} else {
-		elog, err = eventlog.Open(name)
-		if err != nil {
-			return
-		}
-	}
-	defer elog.Close()
-
-	elog.Info(1, fmt.Sprintf("starting %s service", name))
-	run := svc.Run
-	if isDebug {
-		run = debug.Run
-	}
-	err = run(name, &myservice{})
-	if err != nil {
-		elog.Error(1, fmt.Sprintf("%s service failed: %v", name, err))
-		return
-	}
-	elog.Info(1, fmt.Sprintf("%s service stopped", name))
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/go12.c b/installer/vendor/golang.org/x/sys/windows/svc/go12.c
deleted file mode 100644
index 6f1be1fa3b..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/go12.c
+++ /dev/null
@@ -1,24 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build !go1.3
-
-// copied from pkg/runtime
-typedef	unsigned int	uint32;
-typedef	unsigned long long int	uint64;
-#ifdef _64BIT
-typedef	uint64		uintptr;
-#else
-typedef	uint32		uintptr;
-#endif
-
-// from sys_386.s or sys_amd64.s
-void ·servicemain(void);
-
-void
-·getServiceMain(uintptr *r)
-{
-	*r = (uintptr)·servicemain;
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/go12.go b/installer/vendor/golang.org/x/sys/windows/svc/go12.go
deleted file mode 100644
index 6f0a924eaf..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/go12.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build !go1.3
-
-package svc
-
-// from go12.c
-func getServiceMain(r *uintptr)
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/go13.go b/installer/vendor/golang.org/x/sys/windows/svc/go13.go
deleted file mode 100644
index 432a9e796a..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/go13.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-// +build go1.3
-
-package svc
-
-import "unsafe"
-
-const ptrSize = 4 << (^uintptr(0) >> 63) // unsafe.Sizeof(uintptr(0)) but an ideal const
-
-// Should be a built-in for unsafe.Pointer?
-func add(p unsafe.Pointer, x uintptr) unsafe.Pointer {
-	return unsafe.Pointer(uintptr(p) + x)
-}
-
-// funcPC returns the entry PC of the function f.
-// It assumes that f is a func value. Otherwise the behavior is undefined.
-func funcPC(f interface{}) uintptr {
-	return **(**uintptr)(add(unsafe.Pointer(&f), ptrSize))
-}
-
-// from sys_386.s and sys_amd64.s
-func servicectlhandler(ctl uint32) uintptr
-func servicemain(argc uint32, argv **uint16)
-
-func getServiceMain(r *uintptr) {
-	*r = funcPC(servicemain)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/mgr/config.go b/installer/vendor/golang.org/x/sys/windows/svc/mgr/config.go
deleted file mode 100644
index 0a6edba4f5..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/mgr/config.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package mgr
-
-import (
-	"syscall"
-	"unicode/utf16"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-const (
-	// Service start types.
-	StartManual    = windows.SERVICE_DEMAND_START // the service must be started manually
-	StartAutomatic = windows.SERVICE_AUTO_START   // the service will start by itself whenever the computer reboots
-	StartDisabled  = windows.SERVICE_DISABLED     // the service cannot be started
-
-	// The severity of the error, and action taken,
-	// if this service fails to start.
-	ErrorCritical = windows.SERVICE_ERROR_CRITICAL
-	ErrorIgnore   = windows.SERVICE_ERROR_IGNORE
-	ErrorNormal   = windows.SERVICE_ERROR_NORMAL
-	ErrorSevere   = windows.SERVICE_ERROR_SEVERE
-)
-
-// TODO(brainman): Password is not returned by windows.QueryServiceConfig, not sure how to get it.
-
-type Config struct {
-	ServiceType      uint32
-	StartType        uint32
-	ErrorControl     uint32
-	BinaryPathName   string // fully qualified path to the service binary file, can also include arguments for an auto-start service
-	LoadOrderGroup   string
-	TagId            uint32
-	Dependencies     []string
-	ServiceStartName string // name of the account under which the service should run
-	DisplayName      string
-	Password         string
-	Description      string
-}
-
-func toString(p *uint16) string {
-	if p == nil {
-		return ""
-	}
-	return syscall.UTF16ToString((*[4096]uint16)(unsafe.Pointer(p))[:])
-}
-
-func toStringSlice(ps *uint16) []string {
-	if ps == nil {
-		return nil
-	}
-	r := make([]string, 0)
-	for from, i, p := 0, 0, (*[1 << 24]uint16)(unsafe.Pointer(ps)); true; i++ {
-		if p[i] == 0 {
-			// empty string marks the end
-			if i <= from {
-				break
-			}
-			r = append(r, string(utf16.Decode(p[from:i])))
-			from = i + 1
-		}
-	}
-	return r
-}
-
-// Config retrieves service s configuration paramteres.
-func (s *Service) Config() (Config, error) {
-	var p *windows.QUERY_SERVICE_CONFIG
-	n := uint32(1024)
-	for {
-		b := make([]byte, n)
-		p = (*windows.QUERY_SERVICE_CONFIG)(unsafe.Pointer(&b[0]))
-		err := windows.QueryServiceConfig(s.Handle, p, n, &n)
-		if err == nil {
-			break
-		}
-		if err.(syscall.Errno) != syscall.ERROR_INSUFFICIENT_BUFFER {
-			return Config{}, err
-		}
-		if n <= uint32(len(b)) {
-			return Config{}, err
-		}
-	}
-
-	var p2 *windows.SERVICE_DESCRIPTION
-	n = uint32(1024)
-	for {
-		b := make([]byte, n)
-		p2 = (*windows.SERVICE_DESCRIPTION)(unsafe.Pointer(&b[0]))
-		err := windows.QueryServiceConfig2(s.Handle,
-			windows.SERVICE_CONFIG_DESCRIPTION, &b[0], n, &n)
-		if err == nil {
-			break
-		}
-		if err.(syscall.Errno) != syscall.ERROR_INSUFFICIENT_BUFFER {
-			return Config{}, err
-		}
-		if n <= uint32(len(b)) {
-			return Config{}, err
-		}
-	}
-
-	return Config{
-		ServiceType:      p.ServiceType,
-		StartType:        p.StartType,
-		ErrorControl:     p.ErrorControl,
-		BinaryPathName:   toString(p.BinaryPathName),
-		LoadOrderGroup:   toString(p.LoadOrderGroup),
-		TagId:            p.TagId,
-		Dependencies:     toStringSlice(p.Dependencies),
-		ServiceStartName: toString(p.ServiceStartName),
-		DisplayName:      toString(p.DisplayName),
-		Description:      toString(p2.Description),
-	}, nil
-}
-
-func updateDescription(handle windows.Handle, desc string) error {
-	d := windows.SERVICE_DESCRIPTION{toPtr(desc)}
-	return windows.ChangeServiceConfig2(handle,
-		windows.SERVICE_CONFIG_DESCRIPTION, (*byte)(unsafe.Pointer(&d)))
-}
-
-// UpdateConfig updates service s configuration parameters.
-func (s *Service) UpdateConfig(c Config) error {
-	err := windows.ChangeServiceConfig(s.Handle, c.ServiceType, c.StartType,
-		c.ErrorControl, toPtr(c.BinaryPathName), toPtr(c.LoadOrderGroup),
-		nil, toStringBlock(c.Dependencies), toPtr(c.ServiceStartName),
-		toPtr(c.Password), toPtr(c.DisplayName))
-	if err != nil {
-		return err
-	}
-	return updateDescription(s.Handle, c.Description)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go b/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
deleted file mode 100644
index da8ceb6ed8..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package mgr can be used to manage Windows service programs.
-// It can be used to install and remove them. It can also start,
-// stop and pause them. The package can query / change current
-// service state and config parameters.
-//
-package mgr
-
-import (
-	"syscall"
-	"unicode/utf16"
-
-	"golang.org/x/sys/windows"
-)
-
-// Mgr is used to manage Windows service.
-type Mgr struct {
-	Handle windows.Handle
-}
-
-// Connect establishes a connection to the service control manager.
-func Connect() (*Mgr, error) {
-	return ConnectRemote("")
-}
-
-// ConnectRemote establishes a connection to the
-// service control manager on computer named host.
-func ConnectRemote(host string) (*Mgr, error) {
-	var s *uint16
-	if host != "" {
-		s = syscall.StringToUTF16Ptr(host)
-	}
-	h, err := windows.OpenSCManager(s, nil, windows.SC_MANAGER_ALL_ACCESS)
-	if err != nil {
-		return nil, err
-	}
-	return &Mgr{Handle: h}, nil
-}
-
-// Disconnect closes connection to the service control manager m.
-func (m *Mgr) Disconnect() error {
-	return windows.CloseServiceHandle(m.Handle)
-}
-
-func toPtr(s string) *uint16 {
-	if len(s) == 0 {
-		return nil
-	}
-	return syscall.StringToUTF16Ptr(s)
-}
-
-// toStringBlock terminates strings in ss with 0, and then
-// concatenates them together. It also adds extra 0 at the end.
-func toStringBlock(ss []string) *uint16 {
-	if len(ss) == 0 {
-		return nil
-	}
-	t := ""
-	for _, s := range ss {
-		if s != "" {
-			t += s + "\x00"
-		}
-	}
-	if t == "" {
-		return nil
-	}
-	t += "\x00"
-	return &utf16.Encode([]rune(t))[0]
-}
-
-// CreateService installs new service name on the system.
-// The service will be executed by running exepath binary.
-// Use config c to specify service parameters.
-// If service StartType is set to StartAutomatic,
-// args will be passed to svc.Handle.Execute.
-func (m *Mgr) CreateService(name, exepath string, c Config, args ...string) (*Service, error) {
-	if c.StartType == 0 {
-		c.StartType = StartManual
-	}
-	if c.ErrorControl == 0 {
-		c.ErrorControl = ErrorNormal
-	}
-	if c.ServiceType == 0 {
-		c.ServiceType = windows.SERVICE_WIN32_OWN_PROCESS
-	}
-	s := syscall.EscapeArg(exepath)
-	for _, v := range args {
-		s += " " + syscall.EscapeArg(v)
-	}
-	h, err := windows.CreateService(m.Handle, toPtr(name), toPtr(c.DisplayName),
-		windows.SERVICE_ALL_ACCESS, c.ServiceType,
-		c.StartType, c.ErrorControl, toPtr(s), toPtr(c.LoadOrderGroup),
-		nil, toStringBlock(c.Dependencies), toPtr(c.ServiceStartName), toPtr(c.Password))
-	if err != nil {
-		return nil, err
-	}
-	if c.Description != "" {
-		err = updateDescription(h, c.Description)
-		if err != nil {
-			return nil, err
-		}
-	}
-	return &Service{Name: name, Handle: h}, nil
-}
-
-// OpenService retrieves access to service name, so it can
-// be interrogated and controlled.
-func (m *Mgr) OpenService(name string) (*Service, error) {
-	h, err := windows.OpenService(m.Handle, syscall.StringToUTF16Ptr(name), windows.SERVICE_ALL_ACCESS)
-	if err != nil {
-		return nil, err
-	}
-	return &Service{Name: name, Handle: h}, nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go b/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
deleted file mode 100644
index 78be970c05..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/mgr/mgr_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package mgr_test
-
-import (
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"syscall"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func TestOpenLanManServer(t *testing.T) {
-	m, err := mgr.Connect()
-	if err != nil {
-		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
-			t.Skip("Skipping test: we don't have rights to manage services.")
-		}
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	s, err := m.OpenService("LanmanServer")
-	if err != nil {
-		t.Fatalf("OpenService(lanmanserver) failed: %s", err)
-	}
-	defer s.Close()
-
-	_, err = s.Config()
-	if err != nil {
-		t.Fatalf("Config failed: %s", err)
-	}
-}
-
-func install(t *testing.T, m *mgr.Mgr, name, exepath string, c mgr.Config) {
-	// Sometimes it takes a while for the service to get
-	// removed after previous test run.
-	for i := 0; ; i++ {
-		s, err := m.OpenService(name)
-		if err != nil {
-			break
-		}
-		s.Close()
-
-		if i > 10 {
-			t.Fatalf("service %s already exists", name)
-		}
-		time.Sleep(300 * time.Millisecond)
-	}
-
-	s, err := m.CreateService(name, exepath, c)
-	if err != nil {
-		t.Fatalf("CreateService(%s) failed: %v", name, err)
-	}
-	defer s.Close()
-}
-
-func depString(d []string) string {
-	if len(d) == 0 {
-		return ""
-	}
-	for i := range d {
-		d[i] = strings.ToLower(d[i])
-	}
-	ss := sort.StringSlice(d)
-	ss.Sort()
-	return strings.Join([]string(ss), " ")
-}
-
-func testConfig(t *testing.T, s *mgr.Service, should mgr.Config) mgr.Config {
-	is, err := s.Config()
-	if err != nil {
-		t.Fatalf("Config failed: %s", err)
-	}
-	if should.DisplayName != is.DisplayName {
-		t.Fatalf("config mismatch: DisplayName is %q, but should have %q", is.DisplayName, should.DisplayName)
-	}
-	if should.StartType != is.StartType {
-		t.Fatalf("config mismatch: StartType is %v, but should have %v", is.StartType, should.StartType)
-	}
-	if should.Description != is.Description {
-		t.Fatalf("config mismatch: Description is %q, but should have %q", is.Description, should.Description)
-	}
-	if depString(should.Dependencies) != depString(is.Dependencies) {
-		t.Fatalf("config mismatch: Dependencies is %v, but should have %v", is.Dependencies, should.Dependencies)
-	}
-	return is
-}
-
-func remove(t *testing.T, s *mgr.Service) {
-	err := s.Delete()
-	if err != nil {
-		t.Fatalf("Delete failed: %s", err)
-	}
-}
-
-func TestMyService(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system services")
-	}
-
-	const name = "myservice"
-
-	m, err := mgr.Connect()
-	if err != nil {
-		if errno, ok := err.(syscall.Errno); ok && errno == syscall.ERROR_ACCESS_DENIED {
-			t.Skip("Skipping test: we don't have rights to manage services.")
-		}
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	c := mgr.Config{
-		StartType:    mgr.StartDisabled,
-		DisplayName:  "my service",
-		Description:  "my service is just a test",
-		Dependencies: []string{"LanmanServer", "W32Time"},
-	}
-
-	exename := os.Args[0]
-	exepath, err := filepath.Abs(exename)
-	if err != nil {
-		t.Fatalf("filepath.Abs(%s) failed: %s", exename, err)
-	}
-
-	install(t, m, name, exepath, c)
-
-	s, err := m.OpenService(name)
-	if err != nil {
-		t.Fatalf("service %s is not installed", name)
-	}
-	defer s.Close()
-
-	c.BinaryPathName = exepath
-	c = testConfig(t, s, c)
-
-	c.StartType = mgr.StartManual
-	err = s.UpdateConfig(c)
-	if err != nil {
-		t.Fatalf("UpdateConfig failed: %v", err)
-	}
-
-	testConfig(t, s, c)
-
-	remove(t, s)
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/mgr/service.go b/installer/vendor/golang.org/x/sys/windows/svc/mgr/service.go
deleted file mode 100644
index 465f3c3d23..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/mgr/service.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package mgr
-
-import (
-	"syscall"
-
-	"golang.org/x/sys/windows"
-	"golang.org/x/sys/windows/svc"
-)
-
-// TODO(brainman): Use EnumDependentServices to enumerate dependent services.
-
-// TODO(brainman): Use EnumServicesStatus to enumerate services in the specified service control manager database.
-
-// Service is used to access Windows service.
-type Service struct {
-	Name   string
-	Handle windows.Handle
-}
-
-// Delete marks service s for deletion from the service control manager database.
-func (s *Service) Delete() error {
-	return windows.DeleteService(s.Handle)
-}
-
-// Close relinquish access to the service s.
-func (s *Service) Close() error {
-	return windows.CloseServiceHandle(s.Handle)
-}
-
-// Start starts service s.
-// args will be passed to svc.Handler.Execute.
-func (s *Service) Start(args ...string) error {
-	var p **uint16
-	if len(args) > 0 {
-		vs := make([]*uint16, len(args))
-		for i, _ := range vs {
-			vs[i] = syscall.StringToUTF16Ptr(args[i])
-		}
-		p = &vs[0]
-	}
-	return windows.StartService(s.Handle, uint32(len(args)), p)
-}
-
-// Control sends state change request c to the servce s.
-func (s *Service) Control(c svc.Cmd) (svc.Status, error) {
-	var t windows.SERVICE_STATUS
-	err := windows.ControlService(s.Handle, uint32(c), &t)
-	if err != nil {
-		return svc.Status{}, err
-	}
-	return svc.Status{
-		State:   svc.State(t.CurrentState),
-		Accepts: svc.Accepted(t.ControlsAccepted),
-	}, nil
-}
-
-// Query returns current status of service s.
-func (s *Service) Query() (svc.Status, error) {
-	var t windows.SERVICE_STATUS
-	err := windows.QueryServiceStatus(s.Handle, &t)
-	if err != nil {
-		return svc.Status{}, err
-	}
-	return svc.Status{
-		State:   svc.State(t.CurrentState),
-		Accepts: svc.Accepted(t.ControlsAccepted),
-	}, nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/security.go b/installer/vendor/golang.org/x/sys/windows/svc/security.go
deleted file mode 100644
index 6fbc9236ed..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/security.go
+++ /dev/null
@@ -1,62 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package svc
-
-import (
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-func allocSid(subAuth0 uint32) (*windows.SID, error) {
-	var sid *windows.SID
-	err := windows.AllocateAndInitializeSid(&windows.SECURITY_NT_AUTHORITY,
-		1, subAuth0, 0, 0, 0, 0, 0, 0, 0, &sid)
-	if err != nil {
-		return nil, err
-	}
-	return sid, nil
-}
-
-// IsAnInteractiveSession determines if calling process is running interactively.
-// It queries the process token for membership in the Interactive group.
-// http://stackoverflow.com/questions/2668851/how-do-i-detect-that-my-application-is-running-as-service-or-in-an-interactive-s
-func IsAnInteractiveSession() (bool, error) {
-	interSid, err := allocSid(windows.SECURITY_INTERACTIVE_RID)
-	if err != nil {
-		return false, err
-	}
-	defer windows.FreeSid(interSid)
-
-	serviceSid, err := allocSid(windows.SECURITY_SERVICE_RID)
-	if err != nil {
-		return false, err
-	}
-	defer windows.FreeSid(serviceSid)
-
-	t, err := windows.OpenCurrentProcessToken()
-	if err != nil {
-		return false, err
-	}
-	defer t.Close()
-
-	gs, err := t.GetTokenGroups()
-	if err != nil {
-		return false, err
-	}
-	p := unsafe.Pointer(&gs.Groups[0])
-	groups := (*[2 << 20]windows.SIDAndAttributes)(p)[:gs.GroupCount]
-	for _, g := range groups {
-		if windows.EqualSid(g.Sid, interSid) {
-			return true, nil
-		}
-		if windows.EqualSid(g.Sid, serviceSid) {
-			return false, nil
-		}
-	}
-	return false, nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/service.go b/installer/vendor/golang.org/x/sys/windows/svc/service.go
deleted file mode 100644
index 9864f7a72f..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/service.go
+++ /dev/null
@@ -1,316 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// Package svc provides everything required to build Windows service.
-//
-package svc
-
-import (
-	"errors"
-	"runtime"
-	"syscall"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-// State describes service execution state (Stopped, Running and so on).
-type State uint32
-
-const (
-	Stopped         = State(windows.SERVICE_STOPPED)
-	StartPending    = State(windows.SERVICE_START_PENDING)
-	StopPending     = State(windows.SERVICE_STOP_PENDING)
-	Running         = State(windows.SERVICE_RUNNING)
-	ContinuePending = State(windows.SERVICE_CONTINUE_PENDING)
-	PausePending    = State(windows.SERVICE_PAUSE_PENDING)
-	Paused          = State(windows.SERVICE_PAUSED)
-)
-
-// Cmd represents service state change request. It is sent to a service
-// by the service manager, and should be actioned upon by the service.
-type Cmd uint32
-
-const (
-	Stop        = Cmd(windows.SERVICE_CONTROL_STOP)
-	Pause       = Cmd(windows.SERVICE_CONTROL_PAUSE)
-	Continue    = Cmd(windows.SERVICE_CONTROL_CONTINUE)
-	Interrogate = Cmd(windows.SERVICE_CONTROL_INTERROGATE)
-	Shutdown    = Cmd(windows.SERVICE_CONTROL_SHUTDOWN)
-)
-
-// Accepted is used to describe commands accepted by the service.
-// Note that Interrogate is always accepted.
-type Accepted uint32
-
-const (
-	AcceptStop             = Accepted(windows.SERVICE_ACCEPT_STOP)
-	AcceptShutdown         = Accepted(windows.SERVICE_ACCEPT_SHUTDOWN)
-	AcceptPauseAndContinue = Accepted(windows.SERVICE_ACCEPT_PAUSE_CONTINUE)
-)
-
-// Status combines State and Accepted commands to fully describe running service.
-type Status struct {
-	State      State
-	Accepts    Accepted
-	CheckPoint uint32 // used to report progress during a lengthy operation
-	WaitHint   uint32 // estimated time required for a pending operation, in milliseconds
-}
-
-// ChangeRequest is sent to the service Handler to request service status change.
-type ChangeRequest struct {
-	Cmd           Cmd
-	CurrentStatus Status
-}
-
-// Handler is the interface that must be implemented to build Windows service.
-type Handler interface {
-
-	// Execute will be called by the package code at the start of
-	// the service, and the service will exit once Execute completes.
-	// Inside Execute you must read service change requests from r and
-	// act accordingly. You must keep service control manager up to date
-	// about state of your service by writing into s as required.
-	// args contains service name followed by argument strings passed
-	// to the service.
-	// You can provide service exit code in exitCode return parameter,
-	// with 0 being "no error". You can also indicate if exit code,
-	// if any, is service specific or not by using svcSpecificEC
-	// parameter.
-	Execute(args []string, r <-chan ChangeRequest, s chan<- Status) (svcSpecificEC bool, exitCode uint32)
-}
-
-var (
-	// These are used by asm code.
-	goWaitsH                     uintptr
-	cWaitsH                      uintptr
-	ssHandle                     uintptr
-	sName                        *uint16
-	sArgc                        uintptr
-	sArgv                        **uint16
-	ctlHandlerProc               uintptr
-	cSetEvent                    uintptr
-	cWaitForSingleObject         uintptr
-	cRegisterServiceCtrlHandlerW uintptr
-)
-
-func init() {
-	k := syscall.MustLoadDLL("kernel32.dll")
-	cSetEvent = k.MustFindProc("SetEvent").Addr()
-	cWaitForSingleObject = k.MustFindProc("WaitForSingleObject").Addr()
-	a := syscall.MustLoadDLL("advapi32.dll")
-	cRegisterServiceCtrlHandlerW = a.MustFindProc("RegisterServiceCtrlHandlerW").Addr()
-}
-
-type ctlEvent struct {
-	cmd   Cmd
-	errno uint32
-}
-
-// service provides access to windows service api.
-type service struct {
-	name    string
-	h       windows.Handle
-	cWaits  *event
-	goWaits *event
-	c       chan ctlEvent
-	handler Handler
-}
-
-func newService(name string, handler Handler) (*service, error) {
-	var s service
-	var err error
-	s.name = name
-	s.c = make(chan ctlEvent)
-	s.handler = handler
-	s.cWaits, err = newEvent()
-	if err != nil {
-		return nil, err
-	}
-	s.goWaits, err = newEvent()
-	if err != nil {
-		s.cWaits.Close()
-		return nil, err
-	}
-	return &s, nil
-}
-
-func (s *service) close() error {
-	s.cWaits.Close()
-	s.goWaits.Close()
-	return nil
-}
-
-type exitCode struct {
-	isSvcSpecific bool
-	errno         uint32
-}
-
-func (s *service) updateStatus(status *Status, ec *exitCode) error {
-	if s.h == 0 {
-		return errors.New("updateStatus with no service status handle")
-	}
-	var t windows.SERVICE_STATUS
-	t.ServiceType = windows.SERVICE_WIN32_OWN_PROCESS
-	t.CurrentState = uint32(status.State)
-	if status.Accepts&AcceptStop != 0 {
-		t.ControlsAccepted |= windows.SERVICE_ACCEPT_STOP
-	}
-	if status.Accepts&AcceptShutdown != 0 {
-		t.ControlsAccepted |= windows.SERVICE_ACCEPT_SHUTDOWN
-	}
-	if status.Accepts&AcceptPauseAndContinue != 0 {
-		t.ControlsAccepted |= windows.SERVICE_ACCEPT_PAUSE_CONTINUE
-	}
-	if ec.errno == 0 {
-		t.Win32ExitCode = windows.NO_ERROR
-		t.ServiceSpecificExitCode = windows.NO_ERROR
-	} else if ec.isSvcSpecific {
-		t.Win32ExitCode = uint32(windows.ERROR_SERVICE_SPECIFIC_ERROR)
-		t.ServiceSpecificExitCode = ec.errno
-	} else {
-		t.Win32ExitCode = ec.errno
-		t.ServiceSpecificExitCode = windows.NO_ERROR
-	}
-	t.CheckPoint = status.CheckPoint
-	t.WaitHint = status.WaitHint
-	return windows.SetServiceStatus(s.h, &t)
-}
-
-const (
-	sysErrSetServiceStatusFailed = uint32(syscall.APPLICATION_ERROR) + iota
-	sysErrNewThreadInCallback
-)
-
-func (s *service) run() {
-	s.goWaits.Wait()
-	s.h = windows.Handle(ssHandle)
-	argv := (*[100]*int16)(unsafe.Pointer(sArgv))[:sArgc]
-	args := make([]string, len(argv))
-	for i, a := range argv {
-		args[i] = syscall.UTF16ToString((*[1 << 20]uint16)(unsafe.Pointer(a))[:])
-	}
-
-	cmdsToHandler := make(chan ChangeRequest)
-	changesFromHandler := make(chan Status)
-	exitFromHandler := make(chan exitCode)
-
-	go func() {
-		ss, errno := s.handler.Execute(args, cmdsToHandler, changesFromHandler)
-		exitFromHandler <- exitCode{ss, errno}
-	}()
-
-	status := Status{State: Stopped}
-	ec := exitCode{isSvcSpecific: true, errno: 0}
-	var outch chan ChangeRequest
-	inch := s.c
-	var cmd Cmd
-loop:
-	for {
-		select {
-		case r := <-inch:
-			if r.errno != 0 {
-				ec.errno = r.errno
-				break loop
-			}
-			inch = nil
-			outch = cmdsToHandler
-			cmd = r.cmd
-		case outch <- ChangeRequest{cmd, status}:
-			inch = s.c
-			outch = nil
-		case c := <-changesFromHandler:
-			err := s.updateStatus(&c, &ec)
-			if err != nil {
-				// best suitable error number
-				ec.errno = sysErrSetServiceStatusFailed
-				if err2, ok := err.(syscall.Errno); ok {
-					ec.errno = uint32(err2)
-				}
-				break loop
-			}
-			status = c
-		case ec = <-exitFromHandler:
-			break loop
-		}
-	}
-
-	s.updateStatus(&Status{State: Stopped}, &ec)
-	s.cWaits.Set()
-}
-
-func newCallback(fn interface{}) (cb uintptr, err error) {
-	defer func() {
-		r := recover()
-		if r == nil {
-			return
-		}
-		cb = 0
-		switch v := r.(type) {
-		case string:
-			err = errors.New(v)
-		case error:
-			err = v
-		default:
-			err = errors.New("unexpected panic in syscall.NewCallback")
-		}
-	}()
-	return syscall.NewCallback(fn), nil
-}
-
-// BUG(brainman): There is no mechanism to run multiple services
-// inside one single executable. Perhaps, it can be overcome by
-// using RegisterServiceCtrlHandlerEx Windows api.
-
-// Run executes service name by calling appropriate handler function.
-func Run(name string, handler Handler) error {
-	runtime.LockOSThread()
-
-	tid := windows.GetCurrentThreadId()
-
-	s, err := newService(name, handler)
-	if err != nil {
-		return err
-	}
-
-	ctlHandler := func(ctl uint32) uintptr {
-		e := ctlEvent{cmd: Cmd(ctl)}
-		// We assume that this callback function is running on
-		// the same thread as Run. Nowhere in MS documentation
-		// I could find statement to guarantee that. So putting
-		// check here to verify, otherwise things will go bad
-		// quickly, if ignored.
-		i := windows.GetCurrentThreadId()
-		if i != tid {
-			e.errno = sysErrNewThreadInCallback
-		}
-		s.c <- e
-		return 0
-	}
-
-	var svcmain uintptr
-	getServiceMain(&svcmain)
-	t := []windows.SERVICE_TABLE_ENTRY{
-		{syscall.StringToUTF16Ptr(s.name), svcmain},
-		{nil, 0},
-	}
-
-	goWaitsH = uintptr(s.goWaits.h)
-	cWaitsH = uintptr(s.cWaits.h)
-	sName = t[0].ServiceName
-	ctlHandlerProc, err = newCallback(ctlHandler)
-	if err != nil {
-		return err
-	}
-
-	go s.run()
-
-	err = windows.StartServiceCtrlDispatcher(&t[0])
-	if err != nil {
-		return err
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/svc_test.go b/installer/vendor/golang.org/x/sys/windows/svc/svc_test.go
deleted file mode 100644
index 764da54a54..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/svc_test.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package svc_test
-
-import (
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-	"time"
-
-	"golang.org/x/sys/windows/svc"
-	"golang.org/x/sys/windows/svc/mgr"
-)
-
-func getState(t *testing.T, s *mgr.Service) svc.State {
-	status, err := s.Query()
-	if err != nil {
-		t.Fatalf("Query(%s) failed: %s", s.Name, err)
-	}
-	return status.State
-}
-
-func testState(t *testing.T, s *mgr.Service, want svc.State) {
-	have := getState(t, s)
-	if have != want {
-		t.Fatalf("%s state is=%d want=%d", s.Name, have, want)
-	}
-}
-
-func waitState(t *testing.T, s *mgr.Service, want svc.State) {
-	for i := 0; ; i++ {
-		have := getState(t, s)
-		if have == want {
-			return
-		}
-		if i > 10 {
-			t.Fatalf("%s state is=%d, waiting timeout", s.Name, have)
-		}
-		time.Sleep(300 * time.Millisecond)
-	}
-}
-
-func TestExample(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in short mode - it modifies system services")
-	}
-
-	const name = "myservice"
-
-	m, err := mgr.Connect()
-	if err != nil {
-		t.Fatalf("SCM connection failed: %s", err)
-	}
-	defer m.Disconnect()
-
-	dir, err := ioutil.TempDir("", "svc")
-	if err != nil {
-		t.Fatalf("failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	exepath := filepath.Join(dir, "a.exe")
-	o, err := exec.Command("go", "build", "-o", exepath, "golang.org/x/sys/windows/svc/example").CombinedOutput()
-	if err != nil {
-		t.Fatalf("failed to build service program: %v\n%v", err, string(o))
-	}
-
-	s, err := m.OpenService(name)
-	if err == nil {
-		err = s.Delete()
-		if err != nil {
-			s.Close()
-			t.Fatalf("Delete failed: %s", err)
-		}
-		s.Close()
-	}
-	s, err = m.CreateService(name, exepath, mgr.Config{DisplayName: "my service"}, "is", "auto-started")
-	if err != nil {
-		t.Fatalf("CreateService(%s) failed: %v", name, err)
-	}
-	defer s.Close()
-
-	testState(t, s, svc.Stopped)
-	err = s.Start("is", "manual-started")
-	if err != nil {
-		t.Fatalf("Start(%s) failed: %s", s.Name, err)
-	}
-	waitState(t, s, svc.Running)
-	time.Sleep(1 * time.Second)
-
-	// testing deadlock from issues 4.
-	_, err = s.Control(svc.Interrogate)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	_, err = s.Control(svc.Interrogate)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	time.Sleep(1 * time.Second)
-
-	_, err = s.Control(svc.Stop)
-	if err != nil {
-		t.Fatalf("Control(%s) failed: %s", s.Name, err)
-	}
-	waitState(t, s, svc.Stopped)
-
-	err = s.Delete()
-	if err != nil {
-		t.Fatalf("Delete failed: %s", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/sys_386.s b/installer/vendor/golang.org/x/sys/windows/svc/sys_386.s
deleted file mode 100644
index 5e11bfadb5..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/sys_386.s
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// func servicemain(argc uint32, argv **uint16)
-TEXT ·servicemain(SB),7,$0
-	MOVL	argc+0(FP), AX
-	MOVL	AX, ·sArgc(SB)
-	MOVL	argv+4(FP), AX
-	MOVL	AX, ·sArgv(SB)
-
-	PUSHL	BP
-	PUSHL	BX
-	PUSHL	SI
-	PUSHL	DI
-
-	SUBL	$12, SP
-
-	MOVL	·sName(SB), AX
-	MOVL	AX, (SP)
-	MOVL	$·servicectlhandler(SB), AX
-	MOVL	AX, 4(SP)
-	MOVL	·cRegisterServiceCtrlHandlerW(SB), AX
-	MOVL	SP, BP
-	CALL	AX
-	MOVL	BP, SP
-	CMPL	AX, $0
-	JE	exit
-	MOVL	AX, ·ssHandle(SB)
-
-	MOVL	·goWaitsH(SB), AX
-	MOVL	AX, (SP)
-	MOVL	·cSetEvent(SB), AX
-	MOVL	SP, BP
-	CALL	AX
-	MOVL	BP, SP
-
-	MOVL	·cWaitsH(SB), AX
-	MOVL	AX, (SP)
-	MOVL	$-1, AX
-	MOVL	AX, 4(SP)
-	MOVL	·cWaitForSingleObject(SB), AX
-	MOVL	SP, BP
-	CALL	AX
-	MOVL	BP, SP
-
-exit:
-	ADDL	$12, SP
-
-	POPL	DI
-	POPL	SI
-	POPL	BX
-	POPL	BP
-
-	MOVL	0(SP), CX
-	ADDL	$12, SP
-	JMP	CX
-
-// I do not know why, but this seems to be the only way to call
-// ctlHandlerProc on Windows 7.
-
-// func servicectlhandler(ctl uint32) uintptr
-TEXT ·servicectlhandler(SB),7,$0
-	MOVL	·ctlHandlerProc(SB), CX
-	JMP	CX
diff --git a/installer/vendor/golang.org/x/sys/windows/svc/sys_amd64.s b/installer/vendor/golang.org/x/sys/windows/svc/sys_amd64.s
deleted file mode 100644
index 87dbec8395..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/svc/sys_amd64.s
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-// func servicemain(argc uint32, argv **uint16)
-TEXT ·servicemain(SB),7,$0
-	MOVL	CX, ·sArgc(SB)
-	MOVL	DX, ·sArgv(SB)
-
-	SUBQ	$32, SP		// stack for the first 4 syscall params
-
-	MOVQ	·sName(SB), CX
-	MOVQ	$·servicectlhandler(SB), DX
-	MOVQ	·cRegisterServiceCtrlHandlerW(SB), AX
-	CALL	AX
-	CMPQ	AX, $0
-	JE	exit
-	MOVQ	AX, ·ssHandle(SB)
-
-	MOVQ	·goWaitsH(SB), CX
-	MOVQ	·cSetEvent(SB), AX
-	CALL	AX
-
-	MOVQ	·cWaitsH(SB), CX
-	MOVQ	$4294967295, DX
-	MOVQ	·cWaitForSingleObject(SB), AX
-	CALL	AX
-
-exit:
-	ADDQ	$32, SP
-	RET
-
-// I do not know why, but this seems to be the only way to call
-// ctlHandlerProc on Windows 7.
-
-// func servicectlhandler(ctl uint32) uintptr
-TEXT ·servicectlhandler(SB),7,$0
-	MOVQ	·ctlHandlerProc(SB), AX
-	JMP	AX
diff --git a/installer/vendor/golang.org/x/sys/windows/syscall.go b/installer/vendor/golang.org/x/sys/windows/syscall.go
index 4e2fbe86e2..af828a91bc 100644
--- a/installer/vendor/golang.org/x/sys/windows/syscall.go
+++ b/installer/vendor/golang.org/x/sys/windows/syscall.go
@@ -5,17 +5,20 @@
 // +build windows
 
 // Package windows contains an interface to the low-level operating system
-// primitives.  OS details vary depending on the underlying system, and
+// primitives. OS details vary depending on the underlying system, and
 // by default, godoc will display the OS-specific documentation for the current
-// system.  If you want godoc to display syscall documentation for another
-// system, set $GOOS and $GOARCH to the desired system.  For example, if
+// system. If you want godoc to display syscall documentation for another
+// system, set $GOOS and $GOARCH to the desired system. For example, if
 // you want to view documentation for freebsd/arm on linux/amd64, set $GOOS
 // to freebsd and $GOARCH to arm.
+//
 // The primary use of this package is inside other packages that provide a more
 // portable interface to the system, such as "os", "time" and "net".  Use
 // those packages rather than this one if you can.
+//
 // For details of the functions and data types in this package consult
 // the manuals for the appropriate operating system.
+//
 // These calls return err == nil to indicate success; otherwise
 // err represents an operating system error describing the failure and
 // holds a value of type syscall.Errno.
diff --git a/installer/vendor/golang.org/x/sys/windows/syscall_test.go b/installer/vendor/golang.org/x/sys/windows/syscall_test.go
deleted file mode 100644
index 62588b91bb..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/syscall_test.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package windows_test
-
-import (
-	"testing"
-
-	"golang.org/x/sys/windows"
-)
-
-func testSetGetenv(t *testing.T, key, value string) {
-	err := windows.Setenv(key, value)
-	if err != nil {
-		t.Fatalf("Setenv failed to set %q: %v", value, err)
-	}
-	newvalue, found := windows.Getenv(key)
-	if !found {
-		t.Fatalf("Getenv failed to find %v variable (want value %q)", key, value)
-	}
-	if newvalue != value {
-		t.Fatalf("Getenv(%v) = %q; want %q", key, newvalue, value)
-	}
-}
-
-func TestEnv(t *testing.T) {
-	testSetGetenv(t, "TESTENV", "AVALUE")
-	// make sure TESTENV gets set to "", not deleted
-	testSetGetenv(t, "TESTENV", "")
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/syscall_windows.go b/installer/vendor/golang.org/x/sys/windows/syscall_windows.go
index 592d73e036..1e9f4bb4a3 100644
--- a/installer/vendor/golang.org/x/sys/windows/syscall_windows.go
+++ b/installer/vendor/golang.org/x/sys/windows/syscall_windows.go
@@ -1,4 +1,4 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
+// Copyright 2009 The Go Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
@@ -16,7 +16,46 @@ import (
 
 type Handle uintptr
 
-const InvalidHandle = ^Handle(0)
+const (
+	InvalidHandle = ^Handle(0)
+
+	// Flags for DefineDosDevice.
+	DDD_EXACT_MATCH_ON_REMOVE = 0x00000004
+	DDD_NO_BROADCAST_SYSTEM   = 0x00000008
+	DDD_RAW_TARGET_PATH       = 0x00000001
+	DDD_REMOVE_DEFINITION     = 0x00000002
+
+	// Return values for GetDriveType.
+	DRIVE_UNKNOWN     = 0
+	DRIVE_NO_ROOT_DIR = 1
+	DRIVE_REMOVABLE   = 2
+	DRIVE_FIXED       = 3
+	DRIVE_REMOTE      = 4
+	DRIVE_CDROM       = 5
+	DRIVE_RAMDISK     = 6
+
+	// File system flags from GetVolumeInformation and GetVolumeInformationByHandle.
+	FILE_CASE_SENSITIVE_SEARCH        = 0x00000001
+	FILE_CASE_PRESERVED_NAMES         = 0x00000002
+	FILE_FILE_COMPRESSION             = 0x00000010
+	FILE_DAX_VOLUME                   = 0x20000000
+	FILE_NAMED_STREAMS                = 0x00040000
+	FILE_PERSISTENT_ACLS              = 0x00000008
+	FILE_READ_ONLY_VOLUME             = 0x00080000
+	FILE_SEQUENTIAL_WRITE_ONCE        = 0x00100000
+	FILE_SUPPORTS_ENCRYPTION          = 0x00020000
+	FILE_SUPPORTS_EXTENDED_ATTRIBUTES = 0x00800000
+	FILE_SUPPORTS_HARD_LINKS          = 0x00400000
+	FILE_SUPPORTS_OBJECT_IDS          = 0x00010000
+	FILE_SUPPORTS_OPEN_BY_FILE_ID     = 0x01000000
+	FILE_SUPPORTS_REPARSE_POINTS      = 0x00000080
+	FILE_SUPPORTS_SPARSE_FILES        = 0x00000040
+	FILE_SUPPORTS_TRANSACTIONS        = 0x00200000
+	FILE_SUPPORTS_USN_JOURNAL         = 0x02000000
+	FILE_UNICODE_ON_DISK              = 0x00000004
+	FILE_VOLUME_IS_COMPRESSED         = 0x00008000
+	FILE_VOLUME_QUOTAS                = 0x00000020
+)
 
 // StringToUTF16 is deprecated. Use UTF16FromString instead.
 // If s contains a NUL byte this function panics instead of
@@ -71,12 +110,17 @@ func UTF16PtrFromString(s string) (*uint16, error) {
 
 func Getpagesize() int { return 4096 }
 
-// Converts a Go function to a function pointer conforming
-// to the stdcall or cdecl calling convention.  This is useful when
-// interoperating with Windows code requiring callbacks.
-// Implemented in runtime/syscall_windows.goc
-func NewCallback(fn interface{}) uintptr
-func NewCallbackCDecl(fn interface{}) uintptr
+// NewCallback converts a Go function to a function pointer conforming to the stdcall calling convention.
+// This is useful when interoperating with Windows code requiring callbacks.
+func NewCallback(fn interface{}) uintptr {
+	return syscall.NewCallback(fn)
+}
+
+// NewCallbackCDecl converts a Go function to a function pointer conforming to the cdecl calling convention.
+// This is useful when interoperating with Windows code requiring callbacks.
+func NewCallbackCDecl(fn interface{}) uintptr {
+	return syscall.NewCallbackCDecl(fn)
+}
 
 // windows api calls
 
@@ -93,7 +137,8 @@ func NewCallbackCDecl(fn interface{}) uintptr
 //sys	WriteFile(handle Handle, buf []byte, done *uint32, overlapped *Overlapped) (err error)
 //sys	SetFilePointer(handle Handle, lowoffset int32, highoffsetptr *int32, whence uint32) (newlowoffset uint32, err error) [failretval==0xffffffff]
 //sys	CloseHandle(handle Handle) (err error)
-//sys	GetStdHandle(stdhandle int) (handle Handle, err error) [failretval==InvalidHandle]
+//sys	GetStdHandle(stdhandle uint32) (handle Handle, err error) [failretval==InvalidHandle]
+//sys	SetStdHandle(stdhandle uint32, handle Handle) (err error)
 //sys	findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstFileW
 //sys	findNextFile1(handle Handle, data *win32finddata1) (err error) = FindNextFileW
 //sys	FindClose(handle Handle) (err error)
@@ -109,6 +154,7 @@ func NewCallbackCDecl(fn interface{}) uintptr
 //sys	GetComputerNameEx(nametype uint32, buf *uint16, n *uint32) (err error) = GetComputerNameExW
 //sys	SetEndOfFile(handle Handle) (err error)
 //sys	GetSystemTimeAsFileTime(time *Filetime)
+//sys	GetSystemTimePreciseAsFileTime(time *Filetime)
 //sys	GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) [failretval==0xffffffff]
 //sys	CreateIoCompletionPort(filehandle Handle, cphandle Handle, key uint32, threadcnt uint32) (handle Handle, err error)
 //sys	GetQueuedCompletionStatus(cphandle Handle, qty *uint32, key *uint32, overlapped **Overlapped, timeout uint32) (err error)
@@ -152,6 +198,9 @@ func NewCallbackCDecl(fn interface{}) uintptr
 //sys	FlushViewOfFile(addr uintptr, length uintptr) (err error)
 //sys	VirtualLock(addr uintptr, length uintptr) (err error)
 //sys	VirtualUnlock(addr uintptr, length uintptr) (err error)
+//sys	VirtualAlloc(address uintptr, size uintptr, alloctype uint32, protect uint32) (value uintptr, err error) = kernel32.VirtualAlloc
+//sys	VirtualFree(address uintptr, size uintptr, freetype uint32) (err error) = kernel32.VirtualFree
+//sys	VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect *uint32) (err error) = kernel32.VirtualProtect
 //sys	TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) = mswsock.TransmitFile
 //sys	ReadDirectoryChanges(handle Handle, buf *byte, buflen uint32, watchSubTree bool, mask uint32, retlen *uint32, overlapped *Overlapped, completionRoutine uintptr) (err error) = kernel32.ReadDirectoryChangesW
 //sys	CertOpenSystemStore(hprov Handle, name *uint16) (store Handle, err error) = crypt32.CertOpenSystemStoreW
@@ -171,6 +220,8 @@ func NewCallbackCDecl(fn interface{}) uintptr
 //sys	RegQueryValueEx(key Handle, name *uint16, reserved *uint32, valtype *uint32, buf *byte, buflen *uint32) (regerrno error) = advapi32.RegQueryValueExW
 //sys	getCurrentProcessId() (pid uint32) = kernel32.GetCurrentProcessId
 //sys	GetConsoleMode(console Handle, mode *uint32) (err error) = kernel32.GetConsoleMode
+//sys	SetConsoleMode(console Handle, mode uint32) (err error) = kernel32.SetConsoleMode
+//sys	GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) = kernel32.GetConsoleScreenBufferInfo
 //sys	WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) = kernel32.WriteConsoleW
 //sys	ReadConsole(console Handle, buf *uint16, toread uint32, read *uint32, inputControl *byte) (err error) = kernel32.ReadConsoleW
 //sys	CreateToolhelp32Snapshot(flags uint32, processId uint32) (handle Handle, err error) [failretval==InvalidHandle] = kernel32.CreateToolhelp32Snapshot
@@ -181,11 +232,51 @@ func NewCallbackCDecl(fn interface{}) uintptr
 //sys	CreateSymbolicLink(symlinkfilename *uint16, targetfilename *uint16, flags uint32) (err error) [failretval&0xff==0] = CreateSymbolicLinkW
 //sys	CreateHardLink(filename *uint16, existingfilename *uint16, reserved uintptr) (err error) [failretval&0xff==0] = CreateHardLinkW
 //sys	GetCurrentThreadId() (id uint32)
-//sys	CreateEvent(eventAttrs *syscall.SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) = kernel32.CreateEventW
+//sys	CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) = kernel32.CreateEventW
+//sys	CreateEventEx(eventAttrs *SecurityAttributes, name *uint16, flags uint32, desiredAccess uint32) (handle Handle, err error) = kernel32.CreateEventExW
+//sys	OpenEvent(desiredAccess uint32, inheritHandle bool, name *uint16) (handle Handle, err error) = kernel32.OpenEventW
 //sys	SetEvent(event Handle) (err error) = kernel32.SetEvent
+//sys	ResetEvent(event Handle) (err error) = kernel32.ResetEvent
+//sys	PulseEvent(event Handle) (err error) = kernel32.PulseEvent
+
+// Volume Management Functions
+//sys	DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) = DefineDosDeviceW
+//sys	DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) = DeleteVolumeMountPointW
+//sys	FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeW
+//sys	FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) [failretval==InvalidHandle] = FindFirstVolumeMountPointW
+//sys	FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) = FindNextVolumeW
+//sys	FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) = FindNextVolumeMountPointW
+//sys	FindVolumeClose(findVolume Handle) (err error)
+//sys	FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error)
+//sys	GetDriveType(rootPathName *uint16) (driveType uint32) = GetDriveTypeW
+//sys	GetLogicalDrives() (drivesBitMask uint32, err error) [failretval==0]
+//sys	GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) [failretval==0] = GetLogicalDriveStringsW
+//sys	GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationW
+//sys	GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) = GetVolumeInformationByHandleW
+//sys	GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) = GetVolumeNameForVolumeMountPointW
+//sys	GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) = GetVolumePathNameW
+//sys	GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) = GetVolumePathNamesForVolumeNameW
+//sys	QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) [failretval==0] = QueryDosDeviceW
+//sys	SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) = SetVolumeLabelW
+//sys	SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) = SetVolumeMountPointW
 
 // syscall interface implementation for other packages
 
+// GetProcAddressByOrdinal retrieves the address of the exported
+// function from module by ordinal.
+func GetProcAddressByOrdinal(module Handle, ordinal uintptr) (proc uintptr, err error) {
+	r0, _, e1 := syscall.Syscall(procGetProcAddress.Addr(), 2, uintptr(module), ordinal, 0)
+	proc = uintptr(r0)
+	if proc == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func Exit(code int) { ExitProcess(uint32(code)) }
 
 func makeInheritSa() *SecurityAttributes {
@@ -311,8 +402,8 @@ var (
 	Stderr = getStdHandle(STD_ERROR_HANDLE)
 )
 
-func getStdHandle(h int) (fd Handle) {
-	r, _ := GetStdHandle(h)
+func getStdHandle(stdhandle uint32) (fd Handle) {
+	r, _ := GetStdHandle(stdhandle)
 	CloseOnExec(r)
 	return r
 }
@@ -484,6 +575,10 @@ func Chmod(path string, mode uint32) (err error) {
 	return SetFileAttributes(p, attrs)
 }
 
+func LoadGetSystemTimePreciseAsFileTime() error {
+	return procGetSystemTimePreciseAsFileTime.Find()
+}
+
 func LoadCancelIoEx() error {
 	return procCancelIoEx.Find()
 }
@@ -761,6 +856,75 @@ func ConnectEx(fd Handle, sa Sockaddr, sendBuf *byte, sendDataLen uint32, bytesS
 	return connectEx(fd, ptr, n, sendBuf, sendDataLen, bytesSent, overlapped)
 }
 
+var sendRecvMsgFunc struct {
+	once     sync.Once
+	sendAddr uintptr
+	recvAddr uintptr
+	err      error
+}
+
+func loadWSASendRecvMsg() error {
+	sendRecvMsgFunc.once.Do(func() {
+		var s Handle
+		s, sendRecvMsgFunc.err = Socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP)
+		if sendRecvMsgFunc.err != nil {
+			return
+		}
+		defer CloseHandle(s)
+		var n uint32
+		sendRecvMsgFunc.err = WSAIoctl(s,
+			SIO_GET_EXTENSION_FUNCTION_POINTER,
+			(*byte)(unsafe.Pointer(&WSAID_WSARECVMSG)),
+			uint32(unsafe.Sizeof(WSAID_WSARECVMSG)),
+			(*byte)(unsafe.Pointer(&sendRecvMsgFunc.recvAddr)),
+			uint32(unsafe.Sizeof(sendRecvMsgFunc.recvAddr)),
+			&n, nil, 0)
+		if sendRecvMsgFunc.err != nil {
+			return
+		}
+		sendRecvMsgFunc.err = WSAIoctl(s,
+			SIO_GET_EXTENSION_FUNCTION_POINTER,
+			(*byte)(unsafe.Pointer(&WSAID_WSASENDMSG)),
+			uint32(unsafe.Sizeof(WSAID_WSASENDMSG)),
+			(*byte)(unsafe.Pointer(&sendRecvMsgFunc.sendAddr)),
+			uint32(unsafe.Sizeof(sendRecvMsgFunc.sendAddr)),
+			&n, nil, 0)
+	})
+	return sendRecvMsgFunc.err
+}
+
+func WSASendMsg(fd Handle, msg *WSAMsg, flags uint32, bytesSent *uint32, overlapped *Overlapped, croutine *byte) error {
+	err := loadWSASendRecvMsg()
+	if err != nil {
+		return err
+	}
+	r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.sendAddr, 6, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(flags), uintptr(unsafe.Pointer(bytesSent)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)))
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return err
+}
+
+func WSARecvMsg(fd Handle, msg *WSAMsg, bytesReceived *uint32, overlapped *Overlapped, croutine *byte) error {
+	err := loadWSASendRecvMsg()
+	if err != nil {
+		return err
+	}
+	r1, _, e1 := syscall.Syscall6(sendRecvMsgFunc.recvAddr, 5, uintptr(fd), uintptr(unsafe.Pointer(msg)), uintptr(unsafe.Pointer(bytesReceived)), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(croutine)), 0)
+	if r1 == socket_error {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return err
+}
+
 // Invented structures to support what package os expects.
 type Rusage struct {
 	CreationTime Filetime
diff --git a/installer/vendor/golang.org/x/sys/windows/syscall_windows_test.go b/installer/vendor/golang.org/x/sys/windows/syscall_windows_test.go
deleted file mode 100644
index 0f73c11ba4..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/syscall_windows_test.go
+++ /dev/null
@@ -1,107 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows_test
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"syscall"
-	"testing"
-	"unsafe"
-
-	"golang.org/x/sys/windows"
-)
-
-func TestWin32finddata(t *testing.T) {
-	dir, err := ioutil.TempDir("", "go-build")
-	if err != nil {
-		t.Fatalf("failed to create temp directory: %v", err)
-	}
-	defer os.RemoveAll(dir)
-
-	path := filepath.Join(dir, "long_name.and_extension")
-	f, err := os.Create(path)
-	if err != nil {
-		t.Fatalf("failed to create %v: %v", path, err)
-	}
-	f.Close()
-
-	type X struct {
-		fd  windows.Win32finddata
-		got byte
-		pad [10]byte // to protect ourselves
-
-	}
-	var want byte = 2 // it is unlikely to have this character in the filename
-	x := X{got: want}
-
-	pathp, _ := windows.UTF16PtrFromString(path)
-	h, err := windows.FindFirstFile(pathp, &(x.fd))
-	if err != nil {
-		t.Fatalf("FindFirstFile failed: %v", err)
-	}
-	err = windows.FindClose(h)
-	if err != nil {
-		t.Fatalf("FindClose failed: %v", err)
-	}
-
-	if x.got != want {
-		t.Fatalf("memory corruption: want=%d got=%d", want, x.got)
-	}
-}
-
-func TestFormatMessage(t *testing.T) {
-	dll := windows.MustLoadDLL("pdh.dll")
-
-	pdhOpenQuery := func(datasrc *uint16, userdata uint32, query *windows.Handle) (errno uintptr) {
-		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhOpenQueryW").Addr(), 3, uintptr(unsafe.Pointer(datasrc)), uintptr(userdata), uintptr(unsafe.Pointer(query)))
-		return r0
-	}
-
-	pdhCloseQuery := func(query windows.Handle) (errno uintptr) {
-		r0, _, _ := syscall.Syscall(dll.MustFindProc("PdhCloseQuery").Addr(), 1, uintptr(query), 0, 0)
-		return r0
-	}
-
-	var q windows.Handle
-	name, err := windows.UTF16PtrFromString("no_such_source")
-	if err != nil {
-		t.Fatal(err)
-	}
-	errno := pdhOpenQuery(name, 0, &q)
-	if errno == 0 {
-		pdhCloseQuery(q)
-		t.Fatal("PdhOpenQuery succeeded, but expected to fail.")
-	}
-
-	const flags uint32 = syscall.FORMAT_MESSAGE_FROM_HMODULE | syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY | syscall.FORMAT_MESSAGE_IGNORE_INSERTS
-	buf := make([]uint16, 300)
-	_, err = windows.FormatMessage(flags, uintptr(dll.Handle), uint32(errno), 0, buf, nil)
-	if err != nil {
-		t.Fatal("FormatMessage for handle=%x and errno=%x failed: %v", dll.Handle, errno, err)
-	}
-}
-
-func abort(funcname string, err error) {
-	panic(funcname + " failed: " + err.Error())
-}
-
-func ExampleLoadLibrary() {
-	h, err := windows.LoadLibrary("kernel32.dll")
-	if err != nil {
-		abort("LoadLibrary", err)
-	}
-	defer windows.FreeLibrary(h)
-	proc, err := windows.GetProcAddress(h, "GetVersion")
-	if err != nil {
-		abort("GetProcAddress", err)
-	}
-	r, _, _ := syscall.Syscall(uintptr(proc), 0, 0, 0, 0)
-	major := byte(r)
-	minor := uint8(r >> 8)
-	build := uint16(r >> 16)
-	print("windows version ", major, ".", minor, " (Build ", build, ")\n")
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/types_windows.go b/installer/vendor/golang.org/x/sys/windows/types_windows.go
new file mode 100644
index 0000000000..52c2037b68
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/windows/types_windows.go
@@ -0,0 +1,1333 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+import "syscall"
+
+const (
+	// Windows errors.
+	ERROR_FILE_NOT_FOUND         syscall.Errno = 2
+	ERROR_PATH_NOT_FOUND         syscall.Errno = 3
+	ERROR_ACCESS_DENIED          syscall.Errno = 5
+	ERROR_NO_MORE_FILES          syscall.Errno = 18
+	ERROR_HANDLE_EOF             syscall.Errno = 38
+	ERROR_NETNAME_DELETED        syscall.Errno = 64
+	ERROR_FILE_EXISTS            syscall.Errno = 80
+	ERROR_BROKEN_PIPE            syscall.Errno = 109
+	ERROR_BUFFER_OVERFLOW        syscall.Errno = 111
+	ERROR_INSUFFICIENT_BUFFER    syscall.Errno = 122
+	ERROR_MOD_NOT_FOUND          syscall.Errno = 126
+	ERROR_PROC_NOT_FOUND         syscall.Errno = 127
+	ERROR_ALREADY_EXISTS         syscall.Errno = 183
+	ERROR_ENVVAR_NOT_FOUND       syscall.Errno = 203
+	ERROR_MORE_DATA              syscall.Errno = 234
+	ERROR_OPERATION_ABORTED      syscall.Errno = 995
+	ERROR_IO_PENDING             syscall.Errno = 997
+	ERROR_SERVICE_SPECIFIC_ERROR syscall.Errno = 1066
+	ERROR_NOT_FOUND              syscall.Errno = 1168
+	ERROR_PRIVILEGE_NOT_HELD     syscall.Errno = 1314
+	WSAEACCES                    syscall.Errno = 10013
+	WSAEMSGSIZE                  syscall.Errno = 10040
+	WSAECONNRESET                syscall.Errno = 10054
+)
+
+const (
+	// Invented values to support what package os expects.
+	O_RDONLY   = 0x00000
+	O_WRONLY   = 0x00001
+	O_RDWR     = 0x00002
+	O_CREAT    = 0x00040
+	O_EXCL     = 0x00080
+	O_NOCTTY   = 0x00100
+	O_TRUNC    = 0x00200
+	O_NONBLOCK = 0x00800
+	O_APPEND   = 0x00400
+	O_SYNC     = 0x01000
+	O_ASYNC    = 0x02000
+	O_CLOEXEC  = 0x80000
+)
+
+const (
+	// More invented values for signals
+	SIGHUP  = Signal(0x1)
+	SIGINT  = Signal(0x2)
+	SIGQUIT = Signal(0x3)
+	SIGILL  = Signal(0x4)
+	SIGTRAP = Signal(0x5)
+	SIGABRT = Signal(0x6)
+	SIGBUS  = Signal(0x7)
+	SIGFPE  = Signal(0x8)
+	SIGKILL = Signal(0x9)
+	SIGSEGV = Signal(0xb)
+	SIGPIPE = Signal(0xd)
+	SIGALRM = Signal(0xe)
+	SIGTERM = Signal(0xf)
+)
+
+var signals = [...]string{
+	1:  "hangup",
+	2:  "interrupt",
+	3:  "quit",
+	4:  "illegal instruction",
+	5:  "trace/breakpoint trap",
+	6:  "aborted",
+	7:  "bus error",
+	8:  "floating point exception",
+	9:  "killed",
+	10: "user defined signal 1",
+	11: "segmentation fault",
+	12: "user defined signal 2",
+	13: "broken pipe",
+	14: "alarm clock",
+	15: "terminated",
+}
+
+const (
+	GENERIC_READ    = 0x80000000
+	GENERIC_WRITE   = 0x40000000
+	GENERIC_EXECUTE = 0x20000000
+	GENERIC_ALL     = 0x10000000
+
+	FILE_LIST_DIRECTORY   = 0x00000001
+	FILE_APPEND_DATA      = 0x00000004
+	FILE_WRITE_ATTRIBUTES = 0x00000100
+
+	FILE_SHARE_READ              = 0x00000001
+	FILE_SHARE_WRITE             = 0x00000002
+	FILE_SHARE_DELETE            = 0x00000004
+	FILE_ATTRIBUTE_READONLY      = 0x00000001
+	FILE_ATTRIBUTE_HIDDEN        = 0x00000002
+	FILE_ATTRIBUTE_SYSTEM        = 0x00000004
+	FILE_ATTRIBUTE_DIRECTORY     = 0x00000010
+	FILE_ATTRIBUTE_ARCHIVE       = 0x00000020
+	FILE_ATTRIBUTE_NORMAL        = 0x00000080
+	FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400
+
+	INVALID_FILE_ATTRIBUTES = 0xffffffff
+
+	CREATE_NEW        = 1
+	CREATE_ALWAYS     = 2
+	OPEN_EXISTING     = 3
+	OPEN_ALWAYS       = 4
+	TRUNCATE_EXISTING = 5
+
+	FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
+	FILE_FLAG_BACKUP_SEMANTICS   = 0x02000000
+	FILE_FLAG_OVERLAPPED         = 0x40000000
+
+	HANDLE_FLAG_INHERIT    = 0x00000001
+	STARTF_USESTDHANDLES   = 0x00000100
+	STARTF_USESHOWWINDOW   = 0x00000001
+	DUPLICATE_CLOSE_SOURCE = 0x00000001
+	DUPLICATE_SAME_ACCESS  = 0x00000002
+
+	STD_INPUT_HANDLE  = -10 & (1<<32 - 1)
+	STD_OUTPUT_HANDLE = -11 & (1<<32 - 1)
+	STD_ERROR_HANDLE  = -12 & (1<<32 - 1)
+
+	FILE_BEGIN   = 0
+	FILE_CURRENT = 1
+	FILE_END     = 2
+
+	LANG_ENGLISH       = 0x09
+	SUBLANG_ENGLISH_US = 0x01
+
+	FORMAT_MESSAGE_ALLOCATE_BUFFER = 256
+	FORMAT_MESSAGE_IGNORE_INSERTS  = 512
+	FORMAT_MESSAGE_FROM_STRING     = 1024
+	FORMAT_MESSAGE_FROM_HMODULE    = 2048
+	FORMAT_MESSAGE_FROM_SYSTEM     = 4096
+	FORMAT_MESSAGE_ARGUMENT_ARRAY  = 8192
+	FORMAT_MESSAGE_MAX_WIDTH_MASK  = 255
+
+	MAX_PATH      = 260
+	MAX_LONG_PATH = 32768
+
+	MAX_COMPUTERNAME_LENGTH = 15
+
+	TIME_ZONE_ID_UNKNOWN  = 0
+	TIME_ZONE_ID_STANDARD = 1
+
+	TIME_ZONE_ID_DAYLIGHT = 2
+	IGNORE                = 0
+	INFINITE              = 0xffffffff
+
+	WAIT_TIMEOUT   = 258
+	WAIT_ABANDONED = 0x00000080
+	WAIT_OBJECT_0  = 0x00000000
+	WAIT_FAILED    = 0xFFFFFFFF
+
+	PROCESS_TERMINATE         = 1
+	PROCESS_QUERY_INFORMATION = 0x00000400
+	SYNCHRONIZE               = 0x00100000
+
+	FILE_MAP_COPY    = 0x01
+	FILE_MAP_WRITE   = 0x02
+	FILE_MAP_READ    = 0x04
+	FILE_MAP_EXECUTE = 0x20
+
+	CTRL_C_EVENT     = 0
+	CTRL_BREAK_EVENT = 1
+
+	// Windows reserves errors >= 1<<29 for application use.
+	APPLICATION_ERROR = 1 << 29
+)
+
+const (
+	// Process creation flags.
+	CREATE_BREAKAWAY_FROM_JOB        = 0x01000000
+	CREATE_DEFAULT_ERROR_MODE        = 0x04000000
+	CREATE_NEW_CONSOLE               = 0x00000010
+	CREATE_NEW_PROCESS_GROUP         = 0x00000200
+	CREATE_NO_WINDOW                 = 0x08000000
+	CREATE_PROTECTED_PROCESS         = 0x00040000
+	CREATE_PRESERVE_CODE_AUTHZ_LEVEL = 0x02000000
+	CREATE_SEPARATE_WOW_VDM          = 0x00000800
+	CREATE_SHARED_WOW_VDM            = 0x00001000
+	CREATE_SUSPENDED                 = 0x00000004
+	CREATE_UNICODE_ENVIRONMENT       = 0x00000400
+	DEBUG_ONLY_THIS_PROCESS          = 0x00000002
+	DEBUG_PROCESS                    = 0x00000001
+	DETACHED_PROCESS                 = 0x00000008
+	EXTENDED_STARTUPINFO_PRESENT     = 0x00080000
+	INHERIT_PARENT_AFFINITY          = 0x00010000
+)
+
+const (
+	// flags for CreateToolhelp32Snapshot
+	TH32CS_SNAPHEAPLIST = 0x01
+	TH32CS_SNAPPROCESS  = 0x02
+	TH32CS_SNAPTHREAD   = 0x04
+	TH32CS_SNAPMODULE   = 0x08
+	TH32CS_SNAPMODULE32 = 0x10
+	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
+	TH32CS_INHERIT      = 0x80000000
+)
+
+const (
+	// filters for ReadDirectoryChangesW
+	FILE_NOTIFY_CHANGE_FILE_NAME   = 0x001
+	FILE_NOTIFY_CHANGE_DIR_NAME    = 0x002
+	FILE_NOTIFY_CHANGE_ATTRIBUTES  = 0x004
+	FILE_NOTIFY_CHANGE_SIZE        = 0x008
+	FILE_NOTIFY_CHANGE_LAST_WRITE  = 0x010
+	FILE_NOTIFY_CHANGE_LAST_ACCESS = 0x020
+	FILE_NOTIFY_CHANGE_CREATION    = 0x040
+	FILE_NOTIFY_CHANGE_SECURITY    = 0x100
+)
+
+const (
+	// do not reorder
+	FILE_ACTION_ADDED = iota + 1
+	FILE_ACTION_REMOVED
+	FILE_ACTION_MODIFIED
+	FILE_ACTION_RENAMED_OLD_NAME
+	FILE_ACTION_RENAMED_NEW_NAME
+)
+
+const (
+	// wincrypt.h
+	PROV_RSA_FULL                    = 1
+	PROV_RSA_SIG                     = 2
+	PROV_DSS                         = 3
+	PROV_FORTEZZA                    = 4
+	PROV_MS_EXCHANGE                 = 5
+	PROV_SSL                         = 6
+	PROV_RSA_SCHANNEL                = 12
+	PROV_DSS_DH                      = 13
+	PROV_EC_ECDSA_SIG                = 14
+	PROV_EC_ECNRA_SIG                = 15
+	PROV_EC_ECDSA_FULL               = 16
+	PROV_EC_ECNRA_FULL               = 17
+	PROV_DH_SCHANNEL                 = 18
+	PROV_SPYRUS_LYNKS                = 20
+	PROV_RNG                         = 21
+	PROV_INTEL_SEC                   = 22
+	PROV_REPLACE_OWF                 = 23
+	PROV_RSA_AES                     = 24
+	CRYPT_VERIFYCONTEXT              = 0xF0000000
+	CRYPT_NEWKEYSET                  = 0x00000008
+	CRYPT_DELETEKEYSET               = 0x00000010
+	CRYPT_MACHINE_KEYSET             = 0x00000020
+	CRYPT_SILENT                     = 0x00000040
+	CRYPT_DEFAULT_CONTAINER_OPTIONAL = 0x00000080
+
+	USAGE_MATCH_TYPE_AND = 0
+	USAGE_MATCH_TYPE_OR  = 1
+
+	X509_ASN_ENCODING   = 0x00000001
+	PKCS_7_ASN_ENCODING = 0x00010000
+
+	CERT_STORE_PROV_MEMORY = 2
+
+	CERT_STORE_ADD_ALWAYS = 4
+
+	CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG = 0x00000004
+
+	CERT_TRUST_NO_ERROR                          = 0x00000000
+	CERT_TRUST_IS_NOT_TIME_VALID                 = 0x00000001
+	CERT_TRUST_IS_REVOKED                        = 0x00000004
+	CERT_TRUST_IS_NOT_SIGNATURE_VALID            = 0x00000008
+	CERT_TRUST_IS_NOT_VALID_FOR_USAGE            = 0x00000010
+	CERT_TRUST_IS_UNTRUSTED_ROOT                 = 0x00000020
+	CERT_TRUST_REVOCATION_STATUS_UNKNOWN         = 0x00000040
+	CERT_TRUST_IS_CYCLIC                         = 0x00000080
+	CERT_TRUST_INVALID_EXTENSION                 = 0x00000100
+	CERT_TRUST_INVALID_POLICY_CONSTRAINTS        = 0x00000200
+	CERT_TRUST_INVALID_BASIC_CONSTRAINTS         = 0x00000400
+	CERT_TRUST_INVALID_NAME_CONSTRAINTS          = 0x00000800
+	CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT = 0x00001000
+	CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT   = 0x00002000
+	CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT = 0x00004000
+	CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT      = 0x00008000
+	CERT_TRUST_IS_OFFLINE_REVOCATION             = 0x01000000
+	CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY          = 0x02000000
+	CERT_TRUST_IS_EXPLICIT_DISTRUST              = 0x04000000
+	CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT    = 0x08000000
+
+	CERT_CHAIN_POLICY_BASE              = 1
+	CERT_CHAIN_POLICY_AUTHENTICODE      = 2
+	CERT_CHAIN_POLICY_AUTHENTICODE_TS   = 3
+	CERT_CHAIN_POLICY_SSL               = 4
+	CERT_CHAIN_POLICY_BASIC_CONSTRAINTS = 5
+	CERT_CHAIN_POLICY_NT_AUTH           = 6
+	CERT_CHAIN_POLICY_MICROSOFT_ROOT    = 7
+	CERT_CHAIN_POLICY_EV                = 8
+
+	CERT_E_EXPIRED       = 0x800B0101
+	CERT_E_ROLE          = 0x800B0103
+	CERT_E_PURPOSE       = 0x800B0106
+	CERT_E_UNTRUSTEDROOT = 0x800B0109
+	CERT_E_CN_NO_MATCH   = 0x800B010F
+
+	AUTHTYPE_CLIENT = 1
+	AUTHTYPE_SERVER = 2
+)
+
+var (
+	OID_PKIX_KP_SERVER_AUTH = []byte("1.3.6.1.5.5.7.3.1\x00")
+	OID_SERVER_GATED_CRYPTO = []byte("1.3.6.1.4.1.311.10.3.3\x00")
+	OID_SGC_NETSCAPE        = []byte("2.16.840.1.113730.4.1\x00")
+)
+
+// Invented values to support what package os expects.
+type Timeval struct {
+	Sec  int32
+	Usec int32
+}
+
+func (tv *Timeval) Nanoseconds() int64 {
+	return (int64(tv.Sec)*1e6 + int64(tv.Usec)) * 1e3
+}
+
+func NsecToTimeval(nsec int64) (tv Timeval) {
+	tv.Sec = int32(nsec / 1e9)
+	tv.Usec = int32(nsec % 1e9 / 1e3)
+	return
+}
+
+type SecurityAttributes struct {
+	Length             uint32
+	SecurityDescriptor uintptr
+	InheritHandle      uint32
+}
+
+type Overlapped struct {
+	Internal     uintptr
+	InternalHigh uintptr
+	Offset       uint32
+	OffsetHigh   uint32
+	HEvent       Handle
+}
+
+type FileNotifyInformation struct {
+	NextEntryOffset uint32
+	Action          uint32
+	FileNameLength  uint32
+	FileName        uint16
+}
+
+type Filetime struct {
+	LowDateTime  uint32
+	HighDateTime uint32
+}
+
+// Nanoseconds returns Filetime ft in nanoseconds
+// since Epoch (00:00:00 UTC, January 1, 1970).
+func (ft *Filetime) Nanoseconds() int64 {
+	// 100-nanosecond intervals since January 1, 1601
+	nsec := int64(ft.HighDateTime)<<32 + int64(ft.LowDateTime)
+	// change starting time to the Epoch (00:00:00 UTC, January 1, 1970)
+	nsec -= 116444736000000000
+	// convert into nanoseconds
+	nsec *= 100
+	return nsec
+}
+
+func NsecToFiletime(nsec int64) (ft Filetime) {
+	// convert into 100-nanosecond
+	nsec /= 100
+	// change starting time to January 1, 1601
+	nsec += 116444736000000000
+	// split into high / low
+	ft.LowDateTime = uint32(nsec & 0xffffffff)
+	ft.HighDateTime = uint32(nsec >> 32 & 0xffffffff)
+	return ft
+}
+
+type Win32finddata struct {
+	FileAttributes    uint32
+	CreationTime      Filetime
+	LastAccessTime    Filetime
+	LastWriteTime     Filetime
+	FileSizeHigh      uint32
+	FileSizeLow       uint32
+	Reserved0         uint32
+	Reserved1         uint32
+	FileName          [MAX_PATH - 1]uint16
+	AlternateFileName [13]uint16
+}
+
+// This is the actual system call structure.
+// Win32finddata is what we committed to in Go 1.
+type win32finddata1 struct {
+	FileAttributes    uint32
+	CreationTime      Filetime
+	LastAccessTime    Filetime
+	LastWriteTime     Filetime
+	FileSizeHigh      uint32
+	FileSizeLow       uint32
+	Reserved0         uint32
+	Reserved1         uint32
+	FileName          [MAX_PATH]uint16
+	AlternateFileName [14]uint16
+}
+
+func copyFindData(dst *Win32finddata, src *win32finddata1) {
+	dst.FileAttributes = src.FileAttributes
+	dst.CreationTime = src.CreationTime
+	dst.LastAccessTime = src.LastAccessTime
+	dst.LastWriteTime = src.LastWriteTime
+	dst.FileSizeHigh = src.FileSizeHigh
+	dst.FileSizeLow = src.FileSizeLow
+	dst.Reserved0 = src.Reserved0
+	dst.Reserved1 = src.Reserved1
+
+	// The src is 1 element bigger than dst, but it must be NUL.
+	copy(dst.FileName[:], src.FileName[:])
+	copy(dst.AlternateFileName[:], src.AlternateFileName[:])
+}
+
+type ByHandleFileInformation struct {
+	FileAttributes     uint32
+	CreationTime       Filetime
+	LastAccessTime     Filetime
+	LastWriteTime      Filetime
+	VolumeSerialNumber uint32
+	FileSizeHigh       uint32
+	FileSizeLow        uint32
+	NumberOfLinks      uint32
+	FileIndexHigh      uint32
+	FileIndexLow       uint32
+}
+
+const (
+	GetFileExInfoStandard = 0
+	GetFileExMaxInfoLevel = 1
+)
+
+type Win32FileAttributeData struct {
+	FileAttributes uint32
+	CreationTime   Filetime
+	LastAccessTime Filetime
+	LastWriteTime  Filetime
+	FileSizeHigh   uint32
+	FileSizeLow    uint32
+}
+
+// ShowWindow constants
+const (
+	// winuser.h
+	SW_HIDE            = 0
+	SW_NORMAL          = 1
+	SW_SHOWNORMAL      = 1
+	SW_SHOWMINIMIZED   = 2
+	SW_SHOWMAXIMIZED   = 3
+	SW_MAXIMIZE        = 3
+	SW_SHOWNOACTIVATE  = 4
+	SW_SHOW            = 5
+	SW_MINIMIZE        = 6
+	SW_SHOWMINNOACTIVE = 7
+	SW_SHOWNA          = 8
+	SW_RESTORE         = 9
+	SW_SHOWDEFAULT     = 10
+	SW_FORCEMINIMIZE   = 11
+)
+
+type StartupInfo struct {
+	Cb            uint32
+	_             *uint16
+	Desktop       *uint16
+	Title         *uint16
+	X             uint32
+	Y             uint32
+	XSize         uint32
+	YSize         uint32
+	XCountChars   uint32
+	YCountChars   uint32
+	FillAttribute uint32
+	Flags         uint32
+	ShowWindow    uint16
+	_             uint16
+	_             *byte
+	StdInput      Handle
+	StdOutput     Handle
+	StdErr        Handle
+}
+
+type ProcessInformation struct {
+	Process   Handle
+	Thread    Handle
+	ProcessId uint32
+	ThreadId  uint32
+}
+
+type ProcessEntry32 struct {
+	Size            uint32
+	Usage           uint32
+	ProcessID       uint32
+	DefaultHeapID   uintptr
+	ModuleID        uint32
+	Threads         uint32
+	ParentProcessID uint32
+	PriClassBase    int32
+	Flags           uint32
+	ExeFile         [MAX_PATH]uint16
+}
+
+type Systemtime struct {
+	Year         uint16
+	Month        uint16
+	DayOfWeek    uint16
+	Day          uint16
+	Hour         uint16
+	Minute       uint16
+	Second       uint16
+	Milliseconds uint16
+}
+
+type Timezoneinformation struct {
+	Bias         int32
+	StandardName [32]uint16
+	StandardDate Systemtime
+	StandardBias int32
+	DaylightName [32]uint16
+	DaylightDate Systemtime
+	DaylightBias int32
+}
+
+// Socket related.
+
+const (
+	AF_UNSPEC  = 0
+	AF_UNIX    = 1
+	AF_INET    = 2
+	AF_INET6   = 23
+	AF_NETBIOS = 17
+
+	SOCK_STREAM    = 1
+	SOCK_DGRAM     = 2
+	SOCK_RAW       = 3
+	SOCK_SEQPACKET = 5
+
+	IPPROTO_IP   = 0
+	IPPROTO_IPV6 = 0x29
+	IPPROTO_TCP  = 6
+	IPPROTO_UDP  = 17
+
+	SOL_SOCKET                = 0xffff
+	SO_REUSEADDR              = 4
+	SO_KEEPALIVE              = 8
+	SO_DONTROUTE              = 16
+	SO_BROADCAST              = 32
+	SO_LINGER                 = 128
+	SO_RCVBUF                 = 0x1002
+	SO_SNDBUF                 = 0x1001
+	SO_UPDATE_ACCEPT_CONTEXT  = 0x700b
+	SO_UPDATE_CONNECT_CONTEXT = 0x7010
+
+	IOC_OUT                            = 0x40000000
+	IOC_IN                             = 0x80000000
+	IOC_VENDOR                         = 0x18000000
+	IOC_INOUT                          = IOC_IN | IOC_OUT
+	IOC_WS2                            = 0x08000000
+	SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
+	SIO_KEEPALIVE_VALS                 = IOC_IN | IOC_VENDOR | 4
+	SIO_UDP_CONNRESET                  = IOC_IN | IOC_VENDOR | 12
+
+	// cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460
+
+	IP_TOS             = 0x3
+	IP_TTL             = 0x4
+	IP_MULTICAST_IF    = 0x9
+	IP_MULTICAST_TTL   = 0xa
+	IP_MULTICAST_LOOP  = 0xb
+	IP_ADD_MEMBERSHIP  = 0xc
+	IP_DROP_MEMBERSHIP = 0xd
+
+	IPV6_V6ONLY         = 0x1b
+	IPV6_UNICAST_HOPS   = 0x4
+	IPV6_MULTICAST_IF   = 0x9
+	IPV6_MULTICAST_HOPS = 0xa
+	IPV6_MULTICAST_LOOP = 0xb
+	IPV6_JOIN_GROUP     = 0xc
+	IPV6_LEAVE_GROUP    = 0xd
+
+	MSG_OOB       = 0x1
+	MSG_PEEK      = 0x2
+	MSG_DONTROUTE = 0x4
+	MSG_WAITALL   = 0x8
+
+	MSG_TRUNC  = 0x0100
+	MSG_CTRUNC = 0x0200
+	MSG_BCAST  = 0x0400
+	MSG_MCAST  = 0x0800
+
+	SOMAXCONN = 0x7fffffff
+
+	TCP_NODELAY = 1
+
+	SHUT_RD   = 0
+	SHUT_WR   = 1
+	SHUT_RDWR = 2
+
+	WSADESCRIPTION_LEN = 256
+	WSASYS_STATUS_LEN  = 128
+)
+
+type WSABuf struct {
+	Len uint32
+	Buf *byte
+}
+
+type WSAMsg struct {
+	Name        *syscall.RawSockaddrAny
+	Namelen     int32
+	Buffers     *WSABuf
+	BufferCount uint32
+	Control     WSABuf
+	Flags       uint32
+}
+
+// Invented values to support what package os expects.
+const (
+	S_IFMT   = 0x1f000
+	S_IFIFO  = 0x1000
+	S_IFCHR  = 0x2000
+	S_IFDIR  = 0x4000
+	S_IFBLK  = 0x6000
+	S_IFREG  = 0x8000
+	S_IFLNK  = 0xa000
+	S_IFSOCK = 0xc000
+	S_ISUID  = 0x800
+	S_ISGID  = 0x400
+	S_ISVTX  = 0x200
+	S_IRUSR  = 0x100
+	S_IWRITE = 0x80
+	S_IWUSR  = 0x80
+	S_IXUSR  = 0x40
+)
+
+const (
+	FILE_TYPE_CHAR    = 0x0002
+	FILE_TYPE_DISK    = 0x0001
+	FILE_TYPE_PIPE    = 0x0003
+	FILE_TYPE_REMOTE  = 0x8000
+	FILE_TYPE_UNKNOWN = 0x0000
+)
+
+type Hostent struct {
+	Name     *byte
+	Aliases  **byte
+	AddrType uint16
+	Length   uint16
+	AddrList **byte
+}
+
+type Protoent struct {
+	Name    *byte
+	Aliases **byte
+	Proto   uint16
+}
+
+const (
+	DNS_TYPE_A       = 0x0001
+	DNS_TYPE_NS      = 0x0002
+	DNS_TYPE_MD      = 0x0003
+	DNS_TYPE_MF      = 0x0004
+	DNS_TYPE_CNAME   = 0x0005
+	DNS_TYPE_SOA     = 0x0006
+	DNS_TYPE_MB      = 0x0007
+	DNS_TYPE_MG      = 0x0008
+	DNS_TYPE_MR      = 0x0009
+	DNS_TYPE_NULL    = 0x000a
+	DNS_TYPE_WKS     = 0x000b
+	DNS_TYPE_PTR     = 0x000c
+	DNS_TYPE_HINFO   = 0x000d
+	DNS_TYPE_MINFO   = 0x000e
+	DNS_TYPE_MX      = 0x000f
+	DNS_TYPE_TEXT    = 0x0010
+	DNS_TYPE_RP      = 0x0011
+	DNS_TYPE_AFSDB   = 0x0012
+	DNS_TYPE_X25     = 0x0013
+	DNS_TYPE_ISDN    = 0x0014
+	DNS_TYPE_RT      = 0x0015
+	DNS_TYPE_NSAP    = 0x0016
+	DNS_TYPE_NSAPPTR = 0x0017
+	DNS_TYPE_SIG     = 0x0018
+	DNS_TYPE_KEY     = 0x0019
+	DNS_TYPE_PX      = 0x001a
+	DNS_TYPE_GPOS    = 0x001b
+	DNS_TYPE_AAAA    = 0x001c
+	DNS_TYPE_LOC     = 0x001d
+	DNS_TYPE_NXT     = 0x001e
+	DNS_TYPE_EID     = 0x001f
+	DNS_TYPE_NIMLOC  = 0x0020
+	DNS_TYPE_SRV     = 0x0021
+	DNS_TYPE_ATMA    = 0x0022
+	DNS_TYPE_NAPTR   = 0x0023
+	DNS_TYPE_KX      = 0x0024
+	DNS_TYPE_CERT    = 0x0025
+	DNS_TYPE_A6      = 0x0026
+	DNS_TYPE_DNAME   = 0x0027
+	DNS_TYPE_SINK    = 0x0028
+	DNS_TYPE_OPT     = 0x0029
+	DNS_TYPE_DS      = 0x002B
+	DNS_TYPE_RRSIG   = 0x002E
+	DNS_TYPE_NSEC    = 0x002F
+	DNS_TYPE_DNSKEY  = 0x0030
+	DNS_TYPE_DHCID   = 0x0031
+	DNS_TYPE_UINFO   = 0x0064
+	DNS_TYPE_UID     = 0x0065
+	DNS_TYPE_GID     = 0x0066
+	DNS_TYPE_UNSPEC  = 0x0067
+	DNS_TYPE_ADDRS   = 0x00f8
+	DNS_TYPE_TKEY    = 0x00f9
+	DNS_TYPE_TSIG    = 0x00fa
+	DNS_TYPE_IXFR    = 0x00fb
+	DNS_TYPE_AXFR    = 0x00fc
+	DNS_TYPE_MAILB   = 0x00fd
+	DNS_TYPE_MAILA   = 0x00fe
+	DNS_TYPE_ALL     = 0x00ff
+	DNS_TYPE_ANY     = 0x00ff
+	DNS_TYPE_WINS    = 0xff01
+	DNS_TYPE_WINSR   = 0xff02
+	DNS_TYPE_NBSTAT  = 0xff01
+)
+
+const (
+	DNS_INFO_NO_RECORDS = 0x251D
+)
+
+const (
+	// flags inside DNSRecord.Dw
+	DnsSectionQuestion   = 0x0000
+	DnsSectionAnswer     = 0x0001
+	DnsSectionAuthority  = 0x0002
+	DnsSectionAdditional = 0x0003
+)
+
+type DNSSRVData struct {
+	Target   *uint16
+	Priority uint16
+	Weight   uint16
+	Port     uint16
+	Pad      uint16
+}
+
+type DNSPTRData struct {
+	Host *uint16
+}
+
+type DNSMXData struct {
+	NameExchange *uint16
+	Preference   uint16
+	Pad          uint16
+}
+
+type DNSTXTData struct {
+	StringCount uint16
+	StringArray [1]*uint16
+}
+
+type DNSRecord struct {
+	Next     *DNSRecord
+	Name     *uint16
+	Type     uint16
+	Length   uint16
+	Dw       uint32
+	Ttl      uint32
+	Reserved uint32
+	Data     [40]byte
+}
+
+const (
+	TF_DISCONNECT         = 1
+	TF_REUSE_SOCKET       = 2
+	TF_WRITE_BEHIND       = 4
+	TF_USE_DEFAULT_WORKER = 0
+	TF_USE_SYSTEM_THREAD  = 16
+	TF_USE_KERNEL_APC     = 32
+)
+
+type TransmitFileBuffers struct {
+	Head       uintptr
+	HeadLength uint32
+	Tail       uintptr
+	TailLength uint32
+}
+
+const (
+	IFF_UP           = 1
+	IFF_BROADCAST    = 2
+	IFF_LOOPBACK     = 4
+	IFF_POINTTOPOINT = 8
+	IFF_MULTICAST    = 16
+)
+
+const SIO_GET_INTERFACE_LIST = 0x4004747F
+
+// TODO(mattn): SockaddrGen is union of sockaddr/sockaddr_in/sockaddr_in6_old.
+// will be fixed to change variable type as suitable.
+
+type SockaddrGen [24]byte
+
+type InterfaceInfo struct {
+	Flags            uint32
+	Address          SockaddrGen
+	BroadcastAddress SockaddrGen
+	Netmask          SockaddrGen
+}
+
+type IpAddressString struct {
+	String [16]byte
+}
+
+type IpMaskString IpAddressString
+
+type IpAddrString struct {
+	Next      *IpAddrString
+	IpAddress IpAddressString
+	IpMask    IpMaskString
+	Context   uint32
+}
+
+const MAX_ADAPTER_NAME_LENGTH = 256
+const MAX_ADAPTER_DESCRIPTION_LENGTH = 128
+const MAX_ADAPTER_ADDRESS_LENGTH = 8
+
+type IpAdapterInfo struct {
+	Next                *IpAdapterInfo
+	ComboIndex          uint32
+	AdapterName         [MAX_ADAPTER_NAME_LENGTH + 4]byte
+	Description         [MAX_ADAPTER_DESCRIPTION_LENGTH + 4]byte
+	AddressLength       uint32
+	Address             [MAX_ADAPTER_ADDRESS_LENGTH]byte
+	Index               uint32
+	Type                uint32
+	DhcpEnabled         uint32
+	CurrentIpAddress    *IpAddrString
+	IpAddressList       IpAddrString
+	GatewayList         IpAddrString
+	DhcpServer          IpAddrString
+	HaveWins            bool
+	PrimaryWinsServer   IpAddrString
+	SecondaryWinsServer IpAddrString
+	LeaseObtained       int64
+	LeaseExpires        int64
+}
+
+const MAXLEN_PHYSADDR = 8
+const MAX_INTERFACE_NAME_LEN = 256
+const MAXLEN_IFDESCR = 256
+
+type MibIfRow struct {
+	Name            [MAX_INTERFACE_NAME_LEN]uint16
+	Index           uint32
+	Type            uint32
+	Mtu             uint32
+	Speed           uint32
+	PhysAddrLen     uint32
+	PhysAddr        [MAXLEN_PHYSADDR]byte
+	AdminStatus     uint32
+	OperStatus      uint32
+	LastChange      uint32
+	InOctets        uint32
+	InUcastPkts     uint32
+	InNUcastPkts    uint32
+	InDiscards      uint32
+	InErrors        uint32
+	InUnknownProtos uint32
+	OutOctets       uint32
+	OutUcastPkts    uint32
+	OutNUcastPkts   uint32
+	OutDiscards     uint32
+	OutErrors       uint32
+	OutQLen         uint32
+	DescrLen        uint32
+	Descr           [MAXLEN_IFDESCR]byte
+}
+
+type CertContext struct {
+	EncodingType uint32
+	EncodedCert  *byte
+	Length       uint32
+	CertInfo     uintptr
+	Store        Handle
+}
+
+type CertChainContext struct {
+	Size                       uint32
+	TrustStatus                CertTrustStatus
+	ChainCount                 uint32
+	Chains                     **CertSimpleChain
+	LowerQualityChainCount     uint32
+	LowerQualityChains         **CertChainContext
+	HasRevocationFreshnessTime uint32
+	RevocationFreshnessTime    uint32
+}
+
+type CertSimpleChain struct {
+	Size                       uint32
+	TrustStatus                CertTrustStatus
+	NumElements                uint32
+	Elements                   **CertChainElement
+	TrustListInfo              uintptr
+	HasRevocationFreshnessTime uint32
+	RevocationFreshnessTime    uint32
+}
+
+type CertChainElement struct {
+	Size              uint32
+	CertContext       *CertContext
+	TrustStatus       CertTrustStatus
+	RevocationInfo    *CertRevocationInfo
+	IssuanceUsage     *CertEnhKeyUsage
+	ApplicationUsage  *CertEnhKeyUsage
+	ExtendedErrorInfo *uint16
+}
+
+type CertRevocationInfo struct {
+	Size             uint32
+	RevocationResult uint32
+	RevocationOid    *byte
+	OidSpecificInfo  uintptr
+	HasFreshnessTime uint32
+	FreshnessTime    uint32
+	CrlInfo          uintptr // *CertRevocationCrlInfo
+}
+
+type CertTrustStatus struct {
+	ErrorStatus uint32
+	InfoStatus  uint32
+}
+
+type CertUsageMatch struct {
+	Type  uint32
+	Usage CertEnhKeyUsage
+}
+
+type CertEnhKeyUsage struct {
+	Length           uint32
+	UsageIdentifiers **byte
+}
+
+type CertChainPara struct {
+	Size                         uint32
+	RequestedUsage               CertUsageMatch
+	RequstedIssuancePolicy       CertUsageMatch
+	URLRetrievalTimeout          uint32
+	CheckRevocationFreshnessTime uint32
+	RevocationFreshnessTime      uint32
+	CacheResync                  *Filetime
+}
+
+type CertChainPolicyPara struct {
+	Size            uint32
+	Flags           uint32
+	ExtraPolicyPara uintptr
+}
+
+type SSLExtraCertChainPolicyPara struct {
+	Size       uint32
+	AuthType   uint32
+	Checks     uint32
+	ServerName *uint16
+}
+
+type CertChainPolicyStatus struct {
+	Size              uint32
+	Error             uint32
+	ChainIndex        uint32
+	ElementIndex      uint32
+	ExtraPolicyStatus uintptr
+}
+
+const (
+	// do not reorder
+	HKEY_CLASSES_ROOT = 0x80000000 + iota
+	HKEY_CURRENT_USER
+	HKEY_LOCAL_MACHINE
+	HKEY_USERS
+	HKEY_PERFORMANCE_DATA
+	HKEY_CURRENT_CONFIG
+	HKEY_DYN_DATA
+
+	KEY_QUERY_VALUE        = 1
+	KEY_SET_VALUE          = 2
+	KEY_CREATE_SUB_KEY     = 4
+	KEY_ENUMERATE_SUB_KEYS = 8
+	KEY_NOTIFY             = 16
+	KEY_CREATE_LINK        = 32
+	KEY_WRITE              = 0x20006
+	KEY_EXECUTE            = 0x20019
+	KEY_READ               = 0x20019
+	KEY_WOW64_64KEY        = 0x0100
+	KEY_WOW64_32KEY        = 0x0200
+	KEY_ALL_ACCESS         = 0xf003f
+)
+
+const (
+	// do not reorder
+	REG_NONE = iota
+	REG_SZ
+	REG_EXPAND_SZ
+	REG_BINARY
+	REG_DWORD_LITTLE_ENDIAN
+	REG_DWORD_BIG_ENDIAN
+	REG_LINK
+	REG_MULTI_SZ
+	REG_RESOURCE_LIST
+	REG_FULL_RESOURCE_DESCRIPTOR
+	REG_RESOURCE_REQUIREMENTS_LIST
+	REG_QWORD_LITTLE_ENDIAN
+	REG_DWORD = REG_DWORD_LITTLE_ENDIAN
+	REG_QWORD = REG_QWORD_LITTLE_ENDIAN
+)
+
+type AddrinfoW struct {
+	Flags     int32
+	Family    int32
+	Socktype  int32
+	Protocol  int32
+	Addrlen   uintptr
+	Canonname *uint16
+	Addr      uintptr
+	Next      *AddrinfoW
+}
+
+const (
+	AI_PASSIVE     = 1
+	AI_CANONNAME   = 2
+	AI_NUMERICHOST = 4
+)
+
+type GUID struct {
+	Data1 uint32
+	Data2 uint16
+	Data3 uint16
+	Data4 [8]byte
+}
+
+var WSAID_CONNECTEX = GUID{
+	0x25a207b9,
+	0xddf3,
+	0x4660,
+	[8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e},
+}
+
+var WSAID_WSASENDMSG = GUID{
+	0xa441e712,
+	0x754f,
+	0x43ca,
+	[8]byte{0x84, 0xa7, 0x0d, 0xee, 0x44, 0xcf, 0x60, 0x6d},
+}
+
+var WSAID_WSARECVMSG = GUID{
+	0xf689d7c8,
+	0x6f1f,
+	0x436b,
+	[8]byte{0x8a, 0x53, 0xe5, 0x4f, 0xe3, 0x51, 0xc3, 0x22},
+}
+
+const (
+	FILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
+	FILE_SKIP_SET_EVENT_ON_HANDLE        = 2
+)
+
+const (
+	WSAPROTOCOL_LEN    = 255
+	MAX_PROTOCOL_CHAIN = 7
+	BASE_PROTOCOL      = 1
+	LAYERED_PROTOCOL   = 0
+
+	XP1_CONNECTIONLESS           = 0x00000001
+	XP1_GUARANTEED_DELIVERY      = 0x00000002
+	XP1_GUARANTEED_ORDER         = 0x00000004
+	XP1_MESSAGE_ORIENTED         = 0x00000008
+	XP1_PSEUDO_STREAM            = 0x00000010
+	XP1_GRACEFUL_CLOSE           = 0x00000020
+	XP1_EXPEDITED_DATA           = 0x00000040
+	XP1_CONNECT_DATA             = 0x00000080
+	XP1_DISCONNECT_DATA          = 0x00000100
+	XP1_SUPPORT_BROADCAST        = 0x00000200
+	XP1_SUPPORT_MULTIPOINT       = 0x00000400
+	XP1_MULTIPOINT_CONTROL_PLANE = 0x00000800
+	XP1_MULTIPOINT_DATA_PLANE    = 0x00001000
+	XP1_QOS_SUPPORTED            = 0x00002000
+	XP1_UNI_SEND                 = 0x00008000
+	XP1_UNI_RECV                 = 0x00010000
+	XP1_IFS_HANDLES              = 0x00020000
+	XP1_PARTIAL_MESSAGE          = 0x00040000
+	XP1_SAN_SUPPORT_SDP          = 0x00080000
+
+	PFL_MULTIPLE_PROTO_ENTRIES  = 0x00000001
+	PFL_RECOMMENDED_PROTO_ENTRY = 0x00000002
+	PFL_HIDDEN                  = 0x00000004
+	PFL_MATCHES_PROTOCOL_ZERO   = 0x00000008
+	PFL_NETWORKDIRECT_PROVIDER  = 0x00000010
+)
+
+type WSAProtocolInfo struct {
+	ServiceFlags1     uint32
+	ServiceFlags2     uint32
+	ServiceFlags3     uint32
+	ServiceFlags4     uint32
+	ProviderFlags     uint32
+	ProviderId        GUID
+	CatalogEntryId    uint32
+	ProtocolChain     WSAProtocolChain
+	Version           int32
+	AddressFamily     int32
+	MaxSockAddr       int32
+	MinSockAddr       int32
+	SocketType        int32
+	Protocol          int32
+	ProtocolMaxOffset int32
+	NetworkByteOrder  int32
+	SecurityScheme    int32
+	MessageSize       uint32
+	ProviderReserved  uint32
+	ProtocolName      [WSAPROTOCOL_LEN + 1]uint16
+}
+
+type WSAProtocolChain struct {
+	ChainLen     int32
+	ChainEntries [MAX_PROTOCOL_CHAIN]uint32
+}
+
+type TCPKeepalive struct {
+	OnOff    uint32
+	Time     uint32
+	Interval uint32
+}
+
+type symbolicLinkReparseBuffer struct {
+	SubstituteNameOffset uint16
+	SubstituteNameLength uint16
+	PrintNameOffset      uint16
+	PrintNameLength      uint16
+	Flags                uint32
+	PathBuffer           [1]uint16
+}
+
+type mountPointReparseBuffer struct {
+	SubstituteNameOffset uint16
+	SubstituteNameLength uint16
+	PrintNameOffset      uint16
+	PrintNameLength      uint16
+	PathBuffer           [1]uint16
+}
+
+type reparseDataBuffer struct {
+	ReparseTag        uint32
+	ReparseDataLength uint16
+	Reserved          uint16
+
+	// GenericReparseBuffer
+	reparseBuffer byte
+}
+
+const (
+	FSCTL_GET_REPARSE_POINT          = 0x900A8
+	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024
+	IO_REPARSE_TAG_MOUNT_POINT       = 0xA0000003
+	IO_REPARSE_TAG_SYMLINK           = 0xA000000C
+	SYMBOLIC_LINK_FLAG_DIRECTORY     = 0x1
+)
+
+const (
+	ComputerNameNetBIOS                   = 0
+	ComputerNameDnsHostname               = 1
+	ComputerNameDnsDomain                 = 2
+	ComputerNameDnsFullyQualified         = 3
+	ComputerNamePhysicalNetBIOS           = 4
+	ComputerNamePhysicalDnsHostname       = 5
+	ComputerNamePhysicalDnsDomain         = 6
+	ComputerNamePhysicalDnsFullyQualified = 7
+	ComputerNameMax                       = 8
+)
+
+const (
+	MOVEFILE_REPLACE_EXISTING      = 0x1
+	MOVEFILE_COPY_ALLOWED          = 0x2
+	MOVEFILE_DELAY_UNTIL_REBOOT    = 0x4
+	MOVEFILE_WRITE_THROUGH         = 0x8
+	MOVEFILE_CREATE_HARDLINK       = 0x10
+	MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20
+)
+
+const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
+
+const (
+	IF_TYPE_OTHER              = 1
+	IF_TYPE_ETHERNET_CSMACD    = 6
+	IF_TYPE_ISO88025_TOKENRING = 9
+	IF_TYPE_PPP                = 23
+	IF_TYPE_SOFTWARE_LOOPBACK  = 24
+	IF_TYPE_ATM                = 37
+	IF_TYPE_IEEE80211          = 71
+	IF_TYPE_TUNNEL             = 131
+	IF_TYPE_IEEE1394           = 144
+)
+
+type SocketAddress struct {
+	Sockaddr       *syscall.RawSockaddrAny
+	SockaddrLength int32
+}
+
+type IpAdapterUnicastAddress struct {
+	Length             uint32
+	Flags              uint32
+	Next               *IpAdapterUnicastAddress
+	Address            SocketAddress
+	PrefixOrigin       int32
+	SuffixOrigin       int32
+	DadState           int32
+	ValidLifetime      uint32
+	PreferredLifetime  uint32
+	LeaseLifetime      uint32
+	OnLinkPrefixLength uint8
+}
+
+type IpAdapterAnycastAddress struct {
+	Length  uint32
+	Flags   uint32
+	Next    *IpAdapterAnycastAddress
+	Address SocketAddress
+}
+
+type IpAdapterMulticastAddress struct {
+	Length  uint32
+	Flags   uint32
+	Next    *IpAdapterMulticastAddress
+	Address SocketAddress
+}
+
+type IpAdapterDnsServerAdapter struct {
+	Length   uint32
+	Reserved uint32
+	Next     *IpAdapterDnsServerAdapter
+	Address  SocketAddress
+}
+
+type IpAdapterPrefix struct {
+	Length       uint32
+	Flags        uint32
+	Next         *IpAdapterPrefix
+	Address      SocketAddress
+	PrefixLength uint32
+}
+
+type IpAdapterAddresses struct {
+	Length                uint32
+	IfIndex               uint32
+	Next                  *IpAdapterAddresses
+	AdapterName           *byte
+	FirstUnicastAddress   *IpAdapterUnicastAddress
+	FirstAnycastAddress   *IpAdapterAnycastAddress
+	FirstMulticastAddress *IpAdapterMulticastAddress
+	FirstDnsServerAddress *IpAdapterDnsServerAdapter
+	DnsSuffix             *uint16
+	Description           *uint16
+	FriendlyName          *uint16
+	PhysicalAddress       [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
+	PhysicalAddressLength uint32
+	Flags                 uint32
+	Mtu                   uint32
+	IfType                uint32
+	OperStatus            uint32
+	Ipv6IfIndex           uint32
+	ZoneIndices           [16]uint32
+	FirstPrefix           *IpAdapterPrefix
+	/* more fields might be present here. */
+}
+
+const (
+	IfOperStatusUp             = 1
+	IfOperStatusDown           = 2
+	IfOperStatusTesting        = 3
+	IfOperStatusUnknown        = 4
+	IfOperStatusDormant        = 5
+	IfOperStatusNotPresent     = 6
+	IfOperStatusLowerLayerDown = 7
+)
+
+// Console related constants used for the mode parameter to SetConsoleMode. See
+// https://docs.microsoft.com/en-us/windows/console/setconsolemode for details.
+
+const (
+	ENABLE_PROCESSED_INPUT        = 0x1
+	ENABLE_LINE_INPUT             = 0x2
+	ENABLE_ECHO_INPUT             = 0x4
+	ENABLE_WINDOW_INPUT           = 0x8
+	ENABLE_MOUSE_INPUT            = 0x10
+	ENABLE_INSERT_MODE            = 0x20
+	ENABLE_QUICK_EDIT_MODE        = 0x40
+	ENABLE_EXTENDED_FLAGS         = 0x80
+	ENABLE_AUTO_POSITION          = 0x100
+	ENABLE_VIRTUAL_TERMINAL_INPUT = 0x200
+
+	ENABLE_PROCESSED_OUTPUT            = 0x1
+	ENABLE_WRAP_AT_EOL_OUTPUT          = 0x2
+	ENABLE_VIRTUAL_TERMINAL_PROCESSING = 0x4
+	DISABLE_NEWLINE_AUTO_RETURN        = 0x8
+	ENABLE_LVB_GRID_WORLDWIDE          = 0x10
+)
+
+type Coord struct {
+	X int16
+	Y int16
+}
+
+type SmallRect struct {
+	Left   int16
+	Top    int16
+	Right  int16
+	Bottom int16
+}
+
+// Used with GetConsoleScreenBuffer to retreive information about a console
+// screen buffer. See
+// https://docs.microsoft.com/en-us/windows/console/console-screen-buffer-info-str
+// for details.
+
+type ConsoleScreenBufferInfo struct {
+	Size              Coord
+	CursorPosition    Coord
+	Attributes        uint16
+	Window            SmallRect
+	MaximumWindowSize Coord
+}
diff --git a/installer/vendor/golang.org/x/sys/windows/types_windows_386.go b/installer/vendor/golang.org/x/sys/windows/types_windows_386.go
new file mode 100644
index 0000000000..fe0ddd0316
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/windows/types_windows_386.go
@@ -0,0 +1,22 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+type WSAData struct {
+	Version      uint16
+	HighVersion  uint16
+	Description  [WSADESCRIPTION_LEN + 1]byte
+	SystemStatus [WSASYS_STATUS_LEN + 1]byte
+	MaxSockets   uint16
+	MaxUdpDg     uint16
+	VendorInfo   *byte
+}
+
+type Servent struct {
+	Name    *byte
+	Aliases **byte
+	Port    uint16
+	Proto   *byte
+}
diff --git a/installer/vendor/golang.org/x/sys/windows/types_windows_amd64.go b/installer/vendor/golang.org/x/sys/windows/types_windows_amd64.go
new file mode 100644
index 0000000000..7e154c2df2
--- /dev/null
+++ b/installer/vendor/golang.org/x/sys/windows/types_windows_amd64.go
@@ -0,0 +1,22 @@
+// Copyright 2011 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package windows
+
+type WSAData struct {
+	Version      uint16
+	HighVersion  uint16
+	MaxSockets   uint16
+	MaxUdpDg     uint16
+	VendorInfo   *byte
+	Description  [WSADESCRIPTION_LEN + 1]byte
+	SystemStatus [WSASYS_STATUS_LEN + 1]byte
+}
+
+type Servent struct {
+	Name    *byte
+	Aliases **byte
+	Proto   *byte
+	Port    uint16
+}
diff --git a/installer/vendor/golang.org/x/sys/windows/zsyscall_windows.go b/installer/vendor/golang.org/x/sys/windows/zsyscall_windows.go
index f10ebbf2b2..c7b3b15ead 100644
--- a/installer/vendor/golang.org/x/sys/windows/zsyscall_windows.go
+++ b/installer/vendor/golang.org/x/sys/windows/zsyscall_windows.go
@@ -64,6 +64,7 @@ var (
 	procQueryServiceConfigW                = modadvapi32.NewProc("QueryServiceConfigW")
 	procChangeServiceConfig2W              = modadvapi32.NewProc("ChangeServiceConfig2W")
 	procQueryServiceConfig2W               = modadvapi32.NewProc("QueryServiceConfig2W")
+	procEnumServicesStatusExW              = modadvapi32.NewProc("EnumServicesStatusExW")
 	procGetLastError                       = modkernel32.NewProc("GetLastError")
 	procLoadLibraryW                       = modkernel32.NewProc("LoadLibraryW")
 	procLoadLibraryExW                     = modkernel32.NewProc("LoadLibraryExW")
@@ -78,6 +79,7 @@ var (
 	procSetFilePointer                     = modkernel32.NewProc("SetFilePointer")
 	procCloseHandle                        = modkernel32.NewProc("CloseHandle")
 	procGetStdHandle                       = modkernel32.NewProc("GetStdHandle")
+	procSetStdHandle                       = modkernel32.NewProc("SetStdHandle")
 	procFindFirstFileW                     = modkernel32.NewProc("FindFirstFileW")
 	procFindNextFileW                      = modkernel32.NewProc("FindNextFileW")
 	procFindClose                          = modkernel32.NewProc("FindClose")
@@ -93,6 +95,7 @@ var (
 	procGetComputerNameExW                 = modkernel32.NewProc("GetComputerNameExW")
 	procSetEndOfFile                       = modkernel32.NewProc("SetEndOfFile")
 	procGetSystemTimeAsFileTime            = modkernel32.NewProc("GetSystemTimeAsFileTime")
+	procGetSystemTimePreciseAsFileTime     = modkernel32.NewProc("GetSystemTimePreciseAsFileTime")
 	procGetTimeZoneInformation             = modkernel32.NewProc("GetTimeZoneInformation")
 	procCreateIoCompletionPort             = modkernel32.NewProc("CreateIoCompletionPort")
 	procGetQueuedCompletionStatus          = modkernel32.NewProc("GetQueuedCompletionStatus")
@@ -136,6 +139,9 @@ var (
 	procFlushViewOfFile                    = modkernel32.NewProc("FlushViewOfFile")
 	procVirtualLock                        = modkernel32.NewProc("VirtualLock")
 	procVirtualUnlock                      = modkernel32.NewProc("VirtualUnlock")
+	procVirtualAlloc                       = modkernel32.NewProc("VirtualAlloc")
+	procVirtualFree                        = modkernel32.NewProc("VirtualFree")
+	procVirtualProtect                     = modkernel32.NewProc("VirtualProtect")
 	procTransmitFile                       = modmswsock.NewProc("TransmitFile")
 	procReadDirectoryChangesW              = modkernel32.NewProc("ReadDirectoryChangesW")
 	procCertOpenSystemStoreW               = modcrypt32.NewProc("CertOpenSystemStoreW")
@@ -155,6 +161,8 @@ var (
 	procRegQueryValueExW                   = modadvapi32.NewProc("RegQueryValueExW")
 	procGetCurrentProcessId                = modkernel32.NewProc("GetCurrentProcessId")
 	procGetConsoleMode                     = modkernel32.NewProc("GetConsoleMode")
+	procSetConsoleMode                     = modkernel32.NewProc("SetConsoleMode")
+	procGetConsoleScreenBufferInfo         = modkernel32.NewProc("GetConsoleScreenBufferInfo")
 	procWriteConsoleW                      = modkernel32.NewProc("WriteConsoleW")
 	procReadConsoleW                       = modkernel32.NewProc("ReadConsoleW")
 	procCreateToolhelp32Snapshot           = modkernel32.NewProc("CreateToolhelp32Snapshot")
@@ -165,7 +173,30 @@ var (
 	procCreateHardLinkW                    = modkernel32.NewProc("CreateHardLinkW")
 	procGetCurrentThreadId                 = modkernel32.NewProc("GetCurrentThreadId")
 	procCreateEventW                       = modkernel32.NewProc("CreateEventW")
+	procCreateEventExW                     = modkernel32.NewProc("CreateEventExW")
+	procOpenEventW                         = modkernel32.NewProc("OpenEventW")
 	procSetEvent                           = modkernel32.NewProc("SetEvent")
+	procResetEvent                         = modkernel32.NewProc("ResetEvent")
+	procPulseEvent                         = modkernel32.NewProc("PulseEvent")
+	procDefineDosDeviceW                   = modkernel32.NewProc("DefineDosDeviceW")
+	procDeleteVolumeMountPointW            = modkernel32.NewProc("DeleteVolumeMountPointW")
+	procFindFirstVolumeW                   = modkernel32.NewProc("FindFirstVolumeW")
+	procFindFirstVolumeMountPointW         = modkernel32.NewProc("FindFirstVolumeMountPointW")
+	procFindNextVolumeW                    = modkernel32.NewProc("FindNextVolumeW")
+	procFindNextVolumeMountPointW          = modkernel32.NewProc("FindNextVolumeMountPointW")
+	procFindVolumeClose                    = modkernel32.NewProc("FindVolumeClose")
+	procFindVolumeMountPointClose          = modkernel32.NewProc("FindVolumeMountPointClose")
+	procGetDriveTypeW                      = modkernel32.NewProc("GetDriveTypeW")
+	procGetLogicalDrives                   = modkernel32.NewProc("GetLogicalDrives")
+	procGetLogicalDriveStringsW            = modkernel32.NewProc("GetLogicalDriveStringsW")
+	procGetVolumeInformationW              = modkernel32.NewProc("GetVolumeInformationW")
+	procGetVolumeInformationByHandleW      = modkernel32.NewProc("GetVolumeInformationByHandleW")
+	procGetVolumeNameForVolumeMountPointW  = modkernel32.NewProc("GetVolumeNameForVolumeMountPointW")
+	procGetVolumePathNameW                 = modkernel32.NewProc("GetVolumePathNameW")
+	procGetVolumePathNamesForVolumeNameW   = modkernel32.NewProc("GetVolumePathNamesForVolumeNameW")
+	procQueryDosDeviceW                    = modkernel32.NewProc("QueryDosDeviceW")
+	procSetVolumeLabelW                    = modkernel32.NewProc("SetVolumeLabelW")
+	procSetVolumeMountPointW               = modkernel32.NewProc("SetVolumeMountPointW")
 	procWSAStartup                         = modws2_32.NewProc("WSAStartup")
 	procWSACleanup                         = modws2_32.NewProc("WSACleanup")
 	procWSAIoctl                           = modws2_32.NewProc("WSAIoctl")
@@ -215,6 +246,7 @@ var (
 	procAllocateAndInitializeSid           = modadvapi32.NewProc("AllocateAndInitializeSid")
 	procFreeSid                            = modadvapi32.NewProc("FreeSid")
 	procEqualSid                           = modadvapi32.NewProc("EqualSid")
+	procCheckTokenMembership               = modadvapi32.NewProc("CheckTokenMembership")
 	procOpenProcessToken                   = modadvapi32.NewProc("OpenProcessToken")
 	procGetTokenInformation                = modadvapi32.NewProc("GetTokenInformation")
 	procGetUserProfileDirectoryW           = moduserenv.NewProc("GetUserProfileDirectoryW")
@@ -428,6 +460,18 @@ func QueryServiceConfig2(service Handle, infoLevel uint32, buff *byte, buffSize
 	return
 }
 
+func EnumServicesStatusEx(mgr Handle, infoLevel uint32, serviceType uint32, serviceState uint32, services *byte, bufSize uint32, bytesNeeded *uint32, servicesReturned *uint32, resumeHandle *uint32, groupName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall12(procEnumServicesStatusExW.Addr(), 10, uintptr(mgr), uintptr(infoLevel), uintptr(serviceType), uintptr(serviceState), uintptr(unsafe.Pointer(services)), uintptr(bufSize), uintptr(unsafe.Pointer(bytesNeeded)), uintptr(unsafe.Pointer(servicesReturned)), uintptr(unsafe.Pointer(resumeHandle)), uintptr(unsafe.Pointer(groupName)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func GetLastError() (lasterr error) {
 	r0, _, _ := syscall.Syscall(procGetLastError.Addr(), 0, 0, 0, 0)
 	if r0 != 0 {
@@ -619,7 +663,7 @@ func CloseHandle(handle Handle) (err error) {
 	return
 }
 
-func GetStdHandle(stdhandle int) (handle Handle, err error) {
+func GetStdHandle(stdhandle uint32) (handle Handle, err error) {
 	r0, _, e1 := syscall.Syscall(procGetStdHandle.Addr(), 1, uintptr(stdhandle), 0, 0)
 	handle = Handle(r0)
 	if handle == InvalidHandle {
@@ -632,6 +676,18 @@ func GetStdHandle(stdhandle int) (handle Handle, err error) {
 	return
 }
 
+func SetStdHandle(stdhandle uint32, handle Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetStdHandle.Addr(), 2, uintptr(stdhandle), uintptr(handle), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func findFirstFile1(name *uint16, data *win32finddata1) (handle Handle, err error) {
 	r0, _, e1 := syscall.Syscall(procFindFirstFileW.Addr(), 2, uintptr(unsafe.Pointer(name)), uintptr(unsafe.Pointer(data)), 0)
 	handle = Handle(r0)
@@ -807,6 +863,11 @@ func GetSystemTimeAsFileTime(time *Filetime) {
 	return
 }
 
+func GetSystemTimePreciseAsFileTime(time *Filetime) {
+	syscall.Syscall(procGetSystemTimePreciseAsFileTime.Addr(), 1, uintptr(unsafe.Pointer(time)), 0, 0)
+	return
+}
+
 func GetTimeZoneInformation(tzi *Timezoneinformation) (rc uint32, err error) {
 	r0, _, e1 := syscall.Syscall(procGetTimeZoneInformation.Addr(), 1, uintptr(unsafe.Pointer(tzi)), 0, 0)
 	rc = uint32(r0)
@@ -1352,6 +1413,43 @@ func VirtualUnlock(addr uintptr, length uintptr) (err error) {
 	return
 }
 
+func VirtualAlloc(address uintptr, size uintptr, alloctype uint32, protect uint32) (value uintptr, err error) {
+	r0, _, e1 := syscall.Syscall6(procVirtualAlloc.Addr(), 4, uintptr(address), uintptr(size), uintptr(alloctype), uintptr(protect), 0, 0)
+	value = uintptr(r0)
+	if value == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualFree(address uintptr, size uintptr, freetype uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procVirtualFree.Addr(), 3, uintptr(address), uintptr(size), uintptr(freetype))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func VirtualProtect(address uintptr, size uintptr, newprotect uint32, oldprotect *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procVirtualProtect.Addr(), 4, uintptr(address), uintptr(size), uintptr(newprotect), uintptr(unsafe.Pointer(oldprotect)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func TransmitFile(s Handle, handle Handle, bytesToWrite uint32, bytsPerSend uint32, overlapped *Overlapped, transmitFileBuf *TransmitFileBuffers, flags uint32) (err error) {
 	r1, _, e1 := syscall.Syscall9(procTransmitFile.Addr(), 7, uintptr(s), uintptr(handle), uintptr(bytesToWrite), uintptr(bytsPerSend), uintptr(unsafe.Pointer(overlapped)), uintptr(unsafe.Pointer(transmitFileBuf)), uintptr(flags), 0, 0)
 	if r1 == 0 {
@@ -1557,6 +1655,30 @@ func GetConsoleMode(console Handle, mode *uint32) (err error) {
 	return
 }
 
+func SetConsoleMode(console Handle, mode uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetConsoleMode.Addr(), 2, uintptr(console), uintptr(mode), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetConsoleScreenBufferInfo(console Handle, info *ConsoleScreenBufferInfo) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetConsoleScreenBufferInfo.Addr(), 2, uintptr(console), uintptr(unsafe.Pointer(info)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func WriteConsole(console Handle, buf *uint16, towrite uint32, written *uint32, reserved *byte) (err error) {
 	r1, _, e1 := syscall.Syscall6(procWriteConsoleW.Addr(), 5, uintptr(console), uintptr(unsafe.Pointer(buf)), uintptr(towrite), uintptr(unsafe.Pointer(written)), uintptr(unsafe.Pointer(reserved)), 0)
 	if r1 == 0 {
@@ -1660,7 +1782,7 @@ func GetCurrentThreadId() (id uint32) {
 	return
 }
 
-func CreateEvent(eventAttrs *syscall.SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) {
+func CreateEvent(eventAttrs *SecurityAttributes, manualReset uint32, initialState uint32, name *uint16) (handle Handle, err error) {
 	r0, _, e1 := syscall.Syscall6(procCreateEventW.Addr(), 4, uintptr(unsafe.Pointer(eventAttrs)), uintptr(manualReset), uintptr(initialState), uintptr(unsafe.Pointer(name)), 0, 0)
 	handle = Handle(r0)
 	if handle == 0 {
@@ -1673,6 +1795,38 @@ func CreateEvent(eventAttrs *syscall.SecurityAttributes, manualReset uint32, ini
 	return
 }
 
+func CreateEventEx(eventAttrs *SecurityAttributes, name *uint16, flags uint32, desiredAccess uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall6(procCreateEventExW.Addr(), 4, uintptr(unsafe.Pointer(eventAttrs)), uintptr(unsafe.Pointer(name)), uintptr(flags), uintptr(desiredAccess), 0, 0)
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func OpenEvent(desiredAccess uint32, inheritHandle bool, name *uint16) (handle Handle, err error) {
+	var _p0 uint32
+	if inheritHandle {
+		_p0 = 1
+	} else {
+		_p0 = 0
+	}
+	r0, _, e1 := syscall.Syscall(procOpenEventW.Addr(), 3, uintptr(desiredAccess), uintptr(_p0), uintptr(unsafe.Pointer(name)))
+	handle = Handle(r0)
+	if handle == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func SetEvent(event Handle) (err error) {
 	r1, _, e1 := syscall.Syscall(procSetEvent.Addr(), 1, uintptr(event), 0, 0)
 	if r1 == 0 {
@@ -1685,6 +1839,257 @@ func SetEvent(event Handle) (err error) {
 	return
 }
 
+func ResetEvent(event Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procResetEvent.Addr(), 1, uintptr(event), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func PulseEvent(event Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procPulseEvent.Addr(), 1, uintptr(event), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DefineDosDevice(flags uint32, deviceName *uint16, targetPath *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procDefineDosDeviceW.Addr(), 3, uintptr(flags), uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func DeleteVolumeMountPoint(volumeMountPoint *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procDeleteVolumeMountPointW.Addr(), 1, uintptr(unsafe.Pointer(volumeMountPoint)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindFirstVolume(volumeName *uint16, bufferLength uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procFindFirstVolumeW.Addr(), 2, uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength), 0)
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindFirstVolumeMountPoint(rootPathName *uint16, volumeMountPoint *uint16, bufferLength uint32) (handle Handle, err error) {
+	r0, _, e1 := syscall.Syscall(procFindFirstVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+	handle = Handle(r0)
+	if handle == InvalidHandle {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindNextVolume(findVolume Handle, volumeName *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindNextVolumeW.Addr(), 3, uintptr(findVolume), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindNextVolumeMountPoint(findVolumeMountPoint Handle, volumeMountPoint *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindNextVolumeMountPointW.Addr(), 3, uintptr(findVolumeMountPoint), uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindVolumeClose(findVolume Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindVolumeClose.Addr(), 1, uintptr(findVolume), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func FindVolumeMountPointClose(findVolumeMountPoint Handle) (err error) {
+	r1, _, e1 := syscall.Syscall(procFindVolumeMountPointClose.Addr(), 1, uintptr(findVolumeMountPoint), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetDriveType(rootPathName *uint16) (driveType uint32) {
+	r0, _, _ := syscall.Syscall(procGetDriveTypeW.Addr(), 1, uintptr(unsafe.Pointer(rootPathName)), 0, 0)
+	driveType = uint32(r0)
+	return
+}
+
+func GetLogicalDrives() (drivesBitMask uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetLogicalDrives.Addr(), 0, 0, 0, 0)
+	drivesBitMask = uint32(r0)
+	if drivesBitMask == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetLogicalDriveStrings(bufferLength uint32, buffer *uint16) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procGetLogicalDriveStringsW.Addr(), 2, uintptr(bufferLength), uintptr(unsafe.Pointer(buffer)), 0)
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeInformation(rootPathName *uint16, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procGetVolumeInformationW.Addr(), 8, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeInformationByHandle(file Handle, volumeNameBuffer *uint16, volumeNameSize uint32, volumeNameSerialNumber *uint32, maximumComponentLength *uint32, fileSystemFlags *uint32, fileSystemNameBuffer *uint16, fileSystemNameSize uint32) (err error) {
+	r1, _, e1 := syscall.Syscall9(procGetVolumeInformationByHandleW.Addr(), 8, uintptr(file), uintptr(unsafe.Pointer(volumeNameBuffer)), uintptr(volumeNameSize), uintptr(unsafe.Pointer(volumeNameSerialNumber)), uintptr(unsafe.Pointer(maximumComponentLength)), uintptr(unsafe.Pointer(fileSystemFlags)), uintptr(unsafe.Pointer(fileSystemNameBuffer)), uintptr(fileSystemNameSize), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumeNameForVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16, bufferlength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetVolumeNameForVolumeMountPointW.Addr(), 3, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), uintptr(bufferlength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumePathName(fileName *uint16, volumePathName *uint16, bufferLength uint32) (err error) {
+	r1, _, e1 := syscall.Syscall(procGetVolumePathNameW.Addr(), 3, uintptr(unsafe.Pointer(fileName)), uintptr(unsafe.Pointer(volumePathName)), uintptr(bufferLength))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func GetVolumePathNamesForVolumeName(volumeName *uint16, volumePathNames *uint16, bufferLength uint32, returnLength *uint32) (err error) {
+	r1, _, e1 := syscall.Syscall6(procGetVolumePathNamesForVolumeNameW.Addr(), 4, uintptr(unsafe.Pointer(volumeName)), uintptr(unsafe.Pointer(volumePathNames)), uintptr(bufferLength), uintptr(unsafe.Pointer(returnLength)), 0, 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func QueryDosDevice(deviceName *uint16, targetPath *uint16, max uint32) (n uint32, err error) {
+	r0, _, e1 := syscall.Syscall(procQueryDosDeviceW.Addr(), 3, uintptr(unsafe.Pointer(deviceName)), uintptr(unsafe.Pointer(targetPath)), uintptr(max))
+	n = uint32(r0)
+	if n == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetVolumeLabel(rootPathName *uint16, volumeName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetVolumeLabelW.Addr(), 2, uintptr(unsafe.Pointer(rootPathName)), uintptr(unsafe.Pointer(volumeName)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
+func SetVolumeMountPoint(volumeMountPoint *uint16, volumeName *uint16) (err error) {
+	r1, _, e1 := syscall.Syscall(procSetVolumeMountPointW.Addr(), 2, uintptr(unsafe.Pointer(volumeMountPoint)), uintptr(unsafe.Pointer(volumeName)), 0)
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func WSAStartup(verreq uint32, data *WSAData) (sockerr error) {
 	r0, _, _ := syscall.Syscall(procWSAStartup.Addr(), 2, uintptr(verreq), uintptr(unsafe.Pointer(data)), 0)
 	if r0 != 0 {
@@ -2233,6 +2638,18 @@ func EqualSid(sid1 *SID, sid2 *SID) (isEqual bool) {
 	return
 }
 
+func checkTokenMembership(tokenHandle Token, sidToCheck *SID, isMember *int32) (err error) {
+	r1, _, e1 := syscall.Syscall(procCheckTokenMembership.Addr(), 3, uintptr(tokenHandle), uintptr(unsafe.Pointer(sidToCheck)), uintptr(unsafe.Pointer(isMember)))
+	if r1 == 0 {
+		if e1 != 0 {
+			err = errnoErr(e1)
+		} else {
+			err = syscall.EINVAL
+		}
+	}
+	return
+}
+
 func OpenProcessToken(h Handle, access uint32, token *Token) (err error) {
 	r1, _, e1 := syscall.Syscall(procOpenProcessToken.Addr(), 3, uintptr(h), uintptr(access), uintptr(unsafe.Pointer(token)))
 	if r1 == 0 {
diff --git a/installer/vendor/golang.org/x/sys/windows/ztypes_windows.go b/installer/vendor/golang.org/x/sys/windows/ztypes_windows.go
deleted file mode 100644
index 1fe19d1d7f..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/ztypes_windows.go
+++ /dev/null
@@ -1,1242 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-import "syscall"
-
-const (
-	// Windows errors.
-	ERROR_FILE_NOT_FOUND         syscall.Errno = 2
-	ERROR_PATH_NOT_FOUND         syscall.Errno = 3
-	ERROR_ACCESS_DENIED          syscall.Errno = 5
-	ERROR_NO_MORE_FILES          syscall.Errno = 18
-	ERROR_HANDLE_EOF             syscall.Errno = 38
-	ERROR_NETNAME_DELETED        syscall.Errno = 64
-	ERROR_FILE_EXISTS            syscall.Errno = 80
-	ERROR_BROKEN_PIPE            syscall.Errno = 109
-	ERROR_BUFFER_OVERFLOW        syscall.Errno = 111
-	ERROR_INSUFFICIENT_BUFFER    syscall.Errno = 122
-	ERROR_MOD_NOT_FOUND          syscall.Errno = 126
-	ERROR_PROC_NOT_FOUND         syscall.Errno = 127
-	ERROR_ALREADY_EXISTS         syscall.Errno = 183
-	ERROR_ENVVAR_NOT_FOUND       syscall.Errno = 203
-	ERROR_MORE_DATA              syscall.Errno = 234
-	ERROR_OPERATION_ABORTED      syscall.Errno = 995
-	ERROR_IO_PENDING             syscall.Errno = 997
-	ERROR_SERVICE_SPECIFIC_ERROR syscall.Errno = 1066
-	ERROR_NOT_FOUND              syscall.Errno = 1168
-	ERROR_PRIVILEGE_NOT_HELD     syscall.Errno = 1314
-	WSAEACCES                    syscall.Errno = 10013
-	WSAECONNRESET                syscall.Errno = 10054
-)
-
-const (
-	// Invented values to support what package os expects.
-	O_RDONLY   = 0x00000
-	O_WRONLY   = 0x00001
-	O_RDWR     = 0x00002
-	O_CREAT    = 0x00040
-	O_EXCL     = 0x00080
-	O_NOCTTY   = 0x00100
-	O_TRUNC    = 0x00200
-	O_NONBLOCK = 0x00800
-	O_APPEND   = 0x00400
-	O_SYNC     = 0x01000
-	O_ASYNC    = 0x02000
-	O_CLOEXEC  = 0x80000
-)
-
-const (
-	// More invented values for signals
-	SIGHUP  = Signal(0x1)
-	SIGINT  = Signal(0x2)
-	SIGQUIT = Signal(0x3)
-	SIGILL  = Signal(0x4)
-	SIGTRAP = Signal(0x5)
-	SIGABRT = Signal(0x6)
-	SIGBUS  = Signal(0x7)
-	SIGFPE  = Signal(0x8)
-	SIGKILL = Signal(0x9)
-	SIGSEGV = Signal(0xb)
-	SIGPIPE = Signal(0xd)
-	SIGALRM = Signal(0xe)
-	SIGTERM = Signal(0xf)
-)
-
-var signals = [...]string{
-	1:  "hangup",
-	2:  "interrupt",
-	3:  "quit",
-	4:  "illegal instruction",
-	5:  "trace/breakpoint trap",
-	6:  "aborted",
-	7:  "bus error",
-	8:  "floating point exception",
-	9:  "killed",
-	10: "user defined signal 1",
-	11: "segmentation fault",
-	12: "user defined signal 2",
-	13: "broken pipe",
-	14: "alarm clock",
-	15: "terminated",
-}
-
-const (
-	GENERIC_READ    = 0x80000000
-	GENERIC_WRITE   = 0x40000000
-	GENERIC_EXECUTE = 0x20000000
-	GENERIC_ALL     = 0x10000000
-
-	FILE_LIST_DIRECTORY   = 0x00000001
-	FILE_APPEND_DATA      = 0x00000004
-	FILE_WRITE_ATTRIBUTES = 0x00000100
-
-	FILE_SHARE_READ              = 0x00000001
-	FILE_SHARE_WRITE             = 0x00000002
-	FILE_SHARE_DELETE            = 0x00000004
-	FILE_ATTRIBUTE_READONLY      = 0x00000001
-	FILE_ATTRIBUTE_HIDDEN        = 0x00000002
-	FILE_ATTRIBUTE_SYSTEM        = 0x00000004
-	FILE_ATTRIBUTE_DIRECTORY     = 0x00000010
-	FILE_ATTRIBUTE_ARCHIVE       = 0x00000020
-	FILE_ATTRIBUTE_NORMAL        = 0x00000080
-	FILE_ATTRIBUTE_REPARSE_POINT = 0x00000400
-
-	INVALID_FILE_ATTRIBUTES = 0xffffffff
-
-	CREATE_NEW        = 1
-	CREATE_ALWAYS     = 2
-	OPEN_EXISTING     = 3
-	OPEN_ALWAYS       = 4
-	TRUNCATE_EXISTING = 5
-
-	FILE_FLAG_OPEN_REPARSE_POINT = 0x00200000
-	FILE_FLAG_BACKUP_SEMANTICS   = 0x02000000
-	FILE_FLAG_OVERLAPPED         = 0x40000000
-
-	HANDLE_FLAG_INHERIT    = 0x00000001
-	STARTF_USESTDHANDLES   = 0x00000100
-	STARTF_USESHOWWINDOW   = 0x00000001
-	DUPLICATE_CLOSE_SOURCE = 0x00000001
-	DUPLICATE_SAME_ACCESS  = 0x00000002
-
-	STD_INPUT_HANDLE  = -10
-	STD_OUTPUT_HANDLE = -11
-	STD_ERROR_HANDLE  = -12
-
-	FILE_BEGIN   = 0
-	FILE_CURRENT = 1
-	FILE_END     = 2
-
-	LANG_ENGLISH       = 0x09
-	SUBLANG_ENGLISH_US = 0x01
-
-	FORMAT_MESSAGE_ALLOCATE_BUFFER = 256
-	FORMAT_MESSAGE_IGNORE_INSERTS  = 512
-	FORMAT_MESSAGE_FROM_STRING     = 1024
-	FORMAT_MESSAGE_FROM_HMODULE    = 2048
-	FORMAT_MESSAGE_FROM_SYSTEM     = 4096
-	FORMAT_MESSAGE_ARGUMENT_ARRAY  = 8192
-	FORMAT_MESSAGE_MAX_WIDTH_MASK  = 255
-
-	MAX_PATH      = 260
-	MAX_LONG_PATH = 32768
-
-	MAX_COMPUTERNAME_LENGTH = 15
-
-	TIME_ZONE_ID_UNKNOWN  = 0
-	TIME_ZONE_ID_STANDARD = 1
-
-	TIME_ZONE_ID_DAYLIGHT = 2
-	IGNORE                = 0
-	INFINITE              = 0xffffffff
-
-	WAIT_TIMEOUT   = 258
-	WAIT_ABANDONED = 0x00000080
-	WAIT_OBJECT_0  = 0x00000000
-	WAIT_FAILED    = 0xFFFFFFFF
-
-	CREATE_NEW_PROCESS_GROUP   = 0x00000200
-	CREATE_UNICODE_ENVIRONMENT = 0x00000400
-
-	PROCESS_TERMINATE         = 1
-	PROCESS_QUERY_INFORMATION = 0x00000400
-	SYNCHRONIZE               = 0x00100000
-
-	PAGE_READONLY          = 0x02
-	PAGE_READWRITE         = 0x04
-	PAGE_WRITECOPY         = 0x08
-	PAGE_EXECUTE_READ      = 0x20
-	PAGE_EXECUTE_READWRITE = 0x40
-	PAGE_EXECUTE_WRITECOPY = 0x80
-
-	FILE_MAP_COPY    = 0x01
-	FILE_MAP_WRITE   = 0x02
-	FILE_MAP_READ    = 0x04
-	FILE_MAP_EXECUTE = 0x20
-
-	CTRL_C_EVENT     = 0
-	CTRL_BREAK_EVENT = 1
-
-	// Windows reserves errors >= 1<<29 for application use.
-	APPLICATION_ERROR = 1 << 29
-)
-
-const (
-	// flags for CreateToolhelp32Snapshot
-	TH32CS_SNAPHEAPLIST = 0x01
-	TH32CS_SNAPPROCESS  = 0x02
-	TH32CS_SNAPTHREAD   = 0x04
-	TH32CS_SNAPMODULE   = 0x08
-	TH32CS_SNAPMODULE32 = 0x10
-	TH32CS_SNAPALL      = TH32CS_SNAPHEAPLIST | TH32CS_SNAPMODULE | TH32CS_SNAPPROCESS | TH32CS_SNAPTHREAD
-	TH32CS_INHERIT      = 0x80000000
-)
-
-const (
-	// filters for ReadDirectoryChangesW
-	FILE_NOTIFY_CHANGE_FILE_NAME   = 0x001
-	FILE_NOTIFY_CHANGE_DIR_NAME    = 0x002
-	FILE_NOTIFY_CHANGE_ATTRIBUTES  = 0x004
-	FILE_NOTIFY_CHANGE_SIZE        = 0x008
-	FILE_NOTIFY_CHANGE_LAST_WRITE  = 0x010
-	FILE_NOTIFY_CHANGE_LAST_ACCESS = 0x020
-	FILE_NOTIFY_CHANGE_CREATION    = 0x040
-	FILE_NOTIFY_CHANGE_SECURITY    = 0x100
-)
-
-const (
-	// do not reorder
-	FILE_ACTION_ADDED = iota + 1
-	FILE_ACTION_REMOVED
-	FILE_ACTION_MODIFIED
-	FILE_ACTION_RENAMED_OLD_NAME
-	FILE_ACTION_RENAMED_NEW_NAME
-)
-
-const (
-	// wincrypt.h
-	PROV_RSA_FULL                    = 1
-	PROV_RSA_SIG                     = 2
-	PROV_DSS                         = 3
-	PROV_FORTEZZA                    = 4
-	PROV_MS_EXCHANGE                 = 5
-	PROV_SSL                         = 6
-	PROV_RSA_SCHANNEL                = 12
-	PROV_DSS_DH                      = 13
-	PROV_EC_ECDSA_SIG                = 14
-	PROV_EC_ECNRA_SIG                = 15
-	PROV_EC_ECDSA_FULL               = 16
-	PROV_EC_ECNRA_FULL               = 17
-	PROV_DH_SCHANNEL                 = 18
-	PROV_SPYRUS_LYNKS                = 20
-	PROV_RNG                         = 21
-	PROV_INTEL_SEC                   = 22
-	PROV_REPLACE_OWF                 = 23
-	PROV_RSA_AES                     = 24
-	CRYPT_VERIFYCONTEXT              = 0xF0000000
-	CRYPT_NEWKEYSET                  = 0x00000008
-	CRYPT_DELETEKEYSET               = 0x00000010
-	CRYPT_MACHINE_KEYSET             = 0x00000020
-	CRYPT_SILENT                     = 0x00000040
-	CRYPT_DEFAULT_CONTAINER_OPTIONAL = 0x00000080
-
-	USAGE_MATCH_TYPE_AND = 0
-	USAGE_MATCH_TYPE_OR  = 1
-
-	X509_ASN_ENCODING   = 0x00000001
-	PKCS_7_ASN_ENCODING = 0x00010000
-
-	CERT_STORE_PROV_MEMORY = 2
-
-	CERT_STORE_ADD_ALWAYS = 4
-
-	CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG = 0x00000004
-
-	CERT_TRUST_NO_ERROR                          = 0x00000000
-	CERT_TRUST_IS_NOT_TIME_VALID                 = 0x00000001
-	CERT_TRUST_IS_REVOKED                        = 0x00000004
-	CERT_TRUST_IS_NOT_SIGNATURE_VALID            = 0x00000008
-	CERT_TRUST_IS_NOT_VALID_FOR_USAGE            = 0x00000010
-	CERT_TRUST_IS_UNTRUSTED_ROOT                 = 0x00000020
-	CERT_TRUST_REVOCATION_STATUS_UNKNOWN         = 0x00000040
-	CERT_TRUST_IS_CYCLIC                         = 0x00000080
-	CERT_TRUST_INVALID_EXTENSION                 = 0x00000100
-	CERT_TRUST_INVALID_POLICY_CONSTRAINTS        = 0x00000200
-	CERT_TRUST_INVALID_BASIC_CONSTRAINTS         = 0x00000400
-	CERT_TRUST_INVALID_NAME_CONSTRAINTS          = 0x00000800
-	CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT = 0x00001000
-	CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT   = 0x00002000
-	CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT = 0x00004000
-	CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT      = 0x00008000
-	CERT_TRUST_IS_OFFLINE_REVOCATION             = 0x01000000
-	CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY          = 0x02000000
-	CERT_TRUST_IS_EXPLICIT_DISTRUST              = 0x04000000
-	CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT    = 0x08000000
-
-	CERT_CHAIN_POLICY_BASE              = 1
-	CERT_CHAIN_POLICY_AUTHENTICODE      = 2
-	CERT_CHAIN_POLICY_AUTHENTICODE_TS   = 3
-	CERT_CHAIN_POLICY_SSL               = 4
-	CERT_CHAIN_POLICY_BASIC_CONSTRAINTS = 5
-	CERT_CHAIN_POLICY_NT_AUTH           = 6
-	CERT_CHAIN_POLICY_MICROSOFT_ROOT    = 7
-	CERT_CHAIN_POLICY_EV                = 8
-
-	CERT_E_EXPIRED       = 0x800B0101
-	CERT_E_ROLE          = 0x800B0103
-	CERT_E_PURPOSE       = 0x800B0106
-	CERT_E_UNTRUSTEDROOT = 0x800B0109
-	CERT_E_CN_NO_MATCH   = 0x800B010F
-
-	AUTHTYPE_CLIENT = 1
-	AUTHTYPE_SERVER = 2
-)
-
-var (
-	OID_PKIX_KP_SERVER_AUTH = []byte("1.3.6.1.5.5.7.3.1\x00")
-	OID_SERVER_GATED_CRYPTO = []byte("1.3.6.1.4.1.311.10.3.3\x00")
-	OID_SGC_NETSCAPE        = []byte("2.16.840.1.113730.4.1\x00")
-)
-
-// Invented values to support what package os expects.
-type Timeval struct {
-	Sec  int32
-	Usec int32
-}
-
-func (tv *Timeval) Nanoseconds() int64 {
-	return (int64(tv.Sec)*1e6 + int64(tv.Usec)) * 1e3
-}
-
-func NsecToTimeval(nsec int64) (tv Timeval) {
-	tv.Sec = int32(nsec / 1e9)
-	tv.Usec = int32(nsec % 1e9 / 1e3)
-	return
-}
-
-type SecurityAttributes struct {
-	Length             uint32
-	SecurityDescriptor uintptr
-	InheritHandle      uint32
-}
-
-type Overlapped struct {
-	Internal     uintptr
-	InternalHigh uintptr
-	Offset       uint32
-	OffsetHigh   uint32
-	HEvent       Handle
-}
-
-type FileNotifyInformation struct {
-	NextEntryOffset uint32
-	Action          uint32
-	FileNameLength  uint32
-	FileName        uint16
-}
-
-type Filetime struct {
-	LowDateTime  uint32
-	HighDateTime uint32
-}
-
-// Nanoseconds returns Filetime ft in nanoseconds
-// since Epoch (00:00:00 UTC, January 1, 1970).
-func (ft *Filetime) Nanoseconds() int64 {
-	// 100-nanosecond intervals since January 1, 1601
-	nsec := int64(ft.HighDateTime)<<32 + int64(ft.LowDateTime)
-	// change starting time to the Epoch (00:00:00 UTC, January 1, 1970)
-	nsec -= 116444736000000000
-	// convert into nanoseconds
-	nsec *= 100
-	return nsec
-}
-
-func NsecToFiletime(nsec int64) (ft Filetime) {
-	// convert into 100-nanosecond
-	nsec /= 100
-	// change starting time to January 1, 1601
-	nsec += 116444736000000000
-	// split into high / low
-	ft.LowDateTime = uint32(nsec & 0xffffffff)
-	ft.HighDateTime = uint32(nsec >> 32 & 0xffffffff)
-	return ft
-}
-
-type Win32finddata struct {
-	FileAttributes    uint32
-	CreationTime      Filetime
-	LastAccessTime    Filetime
-	LastWriteTime     Filetime
-	FileSizeHigh      uint32
-	FileSizeLow       uint32
-	Reserved0         uint32
-	Reserved1         uint32
-	FileName          [MAX_PATH - 1]uint16
-	AlternateFileName [13]uint16
-}
-
-// This is the actual system call structure.
-// Win32finddata is what we committed to in Go 1.
-type win32finddata1 struct {
-	FileAttributes    uint32
-	CreationTime      Filetime
-	LastAccessTime    Filetime
-	LastWriteTime     Filetime
-	FileSizeHigh      uint32
-	FileSizeLow       uint32
-	Reserved0         uint32
-	Reserved1         uint32
-	FileName          [MAX_PATH]uint16
-	AlternateFileName [14]uint16
-}
-
-func copyFindData(dst *Win32finddata, src *win32finddata1) {
-	dst.FileAttributes = src.FileAttributes
-	dst.CreationTime = src.CreationTime
-	dst.LastAccessTime = src.LastAccessTime
-	dst.LastWriteTime = src.LastWriteTime
-	dst.FileSizeHigh = src.FileSizeHigh
-	dst.FileSizeLow = src.FileSizeLow
-	dst.Reserved0 = src.Reserved0
-	dst.Reserved1 = src.Reserved1
-
-	// The src is 1 element bigger than dst, but it must be NUL.
-	copy(dst.FileName[:], src.FileName[:])
-	copy(dst.AlternateFileName[:], src.AlternateFileName[:])
-}
-
-type ByHandleFileInformation struct {
-	FileAttributes     uint32
-	CreationTime       Filetime
-	LastAccessTime     Filetime
-	LastWriteTime      Filetime
-	VolumeSerialNumber uint32
-	FileSizeHigh       uint32
-	FileSizeLow        uint32
-	NumberOfLinks      uint32
-	FileIndexHigh      uint32
-	FileIndexLow       uint32
-}
-
-const (
-	GetFileExInfoStandard = 0
-	GetFileExMaxInfoLevel = 1
-)
-
-type Win32FileAttributeData struct {
-	FileAttributes uint32
-	CreationTime   Filetime
-	LastAccessTime Filetime
-	LastWriteTime  Filetime
-	FileSizeHigh   uint32
-	FileSizeLow    uint32
-}
-
-// ShowWindow constants
-const (
-	// winuser.h
-	SW_HIDE            = 0
-	SW_NORMAL          = 1
-	SW_SHOWNORMAL      = 1
-	SW_SHOWMINIMIZED   = 2
-	SW_SHOWMAXIMIZED   = 3
-	SW_MAXIMIZE        = 3
-	SW_SHOWNOACTIVATE  = 4
-	SW_SHOW            = 5
-	SW_MINIMIZE        = 6
-	SW_SHOWMINNOACTIVE = 7
-	SW_SHOWNA          = 8
-	SW_RESTORE         = 9
-	SW_SHOWDEFAULT     = 10
-	SW_FORCEMINIMIZE   = 11
-)
-
-type StartupInfo struct {
-	Cb            uint32
-	_             *uint16
-	Desktop       *uint16
-	Title         *uint16
-	X             uint32
-	Y             uint32
-	XSize         uint32
-	YSize         uint32
-	XCountChars   uint32
-	YCountChars   uint32
-	FillAttribute uint32
-	Flags         uint32
-	ShowWindow    uint16
-	_             uint16
-	_             *byte
-	StdInput      Handle
-	StdOutput     Handle
-	StdErr        Handle
-}
-
-type ProcessInformation struct {
-	Process   Handle
-	Thread    Handle
-	ProcessId uint32
-	ThreadId  uint32
-}
-
-type ProcessEntry32 struct {
-	Size            uint32
-	Usage           uint32
-	ProcessID       uint32
-	DefaultHeapID   uintptr
-	ModuleID        uint32
-	Threads         uint32
-	ParentProcessID uint32
-	PriClassBase    int32
-	Flags           uint32
-	ExeFile         [MAX_PATH]uint16
-}
-
-type Systemtime struct {
-	Year         uint16
-	Month        uint16
-	DayOfWeek    uint16
-	Day          uint16
-	Hour         uint16
-	Minute       uint16
-	Second       uint16
-	Milliseconds uint16
-}
-
-type Timezoneinformation struct {
-	Bias         int32
-	StandardName [32]uint16
-	StandardDate Systemtime
-	StandardBias int32
-	DaylightName [32]uint16
-	DaylightDate Systemtime
-	DaylightBias int32
-}
-
-// Socket related.
-
-const (
-	AF_UNSPEC  = 0
-	AF_UNIX    = 1
-	AF_INET    = 2
-	AF_INET6   = 23
-	AF_NETBIOS = 17
-
-	SOCK_STREAM    = 1
-	SOCK_DGRAM     = 2
-	SOCK_RAW       = 3
-	SOCK_SEQPACKET = 5
-
-	IPPROTO_IP   = 0
-	IPPROTO_IPV6 = 0x29
-	IPPROTO_TCP  = 6
-	IPPROTO_UDP  = 17
-
-	SOL_SOCKET                = 0xffff
-	SO_REUSEADDR              = 4
-	SO_KEEPALIVE              = 8
-	SO_DONTROUTE              = 16
-	SO_BROADCAST              = 32
-	SO_LINGER                 = 128
-	SO_RCVBUF                 = 0x1002
-	SO_SNDBUF                 = 0x1001
-	SO_UPDATE_ACCEPT_CONTEXT  = 0x700b
-	SO_UPDATE_CONNECT_CONTEXT = 0x7010
-
-	IOC_OUT                            = 0x40000000
-	IOC_IN                             = 0x80000000
-	IOC_VENDOR                         = 0x18000000
-	IOC_INOUT                          = IOC_IN | IOC_OUT
-	IOC_WS2                            = 0x08000000
-	SIO_GET_EXTENSION_FUNCTION_POINTER = IOC_INOUT | IOC_WS2 | 6
-	SIO_KEEPALIVE_VALS                 = IOC_IN | IOC_VENDOR | 4
-	SIO_UDP_CONNRESET                  = IOC_IN | IOC_VENDOR | 12
-
-	// cf. http://support.microsoft.com/default.aspx?scid=kb;en-us;257460
-
-	IP_TOS             = 0x3
-	IP_TTL             = 0x4
-	IP_MULTICAST_IF    = 0x9
-	IP_MULTICAST_TTL   = 0xa
-	IP_MULTICAST_LOOP  = 0xb
-	IP_ADD_MEMBERSHIP  = 0xc
-	IP_DROP_MEMBERSHIP = 0xd
-
-	IPV6_V6ONLY         = 0x1b
-	IPV6_UNICAST_HOPS   = 0x4
-	IPV6_MULTICAST_IF   = 0x9
-	IPV6_MULTICAST_HOPS = 0xa
-	IPV6_MULTICAST_LOOP = 0xb
-	IPV6_JOIN_GROUP     = 0xc
-	IPV6_LEAVE_GROUP    = 0xd
-
-	SOMAXCONN = 0x7fffffff
-
-	TCP_NODELAY = 1
-
-	SHUT_RD   = 0
-	SHUT_WR   = 1
-	SHUT_RDWR = 2
-
-	WSADESCRIPTION_LEN = 256
-	WSASYS_STATUS_LEN  = 128
-)
-
-type WSABuf struct {
-	Len uint32
-	Buf *byte
-}
-
-// Invented values to support what package os expects.
-const (
-	S_IFMT   = 0x1f000
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xa000
-	S_IFSOCK = 0xc000
-	S_ISUID  = 0x800
-	S_ISGID  = 0x400
-	S_ISVTX  = 0x200
-	S_IRUSR  = 0x100
-	S_IWRITE = 0x80
-	S_IWUSR  = 0x80
-	S_IXUSR  = 0x40
-)
-
-const (
-	FILE_TYPE_CHAR    = 0x0002
-	FILE_TYPE_DISK    = 0x0001
-	FILE_TYPE_PIPE    = 0x0003
-	FILE_TYPE_REMOTE  = 0x8000
-	FILE_TYPE_UNKNOWN = 0x0000
-)
-
-type Hostent struct {
-	Name     *byte
-	Aliases  **byte
-	AddrType uint16
-	Length   uint16
-	AddrList **byte
-}
-
-type Protoent struct {
-	Name    *byte
-	Aliases **byte
-	Proto   uint16
-}
-
-const (
-	DNS_TYPE_A       = 0x0001
-	DNS_TYPE_NS      = 0x0002
-	DNS_TYPE_MD      = 0x0003
-	DNS_TYPE_MF      = 0x0004
-	DNS_TYPE_CNAME   = 0x0005
-	DNS_TYPE_SOA     = 0x0006
-	DNS_TYPE_MB      = 0x0007
-	DNS_TYPE_MG      = 0x0008
-	DNS_TYPE_MR      = 0x0009
-	DNS_TYPE_NULL    = 0x000a
-	DNS_TYPE_WKS     = 0x000b
-	DNS_TYPE_PTR     = 0x000c
-	DNS_TYPE_HINFO   = 0x000d
-	DNS_TYPE_MINFO   = 0x000e
-	DNS_TYPE_MX      = 0x000f
-	DNS_TYPE_TEXT    = 0x0010
-	DNS_TYPE_RP      = 0x0011
-	DNS_TYPE_AFSDB   = 0x0012
-	DNS_TYPE_X25     = 0x0013
-	DNS_TYPE_ISDN    = 0x0014
-	DNS_TYPE_RT      = 0x0015
-	DNS_TYPE_NSAP    = 0x0016
-	DNS_TYPE_NSAPPTR = 0x0017
-	DNS_TYPE_SIG     = 0x0018
-	DNS_TYPE_KEY     = 0x0019
-	DNS_TYPE_PX      = 0x001a
-	DNS_TYPE_GPOS    = 0x001b
-	DNS_TYPE_AAAA    = 0x001c
-	DNS_TYPE_LOC     = 0x001d
-	DNS_TYPE_NXT     = 0x001e
-	DNS_TYPE_EID     = 0x001f
-	DNS_TYPE_NIMLOC  = 0x0020
-	DNS_TYPE_SRV     = 0x0021
-	DNS_TYPE_ATMA    = 0x0022
-	DNS_TYPE_NAPTR   = 0x0023
-	DNS_TYPE_KX      = 0x0024
-	DNS_TYPE_CERT    = 0x0025
-	DNS_TYPE_A6      = 0x0026
-	DNS_TYPE_DNAME   = 0x0027
-	DNS_TYPE_SINK    = 0x0028
-	DNS_TYPE_OPT     = 0x0029
-	DNS_TYPE_DS      = 0x002B
-	DNS_TYPE_RRSIG   = 0x002E
-	DNS_TYPE_NSEC    = 0x002F
-	DNS_TYPE_DNSKEY  = 0x0030
-	DNS_TYPE_DHCID   = 0x0031
-	DNS_TYPE_UINFO   = 0x0064
-	DNS_TYPE_UID     = 0x0065
-	DNS_TYPE_GID     = 0x0066
-	DNS_TYPE_UNSPEC  = 0x0067
-	DNS_TYPE_ADDRS   = 0x00f8
-	DNS_TYPE_TKEY    = 0x00f9
-	DNS_TYPE_TSIG    = 0x00fa
-	DNS_TYPE_IXFR    = 0x00fb
-	DNS_TYPE_AXFR    = 0x00fc
-	DNS_TYPE_MAILB   = 0x00fd
-	DNS_TYPE_MAILA   = 0x00fe
-	DNS_TYPE_ALL     = 0x00ff
-	DNS_TYPE_ANY     = 0x00ff
-	DNS_TYPE_WINS    = 0xff01
-	DNS_TYPE_WINSR   = 0xff02
-	DNS_TYPE_NBSTAT  = 0xff01
-)
-
-const (
-	DNS_INFO_NO_RECORDS = 0x251D
-)
-
-const (
-	// flags inside DNSRecord.Dw
-	DnsSectionQuestion   = 0x0000
-	DnsSectionAnswer     = 0x0001
-	DnsSectionAuthority  = 0x0002
-	DnsSectionAdditional = 0x0003
-)
-
-type DNSSRVData struct {
-	Target   *uint16
-	Priority uint16
-	Weight   uint16
-	Port     uint16
-	Pad      uint16
-}
-
-type DNSPTRData struct {
-	Host *uint16
-}
-
-type DNSMXData struct {
-	NameExchange *uint16
-	Preference   uint16
-	Pad          uint16
-}
-
-type DNSTXTData struct {
-	StringCount uint16
-	StringArray [1]*uint16
-}
-
-type DNSRecord struct {
-	Next     *DNSRecord
-	Name     *uint16
-	Type     uint16
-	Length   uint16
-	Dw       uint32
-	Ttl      uint32
-	Reserved uint32
-	Data     [40]byte
-}
-
-const (
-	TF_DISCONNECT         = 1
-	TF_REUSE_SOCKET       = 2
-	TF_WRITE_BEHIND       = 4
-	TF_USE_DEFAULT_WORKER = 0
-	TF_USE_SYSTEM_THREAD  = 16
-	TF_USE_KERNEL_APC     = 32
-)
-
-type TransmitFileBuffers struct {
-	Head       uintptr
-	HeadLength uint32
-	Tail       uintptr
-	TailLength uint32
-}
-
-const (
-	IFF_UP           = 1
-	IFF_BROADCAST    = 2
-	IFF_LOOPBACK     = 4
-	IFF_POINTTOPOINT = 8
-	IFF_MULTICAST    = 16
-)
-
-const SIO_GET_INTERFACE_LIST = 0x4004747F
-
-// TODO(mattn): SockaddrGen is union of sockaddr/sockaddr_in/sockaddr_in6_old.
-// will be fixed to change variable type as suitable.
-
-type SockaddrGen [24]byte
-
-type InterfaceInfo struct {
-	Flags            uint32
-	Address          SockaddrGen
-	BroadcastAddress SockaddrGen
-	Netmask          SockaddrGen
-}
-
-type IpAddressString struct {
-	String [16]byte
-}
-
-type IpMaskString IpAddressString
-
-type IpAddrString struct {
-	Next      *IpAddrString
-	IpAddress IpAddressString
-	IpMask    IpMaskString
-	Context   uint32
-}
-
-const MAX_ADAPTER_NAME_LENGTH = 256
-const MAX_ADAPTER_DESCRIPTION_LENGTH = 128
-const MAX_ADAPTER_ADDRESS_LENGTH = 8
-
-type IpAdapterInfo struct {
-	Next                *IpAdapterInfo
-	ComboIndex          uint32
-	AdapterName         [MAX_ADAPTER_NAME_LENGTH + 4]byte
-	Description         [MAX_ADAPTER_DESCRIPTION_LENGTH + 4]byte
-	AddressLength       uint32
-	Address             [MAX_ADAPTER_ADDRESS_LENGTH]byte
-	Index               uint32
-	Type                uint32
-	DhcpEnabled         uint32
-	CurrentIpAddress    *IpAddrString
-	IpAddressList       IpAddrString
-	GatewayList         IpAddrString
-	DhcpServer          IpAddrString
-	HaveWins            bool
-	PrimaryWinsServer   IpAddrString
-	SecondaryWinsServer IpAddrString
-	LeaseObtained       int64
-	LeaseExpires        int64
-}
-
-const MAXLEN_PHYSADDR = 8
-const MAX_INTERFACE_NAME_LEN = 256
-const MAXLEN_IFDESCR = 256
-
-type MibIfRow struct {
-	Name            [MAX_INTERFACE_NAME_LEN]uint16
-	Index           uint32
-	Type            uint32
-	Mtu             uint32
-	Speed           uint32
-	PhysAddrLen     uint32
-	PhysAddr        [MAXLEN_PHYSADDR]byte
-	AdminStatus     uint32
-	OperStatus      uint32
-	LastChange      uint32
-	InOctets        uint32
-	InUcastPkts     uint32
-	InNUcastPkts    uint32
-	InDiscards      uint32
-	InErrors        uint32
-	InUnknownProtos uint32
-	OutOctets       uint32
-	OutUcastPkts    uint32
-	OutNUcastPkts   uint32
-	OutDiscards     uint32
-	OutErrors       uint32
-	OutQLen         uint32
-	DescrLen        uint32
-	Descr           [MAXLEN_IFDESCR]byte
-}
-
-type CertContext struct {
-	EncodingType uint32
-	EncodedCert  *byte
-	Length       uint32
-	CertInfo     uintptr
-	Store        Handle
-}
-
-type CertChainContext struct {
-	Size                       uint32
-	TrustStatus                CertTrustStatus
-	ChainCount                 uint32
-	Chains                     **CertSimpleChain
-	LowerQualityChainCount     uint32
-	LowerQualityChains         **CertChainContext
-	HasRevocationFreshnessTime uint32
-	RevocationFreshnessTime    uint32
-}
-
-type CertSimpleChain struct {
-	Size                       uint32
-	TrustStatus                CertTrustStatus
-	NumElements                uint32
-	Elements                   **CertChainElement
-	TrustListInfo              uintptr
-	HasRevocationFreshnessTime uint32
-	RevocationFreshnessTime    uint32
-}
-
-type CertChainElement struct {
-	Size              uint32
-	CertContext       *CertContext
-	TrustStatus       CertTrustStatus
-	RevocationInfo    *CertRevocationInfo
-	IssuanceUsage     *CertEnhKeyUsage
-	ApplicationUsage  *CertEnhKeyUsage
-	ExtendedErrorInfo *uint16
-}
-
-type CertRevocationInfo struct {
-	Size             uint32
-	RevocationResult uint32
-	RevocationOid    *byte
-	OidSpecificInfo  uintptr
-	HasFreshnessTime uint32
-	FreshnessTime    uint32
-	CrlInfo          uintptr // *CertRevocationCrlInfo
-}
-
-type CertTrustStatus struct {
-	ErrorStatus uint32
-	InfoStatus  uint32
-}
-
-type CertUsageMatch struct {
-	Type  uint32
-	Usage CertEnhKeyUsage
-}
-
-type CertEnhKeyUsage struct {
-	Length           uint32
-	UsageIdentifiers **byte
-}
-
-type CertChainPara struct {
-	Size                         uint32
-	RequestedUsage               CertUsageMatch
-	RequstedIssuancePolicy       CertUsageMatch
-	URLRetrievalTimeout          uint32
-	CheckRevocationFreshnessTime uint32
-	RevocationFreshnessTime      uint32
-	CacheResync                  *Filetime
-}
-
-type CertChainPolicyPara struct {
-	Size            uint32
-	Flags           uint32
-	ExtraPolicyPara uintptr
-}
-
-type SSLExtraCertChainPolicyPara struct {
-	Size       uint32
-	AuthType   uint32
-	Checks     uint32
-	ServerName *uint16
-}
-
-type CertChainPolicyStatus struct {
-	Size              uint32
-	Error             uint32
-	ChainIndex        uint32
-	ElementIndex      uint32
-	ExtraPolicyStatus uintptr
-}
-
-const (
-	// do not reorder
-	HKEY_CLASSES_ROOT = 0x80000000 + iota
-	HKEY_CURRENT_USER
-	HKEY_LOCAL_MACHINE
-	HKEY_USERS
-	HKEY_PERFORMANCE_DATA
-	HKEY_CURRENT_CONFIG
-	HKEY_DYN_DATA
-
-	KEY_QUERY_VALUE        = 1
-	KEY_SET_VALUE          = 2
-	KEY_CREATE_SUB_KEY     = 4
-	KEY_ENUMERATE_SUB_KEYS = 8
-	KEY_NOTIFY             = 16
-	KEY_CREATE_LINK        = 32
-	KEY_WRITE              = 0x20006
-	KEY_EXECUTE            = 0x20019
-	KEY_READ               = 0x20019
-	KEY_WOW64_64KEY        = 0x0100
-	KEY_WOW64_32KEY        = 0x0200
-	KEY_ALL_ACCESS         = 0xf003f
-)
-
-const (
-	// do not reorder
-	REG_NONE = iota
-	REG_SZ
-	REG_EXPAND_SZ
-	REG_BINARY
-	REG_DWORD_LITTLE_ENDIAN
-	REG_DWORD_BIG_ENDIAN
-	REG_LINK
-	REG_MULTI_SZ
-	REG_RESOURCE_LIST
-	REG_FULL_RESOURCE_DESCRIPTOR
-	REG_RESOURCE_REQUIREMENTS_LIST
-	REG_QWORD_LITTLE_ENDIAN
-	REG_DWORD = REG_DWORD_LITTLE_ENDIAN
-	REG_QWORD = REG_QWORD_LITTLE_ENDIAN
-)
-
-type AddrinfoW struct {
-	Flags     int32
-	Family    int32
-	Socktype  int32
-	Protocol  int32
-	Addrlen   uintptr
-	Canonname *uint16
-	Addr      uintptr
-	Next      *AddrinfoW
-}
-
-const (
-	AI_PASSIVE     = 1
-	AI_CANONNAME   = 2
-	AI_NUMERICHOST = 4
-)
-
-type GUID struct {
-	Data1 uint32
-	Data2 uint16
-	Data3 uint16
-	Data4 [8]byte
-}
-
-var WSAID_CONNECTEX = GUID{
-	0x25a207b9,
-	0xddf3,
-	0x4660,
-	[8]byte{0x8e, 0xe9, 0x76, 0xe5, 0x8c, 0x74, 0x06, 0x3e},
-}
-
-const (
-	FILE_SKIP_COMPLETION_PORT_ON_SUCCESS = 1
-	FILE_SKIP_SET_EVENT_ON_HANDLE        = 2
-)
-
-const (
-	WSAPROTOCOL_LEN    = 255
-	MAX_PROTOCOL_CHAIN = 7
-	BASE_PROTOCOL      = 1
-	LAYERED_PROTOCOL   = 0
-
-	XP1_CONNECTIONLESS           = 0x00000001
-	XP1_GUARANTEED_DELIVERY      = 0x00000002
-	XP1_GUARANTEED_ORDER         = 0x00000004
-	XP1_MESSAGE_ORIENTED         = 0x00000008
-	XP1_PSEUDO_STREAM            = 0x00000010
-	XP1_GRACEFUL_CLOSE           = 0x00000020
-	XP1_EXPEDITED_DATA           = 0x00000040
-	XP1_CONNECT_DATA             = 0x00000080
-	XP1_DISCONNECT_DATA          = 0x00000100
-	XP1_SUPPORT_BROADCAST        = 0x00000200
-	XP1_SUPPORT_MULTIPOINT       = 0x00000400
-	XP1_MULTIPOINT_CONTROL_PLANE = 0x00000800
-	XP1_MULTIPOINT_DATA_PLANE    = 0x00001000
-	XP1_QOS_SUPPORTED            = 0x00002000
-	XP1_UNI_SEND                 = 0x00008000
-	XP1_UNI_RECV                 = 0x00010000
-	XP1_IFS_HANDLES              = 0x00020000
-	XP1_PARTIAL_MESSAGE          = 0x00040000
-	XP1_SAN_SUPPORT_SDP          = 0x00080000
-
-	PFL_MULTIPLE_PROTO_ENTRIES  = 0x00000001
-	PFL_RECOMMENDED_PROTO_ENTRY = 0x00000002
-	PFL_HIDDEN                  = 0x00000004
-	PFL_MATCHES_PROTOCOL_ZERO   = 0x00000008
-	PFL_NETWORKDIRECT_PROVIDER  = 0x00000010
-)
-
-type WSAProtocolInfo struct {
-	ServiceFlags1     uint32
-	ServiceFlags2     uint32
-	ServiceFlags3     uint32
-	ServiceFlags4     uint32
-	ProviderFlags     uint32
-	ProviderId        GUID
-	CatalogEntryId    uint32
-	ProtocolChain     WSAProtocolChain
-	Version           int32
-	AddressFamily     int32
-	MaxSockAddr       int32
-	MinSockAddr       int32
-	SocketType        int32
-	Protocol          int32
-	ProtocolMaxOffset int32
-	NetworkByteOrder  int32
-	SecurityScheme    int32
-	MessageSize       uint32
-	ProviderReserved  uint32
-	ProtocolName      [WSAPROTOCOL_LEN + 1]uint16
-}
-
-type WSAProtocolChain struct {
-	ChainLen     int32
-	ChainEntries [MAX_PROTOCOL_CHAIN]uint32
-}
-
-type TCPKeepalive struct {
-	OnOff    uint32
-	Time     uint32
-	Interval uint32
-}
-
-type symbolicLinkReparseBuffer struct {
-	SubstituteNameOffset uint16
-	SubstituteNameLength uint16
-	PrintNameOffset      uint16
-	PrintNameLength      uint16
-	Flags                uint32
-	PathBuffer           [1]uint16
-}
-
-type mountPointReparseBuffer struct {
-	SubstituteNameOffset uint16
-	SubstituteNameLength uint16
-	PrintNameOffset      uint16
-	PrintNameLength      uint16
-	PathBuffer           [1]uint16
-}
-
-type reparseDataBuffer struct {
-	ReparseTag        uint32
-	ReparseDataLength uint16
-	Reserved          uint16
-
-	// GenericReparseBuffer
-	reparseBuffer byte
-}
-
-const (
-	FSCTL_GET_REPARSE_POINT          = 0x900A8
-	MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16 * 1024
-	IO_REPARSE_TAG_MOUNT_POINT       = 0xA0000003
-	IO_REPARSE_TAG_SYMLINK           = 0xA000000C
-	SYMBOLIC_LINK_FLAG_DIRECTORY     = 0x1
-)
-
-const (
-	ComputerNameNetBIOS                   = 0
-	ComputerNameDnsHostname               = 1
-	ComputerNameDnsDomain                 = 2
-	ComputerNameDnsFullyQualified         = 3
-	ComputerNamePhysicalNetBIOS           = 4
-	ComputerNamePhysicalDnsHostname       = 5
-	ComputerNamePhysicalDnsDomain         = 6
-	ComputerNamePhysicalDnsFullyQualified = 7
-	ComputerNameMax                       = 8
-)
-
-const (
-	MOVEFILE_REPLACE_EXISTING      = 0x1
-	MOVEFILE_COPY_ALLOWED          = 0x2
-	MOVEFILE_DELAY_UNTIL_REBOOT    = 0x4
-	MOVEFILE_WRITE_THROUGH         = 0x8
-	MOVEFILE_CREATE_HARDLINK       = 0x10
-	MOVEFILE_FAIL_IF_NOT_TRACKABLE = 0x20
-)
-
-const GAA_FLAG_INCLUDE_PREFIX = 0x00000010
-
-const (
-	IF_TYPE_OTHER              = 1
-	IF_TYPE_ETHERNET_CSMACD    = 6
-	IF_TYPE_ISO88025_TOKENRING = 9
-	IF_TYPE_PPP                = 23
-	IF_TYPE_SOFTWARE_LOOPBACK  = 24
-	IF_TYPE_ATM                = 37
-	IF_TYPE_IEEE80211          = 71
-	IF_TYPE_TUNNEL             = 131
-	IF_TYPE_IEEE1394           = 144
-)
-
-type SocketAddress struct {
-	Sockaddr       *syscall.RawSockaddrAny
-	SockaddrLength int32
-}
-
-type IpAdapterUnicastAddress struct {
-	Length             uint32
-	Flags              uint32
-	Next               *IpAdapterUnicastAddress
-	Address            SocketAddress
-	PrefixOrigin       int32
-	SuffixOrigin       int32
-	DadState           int32
-	ValidLifetime      uint32
-	PreferredLifetime  uint32
-	LeaseLifetime      uint32
-	OnLinkPrefixLength uint8
-}
-
-type IpAdapterAnycastAddress struct {
-	Length  uint32
-	Flags   uint32
-	Next    *IpAdapterAnycastAddress
-	Address SocketAddress
-}
-
-type IpAdapterMulticastAddress struct {
-	Length  uint32
-	Flags   uint32
-	Next    *IpAdapterMulticastAddress
-	Address SocketAddress
-}
-
-type IpAdapterDnsServerAdapter struct {
-	Length   uint32
-	Reserved uint32
-	Next     *IpAdapterDnsServerAdapter
-	Address  SocketAddress
-}
-
-type IpAdapterPrefix struct {
-	Length       uint32
-	Flags        uint32
-	Next         *IpAdapterPrefix
-	Address      SocketAddress
-	PrefixLength uint32
-}
-
-type IpAdapterAddresses struct {
-	Length                uint32
-	IfIndex               uint32
-	Next                  *IpAdapterAddresses
-	AdapterName           *byte
-	FirstUnicastAddress   *IpAdapterUnicastAddress
-	FirstAnycastAddress   *IpAdapterAnycastAddress
-	FirstMulticastAddress *IpAdapterMulticastAddress
-	FirstDnsServerAddress *IpAdapterDnsServerAdapter
-	DnsSuffix             *uint16
-	Description           *uint16
-	FriendlyName          *uint16
-	PhysicalAddress       [syscall.MAX_ADAPTER_ADDRESS_LENGTH]byte
-	PhysicalAddressLength uint32
-	Flags                 uint32
-	Mtu                   uint32
-	IfType                uint32
-	OperStatus            uint32
-	Ipv6IfIndex           uint32
-	ZoneIndices           [16]uint32
-	FirstPrefix           *IpAdapterPrefix
-	/* more fields might be present here. */
-}
-
-const (
-	IfOperStatusUp             = 1
-	IfOperStatusDown           = 2
-	IfOperStatusTesting        = 3
-	IfOperStatusUnknown        = 4
-	IfOperStatusDormant        = 5
-	IfOperStatusNotPresent     = 6
-	IfOperStatusLowerLayerDown = 7
-)
diff --git a/installer/vendor/golang.org/x/sys/windows/ztypes_windows_386.go b/installer/vendor/golang.org/x/sys/windows/ztypes_windows_386.go
deleted file mode 100644
index 10f33be0b7..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/ztypes_windows_386.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-type WSAData struct {
-	Version      uint16
-	HighVersion  uint16
-	Description  [WSADESCRIPTION_LEN + 1]byte
-	SystemStatus [WSASYS_STATUS_LEN + 1]byte
-	MaxSockets   uint16
-	MaxUdpDg     uint16
-	VendorInfo   *byte
-}
-
-type Servent struct {
-	Name    *byte
-	Aliases **byte
-	Port    uint16
-	Proto   *byte
-}
diff --git a/installer/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go b/installer/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
deleted file mode 100644
index 3f272c2499..0000000000
--- a/installer/vendor/golang.org/x/sys/windows/ztypes_windows_amd64.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2011 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package windows
-
-type WSAData struct {
-	Version      uint16
-	HighVersion  uint16
-	MaxSockets   uint16
-	MaxUdpDg     uint16
-	VendorInfo   *byte
-	Description  [WSADESCRIPTION_LEN + 1]byte
-	SystemStatus [WSASYS_STATUS_LEN + 1]byte
-}
-
-type Servent struct {
-	Name    *byte
-	Aliases **byte
-	Proto   *byte
-	Port    uint16
-}
diff --git a/installer/vendor/golang.org/x/time/CONTRIBUTING.md b/installer/vendor/golang.org/x/time/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/time/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/time/README.md b/installer/vendor/golang.org/x/time/README.md
deleted file mode 100644
index ce9becdded..0000000000
--- a/installer/vendor/golang.org/x/time/README.md
+++ /dev/null
@@ -1,17 +0,0 @@
-# Go Time
-
-This repository provides supplementary Go time packages.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/time`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/time`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the time repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/time:" in the
-subject line, so it is easy to find.
diff --git a/installer/vendor/golang.org/x/time/rate/rate.go b/installer/vendor/golang.org/x/time/rate/rate.go
index eabcd11474..7228d97e96 100644
--- a/installer/vendor/golang.org/x/time/rate/rate.go
+++ b/installer/vendor/golang.org/x/time/rate/rate.go
@@ -253,8 +253,12 @@ func (lim *Limiter) waitN(ctx contextContext, n int) (err error) {
 	if !r.ok {
 		return fmt.Errorf("rate: Wait(n=%d) would exceed context deadline", n)
 	}
-	// Wait
-	t := time.NewTimer(r.DelayFrom(now))
+	// Wait if necessary
+	delay := r.DelayFrom(now)
+	if delay == 0 {
+		return nil
+	}
+	t := time.NewTimer(delay)
 	defer t.Stop()
 	select {
 	case <-t.C:
diff --git a/installer/vendor/golang.org/x/time/rate/rate_test.go b/installer/vendor/golang.org/x/time/rate/rate_test.go
deleted file mode 100644
index e8add694fd..0000000000
--- a/installer/vendor/golang.org/x/time/rate/rate_test.go
+++ /dev/null
@@ -1,449 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package rate
-
-import (
-	"context"
-	"math"
-	"runtime"
-	"sync"
-	"sync/atomic"
-	"testing"
-	"time"
-)
-
-func TestLimit(t *testing.T) {
-	if Limit(10) == Inf {
-		t.Errorf("Limit(10) == Inf should be false")
-	}
-}
-
-func closeEnough(a, b Limit) bool {
-	return (math.Abs(float64(a)/float64(b)) - 1.0) < 1e-9
-}
-
-func TestEvery(t *testing.T) {
-	cases := []struct {
-		interval time.Duration
-		lim      Limit
-	}{
-		{0, Inf},
-		{-1, Inf},
-		{1 * time.Nanosecond, Limit(1e9)},
-		{1 * time.Microsecond, Limit(1e6)},
-		{1 * time.Millisecond, Limit(1e3)},
-		{10 * time.Millisecond, Limit(100)},
-		{100 * time.Millisecond, Limit(10)},
-		{1 * time.Second, Limit(1)},
-		{2 * time.Second, Limit(0.5)},
-		{time.Duration(2.5 * float64(time.Second)), Limit(0.4)},
-		{4 * time.Second, Limit(0.25)},
-		{10 * time.Second, Limit(0.1)},
-		{time.Duration(math.MaxInt64), Limit(1e9 / float64(math.MaxInt64))},
-	}
-	for _, tc := range cases {
-		lim := Every(tc.interval)
-		if !closeEnough(lim, tc.lim) {
-			t.Errorf("Every(%v) = %v want %v", tc.interval, lim, tc.lim)
-		}
-	}
-}
-
-const (
-	d = 100 * time.Millisecond
-)
-
-var (
-	t0 = time.Now()
-	t1 = t0.Add(time.Duration(1) * d)
-	t2 = t0.Add(time.Duration(2) * d)
-	t3 = t0.Add(time.Duration(3) * d)
-	t4 = t0.Add(time.Duration(4) * d)
-	t5 = t0.Add(time.Duration(5) * d)
-	t9 = t0.Add(time.Duration(9) * d)
-)
-
-type allow struct {
-	t  time.Time
-	n  int
-	ok bool
-}
-
-func run(t *testing.T, lim *Limiter, allows []allow) {
-	for i, allow := range allows {
-		ok := lim.AllowN(allow.t, allow.n)
-		if ok != allow.ok {
-			t.Errorf("step %d: lim.AllowN(%v, %v) = %v want %v",
-				i, allow.t, allow.n, ok, allow.ok)
-		}
-	}
-}
-
-func TestLimiterBurst1(t *testing.T) {
-	run(t, NewLimiter(10, 1), []allow{
-		{t0, 1, true},
-		{t0, 1, false},
-		{t0, 1, false},
-		{t1, 1, true},
-		{t1, 1, false},
-		{t1, 1, false},
-		{t2, 2, false}, // burst size is 1, so n=2 always fails
-		{t2, 1, true},
-		{t2, 1, false},
-	})
-}
-
-func TestLimiterBurst3(t *testing.T) {
-	run(t, NewLimiter(10, 3), []allow{
-		{t0, 2, true},
-		{t0, 2, false},
-		{t0, 1, true},
-		{t0, 1, false},
-		{t1, 4, false},
-		{t2, 1, true},
-		{t3, 1, true},
-		{t4, 1, true},
-		{t4, 1, true},
-		{t4, 1, false},
-		{t4, 1, false},
-		{t9, 3, true},
-		{t9, 0, true},
-	})
-}
-
-func TestLimiterJumpBackwards(t *testing.T) {
-	run(t, NewLimiter(10, 3), []allow{
-		{t1, 1, true}, // start at t1
-		{t0, 1, true}, // jump back to t0, two tokens remain
-		{t0, 1, true},
-		{t0, 1, false},
-		{t0, 1, false},
-		{t1, 1, true}, // got a token
-		{t1, 1, false},
-		{t1, 1, false},
-		{t2, 1, true}, // got another token
-		{t2, 1, false},
-		{t2, 1, false},
-	})
-}
-
-func TestSimultaneousRequests(t *testing.T) {
-	const (
-		limit       = 1
-		burst       = 5
-		numRequests = 15
-	)
-	var (
-		wg    sync.WaitGroup
-		numOK = uint32(0)
-	)
-
-	// Very slow replenishing bucket.
-	lim := NewLimiter(limit, burst)
-
-	// Tries to take a token, atomically updates the counter and decreases the wait
-	// group counter.
-	f := func() {
-		defer wg.Done()
-		if ok := lim.Allow(); ok {
-			atomic.AddUint32(&numOK, 1)
-		}
-	}
-
-	wg.Add(numRequests)
-	for i := 0; i < numRequests; i++ {
-		go f()
-	}
-	wg.Wait()
-	if numOK != burst {
-		t.Errorf("numOK = %d, want %d", numOK, burst)
-	}
-}
-
-func TestLongRunningQPS(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode")
-	}
-	if runtime.GOOS == "openbsd" {
-		t.Skip("low resolution time.Sleep invalidates test (golang.org/issue/14183)")
-		return
-	}
-
-	// The test runs for a few seconds executing many requests and then checks
-	// that overall number of requests is reasonable.
-	const (
-		limit = 100
-		burst = 100
-	)
-	var numOK = int32(0)
-
-	lim := NewLimiter(limit, burst)
-
-	var wg sync.WaitGroup
-	f := func() {
-		if ok := lim.Allow(); ok {
-			atomic.AddInt32(&numOK, 1)
-		}
-		wg.Done()
-	}
-
-	start := time.Now()
-	end := start.Add(5 * time.Second)
-	for time.Now().Before(end) {
-		wg.Add(1)
-		go f()
-
-		// This will still offer ~500 requests per second, but won't consume
-		// outrageous amount of CPU.
-		time.Sleep(2 * time.Millisecond)
-	}
-	wg.Wait()
-	elapsed := time.Since(start)
-	ideal := burst + (limit * float64(elapsed) / float64(time.Second))
-
-	// We should never get more requests than allowed.
-	if want := int32(ideal + 1); numOK > want {
-		t.Errorf("numOK = %d, want %d (ideal %f)", numOK, want, ideal)
-	}
-	// We should get very close to the number of requests allowed.
-	if want := int32(0.999 * ideal); numOK < want {
-		t.Errorf("numOK = %d, want %d (ideal %f)", numOK, want, ideal)
-	}
-}
-
-type request struct {
-	t   time.Time
-	n   int
-	act time.Time
-	ok  bool
-}
-
-// dFromDuration converts a duration to a multiple of the global constant d
-func dFromDuration(dur time.Duration) int {
-	// Adding a millisecond to be swallowed by the integer division
-	// because we don't care about small inaccuracies
-	return int((dur + time.Millisecond) / d)
-}
-
-// dSince returns multiples of d since t0
-func dSince(t time.Time) int {
-	return dFromDuration(t.Sub(t0))
-}
-
-func runReserve(t *testing.T, lim *Limiter, req request) *Reservation {
-	return runReserveMax(t, lim, req, InfDuration)
-}
-
-func runReserveMax(t *testing.T, lim *Limiter, req request, maxReserve time.Duration) *Reservation {
-	r := lim.reserveN(req.t, req.n, maxReserve)
-	if r.ok && (dSince(r.timeToAct) != dSince(req.act)) || r.ok != req.ok {
-		t.Errorf("lim.reserveN(t%d, %v, %v) = (t%d, %v) want (t%d, %v)",
-			dSince(req.t), req.n, maxReserve, dSince(r.timeToAct), r.ok, dSince(req.act), req.ok)
-	}
-	return &r
-}
-
-func TestSimpleReserve(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	runReserve(t, lim, request{t0, 2, t2, true})
-	runReserve(t, lim, request{t3, 2, t4, true})
-}
-
-func TestMix(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 3, t1, false}) // should return false because n > Burst
-	runReserve(t, lim, request{t0, 2, t0, true})
-	run(t, lim, []allow{{t1, 2, false}}) // not enought tokens - don't allow
-	runReserve(t, lim, request{t1, 2, t2, true})
-	run(t, lim, []allow{{t1, 1, false}}) // negative tokens - don't allow
-	run(t, lim, []allow{{t3, 1, true}})
-}
-
-func TestCancelInvalid(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 3, t3, false})
-	r.CancelAt(t0)                               // should have no effect
-	runReserve(t, lim, request{t0, 2, t2, true}) // did not get extra tokens
-}
-
-func TestCancelLast(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 2, t2, true})
-	r.CancelAt(t1) // got 2 tokens back
-	runReserve(t, lim, request{t1, 2, t2, true})
-}
-
-func TestCancelTooLate(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 2, t2, true})
-	r.CancelAt(t3) // too late to cancel - should have no effect
-	runReserve(t, lim, request{t3, 2, t4, true})
-}
-
-func TestCancel0Tokens(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 1, t1, true})
-	runReserve(t, lim, request{t0, 1, t2, true})
-	r.CancelAt(t0) // got 0 tokens back
-	runReserve(t, lim, request{t0, 1, t3, true})
-}
-
-func TestCancel1Token(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 2, t2, true})
-	runReserve(t, lim, request{t0, 1, t3, true})
-	r.CancelAt(t2) // got 1 token back
-	runReserve(t, lim, request{t2, 2, t4, true})
-}
-
-func TestCancelMulti(t *testing.T) {
-	lim := NewLimiter(10, 4)
-
-	runReserve(t, lim, request{t0, 4, t0, true})
-	rA := runReserve(t, lim, request{t0, 3, t3, true})
-	runReserve(t, lim, request{t0, 1, t4, true})
-	rC := runReserve(t, lim, request{t0, 1, t5, true})
-	rC.CancelAt(t1) // get 1 token back
-	rA.CancelAt(t1) // get 2 tokens back, as if C was never reserved
-	runReserve(t, lim, request{t1, 3, t5, true})
-}
-
-func TestReserveJumpBack(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t1, 2, t1, true}) // start at t1
-	runReserve(t, lim, request{t0, 1, t1, true}) // should violate Limit,Burst
-	runReserve(t, lim, request{t2, 2, t3, true})
-}
-
-func TestReserveJumpBackCancel(t *testing.T) {
-	lim := NewLimiter(10, 2)
-
-	runReserve(t, lim, request{t1, 2, t1, true}) // start at t1
-	r := runReserve(t, lim, request{t1, 2, t3, true})
-	runReserve(t, lim, request{t1, 1, t4, true})
-	r.CancelAt(t0)                               // cancel at t0, get 1 token back
-	runReserve(t, lim, request{t1, 2, t4, true}) // should violate Limit,Burst
-}
-
-func TestReserveSetLimit(t *testing.T) {
-	lim := NewLimiter(5, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	runReserve(t, lim, request{t0, 2, t4, true})
-	lim.SetLimitAt(t2, 10)
-	runReserve(t, lim, request{t2, 1, t4, true}) // violates Limit and Burst
-}
-
-func TestReserveSetLimitCancel(t *testing.T) {
-	lim := NewLimiter(5, 2)
-
-	runReserve(t, lim, request{t0, 2, t0, true})
-	r := runReserve(t, lim, request{t0, 2, t4, true})
-	lim.SetLimitAt(t2, 10)
-	r.CancelAt(t2) // 2 tokens back
-	runReserve(t, lim, request{t2, 2, t3, true})
-}
-
-func TestReserveMax(t *testing.T) {
-	lim := NewLimiter(10, 2)
-	maxT := d
-
-	runReserveMax(t, lim, request{t0, 2, t0, true}, maxT)
-	runReserveMax(t, lim, request{t0, 1, t1, true}, maxT)  // reserve for close future
-	runReserveMax(t, lim, request{t0, 1, t2, false}, maxT) // time to act too far in the future
-}
-
-type wait struct {
-	name   string
-	ctx    context.Context
-	n      int
-	delay  int // in multiples of d
-	nilErr bool
-}
-
-func runWait(t *testing.T, lim *Limiter, w wait) {
-	start := time.Now()
-	err := lim.WaitN(w.ctx, w.n)
-	delay := time.Now().Sub(start)
-	if (w.nilErr && err != nil) || (!w.nilErr && err == nil) || w.delay != dFromDuration(delay) {
-		errString := "<nil>"
-		if !w.nilErr {
-			errString = "<non-nil error>"
-		}
-		t.Errorf("lim.WaitN(%v, lim, %v) = %v with delay %v ; want %v with delay %v",
-			w.name, w.n, err, delay, errString, d*time.Duration(w.delay))
-	}
-}
-
-func TestWaitSimple(t *testing.T) {
-	lim := NewLimiter(10, 3)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	cancel()
-	runWait(t, lim, wait{"already-cancelled", ctx, 1, 0, false})
-
-	runWait(t, lim, wait{"exceed-burst-error", context.Background(), 4, 0, false})
-
-	runWait(t, lim, wait{"act-now", context.Background(), 2, 0, true})
-	runWait(t, lim, wait{"act-later", context.Background(), 3, 2, true})
-}
-
-func TestWaitCancel(t *testing.T) {
-	lim := NewLimiter(10, 3)
-
-	ctx, cancel := context.WithCancel(context.Background())
-	runWait(t, lim, wait{"act-now", ctx, 2, 0, true}) // after this lim.tokens = 1
-	go func() {
-		time.Sleep(d)
-		cancel()
-	}()
-	runWait(t, lim, wait{"will-cancel", ctx, 3, 1, false})
-	// should get 3 tokens back, and have lim.tokens = 2
-	t.Logf("tokens:%v last:%v lastEvent:%v", lim.tokens, lim.last, lim.lastEvent)
-	runWait(t, lim, wait{"act-now-after-cancel", context.Background(), 2, 0, true})
-}
-
-func TestWaitTimeout(t *testing.T) {
-	lim := NewLimiter(10, 3)
-
-	ctx, cancel := context.WithTimeout(context.Background(), d)
-	defer cancel()
-	runWait(t, lim, wait{"act-now", ctx, 2, 0, true})
-	runWait(t, lim, wait{"w-timeout-err", ctx, 3, 0, false})
-}
-
-func TestWaitInf(t *testing.T) {
-	lim := NewLimiter(Inf, 0)
-
-	runWait(t, lim, wait{"exceed-burst-no-error", context.Background(), 3, 0, true})
-}
-
-func BenchmarkAllowN(b *testing.B) {
-	lim := NewLimiter(Every(1*time.Second), 1)
-	now := time.Now()
-	b.ReportAllocs()
-	b.ResetTimer()
-	b.RunParallel(func(pb *testing.PB) {
-		for pb.Next() {
-			lim.AllowN(now, 1)
-		}
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/.gitattributes b/installer/vendor/golang.org/x/tools/.gitattributes
deleted file mode 100644
index d2f212e5da..0000000000
--- a/installer/vendor/golang.org/x/tools/.gitattributes
+++ /dev/null
@@ -1,10 +0,0 @@
-# Treat all files in this repo as binary, with no git magic updating
-# line endings. Windows users contributing to Go will need to use a
-# modern version of git and editors capable of LF line endings.
-#
-# We'll prevent accidental CRLF line endings from entering the repo
-# via the git-review gofmt checks.
-#
-# See golang.org/issue/9281
-
-* -text
diff --git a/installer/vendor/golang.org/x/tools/.gitignore b/installer/vendor/golang.org/x/tools/.gitignore
deleted file mode 100644
index 5a9d62efd4..0000000000
--- a/installer/vendor/golang.org/x/tools/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add no patterns to .gitignore except for files generated by the build.
-last-change
diff --git a/installer/vendor/golang.org/x/tools/CONTRIBUTING.md b/installer/vendor/golang.org/x/tools/CONTRIBUTING.md
deleted file mode 100644
index 88dff59bc7..0000000000
--- a/installer/vendor/golang.org/x/tools/CONTRIBUTING.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Contributing to Go
-
-Go is an open source project.
-
-It is the work of hundreds of contributors. We appreciate your help!
-
-
-## Filing issues
-
-When [filing an issue](https://golang.org/issue/new), make sure to answer these five questions:
-
-1. What version of Go are you using (`go version`)?
-2. What operating system and processor architecture are you using?
-3. What did you do?
-4. What did you expect to see?
-5. What did you see instead?
-
-General questions should go to the [golang-nuts mailing list](https://groups.google.com/group/golang-nuts) instead of the issue tracker.
-The gophers there will answer or ask you to file an issue if you've tripped over a bug.
-
-## Contributing code
-
-Please read the [Contribution Guidelines](https://golang.org/doc/contribute.html)
-before sending patches.
-
-**We do not accept GitHub pull requests**
-(we use [Gerrit](https://code.google.com/p/gerrit/) instead for code review).
-
-Unless otherwise noted, the Go source files are distributed under
-the BSD-style license found in the LICENSE file.
-
diff --git a/installer/vendor/golang.org/x/tools/README.md b/installer/vendor/golang.org/x/tools/README.md
deleted file mode 100644
index 20be9e1abd..0000000000
--- a/installer/vendor/golang.org/x/tools/README.md
+++ /dev/null
@@ -1,27 +0,0 @@
-# Go Tools
-
-This subrepository holds the source for various packages and tools that support
-the Go programming language.
-
-Some of the tools, `godoc` and `vet` for example, are included in binary Go
-distributions.
-
-Others, including the Go `guru` and the test coverage tool, can be fetched with
-`go get`.
-
-Packages include a type-checker for Go and an implementation of the
-Static Single Assignment form (SSA) representation for Go programs.
-
-## Download/Install
-
-The easiest way to install is to run `go get -u golang.org/x/tools/...`. You can
-also manually git clone the repository to `$GOPATH/src/golang.org/x/tools`.
-
-## Report Issues / Send Patches
-
-This repository uses Gerrit for code changes. To learn how to submit changes to
-this repository, see https://golang.org/doc/contribute.html.
-
-The main issue tracker for the tools repository is located at
-https://github.com/golang/go/issues. Prefix your issue with "x/tools/(your
-subdir):" in the subject line, so it is easy to find.
diff --git a/installer/vendor/golang.org/x/tools/benchmark/parse/parse.go b/installer/vendor/golang.org/x/tools/benchmark/parse/parse.go
deleted file mode 100644
index b37e6f0f97..0000000000
--- a/installer/vendor/golang.org/x/tools/benchmark/parse/parse.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package parse provides support for parsing benchmark results as
-// generated by 'go test -bench'.
-package parse // import "golang.org/x/tools/benchmark/parse"
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"strconv"
-	"strings"
-)
-
-// Flags used by Benchmark.Measured to indicate
-// which measurements a Benchmark contains.
-const (
-	NsPerOp = 1 << iota
-	MBPerS
-	AllocedBytesPerOp
-	AllocsPerOp
-)
-
-// Benchmark is one run of a single benchmark.
-type Benchmark struct {
-	Name              string  // benchmark name
-	N                 int     // number of iterations
-	NsPerOp           float64 // nanoseconds per iteration
-	AllocedBytesPerOp uint64  // bytes allocated per iteration
-	AllocsPerOp       uint64  // allocs per iteration
-	MBPerS            float64 // MB processed per second
-	Measured          int     // which measurements were recorded
-	Ord               int     // ordinal position within a benchmark run
-}
-
-// ParseLine extracts a Benchmark from a single line of testing.B
-// output.
-func ParseLine(line string) (*Benchmark, error) {
-	fields := strings.Fields(line)
-
-	// Two required, positional fields: Name and iterations.
-	if len(fields) < 2 {
-		return nil, fmt.Errorf("two fields required, have %d", len(fields))
-	}
-	if !strings.HasPrefix(fields[0], "Benchmark") {
-		return nil, fmt.Errorf(`first field does not start with "Benchmark"`)
-	}
-	n, err := strconv.Atoi(fields[1])
-	if err != nil {
-		return nil, err
-	}
-	b := &Benchmark{Name: fields[0], N: n}
-
-	// Parse any remaining pairs of fields; we've parsed one pair already.
-	for i := 1; i < len(fields)/2; i++ {
-		b.parseMeasurement(fields[i*2], fields[i*2+1])
-	}
-	return b, nil
-}
-
-func (b *Benchmark) parseMeasurement(quant string, unit string) {
-	switch unit {
-	case "ns/op":
-		if f, err := strconv.ParseFloat(quant, 64); err == nil {
-			b.NsPerOp = f
-			b.Measured |= NsPerOp
-		}
-	case "MB/s":
-		if f, err := strconv.ParseFloat(quant, 64); err == nil {
-			b.MBPerS = f
-			b.Measured |= MBPerS
-		}
-	case "B/op":
-		if i, err := strconv.ParseUint(quant, 10, 64); err == nil {
-			b.AllocedBytesPerOp = i
-			b.Measured |= AllocedBytesPerOp
-		}
-	case "allocs/op":
-		if i, err := strconv.ParseUint(quant, 10, 64); err == nil {
-			b.AllocsPerOp = i
-			b.Measured |= AllocsPerOp
-		}
-	}
-}
-
-func (b *Benchmark) String() string {
-	buf := new(bytes.Buffer)
-	fmt.Fprintf(buf, "%s %d", b.Name, b.N)
-	if (b.Measured & NsPerOp) != 0 {
-		fmt.Fprintf(buf, " %.2f ns/op", b.NsPerOp)
-	}
-	if (b.Measured & MBPerS) != 0 {
-		fmt.Fprintf(buf, " %.2f MB/s", b.MBPerS)
-	}
-	if (b.Measured & AllocedBytesPerOp) != 0 {
-		fmt.Fprintf(buf, " %d B/op", b.AllocedBytesPerOp)
-	}
-	if (b.Measured & AllocsPerOp) != 0 {
-		fmt.Fprintf(buf, " %d allocs/op", b.AllocsPerOp)
-	}
-	return buf.String()
-}
-
-// Set is a collection of benchmarks from one
-// testing.B run, keyed by name to facilitate comparison.
-type Set map[string][]*Benchmark
-
-// ParseSet extracts a Set from testing.B output.
-// ParseSet preserves the order of benchmarks that have identical
-// names.
-func ParseSet(r io.Reader) (Set, error) {
-	bb := make(Set)
-	scan := bufio.NewScanner(r)
-	ord := 0
-	for scan.Scan() {
-		if b, err := ParseLine(scan.Text()); err == nil {
-			b.Ord = ord
-			ord++
-			bb[b.Name] = append(bb[b.Name], b)
-		}
-	}
-
-	if err := scan.Err(); err != nil {
-		return nil, err
-	}
-
-	return bb, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/benchmark/parse/parse_test.go b/installer/vendor/golang.org/x/tools/benchmark/parse/parse_test.go
deleted file mode 100644
index 06db8489d6..0000000000
--- a/installer/vendor/golang.org/x/tools/benchmark/parse/parse_test.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package parse
-
-import (
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestParseLine(t *testing.T) {
-	cases := []struct {
-		line string
-		want *Benchmark
-		err  bool // expect an error
-	}{
-		{
-			line: "BenchmarkEncrypt	100000000	        19.6 ns/op",
-			want: &Benchmark{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6,
-				Measured: NsPerOp,
-			},
-		},
-		{
-			line: "BenchmarkEncrypt	100000000	        19.6 ns/op	 817.77 MB/s",
-			want: &Benchmark{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6, MBPerS: 817.77,
-				Measured: NsPerOp | MBPerS,
-			},
-		},
-		{
-			line: "BenchmarkEncrypt	100000000	        19.6 ns/op	 817.77",
-			want: &Benchmark{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6,
-				Measured: NsPerOp,
-			},
-		},
-		{
-			line: "BenchmarkEncrypt	100000000	        19.6 ns/op	 817.77 MB/s	       5 allocs/op",
-			want: &Benchmark{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6, MBPerS: 817.77, AllocsPerOp: 5,
-				Measured: NsPerOp | MBPerS | AllocsPerOp,
-			},
-		},
-		{
-			line: "BenchmarkEncrypt	100000000	        19.6 ns/op	 817.77 MB/s	       3 B/op	       5 allocs/op",
-			want: &Benchmark{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6, MBPerS: 817.77, AllocedBytesPerOp: 3, AllocsPerOp: 5,
-				Measured: NsPerOp | MBPerS | AllocedBytesPerOp | AllocsPerOp,
-			},
-		},
-		// error handling cases
-		{
-			line: "BenchPress	100	        19.6 ns/op", // non-benchmark
-			err: true,
-		},
-		{
-			line: "BenchmarkEncrypt	lots	        19.6 ns/op", // non-int iterations
-			err: true,
-		},
-		{
-			line: "BenchmarkBridge	100000000	        19.6 smoots", // unknown unit
-			want: &Benchmark{
-				Name: "BenchmarkBridge",
-				N:    100000000,
-			},
-		},
-		{
-			line: "PASS",
-			err:  true,
-		},
-	}
-
-	for _, tt := range cases {
-		have, err := ParseLine(tt.line)
-		if tt.err && err == nil {
-			t.Errorf("parsing line %q should have failed", tt.line)
-			continue
-		}
-		if !reflect.DeepEqual(have, tt.want) {
-			t.Errorf("parsed line %q incorrectly, want %v have %v", tt.line, tt.want, have)
-		}
-	}
-}
-
-func TestParseSet(t *testing.T) {
-	// Test two things:
-	// 1. The noise that can accompany testing.B output gets ignored.
-	// 2. Benchmarks with the same name have their order preserved.
-	in := `
-		?   	crypto	[no test files]
-		PASS
-				pem_decrypt_test.go:17: test 4. %!s(x509.PEMCipher=5)
-			... [output truncated]
-
-		BenchmarkEncrypt	100000000	        19.6 ns/op
-		BenchmarkEncrypt	 5000000	       517 ns/op
-		=== RUN TestChunk
-		--- PASS: TestChunk (0.00 seconds)
-		--- SKIP: TestLinuxSendfile (0.00 seconds)
-			fs_test.go:716: skipping; linux-only test
-		BenchmarkReadRequestApachebench	 1000000	      2960 ns/op	  27.70 MB/s	     839 B/op	       9 allocs/op
-		BenchmarkClientServerParallel64	   50000	     59192 ns/op	    7028 B/op	      60 allocs/op
-		ok  	net/http	95.783s
-	`
-
-	want := Set{
-		"BenchmarkReadRequestApachebench": []*Benchmark{
-			{
-				Name: "BenchmarkReadRequestApachebench",
-				N:    1000000, NsPerOp: 2960, MBPerS: 27.70, AllocedBytesPerOp: 839, AllocsPerOp: 9,
-				Measured: NsPerOp | MBPerS | AllocedBytesPerOp | AllocsPerOp,
-				Ord:      2,
-			},
-		},
-		"BenchmarkClientServerParallel64": []*Benchmark{
-			{
-				Name: "BenchmarkClientServerParallel64",
-				N:    50000, NsPerOp: 59192, AllocedBytesPerOp: 7028, AllocsPerOp: 60,
-				Measured: NsPerOp | AllocedBytesPerOp | AllocsPerOp,
-				Ord:      3,
-			},
-		},
-		"BenchmarkEncrypt": []*Benchmark{
-			{
-				Name: "BenchmarkEncrypt",
-				N:    100000000, NsPerOp: 19.6,
-				Measured: NsPerOp,
-				Ord:      0,
-			},
-			{
-				Name: "BenchmarkEncrypt",
-				N:    5000000, NsPerOp: 517,
-				Measured: NsPerOp,
-				Ord:      1,
-			},
-		},
-	}
-
-	have, err := ParseSet(strings.NewReader(in))
-	if err != nil {
-		t.Fatalf("unexpected err during ParseSet: %v", err)
-	}
-	if !reflect.DeepEqual(want, have) {
-		t.Errorf("parsed bench set incorrectly, want %v have %v", want, have)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/blog/atom/atom.go b/installer/vendor/golang.org/x/tools/blog/atom/atom.go
deleted file mode 100644
index 542c50e6e4..0000000000
--- a/installer/vendor/golang.org/x/tools/blog/atom/atom.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2009 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Adapted from encoding/xml/read_test.go.
-
-// Package atom defines XML data structures for an Atom feed.
-package atom // import "golang.org/x/tools/blog/atom"
-
-import (
-	"encoding/xml"
-	"time"
-)
-
-type Feed struct {
-	XMLName xml.Name `xml:"http://www.w3.org/2005/Atom feed"`
-	Title   string   `xml:"title"`
-	ID      string   `xml:"id"`
-	Link    []Link   `xml:"link"`
-	Updated TimeStr  `xml:"updated"`
-	Author  *Person  `xml:"author"`
-	Entry   []*Entry `xml:"entry"`
-}
-
-type Entry struct {
-	Title     string  `xml:"title"`
-	ID        string  `xml:"id"`
-	Link      []Link  `xml:"link"`
-	Published TimeStr `xml:"published"`
-	Updated   TimeStr `xml:"updated"`
-	Author    *Person `xml:"author"`
-	Summary   *Text   `xml:"summary"`
-	Content   *Text   `xml:"content"`
-}
-
-type Link struct {
-	Rel      string `xml:"rel,attr,omitempty"`
-	Href     string `xml:"href,attr"`
-	Type     string `xml:"type,attr,omitempty"`
-	HrefLang string `xml:"hreflang,attr,omitempty"`
-	Title    string `xml:"title,attr,omitempty"`
-	Length   uint   `xml:"length,attr,omitempty"`
-}
-
-type Person struct {
-	Name     string `xml:"name"`
-	URI      string `xml:"uri,omitempty"`
-	Email    string `xml:"email,omitempty"`
-	InnerXML string `xml:",innerxml"`
-}
-
-type Text struct {
-	Type string `xml:"type,attr"`
-	Body string `xml:",chardata"`
-}
-
-type TimeStr string
-
-func Time(t time.Time) TimeStr {
-	return TimeStr(t.Format("2006-01-02T15:04:05-07:00"))
-}
diff --git a/installer/vendor/golang.org/x/tools/blog/blog.go b/installer/vendor/golang.org/x/tools/blog/blog.go
deleted file mode 100644
index 23c8dc6d47..0000000000
--- a/installer/vendor/golang.org/x/tools/blog/blog.go
+++ /dev/null
@@ -1,424 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package blog implements a web server for articles written in present format.
-package blog // import "golang.org/x/tools/blog"
-
-import (
-	"bytes"
-	"encoding/json"
-	"encoding/xml"
-	"fmt"
-	"html/template"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-	"time"
-
-	"golang.org/x/tools/blog/atom"
-	"golang.org/x/tools/present"
-)
-
-var validJSONPFunc = regexp.MustCompile(`(?i)^[a-z_][a-z0-9_.]*$`)
-
-// Config specifies Server configuration values.
-type Config struct {
-	ContentPath  string // Relative or absolute location of article files and related content.
-	TemplatePath string // Relative or absolute location of template files.
-
-	BaseURL  string // Absolute base URL (for permalinks; no trailing slash).
-	BasePath string // Base URL path relative to server root (no trailing slash).
-	GodocURL string // The base URL of godoc (for menu bar; no trailing slash).
-	Hostname string // Server host name, used for rendering ATOM feeds.
-
-	HomeArticles int    // Articles to display on the home page.
-	FeedArticles int    // Articles to include in Atom and JSON feeds.
-	FeedTitle    string // The title of the Atom XML feed
-
-	PlayEnabled bool
-}
-
-// Doc represents an article adorned with presentation data.
-type Doc struct {
-	*present.Doc
-	Permalink string        // Canonical URL for this document.
-	Path      string        // Path relative to server root (including base).
-	HTML      template.HTML // rendered article
-
-	Related      []*Doc
-	Newer, Older *Doc
-}
-
-// Server implements an http.Handler that serves blog articles.
-type Server struct {
-	cfg      Config
-	docs     []*Doc
-	tags     []string
-	docPaths map[string]*Doc // key is path without BasePath.
-	docTags  map[string][]*Doc
-	template struct {
-		home, index, article, doc *template.Template
-	}
-	atomFeed []byte // pre-rendered Atom feed
-	jsonFeed []byte // pre-rendered JSON feed
-	content  http.Handler
-}
-
-// NewServer constructs a new Server using the specified config.
-func NewServer(cfg Config) (*Server, error) {
-	present.PlayEnabled = cfg.PlayEnabled
-
-	root := filepath.Join(cfg.TemplatePath, "root.tmpl")
-	parse := func(name string) (*template.Template, error) {
-		t := template.New("").Funcs(funcMap)
-		return t.ParseFiles(root, filepath.Join(cfg.TemplatePath, name))
-	}
-
-	s := &Server{cfg: cfg}
-
-	// Parse templates.
-	var err error
-	s.template.home, err = parse("home.tmpl")
-	if err != nil {
-		return nil, err
-	}
-	s.template.index, err = parse("index.tmpl")
-	if err != nil {
-		return nil, err
-	}
-	s.template.article, err = parse("article.tmpl")
-	if err != nil {
-		return nil, err
-	}
-	p := present.Template().Funcs(funcMap)
-	s.template.doc, err = p.ParseFiles(filepath.Join(cfg.TemplatePath, "doc.tmpl"))
-	if err != nil {
-		return nil, err
-	}
-
-	// Load content.
-	err = s.loadDocs(filepath.Clean(cfg.ContentPath))
-	if err != nil {
-		return nil, err
-	}
-
-	err = s.renderAtomFeed()
-	if err != nil {
-		return nil, err
-	}
-
-	err = s.renderJSONFeed()
-	if err != nil {
-		return nil, err
-	}
-
-	// Set up content file server.
-	s.content = http.StripPrefix(s.cfg.BasePath, http.FileServer(http.Dir(cfg.ContentPath)))
-
-	return s, nil
-}
-
-var funcMap = template.FuncMap{
-	"sectioned": sectioned,
-	"authors":   authors,
-}
-
-// sectioned returns true if the provided Doc contains more than one section.
-// This is used to control whether to display the table of contents and headings.
-func sectioned(d *present.Doc) bool {
-	return len(d.Sections) > 1
-}
-
-// authors returns a comma-separated list of author names.
-func authors(authors []present.Author) string {
-	var b bytes.Buffer
-	last := len(authors) - 1
-	for i, a := range authors {
-		if i > 0 {
-			if i == last {
-				b.WriteString(" and ")
-			} else {
-				b.WriteString(", ")
-			}
-		}
-		b.WriteString(authorName(a))
-	}
-	return b.String()
-}
-
-// authorName returns the first line of the Author text: the author's name.
-func authorName(a present.Author) string {
-	el := a.TextElem()
-	if len(el) == 0 {
-		return ""
-	}
-	text, ok := el[0].(present.Text)
-	if !ok || len(text.Lines) == 0 {
-		return ""
-	}
-	return text.Lines[0]
-}
-
-// loadDocs reads all content from the provided file system root, renders all
-// the articles it finds, adds them to the Server's docs field, computes the
-// denormalized docPaths, docTags, and tags fields, and populates the various
-// helper fields (Next, Previous, Related) for each Doc.
-func (s *Server) loadDocs(root string) error {
-	// Read content into docs field.
-	const ext = ".article"
-	fn := func(p string, info os.FileInfo, err error) error {
-		if filepath.Ext(p) != ext {
-			return nil
-		}
-		f, err := os.Open(p)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-		d, err := present.Parse(f, p, 0)
-		if err != nil {
-			return err
-		}
-		html := new(bytes.Buffer)
-		err = d.Render(html, s.template.doc)
-		if err != nil {
-			return err
-		}
-		p = p[len(root) : len(p)-len(ext)] // trim root and extension
-		p = filepath.ToSlash(p)
-		s.docs = append(s.docs, &Doc{
-			Doc:       d,
-			Path:      s.cfg.BasePath + p,
-			Permalink: s.cfg.BaseURL + p,
-			HTML:      template.HTML(html.String()),
-		})
-		return nil
-	}
-	err := filepath.Walk(root, fn)
-	if err != nil {
-		return err
-	}
-	sort.Sort(docsByTime(s.docs))
-
-	// Pull out doc paths and tags and put in reverse-associating maps.
-	s.docPaths = make(map[string]*Doc)
-	s.docTags = make(map[string][]*Doc)
-	for _, d := range s.docs {
-		s.docPaths[strings.TrimPrefix(d.Path, s.cfg.BasePath)] = d
-		for _, t := range d.Tags {
-			s.docTags[t] = append(s.docTags[t], d)
-		}
-	}
-
-	// Pull out unique sorted list of tags.
-	for t := range s.docTags {
-		s.tags = append(s.tags, t)
-	}
-	sort.Strings(s.tags)
-
-	// Set up presentation-related fields, Newer, Older, and Related.
-	for _, doc := range s.docs {
-		// Newer, Older: docs adjacent to doc
-		for i := range s.docs {
-			if s.docs[i] != doc {
-				continue
-			}
-			if i > 0 {
-				doc.Newer = s.docs[i-1]
-			}
-			if i+1 < len(s.docs) {
-				doc.Older = s.docs[i+1]
-			}
-			break
-		}
-
-		// Related: all docs that share tags with doc.
-		related := make(map[*Doc]bool)
-		for _, t := range doc.Tags {
-			for _, d := range s.docTags[t] {
-				if d != doc {
-					related[d] = true
-				}
-			}
-		}
-		for d := range related {
-			doc.Related = append(doc.Related, d)
-		}
-		sort.Sort(docsByTime(doc.Related))
-	}
-
-	return nil
-}
-
-// renderAtomFeed generates an XML Atom feed and stores it in the Server's
-// atomFeed field.
-func (s *Server) renderAtomFeed() error {
-	var updated time.Time
-	if len(s.docs) > 0 {
-		updated = s.docs[0].Time
-	}
-	feed := atom.Feed{
-		Title:   s.cfg.FeedTitle,
-		ID:      "tag:" + s.cfg.Hostname + ",2013:" + s.cfg.Hostname,
-		Updated: atom.Time(updated),
-		Link: []atom.Link{{
-			Rel:  "self",
-			Href: s.cfg.BaseURL + "/feed.atom",
-		}},
-	}
-	for i, doc := range s.docs {
-		if i >= s.cfg.FeedArticles {
-			break
-		}
-		e := &atom.Entry{
-			Title: doc.Title,
-			ID:    feed.ID + doc.Path,
-			Link: []atom.Link{{
-				Rel:  "alternate",
-				Href: doc.Permalink,
-			}},
-			Published: atom.Time(doc.Time),
-			Updated:   atom.Time(doc.Time),
-			Summary: &atom.Text{
-				Type: "html",
-				Body: summary(doc),
-			},
-			Content: &atom.Text{
-				Type: "html",
-				Body: string(doc.HTML),
-			},
-			Author: &atom.Person{
-				Name: authors(doc.Authors),
-			},
-		}
-		feed.Entry = append(feed.Entry, e)
-	}
-	data, err := xml.Marshal(&feed)
-	if err != nil {
-		return err
-	}
-	s.atomFeed = data
-	return nil
-}
-
-type jsonItem struct {
-	Title   string
-	Link    string
-	Time    time.Time
-	Summary string
-	Content string
-	Author  string
-}
-
-// renderJSONFeed generates a JSON feed and stores it in the Server's jsonFeed
-// field.
-func (s *Server) renderJSONFeed() error {
-	var feed []jsonItem
-	for i, doc := range s.docs {
-		if i >= s.cfg.FeedArticles {
-			break
-		}
-		item := jsonItem{
-			Title:   doc.Title,
-			Link:    doc.Permalink,
-			Time:    doc.Time,
-			Summary: summary(doc),
-			Content: string(doc.HTML),
-			Author:  authors(doc.Authors),
-		}
-		feed = append(feed, item)
-	}
-	data, err := json.Marshal(feed)
-	if err != nil {
-		return err
-	}
-	s.jsonFeed = data
-	return nil
-}
-
-// summary returns the first paragraph of text from the provided Doc.
-func summary(d *Doc) string {
-	if len(d.Sections) == 0 {
-		return ""
-	}
-	for _, elem := range d.Sections[0].Elem {
-		text, ok := elem.(present.Text)
-		if !ok || text.Pre {
-			// skip everything but non-text elements
-			continue
-		}
-		var buf bytes.Buffer
-		for _, s := range text.Lines {
-			buf.WriteString(string(present.Style(s)))
-			buf.WriteByte('\n')
-		}
-		return buf.String()
-	}
-	return ""
-}
-
-// rootData encapsulates data destined for the root template.
-type rootData struct {
-	Doc      *Doc
-	BasePath string
-	GodocURL string
-	Data     interface{}
-}
-
-// ServeHTTP serves the front, index, and article pages
-// as well as the ATOM and JSON feeds.
-func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	var (
-		d = rootData{BasePath: s.cfg.BasePath, GodocURL: s.cfg.GodocURL}
-		t *template.Template
-	)
-	switch p := strings.TrimPrefix(r.URL.Path, s.cfg.BasePath); p {
-	case "/":
-		d.Data = s.docs
-		if len(s.docs) > s.cfg.HomeArticles {
-			d.Data = s.docs[:s.cfg.HomeArticles]
-		}
-		t = s.template.home
-	case "/index":
-		d.Data = s.docs
-		t = s.template.index
-	case "/feed.atom", "/feeds/posts/default":
-		w.Header().Set("Content-type", "application/atom+xml; charset=utf-8")
-		w.Write(s.atomFeed)
-		return
-	case "/.json":
-		if p := r.FormValue("jsonp"); validJSONPFunc.MatchString(p) {
-			w.Header().Set("Content-type", "application/javascript; charset=utf-8")
-			fmt.Fprintf(w, "%v(%s)", p, s.jsonFeed)
-			return
-		}
-		w.Header().Set("Content-type", "application/json; charset=utf-8")
-		w.Write(s.jsonFeed)
-		return
-	default:
-		doc, ok := s.docPaths[p]
-		if !ok {
-			// Not a doc; try to just serve static content.
-			s.content.ServeHTTP(w, r)
-			return
-		}
-		d.Doc = doc
-		t = s.template.article
-	}
-	err := t.ExecuteTemplate(w, "root", d)
-	if err != nil {
-		log.Println(err)
-	}
-}
-
-// docsByTime implements sort.Interface, sorting Docs by their Time field.
-type docsByTime []*Doc
-
-func (s docsByTime) Len() int           { return len(s) }
-func (s docsByTime) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s docsByTime) Less(i, j int) bool { return s[i].Time.After(s[j].Time) }
diff --git a/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp.go b/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp.go
deleted file mode 100644
index 32f3a1c88f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp.go
+++ /dev/null
@@ -1,184 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"sort"
-	"strconv"
-	"text/tabwriter"
-
-	"golang.org/x/tools/benchmark/parse"
-)
-
-var (
-	changedOnly = flag.Bool("changed", false, "show only benchmarks that have changed")
-	magSort     = flag.Bool("mag", false, "sort benchmarks by magnitude of change")
-	best        = flag.Bool("best", false, "compare best times from old and new")
-)
-
-const usageFooter = `
-Each input file should be from:
-	go test -run=NONE -bench=. > [old,new].txt
-
-Benchcmp compares old and new for each benchmark.
-
-If -test.benchmem=true is added to the "go test" command
-benchcmp will also compare memory allocations.
-`
-
-func main() {
-	flag.Usage = func() {
-		fmt.Fprintf(os.Stderr, "usage: %s old.txt new.txt\n\n", os.Args[0])
-		flag.PrintDefaults()
-		fmt.Fprint(os.Stderr, usageFooter)
-		os.Exit(2)
-	}
-	flag.Parse()
-	if flag.NArg() != 2 {
-		flag.Usage()
-	}
-
-	before := parseFile(flag.Arg(0))
-	after := parseFile(flag.Arg(1))
-
-	cmps, warnings := Correlate(before, after)
-
-	for _, warn := range warnings {
-		fmt.Fprintln(os.Stderr, warn)
-	}
-
-	if len(cmps) == 0 {
-		fatal("benchcmp: no repeated benchmarks")
-	}
-
-	w := new(tabwriter.Writer)
-	w.Init(os.Stdout, 0, 0, 5, ' ', 0)
-	defer w.Flush()
-
-	var header bool // Has the header has been displayed yet for a given block?
-
-	if *magSort {
-		sort.Sort(ByDeltaNsPerOp(cmps))
-	} else {
-		sort.Sort(ByParseOrder(cmps))
-	}
-	for _, cmp := range cmps {
-		if !cmp.Measured(parse.NsPerOp) {
-			continue
-		}
-		if delta := cmp.DeltaNsPerOp(); !*changedOnly || delta.Changed() {
-			if !header {
-				fmt.Fprint(w, "benchmark\told ns/op\tnew ns/op\tdelta\n")
-				header = true
-			}
-			fmt.Fprintf(w, "%s\t%s\t%s\t%s\n", cmp.Name(), formatNs(cmp.Before.NsPerOp), formatNs(cmp.After.NsPerOp), delta.Percent())
-		}
-	}
-
-	header = false
-	if *magSort {
-		sort.Sort(ByDeltaMBPerS(cmps))
-	}
-	for _, cmp := range cmps {
-		if !cmp.Measured(parse.MBPerS) {
-			continue
-		}
-		if delta := cmp.DeltaMBPerS(); !*changedOnly || delta.Changed() {
-			if !header {
-				fmt.Fprint(w, "\nbenchmark\told MB/s\tnew MB/s\tspeedup\n")
-				header = true
-			}
-			fmt.Fprintf(w, "%s\t%.2f\t%.2f\t%s\n", cmp.Name(), cmp.Before.MBPerS, cmp.After.MBPerS, delta.Multiple())
-		}
-	}
-
-	header = false
-	if *magSort {
-		sort.Sort(ByDeltaAllocsPerOp(cmps))
-	}
-	for _, cmp := range cmps {
-		if !cmp.Measured(parse.AllocsPerOp) {
-			continue
-		}
-		if delta := cmp.DeltaAllocsPerOp(); !*changedOnly || delta.Changed() {
-			if !header {
-				fmt.Fprint(w, "\nbenchmark\told allocs\tnew allocs\tdelta\n")
-				header = true
-			}
-			fmt.Fprintf(w, "%s\t%d\t%d\t%s\n", cmp.Name(), cmp.Before.AllocsPerOp, cmp.After.AllocsPerOp, delta.Percent())
-		}
-	}
-
-	header = false
-	if *magSort {
-		sort.Sort(ByDeltaAllocedBytesPerOp(cmps))
-	}
-	for _, cmp := range cmps {
-		if !cmp.Measured(parse.AllocedBytesPerOp) {
-			continue
-		}
-		if delta := cmp.DeltaAllocedBytesPerOp(); !*changedOnly || delta.Changed() {
-			if !header {
-				fmt.Fprint(w, "\nbenchmark\told bytes\tnew bytes\tdelta\n")
-				header = true
-			}
-			fmt.Fprintf(w, "%s\t%d\t%d\t%s\n", cmp.Name(), cmp.Before.AllocedBytesPerOp, cmp.After.AllocedBytesPerOp, cmp.DeltaAllocedBytesPerOp().Percent())
-		}
-	}
-}
-
-func fatal(msg interface{}) {
-	fmt.Fprintln(os.Stderr, msg)
-	os.Exit(1)
-}
-
-func parseFile(path string) parse.Set {
-	f, err := os.Open(path)
-	if err != nil {
-		fatal(err)
-	}
-	defer f.Close()
-	bb, err := parse.ParseSet(f)
-	if err != nil {
-		fatal(err)
-	}
-	if *best {
-		selectBest(bb)
-	}
-	return bb
-}
-
-func selectBest(bs parse.Set) {
-	for name, bb := range bs {
-		if len(bb) < 2 {
-			continue
-		}
-		ord := bb[0].Ord
-		best := bb[0]
-		for _, b := range bb {
-			if b.NsPerOp < best.NsPerOp {
-				b.Ord = ord
-				best = b
-			}
-		}
-		bs[name] = []*parse.Benchmark{best}
-	}
-}
-
-// formatNs formats ns measurements to expose a useful amount of
-// precision. It mirrors the ns precision logic of testing.B.
-func formatNs(ns float64) string {
-	prec := 0
-	switch {
-	case ns < 10:
-		prec = 2
-	case ns < 100:
-		prec = 1
-	}
-	return strconv.FormatFloat(ns, 'f', prec, 64)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp_test.go b/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp_test.go
deleted file mode 100644
index 22260795e6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/benchcmp/benchcmp_test.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package main
-
-import (
-	"reflect"
-	"testing"
-
-	"golang.org/x/tools/benchmark/parse"
-)
-
-func TestSelectBest(t *testing.T) {
-	have := parse.Set{
-		"Benchmark1": []*parse.Benchmark{
-			{
-				Name: "Benchmark1",
-				N:    10, NsPerOp: 100, Measured: parse.NsPerOp,
-				Ord: 0,
-			},
-			{
-				Name: "Benchmark1",
-				N:    10, NsPerOp: 50, Measured: parse.NsPerOp,
-				Ord: 3,
-			},
-		},
-		"Benchmark2": []*parse.Benchmark{
-			{
-				Name: "Benchmark2",
-				N:    10, NsPerOp: 60, Measured: parse.NsPerOp,
-				Ord: 1,
-			},
-			{
-				Name: "Benchmark2",
-				N:    10, NsPerOp: 500, Measured: parse.NsPerOp,
-				Ord: 2,
-			},
-		},
-	}
-
-	want := parse.Set{
-		"Benchmark1": []*parse.Benchmark{
-			{
-				Name: "Benchmark1",
-				N:    10, NsPerOp: 50, Measured: parse.NsPerOp,
-				Ord: 0,
-			},
-		},
-		"Benchmark2": []*parse.Benchmark{
-			{
-				Name: "Benchmark2",
-				N:    10, NsPerOp: 60, Measured: parse.NsPerOp,
-				Ord: 1,
-			},
-		},
-	}
-
-	selectBest(have)
-	if !reflect.DeepEqual(want, have) {
-		t.Errorf("filtered bench set incorrectly, want %v have %v", want, have)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare.go b/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare.go
deleted file mode 100644
index c3f5e89c76..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare.go
+++ /dev/null
@@ -1,156 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"math"
-
-	"golang.org/x/tools/benchmark/parse"
-)
-
-// BenchCmp is a pair of benchmarks.
-type BenchCmp struct {
-	Before *parse.Benchmark
-	After  *parse.Benchmark
-}
-
-// Correlate correlates benchmarks from two BenchSets.
-func Correlate(before, after parse.Set) (cmps []BenchCmp, warnings []string) {
-	cmps = make([]BenchCmp, 0, len(after))
-	for name, beforebb := range before {
-		afterbb := after[name]
-		if len(beforebb) != len(afterbb) {
-			warnings = append(warnings, fmt.Sprintf("ignoring %s: before has %d instances, after has %d", name, len(beforebb), len(afterbb)))
-			continue
-		}
-		for i, beforeb := range beforebb {
-			afterb := afterbb[i]
-			cmps = append(cmps, BenchCmp{beforeb, afterb})
-		}
-	}
-	return
-}
-
-func (c BenchCmp) Name() string           { return c.Before.Name }
-func (c BenchCmp) String() string         { return fmt.Sprintf("<%s, %s>", c.Before, c.After) }
-func (c BenchCmp) Measured(flag int) bool { return (c.Before.Measured & c.After.Measured & flag) != 0 }
-func (c BenchCmp) DeltaNsPerOp() Delta    { return Delta{c.Before.NsPerOp, c.After.NsPerOp} }
-func (c BenchCmp) DeltaMBPerS() Delta     { return Delta{c.Before.MBPerS, c.After.MBPerS} }
-func (c BenchCmp) DeltaAllocedBytesPerOp() Delta {
-	return Delta{float64(c.Before.AllocedBytesPerOp), float64(c.After.AllocedBytesPerOp)}
-}
-func (c BenchCmp) DeltaAllocsPerOp() Delta {
-	return Delta{float64(c.Before.AllocsPerOp), float64(c.After.AllocsPerOp)}
-}
-
-// Delta is the before and after value for a benchmark measurement.
-// Both must be non-negative.
-type Delta struct {
-	Before float64
-	After  float64
-}
-
-// mag calculates the magnitude of a change, regardless of the direction of
-// the change. mag is intended for sorting and has no independent meaning.
-func (d Delta) mag() float64 {
-	switch {
-	case d.Before != 0 && d.After != 0 && d.Before >= d.After:
-		return d.After / d.Before
-	case d.Before != 0 && d.After != 0 && d.Before < d.After:
-		return d.Before / d.After
-	case d.Before == 0 && d.After == 0:
-		return 1
-	default:
-		// 0 -> 1 or 1 -> 0
-		// These are significant changes and worth surfacing.
-		return math.Inf(1)
-	}
-}
-
-// Changed reports whether the benchmark quantities are different.
-func (d Delta) Changed() bool { return d.Before != d.After }
-
-// Float64 returns After / Before. If Before is 0, Float64 returns
-// 1 if After is also 0, and +Inf otherwise.
-func (d Delta) Float64() float64 {
-	switch {
-	case d.Before != 0:
-		return d.After / d.Before
-	case d.After == 0:
-		return 1
-	default:
-		return math.Inf(1)
-	}
-}
-
-// Percent formats a Delta as a percent change, ranging from -100% up.
-func (d Delta) Percent() string {
-	return fmt.Sprintf("%+.2f%%", 100*d.Float64()-100)
-}
-
-// Multiple formats a Delta as a multiplier, ranging from 0.00x up.
-func (d Delta) Multiple() string {
-	return fmt.Sprintf("%.2fx", d.Float64())
-}
-
-func (d Delta) String() string {
-	return fmt.Sprintf("Δ(%f, %f)", d.Before, d.After)
-}
-
-// ByParseOrder sorts BenchCmps to match the order in
-// which the Before benchmarks were presented to Parse.
-type ByParseOrder []BenchCmp
-
-func (x ByParseOrder) Len() int           { return len(x) }
-func (x ByParseOrder) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x ByParseOrder) Less(i, j int) bool { return x[i].Before.Ord < x[j].Before.Ord }
-
-// lessByDelta provides lexicographic ordering:
-//   * largest delta by magnitude
-//   * alphabetic by name
-func lessByDelta(i, j BenchCmp, calcDelta func(BenchCmp) Delta) bool {
-	iDelta, jDelta := calcDelta(i).mag(), calcDelta(j).mag()
-	if iDelta != jDelta {
-		return iDelta < jDelta
-	}
-	return i.Name() < j.Name()
-}
-
-// ByDeltaNsPerOp sorts BenchCmps lexicographically by change
-// in ns/op, descending, then by benchmark name.
-type ByDeltaNsPerOp []BenchCmp
-
-func (x ByDeltaNsPerOp) Len() int           { return len(x) }
-func (x ByDeltaNsPerOp) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x ByDeltaNsPerOp) Less(i, j int) bool { return lessByDelta(x[i], x[j], BenchCmp.DeltaNsPerOp) }
-
-// ByDeltaMBPerS sorts BenchCmps lexicographically by change
-// in MB/s, descending, then by benchmark name.
-type ByDeltaMBPerS []BenchCmp
-
-func (x ByDeltaMBPerS) Len() int           { return len(x) }
-func (x ByDeltaMBPerS) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x ByDeltaMBPerS) Less(i, j int) bool { return lessByDelta(x[i], x[j], BenchCmp.DeltaMBPerS) }
-
-// ByDeltaAllocedBytesPerOp sorts BenchCmps lexicographically by change
-// in B/op, descending, then by benchmark name.
-type ByDeltaAllocedBytesPerOp []BenchCmp
-
-func (x ByDeltaAllocedBytesPerOp) Len() int      { return len(x) }
-func (x ByDeltaAllocedBytesPerOp) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-func (x ByDeltaAllocedBytesPerOp) Less(i, j int) bool {
-	return lessByDelta(x[i], x[j], BenchCmp.DeltaAllocedBytesPerOp)
-}
-
-// ByDeltaAllocsPerOp sorts BenchCmps lexicographically by change
-// in allocs/op, descending, then by benchmark name.
-type ByDeltaAllocsPerOp []BenchCmp
-
-func (x ByDeltaAllocsPerOp) Len() int      { return len(x) }
-func (x ByDeltaAllocsPerOp) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-func (x ByDeltaAllocsPerOp) Less(i, j int) bool {
-	return lessByDelta(x[i], x[j], BenchCmp.DeltaAllocsPerOp)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare_test.go b/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare_test.go
deleted file mode 100644
index 3403796d67..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/benchcmp/compare_test.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"math"
-	"reflect"
-	"sort"
-	"testing"
-
-	"golang.org/x/tools/benchmark/parse"
-)
-
-func TestDelta(t *testing.T) {
-	cases := []struct {
-		before  float64
-		after   float64
-		mag     float64
-		f       float64
-		changed bool
-		pct     string
-		mult    string
-	}{
-		{before: 1, after: 1, mag: 1, f: 1, changed: false, pct: "+0.00%", mult: "1.00x"},
-		{before: 1, after: 2, mag: 0.5, f: 2, changed: true, pct: "+100.00%", mult: "2.00x"},
-		{before: 2, after: 1, mag: 0.5, f: 0.5, changed: true, pct: "-50.00%", mult: "0.50x"},
-		{before: 0, after: 0, mag: 1, f: 1, changed: false, pct: "+0.00%", mult: "1.00x"},
-		{before: 1, after: 0, mag: math.Inf(1), f: 0, changed: true, pct: "-100.00%", mult: "0.00x"},
-		{before: 0, after: 1, mag: math.Inf(1), f: math.Inf(1), changed: true, pct: "+Inf%", mult: "+Infx"},
-	}
-	for _, tt := range cases {
-		d := Delta{tt.before, tt.after}
-		if want, have := tt.mag, d.mag(); want != have {
-			t.Errorf("%s.mag(): want %f have %f", d, want, have)
-		}
-		if want, have := tt.f, d.Float64(); want != have {
-			t.Errorf("%s.Float64(): want %f have %f", d, want, have)
-		}
-		if want, have := tt.changed, d.Changed(); want != have {
-			t.Errorf("%s.Changed(): want %t have %t", d, want, have)
-		}
-		if want, have := tt.pct, d.Percent(); want != have {
-			t.Errorf("%s.Percent(): want %q have %q", d, want, have)
-		}
-		if want, have := tt.mult, d.Multiple(); want != have {
-			t.Errorf("%s.Multiple(): want %q have %q", d, want, have)
-		}
-	}
-}
-
-func TestCorrelate(t *testing.T) {
-	// Benches that are going to be successfully correlated get N thus:
-	//   0x<counter><num benches><b = before | a = after>
-	// Read this: "<counter> of <num benches>, from <before|after>".
-	before := parse.Set{
-		"BenchmarkOneEach":   []*parse.Benchmark{{Name: "BenchmarkOneEach", N: 0x11b}},
-		"BenchmarkOneToNone": []*parse.Benchmark{{Name: "BenchmarkOneToNone"}},
-		"BenchmarkOneToTwo":  []*parse.Benchmark{{Name: "BenchmarkOneToTwo"}},
-		"BenchmarkTwoToOne": []*parse.Benchmark{
-			{Name: "BenchmarkTwoToOne"},
-			{Name: "BenchmarkTwoToOne"},
-		},
-		"BenchmarkTwoEach": []*parse.Benchmark{
-			{Name: "BenchmarkTwoEach", N: 0x12b},
-			{Name: "BenchmarkTwoEach", N: 0x22b},
-		},
-	}
-
-	after := parse.Set{
-		"BenchmarkOneEach":   []*parse.Benchmark{{Name: "BenchmarkOneEach", N: 0x11a}},
-		"BenchmarkNoneToOne": []*parse.Benchmark{{Name: "BenchmarkNoneToOne"}},
-		"BenchmarkTwoToOne":  []*parse.Benchmark{{Name: "BenchmarkTwoToOne"}},
-		"BenchmarkOneToTwo": []*parse.Benchmark{
-			{Name: "BenchmarkOneToTwo"},
-			{Name: "BenchmarkOneToTwo"},
-		},
-		"BenchmarkTwoEach": []*parse.Benchmark{
-			{Name: "BenchmarkTwoEach", N: 0x12a},
-			{Name: "BenchmarkTwoEach", N: 0x22a},
-		},
-	}
-
-	pairs, errs := Correlate(before, after)
-
-	// Fail to match: BenchmarkOneToNone, BenchmarkOneToTwo, BenchmarkTwoToOne.
-	// Correlate does not notice BenchmarkNoneToOne.
-	if len(errs) != 3 {
-		t.Errorf("Correlated expected 4 errors, got %d: %v", len(errs), errs)
-	}
-
-	// Want three correlated pairs: one BenchmarkOneEach, two BenchmarkTwoEach.
-	if len(pairs) != 3 {
-		t.Fatalf("Correlated expected 3 pairs, got %v", pairs)
-	}
-
-	for _, pair := range pairs {
-		if pair.Before.N&0xF != 0xb {
-			t.Errorf("unexpected Before in pair %s", pair)
-		}
-		if pair.After.N&0xF != 0xa {
-			t.Errorf("unexpected After in pair %s", pair)
-		}
-		if pair.Before.N>>4 != pair.After.N>>4 {
-			t.Errorf("mismatched pair %s", pair)
-		}
-	}
-}
-
-func TestBenchCmpSorting(t *testing.T) {
-	c := []BenchCmp{
-		{&parse.Benchmark{Name: "BenchmarkMuchFaster", NsPerOp: 10, Ord: 3}, &parse.Benchmark{Name: "BenchmarkMuchFaster", NsPerOp: 1}},
-		{&parse.Benchmark{Name: "BenchmarkSameB", NsPerOp: 5, Ord: 1}, &parse.Benchmark{Name: "BenchmarkSameB", NsPerOp: 5}},
-		{&parse.Benchmark{Name: "BenchmarkSameA", NsPerOp: 5, Ord: 2}, &parse.Benchmark{Name: "BenchmarkSameA", NsPerOp: 5}},
-		{&parse.Benchmark{Name: "BenchmarkSlower", NsPerOp: 10, Ord: 0}, &parse.Benchmark{Name: "BenchmarkSlower", NsPerOp: 11}},
-	}
-
-	// Test just one magnitude-based sort order; they are symmetric.
-	sort.Sort(ByDeltaNsPerOp(c))
-	want := []string{"BenchmarkMuchFaster", "BenchmarkSlower", "BenchmarkSameA", "BenchmarkSameB"}
-	have := []string{c[0].Name(), c[1].Name(), c[2].Name(), c[3].Name()}
-	if !reflect.DeepEqual(want, have) {
-		t.Errorf("ByDeltaNsOp incorrect sorting: want %v have %v", want, have)
-	}
-
-	sort.Sort(ByParseOrder(c))
-	want = []string{"BenchmarkSlower", "BenchmarkSameB", "BenchmarkSameA", "BenchmarkMuchFaster"}
-	have = []string{c[0].Name(), c[1].Name(), c[2].Name(), c[3].Name()}
-	if !reflect.DeepEqual(want, have) {
-		t.Errorf("ByParseOrder incorrect sorting: want %v have %v", want, have)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/benchcmp/doc.go b/installer/vendor/golang.org/x/tools/cmd/benchcmp/doc.go
deleted file mode 100644
index f5c7a3619f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/benchcmp/doc.go
+++ /dev/null
@@ -1,37 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-The benchcmp command displays performance changes between benchmarks.
-
-Benchcmp parses the output of two 'go test' benchmark runs,
-correlates the results per benchmark, and displays the deltas.
-
-To measure the performance impact of a change, use 'go test'
-to run benchmarks before and after the change:
-
-	go test -run=NONE -bench=. ./... > old.txt
-	# make changes
-	go test -run=NONE -bench=. ./... > new.txt
-
-Then feed the benchmark results to benchcmp:
-
-	benchcmp old.txt new.txt
-
-Benchcmp will summarize and display the performance changes,
-in a format like this:
-
-	$ benchcmp old.txt new.txt
-	benchmark           old ns/op     new ns/op     delta
-	BenchmarkConcat     523           68.6          -86.88%
-
-	benchmark           old allocs     new allocs     delta
-	BenchmarkConcat     3              1              -66.67%
-
-	benchmark           old bytes     new bytes     delta
-	BenchmarkConcat     80            48            -40.00%
-
-*/
-package main // import "golang.org/x/tools/cmd/benchcmp"
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/.gitignore b/installer/vendor/golang.org/x/tools/cmd/bundle/.gitignore
deleted file mode 100644
index caaeb09d8c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-testdata/out.got
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/main.go b/installer/vendor/golang.org/x/tools/cmd/bundle/main.go
deleted file mode 100644
index 601da7f809..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/main.go
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Bundle creates a single-source-file version of a source package
-// suitable for inclusion in a particular target package.
-//
-// Usage:
-//
-//	bundle [-o file] [-dst path] [-pkg name] [-prefix p] [-import old=new] <src>
-//
-// The src argument specifies the import path of the package to bundle.
-// The bundling of a directory of source files into a single source file
-// necessarily imposes a number of constraints.
-// The package being bundled must not use cgo; must not use conditional
-// file compilation, whether with build tags or system-specific file names
-// like code_amd64.go; must not depend on any special comments, which
-// may not be preserved; must not use any assembly sources;
-// must not use renaming imports; and must not use reflection-based APIs
-// that depend on the specific names of types or struct fields.
-//
-// By default, bundle writes the bundled code to standard output.
-// If the -o argument is given, bundle writes to the named file
-// and also includes a ``//go:generate'' comment giving the exact
-// command line used, for regenerating the file with ``go generate.''
-//
-// Bundle customizes its output for inclusion in a particular package, the destination package.
-// By default bundle assumes the destination is the package in the current directory,
-// but the destination package can be specified explicitly using the -dst option,
-// which takes an import path as its argument.
-// If the source package imports the destination package, bundle will remove
-// those imports and rewrite any references to use direct references to the
-// corresponding symbols.
-// Bundle also must write a package declaration in the output and must
-// choose a name to use in that declaration.
-// If the -package option is given, bundle uses that name.
-// Otherwise, if the -dst option is given, bundle uses the last
-// element of the destination import path.
-// Otherwise, by default bundle uses the package name found in the
-// package sources in the current directory.
-//
-// To avoid collisions, bundle inserts a prefix at the beginning of
-// every package-level const, func, type, and var identifier in src's code,
-// updating references accordingly. The default prefix is the package name
-// of the source package followed by an underscore. The -prefix option
-// specifies an alternate prefix.
-//
-// Occasionally it is necessary to rewrite imports during the bundling
-// process. The -import option, which may be repeated, specifies that
-// an import of "old" should be rewritten to import "new" instead.
-//
-// Example
-//
-// Bundle archive/zip for inclusion in cmd/dist:
-//
-//	cd $GOROOT/src/cmd/dist
-//	bundle -o zip.go archive/zip
-//
-// Bundle golang.org/x/net/http2 for inclusion in net/http,
-// prefixing all identifiers by "http2" instead of "http2_",
-// and rewriting the import "golang.org/x/net/http2/hpack"
-// to "internal/golang.org/x/net/http2/hpack":
-//
-//	cd $GOROOT/src/net/http
-//	bundle -o h2_bundle.go \
-//		-prefix http2 \
-//		-import golang.org/x/net/http2/hpack=internal/golang.org/x/net/http2/hpack \
-//		golang.org/x/net/http2
-//
-// Two ways to update the http2 bundle:
-//
-//	go generate net/http
-//
-//	cd $GOROOT/src/net/http
-//	go generate
-//
-// Update both bundles, restricting ``go generate'' to running bundle commands:
-//
-//	go generate -run bundle cmd/dist net/http
-//
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/format"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/loader"
-)
-
-var (
-	outputFile = flag.String("o", "", "write output to `file` (default standard output)")
-	dstPath    = flag.String("dst", "", "set destination import `path` (default taken from current directory)")
-	pkgName    = flag.String("pkg", "", "set destination package `name` (default taken from current directory)")
-	prefix     = flag.String("prefix", "", "set bundled identifier prefix to `p` (default source package name + \"_\")")
-	underscore = flag.Bool("underscore", false, "rewrite golang.org to golang_org in imports; temporary workaround for golang.org/issue/16333")
-
-	importMap = map[string]string{}
-)
-
-func init() {
-	flag.Var(flagFunc(addImportMap), "import", "rewrite import using `map`, of form old=new (can be repeated)")
-}
-
-func addImportMap(s string) {
-	if strings.Count(s, "=") != 1 {
-		log.Fatal("-import argument must be of the form old=new")
-	}
-	i := strings.Index(s, "=")
-	old, new := s[:i], s[i+1:]
-	if old == "" || new == "" {
-		log.Fatal("-import argument must be of the form old=new; old and new must be non-empty")
-	}
-	importMap[old] = new
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "Usage: bundle [options] <src>\n")
-	flag.PrintDefaults()
-}
-
-func main() {
-	log.SetPrefix("bundle: ")
-	log.SetFlags(0)
-
-	flag.Usage = usage
-	flag.Parse()
-	args := flag.Args()
-	if len(args) != 1 {
-		usage()
-		os.Exit(2)
-	}
-
-	if *dstPath != "" {
-		if *pkgName == "" {
-			*pkgName = path.Base(*dstPath)
-		}
-	} else {
-		wd, _ := os.Getwd()
-		pkg, err := build.ImportDir(wd, 0)
-		if err != nil {
-			log.Fatalf("cannot find package in current directory: %v", err)
-		}
-		*dstPath = pkg.ImportPath
-		if *pkgName == "" {
-			*pkgName = pkg.Name
-		}
-	}
-
-	code, err := bundle(args[0], *dstPath, *pkgName, *prefix)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if *outputFile != "" {
-		err := ioutil.WriteFile(*outputFile, code, 0666)
-		if err != nil {
-			log.Fatal(err)
-		}
-	} else {
-		_, err := os.Stdout.Write(code)
-		if err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-// isStandardImportPath is copied from cmd/go in the standard library.
-func isStandardImportPath(path string) bool {
-	i := strings.Index(path, "/")
-	if i < 0 {
-		i = len(path)
-	}
-	elem := path[:i]
-	return !strings.Contains(elem, ".")
-}
-
-var ctxt = &build.Default
-
-func bundle(src, dst, dstpkg, prefix string) ([]byte, error) {
-	// Load the initial package.
-	conf := loader.Config{ParserMode: parser.ParseComments, Build: ctxt}
-	conf.TypeCheckFuncBodies = func(p string) bool { return p == src }
-	conf.Import(src)
-
-	lprog, err := conf.Load()
-	if err != nil {
-		return nil, err
-	}
-
-	// Because there was a single Import call and Load succeeded,
-	// InitialPackages is guaranteed to hold the sole requested package.
-	info := lprog.InitialPackages()[0]
-	if prefix == "" {
-		pkgName := info.Files[0].Name.Name
-		prefix = pkgName + "_"
-	}
-
-	objsToUpdate := make(map[types.Object]bool)
-	var rename func(from types.Object)
-	rename = func(from types.Object) {
-		if !objsToUpdate[from] {
-			objsToUpdate[from] = true
-
-			// Renaming a type that is used as an embedded field
-			// requires renaming the field too. e.g.
-			// 	type T int // if we rename this to U..
-			// 	var s struct {T}
-			// 	print(s.T) // ...this must change too
-			if _, ok := from.(*types.TypeName); ok {
-				for id, obj := range info.Uses {
-					if obj == from {
-						if field := info.Defs[id]; field != nil {
-							rename(field)
-						}
-					}
-				}
-			}
-		}
-	}
-
-	// Rename each package-level object.
-	scope := info.Pkg.Scope()
-	for _, name := range scope.Names() {
-		rename(scope.Lookup(name))
-	}
-
-	var out bytes.Buffer
-
-	fmt.Fprintf(&out, "// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.\n")
-	if *outputFile != "" {
-		fmt.Fprintf(&out, "//go:generate bundle %s\n", strings.Join(os.Args[1:], " "))
-	} else {
-		fmt.Fprintf(&out, "//   $ bundle %s\n", strings.Join(os.Args[1:], " "))
-	}
-	fmt.Fprintf(&out, "\n")
-
-	// Concatenate package comments from all files...
-	for _, f := range info.Files {
-		if doc := f.Doc.Text(); strings.TrimSpace(doc) != "" {
-			for _, line := range strings.Split(doc, "\n") {
-				fmt.Fprintf(&out, "// %s\n", line)
-			}
-		}
-	}
-	// ...but don't let them become the actual package comment.
-	fmt.Fprintln(&out)
-
-	fmt.Fprintf(&out, "package %s\n\n", dstpkg)
-
-	// BUG(adonovan,shurcooL): bundle may generate incorrect code
-	// due to shadowing between identifiers and imported package names.
-	//
-	// The generated code will either fail to compile or
-	// (unlikely) compile successfully but have different behavior
-	// than the original package. The risk of this happening is higher
-	// when the original package has renamed imports (they're typically
-	// renamed in order to resolve a shadow inside that particular .go file).
-
-	// TODO(adonovan,shurcooL):
-	// - detect shadowing issues, and either return error or resolve them
-	// - preserve comments from the original import declarations.
-
-	// pkgStd and pkgExt are sets of printed import specs. This is done
-	// to deduplicate instances of the same import name and path.
-	var pkgStd = make(map[string]bool)
-	var pkgExt = make(map[string]bool)
-	for _, f := range info.Files {
-		for _, imp := range f.Imports {
-			path, err := strconv.Unquote(imp.Path.Value)
-			if err != nil {
-				log.Fatalf("invalid import path string: %v", err) // Shouldn't happen here since conf.Load succeeded.
-			}
-			if path == dst {
-				continue
-			}
-			if newPath, ok := importMap[path]; ok {
-				path = newPath
-			}
-
-			var name string
-			if imp.Name != nil {
-				name = imp.Name.Name
-			}
-			spec := fmt.Sprintf("%s %q", name, path)
-			if isStandardImportPath(path) {
-				pkgStd[spec] = true
-			} else {
-				if *underscore {
-					spec = strings.Replace(spec, "golang.org/", "golang_org/", 1)
-				}
-				pkgExt[spec] = true
-			}
-		}
-	}
-
-	// Print a single declaration that imports all necessary packages.
-	fmt.Fprintln(&out, "import (")
-	for p := range pkgStd {
-		fmt.Fprintf(&out, "\t%s\n", p)
-	}
-	if len(pkgExt) > 0 {
-		fmt.Fprintln(&out)
-	}
-	for p := range pkgExt {
-		fmt.Fprintf(&out, "\t%s\n", p)
-	}
-	fmt.Fprint(&out, ")\n\n")
-
-	// Modify and print each file.
-	for _, f := range info.Files {
-		// Update renamed identifiers.
-		for id, obj := range info.Defs {
-			if objsToUpdate[obj] {
-				id.Name = prefix + obj.Name()
-			}
-		}
-		for id, obj := range info.Uses {
-			if objsToUpdate[obj] {
-				id.Name = prefix + obj.Name()
-			}
-		}
-
-		// For each qualified identifier that refers to the
-		// destination package, remove the qualifier.
-		// The "@@@." strings are removed in postprocessing.
-		ast.Inspect(f, func(n ast.Node) bool {
-			if sel, ok := n.(*ast.SelectorExpr); ok {
-				if id, ok := sel.X.(*ast.Ident); ok {
-					if obj, ok := info.Uses[id].(*types.PkgName); ok {
-						if obj.Imported().Path() == dst {
-							id.Name = "@@@"
-						}
-					}
-				}
-			}
-			return true
-		})
-
-		last := f.Package
-		if len(f.Imports) > 0 {
-			imp := f.Imports[len(f.Imports)-1]
-			last = imp.End()
-			if imp.Comment != nil {
-				if e := imp.Comment.End(); e > last {
-					last = e
-				}
-			}
-		}
-
-		// Pretty-print package-level declarations.
-		// but no package or import declarations.
-		var buf bytes.Buffer
-		for _, decl := range f.Decls {
-			if decl, ok := decl.(*ast.GenDecl); ok && decl.Tok == token.IMPORT {
-				continue
-			}
-
-			beg, end := sourceRange(decl)
-
-			printComments(&out, f.Comments, last, beg)
-
-			buf.Reset()
-			format.Node(&buf, lprog.Fset, &printer.CommentedNode{Node: decl, Comments: f.Comments})
-			// Remove each "@@@." in the output.
-			// TODO(adonovan): not hygienic.
-			out.Write(bytes.Replace(buf.Bytes(), []byte("@@@."), nil, -1))
-
-			last = printSameLineComment(&out, f.Comments, lprog.Fset, end)
-
-			out.WriteString("\n\n")
-		}
-
-		printLastComments(&out, f.Comments, last)
-	}
-
-	// Now format the entire thing.
-	result, err := format.Source(out.Bytes())
-	if err != nil {
-		log.Fatalf("formatting failed: %v", err)
-	}
-
-	return result, nil
-}
-
-// sourceRange returns the [beg, end) interval of source code
-// belonging to decl (incl. associated comments).
-func sourceRange(decl ast.Decl) (beg, end token.Pos) {
-	beg = decl.Pos()
-	end = decl.End()
-
-	var doc, com *ast.CommentGroup
-
-	switch d := decl.(type) {
-	case *ast.GenDecl:
-		doc = d.Doc
-		if len(d.Specs) > 0 {
-			switch spec := d.Specs[len(d.Specs)-1].(type) {
-			case *ast.ValueSpec:
-				com = spec.Comment
-			case *ast.TypeSpec:
-				com = spec.Comment
-			}
-		}
-	case *ast.FuncDecl:
-		doc = d.Doc
-	}
-
-	if doc != nil {
-		beg = doc.Pos()
-	}
-	if com != nil && com.End() > end {
-		end = com.End()
-	}
-
-	return beg, end
-}
-
-func printComments(out *bytes.Buffer, comments []*ast.CommentGroup, pos, end token.Pos) {
-	for _, cg := range comments {
-		if pos <= cg.Pos() && cg.Pos() < end {
-			for _, c := range cg.List {
-				fmt.Fprintln(out, c.Text)
-			}
-			fmt.Fprintln(out)
-		}
-	}
-}
-
-const infinity = 1 << 30
-
-func printLastComments(out *bytes.Buffer, comments []*ast.CommentGroup, pos token.Pos) {
-	printComments(out, comments, pos, infinity)
-}
-
-func printSameLineComment(out *bytes.Buffer, comments []*ast.CommentGroup, fset *token.FileSet, pos token.Pos) token.Pos {
-	tf := fset.File(pos)
-	for _, cg := range comments {
-		if pos <= cg.Pos() && tf.Line(cg.Pos()) == tf.Line(pos) {
-			for _, c := range cg.List {
-				fmt.Fprintln(out, c.Text)
-			}
-			return cg.End()
-		}
-	}
-	return pos
-}
-
-type flagFunc func(string)
-
-func (f flagFunc) Set(s string) error {
-	f(s)
-	return nil
-}
-
-func (f flagFunc) String() string { return "" }
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/main_test.go b/installer/vendor/golang.org/x/tools/cmd/bundle/main_test.go
deleted file mode 100644
index b96f7d9dc0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/main_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main
-
-import (
-	"bytes"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestBundle(t *testing.T) {
-	load := func(name string) string {
-		data, err := ioutil.ReadFile(name)
-		if err != nil {
-			t.Fatal(err)
-		}
-		return string(data)
-	}
-
-	ctxt = buildutil.FakeContext(map[string]map[string]string{
-		"initial": {
-			"a.go": load("testdata/src/initial/a.go"),
-			"b.go": load("testdata/src/initial/b.go"),
-			"c.go": load("testdata/src/initial/c.go"),
-		},
-		"domain.name/importdecl": {
-			"p.go": load("testdata/src/domain.name/importdecl/p.go"),
-		},
-		"fmt": {
-			"print.go": `package fmt; func Println(...interface{})`,
-		},
-	})
-
-	os.Args = os.Args[:1] // avoid e.g. -test=short in the output
-	out, err := bundle("initial", "github.com/dest", "dest", "prefix")
-	if err != nil {
-		t.Fatal(err)
-	}
-	if got, want := string(out), load("testdata/out.golden"); got != want {
-		t.Errorf("-- got --\n%s\n-- want --\n%s\n-- diff --", got, want)
-
-		if err := ioutil.WriteFile("testdata/out.got", out, 0644); err != nil {
-			t.Fatal(err)
-		}
-		t.Log(diff("testdata/out.golden", "testdata/out.got"))
-	}
-}
-
-func diff(a, b string) string {
-	var cmd *exec.Cmd
-	switch runtime.GOOS {
-	case "plan9":
-		cmd = exec.Command("/bin/diff", "-c", a, b)
-	default:
-		cmd = exec.Command("/usr/bin/diff", "-u", a, b)
-	}
-	var out bytes.Buffer
-	cmd.Stdout = &out
-	cmd.Stderr = &out
-	cmd.Run() // nonzero exit is expected
-	if out.Len() == 0 {
-		return "(failed to compute diff)"
-	}
-	return out.String()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/out.golden b/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/out.golden
deleted file mode 100644
index 5260fdd145..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/out.golden
+++ /dev/null
@@ -1,62 +0,0 @@
-// Code generated by golang.org/x/tools/cmd/bundle. DO NOT EDIT.
-//   $ bundle
-
-// The package doc comment
-//
-
-package dest
-
-import (
-	"fmt"
-	. "fmt"
-	_ "fmt"
-	renamedfmt "fmt"
-	renamedfmt2 "fmt"
-
-	"domain.name/importdecl"
-)
-
-// init functions are not renamed
-func init() { prefixfoo() }
-
-// Type S.
-type prefixS struct {
-	prefixt
-	u int
-} /* multi-line
-comment
-*/
-
-// non-associated comment
-
-/*
-	non-associated comment2
-*/
-
-// Function bar.
-func prefixbar(s *prefixS) {
-	fmt.Println(s.prefixt, s.u) // comment inside function
-}
-
-// file-end comment
-
-type prefixt int // type1
-
-// const1
-const prefixc = 1 // const2
-
-func prefixfoo() {
-	fmt.Println(importdecl.F())
-}
-
-// zinit
-const (
-	prefixz1 = iota // z1
-	prefixz2        // z2
-) // zend
-
-func prefixbaz() {
-	renamedfmt.Println()
-	renamedfmt2.Println()
-	Println()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/domain.name/importdecl/p.go b/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/domain.name/importdecl/p.go
deleted file mode 100644
index 36dfd154e3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/domain.name/importdecl/p.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package importdecl
-
-func F() int { return 1 }
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/a.go b/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/a.go
deleted file mode 100644
index ded6c64c88..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/a.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package initial
-
-import "fmt" // this comment should not be visible
-
-// init functions are not renamed
-func init() { foo() }
-
-// Type S.
-type S struct {
-	t
-	u int
-} /* multi-line
-comment
-*/
-
-// non-associated comment
-
-/*
-	non-associated comment2
-*/
-
-// Function bar.
-func bar(s *S) {
-	fmt.Println(s.t, s.u) // comment inside function
-}
-
-// file-end comment
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/b.go b/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/b.go
deleted file mode 100644
index 31d5cabe73..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/b.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// The package doc comment
-package initial
-
-import (
-	"fmt"
-
-	"domain.name/importdecl"
-)
-
-type t int // type1
-
-// const1
-const c = 1 // const2
-
-func foo() {
-	fmt.Println(importdecl.F())
-}
-
-// zinit
-const (
-	z1 = iota // z1
-	z2        // z2
-) // zend
diff --git a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/c.go b/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/c.go
deleted file mode 100644
index 6a9cbc6914..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/bundle/testdata/src/initial/c.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package initial
-
-import _ "fmt"
-import renamedfmt "fmt"
-import renamedfmt2 "fmt"
-import . "fmt"
-
-func baz() {
-	renamedfmt.Println()
-	renamedfmt2.Println()
-	Println()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/callgraph/main.go b/installer/vendor/golang.org/x/tools/cmd/callgraph/main.go
deleted file mode 100644
index 8ef4597c1f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/callgraph/main.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// callgraph: a tool for reporting the call graph of a Go program.
-// See Usage for details, or run with -help.
-package main // import "golang.org/x/tools/cmd/callgraph"
-
-// TODO(adonovan):
-//
-// Features:
-// - restrict graph to a single package
-// - output
-//   - functions reachable from root (use digraph tool?)
-//   - unreachable functions (use digraph tool?)
-//   - dynamic (runtime) types
-//   - indexed output (numbered nodes)
-//   - JSON output
-//   - additional template fields:
-//     callee file/line/col
-
-import (
-	"bufio"
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"go/token"
-	"io"
-	"log"
-	"os"
-	"runtime"
-	"text/template"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/cha"
-	"golang.org/x/tools/go/callgraph/rta"
-	"golang.org/x/tools/go/callgraph/static"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// flags
-var (
-	algoFlag = flag.String("algo", "rta",
-		`Call graph construction algorithm (static, cha, rta, pta)`)
-
-	testFlag = flag.Bool("test", false,
-		"Loads test code (*_test.go) for imported packages")
-
-	formatFlag = flag.String("format",
-		"{{.Caller}}\t--{{.Dynamic}}-{{.Line}}:{{.Column}}-->\t{{.Callee}}",
-		"A template expression specifying how to format an edge")
-
-	ptalogFlag = flag.String("ptalog", "",
-		"Location of the points-to analysis log file, or empty to disable logging.")
-)
-
-func init() {
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-}
-
-const Usage = `callgraph: display the the call graph of a Go program.
-
-Usage:
-
-  callgraph [-algo=static|cha|rta|pta] [-test] [-format=...] <args>...
-
-Flags:
-
--algo      Specifies the call-graph construction algorithm, one of:
-
-            static      static calls only (unsound)
-            cha         Class Hierarchy Analysis
-            rta         Rapid Type Analysis
-            pta         inclusion-based Points-To Analysis
-
-           The algorithms are ordered by increasing precision in their
-           treatment of dynamic calls (and thus also computational cost).
-           RTA and PTA require a whole program (main or test), and
-           include only functions reachable from main.
-
--test      Include the package's tests in the analysis.
-
--format    Specifies the format in which each call graph edge is displayed.
-           One of:
-
-            digraph     output suitable for input to
-                        golang.org/x/tools/cmd/digraph.
-            graphviz    output in AT&T GraphViz (.dot) format.
-
-           All other values are interpreted using text/template syntax.
-           The default value is:
-
-            {{.Caller}}\t--{{.Dynamic}}-{{.Line}}:{{.Column}}-->\t{{.Callee}}
-
-           The structure passed to the template is (effectively):
-
-                   type Edge struct {
-                           Caller      *ssa.Function // calling function
-                           Callee      *ssa.Function // called function
-
-                           // Call site:
-                           Filename    string // containing file
-                           Offset      int    // offset within file of '('
-                           Line        int    // line number
-                           Column      int    // column number of call
-                           Dynamic     string // "static" or "dynamic"
-                           Description string // e.g. "static method call"
-                   }
-
-           Caller and Callee are *ssa.Function values, which print as
-           "(*sync/atomic.Mutex).Lock", but other attributes may be
-           derived from them, e.g. Caller.Pkg.Pkg.Path yields the
-           import path of the enclosing package.  Consult the go/ssa
-           API documentation for details.
-
-` + loader.FromArgsUsage + `
-
-Examples:
-
-  Show the call graph of the trivial web server application:
-
-    callgraph -format digraph $GOROOT/src/net/http/triv.go
-
-  Same, but show only the packages of each function:
-
-    callgraph -format '{{.Caller.Pkg.Pkg.Path}} -> {{.Callee.Pkg.Pkg.Path}}' \
-      $GOROOT/src/net/http/triv.go | sort | uniq
-
-  Show functions that make dynamic calls into the 'fmt' test package,
-  using the pointer analysis algorithm:
-
-    callgraph -format='{{.Caller}} -{{.Dynamic}}-> {{.Callee}}' -test -algo=pta fmt |
-      sed -ne 's/-dynamic-/--/p' |
-      sed -ne 's/-->.*fmt_test.*$//p' | sort | uniq
-
-  Show all functions directly called by the callgraph tool's main function:
-
-    callgraph -format=digraph golang.org/x/tools/cmd/callgraph |
-      digraph succs golang.org/x/tools/cmd/callgraph.main
-`
-
-func init() {
-	// If $GOMAXPROCS isn't set, use the full capacity of the machine.
-	// For small machines, use at least 4 threads.
-	if os.Getenv("GOMAXPROCS") == "" {
-		n := runtime.NumCPU()
-		if n < 4 {
-			n = 4
-		}
-		runtime.GOMAXPROCS(n)
-	}
-}
-
-func main() {
-	flag.Parse()
-	if err := doCallgraph(&build.Default, *algoFlag, *formatFlag, *testFlag, flag.Args()); err != nil {
-		fmt.Fprintf(os.Stderr, "callgraph: %s\n", err)
-		os.Exit(1)
-	}
-}
-
-var stdout io.Writer = os.Stdout
-
-func doCallgraph(ctxt *build.Context, algo, format string, tests bool, args []string) error {
-	conf := loader.Config{Build: ctxt}
-
-	if len(args) == 0 {
-		fmt.Fprintln(os.Stderr, Usage)
-		return nil
-	}
-
-	// Use the initial packages from the command line.
-	_, err := conf.FromArgs(args, tests)
-	if err != nil {
-		return err
-	}
-
-	// Load, parse and type-check the whole program.
-	iprog, err := conf.Load()
-	if err != nil {
-		return err
-	}
-
-	// Create and build SSA-form program representation.
-	prog := ssautil.CreateProgram(iprog, 0)
-	prog.Build()
-
-	// -- call graph construction ------------------------------------------
-
-	var cg *callgraph.Graph
-
-	switch algo {
-	case "static":
-		cg = static.CallGraph(prog)
-
-	case "cha":
-		cg = cha.CallGraph(prog)
-
-	case "pta":
-		// Set up points-to analysis log file.
-		var ptalog io.Writer
-		if *ptalogFlag != "" {
-			if f, err := os.Create(*ptalogFlag); err != nil {
-				log.Fatalf("Failed to create PTA log file: %s", err)
-			} else {
-				buf := bufio.NewWriter(f)
-				ptalog = buf
-				defer func() {
-					if err := buf.Flush(); err != nil {
-						log.Printf("flush: %s", err)
-					}
-					if err := f.Close(); err != nil {
-						log.Printf("close: %s", err)
-					}
-				}()
-			}
-		}
-
-		mains, err := mainPackages(prog, tests)
-		if err != nil {
-			return err
-		}
-		config := &pointer.Config{
-			Mains:          mains,
-			BuildCallGraph: true,
-			Log:            ptalog,
-		}
-		ptares, err := pointer.Analyze(config)
-		if err != nil {
-			return err // internal error in pointer analysis
-		}
-		cg = ptares.CallGraph
-
-	case "rta":
-		mains, err := mainPackages(prog, tests)
-		if err != nil {
-			return err
-		}
-		var roots []*ssa.Function
-		for _, main := range mains {
-			roots = append(roots, main.Func("init"), main.Func("main"))
-		}
-		rtares := rta.Analyze(roots, true)
-		cg = rtares.CallGraph
-
-		// NB: RTA gives us Reachable and RuntimeTypes too.
-
-	default:
-		return fmt.Errorf("unknown algorithm: %s", algo)
-	}
-
-	cg.DeleteSyntheticNodes()
-
-	// -- output------------------------------------------------------------
-
-	var before, after string
-
-	// Pre-canned formats.
-	switch format {
-	case "digraph":
-		format = `{{printf "%q %q" .Caller .Callee}}`
-
-	case "graphviz":
-		before = "digraph callgraph {\n"
-		after = "}\n"
-		format = `  {{printf "%q" .Caller}} -> {{printf "%q" .Callee}}`
-	}
-
-	tmpl, err := template.New("-format").Parse(format)
-	if err != nil {
-		return fmt.Errorf("invalid -format template: %v", err)
-	}
-
-	// Allocate these once, outside the traversal.
-	var buf bytes.Buffer
-	data := Edge{fset: prog.Fset}
-
-	fmt.Fprint(stdout, before)
-	if err := callgraph.GraphVisitEdges(cg, func(edge *callgraph.Edge) error {
-		data.position.Offset = -1
-		data.edge = edge
-		data.Caller = edge.Caller.Func
-		data.Callee = edge.Callee.Func
-
-		buf.Reset()
-		if err := tmpl.Execute(&buf, &data); err != nil {
-			return err
-		}
-		stdout.Write(buf.Bytes())
-		if len := buf.Len(); len == 0 || buf.Bytes()[len-1] != '\n' {
-			fmt.Fprintln(stdout)
-		}
-		return nil
-	}); err != nil {
-		return err
-	}
-	fmt.Fprint(stdout, after)
-	return nil
-}
-
-// mainPackages returns the main packages to analyze.
-// Each resulting package is named "main" and has a main function.
-func mainPackages(prog *ssa.Program, tests bool) ([]*ssa.Package, error) {
-	pkgs := prog.AllPackages() // TODO(adonovan): use only initial packages
-
-	// If tests, create a "testmain" package for each test.
-	var mains []*ssa.Package
-	if tests {
-		for _, pkg := range pkgs {
-			if main := prog.CreateTestMainPackage(pkg); main != nil {
-				mains = append(mains, main)
-			}
-		}
-		if mains == nil {
-			return nil, fmt.Errorf("no tests")
-		}
-		return mains, nil
-	}
-
-	// Otherwise, use the main packages.
-	mains = append(mains, ssautil.MainPackages(pkgs)...)
-	if len(mains) == 0 {
-		return nil, fmt.Errorf("no main packages")
-	}
-	return mains, nil
-}
-
-type Edge struct {
-	Caller *ssa.Function
-	Callee *ssa.Function
-
-	edge     *callgraph.Edge
-	fset     *token.FileSet
-	position token.Position // initialized lazily
-}
-
-func (e *Edge) pos() *token.Position {
-	if e.position.Offset == -1 {
-		e.position = e.fset.Position(e.edge.Pos()) // called lazily
-	}
-	return &e.position
-}
-
-func (e *Edge) Filename() string { return e.pos().Filename }
-func (e *Edge) Column() int      { return e.pos().Column }
-func (e *Edge) Line() int        { return e.pos().Line }
-func (e *Edge) Offset() int      { return e.pos().Offset }
-
-func (e *Edge) Dynamic() string {
-	if e.edge.Site != nil && e.edge.Site.Common().StaticCallee() == nil {
-		return "dynamic"
-	}
-	return "static"
-}
-
-func (e *Edge) Description() string { return e.edge.Description() }
diff --git a/installer/vendor/golang.org/x/tools/cmd/callgraph/main_test.go b/installer/vendor/golang.org/x/tools/cmd/callgraph/main_test.go
deleted file mode 100644
index c42f56dafe..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/callgraph/main_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/build"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-)
-
-func TestCallgraph(t *testing.T) {
-	ctxt := build.Default // copy
-	ctxt.GOPATH = "testdata"
-
-	const format = "{{.Caller}} --> {{.Callee}}"
-
-	for _, test := range []struct {
-		algo, format string
-		tests        bool
-		want         []string
-	}{
-		{"rta", format, false, []string{
-			// rta imprecisely shows cross product of {main,main2} x {C,D}
-			`pkg.main --> (pkg.C).f`,
-			`pkg.main --> (pkg.D).f`,
-			`pkg.main --> pkg.main2`,
-			`pkg.main2 --> (pkg.C).f`,
-			`pkg.main2 --> (pkg.D).f`,
-		}},
-		{"pta", format, false, []string{
-			// pta distinguishes main->C, main2->D.  Also has a root node.
-			`<root> --> pkg.init`,
-			`<root> --> pkg.main`,
-			`pkg.main --> (pkg.C).f`,
-			`pkg.main --> pkg.main2`,
-			`pkg.main2 --> (pkg.D).f`,
-		}},
-		// tests: main is not called.
-		{"rta", format, true, []string{
-			`pkg$testmain.init --> pkg.init`,
-			`pkg.Example --> (pkg.C).f`,
-		}},
-		{"pta", format, true, []string{
-			`<root> --> pkg$testmain.init`,
-			`<root> --> pkg.Example`,
-			`pkg$testmain.init --> pkg.init`,
-			`pkg.Example --> (pkg.C).f`,
-		}},
-	} {
-		stdout = new(bytes.Buffer)
-		if err := doCallgraph(&ctxt, test.algo, test.format, test.tests, []string{"pkg"}); err != nil {
-			t.Error(err)
-			continue
-		}
-
-		got := sortedLines(fmt.Sprint(stdout))
-		if !reflect.DeepEqual(got, test.want) {
-			t.Errorf("callgraph(%q, %q, %t):\ngot:\n%s\nwant:\n%s",
-				test.algo, test.format, test.tests,
-				strings.Join(got, "\n"),
-				strings.Join(test.want, "\n"))
-		}
-	}
-}
-
-func sortedLines(s string) []string {
-	s = strings.TrimSpace(s)
-	lines := strings.Split(s, "\n")
-	sort.Strings(lines)
-	return lines
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg.go b/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg.go
deleted file mode 100644
index b81c97fba6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package main
-
-type I interface {
-	f()
-}
-
-type C int
-
-func (C) f() {}
-
-type D int
-
-func (D) f() {}
-
-func main() {
-	var i I = C(0)
-	i.f() // dynamic call
-
-	main2()
-}
-
-func main2() {
-	var i I = D(0)
-	i.f() // dynamic call
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg_test.go b/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg_test.go
deleted file mode 100644
index d6247577b0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/callgraph/testdata/src/pkg/pkg_test.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package main
-
-// Don't import "testing", it adds a lot of callgraph edges.
-
-func Example() {
-	C(0).f()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/compilebench/main.go b/installer/vendor/golang.org/x/tools/cmd/compilebench/main.go
deleted file mode 100644
index d2cd70b219..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/compilebench/main.go
+++ /dev/null
@@ -1,360 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Compilebench benchmarks the speed of the Go compiler.
-//
-// Usage:
-//
-//	compilebench [options]
-//
-// It times the compilation of various packages and prints results in
-// the format used by package testing (and expected by golang.org/x/perf/cmd/benchstat).
-//
-// The options are:
-//
-//	-alloc
-//		Report allocations.
-//
-//	-compile exe
-//		Use exe as the path to the cmd/compile binary.
-//
-//	-compileflags 'list'
-//		Pass the space-separated list of flags to the compilation.
-//
-//	-count n
-//		Run each benchmark n times (default 1).
-//
-//	-cpuprofile file
-//		Write a CPU profile of the compiler to file.
-//
-//	-memprofile file
-//		Write a memory profile of the compiler to file.
-//
-//	-memprofilerate rate
-//		Set runtime.MemProfileRate during compilation.
-//
-//	-obj
-//		Report object file statistics.
-//
-//  -pkg
-//		Benchmark compiling a single package.
-//
-//	-run regexp
-//		Only run benchmarks with names matching regexp.
-//
-// Although -cpuprofile and -memprofile are intended to write a
-// combined profile for all the executed benchmarks to file,
-// today they write only the profile for the last benchmark executed.
-//
-// The default memory profiling rate is one profile sample per 512 kB
-// allocated (see ``go doc runtime.MemProfileRate'').
-// Lowering the rate (for example, -memprofilerate 64000) produces
-// a more fine-grained and therefore accurate profile, but it also incurs
-// execution cost. For benchmark comparisons, never use timings
-// obtained with a low -memprofilerate option.
-//
-// Example
-//
-// Assuming the base version of the compiler has been saved with
-// ``toolstash save,'' this sequence compares the old and new compiler:
-//
-//	compilebench -count 10 -compile $(toolstash -n compile) >old.txt
-//	compilebench -count 10 >new.txt
-//	benchstat old.txt new.txt
-//
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-	"time"
-)
-
-var (
-	goroot   string
-	compiler string
-	runRE    *regexp.Regexp
-	is6g     bool
-)
-
-var (
-	flagGoCmd          = flag.String("go", "go", "path to \"go\" command")
-	flagAlloc          = flag.Bool("alloc", false, "report allocations")
-	flagObj            = flag.Bool("obj", false, "report object file stats")
-	flagCompiler       = flag.String("compile", "", "use `exe` as the cmd/compile binary")
-	flagCompilerFlags  = flag.String("compileflags", "", "additional `flags` to pass to compile")
-	flagRun            = flag.String("run", "", "run benchmarks matching `regexp`")
-	flagCount          = flag.Int("count", 1, "run benchmarks `n` times")
-	flagCpuprofile     = flag.String("cpuprofile", "", "write CPU profile to `file`")
-	flagMemprofile     = flag.String("memprofile", "", "write memory profile to `file`")
-	flagMemprofilerate = flag.Int64("memprofilerate", -1, "set memory profile `rate`")
-	flagPackage        = flag.String("pkg", "", "if set, benchmark the package at path `pkg`")
-	flagShort          = flag.Bool("short", false, "skip long-running benchmarks")
-)
-
-var tests = []struct {
-	name string
-	dir  string
-	long bool
-}{
-	{"BenchmarkTemplate", "html/template", false},
-	{"BenchmarkUnicode", "unicode", false},
-	{"BenchmarkGoTypes", "go/types", false},
-	{"BenchmarkCompiler", "cmd/compile/internal/gc", false},
-	{"BenchmarkSSA", "cmd/compile/internal/ssa", false},
-	{"BenchmarkFlate", "compress/flate", false},
-	{"BenchmarkGoParser", "go/parser", false},
-	{"BenchmarkReflect", "reflect", false},
-	{"BenchmarkTar", "archive/tar", false},
-	{"BenchmarkXML", "encoding/xml", false},
-	{"BenchmarkStdCmd", "", true},
-	{"BenchmarkHelloSize", "", false},
-	{"BenchmarkCmdGoSize", "", true},
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "usage: compilebench [options]\n")
-	fmt.Fprintf(os.Stderr, "options:\n")
-	flag.PrintDefaults()
-	os.Exit(2)
-}
-
-func main() {
-	log.SetFlags(0)
-	log.SetPrefix("compilebench: ")
-	flag.Usage = usage
-	flag.Parse()
-	if flag.NArg() != 0 {
-		usage()
-	}
-
-	s, err := exec.Command(*flagGoCmd, "env", "GOROOT").CombinedOutput()
-	if err != nil {
-		log.Fatalf("%s env GOROOT: %v", *flagGoCmd, err)
-	}
-	goroot = strings.TrimSpace(string(s))
-
-	compiler = *flagCompiler
-	if compiler == "" {
-		out, err := exec.Command(*flagGoCmd, "tool", "-n", "compile").CombinedOutput()
-		if err != nil {
-			out, err = exec.Command(*flagGoCmd, "tool", "-n", "6g").CombinedOutput()
-			is6g = true
-			if err != nil {
-				out, err = exec.Command(*flagGoCmd, "tool", "-n", "compile").CombinedOutput()
-				log.Fatalf("go tool -n compiler: %v\n%s", err, out)
-			}
-		}
-		compiler = strings.TrimSpace(string(out))
-	}
-
-	if *flagRun != "" {
-		r, err := regexp.Compile(*flagRun)
-		if err != nil {
-			log.Fatalf("invalid -run argument: %v", err)
-		}
-		runRE = r
-	}
-
-	for i := 0; i < *flagCount; i++ {
-		if *flagPackage != "" {
-			runBuild("BenchmarkPkg", *flagPackage, i)
-			continue
-		}
-		for _, tt := range tests {
-			if tt.long && *flagShort {
-				continue
-			}
-			if runRE == nil || runRE.MatchString(tt.name) {
-				runBuild(tt.name, tt.dir, i)
-			}
-		}
-	}
-}
-
-func runCmd(name string, cmd *exec.Cmd) {
-	start := time.Now()
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		log.Printf("%v: %v\n%s", name, err, out)
-		return
-	}
-	fmt.Printf("%s 1 %d ns/op\n", name, time.Since(start).Nanoseconds())
-}
-
-func runStdCmd() {
-	args := []string{"build", "-a"}
-	if *flagCompilerFlags != "" {
-		args = append(args, "-gcflags", *flagCompilerFlags)
-	}
-	args = append(args, "std", "cmd")
-	cmd := exec.Command(*flagGoCmd, args...)
-	cmd.Dir = filepath.Join(goroot, "src")
-	runCmd("BenchmarkStdCmd", cmd)
-}
-
-// path is either a path to a file ("$GOROOT/test/helloworld.go") or a package path ("cmd/go").
-func runSize(name, path string) {
-	cmd := exec.Command(*flagGoCmd, "build", "-o", "_compilebenchout_", path)
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		log.Print(err)
-		return
-	}
-	defer os.Remove("_compilebenchout_")
-	info, err := os.Stat("_compilebenchout_")
-	if err != nil {
-		log.Print(err)
-		return
-	}
-	out, err := exec.Command("size", "_compilebenchout_").CombinedOutput()
-	if err != nil {
-		log.Printf("size: %v\n%s", err, out)
-		return
-	}
-	lines := strings.Split(string(out), "\n")
-	if len(lines) < 2 {
-		log.Printf("not enough output from size: %s", out)
-		return
-	}
-	f := strings.Fields(lines[1])
-	if strings.HasPrefix(lines[0], "__TEXT") && len(f) >= 2 { // OS X
-		fmt.Printf("%s 1 %s text-bytes %s data-bytes %v exe-bytes\n", name, f[0], f[1], info.Size())
-	} else if strings.Contains(lines[0], "bss") && len(f) >= 3 {
-		fmt.Printf("%s 1 %s text-bytes %s data-bytes %s bss-bytes %v exe-bytes\n", name, f[0], f[1], f[2], info.Size())
-	}
-}
-
-func runBuild(name, dir string, count int) {
-	switch name {
-	case "BenchmarkStdCmd":
-		runStdCmd()
-		return
-	case "BenchmarkCmdGoSize":
-		runSize("BenchmarkCmdGoSize", "cmd/go")
-		return
-	case "BenchmarkHelloSize":
-		runSize("BenchmarkHelloSize", filepath.Join(goroot, "test/helloworld.go"))
-		return
-	}
-
-	pkg, err := build.Import(dir, ".", 0)
-	if err != nil {
-		log.Print(err)
-		return
-	}
-	args := []string{"-o", "_compilebench_.o"}
-	if is6g {
-		*flagMemprofilerate = -1
-		*flagAlloc = false
-		*flagCpuprofile = ""
-		*flagMemprofile = ""
-	}
-	if *flagMemprofilerate >= 0 {
-		args = append(args, "-memprofilerate", fmt.Sprint(*flagMemprofilerate))
-	}
-	args = append(args, strings.Fields(*flagCompilerFlags)...)
-	if *flagAlloc || *flagCpuprofile != "" || *flagMemprofile != "" {
-		if *flagAlloc || *flagMemprofile != "" {
-			args = append(args, "-memprofile", "_compilebench_.memprof")
-		}
-		if *flagCpuprofile != "" {
-			args = append(args, "-cpuprofile", "_compilebench_.cpuprof")
-		}
-	}
-	args = append(args, pkg.GoFiles...)
-	cmd := exec.Command(compiler, args...)
-	cmd.Dir = pkg.Dir
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	start := time.Now()
-	err = cmd.Run()
-	if err != nil {
-		log.Printf("%v: %v", name, err)
-		return
-	}
-	end := time.Now()
-
-	var allocs, allocbytes int64
-	if *flagAlloc || *flagMemprofile != "" {
-		out, err := ioutil.ReadFile(pkg.Dir + "/_compilebench_.memprof")
-		if err != nil {
-			log.Print("cannot find memory profile after compilation")
-		}
-		for _, line := range strings.Split(string(out), "\n") {
-			f := strings.Fields(line)
-			if len(f) < 4 || f[0] != "#" || f[2] != "=" {
-				continue
-			}
-			val, err := strconv.ParseInt(f[3], 0, 64)
-			if err != nil {
-				continue
-			}
-			switch f[1] {
-			case "TotalAlloc":
-				allocbytes = val
-			case "Mallocs":
-				allocs = val
-			}
-		}
-
-		if *flagMemprofile != "" {
-			if err := ioutil.WriteFile(*flagMemprofile, out, 0666); err != nil {
-				log.Print(err)
-			}
-		}
-		os.Remove(pkg.Dir + "/_compilebench_.memprof")
-	}
-
-	if *flagCpuprofile != "" {
-		out, err := ioutil.ReadFile(pkg.Dir + "/_compilebench_.cpuprof")
-		if err != nil {
-			log.Print(err)
-		}
-		outpath := *flagCpuprofile
-		if *flagCount != 1 {
-			outpath = fmt.Sprintf("%s_%d", outpath, count)
-		}
-		if err := ioutil.WriteFile(outpath, out, 0666); err != nil {
-			log.Print(err)
-		}
-		os.Remove(pkg.Dir + "/_compilebench_.cpuprof")
-	}
-
-	wallns := end.Sub(start).Nanoseconds()
-	userns := cmd.ProcessState.UserTime().Nanoseconds()
-
-	fmt.Printf("%s 1 %d ns/op %d user-ns/op", name, wallns, userns)
-	if *flagAlloc {
-		fmt.Printf(" %d B/op %d allocs/op", allocbytes, allocs)
-	}
-
-	opath := pkg.Dir + "/_compilebench_.o"
-	if *flagObj {
-		// TODO(josharian): object files are big; just read enough to find what we seek.
-		data, err := ioutil.ReadFile(opath)
-		if err != nil {
-			log.Print(err)
-		}
-		// Find start of export data.
-		i := bytes.Index(data, []byte("\n$$B\n")) + len("\n$$B\n")
-		// Count bytes to end of export data.
-		nexport := bytes.Index(data[i:], []byte("\n$$\n"))
-		fmt.Printf(" %d object-bytes %d export-bytes", len(data), nexport)
-	}
-	fmt.Println()
-
-	os.Remove(opath)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/README b/installer/vendor/golang.org/x/tools/cmd/cover/README
deleted file mode 100644
index ff9523d4bd..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/README
+++ /dev/null
@@ -1,2 +0,0 @@
-NOTE: For Go releases 1.5 and later, this tool lives in the
-standard repository. The code here is not maintained.
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/cover.go b/installer/vendor/golang.org/x/tools/cmd/cover/cover.go
deleted file mode 100644
index e09336499b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/cover.go
+++ /dev/null
@@ -1,722 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-const usageMessage = "" +
-	`Usage of 'go tool cover':
-Given a coverage profile produced by 'go test':
-	go test -coverprofile=c.out
-
-Open a web browser displaying annotated source code:
-	go tool cover -html=c.out
-
-Write out an HTML file instead of launching a web browser:
-	go tool cover -html=c.out -o coverage.html
-
-Display coverage percentages to stdout for each function:
-	go tool cover -func=c.out
-
-Finally, to generate modified source code with coverage annotations
-(what go test -cover does):
-	go tool cover -mode=set -var=CoverageVariableName program.go
-`
-
-func usage() {
-	fmt.Fprintln(os.Stderr, usageMessage)
-	fmt.Fprintln(os.Stderr, "Flags:")
-	flag.PrintDefaults()
-	fmt.Fprintln(os.Stderr, "\n  Only one of -html, -func, or -mode may be set.")
-	os.Exit(2)
-}
-
-var (
-	mode    = flag.String("mode", "", "coverage mode: set, count, atomic")
-	varVar  = flag.String("var", "GoCover", "name of coverage variable to generate")
-	output  = flag.String("o", "", "file for output; default: stdout")
-	htmlOut = flag.String("html", "", "generate HTML representation of coverage profile")
-	funcOut = flag.String("func", "", "output coverage profile information for each function")
-)
-
-var profile string // The profile to read; the value of -html or -func
-
-var counterStmt func(*File, ast.Expr) ast.Stmt
-
-const (
-	atomicPackagePath = "sync/atomic"
-	atomicPackageName = "_cover_atomic_"
-)
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-
-	// Usage information when no arguments.
-	if flag.NFlag() == 0 && flag.NArg() == 0 {
-		flag.Usage()
-	}
-
-	err := parseFlags()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		fmt.Fprintln(os.Stderr, `For usage information, run "go tool cover -help"`)
-		os.Exit(2)
-	}
-
-	// Generate coverage-annotated source.
-	if *mode != "" {
-		annotate(flag.Arg(0))
-		return
-	}
-
-	// Output HTML or function coverage information.
-	if *htmlOut != "" {
-		err = htmlOutput(profile, *output)
-	} else {
-		err = funcOutput(profile, *output)
-	}
-
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "cover: %v\n", err)
-		os.Exit(2)
-	}
-}
-
-// parseFlags sets the profile and counterStmt globals and performs validations.
-func parseFlags() error {
-	profile = *htmlOut
-	if *funcOut != "" {
-		if profile != "" {
-			return fmt.Errorf("too many options")
-		}
-		profile = *funcOut
-	}
-
-	// Must either display a profile or rewrite Go source.
-	if (profile == "") == (*mode == "") {
-		return fmt.Errorf("too many options")
-	}
-
-	if *mode != "" {
-		switch *mode {
-		case "set":
-			counterStmt = setCounterStmt
-		case "count":
-			counterStmt = incCounterStmt
-		case "atomic":
-			counterStmt = atomicCounterStmt
-		default:
-			return fmt.Errorf("unknown -mode %v", *mode)
-		}
-
-		if flag.NArg() == 0 {
-			return fmt.Errorf("missing source file")
-		} else if flag.NArg() == 1 {
-			return nil
-		}
-	} else if flag.NArg() == 0 {
-		return nil
-	}
-	return fmt.Errorf("too many arguments")
-}
-
-// Block represents the information about a basic block to be recorded in the analysis.
-// Note: Our definition of basic block is based on control structures; we don't break
-// apart && and ||. We could but it doesn't seem important enough to bother.
-type Block struct {
-	startByte token.Pos
-	endByte   token.Pos
-	numStmt   int
-}
-
-// File is a wrapper for the state of a file used in the parser.
-// The basic parse tree walker is a method of this type.
-type File struct {
-	fset      *token.FileSet
-	name      string // Name of file.
-	astFile   *ast.File
-	blocks    []Block
-	atomicPkg string // Package name for "sync/atomic" in this file.
-}
-
-// Visit implements the ast.Visitor interface.
-func (f *File) Visit(node ast.Node) ast.Visitor {
-	switch n := node.(type) {
-	case *ast.BlockStmt:
-		// If it's a switch or select, the body is a list of case clauses; don't tag the block itself.
-		if len(n.List) > 0 {
-			switch n.List[0].(type) {
-			case *ast.CaseClause: // switch
-				for _, n := range n.List {
-					clause := n.(*ast.CaseClause)
-					clause.Body = f.addCounters(clause.Pos(), clause.End(), clause.Body, false)
-				}
-				return f
-			case *ast.CommClause: // select
-				for _, n := range n.List {
-					clause := n.(*ast.CommClause)
-					clause.Body = f.addCounters(clause.Pos(), clause.End(), clause.Body, false)
-				}
-				return f
-			}
-		}
-		n.List = f.addCounters(n.Lbrace, n.Rbrace+1, n.List, true) // +1 to step past closing brace.
-	case *ast.IfStmt:
-		ast.Walk(f, n.Body)
-		if n.Else == nil {
-			return nil
-		}
-		// The elses are special, because if we have
-		//	if x {
-		//	} else if y {
-		//	}
-		// we want to cover the "if y". To do this, we need a place to drop the counter,
-		// so we add a hidden block:
-		//	if x {
-		//	} else {
-		//		if y {
-		//		}
-		//	}
-		switch stmt := n.Else.(type) {
-		case *ast.IfStmt:
-			block := &ast.BlockStmt{
-				Lbrace: n.Body.End(), // Start at end of the "if" block so the covered part looks like it starts at the "else".
-				List:   []ast.Stmt{stmt},
-				Rbrace: stmt.End(),
-			}
-			n.Else = block
-		case *ast.BlockStmt:
-			stmt.Lbrace = n.Body.End() // Start at end of the "if" block so the covered part looks like it starts at the "else".
-		default:
-			panic("unexpected node type in if")
-		}
-		ast.Walk(f, n.Else)
-		return nil
-	case *ast.SelectStmt:
-		// Don't annotate an empty select - creates a syntax error.
-		if n.Body == nil || len(n.Body.List) == 0 {
-			return nil
-		}
-	case *ast.SwitchStmt:
-		// Don't annotate an empty switch - creates a syntax error.
-		if n.Body == nil || len(n.Body.List) == 0 {
-			return nil
-		}
-	case *ast.TypeSwitchStmt:
-		// Don't annotate an empty type switch - creates a syntax error.
-		if n.Body == nil || len(n.Body.List) == 0 {
-			return nil
-		}
-	}
-	return f
-}
-
-// unquote returns the unquoted string.
-func unquote(s string) string {
-	t, err := strconv.Unquote(s)
-	if err != nil {
-		log.Fatalf("cover: improperly quoted string %q\n", s)
-	}
-	return t
-}
-
-// addImport adds an import for the specified path, if one does not already exist, and returns
-// the local package name.
-func (f *File) addImport(path string) string {
-	// Does the package already import it?
-	for _, s := range f.astFile.Imports {
-		if unquote(s.Path.Value) == path {
-			if s.Name != nil {
-				return s.Name.Name
-			}
-			return filepath.Base(path)
-		}
-	}
-	newImport := &ast.ImportSpec{
-		Name: ast.NewIdent(atomicPackageName),
-		Path: &ast.BasicLit{
-			Kind:  token.STRING,
-			Value: fmt.Sprintf("%q", path),
-		},
-	}
-	impDecl := &ast.GenDecl{
-		Tok: token.IMPORT,
-		Specs: []ast.Spec{
-			newImport,
-		},
-	}
-	// Make the new import the first Decl in the file.
-	astFile := f.astFile
-	astFile.Decls = append(astFile.Decls, nil)
-	copy(astFile.Decls[1:], astFile.Decls[0:])
-	astFile.Decls[0] = impDecl
-	astFile.Imports = append(astFile.Imports, newImport)
-
-	// Now refer to the package, just in case it ends up unused.
-	// That is, append to the end of the file the declaration
-	//	var _ = _cover_atomic_.AddUint32
-	reference := &ast.GenDecl{
-		Tok: token.VAR,
-		Specs: []ast.Spec{
-			&ast.ValueSpec{
-				Names: []*ast.Ident{
-					ast.NewIdent("_"),
-				},
-				Values: []ast.Expr{
-					&ast.SelectorExpr{
-						X:   ast.NewIdent(atomicPackageName),
-						Sel: ast.NewIdent("AddUint32"),
-					},
-				},
-			},
-		},
-	}
-	astFile.Decls = append(astFile.Decls, reference)
-	return atomicPackageName
-}
-
-var slashslash = []byte("//")
-
-// initialComments returns the prefix of content containing only
-// whitespace and line comments.  Any +build directives must appear
-// within this region.  This approach is more reliable than using
-// go/printer to print a modified AST containing comments.
-//
-func initialComments(content []byte) []byte {
-	// Derived from go/build.Context.shouldBuild.
-	end := 0
-	p := content
-	for len(p) > 0 {
-		line := p
-		if i := bytes.IndexByte(line, '\n'); i >= 0 {
-			line, p = line[:i], p[i+1:]
-		} else {
-			p = p[len(p):]
-		}
-		line = bytes.TrimSpace(line)
-		if len(line) == 0 { // Blank line.
-			end = len(content) - len(p)
-			continue
-		}
-		if !bytes.HasPrefix(line, slashslash) { // Not comment line.
-			break
-		}
-	}
-	return content[:end]
-}
-
-func annotate(name string) {
-	fset := token.NewFileSet()
-	content, err := ioutil.ReadFile(name)
-	if err != nil {
-		log.Fatalf("cover: %s: %s", name, err)
-	}
-	parsedFile, err := parser.ParseFile(fset, name, content, parser.ParseComments)
-	if err != nil {
-		log.Fatalf("cover: %s: %s", name, err)
-	}
-	parsedFile.Comments = trimComments(parsedFile, fset)
-
-	file := &File{
-		fset:    fset,
-		name:    name,
-		astFile: parsedFile,
-	}
-	if *mode == "atomic" {
-		file.atomicPkg = file.addImport(atomicPackagePath)
-	}
-	ast.Walk(file, file.astFile)
-	fd := os.Stdout
-	if *output != "" {
-		var err error
-		fd, err = os.Create(*output)
-		if err != nil {
-			log.Fatalf("cover: %s", err)
-		}
-	}
-	fd.Write(initialComments(content)) // Retain '// +build' directives.
-	file.print(fd)
-	// After printing the source tree, add some declarations for the counters etc.
-	// We could do this by adding to the tree, but it's easier just to print the text.
-	file.addVariables(fd)
-}
-
-// trimComments drops all but the //go: comments, some of which are semantically important.
-// We drop all others because they can appear in places that cause our counters
-// to appear in syntactically incorrect places. //go: appears at the beginning of
-// the line and is syntactically safe.
-func trimComments(file *ast.File, fset *token.FileSet) []*ast.CommentGroup {
-	var comments []*ast.CommentGroup
-	for _, group := range file.Comments {
-		var list []*ast.Comment
-		for _, comment := range group.List {
-			if strings.HasPrefix(comment.Text, "//go:") && fset.Position(comment.Slash).Column == 1 {
-				list = append(list, comment)
-			}
-		}
-		if list != nil {
-			comments = append(comments, &ast.CommentGroup{List: list})
-		}
-	}
-	return comments
-}
-
-func (f *File) print(w io.Writer) {
-	printer.Fprint(w, f.fset, f.astFile)
-}
-
-// intLiteral returns an ast.BasicLit representing the integer value.
-func (f *File) intLiteral(i int) *ast.BasicLit {
-	node := &ast.BasicLit{
-		Kind:  token.INT,
-		Value: fmt.Sprint(i),
-	}
-	return node
-}
-
-// index returns an ast.BasicLit representing the number of counters present.
-func (f *File) index() *ast.BasicLit {
-	return f.intLiteral(len(f.blocks))
-}
-
-// setCounterStmt returns the expression: __count[23] = 1.
-func setCounterStmt(f *File, counter ast.Expr) ast.Stmt {
-	return &ast.AssignStmt{
-		Lhs: []ast.Expr{counter},
-		Tok: token.ASSIGN,
-		Rhs: []ast.Expr{f.intLiteral(1)},
-	}
-}
-
-// incCounterStmt returns the expression: __count[23]++.
-func incCounterStmt(f *File, counter ast.Expr) ast.Stmt {
-	return &ast.IncDecStmt{
-		X:   counter,
-		Tok: token.INC,
-	}
-}
-
-// atomicCounterStmt returns the expression: atomic.AddUint32(&__count[23], 1)
-func atomicCounterStmt(f *File, counter ast.Expr) ast.Stmt {
-	return &ast.ExprStmt{
-		X: &ast.CallExpr{
-			Fun: &ast.SelectorExpr{
-				X:   ast.NewIdent(f.atomicPkg),
-				Sel: ast.NewIdent("AddUint32"),
-			},
-			Args: []ast.Expr{&ast.UnaryExpr{
-				Op: token.AND,
-				X:  counter,
-			},
-				f.intLiteral(1),
-			},
-		},
-	}
-}
-
-// newCounter creates a new counter expression of the appropriate form.
-func (f *File) newCounter(start, end token.Pos, numStmt int) ast.Stmt {
-	counter := &ast.IndexExpr{
-		X: &ast.SelectorExpr{
-			X:   ast.NewIdent(*varVar),
-			Sel: ast.NewIdent("Count"),
-		},
-		Index: f.index(),
-	}
-	stmt := counterStmt(f, counter)
-	f.blocks = append(f.blocks, Block{start, end, numStmt})
-	return stmt
-}
-
-// addCounters takes a list of statements and adds counters to the beginning of
-// each basic block at the top level of that list. For instance, given
-//
-//	S1
-//	if cond {
-//		S2
-// 	}
-//	S3
-//
-// counters will be added before S1 and before S3. The block containing S2
-// will be visited in a separate call.
-// TODO: Nested simple blocks get unnecessary (but correct) counters
-func (f *File) addCounters(pos, blockEnd token.Pos, list []ast.Stmt, extendToClosingBrace bool) []ast.Stmt {
-	// Special case: make sure we add a counter to an empty block. Can't do this below
-	// or we will add a counter to an empty statement list after, say, a return statement.
-	if len(list) == 0 {
-		return []ast.Stmt{f.newCounter(pos, blockEnd, 0)}
-	}
-	// We have a block (statement list), but it may have several basic blocks due to the
-	// appearance of statements that affect the flow of control.
-	var newList []ast.Stmt
-	for {
-		// Find first statement that affects flow of control (break, continue, if, etc.).
-		// It will be the last statement of this basic block.
-		var last int
-		end := blockEnd
-		for last = 0; last < len(list); last++ {
-			end = f.statementBoundary(list[last])
-			if f.endsBasicSourceBlock(list[last]) {
-				extendToClosingBrace = false // Block is broken up now.
-				last++
-				break
-			}
-		}
-		if extendToClosingBrace {
-			end = blockEnd
-		}
-		if pos != end { // Can have no source to cover if e.g. blocks abut.
-			newList = append(newList, f.newCounter(pos, end, last))
-		}
-		newList = append(newList, list[0:last]...)
-		list = list[last:]
-		if len(list) == 0 {
-			break
-		}
-		pos = list[0].Pos()
-	}
-	return newList
-}
-
-// hasFuncLiteral reports the existence and position of the first func literal
-// in the node, if any. If a func literal appears, it usually marks the termination
-// of a basic block because the function body is itself a block.
-// Therefore we draw a line at the start of the body of the first function literal we find.
-// TODO: what if there's more than one? Probably doesn't matter much.
-func hasFuncLiteral(n ast.Node) (bool, token.Pos) {
-	if n == nil {
-		return false, 0
-	}
-	var literal funcLitFinder
-	ast.Walk(&literal, n)
-	return literal.found(), token.Pos(literal)
-}
-
-// statementBoundary finds the location in s that terminates the current basic
-// block in the source.
-func (f *File) statementBoundary(s ast.Stmt) token.Pos {
-	// Control flow statements are easy.
-	switch s := s.(type) {
-	case *ast.BlockStmt:
-		// Treat blocks like basic blocks to avoid overlapping counters.
-		return s.Lbrace
-	case *ast.IfStmt:
-		found, pos := hasFuncLiteral(s.Init)
-		if found {
-			return pos
-		}
-		found, pos = hasFuncLiteral(s.Cond)
-		if found {
-			return pos
-		}
-		return s.Body.Lbrace
-	case *ast.ForStmt:
-		found, pos := hasFuncLiteral(s.Init)
-		if found {
-			return pos
-		}
-		found, pos = hasFuncLiteral(s.Cond)
-		if found {
-			return pos
-		}
-		found, pos = hasFuncLiteral(s.Post)
-		if found {
-			return pos
-		}
-		return s.Body.Lbrace
-	case *ast.LabeledStmt:
-		return f.statementBoundary(s.Stmt)
-	case *ast.RangeStmt:
-		found, pos := hasFuncLiteral(s.X)
-		if found {
-			return pos
-		}
-		return s.Body.Lbrace
-	case *ast.SwitchStmt:
-		found, pos := hasFuncLiteral(s.Init)
-		if found {
-			return pos
-		}
-		found, pos = hasFuncLiteral(s.Tag)
-		if found {
-			return pos
-		}
-		return s.Body.Lbrace
-	case *ast.SelectStmt:
-		return s.Body.Lbrace
-	case *ast.TypeSwitchStmt:
-		found, pos := hasFuncLiteral(s.Init)
-		if found {
-			return pos
-		}
-		return s.Body.Lbrace
-	}
-	// If not a control flow statement, it is a declaration, expression, call, etc. and it may have a function literal.
-	// If it does, that's tricky because we want to exclude the body of the function from this block.
-	// Draw a line at the start of the body of the first function literal we find.
-	// TODO: what if there's more than one? Probably doesn't matter much.
-	found, pos := hasFuncLiteral(s)
-	if found {
-		return pos
-	}
-	return s.End()
-}
-
-// endsBasicSourceBlock reports whether s changes the flow of control: break, if, etc.,
-// or if it's just problematic, for instance contains a function literal, which will complicate
-// accounting due to the block-within-an expression.
-func (f *File) endsBasicSourceBlock(s ast.Stmt) bool {
-	switch s := s.(type) {
-	case *ast.BlockStmt:
-		// Treat blocks like basic blocks to avoid overlapping counters.
-		return true
-	case *ast.BranchStmt:
-		return true
-	case *ast.ForStmt:
-		return true
-	case *ast.IfStmt:
-		return true
-	case *ast.LabeledStmt:
-		return f.endsBasicSourceBlock(s.Stmt)
-	case *ast.RangeStmt:
-		return true
-	case *ast.SwitchStmt:
-		return true
-	case *ast.SelectStmt:
-		return true
-	case *ast.TypeSwitchStmt:
-		return true
-	case *ast.ExprStmt:
-		// Calls to panic change the flow.
-		// We really should verify that "panic" is the predefined function,
-		// but without type checking we can't and the likelihood of it being
-		// an actual problem is vanishingly small.
-		if call, ok := s.X.(*ast.CallExpr); ok {
-			if ident, ok := call.Fun.(*ast.Ident); ok && ident.Name == "panic" && len(call.Args) == 1 {
-				return true
-			}
-		}
-	}
-	found, _ := hasFuncLiteral(s)
-	return found
-}
-
-// funcLitFinder implements the ast.Visitor pattern to find the location of any
-// function literal in a subtree.
-type funcLitFinder token.Pos
-
-func (f *funcLitFinder) Visit(node ast.Node) (w ast.Visitor) {
-	if f.found() {
-		return nil // Prune search.
-	}
-	switch n := node.(type) {
-	case *ast.FuncLit:
-		*f = funcLitFinder(n.Body.Lbrace)
-		return nil // Prune search.
-	}
-	return f
-}
-
-func (f *funcLitFinder) found() bool {
-	return token.Pos(*f) != token.NoPos
-}
-
-// Sort interface for []block1; used for self-check in addVariables.
-
-type block1 struct {
-	Block
-	index int
-}
-
-type blockSlice []block1
-
-func (b blockSlice) Len() int           { return len(b) }
-func (b blockSlice) Less(i, j int) bool { return b[i].startByte < b[j].startByte }
-func (b blockSlice) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-
-// offset translates a token position into a 0-indexed byte offset.
-func (f *File) offset(pos token.Pos) int {
-	return f.fset.Position(pos).Offset
-}
-
-// addVariables adds to the end of the file the declarations to set up the counter and position variables.
-func (f *File) addVariables(w io.Writer) {
-	// Self-check: Verify that the instrumented basic blocks are disjoint.
-	t := make([]block1, len(f.blocks))
-	for i := range f.blocks {
-		t[i].Block = f.blocks[i]
-		t[i].index = i
-	}
-	sort.Sort(blockSlice(t))
-	for i := 1; i < len(t); i++ {
-		if t[i-1].endByte > t[i].startByte {
-			fmt.Fprintf(os.Stderr, "cover: internal error: block %d overlaps block %d\n", t[i-1].index, t[i].index)
-			// Note: error message is in byte positions, not token positions.
-			fmt.Fprintf(os.Stderr, "\t%s:#%d,#%d %s:#%d,#%d\n",
-				f.name, f.offset(t[i-1].startByte), f.offset(t[i-1].endByte),
-				f.name, f.offset(t[i].startByte), f.offset(t[i].endByte))
-		}
-	}
-
-	// Declare the coverage struct as a package-level variable.
-	fmt.Fprintf(w, "\nvar %s = struct {\n", *varVar)
-	fmt.Fprintf(w, "\tCount     [%d]uint32\n", len(f.blocks))
-	fmt.Fprintf(w, "\tPos       [3 * %d]uint32\n", len(f.blocks))
-	fmt.Fprintf(w, "\tNumStmt   [%d]uint16\n", len(f.blocks))
-	fmt.Fprintf(w, "} {\n")
-
-	// Initialize the position array field.
-	fmt.Fprintf(w, "\tPos: [3 * %d]uint32{\n", len(f.blocks))
-
-	// A nice long list of positions. Each position is encoded as follows to reduce size:
-	// - 32-bit starting line number
-	// - 32-bit ending line number
-	// - (16 bit ending column number << 16) | (16-bit starting column number).
-	for i, block := range f.blocks {
-		start := f.fset.Position(block.startByte)
-		end := f.fset.Position(block.endByte)
-		fmt.Fprintf(w, "\t\t%d, %d, %#x, // [%d]\n", start.Line, end.Line, (end.Column&0xFFFF)<<16|(start.Column&0xFFFF), i)
-	}
-
-	// Close the position array.
-	fmt.Fprintf(w, "\t},\n")
-
-	// Initialize the position array field.
-	fmt.Fprintf(w, "\tNumStmt: [%d]uint16{\n", len(f.blocks))
-
-	// A nice long list of statements-per-block, so we can give a conventional
-	// valuation of "percent covered". To save space, it's a 16-bit number, so we
-	// clamp it if it overflows - won't matter in practice.
-	for i, block := range f.blocks {
-		n := block.numStmt
-		if n > 1<<16-1 {
-			n = 1<<16 - 1
-		}
-		fmt.Fprintf(w, "\t\t%d, // %d\n", n, i)
-	}
-
-	// Close the statements-per-block array.
-	fmt.Fprintf(w, "\t},\n")
-
-	// Close the struct initialization.
-	fmt.Fprintf(w, "}\n")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/cover_test.go b/installer/vendor/golang.org/x/tools/cmd/cover/cover_test.go
deleted file mode 100644
index a18778b5b4..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/cover_test.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package main_test
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"testing"
-)
-
-const (
-	// Data directory, also the package directory for the test.
-	testdata = "testdata"
-
-	// Binaries we compile.
-	testcover = "./testcover.exe"
-)
-
-var (
-	// Files we use.
-	testMain    = filepath.Join(testdata, "main.go")
-	testTest    = filepath.Join(testdata, "test.go")
-	coverInput  = filepath.Join(testdata, "test_line.go")
-	coverOutput = filepath.Join(testdata, "test_cover.go")
-)
-
-var debug = false // Keeps the rewritten files around if set.
-
-// Run this shell script, but do it in Go so it can be run by "go test".
-//
-//	replace the word LINE with the line number < testdata/test.go > testdata/test_line.go
-// 	go build -o ./testcover
-// 	./testcover -mode=count -var=CoverTest -o ./testdata/test_cover.go testdata/test_line.go
-//	go run ./testdata/main.go ./testdata/test.go
-//
-func TestCover(t *testing.T) {
-	// Read in the test file (testTest) and write it, with LINEs specified, to coverInput.
-	file, err := ioutil.ReadFile(testTest)
-	if err != nil {
-		t.Fatal(err)
-	}
-	lines := bytes.Split(file, []byte("\n"))
-	for i, line := range lines {
-		lines[i] = bytes.Replace(line, []byte("LINE"), []byte(fmt.Sprint(i+1)), -1)
-	}
-	err = ioutil.WriteFile(coverInput, bytes.Join(lines, []byte("\n")), 0666)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// defer removal of test_line.go
-	if !debug {
-		defer os.Remove(coverInput)
-	}
-
-	// go build -o testcover
-	cmd := exec.Command("go", "build", "-o", testcover)
-	run(cmd, t)
-
-	// defer removal of testcover
-	defer os.Remove(testcover)
-
-	// ./testcover -mode=count -var=coverTest -o ./testdata/test_cover.go testdata/test_line.go
-	cmd = exec.Command(testcover, "-mode=count", "-var=coverTest", "-o", coverOutput, coverInput)
-	run(cmd, t)
-
-	// defer removal of ./testdata/test_cover.go
-	if !debug {
-		defer os.Remove(coverOutput)
-	}
-
-	// go run ./testdata/main.go ./testdata/test.go
-	cmd = exec.Command("go", "run", testMain, coverOutput)
-	run(cmd, t)
-}
-
-func run(c *exec.Cmd, t *testing.T) {
-	c.Stdout = os.Stdout
-	c.Stderr = os.Stderr
-	err := c.Run()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/doc.go b/installer/vendor/golang.org/x/tools/cmd/cover/doc.go
deleted file mode 100644
index b74d5b3ce3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/doc.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Cover is a program for analyzing the coverage profiles generated by
-'go test -coverprofile=cover.out'.
-
-Cover is also used by 'go test -cover' to rewrite the source code with
-annotations to track which parts of each function are executed.
-It operates on one Go source file at a time, computing approximate
-basic block information by studying the source. It is thus more portable
-than binary-rewriting coverage tools, but also a little less capable.
-For instance, it does not probe inside && and || expressions, and can
-be mildly confused by single statements with multiple function literals.
-
-For usage information, please see:
-	go help testflag
-	go tool cover -help
-
-No longer maintained:
-
-For Go releases 1.5 and later, this tool lives in the
-standard repository. The code here is not maintained.
-
-*/
-package main // import "golang.org/x/tools/cmd/cover"
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/func.go b/installer/vendor/golang.org/x/tools/cmd/cover/func.go
deleted file mode 100644
index 41d9fceca5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/func.go
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements the visitor that computes the (line, column)-(line-column) range for each function.
-
-package main
-
-import (
-	"bufio"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
-	"text/tabwriter"
-
-	"golang.org/x/tools/cover"
-)
-
-// funcOutput takes two file names as arguments, a coverage profile to read as input and an output
-// file to write ("" means to write to standard output). The function reads the profile and produces
-// as output the coverage data broken down by function, like this:
-//
-//	fmt/format.go:30:	init			100.0%
-//	fmt/format.go:57:	clearflags		100.0%
-//	...
-//	fmt/scan.go:1046:	doScan			100.0%
-//	fmt/scan.go:1075:	advance			96.2%
-//	fmt/scan.go:1119:	doScanf			96.8%
-//	total:		(statements)			91.9%
-
-func funcOutput(profile, outputFile string) error {
-	profiles, err := cover.ParseProfiles(profile)
-	if err != nil {
-		return err
-	}
-
-	var out *bufio.Writer
-	if outputFile == "" {
-		out = bufio.NewWriter(os.Stdout)
-	} else {
-		fd, err := os.Create(outputFile)
-		if err != nil {
-			return err
-		}
-		defer fd.Close()
-		out = bufio.NewWriter(fd)
-	}
-	defer out.Flush()
-
-	tabber := tabwriter.NewWriter(out, 1, 8, 1, '\t', 0)
-	defer tabber.Flush()
-
-	var total, covered int64
-	for _, profile := range profiles {
-		fn := profile.FileName
-		file, err := findFile(fn)
-		if err != nil {
-			return err
-		}
-		funcs, err := findFuncs(file)
-		if err != nil {
-			return err
-		}
-		// Now match up functions and profile blocks.
-		for _, f := range funcs {
-			c, t := f.coverage(profile)
-			fmt.Fprintf(tabber, "%s:%d:\t%s\t%.1f%%\n", fn, f.startLine, f.name, 100.0*float64(c)/float64(t))
-			total += t
-			covered += c
-		}
-	}
-	fmt.Fprintf(tabber, "total:\t(statements)\t%.1f%%\n", 100.0*float64(covered)/float64(total))
-
-	return nil
-}
-
-// findFuncs parses the file and returns a slice of FuncExtent descriptors.
-func findFuncs(name string) ([]*FuncExtent, error) {
-	fset := token.NewFileSet()
-	parsedFile, err := parser.ParseFile(fset, name, nil, 0)
-	if err != nil {
-		return nil, err
-	}
-	visitor := &FuncVisitor{
-		fset:    fset,
-		name:    name,
-		astFile: parsedFile,
-	}
-	ast.Walk(visitor, visitor.astFile)
-	return visitor.funcs, nil
-}
-
-// FuncExtent describes a function's extent in the source by file and position.
-type FuncExtent struct {
-	name      string
-	startLine int
-	startCol  int
-	endLine   int
-	endCol    int
-}
-
-// FuncVisitor implements the visitor that builds the function position list for a file.
-type FuncVisitor struct {
-	fset    *token.FileSet
-	name    string // Name of file.
-	astFile *ast.File
-	funcs   []*FuncExtent
-}
-
-// Visit implements the ast.Visitor interface.
-func (v *FuncVisitor) Visit(node ast.Node) ast.Visitor {
-	switch n := node.(type) {
-	case *ast.FuncDecl:
-		start := v.fset.Position(n.Pos())
-		end := v.fset.Position(n.End())
-		fe := &FuncExtent{
-			name:      n.Name.Name,
-			startLine: start.Line,
-			startCol:  start.Column,
-			endLine:   end.Line,
-			endCol:    end.Column,
-		}
-		v.funcs = append(v.funcs, fe)
-	}
-	return v
-}
-
-// coverage returns the fraction of the statements in the function that were covered, as a numerator and denominator.
-func (f *FuncExtent) coverage(profile *cover.Profile) (num, den int64) {
-	// We could avoid making this n^2 overall by doing a single scan and annotating the functions,
-	// but the sizes of the data structures is never very large and the scan is almost instantaneous.
-	var covered, total int64
-	// The blocks are sorted, so we can stop counting as soon as we reach the end of the relevant block.
-	for _, b := range profile.Blocks {
-		if b.StartLine > f.endLine || (b.StartLine == f.endLine && b.StartCol >= f.endCol) {
-			// Past the end of the function.
-			break
-		}
-		if b.EndLine < f.startLine || (b.EndLine == f.startLine && b.EndCol <= f.startCol) {
-			// Before the beginning of the function
-			continue
-		}
-		total += int64(b.NumStmt)
-		if b.Count > 0 {
-			covered += int64(b.NumStmt)
-		}
-	}
-	if total == 0 {
-		total = 1 // Avoid zero denominator.
-	}
-	return covered, total
-}
-
-// findFile finds the location of the named file in GOROOT, GOPATH etc.
-func findFile(file string) (string, error) {
-	dir, file := filepath.Split(file)
-	pkg, err := build.Import(dir, ".", build.FindOnly)
-	if err != nil {
-		return "", fmt.Errorf("can't find %q: %v", file, err)
-	}
-	return filepath.Join(pkg.Dir, file), nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/html.go b/installer/vendor/golang.org/x/tools/cmd/cover/html.go
deleted file mode 100644
index ef50e2bfce..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/html.go
+++ /dev/null
@@ -1,284 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"html/template"
-	"io"
-	"io/ioutil"
-	"math"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-
-	"golang.org/x/tools/cover"
-)
-
-// htmlOutput reads the profile data from profile and generates an HTML
-// coverage report, writing it to outfile. If outfile is empty,
-// it writes the report to a temporary file and opens it in a web browser.
-func htmlOutput(profile, outfile string) error {
-	profiles, err := cover.ParseProfiles(profile)
-	if err != nil {
-		return err
-	}
-
-	var d templateData
-
-	for _, profile := range profiles {
-		fn := profile.FileName
-		if profile.Mode == "set" {
-			d.Set = true
-		}
-		file, err := findFile(fn)
-		if err != nil {
-			return err
-		}
-		src, err := ioutil.ReadFile(file)
-		if err != nil {
-			return fmt.Errorf("can't read %q: %v", fn, err)
-		}
-		var buf bytes.Buffer
-		err = htmlGen(&buf, src, profile.Boundaries(src))
-		if err != nil {
-			return err
-		}
-		d.Files = append(d.Files, &templateFile{
-			Name:     fn,
-			Body:     template.HTML(buf.String()),
-			Coverage: percentCovered(profile),
-		})
-	}
-
-	var out *os.File
-	if outfile == "" {
-		var dir string
-		dir, err = ioutil.TempDir("", "cover")
-		if err != nil {
-			return err
-		}
-		out, err = os.Create(filepath.Join(dir, "coverage.html"))
-	} else {
-		out, err = os.Create(outfile)
-	}
-	if err != nil {
-		return err
-	}
-	err = htmlTemplate.Execute(out, d)
-	if err == nil {
-		err = out.Close()
-	}
-	if err != nil {
-		return err
-	}
-
-	if outfile == "" {
-		if !startBrowser("file://" + out.Name()) {
-			fmt.Fprintf(os.Stderr, "HTML output written to %s\n", out.Name())
-		}
-	}
-
-	return nil
-}
-
-// percentCovered returns, as a percentage, the fraction of the statements in
-// the profile covered by the test run.
-// In effect, it reports the coverage of a given source file.
-func percentCovered(p *cover.Profile) float64 {
-	var total, covered int64
-	for _, b := range p.Blocks {
-		total += int64(b.NumStmt)
-		if b.Count > 0 {
-			covered += int64(b.NumStmt)
-		}
-	}
-	if total == 0 {
-		return 0
-	}
-	return float64(covered) / float64(total) * 100
-}
-
-// htmlGen generates an HTML coverage report with the provided filename,
-// source code, and tokens, and writes it to the given Writer.
-func htmlGen(w io.Writer, src []byte, boundaries []cover.Boundary) error {
-	dst := bufio.NewWriter(w)
-	for i := range src {
-		for len(boundaries) > 0 && boundaries[0].Offset == i {
-			b := boundaries[0]
-			if b.Start {
-				n := 0
-				if b.Count > 0 {
-					n = int(math.Floor(b.Norm*9)) + 1
-				}
-				fmt.Fprintf(dst, `<span class="cov%v" title="%v">`, n, b.Count)
-			} else {
-				dst.WriteString("</span>")
-			}
-			boundaries = boundaries[1:]
-		}
-		switch b := src[i]; b {
-		case '>':
-			dst.WriteString("&gt;")
-		case '<':
-			dst.WriteString("&lt;")
-		case '&':
-			dst.WriteString("&amp;")
-		case '\t':
-			dst.WriteString("        ")
-		default:
-			dst.WriteByte(b)
-		}
-	}
-	return dst.Flush()
-}
-
-// startBrowser tries to open the URL in a browser
-// and reports whether it succeeds.
-func startBrowser(url string) bool {
-	// try to start the browser
-	var args []string
-	switch runtime.GOOS {
-	case "darwin":
-		args = []string{"open"}
-	case "windows":
-		args = []string{"cmd", "/c", "start"}
-	default:
-		args = []string{"xdg-open"}
-	}
-	cmd := exec.Command(args[0], append(args[1:], url)...)
-	return cmd.Start() == nil
-}
-
-// rgb returns an rgb value for the specified coverage value
-// between 0 (no coverage) and 10 (max coverage).
-func rgb(n int) string {
-	if n == 0 {
-		return "rgb(192, 0, 0)" // Red
-	}
-	// Gradient from gray to green.
-	r := 128 - 12*(n-1)
-	g := 128 + 12*(n-1)
-	b := 128 + 3*(n-1)
-	return fmt.Sprintf("rgb(%v, %v, %v)", r, g, b)
-}
-
-// colors generates the CSS rules for coverage colors.
-func colors() template.CSS {
-	var buf bytes.Buffer
-	for i := 0; i < 11; i++ {
-		fmt.Fprintf(&buf, ".cov%v { color: %v }\n", i, rgb(i))
-	}
-	return template.CSS(buf.String())
-}
-
-var htmlTemplate = template.Must(template.New("html").Funcs(template.FuncMap{
-	"colors": colors,
-}).Parse(tmplHTML))
-
-type templateData struct {
-	Files []*templateFile
-	Set   bool
-}
-
-type templateFile struct {
-	Name     string
-	Body     template.HTML
-	Coverage float64
-}
-
-const tmplHTML = `
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-		<style>
-			body {
-				background: black;
-				color: rgb(80, 80, 80);
-			}
-			body, pre, #legend span {
-				font-family: Menlo, monospace;
-				font-weight: bold;
-			}
-			#topbar {
-				background: black;
-				position: fixed;
-				top: 0; left: 0; right: 0;
-				height: 42px;
-				border-bottom: 1px solid rgb(80, 80, 80);
-			}
-			#content {
-				margin-top: 50px;
-			}
-			#nav, #legend {
-				float: left;
-				margin-left: 10px;
-			}
-			#legend {
-				margin-top: 12px;
-			}
-			#nav {
-				margin-top: 10px;
-			}
-			#legend span {
-				margin: 0 5px;
-			}
-			{{colors}}
-		</style>
-	</head>
-	<body>
-		<div id="topbar">
-			<div id="nav">
-				<select id="files">
-				{{range $i, $f := .Files}}
-				<option value="file{{$i}}">{{$f.Name}} ({{printf "%.1f" $f.Coverage}}%)</option>
-				{{end}}
-				</select>
-			</div>
-			<div id="legend">
-				<span>not tracked</span>
-			{{if .Set}}
-				<span class="cov0">not covered</span>
-				<span class="cov8">covered</span>
-			{{else}}
-				<span class="cov0">no coverage</span>
-				<span class="cov1">low coverage</span>
-				<span class="cov2">*</span>
-				<span class="cov3">*</span>
-				<span class="cov4">*</span>
-				<span class="cov5">*</span>
-				<span class="cov6">*</span>
-				<span class="cov7">*</span>
-				<span class="cov8">*</span>
-				<span class="cov9">*</span>
-				<span class="cov10">high coverage</span>
-			{{end}}
-			</div>
-		</div>
-		<div id="content">
-		{{range $i, $f := .Files}}
-		<pre class="file" id="file{{$i}}" {{if $i}}style="display: none"{{end}}>{{$f.Body}}</pre>
-		{{end}}
-		</div>
-	</body>
-	<script>
-	(function() {
-		var files = document.getElementById('files');
-		var visible = document.getElementById('file0');
-		files.addEventListener('change', onChange, false);
-		function onChange() {
-			visible.style.display = 'none';
-			visible = document.getElementById(files.value);
-			visible.style.display = 'block';
-			window.scrollTo(0, 0);
-		}
-	})();
-	</script>
-</html>
-`
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/testdata/main.go b/installer/vendor/golang.org/x/tools/cmd/cover/testdata/main.go
deleted file mode 100644
index 6ed39c4f23..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/testdata/main.go
+++ /dev/null
@@ -1,112 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Test runner for coverage test. This file is not coverage-annotated; test.go is.
-// It knows the coverage counter is called "coverTest".
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-func main() {
-	testAll()
-	verify()
-}
-
-type block struct {
-	count uint32
-	line  uint32
-}
-
-var counters = make(map[block]bool)
-
-// check records the location and expected value for a counter.
-func check(line, count uint32) {
-	b := block{
-		count,
-		line,
-	}
-	counters[b] = true
-}
-
-// checkVal is a version of check that returns its extra argument,
-// so it can be used in conditionals.
-func checkVal(line, count uint32, val int) int {
-	b := block{
-		count,
-		line,
-	}
-	counters[b] = true
-	return val
-}
-
-var PASS = true
-
-// verify checks the expected counts against the actual. It runs after the test has completed.
-func verify() {
-	for b := range counters {
-		got, index := count(b.line)
-		if b.count == anything && got != 0 {
-			got = anything
-		}
-		if got != b.count {
-			fmt.Fprintf(os.Stderr, "test_go:%d expected count %d got %d [counter %d]\n", b.line, b.count, got, index)
-			PASS = false
-		}
-	}
-	verifyPanic()
-	if !PASS {
-		fmt.Fprintf(os.Stderr, "FAIL\n")
-		os.Exit(2)
-	}
-}
-
-// verifyPanic is a special check for the known counter that should be
-// after the panic call in testPanic.
-func verifyPanic() {
-	if coverTest.Count[panicIndex-1] != 1 {
-		// Sanity check for test before panic.
-		fmt.Fprintf(os.Stderr, "bad before panic")
-		PASS = false
-	}
-	if coverTest.Count[panicIndex] != 0 {
-		fmt.Fprintf(os.Stderr, "bad at panic: %d should be 0\n", coverTest.Count[panicIndex])
-		PASS = false
-	}
-	if coverTest.Count[panicIndex+1] != 1 {
-		fmt.Fprintf(os.Stderr, "bad after panic")
-		PASS = false
-	}
-}
-
-// count returns the count and index for the counter at the specified line.
-func count(line uint32) (uint32, int) {
-	// Linear search is fine. Choose perfect fit over approximate.
-	// We can have a closing brace for a range on the same line as a condition for an "else if"
-	// and we don't want that brace to steal the count for the condition on the "if".
-	// Therefore we test for a perfect (lo==line && hi==line) match, but if we can't
-	// find that we take the first imperfect match.
-	index := -1
-	indexLo := uint32(1e9)
-	for i := range coverTest.Count {
-		lo, hi := coverTest.Pos[3*i], coverTest.Pos[3*i+1]
-		if lo == line && line == hi {
-			return coverTest.Count[i], i
-		}
-		// Choose the earliest match (the counters are in unpredictable order).
-		if lo <= line && line <= hi && indexLo > lo {
-			index = i
-			indexLo = lo
-		}
-	}
-	if index == -1 {
-		fmt.Fprintln(os.Stderr, "cover_test: no counter for line", line)
-		PASS = false
-		return 0, 0
-	}
-	return coverTest.Count[index], index
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/cover/testdata/test.go b/installer/vendor/golang.org/x/tools/cmd/cover/testdata/test.go
deleted file mode 100644
index 9013950a2b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/cover/testdata/test.go
+++ /dev/null
@@ -1,218 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This program is processed by the cover command, and then testAll is called.
-// The test driver in main.go can then compare the coverage statistics with expectation.
-
-// The word LINE is replaced by the line number in this file. When the file is executed,
-// the coverage processing has changed the line numbers, so we can't use runtime.Caller.
-
-package main
-
-const anything = 1e9 // Just some unlikely value that means "we got here, don't care how often"
-
-func testAll() {
-	testSimple()
-	testBlockRun()
-	testIf()
-	testFor()
-	testRange()
-	testSwitch()
-	testTypeSwitch()
-	testSelect1()
-	testSelect2()
-	testPanic()
-	testEmptySwitches()
-}
-
-// The indexes of the counters in testPanic are known to main.go
-const panicIndex = 3
-
-// This test appears first because the index of its counters is known to main.go
-func testPanic() {
-	defer func() {
-		recover()
-	}()
-	check(LINE, 1)
-	panic("should not get next line")
-	check(LINE, 0) // this is GoCover.Count[panicIndex]
-	// The next counter is in testSimple and it will be non-zero.
-	// If the panic above does not trigger a counter, the test will fail
-	// because GoCover.Count[panicIndex] will be the one in testSimple.
-}
-
-func testSimple() {
-	check(LINE, 1)
-}
-
-func testIf() {
-	if true {
-		check(LINE, 1)
-	} else {
-		check(LINE, 0)
-	}
-	if false {
-		check(LINE, 0)
-	} else {
-		check(LINE, 1)
-	}
-	for i := 0; i < 3; i++ {
-		if checkVal(LINE, 3, i) <= 2 {
-			check(LINE, 3)
-		}
-		if checkVal(LINE, 3, i) <= 1 {
-			check(LINE, 2)
-		}
-		if checkVal(LINE, 3, i) <= 0 {
-			check(LINE, 1)
-		}
-	}
-	for i := 0; i < 3; i++ {
-		if checkVal(LINE, 3, i) <= 1 {
-			check(LINE, 2)
-		} else {
-			check(LINE, 1)
-		}
-	}
-	for i := 0; i < 3; i++ {
-		if checkVal(LINE, 3, i) <= 0 {
-			check(LINE, 1)
-		} else if checkVal(LINE, 2, i) <= 1 {
-			check(LINE, 1)
-		} else if checkVal(LINE, 1, i) <= 2 {
-			check(LINE, 1)
-		} else if checkVal(LINE, 0, i) <= 3 {
-			check(LINE, 0)
-		}
-	}
-	if func(a, b int) bool { return a < b }(3, 4) {
-		check(LINE, 1)
-	}
-}
-
-func testFor() {
-	for i := 0; i < 10; func() { i++; check(LINE, 10) }() {
-		check(LINE, 10)
-	}
-}
-
-func testRange() {
-	for _, f := range []func(){
-		func() { check(LINE, 1) },
-	} {
-		f()
-		check(LINE, 1)
-	}
-}
-
-func testBlockRun() {
-	check(LINE, 1)
-	{
-		check(LINE, 1)
-	}
-	{
-		check(LINE, 1)
-	}
-	check(LINE, 1)
-	{
-		check(LINE, 1)
-	}
-	{
-		check(LINE, 1)
-	}
-	check(LINE, 1)
-}
-
-func testSwitch() {
-	for i := 0; i < 5; func() { i++; check(LINE, 5) }() {
-		switch i {
-		case 0:
-			check(LINE, 1)
-		case 1:
-			check(LINE, 1)
-		case 2:
-			check(LINE, 1)
-		default:
-			check(LINE, 2)
-		}
-	}
-}
-
-func testTypeSwitch() {
-	var x = []interface{}{1, 2.0, "hi"}
-	for _, v := range x {
-		switch func() { check(LINE, 3) }(); v.(type) {
-		case int:
-			check(LINE, 1)
-		case float64:
-			check(LINE, 1)
-		case string:
-			check(LINE, 1)
-		case complex128:
-			check(LINE, 0)
-		default:
-			check(LINE, 0)
-		}
-	}
-}
-
-func testSelect1() {
-	c := make(chan int)
-	go func() {
-		for i := 0; i < 1000; i++ {
-			c <- i
-		}
-	}()
-	for {
-		select {
-		case <-c:
-			check(LINE, anything)
-		case <-c:
-			check(LINE, anything)
-		default:
-			check(LINE, 1)
-			return
-		}
-	}
-}
-
-func testSelect2() {
-	c1 := make(chan int, 1000)
-	c2 := make(chan int, 1000)
-	for i := 0; i < 1000; i++ {
-		c1 <- i
-		c2 <- i
-	}
-	for {
-		select {
-		case <-c1:
-			check(LINE, 1000)
-		case <-c2:
-			check(LINE, 1000)
-		default:
-			check(LINE, 1)
-			return
-		}
-	}
-}
-
-// Empty control statements created syntax errors. This function
-// is here just to be sure that those are handled correctly now.
-func testEmptySwitches() {
-	check(LINE, 1)
-	switch 3 {
-	}
-	check(LINE, 1)
-	switch i := (interface{})(3).(int); i {
-	}
-	check(LINE, 1)
-	c := make(chan int)
-	go func() {
-		check(LINE, 1)
-		c <- 1
-		select {}
-	}()
-	<-c
-	check(LINE, 1)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/digraph/digraph.go b/installer/vendor/golang.org/x/tools/cmd/digraph/digraph.go
deleted file mode 100644
index 3ad2950015..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/digraph/digraph.go
+++ /dev/null
@@ -1,540 +0,0 @@
-// The digraph command performs queries over unlabelled directed graphs
-// represented in text form.  It is intended to integrate nicely with
-// typical UNIX command pipelines.
-//
-// Since directed graphs (import graphs, reference graphs, call graphs,
-// etc) often arise during software tool development and debugging, this
-// command is included in the go.tools repository.
-//
-// TODO(adonovan):
-// - support input files other than stdin
-// - suport alternative formats (AT&T GraphViz, CSV, etc),
-//   a comment syntax, etc.
-// - allow queries to nest, like Blaze query language.
-//
-package main // import "golang.org/x/tools/cmd/digraph"
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"strconv"
-	"unicode"
-	"unicode/utf8"
-)
-
-const Usage = `digraph: queries over directed graphs in text form.
-
-Graph format:
-
-  Each line contains zero or more words.  Words are separated by
-  unquoted whitespace; words may contain Go-style double-quoted portions,
-  allowing spaces and other characters to be expressed.
-
-  Each field declares a node, and if there are more than one,
-  an edge from the first to each subsequent one.
-  The graph is provided on the standard input.
-
-  For instance, the following (acyclic) graph specifies a partial order
-  among the subtasks of getting dressed:
-
-	% cat clothes.txt
-	socks shoes
-	"boxer shorts" pants
-	pants belt shoes
-	shirt tie sweater
-	sweater jacket
-	hat
-
-  The line "shirt tie sweater" indicates the two edges shirt -> tie and
-  shirt -> sweater, not shirt -> tie -> sweater.
-
-Supported queries:
-
-  nodes
-	the set of all nodes
-  degree
-	the in-degree and out-degree of each node.
-  preds <label> ...
-	the set of immediate predecessors of the specified nodes
-  succs <label> ...
-	the set of immediate successors of the specified nodes
-  forward <label> ...
-	the set of nodes transitively reachable from the specified nodes
-  reverse <label> ...
-	the set of nodes that transitively reach the specified nodes
-  somepath <label> <label>
-	the list of nodes on some arbitrary path from the first node to the second
-  allpaths <label> <label>
-	the set of nodes on all paths from the first node to the second
-  sccs
-	all strongly connected components (one per line)
-  scc <label>
-	the set of nodes nodes strongly connected to the specified one
-
-Example usage:
-
-   Show the transitive closure of imports of the digraph tool itself:
-   % go list -f '{{.ImportPath}}{{.Imports}}' ... | tr '[]' '  ' |
-         digraph forward golang.org/x/tools/cmd/digraph
-
-   Show which clothes (see above) must be donned before a jacket:
-   %  digraph reverse jacket <clothes.txt
-
-`
-
-func main() {
-	flag.Parse()
-
-	args := flag.Args()
-	if len(args) == 0 {
-		fmt.Println(Usage)
-		return
-	}
-
-	if err := digraph(args[0], args[1:]); err != nil {
-		fmt.Fprintf(os.Stderr, "digraph: %s\n", err)
-		os.Exit(1)
-	}
-}
-
-type nodelist []string
-
-func (l nodelist) println(sep string) {
-	for i, label := range l {
-		if i > 0 {
-			fmt.Fprint(stdout, sep)
-		}
-		fmt.Fprint(stdout, label)
-	}
-	fmt.Fprintln(stdout)
-}
-
-type nodeset map[string]bool
-
-func (s nodeset) sort() nodelist {
-	labels := make(nodelist, len(s))
-	var i int
-	for label := range s {
-		labels[i] = label
-		i++
-	}
-	sort.Strings(labels)
-	return labels
-}
-
-func (s nodeset) addAll(x nodeset) {
-	for label := range x {
-		s[label] = true
-	}
-}
-
-// A graph maps nodes to the non-nil set of their immediate successors.
-type graph map[string]nodeset
-
-func (g graph) addNode(label string) nodeset {
-	edges := g[label]
-	if edges == nil {
-		edges = make(nodeset)
-		g[label] = edges
-	}
-	return edges
-}
-
-func (g graph) addEdges(from string, to ...string) {
-	edges := g.addNode(from)
-	for _, to := range to {
-		g.addNode(to)
-		edges[to] = true
-	}
-}
-
-func (g graph) reachableFrom(roots nodeset) nodeset {
-	seen := make(nodeset)
-	var visit func(label string)
-	visit = func(label string) {
-		if !seen[label] {
-			seen[label] = true
-			for e := range g[label] {
-				visit(e)
-			}
-		}
-	}
-	for root := range roots {
-		visit(root)
-	}
-	return seen
-}
-
-func (g graph) transpose() graph {
-	rev := make(graph)
-	for label, edges := range g {
-		rev.addNode(label)
-		for succ := range edges {
-			rev.addEdges(succ, label)
-		}
-	}
-	return rev
-}
-
-func (g graph) sccs() []nodeset {
-	// Kosaraju's algorithm---Tarjan is overkill here.
-
-	// Forward pass.
-	S := make(nodelist, 0, len(g)) // postorder stack
-	seen := make(nodeset)
-	var visit func(label string)
-	visit = func(label string) {
-		if !seen[label] {
-			seen[label] = true
-			for e := range g[label] {
-				visit(e)
-			}
-			S = append(S, label)
-		}
-	}
-	for label := range g {
-		visit(label)
-	}
-
-	// Reverse pass.
-	rev := g.transpose()
-	var scc nodeset
-	seen = make(nodeset)
-	var rvisit func(label string)
-	rvisit = func(label string) {
-		if !seen[label] {
-			seen[label] = true
-			scc[label] = true
-			for e := range rev[label] {
-				rvisit(e)
-			}
-		}
-	}
-	var sccs []nodeset
-	for len(S) > 0 {
-		top := S[len(S)-1]
-		S = S[:len(S)-1] // pop
-		if !seen[top] {
-			scc = make(nodeset)
-			rvisit(top)
-			sccs = append(sccs, scc)
-		}
-	}
-	return sccs
-}
-
-func parse(rd io.Reader) (graph, error) {
-	g := make(graph)
-
-	var linenum int
-	in := bufio.NewScanner(rd)
-	for in.Scan() {
-		linenum++
-		// Split into words, honoring double-quotes per Go spec.
-		words, err := split(in.Text())
-		if err != nil {
-			return nil, fmt.Errorf("at line %d: %v", linenum, err)
-		}
-		if len(words) > 0 {
-			g.addEdges(words[0], words[1:]...)
-		}
-	}
-	if err := in.Err(); err != nil {
-		return nil, err
-	}
-	return g, nil
-}
-
-var stdin io.Reader = os.Stdin
-var stdout io.Writer = os.Stdout
-
-func digraph(cmd string, args []string) error {
-	// Parse the input graph.
-	g, err := parse(stdin)
-	if err != nil {
-		return err
-	}
-
-	// Parse the command line.
-	switch cmd {
-	case "nodes":
-		if len(args) != 0 {
-			return fmt.Errorf("usage: digraph nodes")
-		}
-		nodes := make(nodeset)
-		for label := range g {
-			nodes[label] = true
-		}
-		nodes.sort().println("\n")
-
-	case "degree":
-		if len(args) != 0 {
-			return fmt.Errorf("usage: digraph degree")
-		}
-		nodes := make(nodeset)
-		for label := range g {
-			nodes[label] = true
-		}
-		rev := g.transpose()
-		for _, label := range nodes.sort() {
-			fmt.Fprintf(stdout, "%d\t%d\t%s\n", len(rev[label]), len(g[label]), label)
-		}
-
-	case "succs", "preds":
-		if len(args) == 0 {
-			return fmt.Errorf("usage: digraph %s <label> ...", cmd)
-		}
-		g := g
-		if cmd == "preds" {
-			g = g.transpose()
-		}
-		result := make(nodeset)
-		for _, root := range args {
-			edges := g[root]
-			if edges == nil {
-				return fmt.Errorf("no such node %q", root)
-			}
-			result.addAll(edges)
-		}
-		result.sort().println("\n")
-
-	case "forward", "reverse":
-		if len(args) == 0 {
-			return fmt.Errorf("usage: digraph %s <label> ...", cmd)
-		}
-		roots := make(nodeset)
-		for _, root := range args {
-			if g[root] == nil {
-				return fmt.Errorf("no such node %q", root)
-			}
-			roots[root] = true
-		}
-		g := g
-		if cmd == "reverse" {
-			g = g.transpose()
-		}
-		g.reachableFrom(roots).sort().println("\n")
-
-	case "somepath":
-		if len(args) != 2 {
-			return fmt.Errorf("usage: digraph somepath <from> <to>")
-		}
-		from, to := args[0], args[1]
-		if g[from] == nil {
-			return fmt.Errorf("no such 'from' node %q", from)
-		}
-		if g[to] == nil {
-			return fmt.Errorf("no such 'to' node %q", to)
-		}
-
-		seen := make(nodeset)
-		var visit func(path nodelist, label string) bool
-		visit = func(path nodelist, label string) bool {
-			if !seen[label] {
-				seen[label] = true
-				if label == to {
-					append(path, label).println("\n")
-					return true // unwind
-				}
-				for e := range g[label] {
-					if visit(append(path, label), e) {
-						return true
-					}
-				}
-			}
-			return false
-		}
-		if !visit(make(nodelist, 0, 100), from) {
-			return fmt.Errorf("no path from %q to %q", args[0], args[1])
-		}
-
-	case "allpaths":
-		if len(args) != 2 {
-			return fmt.Errorf("usage: digraph allpaths <from> <to>")
-		}
-		from, to := args[0], args[1]
-		if g[from] == nil {
-			return fmt.Errorf("no such 'from' node %q", from)
-		}
-		if g[to] == nil {
-			return fmt.Errorf("no such 'to' node %q", to)
-		}
-
-		seen := make(nodeset) // value of seen[x] indicates whether x is on some path to 'to'
-		var visit func(label string) bool
-		visit = func(label string) bool {
-			reachesTo, ok := seen[label]
-			if !ok {
-				reachesTo = label == to
-
-				seen[label] = reachesTo
-				for e := range g[label] {
-					if visit(e) {
-						reachesTo = true
-					}
-				}
-				seen[label] = reachesTo
-			}
-			return reachesTo
-		}
-		if !visit(from) {
-			return fmt.Errorf("no path from %q to %q", from, to)
-		}
-		for label, reachesTo := range seen {
-			if !reachesTo {
-				delete(seen, label)
-			}
-		}
-		seen.sort().println("\n")
-
-	case "sccs":
-		if len(args) != 0 {
-			return fmt.Errorf("usage: digraph sccs")
-		}
-		for _, scc := range g.sccs() {
-			scc.sort().println(" ")
-		}
-
-	case "scc":
-		if len(args) != 1 {
-			return fmt.Errorf("usage: digraph scc <label>")
-		}
-		label := args[0]
-		if g[label] == nil {
-			return fmt.Errorf("no such node %q", label)
-		}
-		for _, scc := range g.sccs() {
-			if scc[label] {
-				scc.sort().println("\n")
-				break
-			}
-		}
-
-	default:
-		return fmt.Errorf("no such command %q", cmd)
-	}
-
-	return nil
-}
-
-// -- Utilities --------------------------------------------------------
-
-// split splits a line into words, which are generally separated by
-// spaces, but Go-style double-quoted string literals are also supported.
-// (This approximates the behaviour of the Bourne shell.)
-//
-//   `one "two three"` -> ["one" "two three"]
-//   `a"\n"b` -> ["a\nb"]
-//
-func split(line string) ([]string, error) {
-	var (
-		words   []string
-		inWord  bool
-		current bytes.Buffer
-	)
-
-	for len(line) > 0 {
-		r, size := utf8.DecodeRuneInString(line)
-		if unicode.IsSpace(r) {
-			if inWord {
-				words = append(words, current.String())
-				current.Reset()
-				inWord = false
-			}
-		} else if r == '"' {
-			var ok bool
-			size, ok = quotedLength(line)
-			if !ok {
-				return nil, errors.New("invalid quotation")
-			}
-			s, err := strconv.Unquote(line[:size])
-			if err != nil {
-				return nil, err
-			}
-			current.WriteString(s)
-			inWord = true
-		} else {
-			current.WriteRune(r)
-			inWord = true
-		}
-		line = line[size:]
-	}
-	if inWord {
-		words = append(words, current.String())
-	}
-	return words, nil
-}
-
-// quotedLength returns the length in bytes of the prefix of input that
-// contain a possibly-valid double-quoted Go string literal.
-//
-// On success, n is at least two (""); input[:n] may be passed to
-// strconv.Unquote to interpret its value, and input[n:] contains the
-// rest of the input.
-//
-// On failure, quotedLength returns false, and the entire input can be
-// passed to strconv.Unquote if an informative error message is desired.
-//
-// quotedLength does not and need not detect all errors, such as
-// invalid hex or octal escape sequences, since it assumes
-// strconv.Unquote will be applied to the prefix.  It guarantees only
-// that if there is a prefix of input containing a valid string literal,
-// its length is returned.
-//
-// TODO(adonovan): move this into a strconv-like utility package.
-//
-func quotedLength(input string) (n int, ok bool) {
-	var offset int
-
-	// next returns the rune at offset, or -1 on EOF.
-	// offset advances to just after that rune.
-	next := func() rune {
-		if offset < len(input) {
-			r, size := utf8.DecodeRuneInString(input[offset:])
-			offset += size
-			return r
-		}
-		return -1
-	}
-
-	if next() != '"' {
-		return // error: not a quotation
-	}
-
-	for {
-		r := next()
-		if r == '\n' || r < 0 {
-			return // error: string literal not terminated
-		}
-		if r == '"' {
-			return offset, true // success
-		}
-		if r == '\\' {
-			var skip int
-			switch next() {
-			case 'a', 'b', 'f', 'n', 'r', 't', 'v', '\\', '"':
-				skip = 0
-			case '0', '1', '2', '3', '4', '5', '6', '7':
-				skip = 2
-			case 'x':
-				skip = 2
-			case 'u':
-				skip = 4
-			case 'U':
-				skip = 8
-			default:
-				return // error: invalid escape
-			}
-
-			for i := 0; i < skip; i++ {
-				next()
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/digraph/digraph_test.go b/installer/vendor/golang.org/x/tools/cmd/digraph/digraph_test.go
deleted file mode 100644
index 0c90304939..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/digraph/digraph_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-func TestDigraph(t *testing.T) {
-	const g1 = `
-socks shoes
-shorts pants
-pants belt shoes
-shirt tie sweater
-sweater jacket
-hat
-`
-
-	const g2 = `
-a b c
-b d
-c d
-d c
-`
-
-	for _, test := range []struct {
-		input string
-		cmd   string
-		args  []string
-		want  string
-	}{
-		{g1, "nodes", nil, "belt\nhat\njacket\npants\nshirt\nshoes\nshorts\nsocks\nsweater\ntie\n"},
-		{g1, "reverse", []string{"jacket"}, "jacket\nshirt\nsweater\n"},
-		{g1, "forward", []string{"socks"}, "shoes\nsocks\n"},
-		{g1, "forward", []string{"socks", "sweater"}, "jacket\nshoes\nsocks\nsweater\n"},
-
-		{g2, "allpaths", []string{"a", "d"}, "a\nb\nc\nd\n"},
-
-		{g2, "sccs", nil, "a\nb\nc d\n"},
-		{g2, "scc", []string{"d"}, "c\nd\n"},
-		{g2, "succs", []string{"a"}, "b\nc\n"},
-		{g2, "preds", []string{"c"}, "a\nd\n"},
-		{g2, "preds", []string{"c", "d"}, "a\nb\nc\nd\n"},
-	} {
-		stdin = strings.NewReader(test.input)
-		stdout = new(bytes.Buffer)
-		if err := digraph(test.cmd, test.args); err != nil {
-			t.Error(err)
-			continue
-		}
-
-		got := stdout.(fmt.Stringer).String()
-		if got != test.want {
-			t.Errorf("digraph(%s, %s) = %q, want %q", test.cmd, test.args, got, test.want)
-		}
-	}
-
-	// TODO(adonovan):
-	// - test somepath (it's nondeterministic).
-	// - test errors
-}
-
-func TestSplit(t *testing.T) {
-	for _, test := range []struct {
-		line string
-		want []string
-	}{
-		{`one "2a 2b" three`, []string{"one", "2a 2b", "three"}},
-		{`one tw"\n\x0a\u000a\012"o three`, []string{"one", "tw\n\n\n\no", "three"}},
-	} {
-		got, err := split(test.line)
-		if err != nil {
-			t.Errorf("split(%s) failed: %v", test.line, err)
-		}
-		if !reflect.DeepEqual(got, test.want) {
-			t.Errorf("split(%s) = %v, want %v", test.line, got, test.want)
-		}
-	}
-}
-
-func TestQuotedLength(t *testing.T) {
-	for _, test := range []struct {
-		input string
-		want  int
-	}{
-		{`"abc"`, 5},
-		{`"abc"def`, 5},
-		{`"abc\"d"ef`, 8}, // "abc\"d" is consumed, ef is residue
-		{`"\012\n\x0a\u000a\U0000000a"`, 28},
-		{"\"\xff\"", 3}, // bad UTF-8 is ok
-		{`"\xff"`, 6},   // hex escape for bad UTF-8 is ok
-	} {
-		got, ok := quotedLength(test.input)
-		if !ok {
-			got = 0
-		}
-		if got != test.want {
-			t.Errorf("quotedLength(%s) = %d, want %d", test.input, got, test.want)
-		}
-	}
-
-	// errors
-	for _, input := range []string{
-		``,            // not a quotation
-		`a`,           // not a quotation
-		`'a'`,         // not a quotation
-		`"a`,          // not terminated
-		`"\0"`,        // short octal escape
-		`"\x1"`,       // short hex escape
-		`"\u000"`,     // short \u escape
-		`"\U0000000"`, // short \U escape
-		`"\k"`,        // invalid escape
-		"\"ab\nc\"",   // newline
-	} {
-		if n, ok := quotedLength(input); ok {
-			t.Errorf("quotedLength(%s) = %d, want !ok", input, n)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/eg/eg.go b/installer/vendor/golang.org/x/tools/cmd/eg/eg.go
deleted file mode 100644
index 18b0f09b10..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/eg/eg.go
+++ /dev/null
@@ -1,150 +0,0 @@
-// The eg command performs example-based refactoring.
-// For documentation, run the command, or see Help in
-// golang.org/x/tools/refactor/eg.
-package main // import "golang.org/x/tools/cmd/eg"
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"os"
-	"os/exec"
-	"strings"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/refactor/eg"
-)
-
-var (
-	beforeeditFlag = flag.String("beforeedit", "", "A command to exec before each file is edited (e.g. chmod, checkout).  Whitespace delimits argument words.  The string '{}' is replaced by the file name.")
-	helpFlag       = flag.Bool("help", false, "show detailed help message")
-	templateFlag   = flag.String("t", "", "template.go file specifying the refactoring")
-	transitiveFlag = flag.Bool("transitive", false, "apply refactoring to all dependencies too")
-	writeFlag      = flag.Bool("w", false, "rewrite input files in place (by default, the results are printed to standard output)")
-	verboseFlag    = flag.Bool("v", false, "show verbose matcher diagnostics")
-)
-
-func init() {
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-}
-
-const usage = `eg: an example-based refactoring tool.
-
-Usage: eg -t template.go [-w] [-transitive] <args>...
-
--help            show detailed help message
--t template.go	 specifies the template file (use -help to see explanation)
--w          	 causes files to be re-written in place.
--transitive 	 causes all dependencies to be refactored too.
--v               show verbose matcher diagnostics
--beforeedit cmd  a command to exec before each file is modified.
-                 "{}" represents the name of the file.
-` + loader.FromArgsUsage
-
-func main() {
-	if err := doMain(); err != nil {
-		fmt.Fprintf(os.Stderr, "eg: %s\n", err)
-		os.Exit(1)
-	}
-}
-
-func doMain() error {
-	flag.Parse()
-	args := flag.Args()
-
-	if *helpFlag {
-		fmt.Fprint(os.Stderr, eg.Help)
-		os.Exit(2)
-	}
-
-	if len(args) == 0 {
-		fmt.Fprint(os.Stderr, usage)
-		os.Exit(1)
-	}
-
-	if *templateFlag == "" {
-		return fmt.Errorf("no -t template.go file specified")
-	}
-
-	conf := loader.Config{
-		Fset:       token.NewFileSet(),
-		ParserMode: parser.ParseComments,
-	}
-
-	// The first Created package is the template.
-	conf.CreateFromFilenames("template", *templateFlag)
-
-	if _, err := conf.FromArgs(args, true); err != nil {
-		return err
-	}
-
-	// Load, parse and type-check the whole program.
-	iprog, err := conf.Load()
-	if err != nil {
-		return err
-	}
-
-	// Analyze the template.
-	template := iprog.Created[0]
-	xform, err := eg.NewTransformer(iprog.Fset, template.Pkg, template.Files[0], &template.Info, *verboseFlag)
-	if err != nil {
-		return err
-	}
-
-	// Apply it to the input packages.
-	var pkgs []*loader.PackageInfo
-	if *transitiveFlag {
-		for _, info := range iprog.AllPackages {
-			pkgs = append(pkgs, info)
-		}
-	} else {
-		pkgs = iprog.InitialPackages()
-	}
-	var hadErrors bool
-	for _, pkg := range pkgs {
-		if pkg == template {
-			continue
-		}
-		for _, file := range pkg.Files {
-			n := xform.Transform(&pkg.Info, pkg.Pkg, file)
-			if n == 0 {
-				continue
-			}
-			filename := iprog.Fset.File(file.Pos()).Name()
-			fmt.Fprintf(os.Stderr, "=== %s (%d matches)\n", filename, n)
-			if *writeFlag {
-				// Run the before-edit command (e.g. "chmod +w",  "checkout") if any.
-				if *beforeeditFlag != "" {
-					args := strings.Fields(*beforeeditFlag)
-					// Replace "{}" with the filename, like find(1).
-					for i := range args {
-						if i > 0 {
-							args[i] = strings.Replace(args[i], "{}", filename, -1)
-						}
-					}
-					cmd := exec.Command(args[0], args[1:]...)
-					cmd.Stdout = os.Stdout
-					cmd.Stderr = os.Stderr
-					if err := cmd.Run(); err != nil {
-						fmt.Fprintf(os.Stderr, "Warning: edit hook %q failed (%s)\n",
-							args, err)
-					}
-				}
-				if err := eg.WriteAST(iprog.Fset, filename, file); err != nil {
-					fmt.Fprintf(os.Stderr, "eg: %s\n", err)
-					hadErrors = true
-				}
-			} else {
-				format.Node(os.Stdout, iprog.Fset, file)
-			}
-		}
-	}
-	if hadErrors {
-		os.Exit(1)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/main.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/main.go
deleted file mode 100644
index 365a26149b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/main.go
+++ /dev/null
@@ -1,511 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The fiximports command fixes import declarations to use the canonical
-// import path for packages that have an "import comment" as defined by
-// https://golang.org/s/go14customimport.
-//
-//
-// Background
-//
-// The Go 1 custom import path mechanism lets the maintainer of a
-// package give it a stable name by which clients may import and "go
-// get" it, independent of the underlying version control system (such
-// as Git) or server (such as github.com) that hosts it.  Requests for
-// the custom name are redirected to the underlying name.  This allows
-// packages to be migrated from one underlying server or system to
-// another without breaking existing clients.
-//
-// Because this redirect mechanism creates aliases for existing
-// packages, it's possible for a single program to import the same
-// package by its canonical name and by an alias.  The resulting
-// executable will contain two copies of the package, which is wasteful
-// at best and incorrect at worst.
-//
-// To avoid this, "go build" reports an error if it encounters a special
-// comment like the one below, and if the import path in the comment
-// does not match the path of the enclosing package relative to
-// GOPATH/src:
-//
-//      $ grep ^package $GOPATH/src/github.com/bob/vanity/foo/foo.go
-// 	package foo // import "vanity.com/foo"
-//
-// The error from "go build" indicates that the package canonically
-// known as "vanity.com/foo" is locally installed under the
-// non-canonical name "github.com/bob/vanity/foo".
-//
-//
-// Usage
-//
-// When a package that you depend on introduces a custom import comment,
-// and your workspace imports it by the non-canonical name, your build
-// will stop working as soon as you update your copy of that package
-// using "go get -u".
-//
-// The purpose of the fiximports tool is to fix up all imports of the
-// non-canonical path within a Go workspace, replacing them with imports
-// of the canonical path.  Following a run of fiximports, the workspace
-// will no longer depend on the non-canonical copy of the package, so it
-// should be safe to delete.  It may be necessary to run "go get -u"
-// again to ensure that the package is locally installed under its
-// canonical path, if it was not already.
-//
-// The fiximports tool operates locally; it does not make HTTP requests
-// and does not discover new custom import comments.  It only operates
-// on non-canonical packages present in your workspace.
-//
-// The -baddomains flag is a list of domain names that should always be
-// considered non-canonical.  You can use this if you wish to make sure
-// that you no longer have any dependencies on packages from that
-// domain, even those that do not yet provide a canical import path
-// comment.  For example, the default value of -baddomains includes the
-// moribund code hosting site code.google.com, so fiximports will report
-// an error for each import of a package from this domain remaining
-// after canonicalization.
-//
-// To see the changes fiximports would make without applying them, use
-// the -n flag.
-//
-package main
-
-import (
-	"bytes"
-	"encoding/json"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// flags
-var (
-	dryrun     = flag.Bool("n", false, "dry run: show changes, but don't apply them")
-	badDomains = flag.String("baddomains", "code.google.com",
-		"a comma-separated list of domains from which packages should not be imported")
-	replaceFlag = flag.String("replace", "",
-		"a comma-separated list of noncanonical=canonical pairs of package paths.  If both items in a pair end with '...', they are treated as path prefixes.")
-)
-
-// seams for testing
-var (
-	stderr    io.Writer = os.Stderr
-	writeFile           = ioutil.WriteFile
-)
-
-const usage = `fiximports: rewrite import paths to use canonical package names.
-
-Usage: fiximports [-n] package...
-
-The package... arguments specify a list of packages
-in the style of the go tool; see "go help packages".
-Hint: use "all" or "..." to match the entire workspace.
-
-For details, see http://godoc.org/golang.org/x/tools/cmd/fiximports.
-
-Flags:
-  -n:	       dry run: show changes, but don't apply them
-  -baddomains  a comma-separated list of domains from which packages
-               should not be imported
-`
-
-func main() {
-	flag.Parse()
-
-	if len(flag.Args()) == 0 {
-		fmt.Fprintf(stderr, usage)
-		os.Exit(1)
-	}
-	if !fiximports(flag.Args()...) {
-		os.Exit(1)
-	}
-}
-
-type canonicalName struct{ path, name string }
-
-// fiximports fixes imports in the specified packages.
-// Invariant: a false result implies an error was already printed.
-func fiximports(packages ...string) bool {
-	// importedBy is the transpose of the package import graph.
-	importedBy := make(map[string]map[*build.Package]bool)
-
-	// addEdge adds an edge to the import graph.
-	addEdge := func(from *build.Package, to string) {
-		if to == "C" || to == "unsafe" {
-			return // fake
-		}
-		pkgs := importedBy[to]
-		if pkgs == nil {
-			pkgs = make(map[*build.Package]bool)
-			importedBy[to] = pkgs
-		}
-		pkgs[from] = true
-	}
-
-	// List metadata for all packages in the workspace.
-	pkgs, err := list("...")
-	if err != nil {
-		fmt.Fprintf(stderr, "importfix: %v\n", err)
-		return false
-	}
-
-	// packageName maps each package's path to its name.
-	packageName := make(map[string]string)
-	for _, p := range pkgs {
-		packageName[p.ImportPath] = p.Package.Name
-	}
-
-	// canonical maps each non-canonical package path to
-	// its canonical path and name.
-	// A present nil value indicates that the canonical package
-	// is unknown: hosted on a bad domain with no redirect.
-	canonical := make(map[string]canonicalName)
-	domains := strings.Split(*badDomains, ",")
-
-	type replaceItem struct {
-		old, new    string
-		matchPrefix bool
-	}
-	var replace []replaceItem
-	for _, pair := range strings.Split(*replaceFlag, ",") {
-		if pair == "" {
-			continue
-		}
-		words := strings.Split(pair, "=")
-		if len(words) != 2 {
-			fmt.Fprintf(stderr, "importfix: -replace: %q is not of the form \"canonical=noncanonical\".\n", pair)
-			return false
-		}
-		replace = append(replace, replaceItem{
-			old: strings.TrimSuffix(words[0], "..."),
-			new: strings.TrimSuffix(words[1], "..."),
-			matchPrefix: strings.HasSuffix(words[0], "...") &&
-				strings.HasSuffix(words[1], "..."),
-		})
-	}
-
-	// Find non-canonical packages and populate importedBy graph.
-	for _, p := range pkgs {
-		if p.Error != nil {
-			msg := p.Error.Err
-			if strings.Contains(msg, "code in directory") &&
-				strings.Contains(msg, "expects import") {
-				// don't show the very errors we're trying to fix
-			} else {
-				fmt.Fprintln(stderr, msg)
-			}
-		}
-
-		for _, imp := range p.Imports {
-			addEdge(&p.Package, imp)
-		}
-		for _, imp := range p.TestImports {
-			addEdge(&p.Package, imp)
-		}
-		for _, imp := range p.XTestImports {
-			addEdge(&p.Package, imp)
-		}
-
-		// Does package have an explicit import comment?
-		if p.ImportComment != "" {
-			if p.ImportComment != p.ImportPath {
-				canonical[p.ImportPath] = canonicalName{
-					path: p.Package.ImportComment,
-					name: p.Package.Name,
-				}
-			}
-		} else {
-			// Is package matched by a -replace item?
-			var newPath string
-			for _, item := range replace {
-				if item.matchPrefix {
-					if strings.HasPrefix(p.ImportPath, item.old) {
-						newPath = item.new + p.ImportPath[len(item.old):]
-						break
-					}
-				} else if p.ImportPath == item.old {
-					newPath = item.new
-					break
-				}
-			}
-			if newPath != "" {
-				newName := packageName[newPath]
-				if newName == "" {
-					newName = filepath.Base(newPath) // a guess
-				}
-				canonical[p.ImportPath] = canonicalName{
-					path: newPath,
-					name: newName,
-				}
-				continue
-			}
-
-			// Is package matched by a -baddomains item?
-			for _, domain := range domains {
-				slash := strings.Index(p.ImportPath, "/")
-				if slash < 0 {
-					continue // no slash: standard package
-				}
-				if p.ImportPath[:slash] == domain {
-					// Package comes from bad domain and has no import comment.
-					// Report an error each time this package is imported.
-					canonical[p.ImportPath] = canonicalName{}
-
-					// TODO(adonovan): should we make an HTTP request to
-					// see if there's an HTTP redirect, a "go-import" meta tag,
-					// or an import comment in the the latest revision?
-					// It would duplicate a lot of logic from "go get".
-				}
-				break
-			}
-		}
-	}
-
-	// Find all clients (direct importers) of canonical packages.
-	// These are the packages that need fixing up.
-	clients := make(map[*build.Package]bool)
-	for path := range canonical {
-		for client := range importedBy[path] {
-			clients[client] = true
-		}
-	}
-
-	// Restrict rewrites to the set of packages specified by the user.
-	if len(packages) == 1 && (packages[0] == "all" || packages[0] == "...") {
-		// no restriction
-	} else {
-		pkgs, err := list(packages...)
-		if err != nil {
-			fmt.Fprintf(stderr, "importfix: %v\n", err)
-			return false
-		}
-		seen := make(map[string]bool)
-		for _, p := range pkgs {
-			seen[p.ImportPath] = true
-		}
-		for client := range clients {
-			if !seen[client.ImportPath] {
-				delete(clients, client)
-			}
-		}
-	}
-
-	// Rewrite selected client packages.
-	ok := true
-	for client := range clients {
-		if !rewritePackage(client, canonical) {
-			ok = false
-
-			// There were errors.
-			// Show direct and indirect imports of client.
-			seen := make(map[string]bool)
-			var direct, indirect []string
-			for p := range importedBy[client.ImportPath] {
-				direct = append(direct, p.ImportPath)
-				seen[p.ImportPath] = true
-			}
-
-			var visit func(path string)
-			visit = func(path string) {
-				for q := range importedBy[path] {
-					qpath := q.ImportPath
-					if !seen[qpath] {
-						seen[qpath] = true
-						indirect = append(indirect, qpath)
-						visit(qpath)
-					}
-				}
-			}
-
-			if direct != nil {
-				fmt.Fprintf(stderr, "\timported directly by:\n")
-				sort.Strings(direct)
-				for _, path := range direct {
-					fmt.Fprintf(stderr, "\t\t%s\n", path)
-					visit(path)
-				}
-
-				if indirect != nil {
-					fmt.Fprintf(stderr, "\timported indirectly by:\n")
-					sort.Strings(indirect)
-					for _, path := range indirect {
-						fmt.Fprintf(stderr, "\t\t%s\n", path)
-					}
-				}
-			}
-		}
-	}
-
-	return ok
-}
-
-// Invariant: false result => error already printed.
-func rewritePackage(client *build.Package, canonical map[string]canonicalName) bool {
-	ok := true
-
-	used := make(map[string]bool)
-	var filenames []string
-	filenames = append(filenames, client.GoFiles...)
-	filenames = append(filenames, client.TestGoFiles...)
-	filenames = append(filenames, client.XTestGoFiles...)
-	var first bool
-	for _, filename := range filenames {
-		if !first {
-			first = true
-			fmt.Fprintf(stderr, "%s\n", client.ImportPath)
-		}
-		err := rewriteFile(filepath.Join(client.Dir, filename), canonical, used)
-		if err != nil {
-			fmt.Fprintf(stderr, "\tERROR: %v\n", err)
-			ok = false
-		}
-	}
-
-	// Show which imports were renamed in this package.
-	var keys []string
-	for key := range used {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	for _, key := range keys {
-		if p := canonical[key]; p.path != "" {
-			fmt.Fprintf(stderr, "\tfixed: %s -> %s\n", key, p.path)
-		} else {
-			fmt.Fprintf(stderr, "\tERROR: %s has no import comment\n", key)
-			ok = false
-		}
-	}
-
-	return ok
-}
-
-// rewrite reads, modifies, and writes filename, replacing all imports
-// of packages P in canonical by canonical[P].
-// It records in used which canonical packages were imported.
-// used[P]=="" indicates that P was imported but its canonical path is unknown.
-func rewriteFile(filename string, canonical map[string]canonicalName, used map[string]bool) error {
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, filename, nil, parser.ParseComments)
-	if err != nil {
-		return err
-	}
-	var changed bool
-	for _, imp := range f.Imports {
-		impPath, err := strconv.Unquote(imp.Path.Value)
-		if err != nil {
-			log.Printf("%s: bad import spec %q: %v",
-				fset.Position(imp.Pos()), imp.Path.Value, err)
-			continue
-		}
-		canon, ok := canonical[impPath]
-		if !ok {
-			continue // import path is canonical
-		}
-
-		used[impPath] = true
-
-		if canon.path == "" {
-			// The canonical path is unknown (a -baddomain).
-			// Show the offending import.
-			// TODO(adonovan): should we show the actual source text?
-			fmt.Fprintf(stderr, "\t%s:%d: import %q\n",
-				shortPath(filename),
-				fset.Position(imp.Pos()).Line, impPath)
-			continue
-		}
-
-		changed = true
-
-		imp.Path.Value = strconv.Quote(canon.path)
-
-		// Add a renaming import if necessary.
-		//
-		// This is a guess at best.  We can't see whether a 'go
-		// get' of the canonical import path would have the same
-		// name or not.  Assume it's the last segment.
-		newBase := path.Base(canon.path)
-		if imp.Name == nil && newBase != canon.name {
-			imp.Name = &ast.Ident{Name: canon.name}
-		}
-	}
-
-	if changed && !*dryrun {
-		var buf bytes.Buffer
-		if err := format.Node(&buf, fset, f); err != nil {
-			return fmt.Errorf("%s: couldn't format file: %v", filename, err)
-		}
-		return writeFile(filename, buf.Bytes(), 0644)
-	}
-
-	return nil
-}
-
-// listPackage is a copy of cmd/go/list.Package.
-// It has more fields than build.Package and we need some of them.
-type listPackage struct {
-	build.Package
-	Error *packageError // error loading package
-}
-
-// A packageError describes an error loading information about a package.
-type packageError struct {
-	ImportStack []string // shortest path from package named on command line to this one
-	Pos         string   // position of error
-	Err         string   // the error itself
-}
-
-// list runs 'go list' with the specified arguments and returns the
-// metadata for matching packages.
-func list(args ...string) ([]*listPackage, error) {
-	cmd := exec.Command("go", append([]string{"list", "-e", "-json"}, args...)...)
-	cmd.Stdout = new(bytes.Buffer)
-	cmd.Stderr = stderr
-	if err := cmd.Run(); err != nil {
-		return nil, err
-	}
-
-	dec := json.NewDecoder(cmd.Stdout.(io.Reader))
-	var pkgs []*listPackage
-	for {
-		var p listPackage
-		if err := dec.Decode(&p); err == io.EOF {
-			break
-		} else if err != nil {
-			return nil, err
-		}
-		pkgs = append(pkgs, &p)
-	}
-	return pkgs, nil
-}
-
-var cwd string
-
-func init() {
-	var err error
-	cwd, err = os.Getwd()
-	if err != nil {
-		log.Fatalf("os.Getwd: %v", err)
-	}
-}
-
-// shortPath returns an absolute or relative name for path, whatever is shorter.
-// Plundered from $GOROOT/src/cmd/go/build.go.
-func shortPath(path string) string {
-	if rel, err := filepath.Rel(cwd, path); err == nil && len(rel) < len(path) {
-		return rel
-	}
-	return path
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/main_test.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/main_test.go
deleted file mode 100644
index 75319a02c2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/main_test.go
+++ /dev/null
@@ -1,243 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package main
-
-import (
-	"bytes"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// TODO(adonovan):
-// - test introduction of renaming imports.
-// - test induced failures of rewriteFile.
-
-// Guide to the test packages:
-//
-// new.com/one		-- canonical name for old.com/one
-// old.com/one		-- non-canonical; has import comment "new.com/one"
-// old.com/bad		-- has a parse error
-// fruit.io/orange	\
-// fruit.io/banana	 } orange -> pear -> banana -> titanic.biz/bar
-// fruit.io/pear	/
-// titanic.biz/bar	-- domain is sinking; package has jumped ship to new.com/bar
-// titanic.biz/foo	-- domain is sinking but package has no import comment yet
-
-func TestFixImports(t *testing.T) {
-	gopath := filepath.Join(cwd, "testdata")
-	if err := os.Setenv("GOPATH", gopath); err != nil {
-		t.Fatalf("os.Setenv: %v", err)
-	}
-	defer func() {
-		stderr = os.Stderr
-		*badDomains = "code.google.com"
-		*replaceFlag = ""
-	}()
-
-	for i, test := range []struct {
-		packages    []string // packages to rewrite, "go list" syntax
-		badDomains  string   // -baddomains flag
-		replaceFlag string   // -replace flag
-		wantOK      bool
-		wantStderr  string
-		wantRewrite map[string]string
-	}{
-		// #0. No errors.
-		{
-			packages:   []string{"all"},
-			badDomains: "code.google.com",
-			wantOK:     true,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-fruit.io/banana
-	fixed: old.com/one -> new.com/one
-	fixed: titanic.biz/bar -> new.com/bar
-`,
-			wantRewrite: map[string]string{
-				"$GOPATH/src/fruit.io/banana/banana.go": `package banana
-
-import (
-	_ "new.com/bar"
-	_ "new.com/one"
-	_ "titanic.biz/foo"
-)`,
-			},
-		},
-		// #1. No packages needed rewriting.
-		{
-			packages:   []string{"titanic.biz/...", "old.com/...", "new.com/..."},
-			badDomains: "code.google.com",
-			wantOK:     true,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-`,
-		},
-		// #2. Some packages without import comments matched bad domains.
-		{
-			packages:   []string{"all"},
-			badDomains: "titanic.biz",
-			wantOK:     false,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-fruit.io/banana
-	testdata/src/fruit.io/banana/banana.go:6: import "titanic.biz/foo"
-	fixed: old.com/one -> new.com/one
-	fixed: titanic.biz/bar -> new.com/bar
-	ERROR: titanic.biz/foo has no import comment
-	imported directly by:
-		fruit.io/pear
-	imported indirectly by:
-		fruit.io/orange
-`,
-			wantRewrite: map[string]string{
-				"$GOPATH/src/fruit.io/banana/banana.go": `package banana
-
-import (
-	_ "new.com/bar"
-	_ "new.com/one"
-	_ "titanic.biz/foo"
-)`,
-			},
-		},
-		// #3. The -replace flag lets user supply missing import comments.
-		{
-			packages:    []string{"all"},
-			replaceFlag: "titanic.biz/foo=new.com/foo",
-			wantOK:      true,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-fruit.io/banana
-	fixed: old.com/one -> new.com/one
-	fixed: titanic.biz/bar -> new.com/bar
-	fixed: titanic.biz/foo -> new.com/foo
-`,
-			wantRewrite: map[string]string{
-				"$GOPATH/src/fruit.io/banana/banana.go": `package banana
-
-import (
-	_ "new.com/bar"
-	_ "new.com/foo"
-	_ "new.com/one"
-)`,
-			},
-		},
-		// #4. The -replace flag supports wildcards.
-		//     An explicit import comment takes precedence.
-		{
-			packages:    []string{"all"},
-			replaceFlag: "titanic.biz/...=new.com/...",
-			wantOK:      true,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-fruit.io/banana
-	fixed: old.com/one -> new.com/one
-	fixed: titanic.biz/bar -> new.com/bar
-	fixed: titanic.biz/foo -> new.com/foo
-`,
-			wantRewrite: map[string]string{
-				"$GOPATH/src/fruit.io/banana/banana.go": `package banana
-
-import (
-	_ "new.com/bar"
-	_ "new.com/foo"
-	_ "new.com/one"
-)`,
-			},
-		},
-		// #5. The -replace flag trumps -baddomains.
-		{
-			packages:    []string{"all"},
-			badDomains:  "titanic.biz",
-			replaceFlag: "titanic.biz/foo=new.com/foo",
-			wantOK:      true,
-			wantStderr: `
-testdata/src/old.com/bad/bad.go:2:43: expected 'package', found 'EOF'
-fruit.io/banana
-	fixed: old.com/one -> new.com/one
-	fixed: titanic.biz/bar -> new.com/bar
-	fixed: titanic.biz/foo -> new.com/foo
-`,
-			wantRewrite: map[string]string{
-				"$GOPATH/src/fruit.io/banana/banana.go": `package banana
-
-import (
-	_ "new.com/bar"
-	_ "new.com/foo"
-	_ "new.com/one"
-)`,
-			},
-		},
-	} {
-		*badDomains = test.badDomains
-		*replaceFlag = test.replaceFlag
-
-		stderr = new(bytes.Buffer)
-		gotRewrite := make(map[string]string)
-		writeFile = func(filename string, content []byte, mode os.FileMode) error {
-			filename = strings.Replace(filename, gopath, "$GOPATH", 1)
-			filename = filepath.ToSlash(filename)
-			gotRewrite[filename] = string(bytes.TrimSpace(content))
-			return nil
-		}
-
-		if runtime.GOOS == "windows" {
-			test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/old.com/bad/bad.go`, `testdata\src\old.com\bad\bad.go`, -1)
-			test.wantStderr = strings.Replace(test.wantStderr, `testdata/src/fruit.io/banana/banana.go`, `testdata\src\fruit.io\banana\banana.go`, -1)
-		}
-
-		// Check status code.
-		if fiximports(test.packages...) != test.wantOK {
-			t.Errorf("#%d. fiximports() = %t", i, !test.wantOK)
-		}
-
-		// Compare stderr output.
-		if got := stderr.(*bytes.Buffer).String(); got != test.wantStderr {
-			if strings.Contains(got, "vendor/golang_org/x/text/unicode/norm") {
-				t.Skip("skipping known-broken test; see golang.org/issue/17417")
-			}
-			t.Errorf("#%d. stderr: got <<%s>>, want <<%s>>",
-				i, stderr, test.wantStderr)
-		}
-
-		// Compare rewrites.
-		for k, v := range gotRewrite {
-			if test.wantRewrite[k] != v {
-				t.Errorf("#%d. rewrite[%s] = <<%s>>, want <<%s>>",
-					i, k, v, test.wantRewrite[k])
-			}
-			delete(test.wantRewrite, k)
-		}
-		for k, v := range test.wantRewrite {
-			t.Errorf("#%d. rewrite[%s] missing, want <<%s>>", i, k, v)
-		}
-	}
-}
-
-// TestDryRun tests that the -n flag suppresses calls to writeFile.
-func TestDryRun(t *testing.T) {
-	gopath := filepath.Join(cwd, "testdata")
-	if err := os.Setenv("GOPATH", gopath); err != nil {
-		t.Fatalf("os.Setenv: %v", err)
-	}
-
-	*dryrun = true
-	defer func() { *dryrun = false }() // restore
-	stderr = new(bytes.Buffer)
-	writeFile = func(filename string, content []byte, mode os.FileMode) error {
-		t.Fatalf("writeFile(%s) called in dryrun mode", filename)
-		return nil
-	}
-
-	if !fiximports("all") {
-		t.Fatalf("fiximports failed: %s", stderr)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/banana/banana.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/banana/banana.go
deleted file mode 100644
index 04e0242eda..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/banana/banana.go
+++ /dev/null
@@ -1,7 +0,0 @@
-package banana
-
-import (
-	_ "old.com/one"
-	_ "titanic.biz/bar"
-	_ "titanic.biz/foo"
-)
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/orange/orange.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/orange/orange.go
deleted file mode 100644
index ae65daa6b3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/orange/orange.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package orange
-
-import _ "fruit.io/pear"
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/pear/pear.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/pear/pear.go
deleted file mode 100644
index de92df05d4..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/fruit.io/pear/pear.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package pear
-
-import _ "fruit.io/banana"
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/new.com/one/one.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/new.com/one/one.go
deleted file mode 100644
index a8c5e83e93..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/new.com/one/one.go
+++ /dev/null
@@ -1 +0,0 @@
-package one // import "new.com/one"
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/bad/bad.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/bad/bad.go
deleted file mode 100644
index a1a3d1ad5f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/bad/bad.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// This ill-formed Go source file is here to ensure the tool is robust
-// against bad packages in the workspace.
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/one/one.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/one/one.go
deleted file mode 100644
index a8c5e83e93..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/old.com/one/one.go
+++ /dev/null
@@ -1 +0,0 @@
-package one // import "new.com/one"
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/bar/bar.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/bar/bar.go
deleted file mode 100644
index cc720bc76a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/bar/bar.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// This package is moving to new.com too.
-package bar // import "new.com/bar"
diff --git a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/foo/foo.go b/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/foo/foo.go
deleted file mode 100644
index 145c31b8d2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/fiximports/testdata/src/titanic.biz/foo/foo.go
+++ /dev/null
@@ -1,2 +0,0 @@
-// This package hasn't jumped ship yet.
-package foo
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/.dockerignore b/installer/vendor/golang.org/x/tools/cmd/getgo/.dockerignore
deleted file mode 100644
index 2b87ad9cd7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/.dockerignore
+++ /dev/null
@@ -1,5 +0,0 @@
-.git
-.dockerignore
-LICENSE
-README.md
-.gitignore
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/.gitignore b/installer/vendor/golang.org/x/tools/cmd/getgo/.gitignore
deleted file mode 100644
index d4984ab94c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-build
-testgetgo
-getgo
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/Dockerfile b/installer/vendor/golang.org/x/tools/cmd/getgo/Dockerfile
deleted file mode 100644
index 78fd956679..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/Dockerfile
+++ /dev/null
@@ -1,20 +0,0 @@
-FROM golang:latest
-
-ENV SHELL /bin/bash
-ENV HOME /root
-WORKDIR $HOME
-
-COPY . /go/src/golang.org/x/tools/cmd/getgo
-
-RUN ( \
-		cd /go/src/golang.org/x/tools/cmd/getgo \
-		&& go build \
-		&& mv getgo /usr/local/bin/getgo \
-	)
-
-# undo the adding of GOPATH to env for testing
-ENV PATH /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-ENV GOPATH ""
-
-# delete /go and /usr/local/go for testing
-RUN rm -rf /go /usr/local/go
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/README.md b/installer/vendor/golang.org/x/tools/cmd/getgo/README.md
deleted file mode 100644
index e62a6c2b64..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/README.md
+++ /dev/null
@@ -1,71 +0,0 @@
-# getgo
-
-A proof-of-concept command-line installer for Go.
-
-This installer is designed to both install Go as well as do the initial configuration
-of setting up the right environment variables and paths.
-
-It will install the Go distribution (tools & stdlib) to "/.go" inside your home directory by default.
-
-It will setup "$HOME/go" as your GOPATH.
-This is where third party libraries and apps will be installed as well as where you will write your Go code.
-
-If Go is already installed via this installer it will upgrade it to the latest version of Go.
-
-Currently the installer supports Windows, \*nix and macOS on x86 & x64.
-It supports Bash and Zsh on all of these platforms as well as powershell & cmd.exe on Windows.
-
-## Usage
-
-Windows Powershell/cmd.exe:
-
-`(New-Object System.Net.WebClient).DownloadFile('https://get.golang.org/installer.exe', 'installer.exe'); Start-Process -Wait -NonewWindow installer.exe; Remove-Item installer.exe`
-
-Shell (Linux/macOS/Windows):
-
-`curl -LO https://get.golang.org/$(uname)/go_installer && chmod +x go_installer && ./go_installer && rm go_installer`
-
-## To Do
-
-* Check if Go is already installed (via a different method) and update it in place or at least notify the user
-* Lots of testing. It's only had limited testing so far.
-* Add support for additional shells.
-
-## Development instructions
-
-### Testing
-
-There are integration tests in [`main_test.go`](main_test.go). Please add more
-tests there.
-
-#### On unix/linux with the Dockerfile
-
-The Dockerfile automatically builds the binary, moves it to
-`/usr/local/bin/getgo` and then unsets `$GOPATH` and removes all `$GOPATH` from
-`$PATH`.
-
-```bash
-$ docker build --rm --force-rm -t getgo .
-...
-$ docker run --rm -it getgo bash
-root@78425260fad0:~# getgo -v
-Welcome to the Go installer!
-Downloading Go version go1.8.3 to /usr/local/go
-This may take a bit of time...
-Adding "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin" to /root/.bashrc
-Downloaded!
-Setting up GOPATH
-Adding "export GOPATH=/root/go" to /root/.bashrc
-Adding "export PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/root/go/bin" to /root/.bashrc
-GOPATH has been setup!
-root@78425260fad0:~# which go
-/usr/local/go/bin/go
-root@78425260fad0:~# echo $GOPATH
-/root/go
-root@78425260fad0:~# echo $PATH
-/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/go/bin:/root/go/bin
-```
-
-## Release instructions
-
-To upload a new release of getgo, run `./make.bash && ./upload.bash`.
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/download.go b/installer/vendor/golang.org/x/tools/cmd/getgo/download.go
deleted file mode 100644
index a68f47443a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/download.go
+++ /dev/null
@@ -1,182 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"archive/tar"
-	"archive/zip"
-	"compress/gzip"
-	"crypto/sha256"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-const (
-	currentVersionURL = "https://golang.org/VERSION?m=text"
-	downloadURLPrefix = "https://storage.googleapis.com/golang"
-)
-
-// downloadGoVersion downloads and upacks the specific go version to dest/go.
-func downloadGoVersion(version, ops, arch, dest string) error {
-	suffix := "tar.gz"
-	if ops == "windows" {
-		suffix = "zip"
-	}
-	uri := fmt.Sprintf("%s/%s.%s-%s.%s", downloadURLPrefix, version, ops, arch, suffix)
-
-	verbosef("Downloading %s", uri)
-
-	req, err := http.NewRequest("GET", uri, nil)
-	if err != nil {
-		return err
-	}
-	req.Header.Add("User-Agent", fmt.Sprintf("golang.org-getgo/%s", version))
-
-	resp, err := http.DefaultClient.Do(req)
-	if err != nil {
-		return fmt.Errorf("Downloading Go from %s failed: %v", uri, err)
-	}
-	if resp.StatusCode > 299 {
-		return fmt.Errorf("Downloading Go from %s failed with HTTP status %s", uri, resp.Status)
-	}
-	defer resp.Body.Close()
-
-	tmpf, err := ioutil.TempFile("", "go")
-	if err != nil {
-		return err
-	}
-	defer os.Remove(tmpf.Name())
-
-	h := sha256.New()
-
-	w := io.MultiWriter(tmpf, h)
-	if _, err := io.Copy(w, resp.Body); err != nil {
-		return err
-	}
-
-	verbosef("Downloading SHA %s.sha256", uri)
-
-	sresp, err := http.Get(uri + ".sha256")
-	if err != nil {
-		return fmt.Errorf("Downloading Go sha256 from %s.sha256 failed: %v", uri, err)
-	}
-	defer sresp.Body.Close()
-	if sresp.StatusCode > 299 {
-		return fmt.Errorf("Downloading Go sha256 from %s.sha256 failed with HTTP status %s", uri, sresp.Status)
-	}
-
-	shasum, err := ioutil.ReadAll(sresp.Body)
-	if err != nil {
-		return err
-	}
-
-	// Check the shasum.
-	sum := fmt.Sprintf("%x", h.Sum(nil))
-	if sum != string(shasum) {
-		return fmt.Errorf("Shasum mismatch %s vs. %s", sum, string(shasum))
-	}
-
-	unpackFunc := unpackTar
-	if ops == "windows" {
-		unpackFunc = unpackZip
-	}
-	if err := unpackFunc(tmpf.Name(), dest); err != nil {
-		return fmt.Errorf("Unpacking Go to %s failed: %v", dest, err)
-	}
-	return nil
-}
-
-func unpack(dest, name string, fi os.FileInfo, r io.Reader) error {
-	if strings.HasPrefix(name, "go/") {
-		name = name[len("go/"):]
-	}
-
-	path := filepath.Join(dest, name)
-	if fi.IsDir() {
-		return os.MkdirAll(path, fi.Mode())
-	}
-
-	f, err := os.OpenFile(path, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, fi.Mode())
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = io.Copy(f, r)
-	return err
-}
-
-func unpackTar(src, dest string) error {
-	r, err := os.Open(src)
-	if err != nil {
-		return err
-	}
-	defer r.Close()
-
-	archive, err := gzip.NewReader(r)
-	if err != nil {
-		return err
-	}
-	defer archive.Close()
-
-	tarReader := tar.NewReader(archive)
-
-	for {
-		header, err := tarReader.Next()
-		if err == io.EOF {
-			break
-		} else if err != nil {
-			return err
-		}
-
-		if err := unpack(dest, header.Name, header.FileInfo(), tarReader); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func unpackZip(src, dest string) error {
-	zr, err := zip.OpenReader(src)
-	if err != nil {
-		return err
-	}
-
-	for _, f := range zr.File {
-		fr, err := f.Open()
-		if err != nil {
-			return err
-		}
-		if err := unpack(dest, f.Name, f.FileInfo(), fr); err != nil {
-			return err
-		}
-		fr.Close()
-	}
-
-	return nil
-}
-
-func getLatestGoVersion() (string, error) {
-	resp, err := http.Get(currentVersionURL)
-	if err != nil {
-		return "", fmt.Errorf("Getting current Go version failed: %v", err)
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode > 299 {
-		b, _ := ioutil.ReadAll(io.LimitReader(resp.Body, 1024))
-		return "", fmt.Errorf("Could not get current Go version: HTTP %d: %q", resp.StatusCode, b)
-	}
-	version, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return "", err
-	}
-	return strings.TrimSpace(string(version)), nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/download_test.go b/installer/vendor/golang.org/x/tools/cmd/getgo/download_test.go
deleted file mode 100644
index 1a47823c09..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/download_test.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"testing"
-)
-
-func TestDownloadGoVersion(t *testing.T) {
-	if testing.Short() {
-		t.Skipf("Skipping download in short mode")
-	}
-
-	tmpd, err := ioutil.TempDir("", "go")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpd)
-
-	if err := downloadGoVersion("go1.8.1", "linux", "amd64", filepath.Join(tmpd, "go")); err != nil {
-		t.Fatal(err)
-	}
-
-	// Ensure the VERSION file exists.
-	vf := filepath.Join(tmpd, "go", "VERSION")
-	if _, err := os.Stat(vf); os.IsNotExist(err) {
-		t.Fatalf("file %s does not exist and should", vf)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/main.go b/installer/vendor/golang.org/x/tools/cmd/getgo/main.go
deleted file mode 100644
index 8d9fbd41bb..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/main.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The getgo command installs Go to the user's system.
-package main
-
-import (
-	"bufio"
-	"context"
-	"errors"
-	"flag"
-	"fmt"
-	"os"
-	"os/exec"
-	"strings"
-)
-
-var (
-	interactive = flag.Bool("i", false, "Interactive mode, prompt for inputs.")
-	verbose     = flag.Bool("v", false, "Verbose.")
-	setupOnly   = flag.Bool("skip-dl", false, "Don't download - only set up environment variables")
-	goVersion   = flag.String("version", "", `Version of Go to install (e.g. "1.8.3"). If empty, uses the latest version.`)
-
-	version = "devel"
-)
-
-var exitCleanly error = errors.New("exit cleanly sentinel value")
-
-func main() {
-	flag.Parse()
-	if *goVersion != "" && !strings.HasPrefix(*goVersion, "go") {
-		*goVersion = "go" + *goVersion
-	}
-
-	ctx := context.Background()
-
-	verbosef("version " + version)
-
-	runStep := func(s step) {
-		err := s(ctx)
-		if err == exitCleanly {
-			os.Exit(0)
-		}
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(2)
-		}
-	}
-
-	if !*setupOnly {
-		runStep(welcome)
-		runStep(checkOthers)
-		runStep(chooseVersion)
-		runStep(downloadGo)
-	}
-
-	runStep(setupGOPATH)
-}
-
-func verbosef(format string, v ...interface{}) {
-	if !*verbose {
-		return
-	}
-
-	fmt.Printf(format+"\n", v...)
-}
-
-func prompt(ctx context.Context, query, defaultAnswer string) (string, error) {
-	if !*interactive {
-		return defaultAnswer, nil
-	}
-
-	fmt.Printf("%s [%s]: ", query, defaultAnswer)
-
-	type result struct {
-		answer string
-		err    error
-	}
-	ch := make(chan result, 1)
-	go func() {
-		s := bufio.NewScanner(os.Stdin)
-		if !s.Scan() {
-			ch <- result{"", s.Err()}
-			return
-		}
-		answer := s.Text()
-		if answer == "" {
-			answer = defaultAnswer
-		}
-		ch <- result{answer, nil}
-	}()
-
-	select {
-	case r := <-ch:
-		return r.answer, r.err
-	case <-ctx.Done():
-		return "", ctx.Err()
-	}
-}
-
-func runCommand(ctx context.Context, prog string, args ...string) ([]byte, error) {
-	verbosef("Running command: %s %v", prog, args)
-
-	cmd := exec.CommandContext(ctx, prog, args...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		return nil, fmt.Errorf("running cmd '%s %s' failed: %s err: %v", prog, strings.Join(args, " "), string(out), err)
-	}
-	if out != nil && err == nil && len(out) != 0 {
-		verbosef("%s", out)
-	}
-
-	return out, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/main_test.go b/installer/vendor/golang.org/x/tools/cmd/getgo/main_test.go
deleted file mode 100644
index 932a739788..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/main_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"runtime"
-	"testing"
-)
-
-const (
-	testbin = "testgetgo"
-)
-
-var (
-	exeSuffix string // ".exe" on Windows
-)
-
-func init() {
-	if runtime.GOOS == "windows" {
-		exeSuffix = ".exe"
-	}
-}
-
-// TestMain creates a getgo command for testing purposes and
-// deletes it after the tests have been run.
-func TestMain(m *testing.M) {
-	if os.Getenv("GOGET_INTEGRATION") == "" {
-		fmt.Fprintln(os.Stderr, "main_test: Skipping integration tests with GOGET_INTEGRATION unset")
-		return
-	}
-
-	args := []string{"build", "-tags", testbin, "-o", testbin + exeSuffix}
-	out, err := exec.Command("go", args...).CombinedOutput()
-	if err != nil {
-		fmt.Fprintf(os.Stderr, "building %s failed: %v\n%s", testbin, err, out)
-		os.Exit(2)
-	}
-
-	// Don't let these environment variables confuse the test.
-	os.Unsetenv("GOBIN")
-	os.Unsetenv("GOPATH")
-	os.Unsetenv("GIT_ALLOW_PROTOCOL")
-	os.Unsetenv("PATH")
-
-	r := m.Run()
-
-	os.Remove(testbin + exeSuffix)
-
-	os.Exit(r)
-}
-
-func createTmpHome(t *testing.T) string {
-	tmpd, err := ioutil.TempDir("", "testgetgo")
-	if err != nil {
-		t.Fatalf("creating test tempdir failed: %v", err)
-	}
-
-	os.Setenv("HOME", tmpd)
-	return tmpd
-}
-
-// doRun runs the test getgo command, recording stdout and stderr and
-// returning exit status.
-func doRun(t *testing.T, args ...string) error {
-	var stdout, stderr bytes.Buffer
-	t.Logf("running %s %v", testbin, args)
-	cmd := exec.Command("./"+testbin+exeSuffix, args...)
-	cmd.Stdout = &stdout
-	cmd.Stderr = &stderr
-	cmd.Env = os.Environ()
-	status := cmd.Run()
-	if stdout.Len() > 0 {
-		t.Log("standard output:")
-		t.Log(stdout.String())
-	}
-	if stderr.Len() > 0 {
-		t.Log("standard error:")
-		t.Log(stderr.String())
-	}
-	return status
-}
-
-func TestCommandVerbose(t *testing.T) {
-	tmpd := createTmpHome(t)
-	defer os.RemoveAll(tmpd)
-
-	err := doRun(t, "-v")
-	if err != nil {
-		t.Fatal(err)
-	}
-	// make sure things are in path
-	shellConfig, err := shellConfigFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	b, err := ioutil.ReadFile(shellConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-	home, err := getHomeDir()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := fmt.Sprintf(`
-export PATH=$PATH:%s/.go/bin
-
-export GOPATH=%s/go
-
-export PATH=$PATH:%s/go/bin
-`, home, home, home)
-
-	if string(b) != expected {
-		t.Fatalf("%s expected %q, got %q", shellConfig, expected, string(b))
-	}
-}
-
-func TestCommandPathExists(t *testing.T) {
-	tmpd := createTmpHome(t)
-	defer os.RemoveAll(tmpd)
-
-	// run once
-	err := doRun(t, "-skip-dl")
-	if err != nil {
-		t.Fatal(err)
-	}
-	// make sure things are in path
-	shellConfig, err := shellConfigFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	b, err := ioutil.ReadFile(shellConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-	home, err := getHomeDir()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := fmt.Sprintf(`
-export GOPATH=%s/go
-
-export PATH=$PATH:%s/go/bin
-`, home, home)
-
-	if string(b) != expected {
-		t.Fatalf("%s expected %q, got %q", shellConfig, expected, string(b))
-	}
-
-	// run twice
-	if err := doRun(t, "-skip-dl"); err != nil {
-		t.Fatal(err)
-	}
-
-	b, err = ioutil.ReadFile(shellConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if string(b) != expected {
-		t.Fatalf("%s expected %q, got %q", shellConfig, expected, string(b))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/make.bash b/installer/vendor/golang.org/x/tools/cmd/getgo/make.bash
deleted file mode 100755
index cbc36857e8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/make.bash
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-set -e -o -x
-
-LDFLAGS="-X main.version=$(git describe --always --dirty='*')"
-
-GOOS=windows GOARCH=386 go build -o build/installer.exe    -ldflags="$LDFLAGS"
-GOOS=linux GOARCH=386   go build -o build/installer_linux  -ldflags="$LDFLAGS"
-GOOS=darwin GOARCH=386  go build -o build/installer_darwin -ldflags="$LDFLAGS"
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/path.go b/installer/vendor/golang.org/x/tools/cmd/getgo/path.go
deleted file mode 100644
index 551ac42e8c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/path.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bufio"
-	"context"
-	"fmt"
-	"os"
-	"os/user"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-const (
-	bashConfig = ".bash_profile"
-	zshConfig  = ".zshrc"
-)
-
-// appendToPATH adds the given path to the PATH environment variable and
-// persists it for future sessions.
-func appendToPATH(value string) error {
-	if isInPATH(value) {
-		return nil
-	}
-	return persistEnvVar("PATH", pathVar+envSeparator+value)
-}
-
-func isInPATH(dir string) bool {
-	p := os.Getenv("PATH")
-
-	paths := strings.Split(p, envSeparator)
-	for _, d := range paths {
-		if d == dir {
-			return true
-		}
-	}
-
-	return false
-}
-
-func getHomeDir() (string, error) {
-	home := os.Getenv(homeKey)
-	if home != "" {
-		return home, nil
-	}
-
-	u, err := user.Current()
-	if err != nil {
-		return "", err
-	}
-	return u.HomeDir, nil
-}
-
-func checkStringExistsFile(filename, value string) (bool, error) {
-	file, err := os.OpenFile(filename, os.O_RDONLY, 0600)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return false, nil
-		}
-		return false, err
-	}
-	defer file.Close()
-
-	scanner := bufio.NewScanner(file)
-	for scanner.Scan() {
-		line := scanner.Text()
-		if line == value {
-			return true, nil
-		}
-	}
-
-	return false, scanner.Err()
-}
-
-func appendToFile(filename, value string) error {
-	verbosef("Adding %q to %s", value, filename)
-
-	ok, err := checkStringExistsFile(filename, value)
-	if err != nil {
-		return err
-	}
-	if ok {
-		// Nothing to do.
-		return nil
-	}
-
-	f, err := os.OpenFile(filename, os.O_APPEND|os.O_WRONLY|os.O_CREATE, 0600)
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-
-	_, err = f.WriteString(lineEnding + value + lineEnding)
-	return err
-}
-
-func isShell(name string) bool {
-	return strings.Contains(currentShell(), name)
-}
-
-// persistEnvVarWindows sets an environment variable in the Windows
-// registry.
-func persistEnvVarWindows(name, value string) error {
-	_, err := runCommand(context.Background(), "powershell", "-command",
-		fmt.Sprintf(`[Environment]::SetEnvironmentVariable("%s", "%s", "User")`, name, value))
-	return err
-}
-
-func persistEnvVar(name, value string) error {
-	if runtime.GOOS == "windows" {
-		if err := persistEnvVarWindows(name, value); err != nil {
-			return err
-		}
-
-		if isShell("cmd.exe") || isShell("powershell.exe") {
-			return os.Setenv(strings.ToUpper(name), value)
-		}
-		// User is in bash, zsh, etc.
-		// Also set the environment variable in their shell config.
-	}
-
-	rc, err := shellConfigFile()
-	if err != nil {
-		return err
-	}
-
-	line := fmt.Sprintf("export %s=%s", strings.ToUpper(name), value)
-	if err := appendToFile(rc, line); err != nil {
-		return err
-	}
-
-	return os.Setenv(strings.ToUpper(name), value)
-}
-
-func shellConfigFile() (string, error) {
-	home, err := getHomeDir()
-	if err != nil {
-		return "", err
-	}
-
-	switch {
-	case isShell("bash"):
-		return filepath.Join(home, bashConfig), nil
-	case isShell("zsh"):
-		return filepath.Join(home, zshConfig), nil
-	default:
-		return "", fmt.Errorf("%q is not a supported shell", currentShell())
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/path_test.go b/installer/vendor/golang.org/x/tools/cmd/getgo/path_test.go
deleted file mode 100644
index 4cf66474cf..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/path_test.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-func TestAppendPath(t *testing.T) {
-	tmpd, err := ioutil.TempDir("", "go")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tmpd)
-
-	if err := os.Setenv("HOME", tmpd); err != nil {
-		t.Fatal(err)
-	}
-
-	GOPATH := os.Getenv("GOPATH")
-	if err := appendToPATH(filepath.Join(GOPATH, "bin")); err != nil {
-		t.Fatal(err)
-	}
-
-	shellConfig, err := shellConfigFile()
-	if err != nil {
-		t.Fatal(err)
-	}
-	b, err := ioutil.ReadFile(shellConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	expected := "export PATH=" + pathVar + envSeparator + filepath.Join(GOPATH, "bin")
-	if strings.TrimSpace(string(b)) != expected {
-		t.Fatalf("expected: %q, got %q", expected, strings.TrimSpace(string(b)))
-	}
-
-	// Check that appendToPATH is idempotent.
-	if err := appendToPATH(filepath.Join(GOPATH, "bin")); err != nil {
-		t.Fatal(err)
-	}
-	b, err = ioutil.ReadFile(shellConfig)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if strings.TrimSpace(string(b)) != expected {
-		t.Fatalf("expected: %q, got %q", expected, strings.TrimSpace(string(b)))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/server/README.md b/installer/vendor/golang.org/x/tools/cmd/getgo/server/README.md
deleted file mode 100644
index 0cf629d6e6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/server/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# getgo server
-
-## Deployment
-
-```
-gcloud app deploy --promote --project golang-org
-```
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/server/app.yaml b/installer/vendor/golang.org/x/tools/cmd/getgo/server/app.yaml
deleted file mode 100644
index 0502c4e04c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/server/app.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-runtime: go
-service: get
-api_version: go1
-
-handlers:
-- url: /.*
-  script: _go_app
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/server/main.go b/installer/vendor/golang.org/x/tools/cmd/getgo/server/main.go
deleted file mode 100644
index b599506558..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/server/main.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Command server serves get.golang.org, redirecting users to the appropriate
-// getgo installer based on the request path.
-package server
-
-import (
-	"fmt"
-	"net/http"
-	"strings"
-	"time"
-)
-
-const (
-	base             = "https://storage.googleapis.com/golang/getgo/"
-	windowsInstaller = base + "installer.exe"
-	linuxInstaller   = base + "installer_linux"
-	macInstaller     = base + "installer_darwin"
-)
-
-// substring-based redirects.
-var stringMatch = map[string]string{
-	// via uname, from bash
-	"MINGW":  windowsInstaller, // Reported as MINGW64_NT-10.0 in git bash
-	"Linux":  linuxInstaller,
-	"Darwin": macInstaller,
-}
-
-func init() {
-	http.HandleFunc("/", handler)
-}
-
-func handler(w http.ResponseWriter, r *http.Request) {
-	if containsIgnoreCase(r.URL.Path, "installer.exe") {
-		// cache bust
-		http.Redirect(w, r, windowsInstaller+cacheBust(), http.StatusFound)
-		return
-	}
-
-	for match, redirect := range stringMatch {
-		if containsIgnoreCase(r.URL.Path, match) {
-			http.Redirect(w, r, redirect, http.StatusFound)
-			return
-		}
-	}
-
-	http.NotFound(w, r)
-}
-
-func containsIgnoreCase(s, substr string) bool {
-	return strings.Contains(
-		strings.ToLower(s),
-		strings.ToLower(substr),
-	)
-}
-
-func cacheBust() string {
-	return fmt.Sprintf("?%d", time.Now().Nanosecond())
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/steps.go b/installer/vendor/golang.org/x/tools/cmd/getgo/steps.go
deleted file mode 100644
index eac6517d6b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/steps.go
+++ /dev/null
@@ -1,131 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-type step func(context.Context) error
-
-func welcome(ctx context.Context) error {
-	fmt.Println("Welcome to the Go installer!")
-	answer, err := prompt(ctx, "Would you like to install Go? Y/n", "Y")
-	if err != nil {
-		return err
-	}
-	if strings.ToLower(answer) != "y" {
-		fmt.Println("Exiting install.")
-		return exitCleanly
-	}
-
-	return nil
-}
-
-func checkOthers(ctx context.Context) error {
-	// TODO: if go is currently installed install new version over that
-	path, err := whichGo(ctx)
-	if err != nil {
-		fmt.Printf("Cannot check if Go is already installed:\n%v\n", err)
-	}
-	if path == "" {
-		return nil
-	}
-	if path != installPath {
-		fmt.Printf("Go is already installed at %v; remove it from your PATH.\n", path)
-	}
-	return nil
-}
-
-func chooseVersion(ctx context.Context) error {
-	if *goVersion != "" {
-		return nil
-	}
-
-	var err error
-	*goVersion, err = getLatestGoVersion()
-	if err != nil {
-		return err
-	}
-
-	answer, err := prompt(ctx, fmt.Sprintf("The latest Go version is %s, install that? Y/n", *goVersion), "Y")
-	if err != nil {
-		return err
-	}
-
-	if strings.ToLower(answer) != "y" {
-		// TODO: handle passing a version
-		fmt.Println("Aborting install.")
-		return exitCleanly
-	}
-
-	return nil
-}
-
-func downloadGo(ctx context.Context) error {
-	answer, err := prompt(ctx, fmt.Sprintf("Download Go version %s to %s? Y/n", *goVersion, installPath), "Y")
-	if err != nil {
-		return err
-	}
-
-	if strings.ToLower(answer) != "y" {
-		fmt.Println("Aborting install.")
-		return exitCleanly
-	}
-
-	fmt.Printf("Downloading Go version %s to %s\n", *goVersion, installPath)
-	fmt.Println("This may take a bit of time...")
-
-	if err := downloadGoVersion(*goVersion, runtime.GOOS, arch, installPath); err != nil {
-		return err
-	}
-
-	if err := appendToPATH(filepath.Join(installPath, "bin")); err != nil {
-		return err
-	}
-
-	fmt.Println("Downloaded!")
-	return nil
-}
-
-func setupGOPATH(ctx context.Context) error {
-	answer, err := prompt(ctx, "Would you like us to setup your GOPATH? Y/n", "Y")
-	if err != nil {
-		return err
-	}
-
-	if strings.ToLower(answer) != "y" {
-		fmt.Println("Exiting and not setting up GOPATH.")
-		return exitCleanly
-	}
-
-	fmt.Println("Setting up GOPATH")
-	home, err := getHomeDir()
-	if err != nil {
-		return err
-	}
-
-	gopath := os.Getenv("GOPATH")
-	if gopath == "" {
-		// set $GOPATH
-		gopath = filepath.Join(home, "go")
-		if err := persistEnvVar("GOPATH", gopath); err != nil {
-			return err
-		}
-		fmt.Println("GOPATH has been set up!")
-	} else {
-		verbosef("GOPATH is already set to %s", gopath)
-	}
-
-	if err := appendToPATH(filepath.Join(gopath, "bin")); err != nil {
-		return err
-	}
-	return persistEnvChangesForSession()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/system.go b/installer/vendor/golang.org/x/tools/cmd/getgo/system.go
deleted file mode 100644
index 8b5b024d27..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/system.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"context"
-	"os/exec"
-	"runtime"
-	"strings"
-)
-
-// arch contains either amd64 or 386.
-var arch = func() string {
-	cmd := exec.Command("uname", "-m") // "x86_64"
-	if runtime.GOOS == "windows" {
-		cmd = exec.Command("powershell", "-command", "(Get-WmiObject -Class Win32_ComputerSystem).SystemType") // "x64-based PC"
-	}
-
-	out, err := cmd.Output()
-	if err != nil {
-		// a sensible default?
-		return "amd64"
-	}
-	if bytes.Contains(out, []byte("64")) {
-		return "amd64"
-	}
-	return "386"
-}()
-
-func findGo(ctx context.Context, cmd string) (string, error) {
-	out, err := exec.CommandContext(ctx, cmd, "go").CombinedOutput()
-	return strings.TrimSpace(string(out)), err
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/system_unix.go b/installer/vendor/golang.org/x/tools/cmd/getgo/system_unix.go
deleted file mode 100644
index d2405c5c08..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/system_unix.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris
-
-package main
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-)
-
-const (
-	envSeparator = ":"
-	homeKey      = "HOME"
-	lineEnding   = "\n"
-	pathVar      = "$PATH"
-)
-
-var installPath = func() string {
-	home, err := getHomeDir()
-	if err != nil {
-		return "/usr/local/go"
-	}
-
-	return filepath.Join(home, ".go")
-}()
-
-func whichGo(ctx context.Context) (string, error) {
-	return findGo(ctx, "which")
-}
-
-func isWindowsXP() bool {
-	return false
-}
-
-func currentShell() string {
-	return os.Getenv("SHELL")
-}
-
-func persistEnvChangesForSession() error {
-	shellConfig, err := shellConfigFile()
-	if err != nil {
-		return err
-	}
-	fmt.Println()
-	fmt.Printf("One more thing! Run `source %s` to persist the\n", shellConfig)
-	fmt.Println("new environment variables to your current session, or open a")
-	fmt.Println("new shell prompt.")
-
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/system_windows.go b/installer/vendor/golang.org/x/tools/cmd/getgo/system_windows.go
deleted file mode 100644
index d8a61917d8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/system_windows.go
+++ /dev/null
@@ -1,86 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build windows
-
-package main
-
-import (
-	"context"
-	"log"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-const (
-	envSeparator = ";"
-	homeKey      = "USERPROFILE"
-	lineEnding   = "/r/n"
-	pathVar      = "$env:Path"
-)
-
-var installPath = `c:\go`
-
-func isWindowsXP() bool {
-	v, err := syscall.GetVersion()
-	if err != nil {
-		log.Fatalf("GetVersion failed: %v", err)
-	}
-	major := byte(v)
-	return major < 6
-}
-
-func whichGo(ctx context.Context) (string, error) {
-	return findGo(ctx, "where")
-}
-
-// currentShell reports the current shell.
-// It might be "powershell.exe", "cmd.exe" or any of the *nix shells.
-//
-// Returns empty string if the shell is unknown.
-func currentShell() string {
-	shell := os.Getenv("SHELL")
-	if shell != "" {
-		return shell
-	}
-
-	pid := os.Getppid()
-	pe, err := getProcessEntry(pid)
-	if err != nil {
-		verbosef("getting shell from process entry failed: %v", err)
-		return ""
-	}
-
-	return syscall.UTF16ToString(pe.ExeFile[:])
-}
-
-func getProcessEntry(pid int) (*syscall.ProcessEntry32, error) {
-	// From https://go.googlesource.com/go/+/go1.8.3/src/syscall/syscall_windows.go#941
-	snapshot, err := syscall.CreateToolhelp32Snapshot(syscall.TH32CS_SNAPPROCESS, 0)
-	if err != nil {
-		return nil, err
-	}
-	defer syscall.CloseHandle(snapshot)
-
-	var procEntry syscall.ProcessEntry32
-	procEntry.Size = uint32(unsafe.Sizeof(procEntry))
-	if err = syscall.Process32First(snapshot, &procEntry); err != nil {
-		return nil, err
-	}
-
-	for {
-		if procEntry.ProcessID == uint32(pid) {
-			return &procEntry, nil
-		}
-
-		if err := syscall.Process32Next(snapshot, &procEntry); err != nil {
-			return nil, err
-		}
-	}
-}
-
-func persistEnvChangesForSession() error {
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/getgo/upload.bash b/installer/vendor/golang.org/x/tools/cmd/getgo/upload.bash
deleted file mode 100755
index f52bb23c93..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/getgo/upload.bash
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-if ! command -v gsutil 2>&1 > /dev/null; then
-  echo "Install gsutil:"
-  echo
-  echo "   https://cloud.google.com/storage/docs/gsutil_install#sdk-install"
-fi
-
-if [ ! -d build ]; then
-  echo "Run make.bash first"
-fi
-
-set -e -o -x
-
-gsutil -m cp -a public-read build/* gs://golang/getgo
diff --git a/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib.go b/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib.go
deleted file mode 100644
index 7c6574636f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib.go
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The go-contrib-init command helps new Go contributors get their development
-// environment set up for the Go contribution process.
-//
-// It aims to be a complement or alternative to https://golang.org/doc/contribute.html.
-package main
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-)
-
-var (
-	repo = flag.String("repo", detectrepo(), "Which go repo you want to contribute to. Use \"go\" for the core, or e.g. \"net\" for golang.org/x/net/*")
-	dry  = flag.Bool("dry-run", false, "Fail with problems instead of trying to fix things.")
-)
-
-func main() {
-	log.SetFlags(0)
-	flag.Parse()
-
-	checkCLA()
-	checkGoroot()
-	checkWorkingDir()
-	checkGitOrigin()
-	checkGitCodeReview()
-	fmt.Print("All good. Happy hacking!\n" +
-		"Remember to squash your revised commits and preserve the magic Change-Id lines.\n" +
-		"Next steps: https://golang.org/doc/contribute.html#commit_changes\n")
-}
-
-func detectrepo() string {
-	wd, err := os.Getwd()
-	if err != nil {
-		return "go"
-	}
-
-	for _, path := range filepath.SplitList(build.Default.GOPATH) {
-		rightdir := filepath.Join(path, "src", "golang.org", "x") + string(os.PathSeparator)
-		if strings.HasPrefix(wd, rightdir) {
-			tail := wd[len(rightdir):]
-			end := strings.Index(tail, string(os.PathSeparator))
-			if end > 0 {
-				repo := tail[:end]
-				return repo
-			}
-		}
-	}
-
-	return "go"
-}
-
-var googleSourceRx = regexp.MustCompile(`(?m)^(go|go-review)?\.googlesource.com\b`)
-
-func checkCLA() {
-	slurp, err := ioutil.ReadFile(cookiesFile())
-	if err != nil && !os.IsNotExist(err) {
-		log.Fatal(err)
-	}
-	if googleSourceRx.Match(slurp) {
-		// Probably good.
-		return
-	}
-	log.Fatal("Your .gitcookies file isn't configured.\n" +
-		"Next steps:\n" +
-		"  * Submit a CLA (https://golang.org/doc/contribute.html#cla) if not done\n" +
-		"  * Go to https://go.googlesource.com/ and click \"Generate Password\" at the top,\n" +
-		"    then follow instructions.\n" +
-		"  * Run go-contrib-init again.\n")
-}
-
-func expandUser(s string) string {
-	env := "HOME"
-	if runtime.GOOS == "windows" {
-		env = "USERPROFILE"
-	} else if runtime.GOOS == "plan9" {
-		env = "home"
-	}
-	home := os.Getenv(env)
-	if home == "" {
-		return s
-	}
-
-	if len(s) >= 2 && s[0] == '~' && os.IsPathSeparator(s[1]) {
-		if runtime.GOOS == "windows" {
-			s = filepath.ToSlash(filepath.Join(home, s[2:]))
-		} else {
-			s = filepath.Join(home, s[2:])
-		}
-	}
-	return os.Expand(s, func(env string) string {
-		if env == "HOME" {
-			return home
-		}
-		return os.Getenv(env)
-	})
-}
-
-func cookiesFile() string {
-	out, _ := exec.Command("git", "config", "http.cookiefile").Output()
-	if s := strings.TrimSpace(string(out)); s != "" {
-		if strings.HasPrefix(s, "~") {
-			s = expandUser(s)
-		}
-		return s
-	}
-	if runtime.GOOS == "windows" {
-		return filepath.Join(os.Getenv("USERPROFILE"), ".gitcookies")
-	}
-	return filepath.Join(os.Getenv("HOME"), ".gitcookies")
-}
-
-func checkGoroot() {
-	v := os.Getenv("GOROOT")
-	if v == "" {
-		return
-	}
-	if *repo == "go" {
-		if strings.HasPrefix(v, "/usr/") {
-			log.Fatalf("Your GOROOT environment variable is set to %q\n"+
-				"This is almost certainly not what you want. Either unset\n"+
-				"your GOROOT or set it to the path of your development version\n"+
-				"of Go.", v)
-		}
-		slurp, err := ioutil.ReadFile(filepath.Join(v, "VERSION"))
-		if err == nil {
-			slurp = bytes.TrimSpace(slurp)
-			log.Fatalf("Your GOROOT environment variable is set to %q\n"+
-				"But that path is to a binary release of Go, with VERSION file %q.\n"+
-				"You should hack on Go in a fresh checkout of Go. Fix or unset your GOROOT.\n",
-				v, slurp)
-		}
-	}
-}
-
-func checkWorkingDir() {
-	wd, err := os.Getwd()
-	if err != nil {
-		log.Fatal(err)
-	}
-	if *repo == "go" {
-		if inGoPath(wd) {
-			log.Fatalf(`You can't work on Go from within your GOPATH. Please checkout Go outside of your GOPATH
-
-Current directory: %s
-GOPATH: %s
-`, wd, os.Getenv("GOPATH"))
-		}
-		return
-	}
-
-	gopath := firstGoPath()
-	if gopath == "" {
-		log.Fatal("Your GOPATH is not set, please set it")
-	}
-
-	rightdir := filepath.Join(gopath, "src", "golang.org", "x", *repo)
-	if !strings.HasPrefix(wd, rightdir) {
-		dirExists, err := exists(rightdir)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if !dirExists {
-			log.Fatalf("The repo you want to work on is currently not on your system.\n"+
-				"Run %q to obtain this repo\n"+
-				"then go to the directory %q\n",
-				"go get -d golang.org/x/"+*repo, rightdir)
-		}
-		log.Fatalf("Your current directory is:%q\n"+
-			"Working on golang/x/%v requires you be in %q\n",
-			wd, *repo, rightdir)
-	}
-}
-
-func firstGoPath() string {
-	list := filepath.SplitList(build.Default.GOPATH)
-	if len(list) < 1 {
-		return ""
-	}
-	return list[0]
-}
-
-func exists(path string) (bool, error) {
-	_, err := os.Stat(path)
-	if os.IsNotExist(err) {
-		return false, nil
-	}
-	return true, err
-}
-
-func inGoPath(wd string) bool {
-	if os.Getenv("GOPATH") == "" {
-		return false
-	}
-
-	for _, path := range filepath.SplitList(os.Getenv("GOPATH")) {
-		if strings.HasPrefix(wd, filepath.Join(path, "src")) {
-			return true
-		}
-	}
-
-	return false
-}
-
-// mostly check that they didn't clone from github
-func checkGitOrigin() {
-	if _, err := exec.LookPath("git"); err != nil {
-		log.Fatalf("You don't appear to have git installed. Do that.")
-	}
-	wantRemote := "https://go.googlesource.com/" + *repo
-	remotes, err := exec.Command("git", "remote", "-v").Output()
-	if err != nil {
-		msg := cmdErr(err)
-		if strings.Contains(msg, "Not a git repository") {
-			log.Fatalf("Your current directory is not in a git checkout of %s", wantRemote)
-		}
-		log.Fatalf("Error running git remote -v: %v", msg)
-	}
-	matches := 0
-	for _, line := range strings.Split(string(remotes), "\n") {
-		line = strings.TrimSpace(line)
-		if !strings.HasPrefix(line, "origin") {
-			continue
-		}
-		if !strings.Contains(line, wantRemote) {
-			curRemote := strings.Fields(strings.TrimPrefix(line, "origin"))[0]
-			// TODO: if not in dryRun mode, just fix it?
-			log.Fatalf("Current directory's git was cloned from %q; origin should be %q", curRemote, wantRemote)
-		}
-		matches++
-	}
-	if matches == 0 {
-		log.Fatalf("git remote -v output didn't contain expected %q. Got:\n%s", wantRemote, remotes)
-	}
-}
-
-func cmdErr(err error) string {
-	if ee, ok := err.(*exec.ExitError); ok && len(ee.Stderr) > 0 {
-		return fmt.Sprintf("%s: %s", err, ee.Stderr)
-	}
-	return fmt.Sprint(err)
-}
-
-func checkGitCodeReview() {
-	if _, err := exec.LookPath("git-codereview"); err != nil {
-		if *dry {
-			log.Fatalf("You don't appear to have git-codereview tool. While this is technically optional,\n" +
-				"almost all Go contributors use it. Our documentation and this tool assume it is used.\n" +
-				"To install it, run:\n\n\t$ go get golang.org/x/review/git-codereview\n\n(Then run go-contrib-init again)")
-		}
-		err := exec.Command("go", "get", "golang.org/x/review/git-codereview").Run()
-		if err != nil {
-			log.Fatalf("Error running go get golang.org/x/review/git-codereview: %v", cmdErr(err))
-		}
-		log.Printf("Installed git-codereview (ran `go get golang.org/x/review/git-codereview`)")
-	}
-	missing := false
-	for _, cmd := range []string{"change", "gofmt", "mail", "pending", "submit", "sync"} {
-		v, _ := exec.Command("git", "config", "alias."+cmd).Output()
-		if strings.Contains(string(v), "codereview") {
-			continue
-		}
-		if *dry {
-			log.Printf("Missing alias. Run:\n\t$ git config alias.%s \"codereview %s\"", cmd, cmd)
-			missing = true
-		} else {
-			err := exec.Command("git", "config", "alias."+cmd, "codereview "+cmd).Run()
-			if err != nil {
-				log.Fatalf("Error setting alias.%s: %v", cmd, cmdErr(err))
-			}
-		}
-	}
-	if missing {
-		log.Fatalf("Missing aliases. (While optional, this tool assumes you use them.)")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib_test.go b/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib_test.go
deleted file mode 100644
index c151f020dd..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/go-contrib-init/contrib_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-package main
-
-import (
-	"os"
-	"runtime"
-	"testing"
-)
-
-func TestExpandUser(t *testing.T) {
-	env := "HOME"
-	if runtime.GOOS == "windows" {
-		env = "USERPROFILE"
-	} else if runtime.GOOS == "plan9" {
-		env = "home"
-	}
-
-	oldenv := os.Getenv(env)
-	os.Setenv(env, "/home/gopher")
-	defer os.Setenv(env, oldenv)
-
-	tests := []struct {
-		input string
-		want  string
-	}{
-		{input: "~/foo", want: "/home/gopher/foo"},
-		{input: "${HOME}/foo", want: "/home/gopher/foo"},
-		{input: "/~/foo", want: "/~/foo"},
-	}
-	for _, tt := range tests {
-		got := expandUser(tt.input)
-		if got != tt.want {
-			t.Fatalf("want %q, but %q", tt.want, got)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/doc.go b/installer/vendor/golang.org/x/tools/cmd/godex/doc.go
deleted file mode 100644
index ceb7c2fe14..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/doc.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The godex command prints (dumps) exported information of packages
-// or selected package objects.
-//
-// In contrast to godoc, godex extracts this information from compiled
-// object files. Hence the exported data is truly what a compiler will
-// see, at the cost of missing commentary.
-//
-// Usage: godex [flags] {path[.name]}
-//
-// Each argument must be a (possibly partial) package path, optionally
-// followed by a dot and the name of a package object:
-//
-//	godex math
-//	godex math.Sin
-//	godex math.Sin fmt.Printf
-//	godex go/types
-//
-// godex automatically tries all possible package path prefixes if only a
-// partial package path is given. For instance, for the path "go/types",
-// godex prepends "golang.org/x/tools".
-//
-// The prefixes are computed by searching the directories specified by
-// the GOROOT and GOPATH environment variables (and by excluding the
-// build OS- and architecture-specific directory names from the path).
-// The search order is depth-first and alphabetic; for a partial path
-// "foo", a package "a/foo" is found before "b/foo".
-//
-// Absolute and relative paths may be provided, which disable automatic
-// prefix generation:
-//
-//	godex $GOROOT/pkg/darwin_amd64/sort
-//	godex ./sort
-//
-// All but the last path element may contain dots; a dot in the last path
-// element separates the package path from the package object name. If the
-// last path element contains a dot, terminate the argument with another
-// dot (indicating an empty object name). For instance, the path for a
-// package foo.bar would be specified as in:
-//
-//	godex foo.bar.
-//
-// The flags are:
-//
-//	-s=""
-//		only consider packages from src, where src is one of the supported compilers
-//	-v=false
-//		verbose mode
-//
-// The following sources (-s arguments) are supported:
-//
-//	gc
-//		gc-generated object files
-//	gccgo
-//		gccgo-generated object files
-//	gccgo-new
-//		gccgo-generated object files using a condensed format (experimental)
-//	source
-//		(uncompiled) source code (not yet implemented)
-//
-// If no -s argument is provided, godex will try to find a matching source.
-//
-package main // import "golang.org/x/tools/cmd/godex"
-
-// BUG(gri): support for -s=source is not yet implemented
-// BUG(gri): gccgo-importing appears to have occasional problems stalling godex; try -s=gc as work-around
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/gc.go b/installer/vendor/golang.org/x/tools/cmd/godex/gc.go
deleted file mode 100644
index 95eba658b5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/gc.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements access to gc-generated export data.
-
-package main
-
-import "go/importer"
-
-func init() {
-	register("gc", importer.For("gc", nil))
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/gccgo.go b/installer/vendor/golang.org/x/tools/cmd/godex/gccgo.go
deleted file mode 100644
index 7644998d92..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/gccgo.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements access to gccgo-generated export data.
-
-package main
-
-import (
-	"go/importer"
-	"go/types"
-)
-
-func init() {
-	register("gccgo", importer.For("gccgo", nil))
-}
-
-// Print the extra gccgo compiler data for this package, if it exists.
-func (p *printer) printGccgoExtra(pkg *types.Package) {
-	// Disabled for now.
-	// TODO(gri) address this at some point.
-
-	// if initdata, ok := initmap[pkg]; ok {
-	// 	p.printf("/*\npriority %d\n", initdata.Priority)
-
-	// 	p.printDecl("init", len(initdata.Inits), func() {
-	// 		for _, init := range initdata.Inits {
-	// 			p.printf("%s %s %d\n", init.Name, init.InitFunc, init.Priority)
-	// 		}
-	// 	})
-
-	// 	p.print("*/\n")
-	// }
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/godex.go b/installer/vendor/golang.org/x/tools/cmd/godex/godex.go
deleted file mode 100644
index a222ed63c5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/godex.go
+++ /dev/null
@@ -1,211 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"go/build"
-	"go/types"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"strings"
-)
-
-var (
-	source  = flag.String("s", "", "only consider packages from src, where src is one of the supported compilers")
-	verbose = flag.Bool("v", false, "verbose mode")
-)
-
-// lists of registered sources and corresponding importers
-var (
-	sources      []string
-	importers    []types.Importer
-	importFailed = errors.New("import failed")
-)
-
-func usage() {
-	fmt.Fprintln(os.Stderr, "usage: godex [flags] {path|qualifiedIdent}")
-	flag.PrintDefaults()
-	os.Exit(2)
-}
-
-func report(msg string) {
-	fmt.Fprintln(os.Stderr, "error: "+msg)
-	os.Exit(2)
-}
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-
-	if flag.NArg() == 0 {
-		report("no package name, path, or file provided")
-	}
-
-	var imp types.Importer = new(tryImporters)
-	if *source != "" {
-		imp = lookup(*source)
-		if imp == nil {
-			report("source (-s argument) must be one of: " + strings.Join(sources, ", "))
-		}
-	}
-
-	for _, arg := range flag.Args() {
-		path, name := splitPathIdent(arg)
-		logf("\tprocessing %q: path = %q, name = %s\n", arg, path, name)
-
-		// generate possible package path prefixes
-		// (at the moment we do this for each argument - should probably cache the generated prefixes)
-		prefixes := make(chan string)
-		go genPrefixes(prefixes, !filepath.IsAbs(path) && !build.IsLocalImport(path))
-
-		// import package
-		pkg, err := tryPrefixes(prefixes, path, imp)
-		if err != nil {
-			logf("\t=> ignoring %q: %s\n", path, err)
-			continue
-		}
-
-		// filter objects if needed
-		var filter func(types.Object) bool
-		if name != "" {
-			filter = func(obj types.Object) bool {
-				// TODO(gri) perhaps use regular expression matching here?
-				return obj.Name() == name
-			}
-		}
-
-		// print contents
-		print(os.Stdout, pkg, filter)
-	}
-}
-
-func logf(format string, args ...interface{}) {
-	if *verbose {
-		fmt.Fprintf(os.Stderr, format, args...)
-	}
-}
-
-// splitPathIdent splits a path.name argument into its components.
-// All but the last path element may contain dots.
-func splitPathIdent(arg string) (path, name string) {
-	if i := strings.LastIndex(arg, "."); i >= 0 {
-		if j := strings.LastIndex(arg, "/"); j < i {
-			// '.' is not part of path
-			path = arg[:i]
-			name = arg[i+1:]
-			return
-		}
-	}
-	path = arg
-	return
-}
-
-// tryPrefixes tries to import the package given by (the possibly partial) path using the given importer imp
-// by prepending all possible prefixes to path. It returns with the first package that it could import, or
-// with an error.
-func tryPrefixes(prefixes chan string, path string, imp types.Importer) (pkg *types.Package, err error) {
-	for prefix := range prefixes {
-		actual := path
-		if prefix == "" {
-			// don't use filepath.Join as it will sanitize the path and remove
-			// a leading dot and then the path is not recognized as a relative
-			// package path by the importers anymore
-			logf("\ttrying no prefix\n")
-		} else {
-			actual = filepath.Join(prefix, path)
-			logf("\ttrying prefix %q\n", prefix)
-		}
-		pkg, err = imp.Import(actual)
-		if err == nil {
-			break
-		}
-		logf("\t=> importing %q failed: %s\n", actual, err)
-	}
-	return
-}
-
-// tryImporters is an importer that tries all registered importers
-// successively until one of them succeeds or all of them failed.
-type tryImporters struct{}
-
-func (t *tryImporters) Import(path string) (pkg *types.Package, err error) {
-	for i, imp := range importers {
-		logf("\t\ttrying %s import\n", sources[i])
-		pkg, err = imp.Import(path)
-		if err == nil {
-			break
-		}
-		logf("\t\t=> %s import failed: %s\n", sources[i], err)
-	}
-	return
-}
-
-type protector struct {
-	imp types.Importer
-}
-
-func (p *protector) Import(path string) (pkg *types.Package, err error) {
-	defer func() {
-		if recover() != nil {
-			pkg = nil
-			err = importFailed
-		}
-	}()
-	return p.imp.Import(path)
-}
-
-// protect protects an importer imp from panics and returns the protected importer.
-func protect(imp types.Importer) types.Importer {
-	return &protector{imp}
-}
-
-// register registers an importer imp for a given source src.
-func register(src string, imp types.Importer) {
-	if lookup(src) != nil {
-		panic(src + " importer already registered")
-	}
-	sources = append(sources, src)
-	importers = append(importers, protect(imp))
-}
-
-// lookup returns the importer imp for a given source src.
-func lookup(src string) types.Importer {
-	for i, s := range sources {
-		if s == src {
-			return importers[i]
-		}
-	}
-	return nil
-}
-
-func genPrefixes(out chan string, all bool) {
-	out <- ""
-	if all {
-		platform := build.Default.GOOS + "_" + build.Default.GOARCH
-		dirnames := append([]string{build.Default.GOROOT}, filepath.SplitList(build.Default.GOPATH)...)
-		for _, dirname := range dirnames {
-			walkDir(filepath.Join(dirname, "pkg", platform), "", out)
-		}
-	}
-	close(out)
-}
-
-func walkDir(dirname, prefix string, out chan string) {
-	fiList, err := ioutil.ReadDir(dirname)
-	if err != nil {
-		return
-	}
-	for _, fi := range fiList {
-		if fi.IsDir() && !strings.HasPrefix(fi.Name(), ".") {
-			prefix := filepath.Join(prefix, fi.Name())
-			out <- prefix
-			walkDir(filepath.Join(dirname, fi.Name()), prefix, out)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/isAlias18.go b/installer/vendor/golang.org/x/tools/cmd/godex/isAlias18.go
deleted file mode 100644
index cab1292681..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/isAlias18.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-package main
-
-import "go/types"
-
-func isAlias(obj *types.TypeName) bool {
-	return false // there are no type aliases before Go 1.9
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/isAlias19.go b/installer/vendor/golang.org/x/tools/cmd/godex/isAlias19.go
deleted file mode 100644
index 6ebdd42eb8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/isAlias19.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main
-
-import "go/types"
-
-func isAlias(obj *types.TypeName) bool {
-	return obj.IsAlias()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/print.go b/installer/vendor/golang.org/x/tools/cmd/godex/print.go
deleted file mode 100644
index adce86462a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/print.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"io"
-	"math/big"
-)
-
-// TODO(gri) use tabwriter for alignment?
-
-func print(w io.Writer, pkg *types.Package, filter func(types.Object) bool) {
-	var p printer
-	p.pkg = pkg
-	p.printPackage(pkg, filter)
-	p.printGccgoExtra(pkg)
-	io.Copy(w, &p.buf)
-}
-
-type printer struct {
-	pkg    *types.Package
-	buf    bytes.Buffer
-	indent int  // current indentation level
-	last   byte // last byte written
-}
-
-func (p *printer) print(s string) {
-	// Write the string one byte at a time. We care about the presence of
-	// newlines for indentation which we will see even in the presence of
-	// (non-corrupted) Unicode; no need to read one rune at a time.
-	for i := 0; i < len(s); i++ {
-		ch := s[i]
-		if ch != '\n' && p.last == '\n' {
-			// Note: This could lead to a range overflow for very large
-			// indentations, but it's extremely unlikely to happen for
-			// non-pathological code.
-			p.buf.WriteString("\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t\t"[:p.indent])
-		}
-		p.buf.WriteByte(ch)
-		p.last = ch
-	}
-}
-
-func (p *printer) printf(format string, args ...interface{}) {
-	p.print(fmt.Sprintf(format, args...))
-}
-
-// methodsFor returns the named type and corresponding methods if the type
-// denoted by obj is not an interface and has methods. Otherwise it returns
-// the zero value.
-func methodsFor(obj *types.TypeName) (*types.Named, []*types.Selection) {
-	named, _ := obj.Type().(*types.Named)
-	if named == nil {
-		// A type name's type can also be the
-		// exported basic type unsafe.Pointer.
-		return nil, nil
-	}
-	if _, ok := named.Underlying().(*types.Interface); ok {
-		// ignore interfaces
-		return nil, nil
-	}
-	methods := combinedMethodSet(named)
-	if len(methods) == 0 {
-		return nil, nil
-	}
-	return named, methods
-}
-
-func (p *printer) printPackage(pkg *types.Package, filter func(types.Object) bool) {
-	// collect objects by kind
-	var (
-		consts   []*types.Const
-		typem    []*types.Named    // non-interface types with methods
-		typez    []*types.TypeName // interfaces or types without methods
-		vars     []*types.Var
-		funcs    []*types.Func
-		builtins []*types.Builtin
-		methods  = make(map[*types.Named][]*types.Selection) // method sets for named types
-	)
-	scope := pkg.Scope()
-	for _, name := range scope.Names() {
-		obj := scope.Lookup(name)
-		if obj.Exported() {
-			// collect top-level exported and possibly filtered objects
-			if filter == nil || filter(obj) {
-				switch obj := obj.(type) {
-				case *types.Const:
-					consts = append(consts, obj)
-				case *types.TypeName:
-					// group into types with methods and types without
-					if named, m := methodsFor(obj); named != nil {
-						typem = append(typem, named)
-						methods[named] = m
-					} else {
-						typez = append(typez, obj)
-					}
-				case *types.Var:
-					vars = append(vars, obj)
-				case *types.Func:
-					funcs = append(funcs, obj)
-				case *types.Builtin:
-					// for unsafe.Sizeof, etc.
-					builtins = append(builtins, obj)
-				}
-			}
-		} else if filter == nil {
-			// no filtering: collect top-level unexported types with methods
-			if obj, _ := obj.(*types.TypeName); obj != nil {
-				// see case *types.TypeName above
-				if named, m := methodsFor(obj); named != nil {
-					typem = append(typem, named)
-					methods[named] = m
-				}
-			}
-		}
-	}
-
-	p.printf("package %s  // %q\n", pkg.Name(), pkg.Path())
-
-	p.printDecl("const", len(consts), func() {
-		for _, obj := range consts {
-			p.printObj(obj)
-			p.print("\n")
-		}
-	})
-
-	p.printDecl("var", len(vars), func() {
-		for _, obj := range vars {
-			p.printObj(obj)
-			p.print("\n")
-		}
-	})
-
-	p.printDecl("type", len(typez), func() {
-		for _, obj := range typez {
-			p.printf("%s ", obj.Name())
-			typ := obj.Type()
-			if isAlias(obj) {
-				p.print("= ")
-				p.writeType(p.pkg, typ)
-			} else {
-				p.writeType(p.pkg, typ.Underlying())
-			}
-			p.print("\n")
-		}
-	})
-
-	// non-interface types with methods
-	for _, named := range typem {
-		first := true
-		if obj := named.Obj(); obj.Exported() {
-			if first {
-				p.print("\n")
-				first = false
-			}
-			p.printf("type %s ", obj.Name())
-			p.writeType(p.pkg, named.Underlying())
-			p.print("\n")
-		}
-		for _, m := range methods[named] {
-			if obj := m.Obj(); obj.Exported() {
-				if first {
-					p.print("\n")
-					first = false
-				}
-				p.printFunc(m.Recv(), obj.(*types.Func))
-				p.print("\n")
-			}
-		}
-	}
-
-	if len(funcs) > 0 {
-		p.print("\n")
-		for _, obj := range funcs {
-			p.printFunc(nil, obj)
-			p.print("\n")
-		}
-	}
-
-	// TODO(gri) better handling of builtins (package unsafe only)
-	if len(builtins) > 0 {
-		p.print("\n")
-		for _, obj := range builtins {
-			p.printf("func %s() // builtin\n", obj.Name())
-		}
-	}
-
-	p.print("\n")
-}
-
-func (p *printer) printDecl(keyword string, n int, printGroup func()) {
-	switch n {
-	case 0:
-		// nothing to do
-	case 1:
-		p.printf("\n%s ", keyword)
-		printGroup()
-	default:
-		p.printf("\n%s (\n", keyword)
-		p.indent++
-		printGroup()
-		p.indent--
-		p.print(")\n")
-	}
-}
-
-// absInt returns the absolute value of v as a *big.Int.
-// v must be a numeric value.
-func absInt(v exact.Value) *big.Int {
-	// compute big-endian representation of v
-	b := exact.Bytes(v) // little-endian
-	for i, j := 0, len(b)-1; i < j; i, j = i+1, j-1 {
-		b[i], b[j] = b[j], b[i]
-	}
-	return new(big.Int).SetBytes(b)
-}
-
-var (
-	one = big.NewRat(1, 1)
-	ten = big.NewRat(10, 1)
-)
-
-// floatString returns the string representation for a
-// numeric value v in normalized floating-point format.
-func floatString(v exact.Value) string {
-	if exact.Sign(v) == 0 {
-		return "0.0"
-	}
-	// x != 0
-
-	// convert |v| into a big.Rat x
-	x := new(big.Rat).SetFrac(absInt(exact.Num(v)), absInt(exact.Denom(v)))
-
-	// normalize x and determine exponent e
-	// (This is not very efficient, but also not speed-critical.)
-	var e int
-	for x.Cmp(ten) >= 0 {
-		x.Quo(x, ten)
-		e++
-	}
-	for x.Cmp(one) < 0 {
-		x.Mul(x, ten)
-		e--
-	}
-
-	// TODO(gri) Values such as 1/2 are easier to read in form 0.5
-	// rather than 5.0e-1. Similarly, 1.0e1 is easier to read as
-	// 10.0. Fine-tune best exponent range for readability.
-
-	s := x.FloatString(100) // good-enough precision
-
-	// trim trailing 0's
-	i := len(s)
-	for i > 0 && s[i-1] == '0' {
-		i--
-	}
-	s = s[:i]
-
-	// add a 0 if the number ends in decimal point
-	if len(s) > 0 && s[len(s)-1] == '.' {
-		s += "0"
-	}
-
-	// add exponent and sign
-	if e != 0 {
-		s += fmt.Sprintf("e%+d", e)
-	}
-	if exact.Sign(v) < 0 {
-		s = "-" + s
-	}
-
-	// TODO(gri) If v is a "small" fraction (i.e., numerator and denominator
-	// are just a small number of decimal digits), add the exact fraction as
-	// a comment. For instance: 3.3333...e-1 /* = 1/3 */
-
-	return s
-}
-
-// valString returns the string representation for the value v.
-// Setting floatFmt forces an integer value to be formatted in
-// normalized floating-point format.
-// TODO(gri) Move this code into package exact.
-func valString(v exact.Value, floatFmt bool) string {
-	switch v.Kind() {
-	case exact.Int:
-		if floatFmt {
-			return floatString(v)
-		}
-	case exact.Float:
-		return floatString(v)
-	case exact.Complex:
-		re := exact.Real(v)
-		im := exact.Imag(v)
-		var s string
-		if exact.Sign(re) != 0 {
-			s = floatString(re)
-			if exact.Sign(im) >= 0 {
-				s += " + "
-			} else {
-				s += " - "
-				im = exact.UnaryOp(token.SUB, im, 0) // negate im
-			}
-		}
-		// im != 0, otherwise v would be exact.Int or exact.Float
-		return s + floatString(im) + "i"
-	}
-	return v.String()
-}
-
-func (p *printer) printObj(obj types.Object) {
-	p.print(obj.Name())
-
-	typ, basic := obj.Type().Underlying().(*types.Basic)
-	if basic && typ.Info()&types.IsUntyped != 0 {
-		// don't write untyped types
-	} else {
-		p.print(" ")
-		p.writeType(p.pkg, obj.Type())
-	}
-
-	if obj, ok := obj.(*types.Const); ok {
-		floatFmt := basic && typ.Info()&(types.IsFloat|types.IsComplex) != 0
-		p.print(" = ")
-		p.print(valString(obj.Val(), floatFmt))
-	}
-}
-
-func (p *printer) printFunc(recvType types.Type, obj *types.Func) {
-	p.print("func ")
-	sig := obj.Type().(*types.Signature)
-	if recvType != nil {
-		p.print("(")
-		p.writeType(p.pkg, recvType)
-		p.print(") ")
-	}
-	p.print(obj.Name())
-	p.writeSignature(p.pkg, sig)
-}
-
-// combinedMethodSet returns the method set for a named type T
-// merged with all the methods of *T that have different names than
-// the methods of T.
-//
-// combinedMethodSet is analogous to types/typeutil.IntuitiveMethodSet
-// but doesn't require a MethodSetCache.
-// TODO(gri) If this functionality doesn't change over time, consider
-// just calling IntuitiveMethodSet eventually.
-func combinedMethodSet(T *types.Named) []*types.Selection {
-	// method set for T
-	mset := types.NewMethodSet(T)
-	var res []*types.Selection
-	for i, n := 0, mset.Len(); i < n; i++ {
-		res = append(res, mset.At(i))
-	}
-
-	// add all *T methods with names different from T methods
-	pmset := types.NewMethodSet(types.NewPointer(T))
-	for i, n := 0, pmset.Len(); i < n; i++ {
-		pm := pmset.At(i)
-		if obj := pm.Obj(); mset.Lookup(obj.Pkg(), obj.Name()) == nil {
-			res = append(res, pm)
-		}
-	}
-
-	return res
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/source.go b/installer/vendor/golang.org/x/tools/cmd/godex/source.go
deleted file mode 100644
index 85235e9fa4..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/source.go
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements access to export data from source.
-
-package main
-
-import "go/types"
-
-func init() {
-	register("source", sourceImporter{})
-}
-
-type sourceImporter struct{}
-
-func (sourceImporter) Import(path string) (*types.Package, error) {
-	panic("unimplemented")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godex/writetype.go b/installer/vendor/golang.org/x/tools/cmd/godex/writetype.go
deleted file mode 100644
index dd17f90d7d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godex/writetype.go
+++ /dev/null
@@ -1,242 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements writing of types. The functionality is lifted
-// directly from go/types, but now contains various modifications for
-// nicer output.
-//
-// TODO(gri) back-port once we have a fixed interface and once the
-// go/types API is not frozen anymore for the 1.3 release; and remove
-// this implementation if possible.
-
-package main
-
-import "go/types"
-
-func (p *printer) writeType(this *types.Package, typ types.Type) {
-	p.writeTypeInternal(this, typ, make([]types.Type, 8))
-}
-
-// From go/types - leave for now to ease back-porting this code.
-const GcCompatibilityMode = false
-
-func (p *printer) writeTypeInternal(this *types.Package, typ types.Type, visited []types.Type) {
-	// Theoretically, this is a quadratic lookup algorithm, but in
-	// practice deeply nested composite types with unnamed component
-	// types are uncommon. This code is likely more efficient than
-	// using a map.
-	for _, t := range visited {
-		if t == typ {
-			p.printf("○%T", typ) // cycle to typ
-			return
-		}
-	}
-	visited = append(visited, typ)
-
-	switch t := typ.(type) {
-	case nil:
-		p.print("<nil>")
-
-	case *types.Basic:
-		if t.Kind() == types.UnsafePointer {
-			p.print("unsafe.")
-		}
-		if GcCompatibilityMode {
-			// forget the alias names
-			switch t.Kind() {
-			case types.Byte:
-				t = types.Typ[types.Uint8]
-			case types.Rune:
-				t = types.Typ[types.Int32]
-			}
-		}
-		p.print(t.Name())
-
-	case *types.Array:
-		p.printf("[%d]", t.Len())
-		p.writeTypeInternal(this, t.Elem(), visited)
-
-	case *types.Slice:
-		p.print("[]")
-		p.writeTypeInternal(this, t.Elem(), visited)
-
-	case *types.Struct:
-		n := t.NumFields()
-		if n == 0 {
-			p.print("struct{}")
-			return
-		}
-
-		p.print("struct {\n")
-		p.indent++
-		for i := 0; i < n; i++ {
-			f := t.Field(i)
-			if !f.Anonymous() {
-				p.printf("%s ", f.Name())
-			}
-			p.writeTypeInternal(this, f.Type(), visited)
-			if tag := t.Tag(i); tag != "" {
-				p.printf(" %q", tag)
-			}
-			p.print("\n")
-		}
-		p.indent--
-		p.print("}")
-
-	case *types.Pointer:
-		p.print("*")
-		p.writeTypeInternal(this, t.Elem(), visited)
-
-	case *types.Tuple:
-		p.writeTuple(this, t, false, visited)
-
-	case *types.Signature:
-		p.print("func")
-		p.writeSignatureInternal(this, t, visited)
-
-	case *types.Interface:
-		// We write the source-level methods and embedded types rather
-		// than the actual method set since resolved method signatures
-		// may have non-printable cycles if parameters have anonymous
-		// interface types that (directly or indirectly) embed the
-		// current interface. For instance, consider the result type
-		// of m:
-		//
-		//     type T interface{
-		//         m() interface{ T }
-		//     }
-		//
-		n := t.NumMethods()
-		if n == 0 {
-			p.print("interface{}")
-			return
-		}
-
-		p.print("interface {\n")
-		p.indent++
-		if GcCompatibilityMode {
-			// print flattened interface
-			// (useful to compare against gc-generated interfaces)
-			for i := 0; i < n; i++ {
-				m := t.Method(i)
-				p.print(m.Name())
-				p.writeSignatureInternal(this, m.Type().(*types.Signature), visited)
-				p.print("\n")
-			}
-		} else {
-			// print explicit interface methods and embedded types
-			for i, n := 0, t.NumExplicitMethods(); i < n; i++ {
-				m := t.ExplicitMethod(i)
-				p.print(m.Name())
-				p.writeSignatureInternal(this, m.Type().(*types.Signature), visited)
-				p.print("\n")
-			}
-			for i, n := 0, t.NumEmbeddeds(); i < n; i++ {
-				typ := t.Embedded(i)
-				p.writeTypeInternal(this, typ, visited)
-				p.print("\n")
-			}
-		}
-		p.indent--
-		p.print("}")
-
-	case *types.Map:
-		p.print("map[")
-		p.writeTypeInternal(this, t.Key(), visited)
-		p.print("]")
-		p.writeTypeInternal(this, t.Elem(), visited)
-
-	case *types.Chan:
-		var s string
-		var parens bool
-		switch t.Dir() {
-		case types.SendRecv:
-			s = "chan "
-			// chan (<-chan T) requires parentheses
-			if c, _ := t.Elem().(*types.Chan); c != nil && c.Dir() == types.RecvOnly {
-				parens = true
-			}
-		case types.SendOnly:
-			s = "chan<- "
-		case types.RecvOnly:
-			s = "<-chan "
-		default:
-			panic("unreachable")
-		}
-		p.print(s)
-		if parens {
-			p.print("(")
-		}
-		p.writeTypeInternal(this, t.Elem(), visited)
-		if parens {
-			p.print(")")
-		}
-
-	case *types.Named:
-		s := "<Named w/o object>"
-		if obj := t.Obj(); obj != nil {
-			if pkg := obj.Pkg(); pkg != nil {
-				if pkg != this {
-					p.print(pkg.Path())
-					p.print(".")
-				}
-				// TODO(gri): function-local named types should be displayed
-				// differently from named types at package level to avoid
-				// ambiguity.
-			}
-			s = obj.Name()
-		}
-		p.print(s)
-
-	default:
-		// For externally defined implementations of Type.
-		p.print(t.String())
-	}
-}
-
-func (p *printer) writeTuple(this *types.Package, tup *types.Tuple, variadic bool, visited []types.Type) {
-	p.print("(")
-	for i, n := 0, tup.Len(); i < n; i++ {
-		if i > 0 {
-			p.print(", ")
-		}
-		v := tup.At(i)
-		if name := v.Name(); name != "" {
-			p.print(name)
-			p.print(" ")
-		}
-		typ := v.Type()
-		if variadic && i == n-1 {
-			p.print("...")
-			typ = typ.(*types.Slice).Elem()
-		}
-		p.writeTypeInternal(this, typ, visited)
-	}
-	p.print(")")
-}
-
-func (p *printer) writeSignature(this *types.Package, sig *types.Signature) {
-	p.writeSignatureInternal(this, sig, make([]types.Type, 8))
-}
-
-func (p *printer) writeSignatureInternal(this *types.Package, sig *types.Signature, visited []types.Type) {
-	p.writeTuple(this, sig.Params(), sig.Variadic(), visited)
-
-	res := sig.Results()
-	n := res.Len()
-	if n == 0 {
-		// no result
-		return
-	}
-
-	p.print(" ")
-	if n == 1 && res.At(0).Name() == "" {
-		// single unnamed result
-		p.writeTypeInternal(this, res.At(0).Type(), visited)
-		return
-	}
-
-	// multiple or named result(s)
-	p.writeTuple(this, res, false, visited)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/README.godoc-app b/installer/vendor/golang.org/x/tools/cmd/godoc/README.godoc-app
deleted file mode 100644
index 50a051659d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/README.godoc-app
+++ /dev/null
@@ -1,56 +0,0 @@
-godoc on appengine
-------------------
-
-Prerequisites
--------------
-
-* Go appengine SDK
-  https://developers.google.com/appengine/downloads#Google_App_Engine_SDK_for_Go
-
-* Go sources at tip under $GOROOT
-
-* Godoc sources at tip inside $GOPATH
-  (go get -d golang.org/x/tools/cmd/godoc)
-
-
-Directory structure
--------------------
-
-* Let $APPDIR be the directory containing the app engine files.
-  (e.g., $APPDIR=$HOME/godoc-app)
-
-* $APPDIR contains the following entries (this may change depending on
-  app-engine release and version of godoc):
-
-	app.yaml
-	golang.org/x/tools/cmd/godoc
-	godoc.zip
-	index.split.*
-
-* The app.yaml file is set up per app engine documentation.
-  For instance:
-
-	application: godoc-app
-	version: 1
-	runtime: go
-	api_version: go1
-
-	handlers:
-	- url: /.*
-	  script: _go_app
-
-
-Configuring and running godoc
------------------------------
-
-To configure godoc, run
-
-	bash setup-godoc-app.bash
-
-to prepare an $APPDIR as described above. See the script for details on usage.
-
-To run godoc locally, using the App Engine development server, run
-
-	<path to go_appengine>/dev_appserver.py $APPDIR
-
-godoc should come up at http://localhost:8080 .
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/appinit.go b/installer/vendor/golang.org/x/tools/cmd/godoc/appinit.go
deleted file mode 100644
index 0c83df9074..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/appinit.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package main
-
-// This file replaces main.go when running godoc under app-engine.
-// See README.godoc-app for details.
-
-import (
-	"archive/zip"
-	"log"
-	"net/http"
-	"path"
-	"regexp"
-
-	"golang.org/x/tools/godoc"
-	"golang.org/x/tools/godoc/dl"
-	"golang.org/x/tools/godoc/proxy"
-	"golang.org/x/tools/godoc/short"
-	"golang.org/x/tools/godoc/static"
-	"golang.org/x/tools/godoc/vfs"
-	"golang.org/x/tools/godoc/vfs/mapfs"
-	"golang.org/x/tools/godoc/vfs/zipfs"
-
-	"google.golang.org/appengine"
-)
-
-func init() {
-	enforceHosts = !appengine.IsDevAppServer()
-	playEnabled = true
-
-	log.Println("initializing godoc ...")
-	log.Printf(".zip file   = %s", zipFilename)
-	log.Printf(".zip GOROOT = %s", zipGoroot)
-	log.Printf("index files = %s", indexFilenames)
-
-	goroot := path.Join("/", zipGoroot) // fsHttp paths are relative to '/'
-
-	// read .zip file and set up file systems
-	const zipfile = zipFilename
-	rc, err := zip.OpenReader(zipfile)
-	if err != nil {
-		log.Fatalf("%s: %s\n", zipfile, err)
-	}
-	// rc is never closed (app running forever)
-	fs.Bind("/", zipfs.New(rc, zipFilename), goroot, vfs.BindReplace)
-	fs.Bind("/lib/godoc", mapfs.New(static.Files), "/", vfs.BindReplace)
-
-	corpus := godoc.NewCorpus(fs)
-	corpus.Verbose = false
-	corpus.MaxResults = 10000 // matches flag default in main.go
-	corpus.IndexEnabled = true
-	corpus.IndexFiles = indexFilenames
-	if err := corpus.Init(); err != nil {
-		log.Fatal(err)
-	}
-	corpus.IndexDirectory = indexDirectoryDefault
-	go corpus.RunIndexer()
-
-	pres = godoc.NewPresentation(corpus)
-	pres.TabWidth = 8
-	pres.ShowPlayground = true
-	pres.ShowExamples = true
-	pres.DeclLinks = true
-	pres.NotesRx = regexp.MustCompile("BUG")
-
-	readTemplates(pres, true)
-
-	mux := registerHandlers(pres)
-	dl.RegisterHandlers(mux)
-	short.RegisterHandlers(mux)
-
-	// Register /compile and /share handlers against the default serve mux
-	// so that other app modules can make plain HTTP requests to those
-	// hosts. (For reasons, HTTPS communication between modules is broken.)
-	proxy.RegisterHandlers(http.DefaultServeMux)
-
-	log.Println("godoc initialization complete")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/autocert.go b/installer/vendor/golang.org/x/tools/cmd/godoc/autocert.go
deleted file mode 100644
index 9fc3a8fc5c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/autocert.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build autocert
-
-// This file adds automatic TLS certificate support (using
-// golang.org/x/crypto/acme/autocert), conditional on the use of the
-// autocert build tag. It sets the serveAutoCertHook func variable
-// non-nil. It is used by main.go.
-//
-// TODO: make this the default? We're in the Go 1.8 freeze now, so
-// this is too invasive to be default, but we want it for
-// https://beta.golang.org/
-
-package main
-
-import (
-	"crypto/tls"
-	"flag"
-	"net"
-	"net/http"
-	"time"
-
-	"golang.org/x/crypto/acme/autocert"
-	"golang.org/x/net/http2"
-)
-
-var (
-	autoCertDirFlag  = flag.String("autocert_cache_dir", "/var/cache/autocert", "Directory to cache TLS certs")
-	autoCertHostFlag = flag.String("autocert_hostname", "", "optional hostname to require in autocert SNI requests")
-)
-
-func init() {
-	serveAutoCertHook = serveAutoCert
-}
-
-func serveAutoCert(h http.Handler) error {
-	m := autocert.Manager{
-		Cache:  autocert.DirCache(*autoCertDirFlag),
-		Prompt: autocert.AcceptTOS,
-	}
-	if *autoCertHostFlag != "" {
-		m.HostPolicy = autocert.HostWhitelist(*autoCertHostFlag)
-	}
-	srv := &http.Server{
-		Handler: h,
-		TLSConfig: &tls.Config{
-			GetCertificate: m.GetCertificate,
-		},
-		IdleTimeout: 60 * time.Second,
-	}
-	http2.ConfigureServer(srv, &http2.Server{})
-	ln, err := net.Listen("tcp", ":443")
-	if err != nil {
-		return err
-	}
-	return srv.Serve(tls.NewListener(tcpKeepAliveListener{ln.(*net.TCPListener)}, srv.TLSConfig))
-}
-
-// tcpKeepAliveListener sets TCP keep-alive timeouts on accepted
-// connections. It's used by ListenAndServe and ListenAndServeTLS so
-// dead TCP connections (e.g. closing laptop mid-download) eventually
-// go away.
-type tcpKeepAliveListener struct {
-	*net.TCPListener
-}
-
-func (ln tcpKeepAliveListener) Accept() (c net.Conn, err error) {
-	tc, err := ln.AcceptTCP()
-	if err != nil {
-		return
-	}
-	tc.SetKeepAlive(true)
-	tc.SetKeepAlivePeriod(3 * time.Minute)
-	return tc, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/blog.go b/installer/vendor/golang.org/x/tools/cmd/godoc/blog.go
deleted file mode 100644
index dec4732fc7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/blog.go
+++ /dev/null
@@ -1,81 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/build"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-
-	"golang.org/x/tools/blog"
-	"golang.org/x/tools/godoc/redirect"
-)
-
-const (
-	blogRepo = "golang.org/x/blog"
-	blogURL  = "http://blog.golang.org/"
-	blogPath = "/blog/"
-)
-
-var (
-	blogServer   http.Handler // set by blogInit
-	blogInitOnce sync.Once
-	playEnabled  bool
-)
-
-func init() {
-	// Initialize blog only when first accessed.
-	http.HandleFunc(blogPath, func(w http.ResponseWriter, r *http.Request) {
-		blogInitOnce.Do(blogInit)
-		blogServer.ServeHTTP(w, r)
-	})
-}
-
-func blogInit() {
-	// Binary distributions will include the blog content in "/blog".
-	root := filepath.Join(runtime.GOROOT(), "blog")
-
-	// Prefer content from go.blog repository if present.
-	if pkg, err := build.Import(blogRepo, "", build.FindOnly); err == nil {
-		root = pkg.Dir
-	}
-
-	// If content is not available fall back to redirect.
-	if fi, err := os.Stat(root); err != nil || !fi.IsDir() {
-		fmt.Fprintf(os.Stderr, "Blog content not available locally. "+
-			"To install, run \n\tgo get %v\n", blogRepo)
-		blogServer = http.HandlerFunc(blogRedirectHandler)
-		return
-	}
-
-	s, err := blog.NewServer(blog.Config{
-		BaseURL:      blogPath,
-		BasePath:     strings.TrimSuffix(blogPath, "/"),
-		ContentPath:  filepath.Join(root, "content"),
-		TemplatePath: filepath.Join(root, "template"),
-		HomeArticles: 5,
-		PlayEnabled:  playEnabled,
-	})
-	if err != nil {
-		log.Fatal(err)
-	}
-	blogServer = s
-}
-
-func blogRedirectHandler(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == blogPath {
-		http.Redirect(w, r, blogURL, http.StatusFound)
-		return
-	}
-	blogPrefixHandler.ServeHTTP(w, r)
-}
-
-var blogPrefixHandler = redirect.PrefixHandler(blogPath, blogURL)
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/codewalk.go b/installer/vendor/golang.org/x/tools/cmd/godoc/codewalk.go
deleted file mode 100644
index e3bf5cd009..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/codewalk.go
+++ /dev/null
@@ -1,523 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The /doc/codewalk/ tree is synthesized from codewalk descriptions,
-// files named $GOROOT/doc/codewalk/*.xml.
-// For an example and a description of the format, see
-// http://golang.org/doc/codewalk/codewalk or run godoc -http=:6060
-// and see http://localhost:6060/doc/codewalk/codewalk .
-// That page is itself a codewalk; the source code for it is
-// $GOROOT/doc/codewalk/codewalk.xml.
-
-package main
-
-import (
-	"bytes"
-	"encoding/xml"
-	"errors"
-	"fmt"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	pathpkg "path"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"text/template"
-	"unicode/utf8"
-
-	"golang.org/x/tools/godoc"
-	"golang.org/x/tools/godoc/vfs"
-)
-
-var codewalkHTML, codewalkdirHTML *template.Template
-
-// Handler for /doc/codewalk/ and below.
-func codewalk(w http.ResponseWriter, r *http.Request) {
-	relpath := r.URL.Path[len("/doc/codewalk/"):]
-	abspath := r.URL.Path
-
-	r.ParseForm()
-	if f := r.FormValue("fileprint"); f != "" {
-		codewalkFileprint(w, r, f)
-		return
-	}
-
-	// If directory exists, serve list of code walks.
-	dir, err := fs.Lstat(abspath)
-	if err == nil && dir.IsDir() {
-		codewalkDir(w, r, relpath, abspath)
-		return
-	}
-
-	// If file exists, serve using standard file server.
-	if err == nil {
-		pres.ServeFile(w, r)
-		return
-	}
-
-	// Otherwise append .xml and hope to find
-	// a codewalk description, but before trim
-	// the trailing /.
-	abspath = strings.TrimRight(abspath, "/")
-	cw, err := loadCodewalk(abspath + ".xml")
-	if err != nil {
-		log.Print(err)
-		pres.ServeError(w, r, relpath, err)
-		return
-	}
-
-	// Canonicalize the path and redirect if changed
-	if redir(w, r) {
-		return
-	}
-
-	pres.ServePage(w, godoc.Page{
-		Title:    "Codewalk: " + cw.Title,
-		Tabtitle: cw.Title,
-		Body:     applyTemplate(codewalkHTML, "codewalk", cw),
-	})
-}
-
-func redir(w http.ResponseWriter, r *http.Request) (redirected bool) {
-	canonical := pathpkg.Clean(r.URL.Path)
-	if !strings.HasSuffix(canonical, "/") {
-		canonical += "/"
-	}
-	if r.URL.Path != canonical {
-		url := *r.URL
-		url.Path = canonical
-		http.Redirect(w, r, url.String(), http.StatusMovedPermanently)
-		redirected = true
-	}
-	return
-}
-
-func applyTemplate(t *template.Template, name string, data interface{}) []byte {
-	var buf bytes.Buffer
-	if err := t.Execute(&buf, data); err != nil {
-		log.Printf("%s.Execute: %s", name, err)
-	}
-	return buf.Bytes()
-}
-
-// A Codewalk represents a single codewalk read from an XML file.
-type Codewalk struct {
-	Title string      `xml:"title,attr"`
-	File  []string    `xml:"file"`
-	Step  []*Codestep `xml:"step"`
-}
-
-// A Codestep is a single step in a codewalk.
-type Codestep struct {
-	// Filled in from XML
-	Src   string `xml:"src,attr"`
-	Title string `xml:"title,attr"`
-	XML   string `xml:",innerxml"`
-
-	// Derived from Src; not in XML.
-	Err    error
-	File   string
-	Lo     int
-	LoByte int
-	Hi     int
-	HiByte int
-	Data   []byte
-}
-
-// String method for printing in template.
-// Formats file address nicely.
-func (st *Codestep) String() string {
-	s := st.File
-	if st.Lo != 0 || st.Hi != 0 {
-		s += fmt.Sprintf(":%d", st.Lo)
-		if st.Lo != st.Hi {
-			s += fmt.Sprintf(",%d", st.Hi)
-		}
-	}
-	return s
-}
-
-// loadCodewalk reads a codewalk from the named XML file.
-func loadCodewalk(filename string) (*Codewalk, error) {
-	f, err := fs.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	cw := new(Codewalk)
-	d := xml.NewDecoder(f)
-	d.Entity = xml.HTMLEntity
-	err = d.Decode(cw)
-	if err != nil {
-		return nil, &os.PathError{Op: "parsing", Path: filename, Err: err}
-	}
-
-	// Compute file list, evaluate line numbers for addresses.
-	m := make(map[string]bool)
-	for _, st := range cw.Step {
-		i := strings.Index(st.Src, ":")
-		if i < 0 {
-			i = len(st.Src)
-		}
-		filename := st.Src[0:i]
-		data, err := vfs.ReadFile(fs, filename)
-		if err != nil {
-			st.Err = err
-			continue
-		}
-		if i < len(st.Src) {
-			lo, hi, err := addrToByteRange(st.Src[i+1:], 0, data)
-			if err != nil {
-				st.Err = err
-				continue
-			}
-			// Expand match to line boundaries.
-			for lo > 0 && data[lo-1] != '\n' {
-				lo--
-			}
-			for hi < len(data) && (hi == 0 || data[hi-1] != '\n') {
-				hi++
-			}
-			st.Lo = byteToLine(data, lo)
-			st.Hi = byteToLine(data, hi-1)
-		}
-		st.Data = data
-		st.File = filename
-		m[filename] = true
-	}
-
-	// Make list of files
-	cw.File = make([]string, len(m))
-	i := 0
-	for f := range m {
-		cw.File[i] = f
-		i++
-	}
-	sort.Strings(cw.File)
-
-	return cw, nil
-}
-
-// codewalkDir serves the codewalk directory listing.
-// It scans the directory for subdirectories or files named *.xml
-// and prepares a table.
-func codewalkDir(w http.ResponseWriter, r *http.Request, relpath, abspath string) {
-	type elem struct {
-		Name  string
-		Title string
-	}
-
-	dir, err := fs.ReadDir(abspath)
-	if err != nil {
-		log.Print(err)
-		pres.ServeError(w, r, relpath, err)
-		return
-	}
-	var v []interface{}
-	for _, fi := range dir {
-		name := fi.Name()
-		if fi.IsDir() {
-			v = append(v, &elem{name + "/", ""})
-		} else if strings.HasSuffix(name, ".xml") {
-			cw, err := loadCodewalk(abspath + "/" + name)
-			if err != nil {
-				continue
-			}
-			v = append(v, &elem{name[0 : len(name)-len(".xml")], cw.Title})
-		}
-	}
-
-	pres.ServePage(w, godoc.Page{
-		Title: "Codewalks",
-		Body:  applyTemplate(codewalkdirHTML, "codewalkdir", v),
-	})
-}
-
-// codewalkFileprint serves requests with ?fileprint=f&lo=lo&hi=hi.
-// The filename f has already been retrieved and is passed as an argument.
-// Lo and hi are the numbers of the first and last line to highlight
-// in the response.  This format is used for the middle window pane
-// of the codewalk pages.  It is a separate iframe and does not get
-// the usual godoc HTML wrapper.
-func codewalkFileprint(w http.ResponseWriter, r *http.Request, f string) {
-	abspath := f
-	data, err := vfs.ReadFile(fs, abspath)
-	if err != nil {
-		log.Print(err)
-		pres.ServeError(w, r, f, err)
-		return
-	}
-	lo, _ := strconv.Atoi(r.FormValue("lo"))
-	hi, _ := strconv.Atoi(r.FormValue("hi"))
-	if hi < lo {
-		hi = lo
-	}
-	lo = lineToByte(data, lo)
-	hi = lineToByte(data, hi+1)
-
-	// Put the mark 4 lines before lo, so that the iframe
-	// shows a few lines of context before the highlighted
-	// section.
-	n := 4
-	mark := lo
-	for ; mark > 0 && n > 0; mark-- {
-		if data[mark-1] == '\n' {
-			if n--; n == 0 {
-				break
-			}
-		}
-	}
-
-	io.WriteString(w, `<style type="text/css">@import "/doc/codewalk/codewalk.css";</style><pre>`)
-	template.HTMLEscape(w, data[0:mark])
-	io.WriteString(w, "<a name='mark'></a>")
-	template.HTMLEscape(w, data[mark:lo])
-	if lo < hi {
-		io.WriteString(w, "<div class='codewalkhighlight'>")
-		template.HTMLEscape(w, data[lo:hi])
-		io.WriteString(w, "</div>")
-	}
-	template.HTMLEscape(w, data[hi:])
-	io.WriteString(w, "</pre>")
-}
-
-// addrToByte evaluates the given address starting at offset start in data.
-// It returns the lo and hi byte offset of the matched region within data.
-// See http://plan9.bell-labs.com/sys/doc/sam/sam.html Table II
-// for details on the syntax.
-func addrToByteRange(addr string, start int, data []byte) (lo, hi int, err error) {
-	var (
-		dir        byte
-		prevc      byte
-		charOffset bool
-	)
-	lo = start
-	hi = start
-	for addr != "" && err == nil {
-		c := addr[0]
-		switch c {
-		default:
-			err = errors.New("invalid address syntax near " + string(c))
-		case ',':
-			if len(addr) == 1 {
-				hi = len(data)
-			} else {
-				_, hi, err = addrToByteRange(addr[1:], hi, data)
-			}
-			return
-
-		case '+', '-':
-			if prevc == '+' || prevc == '-' {
-				lo, hi, err = addrNumber(data, lo, hi, prevc, 1, charOffset)
-			}
-			dir = c
-
-		case '$':
-			lo = len(data)
-			hi = len(data)
-			if len(addr) > 1 {
-				dir = '+'
-			}
-
-		case '#':
-			charOffset = true
-
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			var i int
-			for i = 1; i < len(addr); i++ {
-				if addr[i] < '0' || addr[i] > '9' {
-					break
-				}
-			}
-			var n int
-			n, err = strconv.Atoi(addr[0:i])
-			if err != nil {
-				break
-			}
-			lo, hi, err = addrNumber(data, lo, hi, dir, n, charOffset)
-			dir = 0
-			charOffset = false
-			prevc = c
-			addr = addr[i:]
-			continue
-
-		case '/':
-			var i, j int
-		Regexp:
-			for i = 1; i < len(addr); i++ {
-				switch addr[i] {
-				case '\\':
-					i++
-				case '/':
-					j = i + 1
-					break Regexp
-				}
-			}
-			if j == 0 {
-				j = i
-			}
-			pattern := addr[1:i]
-			lo, hi, err = addrRegexp(data, lo, hi, dir, pattern)
-			prevc = c
-			addr = addr[j:]
-			continue
-		}
-		prevc = c
-		addr = addr[1:]
-	}
-
-	if err == nil && dir != 0 {
-		lo, hi, err = addrNumber(data, lo, hi, dir, 1, charOffset)
-	}
-	if err != nil {
-		return 0, 0, err
-	}
-	return lo, hi, nil
-}
-
-// addrNumber applies the given dir, n, and charOffset to the address lo, hi.
-// dir is '+' or '-', n is the count, and charOffset is true if the syntax
-// used was #n.  Applying +n (or +#n) means to advance n lines
-// (or characters) after hi.  Applying -n (or -#n) means to back up n lines
-// (or characters) before lo.
-// The return value is the new lo, hi.
-func addrNumber(data []byte, lo, hi int, dir byte, n int, charOffset bool) (int, int, error) {
-	switch dir {
-	case 0:
-		lo = 0
-		hi = 0
-		fallthrough
-
-	case '+':
-		if charOffset {
-			pos := hi
-			for ; n > 0 && pos < len(data); n-- {
-				_, size := utf8.DecodeRune(data[pos:])
-				pos += size
-			}
-			if n == 0 {
-				return pos, pos, nil
-			}
-			break
-		}
-		// find next beginning of line
-		if hi > 0 {
-			for hi < len(data) && data[hi-1] != '\n' {
-				hi++
-			}
-		}
-		lo = hi
-		if n == 0 {
-			return lo, hi, nil
-		}
-		for ; hi < len(data); hi++ {
-			if data[hi] != '\n' {
-				continue
-			}
-			switch n--; n {
-			case 1:
-				lo = hi + 1
-			case 0:
-				return lo, hi + 1, nil
-			}
-		}
-
-	case '-':
-		if charOffset {
-			// Scan backward for bytes that are not UTF-8 continuation bytes.
-			pos := lo
-			for ; pos > 0 && n > 0; pos-- {
-				if data[pos]&0xc0 != 0x80 {
-					n--
-				}
-			}
-			if n == 0 {
-				return pos, pos, nil
-			}
-			break
-		}
-		// find earlier beginning of line
-		for lo > 0 && data[lo-1] != '\n' {
-			lo--
-		}
-		hi = lo
-		if n == 0 {
-			return lo, hi, nil
-		}
-		for ; lo >= 0; lo-- {
-			if lo > 0 && data[lo-1] != '\n' {
-				continue
-			}
-			switch n--; n {
-			case 1:
-				hi = lo
-			case 0:
-				return lo, hi, nil
-			}
-		}
-	}
-
-	return 0, 0, errors.New("address out of range")
-}
-
-// addrRegexp searches for pattern in the given direction starting at lo, hi.
-// The direction dir is '+' (search forward from hi) or '-' (search backward from lo).
-// Backward searches are unimplemented.
-func addrRegexp(data []byte, lo, hi int, dir byte, pattern string) (int, int, error) {
-	re, err := regexp.Compile(pattern)
-	if err != nil {
-		return 0, 0, err
-	}
-	if dir == '-' {
-		// Could implement reverse search using binary search
-		// through file, but that seems like overkill.
-		return 0, 0, errors.New("reverse search not implemented")
-	}
-	m := re.FindIndex(data[hi:])
-	if len(m) > 0 {
-		m[0] += hi
-		m[1] += hi
-	} else if hi > 0 {
-		// No match.  Wrap to beginning of data.
-		m = re.FindIndex(data)
-	}
-	if len(m) == 0 {
-		return 0, 0, errors.New("no match for " + pattern)
-	}
-	return m[0], m[1], nil
-}
-
-// lineToByte returns the byte index of the first byte of line n.
-// Line numbers begin at 1.
-func lineToByte(data []byte, n int) int {
-	if n <= 1 {
-		return 0
-	}
-	n--
-	for i, c := range data {
-		if c == '\n' {
-			if n--; n == 0 {
-				return i + 1
-			}
-		}
-	}
-	return len(data)
-}
-
-// byteToLine returns the number of the line containing the byte at index i.
-func byteToLine(data []byte, i int) int {
-	l := 1
-	for j, c := range data {
-		if j == i {
-			return l
-		}
-		if c == '\n' {
-			l++
-		}
-	}
-	return l
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/dl.go b/installer/vendor/golang.org/x/tools/cmd/godoc/dl.go
deleted file mode 100644
index 40e66584bc..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/dl.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package main
-
-import "net/http"
-
-// Register a redirect handler for /dl/ to the golang.org download page.
-// This file will not be included when deploying godoc to golang.org.
-
-func init() {
-	http.Handle("/dl/", http.RedirectHandler("https://golang.org/dl/", http.StatusFound))
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/doc.go b/installer/vendor/golang.org/x/tools/cmd/godoc/doc.go
deleted file mode 100644
index e75609369e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/doc.go
+++ /dev/null
@@ -1,153 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Godoc extracts and generates documentation for Go programs.
-
-It has two modes.
-
-Without the -http flag, it runs in command-line mode and prints plain text
-documentation to standard output and exits. If both a library package and
-a command with the same name exists, using the prefix cmd/ will force
-documentation on the command rather than the library package. If the -src
-flag is specified, godoc prints the exported interface of a package in Go
-source form, or the implementation of a specific exported language entity:
-
-	godoc fmt                # documentation for package fmt
-	godoc fmt Printf         # documentation for fmt.Printf
-	godoc cmd/go             # force documentation for the go command
-	godoc -src fmt           # fmt package interface in Go source form
-	godoc -src fmt Printf    # implementation of fmt.Printf
-
-In command-line mode, the -q flag enables search queries against a godoc running
-as a webserver. If no explicit server address is specified with the -server flag,
-godoc first tries localhost:6060 and then http://golang.org.
-
-	godoc -q Reader
-	godoc -q math.Sin
-	godoc -server=:6060 -q sin
-
-With the -http flag, it runs as a web server and presents the documentation as a
-web page.
-
-	godoc -http=:6060
-
-Usage:
-
-	godoc [flag] package [name ...]
-
-The flags are:
-
-	-v
-		verbose mode
-	-q
-		arguments are considered search queries: a legal query is a
-		single identifier (such as ToLower) or a qualified identifier
-		(such as math.Sin)
-	-src
-		print (exported) source in command-line mode
-	-tabwidth=4
-		width of tabs in units of spaces
-	-timestamps=true
-		show timestamps with directory listings
-	-index
-		enable identifier and full text search index
-		(no search box is shown if -index is not set)
-	-index_files=""
-		glob pattern specifying index files; if not empty,
-		the index is read from these files in sorted order
-	-index_throttle=0.75
-		index throttle value; a value of 0 means no time is allocated
-		to the indexer (the indexer will never finish), a value of 1.0
-		means that index creation is running at full throttle (other
-		goroutines may get no time while the index is built)
-	-links=true:
-		link identifiers to their declarations
-	-write_index=false
-		write index to a file; the file name must be specified with
-		-index_files
-	-maxresults=10000
-		maximum number of full text search results shown
-		(no full text index is built if maxresults <= 0)
-	-notes="BUG"
-		regular expression matching note markers to show
-		(e.g., "BUG|TODO", ".*")
-	-html
-		print HTML in command-line mode
-	-goroot=$GOROOT
-		Go root directory
-	-http=addr
-		HTTP service address (e.g., '127.0.0.1:6060' or just ':6060')
-	-server=addr
-		webserver address for command line searches
-	-analysis=type,pointer
-		comma-separated list of analyses to perform
-		"type": display identifier resolution, type info, method sets,
-			'implements', and static callees
-		"pointer": display channel peers, callers and dynamic callees
-			(significantly slower)
-		See http://golang.org/lib/godoc/analysis/help.html for details.
-	-templates=""
-		directory containing alternate template files; if set,
-		the directory may provide alternative template files
-		for the files in $GOROOT/lib/godoc
-	-url=path
-		print to standard output the data that would be served by
-		an HTTP request for path
-	-zip=""
-		zip file providing the file system to serve; disabled if empty
-
-By default, godoc looks at the packages it finds via $GOROOT and $GOPATH (if set).
-This behavior can be altered by providing an alternative $GOROOT with the -goroot
-flag.
-
-When godoc runs as a web server and -index is set, a search index is maintained.
-The index is created at startup.
-
-The index contains both identifier and full text search information (searchable
-via regular expressions). The maximum number of full text search results shown
-can be set with the -maxresults flag; if set to 0, no full text results are
-shown, and only an identifier index but no full text search index is created.
-
-By default, godoc uses the system's GOOS/GOARCH; in command-line mode you can
-set the GOOS/GOARCH environment variables to get output for the system specified.
-If -http was specified you can provide the URL parameters "GOOS" and "GOARCH"
-to set the output on the web page.
-
-The presentation mode of web pages served by godoc can be controlled with the
-"m" URL parameter; it accepts a comma-separated list of flag names as value:
-
-	all	show documentation for all declarations, not just the exported ones
-	methods	show all embedded methods, not just those of unexported anonymous fields
-	src	show the original source code rather then the extracted documentation
-	text	present the page in textual (command-line) form rather than HTML
-	flat	present flat (not indented) directory listings using full paths
-
-For instance, http://golang.org/pkg/math/big/?m=all,text shows the documentation
-for all (not just the exported) declarations of package big, in textual form (as
-it would appear when using godoc from the command line: "godoc -src math/big .*").
-
-By default, godoc serves files from the file system of the underlying OS.
-Instead, a .zip file may be provided via the -zip flag, which contains
-the file system to serve. The file paths stored in the .zip file must use
-slash ('/') as path separator; and they must be unrooted. $GOROOT (or -goroot)
-must be set to the .zip file directory path containing the Go root directory.
-For instance, for a .zip file created by the command:
-
-	zip -r go.zip $HOME/go
-
-one may run godoc as follows:
-
-	godoc -http=:6060 -zip=go.zip -goroot=$HOME/go
-
-Godoc documentation is converted to HTML or to text using the go/doc package;
-see http://golang.org/pkg/go/doc/#ToHTML for the exact rules.
-Godoc also shows example code that is runnable by the testing package;
-see http://golang.org/pkg/testing/#hdr-Examples for the conventions.
-See "Godoc: documenting Go code" for how to write good comments for godoc:
-http://golang.org/doc/articles/godoc_documenting_go_code.html
-
-*/
-package main // import "golang.org/x/tools/cmd/godoc"
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/godoc19_test.go b/installer/vendor/golang.org/x/tools/cmd/godoc/godoc19_test.go
deleted file mode 100644
index 655a623d67..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/godoc19_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main_test
-
-func init() { isGo19 = true }
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/godoc_test.go b/installer/vendor/golang.org/x/tools/cmd/godoc/godoc_test.go
deleted file mode 100644
index 8b0c24e594..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/godoc_test.go
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main_test
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"net/http"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-// buildGodoc builds the godoc executable.
-// It returns its path, and a cleanup function.
-//
-// TODO(adonovan): opt: do this at most once, and do the cleanup
-// exactly once.  How though?  There's no atexit.
-func buildGodoc(t *testing.T) (bin string, cleanup func()) {
-	if runtime.GOARCH == "arm" {
-		t.Skip("skipping test on arm platforms; too slow")
-	}
-	tmp, err := ioutil.TempDir("", "godoc-regtest-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer func() {
-		if cleanup == nil { // probably, go build failed.
-			os.RemoveAll(tmp)
-		}
-	}()
-
-	bin = filepath.Join(tmp, "godoc")
-	if runtime.GOOS == "windows" {
-		bin += ".exe"
-	}
-	cmd := exec.Command("go", "build", "-o", bin)
-	if err := cmd.Run(); err != nil {
-		t.Fatalf("Building godoc: %v", err)
-	}
-
-	return bin, func() { os.RemoveAll(tmp) }
-}
-
-var isGo19 bool // godoc19_test.go sets it to true.
-
-// Basic regression test for godoc command-line tool.
-func TestCLI(t *testing.T) {
-	bin, cleanup := buildGodoc(t)
-	defer cleanup()
-
-	// condStr returns s if cond is true, otherwise empty string.
-	condStr := func(cond bool, s string) string {
-		if !cond {
-			return ""
-		}
-		return s
-	}
-
-	tests := []struct {
-		args      []string
-		matches   []string // regular expressions
-		dontmatch []string // regular expressions
-	}{
-		{
-			args: []string{"fmt"},
-			matches: []string{
-				`import "fmt"`,
-				`Package fmt implements formatted I/O`,
-			},
-		},
-		{
-			args: []string{"io", "WriteString"},
-			matches: []string{
-				`func WriteString\(`,
-				`WriteString writes the contents of the string s to w`,
-			},
-		},
-		{
-			args: []string{"nonexistingpkg"},
-			matches: []string{
-				`cannot find package` +
-					// TODO: Remove this when support for Go 1.8 is dropped.
-					condStr(!isGo19,
-						// For Go 1.8 and older, because it doesn't have CL 33158 change applied to go/build.
-						// The last pattern (does not e) is for plan9:
-						// http://build.golang.org/log/2d8e5e14ed365bfa434b37ec0338cd9e6f8dd9bf
-						`|no such file or directory|does not exist|cannot find the file|(?:' does not e)`),
-			},
-		},
-		{
-			args: []string{"fmt", "NonexistentSymbol"},
-			matches: []string{
-				`No match found\.`,
-			},
-		},
-		{
-			args: []string{"-src", "syscall", "Open"},
-			matches: []string{
-				`func Open\(`,
-			},
-			dontmatch: []string{
-				`No match found\.`,
-			},
-		},
-	}
-	for _, test := range tests {
-		cmd := exec.Command(bin, test.args...)
-		cmd.Args[0] = "godoc"
-		out, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Errorf("Running with args %#v: %v", test.args, err)
-			continue
-		}
-		for _, pat := range test.matches {
-			re := regexp.MustCompile(pat)
-			if !re.Match(out) {
-				t.Errorf("godoc %v =\n%s\nwanted /%v/", strings.Join(test.args, " "), out, pat)
-			}
-		}
-		for _, pat := range test.dontmatch {
-			re := regexp.MustCompile(pat)
-			if re.Match(out) {
-				t.Errorf("godoc %v =\n%s\ndid not want /%v/", strings.Join(test.args, " "), out, pat)
-			}
-		}
-	}
-}
-
-func serverAddress(t *testing.T) string {
-	ln, err := net.Listen("tcp", "127.0.0.1:0")
-	if err != nil {
-		ln, err = net.Listen("tcp6", "[::1]:0")
-	}
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer ln.Close()
-	return ln.Addr().String()
-}
-
-func waitForServerReady(t *testing.T, addr string) {
-	waitForServer(t,
-		fmt.Sprintf("http://%v/", addr),
-		"The Go Programming Language",
-		15*time.Second)
-}
-
-func waitForSearchReady(t *testing.T, addr string) {
-	waitForServer(t,
-		fmt.Sprintf("http://%v/search?q=FALLTHROUGH", addr),
-		"The list of tokens.",
-		2*time.Minute)
-}
-
-const pollInterval = 200 * time.Millisecond
-
-func waitForServer(t *testing.T, url, match string, timeout time.Duration) {
-	// "health check" duplicated from x/tools/cmd/tipgodoc/tip.go
-	deadline := time.Now().Add(timeout)
-	for time.Now().Before(deadline) {
-		time.Sleep(pollInterval)
-		res, err := http.Get(url)
-		if err != nil {
-			continue
-		}
-		rbody, err := ioutil.ReadAll(res.Body)
-		res.Body.Close()
-		if err == nil && res.StatusCode == http.StatusOK &&
-			bytes.Contains(rbody, []byte(match)) {
-			return
-		}
-	}
-	t.Fatalf("Server failed to respond in %v", timeout)
-}
-
-func killAndWait(cmd *exec.Cmd) {
-	cmd.Process.Kill()
-	cmd.Wait()
-}
-
-// Basic integration test for godoc HTTP interface.
-func TestWeb(t *testing.T) {
-	testWeb(t, false)
-}
-
-// Basic integration test for godoc HTTP interface.
-func TestWebIndex(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping test in -short mode")
-	}
-	testWeb(t, true)
-}
-
-// Basic integration test for godoc HTTP interface.
-func testWeb(t *testing.T, withIndex bool) {
-	bin, cleanup := buildGodoc(t)
-	defer cleanup()
-	addr := serverAddress(t)
-	args := []string{fmt.Sprintf("-http=%s", addr)}
-	if withIndex {
-		args = append(args, "-index", "-index_interval=-1s")
-	}
-	cmd := exec.Command(bin, args...)
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	cmd.Args[0] = "godoc"
-	cmd.Env = godocEnv()
-	if err := cmd.Start(); err != nil {
-		t.Fatalf("failed to start godoc: %s", err)
-	}
-	defer killAndWait(cmd)
-
-	if withIndex {
-		waitForSearchReady(t, addr)
-	} else {
-		waitForServerReady(t, addr)
-	}
-
-	tests := []struct {
-		path      string
-		match     []string
-		dontmatch []string
-		needIndex bool
-	}{
-		{
-			path:  "/",
-			match: []string{"Go is an open source programming language"},
-		},
-		{
-			path:  "/pkg/fmt/",
-			match: []string{"Package fmt implements formatted I/O"},
-		},
-		{
-			path:  "/src/fmt/",
-			match: []string{"scan_test.go"},
-		},
-		{
-			path:  "/src/fmt/print.go",
-			match: []string{"// Println formats using"},
-		},
-		{
-			path: "/pkg",
-			match: []string{
-				"Standard library",
-				"Package fmt implements formatted I/O",
-			},
-			dontmatch: []string{
-				"internal/syscall",
-				"cmd/gc",
-			},
-		},
-		{
-			path: "/pkg/?m=all",
-			match: []string{
-				"Standard library",
-				"Package fmt implements formatted I/O",
-				"internal/syscall/?m=all",
-			},
-			dontmatch: []string{
-				"cmd/gc",
-			},
-		},
-		{
-			path: "/search?q=ListenAndServe",
-			match: []string{
-				"/src",
-			},
-			dontmatch: []string{
-				"/pkg/bootstrap",
-			},
-			needIndex: true,
-		},
-		{
-			path: "/pkg/strings/",
-			match: []string{
-				`href="/src/strings/strings.go"`,
-			},
-		},
-		{
-			path: "/cmd/compile/internal/amd64/",
-			match: []string{
-				`href="/src/cmd/compile/internal/amd64/ssa.go"`,
-			},
-		},
-	}
-	for _, test := range tests {
-		if test.needIndex && !withIndex {
-			continue
-		}
-		url := fmt.Sprintf("http://%s%s", addr, test.path)
-		resp, err := http.Get(url)
-		if err != nil {
-			t.Errorf("GET %s failed: %s", url, err)
-			continue
-		}
-		body, err := ioutil.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err != nil {
-			t.Errorf("GET %s: failed to read body: %s (response: %v)", url, err, resp)
-		}
-		isErr := false
-		for _, substr := range test.match {
-			if !bytes.Contains(body, []byte(substr)) {
-				t.Errorf("GET %s: wanted substring %q in body", url, substr)
-				isErr = true
-			}
-		}
-		for _, substr := range test.dontmatch {
-			if bytes.Contains(body, []byte(substr)) {
-				t.Errorf("GET %s: didn't want substring %q in body", url, substr)
-				isErr = true
-			}
-		}
-		if isErr {
-			t.Errorf("GET %s: got:\n%s", url, body)
-		}
-	}
-}
-
-// Basic integration test for godoc -analysis=type (via HTTP interface).
-func TestTypeAnalysis(t *testing.T) {
-	if runtime.GOOS == "plan9" {
-		t.Skip("skipping test on plan9 (issue #11974)") // see comment re: Plan 9 below
-	}
-
-	// Write a fake GOROOT/GOPATH.
-	tmpdir, err := ioutil.TempDir("", "godoc-analysis")
-	if err != nil {
-		t.Fatalf("ioutil.TempDir failed: %s", err)
-	}
-	defer os.RemoveAll(tmpdir)
-	for _, f := range []struct{ file, content string }{
-		{"goroot/src/lib/lib.go", `
-package lib
-type T struct{}
-const C = 3
-var V T
-func (T) F() int { return C }
-`},
-		{"gopath/src/app/main.go", `
-package main
-import "lib"
-func main() { print(lib.V) }
-`},
-	} {
-		file := filepath.Join(tmpdir, f.file)
-		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
-			t.Fatalf("MkdirAll(%s) failed: %s", filepath.Dir(file), err)
-		}
-		if err := ioutil.WriteFile(file, []byte(f.content), 0644); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	// Start the server.
-	bin, cleanup := buildGodoc(t)
-	defer cleanup()
-	addr := serverAddress(t)
-	cmd := exec.Command(bin, fmt.Sprintf("-http=%s", addr), "-analysis=type")
-	cmd.Env = append(cmd.Env, fmt.Sprintf("GOROOT=%s", filepath.Join(tmpdir, "goroot")))
-	cmd.Env = append(cmd.Env, fmt.Sprintf("GOPATH=%s", filepath.Join(tmpdir, "gopath")))
-	for _, e := range os.Environ() {
-		if strings.HasPrefix(e, "GOROOT=") || strings.HasPrefix(e, "GOPATH=") {
-			continue
-		}
-		cmd.Env = append(cmd.Env, e)
-	}
-	cmd.Stdout = os.Stderr
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		t.Fatal(err)
-	}
-	cmd.Args[0] = "godoc"
-	if err := cmd.Start(); err != nil {
-		t.Fatalf("failed to start godoc: %s", err)
-	}
-	defer killAndWait(cmd)
-	waitForServerReady(t, addr)
-
-	// Wait for type analysis to complete.
-	reader := bufio.NewReader(stderr)
-	for {
-		s, err := reader.ReadString('\n') // on Plan 9 this fails
-		if err != nil {
-			t.Fatal(err)
-		}
-		fmt.Fprint(os.Stderr, s)
-		if strings.Contains(s, "Type analysis complete.") {
-			break
-		}
-	}
-	go io.Copy(os.Stderr, reader)
-
-	t0 := time.Now()
-
-	// Make an HTTP request and check for a regular expression match.
-	// The patterns are very crude checks that basic type information
-	// has been annotated onto the source view.
-tryagain:
-	for _, test := range []struct{ url, pattern string }{
-		{"/src/lib/lib.go", "L2.*package .*Package docs for lib.*/lib"},
-		{"/src/lib/lib.go", "L3.*type .*type info for T.*struct"},
-		{"/src/lib/lib.go", "L5.*var V .*type T struct"},
-		{"/src/lib/lib.go", "L6.*func .*type T struct.*T.*return .*const C untyped int.*C"},
-
-		{"/src/app/main.go", "L2.*package .*Package docs for app"},
-		{"/src/app/main.go", "L3.*import .*Package docs for lib.*lib"},
-		{"/src/app/main.go", "L4.*func main.*package lib.*lib.*var lib.V lib.T.*V"},
-	} {
-		url := fmt.Sprintf("http://%s%s", addr, test.url)
-		resp, err := http.Get(url)
-		if err != nil {
-			t.Errorf("GET %s failed: %s", url, err)
-			continue
-		}
-		body, err := ioutil.ReadAll(resp.Body)
-		resp.Body.Close()
-		if err != nil {
-			t.Errorf("GET %s: failed to read body: %s (response: %v)", url, err, resp)
-			continue
-		}
-
-		if !bytes.Contains(body, []byte("Static analysis features")) {
-			// Type analysis results usually become available within
-			// ~4ms after godoc startup (for this input on my machine).
-			if elapsed := time.Since(t0); elapsed > 500*time.Millisecond {
-				t.Fatalf("type analysis results still unavailable after %s", elapsed)
-			}
-			time.Sleep(10 * time.Millisecond)
-			goto tryagain
-		}
-
-		match, err := regexp.Match(test.pattern, body)
-		if err != nil {
-			t.Errorf("regexp.Match(%q) failed: %s", test.pattern, err)
-			continue
-		}
-		if !match {
-			// This is a really ugly failure message.
-			t.Errorf("GET %s: body doesn't match %q, got:\n%s",
-				url, test.pattern, string(body))
-		}
-	}
-}
-
-// godocEnv returns the process environment without the GOPATH variable.
-// (We don't want the indexer looking at the local workspace during tests.)
-func godocEnv() (env []string) {
-	for _, v := range os.Environ() {
-		if strings.HasPrefix(v, "GOPATH=") {
-			continue
-		}
-		env = append(env, v)
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/handlers.go b/installer/vendor/golang.org/x/tools/cmd/godoc/handlers.go
deleted file mode 100644
index 600be6854c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/handlers.go
+++ /dev/null
@@ -1,147 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// The /doc/codewalk/ tree is synthesized from codewalk descriptions,
-// files named $GOROOT/doc/codewalk/*.xml.
-// For an example and a description of the format, see
-// http://golang.org/doc/codewalk/codewalk or run godoc -http=:6060
-// and see http://localhost:6060/doc/codewalk/codewalk .
-// That page is itself a codewalk; the source code for it is
-// $GOROOT/doc/codewalk/codewalk.xml.
-
-package main
-
-import (
-	"encoding/json"
-	"go/format"
-	"log"
-	"net/http"
-	"strings"
-	"text/template"
-
-	"golang.org/x/tools/godoc"
-	"golang.org/x/tools/godoc/redirect"
-	"golang.org/x/tools/godoc/vfs"
-)
-
-var (
-	pres *godoc.Presentation
-	fs   = vfs.NameSpace{}
-)
-
-var enforceHosts = false // set true in production on app engine
-
-// hostEnforcerHandler redirects requests to "http://foo.golang.org/bar"
-// to "https://golang.org/bar".
-// It permits requests to the host "godoc-test.golang.org" for testing.
-type hostEnforcerHandler struct {
-	h http.Handler
-}
-
-func (h hostEnforcerHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if !enforceHosts {
-		h.h.ServeHTTP(w, r)
-		return
-	}
-	if r.TLS == nil || !h.validHost(r.Host) {
-		r.URL.Scheme = "https"
-		if h.validHost(r.Host) {
-			r.URL.Host = r.Host
-		} else {
-			r.URL.Host = "golang.org"
-		}
-		http.Redirect(w, r, r.URL.String(), http.StatusFound)
-		return
-	}
-	w.Header().Set("Strict-Transport-Security", "max-age=31536000; preload")
-	h.h.ServeHTTP(w, r)
-}
-
-func (h hostEnforcerHandler) validHost(host string) bool {
-	switch strings.ToLower(host) {
-	case "golang.org", "godoc-test.golang.org":
-		return true
-	}
-	return false
-}
-
-func registerHandlers(pres *godoc.Presentation) *http.ServeMux {
-	if pres == nil {
-		panic("nil Presentation")
-	}
-	mux := http.NewServeMux()
-	mux.HandleFunc("/doc/codewalk/", codewalk)
-	mux.Handle("/doc/play/", pres.FileServer())
-	mux.Handle("/robots.txt", pres.FileServer())
-	mux.Handle("/", pres)
-	mux.Handle("/pkg/C/", redirect.Handler("/cmd/cgo/"))
-	mux.HandleFunc("/fmt", fmtHandler)
-	redirect.Register(mux)
-
-	http.Handle("/", hostEnforcerHandler{mux})
-
-	return mux
-}
-
-func readTemplate(name string) *template.Template {
-	if pres == nil {
-		panic("no global Presentation set yet")
-	}
-	path := "lib/godoc/" + name
-
-	// use underlying file system fs to read the template file
-	// (cannot use template ParseFile functions directly)
-	data, err := vfs.ReadFile(fs, path)
-	if err != nil {
-		log.Fatal("readTemplate: ", err)
-	}
-	// be explicit with errors (for app engine use)
-	t, err := template.New(name).Funcs(pres.FuncMap()).Parse(string(data))
-	if err != nil {
-		log.Fatal("readTemplate: ", err)
-	}
-	return t
-}
-
-func readTemplates(p *godoc.Presentation, html bool) {
-	p.PackageText = readTemplate("package.txt")
-	p.SearchText = readTemplate("search.txt")
-
-	if html || p.HTMLMode {
-		codewalkHTML = readTemplate("codewalk.html")
-		codewalkdirHTML = readTemplate("codewalkdir.html")
-		p.CallGraphHTML = readTemplate("callgraph.html")
-		p.DirlistHTML = readTemplate("dirlist.html")
-		p.ErrorHTML = readTemplate("error.html")
-		p.ExampleHTML = readTemplate("example.html")
-		p.GodocHTML = readTemplate("godoc.html")
-		p.ImplementsHTML = readTemplate("implements.html")
-		p.MethodSetHTML = readTemplate("methodset.html")
-		p.PackageHTML = readTemplate("package.html")
-		p.SearchHTML = readTemplate("search.html")
-		p.SearchDocHTML = readTemplate("searchdoc.html")
-		p.SearchCodeHTML = readTemplate("searchcode.html")
-		p.SearchTxtHTML = readTemplate("searchtxt.html")
-		p.SearchDescXML = readTemplate("opensearch.xml")
-	}
-}
-
-type fmtResponse struct {
-	Body  string
-	Error string
-}
-
-// fmtHandler takes a Go program in its "body" form value, formats it with
-// standard gofmt formatting, and writes a fmtResponse as a JSON object.
-func fmtHandler(w http.ResponseWriter, r *http.Request) {
-	resp := new(fmtResponse)
-	body, err := format.Source([]byte(r.FormValue("body")))
-	if err != nil {
-		resp.Error = err.Error()
-	} else {
-		resp.Body = string(body)
-	}
-	w.Header().Set("Content-type", "application/json; charset=utf-8")
-	json.NewEncoder(w).Encode(resp)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/index.go b/installer/vendor/golang.org/x/tools/cmd/godoc/index.go
deleted file mode 100644
index f84b29a29d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/index.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import "strings"
-
-func indexDirectoryDefault(dir string) bool {
-	return dir != "/pkg" && !strings.HasPrefix(dir, "/pkg/")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/main.go b/installer/vendor/golang.org/x/tools/cmd/godoc/main.go
deleted file mode 100644
index 227e29b148..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/main.go
+++ /dev/null
@@ -1,345 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// godoc: Go Documentation Server
-
-// Web server tree:
-//
-//	http://godoc/		main landing page
-//	http://godoc/doc/	serve from $GOROOT/doc - spec, mem, etc.
-//	http://godoc/src/	serve files from $GOROOT/src; .go gets pretty-printed
-//	http://godoc/cmd/	serve documentation about commands
-//	http://godoc/pkg/	serve documentation about packages
-//				(idea is if you say import "compress/zlib", you go to
-//				http://godoc/pkg/compress/zlib)
-//
-// Command-line interface:
-//
-//	godoc packagepath [name ...]
-//
-//	godoc compress/zlib
-//		- prints doc for package compress/zlib
-//	godoc crypto/block Cipher NewCMAC
-//		- prints doc for Cipher and NewCMAC in package crypto/block
-
-// +build !appengine
-
-package main
-
-import (
-	"archive/zip"
-	_ "expvar" // to serve /debug/vars
-	"flag"
-	"fmt"
-	"go/build"
-	"log"
-	"net/http"
-	"net/http/httptest"
-	_ "net/http/pprof" // to serve /debug/pprof/*
-	"net/url"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-
-	"golang.org/x/tools/godoc"
-	"golang.org/x/tools/godoc/analysis"
-	"golang.org/x/tools/godoc/static"
-	"golang.org/x/tools/godoc/vfs"
-	"golang.org/x/tools/godoc/vfs/gatefs"
-	"golang.org/x/tools/godoc/vfs/mapfs"
-	"golang.org/x/tools/godoc/vfs/zipfs"
-)
-
-const defaultAddr = ":6060" // default webserver address
-
-var (
-	// file system to serve
-	// (with e.g.: zip -r go.zip $GOROOT -i \*.go -i \*.html -i \*.css -i \*.js -i \*.txt -i \*.c -i \*.h -i \*.s -i \*.png -i \*.jpg -i \*.sh -i favicon.ico)
-	zipfile = flag.String("zip", "", "zip file providing the file system to serve; disabled if empty")
-
-	// file-based index
-	writeIndex = flag.Bool("write_index", false, "write index to a file; the file name must be specified with -index_files")
-
-	analysisFlag = flag.String("analysis", "", `comma-separated list of analyses to perform (supported: type, pointer). See http://golang.org/lib/godoc/analysis/help.html`)
-
-	// network
-	httpAddr   = flag.String("http", "", "HTTP service address (e.g., '"+defaultAddr+"')")
-	serverAddr = flag.String("server", "", "webserver address for command line searches")
-
-	// layout control
-	html    = flag.Bool("html", false, "print HTML in command-line mode")
-	srcMode = flag.Bool("src", false, "print (exported) source in command-line mode")
-	urlFlag = flag.String("url", "", "print HTML for named URL")
-
-	// command-line searches
-	query = flag.Bool("q", false, "arguments are considered search queries")
-
-	verbose = flag.Bool("v", false, "verbose mode")
-
-	// file system roots
-	// TODO(gri) consider the invariant that goroot always end in '/'
-	goroot = flag.String("goroot", runtime.GOROOT(), "Go root directory")
-
-	// layout control
-	tabWidth       = flag.Int("tabwidth", 4, "tab width")
-	showTimestamps = flag.Bool("timestamps", false, "show timestamps with directory listings")
-	templateDir    = flag.String("templates", "", "load templates/JS/CSS from disk in this directory")
-	showPlayground = flag.Bool("play", false, "enable playground in web interface")
-	showExamples   = flag.Bool("ex", false, "show examples in command line mode")
-	declLinks      = flag.Bool("links", true, "link identifiers to their declarations")
-
-	// search index
-	indexEnabled  = flag.Bool("index", false, "enable search index")
-	indexFiles    = flag.String("index_files", "", "glob pattern specifying index files; if not empty, the index is read from these files in sorted order")
-	indexInterval = flag.Duration("index_interval", 0, "interval of indexing; 0 for default (5m), negative to only index once at startup")
-	maxResults    = flag.Int("maxresults", 10000, "maximum number of full text search results shown")
-	indexThrottle = flag.Float64("index_throttle", 0.75, "index throttle value; 0.0 = no time allocated, 1.0 = full throttle")
-
-	// source code notes
-	notesRx = flag.String("notes", "BUG", "regular expression matching note markers to show")
-)
-
-func usage() {
-	fmt.Fprintf(os.Stderr,
-		"usage: godoc package [name ...]\n"+
-			"	godoc -http="+defaultAddr+"\n")
-	flag.PrintDefaults()
-	os.Exit(2)
-}
-
-func loggingHandler(h http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
-		log.Printf("%s\t%s", req.RemoteAddr, req.URL)
-		h.ServeHTTP(w, req)
-	})
-}
-
-func handleURLFlag() {
-	// Try up to 10 fetches, following redirects.
-	urlstr := *urlFlag
-	for i := 0; i < 10; i++ {
-		// Prepare request.
-		u, err := url.Parse(urlstr)
-		if err != nil {
-			log.Fatal(err)
-		}
-		req := &http.Request{
-			URL: u,
-		}
-
-		// Invoke default HTTP handler to serve request
-		// to our buffering httpWriter.
-		w := httptest.NewRecorder()
-		http.DefaultServeMux.ServeHTTP(w, req)
-
-		// Return data, error, or follow redirect.
-		switch w.Code {
-		case 200: // ok
-			os.Stdout.Write(w.Body.Bytes())
-			return
-		case 301, 302, 303, 307: // redirect
-			redirect := w.HeaderMap.Get("Location")
-			if redirect == "" {
-				log.Fatalf("HTTP %d without Location header", w.Code)
-			}
-			urlstr = redirect
-		default:
-			log.Fatalf("HTTP error %d", w.Code)
-		}
-	}
-	log.Fatalf("too many redirects")
-}
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-
-	playEnabled = *showPlayground
-
-	// Check usage: server and no args.
-	if (*httpAddr != "" || *urlFlag != "") && (flag.NArg() > 0) {
-		fmt.Fprintln(os.Stderr, "can't use -http with args.")
-		usage()
-	}
-
-	// Check usage: command line args or index creation mode.
-	if (*httpAddr != "" || *urlFlag != "") != (flag.NArg() == 0) && !*writeIndex {
-		fmt.Fprintln(os.Stderr, "missing args.")
-		usage()
-	}
-
-	var fsGate chan bool
-	fsGate = make(chan bool, 20)
-
-	// Determine file system to use.
-	if *zipfile == "" {
-		// use file system of underlying OS
-		rootfs := gatefs.New(vfs.OS(*goroot), fsGate)
-		fs.Bind("/", rootfs, "/", vfs.BindReplace)
-	} else {
-		// use file system specified via .zip file (path separator must be '/')
-		rc, err := zip.OpenReader(*zipfile)
-		if err != nil {
-			log.Fatalf("%s: %s\n", *zipfile, err)
-		}
-		defer rc.Close() // be nice (e.g., -writeIndex mode)
-		fs.Bind("/", zipfs.New(rc, *zipfile), *goroot, vfs.BindReplace)
-	}
-	if *templateDir != "" {
-		fs.Bind("/lib/godoc", vfs.OS(*templateDir), "/", vfs.BindBefore)
-	} else {
-		fs.Bind("/lib/godoc", mapfs.New(static.Files), "/", vfs.BindReplace)
-	}
-
-	// Bind $GOPATH trees into Go root.
-	for _, p := range filepath.SplitList(build.Default.GOPATH) {
-		fs.Bind("/src", gatefs.New(vfs.OS(p), fsGate), "/src", vfs.BindAfter)
-	}
-
-	httpMode := *httpAddr != ""
-
-	var typeAnalysis, pointerAnalysis bool
-	if *analysisFlag != "" {
-		for _, a := range strings.Split(*analysisFlag, ",") {
-			switch a {
-			case "type":
-				typeAnalysis = true
-			case "pointer":
-				pointerAnalysis = true
-			default:
-				log.Fatalf("unknown analysis: %s", a)
-			}
-		}
-	}
-
-	corpus := godoc.NewCorpus(fs)
-	corpus.Verbose = *verbose
-	corpus.MaxResults = *maxResults
-	corpus.IndexEnabled = *indexEnabled && httpMode
-	if *maxResults == 0 {
-		corpus.IndexFullText = false
-	}
-	corpus.IndexFiles = *indexFiles
-	corpus.IndexDirectory = indexDirectoryDefault
-	corpus.IndexThrottle = *indexThrottle
-	corpus.IndexInterval = *indexInterval
-	if *writeIndex {
-		corpus.IndexThrottle = 1.0
-		corpus.IndexEnabled = true
-	}
-	if *writeIndex || httpMode || *urlFlag != "" {
-		if err := corpus.Init(); err != nil {
-			log.Fatal(err)
-		}
-	}
-
-	pres = godoc.NewPresentation(corpus)
-	pres.TabWidth = *tabWidth
-	pres.ShowTimestamps = *showTimestamps
-	pres.ShowPlayground = *showPlayground
-	pres.ShowExamples = *showExamples
-	pres.DeclLinks = *declLinks
-	pres.SrcMode = *srcMode
-	pres.HTMLMode = *html
-	if *notesRx != "" {
-		pres.NotesRx = regexp.MustCompile(*notesRx)
-	}
-
-	readTemplates(pres, httpMode || *urlFlag != "")
-	registerHandlers(pres)
-
-	if *writeIndex {
-		// Write search index and exit.
-		if *indexFiles == "" {
-			log.Fatal("no index file specified")
-		}
-
-		log.Println("initialize file systems")
-		*verbose = true // want to see what happens
-
-		corpus.UpdateIndex()
-
-		log.Println("writing index file", *indexFiles)
-		f, err := os.Create(*indexFiles)
-		if err != nil {
-			log.Fatal(err)
-		}
-		index, _ := corpus.CurrentIndex()
-		_, err = index.WriteTo(f)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		log.Println("done")
-		return
-	}
-
-	// Print content that would be served at the URL *urlFlag.
-	if *urlFlag != "" {
-		handleURLFlag()
-		return
-	}
-
-	if httpMode {
-		// HTTP server mode.
-		var handler http.Handler = http.DefaultServeMux
-		if *verbose {
-			log.Printf("Go Documentation Server")
-			log.Printf("version = %s", runtime.Version())
-			log.Printf("address = %s", *httpAddr)
-			log.Printf("goroot = %s", *goroot)
-			log.Printf("tabwidth = %d", *tabWidth)
-			switch {
-			case !*indexEnabled:
-				log.Print("search index disabled")
-			case *maxResults > 0:
-				log.Printf("full text index enabled (maxresults = %d)", *maxResults)
-			default:
-				log.Print("identifier search index enabled")
-			}
-			fs.Fprint(os.Stderr)
-			handler = loggingHandler(handler)
-		}
-
-		// Initialize search index.
-		if *indexEnabled {
-			go corpus.RunIndexer()
-		}
-
-		// Start type/pointer analysis.
-		if typeAnalysis || pointerAnalysis {
-			go analysis.Run(pointerAnalysis, &corpus.Analysis)
-		}
-
-		if serveAutoCertHook != nil {
-			go func() {
-				if err := serveAutoCertHook(handler); err != nil {
-					log.Fatalf("ListenAndServe TLS: %v", err)
-				}
-			}()
-		}
-
-		// Start http server.
-		if err := http.ListenAndServe(*httpAddr, handler); err != nil {
-			log.Fatalf("ListenAndServe %s: %v", *httpAddr, err)
-		}
-
-		return
-	}
-
-	if *query {
-		handleRemoteSearch()
-		return
-	}
-
-	if err := godoc.CommandLine(os.Stdout, fs, pres, flag.Args()); err != nil {
-		log.Print(err)
-	}
-}
-
-// serveAutoCertHook if non-nil specifies a function to listen on port 443.
-// See autocert.go.
-var serveAutoCertHook func(http.Handler) error
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/play.go b/installer/vendor/golang.org/x/tools/cmd/godoc/play.go
deleted file mode 100644
index 02f477d3bb..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/play.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package main
-
-// This package registers "/compile" and "/share" handlers
-// that redirect to the golang.org playground.
-import _ "golang.org/x/tools/playground"
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/remotesearch.go b/installer/vendor/golang.org/x/tools/cmd/godoc/remotesearch.go
deleted file mode 100644
index f01d5c7acf..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/remotesearch.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package main
-
-import (
-	"errors"
-	"flag"
-	"io"
-	"log"
-	"net/http"
-	"net/url"
-	"os"
-)
-
-func handleRemoteSearch() {
-	// Command-line queries.
-	for i := 0; i < flag.NArg(); i++ {
-		res, err := remoteSearch(flag.Arg(i))
-		if err != nil {
-			log.Fatalf("remoteSearch: %s", err)
-		}
-		io.Copy(os.Stdout, res.Body)
-	}
-	return
-}
-
-// remoteSearchURL returns the search URL for a given query as needed by
-// remoteSearch. If html is set, an html result is requested; otherwise
-// the result is in textual form.
-// Adjust this function as necessary if modeNames or FormValue parameters
-// change.
-func remoteSearchURL(query string, html bool) string {
-	s := "/search?m=text&q="
-	if html {
-		s = "/search?q="
-	}
-	return s + url.QueryEscape(query)
-}
-
-func remoteSearch(query string) (res *http.Response, err error) {
-	// list of addresses to try
-	var addrs []string
-	if *serverAddr != "" {
-		// explicit server address - only try this one
-		addrs = []string{*serverAddr}
-	} else {
-		addrs = []string{
-			defaultAddr,
-			"golang.org",
-		}
-	}
-
-	// remote search
-	search := remoteSearchURL(query, *html)
-	for _, addr := range addrs {
-		url := "http://" + addr + search
-		res, err = http.Get(url)
-		if err == nil && res.StatusCode == http.StatusOK {
-			break
-		}
-	}
-
-	if err == nil && res.StatusCode != http.StatusOK {
-		err = errors.New(res.Status)
-	}
-
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/setup-godoc-app.bash b/installer/vendor/golang.org/x/tools/cmd/godoc/setup-godoc-app.bash
deleted file mode 100755
index a462ebe0c2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/setup-godoc-app.bash
+++ /dev/null
@@ -1,134 +0,0 @@
-#!/usr/bin/env bash
-
-# Copyright 2011 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-# This script creates a complete godoc app in $APPDIR.
-# It copies the cmd/godoc and src/go/... sources from GOROOT,
-# synthesizes an app.yaml file, and creates the .zip, index, and
-# configuration files.
-#
-# If an argument is provided it is assumed to be the app-engine godoc directory.
-# Without an argument, $APPDIR is used instead. If GOROOT is not set, "go env"
-# is consulted to find the $GOROOT.
-#
-# The script creates a .zip file representing the $GOROOT file system
-# and computes the correspondig search index files. These files are then
-# copied to $APPDIR. A corresponding godoc configuration file is created
-# in $APPDIR/appconfig.go.
-
-ZIPFILE=godoc.zip
-INDEXFILE=godoc.index
-SPLITFILES=index.split.
-GODOC=golang.org/x/tools/cmd/godoc
-CONFIGFILE=$GODOC/appconfig.go
-
-error() {
-	echo "error: $1"
-	exit 2
-}
-
-getArgs() {
-	if [ -z $APPENGINE_SDK ]; then
-		error "APPENGINE_SDK environment variable not set"
-	fi
-	if [ ! -x $APPENGINE_SDK/goapp ]; then
-		error "couldn't find goapp command in $APPENGINE_SDK"
-	fi
-	if [ -z $GOROOT ]; then
-		GOROOT=$(go env GOROOT)
-		echo "GOROOT not set explicitly, using go env value instead"
-	fi
-	if [ -z $APPDIR ]; then
-		if [ $# == 0 ]; then
-			error "APPDIR not set, and no argument provided"
-		fi
-		APPDIR=$1
-		echo "APPDIR not set, using argument instead"
-	fi
-
-	# safety checks
-	if [ ! -d $GOROOT ]; then
-		error "$GOROOT is not a directory"
-	fi
-	if [ -e $APPDIR ]; then
-		error "$APPDIR exists; check and remove it before trying again"
-	fi
-
-	# reporting
-	echo "GOROOT = $GOROOT"
-	echo "APPDIR = $APPDIR"
-}
-
-fetchGodoc() {
-	echo "*** Fetching godoc (if not already in GOPATH)"
-	unset GOBIN
-	go=$APPENGINE_SDK/goapp
-	$go get -d -tags appengine $GODOC
-	mkdir -p $APPDIR/$GODOC
-	cp $(find $($go list -f '{{.Dir}}' $GODOC) -mindepth 1 -maxdepth 1 -type f) $APPDIR/$GODOC/
-}
-
-makeAppYaml() {
-	echo "*** make $APPDIR/app.yaml"
-	cat > $APPDIR/app.yaml <<EOF
-application: godoc
-version: 1
-runtime: go
-api_version: go1.4beta
-
-handlers:
-- url: /.*
-  script: _go_app
-EOF
-}
-
-makeZipfile() {
-	echo "*** make $APPDIR/$ZIPFILE"
-	zip -q -r $APPDIR/$ZIPFILE $GOROOT/*
-}
-
-makeIndexfile() {
-	echo "*** make $APPDIR/$INDEXFILE"
-	GOPATH= godoc -write_index -index_files=$APPDIR/$INDEXFILE -zip=$APPDIR/$ZIPFILE
-}
-
-splitIndexfile() {
-	echo "*** split $APPDIR/$INDEXFILE"
-	split -b8m $APPDIR/$INDEXFILE $APPDIR/$SPLITFILES
-}
-
-makeConfigfile() {
-	echo "*** make $APPDIR/$CONFIGFILE"
-	cat > $APPDIR/$CONFIGFILE <<EOF
-package main
-
-// GENERATED FILE - DO NOT MODIFY BY HAND.
-// (generated by golang.org/x/tools/cmd/godoc/setup-godoc-app.bash)
-
-const (
-	// .zip filename
-	zipFilename = "$ZIPFILE"
-
-	// goroot directory in .zip file
-	zipGoroot = "$GOROOT"
-
-	// glob pattern describing search index files
-	// (if empty, the index is built at run-time)
-	indexFilenames = "$SPLITFILES*"
-)
-EOF
-}
-
-getArgs "$@"
-set -e
-mkdir $APPDIR
-fetchGodoc
-makeAppYaml
-makeZipfile
-makeIndexfile
-splitIndexfile
-makeConfigfile
-
-echo "*** setup complete"
diff --git a/installer/vendor/golang.org/x/tools/cmd/godoc/x.go b/installer/vendor/golang.org/x/tools/cmd/godoc/x.go
deleted file mode 100644
index 13e600c7f3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/godoc/x.go
+++ /dev/null
@@ -1,90 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains the handlers that serve go-import redirects for Go
-// sub-repositories. It specifies the mapping from import paths like
-// "golang.org/x/tools" to the actual repository locations.
-
-package main
-
-import (
-	"html/template"
-	"log"
-	"net/http"
-	"strings"
-)
-
-const xPrefix = "/x/"
-
-type xRepo struct {
-	URL, VCS string
-}
-
-var xMap = map[string]xRepo{
-	"codereview": {"https://code.google.com/p/go.codereview", "hg"},
-
-	"arch":       {"https://go.googlesource.com/arch", "git"},
-	"benchmarks": {"https://go.googlesource.com/benchmarks", "git"},
-	"blog":       {"https://go.googlesource.com/blog", "git"},
-	"build":      {"https://go.googlesource.com/build", "git"},
-	"crypto":     {"https://go.googlesource.com/crypto", "git"},
-	"debug":      {"https://go.googlesource.com/debug", "git"},
-	"exp":        {"https://go.googlesource.com/exp", "git"},
-	"image":      {"https://go.googlesource.com/image", "git"},
-	"mobile":     {"https://go.googlesource.com/mobile", "git"},
-	"net":        {"https://go.googlesource.com/net", "git"},
-	"oauth2":     {"https://go.googlesource.com/oauth2", "git"},
-	"perf":       {"https://go.googlesource.com/perf", "git"},
-	"playground": {"https://go.googlesource.com/playground", "git"},
-	"review":     {"https://go.googlesource.com/review", "git"},
-	"sync":       {"https://go.googlesource.com/sync", "git"},
-	"sys":        {"https://go.googlesource.com/sys", "git"},
-	"talks":      {"https://go.googlesource.com/talks", "git"},
-	"term":       {"https://go.googlesource.com/term", "git"},
-	"text":       {"https://go.googlesource.com/text", "git"},
-	"time":       {"https://go.googlesource.com/time", "git"},
-	"tools":      {"https://go.googlesource.com/tools", "git"},
-	"tour":       {"https://go.googlesource.com/tour", "git"},
-}
-
-func init() {
-	http.HandleFunc(xPrefix, xHandler)
-}
-
-func xHandler(w http.ResponseWriter, r *http.Request) {
-	head, tail := strings.TrimPrefix(r.URL.Path, xPrefix), ""
-	if i := strings.Index(head, "/"); i != -1 {
-		head, tail = head[:i], head[i:]
-	}
-	if head == "" {
-		http.Redirect(w, r, "https://godoc.org/-/subrepo", http.StatusTemporaryRedirect)
-		return
-	}
-	repo, ok := xMap[head]
-	if !ok {
-		http.NotFound(w, r)
-		return
-	}
-	data := struct {
-		Prefix, Head, Tail string
-		Repo               xRepo
-	}{xPrefix, head, tail, repo}
-	if err := xTemplate.Execute(w, data); err != nil {
-		log.Println("xHandler:", err)
-	}
-}
-
-var xTemplate = template.Must(template.New("x").Parse(`<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-<meta name="go-import" content="golang.org{{.Prefix}}{{.Head}} {{.Repo.VCS}} {{.Repo.URL}}">
-<meta name="go-source" content="golang.org{{.Prefix}}{{.Head}} https://github.com/golang/{{.Head}}/ https://github.com/golang/{{.Head}}/tree/master{/dir} https://github.com/golang/{{.Head}}/blob/master{/dir}/{file}#L{line}">
-<meta http-equiv="refresh" content="0; url=https://godoc.org/golang.org{{.Prefix}}{{.Head}}{{.Tail}}">
-</head>
-<body>
-Nothing to see here; <a href="https://godoc.org/golang.org{{.Prefix}}{{.Head}}{{.Tail}}">move along</a>.
-</body>
-</html>
-`))
diff --git a/installer/vendor/golang.org/x/tools/cmd/goimports/doc.go b/installer/vendor/golang.org/x/tools/cmd/goimports/doc.go
deleted file mode 100644
index f5ca3a0a1b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goimports/doc.go
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-
-Command goimports updates your Go import lines,
-adding missing ones and removing unreferenced ones.
-
-     $ go get golang.org/x/tools/cmd/goimports
-
-In addition to fixing imports, goimports also formats
-your code in the same style as gofmt so it can be used
-as a replacement for your editor's gofmt-on-save hook.
-
-For emacs, make sure you have the latest go-mode.el:
-   https://github.com/dominikh/go-mode.el
-Then in your .emacs file:
-   (setq gofmt-command "goimports")
-   (add-to-list 'load-path "/home/you/somewhere/emacs/")
-   (require 'go-mode-autoloads)
-   (add-hook 'before-save-hook 'gofmt-before-save)
-
-For vim, set "gofmt_command" to "goimports":
-    https://golang.org/change/39c724dd7f252
-    https://golang.org/wiki/IDEsAndTextEditorPlugins
-    etc
-
-For GoSublime, follow the steps described here:
-    http://michaelwhatcott.com/gosublime-goimports/
-
-For other editors, you probably know what to do.
-
-To exclude directories in your $GOPATH from being scanned for Go
-files, goimports respects a configuration file at
-$GOPATH/src/.goimportsignore which may contain blank lines, comment
-lines (beginning with '#'), or lines naming a directory relative to
-the configuration file to ignore when scanning. No globbing or regex
-patterns are allowed. Use the "-v" verbose flag to verify it's
-working and see what goimports is doing.
-
-File bugs or feature requests at:
-
-    https://golang.org/issues/new?title=x/tools/cmd/goimports:+
-
-Happy hacking!
-
-*/
-package main // import "golang.org/x/tools/cmd/goimports"
diff --git a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports.go b/installer/vendor/golang.org/x/tools/cmd/goimports/goimports.go
deleted file mode 100644
index 16e30834f0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports.go
+++ /dev/null
@@ -1,369 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"go/scanner"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"runtime/pprof"
-	"strings"
-
-	"golang.org/x/tools/imports"
-)
-
-var (
-	// main operation modes
-	list    = flag.Bool("l", false, "list files whose formatting differs from goimport's")
-	write   = flag.Bool("w", false, "write result to (source) file instead of stdout")
-	doDiff  = flag.Bool("d", false, "display diffs instead of rewriting files")
-	srcdir  = flag.String("srcdir", "", "choose imports as if source code is from `dir`. When operating on a single file, dir may instead be the complete file name.")
-	verbose bool // verbose logging
-
-	cpuProfile     = flag.String("cpuprofile", "", "CPU profile output")
-	memProfile     = flag.String("memprofile", "", "memory profile output")
-	memProfileRate = flag.Int("memrate", 0, "if > 0, sets runtime.MemProfileRate")
-
-	options = &imports.Options{
-		TabWidth:  8,
-		TabIndent: true,
-		Comments:  true,
-		Fragment:  true,
-	}
-	exitCode = 0
-)
-
-func init() {
-	flag.BoolVar(&options.AllErrors, "e", false, "report all errors (not just the first 10 on different lines)")
-	flag.StringVar(&imports.LocalPrefix, "local", "", "put imports beginning with this string after 3rd-party packages")
-}
-
-func report(err error) {
-	scanner.PrintError(os.Stderr, err)
-	exitCode = 2
-}
-
-func usage() {
-	fmt.Fprintf(os.Stderr, "usage: goimports [flags] [path ...]\n")
-	flag.PrintDefaults()
-	os.Exit(2)
-}
-
-func isGoFile(f os.FileInfo) bool {
-	// ignore non-Go files
-	name := f.Name()
-	return !f.IsDir() && !strings.HasPrefix(name, ".") && strings.HasSuffix(name, ".go")
-}
-
-// argumentType is which mode goimports was invoked as.
-type argumentType int
-
-const (
-	// fromStdin means the user is piping their source into goimports.
-	fromStdin argumentType = iota
-
-	// singleArg is the common case from editors, when goimports is run on
-	// a single file.
-	singleArg
-
-	// multipleArg is when the user ran "goimports file1.go file2.go"
-	// or ran goimports on a directory tree.
-	multipleArg
-)
-
-func processFile(filename string, in io.Reader, out io.Writer, argType argumentType) error {
-	opt := options
-	if argType == fromStdin {
-		nopt := *options
-		nopt.Fragment = true
-		opt = &nopt
-	}
-
-	if in == nil {
-		f, err := os.Open(filename)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-		in = f
-	}
-
-	src, err := ioutil.ReadAll(in)
-	if err != nil {
-		return err
-	}
-
-	target := filename
-	if *srcdir != "" {
-		// Determine whether the provided -srcdirc is a directory or file
-		// and then use it to override the target.
-		//
-		// See https://github.com/dominikh/go-mode.el/issues/146
-		if isFile(*srcdir) {
-			if argType == multipleArg {
-				return errors.New("-srcdir value can't be a file when passing multiple arguments or when walking directories")
-			}
-			target = *srcdir
-		} else if argType == singleArg && strings.HasSuffix(*srcdir, ".go") && !isDir(*srcdir) {
-			// For a file which doesn't exist on disk yet, but might shortly.
-			// e.g. user in editor opens $DIR/newfile.go and newfile.go doesn't yet exist on disk.
-			// The goimports on-save hook writes the buffer to a temp file
-			// first and runs goimports before the actual save to newfile.go.
-			// The editor's buffer is named "newfile.go" so that is passed to goimports as:
-			//      goimports -srcdir=/gopath/src/pkg/newfile.go /tmp/gofmtXXXXXXXX.go
-			// and then the editor reloads the result from the tmp file and writes
-			// it to newfile.go.
-			target = *srcdir
-		} else {
-			// Pretend that file is from *srcdir in order to decide
-			// visible imports correctly.
-			target = filepath.Join(*srcdir, filepath.Base(filename))
-		}
-	}
-
-	res, err := imports.Process(target, src, opt)
-	if err != nil {
-		return err
-	}
-
-	if !bytes.Equal(src, res) {
-		// formatting has changed
-		if *list {
-			fmt.Fprintln(out, filename)
-		}
-		if *write {
-			if argType == fromStdin {
-				// filename is "<standard input>"
-				return errors.New("can't use -w on stdin")
-			}
-			err = ioutil.WriteFile(filename, res, 0)
-			if err != nil {
-				return err
-			}
-		}
-		if *doDiff {
-			if argType == fromStdin {
-				filename = "stdin.go" // because <standard input>.orig looks silly
-			}
-			data, err := diff(src, res, filename)
-			if err != nil {
-				return fmt.Errorf("computing diff: %s", err)
-			}
-			fmt.Printf("diff -u %s %s\n", filepath.ToSlash(filename+".orig"), filepath.ToSlash(filename))
-			out.Write(data)
-		}
-	}
-
-	if !*list && !*write && !*doDiff {
-		_, err = out.Write(res)
-	}
-
-	return err
-}
-
-func visitFile(path string, f os.FileInfo, err error) error {
-	if err == nil && isGoFile(f) {
-		err = processFile(path, nil, os.Stdout, multipleArg)
-	}
-	if err != nil {
-		report(err)
-	}
-	return nil
-}
-
-func walkDir(path string) {
-	filepath.Walk(path, visitFile)
-}
-
-func main() {
-	runtime.GOMAXPROCS(runtime.NumCPU())
-
-	// call gofmtMain in a separate function
-	// so that it can use defer and have them
-	// run before the exit.
-	gofmtMain()
-	os.Exit(exitCode)
-}
-
-// parseFlags parses command line flags and returns the paths to process.
-// It's a var so that custom implementations can replace it in other files.
-var parseFlags = func() []string {
-	flag.BoolVar(&verbose, "v", false, "verbose logging")
-
-	flag.Parse()
-	return flag.Args()
-}
-
-func bufferedFileWriter(dest string) (w io.Writer, close func()) {
-	f, err := os.Create(dest)
-	if err != nil {
-		log.Fatal(err)
-	}
-	bw := bufio.NewWriter(f)
-	return bw, func() {
-		if err := bw.Flush(); err != nil {
-			log.Fatalf("error flushing %v: %v", dest, err)
-		}
-		if err := f.Close(); err != nil {
-			log.Fatal(err)
-		}
-	}
-}
-
-func gofmtMain() {
-	flag.Usage = usage
-	paths := parseFlags()
-
-	if *cpuProfile != "" {
-		bw, flush := bufferedFileWriter(*cpuProfile)
-		pprof.StartCPUProfile(bw)
-		defer flush()
-		defer pprof.StopCPUProfile()
-	}
-	// doTrace is a conditionally compiled wrapper around runtime/trace. It is
-	// used to allow goimports to compile under gccgo, which does not support
-	// runtime/trace. See https://golang.org/issue/15544.
-	defer doTrace()()
-	if *memProfileRate > 0 {
-		runtime.MemProfileRate = *memProfileRate
-		bw, flush := bufferedFileWriter(*memProfile)
-		defer func() {
-			runtime.GC() // materialize all statistics
-			if err := pprof.WriteHeapProfile(bw); err != nil {
-				log.Fatal(err)
-			}
-			flush()
-		}()
-	}
-
-	if verbose {
-		log.SetFlags(log.LstdFlags | log.Lmicroseconds)
-		imports.Debug = true
-	}
-	if options.TabWidth < 0 {
-		fmt.Fprintf(os.Stderr, "negative tabwidth %d\n", options.TabWidth)
-		exitCode = 2
-		return
-	}
-
-	if len(paths) == 0 {
-		if err := processFile("<standard input>", os.Stdin, os.Stdout, fromStdin); err != nil {
-			report(err)
-		}
-		return
-	}
-
-	argType := singleArg
-	if len(paths) > 1 {
-		argType = multipleArg
-	}
-
-	for _, path := range paths {
-		switch dir, err := os.Stat(path); {
-		case err != nil:
-			report(err)
-		case dir.IsDir():
-			walkDir(path)
-		default:
-			if err := processFile(path, nil, os.Stdout, argType); err != nil {
-				report(err)
-			}
-		}
-	}
-}
-
-func writeTempFile(dir, prefix string, data []byte) (string, error) {
-	file, err := ioutil.TempFile(dir, prefix)
-	if err != nil {
-		return "", err
-	}
-	_, err = file.Write(data)
-	if err1 := file.Close(); err == nil {
-		err = err1
-	}
-	if err != nil {
-		os.Remove(file.Name())
-		return "", err
-	}
-	return file.Name(), nil
-}
-
-func diff(b1, b2 []byte, filename string) (data []byte, err error) {
-	f1, err := writeTempFile("", "gofmt", b1)
-	if err != nil {
-		return
-	}
-	defer os.Remove(f1)
-
-	f2, err := writeTempFile("", "gofmt", b2)
-	if err != nil {
-		return
-	}
-	defer os.Remove(f2)
-
-	cmd := "diff"
-	if runtime.GOOS == "plan9" {
-		cmd = "/bin/ape/diff"
-	}
-
-	data, err = exec.Command(cmd, "-u", f1, f2).CombinedOutput()
-	if len(data) > 0 {
-		// diff exits with a non-zero status when the files don't match.
-		// Ignore that failure as long as we get output.
-		return replaceTempFilename(data, filename)
-	}
-	return
-}
-
-// replaceTempFilename replaces temporary filenames in diff with actual one.
-//
-// --- /tmp/gofmt316145376	2017-02-03 19:13:00.280468375 -0500
-// +++ /tmp/gofmt617882815	2017-02-03 19:13:00.280468375 -0500
-// ...
-// ->
-// --- path/to/file.go.orig	2017-02-03 19:13:00.280468375 -0500
-// +++ path/to/file.go	2017-02-03 19:13:00.280468375 -0500
-// ...
-func replaceTempFilename(diff []byte, filename string) ([]byte, error) {
-	bs := bytes.SplitN(diff, []byte{'\n'}, 3)
-	if len(bs) < 3 {
-		return nil, fmt.Errorf("got unexpected diff for %s", filename)
-	}
-	// Preserve timestamps.
-	var t0, t1 []byte
-	if i := bytes.LastIndexByte(bs[0], '\t'); i != -1 {
-		t0 = bs[0][i:]
-	}
-	if i := bytes.LastIndexByte(bs[1], '\t'); i != -1 {
-		t1 = bs[1][i:]
-	}
-	// Always print filepath with slash separator.
-	f := filepath.ToSlash(filename)
-	bs[0] = []byte(fmt.Sprintf("--- %s%s", f+".orig", t0))
-	bs[1] = []byte(fmt.Sprintf("+++ %s%s", f, t1))
-	return bytes.Join(bs, []byte{'\n'}), nil
-}
-
-// isFile reports whether name is a file.
-func isFile(name string) bool {
-	fi, err := os.Stat(name)
-	return err == nil && fi.Mode().IsRegular()
-}
-
-// isDir reports whether name is a directory.
-func isDir(name string) bool {
-	fi, err := os.Stat(name)
-	return err == nil && fi.IsDir()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_gc.go b/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_gc.go
deleted file mode 100644
index 21d867eaab..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_gc.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gc
-
-package main
-
-import (
-	"flag"
-	"runtime/trace"
-)
-
-var traceProfile = flag.String("trace", "", "trace profile output")
-
-func doTrace() func() {
-	if *traceProfile != "" {
-		bw, flush := bufferedFileWriter(*traceProfile)
-		trace.Start(bw)
-		return func() {
-			flush()
-			trace.Stop()
-		}
-	}
-	return func() {}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_not_gc.go b/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_not_gc.go
deleted file mode 100644
index f5531ceb31..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goimports/goimports_not_gc.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !gc
-
-package main
-
-func doTrace() func() {
-	return func() {}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gomvpkg/main.go b/installer/vendor/golang.org/x/tools/cmd/gomvpkg/main.go
deleted file mode 100644
index 959b84ef5f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gomvpkg/main.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// licence that can be found in the LICENSE file.
-
-// The gomvpkg command moves go packages, updating import declarations.
-// See the -help message or Usage constant for details.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"os"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/refactor/rename"
-)
-
-var (
-	fromFlag     = flag.String("from", "", "Import path of package to be moved")
-	toFlag       = flag.String("to", "", "Destination import path for package")
-	vcsMvCmdFlag = flag.String("vcs_mv_cmd", "", `A template for the version control system's "move directory" command, e.g. "git mv {{.Src}} {{.Dst}}`)
-	helpFlag     = flag.Bool("help", false, "show usage message")
-)
-
-func init() {
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-}
-
-const Usage = `gomvpkg: moves a package, updating import declarations
-
-Usage:
-
- gomvpkg -from <path> -to <path> [-vcs_mv_cmd <template>]
-
-Flags:
-
--from        specifies the import path of the package to be moved
-
--to          specifies the destination import path
-
--vcs_mv_cmd  specifies a shell command to inform the version control system of a
-             directory move.  The argument is a template using the syntax of the
-             text/template package. It has two fields: Src and Dst, the absolute
-             paths of the directories.
-
-             For example: "git mv {{.Src}} {{.Dst}}"
-
-gomvpkg determines the set of packages that might be affected, including all
-packages importing the 'from' package and any of its subpackages. It will move
-the 'from' package and all its subpackages to the destination path and update all
-imports of those packages to point to its new import path.
-
-gomvpkg rejects moves in which a package already exists at the destination import
-path, or in which a directory already exists at the location the package would be
-moved to.
-
-gomvpkg will not always be able to rename imports when a package's name is changed.
-Import statements may want further cleanup.
-
-gomvpkg's behavior is not defined if any of the packages to be moved are
-imported using dot imports.
-
-Examples:
-
-% gomvpkg -from myproject/foo -to myproject/bar
-
-  Move the package with import path "myproject/foo" to the new path
-  "myproject/bar".
-
-% gomvpkg -from myproject/foo -to myproject/bar -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"
-
-  Move the package with import path "myproject/foo" to the new path
-  "myproject/bar" using "git mv" to execute the directory move.
-`
-
-func main() {
-	flag.Parse()
-
-	if len(flag.Args()) > 0 {
-		fmt.Fprintln(os.Stderr, "gomvpkg: surplus arguments.")
-		os.Exit(1)
-	}
-
-	if *helpFlag || *fromFlag == "" || *toFlag == "" {
-		fmt.Println(Usage)
-		return
-	}
-
-	if err := rename.Move(&build.Default, *fromFlag, *toFlag, *vcsMvCmdFlag); err != nil {
-		fmt.Fprintf(os.Stderr, "gomvpkg: %s.\n", err)
-		os.Exit(1)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gorename/cgo_test.go b/installer/vendor/golang.org/x/tools/cmd/gorename/cgo_test.go
deleted file mode 100644
index fd07553fc6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gorename/cgo_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build cgo
-
-package main_test
-
-func init() {
-	haveCGO = true
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gorename/gorename_test.go b/installer/vendor/golang.org/x/tools/cmd/gorename/gorename_test.go
deleted file mode 100644
index b778cb672b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gorename/gorename_test.go
+++ /dev/null
@@ -1,380 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main_test
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-var haveCGO bool
-
-type test struct {
-	offset, from, to string // specify the arguments
-	fileSpecified    bool   // true if the offset or from args specify a specific file
-	pkgs             map[string][]string
-	wantErr          bool
-	wantOut          string              // a substring expected to be in the output
-	packages         map[string][]string // a map of the package name to the files contained within, which will be numbered by i.go where i is the index
-}
-
-// Test that renaming that would modify cgo files will produce an error and not modify the file.
-func TestGeneratedFiles(t *testing.T) {
-	if !haveCGO {
-		t.Skipf("skipping test: no cgo")
-	}
-
-	tmp, bin, cleanup := buildGorename(t)
-	defer cleanup()
-
-	srcDir := filepath.Join(tmp, "src")
-	err := os.Mkdir(srcDir, os.ModePerm)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var env = []string{fmt.Sprintf("GOPATH=%s", tmp)}
-	for _, envVar := range os.Environ() {
-		if !strings.HasPrefix(envVar, "GOPATH=") {
-			env = append(env, envVar)
-		}
-	}
-
-	// Testing renaming in packages that include cgo files:
-	for iter, renameTest := range []test{
-		{
-			// Test: variable not used in any cgo file -> no error
-			from: `"mytest"::f`, to: "g",
-			packages: map[string][]string{
-				"mytest": []string{`package mytest; func f() {}`,
-					`package mytest
-// #include <stdio.h>
-import "C"
-
-func z() {C.puts(nil)}`},
-			},
-			wantErr: false,
-			wantOut: "Renamed 1 occurrence in 1 file in 1 package.",
-		}, {
-			// Test: to name used in cgo file -> rename error
-			from: `"mytest"::f`, to: "g",
-			packages: map[string][]string{
-				"mytest": []string{`package mytest; func f() {}`,
-					`package mytest
-// #include <stdio.h>
-import "C"
-
-func g() {C.puts(nil)}`},
-			},
-			wantErr: true,
-			wantOut: "conflicts with func in same block",
-		},
-		{
-			// Test: from name in package in cgo file -> error
-			from: `"mytest"::f`, to: "g",
-			packages: map[string][]string{
-				"mytest": []string{`package mytest
-
-// #include <stdio.h>
-import "C"
-
-func f() { C.puts(nil); }
-`},
-			},
-			wantErr: true,
-			wantOut: "gorename: refusing to modify generated file containing DO NOT EDIT marker:",
-		}, {
-			// Test: from name in cgo file -> error
-			from: filepath.Join("mytest", "0.go") + `::f`, to: "g",
-			fileSpecified: true,
-			packages: map[string][]string{
-				"mytest": []string{`package mytest
-
-// #include <stdio.h>
-import "C"
-
-func f() { C.puts(nil); }
-`},
-			},
-			wantErr: true,
-			wantOut: "gorename: refusing to modify generated file containing DO NOT EDIT marker:",
-		}, {
-			// Test: offset in cgo file -> identifier in cgo error
-			offset: filepath.Join("main", "0.go") + `:#78`, to: "bar",
-			fileSpecified: true,
-			wantErr:       true,
-			packages: map[string][]string{
-				"main": {`package main
-
-// #include <unistd.h>
-import "C"
-import "fmt"
-
-func main() {
-	foo := 1
-	C.close(2)
-	fmt.Println(foo)
-}
-`},
-			},
-			wantOut: "cannot rename identifiers in generated file containing DO NOT EDIT marker:",
-		}, {
-			// Test: from identifier appears in cgo file in another package -> error
-			from: `"test"::Foo`, to: "Bar",
-			packages: map[string][]string{
-				"test": []string{
-					`package test
-
-func Foo(x int) (int){
-	return x * 2
-}
-`,
-				},
-				"main": []string{
-					`package main
-
-import "test"
-import "fmt"
-// #include <unistd.h>
-import "C"
-
-func fun() {
-	x := test.Foo(3)
-	C.close(3)
-	fmt.Println(x)
-}
-`,
-				},
-			},
-			wantErr: true,
-			wantOut: "gorename: refusing to modify generated file containing DO NOT EDIT marker:",
-		}, {
-			// Test: from identifier doesn't appear in cgo file that includes modified package -> rename successful
-			from: `"test".Foo::x`, to: "y",
-			packages: map[string][]string{
-				"test": []string{
-					`package test
-
-func Foo(x int) (int){
-	return x * 2
-}
-`,
-				},
-				"main": []string{
-					`package main
-import "test"
-import "fmt"
-// #include <unistd.h>
-import "C"
-
-func fun() {
-	x := test.Foo(3)
-	C.close(3)
-	fmt.Println(x)
-}
-`,
-				},
-			},
-			wantErr: false,
-			wantOut: "Renamed 2 occurrences in 1 file in 1 package.",
-		}, {
-			// Test: from name appears in cgo file in same package -> error
-			from: `"mytest"::f`, to: "g",
-			packages: map[string][]string{
-				"mytest": []string{`package mytest; func f() {}`,
-					`package mytest
-// #include <stdio.h>
-import "C"
-
-func z() {C.puts(nil); f()}`,
-					`package mytest
-// #include <unistd.h>
-import "C"
-
-func foo() {C.close(3); f()}`,
-				},
-			},
-			wantErr: true,
-			wantOut: "gorename: refusing to modify generated files containing DO NOT EDIT marker:",
-		}, {
-			// Test: from name in file, identifier not used in cgo file -> rename successful
-			from: filepath.Join("mytest", "0.go") + `::f`, to: "g",
-			fileSpecified: true,
-			packages: map[string][]string{
-				"mytest": []string{`package mytest; func f() {}`,
-					`package mytest
-// #include <stdio.h>
-import "C"
-
-func z() {C.puts(nil)}`},
-			},
-			wantErr: false,
-			wantOut: "Renamed 1 occurrence in 1 file in 1 package.",
-		}, {
-			// Test: from identifier imported to another package but does not modify cgo file -> rename successful
-			from: `"test".Foo`, to: "Bar",
-			packages: map[string][]string{
-				"test": []string{
-					`package test
-
-func Foo(x int) (int){
-	return x * 2
-}
-`,
-				},
-				"main": []string{
-					`package main
-// #include <unistd.h>
-import "C"
-
-func fun() {
-	C.close(3)
-}
-`,
-					`package main
-import "test"
-import "fmt"
-func g() { fmt.Println(test.Foo(3)) }
-`,
-				},
-			},
-			wantErr: false,
-			wantOut: "Renamed 2 occurrences in 2 files in 2 packages.",
-		},
-	} {
-		// Write the test files
-		testCleanup := setUpPackages(t, srcDir, renameTest.packages)
-
-		// Set up arguments
-		var args []string
-
-		var arg, val string
-		if renameTest.offset != "" {
-			arg, val = "-offset", renameTest.offset
-		} else {
-			arg, val = "-from", renameTest.from
-		}
-
-		prefix := fmt.Sprintf("%d: %s %q -to %q", iter, arg, val, renameTest.to)
-
-		if renameTest.fileSpecified {
-			// add the src dir to the value of the argument
-			val = filepath.Join(srcDir, val)
-		}
-
-		args = append(args, arg, val, "-to", renameTest.to)
-
-		// Run command
-		cmd := exec.Command(bin, args...)
-		cmd.Args[0] = "gorename"
-		cmd.Env = env
-
-		// Check the output
-		out, err := cmd.CombinedOutput()
-		// errors should result in no changes to files
-		if err != nil {
-			if !renameTest.wantErr {
-				t.Errorf("%s: received unexpected error %s", prefix, err)
-			}
-			// Compare output
-			if ok := strings.Contains(string(out), renameTest.wantOut); !ok {
-				t.Errorf("%s: unexpected command output: %s (want: %s)", prefix, out, renameTest.wantOut)
-			}
-			// Check that no files were modified
-			if modified := modifiedFiles(t, srcDir, renameTest.packages); len(modified) != 0 {
-				t.Errorf("%s: files unexpectedly modified: %s", prefix, modified)
-			}
-
-		} else {
-			if !renameTest.wantErr {
-				if ok := strings.Contains(string(out), renameTest.wantOut); !ok {
-					t.Errorf("%s: unexpected command output: %s (want: %s)", prefix, out, renameTest.wantOut)
-				}
-			} else {
-				t.Errorf("%s: command succeeded unexpectedly, output: %s", prefix, out)
-			}
-		}
-		testCleanup()
-	}
-}
-
-// buildGorename builds the gorename executable.
-// It returns its path, and a cleanup function.
-func buildGorename(t *testing.T) (tmp, bin string, cleanup func()) {
-
-	tmp, err := ioutil.TempDir("", "gorename-regtest-")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	defer func() {
-		if cleanup == nil { // probably, go build failed.
-			os.RemoveAll(tmp)
-		}
-	}()
-
-	bin = filepath.Join(tmp, "gorename")
-	if runtime.GOOS == "windows" {
-		bin += ".exe"
-	}
-	cmd := exec.Command("go", "build", "-o", bin)
-	if err := cmd.Run(); err != nil {
-		t.Fatalf("Building gorename: %v", err)
-	}
-	return tmp, bin, func() { os.RemoveAll(tmp) }
-}
-
-// setUpPackages sets up the files in a temporary directory provided by arguments.
-func setUpPackages(t *testing.T, dir string, packages map[string][]string) (cleanup func()) {
-	var pkgDirs []string
-
-	for pkgName, files := range packages {
-		// Create a directory for the package.
-		pkgDir := filepath.Join(dir, pkgName)
-		pkgDirs = append(pkgDirs, pkgDir)
-
-		if err := os.Mkdir(pkgDir, os.ModePerm); err != nil {
-			t.Fatal(err)
-		}
-		// Write the packages files
-		for i, val := range files {
-			file := filepath.Join(pkgDir, strconv.Itoa(i)+".go")
-			if err := ioutil.WriteFile(file, []byte(val), os.ModePerm); err != nil {
-				t.Fatal(err)
-			}
-		}
-	}
-	return func() {
-		for _, dir := range pkgDirs {
-			os.RemoveAll(dir)
-		}
-	}
-}
-
-// modifiedFiles returns a list of files that were renamed (without the prefix dir).
-func modifiedFiles(t *testing.T, dir string, packages map[string][]string) (results []string) {
-
-	for pkgName, files := range packages {
-		pkgDir := filepath.Join(dir, pkgName)
-
-		for i, val := range files {
-			file := filepath.Join(pkgDir, strconv.Itoa(i)+".go")
-			// read file contents and compare to val
-			if contents, err := ioutil.ReadFile(file); err != nil {
-				t.Fatalf("File missing: %s", err)
-			} else if string(contents) != val {
-				results = append(results, strings.TrimPrefix(dir, file))
-			}
-		}
-	}
-	return results
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gorename/main.go b/installer/vendor/golang.org/x/tools/cmd/gorename/main.go
deleted file mode 100644
index b1b895cf1c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gorename/main.go
+++ /dev/null
@@ -1,55 +0,0 @@
-// The gorename command performs precise type-safe renaming of
-// identifiers in Go source code.
-//
-// Run with -help for usage information, or view the Usage constant in
-// package golang.org/x/tools/refactor/rename, which contains most of
-// the implementation.
-//
-package main // import "golang.org/x/tools/cmd/gorename"
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"log"
-	"os"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/refactor/rename"
-)
-
-var (
-	offsetFlag = flag.String("offset", "", "file and byte offset of identifier to be renamed, e.g. 'file.go:#123'.  For use by editors.")
-	fromFlag   = flag.String("from", "", "identifier to be renamed; see -help for formats")
-	toFlag     = flag.String("to", "", "new name for identifier")
-	helpFlag   = flag.Bool("help", false, "show usage message")
-)
-
-func init() {
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-	flag.BoolVar(&rename.Force, "force", false, "proceed, even if conflicts were reported")
-	flag.BoolVar(&rename.Verbose, "v", false, "print verbose information")
-	flag.BoolVar(&rename.Diff, "d", false, "display diffs instead of rewriting files")
-	flag.StringVar(&rename.DiffCmd, "diffcmd", "diff", "diff command invoked when using -d")
-}
-
-func main() {
-	log.SetPrefix("gorename: ")
-	log.SetFlags(0)
-	flag.Parse()
-	if len(flag.Args()) > 0 {
-		log.Fatal("surplus arguments")
-	}
-
-	if *helpFlag || (*offsetFlag == "" && *fromFlag == "" && *toFlag == "") {
-		fmt.Println(rename.Usage)
-		return
-	}
-
-	if err := rename.Main(&build.Default, *offsetFlag, *fromFlag, *toFlag); err != nil {
-		if err != rename.ConflictError {
-			log.Fatal(err)
-		}
-		os.Exit(1)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gotype/gotype.go b/installer/vendor/golang.org/x/tools/cmd/gotype/gotype.go
deleted file mode 100644
index ed88e63546..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gotype/gotype.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// gotype.go is a copy of the original source maintained
-// in $GOROOT/src/go/types/gotype.go, but with the call
-// to types.SizesFor factored out so we can provide a local
-// implementation when compiling against Go 1.8 and earlier.
-//
-// This code is here for the sole purpose of satisfying historic
-// references to this location, and for making gotype accessible
-// via 'go get'.
-//
-// Do NOT make changes to this version as they will not be maintained
-// (and possibly overwritten). Any changes should be made to the original
-// and then ported to here.
-
-/*
-The gotype command, like the front-end of a Go compiler, parses and
-type-checks a single Go package. Errors are reported if the analysis
-fails; otherwise gotype is quiet (unless -v is set).
-
-Without a list of paths, gotype reads from standard input, which
-must provide a single Go source file defining a complete package.
-
-With a single directory argument, gotype checks the Go files in
-that directory, comprising a single package. Use -t to include the
-(in-package) _test.go files. Use -x to type check only external
-test files.
-
-Otherwise, each path must be the filename of a Go file belonging
-to the same package.
-
-Imports are processed by importing directly from the source of
-imported packages (default), or by importing from compiled and
-installed packages (by setting -c to the respective compiler).
-
-The -c flag must be set to a compiler ("gc", "gccgo") when type-
-checking packages containing imports with relative import paths
-(import "./mypkg") because the source importer cannot know which
-files to include for such packages.
-
-Usage:
-	gotype [flags] [path...]
-
-The flags are:
-	-t
-		include local test files in a directory (ignored if -x is provided)
-	-x
-		consider only external test files in a directory
-	-e
-		report all errors (not just the first 10)
-	-v
-		verbose mode
-	-c
-		compiler used for installed packages (gc, gccgo, or source); default: source
-
-Flags controlling additional output:
-	-ast
-		print AST (forces -seq)
-	-trace
-		print parse trace (forces -seq)
-	-comments
-		parse comments (ignored unless -ast or -trace is provided)
-
-Examples:
-
-To check the files a.go, b.go, and c.go:
-
-	gotype a.go b.go c.go
-
-To check an entire package including (in-package) tests in the directory dir and print the processed files:
-
-	gotype -t -v dir
-
-To check the external test package (if any) in the current directory, based on installed packages compiled with
-cmd/compile:
-
-	gotype -c=gc -x .
-
-To verify the output of a pipe:
-
-	echo "package foo" | gotype
-
-*/
-package main
-
-import (
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/importer"
-	"go/parser"
-	"go/scanner"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"sync"
-	"time"
-)
-
-var (
-	// main operation modes
-	testFiles  = flag.Bool("t", false, "include in-package test files in a directory")
-	xtestFiles = flag.Bool("x", false, "consider only external test files in a directory")
-	allErrors  = flag.Bool("e", false, "report all errors, not just the first 10")
-	verbose    = flag.Bool("v", false, "verbose mode")
-	compiler   = flag.String("c", defaultCompiler, "compiler used for installed packages (gc, gccgo, or source)")
-
-	// additional output control
-	printAST      = flag.Bool("ast", false, "print AST (forces -seq)")
-	printTrace    = flag.Bool("trace", false, "print parse trace (forces -seq)")
-	parseComments = flag.Bool("comments", false, "parse comments (ignored unless -ast or -trace is provided)")
-)
-
-var (
-	fset       = token.NewFileSet()
-	errorCount = 0
-	sequential = false
-	parserMode parser.Mode
-)
-
-func initParserMode() {
-	if *allErrors {
-		parserMode |= parser.AllErrors
-	}
-	if *printAST {
-		sequential = true
-	}
-	if *printTrace {
-		parserMode |= parser.Trace
-		sequential = true
-	}
-	if *parseComments && (*printAST || *printTrace) {
-		parserMode |= parser.ParseComments
-	}
-}
-
-const usageString = `usage: gotype [flags] [path ...]
-
-The gotype command, like the front-end of a Go compiler, parses and
-type-checks a single Go package. Errors are reported if the analysis
-fails; otherwise gotype is quiet (unless -v is set).
-
-Without a list of paths, gotype reads from standard input, which
-must provide a single Go source file defining a complete package.
-
-With a single directory argument, gotype checks the Go files in
-that directory, comprising a single package. Use -t to include the
-(in-package) _test.go files. Use -x to type check only external
-test files.
-
-Otherwise, each path must be the filename of a Go file belonging
-to the same package.
-
-Imports are processed by importing directly from the source of
-imported packages (default), or by importing from compiled and
-installed packages (by setting -c to the respective compiler).
-
-The -c flag must be set to a compiler ("gc", "gccgo") when type-
-checking packages containing imports with relative import paths
-(import "./mypkg") because the source importer cannot know which
-files to include for such packages.
-`
-
-func usage() {
-	fmt.Fprintln(os.Stderr, usageString)
-	flag.PrintDefaults()
-	os.Exit(2)
-}
-
-func report(err error) {
-	scanner.PrintError(os.Stderr, err)
-	if list, ok := err.(scanner.ErrorList); ok {
-		errorCount += len(list)
-		return
-	}
-	errorCount++
-}
-
-// parse may be called concurrently
-func parse(filename string, src interface{}) (*ast.File, error) {
-	if *verbose {
-		fmt.Println(filename)
-	}
-	file, err := parser.ParseFile(fset, filename, src, parserMode) // ok to access fset concurrently
-	if *printAST {
-		ast.Print(fset, file)
-	}
-	return file, err
-}
-
-func parseStdin() (*ast.File, error) {
-	src, err := ioutil.ReadAll(os.Stdin)
-	if err != nil {
-		return nil, err
-	}
-	return parse("<standard input>", src)
-}
-
-func parseFiles(dir string, filenames []string) ([]*ast.File, error) {
-	files := make([]*ast.File, len(filenames))
-	errors := make([]error, len(filenames))
-
-	var wg sync.WaitGroup
-	for i, filename := range filenames {
-		wg.Add(1)
-		go func(i int, filepath string) {
-			defer wg.Done()
-			files[i], errors[i] = parse(filepath, nil)
-		}(i, filepath.Join(dir, filename))
-		if sequential {
-			wg.Wait()
-		}
-	}
-	wg.Wait()
-
-	// if there are errors, return the first one for deterministic results
-	for _, err := range errors {
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return files, nil
-}
-
-func parseDir(dir string) ([]*ast.File, error) {
-	ctxt := build.Default
-	pkginfo, err := ctxt.ImportDir(dir, 0)
-	if _, nogo := err.(*build.NoGoError); err != nil && !nogo {
-		return nil, err
-	}
-
-	if *xtestFiles {
-		return parseFiles(dir, pkginfo.XTestGoFiles)
-	}
-
-	filenames := append(pkginfo.GoFiles, pkginfo.CgoFiles...)
-	if *testFiles {
-		filenames = append(filenames, pkginfo.TestGoFiles...)
-	}
-	return parseFiles(dir, filenames)
-}
-
-func getPkgFiles(args []string) ([]*ast.File, error) {
-	if len(args) == 0 {
-		// stdin
-		file, err := parseStdin()
-		if err != nil {
-			return nil, err
-		}
-		return []*ast.File{file}, nil
-	}
-
-	if len(args) == 1 {
-		// possibly a directory
-		path := args[0]
-		info, err := os.Stat(path)
-		if err != nil {
-			return nil, err
-		}
-		if info.IsDir() {
-			return parseDir(path)
-		}
-	}
-
-	// list of files
-	return parseFiles("", args)
-}
-
-func checkPkgFiles(files []*ast.File) {
-	type bailout struct{}
-
-	// if checkPkgFiles is called multiple times, set up conf only once
-	conf := types.Config{
-		FakeImportC: true,
-		Error: func(err error) {
-			if !*allErrors && errorCount >= 10 {
-				panic(bailout{})
-			}
-			report(err)
-		},
-		Importer: importer.For(*compiler, nil),
-		Sizes:    SizesFor(build.Default.Compiler, build.Default.GOARCH),
-	}
-
-	defer func() {
-		switch p := recover().(type) {
-		case nil, bailout:
-			// normal return or early exit
-		default:
-			// re-panic
-			panic(p)
-		}
-	}()
-
-	const path = "pkg" // any non-empty string will do for now
-	conf.Check(path, fset, files, nil)
-}
-
-func printStats(d time.Duration) {
-	fileCount := 0
-	lineCount := 0
-	fset.Iterate(func(f *token.File) bool {
-		fileCount++
-		lineCount += f.LineCount()
-		return true
-	})
-
-	fmt.Printf(
-		"%s (%d files, %d lines, %d lines/s)\n",
-		d, fileCount, lineCount, int64(float64(lineCount)/d.Seconds()),
-	)
-}
-
-func main() {
-	flag.Usage = usage
-	flag.Parse()
-	initParserMode()
-
-	start := time.Now()
-
-	files, err := getPkgFiles(flag.Args())
-	if err != nil {
-		report(err)
-		os.Exit(2)
-	}
-
-	checkPkgFiles(files)
-	if errorCount > 0 {
-		os.Exit(2)
-	}
-
-	if *verbose {
-		printStats(time.Since(start))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor18.go b/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor18.go
deleted file mode 100644
index 94e817679f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor18.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-// This file contains a copy of the implementation of types.SizesFor
-// since this function is not available in go/types before Go 1.9.
-
-package main
-
-import "go/types"
-
-const defaultCompiler = "gc"
-
-var gcArchSizes = map[string]*types.StdSizes{
-	"386":      {4, 4},
-	"arm":      {4, 4},
-	"arm64":    {8, 8},
-	"amd64":    {8, 8},
-	"amd64p32": {4, 8},
-	"mips":     {4, 4},
-	"mipsle":   {4, 4},
-	"mips64":   {8, 8},
-	"mips64le": {8, 8},
-	"ppc64":    {8, 8},
-	"ppc64le":  {8, 8},
-	"s390x":    {8, 8},
-}
-
-func SizesFor(compiler, arch string) types.Sizes {
-	if compiler != "gc" {
-		return nil
-	}
-	s, ok := gcArchSizes[arch]
-	if !ok {
-		return nil
-	}
-	return s
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor19.go b/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor19.go
deleted file mode 100644
index 9e0b481c8f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/gotype/sizesFor19.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main
-
-import "go/types"
-
-const defaultCompiler = "source"
-
-func SizesFor(compiler, arch string) types.Sizes {
-	return types.SizesFor(compiler, arch)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/goyacc/doc.go b/installer/vendor/golang.org/x/tools/cmd/goyacc/doc.go
deleted file mode 100644
index 03ffee7b63..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goyacc/doc.go
+++ /dev/null
@@ -1,70 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Goyacc is a version of yacc for Go.
-It is written in Go and generates parsers written in Go.
-
-Usage:
-
-	goyacc args...
-
-It is largely transliterated from the Inferno version written in Limbo
-which in turn was largely transliterated from the Plan 9 version
-written in C and documented at
-
-	https://9p.io/magic/man2html/1/yacc
-
-Adepts of the original yacc will have no trouble adapting to this
-form of the tool.
-
-The directory $GOPATH/src/golang.org/x/tools/cmd/goyacc/testdata/expr
-is a yacc program for a very simple expression parser. See expr.y and
-main.go in that directory for examples of how to write and build
-goyacc programs.
-
-The generated parser is reentrant. The parsing function yyParse expects
-to be given an argument that conforms to the following interface:
-
-	type yyLexer interface {
-		Lex(lval *yySymType) int
-		Error(e string)
-	}
-
-Lex should return the token identifier, and place other token
-information in lval (which replaces the usual yylval).
-Error is equivalent to yyerror in the original yacc.
-
-Code inside the grammar actions may refer to the variable yylex,
-which holds the yyLexer passed to yyParse.
-
-Clients that need to understand more about the parser state can
-create the parser separately from invoking it. The function yyNewParser
-returns a yyParser conforming to the following interface:
-
-	type yyParser interface {
-		Parse(yyLex) int
-		Lookahead() int
-	}
-
-Parse runs the parser; the top-level call yyParse(yylex) is equivalent
-to yyNewParser().Parse(yylex).
-
-Lookahead can be called during grammar actions to read (but not consume)
-the value of the current lookahead token, as returned by yylex.Lex.
-If there is no current lookahead token (because the parser has not called Lex
-or has consumed the token returned by the most recent call to Lex),
-Lookahead returns -1. Calling Lookahead is equivalent to reading
-yychar from within in a grammar action.
-
-Multiple grammars compiled into a single program should be placed in
-distinct packages.  If that is impossible, the "-p prefix" flag to
-goyacc sets the prefix, by default yy, that begins the names of
-symbols, including types, the parser, and the lexer, generated and
-referenced by yacc's generated code.  Setting it to distinct values
-allows multiple grammars to be placed in a single package.
-
-*/
-package main
diff --git a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/README b/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/README
deleted file mode 100644
index 302ef57a7d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/README
+++ /dev/null
@@ -1,20 +0,0 @@
-This directory contains a simple program demonstrating how to use
-the Go version of yacc.
-
-To build it:
-
-	$ go generate
-	$ go build
-
-or
-
-	$ go generate
-	$ go run expr.go
-
-The file main.go contains the "go generate" command to run yacc to
-create expr.go from expr.y. It also has the package doc comment,
-as godoc will not scan the .y file.
-
-The actual implementation is in expr.y.
-
-The program is not installed in the binary distributions of Go.
diff --git a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/expr.y b/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/expr.y
deleted file mode 100644
index ba4a1b2316..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/expr.y
+++ /dev/null
@@ -1,202 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This is an example of a goyacc program.
-// To build it:
-// goyacc -p "expr" expr.y (produces y.go)
-// go build -o expr y.go
-// expr
-// > <type an expression>
-
-%{
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"math/big"
-	"os"
-	"unicode/utf8"
-)
-
-%}
-
-%union {
-	num *big.Rat
-}
-
-%type	<num>	expr expr1 expr2 expr3
-
-%token '+' '-' '*' '/' '(' ')'
-
-%token	<num>	NUM
-
-%%
-
-top:
-	expr
-	{
-		if $1.IsInt() {
-			fmt.Println($1.Num().String())
-		} else {
-			fmt.Println($1.String())
-		}
-	}
-
-expr:
-	expr1
-|	'+' expr
-	{
-		$$ = $2
-	}
-|	'-' expr
-	{
-		$$ = $2.Neg($2)
-	}
-
-expr1:
-	expr2
-|	expr1 '+' expr2
-	{
-		$$ = $1.Add($1, $3)
-	}
-|	expr1 '-' expr2
-	{
-		$$ = $1.Sub($1, $3)
-	}
-
-expr2:
-	expr3
-|	expr2 '*' expr3
-	{
-		$$ = $1.Mul($1, $3)
-	}
-|	expr2 '/' expr3
-	{
-		$$ = $1.Quo($1, $3)
-	}
-
-expr3:
-	NUM
-|	'(' expr ')'
-	{
-		$$ = $2
-	}
-
-
-%%
-
-// The parser expects the lexer to return 0 on EOF.  Give it a name
-// for clarity.
-const eof = 0
-
-// The parser uses the type <prefix>Lex as a lexer. It must provide
-// the methods Lex(*<prefix>SymType) int and Error(string).
-type exprLex struct {
-	line []byte
-	peek rune
-}
-
-// The parser calls this method to get each new token. This
-// implementation returns operators and NUM.
-func (x *exprLex) Lex(yylval *exprSymType) int {
-	for {
-		c := x.next()
-		switch c {
-		case eof:
-			return eof
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			return x.num(c, yylval)
-		case '+', '-', '*', '/', '(', ')':
-			return int(c)
-
-		// Recognize Unicode multiplication and division
-		// symbols, returning what the parser expects.
-		case '×':
-			return '*'
-		case '÷':
-			return '/'
-
-		case ' ', '\t', '\n', '\r':
-		default:
-			log.Printf("unrecognized character %q", c)
-		}
-	}
-}
-
-// Lex a number.
-func (x *exprLex) num(c rune, yylval *exprSymType) int {
-	add := func(b *bytes.Buffer, c rune) {
-		if _, err := b.WriteRune(c); err != nil {
-			log.Fatalf("WriteRune: %s", err)
-		}
-	}
-	var b bytes.Buffer
-	add(&b, c)
-	L: for {
-		c = x.next()
-		switch c {
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9', '.', 'e', 'E':
-			add(&b, c)
-		default:
-			break L
-		}
-	}
-	if c != eof {
-		x.peek = c
-	}
-	yylval.num = &big.Rat{}
-	_, ok := yylval.num.SetString(b.String())
-	if !ok {
-		log.Printf("bad number %q", b.String())
-		return eof
-	}
-	return NUM
-}
-
-// Return the next rune for the lexer.
-func (x *exprLex) next() rune {
-	if x.peek != eof {
-		r := x.peek
-		x.peek = eof
-		return r
-	}
-	if len(x.line) == 0 {
-		return eof
-	}
-	c, size := utf8.DecodeRune(x.line)
-	x.line = x.line[size:]
-	if c == utf8.RuneError && size == 1 {
-		log.Print("invalid utf8")
-		return x.next()
-	}
-	return c
-}
-
-// The parser calls this method on a parse error.
-func (x *exprLex) Error(s string) {
-	log.Printf("parse error: %s", s)
-}
-
-func main() {
-	in := bufio.NewReader(os.Stdin)
-	for {
-		if _, err := os.Stdout.WriteString("> "); err != nil {
-			log.Fatalf("WriteString: %s", err)
-		}
-		line, err := in.ReadBytes('\n')
-		if err == io.EOF {
-			return
-		}
-		if err != nil {
-			log.Fatalf("ReadBytes: %s", err)
-		}
-
-		exprParse(&exprLex{line: line})
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/main.go b/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/main.go
deleted file mode 100644
index 22e3543422..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goyacc/testdata/expr/main.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file holds the go generate command to run yacc on the grammar in expr.y.
-// To build expr:
-//	% go generate
-//	% go build
-
-//go:generate goyacc -o expr.go -p "expr" expr.y
-
-// Expr is a simple expression evaluator that serves as a working example of
-// how to use Go's yacc implementation.
-package main
diff --git a/installer/vendor/golang.org/x/tools/cmd/goyacc/yacc.go b/installer/vendor/golang.org/x/tools/cmd/goyacc/yacc.go
deleted file mode 100644
index 062bc47e26..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/goyacc/yacc.go
+++ /dev/null
@@ -1,3591 +0,0 @@
-/*
-Derived from Inferno's utils/iyacc/yacc.c
-http://code.google.com/p/inferno-os/source/browse/utils/iyacc/yacc.c
-
-This copyright NOTICE applies to all files in this directory and
-subdirectories, unless another copyright notice appears in a given
-file or subdirectory.  If you take substantial code from this software to use in
-other programs, you must somehow include with it an appropriate
-copyright notice that includes the copyright notice and the other
-notices below.  It is fine (and often tidier) to do that in a separate
-file such as NOTICE, LICENCE or COPYING.
-
-	Copyright © 1994-1999 Lucent Technologies Inc.  All rights reserved.
-	Portions Copyright © 1995-1997 C H Forsyth (forsyth@terzarima.net)
-	Portions Copyright © 1997-1999 Vita Nuova Limited
-	Portions Copyright © 2000-2007 Vita Nuova Holdings Limited (www.vitanuova.com)
-	Portions Copyright © 2004,2006 Bruce Ellis
-	Portions Copyright © 2005-2007 C H Forsyth (forsyth@terzarima.net)
-	Revisions Copyright © 2000-2007 Lucent Technologies Inc. and others
-	Portions Copyright © 2009 The Go Authors. All rights reserved.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-package main
-
-// yacc
-// major difference is lack of stem ("y" variable)
-//
-
-import (
-	"bufio"
-	"bytes"
-	"flag"
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"os"
-	"strconv"
-	"strings"
-	"unicode"
-)
-
-// the following are adjustable
-// according to memory size
-const (
-	ACTSIZE  = 120000
-	NSTATES  = 8000
-	TEMPSIZE = 8000
-
-	SYMINC   = 50  // increase for non-term or term
-	RULEINC  = 50  // increase for max rule length prodptr[i]
-	PRODINC  = 100 // increase for productions     prodptr
-	WSETINC  = 50  // increase for working sets    wsets
-	STATEINC = 200 // increase for states          statemem
-
-	PRIVATE = 0xE000 // unicode private use
-
-	// relationships which must hold:
-	//	TEMPSIZE >= NTERMS + NNONTERM + 1;
-	//	TEMPSIZE >= NSTATES;
-	//
-
-	NTBASE     = 010000
-	ERRCODE    = 8190
-	ACCEPTCODE = 8191
-	YYLEXUNK   = 3
-	TOKSTART   = 4 //index of first defined token
-)
-
-// no, left, right, binary assoc.
-const (
-	NOASC = iota
-	LASC
-	RASC
-	BASC
-)
-
-// flags for state generation
-const (
-	DONE = iota
-	MUSTDO
-	MUSTLOOKAHEAD
-)
-
-// flags for a rule having an action, and being reduced
-const (
-	ACTFLAG = 1 << (iota + 2)
-	REDFLAG
-)
-
-// output parser flags
-const yyFlag = -1000
-
-// parse tokens
-const (
-	IDENTIFIER = PRIVATE + iota
-	MARK
-	TERM
-	LEFT
-	RIGHT
-	BINARY
-	PREC
-	LCURLY
-	IDENTCOLON
-	NUMBER
-	START
-	TYPEDEF
-	TYPENAME
-	UNION
-	ERROR
-)
-
-const ENDFILE = 0
-const EMPTY = 1
-const WHOKNOWS = 0
-const OK = 1
-const NOMORE = -1000
-
-// macros for getting associativity and precedence levels
-func ASSOC(i int) int { return i & 3 }
-
-func PLEVEL(i int) int { return (i >> 4) & 077 }
-
-func TYPE(i int) int { return (i >> 10) & 077 }
-
-// macros for setting associativity and precedence levels
-func SETASC(i, j int) int { return i | j }
-
-func SETPLEV(i, j int) int { return i | (j << 4) }
-
-func SETTYPE(i, j int) int { return i | (j << 10) }
-
-// I/O descriptors
-var finput *bufio.Reader // input file
-var stderr *bufio.Writer
-var ftable *bufio.Writer    // y.go file
-var fcode = &bytes.Buffer{} // saved code
-var foutput *bufio.Writer   // y.output file
-
-var fmtImported bool // output file has recorded an import of "fmt"
-
-var oflag string  // -o [y.go]		- y.go file
-var vflag string  // -v [y.output]	- y.output file
-var lflag bool    // -l			- disable line directives
-var prefix string // name prefix for identifiers, default yy
-
-func init() {
-	flag.StringVar(&oflag, "o", "y.go", "parser output")
-	flag.StringVar(&prefix, "p", "yy", "name prefix to use in generated code")
-	flag.StringVar(&vflag, "v", "y.output", "create parsing tables")
-	flag.BoolVar(&lflag, "l", false, "disable line directives")
-}
-
-var initialstacksize = 16
-
-// communication variables between various I/O routines
-var infile string  // input file name
-var numbval int    // value of an input number
-var tokname string // input token name, slop for runes and 0
-var tokflag = false
-
-// structure declarations
-type Lkset []int
-
-type Pitem struct {
-	prod   []int
-	off    int // offset within the production
-	first  int // first term or non-term in item
-	prodno int // production number for sorting
-}
-
-type Item struct {
-	pitem Pitem
-	look  Lkset
-}
-
-type Symb struct {
-	name    string
-	noconst bool
-	value   int
-}
-
-type Wset struct {
-	pitem Pitem
-	flag  int
-	ws    Lkset
-}
-
-// storage of types
-var ntypes int                     // number of types defined
-var typeset = make(map[int]string) // pointers to type tags
-
-// token information
-
-var ntokens = 0 // number of tokens
-var tokset []Symb
-var toklev []int // vector with the precedence of the terminals
-
-// nonterminal information
-
-var nnonter = -1 // the number of nonterminals
-var nontrst []Symb
-var start int // start symbol
-
-// state information
-
-var nstate = 0                      // number of states
-var pstate = make([]int, NSTATES+2) // index into statemem to the descriptions of the states
-var statemem []Item
-var tystate = make([]int, NSTATES) // contains type information about the states
-var tstates []int                  // states generated by terminal gotos
-var ntstates []int                 // states generated by nonterminal gotos
-var mstates = make([]int, NSTATES) // chain of overflows of term/nonterm generation lists
-var lastred int                    // number of last reduction of a state
-var defact = make([]int, NSTATES)  // default actions of states
-
-// lookahead set information
-
-var nolook = 0  // flag to turn off lookahead computations
-var tbitset = 0 // size of lookahead sets
-var clset Lkset // temporary storage for lookahead computations
-
-// working set information
-
-var wsets []Wset
-var cwp int
-
-// storage for action table
-
-var amem []int                   // action table storage
-var memp int                     // next free action table position
-var indgo = make([]int, NSTATES) // index to the stored goto table
-
-// temporary vector, indexable by states, terms, or ntokens
-
-var temp1 = make([]int, TEMPSIZE) // temporary storage, indexed by terms + ntokens or states
-var lineno = 1                    // current input line number
-var fatfl = 1                     // if on, error is fatal
-var nerrors = 0                   // number of errors
-
-// assigned token type values
-
-var extval = 0
-
-// grammar rule information
-
-var nprod = 1      // number of productions
-var prdptr [][]int // pointers to descriptions of productions
-var levprd []int   // precedence levels for the productions
-var rlines []int   // line number for this rule
-
-// statistics collection variables
-
-var zzgoent = 0
-var zzgobest = 0
-var zzacent = 0
-var zzexcp = 0
-var zzclose = 0
-var zzrrconf = 0
-var zzsrconf = 0
-var zzstate = 0
-
-// optimizer arrays
-
-var yypgo [][]int
-var optst [][]int
-var ggreed []int
-var pgo []int
-
-var maxspr int // maximum spread of any entry
-var maxoff int // maximum offset into a array
-var maxa int
-
-// storage for information about the nonterminals
-
-var pres [][][]int // vector of pointers to productions yielding each nonterminal
-var pfirst []Lkset
-var pempty []int // vector of nonterminals nontrivially deriving e
-
-// random stuff picked out from between functions
-
-var indebug = 0 // debugging flag for cpfir
-var pidebug = 0 // debugging flag for putitem
-var gsdebug = 0 // debugging flag for stagen
-var cldebug = 0 // debugging flag for closure
-var pkdebug = 0 // debugging flag for apack
-var g2debug = 0 // debugging for go2gen
-var adb = 0     // debugging for callopt
-
-type Resrv struct {
-	name  string
-	value int
-}
-
-var resrv = []Resrv{
-	{"binary", BINARY},
-	{"left", LEFT},
-	{"nonassoc", BINARY},
-	{"prec", PREC},
-	{"right", RIGHT},
-	{"start", START},
-	{"term", TERM},
-	{"token", TERM},
-	{"type", TYPEDEF},
-	{"union", UNION},
-	{"struct", UNION},
-	{"error", ERROR},
-}
-
-type Error struct {
-	lineno int
-	tokens []string
-	msg    string
-}
-
-var errors []Error
-
-type Row struct {
-	actions       []int
-	defaultAction int
-}
-
-var stateTable []Row
-
-var zznewstate = 0
-
-const EOF = -1
-
-func main() {
-
-	setup() // initialize and read productions
-
-	tbitset = (ntokens + 32) / 32
-	cpres()  // make table of which productions yield a given nonterminal
-	cempty() // make a table of which nonterminals can match the empty string
-	cpfir()  // make a table of firsts of nonterminals
-
-	stagen() // generate the states
-
-	yypgo = make([][]int, nnonter+1)
-	optst = make([][]int, nstate)
-	output() // write the states and the tables
-	go2out()
-
-	hideprod()
-	summary()
-
-	callopt()
-
-	others()
-
-	exit(0)
-}
-
-func setup() {
-	var j, ty int
-
-	stderr = bufio.NewWriter(os.Stderr)
-	foutput = nil
-
-	flag.Parse()
-	if flag.NArg() != 1 {
-		usage()
-	}
-	if initialstacksize < 1 {
-		// never set so cannot happen
-		fmt.Fprintf(stderr, "yacc: stack size too small\n")
-		usage()
-	}
-	yaccpar = strings.Replace(yaccpartext, "$$", prefix, -1)
-	openup()
-
-	defin(0, "$end")
-	extval = PRIVATE // tokens start in unicode 'private use'
-	defin(0, "error")
-	defin(1, "$accept")
-	defin(0, "$unk")
-	i := 0
-
-	t := gettok()
-
-outer:
-	for {
-		switch t {
-		default:
-			errorf("syntax error tok=%v", t-PRIVATE)
-
-		case MARK, ENDFILE:
-			break outer
-
-		case ';':
-			// Do nothing.
-
-		case START:
-			t = gettok()
-			if t != IDENTIFIER {
-				errorf("bad %%start construction")
-			}
-			start = chfind(1, tokname)
-
-		case ERROR:
-			lno := lineno
-			var tokens []string
-			for {
-				t := gettok()
-				if t == ':' {
-					break
-				}
-				if t != IDENTIFIER && t != IDENTCOLON {
-					errorf("bad syntax in %%error")
-				}
-				tokens = append(tokens, tokname)
-				if t == IDENTCOLON {
-					break
-				}
-			}
-			if gettok() != IDENTIFIER {
-				errorf("bad syntax in %%error")
-			}
-			errors = append(errors, Error{lno, tokens, tokname})
-
-		case TYPEDEF:
-			t = gettok()
-			if t != TYPENAME {
-				errorf("bad syntax in %%type")
-			}
-			ty = numbval
-			for {
-				t = gettok()
-				switch t {
-				case IDENTIFIER:
-					t = chfind(1, tokname)
-					if t < NTBASE {
-						j = TYPE(toklev[t])
-						if j != 0 && j != ty {
-							errorf("type redeclaration of token %s",
-								tokset[t].name)
-						} else {
-							toklev[t] = SETTYPE(toklev[t], ty)
-						}
-					} else {
-						j = nontrst[t-NTBASE].value
-						if j != 0 && j != ty {
-							errorf("type redeclaration of nonterminal %v",
-								nontrst[t-NTBASE].name)
-						} else {
-							nontrst[t-NTBASE].value = ty
-						}
-					}
-					continue
-
-				case ',':
-					continue
-				}
-				break
-			}
-			continue
-
-		case UNION:
-			cpyunion()
-
-		case LEFT, BINARY, RIGHT, TERM:
-			// nonzero means new prec. and assoc.
-			lev := t - TERM
-			if lev != 0 {
-				i++
-			}
-			ty = 0
-
-			// get identifiers so defined
-			t = gettok()
-
-			// there is a type defined
-			if t == TYPENAME {
-				ty = numbval
-				t = gettok()
-			}
-			for {
-				switch t {
-				case ',':
-					t = gettok()
-					continue
-
-				case ';':
-					// Do nothing.
-
-				case IDENTIFIER:
-					j = chfind(0, tokname)
-					if j >= NTBASE {
-						errorf("%v defined earlier as nonterminal", tokname)
-					}
-					if lev != 0 {
-						if ASSOC(toklev[j]) != 0 {
-							errorf("redeclaration of precedence of %v", tokname)
-						}
-						toklev[j] = SETASC(toklev[j], lev)
-						toklev[j] = SETPLEV(toklev[j], i)
-					}
-					if ty != 0 {
-						if TYPE(toklev[j]) != 0 {
-							errorf("redeclaration of type of %v", tokname)
-						}
-						toklev[j] = SETTYPE(toklev[j], ty)
-					}
-					t = gettok()
-					if t == NUMBER {
-						tokset[j].value = numbval
-						t = gettok()
-					}
-
-					continue
-				}
-				break
-			}
-			continue
-
-		case LCURLY:
-			cpycode()
-		}
-		t = gettok()
-	}
-
-	if t == ENDFILE {
-		errorf("unexpected EOF before %%")
-	}
-
-	fmt.Fprintf(fcode, "switch %snt {\n", prefix)
-
-	moreprod()
-	prdptr[0] = []int{NTBASE, start, 1, 0}
-
-	nprod = 1
-	curprod := make([]int, RULEINC)
-	t = gettok()
-	if t != IDENTCOLON {
-		errorf("bad syntax on first rule")
-	}
-
-	if start == 0 {
-		prdptr[0][1] = chfind(1, tokname)
-	}
-
-	// read rules
-	// put into prdptr array in the format
-	// target
-	// followed by id's of terminals and non-terminals
-	// followed by -nprod
-
-	for t != MARK && t != ENDFILE {
-		mem := 0
-
-		// process a rule
-		rlines[nprod] = lineno
-		ruleline := lineno
-		if t == '|' {
-			curprod[mem] = prdptr[nprod-1][0]
-			mem++
-		} else if t == IDENTCOLON {
-			curprod[mem] = chfind(1, tokname)
-			if curprod[mem] < NTBASE {
-				lerrorf(ruleline, "token illegal on LHS of grammar rule")
-			}
-			mem++
-		} else {
-			lerrorf(ruleline, "illegal rule: missing semicolon or | ?")
-		}
-
-		// read rule body
-		t = gettok()
-		for {
-			for t == IDENTIFIER {
-				curprod[mem] = chfind(1, tokname)
-				if curprod[mem] < NTBASE {
-					levprd[nprod] = toklev[curprod[mem]]
-				}
-				mem++
-				if mem >= len(curprod) {
-					ncurprod := make([]int, mem+RULEINC)
-					copy(ncurprod, curprod)
-					curprod = ncurprod
-				}
-				t = gettok()
-			}
-			if t == PREC {
-				if gettok() != IDENTIFIER {
-					lerrorf(ruleline, "illegal %%prec syntax")
-				}
-				j = chfind(2, tokname)
-				if j >= NTBASE {
-					lerrorf(ruleline, "nonterminal "+nontrst[j-NTBASE].name+" illegal after %%prec")
-				}
-				levprd[nprod] = toklev[j]
-				t = gettok()
-			}
-			if t != '=' {
-				break
-			}
-			levprd[nprod] |= ACTFLAG
-			fmt.Fprintf(fcode, "\n\tcase %v:", nprod)
-			fmt.Fprintf(fcode, "\n\t\t%sDollar = %sS[%spt-%v:%spt+1]", prefix, prefix, prefix, mem-1, prefix)
-			cpyact(curprod, mem)
-
-			// action within rule...
-			t = gettok()
-			if t == IDENTIFIER {
-				// make it a nonterminal
-				j = chfind(1, fmt.Sprintf("$$%v", nprod))
-
-				//
-				// the current rule will become rule number nprod+1
-				// enter null production for action
-				//
-				prdptr[nprod] = make([]int, 2)
-				prdptr[nprod][0] = j
-				prdptr[nprod][1] = -nprod
-
-				// update the production information
-				nprod++
-				moreprod()
-				levprd[nprod] = levprd[nprod-1] & ^ACTFLAG
-				levprd[nprod-1] = ACTFLAG
-				rlines[nprod] = lineno
-
-				// make the action appear in the original rule
-				curprod[mem] = j
-				mem++
-				if mem >= len(curprod) {
-					ncurprod := make([]int, mem+RULEINC)
-					copy(ncurprod, curprod)
-					curprod = ncurprod
-				}
-			}
-		}
-
-		for t == ';' {
-			t = gettok()
-		}
-		curprod[mem] = -nprod
-		mem++
-
-		// check that default action is reasonable
-		if ntypes != 0 && (levprd[nprod]&ACTFLAG) == 0 &&
-			nontrst[curprod[0]-NTBASE].value != 0 {
-			// no explicit action, LHS has value
-			tempty := curprod[1]
-			if tempty < 0 {
-				lerrorf(ruleline, "must return a value, since LHS has a type")
-			}
-			if tempty >= NTBASE {
-				tempty = nontrst[tempty-NTBASE].value
-			} else {
-				tempty = TYPE(toklev[tempty])
-			}
-			if tempty != nontrst[curprod[0]-NTBASE].value {
-				lerrorf(ruleline, "default action causes potential type clash")
-			}
-		}
-		moreprod()
-		prdptr[nprod] = make([]int, mem)
-		copy(prdptr[nprod], curprod)
-		nprod++
-		moreprod()
-		levprd[nprod] = 0
-	}
-
-	if TEMPSIZE < ntokens+nnonter+1 {
-		errorf("too many tokens (%d) or non-terminals (%d)", ntokens, nnonter)
-	}
-
-	//
-	// end of all rules
-	// dump out the prefix code
-	//
-
-	fmt.Fprintf(fcode, "\n\t}")
-
-	// put out non-literal terminals
-	for i := TOKSTART; i <= ntokens; i++ {
-		// non-literals
-		if !tokset[i].noconst {
-			fmt.Fprintf(ftable, "const %v = %v\n", tokset[i].name, tokset[i].value)
-		}
-	}
-
-	// put out names of tokens
-	ftable.WriteRune('\n')
-	fmt.Fprintf(ftable, "var %sToknames = [...]string{\n", prefix)
-	for i := 1; i <= ntokens; i++ {
-		fmt.Fprintf(ftable, "\t%q,\n", tokset[i].name)
-	}
-	fmt.Fprintf(ftable, "}\n")
-
-	// put out names of states.
-	// commented out to avoid a huge table just for debugging.
-	// re-enable to have the names in the binary.
-	fmt.Fprintf(ftable, "var %sStatenames = [...]string{", prefix)
-	//	for i:=TOKSTART; i<=ntokens; i++ {
-	//		fmt.Fprintf(ftable, "\t%q,\n", tokset[i].name);
-	//	}
-	fmt.Fprintf(ftable, "}\n")
-
-	ftable.WriteRune('\n')
-	fmt.Fprintf(ftable, "const %sEofCode = 1\n", prefix)
-	fmt.Fprintf(ftable, "const %sErrCode = 2\n", prefix)
-	fmt.Fprintf(ftable, "const %sInitialStackSize = %v\n", prefix, initialstacksize)
-
-	//
-	// copy any postfix code
-	//
-	if t == MARK {
-		if !lflag {
-			fmt.Fprintf(ftable, "\n//line %v:%v\n", infile, lineno)
-		}
-		for {
-			c := getrune(finput)
-			if c == EOF {
-				break
-			}
-			ftable.WriteRune(c)
-		}
-	}
-}
-
-//
-// allocate enough room to hold another production
-//
-func moreprod() {
-	n := len(prdptr)
-	if nprod >= n {
-		nn := n + PRODINC
-		aprod := make([][]int, nn)
-		alevprd := make([]int, nn)
-		arlines := make([]int, nn)
-
-		copy(aprod, prdptr)
-		copy(alevprd, levprd)
-		copy(arlines, rlines)
-
-		prdptr = aprod
-		levprd = alevprd
-		rlines = arlines
-	}
-}
-
-//
-// define s to be a terminal if nt==0
-// or a nonterminal if nt==1
-//
-func defin(nt int, s string) int {
-	val := 0
-	if nt != 0 {
-		nnonter++
-		if nnonter >= len(nontrst) {
-			anontrst := make([]Symb, nnonter+SYMINC)
-			copy(anontrst, nontrst)
-			nontrst = anontrst
-		}
-		nontrst[nnonter] = Symb{name: s}
-		return NTBASE + nnonter
-	}
-
-	// must be a token
-	ntokens++
-	if ntokens >= len(tokset) {
-		nn := ntokens + SYMINC
-		atokset := make([]Symb, nn)
-		atoklev := make([]int, nn)
-
-		copy(atoklev, toklev)
-		copy(atokset, tokset)
-
-		tokset = atokset
-		toklev = atoklev
-	}
-	tokset[ntokens].name = s
-	toklev[ntokens] = 0
-
-	// establish value for token
-	// single character literal
-	if s[0] == '\'' || s[0] == '"' {
-		q, err := strconv.Unquote(s)
-		if err != nil {
-			errorf("invalid token: %s", err)
-		}
-		rq := []rune(q)
-		if len(rq) != 1 {
-			errorf("character token too long: %s", s)
-		}
-		val = int(rq[0])
-		if val == 0 {
-			errorf("token value 0 is illegal")
-		}
-		tokset[ntokens].noconst = true
-	} else {
-		val = extval
-		extval++
-		if s[0] == '$' {
-			tokset[ntokens].noconst = true
-		}
-	}
-
-	tokset[ntokens].value = val
-	return ntokens
-}
-
-var peekline = 0
-
-func gettok() int {
-	var i int
-	var match, c rune
-
-	tokname = ""
-	for {
-		lineno += peekline
-		peekline = 0
-		c = getrune(finput)
-		for c == ' ' || c == '\n' || c == '\t' || c == '\v' || c == '\r' {
-			if c == '\n' {
-				lineno++
-			}
-			c = getrune(finput)
-		}
-
-		// skip comment -- fix
-		if c != '/' {
-			break
-		}
-		lineno += skipcom()
-	}
-
-	switch c {
-	case EOF:
-		if tokflag {
-			fmt.Printf(">>> ENDFILE %v\n", lineno)
-		}
-		return ENDFILE
-
-	case '{':
-		ungetrune(finput, c)
-		if tokflag {
-			fmt.Printf(">>> ={ %v\n", lineno)
-		}
-		return '='
-
-	case '<':
-		// get, and look up, a type name (union member name)
-		c = getrune(finput)
-		for c != '>' && c != EOF && c != '\n' {
-			tokname += string(c)
-			c = getrune(finput)
-		}
-
-		if c != '>' {
-			errorf("unterminated < ... > clause")
-		}
-
-		for i = 1; i <= ntypes; i++ {
-			if typeset[i] == tokname {
-				numbval = i
-				if tokflag {
-					fmt.Printf(">>> TYPENAME old <%v> %v\n", tokname, lineno)
-				}
-				return TYPENAME
-			}
-		}
-		ntypes++
-		numbval = ntypes
-		typeset[numbval] = tokname
-		if tokflag {
-			fmt.Printf(">>> TYPENAME new <%v> %v\n", tokname, lineno)
-		}
-		return TYPENAME
-
-	case '"', '\'':
-		match = c
-		tokname = string(c)
-		for {
-			c = getrune(finput)
-			if c == '\n' || c == EOF {
-				errorf("illegal or missing ' or \"")
-			}
-			if c == '\\' {
-				tokname += string('\\')
-				c = getrune(finput)
-			} else if c == match {
-				if tokflag {
-					fmt.Printf(">>> IDENTIFIER \"%v\" %v\n", tokname, lineno)
-				}
-				tokname += string(c)
-				return IDENTIFIER
-			}
-			tokname += string(c)
-		}
-
-	case '%':
-		c = getrune(finput)
-		switch c {
-		case '%':
-			if tokflag {
-				fmt.Printf(">>> MARK %%%% %v\n", lineno)
-			}
-			return MARK
-		case '=':
-			if tokflag {
-				fmt.Printf(">>> PREC %%= %v\n", lineno)
-			}
-			return PREC
-		case '{':
-			if tokflag {
-				fmt.Printf(">>> LCURLY %%{ %v\n", lineno)
-			}
-			return LCURLY
-		}
-
-		getword(c)
-		// find a reserved word
-		for i := range resrv {
-			if tokname == resrv[i].name {
-				if tokflag {
-					fmt.Printf(">>> %%%v %v %v\n", tokname,
-						resrv[i].value-PRIVATE, lineno)
-				}
-				return resrv[i].value
-			}
-		}
-		errorf("invalid escape, or illegal reserved word: %v", tokname)
-
-	case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-		numbval = int(c - '0')
-		for {
-			c = getrune(finput)
-			if !isdigit(c) {
-				break
-			}
-			numbval = numbval*10 + int(c-'0')
-		}
-		ungetrune(finput, c)
-		if tokflag {
-			fmt.Printf(">>> NUMBER %v %v\n", numbval, lineno)
-		}
-		return NUMBER
-
-	default:
-		if isword(c) || c == '.' || c == '$' {
-			getword(c)
-			break
-		}
-		if tokflag {
-			fmt.Printf(">>> OPERATOR %v %v\n", string(c), lineno)
-		}
-		return int(c)
-	}
-
-	// look ahead to distinguish IDENTIFIER from IDENTCOLON
-	c = getrune(finput)
-	for c == ' ' || c == '\t' || c == '\n' || c == '\v' || c == '\r' || c == '/' {
-		if c == '\n' {
-			peekline++
-		}
-		// look for comments
-		if c == '/' {
-			peekline += skipcom()
-		}
-		c = getrune(finput)
-	}
-	if c == ':' {
-		if tokflag {
-			fmt.Printf(">>> IDENTCOLON %v: %v\n", tokname, lineno)
-		}
-		return IDENTCOLON
-	}
-
-	ungetrune(finput, c)
-	if tokflag {
-		fmt.Printf(">>> IDENTIFIER %v %v\n", tokname, lineno)
-	}
-	return IDENTIFIER
-}
-
-func getword(c rune) {
-	tokname = ""
-	for isword(c) || isdigit(c) || c == '.' || c == '$' {
-		tokname += string(c)
-		c = getrune(finput)
-	}
-	ungetrune(finput, c)
-}
-
-//
-// determine the type of a symbol
-//
-func fdtype(t int) int {
-	var v int
-	var s string
-
-	if t >= NTBASE {
-		v = nontrst[t-NTBASE].value
-		s = nontrst[t-NTBASE].name
-	} else {
-		v = TYPE(toklev[t])
-		s = tokset[t].name
-	}
-	if v <= 0 {
-		errorf("must specify type for %v", s)
-	}
-	return v
-}
-
-func chfind(t int, s string) int {
-	if s[0] == '"' || s[0] == '\'' {
-		t = 0
-	}
-	for i := 0; i <= ntokens; i++ {
-		if s == tokset[i].name {
-			return i
-		}
-	}
-	for i := 0; i <= nnonter; i++ {
-		if s == nontrst[i].name {
-			return NTBASE + i
-		}
-	}
-
-	// cannot find name
-	if t > 1 {
-		errorf("%v should have been defined earlier", s)
-	}
-	return defin(t, s)
-}
-
-//
-// copy the union declaration to the output, and the define file if present
-//
-func cpyunion() {
-
-	if !lflag {
-		fmt.Fprintf(ftable, "\n//line %v:%v\n", infile, lineno)
-	}
-	fmt.Fprintf(ftable, "type %sSymType struct", prefix)
-
-	level := 0
-
-out:
-	for {
-		c := getrune(finput)
-		if c == EOF {
-			errorf("EOF encountered while processing %%union")
-		}
-		ftable.WriteRune(c)
-		switch c {
-		case '\n':
-			lineno++
-		case '{':
-			if level == 0 {
-				fmt.Fprintf(ftable, "\n\tyys int")
-			}
-			level++
-		case '}':
-			level--
-			if level == 0 {
-				break out
-			}
-		}
-	}
-	fmt.Fprintf(ftable, "\n\n")
-}
-
-//
-// saves code between %{ and %}
-// adds an import for __fmt__ the first time
-//
-func cpycode() {
-	lno := lineno
-
-	c := getrune(finput)
-	if c == '\n' {
-		c = getrune(finput)
-		lineno++
-	}
-	if !lflag {
-		fmt.Fprintf(ftable, "\n//line %v:%v\n", infile, lineno)
-	}
-	// accumulate until %}
-	code := make([]rune, 0, 1024)
-	for c != EOF {
-		if c == '%' {
-			c = getrune(finput)
-			if c == '}' {
-				emitcode(code, lno+1)
-				return
-			}
-			code = append(code, '%')
-		}
-		code = append(code, c)
-		if c == '\n' {
-			lineno++
-		}
-		c = getrune(finput)
-	}
-	lineno = lno
-	errorf("eof before %%}")
-}
-
-//
-// emits code saved up from between %{ and %}
-// called by cpycode
-// adds an import for __yyfmt__ after the package clause
-//
-func emitcode(code []rune, lineno int) {
-	for i, line := range lines(code) {
-		writecode(line)
-		if !fmtImported && isPackageClause(line) {
-			fmt.Fprintln(ftable, `import __yyfmt__ "fmt"`)
-			if !lflag {
-				fmt.Fprintf(ftable, "//line %v:%v\n\t\t", infile, lineno+i)
-			}
-			fmtImported = true
-		}
-	}
-}
-
-//
-// does this line look like a package clause?  not perfect: might be confused by early comments.
-//
-func isPackageClause(line []rune) bool {
-	line = skipspace(line)
-
-	// must be big enough.
-	if len(line) < len("package X\n") {
-		return false
-	}
-
-	// must start with "package"
-	for i, r := range []rune("package") {
-		if line[i] != r {
-			return false
-		}
-	}
-	line = skipspace(line[len("package"):])
-
-	// must have another identifier.
-	if len(line) == 0 || (!unicode.IsLetter(line[0]) && line[0] != '_') {
-		return false
-	}
-	for len(line) > 0 {
-		if !unicode.IsLetter(line[0]) && !unicode.IsDigit(line[0]) && line[0] != '_' {
-			break
-		}
-		line = line[1:]
-	}
-	line = skipspace(line)
-
-	// eol, newline, or comment must follow
-	if len(line) == 0 {
-		return true
-	}
-	if line[0] == '\r' || line[0] == '\n' {
-		return true
-	}
-	if len(line) >= 2 {
-		return line[0] == '/' && (line[1] == '/' || line[1] == '*')
-	}
-	return false
-}
-
-//
-// skip initial spaces
-//
-func skipspace(line []rune) []rune {
-	for len(line) > 0 {
-		if line[0] != ' ' && line[0] != '\t' {
-			break
-		}
-		line = line[1:]
-	}
-	return line
-}
-
-//
-// break code into lines
-//
-func lines(code []rune) [][]rune {
-	l := make([][]rune, 0, 100)
-	for len(code) > 0 {
-		// one line per loop
-		var i int
-		for i = range code {
-			if code[i] == '\n' {
-				break
-			}
-		}
-		l = append(l, code[:i+1])
-		code = code[i+1:]
-	}
-	return l
-}
-
-//
-// writes code to ftable
-//
-func writecode(code []rune) {
-	for _, r := range code {
-		ftable.WriteRune(r)
-	}
-}
-
-//
-// skip over comments
-// skipcom is called after reading a '/'
-//
-func skipcom() int {
-	c := getrune(finput)
-	if c == '/' {
-		for c != EOF {
-			if c == '\n' {
-				return 1
-			}
-			c = getrune(finput)
-		}
-		errorf("EOF inside comment")
-		return 0
-	}
-	if c != '*' {
-		errorf("illegal comment")
-	}
-
-	nl := 0 // lines skipped
-	c = getrune(finput)
-
-l1:
-	switch c {
-	case '*':
-		c = getrune(finput)
-		if c == '/' {
-			break
-		}
-		goto l1
-
-	case '\n':
-		nl++
-		fallthrough
-
-	default:
-		c = getrune(finput)
-		goto l1
-	}
-	return nl
-}
-
-//
-// copy action to the next ; or closing }
-//
-func cpyact(curprod []int, max int) {
-
-	if !lflag {
-		fmt.Fprintf(fcode, "\n\t\t//line %v:%v", infile, lineno)
-	}
-	fmt.Fprint(fcode, "\n\t\t")
-
-	lno := lineno
-	brac := 0
-
-loop:
-	for {
-		c := getrune(finput)
-
-	swt:
-		switch c {
-		case ';':
-			if brac == 0 {
-				fcode.WriteRune(c)
-				return
-			}
-
-		case '{':
-			brac++
-
-		case '$':
-			s := 1
-			tok := -1
-			c = getrune(finput)
-
-			// type description
-			if c == '<' {
-				ungetrune(finput, c)
-				if gettok() != TYPENAME {
-					errorf("bad syntax on $<ident> clause")
-				}
-				tok = numbval
-				c = getrune(finput)
-			}
-			if c == '$' {
-				fmt.Fprintf(fcode, "%sVAL", prefix)
-
-				// put out the proper tag...
-				if ntypes != 0 {
-					if tok < 0 {
-						tok = fdtype(curprod[0])
-					}
-					fmt.Fprintf(fcode, ".%v", typeset[tok])
-				}
-				continue loop
-			}
-			if c == '-' {
-				s = -s
-				c = getrune(finput)
-			}
-			j := 0
-			if isdigit(c) {
-				for isdigit(c) {
-					j = j*10 + int(c-'0')
-					c = getrune(finput)
-				}
-				ungetrune(finput, c)
-				j = j * s
-				if j >= max {
-					errorf("Illegal use of $%v", j)
-				}
-			} else if isword(c) || c == '.' {
-				// look for $name
-				ungetrune(finput, c)
-				if gettok() != IDENTIFIER {
-					errorf("$ must be followed by an identifier")
-				}
-				tokn := chfind(2, tokname)
-				fnd := -1
-				c = getrune(finput)
-				if c != '@' {
-					ungetrune(finput, c)
-				} else if gettok() != NUMBER {
-					errorf("@ must be followed by number")
-				} else {
-					fnd = numbval
-				}
-				for j = 1; j < max; j++ {
-					if tokn == curprod[j] {
-						fnd--
-						if fnd <= 0 {
-							break
-						}
-					}
-				}
-				if j >= max {
-					errorf("$name or $name@number not found")
-				}
-			} else {
-				fcode.WriteRune('$')
-				if s < 0 {
-					fcode.WriteRune('-')
-				}
-				ungetrune(finput, c)
-				continue loop
-			}
-			fmt.Fprintf(fcode, "%sDollar[%v]", prefix, j)
-
-			// put out the proper tag
-			if ntypes != 0 {
-				if j <= 0 && tok < 0 {
-					errorf("must specify type of $%v", j)
-				}
-				if tok < 0 {
-					tok = fdtype(curprod[j])
-				}
-				fmt.Fprintf(fcode, ".%v", typeset[tok])
-			}
-			continue loop
-
-		case '}':
-			brac--
-			if brac != 0 {
-				break
-			}
-			fcode.WriteRune(c)
-			return
-
-		case '/':
-			nc := getrune(finput)
-			if nc != '/' && nc != '*' {
-				ungetrune(finput, nc)
-				break
-			}
-			// a comment
-			fcode.WriteRune(c)
-			fcode.WriteRune(nc)
-			c = getrune(finput)
-			for c != EOF {
-				switch {
-				case c == '\n':
-					lineno++
-					if nc == '/' { // end of // comment
-						break swt
-					}
-				case c == '*' && nc == '*': // end of /* comment?
-					nnc := getrune(finput)
-					if nnc == '/' {
-						fcode.WriteRune('*')
-						fcode.WriteRune('/')
-						c = getrune(finput)
-						break swt
-					}
-					ungetrune(finput, nnc)
-				}
-				fcode.WriteRune(c)
-				c = getrune(finput)
-			}
-			errorf("EOF inside comment")
-
-		case '\'', '"':
-			// character string or constant
-			match := c
-			fcode.WriteRune(c)
-			c = getrune(finput)
-			for c != EOF {
-				if c == '\\' {
-					fcode.WriteRune(c)
-					c = getrune(finput)
-					if c == '\n' {
-						lineno++
-					}
-				} else if c == match {
-					break swt
-				}
-				if c == '\n' {
-					errorf("newline in string or char const")
-				}
-				fcode.WriteRune(c)
-				c = getrune(finput)
-			}
-			errorf("EOF in string or character constant")
-
-		case EOF:
-			lineno = lno
-			errorf("action does not terminate")
-
-		case '\n':
-			fmt.Fprint(fcode, "\n\t")
-			lineno++
-			continue loop
-		}
-
-		fcode.WriteRune(c)
-	}
-}
-
-func openup() {
-	infile = flag.Arg(0)
-	finput = open(infile)
-	if finput == nil {
-		errorf("cannot open %v", infile)
-	}
-
-	foutput = nil
-	if vflag != "" {
-		foutput = create(vflag)
-		if foutput == nil {
-			errorf("can't create file %v", vflag)
-		}
-	}
-
-	ftable = nil
-	if oflag == "" {
-		oflag = "y.go"
-	}
-	ftable = create(oflag)
-	if ftable == nil {
-		errorf("can't create file %v", oflag)
-	}
-
-}
-
-//
-// return a pointer to the name of symbol i
-//
-func symnam(i int) string {
-	var s string
-
-	if i >= NTBASE {
-		s = nontrst[i-NTBASE].name
-	} else {
-		s = tokset[i].name
-	}
-	return s
-}
-
-//
-// set elements 0 through n-1 to c
-//
-func aryfil(v []int, n, c int) {
-	for i := 0; i < n; i++ {
-		v[i] = c
-	}
-}
-
-//
-// compute an array with the beginnings of productions yielding given nonterminals
-// The array pres points to these lists
-// the array pyield has the lists: the total size is only NPROD+1
-//
-func cpres() {
-	pres = make([][][]int, nnonter+1)
-	curres := make([][]int, nprod)
-
-	if false {
-		for j := 0; j <= nnonter; j++ {
-			fmt.Printf("nnonter[%v] = %v\n", j, nontrst[j].name)
-		}
-		for j := 0; j < nprod; j++ {
-			fmt.Printf("prdptr[%v][0] = %v+NTBASE\n", j, prdptr[j][0]-NTBASE)
-		}
-	}
-
-	fatfl = 0 // make undefined symbols nonfatal
-	for i := 0; i <= nnonter; i++ {
-		n := 0
-		c := i + NTBASE
-		for j := 0; j < nprod; j++ {
-			if prdptr[j][0] == c {
-				curres[n] = prdptr[j][1:]
-				n++
-			}
-		}
-		if n == 0 {
-			errorf("nonterminal %v not defined", nontrst[i].name)
-			continue
-		}
-		pres[i] = make([][]int, n)
-		copy(pres[i], curres)
-	}
-	fatfl = 1
-	if nerrors != 0 {
-		summary()
-		exit(1)
-	}
-}
-
-//
-// mark nonterminals which derive the empty string
-// also, look for nonterminals which don't derive any token strings
-//
-func cempty() {
-	var i, p, np int
-	var prd []int
-
-	pempty = make([]int, nnonter+1)
-
-	// first, use the array pempty to detect productions that can never be reduced
-	// set pempty to WHONOWS
-	aryfil(pempty, nnonter+1, WHOKNOWS)
-
-	// now, look at productions, marking nonterminals which derive something
-more:
-	for {
-		for i = 0; i < nprod; i++ {
-			prd = prdptr[i]
-			if pempty[prd[0]-NTBASE] != 0 {
-				continue
-			}
-			np = len(prd) - 1
-			for p = 1; p < np; p++ {
-				if prd[p] >= NTBASE && pempty[prd[p]-NTBASE] == WHOKNOWS {
-					break
-				}
-			}
-			// production can be derived
-			if p == np {
-				pempty[prd[0]-NTBASE] = OK
-				continue more
-			}
-		}
-		break
-	}
-
-	// now, look at the nonterminals, to see if they are all OK
-	for i = 0; i <= nnonter; i++ {
-		// the added production rises or falls as the start symbol ...
-		if i == 0 {
-			continue
-		}
-		if pempty[i] != OK {
-			fatfl = 0
-			errorf("nonterminal " + nontrst[i].name + " never derives any token string")
-		}
-	}
-
-	if nerrors != 0 {
-		summary()
-		exit(1)
-	}
-
-	// now, compute the pempty array, to see which nonterminals derive the empty string
-	// set pempty to WHOKNOWS
-	aryfil(pempty, nnonter+1, WHOKNOWS)
-
-	// loop as long as we keep finding empty nonterminals
-
-again:
-	for {
-	next:
-		for i = 1; i < nprod; i++ {
-			// not known to be empty
-			prd = prdptr[i]
-			if pempty[prd[0]-NTBASE] != WHOKNOWS {
-				continue
-			}
-			np = len(prd) - 1
-			for p = 1; p < np; p++ {
-				if prd[p] < NTBASE || pempty[prd[p]-NTBASE] != EMPTY {
-					continue next
-				}
-			}
-
-			// we have a nontrivially empty nonterminal
-			pempty[prd[0]-NTBASE] = EMPTY
-
-			// got one ... try for another
-			continue again
-		}
-		return
-	}
-}
-
-//
-// compute an array with the first of nonterminals
-//
-func cpfir() {
-	var s, n, p, np, ch, i int
-	var curres [][]int
-	var prd []int
-
-	wsets = make([]Wset, nnonter+WSETINC)
-	pfirst = make([]Lkset, nnonter+1)
-	for i = 0; i <= nnonter; i++ {
-		wsets[i].ws = mkset()
-		pfirst[i] = mkset()
-		curres = pres[i]
-		n = len(curres)
-
-		// initially fill the sets
-		for s = 0; s < n; s++ {
-			prd = curres[s]
-			np = len(prd) - 1
-			for p = 0; p < np; p++ {
-				ch = prd[p]
-				if ch < NTBASE {
-					setbit(pfirst[i], ch)
-					break
-				}
-				if pempty[ch-NTBASE] == 0 {
-					break
-				}
-			}
-		}
-	}
-
-	// now, reflect transitivity
-	changes := 1
-	for changes != 0 {
-		changes = 0
-		for i = 0; i <= nnonter; i++ {
-			curres = pres[i]
-			n = len(curres)
-			for s = 0; s < n; s++ {
-				prd = curres[s]
-				np = len(prd) - 1
-				for p = 0; p < np; p++ {
-					ch = prd[p] - NTBASE
-					if ch < 0 {
-						break
-					}
-					changes |= setunion(pfirst[i], pfirst[ch])
-					if pempty[ch] == 0 {
-						break
-					}
-				}
-			}
-		}
-	}
-
-	if indebug == 0 {
-		return
-	}
-	if foutput != nil {
-		for i = 0; i <= nnonter; i++ {
-			fmt.Fprintf(foutput, "\n%v: %v %v\n",
-				nontrst[i].name, pfirst[i], pempty[i])
-		}
-	}
-}
-
-//
-// generate the states
-//
-func stagen() {
-	// initialize
-	nstate = 0
-	tstates = make([]int, ntokens+1)  // states generated by terminal gotos
-	ntstates = make([]int, nnonter+1) // states generated by nonterminal gotos
-	amem = make([]int, ACTSIZE)
-	memp = 0
-
-	clset = mkset()
-	pstate[0] = 0
-	pstate[1] = 0
-	aryfil(clset, tbitset, 0)
-	putitem(Pitem{prdptr[0], 0, 0, 0}, clset)
-	tystate[0] = MUSTDO
-	nstate = 1
-	pstate[2] = pstate[1]
-
-	//
-	// now, the main state generation loop
-	// first pass generates all of the states
-	// later passes fix up lookahead
-	// could be sped up a lot by remembering
-	// results of the first pass rather than recomputing
-	//
-	first := 1
-	for more := 1; more != 0; first = 0 {
-		more = 0
-		for i := 0; i < nstate; i++ {
-			if tystate[i] != MUSTDO {
-				continue
-			}
-
-			tystate[i] = DONE
-			aryfil(temp1, nnonter+1, 0)
-
-			// take state i, close it, and do gotos
-			closure(i)
-
-			// generate goto's
-			for p := 0; p < cwp; p++ {
-				pi := wsets[p]
-				if pi.flag != 0 {
-					continue
-				}
-				wsets[p].flag = 1
-				c := pi.pitem.first
-				if c <= 1 {
-					if pstate[i+1]-pstate[i] <= p {
-						tystate[i] = MUSTLOOKAHEAD
-					}
-					continue
-				}
-
-				// do a goto on c
-				putitem(wsets[p].pitem, wsets[p].ws)
-				for q := p + 1; q < cwp; q++ {
-					// this item contributes to the goto
-					if c == wsets[q].pitem.first {
-						putitem(wsets[q].pitem, wsets[q].ws)
-						wsets[q].flag = 1
-					}
-				}
-
-				if c < NTBASE {
-					state(c) // register new state
-				} else {
-					temp1[c-NTBASE] = state(c)
-				}
-			}
-
-			if gsdebug != 0 && foutput != nil {
-				fmt.Fprintf(foutput, "%v: ", i)
-				for j := 0; j <= nnonter; j++ {
-					if temp1[j] != 0 {
-						fmt.Fprintf(foutput, "%v %v,", nontrst[j].name, temp1[j])
-					}
-				}
-				fmt.Fprintf(foutput, "\n")
-			}
-
-			if first != 0 {
-				indgo[i] = apack(temp1[1:], nnonter-1) - 1
-			}
-
-			more++
-		}
-	}
-}
-
-//
-// generate the closure of state i
-//
-func closure(i int) {
-	zzclose++
-
-	// first, copy kernel of state i to wsets
-	cwp = 0
-	q := pstate[i+1]
-	for p := pstate[i]; p < q; p++ {
-		wsets[cwp].pitem = statemem[p].pitem
-		wsets[cwp].flag = 1 // this item must get closed
-		copy(wsets[cwp].ws, statemem[p].look)
-		cwp++
-	}
-
-	// now, go through the loop, closing each item
-	work := 1
-	for work != 0 {
-		work = 0
-		for u := 0; u < cwp; u++ {
-			if wsets[u].flag == 0 {
-				continue
-			}
-
-			// dot is before c
-			c := wsets[u].pitem.first
-			if c < NTBASE {
-				wsets[u].flag = 0
-				// only interesting case is where . is before nonterminal
-				continue
-			}
-
-			// compute the lookahead
-			aryfil(clset, tbitset, 0)
-
-			// find items involving c
-			for v := u; v < cwp; v++ {
-				if wsets[v].flag != 1 || wsets[v].pitem.first != c {
-					continue
-				}
-				pi := wsets[v].pitem.prod
-				ipi := wsets[v].pitem.off + 1
-
-				wsets[v].flag = 0
-				if nolook != 0 {
-					continue
-				}
-
-				ch := pi[ipi]
-				ipi++
-				for ch > 0 {
-					// terminal symbol
-					if ch < NTBASE {
-						setbit(clset, ch)
-						break
-					}
-
-					// nonterminal symbol
-					setunion(clset, pfirst[ch-NTBASE])
-					if pempty[ch-NTBASE] == 0 {
-						break
-					}
-					ch = pi[ipi]
-					ipi++
-				}
-				if ch <= 0 {
-					setunion(clset, wsets[v].ws)
-				}
-			}
-
-			//
-			// now loop over productions derived from c
-			//
-			curres := pres[c-NTBASE]
-			n := len(curres)
-
-		nexts:
-			// initially fill the sets
-			for s := 0; s < n; s++ {
-				prd := curres[s]
-
-				//
-				// put these items into the closure
-				// is the item there
-				//
-				for v := 0; v < cwp; v++ {
-					// yes, it is there
-					if wsets[v].pitem.off == 0 &&
-						aryeq(wsets[v].pitem.prod, prd) != 0 {
-						if nolook == 0 &&
-							setunion(wsets[v].ws, clset) != 0 {
-							wsets[v].flag = 1
-							work = 1
-						}
-						continue nexts
-					}
-				}
-
-				//  not there; make a new entry
-				if cwp >= len(wsets) {
-					awsets := make([]Wset, cwp+WSETINC)
-					copy(awsets, wsets)
-					wsets = awsets
-				}
-				wsets[cwp].pitem = Pitem{prd, 0, prd[0], -prd[len(prd)-1]}
-				wsets[cwp].flag = 1
-				wsets[cwp].ws = mkset()
-				if nolook == 0 {
-					work = 1
-					copy(wsets[cwp].ws, clset)
-				}
-				cwp++
-			}
-		}
-	}
-
-	// have computed closure; flags are reset; return
-	if cldebug != 0 && foutput != nil {
-		fmt.Fprintf(foutput, "\nState %v, nolook = %v\n", i, nolook)
-		for u := 0; u < cwp; u++ {
-			if wsets[u].flag != 0 {
-				fmt.Fprintf(foutput, "flag set\n")
-			}
-			wsets[u].flag = 0
-			fmt.Fprintf(foutput, "\t%v", writem(wsets[u].pitem))
-			prlook(wsets[u].ws)
-			fmt.Fprintf(foutput, "\n")
-		}
-	}
-}
-
-//
-// sorts last state,and sees if it equals earlier ones. returns state number
-//
-func state(c int) int {
-	zzstate++
-	p1 := pstate[nstate]
-	p2 := pstate[nstate+1]
-	if p1 == p2 {
-		return 0 // null state
-	}
-
-	// sort the items
-	var k, l int
-	for k = p1 + 1; k < p2; k++ { // make k the biggest
-		for l = k; l > p1; l-- {
-			if statemem[l].pitem.prodno < statemem[l-1].pitem.prodno ||
-				statemem[l].pitem.prodno == statemem[l-1].pitem.prodno &&
-					statemem[l].pitem.off < statemem[l-1].pitem.off {
-				s := statemem[l]
-				statemem[l] = statemem[l-1]
-				statemem[l-1] = s
-			} else {
-				break
-			}
-		}
-	}
-
-	size1 := p2 - p1 // size of state
-
-	var i int
-	if c >= NTBASE {
-		i = ntstates[c-NTBASE]
-	} else {
-		i = tstates[c]
-	}
-
-look:
-	for ; i != 0; i = mstates[i] {
-		// get ith state
-		q1 := pstate[i]
-		q2 := pstate[i+1]
-		size2 := q2 - q1
-		if size1 != size2 {
-			continue
-		}
-		k = p1
-		for l = q1; l < q2; l++ {
-			if aryeq(statemem[l].pitem.prod, statemem[k].pitem.prod) == 0 ||
-				statemem[l].pitem.off != statemem[k].pitem.off {
-				continue look
-			}
-			k++
-		}
-
-		// found it
-		pstate[nstate+1] = pstate[nstate] // delete last state
-
-		// fix up lookaheads
-		if nolook != 0 {
-			return i
-		}
-		k = p1
-		for l = q1; l < q2; l++ {
-			if setunion(statemem[l].look, statemem[k].look) != 0 {
-				tystate[i] = MUSTDO
-			}
-			k++
-		}
-		return i
-	}
-
-	// state is new
-	zznewstate++
-	if nolook != 0 {
-		errorf("yacc state/nolook error")
-	}
-	pstate[nstate+2] = p2
-	if nstate+1 >= NSTATES {
-		errorf("too many states")
-	}
-	if c >= NTBASE {
-		mstates[nstate] = ntstates[c-NTBASE]
-		ntstates[c-NTBASE] = nstate
-	} else {
-		mstates[nstate] = tstates[c]
-		tstates[c] = nstate
-	}
-	tystate[nstate] = MUSTDO
-	nstate++
-	return nstate - 1
-}
-
-func putitem(p Pitem, set Lkset) {
-	p.off++
-	p.first = p.prod[p.off]
-
-	if pidebug != 0 && foutput != nil {
-		fmt.Fprintf(foutput, "putitem(%v), state %v\n", writem(p), nstate)
-	}
-	j := pstate[nstate+1]
-	if j >= len(statemem) {
-		asm := make([]Item, j+STATEINC)
-		copy(asm, statemem)
-		statemem = asm
-	}
-	statemem[j].pitem = p
-	if nolook == 0 {
-		s := mkset()
-		copy(s, set)
-		statemem[j].look = s
-	}
-	j++
-	pstate[nstate+1] = j
-}
-
-//
-// creates output string for item pointed to by pp
-//
-func writem(pp Pitem) string {
-	var i int
-
-	p := pp.prod
-	q := chcopy(nontrst[prdptr[pp.prodno][0]-NTBASE].name) + ": "
-	npi := pp.off
-
-	pi := aryeq(p, prdptr[pp.prodno])
-
-	for {
-		c := ' '
-		if pi == npi {
-			c = '.'
-		}
-		q += string(c)
-
-		i = p[pi]
-		pi++
-		if i <= 0 {
-			break
-		}
-		q += chcopy(symnam(i))
-	}
-
-	// an item calling for a reduction
-	i = p[npi]
-	if i < 0 {
-		q += fmt.Sprintf("    (%v)", -i)
-	}
-
-	return q
-}
-
-//
-// pack state i from temp1 into amem
-//
-func apack(p []int, n int) int {
-	//
-	// we don't need to worry about checking because
-	// we will only look at entries known to be there...
-	// eliminate leading and trailing 0's
-	//
-	off := 0
-	pp := 0
-	for ; pp <= n && p[pp] == 0; pp++ {
-		off--
-	}
-
-	// no actions
-	if pp > n {
-		return 0
-	}
-	for ; n > pp && p[n] == 0; n-- {
-	}
-	p = p[pp : n+1]
-
-	// now, find a place for the elements from p to q, inclusive
-	r := len(amem) - len(p)
-
-nextk:
-	for rr := 0; rr <= r; rr++ {
-		qq := rr
-		for pp = 0; pp < len(p); pp++ {
-			if p[pp] != 0 {
-				if p[pp] != amem[qq] && amem[qq] != 0 {
-					continue nextk
-				}
-			}
-			qq++
-		}
-
-		// we have found an acceptable k
-		if pkdebug != 0 && foutput != nil {
-			fmt.Fprintf(foutput, "off = %v, k = %v\n", off+rr, rr)
-		}
-		qq = rr
-		for pp = 0; pp < len(p); pp++ {
-			if p[pp] != 0 {
-				if qq > memp {
-					memp = qq
-				}
-				amem[qq] = p[pp]
-			}
-			qq++
-		}
-		if pkdebug != 0 && foutput != nil {
-			for pp = 0; pp <= memp; pp += 10 {
-				fmt.Fprintf(foutput, "\n")
-				for qq = pp; qq <= pp+9; qq++ {
-					fmt.Fprintf(foutput, "%v ", amem[qq])
-				}
-				fmt.Fprintf(foutput, "\n")
-			}
-		}
-		return off + rr
-	}
-	errorf("no space in action table")
-	return 0
-}
-
-//
-// print the output for the states
-//
-func output() {
-	var c, u, v int
-
-	if !lflag {
-		fmt.Fprintf(ftable, "\n//line yacctab:1")
-	}
-	fmt.Fprintf(ftable, "\nvar %sExca = [...]int{\n", prefix)
-
-	if len(errors) > 0 {
-		stateTable = make([]Row, nstate)
-	}
-
-	noset := mkset()
-
-	// output the stuff for state i
-	for i := 0; i < nstate; i++ {
-		nolook = 0
-		if tystate[i] != MUSTLOOKAHEAD {
-			nolook = 1
-		}
-		closure(i)
-
-		// output actions
-		nolook = 1
-		aryfil(temp1, ntokens+nnonter+1, 0)
-		for u = 0; u < cwp; u++ {
-			c = wsets[u].pitem.first
-			if c > 1 && c < NTBASE && temp1[c] == 0 {
-				for v = u; v < cwp; v++ {
-					if c == wsets[v].pitem.first {
-						putitem(wsets[v].pitem, noset)
-					}
-				}
-				temp1[c] = state(c)
-			} else if c > NTBASE {
-				c -= NTBASE
-				if temp1[c+ntokens] == 0 {
-					temp1[c+ntokens] = amem[indgo[i]+c]
-				}
-			}
-		}
-		if i == 1 {
-			temp1[1] = ACCEPTCODE
-		}
-
-		// now, we have the shifts; look at the reductions
-		lastred = 0
-		for u = 0; u < cwp; u++ {
-			c = wsets[u].pitem.first
-
-			// reduction
-			if c > 0 {
-				continue
-			}
-			lastred = -c
-			us := wsets[u].ws
-			for k := 0; k <= ntokens; k++ {
-				if bitset(us, k) == 0 {
-					continue
-				}
-				if temp1[k] == 0 {
-					temp1[k] = c
-				} else if temp1[k] < 0 { // reduce/reduce conflict
-					if foutput != nil {
-						fmt.Fprintf(foutput,
-							"\n %v: reduce/reduce conflict  (red'ns "+
-								"%v and %v) on %v",
-							i, -temp1[k], lastred, symnam(k))
-					}
-					if -temp1[k] > lastred {
-						temp1[k] = -lastred
-					}
-					zzrrconf++
-				} else {
-					// potential shift/reduce conflict
-					precftn(lastred, k, i)
-				}
-			}
-		}
-		wract(i)
-	}
-
-	fmt.Fprintf(ftable, "}\n")
-	ftable.WriteRune('\n')
-	fmt.Fprintf(ftable, "const %sPrivate = %v\n", prefix, PRIVATE)
-}
-
-//
-// decide a shift/reduce conflict by precedence.
-// r is a rule number, t a token number
-// the conflict is in state s
-// temp1[t] is changed to reflect the action
-//
-func precftn(r, t, s int) {
-	action := NOASC
-
-	lp := levprd[r]
-	lt := toklev[t]
-	if PLEVEL(lt) == 0 || PLEVEL(lp) == 0 {
-		// conflict
-		if foutput != nil {
-			fmt.Fprintf(foutput,
-				"\n%v: shift/reduce conflict (shift %v(%v), red'n %v(%v)) on %v",
-				s, temp1[t], PLEVEL(lt), r, PLEVEL(lp), symnam(t))
-		}
-		zzsrconf++
-		return
-	}
-	if PLEVEL(lt) == PLEVEL(lp) {
-		action = ASSOC(lt)
-	} else if PLEVEL(lt) > PLEVEL(lp) {
-		action = RASC // shift
-	} else {
-		action = LASC
-	} // reduce
-	switch action {
-	case BASC: // error action
-		temp1[t] = ERRCODE
-	case LASC: // reduce
-		temp1[t] = -r
-	}
-}
-
-//
-// output state i
-// temp1 has the actions, lastred the default
-//
-func wract(i int) {
-	var p, p1 int
-
-	// find the best choice for lastred
-	lastred = 0
-	ntimes := 0
-	for j := 0; j <= ntokens; j++ {
-		if temp1[j] >= 0 {
-			continue
-		}
-		if temp1[j]+lastred == 0 {
-			continue
-		}
-		// count the number of appearances of temp1[j]
-		count := 0
-		tred := -temp1[j]
-		levprd[tred] |= REDFLAG
-		for p = 0; p <= ntokens; p++ {
-			if temp1[p]+tred == 0 {
-				count++
-			}
-		}
-		if count > ntimes {
-			lastred = tred
-			ntimes = count
-		}
-	}
-
-	//
-	// for error recovery, arrange that, if there is a shift on the
-	// error recovery token, `error', that the default be the error action
-	//
-	if temp1[2] > 0 {
-		lastred = 0
-	}
-
-	// clear out entries in temp1 which equal lastred
-	// count entries in optst table
-	n := 0
-	for p = 0; p <= ntokens; p++ {
-		p1 = temp1[p]
-		if p1+lastred == 0 {
-			temp1[p] = 0
-			p1 = 0
-		}
-		if p1 > 0 && p1 != ACCEPTCODE && p1 != ERRCODE {
-			n++
-		}
-	}
-
-	wrstate(i)
-	defact[i] = lastred
-	flag := 0
-	os := make([]int, n*2)
-	n = 0
-	for p = 0; p <= ntokens; p++ {
-		p1 = temp1[p]
-		if p1 != 0 {
-			if p1 < 0 {
-				p1 = -p1
-			} else if p1 == ACCEPTCODE {
-				p1 = -1
-			} else if p1 == ERRCODE {
-				p1 = 0
-			} else {
-				os[n] = p
-				n++
-				os[n] = p1
-				n++
-				zzacent++
-				continue
-			}
-			if flag == 0 {
-				fmt.Fprintf(ftable, "\t-1, %v,\n", i)
-			}
-			flag++
-			fmt.Fprintf(ftable, "\t%v, %v,\n", p, p1)
-			zzexcp++
-		}
-	}
-	if flag != 0 {
-		defact[i] = -2
-		fmt.Fprintf(ftable, "\t-2, %v,\n", lastred)
-	}
-	optst[i] = os
-}
-
-//
-// writes state i
-//
-func wrstate(i int) {
-	var j0, j1, u int
-	var pp, qq int
-
-	if len(errors) > 0 {
-		actions := append([]int(nil), temp1...)
-		defaultAction := ERRCODE
-		if lastred != 0 {
-			defaultAction = -lastred
-		}
-		stateTable[i] = Row{actions, defaultAction}
-	}
-
-	if foutput == nil {
-		return
-	}
-	fmt.Fprintf(foutput, "\nstate %v\n", i)
-	qq = pstate[i+1]
-	for pp = pstate[i]; pp < qq; pp++ {
-		fmt.Fprintf(foutput, "\t%v\n", writem(statemem[pp].pitem))
-	}
-	if tystate[i] == MUSTLOOKAHEAD {
-		// print out empty productions in closure
-		for u = pstate[i+1] - pstate[i]; u < cwp; u++ {
-			if wsets[u].pitem.first < 0 {
-				fmt.Fprintf(foutput, "\t%v\n", writem(wsets[u].pitem))
-			}
-		}
-	}
-
-	// check for state equal to another
-	for j0 = 0; j0 <= ntokens; j0++ {
-		j1 = temp1[j0]
-		if j1 != 0 {
-			fmt.Fprintf(foutput, "\n\t%v  ", symnam(j0))
-
-			// shift, error, or accept
-			if j1 > 0 {
-				if j1 == ACCEPTCODE {
-					fmt.Fprintf(foutput, "accept")
-				} else if j1 == ERRCODE {
-					fmt.Fprintf(foutput, "error")
-				} else {
-					fmt.Fprintf(foutput, "shift %v", j1)
-				}
-			} else {
-				fmt.Fprintf(foutput, "reduce %v (src line %v)", -j1, rlines[-j1])
-			}
-		}
-	}
-
-	// output the final production
-	if lastred != 0 {
-		fmt.Fprintf(foutput, "\n\t.  reduce %v (src line %v)\n\n",
-			lastred, rlines[lastred])
-	} else {
-		fmt.Fprintf(foutput, "\n\t.  error\n\n")
-	}
-
-	// now, output nonterminal actions
-	j1 = ntokens
-	for j0 = 1; j0 <= nnonter; j0++ {
-		j1++
-		if temp1[j1] != 0 {
-			fmt.Fprintf(foutput, "\t%v  goto %v\n", symnam(j0+NTBASE), temp1[j1])
-		}
-	}
-}
-
-//
-// output the gotos for the nontermninals
-//
-func go2out() {
-	for i := 1; i <= nnonter; i++ {
-		go2gen(i)
-
-		// find the best one to make default
-		best := -1
-		times := 0
-
-		// is j the most frequent
-		for j := 0; j < nstate; j++ {
-			if tystate[j] == 0 {
-				continue
-			}
-			if tystate[j] == best {
-				continue
-			}
-
-			// is tystate[j] the most frequent
-			count := 0
-			cbest := tystate[j]
-			for k := j; k < nstate; k++ {
-				if tystate[k] == cbest {
-					count++
-				}
-			}
-			if count > times {
-				best = cbest
-				times = count
-			}
-		}
-
-		// best is now the default entry
-		zzgobest += times - 1
-		n := 0
-		for j := 0; j < nstate; j++ {
-			if tystate[j] != 0 && tystate[j] != best {
-				n++
-			}
-		}
-		goent := make([]int, 2*n+1)
-		n = 0
-		for j := 0; j < nstate; j++ {
-			if tystate[j] != 0 && tystate[j] != best {
-				goent[n] = j
-				n++
-				goent[n] = tystate[j]
-				n++
-				zzgoent++
-			}
-		}
-
-		// now, the default
-		if best == -1 {
-			best = 0
-		}
-
-		zzgoent++
-		goent[n] = best
-		yypgo[i] = goent
-	}
-}
-
-//
-// output the gotos for nonterminal c
-//
-func go2gen(c int) {
-	var i, cc, p, q int
-
-	// first, find nonterminals with gotos on c
-	aryfil(temp1, nnonter+1, 0)
-	temp1[c] = 1
-	work := 1
-	for work != 0 {
-		work = 0
-		for i = 0; i < nprod; i++ {
-			// cc is a nonterminal with a goto on c
-			cc = prdptr[i][1] - NTBASE
-			if cc >= 0 && temp1[cc] != 0 {
-				// thus, the left side of production i does too
-				cc = prdptr[i][0] - NTBASE
-				if temp1[cc] == 0 {
-					work = 1
-					temp1[cc] = 1
-				}
-			}
-		}
-	}
-
-	// now, we have temp1[c] = 1 if a goto on c in closure of cc
-	if g2debug != 0 && foutput != nil {
-		fmt.Fprintf(foutput, "%v: gotos on ", nontrst[c].name)
-		for i = 0; i <= nnonter; i++ {
-			if temp1[i] != 0 {
-				fmt.Fprintf(foutput, "%v ", nontrst[i].name)
-			}
-		}
-		fmt.Fprintf(foutput, "\n")
-	}
-
-	// now, go through and put gotos into tystate
-	aryfil(tystate, nstate, 0)
-	for i = 0; i < nstate; i++ {
-		q = pstate[i+1]
-		for p = pstate[i]; p < q; p++ {
-			cc = statemem[p].pitem.first
-			if cc >= NTBASE {
-				// goto on c is possible
-				if temp1[cc-NTBASE] != 0 {
-					tystate[i] = amem[indgo[i]+c]
-					break
-				}
-			}
-		}
-	}
-}
-
-//
-// in order to free up the mem and amem arrays for the optimizer,
-// and still be able to output yyr1, etc., after the sizes of
-// the action array is known, we hide the nonterminals
-// derived by productions in levprd.
-//
-func hideprod() {
-	nred := 0
-	levprd[0] = 0
-	for i := 1; i < nprod; i++ {
-		if (levprd[i] & REDFLAG) == 0 {
-			if foutput != nil {
-				fmt.Fprintf(foutput, "Rule not reduced: %v\n",
-					writem(Pitem{prdptr[i], 0, 0, i}))
-			}
-			fmt.Printf("rule %v never reduced\n", writem(Pitem{prdptr[i], 0, 0, i}))
-			nred++
-		}
-		levprd[i] = prdptr[i][0] - NTBASE
-	}
-	if nred != 0 {
-		fmt.Printf("%v rules never reduced\n", nred)
-	}
-}
-
-func callopt() {
-	var j, k, p, q, i int
-	var v []int
-
-	pgo = make([]int, nnonter+1)
-	pgo[0] = 0
-	maxoff = 0
-	maxspr = 0
-	for i = 0; i < nstate; i++ {
-		k = 32000
-		j = 0
-		v = optst[i]
-		q = len(v)
-		for p = 0; p < q; p += 2 {
-			if v[p] > j {
-				j = v[p]
-			}
-			if v[p] < k {
-				k = v[p]
-			}
-		}
-
-		// nontrivial situation
-		if k <= j {
-			// j is now the range
-			//			j -= k;			// call scj
-			if k > maxoff {
-				maxoff = k
-			}
-		}
-		tystate[i] = q + 2*j
-		if j > maxspr {
-			maxspr = j
-		}
-	}
-
-	// initialize ggreed table
-	ggreed = make([]int, nnonter+1)
-	for i = 1; i <= nnonter; i++ {
-		ggreed[i] = 1
-		j = 0
-
-		// minimum entry index is always 0
-		v = yypgo[i]
-		q = len(v) - 1
-		for p = 0; p < q; p += 2 {
-			ggreed[i] += 2
-			if v[p] > j {
-				j = v[p]
-			}
-		}
-		ggreed[i] = ggreed[i] + 2*j
-		if j > maxoff {
-			maxoff = j
-		}
-	}
-
-	// now, prepare to put the shift actions into the amem array
-	for i = 0; i < ACTSIZE; i++ {
-		amem[i] = 0
-	}
-	maxa = 0
-	for i = 0; i < nstate; i++ {
-		if tystate[i] == 0 && adb > 1 {
-			fmt.Fprintf(ftable, "State %v: null\n", i)
-		}
-		indgo[i] = yyFlag
-	}
-
-	i = nxti()
-	for i != NOMORE {
-		if i >= 0 {
-			stin(i)
-		} else {
-			gin(-i)
-		}
-		i = nxti()
-	}
-
-	// print amem array
-	if adb > 2 {
-		for p = 0; p <= maxa; p += 10 {
-			fmt.Fprintf(ftable, "%v  ", p)
-			for i = 0; i < 10; i++ {
-				fmt.Fprintf(ftable, "%v  ", amem[p+i])
-			}
-			ftable.WriteRune('\n')
-		}
-	}
-
-	aoutput()
-	osummary()
-}
-
-//
-// finds the next i
-//
-func nxti() int {
-	max := 0
-	maxi := 0
-	for i := 1; i <= nnonter; i++ {
-		if ggreed[i] >= max {
-			max = ggreed[i]
-			maxi = -i
-		}
-	}
-	for i := 0; i < nstate; i++ {
-		if tystate[i] >= max {
-			max = tystate[i]
-			maxi = i
-		}
-	}
-	if max == 0 {
-		return NOMORE
-	}
-	return maxi
-}
-
-func gin(i int) {
-	var s int
-
-	// enter gotos on nonterminal i into array amem
-	ggreed[i] = 0
-
-	q := yypgo[i]
-	nq := len(q) - 1
-
-	// now, find amem place for it
-nextgp:
-	for p := 0; p < ACTSIZE; p++ {
-		if amem[p] != 0 {
-			continue
-		}
-		for r := 0; r < nq; r += 2 {
-			s = p + q[r] + 1
-			if s > maxa {
-				maxa = s
-				if maxa >= ACTSIZE {
-					errorf("a array overflow")
-				}
-			}
-			if amem[s] != 0 {
-				continue nextgp
-			}
-		}
-
-		// we have found amem spot
-		amem[p] = q[nq]
-		if p > maxa {
-			maxa = p
-		}
-		for r := 0; r < nq; r += 2 {
-			s = p + q[r] + 1
-			amem[s] = q[r+1]
-		}
-		pgo[i] = p
-		if adb > 1 {
-			fmt.Fprintf(ftable, "Nonterminal %v, entry at %v\n", i, pgo[i])
-		}
-		return
-	}
-	errorf("cannot place goto %v\n", i)
-}
-
-func stin(i int) {
-	var s int
-
-	tystate[i] = 0
-
-	// enter state i into the amem array
-	q := optst[i]
-	nq := len(q)
-
-nextn:
-	// find an acceptable place
-	for n := -maxoff; n < ACTSIZE; n++ {
-		flag := 0
-		for r := 0; r < nq; r += 2 {
-			s = q[r] + n
-			if s < 0 || s > ACTSIZE {
-				continue nextn
-			}
-			if amem[s] == 0 {
-				flag++
-			} else if amem[s] != q[r+1] {
-				continue nextn
-			}
-		}
-
-		// check the position equals another only if the states are identical
-		for j := 0; j < nstate; j++ {
-			if indgo[j] == n {
-
-				// we have some disagreement
-				if flag != 0 {
-					continue nextn
-				}
-				if nq == len(optst[j]) {
-
-					// states are equal
-					indgo[i] = n
-					if adb > 1 {
-						fmt.Fprintf(ftable, "State %v: entry at"+
-							"%v equals state %v\n",
-							i, n, j)
-					}
-					return
-				}
-
-				// we have some disagreement
-				continue nextn
-			}
-		}
-
-		for r := 0; r < nq; r += 2 {
-			s = q[r] + n
-			if s > maxa {
-				maxa = s
-			}
-			if amem[s] != 0 && amem[s] != q[r+1] {
-				errorf("clobber of a array, pos'n %v, by %v", s, q[r+1])
-			}
-			amem[s] = q[r+1]
-		}
-		indgo[i] = n
-		if adb > 1 {
-			fmt.Fprintf(ftable, "State %v: entry at %v\n", i, indgo[i])
-		}
-		return
-	}
-	errorf("Error; failure to place state %v", i)
-}
-
-//
-// this version is for limbo
-// write out the optimized parser
-//
-func aoutput() {
-	ftable.WriteRune('\n')
-	fmt.Fprintf(ftable, "const %sLast = %v\n\n", prefix, maxa+1)
-	arout("Act", amem, maxa+1)
-	arout("Pact", indgo, nstate)
-	arout("Pgo", pgo, nnonter+1)
-}
-
-//
-// put out other arrays, copy the parsers
-//
-func others() {
-	var i, j int
-
-	arout("R1", levprd, nprod)
-	aryfil(temp1, nprod, 0)
-
-	//
-	//yyr2 is the number of rules for each production
-	//
-	for i = 1; i < nprod; i++ {
-		temp1[i] = len(prdptr[i]) - 2
-	}
-	arout("R2", temp1, nprod)
-
-	aryfil(temp1, nstate, -1000)
-	for i = 0; i <= ntokens; i++ {
-		for j := tstates[i]; j != 0; j = mstates[j] {
-			temp1[j] = i
-		}
-	}
-	for i = 0; i <= nnonter; i++ {
-		for j = ntstates[i]; j != 0; j = mstates[j] {
-			temp1[j] = -i
-		}
-	}
-	arout("Chk", temp1, nstate)
-	arout("Def", defact, nstate)
-
-	// put out token translation tables
-	// table 1 has 0-256
-	aryfil(temp1, 256, 0)
-	c := 0
-	for i = 1; i <= ntokens; i++ {
-		j = tokset[i].value
-		if j >= 0 && j < 256 {
-			if temp1[j] != 0 {
-				fmt.Print("yacc bug -- cannot have 2 different Ts with same value\n")
-				fmt.Printf("	%s and %s\n", tokset[i].name, tokset[temp1[j]].name)
-				nerrors++
-			}
-			temp1[j] = i
-			if j > c {
-				c = j
-			}
-		}
-	}
-	for i = 0; i <= c; i++ {
-		if temp1[i] == 0 {
-			temp1[i] = YYLEXUNK
-		}
-	}
-	arout("Tok1", temp1, c+1)
-
-	// table 2 has PRIVATE-PRIVATE+256
-	aryfil(temp1, 256, 0)
-	c = 0
-	for i = 1; i <= ntokens; i++ {
-		j = tokset[i].value - PRIVATE
-		if j >= 0 && j < 256 {
-			if temp1[j] != 0 {
-				fmt.Print("yacc bug -- cannot have 2 different Ts with same value\n")
-				fmt.Printf("	%s and %s\n", tokset[i].name, tokset[temp1[j]].name)
-				nerrors++
-			}
-			temp1[j] = i
-			if j > c {
-				c = j
-			}
-		}
-	}
-	arout("Tok2", temp1, c+1)
-
-	// table 3 has everything else
-	fmt.Fprintf(ftable, "var %sTok3 = [...]int{\n\t", prefix)
-	c = 0
-	for i = 1; i <= ntokens; i++ {
-		j = tokset[i].value
-		if j >= 0 && j < 256 {
-			continue
-		}
-		if j >= PRIVATE && j < 256+PRIVATE {
-			continue
-		}
-
-		if c%5 != 0 {
-			ftable.WriteRune(' ')
-		}
-		fmt.Fprintf(ftable, "%d, %d,", j, i)
-		c++
-		if c%5 == 0 {
-			fmt.Fprint(ftable, "\n\t")
-		}
-	}
-	if c%5 != 0 {
-		ftable.WriteRune(' ')
-	}
-	fmt.Fprintf(ftable, "%d,\n}\n", 0)
-
-	// Custom error messages.
-	fmt.Fprintf(ftable, "\n")
-	fmt.Fprintf(ftable, "var %sErrorMessages = [...]struct {\n", prefix)
-	fmt.Fprintf(ftable, "\tstate int\n")
-	fmt.Fprintf(ftable, "\ttoken int\n")
-	fmt.Fprintf(ftable, "\tmsg   string\n")
-	fmt.Fprintf(ftable, "}{\n")
-	for _, error := range errors {
-		lineno = error.lineno
-		state, token := runMachine(error.tokens)
-		fmt.Fprintf(ftable, "\t{%v, %v, %s},\n", state, token, error.msg)
-	}
-	fmt.Fprintf(ftable, "}\n")
-
-	// copy parser text
-	ch := getrune(finput)
-	for ch != EOF {
-		ftable.WriteRune(ch)
-		ch = getrune(finput)
-	}
-
-	// copy yaccpar
-	if !lflag {
-		fmt.Fprintf(ftable, "\n//line yaccpar:1\n")
-	}
-
-	parts := strings.SplitN(yaccpar, prefix+"run()", 2)
-	fmt.Fprintf(ftable, "%v", parts[0])
-	ftable.Write(fcode.Bytes())
-	fmt.Fprintf(ftable, "%v", parts[1])
-}
-
-func runMachine(tokens []string) (state, token int) {
-	var stack []int
-	i := 0
-	token = -1
-
-Loop:
-	if token < 0 {
-		token = chfind(2, tokens[i])
-		i++
-	}
-
-	row := stateTable[state]
-
-	c := token
-	if token >= NTBASE {
-		c = token - NTBASE + ntokens
-	}
-	action := row.actions[c]
-	if action == 0 {
-		action = row.defaultAction
-	}
-
-	switch {
-	case action == ACCEPTCODE:
-		errorf("tokens are accepted")
-		return
-	case action == ERRCODE:
-		if token >= NTBASE {
-			errorf("error at non-terminal token %s", symnam(token))
-		}
-		return
-	case action > 0:
-		// Shift to state action.
-		stack = append(stack, state)
-		state = action
-		token = -1
-		goto Loop
-	default:
-		// Reduce by production -action.
-		prod := prdptr[-action]
-		if rhsLen := len(prod) - 2; rhsLen > 0 {
-			n := len(stack) - rhsLen
-			state = stack[n]
-			stack = stack[:n]
-		}
-		if token >= 0 {
-			i--
-		}
-		token = prod[0]
-		goto Loop
-	}
-}
-
-func arout(s string, v []int, n int) {
-	s = prefix + s
-	fmt.Fprintf(ftable, "var %v = [...]int{\n", s)
-	for i := 0; i < n; i++ {
-		if i%10 == 0 {
-			fmt.Fprintf(ftable, "\n\t")
-		} else {
-			ftable.WriteRune(' ')
-		}
-		fmt.Fprintf(ftable, "%d,", v[i])
-	}
-	fmt.Fprintf(ftable, "\n}\n")
-}
-
-//
-// output the summary on y.output
-//
-func summary() {
-	if foutput != nil {
-		fmt.Fprintf(foutput, "\n%v terminals, %v nonterminals\n", ntokens, nnonter+1)
-		fmt.Fprintf(foutput, "%v grammar rules, %v/%v states\n", nprod, nstate, NSTATES)
-		fmt.Fprintf(foutput, "%v shift/reduce, %v reduce/reduce conflicts reported\n", zzsrconf, zzrrconf)
-		fmt.Fprintf(foutput, "%v working sets used\n", len(wsets))
-		fmt.Fprintf(foutput, "memory: parser %v/%v\n", memp, ACTSIZE)
-		fmt.Fprintf(foutput, "%v extra closures\n", zzclose-2*nstate)
-		fmt.Fprintf(foutput, "%v shift entries, %v exceptions\n", zzacent, zzexcp)
-		fmt.Fprintf(foutput, "%v goto entries\n", zzgoent)
-		fmt.Fprintf(foutput, "%v entries saved by goto default\n", zzgobest)
-	}
-	if zzsrconf != 0 || zzrrconf != 0 {
-		fmt.Printf("\nconflicts: ")
-		if zzsrconf != 0 {
-			fmt.Printf("%v shift/reduce", zzsrconf)
-		}
-		if zzsrconf != 0 && zzrrconf != 0 {
-			fmt.Printf(", ")
-		}
-		if zzrrconf != 0 {
-			fmt.Printf("%v reduce/reduce", zzrrconf)
-		}
-		fmt.Printf("\n")
-	}
-}
-
-//
-// write optimizer summary
-//
-func osummary() {
-	if foutput == nil {
-		return
-	}
-	i := 0
-	for p := maxa; p >= 0; p-- {
-		if amem[p] == 0 {
-			i++
-		}
-	}
-
-	fmt.Fprintf(foutput, "Optimizer space used: output %v/%v\n", maxa+1, ACTSIZE)
-	fmt.Fprintf(foutput, "%v table entries, %v zero\n", maxa+1, i)
-	fmt.Fprintf(foutput, "maximum spread: %v, maximum offset: %v\n", maxspr, maxoff)
-}
-
-//
-// copies and protects "'s in q
-//
-func chcopy(q string) string {
-	s := ""
-	i := 0
-	j := 0
-	for i = 0; i < len(q); i++ {
-		if q[i] == '"' {
-			s += q[j:i] + "\\"
-			j = i
-		}
-	}
-	return s + q[j:i]
-}
-
-func usage() {
-	fmt.Fprintf(stderr, "usage: yacc [-o output] [-v parsetable] input\n")
-	exit(1)
-}
-
-func bitset(set Lkset, bit int) int { return set[bit>>5] & (1 << uint(bit&31)) }
-
-func setbit(set Lkset, bit int) { set[bit>>5] |= (1 << uint(bit&31)) }
-
-func mkset() Lkset { return make([]int, tbitset) }
-
-//
-// set a to the union of a and b
-// return 1 if b is not a subset of a, 0 otherwise
-//
-func setunion(a, b []int) int {
-	sub := 0
-	for i := 0; i < tbitset; i++ {
-		x := a[i]
-		y := x | b[i]
-		a[i] = y
-		if y != x {
-			sub = 1
-		}
-	}
-	return sub
-}
-
-func prlook(p Lkset) {
-	if p == nil {
-		fmt.Fprintf(foutput, "\tNULL")
-		return
-	}
-	fmt.Fprintf(foutput, " { ")
-	for j := 0; j <= ntokens; j++ {
-		if bitset(p, j) != 0 {
-			fmt.Fprintf(foutput, "%v ", symnam(j))
-		}
-	}
-	fmt.Fprintf(foutput, "}")
-}
-
-//
-// utility routines
-//
-var peekrune rune
-
-func isdigit(c rune) bool { return c >= '0' && c <= '9' }
-
-func isword(c rune) bool {
-	return c >= 0xa0 || c == '_' || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
-}
-
-//
-// return 1 if 2 arrays are equal
-// return 0 if not equal
-//
-func aryeq(a []int, b []int) int {
-	n := len(a)
-	if len(b) != n {
-		return 0
-	}
-	for ll := 0; ll < n; ll++ {
-		if a[ll] != b[ll] {
-			return 0
-		}
-	}
-	return 1
-}
-
-func getrune(f *bufio.Reader) rune {
-	var r rune
-
-	if peekrune != 0 {
-		if peekrune == EOF {
-			return EOF
-		}
-		r = peekrune
-		peekrune = 0
-		return r
-	}
-
-	c, n, err := f.ReadRune()
-	if n == 0 {
-		return EOF
-	}
-	if err != nil {
-		errorf("read error: %v", err)
-	}
-	//fmt.Printf("rune = %v n=%v\n", string(c), n);
-	return c
-}
-
-func ungetrune(f *bufio.Reader, c rune) {
-	if f != finput {
-		panic("ungetc - not finput")
-	}
-	if peekrune != 0 {
-		panic("ungetc - 2nd unget")
-	}
-	peekrune = c
-}
-
-func open(s string) *bufio.Reader {
-	fi, err := os.Open(s)
-	if err != nil {
-		errorf("error opening %v: %v", s, err)
-	}
-	//fmt.Printf("open %v\n", s);
-	return bufio.NewReader(fi)
-}
-
-func create(s string) *bufio.Writer {
-	fo, err := os.Create(s)
-	if err != nil {
-		errorf("error creating %v: %v", s, err)
-	}
-	//fmt.Printf("create %v mode %v\n", s);
-	return bufio.NewWriter(fo)
-}
-
-//
-// write out error comment
-//
-func lerrorf(lineno int, s string, v ...interface{}) {
-	nerrors++
-	fmt.Fprintf(stderr, s, v...)
-	fmt.Fprintf(stderr, ": %v:%v\n", infile, lineno)
-	if fatfl != 0 {
-		summary()
-		exit(1)
-	}
-}
-
-func errorf(s string, v ...interface{}) {
-	lerrorf(lineno, s, v...)
-}
-
-func exit(status int) {
-	if ftable != nil {
-		ftable.Flush()
-		ftable = nil
-		gofmt()
-	}
-	if foutput != nil {
-		foutput.Flush()
-		foutput = nil
-	}
-	if stderr != nil {
-		stderr.Flush()
-		stderr = nil
-	}
-	os.Exit(status)
-}
-
-func gofmt() {
-	src, err := ioutil.ReadFile(oflag)
-	if err != nil {
-		return
-	}
-	src, err = format.Source(src)
-	if err != nil {
-		return
-	}
-	ioutil.WriteFile(oflag, src, 0666)
-}
-
-var yaccpar string // will be processed version of yaccpartext: s/$$/prefix/g
-var yaccpartext = `
-/*	parser for yacc output	*/
-
-var (
-	$$Debug        = 0
-	$$ErrorVerbose = false
-)
-
-type $$Lexer interface {
-	Lex(lval *$$SymType) int
-	Error(s string)
-}
-
-type $$Parser interface {
-	Parse($$Lexer) int
-	Lookahead() int
-}
-
-type $$ParserImpl struct {
-	lval  $$SymType
-	stack [$$InitialStackSize]$$SymType
-	char  int
-}
-
-func (p *$$ParserImpl) Lookahead() int {
-	return p.char
-}
-
-func $$NewParser() $$Parser {
-	return &$$ParserImpl{}
-}
-
-const $$Flag = -1000
-
-func $$Tokname(c int) string {
-	if c >= 1 && c-1 < len($$Toknames) {
-		if $$Toknames[c-1] != "" {
-			return $$Toknames[c-1]
-		}
-	}
-	return __yyfmt__.Sprintf("tok-%v", c)
-}
-
-func $$Statname(s int) string {
-	if s >= 0 && s < len($$Statenames) {
-		if $$Statenames[s] != "" {
-			return $$Statenames[s]
-		}
-	}
-	return __yyfmt__.Sprintf("state-%v", s)
-}
-
-func $$ErrorMessage(state, lookAhead int) string {
-	const TOKSTART = 4
-
-	if !$$ErrorVerbose {
-		return "syntax error"
-	}
-
-	for _, e := range $$ErrorMessages {
-		if e.state == state && e.token == lookAhead {
-			return "syntax error: " + e.msg
-		}
-	}
-
-	res := "syntax error: unexpected " + $$Tokname(lookAhead)
-
-	// To match Bison, suggest at most four expected tokens.
-	expected := make([]int, 0, 4)
-
-	// Look for shiftable tokens.
-	base := $$Pact[state]
-	for tok := TOKSTART; tok-1 < len($$Toknames); tok++ {
-		if n := base + tok; n >= 0 && n < $$Last && $$Chk[$$Act[n]] == tok {
-			if len(expected) == cap(expected) {
-				return res
-			}
-			expected = append(expected, tok)
-		}
-	}
-
-	if $$Def[state] == -2 {
-		i := 0
-		for $$Exca[i] != -1 || $$Exca[i+1] != state {
-			i += 2
-		}
-
-		// Look for tokens that we accept or reduce.
-		for i += 2; $$Exca[i] >= 0; i += 2 {
-			tok := $$Exca[i]
-			if tok < TOKSTART || $$Exca[i+1] == 0 {
-				continue
-			}
-			if len(expected) == cap(expected) {
-				return res
-			}
-			expected = append(expected, tok)
-		}
-
-		// If the default action is to accept or reduce, give up.
-		if $$Exca[i+1] != 0 {
-			return res
-		}
-	}
-
-	for i, tok := range expected {
-		if i == 0 {
-			res += ", expecting "
-		} else {
-			res += " or "
-		}
-		res += $$Tokname(tok)
-	}
-	return res
-}
-
-func $$lex1(lex $$Lexer, lval *$$SymType) (char, token int) {
-	token = 0
-	char = lex.Lex(lval)
-	if char <= 0 {
-		token = $$Tok1[0]
-		goto out
-	}
-	if char < len($$Tok1) {
-		token = $$Tok1[char]
-		goto out
-	}
-	if char >= $$Private {
-		if char < $$Private+len($$Tok2) {
-			token = $$Tok2[char-$$Private]
-			goto out
-		}
-	}
-	for i := 0; i < len($$Tok3); i += 2 {
-		token = $$Tok3[i+0]
-		if token == char {
-			token = $$Tok3[i+1]
-			goto out
-		}
-	}
-
-out:
-	if token == 0 {
-		token = $$Tok2[1] /* unknown char */
-	}
-	if $$Debug >= 3 {
-		__yyfmt__.Printf("lex %s(%d)\n", $$Tokname(token), uint(char))
-	}
-	return char, token
-}
-
-func $$Parse($$lex $$Lexer) int {
-	return $$NewParser().Parse($$lex)
-}
-
-func ($$rcvr *$$ParserImpl) Parse($$lex $$Lexer) int {
-	var $$n int
-	var $$VAL $$SymType
-	var $$Dollar []$$SymType
-	_ = $$Dollar // silence set and not used
-	$$S := $$rcvr.stack[:]
-
-	Nerrs := 0   /* number of errors */
-	Errflag := 0 /* error recovery flag */
-	$$state := 0
-	$$rcvr.char = -1
-	$$token := -1 // $$rcvr.char translated into internal numbering
-	defer func() {
-		// Make sure we report no lookahead when not parsing.
-		$$state = -1
-		$$rcvr.char = -1
-		$$token = -1
-	}()
-	$$p := -1
-	goto $$stack
-
-ret0:
-	return 0
-
-ret1:
-	return 1
-
-$$stack:
-	/* put a state and value onto the stack */
-	if $$Debug >= 4 {
-		__yyfmt__.Printf("char %v in %v\n", $$Tokname($$token), $$Statname($$state))
-	}
-
-	$$p++
-	if $$p >= len($$S) {
-		nyys := make([]$$SymType, len($$S)*2)
-		copy(nyys, $$S)
-		$$S = nyys
-	}
-	$$S[$$p] = $$VAL
-	$$S[$$p].yys = $$state
-
-$$newstate:
-	$$n = $$Pact[$$state]
-	if $$n <= $$Flag {
-		goto $$default /* simple state */
-	}
-	if $$rcvr.char < 0 {
-		$$rcvr.char, $$token = $$lex1($$lex, &$$rcvr.lval)
-	}
-	$$n += $$token
-	if $$n < 0 || $$n >= $$Last {
-		goto $$default
-	}
-	$$n = $$Act[$$n]
-	if $$Chk[$$n] == $$token { /* valid shift */
-		$$rcvr.char = -1
-		$$token = -1
-		$$VAL = $$rcvr.lval
-		$$state = $$n
-		if Errflag > 0 {
-			Errflag--
-		}
-		goto $$stack
-	}
-
-$$default:
-	/* default state action */
-	$$n = $$Def[$$state]
-	if $$n == -2 {
-		if $$rcvr.char < 0 {
-			$$rcvr.char, $$token = $$lex1($$lex, &$$rcvr.lval)
-		}
-
-		/* look through exception table */
-		xi := 0
-		for {
-			if $$Exca[xi+0] == -1 && $$Exca[xi+1] == $$state {
-				break
-			}
-			xi += 2
-		}
-		for xi += 2; ; xi += 2 {
-			$$n = $$Exca[xi+0]
-			if $$n < 0 || $$n == $$token {
-				break
-			}
-		}
-		$$n = $$Exca[xi+1]
-		if $$n < 0 {
-			goto ret0
-		}
-	}
-	if $$n == 0 {
-		/* error ... attempt to resume parsing */
-		switch Errflag {
-		case 0: /* brand new error */
-			$$lex.Error($$ErrorMessage($$state, $$token))
-			Nerrs++
-			if $$Debug >= 1 {
-				__yyfmt__.Printf("%s", $$Statname($$state))
-				__yyfmt__.Printf(" saw %s\n", $$Tokname($$token))
-			}
-			fallthrough
-
-		case 1, 2: /* incompletely recovered error ... try again */
-			Errflag = 3
-
-			/* find a state where "error" is a legal shift action */
-			for $$p >= 0 {
-				$$n = $$Pact[$$S[$$p].yys] + $$ErrCode
-				if $$n >= 0 && $$n < $$Last {
-					$$state = $$Act[$$n] /* simulate a shift of "error" */
-					if $$Chk[$$state] == $$ErrCode {
-						goto $$stack
-					}
-				}
-
-				/* the current p has no shift on "error", pop stack */
-				if $$Debug >= 2 {
-					__yyfmt__.Printf("error recovery pops state %d\n", $$S[$$p].yys)
-				}
-				$$p--
-			}
-			/* there is no state on the stack with an error shift ... abort */
-			goto ret1
-
-		case 3: /* no shift yet; clobber input char */
-			if $$Debug >= 2 {
-				__yyfmt__.Printf("error recovery discards %s\n", $$Tokname($$token))
-			}
-			if $$token == $$EofCode {
-				goto ret1
-			}
-			$$rcvr.char = -1
-			$$token = -1
-			goto $$newstate /* try again in the same state */
-		}
-	}
-
-	/* reduction by production $$n */
-	if $$Debug >= 2 {
-		__yyfmt__.Printf("reduce %v in:\n\t%v\n", $$n, $$Statname($$state))
-	}
-
-	$$nt := $$n
-	$$pt := $$p
-	_ = $$pt // guard against "declared and not used"
-
-	$$p -= $$R2[$$n]
-	// $$p is now the index of $0. Perform the default action. Iff the
-	// reduced production is ε, $1 is possibly out of range.
-	if $$p+1 >= len($$S) {
-		nyys := make([]$$SymType, len($$S)*2)
-		copy(nyys, $$S)
-		$$S = nyys
-	}
-	$$VAL = $$S[$$p+1]
-
-	/* consult goto table to find next state */
-	$$n = $$R1[$$n]
-	$$g := $$Pgo[$$n]
-	$$j := $$g + $$S[$$p].yys + 1
-
-	if $$j >= $$Last {
-		$$state = $$Act[$$g]
-	} else {
-		$$state = $$Act[$$j]
-		if $$Chk[$$state] != -$$n {
-			$$state = $$Act[$$g]
-		}
-	}
-	// dummy call; replaced with literal code
-	$$run()
-	goto $$stack /* stack new state and value */
-}
-`
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/callees.go b/installer/vendor/golang.org/x/tools/cmd/guru/callees.go
deleted file mode 100644
index 7ab1dba5f8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/callees.go
+++ /dev/null
@@ -1,257 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// Callees reports the possible callees of the function call site
-// identified by the specified source location.
-func callees(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, true) // needs exact pos
-	if err != nil {
-		return err
-	}
-
-	// Determine the enclosing call for the specified position.
-	var e *ast.CallExpr
-	for _, n := range qpos.path {
-		if e, _ = n.(*ast.CallExpr); e != nil {
-			break
-		}
-	}
-	if e == nil {
-		return fmt.Errorf("there is no function call here")
-	}
-	// TODO(adonovan): issue an error if the call is "too far
-	// away" from the current selection, as this most likely is
-	// not what the user intended.
-
-	// Reject type conversions.
-	if qpos.info.Types[e.Fun].IsType() {
-		return fmt.Errorf("this is a type conversion, not a function call")
-	}
-
-	// Deal with obviously static calls before constructing SSA form.
-	// Some static calls may yet require SSA construction,
-	// e.g.  f := func(){}; f().
-	switch funexpr := unparen(e.Fun).(type) {
-	case *ast.Ident:
-		switch obj := qpos.info.Uses[funexpr].(type) {
-		case *types.Builtin:
-			// Reject calls to built-ins.
-			return fmt.Errorf("this is a call to the built-in '%s' operator", obj.Name())
-		case *types.Func:
-			// This is a static function call
-			q.Output(lprog.Fset, &calleesTypesResult{
-				site:   e,
-				callee: obj,
-			})
-			return nil
-		}
-	case *ast.SelectorExpr:
-		sel := qpos.info.Selections[funexpr]
-		if sel == nil {
-			// qualified identifier.
-			// May refer to top level function variable
-			// or to top level function.
-			callee := qpos.info.Uses[funexpr.Sel]
-			if obj, ok := callee.(*types.Func); ok {
-				q.Output(lprog.Fset, &calleesTypesResult{
-					site:   e,
-					callee: obj,
-				})
-				return nil
-			}
-		} else if sel.Kind() == types.MethodVal {
-			// Inspect the receiver type of the selected method.
-			// If it is concrete, the call is statically dispatched.
-			// (Due to implicit field selections, it is not enough to look
-			// at sel.Recv(), the type of the actual receiver expression.)
-			method := sel.Obj().(*types.Func)
-			recvtype := method.Type().(*types.Signature).Recv().Type()
-			if !types.IsInterface(recvtype) {
-				// static method call
-				q.Output(lprog.Fset, &calleesTypesResult{
-					site:   e,
-					callee: method,
-				})
-				return nil
-			}
-		}
-	}
-
-	prog := ssautil.CreateProgram(lprog, ssa.GlobalDebug)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	pkg := prog.Package(qpos.info.Pkg)
-	if pkg == nil {
-		return fmt.Errorf("no SSA package")
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	// Ascertain calling function and call site.
-	callerFn := ssa.EnclosingFunction(pkg, qpos.path)
-	if callerFn == nil {
-		return fmt.Errorf("no SSA function built for this location (dead code?)")
-	}
-
-	// Find the call site.
-	site, err := findCallSite(callerFn, e)
-	if err != nil {
-		return err
-	}
-
-	funcs, err := findCallees(ptaConfig, site)
-	if err != nil {
-		return err
-	}
-
-	q.Output(lprog.Fset, &calleesSSAResult{
-		site:  site,
-		funcs: funcs,
-	})
-	return nil
-}
-
-func findCallSite(fn *ssa.Function, call *ast.CallExpr) (ssa.CallInstruction, error) {
-	instr, _ := fn.ValueForExpr(call)
-	callInstr, _ := instr.(ssa.CallInstruction)
-	if instr == nil {
-		return nil, fmt.Errorf("this call site is unreachable in this analysis")
-	}
-	return callInstr, nil
-}
-
-func findCallees(conf *pointer.Config, site ssa.CallInstruction) ([]*ssa.Function, error) {
-	// Avoid running the pointer analysis for static calls.
-	if callee := site.Common().StaticCallee(); callee != nil {
-		switch callee.String() {
-		case "runtime.SetFinalizer", "(reflect.Value).Call":
-			// The PTA treats calls to these intrinsics as dynamic.
-			// TODO(adonovan): avoid reliance on PTA internals.
-
-		default:
-			return []*ssa.Function{callee}, nil // singleton
-		}
-	}
-
-	// Dynamic call: use pointer analysis.
-	conf.BuildCallGraph = true
-	cg := ptrAnalysis(conf).CallGraph
-	cg.DeleteSyntheticNodes()
-
-	// Find all call edges from the site.
-	n := cg.Nodes[site.Parent()]
-	if n == nil {
-		return nil, fmt.Errorf("this call site is unreachable in this analysis")
-	}
-	calleesMap := make(map[*ssa.Function]bool)
-	for _, edge := range n.Out {
-		if edge.Site == site {
-			calleesMap[edge.Callee.Func] = true
-		}
-	}
-
-	// De-duplicate and sort.
-	funcs := make([]*ssa.Function, 0, len(calleesMap))
-	for f := range calleesMap {
-		funcs = append(funcs, f)
-	}
-	sort.Sort(byFuncPos(funcs))
-	return funcs, nil
-}
-
-type calleesSSAResult struct {
-	site  ssa.CallInstruction
-	funcs []*ssa.Function
-}
-
-type calleesTypesResult struct {
-	site   *ast.CallExpr
-	callee *types.Func
-}
-
-func (r *calleesSSAResult) PrintPlain(printf printfFunc) {
-	if len(r.funcs) == 0 {
-		// dynamic call on a provably nil func/interface
-		printf(r.site, "%s on nil value", r.site.Common().Description())
-	} else {
-		printf(r.site, "this %s dispatches to:", r.site.Common().Description())
-		for _, callee := range r.funcs {
-			printf(callee, "\t%s", callee)
-		}
-	}
-}
-
-func (r *calleesSSAResult) JSON(fset *token.FileSet) []byte {
-	j := &serial.Callees{
-		Pos:  fset.Position(r.site.Pos()).String(),
-		Desc: r.site.Common().Description(),
-	}
-	for _, callee := range r.funcs {
-		j.Callees = append(j.Callees, &serial.Callee{
-			Name: callee.String(),
-			Pos:  fset.Position(callee.Pos()).String(),
-		})
-	}
-	return toJSON(j)
-}
-
-func (r *calleesTypesResult) PrintPlain(printf printfFunc) {
-	printf(r.site, "this static function call dispatches to:")
-	printf(r.callee, "\t%s", r.callee.FullName())
-}
-
-func (r *calleesTypesResult) JSON(fset *token.FileSet) []byte {
-	j := &serial.Callees{
-		Pos:  fset.Position(r.site.Pos()).String(),
-		Desc: "static function call",
-	}
-	j.Callees = []*serial.Callee{
-		{
-			Name: r.callee.FullName(),
-			Pos:  fset.Position(r.callee.Pos()).String(),
-		},
-	}
-	return toJSON(j)
-}
-
-// NB: byFuncPos is not deterministic across packages since it depends on load order.
-// Use lessPos if the tests need it.
-type byFuncPos []*ssa.Function
-
-func (a byFuncPos) Len() int           { return len(a) }
-func (a byFuncPos) Less(i, j int) bool { return a[i].Pos() < a[j].Pos() }
-func (a byFuncPos) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/callers.go b/installer/vendor/golang.org/x/tools/cmd/guru/callers.go
deleted file mode 100644
index e51b6e50cf..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/callers.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// Callers reports the possible callers of the function
-// immediately enclosing the specified source location.
-//
-func callers(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	prog := ssautil.CreateProgram(lprog, 0)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	pkg := prog.Package(qpos.info.Pkg)
-	if pkg == nil {
-		return fmt.Errorf("no SSA package")
-	}
-	if !ssa.HasEnclosingFunction(pkg, qpos.path) {
-		return fmt.Errorf("this position is not inside a function")
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	target := ssa.EnclosingFunction(pkg, qpos.path)
-	if target == nil {
-		return fmt.Errorf("no SSA function built for this location (dead code?)")
-	}
-
-	// If the function is never address-taken, all calls are direct
-	// and can be found quickly by inspecting the whole SSA program.
-	cg := directCallsTo(target, entryPoints(ptaConfig.Mains))
-	if cg == nil {
-		// Run the pointer analysis, recording each
-		// call found to originate from target.
-		// (Pointer analysis may return fewer results than
-		// directCallsTo because it ignores dead code.)
-		ptaConfig.BuildCallGraph = true
-		cg = ptrAnalysis(ptaConfig).CallGraph
-	}
-	cg.DeleteSyntheticNodes()
-	edges := cg.CreateNode(target).In
-
-	// TODO(adonovan): sort + dedup calls to ensure test determinism.
-
-	q.Output(lprog.Fset, &callersResult{
-		target:    target,
-		callgraph: cg,
-		edges:     edges,
-	})
-	return nil
-}
-
-// directCallsTo inspects the whole program and returns a callgraph
-// containing edges for all direct calls to the target function.
-// directCallsTo returns nil if the function is ever address-taken.
-func directCallsTo(target *ssa.Function, entrypoints []*ssa.Function) *callgraph.Graph {
-	cg := callgraph.New(nil) // use nil as root *Function
-	targetNode := cg.CreateNode(target)
-
-	// Is the function a program entry point?
-	// If so, add edge from callgraph root.
-	for _, f := range entrypoints {
-		if f == target {
-			callgraph.AddEdge(cg.Root, nil, targetNode)
-		}
-	}
-
-	// Find receiver type (for methods).
-	var recvType types.Type
-	if recv := target.Signature.Recv(); recv != nil {
-		recvType = recv.Type()
-	}
-
-	// Find all direct calls to function,
-	// or a place where its address is taken.
-	var space [32]*ssa.Value // preallocate
-	for fn := range ssautil.AllFunctions(target.Prog) {
-		for _, b := range fn.Blocks {
-			for _, instr := range b.Instrs {
-				// Is this a method (T).f of a concrete type T
-				// whose runtime type descriptor is address-taken?
-				// (To be fully sound, we would have to check that
-				// the type doesn't make it to reflection as a
-				// subelement of some other address-taken type.)
-				if recvType != nil {
-					if mi, ok := instr.(*ssa.MakeInterface); ok {
-						if types.Identical(mi.X.Type(), recvType) {
-							return nil // T is address-taken
-						}
-						if ptr, ok := mi.X.Type().(*types.Pointer); ok &&
-							types.Identical(ptr.Elem(), recvType) {
-							return nil // *T is address-taken
-						}
-					}
-				}
-
-				// Direct call to target?
-				rands := instr.Operands(space[:0])
-				if site, ok := instr.(ssa.CallInstruction); ok &&
-					site.Common().Value == target {
-					callgraph.AddEdge(cg.CreateNode(fn), site, targetNode)
-					rands = rands[1:] // skip .Value (rands[0])
-				}
-
-				// Address-taken?
-				for _, rand := range rands {
-					if rand != nil && *rand == target {
-						return nil
-					}
-				}
-			}
-		}
-	}
-
-	return cg
-}
-
-func entryPoints(mains []*ssa.Package) []*ssa.Function {
-	var entrypoints []*ssa.Function
-	for _, pkg := range mains {
-		entrypoints = append(entrypoints, pkg.Func("init"))
-		if main := pkg.Func("main"); main != nil && pkg.Pkg.Name() == "main" {
-			entrypoints = append(entrypoints, main)
-		}
-	}
-	return entrypoints
-}
-
-type callersResult struct {
-	target    *ssa.Function
-	callgraph *callgraph.Graph
-	edges     []*callgraph.Edge
-}
-
-func (r *callersResult) PrintPlain(printf printfFunc) {
-	root := r.callgraph.Root
-	if r.edges == nil {
-		printf(r.target, "%s is not reachable in this program.", r.target)
-	} else {
-		printf(r.target, "%s is called from these %d sites:", r.target, len(r.edges))
-		for _, edge := range r.edges {
-			if edge.Caller == root {
-				printf(r.target, "the root of the call graph")
-			} else {
-				printf(edge, "\t%s from %s", edge.Description(), edge.Caller.Func)
-			}
-		}
-	}
-}
-
-func (r *callersResult) JSON(fset *token.FileSet) []byte {
-	var callers []serial.Caller
-	for _, edge := range r.edges {
-		callers = append(callers, serial.Caller{
-			Caller: edge.Caller.Func.String(),
-			Pos:    fset.Position(edge.Pos()).String(),
-			Desc:   edge.Description(),
-		})
-	}
-	return toJSON(callers)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/callstack.go b/installer/vendor/golang.org/x/tools/cmd/guru/callstack.go
deleted file mode 100644
index f1ca6a6c91..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/callstack.go
+++ /dev/null
@@ -1,141 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/token"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/static"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// Callstack displays an arbitrary path from a root of the callgraph
-// to the function at the current position.
-//
-// The information may be misleading in a context-insensitive
-// analysis. e.g. the call path X->Y->Z might be infeasible if Y never
-// calls Z when it is called from X.  TODO(adonovan): think about UI.
-//
-// TODO(adonovan): permit user to specify a starting point other than
-// the analysis root.
-//
-func callstack(q *Query) error {
-	fset := token.NewFileSet()
-	lconf := loader.Config{Fset: fset, Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	prog := ssautil.CreateProgram(lprog, 0)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	pkg := prog.Package(qpos.info.Pkg)
-	if pkg == nil {
-		return fmt.Errorf("no SSA package")
-	}
-
-	if !ssa.HasEnclosingFunction(pkg, qpos.path) {
-		return fmt.Errorf("this position is not inside a function")
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	target := ssa.EnclosingFunction(pkg, qpos.path)
-	if target == nil {
-		return fmt.Errorf("no SSA function built for this location (dead code?)")
-	}
-
-	var callpath []*callgraph.Edge
-	isEnd := func(n *callgraph.Node) bool { return n.Func == target }
-
-	// First, build a callgraph containing only static call edges,
-	// and search for an arbitrary path from a root to the target function.
-	// This is quick, and the user wants a static path if one exists.
-	cg := static.CallGraph(prog)
-	cg.DeleteSyntheticNodes()
-	for _, ep := range entryPoints(ptaConfig.Mains) {
-		callpath = callgraph.PathSearch(cg.CreateNode(ep), isEnd)
-		if callpath != nil {
-			break
-		}
-	}
-
-	// No fully static path found.
-	// Run the pointer analysis and build a complete call graph.
-	if callpath == nil {
-		ptaConfig.BuildCallGraph = true
-		cg := ptrAnalysis(ptaConfig).CallGraph
-		cg.DeleteSyntheticNodes()
-		callpath = callgraph.PathSearch(cg.Root, isEnd)
-		if callpath != nil {
-			callpath = callpath[1:] // remove synthetic edge from <root>
-		}
-	}
-
-	q.Output(fset, &callstackResult{
-		qpos:     qpos,
-		target:   target,
-		callpath: callpath,
-	})
-	return nil
-}
-
-type callstackResult struct {
-	qpos     *queryPos
-	target   *ssa.Function
-	callpath []*callgraph.Edge
-}
-
-func (r *callstackResult) PrintPlain(printf printfFunc) {
-	if r.callpath != nil {
-		printf(r.qpos, "Found a call path from root to %s", r.target)
-		printf(r.target, "%s", r.target)
-		for i := len(r.callpath) - 1; i >= 0; i-- {
-			edge := r.callpath[i]
-			printf(edge, "%s from %s", edge.Description(), edge.Caller.Func)
-		}
-	} else {
-		printf(r.target, "%s is unreachable in this analysis scope", r.target)
-	}
-}
-
-func (r *callstackResult) JSON(fset *token.FileSet) []byte {
-	var callers []serial.Caller
-	for i := len(r.callpath) - 1; i >= 0; i-- { // (innermost first)
-		edge := r.callpath[i]
-		callers = append(callers, serial.Caller{
-			Pos:    fset.Position(edge.Pos()).String(),
-			Caller: edge.Caller.Func.String(),
-			Desc:   edge.Description(),
-		})
-	}
-	return toJSON(&serial.CallStack{
-		Pos:     fset.Position(r.target.Pos()).String(),
-		Target:  r.target.String(),
-		Callers: callers,
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/definition.go b/installer/vendor/golang.org/x/tools/cmd/guru/definition.go
deleted file mode 100644
index 46d48060b1..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/definition.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	pathpkg "path"
-	"path/filepath"
-	"strconv"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-)
-
-// definition reports the location of the definition of an identifier.
-func definition(q *Query) error {
-	// First try the simple resolution done by parser.
-	// It only works for intra-file references but it is very fast.
-	// (Extending this approach to all the files of the package,
-	// resolved using ast.NewPackage, was not worth the effort.)
-	{
-		qpos, err := fastQueryPos(q.Build, q.Pos)
-		if err != nil {
-			return err
-		}
-
-		id, _ := qpos.path[0].(*ast.Ident)
-		if id == nil {
-			return fmt.Errorf("no identifier here")
-		}
-
-		// Did the parser resolve it to a local object?
-		if obj := id.Obj; obj != nil && obj.Pos().IsValid() {
-			q.Output(qpos.fset, &definitionResult{
-				pos:   obj.Pos(),
-				descr: fmt.Sprintf("%s %s", obj.Kind, obj.Name),
-			})
-			return nil // success
-		}
-
-		// Qualified identifier?
-		if pkg := packageForQualIdent(qpos.path, id); pkg != "" {
-			srcdir := filepath.Dir(qpos.fset.File(qpos.start).Name())
-			tok, pos, err := findPackageMember(q.Build, qpos.fset, srcdir, pkg, id.Name)
-			if err != nil {
-				return err
-			}
-			q.Output(qpos.fset, &definitionResult{
-				pos:   pos,
-				descr: fmt.Sprintf("%s %s.%s", tok, pkg, id.Name),
-			})
-			return nil // success
-		}
-
-		// Fall back on the type checker.
-	}
-
-	// Run the type checker.
-	lconf := loader.Config{Build: q.Build}
-	allowErrors(&lconf)
-
-	if _, err := importQueryPackage(q.Pos, &lconf); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := lconf.Load()
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	id, _ := qpos.path[0].(*ast.Ident)
-	if id == nil {
-		return fmt.Errorf("no identifier here")
-	}
-
-	// Look up the declaration of this identifier.
-	// If id is an anonymous field declaration,
-	// it is both a use of a type and a def of a field;
-	// prefer the use in that case.
-	obj := qpos.info.Uses[id]
-	if obj == nil {
-		obj = qpos.info.Defs[id]
-		if obj == nil {
-			// Happens for y in "switch y := x.(type)",
-			// and the package declaration,
-			// but I think that's all.
-			return fmt.Errorf("no object for identifier")
-		}
-	}
-
-	if !obj.Pos().IsValid() {
-		return fmt.Errorf("%s is built in", obj.Name())
-	}
-
-	q.Output(lprog.Fset, &definitionResult{
-		pos:   obj.Pos(),
-		descr: qpos.objectString(obj),
-	})
-	return nil
-}
-
-// packageForQualIdent returns the package p if id is X in a qualified
-// identifier p.X; it returns "" otherwise.
-//
-// Precondition: id is path[0], and the parser did not resolve id to a
-// local object.  For speed, packageForQualIdent assumes that p is a
-// package iff it is the basename of an import path (and not, say, a
-// package-level decl in another file or a predeclared identifier).
-func packageForQualIdent(path []ast.Node, id *ast.Ident) string {
-	if sel, ok := path[1].(*ast.SelectorExpr); ok && sel.Sel == id && ast.IsExported(id.Name) {
-		if pkgid, ok := sel.X.(*ast.Ident); ok && pkgid.Obj == nil {
-			f := path[len(path)-1].(*ast.File)
-			for _, imp := range f.Imports {
-				path, _ := strconv.Unquote(imp.Path.Value)
-				if imp.Name != nil {
-					if imp.Name.Name == pkgid.Name {
-						return path // renaming import
-					}
-				} else if pathpkg.Base(path) == pkgid.Name {
-					return path // ordinary import
-				}
-			}
-		}
-	}
-	return ""
-}
-
-// findPackageMember returns the type and position of the declaration of
-// pkg.member by loading and parsing the files of that package.
-// srcdir is the directory in which the import appears.
-func findPackageMember(ctxt *build.Context, fset *token.FileSet, srcdir, pkg, member string) (token.Token, token.Pos, error) {
-	bp, err := ctxt.Import(pkg, srcdir, 0)
-	if err != nil {
-		return 0, token.NoPos, err // no files for package
-	}
-
-	// TODO(adonovan): opt: parallelize.
-	for _, fname := range bp.GoFiles {
-		filename := filepath.Join(bp.Dir, fname)
-
-		// Parse the file, opening it the file via the build.Context
-		// so that we observe the effects of the -modified flag.
-		f, _ := buildutil.ParseFile(fset, ctxt, nil, ".", filename, parser.Mode(0))
-		if f == nil {
-			continue
-		}
-
-		// Find a package-level decl called 'member'.
-		for _, decl := range f.Decls {
-			switch decl := decl.(type) {
-			case *ast.GenDecl:
-				for _, spec := range decl.Specs {
-					switch spec := spec.(type) {
-					case *ast.ValueSpec:
-						// const or var
-						for _, id := range spec.Names {
-							if id.Name == member {
-								return decl.Tok, id.Pos(), nil
-							}
-						}
-					case *ast.TypeSpec:
-						if spec.Name.Name == member {
-							return token.TYPE, spec.Name.Pos(), nil
-						}
-					}
-				}
-			case *ast.FuncDecl:
-				if decl.Recv == nil && decl.Name.Name == member {
-					return token.FUNC, decl.Name.Pos(), nil
-				}
-			}
-		}
-	}
-
-	return 0, token.NoPos, fmt.Errorf("couldn't find declaration of %s in %q", member, pkg)
-}
-
-type definitionResult struct {
-	pos   token.Pos // (nonzero) location of definition
-	descr string    // description of object it denotes
-}
-
-func (r *definitionResult) PrintPlain(printf printfFunc) {
-	printf(r.pos, "defined here as %s", r.descr)
-}
-
-func (r *definitionResult) JSON(fset *token.FileSet) []byte {
-	return toJSON(&serial.Definition{
-		Desc:   r.descr,
-		ObjPos: fset.Position(r.pos).String(),
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/describe.go b/installer/vendor/golang.org/x/tools/cmd/guru/describe.go
deleted file mode 100644
index dd32911de5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/describe.go
+++ /dev/null
@@ -1,899 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"os"
-	"strings"
-	"unicode/utf8"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// describe describes the syntax node denoted by the query position,
-// including:
-// - its syntactic category
-// - the definition of its referent (for identifiers) [now redundant]
-// - its type, fields, and methods (for an expression or type expression)
-//
-func describe(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-	allowErrors(&lconf)
-
-	if _, err := importQueryPackage(q.Pos, &lconf); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := lconf.Load()
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, true) // (need exact pos)
-	if err != nil {
-		return err
-	}
-
-	if false { // debugging
-		fprintf(os.Stderr, lprog.Fset, qpos.path[0], "you selected: %s %s",
-			astutil.NodeDescription(qpos.path[0]), pathToString(qpos.path))
-	}
-
-	var qr QueryResult
-	path, action := findInterestingNode(qpos.info, qpos.path)
-	switch action {
-	case actionExpr:
-		qr, err = describeValue(qpos, path)
-
-	case actionType:
-		qr, err = describeType(qpos, path)
-
-	case actionPackage:
-		qr, err = describePackage(qpos, path)
-
-	case actionStmt:
-		qr, err = describeStmt(qpos, path)
-
-	case actionUnknown:
-		qr = &describeUnknownResult{path[0]}
-
-	default:
-		panic(action) // unreachable
-	}
-	if err != nil {
-		return err
-	}
-	q.Output(lprog.Fset, qr)
-	return nil
-}
-
-type describeUnknownResult struct {
-	node ast.Node
-}
-
-func (r *describeUnknownResult) PrintPlain(printf printfFunc) {
-	// Nothing much to say about misc syntax.
-	printf(r.node, "%s", astutil.NodeDescription(r.node))
-}
-
-func (r *describeUnknownResult) JSON(fset *token.FileSet) []byte {
-	return toJSON(&serial.Describe{
-		Desc: astutil.NodeDescription(r.node),
-		Pos:  fset.Position(r.node.Pos()).String(),
-	})
-}
-
-type action int
-
-const (
-	actionUnknown action = iota // None of the below
-	actionExpr                  // FuncDecl, true Expr or Ident(types.{Const,Var})
-	actionType                  // type Expr or Ident(types.TypeName).
-	actionStmt                  // Stmt or Ident(types.Label)
-	actionPackage               // Ident(types.Package) or ImportSpec
-)
-
-// findInterestingNode classifies the syntax node denoted by path as one of:
-//    - an expression, part of an expression or a reference to a constant
-//      or variable;
-//    - a type, part of a type, or a reference to a named type;
-//    - a statement, part of a statement, or a label referring to a statement;
-//    - part of a package declaration or import spec.
-//    - none of the above.
-// and returns the most "interesting" associated node, which may be
-// the same node, an ancestor or a descendent.
-//
-func findInterestingNode(pkginfo *loader.PackageInfo, path []ast.Node) ([]ast.Node, action) {
-	// TODO(adonovan): integrate with go/types/stdlib_test.go and
-	// apply this to every AST node we can find to make sure it
-	// doesn't crash.
-
-	// TODO(adonovan): audit for ParenExpr safety, esp. since we
-	// traverse up and down.
-
-	// TODO(adonovan): if the users selects the "." in
-	// "fmt.Fprintf()", they'll get an ambiguous selection error;
-	// we won't even reach here.  Can we do better?
-
-	// TODO(adonovan): describing a field within 'type T struct {...}'
-	// describes the (anonymous) struct type and concludes "no methods".
-	// We should ascend to the enclosing type decl, if any.
-
-	for len(path) > 0 {
-		switch n := path[0].(type) {
-		case *ast.GenDecl:
-			if len(n.Specs) == 1 {
-				// Descend to sole {Import,Type,Value}Spec child.
-				path = append([]ast.Node{n.Specs[0]}, path...)
-				continue
-			}
-			return path, actionUnknown // uninteresting
-
-		case *ast.FuncDecl:
-			// Descend to function name.
-			path = append([]ast.Node{n.Name}, path...)
-			continue
-
-		case *ast.ImportSpec:
-			return path, actionPackage
-
-		case *ast.ValueSpec:
-			if len(n.Names) == 1 {
-				// Descend to sole Ident child.
-				path = append([]ast.Node{n.Names[0]}, path...)
-				continue
-			}
-			return path, actionUnknown // uninteresting
-
-		case *ast.TypeSpec:
-			// Descend to type name.
-			path = append([]ast.Node{n.Name}, path...)
-			continue
-
-		case ast.Stmt:
-			return path, actionStmt
-
-		case *ast.ArrayType,
-			*ast.StructType,
-			*ast.FuncType,
-			*ast.InterfaceType,
-			*ast.MapType,
-			*ast.ChanType:
-			return path, actionType
-
-		case *ast.Comment, *ast.CommentGroup, *ast.File, *ast.KeyValueExpr, *ast.CommClause:
-			return path, actionUnknown // uninteresting
-
-		case *ast.Ellipsis:
-			// Continue to enclosing node.
-			// e.g. [...]T in ArrayType
-			//      f(x...) in CallExpr
-			//      f(x...T) in FuncType
-
-		case *ast.Field:
-			// TODO(adonovan): this needs more thought,
-			// since fields can be so many things.
-			if len(n.Names) == 1 {
-				// Descend to sole Ident child.
-				path = append([]ast.Node{n.Names[0]}, path...)
-				continue
-			}
-			// Zero names (e.g. anon field in struct)
-			// or multiple field or param names:
-			// continue to enclosing field list.
-
-		case *ast.FieldList:
-			// Continue to enclosing node:
-			// {Struct,Func,Interface}Type or FuncDecl.
-
-		case *ast.BasicLit:
-			if _, ok := path[1].(*ast.ImportSpec); ok {
-				return path[1:], actionPackage
-			}
-			return path, actionExpr
-
-		case *ast.SelectorExpr:
-			// TODO(adonovan): use Selections info directly.
-			if pkginfo.Uses[n.Sel] == nil {
-				// TODO(adonovan): is this reachable?
-				return path, actionUnknown
-			}
-			// Descend to .Sel child.
-			path = append([]ast.Node{n.Sel}, path...)
-			continue
-
-		case *ast.Ident:
-			switch pkginfo.ObjectOf(n).(type) {
-			case *types.PkgName:
-				return path, actionPackage
-
-			case *types.Const:
-				return path, actionExpr
-
-			case *types.Label:
-				return path, actionStmt
-
-			case *types.TypeName:
-				return path, actionType
-
-			case *types.Var:
-				// For x in 'struct {x T}', return struct type, for now.
-				if _, ok := path[1].(*ast.Field); ok {
-					_ = path[2].(*ast.FieldList) // assertion
-					if _, ok := path[3].(*ast.StructType); ok {
-						return path[3:], actionType
-					}
-				}
-				return path, actionExpr
-
-			case *types.Func:
-				return path, actionExpr
-
-			case *types.Builtin:
-				// For reference to built-in function, return enclosing call.
-				path = path[1:] // ascend to enclosing function call
-				continue
-
-			case *types.Nil:
-				return path, actionExpr
-			}
-
-			// No object.
-			switch path[1].(type) {
-			case *ast.SelectorExpr:
-				// Return enclosing selector expression.
-				return path[1:], actionExpr
-
-			case *ast.Field:
-				// TODO(adonovan): test this.
-				// e.g. all f in:
-				//  struct { f, g int }
-				//  interface { f() }
-				//  func (f T) method(f, g int) (f, g bool)
-				//
-				// switch path[3].(type) {
-				// case *ast.FuncDecl:
-				// case *ast.StructType:
-				// case *ast.InterfaceType:
-				// }
-				//
-				// return path[1:], actionExpr
-				//
-				// Unclear what to do with these.
-				// Struct.Fields             -- field
-				// Interface.Methods         -- field
-				// FuncType.{Params.Results} -- actionExpr
-				// FuncDecl.Recv             -- actionExpr
-
-			case *ast.File:
-				// 'package foo'
-				return path, actionPackage
-
-			case *ast.ImportSpec:
-				return path[1:], actionPackage
-
-			default:
-				// e.g. blank identifier
-				// or y in "switch y := x.(type)"
-				// or code in a _test.go file that's not part of the package.
-				return path, actionUnknown
-			}
-
-		case *ast.StarExpr:
-			if pkginfo.Types[n].IsType() {
-				return path, actionType
-			}
-			return path, actionExpr
-
-		case ast.Expr:
-			// All Expr but {BasicLit,Ident,StarExpr} are
-			// "true" expressions that evaluate to a value.
-			return path, actionExpr
-		}
-
-		// Ascend to parent.
-		path = path[1:]
-	}
-
-	return nil, actionUnknown // unreachable
-}
-
-func describeValue(qpos *queryPos, path []ast.Node) (*describeValueResult, error) {
-	var expr ast.Expr
-	var obj types.Object
-	switch n := path[0].(type) {
-	case *ast.ValueSpec:
-		// ambiguous ValueSpec containing multiple names
-		return nil, fmt.Errorf("multiple value specification")
-	case *ast.Ident:
-		obj = qpos.info.ObjectOf(n)
-		expr = n
-	case ast.Expr:
-		expr = n
-	default:
-		// TODO(adonovan): is this reachable?
-		return nil, fmt.Errorf("unexpected AST for expr: %T", n)
-	}
-
-	typ := qpos.info.TypeOf(expr)
-	if typ == nil {
-		typ = types.Typ[types.Invalid]
-	}
-	constVal := qpos.info.Types[expr].Value
-	if c, ok := obj.(*types.Const); ok {
-		constVal = c.Val()
-	}
-
-	return &describeValueResult{
-		qpos:     qpos,
-		expr:     expr,
-		typ:      typ,
-		constVal: constVal,
-		obj:      obj,
-		methods:  accessibleMethods(typ, qpos.info.Pkg),
-		fields:   accessibleFields(typ, qpos.info.Pkg),
-	}, nil
-}
-
-type describeValueResult struct {
-	qpos     *queryPos
-	expr     ast.Expr     // query node
-	typ      types.Type   // type of expression
-	constVal exact.Value  // value of expression, if constant
-	obj      types.Object // var/func/const object, if expr was Ident
-	methods  []*types.Selection
-	fields   []describeField
-}
-
-func (r *describeValueResult) PrintPlain(printf printfFunc) {
-	var prefix, suffix string
-	if r.constVal != nil {
-		suffix = fmt.Sprintf(" of value %s", r.constVal)
-	}
-	switch obj := r.obj.(type) {
-	case *types.Func:
-		if recv := obj.Type().(*types.Signature).Recv(); recv != nil {
-			if _, ok := recv.Type().Underlying().(*types.Interface); ok {
-				prefix = "interface method "
-			} else {
-				prefix = "method "
-			}
-		}
-	}
-
-	// Describe the expression.
-	if r.obj != nil {
-		if r.obj.Pos() == r.expr.Pos() {
-			// defining ident
-			printf(r.expr, "definition of %s%s%s", prefix, r.qpos.objectString(r.obj), suffix)
-		} else {
-			// referring ident
-			printf(r.expr, "reference to %s%s%s", prefix, r.qpos.objectString(r.obj), suffix)
-			if def := r.obj.Pos(); def != token.NoPos {
-				printf(def, "defined here")
-			}
-		}
-	} else {
-		desc := astutil.NodeDescription(r.expr)
-		if suffix != "" {
-			// constant expression
-			printf(r.expr, "%s%s", desc, suffix)
-		} else {
-			// non-constant expression
-			printf(r.expr, "%s of type %s", desc, r.qpos.typeString(r.typ))
-		}
-	}
-
-	printMethods(printf, r.expr, r.methods)
-	printFields(printf, r.expr, r.fields)
-}
-
-func (r *describeValueResult) JSON(fset *token.FileSet) []byte {
-	var value, objpos string
-	if r.constVal != nil {
-		value = r.constVal.String()
-	}
-	if r.obj != nil {
-		objpos = fset.Position(r.obj.Pos()).String()
-	}
-
-	return toJSON(&serial.Describe{
-		Desc:   astutil.NodeDescription(r.expr),
-		Pos:    fset.Position(r.expr.Pos()).String(),
-		Detail: "value",
-		Value: &serial.DescribeValue{
-			Type:   r.qpos.typeString(r.typ),
-			Value:  value,
-			ObjPos: objpos,
-		},
-	})
-}
-
-// ---- TYPE ------------------------------------------------------------
-
-func describeType(qpos *queryPos, path []ast.Node) (*describeTypeResult, error) {
-	var description string
-	var typ types.Type
-	switch n := path[0].(type) {
-	case *ast.Ident:
-		obj := qpos.info.ObjectOf(n).(*types.TypeName)
-		typ = obj.Type()
-		if isAlias(obj) {
-			description = "alias of "
-		} else if obj.Pos() == n.Pos() {
-			description = "definition of " // (Named type)
-		} else if _, ok := typ.(*types.Basic); ok {
-			description = "reference to built-in "
-		} else {
-			description = "reference to " // (Named type)
-		}
-
-	case ast.Expr:
-		typ = qpos.info.TypeOf(n)
-
-	default:
-		// Unreachable?
-		return nil, fmt.Errorf("unexpected AST for type: %T", n)
-	}
-
-	description = description + "type " + qpos.typeString(typ)
-
-	// Show sizes for structs and named types (it's fairly obvious for others).
-	switch typ.(type) {
-	case *types.Named, *types.Struct:
-		szs := types.StdSizes{WordSize: 8, MaxAlign: 8} // assume amd64
-		description = fmt.Sprintf("%s (size %d, align %d)", description,
-			szs.Sizeof(typ), szs.Alignof(typ))
-	}
-
-	return &describeTypeResult{
-		qpos:        qpos,
-		node:        path[0],
-		description: description,
-		typ:         typ,
-		methods:     accessibleMethods(typ, qpos.info.Pkg),
-		fields:      accessibleFields(typ, qpos.info.Pkg),
-	}, nil
-}
-
-type describeTypeResult struct {
-	qpos        *queryPos
-	node        ast.Node
-	description string
-	typ         types.Type
-	methods     []*types.Selection
-	fields      []describeField
-}
-
-type describeField struct {
-	implicits []*types.Named
-	field     *types.Var
-}
-
-func printMethods(printf printfFunc, node ast.Node, methods []*types.Selection) {
-	if len(methods) > 0 {
-		printf(node, "Methods:")
-	}
-	for _, meth := range methods {
-		// Print the method type relative to the package
-		// in which it was defined, not the query package,
-		printf(meth.Obj(), "\t%s",
-			types.SelectionString(meth, types.RelativeTo(meth.Obj().Pkg())))
-	}
-}
-
-func printFields(printf printfFunc, node ast.Node, fields []describeField) {
-	if len(fields) > 0 {
-		printf(node, "Fields:")
-	}
-
-	// Align the names and the types (requires two passes).
-	var width int
-	var names []string
-	for _, f := range fields {
-		var buf bytes.Buffer
-		for _, fld := range f.implicits {
-			buf.WriteString(fld.Obj().Name())
-			buf.WriteByte('.')
-		}
-		buf.WriteString(f.field.Name())
-		name := buf.String()
-		if n := utf8.RuneCountInString(name); n > width {
-			width = n
-		}
-		names = append(names, name)
-	}
-
-	for i, f := range fields {
-		// Print the field type relative to the package
-		// in which it was defined, not the query package,
-		printf(f.field, "\t%*s %s", -width, names[i],
-			types.TypeString(f.field.Type(), types.RelativeTo(f.field.Pkg())))
-	}
-}
-
-func (r *describeTypeResult) PrintPlain(printf printfFunc) {
-	printf(r.node, "%s", r.description)
-
-	// Show the underlying type for a reference to a named type.
-	if nt, ok := r.typ.(*types.Named); ok && r.node.Pos() != nt.Obj().Pos() {
-		// TODO(adonovan): improve display of complex struct/interface types.
-		printf(nt.Obj(), "defined as %s", r.qpos.typeString(nt.Underlying()))
-	}
-
-	printMethods(printf, r.node, r.methods)
-	if len(r.methods) == 0 {
-		// Only report null result for type kinds
-		// capable of bearing methods.
-		switch r.typ.(type) {
-		case *types.Interface, *types.Struct, *types.Named:
-			printf(r.node, "No methods.")
-		}
-	}
-
-	printFields(printf, r.node, r.fields)
-}
-
-func (r *describeTypeResult) JSON(fset *token.FileSet) []byte {
-	var namePos, nameDef string
-	if nt, ok := r.typ.(*types.Named); ok {
-		namePos = fset.Position(nt.Obj().Pos()).String()
-		nameDef = nt.Underlying().String()
-	}
-	return toJSON(&serial.Describe{
-		Desc:   r.description,
-		Pos:    fset.Position(r.node.Pos()).String(),
-		Detail: "type",
-		Type: &serial.DescribeType{
-			Type:    r.qpos.typeString(r.typ),
-			NamePos: namePos,
-			NameDef: nameDef,
-			Methods: methodsToSerial(r.qpos.info.Pkg, r.methods, fset),
-		},
-	})
-}
-
-// ---- PACKAGE ------------------------------------------------------------
-
-func describePackage(qpos *queryPos, path []ast.Node) (*describePackageResult, error) {
-	var description string
-	var pkg *types.Package
-	switch n := path[0].(type) {
-	case *ast.ImportSpec:
-		var obj types.Object
-		if n.Name != nil {
-			obj = qpos.info.Defs[n.Name]
-		} else {
-			obj = qpos.info.Implicits[n]
-		}
-		pkgname, _ := obj.(*types.PkgName)
-		if pkgname == nil {
-			return nil, fmt.Errorf("can't import package %s", n.Path.Value)
-		}
-		pkg = pkgname.Imported()
-		description = fmt.Sprintf("import of package %q", pkg.Path())
-
-	case *ast.Ident:
-		if _, isDef := path[1].(*ast.File); isDef {
-			// e.g. package id
-			pkg = qpos.info.Pkg
-			description = fmt.Sprintf("definition of package %q", pkg.Path())
-		} else {
-			// e.g. import id "..."
-			//  or  id.F()
-			pkg = qpos.info.ObjectOf(n).(*types.PkgName).Imported()
-			description = fmt.Sprintf("reference to package %q", pkg.Path())
-		}
-
-	default:
-		// Unreachable?
-		return nil, fmt.Errorf("unexpected AST for package: %T", n)
-	}
-
-	var members []*describeMember
-	// NB: "unsafe" has no types.Package
-	if pkg != nil {
-		// Enumerate the accessible package members
-		// in lexicographic order.
-		for _, name := range pkg.Scope().Names() {
-			if pkg == qpos.info.Pkg || ast.IsExported(name) {
-				mem := pkg.Scope().Lookup(name)
-				var methods []*types.Selection
-				if mem, ok := mem.(*types.TypeName); ok {
-					methods = accessibleMethods(mem.Type(), qpos.info.Pkg)
-				}
-				members = append(members, &describeMember{
-					mem,
-					methods,
-				})
-
-			}
-		}
-	}
-
-	return &describePackageResult{qpos.fset, path[0], description, pkg, members}, nil
-}
-
-type describePackageResult struct {
-	fset        *token.FileSet
-	node        ast.Node
-	description string
-	pkg         *types.Package
-	members     []*describeMember // in lexicographic name order
-}
-
-type describeMember struct {
-	obj     types.Object
-	methods []*types.Selection // in types.MethodSet order
-}
-
-func (r *describePackageResult) PrintPlain(printf printfFunc) {
-	printf(r.node, "%s", r.description)
-
-	// Compute max width of name "column".
-	maxname := 0
-	for _, mem := range r.members {
-		if l := len(mem.obj.Name()); l > maxname {
-			maxname = l
-		}
-	}
-
-	for _, mem := range r.members {
-		printf(mem.obj, "\t%s", formatMember(mem.obj, maxname))
-		for _, meth := range mem.methods {
-			printf(meth.Obj(), "\t\t%s", types.SelectionString(meth, types.RelativeTo(r.pkg)))
-		}
-	}
-}
-
-func formatMember(obj types.Object, maxname int) string {
-	qualifier := types.RelativeTo(obj.Pkg())
-	var buf bytes.Buffer
-	fmt.Fprintf(&buf, "%-5s %-*s", tokenOf(obj), maxname, obj.Name())
-	switch obj := obj.(type) {
-	case *types.Const:
-		fmt.Fprintf(&buf, " %s = %s", types.TypeString(obj.Type(), qualifier), obj.Val())
-
-	case *types.Func:
-		fmt.Fprintf(&buf, " %s", types.TypeString(obj.Type(), qualifier))
-
-	case *types.TypeName:
-		typ := obj.Type()
-		if isAlias(obj) {
-			buf.WriteString(" = ")
-		} else {
-			buf.WriteByte(' ')
-			typ = typ.Underlying()
-		}
-		var typestr string
-		// Abbreviate long aggregate type names.
-		switch typ := typ.(type) {
-		case *types.Interface:
-			if typ.NumMethods() > 1 {
-				typestr = "interface{...}"
-			}
-		case *types.Struct:
-			if typ.NumFields() > 1 {
-				typestr = "struct{...}"
-			}
-		}
-		if typestr == "" {
-			typestr = types.TypeString(typ, qualifier)
-		}
-		buf.WriteString(typestr)
-
-	case *types.Var:
-		fmt.Fprintf(&buf, " %s", types.TypeString(obj.Type(), qualifier))
-	}
-	return buf.String()
-}
-
-func (r *describePackageResult) JSON(fset *token.FileSet) []byte {
-	var members []*serial.DescribeMember
-	for _, mem := range r.members {
-		obj := mem.obj
-		typ := obj.Type()
-		var val string
-		var alias string
-		switch obj := obj.(type) {
-		case *types.Const:
-			val = obj.Val().String()
-		case *types.TypeName:
-			if isAlias(obj) {
-				alias = "= " // kludgy
-			} else {
-				typ = typ.Underlying()
-			}
-		}
-		members = append(members, &serial.DescribeMember{
-			Name:    obj.Name(),
-			Type:    alias + typ.String(),
-			Value:   val,
-			Pos:     fset.Position(obj.Pos()).String(),
-			Kind:    tokenOf(obj),
-			Methods: methodsToSerial(r.pkg, mem.methods, fset),
-		})
-	}
-	return toJSON(&serial.Describe{
-		Desc:   r.description,
-		Pos:    fset.Position(r.node.Pos()).String(),
-		Detail: "package",
-		Package: &serial.DescribePackage{
-			Path:    r.pkg.Path(),
-			Members: members,
-		},
-	})
-}
-
-func tokenOf(o types.Object) string {
-	switch o.(type) {
-	case *types.Func:
-		return "func"
-	case *types.Var:
-		return "var"
-	case *types.TypeName:
-		return "type"
-	case *types.Const:
-		return "const"
-	case *types.PkgName:
-		return "package"
-	case *types.Builtin:
-		return "builtin" // e.g. when describing package "unsafe"
-	case *types.Nil:
-		return "nil"
-	case *types.Label:
-		return "label"
-	}
-	panic(o)
-}
-
-// ---- STATEMENT ------------------------------------------------------------
-
-func describeStmt(qpos *queryPos, path []ast.Node) (*describeStmtResult, error) {
-	var description string
-	switch n := path[0].(type) {
-	case *ast.Ident:
-		if qpos.info.Defs[n] != nil {
-			description = "labelled statement"
-		} else {
-			description = "reference to labelled statement"
-		}
-
-	default:
-		// Nothing much to say about statements.
-		description = astutil.NodeDescription(n)
-	}
-	return &describeStmtResult{qpos.fset, path[0], description}, nil
-}
-
-type describeStmtResult struct {
-	fset        *token.FileSet
-	node        ast.Node
-	description string
-}
-
-func (r *describeStmtResult) PrintPlain(printf printfFunc) {
-	printf(r.node, "%s", r.description)
-}
-
-func (r *describeStmtResult) JSON(fset *token.FileSet) []byte {
-	return toJSON(&serial.Describe{
-		Desc:   r.description,
-		Pos:    fset.Position(r.node.Pos()).String(),
-		Detail: "unknown",
-	})
-}
-
-// ------------------- Utilities -------------------
-
-// pathToString returns a string containing the concrete types of the
-// nodes in path.
-func pathToString(path []ast.Node) string {
-	var buf bytes.Buffer
-	fmt.Fprint(&buf, "[")
-	for i, n := range path {
-		if i > 0 {
-			fmt.Fprint(&buf, " ")
-		}
-		fmt.Fprint(&buf, strings.TrimPrefix(fmt.Sprintf("%T", n), "*ast."))
-	}
-	fmt.Fprint(&buf, "]")
-	return buf.String()
-}
-
-func accessibleMethods(t types.Type, from *types.Package) []*types.Selection {
-	var methods []*types.Selection
-	for _, meth := range typeutil.IntuitiveMethodSet(t, nil) {
-		if isAccessibleFrom(meth.Obj(), from) {
-			methods = append(methods, meth)
-		}
-	}
-	return methods
-}
-
-// accessibleFields returns the set of accessible
-// field selections on a value of type recv.
-func accessibleFields(recv types.Type, from *types.Package) []describeField {
-	wantField := func(f *types.Var) bool {
-		if !isAccessibleFrom(f, from) {
-			return false
-		}
-		// Check that the field is not shadowed.
-		obj, _, _ := types.LookupFieldOrMethod(recv, true, f.Pkg(), f.Name())
-		return obj == f
-	}
-
-	var fields []describeField
-	var visit func(t types.Type, stack []*types.Named)
-	visit = func(t types.Type, stack []*types.Named) {
-		tStruct, ok := deref(t).Underlying().(*types.Struct)
-		if !ok {
-			return
-		}
-	fieldloop:
-		for i := 0; i < tStruct.NumFields(); i++ {
-			f := tStruct.Field(i)
-
-			// Handle recursion through anonymous fields.
-			if f.Anonymous() {
-				tf := f.Type()
-				if ptr, ok := tf.(*types.Pointer); ok {
-					tf = ptr.Elem()
-				}
-				if named, ok := tf.(*types.Named); ok { // (be defensive)
-					// If we've already visited this named type
-					// on this path, break the cycle.
-					for _, x := range stack {
-						if x == named {
-							continue fieldloop
-						}
-					}
-					visit(f.Type(), append(stack, named))
-				}
-			}
-
-			// Save accessible fields.
-			if wantField(f) {
-				fields = append(fields, describeField{
-					implicits: append([]*types.Named(nil), stack...),
-					field:     f,
-				})
-			}
-		}
-	}
-	visit(recv, nil)
-
-	return fields
-}
-
-func isAccessibleFrom(obj types.Object, pkg *types.Package) bool {
-	return ast.IsExported(obj.Name()) || obj.Pkg() == pkg
-}
-
-func methodsToSerial(this *types.Package, methods []*types.Selection, fset *token.FileSet) []serial.DescribeMethod {
-	qualifier := types.RelativeTo(this)
-	var jmethods []serial.DescribeMethod
-	for _, meth := range methods {
-		var ser serial.DescribeMethod
-		if meth != nil { // may contain nils when called by implements (on a method)
-			ser = serial.DescribeMethod{
-				Name: types.SelectionString(meth, qualifier),
-				Pos:  fset.Position(meth.Obj().Pos()).String(),
-			}
-		}
-		jmethods = append(jmethods, ser)
-	}
-	return jmethods
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/freevars.go b/installer/vendor/golang.org/x/tools/cmd/guru/freevars.go
deleted file mode 100644
index a36d1f80bf..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/freevars.go
+++ /dev/null
@@ -1,223 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"go/ast"
-	"go/printer"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/loader"
-)
-
-// freevars displays the lexical (not package-level) free variables of
-// the selection.
-//
-// It treats A.B.C as a separate variable from A to reveal the parts
-// of an aggregate type that are actually needed.
-// This aids refactoring.
-//
-// TODO(adonovan): optionally display the free references to
-// file/package scope objects, and to objects from other packages.
-// Depending on where the resulting function abstraction will go,
-// these might be interesting.  Perhaps group the results into three
-// bands.
-//
-func freevars(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-	allowErrors(&lconf)
-
-	if _, err := importQueryPackage(q.Pos, &lconf); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := lconf.Load()
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	file := qpos.path[len(qpos.path)-1] // the enclosing file
-	fileScope := qpos.info.Scopes[file]
-	pkgScope := fileScope.Parent()
-
-	// The id and sel functions return non-nil if they denote an
-	// object o or selection o.x.y that is referenced by the
-	// selection but defined neither within the selection nor at
-	// file scope, i.e. it is in the lexical environment.
-	var id func(n *ast.Ident) types.Object
-	var sel func(n *ast.SelectorExpr) types.Object
-
-	sel = func(n *ast.SelectorExpr) types.Object {
-		switch x := unparen(n.X).(type) {
-		case *ast.SelectorExpr:
-			return sel(x)
-		case *ast.Ident:
-			return id(x)
-		}
-		return nil
-	}
-
-	id = func(n *ast.Ident) types.Object {
-		obj := qpos.info.Uses[n]
-		if obj == nil {
-			return nil // not a reference
-		}
-		if _, ok := obj.(*types.PkgName); ok {
-			return nil // imported package
-		}
-		if !(file.Pos() <= obj.Pos() && obj.Pos() <= file.End()) {
-			return nil // not defined in this file
-		}
-		scope := obj.Parent()
-		if scope == nil {
-			return nil // e.g. interface method, struct field
-		}
-		if scope == fileScope || scope == pkgScope {
-			return nil // defined at file or package scope
-		}
-		if qpos.start <= obj.Pos() && obj.Pos() <= qpos.end {
-			return nil // defined within selection => not free
-		}
-		return obj
-	}
-
-	// Maps each reference that is free in the selection
-	// to the object it refers to.
-	// The map de-duplicates repeated references.
-	refsMap := make(map[string]freevarsRef)
-
-	// Visit all the identifiers in the selected ASTs.
-	ast.Inspect(qpos.path[0], func(n ast.Node) bool {
-		if n == nil {
-			return true // popping DFS stack
-		}
-
-		// Is this node contained within the selection?
-		// (freevars permits inexact selections,
-		// like two stmts in a block.)
-		if qpos.start <= n.Pos() && n.End() <= qpos.end {
-			var obj types.Object
-			var prune bool
-			switch n := n.(type) {
-			case *ast.Ident:
-				obj = id(n)
-
-			case *ast.SelectorExpr:
-				obj = sel(n)
-				prune = true
-			}
-
-			if obj != nil {
-				var kind string
-				switch obj.(type) {
-				case *types.Var:
-					kind = "var"
-				case *types.Func:
-					kind = "func"
-				case *types.TypeName:
-					kind = "type"
-				case *types.Const:
-					kind = "const"
-				case *types.Label:
-					kind = "label"
-				default:
-					panic(obj)
-				}
-
-				typ := qpos.info.TypeOf(n.(ast.Expr))
-				ref := freevarsRef{kind, printNode(lprog.Fset, n), typ, obj}
-				refsMap[ref.ref] = ref
-
-				if prune {
-					return false // don't descend
-				}
-			}
-		}
-
-		return true // descend
-	})
-
-	refs := make([]freevarsRef, 0, len(refsMap))
-	for _, ref := range refsMap {
-		refs = append(refs, ref)
-	}
-	sort.Sort(byRef(refs))
-
-	q.Output(lprog.Fset, &freevarsResult{
-		qpos: qpos,
-		refs: refs,
-	})
-	return nil
-}
-
-type freevarsResult struct {
-	qpos *queryPos
-	refs []freevarsRef
-}
-
-type freevarsRef struct {
-	kind string
-	ref  string
-	typ  types.Type
-	obj  types.Object
-}
-
-func (r *freevarsResult) PrintPlain(printf printfFunc) {
-	if len(r.refs) == 0 {
-		printf(r.qpos, "No free identifiers.")
-	} else {
-		printf(r.qpos, "Free identifiers:")
-		qualifier := types.RelativeTo(r.qpos.info.Pkg)
-		for _, ref := range r.refs {
-			// Avoid printing "type T T".
-			var typstr string
-			if ref.kind != "type" && ref.kind != "label" {
-				typstr = " " + types.TypeString(ref.typ, qualifier)
-			}
-			printf(ref.obj, "%s %s%s", ref.kind, ref.ref, typstr)
-		}
-	}
-}
-
-func (r *freevarsResult) JSON(fset *token.FileSet) []byte {
-	var buf bytes.Buffer
-	for i, ref := range r.refs {
-		if i > 0 {
-			buf.WriteByte('\n')
-		}
-		buf.Write(toJSON(serial.FreeVar{
-			Pos:  fset.Position(ref.obj.Pos()).String(),
-			Kind: ref.kind,
-			Ref:  ref.ref,
-			Type: ref.typ.String(),
-		}))
-	}
-	return buf.Bytes()
-}
-
-// -------- utils --------
-
-type byRef []freevarsRef
-
-func (p byRef) Len() int           { return len(p) }
-func (p byRef) Less(i, j int) bool { return p[i].ref < p[j].ref }
-func (p byRef) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-
-// printNode returns the pretty-printed syntax of n.
-func printNode(fset *token.FileSet, n ast.Node) string {
-	var buf bytes.Buffer
-	printer.Fprint(&buf, fset, n)
-	return buf.String()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/guru.go b/installer/vendor/golang.org/x/tools/cmd/guru/guru.go
deleted file mode 100644
index af3a27d8e9..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/guru.go
+++ /dev/null
@@ -1,401 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-// TODO(adonovan): new queries
-// - show all statements that may update the selected lvalue
-//   (local, global, field, etc).
-// - show all places where an object of type T is created
-//   (&T{}, var t T, new(T), new(struct{array [3]T}), etc.
-
-import (
-	"encoding/json"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io"
-	"log"
-	"path/filepath"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-)
-
-type printfFunc func(pos interface{}, format string, args ...interface{})
-
-// A QueryResult is an item of output.  Each query produces a stream of
-// query results, calling Query.Output for each one.
-type QueryResult interface {
-	// JSON returns the QueryResult in JSON form.
-	JSON(fset *token.FileSet) []byte
-
-	// PrintPlain prints the QueryResult in plain text form.
-	// The implementation calls printfFunc to print each line of output.
-	PrintPlain(printf printfFunc)
-}
-
-// A QueryPos represents the position provided as input to a query:
-// a textual extent in the program's source code, the AST node it
-// corresponds to, and the package to which it belongs.
-// Instances are created by parseQueryPos.
-type queryPos struct {
-	fset       *token.FileSet
-	start, end token.Pos           // source extent of query
-	path       []ast.Node          // AST path from query node to root of ast.File
-	exact      bool                // 2nd result of PathEnclosingInterval
-	info       *loader.PackageInfo // type info for the queried package (nil for fastQueryPos)
-}
-
-// TypeString prints type T relative to the query position.
-func (qpos *queryPos) typeString(T types.Type) string {
-	return types.TypeString(T, types.RelativeTo(qpos.info.Pkg))
-}
-
-// ObjectString prints object obj relative to the query position.
-func (qpos *queryPos) objectString(obj types.Object) string {
-	return types.ObjectString(obj, types.RelativeTo(qpos.info.Pkg))
-}
-
-// A Query specifies a single guru query.
-type Query struct {
-	Pos   string         // query position
-	Build *build.Context // package loading configuration
-
-	// pointer analysis options
-	Scope      []string  // main packages in (*loader.Config).FromArgs syntax
-	PTALog     io.Writer // (optional) pointer-analysis log file
-	Reflection bool      // model reflection soundly (currently slow).
-
-	// result-printing function
-	Output func(*token.FileSet, QueryResult)
-}
-
-// Run runs an guru query and populates its Fset and Result.
-func Run(mode string, q *Query) error {
-	switch mode {
-	case "callees":
-		return callees(q)
-	case "callers":
-		return callers(q)
-	case "callstack":
-		return callstack(q)
-	case "peers":
-		return peers(q)
-	case "pointsto":
-		return pointsto(q)
-	case "whicherrs":
-		return whicherrs(q)
-	case "definition":
-		return definition(q)
-	case "describe":
-		return describe(q)
-	case "freevars":
-		return freevars(q)
-	case "implements":
-		return implements(q)
-	case "referrers":
-		return referrers(q)
-	case "what":
-		return what(q)
-	default:
-		return fmt.Errorf("invalid mode: %q", mode)
-	}
-}
-
-func setPTAScope(lconf *loader.Config, scope []string) error {
-	pkgs := buildutil.ExpandPatterns(lconf.Build, scope)
-	if len(pkgs) == 0 {
-		return fmt.Errorf("no packages specified for pointer analysis scope")
-	}
-	// The value of each entry in pkgs is true,
-	// giving ImportWithTests (not Import) semantics.
-	lconf.ImportPkgs = pkgs
-	return nil
-}
-
-// Create a pointer.Config whose scope is the initial packages of lprog
-// and their dependencies.
-func setupPTA(prog *ssa.Program, lprog *loader.Program, ptaLog io.Writer, reflection bool) (*pointer.Config, error) {
-	// For each initial package (specified on the command line),
-	// if it has a main function, analyze that,
-	// otherwise analyze its tests, if any.
-	var mains []*ssa.Package
-	for _, info := range lprog.InitialPackages() {
-		p := prog.Package(info.Pkg)
-
-		// Add package to the pointer analysis scope.
-		if p.Pkg.Name() == "main" && p.Func("main") != nil {
-			mains = append(mains, p)
-		} else if main := prog.CreateTestMainPackage(p); main != nil {
-			mains = append(mains, main)
-		}
-	}
-	if mains == nil {
-		return nil, fmt.Errorf("analysis scope has no main and no tests")
-	}
-	return &pointer.Config{
-		Log:        ptaLog,
-		Reflection: reflection,
-		Mains:      mains,
-	}, nil
-}
-
-// importQueryPackage finds the package P containing the
-// query position and tells conf to import it.
-// It returns the package's path.
-func importQueryPackage(pos string, conf *loader.Config) (string, error) {
-	fqpos, err := fastQueryPos(conf.Build, pos)
-	if err != nil {
-		return "", err // bad query
-	}
-	filename := fqpos.fset.File(fqpos.start).Name()
-
-	_, importPath, err := guessImportPath(filename, conf.Build)
-	if err != nil {
-		// Can't find GOPATH dir.
-		// Treat the query file as its own package.
-		importPath = "command-line-arguments"
-		conf.CreateFromFilenames(importPath, filename)
-	} else {
-		// Check that it's possible to load the queried package.
-		// (e.g. guru tests contain different 'package' decls in same dir.)
-		// Keep consistent with logic in loader/util.go!
-		cfg2 := *conf.Build
-		cfg2.CgoEnabled = false
-		bp, err := cfg2.Import(importPath, "", 0)
-		if err != nil {
-			return "", err // no files for package
-		}
-
-		switch pkgContainsFile(bp, filename) {
-		case 'T':
-			conf.ImportWithTests(importPath)
-		case 'X':
-			conf.ImportWithTests(importPath)
-			importPath += "_test" // for TypeCheckFuncBodies
-		case 'G':
-			conf.Import(importPath)
-		default:
-			// This happens for ad-hoc packages like
-			// $GOROOT/src/net/http/triv.go.
-			return "", fmt.Errorf("package %q doesn't contain file %s",
-				importPath, filename)
-		}
-	}
-
-	conf.TypeCheckFuncBodies = func(p string) bool { return p == importPath }
-
-	return importPath, nil
-}
-
-// pkgContainsFile reports whether file was among the packages Go
-// files, Test files, eXternal test files, or not found.
-func pkgContainsFile(bp *build.Package, filename string) byte {
-	for i, files := range [][]string{bp.GoFiles, bp.TestGoFiles, bp.XTestGoFiles} {
-		for _, file := range files {
-			if sameFile(filepath.Join(bp.Dir, file), filename) {
-				return "GTX"[i]
-			}
-		}
-	}
-	return 0 // not found
-}
-
-// ParseQueryPos parses the source query position pos and returns the
-// AST node of the loaded program lprog that it identifies.
-// If needExact, it must identify a single AST subtree;
-// this is appropriate for queries that allow fairly arbitrary syntax,
-// e.g. "describe".
-//
-func parseQueryPos(lprog *loader.Program, pos string, needExact bool) (*queryPos, error) {
-	filename, startOffset, endOffset, err := parsePos(pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// Find the named file among those in the loaded program.
-	var file *token.File
-	lprog.Fset.Iterate(func(f *token.File) bool {
-		if sameFile(filename, f.Name()) {
-			file = f
-			return false // done
-		}
-		return true // continue
-	})
-	if file == nil {
-		return nil, fmt.Errorf("file %s not found in loaded program", filename)
-	}
-
-	start, end, err := fileOffsetToPos(file, startOffset, endOffset)
-	if err != nil {
-		return nil, err
-	}
-	info, path, exact := lprog.PathEnclosingInterval(start, end)
-	if path == nil {
-		return nil, fmt.Errorf("no syntax here")
-	}
-	if needExact && !exact {
-		return nil, fmt.Errorf("ambiguous selection within %s", astutil.NodeDescription(path[0]))
-	}
-	return &queryPos{lprog.Fset, start, end, path, exact, info}, nil
-}
-
-// ---------- Utilities ----------
-
-// loadWithSoftErrors calls lconf.Load, suppressing "soft" errors.  (See Go issue 16530.)
-// TODO(adonovan): Once the loader has an option to allow soft errors,
-// replace calls to loadWithSoftErrors with loader calls with that parameter.
-func loadWithSoftErrors(lconf *loader.Config) (*loader.Program, error) {
-	lconf.AllowErrors = true
-
-	// Ideally we would just return conf.Load() here, but go/types
-	// reports certain "soft" errors that gc does not (Go issue 14596).
-	// As a workaround, we set AllowErrors=true and then duplicate
-	// the loader's error checking but allow soft errors.
-	// It would be nice if the loader API permitted "AllowErrors: soft".
-	prog, err := lconf.Load()
-	if err != nil {
-		return nil, err
-	}
-	var errpkgs []string
-	// Report hard errors in indirectly imported packages.
-	for _, info := range prog.AllPackages {
-		if containsHardErrors(info.Errors) {
-			errpkgs = append(errpkgs, info.Pkg.Path())
-		} else {
-			// Enable SSA construction for packages containing only soft errors.
-			info.TransitivelyErrorFree = true
-		}
-	}
-	if errpkgs != nil {
-		var more string
-		if len(errpkgs) > 3 {
-			more = fmt.Sprintf(" and %d more", len(errpkgs)-3)
-			errpkgs = errpkgs[:3]
-		}
-		return nil, fmt.Errorf("couldn't load packages due to errors: %s%s",
-			strings.Join(errpkgs, ", "), more)
-	}
-	return prog, err
-}
-
-func containsHardErrors(errors []error) bool {
-	for _, err := range errors {
-		if err, ok := err.(types.Error); ok && err.Soft {
-			continue
-		}
-		return true
-	}
-	return false
-}
-
-// allowErrors causes type errors to be silently ignored.
-// (Not suitable if SSA construction follows.)
-func allowErrors(lconf *loader.Config) {
-	ctxt := *lconf.Build // copy
-	ctxt.CgoEnabled = false
-	lconf.Build = &ctxt
-	lconf.AllowErrors = true
-	// AllErrors makes the parser always return an AST instead of
-	// bailing out after 10 errors and returning an empty ast.File.
-	lconf.ParserMode = parser.AllErrors
-	lconf.TypeChecker.Error = func(err error) {}
-}
-
-// ptrAnalysis runs the pointer analysis and returns its result.
-func ptrAnalysis(conf *pointer.Config) *pointer.Result {
-	result, err := pointer.Analyze(conf)
-	if err != nil {
-		panic(err) // pointer analysis internal error
-	}
-	return result
-}
-
-func unparen(e ast.Expr) ast.Expr { return astutil.Unparen(e) }
-
-// deref returns a pointer's element type; otherwise it returns typ.
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
-
-// fprintf prints to w a message of the form "location: message\n"
-// where location is derived from pos.
-//
-// pos must be one of:
-//    - a token.Pos, denoting a position
-//    - an ast.Node, denoting an interval
-//    - anything with a Pos() method:
-//         ssa.Member, ssa.Value, ssa.Instruction, types.Object, pointer.Label, etc.
-//    - a QueryPos, denoting the extent of the user's query.
-//    - nil, meaning no position at all.
-//
-// The output format is is compatible with the 'gnu'
-// compilation-error-regexp in Emacs' compilation mode.
-//
-func fprintf(w io.Writer, fset *token.FileSet, pos interface{}, format string, args ...interface{}) {
-	var start, end token.Pos
-	switch pos := pos.(type) {
-	case ast.Node:
-		start = pos.Pos()
-		end = pos.End()
-	case token.Pos:
-		start = pos
-		end = start
-	case *types.PkgName:
-		// The Pos of most PkgName objects does not coincide with an identifier,
-		// so we suppress the usual start+len(name) heuristic for types.Objects.
-		start = pos.Pos()
-		end = start
-	case types.Object:
-		start = pos.Pos()
-		end = start + token.Pos(len(pos.Name())) // heuristic
-	case interface {
-		Pos() token.Pos
-	}:
-		start = pos.Pos()
-		end = start
-	case *queryPos:
-		start = pos.start
-		end = pos.end
-	case nil:
-		// no-op
-	default:
-		panic(fmt.Sprintf("invalid pos: %T", pos))
-	}
-
-	if sp := fset.Position(start); start == end {
-		// (prints "-: " for token.NoPos)
-		fmt.Fprintf(w, "%s: ", sp)
-	} else {
-		ep := fset.Position(end)
-		// The -1 below is a concession to Emacs's broken use of
-		// inclusive (not half-open) intervals.
-		// Other editors may not want it.
-		// TODO(adonovan): add an -editor=vim|emacs|acme|auto
-		// flag; auto uses EMACS=t / VIM=... / etc env vars.
-		fmt.Fprintf(w, "%s:%d.%d-%d.%d: ",
-			sp.Filename, sp.Line, sp.Column, ep.Line, ep.Column-1)
-	}
-	fmt.Fprintf(w, format, args...)
-	io.WriteString(w, "\n")
-}
-
-func toJSON(x interface{}) []byte {
-	b, err := json.MarshalIndent(x, "", "\t")
-	if err != nil {
-		log.Fatalf("JSON error: %v", err)
-	}
-	return b
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/guru_test.go b/installer/vendor/golang.org/x/tools/cmd/guru/guru_test.go
deleted file mode 100644
index 34322552f6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/guru_test.go
+++ /dev/null
@@ -1,329 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main_test
-
-// This file defines a test framework for guru queries.
-//
-// The files beneath testdata/src/main contain Go programs containing
-// query annotations of the form:
-//
-//   @verb id "select"
-//
-// where verb is the query mode (e.g. "callers"), id is a unique name
-// for this query, and "select" is a regular expression matching the
-// substring of the current line that is the query's input selection.
-//
-// The expected output for each query is provided in the accompanying
-// .golden file.
-//
-// (Location information is not included because it's too fragile to
-// display as text.  TODO(adonovan): think about how we can test its
-// correctness, since it is critical information.)
-//
-// Run this test with:
-// 	% go test golang.org/x/tools/cmd/guru -update
-// to update the golden files.
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"testing"
-
-	guru "golang.org/x/tools/cmd/guru"
-)
-
-var updateFlag = flag.Bool("update", false, "Update the golden files.")
-
-type query struct {
-	id       string         // unique id
-	verb     string         // query mode, e.g. "callees"
-	posn     token.Position // query position
-	filename string
-	queryPos string // query position in command-line syntax
-}
-
-func parseRegexp(text string) (*regexp.Regexp, error) {
-	pattern, err := strconv.Unquote(text)
-	if err != nil {
-		return nil, fmt.Errorf("can't unquote %s", text)
-	}
-	return regexp.Compile(pattern)
-}
-
-// parseQueries parses and returns the queries in the named file.
-func parseQueries(t *testing.T, filename string) []*query {
-	filedata, err := ioutil.ReadFile(filename)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Parse the file once to discover the test queries.
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, filename, filedata, parser.ParseComments)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	lines := bytes.Split(filedata, []byte("\n"))
-
-	var queries []*query
-	queriesById := make(map[string]*query)
-
-	// Find all annotations of these forms:
-	expectRe := regexp.MustCompile(`@([a-z]+)\s+(\S+)\s+(\".*)$`) // @verb id "regexp"
-	for _, c := range f.Comments {
-		text := strings.TrimSpace(c.Text())
-		if text == "" || text[0] != '@' {
-			continue
-		}
-		posn := fset.Position(c.Pos())
-
-		// @verb id "regexp"
-		match := expectRe.FindStringSubmatch(text)
-		if match == nil {
-			t.Errorf("%s: ill-formed query: %s", posn, text)
-			continue
-		}
-
-		id := match[2]
-		if prev, ok := queriesById[id]; ok {
-			t.Errorf("%s: duplicate id %s", posn, id)
-			t.Errorf("%s: previously used here", prev.posn)
-			continue
-		}
-
-		q := &query{
-			id:       id,
-			verb:     match[1],
-			filename: filename,
-			posn:     posn,
-		}
-
-		if match[3] != `"nopos"` {
-			selectRe, err := parseRegexp(match[3])
-			if err != nil {
-				t.Errorf("%s: %s", posn, err)
-				continue
-			}
-
-			// Find text of the current line, sans query.
-			// (Queries must be // not /**/ comments.)
-			line := lines[posn.Line-1][:posn.Column-1]
-
-			// Apply regexp to current line to find input selection.
-			loc := selectRe.FindIndex(line)
-			if loc == nil {
-				t.Errorf("%s: selection pattern %s doesn't match line %q",
-					posn, match[3], string(line))
-				continue
-			}
-
-			// Assumes ASCII. TODO(adonovan): test on UTF-8.
-			linestart := posn.Offset - (posn.Column - 1)
-
-			// Compute the file offsets.
-			q.queryPos = fmt.Sprintf("%s:#%d,#%d",
-				filename, linestart+loc[0], linestart+loc[1])
-		}
-
-		queries = append(queries, q)
-		queriesById[id] = q
-	}
-
-	// Return the slice, not map, for deterministic iteration.
-	return queries
-}
-
-// doQuery poses query q to the guru and writes its response and
-// error (if any) to out.
-func doQuery(out io.Writer, q *query, json bool) {
-	fmt.Fprintf(out, "-------- @%s %s --------\n", q.verb, q.id)
-
-	var buildContext = build.Default
-	buildContext.GOPATH = "testdata"
-	pkg := filepath.Dir(strings.TrimPrefix(q.filename, "testdata/src/"))
-
-	gopathAbs, _ := filepath.Abs(buildContext.GOPATH)
-
-	var outputMu sync.Mutex // guards outputs
-	var outputs []string    // JSON objects or lines of text
-	outputFn := func(fset *token.FileSet, qr guru.QueryResult) {
-		outputMu.Lock()
-		defer outputMu.Unlock()
-		if json {
-			jsonstr := string(qr.JSON(fset))
-			// Sanitize any absolute filenames that creep in.
-			jsonstr = strings.Replace(jsonstr, gopathAbs, "$GOPATH", -1)
-			outputs = append(outputs, jsonstr)
-		} else {
-			// suppress position information
-			qr.PrintPlain(func(_ interface{}, format string, args ...interface{}) {
-				outputs = append(outputs, fmt.Sprintf(format, args...))
-			})
-		}
-	}
-
-	query := guru.Query{
-		Pos:        q.queryPos,
-		Build:      &buildContext,
-		Scope:      []string{pkg},
-		Reflection: true,
-		Output:     outputFn,
-	}
-
-	if err := guru.Run(q.verb, &query); err != nil {
-		fmt.Fprintf(out, "\nError: %s\n", err)
-		return
-	}
-
-	// In a "referrers" query, references are sorted within each
-	// package but packages are visited in arbitrary order,
-	// so for determinism we sort them.  Line 0 is a caption.
-	if q.verb == "referrers" {
-		sort.Strings(outputs[1:])
-	}
-
-	for _, output := range outputs {
-		fmt.Fprintf(out, "%s\n", output)
-	}
-
-	if !json {
-		io.WriteString(out, "\n")
-	}
-}
-
-func TestGuru(t *testing.T) {
-	switch runtime.GOOS {
-	case "android":
-		t.Skipf("skipping test on %q (no testdata dir)", runtime.GOOS)
-	case "windows":
-		t.Skipf("skipping test on %q (no /usr/bin/diff)", runtime.GOOS)
-	}
-
-	for _, filename := range []string{
-		"testdata/src/alias/alias.go", // iff guru.HasAlias (go1.9)
-		"testdata/src/calls/main.go",
-		"testdata/src/describe/main.go",
-		"testdata/src/describe/main19.go", // iff go1.9
-		"testdata/src/freevars/main.go",
-		"testdata/src/implements/main.go",
-		"testdata/src/implements-methods/main.go",
-		"testdata/src/imports/main.go",
-		"testdata/src/peers/main.go",
-		"testdata/src/pointsto/main.go",
-		"testdata/src/referrers/main.go",
-		"testdata/src/reflection/main.go",
-		"testdata/src/what/main.go",
-		"testdata/src/whicherrs/main.go",
-		"testdata/src/softerrs/main.go",
-		// JSON:
-		// TODO(adonovan): most of these are very similar; combine them.
-		"testdata/src/calls-json/main.go",
-		"testdata/src/peers-json/main.go",
-		"testdata/src/definition-json/main.go",
-		"testdata/src/definition-json/main19.go",
-		"testdata/src/describe-json/main.go",
-		"testdata/src/implements-json/main.go",
-		"testdata/src/implements-methods-json/main.go",
-		"testdata/src/pointsto-json/main.go",
-		"testdata/src/referrers-json/main.go",
-		"testdata/src/what-json/main.go",
-	} {
-		if filename == "testdata/src/referrers/main.go" && runtime.GOOS == "plan9" {
-			// Disable this test on plan9 since it expects a particular
-			// wording for a "no such file or directory" error.
-			continue
-		}
-		if filename == "testdata/src/alias/alias.go" && !guru.HasAlias {
-			continue
-		}
-		if strings.HasSuffix(filename, "19.go") && !contains(build.Default.ReleaseTags, "go1.9") {
-			// TODO(adonovan): recombine the 'describe' and 'definition'
-			// tests once we drop support for go1.8.
-			continue
-		}
-
-		json := strings.Contains(filename, "-json/")
-		queries := parseQueries(t, filename)
-		golden := filename + "lden"
-		got := filename + "t"
-		gotfh, err := os.Create(got)
-		if err != nil {
-			t.Errorf("Create(%s) failed: %s", got, err)
-			continue
-		}
-		defer os.Remove(got)
-		defer gotfh.Close()
-
-		// Run the guru on each query, redirecting its output
-		// and error (if any) to the foo.got file.
-		for _, q := range queries {
-			doQuery(gotfh, q, json)
-		}
-
-		// Compare foo.got with foo.golden.
-		var cmd *exec.Cmd
-		switch runtime.GOOS {
-		case "plan9":
-			cmd = exec.Command("/bin/diff", "-c", golden, got)
-		default:
-			cmd = exec.Command("/usr/bin/diff", "-u", golden, got)
-		}
-		buf := new(bytes.Buffer)
-		cmd.Stdout = buf
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			t.Errorf("Guru tests for %s failed: %s.\n%s\n",
-				filename, err, buf)
-
-			if *updateFlag {
-				t.Logf("Updating %s...", golden)
-				if err := exec.Command("/bin/cp", got, golden).Run(); err != nil {
-					t.Errorf("Update failed: %s", err)
-				}
-			}
-		}
-	}
-}
-
-func contains(haystack []string, needle string) bool {
-	for _, x := range haystack {
-		if needle == x {
-			return true
-		}
-	}
-	return false
-}
-
-func TestIssue14684(t *testing.T) {
-	var buildContext = build.Default
-	buildContext.GOPATH = "testdata"
-	query := guru.Query{
-		Pos:   "testdata/src/README.txt:#1",
-		Build: &buildContext,
-	}
-	err := guru.Run("freevars", &query)
-	if err == nil {
-		t.Fatal("guru query succeeded unexpectedly")
-	}
-	if got, want := err.Error(), "testdata/src/README.txt is not a Go source file"; got != want {
-		t.Errorf("query error was %q, want %q", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/implements.go b/installer/vendor/golang.org/x/tools/cmd/guru/implements.go
deleted file mode 100644
index 2d89b2d7e7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/implements.go
+++ /dev/null
@@ -1,364 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"reflect"
-	"sort"
-	"strings"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/types/typeutil"
-	"golang.org/x/tools/refactor/importgraph"
-)
-
-// Implements displays the "implements" relation as it pertains to the
-// selected type.
-// If the selection is a method, 'implements' displays
-// the corresponding methods of the types that would have been reported
-// by an implements query on the receiver type.
-//
-func implements(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-	allowErrors(&lconf)
-
-	qpkg, err := importQueryPackage(q.Pos, &lconf)
-	if err != nil {
-		return err
-	}
-
-	// Set the packages to search.
-	if len(q.Scope) > 0 {
-		// Inspect all packages in the analysis scope, if specified.
-		if err := setPTAScope(&lconf, q.Scope); err != nil {
-			return err
-		}
-	} else {
-		// Otherwise inspect the forward and reverse
-		// transitive closure of the selected package.
-		// (In theory even this is incomplete.)
-		_, rev, _ := importgraph.Build(q.Build)
-		for path := range rev.Search(qpkg) {
-			lconf.ImportWithTests(path)
-		}
-
-		// TODO(adonovan): for completeness, we should also
-		// type-check and inspect function bodies in all
-		// imported packages.  This would be expensive, but we
-		// could optimize by skipping functions that do not
-		// contain type declarations.  This would require
-		// changing the loader's TypeCheckFuncBodies hook to
-		// provide the []*ast.File.
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := lconf.Load()
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	// Find the selected type.
-	path, action := findInterestingNode(qpos.info, qpos.path)
-
-	var method *types.Func
-	var T types.Type // selected type (receiver if method != nil)
-
-	switch action {
-	case actionExpr:
-		// method?
-		if id, ok := path[0].(*ast.Ident); ok {
-			if obj, ok := qpos.info.ObjectOf(id).(*types.Func); ok {
-				recv := obj.Type().(*types.Signature).Recv()
-				if recv == nil {
-					return fmt.Errorf("this function is not a method")
-				}
-				method = obj
-				T = recv.Type()
-			}
-		}
-
-		// If not a method, use the expression's type.
-		if T == nil {
-			T = qpos.info.TypeOf(path[0].(ast.Expr))
-		}
-
-	case actionType:
-		T = qpos.info.TypeOf(path[0].(ast.Expr))
-	}
-	if T == nil {
-		return fmt.Errorf("not a type, method, or value")
-	}
-
-	// Find all named types, even local types (which can have
-	// methods due to promotion) and the built-in "error".
-	// We ignore aliases 'type M = N' to avoid duplicate
-	// reporting of the Named type N.
-	var allNamed []*types.Named
-	for _, info := range lprog.AllPackages {
-		for _, obj := range info.Defs {
-			if obj, ok := obj.(*types.TypeName); ok && !isAlias(obj) {
-				if named, ok := obj.Type().(*types.Named); ok {
-					allNamed = append(allNamed, named)
-				}
-			}
-		}
-	}
-	allNamed = append(allNamed, types.Universe.Lookup("error").Type().(*types.Named))
-
-	var msets typeutil.MethodSetCache
-
-	// Test each named type.
-	var to, from, fromPtr []types.Type
-	for _, U := range allNamed {
-		if isInterface(T) {
-			if msets.MethodSet(T).Len() == 0 {
-				continue // empty interface
-			}
-			if isInterface(U) {
-				if msets.MethodSet(U).Len() == 0 {
-					continue // empty interface
-				}
-
-				// T interface, U interface
-				if !types.Identical(T, U) {
-					if types.AssignableTo(U, T) {
-						to = append(to, U)
-					}
-					if types.AssignableTo(T, U) {
-						from = append(from, U)
-					}
-				}
-			} else {
-				// T interface, U concrete
-				if types.AssignableTo(U, T) {
-					to = append(to, U)
-				} else if pU := types.NewPointer(U); types.AssignableTo(pU, T) {
-					to = append(to, pU)
-				}
-			}
-		} else if isInterface(U) {
-			if msets.MethodSet(U).Len() == 0 {
-				continue // empty interface
-			}
-
-			// T concrete, U interface
-			if types.AssignableTo(T, U) {
-				from = append(from, U)
-			} else if pT := types.NewPointer(T); types.AssignableTo(pT, U) {
-				fromPtr = append(fromPtr, U)
-			}
-		}
-	}
-
-	var pos interface{} = qpos
-	if nt, ok := deref(T).(*types.Named); ok {
-		pos = nt.Obj()
-	}
-
-	// Sort types (arbitrarily) to ensure test determinism.
-	sort.Sort(typesByString(to))
-	sort.Sort(typesByString(from))
-	sort.Sort(typesByString(fromPtr))
-
-	var toMethod, fromMethod, fromPtrMethod []*types.Selection // contain nils
-	if method != nil {
-		for _, t := range to {
-			toMethod = append(toMethod,
-				types.NewMethodSet(t).Lookup(method.Pkg(), method.Name()))
-		}
-		for _, t := range from {
-			fromMethod = append(fromMethod,
-				types.NewMethodSet(t).Lookup(method.Pkg(), method.Name()))
-		}
-		for _, t := range fromPtr {
-			fromPtrMethod = append(fromPtrMethod,
-				types.NewMethodSet(t).Lookup(method.Pkg(), method.Name()))
-		}
-	}
-
-	q.Output(lprog.Fset, &implementsResult{
-		qpos, T, pos, to, from, fromPtr, method, toMethod, fromMethod, fromPtrMethod,
-	})
-	return nil
-}
-
-type implementsResult struct {
-	qpos *queryPos
-
-	t       types.Type   // queried type (not necessarily named)
-	pos     interface{}  // pos of t (*types.Name or *QueryPos)
-	to      []types.Type // named or ptr-to-named types assignable to interface T
-	from    []types.Type // named interfaces assignable from T
-	fromPtr []types.Type // named interfaces assignable only from *T
-
-	// if a method was queried:
-	method        *types.Func        // queried method
-	toMethod      []*types.Selection // method of type to[i], if any
-	fromMethod    []*types.Selection // method of type from[i], if any
-	fromPtrMethod []*types.Selection // method of type fromPtrMethod[i], if any
-}
-
-func (r *implementsResult) PrintPlain(printf printfFunc) {
-	relation := "is implemented by"
-
-	meth := func(sel *types.Selection) {
-		if sel != nil {
-			printf(sel.Obj(), "\t%s method (%s).%s",
-				relation, r.qpos.typeString(sel.Recv()), sel.Obj().Name())
-		}
-	}
-
-	if isInterface(r.t) {
-		if types.NewMethodSet(r.t).Len() == 0 { // TODO(adonovan): cache mset
-			printf(r.pos, "empty interface type %s", r.qpos.typeString(r.t))
-			return
-		}
-
-		if r.method == nil {
-			printf(r.pos, "interface type %s", r.qpos.typeString(r.t))
-		} else {
-			printf(r.method, "abstract method %s", r.qpos.objectString(r.method))
-		}
-
-		// Show concrete types (or methods) first; use two passes.
-		for i, sub := range r.to {
-			if !isInterface(sub) {
-				if r.method == nil {
-					printf(deref(sub).(*types.Named).Obj(), "\t%s %s type %s",
-						relation, typeKind(sub), r.qpos.typeString(sub))
-				} else {
-					meth(r.toMethod[i])
-				}
-			}
-		}
-		for i, sub := range r.to {
-			if isInterface(sub) {
-				if r.method == nil {
-					printf(sub.(*types.Named).Obj(), "\t%s %s type %s",
-						relation, typeKind(sub), r.qpos.typeString(sub))
-				} else {
-					meth(r.toMethod[i])
-				}
-			}
-		}
-
-		relation = "implements"
-		for i, super := range r.from {
-			if r.method == nil {
-				printf(super.(*types.Named).Obj(), "\t%s %s",
-					relation, r.qpos.typeString(super))
-			} else {
-				meth(r.fromMethod[i])
-			}
-		}
-	} else {
-		relation = "implements"
-
-		if r.from != nil {
-			if r.method == nil {
-				printf(r.pos, "%s type %s",
-					typeKind(r.t), r.qpos.typeString(r.t))
-			} else {
-				printf(r.method, "concrete method %s",
-					r.qpos.objectString(r.method))
-			}
-			for i, super := range r.from {
-				if r.method == nil {
-					printf(super.(*types.Named).Obj(), "\t%s %s",
-						relation, r.qpos.typeString(super))
-				} else {
-					meth(r.fromMethod[i])
-				}
-			}
-		}
-		if r.fromPtr != nil {
-			if r.method == nil {
-				printf(r.pos, "pointer type *%s", r.qpos.typeString(r.t))
-			} else {
-				// TODO(adonovan): de-dup (C).f and (*C).f implementing (I).f.
-				printf(r.method, "concrete method %s",
-					r.qpos.objectString(r.method))
-			}
-
-			for i, psuper := range r.fromPtr {
-				if r.method == nil {
-					printf(psuper.(*types.Named).Obj(), "\t%s %s",
-						relation, r.qpos.typeString(psuper))
-				} else {
-					meth(r.fromPtrMethod[i])
-				}
-			}
-		} else if r.from == nil {
-			printf(r.pos, "%s type %s implements only interface{}",
-				typeKind(r.t), r.qpos.typeString(r.t))
-		}
-	}
-}
-
-func (r *implementsResult) JSON(fset *token.FileSet) []byte {
-	var method *serial.DescribeMethod
-	if r.method != nil {
-		method = &serial.DescribeMethod{
-			Name: r.qpos.objectString(r.method),
-			Pos:  fset.Position(r.method.Pos()).String(),
-		}
-	}
-	return toJSON(&serial.Implements{
-		T:                       makeImplementsType(r.t, fset),
-		AssignableTo:            makeImplementsTypes(r.to, fset),
-		AssignableFrom:          makeImplementsTypes(r.from, fset),
-		AssignableFromPtr:       makeImplementsTypes(r.fromPtr, fset),
-		AssignableToMethod:      methodsToSerial(r.qpos.info.Pkg, r.toMethod, fset),
-		AssignableFromMethod:    methodsToSerial(r.qpos.info.Pkg, r.fromMethod, fset),
-		AssignableFromPtrMethod: methodsToSerial(r.qpos.info.Pkg, r.fromPtrMethod, fset),
-		Method:                  method,
-	})
-
-}
-
-func makeImplementsTypes(tt []types.Type, fset *token.FileSet) []serial.ImplementsType {
-	var r []serial.ImplementsType
-	for _, t := range tt {
-		r = append(r, makeImplementsType(t, fset))
-	}
-	return r
-}
-
-func makeImplementsType(T types.Type, fset *token.FileSet) serial.ImplementsType {
-	var pos token.Pos
-	if nt, ok := deref(T).(*types.Named); ok { // implementsResult.t may be non-named
-		pos = nt.Obj().Pos()
-	}
-	return serial.ImplementsType{
-		Name: T.String(),
-		Pos:  fset.Position(pos).String(),
-		Kind: typeKind(T),
-	}
-}
-
-// typeKind returns a string describing the underlying kind of type,
-// e.g. "slice", "array", "struct".
-func typeKind(T types.Type) string {
-	s := reflect.TypeOf(T.Underlying()).String()
-	return strings.ToLower(strings.TrimPrefix(s, "*types."))
-}
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
-
-type typesByString []types.Type
-
-func (p typesByString) Len() int           { return len(p) }
-func (p typesByString) Less(i, j int) bool { return p[i].String() < p[j].String() }
-func (p typesByString) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/isAlias18.go b/installer/vendor/golang.org/x/tools/cmd/guru/isAlias18.go
deleted file mode 100644
index 6a2a4c0d23..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/isAlias18.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-package main
-
-import "go/types"
-
-func isAlias(obj *types.TypeName) bool {
-	return false // there are no type aliases before Go 1.9
-}
-
-const HasAlias = false
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/isAlias19.go b/installer/vendor/golang.org/x/tools/cmd/guru/isAlias19.go
deleted file mode 100644
index 25096ab884..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/isAlias19.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main
-
-import "go/types"
-
-func isAlias(obj *types.TypeName) bool {
-	return obj.IsAlias()
-}
-
-const HasAlias = true
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/main.go
deleted file mode 100644
index 761828a090..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/main.go
+++ /dev/null
@@ -1,215 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// guru: a tool for answering questions about Go source code.
-//
-//    http://golang.org/s/using-guru
-//
-// Run with -help flag or help subcommand for usage information.
-//
-package main // import "golang.org/x/tools/cmd/guru"
-
-import (
-	"bufio"
-	"flag"
-	"fmt"
-	"go/build"
-	"go/token"
-	"io"
-	"log"
-	"os"
-	"runtime/pprof"
-	"strings"
-	"sync"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-// flags
-var (
-	modifiedFlag   = flag.Bool("modified", false, "read archive of modified files from standard input")
-	scopeFlag      = flag.String("scope", "", "comma-separated list of `packages` the analysis should be limited to")
-	ptalogFlag     = flag.String("ptalog", "", "write points-to analysis log to `file`")
-	jsonFlag       = flag.Bool("json", false, "emit output in JSON format")
-	reflectFlag    = flag.Bool("reflect", false, "analyze reflection soundly (slow)")
-	cpuprofileFlag = flag.String("cpuprofile", "", "write CPU profile to `file`")
-)
-
-func init() {
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-}
-
-const useHelp = "Run 'guru -help' for more information.\n"
-
-const helpMessage = `Go source code guru.
-Usage: guru [flags] <mode> <position>
-
-The mode argument determines the query to perform:
-
-	callees	  	show possible targets of selected function call
-	callers	  	show possible callers of selected function
-	callstack 	show path from callgraph root to selected function
-	definition	show declaration of selected identifier
-	describe  	describe selected syntax: definition, methods, etc
-	freevars  	show free variables of selection
-	implements	show 'implements' relation for selected type or method
-	peers     	show send/receive corresponding to selected channel op
-	pointsto	show variables the selected pointer may point to
-	referrers 	show all refs to entity denoted by selected identifier
-	what		show basic information about the selected syntax node
-	whicherrs	show possible values of the selected error variable
-
-The position argument specifies the filename and byte offset (or range)
-of the syntax element to query.  For example:
-
-	foo.go:#123,#128
-	bar.go:#123
-
-The -json flag causes guru to emit output in JSON format;
-	golang.org/x/tools/cmd/guru/serial defines its schema.
-	Otherwise, the output is in an editor-friendly format in which
-	every line has the form "pos: text", where pos is "-" if unknown.
-
-The -modified flag causes guru to read an archive from standard input.
-	Files in this archive will be used in preference to those in
-	the file system.  In this way, a text editor may supply guru
-	with the contents of its unsaved buffers.  Each archive entry
-	consists of the file name, a newline, the decimal file size,
-	another newline, and the contents of the file.
-
-The -scope flag restricts analysis to the specified packages.
-	Its value is a comma-separated list of patterns of these forms:
-		golang.org/x/tools/cmd/guru     # a single package
-		golang.org/x/tools/...          # all packages beneath dir
-		...                             # the entire workspace.
-	A pattern preceded by '-' is negative, so the scope
-		encoding/...,-encoding/xml
-	matches all encoding packages except encoding/xml.
-
-User manual: http://golang.org/s/using-guru
-
-Example: describe syntax at offset 530 in this file (an import spec):
-
-  $ guru describe src/golang.org/x/tools/cmd/guru/main.go:#530
-`
-
-func printHelp() {
-	fmt.Fprintln(os.Stderr, helpMessage)
-	fmt.Fprintln(os.Stderr, "Flags:")
-	flag.PrintDefaults()
-}
-
-func main() {
-	log.SetPrefix("guru: ")
-	log.SetFlags(0)
-
-	// Don't print full help unless -help was requested.
-	// Just gently remind users that it's there.
-	flag.Usage = func() { fmt.Fprint(os.Stderr, useHelp) }
-	flag.CommandLine.Init(os.Args[0], flag.ContinueOnError) // hack
-	if err := flag.CommandLine.Parse(os.Args[1:]); err != nil {
-		// (err has already been printed)
-		if err == flag.ErrHelp {
-			printHelp()
-		}
-		os.Exit(2)
-	}
-
-	args := flag.Args()
-	if len(args) != 2 {
-		flag.Usage()
-		os.Exit(2)
-	}
-	mode, posn := args[0], args[1]
-
-	if mode == "help" {
-		printHelp()
-		os.Exit(2)
-	}
-
-	// Set up points-to analysis log file.
-	var ptalog io.Writer
-	if *ptalogFlag != "" {
-		if f, err := os.Create(*ptalogFlag); err != nil {
-			log.Fatalf("Failed to create PTA log file: %s", err)
-		} else {
-			buf := bufio.NewWriter(f)
-			ptalog = buf
-			defer func() {
-				if err := buf.Flush(); err != nil {
-					log.Printf("flush: %s", err)
-				}
-				if err := f.Close(); err != nil {
-					log.Printf("close: %s", err)
-				}
-			}()
-		}
-	}
-
-	// Profiling support.
-	if *cpuprofileFlag != "" {
-		f, err := os.Create(*cpuprofileFlag)
-		if err != nil {
-			log.Fatal(err)
-		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
-	}
-
-	ctxt := &build.Default
-
-	// If there were modified files,
-	// read them from the standard input and
-	// overlay them on the build context.
-	if *modifiedFlag {
-		modified, err := buildutil.ParseOverlayArchive(os.Stdin)
-		if err != nil {
-			log.Fatal(err)
-		}
-
-		// All I/O done by guru needs to consult the modified map.
-		// The ReadFile done by referrers does,
-		// but the loader's cgo preprocessing currently does not.
-
-		if len(modified) > 0 {
-			ctxt = buildutil.OverlayContext(ctxt, modified)
-		}
-	}
-
-	var outputMu sync.Mutex
-	output := func(fset *token.FileSet, qr QueryResult) {
-		outputMu.Lock()
-		defer outputMu.Unlock()
-		if *jsonFlag {
-			// JSON output
-			fmt.Printf("%s\n", qr.JSON(fset))
-		} else {
-			// plain output
-			printf := func(pos interface{}, format string, args ...interface{}) {
-				fprintf(os.Stdout, fset, pos, format, args...)
-			}
-			qr.PrintPlain(printf)
-		}
-	}
-
-	// Avoid corner case of split("").
-	var scope []string
-	if *scopeFlag != "" {
-		scope = strings.Split(*scopeFlag, ",")
-	}
-
-	// Ask the guru.
-	query := Query{
-		Pos:        posn,
-		Build:      ctxt,
-		Scope:      scope,
-		PTALog:     ptalog,
-		Reflection: *reflectFlag,
-		Output:     output,
-	}
-
-	if err := Run(mode, &query); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/peers.go b/installer/vendor/golang.org/x/tools/cmd/guru/peers.go
deleted file mode 100644
index 6e138bf06f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/peers.go
+++ /dev/null
@@ -1,252 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// peers enumerates, for a given channel send (or receive) operation,
-// the set of possible receives (or sends) that correspond to it.
-//
-// TODO(adonovan): support reflect.{Select,Recv,Send,Close}.
-// TODO(adonovan): permit the user to query based on a MakeChan (not send/recv),
-// or the implicit receive in "for v := range ch".
-func peers(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	prog := ssautil.CreateProgram(lprog, ssa.GlobalDebug)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	opPos := findOp(qpos)
-	if opPos == token.NoPos {
-		return fmt.Errorf("there is no channel operation here")
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	var queryOp chanOp // the originating send or receive operation
-	var ops []chanOp   // all sends/receives of opposite direction
-
-	// Look at all channel operations in the whole ssa.Program.
-	// Build a list of those of same type as the query.
-	allFuncs := ssautil.AllFunctions(prog)
-	for fn := range allFuncs {
-		for _, b := range fn.Blocks {
-			for _, instr := range b.Instrs {
-				for _, op := range chanOps(instr) {
-					ops = append(ops, op)
-					if op.pos == opPos {
-						queryOp = op // we found the query op
-					}
-				}
-			}
-		}
-	}
-	if queryOp.ch == nil {
-		return fmt.Errorf("ssa.Instruction for send/receive not found")
-	}
-
-	// Discard operations of wrong channel element type.
-	// Build set of channel ssa.Values as query to pointer analysis.
-	// We compare channels by element types, not channel types, to
-	// ignore both directionality and type names.
-	queryType := queryOp.ch.Type()
-	queryElemType := queryType.Underlying().(*types.Chan).Elem()
-	ptaConfig.AddQuery(queryOp.ch)
-	i := 0
-	for _, op := range ops {
-		if types.Identical(op.ch.Type().Underlying().(*types.Chan).Elem(), queryElemType) {
-			ptaConfig.AddQuery(op.ch)
-			ops[i] = op
-			i++
-		}
-	}
-	ops = ops[:i]
-
-	// Run the pointer analysis.
-	ptares := ptrAnalysis(ptaConfig)
-
-	// Find the points-to set.
-	queryChanPtr := ptares.Queries[queryOp.ch]
-
-	// Ascertain which make(chan) labels the query's channel can alias.
-	var makes []token.Pos
-	for _, label := range queryChanPtr.PointsTo().Labels() {
-		makes = append(makes, label.Pos())
-	}
-	sort.Sort(byPos(makes))
-
-	// Ascertain which channel operations can alias the same make(chan) labels.
-	var sends, receives, closes []token.Pos
-	for _, op := range ops {
-		if ptr, ok := ptares.Queries[op.ch]; ok && ptr.MayAlias(queryChanPtr) {
-			switch op.dir {
-			case types.SendOnly:
-				sends = append(sends, op.pos)
-			case types.RecvOnly:
-				receives = append(receives, op.pos)
-			case types.SendRecv:
-				closes = append(closes, op.pos)
-			}
-		}
-	}
-	sort.Sort(byPos(sends))
-	sort.Sort(byPos(receives))
-	sort.Sort(byPos(closes))
-
-	q.Output(lprog.Fset, &peersResult{
-		queryPos:  opPos,
-		queryType: queryType,
-		makes:     makes,
-		sends:     sends,
-		receives:  receives,
-		closes:    closes,
-	})
-	return nil
-}
-
-// findOp returns the position of the enclosing send/receive/close op.
-// For send and receive operations, this is the position of the <- token;
-// for close operations, it's the Lparen of the function call.
-//
-// TODO(adonovan): handle implicit receive operations from 'for...range chan' statements.
-func findOp(qpos *queryPos) token.Pos {
-	for _, n := range qpos.path {
-		switch n := n.(type) {
-		case *ast.UnaryExpr:
-			if n.Op == token.ARROW {
-				return n.OpPos
-			}
-		case *ast.SendStmt:
-			return n.Arrow
-		case *ast.CallExpr:
-			// close function call can only exist as a direct identifier
-			if close, ok := unparen(n.Fun).(*ast.Ident); ok {
-				if b, ok := qpos.info.Info.Uses[close].(*types.Builtin); ok && b.Name() == "close" {
-					return n.Lparen
-				}
-			}
-		}
-	}
-	return token.NoPos
-}
-
-// chanOp abstracts an ssa.Send, ssa.Unop(ARROW), or a SelectState.
-type chanOp struct {
-	ch  ssa.Value
-	dir types.ChanDir // SendOnly=send, RecvOnly=recv, SendRecv=close
-	pos token.Pos
-}
-
-// chanOps returns a slice of all the channel operations in the instruction.
-func chanOps(instr ssa.Instruction) []chanOp {
-	// TODO(adonovan): handle calls to reflect.{Select,Recv,Send,Close} too.
-	var ops []chanOp
-	switch instr := instr.(type) {
-	case *ssa.UnOp:
-		if instr.Op == token.ARROW {
-			ops = append(ops, chanOp{instr.X, types.RecvOnly, instr.Pos()})
-		}
-	case *ssa.Send:
-		ops = append(ops, chanOp{instr.Chan, types.SendOnly, instr.Pos()})
-	case *ssa.Select:
-		for _, st := range instr.States {
-			ops = append(ops, chanOp{st.Chan, st.Dir, st.Pos})
-		}
-	case ssa.CallInstruction:
-		cc := instr.Common()
-		if b, ok := cc.Value.(*ssa.Builtin); ok && b.Name() == "close" {
-			ops = append(ops, chanOp{cc.Args[0], types.SendRecv, cc.Pos()})
-		}
-	}
-	return ops
-}
-
-// TODO(adonovan): show the line of text for each pos, like "referrers" does.
-type peersResult struct {
-	queryPos                       token.Pos   // of queried channel op
-	queryType                      types.Type  // type of queried channel
-	makes, sends, receives, closes []token.Pos // positions of aliased makechan/send/receive/close instrs
-}
-
-func (r *peersResult) PrintPlain(printf printfFunc) {
-	if len(r.makes) == 0 {
-		printf(r.queryPos, "This channel can't point to anything.")
-		return
-	}
-	printf(r.queryPos, "This channel of type %s may be:", r.queryType)
-	for _, alloc := range r.makes {
-		printf(alloc, "\tallocated here")
-	}
-	for _, send := range r.sends {
-		printf(send, "\tsent to, here")
-	}
-	for _, receive := range r.receives {
-		printf(receive, "\treceived from, here")
-	}
-	for _, clos := range r.closes {
-		printf(clos, "\tclosed, here")
-	}
-}
-
-func (r *peersResult) JSON(fset *token.FileSet) []byte {
-	peers := &serial.Peers{
-		Pos:  fset.Position(r.queryPos).String(),
-		Type: r.queryType.String(),
-	}
-	for _, alloc := range r.makes {
-		peers.Allocs = append(peers.Allocs, fset.Position(alloc).String())
-	}
-	for _, send := range r.sends {
-		peers.Sends = append(peers.Sends, fset.Position(send).String())
-	}
-	for _, receive := range r.receives {
-		peers.Receives = append(peers.Receives, fset.Position(receive).String())
-	}
-	for _, clos := range r.closes {
-		peers.Closes = append(peers.Closes, fset.Position(clos).String())
-	}
-	return toJSON(peers)
-}
-
-// -------- utils --------
-
-// NB: byPos is not deterministic across packages since it depends on load order.
-// Use lessPos if the tests need it.
-type byPos []token.Pos
-
-func (p byPos) Len() int           { return len(p) }
-func (p byPos) Less(i, j int) bool { return p[i] < p[j] }
-func (p byPos) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/pointsto.go b/installer/vendor/golang.org/x/tools/cmd/guru/pointsto.go
deleted file mode 100644
index 782277f374..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/pointsto.go
+++ /dev/null
@@ -1,290 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// pointsto runs the pointer analysis on the selected expression,
-// and reports its points-to set (for a pointer-like expression)
-// or its dynamic types (for an interface, reflect.Value, or
-// reflect.Type expression) and their points-to sets.
-//
-// All printed sets are sorted to ensure determinism.
-//
-func pointsto(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, true) // needs exact pos
-	if err != nil {
-		return err
-	}
-
-	prog := ssautil.CreateProgram(lprog, ssa.GlobalDebug)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	path, action := findInterestingNode(qpos.info, qpos.path)
-	if action != actionExpr {
-		return fmt.Errorf("pointer analysis wants an expression; got %s",
-			astutil.NodeDescription(qpos.path[0]))
-	}
-
-	var expr ast.Expr
-	var obj types.Object
-	switch n := path[0].(type) {
-	case *ast.ValueSpec:
-		// ambiguous ValueSpec containing multiple names
-		return fmt.Errorf("multiple value specification")
-	case *ast.Ident:
-		obj = qpos.info.ObjectOf(n)
-		expr = n
-	case ast.Expr:
-		expr = n
-	default:
-		// TODO(adonovan): is this reachable?
-		return fmt.Errorf("unexpected AST for expr: %T", n)
-	}
-
-	// Reject non-pointerlike types (includes all constants---except nil).
-	// TODO(adonovan): reject nil too.
-	typ := qpos.info.TypeOf(expr)
-	if !pointer.CanPoint(typ) {
-		return fmt.Errorf("pointer analysis wants an expression of reference type; got %s", typ)
-	}
-
-	// Determine the ssa.Value for the expression.
-	var value ssa.Value
-	var isAddr bool
-	if obj != nil {
-		// def/ref of func/var object
-		value, isAddr, err = ssaValueForIdent(prog, qpos.info, obj, path)
-	} else {
-		value, isAddr, err = ssaValueForExpr(prog, qpos.info, path)
-	}
-	if err != nil {
-		return err // e.g. trivially dead code
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	// Run the pointer analysis.
-	ptrs, err := runPTA(ptaConfig, value, isAddr)
-	if err != nil {
-		return err // e.g. analytically unreachable
-	}
-
-	q.Output(lprog.Fset, &pointstoResult{
-		qpos: qpos,
-		typ:  typ,
-		ptrs: ptrs,
-	})
-	return nil
-}
-
-// ssaValueForIdent returns the ssa.Value for the ast.Ident whose path
-// to the root of the AST is path.  isAddr reports whether the
-// ssa.Value is the address denoted by the ast.Ident, not its value.
-//
-func ssaValueForIdent(prog *ssa.Program, qinfo *loader.PackageInfo, obj types.Object, path []ast.Node) (value ssa.Value, isAddr bool, err error) {
-	switch obj := obj.(type) {
-	case *types.Var:
-		pkg := prog.Package(qinfo.Pkg)
-		pkg.Build()
-		if v, addr := prog.VarValue(obj, pkg, path); v != nil {
-			return v, addr, nil
-		}
-		return nil, false, fmt.Errorf("can't locate SSA Value for var %s", obj.Name())
-
-	case *types.Func:
-		fn := prog.FuncValue(obj)
-		if fn == nil {
-			return nil, false, fmt.Errorf("%s is an interface method", obj)
-		}
-		// TODO(adonovan): there's no point running PTA on a *Func ident.
-		// Eliminate this feature.
-		return fn, false, nil
-	}
-	panic(obj)
-}
-
-// ssaValueForExpr returns the ssa.Value of the non-ast.Ident
-// expression whose path to the root of the AST is path.
-//
-func ssaValueForExpr(prog *ssa.Program, qinfo *loader.PackageInfo, path []ast.Node) (value ssa.Value, isAddr bool, err error) {
-	pkg := prog.Package(qinfo.Pkg)
-	pkg.SetDebugMode(true)
-	pkg.Build()
-
-	fn := ssa.EnclosingFunction(pkg, path)
-	if fn == nil {
-		return nil, false, fmt.Errorf("no SSA function built for this location (dead code?)")
-	}
-
-	if v, addr := fn.ValueForExpr(path[0].(ast.Expr)); v != nil {
-		return v, addr, nil
-	}
-
-	return nil, false, fmt.Errorf("can't locate SSA Value for expression in %s", fn)
-}
-
-// runPTA runs the pointer analysis of the selected SSA value or address.
-func runPTA(conf *pointer.Config, v ssa.Value, isAddr bool) (ptrs []pointerResult, err error) {
-	T := v.Type()
-	if isAddr {
-		conf.AddIndirectQuery(v)
-		T = deref(T)
-	} else {
-		conf.AddQuery(v)
-	}
-	ptares := ptrAnalysis(conf)
-
-	var ptr pointer.Pointer
-	if isAddr {
-		ptr = ptares.IndirectQueries[v]
-	} else {
-		ptr = ptares.Queries[v]
-	}
-	if ptr == (pointer.Pointer{}) {
-		return nil, fmt.Errorf("pointer analysis did not find expression (dead code?)")
-	}
-	pts := ptr.PointsTo()
-
-	if pointer.CanHaveDynamicTypes(T) {
-		// Show concrete types for interface/reflect.Value expression.
-		if concs := pts.DynamicTypes(); concs.Len() > 0 {
-			concs.Iterate(func(conc types.Type, pta interface{}) {
-				labels := pta.(pointer.PointsToSet).Labels()
-				sort.Sort(byPosAndString(labels)) // to ensure determinism
-				ptrs = append(ptrs, pointerResult{conc, labels})
-			})
-		}
-	} else {
-		// Show labels for other expressions.
-		labels := pts.Labels()
-		sort.Sort(byPosAndString(labels)) // to ensure determinism
-		ptrs = append(ptrs, pointerResult{T, labels})
-	}
-	sort.Sort(byTypeString(ptrs)) // to ensure determinism
-	return ptrs, nil
-}
-
-type pointerResult struct {
-	typ    types.Type       // type of the pointer (always concrete)
-	labels []*pointer.Label // set of labels
-}
-
-type pointstoResult struct {
-	qpos *queryPos
-	typ  types.Type      // type of expression
-	ptrs []pointerResult // pointer info (typ is concrete => len==1)
-}
-
-func (r *pointstoResult) PrintPlain(printf printfFunc) {
-	if pointer.CanHaveDynamicTypes(r.typ) {
-		// Show concrete types for interface, reflect.Type or
-		// reflect.Value expression.
-
-		if len(r.ptrs) > 0 {
-			printf(r.qpos, "this %s may contain these dynamic types:", r.qpos.typeString(r.typ))
-			for _, ptr := range r.ptrs {
-				var obj types.Object
-				if nt, ok := deref(ptr.typ).(*types.Named); ok {
-					obj = nt.Obj()
-				}
-				if len(ptr.labels) > 0 {
-					printf(obj, "\t%s, may point to:", r.qpos.typeString(ptr.typ))
-					printLabels(printf, ptr.labels, "\t\t")
-				} else {
-					printf(obj, "\t%s", r.qpos.typeString(ptr.typ))
-				}
-			}
-		} else {
-			printf(r.qpos, "this %s cannot contain any dynamic types.", r.typ)
-		}
-	} else {
-		// Show labels for other expressions.
-		if ptr := r.ptrs[0]; len(ptr.labels) > 0 {
-			printf(r.qpos, "this %s may point to these objects:",
-				r.qpos.typeString(r.typ))
-			printLabels(printf, ptr.labels, "\t")
-		} else {
-			printf(r.qpos, "this %s may not point to anything.",
-				r.qpos.typeString(r.typ))
-		}
-	}
-}
-
-func (r *pointstoResult) JSON(fset *token.FileSet) []byte {
-	var pts []serial.PointsTo
-	for _, ptr := range r.ptrs {
-		var namePos string
-		if nt, ok := deref(ptr.typ).(*types.Named); ok {
-			namePos = fset.Position(nt.Obj().Pos()).String()
-		}
-		var labels []serial.PointsToLabel
-		for _, l := range ptr.labels {
-			labels = append(labels, serial.PointsToLabel{
-				Pos:  fset.Position(l.Pos()).String(),
-				Desc: l.String(),
-			})
-		}
-		pts = append(pts, serial.PointsTo{
-			Type:    r.qpos.typeString(ptr.typ),
-			NamePos: namePos,
-			Labels:  labels,
-		})
-	}
-	return toJSON(pts)
-}
-
-type byTypeString []pointerResult
-
-func (a byTypeString) Len() int           { return len(a) }
-func (a byTypeString) Less(i, j int) bool { return a[i].typ.String() < a[j].typ.String() }
-func (a byTypeString) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-
-type byPosAndString []*pointer.Label
-
-func (a byPosAndString) Len() int { return len(a) }
-func (a byPosAndString) Less(i, j int) bool {
-	cmp := a[i].Pos() - a[j].Pos()
-	return cmp < 0 || (cmp == 0 && a[i].String() < a[j].String())
-}
-func (a byPosAndString) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-
-func printLabels(printf printfFunc, labels []*pointer.Label, prefix string) {
-	// TODO(adonovan): due to context-sensitivity, many of these
-	// labels may differ only by context, which isn't apparent.
-	for _, label := range labels {
-		printf(label, "%s%s", prefix, label)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/pos.go b/installer/vendor/golang.org/x/tools/cmd/guru/pos.go
deleted file mode 100644
index 2e659fe424..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/pos.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-// This file defines utilities for working with file positions.
-
-import (
-	"fmt"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/buildutil"
-)
-
-// parseOctothorpDecimal returns the numeric value if s matches "#%d",
-// otherwise -1.
-func parseOctothorpDecimal(s string) int {
-	if s != "" && s[0] == '#' {
-		if s, err := strconv.ParseInt(s[1:], 10, 32); err == nil {
-			return int(s)
-		}
-	}
-	return -1
-}
-
-// parsePos parses a string of the form "file:pos" or
-// file:start,end" where pos, start, end match #%d and represent byte
-// offsets, and returns its components.
-//
-// (Numbers without a '#' prefix are reserved for future use,
-// e.g. to indicate line/column positions.)
-//
-func parsePos(pos string) (filename string, startOffset, endOffset int, err error) {
-	if pos == "" {
-		err = fmt.Errorf("no source position specified")
-		return
-	}
-
-	colon := strings.LastIndex(pos, ":")
-	if colon < 0 {
-		err = fmt.Errorf("bad position syntax %q", pos)
-		return
-	}
-	filename, offset := pos[:colon], pos[colon+1:]
-	startOffset = -1
-	endOffset = -1
-	if comma := strings.Index(offset, ","); comma < 0 {
-		// e.g. "foo.go:#123"
-		startOffset = parseOctothorpDecimal(offset)
-		endOffset = startOffset
-	} else {
-		// e.g. "foo.go:#123,#456"
-		startOffset = parseOctothorpDecimal(offset[:comma])
-		endOffset = parseOctothorpDecimal(offset[comma+1:])
-	}
-	if startOffset < 0 || endOffset < 0 {
-		err = fmt.Errorf("invalid offset %q in query position", offset)
-		return
-	}
-	return
-}
-
-// fileOffsetToPos translates the specified file-relative byte offsets
-// into token.Pos form.  It returns an error if the file was not found
-// or the offsets were out of bounds.
-//
-func fileOffsetToPos(file *token.File, startOffset, endOffset int) (start, end token.Pos, err error) {
-	// Range check [start..end], inclusive of both end-points.
-
-	if 0 <= startOffset && startOffset <= file.Size() {
-		start = file.Pos(int(startOffset))
-	} else {
-		err = fmt.Errorf("start position is beyond end of file")
-		return
-	}
-
-	if 0 <= endOffset && endOffset <= file.Size() {
-		end = file.Pos(int(endOffset))
-	} else {
-		err = fmt.Errorf("end position is beyond end of file")
-		return
-	}
-
-	return
-}
-
-// sameFile returns true if x and y have the same basename and denote
-// the same file.
-//
-func sameFile(x, y string) bool {
-	if filepath.Base(x) == filepath.Base(y) { // (optimisation)
-		if xi, err := os.Stat(x); err == nil {
-			if yi, err := os.Stat(y); err == nil {
-				return os.SameFile(xi, yi)
-			}
-		}
-	}
-	return false
-}
-
-// fastQueryPos parses the position string and returns a queryPos.
-// It parses only a single file and does not run the type checker.
-func fastQueryPos(ctxt *build.Context, pos string) (*queryPos, error) {
-	filename, startOffset, endOffset, err := parsePos(pos)
-	if err != nil {
-		return nil, err
-	}
-
-	// Parse the file, opening it the file via the build.Context
-	// so that we observe the effects of the -modified flag.
-	fset := token.NewFileSet()
-	cwd, _ := os.Getwd()
-	f, err := buildutil.ParseFile(fset, ctxt, nil, cwd, filename, parser.Mode(0))
-	// ParseFile usually returns a partial file along with an error.
-	// Only fail if there is no file.
-	if f == nil {
-		return nil, err
-	}
-	if !f.Pos().IsValid() {
-		return nil, fmt.Errorf("%s is not a Go source file", filename)
-	}
-
-	start, end, err := fileOffsetToPos(fset.File(f.Pos()), startOffset, endOffset)
-	if err != nil {
-		return nil, err
-	}
-
-	path, exact := astutil.PathEnclosingInterval(f, start, end)
-	if path == nil {
-		return nil, fmt.Errorf("no syntax here")
-	}
-
-	return &queryPos{fset, start, end, path, exact, nil}, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/referrers.go b/installer/vendor/golang.org/x/tools/cmd/guru/referrers.go
deleted file mode 100644
index d6b9df90ee..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/referrers.go
+++ /dev/null
@@ -1,522 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/token"
-	"go/types"
-	"io"
-	"log"
-	"sort"
-	"strings"
-	"sync"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/refactor/importgraph"
-)
-
-// Referrers reports all identifiers that resolve to the same object
-// as the queried identifier, within any package in the workspace.
-func referrers(q *Query) error {
-	fset := token.NewFileSet()
-	lconf := loader.Config{Fset: fset, Build: q.Build}
-	allowErrors(&lconf)
-
-	if _, err := importQueryPackage(q.Pos, &lconf); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the query package.
-	lprog, err := lconf.Load()
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, false)
-	if err != nil {
-		return err
-	}
-
-	id, _ := qpos.path[0].(*ast.Ident)
-	if id == nil {
-		return fmt.Errorf("no identifier here")
-	}
-
-	obj := qpos.info.ObjectOf(id)
-	if obj == nil {
-		// Happens for y in "switch y := x.(type)",
-		// the package declaration,
-		// and unresolved identifiers.
-		if _, ok := qpos.path[1].(*ast.File); ok { // package decl?
-			return packageReferrers(q, qpos.info.Pkg.Path())
-		}
-		return fmt.Errorf("no object for identifier: %T", qpos.path[1])
-	}
-
-	// Imported package name?
-	if pkgname, ok := obj.(*types.PkgName); ok {
-		return packageReferrers(q, pkgname.Imported().Path())
-	}
-
-	if obj.Pkg() == nil {
-		return fmt.Errorf("references to predeclared %q are everywhere!", obj.Name())
-	}
-
-	// For a globally accessible object defined in package P, we
-	// must load packages that depend on P.  Specifically, for a
-	// package-level object, we need load only direct importers
-	// of P, but for a field or interface method, we must load
-	// any package that transitively imports P.
-	if global, pkglevel := classify(obj); global {
-		// We'll use the the object's position to identify it in the larger program.
-		objposn := fset.Position(obj.Pos())
-		defpkg := obj.Pkg().Path() // defining package
-		return globalReferrers(q, qpos.info.Pkg.Path(), defpkg, objposn, pkglevel)
-	}
-
-	q.Output(fset, &referrersInitialResult{
-		qinfo: qpos.info,
-		obj:   obj,
-	})
-
-	outputUses(q, fset, usesOf(obj, qpos.info), obj.Pkg())
-
-	return nil // success
-}
-
-// classify classifies objects by how far
-// we have to look to find references to them.
-func classify(obj types.Object) (global, pkglevel bool) {
-	if obj.Exported() {
-		if obj.Parent() == nil {
-			// selectable object (field or method)
-			return true, false
-		}
-		if obj.Parent() == obj.Pkg().Scope() {
-			// lexical object (package-level var/const/func/type)
-			return true, true
-		}
-	}
-	// object with unexported named or defined in local scope
-	return false, false
-}
-
-// packageReferrers reports all references to the specified package
-// throughout the workspace.
-func packageReferrers(q *Query, path string) error {
-	// Scan the workspace and build the import graph.
-	// Ignore broken packages.
-	_, rev, _ := importgraph.Build(q.Build)
-
-	// Find the set of packages that directly import the query package.
-	// Only those packages need typechecking of function bodies.
-	users := rev[path]
-
-	// Load the larger program.
-	fset := token.NewFileSet()
-	lconf := loader.Config{
-		Fset:  fset,
-		Build: q.Build,
-		TypeCheckFuncBodies: func(p string) bool {
-			return users[strings.TrimSuffix(p, "_test")]
-		},
-	}
-	allowErrors(&lconf)
-
-	// The importgraph doesn't treat external test packages
-	// as separate nodes, so we must use ImportWithTests.
-	for path := range users {
-		lconf.ImportWithTests(path)
-	}
-
-	// Subtle!  AfterTypeCheck needs no mutex for qpkg because the
-	// topological import order gives us the necessary happens-before edges.
-	// TODO(adonovan): what about import cycles?
-	var qpkg *types.Package
-
-	// For efficiency, we scan each package for references
-	// just after it has been type-checked.  The loader calls
-	// AfterTypeCheck (concurrently), providing us with a stream of
-	// packages.
-	lconf.AfterTypeCheck = func(info *loader.PackageInfo, files []*ast.File) {
-		// AfterTypeCheck may be called twice for the same package due to augmentation.
-
-		if info.Pkg.Path() == path && qpkg == nil {
-			// Found the package of interest.
-			qpkg = info.Pkg
-			fakepkgname := types.NewPkgName(token.NoPos, qpkg, qpkg.Name(), qpkg)
-			q.Output(fset, &referrersInitialResult{
-				qinfo: info,
-				obj:   fakepkgname, // bogus
-			})
-		}
-
-		// Only inspect packages that directly import the
-		// declaring package (and thus were type-checked).
-		if lconf.TypeCheckFuncBodies(info.Pkg.Path()) {
-			// Find PkgNames that refer to qpkg.
-			// TODO(adonovan): perhaps more useful would be to show imports
-			// of the package instead of qualified identifiers.
-			var refs []*ast.Ident
-			for id, obj := range info.Uses {
-				if obj, ok := obj.(*types.PkgName); ok && obj.Imported() == qpkg {
-					refs = append(refs, id)
-				}
-			}
-			outputUses(q, fset, refs, info.Pkg)
-		}
-
-		clearInfoFields(info) // save memory
-	}
-
-	lconf.Load() // ignore error
-
-	if qpkg == nil {
-		log.Fatalf("query package %q not found during reloading", path)
-	}
-
-	return nil
-}
-
-func usesOf(queryObj types.Object, info *loader.PackageInfo) []*ast.Ident {
-	var refs []*ast.Ident
-	for id, obj := range info.Uses {
-		if sameObj(queryObj, obj) {
-			refs = append(refs, id)
-		}
-	}
-	return refs
-}
-
-// outputUses outputs a result describing refs, which appear in the package denoted by info.
-func outputUses(q *Query, fset *token.FileSet, refs []*ast.Ident, pkg *types.Package) {
-	if len(refs) > 0 {
-		sort.Sort(byNamePos{fset, refs})
-		q.Output(fset, &referrersPackageResult{
-			pkg:   pkg,
-			build: q.Build,
-			fset:  fset,
-			refs:  refs,
-		})
-	}
-}
-
-// globalReferrers reports references throughout the entire workspace to the
-// object at the specified source position.  Its defining package is defpkg,
-// and the query package is qpkg.  isPkgLevel indicates whether the object
-// is defined at package-level.
-func globalReferrers(q *Query, qpkg, defpkg string, objposn token.Position, isPkgLevel bool) error {
-	// Scan the workspace and build the import graph.
-	// Ignore broken packages.
-	_, rev, _ := importgraph.Build(q.Build)
-
-	// Find the set of packages that depend on defpkg.
-	// Only function bodies in those packages need type-checking.
-	var users map[string]bool
-	if isPkgLevel {
-		users = rev[defpkg] // direct importers
-		if users == nil {
-			users = make(map[string]bool)
-		}
-		users[defpkg] = true // plus the defining package itself
-	} else {
-		users = rev.Search(defpkg) // transitive importers
-	}
-
-	// Prepare to load the larger program.
-	fset := token.NewFileSet()
-	lconf := loader.Config{
-		Fset:  fset,
-		Build: q.Build,
-		TypeCheckFuncBodies: func(p string) bool {
-			return users[strings.TrimSuffix(p, "_test")]
-		},
-	}
-	allowErrors(&lconf)
-
-	// The importgraph doesn't treat external test packages
-	// as separate nodes, so we must use ImportWithTests.
-	for path := range users {
-		lconf.ImportWithTests(path)
-	}
-
-	// The remainder of this function is somewhat tricky because it
-	// operates on the concurrent stream of packages observed by the
-	// loader's AfterTypeCheck hook.  Most of guru's helper
-	// functions assume the entire program has already been loaded,
-	// so we can't use them here.
-	// TODO(adonovan): smooth things out once the other changes have landed.
-
-	// Results are reported concurrently from within the
-	// AfterTypeCheck hook.  The program may provide a useful stream
-	// of information even if the user doesn't let the program run
-	// to completion.
-
-	var (
-		mu    sync.Mutex
-		qobj  types.Object
-		qinfo *loader.PackageInfo // info for qpkg
-	)
-
-	// For efficiency, we scan each package for references
-	// just after it has been type-checked.  The loader calls
-	// AfterTypeCheck (concurrently), providing us with a stream of
-	// packages.
-	lconf.AfterTypeCheck = func(info *loader.PackageInfo, files []*ast.File) {
-		// AfterTypeCheck may be called twice for the same package due to augmentation.
-
-		// Only inspect packages that depend on the declaring package
-		// (and thus were type-checked).
-		if lconf.TypeCheckFuncBodies(info.Pkg.Path()) {
-			// Record the query object and its package when we see it.
-			mu.Lock()
-			if qobj == nil && info.Pkg.Path() == defpkg {
-				// Find the object by its position (slightly ugly).
-				qobj = findObject(fset, &info.Info, objposn)
-				if qobj == nil {
-					// It really ought to be there;
-					// we found it once already.
-					log.Fatalf("object at %s not found in package %s",
-						objposn, defpkg)
-				}
-
-				// Object found.
-				qinfo = info
-				q.Output(fset, &referrersInitialResult{
-					qinfo: qinfo,
-					obj:   qobj,
-				})
-			}
-			obj := qobj
-			mu.Unlock()
-
-			// Look for references to the query object.
-			if obj != nil {
-				outputUses(q, fset, usesOf(obj, info), info.Pkg)
-			}
-		}
-
-		clearInfoFields(info) // save memory
-	}
-
-	lconf.Load() // ignore error
-
-	if qobj == nil {
-		log.Fatal("query object not found during reloading")
-	}
-
-	return nil // success
-}
-
-// findObject returns the object defined at the specified position.
-func findObject(fset *token.FileSet, info *types.Info, objposn token.Position) types.Object {
-	good := func(obj types.Object) bool {
-		if obj == nil {
-			return false
-		}
-		posn := fset.Position(obj.Pos())
-		return posn.Filename == objposn.Filename && posn.Offset == objposn.Offset
-	}
-	for _, obj := range info.Defs {
-		if good(obj) {
-			return obj
-		}
-	}
-	for _, obj := range info.Implicits {
-		if good(obj) {
-			return obj
-		}
-	}
-	return nil
-}
-
-// same reports whether x and y are identical, or both are PkgNames
-// that import the same Package.
-//
-func sameObj(x, y types.Object) bool {
-	if x == y {
-		return true
-	}
-	if x, ok := x.(*types.PkgName); ok {
-		if y, ok := y.(*types.PkgName); ok {
-			return x.Imported() == y.Imported()
-		}
-	}
-	return false
-}
-
-func clearInfoFields(info *loader.PackageInfo) {
-	// TODO(adonovan): opt: save memory by eliminating unneeded scopes/objects.
-	// (Requires go/types change for Go 1.7.)
-	//   info.Pkg.Scope().ClearChildren()
-
-	// Discard the file ASTs and their accumulated type
-	// information to save memory.
-	info.Files = nil
-	info.Defs = make(map[*ast.Ident]types.Object)
-	info.Uses = make(map[*ast.Ident]types.Object)
-	info.Implicits = make(map[ast.Node]types.Object)
-
-	// Also, disable future collection of wholly unneeded
-	// type information for the package in case there is
-	// more type-checking to do (augmentation).
-	info.Types = nil
-	info.Scopes = nil
-	info.Selections = nil
-}
-
-// -------- utils --------
-
-// An deterministic ordering for token.Pos that doesn't
-// depend on the order in which packages were loaded.
-func lessPos(fset *token.FileSet, x, y token.Pos) bool {
-	fx := fset.File(x)
-	fy := fset.File(y)
-	if fx != fy {
-		return fx.Name() < fy.Name()
-	}
-	return x < y
-}
-
-type byNamePos struct {
-	fset *token.FileSet
-	ids  []*ast.Ident
-}
-
-func (p byNamePos) Len() int      { return len(p.ids) }
-func (p byNamePos) Swap(i, j int) { p.ids[i], p.ids[j] = p.ids[j], p.ids[i] }
-func (p byNamePos) Less(i, j int) bool {
-	return lessPos(p.fset, p.ids[i].NamePos, p.ids[j].NamePos)
-}
-
-// referrersInitialResult is the initial result of a "referrers" query.
-type referrersInitialResult struct {
-	qinfo *loader.PackageInfo
-	obj   types.Object // object it denotes
-}
-
-func (r *referrersInitialResult) PrintPlain(printf printfFunc) {
-	printf(r.obj, "references to %s",
-		types.ObjectString(r.obj, types.RelativeTo(r.qinfo.Pkg)))
-}
-
-func (r *referrersInitialResult) JSON(fset *token.FileSet) []byte {
-	var objpos string
-	if pos := r.obj.Pos(); pos.IsValid() {
-		objpos = fset.Position(pos).String()
-	}
-	return toJSON(&serial.ReferrersInitial{
-		Desc:   r.obj.String(),
-		ObjPos: objpos,
-	})
-}
-
-// referrersPackageResult is the streaming result for one package of a "referrers" query.
-type referrersPackageResult struct {
-	pkg   *types.Package
-	build *build.Context
-	fset  *token.FileSet
-	refs  []*ast.Ident // set of all other references to it
-}
-
-// forEachRef calls f(id, text) for id in r.refs, in order.
-// Text is the text of the line on which id appears.
-func (r *referrersPackageResult) foreachRef(f func(id *ast.Ident, text string)) {
-	// Show referring lines, like grep.
-	type fileinfo struct {
-		refs     []*ast.Ident
-		linenums []int            // line number of refs[i]
-		data     chan interface{} // file contents or error
-	}
-	var fileinfos []*fileinfo
-	fileinfosByName := make(map[string]*fileinfo)
-
-	// First pass: start the file reads concurrently.
-	sema := make(chan struct{}, 20) // counting semaphore to limit I/O concurrency
-	for _, ref := range r.refs {
-		posn := r.fset.Position(ref.Pos())
-		fi := fileinfosByName[posn.Filename]
-		if fi == nil {
-			fi = &fileinfo{data: make(chan interface{})}
-			fileinfosByName[posn.Filename] = fi
-			fileinfos = append(fileinfos, fi)
-
-			// First request for this file:
-			// start asynchronous read.
-			go func() {
-				sema <- struct{}{} // acquire token
-				content, err := readFile(r.build, posn.Filename)
-				<-sema // release token
-				if err != nil {
-					fi.data <- err
-				} else {
-					fi.data <- content
-				}
-			}()
-		}
-		fi.refs = append(fi.refs, ref)
-		fi.linenums = append(fi.linenums, posn.Line)
-	}
-
-	// Second pass: print refs in original order.
-	// One line may have several refs at different columns.
-	for _, fi := range fileinfos {
-		v := <-fi.data // wait for I/O completion
-
-		// Print one item for all refs in a file that could not
-		// be loaded (perhaps due to //line directives).
-		if err, ok := v.(error); ok {
-			var suffix string
-			if more := len(fi.refs) - 1; more > 0 {
-				suffix = fmt.Sprintf(" (+ %d more refs in this file)", more)
-			}
-			f(fi.refs[0], err.Error()+suffix)
-			continue
-		}
-
-		lines := bytes.Split(v.([]byte), []byte("\n"))
-		for i, ref := range fi.refs {
-			f(ref, string(lines[fi.linenums[i]-1]))
-		}
-	}
-}
-
-// readFile is like ioutil.ReadFile, but
-// it goes through the virtualized build.Context.
-func readFile(ctxt *build.Context, filename string) ([]byte, error) {
-	rc, err := buildutil.OpenFile(ctxt, filename)
-	if err != nil {
-		return nil, err
-	}
-	defer rc.Close()
-	var buf bytes.Buffer
-	if _, err := io.Copy(&buf, rc); err != nil {
-		return nil, err
-	}
-	return buf.Bytes(), nil
-}
-
-func (r *referrersPackageResult) PrintPlain(printf printfFunc) {
-	r.foreachRef(func(id *ast.Ident, text string) {
-		printf(id, "%s", text)
-	})
-}
-
-func (r *referrersPackageResult) JSON(fset *token.FileSet) []byte {
-	refs := serial.ReferrersPackage{Package: r.pkg.Path()}
-	r.foreachRef(func(id *ast.Ident, text string) {
-		refs.Refs = append(refs.Refs, serial.Ref{
-			Pos:  fset.Position(id.NamePos).String(),
-			Text: text,
-		})
-	})
-	return toJSON(refs)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/serial/serial.go b/installer/vendor/golang.org/x/tools/cmd/guru/serial/serial.go
deleted file mode 100644
index 9528797750..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/serial/serial.go
+++ /dev/null
@@ -1,259 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package serial defines the guru's schema for -json output.
-//
-// The output of a guru query is a stream of one or more JSON objects.
-// This table shows the types of objects in the result stream for each
-// query type.
-//
-//      Query      Result stream
-//      -----      -------------
-//      callees    Callees
-//      callers    Caller ...
-//      callstack  CallStack
-//      definition Definition
-//      describe   Describe
-//      freevars   FreeVar ...
-//      implements Implements
-//      peers      Peers
-//      pointsto   PointsTo ...
-//      referrers  ReferrersInitial ReferrersPackage ...
-//      what       What
-//      whicherrs  WhichErrs
-//
-// All 'pos' strings in the output are of the form "file:line:col",
-// where line is the 1-based line number and col is the 1-based byte index.
-package serial
-
-// A Peers is the result of a 'peers' query.
-// If Allocs is empty, the selected channel can't point to anything.
-type Peers struct {
-	Pos      string   `json:"pos"`                // location of the selected channel op (<-)
-	Type     string   `json:"type"`               // type of the selected channel
-	Allocs   []string `json:"allocs,omitempty"`   // locations of aliased make(chan) ops
-	Sends    []string `json:"sends,omitempty"`    // locations of aliased ch<-x ops
-	Receives []string `json:"receives,omitempty"` // locations of aliased <-ch ops
-	Closes   []string `json:"closes,omitempty"`   // locations of aliased close(ch) ops
-}
-
-// A "referrers" query emits a ReferrersInitial object followed by zero or
-// more ReferrersPackage objects, one per package that contains a reference.
-type (
-	ReferrersInitial struct {
-		ObjPos string `json:"objpos,omitempty"` // location of the definition
-		Desc   string `json:"desc"`             // description of the denoted object
-	}
-	ReferrersPackage struct {
-		Package string `json:"package"`
-		Refs    []Ref  `json:"refs"` // non-empty list of references within this package
-	}
-	Ref struct {
-		Pos  string `json:"pos"`  // location of all references
-		Text string `json:"text"` // text of the referring line
-	}
-)
-
-// A Definition is the result of a 'definition' query.
-type Definition struct {
-	ObjPos string `json:"objpos,omitempty"` // location of the definition
-	Desc   string `json:"desc"`             // description of the denoted object
-}
-
-// A Callees is the result of a 'callees' query.
-//
-// Callees is nonempty unless the call was a dynamic call on a
-// provably nil func or interface value.
-type (
-	Callees struct {
-		Pos     string    `json:"pos"`  // location of selected call site
-		Desc    string    `json:"desc"` // description of call site
-		Callees []*Callee `json:"callees"`
-	}
-	Callee struct {
-		Name string `json:"name"` // full name of called function
-		Pos  string `json:"pos"`  // location of called function
-	}
-)
-
-// A Caller is one element of the slice returned by a 'callers' query.
-// (Callstack also contains a similar slice.)
-//
-// The root of the callgraph has an unspecified "Caller" string.
-type Caller struct {
-	Pos    string `json:"pos,omitempty"` // location of the calling function
-	Desc   string `json:"desc"`          // description of call site
-	Caller string `json:"caller"`        // full name of calling function
-}
-
-// A CallStack is the result of a 'callstack' query.
-// It indicates an arbitrary path from the root of the callgraph to
-// the query function.
-//
-// If the Callers slice is empty, the function was unreachable in this
-// analysis scope.
-type CallStack struct {
-	Pos     string   `json:"pos"`     // location of the selected function
-	Target  string   `json:"target"`  // the selected function
-	Callers []Caller `json:"callers"` // enclosing calls, innermost first.
-}
-
-// A FreeVar is one element of the slice returned by a 'freevars'
-// query.  Each one identifies an expression referencing a local
-// identifier defined outside the selected region.
-type FreeVar struct {
-	Pos  string `json:"pos"`  // location of the identifier's definition
-	Kind string `json:"kind"` // one of {var,func,type,const,label}
-	Ref  string `json:"ref"`  // referring expression (e.g. "x" or "x.y.z")
-	Type string `json:"type"` // type of the expression
-}
-
-// An Implements contains the result of an 'implements' query.
-// It describes the queried type, the set of named non-empty interface
-// types to which it is assignable, and the set of named/*named types
-// (concrete or non-empty interface) which may be assigned to it.
-//
-type Implements struct {
-	T                 ImplementsType   `json:"type,omitempty"`    // the queried type
-	AssignableTo      []ImplementsType `json:"to,omitempty"`      // types assignable to T
-	AssignableFrom    []ImplementsType `json:"from,omitempty"`    // interface types assignable from T
-	AssignableFromPtr []ImplementsType `json:"fromptr,omitempty"` // interface types assignable only from *T
-
-	// The following fields are set only if the query was a method.
-	// Assignable{To,From,FromPtr}Method[i] is the corresponding
-	// method of type Assignable{To,From,FromPtr}[i], or blank
-	// {"",""} if that type lacks the method.
-	Method                  *DescribeMethod  `json:"method,omitempty"` //  the queried method
-	AssignableToMethod      []DescribeMethod `json:"to_method,omitempty"`
-	AssignableFromMethod    []DescribeMethod `json:"from_method,omitempty"`
-	AssignableFromPtrMethod []DescribeMethod `json:"fromptr_method,omitempty"`
-}
-
-// An ImplementsType describes a single type as part of an 'implements' query.
-type ImplementsType struct {
-	Name string `json:"name"` // full name of the type
-	Pos  string `json:"pos"`  // location of its definition
-	Kind string `json:"kind"` // "basic", "array", etc
-}
-
-// A SyntaxNode is one element of a stack of enclosing syntax nodes in
-// a "what" query.
-type SyntaxNode struct {
-	Description string `json:"desc"`  // description of syntax tree
-	Start       int    `json:"start"` // start byte offset, 0-based
-	End         int    `json:"end"`   // end byte offset
-}
-
-// A What is the result of the "what" query, which quickly identifies
-// the selection, parsing only a single file.  It is intended for use
-// in low-latency GUIs.
-type What struct {
-	Enclosing  []SyntaxNode `json:"enclosing"`            // enclosing nodes of syntax tree
-	Modes      []string     `json:"modes"`                // query modes enabled for this selection.
-	SrcDir     string       `json:"srcdir,omitempty"`     // $GOROOT src directory containing queried package
-	ImportPath string       `json:"importpath,omitempty"` // import path of queried package
-	Object     string       `json:"object,omitempty"`     // name of identified object, if any
-	SameIDs    []string     `json:"sameids,omitempty"`    // locations of references to same object
-}
-
-// A PointsToLabel describes a pointer analysis label.
-//
-// A "label" is an object that may be pointed to by a pointer, map,
-// channel, 'func', slice or interface.  Labels include:
-//    - functions
-//    - globals
-//    - arrays created by literals (e.g. []byte("foo")) and conversions ([]byte(s))
-//    - stack- and heap-allocated variables (including composite literals)
-//    - arrays allocated by append()
-//    - channels, maps and arrays created by make()
-//    - and their subelements, e.g. "alloc.y[*].z"
-//
-type PointsToLabel struct {
-	Pos  string `json:"pos"`  // location of syntax that allocated the object
-	Desc string `json:"desc"` // description of the label
-}
-
-// A PointsTo is one element of the result of a 'pointsto' query on an
-// expression.  It describes a single pointer: its type and the set of
-// "labels" it points to.
-//
-// If the pointer is of interface type, it will have one PTS entry
-// describing each concrete type that it may contain.  For each
-// concrete type that is a pointer, the PTS entry describes the labels
-// it may point to.  The same is true for reflect.Values, except the
-// dynamic types needn't be concrete.
-//
-type PointsTo struct {
-	Type    string          `json:"type"`              // (concrete) type of the pointer
-	NamePos string          `json:"namepos,omitempty"` // location of type defn, if Named
-	Labels  []PointsToLabel `json:"labels,omitempty"`  // pointed-to objects
-}
-
-// A DescribeValue is the additional result of a 'describe' query
-// if the selection indicates a value or expression.
-type DescribeValue struct {
-	Type   string `json:"type"`             // type of the expression
-	Value  string `json:"value,omitempty"`  // value of the expression, if constant
-	ObjPos string `json:"objpos,omitempty"` // location of the definition, if an Ident
-}
-
-type DescribeMethod struct {
-	Name string `json:"name"` // method name, as defined by types.Selection.String()
-	Pos  string `json:"pos"`  // location of the method's definition
-}
-
-// A DescribeType is the additional result of a 'describe' query
-// if the selection indicates a type.
-type DescribeType struct {
-	Type    string           `json:"type"`              // the string form of the type
-	NamePos string           `json:"namepos,omitempty"` // location of definition of type, if named
-	NameDef string           `json:"namedef,omitempty"` // underlying definition of type, if named
-	Methods []DescribeMethod `json:"methods,omitempty"` // methods of the type
-}
-
-type DescribeMember struct {
-	Name    string           `json:"name"`              // name of member
-	Type    string           `json:"type,omitempty"`    // type of member (underlying, if 'type')
-	Value   string           `json:"value,omitempty"`   // value of member (if 'const')
-	Pos     string           `json:"pos"`               // location of definition of member
-	Kind    string           `json:"kind"`              // one of {var,const,func,type}
-	Methods []DescribeMethod `json:"methods,omitempty"` // methods (if member is a type)
-}
-
-// A DescribePackage is the additional result of a 'describe' if
-// the selection indicates a package.
-type DescribePackage struct {
-	Path    string            `json:"path"`              // import path of the package
-	Members []*DescribeMember `json:"members,omitempty"` // accessible members of the package
-}
-
-// A Describe is the result of a 'describe' query.
-// It may contain an element describing the selected semantic entity
-// in detail.
-type Describe struct {
-	Desc   string `json:"desc"`             // description of the selected syntax node
-	Pos    string `json:"pos"`              // location of the selected syntax node
-	Detail string `json:"detail,omitempty"` // one of {package, type, value}, or "".
-
-	// At most one of the following fields is populated:
-	// the one specified by 'detail'.
-	Package *DescribePackage `json:"package,omitempty"`
-	Type    *DescribeType    `json:"type,omitempty"`
-	Value   *DescribeValue   `json:"value,omitempty"`
-}
-
-// A WhichErrs is the result of a 'whicherrs' query.
-// It contains the position of the queried error and the possible globals,
-// constants, and types it may point to.
-type WhichErrs struct {
-	ErrPos    string          `json:"errpos,omitempty"`    // location of queried error
-	Globals   []string        `json:"globals,omitempty"`   // locations of globals
-	Constants []string        `json:"constants,omitempty"` // locations of constants
-	Types     []WhichErrsType `json:"types,omitempty"`     // Types
-}
-
-type WhichErrsType struct {
-	Type     string `json:"type,omitempty"`
-	Position string `json:"position,omitempty"`
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/README.txt b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/README.txt
deleted file mode 100644
index 34fc41ae4e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-This is not a Go source file.
-Used by TestIssue14684.
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.go
deleted file mode 100644
index 42e1d297f1..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Tests of Go 1.9 type aliases.
-// See go.tools/guru/guru_test.go for explanation.
-// See alias.golden for expected query results.
-
-package alias // @describe describe-pkg "alias"
-
-type I interface { // @implements implements-I "I"
-	f()
-}
-
-type N int
-
-func (N) f() {}
-
-type M = N // @describe describe-def-M "M"
-var m M    // @describe describe-ref-M "M"
-
-type O N // @describe describe-O "O"
-
-type P = struct{ N } // @describe describe-P "N"
-
-type U = undefined // @describe describe-U "U"
-type _ = undefined // @describe describe-undefined "undefined"
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.golden
deleted file mode 100644
index b5ba46e542..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/alias/alias.golden
+++ /dev/null
@@ -1,47 +0,0 @@
--------- @describe describe-pkg --------
-definition of package "alias"
-	type  I interface{f()}
-		method (I) f()
-	type  M = N
-		method (N) f()
-	type  N int
-		method (N) f()
-	type  O int
-	type  P = struct{N}
-		method (struct{N}) f()
-	type  U = invalid type
-	var   m N
-
--------- @implements implements-I --------
-interface type I
-	is implemented by basic type N
-
--------- @describe describe-def-M --------
-alias of type N (size 8, align 8)
-defined as int
-Methods:
-	method (N) f()
-
--------- @describe describe-ref-M --------
-alias of type N (size 8, align 8)
-defined as int
-Methods:
-	method (N) f()
-
--------- @describe describe-O --------
-definition of type O (size 8, align 8)
-No methods.
-
--------- @describe describe-P --------
-type struct{N} (size 8, align 8)
-Methods:
-	method (struct{N}) f()
-Fields:
-	N N
-
--------- @describe describe-U --------
-alias of type invalid type
-
--------- @describe describe-undefined --------
-identifier
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.go
deleted file mode 100644
index 9d58ed1efd..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.go
+++ /dev/null
@@ -1,16 +0,0 @@
-package main
-
-// Tests of call-graph queries, -format=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See calls-json.golden for expected query results.
-
-func call(f func()) {
-	f() // @callees @callees-f "f"
-}
-
-func main() {
-	call(func() {
-		// @callers callers-main.anon "^"
-		// @callstack callstack-main.anon "^"
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.golden
deleted file mode 100644
index 27dc50908d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls-json/main.golden
+++ /dev/null
@@ -1,28 +0,0 @@
--------- @callees @callees-f --------
-{
-	"pos": "testdata/src/calls-json/main.go:8:3",
-	"desc": "dynamic function call",
-	"callees": [
-		{
-			"name": "calls-json.main$1",
-			"pos": "testdata/src/calls-json/main.go:12:7"
-		}
-	]
-}
--------- @callstack callstack-main.anon --------
-{
-	"pos": "testdata/src/calls-json/main.go:12:7",
-	"target": "calls-json.main$1",
-	"callers": [
-		{
-			"pos": "testdata/src/calls-json/main.go:8:3",
-			"desc": "dynamic function call",
-			"caller": "calls-json.call"
-		},
-		{
-			"pos": "testdata/src/calls-json/main.go:12:6",
-			"desc": "static function call",
-			"caller": "calls-json.main"
-		}
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.go
deleted file mode 100644
index a208914020..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.go
+++ /dev/null
@@ -1,129 +0,0 @@
-package main
-
-import (
-	"fmt"
-)
-
-// Tests of call-graph queries.
-// See go.tools/guru/guru_test.go for explanation.
-// See calls.golden for expected query results.
-
-func A(x *int) { // @pointsto pointsto-A-x "x"
-	// @callers callers-A "^"
-	// @callstack callstack-A "^"
-}
-
-func B(x *int) { // @pointsto pointsto-B-x "x"
-	// @callers callers-B "^"
-}
-
-func foo() {
-}
-
-// apply is not (yet) treated context-sensitively.
-func apply(f func(x *int), x *int) {
-	f(x) // @callees callees-apply "f"
-	// @callers callers-apply "^"
-}
-
-// store *is* treated context-sensitively,
-// so the points-to sets for pc, pd are precise.
-func store(ptr **int, value *int) {
-	*ptr = value
-	// @callers callers-store "^"
-}
-
-func call(f func() *int) {
-	// Result points to anon function.
-	f() // @pointsto pointsto-result-f "f"
-
-	// Target of call is anon function.
-	f() // @callees callees-main.call-f "f"
-
-	// @callers callers-main.call "^"
-}
-
-func main() {
-	var a, b int
-	go apply(A, &a) // @callees callees-main-apply1 "app"
-	defer apply(B, &b)
-
-	var c, d int
-	var pc, pd *int // @pointsto pointsto-pc "pc"
-	store(&pc, &c)
-	store(&pd, &d)
-	_ = pd // @pointsto pointsto-pd "pd"
-
-	call(func() *int {
-		// We are called twice from main.call
-		// @callers callers-main.anon "^"
-		return &a
-	})
-
-	// Errors
-	_ = "no function call here"   // @callees callees-err-no-call "no"
-	print("builtin")              // @callees callees-err-builtin "builtin"
-	_ = string("type conversion") // @callees callees-err-conversion "str"
-	call(nil)                     // @callees callees-err-bad-selection "call\\(nil"
-	if false {
-		main() // @callees callees-err-deadcode1 "main"
-	}
-	var nilFunc func()
-	nilFunc() // @callees callees-err-nil-func "nilFunc"
-	var i interface {
-		f()
-	}
-	i.f() // @callees callees-err-nil-interface "i.f"
-
-	i = new(myint)
-	i.f() // @callees callees-not-a-wrapper "f"
-
-	// statically dispatched calls. Handled specially by callees, so test that they work.
-	foo()         // @callees callees-static-call "foo"
-	fmt.Println() // @callees callees-qualified-call "Println"
-	m := new(method)
-	m.f() // @callees callees-static-method-call "f"
-	g := new(embeddedIface)
-	g.iface = m
-	g.f() // @callees callees-implicit-selection-method-call "f"
-}
-
-type myint int
-
-func (myint) f() {
-	// @callers callers-not-a-wrapper "^"
-}
-
-type method int
-
-func (method) f() {
-}
-
-type embeddedIface struct {
-	iface
-}
-
-type iface interface {
-	f()
-}
-
-var dynamic = func() {}
-
-func deadcode() {
-	main() // @callees callees-err-deadcode2 "main"
-	// @callers callers-err-deadcode "^"
-	// @callstack callstack-err-deadcode "^"
-
-	// Within dead code, dynamic calls have no callees.
-	dynamic() // @callees callees-err-deadcode3 "dynamic"
-}
-
-// This code belongs to init.
-var global = 123 // @callers callers-global "global"
-
-// The package initializer may be called by other packages' inits, or
-// in this case, the root of the callgraph.  The source-level init functions
-// are in turn called by it.
-func init() {
-	// @callstack callstack-init "^"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.golden
deleted file mode 100644
index ab68e95a63..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/calls/main.golden
+++ /dev/null
@@ -1,125 +0,0 @@
--------- @pointsto pointsto-A-x --------
-this *int may point to these objects:
-	a
-	b
-
--------- @callstack callstack-A --------
-Found a call path from root to calls.A
-calls.A
-dynamic function call from calls.apply
-concurrent static function call from calls.main
-
--------- @pointsto pointsto-B-x --------
-this *int may point to these objects:
-	a
-	b
-
--------- @callers callers-B --------
-calls.B is called from these 1 sites:
-	dynamic function call from calls.apply
-
--------- @callees callees-apply --------
-this dynamic function call dispatches to:
-	calls.A
-	calls.B
-
--------- @callers callers-apply --------
-calls.apply is called from these 2 sites:
-	concurrent static function call from calls.main
-	deferred static function call from calls.main
-
--------- @callers callers-store --------
-calls.store is called from these 2 sites:
-	static function call from calls.main
-	static function call from calls.main
-
--------- @pointsto pointsto-result-f --------
-this func() *int may point to these objects:
-	calls.main$1
-
--------- @callees callees-main.call-f --------
-this dynamic function call dispatches to:
-	calls.main$1
-
--------- @callers callers-main.call --------
-calls.call is called from these 2 sites:
-	static function call from calls.main
-	static function call from calls.main
-
--------- @callees callees-main-apply1 --------
-this static function call dispatches to:
-	calls.apply
-
--------- @pointsto pointsto-pc --------
-this *int may point to these objects:
-	c
-
--------- @pointsto pointsto-pd --------
-this *int may point to these objects:
-	d
-
--------- @callees callees-err-no-call --------
-
-Error: there is no function call here
--------- @callees callees-err-builtin --------
-
-Error: this is a call to the built-in 'print' operator
--------- @callees callees-err-conversion --------
-
-Error: this is a type conversion, not a function call
--------- @callees callees-err-bad-selection --------
-
-Error: ambiguous selection within function call (or conversion)
--------- @callees callees-err-deadcode1 --------
-this static function call dispatches to:
-	calls.main
-
--------- @callees callees-err-nil-func --------
-dynamic function call on nil value
-
--------- @callees callees-err-nil-interface --------
-dynamic method call on nil value
-
--------- @callees callees-not-a-wrapper --------
-this dynamic method call dispatches to:
-	(calls.myint).f
-
--------- @callees callees-static-call --------
-this static function call dispatches to:
-	calls.foo
-
--------- @callees callees-qualified-call --------
-this static function call dispatches to:
-	fmt.Println
-
--------- @callees callees-static-method-call --------
-this static function call dispatches to:
-	(calls.method).f
-
--------- @callees callees-implicit-selection-method-call --------
-this dynamic method call dispatches to:
-	(calls.method).f
-
--------- @callers callers-not-a-wrapper --------
-(calls.myint).f is called from these 1 sites:
-	dynamic method call from calls.main
-
--------- @callees callees-err-deadcode2 --------
-this static function call dispatches to:
-	calls.main
-
--------- @callstack callstack-err-deadcode --------
-calls.deadcode is unreachable in this analysis scope
-
--------- @callees callees-err-deadcode3 --------
-
-Error: this call site is unreachable in this analysis
--------- @callers callers-global --------
-calls.init is called from these 1 sites:
-the root of the call graph
-
--------- @callstack callstack-init --------
-Found a call path from root to calls.init#1
-calls.init#1
-static function call from calls.init
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.go
deleted file mode 100644
index 64084049a8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.go
+++ /dev/null
@@ -1,66 +0,0 @@
-package definition
-
-// Tests of 'definition' query, -json output.
-// See golang.org/x/tools/cmd/guru/guru_test.go for explanation.
-// See main.golden for expected query results.
-
-// TODO(adonovan): test: selection of member of same package defined in another file.
-
-import (
-	"lib"
-	lib2 "lib"
-)
-
-func main() {
-	var _ int // @definition builtin "int"
-
-	var _ undef           // @definition lexical-undef "undef"
-	var x lib.T           // @definition lexical-pkgname "lib"
-	f()                   // @definition lexical-func "f"
-	print(x)              // @definition lexical-var "x"
-	if x := ""; x == "" { // @definition lexical-shadowing "x"
-	}
-
-	var _ lib.Type     // @definition qualified-type "Type"
-	var _ lib.Func     // @definition qualified-func "Func"
-	var _ lib.Var      // @definition qualified-var "Var"
-	var _ lib.Const    // @definition qualified-const "Const"
-	var _ lib2.Type    // @definition qualified-type-renaming "Type"
-	var _ lib.Nonesuch // @definition qualified-nomember "Nonesuch"
-
-	var u U
-	print(u.field) // @definition select-field "field"
-	u.method()     // @definition select-method "method"
-}
-
-func f()
-
-type T struct{ field int }
-
-func (T) method()
-
-type U struct{ T }
-
-type V1 struct {
-	W // @definition embedded-other-file "W"
-}
-
-type V2 struct {
-	*W // @definition embedded-other-file-pointer "W"
-}
-
-type V3 struct {
-	int // @definition embedded-basic "int"
-}
-
-type V4 struct {
-	*int // @definition embedded-basic-pointer "int"
-}
-
-type V5 struct {
-	lib.Type // @definition embedded-other-pkg "Type"
-}
-
-type V6 struct {
-	T // @definition embedded-same-file "T"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.golden
deleted file mode 100644
index af0a687c44..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main.golden
+++ /dev/null
@@ -1,90 +0,0 @@
--------- @definition builtin --------
-
-Error: int is built in
--------- @definition lexical-undef --------
-
-Error: no object for identifier
--------- @definition lexical-pkgname --------
-{
-	"objpos": "testdata/src/definition-json/main.go:10:2",
-	"desc": "package lib"
-}
--------- @definition lexical-func --------
-{
-	"objpos": "$GOPATH/src/definition-json/main.go:36:6",
-	"desc": "func f"
-}
--------- @definition lexical-var --------
-{
-	"objpos": "$GOPATH/src/definition-json/main.go:18:6",
-	"desc": "var x"
-}
--------- @definition lexical-shadowing --------
-{
-	"objpos": "$GOPATH/src/definition-json/main.go:21:5",
-	"desc": "var x"
-}
--------- @definition qualified-type --------
-{
-	"objpos": "testdata/src/lib/lib.go:3:6",
-	"desc": "type lib.Type"
-}
--------- @definition qualified-func --------
-{
-	"objpos": "testdata/src/lib/lib.go:9:6",
-	"desc": "func lib.Func"
-}
--------- @definition qualified-var --------
-{
-	"objpos": "testdata/src/lib/lib.go:14:5",
-	"desc": "var lib.Var"
-}
--------- @definition qualified-const --------
-{
-	"objpos": "testdata/src/lib/lib.go:12:7",
-	"desc": "const lib.Const"
-}
--------- @definition qualified-type-renaming --------
-{
-	"objpos": "testdata/src/lib/lib.go:3:6",
-	"desc": "type lib.Type"
-}
--------- @definition qualified-nomember --------
-
-Error: couldn't find declaration of Nonesuch in "lib"
--------- @definition select-field --------
-{
-	"objpos": "testdata/src/definition-json/main.go:38:16",
-	"desc": "field field int"
-}
--------- @definition select-method --------
-{
-	"objpos": "testdata/src/definition-json/main.go:40:10",
-	"desc": "func (T).method()"
-}
--------- @definition embedded-other-file --------
-{
-	"objpos": "testdata/src/definition-json/type.go:3:6",
-	"desc": "type W int"
-}
--------- @definition embedded-other-file-pointer --------
-{
-	"objpos": "testdata/src/definition-json/type.go:3:6",
-	"desc": "type W int"
-}
--------- @definition embedded-basic --------
-
-Error: int is built in
--------- @definition embedded-basic-pointer --------
-
-Error: int is built in
--------- @definition embedded-other-pkg --------
-{
-	"objpos": "testdata/src/lib/lib.go:3:6",
-	"desc": "type lib.Type"
-}
--------- @definition embedded-same-file --------
-{
-	"objpos": "$GOPATH/src/definition-json/main.go:38:6",
-	"desc": "type T"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.go
deleted file mode 100644
index 9f047c384e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package definition
-
-import "nosuchpkg"
-
-var _ nosuchpkg.T // @definition qualified-nopkg "nosuchpkg"
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.golden
deleted file mode 100644
index 3281aa5b71..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/main19.golden
+++ /dev/null
@@ -1,5 +0,0 @@
--------- @definition qualified-nopkg --------
-{
-	"objpos": "testdata/src/definition-json/main19.go:3:8",
-	"desc": "package nosuchpkg"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/type.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/type.go
deleted file mode 100644
index a574bf37fc..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/definition-json/type.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package definition
-
-type W int
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.go
deleted file mode 100644
index 549dd8aaf2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package describe // @describe pkgdecl "describe"
-
-// Tests of 'describe' query, -format=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See describe-json.golden for expected query results.
-
-func main() {
-	var s struct{ x [3]int }
-	p := &s.x[0] // @describe desc-val-p "p"
-	_ = p
-
-	var i I = C(0)
-	if i == nil {
-		i = new(D)
-	}
-	print(i) // @describe desc-val-i "\\bi\\b"
-
-	go main() // @describe desc-stmt "go"
-}
-
-type I interface {
-	f()
-}
-
-type C int // @describe desc-type-C "C"
-type D struct{}
-
-func (c C) f()  {}
-func (d *D) f() {}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.golden
deleted file mode 100644
index 5806e0c487..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe-json/main.golden
+++ /dev/null
@@ -1,96 +0,0 @@
--------- @describe pkgdecl --------
-{
-	"desc": "definition of package \"describe-json\"",
-	"pos": "testdata/src/describe-json/main.go:1:9",
-	"detail": "package",
-	"package": {
-		"path": "describe-json",
-		"members": [
-			{
-				"name": "C",
-				"type": "int",
-				"pos": "testdata/src/describe-json/main.go:25:6",
-				"kind": "type",
-				"methods": [
-					{
-						"name": "method (C) f()",
-						"pos": "testdata/src/describe-json/main.go:28:12"
-					}
-				]
-			},
-			{
-				"name": "D",
-				"type": "struct{}",
-				"pos": "testdata/src/describe-json/main.go:26:6",
-				"kind": "type",
-				"methods": [
-					{
-						"name": "method (*D) f()",
-						"pos": "testdata/src/describe-json/main.go:29:13"
-					}
-				]
-			},
-			{
-				"name": "I",
-				"type": "interface{f()}",
-				"pos": "testdata/src/describe-json/main.go:21:6",
-				"kind": "type",
-				"methods": [
-					{
-						"name": "method (I) f()",
-						"pos": "testdata/src/describe-json/main.go:22:2"
-					}
-				]
-			},
-			{
-				"name": "main",
-				"type": "func()",
-				"pos": "testdata/src/describe-json/main.go:7:6",
-				"kind": "func"
-			}
-		]
-	}
-}
--------- @describe desc-val-p --------
-{
-	"desc": "identifier",
-	"pos": "testdata/src/describe-json/main.go:9:2",
-	"detail": "value",
-	"value": {
-		"type": "*int",
-		"objpos": "testdata/src/describe-json/main.go:9:2"
-	}
-}
--------- @describe desc-val-i --------
-{
-	"desc": "identifier",
-	"pos": "testdata/src/describe-json/main.go:16:8",
-	"detail": "value",
-	"value": {
-		"type": "I",
-		"objpos": "testdata/src/describe-json/main.go:12:6"
-	}
-}
--------- @describe desc-stmt --------
-{
-	"desc": "go statement",
-	"pos": "testdata/src/describe-json/main.go:18:2",
-	"detail": "unknown"
-}
--------- @describe desc-type-C --------
-{
-	"desc": "definition of type C (size 8, align 8)",
-	"pos": "testdata/src/describe-json/main.go:25:6",
-	"detail": "type",
-	"type": {
-		"type": "C",
-		"namepos": "testdata/src/describe-json/main.go:25:6",
-		"namedef": "int",
-		"methods": [
-			{
-				"name": "method (C) f()",
-				"pos": "testdata/src/describe-json/main.go:28:12"
-			}
-		]
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.go
deleted file mode 100644
index c6c5349284..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package describe // @describe pkgdecl "describe"
-
-// Tests of 'describe' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See describe.golden for expected query results.
-
-// TODO(adonovan): more coverage of the (extensive) logic.
-
-import (
-	"lib"
-	_ "unsafe" // @describe unsafe "unsafe"
-)
-
-type cake float64 // @describe type-ref-builtin "float64"
-
-const c = iota // @describe const-ref-iota "iota"
-
-const pi = 3.141     // @describe const-def-pi "pi"
-const pie = cake(pi) // @describe const-def-pie "pie"
-const _ = pi         // @describe const-ref-pi "pi"
-
-var global = new(string) // NB: ssa.Global is indirect, i.e. **string
-
-func main() { // @describe func-def-main "main"
-	// func objects
-	_ = main   // @describe func-ref-main "main"
-	_ = (*C).f // @describe func-ref-*C.f "..C..f"
-	_ = D.f    // @describe func-ref-D.f "D.f"
-	_ = I.f    // @describe func-ref-I.f "I.f"
-	var d D    // @describe type-D "D"
-	var i I    // @describe type-I "I"
-	_ = d.f    // @describe func-ref-d.f "d.f"
-	_ = i.f    // @describe func-ref-i.f "i.f"
-
-	var dptr *D // @describe ptr-with-nonptr-methods "dptr"
-	_ = dptr
-
-	// var objects
-	anon := func() {
-		_ = d // @describe ref-lexical-d "d"
-	}
-	_ = anon   // @describe ref-anon "anon"
-	_ = global // @describe ref-global "global"
-
-	// SSA affords some local flow sensitivity.
-	var a, b int
-	var x = &a // @describe var-def-x-1 "x"
-	_ = x      // @describe var-ref-x-1 "x"
-	x = &b     // @describe var-def-x-2 "x"
-	_ = x      // @describe var-ref-x-2 "x"
-
-	i = new(C) // @describe var-ref-i-C "i"
-	if i != nil {
-		i = D{} // @describe var-ref-i-D "i"
-	}
-	print(i) // @describe var-ref-i "\\bi\\b"
-
-	// const objects
-	const localpi = 3.141     // @describe const-local-pi "localpi"
-	const localpie = cake(pi) // @describe const-local-pie "localpie"
-	const _ = localpi         // @describe const-ref-localpi "localpi"
-
-	// type objects
-	type T int      // @describe type-def-T "T"
-	var three T = 3 // @describe type-ref-T "T"
-	_ = three
-
-	print(1 + 2*3)        // @describe const-expr " 2.3"
-	print(real(1+2i) - 3) // @describe const-expr2 "real.*3"
-
-	m := map[string]*int{"a": &a}
-	mapval, _ := m["a"] // @describe map-lookup,ok "m..a.."
-	_ = mapval          // @describe mapval "mapval"
-	_ = m               // @describe m "m"
-
-	defer main() // @describe defer-stmt "defer"
-	go main()    // @describe go-stmt "go"
-
-	panic(3) // @describe builtin-ref-panic "panic"
-
-	var a2 int // @describe var-decl-stmt "var a2 int"
-	_ = a2
-	var _ int // @describe var-decl-stmt2 "var _ int"
-	var _ int // @describe var-def-blank "_"
-
-	var _ lib.Outer // @describe lib-outer "Outer"
-
-	unknown() // @describe call-unknown "\\("
-}
-
-type I interface { // @describe def-iface-I "I"
-	f() // @describe def-imethod-I.f "f"
-}
-
-type C int
-type D struct {
-	Field        int
-	AnotherField string
-}
-
-func (c *C) f() {}
-func (d D) f()  {}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.golden
deleted file mode 100644
index 724643d67d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main.golden
+++ /dev/null
@@ -1,212 +0,0 @@
--------- @describe pkgdecl --------
-definition of package "describe"
-	type  C      int
-		method (*C) f()
-	type  D      struct{...}
-		method (D) f()
-	type  I      interface{f()}
-		method (I) f()
-	const c      untyped int = 0
-	type  cake   float64
-	var   global *string
-	func  main   func()
-	const pi     untyped float = 3.141
-	const pie    cake = 3.141
-
--------- @describe unsafe --------
-import of package "unsafe"
-	builtin Alignof 
-	builtin Offsetof
-	type  Pointer  unsafe.Pointer
-	builtin Sizeof  
-
--------- @describe type-ref-builtin --------
-reference to built-in type float64
-
--------- @describe const-ref-iota --------
-reference to const iota untyped int of value 0
-
--------- @describe const-def-pi --------
-definition of const pi untyped float of value 3.141
-
--------- @describe const-def-pie --------
-definition of const pie cake of value 3.141
-
--------- @describe const-ref-pi --------
-reference to const pi untyped float of value 3.141
-defined here
-
--------- @describe func-def-main --------
-definition of func main()
-
--------- @describe func-ref-main --------
-reference to func main()
-defined here
-
--------- @describe func-ref-*C.f --------
-reference to method func (*C).f()
-defined here
-
--------- @describe func-ref-D.f --------
-reference to method func (D).f()
-defined here
-
--------- @describe func-ref-I.f --------
-reference to interface method func (I).f()
-defined here
-
--------- @describe type-D --------
-reference to type D (size 24, align 8)
-defined as struct{Field int; AnotherField string}
-Methods:
-	method (D) f()
-Fields:
-	Field        int
-	AnotherField string
-
--------- @describe type-I --------
-reference to type I (size 16, align 8)
-defined as interface{f()}
-Methods:
-	method (I) f()
-
--------- @describe func-ref-d.f --------
-reference to method func (D).f()
-defined here
-
--------- @describe func-ref-i.f --------
-reference to interface method func (I).f()
-defined here
-
--------- @describe ptr-with-nonptr-methods --------
-definition of var dptr *D
-Methods:
-	method (*D) f()
-Fields:
-	Field        int
-	AnotherField string
-
--------- @describe ref-lexical-d --------
-reference to var d D
-defined here
-Methods:
-	method (D) f()
-Fields:
-	Field        int
-	AnotherField string
-
--------- @describe ref-anon --------
-reference to var anon func()
-defined here
-
--------- @describe ref-global --------
-reference to var global *string
-defined here
-
--------- @describe var-def-x-1 --------
-definition of var x *int
-
--------- @describe var-ref-x-1 --------
-reference to var x *int
-defined here
-
--------- @describe var-def-x-2 --------
-reference to var x *int
-defined here
-
--------- @describe var-ref-x-2 --------
-reference to var x *int
-defined here
-
--------- @describe var-ref-i-C --------
-reference to var i I
-defined here
-Methods:
-	method (I) f()
-
--------- @describe var-ref-i-D --------
-reference to var i I
-defined here
-Methods:
-	method (I) f()
-
--------- @describe var-ref-i --------
-reference to var i I
-defined here
-Methods:
-	method (I) f()
-
--------- @describe const-local-pi --------
-definition of const localpi untyped float of value 3.141
-
--------- @describe const-local-pie --------
-definition of const localpie cake of value 3.141
-
--------- @describe const-ref-localpi --------
-reference to const localpi untyped float of value 3.141
-defined here
-
--------- @describe type-def-T --------
-definition of type T (size 8, align 8)
-No methods.
-
--------- @describe type-ref-T --------
-reference to type T (size 8, align 8)
-defined as int
-No methods.
-
--------- @describe const-expr --------
-binary * operation of value 6
-
--------- @describe const-expr2 --------
-binary - operation of value -2
-
--------- @describe map-lookup,ok --------
-index expression of type (*int, bool)
-
--------- @describe mapval --------
-reference to var mapval *int
-defined here
-
--------- @describe m --------
-reference to var m map[string]*int
-defined here
-
--------- @describe defer-stmt --------
-defer statement
-
--------- @describe go-stmt --------
-go statement
-
--------- @describe builtin-ref-panic --------
-function call (or conversion) of type ()
-
--------- @describe var-decl-stmt --------
-definition of var a2 int
-
--------- @describe var-decl-stmt2 --------
-definition of var _ int
-
--------- @describe var-def-blank --------
-definition of var _ int
-
--------- @describe lib-outer --------
-reference to type lib.Outer (size 56, align 8)
-defined as struct{A int; b int; lib.inner}
-No methods.
-Fields:
-	A                 int
-	inner.C           bool
-	inner.recursive.E bool
-
--------- @describe call-unknown --------
-function call of type invalid type
-
--------- @describe def-iface-I --------
-definition of type I (size 16, align 8)
-Methods:
-	method (I) f()
-
--------- @describe def-imethod-I.f --------
-definition of interface method func (I).f()
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.go
deleted file mode 100644
index 2068f8ced3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package describe
-
-// The behavior of "describe" on a non-existent import changed
-// when go/types started returning fake packages, so this test
-// is executed only under go1.9.
-
-import (
-	"nosuchpkg"            // @describe badimport1 "nosuchpkg"
-	nosuchpkg2 "nosuchpkg" // @describe badimport2 "nosuchpkg2"
-)
-
-var _ nosuchpkg.T
-var _ nosuchpkg2.T
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.golden
deleted file mode 100644
index 005e30ba46..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/describe/main19.golden
+++ /dev/null
@@ -1,6 +0,0 @@
--------- @describe badimport1 --------
-import of package "nosuchpkg"
-
--------- @describe badimport2 --------
-reference to package "nosuchpkg"
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.go
deleted file mode 100644
index c6aa08d229..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package main
-
-// Tests of 'freevars' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See freevars.golden for expected query results.
-
-// TODO(adonovan): it's hard to test this query in a single line of gofmt'd code.
-
-type T struct {
-	a, b int
-}
-
-type S struct {
-	x int
-	t T
-}
-
-func f(int) {}
-
-func main() {
-	type C int
-	x := 1
-	const exp = 6
-	if y := 2; x+y+int(C(3)) != exp { // @freevars fv1 "if.*{"
-		panic("expected 6")
-	}
-
-	var s S
-
-	for x, y := range "foo" {
-		println(s.x + s.t.a + s.t.b + x + int(y)) // @freevars fv2 "print.*y."
-	}
-
-	f(x) // @freevars fv3 "f.x."
-
-loop: // @freevars fv-def-label "loop:"
-	for {
-		break loop // @freevars fv-ref-label "break loop"
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.golden
deleted file mode 100644
index a3bc0c9538..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/freevars/main.golden
+++ /dev/null
@@ -1,25 +0,0 @@
--------- @freevars fv1 --------
-Free identifiers:
-type C
-const exp int
-var x int
-
--------- @freevars fv2 --------
-Free identifiers:
-var s.t.a int
-var s.t.b int
-var s.x int
-var x int
-var y rune
-
--------- @freevars fv3 --------
-Free identifiers:
-var x int
-
--------- @freevars fv-def-label --------
-No free identifiers.
-
--------- @freevars fv-ref-label --------
-Free identifiers:
-label loop
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.go
deleted file mode 100644
index e18a373ab7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-// Tests of 'implements' query, -output=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See implements.golden for expected query results.
-
-func main() {
-}
-
-type E interface{} // @implements E "E"
-
-type F interface { // @implements F "F"
-	f()
-}
-
-type FG interface { // @implements FG "FG"
-	f()
-	g() []int // @implements slice "..int"
-}
-
-type C int // @implements C "C"
-type D struct{}
-
-func (c *C) f() {} // @implements starC ".C"
-func (d D) f()  {} // @implements D "D"
-
-func (d *D) g() []int { return nil } // @implements starD ".D"
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.golden
deleted file mode 100644
index ce18c1c642..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-json/main.golden
+++ /dev/null
@@ -1,135 +0,0 @@
--------- @implements E --------
-{
-	"type": {
-		"name": "implements-json.E",
-		"pos": "testdata/src/implements-json/main.go:10:6",
-		"kind": "interface"
-	}
-}
--------- @implements F --------
-{
-	"type": {
-		"name": "implements-json.F",
-		"pos": "testdata/src/implements-json/main.go:12:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "*implements-json.C",
-			"pos": "testdata/src/implements-json/main.go:21:6",
-			"kind": "pointer"
-		},
-		{
-			"name": "implements-json.D",
-			"pos": "testdata/src/implements-json/main.go:22:6",
-			"kind": "struct"
-		},
-		{
-			"name": "implements-json.FG",
-			"pos": "testdata/src/implements-json/main.go:16:6",
-			"kind": "interface"
-		}
-	]
-}
--------- @implements FG --------
-{
-	"type": {
-		"name": "implements-json.FG",
-		"pos": "testdata/src/implements-json/main.go:16:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "*implements-json.D",
-			"pos": "testdata/src/implements-json/main.go:22:6",
-			"kind": "pointer"
-		}
-	],
-	"from": [
-		{
-			"name": "implements-json.F",
-			"pos": "testdata/src/implements-json/main.go:12:6",
-			"kind": "interface"
-		}
-	]
-}
--------- @implements slice --------
-{
-	"type": {
-		"name": "[]int",
-		"pos": "-",
-		"kind": "slice"
-	}
-}
--------- @implements C --------
-{
-	"type": {
-		"name": "implements-json.C",
-		"pos": "testdata/src/implements-json/main.go:21:6",
-		"kind": "basic"
-	},
-	"fromptr": [
-		{
-			"name": "implements-json.F",
-			"pos": "testdata/src/implements-json/main.go:12:6",
-			"kind": "interface"
-		}
-	]
-}
--------- @implements starC --------
-{
-	"type": {
-		"name": "*implements-json.C",
-		"pos": "testdata/src/implements-json/main.go:21:6",
-		"kind": "pointer"
-	},
-	"from": [
-		{
-			"name": "implements-json.F",
-			"pos": "testdata/src/implements-json/main.go:12:6",
-			"kind": "interface"
-		}
-	]
-}
--------- @implements D --------
-{
-	"type": {
-		"name": "implements-json.D",
-		"pos": "testdata/src/implements-json/main.go:22:6",
-		"kind": "struct"
-	},
-	"from": [
-		{
-			"name": "implements-json.F",
-			"pos": "testdata/src/implements-json/main.go:12:6",
-			"kind": "interface"
-		}
-	],
-	"fromptr": [
-		{
-			"name": "implements-json.FG",
-			"pos": "testdata/src/implements-json/main.go:16:6",
-			"kind": "interface"
-		}
-	]
-}
--------- @implements starD --------
-{
-	"type": {
-		"name": "*implements-json.D",
-		"pos": "testdata/src/implements-json/main.go:22:6",
-		"kind": "pointer"
-	},
-	"from": [
-		{
-			"name": "implements-json.F",
-			"pos": "testdata/src/implements-json/main.go:12:6",
-			"kind": "interface"
-		},
-		{
-			"name": "implements-json.FG",
-			"pos": "testdata/src/implements-json/main.go:16:6",
-			"kind": "interface"
-		}
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.go
deleted file mode 100644
index 646276d568..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package main
-
-// Tests of 'implements' query applied to methods, -output=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See implements-methods.golden for expected query results.
-
-import _ "lib"
-
-func main() {
-}
-
-type F interface {
-	f() // @implements F.f "f"
-}
-
-type FG interface {
-	f()       // @implements FG.f "f"
-	g() []int // @implements FG.g "g"
-}
-
-type C int
-type D struct{}
-
-func (c *C) f() {} // @implements *C.f "f"
-func (d D) f()  {} // @implements D.f "f"
-
-func (d *D) g() []int { return nil } // @implements *D.g "g"
-
-type sorter []int
-
-func (sorter) Len() int           { return 0 } // @implements Len "Len"
-func (sorter) Less(i, j int) bool { return false }
-func (sorter) Swap(i, j int)      {}
-
-type I interface {
-	Method(*int) *int // @implements I.Method "Method"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.golden
deleted file mode 100644
index 137261b65d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods-json/main.golden
+++ /dev/null
@@ -1,266 +0,0 @@
--------- @implements F.f --------
-{
-	"type": {
-		"name": "implements-methods-json.F",
-		"pos": "testdata/src/implements-methods-json/main.go:12:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "*implements-methods-json.C",
-			"pos": "testdata/src/implements-methods-json/main.go:21:6",
-			"kind": "pointer"
-		},
-		{
-			"name": "implements-methods-json.D",
-			"pos": "testdata/src/implements-methods-json/main.go:22:6",
-			"kind": "struct"
-		},
-		{
-			"name": "implements-methods-json.FG",
-			"pos": "testdata/src/implements-methods-json/main.go:16:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (F).f()",
-		"pos": "testdata/src/implements-methods-json/main.go:13:2"
-	},
-	"to_method": [
-		{
-			"name": "method (*C) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:24:13"
-		},
-		{
-			"name": "method (D) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:25:12"
-		},
-		{
-			"name": "method (FG) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:17:2"
-		}
-	]
-}
--------- @implements FG.f --------
-{
-	"type": {
-		"name": "implements-methods-json.FG",
-		"pos": "testdata/src/implements-methods-json/main.go:16:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "*implements-methods-json.D",
-			"pos": "testdata/src/implements-methods-json/main.go:22:6",
-			"kind": "pointer"
-		}
-	],
-	"from": [
-		{
-			"name": "implements-methods-json.F",
-			"pos": "testdata/src/implements-methods-json/main.go:12:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (FG).f()",
-		"pos": "testdata/src/implements-methods-json/main.go:17:2"
-	},
-	"to_method": [
-		{
-			"name": "method (*D) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:25:12"
-		}
-	],
-	"from_method": [
-		{
-			"name": "method (F) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:13:2"
-		}
-	]
-}
--------- @implements FG.g --------
-{
-	"type": {
-		"name": "implements-methods-json.FG",
-		"pos": "testdata/src/implements-methods-json/main.go:16:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "*implements-methods-json.D",
-			"pos": "testdata/src/implements-methods-json/main.go:22:6",
-			"kind": "pointer"
-		}
-	],
-	"from": [
-		{
-			"name": "implements-methods-json.F",
-			"pos": "testdata/src/implements-methods-json/main.go:12:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (FG).g() []int",
-		"pos": "testdata/src/implements-methods-json/main.go:18:2"
-	},
-	"to_method": [
-		{
-			"name": "method (*D) g() []int",
-			"pos": "testdata/src/implements-methods-json/main.go:27:13"
-		}
-	],
-	"from_method": [
-		{
-			"name": "",
-			"pos": ""
-		}
-	]
-}
--------- @implements *C.f --------
-{
-	"type": {
-		"name": "*implements-methods-json.C",
-		"pos": "testdata/src/implements-methods-json/main.go:21:6",
-		"kind": "pointer"
-	},
-	"from": [
-		{
-			"name": "implements-methods-json.F",
-			"pos": "testdata/src/implements-methods-json/main.go:12:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (*C).f()",
-		"pos": "testdata/src/implements-methods-json/main.go:24:13"
-	},
-	"from_method": [
-		{
-			"name": "method (F) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:13:2"
-		}
-	]
-}
--------- @implements D.f --------
-{
-	"type": {
-		"name": "implements-methods-json.D",
-		"pos": "testdata/src/implements-methods-json/main.go:22:6",
-		"kind": "struct"
-	},
-	"from": [
-		{
-			"name": "implements-methods-json.F",
-			"pos": "testdata/src/implements-methods-json/main.go:12:6",
-			"kind": "interface"
-		}
-	],
-	"fromptr": [
-		{
-			"name": "implements-methods-json.FG",
-			"pos": "testdata/src/implements-methods-json/main.go:16:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (D).f()",
-		"pos": "testdata/src/implements-methods-json/main.go:25:12"
-	},
-	"from_method": [
-		{
-			"name": "method (F) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:13:2"
-		}
-	],
-	"fromptr_method": [
-		{
-			"name": "method (FG) f()",
-			"pos": "testdata/src/implements-methods-json/main.go:17:2"
-		}
-	]
-}
--------- @implements *D.g --------
-{
-	"type": {
-		"name": "*implements-methods-json.D",
-		"pos": "testdata/src/implements-methods-json/main.go:22:6",
-		"kind": "pointer"
-	},
-	"from": [
-		{
-			"name": "implements-methods-json.F",
-			"pos": "testdata/src/implements-methods-json/main.go:12:6",
-			"kind": "interface"
-		},
-		{
-			"name": "implements-methods-json.FG",
-			"pos": "testdata/src/implements-methods-json/main.go:16:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (*D).g() []int",
-		"pos": "testdata/src/implements-methods-json/main.go:27:13"
-	},
-	"from_method": [
-		{
-			"name": "",
-			"pos": ""
-		},
-		{
-			"name": "method (FG) g() []int",
-			"pos": "testdata/src/implements-methods-json/main.go:18:2"
-		}
-	]
-}
--------- @implements Len --------
-{
-	"type": {
-		"name": "implements-methods-json.sorter",
-		"pos": "testdata/src/implements-methods-json/main.go:29:6",
-		"kind": "slice"
-	},
-	"from": [
-		{
-			"name": "lib.Sorter",
-			"pos": "testdata/src/lib/lib.go:16:6",
-			"kind": "interface"
-		}
-	],
-	"method": {
-		"name": "func (sorter).Len() int",
-		"pos": "testdata/src/implements-methods-json/main.go:31:15"
-	},
-	"from_method": [
-		{
-			"name": "method (lib.Sorter) Len() int",
-			"pos": "testdata/src/lib/lib.go:17:2"
-		}
-	]
-}
--------- @implements I.Method --------
-{
-	"type": {
-		"name": "implements-methods-json.I",
-		"pos": "testdata/src/implements-methods-json/main.go:35:6",
-		"kind": "interface"
-	},
-	"to": [
-		{
-			"name": "lib.Type",
-			"pos": "testdata/src/lib/lib.go:3:6",
-			"kind": "basic"
-		}
-	],
-	"method": {
-		"name": "func (I).Method(*int) *int",
-		"pos": "testdata/src/implements-methods-json/main.go:36:2"
-	},
-	"to_method": [
-		{
-			"name": "method (lib.Type) Method(x *int) *int",
-			"pos": "testdata/src/lib/lib.go:5:13"
-		}
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.go
deleted file mode 100644
index 757be44af6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package main
-
-// Tests of 'implements' query applied to methods.
-// See go.tools/guru/guru_test.go for explanation.
-// See implements-methods.golden for expected query results.
-
-import _ "lib"
-
-func main() {
-}
-
-type F interface {
-	f() // @implements F.f "f"
-}
-
-type FG interface {
-	f()       // @implements FG.f "f"
-	g() []int // @implements FG.g "g"
-}
-
-type C int
-type D struct{}
-
-func (c *C) f() {} // @implements *C.f "f"
-func (d D) f()  {} // @implements D.f "f"
-
-func (d *D) g() []int { return nil } // @implements *D.g "g"
-
-type sorter []int
-
-func (sorter) Len() int           { return 0 } // @implements Len "Len"
-func (sorter) Less(i, j int) bool { return false }
-func (sorter) Swap(i, j int)      {}
-
-type I interface {
-	Method(*int) *int // @implements I.Method "Method"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.golden
deleted file mode 100644
index bd591e8476..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements-methods/main.golden
+++ /dev/null
@@ -1,37 +0,0 @@
--------- @implements F.f --------
-abstract method func (F).f()
-	is implemented by method (*C).f
-	is implemented by method (D).f
-	is implemented by method (FG).f
-
--------- @implements FG.f --------
-abstract method func (FG).f()
-	is implemented by method (*D).f
-	implements method (F).f
-
--------- @implements FG.g --------
-abstract method func (FG).g() []int
-	is implemented by method (*D).g
-
--------- @implements *C.f --------
-concrete method func (*C).f()
-	implements method (F).f
-
--------- @implements D.f --------
-concrete method func (D).f()
-	implements method (F).f
-concrete method func (D).f()
-	implements method (FG).f
-
--------- @implements *D.g --------
-concrete method func (*D).g() []int
-	implements method (FG).g
-
--------- @implements Len --------
-concrete method func (sorter).Len() int
-	implements method (lib.Sorter).Len
-
--------- @implements I.Method --------
-abstract method func (I).Method(*int) *int
-	is implemented by method (lib.Type).Method
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.go
deleted file mode 100644
index fea9006ec9..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.go
+++ /dev/null
@@ -1,44 +0,0 @@
-package main
-
-// Tests of 'implements' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See implements.golden for expected query results.
-
-import _ "lib"
-
-func main() {
-}
-
-type E interface{} // @implements E "E"
-
-type F interface { // @implements F "F"
-	f()
-}
-
-type FG interface { // @implements FG "FG"
-	f()
-	g() []int // @implements slice "..int"
-}
-
-type C int // @implements C "C"
-type D struct{}
-
-func (c *C) f() {} // @implements starC ".C"
-func (d D) f()  {} // @implements D "D"
-
-func (d *D) g() []int { return nil } // @implements starD ".D"
-
-type sorter []int // @implements sorter "sorter"
-
-func (sorter) Len() int           { return 0 }
-func (sorter) Less(i, j int) bool { return false }
-func (sorter) Swap(i, j int)      {}
-
-type I interface { // @implements I "I"
-	Method(*int) *int
-}
-
-func _() {
-	var d D
-	_ = d // @implements var_d "d"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.golden
deleted file mode 100644
index 1077c9827b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/implements/main.golden
+++ /dev/null
@@ -1,50 +0,0 @@
--------- @implements E --------
-empty interface type E
-
--------- @implements F --------
-interface type F
-	is implemented by pointer type *C
-	is implemented by struct type D
-	is implemented by interface type FG
-
--------- @implements FG --------
-interface type FG
-	is implemented by pointer type *D
-	implements F
-
--------- @implements slice --------
-slice type []int implements only interface{}
-
--------- @implements C --------
-pointer type *C
-	implements F
-
--------- @implements starC --------
-pointer type *C
-	implements F
-
--------- @implements D --------
-struct type D
-	implements F
-pointer type *D
-	implements FG
-
--------- @implements starD --------
-pointer type *D
-	implements F
-	implements FG
-
--------- @implements sorter --------
-slice type sorter
-	implements lib.Sorter
-
--------- @implements I --------
-interface type I
-	is implemented by basic type lib.Type
-
--------- @implements var_d --------
-struct type D
-	implements F
-pointer type *D
-	implements FG
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.go
deleted file mode 100644
index 9fe2b711f8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-import (
-	"lib"        // @describe ref-pkg-import "lib"
-	"lib/sublib" // @describe ref-pkg-import2 "sublib"
-)
-
-// Tests that import another package.  (To make the tests run quickly,
-// we avoid using imports in all the other tests.  Remember, each
-// query causes parsing and typechecking of the whole program.)
-//
-// See go.tools/guru/guru_test.go for explanation.
-// See imports.golden for expected query results.
-
-var a int
-
-func main() {
-	const c = lib.Const // @describe ref-const "Const"
-	lib.Func()          // @describe ref-func "Func"
-	lib.Var++           // @describe ref-var "Var"
-	var t lib.Type      // @describe ref-type "Type"
-	p := t.Method(&a)   // @describe ref-method "Method"
-
-	print(*p + 1) // @pointsto p "p "
-
-	var _ lib.Type // @describe ref-pkg "lib"
-
-	_ = sublib.C
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.golden
deleted file mode 100644
index 1e1221789e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/imports/main.golden
+++ /dev/null
@@ -1,56 +0,0 @@
--------- @describe ref-pkg-import --------
-import of package "lib"
-	const Const  untyped int = 3
-	func  Func   func()
-	type  Outer  struct{...}
-	type  Sorter interface{...}
-		method (Sorter) Len() int
-		method (Sorter) Less(i int, j int) bool
-		method (Sorter) Swap(i int, j int)
-	type  Type   int
-		method (Type) Method(x *int) *int
-	var   Var    int
-
--------- @describe ref-pkg-import2 --------
-import of package "lib/sublib"
-	const C untyped int = 0
-
--------- @describe ref-const --------
-reference to const lib.Const untyped int of value 3
-defined here
-
--------- @describe ref-func --------
-reference to func lib.Func()
-defined here
-
--------- @describe ref-var --------
-reference to var lib.Var int
-defined here
-
--------- @describe ref-type --------
-reference to type lib.Type (size 8, align 8)
-defined as int
-Methods:
-	method (Type) Method(x *int) *int
-
--------- @describe ref-method --------
-reference to method func (lib.Type).Method(x *int) *int
-defined here
-
--------- @pointsto p --------
-this *int may point to these objects:
-	imports.a
-
--------- @describe ref-pkg --------
-reference to package "lib"
-	const Const  untyped int = 3
-	func  Func   func()
-	type  Outer  struct{...}
-	type  Sorter interface{...}
-		method (Sorter) Len() int
-		method (Sorter) Less(i int, j int) bool
-		method (Sorter) Swap(i int, j int)
-	type  Type   int
-		method (Type) Method(x *int) *int
-	var   Var    int
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/lib.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/lib.go
deleted file mode 100644
index 742cdbfaed..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/lib.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package lib
-
-type Type int
-
-func (Type) Method(x *int) *int {
-	return x
-}
-
-func Func() {
-}
-
-const Const = 3
-
-var Var = 0
-
-type Sorter interface {
-	Len() int
-	Less(i, j int) bool
-	Swap(i, j int)
-}
-
-type Outer struct {
-	A int
-	b int
-	inner
-}
-
-type inner struct {
-	C bool
-	d string
-	recursive
-}
-
-type recursive struct {
-	E bool
-	*inner
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/sublib/sublib.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/sublib/sublib.go
deleted file mode 100644
index 33c6498a34..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/lib/sublib/sublib.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package sublib
-
-const C = 0
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/main/multi.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/main/multi.go
deleted file mode 100644
index 8c650cd289..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/main/multi.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package main
-
-func g(x int) {
-}
-
-func f() {
-	x := 1
-	g(x) // "g(x)" is the selection for multiple queries
-}
-
-func main() {
-	f()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.go
deleted file mode 100644
index ef63992b25..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.go
+++ /dev/null
@@ -1,13 +0,0 @@
-package main
-
-// Tests of channel 'peers' query, -format=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See peers-json.golden for expected query results.
-
-func main() {
-	chA := make(chan *int)
-	<-chA
-	select {
-	case <-chA: // @peers peer-recv-chA "<-"
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.golden
deleted file mode 100644
index 50d571604c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers-json/main.golden
+++ /dev/null
@@ -1,12 +0,0 @@
--------- @peers peer-recv-chA --------
-{
-	"pos": "testdata/src/peers-json/main.go:11:7",
-	"type": "chan *int",
-	"allocs": [
-		"testdata/src/peers-json/main.go:8:13"
-	],
-	"receives": [
-		"testdata/src/peers-json/main.go:9:2",
-		"testdata/src/peers-json/main.go:11:7"
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.go
deleted file mode 100644
index 40ee205b27..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-// Tests of channel 'peers' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See peers.golden for expected query results.
-
-var a2 int
-
-func main() {
-	chA := make(chan *int)
-	a1 := 1
-	chA <- &a1
-
-	chA2 := make(chan *int, 2)
-	if a2 == 0 {
-		chA = chA2
-	}
-
-	chB := make(chan *int)
-	b := 3
-	chB <- &b
-
-	<-chA  // @pointsto pointsto-chA "chA"
-	<-chA2 // @pointsto pointsto-chA2 "chA2"
-	<-chB  // @pointsto pointsto-chB "chB"
-
-	select {
-	case rA := <-chA: // @peers peer-recv-chA "<-"
-		_ = rA // @pointsto pointsto-rA "rA"
-	case rB := <-chB: // @peers peer-recv-chB "<-"
-		_ = rB // @pointsto pointsto-rB "rB"
-
-	case <-chA: // @peers peer-recv-chA' "<-"
-
-	case chA2 <- &a2: // @peers peer-send-chA' "<-"
-	}
-
-	for range chA {
-	}
-
-	close(chA) // @peers peer-close-chA "chA"
-
-	chC := make(chan *int)
-	(close)(chC) // @peers peer-close-chC "chC"
-
-	close := func(ch chan *int) chan *int {
-		return ch
-	}
-
-	close(chC) <- &b // @peers peer-send-chC "chC"
-	<-close(chC)     // @peers peer-recv-chC "chC"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.golden
deleted file mode 100644
index f97e672953..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/peers/main.golden
+++ /dev/null
@@ -1,100 +0,0 @@
--------- @pointsto pointsto-chA --------
-this chan *int may point to these objects:
-	makechan
-	makechan
-
--------- @pointsto pointsto-chA2 --------
-this chan *int may point to these objects:
-	makechan
-
--------- @pointsto pointsto-chB --------
-this chan *int may point to these objects:
-	makechan
-
--------- @peers peer-recv-chA --------
-This channel of type chan *int may be:
-	allocated here
-	allocated here
-	sent to, here
-	sent to, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	closed, here
-
--------- @pointsto pointsto-rA --------
-this *int may point to these objects:
-	peers.a2
-	a1
-
--------- @peers peer-recv-chB --------
-This channel of type chan *int may be:
-	allocated here
-	sent to, here
-	received from, here
-	received from, here
-
--------- @pointsto pointsto-rB --------
-this *int may point to these objects:
-	b
-
--------- @peers peer-recv-chA' --------
-This channel of type chan *int may be:
-	allocated here
-	allocated here
-	sent to, here
-	sent to, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	closed, here
-
--------- @peers peer-send-chA' --------
-This channel of type chan *int may be:
-	allocated here
-	sent to, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	closed, here
-
--------- @peers peer-close-chA --------
-This channel of type chan *int may be:
-	allocated here
-	allocated here
-	sent to, here
-	sent to, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	received from, here
-	closed, here
-
--------- @peers peer-close-chC --------
-This channel of type chan *int may be:
-	allocated here
-	sent to, here
-	received from, here
-	closed, here
-
--------- @peers peer-send-chC --------
-This channel of type chan *int may be:
-	allocated here
-	sent to, here
-	received from, here
-	closed, here
-
--------- @peers peer-recv-chC --------
-This channel of type chan *int may be:
-	allocated here
-	sent to, here
-	received from, here
-	closed, here
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.go
deleted file mode 100644
index 0a9f318668..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package main
-
-// Tests of 'pointsto' queries, -format=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See pointsto-json.golden for expected query results.
-
-func main() { //
-	var s struct{ x [3]int }
-	p := &s.x[0] // @pointsto val-p "p"
-	_ = p
-
-	var i I = C(0)
-	if i == nil {
-		i = new(D)
-	}
-	print(i) // @pointsto val-i "\\bi\\b"
-}
-
-type I interface {
-	f()
-}
-
-type C int
-type D struct{}
-
-func (c C) f()  {}
-func (d *D) f() {}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.golden
deleted file mode 100644
index 06a2204a8c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto-json/main.golden
+++ /dev/null
@@ -1,29 +0,0 @@
--------- @pointsto val-p --------
-[
-	{
-		"type": "*int",
-		"labels": [
-			{
-				"pos": "testdata/src/pointsto-json/main.go:8:6",
-				"desc": "s.x[*]"
-			}
-		]
-	}
-]
--------- @pointsto val-i --------
-[
-	{
-		"type": "*D",
-		"namepos": "testdata/src/pointsto-json/main.go:24:6",
-		"labels": [
-			{
-				"pos": "testdata/src/pointsto-json/main.go:14:10",
-				"desc": "new"
-			}
-		]
-	},
-	{
-		"type": "C",
-		"namepos": "testdata/src/pointsto-json/main.go:23:6"
-	}
-]
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.go
deleted file mode 100644
index c4ba2e258f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package main
-
-// Tests of 'pointsto' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See pointsto.golden for expected query results.
-
-const pi = 3.141 // @pointsto const "pi"
-
-var global = new(string) // NB: ssa.Global is indirect, i.e. **string
-
-func main() {
-	livecode()
-
-	// func objects
-	_ = main   // @pointsto func-ref-main "main"
-	_ = (*C).f // @pointsto func-ref-*C.f "..C..f"
-	_ = D.f    // @pointsto func-ref-D.f "D.f"
-	_ = I.f    // @pointsto func-ref-I.f "I.f"
-	var d D
-	var i I
-	_ = d.f // @pointsto func-ref-d.f "d.f"
-	_ = i.f // @pointsto func-ref-i.f "i.f"
-
-	// var objects
-	anon := func() {
-		_ = d.f // @pointsto ref-lexical-d.f "d.f"
-	}
-	_ = anon   // @pointsto ref-anon "anon"
-	_ = global // @pointsto ref-global "global"
-
-	// SSA affords some local flow sensitivity.
-	var a, b int
-	var x = &a // @pointsto var-def-x-1 "x"
-	_ = x      // @pointsto var-ref-x-1 "x"
-	x = &b     // @pointsto var-def-x-2 "x"
-	_ = x      // @pointsto var-ref-x-2 "x"
-
-	i = new(C) // @pointsto var-ref-i-C "i"
-	if i != nil {
-		i = D{} // @pointsto var-ref-i-D "i"
-	}
-	print(i) // @pointsto var-ref-i "\\bi\\b"
-
-	m := map[string]*int{"a": &a}
-	mapval, _ := m["a"] // @pointsto map-lookup,ok "m..a.."
-	_ = mapval          // @pointsto mapval "mapval"
-	_ = m               // @pointsto m "m"
-
-	if false {
-		panic(3) // @pointsto builtin-panic "panic"
-	}
-
-	// NB: s.f is addressable per (*ssa.Program).VarValue,
-	// but our query concerns the object, not its address.
-	s := struct{ f interface{} }{f: make(chan bool)}
-	print(s.f) // @pointsto var-ref-s-f "s.f"
-}
-
-func livecode() {} // @pointsto func-live "livecode"
-
-func deadcode() { // @pointsto func-dead "deadcode"
-	// Pointer analysis can't run on dead code.
-	var b = new(int) // @pointsto b "b"
-	_ = b
-}
-
-type I interface {
-	f()
-}
-
-type C int
-type D struct{}
-
-func (c *C) f() {}
-func (d D) f()  {}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.golden
deleted file mode 100644
index 7b12b2aff7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/pointsto/main.golden
+++ /dev/null
@@ -1,96 +0,0 @@
--------- @pointsto const --------
-
-Error: pointer analysis wants an expression of reference type; got untyped float
--------- @pointsto func-ref-main --------
-this func() may point to these objects:
-	pointsto.main
-
--------- @pointsto func-ref-*C.f --------
-this func() may point to these objects:
-	(*pointsto.C).f
-
--------- @pointsto func-ref-D.f --------
-this func() may point to these objects:
-	(pointsto.D).f
-
--------- @pointsto func-ref-I.f --------
-
-Error: func (pointsto.I).f() is an interface method
--------- @pointsto func-ref-d.f --------
-this func() may point to these objects:
-	(pointsto.D).f
-
--------- @pointsto func-ref-i.f --------
-
-Error: func (pointsto.I).f() is an interface method
--------- @pointsto ref-lexical-d.f --------
-this func() may point to these objects:
-	(pointsto.D).f
-
--------- @pointsto ref-anon --------
-this func() may point to these objects:
-	pointsto.main$1
-
--------- @pointsto ref-global --------
-this *string may point to these objects:
-	new
-
--------- @pointsto var-def-x-1 --------
-this *int may point to these objects:
-	a
-
--------- @pointsto var-ref-x-1 --------
-this *int may point to these objects:
-	a
-
--------- @pointsto var-def-x-2 --------
-this *int may point to these objects:
-	b
-
--------- @pointsto var-ref-x-2 --------
-this *int may point to these objects:
-	b
-
--------- @pointsto var-ref-i-C --------
-this I may contain these dynamic types:
-	*C, may point to:
-		new
-
--------- @pointsto var-ref-i-D --------
-this I may contain these dynamic types:
-	D
-
--------- @pointsto var-ref-i --------
-this I may contain these dynamic types:
-	*C, may point to:
-		new
-	D
-
--------- @pointsto map-lookup,ok --------
-
-Error: pointer analysis wants an expression of reference type; got (*int, bool)
--------- @pointsto mapval --------
-this *int may point to these objects:
-	a
-
--------- @pointsto m --------
-this map[string]*int may point to these objects:
-	makemap
-
--------- @pointsto builtin-panic --------
-
-Error: pointer analysis wants an expression of reference type; got ()
--------- @pointsto var-ref-s-f --------
-this interface{} may contain these dynamic types:
-	chan bool, may point to:
-		makechan
-
--------- @pointsto func-live --------
-
-Error: pointer analysis did not find expression (dead code?)
--------- @pointsto func-dead --------
-
-Error: pointer analysis did not find expression (dead code?)
--------- @pointsto b --------
-
-Error: pointer analysis did not find expression (dead code?)
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.go
deleted file mode 100644
index 0fd2342526..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package main
-
-// Tests of 'referrers' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See referrers.golden for expected query results.
-
-import "lib"
-
-type s struct {
-	f int
-}
-
-func main() {
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	_ = v.Method               // @referrers ref-method "Method"
-	_ = v.Method
-	v++ //@referrers ref-local "v"
-	v++
-
-	_ = s{}.f // @referrers ref-field "f"
-
-	var s2 s
-	s2.f = 1
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.golden
deleted file mode 100644
index 7bda14123e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers-json/main.golden
+++ /dev/null
@@ -1,234 +0,0 @@
--------- @referrers ref-package --------
-{
-	"desc": "package lib"
-}
-{
-	"package": "definition-json",
-	"refs": [
-		{
-			"pos": "testdata/src/definition-json/main.go:18:8",
-			"text": "\tvar x lib.T           // @definition lexical-pkgname \"lib\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:24:8",
-			"text": "\tvar _ lib.Type     // @definition qualified-type \"Type\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:25:8",
-			"text": "\tvar _ lib.Func     // @definition qualified-func \"Func\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:26:8",
-			"text": "\tvar _ lib.Var      // @definition qualified-var \"Var\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:27:8",
-			"text": "\tvar _ lib.Const    // @definition qualified-const \"Const\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:28:8",
-			"text": "\tvar _ lib2.Type    // @definition qualified-type-renaming \"Type\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:29:8",
-			"text": "\tvar _ lib.Nonesuch // @definition qualified-nomember \"Nonesuch\""
-		},
-		{
-			"pos": "testdata/src/definition-json/main.go:61:2",
-			"text": "\tlib.Type // @definition embedded-other-pkg \"Type\""
-		}
-	]
-}
-{
-	"package": "describe",
-	"refs": [
-		{
-			"pos": "testdata/src/describe/main.go:86:8",
-			"text": "\tvar _ lib.Outer // @describe lib-outer \"Outer\""
-		}
-	]
-}
-{
-	"package": "imports",
-	"refs": [
-		{
-			"pos": "testdata/src/imports/main.go:18:12",
-			"text": "\tconst c = lib.Const // @describe ref-const \"Const\""
-		},
-		{
-			"pos": "testdata/src/imports/main.go:19:2",
-			"text": "\tlib.Func()          // @describe ref-func \"Func\""
-		},
-		{
-			"pos": "testdata/src/imports/main.go:20:2",
-			"text": "\tlib.Var++           // @describe ref-var \"Var\""
-		},
-		{
-			"pos": "testdata/src/imports/main.go:21:8",
-			"text": "\tvar t lib.Type      // @describe ref-type \"Type\""
-		},
-		{
-			"pos": "testdata/src/imports/main.go:26:8",
-			"text": "\tvar _ lib.Type // @describe ref-pkg \"lib\""
-		}
-	]
-}
-{
-	"package": "referrers",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/int_test.go:7:7",
-			"text": "\t_ = (lib.Type).Method // ref from internal test package"
-		}
-	]
-}
-{
-	"package": "referrers",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/main.go:16:8",
-			"text": "\tvar v lib.Type = lib.Const // @referrers ref-package \"lib\""
-		},
-		{
-			"pos": "testdata/src/referrers/main.go:16:19",
-			"text": "\tvar v lib.Type = lib.Const // @referrers ref-package \"lib\""
-		}
-	]
-}
-{
-	"package": "referrers-json",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers-json/main.go:14:8",
-			"text": "\tvar v lib.Type = lib.Const // @referrers ref-package \"lib\""
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:14:19",
-			"text": "\tvar v lib.Type = lib.Const // @referrers ref-package \"lib\""
-		}
-	]
-}
-{
-	"package": "referrers_test",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/ext_test.go:10:7",
-			"text": "\t_ = (lib.Type).Method // ref from external test package"
-		}
-	]
-}
-{
-	"package": "what-json",
-	"refs": [
-		{
-			"pos": "testdata/src/what-json/main.go:13:7",
-			"text": "var _ lib.Var // @what pkg \"lib\""
-		},
-		{
-			"pos": "testdata/src/what-json/main.go:14:8",
-			"text": "type _ lib.T"
-		}
-	]
-}
--------- @referrers ref-method --------
-{
-	"objpos": "testdata/src/lib/lib.go:5:13",
-	"desc": "func (lib.Type).Method(x *int) *int"
-}
-{
-	"package": "imports",
-	"refs": [
-		{
-			"pos": "testdata/src/imports/main.go:22:9",
-			"text": "\tp := t.Method(\u0026a)   // @describe ref-method \"Method\""
-		}
-	]
-}
-{
-	"package": "referrers",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/int_test.go:7:17",
-			"text": "\t_ = (lib.Type).Method // ref from internal test package"
-		}
-	]
-}
-{
-	"package": "referrers",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/main.go:17:8",
-			"text": "\t_ = v.Method               // @referrers ref-method \"Method\""
-		},
-		{
-			"pos": "testdata/src/referrers/main.go:18:8",
-			"text": "\t_ = v.Method"
-		}
-	]
-}
-{
-	"package": "referrers-json",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers-json/main.go:15:8",
-			"text": "\t_ = v.Method               // @referrers ref-method \"Method\""
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:16:8",
-			"text": "\t_ = v.Method"
-		}
-	]
-}
-{
-	"package": "referrers_test",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers/ext_test.go:10:17",
-			"text": "\t_ = (lib.Type).Method // ref from external test package"
-		}
-	]
-}
--------- @referrers ref-local --------
-{
-	"objpos": "testdata/src/referrers-json/main.go:14:6",
-	"desc": "var v lib.Type"
-}
-{
-	"package": "referrers-json",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers-json/main.go:15:6",
-			"text": "\t_ = v.Method               // @referrers ref-method \"Method\""
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:16:6",
-			"text": "\t_ = v.Method"
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:17:2",
-			"text": "\tv++ //@referrers ref-local \"v\""
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:18:2",
-			"text": "\tv++"
-		}
-	]
-}
--------- @referrers ref-field --------
-{
-	"objpos": "testdata/src/referrers-json/main.go:10:2",
-	"desc": "field f int"
-}
-{
-	"package": "referrers-json",
-	"refs": [
-		{
-			"pos": "testdata/src/referrers-json/main.go:20:10",
-			"text": "\t_ = s{}.f // @referrers ref-field \"f\""
-		},
-		{
-			"pos": "testdata/src/referrers-json/main.go:23:5",
-			"text": "\ts2.f = 1"
-		}
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/ext_test.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/ext_test.go
deleted file mode 100644
index 35e3199ac2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/ext_test.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package main_test
-
-import (
-	"lib"
-	renamed "referrers" // package has name "main", path "referrers", local name "renamed"
-)
-
-func _() {
-	// This reference should be found by the ref-method query.
-	_ = (lib.Type).Method // ref from external test package
-	var _ renamed.T
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/int_test.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/int_test.go
deleted file mode 100644
index 9102cd6f8b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/int_test.go
+++ /dev/null
@@ -1,8 +0,0 @@
-package main
-
-import "lib"
-
-func _() {
-	// This reference should be found by the ref-method query.
-	_ = (lib.Type).Method // ref from internal test package
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.go
deleted file mode 100644
index 1fc80ea220..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package main // @referrers package-decl "main"
-
-// Tests of 'referrers' query.
-// See go.tools/guru/guru_test.go for explanation.
-// See referrers.golden for expected query results.
-
-import "lib"
-
-type s struct { // @referrers type " s "
-	f int
-}
-
-type T int
-
-func main() {
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	_ = v.Method               // @referrers ref-method "Method"
-	_ = v.Method
-	v++ //@referrers ref-local "v"
-	v++
-
-	_ = s{}.f // @referrers ref-field "f"
-
-	var s2 s
-	s2.f = 1
-}
-
-// Test //line directives:
-
-type U int // @referrers ref-type-U "U"
-
-//line nosuchfile.y:123
-var u1 U
-var u2 U
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.golden
deleted file mode 100644
index 230e95e732..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/referrers/main.golden
+++ /dev/null
@@ -1,60 +0,0 @@
--------- @referrers package-decl --------
-references to package main ("referrers")
-	var _ renamed.T
-
--------- @referrers type --------
-references to type s struct{f int}
-	_ = s{}.f // @referrers ref-field "f"
-	var s2 s
-
--------- @referrers ref-package --------
-references to package lib
-	_ = (lib.Type).Method // ref from external test package
-	_ = (lib.Type).Method // ref from internal test package
-	const c = lib.Const // @describe ref-const "Const"
-	lib.Func()          // @describe ref-func "Func"
-	lib.Type // @definition embedded-other-pkg "Type"
-	lib.Var++           // @describe ref-var "Var"
-	var _ lib.Const    // @definition qualified-const "Const"
-	var _ lib.Func     // @definition qualified-func "Func"
-	var _ lib.Nonesuch // @definition qualified-nomember "Nonesuch"
-	var _ lib.Outer // @describe lib-outer "Outer"
-	var _ lib.Type     // @definition qualified-type "Type"
-	var _ lib.Type // @describe ref-pkg "lib"
-	var _ lib.Var      // @definition qualified-var "Var"
-	var _ lib2.Type    // @definition qualified-type-renaming "Type"
-	var t lib.Type      // @describe ref-type "Type"
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	var v lib.Type = lib.Const // @referrers ref-package "lib"
-	var x lib.T           // @definition lexical-pkgname "lib"
-type _ lib.T
-var _ lib.Var // @what pkg "lib"
-
--------- @referrers ref-method --------
-references to func (Type).Method(x *int) *int
-	_ = (lib.Type).Method // ref from external test package
-	_ = (lib.Type).Method // ref from internal test package
-	_ = v.Method
-	_ = v.Method
-	_ = v.Method               // @referrers ref-method "Method"
-	_ = v.Method               // @referrers ref-method "Method"
-	p := t.Method(&a)   // @describe ref-method "Method"
-
--------- @referrers ref-local --------
-references to var v lib.Type
-	_ = v.Method
-	_ = v.Method               // @referrers ref-method "Method"
-	v++
-	v++ //@referrers ref-local "v"
-
--------- @referrers ref-field --------
-references to field f int
-	_ = s{}.f // @referrers ref-field "f"
-	s2.f = 1
-
--------- @referrers ref-type-U --------
-references to type U int
-open testdata/src/referrers/nosuchfile.y: no such file or directory (+ 1 more refs in this file)
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.go
deleted file mode 100644
index 392643baa8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.go
+++ /dev/null
@@ -1,30 +0,0 @@
-package main
-
-// This is a test of 'pointsto', but we split it into a separate file
-// so that pointsto.go doesn't have to import "reflect" each time.
-
-import "reflect"
-
-var a int
-var b bool
-
-func main() {
-	m := make(map[*int]*bool)
-	m[&a] = &b
-
-	mrv := reflect.ValueOf(m)
-	if a > 0 {
-		mrv = reflect.ValueOf(&b)
-	}
-	if a > 0 {
-		mrv = reflect.ValueOf(&a)
-	}
-
-	_ = mrv                  // @pointsto mrv "mrv"
-	p1 := mrv.Interface()    // @pointsto p1 "p1"
-	p2 := mrv.MapKeys()      // @pointsto p2 "p2"
-	p3 := p2[0]              // @pointsto p3 "p3"
-	p4 := reflect.TypeOf(p1) // @pointsto p4 "p4"
-
-	_, _, _, _ = p1, p2, p3, p4
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.golden
deleted file mode 100644
index 4782132bd7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/reflection/main.golden
+++ /dev/null
@@ -1,34 +0,0 @@
--------- @pointsto mrv --------
-this reflect.Value may contain these dynamic types:
-	*bool, may point to:
-		reflection.b
-	*int, may point to:
-		reflection.a
-	map[*int]*bool, may point to:
-		makemap
-
--------- @pointsto p1 --------
-this interface{} may contain these dynamic types:
-	*bool, may point to:
-		reflection.b
-	*int, may point to:
-		reflection.a
-	map[*int]*bool, may point to:
-		makemap
-
--------- @pointsto p2 --------
-this []reflect.Value may point to these objects:
-	<alloc in (reflect.Value).MapKeys>
-
--------- @pointsto p3 --------
-this reflect.Value may contain these dynamic types:
-	*int, may point to:
-		reflection.a
-
--------- @pointsto p4 --------
-this reflect.Type may contain these dynamic types:
-	*reflect.rtype, may point to:
-		*bool
-		*int
-		map[*int]*bool
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.go
deleted file mode 100644
index f7254b8389..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.go
+++ /dev/null
@@ -1,15 +0,0 @@
-package main
-
-// Tests of various queries on a program containing only "soft" errors.
-// See go.tools/guru/guru_test.go for explanation.
-// See main.golden for expected query results.
-
-func _() {
-	var i int // "unused var" is a soft error
-}
-
-func f() {} // @callers softerrs-callers-f "f"
-
-func main() {
-	f() // @describe softerrs-describe-f "f"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.golden
deleted file mode 100644
index ae95f46dc6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/softerrs/main.golden
+++ /dev/null
@@ -1,8 +0,0 @@
--------- @callers softerrs-callers-f --------
-softerrs.f is called from these 1 sites:
-	static function call from softerrs.main
-
--------- @describe softerrs-describe-f --------
-reference to func f()
-defined here
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.go
deleted file mode 100644
index 27177ff5d4..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.go
+++ /dev/null
@@ -1,14 +0,0 @@
-package main
-
-import "lib"
-
-// Tests of 'what' queries, -format=json.
-// See go.tools/guru/guru_test.go for explanation.
-// See what-json.golden for expected query results.
-
-func main() {
-	f() // @what call "f"
-}
-
-var _ lib.Var // @what pkg "lib"
-type _ lib.T
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.golden
deleted file mode 100644
index 320c52bd45..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what-json/main.golden
+++ /dev/null
@@ -1,95 +0,0 @@
--------- @what call --------
-{
-	"enclosing": [
-		{
-			"desc": "identifier",
-			"start": 189,
-			"end": 190
-		},
-		{
-			"desc": "function call",
-			"start": 189,
-			"end": 192
-		},
-		{
-			"desc": "expression statement",
-			"start": 189,
-			"end": 192
-		},
-		{
-			"desc": "block",
-			"start": 186,
-			"end": 212
-		},
-		{
-			"desc": "function declaration",
-			"start": 174,
-			"end": 212
-		},
-		{
-			"desc": "source file",
-			"start": 0,
-			"end": 259
-		}
-	],
-	"modes": [
-		"callees",
-		"callers",
-		"callstack",
-		"definition",
-		"describe",
-		"freevars",
-		"implements",
-		"pointsto",
-		"referrers",
-		"whicherrs"
-	],
-	"srcdir": "testdata/src",
-	"importpath": "what-json"
-}
--------- @what pkg --------
-{
-	"enclosing": [
-		{
-			"desc": "identifier",
-			"start": 220,
-			"end": 223
-		},
-		{
-			"desc": "selector",
-			"start": 220,
-			"end": 227
-		},
-		{
-			"desc": "value specification",
-			"start": 218,
-			"end": 227
-		},
-		{
-			"desc": "variable declaration",
-			"start": 214,
-			"end": 227
-		},
-		{
-			"desc": "source file",
-			"start": 0,
-			"end": 259
-		}
-	],
-	"modes": [
-		"definition",
-		"describe",
-		"freevars",
-		"implements",
-		"pointsto",
-		"referrers",
-		"whicherrs"
-	],
-	"srcdir": "testdata/src",
-	"importpath": "what-json",
-	"object": "lib",
-	"sameids": [
-		"$GOPATH/src/what-json/main.go:13:7",
-		"$GOPATH/src/what-json/main.go:14:8"
-	]
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.go
deleted file mode 100644
index 9e6a8b920a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main // @what pkgdecl "main"
-
-// Tests of 'what' queries.
-// See go.tools/guru/guru_test.go for explanation.
-// See what.golden for expected query results.
-
-func main() {
-	f()             // @what call "f"
-	var ch chan int // @what var "var"
-	<-ch            // @what recv "ch"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.golden
deleted file mode 100644
index f113e2f85f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/what/main.golden
+++ /dev/null
@@ -1,41 +0,0 @@
--------- @what pkgdecl --------
-identifier
-source file
-modes: [definition describe freevars implements pointsto referrers whicherrs]
-srcdir: testdata/src
-import path: what
-
--------- @what call --------
-identifier
-function call
-expression statement
-block
-function declaration
-source file
-modes: [callees callers callstack definition describe freevars implements pointsto referrers whicherrs]
-srcdir: testdata/src
-import path: what
-
--------- @what var --------
-variable declaration
-variable declaration statement
-block
-function declaration
-source file
-modes: [callers callstack describe freevars pointsto whicherrs]
-srcdir: testdata/src
-import path: what
-
--------- @what recv --------
-identifier
-unary <- operation
-expression statement
-block
-function declaration
-source file
-modes: [callers callstack definition describe freevars implements peers pointsto referrers whicherrs]
-srcdir: testdata/src
-import path: what
-ch
-ch
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.go b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.go
deleted file mode 100644
index d1613c5839..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.go
+++ /dev/null
@@ -1,32 +0,0 @@
-package main
-
-type errType string
-
-const constErr errType = "blah"
-
-func (et errType) Error() string {
-	return string(et)
-}
-
-var errVar error = errType("foo")
-
-func genErr(i int) error {
-	switch i {
-	case 0:
-		return constErr
-	case 1:
-		return errVar
-	default:
-		return nil
-	}
-}
-
-func unreachable() {
-	err := errVar // @whicherrs func-dead "err"
-	_ = err
-}
-
-func main() {
-	err := genErr(0) // @whicherrs localerrs "err"
-	_ = err
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.golden b/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.golden
deleted file mode 100644
index 3484752c51..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/testdata/src/whicherrs/main.golden
+++ /dev/null
@@ -1,11 +0,0 @@
--------- @whicherrs func-dead --------
-
-Error: pointer analysis did not find expression (dead code?)
--------- @whicherrs localerrs --------
-this error may point to these globals:
-	errVar
-this error may contain these constants:
-	constErr
-this error may contain these dynamic types:
-	errType
-
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/unit_test.go b/installer/vendor/golang.org/x/tools/cmd/guru/unit_test.go
deleted file mode 100644
index 699e6a1b10..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/unit_test.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/build"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// Unit tests for internal guru functions
-
-func TestIssue17515(t *testing.T) {
-	// Tests handling of symlinks in function guessImportPath
-	// If we have Go code inside $HOME/go/src and create a symlink $HOME/src to it
-	// there are 4 possible cases that need to be tested:
-	// (1) absolute & absolute: GOPATH=$HOME/go/src file=$HOME/go/src/test/test.go
-	// (2) absolute & symlink:  GOPATH=$HOME/go/src file=$HOME/src/test/test.go
-	// (3) symlink & symlink:   GOPATH=$HOME/src file=$HOME/src/test/test.go
-	// (4) symlink & absolute:  GOPATH=$HOME/src file= $HOME/go/src/test/test.go
-
-	// Create a temporary home directory under /tmp
-	home, err := ioutil.TempDir(os.TempDir(), "home")
-	if err != nil {
-		t.Errorf("Unable to create a temporary directory in %s", os.TempDir())
-	}
-
-	defer os.RemoveAll(home)
-
-	// create filepath /tmp/home/go/src/test/test.go
-	if err = os.MkdirAll(home+"/go/src/test", 0755); err != nil {
-		t.Fatal(err)
-	}
-
-	var buildContext = build.Default
-
-	// Success test cases
-	type SuccessTest struct {
-		gopath, filename, wantSrcdir string
-	}
-
-	successTests := []SuccessTest{
-		{home + "/go", home + "/go/src/test/test.go", filepath.FromSlash(home + "/go/src")},
-	}
-
-	// Add symlink cases if not on Windows, Plan 9
-	if runtime.GOOS != "windows" && runtime.GOOS != "plan9" {
-		// symlink between /tmp/home/go/src and /tmp/home/src
-		if err := os.Symlink(home+"/go/src", home+"/src"); err != nil {
-			t.Fatal(err)
-		}
-
-		successTests = append(successTests, []SuccessTest{
-			{home + "/go", home + "/src/test/test.go", filepath.FromSlash(home + "/go/src")},
-			{home, home + "/go/src/test/test.go", filepath.FromSlash(home + "/src")},
-			{home, home + "/src/test/test.go", filepath.FromSlash(home + "/src")},
-		}...)
-	}
-
-	for _, test := range successTests {
-		buildContext.GOPATH = test.gopath
-		srcdir, importPath, err := guessImportPath(test.filename, &buildContext)
-		if srcdir != test.wantSrcdir || importPath != "test" || err != nil {
-			t.Errorf("guessImportPath(%q, %q) = %q, %q, %q; want %q, %q, %q",
-				test.filename, test.gopath, srcdir, importPath, err, test.wantSrcdir, "test", "nil")
-		}
-	}
-	// Function to format expected error message
-	errFormat := func(fpath string) string {
-		return fmt.Sprintf("can't evaluate symlinks of %s", fpath)
-	}
-
-	// Failure test cases
-	type FailTest struct {
-		gopath, filename, wantErr string
-	}
-
-	failTests := []FailTest{
-		{home + "/go", home + "/go/src/fake/test.go", errFormat(filepath.FromSlash(home + "/go/src/fake"))},
-	}
-
-	if runtime.GOOS != "windows" && runtime.GOOS != "plan9" {
-		failTests = append(failTests, []FailTest{
-			{home + "/go", home + "/src/fake/test.go", errFormat(filepath.FromSlash(home + "/src/fake"))},
-			{home, home + "/src/fake/test.go", errFormat(filepath.FromSlash(home + "/src/fake"))},
-			{home, home + "/go/src/fake/test.go", errFormat(filepath.FromSlash(home + "/go/src/fake"))},
-		}...)
-	}
-
-	for _, test := range failTests {
-		buildContext.GOPATH = test.gopath
-		srcdir, importPath, err := guessImportPath(test.filename, &buildContext)
-		if !strings.HasPrefix(fmt.Sprint(err), test.wantErr) {
-			t.Errorf("guessImportPath(%q, %q) = %q, %q, %q; want %q, %q, %q",
-				test.filename, test.gopath, srcdir, importPath, err, "", "", test.wantErr)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/what.go b/installer/vendor/golang.org/x/tools/cmd/guru/what.go
deleted file mode 100644
index fabc3e801b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/what.go
+++ /dev/null
@@ -1,282 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/token"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// what reports all the information about the query selection that can be
-// obtained from parsing only its containing source file.
-// It is intended to be a very low-latency query callable from GUI
-// tools, e.g. to populate a menu of options of slower queries about
-// the selected location.
-//
-func what(q *Query) error {
-	qpos, err := fastQueryPos(q.Build, q.Pos)
-	if err != nil {
-		return err
-	}
-
-	// (ignore errors)
-	srcdir, importPath, _ := guessImportPath(qpos.fset.File(qpos.start).Name(), q.Build)
-
-	// Determine which query modes are applicable to the selection.
-	enable := map[string]bool{
-		"describe": true, // any syntax; always enabled
-	}
-
-	if qpos.end > qpos.start {
-		enable["freevars"] = true // nonempty selection?
-	}
-
-	for _, n := range qpos.path {
-		switch n := n.(type) {
-		case *ast.Ident:
-			enable["definition"] = true
-			enable["referrers"] = true
-			enable["implements"] = true
-		case *ast.CallExpr:
-			enable["callees"] = true
-		case *ast.FuncDecl:
-			enable["callers"] = true
-			enable["callstack"] = true
-		case *ast.SendStmt:
-			enable["peers"] = true
-		case *ast.UnaryExpr:
-			if n.Op == token.ARROW {
-				enable["peers"] = true
-			}
-		}
-
-		// For implements, we approximate findInterestingNode.
-		if _, ok := enable["implements"]; !ok {
-			switch n.(type) {
-			case *ast.ArrayType,
-				*ast.StructType,
-				*ast.FuncType,
-				*ast.InterfaceType,
-				*ast.MapType,
-				*ast.ChanType:
-				enable["implements"] = true
-			}
-		}
-
-		// For pointsto and whicherrs, we approximate findInterestingNode.
-		if _, ok := enable["pointsto"]; !ok {
-			switch n.(type) {
-			case ast.Stmt,
-				*ast.ArrayType,
-				*ast.StructType,
-				*ast.FuncType,
-				*ast.InterfaceType,
-				*ast.MapType,
-				*ast.ChanType:
-				// not an expression
-				enable["pointsto"] = false
-				enable["whicherrs"] = false
-
-			case ast.Expr, ast.Decl, *ast.ValueSpec:
-				// an expression, maybe
-				enable["pointsto"] = true
-				enable["whicherrs"] = true
-
-			default:
-				// Comment, Field, KeyValueExpr, etc: ascend.
-			}
-		}
-	}
-
-	// If we don't have an exact selection, disable modes that need one.
-	if !qpos.exact {
-		enable["callees"] = false
-		enable["pointsto"] = false
-		enable["whicherrs"] = false
-		enable["describe"] = false
-	}
-
-	var modes []string
-	for mode := range enable {
-		modes = append(modes, mode)
-	}
-	sort.Strings(modes)
-
-	// Find the object referred to by the selection (if it's an
-	// identifier) and report the position of each identifier
-	// that refers to the same object.
-	//
-	// This may return spurious matches (e.g. struct fields) because
-	// it uses the best-effort name resolution done by go/parser.
-	var sameids []token.Pos
-	var object string
-	if id, ok := qpos.path[0].(*ast.Ident); ok {
-		if id.Obj == nil {
-			// An unresolved identifier is potentially a package name.
-			// Resolve them with a simple importer (adds ~100µs).
-			importer := func(imports map[string]*ast.Object, path string) (*ast.Object, error) {
-				pkg, ok := imports[path]
-				if !ok {
-					pkg = &ast.Object{
-						Kind: ast.Pkg,
-						Name: filepath.Base(path), // a guess
-					}
-					imports[path] = pkg
-				}
-				return pkg, nil
-			}
-			f := qpos.path[len(qpos.path)-1].(*ast.File)
-			ast.NewPackage(qpos.fset, map[string]*ast.File{"": f}, importer, nil)
-		}
-
-		if id.Obj != nil {
-			object = id.Obj.Name
-			decl := qpos.path[len(qpos.path)-1]
-			ast.Inspect(decl, func(n ast.Node) bool {
-				if n, ok := n.(*ast.Ident); ok && n.Obj == id.Obj {
-					sameids = append(sameids, n.Pos())
-				}
-				return true
-			})
-		}
-	}
-
-	q.Output(qpos.fset, &whatResult{
-		path:       qpos.path,
-		srcdir:     srcdir,
-		importPath: importPath,
-		modes:      modes,
-		object:     object,
-		sameids:    sameids,
-	})
-	return nil
-}
-
-// guessImportPath finds the package containing filename, and returns
-// its source directory (an element of $GOPATH) and its import path
-// relative to it.
-//
-// TODO(adonovan): what about _test.go files that are not part of the
-// package?
-//
-func guessImportPath(filename string, buildContext *build.Context) (srcdir, importPath string, err error) {
-	absFile, err := filepath.Abs(filename)
-	if err != nil {
-		return "", "", fmt.Errorf("can't form absolute path of %s: %v", filename, err)
-	}
-
-	absFileDir := filepath.Dir(absFile)
-	resolvedAbsFileDir, err := filepath.EvalSymlinks(absFileDir)
-	if err != nil {
-		return "", "", fmt.Errorf("can't evaluate symlinks of %s: %v", absFileDir, err)
-	}
-
-	segmentedAbsFileDir := segments(resolvedAbsFileDir)
-	// Find the innermost directory in $GOPATH that encloses filename.
-	minD := 1024
-	for _, gopathDir := range buildContext.SrcDirs() {
-		absDir, err := filepath.Abs(gopathDir)
-		if err != nil {
-			continue // e.g. non-existent dir on $GOPATH
-		}
-		resolvedAbsDir, err := filepath.EvalSymlinks(absDir)
-		if err != nil {
-			continue // e.g. non-existent dir on $GOPATH
-		}
-
-		d := prefixLen(segments(resolvedAbsDir), segmentedAbsFileDir)
-		// If there are multiple matches,
-		// prefer the innermost enclosing directory
-		// (smallest d).
-		if d >= 0 && d < minD {
-			minD = d
-			srcdir = gopathDir
-			importPath = strings.Join(segmentedAbsFileDir[len(segmentedAbsFileDir)-minD:], string(os.PathSeparator))
-		}
-	}
-	if srcdir == "" {
-		return "", "", fmt.Errorf("directory %s is not beneath any of these GOROOT/GOPATH directories: %s",
-			filepath.Dir(absFile), strings.Join(buildContext.SrcDirs(), ", "))
-	}
-	if importPath == "" {
-		// This happens for e.g. $GOPATH/src/a.go, but
-		// "" is not a valid path for (*go/build).Import.
-		return "", "", fmt.Errorf("cannot load package in root of source directory %s", srcdir)
-	}
-	return srcdir, importPath, nil
-}
-
-func segments(path string) []string {
-	return strings.Split(path, string(os.PathSeparator))
-}
-
-// prefixLen returns the length of the remainder of y if x is a prefix
-// of y, a negative number otherwise.
-func prefixLen(x, y []string) int {
-	d := len(y) - len(x)
-	if d >= 0 {
-		for i := range x {
-			if y[i] != x[i] {
-				return -1 // not a prefix
-			}
-		}
-	}
-	return d
-}
-
-type whatResult struct {
-	path       []ast.Node
-	modes      []string
-	srcdir     string
-	importPath string
-	object     string
-	sameids    []token.Pos
-}
-
-func (r *whatResult) PrintPlain(printf printfFunc) {
-	for _, n := range r.path {
-		printf(n, "%s", astutil.NodeDescription(n))
-	}
-	printf(nil, "modes: %s", r.modes)
-	printf(nil, "srcdir: %s", r.srcdir)
-	printf(nil, "import path: %s", r.importPath)
-	for _, pos := range r.sameids {
-		printf(pos, "%s", r.object)
-	}
-}
-
-func (r *whatResult) JSON(fset *token.FileSet) []byte {
-	var enclosing []serial.SyntaxNode
-	for _, n := range r.path {
-		enclosing = append(enclosing, serial.SyntaxNode{
-			Description: astutil.NodeDescription(n),
-			Start:       fset.Position(n.Pos()).Offset,
-			End:         fset.Position(n.End()).Offset,
-		})
-	}
-
-	var sameids []string
-	for _, pos := range r.sameids {
-		sameids = append(sameids, fset.Position(pos).String())
-	}
-
-	return toJSON(&serial.What{
-		Modes:      r.modes,
-		SrcDir:     r.srcdir,
-		ImportPath: r.importPath,
-		Enclosing:  enclosing,
-		Object:     r.object,
-		SameIDs:    sameids,
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/guru/whicherrs.go b/installer/vendor/golang.org/x/tools/cmd/guru/whicherrs.go
deleted file mode 100644
index 3a81bf56a1..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/guru/whicherrs.go
+++ /dev/null
@@ -1,327 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/cmd/guru/serial"
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-var builtinErrorType = types.Universe.Lookup("error").Type()
-
-// whicherrs takes an position to an error and tries to find all types, constants
-// and global value which a given error can point to and which can be checked from the
-// scope where the error lives.
-// In short, it returns a list of things that can be checked against in order to handle
-// an error properly.
-//
-// TODO(dmorsing): figure out if fields in errors like *os.PathError.Err
-// can be queried recursively somehow.
-func whicherrs(q *Query) error {
-	lconf := loader.Config{Build: q.Build}
-
-	if err := setPTAScope(&lconf, q.Scope); err != nil {
-		return err
-	}
-
-	// Load/parse/type-check the program.
-	lprog, err := loadWithSoftErrors(&lconf)
-	if err != nil {
-		return err
-	}
-
-	qpos, err := parseQueryPos(lprog, q.Pos, true) // needs exact pos
-	if err != nil {
-		return err
-	}
-
-	prog := ssautil.CreateProgram(lprog, ssa.GlobalDebug)
-
-	ptaConfig, err := setupPTA(prog, lprog, q.PTALog, q.Reflection)
-	if err != nil {
-		return err
-	}
-
-	path, action := findInterestingNode(qpos.info, qpos.path)
-	if action != actionExpr {
-		return fmt.Errorf("whicherrs wants an expression; got %s",
-			astutil.NodeDescription(qpos.path[0]))
-	}
-	var expr ast.Expr
-	var obj types.Object
-	switch n := path[0].(type) {
-	case *ast.ValueSpec:
-		// ambiguous ValueSpec containing multiple names
-		return fmt.Errorf("multiple value specification")
-	case *ast.Ident:
-		obj = qpos.info.ObjectOf(n)
-		expr = n
-	case ast.Expr:
-		expr = n
-	default:
-		return fmt.Errorf("unexpected AST for expr: %T", n)
-	}
-
-	typ := qpos.info.TypeOf(expr)
-	if !types.Identical(typ, builtinErrorType) {
-		return fmt.Errorf("selection is not an expression of type 'error'")
-	}
-	// Determine the ssa.Value for the expression.
-	var value ssa.Value
-	if obj != nil {
-		// def/ref of func/var object
-		value, _, err = ssaValueForIdent(prog, qpos.info, obj, path)
-	} else {
-		value, _, err = ssaValueForExpr(prog, qpos.info, path)
-	}
-	if err != nil {
-		return err // e.g. trivially dead code
-	}
-
-	// Defer SSA construction till after errors are reported.
-	prog.Build()
-
-	globals := findVisibleErrs(prog, qpos)
-	constants := findVisibleConsts(prog, qpos)
-
-	res := &whicherrsResult{
-		qpos:   qpos,
-		errpos: expr.Pos(),
-	}
-
-	// TODO(adonovan): the following code is heavily duplicated
-	// w.r.t.  "pointsto".  Refactor?
-
-	// Find the instruction which initialized the
-	// global error. If more than one instruction has stored to the global
-	// remove the global from the set of values that we want to query.
-	allFuncs := ssautil.AllFunctions(prog)
-	for fn := range allFuncs {
-		for _, b := range fn.Blocks {
-			for _, instr := range b.Instrs {
-				store, ok := instr.(*ssa.Store)
-				if !ok {
-					continue
-				}
-				gval, ok := store.Addr.(*ssa.Global)
-				if !ok {
-					continue
-				}
-				gbl, ok := globals[gval]
-				if !ok {
-					continue
-				}
-				// we already found a store to this global
-				// The normal error define is just one store in the init
-				// so we just remove this global from the set we want to query
-				if gbl != nil {
-					delete(globals, gval)
-				}
-				globals[gval] = store.Val
-			}
-		}
-	}
-
-	ptaConfig.AddQuery(value)
-	for _, v := range globals {
-		ptaConfig.AddQuery(v)
-	}
-
-	ptares := ptrAnalysis(ptaConfig)
-	valueptr := ptares.Queries[value]
-	if valueptr == (pointer.Pointer{}) {
-		return fmt.Errorf("pointer analysis did not find expression (dead code?)")
-	}
-	for g, v := range globals {
-		ptr, ok := ptares.Queries[v]
-		if !ok {
-			continue
-		}
-		if !ptr.MayAlias(valueptr) {
-			continue
-		}
-		res.globals = append(res.globals, g)
-	}
-	pts := valueptr.PointsTo()
-	dedup := make(map[*ssa.NamedConst]bool)
-	for _, label := range pts.Labels() {
-		// These values are either MakeInterfaces or reflect
-		// generated interfaces. For the purposes of this
-		// analysis, we don't care about reflect generated ones
-		makeiface, ok := label.Value().(*ssa.MakeInterface)
-		if !ok {
-			continue
-		}
-		constval, ok := makeiface.X.(*ssa.Const)
-		if !ok {
-			continue
-		}
-		c := constants[*constval]
-		if c != nil && !dedup[c] {
-			dedup[c] = true
-			res.consts = append(res.consts, c)
-		}
-	}
-	concs := pts.DynamicTypes()
-	concs.Iterate(func(conc types.Type, _ interface{}) {
-		// go/types is a bit annoying here.
-		// We want to find all the types that we can
-		// typeswitch or assert to. This means finding out
-		// if the type pointed to can be seen by us.
-		//
-		// For the purposes of this analysis, we care only about
-		// TypeNames of Named or pointer-to-Named types.
-		// We ignore other types (e.g. structs) that implement error.
-		var name *types.TypeName
-		switch t := conc.(type) {
-		case *types.Pointer:
-			named, ok := t.Elem().(*types.Named)
-			if !ok {
-				return
-			}
-			name = named.Obj()
-		case *types.Named:
-			name = t.Obj()
-		default:
-			return
-		}
-		if !isAccessibleFrom(name, qpos.info.Pkg) {
-			return
-		}
-		res.types = append(res.types, &errorType{conc, name})
-	})
-	sort.Sort(membersByPosAndString(res.globals))
-	sort.Sort(membersByPosAndString(res.consts))
-	sort.Sort(sorterrorType(res.types))
-
-	q.Output(lprog.Fset, res)
-	return nil
-}
-
-// findVisibleErrs returns a mapping from each package-level variable of type "error" to nil.
-func findVisibleErrs(prog *ssa.Program, qpos *queryPos) map[*ssa.Global]ssa.Value {
-	globals := make(map[*ssa.Global]ssa.Value)
-	for _, pkg := range prog.AllPackages() {
-		for _, mem := range pkg.Members {
-			gbl, ok := mem.(*ssa.Global)
-			if !ok {
-				continue
-			}
-			gbltype := gbl.Type()
-			// globals are always pointers
-			if !types.Identical(deref(gbltype), builtinErrorType) {
-				continue
-			}
-			if !isAccessibleFrom(gbl.Object(), qpos.info.Pkg) {
-				continue
-			}
-			globals[gbl] = nil
-		}
-	}
-	return globals
-}
-
-// findVisibleConsts returns a mapping from each package-level constant assignable to type "error", to nil.
-func findVisibleConsts(prog *ssa.Program, qpos *queryPos) map[ssa.Const]*ssa.NamedConst {
-	constants := make(map[ssa.Const]*ssa.NamedConst)
-	for _, pkg := range prog.AllPackages() {
-		for _, mem := range pkg.Members {
-			obj, ok := mem.(*ssa.NamedConst)
-			if !ok {
-				continue
-			}
-			consttype := obj.Type()
-			if !types.AssignableTo(consttype, builtinErrorType) {
-				continue
-			}
-			if !isAccessibleFrom(obj.Object(), qpos.info.Pkg) {
-				continue
-			}
-			constants[*obj.Value] = obj
-		}
-	}
-
-	return constants
-}
-
-type membersByPosAndString []ssa.Member
-
-func (a membersByPosAndString) Len() int { return len(a) }
-func (a membersByPosAndString) Less(i, j int) bool {
-	cmp := a[i].Pos() - a[j].Pos()
-	return cmp < 0 || cmp == 0 && a[i].String() < a[j].String()
-}
-func (a membersByPosAndString) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-
-type sorterrorType []*errorType
-
-func (a sorterrorType) Len() int { return len(a) }
-func (a sorterrorType) Less(i, j int) bool {
-	cmp := a[i].obj.Pos() - a[j].obj.Pos()
-	return cmp < 0 || cmp == 0 && a[i].typ.String() < a[j].typ.String()
-}
-func (a sorterrorType) Swap(i, j int) { a[i], a[j] = a[j], a[i] }
-
-type errorType struct {
-	typ types.Type      // concrete type N or *N that implements error
-	obj *types.TypeName // the named type N
-}
-
-type whicherrsResult struct {
-	qpos    *queryPos
-	errpos  token.Pos
-	globals []ssa.Member
-	consts  []ssa.Member
-	types   []*errorType
-}
-
-func (r *whicherrsResult) PrintPlain(printf printfFunc) {
-	if len(r.globals) > 0 {
-		printf(r.qpos, "this error may point to these globals:")
-		for _, g := range r.globals {
-			printf(g.Pos(), "\t%s", g.RelString(r.qpos.info.Pkg))
-		}
-	}
-	if len(r.consts) > 0 {
-		printf(r.qpos, "this error may contain these constants:")
-		for _, c := range r.consts {
-			printf(c.Pos(), "\t%s", c.RelString(r.qpos.info.Pkg))
-		}
-	}
-	if len(r.types) > 0 {
-		printf(r.qpos, "this error may contain these dynamic types:")
-		for _, t := range r.types {
-			printf(t.obj.Pos(), "\t%s", r.qpos.typeString(t.typ))
-		}
-	}
-}
-
-func (r *whicherrsResult) JSON(fset *token.FileSet) []byte {
-	we := &serial.WhichErrs{}
-	we.ErrPos = fset.Position(r.errpos).String()
-	for _, g := range r.globals {
-		we.Globals = append(we.Globals, fset.Position(g.Pos()).String())
-	}
-	for _, c := range r.consts {
-		we.Constants = append(we.Constants, fset.Position(c.Pos()).String())
-	}
-	for _, t := range r.types {
-		var et serial.WhichErrsType
-		et.Type = r.qpos.typeString(t.typ)
-		et.Position = fset.Position(t.obj.Pos()).String()
-		we.Types = append(we.Types, et)
-	}
-	return toJSON(we)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/.clang-format b/installer/vendor/golang.org/x/tools/cmd/heapview/client/.clang-format
deleted file mode 100644
index f6cb8ad931..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/.clang-format
+++ /dev/null
@@ -1 +0,0 @@
-BasedOnStyle: Google
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/.gitignore b/installer/vendor/golang.org/x/tools/cmd/heapview/client/.gitignore
deleted file mode 100644
index 2ccbe4656c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/node_modules/
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/README.md b/installer/vendor/golang.org/x/tools/cmd/heapview/client/README.md
deleted file mode 100644
index 4cb26219db..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/README.md
+++ /dev/null
@@ -1,45 +0,0 @@
-# Go Heap Viewer Client
-
-This directory contains the client Typescript code for the Go
-heap viewer.
-
-## Typescript Tooling
-
-Below are instructions for downloading tooling and files to
-help make the development process more convenient. These tools
-are not required for contributing or running the heap viewer-
-they are just meant as development aids.
-
-## Node and NPM
-
-We use npm to manage the dependencies for these tools. There are
-a couple of ways of installing npm on your system, but we recommend
-using nvm.
-
-Run the following command to install nvm:
-
-    [shell]$ curl -o- https://raw.githubusercontent.com/creationix/nvm/v0.31.3/install.sh | bash
-
-or see the instructions on [the nvm github page](github.com/creationix/nvm)
-for alternative methods. This will put the nvm tool in your home directory
-and edit your path to add nvm, node and other tools you install using them.
-Once nvm is installed, use
-
-    [shell]$ nvm install node
-
-then
-
-    [shell]$ nvm use node
-
-to install node.js.
-
-Once node is installed, you can install typescript using
-
-    [shell]$ npm install -g typescript
-
-Finally, import type definitions into this project by running
-
-    [shell]$ npm install
-
-in this directory. They will be imported into the node_packages directory
-and be automatically available to the Typescript compiler.
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/main.ts b/installer/vendor/golang.org/x/tools/cmd/heapview/client/main.ts
deleted file mode 100644
index fe3985c111..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/main.ts
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/**
- * An enum of types of actions that might be requested
- * by the app.
- */
-enum Action {
-  TOGGLE_SIDEBAR,  // Toggle the sidebar.
-  NAVIGATE_ABOUT,  // Go to the about page.
-}
-
-const TITLE = 'Go Heap Viewer';
-
-/**
- * A type of event that signals to the AppElement controller
- * that something shoud be done. For the most part, the structure
- * of the app will be that elements' state will mostly be controlled
- * by parent elements. Elements will issue actions that the AppElement
- * will handle, and the app will be re-rendered down the DOM
- * hierarchy.
- */
-class ActionEvent extends Event {
-  static readonly EVENT_TYPE = 'action-event'
-  constructor(public readonly action: Action) { super(ActionEvent.EVENT_TYPE); }
-}
-
-/**
- * A hamburger menu element. Triggers a TOGGLE_SIDE action to toggle the
- * sidebar.
- */
-export class HamburgerElement extends HTMLElement {
-  static readonly NAME = 'heap-hamburger';
-
-  createdCallback() {
-    this.appendChild(document.createTextNode('☰'));
-    this.onclick =
-        () => { this.dispatchEvent(new ActionEvent(Action.TOGGLE_SIDEBAR)) };
-  }
-}
-document.registerElement(HamburgerElement.NAME, HamburgerElement);
-
-/**
- * A heading for the page with a hamburger menu and a title.
- */
-export class HeadingElement extends HTMLElement {
-  static readonly NAME = 'heap-heading';
-
-  createdCallback() {
-    this.style.display = 'block';
-    this.style.backgroundColor = '#2196F3';
-    this.style.webkitUserSelect = 'none';
-    this.style.cursor = 'default';
-    this.style.color = '#FFFFFF';
-    this.style.padding = '10px';
-
-    const div = document.createElement('div');
-    div.style.margin = '0px';
-    div.style.fontSize = '2em';
-    div.appendChild(document.createElement(HamburgerElement.NAME));
-    div.appendChild(document.createTextNode(' ' + TITLE));
-    this.appendChild(div);
-  }
-}
-document.registerElement(HeadingElement.NAME, HeadingElement);
-
-/**
- * A sidebar that has navigation for the app.
- */
-export class SidebarElement extends HTMLElement {
-  static readonly NAME = 'heap-sidebar';
-
-  createdCallback() {
-    this.style.display = 'none';
-    this.style.backgroundColor = '#9E9E9E';
-    this.style.width = '15em';
-
-    const aboutButton = document.createElement('button');
-    aboutButton.innerText = 'about';
-    aboutButton.onclick =
-        () => { this.dispatchEvent(new ActionEvent(Action.NAVIGATE_ABOUT)) };
-    this.appendChild(aboutButton);
-  }
-
-  toggle() {
-    this.style.display = this.style.display === 'none' ? 'block' : 'none';
-  }
-}
-document.registerElement(SidebarElement.NAME, SidebarElement);
-
-/**
- * A Container for the main content in the app.
- * TODO(matloob): Implement main content.
- */
-export class MainContentElement extends HTMLElement {
-  static readonly NAME = 'heap-container';
-
-  attachedCallback() {
-    this.style.backgroundColor = '#E0E0E0';
-    this.style.height = '100%';
-    this.style.flex = '1';
-  }
-}
-document.registerElement(MainContentElement.NAME, MainContentElement);
-
-/**
- * A container and controller for the whole app.
- * Contains the heading, side drawer and main panel.
- */
-class AppElement extends HTMLElement {
-  static readonly NAME = 'heap-app';
-  private sidebar: SidebarElement;
-  private mainContent: MainContentElement;
-
-  attachedCallback() {
-    document.title = TITLE;
-
-    this.addEventListener(
-        ActionEvent.EVENT_TYPE, e => this.handleAction(e as ActionEvent),
-        /* capture */ true);
-
-    this.render();
-  }
-
-  render() {
-    this.style.display = 'block';
-    this.style.height = '100vh';
-    this.style.width = '100vw';
-    this.appendChild(document.createElement(HeadingElement.NAME));
-
-    const bodyDiv = document.createElement('div');
-    bodyDiv.style.height = '100%';
-    bodyDiv.style.display = 'flex';
-    this.sidebar =
-        document.createElement(SidebarElement.NAME) as SidebarElement;
-    bodyDiv.appendChild(this.sidebar);
-    this.mainContent =
-        document.createElement(MainContentElement.NAME) as MainContentElement;
-    bodyDiv.appendChild(this.mainContent);
-    this.appendChild(bodyDiv);
-
-    this.renderRoute();
-  }
-
-  renderRoute() {
-    this.mainContent.innerHTML = ''
-    switch (window.location.pathname) {
-      case '/about':
-        this.mainContent.appendChild(
-            document.createElement(AboutPageElement.NAME));
-        break;
-    }
-  }
-
-  handleAction(event: ActionEvent) {
-    switch (event.action) {
-      case Action.TOGGLE_SIDEBAR:
-        this.sidebar.toggle();
-        break;
-      case Action.NAVIGATE_ABOUT:
-        window.history.pushState({}, '', '/about');
-        this.renderRoute();
-        break;
-    }
-  }
-}
-document.registerElement(AppElement.NAME, AppElement);
-
-/**
- * An about page.
- */
-class AboutPageElement extends HTMLElement {
-  static readonly NAME = 'heap-about';
-
-  createdCallback() { this.textContent = TITLE; }
-}
-document.registerElement(AboutPageElement.NAME, AboutPageElement);
-
-/**
- * Resets body's margin and padding, and sets font.
- */
-function clearStyle(document: Document) {
-  const styleElement = document.createElement('style') as HTMLStyleElement;
-  document.head.appendChild(styleElement);
-  const styleSheet = styleElement.sheet as CSSStyleSheet;
-  styleSheet.insertRule(
-      '* {font-family: Roboto,Helvetica; box-sizing: border-box}', 0);
-  styleSheet.insertRule('body {margin: 0px; padding:0px}', 0);
-}
-
-export function main() {
-  clearStyle(document);
-  document.body.appendChild(document.createElement(AppElement.NAME));
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/main_test.ts b/installer/vendor/golang.org/x/tools/cmd/heapview/client/main_test.ts
deleted file mode 100644
index a2086538e7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/main_test.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-import {HamburgerElement, HeadingElement, SidebarElement, main} from './main';
-
-describe('main', () => {
-  it('sets the document\'s title', () => {
-    main();
-    expect(document.title).toBe('Go Heap Viewer');
-  });
-
-  it('has a heading', () => {
-    main();
-    expect(document.querySelector(HeadingElement.NAME)).toBeDefined();
-  });
-
-  it('has a sidebar', () => {
-    main();
-    const hamburger = document.querySelector(HamburgerElement.NAME);
-    const sidebar =
-        document.querySelector(SidebarElement.NAME) as SidebarElement;
-    expect(sidebar.style.display).toBe('none');
-
-    // Click on the hamburger. Sidebar should then be visible.
-    hamburger.dispatchEvent(new Event('click'));
-    expect(sidebar.style.display).toBe('block');
-  })
-});
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/package.json b/installer/vendor/golang.org/x/tools/cmd/heapview/client/package.json
deleted file mode 100644
index b2febe8890..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/package.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-  "//": [
-    "Copyright 2016 The Go Authors. All rights reserved.",
-    "Use of this source code is governed by a BSD-style",
-    "license that can be found in the LICENSE file.",
-
-    "This file exists to help import typescript typings",
-    "for web features used in this project. Neither the",
-    "typings nor node or npm are required to do development",
-    "on the code in this project.",
-
-    "If you do have npm installed, use the `npm i` command",
-    "in this directory to install the typings."
-  ],
-  "private": true,
-  "name": "@golangtools/heapview",
-  "version": "0.0.0",
-  "devDependencies": {
-    "@types/webcomponents.js": "latest",
-    "@types/whatwg-fetch": "latest",
-    "@types/jasmine": "latest",
-
-    "jasmine-core": "latest",
-    "karma": "latest",
-    "karma-jasmine": "latest",
-    "karma-chrome-launcher": "latest",
-
-    "clang-format": "latest"
-  },
-  "scripts": {
-    "test": "karma start testing/karma.conf.js",
-    "format": "find . | grep '\\(test_main\\.js\\|\\.ts\\)$' | xargs clang-format -i",
-    "lint": "tslint --project ."
-  }
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/karma.conf.js b/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/karma.conf.js
deleted file mode 100644
index acaf9d5bc7..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/karma.conf.js
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-module.exports = config => {
-    config.set({
-        frameworks: ['jasmine'],
-        basePath: '../../../..',
-        files: [
-            'third_party/webcomponents/customelements.js',
-            'third_party/typescript/typescript.js',
-            'third_party/moduleloader/moduleloader.js',
-            'cmd/heapview/client/testing/test_main.js',
-            {pattern: 'cmd/heapview/client/**/*.ts', included: false},
-        ],
-        browsers: ['Chrome'],
-        plugins: [
-            'karma-jasmine',
-            'karma-chrome-launcher'
-        ],
-    })
-}
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/test_main.js b/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/test_main.js
deleted file mode 100644
index 6c2afd7336..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/testing/test_main.js
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Configure module loader.
-System.transpiler = 'typescript'
-System.typescriptOptions = {
-  target: ts.ScriptTarget.ES2015
-};
-System.locate = (load) => load.name + '.ts';
-
-// Determine set of test files.
-var tests = [];
-for (var file in window.__karma__.files) {
-  if (window.__karma__.files.hasOwnProperty(file)) {
-    if (/_test\.ts$/.test(file)) {
-      tests.push(file.slice(0, -3));
-    }
-  }
-}
-
-// Steal loaded callback so we can block until we're
-// done loading all test modules.
-var loadedCallback = window.__karma__.loaded.bind(window.__karma__);
-window.__karma__.loaded = () => {};
-
-// Load all test modules, and then call loadedCallback.
-var promises = [];
-for (var i = 0; i < tests.length; i++) {
-  promises.push(System.import(tests[i]));
-}
-Promise.all(promises).then(loadedCallback);
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/tsconfig.json b/installer/vendor/golang.org/x/tools/cmd/heapview/client/tsconfig.json
deleted file mode 100644
index 14c38a1b55..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/tsconfig.json
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains configuration for the Typescript
-// compiler if you're running it locally for typechecking
-// and other tooling. The Typescript compiler is
-// not necessary to do development on this project.
-
-{
-  "compilerOptions": {
-    "noEmit": true,
-    "strictNullChecks": true,
-    "target": "es2015"
-  }
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/client/tslint.json b/installer/vendor/golang.org/x/tools/cmd/heapview/client/tslint.json
deleted file mode 100644
index a0f2d15d2f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/client/tslint.json
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This tslint file is based on a configuration used at
-// Google.
-
-{
-  "rules": {
-    "class-name": true,
-    "forin": true,
-    "interface-name": [true, "never-prefix"],
-    "jsdoc-format": true,
-    "label-position": true,
-    "label-undefined": true,
-    "new-parens": true,
-    "no-angle-bracket-type-assertion": true,
-    "no-construct": true,
-    "no-debugger": true,
-    "no-namespace": [true, "allow-declarations"],
-    "no-reference": true,
-    "no-require-imports": true,
-    "no-unused-expression": true,
-    "no-unused-variable": true,
-    "no-use-before-declare": true,
-    "no-var-keyword": true,
-    "semicolon": [true, "always"],
-    "switch-default": true,
-    "triple-equals": [true, "allow-null-check"],
-    "use-isnan": true,
-    "variable-name": [
-      true,
-      "check-format",
-      "ban-keywords",
-      "allow-leading-underscore",
-      "allow-trailing-underscore",
-      "allow-pascal-case"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile.go b/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile.go
deleted file mode 100644
index 78445a9ca8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile.go
+++ /dev/null
@@ -1,145 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin linux
-
-package core
-
-import (
-	"errors"
-	"fmt"
-	"io"
-	"os"
-	"syscall"
-)
-
-var errMmapClosed = errors.New("mmap: closed")
-
-// mmapFile wraps a memory-mapped file.
-type mmapFile struct {
-	data     []byte
-	pos      uint64
-	writable bool
-}
-
-// mmapOpen opens the named file for reading.
-// If writable is true, the file is also open for writing.
-func mmapOpen(filename string, writable bool) (*mmapFile, error) {
-	f, err := os.Open(filename)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	st, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-
-	size := st.Size()
-	if size == 0 {
-		return &mmapFile{data: []byte{}}, nil
-	}
-	if size < 0 {
-		return nil, fmt.Errorf("mmap: file %q has negative size: %d", filename, size)
-	}
-	if size != int64(int(size)) {
-		return nil, fmt.Errorf("mmap: file %q is too large", filename)
-	}
-
-	prot := syscall.PROT_READ
-	if writable {
-		prot |= syscall.PROT_WRITE
-	}
-	data, err := syscall.Mmap(int(f.Fd()), 0, int(size), prot, syscall.MAP_SHARED)
-	if err != nil {
-		return nil, err
-	}
-	return &mmapFile{data: data, writable: writable}, nil
-}
-
-// Size returns the size of the mapped file.
-func (f *mmapFile) Size() uint64 {
-	return uint64(len(f.data))
-}
-
-// Pos returns the current file pointer.
-func (f *mmapFile) Pos() uint64 {
-	return f.pos
-}
-
-// SeekTo sets the current file pointer relative to the start of the file.
-func (f *mmapFile) SeekTo(offset uint64) {
-	f.pos = offset
-}
-
-// Read implements io.Reader.
-func (f *mmapFile) Read(p []byte) (int, error) {
-	if f.data == nil {
-		return 0, errMmapClosed
-	}
-	if f.pos >= f.Size() {
-		return 0, io.EOF
-	}
-	n := copy(p, f.data[f.pos:])
-	f.pos += uint64(n)
-	if n < len(p) {
-		return n, io.EOF
-	}
-	return n, nil
-}
-
-// ReadByte implements io.ByteReader.
-func (f *mmapFile) ReadByte() (byte, error) {
-	if f.data == nil {
-		return 0, errMmapClosed
-	}
-	if f.pos >= f.Size() {
-		return 0, io.EOF
-	}
-	b := f.data[f.pos]
-	f.pos++
-	return b, nil
-}
-
-// ReadSlice returns a slice of size n that points directly at the
-// underlying mapped file. There is no copying. Fails if it cannot
-// read at least n bytes.
-func (f *mmapFile) ReadSlice(n uint64) ([]byte, error) {
-	if f.data == nil {
-		return nil, errMmapClosed
-	}
-	if f.pos+n >= f.Size() {
-		return nil, io.EOF
-	}
-	first := f.pos
-	f.pos += n
-	return f.data[first:f.pos:f.pos], nil
-}
-
-// ReadSliceAt is like ReadSlice, but reads from a specific offset.
-// The file pointer is not used or advanced.
-func (f *mmapFile) ReadSliceAt(offset, n uint64) ([]byte, error) {
-	if f.data == nil {
-		return nil, errMmapClosed
-	}
-	if f.Size() < offset {
-		return nil, fmt.Errorf("mmap: out-of-bounds ReadSliceAt offset %d, size is %d", offset, f.Size())
-	}
-	if offset+n >= f.Size() {
-		return nil, io.EOF
-	}
-	end := offset + n
-	return f.data[offset:end:end], nil
-}
-
-// Close closes the file.
-func (f *mmapFile) Close() error {
-	if f.data == nil {
-		return nil
-	}
-	err := syscall.Munmap(f.data)
-	f.data = nil
-	f.pos = 0
-	return err
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile_other.go b/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile_other.go
deleted file mode 100644
index 181f842067..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/mmapfile_other.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !darwin,!linux
-
-package core
-
-// TODO(matloob): perhaps use the more portable golang.org/x/exp/mmap
-// instead of the mmap code in mmapfile.go.
-
-type mmapFile struct{}
-
-func (m *mmapFile) Close() error { return nil }
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/raw.go b/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/raw.go
deleted file mode 100644
index febed0f4dc..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/internal/core/raw.go
+++ /dev/null
@@ -1,308 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package core provides functions for reading core dumps
-// and examining their contained heaps.
-package core
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"runtime"
-	"sort"
-)
-
-// RawDump provides raw access to the heap records in a core file.
-// The raw records in this file are described by other structs named Raw{*}.
-// All []byte slices are direct references to the underlying mmap'd file.
-// These references will become invalid as soon as the RawDump is closed.
-type RawDump struct {
-	Params   *RawParams
-	MemStats *runtime.MemStats
-
-	HeapObjects    []RawSegment // heap objects sorted by Addr, low-to-high
-	GlobalSegments []RawSegment // data, bss, and noptrbss segments
-
-	OSThreads   []*RawOSThread
-	Goroutines  []*RawGoroutine
-	StackFrames []*RawStackFrame
-	OtherRoots  []*RawOtherRoot
-	Finalizers  []*RawFinalizer
-	Defers      []*RawDefer
-	Panics      []*RawPanic
-
-	TypeFromItab map[uint64]uint64   // map from itab address to the type address that itab represents
-	TypeFromAddr map[uint64]*RawType // map from RawType.Addr to RawType
-
-	MemProfMap   map[uint64]*RawMemProfEntry
-	AllocSamples []*RawAllocSample
-
-	fmap *mmapFile
-}
-
-// RawParams holds metadata about the program that generated the dump.
-type RawParams struct {
-	// Info about the memory space
-
-	ByteOrder binary.ByteOrder // byte order of all memory in this dump
-	PtrSize   uint64           // in bytes
-	HeapStart uint64           // heap start address
-	HeapEnd   uint64           // heap end address (this is the last byte in the heap + 1)
-
-	// Info about the program that generated this heapdump
-
-	GoArch       string // GOARCH of the runtime library that generated this dump
-	GoExperiment string // GOEXPERIMENT of the toolchain that build the runtime library
-	NCPU         uint64 // number of physical cpus available to the program
-}
-
-// RawSegment represents a segment of memory.
-type RawSegment struct {
-	Addr      uint64       // base address of the segment
-	Data      []byte       // data for this segment
-	PtrFields RawPtrFields // offsets of ptr fields within this segment
-}
-
-// RawPtrFields represents a pointer field.
-type RawPtrFields struct {
-	encoded          []byte // list of uvarint-encoded offsets, or nil if none
-	startOff, endOff uint64 // decoded offsets are translated and clipped to [startOff,endOff)
-}
-
-// RawOSThread represents an OS thread.
-type RawOSThread struct {
-	MAddr  uint64 // address of the OS thread descriptor (M)
-	GoID   uint64 // go's internal ID for the thread
-	ProcID uint64 // kernel's ID for the thread
-}
-
-// RawGoroutine represents a goroutine structure.
-type RawGoroutine struct {
-	GAddr        uint64 // address of the goroutine descriptor
-	SP           uint64 // current stack pointer (lowest address in the currently running frame)
-	GoID         uint64 // goroutine ID
-	GoPC         uint64 // PC of the go statement that created this goroutine
-	Status       uint64
-	IsSystem     bool   // true if started by the system
-	IsBackground bool   // always false in go1.7
-	WaitSince    uint64 // time the goroutine started waiting, in nanoseconds since the Unix epoch
-	WaitReason   string
-	CtxtAddr     uint64 // address of the scheduling ctxt
-	MAddr        uint64 // address of the OS thread descriptor (M)
-	TopDeferAddr uint64 // address of the top defer record
-	TopPanicAddr uint64 // address of the top panic record
-}
-
-// RawStackFrame represents a stack frame.
-type RawStackFrame struct {
-	Name     string
-	Depth    uint64     // 0 = bottom of stack (currently running frame)
-	CalleeSP uint64     // stack pointer of the child frame (or 0 for the bottom-most frame)
-	EntryPC  uint64     // entry PC for the function
-	PC       uint64     // current PC being executed
-	NextPC   uint64     // for callers, where the function resumes (if anywhere) after the callee is done
-	Segment  RawSegment // local vars (Segment.Addr is the stack pointer, i.e., lowest address in the frame)
-}
-
-// RawOtherRoot represents the other roots not in RawDump's other fields.
-type RawOtherRoot struct {
-	Description string
-	Addr        uint64 // address pointed to by this root
-}
-
-// RawFinalizer represents a finalizer.
-type RawFinalizer struct {
-	IsQueued      bool   // if true, the object is unreachable and the finalizer is ready to run
-	ObjAddr       uint64 // address of the object to finalize
-	ObjTypeAddr   uint64 // address of the descriptor for typeof(obj)
-	FnAddr        uint64 // function to be run (a FuncVal*)
-	FnArgTypeAddr uint64 // address of the descriptor for the type of the function argument
-	FnPC          uint64 // PC of finalizer entry point
-}
-
-// RawDefer represents a defer.
-type RawDefer struct {
-	Addr     uint64 // address of the defer record
-	GAddr    uint64 // address of the containing goroutine's descriptor
-	ArgP     uint64 // stack pointer giving the args for defer (TODO: is this right?)
-	PC       uint64 // PC of the defer instruction
-	FnAddr   uint64 // function to be run (a FuncVal*)
-	FnPC     uint64 // PC of the defered function's entry point
-	LinkAddr uint64 // address of the next defer record in this chain
-}
-
-// RawPanic represents a panic.
-type RawPanic struct {
-	Addr        uint64 // address of the panic record
-	GAddr       uint64 // address of the containing goroutine's descriptor
-	ArgTypeAddr uint64 // type of the panic arg
-	ArgAddr     uint64 // address of the panic arg
-	DeferAddr   uint64 // address of the defer record that is currently running
-	LinkAddr    uint64 // address of the next panic record in this chain
-}
-
-// RawType repesents the Go runtime's representation of a type.
-type RawType struct {
-	Addr uint64 // address of the type descriptor
-	Size uint64 // in bytes
-	Name string // not necessarily unique
-	// If true, this type is equivalent to a single pointer, so ifaces can store
-	// this type directly in the data field (without indirection).
-	DirectIFace bool
-}
-
-// RawMemProfEntry represents a memory profiler entry.
-type RawMemProfEntry struct {
-	Size      uint64            // size of the allocated object
-	NumAllocs uint64            // number of allocations
-	NumFrees  uint64            // number of frees
-	Stacks    []RawMemProfFrame // call stacks
-}
-
-// RawMemProfFrame represents a memory profiler frame.
-type RawMemProfFrame struct {
-	Func []byte // string left as []byte reference to save memory
-	File []byte // string left as []byte reference to save memory
-	Line uint64
-}
-
-// RawAllocSample represents a memory profiler allocation sample.
-type RawAllocSample struct {
-	Addr uint64           // address of object
-	Prof *RawMemProfEntry // record of allocation site
-}
-
-// Close closes the file.
-func (r *RawDump) Close() error {
-	return r.fmap.Close()
-}
-
-// FindSegment returns the segment that contains the given address, or
-// nil of no segment contains the address.
-func (r *RawDump) FindSegment(addr uint64) *RawSegment {
-	// Binary search for an upper-bound heap object, then check
-	// if the previous object contains addr.
-	k := sort.Search(len(r.HeapObjects), func(k int) bool {
-		return addr < r.HeapObjects[k].Addr
-	})
-	k--
-	if k >= 0 && r.HeapObjects[k].Contains(addr) {
-		return &r.HeapObjects[k]
-	}
-
-	// Check all global segments.
-	for k := range r.GlobalSegments {
-		if r.GlobalSegments[k].Contains(addr) {
-			return &r.GlobalSegments[k]
-		}
-	}
-
-	// NB: Stack-local vars are technically allocated in the heap, since stack frames are
-	// allocated in the heap space, however, stack frames don't show up in r.HeapObjects.
-	for _, f := range r.StackFrames {
-		if f.Segment.Contains(addr) {
-			return &f.Segment
-		}
-	}
-
-	return nil
-}
-
-// Contains returns true if the segment contains the given address.
-func (r RawSegment) Contains(addr uint64) bool {
-	return r.Addr <= addr && addr < r.Addr+r.Size()
-}
-
-// ContainsRange returns true if the segment contains the range [addr, addr+size).
-func (r RawSegment) ContainsRange(addr, size uint64) bool {
-	if !r.Contains(addr) {
-		return false
-	}
-	if size > 0 && !r.Contains(addr+size-1) {
-		return false
-	}
-	return true
-}
-
-// Size returns the size of the segment in bytes.
-func (r RawSegment) Size() uint64 {
-	return uint64(len(r.Data))
-}
-
-// Slice takes a slice of the given segment. Panics if [offset,offset+size)
-// is out-of-bounds. The resulting RawSegment.PtrOffsets will clipped and
-// translated into the new segment.
-func (r RawSegment) Slice(offset, size uint64) *RawSegment {
-	if offset+size > uint64(len(r.Data)) {
-		panic(fmt.Errorf("slice(%d,%d) out-of-bounds of segment @%x sz=%d", offset, size, r.Addr, len(r.Data)))
-	}
-	return &RawSegment{
-		Addr: r.Addr + offset,
-		Data: r.Data[offset : offset+size : offset+size],
-		PtrFields: RawPtrFields{
-			encoded:  r.PtrFields.encoded,
-			startOff: r.PtrFields.startOff + offset,
-			endOff:   r.PtrFields.startOff + offset + size,
-		},
-	}
-}
-
-// Offsets decodes the list of ptr field offsets.
-func (r RawPtrFields) Offsets() []uint64 {
-	if r.encoded == nil {
-		return nil
-	}
-
-	// NB: This should never fail since we already decoded the varints once
-	// when parsing the file originally. Hence we panic on failure.
-	reader := bytes.NewReader(r.encoded)
-	readUint64 := func() uint64 {
-		x, err := binary.ReadUvarint(reader)
-		if err != nil {
-			panic(fmt.Errorf("unexpected failure decoding uvarint: %v", err))
-		}
-		return x
-	}
-
-	var out []uint64
-	for {
-		k := readUint64()
-		switch k {
-		case 0: // end
-			return out
-		case 1: // ptr
-			x := readUint64()
-			if r.startOff <= x && x < r.endOff {
-				out = append(out, x-r.startOff)
-			}
-		default:
-			panic(fmt.Errorf("unexpected FieldKind %d", k))
-		}
-	}
-}
-
-// ReadPtr decodes a ptr from the given byte slice.
-func (r *RawParams) ReadPtr(b []byte) uint64 {
-	switch r.PtrSize {
-	case 4:
-		return uint64(r.ByteOrder.Uint32(b))
-	case 8:
-		return r.ByteOrder.Uint64(b)
-	default:
-		panic(fmt.Errorf("unsupported PtrSize=%d", r.PtrSize))
-	}
-}
-
-// WritePtr encodes a ptr into the given byte slice.
-func (r *RawParams) WritePtr(b []byte, addr uint64) {
-	switch r.PtrSize {
-	case 4:
-		r.ByteOrder.PutUint32(b, uint32(addr))
-	case 8:
-		r.ByteOrder.PutUint64(b, addr)
-	default:
-		panic(fmt.Errorf("unsupported PtrSize=%d", r.PtrSize))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/heapview/main.go b/installer/vendor/golang.org/x/tools/cmd/heapview/main.go
deleted file mode 100644
index 6dac12e00e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/heapview/main.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// heapview is a tool for viewing Go heap dumps.
-package main
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"io"
-	"log"
-	"net/http"
-	"os"
-	"path/filepath"
-)
-
-var host = flag.String("host", "", "host addr to listen on")
-var port = flag.Int("port", 8080, "service port")
-
-var index = `<!DOCTYPE html>
-<script src="js/customelements.js"></script>
-<script src="js/typescript.js"></script>
-<script src="js/moduleloader.js"></script>
-<script>
-  System.transpiler = 'typescript';
-  System.typescriptOptions = {target: ts.ScriptTarget.ES2015};
-  System.locate = (load) => load.name + '.ts';
-</script>
-<script type="module">
-  import {main} from './client/main';
-  main();
-</script>
-`
-
-func toolsDir() string {
-	p, err := build.Import("golang.org/x/tools", "", build.FindOnly)
-	if err != nil {
-		log.Println("error: can't find client files:", err)
-		os.Exit(1)
-	}
-	return p.Dir
-}
-
-var parseFlags = func() {
-	flag.Parse()
-}
-
-var addHandlers = func() {
-	toolsDir := toolsDir()
-
-	// Directly serve typescript code in client directory for development.
-	http.Handle("/client/", http.StripPrefix("/client",
-		http.FileServer(http.Dir(filepath.Join(toolsDir, "cmd/heapview/client")))))
-
-	// Serve typescript.js and moduleloader.js for development.
-	http.HandleFunc("/js/typescript.js", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, filepath.Join(toolsDir, "third_party/typescript/typescript.js"))
-	})
-	http.HandleFunc("/js/moduleloader.js", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, filepath.Join(toolsDir, "third_party/moduleloader/moduleloader.js"))
-	})
-	http.HandleFunc("/js/customelements.js", func(w http.ResponseWriter, r *http.Request) {
-		http.ServeFile(w, r, filepath.Join(toolsDir, "third_party/webcomponents/customelements.js"))
-	})
-
-	// Serve index.html using html string above.
-	http.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-Type", "text/html")
-		io.WriteString(w, index)
-	})
-}
-
-var listenAndServe = func() error {
-	return http.ListenAndServe(fmt.Sprintf("%s:%d", *host, *port), nil)
-}
-
-func main() {
-	parseFlags()
-	addHandlers()
-	log.Fatal(listenAndServe())
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/html2article/conv.go b/installer/vendor/golang.org/x/tools/cmd/html2article/conv.go
deleted file mode 100644
index 4ef4f6cc2d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/html2article/conv.go
+++ /dev/null
@@ -1,331 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This program takes an HTML file and outputs a corresponding article file in
-// present format. See: golang.org/x/tools/present
-package main // import "golang.org/x/tools/cmd/html2article"
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"log"
-	"net/url"
-	"os"
-	"regexp"
-	"strings"
-
-	"golang.org/x/net/html"
-	"golang.org/x/net/html/atom"
-)
-
-func main() {
-	flag.Parse()
-
-	err := convert(os.Stdout, os.Stdin)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-func convert(w io.Writer, r io.Reader) error {
-	root, err := html.Parse(r)
-	if err != nil {
-		return err
-	}
-
-	style := find(root, isTag(atom.Style))
-	if err := parseStyles(style); err != nil {
-		log.Printf("couldn't parse all styles: %v", err)
-	}
-
-	body := find(root, isTag(atom.Body))
-	if body == nil {
-		return errors.New("couldn't find body")
-	}
-	article := limitNewlineRuns(makeHeadings(strings.TrimSpace(text(body))))
-	_, err = fmt.Fprintf(w, "Title\n\n%s", article)
-	return err
-}
-
-type Style string
-
-const (
-	Bold   Style = "*"
-	Italic Style = "_"
-	Code   Style = "`"
-)
-
-var cssRules = make(map[string]Style)
-
-func parseStyles(style *html.Node) error {
-	if style == nil || style.FirstChild == nil {
-		return errors.New("couldn't find styles")
-	}
-
-	styles := style.FirstChild.Data
-	readUntil := func(end rune) (string, bool) {
-		i := strings.IndexRune(styles, end)
-		if i < 0 {
-			return "", false
-		}
-		s := styles[:i]
-		styles = styles[i:]
-		return s, true
-	}
-
-	for {
-		sel, ok := readUntil('{')
-		if !ok && sel == "" {
-			break
-		} else if !ok {
-			return fmt.Errorf("could not parse selector %q", styles)
-		}
-
-		value, ok := readUntil('}')
-		if !ok {
-			return fmt.Errorf("couldn't parse style body for %s", sel)
-		}
-		switch {
-		case strings.Contains(value, "italic"):
-			cssRules[sel] = Italic
-		case strings.Contains(value, "bold"):
-			cssRules[sel] = Bold
-		case strings.Contains(value, "Consolas") || strings.Contains(value, "Courier New"):
-			cssRules[sel] = Code
-		}
-	}
-	return nil
-}
-
-var newlineRun = regexp.MustCompile(`\n\n+`)
-
-func limitNewlineRuns(s string) string {
-	return newlineRun.ReplaceAllString(s, "\n\n")
-}
-
-func makeHeadings(body string) string {
-	buf := new(bytes.Buffer)
-	lines := strings.Split(body, "\n")
-	for i, s := range lines {
-		if i == 0 && !isBoldTitle(s) {
-			buf.WriteString("* Introduction\n\n")
-		}
-		if isBoldTitle(s) {
-			s = strings.TrimSpace(strings.Replace(s, "*", " ", -1))
-			s = "* " + s
-		}
-		buf.WriteString(s)
-		buf.WriteByte('\n')
-	}
-	return buf.String()
-}
-
-func isBoldTitle(s string) bool {
-	return !strings.Contains(s, " ") &&
-		strings.HasPrefix(s, "*") &&
-		strings.HasSuffix(s, "*")
-}
-
-func indent(buf *bytes.Buffer, s string) {
-	for _, l := range strings.Split(s, "\n") {
-		if l != "" {
-			buf.WriteByte('\t')
-			buf.WriteString(l)
-		}
-		buf.WriteByte('\n')
-	}
-}
-
-func unwrap(buf *bytes.Buffer, s string) {
-	var cont bool
-	for _, l := range strings.Split(s, "\n") {
-		l = strings.TrimSpace(l)
-		if len(l) == 0 {
-			if cont {
-				buf.WriteByte('\n')
-				buf.WriteByte('\n')
-			}
-			cont = false
-		} else {
-			if cont {
-				buf.WriteByte(' ')
-			}
-			buf.WriteString(l)
-			cont = true
-		}
-	}
-}
-
-func text(n *html.Node) string {
-	var buf bytes.Buffer
-	walk(n, func(n *html.Node) bool {
-		switch n.Type {
-		case html.TextNode:
-			buf.WriteString(n.Data)
-			return false
-		case html.ElementNode:
-			// no-op
-		default:
-			return true
-		}
-		a := n.DataAtom
-		if a == atom.Span {
-			switch {
-			case hasStyle(Code)(n):
-				a = atom.Code
-			case hasStyle(Bold)(n):
-				a = atom.B
-			case hasStyle(Italic)(n):
-				a = atom.I
-			}
-		}
-		switch a {
-		case atom.Br:
-			buf.WriteByte('\n')
-		case atom.P:
-			unwrap(&buf, childText(n))
-			buf.WriteString("\n\n")
-		case atom.Li:
-			buf.WriteString("- ")
-			unwrap(&buf, childText(n))
-			buf.WriteByte('\n')
-		case atom.Pre:
-			indent(&buf, childText(n))
-			buf.WriteByte('\n')
-		case atom.A:
-			href, text := attr(n, "href"), childText(n)
-			// Skip links with no text.
-			if strings.TrimSpace(text) == "" {
-				break
-			}
-			// Don't emit empty links.
-			if strings.TrimSpace(href) == "" {
-				buf.WriteString(text)
-				break
-			}
-			// Use original url for Google Docs redirections.
-			if u, err := url.Parse(href); err != nil {
-				log.Printf("parsing url %q: %v", href, err)
-			} else if u.Host == "www.google.com" && u.Path == "/url" {
-				href = u.Query().Get("q")
-			}
-			fmt.Fprintf(&buf, "[[%s][%s]]", href, text)
-		case atom.Code:
-			buf.WriteString(highlight(n, "`"))
-		case atom.B:
-			buf.WriteString(highlight(n, "*"))
-		case atom.I:
-			buf.WriteString(highlight(n, "_"))
-		case atom.Img:
-			src := attr(n, "src")
-			fmt.Fprintf(&buf, ".image %s\n", src)
-		case atom.Iframe:
-			src, w, h := attr(n, "src"), attr(n, "width"), attr(n, "height")
-			fmt.Fprintf(&buf, "\n.iframe %s %s %s\n", src, h, w)
-		case atom.Param:
-			if attr(n, "name") == "movie" {
-				// Old style YouTube embed.
-				u := attr(n, "value")
-				u = strings.Replace(u, "/v/", "/embed/", 1)
-				if i := strings.Index(u, "&"); i >= 0 {
-					u = u[:i]
-				}
-				fmt.Fprintf(&buf, "\n.iframe %s 540 304\n", u)
-			}
-		case atom.Title:
-		default:
-			return true
-		}
-		return false
-	})
-	return buf.String()
-}
-
-func childText(node *html.Node) string {
-	var buf bytes.Buffer
-	for n := node.FirstChild; n != nil; n = n.NextSibling {
-		fmt.Fprint(&buf, text(n))
-	}
-	return buf.String()
-}
-
-func highlight(node *html.Node, char string) string {
-	t := strings.Replace(childText(node), " ", char, -1)
-	return fmt.Sprintf("%s%s%s", char, t, char)
-}
-
-type selector func(*html.Node) bool
-
-func isTag(a atom.Atom) selector {
-	return func(n *html.Node) bool {
-		return n.DataAtom == a
-	}
-}
-
-func hasClass(name string) selector {
-	return func(n *html.Node) bool {
-		for _, a := range n.Attr {
-			if a.Key == "class" {
-				for _, c := range strings.Fields(a.Val) {
-					if c == name {
-						return true
-					}
-				}
-			}
-		}
-		return false
-	}
-}
-
-func hasStyle(s Style) selector {
-	return func(n *html.Node) bool {
-		for rule, s2 := range cssRules {
-			if s2 != s {
-				continue
-			}
-			if strings.HasPrefix(rule, ".") && hasClass(rule[1:])(n) {
-				return true
-			}
-			if n.DataAtom.String() == rule {
-				return true
-			}
-		}
-		return false
-	}
-}
-
-func attr(node *html.Node, key string) (value string) {
-	for _, attr := range node.Attr {
-		if attr.Key == key {
-			return attr.Val
-		}
-	}
-	return ""
-}
-
-func find(n *html.Node, fn selector) *html.Node {
-	var result *html.Node
-	walk(n, func(n *html.Node) bool {
-		if result != nil {
-			return false
-		}
-		if fn(n) {
-			result = n
-			return false
-		}
-		return true
-	})
-	return result
-}
-
-func walk(n *html.Node, fn selector) {
-	if fn(n) {
-		for c := n.FirstChild; c != nil; c = c.NextSibling {
-			walk(c, fn)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/appengine.go b/installer/vendor/golang.org/x/tools/cmd/present/appengine.go
deleted file mode 100644
index 1e39ce1dd9..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/appengine.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package main
-
-import (
-	"mime"
-
-	"golang.org/x/tools/present"
-)
-
-func init() {
-	initTemplates("./present/")
-	present.PlayEnabled = true
-	initPlayground("./present/", nil)
-
-	// App Engine has no /etc/mime.types
-	mime.AddExtensionType(".svg", "image/svg+xml")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/dir.go b/installer/vendor/golang.org/x/tools/cmd/present/dir.go
deleted file mode 100644
index 0276351370..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/dir.go
+++ /dev/null
@@ -1,214 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"html/template"
-	"io"
-	"log"
-	"net"
-	"net/http"
-	"os"
-	"path/filepath"
-	"sort"
-
-	"golang.org/x/tools/present"
-)
-
-func init() {
-	http.HandleFunc("/", dirHandler)
-}
-
-// dirHandler serves a directory listing for the requested path, rooted at basePath.
-func dirHandler(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == "/favicon.ico" {
-		http.Error(w, "not found", 404)
-		return
-	}
-	const base = "."
-	name := filepath.Join(base, r.URL.Path)
-	if isDoc(name) {
-		err := renderDoc(w, name)
-		if err != nil {
-			log.Println(err)
-			http.Error(w, err.Error(), 500)
-		}
-		return
-	}
-	if isDir, err := dirList(w, name); err != nil {
-		addr, _, e := net.SplitHostPort(r.RemoteAddr)
-		if e != nil {
-			addr = r.RemoteAddr
-		}
-		log.Printf("request from %s: %s", addr, err)
-		http.Error(w, err.Error(), 500)
-		return
-	} else if isDir {
-		return
-	}
-	http.FileServer(http.Dir(base)).ServeHTTP(w, r)
-}
-
-func isDoc(path string) bool {
-	_, ok := contentTemplate[filepath.Ext(path)]
-	return ok
-}
-
-var (
-	// dirListTemplate holds the front page template.
-	dirListTemplate *template.Template
-
-	// contentTemplate maps the presentable file extensions to the
-	// template to be executed.
-	contentTemplate map[string]*template.Template
-)
-
-func initTemplates(base string) error {
-	// Locate the template file.
-	actionTmpl := filepath.Join(base, "templates/action.tmpl")
-
-	contentTemplate = make(map[string]*template.Template)
-
-	for ext, contentTmpl := range map[string]string{
-		".slide":   "slides.tmpl",
-		".article": "article.tmpl",
-	} {
-		contentTmpl = filepath.Join(base, "templates", contentTmpl)
-
-		// Read and parse the input.
-		tmpl := present.Template()
-		tmpl = tmpl.Funcs(template.FuncMap{"playable": playable})
-		if _, err := tmpl.ParseFiles(actionTmpl, contentTmpl); err != nil {
-			return err
-		}
-		contentTemplate[ext] = tmpl
-	}
-
-	var err error
-	dirListTemplate, err = template.ParseFiles(filepath.Join(base, "templates/dir.tmpl"))
-	return err
-}
-
-// renderDoc reads the present file, gets its template representation,
-// and executes the template, sending output to w.
-func renderDoc(w io.Writer, docFile string) error {
-	// Read the input and build the doc structure.
-	doc, err := parse(docFile, 0)
-	if err != nil {
-		return err
-	}
-
-	// Find which template should be executed.
-	tmpl := contentTemplate[filepath.Ext(docFile)]
-
-	// Execute the template.
-	return doc.Render(w, tmpl)
-}
-
-func parse(name string, mode present.ParseMode) (*present.Doc, error) {
-	f, err := os.Open(name)
-	if err != nil {
-		return nil, err
-	}
-	defer f.Close()
-	return present.Parse(f, name, 0)
-}
-
-// dirList scans the given path and writes a directory listing to w.
-// It parses the first part of each .slide file it encounters to display the
-// presentation title in the listing.
-// If the given path is not a directory, it returns (isDir == false, err == nil)
-// and writes nothing to w.
-func dirList(w io.Writer, name string) (isDir bool, err error) {
-	f, err := os.Open(name)
-	if err != nil {
-		return false, err
-	}
-	defer f.Close()
-	fi, err := f.Stat()
-	if err != nil {
-		return false, err
-	}
-	if isDir = fi.IsDir(); !isDir {
-		return false, nil
-	}
-	fis, err := f.Readdir(0)
-	if err != nil {
-		return false, err
-	}
-	d := &dirListData{Path: name}
-	for _, fi := range fis {
-		// skip the golang.org directory
-		if name == "." && fi.Name() == "golang.org" {
-			continue
-		}
-		e := dirEntry{
-			Name: fi.Name(),
-			Path: filepath.ToSlash(filepath.Join(name, fi.Name())),
-		}
-		if fi.IsDir() && showDir(e.Name) {
-			d.Dirs = append(d.Dirs, e)
-			continue
-		}
-		if isDoc(e.Name) {
-			if p, err := parse(e.Path, present.TitlesOnly); err != nil {
-				log.Println(err)
-			} else {
-				e.Title = p.Title
-			}
-			switch filepath.Ext(e.Path) {
-			case ".article":
-				d.Articles = append(d.Articles, e)
-			case ".slide":
-				d.Slides = append(d.Slides, e)
-			}
-		} else if showFile(e.Name) {
-			d.Other = append(d.Other, e)
-		}
-	}
-	if d.Path == "." {
-		d.Path = ""
-	}
-	sort.Sort(d.Dirs)
-	sort.Sort(d.Slides)
-	sort.Sort(d.Articles)
-	sort.Sort(d.Other)
-	return true, dirListTemplate.Execute(w, d)
-}
-
-// showFile reports whether the given file should be displayed in the list.
-func showFile(n string) bool {
-	switch filepath.Ext(n) {
-	case ".pdf":
-	case ".html":
-	case ".go":
-	default:
-		return isDoc(n)
-	}
-	return true
-}
-
-// showDir reports whether the given directory should be displayed in the list.
-func showDir(n string) bool {
-	if len(n) > 0 && (n[0] == '.' || n[0] == '_') || n == "present" {
-		return false
-	}
-	return true
-}
-
-type dirListData struct {
-	Path                          string
-	Dirs, Slides, Articles, Other dirEntrySlice
-}
-
-type dirEntry struct {
-	Name, Path, Title string
-}
-
-type dirEntrySlice []dirEntry
-
-func (s dirEntrySlice) Len() int           { return len(s) }
-func (s dirEntrySlice) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s dirEntrySlice) Less(i, j int) bool { return s[i].Name < s[j].Name }
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/doc.go b/installer/vendor/golang.org/x/tools/cmd/present/doc.go
deleted file mode 100644
index fafe4c191d..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/doc.go
+++ /dev/null
@@ -1,57 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-Present displays slide presentations and articles. It runs a web server that
-presents slide and article files from the current directory.
-
-It may be run as a stand-alone command or an App Engine app.
-
-Usage of present:
-  -base="": base path for slide template and static resources
-  -http="127.0.0.1:3999": HTTP service address (e.g., '127.0.0.1:3999')
-  -nacl=false: use Native Client environment playground (prevents non-Go code execution)
-  -notes=false: enable presenter notes (press 'N' from the browser to display them)
-  -orighost="": host component of web origin URL (e.g., 'localhost')
-  -play=true: enable playground (permit execution of arbitrary user code)
-
-The setup of the Go version of NaCl is documented at:
-https://golang.org/wiki/NativeClient
-
-To use with App Engine, copy the tools/cmd/present directory to the root of
-your application and create an app.yaml file similar to this:
-
-    application: [application]
-    version: [version]
-    runtime: go
-    api_version: go1
-
-    handlers:
-    - url: /favicon.ico
-      static_files: present/static/favicon.ico
-      upload: present/static/favicon.ico
-    - url: /static
-      static_dir: present/static
-      application_readable: true
-    - url: /.*
-      script: _go_app
-
-    # nobuild_files is a regexp that identifies which files to not build.  It
-    # is useful for embedding static assets like code snippets and preventing
-    # them from producing build errors for your project.
-    nobuild_files: [path regexp for talk materials]
-
-Present then can be tested in a local App Engine environment with
-
-    goapp serve
-
-Input files are named foo.extension, where "extension" defines the format of
-the generated output. The supported formats are:
-	.slide        // HTML5 slide presentation
-	.article      // article format, such as a blog post
-
-The present file format is documented by the present package:
-http://godoc.org/golang.org/x/tools/present
-*/
-package main // import "golang.org/x/tools/cmd/present"
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/local.go b/installer/vendor/golang.org/x/tools/cmd/present/local.go
deleted file mode 100644
index 260cacbbf6..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/local.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package main
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"strings"
-
-	"golang.org/x/tools/present"
-)
-
-const basePkg = "golang.org/x/tools/cmd/present"
-
-var (
-	httpAddr     = flag.String("http", "127.0.0.1:3999", "HTTP service address (e.g., '127.0.0.1:3999')")
-	originHost   = flag.String("orighost", "", "host component of web origin URL (e.g., 'localhost')")
-	basePath     = flag.String("base", "", "base path for slide template and static resources")
-	nativeClient = flag.Bool("nacl", false, "use Native Client environment playground (prevents non-Go code execution)")
-)
-
-func main() {
-	flag.BoolVar(&present.PlayEnabled, "play", true, "enable playground (permit execution of arbitrary user code)")
-	flag.BoolVar(&present.NotesEnabled, "notes", false, "enable presenter notes (press 'N' from the browser to display them)")
-	flag.Parse()
-
-	if *basePath == "" {
-		p, err := build.Default.Import(basePkg, "", build.FindOnly)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "Couldn't find gopresent files: %v\n", err)
-			fmt.Fprintf(os.Stderr, basePathMessage, basePkg)
-			os.Exit(1)
-		}
-		*basePath = p.Dir
-	}
-	err := initTemplates(*basePath)
-	if err != nil {
-		log.Fatalf("Failed to parse templates: %v", err)
-	}
-
-	ln, err := net.Listen("tcp", *httpAddr)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer ln.Close()
-
-	_, port, err := net.SplitHostPort(ln.Addr().String())
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	origin := &url.URL{Scheme: "http"}
-	if *originHost != "" {
-		origin.Host = net.JoinHostPort(*originHost, port)
-	} else if ln.Addr().(*net.TCPAddr).IP.IsUnspecified() {
-		name, _ := os.Hostname()
-		origin.Host = net.JoinHostPort(name, port)
-	} else {
-		reqHost, reqPort, err := net.SplitHostPort(*httpAddr)
-		if err != nil {
-			log.Fatal(err)
-		}
-		if reqPort == "0" {
-			origin.Host = net.JoinHostPort(reqHost, port)
-		} else {
-			origin.Host = *httpAddr
-		}
-	}
-
-	initPlayground(*basePath, origin)
-	http.Handle("/static/", http.FileServer(http.Dir(*basePath)))
-
-	if !ln.Addr().(*net.TCPAddr).IP.IsLoopback() &&
-		present.PlayEnabled && !*nativeClient {
-		log.Print(localhostWarning)
-	}
-
-	log.Printf("Open your web browser and visit %s", origin.String())
-	if present.NotesEnabled {
-		log.Println("Notes are enabled, press 'N' from the browser to display them.")
-	}
-	log.Fatal(http.Serve(ln, nil))
-}
-
-func environ(vars ...string) []string {
-	env := os.Environ()
-	for _, r := range vars {
-		k := strings.SplitAfter(r, "=")[0]
-		var found bool
-		for i, v := range env {
-			if strings.HasPrefix(v, k) {
-				env[i] = r
-				found = true
-			}
-		}
-		if !found {
-			env = append(env, r)
-		}
-	}
-	return env
-}
-
-const basePathMessage = `
-By default, gopresent locates the slide template files and associated
-static content by looking for a %q package
-in your Go workspaces (GOPATH).
-
-You may use the -base flag to specify an alternate location.
-`
-
-const localhostWarning = `
-WARNING!  WARNING!  WARNING!
-
-The present server appears to be listening on an address that is not localhost.
-Anyone with access to this address and port will have access to this machine as
-the user running present.
-
-To avoid this message, listen on localhost or run with -play=false.
-
-If you don't understand this message, hit Control-C to terminate this process.
-
-WARNING!  WARNING!  WARNING!
-`
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/play.go b/installer/vendor/golang.org/x/tools/cmd/present/play.go
deleted file mode 100644
index 831b99f447..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/play.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"path/filepath"
-	"time"
-
-	"golang.org/x/tools/godoc/static"
-)
-
-var scripts = []string{"jquery.js", "jquery-ui.js", "playground.js", "play.js"}
-
-// playScript registers an HTTP handler at /play.js that serves all the
-// scripts specified by the variable above, and appends a line that
-// initializes the playground with the specified transport.
-func playScript(root, transport string) {
-	modTime := time.Now()
-	var buf bytes.Buffer
-	for _, p := range scripts {
-		if s, ok := static.Files[p]; ok {
-			buf.WriteString(s)
-			continue
-		}
-		b, err := ioutil.ReadFile(filepath.Join(root, "static", p))
-		if err != nil {
-			panic(err)
-		}
-		buf.Write(b)
-	}
-	fmt.Fprintf(&buf, "\ninitPlayground(new %v());\n", transport)
-	b := buf.Bytes()
-	http.HandleFunc("/play.js", func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Content-type", "application/javascript")
-		http.ServeContent(w, r, "", modTime, bytes.NewReader(b))
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/play_http.go b/installer/vendor/golang.org/x/tools/cmd/present/play_http.go
deleted file mode 100644
index 02e7314d4c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/play_http.go
+++ /dev/null
@@ -1,23 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine appenginevm
-
-package main
-
-import (
-	"net/url"
-
-	"golang.org/x/tools/present"
-
-	_ "golang.org/x/tools/playground"
-)
-
-func initPlayground(basepath string, origin *url.URL) {
-	playScript(basepath, "HTTPTransport")
-}
-
-func playable(c present.Code) bool {
-	return present.PlayEnabled && c.Play && c.Ext == ".go"
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/play_socket.go b/installer/vendor/golang.org/x/tools/cmd/present/play_socket.go
deleted file mode 100644
index df63edabd5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/play_socket.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine,!appenginevm
-
-package main
-
-import (
-	"net/http"
-	"net/url"
-	"runtime"
-
-	"golang.org/x/tools/playground/socket"
-	"golang.org/x/tools/present"
-)
-
-func initPlayground(basepath string, origin *url.URL) {
-	if present.PlayEnabled {
-		if *nativeClient {
-			socket.RunScripts = false
-			socket.Environ = func() []string {
-				if runtime.GOARCH == "amd64" {
-					return environ("GOOS=nacl", "GOARCH=amd64p32")
-				}
-				return environ("GOOS=nacl")
-			}
-		}
-		playScript(basepath, "SocketTransport")
-		http.Handle("/socket", socket.NewHandler(origin))
-	}
-}
-
-func playable(c present.Code) bool {
-	return present.PlayEnabled && c.Play
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/article.css b/installer/vendor/golang.org/x/tools/cmd/present/static/article.css
deleted file mode 100644
index 7b304556f8..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/article.css
+++ /dev/null
@@ -1,161 +0,0 @@
-body {
-	margin: 0;
-	font-family: Helvetica, Arial, sans-serif;
-	font-size: 16px;
-}
-pre,
-code {
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-pre {
-	line-height: 18px;
-	margin: 0;
-	padding: 0;
-}
-a {
-	color: #375EAB;
-	text-decoration: none;
-}
-a:hover {
-	text-decoration: underline;
-}
-p, ul, ol {
-	margin: 20px;
-}
-
-h1, h2, h3, h4 {
-	margin: 20px 0;
-	padding: 0;
-	color: #375EAB;
-	font-weight: bold;
-}
-h1 {
-	font-size: 18px;
-	padding: 2px 5px;
-}
-h2 {
-	font-size: 16px;
-}
-h3 {
-	font-size: 16px;
-}
-h3, h4 {
-	margin: 20px 5px;
-}
-h4 {
-	font-size: 16px;
-}
-
-div#heading {
-	margin: 0 0 10px 0;
-	padding: 21px 0;
-	font-size: 20px;
-	font-weight: bold;
-}
-
-div#heading .author {
-	padding-top: 10px;
-	font-size: 14px;
-	font-weight: normal;
-}
-
-div#topbar {
-}
-
-body {
-	text-align: center;
-}
-div#page {
-	width: 100%;
-}
-div#page > .container,
-div#topbar > .container {
-	text-align: left;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 0 20px;
-	width: 900px;
-}
-div#page.wide > .container,
-div#topbar.wide > .container {
-	width: auto;
-}
-
-div#footer {
-	text-align: center;
-	color: #666;
-	font-size: 14px;
-	margin: 40px 0;
-}
-
-.author p {
-	margin: 0;
-	padding: 0 20px;
-}
-
-div.code,
-div.output {
-	margin: 20px 20px 20px 40px;
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-div.output {
-	padding: 10px;
-}
-
-div.code { background: white; }
-div.output { background: black; }
-div.output .stdout { color: #e6e6e6; }
-div.output .stderr { color: rgb(244, 74, 63); }
-div.output .system { color: rgb(255, 209, 77) }
-
-.buttons {
-	margin-left: 20px;
-}
-div.output .buttons {
-	margin-left: 0;
-	margin-bottom: 10px;
-}
-
-#toc {
-	float: right;
-	margin: 0px 10px;
-	padding: 10px;
-	border: 1px solid #e5ecf9; 
-	background-color: #eee;
-	box-shadow: 3px 3px 2px #888888;
-
-	max-width: 33%;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-#tochead {
-	font-weight: bold;
-	font-variant: small-caps;
-	font-size: 100%;
-	text-align: center;
-	padding-bottom: 5px;
-}
-
-#toc ul, #toc a {
-	list-style-type: none;
-	padding-left: 0px;
-	color: black;
-	margin: 0px;
-}
-
-ul.toc-inner a {
-	padding-left: 10px !important;
-}
-
-@media print {
-	.no-print, .no-print * {
-		display: none !important;
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/dir.css b/installer/vendor/golang.org/x/tools/cmd/present/static/dir.css
deleted file mode 100644
index 97587e62fa..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/dir.css
+++ /dev/null
@@ -1,186 +0,0 @@
-/* copied from $GOROOT/doc/style.css */
-
-body {
-	margin: 0;
-	font-family: Helvetica, Arial, sans-serif;
-	font-size: 16px;
-}
-pre,
-code {
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-pre {
-	line-height: 18px;
-}
-pre .comment {
-	color: #375EAB;
-}
-pre .highlight,
-pre .highlight-comment,
-pre .selection-highlight,
-pre .selection-highlight-comment {
-	background: #FFFF00;
-}
-pre .selection,
-pre .selection-comment {
-	background: #FF9632;
-}
-pre .ln {
-	color: #999;
-}
-body {
-	color: #222;
-}
-a,
-.exampleHeading .text {
-	color: #375EAB;
-	text-decoration: none;
-}
-a:hover,
-.exampleHeading .text:hover {
-	text-decoration: underline;
-}
-p,
-pre,
-ul,
-ol {
-	margin: 20px;
-}
-pre {
-	background: #e9e9e9;
-	padding: 10px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-h1,
-h2,
-h3,
-h4,
-.rootHeading {
-	margin: 20px 0;
-	padding: 0;
-	color: #375EAB;
-	font-weight: bold;
-}
-h1 {
-	font-size: 24px;
-}
-h2 {
-	font-size: 20px;
-	background: #E0EBF5;
-	padding: 2px 5px;
-}
-h3 {
-	font-size: 20px;
-}
-h3,
-h4 {
-	margin: 20px 5px;
-}
-h4 {
-	font-size: 16px;
-}
-
-dl {
-	margin: 20px;
-}
-dd {
-	margin: 2px 20px;
-}
-dl,
-dd {
-	font-size: 14px;
-}
-div#nav table td {
-	vertical-align: top;
-}
-
-div#heading {
-	float: left;
-	margin: 0 0 10px 0;
-	padding: 21px 0;
-	font-size: 20px;
-	font-weight: normal;
-}
-div#heading a {
-	color: #222;
-	text-decoration: none;
-}
-
-div#topbar {
-	background: #E0EBF5;
-	height: 64px;
-}
-
-body {
-	text-align: center;
-}
-div#page,
-div#topbar > .container {
-	clear: both;
-	text-align: left;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 0 20px;
-	width: 900px;
-}
-div#page.wide,
-div#topbar > .wide {
-	width: auto;
-}
-div#plusone {
-	float: right;
-}
-
-div#footer {
-	color: #666;
-	font-size: 14px;
-	margin: 40px 0;
-}
-
-div#menu > a,
-div#menu > input {
-	padding: 10px;
-
-	text-decoration: none;
-	font-size: 16px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-div#menu > a,
-div#menu > input {
-	border: 1px solid #375EAB;
-}
-div#menu > a {
-	color: white;
-	background: #375EAB;
-}
-
-div#menu {
-	float: right;
-	min-width: 590px;
-	padding: 10px 0;
-	text-align: right;
-}
-div#menu > a {
-	margin-right: 5px;
-	margin-bottom: 10px;
-
-	padding: 10px;
-}
-div#menu > input {
-	position: relative;
-	top: 1px;
-	width: 60px;
-	background: white;
-	color: #222;
-}
-div#menu > input.inactive {
-	color: #999;
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/dir.js b/installer/vendor/golang.org/x/tools/cmd/present/static/dir.js
deleted file mode 100644
index 5b0c37e516..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/dir.js
+++ /dev/null
@@ -1,41 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// copied from $GOROOT/doc/godocs.js
-
-function bindEvent(el, e, fn) {
-  if (el.addEventListener){
-    el.addEventListener(e, fn, false);
-  } else if (el.attachEvent){
-    el.attachEvent('on'+e, fn);
-  }
-}
-
-function godocs_bindSearchEvents() {
-  var search = document.getElementById('search');
-  if (!search) {
-    // no search box (index disabled)
-    return;
-  }
-  function clearInactive() {
-    if (search.className == "inactive") {
-      search.value = "";
-      search.className = "";
-    }
-  }
-  function restoreInactive() {
-    if (search.value !== "") {
-      return;
-    }
-    if (search.type != "search") {
-      search.value = search.getAttribute("placeholder");
-    }
-    search.className = "inactive";
-  }
-  restoreInactive();
-  bindEvent(search, 'focus', clearInactive);
-  bindEvent(search, 'blur', restoreInactive);
-}
-
-bindEvent(window, 'load', godocs_bindSearchEvents);
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/favicon.ico b/installer/vendor/golang.org/x/tools/cmd/present/static/favicon.ico
deleted file mode 100644
index 48854ff3b7..0000000000
Binary files a/installer/vendor/golang.org/x/tools/cmd/present/static/favicon.ico and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/jquery-ui.js b/installer/vendor/golang.org/x/tools/cmd/present/static/jquery-ui.js
deleted file mode 100644
index f39193859c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/jquery-ui.js
+++ /dev/null
@@ -1,6 +0,0 @@
-/*! jQuery UI - v1.10.2 - 2013-03-20
-* http://jqueryui.com
-* Includes: jquery.ui.core.js, jquery.ui.widget.js, jquery.ui.mouse.js, jquery.ui.resizable.js
-* Copyright 2013 jQuery Foundation and other contributors Licensed MIT */
-
-(function(e,t){function i(t,i){var a,n,r,o=t.nodeName.toLowerCase();return"area"===o?(a=t.parentNode,n=a.name,t.href&&n&&"map"===a.nodeName.toLowerCase()?(r=e("img[usemap=#"+n+"]")[0],!!r&&s(r)):!1):(/input|select|textarea|button|object/.test(o)?!t.disabled:"a"===o?t.href||i:i)&&s(t)}function s(t){return e.expr.filters.visible(t)&&!e(t).parents().addBack().filter(function(){return"hidden"===e.css(this,"visibility")}).length}var a=0,n=/^ui-id-\d+$/;e.ui=e.ui||{},e.extend(e.ui,{version:"1.10.2",keyCode:{BACKSPACE:8,COMMA:188,DELETE:46,DOWN:40,END:35,ENTER:13,ESCAPE:27,HOME:36,LEFT:37,NUMPAD_ADD:107,NUMPAD_DECIMAL:110,NUMPAD_DIVIDE:111,NUMPAD_ENTER:108,NUMPAD_MULTIPLY:106,NUMPAD_SUBTRACT:109,PAGE_DOWN:34,PAGE_UP:33,PERIOD:190,RIGHT:39,SPACE:32,TAB:9,UP:38}}),e.fn.extend({focus:function(t){return function(i,s){return"number"==typeof i?this.each(function(){var t=this;setTimeout(function(){e(t).focus(),s&&s.call(t)},i)}):t.apply(this,arguments)}}(e.fn.focus),scrollParent:function(){var t;return t=e.ui.ie&&/(static|relative)/.test(this.css("position"))||/absolute/.test(this.css("position"))?this.parents().filter(function(){return/(relative|absolute|fixed)/.test(e.css(this,"position"))&&/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0):this.parents().filter(function(){return/(auto|scroll)/.test(e.css(this,"overflow")+e.css(this,"overflow-y")+e.css(this,"overflow-x"))}).eq(0),/fixed/.test(this.css("position"))||!t.length?e(document):t},zIndex:function(i){if(i!==t)return this.css("zIndex",i);if(this.length)for(var s,a,n=e(this[0]);n.length&&n[0]!==document;){if(s=n.css("position"),("absolute"===s||"relative"===s||"fixed"===s)&&(a=parseInt(n.css("zIndex"),10),!isNaN(a)&&0!==a))return a;n=n.parent()}return 0},uniqueId:function(){return this.each(function(){this.id||(this.id="ui-id-"+ ++a)})},removeUniqueId:function(){return this.each(function(){n.test(this.id)&&e(this).removeAttr("id")})}}),e.extend(e.expr[":"],{data:e.expr.createPseudo?e.expr.createPseudo(function(t){return function(i){return!!e.data(i,t)}}):function(t,i,s){return!!e.data(t,s[3])},focusable:function(t){return i(t,!isNaN(e.attr(t,"tabindex")))},tabbable:function(t){var s=e.attr(t,"tabindex"),a=isNaN(s);return(a||s>=0)&&i(t,!a)}}),e("<a>").outerWidth(1).jquery||e.each(["Width","Height"],function(i,s){function a(t,i,s,a){return e.each(n,function(){i-=parseFloat(e.css(t,"padding"+this))||0,s&&(i-=parseFloat(e.css(t,"border"+this+"Width"))||0),a&&(i-=parseFloat(e.css(t,"margin"+this))||0)}),i}var n="Width"===s?["Left","Right"]:["Top","Bottom"],r=s.toLowerCase(),o={innerWidth:e.fn.innerWidth,innerHeight:e.fn.innerHeight,outerWidth:e.fn.outerWidth,outerHeight:e.fn.outerHeight};e.fn["inner"+s]=function(i){return i===t?o["inner"+s].call(this):this.each(function(){e(this).css(r,a(this,i)+"px")})},e.fn["outer"+s]=function(t,i){return"number"!=typeof t?o["outer"+s].call(this,t):this.each(function(){e(this).css(r,a(this,t,!0,i)+"px")})}}),e.fn.addBack||(e.fn.addBack=function(e){return this.add(null==e?this.prevObject:this.prevObject.filter(e))}),e("<a>").data("a-b","a").removeData("a-b").data("a-b")&&(e.fn.removeData=function(t){return function(i){return arguments.length?t.call(this,e.camelCase(i)):t.call(this)}}(e.fn.removeData)),e.ui.ie=!!/msie [\w.]+/.exec(navigator.userAgent.toLowerCase()),e.support.selectstart="onselectstart"in document.createElement("div"),e.fn.extend({disableSelection:function(){return this.bind((e.support.selectstart?"selectstart":"mousedown")+".ui-disableSelection",function(e){e.preventDefault()})},enableSelection:function(){return this.unbind(".ui-disableSelection")}}),e.extend(e.ui,{plugin:{add:function(t,i,s){var a,n=e.ui[t].prototype;for(a in s)n.plugins[a]=n.plugins[a]||[],n.plugins[a].push([i,s[a]])},call:function(e,t,i){var s,a=e.plugins[t];if(a&&e.element[0].parentNode&&11!==e.element[0].parentNode.nodeType)for(s=0;a.length>s;s++)e.options[a[s][0]]&&a[s][1].apply(e.element,i)}},hasScroll:function(t,i){if("hidden"===e(t).css("overflow"))return!1;var s=i&&"left"===i?"scrollLeft":"scrollTop",a=!1;return t[s]>0?!0:(t[s]=1,a=t[s]>0,t[s]=0,a)}})})(jQuery);(function(e,t){var i=0,s=Array.prototype.slice,n=e.cleanData;e.cleanData=function(t){for(var i,s=0;null!=(i=t[s]);s++)try{e(i).triggerHandler("remove")}catch(a){}n(t)},e.widget=function(i,s,n){var a,r,o,h,l={},u=i.split(".")[0];i=i.split(".")[1],a=u+"-"+i,n||(n=s,s=e.Widget),e.expr[":"][a.toLowerCase()]=function(t){return!!e.data(t,a)},e[u]=e[u]||{},r=e[u][i],o=e[u][i]=function(e,i){return this._createWidget?(arguments.length&&this._createWidget(e,i),t):new o(e,i)},e.extend(o,r,{version:n.version,_proto:e.extend({},n),_childConstructors:[]}),h=new s,h.options=e.widget.extend({},h.options),e.each(n,function(i,n){return e.isFunction(n)?(l[i]=function(){var e=function(){return s.prototype[i].apply(this,arguments)},t=function(e){return s.prototype[i].apply(this,e)};return function(){var i,s=this._super,a=this._superApply;return this._super=e,this._superApply=t,i=n.apply(this,arguments),this._super=s,this._superApply=a,i}}(),t):(l[i]=n,t)}),o.prototype=e.widget.extend(h,{widgetEventPrefix:r?h.widgetEventPrefix:i},l,{constructor:o,namespace:u,widgetName:i,widgetFullName:a}),r?(e.each(r._childConstructors,function(t,i){var s=i.prototype;e.widget(s.namespace+"."+s.widgetName,o,i._proto)}),delete r._childConstructors):s._childConstructors.push(o),e.widget.bridge(i,o)},e.widget.extend=function(i){for(var n,a,r=s.call(arguments,1),o=0,h=r.length;h>o;o++)for(n in r[o])a=r[o][n],r[o].hasOwnProperty(n)&&a!==t&&(i[n]=e.isPlainObject(a)?e.isPlainObject(i[n])?e.widget.extend({},i[n],a):e.widget.extend({},a):a);return i},e.widget.bridge=function(i,n){var a=n.prototype.widgetFullName||i;e.fn[i]=function(r){var o="string"==typeof r,h=s.call(arguments,1),l=this;return r=!o&&h.length?e.widget.extend.apply(null,[r].concat(h)):r,o?this.each(function(){var s,n=e.data(this,a);return n?e.isFunction(n[r])&&"_"!==r.charAt(0)?(s=n[r].apply(n,h),s!==n&&s!==t?(l=s&&s.jquery?l.pushStack(s.get()):s,!1):t):e.error("no such method '"+r+"' for "+i+" widget instance"):e.error("cannot call methods on "+i+" prior to initialization; "+"attempted to call method '"+r+"'")}):this.each(function(){var t=e.data(this,a);t?t.option(r||{})._init():e.data(this,a,new n(r,this))}),l}},e.Widget=function(){},e.Widget._childConstructors=[],e.Widget.prototype={widgetName:"widget",widgetEventPrefix:"",defaultElement:"<div>",options:{disabled:!1,create:null},_createWidget:function(t,s){s=e(s||this.defaultElement||this)[0],this.element=e(s),this.uuid=i++,this.eventNamespace="."+this.widgetName+this.uuid,this.options=e.widget.extend({},this.options,this._getCreateOptions(),t),this.bindings=e(),this.hoverable=e(),this.focusable=e(),s!==this&&(e.data(s,this.widgetFullName,this),this._on(!0,this.element,{remove:function(e){e.target===s&&this.destroy()}}),this.document=e(s.style?s.ownerDocument:s.document||s),this.window=e(this.document[0].defaultView||this.document[0].parentWindow)),this._create(),this._trigger("create",null,this._getCreateEventData()),this._init()},_getCreateOptions:e.noop,_getCreateEventData:e.noop,_create:e.noop,_init:e.noop,destroy:function(){this._destroy(),this.element.unbind(this.eventNamespace).removeData(this.widgetName).removeData(this.widgetFullName).removeData(e.camelCase(this.widgetFullName)),this.widget().unbind(this.eventNamespace).removeAttr("aria-disabled").removeClass(this.widgetFullName+"-disabled "+"ui-state-disabled"),this.bindings.unbind(this.eventNamespace),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")},_destroy:e.noop,widget:function(){return this.element},option:function(i,s){var n,a,r,o=i;if(0===arguments.length)return e.widget.extend({},this.options);if("string"==typeof i)if(o={},n=i.split("."),i=n.shift(),n.length){for(a=o[i]=e.widget.extend({},this.options[i]),r=0;n.length-1>r;r++)a[n[r]]=a[n[r]]||{},a=a[n[r]];if(i=n.pop(),s===t)return a[i]===t?null:a[i];a[i]=s}else{if(s===t)return this.options[i]===t?null:this.options[i];o[i]=s}return this._setOptions(o),this},_setOptions:function(e){var t;for(t in e)this._setOption(t,e[t]);return this},_setOption:function(e,t){return this.options[e]=t,"disabled"===e&&(this.widget().toggleClass(this.widgetFullName+"-disabled ui-state-disabled",!!t).attr("aria-disabled",t),this.hoverable.removeClass("ui-state-hover"),this.focusable.removeClass("ui-state-focus")),this},enable:function(){return this._setOption("disabled",!1)},disable:function(){return this._setOption("disabled",!0)},_on:function(i,s,n){var a,r=this;"boolean"!=typeof i&&(n=s,s=i,i=!1),n?(s=a=e(s),this.bindings=this.bindings.add(s)):(n=s,s=this.element,a=this.widget()),e.each(n,function(n,o){function h(){return i||r.options.disabled!==!0&&!e(this).hasClass("ui-state-disabled")?("string"==typeof o?r[o]:o).apply(r,arguments):t}"string"!=typeof o&&(h.guid=o.guid=o.guid||h.guid||e.guid++);var l=n.match(/^(\w+)\s*(.*)$/),u=l[1]+r.eventNamespace,c=l[2];c?a.delegate(c,u,h):s.bind(u,h)})},_off:function(e,t){t=(t||"").split(" ").join(this.eventNamespace+" ")+this.eventNamespace,e.unbind(t).undelegate(t)},_delay:function(e,t){function i(){return("string"==typeof e?s[e]:e).apply(s,arguments)}var s=this;return setTimeout(i,t||0)},_hoverable:function(t){this.hoverable=this.hoverable.add(t),this._on(t,{mouseenter:function(t){e(t.currentTarget).addClass("ui-state-hover")},mouseleave:function(t){e(t.currentTarget).removeClass("ui-state-hover")}})},_focusable:function(t){this.focusable=this.focusable.add(t),this._on(t,{focusin:function(t){e(t.currentTarget).addClass("ui-state-focus")},focusout:function(t){e(t.currentTarget).removeClass("ui-state-focus")}})},_trigger:function(t,i,s){var n,a,r=this.options[t];if(s=s||{},i=e.Event(i),i.type=(t===this.widgetEventPrefix?t:this.widgetEventPrefix+t).toLowerCase(),i.target=this.element[0],a=i.originalEvent)for(n in a)n in i||(i[n]=a[n]);return this.element.trigger(i,s),!(e.isFunction(r)&&r.apply(this.element[0],[i].concat(s))===!1||i.isDefaultPrevented())}},e.each({show:"fadeIn",hide:"fadeOut"},function(t,i){e.Widget.prototype["_"+t]=function(s,n,a){"string"==typeof n&&(n={effect:n});var r,o=n?n===!0||"number"==typeof n?i:n.effect||i:t;n=n||{},"number"==typeof n&&(n={duration:n}),r=!e.isEmptyObject(n),n.complete=a,n.delay&&s.delay(n.delay),r&&e.effects&&e.effects.effect[o]?s[t](n):o!==t&&s[o]?s[o](n.duration,n.easing,a):s.queue(function(i){e(this)[t](),a&&a.call(s[0]),i()})}})})(jQuery);(function(e){var t=!1;e(document).mouseup(function(){t=!1}),e.widget("ui.mouse",{version:"1.10.2",options:{cancel:"input,textarea,button,select,option",distance:1,delay:0},_mouseInit:function(){var t=this;this.element.bind("mousedown."+this.widgetName,function(e){return t._mouseDown(e)}).bind("click."+this.widgetName,function(i){return!0===e.data(i.target,t.widgetName+".preventClickEvent")?(e.removeData(i.target,t.widgetName+".preventClickEvent"),i.stopImmediatePropagation(),!1):undefined}),this.started=!1},_mouseDestroy:function(){this.element.unbind("."+this.widgetName),this._mouseMoveDelegate&&e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate)},_mouseDown:function(i){if(!t){this._mouseStarted&&this._mouseUp(i),this._mouseDownEvent=i;var s=this,n=1===i.which,a="string"==typeof this.options.cancel&&i.target.nodeName?e(i.target).closest(this.options.cancel).length:!1;return n&&!a&&this._mouseCapture(i)?(this.mouseDelayMet=!this.options.delay,this.mouseDelayMet||(this._mouseDelayTimer=setTimeout(function(){s.mouseDelayMet=!0},this.options.delay)),this._mouseDistanceMet(i)&&this._mouseDelayMet(i)&&(this._mouseStarted=this._mouseStart(i)!==!1,!this._mouseStarted)?(i.preventDefault(),!0):(!0===e.data(i.target,this.widgetName+".preventClickEvent")&&e.removeData(i.target,this.widgetName+".preventClickEvent"),this._mouseMoveDelegate=function(e){return s._mouseMove(e)},this._mouseUpDelegate=function(e){return s._mouseUp(e)},e(document).bind("mousemove."+this.widgetName,this._mouseMoveDelegate).bind("mouseup."+this.widgetName,this._mouseUpDelegate),i.preventDefault(),t=!0,!0)):!0}},_mouseMove:function(t){return e.ui.ie&&(!document.documentMode||9>document.documentMode)&&!t.button?this._mouseUp(t):this._mouseStarted?(this._mouseDrag(t),t.preventDefault()):(this._mouseDistanceMet(t)&&this._mouseDelayMet(t)&&(this._mouseStarted=this._mouseStart(this._mouseDownEvent,t)!==!1,this._mouseStarted?this._mouseDrag(t):this._mouseUp(t)),!this._mouseStarted)},_mouseUp:function(t){return e(document).unbind("mousemove."+this.widgetName,this._mouseMoveDelegate).unbind("mouseup."+this.widgetName,this._mouseUpDelegate),this._mouseStarted&&(this._mouseStarted=!1,t.target===this._mouseDownEvent.target&&e.data(t.target,this.widgetName+".preventClickEvent",!0),this._mouseStop(t)),!1},_mouseDistanceMet:function(e){return Math.max(Math.abs(this._mouseDownEvent.pageX-e.pageX),Math.abs(this._mouseDownEvent.pageY-e.pageY))>=this.options.distance},_mouseDelayMet:function(){return this.mouseDelayMet},_mouseStart:function(){},_mouseDrag:function(){},_mouseStop:function(){},_mouseCapture:function(){return!0}})})(jQuery);(function(e){function t(e){return parseInt(e,10)||0}function i(e){return!isNaN(parseInt(e,10))}e.widget("ui.resizable",e.ui.mouse,{version:"1.10.2",widgetEventPrefix:"resize",options:{alsoResize:!1,animate:!1,animateDuration:"slow",animateEasing:"swing",aspectRatio:!1,autoHide:!1,containment:!1,ghost:!1,grid:!1,handles:"e,s,se",helper:!1,maxHeight:null,maxWidth:null,minHeight:10,minWidth:10,zIndex:90,resize:null,start:null,stop:null},_create:function(){var t,i,s,n,a,o=this,r=this.options;if(this.element.addClass("ui-resizable"),e.extend(this,{_aspectRatio:!!r.aspectRatio,aspectRatio:r.aspectRatio,originalElement:this.element,_proportionallyResizeElements:[],_helper:r.helper||r.ghost||r.animate?r.helper||"ui-resizable-helper":null}),this.element[0].nodeName.match(/canvas|textarea|input|select|button|img/i)&&(this.element.wrap(e("<div class='ui-wrapper' style='overflow: hidden;'></div>").css({position:this.element.css("position"),width:this.element.outerWidth(),height:this.element.outerHeight(),top:this.element.css("top"),left:this.element.css("left")})),this.element=this.element.parent().data("ui-resizable",this.element.data("ui-resizable")),this.elementIsWrapper=!0,this.element.css({marginLeft:this.originalElement.css("marginLeft"),marginTop:this.originalElement.css("marginTop"),marginRight:this.originalElement.css("marginRight"),marginBottom:this.originalElement.css("marginBottom")}),this.originalElement.css({marginLeft:0,marginTop:0,marginRight:0,marginBottom:0}),this.originalResizeStyle=this.originalElement.css("resize"),this.originalElement.css("resize","none"),this._proportionallyResizeElements.push(this.originalElement.css({position:"static",zoom:1,display:"block"})),this.originalElement.css({margin:this.originalElement.css("margin")}),this._proportionallyResize()),this.handles=r.handles||(e(".ui-resizable-handle",this.element).length?{n:".ui-resizable-n",e:".ui-resizable-e",s:".ui-resizable-s",w:".ui-resizable-w",se:".ui-resizable-se",sw:".ui-resizable-sw",ne:".ui-resizable-ne",nw:".ui-resizable-nw"}:"e,s,se"),this.handles.constructor===String)for("all"===this.handles&&(this.handles="n,e,s,w,se,sw,ne,nw"),t=this.handles.split(","),this.handles={},i=0;t.length>i;i++)s=e.trim(t[i]),a="ui-resizable-"+s,n=e("<div class='ui-resizable-handle "+a+"'></div>"),n.css({zIndex:r.zIndex}),"se"===s&&n.addClass("ui-icon ui-icon-gripsmall-diagonal-se"),this.handles[s]=".ui-resizable-"+s,this.element.append(n);this._renderAxis=function(t){var i,s,n,a;t=t||this.element;for(i in this.handles)this.handles[i].constructor===String&&(this.handles[i]=e(this.handles[i],this.element).show()),this.elementIsWrapper&&this.originalElement[0].nodeName.match(/textarea|input|select|button/i)&&(s=e(this.handles[i],this.element),a=/sw|ne|nw|se|n|s/.test(i)?s.outerHeight():s.outerWidth(),n=["padding",/ne|nw|n/.test(i)?"Top":/se|sw|s/.test(i)?"Bottom":/^e$/.test(i)?"Right":"Left"].join(""),t.css(n,a),this._proportionallyResize()),e(this.handles[i]).length},this._renderAxis(this.element),this._handles=e(".ui-resizable-handle",this.element).disableSelection(),this._handles.mouseover(function(){o.resizing||(this.className&&(n=this.className.match(/ui-resizable-(se|sw|ne|nw|n|e|s|w)/i)),o.axis=n&&n[1]?n[1]:"se")}),r.autoHide&&(this._handles.hide(),e(this.element).addClass("ui-resizable-autohide").mouseenter(function(){r.disabled||(e(this).removeClass("ui-resizable-autohide"),o._handles.show())}).mouseleave(function(){r.disabled||o.resizing||(e(this).addClass("ui-resizable-autohide"),o._handles.hide())})),this._mouseInit()},_destroy:function(){this._mouseDestroy();var t,i=function(t){e(t).removeClass("ui-resizable ui-resizable-disabled ui-resizable-resizing").removeData("resizable").removeData("ui-resizable").unbind(".resizable").find(".ui-resizable-handle").remove()};return this.elementIsWrapper&&(i(this.element),t=this.element,this.originalElement.css({position:t.css("position"),width:t.outerWidth(),height:t.outerHeight(),top:t.css("top"),left:t.css("left")}).insertAfter(t),t.remove()),this.originalElement.css("resize",this.originalResizeStyle),i(this.originalElement),this},_mouseCapture:function(t){var i,s,n=!1;for(i in this.handles)s=e(this.handles[i])[0],(s===t.target||e.contains(s,t.target))&&(n=!0);return!this.options.disabled&&n},_mouseStart:function(i){var s,n,a,o=this.options,r=this.element.position(),h=this.element;return this.resizing=!0,/absolute/.test(h.css("position"))?h.css({position:"absolute",top:h.css("top"),left:h.css("left")}):h.is(".ui-draggable")&&h.css({position:"absolute",top:r.top,left:r.left}),this._renderProxy(),s=t(this.helper.css("left")),n=t(this.helper.css("top")),o.containment&&(s+=e(o.containment).scrollLeft()||0,n+=e(o.containment).scrollTop()||0),this.offset=this.helper.offset(),this.position={left:s,top:n},this.size=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalSize=this._helper?{width:h.outerWidth(),height:h.outerHeight()}:{width:h.width(),height:h.height()},this.originalPosition={left:s,top:n},this.sizeDiff={width:h.outerWidth()-h.width(),height:h.outerHeight()-h.height()},this.originalMousePosition={left:i.pageX,top:i.pageY},this.aspectRatio="number"==typeof o.aspectRatio?o.aspectRatio:this.originalSize.width/this.originalSize.height||1,a=e(".ui-resizable-"+this.axis).css("cursor"),e("body").css("cursor","auto"===a?this.axis+"-resize":a),h.addClass("ui-resizable-resizing"),this._propagate("start",i),!0},_mouseDrag:function(t){var i,s=this.helper,n={},a=this.originalMousePosition,o=this.axis,r=this.position.top,h=this.position.left,l=this.size.width,u=this.size.height,c=t.pageX-a.left||0,d=t.pageY-a.top||0,p=this._change[o];return p?(i=p.apply(this,[t,c,d]),this._updateVirtualBoundaries(t.shiftKey),(this._aspectRatio||t.shiftKey)&&(i=this._updateRatio(i,t)),i=this._respectSize(i,t),this._updateCache(i),this._propagate("resize",t),this.position.top!==r&&(n.top=this.position.top+"px"),this.position.left!==h&&(n.left=this.position.left+"px"),this.size.width!==l&&(n.width=this.size.width+"px"),this.size.height!==u&&(n.height=this.size.height+"px"),s.css(n),!this._helper&&this._proportionallyResizeElements.length&&this._proportionallyResize(),e.isEmptyObject(n)||this._trigger("resize",t,this.ui()),!1):!1},_mouseStop:function(t){this.resizing=!1;var i,s,n,a,o,r,h,l=this.options,u=this;return this._helper&&(i=this._proportionallyResizeElements,s=i.length&&/textarea/i.test(i[0].nodeName),n=s&&e.ui.hasScroll(i[0],"left")?0:u.sizeDiff.height,a=s?0:u.sizeDiff.width,o={width:u.helper.width()-a,height:u.helper.height()-n},r=parseInt(u.element.css("left"),10)+(u.position.left-u.originalPosition.left)||null,h=parseInt(u.element.css("top"),10)+(u.position.top-u.originalPosition.top)||null,l.animate||this.element.css(e.extend(o,{top:h,left:r})),u.helper.height(u.size.height),u.helper.width(u.size.width),this._helper&&!l.animate&&this._proportionallyResize()),e("body").css("cursor","auto"),this.element.removeClass("ui-resizable-resizing"),this._propagate("stop",t),this._helper&&this.helper.remove(),!1},_updateVirtualBoundaries:function(e){var t,s,n,a,o,r=this.options;o={minWidth:i(r.minWidth)?r.minWidth:0,maxWidth:i(r.maxWidth)?r.maxWidth:1/0,minHeight:i(r.minHeight)?r.minHeight:0,maxHeight:i(r.maxHeight)?r.maxHeight:1/0},(this._aspectRatio||e)&&(t=o.minHeight*this.aspectRatio,n=o.minWidth/this.aspectRatio,s=o.maxHeight*this.aspectRatio,a=o.maxWidth/this.aspectRatio,t>o.minWidth&&(o.minWidth=t),n>o.minHeight&&(o.minHeight=n),o.maxWidth>s&&(o.maxWidth=s),o.maxHeight>a&&(o.maxHeight=a)),this._vBoundaries=o},_updateCache:function(e){this.offset=this.helper.offset(),i(e.left)&&(this.position.left=e.left),i(e.top)&&(this.position.top=e.top),i(e.height)&&(this.size.height=e.height),i(e.width)&&(this.size.width=e.width)},_updateRatio:function(e){var t=this.position,s=this.size,n=this.axis;return i(e.height)?e.width=e.height*this.aspectRatio:i(e.width)&&(e.height=e.width/this.aspectRatio),"sw"===n&&(e.left=t.left+(s.width-e.width),e.top=null),"nw"===n&&(e.top=t.top+(s.height-e.height),e.left=t.left+(s.width-e.width)),e},_respectSize:function(e){var t=this._vBoundaries,s=this.axis,n=i(e.width)&&t.maxWidth&&t.maxWidth<e.width,a=i(e.height)&&t.maxHeight&&t.maxHeight<e.height,o=i(e.width)&&t.minWidth&&t.minWidth>e.width,r=i(e.height)&&t.minHeight&&t.minHeight>e.height,h=this.originalPosition.left+this.originalSize.width,l=this.position.top+this.size.height,u=/sw|nw|w/.test(s),c=/nw|ne|n/.test(s);return o&&(e.width=t.minWidth),r&&(e.height=t.minHeight),n&&(e.width=t.maxWidth),a&&(e.height=t.maxHeight),o&&u&&(e.left=h-t.minWidth),n&&u&&(e.left=h-t.maxWidth),r&&c&&(e.top=l-t.minHeight),a&&c&&(e.top=l-t.maxHeight),e.width||e.height||e.left||!e.top?e.width||e.height||e.top||!e.left||(e.left=null):e.top=null,e},_proportionallyResize:function(){if(this._proportionallyResizeElements.length){var e,t,i,s,n,a=this.helper||this.element;for(e=0;this._proportionallyResizeElements.length>e;e++){if(n=this._proportionallyResizeElements[e],!this.borderDif)for(this.borderDif=[],i=[n.css("borderTopWidth"),n.css("borderRightWidth"),n.css("borderBottomWidth"),n.css("borderLeftWidth")],s=[n.css("paddingTop"),n.css("paddingRight"),n.css("paddingBottom"),n.css("paddingLeft")],t=0;i.length>t;t++)this.borderDif[t]=(parseInt(i[t],10)||0)+(parseInt(s[t],10)||0);n.css({height:a.height()-this.borderDif[0]-this.borderDif[2]||0,width:a.width()-this.borderDif[1]-this.borderDif[3]||0})}}},_renderProxy:function(){var t=this.element,i=this.options;this.elementOffset=t.offset(),this._helper?(this.helper=this.helper||e("<div style='overflow:hidden;'></div>"),this.helper.addClass(this._helper).css({width:this.element.outerWidth()-1,height:this.element.outerHeight()-1,position:"absolute",left:this.elementOffset.left+"px",top:this.elementOffset.top+"px",zIndex:++i.zIndex}),this.helper.appendTo("body").disableSelection()):this.helper=this.element},_change:{e:function(e,t){return{width:this.originalSize.width+t}},w:function(e,t){var i=this.originalSize,s=this.originalPosition;return{left:s.left+t,width:i.width-t}},n:function(e,t,i){var s=this.originalSize,n=this.originalPosition;return{top:n.top+i,height:s.height-i}},s:function(e,t,i){return{height:this.originalSize.height+i}},se:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},sw:function(t,i,s){return e.extend(this._change.s.apply(this,arguments),this._change.w.apply(this,[t,i,s]))},ne:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.e.apply(this,[t,i,s]))},nw:function(t,i,s){return e.extend(this._change.n.apply(this,arguments),this._change.w.apply(this,[t,i,s]))}},_propagate:function(t,i){e.ui.plugin.call(this,t,[i,this.ui()]),"resize"!==t&&this._trigger(t,i,this.ui())},plugins:{},ui:function(){return{originalElement:this.originalElement,element:this.element,helper:this.helper,position:this.position,size:this.size,originalSize:this.originalSize,originalPosition:this.originalPosition}}}),e.ui.plugin.add("resizable","animate",{stop:function(t){var i=e(this).data("ui-resizable"),s=i.options,n=i._proportionallyResizeElements,a=n.length&&/textarea/i.test(n[0].nodeName),o=a&&e.ui.hasScroll(n[0],"left")?0:i.sizeDiff.height,r=a?0:i.sizeDiff.width,h={width:i.size.width-r,height:i.size.height-o},l=parseInt(i.element.css("left"),10)+(i.position.left-i.originalPosition.left)||null,u=parseInt(i.element.css("top"),10)+(i.position.top-i.originalPosition.top)||null;i.element.animate(e.extend(h,u&&l?{top:u,left:l}:{}),{duration:s.animateDuration,easing:s.animateEasing,step:function(){var s={width:parseInt(i.element.css("width"),10),height:parseInt(i.element.css("height"),10),top:parseInt(i.element.css("top"),10),left:parseInt(i.element.css("left"),10)};n&&n.length&&e(n[0]).css({width:s.width,height:s.height}),i._updateCache(s),i._propagate("resize",t)}})}}),e.ui.plugin.add("resizable","containment",{start:function(){var i,s,n,a,o,r,h,l=e(this).data("ui-resizable"),u=l.options,c=l.element,d=u.containment,p=d instanceof e?d.get(0):/parent/.test(d)?c.parent().get(0):d;p&&(l.containerElement=e(p),/document/.test(d)||d===document?(l.containerOffset={left:0,top:0},l.containerPosition={left:0,top:0},l.parentData={element:e(document),left:0,top:0,width:e(document).width(),height:e(document).height()||document.body.parentNode.scrollHeight}):(i=e(p),s=[],e(["Top","Right","Left","Bottom"]).each(function(e,n){s[e]=t(i.css("padding"+n))}),l.containerOffset=i.offset(),l.containerPosition=i.position(),l.containerSize={height:i.innerHeight()-s[3],width:i.innerWidth()-s[1]},n=l.containerOffset,a=l.containerSize.height,o=l.containerSize.width,r=e.ui.hasScroll(p,"left")?p.scrollWidth:o,h=e.ui.hasScroll(p)?p.scrollHeight:a,l.parentData={element:p,left:n.left,top:n.top,width:r,height:h}))},resize:function(t){var i,s,n,a,o=e(this).data("ui-resizable"),r=o.options,h=o.containerOffset,l=o.position,u=o._aspectRatio||t.shiftKey,c={top:0,left:0},d=o.containerElement;d[0]!==document&&/static/.test(d.css("position"))&&(c=h),l.left<(o._helper?h.left:0)&&(o.size.width=o.size.width+(o._helper?o.position.left-h.left:o.position.left-c.left),u&&(o.size.height=o.size.width/o.aspectRatio),o.position.left=r.helper?h.left:0),l.top<(o._helper?h.top:0)&&(o.size.height=o.size.height+(o._helper?o.position.top-h.top:o.position.top),u&&(o.size.width=o.size.height*o.aspectRatio),o.position.top=o._helper?h.top:0),o.offset.left=o.parentData.left+o.position.left,o.offset.top=o.parentData.top+o.position.top,i=Math.abs((o._helper?o.offset.left-c.left:o.offset.left-c.left)+o.sizeDiff.width),s=Math.abs((o._helper?o.offset.top-c.top:o.offset.top-h.top)+o.sizeDiff.height),n=o.containerElement.get(0)===o.element.parent().get(0),a=/relative|absolute/.test(o.containerElement.css("position")),n&&a&&(i-=o.parentData.left),i+o.size.width>=o.parentData.width&&(o.size.width=o.parentData.width-i,u&&(o.size.height=o.size.width/o.aspectRatio)),s+o.size.height>=o.parentData.height&&(o.size.height=o.parentData.height-s,u&&(o.size.width=o.size.height*o.aspectRatio))},stop:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.containerOffset,n=t.containerPosition,a=t.containerElement,o=e(t.helper),r=o.offset(),h=o.outerWidth()-t.sizeDiff.width,l=o.outerHeight()-t.sizeDiff.height;t._helper&&!i.animate&&/relative/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l}),t._helper&&!i.animate&&/static/.test(a.css("position"))&&e(this).css({left:r.left-n.left-s.left,width:h,height:l})}}),e.ui.plugin.add("resizable","alsoResize",{start:function(){var t=e(this).data("ui-resizable"),i=t.options,s=function(t){e(t).each(function(){var t=e(this);t.data("ui-resizable-alsoresize",{width:parseInt(t.width(),10),height:parseInt(t.height(),10),left:parseInt(t.css("left"),10),top:parseInt(t.css("top"),10)})})};"object"!=typeof i.alsoResize||i.alsoResize.parentNode?s(i.alsoResize):i.alsoResize.length?(i.alsoResize=i.alsoResize[0],s(i.alsoResize)):e.each(i.alsoResize,function(e){s(e)})},resize:function(t,i){var s=e(this).data("ui-resizable"),n=s.options,a=s.originalSize,o=s.originalPosition,r={height:s.size.height-a.height||0,width:s.size.width-a.width||0,top:s.position.top-o.top||0,left:s.position.left-o.left||0},h=function(t,s){e(t).each(function(){var t=e(this),n=e(this).data("ui-resizable-alsoresize"),a={},o=s&&s.length?s:t.parents(i.originalElement[0]).length?["width","height"]:["width","height","top","left"];e.each(o,function(e,t){var i=(n[t]||0)+(r[t]||0);i&&i>=0&&(a[t]=i||null)}),t.css(a)})};"object"!=typeof n.alsoResize||n.alsoResize.nodeType?h(n.alsoResize):e.each(n.alsoResize,function(e,t){h(e,t)})},stop:function(){e(this).removeData("resizable-alsoresize")}}),e.ui.plugin.add("resizable","ghost",{start:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.size;t.ghost=t.originalElement.clone(),t.ghost.css({opacity:.25,display:"block",position:"relative",height:s.height,width:s.width,margin:0,left:0,top:0}).addClass("ui-resizable-ghost").addClass("string"==typeof i.ghost?i.ghost:""),t.ghost.appendTo(t.helper)},resize:function(){var t=e(this).data("ui-resizable");t.ghost&&t.ghost.css({position:"relative",height:t.size.height,width:t.size.width})},stop:function(){var t=e(this).data("ui-resizable");t.ghost&&t.helper&&t.helper.get(0).removeChild(t.ghost.get(0))}}),e.ui.plugin.add("resizable","grid",{resize:function(){var t=e(this).data("ui-resizable"),i=t.options,s=t.size,n=t.originalSize,a=t.originalPosition,o=t.axis,r="number"==typeof i.grid?[i.grid,i.grid]:i.grid,h=r[0]||1,l=r[1]||1,u=Math.round((s.width-n.width)/h)*h,c=Math.round((s.height-n.height)/l)*l,d=n.width+u,p=n.height+c,f=i.maxWidth&&d>i.maxWidth,m=i.maxHeight&&p>i.maxHeight,g=i.minWidth&&i.minWidth>d,v=i.minHeight&&i.minHeight>p;i.grid=r,g&&(d+=h),v&&(p+=l),f&&(d-=h),m&&(p-=l),/^(se|s|e)$/.test(o)?(t.size.width=d,t.size.height=p):/^(ne)$/.test(o)?(t.size.width=d,t.size.height=p,t.position.top=a.top-c):/^(sw)$/.test(o)?(t.size.width=d,t.size.height=p,t.position.left=a.left-u):(t.size.width=d,t.size.height=p,t.position.top=a.top-c,t.position.left=a.left-u)}})})(jQuery);
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/notes.css b/installer/vendor/golang.org/x/tools/cmd/present/static/notes.css
deleted file mode 100644
index 0b44583795..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/notes.css
+++ /dev/null
@@ -1,32 +0,0 @@
-p {
-  margin: 10px;
-}
-
-#presenter-slides {
-  display: block;
-  margin-top: -10px;
-  margin-left: -17px;
-  position: fixed;
-  border: 0;
-  width : 146%;
-  height: 750px;
-
-  transform: scale(0.7, 0.7);
-  transform-origin: top left;
-  -moz-transform: scale(0.7);
-  -moz-transform-origin: top left;
-  -o-transform: scale(0.7);
-  -o-transform-origin: top left;
-  -webkit-transform: scale(0.7);
-  -webkit-transform-origin: top left;
-}
-
-#presenter-notes {
-  margin-top: -180px;
-  font-family: 'Open Sans', Arial, sans-serif;
-  height: 30%;
-  width: 100%;
-  overflow: scroll;
-  position: fixed;
-  top: 706px;
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/notes.js b/installer/vendor/golang.org/x/tools/cmd/present/static/notes.js
deleted file mode 100644
index a19f21eb16..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/notes.js
+++ /dev/null
@@ -1,161 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Store child window object which will display slides with notes
-var notesWindow = null;
-
-var isParentWindow = window.parent == window;
-
-// When parent window closes, clear storage and close child window
-if (isParentWindow) {
-  window.onbeforeunload = function() {
-    localStorage.clear();
-    if (notesWindow) notesWindow.close();
-  }
-};
-
-function toggleNotesWindow() {
-  if (!isParentWindow) return;
-  if (notesWindow) {
-    notesWindow.close();
-    notesWindow = null;
-    return;
-  }
-
-  initNotes();
-};
-
-function initNotes() {
-  notesWindow = window.open('', '', 'width=1000,height=700');
-  var w = notesWindow;
-  var slidesUrl = window.location.href;
-
-  var curSlide = parseInt(localStorage.getItem('destSlide'), 10);
-  var formattedNotes = '';
-  var section = sections[curSlide - 1];
-  // curSlide is 0 when initialized from the first page of slides.
-  // Check if section is valid before retrieving Notes.
-  if (section) {
-    formattedNotes = formatNotes(section.Notes);
-  } else if (curSlide == 0) {
-    formattedNotes = formatNotes(titleNotes);
-  }
-
-  // Hack to apply css. Requires existing html on notesWindow.
-  w.document.write("<div style='display:none;'></div>");
-
-  w.document.title = window.document.title;
-
-  var slides = w.document.createElement('iframe');
-  slides.id = 'presenter-slides';
-  slides.src = slidesUrl;
-  w.document.body.appendChild(slides);
-  // setTimeout needed for Firefox
-  setTimeout(function() {
-    slides.focus();
-  }, 100);
-
-  var notes = w.document.createElement('div');
-  notes.id = 'presenter-notes';
-  notes.innerHTML = formattedNotes;
-  w.document.body.appendChild(notes);
-
-  w.document.close();
-
-  function addPresenterNotesStyle() {
-    var el = w.document.createElement('link');
-    el.rel = 'stylesheet';
-    el.type = 'text/css';
-    el.href = PERMANENT_URL_PREFIX + 'notes.css';
-    w.document.body.appendChild(el);
-    w.document.querySelector('head').appendChild(el);
-  }
-
-  addPresenterNotesStyle();
-
-  // Add listener on notesWindow to update notes when triggered from
-  // parent window
-  w.addEventListener('storage', updateNotes, false);
-};
-
-function formatNotes(notes) {
-  var formattedNotes = '';
-  if (notes) {
-    for (var i = 0; i < notes.length; i++) {
-      formattedNotes = formattedNotes + '<p>' + notes[i] + '</p>';
-    }
-  }
-  return formattedNotes;
-};
-
-function updateNotes() {
-  // When triggered from parent window, notesWindow is null
-  // The storage event listener on notesWindow will update notes
-  if (!notesWindow) return;
-  var destSlide = parseInt(localStorage.getItem('destSlide'), 10);
-  var section = sections[destSlide - 1];
-  var el = notesWindow.document.getElementById('presenter-notes');
-
-  if (!el) return;
-
-  if (section && section.Notes) {
-    el.innerHTML = formatNotes(section.Notes);
-  } else if (destSlide == 0) {
-    el.innerHTML = formatNotes(titleNotes);
-  }  else {
-    el.innerHTML = '';
-  }
-};
-
-/* Playground syncing */
-
-// When presenter notes are enabled, playground click handlers are
-// stored here to sync click events on the correct playground
-var playgroundHandlers = {onRun: [], onKill: [], onClose: []};
-
-function updatePlay(e) {
-	var i = localStorage.getItem('play-index');
-
-	switch (e.key) {
-		case 'play-index':
-			return;
-		case 'play-action':
-			// Sync 'run', 'kill', 'close' actions
-			var action = localStorage.getItem('play-action');
-			playgroundHandlers[action][i](e);
-			return;
-		case 'play-code':
-			// Sync code editing
-			var play = document.querySelectorAll('div.playground')[i];
-			play.innerHTML = localStorage.getItem('play-code');
-			return;
-		case 'output-style':
-			// Sync resizing of playground output
-			var out = document.querySelectorAll('.output')[i];
-			out.style = localStorage.getItem('output-style');
-			return;
-	}
-};
-
-// Reset 'run', 'kill', 'close' storage items when synced
-// so that successive actions can be synced correctly
-function updatePlayStorage(action, index, e) {
-	localStorage.setItem('play-index', index);
-
-	if (localStorage.getItem('play-action') === action) {
-		// We're the receiving window, and the message has been received
-		localStorage.removeItem('play-action');
-	} else {
-		// We're the triggering window, send the message
-		localStorage.setItem('play-action', action);
-	}
-
-	if (action === 'onRun') {
-		if (localStorage.getItem('play-shiftKey') === 'true') {
-			localStorage.removeItem('play-shiftKey');
-		} else if (e.shiftKey) {
-			localStorage.setItem('play-shiftKey', e.shiftKey);
-		}
-	}
-};
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/slides.js b/installer/vendor/golang.org/x/tools/cmd/present/static/slides.js
deleted file mode 100644
index df10647e8a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/slides.js
+++ /dev/null
@@ -1,612 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-var PERMANENT_URL_PREFIX = '/static/';
-
-var SLIDE_CLASSES = ['far-past', 'past', 'current', 'next', 'far-next'];
-
-var PM_TOUCH_SENSITIVITY = 15;
-
-var curSlide;
-
-/* ---------------------------------------------------------------------- */
-/* classList polyfill by Eli Grey
- * (http://purl.eligrey.com/github/classList.js/blob/master/classList.js) */
-
-if (typeof document !== 'undefined' && !('classList' in document.createElement('a'))) {
-
-(function (view) {
-
-var
-    classListProp = 'classList'
-  , protoProp = 'prototype'
-  , elemCtrProto = (view.HTMLElement || view.Element)[protoProp]
-  , objCtr = Object
-    strTrim = String[protoProp].trim || function () {
-    return this.replace(/^\s+|\s+$/g, '');
-  }
-  , arrIndexOf = Array[protoProp].indexOf || function (item) {
-    for (var i = 0, len = this.length; i < len; i++) {
-      if (i in this && this[i] === item) {
-        return i;
-      }
-    }
-    return -1;
-  }
-  // Vendors: please allow content code to instantiate DOMExceptions
-  , DOMEx = function (type, message) {
-    this.name = type;
-    this.code = DOMException[type];
-    this.message = message;
-  }
-  , checkTokenAndGetIndex = function (classList, token) {
-    if (token === '') {
-      throw new DOMEx(
-          'SYNTAX_ERR'
-        , 'An invalid or illegal string was specified'
-      );
-    }
-    if (/\s/.test(token)) {
-      throw new DOMEx(
-          'INVALID_CHARACTER_ERR'
-        , 'String contains an invalid character'
-      );
-    }
-    return arrIndexOf.call(classList, token);
-  }
-  , ClassList = function (elem) {
-    var
-        trimmedClasses = strTrim.call(elem.className)
-      , classes = trimmedClasses ? trimmedClasses.split(/\s+/) : []
-    ;
-    for (var i = 0, len = classes.length; i < len; i++) {
-      this.push(classes[i]);
-    }
-    this._updateClassName = function () {
-      elem.className = this.toString();
-    };
-  }
-  , classListProto = ClassList[protoProp] = []
-  , classListGetter = function () {
-    return new ClassList(this);
-  }
-;
-// Most DOMException implementations don't allow calling DOMException's toString()
-// on non-DOMExceptions. Error's toString() is sufficient here.
-DOMEx[protoProp] = Error[protoProp];
-classListProto.item = function (i) {
-  return this[i] || null;
-};
-classListProto.contains = function (token) {
-  token += '';
-  return checkTokenAndGetIndex(this, token) !== -1;
-};
-classListProto.add = function (token) {
-  token += '';
-  if (checkTokenAndGetIndex(this, token) === -1) {
-    this.push(token);
-    this._updateClassName();
-  }
-};
-classListProto.remove = function (token) {
-  token += '';
-  var index = checkTokenAndGetIndex(this, token);
-  if (index !== -1) {
-    this.splice(index, 1);
-    this._updateClassName();
-  }
-};
-classListProto.toggle = function (token) {
-  token += '';
-  if (checkTokenAndGetIndex(this, token) === -1) {
-    this.add(token);
-  } else {
-    this.remove(token);
-  }
-};
-classListProto.toString = function () {
-  return this.join(' ');
-};
-
-if (objCtr.defineProperty) {
-  var classListPropDesc = {
-      get: classListGetter
-    , enumerable: true
-    , configurable: true
-  };
-  try {
-    objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
-  } catch (ex) { // IE 8 doesn't support enumerable:true
-    if (ex.number === -0x7FF5EC54) {
-      classListPropDesc.enumerable = false;
-      objCtr.defineProperty(elemCtrProto, classListProp, classListPropDesc);
-    }
-  }
-} else if (objCtr[protoProp].__defineGetter__) {
-  elemCtrProto.__defineGetter__(classListProp, classListGetter);
-}
-
-}(self));
-
-}
-/* ---------------------------------------------------------------------- */
-
-/* Slide movement */
-
-function hideHelpText() {
-  document.getElementById('help').style.display = 'none';
-};
-
-function getSlideEl(no) {
-  if ((no < 0) || (no >= slideEls.length)) {
-    return null;
-  } else {
-    return slideEls[no];
-  }
-};
-
-function updateSlideClass(slideNo, className) {
-  var el = getSlideEl(slideNo);
-
-  if (!el) {
-    return;
-  }
-
-  if (className) {
-    el.classList.add(className);
-  }
-
-  for (var i in SLIDE_CLASSES) {
-    if (className != SLIDE_CLASSES[i]) {
-      el.classList.remove(SLIDE_CLASSES[i]);
-    }
-  }
-};
-
-function updateSlides() {
-  if (window.trackPageview) window.trackPageview();
-
-  for (var i = 0; i < slideEls.length; i++) {
-    switch (i) {
-      case curSlide - 2:
-        updateSlideClass(i, 'far-past');
-        break;
-      case curSlide - 1:
-        updateSlideClass(i, 'past');
-        break;
-      case curSlide:
-        updateSlideClass(i, 'current');
-        break;
-      case curSlide + 1:
-        updateSlideClass(i, 'next');
-        break;
-      case curSlide + 2:
-        updateSlideClass(i, 'far-next');
-        break;
-      default:
-        updateSlideClass(i);
-        break;
-    }
-  }
-
-  triggerLeaveEvent(curSlide - 1);
-  triggerEnterEvent(curSlide);
-
-  window.setTimeout(function() {
-    // Hide after the slide
-    disableSlideFrames(curSlide - 2);
-  }, 301);
-
-  enableSlideFrames(curSlide - 1);
-  enableSlideFrames(curSlide + 2);
-
-  updateHash();
-};
-
-function prevSlide() {
-  hideHelpText();
-  if (curSlide > 0) {
-    curSlide--;
-
-    updateSlides();
-  }
-
-  if (notesEnabled) localStorage.setItem('destSlide', curSlide);
-};
-
-function nextSlide() {
-  hideHelpText();
-  if (curSlide < slideEls.length - 1) {
-    curSlide++;
-
-    updateSlides();
-  }
-
-  if (notesEnabled) localStorage.setItem('destSlide', curSlide);
-};
-
-/* Slide events */
-
-function triggerEnterEvent(no) {
-  var el = getSlideEl(no);
-  if (!el) {
-    return;
-  }
-
-  var onEnter = el.getAttribute('onslideenter');
-  if (onEnter) {
-    new Function(onEnter).call(el);
-  }
-
-  var evt = document.createEvent('Event');
-  evt.initEvent('slideenter', true, true);
-  evt.slideNumber = no + 1; // Make it readable
-
-  el.dispatchEvent(evt);
-};
-
-function triggerLeaveEvent(no) {
-  var el = getSlideEl(no);
-  if (!el) {
-    return;
-  }
-
-  var onLeave = el.getAttribute('onslideleave');
-  if (onLeave) {
-    new Function(onLeave).call(el);
-  }
-
-  var evt = document.createEvent('Event');
-  evt.initEvent('slideleave', true, true);
-  evt.slideNumber = no + 1; // Make it readable
-
-  el.dispatchEvent(evt);
-};
-
-/* Touch events */
-
-function handleTouchStart(event) {
-  if (event.touches.length == 1) {
-    touchDX = 0;
-    touchDY = 0;
-
-    touchStartX = event.touches[0].pageX;
-    touchStartY = event.touches[0].pageY;
-
-    document.body.addEventListener('touchmove', handleTouchMove, true);
-    document.body.addEventListener('touchend', handleTouchEnd, true);
-  }
-};
-
-function handleTouchMove(event) {
-  if (event.touches.length > 1) {
-    cancelTouch();
-  } else {
-    touchDX = event.touches[0].pageX - touchStartX;
-    touchDY = event.touches[0].pageY - touchStartY;
-    event.preventDefault();
-  }
-};
-
-function handleTouchEnd(event) {
-  var dx = Math.abs(touchDX);
-  var dy = Math.abs(touchDY);
-
-  if ((dx > PM_TOUCH_SENSITIVITY) && (dy < (dx * 2 / 3))) {
-    if (touchDX > 0) {
-      prevSlide();
-    } else {
-      nextSlide();
-    }
-  }
-
-  cancelTouch();
-};
-
-function cancelTouch() {
-  document.body.removeEventListener('touchmove', handleTouchMove, true);
-  document.body.removeEventListener('touchend', handleTouchEnd, true);
-};
-
-/* Preloading frames */
-
-function disableSlideFrames(no) {
-  var el = getSlideEl(no);
-  if (!el) {
-    return;
-  }
-
-  var frames = el.getElementsByTagName('iframe');
-  for (var i = 0, frame; frame = frames[i]; i++) {
-    disableFrame(frame);
-  }
-};
-
-function enableSlideFrames(no) {
-  var el = getSlideEl(no);
-  if (!el) {
-    return;
-  }
-
-  var frames = el.getElementsByTagName('iframe');
-  for (var i = 0, frame; frame = frames[i]; i++) {
-    enableFrame(frame);
-  }
-};
-
-function disableFrame(frame) {
-  frame.src = 'about:blank';
-};
-
-function enableFrame(frame) {
-  var src = frame._src;
-
-  if (frame.src != src && src != 'about:blank') {
-    frame.src = src;
-  }
-};
-
-function setupFrames() {
-  var frames = document.querySelectorAll('iframe');
-  for (var i = 0, frame; frame = frames[i]; i++) {
-    frame._src = frame.src;
-    disableFrame(frame);
-  }
-
-  enableSlideFrames(curSlide);
-  enableSlideFrames(curSlide + 1);
-  enableSlideFrames(curSlide + 2);
-};
-
-function setupInteraction() {
-  /* Clicking and tapping */
-
-  var el = document.createElement('div');
-  el.className = 'slide-area';
-  el.id = 'prev-slide-area';
-  el.addEventListener('click', prevSlide, false);
-  document.querySelector('section.slides').appendChild(el);
-
-  var el = document.createElement('div');
-  el.className = 'slide-area';
-  el.id = 'next-slide-area';
-  el.addEventListener('click', nextSlide, false);
-  document.querySelector('section.slides').appendChild(el);
-
-  /* Swiping */
-
-  document.body.addEventListener('touchstart', handleTouchStart, false);
-}
-
-/* Hash functions */
-
-function getCurSlideFromHash() {
-  var slideNo = parseInt(location.hash.substr(1));
-
-  if (slideNo) {
-    curSlide = slideNo - 1;
-  } else {
-    curSlide = 0;
-  }
-};
-
-function updateHash() {
-  location.replace('#' + (curSlide + 1));
-};
-
-/* Event listeners */
-
-function handleBodyKeyDown(event) {
-  // If we're in a code element, only handle pgup/down.
-  var inCode = event.target.classList.contains('code');
-
-  switch (event.keyCode) {
-    case 78: // 'N' opens presenter notes window
-      if (!inCode && notesEnabled) toggleNotesWindow();
-      break;
-    case 72: // 'H' hides the help text
-    case 27: // escape key
-      if (!inCode) hideHelpText();
-      break;
-
-    case 39: // right arrow
-    case 13: // Enter
-    case 32: // space
-      if (inCode) break;
-    case 34: // PgDn
-      nextSlide();
-      event.preventDefault();
-      break;
-
-    case 37: // left arrow
-    case 8: // Backspace
-      if (inCode) break;
-    case 33: // PgUp
-      prevSlide();
-      event.preventDefault();
-      break;
-
-    case 40: // down arrow
-      if (inCode) break;
-      nextSlide();
-      event.preventDefault();
-      break;
-
-    case 38: // up arrow
-      if (inCode) break;
-      prevSlide();
-      event.preventDefault();
-      break;
-  }
-};
-
-function scaleSmallViewports() {
-  var el = document.querySelector('.slides');
-  var transform = '';
-  var sWidthPx = 1250;
-  var sHeightPx = 750;
-  var sAspectRatio = sWidthPx / sHeightPx;
-  var wAspectRatio = window.innerWidth / window.innerHeight;
-
-  if (wAspectRatio <= sAspectRatio && window.innerWidth < sWidthPx) {
-    transform = 'scale(' + window.innerWidth / sWidthPx + ')';
-  } else if (window.innerHeight < sHeightPx) {
-    transform = 'scale(' + window.innerHeight / sHeightPx + ')';
-  }
-  el.style.transform = transform;
-}
-
-function addEventListeners() {
-  document.addEventListener('keydown', handleBodyKeyDown, false);
-  var resizeTimeout;
-  window.addEventListener('resize', function() {
-    // throttle resize events
-    window.clearTimeout(resizeTimeout);
-    resizeTimeout = window.setTimeout(function() {
-      resizeTimeout = null;
-      scaleSmallViewports();
-    }, 50);
-  });
-}
-
-/* Initialization */
-
-function addFontStyle() {
-  var el = document.createElement('link');
-  el.rel = 'stylesheet';
-  el.type = 'text/css';
-  el.href = '//fonts.googleapis.com/css?family=' +
-            'Open+Sans:regular,semibold,italic,italicsemibold|Droid+Sans+Mono';
-
-  document.body.appendChild(el);
-};
-
-function addGeneralStyle() {
-  var el = document.createElement('link');
-  el.rel = 'stylesheet';
-  el.type = 'text/css';
-  el.href = PERMANENT_URL_PREFIX + 'styles.css';
-  document.body.appendChild(el);
-
-  var el = document.createElement('meta');
-  el.name = 'viewport';
-  el.content = 'width=device-width,height=device-height,initial-scale=1';
-  document.querySelector('head').appendChild(el);
-
-  var el = document.createElement('meta');
-  el.name = 'apple-mobile-web-app-capable';
-  el.content = 'yes';
-  document.querySelector('head').appendChild(el);
-
-  scaleSmallViewports();
-};
-
-function handleDomLoaded() {
-  slideEls = document.querySelectorAll('section.slides > article');
-
-  setupFrames();
-
-  addFontStyle();
-  addGeneralStyle();
-  addEventListeners();
-
-  updateSlides();
-
-  setupInteraction();
-
-  if (window.location.hostname == 'localhost' || window.location.hostname == '127.0.0.1' || window.location.hostname == '::1') {
-    hideHelpText();
-  }
-
-  document.body.classList.add('loaded');
-
-  setupNotesSync();
-};
-
-function initialize() {
-  getCurSlideFromHash();
-
-  if (window['_DEBUG']) {
-    PERMANENT_URL_PREFIX = '../';
-  }
-
-  if (window['_DCL']) {
-    handleDomLoaded();
-  } else {
-    document.addEventListener('DOMContentLoaded', handleDomLoaded, false);
-  }
-}
-
-// If ?debug exists then load the script relative instead of absolute
-if (!window['_DEBUG'] && document.location.href.indexOf('?debug') !== -1) {
-  document.addEventListener('DOMContentLoaded', function() {
-    // Avoid missing the DomContentLoaded event
-    window['_DCL'] = true
-  }, false);
-
-  window['_DEBUG'] = true;
-  var script = document.createElement('script');
-  script.type = 'text/javascript';
-  script.src = '../slides.js';
-  var s = document.getElementsByTagName('script')[0];
-  s.parentNode.insertBefore(script, s);
-
-  // Remove this script
-  s.parentNode.removeChild(s);
-} else {
-  initialize();
-}
-
-/* Synchronize windows when notes are enabled */
-
-function setupNotesSync() {
-  if (!notesEnabled) return;
-
-  function setupPlayResizeSync() {
-    var out = document.getElementsByClassName('output');
-    for (var i = 0; i < out.length; i++) {
-      $(out[i]).bind('resize', function(event) {
-        if ($(event.target).hasClass('ui-resizable')) {
-          localStorage.setItem('play-index', i);
-          localStorage.setItem('output-style', out[i].style.cssText);
-        }
-      })
-    }
-  };
-  function setupPlayCodeSync() {
-    var play = document.querySelectorAll('div.playground');
-    for (var i = 0; i < play.length; i++) {
-      play[i].addEventListener('input', inputHandler, false);
-
-      function inputHandler(e) {
-        localStorage.setItem('play-index', i);
-        localStorage.setItem('play-code', e.target.innerHTML);
-      }
-    }
-  };
-
-  setupPlayCodeSync();
-  setupPlayResizeSync();
-  localStorage.setItem('destSlide', curSlide);
-  window.addEventListener('storage', updateOtherWindow, false);
-}
-
-// An update to local storage is caught only by the other window
-// The triggering window does not handle any sync actions
-function updateOtherWindow(e) {
-  // Ignore remove storage events which are not meant to update the other window
-  var isRemoveStorageEvent = !e.newValue;
-  if (isRemoveStorageEvent) return;
-
-  var destSlide = localStorage.getItem('destSlide');
-  while (destSlide > curSlide) {
-    nextSlide();
-  }
-  while (destSlide < curSlide) {
-    prevSlide();
-  }
-
-  updatePlay(e);
-  updateNotes();
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/static/styles.css b/installer/vendor/golang.org/x/tools/cmd/present/static/styles.css
deleted file mode 100644
index 2d8d3544d1..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/static/styles.css
+++ /dev/null
@@ -1,534 +0,0 @@
-@media screen {
-  /* Framework */
-  html {
-    height: 100%;
-  }
-
-  body {
-    margin: 0;
-    padding: 0;
-
-    display: block !important;
-
-    height: 100%;
-    height: 100vh;
-
-    overflow: hidden;
-
-    background: rgb(215, 215, 215);
-    background: -o-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background: -moz-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background: -webkit-radial-gradient(rgb(240, 240, 240), rgb(190, 190, 190));
-    background: -webkit-gradient(radial, 50% 50%, 0, 50% 50%, 500, from(rgb(240, 240, 240)), to(rgb(190, 190, 190)));
-
-    -webkit-font-smoothing: antialiased;
-  }
-
-  .slides {
-    width: 100%;
-    height: 100%;
-    left: 0;
-    top: 0;
-
-    position: absolute;
-
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-
-  .slides > article {
-    display: block;
-
-    position: absolute;
-    overflow: hidden;
-
-    width: 900px;
-    height: 700px;
-
-    left: 50%;
-    top: 50%;
-
-    margin-left: -450px;
-    margin-top: -350px;
-
-    padding: 40px 60px;
-
-    box-sizing: border-box;
-    -o-box-sizing: border-box;
-    -moz-box-sizing: border-box;
-    -webkit-box-sizing: border-box;
-
-    border-radius: 10px;
-    -o-border-radius: 10px;
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-
-    background-color: white;
-
-    border: 1px solid rgba(0, 0, 0, .3);
-
-    transition: transform .3s ease-out;
-    -o-transition: -o-transform .3s ease-out;
-    -moz-transition: -moz-transform .3s ease-out;
-    -webkit-transition: -webkit-transform .3s ease-out;
-  }
-  .slides.layout-widescreen > article {
-    margin-left: -550px;
-    width: 1100px;
-  }
-  .slides.layout-faux-widescreen > article {
-    margin-left: -550px;
-    width: 1100px;
-
-    padding: 40px 160px;
-  }
-
-  .slides.layout-widescreen > article:not(.nobackground):not(.biglogo),
-  .slides.layout-faux-widescreen > article:not(.nobackground):not(.biglogo) {
-    background-position-x: 0, 840px;
-  }
-
-  /* Clickable/tappable areas */
-
-  .slide-area {
-    z-index: 1000;
-
-    position: absolute;
-    left: 0;
-    top: 0;
-    width: 150px;
-    height: 700px;
-
-    left: 50%;
-    top: 50%;
-
-    cursor: pointer;
-    margin-top: -350px;
-
-    tap-highlight-color: transparent;
-    -o-tap-highlight-color: transparent;
-    -moz-tap-highlight-color: transparent;
-    -webkit-tap-highlight-color: transparent;
-  }
-  #prev-slide-area {
-    margin-left: -550px;
-  }
-  #next-slide-area {
-    margin-left: 400px;
-  }
-  .slides.layout-widescreen #prev-slide-area,
-  .slides.layout-faux-widescreen #prev-slide-area {
-    margin-left: -650px;
-  }
-  .slides.layout-widescreen #next-slide-area,
-  .slides.layout-faux-widescreen #next-slide-area {
-    margin-left: 500px;
-  }
-
-  /* Slides */
-
-  .slides > article {
-    display: none;
-  }
-  .slides > article.far-past {
-    display: block;
-    transform: translate(-2040px);
-    -o-transform: translate(-2040px);
-    -moz-transform: translate(-2040px);
-    -webkit-transform: translate3d(-2040px, 0, 0);
-  }
-  .slides > article.past {
-    display: block;
-    transform: translate(-1020px);
-    -o-transform: translate(-1020px);
-    -moz-transform: translate(-1020px);
-    -webkit-transform: translate3d(-1020px, 0, 0);
-  }
-  .slides > article.current {
-    display: block;
-    transform: translate(0);
-    -o-transform: translate(0);
-    -moz-transform: translate(0);
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .slides > article.next {
-    display: block;
-    transform: translate(1020px);
-    -o-transform: translate(1020px);
-    -moz-transform: translate(1020px);
-    -webkit-transform: translate3d(1020px, 0, 0);
-  }
-  .slides > article.far-next {
-    display: block;
-    transform: translate(2040px);
-    -o-transform: translate(2040px);
-    -moz-transform: translate(2040px);
-    -webkit-transform: translate3d(2040px, 0, 0);
-  }
-
-  .slides.layout-widescreen > article.far-past,
-  .slides.layout-faux-widescreen > article.far-past {
-    display: block;
-    transform: translate(-2260px);
-    -o-transform: translate(-2260px);
-    -moz-transform: translate(-2260px);
-    -webkit-transform: translate3d(-2260px, 0, 0);
-  }
-  .slides.layout-widescreen > article.past,
-  .slides.layout-faux-widescreen > article.past {
-    display: block;
-    transform: translate(-1130px);
-    -o-transform: translate(-1130px);
-    -moz-transform: translate(-1130px);
-    -webkit-transform: translate3d(-1130px, 0, 0);
-  }
-  .slides.layout-widescreen > article.current,
-  .slides.layout-faux-widescreen > article.current {
-    display: block;
-    transform: translate(0);
-    -o-transform: translate(0);
-    -moz-transform: translate(0);
-    -webkit-transform: translate3d(0, 0, 0);
-  }
-  .slides.layout-widescreen > article.next,
-  .slides.layout-faux-widescreen > article.next {
-    display: block;
-    transform: translate(1130px);
-    -o-transform: translate(1130px);
-    -moz-transform: translate(1130px);
-    -webkit-transform: translate3d(1130px, 0, 0);
-  }
-  .slides.layout-widescreen > article.far-next,
-  .slides.layout-faux-widescreen > article.far-next {
-    display: block;
-    transform: translate(2260px);
-    -o-transform: translate(2260px);
-    -moz-transform: translate(2260px);
-    -webkit-transform: translate3d(2260px, 0, 0);
-  }
-}
-
-@media print {
-  /* Set page layout */
-  @page {
-    size: A4 landscape;
-  }
-
-  body {
-    display: block !important;
-  }
-
-  .slides > article {
-    display: block;
-
-    position: relative;
-
-    page-break-inside: never;
-    page-break-after: always;
-
-    overflow: hidden;
-  }
-
-  h2 {
-    position: static !important;
-    margin-top: 400px !important;
-    margin-bottom: 100px !important;
-  }
-
-  div.code {
-    background: rgb(240, 240, 240);
-  }
-
-  /* Add explicit links */
-  a:link:after, a:visited:after {
-   content: " (" attr(href) ") ";
-   font-size: 50%;
-  }
-
-  #help {
-    display: none;
-    visibility: hidden;
-  }
-}
-
-/* Styles for slides */
-
-.slides > article {
-  font-family: 'Open Sans', Arial, sans-serif;
-
-  color: black;
-  text-shadow: 0 1px 1px rgba(0, 0, 0, .1);
-
-  font-size: 26px;
-  line-height: 36px;
-
-  letter-spacing: -1px;
-}
-
-b {
-  font-weight: 600;
-}
-
-a {
-  color: rgb(0, 102, 204);
-  text-decoration: none;
-}
-a:visited {
-  color: rgba(0, 102, 204, .75);
-}
-a:hover {
-  color: black;
-}
-
-p {
-  margin: 0;
-  padding: 0;
-
-  margin-top: 20px;
-}
-p:first-child {
-  margin-top: 0;
-}
-
-h1 {
-  font-size: 60px;
-  line-height: 60px;
-
-  padding: 0;
-  margin: 0;
-  margin-top: 200px;
-  margin-bottom: 5px;
-  padding-right: 40px;
-
-  font-weight: 600;
-
-  letter-spacing: -3px;
-
-  color: rgb(51, 51, 51);
-}
-
-h2 {
-  font-size: 45px;
-  line-height: 45px;
-
-  position: absolute;
-  bottom: 150px;
-
-  padding: 0;
-  margin: 0;
-  padding-right: 40px;
-
-  font-weight: 600;
-
-  letter-spacing: -2px;
-
-  color: rgb(51, 51, 51);
-}
-
-h3 {
-  font-size: 30px;
-  line-height: 36px;
-
-  padding: 0;
-  margin: 0;
-  padding-right: 40px;
-
-  font-weight: 600;
-
-  letter-spacing: -1px;
-
-  color: rgb(51, 51, 51);
-}
-
-ul {
-  margin: 0;
-  padding: 0;
-  margin-top: 20px;
-  margin-left: 1.5em;
-}
-li {
-  padding: 0;
-  margin: 0 0 .5em 0;
-}
-
-div.code {
-  padding: 5px 10px;
-  margin-top: 20px;
-  margin-bottom: 20px;
-  overflow: hidden;
-
-  background: rgb(240, 240, 240);
-  border: 1px solid rgb(224, 224, 224);
-}
-pre {
-  margin: 0;
-  padding: 0;
-
-  font-family: 'Droid Sans Mono', 'Courier New', monospace;
-  font-size: 18px;
-  line-height: 24px;
-  letter-spacing: -1px;
-
-  color: black;
-}
-
-pre.numbers span:before {
-  content: attr(num);
-  margin-right: 1em;
-  display: inline-block;
-}
-
-code {
-  font-size: 95%;
-  font-family: 'Droid Sans Mono', 'Courier New', monospace;
-
-  color: black;
-}
-
-article > .image,
-article > .video {
-  text-align: center;
-  margin-top: 40px;
-}
-
-article.background {
-  background-size: contain;
-  background-repeat: round;
-}
-
-table {
-  width: 100%;
-  border-collapse: collapse;
-  margin-top: 40px;
-}
-th {
-  font-weight: 600;
-  text-align: left;
-}
-td,
-th {
-  border: 1px solid rgb(224, 224, 224);
-  padding: 5px 10px;
-  vertical-align: top;
-}
-
-p.link {
-  margin-left: 20px;
-}
-
-/* Code */
-div.code {
-  outline: 0px solid transparent;
-}
-div.playground {
-  position: relative;
-}
-div.output {
-  position: absolute;
-  left: 50%;
-  top: 50%;
-  right: 40px;
-  bottom: 40px;
-  background: #202020;
-  padding: 5px 10px;
-  z-index: 2;
-
-  border-radius: 10px;
-  -o-border-radius: 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-
-}
-div.output pre {
-  margin: 0;
-  padding: 0;
-  background: none;
-  border: none;
-  width: 100%;
-  height: 100%;
-  overflow: auto;
-}
-div.output .stdout, div.output pre {
-  color: #e6e6e6;
-}
-div.output .stderr, div.output .error {
-  color: rgb(255, 200, 200);
-}
-div.output .system, div.output .exit {
-  color: rgb(255, 230, 120)
-}
-.buttons {
-  position: relative;
-  float: right;
-  top: -60px;
-  right: 10px;
-}
-div.output .buttons {
-  position: absolute;
-  float: none;
-  top: auto;
-  right: 5px;
-  bottom: 5px;
-}
-
-/* Presenter details */
-.presenter {
-  margin-top: 20px;
-}
-.presenter p,
-.presenter .link {
-  margin: 0;
-  font-size: 28px;
-  line-height: 1.2em;
-}
-
-/* Output resize details */
-.ui-resizable-handle {
-  position: absolute;
-}
-.ui-resizable-n {
-  cursor: n-resize;
-  height: 7px;
-  width: 100%;
-  top: -5px;
-  left: 0;
-}
-.ui-resizable-w {
-  cursor: w-resize;
-  width: 7px;
-  left: -5px;
-  top: 0;
-  height: 100%;
-}
-.ui-resizable-nw {
-  cursor: nw-resize;
-  width: 9px;
-  height: 9px;
-  left: -5px;
-  top: -5px;
-}
-iframe {
-  border: none;
-}
-figcaption {
-  color: #666;
-  text-align: center;
-  font-size: 0.75em;
-}
-
-#help {
-  font-family: 'Open Sans', Arial, sans-serif;
-  text-align: center;
-  color: white;
-  background: #000;
-  opacity: 0.5;
-  position: fixed;
-  bottom: 25px;
-  left: 50px;
-  right: 50px;
-  padding: 20px;
-
-  border-radius: 10px;
-  -o-border-radius: 10px;
-  -moz-border-radius: 10px;
-  -webkit-border-radius: 10px;
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/templates/action.tmpl b/installer/vendor/golang.org/x/tools/cmd/present/templates/action.tmpl
deleted file mode 100644
index 8bde042c90..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/templates/action.tmpl
+++ /dev/null
@@ -1,62 +0,0 @@
-{/*
-This is the action template.
-It determines how the formatting actions are rendered.
-*/}
-
-{{define "section"}}
-  <h{{len .Number}} id="TOC_{{.FormattedNumber}}">{{.FormattedNumber}} {{.Title}}</h{{len .Number}}>
-  {{range .Elem}}{{elem $.Template .}}{{end}}
-{{end}}
-
-{{define "list"}}
-  <ul>
-  {{range .Bullet}}
-    <li>{{style .}}</li>
-  {{end}}
-  </ul>
-{{end}}
-
-{{define "text"}}
-  {{if .Pre}}
-  <div class="code"><pre>{{range .Lines}}{{.}}{{end}}</pre></div>
-  {{else}}
-  <p>
-    {{range $i, $l := .Lines}}{{if $i}}{{template "newline"}}
-    {{end}}{{style $l}}{{end}}
-  </p>
-  {{end}}
-{{end}}
-
-{{define "code"}}
-  <div class="code{{if playable .}} playground{{end}}" {{if .Edit}}contenteditable="true" spellcheck="false"{{end}}>{{.Text}}</div>
-{{end}}
-
-{{define "image"}}
-<div class="image">
-  <img src="{{.URL}}"{{with .Height}} height="{{.}}"{{end}}{{with .Width}} width="{{.}}"{{end}}>
-</div>
-{{end}}
-
-{{define "video"}}
-<div class="video">
-  <video {{with .Height}} height="{{.}}"{{end}}{{with .Width}} width="{{.}}"{{end}} controls>
-    <source src="{{.URL}}" type="{{.SourceType}}">
-  </video>
-</div>
-{{end}}
-
-{{define "background"}}
-<div class="background">
-  <img src="{{.URL}}">
-</div>
-{{end}}
-
-{{define "iframe"}}
-<iframe src="{{.URL}}"{{with .Height}} height="{{.}}"{{end}}{{with .Width}} width="{{.}}"{{end}}></iframe>
-{{end}}
-
-{{define "link"}}<p class="link"><a href="{{.URL}}" target="_blank">{{style .Label}}</a></p>{{end}}
-
-{{define "html"}}{{.HTML}}{{end}}
-
-{{define "caption"}}<figcaption>{{style .Text}}</figcaption>{{end}}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/templates/article.tmpl b/installer/vendor/golang.org/x/tools/cmd/present/templates/article.tmpl
deleted file mode 100644
index 0a223c63cd..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/templates/article.tmpl
+++ /dev/null
@@ -1,98 +0,0 @@
-{/* This is the article template. It defines how articles are formatted. */}
-
-{{define "root"}}
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>{{.Title}}</title>
-    <link type="text/css" rel="stylesheet" href="/static/article.css">
-    <meta charset='utf-8'>
-    <script>
-      // Initialize Google Analytics tracking code on production site only.
-      if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-        var _gaq = _gaq || [];
-        _gaq.push(["_setAccount", "UA-11222381-6"]);
-        _gaq.push(["b._setAccount", "UA-49880327-6"]);
-        window.trackPageview = function() {
-          _gaq.push(["_trackPageview", location.pathname+location.hash]);
-          _gaq.push(["b._trackPageview", location.pathname+location.hash]);
-        };
-        window.trackPageview();
-        window.trackEvent = function(category, action, opt_label, opt_value, opt_noninteraction) {
-          _gaq.push(["_trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-          _gaq.push(["b._trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-        };
-      }
-    </script>
-  </head>
-
-  <body>
-    <div id="topbar" class="wide">
-      <div class="container">
-        <div id="heading">{{.Title}}
-          {{with .Subtitle}}{{.}}{{end}}
-          {{if .Authors}}
-            {{range .Authors}}
-              <div class="author">
-                {{range .Elem}}{{elem $.Template .}}{{end}}
-              </div>
-            {{end}}
-          {{end}}
-        </div>
-      </div>
-    </div>
-    <div id="page" class="wide">
-      <div class="container">
-        {{with .Sections}}
-          <div id="toc" class="no-print">
-            <div id="tochead">Contents</div>
-            {{template "TOC" .}}
-          </div>
-        {{end}}
-
-        {{range .Sections}}
-          {{elem $.Template .}}
-        {{end}}{{/* of Section block */}}
-
-      </div>
-    </div>
-
-    {{if .PlayEnabled}}
-    <script src='/play.js'></script>
-    {{end}}
-
-    <script>
-      (function() {
-        // Load Google Analytics tracking code on production site only.
-        if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-          var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
-          ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-          var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
-        }
-      })();
-    </script>
-  </body>
-</html>
-{{end}}
-
-{{define "TOC"}}
-  <ul class="toc-outer">
-  {{range .}}
-    <li><a href="#TOC_{{.FormattedNumber}}">{{.Title}}</a></li>
-    {{with .Sections}}{{template "TOC-Inner" .}}{{end}}
-  {{end}}
-  </ul>
-{{end}}
-
-{{define "TOC-Inner"}}
-  <ul class="toc-inner">
-  {{range .}}
-    <li><a href="#TOC_{{.FormattedNumber}}">{{.Title}}</a></li>
-    {{with .Sections}}{{template "TOC-Inner" .}}{{end}}
-  {{end}}
-  </ul>
-{{end}}
-
-{{define "newline"}}
-{{/* No automatic line break. Paragraphs are free-form. */}}
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/templates/dir.tmpl b/installer/vendor/golang.org/x/tools/cmd/present/templates/dir.tmpl
deleted file mode 100644
index 1732623d69..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/templates/dir.tmpl
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-  <title>Talks - The Go Programming Language</title>
-  <link type="text/css" rel="stylesheet" href="/static/dir.css">
-  <script src="/static/dir.js"></script>
-  <script>
-    // Initialize Google Analytics tracking code on production site only.
-    if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-      var _gaq = _gaq || [];
-      _gaq.push(["_setAccount", "UA-11222381-6"]);
-      _gaq.push(["b._setAccount", "UA-49880327-6"]);
-      window.trackPageview = function() {
-        _gaq.push(["_trackPageview", location.pathname+location.hash]);
-        _gaq.push(["b._trackPageview", location.pathname+location.hash]);
-      };
-      window.trackPageview();
-      window.trackEvent = function(category, action, opt_label, opt_value, opt_noninteraction) {
-        _gaq.push(["_trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-        _gaq.push(["b._trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-      };
-    }
-  </script>
-</head>
-<body>
-
-<div id="topbar"><div class="container">
-
-<form method="GET" action="//golang.org/search">
-<div id="menu">
-<a href="http://golang.org/doc/">Documents</a>
-<a href="http://golang.org/ref">References</a>
-<a href="http://golang.org/pkg/">Packages</a>
-<a href="http://golang.org/project/">The Project</a>
-<a href="http://golang.org/help/">Help</a>
-<input type="text" id="search" name="q" class="inactive" value="Search">
-</div>
-<div id="heading"><a href="/">The Go Programming Language</a></div>
-</form>
-
-</div></div>
-
-<div id="page">
-
-  <h1>Go talks</h1>
-
-  {{with .Path}}<h2>{{.}}</h2>{{end}}
-
-  {{with .Articles}}
-  <h4>Articles:</h4>
-  <dl>
-  {{range .}}
-  <dd><a href="/{{.Path}}">{{.Name}}</a>: {{.Title}}</dd>
-  {{end}}
-  </dl>
-  {{end}}
-
-  {{with .Slides}}
-  <h4>Slide decks:</h4>
-  <dl>
-  {{range .}}
-  <dd><a href="/{{.Path}}">{{.Name}}</a>: {{.Title}}</dd>
-  {{end}}
-  </dl>
-  {{end}}
-
-  {{with .Other}}
-  <h4>Files:</h4>
-  <dl>
-  {{range .}}
-  <dd><a href="/{{.Path}}">{{.Name}}</a></dd>
-  {{end}}
-  </dl>
-  {{end}}
-
-  {{with .Dirs}}
-  <h4>Sub-directories:</h4>
-  <dl>
-  {{range .}}
-  <dd><a href="/{{.Path}}">{{.Name}}</a></dd>
-  {{end}}
-  </dl>
-  {{end}}
-
-</div>
-
-<div id="footer">
-Except as <a href="https://developers.google.com/site-policies#restrictions">noted</a>,
-the content of this page is licensed under the
-Creative Commons Attribution 3.0 License,
-and code is licensed under a <a href="http://golang.org/LICENSE">BSD license</a>.<br>
-<a href="http://golang.org/doc/tos.html">Terms of Service</a> |
-<a href="http://www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-</div>
-
-<script>
-  (function() {
-    // Load Google Analytics tracking code on production site only.
-    if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-      var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
-      ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-      var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
-    }
-  })();
-</script>
-</body>
-</html>
diff --git a/installer/vendor/golang.org/x/tools/cmd/present/templates/slides.tmpl b/installer/vendor/golang.org/x/tools/cmd/present/templates/slides.tmpl
deleted file mode 100644
index 37484000c0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/present/templates/slides.tmpl
+++ /dev/null
@@ -1,106 +0,0 @@
-{/* This is the slide template. It defines how presentations are formatted. */}
-
-{{define "root"}}
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>{{.Title}}</title>
-    <meta charset='utf-8'>
-    <script>
-      var notesEnabled = {{.NotesEnabled}};
-    </script>
-    <script src='/static/slides.js'></script>
-
-    {{if .NotesEnabled}}
-    <script>
-      var sections = {{.Sections}};
-      var titleNotes = {{.TitleNotes}}
-    </script>
-    <script src='/static/notes.js'></script>
-    {{end}}
-
-    <script>
-      // Initialize Google Analytics tracking code on production site only.
-      if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-        var _gaq = _gaq || [];
-        _gaq.push(["_setAccount", "UA-11222381-6"]);
-        _gaq.push(["b._setAccount", "UA-49880327-6"]);
-        window.trackPageview = function() {
-          _gaq.push(["_trackPageview", location.pathname+location.hash]);
-          _gaq.push(["b._trackPageview", location.pathname+location.hash]);
-        };
-        window.trackPageview();
-        window.trackEvent = function(category, action, opt_label, opt_value, opt_noninteraction) {
-          _gaq.push(["_trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-          _gaq.push(["b._trackEvent", category, action, opt_label, opt_value, opt_noninteraction]);
-        };
-      }
-    </script>
-  </head>
-
-  <body style='display: none'>
-
-    <section class='slides layout-widescreen'>
-
-      <article>
-        <h1>{{.Title}}</h1>
-        {{with .Subtitle}}<h3>{{.}}</h3>{{end}}
-        {{if not .Time.IsZero}}<h3>{{.Time.Format "2 January 2006"}}</h3>{{end}}
-        {{range .Authors}}
-          <div class="presenter">
-            {{range .TextElem}}{{elem $.Template .}}{{end}}
-          </div>
-        {{end}}
-      </article>
-
-  {{range $i, $s := .Sections}}
-  <!-- start of slide {{$s.Number}} -->
-      <article {{$s.HTMLAttributes}}>
-      {{if $s.Elem}}
-        <h3>{{$s.Title}}</h3>
-        {{range $s.Elem}}{{elem $.Template .}}{{end}}
-      {{else}}
-        <h2>{{$s.Title}}</h2>
-      {{end}}
-      </article>
-  <!-- end of slide {{$i}} -->
-  {{end}}{{/* of Slide block */}}
-
-      <article>
-        <h3>Thank you</h3>
-        {{range .Authors}}
-          <div class="presenter">
-            {{range .Elem}}{{elem $.Template .}}{{end}}
-          </div>
-        {{end}}
-      </article>
-
-    </section>
-
-    <div id="help">
-      Use the left and right arrow keys or click the left and right
-      edges of the page to navigate between slides.<br>
-      (Press 'H' or navigate to hide this message.)
-    </div>
-
-    {{if .PlayEnabled}}
-    <script src='/play.js'></script>
-    {{end}}
-
-    <script>
-      (function() {
-        // Load Google Analytics tracking code on production site only.
-        if (window["location"] && window["location"]["hostname"] == "talks.golang.org") {
-          var ga = document.createElement("script"); ga.type = "text/javascript"; ga.async = true;
-          ga.src = ("https:" == document.location.protocol ? "https://ssl" : "http://www") + ".google-analytics.com/ga.js";
-          var s = document.getElementsByTagName("script")[0]; s.parentNode.insertBefore(ga, s);
-        }
-      })();
-    </script>
-  </body>
-</html>
-{{end}}
-
-{{define "newline"}}
-<br>
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/cmd/ssadump/main.go b/installer/vendor/golang.org/x/tools/cmd/ssadump/main.go
deleted file mode 100644
index 3d1dea140f..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/ssadump/main.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// ssadump: a tool for displaying and interpreting the SSA form of Go programs.
-package main // import "golang.org/x/tools/cmd/ssadump"
-
-import (
-	"flag"
-	"fmt"
-	"go/build"
-	"go/types"
-	"os"
-	"runtime"
-	"runtime/pprof"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/interp"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// flags
-var (
-	mode = ssa.BuilderMode(0)
-
-	testFlag = flag.Bool("test", false, "Loads test code (*_test.go) for imported packages.")
-
-	runFlag = flag.Bool("run", false, "Invokes the SSA interpreter on the program.")
-
-	interpFlag = flag.String("interp", "", `Options controlling the SSA test interpreter.
-The value is a sequence of zero or more more of these letters:
-R	disable [R]ecover() from panic; show interpreter crash instead.
-T	[T]race execution of the program.  Best for single-threaded programs!
-`)
-
-	cpuprofile = flag.String("cpuprofile", "", "write cpu profile to file")
-)
-
-func init() {
-	flag.Var(&mode, "build", ssa.BuilderModeDoc)
-	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-}
-
-const usage = `SSA builder and interpreter.
-Usage: ssadump [<flag> ...] <args> ...
-Use -help flag to display options.
-
-Examples:
-% ssadump -build=F hello.go              # dump SSA form of a single package
-% ssadump -run -interp=T hello.go        # interpret a program, with tracing
-% ssadump -run -test unicode -- -test.v  # interpret the unicode package's tests, verbosely
-` + loader.FromArgsUsage +
-	`
-When -run is specified, ssadump will run the program.
-The entry point depends on the -test flag:
-if clear, it runs the first package named main.
-if set, it runs the tests of each package.
-`
-
-func main() {
-	if err := doMain(); err != nil {
-		fmt.Fprintf(os.Stderr, "ssadump: %s\n", err)
-		os.Exit(1)
-	}
-}
-
-func doMain() error {
-	flag.Parse()
-	args := flag.Args()
-
-	conf := loader.Config{Build: &build.Default}
-
-	// Choose types.Sizes from conf.Build.
-	var wordSize int64 = 8
-	switch conf.Build.GOARCH {
-	case "386", "arm":
-		wordSize = 4
-	}
-	conf.TypeChecker.Sizes = &types.StdSizes{
-		MaxAlign: 8,
-		WordSize: wordSize,
-	}
-
-	var interpMode interp.Mode
-	for _, c := range *interpFlag {
-		switch c {
-		case 'T':
-			interpMode |= interp.EnableTracing
-		case 'R':
-			interpMode |= interp.DisableRecover
-		default:
-			return fmt.Errorf("unknown -interp option: '%c'", c)
-		}
-	}
-
-	if len(args) == 0 {
-		fmt.Fprint(os.Stderr, usage)
-		os.Exit(1)
-	}
-
-	// Profiling support.
-	if *cpuprofile != "" {
-		f, err := os.Create(*cpuprofile)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-			os.Exit(1)
-		}
-		pprof.StartCPUProfile(f)
-		defer pprof.StopCPUProfile()
-	}
-
-	// Use the initial packages from the command line.
-	args, err := conf.FromArgs(args, *testFlag)
-	if err != nil {
-		return err
-	}
-
-	// The interpreter needs the runtime package.
-	if *runFlag {
-		conf.Import("runtime")
-	}
-
-	// Load, parse and type-check the whole program.
-	lprog, err := conf.Load()
-	if err != nil {
-		return err
-	}
-
-	// Create and build SSA-form program representation.
-	prog := ssautil.CreateProgram(lprog, mode)
-
-	// Build and display only the initial packages
-	// (and synthetic wrappers), unless -run is specified.
-	var initpkgs []*ssa.Package
-	for _, info := range lprog.InitialPackages() {
-		ssapkg := prog.Package(info.Pkg)
-		ssapkg.Build()
-		if info.Pkg.Path() != "runtime" {
-			initpkgs = append(initpkgs, ssapkg)
-		}
-	}
-
-	// Run the interpreter.
-	if *runFlag {
-		prog.Build()
-
-		var mains []*ssa.Package
-		if *testFlag {
-			// If -test, run the tests.
-			for _, pkg := range initpkgs {
-				if main := prog.CreateTestMainPackage(pkg); main != nil {
-					mains = append(mains, main)
-				}
-			}
-			if mains == nil {
-				return fmt.Errorf("no tests")
-			}
-		} else {
-			// Otherwise, run the main packages.
-			mains = ssautil.MainPackages(initpkgs)
-			if len(mains) == 0 {
-				return fmt.Errorf("no main package")
-			}
-		}
-
-		if runtime.GOARCH != build.Default.GOARCH {
-			return fmt.Errorf("cross-interpretation is not supported (target has GOARCH %s, interpreter has %s)",
-				build.Default.GOARCH, runtime.GOARCH)
-		}
-
-		for _, main := range mains {
-			if len(mains) > 1 {
-				fmt.Fprintf(os.Stderr, "Running: %s\n", main.Pkg.Path())
-			}
-			interp.Interpret(main, interpMode, conf.TypeChecker.Sizes, main.Pkg.Path(), args)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stress/stress.go b/installer/vendor/golang.org/x/tools/cmd/stress/stress.go
deleted file mode 100644
index ee68917cba..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stress/stress.go
+++ /dev/null
@@ -1,133 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !plan9
-
-// The stress utility is intended for catching sporadic failures.
-// It runs a given process in parallel in a loop and collects any failures.
-// Usage:
-// 	$ stress ./fmt.test -test.run=TestSometing -test.cpu=10
-// You can also specify a number of parallel processes with -p flag;
-// instruct the utility to not kill hanged processes for gdb attach;
-// or specify the failure output you are looking for (if you want to
-// ignore some other sporadic failures).
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"regexp"
-	"runtime"
-	"syscall"
-	"time"
-)
-
-var (
-	flagP       = flag.Int("p", runtime.NumCPU(), "run `N` processes in parallel")
-	flagTimeout = flag.Duration("timeout", 10*time.Minute, "timeout each process after `duration`")
-	flagKill    = flag.Bool("kill", true, "kill timed out processes if true, otherwise just print pid (to attach with gdb)")
-	flagFailure = flag.String("failure", "", "fail only if output matches `regexp`")
-	flagIgnore  = flag.String("ignore", "", "ignore failure if output matches `regexp`")
-)
-
-func init() {
-	flag.Usage = func() {
-		os.Stderr.WriteString(`The stress utility is intended for catching sporadic failures.
-It runs a given process in parallel in a loop and collects any failures.
-Usage:
-
-	$ stress ./fmt.test -test.run=TestSometing -test.cpu=10
-
-`)
-		flag.PrintDefaults()
-	}
-}
-
-func main() {
-	flag.Parse()
-	if *flagP <= 0 || *flagTimeout <= 0 || len(flag.Args()) == 0 {
-		flag.Usage()
-		os.Exit(1)
-	}
-	var failureRe, ignoreRe *regexp.Regexp
-	if *flagFailure != "" {
-		var err error
-		if failureRe, err = regexp.Compile(*flagFailure); err != nil {
-			fmt.Println("bad failure regexp:", err)
-			os.Exit(1)
-		}
-	}
-	if *flagIgnore != "" {
-		var err error
-		if ignoreRe, err = regexp.Compile(*flagIgnore); err != nil {
-			fmt.Println("bad ignore regexp:", err)
-			os.Exit(1)
-		}
-	}
-	res := make(chan []byte)
-	for i := 0; i < *flagP; i++ {
-		go func() {
-			for {
-				cmd := exec.Command(flag.Args()[0], flag.Args()[1:]...)
-				done := make(chan bool)
-				if *flagTimeout > 0 {
-					go func() {
-						select {
-						case <-done:
-							return
-						case <-time.After(*flagTimeout):
-						}
-						if !*flagKill {
-							fmt.Printf("process %v timed out\n", cmd.Process.Pid)
-							return
-						}
-						cmd.Process.Signal(syscall.SIGABRT)
-						select {
-						case <-done:
-							return
-						case <-time.After(10 * time.Second):
-						}
-						cmd.Process.Kill()
-					}()
-				}
-				out, err := cmd.CombinedOutput()
-				close(done)
-				if err != nil && (failureRe == nil || failureRe.Match(out)) && (ignoreRe == nil || !ignoreRe.Match(out)) {
-					out = append(out, fmt.Sprintf("\n\nERROR: %v\n", err)...)
-				} else {
-					out = []byte{}
-				}
-				res <- out
-			}
-		}()
-	}
-	runs, fails := 0, 0
-	ticker := time.NewTicker(5 * time.Second).C
-	for {
-		select {
-		case out := <-res:
-			runs++
-			if len(out) == 0 {
-				continue
-			}
-			fails++
-			f, err := ioutil.TempFile("", "go-stress")
-			if err != nil {
-				fmt.Printf("failed to create temp file: %v\n", err)
-				os.Exit(1)
-			}
-			f.Write(out)
-			f.Close()
-			if len(out) > 2<<10 {
-				out = out[:2<<10]
-			}
-			fmt.Printf("\n%s\n%s\n", f.Name(), out)
-		case <-ticker:
-			fmt.Printf("%v runs so far, %v failures\n", runs, fails)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/endtoend_test.go b/installer/vendor/golang.org/x/tools/cmd/stringer/endtoend_test.go
deleted file mode 100644
index a1db27aed5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/endtoend_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// go command is not available on android
-
-// +build !android
-
-package main
-
-import (
-	"fmt"
-	"go/build"
-	"io"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-	"testing"
-)
-
-// This file contains a test that compiles and runs each program in testdata
-// after generating the string method for its type. The rule is that for testdata/x.go
-// we run stringer -type X and then compile and run the program. The resulting
-// binary panics if the String method for X is not correct, including for error cases.
-
-func TestEndToEnd(t *testing.T) {
-	dir, err := ioutil.TempDir("", "stringer")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-	// Create stringer in temporary directory.
-	stringer := filepath.Join(dir, "stringer.exe")
-	err = run("go", "build", "-o", stringer)
-	if err != nil {
-		t.Fatalf("building stringer: %s", err)
-	}
-	// Read the testdata directory.
-	fd, err := os.Open("testdata")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer fd.Close()
-	names, err := fd.Readdirnames(-1)
-	if err != nil {
-		t.Fatalf("Readdirnames: %s", err)
-	}
-	// Generate, compile, and run the test programs.
-	for _, name := range names {
-		if !strings.HasSuffix(name, ".go") {
-			t.Errorf("%s is not a Go file", name)
-			continue
-		}
-		if name == "cgo.go" && !build.Default.CgoEnabled {
-			t.Logf("cgo is no enabled for %s", name)
-			continue
-		}
-		// Names are known to be ASCII and long enough.
-		typeName := fmt.Sprintf("%c%s", name[0]+'A'-'a', name[1:len(name)-len(".go")])
-		stringerCompileAndRun(t, dir, stringer, typeName, name)
-	}
-}
-
-// stringerCompileAndRun runs stringer for the named file and compiles and
-// runs the target binary in directory dir. That binary will panic if the String method is incorrect.
-func stringerCompileAndRun(t *testing.T, dir, stringer, typeName, fileName string) {
-	t.Logf("run: %s %s\n", fileName, typeName)
-	source := filepath.Join(dir, fileName)
-	err := copy(source, filepath.Join("testdata", fileName))
-	if err != nil {
-		t.Fatalf("copying file to temporary directory: %s", err)
-	}
-	stringSource := filepath.Join(dir, typeName+"_string.go")
-	// Run stringer in temporary directory.
-	err = run(stringer, "-type", typeName, "-output", stringSource, source)
-	if err != nil {
-		t.Fatal(err)
-	}
-	// Run the binary in the temporary directory.
-	err = run("go", "run", stringSource, source)
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// copy copies the from file to the to file.
-func copy(to, from string) error {
-	toFd, err := os.Create(to)
-	if err != nil {
-		return err
-	}
-	defer toFd.Close()
-	fromFd, err := os.Open(from)
-	if err != nil {
-		return err
-	}
-	defer fromFd.Close()
-	_, err = io.Copy(toFd, fromFd)
-	return err
-}
-
-// run runs a single command and returns an error if it does not succeed.
-// os/exec should have this function, to be honest.
-func run(name string, arg ...string) error {
-	cmd := exec.Command(name, arg...)
-	cmd.Stdout = os.Stdout
-	cmd.Stderr = os.Stderr
-	return cmd.Run()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/golden_test.go b/installer/vendor/golang.org/x/tools/cmd/stringer/golden_test.go
deleted file mode 100644
index 12df238fa0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/golden_test.go
+++ /dev/null
@@ -1,258 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains simple golden tests for various examples.
-// Besides validating the results when the implementation changes,
-// it provides a way to look at the generated code without having
-// to execute the print statements in one's head.
-
-package main
-
-import (
-	"strings"
-	"testing"
-)
-
-// Golden represents a test case.
-type Golden struct {
-	name   string
-	input  string // input; the package clause is provided when running the test.
-	output string // exected output.
-}
-
-var golden = []Golden{
-	{"day", day_in, day_out},
-	{"offset", offset_in, offset_out},
-	{"gap", gap_in, gap_out},
-	{"num", num_in, num_out},
-	{"unum", unum_in, unum_out},
-	{"prime", prime_in, prime_out},
-}
-
-// Each example starts with "type XXX [u]int", with a single space separating them.
-
-// Simple test: enumeration of type int starting at 0.
-const day_in = `type Day int
-const (
-	Monday Day = iota
-	Tuesday
-	Wednesday
-	Thursday
-	Friday
-	Saturday
-	Sunday
-)
-`
-
-const day_out = `
-const _Day_name = "MondayTuesdayWednesdayThursdayFridaySaturdaySunday"
-
-var _Day_index = [...]uint8{0, 6, 13, 22, 30, 36, 44, 50}
-
-func (i Day) String() string {
-	if i < 0 || i >= Day(len(_Day_index)-1) {
-		return fmt.Sprintf("Day(%d)", i)
-	}
-	return _Day_name[_Day_index[i]:_Day_index[i+1]]
-}
-`
-
-// Enumeration with an offset.
-// Also includes a duplicate.
-const offset_in = `type Number int
-const (
-	_ Number = iota
-	One
-	Two
-	Three
-	AnotherOne = One  // Duplicate; note that AnotherOne doesn't appear below.
-)
-`
-
-const offset_out = `
-const _Number_name = "OneTwoThree"
-
-var _Number_index = [...]uint8{0, 3, 6, 11}
-
-func (i Number) String() string {
-	i -= 1
-	if i < 0 || i >= Number(len(_Number_index)-1) {
-		return fmt.Sprintf("Number(%d)", i+1)
-	}
-	return _Number_name[_Number_index[i]:_Number_index[i+1]]
-}
-`
-
-// Gaps and an offset.
-const gap_in = `type Gap int
-const (
-	Two Gap = 2
-	Three Gap = 3
-	Five Gap = 5
-	Six Gap = 6
-	Seven Gap = 7
-	Eight Gap = 8
-	Nine Gap = 9
-	Eleven Gap = 11
-)
-`
-
-const gap_out = `
-const (
-	_Gap_name_0 = "TwoThree"
-	_Gap_name_1 = "FiveSixSevenEightNine"
-	_Gap_name_2 = "Eleven"
-)
-
-var (
-	_Gap_index_0 = [...]uint8{0, 3, 8}
-	_Gap_index_1 = [...]uint8{0, 4, 7, 12, 17, 21}
-	_Gap_index_2 = [...]uint8{0, 6}
-)
-
-func (i Gap) String() string {
-	switch {
-	case 2 <= i && i <= 3:
-		i -= 2
-		return _Gap_name_0[_Gap_index_0[i]:_Gap_index_0[i+1]]
-	case 5 <= i && i <= 9:
-		i -= 5
-		return _Gap_name_1[_Gap_index_1[i]:_Gap_index_1[i+1]]
-	case i == 11:
-		return _Gap_name_2
-	default:
-		return fmt.Sprintf("Gap(%d)", i)
-	}
-}
-`
-
-// Signed integers spanning zero.
-const num_in = `type Num int
-const (
-	m_2 Num = -2 + iota
-	m_1
-	m0
-	m1
-	m2
-)
-`
-
-const num_out = `
-const _Num_name = "m_2m_1m0m1m2"
-
-var _Num_index = [...]uint8{0, 3, 6, 8, 10, 12}
-
-func (i Num) String() string {
-	i -= -2
-	if i < 0 || i >= Num(len(_Num_index)-1) {
-		return fmt.Sprintf("Num(%d)", i+-2)
-	}
-	return _Num_name[_Num_index[i]:_Num_index[i+1]]
-}
-`
-
-// Unsigned integers spanning zero.
-const unum_in = `type Unum uint
-const (
-	m_2 Unum = iota + 253
-	m_1
-)
-
-const (
-	m0 Unum = iota
-	m1
-	m2
-)
-`
-
-const unum_out = `
-const (
-	_Unum_name_0 = "m0m1m2"
-	_Unum_name_1 = "m_2m_1"
-)
-
-var (
-	_Unum_index_0 = [...]uint8{0, 2, 4, 6}
-	_Unum_index_1 = [...]uint8{0, 3, 6}
-)
-
-func (i Unum) String() string {
-	switch {
-	case 0 <= i && i <= 2:
-		return _Unum_name_0[_Unum_index_0[i]:_Unum_index_0[i+1]]
-	case 253 <= i && i <= 254:
-		i -= 253
-		return _Unum_name_1[_Unum_index_1[i]:_Unum_index_1[i+1]]
-	default:
-		return fmt.Sprintf("Unum(%d)", i)
-	}
-}
-`
-
-// Enough gaps to trigger a map implementation of the method.
-// Also includes a duplicate to test that it doesn't cause problems
-const prime_in = `type Prime int
-const (
-	p2 Prime = 2
-	p3 Prime = 3
-	p5 Prime = 5
-	p7 Prime = 7
-	p77 Prime = 7 // Duplicate; note that p77 doesn't appear below.
-	p11 Prime = 11
-	p13 Prime = 13
-	p17 Prime = 17
-	p19 Prime = 19
-	p23 Prime = 23
-	p29 Prime = 29
-	p37 Prime = 31
-	p41 Prime = 41
-	p43 Prime = 43
-)
-`
-
-const prime_out = `
-const _Prime_name = "p2p3p5p7p11p13p17p19p23p29p37p41p43"
-
-var _Prime_map = map[Prime]string{
-	2:  _Prime_name[0:2],
-	3:  _Prime_name[2:4],
-	5:  _Prime_name[4:6],
-	7:  _Prime_name[6:8],
-	11: _Prime_name[8:11],
-	13: _Prime_name[11:14],
-	17: _Prime_name[14:17],
-	19: _Prime_name[17:20],
-	23: _Prime_name[20:23],
-	29: _Prime_name[23:26],
-	31: _Prime_name[26:29],
-	41: _Prime_name[29:32],
-	43: _Prime_name[32:35],
-}
-
-func (i Prime) String() string {
-	if str, ok := _Prime_map[i]; ok {
-		return str
-	}
-	return fmt.Sprintf("Prime(%d)", i)
-}
-`
-
-func TestGolden(t *testing.T) {
-	for _, test := range golden {
-		var g Generator
-		input := "package test\n" + test.input
-		file := test.name + ".go"
-		g.parsePackage(".", []string{file}, input)
-		// Extract the name and type of the constant from the first line.
-		tokens := strings.SplitN(test.input, " ", 3)
-		if len(tokens) != 3 {
-			t.Fatalf("%s: need type declaration on first line", test.name)
-		}
-		g.generate(tokens[1])
-		got := string(g.format())
-		if got != test.output {
-			t.Errorf("%s: got\n====\n%s====\nexpected\n====%s", test.name, got, test.output)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/importer18.go b/installer/vendor/golang.org/x/tools/cmd/stringer/importer18.go
deleted file mode 100644
index fd21873cda..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/importer18.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !go1.9
-
-package main
-
-import (
-	"go/importer"
-	"go/types"
-)
-
-func defaultImporter() types.Importer {
-	return importer.Default()
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/importer19.go b/installer/vendor/golang.org/x/tools/cmd/stringer/importer19.go
deleted file mode 100644
index deddadb1f1..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/importer19.go
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package main
-
-import (
-	"go/importer"
-	"go/types"
-)
-
-func defaultImporter() types.Importer {
-	return importer.For("source", nil)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/stringer.go b/installer/vendor/golang.org/x/tools/cmd/stringer/stringer.go
deleted file mode 100644
index f741d98c33..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/stringer.go
+++ /dev/null
@@ -1,635 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Stringer is a tool to automate the creation of methods that satisfy the fmt.Stringer
-// interface. Given the name of a (signed or unsigned) integer type T that has constants
-// defined, stringer will create a new self-contained Go source file implementing
-//	func (t T) String() string
-// The file is created in the same package and directory as the package that defines T.
-// It has helpful defaults designed for use with go generate.
-//
-// Stringer works best with constants that are consecutive values such as created using iota,
-// but creates good code regardless. In the future it might also provide custom support for
-// constant sets that are bit patterns.
-//
-// For example, given this snippet,
-//
-//	package painkiller
-//
-//	type Pill int
-//
-//	const (
-//		Placebo Pill = iota
-//		Aspirin
-//		Ibuprofen
-//		Paracetamol
-//		Acetaminophen = Paracetamol
-//	)
-//
-// running this command
-//
-//	stringer -type=Pill
-//
-// in the same directory will create the file pill_string.go, in package painkiller,
-// containing a definition of
-//
-//	func (Pill) String() string
-//
-// That method will translate the value of a Pill constant to the string representation
-// of the respective constant name, so that the call fmt.Print(painkiller.Aspirin) will
-// print the string "Aspirin".
-//
-// Typically this process would be run using go generate, like this:
-//
-//	//go:generate stringer -type=Pill
-//
-// If multiple constants have the same value, the lexically first matching name will
-// be used (in the example, Acetaminophen will print as "Paracetamol").
-//
-// With no arguments, it processes the package in the current directory.
-// Otherwise, the arguments must name a single directory holding a Go package
-// or a set of Go source files that represent a single Go package.
-//
-// The -type flag accepts a comma-separated list of types so a single run can
-// generate methods for multiple types. The default output file is t_string.go,
-// where t is the lower-cased name of the first type listed. It can be overridden
-// with the -output flag.
-//
-package main // import "golang.org/x/tools/cmd/stringer"
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"go/ast"
-	"go/build"
-	exact "go/constant"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-)
-
-var (
-	typeNames = flag.String("type", "", "comma-separated list of type names; must be set")
-	output    = flag.String("output", "", "output file name; default srcdir/<type>_string.go")
-)
-
-// Usage is a replacement usage function for the flags package.
-func Usage() {
-	fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
-	fmt.Fprintf(os.Stderr, "\tstringer [flags] -type T [directory]\n")
-	fmt.Fprintf(os.Stderr, "\tstringer [flags] -type T files... # Must be a single package\n")
-	fmt.Fprintf(os.Stderr, "For more information, see:\n")
-	fmt.Fprintf(os.Stderr, "\thttp://godoc.org/golang.org/x/tools/cmd/stringer\n")
-	fmt.Fprintf(os.Stderr, "Flags:\n")
-	flag.PrintDefaults()
-}
-
-func main() {
-	log.SetFlags(0)
-	log.SetPrefix("stringer: ")
-	flag.Usage = Usage
-	flag.Parse()
-	if len(*typeNames) == 0 {
-		flag.Usage()
-		os.Exit(2)
-	}
-	types := strings.Split(*typeNames, ",")
-
-	// We accept either one directory or a list of files. Which do we have?
-	args := flag.Args()
-	if len(args) == 0 {
-		// Default: process whole package in current directory.
-		args = []string{"."}
-	}
-
-	// Parse the package once.
-	var (
-		dir string
-		g   Generator
-	)
-	if len(args) == 1 && isDirectory(args[0]) {
-		dir = args[0]
-		g.parsePackageDir(args[0])
-	} else {
-		dir = filepath.Dir(args[0])
-		g.parsePackageFiles(args)
-	}
-
-	// Print the header and package clause.
-	g.Printf("// Code generated by \"stringer %s\"; DO NOT EDIT.\n", strings.Join(os.Args[1:], " "))
-	g.Printf("\n")
-	g.Printf("package %s", g.pkg.name)
-	g.Printf("\n")
-	g.Printf("import \"fmt\"\n") // Used by all methods.
-
-	// Run generate for each type.
-	for _, typeName := range types {
-		g.generate(typeName)
-	}
-
-	// Format the output.
-	src := g.format()
-
-	// Write to file.
-	outputName := *output
-	if outputName == "" {
-		baseName := fmt.Sprintf("%s_string.go", types[0])
-		outputName = filepath.Join(dir, strings.ToLower(baseName))
-	}
-	err := ioutil.WriteFile(outputName, src, 0644)
-	if err != nil {
-		log.Fatalf("writing output: %s", err)
-	}
-}
-
-// isDirectory reports whether the named file is a directory.
-func isDirectory(name string) bool {
-	info, err := os.Stat(name)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return info.IsDir()
-}
-
-// Generator holds the state of the analysis. Primarily used to buffer
-// the output for format.Source.
-type Generator struct {
-	buf bytes.Buffer // Accumulated output.
-	pkg *Package     // Package we are scanning.
-}
-
-func (g *Generator) Printf(format string, args ...interface{}) {
-	fmt.Fprintf(&g.buf, format, args...)
-}
-
-// File holds a single parsed file and associated data.
-type File struct {
-	pkg  *Package  // Package to which this file belongs.
-	file *ast.File // Parsed AST.
-	// These fields are reset for each type being generated.
-	typeName string  // Name of the constant type.
-	values   []Value // Accumulator for constant values of that type.
-}
-
-type Package struct {
-	dir      string
-	name     string
-	defs     map[*ast.Ident]types.Object
-	files    []*File
-	typesPkg *types.Package
-}
-
-// parsePackageDir parses the package residing in the directory.
-func (g *Generator) parsePackageDir(directory string) {
-	pkg, err := build.Default.ImportDir(directory, 0)
-	if err != nil {
-		log.Fatalf("cannot process directory %s: %s", directory, err)
-	}
-	var names []string
-	names = append(names, pkg.GoFiles...)
-	names = append(names, pkg.CgoFiles...)
-	// TODO: Need to think about constants in test files. Maybe write type_string_test.go
-	// in a separate pass? For later.
-	// names = append(names, pkg.TestGoFiles...) // These are also in the "foo" package.
-	names = append(names, pkg.SFiles...)
-	names = prefixDirectory(directory, names)
-	g.parsePackage(directory, names, nil)
-}
-
-// parsePackageFiles parses the package occupying the named files.
-func (g *Generator) parsePackageFiles(names []string) {
-	g.parsePackage(".", names, nil)
-}
-
-// prefixDirectory places the directory name on the beginning of each name in the list.
-func prefixDirectory(directory string, names []string) []string {
-	if directory == "." {
-		return names
-	}
-	ret := make([]string, len(names))
-	for i, name := range names {
-		ret[i] = filepath.Join(directory, name)
-	}
-	return ret
-}
-
-// parsePackage analyzes the single package constructed from the named files.
-// If text is non-nil, it is a string to be used instead of the content of the file,
-// to be used for testing. parsePackage exits if there is an error.
-func (g *Generator) parsePackage(directory string, names []string, text interface{}) {
-	var files []*File
-	var astFiles []*ast.File
-	g.pkg = new(Package)
-	fs := token.NewFileSet()
-	for _, name := range names {
-		if !strings.HasSuffix(name, ".go") {
-			continue
-		}
-		parsedFile, err := parser.ParseFile(fs, name, text, 0)
-		if err != nil {
-			log.Fatalf("parsing package: %s: %s", name, err)
-		}
-		astFiles = append(astFiles, parsedFile)
-		files = append(files, &File{
-			file: parsedFile,
-			pkg:  g.pkg,
-		})
-	}
-	if len(astFiles) == 0 {
-		log.Fatalf("%s: no buildable Go files", directory)
-	}
-	g.pkg.name = astFiles[0].Name.Name
-	g.pkg.files = files
-	g.pkg.dir = directory
-	// Type check the package.
-	g.pkg.check(fs, astFiles)
-}
-
-// check type-checks the package. The package must be OK to proceed.
-func (pkg *Package) check(fs *token.FileSet, astFiles []*ast.File) {
-	pkg.defs = make(map[*ast.Ident]types.Object)
-	config := types.Config{Importer: defaultImporter(), FakeImportC: true}
-	info := &types.Info{
-		Defs: pkg.defs,
-	}
-	typesPkg, err := config.Check(pkg.dir, fs, astFiles, info)
-	if err != nil {
-		log.Fatalf("checking package: %s", err)
-	}
-	pkg.typesPkg = typesPkg
-}
-
-// generate produces the String method for the named type.
-func (g *Generator) generate(typeName string) {
-	values := make([]Value, 0, 100)
-	for _, file := range g.pkg.files {
-		// Set the state for this run of the walker.
-		file.typeName = typeName
-		file.values = nil
-		if file.file != nil {
-			ast.Inspect(file.file, file.genDecl)
-			values = append(values, file.values...)
-		}
-	}
-
-	if len(values) == 0 {
-		log.Fatalf("no values defined for type %s", typeName)
-	}
-	runs := splitIntoRuns(values)
-	// The decision of which pattern to use depends on the number of
-	// runs in the numbers. If there's only one, it's easy. For more than
-	// one, there's a tradeoff between complexity and size of the data
-	// and code vs. the simplicity of a map. A map takes more space,
-	// but so does the code. The decision here (crossover at 10) is
-	// arbitrary, but considers that for large numbers of runs the cost
-	// of the linear scan in the switch might become important, and
-	// rather than use yet another algorithm such as binary search,
-	// we punt and use a map. In any case, the likelihood of a map
-	// being necessary for any realistic example other than bitmasks
-	// is very low. And bitmasks probably deserve their own analysis,
-	// to be done some other day.
-	switch {
-	case len(runs) == 1:
-		g.buildOneRun(runs, typeName)
-	case len(runs) <= 10:
-		g.buildMultipleRuns(runs, typeName)
-	default:
-		g.buildMap(runs, typeName)
-	}
-}
-
-// splitIntoRuns breaks the values into runs of contiguous sequences.
-// For example, given 1,2,3,5,6,7 it returns {1,2,3},{5,6,7}.
-// The input slice is known to be non-empty.
-func splitIntoRuns(values []Value) [][]Value {
-	// We use stable sort so the lexically first name is chosen for equal elements.
-	sort.Stable(byValue(values))
-	// Remove duplicates. Stable sort has put the one we want to print first,
-	// so use that one. The String method won't care about which named constant
-	// was the argument, so the first name for the given value is the only one to keep.
-	// We need to do this because identical values would cause the switch or map
-	// to fail to compile.
-	j := 1
-	for i := 1; i < len(values); i++ {
-		if values[i].value != values[i-1].value {
-			values[j] = values[i]
-			j++
-		}
-	}
-	values = values[:j]
-	runs := make([][]Value, 0, 10)
-	for len(values) > 0 {
-		// One contiguous sequence per outer loop.
-		i := 1
-		for i < len(values) && values[i].value == values[i-1].value+1 {
-			i++
-		}
-		runs = append(runs, values[:i])
-		values = values[i:]
-	}
-	return runs
-}
-
-// format returns the gofmt-ed contents of the Generator's buffer.
-func (g *Generator) format() []byte {
-	src, err := format.Source(g.buf.Bytes())
-	if err != nil {
-		// Should never happen, but can arise when developing this code.
-		// The user can compile the output to see the error.
-		log.Printf("warning: internal error: invalid Go generated: %s", err)
-		log.Printf("warning: compile the package to analyze the error")
-		return g.buf.Bytes()
-	}
-	return src
-}
-
-// Value represents a declared constant.
-type Value struct {
-	name string // The name of the constant.
-	// The value is stored as a bit pattern alone. The boolean tells us
-	// whether to interpret it as an int64 or a uint64; the only place
-	// this matters is when sorting.
-	// Much of the time the str field is all we need; it is printed
-	// by Value.String.
-	value  uint64 // Will be converted to int64 when needed.
-	signed bool   // Whether the constant is a signed type.
-	str    string // The string representation given by the "go/exact" package.
-}
-
-func (v *Value) String() string {
-	return v.str
-}
-
-// byValue lets us sort the constants into increasing order.
-// We take care in the Less method to sort in signed or unsigned order,
-// as appropriate.
-type byValue []Value
-
-func (b byValue) Len() int      { return len(b) }
-func (b byValue) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
-func (b byValue) Less(i, j int) bool {
-	if b[i].signed {
-		return int64(b[i].value) < int64(b[j].value)
-	}
-	return b[i].value < b[j].value
-}
-
-// genDecl processes one declaration clause.
-func (f *File) genDecl(node ast.Node) bool {
-	decl, ok := node.(*ast.GenDecl)
-	if !ok || decl.Tok != token.CONST {
-		// We only care about const declarations.
-		return true
-	}
-	// The name of the type of the constants we are declaring.
-	// Can change if this is a multi-element declaration.
-	typ := ""
-	// Loop over the elements of the declaration. Each element is a ValueSpec:
-	// a list of names possibly followed by a type, possibly followed by values.
-	// If the type and value are both missing, we carry down the type (and value,
-	// but the "go/types" package takes care of that).
-	for _, spec := range decl.Specs {
-		vspec := spec.(*ast.ValueSpec) // Guaranteed to succeed as this is CONST.
-		if vspec.Type == nil && len(vspec.Values) > 0 {
-			// "X = 1". With no type but a value, the constant is untyped.
-			// Skip this vspec and reset the remembered type.
-			typ = ""
-			continue
-		}
-		if vspec.Type != nil {
-			// "X T". We have a type. Remember it.
-			ident, ok := vspec.Type.(*ast.Ident)
-			if !ok {
-				continue
-			}
-			typ = ident.Name
-		}
-		if typ != f.typeName {
-			// This is not the type we're looking for.
-			continue
-		}
-		// We now have a list of names (from one line of source code) all being
-		// declared with the desired type.
-		// Grab their names and actual values and store them in f.values.
-		for _, name := range vspec.Names {
-			if name.Name == "_" {
-				continue
-			}
-			// This dance lets the type checker find the values for us. It's a
-			// bit tricky: look up the object declared by the name, find its
-			// types.Const, and extract its value.
-			obj, ok := f.pkg.defs[name]
-			if !ok {
-				log.Fatalf("no value for constant %s", name)
-			}
-			info := obj.Type().Underlying().(*types.Basic).Info()
-			if info&types.IsInteger == 0 {
-				log.Fatalf("can't handle non-integer constant type %s", typ)
-			}
-			value := obj.(*types.Const).Val() // Guaranteed to succeed as this is CONST.
-			if value.Kind() != exact.Int {
-				log.Fatalf("can't happen: constant is not an integer %s", name)
-			}
-			i64, isInt := exact.Int64Val(value)
-			u64, isUint := exact.Uint64Val(value)
-			if !isInt && !isUint {
-				log.Fatalf("internal error: value of %s is not an integer: %s", name, value.String())
-			}
-			if !isInt {
-				u64 = uint64(i64)
-			}
-			v := Value{
-				name:   name.Name,
-				value:  u64,
-				signed: info&types.IsUnsigned == 0,
-				str:    value.String(),
-			}
-			f.values = append(f.values, v)
-		}
-	}
-	return false
-}
-
-// Helpers
-
-// usize returns the number of bits of the smallest unsigned integer
-// type that will hold n. Used to create the smallest possible slice of
-// integers to use as indexes into the concatenated strings.
-func usize(n int) int {
-	switch {
-	case n < 1<<8:
-		return 8
-	case n < 1<<16:
-		return 16
-	default:
-		// 2^32 is enough constants for anyone.
-		return 32
-	}
-}
-
-// declareIndexAndNameVars declares the index slices and concatenated names
-// strings representing the runs of values.
-func (g *Generator) declareIndexAndNameVars(runs [][]Value, typeName string) {
-	var indexes, names []string
-	for i, run := range runs {
-		index, name := g.createIndexAndNameDecl(run, typeName, fmt.Sprintf("_%d", i))
-		indexes = append(indexes, index)
-		names = append(names, name)
-	}
-	g.Printf("const (\n")
-	for _, name := range names {
-		g.Printf("\t%s\n", name)
-	}
-	g.Printf(")\n\n")
-	g.Printf("var (")
-	for _, index := range indexes {
-		g.Printf("\t%s\n", index)
-	}
-	g.Printf(")\n\n")
-}
-
-// declareIndexAndNameVar is the single-run version of declareIndexAndNameVars
-func (g *Generator) declareIndexAndNameVar(run []Value, typeName string) {
-	index, name := g.createIndexAndNameDecl(run, typeName, "")
-	g.Printf("const %s\n", name)
-	g.Printf("var %s\n", index)
-}
-
-// createIndexAndNameDecl returns the pair of declarations for the run. The caller will add "const" and "var".
-func (g *Generator) createIndexAndNameDecl(run []Value, typeName string, suffix string) (string, string) {
-	b := new(bytes.Buffer)
-	indexes := make([]int, len(run))
-	for i := range run {
-		b.WriteString(run[i].name)
-		indexes[i] = b.Len()
-	}
-	nameConst := fmt.Sprintf("_%s_name%s = %q", typeName, suffix, b.String())
-	nameLen := b.Len()
-	b.Reset()
-	fmt.Fprintf(b, "_%s_index%s = [...]uint%d{0, ", typeName, suffix, usize(nameLen))
-	for i, v := range indexes {
-		if i > 0 {
-			fmt.Fprintf(b, ", ")
-		}
-		fmt.Fprintf(b, "%d", v)
-	}
-	fmt.Fprintf(b, "}")
-	return b.String(), nameConst
-}
-
-// declareNameVars declares the concatenated names string representing all the values in the runs.
-func (g *Generator) declareNameVars(runs [][]Value, typeName string, suffix string) {
-	g.Printf("const _%s_name%s = \"", typeName, suffix)
-	for _, run := range runs {
-		for i := range run {
-			g.Printf("%s", run[i].name)
-		}
-	}
-	g.Printf("\"\n")
-}
-
-// buildOneRun generates the variables and String method for a single run of contiguous values.
-func (g *Generator) buildOneRun(runs [][]Value, typeName string) {
-	values := runs[0]
-	g.Printf("\n")
-	g.declareIndexAndNameVar(values, typeName)
-	// The generated code is simple enough to write as a Printf format.
-	lessThanZero := ""
-	if values[0].signed {
-		lessThanZero = "i < 0 || "
-	}
-	if values[0].value == 0 { // Signed or unsigned, 0 is still 0.
-		g.Printf(stringOneRun, typeName, usize(len(values)), lessThanZero)
-	} else {
-		g.Printf(stringOneRunWithOffset, typeName, values[0].String(), usize(len(values)), lessThanZero)
-	}
-}
-
-// Arguments to format are:
-//	[1]: type name
-//	[2]: size of index element (8 for uint8 etc.)
-//	[3]: less than zero check (for signed types)
-const stringOneRun = `func (i %[1]s) String() string {
-	if %[3]si >= %[1]s(len(_%[1]s_index)-1) {
-		return fmt.Sprintf("%[1]s(%%d)", i)
-	}
-	return _%[1]s_name[_%[1]s_index[i]:_%[1]s_index[i+1]]
-}
-`
-
-// Arguments to format are:
-//	[1]: type name
-//	[2]: lowest defined value for type, as a string
-//	[3]: size of index element (8 for uint8 etc.)
-//	[4]: less than zero check (for signed types)
-/*
- */
-const stringOneRunWithOffset = `func (i %[1]s) String() string {
-	i -= %[2]s
-	if %[4]si >= %[1]s(len(_%[1]s_index)-1) {
-		return fmt.Sprintf("%[1]s(%%d)", i + %[2]s)
-	}
-	return _%[1]s_name[_%[1]s_index[i] : _%[1]s_index[i+1]]
-}
-`
-
-// buildMultipleRuns generates the variables and String method for multiple runs of contiguous values.
-// For this pattern, a single Printf format won't do.
-func (g *Generator) buildMultipleRuns(runs [][]Value, typeName string) {
-	g.Printf("\n")
-	g.declareIndexAndNameVars(runs, typeName)
-	g.Printf("func (i %s) String() string {\n", typeName)
-	g.Printf("\tswitch {\n")
-	for i, values := range runs {
-		if len(values) == 1 {
-			g.Printf("\tcase i == %s:\n", &values[0])
-			g.Printf("\t\treturn _%s_name_%d\n", typeName, i)
-			continue
-		}
-		g.Printf("\tcase %s <= i && i <= %s:\n", &values[0], &values[len(values)-1])
-		if values[0].value != 0 {
-			g.Printf("\t\ti -= %s\n", &values[0])
-		}
-		g.Printf("\t\treturn _%s_name_%d[_%s_index_%d[i]:_%s_index_%d[i+1]]\n",
-			typeName, i, typeName, i, typeName, i)
-	}
-	g.Printf("\tdefault:\n")
-	g.Printf("\t\treturn fmt.Sprintf(\"%s(%%d)\", i)\n", typeName)
-	g.Printf("\t}\n")
-	g.Printf("}\n")
-}
-
-// buildMap handles the case where the space is so sparse a map is a reasonable fallback.
-// It's a rare situation but has simple code.
-func (g *Generator) buildMap(runs [][]Value, typeName string) {
-	g.Printf("\n")
-	g.declareNameVars(runs, typeName, "")
-	g.Printf("\nvar _%s_map = map[%s]string{\n", typeName, typeName)
-	n := 0
-	for _, values := range runs {
-		for _, value := range values {
-			g.Printf("\t%s: _%s_name[%d:%d],\n", &value, typeName, n, n+len(value.name))
-			n += len(value.name)
-		}
-	}
-	g.Printf("}\n\n")
-	g.Printf(stringMap, typeName)
-}
-
-// Argument to format is the type name.
-const stringMap = `func (i %[1]s) String() string {
-	if str, ok := _%[1]s_map[i]; ok {
-		return str
-	}
-	return fmt.Sprintf("%[1]s(%%d)", i)
-}
-`
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/cgo.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/cgo.go
deleted file mode 100644
index ef38f959c0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/cgo.go
+++ /dev/null
@@ -1,32 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Import "C" shouldn't be imported.
-
-package main
-
-/*
-#define HELLO 1
-*/
-import "C"
-
-import "fmt"
-
-type Cgo uint32
-
-const (
-	// MustScanSubDirs indicates that events were coalesced hierarchically.
-	MustScanSubDirs Cgo = 1 << iota
-)
-
-func main() {
-	_ = C.HELLO
-	ck(MustScanSubDirs, "MustScanSubDirs")
-}
-
-func ck(day Cgo, str string) {
-	if fmt.Sprint(day) != str {
-		panic("cgo.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/day.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/day.go
deleted file mode 100644
index 35fa8dce8a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/day.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Simple test: enumeration of type int starting at 0.
-
-package main
-
-import "fmt"
-
-type Day int
-
-const (
-	Monday Day = iota
-	Tuesday
-	Wednesday
-	Thursday
-	Friday
-	Saturday
-	Sunday
-)
-
-func main() {
-	ck(Monday, "Monday")
-	ck(Tuesday, "Tuesday")
-	ck(Wednesday, "Wednesday")
-	ck(Thursday, "Thursday")
-	ck(Friday, "Friday")
-	ck(Saturday, "Saturday")
-	ck(Sunday, "Sunday")
-	ck(-127, "Day(-127)")
-	ck(127, "Day(127)")
-}
-
-func ck(day Day, str string) {
-	if fmt.Sprint(day) != str {
-		panic("day.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/gap.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/gap.go
deleted file mode 100644
index bc8a90c547..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/gap.go
+++ /dev/null
@@ -1,44 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Gaps and an offset.
-
-package main
-
-import "fmt"
-
-type Gap int
-
-const (
-	Two    Gap = 2
-	Three  Gap = 3
-	Five   Gap = 5
-	Six    Gap = 6
-	Seven  Gap = 7
-	Eight  Gap = 8
-	Nine   Gap = 9
-	Eleven Gap = 11
-)
-
-func main() {
-	ck(0, "Gap(0)")
-	ck(1, "Gap(1)")
-	ck(Two, "Two")
-	ck(Three, "Three")
-	ck(4, "Gap(4)")
-	ck(Five, "Five")
-	ck(Six, "Six")
-	ck(Seven, "Seven")
-	ck(Eight, "Eight")
-	ck(Nine, "Nine")
-	ck(10, "Gap(10)")
-	ck(Eleven, "Eleven")
-	ck(12, "Gap(12)")
-}
-
-func ck(gap Gap, str string) {
-	if fmt.Sprint(gap) != str {
-		panic("gap.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/num.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/num.go
deleted file mode 100644
index 0d5ab10707..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/num.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Signed integers spanning zero.
-
-package main
-
-import "fmt"
-
-type Num int
-
-const (
-	m_2 Num = -2 + iota
-	m_1
-	m0
-	m1
-	m2
-)
-
-func main() {
-	ck(-3, "Num(-3)")
-	ck(m_2, "m_2")
-	ck(m_1, "m_1")
-	ck(m0, "m0")
-	ck(m1, "m1")
-	ck(m2, "m2")
-	ck(3, "Num(3)")
-}
-
-func ck(num Num, str string) {
-	if fmt.Sprint(num) != str {
-		panic("num.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/number.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/number.go
deleted file mode 100644
index 7f1c8246c0..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/number.go
+++ /dev/null
@@ -1,34 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Enumeration with an offset.
-// Also includes a duplicate.
-
-package main
-
-import "fmt"
-
-type Number int
-
-const (
-	_ Number = iota
-	One
-	Two
-	Three
-	AnotherOne = One // Duplicate; note that AnotherOne doesn't appear below.
-)
-
-func main() {
-	ck(One, "One")
-	ck(Two, "Two")
-	ck(Three, "Three")
-	ck(AnotherOne, "One")
-	ck(127, "Number(127)")
-}
-
-func ck(num Number, str string) {
-	if fmt.Sprint(num) != str {
-		panic("number.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/prime.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/prime.go
deleted file mode 100644
index f551a1a0bb..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/prime.go
+++ /dev/null
@@ -1,56 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Enough gaps to trigger a map implementation of the method.
-// Also includes a duplicate to test that it doesn't cause problems
-
-package main
-
-import "fmt"
-
-type Prime int
-
-const (
-	p2  Prime = 2
-	p3  Prime = 3
-	p5  Prime = 5
-	p7  Prime = 7
-	p77 Prime = 7 // Duplicate; note that p77 doesn't appear below.
-	p11 Prime = 11
-	p13 Prime = 13
-	p17 Prime = 17
-	p19 Prime = 19
-	p23 Prime = 23
-	p29 Prime = 29
-	p37 Prime = 31
-	p41 Prime = 41
-	p43 Prime = 43
-)
-
-func main() {
-	ck(0, "Prime(0)")
-	ck(1, "Prime(1)")
-	ck(p2, "p2")
-	ck(p3, "p3")
-	ck(4, "Prime(4)")
-	ck(p5, "p5")
-	ck(p7, "p7")
-	ck(p77, "p7")
-	ck(p11, "p11")
-	ck(p13, "p13")
-	ck(p17, "p17")
-	ck(p19, "p19")
-	ck(p23, "p23")
-	ck(p29, "p29")
-	ck(p37, "p37")
-	ck(p41, "p41")
-	ck(p43, "p43")
-	ck(44, "Prime(44)")
-}
-
-func ck(prime Prime, str string) {
-	if fmt.Sprint(prime) != str {
-		panic("prime.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum.go
deleted file mode 100644
index 2f8508f49c..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum.go
+++ /dev/null
@@ -1,38 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Unsigned integers spanning zero.
-
-package main
-
-import "fmt"
-
-type Unum uint8
-
-const (
-	m_2 Unum = iota + 253
-	m_1
-)
-
-const (
-	m0 Unum = iota
-	m1
-	m2
-)
-
-func main() {
-	ck(^Unum(0)-3, "Unum(252)")
-	ck(m_2, "m_2")
-	ck(m_1, "m_1")
-	ck(m0, "m0")
-	ck(m1, "m1")
-	ck(m2, "m2")
-	ck(3, "Unum(3)")
-}
-
-func ck(unum Unum, str string) {
-	if fmt.Sprint(unum) != str {
-		panic("unum.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum2.go b/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum2.go
deleted file mode 100644
index edbbedf33a..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/testdata/unum2.go
+++ /dev/null
@@ -1,31 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Unsigned integers - check maximum size
-
-package main
-
-import "fmt"
-
-type Unum2 uint8
-
-const (
-	Zero Unum2 = iota
-	One
-	Two
-)
-
-func main() {
-	ck(Zero, "Zero")
-	ck(One, "One")
-	ck(Two, "Two")
-	ck(3, "Unum2(3)")
-	ck(255, "Unum2(255)")
-}
-
-func ck(unum Unum2, str string) {
-	if fmt.Sprint(unum) != str {
-		panic("unum.go: " + str)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/stringer/util_test.go b/installer/vendor/golang.org/x/tools/cmd/stringer/util_test.go
deleted file mode 100644
index 1aeba6e681..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/stringer/util_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains tests for some of the internal functions.
-
-package main
-
-import (
-	"fmt"
-	"testing"
-)
-
-// Helpers to save typing in the test cases.
-type u []uint64
-type uu [][]uint64
-
-type SplitTest struct {
-	input  u
-	output uu
-	signed bool
-}
-
-var (
-	m2  = uint64(2)
-	m1  = uint64(1)
-	m0  = uint64(0)
-	m_1 = ^uint64(0)     // -1 when signed.
-	m_2 = ^uint64(0) - 1 // -2 when signed.
-)
-
-var splitTests = []SplitTest{
-	// No need for a test for the empty case; that's picked off before splitIntoRuns.
-	// Single value.
-	{u{1}, uu{u{1}}, false},
-	// Out of order.
-	{u{3, 2, 1}, uu{u{1, 2, 3}}, true},
-	// Out of order.
-	{u{3, 2, 1}, uu{u{1, 2, 3}}, false},
-	// A gap at the beginning.
-	{u{1, 33, 32, 31}, uu{u{1}, u{31, 32, 33}}, true},
-	// A gap in the middle, in mixed order.
-	{u{33, 7, 32, 31, 9, 8}, uu{u{7, 8, 9}, u{31, 32, 33}}, true},
-	// Gaps throughout
-	{u{33, 44, 1, 32, 45, 31}, uu{u{1}, u{31, 32, 33}, u{44, 45}}, true},
-	// Unsigned values spanning 0.
-	{u{m1, m0, m_1, m2, m_2}, uu{u{m0, m1, m2}, u{m_2, m_1}}, false},
-	// Signed values spanning 0
-	{u{m1, m0, m_1, m2, m_2}, uu{u{m_2, m_1, m0, m1, m2}}, true},
-}
-
-func TestSplitIntoRuns(t *testing.T) {
-Outer:
-	for n, test := range splitTests {
-		values := make([]Value, len(test.input))
-		for i, v := range test.input {
-			values[i] = Value{"", v, test.signed, fmt.Sprint(v)}
-		}
-		runs := splitIntoRuns(values)
-		if len(runs) != len(test.output) {
-			t.Errorf("#%d: %v: got %d runs; expected %d", n, test.input, len(runs), len(test.output))
-			continue
-		}
-		for i, run := range runs {
-			if len(run) != len(test.output[i]) {
-				t.Errorf("#%d: got %v; expected %v", n, runs, test.output)
-				continue Outer
-			}
-			for j, v := range run {
-				if v.value != test.output[i][j] {
-					t.Errorf("#%d: got %v; expected %v", n, runs, test.output)
-					continue Outer
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/Dockerfile b/installer/vendor/golang.org/x/tools/cmd/tip/Dockerfile
deleted file mode 100644
index 86dfe364c5..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/Dockerfile
+++ /dev/null
@@ -1,132 +0,0 @@
-FROM golang:1.8
-
-RUN apt-get update && apt-get install --no-install-recommends -y -q build-essential git
-
-# golang puts its go install here (weird but true)
-ENV GOROOT_BOOTSTRAP /usr/local/go
-
-# BEGIN deps (run `make update-deps` to update)
-
-# Repo cloud.google.com/go at 76d607c (2017-07-20)
-ENV REV=76d607c4e7a2b9df49f1d1a58a3f3d2dd2614704
-RUN go get -d cloud.google.com/go/compute/metadata `#and 6 other pkgs` &&\
-    (cd /go/src/cloud.google.com/go && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo github.com/golang/protobuf at 0a4f71a (2017-07-11)
-ENV REV=0a4f71a498b7c4812f64969510bcb4eca251e33a
-RUN go get -d github.com/golang/protobuf/proto `#and 6 other pkgs` &&\
-    (cd /go/src/github.com/golang/protobuf && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo github.com/googleapis/gax-go at 84ed267 (2017-06-10)
-ENV REV=84ed26760e7f6f80887a2fbfb50db3cc415d2cea
-RUN go get -d github.com/googleapis/gax-go &&\
-    (cd /go/src/github.com/googleapis/gax-go && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo golang.org/x/build at da1460b (2017-07-31)
-ENV REV=da1460b7c9c9b65383d1336593ed9ad346f6a1c5
-RUN go get -d golang.org/x/build/autocertcache &&\
-    (cd /go/src/golang.org/x/build && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo golang.org/x/crypto at 6914964 (2017-07-20)
-ENV REV=6914964337150723782436d56b3f21610a74ce7b
-RUN go get -d golang.org/x/crypto/acme `#and 2 other pkgs` &&\
-    (cd /go/src/golang.org/x/crypto && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo golang.org/x/net at ab54850 (2017-07-21)
-ENV REV=ab5485076ff3407ad2d02db054635913f017b0ed
-RUN go get -d golang.org/x/net/context `#and 8 other pkgs` &&\
-    (cd /go/src/golang.org/x/net && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo golang.org/x/oauth2 at b53b38a (2017-07-19)
-ENV REV=b53b38ad8a6435bd399ea76d0fa74f23149cca4e
-RUN go get -d golang.org/x/oauth2 `#and 5 other pkgs` &&\
-    (cd /go/src/golang.org/x/oauth2 && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo golang.org/x/text at 836efe4 (2017-07-14)
-ENV REV=836efe42bb4aa16aaa17b9c155d8813d336ed720
-RUN go get -d golang.org/x/text/secure/bidirule `#and 4 other pkgs` &&\
-    (cd /go/src/golang.org/x/text && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo google.golang.org/api at 295e4bb (2017-07-18)
-ENV REV=295e4bb0ade057ae2cfb9876ab0b54635dbfcea4
-RUN go get -d google.golang.org/api/gensupport `#and 9 other pkgs` &&\
-    (cd /go/src/google.golang.org/api && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo google.golang.org/genproto at b0a3dcf (2017-07-12)
-ENV REV=b0a3dcfcd1a9bd48e63634bd8802960804cf8315
-RUN go get -d google.golang.org/genproto/googleapis/api/annotations `#and 3 other pkgs` &&\
-    (cd /go/src/google.golang.org/genproto && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Repo google.golang.org/grpc at fa1cb32 (2017-07-31)
-ENV REV=fa1cb32dc4f81e23ab862dd5e7ac4f2920a33088
-RUN go get -d google.golang.org/grpc `#and 14 other pkgs` &&\
-    (cd /go/src/google.golang.org/grpc && (git cat-file -t $REV 2>/dev/null || git fetch -q origin $REV) && git reset --hard $REV)
-
-# Optimization to speed up iterative development, not necessary for correctness:
-RUN go install cloud.google.com/go/compute/metadata \
-	cloud.google.com/go/iam \
-	cloud.google.com/go/internal \
-	cloud.google.com/go/internal/optional \
-	cloud.google.com/go/internal/version \
-	cloud.google.com/go/storage \
-	github.com/golang/protobuf/proto \
-	github.com/golang/protobuf/protoc-gen-go/descriptor \
-	github.com/golang/protobuf/ptypes \
-	github.com/golang/protobuf/ptypes/any \
-	github.com/golang/protobuf/ptypes/duration \
-	github.com/golang/protobuf/ptypes/timestamp \
-	github.com/googleapis/gax-go \
-	golang.org/x/build/autocertcache \
-	golang.org/x/crypto/acme \
-	golang.org/x/crypto/acme/autocert \
-	golang.org/x/net/context \
-	golang.org/x/net/context/ctxhttp \
-	golang.org/x/net/http2 \
-	golang.org/x/net/http2/hpack \
-	golang.org/x/net/idna \
-	golang.org/x/net/internal/timeseries \
-	golang.org/x/net/lex/httplex \
-	golang.org/x/net/trace \
-	golang.org/x/oauth2 \
-	golang.org/x/oauth2/google \
-	golang.org/x/oauth2/internal \
-	golang.org/x/oauth2/jws \
-	golang.org/x/oauth2/jwt \
-	golang.org/x/text/secure/bidirule \
-	golang.org/x/text/transform \
-	golang.org/x/text/unicode/bidi \
-	golang.org/x/text/unicode/norm \
-	google.golang.org/api/gensupport \
-	google.golang.org/api/googleapi \
-	google.golang.org/api/googleapi/internal/uritemplates \
-	google.golang.org/api/googleapi/transport \
-	google.golang.org/api/internal \
-	google.golang.org/api/iterator \
-	google.golang.org/api/option \
-	google.golang.org/api/storage/v1 \
-	google.golang.org/api/transport/http \
-	google.golang.org/genproto/googleapis/api/annotations \
-	google.golang.org/genproto/googleapis/iam/v1 \
-	google.golang.org/genproto/googleapis/rpc/status \
-	google.golang.org/grpc \
-	google.golang.org/grpc/codes \
-	google.golang.org/grpc/credentials \
-	google.golang.org/grpc/grpclb/grpc_lb_v1 \
-	google.golang.org/grpc/grpclog \
-	google.golang.org/grpc/internal \
-	google.golang.org/grpc/keepalive \
-	google.golang.org/grpc/metadata \
-	google.golang.org/grpc/naming \
-	google.golang.org/grpc/peer \
-	google.golang.org/grpc/stats \
-	google.golang.org/grpc/status \
-	google.golang.org/grpc/tap \
-	google.golang.org/grpc/transport
-# END deps.
-
-# golang sets GOPATH=/go
-ADD . /go/src/tip
-RUN go install --tags=autocert tip
-ENTRYPOINT ["/go/bin/tip"]
-# App Engine expects us to listen on port 8080
-EXPOSE 8080
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/Makefile b/installer/vendor/golang.org/x/tools/cmd/tip/Makefile
deleted file mode 100644
index 7d2f6ed37b..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/Makefile
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2017 The Go Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file.
-
-VERSION=v2
-
-update-deps:
-	go install golang.org/x/build/cmd/gitlock
-	gitlock --update=Dockerfile --ignore=NONE golang.org/x/tools/cmd/tip
-
-docker-prod: Dockerfile
-	docker build -f Dockerfile --tag=gcr.io/symbolic-datum-552/tip:$(VERSION) .
-docker-dev: Dockerfile
-	docker build -f Dockerfile --tag=gcr.io/go-dashboard-dev/tip:$(VERSION) .
-
-push-prod: docker-prod
-	gcloud docker -- push gcr.io/symbolic-datum-552/tip:$(VERSION)
-push-dev: docker-dev
-	gcloud docker -- push gcr.io/go-dashboard-dev/tip:$(VERSION)
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/README b/installer/vendor/golang.org/x/tools/cmd/tip/README
deleted file mode 100644
index b96c1071a2..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/README
+++ /dev/null
@@ -1,32 +0,0 @@
-============================================================
-Old instructions, only valid for talks.golang.org:
-============================================================
-
-1. Deploy the app.
-
-   To deploy tip.golang.org:
-       (See Kubernetes instruction below.)
-
-   To deploy talks.golang.org:
-       $ gcloud --project golang-org app deploy --no-promote talks.yaml
-
-2. Wait until the deployed version is serving requests.
-
-3. Go to the developer console and upgrade the default version.
-   https://console.developers.google.com/appengine/versions?project=golang-org&moduleId=tip
-
-4. Clean up any old versions (they continue to use at least one instance).
-
-============================================================
-New Kubernetes instructions, for tip.golang.org:
-============================================================
-
-Kubernetes instructions:
-
- * build & push images (see Makefile for helpers)
- * create/update resources:
-   - kubectl create -f tip-rc.yaml
-   - kubectl create -f tip-service.yaml
-
-TODO(bradfitz): flesh out these instructions as I gain experience
-with updating this over time. Also: move talks.golang.org to GKE too?
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/cert.go b/installer/vendor/golang.org/x/tools/cmd/tip/cert.go
deleted file mode 100644
index e00777b212..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/cert.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build autocert
-
-// This file contains autocert and cloud.google.com/go/storage
-// dependencies we want to hide by default from the Go build system,
-// which currently doesn't know how to fetch non-golang.org/x/*
-// dependencies. The Dockerfile builds the production binary
-// with this code using --tags=autocert.
-
-package main
-
-import (
-	"context"
-	"crypto/tls"
-	"log"
-	"net/http"
-
-	"cloud.google.com/go/storage"
-	"golang.org/x/build/autocertcache"
-	"golang.org/x/crypto/acme/autocert"
-)
-
-func init() {
-	runHTTPS = runHTTPSAutocert
-}
-
-func runHTTPSAutocert(h http.Handler) error {
-	var cache autocert.Cache
-	if b := *autoCertCacheBucket; b != "" {
-		sc, err := storage.NewClient(context.Background())
-		if err != nil {
-			log.Fatalf("storage.NewClient: %v", err)
-		}
-		cache = autocertcache.NewGoogleCloudStorageCache(sc, b)
-	}
-	m := autocert.Manager{
-		Prompt:     autocert.AcceptTOS,
-		HostPolicy: autocert.HostWhitelist(*autoCertDomain),
-		Cache:      cache,
-	}
-	s := &http.Server{
-		Addr:      ":https",
-		Handler:   h,
-		TLSConfig: &tls.Config{GetCertificate: m.GetCertificate},
-	}
-	return s.ListenAndServeTLS("", "")
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/godoc.go b/installer/vendor/golang.org/x/tools/cmd/tip/godoc.go
deleted file mode 100644
index a01b8ca2cc..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/godoc.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-)
-
-type godocBuilder struct {
-}
-
-func (b godocBuilder) Signature(heads map[string]string) string {
-	return fmt.Sprintf("go=%v/tools=%v", heads["go"], heads["tools"])
-}
-
-func (b godocBuilder) Init(dir, hostport string, heads map[string]string) (*exec.Cmd, error) {
-	goDir := filepath.Join(dir, "go")
-	toolsDir := filepath.Join(dir, "gopath/src/golang.org/x/tools")
-	if err := checkout(repoURL+"go", heads["go"], goDir); err != nil {
-		return nil, err
-	}
-	if err := checkout(repoURL+"tools", heads["tools"], toolsDir); err != nil {
-		return nil, err
-	}
-
-	make := exec.Command(filepath.Join(goDir, "src/make.bash"))
-	make.Dir = filepath.Join(goDir, "src")
-	if err := runErr(make); err != nil {
-		return nil, err
-	}
-	goBin := filepath.Join(goDir, "bin/go")
-	goPath := filepath.Join(dir, "gopath")
-	install := exec.Command(goBin, "install", "golang.org/x/tools/cmd/godoc")
-	install.Env = []string{
-		"GOROOT=" + goDir,
-		"GOPATH=" + goPath,
-		"GOROOT_BOOTSTRAP=" + os.Getenv("GOROOT_BOOTSTRAP"),
-	}
-	if err := runErr(install); err != nil {
-		return nil, err
-	}
-
-	godocBin := filepath.Join(goPath, "bin/godoc")
-	godoc := exec.Command(godocBin, "-http="+hostport, "-index", "-index_interval=-1s")
-	godoc.Env = []string{"GOROOT=" + goDir}
-	// TODO(adg): log this somewhere useful
-	godoc.Stdout = os.Stdout
-	godoc.Stderr = os.Stderr
-	if err := godoc.Start(); err != nil {
-		return nil, err
-	}
-	return godoc, nil
-}
-
-var indexingMsg = []byte("Indexing in progress: result may be inaccurate")
-
-func (b godocBuilder) HealthCheck(hostport string) error {
-	body, err := getOK(fmt.Sprintf("http://%v/search?q=FALLTHROUGH", hostport))
-	if err != nil {
-		return err
-	}
-	if bytes.Contains(body, indexingMsg) {
-		return errors.New("still indexing")
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/godoc.yaml b/installer/vendor/golang.org/x/tools/cmd/tip/godoc.yaml
deleted file mode 100644
index 64dbb7d2f4..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/godoc.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-module: tip
-runtime: custom
-vm: true
-
-manual_scaling:
-  instances: 4
-
-env_variables:
-  TIP_BUILDER: 'godoc'
-
-health_check:
-  enable_health_check: True
-  check_interval_sec: 5
-  timeout_sec: 4
-  unhealthy_threshold: 2
-  healthy_threshold: 2
-  restart_threshold: 240
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/talks.go b/installer/vendor/golang.org/x/tools/cmd/tip/talks.go
deleted file mode 100644
index 3fc9e1e4c3..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/talks.go
+++ /dev/null
@@ -1,73 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-)
-
-type talksBuilder struct {
-}
-
-func (b talksBuilder) Signature(heads map[string]string) string {
-	return heads["talks"]
-}
-
-const talksToolsRev = "e04df2157ae7263e17159baabadc99fb03fc7514"
-
-func (b talksBuilder) Init(dir, hostport string, heads map[string]string) (*exec.Cmd, error) {
-	toolsDir := filepath.Join(dir, "gopath/src/golang.org/x/tools")
-	if err := checkout(repoURL+"tools", talksToolsRev, toolsDir); err != nil {
-		return nil, err
-	}
-	talksDir := filepath.Join(dir, "gopath/src/golang.org/x/talks")
-	if err := checkout(repoURL+"talks", heads["talks"], talksDir); err != nil {
-		return nil, err
-	}
-
-	goDir := os.Getenv("GOROOT_BOOTSTRAP")
-	if goDir == "" {
-		goDir = runtime.GOROOT()
-	}
-	goBin := filepath.Join(goDir, "bin/go")
-	goPath := filepath.Join(dir, "gopath")
-	presentPath := "golang.org/x/tools/cmd/present"
-	install := exec.Command(goBin, "install", "-tags=appenginevm", presentPath)
-	install.Env = []string{"GOROOT=" + goDir, "GOPATH=" + goPath}
-	if err := runErr(install); err != nil {
-		return nil, err
-	}
-
-	talksBin := filepath.Join(goPath, "bin/present")
-	presentSrc := filepath.Join(goPath, "src", presentPath)
-	present := exec.Command(talksBin, "-http="+hostport, "-base="+presentSrc)
-	present.Dir = talksDir
-	// TODO(adg): log this somewhere useful
-	present.Stdout = os.Stdout
-	present.Stderr = os.Stderr
-	if err := present.Start(); err != nil {
-		return nil, err
-	}
-	return present, nil
-}
-
-var talksMsg = []byte("Talks - The Go Programming Language")
-
-func (b talksBuilder) HealthCheck(hostport string) error {
-	body, err := getOK(fmt.Sprintf("http://%v/", hostport))
-	if err != nil {
-		return err
-	}
-	if !bytes.Contains(body, talksMsg) {
-		return errors.New("couldn't match string")
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/talks.yaml b/installer/vendor/golang.org/x/tools/cmd/tip/talks.yaml
deleted file mode 100644
index 24391a753e..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/talks.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-service: talks
-runtime: custom
-env: flex
-
-manual_scaling:
-  instances: 1
-
-env_variables:
-  TIP_BUILDER: 'talks'
-
-health_check:
-  enable_health_check: False
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/tip-rc.yaml b/installer/vendor/golang.org/x/tools/cmd/tip/tip-rc.yaml
deleted file mode 100644
index 82af3b7087..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/tip-rc.yaml
+++ /dev/null
@@ -1,40 +0,0 @@
-apiVersion: v1
-kind: ReplicationController
-metadata:
-  name: tipgodoc
-spec:
-  replicas: 1
-  selector:
-    app: tipgodoc
-  template:
-    metadata:
-      name: tipgodoc
-      labels:
-        app: tipgodoc
-    spec:
-      volumes:
-      - name: cache-volume
-        emptyDir: {}
-      containers:
-      - name: gitmirror
-        image: gcr.io/symbolic-datum-552/tip:v2
-        imagePullPolicy: Always
-        command: ["/go/bin/tip", "--autocert=tip.golang.org", "--autocert-bucket=golang-tip-autocert"]
-        env:
-        - name: TMPDIR
-          value: /build
-        - name: TIP_BUILDER
-          value: godoc
-        volumeMounts:
-        - mountPath: /build
-          name: cache-volume
-        ports:
-        - containerPort: 8080
-        - containerPort: 443
-        resources:
-          requests:
-            cpu: "1"
-            memory: "2Gi"
-          limits:
-            cpu: "2"
-            memory: "4Gi"
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/tip-service.yaml b/installer/vendor/golang.org/x/tools/cmd/tip/tip-service.yaml
deleted file mode 100644
index eeb2a1cb53..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/tip-service.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  name: tipgodoc
-spec:
-  ports:
-    - port: 80
-      targetPort: 8080
-      name: http
-    - port: 443
-      targetPort: 443
-      name: https
-  selector:
-    app: tipgodoc
-  type: LoadBalancer
-  loadBalancerIP: 130.211.180.236
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/tip.go b/installer/vendor/golang.org/x/tools/cmd/tip/tip.go
deleted file mode 100644
index 6e0fd47afa..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/tip.go
+++ /dev/null
@@ -1,402 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// Command tip is the tip.golang.org server,
-// serving the latest HEAD straight from the Git oven.
-package main
-
-import (
-	"bufio"
-	"encoding/json"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"sync"
-	"time"
-)
-
-const (
-	repoURL      = "https://go.googlesource.com/"
-	metaURL      = "https://go.googlesource.com/?b=master&format=JSON"
-	startTimeout = 10 * time.Minute
-)
-
-var startTime = time.Now()
-
-var (
-	autoCertDomain      = flag.String("autocert", "", "if non-empty, listen on port 443 and serve a LetsEncrypt cert for this hostname")
-	autoCertCacheBucket = flag.String("autocert-bucket", "", "if non-empty, the Google Cloud Storage bucket in which to store the LetsEncrypt cache")
-)
-
-// runHTTPS, if non-nil, specifies the function to serve HTTPS.
-// It is set non-nil in cert.go with the "autocert" build tag.
-var runHTTPS func(http.Handler) error
-
-func main() {
-	flag.Parse()
-
-	const k = "TIP_BUILDER"
-	var b Builder
-	switch os.Getenv(k) {
-	case "godoc":
-		b = godocBuilder{}
-	case "talks":
-		b = talksBuilder{}
-	default:
-		log.Fatalf("Unknown %v value: %q", k, os.Getenv(k))
-	}
-
-	p := &Proxy{builder: b}
-	go p.run()
-	mux := newServeMux(p)
-
-	log.Printf("Starting up tip server for builder %q", os.Getenv(k))
-
-	errc := make(chan error, 1)
-
-	go func() {
-		errc <- http.ListenAndServe(":8080", mux)
-	}()
-	if *autoCertDomain != "" {
-		if runHTTPS == nil {
-			errc <- errors.New("can't use --autocert without building binary with the autocert build tag")
-		} else {
-			go func() {
-				errc <- runHTTPS(mux)
-			}()
-		}
-		log.Printf("Listening on port 443 with LetsEncrypt support on domain %q", *autoCertDomain)
-	}
-	if err := <-errc; err != nil {
-		p.stop()
-		log.Fatal(err)
-	}
-}
-
-// Proxy implements the tip.golang.org server: a reverse-proxy
-// that builds and runs godoc instances showing the latest docs.
-type Proxy struct {
-	builder Builder
-
-	mu       sync.Mutex // protects the followin'
-	proxy    http.Handler
-	cur      string    // signature of gorepo+toolsrepo
-	cmd      *exec.Cmd // live godoc instance, or nil for none
-	side     string
-	hostport string // host and port of the live instance
-	err      error
-}
-
-type Builder interface {
-	Signature(heads map[string]string) string
-	Init(dir, hostport string, heads map[string]string) (*exec.Cmd, error)
-	HealthCheck(hostport string) error
-}
-
-func (p *Proxy) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.URL.Path == "/_tipstatus" {
-		p.serveStatus(w, r)
-		return
-	}
-	p.mu.Lock()
-	proxy := p.proxy
-	err := p.err
-	p.mu.Unlock()
-	if proxy == nil {
-		s := "starting up"
-		if err != nil {
-			s = err.Error()
-		}
-		http.Error(w, s, http.StatusInternalServerError)
-		return
-	}
-	proxy.ServeHTTP(w, r)
-}
-
-func (p *Proxy) serveStatus(w http.ResponseWriter, r *http.Request) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	fmt.Fprintf(w, "side=%v\ncurrent=%v\nerror=%v\nuptime=%v\n", p.side, p.cur, p.err, int(time.Since(startTime).Seconds()))
-}
-
-func (p *Proxy) serveHealthCheck(w http.ResponseWriter, r *http.Request) {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-
-	// NOTE: (App Engine only; not GKE) Status 502, 503, 504 are
-	// the only status codes that signify an unhealthy app.  So
-	// long as this handler returns one of those codes, this
-	// instance will not be sent any requests.
-	if p.proxy == nil {
-		log.Printf("Health check: not ready")
-		http.Error(w, "Not ready", http.StatusServiceUnavailable)
-		return
-	}
-
-	if err := p.builder.HealthCheck(p.hostport); err != nil {
-		log.Printf("Health check failed: %v", err)
-		http.Error(w, "Health check failed", http.StatusServiceUnavailable)
-		return
-	}
-	io.WriteString(w, "ok")
-}
-
-// run runs in its own goroutine.
-func (p *Proxy) run() {
-	p.side = "a"
-	for {
-		p.poll()
-		time.Sleep(30 * time.Second)
-	}
-}
-
-func (p *Proxy) stop() {
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if p.cmd != nil {
-		p.cmd.Process.Kill()
-	}
-}
-
-// poll runs from the run loop goroutine.
-func (p *Proxy) poll() {
-	heads := gerritMetaMap()
-	if heads == nil {
-		return
-	}
-
-	sig := p.builder.Signature(heads)
-
-	p.mu.Lock()
-	changes := sig != p.cur
-	curSide := p.side
-	p.cur = sig
-	p.mu.Unlock()
-
-	if !changes {
-		return
-	}
-
-	newSide := "b"
-	if curSide == "b" {
-		newSide = "a"
-	}
-
-	dir := filepath.Join(os.TempDir(), "tip", newSide)
-	if err := os.MkdirAll(dir, 0755); err != nil {
-		p.err = err
-		return
-	}
-	hostport := "localhost:8081"
-	if newSide == "b" {
-		hostport = "localhost:8082"
-	}
-	cmd, err := p.builder.Init(dir, hostport, heads)
-	if err != nil {
-		err = fmt.Errorf("builder.Init: %v", err)
-	} else {
-		go func() {
-			// TODO(adg,bradfitz): be smarter about dead processes
-			if err := cmd.Wait(); err != nil {
-				log.Printf("process in %v exited: %v", dir, err)
-			}
-		}()
-		err = waitReady(p.builder, hostport)
-		if err != nil {
-			cmd.Process.Kill()
-			err = fmt.Errorf("waitReady: %v", err)
-		}
-	}
-
-	p.mu.Lock()
-	defer p.mu.Unlock()
-	if err != nil {
-		log.Println(err)
-		p.err = err
-		return
-	}
-
-	u, err := url.Parse(fmt.Sprintf("http://%v/", hostport))
-	if err != nil {
-		err = fmt.Errorf("parsing hostport: %v", err)
-		log.Println(err)
-		p.err = err
-		return
-	}
-	p.proxy = httputil.NewSingleHostReverseProxy(u)
-	p.side = newSide
-	p.hostport = hostport
-	if p.cmd != nil {
-		p.cmd.Process.Kill()
-	}
-	p.cmd = cmd
-}
-
-func newServeMux(p *Proxy) http.Handler {
-	mux := http.NewServeMux()
-	mux.Handle("/", httpsOnlyHandler{p})
-	mux.HandleFunc("/_ah/health", p.serveHealthCheck)
-	return mux
-}
-
-func waitReady(b Builder, hostport string) error {
-	var err error
-	deadline := time.Now().Add(startTimeout)
-	for time.Now().Before(deadline) {
-		if err = b.HealthCheck(hostport); err == nil {
-			return nil
-		}
-		time.Sleep(time.Second)
-	}
-	return fmt.Errorf("timed out waiting for process at %v: %v", hostport, err)
-}
-
-func runErr(cmd *exec.Cmd) error {
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		if len(out) == 0 {
-			return err
-		}
-		return fmt.Errorf("%s\n%v", out, err)
-	}
-	return nil
-}
-
-func checkout(repo, hash, path string) error {
-	// Clone git repo if it doesn't exist.
-	if _, err := os.Stat(filepath.Join(path, ".git")); os.IsNotExist(err) {
-		if err := os.MkdirAll(filepath.Dir(path), 0755); err != nil {
-			return fmt.Errorf("mkdir: %v", err)
-		}
-		if err := runErr(exec.Command("git", "clone", repo, path)); err != nil {
-			return fmt.Errorf("clone: %v", err)
-		}
-	} else if err != nil {
-		return fmt.Errorf("stat .git: %v", err)
-	}
-
-	// Pull down changes and update to hash.
-	cmd := exec.Command("git", "fetch")
-	cmd.Dir = path
-	if err := runErr(cmd); err != nil {
-		return fmt.Errorf("fetch: %v", err)
-	}
-	cmd = exec.Command("git", "reset", "--hard", hash)
-	cmd.Dir = path
-	if err := runErr(cmd); err != nil {
-		return fmt.Errorf("reset: %v", err)
-	}
-	cmd = exec.Command("git", "clean", "-d", "-f", "-x")
-	cmd.Dir = path
-	if err := runErr(cmd); err != nil {
-		return fmt.Errorf("clean: %v", err)
-	}
-	return nil
-}
-
-var timeoutClient = &http.Client{Timeout: 10 * time.Second}
-
-// gerritMetaMap returns the map from repo name (e.g. "go") to its
-// latest master hash.
-// The returned map is nil on any transient error.
-func gerritMetaMap() map[string]string {
-	res, err := timeoutClient.Get(metaURL)
-	if err != nil {
-		log.Printf("Error getting Gerrit meta map: %v", err)
-		return nil
-	}
-	defer res.Body.Close()
-	defer io.Copy(ioutil.Discard, res.Body) // ensure EOF for keep-alive
-	if res.StatusCode != 200 {
-		return nil
-	}
-	var meta map[string]struct {
-		Branches map[string]string
-	}
-	br := bufio.NewReader(res.Body)
-	// For security reasons or something, this URL starts with ")]}'\n" before
-	// the JSON object. So ignore that.
-	// Shawn Pearce says it's guaranteed to always be just one line, ending in '\n'.
-	for {
-		b, err := br.ReadByte()
-		if err != nil {
-			return nil
-		}
-		if b == '\n' {
-			break
-		}
-	}
-	if err := json.NewDecoder(br).Decode(&meta); err != nil {
-		log.Printf("JSON decoding error from %v: %s", metaURL, err)
-		return nil
-	}
-	m := map[string]string{}
-	for repo, v := range meta {
-		if master, ok := v.Branches["master"]; ok {
-			m[repo] = master
-		}
-	}
-	return m
-}
-
-func getOK(url string) (body []byte, err error) {
-	res, err := timeoutClient.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	body, err = ioutil.ReadAll(res.Body)
-	res.Body.Close()
-	if err != nil {
-		return nil, err
-	}
-	if res.StatusCode != http.StatusOK {
-		return nil, errors.New(res.Status)
-	}
-	return body, nil
-}
-
-// httpsOnlyHandler redirects requests to "http://example.com/foo?bar" to
-// "https://example.com/foo?bar". It should be used when the server is listening
-// for HTTP traffic behind a proxy that terminates TLS traffic, not when the Go
-// server is terminating TLS directly.
-type httpsOnlyHandler struct {
-	h http.Handler
-}
-
-// isProxiedReq checks whether the server is running behind a proxy that may be
-// terminating TLS.
-func isProxiedReq(r *http.Request) bool {
-	if _, ok := r.Header["X-Appengine-Https"]; ok {
-		return true
-	}
-	if _, ok := r.Header["X-Forwarded-Proto"]; ok {
-		return true
-	}
-	return false
-}
-
-func (h httpsOnlyHandler) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if r.Header.Get("X-Appengine-Https") == "off" || r.Header.Get("X-Forwarded-Proto") == "http" ||
-		(!isProxiedReq(r) && r.TLS == nil) {
-		r.URL.Scheme = "https"
-		r.URL.Host = r.Host
-		http.Redirect(w, r, r.URL.String(), http.StatusFound)
-		return
-	}
-	if r.Header.Get("X-Appengine-Https") == "on" || r.Header.Get("X-Forwarded-Proto") == "https" ||
-		(!isProxiedReq(r) && r.TLS != nil) {
-		// Only set this header when we're actually in production.
-		w.Header().Set("Strict-Transport-Security", "max-age=31536000; preload")
-	}
-	h.h.ServeHTTP(w, r)
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/tip/tip_test.go b/installer/vendor/golang.org/x/tools/cmd/tip/tip_test.go
deleted file mode 100644
index 878954d571..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/tip/tip_test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"net/http/httptest"
-	"testing"
-)
-
-func TestTipRedirects(t *testing.T) {
-	mux := newServeMux(&Proxy{builder: &godocBuilder{}})
-	req := httptest.NewRequest("GET", "http://example.com/foo?bar=baz", nil)
-	req.Header.Set("X-Forwarded-Proto", "http")
-	w := httptest.NewRecorder()
-	mux.ServeHTTP(w, req)
-	if w.Code != 302 {
-		t.Errorf("expected Code to be 302, got %d", w.Code)
-	}
-	want := "https://example.com/foo?bar=baz"
-	if loc := w.Header().Get("Location"); loc != want {
-		t.Errorf("Location header: got %s, want %s", loc, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/toolstash/buildall b/installer/vendor/golang.org/x/tools/cmd/toolstash/buildall
deleted file mode 100755
index 40d88f5406..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/toolstash/buildall
+++ /dev/null
@@ -1,68 +0,0 @@
-#!/bin/bash
-
-# Usage: buildall [-e] [-nocmp] [-work]
-#
-# Builds everything (std) for every GOOS/GOARCH combination but installs nothing.
-#
-# By default, runs the builds with -toolexec 'toolstash -cmp', to test that the
-# toolchain is producing bit identical output to a previous known good toolchain.
-#
-# Options:
-#	-e: stop at first failure
-#	-nocmp: turn off toolstash -cmp; just check that ordinary builds succeed
-#	-work: pass -work to go command
-
-sete=false
-if [ "$1" = "-e" ]; then
-	sete=true
-	shift
-fi
-
-cmp=true
-if [ "$1" = "-nocmp" ]; then
-	cmp=false
-	shift
-fi
-
-work=""
-if [ "$1" = "-work" ]; then
-	work="-work"
-	shift
-fi
-
-cd $(go env GOROOT)/src
-go install cmd/compile cmd/link cmd/asm || exit 1
-pattern="$1"
-if [ "$pattern" = "" ]; then
-	pattern=.
-fi
-
-targets="$(go tool dist list; echo linux/386/387)"
-targets="$(echo "$targets" | tr '/' '-' | sort | egrep "$pattern" | egrep -v 'android-arm|darwin-arm')"
-
-# put linux, nacl first in the target list to get all the architectures up front.
-targets="$(echo "$targets" | egrep 'linux|nacl') $(echo "$targets" | egrep -v 'linux|nacl')"
-
-if [ "$sete" = true ]; then
-	set -e
-fi
-for target in $targets
-do
-	echo $target
-	export GOOS=$(echo $target | sed 's/-.*//')
-	export GOARCH=$(echo $target | sed 's/.*-//')
-	unset GO386
-	if [ "$GOARCH" = "387" ]; then
-		export GOARCH=386
-		export GO386=387
-	fi
-	if $cmp; then
-		if [ "$GOOS" = "android" ]; then
-			go build $work -a -toolexec 'toolstash -cmp' std
-		else
-			go build $work -a -toolexec 'toolstash -cmp' std cmd
-		fi
-	else
-		go build $work -a std
-	fi
-done
diff --git a/installer/vendor/golang.org/x/tools/cmd/toolstash/cmp.go b/installer/vendor/golang.org/x/tools/cmd/toolstash/cmp.go
deleted file mode 100644
index f5974e12ba..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/toolstash/cmp.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"io"
-	"log"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-var (
-	hexDumpRE = regexp.MustCompile(`^\t(0x[0-9a-f]{4,})(( ([0-9a-f]{2}|  )){16})  [ -\x7F]{1,16}\n`)
-	listingRE = regexp.MustCompile(`^\t(0x[0-9a-f]{4,}) ([0-9]{4,}) \(.*:[0-9]+\)\t`)
-)
-
-// okdiffs lists regular expressions for lines to consider minor mismatches.
-// If one of these regexps matches both of a pair of unequal lines, the mismatch
-// is reported but not treated as the one worth looking for.
-// For example, differences in the TEXT line are typically frame size
-// changes due to optimization decisions made in the body of the function.
-// Better to keep looking for the actual difference.
-// Similarly, forward jumps might have different offsets due to a
-// change in instruction encoding later on.
-// Better to find that change.
-var okdiffs = []*regexp.Regexp{
-	regexp.MustCompile(`\)	TEXT[ 	].*,\$`),
-	regexp.MustCompile(`\)	WORD[ 	].*,\$`),
-	regexp.MustCompile(`\)	(B|BR|JMP)	`),
-	regexp.MustCompile(`\)	FUNCDATA	`),
-	regexp.MustCompile(`\\(z|x00)`),
-	regexp.MustCompile(`\$\([0-9]\.[0-9]+e[+\-][0-9]+\)`),
-	regexp.MustCompile(`size=.*value=.*args=.*locals=`),
-}
-
-func compareLogs(outfile string) string {
-	f1, err := os.Open(outfile + ".log")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f1.Close()
-
-	f2, err := os.Open(outfile + ".stash.log")
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f2.Close()
-
-	b1 := bufio.NewReader(f1)
-	b2 := bufio.NewReader(f2)
-
-	offset := int64(0)
-	textOffset := offset
-	textLineno := 0
-	lineno := 0
-	var line1, line2 string
-	var prefix bytes.Buffer
-Reading:
-	for {
-		var err1, err2 error
-		line1, err1 = b1.ReadString('\n')
-		line2, err2 = b2.ReadString('\n')
-		if strings.Contains(line1, ")\tTEXT\t") {
-			textOffset = offset
-			textLineno = lineno
-		}
-		offset += int64(len(line1))
-		lineno++
-		if err1 == io.EOF && err2 == io.EOF {
-			return "no differences in debugging output"
-		}
-
-		if lineno == 1 || line1 == line2 && err1 == nil && err2 == nil {
-			continue
-		}
-		// Lines are inconsistent. Worth stopping?
-		for _, re := range okdiffs {
-			if re.MatchString(line1) && re.MatchString(line2) {
-				fmt.Fprintf(&prefix, "inconsistent log line:\n%s:%d:\n\t%s\n%s:%d:\n\t%s\n\n",
-					f1.Name(), lineno, strings.TrimSuffix(line1, "\n"),
-					f2.Name(), lineno, strings.TrimSuffix(line2, "\n"))
-				continue Reading
-			}
-		}
-
-		if err1 != nil {
-			line1 = err1.Error()
-		}
-		if err2 != nil {
-			line2 = err2.Error()
-		}
-		break
-	}
-
-	msg := fmt.Sprintf("inconsistent log line:\n%s:%d:\n\t%s\n%s:%d:\n\t%s",
-		f1.Name(), lineno, strings.TrimSuffix(line1, "\n"),
-		f2.Name(), lineno, strings.TrimSuffix(line2, "\n"))
-
-	if m := hexDumpRE.FindStringSubmatch(line1); m != nil {
-		target, err := strconv.ParseUint(m[1], 0, 64)
-		if err != nil {
-			goto Skip
-		}
-
-		m2 := hexDumpRE.FindStringSubmatch(line2)
-		if m2 == nil {
-			goto Skip
-		}
-
-		fields1 := strings.Fields(m[2])
-		fields2 := strings.Fields(m2[2])
-		i := 0
-		for i < len(fields1) && i < len(fields2) && fields1[i] == fields2[i] {
-			i++
-		}
-		target += uint64(i)
-
-		f1.Seek(textOffset, 0)
-		b1 = bufio.NewReader(f1)
-		last := ""
-		lineno := textLineno
-		limitAddr := uint64(0)
-		lastAddr := uint64(0)
-		for {
-			line1, err1 := b1.ReadString('\n')
-			if err1 != nil {
-				break
-			}
-			lineno++
-			if m := listingRE.FindStringSubmatch(line1); m != nil {
-				addr, _ := strconv.ParseUint(m[1], 0, 64)
-				if addr > target {
-					limitAddr = addr
-					break
-				}
-				last = line1
-				lastAddr = addr
-			} else if hexDumpRE.FindStringSubmatch(line1) != nil {
-				break
-			}
-		}
-		if last != "" {
-			msg = fmt.Sprintf("assembly instruction at %#04x-%#04x:\n%s:%d\n\t%s\n\n%s",
-				lastAddr, limitAddr, f1.Name(), lineno-1, strings.TrimSuffix(last, "\n"), msg)
-		}
-	}
-Skip:
-
-	return prefix.String() + msg
-}
diff --git a/installer/vendor/golang.org/x/tools/cmd/toolstash/main.go b/installer/vendor/golang.org/x/tools/cmd/toolstash/main.go
deleted file mode 100644
index da56361f56..0000000000
--- a/installer/vendor/golang.org/x/tools/cmd/toolstash/main.go
+++ /dev/null
@@ -1,637 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Toolstash provides a way to save, run, and restore a known good copy of the Go toolchain
-// and to compare the object files generated by two toolchains.
-//
-// Usage:
-//
-//	toolstash [-n] [-v] save [tool...]
-//	toolstash [-n] [-v] restore [tool...]
-//	toolstash [-n] [-v] [-t] go run x.go
-//	toolstash [-n] [-v] [-t] [-cmp] compile x.go
-//
-// The toolstash command manages a ``stashed'' copy of the Go toolchain
-// kept in $GOROOT/pkg/toolstash. In this case, the toolchain means the
-// tools available with the 'go tool' command as well as the go, godoc, and gofmt
-// binaries.
-//
-// The command ``toolstash save'', typically run when the toolchain is known to be working,
-// copies the toolchain from its installed location to the toolstash directory.
-// Its inverse, ``toolchain restore'', typically run when the toolchain is known to be broken,
-// copies the toolchain from the toolstash directory back to the installed locations.
-// If additional arguments are given, the save or restore applies only to the named tools.
-// Otherwise, it applies to all tools.
-//
-// Otherwise, toolstash's arguments should be a command line beginning with the
-// name of a toolchain binary, which may be a short name like compile or a complete path
-// to an installed binary. Toolstash runs the command line using the stashed
-// copy of the binary instead of the installed one.
-//
-// The -n flag causes toolstash to print the commands that would be executed
-// but not execute them. The combination -n -cmp shows the two commands
-// that would be compared and then exits successfully. A real -cmp run might
-// run additional commands for diagnosis of an output mismatch.
-//
-// The -v flag causes toolstash to print the commands being executed.
-//
-// The -t flag causes toolstash to print the time elapsed during while the
-// command ran.
-//
-// Comparing
-//
-// The -cmp flag causes toolstash to run both the installed and the stashed
-// copy of an assembler or compiler and check that they produce identical
-// object files. If not, toolstash reports the mismatch and exits with a failure status.
-// As part of reporting the mismatch, toolstash reinvokes the command with
-// the -S flag and identifies the first divergence in the assembly output.
-// If the command is a Go compiler, toolstash also determines whether the
-// difference is triggered by optimization passes.
-// On failure, toolstash leaves additional information in files named
-// similarly to the default output file. If the compilation would normally
-// produce a file x.6, the output from the stashed tool is left in x.6.stash
-// and the debugging traces are left in x.6.log and x.6.stash.log.
-//
-// The -cmp flag is a no-op when the command line is not invoking an
-// assembler or compiler.
-//
-// For example, when working on code cleanup that should not affect
-// compiler output, toolstash can be used to compare the old and new
-// compiler output:
-//
-//	toolstash save
-//	<edit compiler sources>
-//	go tool dist install cmd/compile # install compiler only
-//	toolstash -cmp compile x.go
-//
-// Go Command Integration
-//
-// The go command accepts a -toolexec flag that specifies a program
-// to use to run the build tools.
-//
-// To build with the stashed tools:
-//
-//	go build -toolexec toolstash x.go
-//
-// To build with the stashed go command and the stashed tools:
-//
-//	toolstash go build -toolexec toolstash x.go
-//
-// To verify that code cleanup in the compilers does not make any
-// changes to the objects being generated for the entire tree:
-//
-//	# Build working tree and save tools.
-//	./make.bash
-//	toolstash save
-//
-//	<edit compiler sources>
-//
-//	# Install new tools, but do not rebuild the rest of tree,
-//	# since the compilers might generate buggy code.
-//	go tool dist install cmd/compile
-//
-//	# Check that new tools behave identically to saved tools.
-//	go build -toolexec 'toolstash -cmp' -a std
-//
-//	# If not, restore, in order to keep working on Go code.
-//	toolstash restore
-//
-// Version Skew
-//
-// The Go tools write the current Go version to object files, and (outside
-// release branches) that version includes the hash and time stamp
-// of the most recent Git commit. Functionally equivalent
-// compilers built at different Git versions may produce object files that
-// differ only in the recorded version. Toolstash ignores version mismatches
-// when comparing object files, but the standard tools will refuse to compile
-// or link together packages with different object versions.
-//
-// For the full build in the final example above to work, both the stashed
-// and the installed tools must use the same version string.
-// One way to ensure this is not to commit any of the changes being
-// tested, so that the Git HEAD hash is the same for both builds.
-// A more robust way to force the tools to have the same version string
-// is to write a $GOROOT/VERSION file, which overrides the Git-based version
-// computation:
-//
-//	echo devel >$GOROOT/VERSION
-//
-// The version can be arbitrary text, but to pass all.bash's API check, it must
-// contain the substring ``devel''. The VERSION file must be created before
-// building either version of the toolchain.
-//
-package main // import "golang.org/x/tools/cmd/toolstash"
-
-import (
-	"bufio"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"time"
-)
-
-var usageMessage = `usage: toolstash [-n] [-v] [-cmp] command line
-
-Examples:
-	toolstash save
-	toolstash restore
-	toolstash go run x.go
-	toolstash compile x.go
-	toolstash -cmp compile x.go
-
-For details, godoc golang.org/x/tools/cmd/toolstash
-`
-
-func usage() {
-	fmt.Fprint(os.Stderr, usageMessage)
-	os.Exit(2)
-}
-
-var (
-	goCmd   = flag.String("go", "go", "path to \"go\" command")
-	norun   = flag.Bool("n", false, "print but do not run commands")
-	verbose = flag.Bool("v", false, "print commands being run")
-	cmp     = flag.Bool("cmp", false, "compare tool object files")
-	timing  = flag.Bool("t", false, "print time commands take")
-)
-
-var (
-	cmd       []string
-	tool      string // name of tool: "go", "compile", etc
-	toolStash string // path to stashed tool
-
-	goroot   string
-	toolDir  string
-	stashDir string
-	binDir   string
-)
-
-func canCmp(name string, args []string) bool {
-	switch name {
-	case "asm", "compile", "link":
-		if len(args) == 1 && (args[0] == "-V" || strings.HasPrefix(args[0], "-V=")) {
-			// cmd/go uses "compile -V=full" to query the tool's build ID.
-			return false
-		}
-		return true
-	}
-	return len(name) == 2 && '0' <= name[0] && name[0] <= '9' && (name[1] == 'a' || name[1] == 'g' || name[1] == 'l')
-}
-
-var binTools = []string{"go", "godoc", "gofmt"}
-
-func isBinTool(name string) bool {
-	return strings.HasPrefix(name, "go")
-}
-
-func main() {
-	log.SetFlags(0)
-	log.SetPrefix("toolstash: ")
-
-	flag.Usage = usage
-	flag.Parse()
-	cmd = flag.Args()
-
-	if len(cmd) < 1 {
-		usage()
-	}
-
-	s, err := exec.Command(*goCmd, "env", "GOROOT").CombinedOutput()
-	if err != nil {
-		log.Fatalf("%s env GOROOT: %v", *goCmd, err)
-	}
-	goroot = strings.TrimSpace(string(s))
-	toolDir = filepath.Join(goroot, fmt.Sprintf("pkg/tool/%s_%s", runtime.GOOS, runtime.GOARCH))
-	stashDir = filepath.Join(goroot, "pkg/toolstash")
-
-	binDir = os.Getenv("GOBIN")
-	if binDir == "" {
-		binDir = filepath.Join(goroot, "bin")
-	}
-
-	switch cmd[0] {
-	case "save":
-		save()
-		return
-
-	case "restore":
-		restore()
-		return
-	}
-
-	tool = cmd[0]
-	if i := strings.LastIndexAny(tool, `/\`); i >= 0 {
-		tool = tool[i+1:]
-	}
-
-	if !strings.HasPrefix(tool, "a.out") {
-		toolStash = filepath.Join(stashDir, tool)
-		if _, err := os.Stat(toolStash); err != nil {
-			log.Print(err)
-			os.Exit(2)
-		}
-
-		if *cmp && canCmp(tool, cmd[1:]) {
-			compareTool()
-			return
-		}
-		cmd[0] = toolStash
-	}
-
-	if *norun {
-		fmt.Printf("%s\n", strings.Join(cmd, " "))
-		return
-	}
-	if *verbose {
-		log.Print(strings.Join(cmd, " "))
-	}
-	xcmd := exec.Command(cmd[0], cmd[1:]...)
-	xcmd.Stdin = os.Stdin
-	xcmd.Stdout = os.Stdout
-	xcmd.Stderr = os.Stderr
-	err = xcmd.Run()
-	if err != nil {
-		log.Fatal(err)
-	}
-	os.Exit(0)
-}
-
-func compareTool() {
-	if !strings.Contains(cmd[0], "/") && !strings.Contains(cmd[0], `\`) {
-		cmd[0] = filepath.Join(toolDir, tool)
-	}
-
-	outfile, ok := cmpRun(false, cmd)
-	if ok {
-		os.Remove(outfile + ".stash")
-		return
-	}
-
-	extra := "-S"
-	switch {
-	default:
-		log.Fatalf("unknown tool %s", tool)
-
-	case tool == "compile" || strings.HasSuffix(tool, "g"): // compiler
-		useDashN := true
-		dashcIndex := -1
-		for i, s := range cmd {
-			if s == "-+" {
-				// Compiling runtime. Don't use -N.
-				useDashN = false
-			}
-			if strings.HasPrefix(s, "-c=") {
-				dashcIndex = i
-			}
-		}
-		cmdN := injectflags(cmd, nil, useDashN)
-		_, ok := cmpRun(false, cmdN)
-		if !ok {
-			if useDashN {
-				log.Printf("compiler output differs, with optimizers disabled (-N)")
-			} else {
-				log.Printf("compiler output differs")
-			}
-			if dashcIndex >= 0 {
-				cmd[dashcIndex] = "-c=1"
-			}
-			cmd = injectflags(cmd, []string{"-v", "-m=2"}, useDashN)
-			break
-		}
-		if dashcIndex >= 0 {
-			cmd[dashcIndex] = "-c=1"
-		}
-		cmd = injectflags(cmd, []string{"-v", "-m=2"}, false)
-		log.Printf("compiler output differs, only with optimizers enabled")
-
-	case tool == "asm" || strings.HasSuffix(tool, "a"): // assembler
-		log.Printf("assembler output differs")
-
-	case tool == "link" || strings.HasSuffix(tool, "l"): // linker
-		log.Printf("linker output differs")
-		extra = "-v=2"
-	}
-
-	cmdS := injectflags(cmd, []string{extra}, false)
-	outfile, _ = cmpRun(true, cmdS)
-
-	fmt.Fprintf(os.Stderr, "\n%s\n", compareLogs(outfile))
-	os.Exit(2)
-}
-
-func injectflags(cmd []string, extra []string, addDashN bool) []string {
-	x := []string{cmd[0]}
-	if addDashN {
-		x = append(x, "-N")
-	}
-	x = append(x, extra...)
-	x = append(x, cmd[1:]...)
-	return x
-}
-
-func cmpRun(keepLog bool, cmd []string) (outfile string, match bool) {
-	cmdStash := make([]string, len(cmd))
-	copy(cmdStash, cmd)
-	cmdStash[0] = toolStash
-	for i, arg := range cmdStash {
-		if arg == "-o" {
-			outfile = cmdStash[i+1]
-			cmdStash[i+1] += ".stash"
-			break
-		}
-		if strings.HasSuffix(arg, ".s") || strings.HasSuffix(arg, ".go") && '0' <= tool[0] && tool[0] <= '9' {
-			outfile = filepath.Base(arg[:strings.LastIndex(arg, ".")] + "." + tool[:1])
-			cmdStash = append([]string{cmdStash[0], "-o", outfile + ".stash"}, cmdStash[1:]...)
-			break
-		}
-	}
-
-	if outfile == "" {
-		log.Fatalf("cannot determine output file for command: %s", strings.Join(cmd, " "))
-	}
-
-	if *norun {
-		fmt.Printf("%s\n", strings.Join(cmd, " "))
-		fmt.Printf("%s\n", strings.Join(cmdStash, " "))
-		os.Exit(0)
-	}
-
-	out, err := runCmd(cmd, keepLog, outfile+".log")
-	if err != nil {
-		log.Printf("running: %s", strings.Join(cmd, " "))
-		os.Stderr.Write(out)
-		log.Fatal(err)
-	}
-
-	outStash, err := runCmd(cmdStash, keepLog, outfile+".stash.log")
-	if err != nil {
-		log.Printf("running: %s", strings.Join(cmdStash, " "))
-		log.Printf("installed tool succeeded but stashed tool failed.\n")
-		if len(out) > 0 {
-			log.Printf("installed tool output:")
-			os.Stderr.Write(out)
-		}
-		if len(outStash) > 0 {
-			log.Printf("stashed tool output:")
-			os.Stderr.Write(outStash)
-		}
-		log.Fatal(err)
-	}
-
-	return outfile, sameObject(outfile, outfile+".stash")
-}
-
-func sameObject(file1, file2 string) bool {
-	f1, err := os.Open(file1)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f1.Close()
-
-	f2, err := os.Open(file2)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f2.Close()
-
-	b1 := bufio.NewReader(f1)
-	b2 := bufio.NewReader(f2)
-
-	// Go object files and archives contain lines of the form
-	//	go object <goos> <goarch> <version>
-	// By default, the version on development branches includes
-	// the Git hash and time stamp for the most recent commit.
-	// We allow the versions to differ.
-	if !skipVersion(b1, b2, file1, file2) {
-		return false
-	}
-
-	lastByte := byte(0)
-	for {
-		c1, err1 := b1.ReadByte()
-		c2, err2 := b2.ReadByte()
-		if err1 == io.EOF && err2 == io.EOF {
-			return true
-		}
-		if err1 != nil {
-			log.Fatalf("reading %s: %v", file1, err1)
-		}
-		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
-		}
-		if c1 != c2 {
-			return false
-		}
-		if lastByte == '`' && c1 == '\n' {
-			if !skipVersion(b1, b2, file1, file2) {
-				return false
-			}
-		}
-		lastByte = c1
-	}
-}
-
-func skipVersion(b1, b2 *bufio.Reader, file1, file2 string) bool {
-	// Consume "go object " prefix, if there.
-	prefix := "go object "
-	for i := 0; i < len(prefix); i++ {
-		c1, err1 := b1.ReadByte()
-		c2, err2 := b2.ReadByte()
-		if err1 == io.EOF && err2 == io.EOF {
-			return true
-		}
-		if err1 != nil {
-			log.Fatalf("reading %s: %v", file1, err1)
-		}
-		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
-		}
-		if c1 != c2 {
-			return false
-		}
-		if c1 != prefix[i] {
-			return true // matching bytes, just not a version
-		}
-	}
-
-	// Keep comparing until second space.
-	// Must continue to match.
-	// If we see a \n, it's not a version string after all.
-	for numSpace := 0; numSpace < 2; {
-		c1, err1 := b1.ReadByte()
-		c2, err2 := b2.ReadByte()
-		if err1 == io.EOF && err2 == io.EOF {
-			return true
-		}
-		if err1 != nil {
-			log.Fatalf("reading %s: %v", file1, err1)
-		}
-		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err1)
-		}
-		if c1 != c2 {
-			return false
-		}
-		if c1 == '\n' {
-			return true
-		}
-		if c1 == ' ' {
-			numSpace++
-		}
-	}
-
-	// Have now seen 'go object goos goarch ' in both files.
-	// Now they're allowed to diverge, until the \n, which
-	// must be present.
-	for {
-		c1, err1 := b1.ReadByte()
-		if err1 == io.EOF {
-			log.Fatalf("reading %s: unexpected EOF", file1)
-		}
-		if err1 != nil {
-			log.Fatalf("reading %s: %v", file1, err1)
-		}
-		if c1 == '\n' {
-			break
-		}
-	}
-	for {
-		c2, err2 := b2.ReadByte()
-		if err2 == io.EOF {
-			log.Fatalf("reading %s: unexpected EOF", file2)
-		}
-		if err2 != nil {
-			log.Fatalf("reading %s: %v", file2, err2)
-		}
-		if c2 == '\n' {
-			break
-		}
-	}
-
-	// Consumed "matching" versions from both.
-	return true
-}
-
-func runCmd(cmd []string, keepLog bool, logName string) (output []byte, err error) {
-	if *verbose {
-		log.Print(strings.Join(cmd, " "))
-	}
-
-	if *timing {
-		t0 := time.Now()
-		defer func() {
-			log.Printf("%.3fs elapsed # %s\n", time.Since(t0).Seconds(), strings.Join(cmd, " "))
-		}()
-	}
-
-	xcmd := exec.Command(cmd[0], cmd[1:]...)
-	if !keepLog {
-		return xcmd.CombinedOutput()
-	}
-
-	f, err := os.Create(logName)
-	if err != nil {
-		log.Fatal(err)
-	}
-	fmt.Fprintf(f, "GOOS=%s GOARCH=%s %s\n", os.Getenv("GOOS"), os.Getenv("GOARCH"), strings.Join(cmd, " "))
-	xcmd.Stdout = f
-	xcmd.Stderr = f
-	defer f.Close()
-	return nil, xcmd.Run()
-}
-
-func save() {
-	if err := os.MkdirAll(stashDir, 0777); err != nil {
-		log.Fatal(err)
-	}
-
-	toolDir := filepath.Join(goroot, fmt.Sprintf("pkg/tool/%s_%s", runtime.GOOS, runtime.GOARCH))
-	files, err := ioutil.ReadDir(toolDir)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for _, file := range files {
-		if shouldSave(file.Name()) && file.Mode().IsRegular() {
-			cp(filepath.Join(toolDir, file.Name()), filepath.Join(stashDir, file.Name()))
-		}
-	}
-
-	for _, name := range binTools {
-		if !shouldSave(name) {
-			continue
-		}
-		src := filepath.Join(binDir, name)
-		if _, err := os.Stat(src); err == nil {
-			cp(src, filepath.Join(stashDir, name))
-		}
-	}
-
-	checkShouldSave()
-}
-
-func restore() {
-	files, err := ioutil.ReadDir(stashDir)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	for _, file := range files {
-		if shouldSave(file.Name()) && file.Mode().IsRegular() {
-			targ := toolDir
-			if isBinTool(file.Name()) {
-				targ = binDir
-			}
-			cp(filepath.Join(stashDir, file.Name()), filepath.Join(targ, file.Name()))
-		}
-	}
-
-	checkShouldSave()
-}
-
-func shouldSave(name string) bool {
-	if len(cmd) == 1 {
-		return true
-	}
-	ok := false
-	for i, arg := range cmd {
-		if i > 0 && name == arg {
-			ok = true
-			cmd[i] = "DONE"
-		}
-	}
-	return ok
-}
-
-func checkShouldSave() {
-	var missing []string
-	for _, arg := range cmd[1:] {
-		if arg != "DONE" {
-			missing = append(missing, arg)
-		}
-	}
-	if len(missing) > 0 {
-		log.Fatalf("%s did not find tools: %s", cmd[0], strings.Join(missing, " "))
-	}
-}
-
-func cp(src, dst string) {
-	if *verbose {
-		fmt.Printf("cp %s %s\n", src, dst)
-	}
-	data, err := ioutil.ReadFile(src)
-	if err != nil {
-		log.Fatal(err)
-	}
-	if err := ioutil.WriteFile(dst, data, 0777); err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/codereview.cfg b/installer/vendor/golang.org/x/tools/codereview.cfg
deleted file mode 100644
index 3f8b14b64e..0000000000
--- a/installer/vendor/golang.org/x/tools/codereview.cfg
+++ /dev/null
@@ -1 +0,0 @@
-issuerepo: golang/go
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.go b/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.go
deleted file mode 100644
index 99ea813d28..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!appengine,!gccgo
-
-package intsets
-
-func popcnt(x word) int
-func havePOPCNT() bool
-
-var hasPOPCNT = havePOPCNT()
-
-// popcount returns the population count (number of set bits) of x.
-func popcount(x word) int {
-	if hasPOPCNT {
-		return popcnt(x)
-	}
-	return popcountTable(x) // faster than Hacker's Delight
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.s b/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.s
deleted file mode 100644
index 05c3d6fb57..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_amd64.s
+++ /dev/null
@@ -1,30 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build amd64,!appengine,!gccgo
-
-#include "textflag.h"
-
-// func havePOPCNT() bool
-TEXT ·havePOPCNT(SB),4,$0
-	MOVQ	$1, AX
-	CPUID
-	SHRQ	$23, CX
-	ANDQ	$1, CX
-	MOVB	CX, ret+0(FP)
-	RET
-
-// func popcnt(word) int
-TEXT ·popcnt(SB),NOSPLIT,$0-8
-	XORQ	AX, AX
-	MOVQ	x+0(FP), SI
-	// POPCNT (SI), AX is not recognized by Go assembler,
-	// so we assemble it ourselves.
-	BYTE	$0xf3
-	BYTE	$0x48
-	BYTE	$0x0f
-	BYTE	$0xb8
-	BYTE	$0xc6
-	MOVQ	AX, ret+8(FP)
-	RET
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo.go b/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo.go
deleted file mode 100644
index 82a8875c85..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-package intsets
-
-func popcount(x word) int
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo_c.c b/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo_c.c
deleted file mode 100644
index 08abb32ec4..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_gccgo_c.c
+++ /dev/null
@@ -1,19 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build gccgo
-
-#include <errno.h>
-#include <stdint.h>
-#include <unistd.h>
-
-#define _STRINGIFY2_(x) #x
-#define _STRINGIFY_(x) _STRINGIFY2_(x)
-#define GOSYM_PREFIX _STRINGIFY_(__USER_LABEL_PREFIX__)
-
-extern intptr_t popcount(uintptr_t x) __asm__(GOSYM_PREFIX GOPKGPATH ".popcount");
-
-intptr_t popcount(uintptr_t x) {
-	return __builtin_popcountl((unsigned long)(x));
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_generic.go b/installer/vendor/golang.org/x/tools/container/intsets/popcnt_generic.go
deleted file mode 100644
index 3985a1da1a..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/popcnt_generic.go
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !amd64 appengine
-// +build !gccgo
-
-package intsets
-
-import "runtime"
-
-// We compared three algorithms---Hacker's Delight, table lookup,
-// and AMD64's SSE4.1 hardware POPCNT---on a 2.67GHz Xeon X5550.
-//
-// % GOARCH=amd64 go test -run=NONE -bench=Popcount
-// POPCNT               5.12 ns/op
-// Table                8.53 ns/op
-// HackersDelight       9.96 ns/op
-//
-// % GOARCH=386 go test -run=NONE -bench=Popcount
-// Table               10.4  ns/op
-// HackersDelight       5.23 ns/op
-//
-// (AMD64's ABM1 hardware supports ntz and nlz too,
-// but they aren't critical.)
-
-// popcount returns the population count (number of set bits) of x.
-func popcount(x word) int {
-	if runtime.GOARCH == "386" {
-		return popcountHD(uint32(x))
-	}
-	return popcountTable(x)
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/sparse.go b/installer/vendor/golang.org/x/tools/container/intsets/sparse.go
deleted file mode 100644
index 5db01c1a44..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/sparse.go
+++ /dev/null
@@ -1,1091 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package intsets provides Sparse, a compact and fast representation
-// for sparse sets of int values.
-//
-// The time complexity of the operations Len, Insert, Remove and Has
-// is in O(n) but in practice those methods are faster and more
-// space-efficient than equivalent operations on sets based on the Go
-// map type.  The IsEmpty, Min, Max, Clear and TakeMin operations
-// require constant time.
-//
-package intsets // import "golang.org/x/tools/container/intsets"
-
-// TODO(adonovan):
-// - Add InsertAll(...int), RemoveAll(...int)
-// - Add 'bool changed' results for {Intersection,Difference}With too.
-//
-// TODO(adonovan): implement Dense, a dense bit vector with a similar API.
-// The space usage would be proportional to Max(), not Len(), and the
-// implementation would be based upon big.Int.
-//
-// TODO(adonovan): opt: make UnionWith and Difference faster.
-// These are the hot-spots for go/pointer.
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// A Sparse is a set of int values.
-// Sparse operations (even queries) are not concurrency-safe.
-//
-// The zero value for Sparse is a valid empty set.
-//
-// Sparse sets must be copied using the Copy method, not by assigning
-// a Sparse value.
-//
-type Sparse struct {
-	// An uninitialized Sparse represents an empty set.
-	// An empty set may also be represented by
-	//  root.next == root.prev == &root.
-	//
-	// The root is always the block with the smallest offset.
-	// It can be empty, but only if it is the only block; in that case, offset is
-	// MaxInt (which is not a valid offset).
-	root block
-}
-
-type word uintptr
-
-const (
-	_m            = ^word(0)
-	bitsPerWord   = 8 << (_m>>8&1 + _m>>16&1 + _m>>32&1)
-	bitsPerBlock  = 256 // optimal value for go/pointer solver performance
-	wordsPerBlock = bitsPerBlock / bitsPerWord
-)
-
-// Limit values of implementation-specific int type.
-const (
-	MaxInt = int(^uint(0) >> 1)
-	MinInt = -MaxInt - 1
-)
-
-// -- block ------------------------------------------------------------
-
-// A set is represented as a circular doubly-linked list of blocks,
-// each containing an offset and a bit array of fixed size
-// bitsPerBlock; the blocks are ordered by increasing offset.
-//
-// The set contains an element x iff the block whose offset is x - (x
-// mod bitsPerBlock) has the bit (x mod bitsPerBlock) set, where mod
-// is the Euclidean remainder.
-//
-// A block may only be empty transiently.
-//
-type block struct {
-	offset     int                 // offset mod bitsPerBlock == 0
-	bits       [wordsPerBlock]word // contains at least one set bit
-	next, prev *block              // doubly-linked list of blocks
-}
-
-// wordMask returns the word index (in block.bits)
-// and single-bit mask for the block's ith bit.
-func wordMask(i uint) (w uint, mask word) {
-	w = i / bitsPerWord
-	mask = 1 << (i % bitsPerWord)
-	return
-}
-
-// insert sets the block b's ith bit and
-// returns true if it was not already set.
-//
-func (b *block) insert(i uint) bool {
-	w, mask := wordMask(i)
-	if b.bits[w]&mask == 0 {
-		b.bits[w] |= mask
-		return true
-	}
-	return false
-}
-
-// remove clears the block's ith bit and
-// returns true if the bit was previously set.
-// NB: may leave the block empty.
-//
-func (b *block) remove(i uint) bool {
-	w, mask := wordMask(i)
-	if b.bits[w]&mask != 0 {
-		b.bits[w] &^= mask
-		return true
-	}
-	return false
-}
-
-// has reports whether the block's ith bit is set.
-func (b *block) has(i uint) bool {
-	w, mask := wordMask(i)
-	return b.bits[w]&mask != 0
-}
-
-// empty reports whether b.len()==0, but more efficiently.
-func (b *block) empty() bool {
-	for _, w := range b.bits {
-		if w != 0 {
-			return false
-		}
-	}
-	return true
-}
-
-// len returns the number of set bits in block b.
-func (b *block) len() int {
-	var l int
-	for _, w := range b.bits {
-		l += popcount(w)
-	}
-	return l
-}
-
-// max returns the maximum element of the block.
-// The block must not be empty.
-func (b *block) max() int {
-	bi := b.offset + bitsPerBlock
-	// Decrement bi by number of high zeros in last.bits.
-	for i := len(b.bits) - 1; i >= 0; i-- {
-		if w := b.bits[i]; w != 0 {
-			return bi - nlz(w) - 1
-		}
-		bi -= bitsPerWord
-	}
-	panic("BUG: empty block")
-}
-
-// min returns the minimum element of the block,
-// and also removes it if take is set.
-// The block must not be initially empty.
-// NB: may leave the block empty.
-func (b *block) min(take bool) int {
-	for i, w := range b.bits {
-		if w != 0 {
-			tz := ntz(w)
-			if take {
-				b.bits[i] = w &^ (1 << uint(tz))
-			}
-			return b.offset + int(i*bitsPerWord) + tz
-		}
-	}
-	panic("BUG: empty block")
-}
-
-// lowerBound returns the smallest element of the block that is greater than or
-// equal to the element corresponding to the ith bit. If there is no such
-// element, the second return value is false.
-func (b *block) lowerBound(i uint) (int, bool) {
-	w := i / bitsPerWord
-	bit := i % bitsPerWord
-
-	if val := b.bits[w] >> bit; val != 0 {
-		return b.offset + int(i) + ntz(val), true
-	}
-
-	for w++; w < wordsPerBlock; w++ {
-		if val := b.bits[w]; val != 0 {
-			return b.offset + int(w*bitsPerWord) + ntz(val), true
-		}
-	}
-
-	return 0, false
-}
-
-// forEach calls f for each element of block b.
-// f must not mutate b's enclosing Sparse.
-func (b *block) forEach(f func(int)) {
-	for i, w := range b.bits {
-		offset := b.offset + i*bitsPerWord
-		for bi := 0; w != 0 && bi < bitsPerWord; bi++ {
-			if w&1 != 0 {
-				f(offset)
-			}
-			offset++
-			w >>= 1
-		}
-	}
-}
-
-// offsetAndBitIndex returns the offset of the block that would
-// contain x and the bit index of x within that block.
-//
-func offsetAndBitIndex(x int) (int, uint) {
-	mod := x % bitsPerBlock
-	if mod < 0 {
-		// Euclidean (non-negative) remainder
-		mod += bitsPerBlock
-	}
-	return x - mod, uint(mod)
-}
-
-// -- Sparse --------------------------------------------------------------
-
-// none is a shared, empty, sentinel block that indicates the end of a block
-// list.
-var none block
-
-// Dummy type used to generate an implicit panic. This must be defined at the
-// package level; if it is defined inside a function, it prevents the inlining
-// of that function.
-type to_copy_a_sparse_you_must_call_its_Copy_method struct{}
-
-// init ensures s is properly initialized.
-func (s *Sparse) init() {
-	root := &s.root
-	if root.next == nil {
-		root.offset = MaxInt
-		root.next = root
-		root.prev = root
-	} else if root.next.prev != root {
-		// Copying a Sparse x leads to pernicious corruption: the
-		// new Sparse y shares the old linked list, but iteration
-		// on y will never encounter &y.root so it goes into a
-		// loop.  Fail fast before this occurs.
-		// We don't want to call panic here because it prevents the
-		// inlining of this function.
-		_ = (interface{}(nil)).(to_copy_a_sparse_you_must_call_its_Copy_method)
-	}
-}
-
-func (s *Sparse) first() *block {
-	s.init()
-	if s.root.offset == MaxInt {
-		return &none
-	}
-	return &s.root
-}
-
-// next returns the next block in the list, or end if b is the last block.
-func (s *Sparse) next(b *block) *block {
-	if b.next == &s.root {
-		return &none
-	}
-	return b.next
-}
-
-// prev returns the previous block in the list, or end if b is the first block.
-func (s *Sparse) prev(b *block) *block {
-	if b.prev == &s.root {
-		return &none
-	}
-	return b.prev
-}
-
-// IsEmpty reports whether the set s is empty.
-func (s *Sparse) IsEmpty() bool {
-	return s.root.next == nil || s.root.offset == MaxInt
-}
-
-// Len returns the number of elements in the set s.
-func (s *Sparse) Len() int {
-	var l int
-	for b := s.first(); b != &none; b = s.next(b) {
-		l += b.len()
-	}
-	return l
-}
-
-// Max returns the maximum element of the set s, or MinInt if s is empty.
-func (s *Sparse) Max() int {
-	if s.IsEmpty() {
-		return MinInt
-	}
-	return s.root.prev.max()
-}
-
-// Min returns the minimum element of the set s, or MaxInt if s is empty.
-func (s *Sparse) Min() int {
-	if s.IsEmpty() {
-		return MaxInt
-	}
-	return s.root.min(false)
-}
-
-// LowerBound returns the smallest element >= x, or MaxInt if there is no such
-// element.
-func (s *Sparse) LowerBound(x int) int {
-	offset, i := offsetAndBitIndex(x)
-	for b := s.first(); b != &none; b = s.next(b) {
-		if b.offset > offset {
-			return b.min(false)
-		}
-		if b.offset == offset {
-			if y, ok := b.lowerBound(i); ok {
-				return y
-			}
-		}
-	}
-	return MaxInt
-}
-
-// block returns the block that would contain offset,
-// or nil if s contains no such block.
-// Precondition: offset is a multiple of bitsPerBlock.
-func (s *Sparse) block(offset int) *block {
-	for b := s.first(); b != &none && b.offset <= offset; b = s.next(b) {
-		if b.offset == offset {
-			return b
-		}
-	}
-	return nil
-}
-
-// Insert adds x to the set s, and reports whether the set grew.
-func (s *Sparse) Insert(x int) bool {
-	offset, i := offsetAndBitIndex(x)
-
-	b := s.first()
-	for ; b != &none && b.offset <= offset; b = s.next(b) {
-		if b.offset == offset {
-			return b.insert(i)
-		}
-	}
-
-	// Insert new block before b.
-	new := s.insertBlockBefore(b)
-	new.offset = offset
-	return new.insert(i)
-}
-
-// removeBlock removes a block and returns the block that followed it (or end if
-// it was the last block).
-func (s *Sparse) removeBlock(b *block) *block {
-	if b != &s.root {
-		b.prev.next = b.next
-		b.next.prev = b.prev
-		if b.next == &s.root {
-			return &none
-		}
-		return b.next
-	}
-
-	first := s.root.next
-	if first == &s.root {
-		// This was the only block.
-		s.Clear()
-		return &none
-	}
-	s.root.offset = first.offset
-	s.root.bits = first.bits
-	if first.next == &s.root {
-		// Single block remaining.
-		s.root.next = &s.root
-		s.root.prev = &s.root
-	} else {
-		s.root.next = first.next
-		first.next.prev = &s.root
-	}
-	return &s.root
-}
-
-// Remove removes x from the set s, and reports whether the set shrank.
-func (s *Sparse) Remove(x int) bool {
-	offset, i := offsetAndBitIndex(x)
-	if b := s.block(offset); b != nil {
-		if !b.remove(i) {
-			return false
-		}
-		if b.empty() {
-			s.removeBlock(b)
-		}
-		return true
-	}
-	return false
-}
-
-// Clear removes all elements from the set s.
-func (s *Sparse) Clear() {
-	s.root = block{
-		offset: MaxInt,
-		next:   &s.root,
-		prev:   &s.root,
-	}
-}
-
-// If set s is non-empty, TakeMin sets *p to the minimum element of
-// the set s, removes that element from the set and returns true.
-// Otherwise, it returns false and *p is undefined.
-//
-// This method may be used for iteration over a worklist like so:
-//
-// 	var x int
-// 	for worklist.TakeMin(&x) { use(x) }
-//
-func (s *Sparse) TakeMin(p *int) bool {
-	if s.IsEmpty() {
-		return false
-	}
-	*p = s.root.min(true)
-	if s.root.empty() {
-		s.removeBlock(&s.root)
-	}
-	return true
-}
-
-// Has reports whether x is an element of the set s.
-func (s *Sparse) Has(x int) bool {
-	offset, i := offsetAndBitIndex(x)
-	if b := s.block(offset); b != nil {
-		return b.has(i)
-	}
-	return false
-}
-
-// forEach applies function f to each element of the set s in order.
-//
-// f must not mutate s.  Consequently, forEach is not safe to expose
-// to clients.  In any case, using "range s.AppendTo()" allows more
-// natural control flow with continue/break/return.
-//
-func (s *Sparse) forEach(f func(int)) {
-	for b := s.first(); b != &none; b = s.next(b) {
-		b.forEach(f)
-	}
-}
-
-// Copy sets s to the value of x.
-func (s *Sparse) Copy(x *Sparse) {
-	if s == x {
-		return
-	}
-
-	xb := x.first()
-	sb := s.first()
-	for xb != &none {
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = xb.offset
-		sb.bits = xb.bits
-		xb = x.next(xb)
-		sb = s.next(sb)
-	}
-	s.discardTail(sb)
-}
-
-// insertBlockBefore returns a new block, inserting it before next.
-// If next is the root, the root is replaced. If next is end, the block is
-// inserted at the end.
-func (s *Sparse) insertBlockBefore(next *block) *block {
-	if s.IsEmpty() {
-		if next != &none {
-			panic("BUG: passed block with empty set")
-		}
-		return &s.root
-	}
-
-	if next == &s.root {
-		// Special case: we need to create a new block that will become the root
-		// block.The old root block becomes the second block.
-		second := s.root
-		s.root = block{
-			next: &second,
-		}
-		if second.next == &s.root {
-			s.root.prev = &second
-		} else {
-			s.root.prev = second.prev
-			second.next.prev = &second
-			second.prev = &s.root
-		}
-		return &s.root
-	}
-	if next == &none {
-		// Insert before root.
-		next = &s.root
-	}
-	b := new(block)
-	b.next = next
-	b.prev = next.prev
-	b.prev.next = b
-	next.prev = b
-	return b
-}
-
-// discardTail removes block b and all its successors from s.
-func (s *Sparse) discardTail(b *block) {
-	if b != &none {
-		if b == &s.root {
-			s.Clear()
-		} else {
-			b.prev.next = &s.root
-			s.root.prev = b.prev
-		}
-	}
-}
-
-// IntersectionWith sets s to the intersection s ∩ x.
-func (s *Sparse) IntersectionWith(x *Sparse) {
-	if s == x {
-		return
-	}
-
-	xb := x.first()
-	sb := s.first()
-	for xb != &none && sb != &none {
-		switch {
-		case xb.offset < sb.offset:
-			xb = x.next(xb)
-
-		case xb.offset > sb.offset:
-			sb = s.removeBlock(sb)
-
-		default:
-			var sum word
-			for i := range sb.bits {
-				r := xb.bits[i] & sb.bits[i]
-				sb.bits[i] = r
-				sum |= r
-			}
-			if sum != 0 {
-				sb = s.next(sb)
-			} else {
-				// sb will be overwritten or removed
-			}
-
-			xb = x.next(xb)
-		}
-	}
-
-	s.discardTail(sb)
-}
-
-// Intersection sets s to the intersection x ∩ y.
-func (s *Sparse) Intersection(x, y *Sparse) {
-	switch {
-	case s == x:
-		s.IntersectionWith(y)
-		return
-	case s == y:
-		s.IntersectionWith(x)
-		return
-	case x == y:
-		s.Copy(x)
-		return
-	}
-
-	xb := x.first()
-	yb := y.first()
-	sb := s.first()
-	for xb != &none && yb != &none {
-		switch {
-		case xb.offset < yb.offset:
-			xb = x.next(xb)
-			continue
-		case xb.offset > yb.offset:
-			yb = y.next(yb)
-			continue
-		}
-
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = xb.offset
-
-		var sum word
-		for i := range sb.bits {
-			r := xb.bits[i] & yb.bits[i]
-			sb.bits[i] = r
-			sum |= r
-		}
-		if sum != 0 {
-			sb = s.next(sb)
-		} else {
-			// sb will be overwritten or removed
-		}
-
-		xb = x.next(xb)
-		yb = y.next(yb)
-	}
-
-	s.discardTail(sb)
-}
-
-// Intersects reports whether s ∩ x ≠ ∅.
-func (s *Sparse) Intersects(x *Sparse) bool {
-	sb := s.first()
-	xb := x.first()
-	for sb != &none && xb != &none {
-		switch {
-		case xb.offset < sb.offset:
-			xb = x.next(xb)
-		case xb.offset > sb.offset:
-			sb = s.next(sb)
-		default:
-			for i := range sb.bits {
-				if sb.bits[i]&xb.bits[i] != 0 {
-					return true
-				}
-			}
-			sb = s.next(sb)
-			xb = x.next(xb)
-		}
-	}
-	return false
-}
-
-// UnionWith sets s to the union s ∪ x, and reports whether s grew.
-func (s *Sparse) UnionWith(x *Sparse) bool {
-	if s == x {
-		return false
-	}
-
-	var changed bool
-	xb := x.first()
-	sb := s.first()
-	for xb != &none {
-		if sb != &none && sb.offset == xb.offset {
-			for i := range xb.bits {
-				if sb.bits[i] != xb.bits[i] {
-					sb.bits[i] |= xb.bits[i]
-					changed = true
-				}
-			}
-			xb = x.next(xb)
-		} else if sb == &none || sb.offset > xb.offset {
-			sb = s.insertBlockBefore(sb)
-			sb.offset = xb.offset
-			sb.bits = xb.bits
-			changed = true
-
-			xb = x.next(xb)
-		}
-		sb = s.next(sb)
-	}
-	return changed
-}
-
-// Union sets s to the union x ∪ y.
-func (s *Sparse) Union(x, y *Sparse) {
-	switch {
-	case x == y:
-		s.Copy(x)
-		return
-	case s == x:
-		s.UnionWith(y)
-		return
-	case s == y:
-		s.UnionWith(x)
-		return
-	}
-
-	xb := x.first()
-	yb := y.first()
-	sb := s.first()
-	for xb != &none || yb != &none {
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		switch {
-		case yb == &none || (xb != &none && xb.offset < yb.offset):
-			sb.offset = xb.offset
-			sb.bits = xb.bits
-			xb = x.next(xb)
-
-		case xb == &none || (yb != &none && yb.offset < xb.offset):
-			sb.offset = yb.offset
-			sb.bits = yb.bits
-			yb = y.next(yb)
-
-		default:
-			sb.offset = xb.offset
-			for i := range xb.bits {
-				sb.bits[i] = xb.bits[i] | yb.bits[i]
-			}
-			xb = x.next(xb)
-			yb = y.next(yb)
-		}
-		sb = s.next(sb)
-	}
-
-	s.discardTail(sb)
-}
-
-// DifferenceWith sets s to the difference s ∖ x.
-func (s *Sparse) DifferenceWith(x *Sparse) {
-	if s == x {
-		s.Clear()
-		return
-	}
-
-	xb := x.first()
-	sb := s.first()
-	for xb != &none && sb != &none {
-		switch {
-		case xb.offset > sb.offset:
-			sb = s.next(sb)
-
-		case xb.offset < sb.offset:
-			xb = x.next(xb)
-
-		default:
-			var sum word
-			for i := range sb.bits {
-				r := sb.bits[i] & ^xb.bits[i]
-				sb.bits[i] = r
-				sum |= r
-			}
-			if sum == 0 {
-				sb = s.removeBlock(sb)
-			} else {
-				sb = s.next(sb)
-			}
-			xb = x.next(xb)
-		}
-	}
-}
-
-// Difference sets s to the difference x ∖ y.
-func (s *Sparse) Difference(x, y *Sparse) {
-	switch {
-	case x == y:
-		s.Clear()
-		return
-	case s == x:
-		s.DifferenceWith(y)
-		return
-	case s == y:
-		var y2 Sparse
-		y2.Copy(y)
-		s.Difference(x, &y2)
-		return
-	}
-
-	xb := x.first()
-	yb := y.first()
-	sb := s.first()
-	for xb != &none && yb != &none {
-		if xb.offset > yb.offset {
-			// y has block, x has &none
-			yb = y.next(yb)
-			continue
-		}
-
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = xb.offset
-
-		switch {
-		case xb.offset < yb.offset:
-			// x has block, y has &none
-			sb.bits = xb.bits
-
-			sb = s.next(sb)
-
-		default:
-			// x and y have corresponding blocks
-			var sum word
-			for i := range sb.bits {
-				r := xb.bits[i] & ^yb.bits[i]
-				sb.bits[i] = r
-				sum |= r
-			}
-			if sum != 0 {
-				sb = s.next(sb)
-			} else {
-				// sb will be overwritten or removed
-			}
-
-			yb = y.next(yb)
-		}
-		xb = x.next(xb)
-	}
-
-	for xb != &none {
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = xb.offset
-		sb.bits = xb.bits
-		sb = s.next(sb)
-
-		xb = x.next(xb)
-	}
-
-	s.discardTail(sb)
-}
-
-// SymmetricDifferenceWith sets s to the symmetric difference s ∆ x.
-func (s *Sparse) SymmetricDifferenceWith(x *Sparse) {
-	if s == x {
-		s.Clear()
-		return
-	}
-
-	sb := s.first()
-	xb := x.first()
-	for xb != &none && sb != &none {
-		switch {
-		case sb.offset < xb.offset:
-			sb = s.next(sb)
-		case xb.offset < sb.offset:
-			nb := s.insertBlockBefore(sb)
-			nb.offset = xb.offset
-			nb.bits = xb.bits
-			xb = x.next(xb)
-		default:
-			var sum word
-			for i := range sb.bits {
-				r := sb.bits[i] ^ xb.bits[i]
-				sb.bits[i] = r
-				sum |= r
-			}
-			if sum == 0 {
-				sb = s.removeBlock(sb)
-			} else {
-				sb = s.next(sb)
-			}
-			xb = x.next(xb)
-		}
-	}
-
-	for xb != &none { // append the tail of x to s
-		sb = s.insertBlockBefore(sb)
-		sb.offset = xb.offset
-		sb.bits = xb.bits
-		sb = s.next(sb)
-		xb = x.next(xb)
-	}
-}
-
-// SymmetricDifference sets s to the symmetric difference x ∆ y.
-func (s *Sparse) SymmetricDifference(x, y *Sparse) {
-	switch {
-	case x == y:
-		s.Clear()
-		return
-	case s == x:
-		s.SymmetricDifferenceWith(y)
-		return
-	case s == y:
-		s.SymmetricDifferenceWith(x)
-		return
-	}
-
-	sb := s.first()
-	xb := x.first()
-	yb := y.first()
-	for xb != &none && yb != &none {
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		switch {
-		case yb.offset < xb.offset:
-			sb.offset = yb.offset
-			sb.bits = yb.bits
-			sb = s.next(sb)
-			yb = y.next(yb)
-		case xb.offset < yb.offset:
-			sb.offset = xb.offset
-			sb.bits = xb.bits
-			sb = s.next(sb)
-			xb = x.next(xb)
-		default:
-			var sum word
-			for i := range sb.bits {
-				r := xb.bits[i] ^ yb.bits[i]
-				sb.bits[i] = r
-				sum |= r
-			}
-			if sum != 0 {
-				sb.offset = xb.offset
-				sb = s.next(sb)
-			}
-			xb = x.next(xb)
-			yb = y.next(yb)
-		}
-	}
-
-	for xb != &none { // append the tail of x to s
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = xb.offset
-		sb.bits = xb.bits
-		sb = s.next(sb)
-		xb = x.next(xb)
-	}
-
-	for yb != &none { // append the tail of y to s
-		if sb == &none {
-			sb = s.insertBlockBefore(sb)
-		}
-		sb.offset = yb.offset
-		sb.bits = yb.bits
-		sb = s.next(sb)
-		yb = y.next(yb)
-	}
-
-	s.discardTail(sb)
-}
-
-// SubsetOf reports whether s ∖ x = ∅.
-func (s *Sparse) SubsetOf(x *Sparse) bool {
-	if s == x {
-		return true
-	}
-
-	sb := s.first()
-	xb := x.first()
-	for sb != &none {
-		switch {
-		case xb == &none || xb.offset > sb.offset:
-			return false
-		case xb.offset < sb.offset:
-			xb = x.next(xb)
-		default:
-			for i := range sb.bits {
-				if sb.bits[i]&^xb.bits[i] != 0 {
-					return false
-				}
-			}
-			sb = s.next(sb)
-			xb = x.next(xb)
-		}
-	}
-	return true
-}
-
-// Equals reports whether the sets s and t have the same elements.
-func (s *Sparse) Equals(t *Sparse) bool {
-	if s == t {
-		return true
-	}
-	sb := s.first()
-	tb := t.first()
-	for {
-		switch {
-		case sb == &none && tb == &none:
-			return true
-		case sb == &none || tb == &none:
-			return false
-		case sb.offset != tb.offset:
-			return false
-		case sb.bits != tb.bits:
-			return false
-		}
-
-		sb = s.next(sb)
-		tb = t.next(tb)
-	}
-}
-
-// String returns a human-readable description of the set s.
-func (s *Sparse) String() string {
-	var buf bytes.Buffer
-	buf.WriteByte('{')
-	s.forEach(func(x int) {
-		if buf.Len() > 1 {
-			buf.WriteByte(' ')
-		}
-		fmt.Fprintf(&buf, "%d", x)
-	})
-	buf.WriteByte('}')
-	return buf.String()
-}
-
-// BitString returns the set as a string of 1s and 0s denoting the sum
-// of the i'th powers of 2, for each i in s.  A radix point, always
-// preceded by a digit, appears if the sum is non-integral.
-//
-// Examples:
-//              {}.BitString() =      "0"
-//           {4,5}.BitString() = "110000"
-//            {-3}.BitString() =      "0.001"
-//      {-3,0,4,5}.BitString() = "110001.001"
-//
-func (s *Sparse) BitString() string {
-	if s.IsEmpty() {
-		return "0"
-	}
-
-	min, max := s.Min(), s.Max()
-	var nbytes int
-	if max > 0 {
-		nbytes = max
-	}
-	nbytes++ // zero bit
-	radix := nbytes
-	if min < 0 {
-		nbytes += len(".") - min
-	}
-
-	b := make([]byte, nbytes)
-	for i := range b {
-		b[i] = '0'
-	}
-	if radix < nbytes {
-		b[radix] = '.'
-	}
-	s.forEach(func(x int) {
-		if x >= 0 {
-			x += len(".")
-		}
-		b[radix-x] = '1'
-	})
-	return string(b)
-}
-
-// GoString returns a string showing the internal representation of
-// the set s.
-//
-func (s *Sparse) GoString() string {
-	var buf bytes.Buffer
-	for b := s.first(); b != &none; b = s.next(b) {
-		fmt.Fprintf(&buf, "block %p {offset=%d next=%p prev=%p",
-			b, b.offset, b.next, b.prev)
-		for _, w := range b.bits {
-			fmt.Fprintf(&buf, " 0%016x", w)
-		}
-		fmt.Fprintf(&buf, "}\n")
-	}
-	return buf.String()
-}
-
-// AppendTo returns the result of appending the elements of s to slice
-// in order.
-func (s *Sparse) AppendTo(slice []int) []int {
-	s.forEach(func(x int) {
-		slice = append(slice, x)
-	})
-	return slice
-}
-
-// -- Testing/debugging ------------------------------------------------
-
-// check returns an error if the representation invariants of s are violated.
-func (s *Sparse) check() error {
-	s.init()
-	if s.root.empty() {
-		// An empty set must have only the root block with offset MaxInt.
-		if s.root.next != &s.root {
-			return fmt.Errorf("multiple blocks with empty root block")
-		}
-		if s.root.offset != MaxInt {
-			return fmt.Errorf("empty set has offset %d, should be MaxInt", s.root.offset)
-		}
-		return nil
-	}
-	for b := s.first(); ; b = s.next(b) {
-		if b.offset%bitsPerBlock != 0 {
-			return fmt.Errorf("bad offset modulo: %d", b.offset)
-		}
-		if b.empty() {
-			return fmt.Errorf("empty block")
-		}
-		if b.prev.next != b {
-			return fmt.Errorf("bad prev.next link")
-		}
-		if b.next.prev != b {
-			return fmt.Errorf("bad next.prev link")
-		}
-		if b.next == &s.root {
-			break
-		}
-		if b.offset >= b.next.offset {
-			return fmt.Errorf("bad offset order: b.offset=%d, b.next.offset=%d",
-				b.offset, b.next.offset)
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/sparse_test.go b/installer/vendor/golang.org/x/tools/container/intsets/sparse_test.go
deleted file mode 100644
index e3ef9d3d05..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/sparse_test.go
+++ /dev/null
@@ -1,710 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package intsets_test
-
-import (
-	"fmt"
-	"log"
-	"math/rand"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/container/intsets"
-)
-
-func TestBasics(t *testing.T) {
-	var s intsets.Sparse
-	if len := s.Len(); len != 0 {
-		t.Errorf("Len({}): got %d, want 0", len)
-	}
-	if s := s.String(); s != "{}" {
-		t.Errorf("String({}): got %q, want \"{}\"", s)
-	}
-	if s.Has(3) {
-		t.Errorf("Has(3): got true, want false")
-	}
-	if err := s.Check(); err != nil {
-		t.Error(err)
-	}
-
-	if !s.Insert(3) {
-		t.Errorf("Insert(3): got false, want true")
-	}
-	if max := s.Max(); max != 3 {
-		t.Errorf("Max: got %d, want 3", max)
-	}
-
-	if !s.Insert(435) {
-		t.Errorf("Insert(435): got false, want true")
-	}
-	if s := s.String(); s != "{3 435}" {
-		t.Errorf("String({3 435}): got %q, want \"{3 435}\"", s)
-	}
-	if max := s.Max(); max != 435 {
-		t.Errorf("Max: got %d, want 435", max)
-	}
-	if len := s.Len(); len != 2 {
-		t.Errorf("Len: got %d, want 2", len)
-	}
-
-	if !s.Remove(435) {
-		t.Errorf("Remove(435): got false, want true")
-	}
-	if s := s.String(); s != "{3}" {
-		t.Errorf("String({3}): got %q, want \"{3}\"", s)
-	}
-}
-
-// Insert, Len, IsEmpty, Hash, Clear, AppendTo.
-func TestMoreBasics(t *testing.T) {
-	set := new(intsets.Sparse)
-	set.Insert(456)
-	set.Insert(123)
-	set.Insert(789)
-	if set.Len() != 3 {
-		t.Errorf("%s.Len: got %d, want 3", set, set.Len())
-	}
-	if set.IsEmpty() {
-		t.Errorf("%s.IsEmpty: got true", set)
-	}
-	if !set.Has(123) {
-		t.Errorf("%s.Has(123): got false", set)
-	}
-	if set.Has(1234) {
-		t.Errorf("%s.Has(1234): got true", set)
-	}
-	got := set.AppendTo([]int{-1})
-	if want := []int{-1, 123, 456, 789}; fmt.Sprint(got) != fmt.Sprint(want) {
-		t.Errorf("%s.AppendTo: got %v, want %v", set, got, want)
-	}
-
-	set.Clear()
-
-	if set.Len() != 0 {
-		t.Errorf("Clear: got %d, want 0", set.Len())
-	}
-	if !set.IsEmpty() {
-		t.Errorf("IsEmpty: got false")
-	}
-	if set.Has(123) {
-		t.Errorf("%s.Has: got false", set)
-	}
-}
-
-func TestTakeMin(t *testing.T) {
-	var set intsets.Sparse
-	set.Insert(456)
-	set.Insert(123)
-	set.Insert(789)
-	set.Insert(-123)
-	var got int
-	for i, want := range []int{-123, 123, 456, 789} {
-		if !set.TakeMin(&got) || got != want {
-			t.Errorf("TakeMin #%d: got %d, want %d", i, got, want)
-		}
-	}
-	if set.TakeMin(&got) {
-		t.Errorf("%s.TakeMin returned true", &set)
-	}
-	if err := set.Check(); err != nil {
-		t.Fatalf("check: %s: %#v", err, &set)
-	}
-}
-
-func TestMinAndMax(t *testing.T) {
-	values := []int{0, 456, 123, 789, -123} // elt 0 => empty set
-	wantMax := []int{intsets.MinInt, 456, 456, 789, 789}
-	wantMin := []int{intsets.MaxInt, 456, 123, 123, -123}
-
-	var set intsets.Sparse
-	for i, x := range values {
-		if i != 0 {
-			set.Insert(x)
-		}
-		if got, want := set.Min(), wantMin[i]; got != want {
-			t.Errorf("Min #%d: got %d, want %d", i, got, want)
-		}
-		if got, want := set.Max(), wantMax[i]; got != want {
-			t.Errorf("Max #%d: got %d, want %d", i, got, want)
-		}
-	}
-
-	set.Insert(intsets.MinInt)
-	if got, want := set.Min(), intsets.MinInt; got != want {
-		t.Errorf("Min: got %d, want %d", got, want)
-	}
-
-	set.Insert(intsets.MaxInt)
-	if got, want := set.Max(), intsets.MaxInt; got != want {
-		t.Errorf("Max: got %d, want %d", got, want)
-	}
-}
-
-func TestEquals(t *testing.T) {
-	var setX intsets.Sparse
-	setX.Insert(456)
-	setX.Insert(123)
-	setX.Insert(789)
-
-	if !setX.Equals(&setX) {
-		t.Errorf("Equals(%s, %s): got false", &setX, &setX)
-	}
-
-	var setY intsets.Sparse
-	setY.Insert(789)
-	setY.Insert(456)
-	setY.Insert(123)
-
-	if !setX.Equals(&setY) {
-		t.Errorf("Equals(%s, %s): got false", &setX, &setY)
-	}
-
-	setY.Insert(1)
-	if setX.Equals(&setY) {
-		t.Errorf("Equals(%s, %s): got true", &setX, &setY)
-	}
-
-	var empty intsets.Sparse
-	if setX.Equals(&empty) {
-		t.Errorf("Equals(%s, %s): got true", &setX, &empty)
-	}
-
-	// Edge case: some block (with offset=0) appears in X but not Y.
-	setY.Remove(123)
-	if setX.Equals(&setY) {
-		t.Errorf("Equals(%s, %s): got true", &setX, &setY)
-	}
-}
-
-// A pset is a parallel implementation of a set using both an intsets.Sparse
-// and a built-in hash map.
-type pset struct {
-	hash map[int]bool
-	bits intsets.Sparse
-}
-
-func makePset() *pset {
-	return &pset{hash: make(map[int]bool)}
-}
-
-func (set *pset) add(n int) {
-	prev := len(set.hash)
-	set.hash[n] = true
-	grewA := len(set.hash) > prev
-
-	grewB := set.bits.Insert(n)
-
-	if grewA != grewB {
-		panic(fmt.Sprintf("add(%d): grewA=%t grewB=%t", n, grewA, grewB))
-	}
-}
-
-func (set *pset) remove(n int) {
-	prev := len(set.hash)
-	delete(set.hash, n)
-	shrankA := len(set.hash) < prev
-
-	shrankB := set.bits.Remove(n)
-
-	if shrankA != shrankB {
-		panic(fmt.Sprintf("remove(%d): shrankA=%t shrankB=%t", n, shrankA, shrankB))
-	}
-}
-
-func (set *pset) check(t *testing.T, msg string) {
-	var eltsA []int
-	for elt := range set.hash {
-		eltsA = append(eltsA, int(elt))
-	}
-	sort.Ints(eltsA)
-
-	eltsB := set.bits.AppendTo(nil)
-
-	if a, b := fmt.Sprint(eltsA), fmt.Sprint(eltsB); a != b {
-		t.Errorf("check(%s): hash=%s bits=%s (%s)", msg, a, b, &set.bits)
-	}
-
-	if err := set.bits.Check(); err != nil {
-		t.Fatalf("Check(%s): %s: %#v", msg, err, &set.bits)
-	}
-}
-
-// randomPset returns a parallel set of random size and elements.
-func randomPset(prng *rand.Rand, maxSize int) *pset {
-	set := makePset()
-	size := int(prng.Int()) % maxSize
-	for i := 0; i < size; i++ {
-		// TODO(adonovan): benchmark how performance varies
-		// with this sparsity parameter.
-		n := int(prng.Int()) % 10000
-		set.add(n)
-	}
-	return set
-}
-
-// TestRandomMutations performs the same random adds/removes on two
-// set implementations and ensures that they compute the same result.
-func TestRandomMutations(t *testing.T) {
-	const debug = false
-
-	set := makePset()
-	prng := rand.New(rand.NewSource(0))
-	for i := 0; i < 10000; i++ {
-		n := int(prng.Int())%2000 - 1000
-		if i%2 == 0 {
-			if debug {
-				log.Printf("add %d", n)
-			}
-			set.add(n)
-		} else {
-			if debug {
-				log.Printf("remove %d", n)
-			}
-			set.remove(n)
-		}
-		if debug {
-			set.check(t, "post mutation")
-		}
-	}
-	set.check(t, "final")
-	if debug {
-		log.Print(&set.bits)
-	}
-}
-
-func TestLowerBound(t *testing.T) {
-	// Use random sets of sizes from 0 to about 4000.
-	prng := rand.New(rand.NewSource(0))
-	for i := uint(0); i < 12; i++ {
-		x := randomPset(prng, 1<<i)
-		for j := 0; j < 10000; j++ {
-			found := intsets.MaxInt
-			for e := range x.hash {
-				if e >= j && e < found {
-					found = e
-				}
-			}
-			if res := x.bits.LowerBound(j); res != found {
-				t.Errorf("%s: LowerBound(%d)=%d, expected %d", &x.bits, j, res, found)
-			}
-		}
-	}
-}
-
-// TestSetOperations exercises classic set operations: ∩ , ∪, \.
-func TestSetOperations(t *testing.T) {
-	prng := rand.New(rand.NewSource(0))
-
-	// Use random sets of sizes from 0 to about 4000.
-	// For each operator, we test variations such as
-	// Z.op(X, Y), Z.op(X, Z) and Z.op(Z, Y) to exercise
-	// the degenerate cases of each method implementation.
-	for i := uint(0); i < 12; i++ {
-		X := randomPset(prng, 1<<i)
-		Y := randomPset(prng, 1<<i)
-
-		// TODO(adonovan): minimise dependencies between stanzas below.
-
-		// Copy(X)
-		C := makePset()
-		C.bits.Copy(&Y.bits) // no effect on result
-		C.bits.Copy(&X.bits)
-		C.hash = X.hash
-		C.check(t, "C.Copy(X)")
-		C.bits.Copy(&C.bits)
-		C.check(t, "C.Copy(C)")
-
-		// U.Union(X, Y)
-		U := makePset()
-		U.bits.Union(&X.bits, &Y.bits)
-		for n := range X.hash {
-			U.hash[n] = true
-		}
-		for n := range Y.hash {
-			U.hash[n] = true
-		}
-		U.check(t, "U.Union(X, Y)")
-
-		// U.Union(X, X)
-		U.bits.Union(&X.bits, &X.bits)
-		U.hash = X.hash
-		U.check(t, "U.Union(X, X)")
-
-		// U.Union(U, Y)
-		U = makePset()
-		U.bits.Copy(&X.bits)
-		U.bits.Union(&U.bits, &Y.bits)
-		for n := range X.hash {
-			U.hash[n] = true
-		}
-		for n := range Y.hash {
-			U.hash[n] = true
-		}
-		U.check(t, "U.Union(U, Y)")
-
-		// U.Union(X, U)
-		U.bits.Copy(&Y.bits)
-		U.bits.Union(&X.bits, &U.bits)
-		U.check(t, "U.Union(X, U)")
-
-		// U.UnionWith(U)
-		U.bits.UnionWith(&U.bits)
-		U.check(t, "U.UnionWith(U)")
-
-		// I.Intersection(X, Y)
-		I := makePset()
-		I.bits.Intersection(&X.bits, &Y.bits)
-		for n := range X.hash {
-			if Y.hash[n] {
-				I.hash[n] = true
-			}
-		}
-		I.check(t, "I.Intersection(X, Y)")
-
-		// I.Intersection(X, X)
-		I.bits.Intersection(&X.bits, &X.bits)
-		I.hash = X.hash
-		I.check(t, "I.Intersection(X, X)")
-
-		// I.Intersection(I, X)
-		I.bits.Intersection(&I.bits, &X.bits)
-		I.check(t, "I.Intersection(I, X)")
-
-		// I.Intersection(X, I)
-		I.bits.Intersection(&X.bits, &I.bits)
-		I.check(t, "I.Intersection(X, I)")
-
-		// I.Intersection(I, I)
-		I.bits.Intersection(&I.bits, &I.bits)
-		I.check(t, "I.Intersection(I, I)")
-
-		// D.Difference(X, Y)
-		D := makePset()
-		D.bits.Difference(&X.bits, &Y.bits)
-		for n := range X.hash {
-			if !Y.hash[n] {
-				D.hash[n] = true
-			}
-		}
-		D.check(t, "D.Difference(X, Y)")
-
-		// D.Difference(D, Y)
-		D.bits.Copy(&X.bits)
-		D.bits.Difference(&D.bits, &Y.bits)
-		D.check(t, "D.Difference(D, Y)")
-
-		// D.Difference(Y, D)
-		D.bits.Copy(&X.bits)
-		D.bits.Difference(&Y.bits, &D.bits)
-		D.hash = make(map[int]bool)
-		for n := range Y.hash {
-			if !X.hash[n] {
-				D.hash[n] = true
-			}
-		}
-		D.check(t, "D.Difference(Y, D)")
-
-		// D.Difference(X, X)
-		D.bits.Difference(&X.bits, &X.bits)
-		D.hash = nil
-		D.check(t, "D.Difference(X, X)")
-
-		// D.DifferenceWith(D)
-		D.bits.Copy(&X.bits)
-		D.bits.DifferenceWith(&D.bits)
-		D.check(t, "D.DifferenceWith(D)")
-
-		// SD.SymmetricDifference(X, Y)
-		SD := makePset()
-		SD.bits.SymmetricDifference(&X.bits, &Y.bits)
-		for n := range X.hash {
-			if !Y.hash[n] {
-				SD.hash[n] = true
-			}
-		}
-		for n := range Y.hash {
-			if !X.hash[n] {
-				SD.hash[n] = true
-			}
-		}
-		SD.check(t, "SD.SymmetricDifference(X, Y)")
-
-		// X.SymmetricDifferenceWith(Y)
-		SD.bits.Copy(&X.bits)
-		SD.bits.SymmetricDifferenceWith(&Y.bits)
-		SD.check(t, "X.SymmetricDifference(Y)")
-
-		// Y.SymmetricDifferenceWith(X)
-		SD.bits.Copy(&Y.bits)
-		SD.bits.SymmetricDifferenceWith(&X.bits)
-		SD.check(t, "Y.SymmetricDifference(X)")
-
-		// SD.SymmetricDifference(X, X)
-		SD.bits.SymmetricDifference(&X.bits, &X.bits)
-		SD.hash = nil
-		SD.check(t, "SD.SymmetricDifference(X, X)")
-
-		// SD.SymmetricDifference(X, Copy(X))
-		X2 := makePset()
-		X2.bits.Copy(&X.bits)
-		SD.bits.SymmetricDifference(&X.bits, &X2.bits)
-		SD.check(t, "SD.SymmetricDifference(X, Copy(X))")
-
-		// Copy(X).SymmetricDifferenceWith(X)
-		SD.bits.Copy(&X.bits)
-		SD.bits.SymmetricDifferenceWith(&X.bits)
-		SD.check(t, "Copy(X).SymmetricDifferenceWith(X)")
-	}
-}
-
-func TestIntersectionWith(t *testing.T) {
-	// Edge cases: the pairs (1,1), (1000,2000), (8000,4000)
-	// exercise the <, >, == cases in IntersectionWith that the
-	// TestSetOperations data is too dense to cover.
-	var X, Y intsets.Sparse
-	X.Insert(1)
-	X.Insert(1000)
-	X.Insert(8000)
-	Y.Insert(1)
-	Y.Insert(2000)
-	Y.Insert(4000)
-	X.IntersectionWith(&Y)
-	if got, want := X.String(), "{1}"; got != want {
-		t.Errorf("IntersectionWith: got %s, want %s", got, want)
-	}
-}
-
-func TestIntersects(t *testing.T) {
-	prng := rand.New(rand.NewSource(0))
-
-	for i := uint(0); i < 12; i++ {
-		X, Y := randomPset(prng, 1<<i), randomPset(prng, 1<<i)
-		x, y := &X.bits, &Y.bits
-
-		// test the slow way
-		var z intsets.Sparse
-		z.Copy(x)
-		z.IntersectionWith(y)
-
-		if got, want := x.Intersects(y), !z.IsEmpty(); got != want {
-			t.Errorf("Intersects(%s, %s): got %v, want %v (%s)", x, y, got, want, &z)
-		}
-
-		// make it false
-		a := x.AppendTo(nil)
-		for _, v := range a {
-			y.Remove(v)
-		}
-
-		if got, want := x.Intersects(y), false; got != want {
-			t.Errorf("Intersects: got %v, want %v", got, want)
-		}
-
-		// make it true
-		if x.IsEmpty() {
-			continue
-		}
-		i := prng.Intn(len(a))
-		y.Insert(a[i])
-
-		if got, want := x.Intersects(y), true; got != want {
-			t.Errorf("Intersects: got %v, want %v", got, want)
-		}
-	}
-}
-
-func TestSubsetOf(t *testing.T) {
-	prng := rand.New(rand.NewSource(0))
-
-	for i := uint(0); i < 12; i++ {
-		X, Y := randomPset(prng, 1<<i), randomPset(prng, 1<<i)
-		x, y := &X.bits, &Y.bits
-
-		// test the slow way
-		var z intsets.Sparse
-		z.Copy(x)
-		z.DifferenceWith(y)
-
-		if got, want := x.SubsetOf(y), z.IsEmpty(); got != want {
-			t.Errorf("SubsetOf: got %v, want %v", got, want)
-		}
-
-		// make it true
-		y.UnionWith(x)
-
-		if got, want := x.SubsetOf(y), true; got != want {
-			t.Errorf("SubsetOf: got %v, want %v", got, want)
-		}
-
-		// make it false
-		if x.IsEmpty() {
-			continue
-		}
-		a := x.AppendTo(nil)
-		i := prng.Intn(len(a))
-		y.Remove(a[i])
-
-		if got, want := x.SubsetOf(y), false; got != want {
-			t.Errorf("SubsetOf: got %v, want %v", got, want)
-		}
-	}
-}
-
-func TestBitString(t *testing.T) {
-	for _, test := range []struct {
-		input []int
-		want  string
-	}{
-		{nil, "0"},
-		{[]int{0}, "1"},
-		{[]int{0, 4, 5}, "110001"},
-		{[]int{0, 7, 177}, "1" + strings.Repeat("0", 169) + "10000001"},
-		{[]int{-3, 0, 4, 5}, "110001.001"},
-		{[]int{-3}, "0.001"},
-	} {
-		var set intsets.Sparse
-		for _, x := range test.input {
-			set.Insert(x)
-		}
-		if got := set.BitString(); got != test.want {
-			t.Errorf("BitString(%s) = %s, want %s", set.String(), got, test.want)
-		}
-	}
-}
-
-func TestFailFastOnShallowCopy(t *testing.T) {
-	var x intsets.Sparse
-	x.Insert(1)
-
-	y := x // shallow copy (breaks representation invariants)
-	defer func() {
-		got := fmt.Sprint(recover())
-		want := "interface conversion: interface {} is nil, not intsets.to_copy_a_sparse_you_must_call_its_Copy_method"
-		if got != want {
-			t.Errorf("shallow copy: recover() = %q, want %q", got, want)
-		}
-	}()
-	y.String() // panics
-	t.Error("didn't panic as expected")
-}
-
-// -- Benchmarks -------------------------------------------------------
-
-// TODO(adonovan):
-// - Add benchmarks of each method.
-// - Gather set distributions from pointer analysis.
-// - Measure memory usage.
-
-func benchmarkInsertProbeSparse(b *testing.B, size, spread int) {
-	prng := rand.New(rand.NewSource(0))
-	// Generate our insertions and probes beforehand (we don't want to benchmark
-	// the prng).
-	insert := make([]int, size)
-	probe := make([]int, size*2)
-	for i := range insert {
-		insert[i] = prng.Int() % spread
-	}
-	for i := range probe {
-		probe[i] = prng.Int() % spread
-	}
-
-	b.ResetTimer()
-	var x intsets.Sparse
-	for tries := 0; tries < b.N; tries++ {
-		x.Clear()
-		for _, n := range insert {
-			x.Insert(n)
-		}
-		hits := 0
-		for _, n := range probe {
-			if x.Has(n) {
-				hits++
-			}
-		}
-		// Use the variable so it doesn't get optimized away.
-		if hits > len(probe) {
-			b.Fatalf("%d hits, only %d probes", hits, len(probe))
-		}
-	}
-}
-
-func BenchmarkInsertProbeSparse_2_10(b *testing.B) {
-	benchmarkInsertProbeSparse(b, 2, 10)
-}
-
-func BenchmarkInsertProbeSparse_10_10(b *testing.B) {
-	benchmarkInsertProbeSparse(b, 10, 10)
-}
-
-func BenchmarkInsertProbeSparse_10_1000(b *testing.B) {
-	benchmarkInsertProbeSparse(b, 10, 1000)
-}
-
-func BenchmarkInsertProbeSparse_100_100(b *testing.B) {
-	benchmarkInsertProbeSparse(b, 100, 100)
-}
-
-func BenchmarkInsertProbeSparse_100_10000(b *testing.B) {
-	benchmarkInsertProbeSparse(b, 100, 1000)
-}
-
-func BenchmarkUnionDifferenceSparse(b *testing.B) {
-	prng := rand.New(rand.NewSource(0))
-	for tries := 0; tries < b.N; tries++ {
-		var x, y, z intsets.Sparse
-		for i := 0; i < 1000; i++ {
-			n := int(prng.Int()) % 100000
-			if i%2 == 0 {
-				x.Insert(n)
-			} else {
-				y.Insert(n)
-			}
-		}
-		z.Union(&x, &y)
-		z.Difference(&x, &y)
-	}
-}
-
-func BenchmarkUnionDifferenceHashTable(b *testing.B) {
-	prng := rand.New(rand.NewSource(0))
-	for tries := 0; tries < b.N; tries++ {
-		x, y, z := make(map[int]bool), make(map[int]bool), make(map[int]bool)
-		for i := 0; i < 1000; i++ {
-			n := int(prng.Int()) % 100000
-			if i%2 == 0 {
-				x[n] = true
-			} else {
-				y[n] = true
-			}
-		}
-		// union
-		for n := range x {
-			z[n] = true
-		}
-		for n := range y {
-			z[n] = true
-		}
-		// difference
-		z = make(map[int]bool)
-		for n := range y {
-			if !x[n] {
-				z[n] = true
-			}
-		}
-	}
-}
-
-func BenchmarkAppendTo(b *testing.B) {
-	prng := rand.New(rand.NewSource(0))
-	var x intsets.Sparse
-	for i := 0; i < 1000; i++ {
-		x.Insert(int(prng.Int()) % 10000)
-	}
-	var space [1000]int
-	for tries := 0; tries < b.N; tries++ {
-		x.AppendTo(space[:0])
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/util.go b/installer/vendor/golang.org/x/tools/container/intsets/util.go
deleted file mode 100644
index dd1db86b1c..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/util.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package intsets
-
-// From Hacker's Delight, fig 5.2.
-func popcountHD(x uint32) int {
-	x -= (x >> 1) & 0x55555555
-	x = (x & 0x33333333) + ((x >> 2) & 0x33333333)
-	x = (x + (x >> 4)) & 0x0f0f0f0f
-	x = x + (x >> 8)
-	x = x + (x >> 16)
-	return int(x & 0x0000003f)
-}
-
-var a [1 << 8]byte
-
-func init() {
-	for i := range a {
-		var n byte
-		for x := i; x != 0; x >>= 1 {
-			if x&1 != 0 {
-				n++
-			}
-		}
-		a[i] = n
-	}
-}
-
-func popcountTable(x word) int {
-	return int(a[byte(x>>(0*8))] +
-		a[byte(x>>(1*8))] +
-		a[byte(x>>(2*8))] +
-		a[byte(x>>(3*8))] +
-		a[byte(x>>(4*8))] +
-		a[byte(x>>(5*8))] +
-		a[byte(x>>(6*8))] +
-		a[byte(x>>(7*8))])
-}
-
-// nlz returns the number of leading zeros of x.
-// From Hacker's Delight, fig 5.11.
-func nlz(x word) int {
-	x |= (x >> 1)
-	x |= (x >> 2)
-	x |= (x >> 4)
-	x |= (x >> 8)
-	x |= (x >> 16)
-	x |= (x >> 32)
-	return popcount(^x)
-}
-
-// ntz returns the number of trailing zeros of x.
-// From Hacker's Delight, fig 5.13.
-func ntz(x word) int {
-	if x == 0 {
-		return bitsPerWord
-	}
-	n := 1
-	if bitsPerWord == 64 {
-		if (x & 0xffffffff) == 0 {
-			n = n + 32
-			x = x >> 32
-		}
-	}
-	if (x & 0x0000ffff) == 0 {
-		n = n + 16
-		x = x >> 16
-	}
-	if (x & 0x000000ff) == 0 {
-		n = n + 8
-		x = x >> 8
-	}
-	if (x & 0x0000000f) == 0 {
-		n = n + 4
-		x = x >> 4
-	}
-	if (x & 0x00000003) == 0 {
-		n = n + 2
-		x = x >> 2
-	}
-	return n - int(x&1)
-}
diff --git a/installer/vendor/golang.org/x/tools/container/intsets/util_test.go b/installer/vendor/golang.org/x/tools/container/intsets/util_test.go
deleted file mode 100644
index e4cc6597f1..0000000000
--- a/installer/vendor/golang.org/x/tools/container/intsets/util_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package intsets
-
-import (
-	"math/rand"
-	"testing"
-)
-
-func TestNLZ(t *testing.T) {
-	// Test the platform-specific edge case.
-	// NB: v must be a var (not const) so that the word() conversion is dynamic.
-	// Otherwise the compiler will report an error.
-	v := uint64(0x0000801000000000)
-	n := nlz(word(v))
-	want := 32 // (on 32-bit)
-	if bitsPerWord == 64 {
-		want = 16
-	}
-	if n != want {
-		t.Errorf("%d-bit nlz(%d) = %d, want %d", bitsPerWord, v, n, want)
-	}
-}
-
-// Backdoor for testing.
-func (s *Sparse) Check() error { return s.check() }
-
-func dumbPopcount(x word) int {
-	var popcnt int
-	for i := uint(0); i < bitsPerWord; i++ {
-		if x&(1<<i) != 0 {
-			popcnt++
-		}
-	}
-	return popcnt
-}
-
-func TestPopcount(t *testing.T) {
-	for i := 0; i < 1e5; i++ {
-		x := word(rand.Uint32())
-		if bitsPerWord == 64 {
-			x = x | (word(rand.Uint32()) << 32)
-		}
-		want := dumbPopcount(x)
-		got := popcount(x)
-		if got != want {
-			t.Errorf("popcount(%d) = %d, want %d", x, got, want)
-		}
-	}
-}
-
-func BenchmarkPopcount(b *testing.B) {
-	for i := 0; i < b.N; i++ {
-		popcount(word(i))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/cover/profile.go b/installer/vendor/golang.org/x/tools/cover/profile.go
deleted file mode 100644
index 958881a2a2..0000000000
--- a/installer/vendor/golang.org/x/tools/cover/profile.go
+++ /dev/null
@@ -1,190 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cover provides support for parsing coverage profiles
-// generated by "go test -coverprofile=cover.out".
-package cover // import "golang.org/x/tools/cover"
-
-import (
-	"bufio"
-	"fmt"
-	"math"
-	"os"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// Profile represents the profiling data for a specific file.
-type Profile struct {
-	FileName string
-	Mode     string
-	Blocks   []ProfileBlock
-}
-
-// ProfileBlock represents a single block of profiling data.
-type ProfileBlock struct {
-	StartLine, StartCol int
-	EndLine, EndCol     int
-	NumStmt, Count      int
-}
-
-type byFileName []*Profile
-
-func (p byFileName) Len() int           { return len(p) }
-func (p byFileName) Less(i, j int) bool { return p[i].FileName < p[j].FileName }
-func (p byFileName) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-
-// ParseProfiles parses profile data in the specified file and returns a
-// Profile for each source file described therein.
-func ParseProfiles(fileName string) ([]*Profile, error) {
-	pf, err := os.Open(fileName)
-	if err != nil {
-		return nil, err
-	}
-	defer pf.Close()
-
-	files := make(map[string]*Profile)
-	buf := bufio.NewReader(pf)
-	// First line is "mode: foo", where foo is "set", "count", or "atomic".
-	// Rest of file is in the format
-	//	encoding/base64/base64.go:34.44,37.40 3 1
-	// where the fields are: name.go:line.column,line.column numberOfStatements count
-	s := bufio.NewScanner(buf)
-	mode := ""
-	for s.Scan() {
-		line := s.Text()
-		if mode == "" {
-			const p = "mode: "
-			if !strings.HasPrefix(line, p) || line == p {
-				return nil, fmt.Errorf("bad mode line: %v", line)
-			}
-			mode = line[len(p):]
-			continue
-		}
-		m := lineRe.FindStringSubmatch(line)
-		if m == nil {
-			return nil, fmt.Errorf("line %q doesn't match expected format: %v", line, lineRe)
-		}
-		fn := m[1]
-		p := files[fn]
-		if p == nil {
-			p = &Profile{
-				FileName: fn,
-				Mode:     mode,
-			}
-			files[fn] = p
-		}
-		p.Blocks = append(p.Blocks, ProfileBlock{
-			StartLine: toInt(m[2]),
-			StartCol:  toInt(m[3]),
-			EndLine:   toInt(m[4]),
-			EndCol:    toInt(m[5]),
-			NumStmt:   toInt(m[6]),
-			Count:     toInt(m[7]),
-		})
-	}
-	if err := s.Err(); err != nil {
-		return nil, err
-	}
-	for _, p := range files {
-		sort.Sort(blocksByStart(p.Blocks))
-	}
-	// Generate a sorted slice.
-	profiles := make([]*Profile, 0, len(files))
-	for _, profile := range files {
-		profiles = append(profiles, profile)
-	}
-	sort.Sort(byFileName(profiles))
-	return profiles, nil
-}
-
-type blocksByStart []ProfileBlock
-
-func (b blocksByStart) Len() int      { return len(b) }
-func (b blocksByStart) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
-func (b blocksByStart) Less(i, j int) bool {
-	bi, bj := b[i], b[j]
-	return bi.StartLine < bj.StartLine || bi.StartLine == bj.StartLine && bi.StartCol < bj.StartCol
-}
-
-var lineRe = regexp.MustCompile(`^(.+):([0-9]+).([0-9]+),([0-9]+).([0-9]+) ([0-9]+) ([0-9]+)$`)
-
-func toInt(s string) int {
-	i, err := strconv.Atoi(s)
-	if err != nil {
-		panic(err)
-	}
-	return i
-}
-
-// Boundary represents the position in a source file of the beginning or end of a
-// block as reported by the coverage profile. In HTML mode, it will correspond to
-// the opening or closing of a <span> tag and will be used to colorize the source
-type Boundary struct {
-	Offset int     // Location as a byte offset in the source file.
-	Start  bool    // Is this the start of a block?
-	Count  int     // Event count from the cover profile.
-	Norm   float64 // Count normalized to [0..1].
-}
-
-// Boundaries returns a Profile as a set of Boundary objects within the provided src.
-func (p *Profile) Boundaries(src []byte) (boundaries []Boundary) {
-	// Find maximum count.
-	max := 0
-	for _, b := range p.Blocks {
-		if b.Count > max {
-			max = b.Count
-		}
-	}
-	// Divisor for normalization.
-	divisor := math.Log(float64(max))
-
-	// boundary returns a Boundary, populating the Norm field with a normalized Count.
-	boundary := func(offset int, start bool, count int) Boundary {
-		b := Boundary{Offset: offset, Start: start, Count: count}
-		if !start || count == 0 {
-			return b
-		}
-		if max <= 1 {
-			b.Norm = 0.8 // Profile is in"set" mode; we want a heat map. Use cov8 in the CSS.
-		} else if count > 0 {
-			b.Norm = math.Log(float64(count)) / divisor
-		}
-		return b
-	}
-
-	line, col := 1, 2 // TODO: Why is this 2?
-	for si, bi := 0, 0; si < len(src) && bi < len(p.Blocks); {
-		b := p.Blocks[bi]
-		if b.StartLine == line && b.StartCol == col {
-			boundaries = append(boundaries, boundary(si, true, b.Count))
-		}
-		if b.EndLine == line && b.EndCol == col || line > b.EndLine {
-			boundaries = append(boundaries, boundary(si, false, 0))
-			bi++
-			continue // Don't advance through src; maybe the next block starts here.
-		}
-		if src[si] == '\n' {
-			line++
-			col = 0
-		}
-		col++
-		si++
-	}
-	sort.Sort(boundariesByPos(boundaries))
-	return
-}
-
-type boundariesByPos []Boundary
-
-func (b boundariesByPos) Len() int      { return len(b) }
-func (b boundariesByPos) Swap(i, j int) { b[i], b[j] = b[j], b[i] }
-func (b boundariesByPos) Less(i, j int) bool {
-	if b[i].Offset == b[j].Offset {
-		return !b[i].Start && b[j].Start
-	}
-	return b[i].Offset < b[j].Offset
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ast/astutil/enclosing_test.go b/installer/vendor/golang.org/x/tools/go/ast/astutil/enclosing_test.go
deleted file mode 100644
index 107f87c55c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ast/astutil/enclosing_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package astutil_test
-
-// This file defines tests of PathEnclosingInterval.
-
-// TODO(adonovan): exhaustive tests that run over the whole input
-// tree, not just handcrafted examples.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// pathToString returns a string containing the concrete types of the
-// nodes in path.
-func pathToString(path []ast.Node) string {
-	var buf bytes.Buffer
-	fmt.Fprint(&buf, "[")
-	for i, n := range path {
-		if i > 0 {
-			fmt.Fprint(&buf, " ")
-		}
-		fmt.Fprint(&buf, strings.TrimPrefix(fmt.Sprintf("%T", n), "*ast."))
-	}
-	fmt.Fprint(&buf, "]")
-	return buf.String()
-}
-
-// findInterval parses input and returns the [start, end) positions of
-// the first occurrence of substr in input.  f==nil indicates failure;
-// an error has already been reported in that case.
-//
-func findInterval(t *testing.T, fset *token.FileSet, input, substr string) (f *ast.File, start, end token.Pos) {
-	f, err := parser.ParseFile(fset, "<input>", input, 0)
-	if err != nil {
-		t.Errorf("parse error: %s", err)
-		return
-	}
-
-	i := strings.Index(input, substr)
-	if i < 0 {
-		t.Errorf("%q is not a substring of input", substr)
-		f = nil
-		return
-	}
-
-	filePos := fset.File(f.Package)
-	return f, filePos.Pos(i), filePos.Pos(i + len(substr))
-}
-
-// Common input for following tests.
-const input = `
-// Hello.
-package main
-import "fmt"
-func f() {}
-func main() {
-	z := (x + y) // add them
-        f() // NB: ExprStmt and its CallExpr have same Pos/End
-}
-`
-
-func TestPathEnclosingInterval_Exact(t *testing.T) {
-	// For the exact tests, we check that a substring is mapped to
-	// the canonical string for the node it denotes.
-	tests := []struct {
-		substr string // first occurrence of this string indicates interval
-		node   string // complete text of expected containing node
-	}{
-		{"package",
-			input[11 : len(input)-1]},
-		{"\npack",
-			input[11 : len(input)-1]},
-		{"main",
-			"main"},
-		{"import",
-			"import \"fmt\""},
-		{"\"fmt\"",
-			"\"fmt\""},
-		{"\nfunc f() {}\n",
-			"func f() {}"},
-		{"x ",
-			"x"},
-		{" y",
-			"y"},
-		{"z",
-			"z"},
-		{" + ",
-			"x + y"},
-		{" :=",
-			"z := (x + y)"},
-		{"x + y",
-			"x + y"},
-		{"(x + y)",
-			"(x + y)"},
-		{" (x + y) ",
-			"(x + y)"},
-		{" (x + y) // add",
-			"(x + y)"},
-		{"func",
-			"func f() {}"},
-		{"func f() {}",
-			"func f() {}"},
-		{"\nfun",
-			"func f() {}"},
-		{" f",
-			"f"},
-	}
-	for _, test := range tests {
-		f, start, end := findInterval(t, new(token.FileSet), input, test.substr)
-		if f == nil {
-			continue
-		}
-
-		path, exact := astutil.PathEnclosingInterval(f, start, end)
-		if !exact {
-			t.Errorf("PathEnclosingInterval(%q) not exact", test.substr)
-			continue
-		}
-
-		if len(path) == 0 {
-			if test.node != "" {
-				t.Errorf("PathEnclosingInterval(%q).path: got [], want %q",
-					test.substr, test.node)
-			}
-			continue
-		}
-
-		if got := input[path[0].Pos():path[0].End()]; got != test.node {
-			t.Errorf("PathEnclosingInterval(%q): got %q, want %q (path was %s)",
-				test.substr, got, test.node, pathToString(path))
-			continue
-		}
-	}
-}
-
-func TestPathEnclosingInterval_Paths(t *testing.T) {
-	// For these tests, we check only the path of the enclosing
-	// node, but not its complete text because it's often quite
-	// large when !exact.
-	tests := []struct {
-		substr string // first occurrence of this string indicates interval
-		path   string // the pathToString(),exact of the expected path
-	}{
-		{"// add",
-			"[BlockStmt FuncDecl File],false"},
-		{"(x + y",
-			"[ParenExpr AssignStmt BlockStmt FuncDecl File],false"},
-		{"x +",
-			"[BinaryExpr ParenExpr AssignStmt BlockStmt FuncDecl File],false"},
-		{"z := (x",
-			"[AssignStmt BlockStmt FuncDecl File],false"},
-		{"func f",
-			"[FuncDecl File],false"},
-		{"func f()",
-			"[FuncDecl File],false"},
-		{" f()",
-			"[FuncDecl File],false"},
-		{"() {}",
-			"[FuncDecl File],false"},
-		{"// Hello",
-			"[File],false"},
-		{" f",
-			"[Ident FuncDecl File],true"},
-		{"func ",
-			"[FuncDecl File],true"},
-		{"mai",
-			"[Ident File],true"},
-		{"f() // NB",
-			"[CallExpr ExprStmt BlockStmt FuncDecl File],true"},
-	}
-	for _, test := range tests {
-		f, start, end := findInterval(t, new(token.FileSet), input, test.substr)
-		if f == nil {
-			continue
-		}
-
-		path, exact := astutil.PathEnclosingInterval(f, start, end)
-		if got := fmt.Sprintf("%s,%v", pathToString(path), exact); got != test.path {
-			t.Errorf("PathEnclosingInterval(%q): got %q, want %q",
-				test.substr, got, test.path)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ast/astutil/imports_test.go b/installer/vendor/golang.org/x/tools/go/ast/astutil/imports_test.go
deleted file mode 100644
index 8bc3480873..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ast/astutil/imports_test.go
+++ /dev/null
@@ -1,1818 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package astutil
-
-import (
-	"bytes"
-	"go/ast"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"reflect"
-	"strconv"
-	"testing"
-)
-
-var fset = token.NewFileSet()
-
-func parse(t *testing.T, name, in string) *ast.File {
-	file, err := parser.ParseFile(fset, name, in, parser.ParseComments)
-	if err != nil {
-		t.Fatalf("%s parse: %v", name, err)
-	}
-	return file
-}
-
-func print(t *testing.T, name string, f *ast.File) string {
-	var buf bytes.Buffer
-	if err := format.Node(&buf, fset, f); err != nil {
-		t.Fatalf("%s gofmt: %v", name, err)
-	}
-	return string(buf.Bytes())
-}
-
-type test struct {
-	name       string
-	renamedPkg string
-	pkg        string
-	in         string
-	out        string
-	broken     bool // known broken
-}
-
-var addTests = []test{
-	{
-		name: "leave os alone",
-		pkg:  "os",
-		in: `package main
-
-import (
-	"os"
-)
-`,
-		out: `package main
-
-import (
-	"os"
-)
-`,
-	},
-	{
-		name: "import.1",
-		pkg:  "os",
-		in: `package main
-`,
-		out: `package main
-
-import "os"
-`,
-	},
-	{
-		name: "import.2",
-		pkg:  "os",
-		in: `package main
-
-// Comment
-import "C"
-`,
-		out: `package main
-
-// Comment
-import "C"
-import "os"
-`,
-	},
-	{
-		name: "import.3",
-		pkg:  "os",
-		in: `package main
-
-// Comment
-import "C"
-
-import (
-	"io"
-	"utf8"
-)
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"io"
-	"os"
-	"utf8"
-)
-`,
-	},
-	{
-		name: "import.17",
-		pkg:  "x/y/z",
-		in: `package main
-
-// Comment
-import "C"
-
-import (
-	"a"
-	"b"
-
-	"x/w"
-
-	"d/f"
-)
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"a"
-	"b"
-
-	"x/w"
-	"x/y/z"
-
-	"d/f"
-)
-`,
-	},
-	{
-		name: "issue #19190",
-		pkg:  "x.org/y/z",
-		in: `package main
-
-// Comment
-import "C"
-
-import (
-	"bytes"
-	"os"
-
-	"d.com/f"
-)
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"bytes"
-	"os"
-
-	"d.com/f"
-	"x.org/y/z"
-)
-`,
-	},
-	{
-		name: "issue #19190 with existing grouped import packages",
-		pkg:  "x.org/y/z",
-		in: `package main
-
-// Comment
-import "C"
-
-import (
-	"bytes"
-	"os"
-
-	"c.com/f"
-	"d.com/f"
-
-	"y.com/a"
-	"y.com/b"
-	"y.com/c"
-)
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"bytes"
-	"os"
-
-	"c.com/f"
-	"d.com/f"
-	"x.org/y/z"
-
-	"y.com/a"
-	"y.com/b"
-	"y.com/c"
-)
-`,
-	},
-	{
-		name: "issue #19190 - match score is still respected",
-		pkg:  "y.org/c",
-		in: `package main
-
-import (
-	"x.org/a"
-
-	"y.org/b"
-)
-`,
-		out: `package main
-
-import (
-	"x.org/a"
-
-	"y.org/b"
-	"y.org/c"
-)
-`,
-	},
-	{
-		name: "import into singular group",
-		pkg:  "bytes",
-		in: `package main
-
-import "os"
-
-`,
-		out: `package main
-
-import (
-	"bytes"
-	"os"
-)
-`,
-	},
-	{
-		name: "import into singular group with comment",
-		pkg:  "bytes",
-		in: `package main
-
-import /* why */ /* comment here? */ "os"
-
-`,
-		out: `package main
-
-import /* why */ /* comment here? */ (
-	"bytes"
-	"os"
-)
-`,
-	},
-	{
-		name: "import into group with leading comment",
-		pkg:  "strings",
-		in: `package main
-
-import (
-	// comment before bytes
-	"bytes"
-	"os"
-)
-
-`,
-		out: `package main
-
-import (
-	// comment before bytes
-	"bytes"
-	"os"
-	"strings"
-)
-`,
-	},
-	{
-		name:       "",
-		renamedPkg: "fmtpkg",
-		pkg:        "fmt",
-		in: `package main
-
-import "os"
-
-`,
-		out: `package main
-
-import (
-	fmtpkg "fmt"
-	"os"
-)
-`,
-	},
-	{
-		name: "struct comment",
-		pkg:  "time",
-		in: `package main
-
-// This is a comment before a struct.
-type T struct {
-	t  time.Time
-}
-`,
-		out: `package main
-
-import "time"
-
-// This is a comment before a struct.
-type T struct {
-	t time.Time
-}
-`,
-	},
-	{
-		name: "issue 8729 import C",
-		pkg:  "time",
-		in: `package main
-
-import "C"
-
-// comment
-type T time.Time
-`,
-		out: `package main
-
-import "C"
-import "time"
-
-// comment
-type T time.Time
-`,
-	},
-	{
-		name: "issue 8729 empty import",
-		pkg:  "time",
-		in: `package main
-
-import ()
-
-// comment
-type T time.Time
-`,
-		out: `package main
-
-import "time"
-
-// comment
-type T time.Time
-`,
-	},
-	{
-		name: "issue 8729 comment on package line",
-		pkg:  "time",
-		in: `package main // comment
-
-type T time.Time
-`,
-		out: `package main // comment
-import "time"
-
-type T time.Time
-`,
-	},
-	{
-		name: "issue 8729 comment after package",
-		pkg:  "time",
-		in: `package main
-// comment
-
-type T time.Time
-`,
-		out: `package main
-
-import "time"
-
-// comment
-
-type T time.Time
-`,
-	},
-	{
-		name: "issue 8729 comment before and on package line",
-		pkg:  "time",
-		in: `// comment before
-package main // comment on
-
-type T time.Time
-`,
-		out: `// comment before
-package main // comment on
-import "time"
-
-type T time.Time
-`,
-	},
-
-	// Issue 9961: Match prefixes using path segments rather than bytes
-	{
-		name: "issue 9961",
-		pkg:  "regexp",
-		in: `package main
-
-import (
-	"flag"
-	"testing"
-
-	"rsc.io/p"
-)
-`,
-		out: `package main
-
-import (
-	"flag"
-	"regexp"
-	"testing"
-
-	"rsc.io/p"
-)
-`,
-	},
-	// Issue 10337: Preserve comment position
-	{
-		name: "issue 10337",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"bytes" // a
-	"log" // c
-)
-`,
-		out: `package main
-
-import (
-	"bytes" // a
-	"fmt"
-	"log" // c
-)
-`,
-	},
-	{
-		name: "issue 10337 new import at the start",
-		pkg:  "bytes",
-		in: `package main
-
-import (
-	"fmt" // b
-	"log" // c
-)
-`,
-		out: `package main
-
-import (
-	"bytes"
-	"fmt" // b
-	"log" // c
-)
-`,
-	},
-	{
-		name: "issue 10337 new import at the end",
-		pkg:  "log",
-		in: `package main
-
-import (
-	"bytes" // a
-	"fmt" // b
-)
-`,
-		out: `package main
-
-import (
-	"bytes" // a
-	"fmt"   // b
-	"log"
-)
-`,
-	},
-	// Issue 14075: Merge import declarations
-	{
-		name: "issue 14075",
-		pkg:  "bufio",
-		in: `package main
-
-import "bytes"
-import "fmt"
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-)
-`,
-	},
-	{
-		name: "issue 14075 update position",
-		pkg:  "bufio",
-		in: `package main
-
-import "bytes"
-import (
-	"fmt"
-)
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-)
-`,
-	},
-	{
-		name: `issue 14075 ignore import "C"`,
-		pkg:  "bufio",
-		in: `package main
-
-// Comment
-import "C"
-
-import "bytes"
-import "fmt"
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-)
-`,
-	},
-	{
-		name: `issue 14075 ignore adjacent import "C"`,
-		pkg:  "bufio",
-		in: `package main
-
-// Comment
-import "C"
-import "fmt"
-`,
-		out: `package main
-
-// Comment
-import "C"
-import (
-	"bufio"
-	"fmt"
-)
-`,
-	},
-	{
-		name: `issue 14075 ignore adjacent import "C" (without factored import)`,
-		pkg:  "bufio",
-		in: `package main
-
-// Comment
-import "C"
-import "fmt"
-`,
-		out: `package main
-
-// Comment
-import "C"
-import (
-	"bufio"
-	"fmt"
-)
-`,
-	},
-	{
-		name: `issue 14075 ignore single import "C"`,
-		pkg:  "bufio",
-		in: `package main
-
-// Comment
-import "C"
-`,
-		out: `package main
-
-// Comment
-import "C"
-import "bufio"
-`,
-	},
-	{
-		name: `issue 17212 several single-import lines with shared prefix ending in a slash`,
-		pkg:  "net/http",
-		in: `package main
-
-import "bufio"
-import "net/url"
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"net/http"
-	"net/url"
-)
-`,
-	},
-	{
-		name: `issue 17212 block imports lines with shared prefix ending in a slash`,
-		pkg:  "net/http",
-		in: `package main
-
-import (
-	"bufio"
-	"net/url"
-)
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"net/http"
-	"net/url"
-)
-`,
-	},
-	{
-		name: `issue 17213 many single-import lines`,
-		pkg:  "fmt",
-		in: `package main
-
-import "bufio"
-import "bytes"
-import "errors"
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-)
-`,
-	},
-}
-
-func TestAddImport(t *testing.T) {
-	for _, test := range addTests {
-		file := parse(t, test.name, test.in)
-		var before bytes.Buffer
-		ast.Fprint(&before, fset, file, nil)
-		AddNamedImport(fset, file, test.renamedPkg, test.pkg)
-		if got := print(t, test.name, file); got != test.out {
-			if test.broken {
-				t.Logf("%s is known broken:\ngot: %s\nwant: %s", test.name, got, test.out)
-			} else {
-				t.Errorf("%s:\ngot: %s\nwant: %s", test.name, got, test.out)
-			}
-			var after bytes.Buffer
-			ast.Fprint(&after, fset, file, nil)
-
-			t.Logf("AST before:\n%s\nAST after:\n%s\n", before.String(), after.String())
-		}
-	}
-}
-
-func TestDoubleAddImport(t *testing.T) {
-	file := parse(t, "doubleimport", "package main\n")
-	AddImport(fset, file, "os")
-	AddImport(fset, file, "bytes")
-	want := `package main
-
-import (
-	"bytes"
-	"os"
-)
-`
-	if got := print(t, "doubleimport", file); got != want {
-		t.Errorf("got: %s\nwant: %s", got, want)
-	}
-}
-
-func TestDoubleAddNamedImport(t *testing.T) {
-	file := parse(t, "doublenamedimport", "package main\n")
-	AddNamedImport(fset, file, "o", "os")
-	AddNamedImport(fset, file, "i", "io")
-	want := `package main
-
-import (
-	i "io"
-	o "os"
-)
-`
-	if got := print(t, "doublenamedimport", file); got != want {
-		t.Errorf("got: %s\nwant: %s", got, want)
-	}
-}
-
-// Part of issue 8729.
-func TestDoubleAddImportWithDeclComment(t *testing.T) {
-	file := parse(t, "doubleimport", `package main
-
-import (
-)
-
-// comment
-type I int
-`)
-	// The AddImport order here matters.
-	AddImport(fset, file, "golang.org/x/tools/go/ast/astutil")
-	AddImport(fset, file, "os")
-	want := `package main
-
-import (
-	"golang.org/x/tools/go/ast/astutil"
-	"os"
-)
-
-// comment
-type I int
-`
-	if got := print(t, "doubleimport_with_decl_comment", file); got != want {
-		t.Errorf("got: %s\nwant: %s", got, want)
-	}
-}
-
-var deleteTests = []test{
-	{
-		name: "import.4",
-		pkg:  "os",
-		in: `package main
-
-import (
-	"os"
-)
-`,
-		out: `package main
-`,
-	},
-	{
-		name: "import.5",
-		pkg:  "os",
-		in: `package main
-
-// Comment
-import "C"
-import "os"
-`,
-		out: `package main
-
-// Comment
-import "C"
-`,
-	},
-	{
-		name: "import.6",
-		pkg:  "os",
-		in: `package main
-
-// Comment
-import "C"
-
-import (
-	"io"
-	"os"
-	"utf8"
-)
-`,
-		out: `package main
-
-// Comment
-import "C"
-
-import (
-	"io"
-	"utf8"
-)
-`,
-	},
-	{
-		name: "import.7",
-		pkg:  "io",
-		in: `package main
-
-import (
-	"io"   // a
-	"os"   // b
-	"utf8" // c
-)
-`,
-		out: `package main
-
-import (
-	// a
-	"os"   // b
-	"utf8" // c
-)
-`,
-	},
-	{
-		name: "import.8",
-		pkg:  "os",
-		in: `package main
-
-import (
-	"io"   // a
-	"os"   // b
-	"utf8" // c
-)
-`,
-		out: `package main
-
-import (
-	"io" // a
-	// b
-	"utf8" // c
-)
-`,
-	},
-	{
-		name: "import.9",
-		pkg:  "utf8",
-		in: `package main
-
-import (
-	"io"   // a
-	"os"   // b
-	"utf8" // c
-)
-`,
-		out: `package main
-
-import (
-	"io" // a
-	"os" // b
-	// c
-)
-`,
-	},
-	{
-		name: "import.10",
-		pkg:  "io",
-		in: `package main
-
-import (
-	"io"
-	"os"
-	"utf8"
-)
-`,
-		out: `package main
-
-import (
-	"os"
-	"utf8"
-)
-`,
-	},
-	{
-		name: "import.11",
-		pkg:  "os",
-		in: `package main
-
-import (
-	"io"
-	"os"
-	"utf8"
-)
-`,
-		out: `package main
-
-import (
-	"io"
-	"utf8"
-)
-`,
-	},
-	{
-		name: "import.12",
-		pkg:  "utf8",
-		in: `package main
-
-import (
-	"io"
-	"os"
-	"utf8"
-)
-`,
-		out: `package main
-
-import (
-	"io"
-	"os"
-)
-`,
-	},
-	{
-		name: "handle.raw.quote.imports",
-		pkg:  "os",
-		in:   "package main\n\nimport `os`",
-		out: `package main
-`,
-	},
-	{
-		name: "import.13",
-		pkg:  "io",
-		in: `package main
-
-import (
-	"fmt"
-
-	"io"
-	"os"
-	"utf8"
-
-	"go/format"
-)
-`,
-		out: `package main
-
-import (
-	"fmt"
-
-	"os"
-	"utf8"
-
-	"go/format"
-)
-`,
-	},
-	{
-		name: "import.14",
-		pkg:  "io",
-		in: `package main
-
-import (
-	"fmt" // a
-
-	"io"   // b
-	"os"   // c
-	"utf8" // d
-
-	"go/format" // e
-)
-`,
-		out: `package main
-
-import (
-	"fmt" // a
-
-	// b
-	"os"   // c
-	"utf8" // d
-
-	"go/format" // e
-)
-`,
-	},
-	{
-		name: "import.15",
-		pkg:  "double",
-		in: `package main
-
-import (
-	"double"
-	"double"
-)
-`,
-		out: `package main
-`,
-	},
-	{
-		name: "import.16",
-		pkg:  "bubble",
-		in: `package main
-
-import (
-	"toil"
-	"bubble"
-	"bubble"
-	"trouble"
-)
-`,
-		out: `package main
-
-import (
-	"toil"
-	"trouble"
-)
-`,
-	},
-	{
-		name: "import.17",
-		pkg:  "quad",
-		in: `package main
-
-import (
-	"quad"
-	"quad"
-)
-
-import (
-	"quad"
-	"quad"
-)
-`,
-		out: `package main
-`,
-	},
-	{
-		name:       "import.18",
-		renamedPkg: "x",
-		pkg:        "fmt",
-		in: `package main
-
-import (
-	"fmt"
-	x "fmt"
-)
-`,
-		out: `package main
-
-import (
-	"fmt"
-)
-`,
-	},
-	{
-		name:       "import.18",
-		renamedPkg: "x",
-		pkg:        "fmt",
-		in: `package main
-
-import x "fmt"
-import y "fmt"
-`,
-		out: `package main
-
-import y "fmt"
-`,
-	},
-	// Issue #15432, #18051
-	{
-		name: "import.19",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt"
-
-	// Some comment.
-	"io"
-)`,
-		out: `package main
-
-import (
-	// Some comment.
-	"io"
-)
-`,
-	},
-	{
-		name: "import.20",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt"
-
-	// Some
-	// comment.
-	"io"
-)`,
-		out: `package main
-
-import (
-	// Some
-	// comment.
-	"io"
-)
-`,
-	},
-	{
-		name: "import.21",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt"
-
-	/*
-		Some
-		comment.
-	*/
-	"io"
-)`,
-		out: `package main
-
-import (
-	/*
-		Some
-		comment.
-	*/
-	"io"
-)
-`,
-	},
-	{
-		name: "import.22",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	/* Some */
-	// comment.
-	"io"
-	"fmt"
-)`,
-		out: `package main
-
-import (
-	/* Some */
-	// comment.
-	"io"
-)
-`,
-	},
-	{
-		name: "import.23",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	// comment 1
-	"fmt"
-	// comment 2
-	"io"
-)`,
-		out: `package main
-
-import (
-	// comment 2
-	"io"
-)
-`,
-	},
-	{
-		name: "import.24",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt" // comment 1
-	"io" // comment 2
-)`,
-		out: `package main
-
-import (
-	"io" // comment 2
-)
-`,
-	},
-	{
-		name: "import.25",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt"
-	/* comment */ "io"
-)`,
-		out: `package main
-
-import (
-	/* comment */ "io"
-)
-`,
-	},
-	{
-		name: "import.26",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt"
-	"io" /* comment */
-)`,
-		out: `package main
-
-import (
-	"io" /* comment */
-)
-`,
-	},
-	{
-		name: "import.27",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	"fmt" /* comment */
-	"io"
-)`,
-		out: `package main
-
-import (
-	"io"
-)
-`,
-	},
-	{
-		name: "import.28",
-		pkg:  "fmt",
-		in: `package main
-
-import (
-	/* comment */  "fmt"
-	"io"
-)`,
-		out: `package main
-
-import (
-	"io"
-)
-`,
-	},
-	{
-		name: "import.29",
-		pkg:  "fmt",
-		in: `package main
-
-// comment 1
-import (
-	"fmt"
-	"io" // comment 2
-)`,
-		out: `package main
-
-// comment 1
-import (
-	"io" // comment 2
-)
-`,
-	},
-	{
-		name: "import.30",
-		pkg:  "fmt",
-		in: `package main
-
-// comment 1
-import (
-	"fmt" // comment 2
-	"io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	"io"
-)
-`,
-	},
-	{
-		name: "import.31",
-		pkg:  "fmt",
-		in: `package main
-
-// comment 1
-import (
-	"fmt"
-	/* comment 2 */ "io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	/* comment 2 */ "io"
-)
-`,
-	},
-	{
-		name:       "import.32",
-		pkg:        "fmt",
-		renamedPkg: "f",
-		in: `package main
-
-// comment 1
-import (
-	f "fmt"
-	/* comment 2 */ i "io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	/* comment 2 */ i "io"
-)
-`,
-	},
-	{
-		name:       "import.33",
-		pkg:        "fmt",
-		renamedPkg: "f",
-		in: `package main
-
-// comment 1
-import (
-	/* comment 2 */ f "fmt"
-	i "io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	i "io"
-)
-`,
-	},
-	{
-		name:       "import.34",
-		pkg:        "fmt",
-		renamedPkg: "f",
-		in: `package main
-
-// comment 1
-import (
-	f "fmt" /* comment 2 */
-	i "io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	i "io"
-)
-`,
-	},
-	{
-		name: "import.35",
-		pkg:  "fmt",
-		in: `package main
-
-// comment 1
-import (
-	"fmt"
-	// comment 2
-	"io"
-)`,
-		out: `package main
-
-// comment 1
-import (
-	// comment 2
-	"io"
-)
-`,
-	},
-	{
-		name: "import.36",
-		pkg:  "fmt",
-		in: `package main
-
-/* comment 1 */
-import (
-	"fmt"
-	/* comment 2 */
-	"io"
-)`,
-		out: `package main
-
-/* comment 1 */
-import (
-	/* comment 2 */
-	"io"
-)
-`,
-	},
-
-	// Issue 20229: MergeLine panic on weird input
-	{
-		name: "import.37",
-		pkg:  "io",
-		in: `package main
-import("_"
-"io")`,
-		out: `package main
-
-import (
-	"_"
-)
-`,
-	},
-}
-
-func TestDeleteImport(t *testing.T) {
-	for _, test := range deleteTests {
-		file := parse(t, test.name, test.in)
-		DeleteNamedImport(fset, file, test.renamedPkg, test.pkg)
-		if got := print(t, test.name, file); got != test.out {
-			t.Errorf("%s:\ngot: %s\nwant: %s", test.name, got, test.out)
-		}
-	}
-}
-
-type rewriteTest struct {
-	name   string
-	srcPkg string
-	dstPkg string
-	in     string
-	out    string
-}
-
-var rewriteTests = []rewriteTest{
-	{
-		name:   "import.13",
-		srcPkg: "utf8",
-		dstPkg: "encoding/utf8",
-		in: `package main
-
-import (
-	"io"
-	"os"
-	"utf8" // thanks ken
-)
-`,
-		out: `package main
-
-import (
-	"encoding/utf8" // thanks ken
-	"io"
-	"os"
-)
-`,
-	},
-	{
-		name:   "import.14",
-		srcPkg: "asn1",
-		dstPkg: "encoding/asn1",
-		in: `package main
-
-import (
-	"asn1"
-	"crypto"
-	"crypto/rsa"
-	_ "crypto/sha1"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"time"
-)
-
-var x = 1
-`,
-		out: `package main
-
-import (
-	"crypto"
-	"crypto/rsa"
-	_ "crypto/sha1"
-	"crypto/x509"
-	"crypto/x509/pkix"
-	"encoding/asn1"
-	"time"
-)
-
-var x = 1
-`,
-	},
-	{
-		name:   "import.15",
-		srcPkg: "url",
-		dstPkg: "net/url",
-		in: `package main
-
-import (
-	"bufio"
-	"net"
-	"path"
-	"url"
-)
-
-var x = 1 // comment on x, not on url
-`,
-		out: `package main
-
-import (
-	"bufio"
-	"net"
-	"net/url"
-	"path"
-)
-
-var x = 1 // comment on x, not on url
-`,
-	},
-	{
-		name:   "import.16",
-		srcPkg: "http",
-		dstPkg: "net/http",
-		in: `package main
-
-import (
-	"flag"
-	"http"
-	"log"
-	"text/template"
-)
-
-var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18
-`,
-		out: `package main
-
-import (
-	"flag"
-	"log"
-	"net/http"
-	"text/template"
-)
-
-var addr = flag.String("addr", ":1718", "http service address") // Q=17, R=18
-`,
-	},
-}
-
-func TestRewriteImport(t *testing.T) {
-	for _, test := range rewriteTests {
-		file := parse(t, test.name, test.in)
-		RewriteImport(fset, file, test.srcPkg, test.dstPkg)
-		if got := print(t, test.name, file); got != test.out {
-			t.Errorf("%s:\ngot: %s\nwant: %s", test.name, got, test.out)
-		}
-	}
-}
-
-var importsTests = []struct {
-	name string
-	in   string
-	want [][]string
-}{
-	{
-		name: "no packages",
-		in: `package foo
-`,
-		want: nil,
-	},
-	{
-		name: "one group",
-		in: `package foo
-
-import (
-	"fmt"
-	"testing"
-)
-`,
-		want: [][]string{{"fmt", "testing"}},
-	},
-	{
-		name: "four groups",
-		in: `package foo
-
-import "C"
-import (
-	"fmt"
-	"testing"
-
-	"appengine"
-
-	"myproject/mylib1"
-	"myproject/mylib2"
-)
-`,
-		want: [][]string{
-			{"C"},
-			{"fmt", "testing"},
-			{"appengine"},
-			{"myproject/mylib1", "myproject/mylib2"},
-		},
-	},
-	{
-		name: "multiple factored groups",
-		in: `package foo
-
-import (
-	"fmt"
-	"testing"
-
-	"appengine"
-)
-import (
-	"reflect"
-
-	"bytes"
-)
-`,
-		want: [][]string{
-			{"fmt", "testing"},
-			{"appengine"},
-			{"reflect"},
-			{"bytes"},
-		},
-	},
-}
-
-func unquote(s string) string {
-	res, err := strconv.Unquote(s)
-	if err != nil {
-		return "could_not_unquote"
-	}
-	return res
-}
-
-func TestImports(t *testing.T) {
-	fset := token.NewFileSet()
-	for _, test := range importsTests {
-		f, err := parser.ParseFile(fset, "test.go", test.in, 0)
-		if err != nil {
-			t.Errorf("%s: %v", test.name, err)
-			continue
-		}
-		var got [][]string
-		for _, group := range Imports(fset, f) {
-			var b []string
-			for _, spec := range group {
-				b = append(b, unquote(spec.Path.Value))
-			}
-			got = append(got, b)
-		}
-		if !reflect.DeepEqual(got, test.want) {
-			t.Errorf("Imports(%s)=%v, want %v", test.name, got, test.want)
-		}
-	}
-}
-
-var usesImportTests = []struct {
-	name string
-	path string
-	in   string
-	want bool
-}{
-	{
-		name: "no packages",
-		path: "io",
-		in: `package foo
-`,
-		want: false,
-	},
-	{
-		name: "import.1",
-		path: "io",
-		in: `package foo
-
-import "io"
-
-var _ io.Writer
-`,
-		want: true,
-	},
-	{
-		name: "import.2",
-		path: "io",
-		in: `package foo
-
-import "io"
-`,
-		want: false,
-	},
-	{
-		name: "import.3",
-		path: "io",
-		in: `package foo
-
-import "io"
-
-var io = 42
-`,
-		want: false,
-	},
-	{
-		name: "import.4",
-		path: "io",
-		in: `package foo
-
-import i "io"
-
-var _ i.Writer
-`,
-		want: true,
-	},
-	{
-		name: "import.5",
-		path: "io",
-		in: `package foo
-
-import i "io"
-`,
-		want: false,
-	},
-	{
-		name: "import.6",
-		path: "io",
-		in: `package foo
-
-import i "io"
-
-var i = 42
-var io = 42
-`,
-		want: false,
-	},
-	{
-		name: "import.7",
-		path: "encoding/json",
-		in: `package foo
-
-import "encoding/json"
-
-var _ json.Encoder
-`,
-		want: true,
-	},
-	{
-		name: "import.8",
-		path: "encoding/json",
-		in: `package foo
-
-import "encoding/json"
-`,
-		want: false,
-	},
-	{
-		name: "import.9",
-		path: "encoding/json",
-		in: `package foo
-
-import "encoding/json"
-
-var json = 42
-`,
-		want: false,
-	},
-	{
-		name: "import.10",
-		path: "encoding/json",
-		in: `package foo
-
-import j "encoding/json"
-
-var _ j.Encoder
-`,
-		want: true,
-	},
-	{
-		name: "import.11",
-		path: "encoding/json",
-		in: `package foo
-
-import j "encoding/json"
-`,
-		want: false,
-	},
-	{
-		name: "import.12",
-		path: "encoding/json",
-		in: `package foo
-
-import j "encoding/json"
-
-var j = 42
-var json = 42
-`,
-		want: false,
-	},
-	{
-		name: "import.13",
-		path: "io",
-		in: `package foo
-
-import _ "io"
-`,
-		want: true,
-	},
-	{
-		name: "import.14",
-		path: "io",
-		in: `package foo
-
-import . "io"
-`,
-		want: true,
-	},
-}
-
-func TestUsesImport(t *testing.T) {
-	fset := token.NewFileSet()
-	for _, test := range usesImportTests {
-		f, err := parser.ParseFile(fset, "test.go", test.in, 0)
-		if err != nil {
-			t.Errorf("%s: %v", test.name, err)
-			continue
-		}
-		got := UsesImport(f, test.path)
-		if got != test.want {
-			t.Errorf("UsesImport(%s)=%v, want %v", test.name, got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go b/installer/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
new file mode 100644
index 0000000000..cf72ea990b
--- /dev/null
+++ b/installer/vendor/golang.org/x/tools/go/ast/astutil/rewrite.go
@@ -0,0 +1,477 @@
+// Copyright 2017 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+package astutil
+
+import (
+	"fmt"
+	"go/ast"
+	"reflect"
+	"sort"
+)
+
+// An ApplyFunc is invoked by Apply for each node n, even if n is nil,
+// before and/or after the node's children, using a Cursor describing
+// the current node and providing operations on it.
+//
+// The return value of ApplyFunc controls the syntax tree traversal.
+// See Apply for details.
+type ApplyFunc func(*Cursor) bool
+
+// Apply traverses a syntax tree recursively, starting with root,
+// and calling pre and post for each node as described below.
+// Apply returns the syntax tree, possibly modified.
+//
+// If pre is not nil, it is called for each node before the node's
+// children are traversed (pre-order). If pre returns false, no
+// children are traversed, and post is not called for that node.
+//
+// If post is not nil, and a prior call of pre didn't return false,
+// post is called for each node after its children are traversed
+// (post-order). If post returns false, traversal is terminated and
+// Apply returns immediately.
+//
+// Only fields that refer to AST nodes are considered children;
+// i.e., token.Pos, Scopes, Objects, and fields of basic types
+// (strings, etc.) are ignored.
+//
+// Children are traversed in the order in which they appear in the
+// respective node's struct definition. A package's files are
+// traversed in the filenames' alphabetical order.
+//
+func Apply(root ast.Node, pre, post ApplyFunc) (result ast.Node) {
+	parent := &struct{ ast.Node }{root}
+	defer func() {
+		if r := recover(); r != nil && r != abort {
+			panic(r)
+		}
+		result = parent.Node
+	}()
+	a := &application{pre: pre, post: post}
+	a.apply(parent, "Node", nil, root)
+	return
+}
+
+var abort = new(int) // singleton, to signal termination of Apply
+
+// A Cursor describes a node encountered during Apply.
+// Information about the node and its parent is available
+// from the Node, Parent, Name, and Index methods.
+//
+// If p is a variable of type and value of the current parent node
+// c.Parent(), and f is the field identifier with name c.Name(),
+// the following invariants hold:
+//
+//   p.f            == c.Node()  if c.Index() <  0
+//   p.f[c.Index()] == c.Node()  if c.Index() >= 0
+//
+// The methods Replace, Delete, InsertBefore, and InsertAfter
+// can be used to change the AST without disrupting Apply.
+type Cursor struct {
+	parent ast.Node
+	name   string
+	iter   *iterator // valid if non-nil
+	node   ast.Node
+}
+
+// Node returns the current Node.
+func (c *Cursor) Node() ast.Node { return c.node }
+
+// Parent returns the parent of the current Node.
+func (c *Cursor) Parent() ast.Node { return c.parent }
+
+// Name returns the name of the parent Node field that contains the current Node.
+// If the parent is a *ast.Package and the current Node is a *ast.File, Name returns
+// the filename for the current Node.
+func (c *Cursor) Name() string { return c.name }
+
+// Index reports the index >= 0 of the current Node in the slice of Nodes that
+// contains it, or a value < 0 if the current Node is not part of a slice.
+// The index of the current node changes if InsertBefore is called while
+// processing the current node.
+func (c *Cursor) Index() int {
+	if c.iter != nil {
+		return c.iter.index
+	}
+	return -1
+}
+
+// field returns the current node's parent field value.
+func (c *Cursor) field() reflect.Value {
+	return reflect.Indirect(reflect.ValueOf(c.parent)).FieldByName(c.name)
+}
+
+// Replace replaces the current Node with n.
+// The replacement node is not walked by Apply.
+func (c *Cursor) Replace(n ast.Node) {
+	if _, ok := c.node.(*ast.File); ok {
+		file, ok := n.(*ast.File)
+		if !ok {
+			panic("attempt to replace *ast.File with non-*ast.File")
+		}
+		c.parent.(*ast.Package).Files[c.name] = file
+		return
+	}
+
+	v := c.field()
+	if i := c.Index(); i >= 0 {
+		v = v.Index(i)
+	}
+	v.Set(reflect.ValueOf(n))
+}
+
+// Delete deletes the current Node from its containing slice.
+// If the current Node is not part of a slice, Delete panics.
+// As a special case, if the current node is a package file,
+// Delete removes it from the package's Files map.
+func (c *Cursor) Delete() {
+	if _, ok := c.node.(*ast.File); ok {
+		delete(c.parent.(*ast.Package).Files, c.name)
+		return
+	}
+
+	i := c.Index()
+	if i < 0 {
+		panic("Delete node not contained in slice")
+	}
+	v := c.field()
+	l := v.Len()
+	reflect.Copy(v.Slice(i, l), v.Slice(i+1, l))
+	v.Index(l - 1).Set(reflect.Zero(v.Type().Elem()))
+	v.SetLen(l - 1)
+	c.iter.step--
+}
+
+// InsertAfter inserts n after the current Node in its containing slice.
+// If the current Node is not part of a slice, InsertAfter panics.
+// Apply does not walk n.
+func (c *Cursor) InsertAfter(n ast.Node) {
+	i := c.Index()
+	if i < 0 {
+		panic("InsertAfter node not contained in slice")
+	}
+	v := c.field()
+	v.Set(reflect.Append(v, reflect.Zero(v.Type().Elem())))
+	l := v.Len()
+	reflect.Copy(v.Slice(i+2, l), v.Slice(i+1, l))
+	v.Index(i + 1).Set(reflect.ValueOf(n))
+	c.iter.step++
+}
+
+// InsertBefore inserts n before the current Node in its containing slice.
+// If the current Node is not part of a slice, InsertBefore panics.
+// Apply will not walk n.
+func (c *Cursor) InsertBefore(n ast.Node) {
+	i := c.Index()
+	if i < 0 {
+		panic("InsertBefore node not contained in slice")
+	}
+	v := c.field()
+	v.Set(reflect.Append(v, reflect.Zero(v.Type().Elem())))
+	l := v.Len()
+	reflect.Copy(v.Slice(i+1, l), v.Slice(i, l))
+	v.Index(i).Set(reflect.ValueOf(n))
+	c.iter.index++
+}
+
+// application carries all the shared data so we can pass it around cheaply.
+type application struct {
+	pre, post ApplyFunc
+	cursor    Cursor
+	iter      iterator
+}
+
+func (a *application) apply(parent ast.Node, name string, iter *iterator, n ast.Node) {
+	// convert typed nil into untyped nil
+	if v := reflect.ValueOf(n); v.Kind() == reflect.Ptr && v.IsNil() {
+		n = nil
+	}
+
+	// avoid heap-allocating a new cursor for each apply call; reuse a.cursor instead
+	saved := a.cursor
+	a.cursor.parent = parent
+	a.cursor.name = name
+	a.cursor.iter = iter
+	a.cursor.node = n
+
+	if a.pre != nil && !a.pre(&a.cursor) {
+		a.cursor = saved
+		return
+	}
+
+	// walk children
+	// (the order of the cases matches the order of the corresponding node types in go/ast)
+	switch n := n.(type) {
+	case nil:
+		// nothing to do
+
+	// Comments and fields
+	case *ast.Comment:
+		// nothing to do
+
+	case *ast.CommentGroup:
+		if n != nil {
+			a.applyList(n, "List")
+		}
+
+	case *ast.Field:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Names")
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Tag", nil, n.Tag)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.FieldList:
+		a.applyList(n, "List")
+
+	// Expressions
+	case *ast.BadExpr, *ast.Ident, *ast.BasicLit:
+		// nothing to do
+
+	case *ast.Ellipsis:
+		a.apply(n, "Elt", nil, n.Elt)
+
+	case *ast.FuncLit:
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.CompositeLit:
+		a.apply(n, "Type", nil, n.Type)
+		a.applyList(n, "Elts")
+
+	case *ast.ParenExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.SelectorExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Sel", nil, n.Sel)
+
+	case *ast.IndexExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Index", nil, n.Index)
+
+	case *ast.SliceExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Low", nil, n.Low)
+		a.apply(n, "High", nil, n.High)
+		a.apply(n, "Max", nil, n.Max)
+
+	case *ast.TypeAssertExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Type", nil, n.Type)
+
+	case *ast.CallExpr:
+		a.apply(n, "Fun", nil, n.Fun)
+		a.applyList(n, "Args")
+
+	case *ast.StarExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.UnaryExpr:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.BinaryExpr:
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Y", nil, n.Y)
+
+	case *ast.KeyValueExpr:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+
+	// Types
+	case *ast.ArrayType:
+		a.apply(n, "Len", nil, n.Len)
+		a.apply(n, "Elt", nil, n.Elt)
+
+	case *ast.StructType:
+		a.apply(n, "Fields", nil, n.Fields)
+
+	case *ast.FuncType:
+		a.apply(n, "Params", nil, n.Params)
+		a.apply(n, "Results", nil, n.Results)
+
+	case *ast.InterfaceType:
+		a.apply(n, "Methods", nil, n.Methods)
+
+	case *ast.MapType:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+
+	case *ast.ChanType:
+		a.apply(n, "Value", nil, n.Value)
+
+	// Statements
+	case *ast.BadStmt:
+		// nothing to do
+
+	case *ast.DeclStmt:
+		a.apply(n, "Decl", nil, n.Decl)
+
+	case *ast.EmptyStmt:
+		// nothing to do
+
+	case *ast.LabeledStmt:
+		a.apply(n, "Label", nil, n.Label)
+		a.apply(n, "Stmt", nil, n.Stmt)
+
+	case *ast.ExprStmt:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.SendStmt:
+		a.apply(n, "Chan", nil, n.Chan)
+		a.apply(n, "Value", nil, n.Value)
+
+	case *ast.IncDecStmt:
+		a.apply(n, "X", nil, n.X)
+
+	case *ast.AssignStmt:
+		a.applyList(n, "Lhs")
+		a.applyList(n, "Rhs")
+
+	case *ast.GoStmt:
+		a.apply(n, "Call", nil, n.Call)
+
+	case *ast.DeferStmt:
+		a.apply(n, "Call", nil, n.Call)
+
+	case *ast.ReturnStmt:
+		a.applyList(n, "Results")
+
+	case *ast.BranchStmt:
+		a.apply(n, "Label", nil, n.Label)
+
+	case *ast.BlockStmt:
+		a.applyList(n, "List")
+
+	case *ast.IfStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Cond", nil, n.Cond)
+		a.apply(n, "Body", nil, n.Body)
+		a.apply(n, "Else", nil, n.Else)
+
+	case *ast.CaseClause:
+		a.applyList(n, "List")
+		a.applyList(n, "Body")
+
+	case *ast.SwitchStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Tag", nil, n.Tag)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.TypeSwitchStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Assign", nil, n.Assign)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.CommClause:
+		a.apply(n, "Comm", nil, n.Comm)
+		a.applyList(n, "Body")
+
+	case *ast.SelectStmt:
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.ForStmt:
+		a.apply(n, "Init", nil, n.Init)
+		a.apply(n, "Cond", nil, n.Cond)
+		a.apply(n, "Post", nil, n.Post)
+		a.apply(n, "Body", nil, n.Body)
+
+	case *ast.RangeStmt:
+		a.apply(n, "Key", nil, n.Key)
+		a.apply(n, "Value", nil, n.Value)
+		a.apply(n, "X", nil, n.X)
+		a.apply(n, "Body", nil, n.Body)
+
+	// Declarations
+	case *ast.ImportSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		a.apply(n, "Path", nil, n.Path)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.ValueSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Names")
+		a.apply(n, "Type", nil, n.Type)
+		a.applyList(n, "Values")
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.TypeSpec:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Comment", nil, n.Comment)
+
+	case *ast.BadDecl:
+		// nothing to do
+
+	case *ast.GenDecl:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.applyList(n, "Specs")
+
+	case *ast.FuncDecl:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Recv", nil, n.Recv)
+		a.apply(n, "Name", nil, n.Name)
+		a.apply(n, "Type", nil, n.Type)
+		a.apply(n, "Body", nil, n.Body)
+
+	// Files and packages
+	case *ast.File:
+		a.apply(n, "Doc", nil, n.Doc)
+		a.apply(n, "Name", nil, n.Name)
+		a.applyList(n, "Decls")
+		// Don't walk n.Comments; they have either been walked already if
+		// they are Doc comments, or they can be easily walked explicitly.
+
+	case *ast.Package:
+		// collect and sort names for reproducible behavior
+		var names []string
+		for name := range n.Files {
+			names = append(names, name)
+		}
+		sort.Strings(names)
+		for _, name := range names {
+			a.apply(n, name, nil, n.Files[name])
+		}
+
+	default:
+		panic(fmt.Sprintf("Apply: unexpected node type %T", n))
+	}
+
+	if a.post != nil && !a.post(&a.cursor) {
+		panic(abort)
+	}
+
+	a.cursor = saved
+}
+
+// An iterator controls iteration over a slice of nodes.
+type iterator struct {
+	index, step int
+}
+
+func (a *application) applyList(parent ast.Node, name string) {
+	// avoid heap-allocating a new iterator for each applyList call; reuse a.iter instead
+	saved := a.iter
+	a.iter.index = 0
+	for {
+		// must reload parent.name each time, since cursor modifications might change it
+		v := reflect.Indirect(reflect.ValueOf(parent)).FieldByName(name)
+		if a.iter.index >= v.Len() {
+			break
+		}
+
+		// element x may be nil in a bad AST - be cautious
+		var x ast.Node
+		if e := v.Index(a.iter.index); e.IsValid() {
+			x = e.Interface().(ast.Node)
+		}
+
+		a.iter.step = 1
+		a.apply(parent, name, &a.iter, x)
+		a.iter.index += a.iter.step
+	}
+	a.iter = saved
+}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/allpackages.go b/installer/vendor/golang.org/x/tools/go/buildutil/allpackages.go
deleted file mode 100644
index c0cb03e7be..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/allpackages.go
+++ /dev/null
@@ -1,198 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package buildutil provides utilities related to the go/build
-// package in the standard library.
-//
-// All I/O is done via the build.Context file system interface, which must
-// be concurrency-safe.
-package buildutil // import "golang.org/x/tools/go/buildutil"
-
-import (
-	"go/build"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-)
-
-// AllPackages returns the package path of each Go package in any source
-// directory of the specified build context (e.g. $GOROOT or an element
-// of $GOPATH).  Errors are ignored.  The results are sorted.
-// All package paths are canonical, and thus may contain "/vendor/".
-//
-// The result may include import paths for directories that contain no
-// *.go files, such as "archive" (in $GOROOT/src).
-//
-// All I/O is done via the build.Context file system interface,
-// which must be concurrency-safe.
-//
-func AllPackages(ctxt *build.Context) []string {
-	var list []string
-	ForEachPackage(ctxt, func(pkg string, _ error) {
-		list = append(list, pkg)
-	})
-	sort.Strings(list)
-	return list
-}
-
-// ForEachPackage calls the found function with the package path of
-// each Go package it finds in any source directory of the specified
-// build context (e.g. $GOROOT or an element of $GOPATH).
-// All package paths are canonical, and thus may contain "/vendor/".
-//
-// If the package directory exists but could not be read, the second
-// argument to the found function provides the error.
-//
-// All I/O is done via the build.Context file system interface,
-// which must be concurrency-safe.
-//
-func ForEachPackage(ctxt *build.Context, found func(importPath string, err error)) {
-	ch := make(chan item)
-
-	var wg sync.WaitGroup
-	for _, root := range ctxt.SrcDirs() {
-		root := root
-		wg.Add(1)
-		go func() {
-			allPackages(ctxt, root, ch)
-			wg.Done()
-		}()
-	}
-	go func() {
-		wg.Wait()
-		close(ch)
-	}()
-
-	// All calls to found occur in the caller's goroutine.
-	for i := range ch {
-		found(i.importPath, i.err)
-	}
-}
-
-type item struct {
-	importPath string
-	err        error // (optional)
-}
-
-// We use a process-wide counting semaphore to limit
-// the number of parallel calls to ReadDir.
-var ioLimit = make(chan bool, 20)
-
-func allPackages(ctxt *build.Context, root string, ch chan<- item) {
-	root = filepath.Clean(root) + string(os.PathSeparator)
-
-	var wg sync.WaitGroup
-
-	var walkDir func(dir string)
-	walkDir = func(dir string) {
-		// Avoid .foo, _foo, and testdata directory trees.
-		base := filepath.Base(dir)
-		if base == "" || base[0] == '.' || base[0] == '_' || base == "testdata" {
-			return
-		}
-
-		pkg := filepath.ToSlash(strings.TrimPrefix(dir, root))
-
-		// Prune search if we encounter any of these import paths.
-		switch pkg {
-		case "builtin":
-			return
-		}
-
-		ioLimit <- true
-		files, err := ReadDir(ctxt, dir)
-		<-ioLimit
-		if pkg != "" || err != nil {
-			ch <- item{pkg, err}
-		}
-		for _, fi := range files {
-			fi := fi
-			if fi.IsDir() {
-				wg.Add(1)
-				go func() {
-					walkDir(filepath.Join(dir, fi.Name()))
-					wg.Done()
-				}()
-			}
-		}
-	}
-
-	walkDir(root)
-	wg.Wait()
-}
-
-// ExpandPatterns returns the set of packages matched by patterns,
-// which may have the following forms:
-//
-//		golang.org/x/tools/cmd/guru     # a single package
-//		golang.org/x/tools/...          # all packages beneath dir
-//		...                             # the entire workspace.
-//
-// Order is significant: a pattern preceded by '-' removes matching
-// packages from the set.  For example, these patterns match all encoding
-// packages except encoding/xml:
-//
-// 	encoding/... -encoding/xml
-//
-// A trailing slash in a pattern is ignored.  (Path components of Go
-// package names are separated by slash, not the platform's path separator.)
-//
-func ExpandPatterns(ctxt *build.Context, patterns []string) map[string]bool {
-	// TODO(adonovan): support other features of 'go list':
-	// - "std"/"cmd"/"all" meta-packages
-	// - "..." not at the end of a pattern
-	// - relative patterns using "./" or "../" prefix
-
-	pkgs := make(map[string]bool)
-	doPkg := func(pkg string, neg bool) {
-		if neg {
-			delete(pkgs, pkg)
-		} else {
-			pkgs[pkg] = true
-		}
-	}
-
-	// Scan entire workspace if wildcards are present.
-	// TODO(adonovan): opt: scan only the necessary subtrees of the workspace.
-	var all []string
-	for _, arg := range patterns {
-		if strings.HasSuffix(arg, "...") {
-			all = AllPackages(ctxt)
-			break
-		}
-	}
-
-	for _, arg := range patterns {
-		if arg == "" {
-			continue
-		}
-
-		neg := arg[0] == '-'
-		if neg {
-			arg = arg[1:]
-		}
-
-		if arg == "..." {
-			// ... matches all packages
-			for _, pkg := range all {
-				doPkg(pkg, neg)
-			}
-		} else if dir := strings.TrimSuffix(arg, "/..."); dir != arg {
-			// dir/... matches all packages beneath dir
-			for _, pkg := range all {
-				if strings.HasPrefix(pkg, dir) &&
-					(len(pkg) == len(dir) || pkg[len(dir)] == '/') {
-					doPkg(pkg, neg)
-				}
-			}
-		} else {
-			// single package
-			doPkg(strings.TrimSuffix(arg, "/"), neg)
-		}
-	}
-
-	return pkgs
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/allpackages_test.go b/installer/vendor/golang.org/x/tools/go/buildutil/allpackages_test.go
deleted file mode 100644
index 0440ff2402..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/allpackages_test.go
+++ /dev/null
@@ -1,78 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Incomplete source tree on Android.
-
-// +build !android
-
-package buildutil_test
-
-import (
-	"go/build"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestAllPackages(t *testing.T) {
-	all := buildutil.AllPackages(&build.Default)
-
-	set := make(map[string]bool)
-	for _, pkg := range all {
-		set[pkg] = true
-	}
-
-	const wantAtLeast = 250
-	if len(all) < wantAtLeast {
-		t.Errorf("Found only %d packages, want at least %d", len(all), wantAtLeast)
-	}
-
-	for _, want := range []string{"fmt", "crypto/sha256", "golang.org/x/tools/go/buildutil"} {
-		if !set[want] {
-			t.Errorf("Package %q not found; got %s", want, all)
-		}
-	}
-}
-
-func TestExpandPatterns(t *testing.T) {
-	tree := make(map[string]map[string]string)
-	for _, pkg := range []string{
-		"encoding",
-		"encoding/xml",
-		"encoding/hex",
-		"encoding/json",
-		"fmt",
-	} {
-		tree[pkg] = make(map[string]string)
-	}
-	ctxt := buildutil.FakeContext(tree)
-
-	for _, test := range []struct {
-		patterns string
-		want     string
-	}{
-		{"", ""},
-		{"fmt", "fmt"},
-		{"nosuchpkg", "nosuchpkg"},
-		{"nosuchdir/...", ""},
-		{"...", "encoding encoding/hex encoding/json encoding/xml fmt"},
-		{"encoding/... -encoding/xml", "encoding encoding/hex encoding/json"},
-		{"... -encoding/...", "fmt"},
-		{"encoding", "encoding"},
-		{"encoding/", "encoding"},
-	} {
-		var pkgs []string
-		for pkg := range buildutil.ExpandPatterns(ctxt, strings.Fields(test.patterns)) {
-			pkgs = append(pkgs, pkg)
-		}
-		sort.Strings(pkgs)
-		got := strings.Join(pkgs, " ")
-		if got != test.want {
-			t.Errorf("ExpandPatterns(%s) = %s, want %s",
-				test.patterns, got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/fakecontext.go b/installer/vendor/golang.org/x/tools/go/buildutil/fakecontext.go
deleted file mode 100644
index 24cbcbea2b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/fakecontext.go
+++ /dev/null
@@ -1,108 +0,0 @@
-package buildutil
-
-import (
-	"fmt"
-	"go/build"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"sort"
-	"strings"
-	"time"
-)
-
-// FakeContext returns a build.Context for the fake file tree specified
-// by pkgs, which maps package import paths to a mapping from file base
-// names to contents.
-//
-// The fake Context has a GOROOT of "/go" and no GOPATH, and overrides
-// the necessary file access methods to read from memory instead of the
-// real file system.
-//
-// Unlike a real file tree, the fake one has only two levels---packages
-// and files---so ReadDir("/go/src/") returns all packages under
-// /go/src/ including, for instance, "math" and "math/big".
-// ReadDir("/go/src/math/big") would return all the files in the
-// "math/big" package.
-//
-func FakeContext(pkgs map[string]map[string]string) *build.Context {
-	clean := func(filename string) string {
-		f := path.Clean(filepath.ToSlash(filename))
-		// Removing "/go/src" while respecting segment
-		// boundaries has this unfortunate corner case:
-		if f == "/go/src" {
-			return ""
-		}
-		return strings.TrimPrefix(f, "/go/src/")
-	}
-
-	ctxt := build.Default // copy
-	ctxt.GOROOT = "/go"
-	ctxt.GOPATH = ""
-	ctxt.IsDir = func(dir string) bool {
-		dir = clean(dir)
-		if dir == "" {
-			return true // needed by (*build.Context).SrcDirs
-		}
-		return pkgs[dir] != nil
-	}
-	ctxt.ReadDir = func(dir string) ([]os.FileInfo, error) {
-		dir = clean(dir)
-		var fis []os.FileInfo
-		if dir == "" {
-			// enumerate packages
-			for importPath := range pkgs {
-				fis = append(fis, fakeDirInfo(importPath))
-			}
-		} else {
-			// enumerate files of package
-			for basename := range pkgs[dir] {
-				fis = append(fis, fakeFileInfo(basename))
-			}
-		}
-		sort.Sort(byName(fis))
-		return fis, nil
-	}
-	ctxt.OpenFile = func(filename string) (io.ReadCloser, error) {
-		filename = clean(filename)
-		dir, base := path.Split(filename)
-		content, ok := pkgs[path.Clean(dir)][base]
-		if !ok {
-			return nil, fmt.Errorf("file not found: %s", filename)
-		}
-		return ioutil.NopCloser(strings.NewReader(content)), nil
-	}
-	ctxt.IsAbsPath = func(path string) bool {
-		path = filepath.ToSlash(path)
-		// Don't rely on the default (filepath.Path) since on
-		// Windows, it reports virtual paths as non-absolute.
-		return strings.HasPrefix(path, "/")
-	}
-	return &ctxt
-}
-
-type byName []os.FileInfo
-
-func (s byName) Len() int           { return len(s) }
-func (s byName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s byName) Less(i, j int) bool { return s[i].Name() < s[j].Name() }
-
-type fakeFileInfo string
-
-func (fi fakeFileInfo) Name() string    { return string(fi) }
-func (fakeFileInfo) Sys() interface{}   { return nil }
-func (fakeFileInfo) ModTime() time.Time { return time.Time{} }
-func (fakeFileInfo) IsDir() bool        { return false }
-func (fakeFileInfo) Size() int64        { return 0 }
-func (fakeFileInfo) Mode() os.FileMode  { return 0644 }
-
-type fakeDirInfo string
-
-func (fd fakeDirInfo) Name() string    { return string(fd) }
-func (fakeDirInfo) Sys() interface{}   { return nil }
-func (fakeDirInfo) ModTime() time.Time { return time.Time{} }
-func (fakeDirInfo) IsDir() bool        { return true }
-func (fakeDirInfo) Size() int64        { return 0 }
-func (fakeDirInfo) Mode() os.FileMode  { return 0755 }
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/overlay.go b/installer/vendor/golang.org/x/tools/go/buildutil/overlay.go
deleted file mode 100644
index 3f71c4fef7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/overlay.go
+++ /dev/null
@@ -1,103 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package buildutil
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"go/build"
-	"io"
-	"io/ioutil"
-	"path/filepath"
-	"strconv"
-	"strings"
-)
-
-// OverlayContext overlays a build.Context with additional files from
-// a map. Files in the map take precedence over other files.
-//
-// In addition to plain string comparison, two file names are
-// considered equal if their base names match and their directory
-// components point at the same directory on the file system. That is,
-// symbolic links are followed for directories, but not files.
-//
-// A common use case for OverlayContext is to allow editors to pass in
-// a set of unsaved, modified files.
-//
-// Currently, only the Context.OpenFile function will respect the
-// overlay. This may change in the future.
-func OverlayContext(orig *build.Context, overlay map[string][]byte) *build.Context {
-	// TODO(dominikh): Implement IsDir, HasSubdir and ReadDir
-
-	rc := func(data []byte) (io.ReadCloser, error) {
-		return ioutil.NopCloser(bytes.NewBuffer(data)), nil
-	}
-
-	copy := *orig // make a copy
-	ctxt := &copy
-	ctxt.OpenFile = func(path string) (io.ReadCloser, error) {
-		// Fast path: names match exactly.
-		if content, ok := overlay[path]; ok {
-			return rc(content)
-		}
-
-		// Slow path: check for same file under a different
-		// alias, perhaps due to a symbolic link.
-		for filename, content := range overlay {
-			if sameFile(path, filename) {
-				return rc(content)
-			}
-		}
-
-		return OpenFile(orig, path)
-	}
-	return ctxt
-}
-
-// ParseOverlayArchive parses an archive containing Go files and their
-// contents. The result is intended to be used with OverlayContext.
-//
-//
-// Archive format
-//
-// The archive consists of a series of files. Each file consists of a
-// name, a decimal file size and the file contents, separated by
-// newlinews. No newline follows after the file contents.
-func ParseOverlayArchive(archive io.Reader) (map[string][]byte, error) {
-	overlay := make(map[string][]byte)
-	r := bufio.NewReader(archive)
-	for {
-		// Read file name.
-		filename, err := r.ReadString('\n')
-		if err != nil {
-			if err == io.EOF {
-				break // OK
-			}
-			return nil, fmt.Errorf("reading archive file name: %v", err)
-		}
-		filename = filepath.Clean(strings.TrimSpace(filename))
-
-		// Read file size.
-		sz, err := r.ReadString('\n')
-		if err != nil {
-			return nil, fmt.Errorf("reading size of archive file %s: %v", filename, err)
-		}
-		sz = strings.TrimSpace(sz)
-		size, err := strconv.ParseUint(sz, 10, 32)
-		if err != nil {
-			return nil, fmt.Errorf("parsing size of archive file %s: %v", filename, err)
-		}
-
-		// Read file content.
-		content := make([]byte, size)
-		if _, err := io.ReadFull(r, content); err != nil {
-			return nil, fmt.Errorf("reading archive file %s: %v", filename, err)
-		}
-		overlay[filename] = content
-	}
-
-	return overlay, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/overlay_test.go b/installer/vendor/golang.org/x/tools/go/buildutil/overlay_test.go
deleted file mode 100644
index 92e2258a37..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/overlay_test.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package buildutil_test
-
-import (
-	"go/build"
-	"io/ioutil"
-	"reflect"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestParseOverlayArchive(t *testing.T) {
-	var tt = []struct {
-		in     string
-		out    map[string][]byte
-		hasErr bool
-	}{
-		{
-			"a.go\n5\n12345",
-			map[string][]byte{"a.go": []byte("12345")},
-			false,
-		},
-		{
-			"a.go\n5\n1234",
-			nil,
-			true,
-		},
-		{
-			"a.go\n5\n12345b.go\n4\n1234",
-			map[string][]byte{"a.go": []byte("12345"), "b.go": []byte("1234")},
-			false,
-		},
-	}
-
-	for _, test := range tt {
-		got, err := buildutil.ParseOverlayArchive(strings.NewReader(test.in))
-		if err == nil && test.hasErr {
-			t.Errorf("expected error for %q", test.in)
-		}
-		if err != nil && !test.hasErr {
-			t.Errorf("unexpected error %v for %q", err, test.in)
-		}
-		if !reflect.DeepEqual(got, test.out) {
-			t.Errorf("got %#v, want %#v", got, test.out)
-		}
-	}
-}
-
-func TestOverlay(t *testing.T) {
-	ctx := &build.Default
-	ov := map[string][]byte{
-		"/somewhere/a.go": []byte("file contents"),
-	}
-	names := []string{"/somewhere/a.go", "/somewhere//a.go"}
-	ctx = buildutil.OverlayContext(ctx, ov)
-	for _, name := range names {
-		f, err := buildutil.OpenFile(ctx, name)
-		if err != nil {
-			t.Errorf("unexpected error %v", err)
-		}
-		b, err := ioutil.ReadAll(f)
-		if err != nil {
-			t.Errorf("unexpected error %v", err)
-		}
-		if got, expected := string(b), string(ov["/somewhere/a.go"]); got != expected {
-			t.Errorf("read %q, expected %q", got, expected)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/tags.go b/installer/vendor/golang.org/x/tools/go/buildutil/tags.go
deleted file mode 100644
index 486606f376..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/tags.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package buildutil
-
-// This logic was copied from stringsFlag from $GOROOT/src/cmd/go/build.go.
-
-import "fmt"
-
-const TagsFlagDoc = "a list of `build tags` to consider satisfied during the build. " +
-	"For more information about build tags, see the description of " +
-	"build constraints in the documentation for the go/build package"
-
-// TagsFlag is an implementation of the flag.Value and flag.Getter interfaces that parses
-// a flag value in the same manner as go build's -tags flag and
-// populates a []string slice.
-//
-// See $GOROOT/src/go/build/doc.go for description of build tags.
-// See $GOROOT/src/cmd/go/doc.go for description of 'go build -tags' flag.
-//
-// Example:
-// 	flag.Var((*buildutil.TagsFlag)(&build.Default.BuildTags), "tags", buildutil.TagsFlagDoc)
-type TagsFlag []string
-
-func (v *TagsFlag) Set(s string) error {
-	var err error
-	*v, err = splitQuotedFields(s)
-	if *v == nil {
-		*v = []string{}
-	}
-	return err
-}
-
-func (v *TagsFlag) Get() interface{} { return *v }
-
-func splitQuotedFields(s string) ([]string, error) {
-	// Split fields allowing '' or "" around elements.
-	// Quotes further inside the string do not count.
-	var f []string
-	for len(s) > 0 {
-		for len(s) > 0 && isSpaceByte(s[0]) {
-			s = s[1:]
-		}
-		if len(s) == 0 {
-			break
-		}
-		// Accepted quoted string. No unescaping inside.
-		if s[0] == '"' || s[0] == '\'' {
-			quote := s[0]
-			s = s[1:]
-			i := 0
-			for i < len(s) && s[i] != quote {
-				i++
-			}
-			if i >= len(s) {
-				return nil, fmt.Errorf("unterminated %c string", quote)
-			}
-			f = append(f, s[:i])
-			s = s[i+1:]
-			continue
-		}
-		i := 0
-		for i < len(s) && !isSpaceByte(s[i]) {
-			i++
-		}
-		f = append(f, s[:i])
-		s = s[i:]
-	}
-	return f, nil
-}
-
-func (v *TagsFlag) String() string {
-	return "<tagsFlag>"
-}
-
-func isSpaceByte(c byte) bool {
-	return c == ' ' || c == '\t' || c == '\n' || c == '\r'
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/tags_test.go b/installer/vendor/golang.org/x/tools/go/buildutil/tags_test.go
deleted file mode 100644
index 0fc26180a9..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/tags_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package buildutil_test
-
-import (
-	"flag"
-	"go/build"
-	"reflect"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestTags(t *testing.T) {
-	f := flag.NewFlagSet("TestTags", flag.PanicOnError)
-	var ctxt build.Context
-	f.Var((*buildutil.TagsFlag)(&ctxt.BuildTags), "tags", buildutil.TagsFlagDoc)
-	f.Parse([]string{"-tags", ` 'one'"two"	'three "four"'`, "rest"})
-
-	// BuildTags
-	want := []string{"one", "two", "three \"four\""}
-	if !reflect.DeepEqual(ctxt.BuildTags, want) {
-		t.Errorf("BuildTags = %q, want %q", ctxt.BuildTags, want)
-	}
-
-	// Args()
-	if want := []string{"rest"}; !reflect.DeepEqual(f.Args(), want) {
-		t.Errorf("f.Args() = %q, want %q", f.Args(), want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/util.go b/installer/vendor/golang.org/x/tools/go/buildutil/util.go
deleted file mode 100644
index fc923d7a70..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/util.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package buildutil
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-)
-
-// ParseFile behaves like parser.ParseFile,
-// but uses the build context's file system interface, if any.
-//
-// If file is not absolute (as defined by IsAbsPath), the (dir, file)
-// components are joined using JoinPath; dir must be absolute.
-//
-// The displayPath function, if provided, is used to transform the
-// filename that will be attached to the ASTs.
-//
-// TODO(adonovan): call this from go/loader.parseFiles when the tree thaws.
-//
-func ParseFile(fset *token.FileSet, ctxt *build.Context, displayPath func(string) string, dir string, file string, mode parser.Mode) (*ast.File, error) {
-	if !IsAbsPath(ctxt, file) {
-		file = JoinPath(ctxt, dir, file)
-	}
-	rd, err := OpenFile(ctxt, file)
-	if err != nil {
-		return nil, err
-	}
-	defer rd.Close() // ignore error
-	if displayPath != nil {
-		file = displayPath(file)
-	}
-	return parser.ParseFile(fset, file, rd, mode)
-}
-
-// ContainingPackage returns the package containing filename.
-//
-// If filename is not absolute, it is interpreted relative to working directory dir.
-// All I/O is via the build context's file system interface, if any.
-//
-// The '...Files []string' fields of the resulting build.Package are not
-// populated (build.FindOnly mode).
-//
-func ContainingPackage(ctxt *build.Context, dir, filename string) (*build.Package, error) {
-	if !IsAbsPath(ctxt, filename) {
-		filename = JoinPath(ctxt, dir, filename)
-	}
-
-	// We must not assume the file tree uses
-	// "/" always,
-	// `\` always,
-	// or os.PathSeparator (which varies by platform),
-	// but to make any progress, we are forced to assume that
-	// paths will not use `\` unless the PathSeparator
-	// is also `\`, thus we can rely on filepath.ToSlash for some sanity.
-
-	dirSlash := path.Dir(filepath.ToSlash(filename)) + "/"
-
-	// We assume that no source root (GOPATH[i] or GOROOT) contains any other.
-	for _, srcdir := range ctxt.SrcDirs() {
-		srcdirSlash := filepath.ToSlash(srcdir) + "/"
-		if importPath, ok := HasSubdir(ctxt, srcdirSlash, dirSlash); ok {
-			return ctxt.Import(importPath, dir, build.FindOnly)
-		}
-	}
-
-	return nil, fmt.Errorf("can't find package containing %s", filename)
-}
-
-// -- Effective methods of file system interface -------------------------
-
-// (go/build.Context defines these as methods, but does not export them.)
-
-// hasSubdir calls ctxt.HasSubdir (if not nil) or else uses
-// the local file system to answer the question.
-func HasSubdir(ctxt *build.Context, root, dir string) (rel string, ok bool) {
-	if f := ctxt.HasSubdir; f != nil {
-		return f(root, dir)
-	}
-
-	// Try using paths we received.
-	if rel, ok = hasSubdir(root, dir); ok {
-		return
-	}
-
-	// Try expanding symlinks and comparing
-	// expanded against unexpanded and
-	// expanded against expanded.
-	rootSym, _ := filepath.EvalSymlinks(root)
-	dirSym, _ := filepath.EvalSymlinks(dir)
-
-	if rel, ok = hasSubdir(rootSym, dir); ok {
-		return
-	}
-	if rel, ok = hasSubdir(root, dirSym); ok {
-		return
-	}
-	return hasSubdir(rootSym, dirSym)
-}
-
-func hasSubdir(root, dir string) (rel string, ok bool) {
-	const sep = string(filepath.Separator)
-	root = filepath.Clean(root)
-	if !strings.HasSuffix(root, sep) {
-		root += sep
-	}
-
-	dir = filepath.Clean(dir)
-	if !strings.HasPrefix(dir, root) {
-		return "", false
-	}
-
-	return filepath.ToSlash(dir[len(root):]), true
-}
-
-// FileExists returns true if the specified file exists,
-// using the build context's file system interface.
-func FileExists(ctxt *build.Context, path string) bool {
-	if ctxt.OpenFile != nil {
-		r, err := ctxt.OpenFile(path)
-		if err != nil {
-			return false
-		}
-		r.Close() // ignore error
-		return true
-	}
-	_, err := os.Stat(path)
-	return err == nil
-}
-
-// OpenFile behaves like os.Open,
-// but uses the build context's file system interface, if any.
-func OpenFile(ctxt *build.Context, path string) (io.ReadCloser, error) {
-	if ctxt.OpenFile != nil {
-		return ctxt.OpenFile(path)
-	}
-	return os.Open(path)
-}
-
-// IsAbsPath behaves like filepath.IsAbs,
-// but uses the build context's file system interface, if any.
-func IsAbsPath(ctxt *build.Context, path string) bool {
-	if ctxt.IsAbsPath != nil {
-		return ctxt.IsAbsPath(path)
-	}
-	return filepath.IsAbs(path)
-}
-
-// JoinPath behaves like filepath.Join,
-// but uses the build context's file system interface, if any.
-func JoinPath(ctxt *build.Context, path ...string) string {
-	if ctxt.JoinPath != nil {
-		return ctxt.JoinPath(path...)
-	}
-	return filepath.Join(path...)
-}
-
-// IsDir behaves like os.Stat plus IsDir,
-// but uses the build context's file system interface, if any.
-func IsDir(ctxt *build.Context, path string) bool {
-	if ctxt.IsDir != nil {
-		return ctxt.IsDir(path)
-	}
-	fi, err := os.Stat(path)
-	return err == nil && fi.IsDir()
-}
-
-// ReadDir behaves like ioutil.ReadDir,
-// but uses the build context's file system interface, if any.
-func ReadDir(ctxt *build.Context, path string) ([]os.FileInfo, error) {
-	if ctxt.ReadDir != nil {
-		return ctxt.ReadDir(path)
-	}
-	return ioutil.ReadDir(path)
-}
-
-// SplitPathList behaves like filepath.SplitList,
-// but uses the build context's file system interface, if any.
-func SplitPathList(ctxt *build.Context, s string) []string {
-	if ctxt.SplitPathList != nil {
-		return ctxt.SplitPathList(s)
-	}
-	return filepath.SplitList(s)
-}
-
-// sameFile returns true if x and y have the same basename and denote
-// the same file.
-//
-func sameFile(x, y string) bool {
-	if path.Clean(x) == path.Clean(y) {
-		return true
-	}
-	if filepath.Base(x) == filepath.Base(y) { // (optimisation)
-		if xi, err := os.Stat(x); err == nil {
-			if yi, err := os.Stat(y); err == nil {
-				return os.SameFile(xi, yi)
-			}
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/util_test.go b/installer/vendor/golang.org/x/tools/go/buildutil/util_test.go
deleted file mode 100644
index 72db3172a4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/util_test.go
+++ /dev/null
@@ -1,72 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package buildutil_test
-
-import (
-	"go/build"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestContainingPackage(t *testing.T) {
-	// unvirtualized:
-	goroot := runtime.GOROOT()
-	gopath := filepath.SplitList(os.Getenv("GOPATH"))[0]
-
-	type Test struct {
-		gopath, filename, wantPkg string
-	}
-
-	tests := []Test{
-		{gopath, goroot + "/src/fmt/print.go", "fmt"},
-		{gopath, goroot + "/src/encoding/json/foo.go", "encoding/json"},
-		{gopath, goroot + "/src/encoding/missing/foo.go", "(not found)"},
-		{gopath, gopath + "/src/golang.org/x/tools/go/buildutil/util_test.go",
-			"golang.org/x/tools/go/buildutil"},
-	}
-
-	if runtime.GOOS != "windows" && runtime.GOOS != "plan9" {
-		// Make a symlink to gopath for test
-		tmp, err := ioutil.TempDir(os.TempDir(), "go")
-		if err != nil {
-			t.Errorf("Unable to create a temporary directory in %s", os.TempDir())
-		}
-
-		defer os.RemoveAll(tmp)
-
-		// symlink between $GOPATH/src and /tmp/go/src
-		// in order to test all possible symlink cases
-		if err := os.Symlink(gopath+"/src", tmp+"/src"); err != nil {
-			t.Fatal(err)
-		}
-		tests = append(tests, []Test{
-			{gopath, tmp + "/src/golang.org/x/tools/go/buildutil/util_test.go", "golang.org/x/tools/go/buildutil"},
-			{tmp, gopath + "/src/golang.org/x/tools/go/buildutil/util_test.go", "golang.org/x/tools/go/buildutil"},
-			{tmp, tmp + "/src/golang.org/x/tools/go/buildutil/util_test.go", "golang.org/x/tools/go/buildutil"},
-		}...)
-	}
-
-	for _, test := range tests {
-		var got string
-		var buildContext = build.Default
-		buildContext.GOPATH = test.gopath
-		bp, err := buildutil.ContainingPackage(&buildContext, ".", test.filename)
-		if err != nil {
-			got = "(not found)"
-		} else {
-			got = bp.ImportPath
-		}
-		if got != test.wantPkg {
-			t.Errorf("ContainingPackage(%q) = %s, want %s", test.filename, got, test.wantPkg)
-		}
-	}
-
-	// TODO(adonovan): test on virtualized GOPATH too.
-}
diff --git a/installer/vendor/golang.org/x/tools/go/buildutil/util_windows_test.go b/installer/vendor/golang.org/x/tools/go/buildutil/util_windows_test.go
deleted file mode 100644
index 86fe9c71e2..0000000000
--- a/installer/vendor/golang.org/x/tools/go/buildutil/util_windows_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package buildutil_test
-
-import (
-	"fmt"
-	"go/build"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func testContainingPackageCaseFold(file, want string) error {
-	bp, err := buildutil.ContainingPackage(&build.Default, ".", file)
-	if err != nil {
-		return err
-	}
-	if got := bp.ImportPath; got != want {
-		return fmt.Errorf("ContainingPackage(%q) = %s, want %s", file, got, want)
-	}
-	return nil
-}
-
-func TestContainingPackageCaseFold(t *testing.T) {
-	path := filepath.Join(runtime.GOROOT(), `src\fmt\print.go`)
-	err := testContainingPackageCaseFold(path, "fmt")
-	if err != nil {
-		t.Error(err)
-	}
-	vol := filepath.VolumeName(path)
-	if len(vol) != 2 || vol[1] != ':' {
-		t.Fatalf("GOROOT path has unexpected volume name: %v", vol)
-	}
-	rest := path[len(vol):]
-	err = testContainingPackageCaseFold(strings.ToUpper(vol)+rest, "fmt")
-	if err != nil {
-		t.Error(err)
-	}
-	err = testContainingPackageCaseFold(strings.ToLower(vol)+rest, "fmt")
-	if err != nil {
-		t.Error(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/callgraph.go b/installer/vendor/golang.org/x/tools/go/callgraph/callgraph.go
deleted file mode 100644
index 707a31931a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/callgraph.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Package callgraph defines the call graph and various algorithms
-and utilities to operate on it.
-
-A call graph is a labelled directed graph whose nodes represent
-functions and whose edge labels represent syntactic function call
-sites.  The presence of a labelled edge (caller, site, callee)
-indicates that caller may call callee at the specified call site.
-
-A call graph is a multigraph: it may contain multiple edges (caller,
-*, callee) connecting the same pair of nodes, so long as the edges
-differ by label; this occurs when one function calls another function
-from multiple call sites.  Also, it may contain multiple edges
-(caller, site, *) that differ only by callee; this indicates a
-polymorphic call.
-
-A SOUND call graph is one that overapproximates the dynamic calling
-behaviors of the program in all possible executions.  One call graph
-is more PRECISE than another if it is a smaller overapproximation of
-the dynamic behavior.
-
-All call graphs have a synthetic root node which is responsible for
-calling main() and init().
-
-Calls to built-in functions (e.g. panic, println) are not represented
-in the call graph; they are treated like built-in operators of the
-language.
-
-*/
-package callgraph // import "golang.org/x/tools/go/callgraph"
-
-// TODO(adonovan): add a function to eliminate wrappers from the
-// callgraph, preserving topology.
-// More generally, we could eliminate "uninteresting" nodes such as
-// nodes from packages we don't care about.
-
-import (
-	"fmt"
-	"go/token"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-// A Graph represents a call graph.
-//
-// A graph may contain nodes that are not reachable from the root.
-// If the call graph is sound, such nodes indicate unreachable
-// functions.
-//
-type Graph struct {
-	Root  *Node                   // the distinguished root node
-	Nodes map[*ssa.Function]*Node // all nodes by function
-}
-
-// New returns a new Graph with the specified root node.
-func New(root *ssa.Function) *Graph {
-	g := &Graph{Nodes: make(map[*ssa.Function]*Node)}
-	g.Root = g.CreateNode(root)
-	return g
-}
-
-// CreateNode returns the Node for fn, creating it if not present.
-func (g *Graph) CreateNode(fn *ssa.Function) *Node {
-	n, ok := g.Nodes[fn]
-	if !ok {
-		n = &Node{Func: fn, ID: len(g.Nodes)}
-		g.Nodes[fn] = n
-	}
-	return n
-}
-
-// A Node represents a node in a call graph.
-type Node struct {
-	Func *ssa.Function // the function this node represents
-	ID   int           // 0-based sequence number
-	In   []*Edge       // unordered set of incoming call edges (n.In[*].Callee == n)
-	Out  []*Edge       // unordered set of outgoing call edges (n.Out[*].Caller == n)
-}
-
-func (n *Node) String() string {
-	return fmt.Sprintf("n%d:%s", n.ID, n.Func)
-}
-
-// A Edge represents an edge in the call graph.
-//
-// Site is nil for edges originating in synthetic or intrinsic
-// functions, e.g. reflect.Call or the root of the call graph.
-type Edge struct {
-	Caller *Node
-	Site   ssa.CallInstruction
-	Callee *Node
-}
-
-func (e Edge) String() string {
-	return fmt.Sprintf("%s --> %s", e.Caller, e.Callee)
-}
-
-func (e Edge) Description() string {
-	var prefix string
-	switch e.Site.(type) {
-	case nil:
-		return "synthetic call"
-	case *ssa.Go:
-		prefix = "concurrent "
-	case *ssa.Defer:
-		prefix = "deferred "
-	}
-	return prefix + e.Site.Common().Description()
-}
-
-func (e Edge) Pos() token.Pos {
-	if e.Site == nil {
-		return token.NoPos
-	}
-	return e.Site.Pos()
-}
-
-// AddEdge adds the edge (caller, site, callee) to the call graph.
-// Elimination of duplicate edges is the caller's responsibility.
-func AddEdge(caller *Node, site ssa.CallInstruction, callee *Node) {
-	e := &Edge{caller, site, callee}
-	callee.In = append(callee.In, e)
-	caller.Out = append(caller.Out, e)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha.go b/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha.go
deleted file mode 100644
index 68ffffebd7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha.go
+++ /dev/null
@@ -1,125 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package cha computes the call graph of a Go program using the Class
-// Hierarchy Analysis (CHA) algorithm.
-//
-// CHA was first described in "Optimization of Object-Oriented Programs
-// Using Static Class Hierarchy Analysis", Jeffrey Dean, David Grove,
-// and Craig Chambers, ECOOP'95.
-//
-// CHA is related to RTA (see go/callgraph/rta); the difference is that
-// CHA conservatively computes the entire "implements" relation between
-// interfaces and concrete types ahead of time, whereas RTA uses dynamic
-// programming to construct it on the fly as it encounters new functions
-// reachable from main.  CHA may thus include spurious call edges for
-// types that haven't been instantiated yet, or types that are never
-// instantiated.
-//
-// Since CHA conservatively assumes that all functions are address-taken
-// and all concrete types are put into interfaces, it is sound to run on
-// partial programs, such as libraries without a main or test function.
-//
-package cha // import "golang.org/x/tools/go/callgraph/cha"
-
-import (
-	"go/types"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// CallGraph computes the call graph of the specified program using the
-// Class Hierarchy Analysis algorithm.
-//
-func CallGraph(prog *ssa.Program) *callgraph.Graph {
-	cg := callgraph.New(nil) // TODO(adonovan) eliminate concept of rooted callgraph
-
-	allFuncs := ssautil.AllFunctions(prog)
-
-	// funcsBySig contains all functions, keyed by signature.  It is
-	// the effective set of address-taken functions used to resolve
-	// a dynamic call of a particular signature.
-	var funcsBySig typeutil.Map // value is []*ssa.Function
-
-	// methodsByName contains all methods,
-	// grouped by name for efficient lookup.
-	methodsByName := make(map[string][]*ssa.Function)
-
-	// methodsMemo records, for every abstract method call call I.f on
-	// interface type I, the set of concrete methods C.f of all
-	// types C that satisfy interface I.
-	methodsMemo := make(map[*types.Func][]*ssa.Function)
-	lookupMethods := func(m *types.Func) []*ssa.Function {
-		methods, ok := methodsMemo[m]
-		if !ok {
-			I := m.Type().(*types.Signature).Recv().Type().Underlying().(*types.Interface)
-			for _, f := range methodsByName[m.Name()] {
-				C := f.Signature.Recv().Type() // named or *named
-				if types.Implements(C, I) {
-					methods = append(methods, f)
-				}
-			}
-			methodsMemo[m] = methods
-		}
-		return methods
-	}
-
-	for f := range allFuncs {
-		if f.Signature.Recv() == nil {
-			// Package initializers can never be address-taken.
-			if f.Name() == "init" && f.Synthetic == "package initializer" {
-				continue
-			}
-			funcs, _ := funcsBySig.At(f.Signature).([]*ssa.Function)
-			funcs = append(funcs, f)
-			funcsBySig.Set(f.Signature, funcs)
-		} else {
-			methodsByName[f.Name()] = append(methodsByName[f.Name()], f)
-		}
-	}
-
-	addEdge := func(fnode *callgraph.Node, site ssa.CallInstruction, g *ssa.Function) {
-		gnode := cg.CreateNode(g)
-		callgraph.AddEdge(fnode, site, gnode)
-	}
-
-	addEdges := func(fnode *callgraph.Node, site ssa.CallInstruction, callees []*ssa.Function) {
-		// Because every call to a highly polymorphic and
-		// frequently used abstract method such as
-		// (io.Writer).Write is assumed to call every concrete
-		// Write method in the program, the call graph can
-		// contain a lot of duplication.
-		//
-		// TODO(adonovan): opt: consider factoring the callgraph
-		// API so that the Callers component of each edge is a
-		// slice of nodes, not a singleton.
-		for _, g := range callees {
-			addEdge(fnode, site, g)
-		}
-	}
-
-	for f := range allFuncs {
-		fnode := cg.CreateNode(f)
-		for _, b := range f.Blocks {
-			for _, instr := range b.Instrs {
-				if site, ok := instr.(ssa.CallInstruction); ok {
-					call := site.Common()
-					if call.IsInvoke() {
-						addEdges(fnode, site, lookupMethods(call.Method))
-					} else if g := call.StaticCallee(); g != nil {
-						addEdge(fnode, site, g)
-					} else if _, ok := call.Value.(*ssa.Builtin); !ok {
-						callees, _ := funcsBySig.At(call.Signature()).([]*ssa.Function)
-						addEdges(fnode, site, callees)
-					}
-				}
-			}
-		}
-	}
-
-	return cg
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha_test.go b/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha_test.go
deleted file mode 100644
index 7e56c0630b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/cha/cha_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package cha_test
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/cha"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-var inputs = []string{
-	"testdata/func.go",
-	"testdata/iface.go",
-	"testdata/recv.go",
-}
-
-func expectation(f *ast.File) (string, token.Pos) {
-	for _, c := range f.Comments {
-		text := strings.TrimSpace(c.Text())
-		if t := strings.TrimPrefix(text, "WANT:\n"); t != text {
-			return t, c.Pos()
-		}
-	}
-	return "", token.NoPos
-}
-
-// TestCHA runs CHA on each file in inputs, prints the dynamic edges of
-// the call graph, and compares it with the golden results embedded in
-// the WANT comment at the end of the file.
-//
-func TestCHA(t *testing.T) {
-	for _, filename := range inputs {
-		content, err := ioutil.ReadFile(filename)
-		if err != nil {
-			t.Errorf("couldn't read file '%s': %s", filename, err)
-			continue
-		}
-
-		conf := loader.Config{
-			ParserMode: parser.ParseComments,
-		}
-		f, err := conf.ParseFile(filename, content)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		want, pos := expectation(f)
-		if pos == token.NoPos {
-			t.Errorf("No WANT: comment in %s", filename)
-			continue
-		}
-
-		conf.CreateFromFiles("main", f)
-		iprog, err := conf.Load()
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		prog := ssautil.CreateProgram(iprog, 0)
-		mainPkg := prog.Package(iprog.Created[0].Pkg)
-		prog.Build()
-
-		cg := cha.CallGraph(prog)
-
-		if got := printGraph(cg, mainPkg.Pkg); got != want {
-			t.Errorf("%s: got:\n%s\nwant:\n%s",
-				prog.Fset.Position(pos), got, want)
-		}
-	}
-}
-
-func printGraph(cg *callgraph.Graph, from *types.Package) string {
-	var edges []string
-	callgraph.GraphVisitEdges(cg, func(e *callgraph.Edge) error {
-		if strings.Contains(e.Description(), "dynamic") {
-			edges = append(edges, fmt.Sprintf("%s --> %s",
-				e.Caller.Func.RelString(from),
-				e.Callee.Func.RelString(from)))
-		}
-		return nil
-	})
-	sort.Strings(edges)
-
-	var buf bytes.Buffer
-	buf.WriteString("Dynamic calls\n")
-	for _, edge := range edges {
-		fmt.Fprintf(&buf, "  %s\n", edge)
-	}
-	return strings.TrimSpace(buf.String())
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/func.go b/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/func.go
deleted file mode 100644
index ad483f100d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/func.go
+++ /dev/null
@@ -1,23 +0,0 @@
-//+build ignore
-
-package main
-
-// Test of dynamic function calls; no interfaces.
-
-func A(int) {}
-
-var (
-	B = func(int) {}
-	C = func(int) {}
-)
-
-func f() {
-	pfn := B
-	pfn(0) // calls A, B, C, even though A is not even address-taken
-}
-
-// WANT:
-// Dynamic calls
-//   f --> A
-//   f --> init$1
-//   f --> init$2
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/iface.go b/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/iface.go
deleted file mode 100644
index 1622ec154a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/iface.go
+++ /dev/null
@@ -1,65 +0,0 @@
-//+build ignore
-
-package main
-
-// Test of interface calls.  None of the concrete types are ever
-// instantiated or converted to interfaces.
-
-type I interface {
-	f()
-}
-
-type J interface {
-	f()
-	g()
-}
-
-type C int // implements I
-
-func (*C) f()
-
-type D int // implements I and J
-
-func (*D) f()
-func (*D) g()
-
-func one(i I, j J) {
-	i.f() // calls *C and *D
-}
-
-func two(i I, j J) {
-	j.f() // calls *D (but not *C, even though it defines method f)
-}
-
-func three(i I, j J) {
-	j.g() // calls *D
-}
-
-func four(i I, j J) {
-	Jf := J.f
-	if unknown {
-		Jf = nil // suppress SSA constant propagation
-	}
-	Jf(nil) // calls *D
-}
-
-func five(i I, j J) {
-	jf := j.f
-	if unknown {
-		jf = nil // suppress SSA constant propagation
-	}
-	jf() // calls *D
-}
-
-var unknown bool
-
-// WANT:
-// Dynamic calls
-//   (J).f$bound --> (*D).f
-//   (J).f$thunk --> (*D).f
-//   five --> (J).f$bound
-//   four --> (J).f$thunk
-//   one --> (*C).f
-//   one --> (*D).f
-//   three --> (*D).g
-//   two --> (*D).f
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/recv.go b/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/recv.go
deleted file mode 100644
index 5ba48e933f..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/cha/testdata/recv.go
+++ /dev/null
@@ -1,37 +0,0 @@
-//+build ignore
-
-package main
-
-type I interface {
-	f()
-}
-
-type J interface {
-	g()
-}
-
-type C int // C and *C implement I; *C implements J
-
-func (C) f()
-func (*C) g()
-
-type D int // *D implements I and J
-
-func (*D) f()
-func (*D) g()
-
-func f(i I) {
-	i.f() // calls C, *C, *D
-}
-
-func g(j J) {
-	j.g() // calls *C, *D
-}
-
-// WANT:
-// Dynamic calls
-//   f --> (*C).f
-//   f --> (*D).f
-//   f --> (C).f
-//   g --> (*C).g
-//   g --> (*D).g
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta.go b/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta.go
deleted file mode 100644
index 1a2dadf573..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta.go
+++ /dev/null
@@ -1,459 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This package provides Rapid Type Analysis (RTA) for Go, a fast
-// algorithm for call graph construction and discovery of reachable code
-// (and hence dead code) and runtime types.  The algorithm was first
-// described in:
-//
-// David F. Bacon and Peter F. Sweeney. 1996.
-// Fast static analysis of C++ virtual function calls. (OOPSLA '96)
-// http://doi.acm.org/10.1145/236337.236371
-//
-// The algorithm uses dynamic programming to tabulate the cross-product
-// of the set of known "address taken" functions with the set of known
-// dynamic calls of the same type.  As each new address-taken function
-// is discovered, call graph edges are added from each known callsite,
-// and as each new call site is discovered, call graph edges are added
-// from it to each known address-taken function.
-//
-// A similar approach is used for dynamic calls via interfaces: it
-// tabulates the cross-product of the set of known "runtime types",
-// i.e. types that may appear in an interface value, or be derived from
-// one via reflection, with the set of known "invoke"-mode dynamic
-// calls.  As each new "runtime type" is discovered, call edges are
-// added from the known call sites, and as each new call site is
-// discovered, call graph edges are added to each compatible
-// method.
-//
-// In addition, we must consider all exported methods of any runtime type
-// as reachable, since they may be called via reflection.
-//
-// Each time a newly added call edge causes a new function to become
-// reachable, the code of that function is analyzed for more call sites,
-// address-taken functions, and runtime types.  The process continues
-// until a fixed point is achieved.
-//
-// The resulting call graph is less precise than one produced by pointer
-// analysis, but the algorithm is much faster.  For example, running the
-// cmd/callgraph tool on its own source takes ~2.1s for RTA and ~5.4s
-// for points-to analysis.
-//
-package rta // import "golang.org/x/tools/go/callgraph/rta"
-
-// TODO(adonovan): test it by connecting it to the interpreter and
-// replacing all "unreachable" functions by a special intrinsic, and
-// ensure that that intrinsic is never called.
-
-import (
-	"fmt"
-	"go/types"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// A Result holds the results of Rapid Type Analysis, which includes the
-// set of reachable functions/methods, runtime types, and the call graph.
-//
-type Result struct {
-	// CallGraph is the discovered callgraph.
-	// It does not include edges for calls made via reflection.
-	CallGraph *callgraph.Graph
-
-	// Reachable contains the set of reachable functions and methods.
-	// This includes exported methods of runtime types, since
-	// they may be accessed via reflection.
-	// The value indicates whether the function is address-taken.
-	//
-	// (We wrap the bool in a struct to avoid inadvertent use of
-	// "if Reachable[f] {" to test for set membership.)
-	Reachable map[*ssa.Function]struct{ AddrTaken bool }
-
-	// RuntimeTypes contains the set of types that are needed at
-	// runtime, for interfaces or reflection.
-	//
-	// The value indicates whether the type is inaccessible to reflection.
-	// Consider:
-	// 	type A struct{B}
-	// 	fmt.Println(new(A))
-	// Types *A, A and B are accessible to reflection, but the unnamed
-	// type struct{B} is not.
-	RuntimeTypes typeutil.Map
-}
-
-// Working state of the RTA algorithm.
-type rta struct {
-	result *Result
-
-	prog *ssa.Program
-
-	worklist []*ssa.Function // list of functions to visit
-
-	// addrTakenFuncsBySig contains all address-taken *Functions, grouped by signature.
-	// Keys are *types.Signature, values are map[*ssa.Function]bool sets.
-	addrTakenFuncsBySig typeutil.Map
-
-	// dynCallSites contains all dynamic "call"-mode call sites, grouped by signature.
-	// Keys are *types.Signature, values are unordered []ssa.CallInstruction.
-	dynCallSites typeutil.Map
-
-	// invokeSites contains all "invoke"-mode call sites, grouped by interface.
-	// Keys are *types.Interface (never *types.Named),
-	// Values are unordered []ssa.CallInstruction sets.
-	invokeSites typeutil.Map
-
-	// The following two maps together define the subset of the
-	// m:n "implements" relation needed by the algorithm.
-
-	// concreteTypes maps each concrete type to the set of interfaces that it implements.
-	// Keys are types.Type, values are unordered []*types.Interface.
-	// Only concrete types used as MakeInterface operands are included.
-	concreteTypes typeutil.Map
-
-	// interfaceTypes maps each interface type to
-	// the set of concrete types that implement it.
-	// Keys are *types.Interface, values are unordered []types.Type.
-	// Only interfaces used in "invoke"-mode CallInstructions are included.
-	interfaceTypes typeutil.Map
-}
-
-// addReachable marks a function as potentially callable at run-time,
-// and ensures that it gets processed.
-func (r *rta) addReachable(f *ssa.Function, addrTaken bool) {
-	reachable := r.result.Reachable
-	n := len(reachable)
-	v := reachable[f]
-	if addrTaken {
-		v.AddrTaken = true
-	}
-	reachable[f] = v
-	if len(reachable) > n {
-		// First time seeing f.  Add it to the worklist.
-		r.worklist = append(r.worklist, f)
-	}
-}
-
-// addEdge adds the specified call graph edge, and marks it reachable.
-// addrTaken indicates whether to mark the callee as "address-taken".
-func (r *rta) addEdge(site ssa.CallInstruction, callee *ssa.Function, addrTaken bool) {
-	r.addReachable(callee, addrTaken)
-
-	if g := r.result.CallGraph; g != nil {
-		if site.Parent() == nil {
-			panic(site)
-		}
-		from := g.CreateNode(site.Parent())
-		to := g.CreateNode(callee)
-		callgraph.AddEdge(from, site, to)
-	}
-}
-
-// ---------- addrTakenFuncs × dynCallSites ----------
-
-// visitAddrTakenFunc is called each time we encounter an address-taken function f.
-func (r *rta) visitAddrTakenFunc(f *ssa.Function) {
-	// Create two-level map (Signature -> Function -> bool).
-	S := f.Signature
-	funcs, _ := r.addrTakenFuncsBySig.At(S).(map[*ssa.Function]bool)
-	if funcs == nil {
-		funcs = make(map[*ssa.Function]bool)
-		r.addrTakenFuncsBySig.Set(S, funcs)
-	}
-	if !funcs[f] {
-		// First time seeing f.
-		funcs[f] = true
-
-		// If we've seen any dyncalls of this type, mark it reachable,
-		// and add call graph edges.
-		sites, _ := r.dynCallSites.At(S).([]ssa.CallInstruction)
-		for _, site := range sites {
-			r.addEdge(site, f, true)
-		}
-	}
-}
-
-// visitDynCall is called each time we encounter a dynamic "call"-mode call.
-func (r *rta) visitDynCall(site ssa.CallInstruction) {
-	S := site.Common().Signature()
-
-	// Record the call site.
-	sites, _ := r.dynCallSites.At(S).([]ssa.CallInstruction)
-	r.dynCallSites.Set(S, append(sites, site))
-
-	// For each function of signature S that we know is address-taken,
-	// mark it reachable.  We'll add the callgraph edges later.
-	funcs, _ := r.addrTakenFuncsBySig.At(S).(map[*ssa.Function]bool)
-	for g := range funcs {
-		r.addEdge(site, g, true)
-	}
-}
-
-// ---------- concrete types × invoke sites ----------
-
-// addInvokeEdge is called for each new pair (site, C) in the matrix.
-func (r *rta) addInvokeEdge(site ssa.CallInstruction, C types.Type) {
-	// Ascertain the concrete method of C to be called.
-	imethod := site.Common().Method
-	cmethod := r.prog.MethodValue(r.prog.MethodSets.MethodSet(C).Lookup(imethod.Pkg(), imethod.Name()))
-	r.addEdge(site, cmethod, true)
-}
-
-// visitInvoke is called each time the algorithm encounters an "invoke"-mode call.
-func (r *rta) visitInvoke(site ssa.CallInstruction) {
-	I := site.Common().Value.Type().Underlying().(*types.Interface)
-
-	// Record the invoke site.
-	sites, _ := r.invokeSites.At(I).([]ssa.CallInstruction)
-	r.invokeSites.Set(I, append(sites, site))
-
-	// Add callgraph edge for each existing
-	// address-taken concrete type implementing I.
-	for _, C := range r.implementations(I) {
-		r.addInvokeEdge(site, C)
-	}
-}
-
-// ---------- main algorithm ----------
-
-// visitFunc processes function f.
-func (r *rta) visitFunc(f *ssa.Function) {
-	var space [32]*ssa.Value // preallocate space for common case
-
-	for _, b := range f.Blocks {
-		for _, instr := range b.Instrs {
-			rands := instr.Operands(space[:0])
-
-			switch instr := instr.(type) {
-			case ssa.CallInstruction:
-				call := instr.Common()
-				if call.IsInvoke() {
-					r.visitInvoke(instr)
-				} else if g := call.StaticCallee(); g != nil {
-					r.addEdge(instr, g, false)
-				} else if _, ok := call.Value.(*ssa.Builtin); !ok {
-					r.visitDynCall(instr)
-				}
-
-				// Ignore the call-position operand when
-				// looking for address-taken Functions.
-				// Hack: assume this is rands[0].
-				rands = rands[1:]
-
-			case *ssa.MakeInterface:
-				r.addRuntimeType(instr.X.Type(), false)
-			}
-
-			// Process all address-taken functions.
-			for _, op := range rands {
-				if g, ok := (*op).(*ssa.Function); ok {
-					r.visitAddrTakenFunc(g)
-				}
-			}
-		}
-	}
-}
-
-// Analyze performs Rapid Type Analysis, starting at the specified root
-// functions.  It returns nil if no roots were specified.
-//
-// If buildCallGraph is true, Result.CallGraph will contain a call
-// graph; otherwise, only the other fields (reachable functions) are
-// populated.
-//
-func Analyze(roots []*ssa.Function, buildCallGraph bool) *Result {
-	if len(roots) == 0 {
-		return nil
-	}
-
-	r := &rta{
-		result: &Result{Reachable: make(map[*ssa.Function]struct{ AddrTaken bool })},
-		prog:   roots[0].Prog,
-	}
-
-	if buildCallGraph {
-		// TODO(adonovan): change callgraph API to eliminate the
-		// notion of a distinguished root node.  Some callgraphs
-		// have many roots, or none.
-		r.result.CallGraph = callgraph.New(roots[0])
-	}
-
-	hasher := typeutil.MakeHasher()
-	r.result.RuntimeTypes.SetHasher(hasher)
-	r.addrTakenFuncsBySig.SetHasher(hasher)
-	r.dynCallSites.SetHasher(hasher)
-	r.invokeSites.SetHasher(hasher)
-	r.concreteTypes.SetHasher(hasher)
-	r.interfaceTypes.SetHasher(hasher)
-
-	// Visit functions, processing their instructions, and adding
-	// new functions to the worklist, until a fixed point is
-	// reached.
-	var shadow []*ssa.Function // for efficiency, we double-buffer the worklist
-	r.worklist = append(r.worklist, roots...)
-	for len(r.worklist) > 0 {
-		shadow, r.worklist = r.worklist, shadow[:0]
-		for _, f := range shadow {
-			r.visitFunc(f)
-		}
-	}
-	return r.result
-}
-
-// interfaces(C) returns all currently known interfaces implemented by C.
-func (r *rta) interfaces(C types.Type) []*types.Interface {
-	// Ascertain set of interfaces C implements
-	// and update 'implements' relation.
-	var ifaces []*types.Interface
-	r.interfaceTypes.Iterate(func(I types.Type, concs interface{}) {
-		if I := I.(*types.Interface); types.Implements(C, I) {
-			concs, _ := concs.([]types.Type)
-			r.interfaceTypes.Set(I, append(concs, C))
-			ifaces = append(ifaces, I)
-		}
-	})
-	r.concreteTypes.Set(C, ifaces)
-	return ifaces
-}
-
-// implementations(I) returns all currently known concrete types that implement I.
-func (r *rta) implementations(I *types.Interface) []types.Type {
-	var concs []types.Type
-	if v := r.interfaceTypes.At(I); v != nil {
-		concs = v.([]types.Type)
-	} else {
-		// First time seeing this interface.
-		// Update the 'implements' relation.
-		r.concreteTypes.Iterate(func(C types.Type, ifaces interface{}) {
-			if types.Implements(C, I) {
-				ifaces, _ := ifaces.([]*types.Interface)
-				r.concreteTypes.Set(C, append(ifaces, I))
-				concs = append(concs, C)
-			}
-		})
-		r.interfaceTypes.Set(I, concs)
-	}
-	return concs
-}
-
-// addRuntimeType is called for each concrete type that can be the
-// dynamic type of some interface or reflect.Value.
-// Adapted from needMethods in go/ssa/builder.go
-//
-func (r *rta) addRuntimeType(T types.Type, skip bool) {
-	if prev, ok := r.result.RuntimeTypes.At(T).(bool); ok {
-		if skip && !prev {
-			r.result.RuntimeTypes.Set(T, skip)
-		}
-		return
-	}
-	r.result.RuntimeTypes.Set(T, skip)
-
-	mset := r.prog.MethodSets.MethodSet(T)
-
-	if _, ok := T.Underlying().(*types.Interface); !ok {
-		// T is a new concrete type.
-		for i, n := 0, mset.Len(); i < n; i++ {
-			sel := mset.At(i)
-			m := sel.Obj()
-
-			if m.Exported() {
-				// Exported methods are always potentially callable via reflection.
-				r.addReachable(r.prog.MethodValue(sel), true)
-			}
-		}
-
-		// Add callgraph edge for each existing dynamic
-		// "invoke"-mode call via that interface.
-		for _, I := range r.interfaces(T) {
-			sites, _ := r.invokeSites.At(I).([]ssa.CallInstruction)
-			for _, site := range sites {
-				r.addInvokeEdge(site, T)
-			}
-		}
-	}
-
-	// Precondition: T is not a method signature (*Signature with Recv()!=nil).
-	// Recursive case: skip => don't call makeMethods(T).
-	// Each package maintains its own set of types it has visited.
-
-	var n *types.Named
-	switch T := T.(type) {
-	case *types.Named:
-		n = T
-	case *types.Pointer:
-		n, _ = T.Elem().(*types.Named)
-	}
-	if n != nil {
-		owner := n.Obj().Pkg()
-		if owner == nil {
-			return // built-in error type
-		}
-	}
-
-	// Recursion over signatures of each exported method.
-	for i := 0; i < mset.Len(); i++ {
-		if mset.At(i).Obj().Exported() {
-			sig := mset.At(i).Type().(*types.Signature)
-			r.addRuntimeType(sig.Params(), true)  // skip the Tuple itself
-			r.addRuntimeType(sig.Results(), true) // skip the Tuple itself
-		}
-	}
-
-	switch t := T.(type) {
-	case *types.Basic:
-		// nop
-
-	case *types.Interface:
-		// nop---handled by recursion over method set.
-
-	case *types.Pointer:
-		r.addRuntimeType(t.Elem(), false)
-
-	case *types.Slice:
-		r.addRuntimeType(t.Elem(), false)
-
-	case *types.Chan:
-		r.addRuntimeType(t.Elem(), false)
-
-	case *types.Map:
-		r.addRuntimeType(t.Key(), false)
-		r.addRuntimeType(t.Elem(), false)
-
-	case *types.Signature:
-		if t.Recv() != nil {
-			panic(fmt.Sprintf("Signature %s has Recv %s", t, t.Recv()))
-		}
-		r.addRuntimeType(t.Params(), true)  // skip the Tuple itself
-		r.addRuntimeType(t.Results(), true) // skip the Tuple itself
-
-	case *types.Named:
-		// A pointer-to-named type can be derived from a named
-		// type via reflection.  It may have methods too.
-		r.addRuntimeType(types.NewPointer(T), false)
-
-		// Consider 'type T struct{S}' where S has methods.
-		// Reflection provides no way to get from T to struct{S},
-		// only to S, so the method set of struct{S} is unwanted,
-		// so set 'skip' flag during recursion.
-		r.addRuntimeType(t.Underlying(), true)
-
-	case *types.Array:
-		r.addRuntimeType(t.Elem(), false)
-
-	case *types.Struct:
-		for i, n := 0, t.NumFields(); i < n; i++ {
-			r.addRuntimeType(t.Field(i).Type(), false)
-		}
-
-	case *types.Tuple:
-		for i, n := 0, t.Len(); i < n; i++ {
-			r.addRuntimeType(t.At(i).Type(), false)
-		}
-
-	default:
-		panic(T)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta_test.go b/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta_test.go
deleted file mode 100644
index 28a00b346b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/rta/rta_test.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package rta_test
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/rta"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-var inputs = []string{
-	"testdata/func.go",
-	"testdata/rtype.go",
-	"testdata/iface.go",
-}
-
-func expectation(f *ast.File) (string, token.Pos) {
-	for _, c := range f.Comments {
-		text := strings.TrimSpace(c.Text())
-		if t := strings.TrimPrefix(text, "WANT:\n"); t != text {
-			return t, c.Pos()
-		}
-	}
-	return "", token.NoPos
-}
-
-// TestRTA runs RTA on each file in inputs, prints the results, and
-// compares it with the golden results embedded in the WANT comment at
-// the end of the file.
-//
-// The results string consists of two parts: the set of dynamic call
-// edges, "f --> g", one per line, and the set of reachable functions,
-// one per line.  Each set is sorted.
-//
-func TestRTA(t *testing.T) {
-	for _, filename := range inputs {
-		content, err := ioutil.ReadFile(filename)
-		if err != nil {
-			t.Errorf("couldn't read file '%s': %s", filename, err)
-			continue
-		}
-
-		conf := loader.Config{
-			ParserMode: parser.ParseComments,
-		}
-		f, err := conf.ParseFile(filename, content)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		want, pos := expectation(f)
-		if pos == token.NoPos {
-			t.Errorf("No WANT: comment in %s", filename)
-			continue
-		}
-
-		conf.CreateFromFiles("main", f)
-		iprog, err := conf.Load()
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		prog := ssautil.CreateProgram(iprog, 0)
-		mainPkg := prog.Package(iprog.Created[0].Pkg)
-		prog.Build()
-
-		res := rta.Analyze([]*ssa.Function{
-			mainPkg.Func("main"),
-			mainPkg.Func("init"),
-		}, true)
-
-		if got := printResult(res, mainPkg.Pkg); got != want {
-			t.Errorf("%s: got:\n%s\nwant:\n%s",
-				prog.Fset.Position(pos), got, want)
-		}
-	}
-}
-
-func printResult(res *rta.Result, from *types.Package) string {
-	var buf bytes.Buffer
-
-	writeSorted := func(ss []string) {
-		sort.Strings(ss)
-		for _, s := range ss {
-			fmt.Fprintf(&buf, "  %s\n", s)
-		}
-	}
-
-	buf.WriteString("Dynamic calls\n")
-	var edges []string
-	callgraph.GraphVisitEdges(res.CallGraph, func(e *callgraph.Edge) error {
-		if strings.Contains(e.Description(), "dynamic") {
-			edges = append(edges, fmt.Sprintf("%s --> %s",
-				e.Caller.Func.RelString(from),
-				e.Callee.Func.RelString(from)))
-		}
-		return nil
-	})
-	writeSorted(edges)
-
-	buf.WriteString("Reachable functions\n")
-	var reachable []string
-	for f := range res.Reachable {
-		reachable = append(reachable, f.RelString(from))
-	}
-	writeSorted(reachable)
-
-	buf.WriteString("Reflect types\n")
-	var rtypes []string
-	res.RuntimeTypes.Iterate(func(key types.Type, value interface{}) {
-		if value == false { // accessible to reflection
-			rtypes = append(rtypes, types.TypeString(key, types.RelativeTo(from)))
-		}
-	})
-	writeSorted(rtypes)
-
-	return strings.TrimSpace(buf.String())
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/func.go b/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/func.go
deleted file mode 100644
index 968c73d80e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/func.go
+++ /dev/null
@@ -1,37 +0,0 @@
-//+build ignore
-
-package main
-
-// Test of dynamic function calls.
-// No interfaces, so no runtime/reflect types.
-
-func A1() {
-	A2(0)
-}
-
-func A2(int) {} // not address-taken
-
-func B() {} // unreachable
-
-var (
-	C = func(int) {}
-	D = func(int) {}
-)
-
-func main() {
-	A1()
-
-	pfn := C
-	pfn(0) // calls C and D but not A2 (same sig but not address-taken)
-}
-
-// WANT:
-// Dynamic calls
-//   main --> init$1
-//   main --> init$2
-// Reachable functions
-//   A1
-//   A2
-//   init$1
-//   init$2
-// Reflect types
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/iface.go b/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/iface.go
deleted file mode 100644
index c3ee57049f..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/iface.go
+++ /dev/null
@@ -1,79 +0,0 @@
-//+build ignore
-
-package main
-
-// Test of interface calls.
-
-func use(interface{})
-
-type A byte // instantiated but not a reflect type
-
-func (A) f() {} // called directly
-func (A) F() {} // unreachable
-
-type B int // a reflect type
-
-func (*B) f() {} // reachable via interface invoke
-func (*B) F() {} // reachable: exported method of reflect type
-
-type B2 int // a reflect type, and *B2 also
-
-func (B2) f() {} // reachable via interface invoke
-func (B2) g() {} // reachable: exported method of reflect type
-
-type C string // not instantiated
-
-func (C) f() {} // unreachable
-func (C) F() {} // unreachable
-
-type D uint // instantiated only in dead code
-
-func (D) f() {} // unreachable
-func (D) F() {} // unreachable
-
-func main() {
-	A(0).f()
-
-	use(new(B))
-	use(B2(0))
-
-	var i interface {
-		f()
-	}
-	i.f() // calls (*B).f, (*B2).f and (B2.f)
-
-	live()
-}
-
-func live() {
-	var j interface {
-		f()
-		g()
-	}
-	j.f() // calls (B2).f and (*B2).f but not (*B).f (no g method).
-}
-
-func dead() {
-	use(D(0))
-}
-
-// WANT:
-// Dynamic calls
-//   live --> (*B2).f
-//   live --> (B2).f
-//   main --> (*B).f
-//   main --> (*B2).f
-//   main --> (B2).f
-// Reachable functions
-//   (*B).F
-//   (*B).f
-//   (*B2).f
-//   (A).f
-//   (B2).f
-//   live
-//   use
-// Reflect types
-//   *B
-//   *B2
-//   B
-//   B2
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/rtype.go b/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/rtype.go
deleted file mode 100644
index 85414e5530..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/rta/testdata/rtype.go
+++ /dev/null
@@ -1,35 +0,0 @@
-//+build ignore
-
-package main
-
-// Test of runtime types (types for which descriptors are needed).
-
-func use(interface{})
-
-type A byte // neither A nor byte are runtime types
-
-type B struct{ x uint } // B and uint are runtime types, but not the struct
-
-func main() {
-	var x int // not a runtime type
-	print(x)
-
-	var y string // runtime type due to interface conversion
-	use(y)
-
-	use(struct{ uint64 }{}) // struct is a runtime type
-
-	use(new(B)) // *B is a runtime type
-}
-
-// WANT:
-// Dynamic calls
-// Reachable functions
-//   use
-// Reflect types
-//   *B
-//   B
-//   string
-//   struct{uint64}
-//   uint
-//   uint64
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/static/static.go b/installer/vendor/golang.org/x/tools/go/callgraph/static/static.go
deleted file mode 100644
index 709bb7b6bd..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/static/static.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Package static computes the call graph of a Go program containing
-// only static call edges.
-package static // import "golang.org/x/tools/go/callgraph/static"
-
-import (
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// CallGraph computes the call graph of the specified program
-// considering only static calls.
-//
-func CallGraph(prog *ssa.Program) *callgraph.Graph {
-	cg := callgraph.New(nil) // TODO(adonovan) eliminate concept of rooted callgraph
-
-	// TODO(adonovan): opt: use only a single pass over the ssa.Program.
-	// TODO(adonovan): opt: this is slower than RTA (perhaps because
-	// the lower precision means so many edges are allocated)!
-	for f := range ssautil.AllFunctions(prog) {
-		fnode := cg.CreateNode(f)
-		for _, b := range f.Blocks {
-			for _, instr := range b.Instrs {
-				if site, ok := instr.(ssa.CallInstruction); ok {
-					if g := site.Common().StaticCallee(); g != nil {
-						gnode := cg.CreateNode(g)
-						callgraph.AddEdge(fnode, site, gnode)
-					}
-				}
-			}
-		}
-	}
-
-	return cg
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/static/static_test.go b/installer/vendor/golang.org/x/tools/go/callgraph/static/static_test.go
deleted file mode 100644
index e1bfcd7075..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/static/static_test.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package static_test
-
-import (
-	"fmt"
-	"go/parser"
-	"reflect"
-	"sort"
-	"testing"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/callgraph/static"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-const input = `package P
-
-type C int
-func (C) f()
-
-type I interface{f()}
-
-func f() {
-	p := func() {}
-	g()
-	p() // SSA constant propagation => static
-
-	if unknown {
-		p = h
-	}
-	p() // dynamic
-
-	C(0).f()
-}
-
-func g() {
-	var i I = C(0)
-	i.f()
-}
-
-func h()
-
-var unknown bool
-`
-
-func TestStatic(t *testing.T) {
-	conf := loader.Config{ParserMode: parser.ParseComments}
-	f, err := conf.ParseFile("P.go", input)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	conf.CreateFromFiles("P", f)
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	P := iprog.Created[0].Pkg
-
-	prog := ssautil.CreateProgram(iprog, 0)
-	prog.Build()
-
-	cg := static.CallGraph(prog)
-
-	var edges []string
-	callgraph.GraphVisitEdges(cg, func(e *callgraph.Edge) error {
-		edges = append(edges, fmt.Sprintf("%s -> %s",
-			e.Caller.Func.RelString(P),
-			e.Callee.Func.RelString(P)))
-		return nil
-	})
-	sort.Strings(edges)
-
-	want := []string{
-		"(*C).f -> (C).f",
-		"f -> (C).f",
-		"f -> f$1",
-		"f -> g",
-	}
-	if !reflect.DeepEqual(edges, want) {
-		t.Errorf("Got edges %v, want %v", edges, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/callgraph/util.go b/installer/vendor/golang.org/x/tools/go/callgraph/util.go
deleted file mode 100644
index a8f89031c0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/callgraph/util.go
+++ /dev/null
@@ -1,181 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package callgraph
-
-import "golang.org/x/tools/go/ssa"
-
-// This file provides various utilities over call graphs, such as
-// visitation and path search.
-
-// CalleesOf returns a new set containing all direct callees of the
-// caller node.
-//
-func CalleesOf(caller *Node) map[*Node]bool {
-	callees := make(map[*Node]bool)
-	for _, e := range caller.Out {
-		callees[e.Callee] = true
-	}
-	return callees
-}
-
-// GraphVisitEdges visits all the edges in graph g in depth-first order.
-// The edge function is called for each edge in postorder.  If it
-// returns non-nil, visitation stops and GraphVisitEdges returns that
-// value.
-//
-func GraphVisitEdges(g *Graph, edge func(*Edge) error) error {
-	seen := make(map[*Node]bool)
-	var visit func(n *Node) error
-	visit = func(n *Node) error {
-		if !seen[n] {
-			seen[n] = true
-			for _, e := range n.Out {
-				if err := visit(e.Callee); err != nil {
-					return err
-				}
-				if err := edge(e); err != nil {
-					return err
-				}
-			}
-		}
-		return nil
-	}
-	for _, n := range g.Nodes {
-		if err := visit(n); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-// PathSearch finds an arbitrary path starting at node start and
-// ending at some node for which isEnd() returns true.  On success,
-// PathSearch returns the path as an ordered list of edges; on
-// failure, it returns nil.
-//
-func PathSearch(start *Node, isEnd func(*Node) bool) []*Edge {
-	stack := make([]*Edge, 0, 32)
-	seen := make(map[*Node]bool)
-	var search func(n *Node) []*Edge
-	search = func(n *Node) []*Edge {
-		if !seen[n] {
-			seen[n] = true
-			if isEnd(n) {
-				return stack
-			}
-			for _, e := range n.Out {
-				stack = append(stack, e) // push
-				if found := search(e.Callee); found != nil {
-					return found
-				}
-				stack = stack[:len(stack)-1] // pop
-			}
-		}
-		return nil
-	}
-	return search(start)
-}
-
-// DeleteSyntheticNodes removes from call graph g all nodes for
-// synthetic functions (except g.Root and package initializers),
-// preserving the topology.  In effect, calls to synthetic wrappers
-// are "inlined".
-//
-func (g *Graph) DeleteSyntheticNodes() {
-	// Measurements on the standard library and go.tools show that
-	// resulting graph has ~15% fewer nodes and 4-8% fewer edges
-	// than the input.
-	//
-	// Inlining a wrapper of in-degree m, out-degree n adds m*n
-	// and removes m+n edges.  Since most wrappers are monomorphic
-	// (n=1) this results in a slight reduction.  Polymorphic
-	// wrappers (n>1), e.g. from embedding an interface value
-	// inside a struct to satisfy some interface, cause an
-	// increase in the graph, but they seem to be uncommon.
-
-	// Hash all existing edges to avoid creating duplicates.
-	edges := make(map[Edge]bool)
-	for _, cgn := range g.Nodes {
-		for _, e := range cgn.Out {
-			edges[*e] = true
-		}
-	}
-	for fn, cgn := range g.Nodes {
-		if cgn == g.Root || fn.Synthetic == "" || isInit(cgn.Func) {
-			continue // keep
-		}
-		for _, eIn := range cgn.In {
-			for _, eOut := range cgn.Out {
-				newEdge := Edge{eIn.Caller, eIn.Site, eOut.Callee}
-				if edges[newEdge] {
-					continue // don't add duplicate
-				}
-				AddEdge(eIn.Caller, eIn.Site, eOut.Callee)
-				edges[newEdge] = true
-			}
-		}
-		g.DeleteNode(cgn)
-	}
-}
-
-func isInit(fn *ssa.Function) bool {
-	return fn.Pkg != nil && fn.Pkg.Func("init") == fn
-}
-
-// DeleteNode removes node n and its edges from the graph g.
-// (NB: not efficient for batch deletion.)
-func (g *Graph) DeleteNode(n *Node) {
-	n.deleteIns()
-	n.deleteOuts()
-	delete(g.Nodes, n.Func)
-}
-
-// deleteIns deletes all incoming edges to n.
-func (n *Node) deleteIns() {
-	for _, e := range n.In {
-		removeOutEdge(e)
-	}
-	n.In = nil
-}
-
-// deleteOuts deletes all outgoing edges from n.
-func (n *Node) deleteOuts() {
-	for _, e := range n.Out {
-		removeInEdge(e)
-	}
-	n.Out = nil
-}
-
-// removeOutEdge removes edge.Caller's outgoing edge 'edge'.
-func removeOutEdge(edge *Edge) {
-	caller := edge.Caller
-	n := len(caller.Out)
-	for i, e := range caller.Out {
-		if e == edge {
-			// Replace it with the final element and shrink the slice.
-			caller.Out[i] = caller.Out[n-1]
-			caller.Out[n-1] = nil // aid GC
-			caller.Out = caller.Out[:n-1]
-			return
-		}
-	}
-	panic("edge not found: " + edge.String())
-}
-
-// removeInEdge removes edge.Callee's incoming edge 'edge'.
-func removeInEdge(edge *Edge) {
-	caller := edge.Callee
-	n := len(caller.In)
-	for i, e := range caller.In {
-		if e == edge {
-			// Replace it with the final element and shrink the slice.
-			caller.In[i] = caller.In[n-1]
-			caller.In[n-1] = nil // aid GC
-			caller.In = caller.In[:n-1]
-			return
-		}
-	}
-	panic("edge not found: " + edge.String())
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata.go b/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata.go
deleted file mode 100644
index 30ed521ea0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata.go
+++ /dev/null
@@ -1,129 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package gccgoexportdata provides functions for reading export data
-// files containing type information produced by the gccgo compiler.
-//
-// This package is a stop-gap until such time as gccgo uses the same
-// export data format as gc; see Go issue 17573. Once that occurs, this
-// package will be deprecated and eventually deleted.
-package gccgoexportdata
-
-// TODO(adonovan): add Find, Write, Importer to the API,
-// for symmetry with gcexportdata.
-
-import (
-	"bytes"
-	"debug/elf"
-	"fmt"
-	"go/token"
-	"go/types"
-	"io"
-	"io/ioutil"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/internal/gccgoimporter"
-)
-
-// CompilerInfo executes the specified gccgo compiler and returns
-// information about it: its version (e.g. "4.8.0"), its target triple
-// (e.g. "x86_64-unknown-linux-gnu"), and the list of directories it
-// searches to find standard packages. The given arguments are passed
-// directly to calls to the specified gccgo compiler.
-func CompilerInfo(gccgo string, args ...string) (version, triple string, dirs []string, err error) {
-	var inst gccgoimporter.GccgoInstallation
-	err = inst.InitFromDriver(gccgo, args...)
-	if err == nil {
-		version = inst.GccVersion
-		triple = inst.TargetTriple
-		dirs = inst.SearchPaths()
-	}
-	return
-}
-
-// NewReader returns a reader for the export data section of an object
-// (.o) or archive (.a) file read from r.
-func NewReader(r io.Reader) (io.Reader, error) {
-	data, err := ioutil.ReadAll(r)
-	if err != nil {
-		return nil, err
-	}
-
-	// If the file is an archive, extract the first section.
-	const archiveMagic = "!<arch>\n"
-	if bytes.HasPrefix(data, []byte(archiveMagic)) {
-		section, err := firstSection(data[len(archiveMagic):])
-		if err != nil {
-			return nil, err
-		}
-		data = section
-	}
-
-	// Data contains an ELF file with a .go_export section.
-	// ELF magic number is "\x7fELF".
-	ef, err := elf.NewFile(bytes.NewReader(data))
-	if err != nil {
-		return nil, err
-	}
-	sec := ef.Section(".go_export")
-	if sec == nil {
-		return nil, fmt.Errorf("no .go_export section")
-	}
-	return sec.Open(), nil
-}
-
-// firstSection returns the contents of the first regular file in an ELF
-// archive (http://www.sco.com/developers/devspecs/gabi41.pdf, §7.2).
-func firstSection(a []byte) ([]byte, error) {
-	for len(a) >= 60 {
-		var hdr []byte
-		hdr, a = a[:60], a[60:]
-
-		name := strings.TrimSpace(string(hdr[:16]))
-
-		sizeStr := string(hdr[48:58])
-		size, err := strconv.Atoi(strings.TrimSpace(sizeStr))
-		if err != nil {
-			return nil, fmt.Errorf("invalid size: %q", sizeStr)
-		}
-
-		if len(a) < size {
-			return nil, fmt.Errorf("invalid section size: %d", size)
-		}
-
-		// The payload is padded to an even number of bytes.
-		var payload []byte
-		payload, a = a[:size], a[size+size&1:]
-
-		// Skip special files:
-		//   "/"           archive symbol table
-		//   "/SYM64/"     archive symbol table on e.g. s390x
-		//   "//"          archive string table (if any filename is >15 bytes)
-		if name == "/" || name == "/SYM64/" || name == "//" {
-			continue
-		}
-
-		return payload, nil
-	}
-	return nil, fmt.Errorf("archive has no regular sections")
-}
-
-// Read reads export data from in, decodes it, and returns type
-// information for the package.
-// The package name is specified by path.
-//
-// The FileSet parameter is currently unused but exists for symmetry
-// with gcexportdata.
-//
-// Read may inspect and add to the imports map to ensure that references
-// within the export data to other packages are consistent.  The caller
-// must ensure that imports[path] does not exist, or exists but is
-// incomplete (see types.Package.Complete), and Read inserts the
-// resulting package into this map entry.
-//
-// On return, the state of the reader is undefined.
-func Read(in io.Reader, _ *token.FileSet, imports map[string]*types.Package, path string) (*types.Package, error) {
-	return gccgoimporter.Parse(in, imports, path)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata_test.go b/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata_test.go
deleted file mode 100644
index 1aa114cae3..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/gccgoexportdata_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package gccgoexportdata_test
-
-import (
-	"go/types"
-	"os"
-	"testing"
-
-	"golang.org/x/tools/go/gccgoexportdata"
-)
-
-// Test ensures this package can read gccgo export data from the
-// .go_export from a standalone ELF file or such a file in an archive
-// library.
-//
-// The testdata/{short,long}.a ELF archive files were produced by:
-//
-//   $ echo 'package foo; func F()' > foo.go
-//   $ gccgo -c -fgo-pkgpath blah foo.go
-//   $ objcopy -j .go_export foo.o foo.gox
-//   $ ar q short.a foo.gox
-//   $ objcopy -j .go_export foo.o name-longer-than-16-bytes.gox
-//   $ ar q long.a name-longer-than-16-bytes.gox
-//
-// The file long.a contains an archive string table.
-//
-// The errors.gox file (an ELF object file) comes from the toolchain's
-// standard library.
-func Test(t *testing.T) {
-	for _, test := range []struct {
-		filename, path, member, wantType string
-	}{
-		{"testdata/errors.gox", "errors", "New", "func(text string) error"},
-		{"testdata/short.a", "short", "F", "func()"},
-		{"testdata/long.a", "long", "F", "func()"},
-	} {
-		t.Logf("filename = %s", test.filename)
-		f, err := os.Open(test.filename)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		defer f.Close()
-		r, err := gccgoexportdata.NewReader(f)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		imports := make(map[string]*types.Package)
-		pkg, err := gccgoexportdata.Read(r, nil, imports, test.path)
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		// Check type of designated package member.
-		obj := pkg.Scope().Lookup(test.member)
-		if obj == nil {
-			t.Errorf("%s.%s not found", test.path, test.member)
-			continue
-		}
-		if obj.Type().String() != test.wantType {
-			t.Errorf("%s.%s.Type = %s, want %s",
-				test.path, test.member, obj.Type(), test.wantType)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/errors.gox b/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/errors.gox
deleted file mode 100644
index c6ff16bcc1..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/errors.gox and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/long.a b/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/long.a
deleted file mode 100644
index c150447311..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/long.a and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/short.a b/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/short.a
deleted file mode 100644
index 3cd756e4f7..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gccgoexportdata/testdata/short.a and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/gcexportdata/example_test.go b/installer/vendor/golang.org/x/tools/go/gcexportdata/example_test.go
deleted file mode 100644
index 4ad73abcb4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcexportdata/example_test.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package gcexportdata_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"log"
-	"os"
-	"path/filepath"
-
-	"golang.org/x/tools/go/gcexportdata"
-)
-
-// ExampleRead uses gcexportdata.Read to load type information for the
-// "fmt" package from the fmt.a file produced by the gc compiler.
-func ExampleRead() {
-	// Find the export data file.
-	filename, path := gcexportdata.Find("fmt", "")
-	if filename == "" {
-		log.Fatalf("can't find export data for fmt")
-	}
-	fmt.Printf("Package path:       %s\n", path)
-	fmt.Printf("Export data:        %s\n", filepath.Base(filename))
-
-	// Open and read the file.
-	f, err := os.Open(filename)
-	if err != nil {
-		log.Fatal(err)
-	}
-	defer f.Close()
-	r, err := gcexportdata.NewReader(f)
-	if err != nil {
-		log.Fatalf("reading export data %s: %v", filename, err)
-	}
-
-	// Decode the export data.
-	fset := token.NewFileSet()
-	imports := make(map[string]*types.Package)
-	pkg, err := gcexportdata.Read(r, fset, imports, path)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Print package information.
-	fmt.Printf("Package members:    %s...\n", pkg.Scope().Names()[:5])
-	println := pkg.Scope().Lookup("Println")
-	posn := fset.Position(println.Pos())
-	posn.Line = 123 // make example deterministic
-	fmt.Printf("Println type:       %s\n", println.Type())
-	fmt.Printf("Println location:   %s\n", slashify(posn))
-
-	// Output:
-	//
-	// Package path:       fmt
-	// Export data:        fmt.a
-	// Package members:    [Errorf Formatter Fprint Fprintf Fprintln]...
-	// Println type:       func(a ...interface{}) (n int, err error)
-	// Println location:   $GOROOT/src/fmt/print.go:123:1
-}
-
-// ExampleNewImporter demonstrates usage of NewImporter to provide type
-// information for dependencies when type-checking Go source code.
-func ExampleNewImporter() {
-	const src = `package myscanner
-
-// choosing a package that is unlikely to change across releases
-import "text/scanner"
-
-const eof = scanner.EOF
-`
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "myscanner.go", src, 0)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	packages := make(map[string]*types.Package)
-	imp := gcexportdata.NewImporter(fset, packages)
-	conf := types.Config{Importer: imp}
-	pkg, err := conf.Check("myscanner", fset, []*ast.File{f}, nil)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// object from imported package
-	pi := packages["text/scanner"].Scope().Lookup("EOF")
-	fmt.Printf("const %s.%s %s = %s // %s\n",
-		pi.Pkg().Path(),
-		pi.Name(),
-		pi.Type(),
-		pi.(*types.Const).Val(),
-		slashify(fset.Position(pi.Pos())),
-	)
-
-	// object in source package
-	twopi := pkg.Scope().Lookup("eof")
-	fmt.Printf("const %s %s = %s // %s\n",
-		twopi.Name(),
-		twopi.Type(),
-		twopi.(*types.Const).Val(),
-		slashify(fset.Position(twopi.Pos())),
-	)
-
-	// Output:
-	//
-	// const text/scanner.EOF untyped int = -1 // $GOROOT/src/text/scanner/scanner.go:75:1
-	// const eof untyped int = -1 // myscanner.go:6:7
-}
-
-func slashify(posn token.Position) token.Position {
-	posn.Filename = filepath.ToSlash(posn.Filename) // for MS Windows portability
-	return posn
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go b/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
index e53270e061..b44bdbfcf9 100644
--- a/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
+++ b/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata.go
@@ -7,9 +7,6 @@
 // gc compiler.  This package supports go1.7 export data format and all
 // later versions.
 //
-// This package replaces the deprecated golang.org/x/tools/go/gcimporter15
-// package, which will be deleted in October 2017.
-//
 // Although it might seem convenient for this package to live alongside
 // go/types in the standard library, this would cause version skew
 // problems for developer tools that use it, since they must be able to
@@ -32,7 +29,7 @@ import (
 	"io"
 	"io/ioutil"
 
-	gcimporter "golang.org/x/tools/go/gcimporter15"
+	"golang.org/x/tools/go/internal/gcimporter"
 )
 
 // Find returns the name of an object (.o) or archive (.a) file
diff --git a/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata_test.go b/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata_test.go
deleted file mode 100644
index 69133db975..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcexportdata/gcexportdata_test.go
+++ /dev/null
@@ -1,41 +0,0 @@
-package gcexportdata_test
-
-import (
-	"go/token"
-	"go/types"
-	"log"
-	"os"
-	"testing"
-
-	"golang.org/x/tools/go/gcexportdata"
-)
-
-// Test to ensure that gcexportdata can read files produced by App
-// Engine Go runtime v1.6.
-func TestAppEngine16(t *testing.T) {
-	// Open and read the file.
-	f, err := os.Open("testdata/errors-ae16.a")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer f.Close()
-	r, err := gcexportdata.NewReader(f)
-	if err != nil {
-		log.Fatalf("reading export data: %v", err)
-	}
-
-	// Decode the export data.
-	fset := token.NewFileSet()
-	imports := make(map[string]*types.Package)
-	pkg, err := gcexportdata.Read(r, fset, imports, "errors")
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Print package information.
-	got := pkg.Scope().Lookup("New").Type().String()
-	want := "func(text string) error"
-	if got != want {
-		t.Errorf("New.Type = %s, want %s", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcexportdata/testdata/errors-ae16.a b/installer/vendor/golang.org/x/tools/go/gcexportdata/testdata/errors-ae16.a
deleted file mode 100644
index 3f1dad54f0..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gcexportdata/testdata/errors-ae16.a and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport19_test.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport19_test.go
deleted file mode 100644
index f6e9733b13..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport19_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package gcimporter_test
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"testing"
-
-	gcimporter "golang.org/x/tools/go/gcimporter15"
-)
-
-const src = `
-package p
-
-type (
-	T0 = int32
-	T1 = struct{}
-	T2 = struct{ T1 }
-	Invalid = foo // foo is undeclared
-)
-`
-
-func checkPkg(t *testing.T, pkg *types.Package, label string) {
-	T1 := types.NewStruct(nil, nil)
-	T2 := types.NewStruct([]*types.Var{types.NewField(0, pkg, "T1", T1, true)}, nil)
-
-	for _, test := range []struct {
-		name string
-		typ  types.Type
-	}{
-		{"T0", types.Typ[types.Int32]},
-		{"T1", T1},
-		{"T2", T2},
-		{"Invalid", types.Typ[types.Invalid]},
-	} {
-		obj := pkg.Scope().Lookup(test.name)
-		if obj == nil {
-			t.Errorf("%s: %s not found", label, test.name)
-			continue
-		}
-		tname, _ := obj.(*types.TypeName)
-		if tname == nil {
-			t.Errorf("%s: %v not a type name", label, obj)
-			continue
-		}
-		if !tname.IsAlias() {
-			t.Errorf("%s: %v: not marked as alias", label, tname)
-			continue
-		}
-		if got := tname.Type(); !types.Identical(got, test.typ) {
-			t.Errorf("%s: %v: got %v; want %v", label, tname, got, test.typ)
-		}
-	}
-}
-
-func TestTypeAliases(t *testing.T) {
-	// parse and typecheck
-	fset1 := token.NewFileSet()
-	f, err := parser.ParseFile(fset1, "p.go", src, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var conf types.Config
-	pkg1, err := conf.Check("p", fset1, []*ast.File{f}, nil)
-	if err == nil {
-		// foo in undeclared in src; we should see an error
-		t.Fatal("invalid source type-checked without error")
-	}
-	if pkg1 == nil {
-		// despite incorrect src we should see a (partially) type-checked package
-		t.Fatal("nil package returned")
-	}
-	checkPkg(t, pkg1, "export")
-
-	// export
-	exportdata := gcimporter.BExportData(fset1, pkg1)
-
-	// import
-	imports := make(map[string]*types.Package)
-	fset2 := token.NewFileSet()
-	_, pkg2, err := gcimporter.BImportData(fset2, imports, exportdata, pkg1.Path())
-	if err != nil {
-		t.Fatalf("BImportData(%s): %v", pkg1.Path(), err)
-	}
-	checkPkg(t, pkg2, "import")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport_test.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport_test.go
deleted file mode 100644
index 6ab3bcb102..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport_test.go
+++ /dev/null
@@ -1,326 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gcimporter_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/constant"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-	gcimporter "golang.org/x/tools/go/gcimporter15"
-	"golang.org/x/tools/go/loader"
-)
-
-func TestBExportData_stdlib(t *testing.T) {
-	if runtime.GOOS == "android" {
-		t.Skipf("incomplete std lib on %s", runtime.GOOS)
-	}
-
-	// Load, parse and type-check the program.
-	ctxt := build.Default // copy
-	ctxt.GOPATH = ""      // disable GOPATH
-	conf := loader.Config{
-		Build:       &ctxt,
-		AllowErrors: true,
-	}
-	for _, path := range buildutil.AllPackages(conf.Build) {
-		conf.Import(path)
-	}
-
-	// Create a package containing type and value errors to ensure
-	// they are properly encoded/decoded.
-	f, err := conf.ParseFile("haserrors/haserrors.go", `package haserrors
-const UnknownValue = "" + 0
-type UnknownType undefined
-`)
-	if err != nil {
-		t.Fatal(err)
-	}
-	conf.CreateFromFiles("haserrors", f)
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load failed: %v", err)
-	}
-
-	numPkgs := len(prog.AllPackages)
-	if want := 248; numPkgs < want {
-		t.Errorf("Loaded only %d packages, want at least %d", numPkgs, want)
-	}
-
-	for pkg, info := range prog.AllPackages {
-		if info.Files == nil {
-			continue // empty directory
-		}
-		exportdata := gcimporter.BExportData(conf.Fset, pkg)
-
-		imports := make(map[string]*types.Package)
-		fset2 := token.NewFileSet()
-		n, pkg2, err := gcimporter.BImportData(fset2, imports, exportdata, pkg.Path())
-		if err != nil {
-			t.Errorf("BImportData(%s): %v", pkg.Path(), err)
-			continue
-		}
-		if n != len(exportdata) {
-			t.Errorf("BImportData(%s) decoded %d bytes, want %d",
-				pkg.Path(), n, len(exportdata))
-		}
-
-		// Compare the packages' corresponding members.
-		for _, name := range pkg.Scope().Names() {
-			if !ast.IsExported(name) {
-				continue
-			}
-			obj1 := pkg.Scope().Lookup(name)
-			obj2 := pkg2.Scope().Lookup(name)
-			if obj2 == nil {
-				t.Errorf("%s.%s not found, want %s", pkg.Path(), name, obj1)
-				continue
-			}
-
-			fl1 := fileLine(conf.Fset, obj1)
-			fl2 := fileLine(fset2, obj2)
-			if fl1 != fl2 {
-				t.Errorf("%s.%s: got posn %s, want %s",
-					pkg.Path(), name, fl2, fl1)
-			}
-
-			if err := equalObj(obj1, obj2); err != nil {
-				t.Errorf("%s.%s: %s\ngot:  %s\nwant: %s",
-					pkg.Path(), name, err, obj2, obj1)
-			}
-		}
-	}
-}
-
-func fileLine(fset *token.FileSet, obj types.Object) string {
-	posn := fset.Position(obj.Pos())
-	return fmt.Sprintf("%s:%d", posn.Filename, posn.Line)
-}
-
-// equalObj reports how x and y differ.  They are assumed to belong to
-// different universes so cannot be compared directly.
-func equalObj(x, y types.Object) error {
-	if reflect.TypeOf(x) != reflect.TypeOf(y) {
-		return fmt.Errorf("%T vs %T", x, y)
-	}
-	xt := x.Type()
-	yt := y.Type()
-	switch x.(type) {
-	case *types.Var, *types.Func:
-		// ok
-	case *types.Const:
-		xval := x.(*types.Const).Val()
-		yval := y.(*types.Const).Val()
-		// Use string comparison for floating-point values since rounding is permitted.
-		if constant.Compare(xval, token.NEQ, yval) &&
-			!(xval.Kind() == constant.Float && xval.String() == yval.String()) {
-			return fmt.Errorf("unequal constants %s vs %s", xval, yval)
-		}
-	case *types.TypeName:
-		xt = xt.Underlying()
-		yt = yt.Underlying()
-	default:
-		return fmt.Errorf("unexpected %T", x)
-	}
-	return equalType(xt, yt)
-}
-
-func equalType(x, y types.Type) error {
-	if reflect.TypeOf(x) != reflect.TypeOf(y) {
-		return fmt.Errorf("unequal kinds: %T vs %T", x, y)
-	}
-	switch x := x.(type) {
-	case *types.Interface:
-		y := y.(*types.Interface)
-		// TODO(gri): enable separate emission of Embedded interfaces
-		// and ExplicitMethods then use this logic.
-		// if x.NumEmbeddeds() != y.NumEmbeddeds() {
-		// 	return fmt.Errorf("unequal number of embedded interfaces: %d vs %d",
-		// 		x.NumEmbeddeds(), y.NumEmbeddeds())
-		// }
-		// for i := 0; i < x.NumEmbeddeds(); i++ {
-		// 	xi := x.Embedded(i)
-		// 	yi := y.Embedded(i)
-		// 	if xi.String() != yi.String() {
-		// 		return fmt.Errorf("mismatched %th embedded interface: %s vs %s",
-		// 			i, xi, yi)
-		// 	}
-		// }
-		// if x.NumExplicitMethods() != y.NumExplicitMethods() {
-		// 	return fmt.Errorf("unequal methods: %d vs %d",
-		// 		x.NumExplicitMethods(), y.NumExplicitMethods())
-		// }
-		// for i := 0; i < x.NumExplicitMethods(); i++ {
-		// 	xm := x.ExplicitMethod(i)
-		// 	ym := y.ExplicitMethod(i)
-		// 	if xm.Name() != ym.Name() {
-		// 		return fmt.Errorf("mismatched %th method: %s vs %s", i, xm, ym)
-		// 	}
-		// 	if err := equalType(xm.Type(), ym.Type()); err != nil {
-		// 		return fmt.Errorf("mismatched %s method: %s", xm.Name(), err)
-		// 	}
-		// }
-		if x.NumMethods() != y.NumMethods() {
-			return fmt.Errorf("unequal methods: %d vs %d",
-				x.NumMethods(), y.NumMethods())
-		}
-		for i := 0; i < x.NumMethods(); i++ {
-			xm := x.Method(i)
-			ym := y.Method(i)
-			if xm.Name() != ym.Name() {
-				return fmt.Errorf("mismatched %dth method: %s vs %s", i, xm, ym)
-			}
-			if err := equalType(xm.Type(), ym.Type()); err != nil {
-				return fmt.Errorf("mismatched %s method: %s", xm.Name(), err)
-			}
-		}
-	case *types.Array:
-		y := y.(*types.Array)
-		if x.Len() != y.Len() {
-			return fmt.Errorf("unequal array lengths: %d vs %d", x.Len(), y.Len())
-		}
-		if err := equalType(x.Elem(), y.Elem()); err != nil {
-			return fmt.Errorf("array elements: %s", err)
-		}
-	case *types.Basic:
-		y := y.(*types.Basic)
-		if x.Kind() != y.Kind() {
-			return fmt.Errorf("unequal basic types: %s vs %s", x, y)
-		}
-	case *types.Chan:
-		y := y.(*types.Chan)
-		if x.Dir() != y.Dir() {
-			return fmt.Errorf("unequal channel directions: %d vs %d", x.Dir(), y.Dir())
-		}
-		if err := equalType(x.Elem(), y.Elem()); err != nil {
-			return fmt.Errorf("channel elements: %s", err)
-		}
-	case *types.Map:
-		y := y.(*types.Map)
-		if err := equalType(x.Key(), y.Key()); err != nil {
-			return fmt.Errorf("map keys: %s", err)
-		}
-		if err := equalType(x.Elem(), y.Elem()); err != nil {
-			return fmt.Errorf("map values: %s", err)
-		}
-	case *types.Named:
-		y := y.(*types.Named)
-		if x.String() != y.String() {
-			return fmt.Errorf("unequal named types: %s vs %s", x, y)
-		}
-	case *types.Pointer:
-		y := y.(*types.Pointer)
-		if err := equalType(x.Elem(), y.Elem()); err != nil {
-			return fmt.Errorf("pointer elements: %s", err)
-		}
-	case *types.Signature:
-		y := y.(*types.Signature)
-		if err := equalType(x.Params(), y.Params()); err != nil {
-			return fmt.Errorf("parameters: %s", err)
-		}
-		if err := equalType(x.Results(), y.Results()); err != nil {
-			return fmt.Errorf("results: %s", err)
-		}
-		if x.Variadic() != y.Variadic() {
-			return fmt.Errorf("unequal varidicity: %t vs %t",
-				x.Variadic(), y.Variadic())
-		}
-		if (x.Recv() != nil) != (y.Recv() != nil) {
-			return fmt.Errorf("unequal receivers: %s vs %s", x.Recv(), y.Recv())
-		}
-		if x.Recv() != nil {
-			// TODO(adonovan): fix: this assertion fires for interface methods.
-			// The type of the receiver of an interface method is a named type
-			// if the Package was loaded from export data, or an unnamed (interface)
-			// type if the Package was produced by type-checking ASTs.
-			// if err := equalType(x.Recv().Type(), y.Recv().Type()); err != nil {
-			// 	return fmt.Errorf("receiver: %s", err)
-			// }
-		}
-	case *types.Slice:
-		y := y.(*types.Slice)
-		if err := equalType(x.Elem(), y.Elem()); err != nil {
-			return fmt.Errorf("slice elements: %s", err)
-		}
-	case *types.Struct:
-		y := y.(*types.Struct)
-		if x.NumFields() != y.NumFields() {
-			return fmt.Errorf("unequal struct fields: %d vs %d",
-				x.NumFields(), y.NumFields())
-		}
-		for i := 0; i < x.NumFields(); i++ {
-			xf := x.Field(i)
-			yf := y.Field(i)
-			if xf.Name() != yf.Name() {
-				return fmt.Errorf("mismatched fields: %s vs %s", xf, yf)
-			}
-			if err := equalType(xf.Type(), yf.Type()); err != nil {
-				return fmt.Errorf("struct field %s: %s", xf.Name(), err)
-			}
-			if x.Tag(i) != y.Tag(i) {
-				return fmt.Errorf("struct field %s has unequal tags: %q vs %q",
-					xf.Name(), x.Tag(i), y.Tag(i))
-			}
-		}
-	case *types.Tuple:
-		y := y.(*types.Tuple)
-		if x.Len() != y.Len() {
-			return fmt.Errorf("unequal tuple lengths: %d vs %d", x.Len(), y.Len())
-		}
-		for i := 0; i < x.Len(); i++ {
-			if err := equalType(x.At(i).Type(), y.At(i).Type()); err != nil {
-				return fmt.Errorf("tuple element %d: %s", i, err)
-			}
-		}
-	}
-	return nil
-}
-
-// TestVeryLongFile tests the position of an import object declared in
-// a very long input file.  Line numbers greater than maxlines are
-// reported as line 1, not garbage or token.NoPos.
-func TestVeryLongFile(t *testing.T) {
-	// parse and typecheck
-	longFile := "package foo" + strings.Repeat("\n", 123456) + "var X int"
-	fset1 := token.NewFileSet()
-	f, err := parser.ParseFile(fset1, "foo.go", longFile, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var conf types.Config
-	pkg, err := conf.Check("foo", fset1, []*ast.File{f}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// export
-	exportdata := gcimporter.BExportData(fset1, pkg)
-
-	// import
-	imports := make(map[string]*types.Package)
-	fset2 := token.NewFileSet()
-	_, pkg2, err := gcimporter.BImportData(fset2, imports, exportdata, pkg.Path())
-	if err != nil {
-		t.Fatalf("BImportData(%s): %v", pkg.Path(), err)
-	}
-
-	// compare
-	posn1 := fset1.Position(pkg.Scope().Lookup("X").Pos())
-	posn2 := fset2.Position(pkg2.Scope().Lookup("X").Pos())
-	if want := "foo.go:1:1"; posn2.String() != want {
-		t.Errorf("X position = %s, want %s (orig was %s)",
-			posn2, want, posn1)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter_test.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter_test.go
deleted file mode 100644
index 56cdfc04f4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter_test.go
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file is a copy of $GOROOT/src/go/internal/gcimporter/gcimporter_test.go,
-// adjusted to make it build with code from (std lib) internal/testenv copied.
-
-package gcimporter
-
-import (
-	"bytes"
-	"fmt"
-	"go/types"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-// ----------------------------------------------------------------------------
-// The following three functions (Builder, HasGoBuild, MustHaveGoBuild) were
-// copied from $GOROOT/src/internal/testenv since that package is not available
-// in x/tools.
-
-// Builder reports the name of the builder running this test
-// (for example, "linux-amd64" or "windows-386-gce").
-// If the test is not running on the build infrastructure,
-// Builder returns the empty string.
-func Builder() string {
-	return os.Getenv("GO_BUILDER_NAME")
-}
-
-// HasGoBuild reports whether the current system can build programs with ``go build''
-// and then run them with os.StartProcess or exec.Command.
-func HasGoBuild() bool {
-	switch runtime.GOOS {
-	case "android", "nacl":
-		return false
-	case "darwin":
-		if strings.HasPrefix(runtime.GOARCH, "arm") {
-			return false
-		}
-	}
-	return true
-}
-
-// MustHaveGoBuild checks that the current system can build programs with ``go build''
-// and then run them with os.StartProcess or exec.Command.
-// If not, MustHaveGoBuild calls t.Skip with an explanation.
-func MustHaveGoBuild(t *testing.T) {
-	if !HasGoBuild() {
-		t.Skipf("skipping test: 'go build' not available on %s/%s", runtime.GOOS, runtime.GOARCH)
-	}
-}
-
-// ----------------------------------------------------------------------------
-
-// skipSpecialPlatforms causes the test to be skipped for platforms where
-// builders (build.golang.org) don't have access to compiled packages for
-// import.
-func skipSpecialPlatforms(t *testing.T) {
-	switch platform := runtime.GOOS + "-" + runtime.GOARCH; platform {
-	case "nacl-amd64p32",
-		"nacl-386",
-		"nacl-arm",
-		"darwin-arm",
-		"darwin-arm64":
-		t.Skipf("no compiled packages available for import on %s", platform)
-	}
-}
-
-func compile(t *testing.T, dirname, filename string) string {
-	/* testenv. */ MustHaveGoBuild(t)
-	cmd := exec.Command("go", "tool", "compile", filename)
-	cmd.Dir = dirname
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		t.Logf("%s", out)
-		t.Fatalf("go tool compile %s failed: %s", filename, err)
-	}
-	// filename should end with ".go"
-	return filepath.Join(dirname, filename[:len(filename)-2]+"o")
-}
-
-func testPath(t *testing.T, path, srcDir string) *types.Package {
-	t0 := time.Now()
-	pkg, err := Import(make(map[string]*types.Package), path, srcDir)
-	if err != nil {
-		t.Errorf("testPath(%s): %s", path, err)
-		return nil
-	}
-	t.Logf("testPath(%s): %v", path, time.Since(t0))
-	return pkg
-}
-
-const maxTime = 30 * time.Second
-
-func testDir(t *testing.T, dir string, endTime time.Time) (nimports int) {
-	dirname := filepath.Join(runtime.GOROOT(), "pkg", runtime.GOOS+"_"+runtime.GOARCH, dir)
-	list, err := ioutil.ReadDir(dirname)
-	if err != nil {
-		t.Fatalf("testDir(%s): %s", dirname, err)
-	}
-	for _, f := range list {
-		if time.Now().After(endTime) {
-			t.Log("testing time used up")
-			return
-		}
-		switch {
-		case !f.IsDir():
-			// try extensions
-			for _, ext := range pkgExts {
-				if strings.HasSuffix(f.Name(), ext) {
-					name := f.Name()[0 : len(f.Name())-len(ext)] // remove extension
-					if testPath(t, filepath.Join(dir, name), dir) != nil {
-						nimports++
-					}
-				}
-			}
-		case f.IsDir():
-			nimports += testDir(t, filepath.Join(dir, f.Name()), endTime)
-		}
-	}
-	return
-}
-
-const testfile = "exports.go"
-
-func TestImportTestdata(t *testing.T) {
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	if outFn := compile(t, "testdata", testfile); outFn != "" {
-		defer os.Remove(outFn)
-	}
-
-	// filename should end with ".go"
-	filename := testfile[:len(testfile)-3]
-	if pkg := testPath(t, "./testdata/"+filename, "."); pkg != nil {
-		// The package's Imports list must include all packages
-		// explicitly imported by testfile, plus all packages
-		// referenced indirectly via exported objects in testfile.
-		// With the textual export format (when run against Go1.6),
-		// the list may also include additional packages that are
-		// not strictly required for import processing alone (they
-		// are exported to err "on the safe side").
-		// For now, we just test the presence of a few packages
-		// that we know are there for sure.
-		got := fmt.Sprint(pkg.Imports())
-		for _, want := range []string{"go/ast", "go/token"} {
-			if !strings.Contains(got, want) {
-				t.Errorf(`Package("exports").Imports() = %s, does not contain %s`, got, want)
-			}
-		}
-	}
-}
-
-func TestVersionHandling(t *testing.T) {
-	skipSpecialPlatforms(t) // we really only need to exclude nacl platforms, but this is fine
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	const dir = "./testdata/versions"
-	list, err := ioutil.ReadDir(dir)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, f := range list {
-		name := f.Name()
-		if !strings.HasSuffix(name, ".a") {
-			continue // not a package file
-		}
-		if strings.Contains(name, "corrupted") {
-			continue // don't process a leftover corrupted file
-		}
-		pkgpath := "./" + name[:len(name)-2]
-
-		// test that export data can be imported
-		_, err := Import(make(map[string]*types.Package), pkgpath, dir)
-		if err != nil {
-			t.Errorf("import %q failed: %v", pkgpath, err)
-			continue
-		}
-
-		// create file with corrupted export data
-		// 1) read file
-		data, err := ioutil.ReadFile(filepath.Join(dir, name))
-		if err != nil {
-			t.Fatal(err)
-		}
-		// 2) find export data
-		i := bytes.Index(data, []byte("\n$$B\n")) + 5
-		j := bytes.Index(data[i:], []byte("\n$$\n")) + i
-		if i < 0 || j < 0 || i > j {
-			t.Fatalf("export data section not found (i = %d, j = %d)", i, j)
-		}
-		// 3) corrupt the data (increment every 7th byte)
-		for k := j - 13; k >= i; k -= 7 {
-			data[k]++
-		}
-		// 4) write the file
-		pkgpath += "_corrupted"
-		filename := filepath.Join(dir, pkgpath) + ".a"
-		ioutil.WriteFile(filename, data, 0666)
-		defer os.Remove(filename)
-
-		// test that importing the corrupted file results in an error
-		_, err = Import(make(map[string]*types.Package), pkgpath, dir)
-		if err == nil {
-			t.Errorf("import corrupted %q succeeded", pkgpath)
-		} else if msg := err.Error(); !strings.Contains(msg, "version skew") {
-			t.Errorf("import %q error incorrect (%s)", pkgpath, msg)
-		}
-	}
-}
-
-func TestImportStdLib(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	dt := maxTime
-	if testing.Short() && /* testenv. */ Builder() == "" {
-		dt = 10 * time.Millisecond
-	}
-	nimports := testDir(t, "", time.Now().Add(dt)) // installed packages
-	t.Logf("tested %d imports", nimports)
-}
-
-var importedObjectTests = []struct {
-	name string
-	want string
-}{
-	{"math.Pi", "const Pi untyped float"},
-	{"io.Reader", "type Reader interface{Read(p []byte) (n int, err error)}"},
-	// Go 1.7 and 1.8 don't know about embedded interfaces. Leave this
-	// test out for now - the code is tested in the std library anyway.
-	// TODO(gri) enable again once we're off 1.7 and 1.8.
-	// {"io.ReadWriter", "type ReadWriter interface{Reader; Writer}"},
-	{"math.Sin", "func Sin(x float64) float64"},
-	// TODO(gri) add more tests
-}
-
-func TestImportedTypes(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	for _, test := range importedObjectTests {
-		s := strings.Split(test.name, ".")
-		if len(s) != 2 {
-			t.Fatal("inconsistent test data")
-		}
-		importPath := s[0]
-		objName := s[1]
-
-		pkg, err := Import(make(map[string]*types.Package), importPath, ".")
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-
-		obj := pkg.Scope().Lookup(objName)
-		if obj == nil {
-			t.Errorf("%s: object not found", test.name)
-			continue
-		}
-
-		got := types.ObjectString(obj, types.RelativeTo(pkg))
-		if got != test.want {
-			t.Errorf("%s: got %q; want %q", test.name, got, test.want)
-		}
-	}
-}
-
-func TestIssue5815(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	pkg := importPkg(t, "strings")
-
-	scope := pkg.Scope()
-	for _, name := range scope.Names() {
-		obj := scope.Lookup(name)
-		if obj.Pkg() == nil {
-			t.Errorf("no pkg for %s", obj)
-		}
-		if tname, _ := obj.(*types.TypeName); tname != nil {
-			named := tname.Type().(*types.Named)
-			for i := 0; i < named.NumMethods(); i++ {
-				m := named.Method(i)
-				if m.Pkg() == nil {
-					t.Errorf("no pkg for %s", m)
-				}
-			}
-		}
-	}
-}
-
-// Smoke test to ensure that imported methods get the correct package.
-func TestCorrectMethodPackage(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	imports := make(map[string]*types.Package)
-	_, err := Import(imports, "net/http", ".")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mutex := imports["sync"].Scope().Lookup("Mutex").(*types.TypeName).Type()
-	mset := types.NewMethodSet(types.NewPointer(mutex)) // methods of *sync.Mutex
-	sel := mset.Lookup(nil, "Lock")
-	lock := sel.Obj().(*types.Func)
-	if got, want := lock.Pkg().Path(), "sync"; got != want {
-		t.Errorf("got package path %q; want %q", got, want)
-	}
-}
-
-func TestIssue13566(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	// On windows, we have to set the -D option for the compiler to avoid having a drive
-	// letter and an illegal ':' in the import path - just skip it (see also issue #3483).
-	if runtime.GOOS == "windows" {
-		t.Skip("avoid dealing with relative paths/drive letters on windows")
-	}
-
-	if f := compile(t, "testdata", "a.go"); f != "" {
-		defer os.Remove(f)
-	}
-	if f := compile(t, "testdata", "b.go"); f != "" {
-		defer os.Remove(f)
-	}
-
-	// import must succeed (test for issue at hand)
-	pkg := importPkg(t, "./testdata/b")
-
-	// make sure all indirectly imported packages have names
-	for _, imp := range pkg.Imports() {
-		if imp.Name() == "" {
-			t.Errorf("no name for %s package", imp.Path())
-		}
-	}
-}
-
-func TestIssue13898(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	// import go/internal/gcimporter which imports go/types partially
-	imports := make(map[string]*types.Package)
-	_, err := Import(imports, "go/internal/gcimporter", ".")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// look for go/types package
-	var goTypesPkg *types.Package
-	for path, pkg := range imports {
-		if path == "go/types" {
-			goTypesPkg = pkg
-			break
-		}
-	}
-	if goTypesPkg == nil {
-		t.Fatal("go/types not found")
-	}
-
-	// look for go/types.Object type
-	obj := lookupObj(t, goTypesPkg.Scope(), "Object")
-	typ, ok := obj.Type().(*types.Named)
-	if !ok {
-		t.Fatalf("go/types.Object type is %v; wanted named type", typ)
-	}
-
-	// lookup go/types.Object.Pkg method
-	m, index, indirect := types.LookupFieldOrMethod(typ, false, nil, "Pkg")
-	if m == nil {
-		t.Fatalf("go/types.Object.Pkg not found (index = %v, indirect = %v)", index, indirect)
-	}
-
-	// the method must belong to go/types
-	if m.Pkg().Path() != "go/types" {
-		t.Fatalf("found %v; want go/types", m.Pkg())
-	}
-}
-
-func TestIssue15517(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	// On windows, we have to set the -D option for the compiler to avoid having a drive
-	// letter and an illegal ':' in the import path - just skip it (see also issue #3483).
-	if runtime.GOOS == "windows" {
-		t.Skip("avoid dealing with relative paths/drive letters on windows")
-	}
-
-	if f := compile(t, "testdata", "p.go"); f != "" {
-		defer os.Remove(f)
-	}
-
-	// Multiple imports of p must succeed without redeclaration errors.
-	// We use an import path that's not cleaned up so that the eventual
-	// file path for the package is different from the package path; this
-	// will expose the error if it is present.
-	//
-	// (Issue: Both the textual and the binary importer used the file path
-	// of the package to be imported as key into the shared packages map.
-	// However, the binary importer then used the package path to identify
-	// the imported package to mark it as complete; effectively marking the
-	// wrong package as complete. By using an "unclean" package path, the
-	// file and package path are different, exposing the problem if present.
-	// The same issue occurs with vendoring.)
-	imports := make(map[string]*types.Package)
-	for i := 0; i < 3; i++ {
-		if _, err := Import(imports, "./././testdata/p", "."); err != nil {
-			t.Fatal(err)
-		}
-	}
-}
-
-func TestIssue15920(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	// On windows, we have to set the -D option for the compiler to avoid having a drive
-	// letter and an illegal ':' in the import path - just skip it (see also issue #3483).
-	if runtime.GOOS == "windows" {
-		t.Skip("avoid dealing with relative paths/drive letters on windows")
-	}
-
-	if f := compile(t, "testdata", "issue15920.go"); f != "" {
-		defer os.Remove(f)
-	}
-
-	importPkg(t, "./testdata/issue15920")
-}
-
-func TestIssue20046(t *testing.T) {
-	skipSpecialPlatforms(t)
-
-	// This package only handles gc export data.
-	if runtime.Compiler != "gc" {
-		t.Skipf("gc-built packages not available (compiler = %s)", runtime.Compiler)
-	}
-
-	// On windows, we have to set the -D option for the compiler to avoid having a drive
-	// letter and an illegal ':' in the import path - just skip it (see also issue #3483).
-	if runtime.GOOS == "windows" {
-		t.Skip("avoid dealing with relative paths/drive letters on windows")
-	}
-
-	if f := compile(t, "testdata", "issue20046.go"); f != "" {
-		defer os.Remove(f)
-	}
-
-	// "./issue20046".V.M must exist
-	pkg := importPkg(t, "./testdata/issue20046")
-	obj := lookupObj(t, pkg.Scope(), "V")
-	if m, index, indirect := types.LookupFieldOrMethod(obj.Type(), false, nil, "M"); m == nil {
-		t.Fatalf("V.M not found (index = %v, indirect = %v)", index, indirect)
-	}
-}
-
-func importPkg(t *testing.T, path string) *types.Package {
-	pkg, err := Import(make(map[string]*types.Package), path, ".")
-	if err != nil {
-		t.Fatal(err)
-	}
-	return pkg
-}
-
-func lookupObj(t *testing.T, scope *types.Scope, name string) types.Object {
-	if obj := scope.Lookup(name); obj != nil {
-		return obj
-	}
-	t.Fatalf("%s not found", name)
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/a.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/a.go
deleted file mode 100644
index 56e4292cda..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/a.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Input for TestIssue13566
-
-package a
-
-import "encoding/json"
-
-type A struct {
-	a    *A
-	json json.RawMessage
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/b.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/b.go
deleted file mode 100644
index 4196678200..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/b.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Input for TestIssue13566
-
-package b
-
-import "./a"
-
-type A a.A
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/exports.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/exports.go
deleted file mode 100644
index 8ee28b0942..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/exports.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file is used to generate an object file which
-// serves as test file for gcimporter_test.go.
-
-package exports
-
-import (
-	"go/ast"
-)
-
-// Issue 3682: Correctly read dotted identifiers from export data.
-const init1 = 0
-
-func init() {}
-
-const (
-	C0 int = 0
-	C1     = 3.14159265
-	C2     = 2.718281828i
-	C3     = -123.456e-789
-	C4     = +123.456E+789
-	C5     = 1234i
-	C6     = "foo\n"
-	C7     = `bar\n`
-)
-
-type (
-	T1  int
-	T2  [10]int
-	T3  []int
-	T4  *int
-	T5  chan int
-	T6a chan<- int
-	T6b chan (<-chan int)
-	T6c chan<- (chan int)
-	T7  <-chan *ast.File
-	T8  struct{}
-	T9  struct {
-		a    int
-		b, c float32
-		d    []string `go:"tag"`
-	}
-	T10 struct {
-		T8
-		T9
-		_ *T10
-	}
-	T11 map[int]string
-	T12 interface{}
-	T13 interface {
-		m1()
-		m2(int) float32
-	}
-	T14 interface {
-		T12
-		T13
-		m3(x ...struct{}) []T9
-	}
-	T15 func()
-	T16 func(int)
-	T17 func(x int)
-	T18 func() float32
-	T19 func() (x float32)
-	T20 func(...interface{})
-	T21 struct{ next *T21 }
-	T22 struct{ link *T23 }
-	T23 struct{ link *T22 }
-	T24 *T24
-	T25 *T26
-	T26 *T27
-	T27 *T25
-	T28 func(T28) T28
-)
-
-var (
-	V0 int
-	V1 = -991.0
-)
-
-func F1()         {}
-func F2(x int)    {}
-func F3() int     { return 0 }
-func F4() float32 { return 0 }
-func F5(a, b, c int, u, v, w struct{ x, y T1 }, more ...interface{}) (p, q, r chan<- T10)
-
-func (p *T1) M1()
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue15920.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue15920.go
deleted file mode 100644
index c70f7d8267..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue15920.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package p
-
-// The underlying type of Error is the underlying type of error.
-// Make sure we can import this again without problems.
-type Error error
-
-func F() Error { return nil }
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue20046.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue20046.go
deleted file mode 100644
index c63ee821c9..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/issue20046.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package p
-
-var V interface {
-	M()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/p.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/p.go
deleted file mode 100644
index 9e2e705765..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/p.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Input for TestIssue15517
-
-package p
-
-const C = 0
-
-var V int
-
-func F() {}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test.go b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test.go
deleted file mode 100644
index ac9c968c2d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// To create a test case for a new export format version,
-// build this package with the latest compiler and store
-// the resulting .a file appropriately named in the versions
-// directory. The VersionHandling test will pick it up.
-//
-// In the testdata/versions:
-//
-// go build -o test_go1.$X_$Y.a test.go
-//
-// with $X = Go version and $Y = export format version.
-//
-// Make sure this source is extended such that it exercises
-// whatever export format change has taken place.
-
-package test
-
-// Any release before and including Go 1.7 didn't encode
-// the package for a blank struct field.
-type BlankField struct {
-	_ int
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_0.a b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_0.a
deleted file mode 100644
index edb6c3f25a..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_0.a and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_1.a b/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_1.a
deleted file mode 100644
index 554d04a72a..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/gcimporter15/testdata/versions/test_go1.7_1.a and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/backdoor.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/backdoor.go
deleted file mode 100644
index 4feb0dc641..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/backdoor.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package gccgoimporter
-
-// This file opens a back door to the parser for golang.org/x/tools/go/gccgoexportdata.
-
-import (
-	"go/types"
-	"io"
-)
-
-// Parse reads and parses gccgo export data from in and constructs a
-// Package, inserting it into the imports map.
-func Parse(in io.Reader, imports map[string]*types.Package, path string) (_ *types.Package, err error) {
-	var p parser
-	p.init(path, in, imports)
-	defer func() {
-		switch x := recover().(type) {
-		case nil:
-			// success
-		case importError:
-			err = x
-		default:
-			panic(x) // resume unexpected panic
-		}
-	}()
-	pkg := p.parsePackage()
-	imports[path] = pkg
-	return pkg, err
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation.go
deleted file mode 100644
index cebfc571bf..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gccgoimporter
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/gccgoinstallation.go.
-
-import (
-	"bufio"
-	"go/types"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-// Information about a specific installation of gccgo.
-type GccgoInstallation struct {
-	// Version of gcc (e.g. 4.8.0).
-	GccVersion string
-
-	// Target triple (e.g. x86_64-unknown-linux-gnu).
-	TargetTriple string
-
-	// Built-in library paths used by this installation.
-	LibPaths []string
-}
-
-// Ask the driver at the given path for information for this GccgoInstallation.
-// The given arguments are passed directly to the call to the driver.
-func (inst *GccgoInstallation) InitFromDriver(gccgoPath string, args ...string) (err error) {
-	argv := append([]string{"-###", "-S", "-x", "go", "-"}, args...)
-	cmd := exec.Command(gccgoPath, argv...)
-	stderr, err := cmd.StderrPipe()
-	if err != nil {
-		return
-	}
-
-	err = cmd.Start()
-	if err != nil {
-		return
-	}
-
-	scanner := bufio.NewScanner(stderr)
-	for scanner.Scan() {
-		line := scanner.Text()
-		switch {
-		case strings.HasPrefix(line, "Target: "):
-			inst.TargetTriple = line[8:]
-
-		case line[0] == ' ':
-			args := strings.Fields(line)
-			for _, arg := range args[1:] {
-				if strings.HasPrefix(arg, "-L") {
-					inst.LibPaths = append(inst.LibPaths, arg[2:])
-				}
-			}
-		}
-	}
-
-	argv = append([]string{"-dumpversion"}, args...)
-	stdout, err := exec.Command(gccgoPath, argv...).Output()
-	if err != nil {
-		return
-	}
-	inst.GccVersion = strings.TrimSpace(string(stdout))
-
-	return
-}
-
-// Return the list of export search paths for this GccgoInstallation.
-func (inst *GccgoInstallation) SearchPaths() (paths []string) {
-	for _, lpath := range inst.LibPaths {
-		spath := filepath.Join(lpath, "go", inst.GccVersion)
-		fi, err := os.Stat(spath)
-		if err != nil || !fi.IsDir() {
-			continue
-		}
-		paths = append(paths, spath)
-
-		spath = filepath.Join(spath, inst.TargetTriple)
-		fi, err = os.Stat(spath)
-		if err != nil || !fi.IsDir() {
-			continue
-		}
-		paths = append(paths, spath)
-	}
-
-	paths = append(paths, inst.LibPaths...)
-
-	return
-}
-
-// Return an importer that searches incpaths followed by the gcc installation's
-// built-in search paths and the current directory.
-func (inst *GccgoInstallation) GetImporter(incpaths []string, initmap map[*types.Package]InitData) Importer {
-	return GetImporter(append(append(incpaths, inst.SearchPaths()...), "."), initmap)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation_test.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation_test.go
deleted file mode 100644
index fb1fa6d4b1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/gccgoinstallation_test.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gccgoimporter
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/gccgoinstallation_test.go.
-
-import (
-	"go/types"
-	"runtime"
-	"testing"
-)
-
-var importablePackages = [...]string{
-	"archive/tar",
-	"archive/zip",
-	"bufio",
-	"bytes",
-	"compress/bzip2",
-	"compress/flate",
-	"compress/gzip",
-	"compress/lzw",
-	"compress/zlib",
-	"container/heap",
-	"container/list",
-	"container/ring",
-	"crypto/aes",
-	"crypto/cipher",
-	"crypto/des",
-	"crypto/dsa",
-	"crypto/ecdsa",
-	"crypto/elliptic",
-	"crypto",
-	"crypto/hmac",
-	"crypto/md5",
-	"crypto/rand",
-	"crypto/rc4",
-	"crypto/rsa",
-	"crypto/sha1",
-	"crypto/sha256",
-	"crypto/sha512",
-	"crypto/subtle",
-	"crypto/tls",
-	"crypto/x509",
-	"crypto/x509/pkix",
-	"database/sql/driver",
-	"database/sql",
-	"debug/dwarf",
-	"debug/elf",
-	"debug/gosym",
-	"debug/macho",
-	"debug/pe",
-	"encoding/ascii85",
-	"encoding/asn1",
-	"encoding/base32",
-	"encoding/base64",
-	"encoding/binary",
-	"encoding/csv",
-	"encoding/gob",
-	"encoding",
-	"encoding/hex",
-	"encoding/json",
-	"encoding/pem",
-	"encoding/xml",
-	"errors",
-	"exp/proxy",
-	"exp/terminal",
-	"expvar",
-	"flag",
-	"fmt",
-	"go/ast",
-	"go/build",
-	"go/doc",
-	"go/format",
-	"go/parser",
-	"go/printer",
-	"go/scanner",
-	"go/token",
-	"hash/adler32",
-	"hash/crc32",
-	"hash/crc64",
-	"hash/fnv",
-	"hash",
-	"html",
-	"html/template",
-	"image/color",
-	"image/color/palette",
-	"image/draw",
-	"image/gif",
-	"image",
-	"image/jpeg",
-	"image/png",
-	"index/suffixarray",
-	"io",
-	"io/ioutil",
-	"log",
-	"log/syslog",
-	"math/big",
-	"math/cmplx",
-	"math",
-	"math/rand",
-	"mime",
-	"mime/multipart",
-	"net",
-	"net/http/cgi",
-	"net/http/cookiejar",
-	"net/http/fcgi",
-	"net/http",
-	"net/http/httptest",
-	"net/http/httputil",
-	"net/http/pprof",
-	"net/mail",
-	"net/rpc",
-	"net/rpc/jsonrpc",
-	"net/smtp",
-	"net/textproto",
-	"net/url",
-	"old/regexp",
-	"old/template",
-	"os/exec",
-	"os",
-	"os/signal",
-	"os/user",
-	"path/filepath",
-	"path",
-	"reflect",
-	"regexp",
-	"regexp/syntax",
-	"runtime/debug",
-	"runtime",
-	"runtime/pprof",
-	"sort",
-	"strconv",
-	"strings",
-	"sync/atomic",
-	"sync",
-	"syscall",
-	"testing",
-	"testing/iotest",
-	"testing/quick",
-	"text/scanner",
-	"text/tabwriter",
-	"text/template",
-	"text/template/parse",
-	"time",
-	"unicode",
-	"unicode/utf16",
-	"unicode/utf8",
-}
-
-func TestInstallationImporter(t *testing.T) {
-	// This test relies on gccgo being around, which it most likely will be if we
-	// were compiled with gccgo.
-	if runtime.Compiler != "gccgo" {
-		t.Skip("This test needs gccgo")
-		return
-	}
-
-	var inst GccgoInstallation
-	err := inst.InitFromDriver("gccgo")
-	if err != nil {
-		t.Fatal(err)
-	}
-	imp := inst.GetImporter(nil, nil)
-
-	// Ensure we don't regress the number of packages we can parse. First import
-	// all packages into the same map and then each individually.
-	pkgMap := make(map[string]*types.Package)
-	for _, pkg := range importablePackages {
-		_, err = imp(pkgMap, pkg)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-
-	for _, pkg := range importablePackages {
-		_, err = imp(make(map[string]*types.Package), pkg)
-		if err != nil {
-			t.Error(err)
-		}
-	}
-
-	// Test for certain specific entities in the imported data.
-	for _, test := range [...]importerTest{
-		{pkgpath: "io", name: "Reader", want: "type Reader interface{Read(p []uint8) (n int, err error)}"},
-		{pkgpath: "io", name: "ReadWriter", want: "type ReadWriter interface{Reader; Writer}"},
-		{pkgpath: "math", name: "Pi", want: "const Pi untyped float"},
-		{pkgpath: "math", name: "Sin", want: "func Sin(x float64) float64"},
-		{pkgpath: "sort", name: "Ints", want: "func Ints(a []int)"},
-		{pkgpath: "unsafe", name: "Pointer", want: "type Pointer unsafe.Pointer"},
-	} {
-		runImporterTest(t, imp, nil, &test)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer.go
deleted file mode 100644
index a3fae9aa52..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer.go
+++ /dev/null
@@ -1,209 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package gccgoimporter implements Import for gccgo-generated object files.
-package gccgoimporter // import "golang.org/x/tools/go/internal/gccgoimporter"
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/importer.go.
-
-import (
-	"bytes"
-	"debug/elf"
-	"fmt"
-	"go/types"
-	"io"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-// A PackageInit describes an imported package that needs initialization.
-type PackageInit struct {
-	Name     string // short package name
-	InitFunc string // name of init function
-	Priority int    // priority of init function, see InitData.Priority
-}
-
-// The gccgo-specific init data for a package.
-type InitData struct {
-	// Initialization priority of this package relative to other packages.
-	// This is based on the maximum depth of the package's dependency graph;
-	// it is guaranteed to be greater than that of its dependencies.
-	Priority int
-
-	// The list of packages which this package depends on to be initialized,
-	// including itself if needed. This is the subset of the transitive closure of
-	// the package's dependencies that need initialization.
-	Inits []PackageInit
-}
-
-// Locate the file from which to read export data.
-// This is intended to replicate the logic in gofrontend.
-func findExportFile(searchpaths []string, pkgpath string) (string, error) {
-	for _, spath := range searchpaths {
-		pkgfullpath := filepath.Join(spath, pkgpath)
-		pkgdir, name := filepath.Split(pkgfullpath)
-
-		for _, filepath := range [...]string{
-			pkgfullpath,
-			pkgfullpath + ".gox",
-			pkgdir + "lib" + name + ".so",
-			pkgdir + "lib" + name + ".a",
-			pkgfullpath + ".o",
-		} {
-			fi, err := os.Stat(filepath)
-			if err == nil && !fi.IsDir() {
-				return filepath, nil
-			}
-		}
-	}
-
-	return "", fmt.Errorf("%s: could not find export data (tried %s)", pkgpath, strings.Join(searchpaths, ":"))
-}
-
-const (
-	gccgov1Magic    = "v1;\n"
-	gccgov2Magic    = "v2;\n"
-	goimporterMagic = "\n$$ "
-	archiveMagic    = "!<ar"
-)
-
-// Opens the export data file at the given path. If this is an ELF file,
-// searches for and opens the .go_export section. If this is an archive,
-// reads the export data from the first member, which is assumed to be an ELF file.
-// This is intended to replicate the logic in gofrontend.
-func openExportFile(fpath string) (reader io.ReadSeeker, closer io.Closer, err error) {
-	f, err := os.Open(fpath)
-	if err != nil {
-		return
-	}
-	closer = f
-	defer func() {
-		if err != nil && closer != nil {
-			f.Close()
-		}
-	}()
-
-	var magic [4]byte
-	_, err = f.ReadAt(magic[:], 0)
-	if err != nil {
-		return
-	}
-
-	var elfreader io.ReaderAt
-	switch string(magic[:]) {
-	case gccgov1Magic, gccgov2Magic, goimporterMagic:
-		// Raw export data.
-		reader = f
-		return
-
-	case archiveMagic:
-		// TODO(pcc): Read the archive directly instead of using "ar".
-		f.Close()
-		closer = nil
-
-		cmd := exec.Command("ar", "p", fpath)
-		var out []byte
-		out, err = cmd.Output()
-		if err != nil {
-			return
-		}
-
-		elfreader = bytes.NewReader(out)
-
-	default:
-		elfreader = f
-	}
-
-	ef, err := elf.NewFile(elfreader)
-	if err != nil {
-		return
-	}
-
-	sec := ef.Section(".go_export")
-	if sec == nil {
-		err = fmt.Errorf("%s: .go_export section not found", fpath)
-		return
-	}
-
-	reader = sec.Open()
-	return
-}
-
-// An Importer resolves import paths to Packages. The imports map records
-// packages already known, indexed by package path.
-// An importer must determine the canonical package path and check imports
-// to see if it is already present in the map. If so, the Importer can return
-// the map entry. Otherwise, the importer must load the package data for the
-// given path into a new *Package, record it in imports map, and return the
-// package.
-type Importer func(imports map[string]*types.Package, path string) (*types.Package, error)
-
-func GetImporter(searchpaths []string, initmap map[*types.Package]InitData) Importer {
-	return func(imports map[string]*types.Package, pkgpath string) (pkg *types.Package, err error) {
-		if pkgpath == "unsafe" {
-			return types.Unsafe, nil
-		}
-
-		fpath, err := findExportFile(searchpaths, pkgpath)
-		if err != nil {
-			return
-		}
-
-		reader, closer, err := openExportFile(fpath)
-		if err != nil {
-			return
-		}
-		if closer != nil {
-			defer closer.Close()
-		}
-
-		var magic [4]byte
-		_, err = reader.Read(magic[:])
-		if err != nil {
-			return
-		}
-		_, err = reader.Seek(0, 0) // 0 bytes after start (use 0, io.SeekStart when we drop Go 1.6)
-		if err != nil {
-			return
-		}
-
-		switch string(magic[:]) {
-		case gccgov1Magic, gccgov2Magic:
-			var p parser
-			p.init(fpath, reader, imports)
-			pkg = p.parsePackage()
-			if initmap != nil {
-				initmap[pkg] = p.initdata
-			}
-
-		// Excluded for now: Standard gccgo doesn't support this import format currently.
-		// case goimporterMagic:
-		// 	var data []byte
-		// 	data, err = ioutil.ReadAll(reader)
-		// 	if err != nil {
-		// 		return
-		// 	}
-		// 	var n int
-		// 	n, pkg, err = importer.ImportData(imports, data)
-		// 	if err != nil {
-		// 		return
-		// 	}
-
-		// 	if initmap != nil {
-		// 		suffixreader := bytes.NewReader(data[n:])
-		// 		var p parser
-		// 		p.init(fpath, suffixreader, nil)
-		// 		p.parseInitData()
-		// 		initmap[pkg] = p.initdata
-		// 	}
-
-		default:
-			err = fmt.Errorf("unrecognized magic string: %q", string(magic[:]))
-		}
-
-		return
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer19_test.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer19_test.go
deleted file mode 100644
index 0caa2256f1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer19_test.go
+++ /dev/null
@@ -1,15 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.9
-
-package gccgoimporter
-
-var aliasTests = []importerTest{
-	{pkgpath: "alias", name: "IntAlias2", want: "type IntAlias2 = Int"},
-}
-
-func init() {
-	importerTests = append(importerTests, aliasTests...)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer_test.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer_test.go
deleted file mode 100644
index 87b5ff2a93..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/importer_test.go
+++ /dev/null
@@ -1,178 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gccgoimporter
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/importer_test.go
-// except for the importerTests variable which does not contain Go1.9-specific tests.
-// Those are added via importer19_test.go.
-
-import (
-	"go/types"
-	"io/ioutil"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"testing"
-)
-
-type importerTest struct {
-	pkgpath, name, want, wantval string
-	wantinits                    []string
-}
-
-func runImporterTest(t *testing.T, imp Importer, initmap map[*types.Package]InitData, test *importerTest) {
-	pkg, err := imp(make(map[string]*types.Package), test.pkgpath)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	if test.name != "" {
-		obj := pkg.Scope().Lookup(test.name)
-		if obj == nil {
-			t.Errorf("%s: object not found", test.name)
-			return
-		}
-
-		got := types.ObjectString(obj, types.RelativeTo(pkg))
-		if got != test.want {
-			t.Errorf("%s: got %q; want %q", test.name, got, test.want)
-		}
-
-		if test.wantval != "" {
-			gotval := obj.(*types.Const).Val().String()
-			if gotval != test.wantval {
-				t.Errorf("%s: got val %q; want val %q", test.name, gotval, test.wantval)
-			}
-		}
-	}
-
-	if len(test.wantinits) > 0 {
-		initdata := initmap[pkg]
-		found := false
-		// Check that the package's own init function has the package's priority
-		for _, pkginit := range initdata.Inits {
-			if pkginit.InitFunc == test.wantinits[0] {
-				if initdata.Priority != pkginit.Priority {
-					t.Errorf("%s: got self priority %d; want %d", test.pkgpath, pkginit.Priority, initdata.Priority)
-				}
-				found = true
-				break
-			}
-		}
-
-		if !found {
-			t.Errorf("%s: could not find expected function %q", test.pkgpath, test.wantinits[0])
-		}
-
-		// Each init function in the list other than the first one is a
-		// dependency of the function immediately before it. Check that
-		// the init functions appear in descending priority order.
-		priority := initdata.Priority
-		for _, wantdepinit := range test.wantinits[1:] {
-			found = false
-			for _, pkginit := range initdata.Inits {
-				if pkginit.InitFunc == wantdepinit {
-					if priority <= pkginit.Priority {
-						t.Errorf("%s: got dep priority %d; want less than %d", test.pkgpath, pkginit.Priority, priority)
-					}
-					found = true
-					priority = pkginit.Priority
-					break
-				}
-			}
-
-			if !found {
-				t.Errorf("%s: could not find expected function %q", test.pkgpath, wantdepinit)
-			}
-		}
-	}
-}
-
-var importerTests = []importerTest{
-	{pkgpath: "pointer", name: "Int8Ptr", want: "type Int8Ptr *int8"},
-	{pkgpath: "complexnums", name: "NN", want: "const NN untyped complex", wantval: "(-1 + -1i)"},
-	{pkgpath: "complexnums", name: "NP", want: "const NP untyped complex", wantval: "(-1 + 1i)"},
-	{pkgpath: "complexnums", name: "PN", want: "const PN untyped complex", wantval: "(1 + -1i)"},
-	{pkgpath: "complexnums", name: "PP", want: "const PP untyped complex", wantval: "(1 + 1i)"},
-	{pkgpath: "conversions", name: "Bits", want: "const Bits Units", wantval: `"bits"`},
-	{pkgpath: "time", name: "Duration", want: "type Duration int64"},
-	{pkgpath: "time", name: "Nanosecond", want: "const Nanosecond Duration", wantval: "1"},
-	{pkgpath: "unicode", name: "IsUpper", want: "func IsUpper(r rune) bool"},
-	{pkgpath: "unicode", name: "MaxRune", want: "const MaxRune untyped rune", wantval: "1114111"},
-	{pkgpath: "imports", wantinits: []string{"imports..import", "fmt..import", "math..import"}},
-}
-
-func TestGoxImporter(t *testing.T) {
-	testenv.MustHaveGoBuild(t)
-
-	initmap := make(map[*types.Package]InitData)
-	imp := GetImporter([]string{"testdata"}, initmap)
-
-	for _, test := range importerTests {
-		runImporterTest(t, imp, initmap, &test)
-	}
-}
-
-func TestObjImporter(t *testing.T) {
-	testenv.MustHaveGoBuild(t)
-
-	// This test relies on gccgo being around, which it most likely will be if we
-	// were compiled with gccgo.
-	if runtime.Compiler != "gccgo" {
-		t.Skip("This test needs gccgo")
-		return
-	}
-
-	tmpdir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	initmap := make(map[*types.Package]InitData)
-	imp := GetImporter([]string{tmpdir}, initmap)
-
-	artmpdir, err := ioutil.TempDir("", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-	arinitmap := make(map[*types.Package]InitData)
-	arimp := GetImporter([]string{artmpdir}, arinitmap)
-
-	for _, test := range importerTests {
-		gofile := filepath.Join("testdata", test.pkgpath+".go")
-		ofile := filepath.Join(tmpdir, test.pkgpath+".o")
-		afile := filepath.Join(artmpdir, "lib"+test.pkgpath+".a")
-
-		cmd := exec.Command("gccgo", "-fgo-pkgpath="+test.pkgpath, "-c", "-o", ofile, gofile)
-		out, err := cmd.CombinedOutput()
-		if err != nil {
-			t.Logf("%s", out)
-			t.Fatalf("gccgo %s failed: %s", gofile, err)
-		}
-
-		runImporterTest(t, imp, initmap, &test)
-
-		cmd = exec.Command("ar", "cr", afile, ofile)
-		out, err = cmd.CombinedOutput()
-		if err != nil {
-			t.Logf("%s", out)
-			t.Fatalf("ar cr %s %s failed: %s", afile, ofile, err)
-		}
-
-		runImporterTest(t, arimp, arinitmap, &test)
-
-		if err = os.Remove(ofile); err != nil {
-			t.Fatal(err)
-		}
-		if err = os.Remove(afile); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	if err = os.Remove(tmpdir); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser.go
deleted file mode 100644
index 08e3bb9918..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser.go
+++ /dev/null
@@ -1,902 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gccgoimporter
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/parser.go.
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"go/constant"
-	"go/token"
-	"go/types"
-	"io"
-	"strconv"
-	"strings"
-	"text/scanner"
-)
-
-type parser struct {
-	scanner  scanner.Scanner
-	version  string                    // format version
-	tok      rune                      // current token
-	lit      string                    // literal string; only valid for Ident, Int, String tokens
-	pkgpath  string                    // package path of imported package
-	pkgname  string                    // name of imported package
-	pkg      *types.Package            // reference to imported package
-	imports  map[string]*types.Package // package path -> package object
-	typeMap  map[int]types.Type        // type number -> type
-	initdata InitData                  // package init priority data
-}
-
-func (p *parser) init(filename string, src io.Reader, imports map[string]*types.Package) {
-	p.scanner.Init(src)
-	p.scanner.Error = func(_ *scanner.Scanner, msg string) { p.error(msg) }
-	p.scanner.Mode = scanner.ScanIdents | scanner.ScanInts | scanner.ScanFloats | scanner.ScanStrings | scanner.ScanComments | scanner.SkipComments
-	p.scanner.Whitespace = 1<<'\t' | 1<<'\n' | 1<<' '
-	p.scanner.Filename = filename // for good error messages
-	p.next()
-	p.imports = imports
-	p.typeMap = make(map[int]types.Type)
-}
-
-type importError struct {
-	pos scanner.Position
-	err error
-}
-
-func (e importError) Error() string {
-	return fmt.Sprintf("import error %s (byte offset = %d): %s", e.pos, e.pos.Offset, e.err)
-}
-
-func (p *parser) error(err interface{}) {
-	if s, ok := err.(string); ok {
-		err = errors.New(s)
-	}
-	// panic with a runtime.Error if err is not an error
-	panic(importError{p.scanner.Pos(), err.(error)})
-}
-
-func (p *parser) errorf(format string, args ...interface{}) {
-	p.error(fmt.Errorf(format, args...))
-}
-
-func (p *parser) expect(tok rune) string {
-	lit := p.lit
-	if p.tok != tok {
-		p.errorf("expected %s, got %s (%s)", scanner.TokenString(tok), scanner.TokenString(p.tok), lit)
-	}
-	p.next()
-	return lit
-}
-
-func (p *parser) expectKeyword(keyword string) {
-	lit := p.expect(scanner.Ident)
-	if lit != keyword {
-		p.errorf("expected keyword %s, got %q", keyword, lit)
-	}
-}
-
-func (p *parser) parseString() string {
-	str, err := strconv.Unquote(p.expect(scanner.String))
-	if err != nil {
-		p.error(err)
-	}
-	return str
-}
-
-// unquotedString     = { unquotedStringChar } .
-// unquotedStringChar = <neither a whitespace nor a ';' char> .
-func (p *parser) parseUnquotedString() string {
-	if p.tok == scanner.EOF {
-		p.error("unexpected EOF")
-	}
-	var buf bytes.Buffer
-	buf.WriteString(p.scanner.TokenText())
-	// This loop needs to examine each character before deciding whether to consume it. If we see a semicolon,
-	// we need to let it be consumed by p.next().
-	for ch := p.scanner.Peek(); ch != ';' && ch != scanner.EOF && p.scanner.Whitespace&(1<<uint(ch)) == 0; ch = p.scanner.Peek() {
-		buf.WriteRune(ch)
-		p.scanner.Next()
-	}
-	p.next()
-	return buf.String()
-}
-
-func (p *parser) next() {
-	p.tok = p.scanner.Scan()
-	switch p.tok {
-	case scanner.Ident, scanner.Int, scanner.Float, scanner.String, '·':
-		p.lit = p.scanner.TokenText()
-	default:
-		p.lit = ""
-	}
-}
-
-func (p *parser) parseQualifiedName() (path, name string) {
-	return p.parseQualifiedNameStr(p.parseString())
-}
-
-func (p *parser) parseUnquotedQualifiedName() (path, name string) {
-	return p.parseQualifiedNameStr(p.parseUnquotedString())
-}
-
-// qualifiedName = [ ["."] unquotedString "." ] unquotedString .
-//
-// The above production uses greedy matching.
-func (p *parser) parseQualifiedNameStr(unquotedName string) (pkgpath, name string) {
-	parts := strings.Split(unquotedName, ".")
-	if parts[0] == "" {
-		parts = parts[1:]
-	}
-
-	switch len(parts) {
-	case 0:
-		p.errorf("malformed qualified name: %q", unquotedName)
-	case 1:
-		// unqualified name
-		pkgpath = p.pkgpath
-		name = parts[0]
-	default:
-		// qualified name, which may contain periods
-		pkgpath = strings.Join(parts[0:len(parts)-1], ".")
-		name = parts[len(parts)-1]
-	}
-
-	return
-}
-
-// getPkg returns the package for a given path. If the package is
-// not found but we have a package name, create the package and
-// add it to the p.imports map.
-//
-func (p *parser) getPkg(pkgpath, name string) *types.Package {
-	// package unsafe is not in the imports map - handle explicitly
-	if pkgpath == "unsafe" {
-		return types.Unsafe
-	}
-	pkg := p.imports[pkgpath]
-	if pkg == nil && name != "" {
-		pkg = types.NewPackage(pkgpath, name)
-		p.imports[pkgpath] = pkg
-	}
-	return pkg
-}
-
-// parseExportedName is like parseQualifiedName, but
-// the package path is resolved to an imported *types.Package.
-//
-// ExportedName = string [string] .
-func (p *parser) parseExportedName() (pkg *types.Package, name string) {
-	path, name := p.parseQualifiedName()
-	var pkgname string
-	if p.tok == scanner.String {
-		pkgname = p.parseString()
-	}
-	pkg = p.getPkg(path, pkgname)
-	if pkg == nil {
-		p.errorf("package %s (path = %q) not found", name, path)
-	}
-	return
-}
-
-// Name = QualifiedName | "?" .
-func (p *parser) parseName() string {
-	if p.tok == '?' {
-		// Anonymous.
-		p.next()
-		return ""
-	}
-	// The package path is redundant for us. Don't try to parse it.
-	_, name := p.parseUnquotedQualifiedName()
-	return name
-}
-
-func deref(typ types.Type) types.Type {
-	if p, _ := typ.(*types.Pointer); p != nil {
-		typ = p.Elem()
-	}
-	return typ
-}
-
-// Field = Name Type [string] .
-func (p *parser) parseField(pkg *types.Package) (field *types.Var, tag string) {
-	name := p.parseName()
-	typ := p.parseType(pkg)
-	anon := false
-	if name == "" {
-		anon = true
-		switch typ := deref(typ).(type) {
-		case *types.Basic:
-			name = typ.Name()
-		case *types.Named:
-			name = typ.Obj().Name()
-		default:
-			p.error("anonymous field expected")
-		}
-	}
-	field = types.NewField(token.NoPos, pkg, name, typ, anon)
-	if p.tok == scanner.String {
-		tag = p.parseString()
-	}
-	return
-}
-
-// Param = Name ["..."] Type .
-func (p *parser) parseParam(pkg *types.Package) (param *types.Var, isVariadic bool) {
-	name := p.parseName()
-	if p.tok == '.' {
-		p.next()
-		p.expect('.')
-		p.expect('.')
-		isVariadic = true
-	}
-	typ := p.parseType(pkg)
-	if isVariadic {
-		typ = types.NewSlice(typ)
-	}
-	param = types.NewParam(token.NoPos, pkg, name, typ)
-	return
-}
-
-// Var = Name Type .
-func (p *parser) parseVar(pkg *types.Package) *types.Var {
-	name := p.parseName()
-	return types.NewVar(token.NoPos, pkg, name, p.parseType(pkg))
-}
-
-// Conversion = "convert" "(" Type "," ConstValue ")" .
-func (p *parser) parseConversion(pkg *types.Package) (val constant.Value, typ types.Type) {
-	p.expectKeyword("convert")
-	p.expect('(')
-	typ = p.parseType(pkg)
-	p.expect(',')
-	val, _ = p.parseConstValue(pkg)
-	p.expect(')')
-	return
-}
-
-// ConstValue     = string | "false" | "true" | ["-"] (int ["'"] | FloatOrComplex) | Conversion .
-// FloatOrComplex = float ["i" | ("+"|"-") float "i"] .
-func (p *parser) parseConstValue(pkg *types.Package) (val constant.Value, typ types.Type) {
-	switch p.tok {
-	case scanner.String:
-		str := p.parseString()
-		val = constant.MakeString(str)
-		typ = types.Typ[types.UntypedString]
-		return
-
-	case scanner.Ident:
-		b := false
-		switch p.lit {
-		case "false":
-		case "true":
-			b = true
-
-		case "convert":
-			return p.parseConversion(pkg)
-
-		default:
-			p.errorf("expected const value, got %s (%q)", scanner.TokenString(p.tok), p.lit)
-		}
-
-		p.next()
-		val = constant.MakeBool(b)
-		typ = types.Typ[types.UntypedBool]
-		return
-	}
-
-	sign := ""
-	if p.tok == '-' {
-		p.next()
-		sign = "-"
-	}
-
-	switch p.tok {
-	case scanner.Int:
-		val = constant.MakeFromLiteral(sign+p.lit, token.INT, 0)
-		if val == nil {
-			p.error("could not parse integer literal")
-		}
-
-		p.next()
-		if p.tok == '\'' {
-			p.next()
-			typ = types.Typ[types.UntypedRune]
-		} else {
-			typ = types.Typ[types.UntypedInt]
-		}
-
-	case scanner.Float:
-		re := sign + p.lit
-		p.next()
-
-		var im string
-		switch p.tok {
-		case '+':
-			p.next()
-			im = p.expect(scanner.Float)
-
-		case '-':
-			p.next()
-			im = "-" + p.expect(scanner.Float)
-
-		case scanner.Ident:
-			// re is in fact the imaginary component. Expect "i" below.
-			im = re
-			re = "0"
-
-		default:
-			val = constant.MakeFromLiteral(re, token.FLOAT, 0)
-			if val == nil {
-				p.error("could not parse float literal")
-			}
-			typ = types.Typ[types.UntypedFloat]
-			return
-		}
-
-		p.expectKeyword("i")
-		reval := constant.MakeFromLiteral(re, token.FLOAT, 0)
-		if reval == nil {
-			p.error("could not parse real component of complex literal")
-		}
-		imval := constant.MakeFromLiteral(im+"i", token.IMAG, 0)
-		if imval == nil {
-			p.error("could not parse imag component of complex literal")
-		}
-		val = constant.BinaryOp(reval, token.ADD, imval)
-		typ = types.Typ[types.UntypedComplex]
-
-	default:
-		p.errorf("expected const value, got %s (%q)", scanner.TokenString(p.tok), p.lit)
-	}
-
-	return
-}
-
-// Const = Name [Type] "=" ConstValue .
-func (p *parser) parseConst(pkg *types.Package) *types.Const {
-	name := p.parseName()
-	var typ types.Type
-	if p.tok == '<' {
-		typ = p.parseType(pkg)
-	}
-	p.expect('=')
-	val, vtyp := p.parseConstValue(pkg)
-	if typ == nil {
-		typ = vtyp
-	}
-	return types.NewConst(token.NoPos, pkg, name, typ, val)
-}
-
-// NamedType = TypeName [ "=" ] Type { Method } .
-// TypeName  = ExportedName .
-// Method    = "func" "(" Param ")" Name ParamList ResultList ";" .
-func (p *parser) parseNamedType(n int) types.Type {
-	pkg, name := p.parseExportedName()
-	scope := pkg.Scope()
-
-	if p.tok == '=' {
-		// type alias
-		p.next()
-		typ := p.parseType(pkg)
-		if obj := scope.Lookup(name); obj != nil {
-			typ = obj.Type() // use previously imported type
-			if typ == nil {
-				p.errorf("%v (type alias) used in cycle", obj)
-			}
-		} else {
-			obj = types.NewTypeName(token.NoPos, pkg, name, typ)
-			scope.Insert(obj)
-		}
-		p.typeMap[n] = typ
-		return typ
-	}
-
-	// named type
-	obj := scope.Lookup(name)
-	if obj == nil {
-		// a named type may be referred to before the underlying type
-		// is known - set it up
-		tname := types.NewTypeName(token.NoPos, pkg, name, nil)
-		types.NewNamed(tname, nil, nil)
-		scope.Insert(tname)
-		obj = tname
-	}
-
-	typ := obj.Type()
-	p.typeMap[n] = typ
-
-	nt, ok := typ.(*types.Named)
-	if !ok {
-		// This can happen for unsafe.Pointer, which is a TypeName holding a Basic type.
-		pt := p.parseType(pkg)
-		if pt != typ {
-			p.error("unexpected underlying type for non-named TypeName")
-		}
-		return typ
-	}
-
-	underlying := p.parseType(pkg)
-	if nt.Underlying() == nil {
-		nt.SetUnderlying(underlying.Underlying())
-	}
-
-	// collect associated methods
-	for p.tok == scanner.Ident {
-		p.expectKeyword("func")
-		p.expect('(')
-		receiver, _ := p.parseParam(pkg)
-		p.expect(')')
-		name := p.parseName()
-		params, isVariadic := p.parseParamList(pkg)
-		results := p.parseResultList(pkg)
-		p.expect(';')
-
-		sig := types.NewSignature(receiver, params, results, isVariadic)
-		nt.AddMethod(types.NewFunc(token.NoPos, pkg, name, sig))
-	}
-
-	return nt
-}
-
-func (p *parser) parseInt() int64 {
-	lit := p.expect(scanner.Int)
-	n, err := strconv.ParseInt(lit, 10, 0)
-	if err != nil {
-		p.error(err)
-	}
-	return n
-}
-
-// ArrayOrSliceType = "[" [ int ] "]" Type .
-func (p *parser) parseArrayOrSliceType(pkg *types.Package) types.Type {
-	p.expect('[')
-	if p.tok == ']' {
-		p.next()
-		return types.NewSlice(p.parseType(pkg))
-	}
-
-	n := p.parseInt()
-	p.expect(']')
-	return types.NewArray(p.parseType(pkg), n)
-}
-
-// MapType = "map" "[" Type "]" Type .
-func (p *parser) parseMapType(pkg *types.Package) types.Type {
-	p.expectKeyword("map")
-	p.expect('[')
-	key := p.parseType(pkg)
-	p.expect(']')
-	elem := p.parseType(pkg)
-	return types.NewMap(key, elem)
-}
-
-// ChanType = "chan" ["<-" | "-<"] Type .
-func (p *parser) parseChanType(pkg *types.Package) types.Type {
-	p.expectKeyword("chan")
-	dir := types.SendRecv
-	switch p.tok {
-	case '-':
-		p.next()
-		p.expect('<')
-		dir = types.SendOnly
-
-	case '<':
-		// don't consume '<' if it belongs to Type
-		if p.scanner.Peek() == '-' {
-			p.next()
-			p.expect('-')
-			dir = types.RecvOnly
-		}
-	}
-
-	return types.NewChan(dir, p.parseType(pkg))
-}
-
-// StructType = "struct" "{" { Field } "}" .
-func (p *parser) parseStructType(pkg *types.Package) types.Type {
-	p.expectKeyword("struct")
-
-	var fields []*types.Var
-	var tags []string
-
-	p.expect('{')
-	for p.tok != '}' && p.tok != scanner.EOF {
-		field, tag := p.parseField(pkg)
-		p.expect(';')
-		fields = append(fields, field)
-		tags = append(tags, tag)
-	}
-	p.expect('}')
-
-	return types.NewStruct(fields, tags)
-}
-
-// ParamList = "(" [ { Parameter "," } Parameter ] ")" .
-func (p *parser) parseParamList(pkg *types.Package) (*types.Tuple, bool) {
-	var list []*types.Var
-	isVariadic := false
-
-	p.expect('(')
-	for p.tok != ')' && p.tok != scanner.EOF {
-		if len(list) > 0 {
-			p.expect(',')
-		}
-		par, variadic := p.parseParam(pkg)
-		list = append(list, par)
-		if variadic {
-			if isVariadic {
-				p.error("... not on final argument")
-			}
-			isVariadic = true
-		}
-	}
-	p.expect(')')
-
-	return types.NewTuple(list...), isVariadic
-}
-
-// ResultList = Type | ParamList .
-func (p *parser) parseResultList(pkg *types.Package) *types.Tuple {
-	switch p.tok {
-	case '<':
-		return types.NewTuple(types.NewParam(token.NoPos, pkg, "", p.parseType(pkg)))
-
-	case '(':
-		params, _ := p.parseParamList(pkg)
-		return params
-
-	default:
-		return nil
-	}
-}
-
-// FunctionType = ParamList ResultList .
-func (p *parser) parseFunctionType(pkg *types.Package) *types.Signature {
-	params, isVariadic := p.parseParamList(pkg)
-	results := p.parseResultList(pkg)
-	return types.NewSignature(nil, params, results, isVariadic)
-}
-
-// Func = Name FunctionType .
-func (p *parser) parseFunc(pkg *types.Package) *types.Func {
-	name := p.parseName()
-	if strings.ContainsRune(name, '$') {
-		// This is a Type$equal or Type$hash function, which we don't want to parse,
-		// except for the types.
-		p.discardDirectiveWhileParsingTypes(pkg)
-		return nil
-	}
-	return types.NewFunc(token.NoPos, pkg, name, p.parseFunctionType(pkg))
-}
-
-// InterfaceType = "interface" "{" { ("?" Type | Func) ";" } "}" .
-func (p *parser) parseInterfaceType(pkg *types.Package) types.Type {
-	p.expectKeyword("interface")
-
-	var methods []*types.Func
-	var typs []*types.Named
-
-	p.expect('{')
-	for p.tok != '}' && p.tok != scanner.EOF {
-		if p.tok == '?' {
-			p.next()
-			typs = append(typs, p.parseType(pkg).(*types.Named))
-		} else {
-			method := p.parseFunc(pkg)
-			methods = append(methods, method)
-		}
-		p.expect(';')
-	}
-	p.expect('}')
-
-	return types.NewInterface(methods, typs)
-}
-
-// PointerType = "*" ("any" | Type) .
-func (p *parser) parsePointerType(pkg *types.Package) types.Type {
-	p.expect('*')
-	if p.tok == scanner.Ident {
-		p.expectKeyword("any")
-		return types.Typ[types.UnsafePointer]
-	}
-	return types.NewPointer(p.parseType(pkg))
-}
-
-// TypeDefinition = NamedType | MapType | ChanType | StructType | InterfaceType | PointerType | ArrayOrSliceType | FunctionType .
-func (p *parser) parseTypeDefinition(pkg *types.Package, n int) types.Type {
-	var t types.Type
-	switch p.tok {
-	case scanner.String:
-		t = p.parseNamedType(n)
-
-	case scanner.Ident:
-		switch p.lit {
-		case "map":
-			t = p.parseMapType(pkg)
-
-		case "chan":
-			t = p.parseChanType(pkg)
-
-		case "struct":
-			t = p.parseStructType(pkg)
-
-		case "interface":
-			t = p.parseInterfaceType(pkg)
-		}
-
-	case '*':
-		t = p.parsePointerType(pkg)
-
-	case '[':
-		t = p.parseArrayOrSliceType(pkg)
-
-	case '(':
-		t = p.parseFunctionType(pkg)
-	}
-
-	p.typeMap[n] = t
-	return t
-}
-
-const (
-	// From gofrontend/go/export.h
-	// Note that these values are negative in the gofrontend and have been made positive
-	// in the gccgoimporter.
-	gccgoBuiltinINT8       = 1
-	gccgoBuiltinINT16      = 2
-	gccgoBuiltinINT32      = 3
-	gccgoBuiltinINT64      = 4
-	gccgoBuiltinUINT8      = 5
-	gccgoBuiltinUINT16     = 6
-	gccgoBuiltinUINT32     = 7
-	gccgoBuiltinUINT64     = 8
-	gccgoBuiltinFLOAT32    = 9
-	gccgoBuiltinFLOAT64    = 10
-	gccgoBuiltinINT        = 11
-	gccgoBuiltinUINT       = 12
-	gccgoBuiltinUINTPTR    = 13
-	gccgoBuiltinBOOL       = 15
-	gccgoBuiltinSTRING     = 16
-	gccgoBuiltinCOMPLEX64  = 17
-	gccgoBuiltinCOMPLEX128 = 18
-	gccgoBuiltinERROR      = 19
-	gccgoBuiltinBYTE       = 20
-	gccgoBuiltinRUNE       = 21
-)
-
-func lookupBuiltinType(typ int) types.Type {
-	return [...]types.Type{
-		gccgoBuiltinINT8:       types.Typ[types.Int8],
-		gccgoBuiltinINT16:      types.Typ[types.Int16],
-		gccgoBuiltinINT32:      types.Typ[types.Int32],
-		gccgoBuiltinINT64:      types.Typ[types.Int64],
-		gccgoBuiltinUINT8:      types.Typ[types.Uint8],
-		gccgoBuiltinUINT16:     types.Typ[types.Uint16],
-		gccgoBuiltinUINT32:     types.Typ[types.Uint32],
-		gccgoBuiltinUINT64:     types.Typ[types.Uint64],
-		gccgoBuiltinFLOAT32:    types.Typ[types.Float32],
-		gccgoBuiltinFLOAT64:    types.Typ[types.Float64],
-		gccgoBuiltinINT:        types.Typ[types.Int],
-		gccgoBuiltinUINT:       types.Typ[types.Uint],
-		gccgoBuiltinUINTPTR:    types.Typ[types.Uintptr],
-		gccgoBuiltinBOOL:       types.Typ[types.Bool],
-		gccgoBuiltinSTRING:     types.Typ[types.String],
-		gccgoBuiltinCOMPLEX64:  types.Typ[types.Complex64],
-		gccgoBuiltinCOMPLEX128: types.Typ[types.Complex128],
-		gccgoBuiltinERROR:      types.Universe.Lookup("error").Type(),
-		gccgoBuiltinBYTE:       types.Universe.Lookup("byte").Type(),
-		gccgoBuiltinRUNE:       types.Universe.Lookup("rune").Type(),
-	}[typ]
-}
-
-// Type = "<" "type" ( "-" int | int [ TypeDefinition ] ) ">" .
-func (p *parser) parseType(pkg *types.Package) (t types.Type) {
-	p.expect('<')
-	p.expectKeyword("type")
-
-	switch p.tok {
-	case scanner.Int:
-		n := p.parseInt()
-
-		if p.tok == '>' {
-			t = p.typeMap[int(n)]
-		} else {
-			t = p.parseTypeDefinition(pkg, int(n))
-		}
-
-	case '-':
-		p.next()
-		n := p.parseInt()
-		t = lookupBuiltinType(int(n))
-
-	default:
-		p.errorf("expected type number, got %s (%q)", scanner.TokenString(p.tok), p.lit)
-		return nil
-	}
-
-	p.expect('>')
-	return
-}
-
-// PackageInit = unquotedString unquotedString int .
-func (p *parser) parsePackageInit() PackageInit {
-	name := p.parseUnquotedString()
-	initfunc := p.parseUnquotedString()
-	priority := -1
-	if p.version == "v1" {
-		priority = int(p.parseInt())
-	}
-	return PackageInit{Name: name, InitFunc: initfunc, Priority: priority}
-}
-
-// Throw away tokens until we see a ';'. If we see a '<', attempt to parse as a type.
-func (p *parser) discardDirectiveWhileParsingTypes(pkg *types.Package) {
-	for {
-		switch p.tok {
-		case ';':
-			return
-		case '<':
-			p.parseType(p.pkg)
-		case scanner.EOF:
-			p.error("unexpected EOF")
-		default:
-			p.next()
-		}
-	}
-}
-
-// Create the package if we have parsed both the package path and package name.
-func (p *parser) maybeCreatePackage() {
-	if p.pkgname != "" && p.pkgpath != "" {
-		p.pkg = p.getPkg(p.pkgpath, p.pkgname)
-	}
-}
-
-// InitDataDirective = ( "v1" | "v2" ) ";" |
-//                     "priority" int ";" |
-//                     "init" { PackageInit } ";" |
-//                     "checksum" unquotedString ";" .
-func (p *parser) parseInitDataDirective() {
-	if p.tok != scanner.Ident {
-		// unexpected token kind; panic
-		p.expect(scanner.Ident)
-	}
-
-	switch p.lit {
-	case "v1", "v2":
-		p.version = p.lit
-		p.next()
-		p.expect(';')
-
-	case "priority":
-		p.next()
-		p.initdata.Priority = int(p.parseInt())
-		p.expect(';')
-
-	case "init":
-		p.next()
-		for p.tok != ';' && p.tok != scanner.EOF {
-			p.initdata.Inits = append(p.initdata.Inits, p.parsePackageInit())
-		}
-		p.expect(';')
-
-	case "init_graph":
-		p.next()
-		// The graph data is thrown away for now.
-		for p.tok != ';' && p.tok != scanner.EOF {
-			p.parseInt()
-			p.parseInt()
-		}
-		p.expect(';')
-
-	case "checksum":
-		// Don't let the scanner try to parse the checksum as a number.
-		defer func(mode uint) {
-			p.scanner.Mode = mode
-		}(p.scanner.Mode)
-		p.scanner.Mode &^= scanner.ScanInts | scanner.ScanFloats
-		p.next()
-		p.parseUnquotedString()
-		p.expect(';')
-
-	default:
-		p.errorf("unexpected identifier: %q", p.lit)
-	}
-}
-
-// Directive = InitDataDirective |
-//             "package" unquotedString [ unquotedString ] [ unquotedString ] ";" |
-//             "pkgpath" unquotedString ";" |
-//             "prefix" unquotedString ";" |
-//             "import" unquotedString unquotedString string ";" |
-//             "func" Func ";" |
-//             "type" Type ";" |
-//             "var" Var ";" |
-//             "const" Const ";" .
-func (p *parser) parseDirective() {
-	if p.tok != scanner.Ident {
-		// unexpected token kind; panic
-		p.expect(scanner.Ident)
-	}
-
-	switch p.lit {
-	case "v1", "v2", "priority", "init", "init_graph", "checksum":
-		p.parseInitDataDirective()
-
-	case "package":
-		p.next()
-		p.pkgname = p.parseUnquotedString()
-		p.maybeCreatePackage()
-		if p.version == "v2" && p.tok != ';' {
-			p.parseUnquotedString()
-			p.parseUnquotedString()
-		}
-		p.expect(';')
-
-	case "pkgpath":
-		p.next()
-		p.pkgpath = p.parseUnquotedString()
-		p.maybeCreatePackage()
-		p.expect(';')
-
-	case "prefix":
-		p.next()
-		p.pkgpath = p.parseUnquotedString()
-		p.expect(';')
-
-	case "import":
-		p.next()
-		pkgname := p.parseUnquotedString()
-		pkgpath := p.parseUnquotedString()
-		p.getPkg(pkgpath, pkgname)
-		p.parseString()
-		p.expect(';')
-
-	case "func":
-		p.next()
-		fun := p.parseFunc(p.pkg)
-		if fun != nil {
-			p.pkg.Scope().Insert(fun)
-		}
-		p.expect(';')
-
-	case "type":
-		p.next()
-		p.parseType(p.pkg)
-		p.expect(';')
-
-	case "var":
-		p.next()
-		v := p.parseVar(p.pkg)
-		p.pkg.Scope().Insert(v)
-		p.expect(';')
-
-	case "const":
-		p.next()
-		c := p.parseConst(p.pkg)
-		p.pkg.Scope().Insert(c)
-		p.expect(';')
-
-	default:
-		p.errorf("unexpected identifier: %q", p.lit)
-	}
-}
-
-// Package = { Directive } .
-func (p *parser) parsePackage() *types.Package {
-	for p.tok != scanner.EOF {
-		p.parseDirective()
-	}
-	for _, typ := range p.typeMap {
-		if it, ok := typ.(*types.Interface); ok {
-			it.Complete()
-		}
-	}
-	p.pkg.MarkComplete()
-	return p.pkg
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser_test.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser_test.go
deleted file mode 100644
index 427d943cfe..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/parser_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package gccgoimporter
-
-// This is a verbatim copy of $GOROOT/src/go/internal/gccgoimporter/parser_test.go.
-
-import (
-	"bytes"
-	"go/types"
-	"strings"
-	"testing"
-	"text/scanner"
-)
-
-var typeParserTests = []struct {
-	id, typ, want, underlying, methods string
-}{
-	{id: "foo", typ: "<type -1>", want: "int8"},
-	{id: "foo", typ: "<type 1 *<type -19>>", want: "*error"},
-	{id: "foo", typ: "<type 1 *any>", want: "unsafe.Pointer"},
-	{id: "foo", typ: "<type 1 \"Bar\" <type 2 *<type 1>>>", want: "foo.Bar", underlying: "*foo.Bar"},
-	{id: "foo", typ: "<type 1 \"bar.Foo\" \"bar\" <type -1> func (? <type 1>) M (); >", want: "bar.Foo", underlying: "int8", methods: "func (bar.Foo).M()"},
-	{id: "foo", typ: "<type 1 \".bar.foo\" \"bar\" <type -1>>", want: "bar.foo", underlying: "int8"},
-	{id: "foo", typ: "<type 1 []<type -1>>", want: "[]int8"},
-	{id: "foo", typ: "<type 1 [42]<type -1>>", want: "[42]int8"},
-	{id: "foo", typ: "<type 1 map [<type -1>] <type -2>>", want: "map[int8]int16"},
-	{id: "foo", typ: "<type 1 chan <type -1>>", want: "chan int8"},
-	{id: "foo", typ: "<type 1 chan <- <type -1>>", want: "<-chan int8"},
-	{id: "foo", typ: "<type 1 chan -< <type -1>>", want: "chan<- int8"},
-	{id: "foo", typ: "<type 1 struct { I8 <type -1>; I16 <type -2> \"i16\"; }>", want: "struct{I8 int8; I16 int16 \"i16\"}"},
-	{id: "foo", typ: "<type 1 interface { Foo (a <type -1>, b <type -2>) <type -1>; Bar (? <type -2>, ? ...<type -1>) (? <type -2>, ? <type -1>); Baz (); }>", want: "interface{Bar(int16, ...int8) (int16, int8); Baz(); Foo(a int8, b int16) int8}"},
-	{id: "foo", typ: "<type 1 (? <type -1>) <type -2>>", want: "func(int8) int16"},
-}
-
-func TestTypeParser(t *testing.T) {
-	for _, test := range typeParserTests {
-		var p parser
-		p.init("test.gox", strings.NewReader(test.typ), make(map[string]*types.Package))
-		p.pkgname = test.id
-		p.pkgpath = test.id
-		p.maybeCreatePackage()
-		typ := p.parseType(p.pkg)
-
-		if p.tok != scanner.EOF {
-			t.Errorf("expected full parse, stopped at %q", p.lit)
-		}
-
-		got := typ.String()
-		if got != test.want {
-			t.Errorf("got type %q, expected %q", got, test.want)
-		}
-
-		if test.underlying != "" {
-			underlying := typ.Underlying().String()
-			if underlying != test.underlying {
-				t.Errorf("got underlying type %q, expected %q", underlying, test.underlying)
-			}
-		}
-
-		if test.methods != "" {
-			nt := typ.(*types.Named)
-			var buf bytes.Buffer
-			for i := 0; i != nt.NumMethods(); i++ {
-				buf.WriteString(nt.Method(i).String())
-			}
-			methods := buf.String()
-			if methods != test.methods {
-				t.Errorf("got methods %q, expected %q", methods, test.methods)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/alias.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/alias.gox
deleted file mode 100644
index ced7d84c4f..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/alias.gox
+++ /dev/null
@@ -1,4 +0,0 @@
-v1;
-package alias;
-pkgpath alias;
-type <type 115 "I1" <type 116 interface { M1 (? <type 117 "IntAlias2" = <type 118 "IntAlias" = <type 119 "Int" <type -11>>>>) < type 114>; M2 () <type 1>; }>>;
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.go
deleted file mode 100644
index a51b6b01c0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.go
+++ /dev/null
@@ -1,6 +0,0 @@
-package complexnums
-
-const NN = -1 - 1i
-const NP = -1 + 1i
-const PN = 1 - 1i
-const PP = 1 + 1i
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.gox
deleted file mode 100644
index b66524f80e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/complexnums.gox
+++ /dev/null
@@ -1,8 +0,0 @@
-v1;
-package complexnums;
-pkgpath complexnums;
-priority 1;
-const NN = -0.1E1-0.1E1i ;
-const NP = -0.1E1+0.1E1i ;
-const PN = 0.1E1-0.1E1i ;
-const PP = 0.1E1+0.1E1i ;
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.go
deleted file mode 100644
index 653927ad67..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package conversions
-
-type Units string
-
-const Bits = Units("bits")
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.gox
deleted file mode 100644
index 7de6cdad2c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/conversions.gox
+++ /dev/null
@@ -1,6 +0,0 @@
-v2;
-package conversions;
-prefix go;
-package conversions go.conversions go.conversions;
-const Bits <type 1 "Units" <type -16>> = convert(<type 1>, "bits");
-type <type 1>;
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.go
deleted file mode 100644
index 7907316a60..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.go
+++ /dev/null
@@ -1,5 +0,0 @@
-package imports
-
-import "fmt"
-
-var Hello = fmt.Sprintf("Hello, world")
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.gox
deleted file mode 100644
index 958a4f5b82..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/imports.gox
+++ /dev/null
@@ -1,7 +0,0 @@
-v1;
-package imports;
-pkgpath imports;
-priority 7;
-import fmt fmt "fmt";
-init imports imports..import 7 math math..import 1 runtime runtime..import 1 strconv strconv..import 2 io io..import 3 reflect reflect..import 3 syscall syscall..import 3 time time..import 4 os os..import 5 fmt fmt..import 6;
-var Hello <type -16>;
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.go
deleted file mode 100644
index 4ebc67137d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package pointer
-
-type Int8Ptr *int8
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.gox
deleted file mode 100644
index d96ebbdd14..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/pointer.gox
+++ /dev/null
@@ -1,4 +0,0 @@
-v1;
-package pointer;
-pkgpath pointer;
-type <type 1 "Int8Ptr" <type 2 *<type -1>>>;
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/time.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/time.gox
deleted file mode 100644
index 80c2dbcb47..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/time.gox and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/unicode.gox b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/unicode.gox
deleted file mode 100644
index e70e539655..0000000000
Binary files a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testdata/unicode.gox and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testenv_test.go b/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testenv_test.go
deleted file mode 100644
index 10c11fd25d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/internal/gccgoimporter/testenv_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-package gccgoimporter
-
-// This file contains testing utilities copied from $GOROOT/src/internal/testenv/testenv.go.
-
-import (
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// HasGoBuild reports whether the current system can build programs with ``go build''
-// and then run them with os.StartProcess or exec.Command.
-func HasGoBuild() bool {
-	switch runtime.GOOS {
-	case "android", "nacl":
-		return false
-	case "darwin":
-		if strings.HasPrefix(runtime.GOARCH, "arm") {
-			return false
-		}
-	}
-	return true
-}
-
-// MustHaveGoBuild checks that the current system can build programs with ``go build''
-// and then run them with os.StartProcess or exec.Command.
-// If not, MustHaveGoBuild calls t.Skip with an explanation.
-func MustHaveGoBuild(t *testing.T) {
-	if !HasGoBuild() {
-		t.Skipf("skipping test: 'go build' not available on %s/%s", runtime.GOOS, runtime.GOARCH)
-	}
-}
-
-var testenv = struct {
-	HasGoBuild      func() bool
-	MustHaveGoBuild func(*testing.T)
-}{
-	HasGoBuild:      HasGoBuild,
-	MustHaveGoBuild: MustHaveGoBuild,
-}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/bexport.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/bexport.go
similarity index 100%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/bexport.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/bexport.go
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/bimport.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/bimport.go
similarity index 89%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/bimport.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/bimport.go
index 1936a7f6c9..3e845eafe3 100644
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/bimport.go
+++ b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/bimport.go
@@ -39,8 +39,7 @@ type importer struct {
 	posInfoFormat bool
 	prevFile      string
 	prevLine      int
-	fset          *token.FileSet
-	files         map[string]*token.File
+	fake          fakeFileSet
 
 	// debugging support
 	debugFormat bool
@@ -62,6 +61,10 @@ func BImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 		}
 	}()
 
+	if len(data) > 0 && data[0] == 'i' {
+		return iImportData(fset, imports, data[1:], path)
+	}
+
 	p := importer{
 		imports:    imports,
 		data:       data,
@@ -69,8 +72,10 @@ func BImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 		version:    -1,           // unknown version
 		strList:    []string{""}, // empty string is mapped to 0
 		pathList:   []string{""}, // empty string is mapped to 0
-		fset:       fset,
-		files:      make(map[string]*token.File),
+		fake: fakeFileSet{
+			fset:  fset,
+			files: make(map[string]*token.File),
+		},
 	}
 
 	// read version info
@@ -104,10 +109,10 @@ func BImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 
 	// read version specific flags - extend as necessary
 	switch p.version {
-	// case 6:
+	// case 7:
 	// 	...
 	//	fallthrough
-	case 5, 4, 3, 2, 1:
+	case 6, 5, 4, 3, 2, 1:
 		p.debugFormat = p.rawStringln(p.rawByte()) == "debug"
 		p.trackAllTypes = p.int() != 0
 		p.posInfoFormat = p.int() != 0
@@ -125,7 +130,7 @@ func BImportData(fset *token.FileSet, imports map[string]*types.Package, data []
 	// read package data
 	pkg = p.pkg()
 
-	// read objects of phase 1 only (see cmd/compiler/internal/gc/bexport.go)
+	// read objects of phase 1 only (see cmd/compile/internal/gc/bexport.go)
 	objcount := 0
 	for {
 		tag := p.tagOrIndex()
@@ -184,6 +189,9 @@ func (p *importer) pkg() *types.Package {
 	} else {
 		path = p.string()
 	}
+	if p.version >= 6 {
+		p.int() // package height; unused by go/types
+	}
 
 	// we should never see an empty package name
 	if name == "" {
@@ -259,7 +267,7 @@ func (p *importer) obj(tag int) {
 	case constTag:
 		pos := p.pos()
 		pkg, name := p.qualifiedName()
-		typ := p.typ(nil)
+		typ := p.typ(nil, nil)
 		val := p.value()
 		p.declare(types.NewConst(pos, pkg, name, typ, val))
 
@@ -267,16 +275,16 @@ func (p *importer) obj(tag int) {
 		// TODO(gri) verify type alias hookup is correct
 		pos := p.pos()
 		pkg, name := p.qualifiedName()
-		typ := p.typ(nil)
+		typ := p.typ(nil, nil)
 		p.declare(types.NewTypeName(pos, pkg, name, typ))
 
 	case typeTag:
-		p.typ(nil)
+		p.typ(nil, nil)
 
 	case varTag:
 		pos := p.pos()
 		pkg, name := p.qualifiedName()
-		typ := p.typ(nil)
+		typ := p.typ(nil, nil)
 		p.declare(types.NewVar(pos, pkg, name, typ))
 
 	case funcTag:
@@ -323,15 +331,23 @@ func (p *importer) pos() token.Pos {
 	p.prevFile = file
 	p.prevLine = line
 
-	// Synthesize a token.Pos
+	return p.fake.pos(file, line)
+}
 
+// Synthesize a token.Pos
+type fakeFileSet struct {
+	fset  *token.FileSet
+	files map[string]*token.File
+}
+
+func (s *fakeFileSet) pos(file string, line int) token.Pos {
 	// Since we don't know the set of needed file positions, we
 	// reserve maxlines positions per file.
 	const maxlines = 64 * 1024
-	f := p.files[file]
+	f := s.files[file]
 	if f == nil {
-		f = p.fset.AddFile(file, -1, maxlines)
-		p.files[file] = f
+		f = s.fset.AddFile(file, -1, maxlines)
+		s.files[file] = f
 		// Allocate the fake linebreak indices on first use.
 		// TODO(adonovan): opt: save ~512KB using a more complex scheme?
 		fakeLinesOnce.Do(func() {
@@ -381,7 +397,11 @@ func (t *dddSlice) String() string         { return "..." + t.elem.String() }
 // the package currently imported. The parent package is needed for
 // exported struct fields and interface methods which don't contain
 // explicit package information in the export data.
-func (p *importer) typ(parent *types.Package) types.Type {
+//
+// A non-nil tname is used as the "owner" of the result type; i.e.,
+// the result type is the underlying type of tname. tname is used
+// to give interface methods a named receiver type where possible.
+func (p *importer) typ(parent *types.Package, tname *types.Named) types.Type {
 	// if the type was seen before, i is its index (>= 0)
 	i := p.tagOrIndex()
 	if i >= 0 {
@@ -411,15 +431,15 @@ func (p *importer) typ(parent *types.Package) types.Type {
 		t0 := types.NewNamed(obj.(*types.TypeName), nil, nil)
 
 		// but record the existing type, if any
-		t := obj.Type().(*types.Named)
-		p.record(t)
+		tname := obj.Type().(*types.Named) // tname is either t0 or the existing type
+		p.record(tname)
 
 		// read underlying type
-		t0.SetUnderlying(p.typ(parent))
+		t0.SetUnderlying(p.typ(parent, t0))
 
 		// interfaces don't have associated methods
 		if types.IsInterface(t0) {
-			return t
+			return tname
 		}
 
 		// read associated methods
@@ -440,7 +460,7 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			t0.AddMethod(types.NewFunc(pos, parent, name, sig))
 		}
 
-		return t
+		return tname
 
 	case arrayTag:
 		t := new(types.Array)
@@ -449,7 +469,7 @@ func (p *importer) typ(parent *types.Package) types.Type {
 		}
 
 		n := p.int64()
-		*t = *types.NewArray(p.typ(parent), n)
+		*t = *types.NewArray(p.typ(parent, nil), n)
 		return t
 
 	case sliceTag:
@@ -458,7 +478,7 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			p.record(t)
 		}
 
-		*t = *types.NewSlice(p.typ(parent))
+		*t = *types.NewSlice(p.typ(parent, nil))
 		return t
 
 	case dddTag:
@@ -467,7 +487,7 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			p.record(t)
 		}
 
-		t.elem = p.typ(parent)
+		t.elem = p.typ(parent, nil)
 		return t
 
 	case structTag:
@@ -485,7 +505,7 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			p.record(t)
 		}
 
-		*t = *types.NewPointer(p.typ(parent))
+		*t = *types.NewPointer(p.typ(parent, nil))
 		return t
 
 	case signatureTag:
@@ -504,6 +524,8 @@ func (p *importer) typ(parent *types.Package) types.Type {
 		// cannot expect the interface type to appear in a cycle, as any
 		// such cycle must contain a named type which would have been
 		// first defined earlier.
+		// TODO(gri) Is this still true now that we have type aliases?
+		// See issue #23225.
 		n := len(p.typList)
 		if p.trackAllTypes {
 			p.record(nil)
@@ -512,10 +534,10 @@ func (p *importer) typ(parent *types.Package) types.Type {
 		var embeddeds []*types.Named
 		for n := p.int(); n > 0; n-- {
 			p.pos()
-			embeddeds = append(embeddeds, p.typ(parent).(*types.Named))
+			embeddeds = append(embeddeds, p.typ(parent, nil).(*types.Named))
 		}
 
-		t := types.NewInterface(p.methodList(parent), embeddeds)
+		t := types.NewInterface(p.methodList(parent, tname), embeddeds)
 		p.interfaceList = append(p.interfaceList, t)
 		if p.trackAllTypes {
 			p.typList[n] = t
@@ -528,8 +550,8 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			p.record(t)
 		}
 
-		key := p.typ(parent)
-		val := p.typ(parent)
+		key := p.typ(parent, nil)
+		val := p.typ(parent, nil)
 		*t = *types.NewMap(key, val)
 		return t
 
@@ -539,19 +561,8 @@ func (p *importer) typ(parent *types.Package) types.Type {
 			p.record(t)
 		}
 
-		var dir types.ChanDir
-		// tag values must match the constants in cmd/compile/internal/gc/go.go
-		switch d := p.int(); d {
-		case 1 /* Crecv */ :
-			dir = types.RecvOnly
-		case 2 /* Csend */ :
-			dir = types.SendOnly
-		case 3 /* Cboth */ :
-			dir = types.SendRecv
-		default:
-			errorf("unexpected channel dir %d", d)
-		}
-		val := p.typ(parent)
+		dir := chanDir(p.int())
+		val := p.typ(parent, nil)
 		*t = *types.NewChan(dir, val)
 		return t
 
@@ -561,6 +572,21 @@ func (p *importer) typ(parent *types.Package) types.Type {
 	}
 }
 
+func chanDir(d int) types.ChanDir {
+	// tag values must match the constants in cmd/compile/internal/gc/go.go
+	switch d {
+	case 1 /* Crecv */ :
+		return types.RecvOnly
+	case 2 /* Csend */ :
+		return types.SendOnly
+	case 3 /* Cboth */ :
+		return types.SendRecv
+	default:
+		errorf("unexpected channel dir %d", d)
+		return 0
+	}
+}
+
 func (p *importer) fieldList(parent *types.Package) (fields []*types.Var, tags []string) {
 	if n := p.int(); n > 0 {
 		fields = make([]*types.Var, n)
@@ -575,7 +601,7 @@ func (p *importer) fieldList(parent *types.Package) (fields []*types.Var, tags [
 func (p *importer) field(parent *types.Package) (*types.Var, string) {
 	pos := p.pos()
 	pkg, name, alias := p.fieldName(parent)
-	typ := p.typ(parent)
+	typ := p.typ(parent, nil)
 	tag := p.string()
 
 	anonymous := false
@@ -599,22 +625,30 @@ func (p *importer) field(parent *types.Package) (*types.Var, string) {
 	return types.NewField(pos, pkg, name, typ, anonymous), tag
 }
 
-func (p *importer) methodList(parent *types.Package) (methods []*types.Func) {
+func (p *importer) methodList(parent *types.Package, baseType *types.Named) (methods []*types.Func) {
 	if n := p.int(); n > 0 {
 		methods = make([]*types.Func, n)
 		for i := range methods {
-			methods[i] = p.method(parent)
+			methods[i] = p.method(parent, baseType)
 		}
 	}
 	return
 }
 
-func (p *importer) method(parent *types.Package) *types.Func {
+func (p *importer) method(parent *types.Package, baseType *types.Named) *types.Func {
 	pos := p.pos()
 	pkg, name, _ := p.fieldName(parent)
+	// If we don't have a baseType, use a nil receiver.
+	// A receiver using the actual interface type (which
+	// we don't know yet) will be filled in when we call
+	// types.Interface.Complete.
+	var recv *types.Var
+	if baseType != nil {
+		recv = types.NewVar(token.NoPos, parent, "", baseType)
+	}
 	params, isddd := p.paramList()
 	result, _ := p.paramList()
-	sig := types.NewSignature(nil, params, result, isddd)
+	sig := types.NewSignature(recv, params, result, isddd)
 	return types.NewFunc(pos, pkg, name, sig)
 }
 
@@ -670,7 +704,7 @@ func (p *importer) paramList() (*types.Tuple, bool) {
 }
 
 func (p *importer) param(named bool) (*types.Var, bool) {
-	t := p.typ(nil)
+	t := p.typ(nil, nil)
 	td, isddd := t.(*dddSlice)
 	if isddd {
 		t = types.NewSlice(td.elem)
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/exportdata.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/exportdata.go
similarity index 100%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/exportdata.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/exportdata.go
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
similarity index 99%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
index 6fbc9d7617..58e558c959 100644
--- a/installer/vendor/golang.org/x/tools/go/gcimporter15/gcimporter.go
+++ b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/gcimporter.go
@@ -6,14 +6,10 @@
 // but it also contains the original source-based importer code for Go1.6.
 // Once we stop supporting 1.6, we can remove that code.
 
-// Package gcimporter15 provides various functions for reading
+// Package gcimporter provides various functions for reading
 // gc-generated object files that can be used to implement the
 // Importer interface defined by the Go 1.5 standard library package.
-//
-// Deprecated: this package will be deleted in October 2017.
-// New code should use golang.org/x/tools/go/gcexportdata.
-//
-package gcimporter // import "golang.org/x/tools/go/gcimporter15"
+package gcimporter // import "golang.org/x/tools/go/internal/gcimporter"
 
 import (
 	"bufio"
diff --git a/installer/vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
new file mode 100644
index 0000000000..dfc00a3320
--- /dev/null
+++ b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/iimport.go
@@ -0,0 +1,585 @@
+// Copyright 2018 The Go Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style
+// license that can be found in the LICENSE file.
+
+// Indexed package import.
+// See cmd/compile/internal/gc/iexport.go for the export data format.
+
+// This file is a copy of $GOROOT/src/go/internal/gcimporter/iimport.go.
+
+package gcimporter
+
+import (
+	"bytes"
+	"encoding/binary"
+	"go/constant"
+	"go/token"
+	"go/types"
+	"io"
+	"sort"
+)
+
+type intReader struct {
+	*bytes.Reader
+	path string
+}
+
+func (r *intReader) int64() int64 {
+	i, err := binary.ReadVarint(r.Reader)
+	if err != nil {
+		errorf("import %q: read varint error: %v", r.path, err)
+	}
+	return i
+}
+
+func (r *intReader) uint64() uint64 {
+	i, err := binary.ReadUvarint(r.Reader)
+	if err != nil {
+		errorf("import %q: read varint error: %v", r.path, err)
+	}
+	return i
+}
+
+const predeclReserved = 32
+
+type itag uint64
+
+const (
+	// Types
+	definedType itag = iota
+	pointerType
+	sliceType
+	arrayType
+	chanType
+	mapType
+	signatureType
+	structType
+	interfaceType
+)
+
+// iImportData imports a package from the serialized package data
+// and returns the number of bytes consumed and a reference to the package.
+// If the export data version is not recognized or the format is otherwise
+// compromised, an error is returned.
+func iImportData(fset *token.FileSet, imports map[string]*types.Package, data []byte, path string) (_ int, pkg *types.Package, err error) {
+	r := &intReader{bytes.NewReader(data), path}
+
+	version := r.uint64()
+	switch version {
+	case 0:
+	default:
+		errorf("cannot import %q: unknown iexport format version %d", path, version)
+	}
+
+	sLen := int64(r.uint64())
+	dLen := int64(r.uint64())
+
+	whence, _ := r.Seek(0, io.SeekCurrent)
+	stringData := data[whence : whence+sLen]
+	declData := data[whence+sLen : whence+sLen+dLen]
+	r.Seek(sLen+dLen, io.SeekCurrent)
+
+	p := iimporter{
+		ipath: path,
+
+		stringData:  stringData,
+		stringCache: make(map[uint64]string),
+		pkgCache:    make(map[uint64]*types.Package),
+
+		declData: declData,
+		pkgIndex: make(map[*types.Package]map[string]uint64),
+		typCache: make(map[uint64]types.Type),
+
+		fake: fakeFileSet{
+			fset:  fset,
+			files: make(map[string]*token.File),
+		},
+	}
+
+	for i, pt := range predeclared {
+		p.typCache[uint64(i)] = pt
+	}
+
+	pkgList := make([]*types.Package, r.uint64())
+	for i := range pkgList {
+		pkgPathOff := r.uint64()
+		pkgPath := p.stringAt(pkgPathOff)
+		pkgName := p.stringAt(r.uint64())
+		_ = r.uint64() // package height; unused by go/types
+
+		if pkgPath == "" {
+			pkgPath = path
+		}
+		pkg := imports[pkgPath]
+		if pkg == nil {
+			pkg = types.NewPackage(pkgPath, pkgName)
+			imports[pkgPath] = pkg
+		} else if pkg.Name() != pkgName {
+			errorf("conflicting names %s and %s for package %q", pkg.Name(), pkgName, path)
+		}
+
+		p.pkgCache[pkgPathOff] = pkg
+
+		nameIndex := make(map[string]uint64)
+		for nSyms := r.uint64(); nSyms > 0; nSyms-- {
+			name := p.stringAt(r.uint64())
+			nameIndex[name] = r.uint64()
+		}
+
+		p.pkgIndex[pkg] = nameIndex
+		pkgList[i] = pkg
+	}
+
+	localpkg := pkgList[0]
+
+	names := make([]string, 0, len(p.pkgIndex[localpkg]))
+	for name := range p.pkgIndex[localpkg] {
+		names = append(names, name)
+	}
+	sort.Strings(names)
+	for _, name := range names {
+		p.doDecl(localpkg, name)
+	}
+
+	for _, typ := range p.interfaceList {
+		typ.Complete()
+	}
+
+	// record all referenced packages as imports
+	list := append(([]*types.Package)(nil), pkgList[1:]...)
+	sort.Sort(byPath(list))
+	localpkg.SetImports(list)
+
+	// package was imported completely and without errors
+	localpkg.MarkComplete()
+
+	consumed, _ := r.Seek(0, io.SeekCurrent)
+	return int(consumed), localpkg, nil
+}
+
+type iimporter struct {
+	ipath string
+
+	stringData  []byte
+	stringCache map[uint64]string
+	pkgCache    map[uint64]*types.Package
+
+	declData []byte
+	pkgIndex map[*types.Package]map[string]uint64
+	typCache map[uint64]types.Type
+
+	fake          fakeFileSet
+	interfaceList []*types.Interface
+}
+
+func (p *iimporter) doDecl(pkg *types.Package, name string) {
+	// See if we've already imported this declaration.
+	if obj := pkg.Scope().Lookup(name); obj != nil {
+		return
+	}
+
+	off, ok := p.pkgIndex[pkg][name]
+	if !ok {
+		errorf("%v.%v not in index", pkg, name)
+	}
+
+	r := &importReader{p: p, currPkg: pkg}
+	r.declReader.Reset(p.declData[off:])
+
+	r.obj(name)
+}
+
+func (p *iimporter) stringAt(off uint64) string {
+	if s, ok := p.stringCache[off]; ok {
+		return s
+	}
+
+	slen, n := binary.Uvarint(p.stringData[off:])
+	if n <= 0 {
+		errorf("varint failed")
+	}
+	spos := off + uint64(n)
+	s := string(p.stringData[spos : spos+slen])
+	p.stringCache[off] = s
+	return s
+}
+
+func (p *iimporter) pkgAt(off uint64) *types.Package {
+	if pkg, ok := p.pkgCache[off]; ok {
+		return pkg
+	}
+	path := p.stringAt(off)
+	errorf("missing package %q in %q", path, p.ipath)
+	return nil
+}
+
+func (p *iimporter) typAt(off uint64, base *types.Named) types.Type {
+	if t, ok := p.typCache[off]; ok && (base == nil || !isInterface(t)) {
+		return t
+	}
+
+	if off < predeclReserved {
+		errorf("predeclared type missing from cache: %v", off)
+	}
+
+	r := &importReader{p: p}
+	r.declReader.Reset(p.declData[off-predeclReserved:])
+	t := r.doType(base)
+
+	if base == nil || !isInterface(t) {
+		p.typCache[off] = t
+	}
+	return t
+}
+
+type importReader struct {
+	p          *iimporter
+	declReader bytes.Reader
+	currPkg    *types.Package
+	prevFile   string
+	prevLine   int64
+}
+
+func (r *importReader) obj(name string) {
+	tag := r.byte()
+	pos := r.pos()
+
+	switch tag {
+	case 'A':
+		typ := r.typ()
+
+		r.declare(types.NewTypeName(pos, r.currPkg, name, typ))
+
+	case 'C':
+		typ, val := r.value()
+
+		r.declare(types.NewConst(pos, r.currPkg, name, typ, val))
+
+	case 'F':
+		sig := r.signature(nil)
+
+		r.declare(types.NewFunc(pos, r.currPkg, name, sig))
+
+	case 'T':
+		// Types can be recursive. We need to setup a stub
+		// declaration before recursing.
+		obj := types.NewTypeName(pos, r.currPkg, name, nil)
+		named := types.NewNamed(obj, nil, nil)
+		r.declare(obj)
+
+		underlying := r.p.typAt(r.uint64(), named).Underlying()
+		named.SetUnderlying(underlying)
+
+		if !isInterface(underlying) {
+			for n := r.uint64(); n > 0; n-- {
+				mpos := r.pos()
+				mname := r.ident()
+				recv := r.param()
+				msig := r.signature(recv)
+
+				named.AddMethod(types.NewFunc(mpos, r.currPkg, mname, msig))
+			}
+		}
+
+	case 'V':
+		typ := r.typ()
+
+		r.declare(types.NewVar(pos, r.currPkg, name, typ))
+
+	default:
+		errorf("unexpected tag: %v", tag)
+	}
+}
+
+func (r *importReader) declare(obj types.Object) {
+	obj.Pkg().Scope().Insert(obj)
+}
+
+func (r *importReader) value() (typ types.Type, val constant.Value) {
+	typ = r.typ()
+
+	switch b := typ.Underlying().(*types.Basic); b.Info() & types.IsConstType {
+	case types.IsBoolean:
+		val = constant.MakeBool(r.bool())
+
+	case types.IsString:
+		val = constant.MakeString(r.string())
+
+	case types.IsInteger:
+		val = r.mpint(b)
+
+	case types.IsFloat:
+		val = r.mpfloat(b)
+
+	case types.IsComplex:
+		re := r.mpfloat(b)
+		im := r.mpfloat(b)
+		val = constant.BinaryOp(re, token.ADD, constant.MakeImag(im))
+
+	default:
+		errorf("unexpected type %v", typ) // panics
+		panic("unreachable")
+	}
+
+	return
+}
+
+func intSize(b *types.Basic) (signed bool, maxBytes uint) {
+	if (b.Info() & types.IsUntyped) != 0 {
+		return true, 64
+	}
+
+	switch b.Kind() {
+	case types.Float32, types.Complex64:
+		return true, 3
+	case types.Float64, types.Complex128:
+		return true, 7
+	}
+
+	signed = (b.Info() & types.IsUnsigned) == 0
+	switch b.Kind() {
+	case types.Int8, types.Uint8:
+		maxBytes = 1
+	case types.Int16, types.Uint16:
+		maxBytes = 2
+	case types.Int32, types.Uint32:
+		maxBytes = 4
+	default:
+		maxBytes = 8
+	}
+
+	return
+}
+
+func (r *importReader) mpint(b *types.Basic) constant.Value {
+	signed, maxBytes := intSize(b)
+
+	maxSmall := 256 - maxBytes
+	if signed {
+		maxSmall = 256 - 2*maxBytes
+	}
+	if maxBytes == 1 {
+		maxSmall = 256
+	}
+
+	n, _ := r.declReader.ReadByte()
+	if uint(n) < maxSmall {
+		v := int64(n)
+		if signed {
+			v >>= 1
+			if n&1 != 0 {
+				v = ^v
+			}
+		}
+		return constant.MakeInt64(v)
+	}
+
+	v := -n
+	if signed {
+		v = -(n &^ 1) >> 1
+	}
+	if v < 1 || uint(v) > maxBytes {
+		errorf("weird decoding: %v, %v => %v", n, signed, v)
+	}
+
+	buf := make([]byte, v)
+	io.ReadFull(&r.declReader, buf)
+
+	// convert to little endian
+	// TODO(gri) go/constant should have a more direct conversion function
+	//           (e.g., once it supports a big.Float based implementation)
+	for i, j := 0, len(buf)-1; i < j; i, j = i+1, j-1 {
+		buf[i], buf[j] = buf[j], buf[i]
+	}
+
+	x := constant.MakeFromBytes(buf)
+	if signed && n&1 != 0 {
+		x = constant.UnaryOp(token.SUB, x, 0)
+	}
+	return x
+}
+
+func (r *importReader) mpfloat(b *types.Basic) constant.Value {
+	x := r.mpint(b)
+	if constant.Sign(x) == 0 {
+		return x
+	}
+
+	exp := r.int64()
+	switch {
+	case exp > 0:
+		x = constant.Shift(x, token.SHL, uint(exp))
+	case exp < 0:
+		d := constant.Shift(constant.MakeInt64(1), token.SHL, uint(-exp))
+		x = constant.BinaryOp(x, token.QUO, d)
+	}
+	return x
+}
+
+func (r *importReader) ident() string {
+	return r.string()
+}
+
+func (r *importReader) qualifiedIdent() (*types.Package, string) {
+	name := r.string()
+	pkg := r.pkg()
+	return pkg, name
+}
+
+func (r *importReader) pos() token.Pos {
+	delta := r.int64()
+	if delta != deltaNewFile {
+		r.prevLine += delta
+	} else if l := r.int64(); l == -1 {
+		r.prevLine += deltaNewFile
+	} else {
+		r.prevFile = r.string()
+		r.prevLine = l
+	}
+
+	if r.prevFile == "" && r.prevLine == 0 {
+		return token.NoPos
+	}
+
+	return r.p.fake.pos(r.prevFile, int(r.prevLine))
+}
+
+func (r *importReader) typ() types.Type {
+	return r.p.typAt(r.uint64(), nil)
+}
+
+func isInterface(t types.Type) bool {
+	_, ok := t.(*types.Interface)
+	return ok
+}
+
+func (r *importReader) pkg() *types.Package { return r.p.pkgAt(r.uint64()) }
+func (r *importReader) string() string      { return r.p.stringAt(r.uint64()) }
+
+func (r *importReader) doType(base *types.Named) types.Type {
+	switch k := r.kind(); k {
+	default:
+		errorf("unexpected kind tag in %q: %v", r.p.ipath, k)
+		return nil
+
+	case definedType:
+		pkg, name := r.qualifiedIdent()
+		r.p.doDecl(pkg, name)
+		return pkg.Scope().Lookup(name).(*types.TypeName).Type()
+	case pointerType:
+		return types.NewPointer(r.typ())
+	case sliceType:
+		return types.NewSlice(r.typ())
+	case arrayType:
+		n := r.uint64()
+		return types.NewArray(r.typ(), int64(n))
+	case chanType:
+		dir := chanDir(int(r.uint64()))
+		return types.NewChan(dir, r.typ())
+	case mapType:
+		return types.NewMap(r.typ(), r.typ())
+	case signatureType:
+		r.currPkg = r.pkg()
+		return r.signature(nil)
+
+	case structType:
+		r.currPkg = r.pkg()
+
+		fields := make([]*types.Var, r.uint64())
+		tags := make([]string, len(fields))
+		for i := range fields {
+			fpos := r.pos()
+			fname := r.ident()
+			ftyp := r.typ()
+			emb := r.bool()
+			tag := r.string()
+
+			fields[i] = types.NewField(fpos, r.currPkg, fname, ftyp, emb)
+			tags[i] = tag
+		}
+		return types.NewStruct(fields, tags)
+
+	case interfaceType:
+		r.currPkg = r.pkg()
+
+		embeddeds := make([]*types.Named, r.uint64())
+		for i := range embeddeds {
+			_ = r.pos()
+			embeddeds[i] = r.typ().(*types.Named)
+		}
+
+		methods := make([]*types.Func, r.uint64())
+		for i := range methods {
+			mpos := r.pos()
+			mname := r.ident()
+
+			// TODO(mdempsky): Matches bimport.go, but I
+			// don't agree with this.
+			var recv *types.Var
+			if base != nil {
+				recv = types.NewVar(token.NoPos, r.currPkg, "", base)
+			}
+
+			msig := r.signature(recv)
+			methods[i] = types.NewFunc(mpos, r.currPkg, mname, msig)
+		}
+
+		typ := types.NewInterface(methods, embeddeds)
+		r.p.interfaceList = append(r.p.interfaceList, typ)
+		return typ
+	}
+}
+
+func (r *importReader) kind() itag {
+	return itag(r.uint64())
+}
+
+func (r *importReader) signature(recv *types.Var) *types.Signature {
+	params := r.paramList()
+	results := r.paramList()
+	variadic := params.Len() > 0 && r.bool()
+	return types.NewSignature(recv, params, results, variadic)
+}
+
+func (r *importReader) paramList() *types.Tuple {
+	xs := make([]*types.Var, r.uint64())
+	for i := range xs {
+		xs[i] = r.param()
+	}
+	return types.NewTuple(xs...)
+}
+
+func (r *importReader) param() *types.Var {
+	pos := r.pos()
+	name := r.ident()
+	typ := r.typ()
+	return types.NewParam(pos, r.currPkg, name, typ)
+}
+
+func (r *importReader) bool() bool {
+	return r.uint64() != 0
+}
+
+func (r *importReader) int64() int64 {
+	n, err := binary.ReadVarint(&r.declReader)
+	if err != nil {
+		errorf("readVarint: %v", err)
+	}
+	return n
+}
+
+func (r *importReader) uint64() uint64 {
+	n, err := binary.ReadUvarint(&r.declReader)
+	if err != nil {
+		errorf("readUvarint: %v", err)
+	}
+	return n
+}
+
+func (r *importReader) byte() byte {
+	x, err := r.declReader.ReadByte()
+	if err != nil {
+		errorf("declReader.ReadByte: %v", err)
+	}
+	return x
+}
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/isAlias18.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/isAlias18.go
similarity index 100%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/isAlias18.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/isAlias18.go
diff --git a/installer/vendor/golang.org/x/tools/go/gcimporter15/isAlias19.go b/installer/vendor/golang.org/x/tools/go/internal/gcimporter/isAlias19.go
similarity index 100%
rename from installer/vendor/golang.org/x/tools/go/gcimporter15/isAlias19.go
rename to installer/vendor/golang.org/x/tools/go/internal/gcimporter/isAlias19.go
diff --git a/installer/vendor/golang.org/x/tools/go/loader/cgo.go b/installer/vendor/golang.org/x/tools/go/loader/cgo.go
deleted file mode 100644
index 72c6f502d1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/cgo.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package loader
-
-// This file handles cgo preprocessing of files containing `import "C"`.
-//
-// DESIGN
-//
-// The approach taken is to run the cgo processor on the package's
-// CgoFiles and parse the output, faking the filenames of the
-// resulting ASTs so that the synthetic file containing the C types is
-// called "C" (e.g. "~/go/src/net/C") and the preprocessed files
-// have their original names (e.g. "~/go/src/net/cgo_unix.go"),
-// not the names of the actual temporary files.
-//
-// The advantage of this approach is its fidelity to 'go build'.  The
-// downside is that the token.Position.Offset for each AST node is
-// incorrect, being an offset within the temporary file.  Line numbers
-// should still be correct because of the //line comments.
-//
-// The logic of this file is mostly plundered from the 'go build'
-// tool, which also invokes the cgo preprocessor.
-//
-//
-// REJECTED ALTERNATIVE
-//
-// An alternative approach that we explored is to extend go/types'
-// Importer mechanism to provide the identity of the importing package
-// so that each time `import "C"` appears it resolves to a different
-// synthetic package containing just the objects needed in that case.
-// The loader would invoke cgo but parse only the cgo_types.go file
-// defining the package-level objects, discarding the other files
-// resulting from preprocessing.
-//
-// The benefit of this approach would have been that source-level
-// syntax information would correspond exactly to the original cgo
-// file, with no preprocessing involved, making source tools like
-// godoc, guru, and eg happy.  However, the approach was rejected
-// due to the additional complexity it would impose on go/types.  (It
-// made for a beautiful demo, though.)
-//
-// cgo files, despite their *.go extension, are not legal Go source
-// files per the specification since they may refer to unexported
-// members of package "C" such as C.int.  Also, a function such as
-// C.getpwent has in effect two types, one matching its C type and one
-// which additionally returns (errno C.int).  The cgo preprocessor
-// uses name mangling to distinguish these two functions in the
-// processed code, but go/types would need to duplicate this logic in
-// its handling of function calls, analogous to the treatment of map
-// lookups in which y=m[k] and y,ok=m[k] are both legal.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strings"
-)
-
-// processCgoFiles invokes the cgo preprocessor on bp.CgoFiles, parses
-// the output and returns the resulting ASTs.
-//
-func processCgoFiles(bp *build.Package, fset *token.FileSet, DisplayPath func(path string) string, mode parser.Mode) ([]*ast.File, error) {
-	tmpdir, err := ioutil.TempDir("", strings.Replace(bp.ImportPath, "/", "_", -1)+"_C")
-	if err != nil {
-		return nil, err
-	}
-	defer os.RemoveAll(tmpdir)
-
-	pkgdir := bp.Dir
-	if DisplayPath != nil {
-		pkgdir = DisplayPath(pkgdir)
-	}
-
-	cgoFiles, cgoDisplayFiles, err := runCgo(bp, pkgdir, tmpdir)
-	if err != nil {
-		return nil, err
-	}
-	var files []*ast.File
-	for i := range cgoFiles {
-		rd, err := os.Open(cgoFiles[i])
-		if err != nil {
-			return nil, err
-		}
-		display := filepath.Join(bp.Dir, cgoDisplayFiles[i])
-		f, err := parser.ParseFile(fset, display, rd, mode)
-		rd.Close()
-		if err != nil {
-			return nil, err
-		}
-		files = append(files, f)
-	}
-	return files, nil
-}
-
-var cgoRe = regexp.MustCompile(`[/\\:]`)
-
-// runCgo invokes the cgo preprocessor on bp.CgoFiles and returns two
-// lists of files: the resulting processed files (in temporary
-// directory tmpdir) and the corresponding names of the unprocessed files.
-//
-// runCgo is adapted from (*builder).cgo in
-// $GOROOT/src/cmd/go/build.go, but these features are unsupported:
-// Objective C, CGOPKGPATH, CGO_FLAGS.
-//
-func runCgo(bp *build.Package, pkgdir, tmpdir string) (files, displayFiles []string, err error) {
-	cgoCPPFLAGS, _, _, _ := cflags(bp, true)
-	_, cgoexeCFLAGS, _, _ := cflags(bp, false)
-
-	if len(bp.CgoPkgConfig) > 0 {
-		pcCFLAGS, err := pkgConfigFlags(bp)
-		if err != nil {
-			return nil, nil, err
-		}
-		cgoCPPFLAGS = append(cgoCPPFLAGS, pcCFLAGS...)
-	}
-
-	// Allows including _cgo_export.h from .[ch] files in the package.
-	cgoCPPFLAGS = append(cgoCPPFLAGS, "-I", tmpdir)
-
-	// _cgo_gotypes.go (displayed "C") contains the type definitions.
-	files = append(files, filepath.Join(tmpdir, "_cgo_gotypes.go"))
-	displayFiles = append(displayFiles, "C")
-	for _, fn := range bp.CgoFiles {
-		// "foo.cgo1.go" (displayed "foo.go") is the processed Go source.
-		f := cgoRe.ReplaceAllString(fn[:len(fn)-len("go")], "_")
-		files = append(files, filepath.Join(tmpdir, f+"cgo1.go"))
-		displayFiles = append(displayFiles, fn)
-	}
-
-	var cgoflags []string
-	if bp.Goroot && bp.ImportPath == "runtime/cgo" {
-		cgoflags = append(cgoflags, "-import_runtime_cgo=false")
-	}
-	if bp.Goroot && bp.ImportPath == "runtime/race" || bp.ImportPath == "runtime/cgo" {
-		cgoflags = append(cgoflags, "-import_syscall=false")
-	}
-
-	args := stringList(
-		"go", "tool", "cgo", "-objdir", tmpdir, cgoflags, "--",
-		cgoCPPFLAGS, cgoexeCFLAGS, bp.CgoFiles,
-	)
-	if false {
-		log.Printf("Running cgo for package %q: %s (dir=%s)", bp.ImportPath, args, pkgdir)
-	}
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Dir = pkgdir
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	if err := cmd.Run(); err != nil {
-		return nil, nil, fmt.Errorf("cgo failed: %s: %s", args, err)
-	}
-
-	return files, displayFiles, nil
-}
-
-// -- unmodified from 'go build' ---------------------------------------
-
-// Return the flags to use when invoking the C or C++ compilers, or cgo.
-func cflags(p *build.Package, def bool) (cppflags, cflags, cxxflags, ldflags []string) {
-	var defaults string
-	if def {
-		defaults = "-g -O2"
-	}
-
-	cppflags = stringList(envList("CGO_CPPFLAGS", ""), p.CgoCPPFLAGS)
-	cflags = stringList(envList("CGO_CFLAGS", defaults), p.CgoCFLAGS)
-	cxxflags = stringList(envList("CGO_CXXFLAGS", defaults), p.CgoCXXFLAGS)
-	ldflags = stringList(envList("CGO_LDFLAGS", defaults), p.CgoLDFLAGS)
-	return
-}
-
-// envList returns the value of the given environment variable broken
-// into fields, using the default value when the variable is empty.
-func envList(key, def string) []string {
-	v := os.Getenv(key)
-	if v == "" {
-		v = def
-	}
-	return strings.Fields(v)
-}
-
-// stringList's arguments should be a sequence of string or []string values.
-// stringList flattens them into a single []string.
-func stringList(args ...interface{}) []string {
-	var x []string
-	for _, arg := range args {
-		switch arg := arg.(type) {
-		case []string:
-			x = append(x, arg...)
-		case string:
-			x = append(x, arg)
-		default:
-			panic("stringList: invalid argument")
-		}
-	}
-	return x
-}
diff --git a/installer/vendor/golang.org/x/tools/go/loader/cgo_pkgconfig.go b/installer/vendor/golang.org/x/tools/go/loader/cgo_pkgconfig.go
deleted file mode 100644
index de57422df2..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/cgo_pkgconfig.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package loader
-
-import (
-	"errors"
-	"fmt"
-	"go/build"
-	"os/exec"
-	"strings"
-)
-
-// pkgConfig runs pkg-config with the specified arguments and returns the flags it prints.
-func pkgConfig(mode string, pkgs []string) (flags []string, err error) {
-	cmd := exec.Command("pkg-config", append([]string{mode}, pkgs...)...)
-	out, err := cmd.CombinedOutput()
-	if err != nil {
-		s := fmt.Sprintf("%s failed: %v", strings.Join(cmd.Args, " "), err)
-		if len(out) > 0 {
-			s = fmt.Sprintf("%s: %s", s, out)
-		}
-		return nil, errors.New(s)
-	}
-	if len(out) > 0 {
-		flags = strings.Fields(string(out))
-	}
-	return
-}
-
-// pkgConfigFlags calls pkg-config if needed and returns the cflags
-// needed to build the package.
-func pkgConfigFlags(p *build.Package) (cflags []string, err error) {
-	if len(p.CgoPkgConfig) == 0 {
-		return nil, nil
-	}
-	return pkgConfig("--cflags", p.CgoPkgConfig)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/loader/doc.go b/installer/vendor/golang.org/x/tools/go/loader/doc.go
deleted file mode 100644
index 9b51c9ecde..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/doc.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package loader loads a complete Go program from source code, parsing
-// and type-checking the initial packages plus their transitive closure
-// of dependencies.  The ASTs and the derived facts are retained for
-// later use.
-//
-// THIS INTERFACE IS EXPERIMENTAL AND IS LIKELY TO CHANGE.
-//
-// The package defines two primary types: Config, which specifies a
-// set of initial packages to load and various other options; and
-// Program, which is the result of successfully loading the packages
-// specified by a configuration.
-//
-// The configuration can be set directly, but *Config provides various
-// convenience methods to simplify the common cases, each of which can
-// be called any number of times.  Finally, these are followed by a
-// call to Load() to actually load and type-check the program.
-//
-//      var conf loader.Config
-//
-//      // Use the command-line arguments to specify
-//      // a set of initial packages to load from source.
-//      // See FromArgsUsage for help.
-//      rest, err := conf.FromArgs(os.Args[1:], wantTests)
-//
-//      // Parse the specified files and create an ad hoc package with path "foo".
-//      // All files must have the same 'package' declaration.
-//      conf.CreateFromFilenames("foo", "foo.go", "bar.go")
-//
-//      // Create an ad hoc package with path "foo" from
-//      // the specified already-parsed files.
-//      // All ASTs must have the same 'package' declaration.
-//      conf.CreateFromFiles("foo", parsedFiles)
-//
-//      // Add "runtime" to the set of packages to be loaded.
-//      conf.Import("runtime")
-//
-//      // Adds "fmt" and "fmt_test" to the set of packages
-//      // to be loaded.  "fmt" will include *_test.go files.
-//      conf.ImportWithTests("fmt")
-//
-//      // Finally, load all the packages specified by the configuration.
-//      prog, err := conf.Load()
-//
-// See examples_test.go for examples of API usage.
-//
-//
-// CONCEPTS AND TERMINOLOGY
-//
-// The WORKSPACE is the set of packages accessible to the loader.  The
-// workspace is defined by Config.Build, a *build.Context.  The
-// default context treats subdirectories of $GOROOT and $GOPATH as
-// packages, but this behavior may be overridden.
-//
-// An AD HOC package is one specified as a set of source files on the
-// command line.  In the simplest case, it may consist of a single file
-// such as $GOROOT/src/net/http/triv.go.
-//
-// EXTERNAL TEST packages are those comprised of a set of *_test.go
-// files all with the same 'package foo_test' declaration, all in the
-// same directory.  (go/build.Package calls these files XTestFiles.)
-//
-// An IMPORTABLE package is one that can be referred to by some import
-// spec.  Every importable package is uniquely identified by its
-// PACKAGE PATH or just PATH, a string such as "fmt", "encoding/json",
-// or "cmd/vendor/golang.org/x/arch/x86/x86asm".  A package path
-// typically denotes a subdirectory of the workspace.
-//
-// An import declaration uses an IMPORT PATH to refer to a package.
-// Most import declarations use the package path as the import path.
-//
-// Due to VENDORING (https://golang.org/s/go15vendor), the
-// interpretation of an import path may depend on the directory in which
-// it appears.  To resolve an import path to a package path, go/build
-// must search the enclosing directories for a subdirectory named
-// "vendor".
-//
-// ad hoc packages and external test packages are NON-IMPORTABLE.  The
-// path of an ad hoc package is inferred from the package
-// declarations of its files and is therefore not a unique package key.
-// For example, Config.CreatePkgs may specify two initial ad hoc
-// packages, both with path "main".
-//
-// An AUGMENTED package is an importable package P plus all the
-// *_test.go files with same 'package foo' declaration as P.
-// (go/build.Package calls these files TestFiles.)
-//
-// The INITIAL packages are those specified in the configuration.  A
-// DEPENDENCY is a package loaded to satisfy an import in an initial
-// package or another dependency.
-//
-package loader
-
-// IMPLEMENTATION NOTES
-//
-// 'go test', in-package test files, and import cycles
-// ---------------------------------------------------
-//
-// An external test package may depend upon members of the augmented
-// package that are not in the unaugmented package, such as functions
-// that expose internals.  (See bufio/export_test.go for an example.)
-// So, the loader must ensure that for each external test package
-// it loads, it also augments the corresponding non-test package.
-//
-// The import graph over n unaugmented packages must be acyclic; the
-// import graph over n-1 unaugmented packages plus one augmented
-// package must also be acyclic.  ('go test' relies on this.)  But the
-// import graph over n augmented packages may contain cycles.
-//
-// First, all the (unaugmented) non-test packages and their
-// dependencies are imported in the usual way; the loader reports an
-// error if it detects an import cycle.
-//
-// Then, each package P for which testing is desired is augmented by
-// the list P' of its in-package test files, by calling
-// (*types.Checker).Files.  This arrangement ensures that P' may
-// reference definitions within P, but P may not reference definitions
-// within P'.  Furthermore, P' may import any other package, including
-// ones that depend upon P, without an import cycle error.
-//
-// Consider two packages A and B, both of which have lists of
-// in-package test files we'll call A' and B', and which have the
-// following import graph edges:
-//    B  imports A
-//    B' imports A
-//    A' imports B
-// This last edge would be expected to create an error were it not
-// for the special type-checking discipline above.
-// Cycles of size greater than two are possible.  For example:
-//   compress/bzip2/bzip2_test.go (package bzip2)  imports "io/ioutil"
-//   io/ioutil/tempfile_test.go   (package ioutil) imports "regexp"
-//   regexp/exec_test.go          (package regexp) imports "compress/bzip2"
-//
-//
-// Concurrency
-// -----------
-//
-// Let us define the import dependency graph as follows.  Each node is a
-// list of files passed to (Checker).Files at once.  Many of these lists
-// are the production code of an importable Go package, so those nodes
-// are labelled by the package's path.  The remaining nodes are
-// ad hoc packages and lists of in-package *_test.go files that augment
-// an importable package; those nodes have no label.
-//
-// The edges of the graph represent import statements appearing within a
-// file.  An edge connects a node (a list of files) to the node it
-// imports, which is importable and thus always labelled.
-//
-// Loading is controlled by this dependency graph.
-//
-// To reduce I/O latency, we start loading a package's dependencies
-// asynchronously as soon as we've parsed its files and enumerated its
-// imports (scanImports).  This performs a preorder traversal of the
-// import dependency graph.
-//
-// To exploit hardware parallelism, we type-check unrelated packages in
-// parallel, where "unrelated" means not ordered by the partial order of
-// the import dependency graph.
-//
-// We use a concurrency-safe non-blocking cache (importer.imported) to
-// record the results of type-checking, whether success or failure.  An
-// entry is created in this cache by startLoad the first time the
-// package is imported.  The first goroutine to request an entry becomes
-// responsible for completing the task and broadcasting completion to
-// subsequent requestors, which block until then.
-//
-// Type checking occurs in (parallel) postorder: we cannot type-check a
-// set of files until we have loaded and type-checked all of their
-// immediate dependencies (and thus all of their transitive
-// dependencies). If the input were guaranteed free of import cycles,
-// this would be trivial: we could simply wait for completion of the
-// dependencies and then invoke the typechecker.
-//
-// But as we saw in the 'go test' section above, some cycles in the
-// import graph over packages are actually legal, so long as the
-// cycle-forming edge originates in the in-package test files that
-// augment the package.  This explains why the nodes of the import
-// dependency graph are not packages, but lists of files: the unlabelled
-// nodes avoid the cycles.  Consider packages A and B where B imports A
-// and A's in-package tests AT import B.  The naively constructed import
-// graph over packages would contain a cycle (A+AT) --> B --> (A+AT) but
-// the graph over lists of files is AT --> B --> A, where AT is an
-// unlabelled node.
-//
-// Awaiting completion of the dependencies in a cyclic graph would
-// deadlock, so we must materialize the import dependency graph (as
-// importer.graph) and check whether each import edge forms a cycle.  If
-// x imports y, and the graph already contains a path from y to x, then
-// there is an import cycle, in which case the processing of x must not
-// wait for the completion of processing of y.
-//
-// When the type-checker makes a callback (doImport) to the loader for a
-// given import edge, there are two possible cases.  In the normal case,
-// the dependency has already been completely type-checked; doImport
-// does a cache lookup and returns it.  In the cyclic case, the entry in
-// the cache is still necessarily incomplete, indicating a cycle.  We
-// perform the cycle check again to obtain the error message, and return
-// the error.
-//
-// The result of using concurrency is about a 2.5x speedup for stdlib_test.
-
-// TODO(adonovan): overhaul the package documentation.
diff --git a/installer/vendor/golang.org/x/tools/go/loader/example_test.go b/installer/vendor/golang.org/x/tools/go/loader/example_test.go
deleted file mode 100644
index 88adde3cce..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/example_test.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.8,!go1.9 // TODO(adonovan) determine which versions we need to test here
-// +build !windows
-
-package loader_test
-
-import (
-	"fmt"
-	"go/token"
-	"log"
-	"path/filepath"
-	"runtime"
-	"sort"
-	"strings"
-
-	"golang.org/x/tools/go/loader"
-)
-
-func printProgram(prog *loader.Program) {
-	// Created packages are the initial packages specified by a call
-	// to CreateFromFilenames or CreateFromFiles.
-	var names []string
-	for _, info := range prog.Created {
-		names = append(names, info.Pkg.Path())
-	}
-	fmt.Printf("created: %s\n", names)
-
-	// Imported packages are the initial packages specified by a
-	// call to Import or ImportWithTests.
-	names = nil
-	for _, info := range prog.Imported {
-		if strings.Contains(info.Pkg.Path(), "internal") {
-			continue // skip, to reduce fragility
-		}
-		names = append(names, info.Pkg.Path())
-	}
-	sort.Strings(names)
-	fmt.Printf("imported: %s\n", names)
-
-	// InitialPackages contains the union of created and imported.
-	names = nil
-	for _, info := range prog.InitialPackages() {
-		names = append(names, info.Pkg.Path())
-	}
-	sort.Strings(names)
-	fmt.Printf("initial: %s\n", names)
-
-	// AllPackages contains all initial packages and their dependencies.
-	names = nil
-	for pkg := range prog.AllPackages {
-		names = append(names, pkg.Path())
-	}
-	sort.Strings(names)
-	fmt.Printf("all: %s\n", names)
-}
-
-func printFilenames(fset *token.FileSet, info *loader.PackageInfo) {
-	var names []string
-	for _, f := range info.Files {
-		names = append(names, filepath.Base(fset.File(f.Pos()).Name()))
-	}
-	fmt.Printf("%s.Files: %s\n", info.Pkg.Path(), names)
-}
-
-// This example loads a set of packages and all of their dependencies
-// from a typical command-line.  FromArgs parses a command line and
-// makes calls to the other methods of Config shown in the examples that
-// follow.
-func ExampleConfig_FromArgs() {
-	args := []string{"mytool", "unicode/utf8", "errors", "runtime", "--", "foo", "bar"}
-	const wantTests = false
-
-	var conf loader.Config
-	rest, err := conf.FromArgs(args[1:], wantTests)
-	prog, err := conf.Load()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	fmt.Printf("rest: %s\n", rest)
-	printProgram(prog)
-	// Output:
-	// rest: [foo bar]
-	// created: []
-	// imported: [errors runtime unicode/utf8]
-	// initial: [errors runtime unicode/utf8]
-	// all: [errors runtime runtime/internal/atomic runtime/internal/sys unicode/utf8 unsafe]
-}
-
-// This example creates and type-checks a single package (without tests)
-// from a list of filenames, and loads all of its dependencies.
-// (The input files are actually only a small part of the math/cmplx package.)
-func ExampleConfig_CreateFromFilenames() {
-	var conf loader.Config
-	conf.CreateFromFilenames("math/cmplx",
-		filepath.Join(runtime.GOROOT(), "src/math/cmplx/abs.go"),
-		filepath.Join(runtime.GOROOT(), "src/math/cmplx/sin.go"))
-	prog, err := conf.Load()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	printProgram(prog)
-	// Output:
-	// created: [math/cmplx]
-	// imported: []
-	// initial: [math/cmplx]
-	// all: [math math/cmplx unsafe]
-}
-
-// In the examples below, for stability, the chosen packages are
-// relatively small, platform-independent, and low-level (and thus
-// infrequently changing).
-// The strconv package has internal and external tests.
-
-const hello = `package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("Hello, world.")
-}
-`
-
-// This example creates and type-checks a package from a list of
-// already-parsed files, and loads all its dependencies.
-func ExampleConfig_CreateFromFiles() {
-	var conf loader.Config
-	f, err := conf.ParseFile("hello.go", hello)
-	if err != nil {
-		log.Fatal(err)
-	}
-	conf.CreateFromFiles("hello", f)
-	prog, err := conf.Load()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	printProgram(prog)
-	printFilenames(prog.Fset, prog.Package("strconv"))
-	// Output:
-	// created: [hello]
-	// imported: []
-	// initial: [hello]
-	// all: [errors fmt hello internal/race io math os reflect runtime runtime/internal/atomic runtime/internal/sys strconv sync sync/atomic syscall time unicode/utf8 unsafe]
-	// strconv.Files: [atob.go atof.go atoi.go decimal.go doc.go extfloat.go ftoa.go isprint.go itoa.go quote.go]
-}
-
-// This example imports three packages, including the tests for one of
-// them, and loads all their dependencies.
-func ExampleConfig_Import() {
-	// ImportWithTest("strconv") causes strconv to include
-	// internal_test.go, and creates an external test package,
-	// strconv_test.
-	// (Compare with the example of CreateFromFiles.)
-
-	var conf loader.Config
-	conf.Import("unicode/utf8")
-	conf.Import("errors")
-	conf.ImportWithTests("strconv")
-	prog, err := conf.Load()
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	printProgram(prog)
-	printFilenames(prog.Fset, prog.Package("strconv"))
-	printFilenames(prog.Fset, prog.Package("strconv_test"))
-	// Output:
-	// created: [strconv_test]
-	// imported: [errors strconv unicode/utf8]
-	// initial: [errors strconv strconv_test unicode/utf8]
-	// all: [bufio bytes errors flag fmt internal/race io log math math/rand os reflect runtime runtime/debug runtime/internal/atomic runtime/internal/sys runtime/trace sort strconv strconv_test strings sync sync/atomic syscall testing time unicode unicode/utf8 unsafe]
-	// strconv.Files: [atob.go atof.go atoi.go decimal.go doc.go extfloat.go ftoa.go isprint.go itoa.go quote.go internal_test.go]
-	// strconv_test.Files: [atob_test.go atof_test.go atoi_test.go decimal_test.go example_test.go fp_test.go ftoa_test.go itoa_test.go quote_test.go strconv_test.go]
-}
diff --git a/installer/vendor/golang.org/x/tools/go/loader/loader.go b/installer/vendor/golang.org/x/tools/go/loader/loader.go
deleted file mode 100644
index de756f7fcf..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/loader.go
+++ /dev/null
@@ -1,1077 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package loader
-
-// See doc.go for package documentation and implementation notes.
-
-import (
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-var ignoreVendor build.ImportMode
-
-const trace = false // show timing info for type-checking
-
-// Config specifies the configuration for loading a whole program from
-// Go source code.
-// The zero value for Config is a ready-to-use default configuration.
-type Config struct {
-	// Fset is the file set for the parser to use when loading the
-	// program.  If nil, it may be lazily initialized by any
-	// method of Config.
-	Fset *token.FileSet
-
-	// ParserMode specifies the mode to be used by the parser when
-	// loading source packages.
-	ParserMode parser.Mode
-
-	// TypeChecker contains options relating to the type checker.
-	//
-	// The supplied IgnoreFuncBodies is not used; the effective
-	// value comes from the TypeCheckFuncBodies func below.
-	// The supplied Import function is not used either.
-	TypeChecker types.Config
-
-	// TypeCheckFuncBodies is a predicate over package paths.
-	// A package for which the predicate is false will
-	// have its package-level declarations type checked, but not
-	// its function bodies; this can be used to quickly load
-	// dependencies from source.  If nil, all func bodies are type
-	// checked.
-	TypeCheckFuncBodies func(path string) bool
-
-	// If Build is non-nil, it is used to locate source packages.
-	// Otherwise &build.Default is used.
-	//
-	// By default, cgo is invoked to preprocess Go files that
-	// import the fake package "C".  This behaviour can be
-	// disabled by setting CGO_ENABLED=0 in the environment prior
-	// to startup, or by setting Build.CgoEnabled=false.
-	Build *build.Context
-
-	// The current directory, used for resolving relative package
-	// references such as "./go/loader".  If empty, os.Getwd will be
-	// used instead.
-	Cwd string
-
-	// If DisplayPath is non-nil, it is used to transform each
-	// file name obtained from Build.Import().  This can be used
-	// to prevent a virtualized build.Config's file names from
-	// leaking into the user interface.
-	DisplayPath func(path string) string
-
-	// If AllowErrors is true, Load will return a Program even
-	// if some of the its packages contained I/O, parser or type
-	// errors; such errors are accessible via PackageInfo.Errors.  If
-	// false, Load will fail if any package had an error.
-	AllowErrors bool
-
-	// CreatePkgs specifies a list of non-importable initial
-	// packages to create.  The resulting packages will appear in
-	// the corresponding elements of the Program.Created slice.
-	CreatePkgs []PkgSpec
-
-	// ImportPkgs specifies a set of initial packages to load.
-	// The map keys are package paths.
-	//
-	// The map value indicates whether to load tests.  If true, Load
-	// will add and type-check two lists of files to the package:
-	// non-test files followed by in-package *_test.go files.  In
-	// addition, it will append the external test package (if any)
-	// to Program.Created.
-	ImportPkgs map[string]bool
-
-	// FindPackage is called during Load to create the build.Package
-	// for a given import path from a given directory.
-	// If FindPackage is nil, (*build.Context).Import is used.
-	// A client may use this hook to adapt to a proprietary build
-	// system that does not follow the "go build" layout
-	// conventions, for example.
-	//
-	// It must be safe to call concurrently from multiple goroutines.
-	FindPackage func(ctxt *build.Context, importPath, fromDir string, mode build.ImportMode) (*build.Package, error)
-
-	// AfterTypeCheck is called immediately after a list of files
-	// has been type-checked and appended to info.Files.
-	//
-	// This optional hook function is the earliest opportunity for
-	// the client to observe the output of the type checker,
-	// which may be useful to reduce analysis latency when loading
-	// a large program.
-	//
-	// The function is permitted to modify info.Info, for instance
-	// to clear data structures that are no longer needed, which can
-	// dramatically reduce peak memory consumption.
-	//
-	// The function may be called twice for the same PackageInfo:
-	// once for the files of the package and again for the
-	// in-package test files.
-	//
-	// It must be safe to call concurrently from multiple goroutines.
-	AfterTypeCheck func(info *PackageInfo, files []*ast.File)
-}
-
-// A PkgSpec specifies a non-importable package to be created by Load.
-// Files are processed first, but typically only one of Files and
-// Filenames is provided.  The path needn't be globally unique.
-//
-// For vendoring purposes, the package's directory is the one that
-// contains the first file.
-type PkgSpec struct {
-	Path      string      // package path ("" => use package declaration)
-	Files     []*ast.File // ASTs of already-parsed files
-	Filenames []string    // names of files to be parsed
-}
-
-// A Program is a Go program loaded from source as specified by a Config.
-type Program struct {
-	Fset *token.FileSet // the file set for this program
-
-	// Created[i] contains the initial package whose ASTs or
-	// filenames were supplied by Config.CreatePkgs[i], followed by
-	// the external test package, if any, of each package in
-	// Config.ImportPkgs ordered by ImportPath.
-	//
-	// NOTE: these files must not import "C".  Cgo preprocessing is
-	// only performed on imported packages, not ad hoc packages.
-	//
-	// TODO(adonovan): we need to copy and adapt the logic of
-	// goFilesPackage (from $GOROOT/src/cmd/go/build.go) and make
-	// Config.Import and Config.Create methods return the same kind
-	// of entity, essentially a build.Package.
-	// Perhaps we can even reuse that type directly.
-	Created []*PackageInfo
-
-	// Imported contains the initially imported packages,
-	// as specified by Config.ImportPkgs.
-	Imported map[string]*PackageInfo
-
-	// AllPackages contains the PackageInfo of every package
-	// encountered by Load: all initial packages and all
-	// dependencies, including incomplete ones.
-	AllPackages map[*types.Package]*PackageInfo
-
-	// importMap is the canonical mapping of package paths to
-	// packages.  It contains all Imported initial packages, but not
-	// Created ones, and all imported dependencies.
-	importMap map[string]*types.Package
-}
-
-// PackageInfo holds the ASTs and facts derived by the type-checker
-// for a single package.
-//
-// Not mutated once exposed via the API.
-//
-type PackageInfo struct {
-	Pkg                   *types.Package
-	Importable            bool        // true if 'import "Pkg.Path()"' would resolve to this
-	TransitivelyErrorFree bool        // true if Pkg and all its dependencies are free of errors
-	Files                 []*ast.File // syntax trees for the package's files
-	Errors                []error     // non-nil if the package had errors
-	types.Info                        // type-checker deductions.
-	dir                   string      // package directory
-
-	checker   *types.Checker // transient type-checker state
-	errorFunc func(error)
-}
-
-func (info *PackageInfo) String() string { return info.Pkg.Path() }
-
-func (info *PackageInfo) appendError(err error) {
-	if info.errorFunc != nil {
-		info.errorFunc(err)
-	} else {
-		fmt.Fprintln(os.Stderr, err)
-	}
-	info.Errors = append(info.Errors, err)
-}
-
-func (conf *Config) fset() *token.FileSet {
-	if conf.Fset == nil {
-		conf.Fset = token.NewFileSet()
-	}
-	return conf.Fset
-}
-
-// ParseFile is a convenience function (intended for testing) that invokes
-// the parser using the Config's FileSet, which is initialized if nil.
-//
-// src specifies the parser input as a string, []byte, or io.Reader, and
-// filename is its apparent name.  If src is nil, the contents of
-// filename are read from the file system.
-//
-func (conf *Config) ParseFile(filename string, src interface{}) (*ast.File, error) {
-	// TODO(adonovan): use conf.build() etc like parseFiles does.
-	return parser.ParseFile(conf.fset(), filename, src, conf.ParserMode)
-}
-
-// FromArgsUsage is a partial usage message that applications calling
-// FromArgs may wish to include in their -help output.
-const FromArgsUsage = `
-<args> is a list of arguments denoting a set of initial packages.
-It may take one of two forms:
-
-1. A list of *.go source files.
-
-   All of the specified files are loaded, parsed and type-checked
-   as a single package.  All the files must belong to the same directory.
-
-2. A list of import paths, each denoting a package.
-
-   The package's directory is found relative to the $GOROOT and
-   $GOPATH using similar logic to 'go build', and the *.go files in
-   that directory are loaded, parsed and type-checked as a single
-   package.
-
-   In addition, all *_test.go files in the directory are then loaded
-   and parsed.  Those files whose package declaration equals that of
-   the non-*_test.go files are included in the primary package.  Test
-   files whose package declaration ends with "_test" are type-checked
-   as another package, the 'external' test package, so that a single
-   import path may denote two packages.  (Whether this behaviour is
-   enabled is tool-specific, and may depend on additional flags.)
-
-A '--' argument terminates the list of packages.
-`
-
-// FromArgs interprets args as a set of initial packages to load from
-// source and updates the configuration.  It returns the list of
-// unconsumed arguments.
-//
-// It is intended for use in command-line interfaces that require a
-// set of initial packages to be specified; see FromArgsUsage message
-// for details.
-//
-// Only superficial errors are reported at this stage; errors dependent
-// on I/O are detected during Load.
-//
-func (conf *Config) FromArgs(args []string, xtest bool) ([]string, error) {
-	var rest []string
-	for i, arg := range args {
-		if arg == "--" {
-			rest = args[i+1:]
-			args = args[:i]
-			break // consume "--" and return the remaining args
-		}
-	}
-
-	if len(args) > 0 && strings.HasSuffix(args[0], ".go") {
-		// Assume args is a list of a *.go files
-		// denoting a single ad hoc package.
-		for _, arg := range args {
-			if !strings.HasSuffix(arg, ".go") {
-				return nil, fmt.Errorf("named files must be .go files: %s", arg)
-			}
-		}
-		conf.CreateFromFilenames("", args...)
-	} else {
-		// Assume args are directories each denoting a
-		// package and (perhaps) an external test, iff xtest.
-		for _, arg := range args {
-			if xtest {
-				conf.ImportWithTests(arg)
-			} else {
-				conf.Import(arg)
-			}
-		}
-	}
-
-	return rest, nil
-}
-
-// CreateFromFilenames is a convenience function that adds
-// a conf.CreatePkgs entry to create a package of the specified *.go
-// files.
-//
-func (conf *Config) CreateFromFilenames(path string, filenames ...string) {
-	conf.CreatePkgs = append(conf.CreatePkgs, PkgSpec{Path: path, Filenames: filenames})
-}
-
-// CreateFromFiles is a convenience function that adds a conf.CreatePkgs
-// entry to create package of the specified path and parsed files.
-//
-func (conf *Config) CreateFromFiles(path string, files ...*ast.File) {
-	conf.CreatePkgs = append(conf.CreatePkgs, PkgSpec{Path: path, Files: files})
-}
-
-// ImportWithTests is a convenience function that adds path to
-// ImportPkgs, the set of initial source packages located relative to
-// $GOPATH.  The package will be augmented by any *_test.go files in
-// its directory that contain a "package x" (not "package x_test")
-// declaration.
-//
-// In addition, if any *_test.go files contain a "package x_test"
-// declaration, an additional package comprising just those files will
-// be added to CreatePkgs.
-//
-func (conf *Config) ImportWithTests(path string) { conf.addImport(path, true) }
-
-// Import is a convenience function that adds path to ImportPkgs, the
-// set of initial packages that will be imported from source.
-//
-func (conf *Config) Import(path string) { conf.addImport(path, false) }
-
-func (conf *Config) addImport(path string, tests bool) {
-	if path == "C" {
-		return // ignore; not a real package
-	}
-	if conf.ImportPkgs == nil {
-		conf.ImportPkgs = make(map[string]bool)
-	}
-	conf.ImportPkgs[path] = conf.ImportPkgs[path] || tests
-}
-
-// PathEnclosingInterval returns the PackageInfo and ast.Node that
-// contain source interval [start, end), and all the node's ancestors
-// up to the AST root.  It searches all ast.Files of all packages in prog.
-// exact is defined as for astutil.PathEnclosingInterval.
-//
-// The zero value is returned if not found.
-//
-func (prog *Program) PathEnclosingInterval(start, end token.Pos) (pkg *PackageInfo, path []ast.Node, exact bool) {
-	for _, info := range prog.AllPackages {
-		for _, f := range info.Files {
-			if f.Pos() == token.NoPos {
-				// This can happen if the parser saw
-				// too many errors and bailed out.
-				// (Use parser.AllErrors to prevent that.)
-				continue
-			}
-			if !tokenFileContainsPos(prog.Fset.File(f.Pos()), start) {
-				continue
-			}
-			if path, exact := astutil.PathEnclosingInterval(f, start, end); path != nil {
-				return info, path, exact
-			}
-		}
-	}
-	return nil, nil, false
-}
-
-// InitialPackages returns a new slice containing the set of initial
-// packages (Created + Imported) in unspecified order.
-//
-func (prog *Program) InitialPackages() []*PackageInfo {
-	infos := make([]*PackageInfo, 0, len(prog.Created)+len(prog.Imported))
-	infos = append(infos, prog.Created...)
-	for _, info := range prog.Imported {
-		infos = append(infos, info)
-	}
-	return infos
-}
-
-// Package returns the ASTs and results of type checking for the
-// specified package.
-func (prog *Program) Package(path string) *PackageInfo {
-	if info, ok := prog.AllPackages[prog.importMap[path]]; ok {
-		return info
-	}
-	for _, info := range prog.Created {
-		if path == info.Pkg.Path() {
-			return info
-		}
-	}
-	return nil
-}
-
-// ---------- Implementation ----------
-
-// importer holds the working state of the algorithm.
-type importer struct {
-	conf  *Config   // the client configuration
-	start time.Time // for logging
-
-	progMu sync.Mutex // guards prog
-	prog   *Program   // the resulting program
-
-	// findpkg is a memoization of FindPackage.
-	findpkgMu sync.Mutex // guards findpkg
-	findpkg   map[findpkgKey]*findpkgValue
-
-	importedMu sync.Mutex             // guards imported
-	imported   map[string]*importInfo // all imported packages (incl. failures) by import path
-
-	// import dependency graph: graph[x][y] => x imports y
-	//
-	// Since non-importable packages cannot be cyclic, we ignore
-	// their imports, thus we only need the subgraph over importable
-	// packages.  Nodes are identified by their import paths.
-	graphMu sync.Mutex
-	graph   map[string]map[string]bool
-}
-
-type findpkgKey struct {
-	importPath string
-	fromDir    string
-	mode       build.ImportMode
-}
-
-type findpkgValue struct {
-	ready chan struct{} // closed to broadcast readiness
-	bp    *build.Package
-	err   error
-}
-
-// importInfo tracks the success or failure of a single import.
-//
-// Upon completion, exactly one of info and err is non-nil:
-// info on successful creation of a package, err otherwise.
-// A successful package may still contain type errors.
-//
-type importInfo struct {
-	path     string        // import path
-	info     *PackageInfo  // results of typechecking (including errors)
-	complete chan struct{} // closed to broadcast that info is set.
-}
-
-// awaitCompletion blocks until ii is complete,
-// i.e. the info field is safe to inspect.
-func (ii *importInfo) awaitCompletion() {
-	<-ii.complete // wait for close
-}
-
-// Complete marks ii as complete.
-// Its info and err fields will not be subsequently updated.
-func (ii *importInfo) Complete(info *PackageInfo) {
-	if info == nil {
-		panic("info == nil")
-	}
-	ii.info = info
-	close(ii.complete)
-}
-
-type importError struct {
-	path string // import path
-	err  error  // reason for failure to create a package
-}
-
-// Load creates the initial packages specified by conf.{Create,Import}Pkgs,
-// loading their dependencies packages as needed.
-//
-// On success, Load returns a Program containing a PackageInfo for
-// each package.  On failure, it returns an error.
-//
-// If AllowErrors is true, Load will return a Program even if some
-// packages contained I/O, parser or type errors, or if dependencies
-// were missing.  (Such errors are accessible via PackageInfo.Errors.  If
-// false, Load will fail if any package had an error.
-//
-// It is an error if no packages were loaded.
-//
-func (conf *Config) Load() (*Program, error) {
-	// Create a simple default error handler for parse/type errors.
-	if conf.TypeChecker.Error == nil {
-		conf.TypeChecker.Error = func(e error) { fmt.Fprintln(os.Stderr, e) }
-	}
-
-	// Set default working directory for relative package references.
-	if conf.Cwd == "" {
-		var err error
-		conf.Cwd, err = os.Getwd()
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Install default FindPackage hook using go/build logic.
-	if conf.FindPackage == nil {
-		conf.FindPackage = (*build.Context).Import
-	}
-
-	prog := &Program{
-		Fset:        conf.fset(),
-		Imported:    make(map[string]*PackageInfo),
-		importMap:   make(map[string]*types.Package),
-		AllPackages: make(map[*types.Package]*PackageInfo),
-	}
-
-	imp := importer{
-		conf:     conf,
-		prog:     prog,
-		findpkg:  make(map[findpkgKey]*findpkgValue),
-		imported: make(map[string]*importInfo),
-		start:    time.Now(),
-		graph:    make(map[string]map[string]bool),
-	}
-
-	// -- loading proper (concurrent phase) --------------------------------
-
-	var errpkgs []string // packages that contained errors
-
-	// Load the initially imported packages and their dependencies,
-	// in parallel.
-	// No vendor check on packages imported from the command line.
-	infos, importErrors := imp.importAll("", conf.Cwd, conf.ImportPkgs, ignoreVendor)
-	for _, ie := range importErrors {
-		conf.TypeChecker.Error(ie.err) // failed to create package
-		errpkgs = append(errpkgs, ie.path)
-	}
-	for _, info := range infos {
-		prog.Imported[info.Pkg.Path()] = info
-	}
-
-	// Augment the designated initial packages by their tests.
-	// Dependencies are loaded in parallel.
-	var xtestPkgs []*build.Package
-	for importPath, augment := range conf.ImportPkgs {
-		if !augment {
-			continue
-		}
-
-		// No vendor check on packages imported from command line.
-		bp, err := imp.findPackage(importPath, conf.Cwd, ignoreVendor)
-		if err != nil {
-			// Package not found, or can't even parse package declaration.
-			// Already reported by previous loop; ignore it.
-			continue
-		}
-
-		// Needs external test package?
-		if len(bp.XTestGoFiles) > 0 {
-			xtestPkgs = append(xtestPkgs, bp)
-		}
-
-		// Consult the cache using the canonical package path.
-		path := bp.ImportPath
-		imp.importedMu.Lock() // (unnecessary, we're sequential here)
-		ii, ok := imp.imported[path]
-		// Paranoid checks added due to issue #11012.
-		if !ok {
-			// Unreachable.
-			// The previous loop called importAll and thus
-			// startLoad for each path in ImportPkgs, which
-			// populates imp.imported[path] with a non-zero value.
-			panic(fmt.Sprintf("imported[%q] not found", path))
-		}
-		if ii == nil {
-			// Unreachable.
-			// The ii values in this loop are the same as in
-			// the previous loop, which enforced the invariant
-			// that at least one of ii.err and ii.info is non-nil.
-			panic(fmt.Sprintf("imported[%q] == nil", path))
-		}
-		if ii.info == nil {
-			// Unreachable.
-			// awaitCompletion has the postcondition
-			// ii.info != nil.
-			panic(fmt.Sprintf("imported[%q].info = nil", path))
-		}
-		info := ii.info
-		imp.importedMu.Unlock()
-
-		// Parse the in-package test files.
-		files, errs := imp.conf.parsePackageFiles(bp, 't')
-		for _, err := range errs {
-			info.appendError(err)
-		}
-
-		// The test files augmenting package P cannot be imported,
-		// but may import packages that import P,
-		// so we must disable the cycle check.
-		imp.addFiles(info, files, false)
-	}
-
-	createPkg := func(path, dir string, files []*ast.File, errs []error) {
-		info := imp.newPackageInfo(path, dir)
-		for _, err := range errs {
-			info.appendError(err)
-		}
-
-		// Ad hoc packages are non-importable,
-		// so no cycle check is needed.
-		// addFiles loads dependencies in parallel.
-		imp.addFiles(info, files, false)
-		prog.Created = append(prog.Created, info)
-	}
-
-	// Create packages specified by conf.CreatePkgs.
-	for _, cp := range conf.CreatePkgs {
-		files, errs := parseFiles(conf.fset(), conf.build(), nil, conf.Cwd, cp.Filenames, conf.ParserMode)
-		files = append(files, cp.Files...)
-
-		path := cp.Path
-		if path == "" {
-			if len(files) > 0 {
-				path = files[0].Name.Name
-			} else {
-				path = "(unnamed)"
-			}
-		}
-
-		dir := conf.Cwd
-		if len(files) > 0 && files[0].Pos().IsValid() {
-			dir = filepath.Dir(conf.fset().File(files[0].Pos()).Name())
-		}
-		createPkg(path, dir, files, errs)
-	}
-
-	// Create external test packages.
-	sort.Sort(byImportPath(xtestPkgs))
-	for _, bp := range xtestPkgs {
-		files, errs := imp.conf.parsePackageFiles(bp, 'x')
-		createPkg(bp.ImportPath+"_test", bp.Dir, files, errs)
-	}
-
-	// -- finishing up (sequential) ----------------------------------------
-
-	if len(prog.Imported)+len(prog.Created) == 0 {
-		return nil, errors.New("no initial packages were loaded")
-	}
-
-	// Create infos for indirectly imported packages.
-	// e.g. incomplete packages without syntax, loaded from export data.
-	for _, obj := range prog.importMap {
-		info := prog.AllPackages[obj]
-		if info == nil {
-			prog.AllPackages[obj] = &PackageInfo{Pkg: obj, Importable: true}
-		} else {
-			// finished
-			info.checker = nil
-			info.errorFunc = nil
-		}
-	}
-
-	if !conf.AllowErrors {
-		// Report errors in indirectly imported packages.
-		for _, info := range prog.AllPackages {
-			if len(info.Errors) > 0 {
-				errpkgs = append(errpkgs, info.Pkg.Path())
-			}
-		}
-		if errpkgs != nil {
-			var more string
-			if len(errpkgs) > 3 {
-				more = fmt.Sprintf(" and %d more", len(errpkgs)-3)
-				errpkgs = errpkgs[:3]
-			}
-			return nil, fmt.Errorf("couldn't load packages due to errors: %s%s",
-				strings.Join(errpkgs, ", "), more)
-		}
-	}
-
-	markErrorFreePackages(prog.AllPackages)
-
-	return prog, nil
-}
-
-type byImportPath []*build.Package
-
-func (b byImportPath) Len() int           { return len(b) }
-func (b byImportPath) Less(i, j int) bool { return b[i].ImportPath < b[j].ImportPath }
-func (b byImportPath) Swap(i, j int)      { b[i], b[j] = b[j], b[i] }
-
-// markErrorFreePackages sets the TransitivelyErrorFree flag on all
-// applicable packages.
-func markErrorFreePackages(allPackages map[*types.Package]*PackageInfo) {
-	// Build the transpose of the import graph.
-	importedBy := make(map[*types.Package]map[*types.Package]bool)
-	for P := range allPackages {
-		for _, Q := range P.Imports() {
-			clients, ok := importedBy[Q]
-			if !ok {
-				clients = make(map[*types.Package]bool)
-				importedBy[Q] = clients
-			}
-			clients[P] = true
-		}
-	}
-
-	// Find all packages reachable from some error package.
-	reachable := make(map[*types.Package]bool)
-	var visit func(*types.Package)
-	visit = func(p *types.Package) {
-		if !reachable[p] {
-			reachable[p] = true
-			for q := range importedBy[p] {
-				visit(q)
-			}
-		}
-	}
-	for _, info := range allPackages {
-		if len(info.Errors) > 0 {
-			visit(info.Pkg)
-		}
-	}
-
-	// Mark the others as "transitively error-free".
-	for _, info := range allPackages {
-		if !reachable[info.Pkg] {
-			info.TransitivelyErrorFree = true
-		}
-	}
-}
-
-// build returns the effective build context.
-func (conf *Config) build() *build.Context {
-	if conf.Build != nil {
-		return conf.Build
-	}
-	return &build.Default
-}
-
-// parsePackageFiles enumerates the files belonging to package path,
-// then loads, parses and returns them, plus a list of I/O or parse
-// errors that were encountered.
-//
-// 'which' indicates which files to include:
-//    'g': include non-test *.go source files (GoFiles + processed CgoFiles)
-//    't': include in-package *_test.go source files (TestGoFiles)
-//    'x': include external *_test.go source files. (XTestGoFiles)
-//
-func (conf *Config) parsePackageFiles(bp *build.Package, which rune) ([]*ast.File, []error) {
-	if bp.ImportPath == "unsafe" {
-		return nil, nil
-	}
-	var filenames []string
-	switch which {
-	case 'g':
-		filenames = bp.GoFiles
-	case 't':
-		filenames = bp.TestGoFiles
-	case 'x':
-		filenames = bp.XTestGoFiles
-	default:
-		panic(which)
-	}
-
-	files, errs := parseFiles(conf.fset(), conf.build(), conf.DisplayPath, bp.Dir, filenames, conf.ParserMode)
-
-	// Preprocess CgoFiles and parse the outputs (sequentially).
-	if which == 'g' && bp.CgoFiles != nil {
-		cgofiles, err := processCgoFiles(bp, conf.fset(), conf.DisplayPath, conf.ParserMode)
-		if err != nil {
-			errs = append(errs, err)
-		} else {
-			files = append(files, cgofiles...)
-		}
-	}
-
-	return files, errs
-}
-
-// doImport imports the package denoted by path.
-// It implements the types.Importer signature.
-//
-// It returns an error if a package could not be created
-// (e.g. go/build or parse error), but type errors are reported via
-// the types.Config.Error callback (the first of which is also saved
-// in the package's PackageInfo).
-//
-// Idempotent.
-//
-func (imp *importer) doImport(from *PackageInfo, to string) (*types.Package, error) {
-	if to == "C" {
-		// This should be unreachable, but ad hoc packages are
-		// not currently subject to cgo preprocessing.
-		// See https://github.com/golang/go/issues/11627.
-		return nil, fmt.Errorf(`the loader doesn't cgo-process ad hoc packages like %q; see Go issue 11627`,
-			from.Pkg.Path())
-	}
-
-	bp, err := imp.findPackage(to, from.dir, 0)
-	if err != nil {
-		return nil, err
-	}
-
-	// The standard unsafe package is handled specially,
-	// and has no PackageInfo.
-	if bp.ImportPath == "unsafe" {
-		return types.Unsafe, nil
-	}
-
-	// Look for the package in the cache using its canonical path.
-	path := bp.ImportPath
-	imp.importedMu.Lock()
-	ii := imp.imported[path]
-	imp.importedMu.Unlock()
-	if ii == nil {
-		panic("internal error: unexpected import: " + path)
-	}
-	if ii.info != nil {
-		return ii.info.Pkg, nil
-	}
-
-	// Import of incomplete package: this indicates a cycle.
-	fromPath := from.Pkg.Path()
-	if cycle := imp.findPath(path, fromPath); cycle != nil {
-		cycle = append([]string{fromPath}, cycle...)
-		return nil, fmt.Errorf("import cycle: %s", strings.Join(cycle, " -> "))
-	}
-
-	panic("internal error: import of incomplete (yet acyclic) package: " + fromPath)
-}
-
-// findPackage locates the package denoted by the importPath in the
-// specified directory.
-func (imp *importer) findPackage(importPath, fromDir string, mode build.ImportMode) (*build.Package, error) {
-	// We use a non-blocking duplicate-suppressing cache (gopl.io §9.7)
-	// to avoid holding the lock around FindPackage.
-	key := findpkgKey{importPath, fromDir, mode}
-	imp.findpkgMu.Lock()
-	v, ok := imp.findpkg[key]
-	if ok {
-		// cache hit
-		imp.findpkgMu.Unlock()
-
-		<-v.ready // wait for entry to become ready
-	} else {
-		// Cache miss: this goroutine becomes responsible for
-		// populating the map entry and broadcasting its readiness.
-		v = &findpkgValue{ready: make(chan struct{})}
-		imp.findpkg[key] = v
-		imp.findpkgMu.Unlock()
-
-		ioLimit <- true
-		v.bp, v.err = imp.conf.FindPackage(imp.conf.build(), importPath, fromDir, mode)
-		<-ioLimit
-
-		if _, ok := v.err.(*build.NoGoError); ok {
-			v.err = nil // empty directory is not an error
-		}
-
-		close(v.ready) // broadcast ready condition
-	}
-	return v.bp, v.err
-}
-
-// importAll loads, parses, and type-checks the specified packages in
-// parallel and returns their completed importInfos in unspecified order.
-//
-// fromPath is the package path of the importing package, if it is
-// importable, "" otherwise.  It is used for cycle detection.
-//
-// fromDir is the directory containing the import declaration that
-// caused these imports.
-//
-func (imp *importer) importAll(fromPath, fromDir string, imports map[string]bool, mode build.ImportMode) (infos []*PackageInfo, errors []importError) {
-	// TODO(adonovan): opt: do the loop in parallel once
-	// findPackage is non-blocking.
-	var pending []*importInfo
-	for importPath := range imports {
-		bp, err := imp.findPackage(importPath, fromDir, mode)
-		if err != nil {
-			errors = append(errors, importError{
-				path: importPath,
-				err:  err,
-			})
-			continue
-		}
-		pending = append(pending, imp.startLoad(bp))
-	}
-
-	if fromPath != "" {
-		// We're loading a set of imports.
-		//
-		// We must record graph edges from the importing package
-		// to its dependencies, and check for cycles.
-		imp.graphMu.Lock()
-		deps, ok := imp.graph[fromPath]
-		if !ok {
-			deps = make(map[string]bool)
-			imp.graph[fromPath] = deps
-		}
-		for _, ii := range pending {
-			deps[ii.path] = true
-		}
-		imp.graphMu.Unlock()
-	}
-
-	for _, ii := range pending {
-		if fromPath != "" {
-			if cycle := imp.findPath(ii.path, fromPath); cycle != nil {
-				// Cycle-forming import: we must not await its
-				// completion since it would deadlock.
-				//
-				// We don't record the error in ii since
-				// the error is really associated with the
-				// cycle-forming edge, not the package itself.
-				// (Also it would complicate the
-				// invariants of importPath completion.)
-				if trace {
-					fmt.Fprintf(os.Stderr, "import cycle: %q\n", cycle)
-				}
-				continue
-			}
-		}
-		ii.awaitCompletion()
-		infos = append(infos, ii.info)
-	}
-
-	return infos, errors
-}
-
-// findPath returns an arbitrary path from 'from' to 'to' in the import
-// graph, or nil if there was none.
-func (imp *importer) findPath(from, to string) []string {
-	imp.graphMu.Lock()
-	defer imp.graphMu.Unlock()
-
-	seen := make(map[string]bool)
-	var search func(stack []string, importPath string) []string
-	search = func(stack []string, importPath string) []string {
-		if !seen[importPath] {
-			seen[importPath] = true
-			stack = append(stack, importPath)
-			if importPath == to {
-				return stack
-			}
-			for x := range imp.graph[importPath] {
-				if p := search(stack, x); p != nil {
-					return p
-				}
-			}
-		}
-		return nil
-	}
-	return search(make([]string, 0, 20), from)
-}
-
-// startLoad initiates the loading, parsing and type-checking of the
-// specified package and its dependencies, if it has not already begun.
-//
-// It returns an importInfo, not necessarily in a completed state.  The
-// caller must call awaitCompletion() before accessing its info field.
-//
-// startLoad is concurrency-safe and idempotent.
-//
-func (imp *importer) startLoad(bp *build.Package) *importInfo {
-	path := bp.ImportPath
-	imp.importedMu.Lock()
-	ii, ok := imp.imported[path]
-	if !ok {
-		ii = &importInfo{path: path, complete: make(chan struct{})}
-		imp.imported[path] = ii
-		go func() {
-			info := imp.load(bp)
-			ii.Complete(info)
-		}()
-	}
-	imp.importedMu.Unlock()
-
-	return ii
-}
-
-// load implements package loading by parsing Go source files
-// located by go/build.
-func (imp *importer) load(bp *build.Package) *PackageInfo {
-	info := imp.newPackageInfo(bp.ImportPath, bp.Dir)
-	info.Importable = true
-	files, errs := imp.conf.parsePackageFiles(bp, 'g')
-	for _, err := range errs {
-		info.appendError(err)
-	}
-
-	imp.addFiles(info, files, true)
-
-	imp.progMu.Lock()
-	imp.prog.importMap[bp.ImportPath] = info.Pkg
-	imp.progMu.Unlock()
-
-	return info
-}
-
-// addFiles adds and type-checks the specified files to info, loading
-// their dependencies if needed.  The order of files determines the
-// package initialization order.  It may be called multiple times on the
-// same package.  Errors are appended to the info.Errors field.
-//
-// cycleCheck determines whether the imports within files create
-// dependency edges that should be checked for potential cycles.
-//
-func (imp *importer) addFiles(info *PackageInfo, files []*ast.File, cycleCheck bool) {
-	// Ensure the dependencies are loaded, in parallel.
-	var fromPath string
-	if cycleCheck {
-		fromPath = info.Pkg.Path()
-	}
-	// TODO(adonovan): opt: make the caller do scanImports.
-	// Callers with a build.Package can skip it.
-	imp.importAll(fromPath, info.dir, scanImports(files), 0)
-
-	if trace {
-		fmt.Fprintf(os.Stderr, "%s: start %q (%d)\n",
-			time.Since(imp.start), info.Pkg.Path(), len(files))
-	}
-
-	// Don't call checker.Files on Unsafe, even with zero files,
-	// because it would mutate the package, which is a global.
-	if info.Pkg == types.Unsafe {
-		if len(files) > 0 {
-			panic(`"unsafe" package contains unexpected files`)
-		}
-	} else {
-		// Ignore the returned (first) error since we
-		// already collect them all in the PackageInfo.
-		info.checker.Files(files)
-		info.Files = append(info.Files, files...)
-	}
-
-	if imp.conf.AfterTypeCheck != nil {
-		imp.conf.AfterTypeCheck(info, files)
-	}
-
-	if trace {
-		fmt.Fprintf(os.Stderr, "%s: stop %q\n",
-			time.Since(imp.start), info.Pkg.Path())
-	}
-}
-
-func (imp *importer) newPackageInfo(path, dir string) *PackageInfo {
-	var pkg *types.Package
-	if path == "unsafe" {
-		pkg = types.Unsafe
-	} else {
-		pkg = types.NewPackage(path, "")
-	}
-	info := &PackageInfo{
-		Pkg: pkg,
-		Info: types.Info{
-			Types:      make(map[ast.Expr]types.TypeAndValue),
-			Defs:       make(map[*ast.Ident]types.Object),
-			Uses:       make(map[*ast.Ident]types.Object),
-			Implicits:  make(map[ast.Node]types.Object),
-			Scopes:     make(map[ast.Node]*types.Scope),
-			Selections: make(map[*ast.SelectorExpr]*types.Selection),
-		},
-		errorFunc: imp.conf.TypeChecker.Error,
-		dir:       dir,
-	}
-
-	// Copy the types.Config so we can vary it across PackageInfos.
-	tc := imp.conf.TypeChecker
-	tc.IgnoreFuncBodies = false
-	if f := imp.conf.TypeCheckFuncBodies; f != nil {
-		tc.IgnoreFuncBodies = !f(path)
-	}
-	tc.Importer = closure{imp, info}
-	tc.Error = info.appendError // appendError wraps the user's Error function
-
-	info.checker = types.NewChecker(&tc, imp.conf.fset(), pkg, &info.Info)
-	imp.progMu.Lock()
-	imp.prog.AllPackages[pkg] = info
-	imp.progMu.Unlock()
-	return info
-}
-
-type closure struct {
-	imp  *importer
-	info *PackageInfo
-}
-
-func (c closure) Import(to string) (*types.Package, error) { return c.imp.doImport(c.info, to) }
diff --git a/installer/vendor/golang.org/x/tools/go/loader/loader_test.go b/installer/vendor/golang.org/x/tools/go/loader/loader_test.go
deleted file mode 100644
index 02630eb298..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/loader_test.go
+++ /dev/null
@@ -1,816 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package loader_test
-
-import (
-	"fmt"
-	"go/build"
-	"go/constant"
-	"go/types"
-	"path/filepath"
-	"reflect"
-	"sort"
-	"strings"
-	"sync"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-)
-
-// TestFromArgs checks that conf.FromArgs populates conf correctly.
-// It does no I/O.
-func TestFromArgs(t *testing.T) {
-	type result struct {
-		Err        string
-		Rest       []string
-		ImportPkgs map[string]bool
-		CreatePkgs []loader.PkgSpec
-	}
-	for _, test := range []struct {
-		args  []string
-		tests bool
-		want  result
-	}{
-		// Mix of existing and non-existent packages.
-		{
-			args: []string{"nosuchpkg", "errors"},
-			want: result{
-				ImportPkgs: map[string]bool{"errors": false, "nosuchpkg": false},
-			},
-		},
-		// Same, with -test flag.
-		{
-			args:  []string{"nosuchpkg", "errors"},
-			tests: true,
-			want: result{
-				ImportPkgs: map[string]bool{"errors": true, "nosuchpkg": true},
-			},
-		},
-		// Surplus arguments.
-		{
-			args: []string{"fmt", "errors", "--", "surplus"},
-			want: result{
-				Rest:       []string{"surplus"},
-				ImportPkgs: map[string]bool{"errors": false, "fmt": false},
-			},
-		},
-		// Ad hoc package specified as *.go files.
-		{
-			args: []string{"foo.go", "bar.go"},
-			want: result{CreatePkgs: []loader.PkgSpec{{
-				Filenames: []string{"foo.go", "bar.go"},
-			}}},
-		},
-		// Mixture of *.go and import paths.
-		{
-			args: []string{"foo.go", "fmt"},
-			want: result{
-				Err: "named files must be .go files: fmt",
-			},
-		},
-	} {
-		var conf loader.Config
-		rest, err := conf.FromArgs(test.args, test.tests)
-		got := result{
-			Rest:       rest,
-			ImportPkgs: conf.ImportPkgs,
-			CreatePkgs: conf.CreatePkgs,
-		}
-		if err != nil {
-			got.Err = err.Error()
-		}
-		if !reflect.DeepEqual(got, test.want) {
-			t.Errorf("FromArgs(%q) = %+v, want %+v", test.args, got, test.want)
-		}
-	}
-}
-
-func TestLoad_NoInitialPackages(t *testing.T) {
-	var conf loader.Config
-
-	const wantErr = "no initial packages were loaded"
-
-	prog, err := conf.Load()
-	if err == nil {
-		t.Errorf("Load succeeded unexpectedly, want %q", wantErr)
-	} else if err.Error() != wantErr {
-		t.Errorf("Load failed with wrong error %q, want %q", err, wantErr)
-	}
-	if prog != nil {
-		t.Errorf("Load unexpectedly returned a Program")
-	}
-}
-
-func TestLoad_MissingInitialPackage(t *testing.T) {
-	var conf loader.Config
-	conf.Import("nosuchpkg")
-	conf.Import("errors")
-
-	const wantErr = "couldn't load packages due to errors: nosuchpkg"
-
-	prog, err := conf.Load()
-	if err == nil {
-		t.Errorf("Load succeeded unexpectedly, want %q", wantErr)
-	} else if err.Error() != wantErr {
-		t.Errorf("Load failed with wrong error %q, want %q", err, wantErr)
-	}
-	if prog != nil {
-		t.Errorf("Load unexpectedly returned a Program")
-	}
-}
-
-func TestLoad_MissingInitialPackage_AllowErrors(t *testing.T) {
-	var conf loader.Config
-	conf.AllowErrors = true
-	conf.Import("nosuchpkg")
-	conf.ImportWithTests("errors")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed unexpectedly: %v", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned a nil Program")
-	}
-	if got, want := created(prog), "errors_test"; got != want {
-		t.Errorf("Created = %s, want %s", got, want)
-	}
-	if got, want := imported(prog), "errors"; got != want {
-		t.Errorf("Imported = %s, want %s", got, want)
-	}
-}
-
-func TestCreateUnnamedPackage(t *testing.T) {
-	var conf loader.Config
-	conf.CreateFromFilenames("")
-	prog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load failed: %v", err)
-	}
-	if got, want := fmt.Sprint(prog.InitialPackages()), "[(unnamed)]"; got != want {
-		t.Errorf("InitialPackages = %s, want %s", got, want)
-	}
-}
-
-func TestLoad_MissingFileInCreatedPackage(t *testing.T) {
-	var conf loader.Config
-	conf.CreateFromFilenames("", "missing.go")
-
-	const wantErr = "couldn't load packages due to errors: (unnamed)"
-
-	prog, err := conf.Load()
-	if prog != nil {
-		t.Errorf("Load unexpectedly returned a Program")
-	}
-	if err == nil {
-		t.Fatalf("Load succeeded unexpectedly, want %q", wantErr)
-	}
-	if err.Error() != wantErr {
-		t.Fatalf("Load failed with wrong error %q, want %q", err, wantErr)
-	}
-}
-
-func TestLoad_MissingFileInCreatedPackage_AllowErrors(t *testing.T) {
-	conf := loader.Config{AllowErrors: true}
-	conf.CreateFromFilenames("", "missing.go")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed: %v", err)
-	}
-	if got, want := fmt.Sprint(prog.InitialPackages()), "[(unnamed)]"; got != want {
-		t.Fatalf("InitialPackages = %s, want %s", got, want)
-	}
-}
-
-func TestLoad_ParseError(t *testing.T) {
-	var conf loader.Config
-	conf.CreateFromFilenames("badpkg", "testdata/badpkgdecl.go")
-
-	const wantErr = "couldn't load packages due to errors: badpkg"
-
-	prog, err := conf.Load()
-	if prog != nil {
-		t.Errorf("Load unexpectedly returned a Program")
-	}
-	if err == nil {
-		t.Fatalf("Load succeeded unexpectedly, want %q", wantErr)
-	}
-	if err.Error() != wantErr {
-		t.Fatalf("Load failed with wrong error %q, want %q", err, wantErr)
-	}
-}
-
-func TestLoad_ParseError_AllowErrors(t *testing.T) {
-	var conf loader.Config
-	conf.AllowErrors = true
-	conf.CreateFromFilenames("badpkg", "testdata/badpkgdecl.go")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed unexpectedly: %v", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned a nil Program")
-	}
-	if got, want := created(prog), "badpkg"; got != want {
-		t.Errorf("Created = %s, want %s", got, want)
-	}
-
-	badpkg := prog.Created[0]
-	if len(badpkg.Files) != 1 {
-		t.Errorf("badpkg has %d files, want 1", len(badpkg.Files))
-	}
-	wantErr := filepath.Join("testdata", "badpkgdecl.go") + ":1:34: expected 'package', found 'EOF'"
-	if !hasError(badpkg.Errors, wantErr) {
-		t.Errorf("badpkg.Errors = %v, want %s", badpkg.Errors, wantErr)
-	}
-}
-
-func TestLoad_FromSource_Success(t *testing.T) {
-	var conf loader.Config
-	conf.CreateFromFilenames("P", "testdata/a.go", "testdata/b.go")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed unexpectedly: %v", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned a nil Program")
-	}
-	if got, want := created(prog), "P"; got != want {
-		t.Errorf("Created = %s, want %s", got, want)
-	}
-}
-
-func TestLoad_FromImports_Success(t *testing.T) {
-	var conf loader.Config
-	conf.ImportWithTests("fmt")
-	conf.ImportWithTests("errors")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed unexpectedly: %v", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned a nil Program")
-	}
-	if got, want := created(prog), "errors_test fmt_test"; got != want {
-		t.Errorf("Created = %q, want %s", got, want)
-	}
-	if got, want := imported(prog), "errors fmt"; got != want {
-		t.Errorf("Imported = %s, want %s", got, want)
-	}
-	// Check set of transitive packages.
-	// There are >30 and the set may grow over time, so only check a few.
-	want := map[string]bool{
-		"strings": true,
-		"time":    true,
-		"runtime": true,
-		"testing": true,
-		"unicode": true,
-	}
-	for _, path := range all(prog) {
-		delete(want, path)
-	}
-	if len(want) > 0 {
-		t.Errorf("AllPackages is missing these keys: %q", keys(want))
-	}
-}
-
-func TestLoad_MissingIndirectImport(t *testing.T) {
-	pkgs := map[string]string{
-		"a": `package a; import _ "b"`,
-		"b": `package b; import _ "c"`,
-	}
-	conf := loader.Config{Build: fakeContext(pkgs)}
-	conf.Import("a")
-
-	const wantErr = "couldn't load packages due to errors: b"
-
-	prog, err := conf.Load()
-	if err == nil {
-		t.Errorf("Load succeeded unexpectedly, want %q", wantErr)
-	} else if err.Error() != wantErr {
-		t.Errorf("Load failed with wrong error %q, want %q", err, wantErr)
-	}
-	if prog != nil {
-		t.Errorf("Load unexpectedly returned a Program")
-	}
-}
-
-func TestLoad_BadDependency_AllowErrors(t *testing.T) {
-	for _, test := range []struct {
-		descr    string
-		pkgs     map[string]string
-		wantPkgs string
-	}{
-
-		{
-			descr: "missing dependency",
-			pkgs: map[string]string{
-				"a": `package a; import _ "b"`,
-				"b": `package b; import _ "c"`,
-			},
-			wantPkgs: "a b",
-		},
-		{
-			descr: "bad package decl in dependency",
-			pkgs: map[string]string{
-				"a": `package a; import _ "b"`,
-				"b": `package b; import _ "c"`,
-				"c": `package`,
-			},
-			wantPkgs: "a b",
-		},
-		{
-			descr: "parse error in dependency",
-			pkgs: map[string]string{
-				"a": `package a; import _ "b"`,
-				"b": `package b; import _ "c"`,
-				"c": `package c; var x = `,
-			},
-			wantPkgs: "a b c",
-		},
-	} {
-		conf := loader.Config{
-			AllowErrors: true,
-			Build:       fakeContext(test.pkgs),
-		}
-		conf.Import("a")
-
-		prog, err := conf.Load()
-		if err != nil {
-			t.Errorf("%s: Load failed unexpectedly: %v", test.descr, err)
-		}
-		if prog == nil {
-			t.Fatalf("%s: Load returned a nil Program", test.descr)
-		}
-
-		if got, want := imported(prog), "a"; got != want {
-			t.Errorf("%s: Imported = %s, want %s", test.descr, got, want)
-		}
-		if got := all(prog); strings.Join(got, " ") != test.wantPkgs {
-			t.Errorf("%s: AllPackages = %s, want %s", test.descr, got, test.wantPkgs)
-		}
-	}
-}
-
-func TestCwd(t *testing.T) {
-	ctxt := fakeContext(map[string]string{"one/two/three": `package three`})
-	for _, test := range []struct {
-		cwd, arg, want string
-	}{
-		{cwd: "/go/src/one", arg: "./two/three", want: "one/two/three"},
-		{cwd: "/go/src/one", arg: "../one/two/three", want: "one/two/three"},
-		{cwd: "/go/src/one", arg: "one/two/three", want: "one/two/three"},
-		{cwd: "/go/src/one/two/three", arg: ".", want: "one/two/three"},
-		{cwd: "/go/src/one", arg: "two/three", want: ""},
-	} {
-		conf := loader.Config{
-			Cwd:   test.cwd,
-			Build: ctxt,
-		}
-		conf.Import(test.arg)
-
-		var got string
-		prog, err := conf.Load()
-		if prog != nil {
-			got = imported(prog)
-		}
-		if got != test.want {
-			t.Errorf("Load(%s) from %s: Imported = %s, want %s",
-				test.arg, test.cwd, got, test.want)
-			if err != nil {
-				t.Errorf("Load failed: %v", err)
-			}
-		}
-	}
-}
-
-func TestLoad_vendor(t *testing.T) {
-	pkgs := map[string]string{
-		"a":          `package a; import _ "x"`,
-		"a/vendor":   ``, // mkdir a/vendor
-		"a/vendor/x": `package xa`,
-		"b":          `package b; import _ "x"`,
-		"b/vendor":   ``, // mkdir b/vendor
-		"b/vendor/x": `package xb`,
-		"c":          `package c; import _ "x"`,
-		"x":          `package xc`,
-	}
-	conf := loader.Config{Build: fakeContext(pkgs)}
-	conf.Import("a")
-	conf.Import("b")
-	conf.Import("c")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Check that a, b, and c see different versions of x.
-	for _, r := range "abc" {
-		name := string(r)
-		got := prog.Package(name).Pkg.Imports()[0]
-		want := "x" + name
-		if got.Name() != want {
-			t.Errorf("package %s import %q = %s, want %s",
-				name, "x", got.Name(), want)
-		}
-	}
-}
-
-func TestVendorCwd(t *testing.T) {
-	// Test the interaction of cwd and vendor directories.
-	ctxt := fakeContext(map[string]string{
-		"net":          ``, // mkdir net
-		"net/http":     `package http; import _ "hpack"`,
-		"vendor":       ``, // mkdir vendor
-		"vendor/hpack": `package vendorhpack`,
-		"hpack":        `package hpack`,
-	})
-	for i, test := range []struct {
-		cwd, arg, want string
-	}{
-		{cwd: "/go/src/net", arg: "http"}, // not found
-		{cwd: "/go/src/net", arg: "./http", want: "net/http vendor/hpack"},
-		{cwd: "/go/src/net", arg: "hpack", want: "vendor/hpack"},
-		{cwd: "/go/src/vendor", arg: "hpack", want: "vendor/hpack"},
-		{cwd: "/go/src/vendor", arg: "./hpack", want: "vendor/hpack"},
-	} {
-		conf := loader.Config{
-			Cwd:   test.cwd,
-			Build: ctxt,
-		}
-		conf.Import(test.arg)
-
-		var got string
-		prog, err := conf.Load()
-		if prog != nil {
-			got = strings.Join(all(prog), " ")
-		}
-		if got != test.want {
-			t.Errorf("#%d: Load(%s) from %s: got %s, want %s",
-				i, test.arg, test.cwd, got, test.want)
-			if err != nil {
-				t.Errorf("Load failed: %v", err)
-			}
-		}
-	}
-}
-
-func TestVendorCwdIssue16580(t *testing.T) {
-	// Regression test for Go issue 16580.
-	// Import decls in "created" packages were vendor-resolved
-	// w.r.t. cwd, not the parent directory of the package's files.
-	ctxt := fakeContext(map[string]string{
-		"a":          ``, // mkdir a
-		"a/vendor":   ``, // mkdir a/vendor
-		"a/vendor/b": `package b; const X = true`,
-		"b":          `package b; const X = false`,
-	})
-	for _, test := range []struct {
-		filename, cwd string
-		want          bool // expected value of b.X; depends on filename, not on cwd
-	}{
-		{filename: "c.go", cwd: "/go/src", want: false},
-		{filename: "c.go", cwd: "/go/src/a", want: false},
-		{filename: "c.go", cwd: "/go/src/a/b", want: false},
-		{filename: "c.go", cwd: "/go/src/a/vendor/b", want: false},
-
-		{filename: "/go/src/a/c.go", cwd: "/go/src", want: true},
-		{filename: "/go/src/a/c.go", cwd: "/go/src/a", want: true},
-		{filename: "/go/src/a/c.go", cwd: "/go/src/a/b", want: true},
-		{filename: "/go/src/a/c.go", cwd: "/go/src/a/vendor/b", want: true},
-
-		{filename: "/go/src/c/c.go", cwd: "/go/src", want: false},
-		{filename: "/go/src/c/c.go", cwd: "/go/src/a", want: false},
-		{filename: "/go/src/c/c.go", cwd: "/go/src/a/b", want: false},
-		{filename: "/go/src/c/c.go", cwd: "/go/src/a/vendor/b", want: false},
-	} {
-		conf := loader.Config{
-			Cwd:   test.cwd,
-			Build: ctxt,
-		}
-		f, err := conf.ParseFile(test.filename, `package dummy; import "b"; const X = b.X`)
-		if err != nil {
-			t.Fatal(f)
-		}
-		conf.CreateFromFiles("dummy", f)
-
-		prog, err := conf.Load()
-		if err != nil {
-			t.Errorf("%+v: Load failed: %v", test, err)
-			continue
-		}
-
-		x := constant.BoolVal(prog.Created[0].Pkg.Scope().Lookup("X").(*types.Const).Val())
-		if x != test.want {
-			t.Errorf("%+v: b.X = %t", test, x)
-		}
-	}
-
-	// TODO(adonovan): also test imports within XTestGoFiles.
-}
-
-// TODO(adonovan): more Load tests:
-//
-// failures:
-// - to parse package decl of *_test.go files
-// - to parse package decl of external *_test.go files
-// - to parse whole of *_test.go files
-// - to parse whole of external *_test.go files
-// - to open a *.go file during import scanning
-// - to import from binary
-
-// features:
-// - InitialPackages
-// - PackageCreated hook
-// - TypeCheckFuncBodies hook
-
-func TestTransitivelyErrorFreeFlag(t *testing.T) {
-	// Create an minimal custom build.Context
-	// that fakes the following packages:
-	//
-	// a --> b --> c!   c has an error
-	//   \              d and e are transitively error-free.
-	//    e --> d
-	//
-	// Each package [a-e] consists of one file, x.go.
-	pkgs := map[string]string{
-		"a": `package a; import (_ "b"; _ "e")`,
-		"b": `package b; import _ "c"`,
-		"c": `package c; func f() { _ = int(false) }`, // type error within function body
-		"d": `package d;`,
-		"e": `package e; import _ "d"`,
-	}
-	conf := loader.Config{
-		AllowErrors: true,
-		Build:       fakeContext(pkgs),
-	}
-	conf.Import("a")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed: %s", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned nil *Program")
-	}
-
-	for pkg, info := range prog.AllPackages {
-		var wantErr, wantTEF bool
-		switch pkg.Path() {
-		case "a", "b":
-		case "c":
-			wantErr = true
-		case "d", "e":
-			wantTEF = true
-		default:
-			t.Errorf("unexpected package: %q", pkg.Path())
-			continue
-		}
-
-		if (info.Errors != nil) != wantErr {
-			if wantErr {
-				t.Errorf("Package %q.Error = nil, want error", pkg.Path())
-			} else {
-				t.Errorf("Package %q has unexpected Errors: %v",
-					pkg.Path(), info.Errors)
-			}
-		}
-
-		if info.TransitivelyErrorFree != wantTEF {
-			t.Errorf("Package %q.TransitivelyErrorFree=%t, want %t",
-				pkg.Path(), info.TransitivelyErrorFree, wantTEF)
-		}
-	}
-}
-
-// Test that syntax (scan/parse), type, and loader errors are recorded
-// (in PackageInfo.Errors) and reported (via Config.TypeChecker.Error).
-func TestErrorReporting(t *testing.T) {
-	pkgs := map[string]string{
-		"a": `package a; import (_ "b"; _ "c"); var x int = false`,
-		"b": `package b; 'syntax error!`,
-	}
-	conf := loader.Config{
-		AllowErrors: true,
-		Build:       fakeContext(pkgs),
-	}
-	var mu sync.Mutex
-	var allErrors []error
-	conf.TypeChecker.Error = func(err error) {
-		mu.Lock()
-		allErrors = append(allErrors, err)
-		mu.Unlock()
-	}
-	conf.Import("a")
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Errorf("Load failed: %s", err)
-	}
-	if prog == nil {
-		t.Fatalf("Load returned nil *Program")
-	}
-
-	// TODO(adonovan): test keys of ImportMap.
-
-	// Check errors recorded in each PackageInfo.
-	for pkg, info := range prog.AllPackages {
-		switch pkg.Path() {
-		case "a":
-			if !hasError(info.Errors, "cannot convert false") {
-				t.Errorf("a.Errors = %v, want bool conversion (type) error", info.Errors)
-			}
-			if !hasError(info.Errors, "could not import c") {
-				t.Errorf("a.Errors = %v, want import (loader) error", info.Errors)
-			}
-		case "b":
-			if !hasError(info.Errors, "rune literal not terminated") {
-				t.Errorf("b.Errors = %v, want unterminated literal (syntax) error", info.Errors)
-			}
-		}
-	}
-
-	// Check errors reported via error handler.
-	if !hasError(allErrors, "cannot convert false") ||
-		!hasError(allErrors, "rune literal not terminated") ||
-		!hasError(allErrors, "could not import c") {
-		t.Errorf("allErrors = %v, want syntax, type and loader errors", allErrors)
-	}
-}
-
-func TestCycles(t *testing.T) {
-	for _, test := range []struct {
-		descr   string
-		ctxt    *build.Context
-		wantErr string
-	}{
-		{
-			"self-cycle",
-			fakeContext(map[string]string{
-				"main":      `package main; import _ "selfcycle"`,
-				"selfcycle": `package selfcycle; import _ "selfcycle"`,
-			}),
-			`import cycle: selfcycle -> selfcycle`,
-		},
-		{
-			"three-package cycle",
-			fakeContext(map[string]string{
-				"main": `package main; import _ "a"`,
-				"a":    `package a; import _ "b"`,
-				"b":    `package b; import _ "c"`,
-				"c":    `package c; import _ "a"`,
-			}),
-			`import cycle: c -> a -> b -> c`,
-		},
-		{
-			"self-cycle in dependency of test file",
-			buildutil.FakeContext(map[string]map[string]string{
-				"main": {
-					"main.go":      `package main`,
-					"main_test.go": `package main; import _ "a"`,
-				},
-				"a": {
-					"a.go": `package a; import _ "a"`,
-				},
-			}),
-			`import cycle: a -> a`,
-		},
-		// TODO(adonovan): fix: these fail
-		// {
-		// 	"two-package cycle in dependency of test file",
-		// 	buildutil.FakeContext(map[string]map[string]string{
-		// 		"main": {
-		// 			"main.go":      `package main`,
-		// 			"main_test.go": `package main; import _ "a"`,
-		// 		},
-		// 		"a": {
-		// 			"a.go": `package a; import _ "main"`,
-		// 		},
-		// 	}),
-		// 	`import cycle: main -> a -> main`,
-		// },
-		// {
-		// 	"self-cycle in augmented package",
-		// 	buildutil.FakeContext(map[string]map[string]string{
-		// 		"main": {
-		// 			"main.go":      `package main`,
-		// 			"main_test.go": `package main; import _ "main"`,
-		// 		},
-		// 	}),
-		// 	`import cycle: main -> main`,
-		// },
-	} {
-		conf := loader.Config{
-			AllowErrors: true,
-			Build:       test.ctxt,
-		}
-		var mu sync.Mutex
-		var allErrors []error
-		conf.TypeChecker.Error = func(err error) {
-			mu.Lock()
-			allErrors = append(allErrors, err)
-			mu.Unlock()
-		}
-		conf.ImportWithTests("main")
-
-		prog, err := conf.Load()
-		if err != nil {
-			t.Errorf("%s: Load failed: %s", test.descr, err)
-		}
-		if prog == nil {
-			t.Fatalf("%s: Load returned nil *Program", test.descr)
-		}
-
-		if !hasError(allErrors, test.wantErr) {
-			t.Errorf("%s: Load() errors = %q, want %q",
-				test.descr, allErrors, test.wantErr)
-		}
-	}
-
-	// TODO(adonovan):
-	// - Test that in a legal test cycle, none of the symbols
-	//   defined by augmentation are visible via import.
-}
-
-// ---- utilities ----
-
-// Simplifying wrapper around buildutil.FakeContext for single-file packages.
-func fakeContext(pkgs map[string]string) *build.Context {
-	pkgs2 := make(map[string]map[string]string)
-	for path, content := range pkgs {
-		pkgs2[path] = map[string]string{"x.go": content}
-	}
-	return buildutil.FakeContext(pkgs2)
-}
-
-func hasError(errors []error, substr string) bool {
-	for _, err := range errors {
-		if strings.Contains(err.Error(), substr) {
-			return true
-		}
-	}
-	return false
-}
-
-func keys(m map[string]bool) (keys []string) {
-	for key := range m {
-		keys = append(keys, key)
-	}
-	sort.Strings(keys)
-	return
-}
-
-// Returns all loaded packages.
-func all(prog *loader.Program) []string {
-	var pkgs []string
-	for _, info := range prog.AllPackages {
-		pkgs = append(pkgs, info.Pkg.Path())
-	}
-	sort.Strings(pkgs)
-	return pkgs
-}
-
-// Returns initially imported packages, as a string.
-func imported(prog *loader.Program) string {
-	var pkgs []string
-	for _, info := range prog.Imported {
-		pkgs = append(pkgs, info.Pkg.Path())
-	}
-	sort.Strings(pkgs)
-	return strings.Join(pkgs, " ")
-}
-
-// Returns initially created packages, as a string.
-func created(prog *loader.Program) string {
-	var pkgs []string
-	for _, info := range prog.Created {
-		pkgs = append(pkgs, info.Pkg.Path())
-	}
-	return strings.Join(pkgs, " ")
-}
-
-// Load package "io" twice in parallel.
-// When run with -race, this is a regression test for Go issue 20718, in
-// which the global "unsafe" package was modified concurrently.
-func TestLoad1(t *testing.T) { loadIO(t) }
-func TestLoad2(t *testing.T) { loadIO(t) }
-
-func loadIO(t *testing.T) {
-	t.Parallel()
-	conf := &loader.Config{ImportPkgs: map[string]bool{"io": false}}
-	if _, err := conf.Load(); err != nil {
-		t.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/loader/stdlib_test.go b/installer/vendor/golang.org/x/tools/go/loader/stdlib_test.go
deleted file mode 100644
index 2cd066f8fc..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/stdlib_test.go
+++ /dev/null
@@ -1,201 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package loader_test
-
-// This file enumerates all packages beneath $GOROOT, loads them, plus
-// their external tests if any, runs the type checker on them, and
-// prints some summary information.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-)
-
-func TestStdlib(t *testing.T) {
-	if runtime.GOOS == "android" {
-		t.Skipf("incomplete std lib on %s", runtime.GOOS)
-	}
-	if testing.Short() {
-		t.Skip("skipping in short mode; uses tons of memory (golang.org/issue/14113)")
-	}
-
-	runtime.GC()
-	t0 := time.Now()
-	var memstats runtime.MemStats
-	runtime.ReadMemStats(&memstats)
-	alloc := memstats.Alloc
-
-	// Load, parse and type-check the program.
-	ctxt := build.Default // copy
-	ctxt.GOPATH = ""      // disable GOPATH
-	conf := loader.Config{Build: &ctxt}
-	for _, path := range buildutil.AllPackages(conf.Build) {
-		conf.ImportWithTests(path)
-	}
-
-	prog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load failed: %v", err)
-	}
-
-	t1 := time.Now()
-	runtime.GC()
-	runtime.ReadMemStats(&memstats)
-
-	numPkgs := len(prog.AllPackages)
-	if want := 205; numPkgs < want {
-		t.Errorf("Loaded only %d packages, want at least %d", numPkgs, want)
-	}
-
-	// Dump package members.
-	if false {
-		for pkg := range prog.AllPackages {
-			fmt.Printf("Package %s:\n", pkg.Path())
-			scope := pkg.Scope()
-			qualifier := types.RelativeTo(pkg)
-			for _, name := range scope.Names() {
-				if ast.IsExported(name) {
-					fmt.Printf("\t%s\n", types.ObjectString(scope.Lookup(name), qualifier))
-				}
-			}
-			fmt.Println()
-		}
-	}
-
-	// Check that Test functions for io/ioutil, regexp and
-	// compress/bzip2 are all simultaneously present.
-	// (The apparent cycle formed when augmenting all three of
-	// these packages by their tests was the original motivation
-	// for reporting b/7114.)
-	//
-	// compress/bzip2.TestBitReader in bzip2_test.go    imports io/ioutil
-	// io/ioutil.TestTempFile       in tempfile_test.go imports regexp
-	// regexp.TestRE2Search         in exec_test.go     imports compress/bzip2
-	for _, test := range []struct{ pkg, fn string }{
-		{"io/ioutil", "TestTempFile"},
-		{"regexp", "TestRE2Search"},
-		{"compress/bzip2", "TestBitReader"},
-	} {
-		info := prog.Imported[test.pkg]
-		if info == nil {
-			t.Errorf("failed to load package %q", test.pkg)
-			continue
-		}
-		obj, _ := info.Pkg.Scope().Lookup(test.fn).(*types.Func)
-		if obj == nil {
-			t.Errorf("package %q has no func %q", test.pkg, test.fn)
-			continue
-		}
-	}
-
-	// Dump some statistics.
-
-	// determine line count
-	var lineCount int
-	prog.Fset.Iterate(func(f *token.File) bool {
-		lineCount += f.LineCount()
-		return true
-	})
-
-	t.Log("GOMAXPROCS:           ", runtime.GOMAXPROCS(0))
-	t.Log("#Source lines:        ", lineCount)
-	t.Log("Load/parse/typecheck: ", t1.Sub(t0))
-	t.Log("#MB:                  ", int64(memstats.Alloc-alloc)/1000000)
-}
-
-func TestCgoOption(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode; uses tons of memory (golang.org/issue/14113)")
-	}
-	switch runtime.GOOS {
-	// On these systems, the net and os/user packages don't use cgo
-	// or the std library is incomplete (Android).
-	case "android", "plan9", "solaris", "windows":
-		t.Skipf("no cgo or incomplete std lib on %s", runtime.GOOS)
-	}
-	// In nocgo builds (e.g. linux-amd64-nocgo),
-	// there is no "runtime/cgo" package,
-	// so cgo-generated Go files will have a failing import.
-	if !build.Default.CgoEnabled {
-		return
-	}
-	// Test that we can load cgo-using packages with
-	// CGO_ENABLED=[01], which causes go/build to select pure
-	// Go/native implementations, respectively, based on build
-	// tags.
-	//
-	// Each entry specifies a package-level object and the generic
-	// file expected to define it when cgo is disabled.
-	// When cgo is enabled, the exact file is not specified (since
-	// it varies by platform), but must differ from the generic one.
-	//
-	// The test also loads the actual file to verify that the
-	// object is indeed defined at that location.
-	for _, test := range []struct {
-		pkg, name, genericFile string
-	}{
-		{"net", "cgoLookupHost", "cgo_stub.go"},
-		{"os/user", "current", "lookup_stubs.go"},
-	} {
-		ctxt := build.Default
-		for _, ctxt.CgoEnabled = range []bool{false, true} {
-			conf := loader.Config{Build: &ctxt}
-			conf.Import(test.pkg)
-			prog, err := conf.Load()
-			if err != nil {
-				t.Errorf("Load failed: %v", err)
-				continue
-			}
-			info := prog.Imported[test.pkg]
-			if info == nil {
-				t.Errorf("package %s not found", test.pkg)
-				continue
-			}
-			obj := info.Pkg.Scope().Lookup(test.name)
-			if obj == nil {
-				t.Errorf("no object %s.%s", test.pkg, test.name)
-				continue
-			}
-			posn := prog.Fset.Position(obj.Pos())
-			t.Logf("%s: %s (CgoEnabled=%t)", posn, obj, ctxt.CgoEnabled)
-
-			gotFile := filepath.Base(posn.Filename)
-			filesMatch := gotFile == test.genericFile
-
-			if ctxt.CgoEnabled && filesMatch {
-				t.Errorf("CGO_ENABLED=1: %s found in %s, want native file",
-					obj, gotFile)
-			} else if !ctxt.CgoEnabled && !filesMatch {
-				t.Errorf("CGO_ENABLED=0: %s found in %s, want %s",
-					obj, gotFile, test.genericFile)
-			}
-
-			// Load the file and check the object is declared at the right place.
-			b, err := ioutil.ReadFile(posn.Filename)
-			if err != nil {
-				t.Errorf("can't read %s: %s", posn.Filename, err)
-				continue
-			}
-			line := string(bytes.Split(b, []byte("\n"))[posn.Line-1])
-			ident := line[posn.Column-1:]
-			if !strings.HasPrefix(ident, test.name) {
-				t.Errorf("%s: %s not declared here (looking at %q)", posn, obj, ident)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/loader/testdata/a.go b/installer/vendor/golang.org/x/tools/go/loader/testdata/a.go
deleted file mode 100644
index bae3955088..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/testdata/a.go
+++ /dev/null
@@ -1 +0,0 @@
-package P
diff --git a/installer/vendor/golang.org/x/tools/go/loader/testdata/b.go b/installer/vendor/golang.org/x/tools/go/loader/testdata/b.go
deleted file mode 100644
index bae3955088..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/testdata/b.go
+++ /dev/null
@@ -1 +0,0 @@
-package P
diff --git a/installer/vendor/golang.org/x/tools/go/loader/testdata/badpkgdecl.go b/installer/vendor/golang.org/x/tools/go/loader/testdata/badpkgdecl.go
deleted file mode 100644
index 1e393595c3..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/testdata/badpkgdecl.go
+++ /dev/null
@@ -1 +0,0 @@
-// this file has no package decl
diff --git a/installer/vendor/golang.org/x/tools/go/loader/util.go b/installer/vendor/golang.org/x/tools/go/loader/util.go
deleted file mode 100644
index 7f38dd7407..0000000000
--- a/installer/vendor/golang.org/x/tools/go/loader/util.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package loader
-
-import (
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"io"
-	"os"
-	"strconv"
-	"sync"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-// We use a counting semaphore to limit
-// the number of parallel I/O calls per process.
-var ioLimit = make(chan bool, 10)
-
-// parseFiles parses the Go source files within directory dir and
-// returns the ASTs of the ones that could be at least partially parsed,
-// along with a list of I/O and parse errors encountered.
-//
-// I/O is done via ctxt, which may specify a virtual file system.
-// displayPath is used to transform the filenames attached to the ASTs.
-//
-func parseFiles(fset *token.FileSet, ctxt *build.Context, displayPath func(string) string, dir string, files []string, mode parser.Mode) ([]*ast.File, []error) {
-	if displayPath == nil {
-		displayPath = func(path string) string { return path }
-	}
-	var wg sync.WaitGroup
-	n := len(files)
-	parsed := make([]*ast.File, n)
-	errors := make([]error, n)
-	for i, file := range files {
-		if !buildutil.IsAbsPath(ctxt, file) {
-			file = buildutil.JoinPath(ctxt, dir, file)
-		}
-		wg.Add(1)
-		go func(i int, file string) {
-			ioLimit <- true // wait
-			defer func() {
-				wg.Done()
-				<-ioLimit // signal
-			}()
-			var rd io.ReadCloser
-			var err error
-			if ctxt.OpenFile != nil {
-				rd, err = ctxt.OpenFile(file)
-			} else {
-				rd, err = os.Open(file)
-			}
-			if err != nil {
-				errors[i] = err // open failed
-				return
-			}
-
-			// ParseFile may return both an AST and an error.
-			parsed[i], errors[i] = parser.ParseFile(fset, displayPath(file), rd, mode)
-			rd.Close()
-		}(i, file)
-	}
-	wg.Wait()
-
-	// Eliminate nils, preserving order.
-	var o int
-	for _, f := range parsed {
-		if f != nil {
-			parsed[o] = f
-			o++
-		}
-	}
-	parsed = parsed[:o]
-
-	o = 0
-	for _, err := range errors {
-		if err != nil {
-			errors[o] = err
-			o++
-		}
-	}
-	errors = errors[:o]
-
-	return parsed, errors
-}
-
-// scanImports returns the set of all import paths from all
-// import specs in the specified files.
-func scanImports(files []*ast.File) map[string]bool {
-	imports := make(map[string]bool)
-	for _, f := range files {
-		for _, decl := range f.Decls {
-			if decl, ok := decl.(*ast.GenDecl); ok && decl.Tok == token.IMPORT {
-				for _, spec := range decl.Specs {
-					spec := spec.(*ast.ImportSpec)
-
-					// NB: do not assume the program is well-formed!
-					path, err := strconv.Unquote(spec.Path.Value)
-					if err != nil {
-						continue // quietly ignore the error
-					}
-					if path == "C" {
-						continue // skip pseudopackage
-					}
-					imports[path] = true
-				}
-			}
-		}
-	}
-	return imports
-}
-
-// ---------- Internal helpers ----------
-
-// TODO(adonovan): make this a method: func (*token.File) Contains(token.Pos)
-func tokenFileContainsPos(f *token.File, pos token.Pos) bool {
-	p := int(pos)
-	base := f.Base()
-	return base <= p && p < base+f.Size()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/TODO b/installer/vendor/golang.org/x/tools/go/pointer/TODO
deleted file mode 100644
index f95e70621d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/TODO
+++ /dev/null
@@ -1,33 +0,0 @@
--*- text -*-
-
-Pointer analysis to-do list
-===========================
-
-CONSTRAINT GENERATION:
-- support reflection:
-  - a couple of operators are missing
-  - reflect.Values may contain lvalues (CanAddr)
-- implement native intrinsics.  These vary by platform.
-- add to pts(a.panic) a label representing all runtime panics, e.g.
-  runtime.{TypeAssertionError,errorString,errorCString}.
-
-OPTIMISATIONS
-- pre-solver: 
-  pointer equivalence: extend HVN to HRU
-  location equivalence
-- solver: HCD, LCD.
-- experiment with map+slice worklist in lieu of bitset.
-  It may have faster insert.
-
-MISC:
-- Test on all platforms.  
-  Currently we assume these go/build tags: linux, amd64, !cgo.
-
-MAINTAINABILITY
-- Think about ways to make debugging this code easier.  PTA logs
-  routinely exceed a million lines and require training to read.
-
-BUGS: 
-- There's a crash bug in stdlib_test + reflection, rVCallConstraint.
-
-
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/analysis.go b/installer/vendor/golang.org/x/tools/go/pointer/analysis.go
deleted file mode 100644
index 0abb04dd80..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/analysis.go
+++ /dev/null
@@ -1,452 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file defines the main datatypes and Analyze function of the pointer analysis.
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"io"
-	"os"
-	"reflect"
-	"runtime"
-	"runtime/debug"
-	"sort"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-const (
-	// optimization options; enable all when committing
-	optRenumber = true // enable renumbering optimization (makes logs hard to read)
-	optHVN      = true // enable pointer equivalence via Hash-Value Numbering
-
-	// debugging options; disable all when committing
-	debugHVN           = false // enable assertions in HVN
-	debugHVNVerbose    = false // enable extra HVN logging
-	debugHVNCrossCheck = false // run solver with/without HVN and compare (caveats below)
-	debugTimers        = false // show running time of each phase
-)
-
-// object.flags bitmask values.
-const (
-	otTagged   = 1 << iota // type-tagged object
-	otIndirect             // type-tagged object with indirect payload
-	otFunction             // function object
-)
-
-// An object represents a contiguous block of memory to which some
-// (generalized) pointer may point.
-//
-// (Note: most variables called 'obj' are not *objects but nodeids
-// such that a.nodes[obj].obj != nil.)
-//
-type object struct {
-	// flags is a bitset of the node type (ot*) flags defined above.
-	flags uint32
-
-	// Number of following nodes belonging to the same "object"
-	// allocation.  Zero for all other nodes.
-	size uint32
-
-	// data describes this object; it has one of these types:
-	//
-	// ssa.Value	for an object allocated by an SSA operation.
-	// types.Type	for an rtype instance object or *rtype-tagged object.
-	// string	for an instrinsic object, e.g. the array behind os.Args.
-	// nil		for an object allocated by an instrinsic.
-	//		(cgn provides the identity of the intrinsic.)
-	data interface{}
-
-	// The call-graph node (=context) in which this object was allocated.
-	// May be nil for global objects: Global, Const, some Functions.
-	cgn *cgnode
-}
-
-// nodeid denotes a node.
-// It is an index within analysis.nodes.
-// We use small integers, not *node pointers, for many reasons:
-// - they are smaller on 64-bit systems.
-// - sets of them can be represented compactly in bitvectors or BDDs.
-// - order matters; a field offset can be computed by simple addition.
-type nodeid uint32
-
-// A node is an equivalence class of memory locations.
-// Nodes may be pointers, pointed-to locations, neither, or both.
-//
-// Nodes that are pointed-to locations ("labels") have an enclosing
-// object (see analysis.enclosingObject).
-//
-type node struct {
-	// If non-nil, this node is the start of an object
-	// (addressable memory location).
-	// The following obj.size nodes implicitly belong to the object;
-	// they locate their object by scanning back.
-	obj *object
-
-	// The type of the field denoted by this node.  Non-aggregate,
-	// unless this is an tagged.T node (i.e. the thing
-	// pointed to by an interface) in which case typ is that type.
-	typ types.Type
-
-	// subelement indicates which directly embedded subelement of
-	// an object of aggregate type (struct, tuple, array) this is.
-	subelement *fieldInfo // e.g. ".a.b[*].c"
-
-	// Solver state for the canonical node of this pointer-
-	// equivalence class.  Each node is created with its own state
-	// but they become shared after HVN.
-	solve *solverState
-}
-
-// An analysis instance holds the state of a single pointer analysis problem.
-type analysis struct {
-	config      *Config                     // the client's control/observer interface
-	prog        *ssa.Program                // the program being analyzed
-	log         io.Writer                   // log stream; nil to disable
-	panicNode   nodeid                      // sink for panic, source for recover
-	nodes       []*node                     // indexed by nodeid
-	flattenMemo map[types.Type][]*fieldInfo // memoization of flatten()
-	trackTypes  map[types.Type]bool         // memoization of shouldTrack()
-	constraints []constraint                // set of constraints
-	cgnodes     []*cgnode                   // all cgnodes
-	genq        []*cgnode                   // queue of functions to generate constraints for
-	intrinsics  map[*ssa.Function]intrinsic // non-nil values are summaries for intrinsic fns
-	globalval   map[ssa.Value]nodeid        // node for each global ssa.Value
-	globalobj   map[ssa.Value]nodeid        // maps v to sole member of pts(v), if singleton
-	localval    map[ssa.Value]nodeid        // node for each local ssa.Value
-	localobj    map[ssa.Value]nodeid        // maps v to sole member of pts(v), if singleton
-	atFuncs     map[*ssa.Function]bool      // address-taken functions (for presolver)
-	mapValues   []nodeid                    // values of makemap objects (indirect in HVN)
-	work        nodeset                     // solver's worklist
-	result      *Result                     // results of the analysis
-	track       track                       // pointerlike types whose aliasing we track
-	deltaSpace  []int                       // working space for iterating over PTS deltas
-
-	// Reflection & intrinsics:
-	hasher              typeutil.Hasher // cache of type hashes
-	reflectValueObj     types.Object    // type symbol for reflect.Value (if present)
-	reflectValueCall    *ssa.Function   // (reflect.Value).Call
-	reflectRtypeObj     types.Object    // *types.TypeName for reflect.rtype (if present)
-	reflectRtypePtr     *types.Pointer  // *reflect.rtype
-	reflectType         *types.Named    // reflect.Type
-	rtypes              typeutil.Map    // nodeid of canonical *rtype-tagged object for type T
-	reflectZeros        typeutil.Map    // nodeid of canonical T-tagged object for zero value
-	runtimeSetFinalizer *ssa.Function   // runtime.SetFinalizer
-}
-
-// enclosingObj returns the first node of the addressable memory
-// object that encloses node id.  Panic ensues if that node does not
-// belong to any object.
-func (a *analysis) enclosingObj(id nodeid) nodeid {
-	// Find previous node with obj != nil.
-	for i := id; i >= 0; i-- {
-		n := a.nodes[i]
-		if obj := n.obj; obj != nil {
-			if i+nodeid(obj.size) <= id {
-				break // out of bounds
-			}
-			return i
-		}
-	}
-	panic("node has no enclosing object")
-}
-
-// labelFor returns the Label for node id.
-// Panic ensues if that node is not addressable.
-func (a *analysis) labelFor(id nodeid) *Label {
-	return &Label{
-		obj:        a.nodes[a.enclosingObj(id)].obj,
-		subelement: a.nodes[id].subelement,
-	}
-}
-
-func (a *analysis) warnf(pos token.Pos, format string, args ...interface{}) {
-	msg := fmt.Sprintf(format, args...)
-	if a.log != nil {
-		fmt.Fprintf(a.log, "%s: warning: %s\n", a.prog.Fset.Position(pos), msg)
-	}
-	a.result.Warnings = append(a.result.Warnings, Warning{pos, msg})
-}
-
-// computeTrackBits sets a.track to the necessary 'track' bits for the pointer queries.
-func (a *analysis) computeTrackBits() {
-	if len(a.config.extendedQueries) != 0 {
-		// TODO(dh): only track the types necessary for the query.
-		a.track = trackAll
-		return
-	}
-	var queryTypes []types.Type
-	for v := range a.config.Queries {
-		queryTypes = append(queryTypes, v.Type())
-	}
-	for v := range a.config.IndirectQueries {
-		queryTypes = append(queryTypes, mustDeref(v.Type()))
-	}
-	for _, t := range queryTypes {
-		switch t.Underlying().(type) {
-		case *types.Chan:
-			a.track |= trackChan
-		case *types.Map:
-			a.track |= trackMap
-		case *types.Pointer:
-			a.track |= trackPtr
-		case *types.Slice:
-			a.track |= trackSlice
-		case *types.Interface:
-			a.track = trackAll
-			return
-		}
-		if rVObj := a.reflectValueObj; rVObj != nil && types.Identical(t, rVObj.Type()) {
-			a.track = trackAll
-			return
-		}
-	}
-}
-
-// Analyze runs the pointer analysis with the scope and options
-// specified by config, and returns the (synthetic) root of the callgraph.
-//
-// Pointer analysis of a transitively closed well-typed program should
-// always succeed.  An error can occur only due to an internal bug.
-//
-func Analyze(config *Config) (result *Result, err error) {
-	if config.Mains == nil {
-		return nil, fmt.Errorf("no main/test packages to analyze (check $GOROOT/$GOPATH)")
-	}
-	defer func() {
-		if p := recover(); p != nil {
-			err = fmt.Errorf("internal error in pointer analysis: %v (please report this bug)", p)
-			fmt.Fprintln(os.Stderr, "Internal panic in pointer analysis:")
-			debug.PrintStack()
-		}
-	}()
-
-	a := &analysis{
-		config:      config,
-		log:         config.Log,
-		prog:        config.prog(),
-		globalval:   make(map[ssa.Value]nodeid),
-		globalobj:   make(map[ssa.Value]nodeid),
-		flattenMemo: make(map[types.Type][]*fieldInfo),
-		trackTypes:  make(map[types.Type]bool),
-		atFuncs:     make(map[*ssa.Function]bool),
-		hasher:      typeutil.MakeHasher(),
-		intrinsics:  make(map[*ssa.Function]intrinsic),
-		result: &Result{
-			Queries:         make(map[ssa.Value]Pointer),
-			IndirectQueries: make(map[ssa.Value]Pointer),
-		},
-		deltaSpace: make([]int, 0, 100),
-	}
-
-	if false {
-		a.log = os.Stderr // for debugging crashes; extremely verbose
-	}
-
-	if a.log != nil {
-		fmt.Fprintln(a.log, "==== Starting analysis")
-	}
-
-	// Pointer analysis requires a complete program for soundness.
-	// Check to prevent accidental misconfiguration.
-	for _, pkg := range a.prog.AllPackages() {
-		// (This only checks that the package scope is complete,
-		// not that func bodies exist, but it's a good signal.)
-		if !pkg.Pkg.Complete() {
-			return nil, fmt.Errorf(`pointer analysis requires a complete program yet package %q was incomplete`, pkg.Pkg.Path())
-		}
-	}
-
-	if reflect := a.prog.ImportedPackage("reflect"); reflect != nil {
-		rV := reflect.Pkg.Scope().Lookup("Value")
-		a.reflectValueObj = rV
-		a.reflectValueCall = a.prog.LookupMethod(rV.Type(), nil, "Call")
-		a.reflectType = reflect.Pkg.Scope().Lookup("Type").Type().(*types.Named)
-		a.reflectRtypeObj = reflect.Pkg.Scope().Lookup("rtype")
-		a.reflectRtypePtr = types.NewPointer(a.reflectRtypeObj.Type())
-
-		// Override flattening of reflect.Value, treating it like a basic type.
-		tReflectValue := a.reflectValueObj.Type()
-		a.flattenMemo[tReflectValue] = []*fieldInfo{{typ: tReflectValue}}
-
-		// Override shouldTrack of reflect.Value and *reflect.rtype.
-		// Always track pointers of these types.
-		a.trackTypes[tReflectValue] = true
-		a.trackTypes[a.reflectRtypePtr] = true
-
-		a.rtypes.SetHasher(a.hasher)
-		a.reflectZeros.SetHasher(a.hasher)
-	}
-	if runtime := a.prog.ImportedPackage("runtime"); runtime != nil {
-		a.runtimeSetFinalizer = runtime.Func("SetFinalizer")
-	}
-	a.computeTrackBits()
-
-	a.generate()
-	a.showCounts()
-
-	if optRenumber {
-		a.renumber()
-	}
-
-	N := len(a.nodes) // excludes solver-created nodes
-
-	if optHVN {
-		if debugHVNCrossCheck {
-			// Cross-check: run the solver once without
-			// optimization, once with, and compare the
-			// solutions.
-			savedConstraints := a.constraints
-
-			a.solve()
-			a.dumpSolution("A.pts", N)
-
-			// Restore.
-			a.constraints = savedConstraints
-			for _, n := range a.nodes {
-				n.solve = new(solverState)
-			}
-			a.nodes = a.nodes[:N]
-
-			// rtypes is effectively part of the solver state.
-			a.rtypes = typeutil.Map{}
-			a.rtypes.SetHasher(a.hasher)
-		}
-
-		a.hvn()
-	}
-
-	if debugHVNCrossCheck {
-		runtime.GC()
-		runtime.GC()
-	}
-
-	a.solve()
-
-	// Compare solutions.
-	if optHVN && debugHVNCrossCheck {
-		a.dumpSolution("B.pts", N)
-
-		if !diff("A.pts", "B.pts") {
-			return nil, fmt.Errorf("internal error: optimization changed solution")
-		}
-	}
-
-	// Create callgraph.Nodes in deterministic order.
-	if cg := a.result.CallGraph; cg != nil {
-		for _, caller := range a.cgnodes {
-			cg.CreateNode(caller.fn)
-		}
-	}
-
-	// Add dynamic edges to call graph.
-	var space [100]int
-	for _, caller := range a.cgnodes {
-		for _, site := range caller.sites {
-			for _, callee := range a.nodes[site.targets].solve.pts.AppendTo(space[:0]) {
-				a.callEdge(caller, site, nodeid(callee))
-			}
-		}
-	}
-
-	return a.result, nil
-}
-
-// callEdge is called for each edge in the callgraph.
-// calleeid is the callee's object node (has otFunction flag).
-//
-func (a *analysis) callEdge(caller *cgnode, site *callsite, calleeid nodeid) {
-	obj := a.nodes[calleeid].obj
-	if obj.flags&otFunction == 0 {
-		panic(fmt.Sprintf("callEdge %s -> n%d: not a function object", site, calleeid))
-	}
-	callee := obj.cgn
-
-	if cg := a.result.CallGraph; cg != nil {
-		// TODO(adonovan): opt: I would expect duplicate edges
-		// (to wrappers) to arise due to the elimination of
-		// context information, but I haven't observed any.
-		// Understand this better.
-		callgraph.AddEdge(cg.CreateNode(caller.fn), site.instr, cg.CreateNode(callee.fn))
-	}
-
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\tcall edge %s -> %s\n", site, callee)
-	}
-
-	// Warn about calls to non-intrinsic external functions.
-	// TODO(adonovan): de-dup these messages.
-	if fn := callee.fn; fn.Blocks == nil && a.findIntrinsic(fn) == nil {
-		a.warnf(site.pos(), "unsound call to unknown intrinsic: %s", fn)
-		a.warnf(fn.Pos(), " (declared here)")
-	}
-}
-
-// dumpSolution writes the PTS solution to the specified file.
-//
-// It only dumps the nodes that existed before solving.  The order in
-// which solver-created nodes are created depends on pre-solver
-// optimization, so we can't include them in the cross-check.
-//
-func (a *analysis) dumpSolution(filename string, N int) {
-	f, err := os.Create(filename)
-	if err != nil {
-		panic(err)
-	}
-	for id, n := range a.nodes[:N] {
-		if _, err := fmt.Fprintf(f, "pts(n%d) = {", id); err != nil {
-			panic(err)
-		}
-		var sep string
-		for _, l := range n.solve.pts.AppendTo(a.deltaSpace) {
-			if l >= N {
-				break
-			}
-			fmt.Fprintf(f, "%s%d", sep, l)
-			sep = " "
-		}
-		fmt.Fprintf(f, "} : %s\n", n.typ)
-	}
-	if err := f.Close(); err != nil {
-		panic(err)
-	}
-}
-
-// showCounts logs the size of the constraint system.  A typical
-// optimized distribution is 65% copy, 13% load, 11% addr, 5%
-// offsetAddr, 4% store, 2% others.
-//
-func (a *analysis) showCounts() {
-	if a.log != nil {
-		counts := make(map[reflect.Type]int)
-		for _, c := range a.constraints {
-			counts[reflect.TypeOf(c)]++
-		}
-		fmt.Fprintf(a.log, "# constraints:\t%d\n", len(a.constraints))
-		var lines []string
-		for t, n := range counts {
-			line := fmt.Sprintf("%7d  (%2d%%)\t%s", n, 100*n/len(a.constraints), t)
-			lines = append(lines, line)
-		}
-		sort.Sort(sort.Reverse(sort.StringSlice(lines)))
-		for _, line := range lines {
-			fmt.Fprintf(a.log, "\t%s\n", line)
-		}
-
-		fmt.Fprintf(a.log, "# nodes:\t%d\n", len(a.nodes))
-
-		// Show number of pointer equivalence classes.
-		m := make(map[*solverState]bool)
-		for _, n := range a.nodes {
-			m[n.solve] = true
-		}
-		fmt.Fprintf(a.log, "# ptsets:\t%d\n", len(m))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/api.go b/installer/vendor/golang.org/x/tools/go/pointer/api.go
deleted file mode 100644
index 2b7e79e67a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/api.go
+++ /dev/null
@@ -1,285 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-import (
-	"bytes"
-	"fmt"
-	"go/token"
-	"io"
-
-	"golang.org/x/tools/container/intsets"
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// A Config formulates a pointer analysis problem for Analyze. It is
-// only usable for a single invocation of Analyze and must not be
-// reused.
-type Config struct {
-	// Mains contains the set of 'main' packages to analyze
-	// Clients must provide the analysis with at least one
-	// package defining a main() function.
-	//
-	// Non-main packages in the ssa.Program that are not
-	// dependencies of any main package may still affect the
-	// analysis result, because they contribute runtime types and
-	// thus methods.
-	// TODO(adonovan): investigate whether this is desirable.
-	Mains []*ssa.Package
-
-	// Reflection determines whether to handle reflection
-	// operators soundly, which is currently rather slow since it
-	// causes constraint to be generated during solving
-	// proportional to the number of constraint variables, which
-	// has not yet been reduced by presolver optimisation.
-	Reflection bool
-
-	// BuildCallGraph determines whether to construct a callgraph.
-	// If enabled, the graph will be available in Result.CallGraph.
-	BuildCallGraph bool
-
-	// The client populates Queries[v] or IndirectQueries[v]
-	// for each ssa.Value v of interest, to request that the
-	// points-to sets pts(v) or pts(*v) be computed.  If the
-	// client needs both points-to sets, v may appear in both
-	// maps.
-	//
-	// (IndirectQueries is typically used for Values corresponding
-	// to source-level lvalues, e.g. an *ssa.Global.)
-	//
-	// The analysis populates the corresponding
-	// Result.{Indirect,}Queries map when it creates the pointer
-	// variable for v or *v.  Upon completion the client can
-	// inspect that map for the results.
-	//
-	// TODO(adonovan): this API doesn't scale well for batch tools
-	// that want to dump the entire solution.  Perhaps optionally
-	// populate a map[*ssa.DebugRef]Pointer in the Result, one
-	// entry per source expression.
-	//
-	Queries         map[ssa.Value]struct{}
-	IndirectQueries map[ssa.Value]struct{}
-	extendedQueries map[ssa.Value][]*extendedQuery
-
-	// If Log is non-nil, log messages are written to it.
-	// Logging is extremely verbose.
-	Log io.Writer
-}
-
-type track uint32
-
-const (
-	trackChan  track = 1 << iota // track 'chan' references
-	trackMap                     // track 'map' references
-	trackPtr                     // track regular pointers
-	trackSlice                   // track slice references
-
-	trackAll = ^track(0)
-)
-
-// AddQuery adds v to Config.Queries.
-// Precondition: CanPoint(v.Type()).
-func (c *Config) AddQuery(v ssa.Value) {
-	if !CanPoint(v.Type()) {
-		panic(fmt.Sprintf("%s is not a pointer-like value: %s", v, v.Type()))
-	}
-	if c.Queries == nil {
-		c.Queries = make(map[ssa.Value]struct{})
-	}
-	c.Queries[v] = struct{}{}
-}
-
-// AddQuery adds v to Config.IndirectQueries.
-// Precondition: CanPoint(v.Type().Underlying().(*types.Pointer).Elem()).
-func (c *Config) AddIndirectQuery(v ssa.Value) {
-	if c.IndirectQueries == nil {
-		c.IndirectQueries = make(map[ssa.Value]struct{})
-	}
-	if !CanPoint(mustDeref(v.Type())) {
-		panic(fmt.Sprintf("%s is not the address of a pointer-like value: %s", v, v.Type()))
-	}
-	c.IndirectQueries[v] = struct{}{}
-}
-
-// AddExtendedQuery adds an extended, AST-based query on v to the
-// analysis. The query, which must be a single Go expression, allows
-// destructuring the value.
-//
-// The query must operate on a variable named 'x', which represents
-// the value, and result in a pointer-like object. Only a subset of
-// Go expressions are permitted in queries, namely channel receives,
-// pointer dereferences, field selectors, array/slice/map/tuple
-// indexing and grouping with parentheses. The specific indices when
-// indexing arrays, slices and maps have no significance. Indices used
-// on tuples must be numeric and within bounds.
-//
-// All field selectors must be explicit, even ones usually elided
-// due to promotion of embedded fields.
-//
-// The query 'x' is identical to using AddQuery. The query '*x' is
-// identical to using AddIndirectQuery.
-//
-// On success, AddExtendedQuery returns a Pointer to the queried
-// value. This Pointer will be initialized during analysis. Using it
-// before analysis has finished has undefined behavior.
-//
-// Example:
-// 	// given v, which represents a function call to 'fn() (int, []*T)', and
-// 	// 'type T struct { F *int }', the following query will access the field F.
-// 	c.AddExtendedQuery(v, "x[1][0].F")
-func (c *Config) AddExtendedQuery(v ssa.Value, query string) (*Pointer, error) {
-	ops, _, err := parseExtendedQuery(v.Type().Underlying(), query)
-	if err != nil {
-		return nil, fmt.Errorf("invalid query %q: %s", query, err)
-	}
-	if c.extendedQueries == nil {
-		c.extendedQueries = make(map[ssa.Value][]*extendedQuery)
-	}
-
-	ptr := &Pointer{}
-	c.extendedQueries[v] = append(c.extendedQueries[v], &extendedQuery{ops: ops, ptr: ptr})
-	return ptr, nil
-}
-
-func (c *Config) prog() *ssa.Program {
-	for _, main := range c.Mains {
-		return main.Prog
-	}
-	panic("empty scope")
-}
-
-type Warning struct {
-	Pos     token.Pos
-	Message string
-}
-
-// A Result contains the results of a pointer analysis.
-//
-// See Config for how to request the various Result components.
-//
-type Result struct {
-	CallGraph       *callgraph.Graph      // discovered call graph
-	Queries         map[ssa.Value]Pointer // pts(v) for each v in Config.Queries.
-	IndirectQueries map[ssa.Value]Pointer // pts(*v) for each v in Config.IndirectQueries.
-	Warnings        []Warning             // warnings of unsoundness
-}
-
-// A Pointer is an equivalence class of pointer-like values.
-//
-// A Pointer doesn't have a unique type because pointers of distinct
-// types may alias the same object.
-//
-type Pointer struct {
-	a *analysis
-	n nodeid
-}
-
-// A PointsToSet is a set of labels (locations or allocations).
-type PointsToSet struct {
-	a   *analysis // may be nil if pts is nil
-	pts *nodeset
-}
-
-func (s PointsToSet) String() string {
-	var buf bytes.Buffer
-	buf.WriteByte('[')
-	if s.pts != nil {
-		var space [50]int
-		for i, l := range s.pts.AppendTo(space[:0]) {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-			buf.WriteString(s.a.labelFor(nodeid(l)).String())
-		}
-	}
-	buf.WriteByte(']')
-	return buf.String()
-}
-
-// PointsTo returns the set of labels that this points-to set
-// contains.
-func (s PointsToSet) Labels() []*Label {
-	var labels []*Label
-	if s.pts != nil {
-		var space [50]int
-		for _, l := range s.pts.AppendTo(space[:0]) {
-			labels = append(labels, s.a.labelFor(nodeid(l)))
-		}
-	}
-	return labels
-}
-
-// If this PointsToSet came from a Pointer of interface kind
-// or a reflect.Value, DynamicTypes returns the set of dynamic
-// types that it may contain.  (For an interface, they will
-// always be concrete types.)
-//
-// The result is a mapping whose keys are the dynamic types to which
-// it may point.  For each pointer-like key type, the corresponding
-// map value is the PointsToSet for pointers of that type.
-//
-// The result is empty unless CanHaveDynamicTypes(T).
-//
-func (s PointsToSet) DynamicTypes() *typeutil.Map {
-	var tmap typeutil.Map
-	tmap.SetHasher(s.a.hasher)
-	if s.pts != nil {
-		var space [50]int
-		for _, x := range s.pts.AppendTo(space[:0]) {
-			ifaceObjId := nodeid(x)
-			if !s.a.isTaggedObject(ifaceObjId) {
-				continue // !CanHaveDynamicTypes(tDyn)
-			}
-			tDyn, v, indirect := s.a.taggedValue(ifaceObjId)
-			if indirect {
-				panic("indirect tagged object") // implement later
-			}
-			pts, ok := tmap.At(tDyn).(PointsToSet)
-			if !ok {
-				pts = PointsToSet{s.a, new(nodeset)}
-				tmap.Set(tDyn, pts)
-			}
-			pts.pts.addAll(&s.a.nodes[v].solve.pts)
-		}
-	}
-	return &tmap
-}
-
-// Intersects reports whether this points-to set and the
-// argument points-to set contain common members.
-func (x PointsToSet) Intersects(y PointsToSet) bool {
-	if x.pts == nil || y.pts == nil {
-		return false
-	}
-	// This takes Θ(|x|+|y|) time.
-	var z intsets.Sparse
-	z.Intersection(&x.pts.Sparse, &y.pts.Sparse)
-	return !z.IsEmpty()
-}
-
-func (p Pointer) String() string {
-	return fmt.Sprintf("n%d", p.n)
-}
-
-// PointsTo returns the points-to set of this pointer.
-func (p Pointer) PointsTo() PointsToSet {
-	if p.n == 0 {
-		return PointsToSet{}
-	}
-	return PointsToSet{p.a, &p.a.nodes[p.n].solve.pts}
-}
-
-// MayAlias reports whether the receiver pointer may alias
-// the argument pointer.
-func (p Pointer) MayAlias(q Pointer) bool {
-	return p.PointsTo().Intersects(q.PointsTo())
-}
-
-// DynamicTypes returns p.PointsTo().DynamicTypes().
-func (p Pointer) DynamicTypes() *typeutil.Map {
-	return p.PointsTo().DynamicTypes()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/callgraph.go b/installer/vendor/golang.org/x/tools/go/pointer/callgraph.go
deleted file mode 100644
index 48e152e4af..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/callgraph.go
+++ /dev/null
@@ -1,61 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file defines the internal (context-sensitive) call graph.
-
-import (
-	"fmt"
-	"go/token"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-type cgnode struct {
-	fn         *ssa.Function
-	obj        nodeid      // start of this contour's object block
-	sites      []*callsite // ordered list of callsites within this function
-	callersite *callsite   // where called from, if known; nil for shared contours
-}
-
-// contour returns a description of this node's contour.
-func (n *cgnode) contour() string {
-	if n.callersite == nil {
-		return "shared contour"
-	}
-	if n.callersite.instr != nil {
-		return fmt.Sprintf("as called from %s", n.callersite.instr.Parent())
-	}
-	return fmt.Sprintf("as called from intrinsic (targets=n%d)", n.callersite.targets)
-}
-
-func (n *cgnode) String() string {
-	return fmt.Sprintf("cg%d:%s", n.obj, n.fn)
-}
-
-// A callsite represents a single call site within a cgnode;
-// it is implicitly context-sensitive.
-// callsites never represent calls to built-ins;
-// they are handled as intrinsics.
-//
-type callsite struct {
-	targets nodeid              // pts(·) contains objects for dynamically called functions
-	instr   ssa.CallInstruction // the call instruction; nil for synthetic/intrinsic
-}
-
-func (c *callsite) String() string {
-	if c.instr != nil {
-		return c.instr.Common().Description()
-	}
-	return "synthetic function call"
-}
-
-// pos returns the source position of this callsite, or token.NoPos if implicit.
-func (c *callsite) pos() token.Pos {
-	if c.instr != nil {
-		return c.instr.Pos()
-	}
-	return token.NoPos
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/constraint.go b/installer/vendor/golang.org/x/tools/go/pointer/constraint.go
deleted file mode 100644
index 54b54288a0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/constraint.go
+++ /dev/null
@@ -1,149 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-import "go/types"
-
-type constraint interface {
-	// For a complex constraint, returns the nodeid of the pointer
-	// to which it is attached.   For addr and copy, returns dst.
-	ptr() nodeid
-
-	// renumber replaces each nodeid n in the constraint by mapping[n].
-	renumber(mapping []nodeid)
-
-	// presolve is a hook for constraint-specific behaviour during
-	// pre-solver optimization.  Typical implementations mark as
-	// indirect the set of nodes to which the solver will add copy
-	// edges or PTS labels.
-	presolve(h *hvn)
-
-	// solve is called for complex constraints when the pts for
-	// the node to which they are attached has changed.
-	solve(a *analysis, delta *nodeset)
-
-	String() string
-}
-
-// dst = &src
-// pts(dst) ⊇ {src}
-// A base constraint used to initialize the solver's pt sets
-type addrConstraint struct {
-	dst nodeid // (ptr)
-	src nodeid
-}
-
-func (c *addrConstraint) ptr() nodeid { return c.dst }
-func (c *addrConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst = src
-// A simple constraint represented directly as a copyTo graph edge.
-type copyConstraint struct {
-	dst nodeid // (ptr)
-	src nodeid
-}
-
-func (c *copyConstraint) ptr() nodeid { return c.dst }
-func (c *copyConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst = src[offset]
-// A complex constraint attached to src (the pointer)
-type loadConstraint struct {
-	offset uint32
-	dst    nodeid
-	src    nodeid // (ptr)
-}
-
-func (c *loadConstraint) ptr() nodeid { return c.src }
-func (c *loadConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst[offset] = src
-// A complex constraint attached to dst (the pointer)
-type storeConstraint struct {
-	offset uint32
-	dst    nodeid // (ptr)
-	src    nodeid
-}
-
-func (c *storeConstraint) ptr() nodeid { return c.dst }
-func (c *storeConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst = &src.f  or  dst = &src[0]
-// A complex constraint attached to dst (the pointer)
-type offsetAddrConstraint struct {
-	offset uint32
-	dst    nodeid
-	src    nodeid // (ptr)
-}
-
-func (c *offsetAddrConstraint) ptr() nodeid { return c.src }
-func (c *offsetAddrConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst = src.(typ)  where typ is an interface
-// A complex constraint attached to src (the interface).
-// No representation change: pts(dst) and pts(src) contains tagged objects.
-type typeFilterConstraint struct {
-	typ types.Type // an interface type
-	dst nodeid
-	src nodeid // (ptr)
-}
-
-func (c *typeFilterConstraint) ptr() nodeid { return c.src }
-func (c *typeFilterConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// dst = src.(typ)  where typ is a concrete type
-// A complex constraint attached to src (the interface).
-//
-// If exact, only tagged objects identical to typ are untagged.
-// If !exact, tagged objects assignable to typ are untagged too.
-// The latter is needed for various reflect operators, e.g. Send.
-//
-// This entails a representation change:
-// pts(src) contains tagged objects,
-// pts(dst) contains their payloads.
-type untagConstraint struct {
-	typ   types.Type // a concrete type
-	dst   nodeid
-	src   nodeid // (ptr)
-	exact bool
-}
-
-func (c *untagConstraint) ptr() nodeid { return c.src }
-func (c *untagConstraint) renumber(mapping []nodeid) {
-	c.dst = mapping[c.dst]
-	c.src = mapping[c.src]
-}
-
-// src.method(params...)
-// A complex constraint attached to iface.
-type invokeConstraint struct {
-	method *types.Func // the abstract method
-	iface  nodeid      // (ptr) the interface
-	params nodeid      // the start of the identity/params/results block
-}
-
-func (c *invokeConstraint) ptr() nodeid { return c.iface }
-func (c *invokeConstraint) renumber(mapping []nodeid) {
-	c.iface = mapping[c.iface]
-	c.params = mapping[c.params]
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/doc.go b/installer/vendor/golang.org/x/tools/go/pointer/doc.go
deleted file mode 100644
index 22e569cd0d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/doc.go
+++ /dev/null
@@ -1,610 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-
-Package pointer implements Andersen's analysis, an inclusion-based
-pointer analysis algorithm first described in (Andersen, 1994).
-
-A pointer analysis relates every pointer expression in a whole program
-to the set of memory locations to which it might point.  This
-information can be used to construct a call graph of the program that
-precisely represents the destinations of dynamic function and method
-calls.  It can also be used to determine, for example, which pairs of
-channel operations operate on the same channel.
-
-The package allows the client to request a set of expressions of
-interest for which the points-to information will be returned once the
-analysis is complete.  In addition, the client may request that a
-callgraph is constructed.  The example program in example_test.go
-demonstrates both of these features.  Clients should not request more
-information than they need since it may increase the cost of the
-analysis significantly.
-
-
-CLASSIFICATION
-
-Our algorithm is INCLUSION-BASED: the points-to sets for x and y will
-be related by pts(y) ⊇ pts(x) if the program contains the statement
-y = x.
-
-It is FLOW-INSENSITIVE: it ignores all control flow constructs and the
-order of statements in a program.  It is therefore a "MAY ALIAS"
-analysis: its facts are of the form "P may/may not point to L",
-not "P must point to L".
-
-It is FIELD-SENSITIVE: it builds separate points-to sets for distinct
-fields, such as x and y in struct { x, y *int }.
-
-It is mostly CONTEXT-INSENSITIVE: most functions are analyzed once,
-so values can flow in at one call to the function and return out at
-another.  Only some smaller functions are analyzed with consideration
-of their calling context.
-
-It has a CONTEXT-SENSITIVE HEAP: objects are named by both allocation
-site and context, so the objects returned by two distinct calls to f:
-   func f() *T { return new(T) }
-are distinguished up to the limits of the calling context.
-
-It is a WHOLE PROGRAM analysis: it requires SSA-form IR for the
-complete Go program and summaries for native code.
-
-See the (Hind, PASTE'01) survey paper for an explanation of these terms.
-
-
-SOUNDNESS
-
-The analysis is fully sound when invoked on pure Go programs that do not
-use reflection or unsafe.Pointer conversions.  In other words, if there
-is any possible execution of the program in which pointer P may point to
-object O, the analysis will report that fact.
-
-
-REFLECTION
-
-By default, the "reflect" library is ignored by the analysis, as if all
-its functions were no-ops, but if the client enables the Reflection flag,
-the analysis will make a reasonable attempt to model the effects of
-calls into this library.  However, this comes at a significant
-performance cost, and not all features of that library are yet
-implemented.  In addition, some simplifying approximations must be made
-to ensure that the analysis terminates; for example, reflection can be
-used to construct an infinite set of types and values of those types,
-but the analysis arbitrarily bounds the depth of such types.
-
-Most but not all reflection operations are supported.
-In particular, addressable reflect.Values are not yet implemented, so
-operations such as (reflect.Value).Set have no analytic effect.
-
-
-UNSAFE POINTER CONVERSIONS
-
-The pointer analysis makes no attempt to understand aliasing between the
-operand x and result y of an unsafe.Pointer conversion:
-   y = (*T)(unsafe.Pointer(x))
-It is as if the conversion allocated an entirely new object:
-   y = new(T)
-
-
-NATIVE CODE
-
-The analysis cannot model the aliasing effects of functions written in
-languages other than Go, such as runtime intrinsics in C or assembly, or
-code accessed via cgo.  The result is as if such functions are no-ops.
-However, various important intrinsics are understood by the analysis,
-along with built-ins such as append.
-
-The analysis currently provides no way for users to specify the aliasing
-effects of native code.
-
-------------------------------------------------------------------------
-
-IMPLEMENTATION
-
-The remaining documentation is intended for package maintainers and
-pointer analysis specialists.  Maintainers should have a solid
-understanding of the referenced papers (especially those by H&L and PKH)
-before making making significant changes.
-
-The implementation is similar to that described in (Pearce et al,
-PASTE'04).  Unlike many algorithms which interleave constraint
-generation and solving, constructing the callgraph as they go, this
-implementation for the most part observes a phase ordering (generation
-before solving), with only simple (copy) constraints being generated
-during solving.  (The exception is reflection, which creates various
-constraints during solving as new types flow to reflect.Value
-operations.)  This improves the traction of presolver optimisations,
-but imposes certain restrictions, e.g. potential context sensitivity
-is limited since all variants must be created a priori.
-
-
-TERMINOLOGY
-
-A type is said to be "pointer-like" if it is a reference to an object.
-Pointer-like types include pointers and also interfaces, maps, channels,
-functions and slices.
-
-We occasionally use C's x->f notation to distinguish the case where x
-is a struct pointer from x.f where is a struct value.
-
-Pointer analysis literature (and our comments) often uses the notation
-dst=*src+offset to mean something different than what it means in Go.
-It means: for each node index p in pts(src), the node index p+offset is
-in pts(dst).  Similarly *dst+offset=src is used for store constraints
-and dst=src+offset for offset-address constraints.
-
-
-NODES
-
-Nodes are the key datastructure of the analysis, and have a dual role:
-they represent both constraint variables (equivalence classes of
-pointers) and members of points-to sets (things that can be pointed
-at, i.e. "labels").
-
-Nodes are naturally numbered.  The numbering enables compact
-representations of sets of nodes such as bitvectors (or BDDs); and the
-ordering enables a very cheap way to group related nodes together.  For
-example, passing n parameters consists of generating n parallel
-constraints from caller+i to callee+i for 0<=i<n.
-
-The zero nodeid means "not a pointer".  For simplicity, we generate flow
-constraints even for non-pointer types such as int.  The pointer
-equivalence (PE) presolver optimization detects which variables cannot
-point to anything; this includes not only all variables of non-pointer
-types (such as int) but also variables of pointer-like types if they are
-always nil, or are parameters to a function that is never called.
-
-Each node represents a scalar part of a value or object.
-Aggregate types (structs, tuples, arrays) are recursively flattened
-out into a sequential list of scalar component types, and all the
-elements of an array are represented by a single node.  (The
-flattening of a basic type is a list containing a single node.)
-
-Nodes are connected into a graph with various kinds of labelled edges:
-simple edges (or copy constraints) represent value flow.  Complex
-edges (load, store, etc) trigger the creation of new simple edges
-during the solving phase.
-
-
-OBJECTS
-
-Conceptually, an "object" is a contiguous sequence of nodes denoting
-an addressable location: something that a pointer can point to.  The
-first node of an object has a non-nil obj field containing information
-about the allocation: its size, context, and ssa.Value.
-
-Objects include:
-   - functions and globals;
-   - variable allocations in the stack frame or heap;
-   - maps, channels and slices created by calls to make();
-   - allocations to construct an interface;
-   - allocations caused by conversions, e.g. []byte(str).
-   - arrays allocated by calls to append();
-
-Many objects have no Go types.  For example, the func, map and chan type
-kinds in Go are all varieties of pointers, but their respective objects
-are actual functions (executable code), maps (hash tables), and channels
-(synchronized queues).  Given the way we model interfaces, they too are
-pointers to "tagged" objects with no Go type.  And an *ssa.Global denotes
-the address of a global variable, but the object for a Global is the
-actual data.  So, the types of an ssa.Value that creates an object is
-"off by one indirection": a pointer to the object.
-
-The individual nodes of an object are sometimes referred to as "labels".
-
-For uniformity, all objects have a non-zero number of fields, even those
-of the empty type struct{}.  (All arrays are treated as if of length 1,
-so there are no empty arrays.  The empty tuple is never address-taken,
-so is never an object.)
-
-
-TAGGED OBJECTS
-
-An tagged object has the following layout:
-
-    T          -- obj.flags ⊇ {otTagged}
-    v
-    ...
-
-The T node's typ field is the dynamic type of the "payload": the value
-v which follows, flattened out.  The T node's obj has the otTagged
-flag.
-
-Tagged objects are needed when generalizing across types: interfaces,
-reflect.Values, reflect.Types.  Each of these three types is modelled
-as a pointer that exclusively points to tagged objects.
-
-Tagged objects may be indirect (obj.flags ⊇ {otIndirect}) meaning that
-the value v is not of type T but *T; this is used only for
-reflect.Values that represent lvalues.  (These are not implemented yet.)
-
-
-ANALYSIS ABSTRACTION OF EACH TYPE
-
-Variables of the following "scalar" types may be represented by a
-single node: basic types, pointers, channels, maps, slices, 'func'
-pointers, interfaces.
-
-Pointers
-  Nothing to say here, oddly.
-
-Basic types (bool, string, numbers, unsafe.Pointer)
-  Currently all fields in the flattening of a type, including
-  non-pointer basic types such as int, are represented in objects and
-  values.  Though non-pointer nodes within values are uninteresting,
-  non-pointer nodes in objects may be useful (if address-taken)
-  because they permit the analysis to deduce, in this example,
-
-     var s struct{ ...; x int; ... }
-     p := &s.x
-
-  that p points to s.x.  If we ignored such object fields, we could only
-  say that p points somewhere within s.
-
-  All other basic types are ignored.  Expressions of these types have
-  zero nodeid, and fields of these types within aggregate other types
-  are omitted.
-
-  unsafe.Pointers are not modelled as pointers, so a conversion of an
-  unsafe.Pointer to *T is (unsoundly) treated equivalent to new(T).
-
-Channels
-  An expression of type 'chan T' is a kind of pointer that points
-  exclusively to channel objects, i.e. objects created by MakeChan (or
-  reflection).
-
-  'chan T' is treated like *T.
-  *ssa.MakeChan is treated as equivalent to new(T).
-  *ssa.Send and receive (*ssa.UnOp(ARROW)) and are equivalent to store
-   and load.
-
-Maps
-  An expression of type 'map[K]V' is a kind of pointer that points
-  exclusively to map objects, i.e. objects created by MakeMap (or
-  reflection).
-
-  map K[V] is treated like *M where M = struct{k K; v V}.
-  *ssa.MakeMap is equivalent to new(M).
-  *ssa.MapUpdate is equivalent to *y=x where *y and x have type M.
-  *ssa.Lookup is equivalent to y=x.v where x has type *M.
-
-Slices
-  A slice []T, which dynamically resembles a struct{array *T, len, cap int},
-  is treated as if it were just a *T pointer; the len and cap fields are
-  ignored.
-
-  *ssa.MakeSlice is treated like new([1]T): an allocation of a
-   singleton array.
-  *ssa.Index on a slice is equivalent to a load.
-  *ssa.IndexAddr on a slice returns the address of the sole element of the
-  slice, i.e. the same address.
-  *ssa.Slice is treated as a simple copy.
-
-Functions
-  An expression of type 'func...' is a kind of pointer that points
-  exclusively to function objects.
-
-  A function object has the following layout:
-
-     identity         -- typ:*types.Signature; obj.flags ⊇ {otFunction}
-     params_0         -- (the receiver, if a method)
-     ...
-     params_n-1
-     results_0
-     ...
-     results_m-1
-
-  There may be multiple function objects for the same *ssa.Function
-  due to context-sensitive treatment of some functions.
-
-  The first node is the function's identity node.
-  Associated with every callsite is a special "targets" variable,
-  whose pts() contains the identity node of each function to which
-  the call may dispatch.  Identity words are not otherwise used during
-  the analysis, but we construct the call graph from the pts()
-  solution for such nodes.
-
-  The following block of contiguous nodes represents the flattened-out
-  types of the parameters ("P-block") and results ("R-block") of the
-  function object.
-
-  The treatment of free variables of closures (*ssa.FreeVar) is like
-  that of global variables; it is not context-sensitive.
-  *ssa.MakeClosure instructions create copy edges to Captures.
-
-  A Go value of type 'func' (i.e. a pointer to one or more functions)
-  is a pointer whose pts() contains function objects.  The valueNode()
-  for an *ssa.Function returns a singleton for that function.
-
-Interfaces
-  An expression of type 'interface{...}' is a kind of pointer that
-  points exclusively to tagged objects.  All tagged objects pointed to
-  by an interface are direct (the otIndirect flag is clear) and
-  concrete (the tag type T is not itself an interface type).  The
-  associated ssa.Value for an interface's tagged objects may be an
-  *ssa.MakeInterface instruction, or nil if the tagged object was
-  created by an instrinsic (e.g. reflection).
-
-  Constructing an interface value causes generation of constraints for
-  all of the concrete type's methods; we can't tell a priori which
-  ones may be called.
-
-  TypeAssert y = x.(T) is implemented by a dynamic constraint
-  triggered by each tagged object O added to pts(x): a typeFilter
-  constraint if T is an interface type, or an untag constraint if T is
-  a concrete type.  A typeFilter tests whether O.typ implements T; if
-  so, O is added to pts(y).  An untagFilter tests whether O.typ is
-  assignable to T,and if so, a copy edge O.v -> y is added.
-
-  ChangeInterface is a simple copy because the representation of
-  tagged objects is independent of the interface type (in contrast
-  to the "method tables" approach used by the gc runtime).
-
-  y := Invoke x.m(...) is implemented by allocating contiguous P/R
-  blocks for the callsite and adding a dynamic rule triggered by each
-  tagged object added to pts(x).  The rule adds param/results copy
-  edges to/from each discovered concrete method.
-
-  (Q. Why do we model an interface as a pointer to a pair of type and
-  value, rather than as a pair of a pointer to type and a pointer to
-  value?
-  A. Control-flow joins would merge interfaces ({T1}, {V1}) and ({T2},
-  {V2}) to make ({T1,T2}, {V1,V2}), leading to the infeasible and
-  type-unsafe combination (T1,V2).  Treating the value and its concrete
-  type as inseparable makes the analysis type-safe.)
-
-reflect.Value
-  A reflect.Value is modelled very similar to an interface{}, i.e. as
-  a pointer exclusively to tagged objects, but with two generalizations.
-
-  1) a reflect.Value that represents an lvalue points to an indirect
-     (obj.flags ⊇ {otIndirect}) tagged object, which has a similar
-     layout to an tagged object except that the value is a pointer to
-     the dynamic type.  Indirect tagged objects preserve the correct
-     aliasing so that mutations made by (reflect.Value).Set can be
-     observed.
-
-     Indirect objects only arise when an lvalue is derived from an
-     rvalue by indirection, e.g. the following code:
-
-        type S struct { X T }
-        var s S
-        var i interface{} = &s    // i points to a *S-tagged object (from MakeInterface)
-        v1 := reflect.ValueOf(i)  // v1 points to same *S-tagged object as i
-        v2 := v1.Elem()           // v2 points to an indirect S-tagged object, pointing to s
-        v3 := v2.FieldByName("X") // v3 points to an indirect int-tagged object, pointing to s.X
-        v3.Set(y)                 // pts(s.X) ⊇ pts(y)
-
-     Whether indirect or not, the concrete type of the tagged object
-     corresponds to the user-visible dynamic type, and the existence
-     of a pointer is an implementation detail.
-
-     (NB: indirect tagged objects are not yet implemented)
-
-  2) The dynamic type tag of a tagged object pointed to by a
-     reflect.Value may be an interface type; it need not be concrete.
-
-     This arises in code such as this:
-        tEface := reflect.TypeOf(new(interface{}).Elem() // interface{}
-        eface := reflect.Zero(tEface)
-     pts(eface) is a singleton containing an interface{}-tagged
-     object.  That tagged object's payload is an interface{} value,
-     i.e. the pts of the payload contains only concrete-tagged
-     objects, although in this example it's the zero interface{} value,
-     so its pts is empty.
-
-reflect.Type
-  Just as in the real "reflect" library, we represent a reflect.Type
-  as an interface whose sole implementation is the concrete type,
-  *reflect.rtype.  (This choice is forced on us by go/types: clients
-  cannot fabricate types with arbitrary method sets.)
-
-  rtype instances are canonical: there is at most one per dynamic
-  type.  (rtypes are in fact large structs but since identity is all
-  that matters, we represent them by a single node.)
-
-  The payload of each *rtype-tagged object is an *rtype pointer that
-  points to exactly one such canonical rtype object.  We exploit this
-  by setting the node.typ of the payload to the dynamic type, not
-  '*rtype'.  This saves us an indirection in each resolution rule.  As
-  an optimisation, *rtype-tagged objects are canonicalized too.
-
-
-Aggregate types:
-
-Aggregate types are treated as if all directly contained
-aggregates are recursively flattened out.
-
-Structs
-  *ssa.Field y = x.f creates a simple edge to y from x's node at f's offset.
-
-  *ssa.FieldAddr y = &x->f requires a dynamic closure rule to create
-   simple edges for each struct discovered in pts(x).
-
-  The nodes of a struct consist of a special 'identity' node (whose
-  type is that of the struct itself), followed by the nodes for all
-  the struct's fields, recursively flattened out.  A pointer to the
-  struct is a pointer to its identity node.  That node allows us to
-  distinguish a pointer to a struct from a pointer to its first field.
-
-  Field offsets are logical field offsets (plus one for the identity
-  node), so the sizes of the fields can be ignored by the analysis.
-
-  (The identity node is non-traditional but enables the distiction
-  described above, which is valuable for code comprehension tools.
-  Typical pointer analyses for C, whose purpose is compiler
-  optimization, must soundly model unsafe.Pointer (void*) conversions,
-  and this requires fidelity to the actual memory layout using physical
-  field offsets.)
-
-  *ssa.Field y = x.f creates a simple edge to y from x's node at f's offset.
-
-  *ssa.FieldAddr y = &x->f requires a dynamic closure rule to create
-   simple edges for each struct discovered in pts(x).
-
-Arrays
-  We model an array by an identity node (whose type is that of the
-  array itself) followed by a node representing all the elements of
-  the array; the analysis does not distinguish elements with different
-  indices.  Effectively, an array is treated like struct{elem T}, a
-  load y=x[i] like y=x.elem, and a store x[i]=y like x.elem=y; the
-  index i is ignored.
-
-  A pointer to an array is pointer to its identity node.  (A slice is
-  also a pointer to an array's identity node.)  The identity node
-  allows us to distinguish a pointer to an array from a pointer to one
-  of its elements, but it is rather costly because it introduces more
-  offset constraints into the system.  Furthermore, sound treatment of
-  unsafe.Pointer would require us to dispense with this node.
-
-  Arrays may be allocated by Alloc, by make([]T), by calls to append,
-  and via reflection.
-
-Tuples (T, ...)
-  Tuples are treated like structs with naturally numbered fields.
-  *ssa.Extract is analogous to *ssa.Field.
-
-  However, tuples have no identity field since by construction, they
-  cannot be address-taken.
-
-
-FUNCTION CALLS
-
-  There are three kinds of function call:
-  (1) static "call"-mode calls of functions.
-  (2) dynamic "call"-mode calls of functions.
-  (3) dynamic "invoke"-mode calls of interface methods.
-  Cases 1 and 2 apply equally to methods and standalone functions.
-
-  Static calls.
-    A static call consists three steps:
-    - finding the function object of the callee;
-    - creating copy edges from the actual parameter value nodes to the
-      P-block in the function object (this includes the receiver if
-      the callee is a method);
-    - creating copy edges from the R-block in the function object to
-      the value nodes for the result of the call.
-
-    A static function call is little more than two struct value copies
-    between the P/R blocks of caller and callee:
-
-       callee.P = caller.P
-       caller.R = callee.R
-
-    Context sensitivity
-
-      Static calls (alone) may be treated context sensitively,
-      i.e. each callsite may cause a distinct re-analysis of the
-      callee, improving precision.  Our current context-sensitivity
-      policy treats all intrinsics and getter/setter methods in this
-      manner since such functions are small and seem like an obvious
-      source of spurious confluences, though this has not yet been
-      evaluated.
-
-  Dynamic function calls
-
-    Dynamic calls work in a similar manner except that the creation of
-    copy edges occurs dynamically, in a similar fashion to a pair of
-    struct copies in which the callee is indirect:
-
-       callee->P = caller.P
-       caller.R = callee->R
-
-    (Recall that the function object's P- and R-blocks are contiguous.)
-
-  Interface method invocation
-
-    For invoke-mode calls, we create a params/results block for the
-    callsite and attach a dynamic closure rule to the interface.  For
-    each new tagged object that flows to the interface, we look up
-    the concrete method, find its function object, and connect its P/R
-    blocks to the callsite's P/R blocks, adding copy edges to the graph
-    during solving.
-
-  Recording call targets
-
-    The analysis notifies its clients of each callsite it encounters,
-    passing a CallSite interface.  Among other things, the CallSite
-    contains a synthetic constraint variable ("targets") whose
-    points-to solution includes the set of all function objects to
-    which the call may dispatch.
-
-    It is via this mechanism that the callgraph is made available.
-    Clients may also elect to be notified of callgraph edges directly;
-    internally this just iterates all "targets" variables' pts(·)s.
-
-
-PRESOLVER
-
-We implement Hash-Value Numbering (HVN), a pre-solver constraint
-optimization described in Hardekopf & Lin, SAS'07.  This is documented
-in more detail in hvn.go.  We intend to add its cousins HR and HU in
-future.
-
-
-SOLVER
-
-The solver is currently a naive Andersen-style implementation; it does
-not perform online cycle detection, though we plan to add solver
-optimisations such as Hybrid- and Lazy- Cycle Detection from (Hardekopf
-& Lin, PLDI'07).
-
-It uses difference propagation (Pearce et al, SQC'04) to avoid
-redundant re-triggering of closure rules for values already seen.
-
-Points-to sets are represented using sparse bit vectors (similar to
-those used in LLVM and gcc), which are more space- and time-efficient
-than sets based on Go's built-in map type or dense bit vectors.
-
-Nodes are permuted prior to solving so that object nodes (which may
-appear in points-to sets) are lower numbered than non-object (var)
-nodes.  This improves the density of the set over which the PTSs
-range, and thus the efficiency of the representation.
-
-Partly thanks to avoiding map iteration, the execution of the solver is
-100% deterministic, a great help during debugging.
-
-
-FURTHER READING
-
-Andersen, L. O. 1994. Program analysis and specialization for the C
-programming language. Ph.D. dissertation. DIKU, University of
-Copenhagen.
-
-David J. Pearce, Paul H. J. Kelly, and Chris Hankin. 2004.  Efficient
-field-sensitive pointer analysis for C. In Proceedings of the 5th ACM
-SIGPLAN-SIGSOFT workshop on Program analysis for software tools and
-engineering (PASTE '04). ACM, New York, NY, USA, 37-42.
-http://doi.acm.org/10.1145/996821.996835
-
-David J. Pearce, Paul H. J. Kelly, and Chris Hankin. 2004. Online
-Cycle Detection and Difference Propagation: Applications to Pointer
-Analysis. Software Quality Control 12, 4 (December 2004), 311-337.
-http://dx.doi.org/10.1023/B:SQJO.0000039791.93071.a2
-
-David Grove and Craig Chambers. 2001. A framework for call graph
-construction algorithms. ACM Trans. Program. Lang. Syst. 23, 6
-(November 2001), 685-746.
-http://doi.acm.org/10.1145/506315.506316
-
-Ben Hardekopf and Calvin Lin. 2007. The ant and the grasshopper: fast
-and accurate pointer analysis for millions of lines of code. In
-Proceedings of the 2007 ACM SIGPLAN conference on Programming language
-design and implementation (PLDI '07). ACM, New York, NY, USA, 290-299.
-http://doi.acm.org/10.1145/1250734.1250767
-
-Ben Hardekopf and Calvin Lin. 2007. Exploiting pointer and location
-equivalence to optimize pointer analysis. In Proceedings of the 14th
-international conference on Static Analysis (SAS'07), Hanne Riis
-Nielson and Gilberto Filé (Eds.). Springer-Verlag, Berlin, Heidelberg,
-265-280.
-
-Atanas Rountev and Satish Chandra. 2000. Off-line variable substitution
-for scaling points-to analysis. In Proceedings of the ACM SIGPLAN 2000
-conference on Programming language design and implementation (PLDI '00).
-ACM, New York, NY, USA, 47-56. DOI=10.1145/349299.349310
-http://doi.acm.org/10.1145/349299.349310
-
-*/
-package pointer // import "golang.org/x/tools/go/pointer"
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/example_test.go b/installer/vendor/golang.org/x/tools/go/pointer/example_test.go
deleted file mode 100644
index 673de7a495..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/example_test.go
+++ /dev/null
@@ -1,126 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer_test
-
-import (
-	"fmt"
-	"sort"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// This program demonstrates how to use the pointer analysis to
-// obtain a conservative call-graph of a Go program.
-// It also shows how to compute the points-to set of a variable,
-// in this case, (C).f's ch parameter.
-//
-func Example() {
-	const myprog = `
-package main
-
-import "fmt"
-
-type I interface {
-	f(map[string]int)
-}
-
-type C struct{}
-
-func (C) f(m map[string]int) {
-	fmt.Println("C.f()")
-}
-
-func main() {
-	var i I = C{}
-	x := map[string]int{"one":1}
-	i.f(x) // dynamic method call
-}
-`
-	var conf loader.Config
-
-	// Parse the input file, a string.
-	// (Command-line tools should use conf.FromArgs.)
-	file, err := conf.ParseFile("myprog.go", myprog)
-	if err != nil {
-		fmt.Print(err) // parse error
-		return
-	}
-
-	// Create single-file main package and import its dependencies.
-	conf.CreateFromFiles("main", file)
-
-	iprog, err := conf.Load()
-	if err != nil {
-		fmt.Print(err) // type error in some package
-		return
-	}
-
-	// Create SSA-form program representation.
-	prog := ssautil.CreateProgram(iprog, 0)
-	mainPkg := prog.Package(iprog.Created[0].Pkg)
-
-	// Build SSA code for bodies of all functions in the whole program.
-	prog.Build()
-
-	// Configure the pointer analysis to build a call-graph.
-	config := &pointer.Config{
-		Mains:          []*ssa.Package{mainPkg},
-		BuildCallGraph: true,
-	}
-
-	// Query points-to set of (C).f's parameter m, a map.
-	C := mainPkg.Type("C").Type()
-	Cfm := prog.LookupMethod(C, mainPkg.Pkg, "f").Params[1]
-	config.AddQuery(Cfm)
-
-	// Run the pointer analysis.
-	result, err := pointer.Analyze(config)
-	if err != nil {
-		panic(err) // internal error in pointer analysis
-	}
-
-	// Find edges originating from the main package.
-	// By converting to strings, we de-duplicate nodes
-	// representing the same function due to context sensitivity.
-	var edges []string
-	callgraph.GraphVisitEdges(result.CallGraph, func(edge *callgraph.Edge) error {
-		caller := edge.Caller.Func
-		if caller.Pkg == mainPkg {
-			edges = append(edges, fmt.Sprint(caller, " --> ", edge.Callee.Func))
-		}
-		return nil
-	})
-
-	// Print the edges in sorted order.
-	sort.Strings(edges)
-	for _, edge := range edges {
-		fmt.Println(edge)
-	}
-	fmt.Println()
-
-	// Print the labels of (C).f(m)'s points-to set.
-	fmt.Println("m may point to:")
-	var labels []string
-	for _, l := range result.Queries[Cfm].PointsTo().Labels() {
-		label := fmt.Sprintf("  %s: %s", prog.Fset.Position(l.Pos()), l)
-		labels = append(labels, label)
-	}
-	sort.Strings(labels)
-	for _, label := range labels {
-		fmt.Println(label)
-	}
-
-	// Output:
-	// (main.C).f --> fmt.Println
-	// main.init --> fmt.init
-	// main.main --> (main.C).f
-	//
-	// m may point to:
-	//   myprog.go:18:21: makemap
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/gen.go b/installer/vendor/golang.org/x/tools/go/pointer/gen.go
deleted file mode 100644
index a111175c99..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/gen.go
+++ /dev/null
@@ -1,1325 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file defines the constraint generation phase.
-
-// TODO(adonovan): move the constraint definitions and the store() etc
-// functions which add them (and are also used by the solver) into a
-// new file, constraints.go.
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-)
-
-var (
-	tEface     = types.NewInterface(nil, nil).Complete()
-	tInvalid   = types.Typ[types.Invalid]
-	tUnsafePtr = types.Typ[types.UnsafePointer]
-)
-
-// ---------- Node creation ----------
-
-// nextNode returns the index of the next unused node.
-func (a *analysis) nextNode() nodeid {
-	return nodeid(len(a.nodes))
-}
-
-// addNodes creates nodes for all scalar elements in type typ, and
-// returns the id of the first one, or zero if the type was
-// analytically uninteresting.
-//
-// comment explains the origin of the nodes, as a debugging aid.
-//
-func (a *analysis) addNodes(typ types.Type, comment string) nodeid {
-	id := a.nextNode()
-	for _, fi := range a.flatten(typ) {
-		a.addOneNode(fi.typ, comment, fi)
-	}
-	if id == a.nextNode() {
-		return 0 // type contained no pointers
-	}
-	return id
-}
-
-// addOneNode creates a single node with type typ, and returns its id.
-//
-// typ should generally be scalar (except for tagged.T nodes
-// and struct/array identity nodes).  Use addNodes for non-scalar types.
-//
-// comment explains the origin of the nodes, as a debugging aid.
-// subelement indicates the subelement, e.g. ".a.b[*].c".
-//
-func (a *analysis) addOneNode(typ types.Type, comment string, subelement *fieldInfo) nodeid {
-	id := a.nextNode()
-	a.nodes = append(a.nodes, &node{typ: typ, subelement: subelement, solve: new(solverState)})
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\tcreate n%d %s for %s%s\n",
-			id, typ, comment, subelement.path())
-	}
-	return id
-}
-
-// setValueNode associates node id with the value v.
-// cgn identifies the context iff v is a local variable.
-//
-func (a *analysis) setValueNode(v ssa.Value, id nodeid, cgn *cgnode) {
-	if cgn != nil {
-		a.localval[v] = id
-	} else {
-		a.globalval[v] = id
-	}
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\tval[%s] = n%d  (%T)\n", v.Name(), id, v)
-	}
-
-	// Due to context-sensitivity, we may encounter the same Value
-	// in many contexts. We merge them to a canonical node, since
-	// that's what all clients want.
-
-	// Record the (v, id) relation if the client has queried pts(v).
-	if _, ok := a.config.Queries[v]; ok {
-		t := v.Type()
-		ptr, ok := a.result.Queries[v]
-		if !ok {
-			// First time?  Create the canonical query node.
-			ptr = Pointer{a, a.addNodes(t, "query")}
-			a.result.Queries[v] = ptr
-		}
-		a.result.Queries[v] = ptr
-		a.copy(ptr.n, id, a.sizeof(t))
-	}
-
-	// Record the (*v, id) relation if the client has queried pts(*v).
-	if _, ok := a.config.IndirectQueries[v]; ok {
-		t := v.Type()
-		ptr, ok := a.result.IndirectQueries[v]
-		if !ok {
-			// First time? Create the canonical indirect query node.
-			ptr = Pointer{a, a.addNodes(v.Type(), "query.indirect")}
-			a.result.IndirectQueries[v] = ptr
-		}
-		a.genLoad(cgn, ptr.n, v, 0, a.sizeof(t))
-	}
-
-	for _, query := range a.config.extendedQueries[v] {
-		t, nid := a.evalExtendedQuery(v.Type().Underlying(), id, query.ops)
-
-		if query.ptr.a == nil {
-			query.ptr.a = a
-			query.ptr.n = a.addNodes(t, "query.extended")
-		}
-		a.copy(query.ptr.n, nid, a.sizeof(t))
-	}
-}
-
-// endObject marks the end of a sequence of calls to addNodes denoting
-// a single object allocation.
-//
-// obj is the start node of the object, from a prior call to nextNode.
-// Its size, flags and optional data will be updated.
-//
-func (a *analysis) endObject(obj nodeid, cgn *cgnode, data interface{}) *object {
-	// Ensure object is non-empty by padding;
-	// the pad will be the object node.
-	size := uint32(a.nextNode() - obj)
-	if size == 0 {
-		a.addOneNode(tInvalid, "padding", nil)
-	}
-	objNode := a.nodes[obj]
-	o := &object{
-		size: size, // excludes padding
-		cgn:  cgn,
-		data: data,
-	}
-	objNode.obj = o
-
-	return o
-}
-
-// makeFunctionObject creates and returns a new function object
-// (contour) for fn, and returns the id of its first node.  It also
-// enqueues fn for subsequent constraint generation.
-//
-// For a context-sensitive contour, callersite identifies the sole
-// callsite; for shared contours, caller is nil.
-//
-func (a *analysis) makeFunctionObject(fn *ssa.Function, callersite *callsite) nodeid {
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\t---- makeFunctionObject %s\n", fn)
-	}
-
-	// obj is the function object (identity, params, results).
-	obj := a.nextNode()
-	cgn := a.makeCGNode(fn, obj, callersite)
-	sig := fn.Signature
-	a.addOneNode(sig, "func.cgnode", nil) // (scalar with Signature type)
-	if recv := sig.Recv(); recv != nil {
-		a.addNodes(recv.Type(), "func.recv")
-	}
-	a.addNodes(sig.Params(), "func.params")
-	a.addNodes(sig.Results(), "func.results")
-	a.endObject(obj, cgn, fn).flags |= otFunction
-
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\t----\n")
-	}
-
-	// Queue it up for constraint processing.
-	a.genq = append(a.genq, cgn)
-
-	return obj
-}
-
-// makeTagged creates a tagged object of type typ.
-func (a *analysis) makeTagged(typ types.Type, cgn *cgnode, data interface{}) nodeid {
-	obj := a.addOneNode(typ, "tagged.T", nil) // NB: type may be non-scalar!
-	a.addNodes(typ, "tagged.v")
-	a.endObject(obj, cgn, data).flags |= otTagged
-	return obj
-}
-
-// makeRtype returns the canonical tagged object of type *rtype whose
-// payload points to the sole rtype object for T.
-//
-// TODO(adonovan): move to reflect.go; it's part of the solver really.
-//
-func (a *analysis) makeRtype(T types.Type) nodeid {
-	if v := a.rtypes.At(T); v != nil {
-		return v.(nodeid)
-	}
-
-	// Create the object for the reflect.rtype itself, which is
-	// ordinarily a large struct but here a single node will do.
-	obj := a.nextNode()
-	a.addOneNode(T, "reflect.rtype", nil)
-	a.endObject(obj, nil, T)
-
-	id := a.makeTagged(a.reflectRtypePtr, nil, T)
-	a.nodes[id+1].typ = T // trick (each *rtype tagged object is a singleton)
-	a.addressOf(a.reflectRtypePtr, id+1, obj)
-
-	a.rtypes.Set(T, id)
-	return id
-}
-
-// rtypeValue returns the type of the *reflect.rtype-tagged object obj.
-func (a *analysis) rtypeTaggedValue(obj nodeid) types.Type {
-	tDyn, t, _ := a.taggedValue(obj)
-	if tDyn != a.reflectRtypePtr {
-		panic(fmt.Sprintf("not a *reflect.rtype-tagged object: obj=n%d tag=%v payload=n%d", obj, tDyn, t))
-	}
-	return a.nodes[t].typ
-}
-
-// valueNode returns the id of the value node for v, creating it (and
-// the association) as needed.  It may return zero for uninteresting
-// values containing no pointers.
-//
-func (a *analysis) valueNode(v ssa.Value) nodeid {
-	// Value nodes for locals are created en masse by genFunc.
-	if id, ok := a.localval[v]; ok {
-		return id
-	}
-
-	// Value nodes for globals are created on demand.
-	id, ok := a.globalval[v]
-	if !ok {
-		var comment string
-		if a.log != nil {
-			comment = v.String()
-		}
-		id = a.addNodes(v.Type(), comment)
-		if obj := a.objectNode(nil, v); obj != 0 {
-			a.addressOf(v.Type(), id, obj)
-		}
-		a.setValueNode(v, id, nil)
-	}
-	return id
-}
-
-// valueOffsetNode ascertains the node for tuple/struct value v,
-// then returns the node for its subfield #index.
-//
-func (a *analysis) valueOffsetNode(v ssa.Value, index int) nodeid {
-	id := a.valueNode(v)
-	if id == 0 {
-		panic(fmt.Sprintf("cannot offset within n0: %s = %s", v.Name(), v))
-	}
-	return id + nodeid(a.offsetOf(v.Type(), index))
-}
-
-// isTaggedObject reports whether object obj is a tagged object.
-func (a *analysis) isTaggedObject(obj nodeid) bool {
-	return a.nodes[obj].obj.flags&otTagged != 0
-}
-
-// taggedValue returns the dynamic type tag, the (first node of the)
-// payload, and the indirect flag of the tagged object starting at id.
-// Panic ensues if !isTaggedObject(id).
-//
-func (a *analysis) taggedValue(obj nodeid) (tDyn types.Type, v nodeid, indirect bool) {
-	n := a.nodes[obj]
-	flags := n.obj.flags
-	if flags&otTagged == 0 {
-		panic(fmt.Sprintf("not a tagged object: n%d", obj))
-	}
-	return n.typ, obj + 1, flags&otIndirect != 0
-}
-
-// funcParams returns the first node of the params (P) block of the
-// function whose object node (obj.flags&otFunction) is id.
-//
-func (a *analysis) funcParams(id nodeid) nodeid {
-	n := a.nodes[id]
-	if n.obj == nil || n.obj.flags&otFunction == 0 {
-		panic(fmt.Sprintf("funcParams(n%d): not a function object block", id))
-	}
-	return id + 1
-}
-
-// funcResults returns the first node of the results (R) block of the
-// function whose object node (obj.flags&otFunction) is id.
-//
-func (a *analysis) funcResults(id nodeid) nodeid {
-	n := a.nodes[id]
-	if n.obj == nil || n.obj.flags&otFunction == 0 {
-		panic(fmt.Sprintf("funcResults(n%d): not a function object block", id))
-	}
-	sig := n.typ.(*types.Signature)
-	id += 1 + nodeid(a.sizeof(sig.Params()))
-	if sig.Recv() != nil {
-		id += nodeid(a.sizeof(sig.Recv().Type()))
-	}
-	return id
-}
-
-// ---------- Constraint creation ----------
-
-// copy creates a constraint of the form dst = src.
-// sizeof is the width (in logical fields) of the copied type.
-//
-func (a *analysis) copy(dst, src nodeid, sizeof uint32) {
-	if src == dst || sizeof == 0 {
-		return // trivial
-	}
-	if src == 0 || dst == 0 {
-		panic(fmt.Sprintf("ill-typed copy dst=n%d src=n%d", dst, src))
-	}
-	for i := uint32(0); i < sizeof; i++ {
-		a.addConstraint(&copyConstraint{dst, src})
-		src++
-		dst++
-	}
-}
-
-// addressOf creates a constraint of the form id = &obj.
-// T is the type of the address.
-func (a *analysis) addressOf(T types.Type, id, obj nodeid) {
-	if id == 0 {
-		panic("addressOf: zero id")
-	}
-	if obj == 0 {
-		panic("addressOf: zero obj")
-	}
-	if a.shouldTrack(T) {
-		a.addConstraint(&addrConstraint{id, obj})
-	}
-}
-
-// load creates a load constraint of the form dst = src[offset].
-// offset is the pointer offset in logical fields.
-// sizeof is the width (in logical fields) of the loaded type.
-//
-func (a *analysis) load(dst, src nodeid, offset, sizeof uint32) {
-	if dst == 0 {
-		return // load of non-pointerlike value
-	}
-	if src == 0 && dst == 0 {
-		return // non-pointerlike operation
-	}
-	if src == 0 || dst == 0 {
-		panic(fmt.Sprintf("ill-typed load dst=n%d src=n%d", dst, src))
-	}
-	for i := uint32(0); i < sizeof; i++ {
-		a.addConstraint(&loadConstraint{offset, dst, src})
-		offset++
-		dst++
-	}
-}
-
-// store creates a store constraint of the form dst[offset] = src.
-// offset is the pointer offset in logical fields.
-// sizeof is the width (in logical fields) of the stored type.
-//
-func (a *analysis) store(dst, src nodeid, offset uint32, sizeof uint32) {
-	if src == 0 {
-		return // store of non-pointerlike value
-	}
-	if src == 0 && dst == 0 {
-		return // non-pointerlike operation
-	}
-	if src == 0 || dst == 0 {
-		panic(fmt.Sprintf("ill-typed store dst=n%d src=n%d", dst, src))
-	}
-	for i := uint32(0); i < sizeof; i++ {
-		a.addConstraint(&storeConstraint{offset, dst, src})
-		offset++
-		src++
-	}
-}
-
-// offsetAddr creates an offsetAddr constraint of the form dst = &src.#offset.
-// offset is the field offset in logical fields.
-// T is the type of the address.
-//
-func (a *analysis) offsetAddr(T types.Type, dst, src nodeid, offset uint32) {
-	if !a.shouldTrack(T) {
-		return
-	}
-	if offset == 0 {
-		// Simplify  dst = &src->f0
-		//       to  dst = src
-		// (NB: this optimisation is defeated by the identity
-		// field prepended to struct and array objects.)
-		a.copy(dst, src, 1)
-	} else {
-		a.addConstraint(&offsetAddrConstraint{offset, dst, src})
-	}
-}
-
-// typeAssert creates a typeFilter or untag constraint of the form dst = src.(T):
-// typeFilter for an interface, untag for a concrete type.
-// The exact flag is specified as for untagConstraint.
-//
-func (a *analysis) typeAssert(T types.Type, dst, src nodeid, exact bool) {
-	if isInterface(T) {
-		a.addConstraint(&typeFilterConstraint{T, dst, src})
-	} else {
-		a.addConstraint(&untagConstraint{T, dst, src, exact})
-	}
-}
-
-// addConstraint adds c to the constraint set.
-func (a *analysis) addConstraint(c constraint) {
-	a.constraints = append(a.constraints, c)
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\t%s\n", c)
-	}
-}
-
-// copyElems generates load/store constraints for *dst = *src,
-// where src and dst are slices or *arrays.
-//
-func (a *analysis) copyElems(cgn *cgnode, typ types.Type, dst, src ssa.Value) {
-	tmp := a.addNodes(typ, "copy")
-	sz := a.sizeof(typ)
-	a.genLoad(cgn, tmp, src, 1, sz)
-	a.genStore(cgn, dst, tmp, 1, sz)
-}
-
-// ---------- Constraint generation ----------
-
-// genConv generates constraints for the conversion operation conv.
-func (a *analysis) genConv(conv *ssa.Convert, cgn *cgnode) {
-	res := a.valueNode(conv)
-	if res == 0 {
-		return // result is non-pointerlike
-	}
-
-	tSrc := conv.X.Type()
-	tDst := conv.Type()
-
-	switch utSrc := tSrc.Underlying().(type) {
-	case *types.Slice:
-		// []byte/[]rune -> string?
-		return
-
-	case *types.Pointer:
-		// *T -> unsafe.Pointer?
-		if tDst.Underlying() == tUnsafePtr {
-			return // we don't model unsafe aliasing (unsound)
-		}
-
-	case *types.Basic:
-		switch tDst.Underlying().(type) {
-		case *types.Pointer:
-			// Treat unsafe.Pointer->*T conversions like
-			// new(T) and create an unaliased object.
-			if utSrc == tUnsafePtr {
-				obj := a.addNodes(mustDeref(tDst), "unsafe.Pointer conversion")
-				a.endObject(obj, cgn, conv)
-				a.addressOf(tDst, res, obj)
-				return
-			}
-
-		case *types.Slice:
-			// string -> []byte/[]rune (or named aliases)?
-			if utSrc.Info()&types.IsString != 0 {
-				obj := a.addNodes(sliceToArray(tDst), "convert")
-				a.endObject(obj, cgn, conv)
-				a.addressOf(tDst, res, obj)
-				return
-			}
-
-		case *types.Basic:
-			// All basic-to-basic type conversions are no-ops.
-			// This includes uintptr<->unsafe.Pointer conversions,
-			// which we (unsoundly) ignore.
-			return
-		}
-	}
-
-	panic(fmt.Sprintf("illegal *ssa.Convert %s -> %s: %s", tSrc, tDst, conv.Parent()))
-}
-
-// genAppend generates constraints for a call to append.
-func (a *analysis) genAppend(instr *ssa.Call, cgn *cgnode) {
-	// Consider z = append(x, y).   y is optional.
-	// This may allocate a new [1]T array; call its object w.
-	// We get the following constraints:
-	// 	z = x
-	// 	z = &w
-	//     *z = *y
-
-	x := instr.Call.Args[0]
-
-	z := instr
-	a.copy(a.valueNode(z), a.valueNode(x), 1) // z = x
-
-	if len(instr.Call.Args) == 1 {
-		return // no allocation for z = append(x) or _ = append(x).
-	}
-
-	// TODO(adonovan): test append([]byte, ...string) []byte.
-
-	y := instr.Call.Args[1]
-	tArray := sliceToArray(instr.Call.Args[0].Type())
-
-	var w nodeid
-	w = a.nextNode()
-	a.addNodes(tArray, "append")
-	a.endObject(w, cgn, instr)
-
-	a.copyElems(cgn, tArray.Elem(), z, y)        // *z = *y
-	a.addressOf(instr.Type(), a.valueNode(z), w) //  z = &w
-}
-
-// genBuiltinCall generates contraints for a call to a built-in.
-func (a *analysis) genBuiltinCall(instr ssa.CallInstruction, cgn *cgnode) {
-	call := instr.Common()
-	switch call.Value.(*ssa.Builtin).Name() {
-	case "append":
-		// Safe cast: append cannot appear in a go or defer statement.
-		a.genAppend(instr.(*ssa.Call), cgn)
-
-	case "copy":
-		tElem := call.Args[0].Type().Underlying().(*types.Slice).Elem()
-		a.copyElems(cgn, tElem, call.Args[0], call.Args[1])
-
-	case "panic":
-		a.copy(a.panicNode, a.valueNode(call.Args[0]), 1)
-
-	case "recover":
-		if v := instr.Value(); v != nil {
-			a.copy(a.valueNode(v), a.panicNode, 1)
-		}
-
-	case "print":
-		// In the tests, the probe might be the sole reference
-		// to its arg, so make sure we create nodes for it.
-		if len(call.Args) > 0 {
-			a.valueNode(call.Args[0])
-		}
-
-	case "ssa:wrapnilchk":
-		a.copy(a.valueNode(instr.Value()), a.valueNode(call.Args[0]), 1)
-
-	default:
-		// No-ops: close len cap real imag complex print println delete.
-	}
-}
-
-// shouldUseContext defines the context-sensitivity policy.  It
-// returns true if we should analyse all static calls to fn anew.
-//
-// Obviously this interface rather limits how much freedom we have to
-// choose a policy.  The current policy, rather arbitrarily, is true
-// for intrinsics and accessor methods (actually: short, single-block,
-// call-free functions).  This is just a starting point.
-//
-func (a *analysis) shouldUseContext(fn *ssa.Function) bool {
-	if a.findIntrinsic(fn) != nil {
-		return true // treat intrinsics context-sensitively
-	}
-	if len(fn.Blocks) != 1 {
-		return false // too expensive
-	}
-	blk := fn.Blocks[0]
-	if len(blk.Instrs) > 10 {
-		return false // too expensive
-	}
-	if fn.Synthetic != "" && (fn.Pkg == nil || fn != fn.Pkg.Func("init")) {
-		return true // treat synthetic wrappers context-sensitively
-	}
-	for _, instr := range blk.Instrs {
-		switch instr := instr.(type) {
-		case ssa.CallInstruction:
-			// Disallow function calls (except to built-ins)
-			// because of the danger of unbounded recursion.
-			if _, ok := instr.Common().Value.(*ssa.Builtin); !ok {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-// genStaticCall generates constraints for a statically dispatched function call.
-func (a *analysis) genStaticCall(caller *cgnode, site *callsite, call *ssa.CallCommon, result nodeid) {
-	fn := call.StaticCallee()
-
-	// Special cases for inlined intrinsics.
-	switch fn {
-	case a.runtimeSetFinalizer:
-		// Inline SetFinalizer so the call appears direct.
-		site.targets = a.addOneNode(tInvalid, "SetFinalizer.targets", nil)
-		a.addConstraint(&runtimeSetFinalizerConstraint{
-			targets: site.targets,
-			x:       a.valueNode(call.Args[0]),
-			f:       a.valueNode(call.Args[1]),
-		})
-		return
-
-	case a.reflectValueCall:
-		// Inline (reflect.Value).Call so the call appears direct.
-		dotdotdot := false
-		ret := reflectCallImpl(a, caller, site, a.valueNode(call.Args[0]), a.valueNode(call.Args[1]), dotdotdot)
-		if result != 0 {
-			a.addressOf(fn.Signature.Results().At(0).Type(), result, ret)
-		}
-		return
-	}
-
-	// Ascertain the context (contour/cgnode) for a particular call.
-	var obj nodeid
-	if a.shouldUseContext(fn) {
-		obj = a.makeFunctionObject(fn, site) // new contour
-	} else {
-		obj = a.objectNode(nil, fn) // shared contour
-	}
-	a.callEdge(caller, site, obj)
-
-	sig := call.Signature()
-
-	// Copy receiver, if any.
-	params := a.funcParams(obj)
-	args := call.Args
-	if sig.Recv() != nil {
-		sz := a.sizeof(sig.Recv().Type())
-		a.copy(params, a.valueNode(args[0]), sz)
-		params += nodeid(sz)
-		args = args[1:]
-	}
-
-	// Copy actual parameters into formal params block.
-	// Must loop, since the actuals aren't contiguous.
-	for i, arg := range args {
-		sz := a.sizeof(sig.Params().At(i).Type())
-		a.copy(params, a.valueNode(arg), sz)
-		params += nodeid(sz)
-	}
-
-	// Copy formal results block to actual result.
-	if result != 0 {
-		a.copy(result, a.funcResults(obj), a.sizeof(sig.Results()))
-	}
-}
-
-// genDynamicCall generates constraints for a dynamic function call.
-func (a *analysis) genDynamicCall(caller *cgnode, site *callsite, call *ssa.CallCommon, result nodeid) {
-	// pts(targets) will be the set of possible call targets.
-	site.targets = a.valueNode(call.Value)
-
-	// We add dynamic closure rules that store the arguments into
-	// the P-block and load the results from the R-block of each
-	// function discovered in pts(targets).
-
-	sig := call.Signature()
-	var offset uint32 = 1 // P/R block starts at offset 1
-	for i, arg := range call.Args {
-		sz := a.sizeof(sig.Params().At(i).Type())
-		a.genStore(caller, call.Value, a.valueNode(arg), offset, sz)
-		offset += sz
-	}
-	if result != 0 {
-		a.genLoad(caller, result, call.Value, offset, a.sizeof(sig.Results()))
-	}
-}
-
-// genInvoke generates constraints for a dynamic method invocation.
-func (a *analysis) genInvoke(caller *cgnode, site *callsite, call *ssa.CallCommon, result nodeid) {
-	if call.Value.Type() == a.reflectType {
-		a.genInvokeReflectType(caller, site, call, result)
-		return
-	}
-
-	sig := call.Signature()
-
-	// Allocate a contiguous targets/params/results block for this call.
-	block := a.nextNode()
-	// pts(targets) will be the set of possible call targets
-	site.targets = a.addOneNode(sig, "invoke.targets", nil)
-	p := a.addNodes(sig.Params(), "invoke.params")
-	r := a.addNodes(sig.Results(), "invoke.results")
-
-	// Copy the actual parameters into the call's params block.
-	for i, n := 0, sig.Params().Len(); i < n; i++ {
-		sz := a.sizeof(sig.Params().At(i).Type())
-		a.copy(p, a.valueNode(call.Args[i]), sz)
-		p += nodeid(sz)
-	}
-	// Copy the call's results block to the actual results.
-	if result != 0 {
-		a.copy(result, r, a.sizeof(sig.Results()))
-	}
-
-	// We add a dynamic invoke constraint that will connect the
-	// caller's and the callee's P/R blocks for each discovered
-	// call target.
-	a.addConstraint(&invokeConstraint{call.Method, a.valueNode(call.Value), block})
-}
-
-// genInvokeReflectType is a specialization of genInvoke where the
-// receiver type is a reflect.Type, under the assumption that there
-// can be at most one implementation of this interface, *reflect.rtype.
-//
-// (Though this may appear to be an instance of a pattern---method
-// calls on interfaces known to have exactly one implementation---in
-// practice it occurs rarely, so we special case for reflect.Type.)
-//
-// In effect we treat this:
-//    var rt reflect.Type = ...
-//    rt.F()
-// as this:
-//    rt.(*reflect.rtype).F()
-//
-func (a *analysis) genInvokeReflectType(caller *cgnode, site *callsite, call *ssa.CallCommon, result nodeid) {
-	// Unpack receiver into rtype
-	rtype := a.addOneNode(a.reflectRtypePtr, "rtype.recv", nil)
-	recv := a.valueNode(call.Value)
-	a.typeAssert(a.reflectRtypePtr, rtype, recv, true)
-
-	// Look up the concrete method.
-	fn := a.prog.LookupMethod(a.reflectRtypePtr, call.Method.Pkg(), call.Method.Name())
-
-	obj := a.makeFunctionObject(fn, site) // new contour for this call
-	a.callEdge(caller, site, obj)
-
-	// From now on, it's essentially a static call, but little is
-	// gained by factoring together the code for both cases.
-
-	sig := fn.Signature // concrete method
-	targets := a.addOneNode(sig, "call.targets", nil)
-	a.addressOf(sig, targets, obj) // (a singleton)
-
-	// Copy receiver.
-	params := a.funcParams(obj)
-	a.copy(params, rtype, 1)
-	params++
-
-	// Copy actual parameters into formal P-block.
-	// Must loop, since the actuals aren't contiguous.
-	for i, arg := range call.Args {
-		sz := a.sizeof(sig.Params().At(i).Type())
-		a.copy(params, a.valueNode(arg), sz)
-		params += nodeid(sz)
-	}
-
-	// Copy formal R-block to actual R-block.
-	if result != 0 {
-		a.copy(result, a.funcResults(obj), a.sizeof(sig.Results()))
-	}
-}
-
-// genCall generates constraints for call instruction instr.
-func (a *analysis) genCall(caller *cgnode, instr ssa.CallInstruction) {
-	call := instr.Common()
-
-	// Intrinsic implementations of built-in functions.
-	if _, ok := call.Value.(*ssa.Builtin); ok {
-		a.genBuiltinCall(instr, caller)
-		return
-	}
-
-	var result nodeid
-	if v := instr.Value(); v != nil {
-		result = a.valueNode(v)
-	}
-
-	site := &callsite{instr: instr}
-	if call.StaticCallee() != nil {
-		a.genStaticCall(caller, site, call, result)
-	} else if call.IsInvoke() {
-		a.genInvoke(caller, site, call, result)
-	} else {
-		a.genDynamicCall(caller, site, call, result)
-	}
-
-	caller.sites = append(caller.sites, site)
-
-	if a.log != nil {
-		// TODO(adonovan): debug: improve log message.
-		fmt.Fprintf(a.log, "\t%s to targets %s from %s\n", site, site.targets, caller)
-	}
-}
-
-// objectNode returns the object to which v points, if known.
-// In other words, if the points-to set of v is a singleton, it
-// returns the sole label, zero otherwise.
-//
-// We exploit this information to make the generated constraints less
-// dynamic.  For example, a complex load constraint can be replaced by
-// a simple copy constraint when the sole destination is known a priori.
-//
-// Some SSA instructions always have singletons points-to sets:
-// 	Alloc, Function, Global, MakeChan, MakeClosure,  MakeInterface,  MakeMap,  MakeSlice.
-// Others may be singletons depending on their operands:
-// 	FreeVar, Const, Convert, FieldAddr, IndexAddr, Slice.
-//
-// Idempotent.  Objects are created as needed, possibly via recursion
-// down the SSA value graph, e.g IndexAddr(FieldAddr(Alloc))).
-//
-func (a *analysis) objectNode(cgn *cgnode, v ssa.Value) nodeid {
-	switch v.(type) {
-	case *ssa.Global, *ssa.Function, *ssa.Const, *ssa.FreeVar:
-		// Global object.
-		obj, ok := a.globalobj[v]
-		if !ok {
-			switch v := v.(type) {
-			case *ssa.Global:
-				obj = a.nextNode()
-				a.addNodes(mustDeref(v.Type()), "global")
-				a.endObject(obj, nil, v)
-
-			case *ssa.Function:
-				obj = a.makeFunctionObject(v, nil)
-
-			case *ssa.Const:
-				// not addressable
-
-			case *ssa.FreeVar:
-				// not addressable
-			}
-
-			if a.log != nil {
-				fmt.Fprintf(a.log, "\tglobalobj[%s] = n%d\n", v, obj)
-			}
-			a.globalobj[v] = obj
-		}
-		return obj
-	}
-
-	// Local object.
-	obj, ok := a.localobj[v]
-	if !ok {
-		switch v := v.(type) {
-		case *ssa.Alloc:
-			obj = a.nextNode()
-			a.addNodes(mustDeref(v.Type()), "alloc")
-			a.endObject(obj, cgn, v)
-
-		case *ssa.MakeSlice:
-			obj = a.nextNode()
-			a.addNodes(sliceToArray(v.Type()), "makeslice")
-			a.endObject(obj, cgn, v)
-
-		case *ssa.MakeChan:
-			obj = a.nextNode()
-			a.addNodes(v.Type().Underlying().(*types.Chan).Elem(), "makechan")
-			a.endObject(obj, cgn, v)
-
-		case *ssa.MakeMap:
-			obj = a.nextNode()
-			tmap := v.Type().Underlying().(*types.Map)
-			a.addNodes(tmap.Key(), "makemap.key")
-			elem := a.addNodes(tmap.Elem(), "makemap.value")
-
-			// To update the value field, MapUpdate
-			// generates store-with-offset constraints which
-			// the presolver can't model, so we must mark
-			// those nodes indirect.
-			for id, end := elem, elem+nodeid(a.sizeof(tmap.Elem())); id < end; id++ {
-				a.mapValues = append(a.mapValues, id)
-			}
-			a.endObject(obj, cgn, v)
-
-		case *ssa.MakeInterface:
-			tConc := v.X.Type()
-			obj = a.makeTagged(tConc, cgn, v)
-
-			// Copy the value into it, if nontrivial.
-			if x := a.valueNode(v.X); x != 0 {
-				a.copy(obj+1, x, a.sizeof(tConc))
-			}
-
-		case *ssa.FieldAddr:
-			if xobj := a.objectNode(cgn, v.X); xobj != 0 {
-				obj = xobj + nodeid(a.offsetOf(mustDeref(v.X.Type()), v.Field))
-			}
-
-		case *ssa.IndexAddr:
-			if xobj := a.objectNode(cgn, v.X); xobj != 0 {
-				obj = xobj + 1
-			}
-
-		case *ssa.Slice:
-			obj = a.objectNode(cgn, v.X)
-
-		case *ssa.Convert:
-			// TODO(adonovan): opt: handle these cases too:
-			// - unsafe.Pointer->*T conversion acts like Alloc
-			// - string->[]byte/[]rune conversion acts like MakeSlice
-		}
-
-		if a.log != nil {
-			fmt.Fprintf(a.log, "\tlocalobj[%s] = n%d\n", v.Name(), obj)
-		}
-		a.localobj[v] = obj
-	}
-	return obj
-}
-
-// genLoad generates constraints for result = *(ptr + val).
-func (a *analysis) genLoad(cgn *cgnode, result nodeid, ptr ssa.Value, offset, sizeof uint32) {
-	if obj := a.objectNode(cgn, ptr); obj != 0 {
-		// Pre-apply loadConstraint.solve().
-		a.copy(result, obj+nodeid(offset), sizeof)
-	} else {
-		a.load(result, a.valueNode(ptr), offset, sizeof)
-	}
-}
-
-// genOffsetAddr generates constraints for a 'v=ptr.field' (FieldAddr)
-// or 'v=ptr[*]' (IndexAddr) instruction v.
-func (a *analysis) genOffsetAddr(cgn *cgnode, v ssa.Value, ptr nodeid, offset uint32) {
-	dst := a.valueNode(v)
-	if obj := a.objectNode(cgn, v); obj != 0 {
-		// Pre-apply offsetAddrConstraint.solve().
-		a.addressOf(v.Type(), dst, obj)
-	} else {
-		a.offsetAddr(v.Type(), dst, ptr, offset)
-	}
-}
-
-// genStore generates constraints for *(ptr + offset) = val.
-func (a *analysis) genStore(cgn *cgnode, ptr ssa.Value, val nodeid, offset, sizeof uint32) {
-	if obj := a.objectNode(cgn, ptr); obj != 0 {
-		// Pre-apply storeConstraint.solve().
-		a.copy(obj+nodeid(offset), val, sizeof)
-	} else {
-		a.store(a.valueNode(ptr), val, offset, sizeof)
-	}
-}
-
-// genInstr generates constraints for instruction instr in context cgn.
-func (a *analysis) genInstr(cgn *cgnode, instr ssa.Instruction) {
-	if a.log != nil {
-		var prefix string
-		if val, ok := instr.(ssa.Value); ok {
-			prefix = val.Name() + " = "
-		}
-		fmt.Fprintf(a.log, "; %s%s\n", prefix, instr)
-	}
-
-	switch instr := instr.(type) {
-	case *ssa.DebugRef:
-		// no-op.
-
-	case *ssa.UnOp:
-		switch instr.Op {
-		case token.ARROW: // <-x
-			// We can ignore instr.CommaOk because the node we're
-			// altering is always at zero offset relative to instr
-			tElem := instr.X.Type().Underlying().(*types.Chan).Elem()
-			a.genLoad(cgn, a.valueNode(instr), instr.X, 0, a.sizeof(tElem))
-
-		case token.MUL: // *x
-			a.genLoad(cgn, a.valueNode(instr), instr.X, 0, a.sizeof(instr.Type()))
-
-		default:
-			// NOT, SUB, XOR: no-op.
-		}
-
-	case *ssa.BinOp:
-		// All no-ops.
-
-	case ssa.CallInstruction: // *ssa.Call, *ssa.Go, *ssa.Defer
-		a.genCall(cgn, instr)
-
-	case *ssa.ChangeType:
-		a.copy(a.valueNode(instr), a.valueNode(instr.X), 1)
-
-	case *ssa.Convert:
-		a.genConv(instr, cgn)
-
-	case *ssa.Extract:
-		a.copy(a.valueNode(instr),
-			a.valueOffsetNode(instr.Tuple, instr.Index),
-			a.sizeof(instr.Type()))
-
-	case *ssa.FieldAddr:
-		a.genOffsetAddr(cgn, instr, a.valueNode(instr.X),
-			a.offsetOf(mustDeref(instr.X.Type()), instr.Field))
-
-	case *ssa.IndexAddr:
-		a.genOffsetAddr(cgn, instr, a.valueNode(instr.X), 1)
-
-	case *ssa.Field:
-		a.copy(a.valueNode(instr),
-			a.valueOffsetNode(instr.X, instr.Field),
-			a.sizeof(instr.Type()))
-
-	case *ssa.Index:
-		a.copy(a.valueNode(instr), 1+a.valueNode(instr.X), a.sizeof(instr.Type()))
-
-	case *ssa.Select:
-		recv := a.valueOffsetNode(instr, 2) // instr : (index, recvOk, recv0, ... recv_n-1)
-		for _, st := range instr.States {
-			elemSize := a.sizeof(st.Chan.Type().Underlying().(*types.Chan).Elem())
-			switch st.Dir {
-			case types.RecvOnly:
-				a.genLoad(cgn, recv, st.Chan, 0, elemSize)
-				recv += nodeid(elemSize)
-
-			case types.SendOnly:
-				a.genStore(cgn, st.Chan, a.valueNode(st.Send), 0, elemSize)
-			}
-		}
-
-	case *ssa.Return:
-		results := a.funcResults(cgn.obj)
-		for _, r := range instr.Results {
-			sz := a.sizeof(r.Type())
-			a.copy(results, a.valueNode(r), sz)
-			results += nodeid(sz)
-		}
-
-	case *ssa.Send:
-		a.genStore(cgn, instr.Chan, a.valueNode(instr.X), 0, a.sizeof(instr.X.Type()))
-
-	case *ssa.Store:
-		a.genStore(cgn, instr.Addr, a.valueNode(instr.Val), 0, a.sizeof(instr.Val.Type()))
-
-	case *ssa.Alloc, *ssa.MakeSlice, *ssa.MakeChan, *ssa.MakeMap, *ssa.MakeInterface:
-		v := instr.(ssa.Value)
-		a.addressOf(v.Type(), a.valueNode(v), a.objectNode(cgn, v))
-
-	case *ssa.ChangeInterface:
-		a.copy(a.valueNode(instr), a.valueNode(instr.X), 1)
-
-	case *ssa.TypeAssert:
-		a.typeAssert(instr.AssertedType, a.valueNode(instr), a.valueNode(instr.X), true)
-
-	case *ssa.Slice:
-		a.copy(a.valueNode(instr), a.valueNode(instr.X), 1)
-
-	case *ssa.If, *ssa.Jump:
-		// no-op.
-
-	case *ssa.Phi:
-		sz := a.sizeof(instr.Type())
-		for _, e := range instr.Edges {
-			a.copy(a.valueNode(instr), a.valueNode(e), sz)
-		}
-
-	case *ssa.MakeClosure:
-		fn := instr.Fn.(*ssa.Function)
-		a.copy(a.valueNode(instr), a.valueNode(fn), 1)
-		// Free variables are treated like global variables.
-		for i, b := range instr.Bindings {
-			a.copy(a.valueNode(fn.FreeVars[i]), a.valueNode(b), a.sizeof(b.Type()))
-		}
-
-	case *ssa.RunDefers:
-		// The analysis is flow insensitive, so we just "call"
-		// defers as we encounter them.
-
-	case *ssa.Range:
-		// Do nothing.  Next{Iter: *ssa.Range} handles this case.
-
-	case *ssa.Next:
-		if !instr.IsString { // map
-			// Assumes that Next is always directly applied to a Range result.
-			theMap := instr.Iter.(*ssa.Range).X
-			tMap := theMap.Type().Underlying().(*types.Map)
-
-			ksize := a.sizeof(tMap.Key())
-			vsize := a.sizeof(tMap.Elem())
-
-			// The k/v components of the Next tuple may each be invalid.
-			tTuple := instr.Type().(*types.Tuple)
-
-			// Load from the map's (k,v) into the tuple's (ok, k, v).
-			osrc := uint32(0) // offset within map object
-			odst := uint32(1) // offset within tuple (initially just after 'ok bool')
-			sz := uint32(0)   // amount to copy
-
-			// Is key valid?
-			if tTuple.At(1).Type() != tInvalid {
-				sz += ksize
-			} else {
-				odst += ksize
-				osrc += ksize
-			}
-
-			// Is value valid?
-			if tTuple.At(2).Type() != tInvalid {
-				sz += vsize
-			}
-
-			a.genLoad(cgn, a.valueNode(instr)+nodeid(odst), theMap, osrc, sz)
-		}
-
-	case *ssa.Lookup:
-		if tMap, ok := instr.X.Type().Underlying().(*types.Map); ok {
-			// CommaOk can be ignored: field 0 is a no-op.
-			ksize := a.sizeof(tMap.Key())
-			vsize := a.sizeof(tMap.Elem())
-			a.genLoad(cgn, a.valueNode(instr), instr.X, ksize, vsize)
-		}
-
-	case *ssa.MapUpdate:
-		tmap := instr.Map.Type().Underlying().(*types.Map)
-		ksize := a.sizeof(tmap.Key())
-		vsize := a.sizeof(tmap.Elem())
-		a.genStore(cgn, instr.Map, a.valueNode(instr.Key), 0, ksize)
-		a.genStore(cgn, instr.Map, a.valueNode(instr.Value), ksize, vsize)
-
-	case *ssa.Panic:
-		a.copy(a.panicNode, a.valueNode(instr.X), 1)
-
-	default:
-		panic(fmt.Sprintf("unimplemented: %T", instr))
-	}
-}
-
-func (a *analysis) makeCGNode(fn *ssa.Function, obj nodeid, callersite *callsite) *cgnode {
-	cgn := &cgnode{fn: fn, obj: obj, callersite: callersite}
-	a.cgnodes = append(a.cgnodes, cgn)
-	return cgn
-}
-
-// genRootCalls generates the synthetic root of the callgraph and the
-// initial calls from it to the analysis scope, such as main, a test
-// or a library.
-//
-func (a *analysis) genRootCalls() *cgnode {
-	r := a.prog.NewFunction("<root>", new(types.Signature), "root of callgraph")
-	root := a.makeCGNode(r, 0, nil)
-
-	// TODO(adonovan): make an ssa utility to construct an actual
-	// root function so we don't need to special-case site-less
-	// call edges.
-
-	// For each main package, call main.init(), main.main().
-	for _, mainPkg := range a.config.Mains {
-		main := mainPkg.Func("main")
-		if main == nil {
-			panic(fmt.Sprintf("%s has no main function", mainPkg))
-		}
-
-		targets := a.addOneNode(main.Signature, "root.targets", nil)
-		site := &callsite{targets: targets}
-		root.sites = append(root.sites, site)
-		for _, fn := range [2]*ssa.Function{mainPkg.Func("init"), main} {
-			if a.log != nil {
-				fmt.Fprintf(a.log, "\troot call to %s:\n", fn)
-			}
-			a.copy(targets, a.valueNode(fn), 1)
-		}
-	}
-
-	return root
-}
-
-// genFunc generates constraints for function fn.
-func (a *analysis) genFunc(cgn *cgnode) {
-	fn := cgn.fn
-
-	impl := a.findIntrinsic(fn)
-
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\n\n==== Generating constraints for %s, %s\n", cgn, cgn.contour())
-
-		// Hack: don't display body if intrinsic.
-		if impl != nil {
-			fn2 := *cgn.fn // copy
-			fn2.Locals = nil
-			fn2.Blocks = nil
-			fn2.WriteTo(a.log)
-		} else {
-			cgn.fn.WriteTo(a.log)
-		}
-	}
-
-	if impl != nil {
-		impl(a, cgn)
-		return
-	}
-
-	if fn.Blocks == nil {
-		// External function with no intrinsic treatment.
-		// We'll warn about calls to such functions at the end.
-		return
-	}
-
-	if a.log != nil {
-		fmt.Fprintln(a.log, "; Creating nodes for local values")
-	}
-
-	a.localval = make(map[ssa.Value]nodeid)
-	a.localobj = make(map[ssa.Value]nodeid)
-
-	// The value nodes for the params are in the func object block.
-	params := a.funcParams(cgn.obj)
-	for _, p := range fn.Params {
-		a.setValueNode(p, params, cgn)
-		params += nodeid(a.sizeof(p.Type()))
-	}
-
-	// Free variables have global cardinality:
-	// the outer function sets them with MakeClosure;
-	// the inner function accesses them with FreeVar.
-	//
-	// TODO(adonovan): treat free vars context-sensitively.
-
-	// Create value nodes for all value instructions
-	// since SSA may contain forward references.
-	var space [10]*ssa.Value
-	for _, b := range fn.Blocks {
-		for _, instr := range b.Instrs {
-			switch instr := instr.(type) {
-			case *ssa.Range:
-				// do nothing: it has a funky type,
-				// and *ssa.Next does all the work.
-
-			case ssa.Value:
-				var comment string
-				if a.log != nil {
-					comment = instr.Name()
-				}
-				id := a.addNodes(instr.Type(), comment)
-				a.setValueNode(instr, id, cgn)
-			}
-
-			// Record all address-taken functions (for presolver).
-			rands := instr.Operands(space[:0])
-			if call, ok := instr.(ssa.CallInstruction); ok && !call.Common().IsInvoke() {
-				// Skip CallCommon.Value in "call" mode.
-				// TODO(adonovan): fix: relies on unspecified ordering.  Specify it.
-				rands = rands[1:]
-			}
-			for _, rand := range rands {
-				if atf, ok := (*rand).(*ssa.Function); ok {
-					a.atFuncs[atf] = true
-				}
-			}
-		}
-	}
-
-	// Generate constraints for instructions.
-	for _, b := range fn.Blocks {
-		for _, instr := range b.Instrs {
-			a.genInstr(cgn, instr)
-		}
-	}
-
-	a.localval = nil
-	a.localobj = nil
-}
-
-// genMethodsOf generates nodes and constraints for all methods of type T.
-func (a *analysis) genMethodsOf(T types.Type) {
-	itf := isInterface(T)
-
-	// TODO(adonovan): can we skip this entirely if itf is true?
-	// I think so, but the answer may depend on reflection.
-	mset := a.prog.MethodSets.MethodSet(T)
-	for i, n := 0, mset.Len(); i < n; i++ {
-		m := a.prog.MethodValue(mset.At(i))
-		a.valueNode(m)
-
-		if !itf {
-			// Methods of concrete types are address-taken functions.
-			a.atFuncs[m] = true
-		}
-	}
-}
-
-// generate generates offline constraints for the entire program.
-func (a *analysis) generate() {
-	start("Constraint generation")
-	if a.log != nil {
-		fmt.Fprintln(a.log, "==== Generating constraints")
-	}
-
-	// Create a dummy node since we use the nodeid 0 for
-	// non-pointerlike variables.
-	a.addNodes(tInvalid, "(zero)")
-
-	// Create the global node for panic values.
-	a.panicNode = a.addNodes(tEface, "panic")
-
-	// Create nodes and constraints for all methods of reflect.rtype.
-	// (Shared contours are used by dynamic calls to reflect.Type
-	// methods---typically just String().)
-	if rtype := a.reflectRtypePtr; rtype != nil {
-		a.genMethodsOf(rtype)
-	}
-
-	root := a.genRootCalls()
-
-	if a.config.BuildCallGraph {
-		a.result.CallGraph = callgraph.New(root.fn)
-	}
-
-	// Create nodes and constraints for all methods of all types
-	// that are dynamically accessible via reflection or interfaces.
-	for _, T := range a.prog.RuntimeTypes() {
-		a.genMethodsOf(T)
-	}
-
-	// Generate constraints for functions as they become reachable
-	// from the roots.  (No constraints are generated for functions
-	// that are dead in this analysis scope.)
-	for len(a.genq) > 0 {
-		cgn := a.genq[0]
-		a.genq = a.genq[1:]
-		a.genFunc(cgn)
-	}
-
-	// The runtime magically allocates os.Args; so should we.
-	if os := a.prog.ImportedPackage("os"); os != nil {
-		// In effect:  os.Args = new([1]string)[:]
-		T := types.NewSlice(types.Typ[types.String])
-		obj := a.addNodes(sliceToArray(T), "<command-line args>")
-		a.endObject(obj, nil, "<command-line args>")
-		a.addressOf(T, a.objectNode(nil, os.Var("Args")), obj)
-	}
-
-	// Discard generation state, to avoid confusion after node renumbering.
-	a.panicNode = 0
-	a.globalval = nil
-	a.localval = nil
-	a.localobj = nil
-
-	stop("Constraint generation")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/hvn.go b/installer/vendor/golang.org/x/tools/go/pointer/hvn.go
deleted file mode 100644
index 48051ae7da..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/hvn.go
+++ /dev/null
@@ -1,973 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file implements Hash-Value Numbering (HVN), a pre-solver
-// constraint optimization described in Hardekopf & Lin, SAS'07 (see
-// doc.go) that analyses the graph topology to determine which sets of
-// variables are "pointer equivalent" (PE), i.e. must have identical
-// points-to sets in the solution.
-//
-// A separate ("offline") graph is constructed.  Its nodes are those of
-// the main-graph, plus an additional node *X for each pointer node X.
-// With this graph we can reason about the unknown points-to set of
-// dereferenced pointers.  (We do not generalize this to represent
-// unknown fields x->f, perhaps because such fields would be numerous,
-// though it might be worth an experiment.)
-//
-// Nodes whose points-to relations are not entirely captured by the
-// graph are marked as "indirect": the *X nodes, the parameters of
-// address-taken functions (which includes all functions in method
-// sets), or nodes updated by the solver rules for reflection, etc.
-//
-// All addr (y=&x) nodes are initially assigned a pointer-equivalence
-// (PE) label equal to x's nodeid in the main graph.  (These are the
-// only PE labels that are less than len(a.nodes).)
-//
-// All offsetAddr (y=&x.f) constraints are initially assigned a PE
-// label; such labels are memoized, keyed by (x, f), so that equivalent
-// nodes y as assigned the same label.
-//
-// Then we process each strongly connected component (SCC) of the graph
-// in topological order, assigning it a PE label based on the set P of
-// PE labels that flow to it from its immediate dependencies.
-//
-// If any node in P is "indirect", the entire SCC is assigned a fresh PE
-// label.  Otherwise:
-//
-// |P|=0  if P is empty, all nodes in the SCC are non-pointers (e.g.
-//        uninitialized variables, or formal params of dead functions)
-//        and the SCC is assigned the PE label of zero.
-//
-// |P|=1  if P is a singleton, the SCC is assigned the same label as the
-//        sole element of P.
-//
-// |P|>1  if P contains multiple labels, a unique label representing P is
-//        invented and recorded in an hash table, so that other
-//        equivalent SCCs may also be assigned this label, akin to
-//        conventional hash-value numbering in a compiler.
-//
-// Finally, a renumbering is computed such that each node is replaced by
-// the lowest-numbered node with the same PE label.  All constraints are
-// renumbered, and any resulting duplicates are eliminated.
-//
-// The only nodes that are not renumbered are the objects x in addr
-// (y=&x) constraints, since the ids of these nodes (and fields derived
-// from them via offsetAddr rules) are the elements of all points-to
-// sets, so they must remain as they are if we want the same solution.
-//
-// The solverStates (node.solve) for nodes in the same equivalence class
-// are linked together so that all nodes in the class have the same
-// solution.  This avoids the need to renumber nodeids buried in
-// Queries, cgnodes, etc (like (*analysis).renumber() does) since only
-// the solution is needed.
-//
-// The result of HVN is that the number of distinct nodes and
-// constraints is reduced, but the solution is identical (almost---see
-// CROSS-CHECK below).  In particular, both linear and cyclic chains of
-// copies are each replaced by a single node.
-//
-// Nodes and constraints created "online" (e.g. while solving reflection
-// constraints) are not subject to this optimization.
-//
-// PERFORMANCE
-//
-// In two benchmarks (guru and godoc), HVN eliminates about two thirds
-// of nodes, the majority accounted for by non-pointers: nodes of
-// non-pointer type, pointers that remain nil, formal parameters of dead
-// functions, nodes of untracked types, etc.  It also reduces the number
-// of constraints, also by about two thirds, and the solving time by
-// 30--42%, although we must pay about 15% for the running time of HVN
-// itself.  The benefit is greater for larger applications.
-//
-// There are many possible optimizations to improve the performance:
-// * Use fewer than 1:1 onodes to main graph nodes: many of the onodes
-//   we create are not needed.
-// * HU (HVN with Union---see paper): coalesce "union" peLabels when
-//   their expanded-out sets are equal.
-// * HR (HVN with deReference---see paper): this will require that we
-//   apply HVN until fixed point, which may need more bookkeeping of the
-//   correspondance of main nodes to onodes.
-// * Location Equivalence (see paper): have points-to sets contain not
-//   locations but location-equivalence class labels, each representing
-//   a set of locations.
-// * HVN with field-sensitive ref: model each of the fields of a
-//   pointer-to-struct.
-//
-// CROSS-CHECK
-//
-// To verify the soundness of the optimization, when the
-// debugHVNCrossCheck option is enabled, we run the solver twice, once
-// before and once after running HVN, dumping the solution to disk, and
-// then we compare the results.  If they are not identical, the analysis
-// panics.
-//
-// The solution dumped to disk includes only the N*N submatrix of the
-// complete solution where N is the number of nodes after generation.
-// In other words, we ignore pointer variables and objects created by
-// the solver itself, since their numbering depends on the solver order,
-// which is affected by the optimization.  In any case, that's the only
-// part the client cares about.
-//
-// The cross-check is too strict and may fail spuriously.  Although the
-// H&L paper describing HVN states that the solutions obtained should be
-// identical, this is not the case in practice because HVN can collapse
-// cycles involving *p even when pts(p)={}.  Consider this example
-// distilled from testdata/hello.go:
-//
-//	var x T
-//	func f(p **T) {
-//		t0 = *p
-//		...
-//		t1 = φ(t0, &x)
-//		*p = t1
-//	}
-//
-// If f is dead code, we get:
-// 	unoptimized:  pts(p)={} pts(t0)={} pts(t1)={&x}
-// 	optimized:    pts(p)={} pts(t0)=pts(t1)=pts(*p)={&x}
-//
-// It's hard to argue that this is a bug: the result is sound and the
-// loss of precision is inconsequential---f is dead code, after all.
-// But unfortunately it limits the usefulness of the cross-check since
-// failures must be carefully analyzed.  Ben Hardekopf suggests (in
-// personal correspondence) some approaches to mitigating it:
-//
-// 	If there is a node with an HVN points-to set that is a superset
-// 	of the NORM points-to set, then either it's a bug or it's a
-// 	result of this issue. If it's a result of this issue, then in
-// 	the offline constraint graph there should be a REF node inside
-// 	some cycle that reaches this node, and in the NORM solution the
-// 	pointer being dereferenced by that REF node should be the empty
-// 	set. If that isn't true then this is a bug. If it is true, then
-// 	you can further check that in the NORM solution the "extra"
-// 	points-to info in the HVN solution does in fact come from that
-// 	purported cycle (if it doesn't, then this is still a bug). If
-// 	you're doing the further check then you'll need to do it for
-// 	each "extra" points-to element in the HVN points-to set.
-//
-// 	There are probably ways to optimize these checks by taking
-// 	advantage of graph properties. For example, extraneous points-to
-// 	info will flow through the graph and end up in many
-// 	nodes. Rather than checking every node with extra info, you
-// 	could probably work out the "origin point" of the extra info and
-// 	just check there. Note that the check in the first bullet is
-// 	looking for soundness bugs, while the check in the second bullet
-// 	is looking for precision bugs; depending on your needs, you may
-// 	care more about one than the other.
-//
-// which we should evaluate.  The cross-check is nonetheless invaluable
-// for all but one of the programs in the pointer_test suite.
-
-import (
-	"fmt"
-	"go/types"
-	"io"
-	"reflect"
-
-	"golang.org/x/tools/container/intsets"
-)
-
-// A peLabel is a pointer-equivalence label: two nodes with the same
-// peLabel have identical points-to solutions.
-//
-// The numbers are allocated consecutively like so:
-// 	0	not a pointer
-//	1..N-1	addrConstraints (equals the constraint's .src field, hence sparse)
-//	...	offsetAddr constraints
-//	...	SCCs (with indirect nodes or multiple inputs)
-//
-// Each PE label denotes a set of pointers containing a single addr, a
-// single offsetAddr, or some set of other PE labels.
-//
-type peLabel int
-
-type hvn struct {
-	a        *analysis
-	N        int                // len(a.nodes) immediately after constraint generation
-	log      io.Writer          // (optional) log of HVN lemmas
-	onodes   []*onode           // nodes of the offline graph
-	label    peLabel            // the next available PE label
-	hvnLabel map[string]peLabel // hash-value numbering (PE label) for each set of onodeids
-	stack    []onodeid          // DFS stack
-	index    int32              // next onode.index, from Tarjan's SCC algorithm
-
-	// For each distinct offsetAddrConstraint (src, offset) pair,
-	// offsetAddrLabels records a unique PE label >= N.
-	offsetAddrLabels map[offsetAddr]peLabel
-}
-
-// The index of an node in the offline graph.
-// (Currently the first N align with the main nodes,
-// but this may change with HRU.)
-type onodeid uint32
-
-// An onode is a node in the offline constraint graph.
-// (Where ambiguous, members of analysis.nodes are referred to as
-// "main graph" nodes.)
-//
-// Edges in the offline constraint graph (edges and implicit) point to
-// the source, i.e. against the flow of values: they are dependencies.
-// Implicit edges are used for SCC computation, but not for gathering
-// incoming labels.
-//
-type onode struct {
-	rep onodeid // index of representative of SCC in offline constraint graph
-
-	edges    intsets.Sparse // constraint edges X-->Y (this onode is X)
-	implicit intsets.Sparse // implicit edges *X-->*Y (this onode is X)
-	peLabels intsets.Sparse // set of peLabels are pointer-equivalent to this one
-	indirect bool           // node has points-to relations not represented in graph
-
-	// Tarjan's SCC algorithm
-	index, lowlink int32 // Tarjan numbering
-	scc            int32 // -ve => on stack; 0 => unvisited; +ve => node is root of a found SCC
-}
-
-type offsetAddr struct {
-	ptr    nodeid
-	offset uint32
-}
-
-// nextLabel issues the next unused pointer-equivalence label.
-func (h *hvn) nextLabel() peLabel {
-	h.label++
-	return h.label
-}
-
-// ref(X) returns the index of the onode for *X.
-func (h *hvn) ref(id onodeid) onodeid {
-	return id + onodeid(len(h.a.nodes))
-}
-
-// hvn computes pointer-equivalence labels (peLabels) using the Hash-based
-// Value Numbering (HVN) algorithm described in Hardekopf & Lin, SAS'07.
-//
-func (a *analysis) hvn() {
-	start("HVN")
-
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\n\n==== Pointer equivalence optimization\n\n")
-	}
-
-	h := hvn{
-		a:                a,
-		N:                len(a.nodes),
-		log:              a.log,
-		hvnLabel:         make(map[string]peLabel),
-		offsetAddrLabels: make(map[offsetAddr]peLabel),
-	}
-
-	if h.log != nil {
-		fmt.Fprintf(h.log, "\nCreating offline graph nodes...\n")
-	}
-
-	// Create offline nodes.  The first N nodes correspond to main
-	// graph nodes; the next N are their corresponding ref() nodes.
-	h.onodes = make([]*onode, 2*h.N)
-	for id := range a.nodes {
-		id := onodeid(id)
-		h.onodes[id] = &onode{}
-		h.onodes[h.ref(id)] = &onode{indirect: true}
-	}
-
-	// Each node initially represents just itself.
-	for id, o := range h.onodes {
-		o.rep = onodeid(id)
-	}
-
-	h.markIndirectNodes()
-
-	// Reserve the first N PE labels for addrConstraints.
-	h.label = peLabel(h.N)
-
-	// Add offline constraint edges.
-	if h.log != nil {
-		fmt.Fprintf(h.log, "\nAdding offline graph edges...\n")
-	}
-	for _, c := range a.constraints {
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "; %s\n", c)
-		}
-		c.presolve(&h)
-	}
-
-	// Find and collapse SCCs.
-	if h.log != nil {
-		fmt.Fprintf(h.log, "\nFinding SCCs...\n")
-	}
-	h.index = 1
-	for id, o := range h.onodes {
-		if id > 0 && o.index == 0 {
-			// Start depth-first search at each unvisited node.
-			h.visit(onodeid(id))
-		}
-	}
-
-	// Dump the solution
-	// (NB: somewhat redundant with logging from simplify().)
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\nPointer equivalences:\n")
-		for id, o := range h.onodes {
-			if id == 0 {
-				continue
-			}
-			if id == int(h.N) {
-				fmt.Fprintf(h.log, "---\n")
-			}
-			fmt.Fprintf(h.log, "o%d\t", id)
-			if o.rep != onodeid(id) {
-				fmt.Fprintf(h.log, "rep=o%d", o.rep)
-			} else {
-				fmt.Fprintf(h.log, "p%d", o.peLabels.Min())
-				if o.indirect {
-					fmt.Fprint(h.log, " indirect")
-				}
-			}
-			fmt.Fprintln(h.log)
-		}
-	}
-
-	// Simplify the main constraint graph
-	h.simplify()
-
-	a.showCounts()
-
-	stop("HVN")
-}
-
-// ---- constraint-specific rules ----
-
-// dst := &src
-func (c *addrConstraint) presolve(h *hvn) {
-	// Each object (src) is an initial PE label.
-	label := peLabel(c.src) // label < N
-	if debugHVNVerbose && h.log != nil {
-		// duplicate log messages are possible
-		fmt.Fprintf(h.log, "\tcreate p%d: {&n%d}\n", label, c.src)
-	}
-	odst := onodeid(c.dst)
-	osrc := onodeid(c.src)
-
-	// Assign dst this label.
-	h.onodes[odst].peLabels.Insert(int(label))
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d has p%d\n", odst, label)
-	}
-
-	h.addImplicitEdge(h.ref(odst), osrc) // *dst ~~> src.
-}
-
-// dst = src
-func (c *copyConstraint) presolve(h *hvn) {
-	odst := onodeid(c.dst)
-	osrc := onodeid(c.src)
-	h.addEdge(odst, osrc)                       //  dst -->  src
-	h.addImplicitEdge(h.ref(odst), h.ref(osrc)) // *dst ~~> *src
-}
-
-// dst = *src + offset
-func (c *loadConstraint) presolve(h *hvn) {
-	odst := onodeid(c.dst)
-	osrc := onodeid(c.src)
-	if c.offset == 0 {
-		h.addEdge(odst, h.ref(osrc)) // dst --> *src
-	} else {
-		// We don't interpret load-with-offset, e.g. results
-		// of map value lookup, R-block of dynamic call, slice
-		// copy/append, reflection.
-		h.markIndirect(odst, "load with offset")
-	}
-}
-
-// *dst + offset = src
-func (c *storeConstraint) presolve(h *hvn) {
-	odst := onodeid(c.dst)
-	osrc := onodeid(c.src)
-	if c.offset == 0 {
-		h.onodes[h.ref(odst)].edges.Insert(int(osrc)) // *dst --> src
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "\to%d --> o%d\n", h.ref(odst), osrc)
-		}
-	} else {
-		// We don't interpret store-with-offset.
-		// See discussion of soundness at markIndirectNodes.
-	}
-}
-
-// dst = &src.offset
-func (c *offsetAddrConstraint) presolve(h *hvn) {
-	// Give each distinct (addr, offset) pair a fresh PE label.
-	// The cache performs CSE, effectively.
-	key := offsetAddr{c.src, c.offset}
-	label, ok := h.offsetAddrLabels[key]
-	if !ok {
-		label = h.nextLabel()
-		h.offsetAddrLabels[key] = label
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "\tcreate p%d: {&n%d.#%d}\n",
-				label, c.src, c.offset)
-		}
-	}
-
-	// Assign dst this label.
-	h.onodes[c.dst].peLabels.Insert(int(label))
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d has p%d\n", c.dst, label)
-	}
-}
-
-// dst = src.(typ)  where typ is an interface
-func (c *typeFilterConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.dst), "typeFilter result")
-}
-
-// dst = src.(typ)  where typ is concrete
-func (c *untagConstraint) presolve(h *hvn) {
-	odst := onodeid(c.dst)
-	for end := odst + onodeid(h.a.sizeof(c.typ)); odst < end; odst++ {
-		h.markIndirect(odst, "untag result")
-	}
-}
-
-// dst = src.method(c.params...)
-func (c *invokeConstraint) presolve(h *hvn) {
-	// All methods are address-taken functions, so
-	// their formal P-blocks were already marked indirect.
-
-	// Mark the caller's targets node as indirect.
-	sig := c.method.Type().(*types.Signature)
-	id := c.params
-	h.markIndirect(onodeid(c.params), "invoke targets node")
-	id++
-
-	id += nodeid(h.a.sizeof(sig.Params()))
-
-	// Mark the caller's R-block as indirect.
-	end := id + nodeid(h.a.sizeof(sig.Results()))
-	for id < end {
-		h.markIndirect(onodeid(id), "invoke R-block")
-		id++
-	}
-}
-
-// markIndirectNodes marks as indirect nodes whose points-to relations
-// are not entirely captured by the offline graph, including:
-//
-//    (a) All address-taken nodes (including the following nodes within
-//        the same object).  This is described in the paper.
-//
-// The most subtle cause of indirect nodes is the generation of
-// store-with-offset constraints since the offline graph doesn't
-// represent them.  A global audit of constraint generation reveals the
-// following uses of store-with-offset:
-//
-//    (b) genDynamicCall, for P-blocks of dynamically called functions,
-//        to which dynamic copy edges will be added to them during
-//        solving: from storeConstraint for standalone functions,
-//        and from invokeConstraint for methods.
-//        All such P-blocks must be marked indirect.
-//    (c) MakeUpdate, to update the value part of a map object.
-//        All MakeMap objects's value parts must be marked indirect.
-//    (d) copyElems, to update the destination array.
-//        All array elements must be marked indirect.
-//
-// Not all indirect marking happens here.  ref() nodes are marked
-// indirect at construction, and each constraint's presolve() method may
-// mark additional nodes.
-//
-func (h *hvn) markIndirectNodes() {
-	// (a) all address-taken nodes, plus all nodes following them
-	//     within the same object, since these may be indirectly
-	//     stored or address-taken.
-	for _, c := range h.a.constraints {
-		if c, ok := c.(*addrConstraint); ok {
-			start := h.a.enclosingObj(c.src)
-			end := start + nodeid(h.a.nodes[start].obj.size)
-			for id := c.src; id < end; id++ {
-				h.markIndirect(onodeid(id), "A-T object")
-			}
-		}
-	}
-
-	// (b) P-blocks of all address-taken functions.
-	for id := 0; id < h.N; id++ {
-		obj := h.a.nodes[id].obj
-
-		// TODO(adonovan): opt: if obj.cgn.fn is a method and
-		// obj.cgn is not its shared contour, this is an
-		// "inlined" static method call.  We needn't consider it
-		// address-taken since no invokeConstraint will affect it.
-
-		if obj != nil && obj.flags&otFunction != 0 && h.a.atFuncs[obj.cgn.fn] {
-			// address-taken function
-			if debugHVNVerbose && h.log != nil {
-				fmt.Fprintf(h.log, "n%d is address-taken: %s\n", id, obj.cgn.fn)
-			}
-			h.markIndirect(onodeid(id), "A-T func identity")
-			id++
-			sig := obj.cgn.fn.Signature
-			psize := h.a.sizeof(sig.Params())
-			if sig.Recv() != nil {
-				psize += h.a.sizeof(sig.Recv().Type())
-			}
-			for end := id + int(psize); id < end; id++ {
-				h.markIndirect(onodeid(id), "A-T func P-block")
-			}
-			id--
-			continue
-		}
-	}
-
-	// (c) all map objects' value fields.
-	for _, id := range h.a.mapValues {
-		h.markIndirect(onodeid(id), "makemap.value")
-	}
-
-	// (d) all array element objects.
-	// TODO(adonovan): opt: can we do better?
-	for id := 0; id < h.N; id++ {
-		// Identity node for an object of array type?
-		if tArray, ok := h.a.nodes[id].typ.(*types.Array); ok {
-			// Mark the array element nodes indirect.
-			// (Skip past the identity field.)
-			for range h.a.flatten(tArray.Elem()) {
-				id++
-				h.markIndirect(onodeid(id), "array elem")
-			}
-		}
-	}
-}
-
-func (h *hvn) markIndirect(oid onodeid, comment string) {
-	h.onodes[oid].indirect = true
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d is indirect: %s\n", oid, comment)
-	}
-}
-
-// Adds an edge dst-->src.
-// Note the unusual convention: edges are dependency (contraflow) edges.
-func (h *hvn) addEdge(odst, osrc onodeid) {
-	h.onodes[odst].edges.Insert(int(osrc))
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d --> o%d\n", odst, osrc)
-	}
-}
-
-func (h *hvn) addImplicitEdge(odst, osrc onodeid) {
-	h.onodes[odst].implicit.Insert(int(osrc))
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d ~~> o%d\n", odst, osrc)
-	}
-}
-
-// visit implements the depth-first search of Tarjan's SCC algorithm.
-// Precondition: x is canonical.
-func (h *hvn) visit(x onodeid) {
-	h.checkCanonical(x)
-	xo := h.onodes[x]
-	xo.index = h.index
-	xo.lowlink = h.index
-	h.index++
-
-	h.stack = append(h.stack, x) // push
-	assert(xo.scc == 0, "node revisited")
-	xo.scc = -1
-
-	var deps []int
-	deps = xo.edges.AppendTo(deps)
-	deps = xo.implicit.AppendTo(deps)
-
-	for _, y := range deps {
-		// Loop invariant: x is canonical.
-
-		y := h.find(onodeid(y))
-
-		if x == y {
-			continue // nodes already coalesced
-		}
-
-		xo := h.onodes[x]
-		yo := h.onodes[y]
-
-		switch {
-		case yo.scc > 0:
-			// y is already a collapsed SCC
-
-		case yo.scc < 0:
-			// y is on the stack, and thus in the current SCC.
-			if yo.index < xo.lowlink {
-				xo.lowlink = yo.index
-			}
-
-		default:
-			// y is unvisited; visit it now.
-			h.visit(y)
-			// Note: x and y are now non-canonical.
-
-			x = h.find(onodeid(x))
-
-			if yo.lowlink < xo.lowlink {
-				xo.lowlink = yo.lowlink
-			}
-		}
-	}
-	h.checkCanonical(x)
-
-	// Is x the root of an SCC?
-	if xo.lowlink == xo.index {
-		// Coalesce all nodes in the SCC.
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "scc o%d\n", x)
-		}
-		for {
-			// Pop y from stack.
-			i := len(h.stack) - 1
-			y := h.stack[i]
-			h.stack = h.stack[:i]
-
-			h.checkCanonical(x)
-			xo := h.onodes[x]
-			h.checkCanonical(y)
-			yo := h.onodes[y]
-
-			if xo == yo {
-				// SCC is complete.
-				xo.scc = 1
-				h.labelSCC(x)
-				break
-			}
-			h.coalesce(x, y)
-		}
-	}
-}
-
-// Precondition: x is canonical.
-func (h *hvn) labelSCC(x onodeid) {
-	h.checkCanonical(x)
-	xo := h.onodes[x]
-	xpe := &xo.peLabels
-
-	// All indirect nodes get new labels.
-	if xo.indirect {
-		label := h.nextLabel()
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "\tcreate p%d: indirect SCC\n", label)
-			fmt.Fprintf(h.log, "\to%d has p%d\n", x, label)
-		}
-
-		// Remove pre-labeling, in case a direct pre-labeled node was
-		// merged with an indirect one.
-		xpe.Clear()
-		xpe.Insert(int(label))
-
-		return
-	}
-
-	// Invariant: all peLabels sets are non-empty.
-	// Those that are logically empty contain zero as their sole element.
-	// No other sets contains zero.
-
-	// Find all labels coming in to the coalesced SCC node.
-	for _, y := range xo.edges.AppendTo(nil) {
-		y := h.find(onodeid(y))
-		if y == x {
-			continue // already coalesced
-		}
-		ype := &h.onodes[y].peLabels
-		if debugHVNVerbose && h.log != nil {
-			fmt.Fprintf(h.log, "\tedge from o%d = %s\n", y, ype)
-		}
-
-		if ype.IsEmpty() {
-			if debugHVNVerbose && h.log != nil {
-				fmt.Fprintf(h.log, "\tnode has no PE label\n")
-			}
-		}
-		assert(!ype.IsEmpty(), "incoming node has no PE label")
-
-		if ype.Has(0) {
-			// {0} represents a non-pointer.
-			assert(ype.Len() == 1, "PE set contains {0, ...}")
-		} else {
-			xpe.UnionWith(ype)
-		}
-	}
-
-	switch xpe.Len() {
-	case 0:
-		// SCC has no incoming non-zero PE labels: it is a non-pointer.
-		xpe.Insert(0)
-
-	case 1:
-		// already a singleton
-
-	default:
-		// SCC has multiple incoming non-zero PE labels.
-		// Find the canonical label representing this set.
-		// We use String() as a fingerprint consistent with Equals().
-		key := xpe.String()
-		label, ok := h.hvnLabel[key]
-		if !ok {
-			label = h.nextLabel()
-			if debugHVNVerbose && h.log != nil {
-				fmt.Fprintf(h.log, "\tcreate p%d: union %s\n", label, xpe.String())
-			}
-			h.hvnLabel[key] = label
-		}
-		xpe.Clear()
-		xpe.Insert(int(label))
-	}
-
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\to%d has p%d\n", x, xpe.Min())
-	}
-}
-
-// coalesce combines two nodes in the offline constraint graph.
-// Precondition: x and y are canonical.
-func (h *hvn) coalesce(x, y onodeid) {
-	xo := h.onodes[x]
-	yo := h.onodes[y]
-
-	// x becomes y's canonical representative.
-	yo.rep = x
-
-	if debugHVNVerbose && h.log != nil {
-		fmt.Fprintf(h.log, "\tcoalesce o%d into o%d\n", y, x)
-	}
-
-	// x accumulates y's edges.
-	xo.edges.UnionWith(&yo.edges)
-	yo.edges.Clear()
-
-	// x accumulates y's implicit edges.
-	xo.implicit.UnionWith(&yo.implicit)
-	yo.implicit.Clear()
-
-	// x accumulates y's pointer-equivalence labels.
-	xo.peLabels.UnionWith(&yo.peLabels)
-	yo.peLabels.Clear()
-
-	// x accumulates y's indirect flag.
-	if yo.indirect {
-		xo.indirect = true
-	}
-}
-
-// simplify computes a degenerate renumbering of nodeids from the PE
-// labels assigned by the hvn, and uses it to simplify the main
-// constraint graph, eliminating non-pointer nodes and duplicate
-// constraints.
-//
-func (h *hvn) simplify() {
-	// canon maps each peLabel to its canonical main node.
-	canon := make([]nodeid, h.label)
-	for i := range canon {
-		canon[i] = nodeid(h.N) // indicates "unset"
-	}
-
-	// mapping maps each main node index to the index of the canonical node.
-	mapping := make([]nodeid, len(h.a.nodes))
-
-	for id := range h.a.nodes {
-		id := nodeid(id)
-		if id == 0 {
-			canon[0] = 0
-			mapping[0] = 0
-			continue
-		}
-		oid := h.find(onodeid(id))
-		peLabels := &h.onodes[oid].peLabels
-		assert(peLabels.Len() == 1, "PE class is not a singleton")
-		label := peLabel(peLabels.Min())
-
-		canonId := canon[label]
-		if canonId == nodeid(h.N) {
-			// id becomes the representative of the PE label.
-			canonId = id
-			canon[label] = canonId
-
-			if h.a.log != nil {
-				fmt.Fprintf(h.a.log, "\tpts(n%d) is canonical : \t(%s)\n",
-					id, h.a.nodes[id].typ)
-			}
-
-		} else {
-			// Link the solver states for the two nodes.
-			assert(h.a.nodes[canonId].solve != nil, "missing solver state")
-			h.a.nodes[id].solve = h.a.nodes[canonId].solve
-
-			if h.a.log != nil {
-				// TODO(adonovan): debug: reorganize the log so it prints
-				// one line:
-				// 	pe y = x1, ..., xn
-				// for each canonical y.  Requires allocation.
-				fmt.Fprintf(h.a.log, "\tpts(n%d) = pts(n%d) : %s\n",
-					id, canonId, h.a.nodes[id].typ)
-			}
-		}
-
-		mapping[id] = canonId
-	}
-
-	// Renumber the constraints, eliminate duplicates, and eliminate
-	// any containing non-pointers (n0).
-	addrs := make(map[addrConstraint]bool)
-	copys := make(map[copyConstraint]bool)
-	loads := make(map[loadConstraint]bool)
-	stores := make(map[storeConstraint]bool)
-	offsetAddrs := make(map[offsetAddrConstraint]bool)
-	untags := make(map[untagConstraint]bool)
-	typeFilters := make(map[typeFilterConstraint]bool)
-	invokes := make(map[invokeConstraint]bool)
-
-	nbefore := len(h.a.constraints)
-	cc := h.a.constraints[:0] // in-situ compaction
-	for _, c := range h.a.constraints {
-		// Renumber.
-		switch c := c.(type) {
-		case *addrConstraint:
-			// Don't renumber c.src since it is the label of
-			// an addressable object and will appear in PT sets.
-			c.dst = mapping[c.dst]
-		default:
-			c.renumber(mapping)
-		}
-
-		if c.ptr() == 0 {
-			continue // skip: constraint attached to non-pointer
-		}
-
-		var dup bool
-		switch c := c.(type) {
-		case *addrConstraint:
-			_, dup = addrs[*c]
-			addrs[*c] = true
-
-		case *copyConstraint:
-			if c.src == c.dst {
-				continue // skip degenerate copies
-			}
-			if c.src == 0 {
-				continue // skip copy from non-pointer
-			}
-			_, dup = copys[*c]
-			copys[*c] = true
-
-		case *loadConstraint:
-			if c.src == 0 {
-				continue // skip load from non-pointer
-			}
-			_, dup = loads[*c]
-			loads[*c] = true
-
-		case *storeConstraint:
-			if c.src == 0 {
-				continue // skip store from non-pointer
-			}
-			_, dup = stores[*c]
-			stores[*c] = true
-
-		case *offsetAddrConstraint:
-			if c.src == 0 {
-				continue // skip offset from non-pointer
-			}
-			_, dup = offsetAddrs[*c]
-			offsetAddrs[*c] = true
-
-		case *untagConstraint:
-			if c.src == 0 {
-				continue // skip untag of non-pointer
-			}
-			_, dup = untags[*c]
-			untags[*c] = true
-
-		case *typeFilterConstraint:
-			if c.src == 0 {
-				continue // skip filter of non-pointer
-			}
-			_, dup = typeFilters[*c]
-			typeFilters[*c] = true
-
-		case *invokeConstraint:
-			if c.params == 0 {
-				panic("non-pointer invoke.params")
-			}
-			if c.iface == 0 {
-				continue // skip invoke on non-pointer
-			}
-			_, dup = invokes[*c]
-			invokes[*c] = true
-
-		default:
-			// We don't bother de-duping advanced constraints
-			// (e.g. reflection) since they are uncommon.
-
-			// Eliminate constraints containing non-pointer nodeids.
-			//
-			// We use reflection to find the fields to avoid
-			// adding yet another method to constraint.
-			//
-			// TODO(adonovan): experiment with a constraint
-			// method that returns a slice of pointers to
-			// nodeids fields to enable uniform iteration;
-			// the renumber() method could be removed and
-			// implemented using the new one.
-			//
-			// TODO(adonovan): opt: this is unsound since
-			// some constraints still have an effect if one
-			// of the operands is zero: rVCall, rVMapIndex,
-			// rvSetMapIndex.  Handle them specially.
-			rtNodeid := reflect.TypeOf(nodeid(0))
-			x := reflect.ValueOf(c).Elem()
-			for i, nf := 0, x.NumField(); i < nf; i++ {
-				f := x.Field(i)
-				if f.Type() == rtNodeid {
-					if f.Uint() == 0 {
-						dup = true // skip it
-						break
-					}
-				}
-			}
-		}
-		if dup {
-			continue // skip duplicates
-		}
-
-		cc = append(cc, c)
-	}
-	h.a.constraints = cc
-
-	if h.log != nil {
-		fmt.Fprintf(h.log, "#constraints: was %d, now %d\n", nbefore, len(h.a.constraints))
-	}
-}
-
-// find returns the canonical onodeid for x.
-// (The onodes form a disjoint set forest.)
-func (h *hvn) find(x onodeid) onodeid {
-	// TODO(adonovan): opt: this is a CPU hotspot.  Try "union by rank".
-	xo := h.onodes[x]
-	rep := xo.rep
-	if rep != x {
-		rep = h.find(rep) // simple path compression
-		xo.rep = rep
-	}
-	return rep
-}
-
-func (h *hvn) checkCanonical(x onodeid) {
-	if debugHVN {
-		assert(x == h.find(x), "not canonical")
-	}
-}
-
-func assert(p bool, msg string) {
-	if debugHVN && !p {
-		panic("assertion failed: " + msg)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/intrinsics.go b/installer/vendor/golang.org/x/tools/go/pointer/intrinsics.go
deleted file mode 100644
index b7e2b1403c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/intrinsics.go
+++ /dev/null
@@ -1,361 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This package defines the treatment of intrinsics, i.e. library
-// functions requiring special analytical treatment.
-//
-// Most of these are C or assembly functions, but even some Go
-// functions require may special treatment if the analysis completely
-// replaces the implementation of an API such as reflection.
-
-// TODO(adonovan): support a means of writing analytic summaries in
-// the target code, so that users can summarise the effects of their
-// own C functions using a snippet of Go.
-
-import (
-	"fmt"
-	"go/types"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-// Instances of 'intrinsic' generate analysis constraints for calls to
-// intrinsic functions.
-// Implementations may exploit information from the calling site
-// via cgn.callersite; for shared contours this is nil.
-type intrinsic func(a *analysis, cgn *cgnode)
-
-// Initialized in explicit init() to defeat (spurious) initialization
-// cycle error.
-var intrinsicsByName = make(map[string]intrinsic)
-
-func init() {
-	// Key strings are from Function.String().
-	// That little dot ۰ is an Arabic zero numeral (U+06F0),
-	// categories [Nd].
-	for name, fn := range map[string]intrinsic{
-		// Other packages.
-		"bytes.Equal":                  ext۰NoEffect,
-		"bytes.IndexByte":              ext۰NoEffect,
-		"crypto/aes.decryptBlockAsm":   ext۰NoEffect,
-		"crypto/aes.encryptBlockAsm":   ext۰NoEffect,
-		"crypto/aes.expandKeyAsm":      ext۰NoEffect,
-		"crypto/aes.hasAsm":            ext۰NoEffect,
-		"crypto/md5.block":             ext۰NoEffect,
-		"crypto/rc4.xorKeyStream":      ext۰NoEffect,
-		"crypto/sha1.block":            ext۰NoEffect,
-		"crypto/sha256.block":          ext۰NoEffect,
-		"hash/crc32.castagnoliSSE42":   ext۰NoEffect,
-		"hash/crc32.haveSSE42":         ext۰NoEffect,
-		"math.Abs":                     ext۰NoEffect,
-		"math.Acos":                    ext۰NoEffect,
-		"math.Asin":                    ext۰NoEffect,
-		"math.Atan":                    ext۰NoEffect,
-		"math.Atan2":                   ext۰NoEffect,
-		"math.Ceil":                    ext۰NoEffect,
-		"math.Cos":                     ext۰NoEffect,
-		"math.Dim":                     ext۰NoEffect,
-		"math.Exp":                     ext۰NoEffect,
-		"math.Exp2":                    ext۰NoEffect,
-		"math.Expm1":                   ext۰NoEffect,
-		"math.Float32bits":             ext۰NoEffect,
-		"math.Float32frombits":         ext۰NoEffect,
-		"math.Float64bits":             ext۰NoEffect,
-		"math.Float64frombits":         ext۰NoEffect,
-		"math.Floor":                   ext۰NoEffect,
-		"math.Frexp":                   ext۰NoEffect,
-		"math.Hypot":                   ext۰NoEffect,
-		"math.Ldexp":                   ext۰NoEffect,
-		"math.Log":                     ext۰NoEffect,
-		"math.Log10":                   ext۰NoEffect,
-		"math.Log1p":                   ext۰NoEffect,
-		"math.Log2":                    ext۰NoEffect,
-		"math.Max":                     ext۰NoEffect,
-		"math.Min":                     ext۰NoEffect,
-		"math.Mod":                     ext۰NoEffect,
-		"math.Modf":                    ext۰NoEffect,
-		"math.Remainder":               ext۰NoEffect,
-		"math.Sin":                     ext۰NoEffect,
-		"math.Sincos":                  ext۰NoEffect,
-		"math.Sqrt":                    ext۰NoEffect,
-		"math.Tan":                     ext۰NoEffect,
-		"math.Trunc":                   ext۰NoEffect,
-		"math/big.addMulVVW":           ext۰NoEffect,
-		"math/big.addVV":               ext۰NoEffect,
-		"math/big.addVW":               ext۰NoEffect,
-		"math/big.bitLen":              ext۰NoEffect,
-		"math/big.divWVW":              ext۰NoEffect,
-		"math/big.divWW":               ext۰NoEffect,
-		"math/big.mulAddVWW":           ext۰NoEffect,
-		"math/big.mulWW":               ext۰NoEffect,
-		"math/big.shlVU":               ext۰NoEffect,
-		"math/big.shrVU":               ext۰NoEffect,
-		"math/big.subVV":               ext۰NoEffect,
-		"math/big.subVW":               ext۰NoEffect,
-		"net.runtime_Semacquire":       ext۰NoEffect,
-		"net.runtime_Semrelease":       ext۰NoEffect,
-		"net.runtime_pollClose":        ext۰NoEffect,
-		"net.runtime_pollOpen":         ext۰NoEffect,
-		"net.runtime_pollReset":        ext۰NoEffect,
-		"net.runtime_pollServerInit":   ext۰NoEffect,
-		"net.runtime_pollSetDeadline":  ext۰NoEffect,
-		"net.runtime_pollUnblock":      ext۰NoEffect,
-		"net.runtime_pollWait":         ext۰NoEffect,
-		"net.runtime_pollWaitCanceled": ext۰NoEffect,
-		"os.epipecheck":                ext۰NoEffect,
-		// All other runtime functions are treated as NoEffect.
-		"runtime.SetFinalizer":              ext۰runtime۰SetFinalizer,
-		"strings.IndexByte":                 ext۰NoEffect,
-		"sync.runtime_Semacquire":           ext۰NoEffect,
-		"sync.runtime_Semrelease":           ext۰NoEffect,
-		"sync.runtime_Syncsemacquire":       ext۰NoEffect,
-		"sync.runtime_Syncsemcheck":         ext۰NoEffect,
-		"sync.runtime_Syncsemrelease":       ext۰NoEffect,
-		"sync.runtime_procPin":              ext۰NoEffect,
-		"sync.runtime_procUnpin":            ext۰NoEffect,
-		"sync.runtime_registerPool":         ext۰NoEffect,
-		"sync/atomic.AddInt32":              ext۰NoEffect,
-		"sync/atomic.AddInt64":              ext۰NoEffect,
-		"sync/atomic.AddUint32":             ext۰NoEffect,
-		"sync/atomic.AddUint64":             ext۰NoEffect,
-		"sync/atomic.AddUintptr":            ext۰NoEffect,
-		"sync/atomic.CompareAndSwapInt32":   ext۰NoEffect,
-		"sync/atomic.CompareAndSwapUint32":  ext۰NoEffect,
-		"sync/atomic.CompareAndSwapUint64":  ext۰NoEffect,
-		"sync/atomic.CompareAndSwapUintptr": ext۰NoEffect,
-		"sync/atomic.LoadInt32":             ext۰NoEffect,
-		"sync/atomic.LoadInt64":             ext۰NoEffect,
-		"sync/atomic.LoadPointer":           ext۰NoEffect, // ignore unsafe.Pointers
-		"sync/atomic.LoadUint32":            ext۰NoEffect,
-		"sync/atomic.LoadUint64":            ext۰NoEffect,
-		"sync/atomic.LoadUintptr":           ext۰NoEffect,
-		"sync/atomic.StoreInt32":            ext۰NoEffect,
-		"sync/atomic.StorePointer":          ext۰NoEffect, // ignore unsafe.Pointers
-		"sync/atomic.StoreUint32":           ext۰NoEffect,
-		"sync/atomic.StoreUintptr":          ext۰NoEffect,
-		"syscall.Close":                     ext۰NoEffect,
-		"syscall.Exit":                      ext۰NoEffect,
-		"syscall.Getpid":                    ext۰NoEffect,
-		"syscall.Getwd":                     ext۰NoEffect,
-		"syscall.Kill":                      ext۰NoEffect,
-		"syscall.RawSyscall":                ext۰NoEffect,
-		"syscall.RawSyscall6":               ext۰NoEffect,
-		"syscall.Syscall":                   ext۰NoEffect,
-		"syscall.Syscall6":                  ext۰NoEffect,
-		"syscall.runtime_AfterFork":         ext۰NoEffect,
-		"syscall.runtime_BeforeFork":        ext۰NoEffect,
-		"syscall.setenv_c":                  ext۰NoEffect,
-		"time.Sleep":                        ext۰NoEffect,
-		"time.now":                          ext۰NoEffect,
-		"time.startTimer":                   ext۰time۰startTimer,
-		"time.stopTimer":                    ext۰NoEffect,
-	} {
-		intrinsicsByName[name] = fn
-	}
-}
-
-// findIntrinsic returns the constraint generation function for an
-// intrinsic function fn, or nil if the function should be handled normally.
-//
-func (a *analysis) findIntrinsic(fn *ssa.Function) intrinsic {
-	// Consult the *Function-keyed cache.
-	// A cached nil indicates a normal non-intrinsic function.
-	impl, ok := a.intrinsics[fn]
-	if !ok {
-		impl = intrinsicsByName[fn.String()] // may be nil
-
-		if a.isReflect(fn) {
-			if !a.config.Reflection {
-				impl = ext۰NoEffect // reflection disabled
-			} else if impl == nil {
-				// Ensure all "reflect" code is treated intrinsically.
-				impl = ext۰NotYetImplemented
-			}
-		} else if impl == nil && fn.Pkg != nil && fn.Pkg.Pkg.Path() == "runtime" {
-			// Ignore "runtime" (except SetFinalizer):
-			// it has few interesting effects on aliasing
-			// and is full of unsafe code we can't analyze.
-			impl = ext۰NoEffect
-		}
-
-		a.intrinsics[fn] = impl
-	}
-	return impl
-}
-
-// isReflect reports whether fn belongs to the "reflect" package.
-func (a *analysis) isReflect(fn *ssa.Function) bool {
-	if a.reflectValueObj == nil {
-		return false // "reflect" package not loaded
-	}
-	reflectPackage := a.reflectValueObj.Pkg()
-	if fn.Pkg != nil && fn.Pkg.Pkg == reflectPackage {
-		return true
-	}
-	// Synthetic wrappers have a nil Pkg, so they slip through the
-	// previous check.  Check the receiver package.
-	// TODO(adonovan): should synthetic wrappers have a non-nil Pkg?
-	if recv := fn.Signature.Recv(); recv != nil {
-		if named, ok := deref(recv.Type()).(*types.Named); ok {
-			if named.Obj().Pkg() == reflectPackage {
-				return true // e.g. wrapper of (reflect.Value).f
-			}
-		}
-	}
-	return false
-}
-
-// A trivial intrinsic suitable for any function that does not:
-// 1) induce aliases between its arguments or any global variables;
-// 2) call any functions; or
-// 3) create any labels.
-//
-// Many intrinsics (such as CompareAndSwapInt32) have a fourth kind of
-// effect: loading or storing through a pointer.  Though these could
-// be significant, we deliberately ignore them because they are
-// generally not worth the effort.
-//
-// We sometimes violate condition #3 if the function creates only
-// non-function labels, as the control-flow graph is still sound.
-//
-func ext۰NoEffect(a *analysis, cgn *cgnode) {}
-
-func ext۰NotYetImplemented(a *analysis, cgn *cgnode) {
-	fn := cgn.fn
-	a.warnf(fn.Pos(), "unsound: intrinsic treatment of %s not yet implemented", fn)
-}
-
-// ---------- func runtime.SetFinalizer(x, f interface{}) ----------
-
-// runtime.SetFinalizer(x, f)
-type runtimeSetFinalizerConstraint struct {
-	targets nodeid // (indirect)
-	f       nodeid // (ptr)
-	x       nodeid
-}
-
-func (c *runtimeSetFinalizerConstraint) ptr() nodeid { return c.f }
-func (c *runtimeSetFinalizerConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.targets), "SetFinalizer.targets")
-}
-func (c *runtimeSetFinalizerConstraint) renumber(mapping []nodeid) {
-	c.targets = mapping[c.targets]
-	c.f = mapping[c.f]
-	c.x = mapping[c.x]
-}
-
-func (c *runtimeSetFinalizerConstraint) String() string {
-	return fmt.Sprintf("runtime.SetFinalizer(n%d, n%d)", c.x, c.f)
-}
-
-func (c *runtimeSetFinalizerConstraint) solve(a *analysis, delta *nodeset) {
-	for _, fObj := range delta.AppendTo(a.deltaSpace) {
-		tDyn, f, indirect := a.taggedValue(nodeid(fObj))
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		tSig, ok := tDyn.Underlying().(*types.Signature)
-		if !ok {
-			continue // not a function
-		}
-		if tSig.Recv() != nil {
-			panic(tSig)
-		}
-		if tSig.Params().Len() != 1 {
-			continue //  not a unary function
-		}
-
-		// Extract x to tmp.
-		tx := tSig.Params().At(0).Type()
-		tmp := a.addNodes(tx, "SetFinalizer.tmp")
-		a.typeAssert(tx, tmp, c.x, false)
-
-		// Call f(tmp).
-		a.store(f, tmp, 1, a.sizeof(tx))
-
-		// Add dynamic call target.
-		if a.onlineCopy(c.targets, f) {
-			a.addWork(c.targets)
-		}
-	}
-}
-
-func ext۰runtime۰SetFinalizer(a *analysis, cgn *cgnode) {
-	// This is the shared contour, used for dynamic calls.
-	targets := a.addOneNode(tInvalid, "SetFinalizer.targets", nil)
-	cgn.sites = append(cgn.sites, &callsite{targets: targets})
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&runtimeSetFinalizerConstraint{
-		targets: targets,
-		x:       params,
-		f:       params + 1,
-	})
-}
-
-// ---------- func time.startTimer(t *runtimeTimer) ----------
-
-// time.StartTimer(t)
-type timeStartTimerConstraint struct {
-	targets nodeid // (indirect)
-	t       nodeid // (ptr)
-}
-
-func (c *timeStartTimerConstraint) ptr() nodeid { return c.t }
-func (c *timeStartTimerConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.targets), "StartTimer.targets")
-}
-func (c *timeStartTimerConstraint) renumber(mapping []nodeid) {
-	c.targets = mapping[c.targets]
-	c.t = mapping[c.t]
-}
-
-func (c *timeStartTimerConstraint) String() string {
-	return fmt.Sprintf("time.startTimer(n%d)", c.t)
-}
-
-func (c *timeStartTimerConstraint) solve(a *analysis, delta *nodeset) {
-	for _, tObj := range delta.AppendTo(a.deltaSpace) {
-		t := nodeid(tObj)
-
-		// We model startTimer as if it was defined thus:
-		// 	func startTimer(t *runtimeTimer) { t.f(t.arg) }
-
-		// We hard-code the field offsets of time.runtimeTimer:
-		// type runtimeTimer struct {
-		//  0     __identity__
-		//  1    i      int32
-		//  2    when   int64
-		//  3    period int64
-		//  4    f      func(int64, interface{})
-		//  5    arg    interface{}
-		// }
-		f := t + 4
-		arg := t + 5
-
-		// store t.arg to t.f.params[0]
-		// (offset 1 => skip identity)
-		a.store(f, arg, 1, 1)
-
-		// Add dynamic call target.
-		if a.onlineCopy(c.targets, f) {
-			a.addWork(c.targets)
-		}
-	}
-}
-
-func ext۰time۰startTimer(a *analysis, cgn *cgnode) {
-	// This is the shared contour, used for dynamic calls.
-	targets := a.addOneNode(tInvalid, "startTimer.targets", nil)
-	cgn.sites = append(cgn.sites, &callsite{targets: targets})
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&timeStartTimerConstraint{
-		targets: targets,
-		t:       params,
-	})
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/labels.go b/installer/vendor/golang.org/x/tools/go/pointer/labels.go
deleted file mode 100644
index 7d64ef6a48..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/labels.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"strings"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-// A Label is an entity that may be pointed to by a pointer, map,
-// channel, 'func', slice or interface.
-//
-// Labels include:
-//      - functions
-//      - globals
-//      - tagged objects, representing interfaces and reflect.Values
-//      - arrays created by conversions (e.g. []byte("foo"), []byte(s))
-//      - stack- and heap-allocated variables (including composite literals)
-//      - channels, maps and arrays created by make()
-//      - intrinsic or reflective operations that allocate (e.g. append, reflect.New)
-//      - intrinsic objects, e.g. the initial array behind os.Args.
-//      - and their subelements, e.g. "alloc.y[*].z"
-//
-// Labels are so varied that they defy good generalizations;
-// some have no value, no callgraph node, or no position.
-// Many objects have types that are inexpressible in Go:
-// maps, channels, functions, tagged objects.
-//
-// At most one of Value() or ReflectType() may return non-nil.
-//
-type Label struct {
-	obj        *object    // the addressable memory location containing this label
-	subelement *fieldInfo // subelement path within obj, e.g. ".a.b[*].c"
-}
-
-// Value returns the ssa.Value that allocated this label's object, if any.
-func (l Label) Value() ssa.Value {
-	val, _ := l.obj.data.(ssa.Value)
-	return val
-}
-
-// ReflectType returns the type represented by this label if it is an
-// reflect.rtype instance object or *reflect.rtype-tagged object.
-//
-func (l Label) ReflectType() types.Type {
-	rtype, _ := l.obj.data.(types.Type)
-	return rtype
-}
-
-// Path returns the path to the subelement of the object containing
-// this label.  For example, ".x[*].y".
-//
-func (l Label) Path() string {
-	return l.subelement.path()
-}
-
-// Pos returns the position of this label, if known, zero otherwise.
-func (l Label) Pos() token.Pos {
-	switch data := l.obj.data.(type) {
-	case ssa.Value:
-		return data.Pos()
-	case types.Type:
-		if nt, ok := deref(data).(*types.Named); ok {
-			return nt.Obj().Pos()
-		}
-	}
-	if cgn := l.obj.cgn; cgn != nil {
-		return cgn.fn.Pos()
-	}
-	return token.NoPos
-}
-
-// String returns the printed form of this label.
-//
-// Examples:                                    Object type:
-//      x                                       (a variable)
-//      (sync.Mutex).Lock                       (a function)
-//      convert                                 (array created by conversion)
-//      makemap                                 (map allocated via make)
-//      makechan                                (channel allocated via make)
-//      makeinterface                           (tagged object allocated by makeinterface)
-//      <alloc in reflect.Zero>                 (allocation in instrinsic)
-//      sync.Mutex                              (a reflect.rtype instance)
-//      <command-line arguments>                (an intrinsic object)
-//
-// Labels within compound objects have subelement paths:
-//      x.y[*].z                                (a struct variable, x)
-//      append.y[*].z                           (array allocated by append)
-//      makeslice.y[*].z                        (array allocated via make)
-//
-// TODO(adonovan): expose func LabelString(*types.Package, Label).
-//
-func (l Label) String() string {
-	var s string
-	switch v := l.obj.data.(type) {
-	case types.Type:
-		return v.String()
-
-	case string:
-		s = v // an intrinsic object (e.g. os.Args[*])
-
-	case nil:
-		if l.obj.cgn != nil {
-			// allocation by intrinsic or reflective operation
-			s = fmt.Sprintf("<alloc in %s>", l.obj.cgn.fn)
-		} else {
-			s = "<unknown>" // should be unreachable
-		}
-
-	case *ssa.Function:
-		s = v.String()
-
-	case *ssa.Global:
-		s = v.String()
-
-	case *ssa.Const:
-		s = v.Name()
-
-	case *ssa.Alloc:
-		s = v.Comment
-		if s == "" {
-			s = "alloc"
-		}
-
-	case *ssa.Call:
-		// Currently only calls to append can allocate objects.
-		if v.Call.Value.(*ssa.Builtin).Object().Name() != "append" {
-			panic("unhandled *ssa.Call label: " + v.Name())
-		}
-		s = "append"
-
-	case *ssa.MakeMap, *ssa.MakeChan, *ssa.MakeSlice, *ssa.Convert:
-		s = strings.ToLower(strings.TrimPrefix(fmt.Sprintf("%T", v), "*ssa."))
-
-	case *ssa.MakeInterface:
-		// MakeInterface is usually implicit in Go source (so
-		// Pos()==0), and tagged objects may be allocated
-		// synthetically (so no *MakeInterface data).
-		s = "makeinterface:" + v.X.Type().String()
-
-	default:
-		panic(fmt.Sprintf("unhandled object data type: %T", v))
-	}
-
-	return s + l.subelement.path()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/opt.go b/installer/vendor/golang.org/x/tools/go/pointer/opt.go
deleted file mode 100644
index 81f80aa4f5..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/opt.go
+++ /dev/null
@@ -1,132 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file implements renumbering, a pre-solver optimization to
-// improve the efficiency of the solver's points-to set representation.
-//
-// TODO(adonovan): rename file "renumber.go"
-
-import "fmt"
-
-// renumber permutes a.nodes so that all nodes within an addressable
-// object appear before all non-addressable nodes, maintaining the
-// order of nodes within the same object (as required by offsetAddr).
-//
-// renumber must update every nodeid in the analysis (constraints,
-// Pointers, callgraph, etc) to reflect the new ordering.
-//
-// This is an optimisation to increase the locality and efficiency of
-// sparse representations of points-to sets.  (Typically only about
-// 20% of nodes are within an object.)
-//
-// NB: nodes added during solving (e.g. for reflection, SetFinalizer)
-// will be appended to the end.
-//
-// Renumbering makes the PTA log inscrutable.  To aid debugging, later
-// phases (e.g. HVN) must not rely on it having occurred.
-//
-func (a *analysis) renumber() {
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\n\n==== Renumbering\n\n")
-	}
-
-	N := nodeid(len(a.nodes))
-	newNodes := make([]*node, N, N)
-	renumbering := make([]nodeid, N, N) // maps old to new
-
-	var i, j nodeid
-
-	// The zero node is special.
-	newNodes[j] = a.nodes[i]
-	renumbering[i] = j
-	i++
-	j++
-
-	// Pass 1: object nodes.
-	for i < N {
-		obj := a.nodes[i].obj
-		if obj == nil {
-			i++
-			continue
-		}
-
-		end := i + nodeid(obj.size)
-		for i < end {
-			newNodes[j] = a.nodes[i]
-			renumbering[i] = j
-			i++
-			j++
-		}
-	}
-	nobj := j
-
-	// Pass 2: non-object nodes.
-	for i = 1; i < N; {
-		obj := a.nodes[i].obj
-		if obj != nil {
-			i += nodeid(obj.size)
-			continue
-		}
-
-		newNodes[j] = a.nodes[i]
-		renumbering[i] = j
-		i++
-		j++
-	}
-
-	if j != N {
-		panic(fmt.Sprintf("internal error: j=%d, N=%d", j, N))
-	}
-
-	// Log the remapping table.
-	if a.log != nil {
-		fmt.Fprintf(a.log, "Renumbering nodes to improve density:\n")
-		fmt.Fprintf(a.log, "(%d object nodes of %d total)\n", nobj, N)
-		for old, new := range renumbering {
-			fmt.Fprintf(a.log, "\tn%d -> n%d\n", old, new)
-		}
-	}
-
-	// Now renumber all existing nodeids to use the new node permutation.
-	// It is critical that all reachable nodeids are accounted for!
-
-	// Renumber nodeids in queried Pointers.
-	for v, ptr := range a.result.Queries {
-		ptr.n = renumbering[ptr.n]
-		a.result.Queries[v] = ptr
-	}
-	for v, ptr := range a.result.IndirectQueries {
-		ptr.n = renumbering[ptr.n]
-		a.result.IndirectQueries[v] = ptr
-	}
-	for _, queries := range a.config.extendedQueries {
-		for _, query := range queries {
-			if query.ptr != nil {
-				query.ptr.n = renumbering[query.ptr.n]
-			}
-		}
-	}
-
-	// Renumber nodeids in global objects.
-	for v, id := range a.globalobj {
-		a.globalobj[v] = renumbering[id]
-	}
-
-	// Renumber nodeids in constraints.
-	for _, c := range a.constraints {
-		c.renumber(renumbering)
-	}
-
-	// Renumber nodeids in the call graph.
-	for _, cgn := range a.cgnodes {
-		cgn.obj = renumbering[cgn.obj]
-		for _, site := range cgn.sites {
-			site.targets = renumbering[site.targets]
-		}
-	}
-
-	a.nodes = newNodes
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/pointer_test.go b/installer/vendor/golang.org/x/tools/go/pointer/pointer_test.go
deleted file mode 100644
index 573de5bfb8..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/pointer_test.go
+++ /dev/null
@@ -1,601 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package pointer_test
-
-// This test uses 'expectation' comments embedded within testdata/*.go
-// files to specify the expected pointer analysis behaviour.
-// See below for grammar.
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"go/token"
-	"go/types"
-	"io/ioutil"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-var inputs = []string{
-	"testdata/a_test.go",
-	"testdata/another.go",
-	"testdata/arrayreflect.go",
-	"testdata/arrays.go",
-	"testdata/channels.go",
-	"testdata/chanreflect.go",
-	"testdata/context.go",
-	"testdata/conv.go",
-	"testdata/extended.go",
-	"testdata/finalizer.go",
-	"testdata/flow.go",
-	"testdata/fmtexcerpt.go",
-	"testdata/func.go",
-	"testdata/funcreflect.go",
-	"testdata/hello.go", // NB: causes spurious failure of HVN cross-check
-	"testdata/interfaces.go",
-	"testdata/issue9002.go",
-	"testdata/mapreflect.go",
-	"testdata/maps.go",
-	"testdata/panic.go",
-	"testdata/recur.go",
-	"testdata/reflect.go",
-	"testdata/rtti.go",
-	"testdata/structreflect.go",
-	"testdata/structs.go",
-	"testdata/timer.go",
-}
-
-// Expectation grammar:
-//
-// @calls f -> g
-//
-//   A 'calls' expectation asserts that edge (f, g) appears in the
-//   callgraph.  f and g are notated as per Function.String(), which
-//   may contain spaces (e.g. promoted method in anon struct).
-//
-// @pointsto a | b | c
-//
-//   A 'pointsto' expectation asserts that the points-to set of its
-//   operand contains exactly the set of labels {a,b,c} notated as per
-//   labelString.
-//
-//   A 'pointsto' expectation must appear on the same line as a
-//   print(x) statement; the expectation's operand is x.
-//
-//   If one of the strings is "...", the expectation asserts that the
-//   points-to set at least the other labels.
-//
-//   We use '|' because label names may contain spaces, e.g.  methods
-//   of anonymous structs.
-//
-//   From a theoretical perspective, concrete types in interfaces are
-//   labels too, but they are represented differently and so have a
-//   different expectation, @types, below.
-//
-// @types t | u | v
-//
-//   A 'types' expectation asserts that the set of possible dynamic
-//   types of its interface operand is exactly {t,u,v}, notated per
-//   go/types.Type.String(). In other words, it asserts that the type
-//   component of the interface may point to that set of concrete type
-//   literals.  It also works for reflect.Value, though the types
-//   needn't be concrete in that case.
-//
-//   A 'types' expectation must appear on the same line as a
-//   print(x) statement; the expectation's operand is x.
-//
-//   If one of the strings is "...", the expectation asserts that the
-//   interface's type may point to at least the other types.
-//
-//   We use '|' because type names may contain spaces.
-//
-// @warning "regexp"
-//
-//   A 'warning' expectation asserts that the analysis issues a
-//   warning that matches the regular expression within the string
-//   literal.
-//
-// @line id
-//
-//   A line directive associates the name "id" with the current
-//   file:line.  The string form of labels will use this id instead of
-//   a file:line, making @pointsto expectations more robust against
-//   perturbations in the source file.
-//   (NB, anon functions still include line numbers.)
-//
-type expectation struct {
-	kind     string // "pointsto" | "pointstoquery" | "types" | "calls" | "warning"
-	filename string
-	linenum  int // source line number, 1-based
-	args     []string
-	query    string           // extended query
-	extended *pointer.Pointer // extended query pointer
-	types    []types.Type     // for types
-}
-
-func (e *expectation) String() string {
-	return fmt.Sprintf("@%s[%s]", e.kind, strings.Join(e.args, " | "))
-}
-
-func (e *expectation) errorf(format string, args ...interface{}) {
-	fmt.Printf("%s:%d: ", e.filename, e.linenum)
-	fmt.Printf(format, args...)
-	fmt.Println()
-}
-
-func (e *expectation) needsProbe() bool {
-	return e.kind == "pointsto" || e.kind == "pointstoquery" || e.kind == "types"
-}
-
-// Find probe (call to print(x)) of same source file/line as expectation.
-func findProbe(prog *ssa.Program, probes map[*ssa.CallCommon]bool, queries map[ssa.Value]pointer.Pointer, e *expectation) (site *ssa.CallCommon, pts pointer.PointsToSet) {
-	for call := range probes {
-		pos := prog.Fset.Position(call.Pos())
-		if pos.Line == e.linenum && pos.Filename == e.filename {
-			// TODO(adonovan): send this to test log (display only on failure).
-			// fmt.Printf("%s:%d: info: found probe for %s: %s\n",
-			// 	e.filename, e.linenum, e, p.arg0) // debugging
-			return call, queries[call.Args[0]].PointsTo()
-		}
-	}
-	return // e.g. analysis didn't reach this call
-}
-
-func doOneInput(input, filename string) bool {
-	var conf loader.Config
-
-	// Parsing.
-	f, err := conf.ParseFile(filename, input)
-	if err != nil {
-		fmt.Println(err)
-		return false
-	}
-
-	// Create single-file main package and import its dependencies.
-	conf.CreateFromFiles("main", f)
-	iprog, err := conf.Load()
-	if err != nil {
-		fmt.Println(err)
-		return false
-	}
-	mainPkgInfo := iprog.Created[0].Pkg
-
-	// SSA creation + building.
-	prog := ssautil.CreateProgram(iprog, ssa.SanityCheckFunctions)
-	prog.Build()
-
-	mainpkg := prog.Package(mainPkgInfo)
-	ptrmain := mainpkg // main package for the pointer analysis
-	if mainpkg.Func("main") == nil {
-		// No main function; assume it's a test.
-		ptrmain = prog.CreateTestMainPackage(mainpkg)
-	}
-
-	// Find all calls to the built-in print(x).  Analytically,
-	// print is a no-op, but it's a convenient hook for testing
-	// the PTS of an expression, so our tests use it.
-	probes := make(map[*ssa.CallCommon]bool)
-	for fn := range ssautil.AllFunctions(prog) {
-		if fn.Pkg == mainpkg {
-			for _, b := range fn.Blocks {
-				for _, instr := range b.Instrs {
-					if instr, ok := instr.(ssa.CallInstruction); ok {
-						call := instr.Common()
-						if b, ok := call.Value.(*ssa.Builtin); ok && b.Name() == "print" && len(call.Args) == 1 {
-							probes[instr.Common()] = true
-						}
-					}
-				}
-			}
-		}
-	}
-
-	ok := true
-
-	lineMapping := make(map[string]string) // maps "file:line" to @line tag
-
-	// Parse expectations in this input.
-	var exps []*expectation
-	re := regexp.MustCompile("// *@([a-z]*) *(.*)$")
-	lines := strings.Split(input, "\n")
-	for linenum, line := range lines {
-		linenum++ // make it 1-based
-		if matches := re.FindAllStringSubmatch(line, -1); matches != nil {
-			match := matches[0]
-			kind, rest := match[1], match[2]
-			e := &expectation{kind: kind, filename: filename, linenum: linenum}
-
-			if kind == "line" {
-				if rest == "" {
-					ok = false
-					e.errorf("@%s expectation requires identifier", kind)
-				} else {
-					lineMapping[fmt.Sprintf("%s:%d", filename, linenum)] = rest
-				}
-				continue
-			}
-
-			if e.needsProbe() && !strings.Contains(line, "print(") {
-				ok = false
-				e.errorf("@%s expectation must follow call to print(x)", kind)
-				continue
-			}
-
-			switch kind {
-			case "pointsto":
-				e.args = split(rest, "|")
-
-			case "pointstoquery":
-				args := strings.SplitN(rest, " ", 2)
-				e.query = args[0]
-				e.args = split(args[1], "|")
-			case "types":
-				for _, typstr := range split(rest, "|") {
-					var t types.Type = types.Typ[types.Invalid] // means "..."
-					if typstr != "..." {
-						tv, err := types.Eval(prog.Fset, mainpkg.Pkg, f.Pos(), typstr)
-						if err != nil {
-							ok = false
-							// Don't print err since its location is bad.
-							e.errorf("'%s' is not a valid type: %s", typstr, err)
-							continue
-						}
-						t = tv.Type
-					}
-					e.types = append(e.types, t)
-				}
-
-			case "calls":
-				e.args = split(rest, "->")
-				// TODO(adonovan): eagerly reject the
-				// expectation if fn doesn't denote
-				// existing function, rather than fail
-				// the expectation after analysis.
-				if len(e.args) != 2 {
-					ok = false
-					e.errorf("@calls expectation wants 'caller -> callee' arguments")
-					continue
-				}
-
-			case "warning":
-				lit, err := strconv.Unquote(strings.TrimSpace(rest))
-				if err != nil {
-					ok = false
-					e.errorf("couldn't parse @warning operand: %s", err.Error())
-					continue
-				}
-				e.args = append(e.args, lit)
-
-			default:
-				ok = false
-				e.errorf("unknown expectation kind: %s", e)
-				continue
-			}
-			exps = append(exps, e)
-		}
-	}
-
-	var log bytes.Buffer
-	fmt.Fprintf(&log, "Input: %s\n", filename)
-
-	// Run the analysis.
-	config := &pointer.Config{
-		Reflection:     true,
-		BuildCallGraph: true,
-		Mains:          []*ssa.Package{ptrmain},
-		Log:            &log,
-	}
-probeLoop:
-	for probe := range probes {
-		v := probe.Args[0]
-		pos := prog.Fset.Position(probe.Pos())
-		for _, e := range exps {
-			if e.linenum == pos.Line && e.filename == pos.Filename && e.kind == "pointstoquery" {
-				var err error
-				e.extended, err = config.AddExtendedQuery(v, e.query)
-				if err != nil {
-					panic(err)
-				}
-				continue probeLoop
-			}
-		}
-		if pointer.CanPoint(v.Type()) {
-			config.AddQuery(v)
-		}
-	}
-
-	// Print the log is there was an error or a panic.
-	complete := false
-	defer func() {
-		if !complete || !ok {
-			log.WriteTo(os.Stderr)
-		}
-	}()
-
-	result, err := pointer.Analyze(config)
-	if err != nil {
-		panic(err) // internal error in pointer analysis
-	}
-
-	// Check the expectations.
-	for _, e := range exps {
-		var call *ssa.CallCommon
-		var pts pointer.PointsToSet
-		var tProbe types.Type
-		if e.needsProbe() {
-			if call, pts = findProbe(prog, probes, result.Queries, e); call == nil {
-				ok = false
-				e.errorf("unreachable print() statement has expectation %s", e)
-				continue
-			}
-			if e.extended != nil {
-				pts = e.extended.PointsTo()
-			}
-			tProbe = call.Args[0].Type()
-			if !pointer.CanPoint(tProbe) {
-				ok = false
-				e.errorf("expectation on non-pointerlike operand: %s", tProbe)
-				continue
-			}
-		}
-
-		switch e.kind {
-		case "pointsto", "pointstoquery":
-			if !checkPointsToExpectation(e, pts, lineMapping, prog) {
-				ok = false
-			}
-
-		case "types":
-			if !checkTypesExpectation(e, pts, tProbe) {
-				ok = false
-			}
-
-		case "calls":
-			if !checkCallsExpectation(prog, e, result.CallGraph) {
-				ok = false
-			}
-
-		case "warning":
-			if !checkWarningExpectation(prog, e, result.Warnings) {
-				ok = false
-			}
-		}
-	}
-
-	complete = true
-
-	// ok = false // debugging: uncomment to always see log
-
-	return ok
-}
-
-func labelString(l *pointer.Label, lineMapping map[string]string, prog *ssa.Program) string {
-	// Functions and Globals need no pos suffix,
-	// nor do allocations in intrinsic operations
-	// (for which we'll print the function name).
-	switch l.Value().(type) {
-	case nil, *ssa.Function, *ssa.Global:
-		return l.String()
-	}
-
-	str := l.String()
-	if pos := l.Pos(); pos != token.NoPos {
-		// Append the position, using a @line tag instead of a line number, if defined.
-		posn := prog.Fset.Position(pos)
-		s := fmt.Sprintf("%s:%d", posn.Filename, posn.Line)
-		if tag, ok := lineMapping[s]; ok {
-			return fmt.Sprintf("%s@%s:%d", str, tag, posn.Column)
-		}
-		str = fmt.Sprintf("%s@%s", str, posn)
-	}
-	return str
-}
-
-func checkPointsToExpectation(e *expectation, pts pointer.PointsToSet, lineMapping map[string]string, prog *ssa.Program) bool {
-	expected := make(map[string]int)
-	surplus := make(map[string]int)
-	exact := true
-	for _, g := range e.args {
-		if g == "..." {
-			exact = false
-			continue
-		}
-		expected[g]++
-	}
-	// Find the set of labels that the probe's
-	// argument (x in print(x)) may point to.
-	for _, label := range pts.Labels() {
-		name := labelString(label, lineMapping, prog)
-		if expected[name] > 0 {
-			expected[name]--
-		} else if exact {
-			surplus[name]++
-		}
-	}
-	// Report multiset difference:
-	ok := true
-	for _, count := range expected {
-		if count > 0 {
-			ok = false
-			e.errorf("value does not alias these expected labels: %s", join(expected))
-			break
-		}
-	}
-	for _, count := range surplus {
-		if count > 0 {
-			ok = false
-			e.errorf("value may additionally alias these labels: %s", join(surplus))
-			break
-		}
-	}
-	return ok
-}
-
-func checkTypesExpectation(e *expectation, pts pointer.PointsToSet, typ types.Type) bool {
-	var expected typeutil.Map
-	var surplus typeutil.Map
-	exact := true
-	for _, g := range e.types {
-		if g == types.Typ[types.Invalid] {
-			exact = false
-			continue
-		}
-		expected.Set(g, struct{}{})
-	}
-
-	if !pointer.CanHaveDynamicTypes(typ) {
-		e.errorf("@types expectation requires an interface- or reflect.Value-typed operand, got %s", typ)
-		return false
-	}
-
-	// Find the set of types that the probe's
-	// argument (x in print(x)) may contain.
-	for _, T := range pts.DynamicTypes().Keys() {
-		if expected.At(T) != nil {
-			expected.Delete(T)
-		} else if exact {
-			surplus.Set(T, struct{}{})
-		}
-	}
-	// Report set difference:
-	ok := true
-	if expected.Len() > 0 {
-		ok = false
-		e.errorf("interface cannot contain these types: %s", expected.KeysString())
-	}
-	if surplus.Len() > 0 {
-		ok = false
-		e.errorf("interface may additionally contain these types: %s", surplus.KeysString())
-	}
-	return ok
-}
-
-var errOK = errors.New("OK")
-
-func checkCallsExpectation(prog *ssa.Program, e *expectation, cg *callgraph.Graph) bool {
-	found := make(map[string]int)
-	err := callgraph.GraphVisitEdges(cg, func(edge *callgraph.Edge) error {
-		// Name-based matching is inefficient but it allows us to
-		// match functions whose names that would not appear in an
-		// index ("<root>") or which are not unique ("func@1.2").
-		if edge.Caller.Func.String() == e.args[0] {
-			calleeStr := edge.Callee.Func.String()
-			if calleeStr == e.args[1] {
-				return errOK // expectation satisified; stop the search
-			}
-			found[calleeStr]++
-		}
-		return nil
-	})
-	if err == errOK {
-		return true
-	}
-	if len(found) == 0 {
-		e.errorf("didn't find any calls from %s", e.args[0])
-	}
-	e.errorf("found no call from %s to %s, but only to %s",
-		e.args[0], e.args[1], join(found))
-	return false
-}
-
-func checkWarningExpectation(prog *ssa.Program, e *expectation, warnings []pointer.Warning) bool {
-	// TODO(adonovan): check the position part of the warning too?
-	re, err := regexp.Compile(e.args[0])
-	if err != nil {
-		e.errorf("invalid regular expression in @warning expectation: %s", err.Error())
-		return false
-	}
-
-	if len(warnings) == 0 {
-		e.errorf("@warning %s expectation, but no warnings", strconv.Quote(e.args[0]))
-		return false
-	}
-
-	for _, w := range warnings {
-		if re.MatchString(w.Message) {
-			return true
-		}
-	}
-
-	e.errorf("@warning %s expectation not satised; found these warnings though:", strconv.Quote(e.args[0]))
-	for _, w := range warnings {
-		fmt.Printf("%s: warning: %s\n", prog.Fset.Position(w.Pos), w.Message)
-	}
-	return false
-}
-
-func TestInput(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode; this test requires tons of memory; golang.org/issue/14113")
-	}
-	ok := true
-
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Errorf("os.Getwd: %s", err)
-		return
-	}
-
-	// 'go test' does a chdir so that relative paths in
-	// diagnostics no longer make sense relative to the invoking
-	// shell's cwd.  We print a special marker so that Emacs can
-	// make sense of them.
-	fmt.Fprintf(os.Stderr, "Entering directory `%s'\n", wd)
-
-	for _, filename := range inputs {
-		content, err := ioutil.ReadFile(filename)
-		if err != nil {
-			t.Errorf("couldn't read file '%s': %s", filename, err)
-			continue
-		}
-
-		if !doOneInput(string(content), filename) {
-			ok = false
-		}
-	}
-	if !ok {
-		t.Fail()
-	}
-}
-
-// join joins the elements of multiset with " | "s.
-func join(set map[string]int) string {
-	var buf bytes.Buffer
-	sep := ""
-	for name, count := range set {
-		for i := 0; i < count; i++ {
-			buf.WriteString(sep)
-			sep = " | "
-			buf.WriteString(name)
-		}
-	}
-	return buf.String()
-}
-
-// split returns the list of sep-delimited non-empty strings in s.
-func split(s, sep string) (r []string) {
-	for _, elem := range strings.Split(s, sep) {
-		elem = strings.TrimSpace(elem)
-		if elem != "" {
-			r = append(r, elem)
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/print.go b/installer/vendor/golang.org/x/tools/go/pointer/print.go
deleted file mode 100644
index 4f2f4c7ae1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/print.go
+++ /dev/null
@@ -1,43 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-import "fmt"
-
-func (c *addrConstraint) String() string {
-	return fmt.Sprintf("addr n%d <- {&n%d}", c.dst, c.src)
-}
-
-func (c *copyConstraint) String() string {
-	return fmt.Sprintf("copy n%d <- n%d", c.dst, c.src)
-}
-
-func (c *loadConstraint) String() string {
-	return fmt.Sprintf("load n%d <- n%d[%d]", c.dst, c.src, c.offset)
-}
-
-func (c *storeConstraint) String() string {
-	return fmt.Sprintf("store n%d[%d] <- n%d", c.dst, c.offset, c.src)
-}
-
-func (c *offsetAddrConstraint) String() string {
-	return fmt.Sprintf("offsetAddr n%d <- n%d.#%d", c.dst, c.src, c.offset)
-}
-
-func (c *typeFilterConstraint) String() string {
-	return fmt.Sprintf("typeFilter n%d <- n%d.(%s)", c.dst, c.src, c.typ)
-}
-
-func (c *untagConstraint) String() string {
-	return fmt.Sprintf("untag n%d <- n%d.(%s)", c.dst, c.src, c.typ)
-}
-
-func (c *invokeConstraint) String() string {
-	return fmt.Sprintf("invoke n%d.%s(n%d ...)", c.iface, c.method.Name(), c.params)
-}
-
-func (n nodeid) String() string {
-	return fmt.Sprintf("n%d", n)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/query.go b/installer/vendor/golang.org/x/tools/go/pointer/query.go
deleted file mode 100644
index 1263d318e9..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/query.go
+++ /dev/null
@@ -1,221 +0,0 @@
-package pointer
-
-import (
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"strconv"
-)
-
-// An extendedQuery represents a sequence of destructuring operations
-// applied to an ssa.Value (denoted by "x").
-type extendedQuery struct {
-	ops []interface{}
-	ptr *Pointer
-}
-
-// indexValue returns the value of an integer literal used as an
-// index.
-func indexValue(expr ast.Expr) (int, error) {
-	lit, ok := expr.(*ast.BasicLit)
-	if !ok {
-		return 0, fmt.Errorf("non-integer index (%T)", expr)
-	}
-	if lit.Kind != token.INT {
-		return 0, fmt.Errorf("non-integer index %s", lit.Value)
-	}
-	return strconv.Atoi(lit.Value)
-}
-
-// parseExtendedQuery parses and validates a destructuring Go
-// expression and returns the sequence of destructuring operations.
-// See parseDestructuringExpr for details.
-func parseExtendedQuery(typ types.Type, query string) ([]interface{}, types.Type, error) {
-	expr, err := parser.ParseExpr(query)
-	if err != nil {
-		return nil, nil, err
-	}
-	ops, typ, err := destructuringOps(typ, expr)
-	if err != nil {
-		return nil, nil, err
-	}
-	if len(ops) == 0 {
-		return nil, nil, errors.New("invalid query: must not be empty")
-	}
-	if ops[0] != "x" {
-		return nil, nil, fmt.Errorf("invalid query: query operand must be named x")
-	}
-	if !CanPoint(typ) {
-		return nil, nil, fmt.Errorf("query does not describe a pointer-like value: %s", typ)
-	}
-	return ops, typ, nil
-}
-
-// destructuringOps parses a Go expression consisting only of an
-// identifier "x", field selections, indexing, channel receives, load
-// operations and parens---for example: "<-(*x[i])[key]"--- and
-// returns the sequence of destructuring operations on x.
-func destructuringOps(typ types.Type, expr ast.Expr) ([]interface{}, types.Type, error) {
-	switch expr := expr.(type) {
-	case *ast.SelectorExpr:
-		out, typ, err := destructuringOps(typ, expr.X)
-		if err != nil {
-			return nil, nil, err
-		}
-
-		var structT *types.Struct
-		switch typ := typ.(type) {
-		case *types.Pointer:
-			var ok bool
-			structT, ok = typ.Elem().Underlying().(*types.Struct)
-			if !ok {
-				return nil, nil, fmt.Errorf("cannot access field %s of pointer to type %s", expr.Sel.Name, typ.Elem())
-			}
-
-			out = append(out, "load")
-		case *types.Struct:
-			structT = typ
-		default:
-			return nil, nil, fmt.Errorf("cannot access field %s of type %s", expr.Sel.Name, typ)
-		}
-
-		for i := 0; i < structT.NumFields(); i++ {
-			field := structT.Field(i)
-			if field.Name() == expr.Sel.Name {
-				out = append(out, "field", i)
-				return out, field.Type().Underlying(), nil
-			}
-		}
-		// TODO(dh): supporting embedding would need something like
-		// types.LookupFieldOrMethod, but without taking package
-		// boundaries into account, because we may want to access
-		// unexported fields. If we were only interested in one level
-		// of unexported name, we could determine the appropriate
-		// package and run LookupFieldOrMethod with that. However, a
-		// single query may want to cross multiple package boundaries,
-		// and at this point it's not really worth the complexity.
-		return nil, nil, fmt.Errorf("no field %s in %s (embedded fields must be resolved manually)", expr.Sel.Name, structT)
-	case *ast.Ident:
-		return []interface{}{expr.Name}, typ, nil
-	case *ast.BasicLit:
-		return []interface{}{expr.Value}, nil, nil
-	case *ast.IndexExpr:
-		out, typ, err := destructuringOps(typ, expr.X)
-		if err != nil {
-			return nil, nil, err
-		}
-		switch typ := typ.(type) {
-		case *types.Array:
-			out = append(out, "arrayelem")
-			return out, typ.Elem().Underlying(), nil
-		case *types.Slice:
-			out = append(out, "sliceelem")
-			return out, typ.Elem().Underlying(), nil
-		case *types.Map:
-			out = append(out, "mapelem")
-			return out, typ.Elem().Underlying(), nil
-		case *types.Tuple:
-			out = append(out, "index")
-			idx, err := indexValue(expr.Index)
-			if err != nil {
-				return nil, nil, err
-			}
-			out = append(out, idx)
-			if idx >= typ.Len() || idx < 0 {
-				return nil, nil, fmt.Errorf("tuple index %d out of bounds", idx)
-			}
-			return out, typ.At(idx).Type().Underlying(), nil
-		default:
-			return nil, nil, fmt.Errorf("cannot index type %s", typ)
-		}
-
-	case *ast.UnaryExpr:
-		if expr.Op != token.ARROW {
-			return nil, nil, fmt.Errorf("unsupported unary operator %s", expr.Op)
-		}
-		out, typ, err := destructuringOps(typ, expr.X)
-		if err != nil {
-			return nil, nil, err
-		}
-		ch, ok := typ.(*types.Chan)
-		if !ok {
-			return nil, nil, fmt.Errorf("cannot receive from value of type %s", typ)
-		}
-		out = append(out, "recv")
-		return out, ch.Elem().Underlying(), err
-	case *ast.ParenExpr:
-		return destructuringOps(typ, expr.X)
-	case *ast.StarExpr:
-		out, typ, err := destructuringOps(typ, expr.X)
-		if err != nil {
-			return nil, nil, err
-		}
-		ptr, ok := typ.(*types.Pointer)
-		if !ok {
-			return nil, nil, fmt.Errorf("cannot dereference type %s", typ)
-		}
-		out = append(out, "load")
-		return out, ptr.Elem().Underlying(), err
-	default:
-		return nil, nil, fmt.Errorf("unsupported expression %T", expr)
-	}
-}
-
-func (a *analysis) evalExtendedQuery(t types.Type, id nodeid, ops []interface{}) (types.Type, nodeid) {
-	pid := id
-	// TODO(dh): we're allocating intermediary nodes each time
-	// evalExtendedQuery is called. We should probably only generate
-	// them once per (v, ops) pair.
-	for i := 1; i < len(ops); i++ {
-		var nid nodeid
-		switch ops[i] {
-		case "recv":
-			t = t.(*types.Chan).Elem().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.load(nid, pid, 0, a.sizeof(t))
-		case "field":
-			i++ // fetch field index
-			tt := t.(*types.Struct)
-			idx := ops[i].(int)
-			offset := a.offsetOf(t, idx)
-			t = tt.Field(idx).Type().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.copy(nid, pid+nodeid(offset), a.sizeof(t))
-		case "arrayelem":
-			t = t.(*types.Array).Elem().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.copy(nid, 1+pid, a.sizeof(t))
-		case "sliceelem":
-			t = t.(*types.Slice).Elem().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.load(nid, pid, 1, a.sizeof(t))
-		case "mapelem":
-			tt := t.(*types.Map)
-			t = tt.Elem()
-			ksize := a.sizeof(tt.Key())
-			vsize := a.sizeof(tt.Elem())
-			nid = a.addNodes(t, "query.extended")
-			a.load(nid, pid, ksize, vsize)
-		case "index":
-			i++ // fetch index
-			tt := t.(*types.Tuple)
-			idx := ops[i].(int)
-			t = tt.At(idx).Type().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.copy(nid, pid+nodeid(idx), a.sizeof(t))
-		case "load":
-			t = t.(*types.Pointer).Elem().Underlying()
-			nid = a.addNodes(t, "query.extended")
-			a.load(nid, pid, 0, a.sizeof(t))
-		default:
-			// shouldn't happen
-			panic(fmt.Sprintf("unknown op %q", ops[i]))
-		}
-		pid = nid
-	}
-
-	return t, pid
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/query_test.go b/installer/vendor/golang.org/x/tools/go/pointer/query_test.go
deleted file mode 100644
index 099cc54215..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/query_test.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package pointer
-
-import (
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"reflect"
-	"testing"
-)
-
-func TestParseExtendedQuery(t *testing.T) {
-	const myprog = `
-package pkg
-var V1 *int
-var V2 **int
-var V3 []*int
-var V4 chan []*int
-var V5 struct {F1, F2 chan *int}
-var V6 [1]chan *int
-var V7 int
-`
-	tests := []struct {
-		in    string
-		out   []interface{}
-		v     string
-		valid bool
-	}{
-		{`x`, []interface{}{"x"}, "V1", true},
-		{`*x`, []interface{}{"x", "load"}, "V2", true},
-		{`x[0]`, []interface{}{"x", "sliceelem"}, "V3", true},
-		{`<-x`, []interface{}{"x", "recv"}, "V4", true},
-		{`(<-x)[0]`, []interface{}{"x", "recv", "sliceelem"}, "V4", true},
-		{`<-x.F2`, []interface{}{"x", "field", 1, "recv"}, "V5", true},
-		{`<-x[0]`, []interface{}{"x", "arrayelem", "recv"}, "V6", true},
-		{`x`, nil, "V7", false},
-		{`y`, nil, "V1", false},
-		{`x; x`, nil, "V1", false},
-		{`x()`, nil, "V1", false},
-		{`close(x)`, nil, "V1", false},
-	}
-
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "file.go", myprog, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	cfg := &types.Config{}
-	pkg, err := cfg.Check("main", fset, []*ast.File{f}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, test := range tests {
-		typ := pkg.Scope().Lookup(test.v).Type().Underlying()
-		ops, _, err := parseExtendedQuery(typ, test.in)
-		if test.valid && err != nil {
-			t.Errorf("parseExtendedQuery(%q) = %s, expected no error", test.in, err)
-		}
-		if !test.valid && err == nil {
-			t.Errorf("parseExtendedQuery(%q) succeeded, expected error", test.in)
-		}
-
-		if !reflect.DeepEqual(ops, test.out) {
-			t.Errorf("parseExtendedQuery(%q) = %#v, want %#v", test.in, ops, test.out)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/reflect.go b/installer/vendor/golang.org/x/tools/go/pointer/reflect.go
deleted file mode 100644
index 3439a89659..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/reflect.go
+++ /dev/null
@@ -1,1975 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file implements the generation and resolution rules for
-// constraints arising from the use of reflection in the target
-// program.  See doc.go for explanation of the representation.
-//
-// For consistency, the names of all parameters match those of the
-// actual functions in the "reflect" package.
-//
-// To avoid proliferation of equivalent labels, intrinsics should
-// memoize as much as possible, like TypeOf and Zero do for their
-// tagged objects.
-//
-// TODO(adonovan): this file is rather subtle.  Explain how we derive
-// the implementation of each reflect operator from its spec,
-// including the subtleties of reflect.flag{Addr,RO,Indir}.
-// [Hint: our implementation is as if reflect.flagIndir was always
-// true, i.e. reflect.Values are pointers to tagged objects, there is
-// no inline allocation optimization; and indirect tagged objects (not
-// yet implemented) correspond to reflect.Values with
-// reflect.flagAddr.]
-// A picture would help too.
-//
-// TODO(adonovan): try factoring up the common parts of the majority of
-// these constraints that are single input, single output.
-
-import (
-	"fmt"
-	exact "go/constant"
-	"go/types"
-	"reflect"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-func init() {
-	for name, fn := range map[string]intrinsic{
-		// reflect.Value methods.
-		"(reflect.Value).Addr":            ext۰reflect۰Value۰Addr,
-		"(reflect.Value).Bool":            ext۰NoEffect,
-		"(reflect.Value).Bytes":           ext۰reflect۰Value۰Bytes,
-		"(reflect.Value).Call":            ext۰reflect۰Value۰Call,
-		"(reflect.Value).CallSlice":       ext۰reflect۰Value۰CallSlice,
-		"(reflect.Value).CanAddr":         ext۰NoEffect,
-		"(reflect.Value).CanInterface":    ext۰NoEffect,
-		"(reflect.Value).CanSet":          ext۰NoEffect,
-		"(reflect.Value).Cap":             ext۰NoEffect,
-		"(reflect.Value).Close":           ext۰NoEffect,
-		"(reflect.Value).Complex":         ext۰NoEffect,
-		"(reflect.Value).Convert":         ext۰reflect۰Value۰Convert,
-		"(reflect.Value).Elem":            ext۰reflect۰Value۰Elem,
-		"(reflect.Value).Field":           ext۰reflect۰Value۰Field,
-		"(reflect.Value).FieldByIndex":    ext۰reflect۰Value۰FieldByIndex,
-		"(reflect.Value).FieldByName":     ext۰reflect۰Value۰FieldByName,
-		"(reflect.Value).FieldByNameFunc": ext۰reflect۰Value۰FieldByNameFunc,
-		"(reflect.Value).Float":           ext۰NoEffect,
-		"(reflect.Value).Index":           ext۰reflect۰Value۰Index,
-		"(reflect.Value).Int":             ext۰NoEffect,
-		"(reflect.Value).Interface":       ext۰reflect۰Value۰Interface,
-		"(reflect.Value).InterfaceData":   ext۰NoEffect,
-		"(reflect.Value).IsNil":           ext۰NoEffect,
-		"(reflect.Value).IsValid":         ext۰NoEffect,
-		"(reflect.Value).Kind":            ext۰NoEffect,
-		"(reflect.Value).Len":             ext۰NoEffect,
-		"(reflect.Value).MapIndex":        ext۰reflect۰Value۰MapIndex,
-		"(reflect.Value).MapKeys":         ext۰reflect۰Value۰MapKeys,
-		"(reflect.Value).Method":          ext۰reflect۰Value۰Method,
-		"(reflect.Value).MethodByName":    ext۰reflect۰Value۰MethodByName,
-		"(reflect.Value).NumField":        ext۰NoEffect,
-		"(reflect.Value).NumMethod":       ext۰NoEffect,
-		"(reflect.Value).OverflowComplex": ext۰NoEffect,
-		"(reflect.Value).OverflowFloat":   ext۰NoEffect,
-		"(reflect.Value).OverflowInt":     ext۰NoEffect,
-		"(reflect.Value).OverflowUint":    ext۰NoEffect,
-		"(reflect.Value).Pointer":         ext۰NoEffect,
-		"(reflect.Value).Recv":            ext۰reflect۰Value۰Recv,
-		"(reflect.Value).Send":            ext۰reflect۰Value۰Send,
-		"(reflect.Value).Set":             ext۰reflect۰Value۰Set,
-		"(reflect.Value).SetBool":         ext۰NoEffect,
-		"(reflect.Value).SetBytes":        ext۰reflect۰Value۰SetBytes,
-		"(reflect.Value).SetComplex":      ext۰NoEffect,
-		"(reflect.Value).SetFloat":        ext۰NoEffect,
-		"(reflect.Value).SetInt":          ext۰NoEffect,
-		"(reflect.Value).SetLen":          ext۰NoEffect,
-		"(reflect.Value).SetMapIndex":     ext۰reflect۰Value۰SetMapIndex,
-		"(reflect.Value).SetPointer":      ext۰reflect۰Value۰SetPointer,
-		"(reflect.Value).SetString":       ext۰NoEffect,
-		"(reflect.Value).SetUint":         ext۰NoEffect,
-		"(reflect.Value).Slice":           ext۰reflect۰Value۰Slice,
-		"(reflect.Value).String":          ext۰NoEffect,
-		"(reflect.Value).TryRecv":         ext۰reflect۰Value۰Recv,
-		"(reflect.Value).TrySend":         ext۰reflect۰Value۰Send,
-		"(reflect.Value).Type":            ext۰NoEffect,
-		"(reflect.Value).Uint":            ext۰NoEffect,
-		"(reflect.Value).UnsafeAddr":      ext۰NoEffect,
-
-		// Standalone reflect.* functions.
-		"reflect.Append":      ext۰reflect۰Append,
-		"reflect.AppendSlice": ext۰reflect۰AppendSlice,
-		"reflect.Copy":        ext۰reflect۰Copy,
-		"reflect.ChanOf":      ext۰reflect۰ChanOf,
-		"reflect.DeepEqual":   ext۰NoEffect,
-		"reflect.Indirect":    ext۰reflect۰Indirect,
-		"reflect.MakeChan":    ext۰reflect۰MakeChan,
-		"reflect.MakeFunc":    ext۰reflect۰MakeFunc,
-		"reflect.MakeMap":     ext۰reflect۰MakeMap,
-		"reflect.MakeSlice":   ext۰reflect۰MakeSlice,
-		"reflect.MapOf":       ext۰reflect۰MapOf,
-		"reflect.New":         ext۰reflect۰New,
-		"reflect.NewAt":       ext۰reflect۰NewAt,
-		"reflect.PtrTo":       ext۰reflect۰PtrTo,
-		"reflect.Select":      ext۰reflect۰Select,
-		"reflect.SliceOf":     ext۰reflect۰SliceOf,
-		"reflect.TypeOf":      ext۰reflect۰TypeOf,
-		"reflect.ValueOf":     ext۰reflect۰ValueOf,
-		"reflect.Zero":        ext۰reflect۰Zero,
-		"reflect.init":        ext۰NoEffect,
-
-		// *reflect.rtype methods
-		"(*reflect.rtype).Align":           ext۰NoEffect,
-		"(*reflect.rtype).AssignableTo":    ext۰NoEffect,
-		"(*reflect.rtype).Bits":            ext۰NoEffect,
-		"(*reflect.rtype).ChanDir":         ext۰NoEffect,
-		"(*reflect.rtype).ConvertibleTo":   ext۰NoEffect,
-		"(*reflect.rtype).Elem":            ext۰reflect۰rtype۰Elem,
-		"(*reflect.rtype).Field":           ext۰reflect۰rtype۰Field,
-		"(*reflect.rtype).FieldAlign":      ext۰NoEffect,
-		"(*reflect.rtype).FieldByIndex":    ext۰reflect۰rtype۰FieldByIndex,
-		"(*reflect.rtype).FieldByName":     ext۰reflect۰rtype۰FieldByName,
-		"(*reflect.rtype).FieldByNameFunc": ext۰reflect۰rtype۰FieldByNameFunc,
-		"(*reflect.rtype).Implements":      ext۰NoEffect,
-		"(*reflect.rtype).In":              ext۰reflect۰rtype۰In,
-		"(*reflect.rtype).IsVariadic":      ext۰NoEffect,
-		"(*reflect.rtype).Key":             ext۰reflect۰rtype۰Key,
-		"(*reflect.rtype).Kind":            ext۰NoEffect,
-		"(*reflect.rtype).Len":             ext۰NoEffect,
-		"(*reflect.rtype).Method":          ext۰reflect۰rtype۰Method,
-		"(*reflect.rtype).MethodByName":    ext۰reflect۰rtype۰MethodByName,
-		"(*reflect.rtype).Name":            ext۰NoEffect,
-		"(*reflect.rtype).NumField":        ext۰NoEffect,
-		"(*reflect.rtype).NumIn":           ext۰NoEffect,
-		"(*reflect.rtype).NumMethod":       ext۰NoEffect,
-		"(*reflect.rtype).NumOut":          ext۰NoEffect,
-		"(*reflect.rtype).Out":             ext۰reflect۰rtype۰Out,
-		"(*reflect.rtype).PkgPath":         ext۰NoEffect,
-		"(*reflect.rtype).Size":            ext۰NoEffect,
-		"(*reflect.rtype).String":          ext۰NoEffect,
-	} {
-		intrinsicsByName[name] = fn
-	}
-}
-
-// -------------------- (reflect.Value) --------------------
-
-func ext۰reflect۰Value۰Addr(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).Bytes() Value ----------
-
-// result = v.Bytes()
-type rVBytesConstraint struct {
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVBytesConstraint) ptr() nodeid { return c.v }
-func (c *rVBytesConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVBytes.result")
-}
-func (c *rVBytesConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVBytesConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Bytes()", c.result, c.v)
-}
-
-func (c *rVBytesConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, slice, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		tSlice, ok := tDyn.Underlying().(*types.Slice)
-		if ok && types.Identical(tSlice.Elem(), types.Typ[types.Uint8]) {
-			if a.onlineCopy(c.result, slice) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Bytes(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVBytesConstraint{
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (Value).Call(in []Value) []Value ----------
-
-// result = v.Call(in)
-type rVCallConstraint struct {
-	cgn       *cgnode
-	targets   nodeid // (indirect)
-	v         nodeid // (ptr)
-	arg       nodeid // = in[*]
-	result    nodeid // (indirect)
-	dotdotdot bool   // interpret last arg as a "..." slice
-}
-
-func (c *rVCallConstraint) ptr() nodeid { return c.v }
-func (c *rVCallConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.targets), "rVCall.targets")
-	h.markIndirect(onodeid(c.result), "rVCall.result")
-}
-func (c *rVCallConstraint) renumber(mapping []nodeid) {
-	c.targets = mapping[c.targets]
-	c.v = mapping[c.v]
-	c.arg = mapping[c.arg]
-	c.result = mapping[c.result]
-}
-
-func (c *rVCallConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Call(n%d)", c.result, c.v, c.arg)
-}
-
-func (c *rVCallConstraint) solve(a *analysis, delta *nodeset) {
-	if c.targets == 0 {
-		panic("no targets")
-	}
-
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, fn, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		tSig, ok := tDyn.Underlying().(*types.Signature)
-		if !ok {
-			continue // not a function
-		}
-		if tSig.Recv() != nil {
-			panic(tSig) // TODO(adonovan): rethink when we implement Method()
-		}
-
-		// Add dynamic call target.
-		if a.onlineCopy(c.targets, fn) {
-			a.addWork(c.targets)
-			// TODO(adonovan): is 'else continue' a sound optimisation here?
-		}
-
-		// Allocate a P/R block.
-		tParams := tSig.Params()
-		tResults := tSig.Results()
-		params := a.addNodes(tParams, "rVCall.params")
-		results := a.addNodes(tResults, "rVCall.results")
-
-		// Make a dynamic call to 'fn'.
-		a.store(fn, params, 1, a.sizeof(tParams))
-		a.load(results, fn, 1+a.sizeof(tParams), a.sizeof(tResults))
-
-		// Populate P by type-asserting each actual arg (all merged in c.arg).
-		for i, n := 0, tParams.Len(); i < n; i++ {
-			T := tParams.At(i).Type()
-			a.typeAssert(T, params, c.arg, false)
-			params += nodeid(a.sizeof(T))
-		}
-
-		// Use R by tagging and copying each actual result to c.result.
-		for i, n := 0, tResults.Len(); i < n; i++ {
-			T := tResults.At(i).Type()
-			// Convert from an arbitrary type to a reflect.Value
-			// (like MakeInterface followed by reflect.ValueOf).
-			if isInterface(T) {
-				// (don't tag)
-				if a.onlineCopy(c.result, results) {
-					changed = true
-				}
-			} else {
-				obj := a.makeTagged(T, c.cgn, nil)
-				a.onlineCopyN(obj+1, results, a.sizeof(T))
-				if a.addLabel(c.result, obj) { // (true)
-					changed = true
-				}
-			}
-			results += nodeid(a.sizeof(T))
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-// Common code for direct (inlined) and indirect calls to (reflect.Value).Call.
-func reflectCallImpl(a *analysis, cgn *cgnode, site *callsite, recv, arg nodeid, dotdotdot bool) nodeid {
-	// Allocate []reflect.Value array for the result.
-	ret := a.nextNode()
-	a.addNodes(types.NewArray(a.reflectValueObj.Type(), 1), "rVCall.ret")
-	a.endObject(ret, cgn, nil)
-
-	// pts(targets) will be the set of possible call targets.
-	site.targets = a.addOneNode(tInvalid, "rvCall.targets", nil)
-
-	// All arguments are merged since they arrive in a slice.
-	argelts := a.addOneNode(a.reflectValueObj.Type(), "rVCall.args", nil)
-	a.load(argelts, arg, 1, 1) // slice elements
-
-	a.addConstraint(&rVCallConstraint{
-		cgn:       cgn,
-		targets:   site.targets,
-		v:         recv,
-		arg:       argelts,
-		result:    ret + 1, // results go into elements of ret
-		dotdotdot: dotdotdot,
-	})
-	return ret
-}
-
-func reflectCall(a *analysis, cgn *cgnode, dotdotdot bool) {
-	// This is the shared contour implementation of (reflect.Value).Call
-	// and CallSlice, as used by indirect calls (rare).
-	// Direct calls are inlined in gen.go, eliding the
-	// intermediate cgnode for Call.
-	site := new(callsite)
-	cgn.sites = append(cgn.sites, site)
-	recv := a.funcParams(cgn.obj)
-	arg := recv + 1
-	ret := reflectCallImpl(a, cgn, site, recv, arg, dotdotdot)
-	a.addressOf(cgn.fn.Signature.Results().At(0).Type(), a.funcResults(cgn.obj), ret)
-}
-
-func ext۰reflect۰Value۰Call(a *analysis, cgn *cgnode) {
-	reflectCall(a, cgn, false)
-}
-
-func ext۰reflect۰Value۰CallSlice(a *analysis, cgn *cgnode) {
-	// TODO(adonovan): implement.  Also, inline direct calls in gen.go too.
-	if false {
-		reflectCall(a, cgn, true)
-	}
-}
-
-func ext۰reflect۰Value۰Convert(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).Elem() Value ----------
-
-// result = v.Elem()
-type rVElemConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVElemConstraint) ptr() nodeid { return c.v }
-func (c *rVElemConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVElem.result")
-}
-func (c *rVElemConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVElemConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Elem()", c.result, c.v)
-}
-
-func (c *rVElemConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, payload, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		switch t := tDyn.Underlying().(type) {
-		case *types.Interface:
-			if a.onlineCopy(c.result, payload) {
-				changed = true
-			}
-
-		case *types.Pointer:
-			obj := a.makeTagged(t.Elem(), c.cgn, nil)
-			a.load(obj+1, payload, 0, a.sizeof(t.Elem()))
-			if a.addLabel(c.result, obj) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Elem(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVElemConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰Value۰Field(a *analysis, cgn *cgnode)           {} // TODO(adonovan)
-func ext۰reflect۰Value۰FieldByIndex(a *analysis, cgn *cgnode)    {} // TODO(adonovan)
-func ext۰reflect۰Value۰FieldByName(a *analysis, cgn *cgnode)     {} // TODO(adonovan)
-func ext۰reflect۰Value۰FieldByNameFunc(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).Index() Value ----------
-
-// result = v.Index()
-type rVIndexConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVIndexConstraint) ptr() nodeid { return c.v }
-func (c *rVIndexConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVIndex.result")
-}
-func (c *rVIndexConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVIndexConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Index()", c.result, c.v)
-}
-
-func (c *rVIndexConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, payload, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		var res nodeid
-		switch t := tDyn.Underlying().(type) {
-		case *types.Array:
-			res = a.makeTagged(t.Elem(), c.cgn, nil)
-			a.onlineCopyN(res+1, payload+1, a.sizeof(t.Elem()))
-
-		case *types.Slice:
-			res = a.makeTagged(t.Elem(), c.cgn, nil)
-			a.load(res+1, payload, 1, a.sizeof(t.Elem()))
-
-		case *types.Basic:
-			if t.Kind() == types.String {
-				res = a.makeTagged(types.Typ[types.Rune], c.cgn, nil)
-			}
-		}
-		if res != 0 && a.addLabel(c.result, res) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Index(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVIndexConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (Value).Interface() Value ----------
-
-// result = v.Interface()
-type rVInterfaceConstraint struct {
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVInterfaceConstraint) ptr() nodeid { return c.v }
-func (c *rVInterfaceConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVInterface.result")
-}
-func (c *rVInterfaceConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVInterfaceConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Interface()", c.result, c.v)
-}
-
-func (c *rVInterfaceConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, payload, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		if isInterface(tDyn) {
-			if a.onlineCopy(c.result, payload) {
-				a.addWork(c.result)
-			}
-		} else {
-			if a.addLabel(c.result, vObj) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Interface(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVInterfaceConstraint{
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (Value).MapIndex(Value) Value ----------
-
-// result = v.MapIndex(_)
-type rVMapIndexConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVMapIndexConstraint) ptr() nodeid { return c.v }
-func (c *rVMapIndexConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVMapIndex.result")
-}
-func (c *rVMapIndexConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVMapIndexConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.MapIndex(_)", c.result, c.v)
-}
-
-func (c *rVMapIndexConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, m, indirect := a.taggedValue(vObj)
-		tMap, _ := tDyn.Underlying().(*types.Map)
-		if tMap == nil {
-			continue // not a map
-		}
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		obj := a.makeTagged(tMap.Elem(), c.cgn, nil)
-		a.load(obj+1, m, a.sizeof(tMap.Key()), a.sizeof(tMap.Elem()))
-		if a.addLabel(c.result, obj) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰MapIndex(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVMapIndexConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (Value).MapKeys() []Value ----------
-
-// result = v.MapKeys()
-type rVMapKeysConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVMapKeysConstraint) ptr() nodeid { return c.v }
-func (c *rVMapKeysConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVMapKeys.result")
-}
-func (c *rVMapKeysConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVMapKeysConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.MapKeys()", c.result, c.v)
-}
-
-func (c *rVMapKeysConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, m, indirect := a.taggedValue(vObj)
-		tMap, _ := tDyn.Underlying().(*types.Map)
-		if tMap == nil {
-			continue // not a map
-		}
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		kObj := a.makeTagged(tMap.Key(), c.cgn, nil)
-		a.load(kObj+1, m, 0, a.sizeof(tMap.Key()))
-		if a.addLabel(c.result, kObj) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰MapKeys(a *analysis, cgn *cgnode) {
-	// Allocate an array for the result.
-	obj := a.nextNode()
-	T := types.NewSlice(a.reflectValueObj.Type())
-	a.addNodes(sliceToArray(T), "reflect.MapKeys result")
-	a.endObject(obj, cgn, nil)
-	a.addressOf(T, a.funcResults(cgn.obj), obj)
-
-	a.addConstraint(&rVMapKeysConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: obj + 1, // result is stored in array elems
-	})
-}
-
-func ext۰reflect۰Value۰Method(a *analysis, cgn *cgnode)       {} // TODO(adonovan)
-func ext۰reflect۰Value۰MethodByName(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).Recv(Value) Value ----------
-
-// result, _ = v.Recv()
-type rVRecvConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVRecvConstraint) ptr() nodeid { return c.v }
-func (c *rVRecvConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVRecv.result")
-}
-func (c *rVRecvConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVRecvConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Recv()", c.result, c.v)
-}
-
-func (c *rVRecvConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, ch, indirect := a.taggedValue(vObj)
-		tChan, _ := tDyn.Underlying().(*types.Chan)
-		if tChan == nil {
-			continue // not a channel
-		}
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		tElem := tChan.Elem()
-		elemObj := a.makeTagged(tElem, c.cgn, nil)
-		a.load(elemObj+1, ch, 0, a.sizeof(tElem))
-		if a.addLabel(c.result, elemObj) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Recv(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVRecvConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (Value).Send(Value) ----------
-
-// v.Send(x)
-type rVSendConstraint struct {
-	cgn *cgnode
-	v   nodeid // (ptr)
-	x   nodeid
-}
-
-func (c *rVSendConstraint) ptr() nodeid   { return c.v }
-func (c *rVSendConstraint) presolve(*hvn) {}
-func (c *rVSendConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.x = mapping[c.x]
-}
-
-func (c *rVSendConstraint) String() string {
-	return fmt.Sprintf("reflect n%d.Send(n%d)", c.v, c.x)
-}
-
-func (c *rVSendConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, ch, indirect := a.taggedValue(vObj)
-		tChan, _ := tDyn.Underlying().(*types.Chan)
-		if tChan == nil {
-			continue // not a channel
-		}
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		// Extract x's payload to xtmp, then store to channel.
-		tElem := tChan.Elem()
-		xtmp := a.addNodes(tElem, "Send.xtmp")
-		a.typeAssert(tElem, xtmp, c.x, false)
-		a.store(ch, xtmp, 0, a.sizeof(tElem))
-	}
-}
-
-func ext۰reflect۰Value۰Send(a *analysis, cgn *cgnode) {
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&rVSendConstraint{
-		cgn: cgn,
-		v:   params,
-		x:   params + 1,
-	})
-}
-
-func ext۰reflect۰Value۰Set(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).SetBytes(x []byte) ----------
-
-// v.SetBytes(x)
-type rVSetBytesConstraint struct {
-	cgn *cgnode
-	v   nodeid // (ptr)
-	x   nodeid
-}
-
-func (c *rVSetBytesConstraint) ptr() nodeid   { return c.v }
-func (c *rVSetBytesConstraint) presolve(*hvn) {}
-func (c *rVSetBytesConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.x = mapping[c.x]
-}
-
-func (c *rVSetBytesConstraint) String() string {
-	return fmt.Sprintf("reflect n%d.SetBytes(n%d)", c.v, c.x)
-}
-
-func (c *rVSetBytesConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, slice, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		tSlice, ok := tDyn.Underlying().(*types.Slice)
-		if ok && types.Identical(tSlice.Elem(), types.Typ[types.Uint8]) {
-			if a.onlineCopy(slice, c.x) {
-				a.addWork(slice)
-			}
-		}
-	}
-}
-
-func ext۰reflect۰Value۰SetBytes(a *analysis, cgn *cgnode) {
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&rVSetBytesConstraint{
-		cgn: cgn,
-		v:   params,
-		x:   params + 1,
-	})
-}
-
-// ---------- func (Value).SetMapIndex(k Value, v Value) ----------
-
-// v.SetMapIndex(key, val)
-type rVSetMapIndexConstraint struct {
-	cgn *cgnode
-	v   nodeid // (ptr)
-	key nodeid
-	val nodeid
-}
-
-func (c *rVSetMapIndexConstraint) ptr() nodeid   { return c.v }
-func (c *rVSetMapIndexConstraint) presolve(*hvn) {}
-func (c *rVSetMapIndexConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.key = mapping[c.key]
-	c.val = mapping[c.val]
-}
-
-func (c *rVSetMapIndexConstraint) String() string {
-	return fmt.Sprintf("reflect n%d.SetMapIndex(n%d, n%d)", c.v, c.key, c.val)
-}
-
-func (c *rVSetMapIndexConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, m, indirect := a.taggedValue(vObj)
-		tMap, _ := tDyn.Underlying().(*types.Map)
-		if tMap == nil {
-			continue // not a map
-		}
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		keysize := a.sizeof(tMap.Key())
-
-		// Extract key's payload to keytmp, then store to map key.
-		keytmp := a.addNodes(tMap.Key(), "SetMapIndex.keytmp")
-		a.typeAssert(tMap.Key(), keytmp, c.key, false)
-		a.store(m, keytmp, 0, keysize)
-
-		// Extract val's payload to vtmp, then store to map value.
-		valtmp := a.addNodes(tMap.Elem(), "SetMapIndex.valtmp")
-		a.typeAssert(tMap.Elem(), valtmp, c.val, false)
-		a.store(m, valtmp, keysize, a.sizeof(tMap.Elem()))
-	}
-}
-
-func ext۰reflect۰Value۰SetMapIndex(a *analysis, cgn *cgnode) {
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&rVSetMapIndexConstraint{
-		cgn: cgn,
-		v:   params,
-		key: params + 1,
-		val: params + 2,
-	})
-}
-
-func ext۰reflect۰Value۰SetPointer(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (Value).Slice(v Value, i, j int) Value ----------
-
-// result = v.Slice(_, _)
-type rVSliceConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rVSliceConstraint) ptr() nodeid { return c.v }
-func (c *rVSliceConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rVSlice.result")
-}
-func (c *rVSliceConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *rVSliceConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect n%d.Slice(_, _)", c.result, c.v)
-}
-
-func (c *rVSliceConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, payload, indirect := a.taggedValue(vObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		var res nodeid
-		switch t := tDyn.Underlying().(type) {
-		case *types.Pointer:
-			if tArr, ok := t.Elem().Underlying().(*types.Array); ok {
-				// pointer to array
-				res = a.makeTagged(types.NewSlice(tArr.Elem()), c.cgn, nil)
-				if a.onlineCopy(res+1, payload) {
-					a.addWork(res + 1)
-				}
-			}
-
-		case *types.Array:
-			// TODO(adonovan): implement addressable
-			// arrays when we do indirect tagged objects.
-
-		case *types.Slice:
-			res = vObj
-
-		case *types.Basic:
-			if t == types.Typ[types.String] {
-				res = vObj
-			}
-		}
-
-		if res != 0 && a.addLabel(c.result, res) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Value۰Slice(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rVSliceConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// -------------------- Standalone reflect functions --------------------
-
-func ext۰reflect۰Append(a *analysis, cgn *cgnode)      {} // TODO(adonovan)
-func ext۰reflect۰AppendSlice(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-func ext۰reflect۰Copy(a *analysis, cgn *cgnode)        {} // TODO(adonovan)
-
-// ---------- func ChanOf(ChanDir, Type) Type ----------
-
-// result = ChanOf(dir, t)
-type reflectChanOfConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-	dirs   []types.ChanDir
-}
-
-func (c *reflectChanOfConstraint) ptr() nodeid { return c.t }
-func (c *reflectChanOfConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectChanOf.result")
-}
-func (c *reflectChanOfConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectChanOfConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.ChanOf(n%d)", c.result, c.t)
-}
-
-func (c *reflectChanOfConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.rtypeTaggedValue(tObj)
-
-		if typeTooHigh(T) {
-			continue
-		}
-
-		for _, dir := range c.dirs {
-			if a.addLabel(c.result, a.makeRtype(types.NewChan(dir, T))) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-// dirMap maps reflect.ChanDir to the set of channel types generated by ChanOf.
-var dirMap = [...][]types.ChanDir{
-	0:               {types.SendOnly, types.RecvOnly, types.SendRecv}, // unknown
-	reflect.RecvDir: {types.RecvOnly},
-	reflect.SendDir: {types.SendOnly},
-	reflect.BothDir: {types.SendRecv},
-}
-
-func ext۰reflect۰ChanOf(a *analysis, cgn *cgnode) {
-	// If we have access to the callsite,
-	// and the channel argument is a constant (as is usual),
-	// only generate the requested direction.
-	var dir reflect.ChanDir // unknown
-	if site := cgn.callersite; site != nil {
-		if c, ok := site.instr.Common().Args[0].(*ssa.Const); ok {
-			v, _ := exact.Int64Val(c.Value)
-			if 0 <= v && v <= int64(reflect.BothDir) {
-				dir = reflect.ChanDir(v)
-			}
-		}
-	}
-
-	params := a.funcParams(cgn.obj)
-	a.addConstraint(&reflectChanOfConstraint{
-		cgn:    cgn,
-		t:      params + 1,
-		result: a.funcResults(cgn.obj),
-		dirs:   dirMap[dir],
-	})
-}
-
-// ---------- func Indirect(v Value) Value ----------
-
-// result = Indirect(v)
-type reflectIndirectConstraint struct {
-	cgn    *cgnode
-	v      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectIndirectConstraint) ptr() nodeid { return c.v }
-func (c *reflectIndirectConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectIndirect.result")
-}
-func (c *reflectIndirectConstraint) renumber(mapping []nodeid) {
-	c.v = mapping[c.v]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectIndirectConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.Indirect(n%d)", c.result, c.v)
-}
-
-func (c *reflectIndirectConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		vObj := nodeid(x)
-		tDyn, _, _ := a.taggedValue(vObj)
-		var res nodeid
-		if tPtr, ok := tDyn.Underlying().(*types.Pointer); ok {
-			// load the payload of the pointer's tagged object
-			// into a new tagged object
-			res = a.makeTagged(tPtr.Elem(), c.cgn, nil)
-			a.load(res+1, vObj+1, 0, a.sizeof(tPtr.Elem()))
-		} else {
-			res = vObj
-		}
-
-		if a.addLabel(c.result, res) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Indirect(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectIndirectConstraint{
-		cgn:    cgn,
-		v:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func MakeChan(Type) Value ----------
-
-// result = MakeChan(typ)
-type reflectMakeChanConstraint struct {
-	cgn    *cgnode
-	typ    nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectMakeChanConstraint) ptr() nodeid { return c.typ }
-func (c *reflectMakeChanConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectMakeChan.result")
-}
-func (c *reflectMakeChanConstraint) renumber(mapping []nodeid) {
-	c.typ = mapping[c.typ]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectMakeChanConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.MakeChan(n%d)", c.result, c.typ)
-}
-
-func (c *reflectMakeChanConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		typObj := nodeid(x)
-		T := a.rtypeTaggedValue(typObj)
-		tChan, ok := T.Underlying().(*types.Chan)
-		if !ok || tChan.Dir() != types.SendRecv {
-			continue // not a bidirectional channel type
-		}
-
-		obj := a.nextNode()
-		a.addNodes(tChan.Elem(), "reflect.MakeChan.value")
-		a.endObject(obj, c.cgn, nil)
-
-		// put its address in a new T-tagged object
-		id := a.makeTagged(T, c.cgn, nil)
-		a.addLabel(id+1, obj)
-
-		// flow the T-tagged object to the result
-		if a.addLabel(c.result, id) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰MakeChan(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectMakeChanConstraint{
-		cgn:    cgn,
-		typ:    a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰MakeFunc(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func MakeMap(Type) Value ----------
-
-// result = MakeMap(typ)
-type reflectMakeMapConstraint struct {
-	cgn    *cgnode
-	typ    nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectMakeMapConstraint) ptr() nodeid { return c.typ }
-func (c *reflectMakeMapConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectMakeMap.result")
-}
-func (c *reflectMakeMapConstraint) renumber(mapping []nodeid) {
-	c.typ = mapping[c.typ]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectMakeMapConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.MakeMap(n%d)", c.result, c.typ)
-}
-
-func (c *reflectMakeMapConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		typObj := nodeid(x)
-		T := a.rtypeTaggedValue(typObj)
-		tMap, ok := T.Underlying().(*types.Map)
-		if !ok {
-			continue // not a map type
-		}
-
-		mapObj := a.nextNode()
-		a.addNodes(tMap.Key(), "reflect.MakeMap.key")
-		a.addNodes(tMap.Elem(), "reflect.MakeMap.value")
-		a.endObject(mapObj, c.cgn, nil)
-
-		// put its address in a new T-tagged object
-		id := a.makeTagged(T, c.cgn, nil)
-		a.addLabel(id+1, mapObj)
-
-		// flow the T-tagged object to the result
-		if a.addLabel(c.result, id) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰MakeMap(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectMakeMapConstraint{
-		cgn:    cgn,
-		typ:    a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func MakeSlice(Type) Value ----------
-
-// result = MakeSlice(typ)
-type reflectMakeSliceConstraint struct {
-	cgn    *cgnode
-	typ    nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectMakeSliceConstraint) ptr() nodeid { return c.typ }
-func (c *reflectMakeSliceConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectMakeSlice.result")
-}
-func (c *reflectMakeSliceConstraint) renumber(mapping []nodeid) {
-	c.typ = mapping[c.typ]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectMakeSliceConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.MakeSlice(n%d)", c.result, c.typ)
-}
-
-func (c *reflectMakeSliceConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		typObj := nodeid(x)
-		T := a.rtypeTaggedValue(typObj)
-		if _, ok := T.Underlying().(*types.Slice); !ok {
-			continue // not a slice type
-		}
-
-		obj := a.nextNode()
-		a.addNodes(sliceToArray(T), "reflect.MakeSlice")
-		a.endObject(obj, c.cgn, nil)
-
-		// put its address in a new T-tagged object
-		id := a.makeTagged(T, c.cgn, nil)
-		a.addLabel(id+1, obj)
-
-		// flow the T-tagged object to the result
-		if a.addLabel(c.result, id) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰MakeSlice(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectMakeSliceConstraint{
-		cgn:    cgn,
-		typ:    a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰MapOf(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func New(Type) Value ----------
-
-// result = New(typ)
-type reflectNewConstraint struct {
-	cgn    *cgnode
-	typ    nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectNewConstraint) ptr() nodeid { return c.typ }
-func (c *reflectNewConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectNew.result")
-}
-func (c *reflectNewConstraint) renumber(mapping []nodeid) {
-	c.typ = mapping[c.typ]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectNewConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.New(n%d)", c.result, c.typ)
-}
-
-func (c *reflectNewConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		typObj := nodeid(x)
-		T := a.rtypeTaggedValue(typObj)
-
-		// allocate new T object
-		newObj := a.nextNode()
-		a.addNodes(T, "reflect.New")
-		a.endObject(newObj, c.cgn, nil)
-
-		// put its address in a new *T-tagged object
-		id := a.makeTagged(types.NewPointer(T), c.cgn, nil)
-		a.addLabel(id+1, newObj)
-
-		// flow the pointer to the result
-		if a.addLabel(c.result, id) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰New(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectNewConstraint{
-		cgn:    cgn,
-		typ:    a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰NewAt(a *analysis, cgn *cgnode) {
-	ext۰reflect۰New(a, cgn)
-
-	// TODO(adonovan): also report dynamic calls to unsound intrinsics.
-	if site := cgn.callersite; site != nil {
-		a.warnf(site.pos(), "unsound: %s contains a reflect.NewAt() call", site.instr.Parent())
-	}
-}
-
-// ---------- func PtrTo(Type) Type ----------
-
-// result = PtrTo(t)
-type reflectPtrToConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectPtrToConstraint) ptr() nodeid { return c.t }
-func (c *reflectPtrToConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectPtrTo.result")
-}
-func (c *reflectPtrToConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectPtrToConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.PtrTo(n%d)", c.result, c.t)
-}
-
-func (c *reflectPtrToConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.rtypeTaggedValue(tObj)
-
-		if typeTooHigh(T) {
-			continue
-		}
-
-		if a.addLabel(c.result, a.makeRtype(types.NewPointer(T))) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰PtrTo(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectPtrToConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰Select(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func SliceOf(Type) Type ----------
-
-// result = SliceOf(t)
-type reflectSliceOfConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectSliceOfConstraint) ptr() nodeid { return c.t }
-func (c *reflectSliceOfConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectSliceOf.result")
-}
-func (c *reflectSliceOfConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectSliceOfConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.SliceOf(n%d)", c.result, c.t)
-}
-
-func (c *reflectSliceOfConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.rtypeTaggedValue(tObj)
-
-		if typeTooHigh(T) {
-			continue
-		}
-
-		if a.addLabel(c.result, a.makeRtype(types.NewSlice(T))) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰SliceOf(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectSliceOfConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func TypeOf(v Value) Type ----------
-
-// result = TypeOf(i)
-type reflectTypeOfConstraint struct {
-	cgn    *cgnode
-	i      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectTypeOfConstraint) ptr() nodeid { return c.i }
-func (c *reflectTypeOfConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectTypeOf.result")
-}
-func (c *reflectTypeOfConstraint) renumber(mapping []nodeid) {
-	c.i = mapping[c.i]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectTypeOfConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.TypeOf(n%d)", c.result, c.i)
-}
-
-func (c *reflectTypeOfConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		iObj := nodeid(x)
-		tDyn, _, _ := a.taggedValue(iObj)
-		if a.addLabel(c.result, a.makeRtype(tDyn)) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰TypeOf(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectTypeOfConstraint{
-		cgn:    cgn,
-		i:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func ValueOf(interface{}) Value ----------
-
-func ext۰reflect۰ValueOf(a *analysis, cgn *cgnode) {
-	// TODO(adonovan): when we start creating indirect tagged
-	// objects, we'll need to handle them specially here since
-	// they must never appear in the PTS of an interface{}.
-	a.copy(a.funcResults(cgn.obj), a.funcParams(cgn.obj), 1)
-}
-
-// ---------- func Zero(Type) Value ----------
-
-// result = Zero(typ)
-type reflectZeroConstraint struct {
-	cgn    *cgnode
-	typ    nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *reflectZeroConstraint) ptr() nodeid { return c.typ }
-func (c *reflectZeroConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "reflectZero.result")
-}
-func (c *reflectZeroConstraint) renumber(mapping []nodeid) {
-	c.typ = mapping[c.typ]
-	c.result = mapping[c.result]
-}
-
-func (c *reflectZeroConstraint) String() string {
-	return fmt.Sprintf("n%d = reflect.Zero(n%d)", c.result, c.typ)
-}
-
-func (c *reflectZeroConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		typObj := nodeid(x)
-		T := a.rtypeTaggedValue(typObj)
-
-		// TODO(adonovan): if T is an interface type, we need
-		// to create an indirect tagged object containing
-		// new(T).  To avoid updates of such shared values,
-		// we'll need another flag on indirect tagged objects
-		// that marks whether they are addressable or
-		// readonly, just like the reflect package does.
-
-		// memoize using a.reflectZeros[T]
-		var id nodeid
-		if z := a.reflectZeros.At(T); false && z != nil {
-			id = z.(nodeid)
-		} else {
-			id = a.makeTagged(T, c.cgn, nil)
-			a.reflectZeros.Set(T, id)
-		}
-		if a.addLabel(c.result, id) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰Zero(a *analysis, cgn *cgnode) {
-	a.addConstraint(&reflectZeroConstraint{
-		cgn:    cgn,
-		typ:    a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// -------------------- (*reflect.rtype) methods --------------------
-
-// ---------- func (*rtype) Elem() Type ----------
-
-// result = Elem(t)
-type rtypeElemConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rtypeElemConstraint) ptr() nodeid { return c.t }
-func (c *rtypeElemConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rtypeElem.result")
-}
-func (c *rtypeElemConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *rtypeElemConstraint) String() string {
-	return fmt.Sprintf("n%d = (*reflect.rtype).Elem(n%d)", c.result, c.t)
-}
-
-func (c *rtypeElemConstraint) solve(a *analysis, delta *nodeset) {
-	// Implemented by *types.{Map,Chan,Array,Slice,Pointer}.
-	type hasElem interface {
-		Elem() types.Type
-	}
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.nodes[tObj].obj.data.(types.Type)
-		if tHasElem, ok := T.Underlying().(hasElem); ok {
-			if a.addLabel(c.result, a.makeRtype(tHasElem.Elem())) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰rtype۰Elem(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rtypeElemConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (*rtype) Field(int) StructField ----------
-// ---------- func (*rtype) FieldByName(string) (StructField, bool) ----------
-
-// result = FieldByName(t, name)
-// result = Field(t, _)
-type rtypeFieldByNameConstraint struct {
-	cgn    *cgnode
-	name   string // name of field; "" for unknown
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rtypeFieldByNameConstraint) ptr() nodeid { return c.t }
-func (c *rtypeFieldByNameConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result+3), "rtypeFieldByName.result.Type")
-}
-func (c *rtypeFieldByNameConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *rtypeFieldByNameConstraint) String() string {
-	return fmt.Sprintf("n%d = (*reflect.rtype).FieldByName(n%d, %q)", c.result, c.t, c.name)
-}
-
-func (c *rtypeFieldByNameConstraint) solve(a *analysis, delta *nodeset) {
-	// type StructField struct {
-	// 0	__identity__
-	// 1	Name      string
-	// 2	PkgPath   string
-	// 3	Type      Type
-	// 4	Tag       StructTag
-	// 5	Offset    uintptr
-	// 6	Index     []int
-	// 7	Anonymous bool
-	// }
-
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.nodes[tObj].obj.data.(types.Type)
-		tStruct, ok := T.Underlying().(*types.Struct)
-		if !ok {
-			continue // not a struct type
-		}
-
-		n := tStruct.NumFields()
-		for i := 0; i < n; i++ {
-			f := tStruct.Field(i)
-			if c.name == "" || c.name == f.Name() {
-
-				// a.offsetOf(Type) is 3.
-				if id := c.result + 3; a.addLabel(id, a.makeRtype(f.Type())) {
-					a.addWork(id)
-				}
-				// TODO(adonovan): StructField.Index should be non-nil.
-			}
-		}
-	}
-}
-
-func ext۰reflect۰rtype۰FieldByName(a *analysis, cgn *cgnode) {
-	// If we have access to the callsite,
-	// and the argument is a string constant,
-	// return only that field.
-	var name string
-	if site := cgn.callersite; site != nil {
-		if c, ok := site.instr.Common().Args[0].(*ssa.Const); ok {
-			name = exact.StringVal(c.Value)
-		}
-	}
-
-	a.addConstraint(&rtypeFieldByNameConstraint{
-		cgn:    cgn,
-		name:   name,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰rtype۰Field(a *analysis, cgn *cgnode) {
-	// No-one ever calls Field with a constant argument,
-	// so we don't specialize that case.
-	a.addConstraint(&rtypeFieldByNameConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰rtype۰FieldByIndex(a *analysis, cgn *cgnode)    {} // TODO(adonovan)
-func ext۰reflect۰rtype۰FieldByNameFunc(a *analysis, cgn *cgnode) {} // TODO(adonovan)
-
-// ---------- func (*rtype) In/Out(i int) Type ----------
-
-// result = In/Out(t, i)
-type rtypeInOutConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-	out    bool
-	i      int // -ve if not a constant
-}
-
-func (c *rtypeInOutConstraint) ptr() nodeid { return c.t }
-func (c *rtypeInOutConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rtypeInOut.result")
-}
-func (c *rtypeInOutConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *rtypeInOutConstraint) String() string {
-	return fmt.Sprintf("n%d = (*reflect.rtype).InOut(n%d, %d)", c.result, c.t, c.i)
-}
-
-func (c *rtypeInOutConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.nodes[tObj].obj.data.(types.Type)
-		sig, ok := T.Underlying().(*types.Signature)
-		if !ok {
-			continue // not a func type
-		}
-
-		tuple := sig.Params()
-		if c.out {
-			tuple = sig.Results()
-		}
-		for i, n := 0, tuple.Len(); i < n; i++ {
-			if c.i < 0 || c.i == i {
-				if a.addLabel(c.result, a.makeRtype(tuple.At(i).Type())) {
-					changed = true
-				}
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰rtype۰InOut(a *analysis, cgn *cgnode, out bool) {
-	// If we have access to the callsite,
-	// and the argument is an int constant,
-	// return only that parameter.
-	index := -1
-	if site := cgn.callersite; site != nil {
-		if c, ok := site.instr.Common().Args[0].(*ssa.Const); ok {
-			v, _ := exact.Int64Val(c.Value)
-			index = int(v)
-		}
-	}
-	a.addConstraint(&rtypeInOutConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-		out:    out,
-		i:      index,
-	})
-}
-
-func ext۰reflect۰rtype۰In(a *analysis, cgn *cgnode) {
-	ext۰reflect۰rtype۰InOut(a, cgn, false)
-}
-
-func ext۰reflect۰rtype۰Out(a *analysis, cgn *cgnode) {
-	ext۰reflect۰rtype۰InOut(a, cgn, true)
-}
-
-// ---------- func (*rtype) Key() Type ----------
-
-// result = Key(t)
-type rtypeKeyConstraint struct {
-	cgn    *cgnode
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rtypeKeyConstraint) ptr() nodeid { return c.t }
-func (c *rtypeKeyConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result), "rtypeKey.result")
-}
-func (c *rtypeKeyConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *rtypeKeyConstraint) String() string {
-	return fmt.Sprintf("n%d = (*reflect.rtype).Key(n%d)", c.result, c.t)
-}
-
-func (c *rtypeKeyConstraint) solve(a *analysis, delta *nodeset) {
-	changed := false
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.nodes[tObj].obj.data.(types.Type)
-		if tMap, ok := T.Underlying().(*types.Map); ok {
-			if a.addLabel(c.result, a.makeRtype(tMap.Key())) {
-				changed = true
-			}
-		}
-	}
-	if changed {
-		a.addWork(c.result)
-	}
-}
-
-func ext۰reflect۰rtype۰Key(a *analysis, cgn *cgnode) {
-	a.addConstraint(&rtypeKeyConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// ---------- func (*rtype) Method(int) (Method, bool) ----------
-// ---------- func (*rtype) MethodByName(string) (Method, bool) ----------
-
-// result = MethodByName(t, name)
-// result = Method(t, _)
-type rtypeMethodByNameConstraint struct {
-	cgn    *cgnode
-	name   string // name of method; "" for unknown
-	t      nodeid // (ptr)
-	result nodeid // (indirect)
-}
-
-func (c *rtypeMethodByNameConstraint) ptr() nodeid { return c.t }
-func (c *rtypeMethodByNameConstraint) presolve(h *hvn) {
-	h.markIndirect(onodeid(c.result+3), "rtypeMethodByName.result.Type")
-	h.markIndirect(onodeid(c.result+4), "rtypeMethodByName.result.Func")
-}
-func (c *rtypeMethodByNameConstraint) renumber(mapping []nodeid) {
-	c.t = mapping[c.t]
-	c.result = mapping[c.result]
-}
-
-func (c *rtypeMethodByNameConstraint) String() string {
-	return fmt.Sprintf("n%d = (*reflect.rtype).MethodByName(n%d, %q)", c.result, c.t, c.name)
-}
-
-// changeRecv returns sig with Recv prepended to Params().
-func changeRecv(sig *types.Signature) *types.Signature {
-	params := sig.Params()
-	n := params.Len()
-	p2 := make([]*types.Var, n+1)
-	p2[0] = sig.Recv()
-	for i := 0; i < n; i++ {
-		p2[i+1] = params.At(i)
-	}
-	return types.NewSignature(nil, types.NewTuple(p2...), sig.Results(), sig.Variadic())
-}
-
-func (c *rtypeMethodByNameConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		tObj := nodeid(x)
-		T := a.nodes[tObj].obj.data.(types.Type)
-
-		isIface := isInterface(T)
-
-		// We don't use Lookup(c.name) when c.name != "" to avoid
-		// ambiguity: >1 unexported methods could match.
-		mset := a.prog.MethodSets.MethodSet(T)
-		for i, n := 0, mset.Len(); i < n; i++ {
-			sel := mset.At(i)
-			if c.name == "" || c.name == sel.Obj().Name() {
-				// type Method struct {
-				// 0     __identity__
-				// 1	Name    string
-				// 2	PkgPath string
-				// 3	Type    Type
-				// 4	Func    Value
-				// 5	Index   int
-				// }
-
-				var sig *types.Signature
-				var fn *ssa.Function
-				if isIface {
-					sig = sel.Type().(*types.Signature)
-				} else {
-					fn = a.prog.MethodValue(sel)
-					// move receiver to params[0]
-					sig = changeRecv(fn.Signature)
-				}
-
-				// a.offsetOf(Type) is 3.
-				if id := c.result + 3; a.addLabel(id, a.makeRtype(sig)) {
-					a.addWork(id)
-				}
-				if fn != nil {
-					// a.offsetOf(Func) is 4.
-					if id := c.result + 4; a.addLabel(id, a.objectNode(nil, fn)) {
-						a.addWork(id)
-					}
-				}
-			}
-		}
-	}
-}
-
-func ext۰reflect۰rtype۰MethodByName(a *analysis, cgn *cgnode) {
-	// If we have access to the callsite,
-	// and the argument is a string constant,
-	// return only that method.
-	var name string
-	if site := cgn.callersite; site != nil {
-		if c, ok := site.instr.Common().Args[0].(*ssa.Const); ok {
-			name = exact.StringVal(c.Value)
-		}
-	}
-
-	a.addConstraint(&rtypeMethodByNameConstraint{
-		cgn:    cgn,
-		name:   name,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-func ext۰reflect۰rtype۰Method(a *analysis, cgn *cgnode) {
-	// No-one ever calls Method with a constant argument,
-	// so we don't specialize that case.
-	a.addConstraint(&rtypeMethodByNameConstraint{
-		cgn:    cgn,
-		t:      a.funcParams(cgn.obj),
-		result: a.funcResults(cgn.obj),
-	})
-}
-
-// typeHeight returns the "height" of the type, which is roughly
-// speaking the number of chan, map, pointer and slice type constructors
-// at the root of T; these are the four type kinds that can be created
-// via reflection.  Chan and map constructors are counted as double the
-// height of slice and pointer constructors since they are less often
-// deeply nested.
-//
-// The solver rules for type constructors must somehow bound the set of
-// types they create to ensure termination of the algorithm in cases
-// where the output of a type constructor flows to its input, e.g.
-//
-// 	func f(t reflect.Type) {
-// 		f(reflect.PtrTo(t))
-// 	}
-//
-// It does this by limiting the type height to k, but this still leaves
-// a potentially exponential (4^k) number of of types that may be
-// enumerated in pathological cases.
-//
-func typeHeight(T types.Type) int {
-	switch T := T.(type) {
-	case *types.Chan:
-		return 2 + typeHeight(T.Elem())
-	case *types.Map:
-		k := typeHeight(T.Key())
-		v := typeHeight(T.Elem())
-		if v > k {
-			k = v // max(k, v)
-		}
-		return 2 + k
-	case *types.Slice:
-		return 1 + typeHeight(T.Elem())
-	case *types.Pointer:
-		return 1 + typeHeight(T.Elem())
-	}
-	return 0
-}
-
-func typeTooHigh(T types.Type) bool {
-	return typeHeight(T) > 3
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/solve.go b/installer/vendor/golang.org/x/tools/go/pointer/solve.go
deleted file mode 100644
index 0fdd098b01..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/solve.go
+++ /dev/null
@@ -1,370 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-// This file defines a naive Andersen-style solver for the inclusion
-// constraint system.
-
-import (
-	"fmt"
-	"go/types"
-)
-
-type solverState struct {
-	complex []constraint // complex constraints attached to this node
-	copyTo  nodeset      // simple copy constraint edges
-	pts     nodeset      // points-to set of this node
-	prevPTS nodeset      // pts(n) in previous iteration (for difference propagation)
-}
-
-func (a *analysis) solve() {
-	start("Solving")
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\n\n==== Solving constraints\n\n")
-	}
-
-	// Solver main loop.
-	var delta nodeset
-	for {
-		// Add new constraints to the graph:
-		// static constraints from SSA on round 1,
-		// dynamic constraints from reflection thereafter.
-		a.processNewConstraints()
-
-		var x int
-		if !a.work.TakeMin(&x) {
-			break // empty
-		}
-		id := nodeid(x)
-		if a.log != nil {
-			fmt.Fprintf(a.log, "\tnode n%d\n", id)
-		}
-
-		n := a.nodes[id]
-
-		// Difference propagation.
-		delta.Difference(&n.solve.pts.Sparse, &n.solve.prevPTS.Sparse)
-		if delta.IsEmpty() {
-			continue
-		}
-		if a.log != nil {
-			fmt.Fprintf(a.log, "\t\tpts(n%d : %s) = %s + %s\n",
-				id, n.typ, &delta, &n.solve.prevPTS)
-		}
-		n.solve.prevPTS.Copy(&n.solve.pts.Sparse)
-
-		// Apply all resolution rules attached to n.
-		a.solveConstraints(n, &delta)
-
-		if a.log != nil {
-			fmt.Fprintf(a.log, "\t\tpts(n%d) = %s\n", id, &n.solve.pts)
-		}
-	}
-
-	if !a.nodes[0].solve.pts.IsEmpty() {
-		panic(fmt.Sprintf("pts(0) is nonempty: %s", &a.nodes[0].solve.pts))
-	}
-
-	// Release working state (but keep final PTS).
-	for _, n := range a.nodes {
-		n.solve.complex = nil
-		n.solve.copyTo.Clear()
-		n.solve.prevPTS.Clear()
-	}
-
-	if a.log != nil {
-		fmt.Fprintf(a.log, "Solver done\n")
-
-		// Dump solution.
-		for i, n := range a.nodes {
-			if !n.solve.pts.IsEmpty() {
-				fmt.Fprintf(a.log, "pts(n%d) = %s : %s\n", i, &n.solve.pts, n.typ)
-			}
-		}
-	}
-	stop("Solving")
-}
-
-// processNewConstraints takes the new constraints from a.constraints
-// and adds them to the graph, ensuring
-// that new constraints are applied to pre-existing labels and
-// that pre-existing constraints are applied to new labels.
-//
-func (a *analysis) processNewConstraints() {
-	// Take the slice of new constraints.
-	// (May grow during call to solveConstraints.)
-	constraints := a.constraints
-	a.constraints = nil
-
-	// Initialize points-to sets from addr-of (base) constraints.
-	for _, c := range constraints {
-		if c, ok := c.(*addrConstraint); ok {
-			dst := a.nodes[c.dst]
-			dst.solve.pts.add(c.src)
-
-			// Populate the worklist with nodes that point to
-			// something initially (due to addrConstraints) and
-			// have other constraints attached.
-			// (A no-op in round 1.)
-			if !dst.solve.copyTo.IsEmpty() || len(dst.solve.complex) > 0 {
-				a.addWork(c.dst)
-			}
-		}
-	}
-
-	// Attach simple (copy) and complex constraints to nodes.
-	var stale nodeset
-	for _, c := range constraints {
-		var id nodeid
-		switch c := c.(type) {
-		case *addrConstraint:
-			// base constraints handled in previous loop
-			continue
-		case *copyConstraint:
-			// simple (copy) constraint
-			id = c.src
-			a.nodes[id].solve.copyTo.add(c.dst)
-		default:
-			// complex constraint
-			id = c.ptr()
-			solve := a.nodes[id].solve
-			solve.complex = append(solve.complex, c)
-		}
-
-		if n := a.nodes[id]; !n.solve.pts.IsEmpty() {
-			if !n.solve.prevPTS.IsEmpty() {
-				stale.add(id)
-			}
-			a.addWork(id)
-		}
-	}
-	// Apply new constraints to pre-existing PTS labels.
-	var space [50]int
-	for _, id := range stale.AppendTo(space[:0]) {
-		n := a.nodes[nodeid(id)]
-		a.solveConstraints(n, &n.solve.prevPTS)
-	}
-}
-
-// solveConstraints applies each resolution rule attached to node n to
-// the set of labels delta.  It may generate new constraints in
-// a.constraints.
-//
-func (a *analysis) solveConstraints(n *node, delta *nodeset) {
-	if delta.IsEmpty() {
-		return
-	}
-
-	// Process complex constraints dependent on n.
-	for _, c := range n.solve.complex {
-		if a.log != nil {
-			fmt.Fprintf(a.log, "\t\tconstraint %s\n", c)
-		}
-		c.solve(a, delta)
-	}
-
-	// Process copy constraints.
-	var copySeen nodeset
-	for _, x := range n.solve.copyTo.AppendTo(a.deltaSpace) {
-		mid := nodeid(x)
-		if copySeen.add(mid) {
-			if a.nodes[mid].solve.pts.addAll(delta) {
-				a.addWork(mid)
-			}
-		}
-	}
-}
-
-// addLabel adds label to the points-to set of ptr and reports whether the set grew.
-func (a *analysis) addLabel(ptr, label nodeid) bool {
-	b := a.nodes[ptr].solve.pts.add(label)
-	if b && a.log != nil {
-		fmt.Fprintf(a.log, "\t\tpts(n%d) += n%d\n", ptr, label)
-	}
-	return b
-}
-
-func (a *analysis) addWork(id nodeid) {
-	a.work.Insert(int(id))
-	if a.log != nil {
-		fmt.Fprintf(a.log, "\t\twork: n%d\n", id)
-	}
-}
-
-// onlineCopy adds a copy edge.  It is called online, i.e. during
-// solving, so it adds edges and pts members directly rather than by
-// instantiating a 'constraint'.
-//
-// The size of the copy is implicitly 1.
-// It returns true if pts(dst) changed.
-//
-func (a *analysis) onlineCopy(dst, src nodeid) bool {
-	if dst != src {
-		if nsrc := a.nodes[src]; nsrc.solve.copyTo.add(dst) {
-			if a.log != nil {
-				fmt.Fprintf(a.log, "\t\t\tdynamic copy n%d <- n%d\n", dst, src)
-			}
-			// TODO(adonovan): most calls to onlineCopy
-			// are followed by addWork, possibly batched
-			// via a 'changed' flag; see if there's a
-			// noticeable penalty to calling addWork here.
-			return a.nodes[dst].solve.pts.addAll(&nsrc.solve.pts)
-		}
-	}
-	return false
-}
-
-// Returns sizeof.
-// Implicitly adds nodes to worklist.
-//
-// TODO(adonovan): now that we support a.copy() during solving, we
-// could eliminate onlineCopyN, but it's much slower.  Investigate.
-//
-func (a *analysis) onlineCopyN(dst, src nodeid, sizeof uint32) uint32 {
-	for i := uint32(0); i < sizeof; i++ {
-		if a.onlineCopy(dst, src) {
-			a.addWork(dst)
-		}
-		src++
-		dst++
-	}
-	return sizeof
-}
-
-func (c *loadConstraint) solve(a *analysis, delta *nodeset) {
-	var changed bool
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		k := nodeid(x)
-		koff := k + nodeid(c.offset)
-		if a.onlineCopy(c.dst, koff) {
-			changed = true
-		}
-	}
-	if changed {
-		a.addWork(c.dst)
-	}
-}
-
-func (c *storeConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		k := nodeid(x)
-		koff := k + nodeid(c.offset)
-		if a.onlineCopy(koff, c.src) {
-			a.addWork(koff)
-		}
-	}
-}
-
-func (c *offsetAddrConstraint) solve(a *analysis, delta *nodeset) {
-	dst := a.nodes[c.dst]
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		k := nodeid(x)
-		if dst.solve.pts.add(k + nodeid(c.offset)) {
-			a.addWork(c.dst)
-		}
-	}
-}
-
-func (c *typeFilterConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		ifaceObj := nodeid(x)
-		tDyn, _, indirect := a.taggedValue(ifaceObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		if types.AssignableTo(tDyn, c.typ) {
-			if a.addLabel(c.dst, ifaceObj) {
-				a.addWork(c.dst)
-			}
-		}
-	}
-}
-
-func (c *untagConstraint) solve(a *analysis, delta *nodeset) {
-	predicate := types.AssignableTo
-	if c.exact {
-		predicate = types.Identical
-	}
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		ifaceObj := nodeid(x)
-		tDyn, v, indirect := a.taggedValue(ifaceObj)
-		if indirect {
-			// TODO(adonovan): we'll need to implement this
-			// when we start creating indirect tagged objects.
-			panic("indirect tagged object")
-		}
-
-		if predicate(tDyn, c.typ) {
-			// Copy payload sans tag to dst.
-			//
-			// TODO(adonovan): opt: if tDyn is
-			// nonpointerlike we can skip this entire
-			// constraint, perhaps.  We only care about
-			// pointers among the fields.
-			a.onlineCopyN(c.dst, v, a.sizeof(tDyn))
-		}
-	}
-}
-
-func (c *invokeConstraint) solve(a *analysis, delta *nodeset) {
-	for _, x := range delta.AppendTo(a.deltaSpace) {
-		ifaceObj := nodeid(x)
-		tDyn, v, indirect := a.taggedValue(ifaceObj)
-		if indirect {
-			// TODO(adonovan): we may need to implement this if
-			// we ever apply invokeConstraints to reflect.Value PTSs,
-			// e.g. for (reflect.Value).Call.
-			panic("indirect tagged object")
-		}
-
-		// Look up the concrete method.
-		fn := a.prog.LookupMethod(tDyn, c.method.Pkg(), c.method.Name())
-		if fn == nil {
-			panic(fmt.Sprintf("n%d: no ssa.Function for %s", c.iface, c.method))
-		}
-		sig := fn.Signature
-
-		fnObj := a.globalobj[fn] // dynamic calls use shared contour
-		if fnObj == 0 {
-			// a.objectNode(fn) was not called during gen phase.
-			panic(fmt.Sprintf("a.globalobj[%s]==nil", fn))
-		}
-
-		// Make callsite's fn variable point to identity of
-		// concrete method.  (There's no need to add it to
-		// worklist since it never has attached constraints.)
-		a.addLabel(c.params, fnObj)
-
-		// Extract value and connect to method's receiver.
-		// Copy payload to method's receiver param (arg0).
-		arg0 := a.funcParams(fnObj)
-		recvSize := a.sizeof(sig.Recv().Type())
-		a.onlineCopyN(arg0, v, recvSize)
-
-		src := c.params + 1 // skip past identity
-		dst := arg0 + nodeid(recvSize)
-
-		// Copy caller's argument block to method formal parameters.
-		paramsSize := a.sizeof(sig.Params())
-		a.onlineCopyN(dst, src, paramsSize)
-		src += nodeid(paramsSize)
-		dst += nodeid(paramsSize)
-
-		// Copy method results to caller's result block.
-		resultsSize := a.sizeof(sig.Results())
-		a.onlineCopyN(src, dst, resultsSize)
-	}
-}
-
-func (c *addrConstraint) solve(a *analysis, delta *nodeset) {
-	panic("addr is not a complex constraint")
-}
-
-func (c *copyConstraint) solve(a *analysis, delta *nodeset) {
-	panic("copy is not a complex constraint")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/stdlib_test.go b/installer/vendor/golang.org/x/tools/go/pointer/stdlib_test.go
deleted file mode 100644
index d3ba7216b4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/stdlib_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Incomplete source tree on Android.
-
-// +build !android
-
-package pointer
-
-// This file runs the pointer analysis on all packages and tests beneath
-// $GOROOT.  It provides a "smoke test" that the analysis doesn't crash
-// on a large input, and a benchmark for performance measurement.
-//
-// Because it is relatively slow, the --stdlib flag must be enabled for
-// this test to run:
-//    % go test -v golang.org/x/tools/go/pointer --stdlib
-
-import (
-	"flag"
-	"go/build"
-	"go/token"
-	"testing"
-	"time"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-var runStdlibTest = flag.Bool("stdlib", false, "Run the (slow) stdlib test")
-
-func TestStdlib(t *testing.T) {
-	if !*runStdlibTest {
-		t.Skip("skipping (slow) stdlib test (use --stdlib)")
-	}
-
-	// Load, parse and type-check the program.
-	ctxt := build.Default // copy
-	ctxt.GOPATH = ""      // disable GOPATH
-	conf := loader.Config{Build: &ctxt}
-	if _, err := conf.FromArgs(buildutil.AllPackages(conf.Build), true); err != nil {
-		t.Errorf("FromArgs failed: %v", err)
-		return
-	}
-
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load failed: %v", err)
-	}
-
-	// Create SSA packages.
-	prog := ssautil.CreateProgram(iprog, 0)
-	prog.Build()
-
-	numPkgs := len(prog.AllPackages())
-	if want := 240; numPkgs < want {
-		t.Errorf("Loaded only %d packages, want at least %d", numPkgs, want)
-	}
-
-	// Determine the set of packages/tests to analyze.
-	var mains []*ssa.Package
-	for _, info := range iprog.InitialPackages() {
-		ssapkg := prog.Package(info.Pkg)
-		if main := prog.CreateTestMainPackage(ssapkg); main != nil {
-			mains = append(mains, main)
-		}
-	}
-	if mains == nil {
-		t.Fatal("no tests found in analysis scope")
-	}
-
-	// Run the analysis.
-	config := &Config{
-		Reflection:     false, // TODO(adonovan): fix remaining bug in rVCallConstraint, then enable.
-		BuildCallGraph: true,
-		Mains:          mains,
-	}
-	// TODO(adonovan): add some query values (affects track bits).
-
-	t0 := time.Now()
-
-	result, err := Analyze(config)
-	if err != nil {
-		t.Fatal(err) // internal error in pointer analysis
-	}
-	_ = result // TODO(adonovan): measure something
-
-	t1 := time.Now()
-
-	// Dump some statistics.
-	allFuncs := ssautil.AllFunctions(prog)
-	var numInstrs int
-	for fn := range allFuncs {
-		for _, b := range fn.Blocks {
-			numInstrs += len(b.Instrs)
-		}
-	}
-
-	// determine line count
-	var lineCount int
-	prog.Fset.Iterate(func(f *token.File) bool {
-		lineCount += f.LineCount()
-		return true
-	})
-
-	t.Log("#Source lines:          ", lineCount)
-	t.Log("#Instructions:          ", numInstrs)
-	t.Log("Pointer analysis:       ", t1.Sub(t0))
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/a_test.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/a_test.go
deleted file mode 100644
index 3baa9ac7ef..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/a_test.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build ignore
-
-package a
-
-// This test exercises the synthesis of testmain packages for tests.
-// The test framework doesn't directly let us perform negative
-// assertions (i.e. that TestingQuux isn't called, or that its
-// parameter's PTS is empty) so this test is rather roundabout.
-
-import "testing"
-
-func log(f func(*testing.T)) {
-	// The PTS of f is the set of called tests.  TestingQuux is not present.
-	print(f) // @pointsto main.Test | main.TestFoo
-}
-
-func Test(t *testing.T) {
-	// Don't assert @pointsto(t) since its label contains a fragile line number.
-	log(Test)
-}
-
-func TestFoo(t *testing.T) {
-	// Don't assert @pointsto(t) since its label contains a fragile line number.
-	log(TestFoo)
-}
-
-func TestingQuux(t *testing.T) {
-	// We can't assert @pointsto(t) since this is dead code.
-	log(TestingQuux)
-}
-
-func BenchmarkFoo(b *testing.B) {
-}
-
-func ExampleBar() {
-}
-
-// Excludes TestingQuux.
-// @calls testing.tRunner -> main.Test
-// @calls testing.tRunner -> main.TestFoo
-// @calls testing.runExample -> main.ExampleBar
-// @calls (*testing.B).runN -> main.BenchmarkFoo
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/another.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/another.go
deleted file mode 100644
index 12ed690e99..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/another.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build ignore
-
-package main
-
-var unknown bool
-
-type S string
-
-func incr(x int) int { return x + 1 }
-
-func main() {
-	var i interface{}
-	i = 1
-	if unknown {
-		i = S("foo")
-	}
-	if unknown {
-		i = (func(int, int))(nil) // NB type compares equal to that below.
-	}
-	// Look, the test harness can handle equal-but-not-String-equal
-	// types because we parse types and using a typemap.
-	if unknown {
-		i = (func(x int, y int))(nil)
-	}
-	if unknown {
-		i = incr
-	}
-	print(i) // @types int | S | func(int, int) | func(int) int
-
-	// NB, an interface may never directly alias any global
-	// labels, even though it may contain pointers that do.
-	print(i)                 // @pointsto makeinterface:func(x int) int | makeinterface:func(x int, y int) | makeinterface:func(int, int) | makeinterface:int | makeinterface:main.S
-	print(i.(func(int) int)) // @pointsto main.incr
-
-	print() // regression test for crash
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrayreflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrayreflect.go
deleted file mode 100644
index 2b2367409c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrayreflect.go
+++ /dev/null
@@ -1,191 +0,0 @@
-// +build ignore
-
-package main
-
-// Test of arrays & slices with reflection.
-
-import "reflect"
-
-var a, b int
-
-type S string
-
-func reflectValueSlice() {
-	// reflect.Value contains a slice.
-	slice := make([]*int, 10) // @line slice
-	slice[0] = &a
-	rvsl := reflect.ValueOf(slice).Slice(0, 0)
-	print(rvsl.Interface())              // @types []*int
-	print(rvsl.Interface().([]*int))     // @pointsto makeslice@slice:15
-	print(rvsl.Interface().([]*int)[42]) // @pointsto main.a
-
-	// reflect.Value contains an array (non-addressable).
-	array := [10]*int{&a} // @line array
-	rvarray := reflect.ValueOf(array).Slice(0, 0)
-	print(rvarray.Interface())              // @types
-	print(rvarray.Interface().([]*int))     // @pointsto
-	print(rvarray.Interface().([]*int)[42]) // @pointsto
-
-	// reflect.Value contains a pointer-to-array
-	rvparray := reflect.ValueOf(&array).Slice(0, 0)
-	print(rvparray.Interface())              // @types []*int
-	print(rvparray.Interface().([]*int))     // @pointsto array@array:2
-	print(rvparray.Interface().([]*int)[42]) // @pointsto main.a
-
-	// reflect.Value contains a string.
-	rvstring := reflect.ValueOf("hi").Slice(0, 0)
-	print(rvstring.Interface()) // @types string
-
-	// reflect.Value contains a (named) string type.
-	rvS := reflect.ValueOf(S("hi")).Slice(0, 0)
-	print(rvS.Interface()) // @types S
-
-	// reflect.Value contains a non-array pointer.
-	rvptr := reflect.ValueOf(new(int)).Slice(0, 0)
-	print(rvptr.Interface()) // @types
-
-	// reflect.Value contains a non-string basic type.
-	rvint := reflect.ValueOf(3).Slice(0, 0)
-	print(rvint.Interface()) // @types
-}
-
-func reflectValueBytes() {
-	sl1 := make([]byte, 0) // @line ar5sl1
-	sl2 := make([]byte, 0) // @line ar5sl2
-
-	rvsl1 := reflect.ValueOf(sl1)
-	print(rvsl1.Interface())          // @types []byte
-	print(rvsl1.Interface().([]byte)) // @pointsto makeslice@ar5sl1:13
-	print(rvsl1.Bytes())              // @pointsto makeslice@ar5sl1:13
-
-	rvsl2 := reflect.ValueOf(123)
-	rvsl2.SetBytes(sl2)
-	print(rvsl2.Interface())          // @types int
-	print(rvsl2.Interface().([]byte)) // @pointsto
-	print(rvsl2.Bytes())              // @pointsto
-
-	rvsl3 := reflect.ValueOf([]byte(nil))
-	rvsl3.SetBytes(sl2)
-	print(rvsl3.Interface())          // @types []byte
-	print(rvsl3.Interface().([]byte)) // @pointsto makeslice@ar5sl2:13
-	print(rvsl3.Bytes())              // @pointsto makeslice@ar5sl2:13
-}
-
-func reflectValueIndex() {
-	slice := []*int{&a} // @line ar6slice
-	rv1 := reflect.ValueOf(slice)
-	print(rv1.Index(42).Interface())        // @types *int
-	print(rv1.Index(42).Interface().(*int)) // @pointsto main.a
-
-	array := [10]*int{&a}
-	rv2 := reflect.ValueOf(array)
-	print(rv2.Index(42).Interface())        // @types *int
-	print(rv2.Index(42).Interface().(*int)) // @pointsto main.a
-
-	rv3 := reflect.ValueOf("string")
-	print(rv3.Index(42).Interface()) // @types rune
-
-	rv4 := reflect.ValueOf(&array)
-	print(rv4.Index(42).Interface()) // @types
-
-	rv5 := reflect.ValueOf(3)
-	print(rv5.Index(42).Interface()) // @types
-}
-
-func reflectValueElem() {
-	// Interface.
-	var iface interface{} = &a
-	rv1 := reflect.ValueOf(&iface).Elem()
-	print(rv1.Interface())               // @types *int
-	print(rv1.Interface().(*int))        // @pointsto main.a
-	print(rv1.Elem().Interface())        // @types *int
-	print(rv1.Elem().Interface().(*int)) // @pointsto main.a
-
-	print(reflect.ValueOf(new(interface{})).Elem().Elem()) // @types
-
-	// Pointer.
-	ptr := &a
-	rv2 := reflect.ValueOf(&ptr)
-	print(rv2.Elem().Interface())        // @types *int
-	print(rv2.Elem().Interface().(*int)) // @pointsto main.a
-
-	// No other type works with (rV).Elem, not even those that
-	// work with (rT).Elem: slice, array, map, chan.
-
-	rv3 := reflect.ValueOf([]*int{&a})
-	print(rv3.Elem().Interface()) // @types
-
-	rv4 := reflect.ValueOf([10]*int{&a})
-	print(rv4.Elem().Interface()) // @types
-
-	rv5 := reflect.ValueOf(map[*int]*int{&a: &b})
-	print(rv5.Elem().Interface()) // @types
-
-	ch := make(chan *int)
-	ch <- &a
-	rv6 := reflect.ValueOf(ch)
-	print(rv6.Elem().Interface()) // @types
-
-	rv7 := reflect.ValueOf(3)
-	print(rv7.Elem().Interface()) // @types
-}
-
-func reflectTypeElem() {
-	rt1 := reflect.TypeOf(make([]*int, 0))
-	print(reflect.Zero(rt1.Elem())) // @types *int
-
-	rt2 := reflect.TypeOf([10]*int{})
-	print(reflect.Zero(rt2.Elem())) // @types *int
-
-	rt3 := reflect.TypeOf(map[*int]*int{})
-	print(reflect.Zero(rt3.Elem())) // @types *int
-
-	rt4 := reflect.TypeOf(make(chan *int))
-	print(reflect.Zero(rt4.Elem())) // @types *int
-
-	ptr := &a
-	rt5 := reflect.TypeOf(&ptr)
-	print(reflect.Zero(rt5.Elem())) // @types *int
-
-	rt6 := reflect.TypeOf(3)
-	print(reflect.Zero(rt6.Elem())) // @types
-}
-
-func reflectPtrTo() {
-	tInt := reflect.TypeOf(3)
-	tPtrInt := reflect.PtrTo(tInt)
-	print(reflect.Zero(tPtrInt)) // @types *int
-	tPtrPtrInt := reflect.PtrTo(tPtrInt)
-	print(reflect.Zero(tPtrPtrInt)) // @types **int
-}
-
-func reflectSliceOf() {
-	tInt := reflect.TypeOf(3)
-	tSliceInt := reflect.SliceOf(tInt)
-	print(reflect.Zero(tSliceInt)) // @types []int
-}
-
-type T struct{ x int }
-
-func reflectMakeSlice() {
-	rt := []reflect.Type{
-		reflect.TypeOf(3),
-		reflect.TypeOf([]int{}),
-		reflect.TypeOf([]T{}),
-	}[0]
-	sl := reflect.MakeSlice(rt, 0, 0)
-	print(sl)                         // @types []int | []T
-	print(sl)                         // @pointsto <alloc in reflect.MakeSlice> | <alloc in reflect.MakeSlice>
-	print(&sl.Interface().([]T)[0].x) // @pointsto <alloc in reflect.MakeSlice>[*].x
-}
-
-func main() {
-	reflectValueSlice()
-	reflectValueBytes()
-	reflectValueIndex()
-	reflectValueElem()
-	reflectTypeElem()
-	reflectPtrTo()
-	reflectSliceOf()
-	reflectMakeSlice()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrays.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrays.go
deleted file mode 100644
index e57a15b4be..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/arrays.go
+++ /dev/null
@@ -1,97 +0,0 @@
-// +build ignore
-
-package main
-
-var unknown bool // defeat dead-code elimination
-
-var a, b int
-
-func array1() {
-	sliceA := make([]*int, 10) // @line a1make
-	sliceA[0] = &a
-
-	var sliceB []*int
-	sliceB = append(sliceB, &b) // @line a1append
-
-	print(sliceA)    // @pointsto makeslice@a1make:16
-	print(sliceA[0]) // @pointsto main.a
-
-	print(sliceB)      // @pointsto append@a1append:17
-	print(sliceB[100]) // @pointsto main.b
-}
-
-func array2() {
-	sliceA := make([]*int, 10) // @line a2make
-	sliceA[0] = &a
-
-	sliceB := sliceA[:]
-
-	print(sliceA)    // @pointsto makeslice@a2make:16
-	print(sliceA[0]) // @pointsto main.a
-
-	print(sliceB)    // @pointsto makeslice@a2make:16
-	print(sliceB[0]) // @pointsto main.a
-}
-
-func array3() {
-	a := []interface{}{"", 1}
-	b := []interface{}{true, func() {}}
-	print(a[0]) // @types string | int
-	print(b[0]) // @types bool | func()
-}
-
-// Test of append, copy, slice.
-func array4() {
-	var s2 struct { // @line a4L0
-		a [3]int
-		b struct{ c, d int }
-	}
-	var sl1 = make([]*int, 10) // @line a4make
-	var someint int            // @line a4L1
-	sl1[1] = &someint
-	sl2 := append(sl1, &s2.a[1]) // @line a4append1
-	print(sl1)                   // @pointsto makeslice@a4make:16
-	print(sl2)                   // @pointsto append@a4append1:15 | makeslice@a4make:16
-	print(sl1[0])                // @pointsto someint@a4L1:6 | s2.a[*]@a4L0:6
-	print(sl2[0])                // @pointsto someint@a4L1:6 | s2.a[*]@a4L0:6
-
-	// In z=append(x,y) we should observe flow from y[*] to x[*].
-	var sl3 = make([]*int, 10) // @line a4L2
-	_ = append(sl3, &s2.a[1])
-	print(sl3)    // @pointsto makeslice@a4L2:16
-	print(sl3[0]) // @pointsto s2.a[*]@a4L0:6
-
-	var sl4 = []*int{&a} // @line a4L3
-	sl4a := append(sl4)  // @line a4L4
-	print(sl4a)          // @pointsto slicelit@a4L3:18 | append@a4L4:16
-	print(&sl4a[0])      // @pointsto slicelit[*]@a4L3:18 | append[*]@a4L4:16
-	print(sl4a[0])       // @pointsto main.a
-
-	var sl5 = []*int{&b} // @line a4L5
-	copy(sl5, sl4)
-	print(sl5)     // @pointsto slicelit@a4L5:18
-	print(&sl5[0]) // @pointsto slicelit[*]@a4L5:18
-	print(sl5[0])  // @pointsto main.b | main.a
-
-	var sl6 = sl5[:0]
-	print(sl6)     // @pointsto slicelit@a4L5:18
-	print(&sl6[0]) // @pointsto slicelit[*]@a4L5:18
-	print(sl6[0])  // @pointsto main.b | main.a
-}
-
-func array5() {
-	var arr [2]*int
-	arr[0] = &a
-	arr[1] = &b
-
-	var n int
-	print(arr[n]) // @pointsto main.a | main.b
-}
-
-func main() {
-	array1()
-	array2()
-	array3()
-	array4()
-	array5()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/channels.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/channels.go
deleted file mode 100644
index 377b68a56b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/channels.go
+++ /dev/null
@@ -1,118 +0,0 @@
-// +build ignore
-
-package main
-
-func incr(x int) int { return x + 1 }
-
-func decr(x int) int { return x - 1 }
-
-var unknown bool // defeat dead-code elimination
-
-func chan1() {
-	chA := make(chan func(int) int, 0) // @line c1makeA
-	chB := make(chan func(int) int, 0) // @line c1makeB
-	chA <- incr
-	chB <- decr
-	chB <- func(int) int { return 1 }
-
-	print(chA)   // @pointsto makechan@c1makeA:13
-	print(<-chA) // @pointsto main.incr
-
-	print(chB)   // @pointsto makechan@c1makeB:13
-	print(<-chB) // @pointsto main.decr | main.chan1$1
-}
-
-func chan2() {
-	chA := make(chan func(int) int, 0) // @line c2makeA
-	chB := make(chan func(int) int, 0) // @line c2makeB
-	chA <- incr
-	chB <- decr
-	chB <- func(int) int { return 1 }
-
-	// Channels flow together.
-	// Labelsets remain distinct but elements are merged.
-	chAB := chA
-	if unknown {
-		chAB = chB
-	}
-
-	print(chA)   // @pointsto makechan@c2makeA:13
-	print(<-chA) // @pointsto main.incr
-
-	print(chB)   // @pointsto makechan@c2makeB:13
-	print(<-chB) // @pointsto main.decr | main.chan2$1
-
-	print(chAB)   // @pointsto makechan@c2makeA:13 | makechan@c2makeB:13
-	print(<-chAB) // @pointsto main.incr | main.decr | main.chan2$1
-
-	(<-chA)(3)
-}
-
-// @calls main.chan2 -> main.incr
-
-func chan3() {
-	chA := make(chan func(int) int, 0) // @line c3makeA
-	chB := make(chan func(int) int, 0) // @line c3makeB
-	chA <- incr
-	chB <- decr
-	chB <- func(int) int { return 1 }
-	print(chA)   // @pointsto makechan@c3makeA:13
-	print(<-chA) // @pointsto main.incr
-	print(chB)   // @pointsto makechan@c3makeB:13
-	print(<-chB) // @pointsto main.decr | main.chan3$1
-
-	(<-chA)(3)
-}
-
-// @calls main.chan3 -> main.incr
-
-func chan4() {
-	chA := make(chan func(int) int, 0) // @line c4makeA
-	chB := make(chan func(int) int, 0) // @line c4makeB
-
-	select {
-	case chA <- incr:
-	case chB <- decr:
-	case a := <-chA:
-		print(a) // @pointsto main.incr
-	case b := <-chB:
-		print(b) // @pointsto main.decr
-	default:
-		print(chA) // @pointsto makechan@c4makeA:13
-		print(chB) // @pointsto makechan@c4makeB:13
-	}
-
-	for k := range chA {
-		print(k) // @pointsto main.incr
-	}
-	// Exercise constraint generation (regtest for a crash).
-	for range chA {
-	}
-}
-
-// Multi-word channel value in select with multiple receive cases.
-// (Regtest for a crash.)
-func chan5() {
-	type T struct {
-		x *int
-		y interface{}
-	}
-	ch := make(chan T)
-	ch <- T{new(int), incr} // @line ch5new
-	select {
-	case a := <-ch:
-		print(a.x) // @pointsto new@ch5new:13
-		print(a.y) // @types func(x int) int
-	case b := <-ch:
-		print(b.x) // @pointsto new@ch5new:13
-		print(b.y) // @types func(x int) int
-	}
-}
-
-func main() {
-	chan1()
-	chan2()
-	chan3()
-	chan4()
-	chan5()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect.go
deleted file mode 100644
index 7d22efeb6c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// +build ignore
-
-package main
-
-import "reflect"
-
-// Test of channels with reflection.
-
-var a, b int
-
-func chanreflect1() {
-	ch := make(chan *int, 0) // @line cr1make
-	crv := reflect.ValueOf(ch)
-	crv.Send(reflect.ValueOf(&a))
-	print(crv.Interface())             // @types chan *int
-	print(crv.Interface().(chan *int)) // @pointsto makechan@cr1make:12
-	print(<-ch)                        // @pointsto main.a
-}
-
-func chanreflect1i() {
-	// Exercises reflect.Value conversions to/from interfaces:
-	// a different code path than for concrete types.
-	ch := make(chan interface{}, 0)
-	reflect.ValueOf(ch).Send(reflect.ValueOf(&a))
-	v := <-ch
-	print(v)        // @types *int
-	print(v.(*int)) // @pointsto main.a
-}
-
-func chanreflect2() {
-	ch := make(chan *int, 0)
-	ch <- &b
-	crv := reflect.ValueOf(ch)
-	r, _ := crv.Recv()
-	print(r.Interface())        // @types *int
-	print(r.Interface().(*int)) // @pointsto main.b
-}
-
-func chanOfRecv() {
-	// MakeChan(<-chan) is a no-op.
-	t := reflect.ChanOf(reflect.RecvDir, reflect.TypeOf(&a))
-	print(reflect.Zero(t).Interface())                      // @types <-chan *int
-	print(reflect.MakeChan(t, 0).Interface().(<-chan *int)) // @pointsto
-	print(reflect.MakeChan(t, 0).Interface().(chan *int))   // @pointsto
-}
-
-func chanOfSend() {
-	// MakeChan(chan<-) is a no-op.
-	t := reflect.ChanOf(reflect.SendDir, reflect.TypeOf(&a))
-	print(reflect.Zero(t).Interface())                      // @types chan<- *int
-	print(reflect.MakeChan(t, 0).Interface().(chan<- *int)) // @pointsto
-	print(reflect.MakeChan(t, 0).Interface().(chan *int))   // @pointsto
-}
-
-func chanOfBoth() {
-	t := reflect.ChanOf(reflect.BothDir, reflect.TypeOf(&a))
-	print(reflect.Zero(t).Interface()) // @types chan *int
-	ch := reflect.MakeChan(t, 0)
-	print(ch.Interface().(chan *int)) // @pointsto <alloc in reflect.MakeChan>
-	ch.Send(reflect.ValueOf(&b))
-	ch.Interface().(chan *int) <- &a
-	r, _ := ch.Recv()
-	print(r.Interface().(*int))         // @pointsto main.a | main.b
-	print(<-ch.Interface().(chan *int)) // @pointsto main.a | main.b
-}
-
-var unknownDir reflect.ChanDir // not a constant
-
-func chanOfUnknown() {
-	// Unknown channel direction: assume all three.
-	// MakeChan only works on the bi-di channel type.
-	t := reflect.ChanOf(unknownDir, reflect.TypeOf(&a))
-	print(reflect.Zero(t).Interface())        // @types <-chan *int | chan<- *int | chan *int
-	print(reflect.MakeChan(t, 0).Interface()) // @types chan *int
-}
-
-func main() {
-	chanreflect1()
-	chanreflect1i()
-	chanreflect2()
-	chanOfRecv()
-	chanOfSend()
-	chanOfBoth()
-	chanOfUnknown()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect1.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect1.go
deleted file mode 100644
index c5e2587433..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/chanreflect1.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// +build ignore
-
-package main
-
-import "reflect"
-
-//
-// This test is very sensitive to line-number perturbations!
-
-// Test of channels with reflection.
-
-var a, b int
-
-func chanreflect1() {
-	ch := make(chan *int, 0)
-	crv := reflect.ValueOf(ch)
-	crv.Send(reflect.ValueOf(&a))
-	print(crv.Interface())             // @types chan *int
-	print(crv.Interface().(chan *int)) // @pointsto makechan@testdata/chanreflect.go:15:12
-	print(<-ch)                        // @pointsto main.a
-}
-
-func chanreflect2() {
-	ch := make(chan *int, 0)
-	ch <- &b
-	crv := reflect.ValueOf(ch)
-	r, _ := crv.Recv()
-	print(r.Interface())        // @types *int
-	print(r.Interface().(*int)) // @pointsto main.b
-}
-
-func main() {
-	chanreflect1()
-	chanreflect2()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/context.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/context.go
deleted file mode 100644
index ed616e7eca..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/context.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build ignore
-
-package main
-
-// Test of context-sensitive treatment of certain function calls,
-// e.g. static calls to simple accessor methods.
-
-var a, b int
-
-type T struct{ x *int }
-
-func (t *T) SetX(x *int) { t.x = x }
-func (t *T) GetX() *int  { return t.x }
-
-func context1() {
-	var t1, t2 T
-	t1.SetX(&a)
-	t2.SetX(&b)
-	print(t1.GetX()) // @pointsto main.a
-	print(t2.GetX()) // @pointsto main.b
-}
-
-func context2() {
-	id := func(x *int) *int {
-		print(x) // @pointsto main.a | main.b
-		return x
-	}
-	print(id(&a)) // @pointsto main.a
-	print(id(&b)) // @pointsto main.b
-
-	// Same again, but anon func has free vars.
-	var c int // @line context2c
-	id2 := func(x *int) (*int, *int) {
-		print(x) // @pointsto main.a | main.b
-		return x, &c
-	}
-	p, q := id2(&a)
-	print(p) // @pointsto main.a
-	print(q) // @pointsto c@context2c:6
-	r, s := id2(&b)
-	print(r) // @pointsto main.b
-	print(s) // @pointsto c@context2c:6
-}
-
-func main() {
-	context1()
-	context2()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/conv.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/conv.go
deleted file mode 100644
index 692f0ceba6..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/conv.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build ignore
-
-package main
-
-import "unsafe"
-
-var a int
-
-func conv1() {
-	// Conversions of channel direction.
-	ch := make(chan int)    // @line c1make
-	print((<-chan int)(ch)) // @pointsto makechan@c1make:12
-	print((chan<- int)(ch)) // @pointsto makechan@c1make:12
-}
-
-func conv2() {
-	// string -> []byte/[]rune conversion
-	s := "foo"
-	ba := []byte(s) // @line c2ba
-	ra := []rune(s) // @line c2ra
-	print(ba)       // @pointsto convert@c2ba:14
-	print(ra)       // @pointsto convert@c2ra:14
-}
-
-func conv3() {
-	// Conversion of same underlying types.
-	type PI *int
-	pi := PI(&a)
-	print(pi) // @pointsto main.a
-
-	pint := (*int)(pi)
-	print(pint) // @pointsto main.a
-
-	// Conversions between pointers to identical base types.
-	var y *PI = &pi
-	var x **int = (**int)(y)
-	print(*x) // @pointsto main.a
-	print(*y) // @pointsto main.a
-	y = (*PI)(x)
-	print(*y) // @pointsto main.a
-}
-
-func conv4() {
-	// Handling of unsafe.Pointer conversion is unsound:
-	// we lose the alias to main.a and get something like new(int) instead.
-	p := (*int)(unsafe.Pointer(&a)) // @line c2p
-	print(p)                        // @pointsto convert@c2p:13
-}
-
-// Regression test for b/8231.
-func conv5() {
-	type P unsafe.Pointer
-	var i *struct{}
-	_ = P(i)
-}
-
-func main() {
-	conv1()
-	conv2()
-	conv3()
-	conv4()
-	conv5()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/extended.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/extended.go
deleted file mode 100644
index b3dd20304b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/extended.go
+++ /dev/null
@@ -1,21 +0,0 @@
-// +build ignore
-
-package main
-
-var a int
-
-type t struct {
-	a *map[string]chan *int
-}
-
-func fn() []t {
-	m := make(map[string]chan *int)
-	m[""] = make(chan *int, 1)
-	m[""] <- &a
-	return []t{t{a: &m}}
-}
-
-func main() {
-	x := fn()
-	print(x) // @pointstoquery <-(*x[i].a)[key] main.a
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/finalizer.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/finalizer.go
deleted file mode 100644
index 97f25c9047..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/finalizer.go
+++ /dev/null
@@ -1,89 +0,0 @@
-package main
-
-import "runtime"
-
-func final1a(x *int) int {
-	print(x) // @pointsto new@newint:10
-	return *x
-}
-
-func final1b(x *bool) {
-	print(x) // @pointsto
-}
-
-func runtimeSetFinalizer1() {
-	x := new(int)                    // @line newint
-	runtime.SetFinalizer(x, final1a) // ok: final1a's result is ignored
-	runtime.SetFinalizer(x, final1b) // param type mismatch: no effect
-}
-
-// @calls main.runtimeSetFinalizer1 -> main.final1a
-// @calls main.runtimeSetFinalizer1 -> main.final1b
-
-func final2a(x *bool) {
-	print(x) // @pointsto new@newbool1:10 | new@newbool2:10
-}
-
-func final2b(x *bool) {
-	print(x) // @pointsto new@newbool1:10 | new@newbool2:10
-}
-
-func runtimeSetFinalizer2() {
-	x := new(bool) // @line newbool1
-	f := final2a
-	if unknown {
-		x = new(bool) // @line newbool2
-		f = final2b
-	}
-	runtime.SetFinalizer(x, f)
-}
-
-// @calls main.runtimeSetFinalizer2 -> main.final2a
-// @calls main.runtimeSetFinalizer2 -> main.final2b
-
-type T int
-
-func (t *T) finalize() {
-	print(t) // @pointsto new@final3:10
-}
-
-func runtimeSetFinalizer3() {
-	x := new(T) // @line final3
-	runtime.SetFinalizer(x, (*T).finalize)
-}
-
-// @calls main.runtimeSetFinalizer3 -> (*main.T).finalize$thunk
-
-// I hope I never live to see this code in the wild.
-var setFinalizer = runtime.SetFinalizer
-
-func final4(x *int) {
-	print(x) // @pointsto new@finalIndirect:10
-}
-
-func runtimeSetFinalizerIndirect() {
-	// In an indirect call, the shared contour for SetFinalizer is
-	// used, i.e. the call is not inlined and appears in the call graph.
-	x := new(int) // @line finalIndirect
-	setFinalizer(x, final4)
-}
-
-// Exercise the elimination of SetFinalizer
-// constraints with non-pointer operands.
-func runtimeSetFinalizerNonpointer() {
-	runtime.SetFinalizer(nil, (*T).finalize) // x is a non-pointer
-	runtime.SetFinalizer((*T).finalize, nil) // f is a non-pointer
-}
-
-// @calls main.runtimeSetFinalizerIndirect -> runtime.SetFinalizer
-// @calls runtime.SetFinalizer -> main.final4
-
-func main() {
-	runtimeSetFinalizer1()
-	runtimeSetFinalizer2()
-	runtimeSetFinalizer3()
-	runtimeSetFinalizerIndirect()
-	runtimeSetFinalizerNonpointer()
-}
-
-var unknown bool // defeat dead-code elimination
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/flow.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/flow.go
deleted file mode 100644
index 6fb599e8d8..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/flow.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// +build ignore
-
-package main
-
-// Demonstration of directionality of flow edges.
-
-func f1() {}
-func f2() {}
-
-var somepred bool
-
-// Tracking functions.
-func flow1() {
-	s := f1
-	p := f2
-	q := p
-	r := q
-	if somepred {
-		r = s
-	}
-	print(s) // @pointsto main.f1
-	print(p) // @pointsto main.f2
-	print(q) // @pointsto main.f2
-	print(r) // @pointsto main.f1 | main.f2
-}
-
-// Tracking concrete types in interfaces.
-func flow2() {
-	var s interface{} = 1
-	var p interface{} = "foo"
-	q := p
-	r := q
-	if somepred {
-		r = s
-	}
-	print(s) // @types int
-	print(p) // @types string
-	print(q) // @types string
-	print(r) // @types int | string
-}
-
-var g1, g2 int
-
-// Tracking addresses of globals.
-func flow3() {
-	s := &g1
-	p := &g2
-	q := p
-	r := q
-	if somepred {
-		r = s
-	}
-	print(s) // @pointsto main.g1
-	print(p) // @pointsto main.g2
-	print(q) // @pointsto main.g2
-	print(r) // @pointsto main.g2 | main.g1
-}
-
-func main() {
-	flow1()
-	flow2()
-	flow3()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/fmtexcerpt.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/fmtexcerpt.go
deleted file mode 100644
index ee2a0e76c7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/fmtexcerpt.go
+++ /dev/null
@@ -1,42 +0,0 @@
-// +build ignore
-
-// This is a slice of the fmt package.
-
-package main
-
-type pp struct {
-	field interface{}
-}
-
-func newPrinter() *pp {
-	return new(pp)
-}
-
-func Fprintln(a ...interface{}) {
-	p := newPrinter()
-	p.doPrint(a, true, true)
-}
-
-func Println(a ...interface{}) {
-	Fprintln(a...)
-}
-
-func (p *pp) doPrint(a []interface{}, addspace, addnewline bool) {
-	print(a[0]) // @types S | string
-	stringer := a[0].(interface {
-		String() string
-	})
-
-	stringer.String()
-	print(stringer) // @types S
-}
-
-type S int
-
-func (S) String() string { return "" }
-
-func main() {
-	Println("Hello, World!", S(0))
-}
-
-// @calls (*main.pp).doPrint -> (main.S).String
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/func.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/func.go
deleted file mode 100644
index 2155f8ef71..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/func.go
+++ /dev/null
@@ -1,205 +0,0 @@
-// +build ignore
-
-package main
-
-var a, b, c int
-
-var unknown bool // defeat dead-code elimination
-
-func func1() {
-	var h int // @line f1h
-	f := func(x *int) *int {
-		if unknown {
-			return &b
-		}
-		return x
-	}
-
-	// FV(g) = {f, h}
-	g := func(x *int) *int {
-		if unknown {
-			return &h
-		}
-		return f(x)
-	}
-
-	print(g(&a)) // @pointsto main.a | main.b | h@f1h:6
-	print(f(&a)) // @pointsto main.a | main.b
-	print(&a)    // @pointsto main.a
-}
-
-// @calls main.func1 -> main.func1$2
-// @calls main.func1 -> main.func1$1
-// @calls main.func1$2 ->  main.func1$1
-
-func func2() {
-	var x, y *int
-	defer func() {
-		x = &a
-	}()
-	go func() {
-		y = &b
-	}()
-	print(x) // @pointsto main.a
-	print(y) // @pointsto main.b
-}
-
-func func3() {
-	x, y := func() (x, y *int) {
-		x = &a
-		y = &b
-		if unknown {
-			return nil, &c
-		}
-		return
-	}()
-	print(x) // @pointsto main.a
-	print(y) // @pointsto main.b | main.c
-}
-
-func swap(x, y *int) (*int, *int) { // @line swap
-	print(&x) // @pointsto x@swap:11
-	print(x)  // @pointsto makeslice[*]@func4make:11
-	print(&y) // @pointsto y@swap:14
-	print(y)  // @pointsto j@f4j:5
-	return y, x
-}
-
-func func4() {
-	a := make([]int, 10) // @line func4make
-	i, j := 123, 456     // @line f4j
-	_ = i
-	p, q := swap(&a[3], &j)
-	print(p) // @pointsto j@f4j:5
-	print(q) // @pointsto makeslice[*]@func4make:11
-
-	f := &b
-	print(f) // @pointsto main.b
-}
-
-type T int
-
-func (t *T) f(x *int) *int {
-	print(t) // @pointsto main.a
-	print(x) // @pointsto main.c
-	return &b
-}
-
-func (t *T) g(x *int) *int {
-	print(t) // @pointsto main.a
-	print(x) // @pointsto main.b
-	return &c
-}
-
-func (t *T) h(x *int) *int {
-	print(t) // @pointsto main.a
-	print(x) // @pointsto main.b
-	return &c
-}
-
-var h func(*T, *int) *int
-
-func func5() {
-	// Static call of method.
-	t := (*T)(&a)
-	print(t.f(&c)) // @pointsto main.b
-
-	// Static call of method as function
-	print((*T).g(t, &b)) // @pointsto main.c
-
-	// Dynamic call (not invoke) of method.
-	h = (*T).h
-	print(h(t, &b)) // @pointsto main.c
-}
-
-// @calls main.func5 -> (*main.T).f
-// @calls main.func5 -> (*main.T).g$thunk
-// @calls main.func5 -> (*main.T).h$thunk
-
-func func6() {
-	A := &a
-	f := func() *int {
-		return A // (free variable)
-	}
-	print(f()) // @pointsto main.a
-}
-
-// @calls main.func6 -> main.func6$1
-
-type I interface {
-	f()
-}
-
-type D struct{}
-
-func (D) f() {}
-
-func func7() {
-	var i I = D{}
-	imethodClosure := i.f
-	imethodClosure()
-	// @calls main.func7 -> (main.I).f$bound
-	// @calls (main.I).f$bound -> (main.D).f
-
-	var d D
-	cmethodClosure := d.f
-	cmethodClosure()
-	// @calls main.func7 -> (main.D).f$bound
-	// @calls (main.D).f$bound ->(main.D).f
-
-	methodExpr := D.f
-	methodExpr(d)
-	// @calls main.func7 -> (main.D).f$thunk
-}
-
-func func8(x ...int) {
-	print(&x[0]) // @pointsto varargs[*]@varargs:15
-}
-
-type E struct {
-	x1, x2, x3, x4, x5 *int
-}
-
-func (e E) f() {}
-
-func func9() {
-	// Regression test for bug reported by Jon Valdes on golang-dev, Jun 19 2014.
-	// The receiver of a bound method closure may be of a multi-node type, E.
-	// valueNode was reserving only a single node for it, so the
-	// nodes used by the immediately following constraints
-	// (e.g. param 'i') would get clobbered.
-
-	var e E
-	e.x1 = &a
-	e.x2 = &a
-	e.x3 = &a
-	e.x4 = &a
-	e.x5 = &a
-
-	_ = e.f // form a closure---must reserve sizeof(E) nodes
-
-	func(i I) {
-		i.f() // must not crash the solver
-	}(new(D))
-
-	print(e.x1) // @pointsto main.a
-	print(e.x2) // @pointsto main.a
-	print(e.x3) // @pointsto main.a
-	print(e.x4) // @pointsto main.a
-	print(e.x5) // @pointsto main.a
-}
-
-func main() {
-	func1()
-	func2()
-	func3()
-	func4()
-	func5()
-	func6()
-	func7()
-	func8(1, 2, 3) // @line varargs
-	func9()
-}
-
-// @calls <root> -> main.main
-// @calls <root> -> main.init
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/funcreflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/funcreflect.go
deleted file mode 100644
index a0a9a5faaa..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/funcreflect.go
+++ /dev/null
@@ -1,130 +0,0 @@
-// +build ignore
-
-package main
-
-import "reflect"
-
-var zero, a, b int
-var false2 bool
-
-func f(p *int, q hasF) *int {
-	print(p)      // @pointsto main.a
-	print(q)      // @types *T
-	print(q.(*T)) // @pointsto new@newT1:22
-	return &b
-}
-
-func g(p *bool) (*int, *bool, hasF) {
-	return &b, p, new(T) // @line newT2
-}
-
-func reflectValueCall() {
-	rvf := reflect.ValueOf(f)
-	res := rvf.Call([]reflect.Value{
-		// argument order is not significant:
-		reflect.ValueOf(new(T)), // @line newT1
-		reflect.ValueOf(&a),
-	})
-	print(res[0].Interface())        // @types *int
-	print(res[0].Interface().(*int)) // @pointsto main.b
-}
-
-// @calls main.reflectValueCall -> main.f
-
-func reflectValueCallIndirect() {
-	rvf := reflect.ValueOf(g)
-	call := rvf.Call // kids, don't try this at home
-
-	// Indirect call uses shared contour.
-	//
-	// Also notice that argument position doesn't matter, and args
-	// of inappropriate type (e.g. 'a') are ignored.
-	res := call([]reflect.Value{
-		reflect.ValueOf(&a),
-		reflect.ValueOf(&false2),
-	})
-	res0 := res[0].Interface()
-	print(res0)         // @types *int | *bool | *T
-	print(res0.(*int))  // @pointsto main.b
-	print(res0.(*bool)) // @pointsto main.false2
-	print(res0.(hasF))  // @types *T
-	print(res0.(*T))    // @pointsto new@newT2:19
-}
-
-// @calls main.reflectValueCallIndirect -> (reflect.Value).Call$bound
-// @calls (reflect.Value).Call$bound -> main.g
-
-func reflectTypeInOut() {
-	var f func(float64, bool) (string, int)
-	print(reflect.Zero(reflect.TypeOf(f).In(0)).Interface())    // @types float64
-	print(reflect.Zero(reflect.TypeOf(f).In(1)).Interface())    // @types bool
-	print(reflect.Zero(reflect.TypeOf(f).In(-1)).Interface())   // @types float64 | bool
-	print(reflect.Zero(reflect.TypeOf(f).In(zero)).Interface()) // @types float64 | bool
-
-	print(reflect.Zero(reflect.TypeOf(f).Out(0)).Interface()) // @types string
-	print(reflect.Zero(reflect.TypeOf(f).Out(1)).Interface()) // @types int
-	print(reflect.Zero(reflect.TypeOf(f).Out(2)).Interface()) // @types
-
-	print(reflect.Zero(reflect.TypeOf(3).Out(0)).Interface()) // @types
-}
-
-type hasF interface {
-	F()
-}
-
-type T struct{}
-
-func (T) F()    {}
-func (T) g(int) {}
-
-type U struct{}
-
-func (U) F(int)    {}
-func (U) g(string) {}
-
-type I interface {
-	f()
-}
-
-var nonconst string
-
-func reflectTypeMethodByName() {
-	TU := reflect.TypeOf([]interface{}{T{}, U{}}[0])
-	print(reflect.Zero(TU)) // @types T | U
-
-	F, _ := TU.MethodByName("F")
-	print(reflect.Zero(F.Type)) // @types func(T) | func(U, int)
-	print(F.Func)               // @pointsto (main.T).F | (main.U).F
-
-	g, _ := TU.MethodByName("g")
-	print(reflect.Zero(g.Type)) // @types func(T, int) | func(U, string)
-	print(g.Func)               // @pointsto (main.T).g | (main.U).g
-
-	// Non-literal method names are treated less precisely.
-	U := reflect.TypeOf(U{})
-	X, _ := U.MethodByName(nonconst)
-	print(reflect.Zero(X.Type)) // @types func(U, int) | func(U, string)
-	print(X.Func)               // @pointsto (main.U).F | (main.U).g
-
-	// Interface methods.
-	rThasF := reflect.TypeOf(new(hasF)).Elem()
-	print(reflect.Zero(rThasF)) // @types hasF
-	F2, _ := rThasF.MethodByName("F")
-	print(reflect.Zero(F2.Type)) // @types func()
-	print(F2.Func)               // @pointsto
-
-}
-
-func reflectTypeMethod() {
-	m := reflect.TypeOf(T{}).Method(0)
-	print(reflect.Zero(m.Type)) // @types func(T) | func(T, int)
-	print(m.Func)               // @pointsto (main.T).F | (main.T).g
-}
-
-func main() {
-	reflectValueCall()
-	reflectValueCallIndirect()
-	reflectTypeInOut()
-	reflectTypeMethodByName()
-	reflectTypeMethod()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/hello.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/hello.go
deleted file mode 100644
index b81784b22a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/hello.go
+++ /dev/null
@@ -1,27 +0,0 @@
-// +build ignore
-
-package main
-
-import (
-	"fmt"
-	"os"
-)
-
-type S int
-
-var theS S
-
-func (s *S) String() string {
-	print(s) // @pointsto main.theS
-	return ""
-}
-
-func main() {
-	// os.Args is considered intrinsically allocated,
-	// but may also be set explicitly (e.g. on Windows), hence '...'.
-	print(os.Args) // @pointsto <command-line args> | ...
-	fmt.Println("Hello, World!", &theS)
-}
-
-// @calls main.main               -> fmt.Println
-// @calls (*fmt.pp).handleMethods -> (*main.S).String
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/interfaces.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/interfaces.go
deleted file mode 100644
index 91c0fa9a90..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/interfaces.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// +build ignore
-
-package main
-
-type I interface {
-	f()
-}
-
-type C int
-
-func (*C) f() {}
-
-type D struct{ ptr *int }
-
-func (D) f() {}
-
-type E struct{}
-
-func (*E) f() {}
-
-var a, b int
-
-var unknown bool // defeat dead-code elimination
-
-func interface1() {
-	var i interface{} = &a
-	var j interface{} = D{&b}
-	k := j
-	if unknown {
-		k = i
-	}
-
-	print(i) // @types *int
-	print(j) // @types D
-	print(k) // @types *int | D
-
-	print(i.(*int)) // @pointsto main.a
-	print(j.(*int)) // @pointsto
-	print(k.(*int)) // @pointsto main.a
-
-	print(i.(D).ptr) // @pointsto
-	print(j.(D).ptr) // @pointsto main.b
-	print(k.(D).ptr) // @pointsto main.b
-}
-
-func interface2() {
-	var i I = (*C)(&a)
-	var j I = D{&a}
-	k := j
-	if unknown {
-		k = i
-	}
-
-	print(i) // @types *C
-	print(j) // @types D
-	print(k) // @types *C | D
-	print(k) // @pointsto makeinterface:main.D | makeinterface:*main.C
-
-	k.f()
-	// @calls main.interface2 -> (*main.C).f
-	// @calls main.interface2 -> (main.D).f
-
-	print(i.(*C))    // @pointsto main.a
-	print(j.(D).ptr) // @pointsto main.a
-	print(k.(*C))    // @pointsto main.a
-
-	switch x := k.(type) {
-	case *C:
-		print(x) // @pointsto main.a
-	case D:
-		print(x.ptr) // @pointsto main.a
-	case *E:
-		print(x) // @pointsto
-	}
-}
-
-func interface3() {
-	// There should be no backflow of concrete types from the type-switch to x.
-	var x interface{} = 0
-	print(x) // @types int
-	switch x.(type) {
-	case int:
-	case string:
-	}
-}
-
-func interface4() {
-	var i interface{} = D{&a}
-	if unknown {
-		i = 123
-	}
-
-	print(i) // @types int | D
-
-	j := i.(I)       // interface narrowing type-assertion
-	print(j)         // @types D
-	print(j.(D).ptr) // @pointsto main.a
-
-	var l interface{} = j // interface widening assignment.
-	print(l)              // @types D
-	print(l.(D).ptr)      // @pointsto main.a
-
-	m := j.(interface{}) // interface widening type-assertion.
-	print(m)             // @types D
-	print(m.(D).ptr)     // @pointsto main.a
-}
-
-// Interface method calls and value flow:
-
-type J interface {
-	f(*int) *int
-}
-
-type P struct {
-	x int
-}
-
-func (p *P) f(pi *int) *int {
-	print(p)  // @pointsto p@i5p:6
-	print(pi) // @pointsto i@i5i:6
-	return &p.x
-}
-
-func interface5() {
-	var p P // @line i5p
-	var j J = &p
-	var i int      // @line i5i
-	print(j.f(&i)) // @pointsto p.x@i5p:6
-	print(&i)      // @pointsto i@i5i:6
-
-	print(j) // @pointsto makeinterface:*main.P
-}
-
-// @calls main.interface5 -> (*main.P).f
-
-func interface6() {
-	f := I.f
-	print(f) // @pointsto (main.I).f$thunk
-	f(new(struct{ D }))
-}
-
-// @calls main.interface6 -> (main.I).f$thunk
-// @calls (main.I).f$thunk -> (*struct{main.D}).f
-
-func main() {
-	interface1()
-	interface2()
-	interface3()
-	interface4()
-	interface5()
-	interface6()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/issue9002.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/issue9002.go
deleted file mode 100644
index b7c2c61090..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/issue9002.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package main
-
-func main() {
-	// Regression test for golang issue 9002.
-	//
-	// The two-result "value,ok" receive operation generated a
-	// too-wide constraint loading (value int, ok bool), not bool,
-	// from the channel.
-	//
-	// This bug manifested itself in an out-of-bounds array access
-	// when the makechan object was the highest-numbered node, as in
-	// this program.
-	//
-	// In more realistic programs it silently resulted in bogus
-	// constraints.
-	_, _ = <-make(chan int)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/mapreflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/mapreflect.go
deleted file mode 100644
index bc5e7e6b7c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/mapreflect.go
+++ /dev/null
@@ -1,117 +0,0 @@
-// +build ignore
-
-package main
-
-// Test of maps with reflection.
-
-import "reflect"
-
-var a int
-var b bool
-
-func reflectMapKeysIndex() {
-	m := make(map[*int]*bool) // @line mr1make
-	m[&a] = &b
-
-	mrv := reflect.ValueOf(m)
-	print(mrv.Interface())                  // @types map[*int]*bool
-	print(mrv.Interface().(map[*int]*bool)) // @pointsto makemap@mr1make:11
-	print(mrv)                              // @pointsto makeinterface:map[*int]*bool
-	print(mrv)                              // @types map[*int]*bool
-
-	keys := mrv.MapKeys()
-	print(keys) // @pointsto <alloc in (reflect.Value).MapKeys>
-	for _, k := range keys {
-		print(k)                    // @pointsto <alloc in (reflect.Value).MapKeys>
-		print(k)                    // @types *int
-		print(k.Interface())        // @types *int
-		print(k.Interface().(*int)) // @pointsto main.a
-
-		v := mrv.MapIndex(k)
-		print(v.Interface())         // @types *bool
-		print(v.Interface().(*bool)) // @pointsto main.b
-	}
-}
-
-func reflectSetMapIndex() {
-	m := make(map[*int]*bool)
-	mrv := reflect.ValueOf(m)
-	mrv.SetMapIndex(reflect.ValueOf(&a), reflect.ValueOf(&b))
-
-	print(m[nil]) // @pointsto main.b
-
-	for _, k := range mrv.MapKeys() {
-		print(k.Interface())        // @types *int
-		print(k.Interface().(*int)) // @pointsto main.a
-	}
-
-	tmap := reflect.TypeOf(m)
-	// types.EvalNode won't let us refer to non-exported types:
-	// print(tmap) // #@types *reflect.rtype
-	print(tmap) // @pointsto map[*int]*bool
-
-	zmap := reflect.Zero(tmap)
-	print(zmap)             // @pointsto <alloc in reflect.Zero>
-	print(zmap.Interface()) // @pointsto <alloc in reflect.Zero>
-
-	print(tmap.Key())                            // @pointsto *int
-	print(tmap.Elem())                           // @pointsto *bool
-	print(reflect.Zero(tmap.Key()))              // @pointsto <alloc in reflect.Zero>
-	print(reflect.Zero(tmap.Key()).Interface())  // @pointsto <alloc in reflect.Zero>
-	print(reflect.Zero(tmap.Key()).Interface())  // @types *int
-	print(reflect.Zero(tmap.Elem()))             // @pointsto <alloc in reflect.Zero>
-	print(reflect.Zero(tmap.Elem()).Interface()) // @pointsto <alloc in reflect.Zero>
-	print(reflect.Zero(tmap.Elem()).Interface()) // @types *bool
-}
-
-func reflectSetMapIndexInterface() {
-	// Exercises reflect.Value conversions to/from interfaces:
-	// a different code path than for concrete types.
-	m := make(map[interface{}]interface{})
-	reflect.ValueOf(m).SetMapIndex(reflect.ValueOf(&a), reflect.ValueOf(&b))
-	for k, v := range m {
-		print(k)         // @types *int
-		print(k.(*int))  // @pointsto main.a
-		print(v)         // @types *bool
-		print(v.(*bool)) // @pointsto main.b
-	}
-}
-
-func reflectSetMapIndexAssignable() {
-	// SetMapIndex performs implicit assignability conversions.
-	type I *int
-	type J *int
-
-	str := reflect.ValueOf("")
-
-	// *int is assignable to I.
-	m1 := make(map[string]I)
-	reflect.ValueOf(m1).SetMapIndex(str, reflect.ValueOf(new(int))) // @line int
-	print(m1[""])                                                   // @pointsto new@int:58
-
-	// I is assignable to I.
-	m2 := make(map[string]I)
-	reflect.ValueOf(m2).SetMapIndex(str, reflect.ValueOf(I(new(int)))) // @line I
-	print(m2[""])                                                      // @pointsto new@I:60
-
-	// J is not assignable to I.
-	m3 := make(map[string]I)
-	reflect.ValueOf(m3).SetMapIndex(str, reflect.ValueOf(J(new(int))))
-	print(m3[""]) // @pointsto
-}
-
-func reflectMakeMap() {
-	t := reflect.TypeOf(map[*int]*bool(nil))
-	v := reflect.MakeMap(t)
-	print(v) // @types map[*int]*bool
-	print(v) // @pointsto <alloc in reflect.MakeMap>
-}
-
-func main() {
-	reflectMapKeysIndex()
-	reflectSetMapIndex()
-	reflectSetMapIndexInterface()
-	reflectSetMapIndexAssignable()
-	reflectMakeMap()
-	// TODO(adonovan): reflect.MapOf(Type)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/maps.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/maps.go
deleted file mode 100644
index 67293045bc..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/maps.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// +build ignore
-
-package main
-
-// Test of maps.
-
-var a, b, c int
-
-func maps1() {
-	m1 := map[*int]*int{&a: &b} // @line m1m1
-	m2 := make(map[*int]*int)   // @line m1m2
-	m2[&b] = &a
-
-	print(m1[nil]) // @pointsto main.b | main.c
-	print(m2[nil]) // @pointsto main.a
-
-	print(m1) // @pointsto makemap@m1m1:21
-	print(m2) // @pointsto makemap@m1m2:12
-
-	m1[&b] = &c
-
-	for k, v := range m1 {
-		print(k) // @pointsto main.a | main.b
-		print(v) // @pointsto main.b | main.c
-	}
-
-	for k, v := range m2 {
-		print(k) // @pointsto main.b
-		print(v) // @pointsto main.a
-	}
-
-	// Lookup doesn't create any aliases.
-	print(m2[&c]) // @pointsto main.a
-	if _, ok := m2[&a]; ok {
-		print(m2[&c]) // @pointsto main.a
-	}
-}
-
-func maps2() {
-	m1 := map[*int]*int{&a: &b}
-	m2 := map[*int]*int{&b: &c}
-	_ = []map[*int]*int{m1, m2} // (no spurious merging of m1, m2)
-
-	print(m1[nil]) // @pointsto main.b
-	print(m2[nil]) // @pointsto main.c
-}
-
-var g int
-
-func maps3() {
-	// Regression test for a constraint generation bug for map range
-	// loops in which the key is unused: the (ok, k, v) tuple
-	// returned by ssa.Next may have type 'invalid' for the k and/or
-	// v components, so copying the map key or value may cause
-	// miswiring if the key has >1 components.  In the worst case,
-	// this causes a crash.  The test below used to report that
-	// pts(v) includes not just main.g but new(float64) too, which
-	// is ill-typed.
-
-	// sizeof(K) > 1, abstractly
-	type K struct{ a, b *float64 }
-	k := K{new(float64), nil}
-	m := map[K]*int{k: &g}
-
-	for _, v := range m {
-		print(v) // @pointsto main.g
-	}
-}
-
-func main() {
-	maps1()
-	maps2()
-	maps3()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/panic.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/panic.go
deleted file mode 100644
index ee8a7668e0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/panic.go
+++ /dev/null
@@ -1,36 +0,0 @@
-// +build ignore
-
-package main
-
-// Test of value flow from panic() to recover().
-// We model them as stores/loads of a global location.
-// We ignore concrete panic types originating from the runtime.
-
-var someval int
-
-type myPanic struct{}
-
-func f(int) {}
-
-func g() string { return "" }
-
-func deadcode() {
-	panic(123) // not reached
-}
-
-func main() {
-	switch someval {
-	case 0:
-		panic("oops")
-	case 1:
-		panic(myPanic{})
-	case 2:
-		panic(f)
-	case 3:
-		panic(g)
-	}
-	ex := recover()
-	print(ex)                 // @types myPanic | string | func(int) | func() string
-	print(ex.(func(int)))     // @pointsto main.f
-	print(ex.(func() string)) // @pointsto main.g
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/recur.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/recur.go
deleted file mode 100644
index 4c7229de94..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/recur.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// +build ignore
-
-package main
-
-// Analysis abstraction of recursive calls is finite.
-
-func main() {
-	main()
-}
-
-// @calls main.main -> main.main
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/reflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/reflect.go
deleted file mode 100644
index 6b8d0f22eb..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/reflect.go
+++ /dev/null
@@ -1,115 +0,0 @@
-// +build ignore
-
-package main
-
-import "reflect"
-import "unsafe"
-
-var a, b int
-var unknown bool
-
-func reflectIndirect() {
-	ptr := &a
-	// Pointer:
-	print(reflect.Indirect(reflect.ValueOf(&ptr)).Interface().(*int)) // @pointsto main.a
-	// Non-pointer:
-	print(reflect.Indirect(reflect.ValueOf([]*int{ptr})).Interface().([]*int)[0]) // @pointsto main.a
-}
-
-func reflectNewAt() {
-	var x [8]byte
-	print(reflect.NewAt(reflect.TypeOf(3), unsafe.Pointer(&x)).Interface()) // @types *int
-}
-
-// @warning "unsound: main.reflectNewAt contains a reflect.NewAt.. call"
-
-func reflectTypeOf() {
-	t := reflect.TypeOf(3)
-	if unknown {
-		t = reflect.TypeOf("foo")
-	}
-	// TODO(adonovan): make types.Eval let us refer to unexported types.
-	print(t)                             // #@types *reflect.rtype
-	print(reflect.Zero(t).Interface())   // @types int | string
-	newint := reflect.New(t).Interface() // @line rtonew
-	print(newint)                        // @types *int | *string
-	print(newint.(*int))                 // @pointsto <alloc in reflect.New>
-	print(newint.(*string))              // @pointsto <alloc in reflect.New>
-}
-
-func reflectTypeElem() {
-	print(reflect.Zero(reflect.TypeOf(&a).Elem()).Interface())                       // @types int
-	print(reflect.Zero(reflect.TypeOf([]string{}).Elem()).Interface())               // @types string
-	print(reflect.Zero(reflect.TypeOf(make(chan bool)).Elem()).Interface())          // @types bool
-	print(reflect.Zero(reflect.TypeOf(make(map[string]float64)).Elem()).Interface()) // @types float64
-	print(reflect.Zero(reflect.TypeOf([3]complex64{}).Elem()).Interface())           // @types complex64
-	print(reflect.Zero(reflect.TypeOf(3).Elem()).Interface())                        // @types
-	print(reflect.Zero(reflect.TypeOf(new(interface{})).Elem()))                     // @types interface{}
-	print(reflect.Zero(reflect.TypeOf(new(interface{})).Elem()).Interface())         // @types
-}
-
-// reflect.Values within reflect.Values.
-func metareflection() {
-	// "box" a *int twice, unbox it twice.
-	v0 := reflect.ValueOf(&a)
-	print(v0)                              // @types *int
-	v1 := reflect.ValueOf(v0)              // box
-	print(v1)                              // @types reflect.Value
-	v2 := reflect.ValueOf(v1)              // box
-	print(v2)                              // @types reflect.Value
-	v1a := v2.Interface().(reflect.Value)  // unbox
-	print(v1a)                             // @types reflect.Value
-	v0a := v1a.Interface().(reflect.Value) // unbox
-	print(v0a)                             // @types *int
-	print(v0a.Interface().(*int))          // @pointsto main.a
-
-	// "box" an interface{} lvalue twice, unbox it twice.
-	var iface interface{} = 3
-	x0 := reflect.ValueOf(&iface).Elem()
-	print(x0)                              // @types interface{}
-	x1 := reflect.ValueOf(x0)              // box
-	print(x1)                              // @types reflect.Value
-	x2 := reflect.ValueOf(x1)              // box
-	print(x2)                              // @types reflect.Value
-	x1a := x2.Interface().(reflect.Value)  // unbox
-	print(x1a)                             // @types reflect.Value
-	x0a := x1a.Interface().(reflect.Value) // unbox
-	print(x0a)                             // @types interface{}
-	print(x0a.Interface())                 // @types int
-}
-
-type T struct{}
-
-// When the output of a type constructor flows to its input, we must
-// bound the set of types created to ensure termination of the algorithm.
-func typeCycle() {
-	t := reflect.TypeOf(0)
-	u := reflect.TypeOf("")
-	v := reflect.TypeOf(T{})
-	for unknown {
-		t = reflect.PtrTo(t)
-		t = reflect.SliceOf(t)
-
-		u = reflect.SliceOf(u)
-
-		if unknown {
-			v = reflect.ChanOf(reflect.BothDir, v)
-		} else {
-			v = reflect.PtrTo(v)
-		}
-	}
-
-	// Type height is bounded to about 4 map/slice/chan/pointer constructors.
-	print(reflect.Zero(t).Interface()) // @types int | []*int | []*[]*int
-	print(reflect.Zero(u).Interface()) // @types string | []string | [][]string | [][][]string | [][][][]string
-	print(reflect.Zero(v).Interface()) // @types T | *T | **T | ***T | ****T | chan T | *chan T | **chan T | chan *T | *chan *T | chan **T | chan ***T | chan chan T | chan *chan T | chan chan *T
-}
-
-func main() {
-	reflectIndirect()
-	reflectNewAt()
-	reflectTypeOf()
-	reflectTypeElem()
-	metareflection()
-	typeCycle()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/rtti.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/rtti.go
deleted file mode 100644
index 88e1798d00..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/rtti.go
+++ /dev/null
@@ -1,29 +0,0 @@
-package main
-
-// Regression test for guru crash
-// https://code.google.com/p/go/issues/detail?id=6605
-//
-// Using reflection, methods may be called on types that are not the
-// operand of any ssa.MakeInterface instruction.  In this example,
-// (Y).F is called by deriving the type Y from *Y.  Prior to the fix,
-// no RTTI (or method set) for type Y was included in the program, so
-// the F() call would crash.
-
-import "reflect"
-
-var a int
-
-type X struct{}
-
-func (X) F() *int {
-	return &a
-}
-
-type I interface {
-	F() *int
-}
-
-func main() {
-	type Y struct{ X }
-	print(reflect.Indirect(reflect.ValueOf(new(Y))).Interface().(I).F()) // @pointsto main.a
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/structreflect.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/structreflect.go
deleted file mode 100644
index 9fb49f5590..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/structreflect.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// +build ignore
-
-package main
-
-import "reflect"
-
-type A struct {
-	f *int
-	g interface{}
-	h bool
-}
-
-var dyn string
-
-func reflectTypeFieldByName() {
-	f, _ := reflect.TypeOf(A{}).FieldByName("f")
-	print(f.Type) // @pointsto *int
-
-	g, _ := reflect.TypeOf(A{}).FieldByName("g")
-	print(g.Type)               // @pointsto interface{}
-	print(reflect.Zero(g.Type)) // @pointsto <alloc in reflect.Zero>
-	print(reflect.Zero(g.Type)) // @types interface{}
-
-	print(reflect.Zero(g.Type).Interface()) // @pointsto
-	print(reflect.Zero(g.Type).Interface()) // @types
-
-	h, _ := reflect.TypeOf(A{}).FieldByName("h")
-	print(h.Type) // @pointsto bool
-
-	missing, _ := reflect.TypeOf(A{}).FieldByName("missing")
-	print(missing.Type) // @pointsto
-
-	dyn, _ := reflect.TypeOf(A{}).FieldByName(dyn)
-	print(dyn.Type) // @pointsto *int | bool | interface{}
-}
-
-func reflectTypeField() {
-	fld := reflect.TypeOf(A{}).Field(0)
-	print(fld.Type) // @pointsto *int | bool | interface{}
-}
-
-func main() {
-	reflectTypeFieldByName()
-	reflectTypeField()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/structs.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/structs.go
deleted file mode 100644
index 9036d608db..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/structs.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// +build ignore
-
-package main
-
-var unknown bool // defeat dead-code elimination
-
-var p, q int
-
-type A struct {
-	f *int
-	g interface{}
-}
-
-func (a A) m1() {
-	print(a.f) // @pointsto main.p
-}
-
-func (a *A) m2() {
-	print(a)   // @pointsto complit.A@struct1s:9
-	print(a.f) // @pointsto main.p
-}
-
-type B struct {
-	h *int
-	A
-}
-
-func structs1() {
-	b := &B{ // @line struct1s
-		h: &q,
-	}
-	b.f = &p
-	b.g = b
-
-	print(b.h) // @pointsto main.q
-	print(b.f) // @pointsto main.p
-	print(b.g) // @types *B
-
-	ptr := &b.f
-	print(*ptr) // @pointsto main.p
-
-	b.m1()
-	b.m2()
-}
-
-// @calls main.structs1 -> (main.A).m1
-// @calls main.structs1 -> (*main.A).m2
-// @calls (*main.B).m1 -> (main.A).m1
-// @calls (*main.B).m2 -> (*main.A).m2
-
-type T struct {
-	x int
-	y int
-}
-
-type S struct {
-	a [3]T
-	b *[3]T
-	c [3]*T
-}
-
-func structs2() {
-	var s S          // @line s2s
-	print(&s)        // @pointsto s@s2s:6
-	print(&s.a)      // @pointsto s.a@s2s:6
-	print(&s.a[0])   // @pointsto s.a[*]@s2s:6
-	print(&s.a[0].x) // @pointsto s.a[*].x@s2s:6
-	print(&s.a[0].y) // @pointsto s.a[*].y@s2s:6
-	print(&s.b)      // @pointsto s.b@s2s:6
-	print(&s.b[0])   // @pointsto
-	print(&s.b[0].x) // @pointsto
-	print(&s.b[0].y) // @pointsto
-	print(&s.c)      // @pointsto s.c@s2s:6
-	print(&s.c[0])   // @pointsto s.c[*]@s2s:6
-	print(&s.c[0].x) // @pointsto
-	print(&s.c[0].y) // @pointsto
-
-	var s2 S          // @line s2s2
-	s2.b = new([3]T)  // @line s2s2b
-	print(s2.b)       // @pointsto new@s2s2b:12
-	print(&s2.b)      // @pointsto s2.b@s2s2:6
-	print(&s2.b[0])   // @pointsto new[*]@s2s2b:12
-	print(&s2.b[0].x) // @pointsto new[*].x@s2s2b:12
-	print(&s2.b[0].y) // @pointsto new[*].y@s2s2b:12
-	print(&s2.c[0].x) // @pointsto
-	print(&s2.c[0].y) // @pointsto
-
-	var s3 S          // @line s2s3
-	s3.c[2] = new(T)  // @line s2s3c
-	print(&s3.c)      // @pointsto s3.c@s2s3:6
-	print(s3.c[1])    // @pointsto new@s2s3c:15
-	print(&s3.c[1])   // @pointsto s3.c[*]@s2s3:6
-	print(&s3.c[1].x) // @pointsto new.x@s2s3c:15
-	print(&s3.c[1].y) // @pointsto new.y@s2s3c:15
-}
-
-func main() {
-	structs1()
-	structs2()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/testdata/timer.go b/installer/vendor/golang.org/x/tools/go/pointer/testdata/timer.go
deleted file mode 100644
index 465d0813a1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/testdata/timer.go
+++ /dev/null
@@ -1,24 +0,0 @@
-// +build ignore
-
-package main
-
-import "time"
-
-func after() {}
-
-func main() {
-	// @calls time.startTimer -> time.sendTime
-	ticker := time.NewTicker(1)
-	<-ticker.C
-
-	// @calls time.startTimer -> time.sendTime
-	timer := time.NewTimer(time.Second)
-	<-timer.C
-
-	// @calls time.startTimer -> time.goFunc
-	// @calls time.goFunc -> main.after
-	timer = time.AfterFunc(time.Second, after)
-	<-timer.C
-}
-
-// @calls time.sendTime -> time.Now
diff --git a/installer/vendor/golang.org/x/tools/go/pointer/util.go b/installer/vendor/golang.org/x/tools/go/pointer/util.go
deleted file mode 100644
index 683fddddcf..0000000000
--- a/installer/vendor/golang.org/x/tools/go/pointer/util.go
+++ /dev/null
@@ -1,313 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package pointer
-
-import (
-	"bytes"
-	"fmt"
-	"go/types"
-	"log"
-	"os"
-	"os/exec"
-	"runtime"
-	"time"
-
-	"golang.org/x/tools/container/intsets"
-)
-
-// CanPoint reports whether the type T is pointerlike,
-// for the purposes of this analysis.
-func CanPoint(T types.Type) bool {
-	switch T := T.(type) {
-	case *types.Named:
-		if obj := T.Obj(); obj.Name() == "Value" && obj.Pkg().Path() == "reflect" {
-			return true // treat reflect.Value like interface{}
-		}
-		return CanPoint(T.Underlying())
-	case *types.Pointer, *types.Interface, *types.Map, *types.Chan, *types.Signature, *types.Slice:
-		return true
-	}
-
-	return false // array struct tuple builtin basic
-}
-
-// CanHaveDynamicTypes reports whether the type T can "hold" dynamic types,
-// i.e. is an interface (incl. reflect.Type) or a reflect.Value.
-//
-func CanHaveDynamicTypes(T types.Type) bool {
-	switch T := T.(type) {
-	case *types.Named:
-		if obj := T.Obj(); obj.Name() == "Value" && obj.Pkg().Path() == "reflect" {
-			return true // reflect.Value
-		}
-		return CanHaveDynamicTypes(T.Underlying())
-	case *types.Interface:
-		return true
-	}
-	return false
-}
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
-
-// mustDeref returns the element type of its argument, which must be a
-// pointer; panic ensues otherwise.
-func mustDeref(typ types.Type) types.Type {
-	return typ.Underlying().(*types.Pointer).Elem()
-}
-
-// deref returns a pointer's element type; otherwise it returns typ.
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
-
-// A fieldInfo describes one subelement (node) of the flattening-out
-// of a type T: the subelement's type and its path from the root of T.
-//
-// For example, for this type:
-//     type line struct{ points []struct{x, y int} }
-// flatten() of the inner struct yields the following []fieldInfo:
-//    struct{ x, y int }                      ""
-//    int                                     ".x"
-//    int                                     ".y"
-// and flatten(line) yields:
-//    struct{ points []struct{x, y int} }     ""
-//    struct{ x, y int }                      ".points[*]"
-//    int                                     ".points[*].x
-//    int                                     ".points[*].y"
-//
-type fieldInfo struct {
-	typ types.Type
-
-	// op and tail describe the path to the element (e.g. ".a#2.b[*].c").
-	op   interface{} // *Array: true; *Tuple: int; *Struct: *types.Var; *Named: nil
-	tail *fieldInfo
-}
-
-// path returns a user-friendly string describing the subelement path.
-//
-func (fi *fieldInfo) path() string {
-	var buf bytes.Buffer
-	for p := fi; p != nil; p = p.tail {
-		switch op := p.op.(type) {
-		case bool:
-			fmt.Fprintf(&buf, "[*]")
-		case int:
-			fmt.Fprintf(&buf, "#%d", op)
-		case *types.Var:
-			fmt.Fprintf(&buf, ".%s", op.Name())
-		}
-	}
-	return buf.String()
-}
-
-// flatten returns a list of directly contained fields in the preorder
-// traversal of the type tree of t.  The resulting elements are all
-// scalars (basic types or pointerlike types), except for struct/array
-// "identity" nodes, whose type is that of the aggregate.
-//
-// reflect.Value is considered pointerlike, similar to interface{}.
-//
-// Callers must not mutate the result.
-//
-func (a *analysis) flatten(t types.Type) []*fieldInfo {
-	fl, ok := a.flattenMemo[t]
-	if !ok {
-		switch t := t.(type) {
-		case *types.Named:
-			u := t.Underlying()
-			if isInterface(u) {
-				// Debuggability hack: don't remove
-				// the named type from interfaces as
-				// they're very verbose.
-				fl = append(fl, &fieldInfo{typ: t})
-			} else {
-				fl = a.flatten(u)
-			}
-
-		case *types.Basic,
-			*types.Signature,
-			*types.Chan,
-			*types.Map,
-			*types.Interface,
-			*types.Slice,
-			*types.Pointer:
-			fl = append(fl, &fieldInfo{typ: t})
-
-		case *types.Array:
-			fl = append(fl, &fieldInfo{typ: t}) // identity node
-			for _, fi := range a.flatten(t.Elem()) {
-				fl = append(fl, &fieldInfo{typ: fi.typ, op: true, tail: fi})
-			}
-
-		case *types.Struct:
-			fl = append(fl, &fieldInfo{typ: t}) // identity node
-			for i, n := 0, t.NumFields(); i < n; i++ {
-				f := t.Field(i)
-				for _, fi := range a.flatten(f.Type()) {
-					fl = append(fl, &fieldInfo{typ: fi.typ, op: f, tail: fi})
-				}
-			}
-
-		case *types.Tuple:
-			// No identity node: tuples are never address-taken.
-			n := t.Len()
-			if n == 1 {
-				// Don't add a fieldInfo link for singletons,
-				// e.g. in params/results.
-				fl = append(fl, a.flatten(t.At(0).Type())...)
-			} else {
-				for i := 0; i < n; i++ {
-					f := t.At(i)
-					for _, fi := range a.flatten(f.Type()) {
-						fl = append(fl, &fieldInfo{typ: fi.typ, op: i, tail: fi})
-					}
-				}
-			}
-
-		default:
-			panic(fmt.Sprintf("cannot flatten unsupported type %T", t))
-		}
-
-		a.flattenMemo[t] = fl
-	}
-
-	return fl
-}
-
-// sizeof returns the number of pointerlike abstractions (nodes) in the type t.
-func (a *analysis) sizeof(t types.Type) uint32 {
-	return uint32(len(a.flatten(t)))
-}
-
-// shouldTrack reports whether object type T contains (recursively)
-// any fields whose addresses should be tracked.
-func (a *analysis) shouldTrack(T types.Type) bool {
-	if a.track == trackAll {
-		return true // fast path
-	}
-	track, ok := a.trackTypes[T]
-	if !ok {
-		a.trackTypes[T] = true // break cycles conservatively
-		// NB: reflect.Value, reflect.Type are pre-populated to true.
-		for _, fi := range a.flatten(T) {
-			switch ft := fi.typ.Underlying().(type) {
-			case *types.Interface, *types.Signature:
-				track = true // needed for callgraph
-			case *types.Basic:
-				// no-op
-			case *types.Chan:
-				track = a.track&trackChan != 0 || a.shouldTrack(ft.Elem())
-			case *types.Map:
-				track = a.track&trackMap != 0 || a.shouldTrack(ft.Key()) || a.shouldTrack(ft.Elem())
-			case *types.Slice:
-				track = a.track&trackSlice != 0 || a.shouldTrack(ft.Elem())
-			case *types.Pointer:
-				track = a.track&trackPtr != 0 || a.shouldTrack(ft.Elem())
-			case *types.Array, *types.Struct:
-				// No need to look at field types since they will follow (flattened).
-			default:
-				// Includes *types.Tuple, which are never address-taken.
-				panic(ft)
-			}
-			if track {
-				break
-			}
-		}
-		a.trackTypes[T] = track
-		if !track && a.log != nil {
-			fmt.Fprintf(a.log, "\ttype not tracked: %s\n", T)
-		}
-	}
-	return track
-}
-
-// offsetOf returns the (abstract) offset of field index within struct
-// or tuple typ.
-func (a *analysis) offsetOf(typ types.Type, index int) uint32 {
-	var offset uint32
-	switch t := typ.Underlying().(type) {
-	case *types.Tuple:
-		for i := 0; i < index; i++ {
-			offset += a.sizeof(t.At(i).Type())
-		}
-	case *types.Struct:
-		offset++ // the node for the struct itself
-		for i := 0; i < index; i++ {
-			offset += a.sizeof(t.Field(i).Type())
-		}
-	default:
-		panic(fmt.Sprintf("offsetOf(%s : %T)", typ, typ))
-	}
-	return offset
-}
-
-// sliceToArray returns the type representing the arrays to which
-// slice type slice points.
-func sliceToArray(slice types.Type) *types.Array {
-	return types.NewArray(slice.Underlying().(*types.Slice).Elem(), 1)
-}
-
-// Node set -------------------------------------------------------------------
-
-type nodeset struct {
-	intsets.Sparse
-}
-
-func (ns *nodeset) String() string {
-	var buf bytes.Buffer
-	buf.WriteRune('{')
-	var space [50]int
-	for i, n := range ns.AppendTo(space[:0]) {
-		if i > 0 {
-			buf.WriteString(", ")
-		}
-		buf.WriteRune('n')
-		fmt.Fprintf(&buf, "%d", n)
-	}
-	buf.WriteRune('}')
-	return buf.String()
-}
-
-func (ns *nodeset) add(n nodeid) bool {
-	return ns.Sparse.Insert(int(n))
-}
-
-func (x *nodeset) addAll(y *nodeset) bool {
-	return x.UnionWith(&y.Sparse)
-}
-
-// Profiling & debugging -------------------------------------------------------
-
-var timers = make(map[string]time.Time)
-
-func start(name string) {
-	if debugTimers {
-		timers[name] = time.Now()
-		log.Printf("%s...\n", name)
-	}
-}
-
-func stop(name string) {
-	if debugTimers {
-		log.Printf("%s took %s\n", name, time.Since(timers[name]))
-	}
-}
-
-// diff runs the command "diff a b" and reports its success.
-func diff(a, b string) bool {
-	var cmd *exec.Cmd
-	switch runtime.GOOS {
-	case "plan9":
-		cmd = exec.Command("/bin/diff", "-c", a, b)
-	default:
-		cmd = exec.Command("/usr/bin/diff", "-u", a, b)
-	}
-	cmd.Stdout = os.Stderr
-	cmd.Stderr = os.Stderr
-	return cmd.Run() == nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/blockopt.go b/installer/vendor/golang.org/x/tools/go/ssa/blockopt.go
deleted file mode 100644
index e79260a21a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/blockopt.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// Simple block optimizations to simplify the control flow graph.
-
-// TODO(adonovan): opt: instead of creating several "unreachable" blocks
-// per function in the Builder, reuse a single one (e.g. at Blocks[1])
-// to reduce garbage.
-
-import (
-	"fmt"
-	"os"
-)
-
-// If true, perform sanity checking and show progress at each
-// successive iteration of optimizeBlocks.  Very verbose.
-const debugBlockOpt = false
-
-// markReachable sets Index=-1 for all blocks reachable from b.
-func markReachable(b *BasicBlock) {
-	b.Index = -1
-	for _, succ := range b.Succs {
-		if succ.Index == 0 {
-			markReachable(succ)
-		}
-	}
-}
-
-// deleteUnreachableBlocks marks all reachable blocks of f and
-// eliminates (nils) all others, including possibly cyclic subgraphs.
-//
-func deleteUnreachableBlocks(f *Function) {
-	const white, black = 0, -1
-	// We borrow b.Index temporarily as the mark bit.
-	for _, b := range f.Blocks {
-		b.Index = white
-	}
-	markReachable(f.Blocks[0])
-	if f.Recover != nil {
-		markReachable(f.Recover)
-	}
-	for i, b := range f.Blocks {
-		if b.Index == white {
-			for _, c := range b.Succs {
-				if c.Index == black {
-					c.removePred(b) // delete white->black edge
-				}
-			}
-			if debugBlockOpt {
-				fmt.Fprintln(os.Stderr, "unreachable", b)
-			}
-			f.Blocks[i] = nil // delete b
-		}
-	}
-	f.removeNilBlocks()
-}
-
-// jumpThreading attempts to apply simple jump-threading to block b,
-// in which a->b->c become a->c if b is just a Jump.
-// The result is true if the optimization was applied.
-//
-func jumpThreading(f *Function, b *BasicBlock) bool {
-	if b.Index == 0 {
-		return false // don't apply to entry block
-	}
-	if b.Instrs == nil {
-		return false
-	}
-	if _, ok := b.Instrs[0].(*Jump); !ok {
-		return false // not just a jump
-	}
-	c := b.Succs[0]
-	if c == b {
-		return false // don't apply to degenerate jump-to-self.
-	}
-	if c.hasPhi() {
-		return false // not sound without more effort
-	}
-	for j, a := range b.Preds {
-		a.replaceSucc(b, c)
-
-		// If a now has two edges to c, replace its degenerate If by Jump.
-		if len(a.Succs) == 2 && a.Succs[0] == c && a.Succs[1] == c {
-			jump := new(Jump)
-			jump.setBlock(a)
-			a.Instrs[len(a.Instrs)-1] = jump
-			a.Succs = a.Succs[:1]
-			c.removePred(b)
-		} else {
-			if j == 0 {
-				c.replacePred(b, a)
-			} else {
-				c.Preds = append(c.Preds, a)
-			}
-		}
-
-		if debugBlockOpt {
-			fmt.Fprintln(os.Stderr, "jumpThreading", a, b, c)
-		}
-	}
-	f.Blocks[b.Index] = nil // delete b
-	return true
-}
-
-// fuseBlocks attempts to apply the block fusion optimization to block
-// a, in which a->b becomes ab if len(a.Succs)==len(b.Preds)==1.
-// The result is true if the optimization was applied.
-//
-func fuseBlocks(f *Function, a *BasicBlock) bool {
-	if len(a.Succs) != 1 {
-		return false
-	}
-	b := a.Succs[0]
-	if len(b.Preds) != 1 {
-		return false
-	}
-
-	// Degenerate &&/|| ops may result in a straight-line CFG
-	// containing φ-nodes. (Ideally we'd replace such them with
-	// their sole operand but that requires Referrers, built later.)
-	if b.hasPhi() {
-		return false // not sound without further effort
-	}
-
-	// Eliminate jump at end of A, then copy all of B across.
-	a.Instrs = append(a.Instrs[:len(a.Instrs)-1], b.Instrs...)
-	for _, instr := range b.Instrs {
-		instr.setBlock(a)
-	}
-
-	// A inherits B's successors
-	a.Succs = append(a.succs2[:0], b.Succs...)
-
-	// Fix up Preds links of all successors of B.
-	for _, c := range b.Succs {
-		c.replacePred(b, a)
-	}
-
-	if debugBlockOpt {
-		fmt.Fprintln(os.Stderr, "fuseBlocks", a, b)
-	}
-
-	f.Blocks[b.Index] = nil // delete b
-	return true
-}
-
-// optimizeBlocks() performs some simple block optimizations on a
-// completed function: dead block elimination, block fusion, jump
-// threading.
-//
-func optimizeBlocks(f *Function) {
-	deleteUnreachableBlocks(f)
-
-	// Loop until no further progress.
-	changed := true
-	for changed {
-		changed = false
-
-		if debugBlockOpt {
-			f.WriteTo(os.Stderr)
-			mustSanityCheck(f, nil)
-		}
-
-		for _, b := range f.Blocks {
-			// f.Blocks will temporarily contain nils to indicate
-			// deleted blocks; we remove them at the end.
-			if b == nil {
-				continue
-			}
-
-			// Fuse blocks.  b->c becomes bc.
-			if fuseBlocks(f, b) {
-				changed = true
-			}
-
-			// a->b->c becomes a->c if b contains only a Jump.
-			if jumpThreading(f, b) {
-				changed = true
-				continue // (b was disconnected)
-			}
-		}
-	}
-	f.removeNilBlocks()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/builder.go b/installer/vendor/golang.org/x/tools/go/ssa/builder.go
deleted file mode 100644
index 9390c398fe..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/builder.go
+++ /dev/null
@@ -1,2379 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file implements the BUILD phase of SSA construction.
-//
-// SSA construction has two phases, CREATE and BUILD.  In the CREATE phase
-// (create.go), all packages are constructed and type-checked and
-// definitions of all package members are created, method-sets are
-// computed, and wrapper methods are synthesized.
-// ssa.Packages are created in arbitrary order.
-//
-// In the BUILD phase (builder.go), the builder traverses the AST of
-// each Go source function and generates SSA instructions for the
-// function body.  Initializer expressions for package-level variables
-// are emitted to the package's init() function in the order specified
-// by go/types.Info.InitOrder, then code for each function in the
-// package is generated in lexical order.
-// The BUILD phases for distinct packages are independent and are
-// executed in parallel.
-//
-// TODO(adonovan): indeed, building functions is now embarrassingly parallel.
-// Audit for concurrency then benchmark using more goroutines.
-//
-// The builder's and Program's indices (maps) are populated and
-// mutated during the CREATE phase, but during the BUILD phase they
-// remain constant.  The sole exception is Prog.methodSets and its
-// related maps, which are protected by a dedicated mutex.
-
-import (
-	"fmt"
-	"go/ast"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"os"
-	"sync"
-)
-
-type opaqueType struct {
-	types.Type
-	name string
-}
-
-func (t *opaqueType) String() string { return t.name }
-
-var (
-	varOk    = newVar("ok", tBool)
-	varIndex = newVar("index", tInt)
-
-	// Type constants.
-	tBool       = types.Typ[types.Bool]
-	tByte       = types.Typ[types.Byte]
-	tInt        = types.Typ[types.Int]
-	tInvalid    = types.Typ[types.Invalid]
-	tString     = types.Typ[types.String]
-	tUntypedNil = types.Typ[types.UntypedNil]
-	tRangeIter  = &opaqueType{nil, "iter"} // the type of all "range" iterators
-	tEface      = new(types.Interface)
-
-	// SSA Value constants.
-	vZero = intConst(0)
-	vOne  = intConst(1)
-	vTrue = NewConst(exact.MakeBool(true), tBool)
-)
-
-// builder holds state associated with the package currently being built.
-// Its methods contain all the logic for AST-to-SSA conversion.
-type builder struct{}
-
-// cond emits to fn code to evaluate boolean condition e and jump
-// to t or f depending on its value, performing various simplifications.
-//
-// Postcondition: fn.currentBlock is nil.
-//
-func (b *builder) cond(fn *Function, e ast.Expr, t, f *BasicBlock) {
-	switch e := e.(type) {
-	case *ast.ParenExpr:
-		b.cond(fn, e.X, t, f)
-		return
-
-	case *ast.BinaryExpr:
-		switch e.Op {
-		case token.LAND:
-			ltrue := fn.newBasicBlock("cond.true")
-			b.cond(fn, e.X, ltrue, f)
-			fn.currentBlock = ltrue
-			b.cond(fn, e.Y, t, f)
-			return
-
-		case token.LOR:
-			lfalse := fn.newBasicBlock("cond.false")
-			b.cond(fn, e.X, t, lfalse)
-			fn.currentBlock = lfalse
-			b.cond(fn, e.Y, t, f)
-			return
-		}
-
-	case *ast.UnaryExpr:
-		if e.Op == token.NOT {
-			b.cond(fn, e.X, f, t)
-			return
-		}
-	}
-
-	// A traditional compiler would simplify "if false" (etc) here
-	// but we do not, for better fidelity to the source code.
-	//
-	// The value of a constant condition may be platform-specific,
-	// and may cause blocks that are reachable in some configuration
-	// to be hidden from subsequent analyses such as bug-finding tools.
-	emitIf(fn, b.expr(fn, e), t, f)
-}
-
-// logicalBinop emits code to fn to evaluate e, a &&- or
-// ||-expression whose reified boolean value is wanted.
-// The value is returned.
-//
-func (b *builder) logicalBinop(fn *Function, e *ast.BinaryExpr) Value {
-	rhs := fn.newBasicBlock("binop.rhs")
-	done := fn.newBasicBlock("binop.done")
-
-	// T(e) = T(e.X) = T(e.Y) after untyped constants have been
-	// eliminated.
-	// TODO(adonovan): not true; MyBool==MyBool yields UntypedBool.
-	t := fn.Pkg.typeOf(e)
-
-	var short Value // value of the short-circuit path
-	switch e.Op {
-	case token.LAND:
-		b.cond(fn, e.X, rhs, done)
-		short = NewConst(exact.MakeBool(false), t)
-
-	case token.LOR:
-		b.cond(fn, e.X, done, rhs)
-		short = NewConst(exact.MakeBool(true), t)
-	}
-
-	// Is rhs unreachable?
-	if rhs.Preds == nil {
-		// Simplify false&&y to false, true||y to true.
-		fn.currentBlock = done
-		return short
-	}
-
-	// Is done unreachable?
-	if done.Preds == nil {
-		// Simplify true&&y (or false||y) to y.
-		fn.currentBlock = rhs
-		return b.expr(fn, e.Y)
-	}
-
-	// All edges from e.X to done carry the short-circuit value.
-	var edges []Value
-	for range done.Preds {
-		edges = append(edges, short)
-	}
-
-	// The edge from e.Y to done carries the value of e.Y.
-	fn.currentBlock = rhs
-	edges = append(edges, b.expr(fn, e.Y))
-	emitJump(fn, done)
-	fn.currentBlock = done
-
-	phi := &Phi{Edges: edges, Comment: e.Op.String()}
-	phi.pos = e.OpPos
-	phi.typ = t
-	return done.emit(phi)
-}
-
-// exprN lowers a multi-result expression e to SSA form, emitting code
-// to fn and returning a single Value whose type is a *types.Tuple.
-// The caller must access the components via Extract.
-//
-// Multi-result expressions include CallExprs in a multi-value
-// assignment or return statement, and "value,ok" uses of
-// TypeAssertExpr, IndexExpr (when X is a map), and UnaryExpr (when Op
-// is token.ARROW).
-//
-func (b *builder) exprN(fn *Function, e ast.Expr) Value {
-	typ := fn.Pkg.typeOf(e).(*types.Tuple)
-	switch e := e.(type) {
-	case *ast.ParenExpr:
-		return b.exprN(fn, e.X)
-
-	case *ast.CallExpr:
-		// Currently, no built-in function nor type conversion
-		// has multiple results, so we can avoid some of the
-		// cases for single-valued CallExpr.
-		var c Call
-		b.setCall(fn, e, &c.Call)
-		c.typ = typ
-		return fn.emit(&c)
-
-	case *ast.IndexExpr:
-		mapt := fn.Pkg.typeOf(e.X).Underlying().(*types.Map)
-		lookup := &Lookup{
-			X:       b.expr(fn, e.X),
-			Index:   emitConv(fn, b.expr(fn, e.Index), mapt.Key()),
-			CommaOk: true,
-		}
-		lookup.setType(typ)
-		lookup.setPos(e.Lbrack)
-		return fn.emit(lookup)
-
-	case *ast.TypeAssertExpr:
-		return emitTypeTest(fn, b.expr(fn, e.X), typ.At(0).Type(), e.Lparen)
-
-	case *ast.UnaryExpr: // must be receive <-
-		unop := &UnOp{
-			Op:      token.ARROW,
-			X:       b.expr(fn, e.X),
-			CommaOk: true,
-		}
-		unop.setType(typ)
-		unop.setPos(e.OpPos)
-		return fn.emit(unop)
-	}
-	panic(fmt.Sprintf("exprN(%T) in %s", e, fn))
-}
-
-// builtin emits to fn SSA instructions to implement a call to the
-// built-in function obj with the specified arguments
-// and return type.  It returns the value defined by the result.
-//
-// The result is nil if no special handling was required; in this case
-// the caller should treat this like an ordinary library function
-// call.
-//
-func (b *builder) builtin(fn *Function, obj *types.Builtin, args []ast.Expr, typ types.Type, pos token.Pos) Value {
-	switch obj.Name() {
-	case "make":
-		switch typ.Underlying().(type) {
-		case *types.Slice:
-			n := b.expr(fn, args[1])
-			m := n
-			if len(args) == 3 {
-				m = b.expr(fn, args[2])
-			}
-			if m, ok := m.(*Const); ok {
-				// treat make([]T, n, m) as new([m]T)[:n]
-				cap := m.Int64()
-				at := types.NewArray(typ.Underlying().(*types.Slice).Elem(), cap)
-				alloc := emitNew(fn, at, pos)
-				alloc.Comment = "makeslice"
-				v := &Slice{
-					X:    alloc,
-					High: n,
-				}
-				v.setPos(pos)
-				v.setType(typ)
-				return fn.emit(v)
-			}
-			v := &MakeSlice{
-				Len: n,
-				Cap: m,
-			}
-			v.setPos(pos)
-			v.setType(typ)
-			return fn.emit(v)
-
-		case *types.Map:
-			var res Value
-			if len(args) == 2 {
-				res = b.expr(fn, args[1])
-			}
-			v := &MakeMap{Reserve: res}
-			v.setPos(pos)
-			v.setType(typ)
-			return fn.emit(v)
-
-		case *types.Chan:
-			var sz Value = vZero
-			if len(args) == 2 {
-				sz = b.expr(fn, args[1])
-			}
-			v := &MakeChan{Size: sz}
-			v.setPos(pos)
-			v.setType(typ)
-			return fn.emit(v)
-		}
-
-	case "new":
-		alloc := emitNew(fn, deref(typ), pos)
-		alloc.Comment = "new"
-		return alloc
-
-	case "len", "cap":
-		// Special case: len or cap of an array or *array is
-		// based on the type, not the value which may be nil.
-		// We must still evaluate the value, though.  (If it
-		// was side-effect free, the whole call would have
-		// been constant-folded.)
-		t := deref(fn.Pkg.typeOf(args[0])).Underlying()
-		if at, ok := t.(*types.Array); ok {
-			b.expr(fn, args[0]) // for effects only
-			return intConst(at.Len())
-		}
-		// Otherwise treat as normal.
-
-	case "panic":
-		fn.emit(&Panic{
-			X:   emitConv(fn, b.expr(fn, args[0]), tEface),
-			pos: pos,
-		})
-		fn.currentBlock = fn.newBasicBlock("unreachable")
-		return vTrue // any non-nil Value will do
-	}
-	return nil // treat all others as a regular function call
-}
-
-// addr lowers a single-result addressable expression e to SSA form,
-// emitting code to fn and returning the location (an lvalue) defined
-// by the expression.
-//
-// If escaping is true, addr marks the base variable of the
-// addressable expression e as being a potentially escaping pointer
-// value.  For example, in this code:
-//
-//   a := A{
-//     b: [1]B{B{c: 1}}
-//   }
-//   return &a.b[0].c
-//
-// the application of & causes a.b[0].c to have its address taken,
-// which means that ultimately the local variable a must be
-// heap-allocated.  This is a simple but very conservative escape
-// analysis.
-//
-// Operations forming potentially escaping pointers include:
-// - &x, including when implicit in method call or composite literals.
-// - a[:] iff a is an array (not *array)
-// - references to variables in lexically enclosing functions.
-//
-func (b *builder) addr(fn *Function, e ast.Expr, escaping bool) lvalue {
-	switch e := e.(type) {
-	case *ast.Ident:
-		if isBlankIdent(e) {
-			return blank{}
-		}
-		obj := fn.Pkg.objectOf(e)
-		v := fn.Prog.packageLevelValue(obj) // var (address)
-		if v == nil {
-			v = fn.lookup(obj, escaping)
-		}
-		return &address{addr: v, pos: e.Pos(), expr: e}
-
-	case *ast.CompositeLit:
-		t := deref(fn.Pkg.typeOf(e))
-		var v *Alloc
-		if escaping {
-			v = emitNew(fn, t, e.Lbrace)
-		} else {
-			v = fn.addLocal(t, e.Lbrace)
-		}
-		v.Comment = "complit"
-		var sb storebuf
-		b.compLit(fn, v, e, true, &sb)
-		sb.emit(fn)
-		return &address{addr: v, pos: e.Lbrace, expr: e}
-
-	case *ast.ParenExpr:
-		return b.addr(fn, e.X, escaping)
-
-	case *ast.SelectorExpr:
-		sel, ok := fn.Pkg.info.Selections[e]
-		if !ok {
-			// qualified identifier
-			return b.addr(fn, e.Sel, escaping)
-		}
-		if sel.Kind() != types.FieldVal {
-			panic(sel)
-		}
-		wantAddr := true
-		v := b.receiver(fn, e.X, wantAddr, escaping, sel)
-		last := len(sel.Index()) - 1
-		return &address{
-			addr: emitFieldSelection(fn, v, sel.Index()[last], true, e.Sel),
-			pos:  e.Sel.Pos(),
-			expr: e.Sel,
-		}
-
-	case *ast.IndexExpr:
-		var x Value
-		var et types.Type
-		switch t := fn.Pkg.typeOf(e.X).Underlying().(type) {
-		case *types.Array:
-			x = b.addr(fn, e.X, escaping).address(fn)
-			et = types.NewPointer(t.Elem())
-		case *types.Pointer: // *array
-			x = b.expr(fn, e.X)
-			et = types.NewPointer(t.Elem().Underlying().(*types.Array).Elem())
-		case *types.Slice:
-			x = b.expr(fn, e.X)
-			et = types.NewPointer(t.Elem())
-		case *types.Map:
-			return &element{
-				m:   b.expr(fn, e.X),
-				k:   emitConv(fn, b.expr(fn, e.Index), t.Key()),
-				t:   t.Elem(),
-				pos: e.Lbrack,
-			}
-		default:
-			panic("unexpected container type in IndexExpr: " + t.String())
-		}
-		v := &IndexAddr{
-			X:     x,
-			Index: emitConv(fn, b.expr(fn, e.Index), tInt),
-		}
-		v.setPos(e.Lbrack)
-		v.setType(et)
-		return &address{addr: fn.emit(v), pos: e.Lbrack, expr: e}
-
-	case *ast.StarExpr:
-		return &address{addr: b.expr(fn, e.X), pos: e.Star, expr: e}
-	}
-
-	panic(fmt.Sprintf("unexpected address expression: %T", e))
-}
-
-type store struct {
-	lhs lvalue
-	rhs Value
-}
-
-type storebuf struct{ stores []store }
-
-func (sb *storebuf) store(lhs lvalue, rhs Value) {
-	sb.stores = append(sb.stores, store{lhs, rhs})
-}
-
-func (sb *storebuf) emit(fn *Function) {
-	for _, s := range sb.stores {
-		s.lhs.store(fn, s.rhs)
-	}
-}
-
-// assign emits to fn code to initialize the lvalue loc with the value
-// of expression e.  If isZero is true, assign assumes that loc holds
-// the zero value for its type.
-//
-// This is equivalent to loc.store(fn, b.expr(fn, e)), but may generate
-// better code in some cases, e.g., for composite literals in an
-// addressable location.
-//
-// If sb is not nil, assign generates code to evaluate expression e, but
-// not to update loc.  Instead, the necessary stores are appended to the
-// storebuf sb so that they can be executed later.  This allows correct
-// in-place update of existing variables when the RHS is a composite
-// literal that may reference parts of the LHS.
-//
-func (b *builder) assign(fn *Function, loc lvalue, e ast.Expr, isZero bool, sb *storebuf) {
-	// Can we initialize it in place?
-	if e, ok := unparen(e).(*ast.CompositeLit); ok {
-		// A CompositeLit never evaluates to a pointer,
-		// so if the type of the location is a pointer,
-		// an &-operation is implied.
-		if _, ok := loc.(blank); !ok { // avoid calling blank.typ()
-			if isPointer(loc.typ()) {
-				ptr := b.addr(fn, e, true).address(fn)
-				// copy address
-				if sb != nil {
-					sb.store(loc, ptr)
-				} else {
-					loc.store(fn, ptr)
-				}
-				return
-			}
-		}
-
-		if _, ok := loc.(*address); ok {
-			if isInterface(loc.typ()) {
-				// e.g. var x interface{} = T{...}
-				// Can't in-place initialize an interface value.
-				// Fall back to copying.
-			} else {
-				// x = T{...} or x := T{...}
-				addr := loc.address(fn)
-				if sb != nil {
-					b.compLit(fn, addr, e, isZero, sb)
-				} else {
-					var sb storebuf
-					b.compLit(fn, addr, e, isZero, &sb)
-					sb.emit(fn)
-				}
-
-				// Subtle: emit debug ref for aggregate types only;
-				// slice and map are handled by store ops in compLit.
-				switch loc.typ().Underlying().(type) {
-				case *types.Struct, *types.Array:
-					emitDebugRef(fn, e, addr, true)
-				}
-
-				return
-			}
-		}
-	}
-
-	// simple case: just copy
-	rhs := b.expr(fn, e)
-	if sb != nil {
-		sb.store(loc, rhs)
-	} else {
-		loc.store(fn, rhs)
-	}
-}
-
-// expr lowers a single-result expression e to SSA form, emitting code
-// to fn and returning the Value defined by the expression.
-//
-func (b *builder) expr(fn *Function, e ast.Expr) Value {
-	e = unparen(e)
-
-	tv := fn.Pkg.info.Types[e]
-
-	// Is expression a constant?
-	if tv.Value != nil {
-		return NewConst(tv.Value, tv.Type)
-	}
-
-	var v Value
-	if tv.Addressable() {
-		// Prefer pointer arithmetic ({Index,Field}Addr) followed
-		// by Load over subelement extraction (e.g. Index, Field),
-		// to avoid large copies.
-		v = b.addr(fn, e, false).load(fn)
-	} else {
-		v = b.expr0(fn, e, tv)
-	}
-	if fn.debugInfo() {
-		emitDebugRef(fn, e, v, false)
-	}
-	return v
-}
-
-func (b *builder) expr0(fn *Function, e ast.Expr, tv types.TypeAndValue) Value {
-	switch e := e.(type) {
-	case *ast.BasicLit:
-		panic("non-constant BasicLit") // unreachable
-
-	case *ast.FuncLit:
-		fn2 := &Function{
-			name:      fmt.Sprintf("%s$%d", fn.Name(), 1+len(fn.AnonFuncs)),
-			Signature: fn.Pkg.typeOf(e.Type).Underlying().(*types.Signature),
-			pos:       e.Type.Func,
-			parent:    fn,
-			Pkg:       fn.Pkg,
-			Prog:      fn.Prog,
-			syntax:    e,
-		}
-		fn.AnonFuncs = append(fn.AnonFuncs, fn2)
-		b.buildFunction(fn2)
-		if fn2.FreeVars == nil {
-			return fn2
-		}
-		v := &MakeClosure{Fn: fn2}
-		v.setType(tv.Type)
-		for _, fv := range fn2.FreeVars {
-			v.Bindings = append(v.Bindings, fv.outer)
-			fv.outer = nil
-		}
-		return fn.emit(v)
-
-	case *ast.TypeAssertExpr: // single-result form only
-		return emitTypeAssert(fn, b.expr(fn, e.X), tv.Type, e.Lparen)
-
-	case *ast.CallExpr:
-		if fn.Pkg.info.Types[e.Fun].IsType() {
-			// Explicit type conversion, e.g. string(x) or big.Int(x)
-			x := b.expr(fn, e.Args[0])
-			y := emitConv(fn, x, tv.Type)
-			if y != x {
-				switch y := y.(type) {
-				case *Convert:
-					y.pos = e.Lparen
-				case *ChangeType:
-					y.pos = e.Lparen
-				case *MakeInterface:
-					y.pos = e.Lparen
-				}
-			}
-			return y
-		}
-		// Call to "intrinsic" built-ins, e.g. new, make, panic.
-		if id, ok := unparen(e.Fun).(*ast.Ident); ok {
-			if obj, ok := fn.Pkg.info.Uses[id].(*types.Builtin); ok {
-				if v := b.builtin(fn, obj, e.Args, tv.Type, e.Lparen); v != nil {
-					return v
-				}
-			}
-		}
-		// Regular function call.
-		var v Call
-		b.setCall(fn, e, &v.Call)
-		v.setType(tv.Type)
-		return fn.emit(&v)
-
-	case *ast.UnaryExpr:
-		switch e.Op {
-		case token.AND: // &X --- potentially escaping.
-			addr := b.addr(fn, e.X, true)
-			if _, ok := unparen(e.X).(*ast.StarExpr); ok {
-				// &*p must panic if p is nil (http://golang.org/s/go12nil).
-				// For simplicity, we'll just (suboptimally) rely
-				// on the side effects of a load.
-				// TODO(adonovan): emit dedicated nilcheck.
-				addr.load(fn)
-			}
-			return addr.address(fn)
-		case token.ADD:
-			return b.expr(fn, e.X)
-		case token.NOT, token.ARROW, token.SUB, token.XOR: // ! <- - ^
-			v := &UnOp{
-				Op: e.Op,
-				X:  b.expr(fn, e.X),
-			}
-			v.setPos(e.OpPos)
-			v.setType(tv.Type)
-			return fn.emit(v)
-		default:
-			panic(e.Op)
-		}
-
-	case *ast.BinaryExpr:
-		switch e.Op {
-		case token.LAND, token.LOR:
-			return b.logicalBinop(fn, e)
-		case token.SHL, token.SHR:
-			fallthrough
-		case token.ADD, token.SUB, token.MUL, token.QUO, token.REM, token.AND, token.OR, token.XOR, token.AND_NOT:
-			return emitArith(fn, e.Op, b.expr(fn, e.X), b.expr(fn, e.Y), tv.Type, e.OpPos)
-
-		case token.EQL, token.NEQ, token.GTR, token.LSS, token.LEQ, token.GEQ:
-			cmp := emitCompare(fn, e.Op, b.expr(fn, e.X), b.expr(fn, e.Y), e.OpPos)
-			// The type of x==y may be UntypedBool.
-			return emitConv(fn, cmp, DefaultType(tv.Type))
-		default:
-			panic("illegal op in BinaryExpr: " + e.Op.String())
-		}
-
-	case *ast.SliceExpr:
-		var low, high, max Value
-		var x Value
-		switch fn.Pkg.typeOf(e.X).Underlying().(type) {
-		case *types.Array:
-			// Potentially escaping.
-			x = b.addr(fn, e.X, true).address(fn)
-		case *types.Basic, *types.Slice, *types.Pointer: // *array
-			x = b.expr(fn, e.X)
-		default:
-			panic("unreachable")
-		}
-		if e.High != nil {
-			high = b.expr(fn, e.High)
-		}
-		if e.Low != nil {
-			low = b.expr(fn, e.Low)
-		}
-		if e.Slice3 {
-			max = b.expr(fn, e.Max)
-		}
-		v := &Slice{
-			X:    x,
-			Low:  low,
-			High: high,
-			Max:  max,
-		}
-		v.setPos(e.Lbrack)
-		v.setType(tv.Type)
-		return fn.emit(v)
-
-	case *ast.Ident:
-		obj := fn.Pkg.info.Uses[e]
-		// Universal built-in or nil?
-		switch obj := obj.(type) {
-		case *types.Builtin:
-			return &Builtin{name: obj.Name(), sig: tv.Type.(*types.Signature)}
-		case *types.Nil:
-			return nilConst(tv.Type)
-		}
-		// Package-level func or var?
-		if v := fn.Prog.packageLevelValue(obj); v != nil {
-			if _, ok := obj.(*types.Var); ok {
-				return emitLoad(fn, v) // var (address)
-			}
-			return v // (func)
-		}
-		// Local var.
-		return emitLoad(fn, fn.lookup(obj, false)) // var (address)
-
-	case *ast.SelectorExpr:
-		sel, ok := fn.Pkg.info.Selections[e]
-		if !ok {
-			// qualified identifier
-			return b.expr(fn, e.Sel)
-		}
-		switch sel.Kind() {
-		case types.MethodExpr:
-			// (*T).f or T.f, the method f from the method-set of type T.
-			// The result is a "thunk".
-			return emitConv(fn, makeThunk(fn.Prog, sel), tv.Type)
-
-		case types.MethodVal:
-			// e.f where e is an expression and f is a method.
-			// The result is a "bound".
-			obj := sel.Obj().(*types.Func)
-			rt := recvType(obj)
-			wantAddr := isPointer(rt)
-			escaping := true
-			v := b.receiver(fn, e.X, wantAddr, escaping, sel)
-			if isInterface(rt) {
-				// If v has interface type I,
-				// we must emit a check that v is non-nil.
-				// We use: typeassert v.(I).
-				emitTypeAssert(fn, v, rt, token.NoPos)
-			}
-			c := &MakeClosure{
-				Fn:       makeBound(fn.Prog, obj),
-				Bindings: []Value{v},
-			}
-			c.setPos(e.Sel.Pos())
-			c.setType(tv.Type)
-			return fn.emit(c)
-
-		case types.FieldVal:
-			indices := sel.Index()
-			last := len(indices) - 1
-			v := b.expr(fn, e.X)
-			v = emitImplicitSelections(fn, v, indices[:last])
-			v = emitFieldSelection(fn, v, indices[last], false, e.Sel)
-			return v
-		}
-
-		panic("unexpected expression-relative selector")
-
-	case *ast.IndexExpr:
-		switch t := fn.Pkg.typeOf(e.X).Underlying().(type) {
-		case *types.Array:
-			// Non-addressable array (in a register).
-			v := &Index{
-				X:     b.expr(fn, e.X),
-				Index: emitConv(fn, b.expr(fn, e.Index), tInt),
-			}
-			v.setPos(e.Lbrack)
-			v.setType(t.Elem())
-			return fn.emit(v)
-
-		case *types.Map:
-			// Maps are not addressable.
-			mapt := fn.Pkg.typeOf(e.X).Underlying().(*types.Map)
-			v := &Lookup{
-				X:     b.expr(fn, e.X),
-				Index: emitConv(fn, b.expr(fn, e.Index), mapt.Key()),
-			}
-			v.setPos(e.Lbrack)
-			v.setType(mapt.Elem())
-			return fn.emit(v)
-
-		case *types.Basic: // => string
-			// Strings are not addressable.
-			v := &Lookup{
-				X:     b.expr(fn, e.X),
-				Index: b.expr(fn, e.Index),
-			}
-			v.setPos(e.Lbrack)
-			v.setType(tByte)
-			return fn.emit(v)
-
-		case *types.Slice, *types.Pointer: // *array
-			// Addressable slice/array; use IndexAddr and Load.
-			return b.addr(fn, e, false).load(fn)
-
-		default:
-			panic("unexpected container type in IndexExpr: " + t.String())
-		}
-
-	case *ast.CompositeLit, *ast.StarExpr:
-		// Addressable types (lvalues)
-		return b.addr(fn, e, false).load(fn)
-	}
-
-	panic(fmt.Sprintf("unexpected expr: %T", e))
-}
-
-// stmtList emits to fn code for all statements in list.
-func (b *builder) stmtList(fn *Function, list []ast.Stmt) {
-	for _, s := range list {
-		b.stmt(fn, s)
-	}
-}
-
-// receiver emits to fn code for expression e in the "receiver"
-// position of selection e.f (where f may be a field or a method) and
-// returns the effective receiver after applying the implicit field
-// selections of sel.
-//
-// wantAddr requests that the result is an an address.  If
-// !sel.Indirect(), this may require that e be built in addr() mode; it
-// must thus be addressable.
-//
-// escaping is defined as per builder.addr().
-//
-func (b *builder) receiver(fn *Function, e ast.Expr, wantAddr, escaping bool, sel *types.Selection) Value {
-	var v Value
-	if wantAddr && !sel.Indirect() && !isPointer(fn.Pkg.typeOf(e)) {
-		v = b.addr(fn, e, escaping).address(fn)
-	} else {
-		v = b.expr(fn, e)
-	}
-
-	last := len(sel.Index()) - 1
-	v = emitImplicitSelections(fn, v, sel.Index()[:last])
-	if !wantAddr && isPointer(v.Type()) {
-		v = emitLoad(fn, v)
-	}
-	return v
-}
-
-// setCallFunc populates the function parts of a CallCommon structure
-// (Func, Method, Recv, Args[0]) based on the kind of invocation
-// occurring in e.
-//
-func (b *builder) setCallFunc(fn *Function, e *ast.CallExpr, c *CallCommon) {
-	c.pos = e.Lparen
-
-	// Is this a method call?
-	if selector, ok := unparen(e.Fun).(*ast.SelectorExpr); ok {
-		sel, ok := fn.Pkg.info.Selections[selector]
-		if ok && sel.Kind() == types.MethodVal {
-			obj := sel.Obj().(*types.Func)
-			recv := recvType(obj)
-			wantAddr := isPointer(recv)
-			escaping := true
-			v := b.receiver(fn, selector.X, wantAddr, escaping, sel)
-			if isInterface(recv) {
-				// Invoke-mode call.
-				c.Value = v
-				c.Method = obj
-			} else {
-				// "Call"-mode call.
-				c.Value = fn.Prog.declaredFunc(obj)
-				c.Args = append(c.Args, v)
-			}
-			return
-		}
-
-		// sel.Kind()==MethodExpr indicates T.f() or (*T).f():
-		// a statically dispatched call to the method f in the
-		// method-set of T or *T.  T may be an interface.
-		//
-		// e.Fun would evaluate to a concrete method, interface
-		// wrapper function, or promotion wrapper.
-		//
-		// For now, we evaluate it in the usual way.
-		//
-		// TODO(adonovan): opt: inline expr() here, to make the
-		// call static and to avoid generation of wrappers.
-		// It's somewhat tricky as it may consume the first
-		// actual parameter if the call is "invoke" mode.
-		//
-		// Examples:
-		//  type T struct{}; func (T) f() {}   // "call" mode
-		//  type T interface { f() }           // "invoke" mode
-		//
-		//  type S struct{ T }
-		//
-		//  var s S
-		//  S.f(s)
-		//  (*S).f(&s)
-		//
-		// Suggested approach:
-		// - consume the first actual parameter expression
-		//   and build it with b.expr().
-		// - apply implicit field selections.
-		// - use MethodVal logic to populate fields of c.
-	}
-
-	// Evaluate the function operand in the usual way.
-	c.Value = b.expr(fn, e.Fun)
-}
-
-// emitCallArgs emits to f code for the actual parameters of call e to
-// a (possibly built-in) function of effective type sig.
-// The argument values are appended to args, which is then returned.
-//
-func (b *builder) emitCallArgs(fn *Function, sig *types.Signature, e *ast.CallExpr, args []Value) []Value {
-	// f(x, y, z...): pass slice z straight through.
-	if e.Ellipsis != 0 {
-		for i, arg := range e.Args {
-			v := emitConv(fn, b.expr(fn, arg), sig.Params().At(i).Type())
-			args = append(args, v)
-		}
-		return args
-	}
-
-	offset := len(args) // 1 if call has receiver, 0 otherwise
-
-	// Evaluate actual parameter expressions.
-	//
-	// If this is a chained call of the form f(g()) where g has
-	// multiple return values (MRV), they are flattened out into
-	// args; a suffix of them may end up in a varargs slice.
-	for _, arg := range e.Args {
-		v := b.expr(fn, arg)
-		if ttuple, ok := v.Type().(*types.Tuple); ok { // MRV chain
-			for i, n := 0, ttuple.Len(); i < n; i++ {
-				args = append(args, emitExtract(fn, v, i))
-			}
-		} else {
-			args = append(args, v)
-		}
-	}
-
-	// Actual->formal assignability conversions for normal parameters.
-	np := sig.Params().Len() // number of normal parameters
-	if sig.Variadic() {
-		np--
-	}
-	for i := 0; i < np; i++ {
-		args[offset+i] = emitConv(fn, args[offset+i], sig.Params().At(i).Type())
-	}
-
-	// Actual->formal assignability conversions for variadic parameter,
-	// and construction of slice.
-	if sig.Variadic() {
-		varargs := args[offset+np:]
-		st := sig.Params().At(np).Type().(*types.Slice)
-		vt := st.Elem()
-		if len(varargs) == 0 {
-			args = append(args, nilConst(st))
-		} else {
-			// Replace a suffix of args with a slice containing it.
-			at := types.NewArray(vt, int64(len(varargs)))
-			a := emitNew(fn, at, token.NoPos)
-			a.setPos(e.Rparen)
-			a.Comment = "varargs"
-			for i, arg := range varargs {
-				iaddr := &IndexAddr{
-					X:     a,
-					Index: intConst(int64(i)),
-				}
-				iaddr.setType(types.NewPointer(vt))
-				fn.emit(iaddr)
-				emitStore(fn, iaddr, arg, arg.Pos())
-			}
-			s := &Slice{X: a}
-			s.setType(st)
-			args[offset+np] = fn.emit(s)
-			args = args[:offset+np+1]
-		}
-	}
-	return args
-}
-
-// setCall emits to fn code to evaluate all the parameters of a function
-// call e, and populates *c with those values.
-//
-func (b *builder) setCall(fn *Function, e *ast.CallExpr, c *CallCommon) {
-	// First deal with the f(...) part and optional receiver.
-	b.setCallFunc(fn, e, c)
-
-	// Then append the other actual parameters.
-	sig, _ := fn.Pkg.typeOf(e.Fun).Underlying().(*types.Signature)
-	if sig == nil {
-		panic(fmt.Sprintf("no signature for call of %s", e.Fun))
-	}
-	c.Args = b.emitCallArgs(fn, sig, e, c.Args)
-}
-
-// assignOp emits to fn code to perform loc += incr or loc -= incr.
-func (b *builder) assignOp(fn *Function, loc lvalue, incr Value, op token.Token) {
-	oldv := loc.load(fn)
-	loc.store(fn, emitArith(fn, op, oldv, emitConv(fn, incr, oldv.Type()), loc.typ(), token.NoPos))
-}
-
-// localValueSpec emits to fn code to define all of the vars in the
-// function-local ValueSpec, spec.
-//
-func (b *builder) localValueSpec(fn *Function, spec *ast.ValueSpec) {
-	switch {
-	case len(spec.Values) == len(spec.Names):
-		// e.g. var x, y = 0, 1
-		// 1:1 assignment
-		for i, id := range spec.Names {
-			if !isBlankIdent(id) {
-				fn.addLocalForIdent(id)
-			}
-			lval := b.addr(fn, id, false) // non-escaping
-			b.assign(fn, lval, spec.Values[i], true, nil)
-		}
-
-	case len(spec.Values) == 0:
-		// e.g. var x, y int
-		// Locals are implicitly zero-initialized.
-		for _, id := range spec.Names {
-			if !isBlankIdent(id) {
-				lhs := fn.addLocalForIdent(id)
-				if fn.debugInfo() {
-					emitDebugRef(fn, id, lhs, true)
-				}
-			}
-		}
-
-	default:
-		// e.g. var x, y = pos()
-		tuple := b.exprN(fn, spec.Values[0])
-		for i, id := range spec.Names {
-			if !isBlankIdent(id) {
-				fn.addLocalForIdent(id)
-				lhs := b.addr(fn, id, false) // non-escaping
-				lhs.store(fn, emitExtract(fn, tuple, i))
-			}
-		}
-	}
-}
-
-// assignStmt emits code to fn for a parallel assignment of rhss to lhss.
-// isDef is true if this is a short variable declaration (:=).
-//
-// Note the similarity with localValueSpec.
-//
-func (b *builder) assignStmt(fn *Function, lhss, rhss []ast.Expr, isDef bool) {
-	// Side effects of all LHSs and RHSs must occur in left-to-right order.
-	lvals := make([]lvalue, len(lhss))
-	isZero := make([]bool, len(lhss))
-	for i, lhs := range lhss {
-		var lval lvalue = blank{}
-		if !isBlankIdent(lhs) {
-			if isDef {
-				if obj := fn.Pkg.info.Defs[lhs.(*ast.Ident)]; obj != nil {
-					fn.addNamedLocal(obj)
-					isZero[i] = true
-				}
-			}
-			lval = b.addr(fn, lhs, false) // non-escaping
-		}
-		lvals[i] = lval
-	}
-	if len(lhss) == len(rhss) {
-		// Simple assignment:   x     = f()        (!isDef)
-		// Parallel assignment: x, y  = f(), g()   (!isDef)
-		// or short var decl:   x, y := f(), g()   (isDef)
-		//
-		// In all cases, the RHSs may refer to the LHSs,
-		// so we need a storebuf.
-		var sb storebuf
-		for i := range rhss {
-			b.assign(fn, lvals[i], rhss[i], isZero[i], &sb)
-		}
-		sb.emit(fn)
-	} else {
-		// e.g. x, y = pos()
-		tuple := b.exprN(fn, rhss[0])
-		emitDebugRef(fn, rhss[0], tuple, false)
-		for i, lval := range lvals {
-			lval.store(fn, emitExtract(fn, tuple, i))
-		}
-	}
-}
-
-// arrayLen returns the length of the array whose composite literal elements are elts.
-func (b *builder) arrayLen(fn *Function, elts []ast.Expr) int64 {
-	var max int64 = -1
-	var i int64 = -1
-	for _, e := range elts {
-		if kv, ok := e.(*ast.KeyValueExpr); ok {
-			i = b.expr(fn, kv.Key).(*Const).Int64()
-		} else {
-			i++
-		}
-		if i > max {
-			max = i
-		}
-	}
-	return max + 1
-}
-
-// compLit emits to fn code to initialize a composite literal e at
-// address addr with type typ.
-//
-// Nested composite literals are recursively initialized in place
-// where possible. If isZero is true, compLit assumes that addr
-// holds the zero value for typ.
-//
-// Because the elements of a composite literal may refer to the
-// variables being updated, as in the second line below,
-//	x := T{a: 1}
-//	x = T{a: x.a}
-// all the reads must occur before all the writes.  Thus all stores to
-// loc are emitted to the storebuf sb for later execution.
-//
-// A CompositeLit may have pointer type only in the recursive (nested)
-// case when the type name is implicit.  e.g. in []*T{{}}, the inner
-// literal has type *T behaves like &T{}.
-// In that case, addr must hold a T, not a *T.
-//
-func (b *builder) compLit(fn *Function, addr Value, e *ast.CompositeLit, isZero bool, sb *storebuf) {
-	typ := deref(fn.Pkg.typeOf(e))
-	switch t := typ.Underlying().(type) {
-	case *types.Struct:
-		if !isZero && len(e.Elts) != t.NumFields() {
-			// memclear
-			sb.store(&address{addr, e.Lbrace, nil},
-				zeroValue(fn, deref(addr.Type())))
-			isZero = true
-		}
-		for i, e := range e.Elts {
-			fieldIndex := i
-			pos := e.Pos()
-			if kv, ok := e.(*ast.KeyValueExpr); ok {
-				fname := kv.Key.(*ast.Ident).Name
-				for i, n := 0, t.NumFields(); i < n; i++ {
-					sf := t.Field(i)
-					if sf.Name() == fname {
-						fieldIndex = i
-						pos = kv.Colon
-						e = kv.Value
-						break
-					}
-				}
-			}
-			sf := t.Field(fieldIndex)
-			faddr := &FieldAddr{
-				X:     addr,
-				Field: fieldIndex,
-			}
-			faddr.setType(types.NewPointer(sf.Type()))
-			fn.emit(faddr)
-			b.assign(fn, &address{addr: faddr, pos: pos, expr: e}, e, isZero, sb)
-		}
-
-	case *types.Array, *types.Slice:
-		var at *types.Array
-		var array Value
-		switch t := t.(type) {
-		case *types.Slice:
-			at = types.NewArray(t.Elem(), b.arrayLen(fn, e.Elts))
-			alloc := emitNew(fn, at, e.Lbrace)
-			alloc.Comment = "slicelit"
-			array = alloc
-		case *types.Array:
-			at = t
-			array = addr
-
-			if !isZero && int64(len(e.Elts)) != at.Len() {
-				// memclear
-				sb.store(&address{array, e.Lbrace, nil},
-					zeroValue(fn, deref(array.Type())))
-			}
-		}
-
-		var idx *Const
-		for _, e := range e.Elts {
-			pos := e.Pos()
-			if kv, ok := e.(*ast.KeyValueExpr); ok {
-				idx = b.expr(fn, kv.Key).(*Const)
-				pos = kv.Colon
-				e = kv.Value
-			} else {
-				var idxval int64
-				if idx != nil {
-					idxval = idx.Int64() + 1
-				}
-				idx = intConst(idxval)
-			}
-			iaddr := &IndexAddr{
-				X:     array,
-				Index: idx,
-			}
-			iaddr.setType(types.NewPointer(at.Elem()))
-			fn.emit(iaddr)
-			if t != at { // slice
-				// backing array is unaliased => storebuf not needed.
-				b.assign(fn, &address{addr: iaddr, pos: pos, expr: e}, e, true, nil)
-			} else {
-				b.assign(fn, &address{addr: iaddr, pos: pos, expr: e}, e, true, sb)
-			}
-		}
-
-		if t != at { // slice
-			s := &Slice{X: array}
-			s.setPos(e.Lbrace)
-			s.setType(typ)
-			sb.store(&address{addr: addr, pos: e.Lbrace, expr: e}, fn.emit(s))
-		}
-
-	case *types.Map:
-		m := &MakeMap{Reserve: intConst(int64(len(e.Elts)))}
-		m.setPos(e.Lbrace)
-		m.setType(typ)
-		fn.emit(m)
-		for _, e := range e.Elts {
-			e := e.(*ast.KeyValueExpr)
-
-			// If a key expression in a map literal is  itself a
-			// composite literal, the type may be omitted.
-			// For example:
-			//	map[*struct{}]bool{{}: true}
-			// An &-operation may be implied:
-			//	map[*struct{}]bool{&struct{}{}: true}
-			var key Value
-			if _, ok := unparen(e.Key).(*ast.CompositeLit); ok && isPointer(t.Key()) {
-				// A CompositeLit never evaluates to a pointer,
-				// so if the type of the location is a pointer,
-				// an &-operation is implied.
-				key = b.addr(fn, e.Key, true).address(fn)
-			} else {
-				key = b.expr(fn, e.Key)
-			}
-
-			loc := element{
-				m:   m,
-				k:   emitConv(fn, key, t.Key()),
-				t:   t.Elem(),
-				pos: e.Colon,
-			}
-
-			// We call assign() only because it takes care
-			// of any &-operation required in the recursive
-			// case, e.g.,
-			// map[int]*struct{}{0: {}} implies &struct{}{}.
-			// In-place update is of course impossible,
-			// and no storebuf is needed.
-			b.assign(fn, &loc, e.Value, true, nil)
-		}
-		sb.store(&address{addr: addr, pos: e.Lbrace, expr: e}, m)
-
-	default:
-		panic("unexpected CompositeLit type: " + t.String())
-	}
-}
-
-// switchStmt emits to fn code for the switch statement s, optionally
-// labelled by label.
-//
-func (b *builder) switchStmt(fn *Function, s *ast.SwitchStmt, label *lblock) {
-	// We treat SwitchStmt like a sequential if-else chain.
-	// Multiway dispatch can be recovered later by ssautil.Switches()
-	// to those cases that are free of side effects.
-	if s.Init != nil {
-		b.stmt(fn, s.Init)
-	}
-	var tag Value = vTrue
-	if s.Tag != nil {
-		tag = b.expr(fn, s.Tag)
-	}
-	done := fn.newBasicBlock("switch.done")
-	if label != nil {
-		label._break = done
-	}
-	// We pull the default case (if present) down to the end.
-	// But each fallthrough label must point to the next
-	// body block in source order, so we preallocate a
-	// body block (fallthru) for the next case.
-	// Unfortunately this makes for a confusing block order.
-	var dfltBody *[]ast.Stmt
-	var dfltFallthrough *BasicBlock
-	var fallthru, dfltBlock *BasicBlock
-	ncases := len(s.Body.List)
-	for i, clause := range s.Body.List {
-		body := fallthru
-		if body == nil {
-			body = fn.newBasicBlock("switch.body") // first case only
-		}
-
-		// Preallocate body block for the next case.
-		fallthru = done
-		if i+1 < ncases {
-			fallthru = fn.newBasicBlock("switch.body")
-		}
-
-		cc := clause.(*ast.CaseClause)
-		if cc.List == nil {
-			// Default case.
-			dfltBody = &cc.Body
-			dfltFallthrough = fallthru
-			dfltBlock = body
-			continue
-		}
-
-		var nextCond *BasicBlock
-		for _, cond := range cc.List {
-			nextCond = fn.newBasicBlock("switch.next")
-			// TODO(adonovan): opt: when tag==vTrue, we'd
-			// get better code if we use b.cond(cond)
-			// instead of BinOp(EQL, tag, b.expr(cond))
-			// followed by If.  Don't forget conversions
-			// though.
-			cond := emitCompare(fn, token.EQL, tag, b.expr(fn, cond), token.NoPos)
-			emitIf(fn, cond, body, nextCond)
-			fn.currentBlock = nextCond
-		}
-		fn.currentBlock = body
-		fn.targets = &targets{
-			tail:         fn.targets,
-			_break:       done,
-			_fallthrough: fallthru,
-		}
-		b.stmtList(fn, cc.Body)
-		fn.targets = fn.targets.tail
-		emitJump(fn, done)
-		fn.currentBlock = nextCond
-	}
-	if dfltBlock != nil {
-		emitJump(fn, dfltBlock)
-		fn.currentBlock = dfltBlock
-		fn.targets = &targets{
-			tail:         fn.targets,
-			_break:       done,
-			_fallthrough: dfltFallthrough,
-		}
-		b.stmtList(fn, *dfltBody)
-		fn.targets = fn.targets.tail
-	}
-	emitJump(fn, done)
-	fn.currentBlock = done
-}
-
-// typeSwitchStmt emits to fn code for the type switch statement s, optionally
-// labelled by label.
-//
-func (b *builder) typeSwitchStmt(fn *Function, s *ast.TypeSwitchStmt, label *lblock) {
-	// We treat TypeSwitchStmt like a sequential if-else chain.
-	// Multiway dispatch can be recovered later by ssautil.Switches().
-
-	// Typeswitch lowering:
-	//
-	// var x X
-	// switch y := x.(type) {
-	// case T1, T2: S1                  // >1 	(y := x)
-	// case nil:    SN                  // nil 	(y := x)
-	// default:     SD                  // 0 types 	(y := x)
-	// case T3:     S3                  // 1 type 	(y := x.(T3))
-	// }
-	//
-	//      ...s.Init...
-	// 	x := eval x
-	// .caseT1:
-	// 	t1, ok1 := typeswitch,ok x <T1>
-	// 	if ok1 then goto S1 else goto .caseT2
-	// .caseT2:
-	// 	t2, ok2 := typeswitch,ok x <T2>
-	// 	if ok2 then goto S1 else goto .caseNil
-	// .S1:
-	//      y := x
-	// 	...S1...
-	// 	goto done
-	// .caseNil:
-	// 	if t2, ok2 := typeswitch,ok x <T2>
-	// 	if x == nil then goto SN else goto .caseT3
-	// .SN:
-	//      y := x
-	// 	...SN...
-	// 	goto done
-	// .caseT3:
-	// 	t3, ok3 := typeswitch,ok x <T3>
-	// 	if ok3 then goto S3 else goto default
-	// .S3:
-	//      y := t3
-	// 	...S3...
-	// 	goto done
-	// .default:
-	//      y := x
-	// 	...SD...
-	// 	goto done
-	// .done:
-
-	if s.Init != nil {
-		b.stmt(fn, s.Init)
-	}
-
-	var x Value
-	switch ass := s.Assign.(type) {
-	case *ast.ExprStmt: // x.(type)
-		x = b.expr(fn, unparen(ass.X).(*ast.TypeAssertExpr).X)
-	case *ast.AssignStmt: // y := x.(type)
-		x = b.expr(fn, unparen(ass.Rhs[0]).(*ast.TypeAssertExpr).X)
-	}
-
-	done := fn.newBasicBlock("typeswitch.done")
-	if label != nil {
-		label._break = done
-	}
-	var default_ *ast.CaseClause
-	for _, clause := range s.Body.List {
-		cc := clause.(*ast.CaseClause)
-		if cc.List == nil {
-			default_ = cc
-			continue
-		}
-		body := fn.newBasicBlock("typeswitch.body")
-		var next *BasicBlock
-		var casetype types.Type
-		var ti Value // ti, ok := typeassert,ok x <Ti>
-		for _, cond := range cc.List {
-			next = fn.newBasicBlock("typeswitch.next")
-			casetype = fn.Pkg.typeOf(cond)
-			var condv Value
-			if casetype == tUntypedNil {
-				condv = emitCompare(fn, token.EQL, x, nilConst(x.Type()), token.NoPos)
-				ti = x
-			} else {
-				yok := emitTypeTest(fn, x, casetype, cc.Case)
-				ti = emitExtract(fn, yok, 0)
-				condv = emitExtract(fn, yok, 1)
-			}
-			emitIf(fn, condv, body, next)
-			fn.currentBlock = next
-		}
-		if len(cc.List) != 1 {
-			ti = x
-		}
-		fn.currentBlock = body
-		b.typeCaseBody(fn, cc, ti, done)
-		fn.currentBlock = next
-	}
-	if default_ != nil {
-		b.typeCaseBody(fn, default_, x, done)
-	} else {
-		emitJump(fn, done)
-	}
-	fn.currentBlock = done
-}
-
-func (b *builder) typeCaseBody(fn *Function, cc *ast.CaseClause, x Value, done *BasicBlock) {
-	if obj := fn.Pkg.info.Implicits[cc]; obj != nil {
-		// In a switch y := x.(type), each case clause
-		// implicitly declares a distinct object y.
-		// In a single-type case, y has that type.
-		// In multi-type cases, 'case nil' and default,
-		// y has the same type as the interface operand.
-		emitStore(fn, fn.addNamedLocal(obj), x, obj.Pos())
-	}
-	fn.targets = &targets{
-		tail:   fn.targets,
-		_break: done,
-	}
-	b.stmtList(fn, cc.Body)
-	fn.targets = fn.targets.tail
-	emitJump(fn, done)
-}
-
-// selectStmt emits to fn code for the select statement s, optionally
-// labelled by label.
-//
-func (b *builder) selectStmt(fn *Function, s *ast.SelectStmt, label *lblock) {
-	// A blocking select of a single case degenerates to a
-	// simple send or receive.
-	// TODO(adonovan): opt: is this optimization worth its weight?
-	if len(s.Body.List) == 1 {
-		clause := s.Body.List[0].(*ast.CommClause)
-		if clause.Comm != nil {
-			b.stmt(fn, clause.Comm)
-			done := fn.newBasicBlock("select.done")
-			if label != nil {
-				label._break = done
-			}
-			fn.targets = &targets{
-				tail:   fn.targets,
-				_break: done,
-			}
-			b.stmtList(fn, clause.Body)
-			fn.targets = fn.targets.tail
-			emitJump(fn, done)
-			fn.currentBlock = done
-			return
-		}
-	}
-
-	// First evaluate all channels in all cases, and find
-	// the directions of each state.
-	var states []*SelectState
-	blocking := true
-	debugInfo := fn.debugInfo()
-	for _, clause := range s.Body.List {
-		var st *SelectState
-		switch comm := clause.(*ast.CommClause).Comm.(type) {
-		case nil: // default case
-			blocking = false
-			continue
-
-		case *ast.SendStmt: // ch<- i
-			ch := b.expr(fn, comm.Chan)
-			st = &SelectState{
-				Dir:  types.SendOnly,
-				Chan: ch,
-				Send: emitConv(fn, b.expr(fn, comm.Value),
-					ch.Type().Underlying().(*types.Chan).Elem()),
-				Pos: comm.Arrow,
-			}
-			if debugInfo {
-				st.DebugNode = comm
-			}
-
-		case *ast.AssignStmt: // x := <-ch
-			recv := unparen(comm.Rhs[0]).(*ast.UnaryExpr)
-			st = &SelectState{
-				Dir:  types.RecvOnly,
-				Chan: b.expr(fn, recv.X),
-				Pos:  recv.OpPos,
-			}
-			if debugInfo {
-				st.DebugNode = recv
-			}
-
-		case *ast.ExprStmt: // <-ch
-			recv := unparen(comm.X).(*ast.UnaryExpr)
-			st = &SelectState{
-				Dir:  types.RecvOnly,
-				Chan: b.expr(fn, recv.X),
-				Pos:  recv.OpPos,
-			}
-			if debugInfo {
-				st.DebugNode = recv
-			}
-		}
-		states = append(states, st)
-	}
-
-	// We dispatch on the (fair) result of Select using a
-	// sequential if-else chain, in effect:
-	//
-	// idx, recvOk, r0...r_n-1 := select(...)
-	// if idx == 0 {  // receive on channel 0  (first receive => r0)
-	//     x, ok := r0, recvOk
-	//     ...state0...
-	// } else if v == 1 {   // send on channel 1
-	//     ...state1...
-	// } else {
-	//     ...default...
-	// }
-	sel := &Select{
-		States:   states,
-		Blocking: blocking,
-	}
-	sel.setPos(s.Select)
-	var vars []*types.Var
-	vars = append(vars, varIndex, varOk)
-	for _, st := range states {
-		if st.Dir == types.RecvOnly {
-			tElem := st.Chan.Type().Underlying().(*types.Chan).Elem()
-			vars = append(vars, anonVar(tElem))
-		}
-	}
-	sel.setType(types.NewTuple(vars...))
-
-	fn.emit(sel)
-	idx := emitExtract(fn, sel, 0)
-
-	done := fn.newBasicBlock("select.done")
-	if label != nil {
-		label._break = done
-	}
-
-	var defaultBody *[]ast.Stmt
-	state := 0
-	r := 2 // index in 'sel' tuple of value; increments if st.Dir==RECV
-	for _, cc := range s.Body.List {
-		clause := cc.(*ast.CommClause)
-		if clause.Comm == nil {
-			defaultBody = &clause.Body
-			continue
-		}
-		body := fn.newBasicBlock("select.body")
-		next := fn.newBasicBlock("select.next")
-		emitIf(fn, emitCompare(fn, token.EQL, idx, intConst(int64(state)), token.NoPos), body, next)
-		fn.currentBlock = body
-		fn.targets = &targets{
-			tail:   fn.targets,
-			_break: done,
-		}
-		switch comm := clause.Comm.(type) {
-		case *ast.ExprStmt: // <-ch
-			if debugInfo {
-				v := emitExtract(fn, sel, r)
-				emitDebugRef(fn, states[state].DebugNode.(ast.Expr), v, false)
-			}
-			r++
-
-		case *ast.AssignStmt: // x := <-states[state].Chan
-			if comm.Tok == token.DEFINE {
-				fn.addLocalForIdent(comm.Lhs[0].(*ast.Ident))
-			}
-			x := b.addr(fn, comm.Lhs[0], false) // non-escaping
-			v := emitExtract(fn, sel, r)
-			if debugInfo {
-				emitDebugRef(fn, states[state].DebugNode.(ast.Expr), v, false)
-			}
-			x.store(fn, v)
-
-			if len(comm.Lhs) == 2 { // x, ok := ...
-				if comm.Tok == token.DEFINE {
-					fn.addLocalForIdent(comm.Lhs[1].(*ast.Ident))
-				}
-				ok := b.addr(fn, comm.Lhs[1], false) // non-escaping
-				ok.store(fn, emitExtract(fn, sel, 1))
-			}
-			r++
-		}
-		b.stmtList(fn, clause.Body)
-		fn.targets = fn.targets.tail
-		emitJump(fn, done)
-		fn.currentBlock = next
-		state++
-	}
-	if defaultBody != nil {
-		fn.targets = &targets{
-			tail:   fn.targets,
-			_break: done,
-		}
-		b.stmtList(fn, *defaultBody)
-		fn.targets = fn.targets.tail
-	} else {
-		// A blocking select must match some case.
-		// (This should really be a runtime.errorString, not a string.)
-		fn.emit(&Panic{
-			X: emitConv(fn, stringConst("blocking select matched no case"), tEface),
-		})
-		fn.currentBlock = fn.newBasicBlock("unreachable")
-	}
-	emitJump(fn, done)
-	fn.currentBlock = done
-}
-
-// forStmt emits to fn code for the for statement s, optionally
-// labelled by label.
-//
-func (b *builder) forStmt(fn *Function, s *ast.ForStmt, label *lblock) {
-	//	...init...
-	//      jump loop
-	// loop:
-	//      if cond goto body else done
-	// body:
-	//      ...body...
-	//      jump post
-	// post:				 (target of continue)
-	//      ...post...
-	//      jump loop
-	// done:                                 (target of break)
-	if s.Init != nil {
-		b.stmt(fn, s.Init)
-	}
-	body := fn.newBasicBlock("for.body")
-	done := fn.newBasicBlock("for.done") // target of 'break'
-	loop := body                         // target of back-edge
-	if s.Cond != nil {
-		loop = fn.newBasicBlock("for.loop")
-	}
-	cont := loop // target of 'continue'
-	if s.Post != nil {
-		cont = fn.newBasicBlock("for.post")
-	}
-	if label != nil {
-		label._break = done
-		label._continue = cont
-	}
-	emitJump(fn, loop)
-	fn.currentBlock = loop
-	if loop != body {
-		b.cond(fn, s.Cond, body, done)
-		fn.currentBlock = body
-	}
-	fn.targets = &targets{
-		tail:      fn.targets,
-		_break:    done,
-		_continue: cont,
-	}
-	b.stmt(fn, s.Body)
-	fn.targets = fn.targets.tail
-	emitJump(fn, cont)
-
-	if s.Post != nil {
-		fn.currentBlock = cont
-		b.stmt(fn, s.Post)
-		emitJump(fn, loop) // back-edge
-	}
-	fn.currentBlock = done
-}
-
-// rangeIndexed emits to fn the header for an integer-indexed loop
-// over array, *array or slice value x.
-// The v result is defined only if tv is non-nil.
-// forPos is the position of the "for" token.
-//
-func (b *builder) rangeIndexed(fn *Function, x Value, tv types.Type, pos token.Pos) (k, v Value, loop, done *BasicBlock) {
-	//
-	//      length = len(x)
-	//      index = -1
-	// loop:                                   (target of continue)
-	//      index++
-	// 	if index < length goto body else done
-	// body:
-	//      k = index
-	//      v = x[index]
-	//      ...body...
-	// 	jump loop
-	// done:                                   (target of break)
-
-	// Determine number of iterations.
-	var length Value
-	if arr, ok := deref(x.Type()).Underlying().(*types.Array); ok {
-		// For array or *array, the number of iterations is
-		// known statically thanks to the type.  We avoid a
-		// data dependence upon x, permitting later dead-code
-		// elimination if x is pure, static unrolling, etc.
-		// Ranging over a nil *array may have >0 iterations.
-		// We still generate code for x, in case it has effects.
-		length = intConst(arr.Len())
-	} else {
-		// length = len(x).
-		var c Call
-		c.Call.Value = makeLen(x.Type())
-		c.Call.Args = []Value{x}
-		c.setType(tInt)
-		length = fn.emit(&c)
-	}
-
-	index := fn.addLocal(tInt, token.NoPos)
-	emitStore(fn, index, intConst(-1), pos)
-
-	loop = fn.newBasicBlock("rangeindex.loop")
-	emitJump(fn, loop)
-	fn.currentBlock = loop
-
-	incr := &BinOp{
-		Op: token.ADD,
-		X:  emitLoad(fn, index),
-		Y:  vOne,
-	}
-	incr.setType(tInt)
-	emitStore(fn, index, fn.emit(incr), pos)
-
-	body := fn.newBasicBlock("rangeindex.body")
-	done = fn.newBasicBlock("rangeindex.done")
-	emitIf(fn, emitCompare(fn, token.LSS, incr, length, token.NoPos), body, done)
-	fn.currentBlock = body
-
-	k = emitLoad(fn, index)
-	if tv != nil {
-		switch t := x.Type().Underlying().(type) {
-		case *types.Array:
-			instr := &Index{
-				X:     x,
-				Index: k,
-			}
-			instr.setType(t.Elem())
-			v = fn.emit(instr)
-
-		case *types.Pointer: // *array
-			instr := &IndexAddr{
-				X:     x,
-				Index: k,
-			}
-			instr.setType(types.NewPointer(t.Elem().Underlying().(*types.Array).Elem()))
-			v = emitLoad(fn, fn.emit(instr))
-
-		case *types.Slice:
-			instr := &IndexAddr{
-				X:     x,
-				Index: k,
-			}
-			instr.setType(types.NewPointer(t.Elem()))
-			v = emitLoad(fn, fn.emit(instr))
-
-		default:
-			panic("rangeIndexed x:" + t.String())
-		}
-	}
-	return
-}
-
-// rangeIter emits to fn the header for a loop using
-// Range/Next/Extract to iterate over map or string value x.
-// tk and tv are the types of the key/value results k and v, or nil
-// if the respective component is not wanted.
-//
-func (b *builder) rangeIter(fn *Function, x Value, tk, tv types.Type, pos token.Pos) (k, v Value, loop, done *BasicBlock) {
-	//
-	//	it = range x
-	// loop:                                   (target of continue)
-	//	okv = next it                      (ok, key, value)
-	//  	ok = extract okv #0
-	// 	if ok goto body else done
-	// body:
-	// 	k = extract okv #1
-	// 	v = extract okv #2
-	//      ...body...
-	// 	jump loop
-	// done:                                   (target of break)
-	//
-
-	if tk == nil {
-		tk = tInvalid
-	}
-	if tv == nil {
-		tv = tInvalid
-	}
-
-	rng := &Range{X: x}
-	rng.setPos(pos)
-	rng.setType(tRangeIter)
-	it := fn.emit(rng)
-
-	loop = fn.newBasicBlock("rangeiter.loop")
-	emitJump(fn, loop)
-	fn.currentBlock = loop
-
-	_, isString := x.Type().Underlying().(*types.Basic)
-
-	okv := &Next{
-		Iter:     it,
-		IsString: isString,
-	}
-	okv.setType(types.NewTuple(
-		varOk,
-		newVar("k", tk),
-		newVar("v", tv),
-	))
-	fn.emit(okv)
-
-	body := fn.newBasicBlock("rangeiter.body")
-	done = fn.newBasicBlock("rangeiter.done")
-	emitIf(fn, emitExtract(fn, okv, 0), body, done)
-	fn.currentBlock = body
-
-	if tk != tInvalid {
-		k = emitExtract(fn, okv, 1)
-	}
-	if tv != tInvalid {
-		v = emitExtract(fn, okv, 2)
-	}
-	return
-}
-
-// rangeChan emits to fn the header for a loop that receives from
-// channel x until it fails.
-// tk is the channel's element type, or nil if the k result is
-// not wanted
-// pos is the position of the '=' or ':=' token.
-//
-func (b *builder) rangeChan(fn *Function, x Value, tk types.Type, pos token.Pos) (k Value, loop, done *BasicBlock) {
-	//
-	// loop:                                   (target of continue)
-	//      ko = <-x                           (key, ok)
-	//      ok = extract ko #1
-	//      if ok goto body else done
-	// body:
-	//      k = extract ko #0
-	//      ...
-	//      goto loop
-	// done:                                   (target of break)
-
-	loop = fn.newBasicBlock("rangechan.loop")
-	emitJump(fn, loop)
-	fn.currentBlock = loop
-	recv := &UnOp{
-		Op:      token.ARROW,
-		X:       x,
-		CommaOk: true,
-	}
-	recv.setPos(pos)
-	recv.setType(types.NewTuple(
-		newVar("k", x.Type().Underlying().(*types.Chan).Elem()),
-		varOk,
-	))
-	ko := fn.emit(recv)
-	body := fn.newBasicBlock("rangechan.body")
-	done = fn.newBasicBlock("rangechan.done")
-	emitIf(fn, emitExtract(fn, ko, 1), body, done)
-	fn.currentBlock = body
-	if tk != nil {
-		k = emitExtract(fn, ko, 0)
-	}
-	return
-}
-
-// rangeStmt emits to fn code for the range statement s, optionally
-// labelled by label.
-//
-func (b *builder) rangeStmt(fn *Function, s *ast.RangeStmt, label *lblock) {
-	var tk, tv types.Type
-	if s.Key != nil && !isBlankIdent(s.Key) {
-		tk = fn.Pkg.typeOf(s.Key)
-	}
-	if s.Value != nil && !isBlankIdent(s.Value) {
-		tv = fn.Pkg.typeOf(s.Value)
-	}
-
-	// If iteration variables are defined (:=), this
-	// occurs once outside the loop.
-	//
-	// Unlike a short variable declaration, a RangeStmt
-	// using := never redeclares an existing variable; it
-	// always creates a new one.
-	if s.Tok == token.DEFINE {
-		if tk != nil {
-			fn.addLocalForIdent(s.Key.(*ast.Ident))
-		}
-		if tv != nil {
-			fn.addLocalForIdent(s.Value.(*ast.Ident))
-		}
-	}
-
-	x := b.expr(fn, s.X)
-
-	var k, v Value
-	var loop, done *BasicBlock
-	switch rt := x.Type().Underlying().(type) {
-	case *types.Slice, *types.Array, *types.Pointer: // *array
-		k, v, loop, done = b.rangeIndexed(fn, x, tv, s.For)
-
-	case *types.Chan:
-		k, loop, done = b.rangeChan(fn, x, tk, s.For)
-
-	case *types.Map, *types.Basic: // string
-		k, v, loop, done = b.rangeIter(fn, x, tk, tv, s.For)
-
-	default:
-		panic("Cannot range over: " + rt.String())
-	}
-
-	// Evaluate both LHS expressions before we update either.
-	var kl, vl lvalue
-	if tk != nil {
-		kl = b.addr(fn, s.Key, false) // non-escaping
-	}
-	if tv != nil {
-		vl = b.addr(fn, s.Value, false) // non-escaping
-	}
-	if tk != nil {
-		kl.store(fn, k)
-	}
-	if tv != nil {
-		vl.store(fn, v)
-	}
-
-	if label != nil {
-		label._break = done
-		label._continue = loop
-	}
-
-	fn.targets = &targets{
-		tail:      fn.targets,
-		_break:    done,
-		_continue: loop,
-	}
-	b.stmt(fn, s.Body)
-	fn.targets = fn.targets.tail
-	emitJump(fn, loop) // back-edge
-	fn.currentBlock = done
-}
-
-// stmt lowers statement s to SSA form, emitting code to fn.
-func (b *builder) stmt(fn *Function, _s ast.Stmt) {
-	// The label of the current statement.  If non-nil, its _goto
-	// target is always set; its _break and _continue are set only
-	// within the body of switch/typeswitch/select/for/range.
-	// It is effectively an additional default-nil parameter of stmt().
-	var label *lblock
-start:
-	switch s := _s.(type) {
-	case *ast.EmptyStmt:
-		// ignore.  (Usually removed by gofmt.)
-
-	case *ast.DeclStmt: // Con, Var or Typ
-		d := s.Decl.(*ast.GenDecl)
-		if d.Tok == token.VAR {
-			for _, spec := range d.Specs {
-				if vs, ok := spec.(*ast.ValueSpec); ok {
-					b.localValueSpec(fn, vs)
-				}
-			}
-		}
-
-	case *ast.LabeledStmt:
-		label = fn.labelledBlock(s.Label)
-		emitJump(fn, label._goto)
-		fn.currentBlock = label._goto
-		_s = s.Stmt
-		goto start // effectively: tailcall stmt(fn, s.Stmt, label)
-
-	case *ast.ExprStmt:
-		b.expr(fn, s.X)
-
-	case *ast.SendStmt:
-		fn.emit(&Send{
-			Chan: b.expr(fn, s.Chan),
-			X: emitConv(fn, b.expr(fn, s.Value),
-				fn.Pkg.typeOf(s.Chan).Underlying().(*types.Chan).Elem()),
-			pos: s.Arrow,
-		})
-
-	case *ast.IncDecStmt:
-		op := token.ADD
-		if s.Tok == token.DEC {
-			op = token.SUB
-		}
-		loc := b.addr(fn, s.X, false)
-		b.assignOp(fn, loc, NewConst(exact.MakeInt64(1), loc.typ()), op)
-
-	case *ast.AssignStmt:
-		switch s.Tok {
-		case token.ASSIGN, token.DEFINE:
-			b.assignStmt(fn, s.Lhs, s.Rhs, s.Tok == token.DEFINE)
-
-		default: // +=, etc.
-			op := s.Tok + token.ADD - token.ADD_ASSIGN
-			b.assignOp(fn, b.addr(fn, s.Lhs[0], false), b.expr(fn, s.Rhs[0]), op)
-		}
-
-	case *ast.GoStmt:
-		// The "intrinsics" new/make/len/cap are forbidden here.
-		// panic is treated like an ordinary function call.
-		v := Go{pos: s.Go}
-		b.setCall(fn, s.Call, &v.Call)
-		fn.emit(&v)
-
-	case *ast.DeferStmt:
-		// The "intrinsics" new/make/len/cap are forbidden here.
-		// panic is treated like an ordinary function call.
-		v := Defer{pos: s.Defer}
-		b.setCall(fn, s.Call, &v.Call)
-		fn.emit(&v)
-
-		// A deferred call can cause recovery from panic,
-		// and control resumes at the Recover block.
-		createRecoverBlock(fn)
-
-	case *ast.ReturnStmt:
-		var results []Value
-		if len(s.Results) == 1 && fn.Signature.Results().Len() > 1 {
-			// Return of one expression in a multi-valued function.
-			tuple := b.exprN(fn, s.Results[0])
-			ttuple := tuple.Type().(*types.Tuple)
-			for i, n := 0, ttuple.Len(); i < n; i++ {
-				results = append(results,
-					emitConv(fn, emitExtract(fn, tuple, i),
-						fn.Signature.Results().At(i).Type()))
-			}
-		} else {
-			// 1:1 return, or no-arg return in non-void function.
-			for i, r := range s.Results {
-				v := emitConv(fn, b.expr(fn, r), fn.Signature.Results().At(i).Type())
-				results = append(results, v)
-			}
-		}
-		if fn.namedResults != nil {
-			// Function has named result parameters (NRPs).
-			// Perform parallel assignment of return operands to NRPs.
-			for i, r := range results {
-				emitStore(fn, fn.namedResults[i], r, s.Return)
-			}
-		}
-		// Run function calls deferred in this
-		// function when explicitly returning from it.
-		fn.emit(new(RunDefers))
-		if fn.namedResults != nil {
-			// Reload NRPs to form the result tuple.
-			results = results[:0]
-			for _, r := range fn.namedResults {
-				results = append(results, emitLoad(fn, r))
-			}
-		}
-		fn.emit(&Return{Results: results, pos: s.Return})
-		fn.currentBlock = fn.newBasicBlock("unreachable")
-
-	case *ast.BranchStmt:
-		var block *BasicBlock
-		switch s.Tok {
-		case token.BREAK:
-			if s.Label != nil {
-				block = fn.labelledBlock(s.Label)._break
-			} else {
-				for t := fn.targets; t != nil && block == nil; t = t.tail {
-					block = t._break
-				}
-			}
-
-		case token.CONTINUE:
-			if s.Label != nil {
-				block = fn.labelledBlock(s.Label)._continue
-			} else {
-				for t := fn.targets; t != nil && block == nil; t = t.tail {
-					block = t._continue
-				}
-			}
-
-		case token.FALLTHROUGH:
-			for t := fn.targets; t != nil && block == nil; t = t.tail {
-				block = t._fallthrough
-			}
-
-		case token.GOTO:
-			block = fn.labelledBlock(s.Label)._goto
-		}
-		emitJump(fn, block)
-		fn.currentBlock = fn.newBasicBlock("unreachable")
-
-	case *ast.BlockStmt:
-		b.stmtList(fn, s.List)
-
-	case *ast.IfStmt:
-		if s.Init != nil {
-			b.stmt(fn, s.Init)
-		}
-		then := fn.newBasicBlock("if.then")
-		done := fn.newBasicBlock("if.done")
-		els := done
-		if s.Else != nil {
-			els = fn.newBasicBlock("if.else")
-		}
-		b.cond(fn, s.Cond, then, els)
-		fn.currentBlock = then
-		b.stmt(fn, s.Body)
-		emitJump(fn, done)
-
-		if s.Else != nil {
-			fn.currentBlock = els
-			b.stmt(fn, s.Else)
-			emitJump(fn, done)
-		}
-
-		fn.currentBlock = done
-
-	case *ast.SwitchStmt:
-		b.switchStmt(fn, s, label)
-
-	case *ast.TypeSwitchStmt:
-		b.typeSwitchStmt(fn, s, label)
-
-	case *ast.SelectStmt:
-		b.selectStmt(fn, s, label)
-
-	case *ast.ForStmt:
-		b.forStmt(fn, s, label)
-
-	case *ast.RangeStmt:
-		b.rangeStmt(fn, s, label)
-
-	default:
-		panic(fmt.Sprintf("unexpected statement kind: %T", s))
-	}
-}
-
-// buildFunction builds SSA code for the body of function fn.  Idempotent.
-func (b *builder) buildFunction(fn *Function) {
-	if fn.Blocks != nil {
-		return // building already started
-	}
-
-	var recvField *ast.FieldList
-	var body *ast.BlockStmt
-	var functype *ast.FuncType
-	switch n := fn.syntax.(type) {
-	case nil:
-		return // not a Go source function.  (Synthetic, or from object file.)
-	case *ast.FuncDecl:
-		functype = n.Type
-		recvField = n.Recv
-		body = n.Body
-	case *ast.FuncLit:
-		functype = n.Type
-		body = n.Body
-	default:
-		panic(n)
-	}
-
-	if body == nil {
-		// External function.
-		if fn.Params == nil {
-			// This condition ensures we add a non-empty
-			// params list once only, but we may attempt
-			// the degenerate empty case repeatedly.
-			// TODO(adonovan): opt: don't do that.
-
-			// We set Function.Params even though there is no body
-			// code to reference them.  This simplifies clients.
-			if recv := fn.Signature.Recv(); recv != nil {
-				fn.addParamObj(recv)
-			}
-			params := fn.Signature.Params()
-			for i, n := 0, params.Len(); i < n; i++ {
-				fn.addParamObj(params.At(i))
-			}
-		}
-		return
-	}
-	if fn.Prog.mode&LogSource != 0 {
-		defer logStack("build function %s @ %s", fn, fn.Prog.Fset.Position(fn.pos))()
-	}
-	fn.startBody()
-	fn.createSyntacticParams(recvField, functype)
-	b.stmt(fn, body)
-	if cb := fn.currentBlock; cb != nil && (cb == fn.Blocks[0] || cb == fn.Recover || cb.Preds != nil) {
-		// Control fell off the end of the function's body block.
-		//
-		// Block optimizations eliminate the current block, if
-		// unreachable.  It is a builder invariant that
-		// if this no-arg return is ill-typed for
-		// fn.Signature.Results, this block must be
-		// unreachable.  The sanity checker checks this.
-		fn.emit(new(RunDefers))
-		fn.emit(new(Return))
-	}
-	fn.finishBody()
-}
-
-// buildFuncDecl builds SSA code for the function or method declared
-// by decl in package pkg.
-//
-func (b *builder) buildFuncDecl(pkg *Package, decl *ast.FuncDecl) {
-	id := decl.Name
-	if isBlankIdent(id) {
-		return // discard
-	}
-	fn := pkg.values[pkg.info.Defs[id]].(*Function)
-	if decl.Recv == nil && id.Name == "init" {
-		var v Call
-		v.Call.Value = fn
-		v.setType(types.NewTuple())
-		pkg.init.emit(&v)
-	}
-	b.buildFunction(fn)
-}
-
-// Build calls Package.Build for each package in prog.
-// Building occurs in parallel unless the BuildSerially mode flag was set.
-//
-// Build is intended for whole-program analysis; a typical compiler
-// need only build a single package.
-//
-// Build is idempotent and thread-safe.
-//
-func (prog *Program) Build() {
-	var wg sync.WaitGroup
-	for _, p := range prog.packages {
-		if prog.mode&BuildSerially != 0 {
-			p.Build()
-		} else {
-			wg.Add(1)
-			go func(p *Package) {
-				p.Build()
-				wg.Done()
-			}(p)
-		}
-	}
-	wg.Wait()
-}
-
-// Build builds SSA code for all functions and vars in package p.
-//
-// Precondition: CreatePackage must have been called for all of p's
-// direct imports (and hence its direct imports must have been
-// error-free).
-//
-// Build is idempotent and thread-safe.
-//
-func (p *Package) Build() { p.buildOnce.Do(p.build) }
-
-func (p *Package) build() {
-	if p.info == nil {
-		return // synthetic package, e.g. "testmain"
-	}
-
-	// Ensure we have runtime type info for all exported members.
-	// TODO(adonovan): ideally belongs in memberFromObject, but
-	// that would require package creation in topological order.
-	for name, mem := range p.Members {
-		if ast.IsExported(name) {
-			p.Prog.needMethodsOf(mem.Type())
-		}
-	}
-	if p.Prog.mode&LogSource != 0 {
-		defer logStack("build %s", p)()
-	}
-	init := p.init
-	init.startBody()
-
-	var done *BasicBlock
-
-	if p.Prog.mode&BareInits == 0 {
-		// Make init() skip if package is already initialized.
-		initguard := p.Var("init$guard")
-		doinit := init.newBasicBlock("init.start")
-		done = init.newBasicBlock("init.done")
-		emitIf(init, emitLoad(init, initguard), done, doinit)
-		init.currentBlock = doinit
-		emitStore(init, initguard, vTrue, token.NoPos)
-
-		// Call the init() function of each package we import.
-		for _, pkg := range p.Pkg.Imports() {
-			prereq := p.Prog.packages[pkg]
-			if prereq == nil {
-				panic(fmt.Sprintf("Package(%q).Build(): unsatisfied import: Program.CreatePackage(%q) was not called", p.Pkg.Path(), pkg.Path()))
-			}
-			var v Call
-			v.Call.Value = prereq.init
-			v.Call.pos = init.pos
-			v.setType(types.NewTuple())
-			init.emit(&v)
-		}
-	}
-
-	var b builder
-
-	// Initialize package-level vars in correct order.
-	for _, varinit := range p.info.InitOrder {
-		if init.Prog.mode&LogSource != 0 {
-			fmt.Fprintf(os.Stderr, "build global initializer %v @ %s\n",
-				varinit.Lhs, p.Prog.Fset.Position(varinit.Rhs.Pos()))
-		}
-		if len(varinit.Lhs) == 1 {
-			// 1:1 initialization: var x, y = a(), b()
-			var lval lvalue
-			if v := varinit.Lhs[0]; v.Name() != "_" {
-				lval = &address{addr: p.values[v].(*Global), pos: v.Pos()}
-			} else {
-				lval = blank{}
-			}
-			b.assign(init, lval, varinit.Rhs, true, nil)
-		} else {
-			// n:1 initialization: var x, y :=  f()
-			tuple := b.exprN(init, varinit.Rhs)
-			for i, v := range varinit.Lhs {
-				if v.Name() == "_" {
-					continue
-				}
-				emitStore(init, p.values[v].(*Global), emitExtract(init, tuple, i), v.Pos())
-			}
-		}
-	}
-
-	// Build all package-level functions, init functions
-	// and methods, including unreachable/blank ones.
-	// We build them in source order, but it's not significant.
-	for _, file := range p.files {
-		for _, decl := range file.Decls {
-			if decl, ok := decl.(*ast.FuncDecl); ok {
-				b.buildFuncDecl(p, decl)
-			}
-		}
-	}
-
-	// Finish up init().
-	if p.Prog.mode&BareInits == 0 {
-		emitJump(init, done)
-		init.currentBlock = done
-	}
-	init.emit(new(Return))
-	init.finishBody()
-
-	p.info = nil // We no longer need ASTs or go/types deductions.
-
-	if p.Prog.mode&SanityCheckFunctions != 0 {
-		sanityCheckPackage(p)
-	}
-}
-
-// Like ObjectOf, but panics instead of returning nil.
-// Only valid during p's create and build phases.
-func (p *Package) objectOf(id *ast.Ident) types.Object {
-	if o := p.info.ObjectOf(id); o != nil {
-		return o
-	}
-	panic(fmt.Sprintf("no types.Object for ast.Ident %s @ %s",
-		id.Name, p.Prog.Fset.Position(id.Pos())))
-}
-
-// Like TypeOf, but panics instead of returning nil.
-// Only valid during p's create and build phases.
-func (p *Package) typeOf(e ast.Expr) types.Type {
-	if T := p.info.TypeOf(e); T != nil {
-		return T
-	}
-	panic(fmt.Sprintf("no type for %T @ %s",
-		e, p.Prog.Fset.Position(e.Pos())))
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/builder_test.go b/installer/vendor/golang.org/x/tools/go/ssa/builder_test.go
deleted file mode 100644
index c45f930b3a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/builder_test.go
+++ /dev/null
@@ -1,500 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa_test
-
-import (
-	"bytes"
-	"go/ast"
-	"go/importer"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-func isEmpty(f *ssa.Function) bool { return f.Blocks == nil }
-
-// Tests that programs partially loaded from gc object files contain
-// functions with no code for the external portions, but are otherwise ok.
-func TestBuildPackage(t *testing.T) {
-	input := `
-package main
-
-import (
-	"bytes"
-	"io"
-	"testing"
-)
-
-func main() {
-        var t testing.T
-	t.Parallel()    // static call to external declared method
-        t.Fail()        // static call to promoted external declared method
-        testing.Short() // static call to external package-level function
-
-        var w io.Writer = new(bytes.Buffer)
-        w.Write(nil)    // interface invoke of external declared method
-}
-`
-
-	// Parse the file.
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "input.go", input, 0)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	// Build an SSA program from the parsed file.
-	// Load its dependencies from gc binary export data.
-	mainPkg, _, err := ssautil.BuildPackage(&types.Config{Importer: importer.Default()}, fset,
-		types.NewPackage("main", ""), []*ast.File{f}, ssa.SanityCheckFunctions)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	// The main package, its direct and indirect dependencies are loaded.
-	deps := []string{
-		// directly imported dependencies:
-		"bytes", "io", "testing",
-		// indirect dependencies mentioned by
-		// the direct imports' export data
-		"sync", "unicode", "time",
-	}
-
-	prog := mainPkg.Prog
-	all := prog.AllPackages()
-	if len(all) <= len(deps) {
-		t.Errorf("unexpected set of loaded packages: %q", all)
-	}
-	for _, path := range deps {
-		pkg := prog.ImportedPackage(path)
-		if pkg == nil {
-			t.Errorf("package not loaded: %q", path)
-			continue
-		}
-
-		// External packages should have no function bodies (except for wrappers).
-		isExt := pkg != mainPkg
-
-		// init()
-		if isExt && !isEmpty(pkg.Func("init")) {
-			t.Errorf("external package %s has non-empty init", pkg)
-		} else if !isExt && isEmpty(pkg.Func("init")) {
-			t.Errorf("main package %s has empty init", pkg)
-		}
-
-		for _, mem := range pkg.Members {
-			switch mem := mem.(type) {
-			case *ssa.Function:
-				// Functions at package level.
-				if isExt && !isEmpty(mem) {
-					t.Errorf("external function %s is non-empty", mem)
-				} else if !isExt && isEmpty(mem) {
-					t.Errorf("function %s is empty", mem)
-				}
-
-			case *ssa.Type:
-				// Methods of named types T.
-				// (In this test, all exported methods belong to *T not T.)
-				if !isExt {
-					t.Fatalf("unexpected name type in main package: %s", mem)
-				}
-				mset := prog.MethodSets.MethodSet(types.NewPointer(mem.Type()))
-				for i, n := 0, mset.Len(); i < n; i++ {
-					m := prog.MethodValue(mset.At(i))
-					// For external types, only synthetic wrappers have code.
-					expExt := !strings.Contains(m.Synthetic, "wrapper")
-					if expExt && !isEmpty(m) {
-						t.Errorf("external method %s is non-empty: %s",
-							m, m.Synthetic)
-					} else if !expExt && isEmpty(m) {
-						t.Errorf("method function %s is empty: %s",
-							m, m.Synthetic)
-					}
-				}
-			}
-		}
-	}
-
-	expectedCallee := []string{
-		"(*testing.T).Parallel",
-		"(*testing.common).Fail",
-		"testing.Short",
-		"N/A",
-	}
-	callNum := 0
-	for _, b := range mainPkg.Func("main").Blocks {
-		for _, instr := range b.Instrs {
-			switch instr := instr.(type) {
-			case ssa.CallInstruction:
-				call := instr.Common()
-				if want := expectedCallee[callNum]; want != "N/A" {
-					got := call.StaticCallee().String()
-					if want != got {
-						t.Errorf("call #%d from main.main: got callee %s, want %s",
-							callNum, got, want)
-					}
-				}
-				callNum++
-			}
-		}
-	}
-	if callNum != 4 {
-		t.Errorf("in main.main: got %d calls, want %d", callNum, 4)
-	}
-}
-
-// TestRuntimeTypes tests that (*Program).RuntimeTypes() includes all necessary types.
-func TestRuntimeTypes(t *testing.T) {
-	tests := []struct {
-		input string
-		want  []string
-	}{
-		// An exported package-level type is needed.
-		{`package A; type T struct{}; func (T) f() {}`,
-			[]string{"*p.T", "p.T"},
-		},
-		// An unexported package-level type is not needed.
-		{`package B; type t struct{}; func (t) f() {}`,
-			nil,
-		},
-		// Subcomponents of type of exported package-level var are needed.
-		{`package C; import "bytes"; var V struct {*bytes.Buffer}`,
-			[]string{"*bytes.Buffer", "*struct{*bytes.Buffer}", "struct{*bytes.Buffer}"},
-		},
-		// Subcomponents of type of unexported package-level var are not needed.
-		{`package D; import "bytes"; var v struct {*bytes.Buffer}`,
-			nil,
-		},
-		// Subcomponents of type of exported package-level function are needed.
-		{`package E; import "bytes"; func F(struct {*bytes.Buffer}) {}`,
-			[]string{"*bytes.Buffer", "struct{*bytes.Buffer}"},
-		},
-		// Subcomponents of type of unexported package-level function are not needed.
-		{`package F; import "bytes"; func f(struct {*bytes.Buffer}) {}`,
-			nil,
-		},
-		// Subcomponents of type of exported method of uninstantiated unexported type are not needed.
-		{`package G; import "bytes"; type x struct{}; func (x) G(struct {*bytes.Buffer}) {}; var v x`,
-			nil,
-		},
-		// ...unless used by MakeInterface.
-		{`package G2; import "bytes"; type x struct{}; func (x) G(struct {*bytes.Buffer}) {}; var v interface{} = x{}`,
-			[]string{"*bytes.Buffer", "*p.x", "p.x", "struct{*bytes.Buffer}"},
-		},
-		// Subcomponents of type of unexported method are not needed.
-		{`package I; import "bytes"; type X struct{}; func (X) G(struct {*bytes.Buffer}) {}`,
-			[]string{"*bytes.Buffer", "*p.X", "p.X", "struct{*bytes.Buffer}"},
-		},
-		// Local types aren't needed.
-		{`package J; import "bytes"; func f() { type T struct {*bytes.Buffer}; var t T; _ = t }`,
-			nil,
-		},
-		// ...unless used by MakeInterface.
-		{`package K; import "bytes"; func f() { type T struct {*bytes.Buffer}; _ = interface{}(T{}) }`,
-			[]string{"*bytes.Buffer", "*p.T", "p.T"},
-		},
-		// Types used as operand of MakeInterface are needed.
-		{`package L; import "bytes"; func f() { _ = interface{}(struct{*bytes.Buffer}{}) }`,
-			[]string{"*bytes.Buffer", "struct{*bytes.Buffer}"},
-		},
-		// MakeInterface is optimized away when storing to a blank.
-		{`package M; import "bytes"; var _ interface{} = struct{*bytes.Buffer}{}`,
-			nil,
-		},
-	}
-	for _, test := range tests {
-		// Parse the file.
-		fset := token.NewFileSet()
-		f, err := parser.ParseFile(fset, "input.go", test.input, 0)
-		if err != nil {
-			t.Errorf("test %q: %s", test.input[:15], err)
-			continue
-		}
-
-		// Create a single-file main package.
-		// Load dependencies from gc binary export data.
-		ssapkg, _, err := ssautil.BuildPackage(&types.Config{Importer: importer.Default()}, fset,
-			types.NewPackage("p", ""), []*ast.File{f}, ssa.SanityCheckFunctions)
-		if err != nil {
-			t.Errorf("test %q: %s", test.input[:15], err)
-			continue
-		}
-
-		var typstrs []string
-		for _, T := range ssapkg.Prog.RuntimeTypes() {
-			typstrs = append(typstrs, T.String())
-		}
-		sort.Strings(typstrs)
-
-		if !reflect.DeepEqual(typstrs, test.want) {
-			t.Errorf("test 'package %s': got %q, want %q",
-				f.Name.Name, typstrs, test.want)
-		}
-	}
-}
-
-// TestInit tests that synthesized init functions are correctly formed.
-// Bare init functions omit calls to dependent init functions and the use of
-// an init guard. They are useful in cases where the client uses a different
-// calling convention for init functions, or cases where it is easier for a
-// client to analyze bare init functions. Both of these aspects are used by
-// the llgo compiler for simpler integration with gccgo's runtime library,
-// and to simplify the analysis whereby it deduces which stores to globals
-// can be lowered to global initializers.
-func TestInit(t *testing.T) {
-	tests := []struct {
-		mode        ssa.BuilderMode
-		input, want string
-	}{
-		{0, `package A; import _ "errors"; var i int = 42`,
-			`# Name: A.init
-# Package: A
-# Synthetic: package initializer
-func init():
-0:                                                                entry P:0 S:2
-	t0 = *init$guard                                                   bool
-	if t0 goto 2 else 1
-1:                                                           init.start P:1 S:1
-	*init$guard = true:bool
-	t1 = errors.init()                                                   ()
-	*i = 42:int
-	jump 2
-2:                                                            init.done P:2 S:0
-	return
-
-`},
-		{ssa.BareInits, `package B; import _ "errors"; var i int = 42`,
-			`# Name: B.init
-# Package: B
-# Synthetic: package initializer
-func init():
-0:                                                                entry P:0 S:0
-	*i = 42:int
-	return
-
-`},
-	}
-	for _, test := range tests {
-		// Create a single-file main package.
-		var conf loader.Config
-		f, err := conf.ParseFile("<input>", test.input)
-		if err != nil {
-			t.Errorf("test %q: %s", test.input[:15], err)
-			continue
-		}
-		conf.CreateFromFiles(f.Name.Name, f)
-
-		lprog, err := conf.Load()
-		if err != nil {
-			t.Errorf("test 'package %s': Load: %s", f.Name.Name, err)
-			continue
-		}
-		prog := ssautil.CreateProgram(lprog, test.mode)
-		mainPkg := prog.Package(lprog.Created[0].Pkg)
-		prog.Build()
-		initFunc := mainPkg.Func("init")
-		if initFunc == nil {
-			t.Errorf("test 'package %s': no init function", f.Name.Name)
-			continue
-		}
-
-		var initbuf bytes.Buffer
-		_, err = initFunc.WriteTo(&initbuf)
-		if err != nil {
-			t.Errorf("test 'package %s': WriteTo: %s", f.Name.Name, err)
-			continue
-		}
-
-		if initbuf.String() != test.want {
-			t.Errorf("test 'package %s': got %s, want %s", f.Name.Name, initbuf.String(), test.want)
-		}
-	}
-}
-
-// TestSyntheticFuncs checks that the expected synthetic functions are
-// created, reachable, and not duplicated.
-func TestSyntheticFuncs(t *testing.T) {
-	const input = `package P
-type T int
-func (T) f() int
-func (*T) g() int
-var (
-	// thunks
-	a = T.f
-	b = T.f
-	c = (struct{T}).f
-	d = (struct{T}).f
-	e = (*T).g
-	f = (*T).g
-	g = (struct{*T}).g
-	h = (struct{*T}).g
-
-	// bounds
-	i = T(0).f
-	j = T(0).f
-	k = new(T).g
-	l = new(T).g
-
-	// wrappers
-	m interface{} = struct{T}{}
-	n interface{} = struct{T}{}
-	o interface{} = struct{*T}{}
-	p interface{} = struct{*T}{}
-	q interface{} = new(struct{T})
-	r interface{} = new(struct{T})
-	s interface{} = new(struct{*T})
-	t interface{} = new(struct{*T})
-)
-`
-	// Parse
-	var conf loader.Config
-	f, err := conf.ParseFile("<input>", input)
-	if err != nil {
-		t.Fatalf("parse: %v", err)
-	}
-	conf.CreateFromFiles(f.Name.Name, f)
-
-	// Load
-	lprog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load: %v", err)
-	}
-
-	// Create and build SSA
-	prog := ssautil.CreateProgram(lprog, 0)
-	prog.Build()
-
-	// Enumerate reachable synthetic functions
-	want := map[string]string{
-		"(*P.T).g$bound": "bound method wrapper for func (*P.T).g() int",
-		"(P.T).f$bound":  "bound method wrapper for func (P.T).f() int",
-
-		"(*P.T).g$thunk":         "thunk for func (*P.T).g() int",
-		"(P.T).f$thunk":          "thunk for func (P.T).f() int",
-		"(struct{*P.T}).g$thunk": "thunk for func (*P.T).g() int",
-		"(struct{P.T}).f$thunk":  "thunk for func (P.T).f() int",
-
-		"(*P.T).f":          "wrapper for func (P.T).f() int",
-		"(*struct{*P.T}).f": "wrapper for func (P.T).f() int",
-		"(*struct{*P.T}).g": "wrapper for func (*P.T).g() int",
-		"(*struct{P.T}).f":  "wrapper for func (P.T).f() int",
-		"(*struct{P.T}).g":  "wrapper for func (*P.T).g() int",
-		"(struct{*P.T}).f":  "wrapper for func (P.T).f() int",
-		"(struct{*P.T}).g":  "wrapper for func (*P.T).g() int",
-		"(struct{P.T}).f":   "wrapper for func (P.T).f() int",
-
-		"P.init": "package initializer",
-	}
-	for fn := range ssautil.AllFunctions(prog) {
-		if fn.Synthetic == "" {
-			continue
-		}
-		name := fn.String()
-		wantDescr, ok := want[name]
-		if !ok {
-			t.Errorf("got unexpected/duplicate func: %q: %q", name, fn.Synthetic)
-			continue
-		}
-		delete(want, name)
-
-		if wantDescr != fn.Synthetic {
-			t.Errorf("(%s).Synthetic = %q, want %q", name, fn.Synthetic, wantDescr)
-		}
-	}
-	for fn, descr := range want {
-		t.Errorf("want func: %q: %q", fn, descr)
-	}
-}
-
-// TestPhiElimination ensures that dead phis, including those that
-// participate in a cycle, are properly eliminated.
-func TestPhiElimination(t *testing.T) {
-	const input = `
-package p
-
-func f() error
-
-func g(slice []int) {
-	for {
-		for range slice {
-			// e should not be lifted to a dead φ-node.
-			e := f()
-			h(e)
-		}
-	}
-}
-
-func h(error)
-`
-	// The SSA code for this function should look something like this:
-	// 0:
-	//         jump 1
-	// 1:
-	//         t0 = len(slice)
-	//         jump 2
-	// 2:
-	//         t1 = phi [1: -1:int, 3: t2]
-	//         t2 = t1 + 1:int
-	//         t3 = t2 < t0
-	//         if t3 goto 3 else 1
-	// 3:
-	//         t4 = f()
-	//         t5 = h(t4)
-	//         jump 2
-	//
-	// But earlier versions of the SSA construction algorithm would
-	// additionally generate this cycle of dead phis:
-	//
-	// 1:
-	//         t7 = phi [0: nil:error, 2: t8] #e
-	//         ...
-	// 2:
-	//         t8 = phi [1: t7, 3: t4] #e
-	//         ...
-
-	// Parse
-	var conf loader.Config
-	f, err := conf.ParseFile("<input>", input)
-	if err != nil {
-		t.Fatalf("parse: %v", err)
-	}
-	conf.CreateFromFiles("p", f)
-
-	// Load
-	lprog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load: %v", err)
-	}
-
-	// Create and build SSA
-	prog := ssautil.CreateProgram(lprog, 0)
-	p := prog.Package(lprog.Package("p").Pkg)
-	p.Build()
-	g := p.Func("g")
-
-	phis := 0
-	for _, b := range g.Blocks {
-		for _, instr := range b.Instrs {
-			if _, ok := instr.(*ssa.Phi); ok {
-				phis++
-			}
-		}
-	}
-	if phis != 1 {
-		g.WriteTo(os.Stderr)
-		t.Errorf("expected a single Phi (for the range index), got %d", phis)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/const.go b/installer/vendor/golang.org/x/tools/go/ssa/const.go
deleted file mode 100644
index 2870eea5e9..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/const.go
+++ /dev/null
@@ -1,169 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines the Const SSA value type.
-
-import (
-	"fmt"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"strconv"
-)
-
-// NewConst returns a new constant of the specified value and type.
-// val must be valid according to the specification of Const.Value.
-//
-func NewConst(val exact.Value, typ types.Type) *Const {
-	return &Const{typ, val}
-}
-
-// intConst returns an 'int' constant that evaluates to i.
-// (i is an int64 in case the host is narrower than the target.)
-func intConst(i int64) *Const {
-	return NewConst(exact.MakeInt64(i), tInt)
-}
-
-// nilConst returns a nil constant of the specified type, which may
-// be any reference type, including interfaces.
-//
-func nilConst(typ types.Type) *Const {
-	return NewConst(nil, typ)
-}
-
-// stringConst returns a 'string' constant that evaluates to s.
-func stringConst(s string) *Const {
-	return NewConst(exact.MakeString(s), tString)
-}
-
-// zeroConst returns a new "zero" constant of the specified type,
-// which must not be an array or struct type: the zero values of
-// aggregates are well-defined but cannot be represented by Const.
-//
-func zeroConst(t types.Type) *Const {
-	switch t := t.(type) {
-	case *types.Basic:
-		switch {
-		case t.Info()&types.IsBoolean != 0:
-			return NewConst(exact.MakeBool(false), t)
-		case t.Info()&types.IsNumeric != 0:
-			return NewConst(exact.MakeInt64(0), t)
-		case t.Info()&types.IsString != 0:
-			return NewConst(exact.MakeString(""), t)
-		case t.Kind() == types.UnsafePointer:
-			fallthrough
-		case t.Kind() == types.UntypedNil:
-			return nilConst(t)
-		default:
-			panic(fmt.Sprint("zeroConst for unexpected type:", t))
-		}
-	case *types.Pointer, *types.Slice, *types.Interface, *types.Chan, *types.Map, *types.Signature:
-		return nilConst(t)
-	case *types.Named:
-		return NewConst(zeroConst(t.Underlying()).Value, t)
-	case *types.Array, *types.Struct, *types.Tuple:
-		panic(fmt.Sprint("zeroConst applied to aggregate:", t))
-	}
-	panic(fmt.Sprint("zeroConst: unexpected ", t))
-}
-
-func (c *Const) RelString(from *types.Package) string {
-	var s string
-	if c.Value == nil {
-		s = "nil"
-	} else if c.Value.Kind() == exact.String {
-		s = exact.StringVal(c.Value)
-		const max = 20
-		// TODO(adonovan): don't cut a rune in half.
-		if len(s) > max {
-			s = s[:max-3] + "..." // abbreviate
-		}
-		s = strconv.Quote(s)
-	} else {
-		s = c.Value.String()
-	}
-	return s + ":" + relType(c.Type(), from)
-}
-
-func (c *Const) Name() string {
-	return c.RelString(nil)
-}
-
-func (c *Const) String() string {
-	return c.Name()
-}
-
-func (c *Const) Type() types.Type {
-	return c.typ
-}
-
-func (c *Const) Referrers() *[]Instruction {
-	return nil
-}
-
-func (c *Const) Parent() *Function { return nil }
-
-func (c *Const) Pos() token.Pos {
-	return token.NoPos
-}
-
-// IsNil returns true if this constant represents a typed or untyped nil value.
-func (c *Const) IsNil() bool {
-	return c.Value == nil
-}
-
-// TODO(adonovan): move everything below into golang.org/x/tools/go/ssa/interp.
-
-// Int64 returns the numeric value of this constant truncated to fit
-// a signed 64-bit integer.
-//
-func (c *Const) Int64() int64 {
-	switch x := exact.ToInt(c.Value); x.Kind() {
-	case exact.Int:
-		if i, ok := exact.Int64Val(x); ok {
-			return i
-		}
-		return 0
-	case exact.Float:
-		f, _ := exact.Float64Val(x)
-		return int64(f)
-	}
-	panic(fmt.Sprintf("unexpected constant value: %T", c.Value))
-}
-
-// Uint64 returns the numeric value of this constant truncated to fit
-// an unsigned 64-bit integer.
-//
-func (c *Const) Uint64() uint64 {
-	switch x := exact.ToInt(c.Value); x.Kind() {
-	case exact.Int:
-		if u, ok := exact.Uint64Val(x); ok {
-			return u
-		}
-		return 0
-	case exact.Float:
-		f, _ := exact.Float64Val(x)
-		return uint64(f)
-	}
-	panic(fmt.Sprintf("unexpected constant value: %T", c.Value))
-}
-
-// Float64 returns the numeric value of this constant truncated to fit
-// a float64.
-//
-func (c *Const) Float64() float64 {
-	f, _ := exact.Float64Val(c.Value)
-	return f
-}
-
-// Complex128 returns the complex value of this constant truncated to
-// fit a complex128.
-//
-func (c *Const) Complex128() complex128 {
-	re, _ := exact.Float64Val(exact.Real(c.Value))
-	im, _ := exact.Float64Val(exact.Imag(c.Value))
-	return complex(re, im)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/create.go b/installer/vendor/golang.org/x/tools/go/ssa/create.go
deleted file mode 100644
index 69ac12b1bf..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/create.go
+++ /dev/null
@@ -1,263 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file implements the CREATE phase of SSA construction.
-// See builder.go for explanation.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"os"
-	"sync"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// NewProgram returns a new SSA Program.
-//
-// mode controls diagnostics and checking during SSA construction.
-//
-func NewProgram(fset *token.FileSet, mode BuilderMode) *Program {
-	prog := &Program{
-		Fset:     fset,
-		imported: make(map[string]*Package),
-		packages: make(map[*types.Package]*Package),
-		thunks:   make(map[selectionKey]*Function),
-		bounds:   make(map[*types.Func]*Function),
-		mode:     mode,
-	}
-
-	h := typeutil.MakeHasher() // protected by methodsMu, in effect
-	prog.methodSets.SetHasher(h)
-	prog.canon.SetHasher(h)
-
-	return prog
-}
-
-// memberFromObject populates package pkg with a member for the
-// typechecker object obj.
-//
-// For objects from Go source code, syntax is the associated syntax
-// tree (for funcs and vars only); it will be used during the build
-// phase.
-//
-func memberFromObject(pkg *Package, obj types.Object, syntax ast.Node) {
-	name := obj.Name()
-	switch obj := obj.(type) {
-	case *types.Builtin:
-		if pkg.Pkg != types.Unsafe {
-			panic("unexpected builtin object: " + obj.String())
-		}
-
-	case *types.TypeName:
-		pkg.Members[name] = &Type{
-			object: obj,
-			pkg:    pkg,
-		}
-
-	case *types.Const:
-		c := &NamedConst{
-			object: obj,
-			Value:  NewConst(obj.Val(), obj.Type()),
-			pkg:    pkg,
-		}
-		pkg.values[obj] = c.Value
-		pkg.Members[name] = c
-
-	case *types.Var:
-		g := &Global{
-			Pkg:    pkg,
-			name:   name,
-			object: obj,
-			typ:    types.NewPointer(obj.Type()), // address
-			pos:    obj.Pos(),
-		}
-		pkg.values[obj] = g
-		pkg.Members[name] = g
-
-	case *types.Func:
-		sig := obj.Type().(*types.Signature)
-		if sig.Recv() == nil && name == "init" {
-			pkg.ninit++
-			name = fmt.Sprintf("init#%d", pkg.ninit)
-		}
-		fn := &Function{
-			name:      name,
-			object:    obj,
-			Signature: sig,
-			syntax:    syntax,
-			pos:       obj.Pos(),
-			Pkg:       pkg,
-			Prog:      pkg.Prog,
-		}
-		if syntax == nil {
-			fn.Synthetic = "loaded from gc object file"
-		}
-
-		pkg.values[obj] = fn
-		if sig.Recv() == nil {
-			pkg.Members[name] = fn // package-level function
-		}
-
-	default: // (incl. *types.Package)
-		panic("unexpected Object type: " + obj.String())
-	}
-}
-
-// membersFromDecl populates package pkg with members for each
-// typechecker object (var, func, const or type) associated with the
-// specified decl.
-//
-func membersFromDecl(pkg *Package, decl ast.Decl) {
-	switch decl := decl.(type) {
-	case *ast.GenDecl: // import, const, type or var
-		switch decl.Tok {
-		case token.CONST:
-			for _, spec := range decl.Specs {
-				for _, id := range spec.(*ast.ValueSpec).Names {
-					if !isBlankIdent(id) {
-						memberFromObject(pkg, pkg.info.Defs[id], nil)
-					}
-				}
-			}
-
-		case token.VAR:
-			for _, spec := range decl.Specs {
-				for _, id := range spec.(*ast.ValueSpec).Names {
-					if !isBlankIdent(id) {
-						memberFromObject(pkg, pkg.info.Defs[id], spec)
-					}
-				}
-			}
-
-		case token.TYPE:
-			for _, spec := range decl.Specs {
-				id := spec.(*ast.TypeSpec).Name
-				if !isBlankIdent(id) {
-					memberFromObject(pkg, pkg.info.Defs[id], nil)
-				}
-			}
-		}
-
-	case *ast.FuncDecl:
-		id := decl.Name
-		if !isBlankIdent(id) {
-			memberFromObject(pkg, pkg.info.Defs[id], decl)
-		}
-	}
-}
-
-// CreatePackage constructs and returns an SSA Package from the
-// specified type-checked, error-free file ASTs, and populates its
-// Members mapping.
-//
-// importable determines whether this package should be returned by a
-// subsequent call to ImportedPackage(pkg.Path()).
-//
-// The real work of building SSA form for each function is not done
-// until a subsequent call to Package.Build().
-//
-func (prog *Program) CreatePackage(pkg *types.Package, files []*ast.File, info *types.Info, importable bool) *Package {
-	p := &Package{
-		Prog:    prog,
-		Members: make(map[string]Member),
-		values:  make(map[types.Object]Value),
-		Pkg:     pkg,
-		info:    info,  // transient (CREATE and BUILD phases)
-		files:   files, // transient (CREATE and BUILD phases)
-	}
-
-	// Add init() function.
-	p.init = &Function{
-		name:      "init",
-		Signature: new(types.Signature),
-		Synthetic: "package initializer",
-		Pkg:       p,
-		Prog:      prog,
-	}
-	p.Members[p.init.name] = p.init
-
-	// CREATE phase.
-	// Allocate all package members: vars, funcs, consts and types.
-	if len(files) > 0 {
-		// Go source package.
-		for _, file := range files {
-			for _, decl := range file.Decls {
-				membersFromDecl(p, decl)
-			}
-		}
-	} else {
-		// GC-compiled binary package (or "unsafe")
-		// No code.
-		// No position information.
-		scope := p.Pkg.Scope()
-		for _, name := range scope.Names() {
-			obj := scope.Lookup(name)
-			memberFromObject(p, obj, nil)
-			if obj, ok := obj.(*types.TypeName); ok {
-				if named, ok := obj.Type().(*types.Named); ok {
-					for i, n := 0, named.NumMethods(); i < n; i++ {
-						memberFromObject(p, named.Method(i), nil)
-					}
-				}
-			}
-		}
-	}
-
-	if prog.mode&BareInits == 0 {
-		// Add initializer guard variable.
-		initguard := &Global{
-			Pkg:  p,
-			name: "init$guard",
-			typ:  types.NewPointer(tBool),
-		}
-		p.Members[initguard.Name()] = initguard
-	}
-
-	if prog.mode&GlobalDebug != 0 {
-		p.SetDebugMode(true)
-	}
-
-	if prog.mode&PrintPackages != 0 {
-		printMu.Lock()
-		p.WriteTo(os.Stdout)
-		printMu.Unlock()
-	}
-
-	if importable {
-		prog.imported[p.Pkg.Path()] = p
-	}
-	prog.packages[p.Pkg] = p
-
-	return p
-}
-
-// printMu serializes printing of Packages/Functions to stdout.
-var printMu sync.Mutex
-
-// AllPackages returns a new slice containing all packages in the
-// program prog in unspecified order.
-//
-func (prog *Program) AllPackages() []*Package {
-	pkgs := make([]*Package, 0, len(prog.packages))
-	for _, pkg := range prog.packages {
-		pkgs = append(pkgs, pkg)
-	}
-	return pkgs
-}
-
-// ImportedPackage returns the importable SSA Package whose import
-// path is path, or nil if no such SSA package has been created.
-//
-// Not all packages are importable.  For example, no import
-// declaration can resolve to the x_test package created by 'go test'
-// or the ad-hoc main package created 'go build foo.go'.
-//
-func (prog *Program) ImportedPackage(path string) *Package {
-	return prog.imported[path]
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/doc.go b/installer/vendor/golang.org/x/tools/go/ssa/doc.go
deleted file mode 100644
index 2aa04f4365..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/doc.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ssa defines a representation of the elements of Go programs
-// (packages, types, functions, variables and constants) using a
-// static single-assignment (SSA) form intermediate representation
-// (IR) for the bodies of functions.
-//
-// THIS INTERFACE IS EXPERIMENTAL AND IS LIKELY TO CHANGE.
-//
-// For an introduction to SSA form, see
-// http://en.wikipedia.org/wiki/Static_single_assignment_form.
-// This page provides a broader reading list:
-// http://www.dcs.gla.ac.uk/~jsinger/ssa.html.
-//
-// The level of abstraction of the SSA form is intentionally close to
-// the source language to facilitate construction of source analysis
-// tools.  It is not intended for machine code generation.
-//
-// All looping, branching and switching constructs are replaced with
-// unstructured control flow.  Higher-level control flow constructs
-// such as multi-way branch can be reconstructed as needed; see
-// ssautil.Switches() for an example.
-//
-// To construct an SSA-form program, call ssautil.CreateProgram on a
-// loader.Program, a set of type-checked packages created from
-// parsed Go source files.  The resulting ssa.Program contains all the
-// packages and their members, but SSA code is not created for
-// function bodies until a subsequent call to (*Package).Build.
-//
-// The builder initially builds a naive SSA form in which all local
-// variables are addresses of stack locations with explicit loads and
-// stores.  Registerisation of eligible locals and φ-node insertion
-// using dominance and dataflow are then performed as a second pass
-// called "lifting" to improve the accuracy and performance of
-// subsequent analyses; this pass can be skipped by setting the
-// NaiveForm builder flag.
-//
-// The primary interfaces of this package are:
-//
-//    - Member: a named member of a Go package.
-//    - Value: an expression that yields a value.
-//    - Instruction: a statement that consumes values and performs computation.
-//    - Node: a Value or Instruction (emphasizing its membership in the SSA value graph)
-//
-// A computation that yields a result implements both the Value and
-// Instruction interfaces.  The following table shows for each
-// concrete type which of these interfaces it implements.
-//
-//                      Value?          Instruction?    Member?
-//   *Alloc             ✔               ✔
-//   *BinOp             ✔               ✔
-//   *Builtin           ✔
-//   *Call              ✔               ✔
-//   *ChangeInterface   ✔               ✔
-//   *ChangeType        ✔               ✔
-//   *Const             ✔
-//   *Convert           ✔               ✔
-//   *DebugRef                          ✔
-//   *Defer                             ✔
-//   *Extract           ✔               ✔
-//   *Field             ✔               ✔
-//   *FieldAddr         ✔               ✔
-//   *FreeVar           ✔
-//   *Function          ✔                               ✔ (func)
-//   *Global            ✔                               ✔ (var)
-//   *Go                                ✔
-//   *If                                ✔
-//   *Index             ✔               ✔
-//   *IndexAddr         ✔               ✔
-//   *Jump                              ✔
-//   *Lookup            ✔               ✔
-//   *MakeChan          ✔               ✔
-//   *MakeClosure       ✔               ✔
-//   *MakeInterface     ✔               ✔
-//   *MakeMap           ✔               ✔
-//   *MakeSlice         ✔               ✔
-//   *MapUpdate                         ✔
-//   *NamedConst                                        ✔ (const)
-//   *Next              ✔               ✔
-//   *Panic                             ✔
-//   *Parameter         ✔
-//   *Phi               ✔               ✔
-//   *Range             ✔               ✔
-//   *Return                            ✔
-//   *RunDefers                         ✔
-//   *Select            ✔               ✔
-//   *Send                              ✔
-//   *Slice             ✔               ✔
-//   *Store                             ✔
-//   *Type                                              ✔ (type)
-//   *TypeAssert        ✔               ✔
-//   *UnOp              ✔               ✔
-//
-// Other key types in this package include: Program, Package, Function
-// and BasicBlock.
-//
-// The program representation constructed by this package is fully
-// resolved internally, i.e. it does not rely on the names of Values,
-// Packages, Functions, Types or BasicBlocks for the correct
-// interpretation of the program.  Only the identities of objects and
-// the topology of the SSA and type graphs are semantically
-// significant.  (There is one exception: Ids, used to identify field
-// and method names, contain strings.)  Avoidance of name-based
-// operations simplifies the implementation of subsequent passes and
-// can make them very efficient.  Many objects are nonetheless named
-// to aid in debugging, but it is not essential that the names be
-// either accurate or unambiguous.  The public API exposes a number of
-// name-based maps for client convenience.
-//
-// The ssa/ssautil package provides various utilities that depend only
-// on the public API of this package.
-//
-// TODO(adonovan): Consider the exceptional control-flow implications
-// of defer and recover().
-//
-// TODO(adonovan): write a how-to document for all the various cases
-// of trying to determine corresponding elements across the four
-// domains of source locations, ast.Nodes, types.Objects,
-// ssa.Values/Instructions.
-//
-package ssa // import "golang.org/x/tools/go/ssa"
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/dom.go b/installer/vendor/golang.org/x/tools/go/ssa/dom.go
deleted file mode 100644
index 12ef4308f3..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/dom.go
+++ /dev/null
@@ -1,341 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines algorithms related to dominance.
-
-// Dominator tree construction ----------------------------------------
-//
-// We use the algorithm described in Lengauer & Tarjan. 1979.  A fast
-// algorithm for finding dominators in a flowgraph.
-// http://doi.acm.org/10.1145/357062.357071
-//
-// We also apply the optimizations to SLT described in Georgiadis et
-// al, Finding Dominators in Practice, JGAA 2006,
-// http://jgaa.info/accepted/2006/GeorgiadisTarjanWerneck2006.10.1.pdf
-// to avoid the need for buckets of size > 1.
-
-import (
-	"bytes"
-	"fmt"
-	"math/big"
-	"os"
-	"sort"
-)
-
-// Idom returns the block that immediately dominates b:
-// its parent in the dominator tree, if any.
-// Neither the entry node (b.Index==0) nor recover node
-// (b==b.Parent().Recover()) have a parent.
-//
-func (b *BasicBlock) Idom() *BasicBlock { return b.dom.idom }
-
-// Dominees returns the list of blocks that b immediately dominates:
-// its children in the dominator tree.
-//
-func (b *BasicBlock) Dominees() []*BasicBlock { return b.dom.children }
-
-// Dominates reports whether b dominates c.
-func (b *BasicBlock) Dominates(c *BasicBlock) bool {
-	return b.dom.pre <= c.dom.pre && c.dom.post <= b.dom.post
-}
-
-type byDomPreorder []*BasicBlock
-
-func (a byDomPreorder) Len() int           { return len(a) }
-func (a byDomPreorder) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a byDomPreorder) Less(i, j int) bool { return a[i].dom.pre < a[j].dom.pre }
-
-// DomPreorder returns a new slice containing the blocks of f in
-// dominator tree preorder.
-//
-func (f *Function) DomPreorder() []*BasicBlock {
-	n := len(f.Blocks)
-	order := make(byDomPreorder, n, n)
-	copy(order, f.Blocks)
-	sort.Sort(order)
-	return order
-}
-
-// domInfo contains a BasicBlock's dominance information.
-type domInfo struct {
-	idom      *BasicBlock   // immediate dominator (parent in domtree)
-	children  []*BasicBlock // nodes immediately dominated by this one
-	pre, post int32         // pre- and post-order numbering within domtree
-}
-
-// ltState holds the working state for Lengauer-Tarjan algorithm
-// (during which domInfo.pre is repurposed for CFG DFS preorder number).
-type ltState struct {
-	// Each slice is indexed by b.Index.
-	sdom     []*BasicBlock // b's semidominator
-	parent   []*BasicBlock // b's parent in DFS traversal of CFG
-	ancestor []*BasicBlock // b's ancestor with least sdom
-}
-
-// dfs implements the depth-first search part of the LT algorithm.
-func (lt *ltState) dfs(v *BasicBlock, i int32, preorder []*BasicBlock) int32 {
-	preorder[i] = v
-	v.dom.pre = i // For now: DFS preorder of spanning tree of CFG
-	i++
-	lt.sdom[v.Index] = v
-	lt.link(nil, v)
-	for _, w := range v.Succs {
-		if lt.sdom[w.Index] == nil {
-			lt.parent[w.Index] = v
-			i = lt.dfs(w, i, preorder)
-		}
-	}
-	return i
-}
-
-// eval implements the EVAL part of the LT algorithm.
-func (lt *ltState) eval(v *BasicBlock) *BasicBlock {
-	// TODO(adonovan): opt: do path compression per simple LT.
-	u := v
-	for ; lt.ancestor[v.Index] != nil; v = lt.ancestor[v.Index] {
-		if lt.sdom[v.Index].dom.pre < lt.sdom[u.Index].dom.pre {
-			u = v
-		}
-	}
-	return u
-}
-
-// link implements the LINK part of the LT algorithm.
-func (lt *ltState) link(v, w *BasicBlock) {
-	lt.ancestor[w.Index] = v
-}
-
-// buildDomTree computes the dominator tree of f using the LT algorithm.
-// Precondition: all blocks are reachable (e.g. optimizeBlocks has been run).
-//
-func buildDomTree(f *Function) {
-	// The step numbers refer to the original LT paper; the
-	// reordering is due to Georgiadis.
-
-	// Clear any previous domInfo.
-	for _, b := range f.Blocks {
-		b.dom = domInfo{}
-	}
-
-	n := len(f.Blocks)
-	// Allocate space for 5 contiguous [n]*BasicBlock arrays:
-	// sdom, parent, ancestor, preorder, buckets.
-	space := make([]*BasicBlock, 5*n, 5*n)
-	lt := ltState{
-		sdom:     space[0:n],
-		parent:   space[n : 2*n],
-		ancestor: space[2*n : 3*n],
-	}
-
-	// Step 1.  Number vertices by depth-first preorder.
-	preorder := space[3*n : 4*n]
-	root := f.Blocks[0]
-	prenum := lt.dfs(root, 0, preorder)
-	recover := f.Recover
-	if recover != nil {
-		lt.dfs(recover, prenum, preorder)
-	}
-
-	buckets := space[4*n : 5*n]
-	copy(buckets, preorder)
-
-	// In reverse preorder...
-	for i := int32(n) - 1; i > 0; i-- {
-		w := preorder[i]
-
-		// Step 3. Implicitly define the immediate dominator of each node.
-		for v := buckets[i]; v != w; v = buckets[v.dom.pre] {
-			u := lt.eval(v)
-			if lt.sdom[u.Index].dom.pre < i {
-				v.dom.idom = u
-			} else {
-				v.dom.idom = w
-			}
-		}
-
-		// Step 2. Compute the semidominators of all nodes.
-		lt.sdom[w.Index] = lt.parent[w.Index]
-		for _, v := range w.Preds {
-			u := lt.eval(v)
-			if lt.sdom[u.Index].dom.pre < lt.sdom[w.Index].dom.pre {
-				lt.sdom[w.Index] = lt.sdom[u.Index]
-			}
-		}
-
-		lt.link(lt.parent[w.Index], w)
-
-		if lt.parent[w.Index] == lt.sdom[w.Index] {
-			w.dom.idom = lt.parent[w.Index]
-		} else {
-			buckets[i] = buckets[lt.sdom[w.Index].dom.pre]
-			buckets[lt.sdom[w.Index].dom.pre] = w
-		}
-	}
-
-	// The final 'Step 3' is now outside the loop.
-	for v := buckets[0]; v != root; v = buckets[v.dom.pre] {
-		v.dom.idom = root
-	}
-
-	// Step 4. Explicitly define the immediate dominator of each
-	// node, in preorder.
-	for _, w := range preorder[1:] {
-		if w == root || w == recover {
-			w.dom.idom = nil
-		} else {
-			if w.dom.idom != lt.sdom[w.Index] {
-				w.dom.idom = w.dom.idom.dom.idom
-			}
-			// Calculate Children relation as inverse of Idom.
-			w.dom.idom.dom.children = append(w.dom.idom.dom.children, w)
-		}
-	}
-
-	pre, post := numberDomTree(root, 0, 0)
-	if recover != nil {
-		numberDomTree(recover, pre, post)
-	}
-
-	// printDomTreeDot(os.Stderr, f)        // debugging
-	// printDomTreeText(os.Stderr, root, 0) // debugging
-
-	if f.Prog.mode&SanityCheckFunctions != 0 {
-		sanityCheckDomTree(f)
-	}
-}
-
-// numberDomTree sets the pre- and post-order numbers of a depth-first
-// traversal of the dominator tree rooted at v.  These are used to
-// answer dominance queries in constant time.
-//
-func numberDomTree(v *BasicBlock, pre, post int32) (int32, int32) {
-	v.dom.pre = pre
-	pre++
-	for _, child := range v.dom.children {
-		pre, post = numberDomTree(child, pre, post)
-	}
-	v.dom.post = post
-	post++
-	return pre, post
-}
-
-// Testing utilities ----------------------------------------
-
-// sanityCheckDomTree checks the correctness of the dominator tree
-// computed by the LT algorithm by comparing against the dominance
-// relation computed by a naive Kildall-style forward dataflow
-// analysis (Algorithm 10.16 from the "Dragon" book).
-//
-func sanityCheckDomTree(f *Function) {
-	n := len(f.Blocks)
-
-	// D[i] is the set of blocks that dominate f.Blocks[i],
-	// represented as a bit-set of block indices.
-	D := make([]big.Int, n)
-
-	one := big.NewInt(1)
-
-	// all is the set of all blocks; constant.
-	var all big.Int
-	all.Set(one).Lsh(&all, uint(n)).Sub(&all, one)
-
-	// Initialization.
-	for i, b := range f.Blocks {
-		if i == 0 || b == f.Recover {
-			// A root is dominated only by itself.
-			D[i].SetBit(&D[0], 0, 1)
-		} else {
-			// All other blocks are (initially) dominated
-			// by every block.
-			D[i].Set(&all)
-		}
-	}
-
-	// Iteration until fixed point.
-	for changed := true; changed; {
-		changed = false
-		for i, b := range f.Blocks {
-			if i == 0 || b == f.Recover {
-				continue
-			}
-			// Compute intersection across predecessors.
-			var x big.Int
-			x.Set(&all)
-			for _, pred := range b.Preds {
-				x.And(&x, &D[pred.Index])
-			}
-			x.SetBit(&x, i, 1) // a block always dominates itself.
-			if D[i].Cmp(&x) != 0 {
-				D[i].Set(&x)
-				changed = true
-			}
-		}
-	}
-
-	// Check the entire relation.  O(n^2).
-	// The Recover block (if any) must be treated specially so we skip it.
-	ok := true
-	for i := 0; i < n; i++ {
-		for j := 0; j < n; j++ {
-			b, c := f.Blocks[i], f.Blocks[j]
-			if c == f.Recover {
-				continue
-			}
-			actual := b.Dominates(c)
-			expected := D[j].Bit(i) == 1
-			if actual != expected {
-				fmt.Fprintf(os.Stderr, "dominates(%s, %s)==%t, want %t\n", b, c, actual, expected)
-				ok = false
-			}
-		}
-	}
-
-	preorder := f.DomPreorder()
-	for _, b := range f.Blocks {
-		if got := preorder[b.dom.pre]; got != b {
-			fmt.Fprintf(os.Stderr, "preorder[%d]==%s, want %s\n", b.dom.pre, got, b)
-			ok = false
-		}
-	}
-
-	if !ok {
-		panic("sanityCheckDomTree failed for " + f.String())
-	}
-
-}
-
-// Printing functions ----------------------------------------
-
-// printDomTree prints the dominator tree as text, using indentation.
-func printDomTreeText(buf *bytes.Buffer, v *BasicBlock, indent int) {
-	fmt.Fprintf(buf, "%*s%s\n", 4*indent, "", v)
-	for _, child := range v.dom.children {
-		printDomTreeText(buf, child, indent+1)
-	}
-}
-
-// printDomTreeDot prints the dominator tree of f in AT&T GraphViz
-// (.dot) format.
-func printDomTreeDot(buf *bytes.Buffer, f *Function) {
-	fmt.Fprintln(buf, "//", f)
-	fmt.Fprintln(buf, "digraph domtree {")
-	for i, b := range f.Blocks {
-		v := b.dom
-		fmt.Fprintf(buf, "\tn%d [label=\"%s (%d, %d)\",shape=\"rectangle\"];\n", v.pre, b, v.pre, v.post)
-		// TODO(adonovan): improve appearance of edges
-		// belonging to both dominator tree and CFG.
-
-		// Dominator tree edge.
-		if i != 0 {
-			fmt.Fprintf(buf, "\tn%d -> n%d [style=\"solid\",weight=100];\n", v.idom.dom.pre, v.pre)
-		}
-		// CFG edges.
-		for _, pred := range b.Preds {
-			fmt.Fprintf(buf, "\tn%d -> n%d [style=\"dotted\",weight=0];\n", pred.dom.pre, v.pre)
-		}
-	}
-	fmt.Fprintln(buf, "}")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/emit.go b/installer/vendor/golang.org/x/tools/go/ssa/emit.go
deleted file mode 100644
index 1036988adc..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/emit.go
+++ /dev/null
@@ -1,468 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// Helpers for emitting SSA instructions.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-)
-
-// emitNew emits to f a new (heap Alloc) instruction allocating an
-// object of type typ.  pos is the optional source location.
-//
-func emitNew(f *Function, typ types.Type, pos token.Pos) *Alloc {
-	v := &Alloc{Heap: true}
-	v.setType(types.NewPointer(typ))
-	v.setPos(pos)
-	f.emit(v)
-	return v
-}
-
-// emitLoad emits to f an instruction to load the address addr into a
-// new temporary, and returns the value so defined.
-//
-func emitLoad(f *Function, addr Value) *UnOp {
-	v := &UnOp{Op: token.MUL, X: addr}
-	v.setType(deref(addr.Type()))
-	f.emit(v)
-	return v
-}
-
-// emitDebugRef emits to f a DebugRef pseudo-instruction associating
-// expression e with value v.
-//
-func emitDebugRef(f *Function, e ast.Expr, v Value, isAddr bool) {
-	if !f.debugInfo() {
-		return // debugging not enabled
-	}
-	if v == nil || e == nil {
-		panic("nil")
-	}
-	var obj types.Object
-	e = unparen(e)
-	if id, ok := e.(*ast.Ident); ok {
-		if isBlankIdent(id) {
-			return
-		}
-		obj = f.Pkg.objectOf(id)
-		switch obj.(type) {
-		case *types.Nil, *types.Const, *types.Builtin:
-			return
-		}
-	}
-	f.emit(&DebugRef{
-		X:      v,
-		Expr:   e,
-		IsAddr: isAddr,
-		object: obj,
-	})
-}
-
-// emitArith emits to f code to compute the binary operation op(x, y)
-// where op is an eager shift, logical or arithmetic operation.
-// (Use emitCompare() for comparisons and Builder.logicalBinop() for
-// non-eager operations.)
-//
-func emitArith(f *Function, op token.Token, x, y Value, t types.Type, pos token.Pos) Value {
-	switch op {
-	case token.SHL, token.SHR:
-		x = emitConv(f, x, t)
-		// y may be signed or an 'untyped' constant.
-		// TODO(adonovan): whence signed values?
-		if b, ok := y.Type().Underlying().(*types.Basic); ok && b.Info()&types.IsUnsigned == 0 {
-			y = emitConv(f, y, types.Typ[types.Uint64])
-		}
-
-	case token.ADD, token.SUB, token.MUL, token.QUO, token.REM, token.AND, token.OR, token.XOR, token.AND_NOT:
-		x = emitConv(f, x, t)
-		y = emitConv(f, y, t)
-
-	default:
-		panic("illegal op in emitArith: " + op.String())
-
-	}
-	v := &BinOp{
-		Op: op,
-		X:  x,
-		Y:  y,
-	}
-	v.setPos(pos)
-	v.setType(t)
-	return f.emit(v)
-}
-
-// emitCompare emits to f code compute the boolean result of
-// comparison comparison 'x op y'.
-//
-func emitCompare(f *Function, op token.Token, x, y Value, pos token.Pos) Value {
-	xt := x.Type().Underlying()
-	yt := y.Type().Underlying()
-
-	// Special case to optimise a tagless SwitchStmt so that
-	// these are equivalent
-	//   switch { case e: ...}
-	//   switch true { case e: ... }
-	//   if e==true { ... }
-	// even in the case when e's type is an interface.
-	// TODO(adonovan): opt: generalise to x==true, false!=y, etc.
-	if x == vTrue && op == token.EQL {
-		if yt, ok := yt.(*types.Basic); ok && yt.Info()&types.IsBoolean != 0 {
-			return y
-		}
-	}
-
-	if types.Identical(xt, yt) {
-		// no conversion necessary
-	} else if _, ok := xt.(*types.Interface); ok {
-		y = emitConv(f, y, x.Type())
-	} else if _, ok := yt.(*types.Interface); ok {
-		x = emitConv(f, x, y.Type())
-	} else if _, ok := x.(*Const); ok {
-		x = emitConv(f, x, y.Type())
-	} else if _, ok := y.(*Const); ok {
-		y = emitConv(f, y, x.Type())
-	} else {
-		// other cases, e.g. channels.  No-op.
-	}
-
-	v := &BinOp{
-		Op: op,
-		X:  x,
-		Y:  y,
-	}
-	v.setPos(pos)
-	v.setType(tBool)
-	return f.emit(v)
-}
-
-// isValuePreserving returns true if a conversion from ut_src to
-// ut_dst is value-preserving, i.e. just a change of type.
-// Precondition: neither argument is a named type.
-//
-func isValuePreserving(ut_src, ut_dst types.Type) bool {
-	// Identical underlying types?
-	if structTypesIdentical(ut_dst, ut_src) {
-		return true
-	}
-
-	switch ut_dst.(type) {
-	case *types.Chan:
-		// Conversion between channel types?
-		_, ok := ut_src.(*types.Chan)
-		return ok
-
-	case *types.Pointer:
-		// Conversion between pointers with identical base types?
-		_, ok := ut_src.(*types.Pointer)
-		return ok
-	}
-	return false
-}
-
-// emitConv emits to f code to convert Value val to exactly type typ,
-// and returns the converted value.  Implicit conversions are required
-// by language assignability rules in assignments, parameter passing,
-// etc.  Conversions cannot fail dynamically.
-//
-func emitConv(f *Function, val Value, typ types.Type) Value {
-	t_src := val.Type()
-
-	// Identical types?  Conversion is a no-op.
-	if types.Identical(t_src, typ) {
-		return val
-	}
-
-	ut_dst := typ.Underlying()
-	ut_src := t_src.Underlying()
-
-	// Just a change of type, but not value or representation?
-	if isValuePreserving(ut_src, ut_dst) {
-		c := &ChangeType{X: val}
-		c.setType(typ)
-		return f.emit(c)
-	}
-
-	// Conversion to, or construction of a value of, an interface type?
-	if _, ok := ut_dst.(*types.Interface); ok {
-		// Assignment from one interface type to another?
-		if _, ok := ut_src.(*types.Interface); ok {
-			c := &ChangeInterface{X: val}
-			c.setType(typ)
-			return f.emit(c)
-		}
-
-		// Untyped nil constant?  Return interface-typed nil constant.
-		if ut_src == tUntypedNil {
-			return nilConst(typ)
-		}
-
-		// Convert (non-nil) "untyped" literals to their default type.
-		if t, ok := ut_src.(*types.Basic); ok && t.Info()&types.IsUntyped != 0 {
-			val = emitConv(f, val, DefaultType(ut_src))
-		}
-
-		f.Pkg.Prog.needMethodsOf(val.Type())
-		mi := &MakeInterface{X: val}
-		mi.setType(typ)
-		return f.emit(mi)
-	}
-
-	// Conversion of a compile-time constant value?
-	if c, ok := val.(*Const); ok {
-		if _, ok := ut_dst.(*types.Basic); ok || c.IsNil() {
-			// Conversion of a compile-time constant to
-			// another constant type results in a new
-			// constant of the destination type and
-			// (initially) the same abstract value.
-			// We don't truncate the value yet.
-			return NewConst(c.Value, typ)
-		}
-
-		// We're converting from constant to non-constant type,
-		// e.g. string -> []byte/[]rune.
-	}
-
-	// A representation-changing conversion?
-	// At least one of {ut_src,ut_dst} must be *Basic.
-	// (The other may be []byte or []rune.)
-	_, ok1 := ut_src.(*types.Basic)
-	_, ok2 := ut_dst.(*types.Basic)
-	if ok1 || ok2 {
-		c := &Convert{X: val}
-		c.setType(typ)
-		return f.emit(c)
-	}
-
-	panic(fmt.Sprintf("in %s: cannot convert %s (%s) to %s", f, val, val.Type(), typ))
-}
-
-// emitStore emits to f an instruction to store value val at location
-// addr, applying implicit conversions as required by assignability rules.
-//
-func emitStore(f *Function, addr, val Value, pos token.Pos) *Store {
-	s := &Store{
-		Addr: addr,
-		Val:  emitConv(f, val, deref(addr.Type())),
-		pos:  pos,
-	}
-	f.emit(s)
-	return s
-}
-
-// emitJump emits to f a jump to target, and updates the control-flow graph.
-// Postcondition: f.currentBlock is nil.
-//
-func emitJump(f *Function, target *BasicBlock) {
-	b := f.currentBlock
-	b.emit(new(Jump))
-	addEdge(b, target)
-	f.currentBlock = nil
-}
-
-// emitIf emits to f a conditional jump to tblock or fblock based on
-// cond, and updates the control-flow graph.
-// Postcondition: f.currentBlock is nil.
-//
-func emitIf(f *Function, cond Value, tblock, fblock *BasicBlock) {
-	b := f.currentBlock
-	b.emit(&If{Cond: cond})
-	addEdge(b, tblock)
-	addEdge(b, fblock)
-	f.currentBlock = nil
-}
-
-// emitExtract emits to f an instruction to extract the index'th
-// component of tuple.  It returns the extracted value.
-//
-func emitExtract(f *Function, tuple Value, index int) Value {
-	e := &Extract{Tuple: tuple, Index: index}
-	e.setType(tuple.Type().(*types.Tuple).At(index).Type())
-	return f.emit(e)
-}
-
-// emitTypeAssert emits to f a type assertion value := x.(t) and
-// returns the value.  x.Type() must be an interface.
-//
-func emitTypeAssert(f *Function, x Value, t types.Type, pos token.Pos) Value {
-	a := &TypeAssert{X: x, AssertedType: t}
-	a.setPos(pos)
-	a.setType(t)
-	return f.emit(a)
-}
-
-// emitTypeTest emits to f a type test value,ok := x.(t) and returns
-// a (value, ok) tuple.  x.Type() must be an interface.
-//
-func emitTypeTest(f *Function, x Value, t types.Type, pos token.Pos) Value {
-	a := &TypeAssert{
-		X:            x,
-		AssertedType: t,
-		CommaOk:      true,
-	}
-	a.setPos(pos)
-	a.setType(types.NewTuple(
-		newVar("value", t),
-		varOk,
-	))
-	return f.emit(a)
-}
-
-// emitTailCall emits to f a function call in tail position.  The
-// caller is responsible for all fields of 'call' except its type.
-// Intended for wrapper methods.
-// Precondition: f does/will not use deferred procedure calls.
-// Postcondition: f.currentBlock is nil.
-//
-func emitTailCall(f *Function, call *Call) {
-	tresults := f.Signature.Results()
-	nr := tresults.Len()
-	if nr == 1 {
-		call.typ = tresults.At(0).Type()
-	} else {
-		call.typ = tresults
-	}
-	tuple := f.emit(call)
-	var ret Return
-	switch nr {
-	case 0:
-		// no-op
-	case 1:
-		ret.Results = []Value{tuple}
-	default:
-		for i := 0; i < nr; i++ {
-			v := emitExtract(f, tuple, i)
-			// TODO(adonovan): in principle, this is required:
-			//   v = emitConv(f, o.Type, f.Signature.Results[i].Type)
-			// but in practice emitTailCall is only used when
-			// the types exactly match.
-			ret.Results = append(ret.Results, v)
-		}
-	}
-	f.emit(&ret)
-	f.currentBlock = nil
-}
-
-// emitImplicitSelections emits to f code to apply the sequence of
-// implicit field selections specified by indices to base value v, and
-// returns the selected value.
-//
-// If v is the address of a struct, the result will be the address of
-// a field; if it is the value of a struct, the result will be the
-// value of a field.
-//
-func emitImplicitSelections(f *Function, v Value, indices []int) Value {
-	for _, index := range indices {
-		fld := deref(v.Type()).Underlying().(*types.Struct).Field(index)
-
-		if isPointer(v.Type()) {
-			instr := &FieldAddr{
-				X:     v,
-				Field: index,
-			}
-			instr.setType(types.NewPointer(fld.Type()))
-			v = f.emit(instr)
-			// Load the field's value iff indirectly embedded.
-			if isPointer(fld.Type()) {
-				v = emitLoad(f, v)
-			}
-		} else {
-			instr := &Field{
-				X:     v,
-				Field: index,
-			}
-			instr.setType(fld.Type())
-			v = f.emit(instr)
-		}
-	}
-	return v
-}
-
-// emitFieldSelection emits to f code to select the index'th field of v.
-//
-// If wantAddr, the input must be a pointer-to-struct and the result
-// will be the field's address; otherwise the result will be the
-// field's value.
-// Ident id is used for position and debug info.
-//
-func emitFieldSelection(f *Function, v Value, index int, wantAddr bool, id *ast.Ident) Value {
-	fld := deref(v.Type()).Underlying().(*types.Struct).Field(index)
-	if isPointer(v.Type()) {
-		instr := &FieldAddr{
-			X:     v,
-			Field: index,
-		}
-		instr.setPos(id.Pos())
-		instr.setType(types.NewPointer(fld.Type()))
-		v = f.emit(instr)
-		// Load the field's value iff we don't want its address.
-		if !wantAddr {
-			v = emitLoad(f, v)
-		}
-	} else {
-		instr := &Field{
-			X:     v,
-			Field: index,
-		}
-		instr.setPos(id.Pos())
-		instr.setType(fld.Type())
-		v = f.emit(instr)
-	}
-	emitDebugRef(f, id, v, wantAddr)
-	return v
-}
-
-// zeroValue emits to f code to produce a zero value of type t,
-// and returns it.
-//
-func zeroValue(f *Function, t types.Type) Value {
-	switch t.Underlying().(type) {
-	case *types.Struct, *types.Array:
-		return emitLoad(f, f.addLocal(t, token.NoPos))
-	default:
-		return zeroConst(t)
-	}
-}
-
-// createRecoverBlock emits to f a block of code to return after a
-// recovered panic, and sets f.Recover to it.
-//
-// If f's result parameters are named, the code loads and returns
-// their current values, otherwise it returns the zero values of their
-// type.
-//
-// Idempotent.
-//
-func createRecoverBlock(f *Function) {
-	if f.Recover != nil {
-		return // already created
-	}
-	saved := f.currentBlock
-
-	f.Recover = f.newBasicBlock("recover")
-	f.currentBlock = f.Recover
-
-	var results []Value
-	if f.namedResults != nil {
-		// Reload NRPs to form value tuple.
-		for _, r := range f.namedResults {
-			results = append(results, emitLoad(f, r))
-		}
-	} else {
-		R := f.Signature.Results()
-		for i, n := 0, R.Len(); i < n; i++ {
-			T := R.At(i).Type()
-
-			// Return zero value of each result type.
-			results = append(results, zeroValue(f, T))
-		}
-	}
-	f.emit(&Return{Results: results})
-
-	f.currentBlock = saved
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/example_test.go b/installer/vendor/golang.org/x/tools/go/ssa/example_test.go
deleted file mode 100644
index 31fa561383..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/example_test.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/importer"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-const hello = `
-package main
-
-import "fmt"
-
-const message = "Hello, World!"
-
-func main() {
-	fmt.Println(message)
-}
-`
-
-// This program demonstrates how to run the SSA builder on a single
-// package of one or more already-parsed files.  Its dependencies are
-// loaded from compiler export data.  This is what you'd typically use
-// for a compiler; it does not depend on golang.org/x/tools/go/loader.
-//
-// It shows the printed representation of packages, functions, and
-// instructions.  Within the function listing, the name of each
-// BasicBlock such as ".0.entry" is printed left-aligned, followed by
-// the block's Instructions.
-//
-// For each instruction that defines an SSA virtual register
-// (i.e. implements Value), the type of that value is shown in the
-// right column.
-//
-// Build and run the ssadump.go program if you want a standalone tool
-// with similar functionality. It is located at
-// golang.org/x/tools/cmd/ssadump.
-//
-func ExampleBuildPackage() {
-	// Parse the source files.
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "hello.go", hello, parser.ParseComments)
-	if err != nil {
-		fmt.Print(err) // parse error
-		return
-	}
-	files := []*ast.File{f}
-
-	// Create the type-checker's package.
-	pkg := types.NewPackage("hello", "")
-
-	// Type-check the package, load dependencies.
-	// Create and build the SSA program.
-	hello, _, err := ssautil.BuildPackage(
-		&types.Config{Importer: importer.Default()}, fset, pkg, files, ssa.SanityCheckFunctions)
-	if err != nil {
-		fmt.Print(err) // type error in some package
-		return
-	}
-
-	// Print out the package.
-	hello.WriteTo(os.Stdout)
-
-	// Print out the package-level functions.
-	hello.Func("init").WriteTo(os.Stdout)
-	hello.Func("main").WriteTo(os.Stdout)
-
-	// Output:
-	//
-	// package hello:
-	//   func  init       func()
-	//   var   init$guard bool
-	//   func  main       func()
-	//   const message    message = "Hello, World!":untyped string
-	//
-	// # Name: hello.init
-	// # Package: hello
-	// # Synthetic: package initializer
-	// func init():
-	// 0:                                                                entry P:0 S:2
-	// 	t0 = *init$guard                                                   bool
-	// 	if t0 goto 2 else 1
-	// 1:                                                           init.start P:1 S:1
-	// 	*init$guard = true:bool
-	// 	t1 = fmt.init()                                                      ()
-	// 	jump 2
-	// 2:                                                            init.done P:2 S:0
-	// 	return
-	//
-	// # Name: hello.main
-	// # Package: hello
-	// # Location: hello.go:8:6
-	// func main():
-	// 0:                                                                entry P:0 S:0
-	// 	t0 = new [1]interface{} (varargs)                       *[1]interface{}
-	// 	t1 = &t0[0:int]                                            *interface{}
-	// 	t2 = make interface{} <- string ("Hello, World!":string)    interface{}
-	// 	*t1 = t2
-	// 	t3 = slice t0[:]                                          []interface{}
-	// 	t4 = fmt.Println(t3...)                              (n int, err error)
-	// 	return
-}
-
-// This program shows how to load a main package (cmd/cover) and all its
-// dependencies from source, using the loader, and then build SSA code
-// for the entire program.  This is what you'd typically use for a
-// whole-program analysis.
-//
-func ExampleLoadProgram() {
-	// Load cmd/cover and its dependencies.
-	var conf loader.Config
-	conf.Import("cmd/cover")
-	lprog, err := conf.Load()
-	if err != nil {
-		fmt.Print(err) // type error in some package
-		return
-	}
-
-	// Create SSA-form program representation.
-	prog := ssautil.CreateProgram(lprog, ssa.SanityCheckFunctions)
-
-	// Build SSA code for the entire cmd/cover program.
-	prog.Build()
-
-	// Output:
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/func.go b/installer/vendor/golang.org/x/tools/go/ssa/func.go
deleted file mode 100644
index b21ff4e521..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/func.go
+++ /dev/null
@@ -1,689 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file implements the Function and BasicBlock types.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"io"
-	"os"
-	"strings"
-)
-
-// addEdge adds a control-flow graph edge from from to to.
-func addEdge(from, to *BasicBlock) {
-	from.Succs = append(from.Succs, to)
-	to.Preds = append(to.Preds, from)
-}
-
-// Parent returns the function that contains block b.
-func (b *BasicBlock) Parent() *Function { return b.parent }
-
-// String returns a human-readable label of this block.
-// It is not guaranteed unique within the function.
-//
-func (b *BasicBlock) String() string {
-	return fmt.Sprintf("%d", b.Index)
-}
-
-// emit appends an instruction to the current basic block.
-// If the instruction defines a Value, it is returned.
-//
-func (b *BasicBlock) emit(i Instruction) Value {
-	i.setBlock(b)
-	b.Instrs = append(b.Instrs, i)
-	v, _ := i.(Value)
-	return v
-}
-
-// predIndex returns the i such that b.Preds[i] == c or panics if
-// there is none.
-func (b *BasicBlock) predIndex(c *BasicBlock) int {
-	for i, pred := range b.Preds {
-		if pred == c {
-			return i
-		}
-	}
-	panic(fmt.Sprintf("no edge %s -> %s", c, b))
-}
-
-// hasPhi returns true if b.Instrs contains φ-nodes.
-func (b *BasicBlock) hasPhi() bool {
-	_, ok := b.Instrs[0].(*Phi)
-	return ok
-}
-
-// phis returns the prefix of b.Instrs containing all the block's φ-nodes.
-func (b *BasicBlock) phis() []Instruction {
-	for i, instr := range b.Instrs {
-		if _, ok := instr.(*Phi); !ok {
-			return b.Instrs[:i]
-		}
-	}
-	return nil // unreachable in well-formed blocks
-}
-
-// replacePred replaces all occurrences of p in b's predecessor list with q.
-// Ordinarily there should be at most one.
-//
-func (b *BasicBlock) replacePred(p, q *BasicBlock) {
-	for i, pred := range b.Preds {
-		if pred == p {
-			b.Preds[i] = q
-		}
-	}
-}
-
-// replaceSucc replaces all occurrences of p in b's successor list with q.
-// Ordinarily there should be at most one.
-//
-func (b *BasicBlock) replaceSucc(p, q *BasicBlock) {
-	for i, succ := range b.Succs {
-		if succ == p {
-			b.Succs[i] = q
-		}
-	}
-}
-
-// removePred removes all occurrences of p in b's
-// predecessor list and φ-nodes.
-// Ordinarily there should be at most one.
-//
-func (b *BasicBlock) removePred(p *BasicBlock) {
-	phis := b.phis()
-
-	// We must preserve edge order for φ-nodes.
-	j := 0
-	for i, pred := range b.Preds {
-		if pred != p {
-			b.Preds[j] = b.Preds[i]
-			// Strike out φ-edge too.
-			for _, instr := range phis {
-				phi := instr.(*Phi)
-				phi.Edges[j] = phi.Edges[i]
-			}
-			j++
-		}
-	}
-	// Nil out b.Preds[j:] and φ-edges[j:] to aid GC.
-	for i := j; i < len(b.Preds); i++ {
-		b.Preds[i] = nil
-		for _, instr := range phis {
-			instr.(*Phi).Edges[i] = nil
-		}
-	}
-	b.Preds = b.Preds[:j]
-	for _, instr := range phis {
-		phi := instr.(*Phi)
-		phi.Edges = phi.Edges[:j]
-	}
-}
-
-// Destinations associated with unlabelled for/switch/select stmts.
-// We push/pop one of these as we enter/leave each construct and for
-// each BranchStmt we scan for the innermost target of the right type.
-//
-type targets struct {
-	tail         *targets // rest of stack
-	_break       *BasicBlock
-	_continue    *BasicBlock
-	_fallthrough *BasicBlock
-}
-
-// Destinations associated with a labelled block.
-// We populate these as labels are encountered in forward gotos or
-// labelled statements.
-//
-type lblock struct {
-	_goto     *BasicBlock
-	_break    *BasicBlock
-	_continue *BasicBlock
-}
-
-// labelledBlock returns the branch target associated with the
-// specified label, creating it if needed.
-//
-func (f *Function) labelledBlock(label *ast.Ident) *lblock {
-	lb := f.lblocks[label.Obj]
-	if lb == nil {
-		lb = &lblock{_goto: f.newBasicBlock(label.Name)}
-		if f.lblocks == nil {
-			f.lblocks = make(map[*ast.Object]*lblock)
-		}
-		f.lblocks[label.Obj] = lb
-	}
-	return lb
-}
-
-// addParam adds a (non-escaping) parameter to f.Params of the
-// specified name, type and source position.
-//
-func (f *Function) addParam(name string, typ types.Type, pos token.Pos) *Parameter {
-	v := &Parameter{
-		name:   name,
-		typ:    typ,
-		pos:    pos,
-		parent: f,
-	}
-	f.Params = append(f.Params, v)
-	return v
-}
-
-func (f *Function) addParamObj(obj types.Object) *Parameter {
-	name := obj.Name()
-	if name == "" {
-		name = fmt.Sprintf("arg%d", len(f.Params))
-	}
-	param := f.addParam(name, obj.Type(), obj.Pos())
-	param.object = obj
-	return param
-}
-
-// addSpilledParam declares a parameter that is pre-spilled to the
-// stack; the function body will load/store the spilled location.
-// Subsequent lifting will eliminate spills where possible.
-//
-func (f *Function) addSpilledParam(obj types.Object) {
-	param := f.addParamObj(obj)
-	spill := &Alloc{Comment: obj.Name()}
-	spill.setType(types.NewPointer(obj.Type()))
-	spill.setPos(obj.Pos())
-	f.objects[obj] = spill
-	f.Locals = append(f.Locals, spill)
-	f.emit(spill)
-	f.emit(&Store{Addr: spill, Val: param})
-}
-
-// startBody initializes the function prior to generating SSA code for its body.
-// Precondition: f.Type() already set.
-//
-func (f *Function) startBody() {
-	f.currentBlock = f.newBasicBlock("entry")
-	f.objects = make(map[types.Object]Value) // needed for some synthetics, e.g. init
-}
-
-// createSyntacticParams populates f.Params and generates code (spills
-// and named result locals) for all the parameters declared in the
-// syntax.  In addition it populates the f.objects mapping.
-//
-// Preconditions:
-// f.startBody() was called.
-// Postcondition:
-// len(f.Params) == len(f.Signature.Params) + (f.Signature.Recv() ? 1 : 0)
-//
-func (f *Function) createSyntacticParams(recv *ast.FieldList, functype *ast.FuncType) {
-	// Receiver (at most one inner iteration).
-	if recv != nil {
-		for _, field := range recv.List {
-			for _, n := range field.Names {
-				f.addSpilledParam(f.Pkg.info.Defs[n])
-			}
-			// Anonymous receiver?  No need to spill.
-			if field.Names == nil {
-				f.addParamObj(f.Signature.Recv())
-			}
-		}
-	}
-
-	// Parameters.
-	if functype.Params != nil {
-		n := len(f.Params) // 1 if has recv, 0 otherwise
-		for _, field := range functype.Params.List {
-			for _, n := range field.Names {
-				f.addSpilledParam(f.Pkg.info.Defs[n])
-			}
-			// Anonymous parameter?  No need to spill.
-			if field.Names == nil {
-				f.addParamObj(f.Signature.Params().At(len(f.Params) - n))
-			}
-		}
-	}
-
-	// Named results.
-	if functype.Results != nil {
-		for _, field := range functype.Results.List {
-			// Implicit "var" decl of locals for named results.
-			for _, n := range field.Names {
-				f.namedResults = append(f.namedResults, f.addLocalForIdent(n))
-			}
-		}
-	}
-}
-
-// numberRegisters assigns numbers to all SSA registers
-// (value-defining Instructions) in f, to aid debugging.
-// (Non-Instruction Values are named at construction.)
-//
-func numberRegisters(f *Function) {
-	v := 0
-	for _, b := range f.Blocks {
-		for _, instr := range b.Instrs {
-			switch instr.(type) {
-			case Value:
-				instr.(interface {
-					setNum(int)
-				}).setNum(v)
-				v++
-			}
-		}
-	}
-}
-
-// buildReferrers populates the def/use information in all non-nil
-// Value.Referrers slice.
-// Precondition: all such slices are initially empty.
-func buildReferrers(f *Function) {
-	var rands []*Value
-	for _, b := range f.Blocks {
-		for _, instr := range b.Instrs {
-			rands = instr.Operands(rands[:0]) // recycle storage
-			for _, rand := range rands {
-				if r := *rand; r != nil {
-					if ref := r.Referrers(); ref != nil {
-						*ref = append(*ref, instr)
-					}
-				}
-			}
-		}
-	}
-}
-
-// finishBody() finalizes the function after SSA code generation of its body.
-func (f *Function) finishBody() {
-	f.objects = nil
-	f.currentBlock = nil
-	f.lblocks = nil
-
-	// Don't pin the AST in memory (except in debug mode).
-	if n := f.syntax; n != nil && !f.debugInfo() {
-		f.syntax = extentNode{n.Pos(), n.End()}
-	}
-
-	// Remove from f.Locals any Allocs that escape to the heap.
-	j := 0
-	for _, l := range f.Locals {
-		if !l.Heap {
-			f.Locals[j] = l
-			j++
-		}
-	}
-	// Nil out f.Locals[j:] to aid GC.
-	for i := j; i < len(f.Locals); i++ {
-		f.Locals[i] = nil
-	}
-	f.Locals = f.Locals[:j]
-
-	optimizeBlocks(f)
-
-	buildReferrers(f)
-
-	buildDomTree(f)
-
-	if f.Prog.mode&NaiveForm == 0 {
-		// For debugging pre-state of lifting pass:
-		// numberRegisters(f)
-		// f.WriteTo(os.Stderr)
-		lift(f)
-	}
-
-	f.namedResults = nil // (used by lifting)
-
-	numberRegisters(f)
-
-	if f.Prog.mode&PrintFunctions != 0 {
-		printMu.Lock()
-		f.WriteTo(os.Stdout)
-		printMu.Unlock()
-	}
-
-	if f.Prog.mode&SanityCheckFunctions != 0 {
-		mustSanityCheck(f, nil)
-	}
-}
-
-// removeNilBlocks eliminates nils from f.Blocks and updates each
-// BasicBlock.Index.  Use this after any pass that may delete blocks.
-//
-func (f *Function) removeNilBlocks() {
-	j := 0
-	for _, b := range f.Blocks {
-		if b != nil {
-			b.Index = j
-			f.Blocks[j] = b
-			j++
-		}
-	}
-	// Nil out f.Blocks[j:] to aid GC.
-	for i := j; i < len(f.Blocks); i++ {
-		f.Blocks[i] = nil
-	}
-	f.Blocks = f.Blocks[:j]
-}
-
-// SetDebugMode sets the debug mode for package pkg.  If true, all its
-// functions will include full debug info.  This greatly increases the
-// size of the instruction stream, and causes Functions to depend upon
-// the ASTs, potentially keeping them live in memory for longer.
-//
-func (pkg *Package) SetDebugMode(debug bool) {
-	// TODO(adonovan): do we want ast.File granularity?
-	pkg.debug = debug
-}
-
-// debugInfo reports whether debug info is wanted for this function.
-func (f *Function) debugInfo() bool {
-	return f.Pkg != nil && f.Pkg.debug
-}
-
-// addNamedLocal creates a local variable, adds it to function f and
-// returns it.  Its name and type are taken from obj.  Subsequent
-// calls to f.lookup(obj) will return the same local.
-//
-func (f *Function) addNamedLocal(obj types.Object) *Alloc {
-	l := f.addLocal(obj.Type(), obj.Pos())
-	l.Comment = obj.Name()
-	f.objects[obj] = l
-	return l
-}
-
-func (f *Function) addLocalForIdent(id *ast.Ident) *Alloc {
-	return f.addNamedLocal(f.Pkg.info.Defs[id])
-}
-
-// addLocal creates an anonymous local variable of type typ, adds it
-// to function f and returns it.  pos is the optional source location.
-//
-func (f *Function) addLocal(typ types.Type, pos token.Pos) *Alloc {
-	v := &Alloc{}
-	v.setType(types.NewPointer(typ))
-	v.setPos(pos)
-	f.Locals = append(f.Locals, v)
-	f.emit(v)
-	return v
-}
-
-// lookup returns the address of the named variable identified by obj
-// that is local to function f or one of its enclosing functions.
-// If escaping, the reference comes from a potentially escaping pointer
-// expression and the referent must be heap-allocated.
-//
-func (f *Function) lookup(obj types.Object, escaping bool) Value {
-	if v, ok := f.objects[obj]; ok {
-		if alloc, ok := v.(*Alloc); ok && escaping {
-			alloc.Heap = true
-		}
-		return v // function-local var (address)
-	}
-
-	// Definition must be in an enclosing function;
-	// plumb it through intervening closures.
-	if f.parent == nil {
-		panic("no ssa.Value for " + obj.String())
-	}
-	outer := f.parent.lookup(obj, true) // escaping
-	v := &FreeVar{
-		name:   obj.Name(),
-		typ:    outer.Type(),
-		pos:    outer.Pos(),
-		outer:  outer,
-		parent: f,
-	}
-	f.objects[obj] = v
-	f.FreeVars = append(f.FreeVars, v)
-	return v
-}
-
-// emit emits the specified instruction to function f.
-func (f *Function) emit(instr Instruction) Value {
-	return f.currentBlock.emit(instr)
-}
-
-// RelString returns the full name of this function, qualified by
-// package name, receiver type, etc.
-//
-// The specific formatting rules are not guaranteed and may change.
-//
-// Examples:
-//      "math.IsNaN"                  // a package-level function
-//      "(*bytes.Buffer).Bytes"       // a declared method or a wrapper
-//      "(*bytes.Buffer).Bytes$thunk" // thunk (func wrapping method; receiver is param 0)
-//      "(*bytes.Buffer).Bytes$bound" // bound (func wrapping method; receiver supplied by closure)
-//      "main.main$1"                 // an anonymous function in main
-//      "main.init#1"                 // a declared init function
-//      "main.init"                   // the synthesized package initializer
-//
-// When these functions are referred to from within the same package
-// (i.e. from == f.Pkg.Object), they are rendered without the package path.
-// For example: "IsNaN", "(*Buffer).Bytes", etc.
-//
-// All non-synthetic functions have distinct package-qualified names.
-// (But two methods may have the same name "(T).f" if one is a synthetic
-// wrapper promoting a non-exported method "f" from another package; in
-// that case, the strings are equal but the identifiers "f" are distinct.)
-//
-func (f *Function) RelString(from *types.Package) string {
-	// Anonymous?
-	if f.parent != nil {
-		// An anonymous function's Name() looks like "parentName$1",
-		// but its String() should include the type/package/etc.
-		parent := f.parent.RelString(from)
-		for i, anon := range f.parent.AnonFuncs {
-			if anon == f {
-				return fmt.Sprintf("%s$%d", parent, 1+i)
-			}
-		}
-
-		return f.name // should never happen
-	}
-
-	// Method (declared or wrapper)?
-	if recv := f.Signature.Recv(); recv != nil {
-		return f.relMethod(from, recv.Type())
-	}
-
-	// Thunk?
-	if f.method != nil {
-		return f.relMethod(from, f.method.Recv())
-	}
-
-	// Bound?
-	if len(f.FreeVars) == 1 && strings.HasSuffix(f.name, "$bound") {
-		return f.relMethod(from, f.FreeVars[0].Type())
-	}
-
-	// Package-level function?
-	// Prefix with package name for cross-package references only.
-	if p := f.pkg(); p != nil && p != from {
-		return fmt.Sprintf("%s.%s", p.Path(), f.name)
-	}
-
-	// Unknown.
-	return f.name
-}
-
-func (f *Function) relMethod(from *types.Package, recv types.Type) string {
-	return fmt.Sprintf("(%s).%s", relType(recv, from), f.name)
-}
-
-// writeSignature writes to buf the signature sig in declaration syntax.
-func writeSignature(buf *bytes.Buffer, from *types.Package, name string, sig *types.Signature, params []*Parameter) {
-	buf.WriteString("func ")
-	if recv := sig.Recv(); recv != nil {
-		buf.WriteString("(")
-		if n := params[0].Name(); n != "" {
-			buf.WriteString(n)
-			buf.WriteString(" ")
-		}
-		types.WriteType(buf, params[0].Type(), types.RelativeTo(from))
-		buf.WriteString(") ")
-	}
-	buf.WriteString(name)
-	types.WriteSignature(buf, sig, types.RelativeTo(from))
-}
-
-func (f *Function) pkg() *types.Package {
-	if f.Pkg != nil {
-		return f.Pkg.Pkg
-	}
-	return nil
-}
-
-var _ io.WriterTo = (*Function)(nil) // *Function implements io.Writer
-
-func (f *Function) WriteTo(w io.Writer) (int64, error) {
-	var buf bytes.Buffer
-	WriteFunction(&buf, f)
-	n, err := w.Write(buf.Bytes())
-	return int64(n), err
-}
-
-// WriteFunction writes to buf a human-readable "disassembly" of f.
-func WriteFunction(buf *bytes.Buffer, f *Function) {
-	fmt.Fprintf(buf, "# Name: %s\n", f.String())
-	if f.Pkg != nil {
-		fmt.Fprintf(buf, "# Package: %s\n", f.Pkg.Pkg.Path())
-	}
-	if syn := f.Synthetic; syn != "" {
-		fmt.Fprintln(buf, "# Synthetic:", syn)
-	}
-	if pos := f.Pos(); pos.IsValid() {
-		fmt.Fprintf(buf, "# Location: %s\n", f.Prog.Fset.Position(pos))
-	}
-
-	if f.parent != nil {
-		fmt.Fprintf(buf, "# Parent: %s\n", f.parent.Name())
-	}
-
-	if f.Recover != nil {
-		fmt.Fprintf(buf, "# Recover: %s\n", f.Recover)
-	}
-
-	from := f.pkg()
-
-	if f.FreeVars != nil {
-		buf.WriteString("# Free variables:\n")
-		for i, fv := range f.FreeVars {
-			fmt.Fprintf(buf, "# % 3d:\t%s %s\n", i, fv.Name(), relType(fv.Type(), from))
-		}
-	}
-
-	if len(f.Locals) > 0 {
-		buf.WriteString("# Locals:\n")
-		for i, l := range f.Locals {
-			fmt.Fprintf(buf, "# % 3d:\t%s %s\n", i, l.Name(), relType(deref(l.Type()), from))
-		}
-	}
-	writeSignature(buf, from, f.Name(), f.Signature, f.Params)
-	buf.WriteString(":\n")
-
-	if f.Blocks == nil {
-		buf.WriteString("\t(external)\n")
-	}
-
-	// NB. column calculations are confused by non-ASCII
-	// characters and assume 8-space tabs.
-	const punchcard = 80 // for old time's sake.
-	const tabwidth = 8
-	for _, b := range f.Blocks {
-		if b == nil {
-			// Corrupt CFG.
-			fmt.Fprintf(buf, ".nil:\n")
-			continue
-		}
-		n, _ := fmt.Fprintf(buf, "%d:", b.Index)
-		bmsg := fmt.Sprintf("%s P:%d S:%d", b.Comment, len(b.Preds), len(b.Succs))
-		fmt.Fprintf(buf, "%*s%s\n", punchcard-1-n-len(bmsg), "", bmsg)
-
-		if false { // CFG debugging
-			fmt.Fprintf(buf, "\t# CFG: %s --> %s --> %s\n", b.Preds, b, b.Succs)
-		}
-		for _, instr := range b.Instrs {
-			buf.WriteString("\t")
-			switch v := instr.(type) {
-			case Value:
-				l := punchcard - tabwidth
-				// Left-align the instruction.
-				if name := v.Name(); name != "" {
-					n, _ := fmt.Fprintf(buf, "%s = ", name)
-					l -= n
-				}
-				n, _ := buf.WriteString(instr.String())
-				l -= n
-				// Right-align the type if there's space.
-				if t := v.Type(); t != nil {
-					buf.WriteByte(' ')
-					ts := relType(t, from)
-					l -= len(ts) + len("  ") // (spaces before and after type)
-					if l > 0 {
-						fmt.Fprintf(buf, "%*s", l, "")
-					}
-					buf.WriteString(ts)
-				}
-			case nil:
-				// Be robust against bad transforms.
-				buf.WriteString("<deleted>")
-			default:
-				buf.WriteString(instr.String())
-			}
-			buf.WriteString("\n")
-		}
-	}
-	fmt.Fprintf(buf, "\n")
-}
-
-// newBasicBlock adds to f a new basic block and returns it.  It does
-// not automatically become the current block for subsequent calls to emit.
-// comment is an optional string for more readable debugging output.
-//
-func (f *Function) newBasicBlock(comment string) *BasicBlock {
-	b := &BasicBlock{
-		Index:   len(f.Blocks),
-		Comment: comment,
-		parent:  f,
-	}
-	b.Succs = b.succs2[:0]
-	f.Blocks = append(f.Blocks, b)
-	return b
-}
-
-// NewFunction returns a new synthetic Function instance belonging to
-// prog, with its name and signature fields set as specified.
-//
-// The caller is responsible for initializing the remaining fields of
-// the function object, e.g. Pkg, Params, Blocks.
-//
-// It is practically impossible for clients to construct well-formed
-// SSA functions/packages/programs directly, so we assume this is the
-// job of the Builder alone.  NewFunction exists to provide clients a
-// little flexibility.  For example, analysis tools may wish to
-// construct fake Functions for the root of the callgraph, a fake
-// "reflect" package, etc.
-//
-// TODO(adonovan): think harder about the API here.
-//
-func (prog *Program) NewFunction(name string, sig *types.Signature, provenance string) *Function {
-	return &Function{Prog: prog, name: name, Signature: sig, Synthetic: provenance}
-}
-
-type extentNode [2]token.Pos
-
-func (n extentNode) Pos() token.Pos { return n[0] }
-func (n extentNode) End() token.Pos { return n[1] }
-
-// Syntax returns an ast.Node whose Pos/End methods provide the
-// lexical extent of the function if it was defined by Go source code
-// (f.Synthetic==""), or nil otherwise.
-//
-// If f was built with debug information (see Package.SetDebugRef),
-// the result is the *ast.FuncDecl or *ast.FuncLit that declared the
-// function.  Otherwise, it is an opaque Node providing only position
-// information; this avoids pinning the AST in memory.
-//
-func (f *Function) Syntax() ast.Node { return f.syntax }
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/identical.go b/installer/vendor/golang.org/x/tools/go/ssa/identical.go
deleted file mode 100644
index 53cbee107b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/identical.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build go1.8
-
-package ssa
-
-import "go/types"
-
-var structTypesIdentical = types.IdenticalIgnoreTags
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/identical_17.go b/installer/vendor/golang.org/x/tools/go/ssa/identical_17.go
deleted file mode 100644
index da89d3339a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/identical_17.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// +build !go1.8
-
-package ssa
-
-import "go/types"
-
-var structTypesIdentical = types.Identical
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/identical_test.go b/installer/vendor/golang.org/x/tools/go/ssa/identical_test.go
deleted file mode 100644
index 404693dcd6..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/identical_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-//+build go1.8
-
-package ssa_test
-
-import "testing"
-
-func TestValueForExprStructConv(t *testing.T) {
-	testValueForExpr(t, "testdata/structconv.go")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/external.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/external.go
deleted file mode 100644
index 181ffa4194..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/external.go
+++ /dev/null
@@ -1,551 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package interp
-
-// Emulated functions that we cannot interpret because they are
-// external or because they use "unsafe" or "reflect" operations.
-
-import (
-	"go/types"
-	"math"
-	"os"
-	"runtime"
-	"strings"
-	"sync/atomic"
-	"time"
-	"unsafe"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-type externalFn func(fr *frame, args []value) value
-
-// TODO(adonovan): fix: reflect.Value abstracts an lvalue or an
-// rvalue; Set() causes mutations that can be observed via aliases.
-// We have not captured that correctly here.
-
-// Key strings are from Function.String().
-var externals = make(map[string]externalFn)
-
-func init() {
-	// That little dot ۰ is an Arabic zero numeral (U+06F0), categories [Nd].
-	for k, v := range map[string]externalFn{
-		"(*sync.Pool).Get":                 ext۰sync۰Pool۰Get,
-		"(*sync.Pool).Put":                 ext۰nop,
-		"(reflect.Value).Bool":             ext۰reflect۰Value۰Bool,
-		"(reflect.Value).CanAddr":          ext۰reflect۰Value۰CanAddr,
-		"(reflect.Value).CanInterface":     ext۰reflect۰Value۰CanInterface,
-		"(reflect.Value).Elem":             ext۰reflect۰Value۰Elem,
-		"(reflect.Value).Field":            ext۰reflect۰Value۰Field,
-		"(reflect.Value).Float":            ext۰reflect۰Value۰Float,
-		"(reflect.Value).Index":            ext۰reflect۰Value۰Index,
-		"(reflect.Value).Int":              ext۰reflect۰Value۰Int,
-		"(reflect.Value).Interface":        ext۰reflect۰Value۰Interface,
-		"(reflect.Value).IsNil":            ext۰reflect۰Value۰IsNil,
-		"(reflect.Value).IsValid":          ext۰reflect۰Value۰IsValid,
-		"(reflect.Value).Kind":             ext۰reflect۰Value۰Kind,
-		"(reflect.Value).Len":              ext۰reflect۰Value۰Len,
-		"(reflect.Value).MapIndex":         ext۰reflect۰Value۰MapIndex,
-		"(reflect.Value).MapKeys":          ext۰reflect۰Value۰MapKeys,
-		"(reflect.Value).NumField":         ext۰reflect۰Value۰NumField,
-		"(reflect.Value).NumMethod":        ext۰reflect۰Value۰NumMethod,
-		"(reflect.Value).Pointer":          ext۰reflect۰Value۰Pointer,
-		"(reflect.Value).Set":              ext۰reflect۰Value۰Set,
-		"(reflect.Value).String":           ext۰reflect۰Value۰String,
-		"(reflect.Value).Type":             ext۰reflect۰Value۰Type,
-		"(reflect.Value).Uint":             ext۰reflect۰Value۰Uint,
-		"(reflect.error).Error":            ext۰reflect۰error۰Error,
-		"(reflect.rtype).Bits":             ext۰reflect۰rtype۰Bits,
-		"(reflect.rtype).Elem":             ext۰reflect۰rtype۰Elem,
-		"(reflect.rtype).Field":            ext۰reflect۰rtype۰Field,
-		"(reflect.rtype).In":               ext۰reflect۰rtype۰In,
-		"(reflect.rtype).Kind":             ext۰reflect۰rtype۰Kind,
-		"(reflect.rtype).NumField":         ext۰reflect۰rtype۰NumField,
-		"(reflect.rtype).NumIn":            ext۰reflect۰rtype۰NumIn,
-		"(reflect.rtype).NumMethod":        ext۰reflect۰rtype۰NumMethod,
-		"(reflect.rtype).NumOut":           ext۰reflect۰rtype۰NumOut,
-		"(reflect.rtype).Out":              ext۰reflect۰rtype۰Out,
-		"(reflect.rtype).Size":             ext۰reflect۰rtype۰Size,
-		"(reflect.rtype).String":           ext۰reflect۰rtype۰String,
-		"bytes.init":                       ext۰nop, // avoid asm dependency
-		"bytes.Equal":                      ext۰bytes۰Equal,
-		"bytes.IndexByte":                  ext۰bytes۰IndexByte,
-		"hash/crc32.haveSSE42":             ext۰crc32۰haveSSE42,
-		"internal/cpu.cpuid":               ext۰cpu۰cpuid,
-		"math.Abs":                         ext۰math۰Abs,
-		"math.Exp":                         ext۰math۰Exp,
-		"math.Float32bits":                 ext۰math۰Float32bits,
-		"math.Float32frombits":             ext۰math۰Float32frombits,
-		"math.Float64bits":                 ext۰math۰Float64bits,
-		"math.Float64frombits":             ext۰math۰Float64frombits,
-		"math.Ldexp":                       ext۰math۰Ldexp,
-		"math.Log":                         ext۰math۰Log,
-		"math.Min":                         ext۰math۰Min,
-		"math.hasSSE4":                     ext۰math۰hasSSE4,
-		"os.runtime_args":                  ext۰os۰runtime_args,
-		"os.runtime_beforeExit":            ext۰nop,
-		"os/signal.init":                   ext۰nop,
-		"reflect.New":                      ext۰reflect۰New,
-		"reflect.SliceOf":                  ext۰reflect۰SliceOf,
-		"reflect.TypeOf":                   ext۰reflect۰TypeOf,
-		"reflect.ValueOf":                  ext۰reflect۰ValueOf,
-		"reflect.Zero":                     ext۰reflect۰Zero,
-		"reflect.init":                     ext۰reflect۰Init,
-		"reflect.valueInterface":           ext۰reflect۰valueInterface,
-		"runtime.Breakpoint":               ext۰runtime۰Breakpoint,
-		"runtime.Caller":                   ext۰runtime۰Caller,
-		"runtime.Callers":                  ext۰runtime۰Callers,
-		"runtime.FuncForPC":                ext۰runtime۰FuncForPC,
-		"runtime.GC":                       ext۰runtime۰GC,
-		"runtime.GOMAXPROCS":               ext۰runtime۰GOMAXPROCS,
-		"runtime.Goexit":                   ext۰runtime۰Goexit,
-		"runtime.Gosched":                  ext۰runtime۰Gosched,
-		"runtime.init":                     ext۰nop,
-		"runtime.KeepAlive":                ext۰nop,
-		"runtime.NumCPU":                   ext۰runtime۰NumCPU,
-		"runtime.NumGoroutine":             ext۰runtime۰NumGoroutine,
-		"runtime.ReadMemStats":             ext۰runtime۰ReadMemStats,
-		"runtime.SetFinalizer":             ext۰nop, // ignore
-		"(*runtime.Func).Entry":            ext۰runtime۰Func۰Entry,
-		"(*runtime.Func).FileLine":         ext۰runtime۰Func۰FileLine,
-		"(*runtime.Func).Name":             ext۰runtime۰Func۰Name,
-		"runtime.environ":                  ext۰runtime۰environ,
-		"runtime.getgoroot":                ext۰runtime۰getgoroot,
-		"strings.init":                     ext۰nop, // avoid asm dependency
-		"strings.Count":                    ext۰strings۰Count,
-		"strings.Index":                    ext۰strings۰Index,
-		"strings.IndexByte":                ext۰strings۰IndexByte,
-		"sync.runtime_Semacquire":          ext۰nop, // unimplementable
-		"sync.runtime_Semrelease":          ext۰nop, // unimplementable
-		"sync.runtime_Syncsemcheck":        ext۰nop, // unimplementable
-		"sync.runtime_notifyListCheck":     ext۰nop,
-		"sync.runtime_registerPoolCleanup": ext۰nop,
-		"sync/atomic.AddInt32":             ext۰atomic۰AddInt32,
-		"sync/atomic.AddUint32":            ext۰atomic۰AddUint32,
-		"sync/atomic.CompareAndSwapInt32":  ext۰atomic۰CompareAndSwapInt32,
-		"sync/atomic.CompareAndSwapUint32": ext۰atomic۰CompareAndSwapUint32,
-		"sync/atomic.LoadInt32":            ext۰atomic۰LoadInt32,
-		"sync/atomic.LoadUint32":           ext۰atomic۰LoadUint32,
-		"sync/atomic.StoreInt32":           ext۰atomic۰StoreInt32,
-		"sync/atomic.StoreUint32":          ext۰atomic۰StoreUint32,
-		"sync/atomic.AddInt64":             ext۰atomic۰AddInt64,
-		"sync/atomic.AddUint64":            ext۰atomic۰AddUint64,
-		"sync/atomic.CompareAndSwapInt64":  ext۰atomic۰CompareAndSwapInt64,
-		"sync/atomic.CompareAndSwapUint64": ext۰atomic۰CompareAndSwapUint64,
-		"sync/atomic.LoadInt64":            ext۰atomic۰LoadInt64,
-		"sync/atomic.LoadUint64":           ext۰atomic۰LoadUint64,
-		"sync/atomic.StoreInt64":           ext۰atomic۰StoreInt64,
-		"sync/atomic.StoreUint64":          ext۰atomic۰StoreUint64,
-		"testing.callerEntry":              ext۰testing۰callerEntry,
-		"testing.runExample":               ext۰testing۰runExample,
-		"time.Sleep":                       ext۰time۰Sleep,
-		"time.now":                         ext۰time۰now,
-	} {
-		externals[k] = v
-	}
-}
-
-// wrapError returns an interpreted 'error' interface value for err.
-func wrapError(err error) value {
-	if err == nil {
-		return iface{}
-	}
-	return iface{t: errorType, v: err.Error()}
-}
-
-func ext۰nop(fr *frame, args []value) value { return nil }
-
-func ext۰sync۰Pool۰Get(fr *frame, args []value) value {
-	Pool := fr.i.prog.ImportedPackage("sync").Type("Pool").Object()
-	_, newIndex, _ := types.LookupFieldOrMethod(Pool.Type(), false, Pool.Pkg(), "New")
-
-	if New := (*args[0].(*value)).(structure)[newIndex[0]]; New != nil {
-		return call(fr.i, fr, 0, New, nil)
-	}
-	return nil
-}
-
-func ext۰bytes۰Equal(fr *frame, args []value) value {
-	// func Equal(a, b []byte) bool
-	a := args[0].([]value)
-	b := args[1].([]value)
-	if len(a) != len(b) {
-		return false
-	}
-	for i := range a {
-		if a[i] != b[i] {
-			return false
-		}
-	}
-	return true
-}
-
-func ext۰bytes۰IndexByte(fr *frame, args []value) value {
-	// func IndexByte(s []byte, c byte) int
-	s := args[0].([]value)
-	c := args[1].(byte)
-	for i, b := range s {
-		if b.(byte) == c {
-			return i
-		}
-	}
-	return -1
-}
-
-func ext۰crc32۰haveSSE42(fr *frame, args []value) value {
-	return false
-}
-
-func ext۰math۰Float64frombits(fr *frame, args []value) value {
-	return math.Float64frombits(args[0].(uint64))
-}
-
-func ext۰math۰Float64bits(fr *frame, args []value) value {
-	return math.Float64bits(args[0].(float64))
-}
-
-func ext۰math۰Float32frombits(fr *frame, args []value) value {
-	return math.Float32frombits(args[0].(uint32))
-}
-
-func ext۰math۰Abs(fr *frame, args []value) value {
-	return math.Abs(args[0].(float64))
-}
-
-func ext۰math۰Exp(fr *frame, args []value) value {
-	return math.Exp(args[0].(float64))
-}
-
-func ext۰math۰Float32bits(fr *frame, args []value) value {
-	return math.Float32bits(args[0].(float32))
-}
-
-func ext۰math۰Min(fr *frame, args []value) value {
-	return math.Min(args[0].(float64), args[1].(float64))
-}
-
-func ext۰math۰hasSSE4(fr *frame, args []value) value {
-	return false
-}
-
-func ext۰math۰Ldexp(fr *frame, args []value) value {
-	return math.Ldexp(args[0].(float64), args[1].(int))
-}
-
-func ext۰math۰Log(fr *frame, args []value) value {
-	return math.Log(args[0].(float64))
-}
-
-func ext۰os۰runtime_args(fr *frame, args []value) value {
-	return fr.i.osArgs
-}
-
-func ext۰runtime۰Breakpoint(fr *frame, args []value) value {
-	runtime.Breakpoint()
-	return nil
-}
-
-func ext۰runtime۰Caller(fr *frame, args []value) value {
-	// func Caller(skip int) (pc uintptr, file string, line int, ok bool)
-	skip := 1 + args[0].(int)
-	for i := 0; i < skip; i++ {
-		if fr != nil {
-			fr = fr.caller
-		}
-	}
-	var pc uintptr
-	var file string
-	var line int
-	var ok bool
-	if fr != nil {
-		fn := fr.fn
-		// TODO(adonovan): use pc/posn of current instruction, not start of fn.
-		// (Required to interpret the log package's tests.)
-		pc = uintptr(unsafe.Pointer(fn))
-		posn := fn.Prog.Fset.Position(fn.Pos())
-		file = posn.Filename
-		line = posn.Line
-		ok = true
-	}
-	return tuple{pc, file, line, ok}
-}
-
-func ext۰runtime۰Callers(fr *frame, args []value) value {
-	// Callers(skip int, pc []uintptr) int
-	skip := args[0].(int)
-	pc := args[1].([]value)
-	for i := 0; i < skip; i++ {
-		if fr != nil {
-			fr = fr.caller
-		}
-	}
-	i := 0
-	for fr != nil && i < len(pc) {
-		pc[i] = uintptr(unsafe.Pointer(fr.fn))
-		i++
-		fr = fr.caller
-	}
-	return i
-}
-
-func ext۰runtime۰FuncForPC(fr *frame, args []value) value {
-	// FuncForPC(pc uintptr) *Func
-	pc := args[0].(uintptr)
-	var fn *ssa.Function
-	if pc != 0 {
-		fn = (*ssa.Function)(unsafe.Pointer(pc)) // indeed unsafe!
-	}
-	var Func value
-	Func = structure{fn} // a runtime.Func
-	return &Func
-}
-
-func ext۰runtime۰environ(fr *frame, args []value) value {
-	// This function also implements syscall.runtime_envs.
-	return environ
-}
-
-func ext۰runtime۰getgoroot(fr *frame, args []value) value {
-	return os.Getenv("GOROOT")
-}
-
-func ext۰strings۰Count(fr *frame, args []value) value {
-	// Call compiled version to avoid asm dependency.
-	return strings.Count(args[0].(string), args[1].(string))
-}
-
-func ext۰strings۰IndexByte(fr *frame, args []value) value {
-	// Call compiled version to avoid asm dependency.
-	return strings.IndexByte(args[0].(string), args[1].(byte))
-}
-
-func ext۰strings۰Index(fr *frame, args []value) value {
-	// Call compiled version to avoid asm dependency.
-	return strings.Index(args[0].(string), args[1].(string))
-}
-
-func ext۰runtime۰GOMAXPROCS(fr *frame, args []value) value {
-	// Ignore args[0]; don't let the interpreted program
-	// set the interpreter's GOMAXPROCS!
-	return runtime.GOMAXPROCS(0)
-}
-
-func ext۰runtime۰Goexit(fr *frame, args []value) value {
-	// TODO(adonovan): don't kill the interpreter's main goroutine.
-	runtime.Goexit()
-	return nil
-}
-
-func ext۰runtime۰GC(fr *frame, args []value) value {
-	runtime.GC()
-	return nil
-}
-
-func ext۰runtime۰Gosched(fr *frame, args []value) value {
-	runtime.Gosched()
-	return nil
-}
-
-func ext۰runtime۰NumCPU(fr *frame, args []value) value {
-	return runtime.NumCPU()
-}
-
-func ext۰runtime۰NumGoroutine(fr *frame, args []value) value {
-	return int(atomic.LoadInt32(&fr.i.goroutines))
-}
-
-func ext۰runtime۰ReadMemStats(fr *frame, args []value) value {
-	// TODO(adonovan): populate args[0].(Struct)
-	return nil
-}
-
-func ext۰atomic۰LoadUint32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	return (*args[0].(*value)).(uint32)
-}
-
-func ext۰atomic۰StoreUint32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	*args[0].(*value) = args[1].(uint32)
-	return nil
-}
-
-func ext۰atomic۰LoadInt32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	return (*args[0].(*value)).(int32)
-}
-
-func ext۰atomic۰StoreInt32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	*args[0].(*value) = args[1].(int32)
-	return nil
-}
-
-func ext۰atomic۰CompareAndSwapInt32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	if (*p).(int32) == args[1].(int32) {
-		*p = args[2].(int32)
-		return true
-	}
-	return false
-}
-
-func ext۰atomic۰CompareAndSwapUint32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	if (*p).(uint32) == args[1].(uint32) {
-		*p = args[2].(uint32)
-		return true
-	}
-	return false
-}
-
-func ext۰atomic۰AddInt32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	newv := (*p).(int32) + args[1].(int32)
-	*p = newv
-	return newv
-}
-
-func ext۰atomic۰AddUint32(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	newv := (*p).(uint32) + args[1].(uint32)
-	*p = newv
-	return newv
-}
-
-func ext۰atomic۰LoadUint64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	return (*args[0].(*value)).(uint64)
-}
-
-func ext۰atomic۰StoreUint64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	*args[0].(*value) = args[1].(uint64)
-	return nil
-}
-
-func ext۰atomic۰LoadInt64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	return (*args[0].(*value)).(int64)
-}
-
-func ext۰atomic۰StoreInt64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	*args[0].(*value) = args[1].(int64)
-	return nil
-}
-
-func ext۰atomic۰CompareAndSwapInt64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	if (*p).(int64) == args[1].(int64) {
-		*p = args[2].(int64)
-		return true
-	}
-	return false
-}
-
-func ext۰atomic۰CompareAndSwapUint64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	if (*p).(uint64) == args[1].(uint64) {
-		*p = args[2].(uint64)
-		return true
-	}
-	return false
-}
-
-func ext۰atomic۰AddInt64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	newv := (*p).(int64) + args[1].(int64)
-	*p = newv
-	return newv
-}
-
-func ext۰atomic۰AddUint64(fr *frame, args []value) value {
-	// TODO(adonovan): fix: not atomic!
-	p := args[0].(*value)
-	newv := (*p).(uint64) + args[1].(uint64)
-	*p = newv
-	return newv
-}
-
-func ext۰cpu۰cpuid(fr *frame, args []value) value {
-	return tuple{uint32(0), uint32(0), uint32(0), uint32(0)}
-}
-
-// Pretend: type runtime.Func struct { entry *ssa.Function }
-
-func ext۰runtime۰Func۰FileLine(fr *frame, args []value) value {
-	// func (*runtime.Func) FileLine(uintptr) (string, int)
-	f, _ := (*args[0].(*value)).(structure)[0].(*ssa.Function)
-	pc := args[1].(uintptr)
-	_ = pc
-	if f != nil {
-		// TODO(adonovan): use position of current instruction, not fn.
-		posn := f.Prog.Fset.Position(f.Pos())
-		return tuple{posn.Filename, posn.Line}
-	}
-	return tuple{"", 0}
-}
-
-func ext۰runtime۰Func۰Name(fr *frame, args []value) value {
-	// func (*runtime.Func) Name() string
-	f, _ := (*args[0].(*value)).(structure)[0].(*ssa.Function)
-	if f != nil {
-		return f.String()
-	}
-	return ""
-}
-
-func ext۰runtime۰Func۰Entry(fr *frame, args []value) value {
-	// func (*runtime.Func) Entry() uintptr
-	f, _ := (*args[0].(*value)).(structure)[0].(*ssa.Function)
-	return uintptr(unsafe.Pointer(f))
-}
-
-// This is a workaround for a bug in go/ssa/testmain.go: it creates
-// InternalExamples even for Example functions with no Output comment.
-// TODO(adonovan): fix (and redesign) testmain.go..
-func ext۰testing۰runExample(fr *frame, args []value) value {
-	// This is a stripped down runExample that simply calls the function.
-	// It does not capture and compare output nor recover from panic.
-	//
-	// func runExample(eg testing.InternalExample) bool {
-	//     eg.F()
-	//     return true
-	// }
-	F := args[0].(structure)[1]
-	call(fr.i, fr, 0, F, nil)
-	return true
-}
-
-func ext۰testing۰callerEntry(fr *frame, args []value) value {
-	return uintptr(0) // bogus implementation for now
-}
-
-func ext۰time۰now(fr *frame, args []value) value {
-	nano := time.Now().UnixNano()
-	return tuple{int64(nano / 1e9), int32(nano % 1e9), int64(0)}
-}
-
-func ext۰time۰Sleep(fr *frame, args []value) value {
-	time.Sleep(time.Duration(args[0].(int64)))
-	return nil
-}
-
-func valueToBytes(v value) []byte {
-	in := v.([]value)
-	b := make([]byte, len(in))
-	for i := range in {
-		b[i] = in[i].(byte)
-	}
-	return b
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/external_darwin.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/external_darwin.go
deleted file mode 100644
index 4713009306..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/external_darwin.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2014 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin
-
-package interp
-
-import "syscall"
-
-func init() {
-	externals["syscall.Sysctl"] = ext۰syscall۰Sysctl
-
-	fillStat = func(st *syscall.Stat_t, stat structure) {
-		stat[0] = st.Dev
-		stat[1] = st.Mode
-		stat[2] = st.Nlink
-		stat[3] = st.Ino
-		stat[4] = st.Uid
-		stat[5] = st.Gid
-		stat[6] = st.Rdev
-		// TODO(adonovan): fix: copy Timespecs.
-		// stat[8] = st.Atim
-		// stat[9] = st.Mtim
-		// stat[10] = st.Ctim
-		stat[12] = st.Size
-		stat[13] = st.Blocks
-		stat[14] = st.Blksize
-	}
-}
-
-func ext۰syscall۰Sysctl(fr *frame, args []value) value {
-	r, err := syscall.Sysctl(args[0].(string))
-	return tuple{r, wrapError(err)}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/external_unix.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/external_unix.go
deleted file mode 100644
index bfa39f68a2..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/external_unix.go
+++ /dev/null
@@ -1,256 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build darwin linux
-
-package interp
-
-import "syscall"
-
-func init() {
-	for k, v := range map[string]externalFn{
-		"os.Pipe":              ext۰os۰Pipe,
-		"syscall.Close":        ext۰syscall۰Close,
-		"syscall.Exit":         ext۰syscall۰Exit,
-		"syscall.Fchown":       ext۰syscall۰Fchown,
-		"syscall.Fstat":        ext۰syscall۰Fstat,
-		"syscall.Ftruncate":    ext۰syscall۰Ftruncate,
-		"syscall.Getpid":       ext۰syscall۰Getpid,
-		"syscall.Getwd":        ext۰syscall۰Getwd,
-		"syscall.Kill":         ext۰syscall۰Kill,
-		"syscall.Link":         ext۰syscall۰Link,
-		"syscall.Lstat":        ext۰syscall۰Lstat,
-		"syscall.Mkdir":        ext۰syscall۰Mkdir,
-		"syscall.Open":         ext۰syscall۰Open,
-		"syscall.ParseDirent":  ext۰syscall۰ParseDirent,
-		"syscall.RawSyscall":   ext۰syscall۰RawSyscall,
-		"syscall.Read":         ext۰syscall۰Read,
-		"syscall.ReadDirent":   ext۰syscall۰ReadDirent,
-		"syscall.Readlink":     ext۰syscall۰Readlink,
-		"syscall.Rmdir":        ext۰syscall۰Rmdir,
-		"syscall.Seek":         ext۰syscall۰Seek,
-		"syscall.Stat":         ext۰syscall۰Stat,
-		"syscall.Symlink":      ext۰syscall۰Symlink,
-		"syscall.Write":        ext۰syscall۰Write,
-		"syscall.Unlink":       ext۰syscall۰Unlink,
-		"syscall۰UtimesNano":   ext۰syscall۰UtimesNano,
-		"syscall.setenv_c":     ext۰nop,
-		"syscall.unsetenv_c":   ext۰nop,
-		"syscall.runtime_envs": ext۰runtime۰environ,
-	} {
-		externals[k] = v
-	}
-
-	syswrite = syscall.Write
-}
-
-func ext۰os۰Pipe(fr *frame, args []value) value {
-	// func os.Pipe() (r *File, w *File, err error)
-
-	// The portable POSIX pipe(2) call is good enough for our needs.
-	var p [2]int
-	if err := syscall.Pipe(p[:]); err != nil {
-		// TODO(adonovan): fix: return an *os.SyscallError.
-		return tuple{nil, nil, wrapError(err)}
-	}
-
-	NewFile := fr.i.prog.ImportedPackage("os").Func("NewFile")
-	r := call(fr.i, fr, 0, NewFile, []value{uintptr(p[0]), "|0"})
-	w := call(fr.i, fr, 0, NewFile, []value{uintptr(p[1]), "|1"})
-	return tuple{r, w, wrapError(nil)}
-}
-
-// overridden on darwin
-var fillStat = func(st *syscall.Stat_t, stat structure) {
-	stat[0] = st.Dev
-	stat[1] = st.Ino
-	stat[2] = st.Nlink
-	stat[3] = st.Mode
-	stat[4] = st.Uid
-	stat[5] = st.Gid
-	stat[7] = st.Rdev
-	stat[8] = st.Size
-	stat[9] = st.Blksize
-	stat[10] = st.Blocks
-	// TODO(adonovan): fix: copy Timespecs.
-	// stat[11] = st.Atim
-	// stat[12] = st.Mtim
-	// stat[13] = st.Ctim
-}
-
-func ext۰syscall۰Close(fr *frame, args []value) value {
-	// func Close(fd int) (err error)
-	return wrapError(syscall.Close(args[0].(int)))
-}
-
-func ext۰syscall۰Exit(fr *frame, args []value) value {
-	panic(exitPanic(args[0].(int)))
-}
-
-func ext۰syscall۰Fchown(fr *frame, args []value) value {
-	fd := args[0].(int)
-	uid := args[1].(int)
-	gid := args[2].(int)
-	return wrapError(syscall.Fchown(fd, uid, gid))
-}
-
-func ext۰syscall۰Fstat(fr *frame, args []value) value {
-	// func Fstat(fd int, stat *Stat_t) (err error)
-	fd := args[0].(int)
-	stat := (*args[1].(*value)).(structure)
-
-	var st syscall.Stat_t
-	err := syscall.Fstat(fd, &st)
-	fillStat(&st, stat)
-	return wrapError(err)
-}
-
-func ext۰syscall۰Ftruncate(fr *frame, args []value) value {
-	fd := args[0].(int)
-	length := args[1].(int64)
-	return wrapError(syscall.Ftruncate(fd, length))
-}
-
-func ext۰syscall۰Getpid(fr *frame, args []value) value {
-	return syscall.Getpid()
-}
-
-func ext۰syscall۰Getwd(fr *frame, args []value) value {
-	s, err := syscall.Getwd()
-	return tuple{s, wrapError(err)}
-}
-
-func ext۰syscall۰Kill(fr *frame, args []value) value {
-	// func Kill(pid int, sig Signal) (err error)
-	return wrapError(syscall.Kill(args[0].(int), syscall.Signal(args[1].(int))))
-}
-
-func ext۰syscall۰Link(fr *frame, args []value) value {
-	path := args[0].(string)
-	link := args[1].(string)
-	return wrapError(syscall.Link(path, link))
-}
-
-func ext۰syscall۰Lstat(fr *frame, args []value) value {
-	// func Lstat(name string, stat *Stat_t) (err error)
-	name := args[0].(string)
-	stat := (*args[1].(*value)).(structure)
-
-	var st syscall.Stat_t
-	err := syscall.Lstat(name, &st)
-	fillStat(&st, stat)
-	return wrapError(err)
-}
-
-func ext۰syscall۰Mkdir(fr *frame, args []value) value {
-	path := args[0].(string)
-	mode := args[1].(uint32)
-	return wrapError(syscall.Mkdir(path, mode))
-}
-
-func ext۰syscall۰Open(fr *frame, args []value) value {
-	// func Open(path string, mode int, perm uint32) (fd int, err error) {
-	path := args[0].(string)
-	mode := args[1].(int)
-	perm := args[2].(uint32)
-	fd, err := syscall.Open(path, mode, perm)
-	return tuple{fd, wrapError(err)}
-}
-
-func ext۰syscall۰ParseDirent(fr *frame, args []value) value {
-	// func ParseDirent(buf []byte, max int, names []string) (consumed int, count int, newnames []string)
-	max := args[1].(int)
-	var names []string
-	for _, iname := range args[2].([]value) {
-		names = append(names, iname.(string))
-	}
-	consumed, count, newnames := syscall.ParseDirent(valueToBytes(args[0]), max, names)
-	var inewnames []value
-	for _, newname := range newnames {
-		inewnames = append(inewnames, newname)
-	}
-	return tuple{consumed, count, inewnames}
-}
-
-func ext۰syscall۰RawSyscall(fr *frame, args []value) value {
-	return tuple{uintptr(0), uintptr(0), uintptr(syscall.ENOSYS)}
-}
-
-func ext۰syscall۰Read(fr *frame, args []value) value {
-	// func Read(fd int, p []byte) (n int, err error)
-	fd := args[0].(int)
-	p := args[1].([]value)
-	b := make([]byte, len(p))
-	n, err := syscall.Read(fd, b)
-	for i := 0; i < n; i++ {
-		p[i] = b[i]
-	}
-	return tuple{n, wrapError(err)}
-}
-
-func ext۰syscall۰ReadDirent(fr *frame, args []value) value {
-	// func ReadDirent(fd int, buf []byte) (n int, err error)
-	fd := args[0].(int)
-	p := args[1].([]value)
-	b := make([]byte, len(p))
-	n, err := syscall.ReadDirent(fd, b)
-	for i := 0; i < n; i++ {
-		p[i] = b[i]
-	}
-	return tuple{n, wrapError(err)}
-}
-
-func ext۰syscall۰Readlink(fr *frame, args []value) value {
-	path := args[0].(string)
-	buf := valueToBytes(args[1])
-	n, err := syscall.Readlink(path, buf)
-	return tuple{n, wrapError(err)}
-}
-
-func ext۰syscall۰Rmdir(fr *frame, args []value) value {
-	return wrapError(syscall.Rmdir(args[0].(string)))
-}
-
-func ext۰syscall۰Seek(fr *frame, args []value) value {
-	fd := args[0].(int)
-	offset := args[1].(int64)
-	whence := args[2].(int)
-	new, err := syscall.Seek(fd, offset, whence)
-	return tuple{new, wrapError(err)}
-}
-
-func ext۰syscall۰Stat(fr *frame, args []value) value {
-	// func Stat(name string, stat *Stat_t) (err error)
-	name := args[0].(string)
-	stat := (*args[1].(*value)).(structure)
-
-	var st syscall.Stat_t
-	err := syscall.Stat(name, &st)
-	fillStat(&st, stat)
-	return wrapError(err)
-}
-
-func ext۰syscall۰Symlink(fr *frame, args []value) value {
-	path := args[0].(string)
-	link := args[1].(string)
-	return wrapError(syscall.Symlink(path, link))
-}
-
-func ext۰syscall۰Unlink(fr *frame, args []value) value {
-	return wrapError(syscall.Unlink(args[0].(string)))
-}
-
-func ext۰syscall۰UtimesNano(fr *frame, args []value) value {
-	path := args[0].(string)
-	var ts [2]syscall.Timespec
-	err := syscall.UtimesNano(path, ts[:])
-	// TODO(adonovan): copy the Timespecs into args[1]
-	return wrapError(err)
-}
-
-func ext۰syscall۰Write(fr *frame, args []value) value {
-	// func Write(fd int, p []byte) (n int, err error)
-	n, err := write(args[0].(int), valueToBytes(args[1]))
-	return tuple{n, wrapError(err)}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/interp.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/interp.go
deleted file mode 100644
index 4c8602dce7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/interp.go
+++ /dev/null
@@ -1,762 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package ssa/interp defines an interpreter for the SSA
-// representation of Go programs.
-//
-// This interpreter is provided as an adjunct for testing the SSA
-// construction algorithm.  Its purpose is to provide a minimal
-// metacircular implementation of the dynamic semantics of each SSA
-// instruction.  It is not, and will never be, a production-quality Go
-// interpreter.
-//
-// The following is a partial list of Go features that are currently
-// unsupported or incomplete in the interpreter.
-//
-// * Unsafe operations, including all uses of unsafe.Pointer, are
-// impossible to support given the "boxed" value representation we
-// have chosen.
-//
-// * The reflect package is only partially implemented.
-//
-// * "sync/atomic" operations are not currently atomic due to the
-// "boxed" value representation: it is not possible to read, modify
-// and write an interface value atomically.  As a consequence, Mutexes
-// are currently broken.  TODO(adonovan): provide a metacircular
-// implementation of Mutex avoiding the broken atomic primitives.
-//
-// * recover is only partially implemented.  Also, the interpreter
-// makes no attempt to distinguish target panics from interpreter
-// crashes.
-//
-// * map iteration is asymptotically inefficient.
-//
-// * the sizes of the int, uint and uintptr types in the target
-// program are assumed to be the same as those of the interpreter
-// itself.
-//
-// * all values occupy space, even those of types defined by the spec
-// to have zero size, e.g. struct{}.  This can cause asymptotic
-// performance degradation.
-//
-// * os.Exit is implemented using panic, causing deferred functions to
-// run.
-package interp // import "golang.org/x/tools/go/ssa/interp"
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"os"
-	"reflect"
-	"runtime"
-	"sync/atomic"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-type continuation int
-
-const (
-	kNext continuation = iota
-	kReturn
-	kJump
-)
-
-// Mode is a bitmask of options affecting the interpreter.
-type Mode uint
-
-const (
-	DisableRecover Mode = 1 << iota // Disable recover() in target programs; show interpreter crash instead.
-	EnableTracing                   // Print a trace of all instructions as they are interpreted.
-)
-
-type methodSet map[string]*ssa.Function
-
-// State shared between all interpreted goroutines.
-type interpreter struct {
-	osArgs             []value              // the value of os.Args
-	prog               *ssa.Program         // the SSA program
-	globals            map[ssa.Value]*value // addresses of global variables (immutable)
-	mode               Mode                 // interpreter options
-	reflectPackage     *ssa.Package         // the fake reflect package
-	errorMethods       methodSet            // the method set of reflect.error, which implements the error interface.
-	rtypeMethods       methodSet            // the method set of rtype, which implements the reflect.Type interface.
-	runtimeErrorString types.Type           // the runtime.errorString type
-	sizes              types.Sizes          // the effective type-sizing function
-	goroutines         int32                // atomically updated
-}
-
-type deferred struct {
-	fn    value
-	args  []value
-	instr *ssa.Defer
-	tail  *deferred
-}
-
-type frame struct {
-	i                *interpreter
-	caller           *frame
-	fn               *ssa.Function
-	block, prevBlock *ssa.BasicBlock
-	env              map[ssa.Value]value // dynamic values of SSA variables
-	locals           []value
-	defers           *deferred
-	result           value
-	panicking        bool
-	panic            interface{}
-}
-
-func (fr *frame) get(key ssa.Value) value {
-	switch key := key.(type) {
-	case nil:
-		// Hack; simplifies handling of optional attributes
-		// such as ssa.Slice.{Low,High}.
-		return nil
-	case *ssa.Function, *ssa.Builtin:
-		return key
-	case *ssa.Const:
-		return constValue(key)
-	case *ssa.Global:
-		if r, ok := fr.i.globals[key]; ok {
-			return r
-		}
-	}
-	if r, ok := fr.env[key]; ok {
-		return r
-	}
-	panic(fmt.Sprintf("get: no value for %T: %v", key, key.Name()))
-}
-
-// runDefer runs a deferred call d.
-// It always returns normally, but may set or clear fr.panic.
-//
-func (fr *frame) runDefer(d *deferred) {
-	if fr.i.mode&EnableTracing != 0 {
-		fmt.Fprintf(os.Stderr, "%s: invoking deferred function call\n",
-			fr.i.prog.Fset.Position(d.instr.Pos()))
-	}
-	var ok bool
-	defer func() {
-		if !ok {
-			// Deferred call created a new state of panic.
-			fr.panicking = true
-			fr.panic = recover()
-		}
-	}()
-	call(fr.i, fr, d.instr.Pos(), d.fn, d.args)
-	ok = true
-}
-
-// runDefers executes fr's deferred function calls in LIFO order.
-//
-// On entry, fr.panicking indicates a state of panic; if
-// true, fr.panic contains the panic value.
-//
-// On completion, if a deferred call started a panic, or if no
-// deferred call recovered from a previous state of panic, then
-// runDefers itself panics after the last deferred call has run.
-//
-// If there was no initial state of panic, or it was recovered from,
-// runDefers returns normally.
-//
-func (fr *frame) runDefers() {
-	for d := fr.defers; d != nil; d = d.tail {
-		fr.runDefer(d)
-	}
-	fr.defers = nil
-	if fr.panicking {
-		panic(fr.panic) // new panic, or still panicking
-	}
-}
-
-// lookupMethod returns the method set for type typ, which may be one
-// of the interpreter's fake types.
-func lookupMethod(i *interpreter, typ types.Type, meth *types.Func) *ssa.Function {
-	switch typ {
-	case rtypeType:
-		return i.rtypeMethods[meth.Id()]
-	case errorType:
-		return i.errorMethods[meth.Id()]
-	}
-	return i.prog.LookupMethod(typ, meth.Pkg(), meth.Name())
-}
-
-// visitInstr interprets a single ssa.Instruction within the activation
-// record frame.  It returns a continuation value indicating where to
-// read the next instruction from.
-func visitInstr(fr *frame, instr ssa.Instruction) continuation {
-	switch instr := instr.(type) {
-	case *ssa.DebugRef:
-		// no-op
-
-	case *ssa.UnOp:
-		fr.env[instr] = unop(instr, fr.get(instr.X))
-
-	case *ssa.BinOp:
-		fr.env[instr] = binop(instr.Op, instr.X.Type(), fr.get(instr.X), fr.get(instr.Y))
-
-	case *ssa.Call:
-		fn, args := prepareCall(fr, &instr.Call)
-		fr.env[instr] = call(fr.i, fr, instr.Pos(), fn, args)
-
-	case *ssa.ChangeInterface:
-		fr.env[instr] = fr.get(instr.X)
-
-	case *ssa.ChangeType:
-		fr.env[instr] = fr.get(instr.X) // (can't fail)
-
-	case *ssa.Convert:
-		fr.env[instr] = conv(instr.Type(), instr.X.Type(), fr.get(instr.X))
-
-	case *ssa.MakeInterface:
-		fr.env[instr] = iface{t: instr.X.Type(), v: fr.get(instr.X)}
-
-	case *ssa.Extract:
-		fr.env[instr] = fr.get(instr.Tuple).(tuple)[instr.Index]
-
-	case *ssa.Slice:
-		fr.env[instr] = slice(fr.get(instr.X), fr.get(instr.Low), fr.get(instr.High), fr.get(instr.Max))
-
-	case *ssa.Return:
-		switch len(instr.Results) {
-		case 0:
-		case 1:
-			fr.result = fr.get(instr.Results[0])
-		default:
-			var res []value
-			for _, r := range instr.Results {
-				res = append(res, fr.get(r))
-			}
-			fr.result = tuple(res)
-		}
-		fr.block = nil
-		return kReturn
-
-	case *ssa.RunDefers:
-		fr.runDefers()
-
-	case *ssa.Panic:
-		panic(targetPanic{fr.get(instr.X)})
-
-	case *ssa.Send:
-		fr.get(instr.Chan).(chan value) <- fr.get(instr.X)
-
-	case *ssa.Store:
-		store(deref(instr.Addr.Type()), fr.get(instr.Addr).(*value), fr.get(instr.Val))
-
-	case *ssa.If:
-		succ := 1
-		if fr.get(instr.Cond).(bool) {
-			succ = 0
-		}
-		fr.prevBlock, fr.block = fr.block, fr.block.Succs[succ]
-		return kJump
-
-	case *ssa.Jump:
-		fr.prevBlock, fr.block = fr.block, fr.block.Succs[0]
-		return kJump
-
-	case *ssa.Defer:
-		fn, args := prepareCall(fr, &instr.Call)
-		fr.defers = &deferred{
-			fn:    fn,
-			args:  args,
-			instr: instr,
-			tail:  fr.defers,
-		}
-
-	case *ssa.Go:
-		fn, args := prepareCall(fr, &instr.Call)
-		atomic.AddInt32(&fr.i.goroutines, 1)
-		go func() {
-			call(fr.i, nil, instr.Pos(), fn, args)
-			atomic.AddInt32(&fr.i.goroutines, -1)
-		}()
-
-	case *ssa.MakeChan:
-		fr.env[instr] = make(chan value, asInt(fr.get(instr.Size)))
-
-	case *ssa.Alloc:
-		var addr *value
-		if instr.Heap {
-			// new
-			addr = new(value)
-			fr.env[instr] = addr
-		} else {
-			// local
-			addr = fr.env[instr].(*value)
-		}
-		*addr = zero(deref(instr.Type()))
-
-	case *ssa.MakeSlice:
-		slice := make([]value, asInt(fr.get(instr.Cap)))
-		tElt := instr.Type().Underlying().(*types.Slice).Elem()
-		for i := range slice {
-			slice[i] = zero(tElt)
-		}
-		fr.env[instr] = slice[:asInt(fr.get(instr.Len))]
-
-	case *ssa.MakeMap:
-		reserve := 0
-		if instr.Reserve != nil {
-			reserve = asInt(fr.get(instr.Reserve))
-		}
-		fr.env[instr] = makeMap(instr.Type().Underlying().(*types.Map).Key(), reserve)
-
-	case *ssa.Range:
-		fr.env[instr] = rangeIter(fr.get(instr.X), instr.X.Type())
-
-	case *ssa.Next:
-		fr.env[instr] = fr.get(instr.Iter).(iter).next()
-
-	case *ssa.FieldAddr:
-		fr.env[instr] = &(*fr.get(instr.X).(*value)).(structure)[instr.Field]
-
-	case *ssa.Field:
-		fr.env[instr] = fr.get(instr.X).(structure)[instr.Field]
-
-	case *ssa.IndexAddr:
-		x := fr.get(instr.X)
-		idx := fr.get(instr.Index)
-		switch x := x.(type) {
-		case []value:
-			fr.env[instr] = &x[asInt(idx)]
-		case *value: // *array
-			fr.env[instr] = &(*x).(array)[asInt(idx)]
-		default:
-			panic(fmt.Sprintf("unexpected x type in IndexAddr: %T", x))
-		}
-
-	case *ssa.Index:
-		fr.env[instr] = fr.get(instr.X).(array)[asInt(fr.get(instr.Index))]
-
-	case *ssa.Lookup:
-		fr.env[instr] = lookup(instr, fr.get(instr.X), fr.get(instr.Index))
-
-	case *ssa.MapUpdate:
-		m := fr.get(instr.Map)
-		key := fr.get(instr.Key)
-		v := fr.get(instr.Value)
-		switch m := m.(type) {
-		case map[value]value:
-			m[key] = v
-		case *hashmap:
-			m.insert(key.(hashable), v)
-		default:
-			panic(fmt.Sprintf("illegal map type: %T", m))
-		}
-
-	case *ssa.TypeAssert:
-		fr.env[instr] = typeAssert(fr.i, instr, fr.get(instr.X).(iface))
-
-	case *ssa.MakeClosure:
-		var bindings []value
-		for _, binding := range instr.Bindings {
-			bindings = append(bindings, fr.get(binding))
-		}
-		fr.env[instr] = &closure{instr.Fn.(*ssa.Function), bindings}
-
-	case *ssa.Phi:
-		for i, pred := range instr.Block().Preds {
-			if fr.prevBlock == pred {
-				fr.env[instr] = fr.get(instr.Edges[i])
-				break
-			}
-		}
-
-	case *ssa.Select:
-		var cases []reflect.SelectCase
-		if !instr.Blocking {
-			cases = append(cases, reflect.SelectCase{
-				Dir: reflect.SelectDefault,
-			})
-		}
-		for _, state := range instr.States {
-			var dir reflect.SelectDir
-			if state.Dir == types.RecvOnly {
-				dir = reflect.SelectRecv
-			} else {
-				dir = reflect.SelectSend
-			}
-			var send reflect.Value
-			if state.Send != nil {
-				send = reflect.ValueOf(fr.get(state.Send))
-			}
-			cases = append(cases, reflect.SelectCase{
-				Dir:  dir,
-				Chan: reflect.ValueOf(fr.get(state.Chan)),
-				Send: send,
-			})
-		}
-		chosen, recv, recvOk := reflect.Select(cases)
-		if !instr.Blocking {
-			chosen-- // default case should have index -1.
-		}
-		r := tuple{chosen, recvOk}
-		for i, st := range instr.States {
-			if st.Dir == types.RecvOnly {
-				var v value
-				if i == chosen && recvOk {
-					// No need to copy since send makes an unaliased copy.
-					v = recv.Interface().(value)
-				} else {
-					v = zero(st.Chan.Type().Underlying().(*types.Chan).Elem())
-				}
-				r = append(r, v)
-			}
-		}
-		fr.env[instr] = r
-
-	default:
-		panic(fmt.Sprintf("unexpected instruction: %T", instr))
-	}
-
-	// if val, ok := instr.(ssa.Value); ok {
-	// 	fmt.Println(toString(fr.env[val])) // debugging
-	// }
-
-	return kNext
-}
-
-// prepareCall determines the function value and argument values for a
-// function call in a Call, Go or Defer instruction, performing
-// interface method lookup if needed.
-//
-func prepareCall(fr *frame, call *ssa.CallCommon) (fn value, args []value) {
-	v := fr.get(call.Value)
-	if call.Method == nil {
-		// Function call.
-		fn = v
-	} else {
-		// Interface method invocation.
-		recv := v.(iface)
-		if recv.t == nil {
-			panic("method invoked on nil interface")
-		}
-		if f := lookupMethod(fr.i, recv.t, call.Method); f == nil {
-			// Unreachable in well-typed programs.
-			panic(fmt.Sprintf("method set for dynamic type %v does not contain %s", recv.t, call.Method))
-		} else {
-			fn = f
-		}
-		args = append(args, recv.v)
-	}
-	for _, arg := range call.Args {
-		args = append(args, fr.get(arg))
-	}
-	return
-}
-
-// call interprets a call to a function (function, builtin or closure)
-// fn with arguments args, returning its result.
-// callpos is the position of the callsite.
-//
-func call(i *interpreter, caller *frame, callpos token.Pos, fn value, args []value) value {
-	switch fn := fn.(type) {
-	case *ssa.Function:
-		if fn == nil {
-			panic("call of nil function") // nil of func type
-		}
-		return callSSA(i, caller, callpos, fn, args, nil)
-	case *closure:
-		return callSSA(i, caller, callpos, fn.Fn, args, fn.Env)
-	case *ssa.Builtin:
-		return callBuiltin(caller, callpos, fn, args)
-	}
-	panic(fmt.Sprintf("cannot call %T", fn))
-}
-
-func loc(fset *token.FileSet, pos token.Pos) string {
-	if pos == token.NoPos {
-		return ""
-	}
-	return " at " + fset.Position(pos).String()
-}
-
-// callSSA interprets a call to function fn with arguments args,
-// and lexical environment env, returning its result.
-// callpos is the position of the callsite.
-//
-func callSSA(i *interpreter, caller *frame, callpos token.Pos, fn *ssa.Function, args []value, env []value) value {
-	if i.mode&EnableTracing != 0 {
-		fset := fn.Prog.Fset
-		// TODO(adonovan): fix: loc() lies for external functions.
-		fmt.Fprintf(os.Stderr, "Entering %s%s.\n", fn, loc(fset, fn.Pos()))
-		suffix := ""
-		if caller != nil {
-			suffix = ", resuming " + caller.fn.String() + loc(fset, callpos)
-		}
-		defer fmt.Fprintf(os.Stderr, "Leaving %s%s.\n", fn, suffix)
-	}
-	fr := &frame{
-		i:      i,
-		caller: caller, // for panic/recover
-		fn:     fn,
-	}
-	if fn.Parent() == nil {
-		name := fn.String()
-		if ext := externals[name]; ext != nil {
-			if i.mode&EnableTracing != 0 {
-				fmt.Fprintln(os.Stderr, "\t(external)")
-			}
-			return ext(fr, args)
-		}
-		if fn.Blocks == nil {
-			panic("no code for function: " + name)
-		}
-	}
-	fr.env = make(map[ssa.Value]value)
-	fr.block = fn.Blocks[0]
-	fr.locals = make([]value, len(fn.Locals))
-	for i, l := range fn.Locals {
-		fr.locals[i] = zero(deref(l.Type()))
-		fr.env[l] = &fr.locals[i]
-	}
-	for i, p := range fn.Params {
-		fr.env[p] = args[i]
-	}
-	for i, fv := range fn.FreeVars {
-		fr.env[fv] = env[i]
-	}
-	for fr.block != nil {
-		runFrame(fr)
-	}
-	// Destroy the locals to avoid accidental use after return.
-	for i := range fn.Locals {
-		fr.locals[i] = bad{}
-	}
-	return fr.result
-}
-
-// runFrame executes SSA instructions starting at fr.block and
-// continuing until a return, a panic, or a recovered panic.
-//
-// After a panic, runFrame panics.
-//
-// After a normal return, fr.result contains the result of the call
-// and fr.block is nil.
-//
-// A recovered panic in a function without named return parameters
-// (NRPs) becomes a normal return of the zero value of the function's
-// result type.
-//
-// After a recovered panic in a function with NRPs, fr.result is
-// undefined and fr.block contains the block at which to resume
-// control.
-//
-func runFrame(fr *frame) {
-	defer func() {
-		if fr.block == nil {
-			return // normal return
-		}
-		if fr.i.mode&DisableRecover != 0 {
-			return // let interpreter crash
-		}
-		fr.panicking = true
-		fr.panic = recover()
-		if fr.i.mode&EnableTracing != 0 {
-			fmt.Fprintf(os.Stderr, "Panicking: %T %v.\n", fr.panic, fr.panic)
-		}
-		fr.runDefers()
-		fr.block = fr.fn.Recover
-	}()
-
-	for {
-		if fr.i.mode&EnableTracing != 0 {
-			fmt.Fprintf(os.Stderr, ".%s:\n", fr.block)
-		}
-	block:
-		for _, instr := range fr.block.Instrs {
-			if fr.i.mode&EnableTracing != 0 {
-				if v, ok := instr.(ssa.Value); ok {
-					fmt.Fprintln(os.Stderr, "\t", v.Name(), "=", instr)
-				} else {
-					fmt.Fprintln(os.Stderr, "\t", instr)
-				}
-			}
-			switch visitInstr(fr, instr) {
-			case kReturn:
-				return
-			case kNext:
-				// no-op
-			case kJump:
-				break block
-			}
-		}
-	}
-}
-
-// doRecover implements the recover() built-in.
-func doRecover(caller *frame) value {
-	// recover() must be exactly one level beneath the deferred
-	// function (two levels beneath the panicking function) to
-	// have any effect.  Thus we ignore both "defer recover()" and
-	// "defer f() -> g() -> recover()".
-	if caller.i.mode&DisableRecover == 0 &&
-		caller != nil && !caller.panicking &&
-		caller.caller != nil && caller.caller.panicking {
-		caller.caller.panicking = false
-		p := caller.caller.panic
-		caller.caller.panic = nil
-
-		// TODO(adonovan): support runtime.Goexit.
-		switch p := p.(type) {
-		case targetPanic:
-			// The target program explicitly called panic().
-			return p.v
-		case runtime.Error:
-			// The interpreter encountered a runtime error.
-			return iface{caller.i.runtimeErrorString, p.Error()}
-		case string:
-			// The interpreter explicitly called panic().
-			return iface{caller.i.runtimeErrorString, p}
-		default:
-			panic(fmt.Sprintf("unexpected panic type %T in target call to recover()", p))
-		}
-	}
-	return iface{}
-}
-
-// setGlobal sets the value of a system-initialized global variable.
-func setGlobal(i *interpreter, pkg *ssa.Package, name string, v value) {
-	if g, ok := i.globals[pkg.Var(name)]; ok {
-		*g = v
-		return
-	}
-	panic("no global variable: " + pkg.Pkg.Path() + "." + name)
-}
-
-var environ []value
-
-func init() {
-	for _, s := range os.Environ() {
-		environ = append(environ, s)
-	}
-	environ = append(environ, "GOSSAINTERP=1")
-	environ = append(environ, "GOARCH="+runtime.GOARCH)
-}
-
-// deleteBodies delete the bodies of all standalone functions except the
-// specified ones.  A missing intrinsic leads to a clear runtime error.
-func deleteBodies(pkg *ssa.Package, except ...string) {
-	keep := make(map[string]bool)
-	for _, e := range except {
-		keep[e] = true
-	}
-	for _, mem := range pkg.Members {
-		if fn, ok := mem.(*ssa.Function); ok && !keep[fn.Name()] {
-			fn.Blocks = nil
-		}
-	}
-}
-
-// Interpret interprets the Go program whose main package is mainpkg.
-// mode specifies various interpreter options.  filename and args are
-// the initial values of os.Args for the target program.  sizes is the
-// effective type-sizing function for this program.
-//
-// Interpret returns the exit code of the program: 2 for panic (like
-// gc does), or the argument to os.Exit for normal termination.
-//
-// The SSA program must include the "runtime" package.
-//
-func Interpret(mainpkg *ssa.Package, mode Mode, sizes types.Sizes, filename string, args []string) (exitCode int) {
-	if syswrite == nil {
-		fmt.Fprintln(os.Stderr, "Interpret: unsupported platform.")
-		return 1
-	}
-
-	i := &interpreter{
-		prog:       mainpkg.Prog,
-		globals:    make(map[ssa.Value]*value),
-		mode:       mode,
-		sizes:      sizes,
-		goroutines: 1,
-	}
-	runtimePkg := i.prog.ImportedPackage("runtime")
-	if runtimePkg == nil {
-		panic("ssa.Program doesn't include runtime package")
-	}
-	i.runtimeErrorString = runtimePkg.Type("errorString").Object().Type()
-
-	initReflect(i)
-
-	i.osArgs = append(i.osArgs, filename)
-	for _, arg := range args {
-		i.osArgs = append(i.osArgs, arg)
-	}
-
-	for _, pkg := range i.prog.AllPackages() {
-		// Initialize global storage.
-		for _, m := range pkg.Members {
-			switch v := m.(type) {
-			case *ssa.Global:
-				cell := zero(deref(v.Type()))
-				i.globals[v] = &cell
-			}
-		}
-
-		// Ad-hoc initialization for magic system variables.
-		switch pkg.Pkg.Path() {
-		case "syscall":
-			setGlobal(i, pkg, "envs", environ)
-
-		case "reflect":
-			deleteBodies(pkg, "DeepEqual", "deepValueEqual")
-
-		case "runtime":
-			sz := sizes.Sizeof(pkg.Pkg.Scope().Lookup("MemStats").Type())
-			setGlobal(i, pkg, "sizeof_C_MStats", uintptr(sz))
-			deleteBodies(pkg, "GOROOT", "gogetenv")
-		}
-	}
-
-	// Top-level error handler.
-	exitCode = 2
-	defer func() {
-		if exitCode != 2 || i.mode&DisableRecover != 0 {
-			return
-		}
-		switch p := recover().(type) {
-		case exitPanic:
-			exitCode = int(p)
-			return
-		case targetPanic:
-			fmt.Fprintln(os.Stderr, "panic:", toString(p.v))
-		case runtime.Error:
-			fmt.Fprintln(os.Stderr, "panic:", p.Error())
-		case string:
-			fmt.Fprintln(os.Stderr, "panic:", p)
-		default:
-			fmt.Fprintf(os.Stderr, "panic: unexpected type: %T: %v\n", p, p)
-		}
-
-		// TODO(adonovan): dump panicking interpreter goroutine?
-		// buf := make([]byte, 0x10000)
-		// runtime.Stack(buf, false)
-		// fmt.Fprintln(os.Stderr, string(buf))
-		// (Or dump panicking target goroutine?)
-	}()
-
-	// Run!
-	call(i, nil, token.NoPos, mainpkg.Func("init"), nil)
-	if mainFn := mainpkg.Func("main"); mainFn != nil {
-		call(i, nil, token.NoPos, mainFn, nil)
-		exitCode = 0
-	} else {
-		fmt.Fprintln(os.Stderr, "No main function.")
-		exitCode = 1
-	}
-	return
-}
-
-// deref returns a pointer's element type; otherwise it returns typ.
-// TODO(adonovan): Import from ssa?
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/interp_test.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/interp_test.go
deleted file mode 100644
index 6e9f7b2f16..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/interp_test.go
+++ /dev/null
@@ -1,378 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin
-
-package interp_test
-
-import (
-	"bytes"
-	"fmt"
-	"go/build"
-	"go/types"
-	"os"
-	"path/filepath"
-	"strings"
-	"testing"
-	"time"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/interp"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// Each line contains a space-separated list of $GOROOT/test/
-// filenames comprising the main package of a program.
-// They are ordered quickest-first, roughly.
-//
-// TODO(adonovan): integrate into the $GOROOT/test driver scripts,
-// golden file checking, etc.
-var gorootTestTests = []string{
-	"235.go",
-	"alias1.go",
-	"chancap.go",
-	"func5.go",
-	"func6.go",
-	"func7.go",
-	"func8.go",
-	"helloworld.go",
-	"varinit.go",
-	"escape3.go",
-	"initcomma.go",
-	"cmp.go",
-	"compos.go",
-	"turing.go",
-	"indirect.go",
-	"complit.go",
-	"for.go",
-	"struct0.go",
-	"intcvt.go",
-	"printbig.go",
-	"deferprint.go",
-	"escape.go",
-	"range.go",
-	"const4.go",
-	"float_lit.go",
-	"bigalg.go",
-	"decl.go",
-	"if.go",
-	"named.go",
-	"bigmap.go",
-	"func.go",
-	"reorder2.go",
-	"closure.go",
-	"gc.go",
-	"simassign.go",
-	"iota.go",
-	"nilptr2.go",
-	"goprint.go", // doesn't actually assert anything (cmpout)
-	"utf.go",
-	"method.go",
-	"char_lit.go",
-	"env.go",
-	"int_lit.go",
-	"string_lit.go",
-	"defer.go",
-	"typeswitch.go",
-	"stringrange.go",
-	"reorder.go",
-	"method3.go",
-	"literal.go",
-	"nul1.go", // doesn't actually assert anything (errorcheckoutput)
-	"zerodivide.go",
-	"convert.go",
-	"convT2X.go",
-	"switch.go",
-	"initialize.go",
-	"ddd.go",
-	"blank.go", // partly disabled
-	"map.go",
-	"closedchan.go",
-	"divide.go",
-	"rename.go",
-	"const3.go",
-	"nil.go",
-	"recover.go", // reflection parts disabled
-	"recover1.go",
-	"recover2.go",
-	"recover3.go",
-	"typeswitch1.go",
-	"floatcmp.go",
-	"crlf.go", // doesn't actually assert anything (runoutput)
-	// Slow tests follow.
-	"bom.go", // ~1.7s
-	"gc1.go", // ~1.7s
-	"cmplxdivide.go cmplxdivide1.go", // ~2.4s
-
-	// Working, but not worth enabling:
-	// "append.go",    // works, but slow (15s).
-	// "gc2.go",       // works, but slow, and cheats on the memory check.
-	// "sigchld.go",   // works, but only on POSIX.
-	// "peano.go",     // works only up to n=9, and slow even then.
-	// "stack.go",     // works, but too slow (~30s) by default.
-	// "solitaire.go", // works, but too slow (~30s).
-	// "const.go",     // works but for but one bug: constant folder doesn't consider representations.
-	// "init1.go",     // too slow (80s) and not that interesting. Cheats on ReadMemStats check too.
-	// "rotate.go rotate0.go", // emits source for a test
-	// "rotate.go rotate1.go", // emits source for a test
-	// "rotate.go rotate2.go", // emits source for a test
-	// "rotate.go rotate3.go", // emits source for a test
-	// "64bit.go",             // emits source for a test
-	// "run.go",               // test driver, not a test.
-
-	// Broken.  TODO(adonovan): fix.
-	// copy.go         // very slow; but with N=4 quickly crashes, slice index out of range.
-	// nilptr.go       // interp: V > uintptr not implemented. Slow test, lots of mem
-	// args.go         // works, but requires specific os.Args from the driver.
-	// index.go        // a template, not a real test.
-	// mallocfin.go    // SetFinalizer not implemented.
-
-	// TODO(adonovan): add tests from $GOROOT/test/* subtrees:
-	// bench chan bugs fixedbugs interface ken.
-}
-
-// These are files in go.tools/go/ssa/interp/testdata/.
-var testdataTests = []string{
-	"boundmeth.go",
-	"complit.go",
-	"coverage.go",
-	"defer.go",
-	"fieldprom.go",
-	"ifaceconv.go",
-	"ifaceprom.go",
-	"initorder.go",
-	"methprom.go",
-	"mrvchain.go",
-	"range.go",
-	"recover.go",
-	"reflect.go",
-	"static.go",
-	"callstack.go",
-}
-
-// These are files and packages in $GOROOT/src/.
-var gorootSrcTests = []string{
-	"encoding/ascii85",
-	"encoding/hex",
-	// "encoding/pem", // TODO(adonovan): implement (reflect.Value).SetString
-	// "testing",      // TODO(adonovan): implement runtime.Goexit correctly
-	// "hash/crc32",   // TODO(adonovan): implement hash/crc32.haveCLMUL
-	// "log",          // TODO(adonovan): implement runtime.Callers correctly
-
-	// Too slow:
-	// "container/ring",
-	// "hash/adler32",
-
-	"unicode/utf8",
-	"path",
-	"flag",
-	"encoding/csv",
-	"text/scanner",
-	"unicode",
-}
-
-type successPredicate func(exitcode int, output string) error
-
-func run(t *testing.T, dir, input string, success successPredicate) bool {
-	fmt.Printf("Input: %s\n", input)
-
-	start := time.Now()
-
-	var inputs []string
-	for _, i := range strings.Split(input, " ") {
-		if strings.HasSuffix(i, ".go") {
-			i = dir + i
-		}
-		inputs = append(inputs, i)
-	}
-
-	var conf loader.Config
-	if _, err := conf.FromArgs(inputs, true); err != nil {
-		t.Errorf("FromArgs(%s) failed: %s", inputs, err)
-		return false
-	}
-
-	conf.Import("runtime")
-
-	// Print a helpful hint if we don't make it to the end.
-	var hint string
-	defer func() {
-		if hint != "" {
-			fmt.Println("FAIL")
-			fmt.Println(hint)
-		} else {
-			fmt.Println("PASS")
-		}
-
-		interp.CapturedOutput = nil
-	}()
-
-	hint = fmt.Sprintf("To dump SSA representation, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -test -build=CFP %s\n", input)
-
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Errorf("conf.Load(%s) failed: %s", inputs, err)
-		return false
-	}
-
-	prog := ssautil.CreateProgram(iprog, ssa.SanityCheckFunctions)
-	prog.Build()
-
-	// Find first main or test package among the initial packages.
-	var mainPkg *ssa.Package
-	for _, info := range iprog.InitialPackages() {
-		if info.Pkg.Path() == "runtime" {
-			continue // not an initial package
-		}
-		p := prog.Package(info.Pkg)
-		if p.Pkg.Name() == "main" && p.Func("main") != nil {
-			mainPkg = p
-			break
-		}
-
-		mainPkg = prog.CreateTestMainPackage(p)
-		if mainPkg != nil {
-			break
-		}
-	}
-	if mainPkg == nil {
-		t.Fatalf("no main or test packages among initial packages: %s", inputs)
-	}
-
-	var out bytes.Buffer
-	interp.CapturedOutput = &out
-
-	hint = fmt.Sprintf("To trace execution, run:\n%% go build golang.org/x/tools/cmd/ssadump && ./ssadump -build=C -test -run --interp=T %s\n", input)
-	exitCode := interp.Interpret(mainPkg, 0, &types.StdSizes{WordSize: 8, MaxAlign: 8}, inputs[0], []string{})
-
-	// The definition of success varies with each file.
-	if err := success(exitCode, out.String()); err != nil {
-		t.Errorf("interp.Interpret(%s) failed: %s", inputs, err)
-		return false
-	}
-
-	hint = "" // call off the hounds
-
-	if false {
-		fmt.Println(input, time.Since(start)) // test profiling
-	}
-
-	return true
-}
-
-const slash = string(os.PathSeparator)
-
-func printFailures(failures []string) {
-	if failures != nil {
-		fmt.Println("The following tests failed:")
-		for _, f := range failures {
-			fmt.Printf("\t%s\n", f)
-		}
-	}
-}
-
-func success(exitcode int, output string) error {
-	if exitcode != 0 {
-		return fmt.Errorf("exit code was %d", exitcode)
-	}
-	if strings.Contains(output, "BUG") {
-		return fmt.Errorf("exited zero but output contained 'BUG'")
-	}
-	return nil
-}
-
-// TestTestdataFiles runs the interpreter on testdata/*.go.
-func TestTestdataFiles(t *testing.T) {
-	var failures []string
-	start := time.Now()
-	for _, input := range testdataTests {
-		if testing.Short() && time.Since(start) > 30*time.Second {
-			printFailures(failures)
-			t.Skipf("timeout - aborting test")
-		}
-		if !run(t, "testdata"+slash, input, success) {
-			failures = append(failures, input)
-		}
-	}
-	printFailures(failures)
-}
-
-// TestGorootTest runs the interpreter on $GOROOT/test/*.go.
-func TestGorootTest(t *testing.T) {
-	if testing.Short() {
-		t.Skip() // too slow (~30s)
-	}
-
-	var failures []string
-
-	for _, input := range gorootTestTests {
-		if !run(t, filepath.Join(build.Default.GOROOT, "test")+slash, input, success) {
-			failures = append(failures, input)
-		}
-	}
-	for _, input := range gorootSrcTests {
-		if !run(t, filepath.Join(build.Default.GOROOT, "src")+slash, input, success) {
-			failures = append(failures, input)
-		}
-	}
-	printFailures(failures)
-}
-
-// TestTestmainPackage runs the interpreter on a synthetic "testmain" package.
-func TestTestmainPackage(t *testing.T) {
-	if testing.Short() {
-		t.Skip() // too slow on some platforms
-	}
-
-	success := func(exitcode int, output string) error {
-		if exitcode == 0 {
-			return fmt.Errorf("unexpected success")
-		}
-		if !strings.Contains(output, "FAIL: TestFoo") {
-			return fmt.Errorf("missing failure log for TestFoo")
-		}
-		if !strings.Contains(output, "FAIL: TestBar") {
-			return fmt.Errorf("missing failure log for TestBar")
-		}
-		// TODO(adonovan): test benchmarks too
-		return nil
-	}
-	run(t, "testdata"+slash, "a_test.go", success)
-
-	// Run a test with a custom TestMain function and ensure that it
-	// is executed, and that m.Run runs the tests.
-	success = func(exitcode int, output string) error {
-		if exitcode != 0 {
-			return fmt.Errorf("unexpected failure; output=%s", output)
-		}
-		if want := `TestMain start
-TestC
-PASS
-TestMain end
-`; output != want {
-			return fmt.Errorf("output was %q, want %q", output, want)
-		}
-		return nil
-	}
-	run(t, "testdata"+slash, "c_test.go", success)
-}
-
-// CreateTestMainPackage should return nil if there were no tests.
-func TestNullTestmainPackage(t *testing.T) {
-	var conf loader.Config
-	conf.CreateFromFilenames("", "testdata/b_test.go")
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("CreatePackages failed: %s", err)
-	}
-	prog := ssautil.CreateProgram(iprog, ssa.SanityCheckFunctions)
-	mainPkg := prog.Package(iprog.Created[0].Pkg)
-	if mainPkg.Func("main") != nil {
-		t.Fatalf("unexpected main function")
-	}
-	if prog.CreateTestMainPackage(mainPkg) != nil {
-		t.Fatalf("CreateTestMainPackage returned non-nil")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/map.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/map.go
deleted file mode 100644
index 92ccf9034a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/map.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package interp
-
-// Custom hashtable atop map.
-// For use when the key's equivalence relation is not consistent with ==.
-
-// The Go specification doesn't address the atomicity of map operations.
-// The FAQ states that an implementation is permitted to crash on
-// concurrent map access.
-
-import (
-	"go/types"
-)
-
-type hashable interface {
-	hash(t types.Type) int
-	eq(t types.Type, x interface{}) bool
-}
-
-type entry struct {
-	key   hashable
-	value value
-	next  *entry
-}
-
-// A hashtable atop the built-in map.  Since each bucket contains
-// exactly one hash value, there's no need to perform hash-equality
-// tests when walking the linked list.  Rehashing is done by the
-// underlying map.
-type hashmap struct {
-	keyType types.Type
-	table   map[int]*entry
-	length  int // number of entries in map
-}
-
-// makeMap returns an empty initialized map of key type kt,
-// preallocating space for reserve elements.
-func makeMap(kt types.Type, reserve int) value {
-	if usesBuiltinMap(kt) {
-		return make(map[value]value, reserve)
-	}
-	return &hashmap{keyType: kt, table: make(map[int]*entry, reserve)}
-}
-
-// delete removes the association for key k, if any.
-func (m *hashmap) delete(k hashable) {
-	if m != nil {
-		hash := k.hash(m.keyType)
-		head := m.table[hash]
-		if head != nil {
-			if k.eq(m.keyType, head.key) {
-				m.table[hash] = head.next
-				m.length--
-				return
-			}
-			prev := head
-			for e := head.next; e != nil; e = e.next {
-				if k.eq(m.keyType, e.key) {
-					prev.next = e.next
-					m.length--
-					return
-				}
-				prev = e
-			}
-		}
-	}
-}
-
-// lookup returns the value associated with key k, if present, or
-// value(nil) otherwise.
-func (m *hashmap) lookup(k hashable) value {
-	if m != nil {
-		hash := k.hash(m.keyType)
-		for e := m.table[hash]; e != nil; e = e.next {
-			if k.eq(m.keyType, e.key) {
-				return e.value
-			}
-		}
-	}
-	return nil
-}
-
-// insert updates the map to associate key k with value v.  If there
-// was already an association for an eq() (though not necessarily ==)
-// k, the previous key remains in the map and its associated value is
-// updated.
-func (m *hashmap) insert(k hashable, v value) {
-	hash := k.hash(m.keyType)
-	head := m.table[hash]
-	for e := head; e != nil; e = e.next {
-		if k.eq(m.keyType, e.key) {
-			e.value = v
-			return
-		}
-	}
-	m.table[hash] = &entry{
-		key:   k,
-		value: v,
-		next:  head,
-	}
-	m.length++
-}
-
-// len returns the number of key/value associations in the map.
-func (m *hashmap) len() int {
-	if m != nil {
-		return m.length
-	}
-	return 0
-}
-
-// entries returns a rangeable map of entries.
-func (m *hashmap) entries() map[int]*entry {
-	if m != nil {
-		return m.table
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/ops.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/ops.go
deleted file mode 100644
index f3419ec482..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/ops.go
+++ /dev/null
@@ -1,1396 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package interp
-
-import (
-	"bytes"
-	"fmt"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"strings"
-	"sync"
-	"unsafe"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-// If the target program panics, the interpreter panics with this type.
-type targetPanic struct {
-	v value
-}
-
-func (p targetPanic) String() string {
-	return toString(p.v)
-}
-
-// If the target program calls exit, the interpreter panics with this type.
-type exitPanic int
-
-// constValue returns the value of the constant with the
-// dynamic type tag appropriate for c.Type().
-func constValue(c *ssa.Const) value {
-	if c.IsNil() {
-		return zero(c.Type()) // typed nil
-	}
-
-	if t, ok := c.Type().Underlying().(*types.Basic); ok {
-		// TODO(adonovan): eliminate untyped constants from SSA form.
-		switch t.Kind() {
-		case types.Bool, types.UntypedBool:
-			return exact.BoolVal(c.Value)
-		case types.Int, types.UntypedInt:
-			// Assume sizeof(int) is same on host and target.
-			return int(c.Int64())
-		case types.Int8:
-			return int8(c.Int64())
-		case types.Int16:
-			return int16(c.Int64())
-		case types.Int32, types.UntypedRune:
-			return int32(c.Int64())
-		case types.Int64:
-			return c.Int64()
-		case types.Uint:
-			// Assume sizeof(uint) is same on host and target.
-			return uint(c.Uint64())
-		case types.Uint8:
-			return uint8(c.Uint64())
-		case types.Uint16:
-			return uint16(c.Uint64())
-		case types.Uint32:
-			return uint32(c.Uint64())
-		case types.Uint64:
-			return c.Uint64()
-		case types.Uintptr:
-			// Assume sizeof(uintptr) is same on host and target.
-			return uintptr(c.Uint64())
-		case types.Float32:
-			return float32(c.Float64())
-		case types.Float64, types.UntypedFloat:
-			return c.Float64()
-		case types.Complex64:
-			return complex64(c.Complex128())
-		case types.Complex128, types.UntypedComplex:
-			return c.Complex128()
-		case types.String, types.UntypedString:
-			if c.Value.Kind() == exact.String {
-				return exact.StringVal(c.Value)
-			}
-			return string(rune(c.Int64()))
-		}
-	}
-
-	panic(fmt.Sprintf("constValue: %s", c))
-}
-
-// asInt converts x, which must be an integer, to an int suitable for
-// use as a slice or array index or operand to make().
-func asInt(x value) int {
-	switch x := x.(type) {
-	case int:
-		return x
-	case int8:
-		return int(x)
-	case int16:
-		return int(x)
-	case int32:
-		return int(x)
-	case int64:
-		return int(x)
-	case uint:
-		return int(x)
-	case uint8:
-		return int(x)
-	case uint16:
-		return int(x)
-	case uint32:
-		return int(x)
-	case uint64:
-		return int(x)
-	case uintptr:
-		return int(x)
-	}
-	panic(fmt.Sprintf("cannot convert %T to int", x))
-}
-
-// asUint64 converts x, which must be an unsigned integer, to a uint64
-// suitable for use as a bitwise shift count.
-func asUint64(x value) uint64 {
-	switch x := x.(type) {
-	case uint:
-		return uint64(x)
-	case uint8:
-		return uint64(x)
-	case uint16:
-		return uint64(x)
-	case uint32:
-		return uint64(x)
-	case uint64:
-		return x
-	case uintptr:
-		return uint64(x)
-	}
-	panic(fmt.Sprintf("cannot convert %T to uint64", x))
-}
-
-// zero returns a new "zero" value of the specified type.
-func zero(t types.Type) value {
-	switch t := t.(type) {
-	case *types.Basic:
-		if t.Kind() == types.UntypedNil {
-			panic("untyped nil has no zero value")
-		}
-		if t.Info()&types.IsUntyped != 0 {
-			// TODO(adonovan): make it an invariant that
-			// this is unreachable.  Currently some
-			// constants have 'untyped' types when they
-			// should be defaulted by the typechecker.
-			t = ssa.DefaultType(t).(*types.Basic)
-		}
-		switch t.Kind() {
-		case types.Bool:
-			return false
-		case types.Int:
-			return int(0)
-		case types.Int8:
-			return int8(0)
-		case types.Int16:
-			return int16(0)
-		case types.Int32:
-			return int32(0)
-		case types.Int64:
-			return int64(0)
-		case types.Uint:
-			return uint(0)
-		case types.Uint8:
-			return uint8(0)
-		case types.Uint16:
-			return uint16(0)
-		case types.Uint32:
-			return uint32(0)
-		case types.Uint64:
-			return uint64(0)
-		case types.Uintptr:
-			return uintptr(0)
-		case types.Float32:
-			return float32(0)
-		case types.Float64:
-			return float64(0)
-		case types.Complex64:
-			return complex64(0)
-		case types.Complex128:
-			return complex128(0)
-		case types.String:
-			return ""
-		case types.UnsafePointer:
-			return unsafe.Pointer(nil)
-		default:
-			panic(fmt.Sprint("zero for unexpected type:", t))
-		}
-	case *types.Pointer:
-		return (*value)(nil)
-	case *types.Array:
-		a := make(array, t.Len())
-		for i := range a {
-			a[i] = zero(t.Elem())
-		}
-		return a
-	case *types.Named:
-		return zero(t.Underlying())
-	case *types.Interface:
-		return iface{} // nil type, methodset and value
-	case *types.Slice:
-		return []value(nil)
-	case *types.Struct:
-		s := make(structure, t.NumFields())
-		for i := range s {
-			s[i] = zero(t.Field(i).Type())
-		}
-		return s
-	case *types.Tuple:
-		if t.Len() == 1 {
-			return zero(t.At(0).Type())
-		}
-		s := make(tuple, t.Len())
-		for i := range s {
-			s[i] = zero(t.At(i).Type())
-		}
-		return s
-	case *types.Chan:
-		return chan value(nil)
-	case *types.Map:
-		if usesBuiltinMap(t.Key()) {
-			return map[value]value(nil)
-		}
-		return (*hashmap)(nil)
-	case *types.Signature:
-		return (*ssa.Function)(nil)
-	}
-	panic(fmt.Sprint("zero: unexpected ", t))
-}
-
-// slice returns x[lo:hi:max].  Any of lo, hi and max may be nil.
-func slice(x, lo, hi, max value) value {
-	var Len, Cap int
-	switch x := x.(type) {
-	case string:
-		Len = len(x)
-	case []value:
-		Len = len(x)
-		Cap = cap(x)
-	case *value: // *array
-		a := (*x).(array)
-		Len = len(a)
-		Cap = cap(a)
-	}
-
-	l := 0
-	if lo != nil {
-		l = asInt(lo)
-	}
-
-	h := Len
-	if hi != nil {
-		h = asInt(hi)
-	}
-
-	m := Cap
-	if max != nil {
-		m = asInt(max)
-	}
-
-	switch x := x.(type) {
-	case string:
-		return x[l:h]
-	case []value:
-		return x[l:h:m]
-	case *value: // *array
-		a := (*x).(array)
-		return []value(a)[l:h:m]
-	}
-	panic(fmt.Sprintf("slice: unexpected X type: %T", x))
-}
-
-// lookup returns x[idx] where x is a map or string.
-func lookup(instr *ssa.Lookup, x, idx value) value {
-	switch x := x.(type) { // map or string
-	case map[value]value, *hashmap:
-		var v value
-		var ok bool
-		switch x := x.(type) {
-		case map[value]value:
-			v, ok = x[idx]
-		case *hashmap:
-			v = x.lookup(idx.(hashable))
-			ok = v != nil
-		}
-		if !ok {
-			v = zero(instr.X.Type().Underlying().(*types.Map).Elem())
-		}
-		if instr.CommaOk {
-			v = tuple{v, ok}
-		}
-		return v
-	case string:
-		return x[asInt(idx)]
-	}
-	panic(fmt.Sprintf("unexpected x type in Lookup: %T", x))
-}
-
-// binop implements all arithmetic and logical binary operators for
-// numeric datatypes and strings.  Both operands must have identical
-// dynamic type.
-//
-func binop(op token.Token, t types.Type, x, y value) value {
-	switch op {
-	case token.ADD:
-		switch x.(type) {
-		case int:
-			return x.(int) + y.(int)
-		case int8:
-			return x.(int8) + y.(int8)
-		case int16:
-			return x.(int16) + y.(int16)
-		case int32:
-			return x.(int32) + y.(int32)
-		case int64:
-			return x.(int64) + y.(int64)
-		case uint:
-			return x.(uint) + y.(uint)
-		case uint8:
-			return x.(uint8) + y.(uint8)
-		case uint16:
-			return x.(uint16) + y.(uint16)
-		case uint32:
-			return x.(uint32) + y.(uint32)
-		case uint64:
-			return x.(uint64) + y.(uint64)
-		case uintptr:
-			return x.(uintptr) + y.(uintptr)
-		case float32:
-			return x.(float32) + y.(float32)
-		case float64:
-			return x.(float64) + y.(float64)
-		case complex64:
-			return x.(complex64) + y.(complex64)
-		case complex128:
-			return x.(complex128) + y.(complex128)
-		case string:
-			return x.(string) + y.(string)
-		}
-
-	case token.SUB:
-		switch x.(type) {
-		case int:
-			return x.(int) - y.(int)
-		case int8:
-			return x.(int8) - y.(int8)
-		case int16:
-			return x.(int16) - y.(int16)
-		case int32:
-			return x.(int32) - y.(int32)
-		case int64:
-			return x.(int64) - y.(int64)
-		case uint:
-			return x.(uint) - y.(uint)
-		case uint8:
-			return x.(uint8) - y.(uint8)
-		case uint16:
-			return x.(uint16) - y.(uint16)
-		case uint32:
-			return x.(uint32) - y.(uint32)
-		case uint64:
-			return x.(uint64) - y.(uint64)
-		case uintptr:
-			return x.(uintptr) - y.(uintptr)
-		case float32:
-			return x.(float32) - y.(float32)
-		case float64:
-			return x.(float64) - y.(float64)
-		case complex64:
-			return x.(complex64) - y.(complex64)
-		case complex128:
-			return x.(complex128) - y.(complex128)
-		}
-
-	case token.MUL:
-		switch x.(type) {
-		case int:
-			return x.(int) * y.(int)
-		case int8:
-			return x.(int8) * y.(int8)
-		case int16:
-			return x.(int16) * y.(int16)
-		case int32:
-			return x.(int32) * y.(int32)
-		case int64:
-			return x.(int64) * y.(int64)
-		case uint:
-			return x.(uint) * y.(uint)
-		case uint8:
-			return x.(uint8) * y.(uint8)
-		case uint16:
-			return x.(uint16) * y.(uint16)
-		case uint32:
-			return x.(uint32) * y.(uint32)
-		case uint64:
-			return x.(uint64) * y.(uint64)
-		case uintptr:
-			return x.(uintptr) * y.(uintptr)
-		case float32:
-			return x.(float32) * y.(float32)
-		case float64:
-			return x.(float64) * y.(float64)
-		case complex64:
-			return x.(complex64) * y.(complex64)
-		case complex128:
-			return x.(complex128) * y.(complex128)
-		}
-
-	case token.QUO:
-		switch x.(type) {
-		case int:
-			return x.(int) / y.(int)
-		case int8:
-			return x.(int8) / y.(int8)
-		case int16:
-			return x.(int16) / y.(int16)
-		case int32:
-			return x.(int32) / y.(int32)
-		case int64:
-			return x.(int64) / y.(int64)
-		case uint:
-			return x.(uint) / y.(uint)
-		case uint8:
-			return x.(uint8) / y.(uint8)
-		case uint16:
-			return x.(uint16) / y.(uint16)
-		case uint32:
-			return x.(uint32) / y.(uint32)
-		case uint64:
-			return x.(uint64) / y.(uint64)
-		case uintptr:
-			return x.(uintptr) / y.(uintptr)
-		case float32:
-			return x.(float32) / y.(float32)
-		case float64:
-			return x.(float64) / y.(float64)
-		case complex64:
-			return x.(complex64) / y.(complex64)
-		case complex128:
-			return x.(complex128) / y.(complex128)
-		}
-
-	case token.REM:
-		switch x.(type) {
-		case int:
-			return x.(int) % y.(int)
-		case int8:
-			return x.(int8) % y.(int8)
-		case int16:
-			return x.(int16) % y.(int16)
-		case int32:
-			return x.(int32) % y.(int32)
-		case int64:
-			return x.(int64) % y.(int64)
-		case uint:
-			return x.(uint) % y.(uint)
-		case uint8:
-			return x.(uint8) % y.(uint8)
-		case uint16:
-			return x.(uint16) % y.(uint16)
-		case uint32:
-			return x.(uint32) % y.(uint32)
-		case uint64:
-			return x.(uint64) % y.(uint64)
-		case uintptr:
-			return x.(uintptr) % y.(uintptr)
-		}
-
-	case token.AND:
-		switch x.(type) {
-		case int:
-			return x.(int) & y.(int)
-		case int8:
-			return x.(int8) & y.(int8)
-		case int16:
-			return x.(int16) & y.(int16)
-		case int32:
-			return x.(int32) & y.(int32)
-		case int64:
-			return x.(int64) & y.(int64)
-		case uint:
-			return x.(uint) & y.(uint)
-		case uint8:
-			return x.(uint8) & y.(uint8)
-		case uint16:
-			return x.(uint16) & y.(uint16)
-		case uint32:
-			return x.(uint32) & y.(uint32)
-		case uint64:
-			return x.(uint64) & y.(uint64)
-		case uintptr:
-			return x.(uintptr) & y.(uintptr)
-		}
-
-	case token.OR:
-		switch x.(type) {
-		case int:
-			return x.(int) | y.(int)
-		case int8:
-			return x.(int8) | y.(int8)
-		case int16:
-			return x.(int16) | y.(int16)
-		case int32:
-			return x.(int32) | y.(int32)
-		case int64:
-			return x.(int64) | y.(int64)
-		case uint:
-			return x.(uint) | y.(uint)
-		case uint8:
-			return x.(uint8) | y.(uint8)
-		case uint16:
-			return x.(uint16) | y.(uint16)
-		case uint32:
-			return x.(uint32) | y.(uint32)
-		case uint64:
-			return x.(uint64) | y.(uint64)
-		case uintptr:
-			return x.(uintptr) | y.(uintptr)
-		}
-
-	case token.XOR:
-		switch x.(type) {
-		case int:
-			return x.(int) ^ y.(int)
-		case int8:
-			return x.(int8) ^ y.(int8)
-		case int16:
-			return x.(int16) ^ y.(int16)
-		case int32:
-			return x.(int32) ^ y.(int32)
-		case int64:
-			return x.(int64) ^ y.(int64)
-		case uint:
-			return x.(uint) ^ y.(uint)
-		case uint8:
-			return x.(uint8) ^ y.(uint8)
-		case uint16:
-			return x.(uint16) ^ y.(uint16)
-		case uint32:
-			return x.(uint32) ^ y.(uint32)
-		case uint64:
-			return x.(uint64) ^ y.(uint64)
-		case uintptr:
-			return x.(uintptr) ^ y.(uintptr)
-		}
-
-	case token.AND_NOT:
-		switch x.(type) {
-		case int:
-			return x.(int) &^ y.(int)
-		case int8:
-			return x.(int8) &^ y.(int8)
-		case int16:
-			return x.(int16) &^ y.(int16)
-		case int32:
-			return x.(int32) &^ y.(int32)
-		case int64:
-			return x.(int64) &^ y.(int64)
-		case uint:
-			return x.(uint) &^ y.(uint)
-		case uint8:
-			return x.(uint8) &^ y.(uint8)
-		case uint16:
-			return x.(uint16) &^ y.(uint16)
-		case uint32:
-			return x.(uint32) &^ y.(uint32)
-		case uint64:
-			return x.(uint64) &^ y.(uint64)
-		case uintptr:
-			return x.(uintptr) &^ y.(uintptr)
-		}
-
-	case token.SHL:
-		y := asUint64(y)
-		switch x.(type) {
-		case int:
-			return x.(int) << y
-		case int8:
-			return x.(int8) << y
-		case int16:
-			return x.(int16) << y
-		case int32:
-			return x.(int32) << y
-		case int64:
-			return x.(int64) << y
-		case uint:
-			return x.(uint) << y
-		case uint8:
-			return x.(uint8) << y
-		case uint16:
-			return x.(uint16) << y
-		case uint32:
-			return x.(uint32) << y
-		case uint64:
-			return x.(uint64) << y
-		case uintptr:
-			return x.(uintptr) << y
-		}
-
-	case token.SHR:
-		y := asUint64(y)
-		switch x.(type) {
-		case int:
-			return x.(int) >> y
-		case int8:
-			return x.(int8) >> y
-		case int16:
-			return x.(int16) >> y
-		case int32:
-			return x.(int32) >> y
-		case int64:
-			return x.(int64) >> y
-		case uint:
-			return x.(uint) >> y
-		case uint8:
-			return x.(uint8) >> y
-		case uint16:
-			return x.(uint16) >> y
-		case uint32:
-			return x.(uint32) >> y
-		case uint64:
-			return x.(uint64) >> y
-		case uintptr:
-			return x.(uintptr) >> y
-		}
-
-	case token.LSS:
-		switch x.(type) {
-		case int:
-			return x.(int) < y.(int)
-		case int8:
-			return x.(int8) < y.(int8)
-		case int16:
-			return x.(int16) < y.(int16)
-		case int32:
-			return x.(int32) < y.(int32)
-		case int64:
-			return x.(int64) < y.(int64)
-		case uint:
-			return x.(uint) < y.(uint)
-		case uint8:
-			return x.(uint8) < y.(uint8)
-		case uint16:
-			return x.(uint16) < y.(uint16)
-		case uint32:
-			return x.(uint32) < y.(uint32)
-		case uint64:
-			return x.(uint64) < y.(uint64)
-		case uintptr:
-			return x.(uintptr) < y.(uintptr)
-		case float32:
-			return x.(float32) < y.(float32)
-		case float64:
-			return x.(float64) < y.(float64)
-		case string:
-			return x.(string) < y.(string)
-		}
-
-	case token.LEQ:
-		switch x.(type) {
-		case int:
-			return x.(int) <= y.(int)
-		case int8:
-			return x.(int8) <= y.(int8)
-		case int16:
-			return x.(int16) <= y.(int16)
-		case int32:
-			return x.(int32) <= y.(int32)
-		case int64:
-			return x.(int64) <= y.(int64)
-		case uint:
-			return x.(uint) <= y.(uint)
-		case uint8:
-			return x.(uint8) <= y.(uint8)
-		case uint16:
-			return x.(uint16) <= y.(uint16)
-		case uint32:
-			return x.(uint32) <= y.(uint32)
-		case uint64:
-			return x.(uint64) <= y.(uint64)
-		case uintptr:
-			return x.(uintptr) <= y.(uintptr)
-		case float32:
-			return x.(float32) <= y.(float32)
-		case float64:
-			return x.(float64) <= y.(float64)
-		case string:
-			return x.(string) <= y.(string)
-		}
-
-	case token.EQL:
-		return eqnil(t, x, y)
-
-	case token.NEQ:
-		return !eqnil(t, x, y)
-
-	case token.GTR:
-		switch x.(type) {
-		case int:
-			return x.(int) > y.(int)
-		case int8:
-			return x.(int8) > y.(int8)
-		case int16:
-			return x.(int16) > y.(int16)
-		case int32:
-			return x.(int32) > y.(int32)
-		case int64:
-			return x.(int64) > y.(int64)
-		case uint:
-			return x.(uint) > y.(uint)
-		case uint8:
-			return x.(uint8) > y.(uint8)
-		case uint16:
-			return x.(uint16) > y.(uint16)
-		case uint32:
-			return x.(uint32) > y.(uint32)
-		case uint64:
-			return x.(uint64) > y.(uint64)
-		case uintptr:
-			return x.(uintptr) > y.(uintptr)
-		case float32:
-			return x.(float32) > y.(float32)
-		case float64:
-			return x.(float64) > y.(float64)
-		case string:
-			return x.(string) > y.(string)
-		}
-
-	case token.GEQ:
-		switch x.(type) {
-		case int:
-			return x.(int) >= y.(int)
-		case int8:
-			return x.(int8) >= y.(int8)
-		case int16:
-			return x.(int16) >= y.(int16)
-		case int32:
-			return x.(int32) >= y.(int32)
-		case int64:
-			return x.(int64) >= y.(int64)
-		case uint:
-			return x.(uint) >= y.(uint)
-		case uint8:
-			return x.(uint8) >= y.(uint8)
-		case uint16:
-			return x.(uint16) >= y.(uint16)
-		case uint32:
-			return x.(uint32) >= y.(uint32)
-		case uint64:
-			return x.(uint64) >= y.(uint64)
-		case uintptr:
-			return x.(uintptr) >= y.(uintptr)
-		case float32:
-			return x.(float32) >= y.(float32)
-		case float64:
-			return x.(float64) >= y.(float64)
-		case string:
-			return x.(string) >= y.(string)
-		}
-	}
-	panic(fmt.Sprintf("invalid binary op: %T %s %T", x, op, y))
-}
-
-// eqnil returns the comparison x == y using the equivalence relation
-// appropriate for type t.
-// If t is a reference type, at most one of x or y may be a nil value
-// of that type.
-//
-func eqnil(t types.Type, x, y value) bool {
-	switch t.Underlying().(type) {
-	case *types.Map, *types.Signature, *types.Slice:
-		// Since these types don't support comparison,
-		// one of the operands must be a literal nil.
-		switch x := x.(type) {
-		case *hashmap:
-			return (x != nil) == (y.(*hashmap) != nil)
-		case map[value]value:
-			return (x != nil) == (y.(map[value]value) != nil)
-		case *ssa.Function:
-			switch y := y.(type) {
-			case *ssa.Function:
-				return (x != nil) == (y != nil)
-			case *closure:
-				return true
-			}
-		case *closure:
-			return (x != nil) == (y.(*ssa.Function) != nil)
-		case []value:
-			return (x != nil) == (y.([]value) != nil)
-		}
-		panic(fmt.Sprintf("eqnil(%s): illegal dynamic type: %T", t, x))
-	}
-
-	return equals(t, x, y)
-}
-
-func unop(instr *ssa.UnOp, x value) value {
-	switch instr.Op {
-	case token.ARROW: // receive
-		v, ok := <-x.(chan value)
-		if !ok {
-			v = zero(instr.X.Type().Underlying().(*types.Chan).Elem())
-		}
-		if instr.CommaOk {
-			v = tuple{v, ok}
-		}
-		return v
-	case token.SUB:
-		switch x := x.(type) {
-		case int:
-			return -x
-		case int8:
-			return -x
-		case int16:
-			return -x
-		case int32:
-			return -x
-		case int64:
-			return -x
-		case uint:
-			return -x
-		case uint8:
-			return -x
-		case uint16:
-			return -x
-		case uint32:
-			return -x
-		case uint64:
-			return -x
-		case uintptr:
-			return -x
-		case float32:
-			return -x
-		case float64:
-			return -x
-		case complex64:
-			return -x
-		case complex128:
-			return -x
-		}
-	case token.MUL:
-		return load(deref(instr.X.Type()), x.(*value))
-	case token.NOT:
-		return !x.(bool)
-	case token.XOR:
-		switch x := x.(type) {
-		case int:
-			return ^x
-		case int8:
-			return ^x
-		case int16:
-			return ^x
-		case int32:
-			return ^x
-		case int64:
-			return ^x
-		case uint:
-			return ^x
-		case uint8:
-			return ^x
-		case uint16:
-			return ^x
-		case uint32:
-			return ^x
-		case uint64:
-			return ^x
-		case uintptr:
-			return ^x
-		}
-	}
-	panic(fmt.Sprintf("invalid unary op %s %T", instr.Op, x))
-}
-
-// typeAssert checks whether dynamic type of itf is instr.AssertedType.
-// It returns the extracted value on success, and panics on failure,
-// unless instr.CommaOk, in which case it always returns a "value,ok" tuple.
-//
-func typeAssert(i *interpreter, instr *ssa.TypeAssert, itf iface) value {
-	var v value
-	err := ""
-	if itf.t == nil {
-		err = fmt.Sprintf("interface conversion: interface is nil, not %s", instr.AssertedType)
-
-	} else if idst, ok := instr.AssertedType.Underlying().(*types.Interface); ok {
-		v = itf
-		err = checkInterface(i, idst, itf)
-
-	} else if types.Identical(itf.t, instr.AssertedType) {
-		v = itf.v // extract value
-
-	} else {
-		err = fmt.Sprintf("interface conversion: interface is %s, not %s", itf.t, instr.AssertedType)
-	}
-
-	if err != "" {
-		if !instr.CommaOk {
-			panic(err)
-		}
-		return tuple{zero(instr.AssertedType), false}
-	}
-	if instr.CommaOk {
-		return tuple{v, true}
-	}
-	return v
-}
-
-// If CapturedOutput is non-nil, all writes by the interpreted program
-// to file descriptors 1 and 2 will also be written to CapturedOutput.
-//
-// (The $GOROOT/test system requires that the test be considered a
-// failure if "BUG" appears in the combined stdout/stderr output, even
-// if it exits zero.  This is a global variable shared by all
-// interpreters in the same process.)
-//
-var CapturedOutput *bytes.Buffer
-var capturedOutputMu sync.Mutex
-
-// write writes bytes b to the target program's file descriptor fd.
-// The print/println built-ins and the write() system call funnel
-// through here so they can be captured by the test driver.
-func write(fd int, b []byte) (int, error) {
-	// TODO(adonovan): fix: on Windows, std{out,err} are not 1, 2.
-	if CapturedOutput != nil && (fd == 1 || fd == 2) {
-		capturedOutputMu.Lock()
-		CapturedOutput.Write(b) // ignore errors
-		capturedOutputMu.Unlock()
-	}
-	return syswrite(fd, b)
-}
-
-var syswrite func(int, []byte) (int, error) // set on darwin/linux only
-
-// callBuiltin interprets a call to builtin fn with arguments args,
-// returning its result.
-func callBuiltin(caller *frame, callpos token.Pos, fn *ssa.Builtin, args []value) value {
-	switch fn.Name() {
-	case "append":
-		if len(args) == 1 {
-			return args[0]
-		}
-		if s, ok := args[1].(string); ok {
-			// append([]byte, ...string) []byte
-			arg0 := args[0].([]value)
-			for i := 0; i < len(s); i++ {
-				arg0 = append(arg0, s[i])
-			}
-			return arg0
-		}
-		// append([]T, ...[]T) []T
-		return append(args[0].([]value), args[1].([]value)...)
-
-	case "copy": // copy([]T, []T) int or copy([]byte, string) int
-		src := args[1]
-		if _, ok := src.(string); ok {
-			params := fn.Type().(*types.Signature).Params()
-			src = conv(params.At(0).Type(), params.At(1).Type(), src)
-		}
-		return copy(args[0].([]value), src.([]value))
-
-	case "close": // close(chan T)
-		close(args[0].(chan value))
-		return nil
-
-	case "delete": // delete(map[K]value, K)
-		switch m := args[0].(type) {
-		case map[value]value:
-			delete(m, args[1])
-		case *hashmap:
-			m.delete(args[1].(hashable))
-		default:
-			panic(fmt.Sprintf("illegal map type: %T", m))
-		}
-		return nil
-
-	case "print", "println": // print(any, ...)
-		ln := fn.Name() == "println"
-		var buf bytes.Buffer
-		for i, arg := range args {
-			if i > 0 && ln {
-				buf.WriteRune(' ')
-			}
-			buf.WriteString(toString(arg))
-		}
-		if ln {
-			buf.WriteRune('\n')
-		}
-		write(1, buf.Bytes())
-		return nil
-
-	case "len":
-		switch x := args[0].(type) {
-		case string:
-			return len(x)
-		case array:
-			return len(x)
-		case *value:
-			return len((*x).(array))
-		case []value:
-			return len(x)
-		case map[value]value:
-			return len(x)
-		case *hashmap:
-			return x.len()
-		case chan value:
-			return len(x)
-		default:
-			panic(fmt.Sprintf("len: illegal operand: %T", x))
-		}
-
-	case "cap":
-		switch x := args[0].(type) {
-		case array:
-			return cap(x)
-		case *value:
-			return cap((*x).(array))
-		case []value:
-			return cap(x)
-		case chan value:
-			return cap(x)
-		default:
-			panic(fmt.Sprintf("cap: illegal operand: %T", x))
-		}
-
-	case "real":
-		switch c := args[0].(type) {
-		case complex64:
-			return real(c)
-		case complex128:
-			return real(c)
-		default:
-			panic(fmt.Sprintf("real: illegal operand: %T", c))
-		}
-
-	case "imag":
-		switch c := args[0].(type) {
-		case complex64:
-			return imag(c)
-		case complex128:
-			return imag(c)
-		default:
-			panic(fmt.Sprintf("imag: illegal operand: %T", c))
-		}
-
-	case "complex":
-		switch f := args[0].(type) {
-		case float32:
-			return complex(f, args[1].(float32))
-		case float64:
-			return complex(f, args[1].(float64))
-		default:
-			panic(fmt.Sprintf("complex: illegal operand: %T", f))
-		}
-
-	case "panic":
-		// ssa.Panic handles most cases; this is only for "go
-		// panic" or "defer panic".
-		panic(targetPanic{args[0]})
-
-	case "recover":
-		return doRecover(caller)
-
-	case "ssa:wrapnilchk":
-		recv := args[0]
-		if recv.(*value) == nil {
-			recvType := args[1]
-			methodName := args[2]
-			panic(fmt.Sprintf("value method (%s).%s called using nil *%s pointer",
-				recvType, methodName, recvType))
-		}
-		return recv
-	}
-
-	panic("unknown built-in: " + fn.Name())
-}
-
-func rangeIter(x value, t types.Type) iter {
-	switch x := x.(type) {
-	case map[value]value:
-		// TODO(adonovan): fix: leaks goroutines and channels
-		// on each incomplete map iteration.  We need to open
-		// up an iteration interface using the
-		// reflect.(Value).MapKeys machinery.
-		it := make(mapIter)
-		go func() {
-			for k, v := range x {
-				it <- [2]value{k, v}
-			}
-			close(it)
-		}()
-		return it
-	case *hashmap:
-		// TODO(adonovan): fix: leaks goroutines and channels
-		// on each incomplete map iteration.  We need to open
-		// up an iteration interface using the
-		// reflect.(Value).MapKeys machinery.
-		it := make(mapIter)
-		go func() {
-			for _, e := range x.entries() {
-				for e != nil {
-					it <- [2]value{e.key, e.value}
-					e = e.next
-				}
-			}
-			close(it)
-		}()
-		return it
-	case string:
-		return &stringIter{Reader: strings.NewReader(x)}
-	}
-	panic(fmt.Sprintf("cannot range over %T", x))
-}
-
-// widen widens a basic typed value x to the widest type of its
-// category, one of:
-//   bool, int64, uint64, float64, complex128, string.
-// This is inefficient but reduces the size of the cross-product of
-// cases we have to consider.
-//
-func widen(x value) value {
-	switch y := x.(type) {
-	case bool, int64, uint64, float64, complex128, string, unsafe.Pointer:
-		return x
-	case int:
-		return int64(y)
-	case int8:
-		return int64(y)
-	case int16:
-		return int64(y)
-	case int32:
-		return int64(y)
-	case uint:
-		return uint64(y)
-	case uint8:
-		return uint64(y)
-	case uint16:
-		return uint64(y)
-	case uint32:
-		return uint64(y)
-	case uintptr:
-		return uint64(y)
-	case float32:
-		return float64(y)
-	case complex64:
-		return complex128(y)
-	}
-	panic(fmt.Sprintf("cannot widen %T", x))
-}
-
-// conv converts the value x of type t_src to type t_dst and returns
-// the result.
-// Possible cases are described with the ssa.Convert operator.
-//
-func conv(t_dst, t_src types.Type, x value) value {
-	ut_src := t_src.Underlying()
-	ut_dst := t_dst.Underlying()
-
-	// Destination type is not an "untyped" type.
-	if b, ok := ut_dst.(*types.Basic); ok && b.Info()&types.IsUntyped != 0 {
-		panic("oops: conversion to 'untyped' type: " + b.String())
-	}
-
-	// Nor is it an interface type.
-	if _, ok := ut_dst.(*types.Interface); ok {
-		if _, ok := ut_src.(*types.Interface); ok {
-			panic("oops: Convert should be ChangeInterface")
-		} else {
-			panic("oops: Convert should be MakeInterface")
-		}
-	}
-
-	// Remaining conversions:
-	//    + untyped string/number/bool constant to a specific
-	//      representation.
-	//    + conversions between non-complex numeric types.
-	//    + conversions between complex numeric types.
-	//    + integer/[]byte/[]rune -> string.
-	//    + string -> []byte/[]rune.
-	//
-	// All are treated the same: first we extract the value to the
-	// widest representation (int64, uint64, float64, complex128,
-	// or string), then we convert it to the desired type.
-
-	switch ut_src := ut_src.(type) {
-	case *types.Pointer:
-		switch ut_dst := ut_dst.(type) {
-		case *types.Basic:
-			// *value to unsafe.Pointer?
-			if ut_dst.Kind() == types.UnsafePointer {
-				return unsafe.Pointer(x.(*value))
-			}
-		}
-
-	case *types.Slice:
-		// []byte or []rune -> string
-		// TODO(adonovan): fix: type B byte; conv([]B -> string).
-		switch ut_src.Elem().(*types.Basic).Kind() {
-		case types.Byte:
-			x := x.([]value)
-			b := make([]byte, 0, len(x))
-			for i := range x {
-				b = append(b, x[i].(byte))
-			}
-			return string(b)
-
-		case types.Rune:
-			x := x.([]value)
-			r := make([]rune, 0, len(x))
-			for i := range x {
-				r = append(r, x[i].(rune))
-			}
-			return string(r)
-		}
-
-	case *types.Basic:
-		x = widen(x)
-
-		// integer -> string?
-		// TODO(adonovan): fix: test integer -> named alias of string.
-		if ut_src.Info()&types.IsInteger != 0 {
-			if ut_dst, ok := ut_dst.(*types.Basic); ok && ut_dst.Kind() == types.String {
-				return string(asInt(x))
-			}
-		}
-
-		// string -> []rune, []byte or string?
-		if s, ok := x.(string); ok {
-			switch ut_dst := ut_dst.(type) {
-			case *types.Slice:
-				var res []value
-				// TODO(adonovan): fix: test named alias of rune, byte.
-				switch ut_dst.Elem().(*types.Basic).Kind() {
-				case types.Rune:
-					for _, r := range []rune(s) {
-						res = append(res, r)
-					}
-					return res
-				case types.Byte:
-					for _, b := range []byte(s) {
-						res = append(res, b)
-					}
-					return res
-				}
-			case *types.Basic:
-				if ut_dst.Kind() == types.String {
-					return x.(string)
-				}
-			}
-			break // fail: no other conversions for string
-		}
-
-		// unsafe.Pointer -> *value
-		if ut_src.Kind() == types.UnsafePointer {
-			// TODO(adonovan): this is wrong and cannot
-			// really be fixed with the current design.
-			//
-			// return (*value)(x.(unsafe.Pointer))
-			// creates a new pointer of a different
-			// type but the underlying interface value
-			// knows its "true" type and so cannot be
-			// meaningfully used through the new pointer.
-			//
-			// To make this work, the interpreter needs to
-			// simulate the memory layout of a real
-			// compiled implementation.
-			//
-			// To at least preserve type-safety, we'll
-			// just return the zero value of the
-			// destination type.
-			return zero(t_dst)
-		}
-
-		// Conversions between complex numeric types?
-		if ut_src.Info()&types.IsComplex != 0 {
-			switch ut_dst.(*types.Basic).Kind() {
-			case types.Complex64:
-				return complex64(x.(complex128))
-			case types.Complex128:
-				return x.(complex128)
-			}
-			break // fail: no other conversions for complex
-		}
-
-		// Conversions between non-complex numeric types?
-		if ut_src.Info()&types.IsNumeric != 0 {
-			kind := ut_dst.(*types.Basic).Kind()
-			switch x := x.(type) {
-			case int64: // signed integer -> numeric?
-				switch kind {
-				case types.Int:
-					return int(x)
-				case types.Int8:
-					return int8(x)
-				case types.Int16:
-					return int16(x)
-				case types.Int32:
-					return int32(x)
-				case types.Int64:
-					return int64(x)
-				case types.Uint:
-					return uint(x)
-				case types.Uint8:
-					return uint8(x)
-				case types.Uint16:
-					return uint16(x)
-				case types.Uint32:
-					return uint32(x)
-				case types.Uint64:
-					return uint64(x)
-				case types.Uintptr:
-					return uintptr(x)
-				case types.Float32:
-					return float32(x)
-				case types.Float64:
-					return float64(x)
-				}
-
-			case uint64: // unsigned integer -> numeric?
-				switch kind {
-				case types.Int:
-					return int(x)
-				case types.Int8:
-					return int8(x)
-				case types.Int16:
-					return int16(x)
-				case types.Int32:
-					return int32(x)
-				case types.Int64:
-					return int64(x)
-				case types.Uint:
-					return uint(x)
-				case types.Uint8:
-					return uint8(x)
-				case types.Uint16:
-					return uint16(x)
-				case types.Uint32:
-					return uint32(x)
-				case types.Uint64:
-					return uint64(x)
-				case types.Uintptr:
-					return uintptr(x)
-				case types.Float32:
-					return float32(x)
-				case types.Float64:
-					return float64(x)
-				}
-
-			case float64: // floating point -> numeric?
-				switch kind {
-				case types.Int:
-					return int(x)
-				case types.Int8:
-					return int8(x)
-				case types.Int16:
-					return int16(x)
-				case types.Int32:
-					return int32(x)
-				case types.Int64:
-					return int64(x)
-				case types.Uint:
-					return uint(x)
-				case types.Uint8:
-					return uint8(x)
-				case types.Uint16:
-					return uint16(x)
-				case types.Uint32:
-					return uint32(x)
-				case types.Uint64:
-					return uint64(x)
-				case types.Uintptr:
-					return uintptr(x)
-				case types.Float32:
-					return float32(x)
-				case types.Float64:
-					return float64(x)
-				}
-			}
-		}
-	}
-
-	panic(fmt.Sprintf("unsupported conversion: %s  -> %s, dynamic type %T", t_src, t_dst, x))
-}
-
-// checkInterface checks that the method set of x implements the
-// interface itype.
-// On success it returns "", on failure, an error message.
-//
-func checkInterface(i *interpreter, itype *types.Interface, x iface) string {
-	if meth, _ := types.MissingMethod(x.t, itype, true); meth != nil {
-		return fmt.Sprintf("interface conversion: %v is not %v: missing method %s",
-			x.t, itype, meth.Name())
-	}
-	return "" // ok
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/reflect.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/reflect.go
deleted file mode 100644
index 2b82899681..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/reflect.go
+++ /dev/null
@@ -1,574 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package interp
-
-// Emulated "reflect" package.
-//
-// We completely replace the built-in "reflect" package.
-// The only thing clients can depend upon are that reflect.Type is an
-// interface and reflect.Value is an (opaque) struct.
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"reflect"
-	"unsafe"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-type opaqueType struct {
-	types.Type
-	name string
-}
-
-func (t *opaqueType) String() string { return t.name }
-
-// A bogus "reflect" type-checker package.  Shared across interpreters.
-var reflectTypesPackage = types.NewPackage("reflect", "reflect")
-
-// rtype is the concrete type the interpreter uses to implement the
-// reflect.Type interface.
-//
-// type rtype <opaque>
-var rtypeType = makeNamedType("rtype", &opaqueType{nil, "rtype"})
-
-// error is an (interpreted) named type whose underlying type is string.
-// The interpreter uses it for all implementations of the built-in error
-// interface that it creates.
-// We put it in the "reflect" package for expedience.
-//
-// type error string
-var errorType = makeNamedType("error", &opaqueType{nil, "error"})
-
-func makeNamedType(name string, underlying types.Type) *types.Named {
-	obj := types.NewTypeName(token.NoPos, reflectTypesPackage, name, nil)
-	return types.NewNamed(obj, underlying, nil)
-}
-
-func makeReflectValue(t types.Type, v value) value {
-	return structure{rtype{t}, v}
-}
-
-// Given a reflect.Value, returns its rtype.
-func rV2T(v value) rtype {
-	return v.(structure)[0].(rtype)
-}
-
-// Given a reflect.Value, returns the underlying interpreter value.
-func rV2V(v value) value {
-	return v.(structure)[1]
-}
-
-// makeReflectType boxes up an rtype in a reflect.Type interface.
-func makeReflectType(rt rtype) value {
-	return iface{rtypeType, rt}
-}
-
-func ext۰reflect۰Init(fr *frame, args []value) value {
-	// Signature: func()
-	return nil
-}
-
-func ext۰reflect۰rtype۰Bits(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) int
-	rt := args[0].(rtype).t
-	basic, ok := rt.Underlying().(*types.Basic)
-	if !ok {
-		panic(fmt.Sprintf("reflect.Type.Bits(%T): non-basic type", rt))
-	}
-	return int(fr.i.sizes.Sizeof(basic)) * 8
-}
-
-func ext۰reflect۰rtype۰Elem(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) reflect.Type
-	return makeReflectType(rtype{args[0].(rtype).t.Underlying().(interface {
-		Elem() types.Type
-	}).Elem()})
-}
-
-func ext۰reflect۰rtype۰Field(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype, i int) reflect.StructField
-	st := args[0].(rtype).t.Underlying().(*types.Struct)
-	i := args[1].(int)
-	f := st.Field(i)
-	return structure{
-		f.Name(),
-		f.Pkg().Path(),
-		makeReflectType(rtype{f.Type()}),
-		st.Tag(i),
-		0,         // TODO(adonovan): offset
-		[]value{}, // TODO(adonovan): indices
-		f.Anonymous(),
-	}
-}
-
-func ext۰reflect۰rtype۰In(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype, i int) int
-	i := args[1].(int)
-	return makeReflectType(rtype{args[0].(rtype).t.(*types.Signature).Params().At(i).Type()})
-}
-
-func ext۰reflect۰rtype۰Kind(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) uint
-	return uint(reflectKind(args[0].(rtype).t))
-}
-
-func ext۰reflect۰rtype۰NumField(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) int
-	return args[0].(rtype).t.Underlying().(*types.Struct).NumFields()
-}
-
-func ext۰reflect۰rtype۰NumIn(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) int
-	return args[0].(rtype).t.(*types.Signature).Params().Len()
-}
-
-func ext۰reflect۰rtype۰NumMethod(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) int
-	return fr.i.prog.MethodSets.MethodSet(args[0].(rtype).t).Len()
-}
-
-func ext۰reflect۰rtype۰NumOut(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) int
-	return args[0].(rtype).t.(*types.Signature).Results().Len()
-}
-
-func ext۰reflect۰rtype۰Out(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype, i int) int
-	i := args[1].(int)
-	return makeReflectType(rtype{args[0].(rtype).t.(*types.Signature).Results().At(i).Type()})
-}
-
-func ext۰reflect۰rtype۰Size(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) uintptr
-	return uintptr(fr.i.sizes.Sizeof(args[0].(rtype).t))
-}
-
-func ext۰reflect۰rtype۰String(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) string
-	return args[0].(rtype).t.String()
-}
-
-func ext۰reflect۰New(fr *frame, args []value) value {
-	// Signature: func (t reflect.Type) reflect.Value
-	t := args[0].(iface).v.(rtype).t
-	alloc := zero(t)
-	return makeReflectValue(types.NewPointer(t), &alloc)
-}
-
-func ext۰reflect۰SliceOf(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) Type
-	return makeReflectType(rtype{types.NewSlice(args[0].(iface).v.(rtype).t)})
-}
-
-func ext۰reflect۰TypeOf(fr *frame, args []value) value {
-	// Signature: func (t reflect.rtype) Type
-	return makeReflectType(rtype{args[0].(iface).t})
-}
-
-func ext۰reflect۰ValueOf(fr *frame, args []value) value {
-	// Signature: func (interface{}) reflect.Value
-	itf := args[0].(iface)
-	return makeReflectValue(itf.t, itf.v)
-}
-
-func ext۰reflect۰Zero(fr *frame, args []value) value {
-	// Signature: func (t reflect.Type) reflect.Value
-	t := args[0].(iface).v.(rtype).t
-	return makeReflectValue(t, zero(t))
-}
-
-func reflectKind(t types.Type) reflect.Kind {
-	switch t := t.(type) {
-	case *types.Named:
-		return reflectKind(t.Underlying())
-	case *types.Basic:
-		switch t.Kind() {
-		case types.Bool:
-			return reflect.Bool
-		case types.Int:
-			return reflect.Int
-		case types.Int8:
-			return reflect.Int8
-		case types.Int16:
-			return reflect.Int16
-		case types.Int32:
-			return reflect.Int32
-		case types.Int64:
-			return reflect.Int64
-		case types.Uint:
-			return reflect.Uint
-		case types.Uint8:
-			return reflect.Uint8
-		case types.Uint16:
-			return reflect.Uint16
-		case types.Uint32:
-			return reflect.Uint32
-		case types.Uint64:
-			return reflect.Uint64
-		case types.Uintptr:
-			return reflect.Uintptr
-		case types.Float32:
-			return reflect.Float32
-		case types.Float64:
-			return reflect.Float64
-		case types.Complex64:
-			return reflect.Complex64
-		case types.Complex128:
-			return reflect.Complex128
-		case types.String:
-			return reflect.String
-		case types.UnsafePointer:
-			return reflect.UnsafePointer
-		}
-	case *types.Array:
-		return reflect.Array
-	case *types.Chan:
-		return reflect.Chan
-	case *types.Signature:
-		return reflect.Func
-	case *types.Interface:
-		return reflect.Interface
-	case *types.Map:
-		return reflect.Map
-	case *types.Pointer:
-		return reflect.Ptr
-	case *types.Slice:
-		return reflect.Slice
-	case *types.Struct:
-		return reflect.Struct
-	}
-	panic(fmt.Sprint("unexpected type: ", t))
-}
-
-func ext۰reflect۰Value۰Kind(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) uint
-	return uint(reflectKind(rV2T(args[0]).t))
-}
-
-func ext۰reflect۰Value۰String(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) string
-	return toString(rV2V(args[0]))
-}
-
-func ext۰reflect۰Value۰Type(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) reflect.Type
-	return makeReflectType(rV2T(args[0]))
-}
-
-func ext۰reflect۰Value۰Uint(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) uint64
-	switch v := rV2V(args[0]).(type) {
-	case uint:
-		return uint64(v)
-	case uint8:
-		return uint64(v)
-	case uint16:
-		return uint64(v)
-	case uint32:
-		return uint64(v)
-	case uint64:
-		return uint64(v)
-	case uintptr:
-		return uint64(v)
-	}
-	panic("reflect.Value.Uint")
-}
-
-func ext۰reflect۰Value۰Len(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) int
-	switch v := rV2V(args[0]).(type) {
-	case string:
-		return len(v)
-	case array:
-		return len(v)
-	case chan value:
-		return cap(v)
-	case []value:
-		return len(v)
-	case *hashmap:
-		return v.len()
-	case map[value]value:
-		return len(v)
-	default:
-		panic(fmt.Sprintf("reflect.(Value).Len(%v)", v))
-	}
-}
-
-func ext۰reflect۰Value۰MapIndex(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) Value
-	tValue := rV2T(args[0]).t.Underlying().(*types.Map).Key()
-	k := rV2V(args[1])
-	switch m := rV2V(args[0]).(type) {
-	case map[value]value:
-		if v, ok := m[k]; ok {
-			return makeReflectValue(tValue, v)
-		}
-
-	case *hashmap:
-		if v := m.lookup(k.(hashable)); v != nil {
-			return makeReflectValue(tValue, v)
-		}
-
-	default:
-		panic(fmt.Sprintf("(reflect.Value).MapIndex(%T, %T)", m, k))
-	}
-	return makeReflectValue(nil, nil)
-}
-
-func ext۰reflect۰Value۰MapKeys(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) []Value
-	var keys []value
-	tKey := rV2T(args[0]).t.Underlying().(*types.Map).Key()
-	switch v := rV2V(args[0]).(type) {
-	case map[value]value:
-		for k := range v {
-			keys = append(keys, makeReflectValue(tKey, k))
-		}
-
-	case *hashmap:
-		for _, e := range v.entries() {
-			for ; e != nil; e = e.next {
-				keys = append(keys, makeReflectValue(tKey, e.key))
-			}
-		}
-
-	default:
-		panic(fmt.Sprintf("(reflect.Value).MapKeys(%T)", v))
-	}
-	return keys
-}
-
-func ext۰reflect۰Value۰NumField(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) int
-	return len(rV2V(args[0]).(structure))
-}
-
-func ext۰reflect۰Value۰NumMethod(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) int
-	return fr.i.prog.MethodSets.MethodSet(rV2T(args[0]).t).Len()
-}
-
-func ext۰reflect۰Value۰Pointer(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value) uintptr
-	switch v := rV2V(args[0]).(type) {
-	case *value:
-		return uintptr(unsafe.Pointer(v))
-	case chan value:
-		return reflect.ValueOf(v).Pointer()
-	case []value:
-		return reflect.ValueOf(v).Pointer()
-	case *hashmap:
-		return reflect.ValueOf(v.entries()).Pointer()
-	case map[value]value:
-		return reflect.ValueOf(v).Pointer()
-	case *ssa.Function:
-		return uintptr(unsafe.Pointer(v))
-	case *closure:
-		return uintptr(unsafe.Pointer(v))
-	default:
-		panic(fmt.Sprintf("reflect.(Value).Pointer(%T)", v))
-	}
-}
-
-func ext۰reflect۰Value۰Index(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value, i int) Value
-	i := args[1].(int)
-	t := rV2T(args[0]).t.Underlying()
-	switch v := rV2V(args[0]).(type) {
-	case array:
-		return makeReflectValue(t.(*types.Array).Elem(), v[i])
-	case []value:
-		return makeReflectValue(t.(*types.Slice).Elem(), v[i])
-	default:
-		panic(fmt.Sprintf("reflect.(Value).Index(%T)", v))
-	}
-}
-
-func ext۰reflect۰Value۰Bool(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) bool
-	return rV2V(args[0]).(bool)
-}
-
-func ext۰reflect۰Value۰CanAddr(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value) bool
-	// Always false for our representation.
-	return false
-}
-
-func ext۰reflect۰Value۰CanInterface(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value) bool
-	// Always true for our representation.
-	return true
-}
-
-func ext۰reflect۰Value۰Elem(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value) reflect.Value
-	switch x := rV2V(args[0]).(type) {
-	case iface:
-		return makeReflectValue(x.t, x.v)
-	case *value:
-		return makeReflectValue(rV2T(args[0]).t.Underlying().(*types.Pointer).Elem(), *x)
-	default:
-		panic(fmt.Sprintf("reflect.(Value).Elem(%T)", x))
-	}
-}
-
-func ext۰reflect۰Value۰Field(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value, i int) reflect.Value
-	v := args[0]
-	i := args[1].(int)
-	return makeReflectValue(rV2T(v).t.Underlying().(*types.Struct).Field(i).Type(), rV2V(v).(structure)[i])
-}
-
-func ext۰reflect۰Value۰Float(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) float64
-	switch v := rV2V(args[0]).(type) {
-	case float32:
-		return float64(v)
-	case float64:
-		return float64(v)
-	}
-	panic("reflect.Value.Float")
-}
-
-func ext۰reflect۰Value۰Interface(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value) interface{}
-	return ext۰reflect۰valueInterface(fr, args)
-}
-
-func ext۰reflect۰Value۰Int(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) int64
-	switch x := rV2V(args[0]).(type) {
-	case int:
-		return int64(x)
-	case int8:
-		return int64(x)
-	case int16:
-		return int64(x)
-	case int32:
-		return int64(x)
-	case int64:
-		return x
-	default:
-		panic(fmt.Sprintf("reflect.(Value).Int(%T)", x))
-	}
-}
-
-func ext۰reflect۰Value۰IsNil(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) bool
-	switch x := rV2V(args[0]).(type) {
-	case *value:
-		return x == nil
-	case chan value:
-		return x == nil
-	case map[value]value:
-		return x == nil
-	case *hashmap:
-		return x == nil
-	case iface:
-		return x.t == nil
-	case []value:
-		return x == nil
-	case *ssa.Function:
-		return x == nil
-	case *ssa.Builtin:
-		return x == nil
-	case *closure:
-		return x == nil
-	default:
-		panic(fmt.Sprintf("reflect.(Value).IsNil(%T)", x))
-	}
-}
-
-func ext۰reflect۰Value۰IsValid(fr *frame, args []value) value {
-	// Signature: func (reflect.Value) bool
-	return rV2V(args[0]) != nil
-}
-
-func ext۰reflect۰Value۰Set(fr *frame, args []value) value {
-	// TODO(adonovan): implement.
-	return nil
-}
-
-func ext۰reflect۰valueInterface(fr *frame, args []value) value {
-	// Signature: func (v reflect.Value, safe bool) interface{}
-	v := args[0].(structure)
-	return iface{rV2T(v).t, rV2V(v)}
-}
-
-func ext۰reflect۰error۰Error(fr *frame, args []value) value {
-	return args[0]
-}
-
-// newMethod creates a new method of the specified name, package and receiver type.
-func newMethod(pkg *ssa.Package, recvType types.Type, name string) *ssa.Function {
-	// TODO(adonovan): fix: hack: currently the only part of Signature
-	// that is needed is the "pointerness" of Recv.Type, and for
-	// now, we'll set it to always be false since we're only
-	// concerned with rtype.  Encapsulate this better.
-	sig := types.NewSignature(types.NewVar(token.NoPos, nil, "recv", recvType), nil, nil, false)
-	fn := pkg.Prog.NewFunction(name, sig, "fake reflect method")
-	fn.Pkg = pkg
-	return fn
-}
-
-func initReflect(i *interpreter) {
-	i.reflectPackage = &ssa.Package{
-		Prog:    i.prog,
-		Pkg:     reflectTypesPackage,
-		Members: make(map[string]ssa.Member),
-	}
-
-	// Clobber the type-checker's notion of reflect.Value's
-	// underlying type so that it more closely matches the fake one
-	// (at least in the number of fields---we lie about the type of
-	// the rtype field).
-	//
-	// We must ensure that calls to (ssa.Value).Type() return the
-	// fake type so that correct "shape" is used when allocating
-	// variables, making zero values, loading, and storing.
-	//
-	// TODO(adonovan): obviously this is a hack.  We need a cleaner
-	// way to fake the reflect package (almost---DeepEqual is fine).
-	// One approach would be not to even load its source code, but
-	// provide fake source files.  This would guarantee that no bad
-	// information leaks into other packages.
-	if r := i.prog.ImportedPackage("reflect"); r != nil {
-		rV := r.Pkg.Scope().Lookup("Value").Type().(*types.Named)
-
-		// delete bodies of the old methods
-		mset := i.prog.MethodSets.MethodSet(rV)
-		for j := 0; j < mset.Len(); j++ {
-			i.prog.MethodValue(mset.At(j)).Blocks = nil
-		}
-
-		tEface := types.NewInterface(nil, nil).Complete()
-		rV.SetUnderlying(types.NewStruct([]*types.Var{
-			types.NewField(token.NoPos, r.Pkg, "t", tEface, false), // a lie
-			types.NewField(token.NoPos, r.Pkg, "v", tEface, false),
-		}, nil))
-	}
-
-	i.rtypeMethods = methodSet{
-		"Bits":      newMethod(i.reflectPackage, rtypeType, "Bits"),
-		"Elem":      newMethod(i.reflectPackage, rtypeType, "Elem"),
-		"Field":     newMethod(i.reflectPackage, rtypeType, "Field"),
-		"In":        newMethod(i.reflectPackage, rtypeType, "In"),
-		"Kind":      newMethod(i.reflectPackage, rtypeType, "Kind"),
-		"NumField":  newMethod(i.reflectPackage, rtypeType, "NumField"),
-		"NumIn":     newMethod(i.reflectPackage, rtypeType, "NumIn"),
-		"NumMethod": newMethod(i.reflectPackage, rtypeType, "NumMethod"),
-		"NumOut":    newMethod(i.reflectPackage, rtypeType, "NumOut"),
-		"Out":       newMethod(i.reflectPackage, rtypeType, "Out"),
-		"Size":      newMethod(i.reflectPackage, rtypeType, "Size"),
-		"String":    newMethod(i.reflectPackage, rtypeType, "String"),
-	}
-	i.errorMethods = methodSet{
-		"Error": newMethod(i.reflectPackage, errorType, "Error"),
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/a_test.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/a_test.go
deleted file mode 100644
index 844ec5cdc6..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/a_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package a
-
-import "testing"
-
-func TestFoo(t *testing.T) {
-	t.Error("foo")
-}
-
-func TestBar(t *testing.T) {
-	t.Error("bar")
-}
-
-func BenchmarkWiz(b *testing.B) {
-	b.Error("wiz")
-}
-
-// Don't test Examples since that testing package needs pipe(2) for that.
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/b_test.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/b_test.go
deleted file mode 100644
index 4a30e96a85..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/b_test.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package b
-
-import "testing"
-
-func NotATest(t *testing.T) {
-	t.Error("foo")
-}
-
-func NotABenchmark(b *testing.B) {
-	b.Error("wiz")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/boundmeth.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/boundmeth.go
deleted file mode 100644
index 255cc60703..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/boundmeth.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Tests of bound method closures.
-
-package main
-
-import "fmt"
-
-func assert(b bool) {
-	if !b {
-		panic("oops")
-	}
-}
-
-type I int
-
-func (i I) add(x int) int {
-	return int(i) + x
-}
-
-func valueReceiver() {
-	var three I = 3
-	assert(three.add(5) == 8)
-	var add3 func(int) int = three.add
-	assert(add3(5) == 8)
-}
-
-type S struct{ x int }
-
-func (s *S) incr() {
-	s.x++
-}
-
-func (s *S) get() int {
-	return s.x
-}
-
-func pointerReceiver() {
-	ps := new(S)
-	incr := ps.incr
-	get := ps.get
-	assert(get() == 0)
-	incr()
-	incr()
-	incr()
-	assert(get() == 3)
-}
-
-func addressibleValuePointerReceiver() {
-	var s S
-	incr := s.incr
-	get := s.get
-	assert(get() == 0)
-	incr()
-	incr()
-	incr()
-	assert(get() == 3)
-}
-
-type S2 struct {
-	S
-}
-
-func promotedReceiver() {
-	var s2 S2
-	incr := s2.incr
-	get := s2.get
-	assert(get() == 0)
-	incr()
-	incr()
-	incr()
-	assert(get() == 3)
-}
-
-func anonStruct() {
-	var s struct{ S }
-	incr := s.incr
-	get := s.get
-	assert(get() == 0)
-	incr()
-	incr()
-	incr()
-	assert(get() == 3)
-}
-
-func typeCheck() {
-	var i interface{}
-	i = (*S).incr
-	_ = i.(func(*S)) // type assertion: receiver type prepended to params
-
-	var s S
-	i = s.incr
-	_ = i.(func()) // type assertion: receiver type disappears
-}
-
-type errString string
-
-func (err errString) Error() string {
-	return string(err)
-}
-
-// Regression test for a builder crash.
-func regress1(x error) func() string {
-	return x.Error
-}
-
-// Regression test for b/7269:
-// taking the value of an interface method performs a nil check.
-func nilInterfaceMethodValue() {
-	err := fmt.Errorf("ok")
-	f := err.Error
-	if got := f(); got != "ok" {
-		panic(got)
-	}
-
-	err = nil
-	if got := f(); got != "ok" {
-		panic(got)
-	}
-
-	defer func() {
-		r := fmt.Sprint(recover())
-		// runtime panic string varies across toolchains
-		if r != "runtime error: interface conversion: interface is nil, not error" &&
-			r != "runtime error: invalid memory address or nil pointer dereference" {
-			panic("want runtime panic from nil interface method value, got " + r)
-		}
-	}()
-	f = err.Error // runtime panic: err is nil
-	panic("unreachable")
-}
-
-func main() {
-	valueReceiver()
-	pointerReceiver()
-	addressibleValuePointerReceiver()
-	promotedReceiver()
-	anonStruct()
-	typeCheck()
-
-	if e := regress1(errString("hi"))(); e != "hi" {
-		panic(e)
-	}
-
-	nilInterfaceMethodValue()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/c_test.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/c_test.go
deleted file mode 100644
index ad80b91089..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/c_test.go
+++ /dev/null
@@ -1,17 +0,0 @@
-package c_test
-
-import (
-	"os"
-	"testing"
-)
-
-func TestC(t *testing.T) {
-	println("TestC")
-}
-
-func TestMain(m *testing.M) {
-	println("TestMain start")
-	code := m.Run()
-	println("TestMain end")
-	os.Exit(code)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/callstack.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/callstack.go
deleted file mode 100644
index 56f3b28124..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/callstack.go
+++ /dev/null
@@ -1,52 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"path"
-	"runtime"
-	"strings"
-)
-
-var stack string
-
-func f() {
-	pc := make([]uintptr, 6)
-	pc = pc[:runtime.Callers(1, pc)]
-	for _, f := range pc {
-		Func := runtime.FuncForPC(f)
-		name := Func.Name()
-		if strings.Contains(name, "$") || strings.Contains(name, ".func") {
-			name = "func" // anon funcs vary across toolchains
-		}
-		file, line := Func.FileLine(0)
-		stack += fmt.Sprintf("%s at %s:%d\n", name, path.Base(file), line)
-	}
-}
-
-func g() { f() }
-func h() { g() }
-func i() { func() { h() }() }
-
-// Hack: the 'func' and the call to Caller are on the same line,
-// to paper over differences between toolchains.
-// (The interpreter's location info isn't yet complete.)
-func runtimeCaller0() (uintptr, string, int, bool) { return runtime.Caller(0) }
-
-func main() {
-	i()
-	if stack != `main.f at callstack.go:12
-main.g at callstack.go:26
-main.h at callstack.go:27
-func at callstack.go:28
-main.i at callstack.go:28
-main.main at callstack.go:35
-` {
-		panic("unexpected stack: " + stack)
-	}
-
-	pc, file, line, _ := runtimeCaller0()
-	got := fmt.Sprintf("%s @ %s:%d", runtime.FuncForPC(pc).Name(), path.Base(file), line)
-	if got != "main.runtimeCaller0 @ callstack.go:33" {
-		panic("runtime.Caller: " + got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/complit.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/complit.go
deleted file mode 100644
index 7bec5231d4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/complit.go
+++ /dev/null
@@ -1,184 +0,0 @@
-package main
-
-// Tests of composite literals.
-
-import "fmt"
-
-// Map literals.
-func init() {
-	type M map[int]int
-	m1 := []*M{{1: 1}, &M{2: 2}}
-	want := "map[1:1] map[2:2]"
-	if got := fmt.Sprint(*m1[0], *m1[1]); got != want {
-		panic(got)
-	}
-	m2 := []M{{1: 1}, M{2: 2}}
-	if got := fmt.Sprint(m2[0], m2[1]); got != want {
-		panic(got)
-	}
-}
-
-// Nonliteral keys in composite literal.
-func init() {
-	const zero int = 1
-	var v = []int{1 + zero: 42}
-	if x := fmt.Sprint(v); x != "[0 0 42]" {
-		panic(x)
-	}
-}
-
-// Test for in-place initialization.
-func init() {
-	// struct
-	type S struct {
-		a, b int
-	}
-	s := S{1, 2}
-	s = S{b: 3}
-	if s.a != 0 {
-		panic("s.a != 0")
-	}
-	if s.b != 3 {
-		panic("s.b != 3")
-	}
-	s = S{}
-	if s.a != 0 {
-		panic("s.a != 0")
-	}
-	if s.b != 0 {
-		panic("s.b != 0")
-	}
-
-	// array
-	type A [4]int
-	a := A{2, 4, 6, 8}
-	a = A{1: 6, 2: 4}
-	if a[0] != 0 {
-		panic("a[0] != 0")
-	}
-	if a[1] != 6 {
-		panic("a[1] != 6")
-	}
-	if a[2] != 4 {
-		panic("a[2] != 4")
-	}
-	if a[3] != 0 {
-		panic("a[3] != 0")
-	}
-	a = A{}
-	if a[0] != 0 {
-		panic("a[0] != 0")
-	}
-	if a[1] != 0 {
-		panic("a[1] != 0")
-	}
-	if a[2] != 0 {
-		panic("a[2] != 0")
-	}
-	if a[3] != 0 {
-		panic("a[3] != 0")
-	}
-}
-
-// Regression test for https://github.com/golang/go/issues/10127:
-// composite literal clobbers destination before reading from it.
-func init() {
-	// map
-	{
-		type M map[string]int
-		m := M{"x": 1, "y": 2}
-		m = M{"x": m["y"], "y": m["x"]}
-		if m["x"] != 2 || m["y"] != 1 {
-			panic(fmt.Sprint(m))
-		}
-
-		n := M{"x": 3}
-		m, n = M{"x": n["x"]}, M{"x": m["x"]} // parallel assignment
-		if got := fmt.Sprint(m["x"], n["x"]); got != "3 2" {
-			panic(got)
-		}
-	}
-
-	// struct
-	{
-		type T struct{ x, y, z int }
-		t := T{x: 1, y: 2, z: 3}
-
-		t = T{x: t.y, y: t.z, z: t.x} // all fields
-		if got := fmt.Sprint(t); got != "{2 3 1}" {
-			panic(got)
-		}
-
-		t = T{x: t.y, y: t.z + 3} // not all fields
-		if got := fmt.Sprint(t); got != "{3 4 0}" {
-			panic(got)
-		}
-
-		u := T{x: 5, y: 6, z: 7}
-		t, u = T{x: u.x}, T{x: t.x} // parallel assignment
-		if got := fmt.Sprint(t, u); got != "{5 0 0} {3 0 0}" {
-			panic(got)
-		}
-	}
-
-	// array
-	{
-		a := [3]int{0: 1, 1: 2, 2: 3}
-
-		a = [3]int{0: a[1], 1: a[2], 2: a[0]} //  all elements
-		if got := fmt.Sprint(a); got != "[2 3 1]" {
-			panic(got)
-		}
-
-		a = [3]int{0: a[1], 1: a[2] + 3} //  not all elements
-		if got := fmt.Sprint(a); got != "[3 4 0]" {
-			panic(got)
-		}
-
-		b := [3]int{0: 5, 1: 6, 2: 7}
-		a, b = [3]int{0: b[0]}, [3]int{0: a[0]} // parallel assignment
-		if got := fmt.Sprint(a, b); got != "[5 0 0] [3 0 0]" {
-			panic(got)
-		}
-	}
-
-	// slice
-	{
-		s := []int{0: 1, 1: 2, 2: 3}
-
-		s = []int{0: s[1], 1: s[2], 2: s[0]} //  all elements
-		if got := fmt.Sprint(s); got != "[2 3 1]" {
-			panic(got)
-		}
-
-		s = []int{0: s[1], 1: s[2] + 3} //  not all elements
-		if got := fmt.Sprint(s); got != "[3 4]" {
-			panic(got)
-		}
-
-		t := []int{0: 5, 1: 6, 2: 7}
-		s, t = []int{0: t[0]}, []int{0: s[0]} // parallel assignment
-		if got := fmt.Sprint(s, t); got != "[5] [3]" {
-			panic(got)
-		}
-	}
-}
-
-// Regression test for https://github.com/golang/go/issues/13341:
-// within a map literal, if a key expression is a composite literal,
-// Go 1.5 allows its type to be omitted.  An & operation may be implied.
-func init() {
-	type S struct{ x int }
-	// same as map[*S]bool{&S{x: 1}: true}
-	m := map[*S]bool{{x: 1}: true}
-	for s := range m {
-		if s.x != 1 {
-			panic(s) // wrong key
-		}
-		return
-	}
-	panic("map is empty")
-}
-
-func main() {
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/coverage.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/coverage.go
deleted file mode 100644
index 37ef95c6c7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/coverage.go
+++ /dev/null
@@ -1,534 +0,0 @@
-// This interpreter test is designed to run very quickly yet provide
-// some coverage of a broad selection of constructs.
-//
-// Validate this file with 'go run' after editing.
-// TODO(adonovan): break this into small files organized by theme.
-
-package main
-
-import (
-	"fmt"
-	"reflect"
-)
-
-func init() {
-	// Call of variadic function with (implicit) empty slice.
-	if x := fmt.Sprint(); x != "" {
-		panic(x)
-	}
-}
-
-type empty interface{}
-
-type I interface {
-	f() int
-}
-
-type T struct{ z int }
-
-func (t T) f() int { return t.z }
-
-func use(interface{}) {}
-
-var counter = 2
-
-// Test initialization, including init blocks containing 'return'.
-// Assertion is in main.
-func init() {
-	counter *= 3
-	return
-	counter *= 3
-}
-
-func init() {
-	counter *= 5
-	return
-	counter *= 5
-}
-
-// Recursion.
-func fib(x int) int {
-	if x < 2 {
-		return x
-	}
-	return fib(x-1) + fib(x-2)
-}
-
-func fibgen(ch chan int) {
-	for x := 0; x < 10; x++ {
-		ch <- fib(x)
-	}
-	close(ch)
-}
-
-// Goroutines and channels.
-func init() {
-	ch := make(chan int)
-	go fibgen(ch)
-	var fibs []int
-	for v := range ch {
-		fibs = append(fibs, v)
-		if len(fibs) == 10 {
-			break
-		}
-	}
-	if x := fmt.Sprint(fibs); x != "[0 1 1 2 3 5 8 13 21 34]" {
-		panic(x)
-	}
-}
-
-// Test of aliasing.
-func init() {
-	type S struct {
-		a, b string
-	}
-
-	s1 := []string{"foo", "bar"}
-	s2 := s1 // creates an alias
-	s2[0] = "wiz"
-	if x := fmt.Sprint(s1, s2); x != "[wiz bar] [wiz bar]" {
-		panic(x)
-	}
-
-	pa1 := &[2]string{"foo", "bar"}
-	pa2 := pa1 // creates an alias
-	pa2[0] = "wiz"
-	if x := fmt.Sprint(*pa1, *pa2); x != "[wiz bar] [wiz bar]" {
-		panic(x)
-	}
-
-	a1 := [2]string{"foo", "bar"}
-	a2 := a1 // creates a copy
-	a2[0] = "wiz"
-	if x := fmt.Sprint(a1, a2); x != "[foo bar] [wiz bar]" {
-		panic(x)
-	}
-
-	t1 := S{"foo", "bar"}
-	t2 := t1 // copy
-	t2.a = "wiz"
-	if x := fmt.Sprint(t1, t2); x != "{foo bar} {wiz bar}" {
-		panic(x)
-	}
-}
-
-func main() {
-	print() // legal
-
-	if counter != 2*3*5 {
-		panic(counter)
-	}
-
-	// Test builtins (e.g. complex) preserve named argument types.
-	type N complex128
-	var n N
-	n = complex(1.0, 2.0)
-	if n != complex(1.0, 2.0) {
-		panic(n)
-	}
-	if x := reflect.TypeOf(n).String(); x != "main.N" {
-		panic(x)
-	}
-	if real(n) != 1.0 || imag(n) != 2.0 {
-		panic(n)
-	}
-
-	// Channel + select.
-	ch := make(chan int, 1)
-	select {
-	case ch <- 1:
-		// ok
-	default:
-		panic("couldn't send")
-	}
-	if <-ch != 1 {
-		panic("couldn't receive")
-	}
-	// A "receive" select-case that doesn't declare its vars.  (regression test)
-	anint := 0
-	ok := false
-	select {
-	case anint, ok = <-ch:
-	case anint = <-ch:
-	default:
-	}
-	_ = anint
-	_ = ok
-
-	// Anon structs with methods.
-	anon := struct{ T }{T: T{z: 1}}
-	if x := anon.f(); x != 1 {
-		panic(x)
-	}
-	var i I = anon
-	if x := i.f(); x != 1 {
-		panic(x)
-	}
-	// NB. precise output of reflect.Type.String is undefined.
-	if x := reflect.TypeOf(i).String(); x != "struct { main.T }" && x != "struct{main.T}" {
-		panic(x)
-	}
-
-	// fmt.
-	const message = "Hello, World!"
-	if fmt.Sprintf("%s, %s!", "Hello", "World") != message {
-		panic("oops")
-	}
-
-	// Type assertion.
-	type S struct {
-		f int
-	}
-	var e empty = S{f: 42}
-	switch v := e.(type) {
-	case S:
-		if v.f != 42 {
-			panic(v.f)
-		}
-	default:
-		panic(reflect.TypeOf(v))
-	}
-	if i, ok := e.(I); ok {
-		panic(i)
-	}
-
-	// Switch.
-	var x int
-	switch x {
-	case 1:
-		panic(x)
-		fallthrough
-	case 2, 3:
-		panic(x)
-	default:
-		// ok
-	}
-	// empty switch
-	switch {
-	}
-	// empty switch
-	switch {
-	default:
-	}
-	// empty switch
-	switch {
-	default:
-		fallthrough
-	case false:
-	}
-
-	// string -> []rune conversion.
-	use([]rune("foo"))
-
-	// Calls of form x.f().
-	type S2 struct {
-		f func() int
-	}
-	S2{f: func() int { return 1 }}.f() // field is a func value
-	T{}.f()                            // method call
-	i.f()                              // interface method invocation
-	(interface {
-		f() int
-	}(T{})).f() // anon interface method invocation
-
-	// Map lookup.
-	if v, ok := map[string]string{}["foo5"]; v != "" || ok {
-		panic("oops")
-	}
-
-	// Regression test: implicit address-taken struct literal
-	// inside literal map element.
-	_ = map[int]*struct{}{0: {}}
-}
-
-type mybool bool
-
-func (mybool) f() {}
-
-func init() {
-	type mybool bool
-	var b mybool
-	var i interface{} = b || b // result preserves types of operands
-	_ = i.(mybool)
-
-	i = false && b // result preserves type of "typed" operand
-	_ = i.(mybool)
-
-	i = b || true // result preserves type of "typed" operand
-	_ = i.(mybool)
-}
-
-func init() {
-	var x, y int
-	var b mybool = x == y // x==y is an untyped bool
-	b.f()
-}
-
-// Simple closures.
-func init() {
-	b := 3
-	f := func(a int) int {
-		return a + b
-	}
-	b++
-	if x := f(1); x != 5 { // 1+4 == 5
-		panic(x)
-	}
-	b++
-	if x := f(2); x != 7 { // 2+5 == 7
-		panic(x)
-	}
-	if b := f(1) < 16 || f(2) < 17; !b {
-		panic("oops")
-	}
-}
-
-// Shifts.
-func init() {
-	var i int64 = 1
-	var u uint64 = 1 << 32
-	if x := i << uint32(u); x != 1 {
-		panic(x)
-	}
-	if x := i << uint64(u); x != 0 {
-		panic(x)
-	}
-}
-
-// Implicit conversion of delete() key operand.
-func init() {
-	type I interface{}
-	m := make(map[I]bool)
-	m[1] = true
-	m[I(2)] = true
-	if len(m) != 2 {
-		panic(m)
-	}
-	delete(m, I(1))
-	delete(m, 2)
-	if len(m) != 0 {
-		panic(m)
-	}
-}
-
-// An I->I conversion always succeeds.
-func init() {
-	var x I
-	if I(x) != I(nil) {
-		panic("I->I conversion failed")
-	}
-}
-
-// An I->I type-assert fails iff the value is nil.
-func init() {
-	defer func() {
-		r := fmt.Sprint(recover())
-		// Exact error varies by toolchain.
-		if r != "runtime error: interface conversion: interface is nil, not main.I" &&
-			r != "interface conversion: interface is nil, not main.I" {
-			panic("I->I type assertion succeeded for nil value")
-		}
-	}()
-	var x I
-	_ = x.(I)
-}
-
-//////////////////////////////////////////////////////////////////////
-// Variadic bridge methods and interface thunks.
-
-type VT int
-
-var vcount = 0
-
-func (VT) f(x int, y ...string) {
-	vcount++
-	if x != 1 {
-		panic(x)
-	}
-	if len(y) != 2 || y[0] != "foo" || y[1] != "bar" {
-		panic(y)
-	}
-}
-
-type VS struct {
-	VT
-}
-
-type VI interface {
-	f(x int, y ...string)
-}
-
-func init() {
-	foobar := []string{"foo", "bar"}
-	var s VS
-	s.f(1, "foo", "bar")
-	s.f(1, foobar...)
-	if vcount != 2 {
-		panic("s.f not called twice")
-	}
-
-	fn := VI.f
-	fn(s, 1, "foo", "bar")
-	fn(s, 1, foobar...)
-	if vcount != 4 {
-		panic("I.f not called twice")
-	}
-}
-
-// Multiple labels on same statement.
-func multipleLabels() {
-	var trace []int
-	i := 0
-one:
-two:
-	for ; i < 3; i++ {
-		trace = append(trace, i)
-		switch i {
-		case 0:
-			continue two
-		case 1:
-			i++
-			goto one
-		case 2:
-			break two
-		}
-	}
-	if x := fmt.Sprint(trace); x != "[0 1 2]" {
-		panic(x)
-	}
-}
-
-func init() {
-	multipleLabels()
-}
-
-func init() {
-	// Struct equivalence ignores blank fields.
-	type s struct{ x, _, z int }
-	s1 := s{x: 1, z: 3}
-	s2 := s{x: 1, z: 3}
-	if s1 != s2 {
-		panic("not equal")
-	}
-}
-
-func init() {
-	// A slice var can be compared to const []T nil.
-	var i interface{} = []string{"foo"}
-	var j interface{} = []string(nil)
-	if i.([]string) == nil {
-		panic("expected i non-nil")
-	}
-	if j.([]string) != nil {
-		panic("expected j nil")
-	}
-	// But two slices cannot be compared, even if one is nil.
-	defer func() {
-		r := fmt.Sprint(recover())
-		if r != "runtime error: comparing uncomparable type []string" {
-			panic("want panic from slice comparison, got " + r)
-		}
-	}()
-	_ = i == j // interface comparison recurses on types
-}
-
-func init() {
-	// Regression test for SSA renaming bug.
-	var ints []int
-	for range "foo" {
-		var x int
-		x++
-		ints = append(ints, x)
-	}
-	if fmt.Sprint(ints) != "[1 1 1]" {
-		panic(ints)
-	}
-}
-
-// Regression test for issue 6949:
-// []byte("foo") is not a constant since it allocates memory.
-func init() {
-	var r string
-	for i, b := range "ABC" {
-		x := []byte("abc")
-		x[i] = byte(b)
-		r += string(x)
-	}
-	if r != "AbcaBcabC" {
-		panic(r)
-	}
-}
-
-// Test of 3-operand x[lo:hi:max] slice.
-func init() {
-	s := []int{0, 1, 2, 3}
-	lenCapLoHi := func(x []int) [4]int { return [4]int{len(x), cap(x), x[0], x[len(x)-1]} }
-	if got := lenCapLoHi(s[1:3]); got != [4]int{2, 3, 1, 2} {
-		panic(got)
-	}
-	if got := lenCapLoHi(s[1:3:3]); got != [4]int{2, 2, 1, 2} {
-		panic(got)
-	}
-	max := 3
-	if "a"[0] == 'a' {
-		max = 2 // max is non-constant, even in SSA form
-	}
-	if got := lenCapLoHi(s[1:2:max]); got != [4]int{1, 1, 1, 1} {
-		panic(got)
-	}
-}
-
-var one = 1 // not a constant
-
-// Test makeslice.
-func init() {
-	check := func(s []string, wantLen, wantCap int) {
-		if len(s) != wantLen {
-			panic(len(s))
-		}
-		if cap(s) != wantCap {
-			panic(cap(s))
-		}
-	}
-	//                                       SSA form:
-	check(make([]string, 10), 10, 10)     // new([10]string)[:10]
-	check(make([]string, one), 1, 1)      // make([]string, one, one)
-	check(make([]string, 0, 10), 0, 10)   // new([10]string)[:0]
-	check(make([]string, 0, one), 0, 1)   // make([]string, 0, one)
-	check(make([]string, one, 10), 1, 10) // new([10]string)[:one]
-	check(make([]string, one, one), 1, 1) // make([]string, one, one)
-}
-
-// Test that a nice error is issued by indirection wrappers.
-func init() {
-	var ptr *T
-	var i I = ptr
-
-	defer func() {
-		r := fmt.Sprint(recover())
-		// Exact error varies by toolchain:
-		if r != "runtime error: value method (main.T).f called using nil *main.T pointer" &&
-			r != "value method main.T.f called using nil *T pointer" {
-			panic("want panic from call with nil receiver, got " + r)
-		}
-	}()
-	i.f()
-	panic("unreachable")
-}
-
-// Regression test for a subtle bug in which copying values would causes
-// subcomponents of aggregate variables to change address, breaking
-// aliases.
-func init() {
-	type T struct{ f int }
-	var x T
-	p := &x.f
-	x = T{}
-	*p = 1
-	if x.f != 1 {
-		panic("lost store")
-	}
-	if p != &x.f {
-		panic("unstable address")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/defer.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/defer.go
deleted file mode 100644
index f5bae6c3f4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/defer.go
+++ /dev/null
@@ -1,53 +0,0 @@
-package main
-
-// Tests of defer.  (Deferred recover() belongs is recover.go.)
-
-import "fmt"
-
-func deferMutatesResults(noArgReturn bool) (a, b int) {
-	defer func() {
-		if a != 1 || b != 2 {
-			panic(fmt.Sprint(a, b))
-		}
-		a, b = 3, 4
-	}()
-	if noArgReturn {
-		a, b = 1, 2
-		return
-	}
-	return 1, 2
-}
-
-func init() {
-	a, b := deferMutatesResults(true)
-	if a != 3 || b != 4 {
-		panic(fmt.Sprint(a, b))
-	}
-	a, b = deferMutatesResults(false)
-	if a != 3 || b != 4 {
-		panic(fmt.Sprint(a, b))
-	}
-}
-
-// We concatenate init blocks to make a single function, but we must
-// run defers at the end of each block, not the combined function.
-var deferCount = 0
-
-func init() {
-	deferCount = 1
-	defer func() {
-		deferCount++
-	}()
-	// defer runs HERE
-}
-
-func init() {
-	// Strictly speaking the spec says deferCount may be 0 or 2
-	// since the relative order of init blocks is unspecified.
-	if deferCount != 2 {
-		panic(deferCount) // defer call has not run!
-	}
-}
-
-func main() {
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/fieldprom.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/fieldprom.go
deleted file mode 100644
index fc276ddbf0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/fieldprom.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package main
-
-// Tests of field promotion logic.
-
-type A struct {
-	x int
-	y *int
-}
-
-type B struct {
-	p int
-	q *int
-}
-
-type C struct {
-	A
-	*B
-}
-
-type D struct {
-	a int
-	C
-}
-
-func assert(cond bool) {
-	if !cond {
-		panic("failed")
-	}
-}
-
-func f1(c C) {
-	assert(c.x == c.A.x)
-	assert(c.y == c.A.y)
-	assert(&c.x == &c.A.x)
-	assert(&c.y == &c.A.y)
-
-	assert(c.p == c.B.p)
-	assert(c.q == c.B.q)
-	assert(&c.p == &c.B.p)
-	assert(&c.q == &c.B.q)
-
-	c.x = 1
-	*c.y = 1
-	c.p = 1
-	*c.q = 1
-}
-
-func f2(c *C) {
-	assert(c.x == c.A.x)
-	assert(c.y == c.A.y)
-	assert(&c.x == &c.A.x)
-	assert(&c.y == &c.A.y)
-
-	assert(c.p == c.B.p)
-	assert(c.q == c.B.q)
-	assert(&c.p == &c.B.p)
-	assert(&c.q == &c.B.q)
-
-	c.x = 1
-	*c.y = 1
-	c.p = 1
-	*c.q = 1
-}
-
-func f3(d D) {
-	assert(d.x == d.C.A.x)
-	assert(d.y == d.C.A.y)
-	assert(&d.x == &d.C.A.x)
-	assert(&d.y == &d.C.A.y)
-
-	assert(d.p == d.C.B.p)
-	assert(d.q == d.C.B.q)
-	assert(&d.p == &d.C.B.p)
-	assert(&d.q == &d.C.B.q)
-
-	d.x = 1
-	*d.y = 1
-	d.p = 1
-	*d.q = 1
-}
-
-func f4(d *D) {
-	assert(d.x == d.C.A.x)
-	assert(d.y == d.C.A.y)
-	assert(&d.x == &d.C.A.x)
-	assert(&d.y == &d.C.A.y)
-
-	assert(d.p == d.C.B.p)
-	assert(d.q == d.C.B.q)
-	assert(&d.p == &d.C.B.p)
-	assert(&d.q == &d.C.B.q)
-
-	d.x = 1
-	*d.y = 1
-	d.p = 1
-	*d.q = 1
-}
-
-func main() {
-	y := 123
-	c := C{
-		A{x: 42, y: &y},
-		&B{p: 42, q: &y},
-	}
-
-	assert(&c.x == &c.A.x)
-
-	f1(c)
-	f2(&c)
-
-	d := D{C: c}
-	f3(d)
-	f4(&d)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceconv.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceconv.go
deleted file mode 100644
index 96fc105862..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceconv.go
+++ /dev/null
@@ -1,83 +0,0 @@
-package main
-
-// Tests of interface conversions and type assertions.
-
-type I0 interface {
-}
-type I1 interface {
-	f()
-}
-type I2 interface {
-	f()
-	g()
-}
-
-type C0 struct{}
-type C1 struct{}
-
-func (C1) f() {}
-
-type C2 struct{}
-
-func (C2) f() {}
-func (C2) g() {}
-
-func main() {
-	var i0 I0
-	var i1 I1
-	var i2 I2
-
-	// Nil always causes a type assertion to fail, even to the
-	// same type.
-	if _, ok := i0.(I0); ok {
-		panic("nil i0.(I0) succeeded")
-	}
-	if _, ok := i1.(I1); ok {
-		panic("nil i1.(I1) succeeded")
-	}
-	if _, ok := i2.(I2); ok {
-		panic("nil i2.(I2) succeeded")
-	}
-
-	// Conversions can't fail, even with nil.
-	_ = I0(i0)
-
-	_ = I0(i1)
-	_ = I1(i1)
-
-	_ = I0(i2)
-	_ = I1(i2)
-	_ = I2(i2)
-
-	// Non-nil type assertions pass or fail based on the concrete type.
-	i1 = C1{}
-	if _, ok := i1.(I0); !ok {
-		panic("C1 i1.(I0) failed")
-	}
-	if _, ok := i1.(I1); !ok {
-		panic("C1 i1.(I1) failed")
-	}
-	if _, ok := i1.(I2); ok {
-		panic("C1 i1.(I2) succeeded")
-	}
-
-	i1 = C2{}
-	if _, ok := i1.(I0); !ok {
-		panic("C2 i1.(I0) failed")
-	}
-	if _, ok := i1.(I1); !ok {
-		panic("C2 i1.(I1) failed")
-	}
-	if _, ok := i1.(I2); !ok {
-		panic("C2 i1.(I2) failed")
-	}
-
-	// Conversions can't fail.
-	i1 = C1{}
-	if I0(i1) == nil {
-		panic("C1 I0(i1) was nil")
-	}
-	if I1(i1) == nil {
-		panic("C1 I1(i1) was nil")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceprom.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceprom.go
deleted file mode 100644
index 414dc73636..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/ifaceprom.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-// Test of promotion of methods of an interface embedded within a
-// struct.  In particular, this test exercises that the correct
-// method is called.
-
-type I interface {
-	one() int
-	two() string
-}
-
-type S struct {
-	I
-}
-
-type impl struct{}
-
-func (impl) one() int {
-	return 1
-}
-
-func (impl) two() string {
-	return "two"
-}
-
-func main() {
-	var s S
-	s.I = impl{}
-	if one := s.I.one(); one != 1 {
-		panic(one)
-	}
-	if one := s.one(); one != 1 {
-		panic(one)
-	}
-	closOne := s.I.one
-	if one := closOne(); one != 1 {
-		panic(one)
-	}
-	closOne = s.one
-	if one := closOne(); one != 1 {
-		panic(one)
-	}
-
-	if two := s.I.two(); two != "two" {
-		panic(two)
-	}
-	if two := s.two(); two != "two" {
-		panic(two)
-	}
-	closTwo := s.I.two
-	if two := closTwo(); two != "two" {
-		panic(two)
-	}
-	closTwo = s.two
-	if two := closTwo(); two != "two" {
-		panic(two)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/initorder.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/initorder.go
deleted file mode 100644
index 0f26bed695..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/initorder.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package main
-
-import "fmt"
-
-// Test of initialization order of package-level vars.
-
-var counter int
-
-func next() int {
-	c := counter
-	counter++
-	return c
-}
-
-func next2() (x int, y int) {
-	x = next()
-	y = next()
-	return
-}
-
-func makeOrder() int {
-	_, _, _, _ = f, b, d, e
-	return 0
-}
-
-func main() {
-	// Initialization constraints:
-	// - {f,b,c/d,e} < order  (ref graph traversal)
-	// - order < {a}          (lexical order)
-	// - b < c/d < e < f      (lexical order)
-	// Solution: a b c/d e f
-	abcdef := [6]int{a, b, c, d, e, f}
-	if abcdef != [6]int{0, 1, 2, 3, 4, 5} {
-		panic(abcdef)
-	}
-}
-
-var order = makeOrder()
-
-var a, b = next(), next()
-var c, d = next2()
-var e, f = next(), next()
-
-// ------------------------------------------------------------------------
-
-var order2 []string
-
-func create(x int, name string) int {
-	order2 = append(order2, name)
-	return x
-}
-
-var C = create(B+1, "C")
-var A, B = create(1, "A"), create(2, "B")
-
-// Initialization order of package-level value specs.
-func init() {
-	x := fmt.Sprint(order2)
-	// Result varies by toolchain.  This is a spec bug.
-	if x != "[B C A]" && // gc
-		x != "[A B C]" { // go/types
-		panic(x)
-	}
-	if C != 3 {
-		panic(c)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/methprom.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/methprom.go
deleted file mode 100644
index e8e384c311..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/methprom.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package main
-
-// Tests of method promotion logic.
-
-type A struct{ magic int }
-
-func (a A) x() {
-	if a.magic != 1 {
-		panic(a.magic)
-	}
-}
-func (a *A) y() *A {
-	return a
-}
-
-type B struct{ magic int }
-
-func (b B) p() {
-	if b.magic != 2 {
-		panic(b.magic)
-	}
-}
-func (b *B) q() {
-	if b != theC.B {
-		panic("oops")
-	}
-}
-
-type I interface {
-	f()
-}
-
-type impl struct{ magic int }
-
-func (i impl) f() {
-	if i.magic != 3 {
-		panic("oops")
-	}
-}
-
-type C struct {
-	A
-	*B
-	I
-}
-
-func assert(cond bool) {
-	if !cond {
-		panic("failed")
-	}
-}
-
-var theC = C{
-	A: A{1},
-	B: &B{2},
-	I: impl{3},
-}
-
-func addr() *C {
-	return &theC
-}
-
-func value() C {
-	return theC
-}
-
-func main() {
-	// address
-	addr().x()
-	if addr().y() != &theC.A {
-		panic("oops")
-	}
-	addr().p()
-	addr().q()
-	addr().f()
-
-	// addressable value
-	var c C = value()
-	c.x()
-	if c.y() != &c.A {
-		panic("oops")
-	}
-	c.p()
-	c.q()
-	c.f()
-
-	// non-addressable value
-	value().x()
-	// value().y() // not in method set
-	value().p()
-	value().q()
-	value().f()
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/mrvchain.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/mrvchain.go
deleted file mode 100644
index 70dfd02732..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/mrvchain.go
+++ /dev/null
@@ -1,75 +0,0 @@
-// Tests of call chaining f(g()) when g has multiple return values (MRVs).
-// See https://code.google.com/p/go/issues/detail?id=4573.
-
-package main
-
-func assert(actual, expected int) {
-	if actual != expected {
-		panic(actual)
-	}
-}
-
-func g() (int, int) {
-	return 5, 7
-}
-
-func g2() (float64, float64) {
-	return 5, 7
-}
-
-func f1v(x int, v ...int) {
-	assert(x, 5)
-	assert(v[0], 7)
-}
-
-func f2(x, y int) {
-	assert(x, 5)
-	assert(y, 7)
-}
-
-func f2v(x, y int, v ...int) {
-	assert(x, 5)
-	assert(y, 7)
-	assert(len(v), 0)
-}
-
-func complexArgs() (float64, float64) {
-	return 5, 7
-}
-
-func appendArgs() ([]string, string) {
-	return []string{"foo"}, "bar"
-}
-
-func h() (i interface{}, ok bool) {
-	m := map[int]string{1: "hi"}
-	i, ok = m[1] // string->interface{} conversion within multi-valued expression
-	return
-}
-
-func h2() (i interface{}, ok bool) {
-	ch := make(chan string, 1)
-	ch <- "hi"
-	i, ok = <-ch // string->interface{} conversion within multi-valued expression
-	return
-}
-
-func main() {
-	f1v(g())
-	f2(g())
-	f2v(g())
-	if c := complex(complexArgs()); c != 5+7i {
-		panic(c)
-	}
-	if s := append(appendArgs()); len(s) != 2 || s[0] != "foo" || s[1] != "bar" {
-		panic(s)
-	}
-	i, ok := h()
-	if !ok || i.(string) != "hi" {
-		panic(i)
-	}
-	i, ok = h2()
-	if !ok || i.(string) != "hi" {
-		panic(i)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/range.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/range.go
deleted file mode 100644
index da8a421e62..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/range.go
+++ /dev/null
@@ -1,55 +0,0 @@
-package main
-
-// Tests of range loops.
-
-import "fmt"
-
-// Range over string.
-func init() {
-	if x := len("Hello, 世界"); x != 13 { // bytes
-		panic(x)
-	}
-	var indices []int
-	var runes []rune
-	for i, r := range "Hello, 世界" {
-		runes = append(runes, r)
-		indices = append(indices, i)
-	}
-	if x := fmt.Sprint(runes); x != "[72 101 108 108 111 44 32 19990 30028]" {
-		panic(x)
-	}
-	if x := fmt.Sprint(indices); x != "[0 1 2 3 4 5 6 7 10]" {
-		panic(x)
-	}
-	s := ""
-	for _, r := range runes {
-		s = fmt.Sprintf("%s%c", s, r)
-	}
-	if s != "Hello, 世界" {
-		panic(s)
-	}
-
-	var x int
-	for range "Hello, 世界" {
-		x++
-	}
-	if x != len(indices) {
-		panic(x)
-	}
-}
-
-// Regression test for range of pointer to named array type.
-func init() {
-	type intarr [3]int
-	ia := intarr{1, 2, 3}
-	var count int
-	for _, x := range &ia {
-		count += x
-	}
-	if count != 6 {
-		panic(count)
-	}
-}
-
-func main() {
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/recover.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/recover.go
deleted file mode 100644
index b560052263..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/recover.go
+++ /dev/null
@@ -1,34 +0,0 @@
-package main
-
-// Tests of panic/recover.
-
-import "fmt"
-
-func fortyTwo() (r int) {
-	r = 42
-	// The next two statements simulate a 'return' statement.
-	defer func() { recover() }()
-	panic(nil)
-}
-
-func zero() int {
-	defer func() { recover() }()
-	panic(1)
-}
-
-func zeroEmpty() (int, string) {
-	defer func() { recover() }()
-	panic(1)
-}
-
-func main() {
-	if r := fortyTwo(); r != 42 {
-		panic(r)
-	}
-	if r := zero(); r != 0 {
-		panic(r)
-	}
-	if r, s := zeroEmpty(); r != 0 || s != "" {
-		panic(fmt.Sprint(r, s))
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/reflect.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/reflect.go
deleted file mode 100644
index 6aa9a67a45..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/reflect.go
+++ /dev/null
@@ -1,11 +0,0 @@
-package main
-
-import "reflect"
-
-func main() {
-	// Regression test for issue 9462.
-	got := reflect.SliceOf(reflect.TypeOf(byte(0))).String()
-	if got != "[]uint8" && got != "[]byte" { // result varies by toolchain
-		println("BUG: " + got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/static.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/static.go
deleted file mode 100644
index b115513c63..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/testdata/static.go
+++ /dev/null
@@ -1,58 +0,0 @@
-package main
-
-// Static tests of SSA builder (via the sanity checker).
-// Dynamic semantics are not exercised.
-
-func init() {
-	// Regression test for issue 6806.
-	ch := make(chan int)
-	select {
-	case n, _ := <-ch:
-		_ = n
-	default:
-		// The default case disables the simplification of
-		// select to a simple receive statement.
-	}
-
-	// value,ok-form receive where TypeOf(ok) is a named boolean.
-	type mybool bool
-	var x int
-	var y mybool
-	select {
-	case x, y = <-ch:
-	default:
-		// The default case disables the simplification of
-		// select to a simple receive statement.
-	}
-	_ = x
-	_ = y
-}
-
-var a int
-
-// Regression test for issue 7840 (covered by SSA sanity checker).
-func bug7840() bool {
-	// This creates a single-predecessor block with a φ-node.
-	return false && a == 0 && a == 0
-}
-
-// A blocking select (sans "default:") cannot fall through.
-// Regression test for issue 7022.
-func bug7022() int {
-	var c1, c2 chan int
-	select {
-	case <-c1:
-		return 123
-	case <-c2:
-		return 456
-	}
-}
-
-// Parens should not prevent intrinsic treatment of built-ins.
-// (Regression test for a crash.)
-func init() {
-	_ = (new)(int)
-	_ = (make)([]int, 0)
-}
-
-func main() {}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/interp/value.go b/installer/vendor/golang.org/x/tools/go/ssa/interp/value.go
deleted file mode 100644
index 4faa7b8f9e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/interp/value.go
+++ /dev/null
@@ -1,497 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package interp
-
-// Values
-//
-// All interpreter values are "boxed" in the empty interface, value.
-// The range of possible dynamic types within value are:
-//
-// - bool
-// - numbers (all built-in int/float/complex types are distinguished)
-// - string
-// - map[value]value --- maps for which  usesBuiltinMap(keyType)
-//   *hashmap        --- maps for which !usesBuiltinMap(keyType)
-// - chan value
-// - []value --- slices
-// - iface --- interfaces.
-// - structure --- structs.  Fields are ordered and accessed by numeric indices.
-// - array --- arrays.
-// - *value --- pointers.  Careful: *value is a distinct type from *array etc.
-// - *ssa.Function \
-//   *ssa.Builtin   } --- functions.  A nil 'func' is always of type *ssa.Function.
-//   *closure      /
-// - tuple --- as returned by Return, Next, "value,ok" modes, etc.
-// - iter --- iterators from 'range' over map or string.
-// - bad --- a poison pill for locals that have gone out of scope.
-// - rtype -- the interpreter's concrete implementation of reflect.Type
-//
-// Note that nil is not on this list.
-//
-// Pay close attention to whether or not the dynamic type is a pointer.
-// The compiler cannot help you since value is an empty interface.
-
-import (
-	"bytes"
-	"fmt"
-	"go/types"
-	"io"
-	"reflect"
-	"strings"
-	"sync"
-	"unsafe"
-
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-type value interface{}
-
-type tuple []value
-
-type array []value
-
-type iface struct {
-	t types.Type // never an "untyped" type
-	v value
-}
-
-type structure []value
-
-// For map, array, *array, slice, string or channel.
-type iter interface {
-	// next returns a Tuple (key, value, ok).
-	// key and value are unaliased, e.g. copies of the sequence element.
-	next() tuple
-}
-
-type closure struct {
-	Fn  *ssa.Function
-	Env []value
-}
-
-type bad struct{}
-
-type rtype struct {
-	t types.Type
-}
-
-// Hash functions and equivalence relation:
-
-// hashString computes the FNV hash of s.
-func hashString(s string) int {
-	var h uint32
-	for i := 0; i < len(s); i++ {
-		h ^= uint32(s[i])
-		h *= 16777619
-	}
-	return int(h)
-}
-
-var (
-	mu     sync.Mutex
-	hasher = typeutil.MakeHasher()
-)
-
-// hashType returns a hash for t such that
-// types.Identical(x, y) => hashType(x) == hashType(y).
-func hashType(t types.Type) int {
-	mu.Lock()
-	h := int(hasher.Hash(t))
-	mu.Unlock()
-	return h
-}
-
-// usesBuiltinMap returns true if the built-in hash function and
-// equivalence relation for type t are consistent with those of the
-// interpreter's representation of type t.  Such types are: all basic
-// types (bool, numbers, string), pointers and channels.
-//
-// usesBuiltinMap returns false for types that require a custom map
-// implementation: interfaces, arrays and structs.
-//
-// Panic ensues if t is an invalid map key type: function, map or slice.
-func usesBuiltinMap(t types.Type) bool {
-	switch t := t.(type) {
-	case *types.Basic, *types.Chan, *types.Pointer:
-		return true
-	case *types.Named:
-		return usesBuiltinMap(t.Underlying())
-	case *types.Interface, *types.Array, *types.Struct:
-		return false
-	}
-	panic(fmt.Sprintf("invalid map key type: %T", t))
-}
-
-func (x array) eq(t types.Type, _y interface{}) bool {
-	y := _y.(array)
-	tElt := t.Underlying().(*types.Array).Elem()
-	for i, xi := range x {
-		if !equals(tElt, xi, y[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-func (x array) hash(t types.Type) int {
-	h := 0
-	tElt := t.Underlying().(*types.Array).Elem()
-	for _, xi := range x {
-		h += hash(tElt, xi)
-	}
-	return h
-}
-
-func (x structure) eq(t types.Type, _y interface{}) bool {
-	y := _y.(structure)
-	tStruct := t.Underlying().(*types.Struct)
-	for i, n := 0, tStruct.NumFields(); i < n; i++ {
-		if f := tStruct.Field(i); !f.Anonymous() {
-			if !equals(f.Type(), x[i], y[i]) {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-func (x structure) hash(t types.Type) int {
-	tStruct := t.Underlying().(*types.Struct)
-	h := 0
-	for i, n := 0, tStruct.NumFields(); i < n; i++ {
-		if f := tStruct.Field(i); !f.Anonymous() {
-			h += hash(f.Type(), x[i])
-		}
-	}
-	return h
-}
-
-// nil-tolerant variant of types.Identical.
-func sameType(x, y types.Type) bool {
-	if x == nil {
-		return y == nil
-	}
-	return y != nil && types.Identical(x, y)
-}
-
-func (x iface) eq(t types.Type, _y interface{}) bool {
-	y := _y.(iface)
-	return sameType(x.t, y.t) && (x.t == nil || equals(x.t, x.v, y.v))
-}
-
-func (x iface) hash(_ types.Type) int {
-	return hashType(x.t)*8581 + hash(x.t, x.v)
-}
-
-func (x rtype) hash(_ types.Type) int {
-	return hashType(x.t)
-}
-
-func (x rtype) eq(_ types.Type, y interface{}) bool {
-	return types.Identical(x.t, y.(rtype).t)
-}
-
-// equals returns true iff x and y are equal according to Go's
-// linguistic equivalence relation for type t.
-// In a well-typed program, the dynamic types of x and y are
-// guaranteed equal.
-func equals(t types.Type, x, y value) bool {
-	switch x := x.(type) {
-	case bool:
-		return x == y.(bool)
-	case int:
-		return x == y.(int)
-	case int8:
-		return x == y.(int8)
-	case int16:
-		return x == y.(int16)
-	case int32:
-		return x == y.(int32)
-	case int64:
-		return x == y.(int64)
-	case uint:
-		return x == y.(uint)
-	case uint8:
-		return x == y.(uint8)
-	case uint16:
-		return x == y.(uint16)
-	case uint32:
-		return x == y.(uint32)
-	case uint64:
-		return x == y.(uint64)
-	case uintptr:
-		return x == y.(uintptr)
-	case float32:
-		return x == y.(float32)
-	case float64:
-		return x == y.(float64)
-	case complex64:
-		return x == y.(complex64)
-	case complex128:
-		return x == y.(complex128)
-	case string:
-		return x == y.(string)
-	case *value:
-		return x == y.(*value)
-	case chan value:
-		return x == y.(chan value)
-	case structure:
-		return x.eq(t, y)
-	case array:
-		return x.eq(t, y)
-	case iface:
-		return x.eq(t, y)
-	case rtype:
-		return x.eq(t, y)
-	}
-
-	// Since map, func and slice don't support comparison, this
-	// case is only reachable if one of x or y is literally nil
-	// (handled in eqnil) or via interface{} values.
-	panic(fmt.Sprintf("comparing uncomparable type %s", t))
-}
-
-// Returns an integer hash of x such that equals(x, y) => hash(x) == hash(y).
-func hash(t types.Type, x value) int {
-	switch x := x.(type) {
-	case bool:
-		if x {
-			return 1
-		}
-		return 0
-	case int:
-		return x
-	case int8:
-		return int(x)
-	case int16:
-		return int(x)
-	case int32:
-		return int(x)
-	case int64:
-		return int(x)
-	case uint:
-		return int(x)
-	case uint8:
-		return int(x)
-	case uint16:
-		return int(x)
-	case uint32:
-		return int(x)
-	case uint64:
-		return int(x)
-	case uintptr:
-		return int(x)
-	case float32:
-		return int(x)
-	case float64:
-		return int(x)
-	case complex64:
-		return int(real(x))
-	case complex128:
-		return int(real(x))
-	case string:
-		return hashString(x)
-	case *value:
-		return int(uintptr(unsafe.Pointer(x)))
-	case chan value:
-		return int(uintptr(reflect.ValueOf(x).Pointer()))
-	case structure:
-		return x.hash(t)
-	case array:
-		return x.hash(t)
-	case iface:
-		return x.hash(t)
-	case rtype:
-		return x.hash(t)
-	}
-	panic(fmt.Sprintf("%T is unhashable", x))
-}
-
-// reflect.Value struct values don't have a fixed shape, since the
-// payload can be a scalar or an aggregate depending on the instance.
-// So store (and load) can't simply use recursion over the shape of the
-// rhs value, or the lhs, to copy the value; we need the static type
-// information.  (We can't make reflect.Value a new basic data type
-// because its "structness" is exposed to Go programs.)
-
-// load returns the value of type T in *addr.
-func load(T types.Type, addr *value) value {
-	switch T := T.Underlying().(type) {
-	case *types.Struct:
-		v := (*addr).(structure)
-		a := make(structure, len(v))
-		for i := range a {
-			a[i] = load(T.Field(i).Type(), &v[i])
-		}
-		return a
-	case *types.Array:
-		v := (*addr).(array)
-		a := make(array, len(v))
-		for i := range a {
-			a[i] = load(T.Elem(), &v[i])
-		}
-		return a
-	default:
-		return *addr
-	}
-}
-
-// store stores value v of type T into *addr.
-func store(T types.Type, addr *value, v value) {
-	switch T := T.Underlying().(type) {
-	case *types.Struct:
-		lhs := (*addr).(structure)
-		rhs := v.(structure)
-		for i := range lhs {
-			store(T.Field(i).Type(), &lhs[i], rhs[i])
-		}
-	case *types.Array:
-		lhs := (*addr).(array)
-		rhs := v.(array)
-		for i := range lhs {
-			store(T.Elem(), &lhs[i], rhs[i])
-		}
-	default:
-		*addr = v
-	}
-}
-
-// Prints in the style of built-in println.
-// (More or less; in gc println is actually a compiler intrinsic and
-// can distinguish println(1) from println(interface{}(1)).)
-func writeValue(buf *bytes.Buffer, v value) {
-	switch v := v.(type) {
-	case nil, bool, int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, uintptr, float32, float64, complex64, complex128, string:
-		fmt.Fprintf(buf, "%v", v)
-
-	case map[value]value:
-		buf.WriteString("map[")
-		sep := ""
-		for k, e := range v {
-			buf.WriteString(sep)
-			sep = " "
-			writeValue(buf, k)
-			buf.WriteString(":")
-			writeValue(buf, e)
-		}
-		buf.WriteString("]")
-
-	case *hashmap:
-		buf.WriteString("map[")
-		sep := " "
-		for _, e := range v.entries() {
-			for e != nil {
-				buf.WriteString(sep)
-				sep = " "
-				writeValue(buf, e.key)
-				buf.WriteString(":")
-				writeValue(buf, e.value)
-				e = e.next
-			}
-		}
-		buf.WriteString("]")
-
-	case chan value:
-		fmt.Fprintf(buf, "%v", v) // (an address)
-
-	case *value:
-		if v == nil {
-			buf.WriteString("<nil>")
-		} else {
-			fmt.Fprintf(buf, "%p", v)
-		}
-
-	case iface:
-		fmt.Fprintf(buf, "(%s, ", v.t)
-		writeValue(buf, v.v)
-		buf.WriteString(")")
-
-	case structure:
-		buf.WriteString("{")
-		for i, e := range v {
-			if i > 0 {
-				buf.WriteString(" ")
-			}
-			writeValue(buf, e)
-		}
-		buf.WriteString("}")
-
-	case array:
-		buf.WriteString("[")
-		for i, e := range v {
-			if i > 0 {
-				buf.WriteString(" ")
-			}
-			writeValue(buf, e)
-		}
-		buf.WriteString("]")
-
-	case []value:
-		buf.WriteString("[")
-		for i, e := range v {
-			if i > 0 {
-				buf.WriteString(" ")
-			}
-			writeValue(buf, e)
-		}
-		buf.WriteString("]")
-
-	case *ssa.Function, *ssa.Builtin, *closure:
-		fmt.Fprintf(buf, "%p", v) // (an address)
-
-	case rtype:
-		buf.WriteString(v.t.String())
-
-	case tuple:
-		// Unreachable in well-formed Go programs
-		buf.WriteString("(")
-		for i, e := range v {
-			if i > 0 {
-				buf.WriteString(", ")
-			}
-			writeValue(buf, e)
-		}
-		buf.WriteString(")")
-
-	default:
-		fmt.Fprintf(buf, "<%T>", v)
-	}
-}
-
-// Implements printing of Go values in the style of built-in println.
-func toString(v value) string {
-	var b bytes.Buffer
-	writeValue(&b, v)
-	return b.String()
-}
-
-// ------------------------------------------------------------------------
-// Iterators
-
-type stringIter struct {
-	*strings.Reader
-	i int
-}
-
-func (it *stringIter) next() tuple {
-	okv := make(tuple, 3)
-	ch, n, err := it.ReadRune()
-	ok := err != io.EOF
-	okv[0] = ok
-	if ok {
-		okv[1] = it.i
-		okv[2] = ch
-	}
-	it.i += n
-	return okv
-}
-
-type mapIter chan [2]value
-
-func (it mapIter) next() tuple {
-	kv, ok := <-it
-	return tuple{ok, kv[0], kv[1]}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/lift.go b/installer/vendor/golang.org/x/tools/go/ssa/lift.go
deleted file mode 100644
index 048e9b0326..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/lift.go
+++ /dev/null
@@ -1,653 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines the lifting pass which tries to "lift" Alloc
-// cells (new/local variables) into SSA registers, replacing loads
-// with the dominating stored value, eliminating loads and stores, and
-// inserting φ-nodes as needed.
-
-// Cited papers and resources:
-//
-// Ron Cytron et al. 1991. Efficiently computing SSA form...
-// http://doi.acm.org/10.1145/115372.115320
-//
-// Cooper, Harvey, Kennedy.  2001.  A Simple, Fast Dominance Algorithm.
-// Software Practice and Experience 2001, 4:1-10.
-// http://www.hipersoft.rice.edu/grads/publications/dom14.pdf
-//
-// Daniel Berlin, llvmdev mailing list, 2012.
-// http://lists.cs.uiuc.edu/pipermail/llvmdev/2012-January/046638.html
-// (Be sure to expand the whole thread.)
-
-// TODO(adonovan): opt: there are many optimizations worth evaluating, and
-// the conventional wisdom for SSA construction is that a simple
-// algorithm well engineered often beats those of better asymptotic
-// complexity on all but the most egregious inputs.
-//
-// Danny Berlin suggests that the Cooper et al. algorithm for
-// computing the dominance frontier is superior to Cytron et al.
-// Furthermore he recommends that rather than computing the DF for the
-// whole function then renaming all alloc cells, it may be cheaper to
-// compute the DF for each alloc cell separately and throw it away.
-//
-// Consider exploiting liveness information to avoid creating dead
-// φ-nodes which we then immediately remove.
-//
-// Also see many other "TODO: opt" suggestions in the code.
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-	"math/big"
-	"os"
-)
-
-// If true, show diagnostic information at each step of lifting.
-// Very verbose.
-const debugLifting = false
-
-// domFrontier maps each block to the set of blocks in its dominance
-// frontier.  The outer slice is conceptually a map keyed by
-// Block.Index.  The inner slice is conceptually a set, possibly
-// containing duplicates.
-//
-// TODO(adonovan): opt: measure impact of dups; consider a packed bit
-// representation, e.g. big.Int, and bitwise parallel operations for
-// the union step in the Children loop.
-//
-// domFrontier's methods mutate the slice's elements but not its
-// length, so their receivers needn't be pointers.
-//
-type domFrontier [][]*BasicBlock
-
-func (df domFrontier) add(u, v *BasicBlock) {
-	p := &df[u.Index]
-	*p = append(*p, v)
-}
-
-// build builds the dominance frontier df for the dominator (sub)tree
-// rooted at u, using the Cytron et al. algorithm.
-//
-// TODO(adonovan): opt: consider Berlin approach, computing pruned SSA
-// by pruning the entire IDF computation, rather than merely pruning
-// the DF -> IDF step.
-func (df domFrontier) build(u *BasicBlock) {
-	// Encounter each node u in postorder of dom tree.
-	for _, child := range u.dom.children {
-		df.build(child)
-	}
-	for _, vb := range u.Succs {
-		if v := vb.dom; v.idom != u {
-			df.add(u, vb)
-		}
-	}
-	for _, w := range u.dom.children {
-		for _, vb := range df[w.Index] {
-			// TODO(adonovan): opt: use word-parallel bitwise union.
-			if v := vb.dom; v.idom != u {
-				df.add(u, vb)
-			}
-		}
-	}
-}
-
-func buildDomFrontier(fn *Function) domFrontier {
-	df := make(domFrontier, len(fn.Blocks))
-	df.build(fn.Blocks[0])
-	if fn.Recover != nil {
-		df.build(fn.Recover)
-	}
-	return df
-}
-
-func removeInstr(refs []Instruction, instr Instruction) []Instruction {
-	i := 0
-	for _, ref := range refs {
-		if ref == instr {
-			continue
-		}
-		refs[i] = ref
-		i++
-	}
-	for j := i; j != len(refs); j++ {
-		refs[j] = nil // aid GC
-	}
-	return refs[:i]
-}
-
-// lift replaces local and new Allocs accessed only with
-// load/store by SSA registers, inserting φ-nodes where necessary.
-// The result is a program in classical pruned SSA form.
-//
-// Preconditions:
-// - fn has no dead blocks (blockopt has run).
-// - Def/use info (Operands and Referrers) is up-to-date.
-// - The dominator tree is up-to-date.
-//
-func lift(fn *Function) {
-	// TODO(adonovan): opt: lots of little optimizations may be
-	// worthwhile here, especially if they cause us to avoid
-	// buildDomFrontier.  For example:
-	//
-	// - Alloc never loaded?  Eliminate.
-	// - Alloc never stored?  Replace all loads with a zero constant.
-	// - Alloc stored once?  Replace loads with dominating store;
-	//   don't forget that an Alloc is itself an effective store
-	//   of zero.
-	// - Alloc used only within a single block?
-	//   Use degenerate algorithm avoiding φ-nodes.
-	// - Consider synergy with scalar replacement of aggregates (SRA).
-	//   e.g. *(&x.f) where x is an Alloc.
-	//   Perhaps we'd get better results if we generated this as x.f
-	//   i.e. Field(x, .f) instead of Load(FieldIndex(x, .f)).
-	//   Unclear.
-	//
-	// But we will start with the simplest correct code.
-	df := buildDomFrontier(fn)
-
-	if debugLifting {
-		title := false
-		for i, blocks := range df {
-			if blocks != nil {
-				if !title {
-					fmt.Fprintf(os.Stderr, "Dominance frontier of %s:\n", fn)
-					title = true
-				}
-				fmt.Fprintf(os.Stderr, "\t%s: %s\n", fn.Blocks[i], blocks)
-			}
-		}
-	}
-
-	newPhis := make(newPhiMap)
-
-	// During this pass we will replace some BasicBlock.Instrs
-	// (allocs, loads and stores) with nil, keeping a count in
-	// BasicBlock.gaps.  At the end we will reset Instrs to the
-	// concatenation of all non-dead newPhis and non-nil Instrs
-	// for the block, reusing the original array if space permits.
-
-	// While we're here, we also eliminate 'rundefers'
-	// instructions in functions that contain no 'defer'
-	// instructions.
-	usesDefer := false
-
-	// A counter used to generate ~unique ids for Phi nodes, as an
-	// aid to debugging.  We use large numbers to make them highly
-	// visible.  All nodes are renumbered later.
-	fresh := 1000
-
-	// Determine which allocs we can lift and number them densely.
-	// The renaming phase uses this numbering for compact maps.
-	numAllocs := 0
-	for _, b := range fn.Blocks {
-		b.gaps = 0
-		b.rundefers = 0
-		for _, instr := range b.Instrs {
-			switch instr := instr.(type) {
-			case *Alloc:
-				index := -1
-				if liftAlloc(df, instr, newPhis, &fresh) {
-					index = numAllocs
-					numAllocs++
-				}
-				instr.index = index
-			case *Defer:
-				usesDefer = true
-			case *RunDefers:
-				b.rundefers++
-			}
-		}
-	}
-
-	// renaming maps an alloc (keyed by index) to its replacement
-	// value.  Initially the renaming contains nil, signifying the
-	// zero constant of the appropriate type; we construct the
-	// Const lazily at most once on each path through the domtree.
-	// TODO(adonovan): opt: cache per-function not per subtree.
-	renaming := make([]Value, numAllocs)
-
-	// Renaming.
-	rename(fn.Blocks[0], renaming, newPhis)
-
-	// Eliminate dead φ-nodes.
-	removeDeadPhis(fn.Blocks, newPhis)
-
-	// Prepend remaining live φ-nodes to each block.
-	for _, b := range fn.Blocks {
-		nps := newPhis[b]
-		j := len(nps)
-
-		rundefersToKill := b.rundefers
-		if usesDefer {
-			rundefersToKill = 0
-		}
-
-		if j+b.gaps+rundefersToKill == 0 {
-			continue // fast path: no new phis or gaps
-		}
-
-		// Compact nps + non-nil Instrs into a new slice.
-		// TODO(adonovan): opt: compact in situ (rightwards)
-		// if Instrs has sufficient space or slack.
-		dst := make([]Instruction, len(b.Instrs)+j-b.gaps-rundefersToKill)
-		for i, np := range nps {
-			dst[i] = np.phi
-		}
-		for _, instr := range b.Instrs {
-			if instr == nil {
-				continue
-			}
-			if !usesDefer {
-				if _, ok := instr.(*RunDefers); ok {
-					continue
-				}
-			}
-			dst[j] = instr
-			j++
-		}
-		b.Instrs = dst
-	}
-
-	// Remove any fn.Locals that were lifted.
-	j := 0
-	for _, l := range fn.Locals {
-		if l.index < 0 {
-			fn.Locals[j] = l
-			j++
-		}
-	}
-	// Nil out fn.Locals[j:] to aid GC.
-	for i := j; i < len(fn.Locals); i++ {
-		fn.Locals[i] = nil
-	}
-	fn.Locals = fn.Locals[:j]
-}
-
-// removeDeadPhis removes φ-nodes not transitively needed by a
-// non-Phi, non-DebugRef instruction.
-func removeDeadPhis(blocks []*BasicBlock, newPhis newPhiMap) {
-	// First pass: find the set of "live" φ-nodes: those reachable
-	// from some non-Phi instruction.
-	//
-	// We compute reachability in reverse, starting from each φ,
-	// rather than forwards, starting from each live non-Phi
-	// instruction, because this way visits much less of the
-	// Value graph.
-	livePhis := make(map[*Phi]bool)
-	for _, npList := range newPhis {
-		for _, np := range npList {
-			phi := np.phi
-			if !livePhis[phi] && phiHasDirectReferrer(phi) {
-				markLivePhi(livePhis, phi)
-			}
-		}
-	}
-
-	// Existing φ-nodes due to && and || operators
-	// are all considered live (see Go issue 19622).
-	for _, b := range blocks {
-		for _, phi := range b.phis() {
-			markLivePhi(livePhis, phi.(*Phi))
-		}
-	}
-
-	// Second pass: eliminate unused phis from newPhis.
-	for block, npList := range newPhis {
-		j := 0
-		for _, np := range npList {
-			if livePhis[np.phi] {
-				npList[j] = np
-				j++
-			} else {
-				// discard it, first removing it from referrers
-				for _, val := range np.phi.Edges {
-					if refs := val.Referrers(); refs != nil {
-						*refs = removeInstr(*refs, np.phi)
-					}
-				}
-				np.phi.block = nil
-			}
-		}
-		newPhis[block] = npList[:j]
-	}
-}
-
-// markLivePhi marks phi, and all φ-nodes transitively reachable via
-// its Operands, live.
-func markLivePhi(livePhis map[*Phi]bool, phi *Phi) {
-	livePhis[phi] = true
-	for _, rand := range phi.Operands(nil) {
-		if q, ok := (*rand).(*Phi); ok {
-			if !livePhis[q] {
-				markLivePhi(livePhis, q)
-			}
-		}
-	}
-}
-
-// phiHasDirectReferrer reports whether phi is directly referred to by
-// a non-Phi instruction.  Such instructions are the
-// roots of the liveness traversal.
-func phiHasDirectReferrer(phi *Phi) bool {
-	for _, instr := range *phi.Referrers() {
-		if _, ok := instr.(*Phi); !ok {
-			return true
-		}
-	}
-	return false
-}
-
-type blockSet struct{ big.Int } // (inherit methods from Int)
-
-// add adds b to the set and returns true if the set changed.
-func (s *blockSet) add(b *BasicBlock) bool {
-	i := b.Index
-	if s.Bit(i) != 0 {
-		return false
-	}
-	s.SetBit(&s.Int, i, 1)
-	return true
-}
-
-// take removes an arbitrary element from a set s and
-// returns its index, or returns -1 if empty.
-func (s *blockSet) take() int {
-	l := s.BitLen()
-	for i := 0; i < l; i++ {
-		if s.Bit(i) == 1 {
-			s.SetBit(&s.Int, i, 0)
-			return i
-		}
-	}
-	return -1
-}
-
-// newPhi is a pair of a newly introduced φ-node and the lifted Alloc
-// it replaces.
-type newPhi struct {
-	phi   *Phi
-	alloc *Alloc
-}
-
-// newPhiMap records for each basic block, the set of newPhis that
-// must be prepended to the block.
-type newPhiMap map[*BasicBlock][]newPhi
-
-// liftAlloc determines whether alloc can be lifted into registers,
-// and if so, it populates newPhis with all the φ-nodes it may require
-// and returns true.
-//
-// fresh is a source of fresh ids for phi nodes.
-//
-func liftAlloc(df domFrontier, alloc *Alloc, newPhis newPhiMap, fresh *int) bool {
-	// Don't lift aggregates into registers, because we don't have
-	// a way to express their zero-constants.
-	switch deref(alloc.Type()).Underlying().(type) {
-	case *types.Array, *types.Struct:
-		return false
-	}
-
-	// Don't lift named return values in functions that defer
-	// calls that may recover from panic.
-	if fn := alloc.Parent(); fn.Recover != nil {
-		for _, nr := range fn.namedResults {
-			if nr == alloc {
-				return false
-			}
-		}
-	}
-
-	// Compute defblocks, the set of blocks containing a
-	// definition of the alloc cell.
-	var defblocks blockSet
-	for _, instr := range *alloc.Referrers() {
-		// Bail out if we discover the alloc is not liftable;
-		// the only operations permitted to use the alloc are
-		// loads/stores into the cell, and DebugRef.
-		switch instr := instr.(type) {
-		case *Store:
-			if instr.Val == alloc {
-				return false // address used as value
-			}
-			if instr.Addr != alloc {
-				panic("Alloc.Referrers is inconsistent")
-			}
-			defblocks.add(instr.Block())
-		case *UnOp:
-			if instr.Op != token.MUL {
-				return false // not a load
-			}
-			if instr.X != alloc {
-				panic("Alloc.Referrers is inconsistent")
-			}
-		case *DebugRef:
-			// ok
-		default:
-			return false // some other instruction
-		}
-	}
-	// The Alloc itself counts as a (zero) definition of the cell.
-	defblocks.add(alloc.Block())
-
-	if debugLifting {
-		fmt.Fprintln(os.Stderr, "\tlifting ", alloc, alloc.Name())
-	}
-
-	fn := alloc.Parent()
-
-	// Φ-insertion.
-	//
-	// What follows is the body of the main loop of the insert-φ
-	// function described by Cytron et al, but instead of using
-	// counter tricks, we just reset the 'hasAlready' and 'work'
-	// sets each iteration.  These are bitmaps so it's pretty cheap.
-	//
-	// TODO(adonovan): opt: recycle slice storage for W,
-	// hasAlready, defBlocks across liftAlloc calls.
-	var hasAlready blockSet
-
-	// Initialize W and work to defblocks.
-	var work blockSet = defblocks // blocks seen
-	var W blockSet                // blocks to do
-	W.Set(&defblocks.Int)
-
-	// Traverse iterated dominance frontier, inserting φ-nodes.
-	for i := W.take(); i != -1; i = W.take() {
-		u := fn.Blocks[i]
-		for _, v := range df[u.Index] {
-			if hasAlready.add(v) {
-				// Create φ-node.
-				// It will be prepended to v.Instrs later, if needed.
-				phi := &Phi{
-					Edges:   make([]Value, len(v.Preds)),
-					Comment: alloc.Comment,
-				}
-				// This is merely a debugging aid:
-				phi.setNum(*fresh)
-				*fresh++
-
-				phi.pos = alloc.Pos()
-				phi.setType(deref(alloc.Type()))
-				phi.block = v
-				if debugLifting {
-					fmt.Fprintf(os.Stderr, "\tplace %s = %s at block %s\n", phi.Name(), phi, v)
-				}
-				newPhis[v] = append(newPhis[v], newPhi{phi, alloc})
-
-				if work.add(v) {
-					W.add(v)
-				}
-			}
-		}
-	}
-
-	return true
-}
-
-// replaceAll replaces all intraprocedural uses of x with y,
-// updating x.Referrers and y.Referrers.
-// Precondition: x.Referrers() != nil, i.e. x must be local to some function.
-//
-func replaceAll(x, y Value) {
-	var rands []*Value
-	pxrefs := x.Referrers()
-	pyrefs := y.Referrers()
-	for _, instr := range *pxrefs {
-		rands = instr.Operands(rands[:0]) // recycle storage
-		for _, rand := range rands {
-			if *rand != nil {
-				if *rand == x {
-					*rand = y
-				}
-			}
-		}
-		if pyrefs != nil {
-			*pyrefs = append(*pyrefs, instr) // dups ok
-		}
-	}
-	*pxrefs = nil // x is now unreferenced
-}
-
-// renamed returns the value to which alloc is being renamed,
-// constructing it lazily if it's the implicit zero initialization.
-//
-func renamed(renaming []Value, alloc *Alloc) Value {
-	v := renaming[alloc.index]
-	if v == nil {
-		v = zeroConst(deref(alloc.Type()))
-		renaming[alloc.index] = v
-	}
-	return v
-}
-
-// rename implements the (Cytron et al) SSA renaming algorithm, a
-// preorder traversal of the dominator tree replacing all loads of
-// Alloc cells with the value stored to that cell by the dominating
-// store instruction.  For lifting, we need only consider loads,
-// stores and φ-nodes.
-//
-// renaming is a map from *Alloc (keyed by index number) to its
-// dominating stored value; newPhis[x] is the set of new φ-nodes to be
-// prepended to block x.
-//
-func rename(u *BasicBlock, renaming []Value, newPhis newPhiMap) {
-	// Each φ-node becomes the new name for its associated Alloc.
-	for _, np := range newPhis[u] {
-		phi := np.phi
-		alloc := np.alloc
-		renaming[alloc.index] = phi
-	}
-
-	// Rename loads and stores of allocs.
-	for i, instr := range u.Instrs {
-		switch instr := instr.(type) {
-		case *Alloc:
-			if instr.index >= 0 { // store of zero to Alloc cell
-				// Replace dominated loads by the zero value.
-				renaming[instr.index] = nil
-				if debugLifting {
-					fmt.Fprintf(os.Stderr, "\tkill alloc %s\n", instr)
-				}
-				// Delete the Alloc.
-				u.Instrs[i] = nil
-				u.gaps++
-			}
-
-		case *Store:
-			if alloc, ok := instr.Addr.(*Alloc); ok && alloc.index >= 0 { // store to Alloc cell
-				// Replace dominated loads by the stored value.
-				renaming[alloc.index] = instr.Val
-				if debugLifting {
-					fmt.Fprintf(os.Stderr, "\tkill store %s; new value: %s\n",
-						instr, instr.Val.Name())
-				}
-				// Remove the store from the referrer list of the stored value.
-				if refs := instr.Val.Referrers(); refs != nil {
-					*refs = removeInstr(*refs, instr)
-				}
-				// Delete the Store.
-				u.Instrs[i] = nil
-				u.gaps++
-			}
-
-		case *UnOp:
-			if instr.Op == token.MUL {
-				if alloc, ok := instr.X.(*Alloc); ok && alloc.index >= 0 { // load of Alloc cell
-					newval := renamed(renaming, alloc)
-					if debugLifting {
-						fmt.Fprintf(os.Stderr, "\tupdate load %s = %s with %s\n",
-							instr.Name(), instr, newval.Name())
-					}
-					// Replace all references to
-					// the loaded value by the
-					// dominating stored value.
-					replaceAll(instr, newval)
-					// Delete the Load.
-					u.Instrs[i] = nil
-					u.gaps++
-				}
-			}
-
-		case *DebugRef:
-			if alloc, ok := instr.X.(*Alloc); ok && alloc.index >= 0 { // ref of Alloc cell
-				if instr.IsAddr {
-					instr.X = renamed(renaming, alloc)
-					instr.IsAddr = false
-
-					// Add DebugRef to instr.X's referrers.
-					if refs := instr.X.Referrers(); refs != nil {
-						*refs = append(*refs, instr)
-					}
-				} else {
-					// A source expression denotes the address
-					// of an Alloc that was optimized away.
-					instr.X = nil
-
-					// Delete the DebugRef.
-					u.Instrs[i] = nil
-					u.gaps++
-				}
-			}
-		}
-	}
-
-	// For each φ-node in a CFG successor, rename the edge.
-	for _, v := range u.Succs {
-		phis := newPhis[v]
-		if len(phis) == 0 {
-			continue
-		}
-		i := v.predIndex(u)
-		for _, np := range phis {
-			phi := np.phi
-			alloc := np.alloc
-			newval := renamed(renaming, alloc)
-			if debugLifting {
-				fmt.Fprintf(os.Stderr, "\tsetphi %s edge %s -> %s (#%d) (alloc=%s) := %s\n",
-					phi.Name(), u, v, i, alloc.Name(), newval.Name())
-			}
-			phi.Edges[i] = newval
-			if prefs := newval.Referrers(); prefs != nil {
-				*prefs = append(*prefs, phi)
-			}
-		}
-	}
-
-	// Continue depth-first recursion over domtree, pushing a
-	// fresh copy of the renaming map for each subtree.
-	for i, v := range u.dom.children {
-		r := renaming
-		if i < len(u.dom.children)-1 {
-			// On all but the final iteration, we must make
-			// a copy to avoid destructive update.
-			r = make([]Value, len(renaming))
-			copy(r, renaming)
-		}
-		rename(v, r, newPhis)
-	}
-
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/lvalue.go b/installer/vendor/golang.org/x/tools/go/ssa/lvalue.go
deleted file mode 100644
index 4d85be3ec7..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/lvalue.go
+++ /dev/null
@@ -1,120 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// lvalues are the union of addressable expressions and map-index
-// expressions.
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-)
-
-// An lvalue represents an assignable location that may appear on the
-// left-hand side of an assignment.  This is a generalization of a
-// pointer to permit updates to elements of maps.
-//
-type lvalue interface {
-	store(fn *Function, v Value) // stores v into the location
-	load(fn *Function) Value     // loads the contents of the location
-	address(fn *Function) Value  // address of the location
-	typ() types.Type             // returns the type of the location
-}
-
-// An address is an lvalue represented by a true pointer.
-type address struct {
-	addr Value
-	pos  token.Pos // source position
-	expr ast.Expr  // source syntax of the value (not address) [debug mode]
-}
-
-func (a *address) load(fn *Function) Value {
-	load := emitLoad(fn, a.addr)
-	load.pos = a.pos
-	return load
-}
-
-func (a *address) store(fn *Function, v Value) {
-	store := emitStore(fn, a.addr, v, a.pos)
-	if a.expr != nil {
-		// store.Val is v, converted for assignability.
-		emitDebugRef(fn, a.expr, store.Val, false)
-	}
-}
-
-func (a *address) address(fn *Function) Value {
-	if a.expr != nil {
-		emitDebugRef(fn, a.expr, a.addr, true)
-	}
-	return a.addr
-}
-
-func (a *address) typ() types.Type {
-	return deref(a.addr.Type())
-}
-
-// An element is an lvalue represented by m[k], the location of an
-// element of a map or string.  These locations are not addressable
-// since pointers cannot be formed from them, but they do support
-// load(), and in the case of maps, store().
-//
-type element struct {
-	m, k Value      // map or string
-	t    types.Type // map element type or string byte type
-	pos  token.Pos  // source position of colon ({k:v}) or lbrack (m[k]=v)
-}
-
-func (e *element) load(fn *Function) Value {
-	l := &Lookup{
-		X:     e.m,
-		Index: e.k,
-	}
-	l.setPos(e.pos)
-	l.setType(e.t)
-	return fn.emit(l)
-}
-
-func (e *element) store(fn *Function, v Value) {
-	up := &MapUpdate{
-		Map:   e.m,
-		Key:   e.k,
-		Value: emitConv(fn, v, e.t),
-	}
-	up.pos = e.pos
-	fn.emit(up)
-}
-
-func (e *element) address(fn *Function) Value {
-	panic("map/string elements are not addressable")
-}
-
-func (e *element) typ() types.Type {
-	return e.t
-}
-
-// A blank is a dummy variable whose name is "_".
-// It is not reified: loads are illegal and stores are ignored.
-//
-type blank struct{}
-
-func (bl blank) load(fn *Function) Value {
-	panic("blank.load is illegal")
-}
-
-func (bl blank) store(fn *Function, v Value) {
-	// no-op
-}
-
-func (bl blank) address(fn *Function) Value {
-	panic("blank var is not addressable")
-}
-
-func (bl blank) typ() types.Type {
-	// This should be the type of the blank Ident; the typechecker
-	// doesn't provide this yet, but fortunately, we don't need it
-	// yet either.
-	panic("blank.typ is unimplemented")
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/methods.go b/installer/vendor/golang.org/x/tools/go/ssa/methods.go
deleted file mode 100644
index 080dca968e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/methods.go
+++ /dev/null
@@ -1,239 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines utilities for population of method sets.
-
-import (
-	"fmt"
-	"go/types"
-)
-
-// MethodValue returns the Function implementing method sel, building
-// wrapper methods on demand.  It returns nil if sel denotes an
-// abstract (interface) method.
-//
-// Precondition: sel.Kind() == MethodVal.
-//
-// Thread-safe.
-//
-// EXCLUSIVE_LOCKS_ACQUIRED(prog.methodsMu)
-//
-func (prog *Program) MethodValue(sel *types.Selection) *Function {
-	if sel.Kind() != types.MethodVal {
-		panic(fmt.Sprintf("Method(%s) kind != MethodVal", sel))
-	}
-	T := sel.Recv()
-	if isInterface(T) {
-		return nil // abstract method
-	}
-	if prog.mode&LogSource != 0 {
-		defer logStack("Method %s %v", T, sel)()
-	}
-
-	prog.methodsMu.Lock()
-	defer prog.methodsMu.Unlock()
-
-	return prog.addMethod(prog.createMethodSet(T), sel)
-}
-
-// LookupMethod returns the implementation of the method of type T
-// identified by (pkg, name).  It returns nil if the method exists but
-// is abstract, and panics if T has no such method.
-//
-func (prog *Program) LookupMethod(T types.Type, pkg *types.Package, name string) *Function {
-	sel := prog.MethodSets.MethodSet(T).Lookup(pkg, name)
-	if sel == nil {
-		panic(fmt.Sprintf("%s has no method %s", T, types.Id(pkg, name)))
-	}
-	return prog.MethodValue(sel)
-}
-
-// methodSet contains the (concrete) methods of a non-interface type.
-type methodSet struct {
-	mapping  map[string]*Function // populated lazily
-	complete bool                 // mapping contains all methods
-}
-
-// Precondition: !isInterface(T).
-// EXCLUSIVE_LOCKS_REQUIRED(prog.methodsMu)
-func (prog *Program) createMethodSet(T types.Type) *methodSet {
-	mset, ok := prog.methodSets.At(T).(*methodSet)
-	if !ok {
-		mset = &methodSet{mapping: make(map[string]*Function)}
-		prog.methodSets.Set(T, mset)
-	}
-	return mset
-}
-
-// EXCLUSIVE_LOCKS_REQUIRED(prog.methodsMu)
-func (prog *Program) addMethod(mset *methodSet, sel *types.Selection) *Function {
-	if sel.Kind() == types.MethodExpr {
-		panic(sel)
-	}
-	id := sel.Obj().Id()
-	fn := mset.mapping[id]
-	if fn == nil {
-		obj := sel.Obj().(*types.Func)
-
-		needsPromotion := len(sel.Index()) > 1
-		needsIndirection := !isPointer(recvType(obj)) && isPointer(sel.Recv())
-		if needsPromotion || needsIndirection {
-			fn = makeWrapper(prog, sel)
-		} else {
-			fn = prog.declaredFunc(obj)
-		}
-		if fn.Signature.Recv() == nil {
-			panic(fn) // missing receiver
-		}
-		mset.mapping[id] = fn
-	}
-	return fn
-}
-
-// RuntimeTypes returns a new unordered slice containing all
-// concrete types in the program for which a complete (non-empty)
-// method set is required at run-time.
-//
-// Thread-safe.
-//
-// EXCLUSIVE_LOCKS_ACQUIRED(prog.methodsMu)
-//
-func (prog *Program) RuntimeTypes() []types.Type {
-	prog.methodsMu.Lock()
-	defer prog.methodsMu.Unlock()
-
-	var res []types.Type
-	prog.methodSets.Iterate(func(T types.Type, v interface{}) {
-		if v.(*methodSet).complete {
-			res = append(res, T)
-		}
-	})
-	return res
-}
-
-// declaredFunc returns the concrete function/method denoted by obj.
-// Panic ensues if there is none.
-//
-func (prog *Program) declaredFunc(obj *types.Func) *Function {
-	if v := prog.packageLevelValue(obj); v != nil {
-		return v.(*Function)
-	}
-	panic("no concrete method: " + obj.String())
-}
-
-// needMethodsOf ensures that runtime type information (including the
-// complete method set) is available for the specified type T and all
-// its subcomponents.
-//
-// needMethodsOf must be called for at least every type that is an
-// operand of some MakeInterface instruction, and for the type of
-// every exported package member.
-//
-// Precondition: T is not a method signature (*Signature with Recv()!=nil).
-//
-// Thread-safe.  (Called via emitConv from multiple builder goroutines.)
-//
-// TODO(adonovan): make this faster.  It accounts for 20% of SSA build time.
-//
-// EXCLUSIVE_LOCKS_ACQUIRED(prog.methodsMu)
-//
-func (prog *Program) needMethodsOf(T types.Type) {
-	prog.methodsMu.Lock()
-	prog.needMethods(T, false)
-	prog.methodsMu.Unlock()
-}
-
-// Precondition: T is not a method signature (*Signature with Recv()!=nil).
-// Recursive case: skip => don't create methods for T.
-//
-// EXCLUSIVE_LOCKS_REQUIRED(prog.methodsMu)
-//
-func (prog *Program) needMethods(T types.Type, skip bool) {
-	// Each package maintains its own set of types it has visited.
-	if prevSkip, ok := prog.runtimeTypes.At(T).(bool); ok {
-		// needMethods(T) was previously called
-		if !prevSkip || skip {
-			return // already seen, with same or false 'skip' value
-		}
-	}
-	prog.runtimeTypes.Set(T, skip)
-
-	tmset := prog.MethodSets.MethodSet(T)
-
-	if !skip && !isInterface(T) && tmset.Len() > 0 {
-		// Create methods of T.
-		mset := prog.createMethodSet(T)
-		if !mset.complete {
-			mset.complete = true
-			n := tmset.Len()
-			for i := 0; i < n; i++ {
-				prog.addMethod(mset, tmset.At(i))
-			}
-		}
-	}
-
-	// Recursion over signatures of each method.
-	for i := 0; i < tmset.Len(); i++ {
-		sig := tmset.At(i).Type().(*types.Signature)
-		prog.needMethods(sig.Params(), false)
-		prog.needMethods(sig.Results(), false)
-	}
-
-	switch t := T.(type) {
-	case *types.Basic:
-		// nop
-
-	case *types.Interface:
-		// nop---handled by recursion over method set.
-
-	case *types.Pointer:
-		prog.needMethods(t.Elem(), false)
-
-	case *types.Slice:
-		prog.needMethods(t.Elem(), false)
-
-	case *types.Chan:
-		prog.needMethods(t.Elem(), false)
-
-	case *types.Map:
-		prog.needMethods(t.Key(), false)
-		prog.needMethods(t.Elem(), false)
-
-	case *types.Signature:
-		if t.Recv() != nil {
-			panic(fmt.Sprintf("Signature %s has Recv %s", t, t.Recv()))
-		}
-		prog.needMethods(t.Params(), false)
-		prog.needMethods(t.Results(), false)
-
-	case *types.Named:
-		// A pointer-to-named type can be derived from a named
-		// type via reflection.  It may have methods too.
-		prog.needMethods(types.NewPointer(T), false)
-
-		// Consider 'type T struct{S}' where S has methods.
-		// Reflection provides no way to get from T to struct{S},
-		// only to S, so the method set of struct{S} is unwanted,
-		// so set 'skip' flag during recursion.
-		prog.needMethods(t.Underlying(), true)
-
-	case *types.Array:
-		prog.needMethods(t.Elem(), false)
-
-	case *types.Struct:
-		for i, n := 0, t.NumFields(); i < n; i++ {
-			prog.needMethods(t.Field(i).Type(), false)
-		}
-
-	case *types.Tuple:
-		for i, n := 0, t.Len(); i < n; i++ {
-			prog.needMethods(t.At(i).Type(), false)
-		}
-
-	default:
-		panic(T)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/mode.go b/installer/vendor/golang.org/x/tools/go/ssa/mode.go
deleted file mode 100644
index d2a269893a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/mode.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines the BuilderMode type and its command-line flag.
-
-import (
-	"bytes"
-	"fmt"
-)
-
-// BuilderMode is a bitmask of options for diagnostics and checking.
-//
-// *BuilderMode satisfies the flag.Value interface.  Example:
-//
-// 	var mode = ssa.BuilderMode(0)
-// 	func init() { flag.Var(&mode, "build", ssa.BuilderModeDoc) }
-//
-type BuilderMode uint
-
-const (
-	PrintPackages        BuilderMode = 1 << iota // Print package inventory to stdout
-	PrintFunctions                               // Print function SSA code to stdout
-	LogSource                                    // Log source locations as SSA builder progresses
-	SanityCheckFunctions                         // Perform sanity checking of function bodies
-	NaiveForm                                    // Build naïve SSA form: don't replace local loads/stores with registers
-	BuildSerially                                // Build packages serially, not in parallel.
-	GlobalDebug                                  // Enable debug info for all packages
-	BareInits                                    // Build init functions without guards or calls to dependent inits
-)
-
-const BuilderModeDoc = `Options controlling the SSA builder.
-The value is a sequence of zero or more of these letters:
-C	perform sanity [C]hecking of the SSA form.
-D	include [D]ebug info for every function.
-P	print [P]ackage inventory.
-F	print [F]unction SSA code.
-S	log [S]ource locations as SSA builder progresses.
-L	build distinct packages seria[L]ly instead of in parallel.
-N	build [N]aive SSA form: don't replace local loads/stores with registers.
-I	build bare [I]nit functions: no init guards or calls to dependent inits.
-`
-
-func (m BuilderMode) String() string {
-	var buf bytes.Buffer
-	if m&GlobalDebug != 0 {
-		buf.WriteByte('D')
-	}
-	if m&PrintPackages != 0 {
-		buf.WriteByte('P')
-	}
-	if m&PrintFunctions != 0 {
-		buf.WriteByte('F')
-	}
-	if m&LogSource != 0 {
-		buf.WriteByte('S')
-	}
-	if m&SanityCheckFunctions != 0 {
-		buf.WriteByte('C')
-	}
-	if m&NaiveForm != 0 {
-		buf.WriteByte('N')
-	}
-	if m&BuildSerially != 0 {
-		buf.WriteByte('L')
-	}
-	return buf.String()
-}
-
-// Set parses the flag characters in s and updates *m.
-func (m *BuilderMode) Set(s string) error {
-	var mode BuilderMode
-	for _, c := range s {
-		switch c {
-		case 'D':
-			mode |= GlobalDebug
-		case 'P':
-			mode |= PrintPackages
-		case 'F':
-			mode |= PrintFunctions
-		case 'S':
-			mode |= LogSource | BuildSerially
-		case 'C':
-			mode |= SanityCheckFunctions
-		case 'N':
-			mode |= NaiveForm
-		case 'L':
-			mode |= BuildSerially
-		default:
-			return fmt.Errorf("unknown BuilderMode option: %q", c)
-		}
-	}
-	*m = mode
-	return nil
-}
-
-// Get returns m.
-func (m BuilderMode) Get() interface{} { return m }
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/print.go b/installer/vendor/golang.org/x/tools/go/ssa/print.go
deleted file mode 100644
index 3333ba41a0..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/print.go
+++ /dev/null
@@ -1,431 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file implements the String() methods for all Value and
-// Instruction types.
-
-import (
-	"bytes"
-	"fmt"
-	"go/types"
-	"io"
-	"reflect"
-	"sort"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// relName returns the name of v relative to i.
-// In most cases, this is identical to v.Name(), but references to
-// Functions (including methods) and Globals use RelString and
-// all types are displayed with relType, so that only cross-package
-// references are package-qualified.
-//
-func relName(v Value, i Instruction) string {
-	var from *types.Package
-	if i != nil {
-		from = i.Parent().pkg()
-	}
-	switch v := v.(type) {
-	case Member: // *Function or *Global
-		return v.RelString(from)
-	case *Const:
-		return v.RelString(from)
-	}
-	return v.Name()
-}
-
-func relType(t types.Type, from *types.Package) string {
-	return types.TypeString(t, types.RelativeTo(from))
-}
-
-func relString(m Member, from *types.Package) string {
-	// NB: not all globals have an Object (e.g. init$guard),
-	// so use Package().Object not Object.Package().
-	if pkg := m.Package().Pkg; pkg != nil && pkg != from {
-		return fmt.Sprintf("%s.%s", pkg.Path(), m.Name())
-	}
-	return m.Name()
-}
-
-// Value.String()
-//
-// This method is provided only for debugging.
-// It never appears in disassembly, which uses Value.Name().
-
-func (v *Parameter) String() string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("parameter %s : %s", v.Name(), relType(v.Type(), from))
-}
-
-func (v *FreeVar) String() string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("freevar %s : %s", v.Name(), relType(v.Type(), from))
-}
-
-func (v *Builtin) String() string {
-	return fmt.Sprintf("builtin %s", v.Name())
-}
-
-// Instruction.String()
-
-func (v *Alloc) String() string {
-	op := "local"
-	if v.Heap {
-		op = "new"
-	}
-	from := v.Parent().pkg()
-	return fmt.Sprintf("%s %s (%s)", op, relType(deref(v.Type()), from), v.Comment)
-}
-
-func (v *Phi) String() string {
-	var b bytes.Buffer
-	b.WriteString("phi [")
-	for i, edge := range v.Edges {
-		if i > 0 {
-			b.WriteString(", ")
-		}
-		// Be robust against malformed CFG.
-		if v.block == nil {
-			b.WriteString("??")
-			continue
-		}
-		block := -1
-		if i < len(v.block.Preds) {
-			block = v.block.Preds[i].Index
-		}
-		fmt.Fprintf(&b, "%d: ", block)
-		edgeVal := "<nil>" // be robust
-		if edge != nil {
-			edgeVal = relName(edge, v)
-		}
-		b.WriteString(edgeVal)
-	}
-	b.WriteString("]")
-	if v.Comment != "" {
-		b.WriteString(" #")
-		b.WriteString(v.Comment)
-	}
-	return b.String()
-}
-
-func printCall(v *CallCommon, prefix string, instr Instruction) string {
-	var b bytes.Buffer
-	b.WriteString(prefix)
-	if !v.IsInvoke() {
-		b.WriteString(relName(v.Value, instr))
-	} else {
-		fmt.Fprintf(&b, "invoke %s.%s", relName(v.Value, instr), v.Method.Name())
-	}
-	b.WriteString("(")
-	for i, arg := range v.Args {
-		if i > 0 {
-			b.WriteString(", ")
-		}
-		b.WriteString(relName(arg, instr))
-	}
-	if v.Signature().Variadic() {
-		b.WriteString("...")
-	}
-	b.WriteString(")")
-	return b.String()
-}
-
-func (c *CallCommon) String() string {
-	return printCall(c, "", nil)
-}
-
-func (v *Call) String() string {
-	return printCall(&v.Call, "", v)
-}
-
-func (v *BinOp) String() string {
-	return fmt.Sprintf("%s %s %s", relName(v.X, v), v.Op.String(), relName(v.Y, v))
-}
-
-func (v *UnOp) String() string {
-	return fmt.Sprintf("%s%s%s", v.Op, relName(v.X, v), commaOk(v.CommaOk))
-}
-
-func printConv(prefix string, v, x Value) string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("%s %s <- %s (%s)",
-		prefix,
-		relType(v.Type(), from),
-		relType(x.Type(), from),
-		relName(x, v.(Instruction)))
-}
-
-func (v *ChangeType) String() string      { return printConv("changetype", v, v.X) }
-func (v *Convert) String() string         { return printConv("convert", v, v.X) }
-func (v *ChangeInterface) String() string { return printConv("change interface", v, v.X) }
-func (v *MakeInterface) String() string   { return printConv("make", v, v.X) }
-
-func (v *MakeClosure) String() string {
-	var b bytes.Buffer
-	fmt.Fprintf(&b, "make closure %s", relName(v.Fn, v))
-	if v.Bindings != nil {
-		b.WriteString(" [")
-		for i, c := range v.Bindings {
-			if i > 0 {
-				b.WriteString(", ")
-			}
-			b.WriteString(relName(c, v))
-		}
-		b.WriteString("]")
-	}
-	return b.String()
-}
-
-func (v *MakeSlice) String() string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("make %s %s %s",
-		relType(v.Type(), from),
-		relName(v.Len, v),
-		relName(v.Cap, v))
-}
-
-func (v *Slice) String() string {
-	var b bytes.Buffer
-	b.WriteString("slice ")
-	b.WriteString(relName(v.X, v))
-	b.WriteString("[")
-	if v.Low != nil {
-		b.WriteString(relName(v.Low, v))
-	}
-	b.WriteString(":")
-	if v.High != nil {
-		b.WriteString(relName(v.High, v))
-	}
-	if v.Max != nil {
-		b.WriteString(":")
-		b.WriteString(relName(v.Max, v))
-	}
-	b.WriteString("]")
-	return b.String()
-}
-
-func (v *MakeMap) String() string {
-	res := ""
-	if v.Reserve != nil {
-		res = relName(v.Reserve, v)
-	}
-	from := v.Parent().pkg()
-	return fmt.Sprintf("make %s %s", relType(v.Type(), from), res)
-}
-
-func (v *MakeChan) String() string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("make %s %s", relType(v.Type(), from), relName(v.Size, v))
-}
-
-func (v *FieldAddr) String() string {
-	st := deref(v.X.Type()).Underlying().(*types.Struct)
-	// Be robust against a bad index.
-	name := "?"
-	if 0 <= v.Field && v.Field < st.NumFields() {
-		name = st.Field(v.Field).Name()
-	}
-	return fmt.Sprintf("&%s.%s [#%d]", relName(v.X, v), name, v.Field)
-}
-
-func (v *Field) String() string {
-	st := v.X.Type().Underlying().(*types.Struct)
-	// Be robust against a bad index.
-	name := "?"
-	if 0 <= v.Field && v.Field < st.NumFields() {
-		name = st.Field(v.Field).Name()
-	}
-	return fmt.Sprintf("%s.%s [#%d]", relName(v.X, v), name, v.Field)
-}
-
-func (v *IndexAddr) String() string {
-	return fmt.Sprintf("&%s[%s]", relName(v.X, v), relName(v.Index, v))
-}
-
-func (v *Index) String() string {
-	return fmt.Sprintf("%s[%s]", relName(v.X, v), relName(v.Index, v))
-}
-
-func (v *Lookup) String() string {
-	return fmt.Sprintf("%s[%s]%s", relName(v.X, v), relName(v.Index, v), commaOk(v.CommaOk))
-}
-
-func (v *Range) String() string {
-	return "range " + relName(v.X, v)
-}
-
-func (v *Next) String() string {
-	return "next " + relName(v.Iter, v)
-}
-
-func (v *TypeAssert) String() string {
-	from := v.Parent().pkg()
-	return fmt.Sprintf("typeassert%s %s.(%s)", commaOk(v.CommaOk), relName(v.X, v), relType(v.AssertedType, from))
-}
-
-func (v *Extract) String() string {
-	return fmt.Sprintf("extract %s #%d", relName(v.Tuple, v), v.Index)
-}
-
-func (s *Jump) String() string {
-	// Be robust against malformed CFG.
-	block := -1
-	if s.block != nil && len(s.block.Succs) == 1 {
-		block = s.block.Succs[0].Index
-	}
-	return fmt.Sprintf("jump %d", block)
-}
-
-func (s *If) String() string {
-	// Be robust against malformed CFG.
-	tblock, fblock := -1, -1
-	if s.block != nil && len(s.block.Succs) == 2 {
-		tblock = s.block.Succs[0].Index
-		fblock = s.block.Succs[1].Index
-	}
-	return fmt.Sprintf("if %s goto %d else %d", relName(s.Cond, s), tblock, fblock)
-}
-
-func (s *Go) String() string {
-	return printCall(&s.Call, "go ", s)
-}
-
-func (s *Panic) String() string {
-	return "panic " + relName(s.X, s)
-}
-
-func (s *Return) String() string {
-	var b bytes.Buffer
-	b.WriteString("return")
-	for i, r := range s.Results {
-		if i == 0 {
-			b.WriteString(" ")
-		} else {
-			b.WriteString(", ")
-		}
-		b.WriteString(relName(r, s))
-	}
-	return b.String()
-}
-
-func (*RunDefers) String() string {
-	return "rundefers"
-}
-
-func (s *Send) String() string {
-	return fmt.Sprintf("send %s <- %s", relName(s.Chan, s), relName(s.X, s))
-}
-
-func (s *Defer) String() string {
-	return printCall(&s.Call, "defer ", s)
-}
-
-func (s *Select) String() string {
-	var b bytes.Buffer
-	for i, st := range s.States {
-		if i > 0 {
-			b.WriteString(", ")
-		}
-		if st.Dir == types.RecvOnly {
-			b.WriteString("<-")
-			b.WriteString(relName(st.Chan, s))
-		} else {
-			b.WriteString(relName(st.Chan, s))
-			b.WriteString("<-")
-			b.WriteString(relName(st.Send, s))
-		}
-	}
-	non := ""
-	if !s.Blocking {
-		non = "non"
-	}
-	return fmt.Sprintf("select %sblocking [%s]", non, b.String())
-}
-
-func (s *Store) String() string {
-	return fmt.Sprintf("*%s = %s", relName(s.Addr, s), relName(s.Val, s))
-}
-
-func (s *MapUpdate) String() string {
-	return fmt.Sprintf("%s[%s] = %s", relName(s.Map, s), relName(s.Key, s), relName(s.Value, s))
-}
-
-func (s *DebugRef) String() string {
-	p := s.Parent().Prog.Fset.Position(s.Pos())
-	var descr interface{}
-	if s.object != nil {
-		descr = s.object // e.g. "var x int"
-	} else {
-		descr = reflect.TypeOf(s.Expr) // e.g. "*ast.CallExpr"
-	}
-	var addr string
-	if s.IsAddr {
-		addr = "address of "
-	}
-	return fmt.Sprintf("; %s%s @ %d:%d is %s", addr, descr, p.Line, p.Column, s.X.Name())
-}
-
-func (p *Package) String() string {
-	return "package " + p.Pkg.Path()
-}
-
-var _ io.WriterTo = (*Package)(nil) // *Package implements io.Writer
-
-func (p *Package) WriteTo(w io.Writer) (int64, error) {
-	var buf bytes.Buffer
-	WritePackage(&buf, p)
-	n, err := w.Write(buf.Bytes())
-	return int64(n), err
-}
-
-// WritePackage writes to buf a human-readable summary of p.
-func WritePackage(buf *bytes.Buffer, p *Package) {
-	fmt.Fprintf(buf, "%s:\n", p)
-
-	var names []string
-	maxname := 0
-	for name := range p.Members {
-		if l := len(name); l > maxname {
-			maxname = l
-		}
-		names = append(names, name)
-	}
-
-	from := p.Pkg
-	sort.Strings(names)
-	for _, name := range names {
-		switch mem := p.Members[name].(type) {
-		case *NamedConst:
-			fmt.Fprintf(buf, "  const %-*s %s = %s\n",
-				maxname, name, mem.Name(), mem.Value.RelString(from))
-
-		case *Function:
-			fmt.Fprintf(buf, "  func  %-*s %s\n",
-				maxname, name, relType(mem.Type(), from))
-
-		case *Type:
-			fmt.Fprintf(buf, "  type  %-*s %s\n",
-				maxname, name, relType(mem.Type().Underlying(), from))
-			for _, meth := range typeutil.IntuitiveMethodSet(mem.Type(), &p.Prog.MethodSets) {
-				fmt.Fprintf(buf, "    %s\n", types.SelectionString(meth, types.RelativeTo(from)))
-			}
-
-		case *Global:
-			fmt.Fprintf(buf, "  var   %-*s %s\n",
-				maxname, name, relType(mem.Type().(*types.Pointer).Elem(), from))
-		}
-	}
-
-	fmt.Fprintf(buf, "\n")
-}
-
-func commaOk(x bool) string {
-	if x {
-		return ",ok"
-	}
-	return ""
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/sanity.go b/installer/vendor/golang.org/x/tools/go/ssa/sanity.go
deleted file mode 100644
index b15ad9fb1e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/sanity.go
+++ /dev/null
@@ -1,521 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// An optional pass for sanity-checking invariants of the SSA representation.
-// Currently it checks CFG invariants but little at the instruction level.
-
-import (
-	"fmt"
-	"go/types"
-	"io"
-	"os"
-	"strings"
-)
-
-type sanity struct {
-	reporter io.Writer
-	fn       *Function
-	block    *BasicBlock
-	instrs   map[Instruction]struct{}
-	insane   bool
-}
-
-// sanityCheck performs integrity checking of the SSA representation
-// of the function fn and returns true if it was valid.  Diagnostics
-// are written to reporter if non-nil, os.Stderr otherwise.  Some
-// diagnostics are only warnings and do not imply a negative result.
-//
-// Sanity-checking is intended to facilitate the debugging of code
-// transformation passes.
-//
-func sanityCheck(fn *Function, reporter io.Writer) bool {
-	if reporter == nil {
-		reporter = os.Stderr
-	}
-	return (&sanity{reporter: reporter}).checkFunction(fn)
-}
-
-// mustSanityCheck is like sanityCheck but panics instead of returning
-// a negative result.
-//
-func mustSanityCheck(fn *Function, reporter io.Writer) {
-	if !sanityCheck(fn, reporter) {
-		fn.WriteTo(os.Stderr)
-		panic("SanityCheck failed")
-	}
-}
-
-func (s *sanity) diagnostic(prefix, format string, args ...interface{}) {
-	fmt.Fprintf(s.reporter, "%s: function %s", prefix, s.fn)
-	if s.block != nil {
-		fmt.Fprintf(s.reporter, ", block %s", s.block)
-	}
-	io.WriteString(s.reporter, ": ")
-	fmt.Fprintf(s.reporter, format, args...)
-	io.WriteString(s.reporter, "\n")
-}
-
-func (s *sanity) errorf(format string, args ...interface{}) {
-	s.insane = true
-	s.diagnostic("Error", format, args...)
-}
-
-func (s *sanity) warnf(format string, args ...interface{}) {
-	s.diagnostic("Warning", format, args...)
-}
-
-// findDuplicate returns an arbitrary basic block that appeared more
-// than once in blocks, or nil if all were unique.
-func findDuplicate(blocks []*BasicBlock) *BasicBlock {
-	if len(blocks) < 2 {
-		return nil
-	}
-	if blocks[0] == blocks[1] {
-		return blocks[0]
-	}
-	// Slow path:
-	m := make(map[*BasicBlock]bool)
-	for _, b := range blocks {
-		if m[b] {
-			return b
-		}
-		m[b] = true
-	}
-	return nil
-}
-
-func (s *sanity) checkInstr(idx int, instr Instruction) {
-	switch instr := instr.(type) {
-	case *If, *Jump, *Return, *Panic:
-		s.errorf("control flow instruction not at end of block")
-	case *Phi:
-		if idx == 0 {
-			// It suffices to apply this check to just the first phi node.
-			if dup := findDuplicate(s.block.Preds); dup != nil {
-				s.errorf("phi node in block with duplicate predecessor %s", dup)
-			}
-		} else {
-			prev := s.block.Instrs[idx-1]
-			if _, ok := prev.(*Phi); !ok {
-				s.errorf("Phi instruction follows a non-Phi: %T", prev)
-			}
-		}
-		if ne, np := len(instr.Edges), len(s.block.Preds); ne != np {
-			s.errorf("phi node has %d edges but %d predecessors", ne, np)
-
-		} else {
-			for i, e := range instr.Edges {
-				if e == nil {
-					s.errorf("phi node '%s' has no value for edge #%d from %s", instr.Comment, i, s.block.Preds[i])
-				}
-			}
-		}
-
-	case *Alloc:
-		if !instr.Heap {
-			found := false
-			for _, l := range s.fn.Locals {
-				if l == instr {
-					found = true
-					break
-				}
-			}
-			if !found {
-				s.errorf("local alloc %s = %s does not appear in Function.Locals", instr.Name(), instr)
-			}
-		}
-
-	case *BinOp:
-	case *Call:
-	case *ChangeInterface:
-	case *ChangeType:
-	case *Convert:
-		if _, ok := instr.X.Type().Underlying().(*types.Basic); !ok {
-			if _, ok := instr.Type().Underlying().(*types.Basic); !ok {
-				s.errorf("convert %s -> %s: at least one type must be basic", instr.X.Type(), instr.Type())
-			}
-		}
-
-	case *Defer:
-	case *Extract:
-	case *Field:
-	case *FieldAddr:
-	case *Go:
-	case *Index:
-	case *IndexAddr:
-	case *Lookup:
-	case *MakeChan:
-	case *MakeClosure:
-		numFree := len(instr.Fn.(*Function).FreeVars)
-		numBind := len(instr.Bindings)
-		if numFree != numBind {
-			s.errorf("MakeClosure has %d Bindings for function %s with %d free vars",
-				numBind, instr.Fn, numFree)
-
-		}
-		if recv := instr.Type().(*types.Signature).Recv(); recv != nil {
-			s.errorf("MakeClosure's type includes receiver %s", recv.Type())
-		}
-
-	case *MakeInterface:
-	case *MakeMap:
-	case *MakeSlice:
-	case *MapUpdate:
-	case *Next:
-	case *Range:
-	case *RunDefers:
-	case *Select:
-	case *Send:
-	case *Slice:
-	case *Store:
-	case *TypeAssert:
-	case *UnOp:
-	case *DebugRef:
-		// TODO(adonovan): implement checks.
-	default:
-		panic(fmt.Sprintf("Unknown instruction type: %T", instr))
-	}
-
-	if call, ok := instr.(CallInstruction); ok {
-		if call.Common().Signature() == nil {
-			s.errorf("nil signature: %s", call)
-		}
-	}
-
-	// Check that value-defining instructions have valid types
-	// and a valid referrer list.
-	if v, ok := instr.(Value); ok {
-		t := v.Type()
-		if t == nil {
-			s.errorf("no type: %s = %s", v.Name(), v)
-		} else if t == tRangeIter {
-			// not a proper type; ignore.
-		} else if b, ok := t.Underlying().(*types.Basic); ok && b.Info()&types.IsUntyped != 0 {
-			s.errorf("instruction has 'untyped' result: %s = %s : %s", v.Name(), v, t)
-		}
-		s.checkReferrerList(v)
-	}
-
-	// Untyped constants are legal as instruction Operands(),
-	// for example:
-	//   _ = "foo"[0]
-	// or:
-	//   if wordsize==64 {...}
-
-	// All other non-Instruction Values can be found via their
-	// enclosing Function or Package.
-}
-
-func (s *sanity) checkFinalInstr(idx int, instr Instruction) {
-	switch instr := instr.(type) {
-	case *If:
-		if nsuccs := len(s.block.Succs); nsuccs != 2 {
-			s.errorf("If-terminated block has %d successors; expected 2", nsuccs)
-			return
-		}
-		if s.block.Succs[0] == s.block.Succs[1] {
-			s.errorf("If-instruction has same True, False target blocks: %s", s.block.Succs[0])
-			return
-		}
-
-	case *Jump:
-		if nsuccs := len(s.block.Succs); nsuccs != 1 {
-			s.errorf("Jump-terminated block has %d successors; expected 1", nsuccs)
-			return
-		}
-
-	case *Return:
-		if nsuccs := len(s.block.Succs); nsuccs != 0 {
-			s.errorf("Return-terminated block has %d successors; expected none", nsuccs)
-			return
-		}
-		if na, nf := len(instr.Results), s.fn.Signature.Results().Len(); nf != na {
-			s.errorf("%d-ary return in %d-ary function", na, nf)
-		}
-
-	case *Panic:
-		if nsuccs := len(s.block.Succs); nsuccs != 0 {
-			s.errorf("Panic-terminated block has %d successors; expected none", nsuccs)
-			return
-		}
-
-	default:
-		s.errorf("non-control flow instruction at end of block")
-	}
-}
-
-func (s *sanity) checkBlock(b *BasicBlock, index int) {
-	s.block = b
-
-	if b.Index != index {
-		s.errorf("block has incorrect Index %d", b.Index)
-	}
-	if b.parent != s.fn {
-		s.errorf("block has incorrect parent %s", b.parent)
-	}
-
-	// Check all blocks are reachable.
-	// (The entry block is always implicitly reachable,
-	// as is the Recover block, if any.)
-	if (index > 0 && b != b.parent.Recover) && len(b.Preds) == 0 {
-		s.warnf("unreachable block")
-		if b.Instrs == nil {
-			// Since this block is about to be pruned,
-			// tolerating transient problems in it
-			// simplifies other optimizations.
-			return
-		}
-	}
-
-	// Check predecessor and successor relations are dual,
-	// and that all blocks in CFG belong to same function.
-	for _, a := range b.Preds {
-		found := false
-		for _, bb := range a.Succs {
-			if bb == b {
-				found = true
-				break
-			}
-		}
-		if !found {
-			s.errorf("expected successor edge in predecessor %s; found only: %s", a, a.Succs)
-		}
-		if a.parent != s.fn {
-			s.errorf("predecessor %s belongs to different function %s", a, a.parent)
-		}
-	}
-	for _, c := range b.Succs {
-		found := false
-		for _, bb := range c.Preds {
-			if bb == b {
-				found = true
-				break
-			}
-		}
-		if !found {
-			s.errorf("expected predecessor edge in successor %s; found only: %s", c, c.Preds)
-		}
-		if c.parent != s.fn {
-			s.errorf("successor %s belongs to different function %s", c, c.parent)
-		}
-	}
-
-	// Check each instruction is sane.
-	n := len(b.Instrs)
-	if n == 0 {
-		s.errorf("basic block contains no instructions")
-	}
-	var rands [10]*Value // reuse storage
-	for j, instr := range b.Instrs {
-		if instr == nil {
-			s.errorf("nil instruction at index %d", j)
-			continue
-		}
-		if b2 := instr.Block(); b2 == nil {
-			s.errorf("nil Block() for instruction at index %d", j)
-			continue
-		} else if b2 != b {
-			s.errorf("wrong Block() (%s) for instruction at index %d ", b2, j)
-			continue
-		}
-		if j < n-1 {
-			s.checkInstr(j, instr)
-		} else {
-			s.checkFinalInstr(j, instr)
-		}
-
-		// Check Instruction.Operands.
-	operands:
-		for i, op := range instr.Operands(rands[:0]) {
-			if op == nil {
-				s.errorf("nil operand pointer %d of %s", i, instr)
-				continue
-			}
-			val := *op
-			if val == nil {
-				continue // a nil operand is ok
-			}
-
-			// Check that "untyped" types only appear on constant operands.
-			if _, ok := (*op).(*Const); !ok {
-				if basic, ok := (*op).Type().(*types.Basic); ok {
-					if basic.Info()&types.IsUntyped != 0 {
-						s.errorf("operand #%d of %s is untyped: %s", i, instr, basic)
-					}
-				}
-			}
-
-			// Check that Operands that are also Instructions belong to same function.
-			// TODO(adonovan): also check their block dominates block b.
-			if val, ok := val.(Instruction); ok {
-				if val.Block() == nil {
-					s.errorf("operand %d of %s is an instruction (%s) that belongs to no block", i, instr, val)
-				} else if val.Parent() != s.fn {
-					s.errorf("operand %d of %s is an instruction (%s) from function %s", i, instr, val, val.Parent())
-				}
-			}
-
-			// Check that each function-local operand of
-			// instr refers back to instr.  (NB: quadratic)
-			switch val := val.(type) {
-			case *Const, *Global, *Builtin:
-				continue // not local
-			case *Function:
-				if val.parent == nil {
-					continue // only anon functions are local
-				}
-			}
-
-			// TODO(adonovan): check val.Parent() != nil <=> val.Referrers() is defined.
-
-			if refs := val.Referrers(); refs != nil {
-				for _, ref := range *refs {
-					if ref == instr {
-						continue operands
-					}
-				}
-				s.errorf("operand %d of %s (%s) does not refer to us", i, instr, val)
-			} else {
-				s.errorf("operand %d of %s (%s) has no referrers", i, instr, val)
-			}
-		}
-	}
-}
-
-func (s *sanity) checkReferrerList(v Value) {
-	refs := v.Referrers()
-	if refs == nil {
-		s.errorf("%s has missing referrer list", v.Name())
-		return
-	}
-	for i, ref := range *refs {
-		if _, ok := s.instrs[ref]; !ok {
-			s.errorf("%s.Referrers()[%d] = %s is not an instruction belonging to this function", v.Name(), i, ref)
-		}
-	}
-}
-
-func (s *sanity) checkFunction(fn *Function) bool {
-	// TODO(adonovan): check Function invariants:
-	// - check params match signature
-	// - check transient fields are nil
-	// - warn if any fn.Locals do not appear among block instructions.
-	s.fn = fn
-	if fn.Prog == nil {
-		s.errorf("nil Prog")
-	}
-
-	fn.String()            // must not crash
-	fn.RelString(fn.pkg()) // must not crash
-
-	// All functions have a package, except delegates (which are
-	// shared across packages, or duplicated as weak symbols in a
-	// separate-compilation model), and error.Error.
-	if fn.Pkg == nil {
-		if strings.HasPrefix(fn.Synthetic, "wrapper ") ||
-			strings.HasPrefix(fn.Synthetic, "bound ") ||
-			strings.HasPrefix(fn.Synthetic, "thunk ") ||
-			strings.HasSuffix(fn.name, "Error") {
-			// ok
-		} else {
-			s.errorf("nil Pkg")
-		}
-	}
-	if src, syn := fn.Synthetic == "", fn.Syntax() != nil; src != syn {
-		s.errorf("got fromSource=%t, hasSyntax=%t; want same values", src, syn)
-	}
-	for i, l := range fn.Locals {
-		if l.Parent() != fn {
-			s.errorf("Local %s at index %d has wrong parent", l.Name(), i)
-		}
-		if l.Heap {
-			s.errorf("Local %s at index %d has Heap flag set", l.Name(), i)
-		}
-	}
-	// Build the set of valid referrers.
-	s.instrs = make(map[Instruction]struct{})
-	for _, b := range fn.Blocks {
-		for _, instr := range b.Instrs {
-			s.instrs[instr] = struct{}{}
-		}
-	}
-	for i, p := range fn.Params {
-		if p.Parent() != fn {
-			s.errorf("Param %s at index %d has wrong parent", p.Name(), i)
-		}
-		s.checkReferrerList(p)
-	}
-	for i, fv := range fn.FreeVars {
-		if fv.Parent() != fn {
-			s.errorf("FreeVar %s at index %d has wrong parent", fv.Name(), i)
-		}
-		s.checkReferrerList(fv)
-	}
-
-	if fn.Blocks != nil && len(fn.Blocks) == 0 {
-		// Function _had_ blocks (so it's not external) but
-		// they were "optimized" away, even the entry block.
-		s.errorf("Blocks slice is non-nil but empty")
-	}
-	for i, b := range fn.Blocks {
-		if b == nil {
-			s.warnf("nil *BasicBlock at f.Blocks[%d]", i)
-			continue
-		}
-		s.checkBlock(b, i)
-	}
-	if fn.Recover != nil && fn.Blocks[fn.Recover.Index] != fn.Recover {
-		s.errorf("Recover block is not in Blocks slice")
-	}
-
-	s.block = nil
-	for i, anon := range fn.AnonFuncs {
-		if anon.Parent() != fn {
-			s.errorf("AnonFuncs[%d]=%s but %s.Parent()=%s", i, anon, anon, anon.Parent())
-		}
-	}
-	s.fn = nil
-	return !s.insane
-}
-
-// sanityCheckPackage checks invariants of packages upon creation.
-// It does not require that the package is built.
-// Unlike sanityCheck (for functions), it just panics at the first error.
-func sanityCheckPackage(pkg *Package) {
-	if pkg.Pkg == nil {
-		panic(fmt.Sprintf("Package %s has no Object", pkg))
-	}
-	pkg.String() // must not crash
-
-	for name, mem := range pkg.Members {
-		if name != mem.Name() {
-			panic(fmt.Sprintf("%s: %T.Name() = %s, want %s",
-				pkg.Pkg.Path(), mem, mem.Name(), name))
-		}
-		obj := mem.Object()
-		if obj == nil {
-			// This check is sound because fields
-			// {Global,Function}.object have type
-			// types.Object.  (If they were declared as
-			// *types.{Var,Func}, we'd have a non-empty
-			// interface containing a nil pointer.)
-
-			continue // not all members have typechecker objects
-		}
-		if obj.Name() != name {
-			if obj.Name() == "init" && strings.HasPrefix(mem.Name(), "init#") {
-				// Ok.  The name of a declared init function varies between
-				// its types.Func ("init") and its ssa.Function ("init#%d").
-			} else {
-				panic(fmt.Sprintf("%s: %T.Object().Name() = %s, want %s",
-					pkg.Pkg.Path(), mem, obj.Name(), name))
-			}
-		}
-		if obj.Pos() != mem.Pos() {
-			panic(fmt.Sprintf("%s Pos=%d obj.Pos=%d", mem, mem.Pos(), obj.Pos()))
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/source.go b/installer/vendor/golang.org/x/tools/go/ssa/source.go
deleted file mode 100644
index 6d2223edaa..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/source.go
+++ /dev/null
@@ -1,293 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines utilities for working with source positions
-// or source-level named entities ("objects").
-
-// TODO(adonovan): test that {Value,Instruction}.Pos() positions match
-// the originating syntax, as specified.
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-)
-
-// EnclosingFunction returns the function that contains the syntax
-// node denoted by path.
-//
-// Syntax associated with package-level variable specifications is
-// enclosed by the package's init() function.
-//
-// Returns nil if not found; reasons might include:
-//    - the node is not enclosed by any function.
-//    - the node is within an anonymous function (FuncLit) and
-//      its SSA function has not been created yet
-//      (pkg.Build() has not yet been called).
-//
-func EnclosingFunction(pkg *Package, path []ast.Node) *Function {
-	// Start with package-level function...
-	fn := findEnclosingPackageLevelFunction(pkg, path)
-	if fn == nil {
-		return nil // not in any function
-	}
-
-	// ...then walk down the nested anonymous functions.
-	n := len(path)
-outer:
-	for i := range path {
-		if lit, ok := path[n-1-i].(*ast.FuncLit); ok {
-			for _, anon := range fn.AnonFuncs {
-				if anon.Pos() == lit.Type.Func {
-					fn = anon
-					continue outer
-				}
-			}
-			// SSA function not found:
-			// - package not yet built, or maybe
-			// - builder skipped FuncLit in dead block
-			//   (in principle; but currently the Builder
-			//   generates even dead FuncLits).
-			return nil
-		}
-	}
-	return fn
-}
-
-// HasEnclosingFunction returns true if the AST node denoted by path
-// is contained within the declaration of some function or
-// package-level variable.
-//
-// Unlike EnclosingFunction, the behaviour of this function does not
-// depend on whether SSA code for pkg has been built, so it can be
-// used to quickly reject check inputs that will cause
-// EnclosingFunction to fail, prior to SSA building.
-//
-func HasEnclosingFunction(pkg *Package, path []ast.Node) bool {
-	return findEnclosingPackageLevelFunction(pkg, path) != nil
-}
-
-// findEnclosingPackageLevelFunction returns the Function
-// corresponding to the package-level function enclosing path.
-//
-func findEnclosingPackageLevelFunction(pkg *Package, path []ast.Node) *Function {
-	if n := len(path); n >= 2 { // [... {Gen,Func}Decl File]
-		switch decl := path[n-2].(type) {
-		case *ast.GenDecl:
-			if decl.Tok == token.VAR && n >= 3 {
-				// Package-level 'var' initializer.
-				return pkg.init
-			}
-
-		case *ast.FuncDecl:
-			if decl.Recv == nil && decl.Name.Name == "init" {
-				// Explicit init() function.
-				for _, b := range pkg.init.Blocks {
-					for _, instr := range b.Instrs {
-						if instr, ok := instr.(*Call); ok {
-							if callee, ok := instr.Call.Value.(*Function); ok && callee.Pkg == pkg && callee.Pos() == decl.Name.NamePos {
-								return callee
-							}
-						}
-					}
-				}
-				// Hack: return non-nil when SSA is not yet
-				// built so that HasEnclosingFunction works.
-				return pkg.init
-			}
-			// Declared function/method.
-			return findNamedFunc(pkg, decl.Name.NamePos)
-		}
-	}
-	return nil // not in any function
-}
-
-// findNamedFunc returns the named function whose FuncDecl.Ident is at
-// position pos.
-//
-func findNamedFunc(pkg *Package, pos token.Pos) *Function {
-	// Look at all package members and method sets of named types.
-	// Not very efficient.
-	for _, mem := range pkg.Members {
-		switch mem := mem.(type) {
-		case *Function:
-			if mem.Pos() == pos {
-				return mem
-			}
-		case *Type:
-			mset := pkg.Prog.MethodSets.MethodSet(types.NewPointer(mem.Type()))
-			for i, n := 0, mset.Len(); i < n; i++ {
-				// Don't call Program.Method: avoid creating wrappers.
-				obj := mset.At(i).Obj().(*types.Func)
-				if obj.Pos() == pos {
-					return pkg.values[obj].(*Function)
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// ValueForExpr returns the SSA Value that corresponds to non-constant
-// expression e.
-//
-// It returns nil if no value was found, e.g.
-//    - the expression is not lexically contained within f;
-//    - f was not built with debug information; or
-//    - e is a constant expression.  (For efficiency, no debug
-//      information is stored for constants. Use
-//      go/types.Info.Types[e].Value instead.)
-//    - e is a reference to nil or a built-in function.
-//    - the value was optimised away.
-//
-// If e is an addressable expression used in an lvalue context,
-// value is the address denoted by e, and isAddr is true.
-//
-// The types of e (or &e, if isAddr) and the result are equal
-// (modulo "untyped" bools resulting from comparisons).
-//
-// (Tip: to find the ssa.Value given a source position, use
-// importer.PathEnclosingInterval to locate the ast.Node, then
-// EnclosingFunction to locate the Function, then ValueForExpr to find
-// the ssa.Value.)
-//
-func (f *Function) ValueForExpr(e ast.Expr) (value Value, isAddr bool) {
-	if f.debugInfo() { // (opt)
-		e = unparen(e)
-		for _, b := range f.Blocks {
-			for _, instr := range b.Instrs {
-				if ref, ok := instr.(*DebugRef); ok {
-					if ref.Expr == e {
-						return ref.X, ref.IsAddr
-					}
-				}
-			}
-		}
-	}
-	return
-}
-
-// --- Lookup functions for source-level named entities (types.Objects) ---
-
-// Package returns the SSA Package corresponding to the specified
-// type-checker package object.
-// It returns nil if no such SSA package has been created.
-//
-func (prog *Program) Package(obj *types.Package) *Package {
-	return prog.packages[obj]
-}
-
-// packageLevelValue returns the package-level value corresponding to
-// the specified named object, which may be a package-level const
-// (*Const), var (*Global) or func (*Function) of some package in
-// prog.  It returns nil if the object is not found.
-//
-func (prog *Program) packageLevelValue(obj types.Object) Value {
-	if pkg, ok := prog.packages[obj.Pkg()]; ok {
-		return pkg.values[obj]
-	}
-	return nil
-}
-
-// FuncValue returns the concrete Function denoted by the source-level
-// named function obj, or nil if obj denotes an interface method.
-//
-// TODO(adonovan): check the invariant that obj.Type() matches the
-// result's Signature, both in the params/results and in the receiver.
-//
-func (prog *Program) FuncValue(obj *types.Func) *Function {
-	fn, _ := prog.packageLevelValue(obj).(*Function)
-	return fn
-}
-
-// ConstValue returns the SSA Value denoted by the source-level named
-// constant obj.
-//
-func (prog *Program) ConstValue(obj *types.Const) *Const {
-	// TODO(adonovan): opt: share (don't reallocate)
-	// Consts for const objects and constant ast.Exprs.
-
-	// Universal constant? {true,false,nil}
-	if obj.Parent() == types.Universe {
-		return NewConst(obj.Val(), obj.Type())
-	}
-	// Package-level named constant?
-	if v := prog.packageLevelValue(obj); v != nil {
-		return v.(*Const)
-	}
-	return NewConst(obj.Val(), obj.Type())
-}
-
-// VarValue returns the SSA Value that corresponds to a specific
-// identifier denoting the source-level named variable obj.
-//
-// VarValue returns nil if a local variable was not found, perhaps
-// because its package was not built, the debug information was not
-// requested during SSA construction, or the value was optimized away.
-//
-// ref is the path to an ast.Ident (e.g. from PathEnclosingInterval),
-// and that ident must resolve to obj.
-//
-// pkg is the package enclosing the reference.  (A reference to a var
-// always occurs within a function, so we need to know where to find it.)
-//
-// If the identifier is a field selector and its base expression is
-// non-addressable, then VarValue returns the value of that field.
-// For example:
-//    func f() struct {x int}
-//    f().x  // VarValue(x) returns a *Field instruction of type int
-//
-// All other identifiers denote addressable locations (variables).
-// For them, VarValue may return either the variable's address or its
-// value, even when the expression is evaluated only for its value; the
-// situation is reported by isAddr, the second component of the result.
-//
-// If !isAddr, the returned value is the one associated with the
-// specific identifier.  For example,
-//       var x int    // VarValue(x) returns Const 0 here
-//       x = 1        // VarValue(x) returns Const 1 here
-//
-// It is not specified whether the value or the address is returned in
-// any particular case, as it may depend upon optimizations performed
-// during SSA code generation, such as registerization, constant
-// folding, avoidance of materialization of subexpressions, etc.
-//
-func (prog *Program) VarValue(obj *types.Var, pkg *Package, ref []ast.Node) (value Value, isAddr bool) {
-	// All references to a var are local to some function, possibly init.
-	fn := EnclosingFunction(pkg, ref)
-	if fn == nil {
-		return // e.g. def of struct field; SSA not built?
-	}
-
-	id := ref[0].(*ast.Ident)
-
-	// Defining ident of a parameter?
-	if id.Pos() == obj.Pos() {
-		for _, param := range fn.Params {
-			if param.Object() == obj {
-				return param, false
-			}
-		}
-	}
-
-	// Other ident?
-	for _, b := range fn.Blocks {
-		for _, instr := range b.Instrs {
-			if dr, ok := instr.(*DebugRef); ok {
-				if dr.Pos() == id.Pos() {
-					return dr.X, dr.IsAddr
-				}
-			}
-		}
-	}
-
-	// Defining ident of package-level var?
-	if v := prog.packageLevelValue(obj); v != nil {
-		return v.(*Global), true
-	}
-
-	return // e.g. debug info not requested, or var optimized away
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/source_test.go b/installer/vendor/golang.org/x/tools/go/ssa/source_test.go
deleted file mode 100644
index 43051f80e2..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/source_test.go
+++ /dev/null
@@ -1,397 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa_test
-
-// This file defines tests of source-level debugging utilities.
-
-import (
-	"fmt"
-	"go/ast"
-	exact "go/constant"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-	"regexp"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-func TestObjValueLookup(t *testing.T) {
-	if runtime.GOOS == "android" {
-		t.Skipf("no testdata directory on %s", runtime.GOOS)
-	}
-
-	conf := loader.Config{ParserMode: parser.ParseComments}
-	f, err := conf.ParseFile("testdata/objlookup.go", nil)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	conf.CreateFromFiles("main", f)
-
-	// Maps each var Ident (represented "name:linenum") to the
-	// kind of ssa.Value we expect (represented "Constant", "&Alloc").
-	expectations := make(map[string]string)
-
-	// Find all annotations of form x::BinOp, &y::Alloc, etc.
-	re := regexp.MustCompile(`(\b|&)?(\w*)::(\w*)\b`)
-	for _, c := range f.Comments {
-		text := c.Text()
-		pos := conf.Fset.Position(c.Pos())
-		for _, m := range re.FindAllStringSubmatch(text, -1) {
-			key := fmt.Sprintf("%s:%d", m[2], pos.Line)
-			value := m[1] + m[3]
-			expectations[key] = value
-		}
-	}
-
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	prog := ssautil.CreateProgram(iprog, 0 /*|ssa.PrintFunctions*/)
-	mainInfo := iprog.Created[0]
-	mainPkg := prog.Package(mainInfo.Pkg)
-	mainPkg.SetDebugMode(true)
-	mainPkg.Build()
-
-	var varIds []*ast.Ident
-	var varObjs []*types.Var
-	for id, obj := range mainInfo.Defs {
-		// Check invariants for func and const objects.
-		switch obj := obj.(type) {
-		case *types.Func:
-			checkFuncValue(t, prog, obj)
-
-		case *types.Const:
-			checkConstValue(t, prog, obj)
-
-		case *types.Var:
-			if id.Name == "_" {
-				continue
-			}
-			varIds = append(varIds, id)
-			varObjs = append(varObjs, obj)
-		}
-	}
-	for id, obj := range mainInfo.Uses {
-		if obj, ok := obj.(*types.Var); ok {
-			varIds = append(varIds, id)
-			varObjs = append(varObjs, obj)
-		}
-	}
-
-	// Check invariants for var objects.
-	// The result varies based on the specific Ident.
-	for i, id := range varIds {
-		obj := varObjs[i]
-		ref, _ := astutil.PathEnclosingInterval(f, id.Pos(), id.Pos())
-		pos := prog.Fset.Position(id.Pos())
-		exp := expectations[fmt.Sprintf("%s:%d", id.Name, pos.Line)]
-		if exp == "" {
-			t.Errorf("%s: no expectation for var ident %s ", pos, id.Name)
-			continue
-		}
-		wantAddr := false
-		if exp[0] == '&' {
-			wantAddr = true
-			exp = exp[1:]
-		}
-		checkVarValue(t, prog, mainPkg, ref, obj, exp, wantAddr)
-	}
-}
-
-func checkFuncValue(t *testing.T, prog *ssa.Program, obj *types.Func) {
-	fn := prog.FuncValue(obj)
-	// fmt.Printf("FuncValue(%s) = %s\n", obj, fn) // debugging
-	if fn == nil {
-		if obj.Name() != "interfaceMethod" {
-			t.Errorf("FuncValue(%s) == nil", obj)
-		}
-		return
-	}
-	if fnobj := fn.Object(); fnobj != obj {
-		t.Errorf("FuncValue(%s).Object() == %s; value was %s",
-			obj, fnobj, fn.Name())
-		return
-	}
-	if !types.Identical(fn.Type(), obj.Type()) {
-		t.Errorf("FuncValue(%s).Type() == %s", obj, fn.Type())
-		return
-	}
-}
-
-func checkConstValue(t *testing.T, prog *ssa.Program, obj *types.Const) {
-	c := prog.ConstValue(obj)
-	// fmt.Printf("ConstValue(%s) = %s\n", obj, c) // debugging
-	if c == nil {
-		t.Errorf("ConstValue(%s) == nil", obj)
-		return
-	}
-	if !types.Identical(c.Type(), obj.Type()) {
-		t.Errorf("ConstValue(%s).Type() == %s", obj, c.Type())
-		return
-	}
-	if obj.Name() != "nil" {
-		if !exact.Compare(c.Value, token.EQL, obj.Val()) {
-			t.Errorf("ConstValue(%s).Value (%s) != %s",
-				obj, c.Value, obj.Val())
-			return
-		}
-	}
-}
-
-func checkVarValue(t *testing.T, prog *ssa.Program, pkg *ssa.Package, ref []ast.Node, obj *types.Var, expKind string, wantAddr bool) {
-	// The prefix of all assertions messages.
-	prefix := fmt.Sprintf("VarValue(%s @ L%d)",
-		obj, prog.Fset.Position(ref[0].Pos()).Line)
-
-	v, gotAddr := prog.VarValue(obj, pkg, ref)
-
-	// Kind is the concrete type of the ssa Value.
-	gotKind := "nil"
-	if v != nil {
-		gotKind = fmt.Sprintf("%T", v)[len("*ssa."):]
-	}
-
-	// fmt.Printf("%s = %v (kind %q; expect %q) wantAddr=%t gotAddr=%t\n", prefix, v, gotKind, expKind, wantAddr, gotAddr) // debugging
-
-	// Check the kinds match.
-	// "nil" indicates expected failure (e.g. optimized away).
-	if expKind != gotKind {
-		t.Errorf("%s concrete type == %s, want %s", prefix, gotKind, expKind)
-	}
-
-	// Check the types match.
-	// If wantAddr, the expected type is the object's address.
-	if v != nil {
-		expType := obj.Type()
-		if wantAddr {
-			expType = types.NewPointer(expType)
-			if !gotAddr {
-				t.Errorf("%s: got value, want address", prefix)
-			}
-		} else if gotAddr {
-			t.Errorf("%s: got address, want value", prefix)
-		}
-		if !types.Identical(v.Type(), expType) {
-			t.Errorf("%s.Type() == %s, want %s", prefix, v.Type(), expType)
-		}
-	}
-}
-
-// Ensure that, in debug mode, we can determine the ssa.Value
-// corresponding to every ast.Expr.
-func TestValueForExpr(t *testing.T) {
-	testValueForExpr(t, "testdata/valueforexpr.go")
-}
-
-func testValueForExpr(t *testing.T, testfile string) {
-	if runtime.GOOS == "android" {
-		t.Skipf("no testdata dir on %s", runtime.GOOS)
-	}
-
-	conf := loader.Config{ParserMode: parser.ParseComments}
-	f, err := conf.ParseFile(testfile, nil)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	conf.CreateFromFiles("main", f)
-
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	mainInfo := iprog.Created[0]
-
-	prog := ssautil.CreateProgram(iprog, 0)
-	mainPkg := prog.Package(mainInfo.Pkg)
-	mainPkg.SetDebugMode(true)
-	mainPkg.Build()
-
-	if false {
-		// debugging
-		for _, mem := range mainPkg.Members {
-			if fn, ok := mem.(*ssa.Function); ok {
-				fn.WriteTo(os.Stderr)
-			}
-		}
-	}
-
-	// Find the actual AST node for each canonical position.
-	parenExprByPos := make(map[token.Pos]*ast.ParenExpr)
-	ast.Inspect(f, func(n ast.Node) bool {
-		if n != nil {
-			if e, ok := n.(*ast.ParenExpr); ok {
-				parenExprByPos[e.Pos()] = e
-			}
-		}
-		return true
-	})
-
-	// Find all annotations of form /*@kind*/.
-	for _, c := range f.Comments {
-		text := strings.TrimSpace(c.Text())
-		if text == "" || text[0] != '@' {
-			continue
-		}
-		text = text[1:]
-		pos := c.End() + 1
-		position := prog.Fset.Position(pos)
-		var e ast.Expr
-		if target := parenExprByPos[pos]; target == nil {
-			t.Errorf("%s: annotation doesn't precede ParenExpr: %q", position, text)
-			continue
-		} else {
-			e = target.X
-		}
-
-		path, _ := astutil.PathEnclosingInterval(f, pos, pos)
-		if path == nil {
-			t.Errorf("%s: can't find AST path from root to comment: %s", position, text)
-			continue
-		}
-
-		fn := ssa.EnclosingFunction(mainPkg, path)
-		if fn == nil {
-			t.Errorf("%s: can't find enclosing function", position)
-			continue
-		}
-
-		v, gotAddr := fn.ValueForExpr(e) // (may be nil)
-		got := strings.TrimPrefix(fmt.Sprintf("%T", v), "*ssa.")
-		if want := text; got != want {
-			t.Errorf("%s: got value %q, want %q", position, got, want)
-		}
-		if v != nil {
-			T := v.Type()
-			if gotAddr {
-				T = T.Underlying().(*types.Pointer).Elem() // deref
-			}
-			if !types.Identical(T, mainInfo.TypeOf(e)) {
-				t.Errorf("%s: got type %s, want %s", position, mainInfo.TypeOf(e), T)
-			}
-		}
-	}
-}
-
-// findInterval parses input and returns the [start, end) positions of
-// the first occurrence of substr in input.  f==nil indicates failure;
-// an error has already been reported in that case.
-//
-func findInterval(t *testing.T, fset *token.FileSet, input, substr string) (f *ast.File, start, end token.Pos) {
-	f, err := parser.ParseFile(fset, "<input>", input, 0)
-	if err != nil {
-		t.Errorf("parse error: %s", err)
-		return
-	}
-
-	i := strings.Index(input, substr)
-	if i < 0 {
-		t.Errorf("%q is not a substring of input", substr)
-		f = nil
-		return
-	}
-
-	filePos := fset.File(f.Package)
-	return f, filePos.Pos(i), filePos.Pos(i + len(substr))
-}
-
-func TestEnclosingFunction(t *testing.T) {
-	tests := []struct {
-		input  string // the input file
-		substr string // first occurrence of this string denotes interval
-		fn     string // name of expected containing function
-	}{
-		// We use distinctive numbers as syntactic landmarks.
-
-		// Ordinary function:
-		{`package main
-		  func f() { println(1003) }`,
-			"100", "main.f"},
-		// Methods:
-		{`package main
-                  type T int
-		  func (t T) f() { println(200) }`,
-			"200", "(main.T).f"},
-		// Function literal:
-		{`package main
-		  func f() { println(func() { print(300) }) }`,
-			"300", "main.f$1"},
-		// Doubly nested
-		{`package main
-		  func f() { println(func() { print(func() { print(350) })})}`,
-			"350", "main.f$1$1"},
-		// Implicit init for package-level var initializer.
-		{"package main; var a = 400", "400", "main.init"},
-		// No code for constants:
-		{"package main; const a = 500", "500", "(none)"},
-		// Explicit init()
-		{"package main; func init() { println(600) }", "600", "main.init#1"},
-		// Multiple explicit init functions:
-		{`package main
-		  func init() { println("foo") }
-		  func init() { println(800) }`,
-			"800", "main.init#2"},
-		// init() containing FuncLit.
-		{`package main
-		  func init() { println(func(){print(900)}) }`,
-			"900", "main.init#1$1"},
-	}
-	for _, test := range tests {
-		conf := loader.Config{Fset: token.NewFileSet()}
-		f, start, end := findInterval(t, conf.Fset, test.input, test.substr)
-		if f == nil {
-			continue
-		}
-		path, exact := astutil.PathEnclosingInterval(f, start, end)
-		if !exact {
-			t.Errorf("EnclosingFunction(%q) not exact", test.substr)
-			continue
-		}
-
-		conf.CreateFromFiles("main", f)
-
-		iprog, err := conf.Load()
-		if err != nil {
-			t.Error(err)
-			continue
-		}
-		prog := ssautil.CreateProgram(iprog, 0)
-		pkg := prog.Package(iprog.Created[0].Pkg)
-		pkg.Build()
-
-		name := "(none)"
-		fn := ssa.EnclosingFunction(pkg, path)
-		if fn != nil {
-			name = fn.String()
-		}
-
-		if name != test.fn {
-			t.Errorf("EnclosingFunction(%q in %q) got %s, want %s",
-				test.substr, test.input, name, test.fn)
-			continue
-		}
-
-		// While we're here: test HasEnclosingFunction.
-		if has := ssa.HasEnclosingFunction(pkg, path); has != (fn != nil) {
-			t.Errorf("HasEnclosingFunction(%q in %q) got %v, want %v",
-				test.substr, test.input, has, fn != nil)
-			continue
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssa.go b/installer/vendor/golang.org/x/tools/go/ssa/ssa.go
deleted file mode 100644
index e8350f1c74..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssa.go
+++ /dev/null
@@ -1,1696 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This package defines a high-level intermediate representation for
-// Go programs using static single-assignment (SSA) form.
-
-import (
-	"fmt"
-	"go/ast"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"sync"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// A Program is a partial or complete Go program converted to SSA form.
-type Program struct {
-	Fset       *token.FileSet              // position information for the files of this Program
-	imported   map[string]*Package         // all importable Packages, keyed by import path
-	packages   map[*types.Package]*Package // all loaded Packages, keyed by object
-	mode       BuilderMode                 // set of mode bits for SSA construction
-	MethodSets typeutil.MethodSetCache     // cache of type-checker's method-sets
-
-	methodsMu    sync.Mutex                 // guards the following maps:
-	methodSets   typeutil.Map               // maps type to its concrete methodSet
-	runtimeTypes typeutil.Map               // types for which rtypes are needed
-	canon        typeutil.Map               // type canonicalization map
-	bounds       map[*types.Func]*Function  // bounds for curried x.Method closures
-	thunks       map[selectionKey]*Function // thunks for T.Method expressions
-}
-
-// A Package is a single analyzed Go package containing Members for
-// all package-level functions, variables, constants and types it
-// declares.  These may be accessed directly via Members, or via the
-// type-specific accessor methods Func, Type, Var and Const.
-//
-// Members also contains entries for "init" (the synthetic package
-// initializer) and "init#%d", the nth declared init function,
-// and unspecified other things too.
-//
-type Package struct {
-	Prog    *Program               // the owning program
-	Pkg     *types.Package         // the corresponding go/types.Package
-	Members map[string]Member      // all package members keyed by name (incl. init and init#%d)
-	values  map[types.Object]Value // package members (incl. types and methods), keyed by object
-	init    *Function              // Func("init"); the package's init function
-	debug   bool                   // include full debug info in this package
-
-	// The following fields are set transiently, then cleared
-	// after building.
-	buildOnce sync.Once   // ensures package building occurs once
-	ninit     int32       // number of init functions
-	info      *types.Info // package type information
-	files     []*ast.File // package ASTs
-}
-
-// A Member is a member of a Go package, implemented by *NamedConst,
-// *Global, *Function, or *Type; they are created by package-level
-// const, var, func and type declarations respectively.
-//
-type Member interface {
-	Name() string                    // declared name of the package member
-	String() string                  // package-qualified name of the package member
-	RelString(*types.Package) string // like String, but relative refs are unqualified
-	Object() types.Object            // typechecker's object for this member, if any
-	Pos() token.Pos                  // position of member's declaration, if known
-	Type() types.Type                // type of the package member
-	Token() token.Token              // token.{VAR,FUNC,CONST,TYPE}
-	Package() *Package               // the containing package
-}
-
-// A Type is a Member of a Package representing a package-level named type.
-type Type struct {
-	object *types.TypeName
-	pkg    *Package
-}
-
-// A NamedConst is a Member of a Package representing a package-level
-// named constant.
-//
-// Pos() returns the position of the declaring ast.ValueSpec.Names[*]
-// identifier.
-//
-// NB: a NamedConst is not a Value; it contains a constant Value, which
-// it augments with the name and position of its 'const' declaration.
-//
-type NamedConst struct {
-	object *types.Const
-	Value  *Const
-	pkg    *Package
-}
-
-// A Value is an SSA value that can be referenced by an instruction.
-type Value interface {
-	// Name returns the name of this value, and determines how
-	// this Value appears when used as an operand of an
-	// Instruction.
-	//
-	// This is the same as the source name for Parameters,
-	// Builtins, Functions, FreeVars, Globals.
-	// For constants, it is a representation of the constant's value
-	// and type.  For all other Values this is the name of the
-	// virtual register defined by the instruction.
-	//
-	// The name of an SSA Value is not semantically significant,
-	// and may not even be unique within a function.
-	Name() string
-
-	// If this value is an Instruction, String returns its
-	// disassembled form; otherwise it returns unspecified
-	// human-readable information about the Value, such as its
-	// kind, name and type.
-	String() string
-
-	// Type returns the type of this value.  Many instructions
-	// (e.g. IndexAddr) change their behaviour depending on the
-	// types of their operands.
-	Type() types.Type
-
-	// Parent returns the function to which this Value belongs.
-	// It returns nil for named Functions, Builtin, Const and Global.
-	Parent() *Function
-
-	// Referrers returns the list of instructions that have this
-	// value as one of their operands; it may contain duplicates
-	// if an instruction has a repeated operand.
-	//
-	// Referrers actually returns a pointer through which the
-	// caller may perform mutations to the object's state.
-	//
-	// Referrers is currently only defined if Parent()!=nil,
-	// i.e. for the function-local values FreeVar, Parameter,
-	// Functions (iff anonymous) and all value-defining instructions.
-	// It returns nil for named Functions, Builtin, Const and Global.
-	//
-	// Instruction.Operands contains the inverse of this relation.
-	Referrers() *[]Instruction
-
-	// Pos returns the location of the AST token most closely
-	// associated with the operation that gave rise to this value,
-	// or token.NoPos if it was not explicit in the source.
-	//
-	// For each ast.Node type, a particular token is designated as
-	// the closest location for the expression, e.g. the Lparen
-	// for an *ast.CallExpr.  This permits a compact but
-	// approximate mapping from Values to source positions for use
-	// in diagnostic messages, for example.
-	//
-	// (Do not use this position to determine which Value
-	// corresponds to an ast.Expr; use Function.ValueForExpr
-	// instead.  NB: it requires that the function was built with
-	// debug information.)
-	Pos() token.Pos
-}
-
-// An Instruction is an SSA instruction that computes a new Value or
-// has some effect.
-//
-// An Instruction that defines a value (e.g. BinOp) also implements
-// the Value interface; an Instruction that only has an effect (e.g. Store)
-// does not.
-//
-type Instruction interface {
-	// String returns the disassembled form of this value.
-	//
-	// Examples of Instructions that are Values:
-	//       "x + y"     (BinOp)
-	//       "len([])"   (Call)
-	// Note that the name of the Value is not printed.
-	//
-	// Examples of Instructions that are not Values:
-	//       "return x"  (Return)
-	//       "*y = x"    (Store)
-	//
-	// (The separation Value.Name() from Value.String() is useful
-	// for some analyses which distinguish the operation from the
-	// value it defines, e.g., 'y = local int' is both an allocation
-	// of memory 'local int' and a definition of a pointer y.)
-	String() string
-
-	// Parent returns the function to which this instruction
-	// belongs.
-	Parent() *Function
-
-	// Block returns the basic block to which this instruction
-	// belongs.
-	Block() *BasicBlock
-
-	// setBlock sets the basic block to which this instruction belongs.
-	setBlock(*BasicBlock)
-
-	// Operands returns the operands of this instruction: the
-	// set of Values it references.
-	//
-	// Specifically, it appends their addresses to rands, a
-	// user-provided slice, and returns the resulting slice,
-	// permitting avoidance of memory allocation.
-	//
-	// The operands are appended in undefined order, but the order
-	// is consistent for a given Instruction; the addresses are
-	// always non-nil but may point to a nil Value.  Clients may
-	// store through the pointers, e.g. to effect a value
-	// renaming.
-	//
-	// Value.Referrers is a subset of the inverse of this
-	// relation.  (Referrers are not tracked for all types of
-	// Values.)
-	Operands(rands []*Value) []*Value
-
-	// Pos returns the location of the AST token most closely
-	// associated with the operation that gave rise to this
-	// instruction, or token.NoPos if it was not explicit in the
-	// source.
-	//
-	// For each ast.Node type, a particular token is designated as
-	// the closest location for the expression, e.g. the Go token
-	// for an *ast.GoStmt.  This permits a compact but approximate
-	// mapping from Instructions to source positions for use in
-	// diagnostic messages, for example.
-	//
-	// (Do not use this position to determine which Instruction
-	// corresponds to an ast.Expr; see the notes for Value.Pos.
-	// This position may be used to determine which non-Value
-	// Instruction corresponds to some ast.Stmts, but not all: If
-	// and Jump instructions have no Pos(), for example.)
-	Pos() token.Pos
-}
-
-// A Node is a node in the SSA value graph.  Every concrete type that
-// implements Node is also either a Value, an Instruction, or both.
-//
-// Node contains the methods common to Value and Instruction, plus the
-// Operands and Referrers methods generalized to return nil for
-// non-Instructions and non-Values, respectively.
-//
-// Node is provided to simplify SSA graph algorithms.  Clients should
-// use the more specific and informative Value or Instruction
-// interfaces where appropriate.
-//
-type Node interface {
-	// Common methods:
-	String() string
-	Pos() token.Pos
-	Parent() *Function
-
-	// Partial methods:
-	Operands(rands []*Value) []*Value // nil for non-Instructions
-	Referrers() *[]Instruction        // nil for non-Values
-}
-
-// Function represents the parameters, results, and code of a function
-// or method.
-//
-// If Blocks is nil, this indicates an external function for which no
-// Go source code is available.  In this case, FreeVars and Locals
-// are nil too.  Clients performing whole-program analysis must
-// handle external functions specially.
-//
-// Blocks contains the function's control-flow graph (CFG).
-// Blocks[0] is the function entry point; block order is not otherwise
-// semantically significant, though it may affect the readability of
-// the disassembly.
-// To iterate over the blocks in dominance order, use DomPreorder().
-//
-// Recover is an optional second entry point to which control resumes
-// after a recovered panic.  The Recover block may contain only a return
-// statement, preceded by a load of the function's named return
-// parameters, if any.
-//
-// A nested function (Parent()!=nil) that refers to one or more
-// lexically enclosing local variables ("free variables") has FreeVars.
-// Such functions cannot be called directly but require a
-// value created by MakeClosure which, via its Bindings, supplies
-// values for these parameters.
-//
-// If the function is a method (Signature.Recv() != nil) then the first
-// element of Params is the receiver parameter.
-//
-// A Go package may declare many functions called "init".
-// For each one, Object().Name() returns "init" but Name() returns
-// "init#1", etc, in declaration order.
-//
-// Pos() returns the declaring ast.FuncLit.Type.Func or the position
-// of the ast.FuncDecl.Name, if the function was explicit in the
-// source.  Synthetic wrappers, for which Synthetic != "", may share
-// the same position as the function they wrap.
-// Syntax.Pos() always returns the position of the declaring "func" token.
-//
-// Type() returns the function's Signature.
-//
-type Function struct {
-	name      string
-	object    types.Object     // a declared *types.Func or one of its wrappers
-	method    *types.Selection // info about provenance of synthetic methods
-	Signature *types.Signature
-	pos       token.Pos
-
-	Synthetic string        // provenance of synthetic function; "" for true source functions
-	syntax    ast.Node      // *ast.Func{Decl,Lit}; replaced with simple ast.Node after build, unless debug mode
-	parent    *Function     // enclosing function if anon; nil if global
-	Pkg       *Package      // enclosing package; nil for shared funcs (wrappers and error.Error)
-	Prog      *Program      // enclosing program
-	Params    []*Parameter  // function parameters; for methods, includes receiver
-	FreeVars  []*FreeVar    // free variables whose values must be supplied by closure
-	Locals    []*Alloc      // local variables of this function
-	Blocks    []*BasicBlock // basic blocks of the function; nil => external
-	Recover   *BasicBlock   // optional; control transfers here after recovered panic
-	AnonFuncs []*Function   // anonymous functions directly beneath this one
-	referrers []Instruction // referring instructions (iff Parent() != nil)
-
-	// The following fields are set transiently during building,
-	// then cleared.
-	currentBlock *BasicBlock             // where to emit code
-	objects      map[types.Object]Value  // addresses of local variables
-	namedResults []*Alloc                // tuple of named results
-	targets      *targets                // linked stack of branch targets
-	lblocks      map[*ast.Object]*lblock // labelled blocks
-}
-
-// BasicBlock represents an SSA basic block.
-//
-// The final element of Instrs is always an explicit transfer of
-// control (If, Jump, Return, or Panic).
-//
-// A block may contain no Instructions only if it is unreachable,
-// i.e., Preds is nil.  Empty blocks are typically pruned.
-//
-// BasicBlocks and their Preds/Succs relation form a (possibly cyclic)
-// graph independent of the SSA Value graph: the control-flow graph or
-// CFG.  It is illegal for multiple edges to exist between the same
-// pair of blocks.
-//
-// Each BasicBlock is also a node in the dominator tree of the CFG.
-// The tree may be navigated using Idom()/Dominees() and queried using
-// Dominates().
-//
-// The order of Preds and Succs is significant (to Phi and If
-// instructions, respectively).
-//
-type BasicBlock struct {
-	Index        int            // index of this block within Parent().Blocks
-	Comment      string         // optional label; no semantic significance
-	parent       *Function      // parent function
-	Instrs       []Instruction  // instructions in order
-	Preds, Succs []*BasicBlock  // predecessors and successors
-	succs2       [2]*BasicBlock // initial space for Succs
-	dom          domInfo        // dominator tree info
-	gaps         int            // number of nil Instrs (transient)
-	rundefers    int            // number of rundefers (transient)
-}
-
-// Pure values ----------------------------------------
-
-// A FreeVar represents a free variable of the function to which it
-// belongs.
-//
-// FreeVars are used to implement anonymous functions, whose free
-// variables are lexically captured in a closure formed by
-// MakeClosure.  The value of such a free var is an Alloc or another
-// FreeVar and is considered a potentially escaping heap address, with
-// pointer type.
-//
-// FreeVars are also used to implement bound method closures.  Such a
-// free var represents the receiver value and may be of any type that
-// has concrete methods.
-//
-// Pos() returns the position of the value that was captured, which
-// belongs to an enclosing function.
-//
-type FreeVar struct {
-	name      string
-	typ       types.Type
-	pos       token.Pos
-	parent    *Function
-	referrers []Instruction
-
-	// Transiently needed during building.
-	outer Value // the Value captured from the enclosing context.
-}
-
-// A Parameter represents an input parameter of a function.
-//
-type Parameter struct {
-	name      string
-	object    types.Object // a *types.Var; nil for non-source locals
-	typ       types.Type
-	pos       token.Pos
-	parent    *Function
-	referrers []Instruction
-}
-
-// A Const represents the value of a constant expression.
-//
-// The underlying type of a constant may be any boolean, numeric, or
-// string type.  In addition, a Const may represent the nil value of
-// any reference type---interface, map, channel, pointer, slice, or
-// function---but not "untyped nil".
-//
-// All source-level constant expressions are represented by a Const
-// of the same type and value.
-//
-// Value holds the exact value of the constant, independent of its
-// Type(), using the same representation as package go/exact uses for
-// constants, or nil for a typed nil value.
-//
-// Pos() returns token.NoPos.
-//
-// Example printed form:
-// 	42:int
-//	"hello":untyped string
-//	3+4i:MyComplex
-//
-type Const struct {
-	typ   types.Type
-	Value exact.Value
-}
-
-// A Global is a named Value holding the address of a package-level
-// variable.
-//
-// Pos() returns the position of the ast.ValueSpec.Names[*]
-// identifier.
-//
-type Global struct {
-	name   string
-	object types.Object // a *types.Var; may be nil for synthetics e.g. init$guard
-	typ    types.Type
-	pos    token.Pos
-
-	Pkg *Package
-}
-
-// A Builtin represents a specific use of a built-in function, e.g. len.
-//
-// Builtins are immutable values.  Builtins do not have addresses.
-// Builtins can only appear in CallCommon.Func.
-//
-// Name() indicates the function: one of the built-in functions from the
-// Go spec (excluding "make" and "new") or one of these ssa-defined
-// intrinsics:
-//
-//   // wrapnilchk returns ptr if non-nil, panics otherwise.
-//   // (For use in indirection wrappers.)
-//   func ssa:wrapnilchk(ptr *T, recvType, methodName string) *T
-//
-// Object() returns a *types.Builtin for built-ins defined by the spec,
-// nil for others.
-//
-// Type() returns a *types.Signature representing the effective
-// signature of the built-in for this call.
-//
-type Builtin struct {
-	name string
-	sig  *types.Signature
-}
-
-// Value-defining instructions  ----------------------------------------
-
-// The Alloc instruction reserves space for a variable of the given type,
-// zero-initializes it, and yields its address.
-//
-// Alloc values are always addresses, and have pointer types, so the
-// type of the allocated variable is actually
-// Type().Underlying().(*types.Pointer).Elem().
-//
-// If Heap is false, Alloc allocates space in the function's
-// activation record (frame); we refer to an Alloc(Heap=false) as a
-// "local" alloc.  Each local Alloc returns the same address each time
-// it is executed within the same activation; the space is
-// re-initialized to zero.
-//
-// If Heap is true, Alloc allocates space in the heap; we
-// refer to an Alloc(Heap=true) as a "new" alloc.  Each new Alloc
-// returns a different address each time it is executed.
-//
-// When Alloc is applied to a channel, map or slice type, it returns
-// the address of an uninitialized (nil) reference of that kind; store
-// the result of MakeSlice, MakeMap or MakeChan in that location to
-// instantiate these types.
-//
-// Pos() returns the ast.CompositeLit.Lbrace for a composite literal,
-// or the ast.CallExpr.Rparen for a call to new() or for a call that
-// allocates a varargs slice.
-//
-// Example printed form:
-// 	t0 = local int
-// 	t1 = new int
-//
-type Alloc struct {
-	register
-	Comment string
-	Heap    bool
-	index   int // dense numbering; for lifting
-}
-
-// The Phi instruction represents an SSA φ-node, which combines values
-// that differ across incoming control-flow edges and yields a new
-// value.  Within a block, all φ-nodes must appear before all non-φ
-// nodes.
-//
-// Pos() returns the position of the && or || for short-circuit
-// control-flow joins, or that of the *Alloc for φ-nodes inserted
-// during SSA renaming.
-//
-// Example printed form:
-// 	t2 = phi [0: t0, 1: t1]
-//
-type Phi struct {
-	register
-	Comment string  // a hint as to its purpose
-	Edges   []Value // Edges[i] is value for Block().Preds[i]
-}
-
-// The Call instruction represents a function or method call.
-//
-// The Call instruction yields the function result if there is exactly
-// one.  Otherwise it returns a tuple, the components of which are
-// accessed via Extract.
-//
-// See CallCommon for generic function call documentation.
-//
-// Pos() returns the ast.CallExpr.Lparen, if explicit in the source.
-//
-// Example printed form:
-// 	t2 = println(t0, t1)
-// 	t4 = t3()
-// 	t7 = invoke t5.Println(...t6)
-//
-type Call struct {
-	register
-	Call CallCommon
-}
-
-// The BinOp instruction yields the result of binary operation X Op Y.
-//
-// Pos() returns the ast.BinaryExpr.OpPos, if explicit in the source.
-//
-// Example printed form:
-// 	t1 = t0 + 1:int
-//
-type BinOp struct {
-	register
-	// One of:
-	// ADD SUB MUL QUO REM          + - * / %
-	// AND OR XOR SHL SHR AND_NOT   & | ^ << >> &~
-	// EQL LSS GTR NEQ LEQ GEQ      == != < <= < >=
-	Op   token.Token
-	X, Y Value
-}
-
-// The UnOp instruction yields the result of Op X.
-// ARROW is channel receive.
-// MUL is pointer indirection (load).
-// XOR is bitwise complement.
-// SUB is negation.
-// NOT is logical negation.
-//
-// If CommaOk and Op=ARROW, the result is a 2-tuple of the value above
-// and a boolean indicating the success of the receive.  The
-// components of the tuple are accessed using Extract.
-//
-// Pos() returns the ast.UnaryExpr.OpPos, if explicit in the source.
-// For receive operations (ARROW) implicit in ranging over a channel,
-// Pos() returns the ast.RangeStmt.For.
-// For implicit memory loads (STAR), Pos() returns the position of the
-// most closely associated source-level construct; the details are not
-// specified.
-//
-// Example printed form:
-// 	t0 = *x
-// 	t2 = <-t1,ok
-//
-type UnOp struct {
-	register
-	Op      token.Token // One of: NOT SUB ARROW MUL XOR ! - <- * ^
-	X       Value
-	CommaOk bool
-}
-
-// The ChangeType instruction applies to X a value-preserving type
-// change to Type().
-//
-// Type changes are permitted:
-//    - between a named type and its underlying type.
-//    - between two named types of the same underlying type.
-//    - between (possibly named) pointers to identical base types.
-//    - from a bidirectional channel to a read- or write-channel,
-//      optionally adding/removing a name.
-//
-// This operation cannot fail dynamically.
-//
-// Pos() returns the ast.CallExpr.Lparen, if the instruction arose
-// from an explicit conversion in the source.
-//
-// Example printed form:
-// 	t1 = changetype *int <- IntPtr (t0)
-//
-type ChangeType struct {
-	register
-	X Value
-}
-
-// The Convert instruction yields the conversion of value X to type
-// Type().  One or both of those types is basic (but possibly named).
-//
-// A conversion may change the value and representation of its operand.
-// Conversions are permitted:
-//    - between real numeric types.
-//    - between complex numeric types.
-//    - between string and []byte or []rune.
-//    - between pointers and unsafe.Pointer.
-//    - between unsafe.Pointer and uintptr.
-//    - from (Unicode) integer to (UTF-8) string.
-// A conversion may imply a type name change also.
-//
-// This operation cannot fail dynamically.
-//
-// Conversions of untyped string/number/bool constants to a specific
-// representation are eliminated during SSA construction.
-//
-// Pos() returns the ast.CallExpr.Lparen, if the instruction arose
-// from an explicit conversion in the source.
-//
-// Example printed form:
-// 	t1 = convert []byte <- string (t0)
-//
-type Convert struct {
-	register
-	X Value
-}
-
-// ChangeInterface constructs a value of one interface type from a
-// value of another interface type known to be assignable to it.
-// This operation cannot fail.
-//
-// Pos() returns the ast.CallExpr.Lparen if the instruction arose from
-// an explicit T(e) conversion; the ast.TypeAssertExpr.Lparen if the
-// instruction arose from an explicit e.(T) operation; or token.NoPos
-// otherwise.
-//
-// Example printed form:
-// 	t1 = change interface interface{} <- I (t0)
-//
-type ChangeInterface struct {
-	register
-	X Value
-}
-
-// MakeInterface constructs an instance of an interface type from a
-// value of a concrete type.
-//
-// Use Program.MethodSets.MethodSet(X.Type()) to find the method-set
-// of X, and Program.Method(m) to find the implementation of a method.
-//
-// To construct the zero value of an interface type T, use:
-// 	NewConst(exact.MakeNil(), T, pos)
-//
-// Pos() returns the ast.CallExpr.Lparen, if the instruction arose
-// from an explicit conversion in the source.
-//
-// Example printed form:
-// 	t1 = make interface{} <- int (42:int)
-// 	t2 = make Stringer <- t0
-//
-type MakeInterface struct {
-	register
-	X Value
-}
-
-// The MakeClosure instruction yields a closure value whose code is
-// Fn and whose free variables' values are supplied by Bindings.
-//
-// Type() returns a (possibly named) *types.Signature.
-//
-// Pos() returns the ast.FuncLit.Type.Func for a function literal
-// closure or the ast.SelectorExpr.Sel for a bound method closure.
-//
-// Example printed form:
-// 	t0 = make closure anon@1.2 [x y z]
-// 	t1 = make closure bound$(main.I).add [i]
-//
-type MakeClosure struct {
-	register
-	Fn       Value   // always a *Function
-	Bindings []Value // values for each free variable in Fn.FreeVars
-}
-
-// The MakeMap instruction creates a new hash-table-based map object
-// and yields a value of kind map.
-//
-// Type() returns a (possibly named) *types.Map.
-//
-// Pos() returns the ast.CallExpr.Lparen, if created by make(map), or
-// the ast.CompositeLit.Lbrack if created by a literal.
-//
-// Example printed form:
-// 	t1 = make map[string]int t0
-// 	t1 = make StringIntMap t0
-//
-type MakeMap struct {
-	register
-	Reserve Value // initial space reservation; nil => default
-}
-
-// The MakeChan instruction creates a new channel object and yields a
-// value of kind chan.
-//
-// Type() returns a (possibly named) *types.Chan.
-//
-// Pos() returns the ast.CallExpr.Lparen for the make(chan) that
-// created it.
-//
-// Example printed form:
-// 	t0 = make chan int 0
-// 	t0 = make IntChan 0
-//
-type MakeChan struct {
-	register
-	Size Value // int; size of buffer; zero => synchronous.
-}
-
-// The MakeSlice instruction yields a slice of length Len backed by a
-// newly allocated array of length Cap.
-//
-// Both Len and Cap must be non-nil Values of integer type.
-//
-// (Alloc(types.Array) followed by Slice will not suffice because
-// Alloc can only create arrays of constant length.)
-//
-// Type() returns a (possibly named) *types.Slice.
-//
-// Pos() returns the ast.CallExpr.Lparen for the make([]T) that
-// created it.
-//
-// Example printed form:
-// 	t1 = make []string 1:int t0
-// 	t1 = make StringSlice 1:int t0
-//
-type MakeSlice struct {
-	register
-	Len Value
-	Cap Value
-}
-
-// The Slice instruction yields a slice of an existing string, slice
-// or *array X between optional integer bounds Low and High.
-//
-// Dynamically, this instruction panics if X evaluates to a nil *array
-// pointer.
-//
-// Type() returns string if the type of X was string, otherwise a
-// *types.Slice with the same element type as X.
-//
-// Pos() returns the ast.SliceExpr.Lbrack if created by a x[:] slice
-// operation, the ast.CompositeLit.Lbrace if created by a literal, or
-// NoPos if not explicit in the source (e.g. a variadic argument slice).
-//
-// Example printed form:
-// 	t1 = slice t0[1:]
-//
-type Slice struct {
-	register
-	X              Value // slice, string, or *array
-	Low, High, Max Value // each may be nil
-}
-
-// The FieldAddr instruction yields the address of Field of *struct X.
-//
-// The field is identified by its index within the field list of the
-// struct type of X.
-//
-// Dynamically, this instruction panics if X evaluates to a nil
-// pointer.
-//
-// Type() returns a (possibly named) *types.Pointer.
-//
-// Pos() returns the position of the ast.SelectorExpr.Sel for the
-// field, if explicit in the source.
-//
-// Example printed form:
-// 	t1 = &t0.name [#1]
-//
-type FieldAddr struct {
-	register
-	X     Value // *struct
-	Field int   // index into X.Type().Deref().(*types.Struct).Fields
-}
-
-// The Field instruction yields the Field of struct X.
-//
-// The field is identified by its index within the field list of the
-// struct type of X; by using numeric indices we avoid ambiguity of
-// package-local identifiers and permit compact representations.
-//
-// Pos() returns the position of the ast.SelectorExpr.Sel for the
-// field, if explicit in the source.
-//
-// Example printed form:
-// 	t1 = t0.name [#1]
-//
-type Field struct {
-	register
-	X     Value // struct
-	Field int   // index into X.Type().(*types.Struct).Fields
-}
-
-// The IndexAddr instruction yields the address of the element at
-// index Index of collection X.  Index is an integer expression.
-//
-// The elements of maps and strings are not addressable; use Lookup or
-// MapUpdate instead.
-//
-// Dynamically, this instruction panics if X evaluates to a nil *array
-// pointer.
-//
-// Type() returns a (possibly named) *types.Pointer.
-//
-// Pos() returns the ast.IndexExpr.Lbrack for the index operation, if
-// explicit in the source.
-//
-// Example printed form:
-// 	t2 = &t0[t1]
-//
-type IndexAddr struct {
-	register
-	X     Value // slice or *array,
-	Index Value // numeric index
-}
-
-// The Index instruction yields element Index of array X.
-//
-// Pos() returns the ast.IndexExpr.Lbrack for the index operation, if
-// explicit in the source.
-//
-// Example printed form:
-// 	t2 = t0[t1]
-//
-type Index struct {
-	register
-	X     Value // array
-	Index Value // integer index
-}
-
-// The Lookup instruction yields element Index of collection X, a map
-// or string.  Index is an integer expression if X is a string or the
-// appropriate key type if X is a map.
-//
-// If CommaOk, the result is a 2-tuple of the value above and a
-// boolean indicating the result of a map membership test for the key.
-// The components of the tuple are accessed using Extract.
-//
-// Pos() returns the ast.IndexExpr.Lbrack, if explicit in the source.
-//
-// Example printed form:
-// 	t2 = t0[t1]
-// 	t5 = t3[t4],ok
-//
-type Lookup struct {
-	register
-	X       Value // string or map
-	Index   Value // numeric or key-typed index
-	CommaOk bool  // return a value,ok pair
-}
-
-// SelectState is a helper for Select.
-// It represents one goal state and its corresponding communication.
-//
-type SelectState struct {
-	Dir       types.ChanDir // direction of case (SendOnly or RecvOnly)
-	Chan      Value         // channel to use (for send or receive)
-	Send      Value         // value to send (for send)
-	Pos       token.Pos     // position of token.ARROW
-	DebugNode ast.Node      // ast.SendStmt or ast.UnaryExpr(<-) [debug mode]
-}
-
-// The Select instruction tests whether (or blocks until) one
-// of the specified sent or received states is entered.
-//
-// Let n be the number of States for which Dir==RECV and T_i (0<=i<n)
-// be the element type of each such state's Chan.
-// Select returns an n+2-tuple
-//    (index int, recvOk bool, r_0 T_0, ... r_n-1 T_n-1)
-// The tuple's components, described below, must be accessed via the
-// Extract instruction.
-//
-// If Blocking, select waits until exactly one state holds, i.e. a
-// channel becomes ready for the designated operation of sending or
-// receiving; select chooses one among the ready states
-// pseudorandomly, performs the send or receive operation, and sets
-// 'index' to the index of the chosen channel.
-//
-// If !Blocking, select doesn't block if no states hold; instead it
-// returns immediately with index equal to -1.
-//
-// If the chosen channel was used for a receive, the r_i component is
-// set to the received value, where i is the index of that state among
-// all n receive states; otherwise r_i has the zero value of type T_i.
-// Note that the receive index i is not the same as the state
-// index index.
-//
-// The second component of the triple, recvOk, is a boolean whose value
-// is true iff the selected operation was a receive and the receive
-// successfully yielded a value.
-//
-// Pos() returns the ast.SelectStmt.Select.
-//
-// Example printed form:
-// 	t3 = select nonblocking [<-t0, t1<-t2]
-// 	t4 = select blocking []
-//
-type Select struct {
-	register
-	States   []*SelectState
-	Blocking bool
-}
-
-// The Range instruction yields an iterator over the domain and range
-// of X, which must be a string or map.
-//
-// Elements are accessed via Next.
-//
-// Type() returns an opaque and degenerate "rangeIter" type.
-//
-// Pos() returns the ast.RangeStmt.For.
-//
-// Example printed form:
-// 	t0 = range "hello":string
-//
-type Range struct {
-	register
-	X Value // string or map
-}
-
-// The Next instruction reads and advances the (map or string)
-// iterator Iter and returns a 3-tuple value (ok, k, v).  If the
-// iterator is not exhausted, ok is true and k and v are the next
-// elements of the domain and range, respectively.  Otherwise ok is
-// false and k and v are undefined.
-//
-// Components of the tuple are accessed using Extract.
-//
-// The IsString field distinguishes iterators over strings from those
-// over maps, as the Type() alone is insufficient: consider
-// map[int]rune.
-//
-// Type() returns a *types.Tuple for the triple (ok, k, v).
-// The types of k and/or v may be types.Invalid.
-//
-// Example printed form:
-// 	t1 = next t0
-//
-type Next struct {
-	register
-	Iter     Value
-	IsString bool // true => string iterator; false => map iterator.
-}
-
-// The TypeAssert instruction tests whether interface value X has type
-// AssertedType.
-//
-// If !CommaOk, on success it returns v, the result of the conversion
-// (defined below); on failure it panics.
-//
-// If CommaOk: on success it returns a pair (v, true) where v is the
-// result of the conversion; on failure it returns (z, false) where z
-// is AssertedType's zero value.  The components of the pair must be
-// accessed using the Extract instruction.
-//
-// If AssertedType is a concrete type, TypeAssert checks whether the
-// dynamic type in interface X is equal to it, and if so, the result
-// of the conversion is a copy of the value in the interface.
-//
-// If AssertedType is an interface, TypeAssert checks whether the
-// dynamic type of the interface is assignable to it, and if so, the
-// result of the conversion is a copy of the interface value X.
-// If AssertedType is a superinterface of X.Type(), the operation will
-// fail iff the operand is nil.  (Contrast with ChangeInterface, which
-// performs no nil-check.)
-//
-// Type() reflects the actual type of the result, possibly a
-// 2-types.Tuple; AssertedType is the asserted type.
-//
-// Pos() returns the ast.CallExpr.Lparen if the instruction arose from
-// an explicit T(e) conversion; the ast.TypeAssertExpr.Lparen if the
-// instruction arose from an explicit e.(T) operation; or the
-// ast.CaseClause.Case if the instruction arose from a case of a
-// type-switch statement.
-//
-// Example printed form:
-// 	t1 = typeassert t0.(int)
-// 	t3 = typeassert,ok t2.(T)
-//
-type TypeAssert struct {
-	register
-	X            Value
-	AssertedType types.Type
-	CommaOk      bool
-}
-
-// The Extract instruction yields component Index of Tuple.
-//
-// This is used to access the results of instructions with multiple
-// return values, such as Call, TypeAssert, Next, UnOp(ARROW) and
-// IndexExpr(Map).
-//
-// Example printed form:
-// 	t1 = extract t0 #1
-//
-type Extract struct {
-	register
-	Tuple Value
-	Index int
-}
-
-// Instructions executed for effect.  They do not yield a value. --------------------
-
-// The Jump instruction transfers control to the sole successor of its
-// owning block.
-//
-// A Jump must be the last instruction of its containing BasicBlock.
-//
-// Pos() returns NoPos.
-//
-// Example printed form:
-// 	jump done
-//
-type Jump struct {
-	anInstruction
-}
-
-// The If instruction transfers control to one of the two successors
-// of its owning block, depending on the boolean Cond: the first if
-// true, the second if false.
-//
-// An If instruction must be the last instruction of its containing
-// BasicBlock.
-//
-// Pos() returns NoPos.
-//
-// Example printed form:
-// 	if t0 goto done else body
-//
-type If struct {
-	anInstruction
-	Cond Value
-}
-
-// The Return instruction returns values and control back to the calling
-// function.
-//
-// len(Results) is always equal to the number of results in the
-// function's signature.
-//
-// If len(Results) > 1, Return returns a tuple value with the specified
-// components which the caller must access using Extract instructions.
-//
-// There is no instruction to return a ready-made tuple like those
-// returned by a "value,ok"-mode TypeAssert, Lookup or UnOp(ARROW) or
-// a tail-call to a function with multiple result parameters.
-//
-// Return must be the last instruction of its containing BasicBlock.
-// Such a block has no successors.
-//
-// Pos() returns the ast.ReturnStmt.Return, if explicit in the source.
-//
-// Example printed form:
-// 	return
-// 	return nil:I, 2:int
-//
-type Return struct {
-	anInstruction
-	Results []Value
-	pos     token.Pos
-}
-
-// The RunDefers instruction pops and invokes the entire stack of
-// procedure calls pushed by Defer instructions in this function.
-//
-// It is legal to encounter multiple 'rundefers' instructions in a
-// single control-flow path through a function; this is useful in
-// the combined init() function, for example.
-//
-// Pos() returns NoPos.
-//
-// Example printed form:
-//	rundefers
-//
-type RunDefers struct {
-	anInstruction
-}
-
-// The Panic instruction initiates a panic with value X.
-//
-// A Panic instruction must be the last instruction of its containing
-// BasicBlock, which must have no successors.
-//
-// NB: 'go panic(x)' and 'defer panic(x)' do not use this instruction;
-// they are treated as calls to a built-in function.
-//
-// Pos() returns the ast.CallExpr.Lparen if this panic was explicit
-// in the source.
-//
-// Example printed form:
-// 	panic t0
-//
-type Panic struct {
-	anInstruction
-	X   Value // an interface{}
-	pos token.Pos
-}
-
-// The Go instruction creates a new goroutine and calls the specified
-// function within it.
-//
-// See CallCommon for generic function call documentation.
-//
-// Pos() returns the ast.GoStmt.Go.
-//
-// Example printed form:
-// 	go println(t0, t1)
-// 	go t3()
-// 	go invoke t5.Println(...t6)
-//
-type Go struct {
-	anInstruction
-	Call CallCommon
-	pos  token.Pos
-}
-
-// The Defer instruction pushes the specified call onto a stack of
-// functions to be called by a RunDefers instruction or by a panic.
-//
-// See CallCommon for generic function call documentation.
-//
-// Pos() returns the ast.DeferStmt.Defer.
-//
-// Example printed form:
-// 	defer println(t0, t1)
-// 	defer t3()
-// 	defer invoke t5.Println(...t6)
-//
-type Defer struct {
-	anInstruction
-	Call CallCommon
-	pos  token.Pos
-}
-
-// The Send instruction sends X on channel Chan.
-//
-// Pos() returns the ast.SendStmt.Arrow, if explicit in the source.
-//
-// Example printed form:
-// 	send t0 <- t1
-//
-type Send struct {
-	anInstruction
-	Chan, X Value
-	pos     token.Pos
-}
-
-// The Store instruction stores Val at address Addr.
-// Stores can be of arbitrary types.
-//
-// Pos() returns the position of the source-level construct most closely
-// associated with the memory store operation.
-// Since implicit memory stores are numerous and varied and depend upon
-// implementation choices, the details are not specified.
-//
-// Example printed form:
-// 	*x = y
-//
-type Store struct {
-	anInstruction
-	Addr Value
-	Val  Value
-	pos  token.Pos
-}
-
-// The MapUpdate instruction updates the association of Map[Key] to
-// Value.
-//
-// Pos() returns the ast.KeyValueExpr.Colon or ast.IndexExpr.Lbrack,
-// if explicit in the source.
-//
-// Example printed form:
-//	t0[t1] = t2
-//
-type MapUpdate struct {
-	anInstruction
-	Map   Value
-	Key   Value
-	Value Value
-	pos   token.Pos
-}
-
-// A DebugRef instruction maps a source-level expression Expr to the
-// SSA value X that represents the value (!IsAddr) or address (IsAddr)
-// of that expression.
-//
-// DebugRef is a pseudo-instruction: it has no dynamic effect.
-//
-// Pos() returns Expr.Pos(), the start position of the source-level
-// expression.  This is not the same as the "designated" token as
-// documented at Value.Pos(). e.g. CallExpr.Pos() does not return the
-// position of the ("designated") Lparen token.
-//
-// If Expr is an *ast.Ident denoting a var or func, Object() returns
-// the object; though this information can be obtained from the type
-// checker, including it here greatly facilitates debugging.
-// For non-Ident expressions, Object() returns nil.
-//
-// DebugRefs are generated only for functions built with debugging
-// enabled; see Package.SetDebugMode() and the GlobalDebug builder
-// mode flag.
-//
-// DebugRefs are not emitted for ast.Idents referring to constants or
-// predeclared identifiers, since they are trivial and numerous.
-// Nor are they emitted for ast.ParenExprs.
-//
-// (By representing these as instructions, rather than out-of-band,
-// consistency is maintained during transformation passes by the
-// ordinary SSA renaming machinery.)
-//
-// Example printed form:
-//      ; *ast.CallExpr @ 102:9 is t5
-//      ; var x float64 @ 109:72 is x
-//      ; address of *ast.CompositeLit @ 216:10 is t0
-//
-type DebugRef struct {
-	anInstruction
-	Expr   ast.Expr     // the referring expression (never *ast.ParenExpr)
-	object types.Object // the identity of the source var/func
-	IsAddr bool         // Expr is addressable and X is the address it denotes
-	X      Value        // the value or address of Expr
-}
-
-// Embeddable mix-ins and helpers for common parts of other structs. -----------
-
-// register is a mix-in embedded by all SSA values that are also
-// instructions, i.e. virtual registers, and provides a uniform
-// implementation of most of the Value interface: Value.Name() is a
-// numbered register (e.g. "t0"); the other methods are field accessors.
-//
-// Temporary names are automatically assigned to each register on
-// completion of building a function in SSA form.
-//
-// Clients must not assume that the 'id' value (and the Name() derived
-// from it) is unique within a function.  As always in this API,
-// semantics are determined only by identity; names exist only to
-// facilitate debugging.
-//
-type register struct {
-	anInstruction
-	num       int        // "name" of virtual register, e.g. "t0".  Not guaranteed unique.
-	typ       types.Type // type of virtual register
-	pos       token.Pos  // position of source expression, or NoPos
-	referrers []Instruction
-}
-
-// anInstruction is a mix-in embedded by all Instructions.
-// It provides the implementations of the Block and setBlock methods.
-type anInstruction struct {
-	block *BasicBlock // the basic block of this instruction
-}
-
-// CallCommon is contained by Go, Defer and Call to hold the
-// common parts of a function or method call.
-//
-// Each CallCommon exists in one of two modes, function call and
-// interface method invocation, or "call" and "invoke" for short.
-//
-// 1. "call" mode: when Method is nil (!IsInvoke), a CallCommon
-// represents an ordinary function call of the value in Value,
-// which may be a *Builtin, a *Function or any other value of kind
-// 'func'.
-//
-// Value may be one of:
-//    (a) a *Function, indicating a statically dispatched call
-//        to a package-level function, an anonymous function, or
-//        a method of a named type.
-//    (b) a *MakeClosure, indicating an immediately applied
-//        function literal with free variables.
-//    (c) a *Builtin, indicating a statically dispatched call
-//        to a built-in function.
-//    (d) any other value, indicating a dynamically dispatched
-//        function call.
-// StaticCallee returns the identity of the callee in cases
-// (a) and (b), nil otherwise.
-//
-// Args contains the arguments to the call.  If Value is a method,
-// Args[0] contains the receiver parameter.
-//
-// Example printed form:
-// 	t2 = println(t0, t1)
-// 	go t3()
-//	defer t5(...t6)
-//
-// 2. "invoke" mode: when Method is non-nil (IsInvoke), a CallCommon
-// represents a dynamically dispatched call to an interface method.
-// In this mode, Value is the interface value and Method is the
-// interface's abstract method.  Note: an abstract method may be
-// shared by multiple interfaces due to embedding; Value.Type()
-// provides the specific interface used for this call.
-//
-// Value is implicitly supplied to the concrete method implementation
-// as the receiver parameter; in other words, Args[0] holds not the
-// receiver but the first true argument.
-//
-// Example printed form:
-// 	t1 = invoke t0.String()
-// 	go invoke t3.Run(t2)
-// 	defer invoke t4.Handle(...t5)
-//
-// For all calls to variadic functions (Signature().Variadic()),
-// the last element of Args is a slice.
-//
-type CallCommon struct {
-	Value  Value       // receiver (invoke mode) or func value (call mode)
-	Method *types.Func // abstract method (invoke mode)
-	Args   []Value     // actual parameters (in static method call, includes receiver)
-	pos    token.Pos   // position of CallExpr.Lparen, iff explicit in source
-}
-
-// IsInvoke returns true if this call has "invoke" (not "call") mode.
-func (c *CallCommon) IsInvoke() bool {
-	return c.Method != nil
-}
-
-func (c *CallCommon) Pos() token.Pos { return c.pos }
-
-// Signature returns the signature of the called function.
-//
-// For an "invoke"-mode call, the signature of the interface method is
-// returned.
-//
-// In either "call" or "invoke" mode, if the callee is a method, its
-// receiver is represented by sig.Recv, not sig.Params().At(0).
-//
-func (c *CallCommon) Signature() *types.Signature {
-	if c.Method != nil {
-		return c.Method.Type().(*types.Signature)
-	}
-	return c.Value.Type().Underlying().(*types.Signature)
-}
-
-// StaticCallee returns the callee if this is a trivially static
-// "call"-mode call to a function.
-func (c *CallCommon) StaticCallee() *Function {
-	switch fn := c.Value.(type) {
-	case *Function:
-		return fn
-	case *MakeClosure:
-		return fn.Fn.(*Function)
-	}
-	return nil
-}
-
-// Description returns a description of the mode of this call suitable
-// for a user interface, e.g., "static method call".
-func (c *CallCommon) Description() string {
-	switch fn := c.Value.(type) {
-	case *Builtin:
-		return "built-in function call"
-	case *MakeClosure:
-		return "static function closure call"
-	case *Function:
-		if fn.Signature.Recv() != nil {
-			return "static method call"
-		}
-		return "static function call"
-	}
-	if c.IsInvoke() {
-		return "dynamic method call" // ("invoke" mode)
-	}
-	return "dynamic function call"
-}
-
-// The CallInstruction interface, implemented by *Go, *Defer and *Call,
-// exposes the common parts of function-calling instructions,
-// yet provides a way back to the Value defined by *Call alone.
-//
-type CallInstruction interface {
-	Instruction
-	Common() *CallCommon // returns the common parts of the call
-	Value() *Call        // returns the result value of the call (*Call) or nil (*Go, *Defer)
-}
-
-func (s *Call) Common() *CallCommon  { return &s.Call }
-func (s *Defer) Common() *CallCommon { return &s.Call }
-func (s *Go) Common() *CallCommon    { return &s.Call }
-
-func (s *Call) Value() *Call  { return s }
-func (s *Defer) Value() *Call { return nil }
-func (s *Go) Value() *Call    { return nil }
-
-func (v *Builtin) Type() types.Type        { return v.sig }
-func (v *Builtin) Name() string            { return v.name }
-func (*Builtin) Referrers() *[]Instruction { return nil }
-func (v *Builtin) Pos() token.Pos          { return token.NoPos }
-func (v *Builtin) Object() types.Object    { return types.Universe.Lookup(v.name) }
-func (v *Builtin) Parent() *Function       { return nil }
-
-func (v *FreeVar) Type() types.Type          { return v.typ }
-func (v *FreeVar) Name() string              { return v.name }
-func (v *FreeVar) Referrers() *[]Instruction { return &v.referrers }
-func (v *FreeVar) Pos() token.Pos            { return v.pos }
-func (v *FreeVar) Parent() *Function         { return v.parent }
-
-func (v *Global) Type() types.Type                     { return v.typ }
-func (v *Global) Name() string                         { return v.name }
-func (v *Global) Parent() *Function                    { return nil }
-func (v *Global) Pos() token.Pos                       { return v.pos }
-func (v *Global) Referrers() *[]Instruction            { return nil }
-func (v *Global) Token() token.Token                   { return token.VAR }
-func (v *Global) Object() types.Object                 { return v.object }
-func (v *Global) String() string                       { return v.RelString(nil) }
-func (v *Global) Package() *Package                    { return v.Pkg }
-func (v *Global) RelString(from *types.Package) string { return relString(v, from) }
-
-func (v *Function) Name() string         { return v.name }
-func (v *Function) Type() types.Type     { return v.Signature }
-func (v *Function) Pos() token.Pos       { return v.pos }
-func (v *Function) Token() token.Token   { return token.FUNC }
-func (v *Function) Object() types.Object { return v.object }
-func (v *Function) String() string       { return v.RelString(nil) }
-func (v *Function) Package() *Package    { return v.Pkg }
-func (v *Function) Parent() *Function    { return v.parent }
-func (v *Function) Referrers() *[]Instruction {
-	if v.parent != nil {
-		return &v.referrers
-	}
-	return nil
-}
-
-func (v *Parameter) Type() types.Type          { return v.typ }
-func (v *Parameter) Name() string              { return v.name }
-func (v *Parameter) Object() types.Object      { return v.object }
-func (v *Parameter) Referrers() *[]Instruction { return &v.referrers }
-func (v *Parameter) Pos() token.Pos            { return v.pos }
-func (v *Parameter) Parent() *Function         { return v.parent }
-
-func (v *Alloc) Type() types.Type          { return v.typ }
-func (v *Alloc) Referrers() *[]Instruction { return &v.referrers }
-func (v *Alloc) Pos() token.Pos            { return v.pos }
-
-func (v *register) Type() types.Type          { return v.typ }
-func (v *register) setType(typ types.Type)    { v.typ = typ }
-func (v *register) Name() string              { return fmt.Sprintf("t%d", v.num) }
-func (v *register) setNum(num int)            { v.num = num }
-func (v *register) Referrers() *[]Instruction { return &v.referrers }
-func (v *register) Pos() token.Pos            { return v.pos }
-func (v *register) setPos(pos token.Pos)      { v.pos = pos }
-
-func (v *anInstruction) Parent() *Function          { return v.block.parent }
-func (v *anInstruction) Block() *BasicBlock         { return v.block }
-func (v *anInstruction) setBlock(block *BasicBlock) { v.block = block }
-func (v *anInstruction) Referrers() *[]Instruction  { return nil }
-
-func (t *Type) Name() string                         { return t.object.Name() }
-func (t *Type) Pos() token.Pos                       { return t.object.Pos() }
-func (t *Type) Type() types.Type                     { return t.object.Type() }
-func (t *Type) Token() token.Token                   { return token.TYPE }
-func (t *Type) Object() types.Object                 { return t.object }
-func (t *Type) String() string                       { return t.RelString(nil) }
-func (t *Type) Package() *Package                    { return t.pkg }
-func (t *Type) RelString(from *types.Package) string { return relString(t, from) }
-
-func (c *NamedConst) Name() string                         { return c.object.Name() }
-func (c *NamedConst) Pos() token.Pos                       { return c.object.Pos() }
-func (c *NamedConst) String() string                       { return c.RelString(nil) }
-func (c *NamedConst) Type() types.Type                     { return c.object.Type() }
-func (c *NamedConst) Token() token.Token                   { return token.CONST }
-func (c *NamedConst) Object() types.Object                 { return c.object }
-func (c *NamedConst) Package() *Package                    { return c.pkg }
-func (c *NamedConst) RelString(from *types.Package) string { return relString(c, from) }
-
-// Func returns the package-level function of the specified name,
-// or nil if not found.
-//
-func (p *Package) Func(name string) (f *Function) {
-	f, _ = p.Members[name].(*Function)
-	return
-}
-
-// Var returns the package-level variable of the specified name,
-// or nil if not found.
-//
-func (p *Package) Var(name string) (g *Global) {
-	g, _ = p.Members[name].(*Global)
-	return
-}
-
-// Const returns the package-level constant of the specified name,
-// or nil if not found.
-//
-func (p *Package) Const(name string) (c *NamedConst) {
-	c, _ = p.Members[name].(*NamedConst)
-	return
-}
-
-// Type returns the package-level type of the specified name,
-// or nil if not found.
-//
-func (p *Package) Type(name string) (t *Type) {
-	t, _ = p.Members[name].(*Type)
-	return
-}
-
-func (v *Call) Pos() token.Pos      { return v.Call.pos }
-func (s *Defer) Pos() token.Pos     { return s.pos }
-func (s *Go) Pos() token.Pos        { return s.pos }
-func (s *MapUpdate) Pos() token.Pos { return s.pos }
-func (s *Panic) Pos() token.Pos     { return s.pos }
-func (s *Return) Pos() token.Pos    { return s.pos }
-func (s *Send) Pos() token.Pos      { return s.pos }
-func (s *Store) Pos() token.Pos     { return s.pos }
-func (s *If) Pos() token.Pos        { return token.NoPos }
-func (s *Jump) Pos() token.Pos      { return token.NoPos }
-func (s *RunDefers) Pos() token.Pos { return token.NoPos }
-func (s *DebugRef) Pos() token.Pos  { return s.Expr.Pos() }
-
-// Operands.
-
-func (v *Alloc) Operands(rands []*Value) []*Value {
-	return rands
-}
-
-func (v *BinOp) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X, &v.Y)
-}
-
-func (c *CallCommon) Operands(rands []*Value) []*Value {
-	rands = append(rands, &c.Value)
-	for i := range c.Args {
-		rands = append(rands, &c.Args[i])
-	}
-	return rands
-}
-
-func (s *Go) Operands(rands []*Value) []*Value {
-	return s.Call.Operands(rands)
-}
-
-func (s *Call) Operands(rands []*Value) []*Value {
-	return s.Call.Operands(rands)
-}
-
-func (s *Defer) Operands(rands []*Value) []*Value {
-	return s.Call.Operands(rands)
-}
-
-func (v *ChangeInterface) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (v *ChangeType) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (v *Convert) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (s *DebugRef) Operands(rands []*Value) []*Value {
-	return append(rands, &s.X)
-}
-
-func (v *Extract) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Tuple)
-}
-
-func (v *Field) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (v *FieldAddr) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (s *If) Operands(rands []*Value) []*Value {
-	return append(rands, &s.Cond)
-}
-
-func (v *Index) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X, &v.Index)
-}
-
-func (v *IndexAddr) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X, &v.Index)
-}
-
-func (*Jump) Operands(rands []*Value) []*Value {
-	return rands
-}
-
-func (v *Lookup) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X, &v.Index)
-}
-
-func (v *MakeChan) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Size)
-}
-
-func (v *MakeClosure) Operands(rands []*Value) []*Value {
-	rands = append(rands, &v.Fn)
-	for i := range v.Bindings {
-		rands = append(rands, &v.Bindings[i])
-	}
-	return rands
-}
-
-func (v *MakeInterface) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (v *MakeMap) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Reserve)
-}
-
-func (v *MakeSlice) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Len, &v.Cap)
-}
-
-func (v *MapUpdate) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Map, &v.Key, &v.Value)
-}
-
-func (v *Next) Operands(rands []*Value) []*Value {
-	return append(rands, &v.Iter)
-}
-
-func (s *Panic) Operands(rands []*Value) []*Value {
-	return append(rands, &s.X)
-}
-
-func (v *Phi) Operands(rands []*Value) []*Value {
-	for i := range v.Edges {
-		rands = append(rands, &v.Edges[i])
-	}
-	return rands
-}
-
-func (v *Range) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (s *Return) Operands(rands []*Value) []*Value {
-	for i := range s.Results {
-		rands = append(rands, &s.Results[i])
-	}
-	return rands
-}
-
-func (*RunDefers) Operands(rands []*Value) []*Value {
-	return rands
-}
-
-func (v *Select) Operands(rands []*Value) []*Value {
-	for i := range v.States {
-		rands = append(rands, &v.States[i].Chan, &v.States[i].Send)
-	}
-	return rands
-}
-
-func (s *Send) Operands(rands []*Value) []*Value {
-	return append(rands, &s.Chan, &s.X)
-}
-
-func (v *Slice) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X, &v.Low, &v.High, &v.Max)
-}
-
-func (s *Store) Operands(rands []*Value) []*Value {
-	return append(rands, &s.Addr, &s.Val)
-}
-
-func (v *TypeAssert) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-func (v *UnOp) Operands(rands []*Value) []*Value {
-	return append(rands, &v.X)
-}
-
-// Non-Instruction Values:
-func (v *Builtin) Operands(rands []*Value) []*Value   { return rands }
-func (v *FreeVar) Operands(rands []*Value) []*Value   { return rands }
-func (v *Const) Operands(rands []*Value) []*Value     { return rands }
-func (v *Function) Operands(rands []*Value) []*Value  { return rands }
-func (v *Global) Operands(rands []*Value) []*Value    { return rands }
-func (v *Parameter) Operands(rands []*Value) []*Value { return rands }
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load.go
deleted file mode 100644
index 30b8053c78..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load.go
+++ /dev/null
@@ -1,95 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssautil
-
-// This file defines utility functions for constructing programs in SSA form.
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-)
-
-// CreateProgram returns a new program in SSA form, given a program
-// loaded from source.  An SSA package is created for each transitively
-// error-free package of lprog.
-//
-// Code for bodies of functions is not built until Build is called
-// on the result.
-//
-// mode controls diagnostics and checking during SSA construction.
-//
-func CreateProgram(lprog *loader.Program, mode ssa.BuilderMode) *ssa.Program {
-	prog := ssa.NewProgram(lprog.Fset, mode)
-
-	for _, info := range lprog.AllPackages {
-		if info.TransitivelyErrorFree {
-			prog.CreatePackage(info.Pkg, info.Files, &info.Info, info.Importable)
-		}
-	}
-
-	return prog
-}
-
-// BuildPackage builds an SSA program with IR for a single package.
-//
-// It populates pkg by type-checking the specified file ASTs.  All
-// dependencies are loaded using the importer specified by tc, which
-// typically loads compiler export data; SSA code cannot be built for
-// those packages.  BuildPackage then constructs an ssa.Program with all
-// dependency packages created, and builds and returns the SSA package
-// corresponding to pkg.
-//
-// The caller must have set pkg.Path() to the import path.
-//
-// The operation fails if there were any type-checking or import errors.
-//
-// See ../ssa/example_test.go for an example.
-//
-func BuildPackage(tc *types.Config, fset *token.FileSet, pkg *types.Package, files []*ast.File, mode ssa.BuilderMode) (*ssa.Package, *types.Info, error) {
-	if fset == nil {
-		panic("no token.FileSet")
-	}
-	if pkg.Path() == "" {
-		panic("package has no import path")
-	}
-
-	info := &types.Info{
-		Types:      make(map[ast.Expr]types.TypeAndValue),
-		Defs:       make(map[*ast.Ident]types.Object),
-		Uses:       make(map[*ast.Ident]types.Object),
-		Implicits:  make(map[ast.Node]types.Object),
-		Scopes:     make(map[ast.Node]*types.Scope),
-		Selections: make(map[*ast.SelectorExpr]*types.Selection),
-	}
-	if err := types.NewChecker(tc, fset, pkg, info).Files(files); err != nil {
-		return nil, nil, err
-	}
-
-	prog := ssa.NewProgram(fset, mode)
-
-	// Create SSA packages for all imports.
-	// Order is not significant.
-	created := make(map[*types.Package]bool)
-	var createAll func(pkgs []*types.Package)
-	createAll = func(pkgs []*types.Package) {
-		for _, p := range pkgs {
-			if !created[p] {
-				created[p] = true
-				prog.CreatePackage(p, nil, nil, true)
-				createAll(p.Imports())
-			}
-		}
-	}
-	createAll(pkg.Imports())
-
-	// Create and build the primary package.
-	ssapkg := prog.CreatePackage(pkg, files, info, false)
-	ssapkg.Build()
-	return ssapkg, info, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load_test.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load_test.go
deleted file mode 100644
index 8ccd4637ac..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/load_test.go
+++ /dev/null
@@ -1,64 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssautil_test
-
-import (
-	"go/ast"
-	"go/importer"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-	"testing"
-
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-const hello = `package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("Hello, world")
-}
-`
-
-func TestBuildPackage(t *testing.T) {
-	// There is a more substantial test of BuildPackage and the
-	// SSA program it builds in ../ssa/builder_test.go.
-
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "hello.go", hello, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pkg := types.NewPackage("hello", "")
-	ssapkg, _, err := ssautil.BuildPackage(&types.Config{Importer: importer.Default()}, fset, pkg, []*ast.File{f}, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if pkg.Name() != "main" {
-		t.Errorf("pkg.Name() = %s, want main", pkg.Name())
-	}
-	if ssapkg.Func("main") == nil {
-		ssapkg.WriteTo(os.Stderr)
-		t.Errorf("ssapkg has no main function")
-	}
-}
-
-func TestBuildPackage_MissingImport(t *testing.T) {
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "bad.go", `package bad; import "missing"`, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	pkg := types.NewPackage("bad", "")
-	ssapkg, _, err := ssautil.BuildPackage(new(types.Config), fset, pkg, []*ast.File{f}, 0)
-	if err == nil || ssapkg != nil {
-		t.Fatal("BuildPackage succeeded unexpectedly")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch.go
deleted file mode 100644
index db03bf5559..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch.go
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssautil
-
-// This file implements discovery of switch and type-switch constructs
-// from low-level control flow.
-//
-// Many techniques exist for compiling a high-level switch with
-// constant cases to efficient machine code.  The optimal choice will
-// depend on the data type, the specific case values, the code in the
-// body of each case, and the hardware.
-// Some examples:
-// - a lookup table (for a switch that maps constants to constants)
-// - a computed goto
-// - a binary tree
-// - a perfect hash
-// - a two-level switch (to partition constant strings by their first byte).
-
-import (
-	"bytes"
-	"fmt"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/ssa"
-)
-
-// A ConstCase represents a single constant comparison.
-// It is part of a Switch.
-type ConstCase struct {
-	Block *ssa.BasicBlock // block performing the comparison
-	Body  *ssa.BasicBlock // body of the case
-	Value *ssa.Const      // case comparand
-}
-
-// A TypeCase represents a single type assertion.
-// It is part of a Switch.
-type TypeCase struct {
-	Block   *ssa.BasicBlock // block performing the type assert
-	Body    *ssa.BasicBlock // body of the case
-	Type    types.Type      // case type
-	Binding ssa.Value       // value bound by this case
-}
-
-// A Switch is a logical high-level control flow operation
-// (a multiway branch) discovered by analysis of a CFG containing
-// only if/else chains.  It is not part of the ssa.Instruction set.
-//
-// One of ConstCases and TypeCases has length >= 2;
-// the other is nil.
-//
-// In a value switch, the list of cases may contain duplicate constants.
-// A type switch may contain duplicate types, or types assignable
-// to an interface type also in the list.
-// TODO(adonovan): eliminate such duplicates.
-//
-type Switch struct {
-	Start      *ssa.BasicBlock // block containing start of if/else chain
-	X          ssa.Value       // the switch operand
-	ConstCases []ConstCase     // ordered list of constant comparisons
-	TypeCases  []TypeCase      // ordered list of type assertions
-	Default    *ssa.BasicBlock // successor if all comparisons fail
-}
-
-func (sw *Switch) String() string {
-	// We represent each block by the String() of its
-	// first Instruction, e.g. "print(42:int)".
-	var buf bytes.Buffer
-	if sw.ConstCases != nil {
-		fmt.Fprintf(&buf, "switch %s {\n", sw.X.Name())
-		for _, c := range sw.ConstCases {
-			fmt.Fprintf(&buf, "case %s: %s\n", c.Value, c.Body.Instrs[0])
-		}
-	} else {
-		fmt.Fprintf(&buf, "switch %s.(type) {\n", sw.X.Name())
-		for _, c := range sw.TypeCases {
-			fmt.Fprintf(&buf, "case %s %s: %s\n",
-				c.Binding.Name(), c.Type, c.Body.Instrs[0])
-		}
-	}
-	if sw.Default != nil {
-		fmt.Fprintf(&buf, "default: %s\n", sw.Default.Instrs[0])
-	}
-	fmt.Fprintf(&buf, "}")
-	return buf.String()
-}
-
-// Switches examines the control-flow graph of fn and returns the
-// set of inferred value and type switches.  A value switch tests an
-// ssa.Value for equality against two or more compile-time constant
-// values.  Switches involving link-time constants (addresses) are
-// ignored.  A type switch type-asserts an ssa.Value against two or
-// more types.
-//
-// The switches are returned in dominance order.
-//
-// The resulting switches do not necessarily correspond to uses of the
-// 'switch' keyword in the source: for example, a single source-level
-// switch statement with non-constant cases may result in zero, one or
-// many Switches, one per plural sequence of constant cases.
-// Switches may even be inferred from if/else- or goto-based control flow.
-// (In general, the control flow constructs of the source program
-// cannot be faithfully reproduced from the SSA representation.)
-//
-func Switches(fn *ssa.Function) []Switch {
-	// Traverse the CFG in dominance order, so we don't
-	// enter an if/else-chain in the middle.
-	var switches []Switch
-	seen := make(map[*ssa.BasicBlock]bool) // TODO(adonovan): opt: use ssa.blockSet
-	for _, b := range fn.DomPreorder() {
-		if x, k := isComparisonBlock(b); x != nil {
-			// Block b starts a switch.
-			sw := Switch{Start: b, X: x}
-			valueSwitch(&sw, k, seen)
-			if len(sw.ConstCases) > 1 {
-				switches = append(switches, sw)
-			}
-		}
-
-		if y, x, T := isTypeAssertBlock(b); y != nil {
-			// Block b starts a type switch.
-			sw := Switch{Start: b, X: x}
-			typeSwitch(&sw, y, T, seen)
-			if len(sw.TypeCases) > 1 {
-				switches = append(switches, sw)
-			}
-		}
-	}
-	return switches
-}
-
-func valueSwitch(sw *Switch, k *ssa.Const, seen map[*ssa.BasicBlock]bool) {
-	b := sw.Start
-	x := sw.X
-	for x == sw.X {
-		if seen[b] {
-			break
-		}
-		seen[b] = true
-
-		sw.ConstCases = append(sw.ConstCases, ConstCase{
-			Block: b,
-			Body:  b.Succs[0],
-			Value: k,
-		})
-		b = b.Succs[1]
-		if len(b.Instrs) > 2 {
-			// Block b contains not just 'if x == k',
-			// so it may have side effects that
-			// make it unsafe to elide.
-			break
-		}
-		if len(b.Preds) != 1 {
-			// Block b has multiple predecessors,
-			// so it cannot be treated as a case.
-			break
-		}
-		x, k = isComparisonBlock(b)
-	}
-	sw.Default = b
-}
-
-func typeSwitch(sw *Switch, y ssa.Value, T types.Type, seen map[*ssa.BasicBlock]bool) {
-	b := sw.Start
-	x := sw.X
-	for x == sw.X {
-		if seen[b] {
-			break
-		}
-		seen[b] = true
-
-		sw.TypeCases = append(sw.TypeCases, TypeCase{
-			Block:   b,
-			Body:    b.Succs[0],
-			Type:    T,
-			Binding: y,
-		})
-		b = b.Succs[1]
-		if len(b.Instrs) > 4 {
-			// Block b contains not just
-			//  {TypeAssert; Extract #0; Extract #1; If}
-			// so it may have side effects that
-			// make it unsafe to elide.
-			break
-		}
-		if len(b.Preds) != 1 {
-			// Block b has multiple predecessors,
-			// so it cannot be treated as a case.
-			break
-		}
-		y, x, T = isTypeAssertBlock(b)
-	}
-	sw.Default = b
-}
-
-// isComparisonBlock returns the operands (v, k) if a block ends with
-// a comparison v==k, where k is a compile-time constant.
-//
-func isComparisonBlock(b *ssa.BasicBlock) (v ssa.Value, k *ssa.Const) {
-	if n := len(b.Instrs); n >= 2 {
-		if i, ok := b.Instrs[n-1].(*ssa.If); ok {
-			if binop, ok := i.Cond.(*ssa.BinOp); ok && binop.Block() == b && binop.Op == token.EQL {
-				if k, ok := binop.Y.(*ssa.Const); ok {
-					return binop.X, k
-				}
-				if k, ok := binop.X.(*ssa.Const); ok {
-					return binop.Y, k
-				}
-			}
-		}
-	}
-	return
-}
-
-// isTypeAssertBlock returns the operands (y, x, T) if a block ends with
-// a type assertion "if y, ok := x.(T); ok {".
-//
-func isTypeAssertBlock(b *ssa.BasicBlock) (y, x ssa.Value, T types.Type) {
-	if n := len(b.Instrs); n >= 4 {
-		if i, ok := b.Instrs[n-1].(*ssa.If); ok {
-			if ext1, ok := i.Cond.(*ssa.Extract); ok && ext1.Block() == b && ext1.Index == 1 {
-				if ta, ok := ext1.Tuple.(*ssa.TypeAssert); ok && ta.Block() == b {
-					// hack: relies upon instruction ordering.
-					if ext0, ok := b.Instrs[n-3].(*ssa.Extract); ok {
-						return ext0, ta.X, ta.AssertedType
-					}
-				}
-			}
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch_test.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch_test.go
deleted file mode 100644
index a47dbeff7f..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/switch_test.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package ssautil_test
-
-import (
-	"go/parser"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-func TestSwitches(t *testing.T) {
-	conf := loader.Config{ParserMode: parser.ParseComments}
-	f, err := conf.ParseFile("testdata/switches.go", nil)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	conf.CreateFromFiles("main", f)
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Error(err)
-		return
-	}
-
-	prog := ssautil.CreateProgram(iprog, 0)
-	mainPkg := prog.Package(iprog.Created[0].Pkg)
-	mainPkg.Build()
-
-	for _, mem := range mainPkg.Members {
-		if fn, ok := mem.(*ssa.Function); ok {
-			if fn.Synthetic != "" {
-				continue // e.g. init()
-			}
-			// Each (multi-line) "switch" comment within
-			// this function must match the printed form
-			// of a ConstSwitch.
-			var wantSwitches []string
-			for _, c := range f.Comments {
-				if fn.Syntax().Pos() <= c.Pos() && c.Pos() < fn.Syntax().End() {
-					text := strings.TrimSpace(c.Text())
-					if strings.HasPrefix(text, "switch ") {
-						wantSwitches = append(wantSwitches, text)
-					}
-				}
-			}
-
-			switches := ssautil.Switches(fn)
-			if len(switches) != len(wantSwitches) {
-				t.Errorf("in %s, found %d switches, want %d", fn, len(switches), len(wantSwitches))
-			}
-			for i, sw := range switches {
-				got := sw.String()
-				if i >= len(wantSwitches) {
-					continue
-				}
-				want := wantSwitches[i]
-				if got != want {
-					t.Errorf("in %s, found switch %d: got <<%s>>, want <<%s>>", fn, i, got, want)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/testdata/switches.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/testdata/switches.go
deleted file mode 100644
index 8ab4c118f1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/testdata/switches.go
+++ /dev/null
@@ -1,357 +0,0 @@
-// +build ignore
-
-package main
-
-// This file is the input to TestSwitches in switch_test.go.
-// Each multiway conditional with constant or type cases (Switch)
-// discovered by Switches is printed, and compared with the
-// comments.
-//
-// The body of each case is printed as the value of its first
-// instruction.
-
-// -------- Value switches --------
-
-func SimpleSwitch(x, y int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(23:int)
-	// case 3:int: print(23:int)
-	// case 4:int: print(3:int)
-	// default: x == y
-	// }
-	switch x {
-	case 1:
-		print(1)
-	case 2, 3:
-		print(23)
-		fallthrough
-	case 4:
-		print(3)
-	default:
-		print(4)
-	case y:
-		print(5)
-	}
-	print(6)
-}
-
-func four() int { return 4 }
-
-// A non-constant case makes a switch "impure", but its pure
-// cases form two separate switches.
-func SwitchWithNonConstantCase(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(23:int)
-	// case 3:int: print(23:int)
-	// default: four()
-	// }
-
-	// switch x {
-	// case 5:int: print(5:int)
-	// case 6:int: print(6:int)
-	// default: print("done":string)
-	// }
-	switch x {
-	case 1:
-		print(1)
-	case 2, 3:
-		print(23)
-	case four():
-		print(3)
-	case 5:
-		print(5)
-	case 6:
-		print(6)
-	}
-	print("done")
-}
-
-// Switches may be found even where the source
-// program doesn't have a switch statement.
-
-func ImplicitSwitches(x, y int) {
-	// switch x {
-	// case 1:int: print(12:int)
-	// case 2:int: print(12:int)
-	// default: x < 5:int
-	// }
-	if x == 1 || 2 == x || x < 5 {
-		print(12)
-	}
-
-	// switch x {
-	// case 3:int: print(34:int)
-	// case 4:int: print(34:int)
-	// default: x == y
-	// }
-	if x == 3 || 4 == x || x == y {
-		print(34)
-	}
-
-	// Not a switch: no consistent variable.
-	if x == 5 || y == 6 {
-		print(56)
-	}
-
-	// Not a switch: only one constant comparison.
-	if x == 7 || x == y {
-		print(78)
-	}
-}
-
-func IfElseBasedSwitch(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(2:int)
-	// default: print("else":string)
-	// }
-	if x == 1 {
-		print(1)
-	} else if x == 2 {
-		print(2)
-	} else {
-		print("else")
-	}
-}
-
-func GotoBasedSwitch(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(2:int)
-	// default: print("else":string)
-	// }
-	if x == 1 {
-		goto L1
-	}
-	if x == 2 {
-		goto L2
-	}
-	print("else")
-L1:
-	print(1)
-	goto end
-L2:
-	print(2)
-end:
-}
-
-func SwitchInAForLoop(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(2:int)
-	// default: print("head":string)
-	// }
-loop:
-	for {
-		print("head")
-		switch x {
-		case 1:
-			print(1)
-			break loop
-		case 2:
-			print(2)
-			break loop
-		}
-	}
-}
-
-// This case is a switch in a for-loop, both constructed using goto.
-// As before, the default case points back to the block containing the
-// switch, but that's ok.
-func SwitchInAForLoopUsingGoto(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: print(2:int)
-	// default: print("head":string)
-	// }
-loop:
-	print("head")
-	if x == 1 {
-		goto L1
-	}
-	if x == 2 {
-		goto L2
-	}
-	goto loop
-L1:
-	print(1)
-	goto end
-L2:
-	print(2)
-end:
-}
-
-func UnstructuredSwitchInAForLoop(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 2:int: x == 1:int
-	// default: print("end":string)
-	// }
-	for {
-		if x == 1 {
-			print(1)
-			return
-		}
-		if x == 2 {
-			continue
-		}
-		break
-	}
-	print("end")
-}
-
-func CaseWithMultiplePreds(x int) {
-	for {
-		if x == 1 {
-			print(1)
-			return
-		}
-	loop:
-		// This block has multiple predecessors,
-		// so can't be treated as a switch case.
-		if x == 2 {
-			goto loop
-		}
-		break
-	}
-	print("end")
-}
-
-func DuplicateConstantsAreNotEliminated(x int) {
-	// switch x {
-	// case 1:int: print(1:int)
-	// case 1:int: print("1a":string)
-	// case 2:int: print(2:int)
-	// default: return
-	// }
-	if x == 1 {
-		print(1)
-	} else if x == 1 { // duplicate => unreachable
-		print("1a")
-	} else if x == 2 {
-		print(2)
-	}
-}
-
-// Interface values (created by comparisons) are not constants,
-// so ConstSwitch.X is never of interface type.
-func MakeInterfaceIsNotAConstant(x interface{}) {
-	if x == "foo" {
-		print("foo")
-	} else if x == 1 {
-		print(1)
-	}
-}
-
-func ZeroInitializedVarsAreConstants(x int) {
-	// switch x {
-	// case 0:int: print(1:int)
-	// case 2:int: print(2:int)
-	// default: print("end":string)
-	// }
-	var zero int // SSA construction replaces zero with 0
-	if x == zero {
-		print(1)
-	} else if x == 2 {
-		print(2)
-	}
-	print("end")
-}
-
-// -------- Select --------
-
-// NB, potentially fragile reliance on register number.
-func SelectDesugarsToSwitch(ch chan int) {
-	// switch t1 {
-	// case 0:int: extract t0 #2
-	// case 1:int: println(0:int)
-	// case 2:int: println(1:int)
-	// default: println("default":string)
-	// }
-	select {
-	case x := <-ch:
-		println(x)
-	case <-ch:
-		println(0)
-	case ch <- 1:
-		println(1)
-	default:
-		println("default")
-	}
-}
-
-// NB, potentially fragile reliance on register number.
-func NonblockingSelectDefaultCasePanics(ch chan int) {
-	// switch t1 {
-	// case 0:int: extract t0 #2
-	// case 1:int: println(0:int)
-	// case 2:int: println(1:int)
-	// default: make interface{} <- string ("blocking select m...":string)
-	// }
-	select {
-	case x := <-ch:
-		println(x)
-	case <-ch:
-		println(0)
-	case ch <- 1:
-		println(1)
-	}
-}
-
-// -------- Type switches --------
-
-// NB, reliance on fragile register numbering.
-func SimpleTypeSwitch(x interface{}) {
-	// switch x.(type) {
-	// case t3 int: println(x)
-	// case t7 bool: println(x)
-	// case t10 string: println(t10)
-	// default: println(x)
-	// }
-	switch y := x.(type) {
-	case nil:
-		println(y)
-	case int, bool:
-		println(y)
-	case string:
-		println(y)
-	default:
-		println(y)
-	}
-}
-
-// NB, potentially fragile reliance on register number.
-func DuplicateTypesAreNotEliminated(x interface{}) {
-	// switch x.(type) {
-	// case t1 string: println(1:int)
-	// case t5 interface{}: println(t5)
-	// case t9 int: println(3:int)
-	// default: return
-	// }
-	switch y := x.(type) {
-	case string:
-		println(1)
-	case interface{}:
-		println(y)
-	case int:
-		println(3) // unreachable!
-	}
-}
-
-// NB, potentially fragile reliance on register number.
-func AdHocTypeSwitch(x interface{}) {
-	// switch x.(type) {
-	// case t1 int: println(t1)
-	// case t5 string: println(t5)
-	// default: print("default":string)
-	// }
-	if i, ok := x.(int); ok {
-		println(i)
-	} else if s, ok := x.(string); ok {
-		println(s)
-	} else {
-		print("default")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/visit.go b/installer/vendor/golang.org/x/tools/go/ssa/ssautil/visit.go
deleted file mode 100644
index 3424e8a308..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/ssautil/visit.go
+++ /dev/null
@@ -1,79 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssautil // import "golang.org/x/tools/go/ssa/ssautil"
-
-import "golang.org/x/tools/go/ssa"
-
-// This file defines utilities for visiting the SSA representation of
-// a Program.
-//
-// TODO(adonovan): test coverage.
-
-// AllFunctions finds and returns the set of functions potentially
-// needed by program prog, as determined by a simple linker-style
-// reachability algorithm starting from the members and method-sets of
-// each package.  The result may include anonymous functions and
-// synthetic wrappers.
-//
-// Precondition: all packages are built.
-//
-func AllFunctions(prog *ssa.Program) map[*ssa.Function]bool {
-	visit := visitor{
-		prog: prog,
-		seen: make(map[*ssa.Function]bool),
-	}
-	visit.program()
-	return visit.seen
-}
-
-type visitor struct {
-	prog *ssa.Program
-	seen map[*ssa.Function]bool
-}
-
-func (visit *visitor) program() {
-	for _, pkg := range visit.prog.AllPackages() {
-		for _, mem := range pkg.Members {
-			if fn, ok := mem.(*ssa.Function); ok {
-				visit.function(fn)
-			}
-		}
-	}
-	for _, T := range visit.prog.RuntimeTypes() {
-		mset := visit.prog.MethodSets.MethodSet(T)
-		for i, n := 0, mset.Len(); i < n; i++ {
-			visit.function(visit.prog.MethodValue(mset.At(i)))
-		}
-	}
-}
-
-func (visit *visitor) function(fn *ssa.Function) {
-	if !visit.seen[fn] {
-		visit.seen[fn] = true
-		var buf [10]*ssa.Value // avoid alloc in common case
-		for _, b := range fn.Blocks {
-			for _, instr := range b.Instrs {
-				for _, op := range instr.Operands(buf[:0]) {
-					if fn, ok := (*op).(*ssa.Function); ok {
-						visit.function(fn)
-					}
-				}
-			}
-		}
-	}
-}
-
-// MainPackages returns the subset of the specified packages
-// named "main" that define a main function.
-// The result may include synthetic "testmain" packages.
-func MainPackages(pkgs []*ssa.Package) []*ssa.Package {
-	var mains []*ssa.Package
-	for _, pkg := range pkgs {
-		if pkg.Pkg.Name() == "main" && pkg.Func("main") != nil {
-			mains = append(mains, pkg)
-		}
-	}
-	return mains
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/stdlib_test.go b/installer/vendor/golang.org/x/tools/go/ssa/stdlib_test.go
deleted file mode 100644
index f7e0f86078..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/stdlib_test.go
+++ /dev/null
@@ -1,151 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Incomplete source tree on Android.
-
-// +build !android
-
-package ssa_test
-
-// This file runs the SSA builder in sanity-checking mode on all
-// packages beneath $GOROOT and prints some summary information.
-//
-// Run with "go test -cpu=8 to" set GOMAXPROCS.
-
-import (
-	"go/ast"
-	"go/build"
-	"go/token"
-	"runtime"
-	"testing"
-	"time"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// Skip the set of packages that transitively depend on
-// cmd/internal/objfile, which uses vendoring,
-// which go/loader does not yet support.
-// TODO(adonovan): add support for vendoring and delete this.
-var skip = map[string]bool{
-	"cmd/addr2line":        true,
-	"cmd/internal/objfile": true,
-	"cmd/nm":               true,
-	"cmd/objdump":          true,
-	"cmd/pprof":            true,
-}
-
-func bytesAllocated() uint64 {
-	runtime.GC()
-	var stats runtime.MemStats
-	runtime.ReadMemStats(&stats)
-	return stats.Alloc
-}
-
-func TestStdlib(t *testing.T) {
-	if testing.Short() {
-		t.Skip("skipping in short mode; too slow (golang.org/issue/14113)")
-	}
-	// Load, parse and type-check the program.
-	t0 := time.Now()
-	alloc0 := bytesAllocated()
-
-	// Load, parse and type-check the program.
-	ctxt := build.Default // copy
-	ctxt.GOPATH = ""      // disable GOPATH
-	conf := loader.Config{Build: &ctxt}
-	for _, path := range buildutil.AllPackages(conf.Build) {
-		if skip[path] {
-			continue
-		}
-		conf.ImportWithTests(path)
-	}
-
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Fatalf("Load failed: %v", err)
-	}
-
-	t1 := time.Now()
-	alloc1 := bytesAllocated()
-
-	// Create SSA packages.
-	var mode ssa.BuilderMode
-	// Comment out these lines during benchmarking.  Approx SSA build costs are noted.
-	mode |= ssa.SanityCheckFunctions // + 2% space, + 4% time
-	mode |= ssa.GlobalDebug          // +30% space, +18% time
-	prog := ssautil.CreateProgram(iprog, mode)
-
-	t2 := time.Now()
-
-	// Build SSA.
-	prog.Build()
-
-	t3 := time.Now()
-	alloc3 := bytesAllocated()
-
-	numPkgs := len(prog.AllPackages())
-	if want := 140; numPkgs < want {
-		t.Errorf("Loaded only %d packages, want at least %d", numPkgs, want)
-	}
-
-	// Keep iprog reachable until after we've measured memory usage.
-	if len(iprog.AllPackages) == 0 {
-		panic("unreachable")
-	}
-
-	allFuncs := ssautil.AllFunctions(prog)
-
-	// Check that all non-synthetic functions have distinct names.
-	// Synthetic wrappers for exported methods should be distinct too,
-	// except for unexported ones (explained at (*Function).RelString).
-	byName := make(map[string]*ssa.Function)
-	for fn := range allFuncs {
-		if fn.Synthetic == "" || ast.IsExported(fn.Name()) {
-			str := fn.String()
-			prev := byName[str]
-			byName[str] = fn
-			if prev != nil {
-				t.Errorf("%s: duplicate function named %s",
-					prog.Fset.Position(fn.Pos()), str)
-				t.Errorf("%s:   (previously defined here)",
-					prog.Fset.Position(prev.Pos()))
-			}
-		}
-	}
-
-	// Dump some statistics.
-	var numInstrs int
-	for fn := range allFuncs {
-		for _, b := range fn.Blocks {
-			numInstrs += len(b.Instrs)
-		}
-	}
-
-	// determine line count
-	var lineCount int
-	prog.Fset.Iterate(func(f *token.File) bool {
-		lineCount += f.LineCount()
-		return true
-	})
-
-	// NB: when benchmarking, don't forget to clear the debug +
-	// sanity builder flags for better performance.
-
-	t.Log("GOMAXPROCS:           ", runtime.GOMAXPROCS(0))
-	t.Log("#Source lines:        ", lineCount)
-	t.Log("Load/parse/typecheck: ", t1.Sub(t0))
-	t.Log("SSA create:           ", t2.Sub(t1))
-	t.Log("SSA build:            ", t3.Sub(t2))
-
-	// SSA stats:
-	t.Log("#Packages:            ", numPkgs)
-	t.Log("#Functions:           ", len(allFuncs))
-	t.Log("#Instructions:        ", numInstrs)
-	t.Log("#MB AST+types:        ", int64(alloc1-alloc0)/1e6)
-	t.Log("#MB SSA:              ", int64(alloc3-alloc1)/1e6)
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/testdata/objlookup.go b/installer/vendor/golang.org/x/tools/go/ssa/testdata/objlookup.go
deleted file mode 100644
index 1aaa417e80..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/testdata/objlookup.go
+++ /dev/null
@@ -1,160 +0,0 @@
-//+build ignore
-
-package main
-
-// This file is the input to TestObjValueLookup in source_test.go,
-// which ensures that each occurrence of an ident defining or
-// referring to a func, var or const object can be mapped to its
-// corresponding SSA Value.
-//
-// For every reference to a var object, we use annotations in comments
-// to denote both the expected SSA Value kind, and whether to expect
-// its value (x) or its address (&x).
-//
-// For const and func objects, the results don't vary by reference and
-// are always values not addresses, so no annotations are needed.  The
-// declaration is enough.
-
-import "fmt"
-import "os"
-
-type J int
-
-func (*J) method() {}
-
-const globalConst = 0
-
-var globalVar int // &globalVar::Global
-
-func globalFunc() {}
-
-type I interface {
-	interfaceMethod()
-}
-
-type S struct {
-	x int // x::nil
-}
-
-func main() {
-	print(globalVar) // globalVar::UnOp
-	globalVar = 1    // globalVar::Const
-
-	var v0 int = 1 // v0::Const (simple local value spec)
-	if v0 > 0 {    // v0::Const
-		v0 = 2 // v0::Const
-	}
-	print(v0) // v0::Phi
-
-	// v1 is captured and thus implicitly address-taken.
-	var v1 int = 1         // v1::Const
-	v1 = 2                 // v1::Const
-	fmt.Println(v1)        // v1::UnOp (load)
-	f := func(param int) { // f::MakeClosure param::Parameter
-		if y := 1; y > 0 { // y::Const
-			print(v1, param) // v1::UnOp (load) param::Parameter
-		}
-		param = 2      // param::Const
-		println(param) // param::Const
-	}
-
-	f(0) // f::MakeClosure
-
-	var v2 int // v2::Const (implicitly zero-initialized local value spec)
-	print(v2)  // v2::Const
-
-	m := make(map[string]int) // m::MakeMap
-
-	// Local value spec with multi-valued RHS:
-	var v3, v4 = m[""] // v3::Extract v4::Extract m::MakeMap
-	print(v3)          // v3::Extract
-	print(v4)          // v4::Extract
-
-	v3++    // v3::BinOp (assign with op)
-	v3 += 2 // v3::BinOp (assign with op)
-
-	v5, v6 := false, "" // v5::Const v6::Const (defining assignment)
-	print(v5)           // v5::Const
-	print(v6)           // v6::Const
-
-	var v7 S    // &v7::Alloc
-	v7.x = 1    // &v7::Alloc &x::FieldAddr
-	print(v7.x) // &v7::Alloc &x::FieldAddr
-
-	var v8 [1]int // &v8::Alloc
-	v8[0] = 0     // &v8::Alloc
-	print(v8[:])  // &v8::Alloc
-	_ = v8[0]     // &v8::Alloc
-	_ = v8[:][0]  // &v8::Alloc
-	v8ptr := &v8  // v8ptr::Alloc &v8::Alloc
-	_ = v8ptr[0]  // v8ptr::Alloc
-	_ = *v8ptr    // v8ptr::Alloc
-
-	v8a := make([]int, 1) // v8a::Slice
-	v8a[0] = 0            // v8a::Slice
-	print(v8a[:])         // v8a::Slice
-
-	v9 := S{} // &v9::Alloc
-
-	v10 := &v9 // v10::Alloc &v9::Alloc
-	_ = v10    // v10::Alloc
-
-	var v11 *J = nil // v11::Const
-	v11.method()     // v11::Const
-
-	var v12 J    // &v12::Alloc
-	v12.method() // &v12::Alloc (implicitly address-taken)
-
-	// NB, in the following, 'method' resolves to the *types.Func
-	// of (*J).method, so it doesn't help us locate the specific
-	// ssa.Values here: a bound-method closure and a promotion
-	// wrapper.
-	_ = v11.method            // v11::Const
-	_ = (*struct{ J }).method // J::nil
-
-	// These vars are not optimised away.
-	if false {
-		v13 := 0     // v13::Const
-		println(v13) // v13::Const
-	}
-
-	switch x := 1; x { // x::Const
-	case v0: // v0::Phi
-	}
-
-	for k, v := range m { // k::Extract v::Extract m::MakeMap
-		_ = k // k::Extract
-		v++   // v::BinOp
-	}
-
-	if y := 0; y > 1 { // y::Const y::Const
-	}
-
-	var i interface{}      // i::Const (nil interface)
-	i = 1                  // i::MakeInterface
-	switch i := i.(type) { // i::MakeInterface i::MakeInterface
-	case int:
-		println(i) // i::Extract
-	}
-
-	ch := make(chan int) // ch::MakeChan
-	select {
-	case x := <-ch: // x::UnOp (receive) ch::MakeChan
-		_ = x // x::UnOp
-	}
-
-	// .Op is an inter-package FieldVal-selection.
-	var err os.PathError // &err::Alloc
-	_ = err.Op           // &err::Alloc &Op::FieldAddr
-	_ = &err.Op          // &err::Alloc &Op::FieldAddr
-
-	// Exercise corner-cases of lvalues vs rvalues.
-	// (Guessing IsAddr from the 'pointerness' won't cut it here.)
-	type N *N
-	var n N    // n::Const
-	n1 := n    // n1::Const n::Const
-	n2 := &n1  // n2::Alloc &n1::Alloc
-	n3 := *n2  // n3::UnOp n2::Alloc
-	n4 := **n3 // n4::UnOp n3::UnOp
-	_ = n4     // n4::UnOp
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/testdata/structconv.go b/installer/vendor/golang.org/x/tools/go/ssa/testdata/structconv.go
deleted file mode 100644
index 31264691bb..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/testdata/structconv.go
+++ /dev/null
@@ -1,24 +0,0 @@
-//+build ignore
-
-// This file is the input to TestValueForExprStructConv in identical_test.go,
-// which uses the same framework as TestValueForExpr does in source_test.go.
-//
-// In Go 1.8, struct conversions are permitted even when the struct types have
-// different tags. This wasn't permitted in earlier versions of Go, so this file
-// exists separately from valueforexpr.go to just test this behavior in Go 1.8
-// and later.
-
-package main
-
-type t1 struct {
-	x int
-}
-type t2 struct {
-	x int `tag`
-}
-
-func main() {
-	var tv1 t1
-	var tv2 t2 = /*@ChangeType*/ (t2(tv1))
-	_ = tv2
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/testdata/valueforexpr.go b/installer/vendor/golang.org/x/tools/go/ssa/testdata/valueforexpr.go
deleted file mode 100644
index 4a2cb85a38..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/testdata/valueforexpr.go
+++ /dev/null
@@ -1,152 +0,0 @@
-//+build ignore
-
-package main
-
-// This file is the input to TestValueForExpr in source_test.go, which
-// ensures that each expression e immediately following a /*@kind*/(x)
-// annotation, when passed to Function.ValueForExpr(e), returns a
-// non-nil Value of the same type as e and of kind 'kind'.
-
-func f(spilled, unspilled int) {
-	_ = /*@UnOp*/ (spilled)
-	_ = /*@Parameter*/ (unspilled)
-	_ = /*@<nil>*/ (1 + 2) // (constant)
-	i := 0
-
-	f := func() (int, int) { return 0, 0 }
-
-	/*@Call*/ (print( /*@BinOp*/ (i + 1)))
-	_, _ = /*@Call*/ (f())
-	ch := /*@MakeChan*/ (make(chan int))
-	/*@UnOp*/ (<-ch)
-	x := /*@UnOp*/ (<-ch)
-	_ = x
-	select {
-	case /*@Extract*/ (<-ch):
-	case x := /*@Extract*/ (<-ch):
-		_ = x
-	}
-	defer /*@Function*/ (func() {
-	})()
-	go /*@Function*/ (func() {
-	})()
-	y := 0
-	if true && /*@BinOp*/ (bool(y > 0)) {
-		y = 1
-	}
-	_ = /*@Phi*/ (y)
-	map1 := /*@MakeMap*/ (make(map[string]string))
-	_ = map1
-	_ = /*@Slice*/ (make([]int, 0))
-	_ = /*@MakeClosure*/ (func() { print(spilled) })
-
-	sl := []int{}
-	_ = /*@Slice*/ (sl[:0])
-
-	_ = /*@<nil>*/ (new(int)) // optimized away
-	tmp := /*@Alloc*/ (new(int))
-	_ = tmp
-	var iface interface{}
-	_ = /*@TypeAssert*/ (iface.(int))
-	_ = /*@UnOp*/ (sl[0])
-	_ = /*@IndexAddr*/ (&sl[0])
-	_ = /*@Index*/ ([2]int{}[0])
-	var p *int
-	_ = /*@UnOp*/ (*p)
-
-	_ = /*@UnOp*/ (global)
-	/*@UnOp*/ (global)[""] = ""
-	/*@Global*/ (global) = map[string]string{}
-
-	var local t
-	/*UnOp*/ (local.x) = 1
-
-	// Exercise corner-cases of lvalues vs rvalues.
-	type N *N
-	var n N
-	/*@UnOp*/ (n) = /*@UnOp*/ (n)
-	/*@ChangeType*/ (n) = /*@Alloc*/ (&n)
-	/*@UnOp*/ (n) = /*@UnOp*/ (*n)
-	/*@UnOp*/ (n) = /*@UnOp*/ (**n)
-}
-
-func complit() {
-	// Composite literals.
-	// We get different results for
-	// - composite literal as value (e.g. operand to print)
-	// - composite literal initializer for addressable value
-	// - composite literal value assigned to blank var
-
-	// 1. Slices
-	print( /*@Slice*/ ([]int{}))
-	print( /*@Alloc*/ (&[]int{}))
-	print(& /*@Slice*/ ([]int{}))
-
-	sl1 := /*@Slice*/ ([]int{})
-	sl2 := /*@Alloc*/ (&[]int{})
-	sl3 := & /*@Slice*/ ([]int{})
-	_, _, _ = sl1, sl2, sl3
-
-	_ = /*@Slice*/ ([]int{})
-	_ = /*@<nil>*/ (& /*@Slice*/ ([]int{})) // & optimized away
-	_ = & /*@Slice*/ ([]int{})
-
-	// 2. Arrays
-	print( /*@UnOp*/ ([1]int{}))
-	print( /*@Alloc*/ (&[1]int{}))
-	print(& /*@Alloc*/ ([1]int{}))
-
-	arr1 := /*@Alloc*/ ([1]int{})
-	arr2 := /*@Alloc*/ (&[1]int{})
-	arr3 := & /*@Alloc*/ ([1]int{})
-	_, _, _ = arr1, arr2, arr3
-
-	_ = /*@UnOp*/ ([1]int{})
-	_ = /*@Alloc*/ (& /*@Alloc*/ ([1]int{}))
-	_ = & /*@Alloc*/ ([1]int{})
-
-	// 3. Maps
-	type M map[int]int
-	print( /*@MakeMap*/ (M{}))
-	print( /*@Alloc*/ (&M{}))
-	print(& /*@MakeMap*/ (M{}))
-
-	m1 := /*@MakeMap*/ (M{})
-	m2 := /*@Alloc*/ (&M{})
-	m3 := & /*@MakeMap*/ (M{})
-	_, _, _ = m1, m2, m3
-
-	_ = /*@MakeMap*/ (M{})
-	_ = /*@<nil>*/ (& /*@MakeMap*/ (M{})) // & optimized away
-	_ = & /*@MakeMap*/ (M{})
-
-	// 4. Structs
-	print( /*@UnOp*/ (struct{}{}))
-	print( /*@Alloc*/ (&struct{}{}))
-	print(& /*@Alloc*/ (struct{}{}))
-
-	s1 := /*@Alloc*/ (struct{}{})
-	s2 := /*@Alloc*/ (&struct{}{})
-	s3 := & /*@Alloc*/ (struct{}{})
-	_, _, _ = s1, s2, s3
-
-	_ = /*@UnOp*/ (struct{}{})
-	_ = /*@Alloc*/ (& /*@Alloc*/ (struct{}{}))
-	_ = & /*@Alloc*/ (struct{}{})
-}
-
-type t struct{ x int }
-
-// Ensure we can locate methods of named types.
-func (t) f(param int) {
-	_ = /*@Parameter*/ (param)
-}
-
-// Ensure we can locate init functions.
-func init() {
-	m := /*@MakeMap*/ (make(map[string]string))
-	_ = m
-}
-
-// Ensure we can locate variables in initializer expressions.
-var global = /*@MakeMap*/ (make(map[string]string))
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/testmain.go b/installer/vendor/golang.org/x/tools/go/ssa/testmain.go
deleted file mode 100644
index 8391f26d62..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/testmain.go
+++ /dev/null
@@ -1,265 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// CreateTestMainPackage synthesizes a main package that runs all the
-// tests of the supplied packages.
-// It is closely coupled to $GOROOT/src/cmd/go/test.go and $GOROOT/src/testing.
-//
-// TODO(adonovan): this file no longer needs to live in the ssa package.
-// Move it to ssautil.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/types"
-	"log"
-	"os"
-	"strings"
-	"text/template"
-)
-
-// FindTests returns the Test, Benchmark, and Example functions
-// (as defined by "go test") defined in the specified package,
-// and its TestMain function, if any.
-func FindTests(pkg *Package) (tests, benchmarks, examples []*Function, main *Function) {
-	prog := pkg.Prog
-
-	// The first two of these may be nil: if the program doesn't import "testing",
-	// it can't contain any tests, but it may yet contain Examples.
-	var testSig *types.Signature                              // func(*testing.T)
-	var benchmarkSig *types.Signature                         // func(*testing.B)
-	var exampleSig = types.NewSignature(nil, nil, nil, false) // func()
-
-	// Obtain the types from the parameters of testing.MainStart.
-	if testingPkg := prog.ImportedPackage("testing"); testingPkg != nil {
-		mainStart := testingPkg.Func("MainStart")
-		params := mainStart.Signature.Params()
-		testSig = funcField(params.At(1).Type())
-		benchmarkSig = funcField(params.At(2).Type())
-
-		// Does the package define this function?
-		//   func TestMain(*testing.M)
-		if f := pkg.Func("TestMain"); f != nil {
-			sig := f.Type().(*types.Signature)
-			starM := mainStart.Signature.Results().At(0).Type() // *testing.M
-			if sig.Results().Len() == 0 &&
-				sig.Params().Len() == 1 &&
-				types.Identical(sig.Params().At(0).Type(), starM) {
-				main = f
-			}
-		}
-	}
-
-	// TODO(adonovan): use a stable order, e.g. lexical.
-	for _, mem := range pkg.Members {
-		if f, ok := mem.(*Function); ok &&
-			ast.IsExported(f.Name()) &&
-			strings.HasSuffix(prog.Fset.Position(f.Pos()).Filename, "_test.go") {
-
-			switch {
-			case testSig != nil && isTestSig(f, "Test", testSig):
-				tests = append(tests, f)
-			case benchmarkSig != nil && isTestSig(f, "Benchmark", benchmarkSig):
-				benchmarks = append(benchmarks, f)
-			case isTestSig(f, "Example", exampleSig):
-				examples = append(examples, f)
-			default:
-				continue
-			}
-		}
-	}
-	return
-}
-
-// Like isTest, but checks the signature too.
-func isTestSig(f *Function, prefix string, sig *types.Signature) bool {
-	return isTest(f.Name(), prefix) && types.Identical(f.Signature, sig)
-}
-
-// Given the type of one of the three slice parameters of testing.Main,
-// returns the function type.
-func funcField(slice types.Type) *types.Signature {
-	return slice.(*types.Slice).Elem().Underlying().(*types.Struct).Field(1).Type().(*types.Signature)
-}
-
-// isTest tells whether name looks like a test (or benchmark, according to prefix).
-// It is a Test (say) if there is a character after Test that is not a lower-case letter.
-// We don't want TesticularCancer.
-// Plundered from $GOROOT/src/cmd/go/test.go
-func isTest(name, prefix string) bool {
-	if !strings.HasPrefix(name, prefix) {
-		return false
-	}
-	if len(name) == len(prefix) { // "Test" is ok
-		return true
-	}
-	return ast.IsExported(name[len(prefix):])
-}
-
-// CreateTestMainPackage creates and returns a synthetic "testmain"
-// package for the specified package if it defines tests, benchmarks or
-// executable examples, or nil otherwise.  The new package is named
-// "main" and provides a function named "main" that runs the tests,
-// similar to the one that would be created by the 'go test' tool.
-//
-// Subsequent calls to prog.AllPackages include the new package.
-// The package pkg must belong to the program prog.
-func (prog *Program) CreateTestMainPackage(pkg *Package) *Package {
-	if pkg.Prog != prog {
-		log.Fatal("Package does not belong to Program")
-	}
-
-	// Template data
-	var data struct {
-		Pkg                         *Package
-		Tests, Benchmarks, Examples []*Function
-		Main                        *Function
-		Go18                        bool
-	}
-	data.Pkg = pkg
-
-	// Enumerate tests.
-	data.Tests, data.Benchmarks, data.Examples, data.Main = FindTests(pkg)
-	if data.Main == nil &&
-		data.Tests == nil && data.Benchmarks == nil && data.Examples == nil {
-		return nil
-	}
-
-	// Synthesize source for testmain package.
-	path := pkg.Pkg.Path() + "$testmain"
-	tmpl := testmainTmpl
-	if testingPkg := prog.ImportedPackage("testing"); testingPkg != nil {
-		// In Go 1.8, testing.MainStart's first argument is an interface, not a func.
-		data.Go18 = types.IsInterface(testingPkg.Func("MainStart").Signature.Params().At(0).Type())
-	} else {
-		// The program does not import "testing", but FindTests
-		// returned non-nil, which must mean there were Examples
-		// but no Test, Benchmark, or TestMain functions.
-
-		// We'll simply call them from testmain.main; this will
-		// ensure they don't panic, but will not check any
-		// "Output:" comments.
-		// (We should not execute an Example that has no
-		// "Output:" comment, but it's impossible to tell here.)
-		tmpl = examplesOnlyTmpl
-	}
-	var buf bytes.Buffer
-	if err := tmpl.Execute(&buf, data); err != nil {
-		log.Fatalf("internal error expanding template for %s: %v", path, err)
-	}
-	if false { // debugging
-		fmt.Fprintln(os.Stderr, buf.String())
-	}
-
-	// Parse and type-check the testmain package.
-	f, err := parser.ParseFile(prog.Fset, path+".go", &buf, parser.Mode(0))
-	if err != nil {
-		log.Fatalf("internal error parsing %s: %v", path, err)
-	}
-	conf := types.Config{
-		DisableUnusedImportCheck: true,
-		Importer:                 importer{pkg},
-	}
-	files := []*ast.File{f}
-	info := &types.Info{
-		Types:      make(map[ast.Expr]types.TypeAndValue),
-		Defs:       make(map[*ast.Ident]types.Object),
-		Uses:       make(map[*ast.Ident]types.Object),
-		Implicits:  make(map[ast.Node]types.Object),
-		Scopes:     make(map[ast.Node]*types.Scope),
-		Selections: make(map[*ast.SelectorExpr]*types.Selection),
-	}
-	testmainPkg, err := conf.Check(path, prog.Fset, files, info)
-	if err != nil {
-		log.Fatalf("internal error type-checking %s: %v", path, err)
-	}
-
-	// Create and build SSA code.
-	testmain := prog.CreatePackage(testmainPkg, files, info, false)
-	testmain.SetDebugMode(false)
-	testmain.Build()
-	testmain.Func("main").Synthetic = "test main function"
-	testmain.Func("init").Synthetic = "package initializer"
-	return testmain
-}
-
-// An implementation of types.Importer for an already loaded SSA program.
-type importer struct {
-	pkg *Package // package under test; may be non-importable
-}
-
-func (imp importer) Import(path string) (*types.Package, error) {
-	if p := imp.pkg.Prog.ImportedPackage(path); p != nil {
-		return p.Pkg, nil
-	}
-	if path == imp.pkg.Pkg.Path() {
-		return imp.pkg.Pkg, nil
-	}
-	return nil, fmt.Errorf("not found") // can't happen
-}
-
-var testmainTmpl = template.Must(template.New("testmain").Parse(`
-package main
-
-import "io"
-import "os"
-import "testing"
-import p {{printf "%q" .Pkg.Pkg.Path}}
-
-{{if .Go18}}
-type deps struct{}
-
-func (deps) MatchString(pat, str string) (bool, error) { return true, nil }
-func (deps) StartCPUProfile(io.Writer) error { return nil }
-func (deps) StopCPUProfile() {}
-func (deps) WriteHeapProfile(io.Writer) error { return nil }
-func (deps) WriteProfileTo(string, io.Writer, int) error { return nil }
-func (deps) ImportPath() string { return "" }
-
-var match deps
-{{else}}
-func match(_, _ string) (bool, error) { return true, nil }
-{{end}}
-
-func main() {
-	tests := []testing.InternalTest{
-{{range .Tests}}
-		{ {{printf "%q" .Name}}, p.{{.Name}} },
-{{end}}
-	}
-	benchmarks := []testing.InternalBenchmark{
-{{range .Benchmarks}}
-		{ {{printf "%q" .Name}}, p.{{.Name}} },
-{{end}}
-	}
-	examples := []testing.InternalExample{
-{{range .Examples}}
-		{Name: {{printf "%q" .Name}}, F: p.{{.Name}}},
-{{end}}
-	}
-	m := testing.MainStart(match, tests, benchmarks, examples)
-{{with .Main}}
-	p.{{.Name}}(m)
-{{else}}
-	os.Exit(m.Run())
-{{end}}
-}
-
-`))
-
-var examplesOnlyTmpl = template.Must(template.New("examples").Parse(`
-package main
-
-import p {{printf "%q" .Pkg.Pkg.Path}}
-
-func main() {
-{{range .Examples}}
-	p.{{.Name}}()
-{{end}}
-}
-`))
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/testmain_test.go b/installer/vendor/golang.org/x/tools/go/ssa/testmain_test.go
deleted file mode 100644
index e24b23b9d4..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/testmain_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa_test
-
-// Tests of FindTests.  CreateTestMainPackage is tested via the interpreter.
-// TODO(adonovan): test the 'pkgs' result from FindTests.
-
-import (
-	"fmt"
-	"sort"
-	"testing"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-func create(t *testing.T, content string) *ssa.Package {
-	var conf loader.Config
-	f, err := conf.ParseFile("foo_test.go", content)
-	if err != nil {
-		t.Fatal(err)
-	}
-	conf.CreateFromFiles("foo", f)
-
-	lprog, err := conf.Load()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// We needn't call Build.
-	foo := lprog.Package("foo").Pkg
-	return ssautil.CreateProgram(lprog, ssa.SanityCheckFunctions).Package(foo)
-}
-
-func TestFindTests(t *testing.T) {
-	test := `
-package foo
-
-import "testing"
-
-type T int
-
-// Tests:
-func Test(t *testing.T) {}
-func TestA(t *testing.T) {}
-func TestB(t *testing.T) {}
-
-// Not tests:
-func testC(t *testing.T) {}
-func TestD() {}
-func testE(t *testing.T) int { return 0 }
-func (T) Test(t *testing.T) {}
-
-// Benchmarks:
-func Benchmark(*testing.B) {}
-func BenchmarkA(b *testing.B) {}
-func BenchmarkB(*testing.B) {}
-
-// Not benchmarks:
-func benchmarkC(t *testing.T) {}
-func BenchmarkD() {}
-func benchmarkE(t *testing.T) int { return 0 }
-func (T) Benchmark(t *testing.T) {}
-
-// Examples:
-func Example() {}
-func ExampleA() {}
-
-// Not examples:
-func exampleC() {}
-func ExampleD(t *testing.T) {}
-func exampleE() int { return 0 }
-func (T) Example() {}
-`
-	pkg := create(t, test)
-	tests, benchmarks, examples, _ := ssa.FindTests(pkg)
-
-	sort.Sort(funcsByPos(tests))
-	if got, want := fmt.Sprint(tests), "[foo.Test foo.TestA foo.TestB]"; got != want {
-		t.Errorf("FindTests.tests = %s, want %s", got, want)
-	}
-
-	sort.Sort(funcsByPos(benchmarks))
-	if got, want := fmt.Sprint(benchmarks), "[foo.Benchmark foo.BenchmarkA foo.BenchmarkB]"; got != want {
-		t.Errorf("FindTests.benchmarks = %s, want %s", got, want)
-	}
-
-	sort.Sort(funcsByPos(examples))
-	if got, want := fmt.Sprint(examples), "[foo.Example foo.ExampleA]"; got != want {
-		t.Errorf("FindTests examples = %s, want %s", got, want)
-	}
-}
-
-func TestFindTestsTesting(t *testing.T) {
-	test := `
-package foo
-
-// foo does not import "testing", but defines Examples.
-
-func Example() {}
-func ExampleA() {}
-`
-	pkg := create(t, test)
-	tests, benchmarks, examples, _ := ssa.FindTests(pkg)
-	if len(tests) > 0 {
-		t.Errorf("FindTests.tests = %s, want none", tests)
-	}
-	if len(benchmarks) > 0 {
-		t.Errorf("FindTests.benchmarks = %s, want none", benchmarks)
-	}
-	sort.Sort(funcsByPos(examples))
-	if got, want := fmt.Sprint(examples), "[foo.Example foo.ExampleA]"; got != want {
-		t.Errorf("FindTests examples = %s, want %s", got, want)
-	}
-}
-
-type funcsByPos []*ssa.Function
-
-func (p funcsByPos) Len() int           { return len(p) }
-func (p funcsByPos) Less(i, j int) bool { return p[i].Pos() < p[j].Pos() }
-func (p funcsByPos) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/util.go b/installer/vendor/golang.org/x/tools/go/ssa/util.go
deleted file mode 100644
index ddb1184609..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/util.go
+++ /dev/null
@@ -1,119 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines a number of miscellaneous utility functions.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"io"
-	"os"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-//// AST utilities
-
-func unparen(e ast.Expr) ast.Expr { return astutil.Unparen(e) }
-
-// isBlankIdent returns true iff e is an Ident with name "_".
-// They have no associated types.Object, and thus no type.
-//
-func isBlankIdent(e ast.Expr) bool {
-	id, ok := e.(*ast.Ident)
-	return ok && id.Name == "_"
-}
-
-//// Type utilities.  Some of these belong in go/types.
-
-// isPointer returns true for types whose underlying type is a pointer.
-func isPointer(typ types.Type) bool {
-	_, ok := typ.Underlying().(*types.Pointer)
-	return ok
-}
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
-
-// deref returns a pointer's element type; otherwise it returns typ.
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
-
-// recvType returns the receiver type of method obj.
-func recvType(obj *types.Func) types.Type {
-	return obj.Type().(*types.Signature).Recv().Type()
-}
-
-// DefaultType returns the default "typed" type for an "untyped" type;
-// it returns the incoming type for all other types.  The default type
-// for untyped nil is untyped nil.
-//
-// Exported to ssa/interp.
-//
-// TODO(adonovan): use go/types.DefaultType after 1.8.
-//
-func DefaultType(typ types.Type) types.Type {
-	if t, ok := typ.(*types.Basic); ok {
-		k := t.Kind()
-		switch k {
-		case types.UntypedBool:
-			k = types.Bool
-		case types.UntypedInt:
-			k = types.Int
-		case types.UntypedRune:
-			k = types.Rune
-		case types.UntypedFloat:
-			k = types.Float64
-		case types.UntypedComplex:
-			k = types.Complex128
-		case types.UntypedString:
-			k = types.String
-		}
-		typ = types.Typ[k]
-	}
-	return typ
-}
-
-// logStack prints the formatted "start" message to stderr and
-// returns a closure that prints the corresponding "end" message.
-// Call using 'defer logStack(...)()' to show builder stack on panic.
-// Don't forget trailing parens!
-//
-func logStack(format string, args ...interface{}) func() {
-	msg := fmt.Sprintf(format, args...)
-	io.WriteString(os.Stderr, msg)
-	io.WriteString(os.Stderr, "\n")
-	return func() {
-		io.WriteString(os.Stderr, msg)
-		io.WriteString(os.Stderr, " end\n")
-	}
-}
-
-// newVar creates a 'var' for use in a types.Tuple.
-func newVar(name string, typ types.Type) *types.Var {
-	return types.NewParam(token.NoPos, nil, name, typ)
-}
-
-// anonVar creates an anonymous 'var' for use in a types.Tuple.
-func anonVar(typ types.Type) *types.Var {
-	return newVar("", typ)
-}
-
-var lenResults = types.NewTuple(anonVar(tInt))
-
-// makeLen returns the len builtin specialized to type func(T)int.
-func makeLen(T types.Type) *Builtin {
-	lenParams := types.NewTuple(anonVar(T))
-	return &Builtin{
-		name: "len",
-		sig:  types.NewSignature(nil, lenParams, lenResults, false),
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/ssa/wrappers.go b/installer/vendor/golang.org/x/tools/go/ssa/wrappers.go
deleted file mode 100644
index 701dd90d7d..0000000000
--- a/installer/vendor/golang.org/x/tools/go/ssa/wrappers.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package ssa
-
-// This file defines synthesis of Functions that delegate to declared
-// methods; they come in three kinds:
-//
-// (1) wrappers: methods that wrap declared methods, performing
-//     implicit pointer indirections and embedded field selections.
-//
-// (2) thunks: funcs that wrap declared methods.  Like wrappers,
-//     thunks perform indirections and field selections. The thunk's
-//     first parameter is used as the receiver for the method call.
-//
-// (3) bounds: funcs that wrap declared methods.  The bound's sole
-//     free variable, supplied by a closure, is used as the receiver
-//     for the method call.  No indirections or field selections are
-//     performed since they can be done before the call.
-
-import (
-	"fmt"
-
-	"go/types"
-)
-
-// -- wrappers -----------------------------------------------------------
-
-// makeWrapper returns a synthetic method that delegates to the
-// declared method denoted by meth.Obj(), first performing any
-// necessary pointer indirections or field selections implied by meth.
-//
-// The resulting method's receiver type is meth.Recv().
-//
-// This function is versatile but quite subtle!  Consider the
-// following axes of variation when making changes:
-//   - optional receiver indirection
-//   - optional implicit field selections
-//   - meth.Obj() may denote a concrete or an interface method
-//   - the result may be a thunk or a wrapper.
-//
-// EXCLUSIVE_LOCKS_REQUIRED(prog.methodsMu)
-//
-func makeWrapper(prog *Program, sel *types.Selection) *Function {
-	obj := sel.Obj().(*types.Func)       // the declared function
-	sig := sel.Type().(*types.Signature) // type of this wrapper
-
-	var recv *types.Var // wrapper's receiver or thunk's params[0]
-	name := obj.Name()
-	var description string
-	var start int // first regular param
-	if sel.Kind() == types.MethodExpr {
-		name += "$thunk"
-		description = "thunk"
-		recv = sig.Params().At(0)
-		start = 1
-	} else {
-		description = "wrapper"
-		recv = sig.Recv()
-	}
-
-	description = fmt.Sprintf("%s for %s", description, sel.Obj())
-	if prog.mode&LogSource != 0 {
-		defer logStack("make %s to (%s)", description, recv.Type())()
-	}
-	fn := &Function{
-		name:      name,
-		method:    sel,
-		object:    obj,
-		Signature: sig,
-		Synthetic: description,
-		Prog:      prog,
-		pos:       obj.Pos(),
-	}
-	fn.startBody()
-	fn.addSpilledParam(recv)
-	createParams(fn, start)
-
-	indices := sel.Index()
-
-	var v Value = fn.Locals[0] // spilled receiver
-	if isPointer(sel.Recv()) {
-		v = emitLoad(fn, v)
-
-		// For simple indirection wrappers, perform an informative nil-check:
-		// "value method (T).f called using nil *T pointer"
-		if len(indices) == 1 && !isPointer(recvType(obj)) {
-			var c Call
-			c.Call.Value = &Builtin{
-				name: "ssa:wrapnilchk",
-				sig: types.NewSignature(nil,
-					types.NewTuple(anonVar(sel.Recv()), anonVar(tString), anonVar(tString)),
-					types.NewTuple(anonVar(sel.Recv())), false),
-			}
-			c.Call.Args = []Value{
-				v,
-				stringConst(deref(sel.Recv()).String()),
-				stringConst(sel.Obj().Name()),
-			}
-			c.setType(v.Type())
-			v = fn.emit(&c)
-		}
-	}
-
-	// Invariant: v is a pointer, either
-	//   value of *A receiver param, or
-	// address of  A spilled receiver.
-
-	// We use pointer arithmetic (FieldAddr possibly followed by
-	// Load) in preference to value extraction (Field possibly
-	// preceded by Load).
-
-	v = emitImplicitSelections(fn, v, indices[:len(indices)-1])
-
-	// Invariant: v is a pointer, either
-	//   value of implicit *C field, or
-	// address of implicit  C field.
-
-	var c Call
-	if r := recvType(obj); !isInterface(r) { // concrete method
-		if !isPointer(r) {
-			v = emitLoad(fn, v)
-		}
-		c.Call.Value = prog.declaredFunc(obj)
-		c.Call.Args = append(c.Call.Args, v)
-	} else {
-		c.Call.Method = obj
-		c.Call.Value = emitLoad(fn, v)
-	}
-	for _, arg := range fn.Params[1:] {
-		c.Call.Args = append(c.Call.Args, arg)
-	}
-	emitTailCall(fn, &c)
-	fn.finishBody()
-	return fn
-}
-
-// createParams creates parameters for wrapper method fn based on its
-// Signature.Params, which do not include the receiver.
-// start is the index of the first regular parameter to use.
-//
-func createParams(fn *Function, start int) {
-	var last *Parameter
-	tparams := fn.Signature.Params()
-	for i, n := start, tparams.Len(); i < n; i++ {
-		last = fn.addParamObj(tparams.At(i))
-	}
-	if fn.Signature.Variadic() {
-		last.typ = types.NewSlice(last.typ)
-	}
-}
-
-// -- bounds -----------------------------------------------------------
-
-// makeBound returns a bound method wrapper (or "bound"), a synthetic
-// function that delegates to a concrete or interface method denoted
-// by obj.  The resulting function has no receiver, but has one free
-// variable which will be used as the method's receiver in the
-// tail-call.
-//
-// Use MakeClosure with such a wrapper to construct a bound method
-// closure.  e.g.:
-//
-//   type T int          or:  type T interface { meth() }
-//   func (t T) meth()
-//   var t T
-//   f := t.meth
-//   f() // calls t.meth()
-//
-// f is a closure of a synthetic wrapper defined as if by:
-//
-//   f := func() { return t.meth() }
-//
-// Unlike makeWrapper, makeBound need perform no indirection or field
-// selections because that can be done before the closure is
-// constructed.
-//
-// EXCLUSIVE_LOCKS_ACQUIRED(meth.Prog.methodsMu)
-//
-func makeBound(prog *Program, obj *types.Func) *Function {
-	prog.methodsMu.Lock()
-	defer prog.methodsMu.Unlock()
-	fn, ok := prog.bounds[obj]
-	if !ok {
-		description := fmt.Sprintf("bound method wrapper for %s", obj)
-		if prog.mode&LogSource != 0 {
-			defer logStack("%s", description)()
-		}
-		fn = &Function{
-			name:      obj.Name() + "$bound",
-			object:    obj,
-			Signature: changeRecv(obj.Type().(*types.Signature), nil), // drop receiver
-			Synthetic: description,
-			Prog:      prog,
-			pos:       obj.Pos(),
-		}
-
-		fv := &FreeVar{name: "recv", typ: recvType(obj), parent: fn}
-		fn.FreeVars = []*FreeVar{fv}
-		fn.startBody()
-		createParams(fn, 0)
-		var c Call
-
-		if !isInterface(recvType(obj)) { // concrete
-			c.Call.Value = prog.declaredFunc(obj)
-			c.Call.Args = []Value{fv}
-		} else {
-			c.Call.Value = fv
-			c.Call.Method = obj
-		}
-		for _, arg := range fn.Params {
-			c.Call.Args = append(c.Call.Args, arg)
-		}
-		emitTailCall(fn, &c)
-		fn.finishBody()
-
-		prog.bounds[obj] = fn
-	}
-	return fn
-}
-
-// -- thunks -----------------------------------------------------------
-
-// makeThunk returns a thunk, a synthetic function that delegates to a
-// concrete or interface method denoted by sel.Obj().  The resulting
-// function has no receiver, but has an additional (first) regular
-// parameter.
-//
-// Precondition: sel.Kind() == types.MethodExpr.
-//
-//   type T int          or:  type T interface { meth() }
-//   func (t T) meth()
-//   f := T.meth
-//   var t T
-//   f(t) // calls t.meth()
-//
-// f is a synthetic wrapper defined as if by:
-//
-//   f := func(t T) { return t.meth() }
-//
-// TODO(adonovan): opt: currently the stub is created even when used
-// directly in a function call: C.f(i, 0).  This is less efficient
-// than inlining the stub.
-//
-// EXCLUSIVE_LOCKS_ACQUIRED(meth.Prog.methodsMu)
-//
-func makeThunk(prog *Program, sel *types.Selection) *Function {
-	if sel.Kind() != types.MethodExpr {
-		panic(sel)
-	}
-
-	key := selectionKey{
-		kind:     sel.Kind(),
-		recv:     sel.Recv(),
-		obj:      sel.Obj(),
-		index:    fmt.Sprint(sel.Index()),
-		indirect: sel.Indirect(),
-	}
-
-	prog.methodsMu.Lock()
-	defer prog.methodsMu.Unlock()
-
-	// Canonicalize key.recv to avoid constructing duplicate thunks.
-	canonRecv, ok := prog.canon.At(key.recv).(types.Type)
-	if !ok {
-		canonRecv = key.recv
-		prog.canon.Set(key.recv, canonRecv)
-	}
-	key.recv = canonRecv
-
-	fn, ok := prog.thunks[key]
-	if !ok {
-		fn = makeWrapper(prog, sel)
-		if fn.Signature.Recv() != nil {
-			panic(fn) // unexpected receiver
-		}
-		prog.thunks[key] = fn
-	}
-	return fn
-}
-
-func changeRecv(s *types.Signature, recv *types.Var) *types.Signature {
-	return types.NewSignature(recv, s.Params(), s.Results(), s.Variadic())
-}
-
-// selectionKey is like types.Selection but a usable map key.
-type selectionKey struct {
-	kind     types.SelectionKind
-	recv     types.Type // canonicalized via Program.canon
-	obj      types.Object
-	index    string
-	indirect bool
-}
diff --git a/installer/vendor/golang.org/x/tools/go/types/typeutil/example_test.go b/installer/vendor/golang.org/x/tools/go/types/typeutil/example_test.go
deleted file mode 100644
index 86c4d44057..0000000000
--- a/installer/vendor/golang.org/x/tools/go/types/typeutil/example_test.go
+++ /dev/null
@@ -1,67 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-func ExampleMap() {
-	const source = `package P
-
-var X []string
-var Y []string
-
-const p, q = 1.0, 2.0
-
-func f(offset int32) (value byte, ok bool)
-func g(rune) (uint8, bool)
-`
-
-	// Parse and type-check the package.
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "P.go", source, 0)
-	if err != nil {
-		panic(err)
-	}
-	pkg, err := new(types.Config).Check("P", fset, []*ast.File{f}, nil)
-	if err != nil {
-		panic(err)
-	}
-
-	scope := pkg.Scope()
-
-	// Group names of package-level objects by their type.
-	var namesByType typeutil.Map // value is []string
-	for _, name := range scope.Names() {
-		T := scope.Lookup(name).Type()
-
-		names, _ := namesByType.At(T).([]string)
-		names = append(names, name)
-		namesByType.Set(T, names)
-	}
-
-	// Format, sort, and print the map entries.
-	var lines []string
-	namesByType.Iterate(func(T types.Type, names interface{}) {
-		lines = append(lines, fmt.Sprintf("%s   %s", names, T))
-	})
-	sort.Strings(lines)
-	for _, line := range lines {
-		fmt.Println(line)
-	}
-
-	// Output:
-	// [X Y]   []string
-	// [f g]   func(offset int32) (value byte, ok bool)
-	// [p q]   untyped float
-}
diff --git a/installer/vendor/golang.org/x/tools/go/types/typeutil/imports_test.go b/installer/vendor/golang.org/x/tools/go/types/typeutil/imports_test.go
deleted file mode 100644
index c8ef6d6a4a..0000000000
--- a/installer/vendor/golang.org/x/tools/go/types/typeutil/imports_test.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"testing"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-type closure map[string]*types.Package
-
-func (c closure) Import(path string) (*types.Package, error) { return c[path], nil }
-
-func TestDependencies(t *testing.T) {
-	packages := make(map[string]*types.Package)
-	conf := types.Config{
-		Importer: closure(packages),
-	}
-	fset := token.NewFileSet()
-
-	// All edges go to the right.
-	//  /--D--B--A
-	// F    \_C_/
-	//  \__E_/
-	for i, content := range []string{
-		`package a`,
-		`package c; import (_ "a")`,
-		`package b; import (_ "a")`,
-		`package e; import (_ "c")`,
-		`package d; import (_ "b"; _ "c")`,
-		`package f; import (_ "d"; _ "e")`,
-	} {
-		f, err := parser.ParseFile(fset, fmt.Sprintf("%d.go", i), content, 0)
-		if err != nil {
-			t.Fatal(err)
-		}
-		pkg, err := conf.Check(f.Name.Name, fset, []*ast.File{f}, nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		packages[pkg.Path()] = pkg
-	}
-
-	for _, test := range []struct {
-		roots, want string
-	}{
-		{"a", "a"},
-		{"b", "ab"},
-		{"c", "ac"},
-		{"d", "abcd"},
-		{"e", "ace"},
-		{"f", "abcdef"},
-
-		{"be", "abce"},
-		{"eb", "aceb"},
-		{"de", "abcde"},
-		{"ed", "acebd"},
-		{"ef", "acebdf"},
-	} {
-		var pkgs []*types.Package
-		for _, r := range test.roots {
-			pkgs = append(pkgs, packages[string(r)])
-		}
-		var got string
-		for _, p := range typeutil.Dependencies(pkgs...) {
-			got += p.Path()
-		}
-		if got != test.want {
-			t.Errorf("Dependencies(%q) = %q, want %q", test.roots, got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/types/typeutil/map_test.go b/installer/vendor/golang.org/x/tools/go/types/typeutil/map_test.go
deleted file mode 100644
index 34facbedb1..0000000000
--- a/installer/vendor/golang.org/x/tools/go/types/typeutil/map_test.go
+++ /dev/null
@@ -1,174 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package typeutil_test
-
-// TODO(adonovan):
-// - test use of explicit hasher across two maps.
-// - test hashcodes are consistent with equals for a range of types
-//   (e.g. all types generated by type-checking some body of real code).
-
-import (
-	"go/types"
-	"testing"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-var (
-	tStr      = types.Typ[types.String]             // string
-	tPStr1    = types.NewPointer(tStr)              // *string
-	tPStr2    = types.NewPointer(tStr)              // *string, again
-	tInt      = types.Typ[types.Int]                // int
-	tChanInt1 = types.NewChan(types.RecvOnly, tInt) // <-chan int
-	tChanInt2 = types.NewChan(types.RecvOnly, tInt) // <-chan int, again
-)
-
-func checkEqualButNotIdentical(t *testing.T, x, y types.Type, comment string) {
-	if !types.Identical(x, y) {
-		t.Errorf("%s: not equal: %s, %s", comment, x, y)
-	}
-	if x == y {
-		t.Errorf("%s: identical: %v, %v", comment, x, y)
-	}
-}
-
-func TestAxioms(t *testing.T) {
-	checkEqualButNotIdentical(t, tPStr1, tPStr2, "tPstr{1,2}")
-	checkEqualButNotIdentical(t, tChanInt1, tChanInt2, "tChanInt{1,2}")
-}
-
-func TestMap(t *testing.T) {
-	var tmap *typeutil.Map
-
-	// All methods but Set are safe on on (*T)(nil).
-	tmap.Len()
-	tmap.At(tPStr1)
-	tmap.Delete(tPStr1)
-	tmap.KeysString()
-	tmap.String()
-
-	tmap = new(typeutil.Map)
-
-	// Length of empty map.
-	if l := tmap.Len(); l != 0 {
-		t.Errorf("Len() on empty Map: got %d, want 0", l)
-	}
-	// At of missing key.
-	if v := tmap.At(tPStr1); v != nil {
-		t.Errorf("At() on empty Map: got %v, want nil", v)
-	}
-	// Deletion of missing key.
-	if tmap.Delete(tPStr1) {
-		t.Errorf("Delete() on empty Map: got true, want false")
-	}
-	// Set of new key.
-	if prev := tmap.Set(tPStr1, "*string"); prev != nil {
-		t.Errorf("Set() on empty Map returned non-nil previous value %s", prev)
-	}
-
-	// Now: {*string: "*string"}
-
-	// Length of non-empty map.
-	if l := tmap.Len(); l != 1 {
-		t.Errorf("Len(): got %d, want 1", l)
-	}
-	// At via insertion key.
-	if v := tmap.At(tPStr1); v != "*string" {
-		t.Errorf("At(): got %q, want \"*string\"", v)
-	}
-	// At via equal key.
-	if v := tmap.At(tPStr2); v != "*string" {
-		t.Errorf("At(): got %q, want \"*string\"", v)
-	}
-	// Iteration over sole entry.
-	tmap.Iterate(func(key types.Type, value interface{}) {
-		if key != tPStr1 {
-			t.Errorf("Iterate: key: got %s, want %s", key, tPStr1)
-		}
-		if want := "*string"; value != want {
-			t.Errorf("Iterate: value: got %s, want %s", value, want)
-		}
-	})
-
-	// Setion with key equal to present one.
-	if prev := tmap.Set(tPStr2, "*string again"); prev != "*string" {
-		t.Errorf("Set() previous value: got %s, want \"*string\"", prev)
-	}
-
-	// Setion of another association.
-	if prev := tmap.Set(tChanInt1, "<-chan int"); prev != nil {
-		t.Errorf("Set() previous value: got %s, want nil", prev)
-	}
-
-	// Now: {*string: "*string again", <-chan int: "<-chan int"}
-
-	want1 := "{*string: \"*string again\", <-chan int: \"<-chan int\"}"
-	want2 := "{<-chan int: \"<-chan int\", *string: \"*string again\"}"
-	if s := tmap.String(); s != want1 && s != want2 {
-		t.Errorf("String(): got %s, want %s", s, want1)
-	}
-
-	want1 = "{*string, <-chan int}"
-	want2 = "{<-chan int, *string}"
-	if s := tmap.KeysString(); s != want1 && s != want2 {
-		t.Errorf("KeysString(): got %s, want %s", s, want1)
-	}
-
-	// Keys().
-	I := types.Identical
-	switch k := tmap.Keys(); {
-	case I(k[0], tChanInt1) && I(k[1], tPStr1): // ok
-	case I(k[1], tChanInt1) && I(k[0], tPStr1): // ok
-	default:
-		t.Errorf("Keys(): got %v, want %s", k, want2)
-	}
-
-	if l := tmap.Len(); l != 2 {
-		t.Errorf("Len(): got %d, want 1", l)
-	}
-	// At via original key.
-	if v := tmap.At(tPStr1); v != "*string again" {
-		t.Errorf("At(): got %q, want \"*string again\"", v)
-	}
-	hamming := 1
-	tmap.Iterate(func(key types.Type, value interface{}) {
-		switch {
-		case I(key, tChanInt1):
-			hamming *= 2 // ok
-		case I(key, tPStr1):
-			hamming *= 3 // ok
-		}
-	})
-	if hamming != 6 {
-		t.Errorf("Iterate: hamming: got %d, want %d", hamming, 6)
-	}
-
-	if v := tmap.At(tChanInt2); v != "<-chan int" {
-		t.Errorf("At(): got %q, want \"<-chan int\"", v)
-	}
-	// Deletion with key equal to present one.
-	if !tmap.Delete(tChanInt2) {
-		t.Errorf("Delete() of existing key: got false, want true")
-	}
-
-	// Now: {*string: "*string again"}
-
-	if l := tmap.Len(); l != 1 {
-		t.Errorf("Len(): got %d, want 1", l)
-	}
-	// Deletion again.
-	if !tmap.Delete(tPStr2) {
-		t.Errorf("Delete() of existing key: got false, want true")
-	}
-
-	// Now: {}
-
-	if l := tmap.Len(); l != 0 {
-		t.Errorf("Len(): got %d, want %d", l, 0)
-	}
-	if s := tmap.String(); s != "{}" {
-		t.Errorf("Len(): got %q, want %q", s, "")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/types/typeutil/ui_test.go b/installer/vendor/golang.org/x/tools/go/types/typeutil/ui_test.go
deleted file mode 100644
index b5064acf1f..0000000000
--- a/installer/vendor/golang.org/x/tools/go/types/typeutil/ui_test.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package typeutil_test
-
-import (
-	"fmt"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-func TestIntuitiveMethodSet(t *testing.T) {
-	const source = `
-package P
-type A int
-func (A) f()
-func (*A) g()
-`
-
-	fset := token.NewFileSet()
-	f, err := parser.ParseFile(fset, "hello.go", source, 0)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var conf types.Config
-	pkg, err := conf.Check("P", fset, []*ast.File{f}, nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	qual := types.RelativeTo(pkg)
-
-	for _, test := range []struct {
-		expr string // type expression
-		want string // intuitive method set
-	}{
-		{"A", "(A).f (*A).g"},
-		{"*A", "(*A).f (*A).g"},
-		{"error", "(error).Error"},
-		{"*error", ""},
-		{"struct{A}", "(struct{A}).f (*struct{A}).g"},
-		{"*struct{A}", "(*struct{A}).f (*struct{A}).g"},
-	} {
-		tv, err := types.Eval(fset, pkg, 0, test.expr)
-		if err != nil {
-			t.Errorf("Eval(%s) failed: %v", test.expr, err)
-		}
-		var names []string
-		for _, m := range typeutil.IntuitiveMethodSet(tv.Type, nil) {
-			name := fmt.Sprintf("(%s).%s", types.TypeString(m.Recv(), qual), m.Obj().Name())
-			names = append(names, name)
-		}
-		got := strings.Join(names, " ")
-		if got != test.want {
-			t.Errorf("IntuitiveMethodSet(%s) = %q, want %q", test.expr, got, test.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/go/vcs/discovery.go b/installer/vendor/golang.org/x/tools/go/vcs/discovery.go
deleted file mode 100644
index f431dc1c5b..0000000000
--- a/installer/vendor/golang.org/x/tools/go/vcs/discovery.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"encoding/xml"
-	"fmt"
-	"io"
-	"strings"
-)
-
-// charsetReader returns a reader for the given charset. Currently
-// it only supports UTF-8 and ASCII. Otherwise, it returns a meaningful
-// error which is printed by go get, so the user can find why the package
-// wasn't downloaded if the encoding is not supported. Note that, in
-// order to reduce potential errors, ASCII is treated as UTF-8 (i.e. characters
-// greater than 0x7f are not rejected).
-func charsetReader(charset string, input io.Reader) (io.Reader, error) {
-	switch strings.ToLower(charset) {
-	case "ascii":
-		return input, nil
-	default:
-		return nil, fmt.Errorf("can't decode XML document using charset %q", charset)
-	}
-}
-
-// parseMetaGoImports returns meta imports from the HTML in r.
-// Parsing ends at the end of the <head> section or the beginning of the <body>.
-func parseMetaGoImports(r io.Reader) (imports []metaImport, err error) {
-	d := xml.NewDecoder(r)
-	d.CharsetReader = charsetReader
-	d.Strict = false
-	var t xml.Token
-	for {
-		t, err = d.Token()
-		if err != nil {
-			if err == io.EOF || len(imports) > 0 {
-				err = nil
-			}
-			return
-		}
-		if e, ok := t.(xml.StartElement); ok && strings.EqualFold(e.Name.Local, "body") {
-			return
-		}
-		if e, ok := t.(xml.EndElement); ok && strings.EqualFold(e.Name.Local, "head") {
-			return
-		}
-		e, ok := t.(xml.StartElement)
-		if !ok || !strings.EqualFold(e.Name.Local, "meta") {
-			continue
-		}
-		if attrValue(e.Attr, "name") != "go-import" {
-			continue
-		}
-		if f := strings.Fields(attrValue(e.Attr, "content")); len(f) == 3 {
-			imports = append(imports, metaImport{
-				Prefix:   f[0],
-				VCS:      f[1],
-				RepoRoot: f[2],
-			})
-		}
-	}
-}
-
-// attrValue returns the attribute value for the case-insensitive key
-// `name', or the empty string if nothing is found.
-func attrValue(attrs []xml.Attr, name string) string {
-	for _, a := range attrs {
-		if strings.EqualFold(a.Name.Local, name) {
-			return a.Value
-		}
-	}
-	return ""
-}
diff --git a/installer/vendor/golang.org/x/tools/go/vcs/env.go b/installer/vendor/golang.org/x/tools/go/vcs/env.go
deleted file mode 100644
index e846f5b3b8..0000000000
--- a/installer/vendor/golang.org/x/tools/go/vcs/env.go
+++ /dev/null
@@ -1,39 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"os"
-	"strings"
-)
-
-// envForDir returns a copy of the environment
-// suitable for running in the given directory.
-// The environment is the current process's environment
-// but with an updated $PWD, so that an os.Getwd in the
-// child will be faster.
-func envForDir(dir string) []string {
-	env := os.Environ()
-	// Internally we only use rooted paths, so dir is rooted.
-	// Even if dir is not rooted, no harm done.
-	return mergeEnvLists([]string{"PWD=" + dir}, env)
-}
-
-// mergeEnvLists merges the two environment lists such that
-// variables with the same name in "in" replace those in "out".
-func mergeEnvLists(in, out []string) []string {
-NextVar:
-	for _, inkv := range in {
-		k := strings.SplitAfterN(inkv, "=", 2)[0]
-		for i, outkv := range out {
-			if strings.HasPrefix(outkv, k) {
-				out[i] = inkv
-				continue NextVar
-			}
-		}
-		out = append(out, inkv)
-	}
-	return out
-}
diff --git a/installer/vendor/golang.org/x/tools/go/vcs/http.go b/installer/vendor/golang.org/x/tools/go/vcs/http.go
deleted file mode 100644
index 96188185cb..0000000000
--- a/installer/vendor/golang.org/x/tools/go/vcs/http.go
+++ /dev/null
@@ -1,80 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"fmt"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"net/url"
-)
-
-// httpClient is the default HTTP client, but a variable so it can be
-// changed by tests, without modifying http.DefaultClient.
-var httpClient = http.DefaultClient
-
-// httpGET returns the data from an HTTP GET request for the given URL.
-func httpGET(url string) ([]byte, error) {
-	resp, err := httpClient.Get(url)
-	if err != nil {
-		return nil, err
-	}
-	defer resp.Body.Close()
-	if resp.StatusCode != 200 {
-		return nil, fmt.Errorf("%s: %s", url, resp.Status)
-	}
-	b, err := ioutil.ReadAll(resp.Body)
-	if err != nil {
-		return nil, fmt.Errorf("%s: %v", url, err)
-	}
-	return b, nil
-}
-
-// httpsOrHTTP returns the body of either the importPath's
-// https resource or, if unavailable, the http resource.
-func httpsOrHTTP(importPath string) (urlStr string, body io.ReadCloser, err error) {
-	fetch := func(scheme string) (urlStr string, res *http.Response, err error) {
-		u, err := url.Parse(scheme + "://" + importPath)
-		if err != nil {
-			return "", nil, err
-		}
-		u.RawQuery = "go-get=1"
-		urlStr = u.String()
-		if Verbose {
-			log.Printf("Fetching %s", urlStr)
-		}
-		res, err = httpClient.Get(urlStr)
-		return
-	}
-	closeBody := func(res *http.Response) {
-		if res != nil {
-			res.Body.Close()
-		}
-	}
-	urlStr, res, err := fetch("https")
-	if err != nil || res.StatusCode != 200 {
-		if Verbose {
-			if err != nil {
-				log.Printf("https fetch failed.")
-			} else {
-				log.Printf("ignoring https fetch with status code %d", res.StatusCode)
-			}
-		}
-		closeBody(res)
-		urlStr, res, err = fetch("http")
-	}
-	if err != nil {
-		closeBody(res)
-		return "", nil, err
-	}
-	// Note: accepting a non-200 OK here, so people can serve a
-	// meta import in their http 404 page.
-	if Verbose {
-		log.Printf("Parsing meta tags from %s (status code %d)", urlStr, res.StatusCode)
-	}
-	return urlStr, res.Body, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/vcs/vcs.go b/installer/vendor/golang.org/x/tools/go/vcs/vcs.go
deleted file mode 100644
index 1c87793b9e..0000000000
--- a/installer/vendor/golang.org/x/tools/go/vcs/vcs.go
+++ /dev/null
@@ -1,731 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs // import "golang.org/x/tools/go/vcs"
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"log"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// Verbose enables verbose operation logging.
-var Verbose bool
-
-// ShowCmd controls whether VCS commands are printed.
-var ShowCmd bool
-
-// A Cmd describes how to use a version control system
-// like Mercurial, Git, or Subversion.
-type Cmd struct {
-	Name string
-	Cmd  string // name of binary to invoke command
-
-	CreateCmd   string // command to download a fresh copy of a repository
-	DownloadCmd string // command to download updates into an existing repository
-
-	TagCmd         []TagCmd // commands to list tags
-	TagLookupCmd   []TagCmd // commands to lookup tags before running tagSyncCmd
-	TagSyncCmd     string   // command to sync to specific tag
-	TagSyncDefault string   // command to sync to default tag
-
-	LogCmd string // command to list repository changelogs in an XML format
-
-	Scheme  []string
-	PingCmd string
-}
-
-// A TagCmd describes a command to list available tags
-// that can be passed to Cmd.TagSyncCmd.
-type TagCmd struct {
-	Cmd     string // command to list tags
-	Pattern string // regexp to extract tags from list
-}
-
-// vcsList lists the known version control systems
-var vcsList = []*Cmd{
-	vcsHg,
-	vcsGit,
-	vcsSvn,
-	vcsBzr,
-}
-
-// ByCmd returns the version control system for the given
-// command name (hg, git, svn, bzr).
-func ByCmd(cmd string) *Cmd {
-	for _, vcs := range vcsList {
-		if vcs.Cmd == cmd {
-			return vcs
-		}
-	}
-	return nil
-}
-
-// vcsHg describes how to use Mercurial.
-var vcsHg = &Cmd{
-	Name: "Mercurial",
-	Cmd:  "hg",
-
-	CreateCmd:   "clone -U {repo} {dir}",
-	DownloadCmd: "pull",
-
-	// We allow both tag and branch names as 'tags'
-	// for selecting a version.  This lets people have
-	// a go.release.r60 branch and a go1 branch
-	// and make changes in both, without constantly
-	// editing .hgtags.
-	TagCmd: []TagCmd{
-		{"tags", `^(\S+)`},
-		{"branches", `^(\S+)`},
-	},
-	TagSyncCmd:     "update -r {tag}",
-	TagSyncDefault: "update default",
-
-	LogCmd: "log --encoding=utf-8 --limit={limit} --template={template}",
-
-	Scheme:  []string{"https", "http", "ssh"},
-	PingCmd: "identify {scheme}://{repo}",
-}
-
-// vcsGit describes how to use Git.
-var vcsGit = &Cmd{
-	Name: "Git",
-	Cmd:  "git",
-
-	CreateCmd:   "clone {repo} {dir}",
-	DownloadCmd: "pull --ff-only",
-
-	TagCmd: []TagCmd{
-		// tags/xxx matches a git tag named xxx
-		// origin/xxx matches a git branch named xxx on the default remote repository
-		{"show-ref", `(?:tags|origin)/(\S+)$`},
-	},
-	TagLookupCmd: []TagCmd{
-		{"show-ref tags/{tag} origin/{tag}", `((?:tags|origin)/\S+)$`},
-	},
-	TagSyncCmd:     "checkout {tag}",
-	TagSyncDefault: "checkout master",
-
-	Scheme:  []string{"git", "https", "http", "git+ssh"},
-	PingCmd: "ls-remote {scheme}://{repo}",
-}
-
-// vcsBzr describes how to use Bazaar.
-var vcsBzr = &Cmd{
-	Name: "Bazaar",
-	Cmd:  "bzr",
-
-	CreateCmd: "branch {repo} {dir}",
-
-	// Without --overwrite bzr will not pull tags that changed.
-	// Replace by --overwrite-tags after http://pad.lv/681792 goes in.
-	DownloadCmd: "pull --overwrite",
-
-	TagCmd:         []TagCmd{{"tags", `^(\S+)`}},
-	TagSyncCmd:     "update -r {tag}",
-	TagSyncDefault: "update -r revno:-1",
-
-	Scheme:  []string{"https", "http", "bzr", "bzr+ssh"},
-	PingCmd: "info {scheme}://{repo}",
-}
-
-// vcsSvn describes how to use Subversion.
-var vcsSvn = &Cmd{
-	Name: "Subversion",
-	Cmd:  "svn",
-
-	CreateCmd:   "checkout {repo} {dir}",
-	DownloadCmd: "update",
-
-	// There is no tag command in subversion.
-	// The branch information is all in the path names.
-
-	LogCmd: "log --xml --limit={limit}",
-
-	Scheme:  []string{"https", "http", "svn", "svn+ssh"},
-	PingCmd: "info {scheme}://{repo}",
-}
-
-func (v *Cmd) String() string {
-	return v.Name
-}
-
-// run runs the command line cmd in the given directory.
-// keyval is a list of key, value pairs.  run expands
-// instances of {key} in cmd into value, but only after
-// splitting cmd into individual arguments.
-// If an error occurs, run prints the command line and the
-// command's combined stdout+stderr to standard error.
-// Otherwise run discards the command's output.
-func (v *Cmd) run(dir string, cmd string, keyval ...string) error {
-	_, err := v.run1(dir, cmd, keyval, true)
-	return err
-}
-
-// runVerboseOnly is like run but only generates error output to standard error in verbose mode.
-func (v *Cmd) runVerboseOnly(dir string, cmd string, keyval ...string) error {
-	_, err := v.run1(dir, cmd, keyval, false)
-	return err
-}
-
-// runOutput is like run but returns the output of the command.
-func (v *Cmd) runOutput(dir string, cmd string, keyval ...string) ([]byte, error) {
-	return v.run1(dir, cmd, keyval, true)
-}
-
-// run1 is the generalized implementation of run and runOutput.
-func (v *Cmd) run1(dir string, cmdline string, keyval []string, verbose bool) ([]byte, error) {
-	m := make(map[string]string)
-	for i := 0; i < len(keyval); i += 2 {
-		m[keyval[i]] = keyval[i+1]
-	}
-	args := strings.Fields(cmdline)
-	for i, arg := range args {
-		args[i] = expand(m, arg)
-	}
-
-	_, err := exec.LookPath(v.Cmd)
-	if err != nil {
-		fmt.Fprintf(os.Stderr,
-			"go: missing %s command. See http://golang.org/s/gogetcmd\n",
-			v.Name)
-		return nil, err
-	}
-
-	cmd := exec.Command(v.Cmd, args...)
-	cmd.Dir = dir
-	cmd.Env = envForDir(cmd.Dir)
-	if ShowCmd {
-		fmt.Printf("cd %s\n", dir)
-		fmt.Printf("%s %s\n", v.Cmd, strings.Join(args, " "))
-	}
-	var buf bytes.Buffer
-	cmd.Stdout = &buf
-	cmd.Stderr = &buf
-	err = cmd.Run()
-	out := buf.Bytes()
-	if err != nil {
-		if verbose || Verbose {
-			fmt.Fprintf(os.Stderr, "# cd %s; %s %s\n", dir, v.Cmd, strings.Join(args, " "))
-			os.Stderr.Write(out)
-		}
-		return nil, err
-	}
-	return out, nil
-}
-
-// Ping pings the repo to determine if scheme used is valid.
-// This repo must be pingable with this scheme and VCS.
-func (v *Cmd) Ping(scheme, repo string) error {
-	return v.runVerboseOnly(".", v.PingCmd, "scheme", scheme, "repo", repo)
-}
-
-// Create creates a new copy of repo in dir.
-// The parent of dir must exist; dir must not.
-func (v *Cmd) Create(dir, repo string) error {
-	return v.run(".", v.CreateCmd, "dir", dir, "repo", repo)
-}
-
-// CreateAtRev creates a new copy of repo in dir at revision rev.
-// The parent of dir must exist; dir must not.
-// rev must be a valid revision in repo.
-func (v *Cmd) CreateAtRev(dir, repo, rev string) error {
-	if err := v.Create(dir, repo); err != nil {
-		return err
-	}
-	return v.run(dir, v.TagSyncCmd, "tag", rev)
-}
-
-// Download downloads any new changes for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Download(dir string) error {
-	return v.run(dir, v.DownloadCmd)
-}
-
-// Tags returns the list of available tags for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Tags(dir string) ([]string, error) {
-	var tags []string
-	for _, tc := range v.TagCmd {
-		out, err := v.runOutput(dir, tc.Cmd)
-		if err != nil {
-			return nil, err
-		}
-		re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
-		for _, m := range re.FindAllStringSubmatch(string(out), -1) {
-			tags = append(tags, m[1])
-		}
-	}
-	return tags, nil
-}
-
-// TagSync syncs the repo in dir to the named tag, which is either a
-// tag returned by Tags or the empty string (the default tag).
-// dir must be a valid VCS repo compatible with v and the tag must exist.
-func (v *Cmd) TagSync(dir, tag string) error {
-	if v.TagSyncCmd == "" {
-		return nil
-	}
-	if tag != "" {
-		for _, tc := range v.TagLookupCmd {
-			out, err := v.runOutput(dir, tc.Cmd, "tag", tag)
-			if err != nil {
-				return err
-			}
-			re := regexp.MustCompile(`(?m-s)` + tc.Pattern)
-			m := re.FindStringSubmatch(string(out))
-			if len(m) > 1 {
-				tag = m[1]
-				break
-			}
-		}
-	}
-	if tag == "" && v.TagSyncDefault != "" {
-		return v.run(dir, v.TagSyncDefault)
-	}
-	return v.run(dir, v.TagSyncCmd, "tag", tag)
-}
-
-// Log logs the changes for the repo in dir.
-// dir must be a valid VCS repo compatible with v.
-func (v *Cmd) Log(dir, logTemplate string) ([]byte, error) {
-	if err := v.Download(dir); err != nil {
-		return []byte{}, err
-	}
-
-	const N = 50 // how many revisions to grab
-	return v.runOutput(dir, v.LogCmd, "limit", strconv.Itoa(N), "template", logTemplate)
-}
-
-// LogAtRev logs the change for repo in dir at the rev revision.
-// dir must be a valid VCS repo compatible with v.
-// rev must be a valid revision for the repo in dir.
-func (v *Cmd) LogAtRev(dir, rev, logTemplate string) ([]byte, error) {
-	if err := v.Download(dir); err != nil {
-		return []byte{}, err
-	}
-
-	// Append revision flag to LogCmd.
-	logAtRevCmd := v.LogCmd + " --rev=" + rev
-	return v.runOutput(dir, logAtRevCmd, "limit", strconv.Itoa(1), "template", logTemplate)
-}
-
-// A vcsPath describes how to convert an import path into a
-// version control system and repository name.
-type vcsPath struct {
-	prefix string                              // prefix this description applies to
-	re     string                              // pattern for import path
-	repo   string                              // repository to use (expand with match of re)
-	vcs    string                              // version control system to use (expand with match of re)
-	check  func(match map[string]string) error // additional checks
-	ping   bool                                // ping for scheme to use to download repo
-
-	regexp *regexp.Regexp // cached compiled form of re
-}
-
-// FromDir inspects dir and its parents to determine the
-// version control system and code repository to use.
-// On return, root is the import path
-// corresponding to the root of the repository.
-func FromDir(dir, srcRoot string) (vcs *Cmd, root string, err error) {
-	// Clean and double-check that dir is in (a subdirectory of) srcRoot.
-	dir = filepath.Clean(dir)
-	srcRoot = filepath.Clean(srcRoot)
-	if len(dir) <= len(srcRoot) || dir[len(srcRoot)] != filepath.Separator {
-		return nil, "", fmt.Errorf("directory %q is outside source root %q", dir, srcRoot)
-	}
-
-	var vcsRet *Cmd
-	var rootRet string
-
-	origDir := dir
-	for len(dir) > len(srcRoot) {
-		for _, vcs := range vcsList {
-			if _, err := os.Stat(filepath.Join(dir, "."+vcs.Cmd)); err == nil {
-				root := filepath.ToSlash(dir[len(srcRoot)+1:])
-				// Record first VCS we find, but keep looking,
-				// to detect mistakes like one kind of VCS inside another.
-				if vcsRet == nil {
-					vcsRet = vcs
-					rootRet = root
-					continue
-				}
-				// Allow .git inside .git, which can arise due to submodules.
-				if vcsRet == vcs && vcs.Cmd == "git" {
-					continue
-				}
-				// Otherwise, we have one VCS inside a different VCS.
-				return nil, "", fmt.Errorf("directory %q uses %s, but parent %q uses %s",
-					filepath.Join(srcRoot, rootRet), vcsRet.Cmd, filepath.Join(srcRoot, root), vcs.Cmd)
-			}
-		}
-
-		// Move to parent.
-		ndir := filepath.Dir(dir)
-		if len(ndir) >= len(dir) {
-			// Shouldn't happen, but just in case, stop.
-			break
-		}
-		dir = ndir
-	}
-
-	if vcsRet != nil {
-		return vcsRet, rootRet, nil
-	}
-
-	return nil, "", fmt.Errorf("directory %q is not using a known version control system", origDir)
-}
-
-// RepoRoot represents a version control system, a repo, and a root of
-// where to put it on disk.
-type RepoRoot struct {
-	VCS *Cmd
-
-	// Repo is the repository URL, including scheme.
-	Repo string
-
-	// Root is the import path corresponding to the root of the
-	// repository.
-	Root string
-}
-
-// RepoRootForImportPath analyzes importPath to determine the
-// version control system, and code repository to use.
-func RepoRootForImportPath(importPath string, verbose bool) (*RepoRoot, error) {
-	rr, err := RepoRootForImportPathStatic(importPath, "")
-	if err == errUnknownSite {
-		rr, err = RepoRootForImportDynamic(importPath, verbose)
-
-		// RepoRootForImportDynamic returns error detail
-		// that is irrelevant if the user didn't intend to use a
-		// dynamic import in the first place.
-		// Squelch it.
-		if err != nil {
-			if Verbose {
-				log.Printf("import %q: %v", importPath, err)
-			}
-			err = fmt.Errorf("unrecognized import path %q", importPath)
-		}
-	}
-
-	if err == nil && strings.Contains(importPath, "...") && strings.Contains(rr.Root, "...") {
-		// Do not allow wildcards in the repo root.
-		rr = nil
-		err = fmt.Errorf("cannot expand ... in %q", importPath)
-	}
-	return rr, err
-}
-
-var errUnknownSite = errors.New("dynamic lookup required to find mapping")
-
-// RepoRootForImportPathStatic attempts to map importPath to a
-// RepoRoot using the commonly-used VCS hosting sites in vcsPaths
-// (github.com/user/dir), or from a fully-qualified importPath already
-// containing its VCS type (foo.com/repo.git/dir)
-//
-// If scheme is non-empty, that scheme is forced.
-func RepoRootForImportPathStatic(importPath, scheme string) (*RepoRoot, error) {
-	if strings.Contains(importPath, "://") {
-		return nil, fmt.Errorf("invalid import path %q", importPath)
-	}
-	for _, srv := range vcsPaths {
-		if !strings.HasPrefix(importPath, srv.prefix) {
-			continue
-		}
-		m := srv.regexp.FindStringSubmatch(importPath)
-		if m == nil {
-			if srv.prefix != "" {
-				return nil, fmt.Errorf("invalid %s import path %q", srv.prefix, importPath)
-			}
-			continue
-		}
-
-		// Build map of named subexpression matches for expand.
-		match := map[string]string{
-			"prefix": srv.prefix,
-			"import": importPath,
-		}
-		for i, name := range srv.regexp.SubexpNames() {
-			if name != "" && match[name] == "" {
-				match[name] = m[i]
-			}
-		}
-		if srv.vcs != "" {
-			match["vcs"] = expand(match, srv.vcs)
-		}
-		if srv.repo != "" {
-			match["repo"] = expand(match, srv.repo)
-		}
-		if srv.check != nil {
-			if err := srv.check(match); err != nil {
-				return nil, err
-			}
-		}
-		vcs := ByCmd(match["vcs"])
-		if vcs == nil {
-			return nil, fmt.Errorf("unknown version control system %q", match["vcs"])
-		}
-		if srv.ping {
-			if scheme != "" {
-				match["repo"] = scheme + "://" + match["repo"]
-			} else {
-				for _, scheme := range vcs.Scheme {
-					if vcs.Ping(scheme, match["repo"]) == nil {
-						match["repo"] = scheme + "://" + match["repo"]
-						break
-					}
-				}
-			}
-		}
-		rr := &RepoRoot{
-			VCS:  vcs,
-			Repo: match["repo"],
-			Root: match["root"],
-		}
-		return rr, nil
-	}
-	return nil, errUnknownSite
-}
-
-// RepoRootForImportDynamic finds a *RepoRoot for a custom domain that's not
-// statically known by RepoRootForImportPathStatic.
-//
-// This handles custom import paths like "name.tld/pkg/foo" or just "name.tld".
-func RepoRootForImportDynamic(importPath string, verbose bool) (*RepoRoot, error) {
-	slash := strings.Index(importPath, "/")
-	if slash < 0 {
-		slash = len(importPath)
-	}
-	host := importPath[:slash]
-	if !strings.Contains(host, ".") {
-		return nil, errors.New("import path doesn't contain a hostname")
-	}
-	urlStr, body, err := httpsOrHTTP(importPath)
-	if err != nil {
-		return nil, fmt.Errorf("http/https fetch: %v", err)
-	}
-	defer body.Close()
-	imports, err := parseMetaGoImports(body)
-	if err != nil {
-		return nil, fmt.Errorf("parsing %s: %v", importPath, err)
-	}
-	metaImport, err := matchGoImport(imports, importPath)
-	if err != nil {
-		if err != errNoMatch {
-			return nil, fmt.Errorf("parse %s: %v", urlStr, err)
-		}
-		return nil, fmt.Errorf("parse %s: no go-import meta tags", urlStr)
-	}
-	if verbose {
-		log.Printf("get %q: found meta tag %#v at %s", importPath, metaImport, urlStr)
-	}
-	// If the import was "uni.edu/bob/project", which said the
-	// prefix was "uni.edu" and the RepoRoot was "evilroot.com",
-	// make sure we don't trust Bob and check out evilroot.com to
-	// "uni.edu" yet (possibly overwriting/preempting another
-	// non-evil student).  Instead, first verify the root and see
-	// if it matches Bob's claim.
-	if metaImport.Prefix != importPath {
-		if verbose {
-			log.Printf("get %q: verifying non-authoritative meta tag", importPath)
-		}
-		urlStr0 := urlStr
-		urlStr, body, err = httpsOrHTTP(metaImport.Prefix)
-		if err != nil {
-			return nil, fmt.Errorf("fetch %s: %v", urlStr, err)
-		}
-		imports, err := parseMetaGoImports(body)
-		if err != nil {
-			return nil, fmt.Errorf("parsing %s: %v", importPath, err)
-		}
-		if len(imports) == 0 {
-			return nil, fmt.Errorf("fetch %s: no go-import meta tag", urlStr)
-		}
-		metaImport2, err := matchGoImport(imports, importPath)
-		if err != nil || metaImport != metaImport2 {
-			return nil, fmt.Errorf("%s and %s disagree about go-import for %s", urlStr0, urlStr, metaImport.Prefix)
-		}
-	}
-
-	if !strings.Contains(metaImport.RepoRoot, "://") {
-		return nil, fmt.Errorf("%s: invalid repo root %q; no scheme", urlStr, metaImport.RepoRoot)
-	}
-	rr := &RepoRoot{
-		VCS:  ByCmd(metaImport.VCS),
-		Repo: metaImport.RepoRoot,
-		Root: metaImport.Prefix,
-	}
-	if rr.VCS == nil {
-		return nil, fmt.Errorf("%s: unknown vcs %q", urlStr, metaImport.VCS)
-	}
-	return rr, nil
-}
-
-// metaImport represents the parsed <meta name="go-import"
-// content="prefix vcs reporoot" /> tags from HTML files.
-type metaImport struct {
-	Prefix, VCS, RepoRoot string
-}
-
-// errNoMatch is returned from matchGoImport when there's no applicable match.
-var errNoMatch = errors.New("no import match")
-
-// matchGoImport returns the metaImport from imports matching importPath.
-// An error is returned if there are multiple matches.
-// errNoMatch is returned if none match.
-func matchGoImport(imports []metaImport, importPath string) (_ metaImport, err error) {
-	match := -1
-	for i, im := range imports {
-		if !strings.HasPrefix(importPath, im.Prefix) {
-			continue
-		}
-		if match != -1 {
-			err = fmt.Errorf("multiple meta tags match import path %q", importPath)
-			return
-		}
-		match = i
-	}
-	if match == -1 {
-		err = errNoMatch
-		return
-	}
-	return imports[match], nil
-}
-
-// expand rewrites s to replace {k} with match[k] for each key k in match.
-func expand(match map[string]string, s string) string {
-	for k, v := range match {
-		s = strings.Replace(s, "{"+k+"}", v, -1)
-	}
-	return s
-}
-
-// vcsPaths lists the known vcs paths.
-var vcsPaths = []*vcsPath{
-	// go.googlesource.com
-	{
-		prefix: "go.googlesource.com",
-		re:     `^(?P<root>go\.googlesource\.com/[A-Za-z0-9_.\-]+/?)$`,
-		vcs:    "git",
-		repo:   "https://{root}",
-		check:  noVCSSuffix,
-	},
-
-	// Github
-	{
-		prefix: "github.com/",
-		re:     `^(?P<root>github\.com/[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+)(/[\p{L}0-9_.\-]+)*$`,
-		vcs:    "git",
-		repo:   "https://{root}",
-		check:  noVCSSuffix,
-	},
-
-	// Bitbucket
-	{
-		prefix: "bitbucket.org/",
-		re:     `^(?P<root>bitbucket\.org/(?P<bitname>[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
-		repo:   "https://{root}",
-		check:  bitbucketVCS,
-	},
-
-	// Launchpad
-	{
-		prefix: "launchpad.net/",
-		re:     `^(?P<root>launchpad\.net/((?P<project>[A-Za-z0-9_.\-]+)(?P<series>/[A-Za-z0-9_.\-]+)?|~[A-Za-z0-9_.\-]+/(\+junk|[A-Za-z0-9_.\-]+)/[A-Za-z0-9_.\-]+))(/[A-Za-z0-9_.\-]+)*$`,
-		vcs:    "bzr",
-		repo:   "https://{root}",
-		check:  launchpadVCS,
-	},
-
-	// Git at OpenStack
-	{
-		prefix: "git.openstack.org",
-		re:     `^(?P<root>git\.openstack\.org/[A-Za-z0-9_.\-]+/[A-Za-z0-9_.\-]+)(\.git)?(/[A-Za-z0-9_.\-]+)*$`,
-		vcs:    "git",
-		repo:   "https://{root}",
-		check:  noVCSSuffix,
-	},
-
-	// General syntax for any server.
-	{
-		re:   `^(?P<root>(?P<repo>([a-z0-9.\-]+\.)+[a-z0-9.\-]+(:[0-9]+)?/[A-Za-z0-9_.\-/]*?)\.(?P<vcs>bzr|git|hg|svn))(/[A-Za-z0-9_.\-]+)*$`,
-		ping: true,
-	},
-}
-
-func init() {
-	// fill in cached regexps.
-	// Doing this eagerly discovers invalid regexp syntax
-	// without having to run a command that needs that regexp.
-	for _, srv := range vcsPaths {
-		srv.regexp = regexp.MustCompile(srv.re)
-	}
-}
-
-// noVCSSuffix checks that the repository name does not
-// end in .foo for any version control system foo.
-// The usual culprit is ".git".
-func noVCSSuffix(match map[string]string) error {
-	repo := match["repo"]
-	for _, vcs := range vcsList {
-		if strings.HasSuffix(repo, "."+vcs.Cmd) {
-			return fmt.Errorf("invalid version control suffix in %s path", match["prefix"])
-		}
-	}
-	return nil
-}
-
-// bitbucketVCS determines the version control system for a
-// Bitbucket repository, by using the Bitbucket API.
-func bitbucketVCS(match map[string]string) error {
-	if err := noVCSSuffix(match); err != nil {
-		return err
-	}
-
-	var resp struct {
-		SCM string `json:"scm"`
-	}
-	url := expand(match, "https://api.bitbucket.org/1.0/repositories/{bitname}")
-	data, err := httpGET(url)
-	if err != nil {
-		return err
-	}
-	if err := json.Unmarshal(data, &resp); err != nil {
-		return fmt.Errorf("decoding %s: %v", url, err)
-	}
-
-	if ByCmd(resp.SCM) != nil {
-		match["vcs"] = resp.SCM
-		if resp.SCM == "git" {
-			match["repo"] += ".git"
-		}
-		return nil
-	}
-
-	return fmt.Errorf("unable to detect version control system for bitbucket.org/ path")
-}
-
-// launchpadVCS solves the ambiguity for "lp.net/project/foo". In this case,
-// "foo" could be a series name registered in Launchpad with its own branch,
-// and it could also be the name of a directory within the main project
-// branch one level up.
-func launchpadVCS(match map[string]string) error {
-	if match["project"] == "" || match["series"] == "" {
-		return nil
-	}
-	_, err := httpGET(expand(match, "https://code.launchpad.net/{project}{series}/.bzr/branch-format"))
-	if err != nil {
-		match["root"] = expand(match, "launchpad.net/{project}")
-		match["repo"] = expand(match, "https://{root}")
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/go/vcs/vcs_test.go b/installer/vendor/golang.org/x/tools/go/vcs/vcs_test.go
deleted file mode 100644
index 8f36cac70c..0000000000
--- a/installer/vendor/golang.org/x/tools/go/vcs/vcs_test.go
+++ /dev/null
@@ -1,142 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vcs
-
-import (
-	"io/ioutil"
-	"os"
-	"path"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-// Test that RepoRootForImportPath creates the correct RepoRoot for a given importPath.
-// TODO(cmang): Add tests for SVN and BZR.
-func TestRepoRootForImportPath(t *testing.T) {
-	if runtime.GOOS == "android" {
-		t.Skipf("incomplete source tree on %s", runtime.GOOS)
-	}
-
-	tests := []struct {
-		path string
-		want *RepoRoot
-	}{
-		{
-			"github.com/golang/groupcache",
-			&RepoRoot{
-				VCS:  vcsGit,
-				Repo: "https://github.com/golang/groupcache",
-			},
-		},
-		// Unicode letters in directories (issue 18660).
-		{
-			"github.com/user/unicode/испытание",
-			&RepoRoot{
-				VCS:  vcsGit,
-				Repo: "https://github.com/user/unicode",
-			},
-		},
-	}
-
-	for _, test := range tests {
-		got, err := RepoRootForImportPath(test.path, false)
-		if err != nil {
-			t.Errorf("RepoRootForImportPath(%q): %v", test.path, err)
-			continue
-		}
-		want := test.want
-		if got.VCS.Name != want.VCS.Name || got.Repo != want.Repo {
-			t.Errorf("RepoRootForImportPath(%q) = VCS(%s) Repo(%s), want VCS(%s) Repo(%s)", test.path, got.VCS, got.Repo, want.VCS, want.Repo)
-		}
-	}
-}
-
-// Test that FromDir correctly inspects a given directory and returns the right VCS and root.
-func TestFromDir(t *testing.T) {
-	tempDir, err := ioutil.TempDir("", "vcstest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(tempDir)
-
-	for j, vcs := range vcsList {
-		dir := filepath.Join(tempDir, "example.com", vcs.Name, "."+vcs.Cmd)
-		if j&1 == 0 {
-			err := os.MkdirAll(dir, 0755)
-			if err != nil {
-				t.Fatal(err)
-			}
-		} else {
-			err := os.MkdirAll(filepath.Dir(dir), 0755)
-			if err != nil {
-				t.Fatal(err)
-			}
-			f, err := os.Create(dir)
-			if err != nil {
-				t.Fatal(err)
-			}
-			f.Close()
-		}
-
-		want := RepoRoot{
-			VCS:  vcs,
-			Root: path.Join("example.com", vcs.Name),
-		}
-		var got RepoRoot
-		got.VCS, got.Root, err = FromDir(dir, tempDir)
-		if err != nil {
-			t.Errorf("FromDir(%q, %q): %v", dir, tempDir, err)
-			continue
-		}
-		if got.VCS.Name != want.VCS.Name || got.Root != want.Root {
-			t.Errorf("FromDir(%q, %q) = VCS(%s) Root(%s), want VCS(%s) Root(%s)", dir, tempDir, got.VCS, got.Root, want.VCS, want.Root)
-		}
-	}
-}
-
-var parseMetaGoImportsTests = []struct {
-	in  string
-	out []metaImport
-}{
-	{
-		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">`,
-		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
-	},
-	{
-		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
-		<meta name="go-import" content="baz/quux git http://github.com/rsc/baz/quux">`,
-		[]metaImport{
-			{"foo/bar", "git", "https://github.com/rsc/foo/bar"},
-			{"baz/quux", "git", "http://github.com/rsc/baz/quux"},
-		},
-	},
-	{
-		`<head>
-		<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
-		</head>`,
-		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
-	},
-	{
-		`<meta name="go-import" content="foo/bar git https://github.com/rsc/foo/bar">
-		<body>`,
-		[]metaImport{{"foo/bar", "git", "https://github.com/rsc/foo/bar"}},
-	},
-}
-
-func TestParseMetaGoImports(t *testing.T) {
-	for i, tt := range parseMetaGoImportsTests {
-		out, err := parseMetaGoImports(strings.NewReader(tt.in))
-		if err != nil {
-			t.Errorf("test#%d: %v", i, err)
-			continue
-		}
-		if !reflect.DeepEqual(out, tt.out) {
-			t.Errorf("test#%d:\n\thave %q\n\twant %q", i, out, tt.out)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/README.md b/installer/vendor/golang.org/x/tools/godoc/README.md
deleted file mode 100644
index 52bc8a4ef3..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/README.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# godoc
-
-This directory contains most of the code for running a godoc server. The
-executable lives at golang.org/x/tools/cmd/godoc.
-
-## Development mode
-
-In production, CSS/JS/template assets need to be compiled into the godoc
-binary. It can be tedious to recompile assets every time, but you can pass a
-flag to load CSS/JS/templates from disk every time a page loads:
-
-```
-godoc -templates=$GOPATH/src/golang.org/x/tools/godoc/static -http=:6060
-```
-
-## Recompiling static assets
-
-The files that live at `static/style.css`, `static/jquery.js` and so on are not
-present in the final binary. They are placed into `static/static.go` by running
-`go generate`. So to compile a change and test it in your browser:
-
-1) Make changes to e.g. `static/style.css`.
-
-2) Run `go generate golang.org/x/tools/godoc/static` so `static/static.go` picks
-up the change.
-
-3) Run `go install golang.org/x/tools/cmd/godoc` so the compiled `godoc` binary
-picks up the change.
-
-4) Run `godoc -http=:6060` and view your changes in the browser. You may need
-to disable your browser's cache to avoid reloading a stale file.
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/README b/installer/vendor/golang.org/x/tools/godoc/analysis/README
deleted file mode 100644
index 5b29a3260b..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/README
+++ /dev/null
@@ -1,111 +0,0 @@
-
-Type and Pointer Analysis to-do list
-====================================
-
-Alan Donovan <adonovan@google.com>
-
-
-Overall design
---------------
-
-We should re-run the type and pointer analyses periodically,
-as we do with the indexer.
-
-Version skew: how to mitigate the bad effects of stale URLs in old pages?
-We could record the file's length/CRC32/mtime in the go/loader, and
-refuse to decorate it with links unless they match at serving time.
-
-Use the VFS mechanism when (a) enumerating packages and (b) loading
-them.  (Requires planned changes to go/loader.)
-
-Future work: shard this using map/reduce for larger corpora.
-
-Testing: how does one test that a web page "looks right"?
-
-
-Bugs
-----
-
-(*ssa.Program).Create requires transitively error-free packages.  We
-can make this more robust by making the requirement transitively free
-of "hard" errors; soft errors are fine.
-
-Markup of compiler errors is slightly buggy because they overlap with
-other selections (e.g. Idents).  Fix.
-
-
-User Interface
---------------
-
-CALLGRAPH:
-- Add a search box: given a search node, expand path from each entry
-  point to it.
-- Cause hovering over a given node to highlight that node, and all
-  nodes that are logically identical to it.
-- Initially expand the callgraph trees (but not their toggle divs).
-
-CALLEES:
-- The '(' links are not very discoverable.  Highlight them?
-
-Type info:
-- In the source viewer's lower pane, use a toggle div around the
-  IMPLEMENTS and METHODSETS lists, like we do in the pacakge view.
-  Only expand them initially if short.
-- Include IMPLEMENTS and METHOD SETS information in search index.
-- URLs in IMPLEMENTS/METHOD SETS always link to source, even from the
-  package docs view.  This makes sense for links to non-exported
-  types, but links to exported types and funcs should probably go to
-  other package docs.
-- Suppress toggle divs for empty method sets.
-
-Misc:
-- The [X] button in the lower pane is subject to scrolling.
-- Should the lower pane be floating?  An iframe?
-  When we change document.location by clicking on a link, it will go away.
-  How do we prevent that (a la Gmail's chat windows)?
-- Progress/status: for each file, display its analysis status, one of:
-   - not in analysis scope
-   - type analysis running...
-   - type analysis complete
-     (+ optionally: there were type errors in this file)
-   And if PTA requested:
-   - type analysis complete; PTA not attempted due to type errors
-   - PTA running...
-   - PTA complete
-- Scroll the selection into view, e.g. the vertical center, or better
-  still, under the pointer (assuming we have a mouse).
-
-
-More features
--------------
-
-Display the REFERRERS relation?  (Useful but potentially large.)
-
-Display the INSTANTIATIONS relation? i.e. given a type T, show the set of
-syntactic constructs that can instantiate it:
-    var x T
-    x := T{...}
-    x = new(T)
-    x = make([]T, n)
-    etc
-    + all INSTANTIATIONS of all S defined as struct{t T} or [n]T
-(Potentially a lot of information.)
-(Add this to guru too.)
-
-
-Optimisations
--------------
-
-Each call to addLink takes a (per-file) lock.  The locking is
-fine-grained so server latency isn't terrible, but overall it makes
-the link computation quite slow.  Batch update might be better.
-
-Memory usage is now about 1.5GB for GOROOT + go.tools.  It used to be 700MB.
-
-Optimize for time and space.  The main slowdown is the network I/O
-time caused by an increase in page size of about 3x: about 2x from
-HTML, and 0.7--2.1x from JSON (unindented vs indented).  The JSON
-contains a lot of filenames (e.g. 820 copies of 16 distinct
-filenames).  20% of the HTML is L%d spans (now disabled).  The HTML
-also contains lots of tooltips for long struct/interface types.
-De-dup or just abbreviate?  The actual formatting is very fast.
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/analysis.go b/installer/vendor/golang.org/x/tools/godoc/analysis/analysis.go
deleted file mode 100644
index b79286c5d3..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/analysis.go
+++ /dev/null
@@ -1,613 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package analysis performs type and pointer analysis
-// and generates mark-up for the Go source view.
-//
-// The Run method populates a Result object by running type and
-// (optionally) pointer analysis.  The Result object is thread-safe
-// and at all times may be accessed by a serving thread, even as it is
-// progressively populated as analysis facts are derived.
-//
-// The Result is a mapping from each godoc file URL
-// (e.g. /src/fmt/print.go) to information about that file.  The
-// information is a list of HTML markup links and a JSON array of
-// structured data values.  Some of the links call client-side
-// JavaScript functions that index this array.
-//
-// The analysis computes mark-up for the following relations:
-//
-// IMPORTS: for each ast.ImportSpec, the package that it denotes.
-//
-// RESOLUTION: for each ast.Ident, its kind and type, and the location
-// of its definition.
-//
-// METHOD SETS, IMPLEMENTS: for each ast.Ident defining a named type,
-// its method-set, the set of interfaces it implements or is
-// implemented by, and its size/align values.
-//
-// CALLERS, CALLEES: for each function declaration ('func' token), its
-// callers, and for each call-site ('(' token), its callees.
-//
-// CALLGRAPH: the package docs include an interactive viewer for the
-// intra-package call graph of "fmt".
-//
-// CHANNEL PEERS: for each channel operation make/<-/close, the set of
-// other channel ops that alias the same channel(s).
-//
-// ERRORS: for each locus of a frontend (scanner/parser/type) error, the
-// location is highlighted in red and hover text provides the compiler
-// error message.
-//
-package analysis // import "golang.org/x/tools/godoc/analysis"
-
-import (
-	"fmt"
-	"go/build"
-	"go/scanner"
-	"go/token"
-	"go/types"
-	"html"
-	"io"
-	"log"
-	"os"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-	"golang.org/x/tools/go/ssa/ssautil"
-)
-
-// -- links ------------------------------------------------------------
-
-// A Link is an HTML decoration of the bytes [Start, End) of a file.
-// Write is called before/after those bytes to emit the mark-up.
-type Link interface {
-	Start() int
-	End() int
-	Write(w io.Writer, _ int, start bool) // the godoc.LinkWriter signature
-}
-
-// An <a> element.
-type aLink struct {
-	start, end int    // =godoc.Segment
-	title      string // hover text
-	onclick    string // JS code (NB: trusted)
-	href       string // URL     (NB: trusted)
-}
-
-func (a aLink) Start() int { return a.start }
-func (a aLink) End() int   { return a.end }
-func (a aLink) Write(w io.Writer, _ int, start bool) {
-	if start {
-		fmt.Fprintf(w, `<a title='%s'`, html.EscapeString(a.title))
-		if a.onclick != "" {
-			fmt.Fprintf(w, ` onclick='%s'`, html.EscapeString(a.onclick))
-		}
-		if a.href != "" {
-			// TODO(adonovan): I think that in principle, a.href must first be
-			// url.QueryEscape'd, but if I do that, a leading slash becomes "%2F",
-			// which causes the browser to treat the path as relative, not absolute.
-			// WTF?
-			fmt.Fprintf(w, ` href='%s'`, html.EscapeString(a.href))
-		}
-		fmt.Fprintf(w, ">")
-	} else {
-		fmt.Fprintf(w, "</a>")
-	}
-}
-
-// An <a class='error'> element.
-type errorLink struct {
-	start int
-	msg   string
-}
-
-func (e errorLink) Start() int { return e.start }
-func (e errorLink) End() int   { return e.start + 1 }
-
-func (e errorLink) Write(w io.Writer, _ int, start bool) {
-	// <span> causes havoc, not sure why, so use <a>.
-	if start {
-		fmt.Fprintf(w, `<a class='error' title='%s'>`, html.EscapeString(e.msg))
-	} else {
-		fmt.Fprintf(w, "</a>")
-	}
-}
-
-// -- fileInfo ---------------------------------------------------------
-
-// FileInfo holds analysis information for the source file view.
-// Clients must not mutate it.
-type FileInfo struct {
-	Data  []interface{} // JSON serializable values
-	Links []Link        // HTML link markup
-}
-
-// A fileInfo is the server's store of hyperlinks and JSON data for a
-// particular file.
-type fileInfo struct {
-	mu        sync.Mutex
-	data      []interface{} // JSON objects
-	links     []Link
-	sorted    bool
-	hasErrors bool // TODO(adonovan): surface this in the UI
-}
-
-// addLink adds a link to the Go source file fi.
-func (fi *fileInfo) addLink(link Link) {
-	fi.mu.Lock()
-	fi.links = append(fi.links, link)
-	fi.sorted = false
-	if _, ok := link.(errorLink); ok {
-		fi.hasErrors = true
-	}
-	fi.mu.Unlock()
-}
-
-// addData adds the structured value x to the JSON data for the Go
-// source file fi.  Its index is returned.
-func (fi *fileInfo) addData(x interface{}) int {
-	fi.mu.Lock()
-	index := len(fi.data)
-	fi.data = append(fi.data, x)
-	fi.mu.Unlock()
-	return index
-}
-
-// get returns the file info in external form.
-// Callers must not mutate its fields.
-func (fi *fileInfo) get() FileInfo {
-	var r FileInfo
-	// Copy slices, to avoid races.
-	fi.mu.Lock()
-	r.Data = append(r.Data, fi.data...)
-	if !fi.sorted {
-		sort.Sort(linksByStart(fi.links))
-		fi.sorted = true
-	}
-	r.Links = append(r.Links, fi.links...)
-	fi.mu.Unlock()
-	return r
-}
-
-// PackageInfo holds analysis information for the package view.
-// Clients must not mutate it.
-type PackageInfo struct {
-	CallGraph      []*PCGNodeJSON
-	CallGraphIndex map[string]int
-	Types          []*TypeInfoJSON
-}
-
-type pkgInfo struct {
-	mu             sync.Mutex
-	callGraph      []*PCGNodeJSON
-	callGraphIndex map[string]int  // keys are (*ssa.Function).RelString()
-	types          []*TypeInfoJSON // type info for exported types
-}
-
-func (pi *pkgInfo) setCallGraph(callGraph []*PCGNodeJSON, callGraphIndex map[string]int) {
-	pi.mu.Lock()
-	pi.callGraph = callGraph
-	pi.callGraphIndex = callGraphIndex
-	pi.mu.Unlock()
-}
-
-func (pi *pkgInfo) addType(t *TypeInfoJSON) {
-	pi.mu.Lock()
-	pi.types = append(pi.types, t)
-	pi.mu.Unlock()
-}
-
-// get returns the package info in external form.
-// Callers must not mutate its fields.
-func (pi *pkgInfo) get() PackageInfo {
-	var r PackageInfo
-	// Copy slices, to avoid races.
-	pi.mu.Lock()
-	r.CallGraph = append(r.CallGraph, pi.callGraph...)
-	r.CallGraphIndex = pi.callGraphIndex
-	r.Types = append(r.Types, pi.types...)
-	pi.mu.Unlock()
-	return r
-}
-
-// -- Result -----------------------------------------------------------
-
-// Result contains the results of analysis.
-// The result contains a mapping from filenames to a set of HTML links
-// and JavaScript data referenced by the links.
-type Result struct {
-	mu        sync.Mutex           // guards maps (but not their contents)
-	status    string               // global analysis status
-	fileInfos map[string]*fileInfo // keys are godoc file URLs
-	pkgInfos  map[string]*pkgInfo  // keys are import paths
-}
-
-// fileInfo returns the fileInfo for the specified godoc file URL,
-// constructing it as needed.  Thread-safe.
-func (res *Result) fileInfo(url string) *fileInfo {
-	res.mu.Lock()
-	fi, ok := res.fileInfos[url]
-	if !ok {
-		if res.fileInfos == nil {
-			res.fileInfos = make(map[string]*fileInfo)
-		}
-		fi = new(fileInfo)
-		res.fileInfos[url] = fi
-	}
-	res.mu.Unlock()
-	return fi
-}
-
-// Status returns a human-readable description of the current analysis status.
-func (res *Result) Status() string {
-	res.mu.Lock()
-	defer res.mu.Unlock()
-	return res.status
-}
-
-func (res *Result) setStatusf(format string, args ...interface{}) {
-	res.mu.Lock()
-	res.status = fmt.Sprintf(format, args...)
-	log.Printf(format, args...)
-	res.mu.Unlock()
-}
-
-// FileInfo returns new slices containing opaque JSON values and the
-// HTML link markup for the specified godoc file URL.  Thread-safe.
-// Callers must not mutate the elements.
-// It returns "zero" if no data is available.
-//
-func (res *Result) FileInfo(url string) (fi FileInfo) {
-	return res.fileInfo(url).get()
-}
-
-// pkgInfo returns the pkgInfo for the specified import path,
-// constructing it as needed.  Thread-safe.
-func (res *Result) pkgInfo(importPath string) *pkgInfo {
-	res.mu.Lock()
-	pi, ok := res.pkgInfos[importPath]
-	if !ok {
-		if res.pkgInfos == nil {
-			res.pkgInfos = make(map[string]*pkgInfo)
-		}
-		pi = new(pkgInfo)
-		res.pkgInfos[importPath] = pi
-	}
-	res.mu.Unlock()
-	return pi
-}
-
-// PackageInfo returns new slices of JSON values for the callgraph and
-// type info for the specified package.  Thread-safe.
-// Callers must not mutate its fields.
-// PackageInfo returns "zero" if no data is available.
-//
-func (res *Result) PackageInfo(importPath string) PackageInfo {
-	return res.pkgInfo(importPath).get()
-}
-
-// -- analysis ---------------------------------------------------------
-
-type analysis struct {
-	result    *Result
-	prog      *ssa.Program
-	ops       []chanOp       // all channel ops in program
-	allNamed  []*types.Named // all "defined" (formerly "named") types in the program
-	ptaConfig pointer.Config
-	path2url  map[string]string // maps openable path to godoc file URL (/src/fmt/print.go)
-	pcgs      map[*ssa.Package]*packageCallGraph
-}
-
-// fileAndOffset returns the file and offset for a given pos.
-func (a *analysis) fileAndOffset(pos token.Pos) (fi *fileInfo, offset int) {
-	return a.fileAndOffsetPosn(a.prog.Fset.Position(pos))
-}
-
-// fileAndOffsetPosn returns the file and offset for a given position.
-func (a *analysis) fileAndOffsetPosn(posn token.Position) (fi *fileInfo, offset int) {
-	url := a.path2url[posn.Filename]
-	return a.result.fileInfo(url), posn.Offset
-}
-
-// posURL returns the URL of the source extent [pos, pos+len).
-func (a *analysis) posURL(pos token.Pos, len int) string {
-	if pos == token.NoPos {
-		return ""
-	}
-	posn := a.prog.Fset.Position(pos)
-	url := a.path2url[posn.Filename]
-	return fmt.Sprintf("%s?s=%d:%d#L%d",
-		url, posn.Offset, posn.Offset+len, posn.Line)
-}
-
-// ----------------------------------------------------------------------
-
-// Run runs program analysis and computes the resulting markup,
-// populating *result in a thread-safe manner, first with type
-// information then later with pointer analysis information if
-// enabled by the pta flag.
-//
-func Run(pta bool, result *Result) {
-	conf := loader.Config{
-		AllowErrors: true,
-	}
-
-	// Silence the default error handler.
-	// Don't print all errors; we'll report just
-	// one per errant package later.
-	conf.TypeChecker.Error = func(e error) {}
-
-	var roots, args []string // roots[i] ends with os.PathSeparator
-
-	// Enumerate packages in $GOROOT.
-	root := filepath.Join(build.Default.GOROOT, "src") + string(os.PathSeparator)
-	roots = append(roots, root)
-	args = allPackages(root)
-	log.Printf("GOROOT=%s: %s\n", root, args)
-
-	// Enumerate packages in $GOPATH.
-	for i, dir := range filepath.SplitList(build.Default.GOPATH) {
-		root := filepath.Join(dir, "src") + string(os.PathSeparator)
-		roots = append(roots, root)
-		pkgs := allPackages(root)
-		log.Printf("GOPATH[%d]=%s: %s\n", i, root, pkgs)
-		args = append(args, pkgs...)
-	}
-
-	// Uncomment to make startup quicker during debugging.
-	//args = []string{"golang.org/x/tools/cmd/godoc"}
-	//args = []string{"fmt"}
-
-	if _, err := conf.FromArgs(args, true); err != nil {
-		// TODO(adonovan): degrade gracefully, not fail totally.
-		// (The crippling case is a parse error in an external test file.)
-		result.setStatusf("Analysis failed: %s.", err) // import error
-		return
-	}
-
-	result.setStatusf("Loading and type-checking packages...")
-	iprog, err := conf.Load()
-	if iprog != nil {
-		// Report only the first error of each package.
-		for _, info := range iprog.AllPackages {
-			for _, err := range info.Errors {
-				fmt.Fprintln(os.Stderr, err)
-				break
-			}
-		}
-		log.Printf("Loaded %d packages.", len(iprog.AllPackages))
-	}
-	if err != nil {
-		result.setStatusf("Loading failed: %s.\n", err)
-		return
-	}
-
-	// Create SSA-form program representation.
-	// Only the transitively error-free packages are used.
-	prog := ssautil.CreateProgram(iprog, ssa.GlobalDebug)
-
-	// Create a "testmain" package for each package with tests.
-	for _, pkg := range prog.AllPackages() {
-		if testmain := prog.CreateTestMainPackage(pkg); testmain != nil {
-			log.Printf("Adding tests for %s", pkg.Pkg.Path())
-		}
-	}
-
-	// Build SSA code for bodies of all functions in the whole program.
-	result.setStatusf("Constructing SSA form...")
-	prog.Build()
-	log.Print("SSA construction complete")
-
-	a := analysis{
-		result: result,
-		prog:   prog,
-		pcgs:   make(map[*ssa.Package]*packageCallGraph),
-	}
-
-	// Build a mapping from openable filenames to godoc file URLs,
-	// i.e. "/src/" plus path relative to GOROOT/src or GOPATH[i]/src.
-	a.path2url = make(map[string]string)
-	for _, info := range iprog.AllPackages {
-	nextfile:
-		for _, f := range info.Files {
-			if f.Pos() == 0 {
-				continue // e.g. files generated by cgo
-			}
-			abs := iprog.Fset.File(f.Pos()).Name()
-			// Find the root to which this file belongs.
-			for _, root := range roots {
-				rel := strings.TrimPrefix(abs, root)
-				if len(rel) < len(abs) {
-					a.path2url[abs] = "/src/" + filepath.ToSlash(rel)
-					continue nextfile
-				}
-			}
-
-			log.Printf("Can't locate file %s (package %q) beneath any root",
-				abs, info.Pkg.Path())
-		}
-	}
-
-	// Add links for scanner, parser, type-checker errors.
-	// TODO(adonovan): fix: these links can overlap with
-	// identifier markup, causing the renderer to emit some
-	// characters twice.
-	errors := make(map[token.Position][]string)
-	for _, info := range iprog.AllPackages {
-		for _, err := range info.Errors {
-			switch err := err.(type) {
-			case types.Error:
-				posn := a.prog.Fset.Position(err.Pos)
-				errors[posn] = append(errors[posn], err.Msg)
-			case scanner.ErrorList:
-				for _, e := range err {
-					errors[e.Pos] = append(errors[e.Pos], e.Msg)
-				}
-			default:
-				log.Printf("Package %q has error (%T) without position: %v\n",
-					info.Pkg.Path(), err, err)
-			}
-		}
-	}
-	for posn, errs := range errors {
-		fi, offset := a.fileAndOffsetPosn(posn)
-		fi.addLink(errorLink{
-			start: offset,
-			msg:   strings.Join(errs, "\n"),
-		})
-	}
-
-	// ---------- type-based analyses ----------
-
-	// Compute the all-pairs IMPLEMENTS relation.
-	// Collect all named types, even local types
-	// (which can have methods via promotion)
-	// and the built-in "error".
-	errorType := types.Universe.Lookup("error").Type().(*types.Named)
-	a.allNamed = append(a.allNamed, errorType)
-	for _, info := range iprog.AllPackages {
-		for _, obj := range info.Defs {
-			if obj, ok := obj.(*types.TypeName); ok {
-				if named, ok := obj.Type().(*types.Named); ok {
-					a.allNamed = append(a.allNamed, named)
-				}
-			}
-		}
-	}
-	log.Print("Computing implements relation...")
-	facts := computeImplements(&a.prog.MethodSets, a.allNamed)
-
-	// Add the type-based analysis results.
-	log.Print("Extracting type info...")
-	for _, info := range iprog.AllPackages {
-		a.doTypeInfo(info, facts)
-	}
-
-	a.visitInstrs(pta)
-
-	result.setStatusf("Type analysis complete.")
-
-	if pta {
-		mainPkgs := ssautil.MainPackages(prog.AllPackages())
-		log.Print("Transitively error-free main packages: ", mainPkgs)
-		a.pointer(mainPkgs)
-	}
-}
-
-// visitInstrs visits all SSA instructions in the program.
-func (a *analysis) visitInstrs(pta bool) {
-	log.Print("Visit instructions...")
-	for fn := range ssautil.AllFunctions(a.prog) {
-		for _, b := range fn.Blocks {
-			for _, instr := range b.Instrs {
-				// CALLEES (static)
-				// (Dynamic calls require pointer analysis.)
-				//
-				// We use the SSA representation to find the static callee,
-				// since in many cases it does better than the
-				// types.Info.{Refs,Selection} information.  For example:
-				//
-				//   defer func(){}()      // static call to anon function
-				//   f := func(){}; f()    // static call to anon function
-				//   f := fmt.Println; f() // static call to named function
-				//
-				// The downside is that we get no static callee information
-				// for packages that (transitively) contain errors.
-				if site, ok := instr.(ssa.CallInstruction); ok {
-					if callee := site.Common().StaticCallee(); callee != nil {
-						// TODO(adonovan): callgraph: elide wrappers.
-						// (Do static calls ever go to wrappers?)
-						if site.Common().Pos() != token.NoPos {
-							a.addCallees(site, []*ssa.Function{callee})
-						}
-					}
-				}
-
-				if !pta {
-					continue
-				}
-
-				// CHANNEL PEERS
-				// Collect send/receive/close instructions in the whole ssa.Program.
-				for _, op := range chanOps(instr) {
-					a.ops = append(a.ops, op)
-					a.ptaConfig.AddQuery(op.ch) // add channel ssa.Value to PTA query
-				}
-			}
-		}
-	}
-	log.Print("Visit instructions complete")
-}
-
-// pointer runs the pointer analysis.
-func (a *analysis) pointer(mainPkgs []*ssa.Package) {
-	// Run the pointer analysis and build the complete callgraph.
-	a.ptaConfig.Mains = mainPkgs
-	a.ptaConfig.BuildCallGraph = true
-	a.ptaConfig.Reflection = false // (for now)
-
-	a.result.setStatusf("Pointer analysis running...")
-
-	ptares, err := pointer.Analyze(&a.ptaConfig)
-	if err != nil {
-		// If this happens, it indicates a bug.
-		a.result.setStatusf("Pointer analysis failed: %s.", err)
-		return
-	}
-	log.Print("Pointer analysis complete.")
-
-	// Add the results of pointer analysis.
-
-	a.result.setStatusf("Computing channel peers...")
-	a.doChannelPeers(ptares.Queries)
-	a.result.setStatusf("Computing dynamic call graph edges...")
-	a.doCallgraph(ptares.CallGraph)
-
-	a.result.setStatusf("Analysis complete.")
-}
-
-type linksByStart []Link
-
-func (a linksByStart) Less(i, j int) bool { return a[i].Start() < a[j].Start() }
-func (a linksByStart) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a linksByStart) Len() int           { return len(a) }
-
-// allPackages returns a new sorted slice of all packages beneath the
-// specified package root directory, e.g. $GOROOT/src or $GOPATH/src.
-// Derived from from go/ssa/stdlib_test.go
-// root must end with os.PathSeparator.
-//
-// TODO(adonovan): use buildutil.AllPackages when the tree thaws.
-func allPackages(root string) []string {
-	var pkgs []string
-	filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
-		if info == nil {
-			return nil // non-existent root directory?
-		}
-		if !info.IsDir() {
-			return nil // not a directory
-		}
-		// Prune the search if we encounter any of these names:
-		base := filepath.Base(path)
-		if base == "testdata" || strings.HasPrefix(base, ".") {
-			return filepath.SkipDir
-		}
-		pkg := filepath.ToSlash(strings.TrimPrefix(path, root))
-		switch pkg {
-		case "builtin":
-			return filepath.SkipDir
-		case "":
-			return nil // ignore root of tree
-		}
-		pkgs = append(pkgs, pkg)
-		return nil
-	})
-	return pkgs
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/callgraph.go b/installer/vendor/golang.org/x/tools/godoc/analysis/callgraph.go
deleted file mode 100644
index 492022d3de..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/callgraph.go
+++ /dev/null
@@ -1,351 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package analysis
-
-// This file computes the CALLERS and CALLEES relations from the call
-// graph.  CALLERS/CALLEES information is displayed in the lower pane
-// when a "func" token or ast.CallExpr.Lparen is clicked, respectively.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"log"
-	"math/big"
-	"sort"
-
-	"golang.org/x/tools/go/callgraph"
-	"golang.org/x/tools/go/ssa"
-)
-
-// doCallgraph computes the CALLEES and CALLERS relations.
-func (a *analysis) doCallgraph(cg *callgraph.Graph) {
-	log.Print("Deleting synthetic nodes...")
-	// TODO(adonovan): opt: DeleteSyntheticNodes is asymptotically
-	// inefficient and can be (unpredictably) slow.
-	cg.DeleteSyntheticNodes()
-	log.Print("Synthetic nodes deleted")
-
-	// Populate nodes of package call graphs (PCGs).
-	for _, n := range cg.Nodes {
-		a.pcgAddNode(n.Func)
-	}
-	// Within each PCG, sort funcs by name.
-	for _, pcg := range a.pcgs {
-		pcg.sortNodes()
-	}
-
-	calledFuncs := make(map[ssa.CallInstruction]map[*ssa.Function]bool)
-	callingSites := make(map[*ssa.Function]map[ssa.CallInstruction]bool)
-	for _, n := range cg.Nodes {
-		for _, e := range n.Out {
-			if e.Site == nil {
-				continue // a call from a synthetic node such as <root>
-			}
-
-			// Add (site pos, callee) to calledFuncs.
-			// (Dynamic calls only.)
-			callee := e.Callee.Func
-
-			a.pcgAddEdge(n.Func, callee)
-
-			if callee.Synthetic != "" {
-				continue // call of a package initializer
-			}
-
-			if e.Site.Common().StaticCallee() == nil {
-				// dynamic call
-				// (CALLEES information for static calls
-				// is computed using SSA information.)
-				lparen := e.Site.Common().Pos()
-				if lparen != token.NoPos {
-					fns := calledFuncs[e.Site]
-					if fns == nil {
-						fns = make(map[*ssa.Function]bool)
-						calledFuncs[e.Site] = fns
-					}
-					fns[callee] = true
-				}
-			}
-
-			// Add (callee, site) to callingSites.
-			fns := callingSites[callee]
-			if fns == nil {
-				fns = make(map[ssa.CallInstruction]bool)
-				callingSites[callee] = fns
-			}
-			fns[e.Site] = true
-		}
-	}
-
-	// CALLEES.
-	log.Print("Callees...")
-	for site, fns := range calledFuncs {
-		var funcs funcsByPos
-		for fn := range fns {
-			funcs = append(funcs, fn)
-		}
-		sort.Sort(funcs)
-
-		a.addCallees(site, funcs)
-	}
-
-	// CALLERS
-	log.Print("Callers...")
-	for callee, sites := range callingSites {
-		pos := funcToken(callee)
-		if pos == token.NoPos {
-			log.Printf("CALLERS: skipping %s: no pos", callee)
-			continue
-		}
-
-		var this *types.Package // for relativizing names
-		if callee.Pkg != nil {
-			this = callee.Pkg.Pkg
-		}
-
-		// Compute sites grouped by parent, with text and URLs.
-		sitesByParent := make(map[*ssa.Function]sitesByPos)
-		for site := range sites {
-			fn := site.Parent()
-			sitesByParent[fn] = append(sitesByParent[fn], site)
-		}
-		var funcs funcsByPos
-		for fn := range sitesByParent {
-			funcs = append(funcs, fn)
-		}
-		sort.Sort(funcs)
-
-		v := callersJSON{
-			Callee:  callee.String(),
-			Callers: []callerJSON{}, // (JS wants non-nil)
-		}
-		for _, fn := range funcs {
-			caller := callerJSON{
-				Func:  prettyFunc(this, fn),
-				Sites: []anchorJSON{}, // (JS wants non-nil)
-			}
-			sites := sitesByParent[fn]
-			sort.Sort(sites)
-			for _, site := range sites {
-				pos := site.Common().Pos()
-				if pos != token.NoPos {
-					caller.Sites = append(caller.Sites, anchorJSON{
-						Text: fmt.Sprintf("%d", a.prog.Fset.Position(pos).Line),
-						Href: a.posURL(pos, len("(")),
-					})
-				}
-			}
-			v.Callers = append(v.Callers, caller)
-		}
-
-		fi, offset := a.fileAndOffset(pos)
-		fi.addLink(aLink{
-			start:   offset,
-			end:     offset + len("func"),
-			title:   fmt.Sprintf("%d callers", len(sites)),
-			onclick: fmt.Sprintf("onClickCallers(%d)", fi.addData(v)),
-		})
-	}
-
-	// PACKAGE CALLGRAPH
-	log.Print("Package call graph...")
-	for pkg, pcg := range a.pcgs {
-		// Maps (*ssa.Function).RelString() to index in JSON CALLGRAPH array.
-		index := make(map[string]int)
-
-		// Treat exported functions (and exported methods of
-		// exported named types) as roots even if they aren't
-		// actually called from outside the package.
-		for i, n := range pcg.nodes {
-			if i == 0 || n.fn.Object() == nil || !n.fn.Object().Exported() {
-				continue
-			}
-			recv := n.fn.Signature.Recv()
-			if recv == nil || deref(recv.Type()).(*types.Named).Obj().Exported() {
-				roots := &pcg.nodes[0].edges
-				roots.SetBit(roots, i, 1)
-			}
-			index[n.fn.RelString(pkg.Pkg)] = i
-		}
-
-		json := a.pcgJSON(pcg)
-
-		// TODO(adonovan): pkg.Path() is not unique!
-		// It is possible to declare a non-test package called x_test.
-		a.result.pkgInfo(pkg.Pkg.Path()).setCallGraph(json, index)
-	}
-}
-
-// addCallees adds client data and links for the facts that site calls fns.
-func (a *analysis) addCallees(site ssa.CallInstruction, fns []*ssa.Function) {
-	v := calleesJSON{
-		Descr:   site.Common().Description(),
-		Callees: []anchorJSON{}, // (JS wants non-nil)
-	}
-	var this *types.Package // for relativizing names
-	if p := site.Parent().Package(); p != nil {
-		this = p.Pkg
-	}
-
-	for _, fn := range fns {
-		v.Callees = append(v.Callees, anchorJSON{
-			Text: prettyFunc(this, fn),
-			Href: a.posURL(funcToken(fn), len("func")),
-		})
-	}
-
-	fi, offset := a.fileAndOffset(site.Common().Pos())
-	fi.addLink(aLink{
-		start:   offset,
-		end:     offset + len("("),
-		title:   fmt.Sprintf("%d callees", len(v.Callees)),
-		onclick: fmt.Sprintf("onClickCallees(%d)", fi.addData(v)),
-	})
-}
-
-// -- utilities --------------------------------------------------------
-
-// stable order within packages but undefined across packages.
-type funcsByPos []*ssa.Function
-
-func (a funcsByPos) Less(i, j int) bool { return a[i].Pos() < a[j].Pos() }
-func (a funcsByPos) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a funcsByPos) Len() int           { return len(a) }
-
-type sitesByPos []ssa.CallInstruction
-
-func (a sitesByPos) Less(i, j int) bool { return a[i].Common().Pos() < a[j].Common().Pos() }
-func (a sitesByPos) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a sitesByPos) Len() int           { return len(a) }
-
-func funcToken(fn *ssa.Function) token.Pos {
-	switch syntax := fn.Syntax().(type) {
-	case *ast.FuncLit:
-		return syntax.Type.Func
-	case *ast.FuncDecl:
-		return syntax.Type.Func
-	}
-	return token.NoPos
-}
-
-// prettyFunc pretty-prints fn for the user interface.
-// TODO(adonovan): return HTML so we have more markup freedom.
-func prettyFunc(this *types.Package, fn *ssa.Function) string {
-	if fn.Parent() != nil {
-		return fmt.Sprintf("%s in %s",
-			types.TypeString(fn.Signature, types.RelativeTo(this)),
-			prettyFunc(this, fn.Parent()))
-	}
-	if fn.Synthetic != "" && fn.Name() == "init" {
-		// (This is the actual initializer, not a declared 'func init').
-		if fn.Pkg.Pkg == this {
-			return "package initializer"
-		}
-		return fmt.Sprintf("%q package initializer", fn.Pkg.Pkg.Path())
-	}
-	return fn.RelString(this)
-}
-
-// -- intra-package callgraph ------------------------------------------
-
-// pcgNode represents a node in the package call graph (PCG).
-type pcgNode struct {
-	fn     *ssa.Function
-	pretty string  // cache of prettyFunc(fn)
-	edges  big.Int // set of callee func indices
-}
-
-// A packageCallGraph represents the intra-package edges of the global call graph.
-// The zeroth node indicates "all external functions".
-type packageCallGraph struct {
-	nodeIndex map[*ssa.Function]int // maps func to node index (a small int)
-	nodes     []*pcgNode            // maps node index to node
-}
-
-// sortNodes populates pcg.nodes in name order and updates the nodeIndex.
-func (pcg *packageCallGraph) sortNodes() {
-	nodes := make([]*pcgNode, 0, len(pcg.nodeIndex))
-	nodes = append(nodes, &pcgNode{fn: nil, pretty: "<external>"})
-	for fn := range pcg.nodeIndex {
-		nodes = append(nodes, &pcgNode{
-			fn:     fn,
-			pretty: prettyFunc(fn.Pkg.Pkg, fn),
-		})
-	}
-	sort.Sort(pcgNodesByPretty(nodes[1:]))
-	for i, n := range nodes {
-		pcg.nodeIndex[n.fn] = i
-	}
-	pcg.nodes = nodes
-}
-
-func (pcg *packageCallGraph) addEdge(caller, callee *ssa.Function) {
-	var callerIndex int
-	if caller.Pkg == callee.Pkg {
-		// intra-package edge
-		callerIndex = pcg.nodeIndex[caller]
-		if callerIndex < 1 {
-			panic(caller)
-		}
-	}
-	edges := &pcg.nodes[callerIndex].edges
-	edges.SetBit(edges, pcg.nodeIndex[callee], 1)
-}
-
-func (a *analysis) pcgAddNode(fn *ssa.Function) {
-	if fn.Pkg == nil {
-		return
-	}
-	pcg, ok := a.pcgs[fn.Pkg]
-	if !ok {
-		pcg = &packageCallGraph{nodeIndex: make(map[*ssa.Function]int)}
-		a.pcgs[fn.Pkg] = pcg
-	}
-	pcg.nodeIndex[fn] = -1
-}
-
-func (a *analysis) pcgAddEdge(caller, callee *ssa.Function) {
-	if callee.Pkg != nil {
-		a.pcgs[callee.Pkg].addEdge(caller, callee)
-	}
-}
-
-// pcgJSON returns a new slice of callgraph JSON values.
-func (a *analysis) pcgJSON(pcg *packageCallGraph) []*PCGNodeJSON {
-	var nodes []*PCGNodeJSON
-	for _, n := range pcg.nodes {
-
-		// TODO(adonovan): why is there no good way to iterate
-		// over the set bits of a big.Int?
-		var callees []int
-		nbits := n.edges.BitLen()
-		for j := 0; j < nbits; j++ {
-			if n.edges.Bit(j) == 1 {
-				callees = append(callees, j)
-			}
-		}
-
-		var pos token.Pos
-		if n.fn != nil {
-			pos = funcToken(n.fn)
-		}
-		nodes = append(nodes, &PCGNodeJSON{
-			Func: anchorJSON{
-				Text: n.pretty,
-				Href: a.posURL(pos, len("func")),
-			},
-			Callees: callees,
-		})
-	}
-	return nodes
-}
-
-type pcgNodesByPretty []*pcgNode
-
-func (a pcgNodesByPretty) Less(i, j int) bool { return a[i].pretty < a[j].pretty }
-func (a pcgNodesByPretty) Swap(i, j int)      { a[i], a[j] = a[j], a[i] }
-func (a pcgNodesByPretty) Len() int           { return len(a) }
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/implements.go b/installer/vendor/golang.org/x/tools/godoc/analysis/implements.go
deleted file mode 100644
index 5a29579892..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/implements.go
+++ /dev/null
@@ -1,195 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package analysis
-
-// This file computes the "implements" relation over all pairs of
-// named types in the program.  (The mark-up is done by typeinfo.go.)
-
-// TODO(adonovan): do we want to report implements(C, I) where C and I
-// belong to different packages and at least one is not exported?
-
-import (
-	"go/types"
-	"sort"
-
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// computeImplements computes the "implements" relation over all pairs
-// of named types in allNamed.
-func computeImplements(cache *typeutil.MethodSetCache, allNamed []*types.Named) map[*types.Named]implementsFacts {
-	// Information about a single type's method set.
-	type msetInfo struct {
-		typ          types.Type
-		mset         *types.MethodSet
-		mask1, mask2 uint64
-	}
-
-	initMsetInfo := func(info *msetInfo, typ types.Type) {
-		info.typ = typ
-		info.mset = cache.MethodSet(typ)
-		for i := 0; i < info.mset.Len(); i++ {
-			name := info.mset.At(i).Obj().Name()
-			info.mask1 |= 1 << methodBit(name[0])
-			info.mask2 |= 1 << methodBit(name[len(name)-1])
-		}
-	}
-
-	// satisfies(T, U) reports whether type T satisfies type U.
-	// U must be an interface.
-	//
-	// Since there are thousands of types (and thus millions of
-	// pairs of types) and types.Assignable(T, U) is relatively
-	// expensive, we compute assignability directly from the
-	// method sets.  (At least one of T and U must be an
-	// interface.)
-	//
-	// We use a trick (thanks gri!) related to a Bloom filter to
-	// quickly reject most tests, which are false.  For each
-	// method set, we precompute a mask, a set of bits, one per
-	// distinct initial byte of each method name.  Thus the mask
-	// for io.ReadWriter would be {'R','W'}.  AssignableTo(T, U)
-	// cannot be true unless mask(T)&mask(U)==mask(U).
-	//
-	// As with a Bloom filter, we can improve precision by testing
-	// additional hashes, e.g. using the last letter of each
-	// method name, so long as the subset mask property holds.
-	//
-	// When analyzing the standard library, there are about 1e6
-	// calls to satisfies(), of which 0.6% return true.  With a
-	// 1-hash filter, 95% of calls avoid the expensive check; with
-	// a 2-hash filter, this grows to 98.2%.
-	satisfies := func(T, U *msetInfo) bool {
-		return T.mask1&U.mask1 == U.mask1 &&
-			T.mask2&U.mask2 == U.mask2 &&
-			containsAllIdsOf(T.mset, U.mset)
-	}
-
-	// Information about a named type N, and perhaps also *N.
-	type namedInfo struct {
-		isInterface bool
-		base        msetInfo // N
-		ptr         msetInfo // *N, iff N !isInterface
-	}
-
-	var infos []namedInfo
-
-	// Precompute the method sets and their masks.
-	for _, N := range allNamed {
-		var info namedInfo
-		initMsetInfo(&info.base, N)
-		_, info.isInterface = N.Underlying().(*types.Interface)
-		if !info.isInterface {
-			initMsetInfo(&info.ptr, types.NewPointer(N))
-		}
-
-		if info.base.mask1|info.ptr.mask1 == 0 {
-			continue // neither N nor *N has methods
-		}
-
-		infos = append(infos, info)
-	}
-
-	facts := make(map[*types.Named]implementsFacts)
-
-	// Test all pairs of distinct named types (T, U).
-	// TODO(adonovan): opt: compute (U, T) at the same time.
-	for t := range infos {
-		T := &infos[t]
-		var to, from, fromPtr []types.Type
-		for u := range infos {
-			if t == u {
-				continue
-			}
-			U := &infos[u]
-			switch {
-			case T.isInterface && U.isInterface:
-				if satisfies(&U.base, &T.base) {
-					to = append(to, U.base.typ)
-				}
-				if satisfies(&T.base, &U.base) {
-					from = append(from, U.base.typ)
-				}
-			case T.isInterface: // U concrete
-				if satisfies(&U.base, &T.base) {
-					to = append(to, U.base.typ)
-				} else if satisfies(&U.ptr, &T.base) {
-					to = append(to, U.ptr.typ)
-				}
-			case U.isInterface: // T concrete
-				if satisfies(&T.base, &U.base) {
-					from = append(from, U.base.typ)
-				} else if satisfies(&T.ptr, &U.base) {
-					fromPtr = append(fromPtr, U.base.typ)
-				}
-			}
-		}
-
-		// Sort types (arbitrarily) to avoid nondeterminism.
-		sort.Sort(typesByString(to))
-		sort.Sort(typesByString(from))
-		sort.Sort(typesByString(fromPtr))
-
-		facts[T.base.typ.(*types.Named)] = implementsFacts{to, from, fromPtr}
-	}
-
-	return facts
-}
-
-type implementsFacts struct {
-	to      []types.Type // named or ptr-to-named types assignable to interface T
-	from    []types.Type // named interfaces assignable from T
-	fromPtr []types.Type // named interfaces assignable only from *T
-}
-
-type typesByString []types.Type
-
-func (p typesByString) Len() int           { return len(p) }
-func (p typesByString) Less(i, j int) bool { return p[i].String() < p[j].String() }
-func (p typesByString) Swap(i, j int)      { p[i], p[j] = p[j], p[i] }
-
-// methodBit returns the index of x in [a-zA-Z], or 52 if not found.
-func methodBit(x byte) uint64 {
-	switch {
-	case 'a' <= x && x <= 'z':
-		return uint64(x - 'a')
-	case 'A' <= x && x <= 'Z':
-		return uint64(26 + x - 'A')
-	}
-	return 52 // all other bytes
-}
-
-// containsAllIdsOf reports whether the method identifiers of T are a
-// superset of those in U.  If U belongs to an interface type, the
-// result is equal to types.Assignable(T, U), but is cheaper to compute.
-//
-// TODO(gri): make this a method of *types.MethodSet.
-//
-func containsAllIdsOf(T, U *types.MethodSet) bool {
-	t, tlen := 0, T.Len()
-	u, ulen := 0, U.Len()
-	for t < tlen && u < ulen {
-		tMeth := T.At(t).Obj()
-		uMeth := U.At(u).Obj()
-		tId := tMeth.Id()
-		uId := uMeth.Id()
-		if tId > uId {
-			// U has a method T lacks: fail.
-			return false
-		}
-		if tId < uId {
-			// T has a method U lacks: ignore it.
-			t++
-			continue
-		}
-		// U and T both have a method of this Id.  Check types.
-		if !types.Identical(tMeth.Type(), uMeth.Type()) {
-			return false // type mismatch
-		}
-		u++
-		t++
-	}
-	return u == ulen
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/json.go b/installer/vendor/golang.org/x/tools/godoc/analysis/json.go
deleted file mode 100644
index f8976187c2..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/json.go
+++ /dev/null
@@ -1,69 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package analysis
-
-// This file defines types used by client-side JavaScript.
-
-type anchorJSON struct {
-	Text string // HTML
-	Href string // URL
-}
-
-type commOpJSON struct {
-	Op anchorJSON
-	Fn string
-}
-
-// JavaScript's onClickComm() expects a commJSON.
-type commJSON struct {
-	Ops []commOpJSON
-}
-
-// Indicates one of these forms of fact about a type T:
-// T "is implemented by <ByKind> type <Other>"  (ByKind != "", e.g. "array")
-// T "implements <Other>"                       (ByKind == "")
-type implFactJSON struct {
-	ByKind string `json:",omitempty"`
-	Other  anchorJSON
-}
-
-// Implements facts are grouped by form, for ease of reading.
-type implGroupJSON struct {
-	Descr string
-	Facts []implFactJSON
-}
-
-// JavaScript's onClickIdent() expects a TypeInfoJSON.
-type TypeInfoJSON struct {
-	Name        string // type name
-	Size, Align int64
-	Methods     []anchorJSON
-	ImplGroups  []implGroupJSON
-}
-
-// JavaScript's onClickCallees() expects a calleesJSON.
-type calleesJSON struct {
-	Descr   string
-	Callees []anchorJSON // markup for called function
-}
-
-type callerJSON struct {
-	Func  string
-	Sites []anchorJSON
-}
-
-// JavaScript's onClickCallers() expects a callersJSON.
-type callersJSON struct {
-	Callee  string
-	Callers []callerJSON
-}
-
-// JavaScript's cgAddChild requires a global array of PCGNodeJSON
-// called CALLGRAPH, representing the intra-package call graph.
-// The first element is special and represents "all external callers".
-type PCGNodeJSON struct {
-	Func    anchorJSON
-	Callees []int // indices within CALLGRAPH of nodes called by this one
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/peers.go b/installer/vendor/golang.org/x/tools/godoc/analysis/peers.go
deleted file mode 100644
index a742f06cb6..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/peers.go
+++ /dev/null
@@ -1,154 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package analysis
-
-// This file computes the channel "peers" relation over all pairs of
-// channel operations in the program.  The peers are displayed in the
-// lower pane when a channel operation (make, <-, close) is clicked.
-
-// TODO(adonovan): handle calls to reflect.{Select,Recv,Send,Close} too,
-// then enable reflection in PTA.
-
-import (
-	"fmt"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/pointer"
-	"golang.org/x/tools/go/ssa"
-)
-
-func (a *analysis) doChannelPeers(ptsets map[ssa.Value]pointer.Pointer) {
-	addSendRecv := func(j *commJSON, op chanOp) {
-		j.Ops = append(j.Ops, commOpJSON{
-			Op: anchorJSON{
-				Text: op.mode,
-				Href: a.posURL(op.pos, op.len),
-			},
-			Fn: prettyFunc(nil, op.fn),
-		})
-	}
-
-	// Build an undirected bipartite multigraph (binary relation)
-	// of MakeChan ops and send/recv/close ops.
-	//
-	// TODO(adonovan): opt: use channel element types to partition
-	// the O(n^2) problem into subproblems.
-	aliasedOps := make(map[*ssa.MakeChan][]chanOp)
-	opToMakes := make(map[chanOp][]*ssa.MakeChan)
-	for _, op := range a.ops {
-		// Combine the PT sets from all contexts.
-		var makes []*ssa.MakeChan // aliased ops
-		ptr, ok := ptsets[op.ch]
-		if !ok {
-			continue // e.g. channel op in dead code
-		}
-		for _, label := range ptr.PointsTo().Labels() {
-			makechan, ok := label.Value().(*ssa.MakeChan)
-			if !ok {
-				continue // skip intrinsically-created channels for now
-			}
-			if makechan.Pos() == token.NoPos {
-				continue // not possible?
-			}
-			makes = append(makes, makechan)
-			aliasedOps[makechan] = append(aliasedOps[makechan], op)
-		}
-		opToMakes[op] = makes
-	}
-
-	// Now that complete relation is built, build links for ops.
-	for _, op := range a.ops {
-		v := commJSON{
-			Ops: []commOpJSON{}, // (JS wants non-nil)
-		}
-		ops := make(map[chanOp]bool)
-		for _, makechan := range opToMakes[op] {
-			v.Ops = append(v.Ops, commOpJSON{
-				Op: anchorJSON{
-					Text: "made",
-					Href: a.posURL(makechan.Pos()-token.Pos(len("make")),
-						len("make")),
-				},
-				Fn: makechan.Parent().RelString(op.fn.Package().Pkg),
-			})
-			for _, op := range aliasedOps[makechan] {
-				ops[op] = true
-			}
-		}
-		for op := range ops {
-			addSendRecv(&v, op)
-		}
-
-		// Add links for each aliased op.
-		fi, offset := a.fileAndOffset(op.pos)
-		fi.addLink(aLink{
-			start:   offset,
-			end:     offset + op.len,
-			title:   "show channel ops",
-			onclick: fmt.Sprintf("onClickComm(%d)", fi.addData(v)),
-		})
-	}
-	// Add links for makechan ops themselves.
-	for makechan, ops := range aliasedOps {
-		v := commJSON{
-			Ops: []commOpJSON{}, // (JS wants non-nil)
-		}
-		for _, op := range ops {
-			addSendRecv(&v, op)
-		}
-
-		fi, offset := a.fileAndOffset(makechan.Pos())
-		fi.addLink(aLink{
-			start:   offset - len("make"),
-			end:     offset,
-			title:   "show channel ops",
-			onclick: fmt.Sprintf("onClickComm(%d)", fi.addData(v)),
-		})
-	}
-}
-
-// -- utilities --------------------------------------------------------
-
-// chanOp abstracts an ssa.Send, ssa.Unop(ARROW), close(), or a SelectState.
-// Derived from cmd/guru/peers.go.
-type chanOp struct {
-	ch   ssa.Value
-	mode string // sent|received|closed
-	pos  token.Pos
-	len  int
-	fn   *ssa.Function
-}
-
-// chanOps returns a slice of all the channel operations in the instruction.
-// Derived from cmd/guru/peers.go.
-func chanOps(instr ssa.Instruction) []chanOp {
-	fn := instr.Parent()
-	var ops []chanOp
-	switch instr := instr.(type) {
-	case *ssa.UnOp:
-		if instr.Op == token.ARROW {
-			// TODO(adonovan): don't assume <-ch; could be 'range ch'.
-			ops = append(ops, chanOp{instr.X, "received", instr.Pos(), len("<-"), fn})
-		}
-	case *ssa.Send:
-		ops = append(ops, chanOp{instr.Chan, "sent", instr.Pos(), len("<-"), fn})
-	case *ssa.Select:
-		for _, st := range instr.States {
-			mode := "received"
-			if st.Dir == types.SendOnly {
-				mode = "sent"
-			}
-			ops = append(ops, chanOp{st.Chan, mode, st.Pos, len("<-"), fn})
-		}
-	case ssa.CallInstruction:
-		call := instr.Common()
-		if blt, ok := call.Value.(*ssa.Builtin); ok && blt.Name() == "close" {
-			pos := instr.Common().Pos()
-			ops = append(ops, chanOp{call.Args[0], "closed", pos - token.Pos(len("close")), len("close("), fn})
-		}
-	}
-	return ops
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/analysis/typeinfo.go b/installer/vendor/golang.org/x/tools/godoc/analysis/typeinfo.go
deleted file mode 100644
index e57683f471..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/analysis/typeinfo.go
+++ /dev/null
@@ -1,234 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package analysis
-
-// This file computes the markup for information from go/types:
-// IMPORTS, identifier RESOLUTION, METHOD SETS, size/alignment, and
-// the IMPLEMENTS relation.
-//
-// IMPORTS links connect import specs to the documentation for the
-// imported package.
-//
-// RESOLUTION links referring identifiers to their defining
-// identifier, and adds tooltips for kind and type.
-//
-// METHOD SETS, size/alignment, and the IMPLEMENTS relation are
-// displayed in the lower pane when a type's defining identifier is
-// clicked.
-
-import (
-	"fmt"
-	"go/types"
-	"reflect"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// TODO(adonovan): audit to make sure it's safe on ill-typed packages.
-
-// TODO(adonovan): use same Sizes as loader.Config.
-var sizes = types.StdSizes{WordSize: 8, MaxAlign: 8}
-
-func (a *analysis) doTypeInfo(info *loader.PackageInfo, implements map[*types.Named]implementsFacts) {
-	// We must not assume the corresponding SSA packages were
-	// created (i.e. were transitively error-free).
-
-	// IMPORTS
-	for _, f := range info.Files {
-		// Package decl.
-		fi, offset := a.fileAndOffset(f.Name.Pos())
-		fi.addLink(aLink{
-			start: offset,
-			end:   offset + len(f.Name.Name),
-			title: "Package docs for " + info.Pkg.Path(),
-			// TODO(adonovan): fix: we're putting the untrusted Path()
-			// into a trusted field.  What's the appropriate sanitizer?
-			href: "/pkg/" + info.Pkg.Path(),
-		})
-
-		// Import specs.
-		for _, imp := range f.Imports {
-			// Remove quotes.
-			L := int(imp.End()-imp.Path.Pos()) - len(`""`)
-			path, _ := strconv.Unquote(imp.Path.Value)
-			fi, offset := a.fileAndOffset(imp.Path.Pos())
-			fi.addLink(aLink{
-				start: offset + 1,
-				end:   offset + 1 + L,
-				title: "Package docs for " + path,
-				// TODO(adonovan): fix: we're putting the untrusted path
-				// into a trusted field.  What's the appropriate sanitizer?
-				href: "/pkg/" + path,
-			})
-		}
-	}
-
-	// RESOLUTION
-	qualifier := types.RelativeTo(info.Pkg)
-	for id, obj := range info.Uses {
-		// Position of the object definition.
-		pos := obj.Pos()
-		Len := len(obj.Name())
-
-		// Correct the position for non-renaming import specs.
-		//  import "sync/atomic"
-		//          ^^^^^^^^^^^
-		if obj, ok := obj.(*types.PkgName); ok && id.Name == obj.Imported().Name() {
-			// Assume this is a non-renaming import.
-			// NB: not true for degenerate renamings: `import foo "foo"`.
-			pos++
-			Len = len(obj.Imported().Path())
-		}
-
-		if obj.Pkg() == nil {
-			continue // don't mark up built-ins.
-		}
-
-		fi, offset := a.fileAndOffset(id.NamePos)
-		fi.addLink(aLink{
-			start: offset,
-			end:   offset + len(id.Name),
-			title: types.ObjectString(obj, qualifier),
-			href:  a.posURL(pos, Len),
-		})
-	}
-
-	// IMPLEMENTS & METHOD SETS
-	for _, obj := range info.Defs {
-		if obj, ok := obj.(*types.TypeName); ok {
-			if named, ok := obj.Type().(*types.Named); ok {
-				a.namedType(named, implements)
-			}
-		}
-	}
-}
-
-func (a *analysis) namedType(T *types.Named, implements map[*types.Named]implementsFacts) {
-	obj := T.Obj()
-	qualifier := types.RelativeTo(obj.Pkg())
-	v := &TypeInfoJSON{
-		Name:    obj.Name(),
-		Size:    sizes.Sizeof(T),
-		Align:   sizes.Alignof(T),
-		Methods: []anchorJSON{}, // (JS wants non-nil)
-	}
-
-	// addFact adds the fact "is implemented by T" (by) or
-	// "implements T" (!by) to group.
-	addFact := func(group *implGroupJSON, T types.Type, by bool) {
-		Tobj := deref(T).(*types.Named).Obj()
-		var byKind string
-		if by {
-			// Show underlying kind of implementing type,
-			// e.g. "slice", "array", "struct".
-			s := reflect.TypeOf(T.Underlying()).String()
-			byKind = strings.ToLower(strings.TrimPrefix(s, "*types."))
-		}
-		group.Facts = append(group.Facts, implFactJSON{
-			ByKind: byKind,
-			Other: anchorJSON{
-				Href: a.posURL(Tobj.Pos(), len(Tobj.Name())),
-				Text: types.TypeString(T, qualifier),
-			},
-		})
-	}
-
-	// IMPLEMENTS
-	if r, ok := implements[T]; ok {
-		if isInterface(T) {
-			// "T is implemented by <conc>" ...
-			// "T is implemented by <iface>"...
-			// "T implements        <iface>"...
-			group := implGroupJSON{
-				Descr: types.TypeString(T, qualifier),
-			}
-			// Show concrete types first; use two passes.
-			for _, sub := range r.to {
-				if !isInterface(sub) {
-					addFact(&group, sub, true)
-				}
-			}
-			for _, sub := range r.to {
-				if isInterface(sub) {
-					addFact(&group, sub, true)
-				}
-			}
-			for _, super := range r.from {
-				addFact(&group, super, false)
-			}
-			v.ImplGroups = append(v.ImplGroups, group)
-		} else {
-			// T is concrete.
-			if r.from != nil {
-				// "T implements <iface>"...
-				group := implGroupJSON{
-					Descr: types.TypeString(T, qualifier),
-				}
-				for _, super := range r.from {
-					addFact(&group, super, false)
-				}
-				v.ImplGroups = append(v.ImplGroups, group)
-			}
-			if r.fromPtr != nil {
-				// "*C implements <iface>"...
-				group := implGroupJSON{
-					Descr: "*" + types.TypeString(T, qualifier),
-				}
-				for _, psuper := range r.fromPtr {
-					addFact(&group, psuper, false)
-				}
-				v.ImplGroups = append(v.ImplGroups, group)
-			}
-		}
-	}
-
-	// METHOD SETS
-	for _, sel := range typeutil.IntuitiveMethodSet(T, &a.prog.MethodSets) {
-		meth := sel.Obj().(*types.Func)
-		pos := meth.Pos() // may be 0 for error.Error
-		v.Methods = append(v.Methods, anchorJSON{
-			Href: a.posURL(pos, len(meth.Name())),
-			Text: types.SelectionString(sel, qualifier),
-		})
-	}
-
-	// Since there can be many specs per decl, we
-	// can't attach the link to the keyword 'type'
-	// (as we do with 'func'); we use the Ident.
-	fi, offset := a.fileAndOffset(obj.Pos())
-	fi.addLink(aLink{
-		start:   offset,
-		end:     offset + len(obj.Name()),
-		title:   fmt.Sprintf("type info for %s", obj.Name()),
-		onclick: fmt.Sprintf("onClickTypeInfo(%d)", fi.addData(v)),
-	})
-
-	// Add info for exported package-level types to the package info.
-	if obj.Exported() && isPackageLevel(obj) {
-		// TODO(adonovan): Path is not unique!
-		// It is possible to declare a non-test package called x_test.
-		a.result.pkgInfo(obj.Pkg().Path()).addType(v)
-	}
-}
-
-// -- utilities --------------------------------------------------------
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
-
-// deref returns a pointer's element type; otherwise it returns typ.
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
-
-// isPackageLevel reports whether obj is a package-level object.
-func isPackageLevel(obj types.Object) bool {
-	return obj.Pkg().Scope().Lookup(obj.Name()) == obj
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/appengine.go b/installer/vendor/golang.org/x/tools/godoc/appengine.go
deleted file mode 100644
index 2a685585c7..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/appengine.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package godoc
-
-import "appengine"
-
-func init() {
-	onAppengine = !appengine.IsDevAppServer()
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/cmdline.go b/installer/vendor/golang.org/x/tools/godoc/cmdline.go
deleted file mode 100644
index 7c53681347..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/cmdline.go
+++ /dev/null
@@ -1,207 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"fmt"
-	"go/ast"
-	"go/build"
-	"io"
-	"log"
-	"os"
-	pathpkg "path"
-	"path/filepath"
-	"regexp"
-	"strings"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-const (
-	target    = "/target"
-	cmdPrefix = "cmd/"
-	srcPrefix = "src/"
-	toolsPath = "golang.org/x/tools/cmd/"
-)
-
-// CommandLine returns godoc results to w.
-// Note that it may add a /target path to fs.
-func CommandLine(w io.Writer, fs vfs.NameSpace, pres *Presentation, args []string) error {
-	path := args[0]
-	srcMode := pres.SrcMode
-	cmdMode := strings.HasPrefix(path, cmdPrefix)
-	if strings.HasPrefix(path, srcPrefix) {
-		path = strings.TrimPrefix(path, srcPrefix)
-		srcMode = true
-	}
-	var abspath, relpath string
-	if cmdMode {
-		path = strings.TrimPrefix(path, cmdPrefix)
-	} else {
-		abspath, relpath = paths(fs, pres, path)
-	}
-
-	var mode PageInfoMode
-	if relpath == builtinPkgPath {
-		// the fake built-in package contains unexported identifiers
-		mode = NoFiltering | NoTypeAssoc
-	}
-	if srcMode {
-		// only filter exports if we don't have explicit command-line filter arguments
-		if len(args) > 1 {
-			mode |= NoFiltering
-		}
-		mode |= ShowSource
-	}
-
-	// First, try as package unless forced as command.
-	var info *PageInfo
-	if !cmdMode {
-		info = pres.GetPkgPageInfo(abspath, relpath, mode)
-	}
-
-	// Second, try as command (if the path is not absolute).
-	var cinfo *PageInfo
-	if !filepath.IsAbs(path) {
-		// First try go.tools/cmd.
-		abspath = pathpkg.Join(pres.PkgFSRoot(), toolsPath+path)
-		cinfo = pres.GetCmdPageInfo(abspath, relpath, mode)
-		if cinfo.IsEmpty() {
-			// Then try $GOROOT/cmd.
-			abspath = pathpkg.Join(pres.CmdFSRoot(), path)
-			cinfo = pres.GetCmdPageInfo(abspath, relpath, mode)
-		}
-	}
-
-	// determine what to use
-	if info == nil || info.IsEmpty() {
-		if cinfo != nil && !cinfo.IsEmpty() {
-			// only cinfo exists - switch to cinfo
-			info = cinfo
-		}
-	} else if cinfo != nil && !cinfo.IsEmpty() {
-		// both info and cinfo exist - use cinfo if info
-		// contains only subdirectory information
-		if info.PAst == nil && info.PDoc == nil {
-			info = cinfo
-		} else if relpath != target {
-			// The above check handles the case where an operating system path
-			// is provided (see documentation for paths below).  In that case,
-			// relpath is set to "/target" (in anticipation of accessing packages there),
-			// and is therefore not expected to match a command.
-			fmt.Fprintf(w, "use 'godoc %s%s' for documentation on the %s command \n\n", cmdPrefix, relpath, relpath)
-		}
-	}
-
-	if info == nil {
-		return fmt.Errorf("%s: no such directory or package", args[0])
-	}
-	if info.Err != nil {
-		return info.Err
-	}
-
-	if info.PDoc != nil && info.PDoc.ImportPath == target {
-		// Replace virtual /target with actual argument from command line.
-		info.PDoc.ImportPath = args[0]
-	}
-
-	// If we have more than one argument, use the remaining arguments for filtering.
-	if len(args) > 1 {
-		info.IsFiltered = true
-		filterInfo(args[1:], info)
-	}
-
-	packageText := pres.PackageText
-	if pres.HTMLMode {
-		packageText = pres.PackageHTML
-	}
-	if err := packageText.Execute(w, info); err != nil {
-		return err
-	}
-	return nil
-}
-
-// paths determines the paths to use.
-//
-// If we are passed an operating system path like . or ./foo or /foo/bar or c:\mysrc,
-// we need to map that path somewhere in the fs name space so that routines
-// like getPageInfo will see it.  We use the arbitrarily-chosen virtual path "/target"
-// for this.  That is, if we get passed a directory like the above, we map that
-// directory so that getPageInfo sees it as /target.
-// Returns the absolute and relative paths.
-func paths(fs vfs.NameSpace, pres *Presentation, path string) (string, string) {
-	if filepath.IsAbs(path) {
-		fs.Bind(target, vfs.OS(path), "/", vfs.BindReplace)
-		return target, target
-	}
-	if build.IsLocalImport(path) {
-		cwd, _ := os.Getwd() // ignore errors
-		path = filepath.Join(cwd, path)
-		fs.Bind(target, vfs.OS(path), "/", vfs.BindReplace)
-		return target, target
-	}
-	if bp, _ := build.Import(path, "", build.FindOnly); bp.Dir != "" && bp.ImportPath != "" {
-		fs.Bind(target, vfs.OS(bp.Dir), "/", vfs.BindReplace)
-		return target, bp.ImportPath
-	}
-	return pathpkg.Join(pres.PkgFSRoot(), path), path
-}
-
-// filterInfo updates info to include only the nodes that match the given
-// filter args.
-func filterInfo(args []string, info *PageInfo) {
-	rx, err := makeRx(args)
-	if err != nil {
-		log.Fatalf("illegal regular expression from %v: %v", args, err)
-	}
-
-	filter := func(s string) bool { return rx.MatchString(s) }
-	switch {
-	case info.PAst != nil:
-		newPAst := map[string]*ast.File{}
-		for name, a := range info.PAst {
-			cmap := ast.NewCommentMap(info.FSet, a, a.Comments)
-			a.Comments = []*ast.CommentGroup{} // remove all comments.
-			ast.FilterFile(a, filter)
-			if len(a.Decls) > 0 {
-				newPAst[name] = a
-			}
-			for _, d := range a.Decls {
-				// add back the comments associated with d only
-				comments := cmap.Filter(d).Comments()
-				a.Comments = append(a.Comments, comments...)
-			}
-		}
-		info.PAst = newPAst // add only matching files.
-	case info.PDoc != nil:
-		info.PDoc.Filter(filter)
-	}
-}
-
-// Does s look like a regular expression?
-func isRegexp(s string) bool {
-	return strings.ContainsAny(s, ".(|)*+?^$[]")
-}
-
-// Make a regular expression of the form
-// names[0]|names[1]|...names[len(names)-1].
-// Returns an error if the regular expression is illegal.
-func makeRx(names []string) (*regexp.Regexp, error) {
-	if len(names) == 0 {
-		return nil, fmt.Errorf("no expression provided")
-	}
-	s := ""
-	for i, name := range names {
-		if i > 0 {
-			s += "|"
-		}
-		if isRegexp(name) {
-			s += name
-		} else {
-			s += "^" + name + "$" // must match exactly
-		}
-	}
-	return regexp.Compile(s)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/cmdline_test.go b/installer/vendor/golang.org/x/tools/godoc/cmdline_test.go
deleted file mode 100644
index 602f2bbaba..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/cmdline_test.go
+++ /dev/null
@@ -1,294 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"go/build"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"runtime"
-	"testing"
-	"text/template"
-
-	"golang.org/x/tools/godoc/vfs"
-	"golang.org/x/tools/godoc/vfs/mapfs"
-)
-
-// setupGoroot creates temporary directory to act as GOROOT when running tests
-// that depend upon the build package.  It updates build.Default to point to the
-// new GOROOT.
-// It returns a function that can be called to reset build.Default and remove
-// the temporary directory.
-func setupGoroot(t *testing.T) (cleanup func()) {
-	var stdLib = map[string]string{
-		"src/fmt/fmt.go": `// Package fmt implements formatted I/O.
-package fmt
-
-type Stringer interface {
-	String() string
-}
-`,
-	}
-	goroot, err := ioutil.TempDir("", "cmdline_test")
-	if err != nil {
-		t.Fatal(err)
-	}
-	origContext := build.Default
-	build.Default = build.Context{
-		GOROOT:   goroot,
-		Compiler: "gc",
-	}
-	for relname, contents := range stdLib {
-		name := filepath.Join(goroot, relname)
-		if err := os.MkdirAll(filepath.Dir(name), 0770); err != nil {
-			t.Fatal(err)
-		}
-		if err := ioutil.WriteFile(name, []byte(contents), 0770); err != nil {
-			t.Fatal(err)
-		}
-	}
-
-	return func() {
-		if err := os.RemoveAll(goroot); err != nil {
-			t.Log(err)
-		}
-		build.Default = origContext
-	}
-}
-
-func TestPaths(t *testing.T) {
-	cleanup := setupGoroot(t)
-	defer cleanup()
-
-	pres := &Presentation{
-		pkgHandler: handlerServer{
-			fsRoot: "/fsroot",
-		},
-	}
-	fs := make(vfs.NameSpace)
-
-	absPath := "/foo/fmt"
-	if runtime.GOOS == "windows" {
-		absPath = `c:\foo\fmt`
-	}
-
-	for _, tc := range []struct {
-		desc   string
-		path   string
-		expAbs string
-		expRel string
-	}{
-		{
-			"Absolute path",
-			absPath,
-			"/target",
-			"/target",
-		},
-		{
-			"Local import",
-			"../foo/fmt",
-			"/target",
-			"/target",
-		},
-		{
-			"Import",
-			"fmt",
-			"/target",
-			"fmt",
-		},
-		{
-			"Default",
-			"unknownpkg",
-			"/fsroot/unknownpkg",
-			"unknownpkg",
-		},
-	} {
-		abs, rel := paths(fs, pres, tc.path)
-		if abs != tc.expAbs || rel != tc.expRel {
-			t.Errorf("%s: paths(%q) = %s,%s; want %s,%s", tc.desc, tc.path, abs, rel, tc.expAbs, tc.expRel)
-		}
-	}
-}
-
-func TestMakeRx(t *testing.T) {
-	for _, tc := range []struct {
-		desc  string
-		names []string
-		exp   string
-	}{
-		{
-			desc:  "empty string",
-			names: []string{""},
-			exp:   `^$`,
-		},
-		{
-			desc:  "simple text",
-			names: []string{"a"},
-			exp:   `^a$`,
-		},
-		{
-			desc:  "two words",
-			names: []string{"foo", "bar"},
-			exp:   `^foo$|^bar$`,
-		},
-		{
-			desc:  "word & non-trivial",
-			names: []string{"foo", `ab?c`},
-			exp:   `^foo$|ab?c`,
-		},
-		{
-			desc:  "bad regexp",
-			names: []string{`(."`},
-			exp:   `(."`,
-		},
-	} {
-		expRE, expErr := regexp.Compile(tc.exp)
-		if re, err := makeRx(tc.names); !reflect.DeepEqual(err, expErr) && !reflect.DeepEqual(re, expRE) {
-			t.Errorf("%s: makeRx(%v) = %q,%q; want %q,%q", tc.desc, tc.names, re, err, expRE, expErr)
-		}
-	}
-}
-
-func TestCommandLine(t *testing.T) {
-	cleanup := setupGoroot(t)
-	defer cleanup()
-	mfs := mapfs.New(map[string]string{
-		"src/bar/bar.go": `// Package bar is an example.
-package bar
-`,
-		"src/foo/foo.go": `// Package foo.
-package foo
-
-// First function is first.
-func First() {
-}
-
-// Second function is second.
-func Second() {
-}
-`,
-		"src/gen/gen.go": `// Package gen
-package gen
-
-//line notgen.go:3
-// F doc //line 1 should appear
-// line 2 should appear
-func F()
-//line foo.go:100`, // no newline on end to check corner cases!
-		"src/vet/vet.go": `// Package vet
-package vet
-`,
-		"src/cmd/go/doc.go": `// The go command
-package main
-`,
-		"src/cmd/gofmt/doc.go": `// The gofmt command
-package main
-`,
-		"src/cmd/vet/vet.go": `// The vet command
-package main
-`,
-	})
-	fs := make(vfs.NameSpace)
-	fs.Bind("/", mfs, "/", vfs.BindReplace)
-	c := NewCorpus(fs)
-	p := &Presentation{Corpus: c}
-	p.cmdHandler = handlerServer{
-		p:       p,
-		c:       c,
-		pattern: "/cmd/",
-		fsRoot:  "/src/cmd",
-	}
-	p.pkgHandler = handlerServer{
-		p:       p,
-		c:       c,
-		pattern: "/pkg/",
-		fsRoot:  "/src",
-		exclude: []string{"/src/cmd"},
-	}
-	p.initFuncMap()
-	p.PackageText = template.Must(template.New("PackageText").Funcs(p.FuncMap()).Parse(`{{$info := .}}{{$filtered := .IsFiltered}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}:
-{{node $ $ast}}{{end}}{{end}}{{end}}{{with .PDoc}}{{if $.IsMain}}COMMAND {{.Doc}}{{else}}PACKAGE {{.Doc}}{{end}}{{with .Funcs}}
-{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}{{end}}{{end}}{{end}}`))
-
-	for _, tc := range []struct {
-		desc string
-		args []string
-		exp  string
-		err  bool
-	}{
-		{
-			desc: "standard package",
-			args: []string{"fmt"},
-			exp:  "PACKAGE Package fmt implements formatted I/O.\n",
-		},
-		{
-			desc: "package",
-			args: []string{"bar"},
-			exp:  "PACKAGE Package bar is an example.\n",
-		},
-		{
-			desc: "package w. filter",
-			args: []string{"foo", "First"},
-			exp:  "PACKAGE \nfunc First()\n    First function is first.\n",
-		},
-		{
-			desc: "package w. bad filter",
-			args: []string{"foo", "DNE"},
-			exp:  "PACKAGE ",
-		},
-		{
-			desc: "source mode",
-			args: []string{"src/bar"},
-			exp:  "bar/bar.go:\n// Package bar is an example.\npackage bar\n",
-		},
-		{
-			desc: "source mode w. filter",
-			args: []string{"src/foo", "Second"},
-			exp:  "// Second function is second.\nfunc Second() {\n}",
-		},
-		{
-			desc: "package w. //line comments",
-			args: []string{"gen", "F"},
-			exp:  "PACKAGE \nfunc F()\n    F doc //line 1 should appear line 2 should appear\n",
-		},
-		{
-			desc: "command",
-			args: []string{"go"},
-			exp:  "COMMAND The go command\n",
-		},
-		{
-			desc: "forced command",
-			args: []string{"cmd/gofmt"},
-			exp:  "COMMAND The gofmt command\n",
-		},
-		{
-			desc: "bad arg",
-			args: []string{"doesnotexist"},
-			err:  true,
-		},
-		{
-			desc: "both command and package",
-			args: []string{"vet"},
-			exp:  "use 'godoc cmd/vet' for documentation on the vet command \n\nPACKAGE Package vet\n",
-		},
-		{
-			desc: "root directory",
-			args: []string{"/"},
-			exp:  "",
-		},
-	} {
-		w := new(bytes.Buffer)
-		err := CommandLine(w, fs, p, tc.args)
-		if got, want := w.String(), tc.exp; got != want || tc.err == (err == nil) {
-			t.Errorf("%s: CommandLine(%v) = %q (%v); want %q (%v)",
-				tc.desc, tc.args, got, err, want, tc.err)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/corpus.go b/installer/vendor/golang.org/x/tools/godoc/corpus.go
deleted file mode 100644
index f2c7ebbf37..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/corpus.go
+++ /dev/null
@@ -1,157 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"errors"
-	pathpkg "path"
-	"time"
-
-	"golang.org/x/tools/godoc/analysis"
-	"golang.org/x/tools/godoc/util"
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// A Corpus holds all the state related to serving and indexing a
-// collection of Go code.
-//
-// Construct a new Corpus with NewCorpus, then modify options,
-// then call its Init method.
-type Corpus struct {
-	fs vfs.FileSystem
-
-	// Verbose logging.
-	Verbose bool
-
-	// IndexEnabled controls whether indexing is enabled.
-	IndexEnabled bool
-
-	// IndexFiles specifies a glob pattern specifying index files.
-	// If not empty, the index is read from these files in sorted
-	// order.
-	IndexFiles string
-
-	// IndexThrottle specifies the indexing throttle value
-	// between 0.0 and 1.0. At 0.0, the indexer always sleeps.
-	// At 1.0, the indexer never sleeps. Because 0.0 is useless
-	// and redundant with setting IndexEnabled to false, the
-	// zero value for IndexThrottle means 0.9.
-	IndexThrottle float64
-
-	// IndexInterval specifies the time to sleep between reindexing
-	// all the sources.
-	// If zero, a default is used. If negative, the index is only
-	// built once.
-	IndexInterval time.Duration
-
-	// IndexDocs enables indexing of Go documentation.
-	// This will produce search results for exported types, functions,
-	// methods, variables, and constants, and will link to the godoc
-	// documentation for those identifiers.
-	IndexDocs bool
-
-	// IndexGoCode enables indexing of Go source code.
-	// This will produce search results for internal and external identifiers
-	// and will link to both declarations and uses of those identifiers in
-	// source code.
-	IndexGoCode bool
-
-	// IndexFullText enables full-text indexing.
-	// This will provide search results for any matching text in any file that
-	// is indexed, including non-Go files (see whitelisted in index.go).
-	// Regexp searching is supported via full-text indexing.
-	IndexFullText bool
-
-	// MaxResults optionally specifies the maximum results for indexing.
-	MaxResults int
-
-	// SummarizePackage optionally specifies a function to
-	// summarize a package. It exists as an optimization to
-	// avoid reading files to parse package comments.
-	//
-	// If SummarizePackage returns false for ok, the caller
-	// ignores all return values and parses the files in the package
-	// as if SummarizePackage were nil.
-	//
-	// If showList is false, the package is hidden from the
-	// package listing.
-	SummarizePackage func(pkg string) (summary string, showList, ok bool)
-
-	// IndexDirectory optionally specifies a function to determine
-	// whether the provided directory should be indexed.  The dir
-	// will be of the form "/src/cmd/6a", "/doc/play",
-	// "/src/io", etc.
-	// If nil, all directories are indexed if indexing is enabled.
-	IndexDirectory func(dir string) bool
-
-	testDir string // TODO(bradfitz,adg): migrate old godoc flag? looks unused.
-
-	// Send a value on this channel to trigger a metadata refresh.
-	// It is buffered so that if a signal is not lost if sent
-	// during a refresh.
-	refreshMetadataSignal chan bool
-
-	// file system information
-	fsTree      util.RWValue // *Directory tree of packages, updated with each sync (but sync code is removed now)
-	fsModified  util.RWValue // timestamp of last call to invalidateIndex
-	docMetadata util.RWValue // mapping from paths to *Metadata
-
-	// SearchIndex is the search index in use.
-	searchIndex util.RWValue
-
-	// Analysis is the result of type and pointer analysis.
-	Analysis analysis.Result
-}
-
-// NewCorpus returns a new Corpus from a filesystem.
-// The returned corpus has all indexing enabled and MaxResults set to 1000.
-// Change or set any options on Corpus before calling the Corpus.Init method.
-func NewCorpus(fs vfs.FileSystem) *Corpus {
-	c := &Corpus{
-		fs: fs,
-		refreshMetadataSignal: make(chan bool, 1),
-
-		MaxResults:    1000,
-		IndexEnabled:  true,
-		IndexDocs:     true,
-		IndexGoCode:   true,
-		IndexFullText: true,
-	}
-	return c
-}
-
-func (c *Corpus) CurrentIndex() (*Index, time.Time) {
-	v, t := c.searchIndex.Get()
-	idx, _ := v.(*Index)
-	return idx, t
-}
-
-func (c *Corpus) FSModifiedTime() time.Time {
-	_, ts := c.fsModified.Get()
-	return ts
-}
-
-// Init initializes Corpus, once options on Corpus are set.
-// It must be called before any subsequent method calls.
-func (c *Corpus) Init() error {
-	// TODO(bradfitz): do this in a goroutine because newDirectory might block for a long time?
-	// It used to be sometimes done in a goroutine before, at least in HTTP server mode.
-	if err := c.initFSTree(); err != nil {
-		return err
-	}
-	c.updateMetadata()
-	go c.refreshMetadataLoop()
-	return nil
-}
-
-func (c *Corpus) initFSTree() error {
-	dir := c.newDirectory(pathpkg.Join("/", c.testDir), -1)
-	if dir == nil {
-		return errors.New("godoc: corpus fstree is nil")
-	}
-	c.fsTree.Set(dir)
-	c.invalidateIndex()
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/dirtrees.go b/installer/vendor/golang.org/x/tools/godoc/dirtrees.go
deleted file mode 100644
index 2b14a41e3f..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/dirtrees.go
+++ /dev/null
@@ -1,342 +0,0 @@
-// Copyright 2010 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains the code dealing with package directory trees.
-
-package godoc
-
-import (
-	"go/doc"
-	"go/parser"
-	"go/token"
-	"log"
-	"os"
-	pathpkg "path"
-	"strings"
-)
-
-// Conventional name for directories containing test data.
-// Excluded from directory trees.
-//
-const testdataDirName = "testdata"
-
-type Directory struct {
-	Depth    int
-	Path     string       // directory path; includes Name
-	Name     string       // directory name
-	HasPkg   bool         // true if the directory contains at least one package
-	Synopsis string       // package documentation, if any
-	Dirs     []*Directory // subdirectories
-}
-
-func isGoFile(fi os.FileInfo) bool {
-	name := fi.Name()
-	return !fi.IsDir() &&
-		len(name) > 0 && name[0] != '.' && // ignore .files
-		pathpkg.Ext(name) == ".go"
-}
-
-func isPkgFile(fi os.FileInfo) bool {
-	return isGoFile(fi) &&
-		!strings.HasSuffix(fi.Name(), "_test.go") // ignore test files
-}
-
-func isPkgDir(fi os.FileInfo) bool {
-	name := fi.Name()
-	return fi.IsDir() && len(name) > 0 &&
-		name[0] != '_' && name[0] != '.' // ignore _files and .files
-}
-
-type treeBuilder struct {
-	c        *Corpus
-	maxDepth int
-}
-
-// ioGate is a semaphore controlling VFS activity (ReadDir, parseFile, etc).
-// Send before an operation and receive after.
-var ioGate = make(chan bool, 20)
-
-func (b *treeBuilder) newDirTree(fset *token.FileSet, path, name string, depth int) *Directory {
-	if name == testdataDirName {
-		return nil
-	}
-
-	if depth >= b.maxDepth {
-		// return a dummy directory so that the parent directory
-		// doesn't get discarded just because we reached the max
-		// directory depth
-		return &Directory{
-			Depth: depth,
-			Path:  path,
-			Name:  name,
-		}
-	}
-
-	var synopses [3]string // prioritized package documentation (0 == highest priority)
-
-	show := true // show in package listing
-	hasPkgFiles := false
-	haveSummary := false
-
-	if hook := b.c.SummarizePackage; hook != nil {
-		if summary, show0, ok := hook(strings.TrimPrefix(path, "/src/")); ok {
-			hasPkgFiles = true
-			show = show0
-			synopses[0] = summary
-			haveSummary = true
-		}
-	}
-
-	ioGate <- true
-	list, err := b.c.fs.ReadDir(path)
-	<-ioGate
-	if err != nil {
-		// TODO: propagate more. See golang.org/issue/14252.
-		// For now:
-		if b.c.Verbose {
-			log.Printf("newDirTree reading %s: %v", path, err)
-		}
-	}
-
-	// determine number of subdirectories and if there are package files
-	var dirchs []chan *Directory
-
-	for _, d := range list {
-		filename := pathpkg.Join(path, d.Name())
-		switch {
-		case isPkgDir(d):
-			ch := make(chan *Directory, 1)
-			dirchs = append(dirchs, ch)
-			name := d.Name()
-			go func() {
-				ch <- b.newDirTree(fset, filename, name, depth+1)
-			}()
-		case !haveSummary && isPkgFile(d):
-			// looks like a package file, but may just be a file ending in ".go";
-			// don't just count it yet (otherwise we may end up with hasPkgFiles even
-			// though the directory doesn't contain any real package files - was bug)
-			// no "optimal" package synopsis yet; continue to collect synopses
-			ioGate <- true
-			const flags = parser.ParseComments | parser.PackageClauseOnly
-			file, err := b.c.parseFile(fset, filename, flags)
-			<-ioGate
-			if err != nil {
-				if b.c.Verbose {
-					log.Printf("Error parsing %v: %v", filename, err)
-				}
-				break
-			}
-
-			hasPkgFiles = true
-			if file.Doc != nil {
-				// prioritize documentation
-				i := -1
-				switch file.Name.Name {
-				case name:
-					i = 0 // normal case: directory name matches package name
-				case "main":
-					i = 1 // directory contains a main package
-				default:
-					i = 2 // none of the above
-				}
-				if 0 <= i && i < len(synopses) && synopses[i] == "" {
-					synopses[i] = doc.Synopsis(file.Doc.Text())
-				}
-			}
-			haveSummary = synopses[0] != ""
-		}
-	}
-
-	// create subdirectory tree
-	var dirs []*Directory
-	for _, ch := range dirchs {
-		if d := <-ch; d != nil {
-			dirs = append(dirs, d)
-		}
-	}
-
-	// if there are no package files and no subdirectories
-	// containing package files, ignore the directory
-	if !hasPkgFiles && len(dirs) == 0 {
-		return nil
-	}
-
-	// select the highest-priority synopsis for the directory entry, if any
-	synopsis := ""
-	for _, synopsis = range synopses {
-		if synopsis != "" {
-			break
-		}
-	}
-
-	return &Directory{
-		Depth:    depth,
-		Path:     path,
-		Name:     name,
-		HasPkg:   hasPkgFiles && show, // TODO(bradfitz): add proper Hide field?
-		Synopsis: synopsis,
-		Dirs:     dirs,
-	}
-}
-
-// newDirectory creates a new package directory tree with at most maxDepth
-// levels, anchored at root. The result tree is pruned such that it only
-// contains directories that contain package files or that contain
-// subdirectories containing package files (transitively). If a non-nil
-// pathFilter is provided, directory paths additionally must be accepted
-// by the filter (i.e., pathFilter(path) must be true). If a value >= 0 is
-// provided for maxDepth, nodes at larger depths are pruned as well; they
-// are assumed to contain package files even if their contents are not known
-// (i.e., in this case the tree may contain directories w/o any package files).
-//
-func (c *Corpus) newDirectory(root string, maxDepth int) *Directory {
-	// The root could be a symbolic link so use Stat not Lstat.
-	d, err := c.fs.Stat(root)
-	// If we fail here, report detailed error messages; otherwise
-	// is is hard to see why a directory tree was not built.
-	switch {
-	case err != nil:
-		log.Printf("newDirectory(%s): %s", root, err)
-		return nil
-	case root != "/" && !isPkgDir(d):
-		log.Printf("newDirectory(%s): not a package directory", root)
-		return nil
-	case root == "/" && !d.IsDir():
-		log.Printf("newDirectory(%s): not a directory", root)
-		return nil
-	}
-	if maxDepth < 0 {
-		maxDepth = 1e6 // "infinity"
-	}
-	b := treeBuilder{c, maxDepth}
-	// the file set provided is only for local parsing, no position
-	// information escapes and thus we don't need to save the set
-	return b.newDirTree(token.NewFileSet(), root, d.Name(), 0)
-}
-
-func (dir *Directory) walk(c chan<- *Directory, skipRoot bool) {
-	if dir != nil {
-		if !skipRoot {
-			c <- dir
-		}
-		for _, d := range dir.Dirs {
-			d.walk(c, false)
-		}
-	}
-}
-
-func (dir *Directory) iter(skipRoot bool) <-chan *Directory {
-	c := make(chan *Directory)
-	go func() {
-		dir.walk(c, skipRoot)
-		close(c)
-	}()
-	return c
-}
-
-func (dir *Directory) lookupLocal(name string) *Directory {
-	for _, d := range dir.Dirs {
-		if d.Name == name {
-			return d
-		}
-	}
-	return nil
-}
-
-func splitPath(p string) []string {
-	p = strings.TrimPrefix(p, "/")
-	if p == "" {
-		return nil
-	}
-	return strings.Split(p, "/")
-}
-
-// lookup looks for the *Directory for a given path, relative to dir.
-func (dir *Directory) lookup(path string) *Directory {
-	d := splitPath(dir.Path)
-	p := splitPath(path)
-	i := 0
-	for i < len(d) {
-		if i >= len(p) || d[i] != p[i] {
-			return nil
-		}
-		i++
-	}
-	for dir != nil && i < len(p) {
-		dir = dir.lookupLocal(p[i])
-		i++
-	}
-	return dir
-}
-
-// DirEntry describes a directory entry. The Depth and Height values
-// are useful for presenting an entry in an indented fashion.
-//
-type DirEntry struct {
-	Depth    int    // >= 0
-	Height   int    // = DirList.MaxHeight - Depth, > 0
-	Path     string // directory path; includes Name, relative to DirList root
-	Name     string // directory name
-	HasPkg   bool   // true if the directory contains at least one package
-	Synopsis string // package documentation, if any
-}
-
-type DirList struct {
-	MaxHeight int // directory tree height, > 0
-	List      []DirEntry
-}
-
-// listing creates a (linear) directory listing from a directory tree.
-// If skipRoot is set, the root directory itself is excluded from the list.
-// If filter is set, only the directory entries whose paths match the filter
-// are included.
-//
-func (root *Directory) listing(skipRoot bool, filter func(string) bool) *DirList {
-	if root == nil {
-		return nil
-	}
-
-	// determine number of entries n and maximum height
-	n := 0
-	minDepth := 1 << 30 // infinity
-	maxDepth := 0
-	for d := range root.iter(skipRoot) {
-		n++
-		if minDepth > d.Depth {
-			minDepth = d.Depth
-		}
-		if maxDepth < d.Depth {
-			maxDepth = d.Depth
-		}
-	}
-	maxHeight := maxDepth - minDepth + 1
-
-	if n == 0 {
-		return nil
-	}
-
-	// create list
-	list := make([]DirEntry, 0, n)
-	for d := range root.iter(skipRoot) {
-		if filter != nil && !filter(d.Path) {
-			continue
-		}
-		var p DirEntry
-		p.Depth = d.Depth - minDepth
-		p.Height = maxHeight - p.Depth
-		// the path is relative to root.Path - remove the root.Path
-		// prefix (the prefix should always be present but avoid
-		// crashes and check)
-		path := strings.TrimPrefix(d.Path, root.Path)
-		// remove leading separator if any - path must be relative
-		path = strings.TrimPrefix(path, "/")
-		p.Path = path
-		p.Name = d.Name
-		p.HasPkg = d.HasPkg
-		p.Synopsis = d.Synopsis
-		list = append(list, p)
-	}
-
-	return &DirList{maxHeight, list}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/dl/dl.go b/installer/vendor/golang.org/x/tools/godoc/dl/dl.go
deleted file mode 100644
index 7a6fe3316a..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/dl/dl.go
+++ /dev/null
@@ -1,547 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-// Package dl implements a simple downloads frontend server.
-//
-// It accepts HTTP POST requests to create a new download metadata entity, and
-// lists entities with sorting and filtering.
-// It is designed to run only on the instance of godoc that serves golang.org.
-package dl
-
-import (
-	"crypto/hmac"
-	"crypto/md5"
-	"encoding/json"
-	"fmt"
-	"html/template"
-	"io"
-	"net/http"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/memcache"
-)
-
-const (
-	edgeCacheBaseURL = "https://redirector.gvt1.com/edgedl/go/"
-	cacheKey         = "download_list_3" // increment if listTemplateData changes
-	cacheDuration    = time.Hour
-)
-
-func RegisterHandlers(mux *http.ServeMux) {
-	mux.Handle("/dl", http.RedirectHandler("/dl/", http.StatusFound))
-	mux.HandleFunc("/dl/", getHandler) // also serves listHandler
-	mux.HandleFunc("/dl/upload", uploadHandler)
-	mux.HandleFunc("/dl/init", initHandler)
-}
-
-type File struct {
-	Filename       string
-	OS             string
-	Arch           string
-	Version        string
-	Checksum       string `datastore:",noindex"` // SHA1; deprecated
-	ChecksumSHA256 string `datastore:",noindex"`
-	Size           int64  `datastore:",noindex"`
-	Kind           string // "archive", "installer", "source"
-	Uploaded       time.Time
-}
-
-func (f File) ChecksumType() string {
-	if f.ChecksumSHA256 != "" {
-		return "SHA256"
-	}
-	return "SHA1"
-}
-
-func (f File) PrettyChecksum() string {
-	if f.ChecksumSHA256 != "" {
-		return f.ChecksumSHA256
-	}
-	return f.Checksum
-}
-
-func (f File) PrettyOS() string {
-	if f.OS == "darwin" {
-		switch {
-		case strings.Contains(f.Filename, "osx10.8"):
-			return "OS X 10.8+"
-		case strings.Contains(f.Filename, "osx10.6"):
-			return "OS X 10.6+"
-		}
-	}
-	return pretty(f.OS)
-}
-
-func (f File) PrettySize() string {
-	const mb = 1 << 20
-	if f.Size == 0 {
-		return ""
-	}
-	if f.Size < mb {
-		// All Go releases are >1mb, but handle this case anyway.
-		return fmt.Sprintf("%v bytes", f.Size)
-	}
-	return fmt.Sprintf("%.0fMB", float64(f.Size)/mb)
-}
-
-var primaryPorts = map[string]bool{
-	"darwin/amd64":  true,
-	"linux/386":     true,
-	"linux/amd64":   true,
-	"linux/armv6l":  true,
-	"windows/386":   true,
-	"windows/amd64": true,
-}
-
-func (f File) PrimaryPort() bool {
-	if f.Kind == "source" {
-		return true
-	}
-	return primaryPorts[f.OS+"/"+f.Arch]
-}
-
-func (f File) Highlight() bool {
-	switch {
-	case f.Kind == "source":
-		return true
-	case f.Arch == "amd64" && f.OS == "linux":
-		return true
-	case f.Arch == "amd64" && f.Kind == "installer":
-		switch f.OS {
-		case "windows":
-			return true
-		case "darwin":
-			if !strings.Contains(f.Filename, "osx10.6") {
-				return true
-			}
-		}
-	}
-	return false
-}
-
-func (f File) URL() string {
-	return edgeCacheBaseURL + f.Filename
-}
-
-type Release struct {
-	Version        string
-	Stable         bool
-	Files          []File
-	Visible        bool // show files on page load
-	SplitPortTable bool // whether files should be split by primary/other ports.
-}
-
-type Feature struct {
-	// The File field will be filled in by the first stable File
-	// whose name matches the given fileRE.
-	File
-	fileRE *regexp.Regexp
-
-	Platform     string // "Microsoft Windows", "Apple macOS", "Linux"
-	Requirements string // "Windows XP and above, 64-bit Intel Processor"
-}
-
-// featuredFiles lists the platforms and files to be featured
-// at the top of the downloads page.
-var featuredFiles = []Feature{
-	{
-		Platform:     "Microsoft Windows",
-		Requirements: "Windows XP SP2 or later, Intel 64-bit processor",
-		fileRE:       regexp.MustCompile(`\.windows-amd64\.msi$`),
-	},
-	{
-		Platform:     "Apple macOS",
-		Requirements: "macOS 10.8 or later, Intel 64-bit processor",
-		fileRE:       regexp.MustCompile(`\.darwin-amd64(-osx10\.8)?\.pkg$`),
-	},
-	{
-		Platform:     "Linux",
-		Requirements: "Linux 2.6.23 or later, Intel 64-bit processor",
-		fileRE:       regexp.MustCompile(`\.linux-amd64\.tar\.gz$`),
-	},
-	{
-		Platform: "Source",
-		fileRE:   regexp.MustCompile(`\.src\.tar\.gz$`),
-	},
-}
-
-// data to send to the template; increment cacheKey if you change this.
-type listTemplateData struct {
-	Featured                  []Feature
-	Stable, Unstable, Archive []Release
-}
-
-var (
-	listTemplate  = template.Must(template.New("").Funcs(templateFuncs).Parse(templateHTML))
-	templateFuncs = template.FuncMap{"pretty": pretty}
-)
-
-func listHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "GET" {
-		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	var (
-		c = appengine.NewContext(r)
-		d listTemplateData
-	)
-	if _, err := memcache.Gob.Get(c, cacheKey, &d); err != nil {
-		if err == memcache.ErrCacheMiss {
-			log.Debugf(c, "cache miss")
-		} else {
-			log.Errorf(c, "cache get error: %v", err)
-		}
-
-		var fs []File
-		_, err := datastore.NewQuery("File").Ancestor(rootKey(c)).GetAll(c, &fs)
-		if err != nil {
-			log.Errorf(c, "error listing: %v", err)
-			return
-		}
-		d.Stable, d.Unstable, d.Archive = filesToReleases(fs)
-		if len(d.Stable) > 0 {
-			d.Featured = filesToFeatured(d.Stable[0].Files)
-		}
-
-		item := &memcache.Item{Key: cacheKey, Object: &d, Expiration: cacheDuration}
-		if err := memcache.Gob.Set(c, item); err != nil {
-			log.Errorf(c, "cache set error: %v", err)
-		}
-	}
-	if err := listTemplate.ExecuteTemplate(w, "root", d); err != nil {
-		log.Errorf(c, "error executing template: %v", err)
-	}
-}
-
-func filesToFeatured(fs []File) (featured []Feature) {
-	for _, feature := range featuredFiles {
-		for _, file := range fs {
-			if feature.fileRE.MatchString(file.Filename) {
-				feature.File = file
-				featured = append(featured, feature)
-				break
-			}
-		}
-	}
-	return
-}
-
-func filesToReleases(fs []File) (stable, unstable, archive []Release) {
-	sort.Sort(fileOrder(fs))
-
-	var r *Release
-	var stableMaj, stableMin int
-	add := func() {
-		if r == nil {
-			return
-		}
-		if !r.Stable {
-			if len(unstable) != 0 {
-				// Only show one (latest) unstable version.
-				return
-			}
-			maj, min, _ := parseVersion(r.Version)
-			if maj < stableMaj || maj == stableMaj && min <= stableMin {
-				// Display unstable version only if newer than the
-				// latest stable release.
-				return
-			}
-			unstable = append(unstable, *r)
-		}
-
-		// Reports whether the release is the most recent minor version of the
-		// two most recent major versions.
-		shouldAddStable := func() bool {
-			if len(stable) >= 2 {
-				// Show up to two stable versions.
-				return false
-			}
-			if len(stable) == 0 {
-				// Most recent stable version.
-				stableMaj, stableMin, _ = parseVersion(r.Version)
-				return true
-			}
-			if maj, _, _ := parseVersion(r.Version); maj == stableMaj {
-				// Older minor version of most recent major version.
-				return false
-			}
-			// Second most recent stable version.
-			return true
-		}
-		if !shouldAddStable() {
-			archive = append(archive, *r)
-			return
-		}
-
-		// Split the file list into primary/other ports for the stable releases.
-		// NOTE(cbro): This is only done for stable releases because maintaining the historical
-		// nature of primary/other ports for older versions is infeasible.
-		// If freebsd is considered primary some time in the future, we'd not want to
-		// mark all of the older freebsd binaries as "primary".
-		// It might be better if we set that as a flag when uploading.
-		r.SplitPortTable = true
-		r.Visible = true // Toggle open all stable releases.
-		stable = append(stable, *r)
-	}
-	for _, f := range fs {
-		if r == nil || f.Version != r.Version {
-			add()
-			r = &Release{
-				Version: f.Version,
-				Stable:  isStable(f.Version),
-			}
-		}
-		r.Files = append(r.Files, f)
-	}
-	add()
-	return
-}
-
-// isStable reports whether the version string v is a stable version.
-func isStable(v string) bool {
-	return !strings.Contains(v, "beta") && !strings.Contains(v, "rc")
-}
-
-type fileOrder []File
-
-func (s fileOrder) Len() int      { return len(s) }
-func (s fileOrder) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-func (s fileOrder) Less(i, j int) bool {
-	a, b := s[i], s[j]
-	if av, bv := a.Version, b.Version; av != bv {
-		return versionLess(av, bv)
-	}
-	if a.OS != b.OS {
-		return a.OS < b.OS
-	}
-	if a.Arch != b.Arch {
-		return a.Arch < b.Arch
-	}
-	if a.Kind != b.Kind {
-		return a.Kind < b.Kind
-	}
-	return a.Filename < b.Filename
-}
-
-func versionLess(a, b string) bool {
-	// Put stable releases first.
-	if isStable(a) != isStable(b) {
-		return isStable(a)
-	}
-	maja, mina, ta := parseVersion(a)
-	majb, minb, tb := parseVersion(b)
-	if maja == majb {
-		if mina == minb {
-			return ta >= tb
-		}
-		return mina >= minb
-	}
-	return maja >= majb
-}
-
-func parseVersion(v string) (maj, min int, tail string) {
-	if i := strings.Index(v, "beta"); i > 0 {
-		tail = v[i:]
-		v = v[:i]
-	}
-	if i := strings.Index(v, "rc"); i > 0 {
-		tail = v[i:]
-		v = v[:i]
-	}
-	p := strings.Split(strings.TrimPrefix(v, "go1."), ".")
-	maj, _ = strconv.Atoi(p[0])
-	if len(p) < 2 {
-		return
-	}
-	min, _ = strconv.Atoi(p[1])
-	return
-}
-
-func uploadHandler(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "method not allowed", http.StatusMethodNotAllowed)
-		return
-	}
-	c := appengine.NewContext(r)
-
-	// Authenticate using a user token (same as gomote).
-	user := r.FormValue("user")
-	if !validUser(user) {
-		http.Error(w, "bad user", http.StatusForbidden)
-		return
-	}
-	if r.FormValue("key") != userKey(c, user) {
-		http.Error(w, "bad key", http.StatusForbidden)
-		return
-	}
-
-	var f File
-	defer r.Body.Close()
-	if err := json.NewDecoder(r.Body).Decode(&f); err != nil {
-		log.Errorf(c, "error decoding upload JSON: %v", err)
-		http.Error(w, "Something broke", http.StatusInternalServerError)
-		return
-	}
-	if f.Filename == "" {
-		http.Error(w, "Must provide Filename", http.StatusBadRequest)
-		return
-	}
-	if f.Uploaded.IsZero() {
-		f.Uploaded = time.Now()
-	}
-	k := datastore.NewKey(c, "File", f.Filename, 0, rootKey(c))
-	if _, err := datastore.Put(c, k, &f); err != nil {
-		log.Errorf(c, "putting File entity: %v", err)
-		http.Error(w, "could not put File entity", http.StatusInternalServerError)
-		return
-	}
-	if err := memcache.Delete(c, cacheKey); err != nil {
-		log.Errorf(c, "cache delete error: %v", err)
-	}
-	io.WriteString(w, "OK")
-}
-
-func getHandler(w http.ResponseWriter, r *http.Request) {
-	name := strings.TrimPrefix(r.URL.Path, "/dl/")
-	if name == "" {
-		listHandler(w, r)
-		return
-	}
-	if !fileRe.MatchString(name) {
-		http.NotFound(w, r)
-		return
-	}
-	http.Redirect(w, r, edgeCacheBaseURL+name, http.StatusFound)
-}
-
-func validUser(user string) bool {
-	switch user {
-	case "adg", "bradfitz", "cbro":
-		return true
-	}
-	return false
-}
-
-func userKey(c context.Context, user string) string {
-	h := hmac.New(md5.New, []byte(secret(c)))
-	h.Write([]byte("user-" + user))
-	return fmt.Sprintf("%x", h.Sum(nil))
-}
-
-var fileRe = regexp.MustCompile(`^go[0-9a-z.]+\.[0-9a-z.-]+\.(tar\.gz|pkg|msi|zip)$`)
-
-func initHandler(w http.ResponseWriter, r *http.Request) {
-	var fileRoot struct {
-		Root string
-	}
-	c := appengine.NewContext(r)
-	k := rootKey(c)
-	err := datastore.RunInTransaction(c, func(c context.Context) error {
-		err := datastore.Get(c, k, &fileRoot)
-		if err != nil && err != datastore.ErrNoSuchEntity {
-			return err
-		}
-		_, err = datastore.Put(c, k, &fileRoot)
-		return err
-	}, nil)
-	if err != nil {
-		http.Error(w, err.Error(), 500)
-		return
-	}
-	io.WriteString(w, "OK")
-}
-
-// rootKey is the ancestor of all File entities.
-func rootKey(c context.Context) *datastore.Key {
-	return datastore.NewKey(c, "FileRoot", "root", 0, nil)
-}
-
-// pretty returns a human-readable version of the given OS, Arch, or Kind.
-func pretty(s string) string {
-	t, ok := prettyStrings[s]
-	if !ok {
-		return s
-	}
-	return t
-}
-
-var prettyStrings = map[string]string{
-	"darwin":  "macOS",
-	"freebsd": "FreeBSD",
-	"linux":   "Linux",
-	"windows": "Windows",
-
-	"386":    "x86",
-	"amd64":  "x86-64",
-	"armv6l": "ARMv6",
-	"arm64":  "ARMv8",
-
-	"archive":   "Archive",
-	"installer": "Installer",
-	"source":    "Source",
-}
-
-// Code below copied from x/build/app/key
-
-var theKey struct {
-	sync.RWMutex
-	builderKey
-}
-
-type builderKey struct {
-	Secret string
-}
-
-func (k *builderKey) Key(c context.Context) *datastore.Key {
-	return datastore.NewKey(c, "BuilderKey", "root", 0, nil)
-}
-
-func secret(c context.Context) string {
-	// check with rlock
-	theKey.RLock()
-	k := theKey.Secret
-	theKey.RUnlock()
-	if k != "" {
-		return k
-	}
-
-	// prepare to fill; check with lock and keep lock
-	theKey.Lock()
-	defer theKey.Unlock()
-	if theKey.Secret != "" {
-		return theKey.Secret
-	}
-
-	// fill
-	if err := datastore.Get(c, theKey.Key(c), &theKey.builderKey); err != nil {
-		if err == datastore.ErrNoSuchEntity {
-			// If the key is not stored in datastore, write it.
-			// This only happens at the beginning of a new deployment.
-			// The code is left here for SDK use and in case a fresh
-			// deployment is ever needed.  "gophers rule" is not the
-			// real key.
-			if !appengine.IsDevAppServer() {
-				panic("lost key from datastore")
-			}
-			theKey.Secret = "gophers rule"
-			datastore.Put(c, theKey.Key(c), &theKey.builderKey)
-			return theKey.Secret
-		}
-		panic("cannot load builder key: " + err.Error())
-	}
-
-	return theKey.Secret
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/dl/dl_test.go b/installer/vendor/golang.org/x/tools/godoc/dl/dl_test.go
deleted file mode 100644
index 3f61fe9eeb..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/dl/dl_test.go
+++ /dev/null
@@ -1,137 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package dl
-
-import (
-	"sort"
-	"strings"
-	"testing"
-)
-
-func TestParseVersion(t *testing.T) {
-	for _, c := range []struct {
-		in       string
-		maj, min int
-		tail     string
-	}{
-		{"go1.5", 5, 0, ""},
-		{"go1.5beta1", 5, 0, "beta1"},
-		{"go1.5.1", 5, 1, ""},
-		{"go1.5.1rc1", 5, 1, "rc1"},
-	} {
-		maj, min, tail := parseVersion(c.in)
-		if maj != c.maj || min != c.min || tail != c.tail {
-			t.Errorf("parseVersion(%q) = %v, %v, %q; want %v, %v, %q",
-				c.in, maj, min, tail, c.maj, c.min, c.tail)
-		}
-	}
-}
-
-func TestFileOrder(t *testing.T) {
-	fs := []File{
-		{Filename: "go1.3.src.tar.gz", Version: "go1.3", OS: "", Arch: "", Kind: "source"},
-		{Filename: "go1.3.1.src.tar.gz", Version: "go1.3.1", OS: "", Arch: "", Kind: "source"},
-		{Filename: "go1.3.linux-amd64.tar.gz", Version: "go1.3", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.3.1.linux-amd64.tar.gz", Version: "go1.3.1", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.3.darwin-amd64.tar.gz", Version: "go1.3", OS: "darwin", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.3.darwin-amd64.pkg", Version: "go1.3", OS: "darwin", Arch: "amd64", Kind: "installer"},
-		{Filename: "go1.3.darwin-386.tar.gz", Version: "go1.3", OS: "darwin", Arch: "386", Kind: "archive"},
-		{Filename: "go1.3beta1.linux-amd64.tar.gz", Version: "go1.3beta1", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.3beta2.linux-amd64.tar.gz", Version: "go1.3beta2", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.3rc1.linux-amd64.tar.gz", Version: "go1.3rc1", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.2.linux-amd64.tar.gz", Version: "go1.2", OS: "linux", Arch: "amd64", Kind: "archive"},
-		{Filename: "go1.2.2.linux-amd64.tar.gz", Version: "go1.2.2", OS: "linux", Arch: "amd64", Kind: "archive"},
-	}
-	sort.Sort(fileOrder(fs))
-	var s []string
-	for _, f := range fs {
-		s = append(s, f.Filename)
-	}
-	got := strings.Join(s, "\n")
-	want := strings.Join([]string{
-		"go1.3.1.src.tar.gz",
-		"go1.3.1.linux-amd64.tar.gz",
-		"go1.3.src.tar.gz",
-		"go1.3.darwin-386.tar.gz",
-		"go1.3.darwin-amd64.tar.gz",
-		"go1.3.darwin-amd64.pkg",
-		"go1.3.linux-amd64.tar.gz",
-		"go1.2.2.linux-amd64.tar.gz",
-		"go1.2.linux-amd64.tar.gz",
-		"go1.3rc1.linux-amd64.tar.gz",
-		"go1.3beta2.linux-amd64.tar.gz",
-		"go1.3beta1.linux-amd64.tar.gz",
-	}, "\n")
-	if got != want {
-		t.Errorf("sort order is\n%s\nwant:\n%s", got, want)
-	}
-}
-
-func TestFilesToReleases(t *testing.T) {
-	fs := []File{
-		{Version: "go1.7.4", OS: "darwin"},
-		{Version: "go1.7.4", OS: "windows"},
-		{Version: "go1.7", OS: "darwin"},
-		{Version: "go1.7", OS: "windows"},
-		{Version: "go1.6.2", OS: "darwin"},
-		{Version: "go1.6.2", OS: "windows"},
-		{Version: "go1.6", OS: "darwin"},
-		{Version: "go1.6", OS: "windows"},
-		{Version: "go1.5.2", OS: "darwin"},
-		{Version: "go1.5.2", OS: "windows"},
-		{Version: "go1.5", OS: "darwin"},
-		{Version: "go1.5", OS: "windows"},
-		{Version: "go1.5beta1", OS: "windows"},
-	}
-	stable, unstable, archive := filesToReleases(fs)
-	if got, want := len(stable), 2; want != got {
-		t.Errorf("len(stable): got %v, want %v", got, want)
-	} else {
-		if got, want := stable[0].Version, "go1.7.4"; want != got {
-			t.Errorf("stable[0].Version: got %v, want %v", got, want)
-		}
-		if got, want := stable[1].Version, "go1.6.2"; want != got {
-			t.Errorf("stable[1].Version: got %v, want %v", got, want)
-		}
-	}
-	if got, want := len(unstable), 0; want != got {
-		t.Errorf("len(unstable): got %v, want %v", got, want)
-	}
-	if got, want := len(archive), 4; want != got {
-		t.Errorf("len(archive): got %v, want %v", got, want)
-	}
-}
-
-func TestOldUnstableNotShown(t *testing.T) {
-	fs := []File{
-		{Version: "go1.7.4"},
-		{Version: "go1.7"},
-		{Version: "go1.7beta1"},
-	}
-	_, unstable, _ := filesToReleases(fs)
-	if len(unstable) != 0 {
-		t.Errorf("got unstable, want none")
-	}
-}
-
-func TestUnstableShown(t *testing.T) {
-	fs := []File{
-		{Version: "go1.8beta2"},
-		{Version: "go1.8rc1"},
-		{Version: "go1.7.4"},
-		{Version: "go1.7"},
-		{Version: "go1.7beta1"},
-	}
-	_, unstable, _ := filesToReleases(fs)
-	if got, want := len(unstable), 1; got != want {
-		t.Fatalf("len(unstable): got %v, want %v", got, want)
-	}
-	// show rcs ahead of betas.
-	if got, want := unstable[0].Version, "go1.8rc1"; got != want {
-		t.Fatalf("unstable[0].Version: got %v, want %v", got, want)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/dl/tmpl.go b/installer/vendor/golang.org/x/tools/godoc/dl/tmpl.go
deleted file mode 100644
index 440917abfc..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/dl/tmpl.go
+++ /dev/null
@@ -1,279 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package dl
-
-// TODO(adg): refactor this to use the tools/godoc/static template.
-
-const templateHTML = `
-{{define "root"}}
-<!DOCTYPE html>
-<html>
-<head>
-        <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-        <title>Downloads - The Go Programming Language</title>
-        <link type="text/css" rel="stylesheet" href="/lib/godoc/style.css">
-        <script type="text/javascript">window.initFuncs = [];</script>
-	<style>
-		table.codetable {
-			margin-left: 20px; margin-right: 20px;
-			border-collapse: collapse;
-		}
-		table.codetable tr {
-			background-color: #f0f0f0;
-		}
-		table.codetable tr:nth-child(2n), table.codetable tr.first {
-			background-color: white;
-		}
-		table.codetable td, table.codetable th {
-			white-space: nowrap;
-			padding: 6px 10px;
-		}
-		table.codetable tt {
-			font-size: xx-small;
-		}
-		table.codetable tr.highlight td {
-			font-weight: bold;
-		}
-		a.downloadBox {
-			display: block;
-			color: #222;
-			border: 1px solid #375EAB;
-			border-radius: 5px;
-			background: #E0EBF5;
-			width: 280px;
-			float: left;
-			margin-left: 10px;
-			margin-bottom: 10px;
-			padding: 10px;
-		}
-		a.downloadBox:hover {
-			text-decoration: none;
-		}
-		.downloadBox .platform {
-			font-size: large;
-		}
-		.downloadBox .filename {
-			color: #375EAB;
-			font-weight: bold;
-			line-height: 1.5em;
-		}
-		a.downloadBox:hover .filename {
-			text-decoration: underline;
-		}
-		.downloadBox .size {
-			font-size: small;
-			font-weight: normal;
-		}
-		.downloadBox .reqs {
-			font-size: small;
-			font-style: italic;
-		}
-		.downloadBox .checksum {
-			font-size: 5pt;
-		}
-	</style>
-</head>
-<body>
-
-<div id="topbar"><div class="container">
-
-<div class="top-heading"><a href="/">The Go Programming Language</a></div>
-<form method="GET" action="/search">
-<div id="menu">
-<a href="/doc/">Documents</a>
-<a href="/pkg/">Packages</a>
-<a href="/project/">The Project</a>
-<a href="/help/">Help</a>
-<a href="/blog/">Blog</a>
-<input type="text" id="search" name="q" class="inactive" value="Search" placeholder="Search">
-</div>
-</form>
-
-</div></div>
-
-<div id="page">
-<div class="container">
-
-<h1>Downloads</h1>
-
-<p>
-After downloading a binary release suitable for your system,
-please follow the <a href="/doc/install">installation instructions</a>.
-</p>
-
-<p>
-If you are building from source,
-follow the <a href="/doc/install/source">source installation instructions</a>.
-</p>
-
-<p>
-See the <a href="/doc/devel/release.html">release history</a> for more
-information about Go releases.
-</p>
-
-{{with .Featured}}
-<h3 id="featured">Featured downloads</h3>
-{{range .}}
-{{template "download" .}}
-{{end}}
-{{end}}
-
-<div style="clear: both;"></div>
-
-{{with .Stable}}
-<h3 id="stable">Stable versions</h3>
-{{template "releases" .}}
-{{end}}
-
-{{with .Unstable}}
-<h3 id="unstable">Unstable version</h3>
-{{template "releases" .}}
-{{end}}
-
-{{with .Archive}}
-<div class="toggle" id="archive">
-  <div class="collapsed">
-    <h3 class="toggleButton" title="Click to show versions">Archived versions▹</h3>
-  </div>
-  <div class="expanded">
-    <h3 class="toggleButton" title="Click to hide versions">Archived versions▾</h3>
-    {{template "releases" .}}
-  </div>
-</div>
-{{end}}
-
-<div id="footer">
-        <p>
-        Except as
-        <a href="https://developers.google.com/site-policies#restrictions">noted</a>,
-        the content of this page is licensed under the Creative Commons
-        Attribution 3.0 License,<br>
-        and code is licensed under a <a href="http://golang.org/LICENSE">BSD license</a>.<br>
-        <a href="http://golang.org/doc/tos.html">Terms of Service</a> |
-        <a href="http://www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-        </p>
-</div><!-- #footer -->
-
-</div><!-- .container -->
-</div><!-- #page -->
-<script>
-  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-  ga('create', 'UA-11222381-2', 'auto');
-  ga('send', 'pageview');
-
-</script>
-</body>
-<script src="/lib/godoc/jquery.js"></script>
-<script src="/lib/godoc/godocs.js"></script>
-<script>
-$(document).ready(function() {
-  $('a.download').click(function(e) {
-    // Try using the link text as the file name,
-    // unless there's a child element of class 'filename'.
-    var filename = $(this).text();
-    var child = $(this).find('.filename');
-    if (child.length > 0) {
-      filename = child.text();
-    }
-
-    // This must be kept in sync with the filenameRE in godocs.js.
-    var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9]+)?(-osx10\.[68])?\.([a-z.]+)$/;
-    var m = filenameRE.exec(filename);
-    if (!m) {
-      // Don't redirect to the download page if it won't recognize this file.
-      // (Should not happen.)
-      return;
-    }
-
-    var dest = "/doc/install";
-    if (filename.indexOf(".src.") != -1) {
-      dest += "/source";
-    }
-    dest += "?download=" + filename;
-
-    e.preventDefault();
-    e.stopPropagation();
-    window.location = dest;
-  });
-});
-</script>
-</html>
-{{end}}
-
-{{define "releases"}}
-{{range .}}
-<div class="toggle{{if .Visible}}Visible{{end}}" id="{{.Version}}">
-	<div class="collapsed">
-		<h2 class="toggleButton" title="Click to show downloads for this version">{{.Version}} ▹</h2>
-	</div>
-	<div class="expanded">
-		<h2 class="toggleButton" title="Click to hide downloads for this version">{{.Version}} ▾</h2>
-		{{if .Stable}}{{else}}
-			<p>This is an <b>unstable</b> version of Go. Use with caution.</p>
-			<p>If you already have Go installed, you can install this version by running:</p>
-<pre>
-go get golang.org/x/build/version/{{.Version}}
-</pre>
-			<p>Then, use the <code>{{.Version}}</code> command instead of the <code>go</code> command to use {{.Version}}.</p>
-		{{end}}
-		{{template "files" .}}
-	</div>
-</div>
-{{end}}
-{{end}}
-
-{{define "files"}}
-<table class="codetable">
-<thead>
-<tr class="first">
-  <th>File name</th>
-  <th>Kind</th>
-  <th>OS</th>
-  <th>Arch</th>
-  <th>Size</th>
-  {{/* Use the checksum type of the first file for the column heading. */}}
-  <th>{{(index .Files 0).ChecksumType}} Checksum</th>
-</tr>
-</thead>
-{{if .SplitPortTable}}
-  {{range .Files}}{{if .PrimaryPort}}{{template "file" .}}{{end}}{{end}}
-
-  {{/* TODO(cbro): add a link to an explanatory doc page */}}
-  <tr class="first"><th colspan="6" class="first">Other Ports</th></tr>
-  {{range .Files}}{{if not .PrimaryPort}}{{template "file" .}}{{end}}{{end}}
-{{else}}
-  {{range .Files}}{{template "file" .}}{{end}}
-{{end}}
-</table>
-{{end}}
-
-{{define "file"}}
-<tr{{if .Highlight}} class="highlight"{{end}}>
-  <td class="filename"><a class="download" href="{{.URL}}">{{.Filename}}</a></td>
-  <td>{{pretty .Kind}}</td>
-  <td>{{.PrettyOS}}</td>
-  <td>{{pretty .Arch}}</td>
-  <td>{{.PrettySize}}</td>
-  <td><tt>{{.PrettyChecksum}}</tt></td>
-</tr>
-{{end}}
-
-{{define "download"}}
-<a class="download downloadBox" href="{{.URL}}">
-<div class="platform">{{.Platform}}</div>
-{{with .Requirements}}<div class="reqs">{{.}}</div>{{end}}
-<div>
-  <span class="filename">{{.Filename}}</span>
-  {{if .Size}}<span class="size">({{.PrettySize}})</span>{{end}}
-</div>
-</a>
-{{end}}
-`
diff --git a/installer/vendor/golang.org/x/tools/godoc/format.go b/installer/vendor/golang.org/x/tools/godoc/format.go
deleted file mode 100644
index 6013238feb..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/format.go
+++ /dev/null
@@ -1,371 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements FormatSelections and FormatText.
-// FormatText is used to HTML-format Go and non-Go source
-// text with line numbers and highlighted sections. It is
-// built on top of FormatSelections, a generic formatter
-// for "selected" text.
-
-package godoc
-
-import (
-	"fmt"
-	"go/scanner"
-	"go/token"
-	"io"
-	"regexp"
-	"strconv"
-	"text/template"
-)
-
-// ----------------------------------------------------------------------------
-// Implementation of FormatSelections
-
-// A Segment describes a text segment [start, end).
-// The zero value of a Segment is a ready-to-use empty segment.
-//
-type Segment struct {
-	start, end int
-}
-
-func (seg *Segment) isEmpty() bool { return seg.start >= seg.end }
-
-// A Selection is an "iterator" function returning a text segment.
-// Repeated calls to a selection return consecutive, non-overlapping,
-// non-empty segments, followed by an infinite sequence of empty
-// segments. The first empty segment marks the end of the selection.
-//
-type Selection func() Segment
-
-// A LinkWriter writes some start or end "tag" to w for the text offset offs.
-// It is called by FormatSelections at the start or end of each link segment.
-//
-type LinkWriter func(w io.Writer, offs int, start bool)
-
-// A SegmentWriter formats a text according to selections and writes it to w.
-// The selections parameter is a bit set indicating which selections provided
-// to FormatSelections overlap with the text segment: If the n'th bit is set
-// in selections, the n'th selection provided to FormatSelections is overlapping
-// with the text.
-//
-type SegmentWriter func(w io.Writer, text []byte, selections int)
-
-// FormatSelections takes a text and writes it to w using link and segment
-// writers lw and sw as follows: lw is invoked for consecutive segment starts
-// and ends as specified through the links selection, and sw is invoked for
-// consecutive segments of text overlapped by the same selections as specified
-// by selections. The link writer lw may be nil, in which case the links
-// Selection is ignored.
-//
-func FormatSelections(w io.Writer, text []byte, lw LinkWriter, links Selection, sw SegmentWriter, selections ...Selection) {
-	// If we have a link writer, make the links
-	// selection the last entry in selections
-	if lw != nil {
-		selections = append(selections, links)
-	}
-
-	// compute the sequence of consecutive segment changes
-	changes := newMerger(selections)
-
-	// The i'th bit in bitset indicates that the text
-	// at the current offset is covered by selections[i].
-	bitset := 0
-	lastOffs := 0
-
-	// Text segments are written in a delayed fashion
-	// such that consecutive segments belonging to the
-	// same selection can be combined (peephole optimization).
-	// last describes the last segment which has not yet been written.
-	var last struct {
-		begin, end int // valid if begin < end
-		bitset     int
-	}
-
-	// flush writes the last delayed text segment
-	flush := func() {
-		if last.begin < last.end {
-			sw(w, text[last.begin:last.end], last.bitset)
-		}
-		last.begin = last.end // invalidate last
-	}
-
-	// segment runs the segment [lastOffs, end) with the selection
-	// indicated by bitset through the segment peephole optimizer.
-	segment := func(end int) {
-		if lastOffs < end { // ignore empty segments
-			if last.end != lastOffs || last.bitset != bitset {
-				// the last segment is not adjacent to or
-				// differs from the new one
-				flush()
-				// start a new segment
-				last.begin = lastOffs
-			}
-			last.end = end
-			last.bitset = bitset
-		}
-	}
-
-	for {
-		// get the next segment change
-		index, offs, start := changes.next()
-		if index < 0 || offs > len(text) {
-			// no more segment changes or the next change
-			// is past the end of the text - we're done
-			break
-		}
-		// determine the kind of segment change
-		if lw != nil && index == len(selections)-1 {
-			// we have a link segment change (see start of this function):
-			// format the previous selection segment, write the
-			// link tag and start a new selection segment
-			segment(offs)
-			flush()
-			lastOffs = offs
-			lw(w, offs, start)
-		} else {
-			// we have a selection change:
-			// format the previous selection segment, determine
-			// the new selection bitset and start a new segment
-			segment(offs)
-			lastOffs = offs
-			mask := 1 << uint(index)
-			if start {
-				bitset |= mask
-			} else {
-				bitset &^= mask
-			}
-		}
-	}
-	segment(len(text))
-	flush()
-}
-
-// A merger merges a slice of Selections and produces a sequence of
-// consecutive segment change events through repeated next() calls.
-//
-type merger struct {
-	selections []Selection
-	segments   []Segment // segments[i] is the next segment of selections[i]
-}
-
-const infinity int = 2e9
-
-func newMerger(selections []Selection) *merger {
-	segments := make([]Segment, len(selections))
-	for i, sel := range selections {
-		segments[i] = Segment{infinity, infinity}
-		if sel != nil {
-			if seg := sel(); !seg.isEmpty() {
-				segments[i] = seg
-			}
-		}
-	}
-	return &merger{selections, segments}
-}
-
-// next returns the next segment change: index specifies the Selection
-// to which the segment belongs, offs is the segment start or end offset
-// as determined by the start value. If there are no more segment changes,
-// next returns an index value < 0.
-//
-func (m *merger) next() (index, offs int, start bool) {
-	// find the next smallest offset where a segment starts or ends
-	offs = infinity
-	index = -1
-	for i, seg := range m.segments {
-		switch {
-		case seg.start < offs:
-			offs = seg.start
-			index = i
-			start = true
-		case seg.end < offs:
-			offs = seg.end
-			index = i
-			start = false
-		}
-	}
-	if index < 0 {
-		// no offset found => all selections merged
-		return
-	}
-	// offset found - it's either the start or end offset but
-	// either way it is ok to consume the start offset: set it
-	// to infinity so it won't be considered in the following
-	// next call
-	m.segments[index].start = infinity
-	if start {
-		return
-	}
-	// end offset found - consume it
-	m.segments[index].end = infinity
-	// advance to the next segment for that selection
-	seg := m.selections[index]()
-	if !seg.isEmpty() {
-		m.segments[index] = seg
-	}
-	return
-}
-
-// ----------------------------------------------------------------------------
-// Implementation of FormatText
-
-// lineSelection returns the line segments for text as a Selection.
-func lineSelection(text []byte) Selection {
-	i, j := 0, 0
-	return func() (seg Segment) {
-		// find next newline, if any
-		for j < len(text) {
-			j++
-			if text[j-1] == '\n' {
-				break
-			}
-		}
-		if i < j {
-			// text[i:j] constitutes a line
-			seg = Segment{i, j}
-			i = j
-		}
-		return
-	}
-}
-
-// tokenSelection returns, as a selection, the sequence of
-// consecutive occurrences of token sel in the Go src text.
-//
-func tokenSelection(src []byte, sel token.Token) Selection {
-	var s scanner.Scanner
-	fset := token.NewFileSet()
-	file := fset.AddFile("", fset.Base(), len(src))
-	s.Init(file, src, nil, scanner.ScanComments)
-	return func() (seg Segment) {
-		for {
-			pos, tok, lit := s.Scan()
-			if tok == token.EOF {
-				break
-			}
-			offs := file.Offset(pos)
-			if tok == sel {
-				seg = Segment{offs, offs + len(lit)}
-				break
-			}
-		}
-		return
-	}
-}
-
-// makeSelection is a helper function to make a Selection from a slice of pairs.
-// Pairs describing empty segments are ignored.
-//
-func makeSelection(matches [][]int) Selection {
-	i := 0
-	return func() Segment {
-		for i < len(matches) {
-			m := matches[i]
-			i++
-			if m[0] < m[1] {
-				// non-empty segment
-				return Segment{m[0], m[1]}
-			}
-		}
-		return Segment{}
-	}
-}
-
-// regexpSelection computes the Selection for the regular expression expr in text.
-func regexpSelection(text []byte, expr string) Selection {
-	var matches [][]int
-	if rx, err := regexp.Compile(expr); err == nil {
-		matches = rx.FindAllIndex(text, -1)
-	}
-	return makeSelection(matches)
-}
-
-var selRx = regexp.MustCompile(`^([0-9]+):([0-9]+)`)
-
-// RangeSelection computes the Selection for a text range described
-// by the argument str; the range description must match the selRx
-// regular expression.
-func RangeSelection(str string) Selection {
-	m := selRx.FindStringSubmatch(str)
-	if len(m) >= 2 {
-		from, _ := strconv.Atoi(m[1])
-		to, _ := strconv.Atoi(m[2])
-		if from < to {
-			return makeSelection([][]int{{from, to}})
-		}
-	}
-	return nil
-}
-
-// Span tags for all the possible selection combinations that may
-// be generated by FormatText. Selections are indicated by a bitset,
-// and the value of the bitset specifies the tag to be used.
-//
-// bit 0: comments
-// bit 1: highlights
-// bit 2: selections
-//
-var startTags = [][]byte{
-	/* 000 */ []byte(``),
-	/* 001 */ []byte(`<span class="comment">`),
-	/* 010 */ []byte(`<span class="highlight">`),
-	/* 011 */ []byte(`<span class="highlight-comment">`),
-	/* 100 */ []byte(`<span class="selection">`),
-	/* 101 */ []byte(`<span class="selection-comment">`),
-	/* 110 */ []byte(`<span class="selection-highlight">`),
-	/* 111 */ []byte(`<span class="selection-highlight-comment">`),
-}
-
-var endTag = []byte(`</span>`)
-
-func selectionTag(w io.Writer, text []byte, selections int) {
-	if selections < len(startTags) {
-		if tag := startTags[selections]; len(tag) > 0 {
-			w.Write(tag)
-			template.HTMLEscape(w, text)
-			w.Write(endTag)
-			return
-		}
-	}
-	template.HTMLEscape(w, text)
-}
-
-// FormatText HTML-escapes text and writes it to w.
-// Consecutive text segments are wrapped in HTML spans (with tags as
-// defined by startTags and endTag) as follows:
-//
-//	- if line >= 0, line number (ln) spans are inserted before each line,
-//	  starting with the value of line
-//	- if the text is Go source, comments get the "comment" span class
-//	- each occurrence of the regular expression pattern gets the "highlight"
-//	  span class
-//	- text segments covered by selection get the "selection" span class
-//
-// Comments, highlights, and selections may overlap arbitrarily; the respective
-// HTML span classes are specified in the startTags variable.
-//
-func FormatText(w io.Writer, text []byte, line int, goSource bool, pattern string, selection Selection) {
-	var comments, highlights Selection
-	if goSource {
-		comments = tokenSelection(text, token.COMMENT)
-	}
-	if pattern != "" {
-		highlights = regexpSelection(text, pattern)
-	}
-	if line >= 0 || comments != nil || highlights != nil || selection != nil {
-		var lineTag LinkWriter
-		if line >= 0 {
-			lineTag = func(w io.Writer, _ int, start bool) {
-				if start {
-					fmt.Fprintf(w, "<span id=\"L%d\" class=\"ln\">%6d</span>\t", line, line)
-					line++
-				}
-			}
-		}
-		FormatSelections(w, text, lineTag, lineSelection(text), selectionTag, comments, highlights, selection)
-	} else {
-		template.HTMLEscape(w, text)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/godoc.go b/installer/vendor/golang.org/x/tools/godoc/godoc.go
deleted file mode 100644
index d6c27d0b2d..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/godoc.go
+++ /dev/null
@@ -1,911 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package godoc is a work-in-progress (2013-07-17) package to
-// begin splitting up the godoc binary into multiple pieces.
-//
-// This package comment will evolve over time as this package splits
-// into smaller pieces.
-package godoc // import "golang.org/x/tools/godoc"
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/doc"
-	"go/format"
-	"go/printer"
-	"go/token"
-	htmltemplate "html/template"
-	"io"
-	"log"
-	"os"
-	pathpkg "path"
-	"regexp"
-	"strconv"
-	"strings"
-	"text/template"
-	"time"
-	"unicode"
-	"unicode/utf8"
-)
-
-// Fake relative package path for built-ins. Documentation for all globals
-// (not just exported ones) will be shown for packages in this directory.
-const builtinPkgPath = "builtin"
-
-// FuncMap defines template functions used in godoc templates.
-//
-// Convention: template function names ending in "_html" or "_url" produce
-//             HTML- or URL-escaped strings; all other function results may
-//             require explicit escaping in the template.
-func (p *Presentation) FuncMap() template.FuncMap {
-	p.initFuncMapOnce.Do(p.initFuncMap)
-	return p.funcMap
-}
-
-func (p *Presentation) TemplateFuncs() template.FuncMap {
-	p.initFuncMapOnce.Do(p.initFuncMap)
-	return p.templateFuncs
-}
-
-func (p *Presentation) initFuncMap() {
-	if p.Corpus == nil {
-		panic("nil Presentation.Corpus")
-	}
-	p.templateFuncs = template.FuncMap{
-		"code": p.code,
-	}
-	p.funcMap = template.FuncMap{
-		// various helpers
-		"filename": filenameFunc,
-		"repeat":   strings.Repeat,
-
-		// access to FileInfos (directory listings)
-		"fileInfoName": fileInfoNameFunc,
-		"fileInfoTime": fileInfoTimeFunc,
-
-		// access to search result information
-		"infoKind_html":    infoKind_htmlFunc,
-		"infoLine":         p.infoLineFunc,
-		"infoSnippet_html": p.infoSnippet_htmlFunc,
-
-		// formatting of AST nodes
-		"node":         p.nodeFunc,
-		"node_html":    p.node_htmlFunc,
-		"comment_html": comment_htmlFunc,
-		"comment_text": comment_textFunc,
-		"sanitize":     sanitizeFunc,
-
-		// support for URL attributes
-		"pkgLink":       pkgLinkFunc,
-		"srcLink":       srcLinkFunc,
-		"posLink_url":   newPosLink_urlFunc(srcPosLinkFunc),
-		"docLink":       docLinkFunc,
-		"queryLink":     queryLinkFunc,
-		"srcBreadcrumb": srcBreadcrumbFunc,
-		"srcToPkgLink":  srcToPkgLinkFunc,
-
-		// formatting of Examples
-		"example_html":   p.example_htmlFunc,
-		"example_text":   p.example_textFunc,
-		"example_name":   p.example_nameFunc,
-		"example_suffix": p.example_suffixFunc,
-
-		// formatting of analysis information
-		"callgraph_html":  p.callgraph_htmlFunc,
-		"implements_html": p.implements_htmlFunc,
-		"methodset_html":  p.methodset_htmlFunc,
-
-		// formatting of Notes
-		"noteTitle": noteTitle,
-
-		// Number operation
-		"multiply": multiply,
-
-		// formatting of PageInfoMode query string
-		"modeQueryString": modeQueryString,
-	}
-	if p.URLForSrc != nil {
-		p.funcMap["srcLink"] = p.URLForSrc
-	}
-	if p.URLForSrcPos != nil {
-		p.funcMap["posLink_url"] = newPosLink_urlFunc(p.URLForSrcPos)
-	}
-	if p.URLForSrcQuery != nil {
-		p.funcMap["queryLink"] = p.URLForSrcQuery
-	}
-}
-
-func multiply(a, b int) int { return a * b }
-
-func filenameFunc(path string) string {
-	_, localname := pathpkg.Split(path)
-	return localname
-}
-
-func fileInfoNameFunc(fi os.FileInfo) string {
-	name := fi.Name()
-	if fi.IsDir() {
-		name += "/"
-	}
-	return name
-}
-
-func fileInfoTimeFunc(fi os.FileInfo) string {
-	if t := fi.ModTime(); t.Unix() != 0 {
-		return t.Local().String()
-	}
-	return "" // don't return epoch if time is obviously not set
-}
-
-// The strings in infoKinds must be properly html-escaped.
-var infoKinds = [nKinds]string{
-	PackageClause: "package&nbsp;clause",
-	ImportDecl:    "import&nbsp;decl",
-	ConstDecl:     "const&nbsp;decl",
-	TypeDecl:      "type&nbsp;decl",
-	VarDecl:       "var&nbsp;decl",
-	FuncDecl:      "func&nbsp;decl",
-	MethodDecl:    "method&nbsp;decl",
-	Use:           "use",
-}
-
-func infoKind_htmlFunc(info SpotInfo) string {
-	return infoKinds[info.Kind()] // infoKind entries are html-escaped
-}
-
-func (p *Presentation) infoLineFunc(info SpotInfo) int {
-	line := info.Lori()
-	if info.IsIndex() {
-		index, _ := p.Corpus.searchIndex.Get()
-		if index != nil {
-			line = index.(*Index).Snippet(line).Line
-		} else {
-			// no line information available because
-			// we don't have an index - this should
-			// never happen; be conservative and don't
-			// crash
-			line = 0
-		}
-	}
-	return line
-}
-
-func (p *Presentation) infoSnippet_htmlFunc(info SpotInfo) string {
-	if info.IsIndex() {
-		index, _ := p.Corpus.searchIndex.Get()
-		// Snippet.Text was HTML-escaped when it was generated
-		return index.(*Index).Snippet(info.Lori()).Text
-	}
-	return `<span class="alert">no snippet text available</span>`
-}
-
-func (p *Presentation) nodeFunc(info *PageInfo, node interface{}) string {
-	var buf bytes.Buffer
-	p.writeNode(&buf, info.FSet, node)
-	return buf.String()
-}
-
-func (p *Presentation) node_htmlFunc(info *PageInfo, node interface{}, linkify bool) string {
-	var buf1 bytes.Buffer
-	p.writeNode(&buf1, info.FSet, node)
-
-	var buf2 bytes.Buffer
-	if n, _ := node.(ast.Node); n != nil && linkify && p.DeclLinks {
-		LinkifyText(&buf2, buf1.Bytes(), n)
-		if st, name := isStructTypeDecl(n); st != nil {
-			addStructFieldIDAttributes(&buf2, name, st)
-		}
-	} else {
-		FormatText(&buf2, buf1.Bytes(), -1, true, "", nil)
-	}
-
-	return buf2.String()
-}
-
-// isStructTypeDecl checks whether n is a struct declaration.
-// It either returns a non-nil StructType and its name, or zero values.
-func isStructTypeDecl(n ast.Node) (st *ast.StructType, name string) {
-	gd, ok := n.(*ast.GenDecl)
-	if !ok || gd.Tok != token.TYPE {
-		return nil, ""
-	}
-	if gd.Lparen > 0 {
-		// Parenthesized type. Who does that, anyway?
-		// TODO: Reportedly gri does. Fix this to handle that too.
-		return nil, ""
-	}
-	if len(gd.Specs) != 1 {
-		return nil, ""
-	}
-	ts, ok := gd.Specs[0].(*ast.TypeSpec)
-	if !ok {
-		return nil, ""
-	}
-	st, ok = ts.Type.(*ast.StructType)
-	if !ok {
-		return nil, ""
-	}
-	return st, ts.Name.Name
-}
-
-// addStructFieldIDAttributes modifies the contents of buf such that
-// all struct fields of the named struct have <span id='name.Field'>
-// in them, so people can link to /#Struct.Field.
-func addStructFieldIDAttributes(buf *bytes.Buffer, name string, st *ast.StructType) {
-	if st.Fields == nil {
-		return
-	}
-	// needsLink is a set of identifiers that still need to be
-	// linked, where value == key, to avoid an allocation in func
-	// linkedField.
-	needsLink := make(map[string]string)
-
-	for _, f := range st.Fields.List {
-		if len(f.Names) == 0 {
-			continue
-		}
-		fieldName := f.Names[0].Name
-		needsLink[fieldName] = fieldName
-	}
-	var newBuf bytes.Buffer
-	foreachLine(buf.Bytes(), func(line []byte) {
-		if fieldName := linkedField(line, needsLink); fieldName != "" {
-			fmt.Fprintf(&newBuf, `<span id="%s.%s"></span>`, name, fieldName)
-			delete(needsLink, fieldName)
-		}
-		newBuf.Write(line)
-	})
-	buf.Reset()
-	buf.Write(newBuf.Bytes())
-}
-
-// foreachLine calls fn for each line of in, where a line includes
-// the trailing "\n", except on the last line, if it doesn't exist.
-func foreachLine(in []byte, fn func(line []byte)) {
-	for len(in) > 0 {
-		nl := bytes.IndexByte(in, '\n')
-		if nl == -1 {
-			fn(in)
-			return
-		}
-		fn(in[:nl+1])
-		in = in[nl+1:]
-	}
-}
-
-// commentPrefix is the line prefix for comments after they've been HTMLified.
-var commentPrefix = []byte(`<span class="comment">// `)
-
-// linkedField determines whether the given line starts with an
-// identifer in the provided ids map (mapping from identifier to the
-// same identifier). The line can start with either an identifier or
-// an identifier in a comment. If one matches, it returns the
-// identifier that matched. Otherwise it returns the empty string.
-func linkedField(line []byte, ids map[string]string) string {
-	line = bytes.TrimSpace(line)
-
-	// For fields with a doc string of the
-	// conventional form, we put the new span into
-	// the comment instead of the field.
-	// The "conventional" form is a complete sentence
-	// per https://golang.org/s/style#comment-sentences like:
-	//
-	//    // Foo is an optional Fooer to foo the foos.
-	//    Foo Fooer
-	//
-	// In this case, we want the #StructName.Foo
-	// link to make the browser go to the comment
-	// line "Foo is an optional Fooer" instead of
-	// the "Foo Fooer" line, which could otherwise
-	// obscure the docs above the browser's "fold".
-	//
-	// TODO: do this better, so it works for all
-	// comments, including unconventional ones.
-	if bytes.HasPrefix(line, commentPrefix) {
-		line = line[len(commentPrefix):]
-	}
-	id := scanIdentifier(line)
-	if len(id) == 0 {
-		// No leading identifier. Avoid map lookup for
-		// somewhat common case.
-		return ""
-	}
-	return ids[string(id)]
-}
-
-// scanIdentifier scans a valid Go identifier off the front of v and
-// either returns a subslice of v if there's a valid identifier, or
-// returns a zero-length slice.
-func scanIdentifier(v []byte) []byte {
-	var n int // number of leading bytes of v belonging to an identifier
-	for {
-		r, width := utf8.DecodeRune(v[n:])
-		if !(isLetter(r) || n > 0 && isDigit(r)) {
-			break
-		}
-		n += width
-	}
-	return v[:n]
-}
-
-func isLetter(ch rune) bool {
-	return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= utf8.RuneSelf && unicode.IsLetter(ch)
-}
-
-func isDigit(ch rune) bool {
-	return '0' <= ch && ch <= '9' || ch >= utf8.RuneSelf && unicode.IsDigit(ch)
-}
-
-func comment_htmlFunc(comment string) string {
-	var buf bytes.Buffer
-	// TODO(gri) Provide list of words (e.g. function parameters)
-	//           to be emphasized by ToHTML.
-	doc.ToHTML(&buf, comment, nil) // does html-escaping
-	return buf.String()
-}
-
-// punchCardWidth is the number of columns of fixed-width
-// characters to assume when wrapping text.  Very few people
-// use terminals or cards smaller than 80 characters, so 80 it is.
-// We do not try to sniff the environment or the tty to adapt to
-// the situation; instead, by using a constant we make sure that
-// godoc always produces the same output regardless of context,
-// a consistency that is lost otherwise.  For example, if we sniffed
-// the environment or tty, then http://golang.org/pkg/math/?m=text
-// would depend on the width of the terminal where godoc started,
-// which is clearly bogus.  More generally, the Unix tools that behave
-// differently when writing to a tty than when writing to a file have
-// a history of causing confusion (compare `ls` and `ls | cat`), and we
-// want to avoid that mistake here.
-const punchCardWidth = 80
-
-func containsOnlySpace(buf []byte) bool {
-	isNotSpace := func(r rune) bool { return !unicode.IsSpace(r) }
-	return bytes.IndexFunc(buf, isNotSpace) == -1
-}
-
-func comment_textFunc(comment, indent, preIndent string) string {
-	var buf bytes.Buffer
-	doc.ToText(&buf, comment, indent, preIndent, punchCardWidth-2*len(indent))
-	if containsOnlySpace(buf.Bytes()) {
-		return ""
-	}
-	return buf.String()
-}
-
-// sanitizeFunc sanitizes the argument src by replacing newlines with
-// blanks, removing extra blanks, and by removing trailing whitespace
-// and commas before closing parentheses.
-func sanitizeFunc(src string) string {
-	buf := make([]byte, len(src))
-	j := 0      // buf index
-	comma := -1 // comma index if >= 0
-	for i := 0; i < len(src); i++ {
-		ch := src[i]
-		switch ch {
-		case '\t', '\n', ' ':
-			// ignore whitespace at the beginning, after a blank, or after opening parentheses
-			if j == 0 {
-				continue
-			}
-			if p := buf[j-1]; p == ' ' || p == '(' || p == '{' || p == '[' {
-				continue
-			}
-			// replace all whitespace with blanks
-			ch = ' '
-		case ',':
-			comma = j
-		case ')', '}', ']':
-			// remove any trailing comma
-			if comma >= 0 {
-				j = comma
-			}
-			// remove any trailing whitespace
-			if j > 0 && buf[j-1] == ' ' {
-				j--
-			}
-		default:
-			comma = -1
-		}
-		buf[j] = ch
-		j++
-	}
-	// remove trailing blank, if any
-	if j > 0 && buf[j-1] == ' ' {
-		j--
-	}
-	return string(buf[:j])
-}
-
-type PageInfo struct {
-	Dirname  string // directory containing the package
-	Err      error  // error or nil
-	GoogleCN bool   // page is being served from golang.google.cn
-
-	Mode PageInfoMode // display metadata from query string
-
-	// package info
-	FSet       *token.FileSet         // nil if no package documentation
-	PDoc       *doc.Package           // nil if no package documentation
-	Examples   []*doc.Example         // nil if no example code
-	Notes      map[string][]*doc.Note // nil if no package Notes
-	PAst       map[string]*ast.File   // nil if no AST with package exports
-	IsMain     bool                   // true for package main
-	IsFiltered bool                   // true if results were filtered
-
-	// analysis info
-	TypeInfoIndex  map[string]int  // index of JSON datum for type T (if -analysis=type)
-	AnalysisData   htmltemplate.JS // array of TypeInfoJSON values
-	CallGraph      htmltemplate.JS // array of PCGNodeJSON values    (if -analysis=pointer)
-	CallGraphIndex map[string]int  // maps func name to index in CallGraph
-
-	// directory info
-	Dirs    *DirList  // nil if no directory information
-	DirTime time.Time // directory time stamp
-	DirFlat bool      // if set, show directory in a flat (non-indented) manner
-}
-
-func (info *PageInfo) IsEmpty() bool {
-	return info.Err != nil || info.PAst == nil && info.PDoc == nil && info.Dirs == nil
-}
-
-func pkgLinkFunc(path string) string {
-	// because of the irregular mapping under goroot
-	// we need to correct certain relative paths
-	path = strings.TrimPrefix(path, "/")
-	path = strings.TrimPrefix(path, "src/")
-	path = strings.TrimPrefix(path, "pkg/")
-	return "pkg/" + path
-}
-
-// srcToPkgLinkFunc builds an <a> tag linking to the package
-// documentation of relpath.
-func srcToPkgLinkFunc(relpath string) string {
-	relpath = pkgLinkFunc(relpath)
-	relpath = pathpkg.Dir(relpath)
-	if relpath == "pkg" {
-		return `<a href="/pkg">Index</a>`
-	}
-	return fmt.Sprintf(`<a href="/%s">%s</a>`, relpath, relpath[len("pkg/"):])
-}
-
-// srcBreadcrumbFun converts each segment of relpath to a HTML <a>.
-// Each segment links to its corresponding src directories.
-func srcBreadcrumbFunc(relpath string) string {
-	segments := strings.Split(relpath, "/")
-	var buf bytes.Buffer
-	var selectedSegment string
-	var selectedIndex int
-
-	if strings.HasSuffix(relpath, "/") {
-		// relpath is a directory ending with a "/".
-		// Selected segment is the segment before the last slash.
-		selectedIndex = len(segments) - 2
-		selectedSegment = segments[selectedIndex] + "/"
-	} else {
-		selectedIndex = len(segments) - 1
-		selectedSegment = segments[selectedIndex]
-	}
-
-	for i := range segments[:selectedIndex] {
-		buf.WriteString(fmt.Sprintf(`<a href="/%s">%s</a>/`,
-			strings.Join(segments[:i+1], "/"),
-			segments[i],
-		))
-	}
-
-	buf.WriteString(`<span class="text-muted">`)
-	buf.WriteString(selectedSegment)
-	buf.WriteString(`</span>`)
-	return buf.String()
-}
-
-func newPosLink_urlFunc(srcPosLinkFunc func(s string, line, low, high int) string) func(info *PageInfo, n interface{}) string {
-	// n must be an ast.Node or a *doc.Note
-	return func(info *PageInfo, n interface{}) string {
-		var pos, end token.Pos
-
-		switch n := n.(type) {
-		case ast.Node:
-			pos = n.Pos()
-			end = n.End()
-		case *doc.Note:
-			pos = n.Pos
-			end = n.End
-		default:
-			panic(fmt.Sprintf("wrong type for posLink_url template formatter: %T", n))
-		}
-
-		var relpath string
-		var line int
-		var low, high int // selection offset range
-
-		if pos.IsValid() {
-			p := info.FSet.Position(pos)
-			relpath = p.Filename
-			line = p.Line
-			low = p.Offset
-		}
-		if end.IsValid() {
-			high = info.FSet.Position(end).Offset
-		}
-
-		return srcPosLinkFunc(relpath, line, low, high)
-	}
-}
-
-func srcPosLinkFunc(s string, line, low, high int) string {
-	s = srcLinkFunc(s)
-	var buf bytes.Buffer
-	template.HTMLEscape(&buf, []byte(s))
-	// selection ranges are of form "s=low:high"
-	if low < high {
-		fmt.Fprintf(&buf, "?s=%d:%d", low, high) // no need for URL escaping
-		// if we have a selection, position the page
-		// such that the selection is a bit below the top
-		line -= 10
-		if line < 1 {
-			line = 1
-		}
-	}
-	// line id's in html-printed source are of the
-	// form "L%d" where %d stands for the line number
-	if line > 0 {
-		fmt.Fprintf(&buf, "#L%d", line) // no need for URL escaping
-	}
-	return buf.String()
-}
-
-func srcLinkFunc(s string) string {
-	s = pathpkg.Clean("/" + s)
-	if !strings.HasPrefix(s, "/src/") {
-		s = "/src" + s
-	}
-	return s
-}
-
-// queryLinkFunc returns a URL for a line in a source file with a highlighted
-// query term.
-// s is expected to be a path to a source file.
-// query is expected to be a string that has already been appropriately escaped
-// for use in a URL query.
-func queryLinkFunc(s, query string, line int) string {
-	url := pathpkg.Clean("/"+s) + "?h=" + query
-	if line > 0 {
-		url += "#L" + strconv.Itoa(line)
-	}
-	return url
-}
-
-func docLinkFunc(s string, ident string) string {
-	return pathpkg.Clean("/pkg/"+s) + "/#" + ident
-}
-
-func (p *Presentation) example_textFunc(info *PageInfo, funcName, indent string) string {
-	if !p.ShowExamples {
-		return ""
-	}
-
-	var buf bytes.Buffer
-	first := true
-	for _, eg := range info.Examples {
-		name := stripExampleSuffix(eg.Name)
-		if name != funcName {
-			continue
-		}
-
-		if !first {
-			buf.WriteString("\n")
-		}
-		first = false
-
-		// print code
-		cnode := &printer.CommentedNode{Node: eg.Code, Comments: eg.Comments}
-		config := &printer.Config{Mode: printer.UseSpaces, Tabwidth: p.TabWidth}
-		var buf1 bytes.Buffer
-		config.Fprint(&buf1, info.FSet, cnode)
-		code := buf1.String()
-
-		// Additional formatting if this is a function body. Unfortunately, we
-		// can't print statements individually because we would lose comments
-		// on later statements.
-		if n := len(code); n >= 2 && code[0] == '{' && code[n-1] == '}' {
-			// remove surrounding braces
-			code = code[1 : n-1]
-			// unindent
-			code = replaceLeadingIndentation(code, strings.Repeat(" ", p.TabWidth), indent)
-		}
-		code = strings.Trim(code, "\n")
-
-		buf.WriteString(indent)
-		buf.WriteString("Example:\n")
-		buf.WriteString(code)
-		buf.WriteString("\n\n")
-	}
-	return buf.String()
-}
-
-func (p *Presentation) example_htmlFunc(info *PageInfo, funcName string) string {
-	var buf bytes.Buffer
-	for _, eg := range info.Examples {
-		name := stripExampleSuffix(eg.Name)
-
-		if name != funcName {
-			continue
-		}
-
-		// print code
-		cnode := &printer.CommentedNode{Node: eg.Code, Comments: eg.Comments}
-		code := p.node_htmlFunc(info, cnode, true)
-		out := eg.Output
-		wholeFile := true
-
-		// Additional formatting if this is a function body.
-		if n := len(code); n >= 2 && code[0] == '{' && code[n-1] == '}' {
-			wholeFile = false
-			// remove surrounding braces
-			code = code[1 : n-1]
-			// unindent
-			code = replaceLeadingIndentation(code, strings.Repeat(" ", p.TabWidth), "")
-			// remove output comment
-			if loc := exampleOutputRx.FindStringIndex(code); loc != nil {
-				code = strings.TrimSpace(code[:loc[0]])
-			}
-		}
-
-		// Write out the playground code in standard Go style
-		// (use tabs, no comment highlight, etc).
-		play := ""
-		if eg.Play != nil && p.ShowPlayground {
-			var buf bytes.Buffer
-			if err := format.Node(&buf, info.FSet, eg.Play); err != nil {
-				log.Print(err)
-			} else {
-				play = buf.String()
-			}
-		}
-
-		// Drop output, as the output comment will appear in the code.
-		if wholeFile && play == "" {
-			out = ""
-		}
-
-		if p.ExampleHTML == nil {
-			out = ""
-			return ""
-		}
-
-		err := p.ExampleHTML.Execute(&buf, struct {
-			Name, Doc, Code, Play, Output string
-			GoogleCN                      bool
-		}{eg.Name, eg.Doc, code, play, out, info.GoogleCN})
-		if err != nil {
-			log.Print(err)
-		}
-	}
-	return buf.String()
-}
-
-// example_nameFunc takes an example function name and returns its display
-// name. For example, "Foo_Bar_quux" becomes "Foo.Bar (Quux)".
-func (p *Presentation) example_nameFunc(s string) string {
-	name, suffix := splitExampleName(s)
-	// replace _ with . for method names
-	name = strings.Replace(name, "_", ".", 1)
-	// use "Package" if no name provided
-	if name == "" {
-		name = "Package"
-	}
-	return name + suffix
-}
-
-// example_suffixFunc takes an example function name and returns its suffix in
-// parenthesized form. For example, "Foo_Bar_quux" becomes " (Quux)".
-func (p *Presentation) example_suffixFunc(name string) string {
-	_, suffix := splitExampleName(name)
-	return suffix
-}
-
-// implements_html returns the "> Implements" toggle for a package-level named type.
-// Its contents are populated from JSON data by client-side JS at load time.
-func (p *Presentation) implements_htmlFunc(info *PageInfo, typeName string) string {
-	if p.ImplementsHTML == nil {
-		return ""
-	}
-	index, ok := info.TypeInfoIndex[typeName]
-	if !ok {
-		return ""
-	}
-	var buf bytes.Buffer
-	err := p.ImplementsHTML.Execute(&buf, struct{ Index int }{index})
-	if err != nil {
-		log.Print(err)
-	}
-	return buf.String()
-}
-
-// methodset_html returns the "> Method set" toggle for a package-level named type.
-// Its contents are populated from JSON data by client-side JS at load time.
-func (p *Presentation) methodset_htmlFunc(info *PageInfo, typeName string) string {
-	if p.MethodSetHTML == nil {
-		return ""
-	}
-	index, ok := info.TypeInfoIndex[typeName]
-	if !ok {
-		return ""
-	}
-	var buf bytes.Buffer
-	err := p.MethodSetHTML.Execute(&buf, struct{ Index int }{index})
-	if err != nil {
-		log.Print(err)
-	}
-	return buf.String()
-}
-
-// callgraph_html returns the "> Call graph" toggle for a package-level func.
-// Its contents are populated from JSON data by client-side JS at load time.
-func (p *Presentation) callgraph_htmlFunc(info *PageInfo, recv, name string) string {
-	if p.CallGraphHTML == nil {
-		return ""
-	}
-	if recv != "" {
-		// Format must match (*ssa.Function).RelString().
-		name = fmt.Sprintf("(%s).%s", recv, name)
-	}
-	index, ok := info.CallGraphIndex[name]
-	if !ok {
-		return ""
-	}
-	var buf bytes.Buffer
-	err := p.CallGraphHTML.Execute(&buf, struct{ Index int }{index})
-	if err != nil {
-		log.Print(err)
-	}
-	return buf.String()
-}
-
-func noteTitle(note string) string {
-	return strings.Title(strings.ToLower(note))
-}
-
-func startsWithUppercase(s string) bool {
-	r, _ := utf8.DecodeRuneInString(s)
-	return unicode.IsUpper(r)
-}
-
-var exampleOutputRx = regexp.MustCompile(`(?i)//[[:space:]]*(unordered )?output:`)
-
-// stripExampleSuffix strips lowercase braz in Foo_braz or Foo_Bar_braz from name
-// while keeping uppercase Braz in Foo_Braz.
-func stripExampleSuffix(name string) string {
-	if i := strings.LastIndex(name, "_"); i != -1 {
-		if i < len(name)-1 && !startsWithUppercase(name[i+1:]) {
-			name = name[:i]
-		}
-	}
-	return name
-}
-
-func splitExampleName(s string) (name, suffix string) {
-	i := strings.LastIndex(s, "_")
-	if 0 <= i && i < len(s)-1 && !startsWithUppercase(s[i+1:]) {
-		name = s[:i]
-		suffix = " (" + strings.Title(s[i+1:]) + ")"
-		return
-	}
-	name = s
-	return
-}
-
-// replaceLeadingIndentation replaces oldIndent at the beginning of each line
-// with newIndent. This is used for formatting examples. Raw strings that
-// span multiple lines are handled specially: oldIndent is not removed (since
-// go/printer will not add any indentation there), but newIndent is added
-// (since we may still want leading indentation).
-func replaceLeadingIndentation(body, oldIndent, newIndent string) string {
-	// Handle indent at the beginning of the first line. After this, we handle
-	// indentation only after a newline.
-	var buf bytes.Buffer
-	if strings.HasPrefix(body, oldIndent) {
-		buf.WriteString(newIndent)
-		body = body[len(oldIndent):]
-	}
-
-	// Use a state machine to keep track of whether we're in a string or
-	// rune literal while we process the rest of the code.
-	const (
-		codeState = iota
-		runeState
-		interpretedStringState
-		rawStringState
-	)
-	searchChars := []string{
-		"'\"`\n", // codeState
-		`\'`,     // runeState
-		`\"`,     // interpretedStringState
-		"`\n",    // rawStringState
-		// newlineState does not need to search
-	}
-	state := codeState
-	for {
-		i := strings.IndexAny(body, searchChars[state])
-		if i < 0 {
-			buf.WriteString(body)
-			break
-		}
-		c := body[i]
-		buf.WriteString(body[:i+1])
-		body = body[i+1:]
-		switch state {
-		case codeState:
-			switch c {
-			case '\'':
-				state = runeState
-			case '"':
-				state = interpretedStringState
-			case '`':
-				state = rawStringState
-			case '\n':
-				if strings.HasPrefix(body, oldIndent) {
-					buf.WriteString(newIndent)
-					body = body[len(oldIndent):]
-				}
-			}
-
-		case runeState:
-			switch c {
-			case '\\':
-				r, size := utf8.DecodeRuneInString(body)
-				buf.WriteRune(r)
-				body = body[size:]
-			case '\'':
-				state = codeState
-			}
-
-		case interpretedStringState:
-			switch c {
-			case '\\':
-				r, size := utf8.DecodeRuneInString(body)
-				buf.WriteRune(r)
-				body = body[size:]
-			case '"':
-				state = codeState
-			}
-
-		case rawStringState:
-			switch c {
-			case '`':
-				state = codeState
-			case '\n':
-				buf.WriteString(newIndent)
-			}
-		}
-	}
-	return buf.String()
-}
-
-// Write an AST node to w.
-func (p *Presentation) writeNode(w io.Writer, fset *token.FileSet, x interface{}) {
-	// convert trailing tabs into spaces using a tconv filter
-	// to ensure a good outcome in most browsers (there may still
-	// be tabs in comments and strings, but converting those into
-	// the right number of spaces is much harder)
-	//
-	// TODO(gri) rethink printer flags - perhaps tconv can be eliminated
-	//           with an another printer mode (which is more efficiently
-	//           implemented in the printer than here with another layer)
-	mode := printer.TabIndent | printer.UseSpaces
-	err := (&printer.Config{Mode: mode, Tabwidth: p.TabWidth}).Fprint(&tconv{p: p, output: w}, fset, x)
-	if err != nil {
-		log.Print(err)
-	}
-}
-
-// WriteNode writes x to w.
-// TODO(bgarcia) Is this method needed? It's just a wrapper for p.writeNode.
-func (p *Presentation) WriteNode(w io.Writer, fset *token.FileSet, x interface{}) {
-	p.writeNode(w, fset, x)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/godoc17_test.go b/installer/vendor/golang.org/x/tools/godoc/godoc17_test.go
deleted file mode 100644
index d153991c78..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/godoc17_test.go
+++ /dev/null
@@ -1,35 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build go1.7
-
-package godoc
-
-import (
-	"bytes"
-	"fmt"
-	"testing"
-)
-
-// Verify that scanIdentifier isn't quadratic.
-// This doesn't actually measure and fail on its own, but it was previously
-// very obvious when running by hand.
-//
-// TODO: if there's a reliable and non-flaky way to test this, do so.
-// Maybe count user CPU time instead of wall time? But that's not easy
-// to do portably in Go.
-func TestStructField(t *testing.T) {
-	for _, n := range []int{10, 100, 1000, 10000} {
-		n := n
-		t.Run(fmt.Sprint(n), func(t *testing.T) {
-			var buf bytes.Buffer
-			fmt.Fprintf(&buf, "package foo\n\ntype T struct {\n")
-			for i := 0; i < n; i++ {
-				fmt.Fprintf(&buf, "\t// Field%d is foo.\n\tField%d int\n\n", i, i)
-			}
-			fmt.Fprintf(&buf, "}\n")
-			linkifySource(t, buf.Bytes())
-		})
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/godoc_test.go b/installer/vendor/golang.org/x/tools/godoc/godoc_test.go
deleted file mode 100644
index c1d631c157..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/godoc_test.go
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"go/parser"
-	"go/token"
-	"strings"
-	"testing"
-)
-
-func TestPkgLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		path string
-		want string
-	}{
-		{"/src/fmt", "pkg/fmt"},
-		{"src/fmt", "pkg/fmt"},
-		{"/fmt", "pkg/fmt"},
-		{"fmt", "pkg/fmt"},
-	} {
-		if got := pkgLinkFunc(tc.path); got != tc.want {
-			t.Errorf("pkgLinkFunc(%v) = %v; want %v", tc.path, got, tc.want)
-		}
-	}
-}
-
-func TestSrcPosLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		src  string
-		line int
-		low  int
-		high int
-		want string
-	}{
-		{"/src/fmt/print.go", 42, 30, 50, "/src/fmt/print.go?s=30:50#L32"},
-		{"/src/fmt/print.go", 2, 1, 5, "/src/fmt/print.go?s=1:5#L1"},
-		{"/src/fmt/print.go", 2, 0, 0, "/src/fmt/print.go#L2"},
-		{"/src/fmt/print.go", 0, 0, 0, "/src/fmt/print.go"},
-		{"/src/fmt/print.go", 0, 1, 5, "/src/fmt/print.go?s=1:5#L1"},
-		{"fmt/print.go", 0, 0, 0, "/src/fmt/print.go"},
-		{"fmt/print.go", 0, 1, 5, "/src/fmt/print.go?s=1:5#L1"},
-	} {
-		if got := srcPosLinkFunc(tc.src, tc.line, tc.low, tc.high); got != tc.want {
-			t.Errorf("srcLinkFunc(%v, %v, %v, %v) = %v; want %v", tc.src, tc.line, tc.low, tc.high, got, tc.want)
-		}
-	}
-}
-
-func TestSrcLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		src  string
-		want string
-	}{
-		{"/src/fmt/print.go", "/src/fmt/print.go"},
-		{"src/fmt/print.go", "/src/fmt/print.go"},
-		{"/fmt/print.go", "/src/fmt/print.go"},
-		{"fmt/print.go", "/src/fmt/print.go"},
-	} {
-		if got := srcLinkFunc(tc.src); got != tc.want {
-			t.Errorf("srcLinkFunc(%v) = %v; want %v", tc.src, got, tc.want)
-		}
-	}
-}
-
-func TestQueryLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		src   string
-		query string
-		line  int
-		want  string
-	}{
-		{"/src/fmt/print.go", "Sprintf", 33, "/src/fmt/print.go?h=Sprintf#L33"},
-		{"/src/fmt/print.go", "Sprintf", 0, "/src/fmt/print.go?h=Sprintf"},
-		{"src/fmt/print.go", "EOF", 33, "/src/fmt/print.go?h=EOF#L33"},
-		{"src/fmt/print.go", "a%3f+%26b", 1, "/src/fmt/print.go?h=a%3f+%26b#L1"},
-	} {
-		if got := queryLinkFunc(tc.src, tc.query, tc.line); got != tc.want {
-			t.Errorf("queryLinkFunc(%v, %v, %v) = %v; want %v", tc.src, tc.query, tc.line, got, tc.want)
-		}
-	}
-}
-
-func TestDocLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		src   string
-		ident string
-		want  string
-	}{
-		{"fmt", "Sprintf", "/pkg/fmt/#Sprintf"},
-		{"fmt", "EOF", "/pkg/fmt/#EOF"},
-	} {
-		if got := docLinkFunc(tc.src, tc.ident); got != tc.want {
-			t.Errorf("docLinkFunc(%v, %v) = %v; want %v", tc.src, tc.ident, got, tc.want)
-		}
-	}
-}
-
-func TestSanitizeFunc(t *testing.T) {
-	for _, tc := range []struct {
-		src  string
-		want string
-	}{
-		{},
-		{"foo", "foo"},
-		{"func   f()", "func f()"},
-		{"func f(a int,)", "func f(a int)"},
-		{"func f(a int,\n)", "func f(a int)"},
-		{"func f(\n\ta int,\n\tb int,\n\tc int,\n)", "func f(a int, b int, c int)"},
-		{"  (   a,   b,  c  )  ", "(a, b, c)"},
-		{"(  a,  b, c    int, foo   bar  ,  )", "(a, b, c int, foo bar)"},
-		{"{   a,   b}", "{a, b}"},
-		{"[   a,   b]", "[a, b]"},
-	} {
-		if got := sanitizeFunc(tc.src); got != tc.want {
-			t.Errorf("sanitizeFunc(%v) = %v; want %v", tc.src, got, tc.want)
-		}
-	}
-}
-
-// Test that we add <span id="StructName.FieldName"> elements
-// to the HTML of struct fields.
-func TestStructFieldsIDAttributes(t *testing.T) {
-	got := linkifySource(t, []byte(`
-package foo
-
-type T struct {
-	NoDoc string
-
-	// Doc has a comment.
-	Doc string
-
-	// Opt, if non-nil, is an option.
-	Opt *int
-
-	// Опция - другое поле.
-	Опция bool
-}
-`))
-	want := `type T struct {
-<span id="T.NoDoc"></span>NoDoc <a href="/pkg/builtin/#string">string</a>
-
-<span id="T.Doc"></span><span class="comment">// Doc has a comment.</span>
-Doc <a href="/pkg/builtin/#string">string</a>
-
-<span id="T.Opt"></span><span class="comment">// Opt, if non-nil, is an option.</span>
-Opt *<a href="/pkg/builtin/#int">int</a>
-
-<span id="T.Опция"></span><span class="comment">// Опция - другое поле.</span>
-Опция <a href="/pkg/builtin/#bool">bool</a>
-}`
-	if got != want {
-		t.Errorf("got: %s\n\nwant: %s\n", got, want)
-	}
-}
-
-// Test that we add <span id="ConstName"> elements to the HTML
-// of definitions in const and var specs.
-func TestValueSpecIDAttributes(t *testing.T) {
-	got := linkifySource(t, []byte(`
-package foo
-
-const (
-	NoDoc string = "NoDoc"
-
-	// Doc has a comment
-	Doc = "Doc"
-
-	NoVal
-)`))
-	want := `const (
-<span id="NoDoc">NoDoc</span> <a href="/pkg/builtin/#string">string</a> = &#34;NoDoc&#34;
-
-<span class="comment">// Doc has a comment</span>
-<span id="Doc">Doc</span> = &#34;Doc&#34;
-
-<span id="NoVal">NoVal</span>
-)`
-	if got != want {
-		t.Errorf("got: %s\n\nwant: %s\n", got, want)
-	}
-}
-
-func TestCompositeLitLinkFields(t *testing.T) {
-	got := linkifySource(t, []byte(`
-package foo
-
-type T struct {
-	X int
-}
-
-var S T = T{X: 12}`))
-	want := `type T struct {
-<span id="T.X"></span>X <a href="/pkg/builtin/#int">int</a>
-}
-var <span id="S">S</span> <a href="#T">T</a> = <a href="#T">T</a>{<a href="#T.X">X</a>: 12}`
-	if got != want {
-		t.Errorf("got: %s\n\nwant: %s\n", got, want)
-	}
-}
-
-func TestFuncDeclNotLink(t *testing.T) {
-	// Function.
-	got := linkifySource(t, []byte(`
-package http
-
-func Get(url string) (resp *Response, err error)`))
-	want := `func Get(url <a href="/pkg/builtin/#string">string</a>) (resp *<a href="#Response">Response</a>, err <a href="/pkg/builtin/#error">error</a>)`
-	if got != want {
-		t.Errorf("got: %s\n\nwant: %s\n", got, want)
-	}
-
-	// Method.
-	got = linkifySource(t, []byte(`
-package http
-
-func (h Header) Get(key string) string`))
-	want = `func (h <a href="#Header">Header</a>) Get(key <a href="/pkg/builtin/#string">string</a>) <a href="/pkg/builtin/#string">string</a>`
-	if got != want {
-		t.Errorf("got: %s\n\nwant: %s\n", got, want)
-	}
-}
-
-func linkifySource(t *testing.T, src []byte) string {
-	p := &Presentation{
-		DeclLinks: true,
-	}
-	fset := token.NewFileSet()
-	af, err := parser.ParseFile(fset, "foo.go", src, parser.ParseComments)
-	if err != nil {
-		t.Fatal(err)
-	}
-	var buf bytes.Buffer
-	pi := &PageInfo{
-		FSet: fset,
-	}
-	sep := ""
-	for _, decl := range af.Decls {
-		buf.WriteString(sep)
-		sep = "\n"
-		buf.WriteString(p.node_htmlFunc(pi, decl, true))
-	}
-	return buf.String()
-}
-
-func TestScanIdentifier(t *testing.T) {
-	tests := []struct {
-		in, want string
-	}{
-		{"foo bar", "foo"},
-		{"foo/bar", "foo"},
-		{" foo", ""},
-		{"фоо", "фоо"},
-		{"f123", "f123"},
-		{"123f", ""},
-	}
-	for _, tt := range tests {
-		got := scanIdentifier([]byte(tt.in))
-		if string(got) != tt.want {
-			t.Errorf("scanIdentifier(%q) = %q; want %q", tt.in, got, tt.want)
-		}
-	}
-}
-
-func TestReplaceLeadingIndentation(t *testing.T) {
-	oldIndent := strings.Repeat(" ", 2)
-	newIndent := strings.Repeat(" ", 4)
-	tests := []struct {
-		src, want string
-	}{
-		{"  foo\n    bar\n  baz", "    foo\n      bar\n    baz"},
-		{"  '`'\n  '`'\n", "    '`'\n    '`'\n"},
-		{"  '\\''\n  '`'\n", "    '\\''\n    '`'\n"},
-		{"  \"`\"\n  \"`\"\n", "    \"`\"\n    \"`\"\n"},
-		{"  `foo\n  bar`", "    `foo\n      bar`"},
-		{"  `foo\\`\n  bar", "    `foo\\`\n    bar"},
-		{"  '\\`'`foo\n  bar", "    '\\`'`foo\n      bar"},
-		{
-			"  if true {\n    foo := `One\n    \tTwo\nThree`\n  }\n",
-			"    if true {\n      foo := `One\n        \tTwo\n    Three`\n    }\n",
-		},
-	}
-	for _, tc := range tests {
-		if got := replaceLeadingIndentation(tc.src, oldIndent, newIndent); got != tc.want {
-			t.Errorf("replaceLeadingIndentation:\n%v\n---\nhave:\n%v\n---\nwant:\n%v\n",
-				tc.src, got, tc.want)
-		}
-	}
-}
-
-func TestSrcBreadcrumbFunc(t *testing.T) {
-	for _, tc := range []struct {
-		path string
-		want string
-	}{
-		{"src/", `<span class="text-muted">src/</span>`},
-		{"src/fmt/", `<a href="/src">src</a>/<span class="text-muted">fmt/</span>`},
-		{"src/fmt/print.go", `<a href="/src">src</a>/<a href="/src/fmt">fmt</a>/<span class="text-muted">print.go</span>`},
-	} {
-		if got := srcBreadcrumbFunc(tc.path); got != tc.want {
-			t.Errorf("srcBreadcrumbFunc(%v) = %v; want %v", tc.path, got, tc.want)
-		}
-	}
-}
-
-func TestSrcToPkgLinkFunc(t *testing.T) {
-	for _, tc := range []struct {
-		path string
-		want string
-	}{
-		{"src/", `<a href="/pkg">Index</a>`},
-		{"src/fmt/", `<a href="/pkg/fmt">fmt</a>`},
-		{"pkg/", `<a href="/pkg">Index</a>`},
-		{"pkg/LICENSE", `<a href="/pkg">Index</a>`},
-	} {
-		if got := srcToPkgLinkFunc(tc.path); got != tc.want {
-			t.Errorf("srcToPkgLinkFunc(%v) = %v; want %v", tc.path, got, tc.want)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/index.go b/installer/vendor/golang.org/x/tools/godoc/index.go
deleted file mode 100644
index 8cefd1423d..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/index.go
+++ /dev/null
@@ -1,1581 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains the infrastructure to create an
-// identifier and full-text index for a set of Go files.
-//
-// Algorithm for identifier index:
-// - traverse all .go files of the file tree specified by root
-// - for each identifier (word) encountered, collect all occurrences (spots)
-//   into a list; this produces a list of spots for each word
-// - reduce the lists: from a list of spots to a list of FileRuns,
-//   and from a list of FileRuns into a list of PakRuns
-// - make a HitList from the PakRuns
-//
-// Details:
-// - keep two lists per word: one containing package-level declarations
-//   that have snippets, and one containing all other spots
-// - keep the snippets in a separate table indexed by snippet index
-//   and store the snippet index in place of the line number in a SpotInfo
-//   (the line number for spots with snippets is stored in the snippet)
-// - at the end, create lists of alternative spellings for a given
-//   word
-//
-// Algorithm for full text index:
-// - concatenate all source code in a byte buffer (in memory)
-// - add the files to a file set in lockstep as they are added to the byte
-//   buffer such that a byte buffer offset corresponds to the Pos value for
-//   that file location
-// - create a suffix array from the concatenated sources
-//
-// String lookup in full text index:
-// - use the suffix array to lookup a string's offsets - the offsets
-//   correspond to the Pos values relative to the file set
-// - translate the Pos values back into file and line information and
-//   sort the result
-
-package godoc
-
-import (
-	"bufio"
-	"bytes"
-	"encoding/gob"
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/doc"
-	"go/parser"
-	"go/token"
-	"index/suffixarray"
-	"io"
-	"log"
-	"os"
-	pathpkg "path"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"sort"
-	"strconv"
-	"strings"
-	"sync"
-	"time"
-	"unicode"
-
-	"golang.org/x/tools/godoc/util"
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// ----------------------------------------------------------------------------
-// InterfaceSlice is a helper type for sorting interface
-// slices according to some slice-specific sort criteria.
-
-type comparer func(x, y interface{}) bool
-
-type interfaceSlice struct {
-	slice []interface{}
-	less  comparer
-}
-
-// ----------------------------------------------------------------------------
-// RunList
-
-// A RunList is a list of entries that can be sorted according to some
-// criteria. A RunList may be compressed by grouping "runs" of entries
-// which are equal (according to the sort critera) into a new RunList of
-// runs. For instance, a RunList containing pairs (x, y) may be compressed
-// into a RunList containing pair runs (x, {y}) where each run consists of
-// a list of y's with the same x.
-type RunList []interface{}
-
-func (h RunList) sort(less comparer) {
-	sort.Sort(&interfaceSlice{h, less})
-}
-
-func (p *interfaceSlice) Len() int           { return len(p.slice) }
-func (p *interfaceSlice) Less(i, j int) bool { return p.less(p.slice[i], p.slice[j]) }
-func (p *interfaceSlice) Swap(i, j int)      { p.slice[i], p.slice[j] = p.slice[j], p.slice[i] }
-
-// Compress entries which are the same according to a sort criteria
-// (specified by less) into "runs".
-func (h RunList) reduce(less comparer, newRun func(h RunList) interface{}) RunList {
-	if len(h) == 0 {
-		return nil
-	}
-	// len(h) > 0
-
-	// create runs of entries with equal values
-	h.sort(less)
-
-	// for each run, make a new run object and collect them in a new RunList
-	var hh RunList
-	i, x := 0, h[0]
-	for j, y := range h {
-		if less(x, y) {
-			hh = append(hh, newRun(h[i:j]))
-			i, x = j, h[j] // start a new run
-		}
-	}
-	// add final run, if any
-	if i < len(h) {
-		hh = append(hh, newRun(h[i:]))
-	}
-
-	return hh
-}
-
-// ----------------------------------------------------------------------------
-// KindRun
-
-// Debugging support. Disable to see multiple entries per line.
-const removeDuplicates = true
-
-// A KindRun is a run of SpotInfos of the same kind in a given file.
-// The kind (3 bits) is stored in each SpotInfo element; to find the
-// kind of a KindRun, look at any of its elements.
-type KindRun []SpotInfo
-
-// KindRuns are sorted by line number or index. Since the isIndex bit
-// is always the same for all infos in one list we can compare lori's.
-func (k KindRun) Len() int           { return len(k) }
-func (k KindRun) Less(i, j int) bool { return k[i].Lori() < k[j].Lori() }
-func (k KindRun) Swap(i, j int)      { k[i], k[j] = k[j], k[i] }
-
-// FileRun contents are sorted by Kind for the reduction into KindRuns.
-func lessKind(x, y interface{}) bool { return x.(SpotInfo).Kind() < y.(SpotInfo).Kind() }
-
-// newKindRun allocates a new KindRun from the SpotInfo run h.
-func newKindRun(h RunList) interface{} {
-	run := make(KindRun, len(h))
-	for i, x := range h {
-		run[i] = x.(SpotInfo)
-	}
-
-	// Spots were sorted by file and kind to create this run.
-	// Within this run, sort them by line number or index.
-	sort.Sort(run)
-
-	if removeDuplicates {
-		// Since both the lori and kind field must be
-		// same for duplicates, and since the isIndex
-		// bit is always the same for all infos in one
-		// list we can simply compare the entire info.
-		k := 0
-		prev := SpotInfo(1<<32 - 1) // an unlikely value
-		for _, x := range run {
-			if x != prev {
-				run[k] = x
-				k++
-				prev = x
-			}
-		}
-		run = run[0:k]
-	}
-
-	return run
-}
-
-// ----------------------------------------------------------------------------
-// FileRun
-
-// A Pak describes a Go package.
-type Pak struct {
-	Path string // path of directory containing the package
-	Name string // package name as declared by package clause
-}
-
-// Paks are sorted by name (primary key) and by import path (secondary key).
-func (p *Pak) less(q *Pak) bool {
-	return p.Name < q.Name || p.Name == q.Name && p.Path < q.Path
-}
-
-// A File describes a Go file.
-type File struct {
-	Name string // directory-local file name
-	Pak  *Pak   // the package to which the file belongs
-}
-
-// Path returns the file path of f.
-func (f *File) Path() string {
-	return pathpkg.Join(f.Pak.Path, f.Name)
-}
-
-// A Spot describes a single occurrence of a word.
-type Spot struct {
-	File *File
-	Info SpotInfo
-}
-
-// A FileRun is a list of KindRuns belonging to the same file.
-type FileRun struct {
-	File   *File
-	Groups []KindRun
-}
-
-// Spots are sorted by file path for the reduction into FileRuns.
-func lessSpot(x, y interface{}) bool {
-	fx := x.(Spot).File
-	fy := y.(Spot).File
-	// same as "return fx.Path() < fy.Path()" but w/o computing the file path first
-	px := fx.Pak.Path
-	py := fy.Pak.Path
-	return px < py || px == py && fx.Name < fy.Name
-}
-
-// newFileRun allocates a new FileRun from the Spot run h.
-func newFileRun(h RunList) interface{} {
-	file := h[0].(Spot).File
-
-	// reduce the list of Spots into a list of KindRuns
-	h1 := make(RunList, len(h))
-	for i, x := range h {
-		h1[i] = x.(Spot).Info
-	}
-	h2 := h1.reduce(lessKind, newKindRun)
-
-	// create the FileRun
-	groups := make([]KindRun, len(h2))
-	for i, x := range h2 {
-		groups[i] = x.(KindRun)
-	}
-	return &FileRun{file, groups}
-}
-
-// ----------------------------------------------------------------------------
-// PakRun
-
-// A PakRun describes a run of *FileRuns of a package.
-type PakRun struct {
-	Pak   *Pak
-	Files []*FileRun
-}
-
-// Sorting support for files within a PakRun.
-func (p *PakRun) Len() int           { return len(p.Files) }
-func (p *PakRun) Less(i, j int) bool { return p.Files[i].File.Name < p.Files[j].File.Name }
-func (p *PakRun) Swap(i, j int)      { p.Files[i], p.Files[j] = p.Files[j], p.Files[i] }
-
-// FileRuns are sorted by package for the reduction into PakRuns.
-func lessFileRun(x, y interface{}) bool {
-	return x.(*FileRun).File.Pak.less(y.(*FileRun).File.Pak)
-}
-
-// newPakRun allocates a new PakRun from the *FileRun run h.
-func newPakRun(h RunList) interface{} {
-	pak := h[0].(*FileRun).File.Pak
-	files := make([]*FileRun, len(h))
-	for i, x := range h {
-		files[i] = x.(*FileRun)
-	}
-	run := &PakRun{pak, files}
-	sort.Sort(run) // files were sorted by package; sort them by file now
-	return run
-}
-
-// ----------------------------------------------------------------------------
-// HitList
-
-// A HitList describes a list of PakRuns.
-type HitList []*PakRun
-
-// PakRuns are sorted by package.
-func lessPakRun(x, y interface{}) bool { return x.(*PakRun).Pak.less(y.(*PakRun).Pak) }
-
-func reduce(h0 RunList) HitList {
-	// reduce a list of Spots into a list of FileRuns
-	h1 := h0.reduce(lessSpot, newFileRun)
-	// reduce a list of FileRuns into a list of PakRuns
-	h2 := h1.reduce(lessFileRun, newPakRun)
-	// sort the list of PakRuns by package
-	h2.sort(lessPakRun)
-	// create a HitList
-	h := make(HitList, len(h2))
-	for i, p := range h2 {
-		h[i] = p.(*PakRun)
-	}
-	return h
-}
-
-// filter returns a new HitList created by filtering
-// all PakRuns from h that have a matching pakname.
-func (h HitList) filter(pakname string) HitList {
-	var hh HitList
-	for _, p := range h {
-		if p.Pak.Name == pakname {
-			hh = append(hh, p)
-		}
-	}
-	return hh
-}
-
-// ----------------------------------------------------------------------------
-// AltWords
-
-type wordPair struct {
-	canon string // canonical word spelling (all lowercase)
-	alt   string // alternative spelling
-}
-
-// An AltWords describes a list of alternative spellings for a
-// canonical (all lowercase) spelling of a word.
-type AltWords struct {
-	Canon string   // canonical word spelling (all lowercase)
-	Alts  []string // alternative spelling for the same word
-}
-
-// wordPairs are sorted by their canonical spelling.
-func lessWordPair(x, y interface{}) bool { return x.(*wordPair).canon < y.(*wordPair).canon }
-
-// newAltWords allocates a new AltWords from the *wordPair run h.
-func newAltWords(h RunList) interface{} {
-	canon := h[0].(*wordPair).canon
-	alts := make([]string, len(h))
-	for i, x := range h {
-		alts[i] = x.(*wordPair).alt
-	}
-	return &AltWords{canon, alts}
-}
-
-func (a *AltWords) filter(s string) *AltWords {
-	var alts []string
-	for _, w := range a.Alts {
-		if w != s {
-			alts = append(alts, w)
-		}
-	}
-	if len(alts) > 0 {
-		return &AltWords{a.Canon, alts}
-	}
-	return nil
-}
-
-// Ident stores information about external identifiers in order to create
-// links to package documentation.
-type Ident struct {
-	Path    string // e.g. "net/http"
-	Package string // e.g. "http"
-	Name    string // e.g. "NewRequest"
-	Doc     string // e.g. "NewRequest returns a new Request..."
-}
-
-// byImportCount sorts the given slice of Idents by the import
-// counts of the packages to which they belong.
-type byImportCount struct {
-	Idents      []Ident
-	ImportCount map[string]int
-}
-
-func (ic byImportCount) Len() int {
-	return len(ic.Idents)
-}
-
-func (ic byImportCount) Less(i, j int) bool {
-	ri := ic.ImportCount[ic.Idents[i].Path]
-	rj := ic.ImportCount[ic.Idents[j].Path]
-	if ri == rj {
-		return ic.Idents[i].Path < ic.Idents[j].Path
-	}
-	return ri > rj
-}
-
-func (ic byImportCount) Swap(i, j int) {
-	ic.Idents[i], ic.Idents[j] = ic.Idents[j], ic.Idents[i]
-}
-
-func (ic byImportCount) String() string {
-	buf := bytes.NewBuffer([]byte("["))
-	for _, v := range ic.Idents {
-		buf.WriteString(fmt.Sprintf("\n\t%s, %s (%d)", v.Path, v.Name, ic.ImportCount[v.Path]))
-	}
-	buf.WriteString("\n]")
-	return buf.String()
-}
-
-// filter creates a new Ident list where the results match the given
-// package name.
-func (ic byImportCount) filter(pakname string) []Ident {
-	if ic.Idents == nil {
-		return nil
-	}
-	var res []Ident
-	for _, i := range ic.Idents {
-		if i.Package == pakname {
-			res = append(res, i)
-		}
-	}
-	return res
-}
-
-// top returns the top n identifiers.
-func (ic byImportCount) top(n int) []Ident {
-	if len(ic.Idents) > n {
-		return ic.Idents[:n]
-	}
-	return ic.Idents
-}
-
-// ----------------------------------------------------------------------------
-// Indexer
-
-type IndexResult struct {
-	Decls  RunList // package-level declarations (with snippets)
-	Others RunList // all other occurrences
-}
-
-// Statistics provides statistics information for an index.
-type Statistics struct {
-	Bytes int // total size of indexed source files
-	Files int // number of indexed source files
-	Lines int // number of lines (all files)
-	Words int // number of different identifiers
-	Spots int // number of identifier occurrences
-}
-
-// An Indexer maintains the data structures and provides the machinery
-// for indexing .go files under a file tree. It implements the path.Visitor
-// interface for walking file trees, and the ast.Visitor interface for
-// walking Go ASTs.
-type Indexer struct {
-	c          *Corpus
-	fset       *token.FileSet // file set for all indexed files
-	fsOpenGate chan bool      // send pre fs.Open; receive on close
-
-	mu            sync.Mutex              // guards all the following
-	sources       bytes.Buffer            // concatenated sources
-	strings       map[string]string       // interned string
-	packages      map[Pak]*Pak            // interned *Paks
-	words         map[string]*IndexResult // RunLists of Spots
-	snippets      []*Snippet              // indices are stored in SpotInfos
-	current       *token.File             // last file added to file set
-	file          *File                   // AST for current file
-	decl          ast.Decl                // AST for current decl
-	stats         Statistics
-	throttle      *util.Throttle
-	importCount   map[string]int                 // package path ("net/http") => count
-	packagePath   map[string]map[string]bool     // "template" => "text/template" => true
-	exports       map[string]map[string]SpotKind // "net/http" => "ListenAndServe" => FuncDecl
-	curPkgExports map[string]SpotKind
-	idents        map[SpotKind]map[string][]Ident // kind => name => list of Idents
-}
-
-func (x *Indexer) intern(s string) string {
-	if s, ok := x.strings[s]; ok {
-		return s
-	}
-	x.strings[s] = s
-	return s
-}
-
-func (x *Indexer) lookupPackage(path, name string) *Pak {
-	// In the source directory tree, more than one package may
-	// live in the same directory. For the packages map, construct
-	// a key that includes both the directory path and the package
-	// name.
-	key := Pak{Path: x.intern(path), Name: x.intern(name)}
-	pak := x.packages[key]
-	if pak == nil {
-		pak = &key
-		x.packages[key] = pak
-	}
-	return pak
-}
-
-func (x *Indexer) addSnippet(s *Snippet) int {
-	index := len(x.snippets)
-	x.snippets = append(x.snippets, s)
-	return index
-}
-
-func (x *Indexer) visitIdent(kind SpotKind, id *ast.Ident) {
-	if id == nil {
-		return
-	}
-	name := x.intern(id.Name)
-
-	switch kind {
-	case TypeDecl, FuncDecl, ConstDecl, VarDecl:
-		x.curPkgExports[name] = kind
-	}
-
-	lists, found := x.words[name]
-	if !found {
-		lists = new(IndexResult)
-		x.words[name] = lists
-	}
-
-	if kind == Use || x.decl == nil {
-		if x.c.IndexGoCode {
-			// not a declaration or no snippet required
-			info := makeSpotInfo(kind, x.current.Line(id.Pos()), false)
-			lists.Others = append(lists.Others, Spot{x.file, info})
-		}
-	} else {
-		// a declaration with snippet
-		index := x.addSnippet(NewSnippet(x.fset, x.decl, id))
-		info := makeSpotInfo(kind, index, true)
-		lists.Decls = append(lists.Decls, Spot{x.file, info})
-	}
-
-	x.stats.Spots++
-}
-
-func (x *Indexer) visitFieldList(kind SpotKind, flist *ast.FieldList) {
-	for _, f := range flist.List {
-		x.decl = nil // no snippets for fields
-		for _, name := range f.Names {
-			x.visitIdent(kind, name)
-		}
-		ast.Walk(x, f.Type)
-		// ignore tag - not indexed at the moment
-	}
-}
-
-func (x *Indexer) visitSpec(kind SpotKind, spec ast.Spec) {
-	switch n := spec.(type) {
-	case *ast.ImportSpec:
-		x.visitIdent(ImportDecl, n.Name)
-		if n.Path != nil {
-			if imp, err := strconv.Unquote(n.Path.Value); err == nil {
-				x.importCount[x.intern(imp)]++
-			}
-		}
-
-	case *ast.ValueSpec:
-		for _, n := range n.Names {
-			x.visitIdent(kind, n)
-		}
-		ast.Walk(x, n.Type)
-		for _, v := range n.Values {
-			ast.Walk(x, v)
-		}
-
-	case *ast.TypeSpec:
-		x.visitIdent(TypeDecl, n.Name)
-		ast.Walk(x, n.Type)
-	}
-}
-
-func (x *Indexer) visitGenDecl(decl *ast.GenDecl) {
-	kind := VarDecl
-	if decl.Tok == token.CONST {
-		kind = ConstDecl
-	}
-	x.decl = decl
-	for _, s := range decl.Specs {
-		x.visitSpec(kind, s)
-	}
-}
-
-func (x *Indexer) Visit(node ast.Node) ast.Visitor {
-	switch n := node.(type) {
-	case nil:
-		// nothing to do
-
-	case *ast.Ident:
-		x.visitIdent(Use, n)
-
-	case *ast.FieldList:
-		x.visitFieldList(VarDecl, n)
-
-	case *ast.InterfaceType:
-		x.visitFieldList(MethodDecl, n.Methods)
-
-	case *ast.DeclStmt:
-		// local declarations should only be *ast.GenDecls;
-		// ignore incorrect ASTs
-		if decl, ok := n.Decl.(*ast.GenDecl); ok {
-			x.decl = nil // no snippets for local declarations
-			x.visitGenDecl(decl)
-		}
-
-	case *ast.GenDecl:
-		x.decl = n
-		x.visitGenDecl(n)
-
-	case *ast.FuncDecl:
-		kind := FuncDecl
-		if n.Recv != nil {
-			kind = MethodDecl
-			ast.Walk(x, n.Recv)
-		}
-		x.decl = n
-		x.visitIdent(kind, n.Name)
-		ast.Walk(x, n.Type)
-		if n.Body != nil {
-			ast.Walk(x, n.Body)
-		}
-
-	case *ast.File:
-		x.decl = nil
-		x.visitIdent(PackageClause, n.Name)
-		for _, d := range n.Decls {
-			ast.Walk(x, d)
-		}
-
-	default:
-		return x
-	}
-
-	return nil
-}
-
-// addFile adds a file to the index if possible and returns the file set file
-// and the file's AST if it was successfully parsed as a Go file. If addFile
-// failed (that is, if the file was not added), it returns file == nil.
-func (x *Indexer) addFile(f vfs.ReadSeekCloser, filename string, goFile bool) (file *token.File, ast *ast.File) {
-	defer f.Close()
-
-	// The file set's base offset and x.sources size must be in lock-step;
-	// this permits the direct mapping of suffix array lookup results to
-	// to corresponding Pos values.
-	//
-	// When a file is added to the file set, its offset base increases by
-	// the size of the file + 1; and the initial base offset is 1. Add an
-	// extra byte to the sources here.
-	x.sources.WriteByte(0)
-
-	// If the sources length doesn't match the file set base at this point
-	// the file set implementation changed or we have another error.
-	base := x.fset.Base()
-	if x.sources.Len() != base {
-		panic("internal error: file base incorrect")
-	}
-
-	// append file contents (src) to x.sources
-	if _, err := x.sources.ReadFrom(f); err == nil {
-		src := x.sources.Bytes()[base:]
-
-		if goFile {
-			// parse the file and in the process add it to the file set
-			if ast, err = parser.ParseFile(x.fset, filename, src, parser.ParseComments); err == nil {
-				file = x.fset.File(ast.Pos()) // ast.Pos() is inside the file
-				return
-			}
-			// file has parse errors, and the AST may be incorrect -
-			// set lines information explicitly and index as ordinary
-			// text file (cannot fall through to the text case below
-			// because the file has already been added to the file set
-			// by the parser)
-			file = x.fset.File(token.Pos(base)) // token.Pos(base) is inside the file
-			file.SetLinesForContent(src)
-			ast = nil
-			return
-		}
-
-		if util.IsText(src) {
-			// only add the file to the file set (for the full text index)
-			file = x.fset.AddFile(filename, x.fset.Base(), len(src))
-			file.SetLinesForContent(src)
-			return
-		}
-	}
-
-	// discard possibly added data
-	x.sources.Truncate(base - 1) // -1 to remove added byte 0 since no file was added
-	return
-}
-
-// Design note: Using an explicit white list of permitted files for indexing
-// makes sure that the important files are included and massively reduces the
-// number of files to index. The advantage over a blacklist is that unexpected
-// (non-blacklisted) files won't suddenly explode the index.
-
-// Files are whitelisted if they have a file name or extension
-// present as key in whitelisted.
-var whitelisted = map[string]bool{
-	".bash":        true,
-	".c":           true,
-	".cc":          true,
-	".cpp":         true,
-	".cxx":         true,
-	".css":         true,
-	".go":          true,
-	".goc":         true,
-	".h":           true,
-	".hh":          true,
-	".hpp":         true,
-	".hxx":         true,
-	".html":        true,
-	".js":          true,
-	".out":         true,
-	".py":          true,
-	".s":           true,
-	".sh":          true,
-	".txt":         true,
-	".xml":         true,
-	"AUTHORS":      true,
-	"CONTRIBUTORS": true,
-	"LICENSE":      true,
-	"Makefile":     true,
-	"PATENTS":      true,
-	"README":       true,
-}
-
-// isWhitelisted returns true if a file is on the list
-// of "permitted" files for indexing. The filename must
-// be the directory-local name of the file.
-func isWhitelisted(filename string) bool {
-	key := pathpkg.Ext(filename)
-	if key == "" {
-		// file has no extension - use entire filename
-		key = filename
-	}
-	return whitelisted[key]
-}
-
-func (x *Indexer) indexDocs(dirname string, filename string, astFile *ast.File) {
-	pkgName := x.intern(astFile.Name.Name)
-	if pkgName == "main" {
-		return
-	}
-	pkgPath := x.intern(strings.TrimPrefix(strings.TrimPrefix(dirname, "/src/"), "pkg/"))
-	astPkg := ast.Package{
-		Name: pkgName,
-		Files: map[string]*ast.File{
-			filename: astFile,
-		},
-	}
-	var m doc.Mode
-	docPkg := doc.New(&astPkg, dirname, m)
-	addIdent := func(sk SpotKind, name string, docstr string) {
-		if x.idents[sk] == nil {
-			x.idents[sk] = make(map[string][]Ident)
-		}
-		name = x.intern(name)
-		x.idents[sk][name] = append(x.idents[sk][name], Ident{
-			Path:    pkgPath,
-			Package: pkgName,
-			Name:    name,
-			Doc:     doc.Synopsis(docstr),
-		})
-	}
-
-	if x.idents[PackageClause] == nil {
-		x.idents[PackageClause] = make(map[string][]Ident)
-	}
-	// List of words under which the package identifier will be stored.
-	// This includes the package name and the components of the directory
-	// in which it resides.
-	words := strings.Split(pathpkg.Dir(pkgPath), "/")
-	if words[0] == "." {
-		words = []string{}
-	}
-	name := x.intern(docPkg.Name)
-	synopsis := doc.Synopsis(docPkg.Doc)
-	words = append(words, name)
-	pkgIdent := Ident{
-		Path:    pkgPath,
-		Package: pkgName,
-		Name:    name,
-		Doc:     synopsis,
-	}
-	for _, word := range words {
-		word = x.intern(word)
-		found := false
-		pkgs := x.idents[PackageClause][word]
-		for i, p := range pkgs {
-			if p.Path == pkgPath {
-				if docPkg.Doc != "" {
-					p.Doc = synopsis
-					pkgs[i] = p
-				}
-				found = true
-				break
-			}
-		}
-		if !found {
-			x.idents[PackageClause][word] = append(x.idents[PackageClause][word], pkgIdent)
-		}
-	}
-
-	for _, c := range docPkg.Consts {
-		for _, name := range c.Names {
-			addIdent(ConstDecl, name, c.Doc)
-		}
-	}
-	for _, t := range docPkg.Types {
-		addIdent(TypeDecl, t.Name, t.Doc)
-		for _, c := range t.Consts {
-			for _, name := range c.Names {
-				addIdent(ConstDecl, name, c.Doc)
-			}
-		}
-		for _, v := range t.Vars {
-			for _, name := range v.Names {
-				addIdent(VarDecl, name, v.Doc)
-			}
-		}
-		for _, f := range t.Funcs {
-			addIdent(FuncDecl, f.Name, f.Doc)
-		}
-		for _, f := range t.Methods {
-			addIdent(MethodDecl, f.Name, f.Doc)
-			// Change the name of methods to be "<typename>.<methodname>".
-			// They will still be indexed as <methodname>.
-			idents := x.idents[MethodDecl][f.Name]
-			idents[len(idents)-1].Name = x.intern(t.Name + "." + f.Name)
-		}
-	}
-	for _, v := range docPkg.Vars {
-		for _, name := range v.Names {
-			addIdent(VarDecl, name, v.Doc)
-		}
-	}
-	for _, f := range docPkg.Funcs {
-		addIdent(FuncDecl, f.Name, f.Doc)
-	}
-}
-
-func (x *Indexer) indexGoFile(dirname string, filename string, file *token.File, astFile *ast.File) {
-	pkgName := astFile.Name.Name
-
-	if x.c.IndexGoCode {
-		x.current = file
-		pak := x.lookupPackage(dirname, pkgName)
-		x.file = &File{filename, pak}
-		ast.Walk(x, astFile)
-	}
-
-	if x.c.IndexDocs {
-		// Test files are already filtered out in visitFile if IndexGoCode and
-		// IndexFullText are false.  Otherwise, check here.
-		isTestFile := (x.c.IndexGoCode || x.c.IndexFullText) &&
-			(strings.HasSuffix(filename, "_test.go") || strings.HasPrefix(dirname, "/test/"))
-		if !isTestFile {
-			x.indexDocs(dirname, filename, astFile)
-		}
-	}
-
-	ppKey := x.intern(pkgName)
-	if _, ok := x.packagePath[ppKey]; !ok {
-		x.packagePath[ppKey] = make(map[string]bool)
-	}
-	pkgPath := x.intern(strings.TrimPrefix(strings.TrimPrefix(dirname, "/src/"), "pkg/"))
-	x.packagePath[ppKey][pkgPath] = true
-
-	// Merge in exported symbols found walking this file into
-	// the map for that package.
-	if len(x.curPkgExports) > 0 {
-		dest, ok := x.exports[pkgPath]
-		if !ok {
-			dest = make(map[string]SpotKind)
-			x.exports[pkgPath] = dest
-		}
-		for k, v := range x.curPkgExports {
-			dest[k] = v
-		}
-	}
-}
-
-func (x *Indexer) visitFile(dirname string, fi os.FileInfo) {
-	if fi.IsDir() || !x.c.IndexEnabled {
-		return
-	}
-
-	filename := pathpkg.Join(dirname, fi.Name())
-	goFile := isGoFile(fi)
-
-	switch {
-	case x.c.IndexFullText:
-		if !isWhitelisted(fi.Name()) {
-			return
-		}
-	case x.c.IndexGoCode:
-		if !goFile {
-			return
-		}
-	case x.c.IndexDocs:
-		if !goFile ||
-			strings.HasSuffix(fi.Name(), "_test.go") ||
-			strings.HasPrefix(dirname, "/test/") {
-			return
-		}
-	default:
-		// No indexing turned on.
-		return
-	}
-
-	x.fsOpenGate <- true
-	defer func() { <-x.fsOpenGate }()
-
-	// open file
-	f, err := x.c.fs.Open(filename)
-	if err != nil {
-		return
-	}
-
-	x.mu.Lock()
-	defer x.mu.Unlock()
-
-	x.throttle.Throttle()
-
-	x.curPkgExports = make(map[string]SpotKind)
-	file, fast := x.addFile(f, filename, goFile)
-	if file == nil {
-		return // addFile failed
-	}
-
-	if fast != nil {
-		x.indexGoFile(dirname, fi.Name(), file, fast)
-	}
-
-	// update statistics
-	x.stats.Bytes += file.Size()
-	x.stats.Files++
-	x.stats.Lines += file.LineCount()
-}
-
-// indexOptions contains information that affects the contents of an index.
-type indexOptions struct {
-	// Docs provides documentation search results.
-	// It is only consulted if IndexEnabled is true.
-	// The default values is true.
-	Docs bool
-
-	// GoCode provides Go source code search results.
-	// It is only consulted if IndexEnabled is true.
-	// The default values is true.
-	GoCode bool
-
-	// FullText provides search results from all files.
-	// It is only consulted if IndexEnabled is true.
-	// The default values is true.
-	FullText bool
-
-	// MaxResults optionally specifies the maximum results for indexing.
-	// The default is 1000.
-	MaxResults int
-}
-
-// ----------------------------------------------------------------------------
-// Index
-
-type LookupResult struct {
-	Decls  HitList // package-level declarations (with snippets)
-	Others HitList // all other occurrences
-}
-
-type Index struct {
-	fset        *token.FileSet           // file set used during indexing; nil if no textindex
-	suffixes    *suffixarray.Index       // suffixes for concatenated sources; nil if no textindex
-	words       map[string]*LookupResult // maps words to hit lists
-	alts        map[string]*AltWords     // maps canonical(words) to lists of alternative spellings
-	snippets    []*Snippet               // all snippets, indexed by snippet index
-	stats       Statistics
-	importCount map[string]int                 // package path ("net/http") => count
-	packagePath map[string]map[string]bool     // "template" => "text/template" => true
-	exports     map[string]map[string]SpotKind // "net/http" => "ListenAndServe" => FuncDecl
-	idents      map[SpotKind]map[string][]Ident
-	opts        indexOptions
-}
-
-func canonical(w string) string { return strings.ToLower(w) }
-
-// Somewhat arbitrary, but I figure low enough to not hurt disk-based filesystems
-// consuming file descriptors, where some systems have low 256 or 512 limits.
-// Go should have a built-in way to cap fd usage under the ulimit.
-const (
-	maxOpenFiles = 200
-	maxOpenDirs  = 50
-)
-
-func (c *Corpus) throttle() float64 {
-	if c.IndexThrottle <= 0 {
-		return 0.9
-	}
-	if c.IndexThrottle > 1.0 {
-		return 1.0
-	}
-	return c.IndexThrottle
-}
-
-// NewIndex creates a new index for the .go files provided by the corpus.
-func (c *Corpus) NewIndex() *Index {
-	// initialize Indexer
-	// (use some reasonably sized maps to start)
-	x := &Indexer{
-		c:           c,
-		fset:        token.NewFileSet(),
-		fsOpenGate:  make(chan bool, maxOpenFiles),
-		strings:     make(map[string]string),
-		packages:    make(map[Pak]*Pak, 256),
-		words:       make(map[string]*IndexResult, 8192),
-		throttle:    util.NewThrottle(c.throttle(), 100*time.Millisecond), // run at least 0.1s at a time
-		importCount: make(map[string]int),
-		packagePath: make(map[string]map[string]bool),
-		exports:     make(map[string]map[string]SpotKind),
-		idents:      make(map[SpotKind]map[string][]Ident, 4),
-	}
-
-	// index all files in the directories given by dirnames
-	var wg sync.WaitGroup // outstanding ReadDir + visitFile
-	dirGate := make(chan bool, maxOpenDirs)
-	for dirname := range c.fsDirnames() {
-		if c.IndexDirectory != nil && !c.IndexDirectory(dirname) {
-			continue
-		}
-		dirGate <- true
-		wg.Add(1)
-		go func(dirname string) {
-			defer func() { <-dirGate }()
-			defer wg.Done()
-
-			list, err := c.fs.ReadDir(dirname)
-			if err != nil {
-				log.Printf("ReadDir(%q): %v; skipping directory", dirname, err)
-				return // ignore this directory
-			}
-			for _, fi := range list {
-				wg.Add(1)
-				go func(fi os.FileInfo) {
-					defer wg.Done()
-					x.visitFile(dirname, fi)
-				}(fi)
-			}
-		}(dirname)
-	}
-	wg.Wait()
-
-	if !c.IndexFullText {
-		// the file set, the current file, and the sources are
-		// not needed after indexing if no text index is built -
-		// help GC and clear them
-		x.fset = nil
-		x.sources.Reset()
-		x.current = nil // contains reference to fset!
-	}
-
-	// for each word, reduce the RunLists into a LookupResult;
-	// also collect the word with its canonical spelling in a
-	// word list for later computation of alternative spellings
-	words := make(map[string]*LookupResult)
-	var wlist RunList
-	for w, h := range x.words {
-		decls := reduce(h.Decls)
-		others := reduce(h.Others)
-		words[w] = &LookupResult{
-			Decls:  decls,
-			Others: others,
-		}
-		wlist = append(wlist, &wordPair{canonical(w), w})
-		x.throttle.Throttle()
-	}
-	x.stats.Words = len(words)
-
-	// reduce the word list {canonical(w), w} into
-	// a list of AltWords runs {canonical(w), {w}}
-	alist := wlist.reduce(lessWordPair, newAltWords)
-
-	// convert alist into a map of alternative spellings
-	alts := make(map[string]*AltWords)
-	for i := 0; i < len(alist); i++ {
-		a := alist[i].(*AltWords)
-		alts[a.Canon] = a
-	}
-
-	// create text index
-	var suffixes *suffixarray.Index
-	if c.IndexFullText {
-		suffixes = suffixarray.New(x.sources.Bytes())
-	}
-
-	// sort idents by the number of imports of their respective packages
-	for _, idMap := range x.idents {
-		for _, ir := range idMap {
-			sort.Sort(byImportCount{ir, x.importCount})
-		}
-	}
-
-	return &Index{
-		fset:        x.fset,
-		suffixes:    suffixes,
-		words:       words,
-		alts:        alts,
-		snippets:    x.snippets,
-		stats:       x.stats,
-		importCount: x.importCount,
-		packagePath: x.packagePath,
-		exports:     x.exports,
-		idents:      x.idents,
-		opts: indexOptions{
-			Docs:       x.c.IndexDocs,
-			GoCode:     x.c.IndexGoCode,
-			FullText:   x.c.IndexFullText,
-			MaxResults: x.c.MaxResults,
-		},
-	}
-}
-
-var ErrFileIndexVersion = errors.New("file index version out of date")
-
-const fileIndexVersion = 3
-
-// fileIndex is the subset of Index that's gob-encoded for use by
-// Index.Write and Index.Read.
-type fileIndex struct {
-	Version     int
-	Words       map[string]*LookupResult
-	Alts        map[string]*AltWords
-	Snippets    []*Snippet
-	Fulltext    bool
-	Stats       Statistics
-	ImportCount map[string]int
-	PackagePath map[string]map[string]bool
-	Exports     map[string]map[string]SpotKind
-	Idents      map[SpotKind]map[string][]Ident
-	Opts        indexOptions
-}
-
-func (x *fileIndex) Write(w io.Writer) error {
-	return gob.NewEncoder(w).Encode(x)
-}
-
-func (x *fileIndex) Read(r io.Reader) error {
-	return gob.NewDecoder(r).Decode(x)
-}
-
-// WriteTo writes the index x to w.
-func (x *Index) WriteTo(w io.Writer) (n int64, err error) {
-	w = countingWriter{&n, w}
-	fulltext := false
-	if x.suffixes != nil {
-		fulltext = true
-	}
-	fx := fileIndex{
-		Version:     fileIndexVersion,
-		Words:       x.words,
-		Alts:        x.alts,
-		Snippets:    x.snippets,
-		Fulltext:    fulltext,
-		Stats:       x.stats,
-		ImportCount: x.importCount,
-		PackagePath: x.packagePath,
-		Exports:     x.exports,
-		Idents:      x.idents,
-		Opts:        x.opts,
-	}
-	if err := fx.Write(w); err != nil {
-		return 0, err
-	}
-	if fulltext {
-		encode := func(x interface{}) error {
-			return gob.NewEncoder(w).Encode(x)
-		}
-		if err := x.fset.Write(encode); err != nil {
-			return 0, err
-		}
-		if err := x.suffixes.Write(w); err != nil {
-			return 0, err
-		}
-	}
-	return n, nil
-}
-
-// ReadFrom reads the index from r into x; x must not be nil.
-// If r does not also implement io.ByteReader, it will be wrapped in a bufio.Reader.
-// If the index is from an old version, the error is ErrFileIndexVersion.
-func (x *Index) ReadFrom(r io.Reader) (n int64, err error) {
-	// We use the ability to read bytes as a plausible surrogate for buffering.
-	if _, ok := r.(io.ByteReader); !ok {
-		r = bufio.NewReader(r)
-	}
-	r = countingReader{&n, r.(byteReader)}
-	var fx fileIndex
-	if err := fx.Read(r); err != nil {
-		return n, err
-	}
-	if fx.Version != fileIndexVersion {
-		return 0, ErrFileIndexVersion
-	}
-	x.words = fx.Words
-	x.alts = fx.Alts
-	x.snippets = fx.Snippets
-	x.stats = fx.Stats
-	x.importCount = fx.ImportCount
-	x.packagePath = fx.PackagePath
-	x.exports = fx.Exports
-	x.idents = fx.Idents
-	x.opts = fx.Opts
-	if fx.Fulltext {
-		x.fset = token.NewFileSet()
-		decode := func(x interface{}) error {
-			return gob.NewDecoder(r).Decode(x)
-		}
-		if err := x.fset.Read(decode); err != nil {
-			return n, err
-		}
-		x.suffixes = new(suffixarray.Index)
-		if err := x.suffixes.Read(r); err != nil {
-			return n, err
-		}
-	}
-	return n, nil
-}
-
-// Stats returns index statistics.
-func (x *Index) Stats() Statistics {
-	return x.stats
-}
-
-// ImportCount returns a map from import paths to how many times they were seen.
-func (x *Index) ImportCount() map[string]int {
-	return x.importCount
-}
-
-// PackagePath returns a map from short package name to a set
-// of full package path names that use that short package name.
-func (x *Index) PackagePath() map[string]map[string]bool {
-	return x.packagePath
-}
-
-// Exports returns a map from full package path to exported
-// symbol name to its type.
-func (x *Index) Exports() map[string]map[string]SpotKind {
-	return x.exports
-}
-
-// Idents returns a map from identifier type to exported
-// symbol name to the list of identifiers matching that name.
-func (x *Index) Idents() map[SpotKind]map[string][]Ident {
-	return x.idents
-}
-
-func (x *Index) lookupWord(w string) (match *LookupResult, alt *AltWords) {
-	match = x.words[w]
-	alt = x.alts[canonical(w)]
-	// remove current spelling from alternatives
-	// (if there is no match, the alternatives do
-	// not contain the current spelling)
-	if match != nil && alt != nil {
-		alt = alt.filter(w)
-	}
-	return
-}
-
-// isIdentifier reports whether s is a Go identifier.
-func isIdentifier(s string) bool {
-	for i, ch := range s {
-		if unicode.IsLetter(ch) || ch == '_' || i > 0 && unicode.IsDigit(ch) {
-			continue
-		}
-		return false
-	}
-	return len(s) > 0
-}
-
-// For a given query, which is either a single identifier or a qualified
-// identifier, Lookup returns a SearchResult containing packages, a LookupResult, a
-// list of alternative spellings, and identifiers, if any. Any and all results
-// may be nil.  If the query syntax is wrong, an error is reported.
-func (x *Index) Lookup(query string) (*SearchResult, error) {
-	ss := strings.Split(query, ".")
-
-	// check query syntax
-	for _, s := range ss {
-		if !isIdentifier(s) {
-			return nil, errors.New("all query parts must be identifiers")
-		}
-	}
-	rslt := &SearchResult{
-		Query:  query,
-		Idents: make(map[SpotKind][]Ident, 5),
-	}
-	// handle simple and qualified identifiers
-	switch len(ss) {
-	case 1:
-		ident := ss[0]
-		rslt.Hit, rslt.Alt = x.lookupWord(ident)
-		if rslt.Hit != nil {
-			// found a match - filter packages with same name
-			// for the list of packages called ident, if any
-			rslt.Pak = rslt.Hit.Others.filter(ident)
-		}
-		for k, v := range x.idents {
-			const rsltLimit = 50
-			ids := byImportCount{v[ident], x.importCount}
-			rslt.Idents[k] = ids.top(rsltLimit)
-		}
-
-	case 2:
-		pakname, ident := ss[0], ss[1]
-		rslt.Hit, rslt.Alt = x.lookupWord(ident)
-		if rslt.Hit != nil {
-			// found a match - filter by package name
-			// (no paks - package names are not qualified)
-			decls := rslt.Hit.Decls.filter(pakname)
-			others := rslt.Hit.Others.filter(pakname)
-			rslt.Hit = &LookupResult{decls, others}
-		}
-		for k, v := range x.idents {
-			ids := byImportCount{v[ident], x.importCount}
-			rslt.Idents[k] = ids.filter(pakname)
-		}
-
-	default:
-		return nil, errors.New("query is not a (qualified) identifier")
-	}
-
-	return rslt, nil
-}
-
-func (x *Index) Snippet(i int) *Snippet {
-	// handle illegal snippet indices gracefully
-	if 0 <= i && i < len(x.snippets) {
-		return x.snippets[i]
-	}
-	return nil
-}
-
-type positionList []struct {
-	filename string
-	line     int
-}
-
-func (list positionList) Len() int           { return len(list) }
-func (list positionList) Less(i, j int) bool { return list[i].filename < list[j].filename }
-func (list positionList) Swap(i, j int)      { list[i], list[j] = list[j], list[i] }
-
-// unique returns the list sorted and with duplicate entries removed
-func unique(list []int) []int {
-	sort.Ints(list)
-	var last int
-	i := 0
-	for _, x := range list {
-		if i == 0 || x != last {
-			last = x
-			list[i] = x
-			i++
-		}
-	}
-	return list[0:i]
-}
-
-// A FileLines value specifies a file and line numbers within that file.
-type FileLines struct {
-	Filename string
-	Lines    []int
-}
-
-// LookupRegexp returns the number of matches and the matches where a regular
-// expression r is found in the full text index. At most n matches are
-// returned (thus found <= n).
-//
-func (x *Index) LookupRegexp(r *regexp.Regexp, n int) (found int, result []FileLines) {
-	if x.suffixes == nil || n <= 0 {
-		return
-	}
-	// n > 0
-
-	var list positionList
-	// FindAllIndex may returns matches that span across file boundaries.
-	// Such matches are unlikely, buf after eliminating them we may end up
-	// with fewer than n matches. If we don't have enough at the end, redo
-	// the search with an increased value n1, but only if FindAllIndex
-	// returned all the requested matches in the first place (if it
-	// returned fewer than that there cannot be more).
-	for n1 := n; found < n; n1 += n - found {
-		found = 0
-		matches := x.suffixes.FindAllIndex(r, n1)
-		// compute files, exclude matches that span file boundaries,
-		// and map offsets to file-local offsets
-		list = make(positionList, len(matches))
-		for _, m := range matches {
-			// by construction, an offset corresponds to the Pos value
-			// for the file set - use it to get the file and line
-			p := token.Pos(m[0])
-			if file := x.fset.File(p); file != nil {
-				if base := file.Base(); base <= m[1] && m[1] <= base+file.Size() {
-					// match [m[0], m[1]) is within the file boundaries
-					list[found].filename = file.Name()
-					list[found].line = file.Line(p)
-					found++
-				}
-			}
-		}
-		if found == n || len(matches) < n1 {
-			// found all matches or there's no chance to find more
-			break
-		}
-	}
-	list = list[0:found]
-	sort.Sort(list) // sort by filename
-
-	// collect matches belonging to the same file
-	var last string
-	var lines []int
-	addLines := func() {
-		if len(lines) > 0 {
-			// remove duplicate lines
-			result = append(result, FileLines{last, unique(lines)})
-			lines = nil
-		}
-	}
-	for _, m := range list {
-		if m.filename != last {
-			addLines()
-			last = m.filename
-		}
-		lines = append(lines, m.line)
-	}
-	addLines()
-
-	return
-}
-
-// InvalidateIndex should be called whenever any of the file systems
-// under godoc's observation change so that the indexer is kicked on.
-func (c *Corpus) invalidateIndex() {
-	c.fsModified.Set(nil)
-	c.refreshMetadata()
-}
-
-// feedDirnames feeds the directory names of all directories
-// under the file system given by root to channel c.
-//
-func (c *Corpus) feedDirnames(ch chan<- string) {
-	if dir, _ := c.fsTree.Get(); dir != nil {
-		for d := range dir.(*Directory).iter(false) {
-			ch <- d.Path
-		}
-	}
-}
-
-// fsDirnames() returns a channel sending all directory names
-// of all the file systems under godoc's observation.
-//
-func (c *Corpus) fsDirnames() <-chan string {
-	ch := make(chan string, 256) // buffered for fewer context switches
-	go func() {
-		c.feedDirnames(ch)
-		close(ch)
-	}()
-	return ch
-}
-
-// CompatibleWith reports whether the Index x is compatible with the corpus
-// indexing options set in c.
-func (x *Index) CompatibleWith(c *Corpus) bool {
-	return x.opts.Docs == c.IndexDocs &&
-		x.opts.GoCode == c.IndexGoCode &&
-		x.opts.FullText == c.IndexFullText &&
-		x.opts.MaxResults == c.MaxResults
-}
-
-func (c *Corpus) readIndex(filenames string) error {
-	matches, err := filepath.Glob(filenames)
-	if err != nil {
-		return err
-	} else if matches == nil {
-		return fmt.Errorf("no index files match %q", filenames)
-	}
-	sort.Strings(matches) // make sure files are in the right order
-	files := make([]io.Reader, 0, len(matches))
-	for _, filename := range matches {
-		f, err := os.Open(filename)
-		if err != nil {
-			return err
-		}
-		defer f.Close()
-		files = append(files, f)
-	}
-	return c.ReadIndexFrom(io.MultiReader(files...))
-}
-
-// ReadIndexFrom sets the current index from the serialized version found in r.
-func (c *Corpus) ReadIndexFrom(r io.Reader) error {
-	x := new(Index)
-	if _, err := x.ReadFrom(r); err != nil {
-		return err
-	}
-	if !x.CompatibleWith(c) {
-		return fmt.Errorf("index file options are incompatible: %v", x.opts)
-	}
-	c.searchIndex.Set(x)
-	return nil
-}
-
-func (c *Corpus) UpdateIndex() {
-	if c.Verbose {
-		log.Printf("updating index...")
-	}
-	start := time.Now()
-	index := c.NewIndex()
-	stop := time.Now()
-	c.searchIndex.Set(index)
-	if c.Verbose {
-		secs := stop.Sub(start).Seconds()
-		stats := index.Stats()
-		log.Printf("index updated (%gs, %d bytes of source, %d files, %d lines, %d unique words, %d spots)",
-			secs, stats.Bytes, stats.Files, stats.Lines, stats.Words, stats.Spots)
-	}
-	memstats := new(runtime.MemStats)
-	runtime.ReadMemStats(memstats)
-	if c.Verbose {
-		log.Printf("before GC: bytes = %d footprint = %d", memstats.HeapAlloc, memstats.Sys)
-	}
-	runtime.GC()
-	runtime.ReadMemStats(memstats)
-	if c.Verbose {
-		log.Printf("after  GC: bytes = %d footprint = %d", memstats.HeapAlloc, memstats.Sys)
-	}
-}
-
-// RunIndexer runs forever, indexing.
-func (c *Corpus) RunIndexer() {
-	// initialize the index from disk if possible
-	if c.IndexFiles != "" {
-		c.initFSTree()
-		if err := c.readIndex(c.IndexFiles); err != nil {
-			log.Printf("error reading index from file %s: %v", c.IndexFiles, err)
-		}
-		return
-	}
-
-	// Repeatedly update the package directory tree and index.
-	// TODO(bgarcia): Use fsnotify to only update when notified of a filesystem change.
-	for {
-		c.initFSTree()
-		c.UpdateIndex()
-		if c.IndexInterval < 0 {
-			return
-		}
-		delay := 5 * time.Minute // by default, reindex every 5 minutes
-		if c.IndexInterval > 0 {
-			delay = c.IndexInterval
-		}
-		time.Sleep(delay)
-	}
-}
-
-type countingWriter struct {
-	n *int64
-	w io.Writer
-}
-
-func (c countingWriter) Write(p []byte) (n int, err error) {
-	n, err = c.w.Write(p)
-	*c.n += int64(n)
-	return
-}
-
-type byteReader interface {
-	io.Reader
-	io.ByteReader
-}
-
-type countingReader struct {
-	n *int64
-	r byteReader
-}
-
-func (c countingReader) Read(p []byte) (n int, err error) {
-	n, err = c.r.Read(p)
-	*c.n += int64(n)
-	return
-}
-
-func (c countingReader) ReadByte() (b byte, err error) {
-	b, err = c.r.ReadByte()
-	*c.n += 1
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/index_test.go b/installer/vendor/golang.org/x/tools/godoc/index_test.go
deleted file mode 100644
index 97f31e71b7..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/index_test.go
+++ /dev/null
@@ -1,323 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"reflect"
-	"sort"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/godoc/vfs/mapfs"
-)
-
-func newCorpus(t *testing.T) *Corpus {
-	c := NewCorpus(mapfs.New(map[string]string{
-		"src/foo/foo.go": `// Package foo is an example.
-package foo
-
-import "bar"
-
-const Pi = 3.1415
-
-var Foos []Foo
-
-// Foo is stuff.
-type Foo struct{}
-
-func New() *Foo {
-   return new(Foo)
-}
-`,
-		"src/bar/bar.go": `// Package bar is another example to test races.
-package bar
-`,
-		"src/other/bar/bar.go": `// Package bar is another bar package.
-package bar
-func X() {}
-`,
-		"src/skip/skip.go": `// Package skip should be skipped.
-package skip
-func Skip() {}
-`,
-		"src/bar/readme.txt": `Whitelisted text file.
-`,
-		"src/bar/baz.zzz": `Text file not whitelisted.
-`,
-	}))
-	c.IndexEnabled = true
-	c.IndexDirectory = func(dir string) bool {
-		return !strings.Contains(dir, "skip")
-	}
-
-	if err := c.Init(); err != nil {
-		t.Fatal(err)
-	}
-	return c
-}
-
-func TestIndex(t *testing.T) {
-	for _, docs := range []bool{true, false} {
-		for _, goCode := range []bool{true, false} {
-			for _, fullText := range []bool{true, false} {
-				c := newCorpus(t)
-				c.IndexDocs = docs
-				c.IndexGoCode = goCode
-				c.IndexFullText = fullText
-				c.UpdateIndex()
-				ix, _ := c.CurrentIndex()
-				if ix == nil {
-					t.Fatal("no index")
-				}
-				t.Logf("docs, goCode, fullText = %v,%v,%v", docs, goCode, fullText)
-				testIndex(t, c, ix)
-			}
-		}
-	}
-}
-
-func TestIndexWriteRead(t *testing.T) {
-	type key struct {
-		docs, goCode, fullText bool
-	}
-	type val struct {
-		buf *bytes.Buffer
-		c   *Corpus
-	}
-	m := map[key]val{}
-
-	for _, docs := range []bool{true, false} {
-		for _, goCode := range []bool{true, false} {
-			for _, fullText := range []bool{true, false} {
-				k := key{docs, goCode, fullText}
-				c := newCorpus(t)
-				c.IndexDocs = docs
-				c.IndexGoCode = goCode
-				c.IndexFullText = fullText
-				c.UpdateIndex()
-				ix, _ := c.CurrentIndex()
-				if ix == nil {
-					t.Fatal("no index")
-				}
-				var buf bytes.Buffer
-				nw, err := ix.WriteTo(&buf)
-				if err != nil {
-					t.Fatalf("Index.WriteTo: %v", err)
-				}
-				m[k] = val{bytes.NewBuffer(buf.Bytes()), c}
-				ix2 := new(Index)
-				nr, err := ix2.ReadFrom(&buf)
-				if err != nil {
-					t.Fatalf("Index.ReadFrom: %v", err)
-				}
-				if nr != nw {
-					t.Errorf("Wrote %d bytes to index but read %d", nw, nr)
-				}
-				testIndex(t, c, ix)
-			}
-		}
-	}
-	// Test CompatibleWith
-	for k1, v1 := range m {
-		ix := new(Index)
-		if _, err := ix.ReadFrom(v1.buf); err != nil {
-			t.Fatalf("Index.ReadFrom: %v", err)
-		}
-		for k2, v2 := range m {
-			if got, want := ix.CompatibleWith(v2.c), k1 == k2; got != want {
-				t.Errorf("CompatibleWith = %v; want %v for %v, %v", got, want, k1, k2)
-			}
-		}
-	}
-}
-
-func testIndex(t *testing.T, c *Corpus, ix *Index) {
-	if _, ok := ix.words["Skip"]; ok {
-		t.Errorf("the word Skip was found; expected it to be skipped")
-	}
-	checkStats(t, c, ix)
-	checkImportCount(t, c, ix)
-	checkPackagePath(t, c, ix)
-	checkExports(t, c, ix)
-	checkIdents(t, c, ix)
-}
-
-// checkStats checks the Index's statistics.
-// Some statistics are only set when we're indexing Go code.
-func checkStats(t *testing.T, c *Corpus, ix *Index) {
-	want := Statistics{}
-	if c.IndexFullText {
-		want.Bytes = 314
-		want.Files = 4
-		want.Lines = 21
-	} else if c.IndexDocs || c.IndexGoCode {
-		want.Bytes = 291
-		want.Files = 3
-		want.Lines = 20
-	}
-	if c.IndexGoCode {
-		want.Words = 8
-		want.Spots = 12
-	}
-	if got := ix.Stats(); !reflect.DeepEqual(got, want) {
-		t.Errorf("Stats = %#v; want %#v", got, want)
-	}
-}
-
-// checkImportCount checks the Index's import count map.
-// It is only set when we're indexing Go code.
-func checkImportCount(t *testing.T, c *Corpus, ix *Index) {
-	want := map[string]int{}
-	if c.IndexGoCode {
-		want = map[string]int{
-			"bar": 1,
-		}
-	}
-	if got := ix.ImportCount(); !reflect.DeepEqual(got, want) {
-		t.Errorf("ImportCount = %v; want %v", got, want)
-	}
-}
-
-// checkPackagePath checks the Index's package path map.
-// It is set if at least one of the indexing options is enabled.
-func checkPackagePath(t *testing.T, c *Corpus, ix *Index) {
-	want := map[string]map[string]bool{}
-	if c.IndexDocs || c.IndexGoCode || c.IndexFullText {
-		want = map[string]map[string]bool{
-			"foo": {
-				"foo": true,
-			},
-			"bar": {
-				"bar":       true,
-				"other/bar": true,
-			},
-		}
-	}
-	if got := ix.PackagePath(); !reflect.DeepEqual(got, want) {
-		t.Errorf("PackagePath = %v; want %v", got, want)
-	}
-}
-
-// checkExports checks the Index's exports map.
-// It is only set when we're indexing Go code.
-func checkExports(t *testing.T, c *Corpus, ix *Index) {
-	want := map[string]map[string]SpotKind{}
-	if c.IndexGoCode {
-		want = map[string]map[string]SpotKind{
-			"foo": {
-				"Pi":   ConstDecl,
-				"Foos": VarDecl,
-				"Foo":  TypeDecl,
-				"New":  FuncDecl,
-			},
-			"other/bar": {
-				"X": FuncDecl,
-			},
-		}
-	}
-	if got := ix.Exports(); !reflect.DeepEqual(got, want) {
-		t.Errorf("Exports = %v; want %v", got, want)
-	}
-}
-
-// checkIdents checks the Index's indents map.
-// It is only set when we're indexing documentation.
-func checkIdents(t *testing.T, c *Corpus, ix *Index) {
-	want := map[SpotKind]map[string][]Ident{}
-	if c.IndexDocs {
-		want = map[SpotKind]map[string][]Ident{
-			PackageClause: {
-				"bar": {
-					{"bar", "bar", "bar", "Package bar is another example to test races."},
-					{"other/bar", "bar", "bar", "Package bar is another bar package."},
-				},
-				"foo":   {{"foo", "foo", "foo", "Package foo is an example."}},
-				"other": {{"other/bar", "bar", "bar", "Package bar is another bar package."}},
-			},
-			ConstDecl: {
-				"Pi": {{"foo", "foo", "Pi", ""}},
-			},
-			VarDecl: {
-				"Foos": {{"foo", "foo", "Foos", ""}},
-			},
-			TypeDecl: {
-				"Foo": {{"foo", "foo", "Foo", "Foo is stuff."}},
-			},
-			FuncDecl: {
-				"New": {{"foo", "foo", "New", ""}},
-				"X":   {{"other/bar", "bar", "X", ""}},
-			},
-		}
-	}
-	if got := ix.Idents(); !reflect.DeepEqual(got, want) {
-		t.Errorf("Idents = %v; want %v", got, want)
-	}
-}
-
-func TestIdentResultSort(t *testing.T) {
-	ic := map[string]int{
-		"/a/b/pkg1": 10,
-		"/a/b/pkg2": 2,
-		"/b/d/pkg3": 20,
-	}
-	for _, tc := range []struct {
-		ir  []Ident
-		exp []Ident
-	}{
-		{
-			ir: []Ident{
-				{"/a/b/pkg2", "pkg2", "MyFunc2", ""},
-				{"/b/d/pkg3", "pkg3", "MyFunc3", ""},
-				{"/a/b/pkg1", "pkg1", "MyFunc1", ""},
-			},
-			exp: []Ident{
-				{"/b/d/pkg3", "pkg3", "MyFunc3", ""},
-				{"/a/b/pkg1", "pkg1", "MyFunc1", ""},
-				{"/a/b/pkg2", "pkg2", "MyFunc2", ""},
-			},
-		},
-		{
-			ir: []Ident{
-				{"/a/a/pkg1", "pkg1", "MyFunc1", ""},
-				{"/a/b/pkg1", "pkg1", "MyFunc1", ""},
-			},
-			exp: []Ident{
-				{"/a/b/pkg1", "pkg1", "MyFunc1", ""},
-				{"/a/a/pkg1", "pkg1", "MyFunc1", ""},
-			},
-		},
-	} {
-		if sort.Sort(byImportCount{tc.ir, ic}); !reflect.DeepEqual(tc.ir, tc.exp) {
-			t.Errorf("got: %v, want %v", tc.ir, tc.exp)
-		}
-	}
-}
-
-func TestIdentFilter(t *testing.T) {
-	ic := map[string]int{}
-	for _, tc := range []struct {
-		ir  []Ident
-		pak string
-		exp []Ident
-	}{
-		{
-			ir: []Ident{
-				{"/a/b/pkg2", "pkg2", "MyFunc2", ""},
-				{"/b/d/pkg3", "pkg3", "MyFunc3", ""},
-				{"/a/b/pkg1", "pkg1", "MyFunc1", ""},
-			},
-			pak: "pkg2",
-			exp: []Ident{
-				{"/a/b/pkg2", "pkg2", "MyFunc2", ""},
-			},
-		},
-	} {
-		res := byImportCount{tc.ir, ic}.filter(tc.pak)
-		if !reflect.DeepEqual(res, tc.exp) {
-			t.Errorf("got: %v, want %v", res, tc.exp)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/linkify.go b/installer/vendor/golang.org/x/tools/godoc/linkify.go
deleted file mode 100644
index dbe0e41902..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/linkify.go
+++ /dev/null
@@ -1,240 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file implements LinkifyText which introduces
-// links for identifiers pointing to their declarations.
-// The approach does not cover all cases because godoc
-// doesn't have complete type information, but it's
-// reasonably good for browsing.
-
-package godoc
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"io"
-	"strconv"
-)
-
-// LinkifyText HTML-escapes source text and writes it to w.
-// Identifiers that are in a "use" position (i.e., that are
-// not being declared), are wrapped with HTML links pointing
-// to the respective declaration, if possible. Comments are
-// formatted the same way as with FormatText.
-//
-func LinkifyText(w io.Writer, text []byte, n ast.Node) {
-	links := linksFor(n)
-
-	i := 0     // links index
-	prev := "" // prev HTML tag
-	linkWriter := func(w io.Writer, _ int, start bool) {
-		// end tag
-		if !start {
-			if prev != "" {
-				fmt.Fprintf(w, `</%s>`, prev)
-				prev = ""
-			}
-			return
-		}
-
-		// start tag
-		prev = ""
-		if i < len(links) {
-			switch info := links[i]; {
-			case info.path != "" && info.name == "":
-				// package path
-				fmt.Fprintf(w, `<a href="/pkg/%s/">`, info.path)
-				prev = "a"
-			case info.path != "" && info.name != "":
-				// qualified identifier
-				fmt.Fprintf(w, `<a href="/pkg/%s/#%s">`, info.path, info.name)
-				prev = "a"
-			case info.path == "" && info.name != "":
-				// local identifier
-				if info.isVal {
-					fmt.Fprintf(w, `<span id="%s">`, info.name)
-					prev = "span"
-				} else if ast.IsExported(info.name) {
-					fmt.Fprintf(w, `<a href="#%s">`, info.name)
-					prev = "a"
-				}
-			}
-			i++
-		}
-	}
-
-	idents := tokenSelection(text, token.IDENT)
-	comments := tokenSelection(text, token.COMMENT)
-	FormatSelections(w, text, linkWriter, idents, selectionTag, comments)
-}
-
-// A link describes the (HTML) link information for an identifier.
-// The zero value of a link represents "no link".
-//
-type link struct {
-	path, name string // package path, identifier name
-	isVal      bool   // identifier is defined in a const or var declaration
-}
-
-// linksFor returns the list of links for the identifiers used
-// by node in the same order as they appear in the source.
-//
-func linksFor(node ast.Node) (links []link) {
-	// linkMap tracks link information for each ast.Ident node. Entries may
-	// be created out of source order (for example, when we visit a parent
-	// definition node). These links are appended to the returned slice when
-	// their ast.Ident nodes are visited.
-	linkMap := make(map[*ast.Ident]link)
-
-	ast.Inspect(node, func(node ast.Node) bool {
-		switch n := node.(type) {
-		case *ast.Field:
-			for _, n := range n.Names {
-				linkMap[n] = link{}
-			}
-		case *ast.ImportSpec:
-			if name := n.Name; name != nil {
-				linkMap[name] = link{}
-			}
-		case *ast.ValueSpec:
-			for _, n := range n.Names {
-				linkMap[n] = link{name: n.Name, isVal: true}
-			}
-		case *ast.FuncDecl:
-			linkMap[n.Name] = link{}
-		case *ast.TypeSpec:
-			linkMap[n.Name] = link{}
-		case *ast.AssignStmt:
-			// Short variable declarations only show up if we apply
-			// this code to all source code (as opposed to exported
-			// declarations only).
-			if n.Tok == token.DEFINE {
-				// Some of the lhs variables may be re-declared,
-				// so technically they are not defs. We don't
-				// care for now.
-				for _, x := range n.Lhs {
-					// Each lhs expression should be an
-					// ident, but we are conservative and check.
-					if n, _ := x.(*ast.Ident); n != nil {
-						linkMap[n] = link{isVal: true}
-					}
-				}
-			}
-		case *ast.SelectorExpr:
-			// Detect qualified identifiers of the form pkg.ident.
-			// If anything fails we return true and collect individual
-			// identifiers instead.
-			if x, _ := n.X.(*ast.Ident); x != nil {
-				// Create links only if x is a qualified identifier.
-				if obj := x.Obj; obj != nil && obj.Kind == ast.Pkg {
-					if spec, _ := obj.Decl.(*ast.ImportSpec); spec != nil {
-						// spec.Path.Value is the import path
-						if path, err := strconv.Unquote(spec.Path.Value); err == nil {
-							// Register two links, one for the package
-							// and one for the qualified identifier.
-							linkMap[x] = link{path: path}
-							linkMap[n.Sel] = link{path: path, name: n.Sel.Name}
-						}
-					}
-				}
-			}
-		case *ast.CompositeLit:
-			// Detect field names within composite literals. These links should
-			// be prefixed by the type name.
-			fieldPath := ""
-			prefix := ""
-			switch typ := n.Type.(type) {
-			case *ast.Ident:
-				prefix = typ.Name + "."
-			case *ast.SelectorExpr:
-				if x, _ := typ.X.(*ast.Ident); x != nil {
-					// Create links only if x is a qualified identifier.
-					if obj := x.Obj; obj != nil && obj.Kind == ast.Pkg {
-						if spec, _ := obj.Decl.(*ast.ImportSpec); spec != nil {
-							// spec.Path.Value is the import path
-							if path, err := strconv.Unquote(spec.Path.Value); err == nil {
-								// Register two links, one for the package
-								// and one for the qualified identifier.
-								linkMap[x] = link{path: path}
-								linkMap[typ.Sel] = link{path: path, name: typ.Sel.Name}
-								fieldPath = path
-								prefix = typ.Sel.Name + "."
-							}
-						}
-					}
-				}
-			}
-			for _, e := range n.Elts {
-				if kv, ok := e.(*ast.KeyValueExpr); ok {
-					if k, ok := kv.Key.(*ast.Ident); ok {
-						// Note: there is some syntactic ambiguity here. We cannot determine
-						// if this is a struct literal or a map literal without type
-						// information. We assume struct literal.
-						name := prefix + k.Name
-						linkMap[k] = link{path: fieldPath, name: name}
-					}
-				}
-			}
-		case *ast.Ident:
-			if l, ok := linkMap[n]; ok {
-				links = append(links, l)
-			} else {
-				l := link{name: n.Name}
-				if n.Obj == nil && predeclared[n.Name] {
-					l.path = builtinPkgPath
-				}
-				links = append(links, l)
-			}
-		}
-		return true
-	})
-	return
-}
-
-// The predeclared map represents the set of all predeclared identifiers.
-// TODO(gri) This information is also encoded in similar maps in go/doc,
-//           but not exported. Consider exporting an accessor and using
-//           it instead.
-var predeclared = map[string]bool{
-	"bool":       true,
-	"byte":       true,
-	"complex64":  true,
-	"complex128": true,
-	"error":      true,
-	"float32":    true,
-	"float64":    true,
-	"int":        true,
-	"int8":       true,
-	"int16":      true,
-	"int32":      true,
-	"int64":      true,
-	"rune":       true,
-	"string":     true,
-	"uint":       true,
-	"uint8":      true,
-	"uint16":     true,
-	"uint32":     true,
-	"uint64":     true,
-	"uintptr":    true,
-	"true":       true,
-	"false":      true,
-	"iota":       true,
-	"nil":        true,
-	"append":     true,
-	"cap":        true,
-	"close":      true,
-	"complex":    true,
-	"copy":       true,
-	"delete":     true,
-	"imag":       true,
-	"len":        true,
-	"make":       true,
-	"new":        true,
-	"panic":      true,
-	"print":      true,
-	"println":    true,
-	"real":       true,
-	"recover":    true,
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/meta.go b/installer/vendor/golang.org/x/tools/godoc/meta.go
deleted file mode 100644
index 41ade3948f..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/meta.go
+++ /dev/null
@@ -1,144 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"encoding/json"
-	"log"
-	pathpkg "path"
-	"strings"
-	"time"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-var (
-	doctype   = []byte("<!DOCTYPE ")
-	jsonStart = []byte("<!--{")
-	jsonEnd   = []byte("}-->")
-)
-
-// ----------------------------------------------------------------------------
-// Documentation Metadata
-
-// TODO(adg): why are some exported and some aren't? -brad
-type Metadata struct {
-	Title    string
-	Subtitle string
-	Template bool   // execute as template
-	Path     string // canonical path for this page
-	filePath string // filesystem path relative to goroot
-}
-
-func (m *Metadata) FilePath() string { return m.filePath }
-
-// extractMetadata extracts the Metadata from a byte slice.
-// It returns the Metadata value and the remaining data.
-// If no metadata is present the original byte slice is returned.
-//
-func extractMetadata(b []byte) (meta Metadata, tail []byte, err error) {
-	tail = b
-	if !bytes.HasPrefix(b, jsonStart) {
-		return
-	}
-	end := bytes.Index(b, jsonEnd)
-	if end < 0 {
-		return
-	}
-	b = b[len(jsonStart)-1 : end+1] // drop leading <!-- and include trailing }
-	if err = json.Unmarshal(b, &meta); err != nil {
-		return
-	}
-	tail = tail[end+len(jsonEnd):]
-	return
-}
-
-// UpdateMetadata scans $GOROOT/doc for HTML files, reads their metadata,
-// and updates the DocMetadata map.
-func (c *Corpus) updateMetadata() {
-	metadata := make(map[string]*Metadata)
-	var scan func(string) // scan is recursive
-	scan = func(dir string) {
-		fis, err := c.fs.ReadDir(dir)
-		if err != nil {
-			log.Println("updateMetadata:", err)
-			return
-		}
-		for _, fi := range fis {
-			name := pathpkg.Join(dir, fi.Name())
-			if fi.IsDir() {
-				scan(name) // recurse
-				continue
-			}
-			if !strings.HasSuffix(name, ".html") {
-				continue
-			}
-			// Extract metadata from the file.
-			b, err := vfs.ReadFile(c.fs, name)
-			if err != nil {
-				log.Printf("updateMetadata %s: %v", name, err)
-				continue
-			}
-			meta, _, err := extractMetadata(b)
-			if err != nil {
-				log.Printf("updateMetadata: %s: %v", name, err)
-				continue
-			}
-			// Store relative filesystem path in Metadata.
-			meta.filePath = name
-			if meta.Path == "" {
-				// If no Path, canonical path is actual path.
-				meta.Path = meta.filePath
-			}
-			// Store under both paths.
-			metadata[meta.Path] = &meta
-			metadata[meta.filePath] = &meta
-		}
-	}
-	scan("/doc")
-	c.docMetadata.Set(metadata)
-}
-
-// MetadataFor returns the *Metadata for a given relative path or nil if none
-// exists.
-//
-func (c *Corpus) MetadataFor(relpath string) *Metadata {
-	if m, _ := c.docMetadata.Get(); m != nil {
-		meta := m.(map[string]*Metadata)
-		// If metadata for this relpath exists, return it.
-		if p := meta[relpath]; p != nil {
-			return p
-		}
-		// Try with or without trailing slash.
-		if strings.HasSuffix(relpath, "/") {
-			relpath = relpath[:len(relpath)-1]
-		} else {
-			relpath = relpath + "/"
-		}
-		return meta[relpath]
-	}
-	return nil
-}
-
-// refreshMetadata sends a signal to update DocMetadata. If a refresh is in
-// progress the metadata will be refreshed again afterward.
-//
-func (c *Corpus) refreshMetadata() {
-	select {
-	case c.refreshMetadataSignal <- true:
-	default:
-	}
-}
-
-// RefreshMetadataLoop runs forever, updating DocMetadata when the underlying
-// file system changes. It should be launched in a goroutine.
-func (c *Corpus) refreshMetadataLoop() {
-	for {
-		<-c.refreshMetadataSignal
-		c.updateMetadata()
-		time.Sleep(10 * time.Second) // at most once every 10 seconds
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/page.go b/installer/vendor/golang.org/x/tools/godoc/page.go
deleted file mode 100644
index 10e86e5c8f..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/page.go
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"net/http"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-)
-
-// Page describes the contents of the top-level godoc webpage.
-type Page struct {
-	Title    string
-	Tabtitle string
-	Subtitle string
-	SrcPath  string
-	Query    string
-	Body     []byte
-	GoogleCN bool // page is being served from golang.google.cn
-
-	// filled in by servePage
-	SearchBox  bool
-	Playground bool
-	Version    string
-}
-
-func (p *Presentation) ServePage(w http.ResponseWriter, page Page) {
-	if page.Tabtitle == "" {
-		page.Tabtitle = page.Title
-	}
-	page.SearchBox = p.Corpus.IndexEnabled
-	page.Playground = p.ShowPlayground
-	page.Version = runtime.Version()
-	applyTemplateToResponseWriter(w, p.GodocHTML, page)
-}
-
-func (p *Presentation) ServeError(w http.ResponseWriter, r *http.Request, relpath string, err error) {
-	w.WriteHeader(http.StatusNotFound)
-	if perr, ok := err.(*os.PathError); ok {
-		rel, err := filepath.Rel(runtime.GOROOT(), perr.Path)
-		if err != nil {
-			perr.Path = "REDACTED"
-		} else {
-			perr.Path = filepath.Join("$GOROOT", rel)
-		}
-	}
-	p.ServePage(w, Page{
-		Title:    "File " + relpath,
-		Subtitle: relpath,
-		Body:     applyTemplate(p.ErrorHTML, "errorHTML", err),
-		GoogleCN: googleCN(r),
-	})
-}
-
-var onAppengine = false // overridden in appengine.go when on app engine
-
-func googleCN(r *http.Request) bool {
-	if r.FormValue("googlecn") != "" {
-		return true
-	}
-	if !onAppengine {
-		return false
-	}
-	if strings.HasSuffix(r.Host, ".cn") {
-		return true
-	}
-	switch r.Header.Get("X-AppEngine-Country") {
-	case "", "ZZ", "CN":
-		return true
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/parser.go b/installer/vendor/golang.org/x/tools/godoc/parser.go
deleted file mode 100644
index 4e644d6fc0..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/parser.go
+++ /dev/null
@@ -1,74 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains support functions for parsing .go files
-// accessed via godoc's file system fs.
-
-package godoc
-
-import (
-	"bytes"
-	"go/ast"
-	"go/parser"
-	"go/token"
-	pathpkg "path"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-var linePrefix = []byte("//line ")
-
-// This function replaces source lines starting with "//line " with a blank line.
-// It does this irrespective of whether the line is truly a line comment or not;
-// e.g., the line may be inside a string, or a /*-style comment; however that is
-// rather unlikely (proper testing would require a full Go scan which we want to
-// avoid for performance).
-func replaceLinePrefixCommentsWithBlankLine(src []byte) {
-	for {
-		i := bytes.Index(src, linePrefix)
-		if i < 0 {
-			break // we're done
-		}
-		// 0 <= i && i+len(linePrefix) <= len(src)
-		if i == 0 || src[i-1] == '\n' {
-			// at beginning of line: blank out line
-			for i < len(src) && src[i] != '\n' {
-				src[i] = ' '
-				i++
-			}
-		} else {
-			// not at beginning of line: skip over prefix
-			i += len(linePrefix)
-		}
-		// i <= len(src)
-		src = src[i:]
-	}
-}
-
-func (c *Corpus) parseFile(fset *token.FileSet, filename string, mode parser.Mode) (*ast.File, error) {
-	src, err := vfs.ReadFile(c.fs, filename)
-	if err != nil {
-		return nil, err
-	}
-
-	// Temporary ad-hoc fix for issue 5247.
-	// TODO(gri) Remove this in favor of a better fix, eventually (see issue 7702).
-	replaceLinePrefixCommentsWithBlankLine(src)
-
-	return parser.ParseFile(fset, filename, src, mode)
-}
-
-func (c *Corpus) parseFiles(fset *token.FileSet, relpath string, abspath string, localnames []string) (map[string]*ast.File, error) {
-	files := make(map[string]*ast.File)
-	for _, f := range localnames {
-		absname := pathpkg.Join(abspath, f)
-		file, err := c.parseFile(fset, absname, parser.ParseComments)
-		if err != nil {
-			return nil, err
-		}
-		files[pathpkg.Join(relpath, f)] = file
-	}
-
-	return files, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/pres.go b/installer/vendor/golang.org/x/tools/godoc/pres.go
deleted file mode 100644
index 855117764e..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/pres.go
+++ /dev/null
@@ -1,166 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"net/http"
-	"regexp"
-	"sync"
-	"text/template"
-
-	"golang.org/x/tools/godoc/vfs/httpfs"
-)
-
-// SearchResultFunc functions return an HTML body for displaying search results.
-type SearchResultFunc func(p *Presentation, result SearchResult) []byte
-
-// Presentation generates output from a corpus.
-type Presentation struct {
-	Corpus *Corpus
-
-	mux        *http.ServeMux
-	fileServer http.Handler
-	cmdHandler handlerServer
-	pkgHandler handlerServer
-
-	CallGraphHTML,
-	DirlistHTML,
-	ErrorHTML,
-	ExampleHTML,
-	GodocHTML,
-	ImplementsHTML,
-	MethodSetHTML,
-	PackageHTML,
-	PackageText,
-	SearchHTML,
-	SearchDocHTML,
-	SearchCodeHTML,
-	SearchTxtHTML,
-	SearchText,
-	SearchDescXML *template.Template
-
-	// TabWidth optionally specifies the tab width.
-	TabWidth int
-
-	ShowTimestamps bool
-	ShowPlayground bool
-	ShowExamples   bool
-	DeclLinks      bool
-
-	// SrcMode outputs source code instead of documentation in command-line mode.
-	SrcMode bool
-	// HTMLMode outputs HTML instead of plain text in command-line mode.
-	HTMLMode bool
-
-	// NotesRx optionally specifies a regexp to match
-	// notes to render in the output.
-	NotesRx *regexp.Regexp
-
-	// AdjustPageInfoMode optionally specifies a function to
-	// modify the PageInfoMode of a request. The default chosen
-	// value is provided.
-	AdjustPageInfoMode func(req *http.Request, mode PageInfoMode) PageInfoMode
-
-	// URLForSrc optionally specifies a function that takes a source file and
-	// returns a URL for it.
-	// The source file argument has the form /src/<path>/<filename>.
-	URLForSrc func(src string) string
-
-	// URLForSrcPos optionally specifies a function to create a URL given a
-	// source file, a line from the source file (1-based), and low & high offset
-	// positions (0-based, bytes from beginning of file). Ideally, the returned
-	// URL will be for the specified line of the file, while the high & low
-	// positions will be used to highlight a section of the file.
-	// The source file argument has the form /src/<path>/<filename>.
-	URLForSrcPos func(src string, line, low, high int) string
-
-	// URLForSrcQuery optionally specifies a function to create a URL given a
-	// source file, a query string, and a line from the source file (1-based).
-	// The source file argument has the form /src/<path>/<filename>.
-	// The query argument will be escaped for the purposes of embedding in a URL
-	// query parameter.
-	// Ideally, the returned URL will be for the specified line of the file with
-	// the query string highlighted.
-	URLForSrcQuery func(src, query string, line int) string
-
-	// SearchResults optionally specifies a list of functions returning an HTML
-	// body for displaying search results.
-	SearchResults []SearchResultFunc
-
-	initFuncMapOnce sync.Once
-	funcMap         template.FuncMap
-	templateFuncs   template.FuncMap
-}
-
-// NewPresentation returns a new Presentation from a corpus.
-// It sets SearchResults to:
-// [SearchResultDoc SearchResultCode SearchResultTxt].
-func NewPresentation(c *Corpus) *Presentation {
-	if c == nil {
-		panic("nil Corpus")
-	}
-	p := &Presentation{
-		Corpus:     c,
-		mux:        http.NewServeMux(),
-		fileServer: http.FileServer(httpfs.New(c.fs)),
-
-		TabWidth:     4,
-		ShowExamples: true,
-		DeclLinks:    true,
-		SearchResults: []SearchResultFunc{
-			(*Presentation).SearchResultDoc,
-			(*Presentation).SearchResultCode,
-			(*Presentation).SearchResultTxt,
-		},
-	}
-	p.cmdHandler = handlerServer{
-		p:       p,
-		c:       c,
-		pattern: "/cmd/",
-		fsRoot:  "/src",
-	}
-	p.pkgHandler = handlerServer{
-		p:           p,
-		c:           c,
-		pattern:     "/pkg/",
-		stripPrefix: "pkg/",
-		fsRoot:      "/src",
-		exclude:     []string{"/src/cmd"},
-	}
-	p.cmdHandler.registerWithMux(p.mux)
-	p.pkgHandler.registerWithMux(p.mux)
-	p.mux.HandleFunc("/", p.ServeFile)
-	p.mux.HandleFunc("/search", p.HandleSearch)
-	p.mux.HandleFunc("/opensearch.xml", p.serveSearchDesc)
-	return p
-}
-
-func (p *Presentation) FileServer() http.Handler {
-	return p.fileServer
-}
-
-func (p *Presentation) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	p.mux.ServeHTTP(w, r)
-}
-
-func (p *Presentation) PkgFSRoot() string {
-	return p.pkgHandler.fsRoot
-}
-
-func (p *Presentation) CmdFSRoot() string {
-	return p.cmdHandler.fsRoot
-}
-
-// TODO(bradfitz): move this to be a method on Corpus. Just moving code around for now,
-// but this doesn't feel right.
-func (p *Presentation) GetPkgPageInfo(abspath, relpath string, mode PageInfoMode) *PageInfo {
-	return p.pkgHandler.GetPageInfo(abspath, relpath, mode, "", "")
-}
-
-// TODO(bradfitz): move this to be a method on Corpus. Just moving code around for now,
-// but this doesn't feel right.
-func (p *Presentation) GetCmdPageInfo(abspath, relpath string, mode PageInfoMode) *PageInfo {
-	return p.cmdHandler.GetPageInfo(abspath, relpath, mode, "", "")
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/proxy/proxy.go b/installer/vendor/golang.org/x/tools/godoc/proxy/proxy.go
deleted file mode 100644
index 0ddaa008cd..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/proxy/proxy.go
+++ /dev/null
@@ -1,176 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-// Package proxy proxies requests to the sandbox compiler service and the
-// playground share handler.
-// It is designed to run only on the instance of godoc that serves golang.org.
-package proxy
-
-import (
-	"bytes"
-	"crypto/sha1"
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net/http"
-	"net/http/httputil"
-	"net/url"
-	"strings"
-	"time"
-
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/urlfetch"
-)
-
-type Request struct {
-	Body string
-}
-
-type Response struct {
-	Errors string
-	Events []Event
-}
-
-type Event struct {
-	Message string
-	Kind    string        // "stdout" or "stderr"
-	Delay   time.Duration // time to wait before printing Message
-}
-
-const (
-	// We need to use HTTP here for "reasons", but the traffic isn't
-	// sensitive and it only travels across Google's internal network
-	// so we should be OK.
-	sandboxURL    = "http://sandbox.golang.org/compile"
-	playgroundURL = "https://play.golang.org"
-)
-
-const expires = 7 * 24 * time.Hour // 1 week
-var cacheControlHeader = fmt.Sprintf("public, max-age=%d", int(expires.Seconds()))
-
-func RegisterHandlers(mux *http.ServeMux) {
-	mux.HandleFunc("/compile", compile)
-	mux.HandleFunc("/share", share)
-}
-
-func compile(w http.ResponseWriter, r *http.Request) {
-	if r.Method != "POST" {
-		http.Error(w, "I only answer to POST requests.", http.StatusMethodNotAllowed)
-		return
-	}
-
-	c := appengine.NewContext(r)
-
-	body := r.FormValue("body")
-	res := &Response{}
-	key := cacheKey(body)
-	if _, err := memcache.Gob.Get(c, key, res); err != nil {
-		if err != memcache.ErrCacheMiss {
-			log.Errorf(c, "getting response cache: %v", err)
-		}
-
-		req := &Request{Body: body}
-		if err := makeSandboxRequest(c, req, res); err != nil {
-			log.Errorf(c, "compile error: %v", err)
-			http.Error(w, "Internal Server Error", http.StatusInternalServerError)
-			return
-		}
-
-		item := &memcache.Item{Key: key, Object: res}
-		if err := memcache.Gob.Set(c, item); err != nil {
-			log.Errorf(c, "setting response cache: %v", err)
-		}
-	}
-
-	expiresTime := time.Now().Add(expires).UTC()
-	w.Header().Set("Expires", expiresTime.Format(time.RFC1123))
-	w.Header().Set("Cache-Control", cacheControlHeader)
-
-	var out interface{}
-	switch r.FormValue("version") {
-	case "2":
-		out = res
-	default: // "1"
-		out = struct {
-			CompileErrors string `json:"compile_errors"`
-			Output        string `json:"output"`
-		}{res.Errors, flatten(res.Events)}
-	}
-	if err := json.NewEncoder(w).Encode(out); err != nil {
-		log.Errorf(c, "encoding response: %v", err)
-	}
-}
-
-// makeSandboxRequest sends the given Request to the sandbox
-// and stores the response in the given Response.
-func makeSandboxRequest(c context.Context, req *Request, res *Response) error {
-	reqJ, err := json.Marshal(req)
-	if err != nil {
-		return fmt.Errorf("marshalling request: %v", err)
-	}
-	r, err := urlfetch.Client(c).Post(sandboxURL, "application/json", bytes.NewReader(reqJ))
-	if err != nil {
-		return fmt.Errorf("making request: %v", err)
-	}
-	defer r.Body.Close()
-	if r.StatusCode != http.StatusOK {
-		b, _ := ioutil.ReadAll(r.Body)
-		return fmt.Errorf("bad status: %v body:\n%s", r.Status, b)
-	}
-	err = json.NewDecoder(r.Body).Decode(res)
-	if err != nil {
-		return fmt.Errorf("unmarshalling response: %v", err)
-	}
-	return nil
-}
-
-// flatten takes a sequence of Events and returns their contents, concatenated.
-func flatten(seq []Event) string {
-	var buf bytes.Buffer
-	for _, e := range seq {
-		buf.WriteString(e.Message)
-	}
-	return buf.String()
-}
-
-func cacheKey(body string) string {
-	h := sha1.New()
-	io.WriteString(h, body)
-	return fmt.Sprintf("prog-%x", h.Sum(nil))
-}
-
-func share(w http.ResponseWriter, r *http.Request) {
-	if googleCN(r) {
-		http.Error(w, http.StatusText(http.StatusForbidden), http.StatusForbidden)
-		return
-	}
-	target, _ := url.Parse(playgroundURL)
-	p := httputil.NewSingleHostReverseProxy(target)
-	p.Transport = &urlfetch.Transport{Context: appengine.NewContext(r)}
-	p.ServeHTTP(w, r)
-}
-
-func googleCN(r *http.Request) bool {
-	if r.FormValue("googlecn") != "" {
-		return true
-	}
-	if appengine.IsDevAppServer() {
-		return false
-	}
-	if strings.HasSuffix(r.Host, ".cn") {
-		return true
-	}
-	switch r.Header.Get("X-AppEngine-Country") {
-	case "", "ZZ", "CN":
-		return true
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/redirect/hash.go b/installer/vendor/golang.org/x/tools/godoc/redirect/hash.go
deleted file mode 100644
index d5a1e3eb67..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/redirect/hash.go
+++ /dev/null
@@ -1,138 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file provides a compact encoding of
-// a map of Mercurial hashes to Git hashes.
-
-package redirect
-
-import (
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-	"sort"
-	"strconv"
-	"strings"
-)
-
-// hashMap is a map of Mercurial hashes to Git hashes.
-type hashMap struct {
-	file    *os.File
-	entries int
-}
-
-// newHashMap takes a file handle that contains a map of Mercurial to Git
-// hashes. The file should be a sequence of pairs of little-endian encoded
-// uint32s, representing a hgHash and a gitHash respectively.
-// The sequence must be sorted by hgHash.
-// The file must remain open for as long as the returned hashMap is used.
-func newHashMap(f *os.File) (*hashMap, error) {
-	fi, err := f.Stat()
-	if err != nil {
-		return nil, err
-	}
-	return &hashMap{file: f, entries: int(fi.Size() / 8)}, nil
-}
-
-// Lookup finds an hgHash in the map that matches the given prefix, and returns
-// its corresponding gitHash. The prefix must be at least 8 characters long.
-func (m *hashMap) Lookup(s string) gitHash {
-	if m == nil {
-		return 0
-	}
-	hg, err := hgHashFromString(s)
-	if err != nil {
-		return 0
-	}
-	var git gitHash
-	b := make([]byte, 8)
-	sort.Search(m.entries, func(i int) bool {
-		n, err := m.file.ReadAt(b, int64(i*8))
-		if err != nil {
-			panic(err)
-		}
-		if n != 8 {
-			panic(io.ErrUnexpectedEOF)
-		}
-		v := hgHash(binary.LittleEndian.Uint32(b[:4]))
-		if v == hg {
-			git = gitHash(binary.LittleEndian.Uint32(b[4:]))
-		}
-		return v >= hg
-	})
-	return git
-}
-
-// hgHash represents the lower (leftmost) 32 bits of a Mercurial hash.
-type hgHash uint32
-
-func (h hgHash) String() string {
-	return intToHash(int64(h))
-}
-
-func hgHashFromString(s string) (hgHash, error) {
-	if len(s) < 8 {
-		return 0, fmt.Errorf("string too small: len(s) = %d", len(s))
-	}
-	hash := s[:8]
-	i, err := strconv.ParseInt(hash, 16, 64)
-	if err != nil {
-		return 0, err
-	}
-	return hgHash(i), nil
-}
-
-// gitHash represents the leftmost 28 bits of a Git hash in its upper 28 bits,
-// and it encodes hash's repository in the lower 4  bits.
-type gitHash uint32
-
-func (h gitHash) Hash() string {
-	return intToHash(int64(h))[:7]
-}
-
-func (h gitHash) Repo() string {
-	return repo(h & 0xF).String()
-}
-
-func intToHash(i int64) string {
-	s := strconv.FormatInt(i, 16)
-	if len(s) < 8 {
-		s = strings.Repeat("0", 8-len(s)) + s
-	}
-	return s
-}
-
-// repo represents a Go Git repository.
-type repo byte
-
-const (
-	repoGo repo = iota
-	repoBlog
-	repoCrypto
-	repoExp
-	repoImage
-	repoMobile
-	repoNet
-	repoSys
-	repoTalks
-	repoText
-	repoTools
-)
-
-func (r repo) String() string {
-	return map[repo]string{
-		repoGo:     "go",
-		repoBlog:   "blog",
-		repoCrypto: "crypto",
-		repoExp:    "exp",
-		repoImage:  "image",
-		repoMobile: "mobile",
-		repoNet:    "net",
-		repoSys:    "sys",
-		repoTalks:  "talks",
-		repoText:   "text",
-		repoTools:  "tools",
-	}[r]
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/redirect/redirect.go b/installer/vendor/golang.org/x/tools/godoc/redirect/redirect.go
deleted file mode 100644
index f86e0ada52..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/redirect/redirect.go
+++ /dev/null
@@ -1,250 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package redirect provides hooks to register HTTP handlers that redirect old
-// godoc paths to their new equivalents and assist in accessing the issue
-// tracker, wiki, code review system, etc.
-package redirect // import "golang.org/x/tools/godoc/redirect"
-
-import (
-	"fmt"
-	"net/http"
-	"os"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// Register registers HTTP handlers that redirect old godoc paths to their new
-// equivalents and assist in accessing the issue tracker, wiki, code review
-// system, etc. If mux is nil it uses http.DefaultServeMux.
-func Register(mux *http.ServeMux) {
-	if mux == nil {
-		mux = http.DefaultServeMux
-	}
-	handlePathRedirects(mux, pkgRedirects, "/pkg/")
-	handlePathRedirects(mux, cmdRedirects, "/cmd/")
-	for prefix, redirect := range prefixHelpers {
-		p := "/" + prefix + "/"
-		mux.Handle(p, PrefixHandler(p, redirect))
-	}
-	for path, redirect := range redirects {
-		mux.Handle(path, Handler(redirect))
-	}
-	// NB: /src/pkg (sans trailing slash) is the index of packages.
-	mux.HandleFunc("/src/pkg/", srcPkgHandler)
-	mux.HandleFunc("/cl/", clHandler)
-	mux.HandleFunc("/change/", changeHandler)
-	mux.HandleFunc("/design/", designHandler)
-}
-
-func handlePathRedirects(mux *http.ServeMux, redirects map[string]string, prefix string) {
-	for source, target := range redirects {
-		h := Handler(prefix + target + "/")
-		p := prefix + source
-		mux.Handle(p, h)
-		mux.Handle(p+"/", h)
-	}
-}
-
-// Packages that were renamed between r60 and go1.
-var pkgRedirects = map[string]string{
-	"asn1":              "encoding/asn1",
-	"big":               "math/big",
-	"cmath":             "math/cmplx",
-	"csv":               "encoding/csv",
-	"exec":              "os/exec",
-	"exp/template/html": "html/template",
-	"gob":               "encoding/gob",
-	"http":              "net/http",
-	"http/cgi":          "net/http/cgi",
-	"http/fcgi":         "net/http/fcgi",
-	"http/httptest":     "net/http/httptest",
-	"http/pprof":        "net/http/pprof",
-	"json":              "encoding/json",
-	"mail":              "net/mail",
-	"rand":              "math/rand",
-	"rpc":               "net/rpc",
-	"rpc/jsonrpc":       "net/rpc/jsonrpc",
-	"scanner":           "text/scanner",
-	"smtp":              "net/smtp",
-	"tabwriter":         "text/tabwriter",
-	"template":          "text/template",
-	"template/parse":    "text/template/parse",
-	"url":               "net/url",
-	"utf16":             "unicode/utf16",
-	"utf8":              "unicode/utf8",
-	"xml":               "encoding/xml",
-}
-
-// Commands that were renamed between r60 and go1.
-var cmdRedirects = map[string]string{
-	"gofix":     "fix",
-	"goinstall": "go",
-	"gopack":    "pack",
-	"gotest":    "go",
-	"govet":     "vet",
-	"goyacc":    "yacc",
-}
-
-var redirects = map[string]string{
-	"/blog":       "/blog/",
-	"/build":      "http://build.golang.org",
-	"/change":     "https://go.googlesource.com/go",
-	"/cl":         "https://go-review.googlesource.com",
-	"/cmd/godoc/": "http://godoc.org/golang.org/x/tools/cmd/godoc/",
-	"/issue":      "https://github.com/golang/go/issues",
-	"/issue/new":  "https://github.com/golang/go/issues/new",
-	"/issues":     "https://github.com/golang/go/issues",
-	"/issues/new": "https://github.com/golang/go/issues/new",
-	"/play":       "http://play.golang.org",
-	"/design":     "https://github.com/golang/proposal/tree/master/design",
-
-	// In Go 1.2 the references page is part of /doc/.
-	"/ref": "/doc/#references",
-	// This next rule clobbers /ref/spec and /ref/mem.
-	// TODO(adg): figure out what to do here, if anything.
-	// "/ref/": "/doc/#references",
-
-	// Be nice to people who are looking in the wrong place.
-	"/doc/mem":  "/ref/mem",
-	"/doc/spec": "/ref/spec",
-
-	"/talks": "http://talks.golang.org",
-	"/tour":  "http://tour.golang.org",
-	"/wiki":  "https://github.com/golang/go/wiki",
-
-	"/doc/articles/c_go_cgo.html":                    "/blog/c-go-cgo",
-	"/doc/articles/concurrency_patterns.html":        "/blog/go-concurrency-patterns-timing-out-and",
-	"/doc/articles/defer_panic_recover.html":         "/blog/defer-panic-and-recover",
-	"/doc/articles/error_handling.html":              "/blog/error-handling-and-go",
-	"/doc/articles/gobs_of_data.html":                "/blog/gobs-of-data",
-	"/doc/articles/godoc_documenting_go_code.html":   "/blog/godoc-documenting-go-code",
-	"/doc/articles/gos_declaration_syntax.html":      "/blog/gos-declaration-syntax",
-	"/doc/articles/image_draw.html":                  "/blog/go-imagedraw-package",
-	"/doc/articles/image_package.html":               "/blog/go-image-package",
-	"/doc/articles/json_and_go.html":                 "/blog/json-and-go",
-	"/doc/articles/json_rpc_tale_of_interfaces.html": "/blog/json-rpc-tale-of-interfaces",
-	"/doc/articles/laws_of_reflection.html":          "/blog/laws-of-reflection",
-	"/doc/articles/slices_usage_and_internals.html":  "/blog/go-slices-usage-and-internals",
-	"/doc/go_for_cpp_programmers.html":               "/wiki/GoForCPPProgrammers",
-	"/doc/go_tutorial.html":                          "http://tour.golang.org/",
-}
-
-var prefixHelpers = map[string]string{
-	"issue":  "https://github.com/golang/go/issues/",
-	"issues": "https://github.com/golang/go/issues/",
-	"play":   "http://play.golang.org/",
-	"talks":  "http://talks.golang.org/",
-	"wiki":   "https://github.com/golang/go/wiki/",
-}
-
-func Handler(target string) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		url := target
-		if qs := r.URL.RawQuery; qs != "" {
-			url += "?" + qs
-		}
-		http.Redirect(w, r, url, http.StatusMovedPermanently)
-	})
-}
-
-var validId = regexp.MustCompile(`^[A-Za-z0-9-]*/?$`)
-
-func PrefixHandler(prefix, baseURL string) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		if p := r.URL.Path; p == prefix {
-			// redirect /prefix/ to /prefix
-			http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
-			return
-		}
-		id := r.URL.Path[len(prefix):]
-		if !validId.MatchString(id) {
-			http.Error(w, "Not found", http.StatusNotFound)
-			return
-		}
-		target := baseURL + id
-		http.Redirect(w, r, target, http.StatusFound)
-	})
-}
-
-// Redirect requests from the old "/src/pkg/foo" to the new "/src/foo".
-// See http://golang.org/s/go14nopkg
-func srcPkgHandler(w http.ResponseWriter, r *http.Request) {
-	r.URL.Path = "/src/" + r.URL.Path[len("/src/pkg/"):]
-	http.Redirect(w, r, r.URL.String(), http.StatusMovedPermanently)
-}
-
-func clHandler(w http.ResponseWriter, r *http.Request) {
-	const prefix = "/cl/"
-	if p := r.URL.Path; p == prefix {
-		// redirect /prefix/ to /prefix
-		http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
-		return
-	}
-	id := r.URL.Path[len(prefix):]
-	// support /cl/152700045/, which is used in commit 0edafefc36.
-	id = strings.TrimSuffix(id, "/")
-	if !validId.MatchString(id) {
-		http.Error(w, "Not found", http.StatusNotFound)
-		return
-	}
-	target := ""
-	// the first CL in rietveld is about 152046, so only treat the id as
-	// a rietveld CL if it is larger than 150000.
-	if n, err := strconv.Atoi(id); err == nil && n > 150000 {
-		target = "https://codereview.appspot.com/" + id
-	} else {
-		target = "https://go-review.googlesource.com/" + id
-	}
-	http.Redirect(w, r, target, http.StatusFound)
-}
-
-var changeMap *hashMap
-
-// LoadChangeMap loads the specified map of Mercurial to Git revisions,
-// which is used by the /change/ handler to intelligently map old hg
-// revisions to their new git equivalents.
-// It should be called before calling Register.
-// The file should remain open as long as the process is running.
-// See the implementation of this package for details.
-func LoadChangeMap(filename string) error {
-	f, err := os.Open(filename)
-	if err != nil {
-		return err
-	}
-	m, err := newHashMap(f)
-	if err != nil {
-		return err
-	}
-	changeMap = m
-	return nil
-}
-
-func changeHandler(w http.ResponseWriter, r *http.Request) {
-	const prefix = "/change/"
-	if p := r.URL.Path; p == prefix {
-		// redirect /prefix/ to /prefix
-		http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
-		return
-	}
-	hash := r.URL.Path[len(prefix):]
-	target := "https://go.googlesource.com/go/+/" + hash
-	if git := changeMap.Lookup(hash); git > 0 {
-		target = fmt.Sprintf("https://go.googlesource.com/%v/+/%v", git.Repo(), git.Hash())
-	}
-	http.Redirect(w, r, target, http.StatusFound)
-}
-
-func designHandler(w http.ResponseWriter, r *http.Request) {
-	const prefix = "/design/"
-	if p := r.URL.Path; p == prefix {
-		// redirect /prefix/ to /prefix
-		http.Redirect(w, r, p[:len(p)-1], http.StatusFound)
-		return
-	}
-	name := r.URL.Path[len(prefix):]
-	target := "https://github.com/golang/proposal/blob/master/design/" + name + ".md"
-	http.Redirect(w, r, target, http.StatusFound)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/redirect/redirect_test.go b/installer/vendor/golang.org/x/tools/godoc/redirect/redirect_test.go
deleted file mode 100644
index cfc2f9790c..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/redirect/redirect_test.go
+++ /dev/null
@@ -1,104 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package redirect
-
-import (
-	"net/http"
-	"net/http/httptest"
-	"testing"
-)
-
-type redirectResult struct {
-	status int
-	path   string
-}
-
-func errorResult(status int) redirectResult {
-	return redirectResult{status, ""}
-}
-
-func TestRedirects(t *testing.T) {
-	var tests = map[string]redirectResult{
-		"/build":    {301, "http://build.golang.org"},
-		"/ref":      {301, "/doc/#references"},
-		"/doc/mem":  {301, "/ref/mem"},
-		"/doc/spec": {301, "/ref/spec"},
-		"/tour":     {301, "http://tour.golang.org"},
-		"/foo":      errorResult(404),
-
-		"/pkg/asn1":           {301, "/pkg/encoding/asn1/"},
-		"/pkg/template/parse": {301, "/pkg/text/template/parse/"},
-
-		"/src/pkg/foo": {301, "/src/foo"},
-
-		"/cmd/gofix": {301, "/cmd/fix/"},
-
-		// git commits (/change)
-		// TODO: mercurial tags and LoadChangeMap.
-		"/change":   {301, "https://go.googlesource.com/go"},
-		"/change/a": {302, "https://go.googlesource.com/go/+/a"},
-
-		"/issue":                    {301, "https://github.com/golang/go/issues"},
-		"/issue?":                   {301, "https://github.com/golang/go/issues"},
-		"/issue/1":                  {302, "https://github.com/golang/go/issues/1"},
-		"/issue/new":                {301, "https://github.com/golang/go/issues/new"},
-		"/issue/new?a=b&c=d%20&e=f": {301, "https://github.com/golang/go/issues/new?a=b&c=d%20&e=f"},
-		"/issues":                   {301, "https://github.com/golang/go/issues"},
-		"/issues/1":                 {302, "https://github.com/golang/go/issues/1"},
-		"/issues/new":               {301, "https://github.com/golang/go/issues/new"},
-		"/issues/1/2/3":             errorResult(404),
-
-		"/wiki/foo":  {302, "https://github.com/golang/go/wiki/foo"},
-		"/wiki/foo/": {302, "https://github.com/golang/go/wiki/foo/"},
-
-		"/design":              {301, "https://github.com/golang/proposal/tree/master/design"},
-		"/design/":             {302, "/design"},
-		"/design/123-foo":      {302, "https://github.com/golang/proposal/blob/master/design/123-foo.md"},
-		"/design/text/123-foo": {302, "https://github.com/golang/proposal/blob/master/design/text/123-foo.md"},
-
-		"/cl/1":          {302, "https://go-review.googlesource.com/1"},
-		"/cl/1/":         {302, "https://go-review.googlesource.com/1"},
-		"/cl/267120043":  {302, "https://codereview.appspot.com/267120043"},
-		"/cl/267120043/": {302, "https://codereview.appspot.com/267120043"},
-	}
-
-	mux := http.NewServeMux()
-	Register(mux)
-	ts := httptest.NewServer(mux)
-	defer ts.Close()
-
-	for path, want := range tests {
-		if want.path != "" && want.path[0] == '/' {
-			// All redirects are absolute.
-			want.path = ts.URL + want.path
-		}
-
-		req, err := http.NewRequest("GET", ts.URL+path, nil)
-		if err != nil {
-			t.Errorf("(path: %q) unexpected error: %v", path, err)
-			continue
-		}
-
-		resp, err := http.DefaultTransport.RoundTrip(req)
-		if err != nil {
-			t.Errorf("(path: %q) unexpected error: %v", path, err)
-			continue
-		}
-
-		if resp.StatusCode != want.status {
-			t.Errorf("(path: %q) got status %d, want %d", path, resp.StatusCode, want.status)
-		}
-
-		if want.status != 301 && want.status != 302 {
-			// Not a redirect. Just check status.
-			continue
-		}
-
-		out, _ := resp.Location()
-		if got := out.String(); got != want.path {
-			t.Errorf("(path: %q) got %s, want %s", path, got, want.path)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/search.go b/installer/vendor/golang.org/x/tools/godoc/search.go
deleted file mode 100644
index d61193f218..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/search.go
+++ /dev/null
@@ -1,139 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"fmt"
-	"net/http"
-	"regexp"
-	"strings"
-)
-
-type SearchResult struct {
-	Query string
-	Alert string // error or warning message
-
-	// identifier matches
-	Pak HitList       // packages matching Query
-	Hit *LookupResult // identifier matches of Query
-	Alt *AltWords     // alternative identifiers to look for
-
-	// textual matches
-	Found    int         // number of textual occurrences found
-	Textual  []FileLines // textual matches of Query
-	Complete bool        // true if all textual occurrences of Query are reported
-	Idents   map[SpotKind][]Ident
-}
-
-func (c *Corpus) Lookup(query string) SearchResult {
-	result := &SearchResult{Query: query}
-
-	index, timestamp := c.CurrentIndex()
-	if index != nil {
-		// identifier search
-		if r, err := index.Lookup(query); err == nil {
-			result = r
-		} else if err != nil && !c.IndexFullText {
-			// ignore the error if full text search is enabled
-			// since the query may be a valid regular expression
-			result.Alert = "Error in query string: " + err.Error()
-			return *result
-		}
-
-		// full text search
-		if c.IndexFullText && query != "" {
-			rx, err := regexp.Compile(query)
-			if err != nil {
-				result.Alert = "Error in query regular expression: " + err.Error()
-				return *result
-			}
-			// If we get maxResults+1 results we know that there are more than
-			// maxResults results and thus the result may be incomplete (to be
-			// precise, we should remove one result from the result set, but
-			// nobody is going to count the results on the result page).
-			result.Found, result.Textual = index.LookupRegexp(rx, c.MaxResults+1)
-			result.Complete = result.Found <= c.MaxResults
-			if !result.Complete {
-				result.Found-- // since we looked for maxResults+1
-			}
-		}
-	}
-
-	// is the result accurate?
-	if c.IndexEnabled {
-		if ts := c.FSModifiedTime(); timestamp.Before(ts) {
-			// The index is older than the latest file system change under godoc's observation.
-			result.Alert = "Indexing in progress: result may be inaccurate"
-		}
-	} else {
-		result.Alert = "Search index disabled: no results available"
-	}
-
-	return *result
-}
-
-// SearchResultDoc optionally specifies a function returning an HTML body
-// displaying search results matching godoc documentation.
-func (p *Presentation) SearchResultDoc(result SearchResult) []byte {
-	return applyTemplate(p.SearchDocHTML, "searchDocHTML", result)
-}
-
-// SearchResultCode optionally specifies a function returning an HTML body
-// displaying search results matching source code.
-func (p *Presentation) SearchResultCode(result SearchResult) []byte {
-	return applyTemplate(p.SearchCodeHTML, "searchCodeHTML", result)
-}
-
-// SearchResultTxt optionally specifies a function returning an HTML body
-// displaying search results of textual matches.
-func (p *Presentation) SearchResultTxt(result SearchResult) []byte {
-	return applyTemplate(p.SearchTxtHTML, "searchTxtHTML", result)
-}
-
-// HandleSearch obtains results for the requested search and returns a page
-// to display them.
-func (p *Presentation) HandleSearch(w http.ResponseWriter, r *http.Request) {
-	query := strings.TrimSpace(r.FormValue("q"))
-	result := p.Corpus.Lookup(query)
-
-	if p.GetPageInfoMode(r)&NoHTML != 0 {
-		p.ServeText(w, applyTemplate(p.SearchText, "searchText", result))
-		return
-	}
-	contents := bytes.Buffer{}
-	for _, f := range p.SearchResults {
-		contents.Write(f(p, result))
-	}
-
-	var title string
-	if haveResults := contents.Len() > 0; haveResults {
-		title = fmt.Sprintf(`Results for query: %v`, query)
-		if !p.Corpus.IndexEnabled {
-			result.Alert = ""
-		}
-	} else {
-		title = fmt.Sprintf(`No results found for query %q`, query)
-	}
-
-	body := bytes.NewBuffer(applyTemplate(p.SearchHTML, "searchHTML", result))
-	body.Write(contents.Bytes())
-
-	p.ServePage(w, Page{
-		Title:    title,
-		Tabtitle: query,
-		Query:    query,
-		Body:     body.Bytes(),
-		GoogleCN: googleCN(r),
-	})
-}
-
-func (p *Presentation) serveSearchDesc(w http.ResponseWriter, r *http.Request) {
-	w.Header().Set("Content-Type", "application/opensearchdescription+xml")
-	data := map[string]interface{}{
-		"BaseURL": fmt.Sprintf("http://%s", r.Host),
-	}
-	applyTemplateToResponseWriter(w, p.SearchDescXML, &data)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/server.go b/installer/vendor/golang.org/x/tools/godoc/server.go
deleted file mode 100644
index 3b452e5eda..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/server.go
+++ /dev/null
@@ -1,802 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/doc"
-	"go/token"
-	htmlpkg "html"
-	htmltemplate "html/template"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/http"
-	"os"
-	pathpkg "path"
-	"path/filepath"
-	"sort"
-	"strings"
-	"text/template"
-	"time"
-
-	"golang.org/x/tools/godoc/analysis"
-	"golang.org/x/tools/godoc/util"
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// handlerServer is a migration from an old godoc http Handler type.
-// This should probably merge into something else.
-type handlerServer struct {
-	p           *Presentation
-	c           *Corpus  // copy of p.Corpus
-	pattern     string   // url pattern; e.g. "/pkg/"
-	stripPrefix string   // prefix to strip from import path; e.g. "pkg/"
-	fsRoot      string   // file system root to which the pattern is mapped; e.g. "/src"
-	exclude     []string // file system paths to exclude; e.g. "/src/cmd"
-}
-
-func (s *handlerServer) registerWithMux(mux *http.ServeMux) {
-	mux.Handle(s.pattern, s)
-}
-
-// getPageInfo returns the PageInfo for a package directory abspath. If the
-// parameter genAST is set, an AST containing only the package exports is
-// computed (PageInfo.PAst), otherwise package documentation (PageInfo.Doc)
-// is extracted from the AST. If there is no corresponding package in the
-// directory, PageInfo.PAst and PageInfo.PDoc are nil. If there are no sub-
-// directories, PageInfo.Dirs is nil. If an error occurred, PageInfo.Err is
-// set to the respective error but the error is not logged.
-//
-func (h *handlerServer) GetPageInfo(abspath, relpath string, mode PageInfoMode, goos, goarch string) *PageInfo {
-	info := &PageInfo{Dirname: abspath, Mode: mode}
-
-	// Restrict to the package files that would be used when building
-	// the package on this system.  This makes sure that if there are
-	// separate implementations for, say, Windows vs Unix, we don't
-	// jumble them all together.
-	// Note: If goos/goarch aren't set, the current binary's GOOS/GOARCH
-	// are used.
-	ctxt := build.Default
-	ctxt.IsAbsPath = pathpkg.IsAbs
-	ctxt.IsDir = func(path string) bool {
-		fi, err := h.c.fs.Stat(filepath.ToSlash(path))
-		return err == nil && fi.IsDir()
-	}
-	ctxt.ReadDir = func(dir string) ([]os.FileInfo, error) {
-		f, err := h.c.fs.ReadDir(filepath.ToSlash(dir))
-		filtered := make([]os.FileInfo, 0, len(f))
-		for _, i := range f {
-			if mode&NoFiltering != 0 || i.Name() != "internal" {
-				filtered = append(filtered, i)
-			}
-		}
-		return filtered, err
-	}
-	ctxt.OpenFile = func(name string) (r io.ReadCloser, err error) {
-		data, err := vfs.ReadFile(h.c.fs, filepath.ToSlash(name))
-		if err != nil {
-			return nil, err
-		}
-		return ioutil.NopCloser(bytes.NewReader(data)), nil
-	}
-
-	if goos != "" {
-		ctxt.GOOS = goos
-	}
-	if goarch != "" {
-		ctxt.GOARCH = goarch
-	}
-
-	pkginfo, err := ctxt.ImportDir(abspath, 0)
-	// continue if there are no Go source files; we still want the directory info
-	if _, nogo := err.(*build.NoGoError); err != nil && !nogo {
-		info.Err = err
-		return info
-	}
-
-	// collect package files
-	pkgname := pkginfo.Name
-	pkgfiles := append(pkginfo.GoFiles, pkginfo.CgoFiles...)
-	if len(pkgfiles) == 0 {
-		// Commands written in C have no .go files in the build.
-		// Instead, documentation may be found in an ignored file.
-		// The file may be ignored via an explicit +build ignore
-		// constraint (recommended), or by defining the package
-		// documentation (historic).
-		pkgname = "main" // assume package main since pkginfo.Name == ""
-		pkgfiles = pkginfo.IgnoredGoFiles
-	}
-
-	// get package information, if any
-	if len(pkgfiles) > 0 {
-		// build package AST
-		fset := token.NewFileSet()
-		files, err := h.c.parseFiles(fset, relpath, abspath, pkgfiles)
-		if err != nil {
-			info.Err = err
-			return info
-		}
-
-		// ignore any errors - they are due to unresolved identifiers
-		pkg, _ := ast.NewPackage(fset, files, poorMansImporter, nil)
-
-		// extract package documentation
-		info.FSet = fset
-		if mode&ShowSource == 0 {
-			// show extracted documentation
-			var m doc.Mode
-			if mode&NoFiltering != 0 {
-				m |= doc.AllDecls
-			}
-			if mode&AllMethods != 0 {
-				m |= doc.AllMethods
-			}
-			info.PDoc = doc.New(pkg, pathpkg.Clean(relpath), m) // no trailing '/' in importpath
-			if mode&NoTypeAssoc != 0 {
-				for _, t := range info.PDoc.Types {
-					info.PDoc.Consts = append(info.PDoc.Consts, t.Consts...)
-					info.PDoc.Vars = append(info.PDoc.Vars, t.Vars...)
-					info.PDoc.Funcs = append(info.PDoc.Funcs, t.Funcs...)
-					t.Consts = nil
-					t.Vars = nil
-					t.Funcs = nil
-				}
-				// for now we cannot easily sort consts and vars since
-				// go/doc.Value doesn't export the order information
-				sort.Sort(funcsByName(info.PDoc.Funcs))
-			}
-
-			// collect examples
-			testfiles := append(pkginfo.TestGoFiles, pkginfo.XTestGoFiles...)
-			files, err = h.c.parseFiles(fset, relpath, abspath, testfiles)
-			if err != nil {
-				log.Println("parsing examples:", err)
-			}
-			info.Examples = collectExamples(h.c, pkg, files)
-
-			// collect any notes that we want to show
-			if info.PDoc.Notes != nil {
-				// could regexp.Compile only once per godoc, but probably not worth it
-				if rx := h.p.NotesRx; rx != nil {
-					for m, n := range info.PDoc.Notes {
-						if rx.MatchString(m) {
-							if info.Notes == nil {
-								info.Notes = make(map[string][]*doc.Note)
-							}
-							info.Notes[m] = n
-						}
-					}
-				}
-			}
-
-		} else {
-			// show source code
-			// TODO(gri) Consider eliminating export filtering in this mode,
-			//           or perhaps eliminating the mode altogether.
-			if mode&NoFiltering == 0 {
-				packageExports(fset, pkg)
-			}
-			info.PAst = files
-		}
-		info.IsMain = pkgname == "main"
-	}
-
-	// get directory information, if any
-	var dir *Directory
-	var timestamp time.Time
-	if tree, ts := h.c.fsTree.Get(); tree != nil && tree.(*Directory) != nil {
-		// directory tree is present; lookup respective directory
-		// (may still fail if the file system was updated and the
-		// new directory tree has not yet been computed)
-		dir = tree.(*Directory).lookup(abspath)
-		timestamp = ts
-	}
-	if dir == nil {
-		// no directory tree present (too early after startup or
-		// command-line mode); compute one level for this page
-		// note: cannot use path filter here because in general
-		//       it doesn't contain the FSTree path
-		dir = h.c.newDirectory(abspath, 1)
-		timestamp = time.Now()
-	}
-	info.Dirs = dir.listing(true, func(path string) bool { return h.includePath(path, mode) })
-
-	info.DirTime = timestamp
-	info.DirFlat = mode&FlatDir != 0
-
-	return info
-}
-
-func (h *handlerServer) includePath(path string, mode PageInfoMode) (r bool) {
-	// if the path is under one of the exclusion paths, don't list.
-	for _, e := range h.exclude {
-		if strings.HasPrefix(path, e) {
-			return false
-		}
-	}
-
-	// if the path includes 'internal', don't list unless we are in the NoFiltering mode.
-	if mode&NoFiltering != 0 {
-		return true
-	}
-	if strings.Contains(path, "internal") || strings.Contains(path, "vendor") {
-		for _, c := range strings.Split(filepath.Clean(path), string(os.PathSeparator)) {
-			if c == "internal" || c == "vendor" {
-				return false
-			}
-		}
-	}
-	return true
-}
-
-type funcsByName []*doc.Func
-
-func (s funcsByName) Len() int           { return len(s) }
-func (s funcsByName) Swap(i, j int)      { s[i], s[j] = s[j], s[i] }
-func (s funcsByName) Less(i, j int) bool { return s[i].Name < s[j].Name }
-
-func (h *handlerServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
-	if redirect(w, r) {
-		return
-	}
-
-	relpath := pathpkg.Clean(r.URL.Path[len(h.stripPrefix)+1:])
-	abspath := pathpkg.Join(h.fsRoot, relpath)
-	mode := h.p.GetPageInfoMode(r)
-	if relpath == builtinPkgPath {
-		mode = NoFiltering | NoTypeAssoc
-	}
-	info := h.GetPageInfo(abspath, relpath, mode, r.FormValue("GOOS"), r.FormValue("GOARCH"))
-	if info.Err != nil {
-		log.Print(info.Err)
-		h.p.ServeError(w, r, relpath, info.Err)
-		return
-	}
-
-	if mode&NoHTML != 0 {
-		h.p.ServeText(w, applyTemplate(h.p.PackageText, "packageText", info))
-		return
-	}
-
-	var tabtitle, title, subtitle string
-	switch {
-	case info.PAst != nil:
-		for _, ast := range info.PAst {
-			tabtitle = ast.Name.Name
-			break
-		}
-	case info.PDoc != nil:
-		tabtitle = info.PDoc.Name
-	default:
-		tabtitle = info.Dirname
-		title = "Directory "
-		if h.p.ShowTimestamps {
-			subtitle = "Last update: " + info.DirTime.String()
-		}
-	}
-	if title == "" {
-		if info.IsMain {
-			// assume that the directory name is the command name
-			_, tabtitle = pathpkg.Split(relpath)
-			title = "Command "
-		} else {
-			title = "Package "
-		}
-	}
-	title += tabtitle
-
-	// special cases for top-level package/command directories
-	switch tabtitle {
-	case "/src":
-		title = "Packages"
-		tabtitle = "Packages"
-	case "/src/cmd":
-		title = "Commands"
-		tabtitle = "Commands"
-	}
-
-	// Emit JSON array for type information.
-	pi := h.c.Analysis.PackageInfo(relpath)
-	info.CallGraphIndex = pi.CallGraphIndex
-	info.CallGraph = htmltemplate.JS(marshalJSON(pi.CallGraph))
-	info.AnalysisData = htmltemplate.JS(marshalJSON(pi.Types))
-	info.TypeInfoIndex = make(map[string]int)
-	for i, ti := range pi.Types {
-		info.TypeInfoIndex[ti.Name] = i
-	}
-
-	info.GoogleCN = googleCN(r)
-	h.p.ServePage(w, Page{
-		Title:    title,
-		Tabtitle: tabtitle,
-		Subtitle: subtitle,
-		Body:     applyTemplate(h.p.PackageHTML, "packageHTML", info),
-		GoogleCN: info.GoogleCN,
-	})
-}
-
-type PageInfoMode uint
-
-const (
-	PageInfoModeQueryString = "m" // query string where PageInfoMode is stored
-
-	NoFiltering PageInfoMode = 1 << iota // do not filter exports
-	AllMethods                           // show all embedded methods
-	ShowSource                           // show source code, do not extract documentation
-	NoHTML                               // show result in textual form, do not generate HTML
-	FlatDir                              // show directory in a flat (non-indented) manner
-	NoTypeAssoc                          // don't associate consts, vars, and factory functions with types
-)
-
-// modeNames defines names for each PageInfoMode flag.
-var modeNames = map[string]PageInfoMode{
-	"all":     NoFiltering,
-	"methods": AllMethods,
-	"src":     ShowSource,
-	"text":    NoHTML,
-	"flat":    FlatDir,
-}
-
-// generate a query string for persisting PageInfoMode between pages.
-func modeQueryString(mode PageInfoMode) string {
-	if modeNames := mode.names(); len(modeNames) > 0 {
-		return "?m=" + strings.Join(modeNames, ",")
-	}
-	return ""
-}
-
-// alphabetically sorted names of active flags for a PageInfoMode.
-func (m PageInfoMode) names() []string {
-	var names []string
-	for name, mode := range modeNames {
-		if m&mode != 0 {
-			names = append(names, name)
-		}
-	}
-	sort.Strings(names)
-	return names
-}
-
-// GetPageInfoMode computes the PageInfoMode flags by analyzing the request
-// URL form value "m". It is value is a comma-separated list of mode names
-// as defined by modeNames (e.g.: m=src,text).
-func (p *Presentation) GetPageInfoMode(r *http.Request) PageInfoMode {
-	var mode PageInfoMode
-	for _, k := range strings.Split(r.FormValue(PageInfoModeQueryString), ",") {
-		if m, found := modeNames[strings.TrimSpace(k)]; found {
-			mode |= m
-		}
-	}
-	if p.AdjustPageInfoMode != nil {
-		mode = p.AdjustPageInfoMode(r, mode)
-	}
-	return mode
-}
-
-// poorMansImporter returns a (dummy) package object named
-// by the last path component of the provided package path
-// (as is the convention for packages). This is sufficient
-// to resolve package identifiers without doing an actual
-// import. It never returns an error.
-//
-func poorMansImporter(imports map[string]*ast.Object, path string) (*ast.Object, error) {
-	pkg := imports[path]
-	if pkg == nil {
-		// note that strings.LastIndex returns -1 if there is no "/"
-		pkg = ast.NewObj(ast.Pkg, path[strings.LastIndex(path, "/")+1:])
-		pkg.Data = ast.NewScope(nil) // required by ast.NewPackage for dot-import
-		imports[path] = pkg
-	}
-	return pkg, nil
-}
-
-// globalNames returns a set of the names declared by all package-level
-// declarations. Method names are returned in the form Receiver_Method.
-func globalNames(pkg *ast.Package) map[string]bool {
-	names := make(map[string]bool)
-	for _, file := range pkg.Files {
-		for _, decl := range file.Decls {
-			addNames(names, decl)
-		}
-	}
-	return names
-}
-
-// collectExamples collects examples for pkg from testfiles.
-func collectExamples(c *Corpus, pkg *ast.Package, testfiles map[string]*ast.File) []*doc.Example {
-	var files []*ast.File
-	for _, f := range testfiles {
-		files = append(files, f)
-	}
-
-	var examples []*doc.Example
-	globals := globalNames(pkg)
-	for _, e := range doc.Examples(files...) {
-		name := stripExampleSuffix(e.Name)
-		if name == "" || globals[name] {
-			examples = append(examples, e)
-		} else if c.Verbose {
-			log.Printf("skipping example 'Example%s' because '%s' is not a known function or type", e.Name, e.Name)
-		}
-	}
-
-	return examples
-}
-
-// addNames adds the names declared by decl to the names set.
-// Method names are added in the form ReceiverTypeName_Method.
-func addNames(names map[string]bool, decl ast.Decl) {
-	switch d := decl.(type) {
-	case *ast.FuncDecl:
-		name := d.Name.Name
-		if d.Recv != nil {
-			var typeName string
-			switch r := d.Recv.List[0].Type.(type) {
-			case *ast.StarExpr:
-				typeName = r.X.(*ast.Ident).Name
-			case *ast.Ident:
-				typeName = r.Name
-			}
-			name = typeName + "_" + name
-		}
-		names[name] = true
-	case *ast.GenDecl:
-		for _, spec := range d.Specs {
-			switch s := spec.(type) {
-			case *ast.TypeSpec:
-				names[s.Name.Name] = true
-			case *ast.ValueSpec:
-				for _, id := range s.Names {
-					names[id.Name] = true
-				}
-			}
-		}
-	}
-}
-
-// packageExports is a local implementation of ast.PackageExports
-// which correctly updates each package file's comment list.
-// (The ast.PackageExports signature is frozen, hence the local
-// implementation).
-//
-func packageExports(fset *token.FileSet, pkg *ast.Package) {
-	for _, src := range pkg.Files {
-		cmap := ast.NewCommentMap(fset, src, src.Comments)
-		ast.FileExports(src)
-		src.Comments = cmap.Filter(src).Comments()
-	}
-}
-
-func applyTemplate(t *template.Template, name string, data interface{}) []byte {
-	var buf bytes.Buffer
-	if err := t.Execute(&buf, data); err != nil {
-		log.Printf("%s.Execute: %s", name, err)
-	}
-	return buf.Bytes()
-}
-
-type writerCapturesErr struct {
-	w   io.Writer
-	err error
-}
-
-func (w *writerCapturesErr) Write(p []byte) (int, error) {
-	n, err := w.w.Write(p)
-	if err != nil {
-		w.err = err
-	}
-	return n, err
-}
-
-// applyTemplateToResponseWriter uses an http.ResponseWriter as the io.Writer
-// for the call to template.Execute.  It uses an io.Writer wrapper to capture
-// errors from the underlying http.ResponseWriter.  Errors are logged only when
-// they come from the template processing and not the Writer; this avoid
-// polluting log files with error messages due to networking issues, such as
-// client disconnects and http HEAD protocol violations.
-func applyTemplateToResponseWriter(rw http.ResponseWriter, t *template.Template, data interface{}) {
-	w := &writerCapturesErr{w: rw}
-	err := t.Execute(w, data)
-	// There are some cases where template.Execute does not return an error when
-	// rw returns an error, and some where it does.  So check w.err first.
-	if w.err == nil && err != nil {
-		// Log template errors.
-		log.Printf("%s.Execute: %s", t.Name(), err)
-	}
-}
-
-func redirect(w http.ResponseWriter, r *http.Request) (redirected bool) {
-	canonical := pathpkg.Clean(r.URL.Path)
-	if !strings.HasSuffix(canonical, "/") {
-		canonical += "/"
-	}
-	if r.URL.Path != canonical {
-		url := *r.URL
-		url.Path = canonical
-		http.Redirect(w, r, url.String(), http.StatusMovedPermanently)
-		redirected = true
-	}
-	return
-}
-
-func redirectFile(w http.ResponseWriter, r *http.Request) (redirected bool) {
-	c := pathpkg.Clean(r.URL.Path)
-	c = strings.TrimRight(c, "/")
-	if r.URL.Path != c {
-		url := *r.URL
-		url.Path = c
-		http.Redirect(w, r, url.String(), http.StatusMovedPermanently)
-		redirected = true
-	}
-	return
-}
-
-func (p *Presentation) serveTextFile(w http.ResponseWriter, r *http.Request, abspath, relpath, title string) {
-	src, err := vfs.ReadFile(p.Corpus.fs, abspath)
-	if err != nil {
-		log.Printf("ReadFile: %s", err)
-		p.ServeError(w, r, relpath, err)
-		return
-	}
-
-	if r.FormValue(PageInfoModeQueryString) == "text" {
-		p.ServeText(w, src)
-		return
-	}
-
-	h := r.FormValue("h")
-	s := RangeSelection(r.FormValue("s"))
-
-	var buf bytes.Buffer
-	if pathpkg.Ext(abspath) == ".go" {
-		// Find markup links for this file (e.g. "/src/fmt/print.go").
-		fi := p.Corpus.Analysis.FileInfo(abspath)
-		buf.WriteString("<script type='text/javascript'>document.ANALYSIS_DATA = ")
-		buf.Write(marshalJSON(fi.Data))
-		buf.WriteString(";</script>\n")
-
-		if status := p.Corpus.Analysis.Status(); status != "" {
-			buf.WriteString("<a href='/lib/godoc/analysis/help.html'>Static analysis features</a> ")
-			// TODO(adonovan): show analysis status at per-file granularity.
-			fmt.Fprintf(&buf, "<span style='color: grey'>[%s]</span><br/>", htmlpkg.EscapeString(status))
-		}
-
-		buf.WriteString("<pre>")
-		formatGoSource(&buf, src, fi.Links, h, s)
-		buf.WriteString("</pre>")
-	} else {
-		buf.WriteString("<pre>")
-		FormatText(&buf, src, 1, false, h, s)
-		buf.WriteString("</pre>")
-	}
-	fmt.Fprintf(&buf, `<p><a href="/%s?m=text">View as plain text</a></p>`, htmlpkg.EscapeString(relpath))
-
-	p.ServePage(w, Page{
-		Title:    title,
-		SrcPath:  relpath,
-		Tabtitle: relpath,
-		Body:     buf.Bytes(),
-		GoogleCN: googleCN(r),
-	})
-}
-
-// formatGoSource HTML-escapes Go source text and writes it to w,
-// decorating it with the specified analysis links.
-//
-func formatGoSource(buf *bytes.Buffer, text []byte, links []analysis.Link, pattern string, selection Selection) {
-	// Emit to a temp buffer so that we can add line anchors at the end.
-	saved, buf := buf, new(bytes.Buffer)
-
-	var i int
-	var link analysis.Link // shared state of the two funcs below
-	segmentIter := func() (seg Segment) {
-		if i < len(links) {
-			link = links[i]
-			i++
-			seg = Segment{link.Start(), link.End()}
-		}
-		return
-	}
-	linkWriter := func(w io.Writer, offs int, start bool) {
-		link.Write(w, offs, start)
-	}
-
-	comments := tokenSelection(text, token.COMMENT)
-	var highlights Selection
-	if pattern != "" {
-		highlights = regexpSelection(text, pattern)
-	}
-
-	FormatSelections(buf, text, linkWriter, segmentIter, selectionTag, comments, highlights, selection)
-
-	// Now copy buf to saved, adding line anchors.
-
-	// The lineSelection mechanism can't be composed with our
-	// linkWriter, so we have to add line spans as another pass.
-	n := 1
-	for _, line := range bytes.Split(buf.Bytes(), []byte("\n")) {
-		// The line numbers are inserted into the document via a CSS ::before
-		// pseudo-element. This prevents them from being copied when users
-		// highlight and copy text.
-		// ::before is supported in 98% of browsers: https://caniuse.com/#feat=css-gencontent
-		// This is also the trick Github uses to hide line numbers.
-		//
-		// The first tab for the code snippet needs to start in column 9, so
-		// it indents a full 8 spaces, hence the two nbsp's. Otherwise the tab
-		// character only indents about two spaces.
-		fmt.Fprintf(saved, `<span id="L%d" class="ln" data-content="%6d">&nbsp;&nbsp;</span>`, n, n)
-		n++
-		saved.Write(line)
-		saved.WriteByte('\n')
-	}
-}
-
-func (p *Presentation) serveDirectory(w http.ResponseWriter, r *http.Request, abspath, relpath string) {
-	if redirect(w, r) {
-		return
-	}
-
-	list, err := p.Corpus.fs.ReadDir(abspath)
-	if err != nil {
-		p.ServeError(w, r, relpath, err)
-		return
-	}
-
-	p.ServePage(w, Page{
-		Title:    "Directory",
-		SrcPath:  relpath,
-		Tabtitle: relpath,
-		Body:     applyTemplate(p.DirlistHTML, "dirlistHTML", list),
-		GoogleCN: googleCN(r),
-	})
-}
-
-func (p *Presentation) ServeHTMLDoc(w http.ResponseWriter, r *http.Request, abspath, relpath string) {
-	// get HTML body contents
-	src, err := vfs.ReadFile(p.Corpus.fs, abspath)
-	if err != nil {
-		log.Printf("ReadFile: %s", err)
-		p.ServeError(w, r, relpath, err)
-		return
-	}
-
-	// if it begins with "<!DOCTYPE " assume it is standalone
-	// html that doesn't need the template wrapping.
-	if bytes.HasPrefix(src, doctype) {
-		w.Write(src)
-		return
-	}
-
-	// if it begins with a JSON blob, read in the metadata.
-	meta, src, err := extractMetadata(src)
-	if err != nil {
-		log.Printf("decoding metadata %s: %v", relpath, err)
-	}
-
-	page := Page{
-		Title:    meta.Title,
-		Subtitle: meta.Subtitle,
-		GoogleCN: googleCN(r),
-	}
-
-	// evaluate as template if indicated
-	if meta.Template {
-		tmpl, err := template.New("main").Funcs(p.TemplateFuncs()).Parse(string(src))
-		if err != nil {
-			log.Printf("parsing template %s: %v", relpath, err)
-			p.ServeError(w, r, relpath, err)
-			return
-		}
-		var buf bytes.Buffer
-		if err := tmpl.Execute(&buf, page); err != nil {
-			log.Printf("executing template %s: %v", relpath, err)
-			p.ServeError(w, r, relpath, err)
-			return
-		}
-		src = buf.Bytes()
-	}
-
-	// if it's the language spec, add tags to EBNF productions
-	if strings.HasSuffix(abspath, "go_spec.html") {
-		var buf bytes.Buffer
-		Linkify(&buf, src)
-		src = buf.Bytes()
-	}
-
-	page.Body = src
-	p.ServePage(w, page)
-}
-
-func (p *Presentation) ServeFile(w http.ResponseWriter, r *http.Request) {
-	p.serveFile(w, r)
-}
-
-func (p *Presentation) serveFile(w http.ResponseWriter, r *http.Request) {
-	relpath := r.URL.Path
-
-	// Check to see if we need to redirect or serve another file.
-	if m := p.Corpus.MetadataFor(relpath); m != nil {
-		if m.Path != relpath {
-			// Redirect to canonical path.
-			http.Redirect(w, r, m.Path, http.StatusMovedPermanently)
-			return
-		}
-		// Serve from the actual filesystem path.
-		relpath = m.filePath
-	}
-
-	abspath := relpath
-	relpath = relpath[1:] // strip leading slash
-
-	switch pathpkg.Ext(relpath) {
-	case ".html":
-		if strings.HasSuffix(relpath, "/index.html") {
-			// We'll show index.html for the directory.
-			// Use the dir/ version as canonical instead of dir/index.html.
-			http.Redirect(w, r, r.URL.Path[0:len(r.URL.Path)-len("index.html")], http.StatusMovedPermanently)
-			return
-		}
-		p.ServeHTMLDoc(w, r, abspath, relpath)
-		return
-
-	case ".go":
-		p.serveTextFile(w, r, abspath, relpath, "Source file")
-		return
-	}
-
-	dir, err := p.Corpus.fs.Lstat(abspath)
-	if err != nil {
-		log.Print(err)
-		p.ServeError(w, r, relpath, err)
-		return
-	}
-
-	if dir != nil && dir.IsDir() {
-		if redirect(w, r) {
-			return
-		}
-		if index := pathpkg.Join(abspath, "index.html"); util.IsTextFile(p.Corpus.fs, index) {
-			p.ServeHTMLDoc(w, r, index, index)
-			return
-		}
-		p.serveDirectory(w, r, abspath, relpath)
-		return
-	}
-
-	if util.IsTextFile(p.Corpus.fs, abspath) {
-		if redirectFile(w, r) {
-			return
-		}
-		p.serveTextFile(w, r, abspath, relpath, "Text file")
-		return
-	}
-
-	p.fileServer.ServeHTTP(w, r)
-}
-
-func (p *Presentation) ServeText(w http.ResponseWriter, text []byte) {
-	w.Header().Set("Content-Type", "text/plain; charset=utf-8")
-	w.Write(text)
-}
-
-func marshalJSON(x interface{}) []byte {
-	var data []byte
-	var err error
-	const indentJSON = false // for easier debugging
-	if indentJSON {
-		data, err = json.MarshalIndent(x, "", "    ")
-	} else {
-		data, err = json.Marshal(x)
-	}
-	if err != nil {
-		panic(fmt.Sprintf("json.Marshal failed: %s", err))
-	}
-	return data
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/short/short.go b/installer/vendor/golang.org/x/tools/godoc/short/short.go
deleted file mode 100644
index 44d3c93659..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/short/short.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-// Package short implements a simple URL shortener, serving an administrative
-// interface at /s and shortened urls from /s/key.
-// It is designed to run only on the instance of godoc that serves golang.org.
-package short
-
-// TODO(adg): collect statistics on URL visits
-
-import (
-	"errors"
-	"fmt"
-	"html/template"
-	"net/http"
-	"net/url"
-	"regexp"
-
-	"golang.org/x/net/context"
-
-	"google.golang.org/appengine"
-	"google.golang.org/appengine/datastore"
-	"google.golang.org/appengine/log"
-	"google.golang.org/appengine/memcache"
-	"google.golang.org/appengine/user"
-)
-
-const (
-	prefix  = "/s"
-	kind    = "Link"
-	baseURL = "https://golang.org" + prefix
-)
-
-// Link represents a short link.
-type Link struct {
-	Key, Target string
-}
-
-var validKey = regexp.MustCompile(`^[a-zA-Z0-9-_.]+$`)
-
-func RegisterHandlers(mux *http.ServeMux) {
-	mux.HandleFunc(prefix, adminHandler)
-	mux.HandleFunc(prefix+"/", linkHandler)
-}
-
-// linkHandler services requests to short URLs.
-//   http://golang.org/s/key
-// It consults memcache and datastore for the Link for key.
-// It then sends a redirects or an error message.
-func linkHandler(w http.ResponseWriter, r *http.Request) {
-	c := appengine.NewContext(r)
-
-	key := r.URL.Path[len(prefix)+1:]
-	if !validKey.MatchString(key) {
-		http.Error(w, "not found", http.StatusNotFound)
-		return
-	}
-
-	var link Link
-	_, err := memcache.JSON.Get(c, cacheKey(key), &link)
-	if err != nil {
-		k := datastore.NewKey(c, kind, key, 0, nil)
-		err = datastore.Get(c, k, &link)
-		switch err {
-		case datastore.ErrNoSuchEntity:
-			http.Error(w, "not found", http.StatusNotFound)
-			return
-		default: // != nil
-			log.Errorf(c, "%q: %v", key, err)
-			http.Error(w, "internal server error", http.StatusInternalServerError)
-			return
-		case nil:
-			item := &memcache.Item{
-				Key:    cacheKey(key),
-				Object: &link,
-			}
-			if err := memcache.JSON.Set(c, item); err != nil {
-				log.Warningf(c, "%q: %v", key, err)
-			}
-		}
-	}
-
-	http.Redirect(w, r, link.Target, http.StatusFound)
-}
-
-var adminTemplate = template.Must(template.New("admin").Parse(templateHTML))
-
-// adminHandler serves an administrative interface.
-func adminHandler(w http.ResponseWriter, r *http.Request) {
-	c := appengine.NewContext(r)
-
-	if !user.IsAdmin(c) {
-		http.Error(w, "forbidden", http.StatusForbidden)
-		return
-	}
-
-	var newLink *Link
-	var doErr error
-	if r.Method == "POST" {
-		key := r.FormValue("key")
-		switch r.FormValue("do") {
-		case "Add":
-			newLink = &Link{key, r.FormValue("target")}
-			doErr = putLink(c, newLink)
-		case "Delete":
-			k := datastore.NewKey(c, kind, key, 0, nil)
-			doErr = datastore.Delete(c, k)
-		default:
-			http.Error(w, "unknown action", http.StatusBadRequest)
-		}
-		err := memcache.Delete(c, cacheKey(key))
-		if err != nil && err != memcache.ErrCacheMiss {
-			log.Warningf(c, "%q: %v", key, err)
-		}
-	}
-
-	var links []*Link
-	_, err := datastore.NewQuery(kind).Order("Key").GetAll(c, &links)
-	if err != nil {
-		http.Error(w, err.Error(), http.StatusInternalServerError)
-		log.Errorf(c, "%v", err)
-		return
-	}
-
-	// Put the new link in the list if it's not there already.
-	// (Eventual consistency means that it might not show up
-	// immediately, which might be confusing for the user.)
-	if newLink != nil && doErr == nil {
-		found := false
-		for i := range links {
-			if links[i].Key == newLink.Key {
-				found = true
-				break
-			}
-		}
-		if !found {
-			links = append([]*Link{newLink}, links...)
-		}
-		newLink = nil
-	}
-
-	var data = struct {
-		BaseURL string
-		Prefix  string
-		Links   []*Link
-		New     *Link
-		Error   error
-	}{baseURL, prefix, links, newLink, doErr}
-	if err := adminTemplate.Execute(w, &data); err != nil {
-		log.Criticalf(c, "adminTemplate: %v", err)
-	}
-}
-
-// putLink validates the provided link and puts it into the datastore.
-func putLink(c context.Context, link *Link) error {
-	if !validKey.MatchString(link.Key) {
-		return errors.New("invalid key; must match " + validKey.String())
-	}
-	if _, err := url.Parse(link.Target); err != nil {
-		return fmt.Errorf("bad target: %v", err)
-	}
-	k := datastore.NewKey(c, kind, link.Key, 0, nil)
-	_, err := datastore.Put(c, k, link)
-	return err
-}
-
-// cacheKey returns a short URL key as a memcache key.
-func cacheKey(key string) string {
-	return "link-" + key
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/short/tmpl.go b/installer/vendor/golang.org/x/tools/godoc/short/tmpl.go
deleted file mode 100644
index 95e4c2a8e8..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/short/tmpl.go
+++ /dev/null
@@ -1,121 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by the Apache 2.0
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package short
-
-const templateHTML = `
-<!doctype HTML>
-<html>
-<head>
-<title>golang.org URL shortener</title>
-<style>
-body {
-	background: white;
-}
-input {
-	border: 1px solid #ccc;
-}
-input[type=text] {
-	width: 400px;
-}
-input, td, th {
-	color: #333;
-	font-family: Georgia, Times New Roman, serif;
-}
-input, td {
-	font-size: 14pt;
-}
-th {
-	font-size: 16pt;
-	text-align: left;
-	padding-top: 10px;
-}
-.autoselect {
-	border: none;
-}
-.error {
-	color: #900;
-}
-table {
-	margin-left: auto;
-	margin-right: auto;
-}
-</style>
-</head>
-<body>
-
-<table>
-
-{{with .Error}}
-<tr>
-	<th colspan="3">Error</th>
-</tr>
-<tr>
-	<td class="error" colspan="3">{{.}}</td>
-</tr>
-{{end}}
-
-<tr>
-	<th>Key</th>
-	<th>Target</th>
-	<th></th>
-</tr>
-
-<form method="POST" action="{{.Prefix}}">
-<tr>
-	<td><input type="text" name="key"{{with .New}} value="{{.Key}}"{{end}}></td>
-	<td><input type="text" name="target"{{with .New}} value="{{.Target}}"{{end}}></td>
-	<td><input type="submit" name="do" value="Add">
-</tr>
-</form>
-
-{{with .Links}}
-<tr>
-	<th>Short Link</th>
-	<th>&nbsp;</th>
-	<th>&nbsp;</th>
-</tr>
-{{range .}}
-<tr>
-	<td><input class="autoselect" type="text" orig="{{$.BaseURL}}/{{.Key}}" value="{{$.BaseURL}}/{{.Key}}"></td>
-	<td><input class="autoselect" type="text" orig="{{.Target}}" value="{{.Target}}"></td>
-	<td>
-		<form method="POST" action="{{$.Prefix}}">
-			<input type="hidden" name="key" value="{{.Key}}">
-			<input type="submit" name="do" value="Delete" class="delete">
-		</form>
-	</td>
-</tr>
-{{end}}
-{{end}}
-
-</table>
-
-</body>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js"></script>
-<script type="text/javascript">window.jQuery || document.write(unescape("%3Cscript src='/doc/jquery.js' type='text/javascript'%3E%3C/script%3E"));</script>
-<script>
-$(document).ready(function() {
-	$('.autoselect').each(function() {
-		$(this).click(function() {
-			$(this).select();
-		});
-		$(this).change(function() {
-			$(this).val($(this).attr('orig'));
-		});
-	});
-	$('.delete').click(function(e) {
-		var link = $(this).closest('tr').find('input').first().val();
-		var ok = confirm('Delete this link?\n' + link);
-		if (!ok) {
-			e.preventDefault();
-			return false;
-		}
-	});
-});
-</script>
-</html>
-`
diff --git a/installer/vendor/golang.org/x/tools/godoc/snippet.go b/installer/vendor/golang.org/x/tools/godoc/snippet.go
deleted file mode 100644
index dd9c8225cc..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/snippet.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// This file contains the infrastructure to create a code
-// snippet for search results.
-//
-// Note: At the moment, this only creates HTML snippets.
-
-package godoc
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/token"
-)
-
-type Snippet struct {
-	Line int
-	Text string // HTML-escaped
-}
-
-func (p *Presentation) newSnippet(fset *token.FileSet, decl ast.Decl, id *ast.Ident) *Snippet {
-	// TODO instead of pretty-printing the node, should use the original source instead
-	var buf1 bytes.Buffer
-	p.writeNode(&buf1, fset, decl)
-	// wrap text with <pre> tag
-	var buf2 bytes.Buffer
-	buf2.WriteString("<pre>")
-	FormatText(&buf2, buf1.Bytes(), -1, true, id.Name, nil)
-	buf2.WriteString("</pre>")
-	return &Snippet{fset.Position(id.Pos()).Line, buf2.String()}
-}
-
-func findSpec(list []ast.Spec, id *ast.Ident) ast.Spec {
-	for _, spec := range list {
-		switch s := spec.(type) {
-		case *ast.ImportSpec:
-			if s.Name == id {
-				return s
-			}
-		case *ast.ValueSpec:
-			for _, n := range s.Names {
-				if n == id {
-					return s
-				}
-			}
-		case *ast.TypeSpec:
-			if s.Name == id {
-				return s
-			}
-		}
-	}
-	return nil
-}
-
-func (p *Presentation) genSnippet(fset *token.FileSet, d *ast.GenDecl, id *ast.Ident) *Snippet {
-	s := findSpec(d.Specs, id)
-	if s == nil {
-		return nil //  declaration doesn't contain id - exit gracefully
-	}
-
-	// only use the spec containing the id for the snippet
-	dd := &ast.GenDecl{
-		Doc:    d.Doc,
-		TokPos: d.Pos(),
-		Tok:    d.Tok,
-		Lparen: d.Lparen,
-		Specs:  []ast.Spec{s},
-		Rparen: d.Rparen,
-	}
-
-	return p.newSnippet(fset, dd, id)
-}
-
-func (p *Presentation) funcSnippet(fset *token.FileSet, d *ast.FuncDecl, id *ast.Ident) *Snippet {
-	if d.Name != id {
-		return nil //  declaration doesn't contain id - exit gracefully
-	}
-
-	// only use the function signature for the snippet
-	dd := &ast.FuncDecl{
-		Doc:  d.Doc,
-		Recv: d.Recv,
-		Name: d.Name,
-		Type: d.Type,
-	}
-
-	return p.newSnippet(fset, dd, id)
-}
-
-// NewSnippet creates a text snippet from a declaration decl containing an
-// identifier id. Parts of the declaration not containing the identifier
-// may be removed for a more compact snippet.
-func NewSnippet(fset *token.FileSet, decl ast.Decl, id *ast.Ident) *Snippet {
-	// TODO(bradfitz, adg): remove this function.  But it's used by indexer, which
-	// doesn't have a *Presentation, and NewSnippet needs a TabWidth.
-	var p Presentation
-	p.TabWidth = 4
-	return p.NewSnippet(fset, decl, id)
-}
-
-// NewSnippet creates a text snippet from a declaration decl containing an
-// identifier id. Parts of the declaration not containing the identifier
-// may be removed for a more compact snippet.
-func (p *Presentation) NewSnippet(fset *token.FileSet, decl ast.Decl, id *ast.Ident) *Snippet {
-	var s *Snippet
-	switch d := decl.(type) {
-	case *ast.GenDecl:
-		s = p.genSnippet(fset, d, id)
-	case *ast.FuncDecl:
-		s = p.funcSnippet(fset, d, id)
-	}
-
-	// handle failure gracefully
-	if s == nil {
-		var buf bytes.Buffer
-		fmt.Fprintf(&buf, `<span class="alert">could not generate a snippet for <span class="highlight">%s</span></span>`, id.Name)
-		s = &Snippet{fset.Position(id.Pos()).Line, buf.String()}
-	}
-	return s
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/spec.go b/installer/vendor/golang.org/x/tools/godoc/spec.go
deleted file mode 100644
index 6d6b9c23a2..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/spec.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2009 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-// This file contains the mechanism to "linkify" html source
-// text containing EBNF sections (as found in go_spec.html).
-// The result is the input source text with the EBNF sections
-// modified such that identifiers are linked to the respective
-// definitions.
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"text/scanner"
-)
-
-type ebnfParser struct {
-	out     io.Writer // parser output
-	src     []byte    // parser input
-	scanner scanner.Scanner
-	prev    int    // offset of previous token
-	pos     int    // offset of current token
-	tok     rune   // one token look-ahead
-	lit     string // token literal
-}
-
-func (p *ebnfParser) flush() {
-	p.out.Write(p.src[p.prev:p.pos])
-	p.prev = p.pos
-}
-
-func (p *ebnfParser) next() {
-	p.tok = p.scanner.Scan()
-	p.pos = p.scanner.Position.Offset
-	p.lit = p.scanner.TokenText()
-}
-
-func (p *ebnfParser) printf(format string, args ...interface{}) {
-	p.flush()
-	fmt.Fprintf(p.out, format, args...)
-}
-
-func (p *ebnfParser) errorExpected(msg string) {
-	p.printf(`<span class="highlight">error: expected %s, found %s</span>`, msg, scanner.TokenString(p.tok))
-}
-
-func (p *ebnfParser) expect(tok rune) {
-	if p.tok != tok {
-		p.errorExpected(scanner.TokenString(tok))
-	}
-	p.next() // make progress in any case
-}
-
-func (p *ebnfParser) parseIdentifier(def bool) {
-	if p.tok == scanner.Ident {
-		name := p.lit
-		if def {
-			p.printf(`<a id="%s">%s</a>`, name, name)
-		} else {
-			p.printf(`<a href="#%s" class="noline">%s</a>`, name, name)
-		}
-		p.prev += len(name) // skip identifier when printing next time
-		p.next()
-	} else {
-		p.expect(scanner.Ident)
-	}
-}
-
-func (p *ebnfParser) parseTerm() bool {
-	switch p.tok {
-	case scanner.Ident:
-		p.parseIdentifier(false)
-
-	case scanner.String:
-		p.next()
-		const ellipsis = '…' // U+2026, the horizontal ellipsis character
-		if p.tok == ellipsis {
-			p.next()
-			p.expect(scanner.String)
-		}
-
-	case '(':
-		p.next()
-		p.parseExpression()
-		p.expect(')')
-
-	case '[':
-		p.next()
-		p.parseExpression()
-		p.expect(']')
-
-	case '{':
-		p.next()
-		p.parseExpression()
-		p.expect('}')
-
-	default:
-		return false // no term found
-	}
-
-	return true
-}
-
-func (p *ebnfParser) parseSequence() {
-	if !p.parseTerm() {
-		p.errorExpected("term")
-	}
-	for p.parseTerm() {
-	}
-}
-
-func (p *ebnfParser) parseExpression() {
-	for {
-		p.parseSequence()
-		if p.tok != '|' {
-			break
-		}
-		p.next()
-	}
-}
-
-func (p *ebnfParser) parseProduction() {
-	p.parseIdentifier(true)
-	p.expect('=')
-	if p.tok != '.' {
-		p.parseExpression()
-	}
-	p.expect('.')
-}
-
-func (p *ebnfParser) parse(out io.Writer, src []byte) {
-	// initialize ebnfParser
-	p.out = out
-	p.src = src
-	p.scanner.Init(bytes.NewBuffer(src))
-	p.next() // initializes pos, tok, lit
-
-	// process source
-	for p.tok != scanner.EOF {
-		p.parseProduction()
-	}
-	p.flush()
-}
-
-// Markers around EBNF sections
-var (
-	openTag  = []byte(`<pre class="ebnf">`)
-	closeTag = []byte(`</pre>`)
-)
-
-func Linkify(out io.Writer, src []byte) {
-	for len(src) > 0 {
-		// i: beginning of EBNF text (or end of source)
-		i := bytes.Index(src, openTag)
-		if i < 0 {
-			i = len(src) - len(openTag)
-		}
-		i += len(openTag)
-
-		// j: end of EBNF text (or end of source)
-		j := bytes.Index(src[i:], closeTag) // close marker
-		if j < 0 {
-			j = len(src) - i
-		}
-		j += i
-
-		// write text before EBNF
-		out.Write(src[0:i])
-		// process EBNF
-		var p ebnfParser
-		p.parse(out, src[i:j])
-
-		// advance
-		src = src[j:]
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/spot.go b/installer/vendor/golang.org/x/tools/godoc/spot.go
deleted file mode 100644
index 95ffa4b8ce..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/spot.go
+++ /dev/null
@@ -1,83 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package godoc
-
-// ----------------------------------------------------------------------------
-// SpotInfo
-
-// A SpotInfo value describes a particular identifier spot in a given file;
-// It encodes three values: the SpotKind (declaration or use), a line or
-// snippet index "lori", and whether it's a line or index.
-//
-// The following encoding is used:
-//
-//   bits    32   4    1       0
-//   value    [lori|kind|isIndex]
-//
-type SpotInfo uint32
-
-// SpotKind describes whether an identifier is declared (and what kind of
-// declaration) or used.
-type SpotKind uint32
-
-const (
-	PackageClause SpotKind = iota
-	ImportDecl
-	ConstDecl
-	TypeDecl
-	VarDecl
-	FuncDecl
-	MethodDecl
-	Use
-	nKinds
-)
-
-var (
-	// These must match the SpotKind values above.
-	name = []string{
-		"Packages",
-		"Imports",
-		"Constants",
-		"Types",
-		"Variables",
-		"Functions",
-		"Methods",
-		"Uses",
-		"Unknown",
-	}
-)
-
-func (x SpotKind) Name() string { return name[x] }
-
-func init() {
-	// sanity check: if nKinds is too large, the SpotInfo
-	// accessor functions may need to be updated
-	if nKinds > 8 {
-		panic("internal error: nKinds > 8")
-	}
-}
-
-// makeSpotInfo makes a SpotInfo.
-func makeSpotInfo(kind SpotKind, lori int, isIndex bool) SpotInfo {
-	// encode lori: bits [4..32)
-	x := SpotInfo(lori) << 4
-	if int(x>>4) != lori {
-		// lori value doesn't fit - since snippet indices are
-		// most certainly always smaller then 1<<28, this can
-		// only happen for line numbers; give it no line number (= 0)
-		x = 0
-	}
-	// encode kind: bits [1..4)
-	x |= SpotInfo(kind) << 1
-	// encode isIndex: bit 0
-	if isIndex {
-		x |= 1
-	}
-	return x
-}
-
-func (x SpotInfo) Kind() SpotKind { return SpotKind(x >> 1 & 7) }
-func (x SpotInfo) Lori() int      { return int(x >> 4) }
-func (x SpotInfo) IsIndex() bool  { return x&1 != 0 }
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/call-eg.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/call-eg.png
deleted file mode 100644
index c48bf4d920..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/call-eg.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/call3.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/call3.png
deleted file mode 100644
index 387a38c64f..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/call3.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers1.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers1.png
deleted file mode 100644
index 80fbc62e95..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers1.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers2.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers2.png
deleted file mode 100644
index 59a84edbc9..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/callers2.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan1.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan1.png
deleted file mode 100644
index 5eb2811155..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan1.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2a.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2a.png
deleted file mode 100644
index b757504179..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2a.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2b.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2b.png
deleted file mode 100644
index d197862d1b..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/chan2b.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/error1.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/error1.png
deleted file mode 100644
index 69550b9d06..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/error1.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/help.html b/installer/vendor/golang.org/x/tools/godoc/static/analysis/help.html
deleted file mode 100644
index 023c07de1e..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/analysis/help.html
+++ /dev/null
@@ -1,254 +0,0 @@
-<!--{
-        "Title": "Static analysis features of godoc"
-}-->
-
-<style>
-  span.err { 'font-size:120%; color:darkred; background-color: yellow; }
-  img.ss { margin-left: 1in; } /* screenshot */
-  img.dotted { border: thin dotted; }
-</style>
-
-<!-- Images were grabbed from Chrome/Linux at 150% zoom, and are
-     displayed at 66% of natural size.  This allows users to zoom a
-     little before seeing pixels. -->
-
-<p>
-  When invoked with the <code>-analysis</code> flag, godoc performs
-  static analysis on the Go packages it indexes and displays the
-  results in the source and package views.  This document provides a
-  brief tour of these features.
-</p>
-
-<h2>Type analysis features</h2>
-<p>
-  <code>godoc -analysis=type</code> performs static checking similar
-  to that done by a compiler: it detects ill-formed programs, resolves
-  each identifier to the entity it denotes, computes the type of each
-  expression and the method set of each type, and determines which
-  types are assignable to each interface type.
-
-  <b>Type analysis</b> is relatively quick, requiring about 10 seconds for
-  the &gt;200 packages of the standard library, for example.
-</p>
-
-<h3>Compiler errors</h3>
-<p>
-  If any source file contains a compilation error, the source view
-  will highlight the errant location in red.  Hovering over it
-  displays the error message.
-</p>
-<img class="ss" width='811' src='error1.png'><br/>
-
-<h3>Identifier resolution</h3>
-<p>
-  In the source view, every referring identifier is annotated with
-  information about the language entity it refers to: a package,
-  constant, variable, type, function or statement label.
-
-  Hovering over the identifier reveals the entity's kind and type
-  (e.g. <code>var x int</code> or <code>func f
-  func(int) string</code>).
-</p>
-<img class="ss" width='652' src='ident-field.png'><br/>
-<br/>
-<img class="ss" width='652' src='ident-func.png'>
-<p>
-  Clicking the link takes you to the entity's definition.
-</p>
-<img class="ss" width='652' src='ident-def.png'><br/>
-
-<h3>Type information: size/alignment, method set, interfaces</h3>
-<p>
-  Clicking on the identifier that defines a named type causes a panel
-  to appear, displaying information about the named type, including
-  its size and alignment in bytes, its
-  <a href='http://golang.org/ref/spec#Method_sets'>method set</a>, and its
-  <i>implements</i> relation: the set of types T that are assignable to
-  or from this type U where at least one of T or U is an interface.
-
-  This example shows information about <code>net/rpc.methodType</code>.
-</p>
-<img class="ss" width='470' src='typeinfo-src.png'>
-<p>
-  The method set includes not only the declared methods of the type,
-  but also any methods "promoted" from anonymous fields of structs,
-  such as <code>sync.Mutex</code> in this example.
-
-  In addition, the receiver type is displayed as <code>*T</code> or
-  <code>T</code> depending on whether it requires the address or just
-  a copy of the receiver value.
-</p>
-<p>
-  The method set and <i>implements</i> relation are also available
-  via the package view.
-</p>
-<img class="ss dotted" width='716' src='typeinfo-pkg.png'>
-
-<h2>Pointer analysis features</h2>
-<p>
-  <code>godoc -analysis=pointer</code> additionally performs a precise
-  whole-program <b>pointer analysis</b>.  In other words, it
-  approximates the set of memory locations to which each
-  reference&mdash;not just vars of kind <code>*T</code>, but also
-  <code>[]T</code>, <code>func</code>, <code>map</code>,
-  <code>chan</code>, and <code>interface</code>&mdash;may refer.  This
-  information reveals the possible destinations of each dynamic call
-  (via a <code>func</code> variable or interface method), and the
-  relationship between send and receive operations on the same
-  channel.
-</p>
-<p>
-  Compared to type analysis, pointer analysis requires more time and
-  memory, and is impractical for code bases exceeding a million lines.
-</p>
-
-<h3>Call graph navigation</h3>
-<p>
-  When pointer analysis is complete, the source view annotates the
-  code with <b>callers</b> and <b>callees</b> information: callers
-  information is associated with the <code>func</code> keyword that
-  declares a function, and callees information is associated with the
-  open paren '<span style="color: dark-blue"><code>(</code></span>' of
-  a function call.
-</p>
-<p>
-  In this example, hovering over the declaration of the
-  <code>rot13</code> function (defined in strings/strings_test.go)
-  reveals that it is called in exactly one place.
-</p>
-<img class="ss" width='612' src='callers1.png'>
-<p>
-  Clicking the link navigates to the sole caller.  (If there were
-  multiple callers, a list of choices would be displayed first.)
-</p>
-<img class="ss" width='680' src='callers2.png'>
-<p>
-  Notice that hovering over this call reveals that there are 19
-  possible callees at this site, of which our <code>rot13</code>
-  function was just one: this is a dynamic call through a variable of
-  type <code>func(rune) rune</code>.
-
-  Clicking on the call brings up the list of all 19 potential callees,
-  shown truncated.  Many of them are anonymous functions.
-</p>
-<img class="ss" width='564' src='call3.png'>
-<p>
-  Pointer analysis gives a very precise approximation of the call
-  graph compared to type-based techniques.
-
-  As a case in point, the next example shows the dynamic call inside
-  the <code>testing</code> package responsible for calling all
-  user-defined functions named <code>Example<i>XYZ</i></code>.
-</p>
-<img class="ss" width='361' src='call-eg.png'>
-<p>
-  Recall that all such functions have type <code>func()</code>,
-  i.e. no arguments and no results.  A type-based approximation could
-  only conclude that this call might dispatch to any function matching
-  that type&mdash;and these are very numerous in most
-  programs&mdash;but pointer analysis can track the flow of specific
-  <code>func</code> values through the testing package.
-
-  As an indication of its precision, the result contains only
-  functions whose name starts with <code>Example</code>.
-</p>
-
-<h3>Intra-package call graph</h3>
-<p>
-  The same call graph information is presented in a very different way
-  in the package view.  For each package, an interactive tree view
-  allows exploration of the call graph as it relates to just that
-  package; all functions from other packages are elided.
-
-  The roots of the tree are the external entry points of the package:
-  not only its exported functions, but also any unexported or
-  anonymous functions that are called (dynamically) from outside the
-  package.
-</p>
-<p>
-  This example shows the entry points of the
-  <code>path/filepath</code> package, with the call graph for
-  <code>Glob</code> expanded several levels
-</p>
-<img class="ss dotted" width='501' src='ipcg-pkg.png'>
-<p>
-  Notice that the nodes for Glob and Join appear multiple times: the
-  tree is a partial unrolling of a cyclic graph; the full unrolling
-  is in general infinite.
-</p>
-<p>
-  For each function documented in the package view, another
-  interactive tree view allows exploration of the same graph starting
-  at that function.
-
-  This is a portion of the internal graph of
-  <code>net/http.ListenAndServe</code>.
-</p>
-<img class="ss dotted" width='455' src='ipcg-func.png'>
-
-<h3>Channel peers (send ↔ receive)</h3>
-<p>
-  Because concurrent Go programs use channels to pass not just values
-  but also control between different goroutines, it is natural when
-  reading Go code to want to navigate from a channel send to the
-  corresponding receive so as to understand the sequence of events.
-</p>
-<p>
-  Godoc annotates every channel operation&mdash;make, send, range,
-  receive, close&mdash;with a link to a panel displaying information
-  about other operations that might alias the same channel.
-</p>
-<p>
-  This example, from the tests of <code>net/http</code>, shows a send
-  operation on a <code>chan bool</code>.
-</p>
-<img class="ss" width='811' src='chan1.png'>
-<p>
-  Clicking on the <code>&lt;-</code> send operator reveals that this
-  channel is made at a unique location (line 332) and that there are
-  three receive operations that might read this value.
-
-  It hardly needs pointing out that some channel element types are
-  very widely used (e.g. struct{}, bool, int, interface{}) and that a
-  typical Go program might contain dozens of receive operations on a
-  value of type <code>chan bool</code>; yet the pointer analysis is
-  able to distinguish operations on channels at a much finer precision
-  than based on their type alone.
-</p>
-<p>
-  Notice also that the send occurs in a different (anonymous) function
-  from the outer one containing the <code>make</code> and the receive
-  operations.
-</p>
-<p>
-  Here's another example of send on a different <code>chan
-  bool</code>, also in package <code>net/http</code>:
-</p>
-<img class="ss" width='774' src='chan2a.png'>
-<p>
-  The analysis finds just one receive operation that might receive
-  from this channel, in the test for this feature.
-</p>
-<img class="ss" width='737' src='chan2b.png'>
-
-<h2>Known issues</h2>
-<p>
-  All analysis results pertain to exactly
-  one configuration (e.g. amd64 linux).  Files that are conditionally
-  compiled based on different platforms or build tags are not visible
-  to the analysis.
-</p>
-<p>
-  Files that <code>import "C"</code> require
-  preprocessing by the cgo tool.  The file offsets after preprocessing
-  do not align with the unpreprocessed file, so markup is misaligned.
-</p>
-<p>
-  Files are not periodically re-analyzed.
-  If the files change underneath the running server, the displayed
-  markup is misaligned.
-</p>
-<p>
-  Additional issues are listed at
-  <a href='https://go.googlesource.com/tools/+/master/godoc/analysis/README'>tools/godoc/analysis/README</a>.
-</p>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-def.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-def.png
deleted file mode 100644
index b0d9e55ad6..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-def.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-field.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-field.png
deleted file mode 100644
index 76cbe5a334..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-field.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-func.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-func.png
deleted file mode 100644
index 69670fa296..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ident-func.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-func.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-func.png
deleted file mode 100644
index 523318d68b..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-func.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-pkg.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-pkg.png
deleted file mode 100644
index e029068551..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/ipcg-pkg.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-pkg.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-pkg.png
deleted file mode 100644
index 91bd5f7458..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-pkg.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-src.png b/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-src.png
deleted file mode 100644
index 6e5b147ebc..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/analysis/typeinfo-src.png and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/callgraph.html b/installer/vendor/golang.org/x/tools/godoc/static/callgraph.html
deleted file mode 100644
index c56b2ef1a7..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/callgraph.html
+++ /dev/null
@@ -1,15 +0,0 @@
-<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Internal call graph</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Internal call graph</span></p>
-		<p>
-		  This viewer shows the portion of the internal call
-		  graph of this package that is reachable from this function.
-		  See the <a href='#pkg-callgraph'>package's call
-		  graph</a> for more information.
-		</p>
-		<ul style="margin-left: 0.5in" id="callgraph-{{.Index}}" class="treeview"></ul>
-	</div>
-</div>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/codewalk.html b/installer/vendor/golang.org/x/tools/godoc/static/codewalk.html
deleted file mode 100644
index 0f3d22a20c..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/codewalk.html
+++ /dev/null
@@ -1,56 +0,0 @@
-<!--
-	Copyright 2010 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<style type='text/css'>@import "/doc/codewalk/codewalk.css";</style>
-<script type="text/javascript" src="/doc/codewalk/codewalk.js"></script>
-
-<div id="codewalk-main">
-  <div class="left" id="code-column">
-    <div id='sizer'></div>
-    <div id="code-area">
-      <div id="code-header" align="center">
-        <a id="code-popout-link" href="" target="_blank">
-          <img title="View code in new window" alt="Pop Out Code" src="/doc/codewalk/popout.png" style="display: block; float: right;"/>
-        </a>
-        <select id="code-selector">
-          {{range .File}}
-          <option value="/doc/codewalk/?fileprint=/{{urlquery .}}">{{html .}}</option>
-          {{end}}
-        </select>
-      </div>
-      <div id="code">
-        <iframe class="code-display" name="code-display" id="code-display"></iframe>
-      </div>
-    </div>
-    <div id="code-options" class="setting">
-      <span>code on <a id="set-code-left" class="selected" href="#">left</a> &bull; <a id="set-code-right" href="#">right</a></span>
-      <span>code width <span id="code-column-width">70%</span></span>
-      <span>filepaths <a id="show-filepaths" class="selected" href="#">shown</a> &bull; <a id="hide-filepaths" href="#">hidden</a></span>
-    </div>
-  </div>
-  <div class="right" id="comment-column">
-    <div id="comment-area">
-      {{range .Step}}
-      <div class="comment first last">
-        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&amp;lo={{urlquery .Lo}}&amp;hi={{urlquery .Hi}}#mark" target="code-display"></a>
-        <div class="comment-title">{{html .Title}}</div>
-        <div class="comment-text">
-	{{with .Err}}
-	ERROR LOADING FILE: {{html .}}<br/><br/>
-	{{end}}
-        {{.XML}}
-        </div>
-        <div class="comment-text file-name"><span class="path-file">{{html .}}</span></div>
-      </div>
-      {{end}}
-    </div>
-    <div id="comment-options" class="setting">
-      <a id="prev-comment" href="#"><span class="hotkey">p</span>revious step</a>
-      &bull;
-      <a id="next-comment" href="#"><span class="hotkey">n</span>ext step</a>
-    </div>
-  </div>
-</div>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/codewalkdir.html b/installer/vendor/golang.org/x/tools/godoc/static/codewalkdir.html
deleted file mode 100644
index b7674c6ce9..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/codewalkdir.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<!--
-	Copyright 2010 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<table class="layout">
-{{range .}}
-<tr>
-	{{$name_html := html .Name}}
-	<td><a href="{{$name_html}}">{{$name_html}}</a></td>
-	<td width="25">&nbsp;</td>
-	<td>{{html .Title}}</td>
-</tr>
-{{end}}
-</table>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/dirlist.html b/installer/vendor/golang.org/x/tools/godoc/static/dirlist.html
deleted file mode 100644
index a3e1a2fa88..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/dirlist.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<p>
-<table class="layout">
-<tr>
-	<th align="left">File</th>
-	<td width="25">&nbsp;</td>
-	<th align="right">Bytes</th>
-	<td width="25">&nbsp;</td>
-	<th align="left">Modified</th>
-</tr>
-<tr>
-	<td><a href="..">..</a></td>
-</tr>
-{{range .}}
-<tr>
-	{{$name_html := fileInfoName . | html}}
-	<td align="left"><a href="{{$name_html}}">{{$name_html}}</a></td>
-	<td></td>
-	<td align="right">{{html .Size}}</td>
-	<td></td>
-	<td align="left">{{fileInfoTime . | html}}</td>
-</tr>
-{{end}}
-
-</table>
-</p>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/doc.go b/installer/vendor/golang.org/x/tools/godoc/static/doc.go
deleted file mode 100644
index b3d8bcf34b..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/doc.go
+++ /dev/null
@@ -1,8 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package static exports a map of static file content that supports the godoc
-// user interface. The map should be used with the mapfs package, see
-// golang.org/x/tools/godoc/vfs/mapfs.
-package static // import "golang.org/x/tools/godoc/static"
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/error.html b/installer/vendor/golang.org/x/tools/godoc/static/error.html
deleted file mode 100644
index 7573aa2367..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/error.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<p>
-<span class="alert" style="font-size:120%">{{html .}}</span>
-</p>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/example.html b/installer/vendor/golang.org/x/tools/godoc/static/example.html
deleted file mode 100644
index 1e86b25884..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/example.html
+++ /dev/null
@@ -1,30 +0,0 @@
-<div id="example_{{.Name}}" class="toggle">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Example{{example_suffix .Name}}</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Example{{example_suffix .Name}}</span></p>
-		{{with .Doc}}<p>{{html .}}</p>{{end}}
-		{{$output := .Output}}
-		{{with .Play}}
-			<div class="play">
-				<div class="input"><textarea class="code" spellcheck="false">{{html .}}</textarea></div>
-				<div class="output"><pre>{{html $output}}</pre></div>
-				<div class="buttons">
-					<a class="run" title="Run this code [shift-enter]">Run</a>
-					<a class="fmt" title="Format this code">Format</a>
-					{{if not $.GoogleCN}}
-					<a class="share" title="Share this code">Share</a>
-					{{end}}
-				</div>
-			</div>
-		{{else}}
-			<p>Code:</p>
-			<pre class="code">{{.Code}}</pre>
-			{{with .Output}}
-			<p>Output:</p>
-			<pre class="output">{{html .}}</pre>
-			{{end}}
-		{{end}}
-	</div>
-</div>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/gen.go b/installer/vendor/golang.org/x/tools/godoc/static/gen.go
deleted file mode 100644
index 42268211e4..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/gen.go
+++ /dev/null
@@ -1,7 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package static
-
-//go:generate go run makestatic.go
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/godoc.html b/installer/vendor/golang.org/x/tools/godoc/static/godoc.html
deleted file mode 100644
index e0caaa8957..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/godoc.html
+++ /dev/null
@@ -1,120 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="theme-color" content="#375EAB">
-{{with .Tabtitle}}
-  <title>{{html .}} - The Go Programming Language</title>
-{{else}}
-  <title>The Go Programming Language</title>
-{{end}}
-<link type="text/css" rel="stylesheet" href="/lib/godoc/style.css">
-{{if .SearchBox}}
-<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
-{{end}}
-<link rel="stylesheet" href="/lib/godoc/jquery.treeview.css">
-<script type="text/javascript">window.initFuncs = [];</script>
-</head>
-<body>
-
-<div id='lowframe' style="position: fixed; bottom: 0; left: 0; height: 0; width: 100%; border-top: thin solid grey; background-color: white; overflow: auto;">
-...
-</div><!-- #lowframe -->
-
-<div id="topbar"{{if .Title}} class="wide"{{end}}><div class="container">
-<div class="top-heading" id="heading-wide"><a href="/">The Go Programming Language</a></div>
-<div class="top-heading" id="heading-narrow"><a href="/">Go</a></div>
-<a href="#" id="menu-button"><span id="menu-button-arrow">&#9661;</span></a>
-<form method="GET" action="/search">
-<div id="menu">
-<a href="/doc/">Documents</a>
-<a href="/pkg/">Packages</a>
-<a href="/project/">The Project</a>
-<a href="/help/">Help</a>
-{{if not .GoogleCN}}
-<a href="/blog/">Blog</a>
-{{end}}
-{{if .Playground}}
-<a id="playgroundButton" href="http://play.golang.org/" title="Show Go Playground">Play</a>
-{{end}}
-<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
-</div>
-</form>
-
-</div></div>
-
-{{if .Playground}}
-<div id="playground" class="play">
-	<div class="input"><textarea class="code" spellcheck="false">package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("Hello, 世界")
-}</textarea></div>
-	<div class="output"></div>
-	<div class="buttons">
-		<a class="run" title="Run this code [shift-enter]">Run</a>
-		<a class="fmt" title="Format this code">Format</a>
-		{{if not $.GoogleCN}}
-		<a class="share" title="Share this code">Share</a>
-		{{end}}
-	</div>
-</div>
-{{end}}
-
-<div id="page"{{if .Title}} class="wide"{{end}}>
-<div class="container">
-
-{{if or .Title .SrcPath}}
-  <h1>
-    {{html .Title}}
-    {{html .SrcPath | srcBreadcrumb}}
-  </h1>
-{{end}}
-
-{{with .Subtitle}}
-  <h2>{{html .}}</h2>
-{{end}}
-
-{{with .SrcPath}}
-  <h2>
-    Documentation: {{html . | srcToPkgLink}}
-  </h2>
-{{end}}
-
-{{/* The Table of Contents is automatically inserted in this <div>.
-     Do not delete this <div>. */}}
-<div id="nav"></div>
-
-{{/* Body is HTML-escaped elsewhere */}}
-{{printf "%s" .Body}}
-
-<div id="footer">
-Build version {{html .Version}}.<br>
-Except as <a href="https://developers.google.com/site-policies#restrictions">noted</a>,
-the content of this page is licensed under the
-Creative Commons Attribution 3.0 License,
-and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
-<a href="/doc/tos.html">Terms of Service</a> |
-<a href="http://www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-</div>
-
-</div><!-- .container -->
-</div><!-- #page -->
-
-<!-- TODO(adonovan): load these from <head> using "defer" attribute? -->
-<script type="text/javascript" src="/lib/godoc/jquery.js"></script>
-<script type="text/javascript" src="/lib/godoc/jquery.treeview.js"></script>
-<script type="text/javascript" src="/lib/godoc/jquery.treeview.edit.js"></script>
-
-{{if .Playground}}
-<script type="text/javascript" src="/lib/godoc/playground.js"></script>
-{{end}}
-{{with .Version}}<script>var goVersion = {{printf "%q" .}};</script>{{end}}
-<script type="text/javascript" src="/lib/godoc/godocs.js"></script>
-
-</body>
-</html>
-
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/godocs.js b/installer/vendor/golang.org/x/tools/godoc/static/godocs.js
deleted file mode 100644
index 09bf0e8022..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/godocs.js
+++ /dev/null
@@ -1,604 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/* A little code to ease navigation of these documents.
- *
- * On window load we:
- *  + Generate a table of contents (generateTOC)
- *  + Bind foldable sections (bindToggles)
- *  + Bind links to foldable sections (bindToggleLinks)
- */
-
-(function() {
-'use strict';
-
-// Mobile-friendly topbar menu
-$(function() {
-  var menu = $('#menu');
-  var menuButton = $('#menu-button');
-  var menuButtonArrow = $('#menu-button-arrow');
-  menuButton.click(function(event) {
-    menu.toggleClass('menu-visible');
-    menuButtonArrow.toggleClass('vertical-flip');
-    event.preventDefault();
-    return false;
-  });
-});
-
-/* Generates a table of contents: looks for h2 and h3 elements and generates
- * links. "Decorates" the element with id=="nav" with this table of contents.
- */
-function generateTOC() {
-  if ($('#manual-nav').length > 0) {
-    return;
-  }
-
-  var nav = $('#nav');
-  if (nav.length === 0) {
-    return;
-  }
-
-  var toc_items = [];
-  $(nav).nextAll('h2, h3').each(function() {
-    var node = this;
-    if (node.id == '')
-      node.id = 'tmp_' + toc_items.length;
-    var link = $('<a/>').attr('href', '#' + node.id).text($(node).text());
-    var item;
-    if ($(node).is('h2')) {
-      item = $('<dt/>');
-    } else { // h3
-      item = $('<dd class="indent"/>');
-    }
-    item.append(link);
-    toc_items.push(item);
-  });
-  if (toc_items.length <= 1) {
-    return;
-  }
-
-  var dl1 = $('<dl/>');
-  var dl2 = $('<dl/>');
-
-  var split_index = (toc_items.length / 2) + 1;
-  if (split_index < 8) {
-    split_index = toc_items.length;
-  }
-  for (var i = 0; i < split_index; i++) {
-    dl1.append(toc_items[i]);
-  }
-  for (/* keep using i */; i < toc_items.length; i++) {
-    dl2.append(toc_items[i]);
-  }
-
-  var tocTable = $('<table class="unruled"/>').appendTo(nav);
-  var tocBody = $('<tbody/>').appendTo(tocTable);
-  var tocRow = $('<tr/>').appendTo(tocBody);
-
-  // 1st column
-  $('<td class="first"/>').appendTo(tocRow).append(dl1);
-  // 2nd column
-  $('<td/>').appendTo(tocRow).append(dl2);
-}
-
-function bindToggle(el) {
-  $('.toggleButton', el).click(function() {
-    if ($(this).closest(".toggle, .toggleVisible")[0] != el) {
-      // Only trigger the closest toggle header.
-      return;
-    }
-
-    if ($(el).is('.toggle')) {
-      $(el).addClass('toggleVisible').removeClass('toggle');
-    } else {
-      $(el).addClass('toggle').removeClass('toggleVisible');
-    }
-  });
-}
-
-function bindToggles(selector) {
-  $(selector).each(function(i, el) {
-    bindToggle(el);
-  });
-}
-
-function bindToggleLink(el, prefix) {
-  $(el).click(function() {
-    var href = $(el).attr('href');
-    var i = href.indexOf('#'+prefix);
-    if (i < 0) {
-      return;
-    }
-    var id = '#' + prefix + href.slice(i+1+prefix.length);
-    if ($(id).is('.toggle')) {
-      $(id).find('.toggleButton').first().click();
-    }
-  });
-}
-function bindToggleLinks(selector, prefix) {
-  $(selector).each(function(i, el) {
-    bindToggleLink(el, prefix);
-  });
-}
-
-function setupDropdownPlayground() {
-  if (!$('#page').is('.wide')) {
-    return; // don't show on front page
-  }
-  var button = $('#playgroundButton');
-  var div = $('#playground');
-  var setup = false;
-  button.toggle(function() {
-    button.addClass('active');
-    div.show();
-    if (setup) {
-      return;
-    }
-    setup = true;
-    playground({
-      'codeEl': $('.code', div),
-      'outputEl': $('.output', div),
-      'runEl': $('.run', div),
-      'fmtEl': $('.fmt', div),
-      'shareEl': $('.share', div),
-      'shareRedirect': '//play.golang.org/p/'
-    });
-  },
-  function() {
-    button.removeClass('active');
-    div.hide();
-  });
-  button.show();
-  $('#menu').css('min-width', '+=60');
-}
-
-function setupInlinePlayground() {
-	'use strict';
-	// Set up playground when each element is toggled.
-	$('div.play').each(function (i, el) {
-		// Set up playground for this example.
-		var setup = function() {
-			var code = $('.code', el);
-			playground({
-				'codeEl':   code,
-				'outputEl': $('.output', el),
-				'runEl':    $('.run', el),
-				'fmtEl':    $('.fmt', el),
-				'shareEl':  $('.share', el),
-				'shareRedirect': '//play.golang.org/p/'
-			});
-
-			// Make the code textarea resize to fit content.
-			var resize = function() {
-				code.height(0);
-				var h = code[0].scrollHeight;
-				code.height(h+20); // minimize bouncing.
-				code.closest('.input').height(h);
-			};
-			code.on('keydown', resize);
-			code.on('keyup', resize);
-			code.keyup(); // resize now.
-		};
-		
-		// If example already visible, set up playground now.
-		if ($(el).is(':visible')) {
-			setup();
-			return;
-		}
-
-		// Otherwise, set up playground when example is expanded.
-		var built = false;
-		$(el).closest('.toggle').click(function() {
-			// Only set up once.
-			if (!built) {
-				setup();
-				built = true;
-			}
-		});
-	});
-}
-
-// fixFocus tries to put focus to div#page so that keyboard navigation works.
-function fixFocus() {
-  var page = $('div#page');
-  var topbar = $('div#topbar');
-  page.css('outline', 0); // disable outline when focused
-  page.attr('tabindex', -1); // and set tabindex so that it is focusable
-  $(window).resize(function (evt) {
-    // only focus page when the topbar is at fixed position (that is, it's in
-    // front of page, and keyboard event will go to the former by default.)
-    // by focusing page, keyboard event will go to page so that up/down arrow,
-    // space, etc. will work as expected.
-    if (topbar.css('position') == "fixed")
-      page.focus();
-  }).resize();
-}
-
-function toggleHash() {
-  var id = window.location.hash.substring(1);
-  // Open all of the toggles for a particular hash.
-  var els = $(
-    document.getElementById(id),
-    $('a[name]').filter(function() {
-      return $(this).attr('name') == id;
-    })
-  );
-
-  while (els.length) {
-    for (var i = 0; i < els.length; i++) {
-      var el = $(els[i]);
-      if (el.is('.toggle')) {
-        el.find('.toggleButton').first().click();
-      }
-    }
-    els = el.parent();
-  }
-}
-
-function personalizeInstallInstructions() {
-  var prefix = '?download=';
-  var s = window.location.search;
-  if (s.indexOf(prefix) != 0) {
-    // No 'download' query string; detect "test" instructions from User Agent.
-    if (navigator.platform.indexOf('Win') != -1) {
-      $('.testUnix').hide();
-      $('.testWindows').show();
-    } else {
-      $('.testUnix').show();
-      $('.testWindows').hide();
-    }
-    return;
-  }
-
-  var filename = s.substr(prefix.length);
-  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9]+)?(-osx10\.[68])?\.([a-z.]+)$/;
-  $('.downloadFilename').text(filename);
-  $('.hideFromDownload').hide();
-  var m = filenameRE.exec(filename);
-  if (!m) {
-    // Can't interpret file name; bail.
-    return;
-  }
-
-  var os = m[3];
-  var ext = m[6];
-  if (ext != 'tar.gz') {
-    $('#tarballInstructions').hide();
-  }
-  if (os != 'darwin' || ext != 'pkg') {
-    $('#darwinPackageInstructions').hide();
-  }
-  if (os != 'windows') {
-    $('#windowsInstructions').hide();
-    $('.testUnix').show();
-    $('.testWindows').hide();
-  } else {
-    if (ext != 'msi') {
-      $('#windowsInstallerInstructions').hide();
-    }
-    if (ext != 'zip') {
-      $('#windowsZipInstructions').hide();
-    }
-    $('.testUnix').hide();
-    $('.testWindows').show();
-  }
-
-  var download = "https://storage.googleapis.com/golang/" + filename;
-
-  var message = $('<p class="downloading">'+
-    'Your download should begin shortly. '+
-    'If it does not, click <a>this link</a>.</p>');
-  message.find('a').attr('href', download);
-  message.insertAfter('#nav');
-
-  window.location = download;
-}
-
-function updateVersionTags() {
-  var v = window.goVersion;
-  if (/^go[0-9.]+$/.test(v)) {
-    $(".versionTag").empty().text(v);
-    $(".whereTag").hide();
-  }
-}
-
-function addPermalinks() {
-  function addPermalink(source, parent) {
-    var id = source.attr("id");
-    if (id == "" || id.indexOf("tmp_") === 0) {
-      // Auto-generated permalink.
-      return;
-    }
-    if (parent.find("> .permalink").length) {
-      // Already attached.
-      return;
-    }
-    parent.append(" ").append($("<a class='permalink'>&#xb6;</a>").attr("href", "#" + id));
-  }
-
-  $("#page .container").find("h2[id], h3[id]").each(function() {
-    var el = $(this);
-    addPermalink(el, el);
-  });
-
-  $("#page .container").find("dl[id]").each(function() {
-    var el = $(this);
-    // Add the anchor to the "dt" element.
-    addPermalink(el, el.find("> dt").first());
-  });
-}
-
-$(document).ready(function() {
-  generateTOC();
-  addPermalinks();
-  bindToggles(".toggle");
-  bindToggles(".toggleVisible");
-  bindToggleLinks(".exampleLink", "example_");
-  bindToggleLinks(".overviewLink", "");
-  bindToggleLinks(".examplesLink", "");
-  bindToggleLinks(".indexLink", "");
-  setupDropdownPlayground();
-  setupInlinePlayground();
-  fixFocus();
-  setupTypeInfo();
-  setupCallgraphs();
-  toggleHash();
-  personalizeInstallInstructions();
-  updateVersionTags();
-
-  // godoc.html defines window.initFuncs in the <head> tag, and root.html and
-  // codewalk.js push their on-page-ready functions to the list.
-  // We execute those functions here, to avoid loading jQuery until the page
-  // content is loaded.
-  for (var i = 0; i < window.initFuncs.length; i++) window.initFuncs[i]();
-});
-
-// -- analysis ---------------------------------------------------------
-
-// escapeHTML returns HTML for s, with metacharacters quoted.
-// It is safe for use in both elements and attributes
-// (unlike the "set innerText, read innerHTML" trick).
-function escapeHTML(s) {
-    return s.replace(/&/g, '&amp;').
-             replace(/\"/g, '&quot;').
-             replace(/\'/g, '&#39;').
-             replace(/</g, '&lt;').
-             replace(/>/g, '&gt;');
-}
-
-// makeAnchor returns HTML for an <a> element, given an anchorJSON object.
-function makeAnchor(json) {
-  var html = escapeHTML(json.Text);
-  if (json.Href != "") {
-      html = "<a href='" + escapeHTML(json.Href) + "'>" + html + "</a>";
-  }
-  return html;
-}
-
-function showLowFrame(html) {
-  var lowframe = document.getElementById('lowframe');
-  lowframe.style.height = "200px";
-  lowframe.innerHTML = "<p style='text-align: left;'>" + html + "</p>\n" +
-      "<div onclick='hideLowFrame()' style='position: absolute; top: 0; right: 0; cursor: pointer;'>✘</div>"
-};
-
-document.hideLowFrame = function() {
-  var lowframe = document.getElementById('lowframe');
-  lowframe.style.height = "0px";
-}
-
-// onClickCallers is the onclick action for the 'func' tokens of a
-// function declaration.
-document.onClickCallers = function(index) {
-  var data = document.ANALYSIS_DATA[index]
-  if (data.Callers.length == 1 && data.Callers[0].Sites.length == 1) {
-    document.location = data.Callers[0].Sites[0].Href; // jump to sole caller
-    return;
-  }
-
-  var html = "Callers of <code>" + escapeHTML(data.Callee) + "</code>:<br/>\n";
-  for (var i = 0; i < data.Callers.length; i++) {
-    var caller = data.Callers[i];
-    html += "<code>" + escapeHTML(caller.Func) + "</code>";
-    var sites = caller.Sites;
-    if (sites != null && sites.length > 0) {
-      html += " at line ";
-      for (var j = 0; j < sites.length; j++) {
-        if (j > 0) {
-          html += ", ";
-        }
-        html += "<code>" + makeAnchor(sites[j]) + "</code>";
-      }
-    }
-    html += "<br/>\n";
-  }
-  showLowFrame(html);
-};
-
-// onClickCallees is the onclick action for the '(' token of a function call.
-document.onClickCallees = function(index) {
-  var data = document.ANALYSIS_DATA[index]
-  if (data.Callees.length == 1) {
-    document.location = data.Callees[0].Href; // jump to sole callee
-    return;
-  }
-
-  var html = "Callees of this " + escapeHTML(data.Descr) + ":<br/>\n";
-  for (var i = 0; i < data.Callees.length; i++) {
-    html += "<code>" + makeAnchor(data.Callees[i]) + "</code><br/>\n";
-  }
-  showLowFrame(html);
-};
-
-// onClickTypeInfo is the onclick action for identifiers declaring a named type.
-document.onClickTypeInfo = function(index) {
-  var data = document.ANALYSIS_DATA[index];
-  var html = "Type <code>" + data.Name + "</code>: " +
-  "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<small>(size=" + data.Size + ", align=" + data.Align + ")</small><br/>\n";
-  html += implementsHTML(data);
-  html += methodsetHTML(data);
-  showLowFrame(html);
-};
-
-// implementsHTML returns HTML for the implements relation of the
-// specified TypeInfoJSON value.
-function implementsHTML(info) {
-  var html = "";
-  if (info.ImplGroups != null) {
-    for (var i = 0; i < info.ImplGroups.length; i++) {
-      var group = info.ImplGroups[i];
-      var x = "<code>" + escapeHTML(group.Descr) + "</code> ";
-      for (var j = 0; j < group.Facts.length; j++) {
-        var fact = group.Facts[j];
-        var y = "<code>" + makeAnchor(fact.Other) + "</code>";
-        if (fact.ByKind != null) {
-          html += escapeHTML(fact.ByKind) + " type " + y + " implements " + x;
-        } else {
-          html += x + " implements " + y;
-        }
-        html += "<br/>\n";
-      }
-    }
-  }
-  return html;
-}
-
-
-// methodsetHTML returns HTML for the methodset of the specified
-// TypeInfoJSON value.
-function methodsetHTML(info) {
-  var html = "";
-  if (info.Methods != null) {
-    for (var i = 0; i < info.Methods.length; i++) {
-      html += "<code>" + makeAnchor(info.Methods[i]) + "</code><br/>\n";
-    }
-  }
-  return html;
-}
-
-// onClickComm is the onclick action for channel "make" and "<-"
-// send/receive tokens.
-document.onClickComm = function(index) {
-  var ops = document.ANALYSIS_DATA[index].Ops
-  if (ops.length == 1) {
-    document.location = ops[0].Op.Href; // jump to sole element
-    return;
-  }
-
-  var html = "Operations on this channel:<br/>\n";
-  for (var i = 0; i < ops.length; i++) {
-    html += makeAnchor(ops[i].Op) + " by <code>" + escapeHTML(ops[i].Fn) + "</code><br/>\n";
-  }
-  if (ops.length == 0) {
-    html += "(none)<br/>\n";
-  }
-  showLowFrame(html);
-};
-
-$(window).load(function() {
-    // Scroll window so that first selection is visible.
-    // (This means we don't need to emit id='L%d' spans for each line.)
-    // TODO(adonovan): ideally, scroll it so that it's under the pointer,
-    // but I don't know how to get the pointer y coordinate.
-    var elts = document.getElementsByClassName("selection");
-    if (elts.length > 0) {
-	elts[0].scrollIntoView()
-    }
-});
-
-// setupTypeInfo populates the "Implements" and "Method set" toggle for
-// each type in the package doc.
-function setupTypeInfo() {
-  for (var i in document.ANALYSIS_DATA) {
-    var data = document.ANALYSIS_DATA[i];
-
-    var el = document.getElementById("implements-" + i);
-    if (el != null) {
-      // el != null => data is TypeInfoJSON.
-      if (data.ImplGroups != null) {
-        el.innerHTML = implementsHTML(data);
-        el.parentNode.parentNode.style.display = "block";
-      }
-    }
-
-    var el = document.getElementById("methodset-" + i);
-    if (el != null) {
-      // el != null => data is TypeInfoJSON.
-      if (data.Methods != null) {
-        el.innerHTML = methodsetHTML(data);
-        el.parentNode.parentNode.style.display = "block";
-      }
-    }
-  }
-}
-
-function setupCallgraphs() {
-  if (document.CALLGRAPH == null) {
-    return
-  }
-  document.getElementById("pkg-callgraph").style.display = "block";
-
-  var treeviews = document.getElementsByClassName("treeview");
-  for (var i = 0; i < treeviews.length; i++) {
-    var tree = treeviews[i];
-    if (tree.id == null || tree.id.indexOf("callgraph-") != 0) {
-      continue;
-    }
-    var id = tree.id.substring("callgraph-".length);
-    $(tree).treeview({collapsed: true, animated: "fast"});
-    document.cgAddChildren(tree, tree, [id]);
-    tree.parentNode.parentNode.style.display = "block";
-  }
-}
-
-document.cgAddChildren = function(tree, ul, indices) {
-  if (indices != null) {
-    for (var i = 0; i < indices.length; i++) {
-      var li = cgAddChild(tree, ul, document.CALLGRAPH[indices[i]]);
-      if (i == indices.length - 1) {
-        $(li).addClass("last");
-      }
-    }
-  }
-  $(tree).treeview({animated: "fast", add: ul});
-}
-
-// cgAddChild adds an <li> element for document.CALLGRAPH node cgn to
-// the parent <ul> element ul. tree is the tree's root <ul> element.
-function cgAddChild(tree, ul, cgn) {
-   var li = document.createElement("li");
-   ul.appendChild(li);
-   li.className = "closed";
-
-   var code = document.createElement("code");
-
-   if (cgn.Callees != null) {
-     $(li).addClass("expandable");
-
-     // Event handlers and innerHTML updates don't play nicely together,
-     // hence all this explicit DOM manipulation.
-     var hitarea = document.createElement("div");
-     hitarea.className = "hitarea expandable-hitarea";
-     li.appendChild(hitarea);
-
-     li.appendChild(code);
-
-     var childUL = document.createElement("ul");
-     li.appendChild(childUL);
-     childUL.setAttribute('style', "display: none;");
-
-     var onClick = function() {
-       document.cgAddChildren(tree, childUL, cgn.Callees);
-       hitarea.removeEventListener('click', onClick)
-     };
-     hitarea.addEventListener('click', onClick);
-
-   } else {
-     li.appendChild(code);
-   }
-   code.innerHTML += "&nbsp;" + makeAnchor(cgn.Func);
-   return li
-}
-
-})();
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/minus.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/minus.gif
deleted file mode 100644
index 47fb7b767c..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/minus.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/plus.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/plus.gif
deleted file mode 100644
index 6906621627..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/plus.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black-line.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black-line.gif
deleted file mode 100644
index e5496877a0..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black-line.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black.gif
deleted file mode 100644
index b718d17f30..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-black.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default-line.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default-line.gif
deleted file mode 100644
index 37114d3068..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default-line.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default.gif
deleted file mode 100644
index 76eee60dd0..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-default.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray-line.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray-line.gif
deleted file mode 100644
index 37600447dc..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray-line.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray.gif b/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray.gif
deleted file mode 100644
index cfdf1ab650..0000000000
Binary files a/installer/vendor/golang.org/x/tools/godoc/static/images/treeview-gray.gif and /dev/null differ
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/implements.html b/installer/vendor/golang.org/x/tools/godoc/static/implements.html
deleted file mode 100644
index 5f65b861a3..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/implements.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Implements</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Implements</span></p>
-		<div style="margin-left: 1in" id='implements-{{.Index}}'>...</div>
-	</div>
-</div>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/jquery.js b/installer/vendor/golang.org/x/tools/godoc/static/jquery.js
deleted file mode 100644
index bc3fbc81b2..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/jquery.js
+++ /dev/null
@@ -1,2 +0,0 @@
-/*! jQuery v1.8.2 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call(" ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":(a+"").replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")||(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&p.expr.match.needsContext.test(f),namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=k.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<q;d++)l=o[d],m=l.selector,h[m]===b&&(h[m]=l.needsContext?p(m,this).index(f)>=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){i=u[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){l=i.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,g=((p.event.special[l.origType]||{}).handle||l.handler).apply(i.elem,r),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length===1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h<i;h++)if(f=a[h])if(!c||c(f,d,e))g.push(f),j&&b.push(h);return g}function bl(a,b,c,d,e,f){return d&&!d[o]&&(d=bl(d)),e&&!e[o]&&(e=bl(e,f)),z(function(f,g,h,i){if(f&&e)return;var j,k,l,m=[],n=[],o=g.length,p=f||bo(b||"*",h.nodeType?[h]:h,[],f),q=a&&(f||!b)?bk(p,m,a,h,i):p,r=c?e||(f?a:o||d)?[]:g:q;c&&c(q,r,h,i);if(d){l=bk(r,n),d(l,[],h,i),j=l.length;while(j--)if(k=l[j])r[n[j]]=!(q[n[j]]=k)}if(f){j=a&&r.length;while(j--)if(k=r[j])f[m[j]]=!(g[m[j]]=k)}else r=bk(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):w.apply(g,r)})}function bm(a){var b,c,d,f=a.length,g=e.relative[a[0].type],h=g||e.relative[" "],i=g?1:0,j=bi(function(a){return a===b},h,!0),k=bi(function(a){return y.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i<f;i++)if(c=e.relative[a[i].type])m=[bi(bj(m),c)];else{c=e.filter[a[i].type].apply(null,a[i].matches);if(c[o]){d=++i;for(;d<f;d++)if(e.relative[a[d].type])break;return bl(i>1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i<d&&bm(a.slice(i,d)),d<f&&bm(a=a.slice(d)),d<f&&a.join(""))}m.push(c)}return bj(m)}function bn(a,b){var d=b.length>0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)bc(a,b[e],c,d);return c}function bp(a,b,c,d,f){var g,h,j,k,l,m=bh(a),n=m.length;if(!d&&m.length===1){h=m[0]=m[0].slice(0);if(h.length>2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;b<c;b++)if(this[b]===a)return b;return-1},z=function(a,b){return a[o]=b==null||b,a},A=function(){var a={},b=[];return z(function(c,d){return b.push(c)>e.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d<b;d+=2)a.push(d);return a}),odd:bf(function(a,b,c){for(var d=1;d<b;d+=2)a.push(d);return a}),lt:bf(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},j=s.compareDocumentPosition?function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bg(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bg(e[j],f[j]);return j===c?bg(a,f[j],-1):bg(e[j],b,1)},[0,0].sort(j),m=!k,bc.uniqueSort=function(a){var b,c=1;k=m,a.sort(j);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},bc.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},i=bc.compile=function(a,b){var c,d=[],e=[],f=D[o][a];if(!f){b||(b=bh(a)),c=b.length;while(c--)f=bm(b[c]),f[o]?d.push(f):e.push(f);f=D(a,bn(e,d))}return f},r.querySelectorAll&&function(){var a,b=bp,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[":focus"],f=[":active",":focus"],h=s.matchesSelector||s.mozMatchesSelector||s.webkitMatchesSelector||s.oMatchesSelector||s.msMatchesSelector;X(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j={top:0,left:0},k=this[0],l=k&&k.ownerDocument;if(!l)return;return(d=l.body)===k?p.offset.bodyOffset(k):(c=l.documentElement,p.contains(c,k)?(typeof k.getBoundingClientRect!="undefined"&&(j=k.getBoundingClientRect()),e=da(l),f=c.clientTop||d.clientTop||0,g=c.clientLeft||d.clientLeft||0,h=e.pageYOffset||c.scrollTop,i=e.pageXOffset||c.scrollLeft,{top:j.top+h-f,left:j.left+i-g}):j)},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.css b/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.css
deleted file mode 100644
index ac33361a62..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.css
+++ /dev/null
@@ -1,76 +0,0 @@
-/* https://github.com/jzaefferer/jquery-treeview/blob/master/jquery.treeview.css */
-/* License: MIT. */
-.treeview, .treeview ul {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}
-
-.treeview ul {
-	background-color: white;
-	margin-top: 4px;
-}
-
-.treeview .hitarea {
-	background: url(images/treeview-default.gif) -64px -25px no-repeat;
-	height: 16px;
-	width: 16px;
-	margin-left: -16px;
-	float: left;
-	cursor: pointer;
-}
-/* fix for IE6 */
-* html .hitarea {
-	display: inline;
-	float:none;
-}
-
-.treeview li {
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-}
-
-.treeview a.selected {
-	background-color: #eee;
-}
-
-#treecontrol { margin: 1em 0; display: none; }
-
-.treeview .hover { color: red; cursor: pointer; }
-
-.treeview li { background: url(images/treeview-default-line.gif) 0 0 no-repeat; }
-.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
-
-.treeview .expandable-hitarea { background-position: -80px -3px; }
-
-.treeview li.last { background-position: 0 -1766px }
-.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(images/treeview-default.gif); }
-.treeview li.lastCollapsable { background-position: 0 -111px }
-.treeview li.lastExpandable { background-position: -32px -67px }
-
-.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; }
-
-.treeview-red li { background-image: url(images/treeview-red-line.gif); }
-.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(images/treeview-red.gif); }
-
-.treeview-black li { background-image: url(images/treeview-black-line.gif); }
-.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(images/treeview-black.gif); }
-
-.treeview-gray li { background-image: url(images/treeview-gray-line.gif); }
-.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(images/treeview-gray.gif); }
-
-.treeview-famfamfam li { background-image: url(images/treeview-famfamfam-line.gif); }
-.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(images/treeview-famfamfam.gif); }
-
-.treeview .placeholder {
-	background: url(images/ajax-loader.gif) 0 0 no-repeat;
-	height: 16px;
-	width: 16px;
-	display: block;
-}
-
-.filetree li { padding: 3px 0 2px 16px; }
-.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; }
-.filetree span.folder { background: url(images/folder.gif) 0 0 no-repeat; }
-.filetree li.expandable span.folder { background: url(images/folder-closed.gif) 0 0 no-repeat; }
-.filetree span.file { background: url(images/file.gif) 0 0 no-repeat; }
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.edit.js b/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.edit.js
deleted file mode 100644
index 9895b02631..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.edit.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/* https://github.com/jzaefferer/jquery-treeview/blob/master/jquery.treeview.edit.js */
-/* License: MIT. */
-(function($) {
-	var CLASSES = $.treeview.classes;
-	var proxied = $.fn.treeview;
-	$.fn.treeview = function(settings) {
-		settings = $.extend({}, settings);
-		if (settings.add) {
-			return this.trigger("add", [settings.add]);
-		}
-		if (settings.remove) {
-			return this.trigger("remove", [settings.remove]);
-		}
-		return proxied.apply(this, arguments).bind("add", function(event, branches) {
-			$(branches).prev()
-				.removeClass(CLASSES.last)
-				.removeClass(CLASSES.lastCollapsable)
-				.removeClass(CLASSES.lastExpandable)
-			.find(">.hitarea")
-				.removeClass(CLASSES.lastCollapsableHitarea)
-				.removeClass(CLASSES.lastExpandableHitarea);
-			$(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, $(this).data("toggler"));
-		}).bind("remove", function(event, branches) {
-			var prev = $(branches).prev();
-			var parent = $(branches).parent();
-			$(branches).remove();
-			prev.filter(":last-child").addClass(CLASSES.last)
-				.filter("." + CLASSES.expandable).replaceClass(CLASSES.last, CLASSES.lastExpandable).end()
-				.find(">.hitarea").replaceClass(CLASSES.expandableHitarea, CLASSES.lastExpandableHitarea).end()
-				.filter("." + CLASSES.collapsable).replaceClass(CLASSES.last, CLASSES.lastCollapsable).end()
-				.find(">.hitarea").replaceClass(CLASSES.collapsableHitarea, CLASSES.lastCollapsableHitarea);
-			if (parent.is(":not(:has(>))") && parent[0] != this) {
-				parent.parent().removeClass(CLASSES.collapsable).removeClass(CLASSES.expandable)
-				parent.siblings(".hitarea").andSelf().remove();
-			}
-		});
-	};
-	
-})(jQuery);
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.js b/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.js
deleted file mode 100644
index 356af2380f..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/jquery.treeview.js
+++ /dev/null
@@ -1,256 +0,0 @@
-/*
- * Treeview 1.4.1 - jQuery plugin to hide and show branches of a tree
- * 
- * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
- * http://docs.jquery.com/Plugins/Treeview
- *
- * Copyright (c) 2007 Jörn Zaefferer
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id: jquery.treeview.js 5759 2008-07-01 07:50:28Z joern.zaefferer $
- *
- */
-
-;(function($) {
-
-	// TODO rewrite as a widget, removing all the extra plugins
-	$.extend($.fn, {
-		swapClass: function(c1, c2) {
-			var c1Elements = this.filter('.' + c1);
-			this.filter('.' + c2).removeClass(c2).addClass(c1);
-			c1Elements.removeClass(c1).addClass(c2);
-			return this;
-		},
-		replaceClass: function(c1, c2) {
-			return this.filter('.' + c1).removeClass(c1).addClass(c2).end();
-		},
-		hoverClass: function(className) {
-			className = className || "hover";
-			return this.hover(function() {
-				$(this).addClass(className);
-			}, function() {
-				$(this).removeClass(className);
-			});
-		},
-		heightToggle: function(animated, callback) {
-			animated ?
-				this.animate({ height: "toggle" }, animated, callback) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-					if(callback)
-						callback.apply(this, arguments);
-				});
-		},
-		heightHide: function(animated, callback) {
-			if (animated) {
-				this.animate({ height: "hide" }, animated, callback);
-			} else {
-				this.hide();
-				if (callback)
-					this.each(callback);				
-			}
-		},
-		prepareBranches: function(settings) {
-			if (!settings.prerendered) {
-				// mark last tree items
-				this.filter(":last-child:not(ul)").addClass(CLASSES.last);
-				// collapse whole tree, or only those marked as closed, anyway except those marked as open
-				this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide();
-			}
-			// return all items with sublists
-			return this.filter(":has(>ul)");
-		},
-		applyClasses: function(settings, toggler) {
-			// TODO use event delegation
-			this.filter(":has(>ul):not(:has(>a))").find(">span").unbind("click.treeview").bind("click.treeview", function(event) {
-				// don't handle click events on children, eg. checkboxes
-				if ( this == event.target )
-					toggler.apply($(this).next());
-			}).add( $("a", this) ).hoverClass();
-			
-			if (!settings.prerendered) {
-				// handle closed ones first
-				this.filter(":has(>ul:hidden)")
-						.addClass(CLASSES.expandable)
-						.replaceClass(CLASSES.last, CLASSES.lastExpandable);
-						
-				// handle open ones
-				this.not(":has(>ul:hidden)")
-						.addClass(CLASSES.collapsable)
-						.replaceClass(CLASSES.last, CLASSES.lastCollapsable);
-						
-	            // create hitarea if not present
-				var hitarea = this.find("div." + CLASSES.hitarea);
-				if (!hitarea.length)
-					hitarea = this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>").find("div." + CLASSES.hitarea);
-				hitarea.removeClass().addClass(CLASSES.hitarea).each(function() {
-					var classes = "";
-					$.each($(this).parent().attr("class").split(" "), function() {
-						classes += this + "-hitarea ";
-					});
-					$(this).addClass( classes );
-				})
-			}
-			
-			// apply event to hitarea
-			this.find("div." + CLASSES.hitarea).click( toggler );
-		},
-		treeview: function(settings) {
-			
-			settings = $.extend({
-				cookieId: "treeview"
-			}, settings);
-			
-			if ( settings.toggle ) {
-				var callback = settings.toggle;
-				settings.toggle = function() {
-					return callback.apply($(this).parent()[0], arguments);
-				};
-			}
-		
-			// factory for treecontroller
-			function treeController(tree, control) {
-				// factory for click handlers
-				function handler(filter) {
-					return function() {
-						// reuse toggle event handler, applying the elements to toggle
-						// start searching for all hitareas
-						toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() {
-							// for plain toggle, no filter is provided, otherwise we need to check the parent element
-							return filter ? $(this).parent("." + filter).length : true;
-						}) );
-						return false;
-					};
-				}
-				// click on first element to collapse tree
-				$("a:eq(0)", control).click( handler(CLASSES.collapsable) );
-				// click on second to expand tree
-				$("a:eq(1)", control).click( handler(CLASSES.expandable) );
-				// click on third to toggle tree
-				$("a:eq(2)", control).click( handler() ); 
-			}
-		
-			// handle toggle event
-			function toggler() {
-				$(this)
-					.parent()
-					// swap classes for hitarea
-					.find(">.hitarea")
-						.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-						.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
-					.end()
-					// swap classes for parent li
-					.swapClass( CLASSES.collapsable, CLASSES.expandable )
-					.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-					// find child lists
-					.find( ">ul" )
-					// toggle them
-					.heightToggle( settings.animated, settings.toggle );
-				if ( settings.unique ) {
-					$(this).parent()
-						.siblings()
-						// swap classes for hitarea
-						.find(">.hitarea")
-							.replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-							.replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
-						.end()
-						.replaceClass( CLASSES.collapsable, CLASSES.expandable )
-						.replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-						.find( ">ul" )
-						.heightHide( settings.animated, settings.toggle );
-				}
-			}
-			this.data("toggler", toggler);
-			
-			function serialize() {
-				function binary(arg) {
-					return arg ? 1 : 0;
-				}
-				var data = [];
-				branches.each(function(i, e) {
-					data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0;
-				});
-				$.cookie(settings.cookieId, data.join(""), settings.cookieOptions );
-			}
-			
-			function deserialize() {
-				var stored = $.cookie(settings.cookieId);
-				if ( stored ) {
-					var data = stored.split("");
-					branches.each(function(i, e) {
-						$(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ]();
-					});
-				}
-			}
-			
-			// add treeview class to activate styles
-			this.addClass("treeview");
-			
-			// prepare branches and find all tree items with child lists
-			var branches = this.find("li").prepareBranches(settings);
-			
-			switch(settings.persist) {
-			case "cookie":
-				var toggleCallback = settings.toggle;
-				settings.toggle = function() {
-					serialize();
-					if (toggleCallback) {
-						toggleCallback.apply(this, arguments);
-					}
-				};
-				deserialize();
-				break;
-			case "location":
-				var current = this.find("a").filter(function() {
-					return this.href.toLowerCase() == location.href.toLowerCase();
-				});
-				if ( current.length ) {
-					// TODO update the open/closed classes
-					var items = current.addClass("selected").parents("ul, li").add( current.next() ).show();
-					if (settings.prerendered) {
-						// if prerendered is on, replicate the basic class swapping
-						items.filter("li")
-							.swapClass( CLASSES.collapsable, CLASSES.expandable )
-							.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-							.find(">.hitarea")
-								.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-								.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea );
-					}
-				}
-				break;
-			}
-			
-			branches.applyClasses(settings, toggler);
-				
-			// if control option is set, create the treecontroller and show it
-			if ( settings.control ) {
-				treeController(this, settings.control);
-				$(settings.control).show();
-			}
-			
-			return this;
-		}
-	});
-	
-	// classes used by the plugin
-	// need to be styled via external stylesheet, see first example
-	$.treeview = {};
-	var CLASSES = ($.treeview.classes = {
-		open: "open",
-		closed: "closed",
-		expandable: "expandable",
-		expandableHitarea: "expandable-hitarea",
-		lastExpandableHitarea: "lastExpandable-hitarea",
-		collapsable: "collapsable",
-		collapsableHitarea: "collapsable-hitarea",
-		lastCollapsableHitarea: "lastCollapsable-hitarea",
-		lastCollapsable: "lastCollapsable",
-		lastExpandable: "lastExpandable",
-		last: "last",
-		hitarea: "hitarea"
-	});
-	
-})(jQuery);
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/makestatic.go b/installer/vendor/golang.org/x/tools/godoc/static/makestatic.go
deleted file mode 100644
index 8ee8e55658..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/makestatic.go
+++ /dev/null
@@ -1,127 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build ignore
-
-// Command makestatic reads a set of files and writes a Go source file to "static.go"
-// that declares a map of string constants containing contents of the input files.
-// It is intended to be invoked via "go generate" (directive in "gen.go").
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/format"
-	"io/ioutil"
-	"os"
-	"time"
-	"unicode/utf8"
-)
-
-var files = []string{
-	"analysis/call3.png",
-	"analysis/call-eg.png",
-	"analysis/callers1.png",
-	"analysis/callers2.png",
-	"analysis/chan1.png",
-	"analysis/chan2a.png",
-	"analysis/chan2b.png",
-	"analysis/error1.png",
-	"analysis/help.html",
-	"analysis/ident-def.png",
-	"analysis/ident-field.png",
-	"analysis/ident-func.png",
-	"analysis/ipcg-func.png",
-	"analysis/ipcg-pkg.png",
-	"analysis/typeinfo-pkg.png",
-	"analysis/typeinfo-src.png",
-	"callgraph.html",
-	"codewalk.html",
-	"codewalkdir.html",
-	"dirlist.html",
-	"error.html",
-	"example.html",
-	"godoc.html",
-	"godocs.js",
-	"images/minus.gif",
-	"images/plus.gif",
-	"images/treeview-black-line.gif",
-	"images/treeview-black.gif",
-	"images/treeview-default-line.gif",
-	"images/treeview-default.gif",
-	"images/treeview-gray-line.gif",
-	"images/treeview-gray.gif",
-	"implements.html",
-	"jquery.js",
-	"jquery.treeview.css",
-	"jquery.treeview.edit.js",
-	"jquery.treeview.js",
-	"methodset.html",
-	"opensearch.xml",
-	"package.html",
-	"package.txt",
-	"play.js",
-	"playground.js",
-	"search.html",
-	"search.txt",
-	"searchcode.html",
-	"searchdoc.html",
-	"searchtxt.html",
-	"style.css",
-}
-
-func main() {
-	if err := makestatic(); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func makestatic() error {
-	f, err := os.Create("static.go")
-	if err != nil {
-		return err
-	}
-	defer f.Close()
-	buf := new(bytes.Buffer)
-	fmt.Fprintf(buf, "%v\n\n%v\n\npackage static\n\n", license, warning)
-	fmt.Fprintf(buf, "var Files = map[string]string{\n")
-	for _, fn := range files {
-		b, err := ioutil.ReadFile(fn)
-		if err != nil {
-			return err
-		}
-		fmt.Fprintf(buf, "\t%q: ", fn)
-		if utf8.Valid(b) {
-			fmt.Fprintf(buf, "`%s`", sanitize(b))
-		} else {
-			fmt.Fprintf(buf, "%q", b)
-		}
-		fmt.Fprintln(buf, ",\n")
-	}
-	fmt.Fprintln(buf, "}")
-	fmtbuf, err := format.Source(buf.Bytes())
-	if err != nil {
-		return err
-	}
-	return ioutil.WriteFile("static.go", fmtbuf, 0666)
-}
-
-// sanitize prepares a valid UTF-8 string as a raw string constant.
-func sanitize(b []byte) []byte {
-	// Replace ` with `+"`"+`
-	b = bytes.Replace(b, []byte("`"), []byte("`+\"`\"+`"), -1)
-
-	// Replace BOM with `+"\xEF\xBB\xBF"+`
-	// (A BOM is valid UTF-8 but not permitted in Go source files.
-	// I wouldn't bother handling this, but for some insane reason
-	// jquery.js has a BOM somewhere in the middle.)
-	return bytes.Replace(b, []byte("\xEF\xBB\xBF"), []byte("`+\"\\xEF\\xBB\\xBF\"+`"), -1)
-}
-
-const warning = `// Code generated by "makestatic"; DO NOT EDIT.`
-
-var license = fmt.Sprintf(`// Copyright %d The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.`, time.Now().UTC().Year())
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/methodset.html b/installer/vendor/golang.org/x/tools/godoc/static/methodset.html
deleted file mode 100644
index 1b339e3c3d..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/methodset.html
+++ /dev/null
@@ -1,9 +0,0 @@
-<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Method set</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Method set</span></p>
-		<div style="margin-left: 1in" id='methodset-{{.Index}}'>...</div>
-	</div>
-</div>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/opensearch.xml b/installer/vendor/golang.org/x/tools/godoc/static/opensearch.xml
deleted file mode 100644
index 1b652db376..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/opensearch.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>godoc</ShortName>
-  <Description>The Go Programming Language</Description>
-  <Tags>go golang</Tags>
-  <Contact />
-  <Url type="text/html" template="{{.BaseURL}}/search?q={searchTerms}" />
-  <Image height="15" width="16" type="image/x-icon">/favicon.ico</Image>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <InputEncoding>UTF-8</InputEncoding>
-</OpenSearchDescription>
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/package.html b/installer/vendor/golang.org/x/tools/godoc/static/package.html
deleted file mode 100644
index 6dc88e6942..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/package.html
+++ /dev/null
@@ -1,337 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-<!--
-	Note: Static (i.e., not template-generated) href and id
-	attributes start with "pkg-" to make it impossible for
-	them to conflict with generated attributes (some of which
-	correspond to Go identifiers).
--->
-{{with .PDoc}}
-	<script type='text/javascript'>
-	document.ANALYSIS_DATA = {{$.AnalysisData}};
-	document.CALLGRAPH = {{$.CallGraph}};
-	</script>
-
-	{{if $.IsMain}}
-		{{/* command documentation */}}
-		{{comment_html .Doc}}
-	{{else}}
-		{{/* package documentation */}}
-		<div id="short-nav">
-			<dl>
-			<dd><code>import "{{html .ImportPath}}"</code></dd>
-			</dl>
-			<dl>
-			<dd><a href="#pkg-overview" class="overviewLink">Overview</a></dd>
-			<dd><a href="#pkg-index" class="indexLink">Index</a></dd>
-			{{if $.Examples}}
-				<dd><a href="#pkg-examples" class="examplesLink">Examples</a></dd>
-			{{end}}
-			{{if $.Dirs}}
-				<dd><a href="#pkg-subdirectories">Subdirectories</a></dd>
-			{{end}}
-			</dl>
-		</div>
-		<!-- The package's Name is printed as title by the top-level template -->
-		<div id="pkg-overview" class="toggleVisible">
-			<div class="collapsed">
-				<h2 class="toggleButton" title="Click to show Overview section">Overview ▹</h2>
-			</div>
-			<div class="expanded">
-				<h2 class="toggleButton" title="Click to hide Overview section">Overview ▾</h2>
-				{{comment_html .Doc}}
-			</div>
-		</div>
-		{{example_html $ ""}}
-
-		<div id="pkg-index" class="toggleVisible">
-		<div class="collapsed">
-			<h2 class="toggleButton" title="Click to show Index section">Index ▹</h2>
-		</div>
-		<div class="expanded">
-			<h2 class="toggleButton" title="Click to hide Index section">Index ▾</h2>
-
-		<!-- Table of contents for API; must be named manual-nav to turn off auto nav. -->
-			<div id="manual-nav">
-			<dl>
-			{{if .Consts}}
-				<dd><a href="#pkg-constants">Constants</a></dd>
-			{{end}}
-			{{if .Vars}}
-				<dd><a href="#pkg-variables">Variables</a></dd>
-			{{end}}
-			{{range .Funcs}}
-				{{$name_html := html .Name}}
-				<dd><a href="#{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-			{{end}}
-			{{range .Types}}
-				{{$tname_html := html .Name}}
-				<dd><a href="#{{$tname_html}}">type {{$tname_html}}</a></dd>
-				{{range .Funcs}}
-					{{$name_html := html .Name}}
-					<dd>&nbsp; &nbsp; <a href="#{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-				{{end}}
-				{{range .Methods}}
-					{{$name_html := html .Name}}
-					<dd>&nbsp; &nbsp; <a href="#{{$tname_html}}.{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-				{{end}}
-			{{end}}
-			{{if $.Notes}}
-				{{range $marker, $item := $.Notes}}
-				<dd><a href="#pkg-note-{{$marker}}">{{noteTitle $marker | html}}s</a></dd>
-				{{end}}
-			{{end}}
-			</dl>
-			</div><!-- #manual-nav -->
-
-		{{if $.Examples}}
-		<div id="pkg-examples">
-			<h3>Examples</h3>
-			<dl>
-			{{range $.Examples}}
-			<dd><a class="exampleLink" href="#example_{{.Name}}">{{example_name .Name}}</a></dd>
-			{{end}}
-			</dl>
-		</div>
-		{{end}}
-
-		{{with .Filenames}}
-			<h3>Package files</h3>
-			<p>
-			<span style="font-size:90%">
-			{{range .}}
-				<a href="{{.|srcLink|html}}">{{.|filename|html}}</a>
-			{{end}}
-			</span>
-			</p>
-		{{end}}
-		</div><!-- .expanded -->
-		</div><!-- #pkg-index -->
-
-		<div id="pkg-callgraph" class="toggle" style="display: none">
-		<div class="collapsed">
-			<h2 class="toggleButton" title="Click to show Internal Call Graph section">Internal call graph ▹</h2>
-		</div> <!-- .expanded -->
-		<div class="expanded">
-			<h2 class="toggleButton" title="Click to hide Internal Call Graph section">Internal call graph ▾</h2>
-			<p>
-			  In the call graph viewer below, each node
-			  is a function belonging to this package
-			  and its children are the functions it
-			  calls&mdash;perhaps dynamically.
-			</p>
-			<p>
-			  The root nodes are the entry points of the
-			  package: functions that may be called from
-			  outside the package.
-			  There may be non-exported or anonymous
-			  functions among them if they are called
-			  dynamically from another package.
-			</p>
-			<p>
-			  Click a node to visit that function's source code.
-			  From there you can visit its callers by
-			  clicking its declaring <code>func</code>
-			  token.
-			</p>
-			<p>
-			  Functions may be omitted if they were
-			  determined to be unreachable in the
-			  particular programs or tests that were
-			  analyzed.
-			</p>
-			<!-- Zero means show all package entry points. -->
-			<ul style="margin-left: 0.5in" id="callgraph-0" class="treeview"></ul>
-		</div>
-		</div> <!-- #pkg-callgraph -->
-
-		{{with .Consts}}
-			<h2 id="pkg-constants">Constants</h2>
-			{{range .}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-		{{end}}
-		{{with .Vars}}
-			<h2 id="pkg-variables">Variables</h2>
-			{{range .}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-		{{end}}
-		{{range .Funcs}}
-			{{/* Name is a string - no need for FSet */}}
-			{{$name_html := html .Name}}
-			<h2 id="{{$name_html}}">func <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-				<a class="permalink" href="#{{$name_html}}">&#xb6;</a>
-			</h2>
-			<pre>{{node_html $ .Decl true}}</pre>
-			{{comment_html .Doc}}
-			{{example_html $ .Name}}
-			{{callgraph_html $ "" .Name}}
-
-		{{end}}
-		{{range .Types}}
-			{{$tname := .Name}}
-			{{$tname_html := html .Name}}
-			<h2 id="{{$tname_html}}">type <a href="{{posLink_url $ .Decl}}">{{$tname_html}}</a>
-				<a class="permalink" href="#{{$tname_html}}">&#xb6;</a>
-			</h2>
-			{{comment_html .Doc}}
-			<pre>{{node_html $ .Decl true}}</pre>
-
-			{{range .Consts}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-
-			{{range .Vars}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-
-			{{example_html $ $tname}}
-			{{implements_html $ $tname}}
-			{{methodset_html $ $tname}}
-
-			{{range .Funcs}}
-				{{$name_html := html .Name}}
-				<h3 id="{{$name_html}}">func <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-					<a class="permalink" href="#{{$name_html}}">&#xb6;</a>
-				</h3>
-				<pre>{{node_html $ .Decl true}}</pre>
-				{{comment_html .Doc}}
-				{{example_html $ .Name}}
-				{{callgraph_html $ "" .Name}}
-			{{end}}
-
-			{{range .Methods}}
-				{{$name_html := html .Name}}
-				<h3 id="{{$tname_html}}.{{$name_html}}">func ({{html .Recv}}) <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-					<a class="permalink" href="#{{$tname_html}}.{{$name_html}}">&#xb6;</a>
-				</h3>
-				<pre>{{node_html $ .Decl true}}</pre>
-				{{comment_html .Doc}}
-				{{$name := printf "%s_%s" $tname .Name}}
-				{{example_html $ $name}}
-				{{callgraph_html $ .Recv .Name}}
-			{{end}}
-		{{end}}
-	{{end}}
-
-	{{with $.Notes}}
-		{{range $marker, $content := .}}
-			<h2 id="pkg-note-{{$marker}}">{{noteTitle $marker | html}}s</h2>
-			<ul style="list-style: none; padding: 0;">
-			{{range .}}
-			<li><a href="{{posLink_url $ .}}" style="float: left;">&#x261e;</a> {{comment_html .Body}}</li>
-			{{end}}
-			</ul>
-		{{end}}
-	{{end}}
-{{end}}
-
-{{with .PAst}}
-	{{range $filename, $ast := .}}
-		<a href="{{$filename|srcLink|html}}">{{$filename|filename|html}}</a>:<pre>{{node_html $ $ast false}}</pre>
-	{{end}}
-{{end}}
-
-{{with .Dirs}}
-	{{/* DirList entries are numbers and strings - no need for FSet */}}
-	{{if $.PDoc}}
-		<h2 id="pkg-subdirectories">Subdirectories</h2>
-	{{end}}
-	{{if eq $.Dirname "/src"}}
-		<div id="manual-nav">
-			<dl>
-				<dt><a href="#stdlib">Standard library</a></dt>
-				<dt><a href="#other">Other packages</a></dt>
-				<dd><a href="#subrepo">Sub-repositories</a></dd>
-				<dd><a href="#community">Community</a></dd>
-			</dl>
-		</div>
-		<h2 id="stdlib">Standard library</h2>
-		<img alt="" class="gopher" src="/doc/gopher/pkg.png"/>
-	{{end}}
-
-
-	<div class="pkg-dir">
-		<table>
-			<tr>
-				<th class="pkg-name">Name</th>
-				<th class="pkg-synopsis">Synopsis</th>
-			</tr>
-
-			{{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}}
-			<tr>
-				<td colspan="2"><a href="..">..</a></td>
-			</tr>
-			{{end}}
-
-			{{range .List}}
-				{{if $.DirFlat}}
-					{{if .HasPkg}}
-						<tr>
-							<td class="pkg-name">
-								<a href="{{html .Path}}/{{modeQueryString $.Mode | html}}">{{html .Path}}</a>
-							</td>
-							<td class="pkg-synopsis">
-								{{html .Synopsis}}
-							</td>
-						</tr>
-					{{end}}
-				{{else}}
-					<tr>
-						<td class="pkg-name" style="padding-left: {{multiply .Depth 20}}px;">
-							<a href="{{html .Path}}/{{modeQueryString $.Mode | html}}">{{html .Name}}</a>
-						</td>
-						<td class="pkg-synopsis">
-							{{html .Synopsis}}
-						</td>
-					</tr>
-				{{end}}
-			{{end}}
-		</table>
-	</div>
-
-
-	{{if eq $.Dirname "/src"}}
-	<h2 id="other">Other packages</h2>
-
-	<h3 id="subrepo">Sub-repositories</h3>
-	<p>
-	These packages are part of the Go Project but outside the main Go tree.
-	They are developed under looser <a href="/doc/go1compat">compatibility requirements</a> than the Go core.
-	Install them with "<a href="/cmd/go/#hdr-Download_and_install_packages_and_dependencies">go get</a>".
-	</p>
-	<ul>
-		<li><a href="//godoc.org/golang.org/x/benchmarks">benchmarks</a> — benchmarks to measure Go as it is developed.</li>
-		<li><a href="//godoc.org/golang.org/x/blog">blog</a> — <a href="//blog.golang.org">blog.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/build">build</a> — <a href="//build.golang.org">build.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/crypto">crypto</a> — additional cryptography packages.</li>
-		<li><a href="//godoc.org/golang.org/x/debug">debug</a> — an experimental debugger for Go.</li>
-		<li><a href="//godoc.org/golang.org/x/image">image</a> — additional imaging packages.</li>
-		<li><a href="//godoc.org/golang.org/x/mobile">mobile</a> — experimental support for Go on mobile platforms.</li>
-		<li><a href="//godoc.org/golang.org/x/net">net</a> — additional networking packages.</li>
-		<li><a href="//godoc.org/golang.org/x/sys">sys</a> — packages for making system calls.</li>
-		<li><a href="//godoc.org/golang.org/x/text">text</a> — packages for working with text.</li>
-		<li><a href="//godoc.org/golang.org/x/tools">tools</a> — godoc, goimports, gorename, and other tools.</li>
-		<li><a href="//godoc.org/golang.org/x/tour">tour</a> — <a href="//tour.golang.org">tour.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/exp">exp</a> — experimental and deprecated packages (handle with care; may change without warning).</li>
-	</ul>
-
-	<h3 id="community">Community</h3>
-	<p>
-	These services can help you find Open Source packages provided by the community.
-	</p>
-	<ul>
-		<li><a href="//godoc.org">GoDoc</a> - a package index and search engine.</li>
-		<li><a href="http://go-search.org">Go Search</a> - a code search engine.</li>
-		<li><a href="/wiki/Projects">Projects at the Go Wiki</a> - a curated list of Go projects.</li>
-	</ul>
-	{{end}}
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/package.txt b/installer/vendor/golang.org/x/tools/godoc/static/package.txt
deleted file mode 100644
index e53fa6ed38..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/package.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-{{$info := .}}{{$filtered := .IsFiltered}}{{/*
-
----------------------------------------
-
-*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}
-
-{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}:
-{{node $ $ast}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if and $filtered (not (or .PDoc .PAst))}}No match found.
-{{end}}{{with .PDoc}}{{if $.IsMain}}COMMAND DOCUMENTATION
-
-{{comment_text .Doc "    " "\t"}}
-{{else}}{{if not $filtered}}PACKAGE DOCUMENTATION
-
-package {{.Name}}
-    import "{{.ImportPath}}"
-
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ "" "    "}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Consts}}{{if not $filtered}}CONSTANTS
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Vars}}{{if not $filtered}}VARIABLES
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Funcs}}{{if not $filtered}}FUNCTIONS
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ .Name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Types}}{{if not $filtered}}TYPES
-
-{{end}}{{range .}}{{$tname := .Name}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{/*
-
----------------------------------------
-
-*/}}{{if .Consts}}{{range .Consts}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Vars}}{{range .Vars}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{range $name := .Names}}{{example_text $ $name "    "}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Funcs}}{{range .Funcs}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ .Name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Methods}}{{range .Methods}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{$name := printf "%s_%s" $tname .Name}}{{example_text $ $name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if and $filtered (not (or .Consts (or .Vars (or .Funcs .Types))))}}No match found.
-{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with $.Notes}}
-{{range $marker, $content := .}}
-{{$marker}}S
-
-{{range $content}}{{comment_text .Body "   " "\t"}}
-{{end}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if not $filtered}}{{with .Dirs}}SUBDIRECTORIES
-{{if $.DirFlat}}{{range .List}}{{if .HasPkg}}
-	{{.Path}}{{end}}{{end}}
-{{else}}{{range .List}}
-	{{repeat `. ` .Depth}}{{.Name}}{{end}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{/*
-Make sure there is no newline at the end of this file.
-perl -i -pe 'chomp if eof' package.txt
-*/}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/play.js b/installer/vendor/golang.org/x/tools/godoc/static/play.js
deleted file mode 100644
index 6adbd6cdf7..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/play.js
+++ /dev/null
@@ -1,114 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-function initPlayground(transport) {
-	'use strict';
-
-	function text(node) {
-		var s = '';
-		for (var i = 0; i < node.childNodes.length; i++) {
-			var n = node.childNodes[i];
-			if (n.nodeType === 1) {
-				if (n.tagName === 'BUTTON') continue
-				if (n.tagName === 'SPAN' && n.className === 'number') continue;
-				if (n.tagName === 'DIV' || n.tagName == 'BR') {
-					s += "\n";
-				}
-				s += text(n);
-				continue;
-			}
-			if (n.nodeType === 3) {
-				s += n.nodeValue;
-			}
-		}
-		return s.replace('\xA0', ' '); // replace non-breaking spaces
-	}
-
-	// When presenter notes are enabled, the index passed
-	// here will identify the playground to be synced
-	function init(code, index) {
-		var output = document.createElement('div');
-		var outpre = document.createElement('pre');
-		var running;
-
-		if ($ && $(output).resizable) {
-			$(output).resizable({
-				handles: 	'n,w,nw',
-				minHeight:	27,
-				minWidth:	135,
-				maxHeight:	608,
-				maxWidth:	990
-			});
-		}
-
-		function onKill() {
-			if (running) running.Kill();
-			if (window.notesEnabled) updatePlayStorage('onKill', index);
-		}
-
-		function onRun(e) {
-			var sk = e.shiftKey || localStorage.getItem('play-shiftKey') === 'true';
-			if (running) running.Kill();
-			output.style.display = 'block';
-			outpre.innerHTML = '';
-			run1.style.display = 'none';
-			var options = {Race: sk};
-			running = transport.Run(text(code), PlaygroundOutput(outpre), options);
-			if (window.notesEnabled) updatePlayStorage('onRun', index, e);
-		}
-
-		function onClose() {
-			if (running) running.Kill();
-			output.style.display = 'none';
-			run1.style.display = 'inline-block';
-			if (window.notesEnabled) updatePlayStorage('onClose', index);
-		}
-
-		if (window.notesEnabled) {
-			playgroundHandlers.onRun.push(onRun);
-			playgroundHandlers.onClose.push(onClose);
-			playgroundHandlers.onKill.push(onKill);
-		}
-
-		var run1 = document.createElement('button');
-		run1.innerHTML = 'Run';
-		run1.className = 'run';
-		run1.addEventListener("click", onRun, false);
-		var run2 = document.createElement('button');
-		run2.className = 'run';
-		run2.innerHTML = 'Run';
-		run2.addEventListener("click", onRun, false);
-		var kill = document.createElement('button');
-		kill.className = 'kill';
-		kill.innerHTML = 'Kill';
-		kill.addEventListener("click", onKill, false);
-		var close = document.createElement('button');
-		close.className = 'close';
-		close.innerHTML = 'Close';
-		close.addEventListener("click", onClose, false);
-
-		var button = document.createElement('div');
-		button.classList.add('buttons');
-		button.appendChild(run1);
-		// Hack to simulate insertAfter
-		code.parentNode.insertBefore(button, code.nextSibling);
-
-		var buttons = document.createElement('div');
-		buttons.classList.add('buttons');
-		buttons.appendChild(run2);
-		buttons.appendChild(kill);
-		buttons.appendChild(close);
-
-		output.classList.add('output');
-		output.appendChild(buttons);
-		output.appendChild(outpre);
-		output.style.display = 'none';
-		code.parentNode.insertBefore(output, button.nextSibling);
-	}
-
-	var play = document.querySelectorAll('div.playground');
-	for (var i = 0; i < play.length; i++) {
-		init(play[i], i);
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/playground.js b/installer/vendor/golang.org/x/tools/godoc/static/playground.js
deleted file mode 100644
index bea9c4b6f5..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/playground.js
+++ /dev/null
@@ -1,467 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-In the absence of any formal way to specify interfaces in JavaScript,
-here's a skeleton implementation of a playground transport.
-
-        function Transport() {
-                // Set up any transport state (eg, make a websocket connection).
-                return {
-                        Run: function(body, output, options) {
-                                // Compile and run the program 'body' with 'options'.
-				// Call the 'output' callback to display program output.
-                                return {
-                                        Kill: function() {
-                                                // Kill the running program.
-                                        }
-                                };
-                        }
-                };
-        }
-
-	// The output callback is called multiple times, and each time it is
-	// passed an object of this form.
-        var write = {
-                Kind: 'string', // 'start', 'stdout', 'stderr', 'end'
-                Body: 'string'  // content of write or end status message
-        }
-
-	// The first call must be of Kind 'start' with no body.
-	// Subsequent calls may be of Kind 'stdout' or 'stderr'
-	// and must have a non-null Body string.
-	// The final call should be of Kind 'end' with an optional
-	// Body string, signifying a failure ("killed", for example).
-
-	// The output callback must be of this form.
-	// See PlaygroundOutput (below) for an implementation.
-        function outputCallback(write) {
-        }
-*/
-
-function HTTPTransport() {
-	'use strict';
-
-	// TODO(adg): support stderr
-
-	function playback(output, events) {
-		var timeout;
-		output({Kind: 'start'});
-		function next() {
-			if (!events || events.length === 0) {
-				output({Kind: 'end'});
-				return;
-			}
-			var e = events.shift();
-			if (e.Delay === 0) {
-				output({Kind: 'stdout', Body: e.Message});
-				next();
-				return;
-			}
-			timeout = setTimeout(function() {
-				output({Kind: 'stdout', Body: e.Message});
-				next();
-			}, e.Delay / 1000000);
-		}
-		next();
-		return {
-			Stop: function() {
-				clearTimeout(timeout);
-			}
-		}
-	}
-
-	function error(output, msg) {
-		output({Kind: 'start'});
-		output({Kind: 'stderr', Body: msg});
-		output({Kind: 'end'});
-	}
-
-	var seq = 0;
-	return {
-		Run: function(body, output, options) {
-			seq++;
-			var cur = seq;
-			var playing;
-			$.ajax('/compile', {
-				type: 'POST',
-				data: {'version': 2, 'body': body},
-				dataType: 'json',
-				success: function(data) {
-					if (seq != cur) return;
-					if (!data) return;
-					if (playing != null) playing.Stop();
-					if (data.Errors) {
-						error(output, data.Errors);
-						return;
-					}
-					playing = playback(output, data.Events);
-				},
-				error: function() {
-					error(output, 'Error communicating with remote server.');
-				}
-			});
-			return {
-				Kill: function() {
-					if (playing != null) playing.Stop();
-					output({Kind: 'end', Body: 'killed'});
-				}
-			};
-		}
-	};
-}
-
-function SocketTransport() {
-	'use strict';
-
-	var id = 0;
-	var outputs = {};
-	var started = {};
-	var websocket = new WebSocket('ws://' + window.location.host + '/socket');
-
-	websocket.onclose = function() {
-		console.log('websocket connection closed');
-	}
-
-	websocket.onmessage = function(e) {
-		var m = JSON.parse(e.data);
-		var output = outputs[m.Id];
-		if (output === null)
-			return;
-		if (!started[m.Id]) {
-			output({Kind: 'start'});
-			started[m.Id] = true;
-		}
-		output({Kind: m.Kind, Body: m.Body});
-	}
-
-	function send(m) {
-		websocket.send(JSON.stringify(m));
-	}
-
-	return {
-		Run: function(body, output, options) {
-			var thisID = id+'';
-			id++;
-			outputs[thisID] = output;
-			send({Id: thisID, Kind: 'run', Body: body, Options: options});
-			return {
-				Kill: function() {
-					send({Id: thisID, Kind: 'kill'});
-				}
-			};
-		}
-	};
-}
-
-function PlaygroundOutput(el) {
-	'use strict';
-
-	return function(write) {
-		if (write.Kind == 'start') {
-			el.innerHTML = '';
-			return;
-		}
-
-		var cl = 'system';
-		if (write.Kind == 'stdout' || write.Kind == 'stderr')
-			cl = write.Kind;
-
-		var m = write.Body;
-		if (write.Kind == 'end') {
-			m = '\nProgram exited' + (m?(': '+m):'.');
-		}
-
-		if (m.indexOf('IMAGE:') === 0) {
-			// TODO(adg): buffer all writes before creating image
-			var url = 'data:image/png;base64,' + m.substr(6);
-			var img = document.createElement('img');
-			img.src = url;
-			el.appendChild(img);
-			return;
-		}
-
-		// ^L clears the screen.
-		var s = m.split('\x0c');
-		if (s.length > 1) {
-			el.innerHTML = '';
-			m = s.pop();
-		}
-
-		m = m.replace(/&/g, '&amp;');
-		m = m.replace(/</g, '&lt;');
-		m = m.replace(/>/g, '&gt;');
-
-		var needScroll = (el.scrollTop + el.offsetHeight) == el.scrollHeight;
-
-		var span = document.createElement('span');
-		span.className = cl;
-		span.innerHTML = m;
-		el.appendChild(span);
-
-		if (needScroll)
-			el.scrollTop = el.scrollHeight - el.offsetHeight;
-	}
-}
-
-(function() {
-  function lineHighlight(error) {
-    var regex = /prog.go:([0-9]+)/g;
-    var r = regex.exec(error);
-    while (r) {
-      $(".lines div").eq(r[1]-1).addClass("lineerror");
-      r = regex.exec(error);
-    }
-  }
-  function highlightOutput(wrappedOutput) {
-    return function(write) {
-      if (write.Body) lineHighlight(write.Body);
-      wrappedOutput(write);
-    }
-  }
-  function lineClear() {
-    $(".lineerror").removeClass("lineerror");
-  }
-
-  // opts is an object with these keys
-  //  codeEl - code editor element
-  //  outputEl - program output element
-  //  runEl - run button element
-  //  fmtEl - fmt button element (optional)
-  //  fmtImportEl - fmt "imports" checkbox element (optional)
-  //  shareEl - share button element (optional)
-  //  shareURLEl - share URL text input element (optional)
-  //  shareRedirect - base URL to redirect to on share (optional)
-  //  toysEl - toys select element (optional)
-  //  enableHistory - enable using HTML5 history API (optional)
-  //  transport - playground transport to use (default is HTTPTransport)
-  //  enableShortcuts - whether to enable shortcuts (Ctrl+S/Cmd+S to save) (default is false)
-  function playground(opts) {
-    var code = $(opts.codeEl);
-    var transport = opts['transport'] || new HTTPTransport();
-    var running;
-
-    // autoindent helpers.
-    function insertTabs(n) {
-      // find the selection start and end
-      var start = code[0].selectionStart;
-      var end   = code[0].selectionEnd;
-      // split the textarea content into two, and insert n tabs
-      var v = code[0].value;
-      var u = v.substr(0, start);
-      for (var i=0; i<n; i++) {
-        u += "\t";
-      }
-      u += v.substr(end);
-      // set revised content
-      code[0].value = u;
-      // reset caret position after inserted tabs
-      code[0].selectionStart = start+n;
-      code[0].selectionEnd = start+n;
-    }
-    function autoindent(el) {
-      var curpos = el.selectionStart;
-      var tabs = 0;
-      while (curpos > 0) {
-        curpos--;
-        if (el.value[curpos] == "\t") {
-          tabs++;
-        } else if (tabs > 0 || el.value[curpos] == "\n") {
-          break;
-        }
-      }
-      setTimeout(function() {
-        insertTabs(tabs);
-      }, 1);
-    }
-
-    // NOTE(cbro): e is a jQuery event, not a DOM event.
-    function handleSaveShortcut(e) {
-      if (e.isDefaultPrevented()) return false;
-      if (!e.metaKey && !e.ctrlKey) return false;
-      if (e.key != "S" && e.key != "s") return false;
-
-      e.preventDefault();
-
-      // Share and save
-      share(function(url) {
-        window.location.href = url + ".go?download=true";
-      });
-
-      return true;
-    }
-
-    function keyHandler(e) {
-      if (opts.enableShortcuts && handleSaveShortcut(e)) return;
-
-      if (e.keyCode == 9 && !e.ctrlKey) { // tab (but not ctrl-tab)
-        insertTabs(1);
-        e.preventDefault();
-        return false;
-      }
-      if (e.keyCode == 13) { // enter
-        if (e.shiftKey) { // +shift
-          run();
-          e.preventDefault();
-          return false;
-        } if (e.ctrlKey) { // +control
-          fmt();
-          e.preventDefault();
-        } else {
-          autoindent(e.target);
-        }
-      }
-      return true;
-    }
-    code.unbind('keydown').bind('keydown', keyHandler);
-    var outdiv = $(opts.outputEl).empty();
-    var output = $('<pre/>').appendTo(outdiv);
-
-    function body() {
-      return $(opts.codeEl).val();
-    }
-    function setBody(text) {
-      $(opts.codeEl).val(text);
-    }
-    function origin(href) {
-      return (""+href).split("/").slice(0, 3).join("/");
-    }
-
-    var pushedEmpty = (window.location.pathname == "/");
-    function inputChanged() {
-      if (pushedEmpty) {
-        return;
-      }
-      pushedEmpty = true;
-      $(opts.shareURLEl).hide();
-      window.history.pushState(null, "", "/");
-    }
-    function popState(e) {
-      if (e === null) {
-        return;
-      }
-      if (e && e.state && e.state.code) {
-        setBody(e.state.code);
-      }
-    }
-    var rewriteHistory = false;
-    if (window.history && window.history.pushState && window.addEventListener && opts.enableHistory) {
-      rewriteHistory = true;
-      code[0].addEventListener('input', inputChanged);
-      window.addEventListener('popstate', popState);
-    }
-
-    function setError(error) {
-      if (running) running.Kill();
-      lineClear();
-      lineHighlight(error);
-      output.empty().addClass("error").text(error);
-    }
-    function loading() {
-      lineClear();
-      if (running) running.Kill();
-      output.removeClass("error").text('Waiting for remote server...');
-    }
-    function run() {
-      loading();
-      running = transport.Run(body(), highlightOutput(PlaygroundOutput(output[0])));
-    }
-
-    function fmt() {
-      loading();
-      var data = {"body": body()};
-      if ($(opts.fmtImportEl).is(":checked")) {
-        data["imports"] = "true";
-      }
-      $.ajax("/fmt", {
-        data: data,
-        type: "POST",
-        dataType: "json",
-        success: function(data) {
-          if (data.Error) {
-            setError(data.Error);
-          } else {
-            setBody(data.Body);
-            setError("");
-          }
-        }
-      });
-    }
-
-    var shareURL; // jQuery element to show the shared URL.
-    var sharing = false; // true if there is a pending request.
-    var shareCallbacks = [];
-    function share(opt_callback) {
-      if (opt_callback) shareCallbacks.push(opt_callback);
-
-      if (sharing) return;
-      sharing = true;
-
-      var sharingData = body();
-      $.ajax("/share", {
-        processData: false,
-        data: sharingData,
-        type: "POST",
-        complete: function(xhr) {
-          sharing = false;
-          if (xhr.status != 200) {
-            alert("Server error; try again.");
-            return;
-          }
-          if (opts.shareRedirect) {
-            window.location = opts.shareRedirect + xhr.responseText;
-          }
-          var path = "/p/" + xhr.responseText;
-          var url = origin(window.location) + path;
-
-          for (var i = 0; i < shareCallbacks.length; i++) {
-            shareCallbacks[i](url);
-          }
-          shareCallbacks = [];
-
-          if (shareURL) {
-            shareURL.show().val(url).focus().select();
-
-            if (rewriteHistory) {
-              var historyData = {"code": sharingData};
-              window.history.pushState(historyData, "", path);
-              pushedEmpty = false;
-            }
-          }
-        }
-      });
-    }
-
-    $(opts.runEl).click(run);
-    $(opts.fmtEl).click(fmt);
-
-    if (opts.shareEl !== null && (opts.shareURLEl !== null || opts.shareRedirect !== null)) {
-      if (opts.shareURLEl) {
-        shareURL = $(opts.shareURLEl).hide();
-      }
-      $(opts.shareEl).click(function() {
-        share();
-      });
-    }
-
-    if (opts.toysEl !== null) {
-      $(opts.toysEl).bind('change', function() {
-        var toy = $(this).val();
-        $.ajax("/doc/play/"+toy, {
-          processData: false,
-          type: "GET",
-          complete: function(xhr) {
-            if (xhr.status != 200) {
-              alert("Server error; try again.");
-              return;
-            }
-            setBody(xhr.responseText);
-          }
-        });
-      });
-    }
-  }
-
-  window.playground = playground;
-})();
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/search.html b/installer/vendor/golang.org/x/tools/godoc/static/search.html
deleted file mode 100644
index e0d13b9b5e..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/search.html
+++ /dev/null
@@ -1,18 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{with .Alert}}
-	<p>
-	<span class="alert" style="font-size:120%">{{html .}}</span>
-	</p>
-{{end}}
-{{with .Alt}}
-	<p>
-	<span class="alert" style="font-size:120%">Did you mean: </span>
-	{{range .Alts}}
-		<a href="search?q={{urlquery .}}" style="font-size:120%">{{html .}}</a>
-	{{end}}
-	</p>
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/search.txt b/installer/vendor/golang.org/x/tools/godoc/static/search.txt
deleted file mode 100644
index 0ae0c080db..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/search.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-QUERY
-	{{.Query}}
-
-{{with .Alert}}{{.}}
-{{end}}{{/* .Alert */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Alt}}DID YOU MEAN
-
-{{range .Alts}}	{{.}}
-{{end}}
-{{end}}{{/* .Alt */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Pak}}PACKAGE {{$.Query}}
-
-{{range .}}	{{pkgLink .Pak.Path}}
-{{end}}
-{{end}}{{/* .Pak */}}{{/*
-
----------------------------------------
-
-*/}}{{range $key, $val := .Idents}}{{if $val}}{{$key.Name}}
-{{range $val}}    {{.Path}}.{{.Name}}
-{{end}}
-{{end}}{{end}}{{/* .Idents */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Hit}}{{with .Decls}}PACKAGE-LEVEL DECLARATIONS
-
-{{range .}}package {{.Pak.Name}}
-{{range $file := .Files}}{{range .Groups}}{{range .}}	{{srcLink $file.File.Path}}:{{infoLine .}}{{end}}
-{{end}}{{end}}{{/* .Files */}}
-{{end}}{{end}}{{/* .Decls */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Others}}LOCAL DECLARATIONS AND USES
-
-{{range .}}package {{.Pak.Name}}
-{{range $file := .Files}}{{range .Groups}}{{range .}}	{{srcLink $file.File.Path}}:{{infoLine .}}
-{{end}}{{end}}{{end}}{{/* .Files */}}
-{{end}}{{end}}{{/* .Others */}}{{end}}{{/* .Hit */}}{{/*
-
----------------------------------------
-
-*/}}{{if .Textual}}{{if .Complete}}{{.Found}} TEXTUAL OCCURRENCES{{else}}MORE THAN {{.Found}} TEXTUAL OCCURRENCES{{end}}
-
-{{range .Textual}}{{len .Lines}}	{{srcLink .Filename}}
-{{end}}{{if not .Complete}}...	...
-{{end}}{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/searchcode.html b/installer/vendor/golang.org/x/tools/godoc/static/searchcode.html
deleted file mode 100644
index a032e642c6..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/searchcode.html
+++ /dev/null
@@ -1,64 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{$query_url := urlquery .Query}}
-{{if not .Idents}}
-	{{with .Pak}}
-		<h2 id="Packages">Package {{html $.Query}}</h2>
-		<p>
-		<table class="layout">
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<tr><td><a href="/{{$pkg_html}}">{{$pkg_html}}</a></td></tr>
-		{{end}}
-		</table>
-		</p>
-	{{end}}
-{{end}}
-{{with .Hit}}
-	{{with .Decls}}
-		<h2 id="Global">Package-level declarations</h2>
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<h3 id="Global_{{$pkg_html}}">package <a href="/{{$pkg_html}}">{{html .Pak.Name}}</a></h3>
-			{{range .Files}}
-				{{$file := .File.Path}}
-				{{range .Groups}}
-					{{range .}}
-						{{$line := infoLine .}}
-						<a href="{{queryLink $file $query_url $line | html}}">{{$file}}:{{$line}}</a>
-						{{infoSnippet_html .}}
-					{{end}}
-				{{end}}
-			{{end}}
-		{{end}}
-	{{end}}
-	{{with .Others}}
-		<h2 id="Local">Local declarations and uses</h2>
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<h3 id="Local_{{$pkg_html}}">package <a href="/{{$pkg_html}}">{{html .Pak.Name}}</a></h3>
-			{{range .Files}}
-				{{$file := .File.Path}}
-				<a href="{{queryLink $file $query_url 0 | html}}">{{$file}}</a>
-				<table class="layout">
-				{{range .Groups}}
-					<tr>
-					<td width="25"></td>
-					<th align="left" valign="top">{{index . 0 | infoKind_html}}</th>
-					<td align="left" width="4"></td>
-					<td>
-					{{range .}}
-						{{$line := infoLine .}}
-						<a href="{{queryLink $file $query_url $line | html}}">{{$line}}</a>
-					{{end}}
-					</td>
-					</tr>
-				{{end}}
-				</table>
-			{{end}}
-		{{end}}
-	{{end}}
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/searchdoc.html b/installer/vendor/golang.org/x/tools/godoc/static/searchdoc.html
deleted file mode 100644
index 679c02cf3a..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/searchdoc.html
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{range $key, $val := .Idents}}
-	{{if $val}}
-		<h2 id="{{$key.Name}}">{{$key.Name}}</h2>
-		{{range $val}}
-			{{$pkg_html := pkgLink .Path | html}}
-			{{if eq "Packages" $key.Name}}
-				<a href="/{{$pkg_html}}">{{html .Path}}</a>
-			{{else}}
-				{{$doc_html := docLink .Path .Name| html}}
-				<a href="/{{$pkg_html}}">{{html .Package}}</a>.<a href="{{$doc_html}}">{{.Name}}</a>
-			{{end}}
-			{{if .Doc}}
-				<p>{{comment_html .Doc}}</p>
-			{{else}}
-				<p><em>No documentation available</em></p>
-			{{end}}
-		{{end}}
-	{{end}}
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/searchtxt.html b/installer/vendor/golang.org/x/tools/godoc/static/searchtxt.html
deleted file mode 100644
index 7e4a978c4d..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/searchtxt.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{$query_url := urlquery .Query}}
-{{with .Textual}}
-	{{if $.Complete}}
-		<h2 id="Textual">{{html $.Found}} textual occurrences</h2>
-	{{else}}
-		<h2 id="Textual">More than {{html $.Found}} textual occurrences</h2>
-		<p>
-		<span class="alert" style="font-size:120%">Not all files or lines containing "{{html $.Query}}" are shown.</span>
-		</p>
-	{{end}}
-	<p>
-	<table class="layout">
-	{{range .}}
-		{{$file := .Filename}}
-		<tr>
-		<td align="left" valign="top">
-		<a href="{{queryLink $file $query_url 0}}">{{$file}}</a>:
-		</td>
-		<td align="left" width="4"></td>
-		<th align="left" valign="top">{{len .Lines}}</th>
-		<td align="left" width="4"></td>
-		<td align="left">
-		{{range .Lines}}
-			<a href="{{queryLink $file $query_url .}}">{{html .}}</a>
-		{{end}}
-		{{if not $.Complete}}
-			...
-		{{end}}
-		</td>
-		</tr>
-	{{end}}
-	{{if not $.Complete}}
-		<tr><td align="left">...</td></tr>
-	{{end}}
-	</table>
-	</p>
-{{end}}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/static.go b/installer/vendor/golang.org/x/tools/godoc/static/static.go
deleted file mode 100644
index b41e911031..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/static.go
+++ /dev/null
@@ -1,3718 +0,0 @@
-// Copyright 2017 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Code generated by "makestatic"; DO NOT EDIT.
-
-package static
-
-var Files = map[string]string{
-	"analysis/call3.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03N\x00\x00\x01\xea\b\x03\x00\x00\x00\x04l\xeeb\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x04\x06\x03\x06\t\x05\x0e\x10\r\x16\x17\x15$\x18\x0f\x1e\x1d\x17!# #$\"$%#&(%)(\"()'-+\x1f*+),-+-/,41&J-\x1202/241S/\x0e564,7M796<:.:<9!?p=?<B@4@B?DECLH9?JVHIGvD\x13JLIMOLVQ@QRPUWT_ZHY[X,`\xae7]\xaduWG8`\xaa\\^[A`\xa5:b\xab;b\xac<c\xad_a^=d\xae@f\xb0bdaRe\x99lfP\x90^8Ci\xb4egdMj\xafhjgFm\xb1Ol\xb2fj\x90Ip\xb4\xa7c\"}iflnkKr\xb7oqnNu\xba\xb3h\"{s[Xv\xb6tvs\u007fr\u007fZx\xb8ry\x81]{\xbb\\}\xb6y{x_}\xbeX\x80\xbf`\x80\xba\x96xpb\x80\xc0}\u007f|\x89\x80eb\x83\xbd\u007f\x81~\x9a{oe\x85\xc0\x82\x83\x81k\x85\xbb\xa7}fh\x88\xc3m\x88\xbdj\x8aľ~G\x87\x89\x86q\x8c\xc1\x8a\x8c\x89\xbe\x82Y\x96\x8cnt\x8e\xc4z\x8f\xc0\x8f\x91\x8ex\x92\xc8~\x93\xc3x\x95\xc4z\x94ʒ\x94\x91\x80\x95\xc5ӊJz\x98ǂ\x96Ǡ\x96w|\x99ȕ\x97\x94\x83\x98ɂ\x9aė\x99\x96\x86\x9a\xcc\xe4\x8dA\x80\x9d̅\x9dǚ\x9c\x98\x83\xa0Ϝ\x9e\x9b\xa8\x9e\u007f\x88\xa0\xcb\xf3\x915\x8a\xa2̙\xa0\xb5\x9f\xa1\x9e\x8e\xa2Nj\xa3Ρ\xa3\xa0\xfa\x95/\xa2\xa4\xa1\x8e\xa6\xd0\xff\x952\x92\xa6˳\xa6\x82\xa5\xa7\xa4\x91\xa9ԧ\xa9\xa6\x94\xac֙\xacҪ\xac\xa8\xb9\xac\x88\x9e\xaeΛ\xafԭ\xaf\xac\x9d\xb1֢\xb1ѯ\xb1\xae\xa1\xb5ڥ\xb5ճ\xb5\xb2µ\x90\xa3\xb7ݵ\xb7\xb4\xac\xb7Ҫ\xb9ٷ\xb9\xb6\xac\xbcܺ\xbc\xb9\xb1\xbd\u05ef\xbe\xdf˾\x98\xbd\xbf\xbc\xb1\xc0\xe0\xba\xc1\xd6\xc0¾\xb7\xc2\xdd\xc2\xc4\xc1\xb9\xc5\xe0\xbd\xc5\xda\xc4\xc6û\xc7\xe2\xd6ǝ\xbc\xc8\xe3\xbb\xca\xde\xc7\xc9ƿ\xca\xe5\xc6\xca\xda\xc0\xcc\xda\xca\xcc\xc8\xc1\xcc\xe7\xbf\xcf\xe2\xc2\xce\xe9\xcd\xcf\xcc\xc4\xd0\xde\xcb\xcf\xdf\xc8\xd0\xe5\xcf\xd1\xce\xdfѥ\xca\xd1\xe7\xcc\xd3\xe9\xd2\xd4\xd1\xcc\xd5\xdd\xd3\xd3\xde\xce\xd6\xeb\xd6\xd8\xd5\xd0\xd8\xed\xe7ج\xd2\xda\xe2\xcb\xdb\xee\xd5\xd9\xe9\xd9\xd9\xe4\xd7\xdb\xeb\xda\xdc\xd9\xd8\xdc\xec\xd2\xde\xec\xd9\xdd\xed\xdc\xdd\xe7\xdd\xdf\xdc\xd4\xe0\xef\xdb\xdf\xef\xf0\xe0\xb3\xdc\xe1\xe4\xdd\xe1\xf1\xe0\xe2\xdf\xd9\xe5\xf4\xe0\xe5\xe8\xe0\xe4\xf4\xe3\xe5\xe2\xde\xe6\xef\xe7\xe5\xe9\xe5\xe7\xe4\xe6\xe7\xf1\xe0\xe9\xf1\xe4\xe9\xeb\xe7\xe9\xe6\xe3\xec\xf4\xeb\xed\xea\xe6\xee\xf7\xec\xed\xf7\xe8\xf0\xf9\xf0\xf0\xfb\xf0\xf3\xef\xf4\xf2\xf6\xee\xf4\xf6\xf0\xf6\xf8\xf4\xf7\xf3\xf2\xf7\xfa\xf5\xfa\xfd\xf8\xfa\xf7\xfd\xfb\xff\xf7\xfd\xff\xf9\xff\xff\xfe\xff\xfc\x9cx\xeb\xab\x00\x00 \x00IDATx^\xed\x9d\x0fp\x14ׁ\xa7C\x9c\xf3\x83\x89-\x94\x95V\xa7\xb0\x04r\xac8\x14\xd37l\tF\\N\xa0\xd1\xe9N\xb27\xd2q\x0e\x845\xc1+\xbc\xb6N\xb0\x11\xb2\x1d\xd8(K!\x8e\x15\n\xa9S \"\x18\bZ\x82\x10QJ\x12\b,\x84A\x90\n\x10\xe1\"\xe0\x80b\xc9v\xe2\x12Nd\x1bk\x89\xd6\xc4j;\x80\x8d\x8d\xf0\xd4Խ\xd7\xdd3\xf3\xba\xa7{zz\xd4j\x8dF\xbf\xaf\xa8\xa1\xe7\xe9\xbd\xd7\u007f\xa6\xbf\xe9\xee7=\xbf\xf9\x8c?fD\x00\x80\x8aϘIc\x8cY\xd7\x00L4\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:%27\xcc*\x00{\x81N\tKwA\x1aYhV\t\xd8\ntJXfάj|ɬ\x12\xb0\x15Gu\xea\xde_[]w\xa8\x9fM\xde8\xb1\xa7z\xd7\x19m\xa9\xd3\xf4\x15\xa7%͋\xf2\x8c\xa81\xb5ެJ\\q\x82\xec7\xab\x02\xec\xc6I\x9dz\xab\xea\xcft\x9f\xd9U;@\xa7\xebk\x8e_h\xafnה:Mfچ\x82\xa4>\xb3Z2\xf5Sw\x99U\x89+\xdaI\xb3Y\x15`7N\xea\xd4U\xd5M\x1f\a\xaa\xe8A\xe9x5ۉ\xbb\xaa\xfbU\xa5N\xd3G։\xe2\x98\x1c\x16\x1d\xa0\x8d\xb4\x99U\x01v\xe3\xa4N\xa2t\x00\xeae\xfa\xd4\xcb'\"\xb5\xed\xaaR\xa7\xe9\"\xe3\xeb\xfc\xcd\x12\xd0i\fpT'\xca@w\x1dۅw\xc9'\"{\xeaU\xa5\x8e2\x98J$\x96J\xcf6d$el\xa0\xff\x9f\x98BȪ\xae\xdc\xe9I\xf3\x06\xf9\xca}I\x84L\xae\xd5\xeb&H\xd7\xc2TWڼ\xb07\x85\x9a\xb4*\xf6_w\xb2<7\x92\xcc\xd7\xe0\xe7ֿ(\xdd5m\xc1\tZZL\\UKg$=$\xd5\xec\xcdMM_\xba4uj\x1d\x9d\xae\x9d3u\xc6R\xedѴ\xf3\x89|\xf7\xe2\xa7\xf2\x874\xc5b\x13tr\x1egu\uab6a\xaa\xaaa\xfbáZ\xb6\xb7\x0e\xd4\xecR\x95:\xcb\xf1\xe6\xed\xa4\xac\xb9Y\xdai\v\\\xab\xeaW\xb9r\xe9\"\xd5\xd5N\x9b\x91<mi.Q\x0f\x8a\xb577\xbb\xcat\xbbQh\x9a\x9aQ\xd1XF*\xb4\xe5\v\xc9<\xf6\xdf`\xcd:\x99\x1a^S~n\xf5\xe4ᦺ\x05\x93\xa9\x03gj\xa7\x90Բ\x8ad6\xca=83}C\x99+\xa9\xfa!\xdaq\xc1\xe4\xe2\xfau\xa9\x19ꡓ_\xce}\xa6\xa5\xe3\xc0b\xe1]U\xe9`o\xd3\xec\x14\xe77\xe9\x84\xc7Y\x9d\xc4\xde\xeeSu\xb5\xf4e\uebe9\xef\x1d\xe8\xdeSU\xa7*u\x9a\xe0\xc9\xde~i\x14L~\x143Hf\xbf\xde%UR$\x9d\x06\xa6ͣ'\xad\x83ua\xe3\x1a\x17\xd6\\\x90\xfe\xef\xbd ӫ\xf9{pn\x03ul\x96\xb3\xa4O\x8a\\)T\xf2\xdcT:\xb5\x9d\xd0\xe3\xd5\x06r\x8aN֓\x1a\x91\x9d\xc3mW\xb5?\xe0e\"\xed\xcbQ\x1f\x9d\x16\xd2\xe3\xa0\xe3\xc7{\xe0\xb4N\"\xdb\xe5\x1a\xe9c_==$\xb5\xd5\xefQ\x97:LP\xa7\x82Y\xd2\u007f3\v\xd8c\x86K\xffӚ\x88:Փ\xe3\x11\xfeJ\xad\"\x01.\xa8\xff\x10\x9a[\xef\x86yӓ\x89\xb4$.\xb6 e.\xfa\xb0\"Ed\xcbɶӢ郌\xf4\x02U\xfb\u05fc\x85\x1b\x0f\xfcjHs\xae\xf7\xd2\xfe\xaa\x998:9\x8f\x93:)C\xe1'\xaa\xe4g}7\xc4\xdaC\xdaRG\t\xea4g\x81\xf4\u07fc\xd9\xec1c\xb6~\xed\x88:\xad#&\x03\xfd\xcd\xf52\xda\xd1\xeb\xe0\xdc\xdaҦ\xad\xd8՜)\xeb\xc4f%\xe9TAz\xd9a\x93\x1d\x9d2\x14\x1f5w:\\;P^$\xe4\xed\r\xbbvjƵ\x93\xf38\xa9Sm\x93\xf4\xdf\xf1j\xfa ]AHc\xe4|\xa9Ä\x8eNӥ\xff\xa6\xcbG'\x83;s\"\xea\xd4hrt2$8\xb7\x99s\x98\x90\v5:\xbd4y\xdeK'f\xcca\x85\xb9\xd3\xdb%ԧ\x8b\xe7\xb6R\x91\xae\xb5\xcc? j\xc0\xc8\xde\x18\xe0\xa8Nҥ\x89tZw\xa6\x8a\xee\x14\xfd\x92I\\\xa9\xd3\x04u\xaa\x97.H\xb6\xcbO3\x16\xe9\xd7\x0e\xe9t\xa1,̝\xfe\xf4L\xf6\x0eQ\xbcT\xfb\x87\xc0\xb5\x93\x11\xc1\xb9Mc^\xdd\xc8\xd0\xe8\xd4N\xd2\bɔ\x86K\xf6\x13\xe9J\xf3\xf15\xaa\xf6;\x85\x0e\xf6\xdf\xcagE\r\xd0i\fpR\xa7\xae\xaa\xc63\xddg\xea\xd8\xfd\x0f]U\xed\xdd\xc7k\xeb\aԥ\xce\"\x8f\xec\xc9\xfb\\\xee\xe4\x15\xf5+&\xe7R\xadۚgd67k\x15\xa0\xc5ͮ\x82\xe6f\xf9rd\x01\x99\x1a6\xe4\xd0\xf4\xc0\xcc\r\xf5\xc5$\xec\x18\xbb@\x1e\xd9Ӈ\x9f[\x19Y\xb4aM\x06I\xadh릳j\x13\xdb\v\\\xcd\xdd\xe2qWc}\xb32\xb6\xbe\x82,\xaa\xdbS@\xd4\xe3\xf5;\x05\xcf\x0f\x8e\x1cyF\x96\x8a\xa7\x9d\x1c\xd2\x16\x81\xd1\xc6I\x9d\xc4\ue9ba\xea]m\x927\xc7\xebjꏇ\x95:\xc9@\x8at%2E\xbe\x1bcݬ\xa4Y\xd2\xe7N\x93\xa5R\xad\x02\xedr1\x91/\xf0\xaa\xa7\xea\xbc\xf3w-JO\x9e\x1d~\x1fRMj\x84\x8bB~n7*f\xb8R\x17\xd5Lwe\x16\xd3\"ש\xa9\xf4\xb1X<\xe4b\x15\\\x99\xec\xe2Iܟ\x99\x9a2Gs'\xdeO\x97\xef\xccw{W\x86\xd9$\xf6NYt\xa27\xca\xfb\x11\x81M8\xaaS°\x8784j\xd6;\xb5\xb8wp\xb0\xaf}a\f\xc3t{f\x86\r[\x80Q\x06:\xc5@M\xca\xc3fUlbO\x8a2\x11\xd3\xed\xec\xbd'\xc6\xe0έ\t\rt\xb2Nw\xeaR\xa7NM\xdb'Kgy\xe2\xa9\xc91\x0e\x1c\x02G\x81N\xf1MA\xd2\xc3ۛ\xb6?\x9c\xe4\xd4\xe1\x10\x8c\b\xe8\x14\xe7\xd4?\x94\xeeJ\x9f\x17˩\x1ep\x1e\xe8\x04\x80m@\xa7D\xe4G!̪\x02;\x81N\x89\bt\x1a#\xa0S\"\x02\x9d\xc6\b蔈@\xa71\x02:%\"\xd0i\x8c\x80N\x89\bt\x1a#\xa0S\"\x02\x9d\xc6\b蔈(*\xfd\xe3\u007f\xff\xbeJ\xa7\xbe9{D0\x9a8\xaa\x93~\xa82\xe5T\x15>\xf6\xb7H\x87\xf7\x88\xf1\x1fe\x9b\xfeA\xf8{\xcdѩb\xb2\xfa\xbb\x87\xc0f\x9c\xd4I?T\x99\xd2W}(r\x86\x1d\b㈧\xc5\xf8\x8f\xb2M\xee\u007f\f;٫\x9f\xb2N\xbf\x05\xb0\x05'u\xd2\x0fU\xa6\xd47vC'\xab\x84e\xadp0\x9b\xfe\xaf\xfb\xeft\xae\x9dV\xb9\xf0\x9d\x8dQ\xc4I\x9d\fB\x95\xc5S5\x03\xd0\xc9V\x98G\xff\xeb\xbf~\xffG?\xfcяn\f\xaa\xbe\x91ۯ\xc9\x15\x03\xb6\xe2\xa8N\xa2n\xa8r\u007fu\x97\x98@:\x19\xc42\x8b\x91\xf3\x95\xdf\xcdso\xf5z;6欼&\x8a\xd7ʽ\xee\xfc\xa7.\xd2\xe2\u007f\x16\xdc\xfb\xd6{s\x9e\xfa\x8djR\xbc\xe6\x11\x04A:٣\xa5\a6\x16y\x9ex\x9d=\xb9\xb6v\xb1\xf7_\xfee\xb1\xa7\x85\xda\xf4ÿ\xf9\x9f\u007f\xf9\x17\u007f\xf1\xd7\u007f9s\xe6\xd2߬^\xec\xf6>\xf5\xba<\xa3UIN}Wk\"\xe2\xacN\xba\xa1\xca\xf5\x8db\"\xe9d\x14\xcbl\x92\xafܑ-l,\x11\x16\xef\xcc\xdbG\xaf\x8b\x84\xf5\x1d-O\t\xe7D\xf1b\x8b[\xc8߹3\xdfs\x91\x9f\x14\xc5s\x9d\x9d\xf3w\xb2f\xacԻso\xf6j:=T\xe4\xdd\xf7\x83\xf9\x9e\x03O\xec\xa3:\xfd\x93\xfb?L\xce̜\x94\x949{\xd2_}}o\xc7Na\x9f<\x9fC\b8\x1aE\x9c\xd5I/T\xf9\f\xf3+\x81t\x12\rc\x99#\xe7+{\u05ca\x1d\xc2\x11\xf1\x99\xf5\xa2x\xbd\x85\x1e\xa2\x86\x960EĬBv\xb8\xca_\xae\x9e\xa4\xc8:\xd1\xd2\x1cz\xdcY\xeb\xa5S-\x025m\x1f{`\x83\xe4\xee\xfb\xd6\xf8\xfdg>\xf4\u07fb\xef?\xd2\x19\r\xb1.\x19\xddd|\xfdL\xd5\xf8\xc2a\x9dİP\xe5\xfe\xea37n\xdcx\xa96\x912w\x8cb\x99e\f\xf2\x95\xbd-\xe29ᚸu\xadȒ]\x9f(\xcc\x16\x96\xb0⬭\xecq\x1f\xfd\v?)r:=C\x1fvfч\xad9\xf4\xe1e\xaa\xa4\xac\xd3_L\x9a4I\\4i\xd2g\xfe7\x9fb֭\xc98\av\xe2\xa4N\xba\xa1\xca\x17\xaa\x02$ΐ\x93Q,\xb3\x82~\xbe\xb2\xb7C<\xe7\x16%\x9d\xcey\xf3\xb7\x1e\xe9,\x91u\x92\xac\xe9dg~ܤ\xc8\xe9\xc4\xfe\x97t\xda7\x97\x8a֡\x1c\x9d\xfeI\xf8?\u007f\xfd\x97T\xa7\xcf\xfd\xa7\xbf:şT\xb6!~o\x14qR'\xfdP\xe5^Ʃ\x9a^\xedOK\x8cc\x8cb\x99#\xc2tʒu*Z~\x9d\x16\x94\xcb:md\x8f\a\xa4\xa3ShR\xd4\xd3\xe95\xe1\x89\xd7.\x16-\x1f\x92t\xfa\xbe\xfb\xef\xbf\xff?\xa8NS\xfe\x9f\xfb\x1c?\x9b2\x97\xf5\x881\x10-\x8e\xea\xa4\x1b\xaa,\x91`\xd7N\xfa\xb1̑\xf3\x959\x9d\xf2\xcb\xe9\xf3\xa1Ge\x9d\xf2\xd8\x05S\xe1J\xf5\xa4\xa8\xa7\xd39!O\x10J\xd8\b\x9e<P\xfeÿe:\x9d\xf2\xaed\x1fQm\x94\\\x14ǒ\x10J\vF\x8a\x93:\xe9\x87*Snt\x9f\xaa\xe9\x8e\xf2\x17\x9f\xe3\x1e\x83Xf\xd1$_\xf9bξ\xeb-\xee\x8b\xd7\xd7R\x1fv\n\xe5\av>*,\xde\xdbIm\x11\xbe\xder\xa0(\xe7e\x91\x9f\x1c\xea\xec\xec\x9c\xfflg\xe75\xf1\xb5N\xf7\xb3\x9dC\xbf|\xd6\xdd\xf9\x9axn~GG\xe7\xeb\xcc\x1d\xf9c\xdc\u007f\x90t\xea\xea\x98_t\xa0c\xa3 \xff&@\x05i7^\x060R\x9c\xd4\xc9 T\x99\x96\xb3K\xa7D9>\x19\xc42\x8b\x91\xf3\x95\x87聥%[\xf0\xb4\b\xc2jqh_Q\x96w\xed\x81\"\xf7Jv\x86\xf7L\xb6w\xedk\xacNh\xf2\x97\x82\xcc\x01\xf1;\xf4\xd1\xfd+\xf61\xd4w\xc4N7+s/\xbf(\xdfd\xf4\xf7\u007f\xf3\xdf$\x9d\x06_.\xf7f/\x97\xef\xf0kN\n\xfbM\x02`#\x8e\xea\x04\xac\x93\xb5SoR\x8f?x\x9e\xfdû\xef^\xfb\xe5\xea\x9ck\xf2-\xb0\u007f\xf7W\xb2N\xa1*\xdb]\x05\xdaϖ\x81\x9d@\xa78'z\x9d\x8e(?\xe89\xb4\xb8C\xd6\xe9G\xffE\xa3S_:n(\x1f]\xa0S\x9c\x13\xbdN\xe7\xd8\x109\xe5\xa2\xf0+\xe5\\0\xec\xe8\x04F\x19\xe8\x14\u05fc.\x8d4h'\xf5\x19z\xc6\xf3lKG˳\x9e\xf5C\xd0i\x8c\x80Nq\x8d4\xd2\xf0\x9avҀ\xa1#Ox\xdd\xde'\x8e\f\x05\xbe\x8d\xfb\xb7\xd0\xc9a\xa0S\"\x02\x9d\xc6\b蔈@\xa71\x02:%0u\xd0\xc9a\xa0S\xc22\xb8a!\xbb\x05v\xc5!\xf8\xe4\x18\xd0)a\x99\xa3|A㳻\xe0\x93S@\xa7De\x80}}\xf0C\xbf\xff\xde}\v\x13\xe5v\xc8\xf8\a:%*\x03\x84dfޗ\x969{\xd2\xc3\xd0\xc9)\xa0S\xa22\xb8\xe7s\x9f\x9dt\u007fJJJf;\xc2V\x9c\x02:%,3\xa6\x97U\x1f\xba\xd0\xd5\xf5\x12\xbe/\xe8\x18\x8e\xea\xa4\x1b\xaa<P#}\xb5\xbd&\x91\xae\x97\x1bS\x83!\xd1}\xc5iI\xf3TA\x18\xdfQ2\xbdFF`\x16\x05\x84\x90\xa4.\x9d\n'\xc8~\x96\xb1\xa7\xc9\xd9\x03\xa3\x8a\x93:\xe9\x87*\xf7U\x1d\xef\xa6$\xd0w\xdb\xe9\xdaM\r\xc6\x05e\xa6m(HR]\xbc\xbc\xde\xe9\x8e|/kT\x04f\xd1\xddܼA7뫝\xa8\xb3(\x80\x038\xa9\x93~\xa8r_U\xa4؟\xf1N\x1fY\x17\x1e\x11frk\xb8U\xdatu\xd2/\x05\xa3\x8a\x93:\xe9\x87*'\xb6N]D\xe7\xb7A\xa0S\xa2\xe2\xa8N\xa2^\xa8r\xc2\xe9ԗD\xc8d\xe9\xab\xfa\x83\xa9r\x9e\x9e\xf6\v\xe5Y\x1b\x9fQґCpQ˺\xa9\xcbb1qU-\x9d\x91\xf4\x10+\v͂\xa1/N\x13tr\x1egu\xd2\vU\xee\xabj\xdcUUۜ@\x83\xb9\xed\xcdͮ2i\xeax\xf3vR\xd6ܬM\x10d\x19*-K<\x17\xf92.jY?u\xf9L\xed\x14\x92ZV\x91,\x85\x8e\x85f!\xea\xea4\xd8\xdb4;EgDo\x92m\x84\xf7\r\x9c\xd6I/T\xb9\xbf\xaa\xf6D\xf7\x99\xba\xed\t\xe4\x93(&\x05\xf6u\xfd\x93\xbd\xa2\xeb\xa2x\xbdh\xb9\xaa\x90\x8bZ\xd6O]\x16])\xd4\xcb\xdcT\xe5YR$\x9d\x16\xd2c\x9b\xde/\xd0Mz\xdb&\xa0\x93.\x0e\xeb$\x86\x85*\x8b\xe2)&\xd2@MB\x9d\x9a\x98\xe8$\xa5#\a\xf2'e\xb8\xa8e\x83\xd4e\xd1\xc5~K\xa6̥<\x8b\xa8\xd3K\xfb\xabf\xea\x1e\x9d\xcc4\x89\x16褋\x93:\xe9\x86*\ahN\xa8$z\x13\x9dT\xe9\xc8\n\\Բ~\xea\xb2(\x9d\xdeE\xa7\x13\xa5Y\xaf\x14:\x8d.N\xea\xa4\x1f\xaa\xdc(\xefoM\t\xf5\xeb\xb8&:\xa9ґ\xa3ƚN\xba\xa5\xd0itqT'\xddP\xe5z\xe9\xb0\xd4W\x13\f\xb1L\x04Lt\xf2^g\xbfƴ2\xfc/\x11qR\xa7Iҿ\b\u007f\x0f\xef\x1b8\xab\x93~\xa8rw\xd5\xfe\xae\x97ګ\x13\xe7\xe04\xd8\xd6\xdc\xec*hn\xee\x0f\x8c\xec\x85\xed\xd6Y\xc2\x13\xbf\xe8X.\x05%GO7\xed\xb4Ml/p5w\xf3\xb3\x90\xee\x8aX\xd7\xdc\x1c\xf6iC\xbb\xdeOe0E\x9e\xfb\x82,ʫ_\xbb\u007f҃\xdf3\xd2\x05:ł\x93:\x19\x84*\xf76\xd6\xd6ԟ\x8a\xd4n|\xd1.\xa7*\x93*q E\x9a\x98rFS\xa3hgy (9z\x8aiO\xaeSS\xe9c17\v\xe9\x9e=Fد\f\xf4NYt\xa2W{\xbf\x1eS\xe4\x8b\xcfɢ|\xf5\x8bϿ\xfa\xfc\x97~f\xa0\vt\x8a\x05Gu\x02N\xb2g&!\xda_ƙ\x14p\x85\xf2\xb9\x9fӇ\x9f\xffgŏ\xef=8\xe9\xfeo\xbd\xfd\xf6\xf3_\xbe\xef\xbe/\xff:\xa8\xd3\xf7>?\xe9\xfe\xaf\xbd\xcdM<\xff\xe5\xcfMz\xf0\xbb\xd0\xc9\x00\xe8\x94\xc0\xf4\x9e\xd0~\x80\x1c\xae\xd3\xfd\x8aM\x9f\xfbޫ\xcfS\xb5\x1e|\xee\xd5_\u007f\xe5+\x01\x9d\xfe\xf5\xc1\u007f\xa5\a\xb0\xafq\x13\x0f~\xf3\u05ef\xfe\xec\xcb\xd0\xc9\x00\xe84\xa1\xe0u\x92O\xf6\x94S\xba/|\xf7\xed \xbf\xbe?\xa0\xd3\x17\u007f\xa6\x18\x17\x9c\xf8\xec\xcf\xe5:\xd0I\x17\xe84\xa1\xe0ubC\x11\xf7\u007fK\xd1iү\xe5\xff\u007fNO\xe6&M\n\xe8t\x9f|C\x117\xf1\xd5\xfb\xbe\xf2\xad\x9fC'#\xa0ӄ\x82\xd7I\xe2\xb9\xcf\xcb\xffߧ\xe8\xf4ů\xfe\xfc\xedW\x83:MR\x8eE\xa1\x89\xb7\u007f\xf6\xb5/\xdf\xf7M\xe8d\x00t\x9aP\x84\xe9\xf4\xe5\xaf)\x1a)'{\x9f}\x95^(\x05u\xfa\xc27\x95j\xc1\t\xc6\xf3\xf7A'\x03\xa0ӄ\x82\xd7\xe9K?{\xf5\xf9\xaf|\xe1UY\x91\xe7\xeeW\x86\"\xbe\xf9\xea\xcf>\x1f\xd4\xe9\xb9\xfb\xbe\xf5\xebW\x9f\xfb\x127\xf1\xa5\xef\xbd\xfa\xea7\x1f\x84N\x06@\xa7\t\x05\x13I\xb9\nz\xfb\xbb\x9f\xff\xcc\xfd_}5p\xc8\xf9\xee祁\xf2\x9f=8\xe9\xfeo\x06uz\xfb\xb9/~v\xd2\x17\x9f\xe3&\xbe\xf7\xc5I\xf7}\xf9y\xe8d\x00t\x9aPp\xa7y#\x03:\xe9\x02\x9d&\x14\xd0it\x81N\x13\n\xe84\xba@\xa7\t\x05t\x1a]\xa0ӄ\x02:\x8d.\xd0iB\xa1\x1f\xa3\x12\vfs\x9a\x988\xaa\x93n\xa82\xe5\xcc\xfe\x9a\xba\xf6\b\xed\x80Bİf\xdb9A\xf6\x9bU\x01j\x9c\xd4I?TY\x1cl\xacj\xbb\xd0^\xa5\x97\xb3\r\xd4D\fk\xb6\x1d\xc42[\xc6I\x9d\xf4C\x95\xc5\xc6\xean\xa6\x9a\xf6;v \x12\xbaa\xcd6\x83\x1cY\xcb8\xa9\x93~\xa8rw\x95\xf4\xad\xdcQ\xde5\x12\r\xdd\f\n\x9b\x81N\x96qT'Q/T\xb9\xad:\x91~\x8af\x141\vk\xbe\xe8\x16\x84\xad\xbfY[8\xff\x89w\xb9RӰf\xcao\xca\x17\xbb\xbdO\xbd.j@,\xb3e\x9c\xd5I/TyO\xfd\x99]U\xb5\x87\x12*\x04vt0\tk\xbe\xdeҒ_\x94\xedݸv.\x9fBa\x1a\xd6,\x8a\x1d\x9e\xaf\xef\xed\xd8)\xecS\x15\x1a\xc52\x83H8\xab\x93^\xa8r\x9d\x14\xaa\\[\x87cT\x14D\x0e\x1c\x13\x1f\x15J\xae\x89C\xea\xf8>Ӱ\xe6\xeb\xf9O\xb0\x9c\xb2\x16u3\xa3Xf\x10\t\x87u\x12\xc3C\x95\xeb\xa5\xf1\x88\xfe\xc4\nU\x1e-\xcct\xca\n\x8bG2\x0fk\xee\x10~\xa5m$\x1a\xc72\x83H8\xa9\x93~\xa8r\x93<\xf6۴Ǩ\x19\ba\xa6\xd3\xd7\xc3\xcbLÚ\xf7\t\xd7\xc3[I-q\xedd\x15'u\xd2\x0fUn\xaf\x91>\x8clęE\x14\x98\xe9T\xaeShF\x87:+=\x04F\xf6,\xe3\xa8N\xba\xa1\xca}\xd2@y\u007f5n\x8b\x88\x82\xd1\xd0\xe9\x9aw\xe5\x10\xfdo\xe3F\xed\x1f\xa0\x93e\x9c\xd4I?TYl\xafn\xef>U\xbb\vC\x11&\x98\x855\xbf\xfb\x8b\u03a2\x95\x9d\x9d\x16\xc3e)\x1d\xf3\x8b\x0etl\x14\x0eh\xcbuc\x99A$\x9c\xd4\xc9 TY\xec\xdaS\xb3\xab\x1d6\x99a\x16\xd6|Q\x90xʠy\x04^.\xf7f/?\x12V\xac\x1b\xcb\f\"\xe1\xa8N`|\xa1\x17\xcb\f\"\x01\x9d@\x04\xc2c\x99A$\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\xc3Q\x9d\xf4B\x95\ak\xabdjM\x1a\x83\xf8\x80\vv\x06Z\x9c\xd4I7Ty\xa0\xaa\xbd\x9b\xd2^u¬9\x183\x9a\xb8\xafJs\xc1\xce@\x8b\x93:\xe9\x87*\x9fbv\r\xd4⋟q\xcc\xecEf5\x80\x84\x93:\xe9\x87*K\xd4\xe3\xbb\xed\xf1L\x06t\x8a\x0eGu\x12\xf5B\x95\x19R\x12\v\x18+\xba\x16\xa6\xba\xd2\xe6I_\x14ܐ\x91\x94\xb1\x81\xfe_L\\UKg$=\xc4\xde\xfa\x94p\xbe\f\x91\x0fv\xe6*\x14\xb3\xa2\v.2S\xea\xacv\xce\xd4\x19K'j@\x9f\xb3:\xe9\x85*3\xa4$K0F4Mͨh,#\x15t\xb2\xc0\xb5\xaa~\x95+\x97\xbe\xc1\xd5N!\xa9e\x15\xc9\vE\xb1\xffP\xf3\x8c\xcc\xe6\xe6f)\x99\"\x18\xec\xccU薊\xda\n\\\xac\xbc`rq\xfd\xbaԌ\t\x1a1\xe1\xacNz\xa1ʔ\vU\xf8\n\xf5\xd810m\xde\x00\xcbk\xa3W\xb3\xfb\xa5\x1fH\x93\x1f])\xf4E\xc9M\x95\xaa\xa8N\xf6\x02\xe1d\\\x05ɰ2\xa6S=\xa9\x11Y\xa4\xd8vqB\xe2\xb0Nbx\xa82\xa5\xb1.r\x130\x9aԓ@\xa4\x94X0K\xfaof\x01}p\xb1\aI\x11#\x9dB\x15B:-\x9a>\xc8H/\x10'$N\xea\xa4\x1f\xaaL\xa9Ad\xe5\x18\xb2\x8e\x04\u007f\xbdd\xce\x02\xe9\xbfy\xb3E^\x11#\x9dB\x15B\x93\x19ʅ\xd6\x04\r@rR'\xfdPe\x96\x03\xab\x8a\xa0\a\xce\xd2\xc8\x1d\x9d\xa6K\xffM\x97\x8eNZ\x9d\xaa_\x92+\x19鴊M\xe6No\x97\x98\xa0CK\x8e\xea\xa4\x1b\xaa\xcc.\x9dF\xf77^AD\xfa\xd33ٛ[\xf1Rv\xdeǮy\xb6K\x81ͼN\x99\x99\xf4\xb2\x97(\xa7\xe4::%\xad\x10\xc5\x1b\xb3\xd9\xe4~\xb9\xd6\xe3k\xc4\t\x89\x93:\x19\x84*S\xb7\xf0[icI\xd3\x0337\xd4\x17\x13vҐ;yE\xfd\x8aɹ\xd2h]A\x9b\xd8^\xe0\x92~\x93\xad\xccU\xb1'sj7\x1f쬪0'u͚9dJ\xcd\x19Q\\A\x16\xd5\xed) \x13\xf4\x961'u2\nU\xbe\x80\xbbVƖ\xaeE\xe9ɳ\xe5\x17aݬ\xa4Y\xf2\xe7N\x84\xb8NM\xa5\x8f\xc5\xf4\xd9@qJR&\x8bD\x0f\x05;\xab*te&%?\xf4\xb8\\w\u007ffjʜ\xfdF\xb3Jp\x1c\xd5\t\x80\xc4\x06:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x1a7,\"\xa9\xb9g\xcc*\x811\x05:\x8d\x1b\xba\x9bjf\xa6NԈ\xa0q\x82\xa3:\xe9\x85*\xb3\xa4\x9c]ջ\x0ea?\x89\x82&\x82\xacܸ\xc6I\x9dtC\x95ž\xda]R)\xbe\x91kN\x1bi3\xab\x02\xc6\x12'u\xd2\x0fUn\xaec_\xad\x1e\xack6i\r\xa0S\xdc\xe3\xa4N\xfa\xa1ʍr8\xd8\x1e$W\x9a\x03\x9d\xe2\x1cGu\x12\xf5B\x95\xfbj\x9b\xfa\x06\xfb\x9aq\xb2\x17\x05'H\x93Y\x150\x968\xab\x93n\xa8\xf2@#-ݏ\xf4\x95(\x18L\x9d}\xa8{\x82\xe6\x15\x8f\v\x9c\xd5I/Ty\xb0\xb1\x8e\xe5\x1b5\xe2'4\xa2`?!d\x81Y%0f8\xac\x93\x18\x1e\xaa\xdc\\7 \x95\xe2\a\x9e\xcc\xe9O\x9d\xbe\xae\t\x19\x9f\xf1\x8b\x93:\xe9\x87*W\xcb\xf9`R6,\x88L\x1b\xc1\x80M\\\xe3\xa4N\xfa\xa1\xca\xd0)z0\xb2\x17\xe78\xaa\x93n\xa8r\x93t\xb27P\x871+s\xa0S\x9c\xe3\xa4N\xfa\xa1\xca\x03\xdb\xebNu\x9f\xaaێ\xa1=s\xa0S\x9c\xe3\xa4N\x06\xa1ʃm\xbbjv\xb5a`ό\xc1\xee\xf6E.\xfc\xae\\\\\xe3\xa8N`$,$d\xda\x1e\xb3J`L\x81N\xe3\x86\xee\xe384\xc5;\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN@\xcd\xe0\xc0\xc0\xc0`\xf0?`\t\xe8\x04T\x1c\x9aL\bI\xea\xefO\xa2\xffMFX\x9bE\xa0\x13\x90\xd83\xa7W\xfa\xbf\x8eԷ\xb5\x9d\x12\xc5Smm\xf5\xa4Τ\xd1X\xd37'\xce\xee\tvT'\xfdPen\x12\x18\xf3\x1dAh1\xab\x13\x99\rd\xf2v\xa3\xbfU\x902y\xa2\x8e\x04o\xb4\xed\x96u*&\x93G[\xab\x98\u05edb\xf2\x1a\xb3*\x8e\xe2\xa4N\xfa\xa1\xca\xfc$0\xe6\xf5N\xf7N\xb3:\x91\xe9k\x9e]f\xf0\xa7u\x93k\x94\xa9p\x9d\xba\x9b]\xfa͚l{\xcd\f\u05ed\xe3\x9cnq\x88\xfa)\xebLj8\x8a\x93:\xe9\x87*s\x93 \"Y#\xd4I\x14\x17\x18\xe8t\xc1\xb5\"0\x19\xae\x93(\x1a\xe84{\x91nqL\x18\xac\xdb\xf2r\xddb\x8eUq\xf5\x8dJ'u\xd2\x0fU\xe6&ADFO\xa7\x82\xf4\xe0\x9b\x99\x05\x9d2F_\xa7GMu\xeaO/0\xab\xe2 \x8e\xea$\xea\x85*s\x93 \"Y\x1b\x9f\xf1\xe6<\xf5\x1bUYw2\x91I\xe6ޤ\a\xd3\\\x8f\xa7\xa77\x15\xa7d\xb2\x84\xd0E\xe9\xaei\v\xe4\x1f\xb2\xa1:\x15Ӻ\x0f\xb0Q\x87\xda9Sg,\x95-\x1aL\x0e\x1e\x9c\xf4u*~8=eA\x17}룍\x1f\x17\xcb\xe8c]\xbd2\xdf\f\xa9\x06\xd7Y8\xef湷z\xbd\x1d\x1bsV^\x13\xc5k\xe5^w\xfeS\x17i\xf1E\xb7 <5\xe4\x15\x84\x9c\xebܺ\x1d\x11\x04a\xab\xb8\x93>\xb6\xb0I\xc6\xd7Y'C?]\xee)\xdax\x9dMv>\x91\xef^\xfcT\xfe\x90\xdc\xfb\xaa\xa48J\x19qV'\xbdPe>_\x19D\"K\xf8zK\xcb\x12\xcfE\xbel\xb0f\x9dL\r\xff!QS2Y\x9aIRפU0\x05\x1en\xaa[0Y\xcal\xa1:u\xe7N^Ǧ\v&\x17\u05efK͐\x12\x9a۹\xe8s]\x9dH\xc6\xf6\xed\x19I\xa7\xc4\xfeCӊ{\xc5\u07b2\xe4\xe6\xfe\xfeC\xcd32\x9b\x9b\x9b\xa51$\xbe3\x1d:\xb2\x85\x8d%\xc2\xe2\x9dy\xfb\x98.\xeb;Z\x9e\x12\xe85\xd1\xd0/v\n\xbf\x10\u007f:\xf7\xa7\xbf\x12\xb9u\xbbޙ\xff\xec\x1f\xc4?\xfc \xbb\xf3ڵ\xce\u03a2\x95\x9d\x9d\x9d/\xb3>\x9e\x116v\xec\xf3>J\x1d\xfa\xe5\xdcgZ:\x0e,\x16ޕ;?\x14Oq4\xce\xea\xa4\x17\xaa\xccM\x82\x88d\x15\xd17\xe7\xebE\xcbU\x85\xbd\x17dzU\xa5\xe9\xb9T\xa3z\xb1\xe0a\x16\xb9\xc6\u07bff-d\xc5T\xa7\n\x97t\x1aPO\xd8\xd8C\x1b\xd9.?\t%\xcb\xea\xea4\x93\x1e\x00\x06f̡\x93e\xechT \x9f_\x05O\xf6T\x9d\xe9\xe1]+v\bG\xc4g\xd6\xd3\xe5o\xa1\x87\xa8\xa1%\xabY\xf1\xd03˯y\xe5\xb3<n\xddv\xb2\xa3\xd13\xcfH\xc5\xc1\x93\xbd#\xc2\x01\xfax\x8e\r\x00\x1e\xf02\x91\xf6\xe5(G\xa7n\x12Go\xc4\x0e\xeb$\x86\x87*\xf3\x93 \x12Y[\xd9\xe3\x01\xe1\x1aWv\x81\x04Pe-\xa7o\xa7{w\xbf\xb8\x82\xed\xf0\xbd\x1b\xe6MO&\xb3X\xf1\x82\xb2UD>\xa9^4}\x90!_x\xec1\xd3\xe9q\xf6\xb8\x81\xf4\xb1\xb2S\xe2@\xb2\x9cE\x1b\xd4Iՙ\x1e\xde\x16j\xc25q\xebZ:}\xed\xc0\x13\x85\xd9\xc2\x12\xa9\xfc\xfa\xa3yO\xc9Vp\xeb\xf6\xfa\xdc_\x89׳;\xa4\xe2\xa0Nk\v\x87ޥx\xa9e\xafy\v7\x1e\xf8Րb\x13]\"C\x8b\x9d\xc7I\x9d\xf4C\x95Փ\xc0\x18\xf9r\xbdSP\r\x1e7\xd7˨o`H\xdf/\xb6\xb9DI\xa7\xb6\xb4i+v5g\xca:\xa5%ϔ\x0eSb\x86\"\xa1\xf4\x8c\x8f\xef3\x1e\x8ah&l\xb4h\xdeRq\u007f\x8a|b\x19\xd4Iՙ\x1e\xde\x0e\xf1\x9c[\x94t:\xe7\xcd\xdfz\xa4\xb3D\xd6Il\x11:\xe5\t~ݞ\xf8\x17\xb1C9\xf6\x04uZ\xa2\\G=%2!ˋ\x84\xbc\xbd\x8aOm$\x8e\xf6\x1c'u\xd2\x0fU\xe6'A$\xb26\xb2G\xf5\xd1\xc9\x00N\xa7\x99s\xd8\xdb\xd8BY\xa7\xd4S\x17\x92+\xd8T\xee\xf4v\t\xe9\x1c\xb1\x9f\x1b\xba\xd3\xd5i){\xac&쬱>uP9דu\xaa~Iә\x1eL\xa7,Y\xa7\xa2\xe5l8\xa1\\\xd6\xe9u\xef\xd6|\xf9\x12\x88_\xb7#9Cʹ\x9e\xacӁ\xd7\xd8\xd1\xe9\x9c\x04\xfd\xfb\xb9\xadT\xa4k-\xf3\x0f\xc8U\xca\\q\xf4\x11\x8b\xa3:\xe9\x86*s\x93 \"Y^\xba'\x0e\x15\xad4\xab'\xaat\x9aƎ\x1972\x94\x93=Q\xdc\xefb\x87\xa2\xfd\xb2*\x8f\xcb7\x15,\x9a\x1e\x1cE\xd0\xd5)\x9d\x1a983\x93M\x0f\xa6֧(\xafU&-\xe8euԝ](;.j\xe0t\xcag\x82\f=*\xe94\xb4\xfc\a\xe2\xb3%\xd2Q\x86_\xb7\xa1\xc5Gr\xe4s=q%-\xf8\x03\xbb`\xea\x90o\x9b\xd8J\x0fb;\x05\xe9\x8f+\x9f\x95jܘ9O;\xb71\xc4I\x9d\xf4C\x95\xb9I\x10\x91,\xe1\x89_t,\xcfy٬\x1e}\x8bJ\xa9\xe8\xdf\xee:џ\x9b\xd9-\x96\x91E\x1b\xd6d\x90Ԋ\xb6\xfe\xe6\xd9\x05m\x83\xfd\xf3қ\xe8\x1b\xd8\n\xb2\xa8nO\x01\xa9\x95\xeawM\xae\b4\xd5\x1fٛ\xd7\xd64'E\xbe\xc0Z1]9ףDž\x8a=\x99SYuUg\v\xc8T\xcd/I^\xcc\xd9w\xbd\xc5}\xf1\xfaڒש\f\xe5\av>*,\xde\xdby\xbd\xf3;\xde\xd7\xc5\xdfdo켮Y\xb7\xad\x859ʰ\xddά}GJ<\xaf\xb1\xb2\xb9k[\x8e<ä\xda)x~p\x84N\xca\xc6U\x90x\xfa\xc0\xd2I\x9d\fB\x95\xb9I\x10\x89\xa2\x9d\xe5\xd9\u07b5\xaf\x99U\xa3\xef\xd8i\x84\xd4&\x93\xa9u\xecr\xe6F\xc5\fWꢚ\xe9\xae\xcc\r\xec&\xf1\xf6Z\xfa\xb8\x8aVڟ\x99\x9a2g\xbf\xd2b\xd5\x03\x81\v\x90:\xd2\x15\xf8\x82FW@\xa7\x99e\x8b\x92\xd3s\x15ͺ\xc8\xc3JՁ┤L\xf9\xaa\x8b\xef\xacz\xaaf\xe8z(O\x10Z\xb2\x05O\x8b \xac\x16\x87\xf6\x15ey\xd7\x1e(r\xaf젗B\x1bō\x820\xb7C\xb3n/\v땦\xd77\xe6\xcc_)_+v\x94,\xceY\xce\x14\xfa\xe9\xf2\x9d\xf9n\xefJ٦椥b\x1c\xe1\xa8N nY\xeaRԑ>\x9eU\xbe\xa0A\xf4>Z\xefw\x99\x9d\x97\xef!#\xbc\x9a\xb9\x96\xd5aVEa\xbb\xab \xae\xbe\x94\x05\x9d\x80DE\xba<\x900x\xa2-\xf0\x05\x8d\xb6\x13z\xbbj]\xaa\xc9\x0e\\\x93\xf2\xb082Z\x16\xbfkVE\xa6/=\xben(\x87N\xc0\neMb\xa6\xd1]\xe9\nݩKGt\x1d\xbc\xb3c\xa8\xe4\af\x95\xe2\x15\xe8\x04\xa2g\x80d\x14\xa7k\xc6\x19l\xe6\xba\xf0\xf5\u007f\xf6F\xf1Q@|\x02\x9d\x80\x05ʦf\x8e\xf6\x17=\u007f\xe0)y٬N\xdc\x02\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\x8e\x131\xb0y\\\xa79C'\xe04Jn\xb3\xfe\x1f\xc7w\x9a3t\x02#!\x90\xc5l\x85@n\xb3>\\\x9as\xdce&\x9b\xe2\xb4N\xa7\xaa\x94\xbb\x94\xbb\xf7\xd4\xec\xef\x0e\x9b\x04\xd1\x10s\x06\xb1\xedHY\xccV\x17\x87\xfbJ\x15G\x87\xf7H`2\xf8E\xabx\xcbL6\xc5a\x9d\xfa\xaa\x0f\xc9\xdf1\xeb\xaen\xeej\xae\xee\xd6L\x82\xa8\x88=\x83\xd8f\xe4,f\xabq\xcf\xfa:\x1d\xf1\x04\x9d\f\xea\x14o\x99ɦ8\xacS}c\xb7\xa4\xd3\r)i\xe5P\xed\r\xd5$\x88\x96\x983\x88m%\x98\xc5l-\x9fV_'q(8\x15\xd2)\xce2\x93MqV\xa7S5\x03\xb2Ng\xaa\xd9M\xfc\x03\xd5gT\x93 Zb\xce \xb6\x95`\x16\xb3-:\x85\xe0t\x8a\xaf\xccdS\x1cթ\xbf\xbaK\x94uj\x94\xbf\b]ߤ\x9a\x04\x11\xf8g\xc1}`c\x91\xe7\x89\xd7ٓ\xd83\x88et\xb3\x98\x19]\vS]i\xf3\xa4\xc2\r\x19I\x19\x1bD\xf6\x834Sօ\x87*\x8b|\x16\xb3^ܳ\n\xd52p:դ\xc9)q\xd7<\x02w\x01\xc6\xe9\x14_\x99ɦ8\xaaS}\xa3\xa8\xe8\xb4K\x8e&8\xb4G5\t\"p\xb1\xc5-xw\xee͖\xf2Sc\xcf \x96\xd1\xcfb\x16Ŧ\xa9\x19\x15\x8de\xa4\x82N\x16\xb8Vկr\xe5\xd2Ӈ\xda)dښ\xb2i\xeaPe\x91\xcfb\u058b{\xe6Q/\x03\xa7\xd3B\xa2\xe4\x10\x9d\xeb\xec\x9c\x1f<\xc4\xf1:\xc5Uf\xb2)\x9fy\x1c\x00`\x13#8:\x01\x00\xd4@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m\x98\xeb4\xb0f\xf6TW\xfa\xc2C\xe1\u007f\xd9@\x1eV\x1eF\xc0\xbd\x8ai\xae\xf4\xc6\xe0Ӂ{\xf4\xa1\x96,\nU\xa8#\v\xc3\x1a\xf1\xac#\xc5\x11\xffn\x82a\xf7\x9a\x053AZn\xb3E5\xc1\x96\xed\t\xc6\x12S\x9dj\\ʏ\x12\xcf\xfbP\xfb'[^\xfe\n\xd6w{\xe0ن$6\x97\xb8\xd0I\xbd`&\xc8\xcbm\xb6\xa8&ز=\xc1Xb\xa6\xd3RB\x16\x9e\x10?\xe9]\xe5\"\x99\xf74\u007f\xb3\xe5\xe5\x9fE\x96~r/\xd0\xf3=B\xc2t\xea\xdeЬ\xd7.\xc8\bu2\xec^\xb5`&(\xcbm\xb6\xa8&ز=\xc1Xb\xa2S\x13!\xdb\xe5\xa9\xe3\x84\xd4h\xfeh\xcb˟N\xbaBO\xf4t2c\x84:\x19\xa2Z0\x13\x94\xe5\x1e!\xb6lO0\x96D\xd6\xe9^Zh_-&\xd35\u007f\xb5\xe5\xe5O#ݡ'\xf1\xa4\x93j\xc1L\x80N@\"\xb2Nm\x84\f\x04\xa6\xfb6tIE\x8b\xd2]I3W\x89~\xf5\xcb?\xb0t\xba+e\xe1q\xb9*\xff\xa4\xbfx\x9a+yN\x8dꬩ\x97\x96\xa5,d\xd7%s\xa4˲\x80\x0f+\xa4g\xddL'qi\xbakzY\xe8\x82D\xaf\x9bS\vR\xa7λ\xc0t\xaa%\xb3\xe4\xa2\n\xe9ɺ\x0fX\xebU\x1fHE\xdc\x02ג\r\x83\xc5i\x0fd4\xd2\xc9Y\xae\xb4\x9b\xacD(\x00\x00\x1e\xe5IDAT\xa5\xdc\xf5N\xff\n\xb6\xc8g\x82}\a\x16,\xb0wK\xd2jz\x0e\xb6\t,\xb7\xd2Wh\xf5\xb4-\x14\xf8\x99\xe9o\xcfYd\x85\x1f\x8c?\"봊\xccД\x14\x13\x92\x9e\x91F\x1f>P\xbd\xfcǧ\x12\u05ec鄬\xf1k\x9e\xf4&\x93\x94\xd93\by\x88\xeb\xa3\xdeE\xa6\xb2>\xe8\x1e\xb3&\xd7E\xe6\xe5\xd6)\u007fس\x88^\xa9\xe5\x0e0;\xd2HZ\n!\xb3\xee)\xfb\xbb^7U\x84\xa4\xcdrMɤ;\xfa\a.\xd2+\x95\xcd gh\xeb\xa5\xe9$\x99\xb6\x9e\xf9\x89f\x81kIq*Is\x11\xd2XL\x1e\xa0e\x99\xfe\x80N\x87\x92\xc8\xd4ٴ$x\xed\x13X0\x8dN|ϡ6\x81\xe5\x96\xfb\xe2VO\xd3B\x81\x9f\x99\xc1\xf6\x84N\xe3\x93\xc8:- \x05\xea\x826\x92\xc4\x0e:\xa7\xa6\x92\r\xfc\xcb?\x90LV\xd0\xfd\xe5T\ni\xd4<YHVQ%^J&\x87\x82}\xbc4\x99\xac\xa1e\xfb]\xa4\xd6ot\xb2G\xa6wљ\xb9\xc8\x1ee\u007f\xd7\xeb\x86\x10\xaa\xe1\a\xf3\xa4\x83\xdbBY\xe4\x97\xc84\xa9\xf5\f\xfa\xce\xdf\xec\"\xbb4\vL\xff2\xb3\xd7\u007f/\x97\xb8\x1e\xa8\xbfǮ\v/(\xdd\x0fNe\xfd߫ \x0f\x84\x8e\"\xf2\x82it\xe2z\xe6\xdb(\xcb-\xf5\xa5Z=U\v\x05\xbe\xa1\xc1\xf6\xf4\xd7W\x9d\xf2\x83\xf1Gd\x9d\xe6h\xdf$W\x902\xe5\xffb\xfe\xe5_A\x16H\xc5\xfb\xd9\xd1L\xf5d\x9alKun[\xb0\x8f\x85\xca\x1eZGR\xef\x19\xea$\x1dl\x8a\xd9\\\xa4}T\xa7\x9b\\y\xd9>Le\x95\x9a\xe5\v\xbbǙU\xb4u_\xb0\xb5j\x81\x95~{\t\xa9`e\xb3\xd9>.u_F\xe6I\xb52I\xe0@i\xa4S\xa8g\xbe\r\xaf\x93j\xf5T-\x14\xf8\x86\x06\xdb\x13\x8cS\"\xeb\xf4\x10Y\xaa)Q\x86\x8e+\xd8a+\xf4\xf2O#MR\xf1'\x93I\xbf\xfa\xc9Cd\xce\x19\xf5h\xf3\xbd$e\xc8\xec\xdeTzff\xa0\x93|)T͆$\xa4}4\xbc\x1b\u007f2;\xb6\xf8\x95=\xf1^\n\xeb\xf4^\x1a\xdbyk\xc9\xccPk\xd5\x02\xd7\xca箟\x10y\x9e\xb9\xa4Z\xe9~\xa6\xb2ȃ\x83\xa1\xfeuu\xe2z\xe6\xdbp:\xa9WO\xbd,2\xaa\x99\xe9oO0N\x89\xac\xd3\xc3$W[t\xef̮\xb2Eӈ\xea\xe5\xff\x90^\xe5̑p\x91v\xd5\x13\xff\x19z\xa5\x92\x9c\xbb\x87\xbb\x12\x1f D\xb9\x8e\x98\xc3\xce\xe5\xf4u\x92\x8fo{\xd8\xff\xd2\xfe\x1e\xde\xcd\a\x81n\xf6Ho\xfcKٱ\xaa\x9d\xcc\xe6Z+\x03\x03\xdc\x02\xd7\xca\xc7\x05:\x17v\xe5\xef/ UJ\xad\xc0\xa5\x17\x8f\xaeN\\\xcf|\x1bN'\xf5\xeai\x96EB=3\xbd\xed\t\xc6+\x91u\xaa\xe0\x87\"\x8e\xb3=\xa6:\x8d\rbe\xccQ\xbd\xfc\"\tѨzBϬ\n\x92\xe8Ĕ\xe2\xe0\xa5x7\x99\xa2L-`\x9fdE\x1a(\x0f\xe9\x14\xdeM?!\xf2D\xb3\xa4S\x17I\xbbG\xed\xaf\xe5Z\xcb\r\xf9\x05V\xfe\x12\xa6\x13=\\q\x87%\x05]\x9dB=\xab\xdap:\xa9WO\xbd,\x12\xea\x99\xe9nO0^\x89\xacS7\xf7\xd2\xf7\x93\xc9]\xecΛ\xe2\xfa\v\x1fjNN>T\xae\x10$TO\x18\xf7N\xad\x99EB;I\u007f4G\xa70\x9dº\xf9 \xf0Q\xcf~\xf9\xb2d\x069q/i\xca\a~\x8dN\xaa\x056\xd2ɯ]d\x86Z\xa75Z\x9dTm8\x9d\xfa5G\xa70\x9dT\r\xf5\xb7'\x18\xaf\x98\xdc\x151-t\xf1\xb4\x82^Z\xd3\xeb\x01\xf9Z}\xa9\xfa\xe5Oe\xc7!Ʃ\xfe{\xea'\x03\xf2\xa7+\xb5dJ\xf0F\xa2\a\xa2\xb8v\xd2\xea\x14ލ?E\xe9f\x8d\xacS\x05Y\xd1.\xef\xb3\xfc.\xac^`C\x9df(#\xe4M\x0fU\a\xbaW\x16\xacJ\xe9\xec\xe10\x9d\xf86\xfc\xb5\x93j\xf5\xf4t\xe2\x1a\x1amO0N1\xd1i\x17!\xf5\xf2\xd4!B6\xb0\xb3:\xe9\xbc\xff\xc3tvQ\x15z\xf9\x8b\xc9li7o#\xae\x0fTODe\xcf\xed#\x93\x83\x1e\x04\x86\xbev\x91\xe4O\xa2\xd4I\xaf\x9bb\xb9\x9b{\xd3e\x9d\x06ȴ\x15\xf25>\xbf\v\xab\x17\xd8P\xa7\x15\xca\u07be@\x1e\xf2\x93\x90\x17\xac^>\xdd\xfd0-L'\xbe\x8d\xdeȞ\xb4zz:q\r\x8d\xb6'\x18\xa7\x98\xdd\x02\xbb\x90^$\x9f\xf9\xf0^\xef\xe3\x84̹翗,\x8dNߘG؎\x1ez\xf9\xfb\\\xa4\x98\xeeO])\xec`\xa6z\xf2\x10y\x88\xee\xba\x1f.R\x06\x87\x19\x17\xa6\x90\n*ES\x12\x1bX\xd3\xdc\xcb\xe3\"\x8d\x9f\xdc\xd39:\xe9t\xd3\xef\"\x1b\xee\xf9?\xcc\r\xdcT\x91I\x92\x92\xa5\xd3,\xd5\xd1I\xb5\xc0\x86:\xf5'\xb1E\xba\xb7\x8eL\x15\x83\xfd\xcb\vF\xcf\xdd\xe8_\xfa3I\x98N\xaa6\xf2rK\xe5\xaa\xd5\xd3Ӊkh\xb4=\xf1\xb9\xd38\xc5L\xa7O\n\x02\xc3\n\v\xa4\x91\bB\xa6-\x98=9\xa5\x8c\res/\u007f\x93\x8b<0{:\x91\xef:\xe7\x9f\f\xa4\x10\xd7\xccYI$\xad?\xd4g\xfd\x14\x92<;\x9d\xc8\xe7\x91j\x9df\x13\xf6\xa5\b\x9d\x93=\x9dn\x1a]$mv\x12Y\xa8\xe8\xb4'\xe0\x95j\x17V-\xb0\xa1N\xecs֔\xd9t\x1e\xdc\x1d\xe1ʂ\x15\x13\x92\x9cN\x92*\xc2tR\xb5\x91\x97[.\xe7WOO'\xbe\xa1\xd1\xf6\xc4]\x11\xe3\x133\x9d\xfc\xfe3\xc53\x1ep\xa5/R>?m\xcbLu\xcd,\xfb\xe0C\x17\x19T\x9d\x9c\xf4/\x9d\xeeJ\x9a]-\x9f\x8a\xf1O\x06\x96\xcep=@[\xf0]v?\x9c\xeeJ\x97oj\xd3\xe8ԗ\xf9@\xf2~\xbd\xa1\b\xddnrӒ\xe6\xb45*\x16\xd1E\n\\`\xf1\xbb0\xbf\xc0\xc6:\xf9\xfb\x8aӧ\xa4\xe6\xf2\x8b\xa2,ؽ\xdaY\xae\x94ܾ\x13\xe1:\xf1m\xe4\xe5Vʹ\xd5\xd3Չoh\xb0=\xa1\xd3\xf8\xc4\\\xa7\xf1\xc2\x00\xbb\xc1\b\x80\xb1$qt\xaa\xe0\x86\x11\x00\x18\x13\x12D\xa7\xbe\xc1\xc6\a\\\xa1a\x04\x00Ƅ\x04\xd1)\x97\x10\x1c\x9c\xc0\x98\x93 :U'\xa5\xc1&0\xe6$\x88N\x00\xc4\x03\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1bv\xebt\xb6\xe4\xb6Y\x95h\xb8Sr֬\n\x00q\x87\xa9N\x1fm\xc9\xf3\x94\xfb\xccj\x058(4D]7\x12\xbe\x83\xc2A\xb3:V\xb8\xec=oVń\x91\xf7\x10-\x97\xe6\n2^k\x9br3m\xe2yOS\xd8 \xb8\xd9\x1bӋ\x1e\xa1A\xaf\r\xb0\x17S\x9dJ\xbdG7y>6\xab\xa5\xd0*\xbc`V%Z^t\xb7\x9aU\xb1\xc0\xf9쨏vW~\xaf[l\xa1\a\x0e\x83\xce\"V\x18~Ž\xb9\x87\xb2[\xb0v\xa0\xbf\xd9\xd3sX\xf8\x9d\xa6\xf0N\xa5\xa7\x94\xfeWꩼ\xa3\xd7\x06؋\x99Nw\x84V\xbf\xef\xaeI\xa5\x00\xef\xbbw\x9bU\x89\x9e\xbdY7ͪX \xfa7\xfa\x95\xeb\xf5ˣ\xef\x81è\xb3\xc8\x15\xb2\xa4#\xc9\v\x82e\x03\xae\x86\xe9\xe4\xdf]N\xdf\f\xefx\xcam|e\x80!f:\xbd'X8\xc7\xd9\xec\x1d6\xab\x12=\xc3\xde\xcdfUF\x85\xc7\xcc\f\xb0\x82ig\xba\x15d\x9d\xde\xdba\xd9`=\x9d*KO\xfb_X]\t\x9d\x9c \xa2N\xbe\xc5\xf2I\xfc\x0e\xbf\u007f\xab@\xcf\xe3\xdew\vKؤ\xfb؎%\x9e\xd5\xf2\xc1\xe3\xbdo繽\xe5Ҵ/[~\xcd\xder\v\xc2\xde\xf7*\v=\xab?\xe5:\xe3J\x8d:\xf3\xbdP\x92\xbddG@ɽ\x1e\x8d\x9c\x96{P\xf8\xd8C\xd7\xe1$\x9bR/z\x88\x9eՅ\xee\xbc\xf2B\x9f\xff\xbcrٲ\\\xbd\x16\x06=ܩ\\\\\xb8c\xc7\xe2\xec\xd3\\\x0f\x1c\\g\xaa%ӛ\x9b\x8a\xac\xc0u\xce\x1f\xe92\x94\xfb\n\x05!\xc7翻>\xdf]X\xfe\x96\xdf\xffi\x9e\xfbDž\xf9W\xb6\xe5\x94\xdee\x8bӺ%?\xa7\\\xb9d\n\xea\x14\x9a\xdb\xee\xca\xc3O\xfbˏ2\x9d\x82=h\x9b\x01\xbb\x88|tz\xb3\xe7\xa4\xd0\xd0\xd3s\x8b\x9d\x98\xbb\x1b\xfc\xbe\xab\x9b\xb3\xe8k|\xd2-x\x1b\x0e\xe6<\xcdj\\\xc9^~\xf0r\x83 ]\xe7\xbc)\xf4H\xad\x86O\x9f,,\xca.\xdcQ9\xf7\xcf\\_\\\xa9Qg\x9b\x85m/\xb6z\x1fS\xf6\xc9W\x84\xdf\xfaUX\xee!\xc0՞\x9e\xf9\xd2\x1e\xaa\xaa\x1b⍹\x9b\xce^>\x96'|J\xaf[z\x8a\x9e\xa4\xd7-\xff\xaeY\v\xdd\x1e|\x8fz\x0f7\xcc\xf7\x1c[\xdd\xca\xf5\xc0\xc1u\xc6/\x99\xee\xdcTd\xed\x1d\x1e^\xbf\x83\xcd\xe1\xb7\rt#\xbc0\xf7\x857\x99\x9c[\xae\x9c.\x17\xae\xd2m\x9e#\xec(\x15\x16\x1f\xcck\x95\x16\xa7\xb0\xa1\xa1\xd0\xf3\x8e\xd40\xa8Shn\xbb+of\u007f4\xff\x16\xd3)ԃ\xa6\x19\xb0\x8b\xe8O\xf6\xa4\xb7̆,i2\x87\xbe9Wz\xe9\xd4p\xe1j\xfa\x92\xf9NKg\xf9/\n\u007f\n4{L\xa0o\x9da\xd7\\\xa1R\xdd\xce\xceK\x03\x19W\xe5\xc3\x005X\b\xbf\xf8\xb7\xd6\x03\x87Gy\xc3\x0f\xd5\xe58\xece\x1a\x1cΑ,\xe4N\xbfTk\x11\xde\xc3i\x81\xbe\xd3\x1f\x16\xde\xd1\xf6\xc0\x11\xec\x8c[2\xa3\xb9\x85\xc8b\x87\xacriҷ\xa9\xe4N\xa14\xc89|\x92.\x88o\x19\xf3\xd8[I\xb7\xf5y\xff\xa6-\xacn!-\xfe\xb8\xb0D\xaa\x1dЉ\x9b\xdb\xeeJ\xff\xb2-+\xfdL'\xae\au3`\x17\xb1\xe9\xb4)0yIx3T\xf7\xac\xf0~`\xf2\xb1,\xfe\xc0\x14^\xaa\xdb\xd9\xfaG|\x9fR\n7\xcbun\n\xa7G\xd8\x03GP\x86`]\x8e?\xe7\x17n;\xf6\xa6Ov\x81\u05c9_\x8b\xf0\x1ev\xe7Ї?Iҫz\xe0\bv\xc6-\x99\xd1\xdcBdm\xb9zu\x99\xac\x93\u007f\xf8\x1by\xca\xe7\x14w\x0e\xaf~$GXF\xa7\xbc'\xa9*\xc3\xcc\x14ZW:\xc1>,\x0f[\x04t\xe2\xe6F+\xb1\x0f\x1d\xa4k\xa7P\x0f\xeaf\xc0.b\xd3)8\xd9*p\xd7)܅\xf0c\xda\xcb\x01M\xa9ng˔K\t\xe5T\xec\xaa\xf0\xca\b{\xe0\b\xca\x10j\xc6\xf1\xf1\xd1\xf5K\x84\xbc\x83aG'~-\xc2{h\x9d{\x87\xbd\xa1\xbc\xa3\xed\x81#\xd8\x19\xbfd\x06s\v\xc1fq\xe9\xb2\xf2䬲\x19\xaez\vw\x9f\xed)\x95t\xba\xe4\xbf\xea\xf6+:I\x8b\xd5#H\x03\xee\x81W\x80\x9b\x1b\xadtg\xc7mI'\xae\au3`\x17\x16uګ\xd9\u007f/\xf3\xaf\xc7p\xf0\x12\xda\xffط\xfd:\x84Ju;\xab|\xe4\xf7\x12\xca;f\x83;|\x80\xdeZ\x0f\x1c\x11u\xba\xba\x9b\xee\xda\x1f\x9f\xf4\x1cfO\xa4\x1d\xfc\x98tXR\xadEx\x0f\u007f\x16\xca\xff\xfcVQ\x89O\xdb\x03G\xb03nɌ\xe6\x16Bَo\xb1ո\xe9\xdd[\xf8\x11{\xb6\xa4\x84\xbds};\xa0SV@\xa7m\xec\x8f\xc7\x04i[\x05t\xe2\xe6&U\xf2K:q=\xa8\x9b\x01\xbb\x88^'\x0f}A|+5\xfb\xef]o)ۛ\xb6I/\x8e\xff\xdbE\x81wg\xfd\x01\xe2P\xa9ng\x97\xe4k\x9e\xbd\xf2\xfd\x10\xbe%\xe5#\xec\x81'\xa2N\r\xc2%\xf6_\xe9\x16\xe9\xb1\xd4\xef\xbf-\xf7\xa3Z\x8b\xf0\x1e~/\xe4\tB\xe9Ͱ\x1e8\x82\x9dqKf47\xff\xfb\a\xdf\xe7fA\xada\xabX\xb2\u05ffE\xdaƅ\xccm\xdf7\xc2tʣF\f?R*\xb5\b\xe8\xc4͍Ӊ\xebA\xdd\f\xd8E4#{W%IJ\xbc\a\x1bJ\x04\xf7\v\u007f\xbc\xd5\xe3\xde|\xd5\xf7\xe6f7\x1b\xf1\xbb2\xffѣ\x97\xb6\tǤ\xea\xef\xc9w\x06}\xfa[i\xc0*x!%\xa3*\xd5\xefl\xf7\xdcʳg7+wV\xb4\x86\x9d\x88X\xed!\x80\xefw==\xf37\xf7\xf4\xdc\xf5\xab\xea\x86h\x10\xb2\u007fr\x9e6\xbb\"=\xc9j=[\x9a\xfdg\xd5\xdc\xf4{\xf8\xfd\xfc\xcb/\xf6\xdc\xf4\x85\xf5\xc0\xf7\xact\xc6/\x99\xee\xdc\x18O\xcb\xc3\x0f\x81\xbb\"zrv\f\xbf\xb2\xd5{\xd3\xff~ζW|\xb4\xd9\xfa\xc3\r\x8fѓī\u007f\xcci\x1d>\xe9~k\xb8\x92\xa9\x9c%,?y\xac(\xe7O\xf4`\xc9\xee\x8ah\xed\xe9Q\xcd\xed\xa3\xcaR\xb6\xaa\xb7J+?\xe2z\xe0\x9b\x01\x1b\x89\xfc\xb9S\x8et\x06\xee\x96\x06r\xdf+\xf5d\xaf\xfe\xb1 l\xddʊ\xfe-\x9b>n\xa5\xc5\u007fZ_\x98\x1d\xbc_u\xef|v\x9e\xff\x96|\xe2\xae9\xb8\xa8J\r:\xbbT\xba8\xe7I\xe9\xbd\xdb\xdf\xe3\xd9\xe1\xd7`\xb1\x87 o(W\x12G\xfd\xea\xbaA^x\xb2\xa1\xd0\xed-\x95]\xf0m\xcb\xf1<yU=7\xfd\x1e^q\xb32\xf7\x93\xefhz\xe0\bt\xe6\xe7\x96Lwn\x8ccޣRE!@+\x9b\xdc\xe6\xdf&\bs\xaf\xf8}\xadEY\xde\xf5NJ\xdcO\xd2c\xe2\xc9l!\xfb\xa4tm\x94\xb5csN~%Sf\x93\xd2j=?\xb7\x06A\xd8D\x9fn\x11\x84\x86P\x0f\xa5|3`#f'{\xd6\xf0ms\x9f4\xab\x13\x1d\xa7ݛU\x9f\xe1\xc4!\xb7\xb3\xb7\xdc\xfe\xf4ӏ\xdfx:'\xda[\x1aG\x83\xd0\xf5\xaa%bl\x06\"c\xafN\xf4\r\xb0Ж\xa1\xd7;ްA\xb2\xb8\xe3\xac\xf2)\x93/Ou4\x1c~_\xc6\xc6\xfb\xad\"\x11\xa3\x1716\x03\x91\xb1Y\xa7\x89\xc4\xef\xe5!r\xff;\xfcgo~\xff\x93\xca9ד\xba\x8dl'F/bl\x06\"\x03\x9dbƷٳ\xe5\xf4\x95\xd3[<[T\a\xd2?\x9d\x97q\xe4*\xff\xa642bV+\x8c\x18\x9b\x013\xa0S\xec\xf8ί\xcew\xe7\xaf>?\x86\xfb\xa542\xa2\x19B\x8d\x82\x18\x9b\x013\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6a\xb7N\xc8(\a\x13\x18S\x9d\x90Q.3\xf2\x1e\xa2\xe5\xa4t\a\xed⧣\xb9\th\xab\xa0\x93\xdad\xc0\xd1P]+\xb3\xb0Rw\xc2'\xa2\x9bꄌr\x19\v=pĒQ~\xf7\xbc\xf0㞞\x17\x96\xe5}\xa4S_\x83\x947\x18%\x1f\xf7\x94\x04\xea\x1a\xce\xc2\xca\xe2\xe8ԝ\xf0\x89\xe8f:!\xa3<@\xf4=pĔQ~K:\x8a\xdc\xf1D%\x8a\x95oZ\x94\a\xeb\x1a\xcd\xc2\xca\xe2\xe8՝\xe8\x89\xe8f:!\xa3|D\x98v\xa6WA\xde\u007f\xfd\xcb\xcc\xdaJ\x8cD\xa7\xf0YXY\x1c\xbd\xba\x13=\x11=rV\x042\xca\xc7\"\xa3\\\xde\u007foK)\xce\xc1fF[=k\x87\\\xca'\x97si\xe4\xaaׂ괍\xcen\xfe\x1dn\x16l\x19~\xcc\"%\x84\xd3\x06\xcbk\xa5\xeeDOD\x8f&\xc9\b\x19\xe5\xcef\x94\xdf\x12\x8e\r\xdf\xfdݲ%w\xf9fF[=KXr\xf2l\xdeӪ\xe4r.\x8d\\\xb5\x16T\xa7\x9b\x95B\xebU~\x16ï\x14n\xb9\xed\xbf\xfd\x93\x9c\x9e\xbb\x06\xcbk\xa5\xeeDOD\x8f\xfed\x8f\x8f]EF\xf9hf\x94ߒ\xde\xf7\x8bn\xaa\x9b\x19l\xf5,\xefG\xec,ۯJ.\xe7\xd3ȹ\xb5\xa0:\xb5f\x9d\xd7\xcc\xc2\xdf\xc0\x8e0\x9b6\xcbuu\x96\xd7J݉\x9e\x88\x1e\x9bN\x9b\x02\x93\xc8(\x1f\x85\x8c\xf2[\xc2O\xae^\xbd\xb4i\xf1\x1b\xea\x15\xd2\xdf\xeaY[\x02\xa5|r9\x97FέEy\xc3^\xe5\xe5\xe4f\xe1\xbf9\xf7\xdf\xfc\xbe\x1c9\xc3Yoy\xadԝ\xe8\x89\xe8\xb1\xe9\x14\x9cDF\xf9(d\x94+\xd7\xfe\xeb\x8b|\xaaf\xfa[=T\xca%\x97\xf3i\xe4\xdcZ\x94{s\x96<\xed\xd3̂\x16\xef\xf0_\xca\xd1\xd8\xcd\xcd\xd8J݉\x9e\x88nQ'd\x94s=\x8cVF\xb9\xb2\xff\x1e\xa3o\xe6\xfc\n\xe9ou\xb5NY\xb2N|\x1a9\xb7\x16\xe5\xdew\xde\xcfi\xd5̂\x9e\xac\xe5\xf9\x94\xf37\xdd\xe5\xb5Rw\xa2'\xa2G\xaf\x132ʵ=\x8cVF\xb9\xb2\xffn\xca\xf6\xa9VH\u007f\xab\xeb\xeaħ\x91sk\xc1\x06\xca/\xb9\xaf\xaag\xc1\x82\x02\xcf+\xe7o\xba\xcbk\xa5\xeeDOD\x8ffd\x0f\x19\xe5\x8ef\x94˷!\x9c\xad\x946f\xb0\x99\xfeV\xe7J\xf9\xe4\xf2P\x1a9\xb7\x16\x1f\xf7\x94l\xfe\x9d\xefn\xb9\xf7\xcam\xd5,\xe8L\x1e\xc9\xf9\xd4py\xadԝ\xf0\x89\xe8\x91?wBF\xf9\x18d\x94\xcb7ɹ\x97\x1d\xf3\xf1\xcd\xf4\xb7z\xa8t\v\x9f\\\x1eJ#\xe7\xd6\xe2(\x9bx\x83\xf5\xbeW=\v\xff\x9f\x84\xc0QUgy\xadԝ\xf0\x89\xe8f'{\xd6@F\xf9\xb8\xe4nV\xd8\xfb\x80!V\xea\x06\t]T'8\xf6ꄌr\xc73\xca\xed\xe0\xf4\xe2\xe8ߺ\xac\xd4\r\x02\x9d\x80\x19\xf1\x91Q>b\x1a\xae\xf8J\u007fbVI\xc1J]\x1e\xe8\x04̈\x87\x8c\xf2\x913,,\xdf\xea\x8d\xf2l\xd5J]\x8e\t\x94\x88\x0e\x9db'\x0e2\xcam\xa0!\xbbTsϠ1Vꆘ@\x89\xe8\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\xc6\xc8ur.\xbc;:\xd6\x1f\x95\xff\xbf\xb2:\xcf]\xb8yb\xdc\xdb\x02\xe2\x04\v:\x8dyx\xb7!|\xdd7\x84\xdd\xd2\xffW\xe7\x96\x1c\xbb|\xb4(o\x02|g\r\xc4\r\x16t\x1a\xfb\xf0n#Bu}=\xf9\x8aNg\x05\x16ipS\xf9\xda=\x00N`A'Ӽm+\x98vfZ\x81#Tw\xbd\xb0\xde#\xeb\xe4\x93\x0eKz\xe1b\x00\x8c\x16&:\xc5Ux\xb7*o\xdbwt\xb9\xe7\x1b\x87}\x9a\xcen\xdf\xf2\xe7\xec\x0e\xd4\xf7ݹT\xf8\x8d\x98\x8e\x9d\x00\xc4Dd\x9d\xe2+\xbc[5\xe3MY{_ܛ\xb5\xd9\x1fV7\xa8ӛԱl\fE\x00\a\x89\xacS\x9c\x85ws3\xbe$\x85\xd5ɏ\xea\xbaA\x9d|W\xaf\xb4\x16z\xe1\x13p\x8e\xc8:\xc5Yx77\xe3\xcdr$㣛\xc3\xea\x86N\xf6(\x1f\xe7\xebd_\x020J\x98\\;\xc5Wx77\xe3\x12Y\x93\U00092c3a\x8aNw\xe496\xb8q\xf1\x04\x1c#\xb2Nq\x16\xde\xcd\xcdx\xf3#\xacw_ᦰ\xba\xb2N\xbe\x1c\xb9f\x83'\x86\x1c+\x00b#\xb2Nq\x16\xde\xcd\xcd\xf8E\xe9O'\x85\x17\xb5u\x03:屟@\xf2\u007f\\\x18\xfec\x1a\x00\x8c\x16f:\xc5Sx\xb7*\xa3\xbcR\xd8}~\xb7P\xa9\xe9\xecNOO\xf6z)T\xfd\x05\xa1\xfc\xe8\xe5\xd6\xc2<;\u007f\xaf\x1a\x80\xc8D\xd6)\xbe»U\x19\xe5\xbe\xd6e\x9ee\x87}\x9a\xba{\xa5\x1an\xf6+\xac\xbf}\xbap\xfe\x92m\xb6d\xd2\x02\x10\x1d\x16\ue288\x9a\xc4\t\xef\x06\xc0\x12\xa3\xa1S\xe2\x84w\x03`\x89\xd1\xd0)A»\x01\xb0\xcah\xe8\x94\x18\xe1\xdd\x00Xf4tJ\x90\xf0n\x00\xac2*:\x0101\x81N\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00۰[\xa7\xb3%\xb7ͪ\xa8\xb9S\x12K\x88,\x00\xf1\x88\xa9N\x1fm\xc9\xf3\x94G}\xb7\xd0A\xa1!\xea\xba2\xbe\x83\xc2A\xb3:V\x18yd\xfa\xc8{\x88\x96\xb3n\xe5\xae`\xb7\xf9[J\x83\\\xe9E\x8f\xd0`V\x15\x8c\x19\xa6:\x95z\x8fn\xf2D\xfb\xbd\xa5V)\xe5\xcb\"/\xba[ͪX\xc0Bd\xfa\x98\x87\xae\x1f\x14zz\x0e\v\xad==s\x8d\xdfQ\x02\xcd\xeeTzJ\xe9\u007f\xa5\x9eJ|#2~1\xd3\xe9\x8e\xd0\x1a\f\xd43\xe5}7\x1f\xca\x155{\xb3\xec\xfc\x06z\xf4G\xc71\x0f]ou\xb3\x84\xc1\xdf\xf9\xfd\x1e\xe37\x94`\xb3\xdd\xe5\xf4]펧<\xa6M\f\x9c\xc1L\xa7\xf7\x04\vg>\x9b\xbd1}5pػ٬ʨ`%\x06\xdd\x14\xd3\xcet*\xf8\xdeStz\xcf\xd8\xe0`\xb3ݕ\xa5\xa7\xfd/\xac\xae\x84NqLD\x9d|\x8b\xe5S\xfb\x1d,\x82\x9c\x9eǽ\xef\x16\x96h\xd2\xc8\xfd\xef};\xcf\xed-\x97\xa6}\xd9\xf2K\xcde\x89\x1b5\xe3\x82\xc9){=\x1a\r-\xf7\xa0`\x10\x99\xce\x11W\xa1\xeb\fI\xa7h\x9a\xed\xae<\xfc\xb4\xbf\xfc(\xd3\xe9\xee\xfa|wa\xf9[~i![\xb7\xe4甿\x17\xd6/\x18\v\"\x1f\x9d\xde\xec9)4\xf4\xf4\xdc\xf2\xfbo\xf6\xb8\x1b\xfc\xbe\xab\x9b\xb3\xd4i\xe4\xfe+\xd9\xcb\x0f^n\x10\xa4\x93\x957\x85\x1e\xa9\x15\x97%n\xd4,\x14L\xcexE\xf8\xadz\xbe\x96{\b\xa0\x1b\x99\xce\x11_\xa1댠Nf\xcdvW\xde\xcc\xfeh\xfe-\xa6\xd3ya˕\xd3\xe5\xc2Uy!\v\x1b\x1a\n=\xef\x84u\fƀ\xe8O\xf6B1z\\\x1a\xf9p!\x8b\xb3\xf3\x9d\x96.\x8f_\x14\x82_\xb4\r\x85\x98\xeb6\xe3\x82\xc9\x197\x85\xf0\x8b\u007fk=p\x84G\xa6s\xc4]\xe8zP'\xd3f\xbb+\xfd˶\xac\xf43\x9d\x86O\xd2%\xf5-\x93\xde*\xb2\n\xef\xb28\xc1\x12\xbd\xbe\x81\xd3ĦӦ\xc0\xe4%>\x0e\xe2\xac\x10\xcc\xd7\x0f\x85\x98\xeb6\xe3\x82\xc9\x197\x85\xd3~-\xd6z\xe0\b\x8fL爻\xd0\xf5\xa0N\xa6ͨN\xec3\x05\xe9\xda\xe9\xce\xe1Տ\xe4\bRL{\x96t\x82}X\xc0x_<\x10\x9bN\xc1\xc9V\x81\xbbz\t\x9e\xb7\xf0!\xe6\xba\xcd\xf8`r\xbf\xfe\x8f\x9aY\xeb\x81#<\x94\x96'\xdeB׃\x1bʹ\x19\xd5\xe9ΎےNW\xbd\x85\xbb\xcf\xf6\x94\xca:I\v\xdb#\x98\x8d\xd3\x03'\xb0\xa8\xd3^\xcd^}\x99\u007f\x19\x87\xb3\x1a\x02\x93\xa1\x10s\xddf\\09\xa3\xc1\x1d>\x14o\xad\a\x8e\x88:\xc5]\xe8zP'\xd3f\xbb\xe5\xc4[\xa6Ӓ\x12\xf6&\xf6mY\xa7m\xec\xf1\x98\x10\xed\x87\x19`4\x89^'\xf6#\x99\xbe\x95\x9a\xbd\xfa\xae\xb7\x94\xedcۤ\xd7\xd4\xff\xed\xa2\xc0{v\xe8\xadX\xb7\x19\x17LN\xf1-\xd1\xf9\xd5\x18K=\xf0D\xd4)\xeeB׃:\x996\xe3t*d\xf2\xfb\xbe!\xeb\x94GE\x1a~\xa4\xd4\x0f\xe2\x80hF\xf6\xaeJ\x92\x94x\x0f6\x94\b\xee\x17\xfeȧ\x91\xfb\xaf\xcc\u007f\xf4\xe8\xa5m\xca\x0f:\xbf'\xdf/\xa4\xca\x12\xd7o\x16\n&\xf7\xb33F홊\xd5\x1e\x02\xe8G\xa6s\xc4W\xe8:\xe5\xcd\xc3B\xab\x1c\x1dm\xd2\xec\xa3\xcaR\xb6&\xb7J+?\xa2\x15\xd6\x1fnx\x8c\x9e\x0eҖY\xc2\xf2\x93NJr\x90\xb6\x16\x17D\xfe\xdc)G:\x9dwKû\xef\x95z\xb2W\xffX\x10\xb6\xf2i\xe4\xf4\x02}}av\xf0.ֽ\xf3\xd9E\x90*KܠY0\x98\x9c\x9e\xf7{vhgl\xb1\x87 \xfa\x91\xe9\x1c\xf1\x15\xbaN\x0f+\xac\u007f\xcf\xdd(\x9a5\b\xc2&\xfat\x8b 4\xf8}\xadEY\xde\xf5NJ\xdc\xf4\x98\x94\xb5csN~\xa5\xea=\x03\x8c\x19f'{\xd6\xf0ms\x87\x8f\\\x9bpڽ9\xde\u007f\x82)\x9eC\xd7C\u05eb`\xec\xb1W'\xfa\xbeYhq\xc4\xf6\x8e7l\x90,\xee\x88\xe7\xd0u\xe8\x14OجSb\x12ϡ\xeb\xd0)\x9e\x80NQ\x10\xbf\xa1\xeb7\xa5\xf1\x12\xb3Z\xc0)\xa0S4\xc4m\xe8\xba4^\xf2\xbe\x1f\xc4\t\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00۰['d\x94\x83\t\x8c\xa9N\xc8(\x1f=\x90Q\x9eh\x98ꄌ\xf2\xe8@F90\xd7\t\x19\xe5Q\x82\x8cr`\xae\x132ʣĴ3d\x94O\x00\"gE \xa3\x1c\x19\xe5\xc0\x02\xd1$\x19!\xa3\x1c\x19\xe5 *\xa2?\xd9CF92ʁ\t\xb1\xe9\xb4)0\x89\x8c\xf2`\x0f\x81\xceL\xc3\xc6\xd5 \xa3<\x91\x88M\xa7\xe0$2ʃ=\x04:3\r\x1bW\x83\x8c\xf2D¢N\xc8(GF90&z\x9d\x90Q\x8e\x8cr`B4#{\xc8(GF9\x88\x8aȟ;!\xa3\x1c\x19\xe5\xc0\x02f'{\xd6@F\xb9\xe3 \x056\x9e\xb0W'd\x94;\x0et\x8a'l\xd6)1AF9\x88\x0e\xe8\x14\x05\xc8(\a\xd1\x01\x9d\xa2\x01\x19\xe5 *\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6a\xb7N\x963\xca\xf5Ar9\x18\x8f\x98\xea4\xda\x19\xe5\xfa \xb9\\@r\xf98\xc4T\xa7\xd1\xcf(\xd7\a\xc9\xe5H.\x1f\u007f\x98\xe9\xe4DF\xb9>H.Gr\xf9\xb8\xc3L''2\xca\xf5Ar9\x92\xcb\xc7\x1d\x91\xb3\"F\x9cQ\xceuf9w\x1c\xc9\xe5Q4Cry\\\x11M\x92\xd1\b2ʹ\xbe,\xe7\x8e#\xb9<\x8afH.\x8f+\xa2?ً1\xa3\x9c\xc7Z\xee8\x92ˣh\x86\xe4\xf2\xb8\"6\x9d6\x05&\xcd3\xcay\xac\xe5\x8e#\xb9<\x8afH.\x8f+b\xd3)8i\x9eQ\xcec-w\x1c\xc9\xe5Q4Cry\\aQ'\xeb\x19\xe5<\xd6rǑ\\\x1eE3$\x97\xc7\x15\xd1\xeb\x14cF9\x8f\xa5\xdcq$\x97\xfb\xa3h\x86\xe4\xf2\xb8\"\x9a\x91\xbd\x11e\x94\a\xb1\x9a;\x8e\xe4r\xbfy3$\x97\xc7\x17\x91?w\xb2!\xa3<\x88\xc5\xdcq$\x97#\xb9|\xfcav\xb2g\x8dX2\xca\xf5Ar\xf9\x88@6\xec\xd8`\xafN1d\x94\xeb\x83\xe4\xf2\x91\x01\x9d\xc6\x06\x9bu\x9aH \xb9\x1ch\x81N1\x83\xe4r\xa0\x05:\xc5\x0e\x92ˁ\x06\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80mح\x132\xca\xc1\x04\xc6T'd\x94ˌ\xbc\x87hAF\xf9\xf8\xc5T'd\x94\xcbX\xe8\x81\x03\x19\xe5\x13\v3\x9d\x90Q\x1e \xfa\x1e8\x90Q>\xb10\xd3\t\x19\xe5#´3d\x94'\x14\x91\xb3\"\x90Q\x8e\x8cr`\x81h\x92\x8c\x90Q\x8e\x8cr\x10\x15џ\xec!\xa3\\\xdb\x032ʁ\x86\xd8t\xda\x14\x98DF92\xcaA\x88\xd8t\nN\"\xa3\x1c\x19\xe5 \x84E\x9d\x90Q\x8e\x8cr`L\xf4:!\xa3\\\xdb\x032ʁ\x86hF\xf6\x90Q\x8e\x8cr\x10\x15\x91?wBF92ʁ\x05\xccN\xf6\xac\x81\x8c\xf28\x01)\xb0c\x83\xbd:!\xa3\x1c\x19\xe5\x13\x1a\x9bu\x9aH \xa3\x1ch\x81N1\x83\x8cr\xa0\x05:\xc5\x0e2ʁ\x06\xe8\x04\x80m@'\x00l\x03:\x01`\x1b\xd0\t\x00ۀN\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80mح\x132\xca\xc1\x04\xc6T'd\x94ˌ\xbc\x87h9)\xddA\xbb\xf8\xe9h\xee\x12\xda*\xe8\xa46\x19p4T\xd74ڼg\xaeP\xe2\xf3\x9f\x15\x84\xb9\x97\xd5\u007fxgu\xb6\xb7\xf2\x8a\xf7\xb6\x95\x19O LuBF\xb9\x8c\x85\x1e8b\xc9(\xbf{^\xf8qO\xcf\v\xcb\xf2>ҩ\xafA\xca\x1b\x8c\x92\x8f{J\x02uM\xa3͇/\v\x9e\x1e\xffݳ\xc2e\xf5\xf7L.e\xaf<vr\x99 \xfc\xbb\x95\x19O \xcctBFy\x80\xe8{\xe0\x88%\xa3\xdc\u007fKz\xe3\xbf\xe3\x89j\u007f\xb5\xf2U\x8c\xf2`]\xd3h\xf3\xbbB\xe5f\xfa\x82j\xb2[\xee\xe4<M7\xc3p\x91\xf0\xef\xd6f<a0\xd3\t\x19\xe5#´3\xbd\n\xb2N\xfeefm%\xac\xec՜Nf\xd1\xe6w\x85\xcb\xd9\xc3a:\xed\xf6Hߗo\x15\u07b36\xe3\tC\xe4\xac\bd\x94\x8fEF\xb9\xac\xd3m)\xc59\xd8\xcch\xabg\xed\x90K?\xcds\xff\xb80\xffʶ\x9cһ|\\\xb9굠:m\xa3\xb3\x9b\u007f\xc7<\xda\xfc\xae\xf0\xfecg\x15\x9d|G\x97{\xbeq\x98\xadZ\xd1&i\xeewZ}\xa1\x19kz\xd0\xdd:z+\x9f\x90D\x93d\x84\x8crg3\xcao\tdž\xef\xfenْ\xbb|3\xa3\xad\x9e%,9y6\x8f\x96^\xc9\x11v\x94\n\x8b\x0f\xe6\xb5\xf2q媵\xa0:ݬ\x942\x92L\xa3ͩN\xad\xe5\x8aN\x9b\xb2\xf6\xbe\xb87k3]a\x81\xbb\x9e\r\xceXӃ\xce\xd6\xd1]\xf9\x84$\xfa\x93=>v\x15\x19壙Q~K:d\x15\xddT73\xd8\xeaYޏ\xd8Y6\x9d\xf2V\xd2W\xe0\xbc\u007f\xd3\x16u\\9\xb7\x16T\xa7\xd6,\xe9\xf54\x8d6\xa7:ݙ\u007fG\xd2\xe9\x92\x14\xf0\xc7\x1e\xdf\xe7_\x91ЌU=\xe8m\x1d\xa3\x95O<b\xd3iS`\x12\x19壐Q~K\xf8\xc9ի\x976-~C\xbdB\xfa[=kK\xa0\xd4{\x92\xee\xb1\xc3r\x90%\x17WέEy\xc3^\xe5\xe54\x8d6\xa7:\xf9\xcb[%\x9d6\xcb\xdd<\xba\xd9\xef\xe3G[C3V\xf5\xa0\xb7u\x8cV>\xf1\x88M\xa7\xe0$2\xcaG!\xa3\\\x19\x8aX_\xe4S5\xd3\xdf\xea\xa1R\xef%\xffU\xb7\x9c\v\xcbǕskQ\xee\xcdY\xf2\xb44[\xd3hs\xa6\xd3\xd9oH:\x95\xc8\xc1\x86\xe5%\xc1k'\xdf%Ռ\xc3z\xd0n\x1d\xa3\x95O<,ꄌr\xae\x87\xd1\xca(Wt:F\x0f\x12\xfc\n\xe9ou\xb5NY\xb2N|\\9\xb7\x16\xe5\xdew\xdeϑ\x0e0\xa6\xd1\xe6L\xa7\xe1\xec\xcb\xd2\xd1\xe9\x11\xb6\x86\xbe\xc2MldOڲ'\x85\xdb\xfc\x8cU=\xe8m\x1d\xa3\x95O<\xa2\xd7\t\x19\xe5\xda\x1eF+\xa3\\\xd1iS\xb6O\xb5B\xfa[]W'>\xae\x9c[\v6P~\xc9\xcd2gM\xa3͙N\xfeM\x95L\xa7\x17\xa5e8)\xbc\x18\xf8\xdc\xc9WZ\xa8\x9a\xb1\xaa\a\xbd\xadc\xb4\xf2\x89G4#{\xc8(w4\xa3\\\xbe+\xe2l\xa5\xb41\x83\xcd\xf4\xb7:W\xfaǜ\xd6\xe1\x93\uedc6+\xe9.\x1c\x8a+\xe7\xd6\xe2㞒Ϳ\xf3\xdd-\xf7^\xb9m\x1am>|Y8{\xd7\xdf\xe3\x91F\xf6*\x85\xdd\xe7w\v\x92\x80\x97<%/\x9c]\xed~E\xb58\xa1\x1e\f\xb6\x8e\xd1\xca'\x1e\x91?wBF\xf9\x18d\x94\xcb\xf7칗\x1d\xf3\xf1\xcd\xf4\xb7z\xa8t\v=\x16\x9c\xcc\x16\xb2O\xb2K\x94P\\9\xb7\x16G\xd9\xc4\x1b\xac\xf7\xbd\xa6\xd1\xe6W\xe6\n\xc2i\xbf\xaf\xc4+\x9d\xe7\xb5.\xf3,;,\x8b\xf1\xcejO\xde\xd3\xff\xa6^\x9cP\x0f\x06[\xc7h\xe5\x13\x0f\xb3\x93=k \xa3||\x13\xba\xf8\x1d1\t\xb8u\xa2\xc0^\x9d\x90Q\x1e'\x19\xe51b\xa3N\x06['\xc1\xb1Y\xa7\x89D<g\x94Lj\x8d:\x19l\x9d\x04\a:\xc5L\xfcf\x94Lj\xad\xd1\xe6\x06['\xc1\x81N\xb1\x13\xb7\x19\xe51bo\xb4y\xa2m\x9d\xa8\x80N\x00\xd8\x06t\x02\xc06\xa0\x13\x00\xb6\x01\x9d\x00\xb0\r\xe8\x04\x80m\xfc\u007f\xe7\xbd\xe7\x84\xdaB\xea\xf4\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/call-eg.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x02\x1e\x00\x00\x01\xc8\b\x03\x00\x00\x006\x92\x13\xd7\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x05\a\x03\n\r\t\r\x12\x14\x0e\x12\x1d\x11\x13\x10\x1b\x1a\x14  \x19\x15\"6\x1f#%!# $%#&(&+)\x1e++$*,*0.\"-/,\x1c0Z120463/6B;8-8:7<>;C@4#Cx@B?AFHDFDKH<MH7\x00f\x00IJH\x00i\x01\x00j\x02LNK8P|0R\x95\am\x06PROYTC\x0fp\vTVS/Z\xa3\x0es\x18,`\xae7]\xad\x15v\x1c[]Zb]K9a\xab\x19y\x1e;b\xac_a^=d\xae@f\xb0*{!bdaBh\xb3efdDi\xb4fheMj\xaf.\x81.Fm\xb1qjROl\xb2Ho\xb3kmj0\x859Jq\xb5Kr\xb7npmMs\xb8;\x86:cr\x8fNu\xba|t]Xv\xb6sur?\x8a>Zx\xb8vxu]{\xbb_}\xbez|y\x84|dX\x80\xbfL\x91K`\x81\xbbb\x80\xc0}\u007f|\u007f\x81~c\x83\xbdN\x95Ue\x85\xbf\u007f\x83\x92W\x95V\x82\x84\x81\x8d\x84fg\x88\xc2m\x87\xbci\x89\xc3j\x8a\xc4[\x9aZ\x87\x89\x86q\x8c\xc1\x8a\x8b\x88\\\x9dc\x96\x8cnt\x8e\xc4v\x90\xc6g\xa0g}\x91\u008f\x91\x8ey\x93ɒ\x94\x91\x80\x95\xc6z\x97Ƃ\x96\xc7s\xa4l\xa1\x96x\x95\x97\x94\x83\x98ɂ\x9aė\x99\x96\u007f\x9d\xcct\xa9v\x86\x9b́\x9eΚ\x9c\x99\x82\xa0Ϩ\x9d\u007f\x9c\x9e\x9b\x88\xa0\xca\u007f\xabz\x8a\xa2̟\xa1\x9e\x9e\xa3\xa5\xa1\xa3\xa0\x8d\xa6Ђ\xb1\x85\xa3\xa5\xa2\xb3\xa7\x83\x91\xa9ԧ\xa9\xa6\x8d\xb5\x8a\x94\xac֙\xacѪ\xac\xa9\xa4\xac\xc0\x9e\xad͍\xb8\x93\x9b\xafԻ\xae\x89\x9d\xb1֯\xb1\xae\x97\xbb\x97\x9f\xb3ء\xb5\xdaµ\x90\xb4\xb6\xb3\xa3\xbf\x9d\xac\xb7Ң\xc0\xa4\xa9\xb9ٷ\xb9\xb6\xac\xbcܺ\xbc\xb9\xa6Ũ\xb1\xbd\u05ef\xbe\u07fd\xbf\xbc̿\x9a\xb1\xc0\xe1\xb8\xc0ձȭ\xc0¿\xb7\xc2ݹ\xc5\xe0\xbd\xc5ڲͷ\xc2\xc6ֻ\xc7\xe2\xd6ǝ\xc6\xc8ż\xc8\xe3\xbf\xca\xe5\xbdм\xc6\xcb\xdb\xca\xcc\xc8\xc1\xcc\xe7\xc2\xcd\xe9\xbf\xcf\xe2\xc7\xce\xe4\xca\xcf\xdf\xce\xd0\xcd\xc8\xd3\xc1\xc8\xd0\xe6\xdfѥ\xca\xd1\xe7\xcb\xd3\xe9\xca\xd8\xcc\xd3\xd5\xd1\xce\xd6\xeb\xd3\xd7\xe0\xd6\xd8\xd4\xd0\xd8\xed\xe7ج\xd5\xdb\xd0\xcb\xdb\xee\xd5\xd9\xe9\xd9\xdb\xd8\xd7\xdb\xeb\xd8\xdc\xec\xd2\xde\xec\xd5\xdf\xda\xd9\xdd\xed\xdc\xdd\xe7\xdd\xdf\xdc\xd7\xe1\xdb\xdb\xdf\xef\xd5\xe1\xef\xf0\xe0\xb3\xdd\xe1\xf1\xe0\xe2\xdf\xde\xe3\xe6\xd9\xe5\xf4\xe0\xe4\xf4\xe3\xe5\xe2\xde\xe6\xef\xe8\xe5\xea\xe5\xe7\xe4\xe6\xe7\xf1\xe0\xe9\xf1\xe3\xe9\xeb\xe7\xe9\xe6\xe3\xec\xf4\xeb\xed\xea\xe6\xee\xf7\xec\xed\xf7\xe8\xf0\xf9\xef\xf0\xfb\xf0\xf3\xef\xf4\xf2\xf6\xef\xf4\xf7\xf4\xf7\xf3\xf2\xf7\xfa\xf5\xfa\xfd\xf8\xfa\xf7\xfd\xfb\xff\xf7\xfd\xff\xf9\xfe\xff\xfe\xff\xfcA\x10\x8d\xd1\x00\x00 \x00IDATx^\xed\x9d\x0ft\x14U\xbe\xe7\awqv+\xfd^\xcc&O\x98\xe51\xd3@vaȆ\x82\x89M\"\x98`^\xc0\x13a} \b\x0e\x88\x99l\x1c=A\x98\xe1\xafg2\xcf3YI\x8eA\xf2@$\x98\xacsL\x00\xb3J\x88\x12\x91\x80\xae\xe6\x80ᨼ#\x90LD\x87\x93\x991\x83о\xc9L\xc4RQD\x12\xfb\xd4\xd9{oUu\xdd[\xa9\xbe71\xe9\xaa\xea\xee\xdf\xe7p\x92ە[\xb7nU}\xba\xeaVu\u007f\xa9\xef\xa9#@\x01\xe2\x9c\xef\x89\x14\xe0!j\x1c\x88u@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\xb8\xa7G_kMeM\x9b\xfe\xa2\xad\xaejG\v\xaf6\xe0\n\xee\xe9QW\xd5z\xaa\xa5\xb2\x05\x17{\x1bʛO\xb5\x94\xb7\v\xe6\x00\x1c\xc75=Z+\xbb\xd0\xcf\xf6\xca\x1e\xf4\xb3\xa1\xb2CQ\xbaʍC\t\xe0\x19\\ӣ\xae\x81\xfc\xaanQ\x94\x8e\xf2V\\\xec\xe1U\a\\\xc15=j\x1a\xb5_u\x8a\xd2\\\xd9+\xa8\f\xb8\x84kz4Uc'\x82U\xbb\xb0\"m5\xe5\xd5MA\xd1,\x80㸦GOU]W\xb0\xa3\xa6|\x87\xa2\xec(\xafn\xedh\xab\xde\x01\xc7\x10\xcf\xe1\x9a\x1e\xca\xf9\xba\xf2\xf2\xf2\xe6\xba\x1a4\f!\xe3Ӟ\xaaf\xd1,\x80Ӹ\xa7\a:\xb3\x9c\xefS\xaa\x9b\x14\xa5\xb1\x86\xbc\xd4\u007f\x01\x1e\xc2==ȩ\xa4\xbd\x1c]ҶT\xf5\xe1rC\x1d\u007f\x06\xc0y\\ӣ\xad\xbc\v\x9dP\xaa\xf1\xf5\xcbyraۣ\xdd\"\x03\xbc\x84kz\xb4\x97\xb7t\xb4Vב˕\x96\xca\x1644\xad\x81\xa1\xa9\xe7pM\x0f\xa5uWU]\xab^n\xaf\xa9\xda\xd5\x02vx\x0f\xf7\xf4\x00b\x00\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x14e\xcd\x1a\xbb\"\xa0\xb8\xa9G8D\xd9[]\xaeQ-\x9a%:\xfc\x9b\u007f\xa3M\x11\xb3Ǐȼ\xfb\xc4\xe0yF\x8f\x12\xb4\x88\xa9gE\xb5\xdc\xc2==\xc2!\xca`yK\a\xa2\xa5\xbcUq\x85\x92)\xef\xdb\x141=\xbf\xf5?qd\xcf\"\xff\x8b\x83g\x1a5\xce\x1e9\xb2\xc7\u007fDT\xcb-\\Ӄ\nQ\xb6ᯌ\x05\xf1\x97\x92\xdd\xe0\xacy\xc48\xcb\x1e<\x14\xe5\x041cѭJTy\r\xf4\x18\x04\x15\xa2\xd4^\xefr\xe9\xdbb\x91\x0f\x1e\x86\x1eO\xfa\xa3\x9b\xd0\x02=\x06C\x85(1\xe4\x9b\xc9npv\xf2F\x9b\xa2\x8e\xa6G\xc9LE\xf9\x85\u07ff\x17U\xf0ߎ\x8b\x93\xf7l\xbcu\xea݃\x06\f{\x17M\xbdu#2\xe9\xc4d\xbf\u007f\xa52\xd3\xef\x9fޫ\xf4\xac\x9c9y\xe6J4z\xe9˜\xfc\xeb\x993_\xdc8}Q\x10\xb7\xf0䚙\xd3W\xea-\x98z\x18-x\x06\xd7\xf4\xa0B\x94\x98]\r\xdc\xda\xd1c\xcd\xe4\xb36E\x9d\x13\xfe\x17\x82g7\xfa\x9fP\x94\xf7\x8fL~\f\xedȒ)h\xfc\xbaw\xb2?\xf3\xb1'\xa7\xae\xb4T.\xf1o|\xe1\xc9\xcc\xdb\xfb\x94\xbe\xd7\x1e\xf3\xbf\xa6\xfcֿ\x17Y\xf1\x82\u007f͋{W\xa2\x97ʋ\xd3\xfd\x1b\xef\xf6g>\x91\xf9$ia\xe6\x13\x8f͜\xaa\rz\xc3z\x84[\xf0\f\xae\xe9A\x85(\x11\xa7p\xde\xc5\r\xceN^cS48\x81/]\xfc%\xa4<\x05\xe9\xa1<6\x85\x14\xa7#\x8fJ2ٺ/\xf8\u007f\xab\xe0]\xbd\x17\xbf(\xb9\xe3\x8f3\x9f\xc0\x85\xe0^|0\xb8\x1d\xab\x94Y\x82\xea\xfc_\xa5\x04/e\xca-h\xcc\xf5\xe7\x99w\x909\r=\x98\x16\xbc\x81kzP!JD\xc3.A\xedh\xf1\v\xf3\x88\xf1\x8bA\a\x0f\xa4Ǔ\xaf\xbd\xb0h\n\x99N\xebQ\x12.\x9a\xac\xbc\xa5\xb7\x0f1\x93\xc8\x14\xbc=S?\xb8\xfcq\xcfݷL\xc7\xe7$%s/\xda\xf5Ae\xe3\xcfp\v\xe44\xb6\xc7\xffg\xfc\xcbЃi\xc1\x1b\xb8\xa7\x87\x19\xa2DT\xb5\xf0\xabF\x8b\xf7\xa7\xac\xb1)\x86!c\x8f?\xfb\xf7\xe02\xad\x87Y4\xb9ݯ\xa1i\xb1W\xdf\xe5\xafe\xceܸ\xf7\xc8\xddD\x8f\x17\x95\xd7&+\xba\x1e\xb8\x05刟\x9c]\f=\xd8\x16<\x81{z\x98!J\xfc?\x03\x9d\xe2W\x8e\x16\x1b\xfdgm\x8aa\xb4\xa1\xe9t\xb2/Ez\x94\xdcr\x82\xf0G\xfc\xe2\xfd\xcc\xc7f\x92\xc2\xedw\xe0\x93\xcbJC\x8f)\n{\xf4 \xff卡\aӂ7pM\x0f*D\x89\x87\x1e\xe7\x05գ\xc3\xfbSJl\x8a&\x9a\x1e\x99\x1bO\xa0q\xc4T\xb4G\xfb\ue22cNjژ\xe11<\xe4\xe8\xbd\xe31e\xcd\xddx\x889\x13\x1f\n\xfan\x1f\xa4G&\xb2&x\xcb\"2\xa7\xa1\a\xdd\x02\x1a\n=\xe1\x81{\xa9\xae\xe9A\x87(\x91+\xee\\\xcd\t\x0e\x1e\xf8\xca\x05\xfd\xbc{e\tڽ\x8b2\x9fx\xe2\x0e\xff\xe4ߞ@\x171%\xaf)'J&\x1fa\xef\x92l\xf4\xffl\xef\xde\x12\xb4\x8b\x83G\xd6d\x9eU\xceN\xdfx\xa4Wy̿r\xcf\x13\xb7\xa3\v\x96\xd7NL\u007f2\xb8w\xf2\x89\xe0\xcf\xf0\x15\xf1\x14\xff\xed{\xf7܊G\xb8\xe4\xae\xe9\x93G\x8e\x9c\xa5[\xc0\xac\xf4\xc2I\xc65=\x98\x10\xe5)wF\xa6\xefO-\xb1)\x9a\xecE\x03\x01\xf4V>qk&\xb2\xe4\xec\xa2)S\xef\xfe\xb5\u07fff\r\x9a:\xf9\xc4T\xf4\xd32Xy\xf1\xee\xcc\xe9\x8b^\xc0G\x01\xbf\u007f#\xda\xd7~t\xec\xe9{\xf2\xd6)\x99+\xf7\xdc:yQ\xa6\u07ffw\xaa\u007f\xea^2\xb6\x98\xb2\xb1d\xfa\xcc\x12\xacW\t=\xe00Z\xc0\xec\xc9ܣ\xb8\x8e{zx\x80_\xfb\xffͦ\xe8\x04\xda\xd0\xd4\xfb$\xb4\x1e\xee}\x92\x0fz\x00\x1c@\x0f \"\xda\xe06\x16\x00=\\\x80\fn=p\xd9*\x06\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x18\x16/\xad\xfaPQ\xceOK\x98\x87\x03\xb8\xa7\a\xf5$ʞ\xa6]\x95\xbb\x9a\xbc\xf7\xb0\xb0Wg\xc8\x1a\x81w\xb4\t\xb5r\xed\xa7\xe8\xd7\xe6\xa4u\xdc\xf9\xe2\a\xf7\xf40\x9fDy\xbe\xba\xa6\xad\xa3mW\xb5;\xdf\x18\xe3\xf0\xf1\xab\xf9\x0f\xbd\x8a8 \xbfB^?#\x1f\xd0\xfeP\x97\xf4\bg\xb68\xc25=\xa8\x10e#y\x0eT\xef\x0e\x97R\x94<\n\u007f\x85\u007f\xfeN\xd3\xe3wY\xbf\xe9\xeb\xeb\xeb\xc5\xdf\x11|\xc0\xe7R\xf0\xc2a\\Ӄ\nQ6h\xa7\xf2\x1a\xb7\x92P\x1c4=>}\xe6c\xf4\xb3\xfd\x1f\xfe\xd3?Κ4q\xe2\ndtϸ;\x05s\xc6\a\xae\xe9A\x85(\xcfW7v\xf5v5V;\x1f\xa3\xfc\xf4\xc0\xaa\xecſ\xc1\xfb^\xf9xӼ\xf9\xbf\xf9ͼ\xec\xe7\x99\n\x9a\x1e\x84^\xdf\u007f\xce\xc8\x18\x93\x9c\x91>\xe6\x81 :|$\xbb\xf3\xedX\x87qM\x0f:D\x19l(//opa{o\x92\u007f\xf3\xca3\xf9\xf7\xa0\xe1構\xf3\x9f\xa9\rd?\xf3\xd03L\x85\xc2M\x1f\u007f\xfc\xcc*R\f\xfe\x87u\xaa\xdavU\x1d\xb8a6\xf2\xb8IJ\x88'߹\xa6\a\x15\xa2\xecm\u0601\x86\xa6;\x1a\x1c\x8f\xe8\xbfD\x86\x9ao\xca\xe8\x88\xf1\xbc\xfc\x0e\x1ez\xbec\xa9Q\x88\xaf[\xf2I1\xf8\x0fcƌQ\xf2ƌ\xb9a\x1d\x1aCwH\xee|{\xdaa\\Ӄ\nQ6\xed\xc0\a\x0e\x17\x86\xa6\x9b\n?\xfd\x1bb\xfe&E\xd96W\xc1CЗ,5\n\x1fz\xf3\xcdM\x9a\x1e\xca\xff\xf9/\xff\x88\xf4\x18;g]{/\xd6c\x87\xb5\xb5x\xc4==\xcc\x10e\xa5\x96gh\xad\x14\xd4\x1fu\x96\xea\xb75\x1eB\a\x8e\x19h\x04\xf2\xca\xe0\xa3\a\x1a{\xbc\xa3\x9fo\xfe\xdf\xff\xf8_H\x8f\xa4\xd6.|\x94k\x96\x1c\x97\xd9\r\xdc\xd3\xc3\fQ\xba\xa6Ǧ\xc27\t\x1f\xe3\x03\xc7C\xbf{g\xf1\xaaO-5\xa8\xa1\xa9\xf2q\xe0\u007fb=\xdaI\xc7\xd7\xf9\xbcw\x17/\n\xb8\xa6\a\x15\xa2l '\x97\xe0\x0e\xc7/l_\x91\xc9uʶZ<\x00)\x90\xe5\xa2\x0f\xf5?\x9cZ\u05ee\x15h=\x94\xf5\xff-\xacG\xdf\xc4YJ\"\xe0\x9a\x1eT\x882\xb8\x83\fMw8\u007f\xe9\xb2mƦ\xe7_ڄ%y3\xf0\xca+\xaf~h\x1c<fKd\uf4fb\xa6\x1f\x87k\xff\uefc6\xf5\xd8,\xb5\fn-\x0eqM\x0f:D\xd9ۼ\xab\xaa\xa6\xd9\xf1\v\x17\xc4+E\xf3\xe6\x16\xe1[\xa2\xaff\xe1AHV\x916\xf8\xa8J+ǿ\xc8g.ԍ\x90\xf0ɥ)y\x85]k\xf1\x87{zx\x8a\x0f\xb3\u007f\xf5\xe1\xdf\xfe\xf6\xf1\x9bks̓\xc5`\xfeU\xd7c\x87\xefN7\\v\x01Ѓ\xf0\xd2\\\xed\xbc\xf2\xe9\xbcW8\xb5vhz\x9c\x1f\x97(\x1f\u0602\x1e\x1aoꗴ\xef\f\xba\xb4\xd5!\x17\xc0x\xec\xf1\x1f\xff{\x82\x1c8\b\xa0\a\xe1\xd3Mٿz\xfe\xd5\xe7\u007f\x95]f\xbd\xb4\xd5\x01=\x86\x8f\xa8\xf1\x18\xe2ӗ\x1e\xca\xcf\xca\u007f\xe8\xa5\bvh\xec0\xef{$\b\xa0\xc70\x00=\x86\x85\xa8\xf1x\x03\xf4\x18\x16\xa2\xc6\xe3\x8b\xdeGoCzܸ\xba)\x81\xfc\x00=\x86\xcc4\xe3\x03}\xb7\x1e\x0e\xe0\x02\xa0\xc7P\t\x8e]\xa7\xaaWUu`\xec\x1c\xcf}g:j\x80\x1eC%(I\x19\x19c\xd32\xd2\xc7\xdc\xe9\xfc\xb7\x1e\xdd\x02\xf4\x18*\xbdM\xe3RS'\xa4\xa6\xa6f\xb48\xff١[\x80\x1eC\xa6\xb7\xa3\xbd\xbd\xfd\x14\xfa\x97\x10\xdf\xf4\xd0\x00=\x86\x01θh9\x97D\xc1==\xa8\x10%U\x04<\x85{z\x98!J\xba\xe8\t\x1a[D5\x12\x05\xd7\xf4\xa0B\x94T\xd1\x1b\xa4\xe7\x89j\xe8\x8c\x19}D\x8bt\x16\xd7\xf4\xa0B\x94ևR\xbaN\xfam\xa2\x1a:c.\x8e6\xa0\x87\x06\x15\xa2\xb4<\x94\xd21Z\x93$\xe9\x81\xf6\x05\xe3\x93g\xe1۠\xd5Ӓ'\xe0\xf8l\x9d\xa4\x91\xae(K\xa4\xa4j\xe5\x94O\x9a\xc8\xd4ES˗MH\x9e\xd5\x01z\xf0\x115\u0383\nQZ\x1eJ\xe9\x18\xc1\x1d\xd5\xe3'\xa4\x8c[\x96'\x9dR\x94;\x93\x96\xd5=\x92\x96ާ\xf445N\xc8hllDC\xe5\x8eƤ\x87\x15\xa5y\x81\x8f\xa9\xdbV\x9d$\xa5=\xbc9e\x0e\xe8\xc1G\xd48\x0f*D\xc9>\x94\xd2Qҥ\f\x9c\xb7\xc7nj*\x05\x87\x9bH\x1f̓\x8b\x0f\xe9\xa1<\xecc\xeb*\xbeTt\xe4X\x90\x06z\xf0\x115΅z\x12%\xf3PJGI\xf7\xe9\x0f\xb1\xcb\x1bߋ\xd1\xfe_\x86\bz\x18u\x15\xdf\x02}\xea\xf0\xf5\x18C\xfeq\xfe\xaex\n\xf7\xf4`\x9eDI\x15\x1d%=]/L\xd2G\x1cs\xc8T{=\x8c\xba\xe6T\xbc\xa7\x9f\xbaI\xdb\xdfڅ\xc7X\xaa`\xbb\xfbA\x8f\xa1A=\x89\x92~(\xa5\xb3\x84E\xc8\x1b\xdfB\xe8\nO\xad\xc4\xc7\n\"\xc2\x03>\xb6.\xab\xc7\xcdOQ\xfb\xfb'\xf7Z\v\x16@\x8f\xa1A\x85(\x99\x87R:Kx\x977h\xa3\x8e\xfbID!#CQ\xbaȄ\xe4Պҗ\xceՃ\xde\xdf/\xdfx\xceR\xb8\xf8\xf8Mcn\xfc%\x9a\xf0\xa3\xb17\xfc\xe8ݰ\x1e\x8f\xff\xfd\x98\xef\xff\xf3E\xaa\x80\xfe>\xe6\xa6\u007f\x01=\f\xa8\x10%\xf3PJ\a\xe9m&\xd7(ڈb\xb5\x94\xb7\xab\xe6N\xa9\x1a\x97\x1f\xf6m\xae\xc9H\xc6\a\xb3ii\xeb\xd6M\x93\x92\xaaڨ\xba\xe8zfA\xb3Ҳ \xa9\xb1êǏ\xef\xb5\x16\x1e\x1f\xfb\xf8\xb9\x97\u007f|\xf1\xe2\xdf=u\xeeݟ\xfc\xd8\xd0\xe3ٿ{\xf6\xdc\xcb?\xf8g\xaapӽ\xef\x9e{\xf6\x87\xa0G\x18*DI?\x94\xd2A\xf0\xbd\f\x84\x1e\xa6n\xc8HM\xcd\xd0n\xbd\x04\x97\xa5&g\x90\xff\xfd\xa7=#9e\xd6\xfd\x92\xb4\x84\xaa\xbb\x04\xfdNjKF?\x97X\xf4\xb09x\xe0#\x82\xc1\xbb7\x1az\xdc\xfc\x1cz\xf9\xc6\xf7\xa9\xc2\rohu@\x8f8¢Ǐ~n-\\\x1c\xf3\xae\xf6\xfb\x8d\x1f\x8eE\xe3UC\x8f\xb1\xda\xf0\x95*\xfc\xd3؟\xfc\xf2\r\xd0#\xbe`\xf5x\xce8f\x84\vh\xff\xebz\xdc\xfcOo\\<\x17\xd6c\xcc\x1b\x86=F\xe1\xe2s\xf7\xfe\xe8\x86{A\x8f\xb8\x82\xd5\xe3\a\xbf\xb4\x16\x90\x16\xfa\xc9\xe5\x06$̳a=n6\x8e.\xe1\x02\xe6\xe5\x1b@\x8f\xb8\x82\xd1\xe3\xd9\xef_\xb4\x14\x10Oݨ\rMo\xba\xf7\xdcs\xdf\x0f\xeb\xf1\xd4\xd8_\xbe{\xee\xa9\x1fP\x85\x1f<~\xee\xdc\xcfo\x02=\xe2\n,\x86>x@G\x02\xe3\x98q\xb3y\xf0\xb8x\xf1_\xfe\x9e\\\xd8>\x87\xaeo\u007f\x1e\xd6\xe3\xe2S7\xdf0\xe6槨\xc2\xe37\x8f\x19\xfb×A\x8f\xb8\"<(\x1d5@\x8f8\x02\xf4\xe0!j<\xee\x01=x\x88\x1a\x8f{@\x0f\x1e\xa2\xc6\xe3\x1eЃ\x87\xa8\xf1\xb8g\xcc\xe8#Z\xa4\xb3\x80\x1e\x00\x87\x98\xd0#OJ]\x00))7\x88\t=:\x1a\xab&\xa6z&\x05\x93H8\xafG\xa3q\x1c訩j\xe8\x18T\x8c@\xa3\xe4\xc2'\xfe\x80\xe3zt\x95\xb7h\x85\x8e\xca\xc6\xf6\xc6\xca\x0eK1\x12͉\xf1\xf4%\xaf\xe1\xb4\x1e\x1d;t=\xfa\xc87\x8f\x9b\xaa\xfb\x98bD@\x0fWpX\x8f\xc6\xf2F=j\xddVI\x1e\xc6P\xd9\xc6\x14#\x02z\xb8\x82\xc3z\x04\x83F\x94\xb6A\xfb\xde^]#S\x8cH\xab\xe4\xc67\x95\x13\x1e\x87\xf5P\xc2I\xeb\x1a-\xd5\xd2T\xc3\x14#қ:\xad\xa9#\x91\xfe\xe3\x15o\xe0\x9a\x1e\xfa\xaf\x96j\xa6\x18\x19\x9c\x8c\x9eͫ\x00D\x01\xd7\xf4\xd0c\xf9\x8d5L1\"=i\xe3\x1fi8\xa5\x00\xce\xe2\x9a\x1e\xfa\x80\x03?\x19\x9d*F\xa4Yr\xfcIs\x80\x8bz\xb4\x95\xe3۠=\xe5mL1\"p\xe5\xe2\n\xae\xe9\xd1GB\x93\x8d\xda}\x8fp1\"\xa0\x87+8\xacG\xb0\xa3\xa3\xaa\xb1\x83\xe4\x9c\xe1\xaei\f\xe0\xb0\x1e-\xe5\x04\xf2\xf1ZGCe\x8d\xf1\x99\x8bY\xb4\xa3\xb7\xa3%\xcf\xe7B~\x1fpX\x8f\xef\xc6\x1cI\x1a\xef\xc2\xff\r\x03Ć\x1e\x1d\xadp\xe8p\x87\x98\xd0\x03p\v\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x83\xf3z\u0605(\xa9\xa9\x80\x97p\\\x0f\xbb\x10%5\x15\xf0\x14N\xeba\x17\xa2\xa4\xa6\x02\xde\xc2a=lC\x94\xd4T\xc0[8\xac\x87m\x88\x92\x9a\nx\v\x87\xf5P\xecB\x94\xd4T\xc0[\xb8\xa6\x87%9\tzx\x12\xd7\xf4\xb0$'A\x0fO\xe2\x9a\x1e\x96\xe4$\xe8\xe1I\\\xd3Ò\x9c\x04=<\x89kzX\x92\x93\xa0\x87'qX\x0f\xfb\x10%5\x15\xf0\x14\x0e\xeba\x1f\xa2\xa4\xa7\x02^\xc2a=\x80\xd8\x02\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\xc3\xf7\xee\a\x80\x88\x8c\xe8\xe8\x01\xc4;\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0eC\xd1#\xb8.=%)\xed\xb6\xa6\xc1\u007fyT\xbaS\xff1\x02\x066\x8f\xf7\x8dk\b\xbf\f\x0e\xa0\x1f\xd5\xd2mf\x85]Ҝ\xc1sQ<\"-\xe3\xfe]@\xc4\xe6-\x1d\x13@\xfa-ꪀQٞ\xa3\xc9\x10\xf4\xa8J\x924f]\xb5\xfeiTVg3n\xbb\xc5x\xf5h2^\x8a'\xf4`;&@뷨\xab\x02Fe{\x8e&b=VHҜV囮\a|Rƀ\xe5o\xa3\xb2:\x93\xa4\x15\xdf\f\x18-\x0fH\xd2 =:\x1em\xb4\x9b/\xcc\b\xf5\x88\xd8<\xd31\x01z\xbfE]\x150*\xdbs4\x11\xea\xd1(I;\xb4R\xab$UY\xfe8*\xab3Nj7_\xd8\xe9!b\x84zD\x84\xe9\x98\x00\xbd\xdf#dT\xb6\xe7h\"\xd2c \xcd\xdc\xf6ˤ\U00056fce\xca\xea\xa4I\x1d\xe6\v/\xe9\xc1tL@\x82\xea\xd1,IA\xa3|\xfeQ\xf2nj\xce\x1b\xe7K\x9e\xf8\x80\xa2\xb2\xab\x13\\1ޗ:\xa7U\xabJ\xbf\xe8Y2>)eZ\x15s\x94\xeeZ2.)u\x0e>\xafO#\xc3\x1ac\xff\xae&\xaf:\xb0\x1eʊq\xbe\xf1\x0f\x98't\xbbf\xdaf\xa7\xa6\xccj\xc7zTK\x13\xb5I\x9bɋG>'s\u007fN&Q\x1d\xae\x96\x1e\xed]\x92曄\x06\x9c\xd5\x13}i+\xa8\xf1B\xcfj\xdc\xe5\xb6p\xdbFnj\xbd\xf5\x88\xb4D\xb5\xb6\x1c\x9e\xc7\xe8\xb7ޖ\xb9z\xd69t\xe8\x85\xd9oω\xd2j\xd5}Dz< M\xb0LY&I\xe3&\xa5\xa1\x1f\x9f3\xabӚ,\xf9&\x8d\x97\xa4u\xaa\xe5EW\x8a\x94\x9a>\x01\rl\xa96꒤\x94t\xd4\x06\xda\x02\xeb\xf2|Ҭ\xbc]\xfa\x1fj\xf2$鶼 ڨh\x11i\xa9\x924q@\xdf\u007fv͔KR\xda$_R\x06ډ\x9f'I]d\xda\x04\xa9\rͽb\x9c\x94\x82\xe7\xfe\xc6\xd2\xe1jiY\xaa\x94擤\x86%\x92\x0fM\xcbP\r=\x9a\x92\xb5.\x85\xafό\x8eY\xf4\xa0[6\xe71\xfa\xad\xb5E\xad\x9ee\x0e\x1dza\x11\xb6gl\xe81[Z\xc0Nh\x96\x92\xf1A\xa1-Ez\x94^\x9d`\x8a\xb4\x1a\xad\u007f[\xaa\xd4`y1Gz\x00\xed\xe2S)\xe6\x86WO%I\xebд\x06\x9fT\xadF:\xb9H\xe3ѡ\xaa9I\xaa\xd1\xf7\x9f]3\x92\x84\xb4\xfa|\x169\xf8ܦ\x89y\n\x9f\x00\xd1\xdc\x13\xd0;\xb3ɇ\xff\xcet\x18\xfdeb\x97:\x90'\xf9|u\x03j\x83$\x9dқ\xefM\xc1\xed\x0fl\x96|\xe6\xbb\\\xeb\x98E\x0f\xaaez\x1e\xbdߤ-f\xf5\x989t\xe8\x19#lO\xb5\xae\xdc<\x90\xb9\x87H\x8fiV\x89WK\x0f뿗ѫ\xb3Z\x9aM&\xd7\xe1\xa3\r\xf3b\xbc\xb6\xf7+\xf3\x9a\xc3mܦo\xf1]R\xea@D=\xc8\xc1`\t^\n\xd9\xe66\xcd,\xd0\xfav\x95\f\x8f\x9a\xb4\x81\xd1\xfd\xd8\x124\xf7ym\xee%\x96\x0e\xeb\xedvI\xd2f<m\x1a\xdeg\xa4\xf9\x87\xf5\xc3R\x06\xb5\x17\xed\xf50[\xa6\xe7\xa1\xf5`V\x8f\x99C\x87\x9e1\xc2\xf6\xf4\b\"=fI+,S\xf4K\xbd\xcd\xe15!?\xc6I\xda\x15\xdd7IR\x0f\xfbb\x964\xad\x8d\xbd:\x1cH\xd6/\t\x06RЙ \x82\x1e\xdaP\xa2\x12\x0fQ\xc96\x1f܌\x9a\x82\xdf\xfb\xaa\xbeeQ[\xedd$}\x9e\x9e;Oe;\\\xad\x9d+\xbf\x91\xb4e\xe6I\x95z\xf3\x13%\xed\xfeWo\xafپ\xad\x1eT\xcb\xf4<\x94\x1e\xec\xea\xb1}\xd1`\x16f\xbf==\x82H\x8f;\xa9\xb5\xd2\x19h۵.\x0f\r,\x16P\xabsU\x92&M#$I-\xcc\v\xb5\r\x9d\xe9S\xf2j\xa8\x91YP\x92\xf4\xf3p\x06>w\xd8\xeb\xa1\x1d\u007fj\xf0o\xb2\xff\x067\xf3\xb9\xd1L\r\x19ٮ\xc0ǒ\x16)\x9d\x9a[\x1f(R\x1d\xae\xd6\u07b7h)x$\x88\x8e?\xe5z-\x9f>t\xa1\xb1Ճj\x99\x9e\x87҃]=K_\b\xec\xc2춧W\x10鱙\x1e\x9a\xb6\xe2-P\x99\x86\a铦1\xab\xa3H&\r\xcc\vt$_\x90\x8c\nI\xcb\xc2C\xb3\x0e)I/\xcd\xc6wRx\x17\xb6\xa6\x1e\x83\x9b\xe9\x91$\xad\xd0H\xf4h\x97\xd2\x06\x90\xcd\xd5\xd4\xdcڌt\x87\xf5\xbf\f\xd2\x03\x1dN\xa8Æ\x8e\xad\x1ef\xcb\xcc<\x94\x1e\xec\xea\xb1}!\xb0\v\xb3ݞ^A\xa4G\a\xb5*=RR;\xbeӼ\xa4\xee\xd4U\xf4\xdbr\xf48\x1f\x9e\x87y\x81\x19h[7I2W\xba'\xfc\xf6\x9a\x16\xf9\xe81H\x8fA\xcd|n\xdcj\xa8Ӯ\x8b'H\xad\x03\xc9I\x9f\xab\x16=\x98\x0eG\xd2C\x95\x84G\x8fuV=\x98y(=\xd8ճу\x99\xd1~{z\x05\x91\x1ehH\x18\xbe\xe7\xb4\x1a\r\xb5\xd0\xf9T\x1b\xbb\xad`W'M?\x9d\xaam=\x03신6\x02\xaf\x96\x92\x8c\xa1Ào\bc\x0f\xab\x1e\x83\x9bQS\xf5f\xd6i]\xdc,\xadn\xd1\xf6\x01\xbdK\xd8\x0eG\xd4c\x82>\\j\x98Ui4\xafw\xac\\?\xbd.\x19\xa4\a=\x0f\xa5\a\xbbzvzP3Fڞ\x1eA\xa8G\x8d$\xd5i\xa5&\t]{)\xba\xf9W\xc7\xe1\xadf\xae\xce\x12)\x9d\xec\xb6f|\xb1F\xbfP\xf4=\xd1E\xedWch_#\xa5|3D=\xec\x9a\xd1/\x06\x06t\x83\x83\xd2\xf8՚\x97\xf4.a;\x1cQ\x8f\xd5\xfaޛ\xad]\xd2\x10\xb4\x8e\xd5i\xa7Wt}dՃ\x9e\x87҃]=;=\xa8\x19#mO\x8f \xd4C\x9d\x83\x06MmW\a\xba\xee\x97\xf0Gr\xc8v|5\xd97K\xc2;\xce\\\x9d.\x9f\xb4\fm\x9f\xf6T|\xa5ü\x98%\xcdB\xbb\xe2j\x1euC\xebT\x92\xb4\x19\xed\xe4\xc6d|\xe1`\xb9w\x9d$5|3`s\xf4\xb0i\xa6\xc7'=:\x80'\xe9\a\xb8\f)9\x85\x1c\xd6-G\x0f\xaa\xc3\x11\xf5\xe8I\xc6]\x1axDJV\xc2\xedk\x1dC\xe7\n\xf4\x97\x9e\fi\x90\x1e\xcc<Z\xbf\xc9tf\xf5\xec\xf4\xa0f\x8c\xb4=c\xe4\xbe\a\x1aH-0\x86\x99\xb3\xc9\xc8T\x92\xc6\xcfNOJyX\x9aĬN\xa3O\xf2Ớ\xe4S]\xfaE0U\xf2M\x9c\x94,\xa5\xf5\x98m\x92ۊ\xe3$\xed\xa2\x99\xd5#]\xc2\x1f\xa2ۜ\\l\x9aiH\x92\xd2ғ\xa5\xdbt=j\fO\x98]\xc2t8\xa2\x1e\xf8\xbeUJz\xaa\x94D}\xabE\xef\xd8\x12t\xc94NJ\xde<H\x0ff\x1e\xad\xdf\xdatz\xf5\xec\xf4\xa0g\x8c\xb4=c\xe3\xae)\xa6m\xc9\x04_\xd28\xe3~TsF\x9ao\xe2ß_\xf5\xa11+}0\xecY6ޗ\x9c^\xa9\x1d\xfa\xe9\x17\xc1\x15\x13|x\x0e\xbaɎ;\xc7\xf9\xd2nӾK\xc1\xeaѕ\xe1K\xa9\xb3\xd1þ\x99\xbc\xb4\xe4i\xcd\r\xba\x15\xa8K\xda;\x8e\xdd%t\x87#\xebA>'I[@wE\xef\xd8@\xf5$_j\xde\xf9\xd6\xc1z\xd0\xf3h\xfd֧S\xabg\xab\a=c\x84\xed\x19;z\xc4\n\xc1A\x9f(\x03#$\x9e\xf4\xd8L\r+\x81Q!n\xf48\xdf\xdb\xe0\xf3\x99\xc3J`T\x88\x1b=\xf0\x00\x1a\x0e\x1e\xa3M\xdc\xe8Q\x99\x9c\x06v\x8c:q\xa3\a\x10\r@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c\xdcУ\xa2BT\x03\xf0\b#\xd5c\x9b,\x1f\xa3^\x9e\xce?\x19\xb1\xaa\xc1_\xe5ݢ*\xa3\xc1\xdb3d\x8d\xfc\x90\xa8*C\x05\x9a%\xfb\xb2\xa8V\x820R=\xaetf\xd5S/O\xe6\x1c\x8fX\u0560,p\x05\xff:\xf3'QE\x13a]\x9b\n\xfd\xefeUt\"v\xcb_\xd9\xcc\x10\x99+\x9d\x9d\a\xe5ߋj%\b#\xd5CU\x03\xb4\x1e\xaa\xf8\x9dzy\xc6N\xf2\xbb\xa8LP\x91BX\u05f6\x82ֳ\xa3\xf25\x9b\xbfq\xe9\x06=tF[\x0f1[\x03_\x92\xdf\xf7\x89v9\x85\xb0\xaem\x05\xadg\x97w\x8a\x95\xb5\x00z\x18\x88\xf4\xb8^V\x98U\xb8\xe1\x02*]Ȓ\xe5\xda\xcbe\v\xb3\xd7~\x8b^]\xdeR\x90\x95\xbf\x1e\x9f%\x02\xbbw.\xcd^\x8bKײe}$\xf2:*ԫ\xf5\xe8\xe7\xeb\xe8\x80r\xb48g\xe9\xce~\xbd\xc1ϲ\xb6\xa3\x9f'\xf5q\xc1*\xce\"\f\xe8\xbatc\x9dk\v\xb3\n\xd6/\f\xb1\x15(\xc2\xe2\xfe\x05\xb5\xbb!T(˹!si\xdf\x16d=]Xxf{n\xe9u4\x82\xca:XQ\x98\xbbA\x1fr\x84\xf5`\xbb\x9e\x80\x88\xf48)W\x9cy}\x83܍\xce\xe5\xaf\x1f[\xb88\xa7pgٌ/й>g\xd5\xfe\xd3\xf5\xf2\x01T# /=v\xbc`\v\xae\xdc\xdd٩\xed\x92\xeb\x9dsk\xbfR\xbf\xaa\xcd\xed\xbc\x8e\xc7z\xdb\xdf:\x98\u007f\x9f\xfe\x1e\xae\xc8\xc2&\xf5\xbf\u05f9\xf8A40\xf8k\xe4E\x84\xa1\xebR\x8d\xfda\xc6\xd6\xe3\xa7\x0f\x15\xc8߲\x15(\x02\xb5\xfd\xfde\xf8L\x16\xfa\xa0^\xfe@=:\xe3\xe8G\xf4\xd2\xce̕w\x96\xca\xf3\xf6\x15\x1cP\xffr,K^\xb8\xaf~a\xf6%2cX\x0f\xb6\xeb\t\x88H\x8f\xfech\a\x87\x96o /\xee\x93\xd1;-\x84&\xf4\x17\xaeE\x9b,\xf4:>\xab\a\xf2\xbfF\xdb1_\xaf\x9f\xad\xbfc+\xf0Ѿl\xab\x8a\xf7\xc7Q\x15oq\xed\x02糬mz\xcd\xf0\xf9\xc0~\x11\f\xe1\xbaTc\a\xf3\xf1!\xe6`n\x88\xa9@\x13\xc0\x87\x94\xf5\xa4\x18\xdaZt\xadp\x1f.QK\x9b_\xa6\xbe%\x9fT\xb7\xe2\xeb\xec\xc0B4\xf9Za\x11\xa9m\xe8\xc1v=\x11\x11\xe9\xa1^;\xb8\xf6\xae\xb9\xf2rR\xbe/\xa0\xbf\xabߖ?\nW\b\xe0\xad[\x1f\xd0_\x19z\x9c\xc9\xeeW\xfb\xb3;Q\xa9\xec\xaeз\x88B\xedfǶ\xac\xcf\xf4\x9a\xe6\x1e\xb5]\x04C\xb8.\xd5\xd8\x17\x85\v\xb7\x1f\xfa(\x14b+\xd0\x04*\xba\xbbu\xeb\xd4\xfe\x9f\x16\xacת\x9aK\x9b\u007f\f\xed\xfa~u7\x9e7@.\xb6\x0fj\xc3XC\x0f\xb6뉈H\x8f\xee\xfc\xc2\xdd\xc7;K\xf5}W\xa4O= \x9b\xe7cr:\x19\xa4Ƿ\x05\xc7\xd5\xe3\x05x\x87,\xd7G\x06d?]\tl5\xe6\v\xefQ\xfbE0\x84\xebҍ];T\xb6T.\xd8\xcf9z\xa0\xbe\xbc}Z\u007fq\\~\x8f\xfc\xa6\x966\xff\xb4ڝ\xa5\xeaz\x90~w\xca\xe4\x02\xd9Ѓ\xe9zB\"\xd2ci\x11\x16a\x8b\xbe\xef\xb6\xe8SO\xcb\xe6}\x06{=\xd4\xed\x1b\xd4-x\x10\x8aނ\u007f\"\x90\xf7\xe5N\xd98xh{\xf4\xf0\x17\x91\x16\xc1\x10\xaeK5ֽ\x1b\x89q\xedX\xf6A\xa6\x02\x8d>4\xbd\x80\x97|e~\xed¯\xf1+jiX\x8f\x80\xa1\a\xb9\xda>$\x93Ӛy\xf4\xa0\xba\x9e\x90\x88\xf4(Ļ+\xf4S}\xdf\x19\xef\xd1\xeb\xf3K\xf1\x9bv;ަ\x11\xf4\xf8 \xf0e\xe0\x03\\8\xad\x9d\xbak\xf1\x99\xffK\xf3ࡖ\x96\xa2\x9d\x86\xfff\xbf\b\x86p]\xaa\xb1z\x99\x1c\x18J+\x98\n\x88\xcf\xf6\xe9\n\xeaz\xccG\xe7\x8dPQ\xadZA\xfaL-\x8dѣ\x00\x0f\xa9\xee*%s\x18z\xd0]OLDz\xd4\xcbe\a\xf7݇\x8e\xe1\xdd\xdf~@\xae\x0f\xb4M\u007f&pϡ\xb7\xb7ˇ\xd5/;\xb3*\xbaC\x1fUdu~\xa9\x86~\x8f\xae\\*:;\xc9;0T\xb8\xb6P;\xd9\xef\x9eQv\xfcx\x05\x19\xe5\xed\x9caޭ\xae\x0f\x1c8^\x9a\xf3E\xc4E0\xbd0\xeaR\x8d\xd5\xcb9\xb5'Q\xf1\f[AU7h\xc3Q\xe3\xaei\xe7ܝ\xfd\xefm˿\xa2~6w\xfb{!ji\u007f\xc9=\xd0\u007f,\xebB\u007fY\xe9\x15<\x8c]u\xec\xf0\xe2\xdcOИ\x06\xdf5=\xd0\xd9\xc9.-A\x11\xe9\x11:\xb08\x90_vxqV\xe9\x05\xed<\xac]\t\xa8\x9f\x94\x15\xe6\x14\x1d'\x9f\xb9\xc8Y\xff\x9e\x83~nS\xff\xa0\x9f\xaa\x0f\x91\x1a\a\x02\a\xf46N\x97\xce\xcb-~[\xc57F\xa8cCh{n\xf6\x83ݜEP\x84\xebR\x8d\x1d}\xb0\xbe0k~\xe9\x19k\x05\xf5p>\xe9\xc0۲\xc1\x81\xd3\xe8\xc7Nu\xbb,\xcf8c.\xad\xb8@\x96\x8f\xe5\xc89\xc7\xc8\xd8\"\xb0\xb3bna\x19\xbea\xb7U\x9f\xab\x8cYZ\x82\"\xd2cTyZ\xb6ޚ\xf0\fý\xf7\x9b 8\xaa\xc7\xd6a\\!\xf6\u007f\xa6\xe1\xd0-K\xd0\xc3\x16G\xf5\x18\x0e\x0f\xea\xc7\xf8\aE\x15G\a\xd0\xc3\x16\xcf\xea\xf1\xc9I\x8dOD\x15G\x83+d\x80-\xaa\x95\x80xV\x0fG!\x03\xec\xc1\x17L\x00\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01ppC\x0f\xc8\xd8\xc6\f#\xd5ct2\xb6C\x99m\xb8\x8cj\xc6\x16M\xc4\xdf^9 \xcbV\xb5\xa3\xd1u\xef0R=\xbe{ƖF4\x9b\xeb\x19\xdb/r\xf6\xe3/\x9c^۟c\xfd\"\xbd\xd9ua'c\x90\x91\xea\xf1\xdd3\xb6\f\x82\xd9\xdc\xcf\xd8.?L~\x1d^>\xa8r\xb8\xeb\xc2N\xc6 \xa3\xad\x87\x18#c;\x1c\xdc\xcf\xd8n\xa9%\xbfjm\xbfH\xaf!\xecd\f\"\xd2#J\x19[u\xa9>0(\xa6g\xb3D]u<\x91\xb1ݭ\xed\xfb\xb2\xdd\xccv0\xbbn\xdfI\xfb\xd0p\f!\xd2#J\x19[5@\xc6\x05E\xf2~z6K\xd4U\xc7\x13\x19\xdb\xc3Ejw\xe1\xef\xd5\xfb\x0e\xb1\xdb!\xdcu\xfbNڇ\x86c\b\x91\x1e\xd1\xca\xd8֣q\\\xa8B>h\x99\x8d\x89\xba\x9a\xb8\x9f\xb1\xed,Pwg\xedV\vp,\x94\r\x02\x87\x93=v\x9d\x8c\x14\x1a\x8e\x15DzD/c\xab\x86\xcaf\x84\x03$a=訫\x89\xfb\x19\xdb/\xe4\xfe\a\xb7\x16_\xd7B~L\x10x\xb0\x1e\xcc\x1aۇ\x86c\x05\x91\x1e\xd1\xcb\xd8\xf6\xaf\xcf2\xaff\xc3z\x90ߝ\xb2\xe5\x1a\xd1\xfd\x8cm(p)\xe7O9\x97\xb2\xb4\xa5\x15QK\x19\xac\a\xb3\xc6LݘC\xa4G\xd42\xb6\xd7\x1f\fP\xf1\xa2\xb0\x1et\xd4\xd5\xc4\x03\x19\xdb\xc5\xfb\v\xd5\xc2\x03\x8b\xc9t&\b\xcc\xeaa\xe9d\xa4\xd0p\xac \xd2#Z\x19\xdbkE\xe4\xccs\xb2\x94\x9d\x8d\x89\xba\x9ax c\xbb\xbex\x8b\xba\xa5x-\x99\xce\x1c\xab\xc2kl\xd7\xc9X\xbf\xdc\x15\xe9\x11\xa5\x8c\xed\xb5\xe5\xf2>|\xe9\xb2\x15\xed\x1ez63\xea\xca\xf6\xc2\xfd\x8c\xed\xce\x19\xfb\xd5\xfd3\xd0\xf1\x90\xde\x0e\xcc\x1a\xdbt2bh8V\x10\xe9\x11\xa5\x8c\xedGYz݅*3\x9b\x19ue\xf0@\xc6\xf6\xad\xec\v\xea%|\x03\x9d\xde\x0e\xcc\x1a\xdbt2bh8V\x10\xe91\xaa\x883\xb6ý\x05;j\xb8\xb6`o\xe3\xa8\x1e⌭\xb9\x97 c\xeb\x05\x1c\xd5C\x8c\xb9\x97 c\xeb\x05<\xa5\a\x1du\x85\x8c\xad\x17\xf0\x94\x1e\xaeE]][\xb0\xd7\xf1\x94\x1e\x80\xd7\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01ppC\x0f\xc8\xd8\xc6\f#\xd5#A2\xb6\x87qC\x05k\xcd/`\xdb\xf2Y\x96\xbc\x94_#\xd6\x18\xa9\x1e\t\x92\xb1\xbd~T\xde\xd7y\xb8x\xc6\x19\xdbY\fB\xdd\x15\x015\xae\x18\xa9\x1e֏\xc2\xc5\xef\xd4\xd8\xcc\xd8^\xc2\xdfl\r\x15/\xb6\xabNQ\x0fzX\x18\xee7%b3cK\xf4P\x0fʂo'%\x9a\x1e\x90\xb1Ֆ\xa6\xe9QV\xc8N5\xb7\x0e:)\x95\x15\xe6n\xd1N.\x90\xb1M\xb4\x8c\xed%\xf9\xad\xfe\xbf\xee\x96\xf7\xb1S\xcd\xc6\xd4\xcbs\x97\x1e>\xbeV\x0e0\x15 c\x9b \x19\xdbK\xe4\xf8T\x16b\xa7R\x8d\x15/\xee\xc7ŀjYc\xc8ت\t\x90\xb1\xbd$\xef\xef>Y\x9c\xfd\x19;\xd5l\xec\x9a\x16f\xa8\rX*@\xc6\x16\xefٸ\xcfؒ\xb1\x87\xe6\x005\xd5l\xac[&\xd9}\xb2\x1d c\x9bp\x19[mh:\xb7\x96\x9dj6\xf6\xb5v\x9e\xdc\x1aP-k\f\x19[5\x012\xb6\x9a\x1e\xf9;/죧R\x8d\x15\x15\"\x1b>\t\x04\xd8نpM\xeeiDz@\xc6V[\xda\x05\x19\x1f\xebJ\xd7W,g\xfb`4\xa6^\xca.\xac\xaf͕\xb3\x8e\xfe\x052\xb6\t\x97\xb1E\x95\xf05\xf8\x85\xc5\x05'\xe9>\x98[\a]\xd9n\xc8]\xb8\xfbh\x96\xbc\x8d\xaa\x00\x19\xdb\xe1\x00\x19\xdbX\xc3Q= c\x1bk8\xaa>o5\x06\x00\x00\t\x1cIDAT\x87\x18\xc8\xd8z\vO\xe9\x01\x19[\xaf\xe1)=\\\x8b\xba\xba\xb6`\xaf\xe3)=\x00\xaf\x01z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c\x04zX\"\xb4\x14_W\x14d\xeb_\xee\xf5|B6Q\x9fB;r\x04zX\"\xb4\x14\xa5\xf9\x87\xb6fk_(\xf7|B6Q\x9fB;r\x84'\x97\b\x9ft_\x93\x0f\x9a\xe9\r\xc1\x1b\xdc\xfd\x84l\x82>\x85v\xe4|W=.\xcbC?*\v\xbf\x8d\x1b\xf5\x84l\x82>\x85v\xe4\x88\xf5ؾU\v\x9f\xa2a\xc8Q\xfd\u007f\xb0\b\xcd\xd3\xc6\x05\xf8\x8b\xeafB\x16M?\xb4*\xfb\xa7\a\xd9\xfd鉄l\x82>\x85v\xe4\x88\xf5\x90W\xbd~ly\xf6%m\x18\xa2\xff\x0f\x16\x1fu\x1e\x93\xeb;;\xc9W\x86\xc3\tY\x9c\xf2\xa8}\xab6\xf0\xbf\x99\xf9=\x91\x90MЧЎ\x1c\xb1\x1eK\xd1\xfb\xa8\u007fq\x91\xca&Z\x98\x93\x8b\x9eR9M\xb2 \xa7e*\xdeDp?!\x9b\xa0O\xa1\x1d9b=\x9e\xc6?\x0f\xe1\x11\xa2H\x8f\nm\xe4w\x8f\xf5\xea\xd1\xfd\x84l\x82>\x85v\xe4\x88\xf5 ۏ\x84OEz\x14k\xef\xf5\xf5E*\x8b\xfb\t\xd9\x04}\n\xed\xc8\x11\xebA§\x87q\xf8\x94\xec\x84Z\xce\xd1\xe3.\xbc\xf9C\v\xc3)k\x1d\xf7\x13\xb2\t\xfa\x14ڑ#\xd6\x03G!C\xf7\xe0\xf0i6\t\xabF\xd6\xe3-r\xbe>&\xbfei\xc2\xfd\x84l\x82>\x85v\xe4\x88\xf5\x90\xd7~p\xba\x98\xa4^\x8b\xf3\xf7\xef+\")R\xedʅ|\xf5\x9fNȖɻO\xee\x96\amQ\xf7\x13\xb2\t\xfa\x14ڑ#\xd4\xe3\x9e\xfa\xb2\x1c=\xf5z\xb94;g\xedӲ\xbc-\x94K\xce\xceY\xf8:\x90NȆ\x0e.\xcf^n\xb9\xef\xa1z !\x9b\xa8O\xa1\x1d9B=b\x02ȸE\x89(\xe9\x01\t\xd9\xf8 Jz@B6>\x88\x92\x1e\x90\x90\x8d\x0f\xa2\xa4\x87\xa3@B6jă\x1e@\xd4\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\x02=\xe2#c\xab\xaa\x17\xd6\x17\xcc}\xf0\xcc\xf2\xf7l\xe6\x18\t\xecҢ\xb1\x1d\\F\xa0G|dl\xd5?e\xad?~t\vy\xf0\xe1\xa8\xc2.M\xb4\x1db\x10\xe1\xc9%.2\xb6k\xf1\x17UC\x15\xa3\xae\x87\xca.mx\a\xbaX\xe0\xbb\xea\x11[\x19ۅ$c{A\x8e»\xdbfiq\x84X\x8fx\xc8ؖ\xcd\xc7\xf9\xca\xd0[\xe4p\x17~\x04\xaf\xf9\x14Z\xd4\xc2!\xfdi\xbcTqHq[ci\xcc\xd3xmZ\xa0\xd68\x86\x10\xeb\x11\x0f\x19\xdb\xcf\n\xe5\xb5\xf5\x1fh;\xc6|\x04\xaf\xd9\x18n!\xbf~\xff\xdc-LqHq\xdb\xf0Ҙ\xa7\xf1\x0en\x81Z\xe3\x18B\xacG<dl\xd5k\xfb\x8a\xb2\xe4\\\\\xa2\x1e\xc1K?\xa37\x90\x8b\xde\xece\xf9lq(q[\xfa\xe4\x12~\"\x9e]\v\xcc\x1a\xc7\nb=\x9e\xc6?c<c\x8b\t\x9d^\x8f\x03Z\xf4#x\xa9g\xf4\x92g j\xebf\x16\x87\x12\xb7\xb5\xd5î\x05f\x8dc\x05\xb1\x1ed\x95c<cۭ\x8d\x03\x8a70\x8fय़\xd1K\xad\x9bY\x1cJ\xdc\xd6V\x0f\xdb\x16\xe85\x8e\x15\xc4z\xc4C\xc6v>y\xa2\xaeZ\xbb\x98y\x04/\xfd\x8c^[=\x86\x12\xb7\xe5\xeb\x11i\x8dc\x05\xb1\x1e\xf1\x90\xb1-\xc0\x0f\x99UCx\x0fS\x8fय़\xd1k\xab\xc7P\xe2\xb6|=\"\xadq\xac \xd6#\x1e2\xb6\x05\xf2\xfc\xfa\xd3\xc7K\xb3\xf1Z\x84\x1f\xc1K5F=\x8d\x97~0\xaf0nK-\xcd\xdc\x0e\xf6-\xb0k\x1c+\b\xf5\x88\x8b\x8cm\xd1\xe1ڥ9\xf9\x1b\xb4ԍ\xf1\b^\xea)\xb4\xd4\xd3x\xe9\a\xf3\n\xe3\xb6\xd4\xd2\xcc\xed`\xdf\x02\xbbƱ\x82P\x8f\x98\x00RrQ\"Jz\xc4s\xc6\xd6\xe1us\x95(\xe9\x11\xcf\x19[\x87\xd7\xcdU\xa2\xa4G<gl\x1d]7\x97\x89\x92\x1e\x8e\x02\x19ۨ\x11\x0fz\x00Q\x03\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\b\xf4\x80\x8c\xed\xc8ѲA\xb1\x89@\x0f\xc8؎\x1c=\x1b\x14\x93\bO.\x90\xb1\x1d9\xf5\t\xa7\adl\x87A<\xeb\x01\x19ۈ\x19\xdbZ\xb2\xea\xc7\xd0\xcfZj噺W\xca\ns\xb7h'\x17\xc8\xd8&X\xc6\xf6\xab\xb2\xe2\xce\xeb\xea\xf5\xf7\x8aˮQ+O\u05fd<w\xe9\xe1\xe3ke\xbc\xcd c\x9bp\x19ۣ\xda%\xc9\U000a3595\x0f\xd7-^\u070f\x17\x81\xb7\x19dlI\xa0(\x912\xb6\x17\xe4P\xff\xd1k\xdf\x06.XVި{M{\x10\x19I\x16B\xc66\xe12\xb6\xa1\xac\v\a\xe4ڿ\xca!\xcb\xca\x1bu\xbbe\xf2\xdcm\xad]\xc8\xd8\xe2UO\xa8\x8c\xed\xd2c\xa5\xc5K\x8f\xe3S\f\xb3\xf2Fݯe\xb2~[qc\x90\xb1M\xbc\x8cm\xd9\xf6\xac\xd3\xf26\xfc\x17f\xe5\xc3u\x8b\xf0\x82?\t\xe0\xc6 c\x9bp\x19[u_\xf6\xdc\xd0\xe2l\xa2Ox\xe5麗\xb2\v\xebks\xc96\x83\x8cm\xc2el\xd5\xee\xdcZu\u007f\x0e\xe9zx噺\x977\xe4.\xdc}4\v5\x06\x19[\xd7p4%\x97HDI\x0f\x87s\xa8\x8e\xea\xe1\xf0\xba\xb9J\x94\xf4p8\x87\xea\xa8\x1e\x0e\xaf\x9b\xabDI\x0fGs\xa8\x90\xb1\x8d\x1aQ\xd2\xc3Q c\x1b5\xe2A\x0f j\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\x81\x1e\x90\xb1Ml\x04z@\xc6v\xa4\bW\xde\xd3\bO.\x90\xb1\x1d\x19\u0095\xf74\xdfU\x0f\xc8\xd8\x0e\x11\xe1\xca{\x1a\xb1\x1e\x90\xb1\xe5=\xc7\xd6h\x8c\xda:\x91\xd6\xcd\xd8:t\u05fd\x8eX\x0f\xc8\xd8r\x9ec\x1bn\x8c\xde:\x11\xd6-\xbcu\xa8\xae{\x1d\xb1\x1e\x90\xb1\x8d\x9c\xb1\xa5\x1a\xa3\xb6\x8e\xfd\xbaQ[\x87\ueeb7\x11\xeb\x01\x19\xdb\xc8\x19[\xba1s\xebد\x1b\xb5u\xe8\xae{\x1b\xb1\x1ed\xd7C\xc6\xd66cK5F\xb7`\xbbn\xd4֡\xbb\xeem\xc4z@\xc66rƖj\x8c\xda:\xf6\xebFm\x1d\xba\xeb\xdeF\xac\adl#gl\xa9ƨ\xadc\xbfn\xd4։'= c\xcb\xc9ؚ\x8dQ['º\x85\xb7\x0e\xd3uo#\xd4\x032\xb6\xbc\x8c\xad٘\xb9u\"\xad\x9b\xb1uBL\u05fd\x8dP\x8f\x98\xc0є\\\"\x11%=\x1cΡ:\xaa\x87\xc3\xeb\xe6*Q\xd2\xc3\xe1\x1c\xaa\xa3z8\xbcn\xae\x12%=\x1c͡B\xc66jDI\x0fG\x81\x8cmԈ\a=\x80\xa8\x01z\x00\x1c@\x0f\x80\x03\xe8\x01p\x00=\x00\x0e\xa0\a\xc0\x01\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c\x04zD\xce\xd8F\x99Q\xcd\xd8\x1e#-\xcd\xdb0\xf8\xc6;\x95\x14\xa6\x8a\x80\x81@\x8f\x88\x19\xdb\xe1DG\x85u\xa3\x9d\xb1\xbd~R~\xba\xb3\xf3\xe8\U00082bedթ\xa40U\x04\f\x84'\x97\b\x9f\x95\x0f':*\xac\x1b\xf5\x8c\xed\x97Z\xd8%ۺ.TR\x98\t\r\x03:\xdfU\x8f\xe1DG\x85u\xa3\x9e\xb1\xd5\xf4P\x97[\x97C}\xa1z8\xa1\xe1\xc4A\xac\x87\x91\xb1\xc5yѧ\xd5z\xf4\xf3uan\x96BX\u05c9\x8c\xad\xa6Ǖ\xc0\xbe\bIa:4<\x84`m\xe2 \xd6\xc3\xc8\xd8\xf6\xbfWXqE\xfd\xaavn\xe7uan\x96BX\u05c9\x8c\xed\x97\xf2\xe1\xfe\xeb\xbf_\xbe\xf4z\xa4\xa40\x1d\x1a\x16\x06k\x13\b\xb1\x1efƶ\x1e\xbf\xc1\xf5`\xa807K!\xac\x1b\xf5\x8c\xed\x97\xe4ذ\x98\xe4\x06\"d\xfd\xc2Ea\xb06\x91\x10\xebafl\xaf\xcc\xf8w54W\xcb5\ns\xb3\x14ºQ\xcf\xd8~)\xd7vw\x9f\xde:\xef\x0f\xaaX\x0fa\xb06\x91\x10\xebA\x86\x00Z|u\xfdN\xf5t\xaee\x8fF\xca\xcdR\b\xebF=c\xab\x0fM\xcb\x16\x87\xc4z\b\x83\xb5\x89\x84X\x0f3c\xab\x9e,\b\x19\xff\xe9\x8007K!\xac\x1b\xf5\x8c\xad\xae\xc7\xe1\xf0\xff308)L\x1d=D\x0f\xafM \xc4z\x98\x19[5Tp2W\u007f?\vs\xb3\x14ºQ\xcf\xd8\xeazl\xcd\tEL\n\x87\x8b\xc2`m\"!\xd6\xc3\xccآ}qW\xae~Y\"\xcc\xcdR\b\xebF;c\xab\xdd5=^&\xefW#$\x85\xa9\xa28X\x9b@\b\xf5\xa02\xb6\xaa\xfa\x89l\x1c\x19\x84\xb9Y\na\xddhgl\xb5\xcf\\\xb2\x96\x1f»\xdf.)L\x87\x86\x87\x10\xacM\x1c\x84z0\\\x0fx\xf3)\xbd\x8e\xa6\xe4\x12\x89\xe1\xe9\xf1\xfa\xbc!\xde?t8\x87\nzD\x89a\xe8Q\u007f&TZ+\xaa\xa4\xe3p\x0e\x15\xf4\x88\x12Cף_^\xb5m\xfeP?>u4\x87\xeap\xc66\x91\x18\xba\x1ej}N\xa9\xf5s\x11o\x00\x19ۨ1\f=\x80\xc4\x03\xf4\x008\x80\x1e\x00\a\xd0\x03\xe0\x00z\x00\x1c@\x0f\x80\xc3\xff\a'\xa7c\x12\x8d\x96\rF\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/callers1.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03\xa2\x00\x00\x01.\b\x03\x00\x00\x00\xa3\xcb_?\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x04\a\x03\x06\f\x0f\n\r\t\x10\x12\x0f\x17\x17\x13\x1a\x1a\x14 \x1f\x19!# #$\"%$\x1d$%#&'%'(&+)\x1e()'++$*+)+-*/-!,-+-.,02/52'241574796<9-9;8:;C;=:=?<B@4?@>#CxAB@CDBDFCKH<MH7HIG\x00f\x00\x00h\x00\x00i\x01JLI\x00j\x02MOL\x05m\x05PRO\fo\t\x0fq\vTVSZVD\fr\x17WXV\x11t\x19,`\xae7]\xad\x15v\x1c[]Z\x19y\x1e]_\\d_M:b\xac_`^<c\xad>e\xafac`*{!Ag\xb2ceb)|*dfcfgeghfLi\xafDl\xb0hjgqjR\\k\x88/\x82/jkiHo\xb3/\x858Jq\xb5mol;\x86:pqoUt\xb4>\x89=|t]tvs@\x8b?swzB\x8c@vxu@\x8dG\\{\xbbxzw]~\xb7K\x8fJ{}z\x85}d}\u007f|O\x93N\u007f\x81~c\x83\xbdN\x95Uu\x84\x96\x81\x83\x80W\x95V\x8e\x85gm\x87\xbcZ\x98Y\x87\x89\x86]\x9c\\\x89\x8b\x88\x95\x8bm\\\x9dcs\x8d\xc3d\x9dd\x8c\x8e\x8bf\x9fg{\x90\xc0\x8e\x90\x8d\x90\x92\x8f\u007f\x93\xc4j\xa3jz\x97Ɠ\x95\x92s\xa4l\xa1\x96xq\xa5s\x81\x9a×\x99\x96\x84\x9cƙ\x9b\x98u\xaaw\x9b\x9d\x99~\xaay\x9c\x9e\x9b\xa8\x9e\u007f\x88\xa0˞\xa0\x9d\x80\xad|\xa0\xa2\x9f\xa1\xa3\xa0\xa2\xa4\xa1\x92\xa5ʮ\xa4\x85\x82\xb1\x86\xa4\xa6\xa3\xa5\xa7\xa4\xb4\xa7\x82\xa6\xa8\xa5\x8b\xb3\x88\x95\xa9Ψ\xaa\xa7\x8d\xb5\x8a\x98\xabѩ\xab\xa8\x8e\xb6\x8c\x8d\xb8\x93\xab\xad\xaa\xb9\xad\x88\x9f\xaeέ\xaf\xac\x96\xba\x96\xaf\xb1\xae\xa3\xb2Ҙ\xbc\x98\xb1\xb3\xaf\xb2\xb4\xb1\x9b\xbe\x9bµ\x90\xb4\xb6\xb3\xb5\xb7\xb4\xa3\xbf\x9d\xac\xb7Ң\xc0\xa4\xb7\xb9\xb6\xb8\xba\xb7\xb9\xbb\xb8\xa5ħ\xb1\xbc\u05fb\xbd\xba\xbc\xbe\xbb\xbd\xbf\xbc\xafƫ\xa9ȫ\xb8\xc0տ\xc1\xbe\xce\xc1\x9b\xc1ÿ\xb2ʮ\xc2\xc4\xc1\xbc\xc4ٲ̷\xc4\xc6ú\u0379\xd7Ȝ\xc1\xc8\u07bb\xca\xde\xc7\xc9Ƽϻ\xc9\xcb\xc8\xc0\xcc\xda\xc7\xcb\xdb\xca\xccɿҾ\xcc\xce\xcb\xc4\xcf\xdd\xca\xce\xde\xce\xd0\xcc\xc8\xd3\xc1\xe0Ф\xcf\xd2\xce\xc8\xd6\xc9\xd1\xd3\xd0\xd1\xd2\xdc\xd2\xd4\xd1\xdeէ\xca\xd8\xcc\xd3\xd5\xd2\xcd\xd6\xde\xcc\xda\xce\xd5\xd7\xd4\xe7\u05eb\xd6\xd8\xd5\xd1\xd9\xe1\xd5\xdb\xd1\xd8\xda\xd6\xd8\xd9\xe3\xd3\xdc\xe4\xda\xdc\xd9\xe6ݯ\xd5\xdf\xda\xdc\xdf\xdb\xd7\xe1\xdc\xde\xe0\xdd\xf0\xe0\xb3\xdc\xe1\xe4\xdf\xe1\xde\xe1\xe3\xe0\xe3\xe5\xe1\xe1\xe6\xe8\xe4\xe6\xe3\xe8\xe5\xea\xe5\xe7\xe4\xe6\xe8\xe5\xe4\xe9\xec\xe7\xe9\xe6\xef\xf2\xee\xf7\xf9\xf6\xfe\xff\xfc\xbd\bi5\x00\x00 \x00IDATx^\xed\x9d\x0fp\x13\u05fd\xef\xe1%\xb7\xf7\xf8Y\xba\xbdvjW&\xbevs=n\xb1\xc7\xf6\x98\xa8@\x84\xc3s\x80\x90\xe0\x10\xee\x03'J\xe19\xaf\xb9\x81\xa4\x80\xfb\x9cb\x87ۄ\xbf\xc1m\xd0\x00Uq\xc1<BL\x9d\xa7)\xc5@\xf0\xad\x15p\x9c8&\xb8Ԏi\xeb\xe4\xc6!\xb85\x93\xb9Q\xe2LP:\xb7ʄ\x99e2\xe2ܛy{ή\xa4]\xedY\xadd죕\xfc\xfb\f#\xfdt\xf6\xecٳF\xdf=\u007fvu\xbe3\xbe\x9a8\x18\x00\x80\xa9f\x86\x91\x0ec`T6\x00\x007\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00LM\nI\xb4\xb1\x91\x15\x02@z\xc3]\xa2C.\x8f\x14\xf8\xda\xdd\x1d\xbePjװ^\xfe0\u007f*y\x8e\x11\x12\x1e)))9\x81O\x88\xaf\x8fhw3\xe0\xc3Ғ\xfb5\x89\u007f}zn\xf9?\ai\xf8\xda\xdcW4\x9b\xd50K`\xd0(֯\xfcJ\xe8\x93\xe2\x10\n\x8c\x8f6\xf5$R\a\xf6Y\x18\x92\xc8!\x00\xde\x12\r\xecy\xb5\x85\x06c\xfb\xbc\x97\xbc\xfbƤ\xd4q\xd7\x1b1\xf6\x91x\xaa\xfc*#$\\\xd9Z\U000a6005s%[\xaf\xe0\x84y\xab\xb1\\\x93\xb6f\xee\xd1\xc6\xf2\xcfix\xb6\xfce\xcd\xe6(X%0\xf8\xf8ܹ\xa3%\xbf\v}R\x1cBA\x1cG\x9br\x12\xa9\x03\xfb,\x98\xbcy1\x12'r\b\x80\xb7D=\xa7ǨD\x83\a^\x15__=@/\xc1\xbeVc\x89^)\xdd\xca\b%\x0e\x97\b\xe2k\xb0\xe40\x9e\x00{5\x02\xfb\\,((\xc8\x1f\xe2h#\xb4%\xe8\xf0VX\xa2\xaaC(\x88\xe3hSN\xfcu\xd0;\v\x16+7(>\xc4\u007f\b\x80\xb7D\x87\xdc\x01\x1f\x95\xe8\xf0\x1e\xf2_\x1b\xd8C:\xb8]\xae\xae}\x86\x12m\x8c\xb4\x9c\x8d\xeaFt\xd2%z\xa5$\xb1~\xd8\x04$\x9a\xe8!\xccI\"g\xa1\x92(\x90\x00|%\x1a\xd87\x82%\x89\x9e>F\x13\x8eu\x8a/B\x00\xb7\x18I\xf4\xc3\xd2g\x19\xa1\x8cR\xa2\xe7\x1e]P:\xf7\x9f\x17\xd0\xf4\x13\x8f\x94\u07fbU\xdc\xf4viI\xc9\xf3W\x9e\xba\xbb\xfc\xfb\xea\xcb\xf7է\xe6\xcf\xd9 wSCy\x85\xb9%\x14\xd2P\u007f^^RRz\x82l\xfdqI\xe9K[\xef-\u007f\xf4cU^u\t\x11Xu \xc8\x12U\x1eB\x01\xf3hd\x84\xbd\x17北m\x9d\x13\xd2;\x9aDpn\xe9O\x16\xcc\u007f\xf3\xd99k\x02\xe2\xdf\u007f\xc3\xfc\xd2\x05O\xbc-\x1d\xe2p\xe3\x82;\x9f\xb8\xa2\n\xf5\xce\xf8\xafO\xcd]\xb0u\xeb\xdc9'\x14\x05+\xce\xe2\xc7d\x1fiL\xae\xfeC]\xd90W\xac\xdaU\xfc\x8a\x94\xb5d\xa5\xea\x10\"GW\x96\xaf<\x1a}4@\x05_\x89zNbY\xa2m\xaf҄\xee6i\x83\xa1D\x1bK?f\x842\n\x89^,}\xea\xe5\xd7^\x9a[\x12\xa4\x19\x9f={x\xee\xca \x16N\x9cXp\xef\x9c\x05[\x9f*\xfd\x10\v\x1fJ\x88{\\\x99s\xefK\xaf<ZR\x8e\x95y\xf1\xdb\xe7N\x94\xec=w\x8e6\xd4\x17ϝ+\xdfK\x82?\x9d(-\x99\xbb\xf7\xf0\x9c\r\xea\xbc\xca\x12\"0\xeb@\b\xb5\xa2\x8aC(\xaa\xc3<\x9apn\xce\xf3W\xf1\xd5\xe7\xe7\x9c\x13tNH\xf7h2o\xce)ٺ\xa6d\xee\xcf\xe6\x8a\u007f\x9d\xb3%\x8do\x9ex\xa2\xf4-\xe9\x10\v~\xb6wA\xf9{\xcaP猅\xfb\xe7\x1f}\xbe\xbc\xfc\xa5GUݔ\xc8Y\\=W\xbaW\x1e\x93\xab\xfePo\xceY\xf9\x8b\xd7\xf6\x8a\xff-\x81ߝ\xbbw\u0379s\xe7\xe8\\A\xf8\x10\xa4?\xf4\xfc\xd9\xe7˟\x8a\xda\rP\xc1U\xa2\xc3\xee@H\xa2\xb2&ߐ\xe6\x8e\f%\xfaa\xe9ӌ0\x84B\xa2G\xe7\x92\xef\xe7\xd19A\xf2}\xfc\x15&\xb2\xa0W\xec\x95%\xb4\x15\xc1x\x8d|A\u007f\x04\xe3G\xee\x15w\v\xae$\x02S\xe5U\xf5\xdfBߦ\xf29\xe2\x85᩹꼊\x12\x14\xe8Ձ\xd5\xd1UT\x87\x1eEs4\xdcH\xbe\xb6?$w\x99\xd8'\xa4{\xb4\x10\xf3\x9f\x127\xbcBoT\t'\xc8\x1fj\xe5\x13\xf4\x10w\x8b;\u007f\xbe\xe0!uȬÉ\x12\xb1\xe1=Z\xf2\x1e\x8e\"\xf2\x87\xa2\xfbH\x1d\xfe\xc8n\u0082\xef\x93n\xc9\t:\x9f\xa4\xea\xe8ʇx\xad\xe45\xfazV\xb5\x1b\xa0\x86\xa7D\x03\xfb\x86\x83\xc1\xe0XKP\xfc6\xb5yiRW\x9c\xad\xe8\x8f\xc5\xe6B\x1b\x86PH\xf4\xe3\xf9w\xff\xf8\xa5\xb7\xe9\x1cƆ\xbb\x05\xf1p\xc1\x05\xf4\x1e\xea\xcary\xaf+\xafH\\\xc1\x9f\x97\xbcD\x12\x9e/\x8f\xce˖(ٴW\x9dWY\x82\x02\xbd:\xb0$\x1a\xa9\x0eE{4\xfcf\xb9\x80\x85\xf2sх\x85OH\xf7h!\xe6\x9f\x10\x0f\x1c\xc0\xcf\xfdP\x8c\xffz\xf4\xfbwϡ\xfdM\\No\\\x1d-\xf9\\\x15bV\x1d\x9e\x9b\x83I\x95\xff\x15G\xc1\x96hx\xb7\xb3D\xd9!X\x12m\x94\xeeV\xddߨ\xda\rP\xc3S\xa2\xa3\xae\x10>|Z\xba;\xda\xde)m2\x90\xe8\xd5\xf2FF\x18F\xfar\t%G\xc5\xd7\xcf_\xdap\u007f\xc9\xdc_`\xd2\xceH\xd06c\xe5J\xcd^\x17K\xc8\xf7^\xfaZ\xa8\xf2\xb2%\x1a\xfe\x12F\xf2*KP\xa2S\x878\xa6\x8b\xb4G\x13\a\x93/\xe3\x97iK\xa9sBzG\v1\xff5\xfcV)\xa6\x12}k\xee\x82\xe7^>\xb7fe\xe4P\xe7J.\xaaB̪\xc3\xe1ҿ\x92\xc6.\xceV4\xb2[\x89bT̒\xe8#RE\x9fxH]\x02\xa0\x82\xa7D\x83~\u0090\xdb\xef\x0f\xe2a\x97ط\xc2\x01\x97\xfcȂ\x81D\x9f-\xbd\xc2\b\xc3H_.*\x98\x8b\xa4A\xf8\xfcD\xf9Q\xb1\xd7t\xf7E\xca_I\x16Ƅ\xe2_\xa9\xa41\x9d\xecQ\xe55\x90h$\xaf\xb2\x04\x05zu\x98\x98D\xf1\xb3O\xe0'\xe8\x04\x19\xfb\x84t\x8f\x16\x82H\xb4\\\x92\xe8\xfd\x0f\xd1\xc6V\x92(-\xf3%\xb1}U\x86\x98U\x87\x0fK\xbf\xff\xe1\xdb\xf7>\xa2\xb9U\x12%\xd1\xe7\xa3$\xfa\x9a\xa6\x15}\xe9CEv\xf1\x0fw7}\xbb\xbb\x11\xab\xcf\x18P\xc2S\xa2\x12>\xf9\xbeh\x97\xf8\xday@\xfeo\x8f-Q\x83F\x14\a\xee$\x89\x8dw\x8a_\xb1\xbdtx\x83\xd7<M\xbe!tL\xf6\xfc\xcf\xc8+k\xce\xff\xa1\x05b\xe3{\xa5\\\xfa6)\xf2\x1aHT\x91WQ\x82\x02\xbd:LP\xa2o\x95_-\u007f\x8b\x04\xec\x13\xd2=Z\b\x85D\x17\x90\x9d\x82R\x03\\>W\x94k\xe0\xee5\xea\x10\xb3\xeap\xb1dnIɚ\xa8;]X%Q\xf1:\x11|(J\xa2\xc2\xfc5\xe4\x8a\xf0,\xbd\x00\xac\x11K\xbf\x1a\x1a%ˇ8+MSKcQ\x90\xa8\x0e\xbc%\x1a\xf4\r\xb9}~1\x18\xdb\xd3y\xa9Kz\xbaH\xf0\xf9ܝ\xbeq\xfd\x9d\xb6FZέ\x8cF\x94\xfc/?}\xf6i\xfa\xff\xbd\xb7d\xce\xf3g_n,yS\x8c\x9f+\xfd\xe1\xcb\xff\xda(&\aߢ\x13\x8a\xd1c\xd8\xf7\xca\x17\xec}\xfe\xce\xd2\xd2_\xbd\xa7\xc8+OT\xbeE\xae\x1d\xc2\xefΝ+o<w.@\xe6,\x1b\xdf\xc2\x17\x1bK\xc9\x04f$\xaf\xb2\x84\b\xcc:HO\x17\x1d\xa6\xb5P\x1cB\x81\xce\xd1pp\xfe\xa3\xf3\xa5\xac\xcc\x13b\x1f-\xc2{w\x1e\x16N\x94\xbe'\xfcp\xcd\xc7b\xde\rG\u007f\xb6R\xec\x15\x8b\x92//Yy\xe2\xa5{\xe7\x90?g$d\xd7\xe1\xed\xf2\xd7Ξ\xbb\x1a݈*\xcf⑹\xbf\xf8\xd9C%\xe2\xdfAU\xf57\xcb\xef?z\xf6Yi\xc0\xbe\xb7\xfc\xf0\xcbk\xca?V\x1eBl\xf6K\x9f;\xfb\\\xe9S8\xea\x8c\x01%\xbc%\xea#C\xd1\x034\xea\xd8\xd7.=\xa3\xdb'\rP\x03z\xfb\\%\xd3\xf2\x9aP\xc5ٕ\xe5+ɵ\x18\x9fxd\xef\x82\xd2\xf9kޤ\xa9\xaf\xad\x99;瑳\xd2mD\xcd\x10M\xe4\xca\x13w\u07bd\xf5W\xa5%O+\xf2\nsh^z%\xb8(\xed'~Ǟ&I\uf54b\xafʼ\xea\x12\xc20\xeb@\x9f\xd1%lP\x1dB\x81\xde\xd1\xf0\xe1\xf2\xd0\xcd\x0e\xd6\t\xb1\x8f\x16&(6\x80'攔\x9f ك\x87\xef-\x9f\xbb\xe1\xa5{K\xc5&\xad|k\xe3\x9c\xf9OQEDBv\x1d~GSK\x1fQ]\x88TgqeM\xf9\x9cG\u007f\"\xe6UW\xfdʆ\x05s\x1e\x92\x1e\xf6\x13\x9e\xbd\xb3|\xcd[\xaaC\x88\x95;L\ue2ca\"\x8f:c@\x01o\x89N\x84\x9f\x94\xfc\x89\x11\x027G\xa8?\xab\x0eY\\\x9d\xf3\xf4\xd5`\xf0\xf3\x8b\x1b\xee\x8c\xefq\\`RI\x05\x89¯Ц\x82\xf8%\xfa\xf2\x1c\xa9\x8f\x1b\x9c\xabj\x9f\x01>\xa4\x82D\x81\xa9 ~\x89^,\x95z\xb8\xef\x95*fh\x01^\x80D\xa7'\xd2\xfcLt\xc8&\xd8X\xdex\xe2\xcd\x13\x8d\xac\xc9t`\xca\x01\x89NO\xe8\xfċѡ\x1e\xaf<:\xbft\xfe\xf7\xa1\x9b\x9b\x14@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2)\x87\xe67a@Z\x03\x12M-|\xce<\xb4\xc4(\x13\x90N\x80DٴW\xfa\x8d\xb2ă\xbf\xb2\xdd(KB\x04\x8b\x8b]\xa7njr\x01\xe9\x04w\x892\f#\x02\xde\xd6}\xed\x031\x97L\xfer\xd7\xf2E\x9bn\xc4\xca1A\x965K\xef\x9dUy\x96\x02\xe7h(y\vj\xd2\xdb#1\xb6dl1ʒ\b\x03\xa8\xc3(\v\x90f\xf0\x96(\xc30\"\xe0n\x1f\x1a\xeds\xb7\xc5\xd2h\xfd\x83\xc7w.\xba\x16#\x83H0H\x16\xd7\x12\f\x87j\x9d\xfd\x91\xf8\r\xb4\x9e\xbe\xf7\xa2J\xf7IWQ\x9el2Ӝ\xe1f\xec8!<\x99\xcdFY\x12\xe0\r\xe45\xca\x02\xa4\x19\xbc%\xca0\x8c\xe8l%\xaa\xf2\xef\xeb\xd3\xdf\xeb\x9a\xe38\xbea\xa0\xd0w*\x8a\x8b\x17\xce..^\xab\xfb\xd3p\x99\x8a\x9ap\xe8͗%\xfa\x02:)\xbe\xfa\x90\x8b~\xbadY\xcf\xdaqb4X'\xb1cڋz\x8c\xb2\x00i\x06g\x89\xb2\f#\xdaZ\xe9\xa6N\x8f\xfen\x1f9^\xd7\xdf(!X\x90\xdd>3\xdb^1\xa3\xc1\xc0e\xa4lY(Z\x86\x1eȖ\xc5H\x97e\xe9C\xdd\xf4\x83s\x96\x91\xcc\x13 0\xcbi\x94%~@\xa2\xd3\x0f\xbe\x12e\x1aF\xf8\xa4V\xa6\xfb\x05\x9d\x9d\xae/wPvc\xbc\xcb\xe18\x83?\xadv\xac&a\xf5\xa9ݫ\x17m\xfa\x8c\xe6\xf9\xf4\x99\xe5\xffm\xf3W_\r\xff\xe7W\xffu\xcb=\xd2D\xcf@&B\r#\xab\n\xb2\xaa\x88d\x9b˲\xcbH\x8fӃ$\xcaH\x96q\x1f\xce\r\xb7\x97A\u007fGA\x19U\xb7\x90\xf3$\xa3\x84\x10\x8a\xd4:\x94тG-\xa8\x18\xe3:dq\xad-ʮ\x92Υ\xa52\xbb(ܚ7dE]3\x12.!B\x17Ht\xda\xc1W\xa2\xba\x86\x11\xa4\xe7\xab;\xcaz\u007f\xf0\x8c\xe3\xd0\xe0\xe0_0\xfel\xb0\xfa\x10\xbe\xf1\x87]\xd5\x18_>S\xedx\xf0\xd0\xff[\xfa\f\xc91\xb8xݡ\u007f\x981cF\xb0fƌ[\x9a\xa4o\xb6\xd0z\xa0\xa0('\u007f\xed\n$~\xe9\x9d\xd6\x06O\x83u\x95x\x91\xe8\xf6\x16ٽ^o\xc8\xcf4,\xd1\v\xa2n\xbfq\x89\x86\xfd\xa8K[B\x18E\xaa\xcfki¸\xc7i\x15{\x05\a2\x91\xadi{\xce}$\x8b3\xa3\xce\xd3l+\x93G\xc5\xddѲJ\xb8\x84\xd0~\xe3]\x15\xb9\x93ؾ\x03)\x01W\x89\xea\x1bF\x88_dw\x8c\xbb\x1c\x91\x8e\xae(Q\x8c\x0fU\xd3p\xa9\u0602n{P\x8c\xae\xd7n\xba\x1e\xf4\xfd\xef\u007f\x10%\xfa7K\xb6\xbc\x13n\xb4\xcaм\x005U\xe8\xa0\x13\xa1\x1d\x886ݑ\x8e.VH4\xd8۵=?\x8fjԃ.iJP\x11I\xb5\x92\x89\xdf&+I\xb4\xe6\x8aB^e\xa3\xfb\x93ɦ^tP\xca=\x86\xb4\xfd\x83\xc4J\x90Y\"^Eb\x8c\x06\x80\xf4\x84\xa7Dc\x18F\xe0\x1eW\xf8\x86\a\x03\xb6Dw\x86\xc2\xf3\x8e\xf7E\x8d\x05\\\xa2D3\xfb\xfd\x91neYh\xa6\xc6YLߊ騐-QB \xbf\x8a\xbc\xb5\xa1p]ʘs=\x91T\xa5\xc0\x9c\xa1\xf0\x81B\x81\x90/\x8fAǢ\x94\x96x\t2c\x1d\xaebhE\xa7\x1d<%\xaao\x18!t\x86\x96\xa5gÖh8<\xee\xb8N\x12Z\x89DG\x14\x03\xbf\xb2\n9\xa8\xbc\x87\xbe-\xac\xa4\xa9\f\x89ʺn\xca$\xef=\x91\x9ei\xb8\x04\x15\x91T\xa5\xc0\xc2a\x99<ޕ\x9f\x02\xea\x95'\xa1&^B\x04/\xea\x8dN\x02\xd2\x1c\x9e\x12\xd55\x8c\bxZ|1\xf7\x8c\x92\xe8\xfe(\x89\x9ew\xbcK\x12\xb4\x12\r\x89\xd1YH\xdf\n#\xad\xe8>\xb9\x15\x93$*\xe4J9\x9b\xe8\xccN\xc0\x1a~nA%\xe70\x91T\x9a\xb3!J`+\n\xfb)rϽɢm\xf9\x12+!\x02\xcc\xe8N?xJTBk\x18\xe1?xD\xfc\x12\xc7rd\x8fHt\xd1~\x8co\xd4GI\xf4ڃ\xf5\xa4\x19\xfd\x9f\xba\x12\xf5о\xe6Ai$g\xb7c<\x8e\xa4;=\xa1V4\xaf\x8a\xbc\x06\xf2\xa5f\xab\xe6\x8e\xd0<\x8d\x91D\xb3\x9f\x14+^\x11%\xb0\x0e\xa9\xf0\x8d\x9bi\x96`\xf1\u009b,A\x01Ht\xfa\xc1[\xa2\fÈ\xb1}\aG}>_w\xab\xde>Ҍ\xee\x1f\xe8\xf3\u007f\xf5\x0f\xfe\xf2\xd0:G\xf5\xa9\xcb\u007f\x19\xac\xde\xf5\x87\x1b\xef\xef\xaa&3\xbd\x83\x8bV\x1f?\xbf\xfb\x1fU\x12\x15z\xe8ܭ4\xac\\\x91\xb1\u07b3>c\x05\x8d\x9b\xac\xdb\xdb\xe6e\x93#\x8f{\xbdߨ\xf1\xf6\x88zlAU\xae\x93\xcd\xf9\xf2\xd3E\xefdlה\x10F\x95Zi۲\xb9\x12e\xba\x87}^\x8b\xb3\a\xf7;-^\xb1\x88\xf5\xe8\x81\xd6v'\x92\xa6\xc2v \xc5\xd3L\x13*AA\x1f\xa3\xd3\f\xa47\xbc%\xca0\x8c8&\x0fP\xf5&+\xaf/\xa5\xb7E\xab? \x1f>\xaa_\xb4x\xd3~\x87c\xd7.\x92\xf4\xfeb\xf1u\x97\x98\xfc\xc13\xb5\x8b\xd7\xfd\x1f\x95D\a2\xe8pNj\u0082ͳ\xb3g7Km\xa3P\x97\x9be\xa7C\xba\x06\x9a#sD\f{\x96\xe4[\x8b\x1f\vu,\x1b\xbe\xde\x1d]B\x18U\xea\x88=+\xa7j#Buub\x92e([|\xad\x13\x93;\xec\xb6\\\xbbt\xe7כ\xf5$\x8e\"\xc1\x12\x94\x8cg.\x1b\x187|\xc4\x11H'xKt*ьE'\xcec\x16\xdd6=1\x0eZ\x9c\x93R\xa1\x10mŌI$ \x9d\x01\x89\xb2ّ\x1fé-~\xfc\xb3&\xf5\x87.\x84\xf1\x81\xd8Sk@\x9a\x91\x02\x12u\xc4\xcb?N\xa2D\x01\xc0$\x80D\x01\xc0Ԥ\x80D\xe3f2;\xba\x00`\x12@\xa2\x00`j\xd2G\xa2B\xf32\xf2\x18\xfd\xfan\xd0(\x90N\xa4\x8dD\x83\x95\xa1\x1f\xa3\x1d\x01\x8d\x02iD\xdaHT\xb8u\xf3W_\xfd\xe7W_\xfd\u05edK\xe0\xc7 @\x1a\x916\x12\r d\xb7ߚg\xaf\x98᜔\xe55\x01\xc0\x1c\xa4\x8dD\x05o~n\xee\x1d\xb9\xb9\xb9\xf3ހ\x8e.\x90F\xa4\x8dD\xb1\xe0\xbbt\xe9\xd2\xe8\xa5Kc\xd0\xcf\x05҉\xf4\x91h\xdc\xeb\xe8\x02@*\x91F\x12Mab\xd8SL\xb6\xe5\x04\x90jp\x97(\xc30\xc2\xd7q`Ok\xf74\xee\x9fF\xec)\x18\xfe\x15\x93l9\x01\xa4\x1a\xbc%\xca0\x8c\x18wy\x86dž\x8f\x1c\x98|\x8dθ\x19\x8c\n\x9f<\"\xf6\x14L\xff\x8aɵ\x9c\x00R\r\xde\x12e\x18F\\rQg\x97\xd8\v\x8cM\x88\x19_L\x1c~\x12\x8d\xd8S\xe8\xf8WL\xaa\xe5\x04\x90jp\x96(\xcb0BZ\xa6\xd6\xef\x9a\xfc\x9fA\xa6\x86D\xc3\xf6\x14z\xfe\x15\x93j9\x01\xa4\x1a|%\xca4\x8c \bc\xad\x9eɟ\x8a\xbdI\x89֡\xcc\xe6\xef\xe5\xe7\xde3\xa2)\u061dG۷\xb1\x1cy1\xcd\x1ce3\x97\xa0\x1fDȞB\u05ff\x82a9\x01L#\xf8JT\xc70\xc2\xefr\xb9ܓ?\x14\xbd9\x89\x06\xa9\x85C\xc1概\xec\xa1肗\xa0*\xf2&\xb8\x9b%\xdcJ\t%\xe8\a\x11\xb2\xa7\xa0\xb0\xfc+\x18\x96\x13\xc04\x82\xabDu\r#\xfc\xbe\xa1֩\x98.2\x92!\xfd\xa7\xb3\x8d,\xebi-\b\x90\xa5;+\xa3\v\x1e\xdd,\xa9g|T\"z\x11\x95D\xfc \x14\xf6\x14l\xff\n\xb6\xe5\x040]\xe0)\xd1X\x86\x11b\xdbsRwljB\xf4\xf7\xe27\xf5\x85\x1aS\xa2d\xfcg\xddH\x8aiF:w-GQ\x88\xa8\x85<\x13\xf1\x83hS\xee\xcc\xf2\xaf`[N\x00\xd3\x05\x9e\x12\xd51\x8c\x90\x9f\a\x1apM\xfa`\x94\xe8\xef\xf6\x17'(Q\xb2Ξ\xb4,}\x97f%\xdc\x10^\x8fD\xb4\xa9[\"~\x10=\xca^,˿\x82m9\x01L\x17xJ\x94m\x18\x11l\x91\xa6\x8c.\xec\x9b\x12\x89\xaaT\xf8\xf3\xdbf~\xed_\xbe\xf8\xe2\xb7߹\xf5\x96\xef\xfc9,џ\xff\xfd̿\xfd_$\xe3\x0f\xbe6\x93l\x9by\xdbO\xc5\x0f\xa4\xe5\xb4>F\x8aq\xa1D\xfb\xe0\x89\xf8A(\xec)\xd8\xfe\x15l\xcb\t`\xba\xc0S\xa2\x12\x1aÈ\x03\xc4XP\xec螎\xb9\xdbD\x88\x96\xe8\xcf\xff\xe6\xe7\x9f\xfc\xf6\xbb_|\xf1w/~\xf2\xef\xff\xe3\xbb!\x89\xfe\xfa\xef~\xfd\xc9o\xbf%jt\xc6\xed\xbf\xff\xe2\x8b\xdb~\xf0\xe7\xff\xf8\xf5\xb7\xc5\x0fĬ\xc1\x9aG\x86\x94\x85\xf6\xe8\x82G\xb7(Ə\f\x12\xf2\x83\x88\xd8S\xe8\xf8W0-'\x80\xe9\x02o\x892\f#\xdeq\x9d\x1c\x1e\x1b\x9e\xba颈D\xbf\xf9\xd3H\x83\xfa\xef_\vI\xf4\xf6߈\x1f\u007f\xff\xb7bL\x82[~/m\x9fA\xae$VTֺ\xe7\x8e\\\x8d\x1e\xe5\x19]6\x89\xfaA\xc8\xf6\x14\xfa\xfe\x15Z\xcb\t`\x1a\xc1[\xa2\f\xc3\b\xec\xebl\xdd\xd7\xd63\x05\xb7\xfe\xa2%:\xf3\xcf\xd2\xfb\xef\xbf}\xeb\x8c\x193C\x12\xbdu\xa6\b\xfd\xf8\x1f\xe2\xb6\u007f\xba\xf5\xbb\xffBTJ\x1f]\xb0\xaeu\xe6\xccZ\xa5}\xa6\xc2msi\xd2\xc2$\xec\a!\xd9S\xe8\xfaW0,'\x80i\x04o\x89r%Z\xa2\xb7\xca\x12\xbd\xfd\x9f~\xff\xc5'3B\x12\x9d)\xb7\x9br\xc6\xdf\xfc\xe0;\xb7\xfc $Q\xc50q\n\x89iO1ٖ\x13@\x8a1\xad$z\xbb\xdcѽ\xe5\x93/\xbex1,\xd1o\xfeH%Q\x91\xdf\xde\xc2W\xa2\xb1\xec)\xa6\xc0r\x02H)\xa6\x95D_\xfc\x9a4]t\xdb\x0f>\xf9\xcd\u007f\x0fK\xf4\xc5[\xff\xe5ϟ\xbc\xf8-9\xe3\xb7\xfe\xef'\x9f\xfc\xe86\xce\x12\x05\x00]\xd2^\xa2\xf4\x87e!\x8d\xfe\xf4\xef\xe9M\x97\xdf\xdc6\xf3k?\nK\xf4\x8b\x17o\xbfe\xe6\xed/\xca\x12\xfd\xf9\xed3o\xfd\xf6o\xa9D\xa5\x19\x1e\x00H*i/щB\x1f\xa3G\xc8\x12\xf5\xdc\x10\x00p\x06$\xaa\x03\xbf\x1f\xa3\x01@,@\xa2:\x80D\x01s\x00\x12\xd5\x01$\n\x98\x03\x90\xa8\x0e Q\xc0\x1c\xa4\xb7Do\x06\xa3\xc2\x01\x80\vi-Q\x00H}@\xa2\x80̤\xff\x16\x10\x98\x14@\xa2\x00\xc1\xe7̓~a\x0e\x98\r\x90(\x80\xc9OR\x8b]\xa7a\xb5^S\xc2]\xa2\f\xc3\be*gN\xda\xc2\xc7\xf5\xd7\xe5eUMVg\xefU[_\x9c\xa9\xfey\xb9[\xb4\xe1d\x10\u007f\x1d0\x1e@\x1d\x8cT\xc0\f\xf0\x96(\xc30B\x99\xca\x1bOvxm\xbdyy.gV<?+\xf7őɅX?(e\xa5>Y\xb8%ï\t\xe3$\x10ky\xf0\xf8\xeb@\x9c*\xa2\x97_\x02\xcc\x02o\x892\f#\x14\xa9\xfc\t7\x9b~Ԍ\x83q\x88O\xd4r\xae\xf1Bh/0\x97\xd5d\xa5Vl\xc6\xd9^M\x18\x17AW\xee\xbc\x18\x9b\xe3\xaf\x03Y\xc0\f~/`V8K\x94i\x18\x11IM\"#(ޮ\xf6\xd8\x12T1`\x90\xa7\x13uƙ:\xdb=\x86F4a<\fT\xa0{b\r\x1f\xe3\xaf\x03H\xd4\xcc\xf0\x95(\xdb0\"\x92ʗ@\x16B\x19t\x91\x16\xc1&\xad\x9a\xb9V\xb5\xfdr\xb5ñ\xff\xa3m\x0f/\xda\xf4\xa5z\xc7c\xf9\x19\xd4\xed\x81m\x18A\xe8C}\xf4=\xb0l\x96%\xff\x9e\x90\xa0C\xa9J\xaa\x1a\x96\xcc\x1e\xc8D\x99ê0\x8cn\x1d\x02k3\xf2\xc9EŸ\x0e\xc5r\x06\xbb*UM\x17HԴ\xf0\x95(\xdb0\"\x92ʙ>\xafW\xfe\xd1\xf6\x05\xefA\xd4\xe4\xf5\xaa\x87v\xd7Ϝ\xa9]\xbd\xb8v\xf7\xb6\xbb>\x8d\xda1\xb0>3\uf21ea\x04\xc1g\x93\x8a\xf2\xa0\xefu\xb5ޓѫNU\xb29\xc7\xda'T\xd9ɢb\x8a0\x8c^\x1d\xda\xf22\xd7\xd3n\xb9q\x1d\xacN\xaf\xd7\xdbU\x89\xb6\xa8R\x15\b\xe3]\x15\xb9q\xf5\xf1\x81$\xc0U\xa2l\xc3\bE*\u007f\xb2B\xeb*\xb0;\xba\x8f;\xea\xaf\xe1\x1b״\x1b\x86\xca\xd0c\xfa\x86\x11a\x02\xad\xe4\xab?;\xc6\x1d\xc7-ȅ\x03\xd9ǢB%\xac:ԡ\xb2\x90ьa\x1d\x9a\xfa\xc5a\xab\x13雔.\x11\x9b\xd8x{\xf9\x00wxJ\x94m\x18\xa1L发D\xab\xa3\x1bP\x19wn\x96K\xdf0\"\x82\xbf\xb9\xaa0\a\xcd\xd6ی[Q\xeeZ\xbcc\x96\xa0\x0eU\xb0\xea\xe0\xb6\xe6ʶ\xc1q\xd4Al'\x97!7\xd6e\xac\xc3U\f\xad\xa8i\xe1)Q\xb6a\x842\x95?F\x12]\xc7H\x14\xdb\xd0J\xb4\x90(B\xcf0\"Lo^\xfe\x93m^\xbb\xaeDdz\xd7v~}\xb4\xb0I\x1d\xaaa\xd6\xe1R\x15\xaa\x94\xdaQ\xc3:\x88\n\xad\xb2\x1c\xd1\xdfJ\xf0\xa2\xde\xd8\x19\x80\xa4\xc1S\xa2:\x86\x11\x8aT\xfe\x18I\xf4\x19F\xa28\x12͏\xb3cX\\INs\x99\xaeD\xdbŶﾂ\x9c\x80:Tì\x03\x1d\x8d>\x19_\xd3\x17\xb0[5\xbd\xe7(`F\u05fc\U00014a04\xc60B\x91ʟ\tH\xb43?^m`\x9cO\x9c#\x82e\xba\x12mC#\xf8\x02Z\x81\x83\x05\x97\x14\xa1:\x8f\x8eDɜ\xee\xacx\xdc\xe4\xfc\x15\xf4n\xabGc{\xa1\x00$j^xK\x94a\x18\xa1L\xe5\x8a\xd0\xe3\xf5\x92\xe9\xce@hF\xb7Gݎ\u007f\xf9\xc7\xc1\xd5\xf5\x83\x83\xd1#\xc1ev\x8d%\xb0.MhY\xf3\xe62dۢ\xa3\x80\xf1욶\x82\"K\xddf\x8b_\x11*2\xe8\xd4AbȾ\f\x1b\x12(F[\xbc\"Nk\x8cL}\xe0\xbdfZxK\x94e\x18\xa1L\xe5\xc9\x1b\x92\xb3\x03ra!\x97\x06\xaa;\x92\x18_vP6\xe9\xec\x1e\x0f\xc1\x1dEV\xdb\x03\xee;,zM\xd8\xe9;lu\x81\x93E\xb9ͪ0\xc2\xcd\xd7\xe1B\xa6<\x9dT\x10#\xd3x沁\xf1d\f4\x00CxK\x140'm\xc5\b~\x8cfN@\xa2\x80\xc4\xf8@2f\xd4\x01C@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00`j@\xa2\x00\a\\\xd9\r\xe2kO.\xf7_3\xa5\x01 є\xa0\xbd\xd2\xcf\b͈\xbf\xb2]\x9b\x18\xc8^\x8b\xc60\xbeϦY\xf5\x85\x01\xb3\x84i\fw\x89j\r#\x047]\x16E\xb3\x82\x1d\x10f\vjb\x84\xf1\x93\x88w\xc4Ͳ%C\xebzџ)\xccj\xc7㖍Q\xe9\xa3+\xf2\xb3go\x96\u007f\x1f\xef\xb2\xe7\xe4o$?\x88c\x95\xa0\x0f\xcfsK\n\xbc%\xca0\x8c\b\xb8.\xf8DL\xdd6L\n\x9d\xfdF9th\xcep3\xc2\x04H\xc4;\x02\x1b\xac\xb6=\xf8n\xec\xedؓ\xa9Yl\xb0\xd7\x1a,h\x15\xaf.Q\xebI\x8c|c\xf6v\xcfƜ\xd9t\x8d\x9c\x85\x19u\xed\r\xa8U\xa7\x04)?+1\xa1sKExK\x94a\x18\x11pM\x13K\xae\x8a\x1a\xa3\x1cl.Y\xd63\xc2DH\xc4;b\b\xc5^Tb\x9d\xce:-\x11\x1a\xac\xd1\xff\xa1\xfe\xcc=h(X\x18mo\xb1\xa4\x80\xf4\x9c\x86\xb3I\xe3\xba\xc4\xdaM\xd6gi\xd6)\x81\xc0\xaeY\"疒p\x96(\xcb0b\xdaH\xb4,\x8eeLX8g\x05\x18a\"$\xe2\x1d\xd1c\xb0\x8c\x91\xdeRJ\x11\x02\xb3\x9c\xd1I\x8f\xa1\x85\xe2\xe1\xa2ǘ\xc5\xd2B\x10\xf7U\x90\xa3\xd2\xfe\xfb\x88\xb4\xf2\x03\xa3\x04\xacW\xb3D\xce-%\xe1+Q\xa6aD\xbaIt \x13\xa1\x86\x91U\x05YU\xe4*\xd4R\x99]D\xdc%<\xf2\xf2$ed\x9d\xea\x8c\x16<jAŪ\xbcu\xc8\xe2Z[\x94]\xa5\xf9c\b9OF\x87\xba6\x12:\xc4\xef_\xc1\x16\xc2\xe0\xa6\xda\xea\xe5\x9bjo\xe0ץuZ\x1ct\xdd\xd0\x1b\xa7\xd6-^\xbd\xfb:ƻ\x1c\xd5\xc7w\xd6.\xdd\xf4\x91\x9c\xbd!+z^!8,\xe0e\x9aɢnIF\xceB\xf1ob\t`\xc5fm\tXO\xa2\x89\x9c[J\xc2W\xa2LÈ\x80\xeb\xe4\v\xae\x03\u07b4\x99-\x12Z\x0f\x14\x14\xe5\xe4\xaf]A&1\x9d\x19u\x9ef[Y\x10\a\xba\xbdEv\xaf\xd7+v\x1b|^\x8b\xd8d\xf4\x90\xf5\xbe\x14y\x87\x0fd\"[\xd3\xf6\x9c\xfb\xa2\xcb\xebG]ѡ\x8e\x8d\x84 /L\xaf\xf9S\xc6\xed_\xe1\x1f\x1d=\x82\x8e\x8c\x8e\xaa'\x06\xfe\xed\xae\x9dgΟZ\xee\xf8\x12_\x1b\xa4\xab\x9d\r~@\x92w:v\x9f?\xfe\xe0\xe37\xf0\xe53Վ\xdaC\x87j\x17]\x96\xf2w\xb3\xb4\xa4\x9d,\x92\x11\xf2V\x89=\x8c\x8a=\xc5\x19y\xceВ\xfa\xda\x12\xd85\xc3\t\x9c[\xaa\xc2U\xa2lÈ\x80\xabe`l\xb8\xf5`\xdahT\xfc¡y\xe2\x99Ҷ\x93\xcc\xee\xf4\xa2\x8345\xdcѥN2MVu^l\xcd\x155\xbd\xca\x16]\x98'2ˢ\bY6\x12v\xb9\xa5\xd6]\x8e\xd3ȿBgi\xfb\xe3\x0f\x92\xc6\xfa\xf8\xd2\x1b\xe4C\xb8\xa3\xfb\xba\xe3\x94\xf8\xfa\xae\xe3\x8c\xf8Z\xfd\xb0X\x93k\xb5\xf2\xa2\xdcc\xac\x81\xa0f\xb2H&\xe8\xcc\x12/[\xf9\x19\xb6-\x1d\xcdy\xf9r?^S\x82\xf1\xa2\xfbF疲\xf0\x94(\xdb0\x02\a\x87\x888\x05w\x1a\xad\xe4Z\x16\x9a\xeex\xa0P \xe4ӡ\x95\x8eD\xc3S#Vg$UA[\xe4[\xa9\bY6\x12#\xf2\xc2\xf4\xfas\xb2\x06\xfe\x15\xc1N\x8f\xa7\t5y<\xea\x81ܧ\xb5\x0f\xef>\xf5\xfe\x8d\xeb\xf4CX\xa2\xdb\x1e\xbe\xfe\xa5H\xedN1\xae\xdeOR\x8e;\xa4KƘtIRS\xa8sᨣ\v\x18\x97Y\x89\x80Dz\xe5>\xbd\xa6\x04\x9d\x9a)1\xf2\xe6HUxJ\x94m\x18\x11\xc2ۦ\xb7_\xeaQV\x11\n\xe4K?\xbd\xb6\xebH4\x94W\x95\xaa@1\x04S\x84:V\x16\xb11\xf2\xaf \xb0F|\xd7N=\xb3ڱ\xfc\x97\xeaV\xf4qGd\x01\xd1\xeaC$e\xd0!ݐ\xe9e\xac\xca\xebEm\n\xc3\xe50\x81\x9aLz\x17\xa9\xa6\x98~\\V&%\xb3J0\x98Ȋ\xe7\xdcR\x12\x9e\x12e\x1bF\x84\xd4\xda\x19\xa7\aC*\x10\x16\xe3\x8a\xc2~\x8a?\x9cJo\x05S16X\xd5y\xf5$\x1a\xb061B\xe3\x89U\x06F\xfe\x15\x04\x86\x10\xde\xdd/\x8a\xf3ڙE\xc7\xc9\az\xe0S\x9f\x92V\xf4]\ni9\xabw\x93M\xa7\xe4V\xb4ɢ\x9dw\xae\xb1\t\xd8\x19\xa9\xbe\x8c\xaf,W\xeaN5\xe4\xd0q\xce\x12\xf9z\xc5*\xc1@\xa2\xf1\x9c[J\xc2S\xa2\x12\x1a\xc3\b\x0f\xb5\x04\xf2\xbb/\xc4\xdc-\xa5\bˮC\xba\x17\xbfq3y\xb5\x8b]\xbdq\x9a@\xfas\xc1\x8a8%\x8ak\xee\bj\xc3\tI\xd4ȿ\x82p)G3f<\xe48O\xde\xeaw\xd1\xd7z\x8c?#\x03\xd0\xf3t\x14\x8a\xf7\xffR|\xa9^NƢ\x0f\xd7\xd3\xec\xc1\xe2\x85\xd1%`\xbfe=\xeeGM\x19j\x8bŁYE\x97\x88\xbf)\xb9\xe7IN\xfe\x12}\x94\x97]\x02\xb3f\n\xe29\xb7\x94\x84\xb7D\x19\x86\x11c\xae\x8e\x91\xb1\xbe}\x9etY\f]\xe8\xa1s\xb7Ҩq=z\xa0\xb5݉\xe8e\xa9ɺ\xbdm^69\xe5J͕ۖ(\xd3=\xac\xc8\xeb\xf3Z\x9c=\xb8\xdfi\xf1F\xcfE\xbe\x93\xb1=*\x8ci#\x11\x03#\xff\n\x1d\x0e9\x16\x1fz\xfd\xf5\x9d\x8eA\xfa\xa1\xfa\xf8\xeb\xf5\x8bɡ\xf7ߵ팘J\xa7\x8b\x1c\xebΜZ\xbd\xf4\x03\x9a}\a\xd2>F\xb5\x1d\x8d\xe0\x03\x85A\xab\xea\xc0Dzfy\x88\x95E\xbe\x18o\xb44tl\xb7\x15\atK0b\x82\xe7f~xK\x94e\x181~\xf2\x80\xdb3\x94.\n\xc5\x03\x92\x0f\x85\xdc\x0et\xd8m\xb9v\xe9&\xb0P\x97\x9be\xa77\x05F\xecY9U\x1b\x11\xaaS\xe4\xad\x13\xdf-C\xd9\xe2k]t\x89\r_\xefV\x87\x13\xb5\x910\xf4\xaf`s\xaa\xfePm\xf5\x83\xf5T\xa1\xf8\xfa\ue94b\xea\xa51\xe7\xf9\xfa\xe5K\xebi\x03[\xbd{\xe7\xd2\xdam\u007f\xa1\xa9ެ\xf0}\xdc\bw\x88G\xf4Z<\xea\xf9\xd8\xd0\f4\xedݶ\xce\xce*j\b\xe8\x97`\xc4\x04\xcf\xcd\xfc\xf0\x96(0\x11\x1e\xb3\xb42B\x13!M\x17Q\x0eZ\x9c\xda\xdbg\xe3H\x1c\xcd\x04+\xd1\n\xcd\x16\x06\xcc\x12\xa6/ є`G\xfe8#4\x0f\x11\x89\xfag1\u007f\xa6Bo,\t\xef\xc4\xd3U\xd2)a\xda\x02\x12\x05&\x01E+\nL2 Q\xe0\xa6\xf9l\xb0z\xd7\x1fn\x18\xe5\x02&\x06H\x14\xb8iv9\x1c\x0e\xc6\xc3N\xc0\xa4\x00\x12\x05\x00S\x03\x12\x05\x00S\x03\x12\x05\x00S\x03\x12\x05\x00S\x03\x12\x05\x00S\x03\x12\x05\x00S\x03\x12\x05\x00S3\x9d%Z\x83l\xab\x86\x8d2\x01@r\x99\xce\x12\xf5u\xba\x8bm\x13Z\xf4\x12\x00\xb8\xc1]\xa2Z\xc3\b\x91\xe1c\xee\xd6>\xbd=\xa6\x92.4\x80\x01\xc0\xcc\xf0\x96(\xc30\x02\v']=\xa3\xfd\xaeX?\xa9\x9f*z\r\xd6u\x06\x80d\xc3[\xa2\f\xc3\b|z\x8fؚ\xfa]\xc9\x18\x16\x82D\x01\xb3\xc3Y\xa2,\xc3\b\x9f\x8b\xaeZ\x94\x94A!H\x140;|%\xca4\x8c\xe8\x11\xd5\x1a\xcfO}\xa7\x82\x81\xc8J\xef\x00`J\xf8J\x94i\x18\xd1\xee\x19ns\x1d\xe8N\xcaZ\x18\x82\xad\xb2{,Y\xd7\a\x00\x88\x03\xae\x12e\x1bF\xb4RÈ\x03\xadI\xd1\xe81\x84\xd0=F\x99\x00 y\U00014a0ea\x84g\x0f]\xf5\xda\xdd\x1b{\xef)!`+\xdcѩ\xe7\x12\x02\x00&\x80\xa7Du\f#\xba$\xa7\x88\xaeh\xf7I\x1e\xf4\xa2\x93FY\x00 \xa9\U00014a0eaD\xbf\x9b\x0e\x06O'\xc30\x02ft\x01\xb3\xc3S\xa2\x12\x1a\xc3\b?\xbd\xe9\x12\xd8\xd7\x17s\xb7\xa9\x01$\n\x98\x1d\xde\x12e\x18F\xe0\xbe=}cC-mɘ.2r\x8d\a\x80d\xc3[\xa2,\xc3\b|\xa9\xdd}\xa4\x8f\xbfB\x05_\u007f\x8d5m̜\x814\x85\xb7D\xcd\xc4\x12\x84\n\x921G\x05\x00\t0\x9d%\xea\xeb\x1f\xc3\x00`r\xa6\xb3D\x01 \x05\x00\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x02\x80\xa9\x01\x89\x022\xb0>\x8c9\x01\x89\x02\x04\x9f3\x0f-1\xca\x04$\x03\x90( \x12,.v\x9d\x86'\x96M\tw\x89j\f#\x84\x16y\xb5\x94\x031\xf7\x9b\x1aN\xda\xc2k=\xf8\xeb\xf2\xb2\xaa&\xab\xb3\xf7\xaa\xad/\x14n\xb7ng\xa4\x86\xf1\xcf\xcbݢ\r'\x83\xd0Ѿ\x87$\nU\xa9j\x06P\a#\x150\x03\xbc%\xaa5\x8c\x10\\\xfd>\x91>W2\xdcU<\xd9/\x84\xc2yy.gV<\xebm\xfb\xe2\xc8\xe4B\xaePXf\x99\xcdH\r\xf3d\xe1\x96\f\xbf&\x8c\x93@\xac_\xbb\x86\x8ef\xaf\xf0\x8a\x1c\x94\x17:d\xd5\x01\xe37\x90\x97\x91\n\x98\x01\xde\x12e\x18F\xd0\xe3\xf1\xd4\x00\x00\x0f\xb1IDAT\f\xd1U\x8cZ\xbac\xef8E\x84\x9bM?j\xc6\xc18\xc4'j9\xd7e\xd8ؾ\x80B\xd2\x0fd\xac\xc8\b\x15\x1bI\x8dP\xb1\x19g{5a\\\x04]\xb9\xf3bl\x0e\x1d\xad\x8a\x8e1\xabr\xc6T\xa9j`\x81\x18\xf3\xc2Y\xa2,\xc3\bʱ\x17\xf8\xaf\xba\xa0b\x04Ż\xbc\xd9\xd8\x12Ta\xd4\xe2w\xa2\xcep\xd4\x1f^\xf1>\x92\x1aa\xb6{\f\x8dh\xc2x\x18\xa8@\xf7\xc4\x1a>\x86\x8e6NZf7r\xabSՀD\xcd\v_\x892\r#\bîqݝ\xa6\x8c@\x16B\x19t\x04,ؤ\xe1\xdaZ\xd5\xf6\xcb\xd5\x0e\xc7\xfe\x8f\xb6=\xbchӗ\xea\x1d\x8f\xe5g\xac%-\xe3X\x8e<\xccˉ\x96J\x1fꓣ\xa6|\x9cߤI\x8dPհd\xf6@&\xca\x1cV\x85at\xeb\x10X\x9b\x91O.*\xf1ԁ\xe4\xaab\xa4F\xe8\x02\x89\x9a\x16\xbe\x12e\x1aF\x10ZO\xeb\xee3\x85\xf4y\xbdVI>\x17ıZ\x93\u05eb\x1e\xda]?s\xa6v\xf5\xe2\xda\xdd\xdb\xee\xfa4j\xc7\xc0\xfa̼#\xa2\xb2\xdd\xcd\x12\xee\xe8.\x80\xcf\x16*j^\r^fפF\u061cc\xed\x13\xaa\xec=AU\x18F\xaf\x0emy\x99\xebi\xff9\x9e:D\xba\xb9\xcc:\b\xe3]\x15\xb9q\xf5\xf1\x81$\xc0U\xa2l\xc3\bL\x16\xc1Nք\u007fV\xa8\x85cwt\x1fw\xd4_\xc37\xaei7\f\x95\xa1\xc7\xc4>䨄~\x17 \x98\xbd\x1d\xefȎ1v݂\\8\x90},*TªC\x1d*\x1b\x92C\xe3:(\xba\xb9L\x96\x88mp\xbc\xbd|\x80;<%\xaac\x18!r\xb25\xd6~S\x89\x91D\xab\xa3\x1bP\x19wn\x96\v\x8f\xa2\x10\xba\x9e\x13\x03\xa8[\xe8\x8ea\x05ފr\xd7\xe2\x1d\xb3\x04u\xa8\x82U\a\xb75W\x16]\x1cuPtsٛ;\\\xc5Њ\x9a\x16\x9e\x12\xd51\x8c\x10q\xf7\xc5\xd8mJ1\x92\xe8:F\xa2؆V\xa2\x85D\x11^\x8f\x84\xfe<l3UO\xb3\xde\xe6\xf1쵝_\x1f-lR\x87j\x98u\xb8T\x85*\xa5vԸ\x0e\x8an\xae\x1e^\x94\fG\x1d \x1exJT\xc70\x82\xacG\x9f4\xe7##\x89>\xc3H\x14G\xa2\xf9\xf1v\fk\xcaz{{\xcbj\xf46\xb7\x8bm\xdf}\x059\x01u\xa8\x86Y\a:\x1a}2\xbe\xa6O\xea掮\x8d1g\x0e3\xba慧D%4\x86\x11\xa4y\x8d\xef\xbb6\x05L@\xa2\x9d\xf9\xf1jCd\x16\x99$^;Kos\x1b\x1a\xc1\x17\xd0\n\x1c,\xb8\xa4\b\xd5yt$J\xe6tg\xc5c\x1a%ws[Q\x8c\xe7\x1c@\xa2慷DY\x86\x11b\x93\x9a\x94\x9b\xa2B\x8f\xd7kuz\xbd\x81Ќn\x8fzZ\xe7\xcb?\x0e\xae\xae\x1f\x1c\x8c\x1e\t.\xb3\x0f\xe18\x11\x8e\xa1\x8d\x01\x1c؈\x8e\xe9\x9c\xe0xvM[A\x91\xa5n\xb3ů\b\x15\x19t\xea 1d_\xc6LWs\x0f:H\x1e/j\x88%\xd1>\x94\x9c'G\x00cxK\x94i\x181\xcaz\xe0e\xeay#C\x9agqa!\x97\x06\xaa;\x92\x18_vP6\xe9\xec\x1e\a'\xc5B[\xf1\x11\xf1U\xef\xa6\xd2\xe9;lu\x81\x93E\xb9ͪ0\xc2\xcd\xd7\x01\x17\xc9\xd3I\xb1f\x84\xc63\x97\r\x8c\x1b>3\x05$\x03\xde\x12\x05\xccI[1\x82\x1f\xa3\x99\x13\x90( 1>\x00\x0eT\xa6\x04$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\n\x00\xa6\x06$\np\xc0\x95\xdd \xbe\xf6\xe4&\xb6L0@\x00\x89\xa6\x04\xed\x95~FhF\xfc\x95\xed\xda\xc4@\xf6Z4\x86\xf1}\xb6x~t\xc8,a\x1a\xc3]\xa2\x1a\xc3\b\xf1?\xf0\xd5\x17\xf6\xbd\xf0jܿ\x92\x9e\x86lAM\x8c0~\xe2\xf7\xaf\xb8y\xb6dh]/\xfa3\x85Y\xedxܲ1*}tE~\xf6\xec\xcd\xf2\xff\xbc˞\x93\xbf\x91\xfc \x8eU\x82><\xcf-)\xf0\x96\xa8\xd60\x02\aZچdž\x8f\xb4\xa4\xbdF;\xfb\x8dr\xe8М\xe1f\x84\t\x10\xbf\u007f\x85\x88\xc1jۃ\xef\xc6ގ=\x99\x9a\xa5\x9az\xad\xc1\x82V\xf1\xea\x12\xb5\x9e\xc4\xc87fo\xf7l̙M\xd7\xc8Y\x98Q\xd7ހZuJ\x90\xf2\xb3\x12\x13:\xb7T\x84\xb7D\x19\x86\x11\xdeV\xd2\xfd\x11Z\x13\xf1JHI*t\x970\x8a\xcd%\xcbzF\x98\b\xf1\xfbW\x88\xdd\x1c\x14{Q\x89u:\xeb\xb4Dh\xb0F\xaff\xe6\xcf܃\x86\x82\x85\xd1\xf6\x16K\n\xc8\xff\xfcp6i\\\x97X\xbb\xc9\xfa,\xcd:%\x10\xd85K\xe4\xdcR\x12\xce\x12e\x19F\x9c\x96\x16\xealO\xcaj\xd7<)\x8bg\x19\x13\x06\xceY\x01F\x98\b\xf1\xfbW`\xdcc\xb0\x8c\x91\xdeRJ\x11\x02\xb3\x9c\xd1I\x8f\xa1\x85\xe2\xe1\xa2ǘ\xc5\x05\xf4\xed\xbe\nrT\xda\u007f\x1f\x91V~`\x94\x80\xf5j\x96ȹ\xa5$|%\xca4\x8c\xf0\xb7t\xf9\x05\xbf\xb7\xc5Գ \t0\x90\x89P\xc3Ȫ\x82\xac*r\x15j\xa9\xcc.\"\xee\x12\x1eyy\x922\xb2NuF\v\x1e\xb5\xa0bU\xde:dq\xad-ʮҴ\x1fBΓѡ\xae\x8d\x84\x0e\xf1\xfbW\xb0\x850\xb8\xa9\xb6z\xf9\xa6\xda\x1b\xf8ui\x9d\x16\a]7\xf4Ʃu\x8bWﾎ\xf1.G\xf5\xf1\x9d\xb5K7}$goȊ\x9e\x16\n\x0e\vx\x99f\xb2\xa8[\x92\x91\xb3P\xfc\x9bX\x02X\xb1Y[\x02֓h\"疒\xf0\x95(\xdb0B8\xe9r\xb9:\xe2\x99\xecK\t\x84\xd6\x03\x05E9\xf9kW\x90ILgF\x9d\xa7\xd9V\x16āno\x91\xdd\xeb\xf5\x8a\xdd\x06\x9f\xd7\"~\x93z\x9cVU\xde\xe1\x03\x99\xc8ִ=\xe7\xbe\xe8\xf2\"MC8Ա\x91\x10\xe4\x85\xe95\u007fʸ\xfd+\xfc\xa3\xa3GБ\xd1Q\xf5\xe5\xf2\xdf\xee\xday\xe6\xfc\xa9\xe5\x8e/\xf1\xb5A\xba\xda\xd9\xe0\a$y\xa7c\xf7\xf9\xe3\x0f>~\x03_>S\xed\xa8=t\xa8v\xd1e)\u007f7KK\xda\xc9\"\x19!o\x95\xd8è\xd8S\x9c\x91\xe7\f-\xa9\xaf-\x81]3\x9c\xc0\xb9\xa5*\\%\xca6\x8c\x10N\xb6\x0e\xfb\x86[O\xa6\x8dF\xc5/\x1c\x9a'\x9e)m;\xc9\xecN/:HS\xc3\x1d]\xea$\xd3dU\xe7\xc5\xd6\\Qӫlхy\"\xb3,\x8a\x90e#a\x97[j;\xd6\xc3\xc0\xbfBgi\xfb\xe3\x0f\x92\xc6\xfa\xf8\xd2\x1b\xe4C\xb8\xa3\xfb\xba\xe3\x94\xf8\xfa\xae\xe3\x8c\xf8Z\xfd\xb0X\x93k\xb5\xf2\xa2\xdcc\xac\x81\xa0f\xb2H&\xe8\xcc\x12/[\xf9\x19\xb6-\x1d\xcdy\xf9r?^SB\x1c\x8b\xee\x1bzs\xa4(<%\xaac\x18\x11\x9a.J\xa3e\"\xcbB\xd3\x1d\x0f\x14\n\x84|:\xb4ґhxj\xc4ꌤ*h\x8b|+\x15!\xcbFbD^\x98^\u007fN\xd6\xc0\xbf\"\xd8\xe9\xf14\xa1&\x8fG=\x90\xfb\xb4\xf6\xe1ݧ\u07bfq\x9d~\bKt\xdb\xc3\u05ff\x14\xa9\xdd)\xc6\xd5\xfbI\xcaq\x87t\xc9\x18\x93.Ij\nu.\x1cut\x01\xe32+\x11\xf0X\xb6ܧה\xa0S3%F\xde\x1c\xa9\nO\x89\xb2\r#\x82{.\xd0\xf0¾\xf4\xb9\x00\x96U\x84\x02\xf9\xd2O\x17\xd7ӑh(\xaf*U\x81b\b\xa6\bu\xac,\f0\xf0\xaf \xb0F|\xd7N=\xb3ڱ\xfc\x97\xeaV\xf4qGd\x01\xd1\xeaC$e\xd0!ݐ\xe9e\xac\xca\xebEm\n\xc3\xe50\x81\x9aLz\x17\xa9\xa6\x98~\\V&%\xb3J0\x9aȊ\xe3\xdcR\x12\x9e\x12e\x1bF\x04\xf7I\x12\xedO'\x89\x86ĸ\xa2\xb0\x9f\xe2\x0f\xa7\xd2[\xc1T\x8c\rVu^=\x89\x06\xacM\x8c\xd0xb\x95\x85\x81\u007f\x05\x81!\x84w\xf7\x8b\xe2\xbcvf\xd1q\xf2\x81\x1e\xf8ԧ\xa4\x15}\x97BZ\xce\xea\xddd\xd3)\xb9\x15m\xb2h\xe7\x9dkl\x02vF\xaa/\xe3+˕\xbaS\r9t\x9c\xb3D\xbe^\xb1J0\x92h\x1c疒\U00014a04\xc60\xa2S\xee\xe8\xa6\xcd,\xb9Bv\x1dҽ\xf8\x8d\x9bɫ]\xec\xea\x8d\xd3\x04ҟ\vV\xc4)Q\\sGP\x1bNL\xa2\x06\xfe\x15\x84K9\x9a1\xe3!\xc7y\xf2V\xbf\x8b\xbe\xd6c\xfc\x19\x19\x80\x9e\xa7\xa3P\xbc\xff\x97\xe2K\xf5r2\x16}\xb8\x9ef\x0f\x16/\x8c.\x01\xfb-\xebq?j\xcaP[,\x0e\xcc*\xbaD\xfcM\xc9=Or\xf2\x97裼\xec\x12\x985S\x12ǹ\xa5$\xbc%\xca0\x8c\x10\x0e\xb6\x0e\x8d\r\xb5\x1eL\x97\xe9\"\xa1\x87\xce\xddJ\xa3\xc6\xf5\xe8\x81\xd6v'\xa2\x97\xa5&\xeb\xf6\xb6y\xd9\xe4\x94+m[6W\xa2L\xf7\xb0\"\xaf\xcfkq\xf6\xe0~\xa7\xc5\x1b=\x17\xf9N\xc6\xf6\xa80\xa6\x8d\x84>\x86\xfe\x15:\x1cr,>\xf4\xfa\xeb;\x1d\x83\xf4C\xf5\xf1\xd7\xeb\x17\x93C\xef\xbfk\xdb\x191\x95N\x179֝9\xb5z\xe9\a4\xfb\x0e\xa4}\x8cj;\x1a\xc1\a\n\x83VU;x,k\x96\xc7\xeb\xf5:\xf3\xc5x\xa3\xa5\xa1c\xbb\xad8\xa0[\x82\x01\x13=7\xf3\xc3[\xa2,\xc3\b\xa1\xf7\x88\xbb\xad7m\xfe\xb2\x03\x92\x0f\x85\xdc\x0et\xd8m\xb9v\xe9&\xb0P\x97\x9be\xa7&\x81#\xf6\xac\x9c\xaa\x8d\b\xd5)\xf2։\uf5a1l\xf1\xb5.\xbaĆ\xafw\xab\xc3\t\xdaH\x9cDF\xfe\x15lN\xd5\x1f\xaa\xad~\xb0\x9e*\x14_\u07fdtQ\xbd4\xe6<_\xbf|i=m`\xabw\xef\\Z\xbb\xed/4՛\x15\xbe\x8f\x1b\xe1\x0e\xb1\a\xe1\xb5x\xd4\xf3\xb1\xa1\x19hڻm\x9d\x9dU\xd4\x10\xd0/\xc1\x80\x89\x9e\x9b\xf9\xe1-Q`\"<fie\x84&B\x9a.\xa2\x1c\xb48\xb5W\xdbqtD\xecAU\xa2\x15\x9a-\f\x98%L_@\xa2)\xc1\x8e\xfcqFh\x1e\"\x12\xf5\xcfb\xfeL\x85\xdeX\x12މgFP\xa7\x84i\vH\x14\x98\x04\x14\xad(0ɀD\x81\x9b\xe6\xb3\xc1\xea]\u007f\xb8a\x94\v\x98\x18 Q\xe0\xa6\xd9\xe5p8\x18\x0f;\x01\x93\x02H\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\xcdt\x96h\r\xb2\xad\x1a6\xca\x04\x00\xc9e:K\xd4\xd7\xe9.\xb6Mh\xd1K\x00\xe0\x06w\x892\f#\x82\x03m\xfbڒӜu\xa5\xe1Z7@z\xc1[\xa2\fÈ\xa0\xc7\xdd?ڷ\xa7/\xe6~SD\xaf\xc1\xba\xce\x00\x90lxK\x94a\x18qa\x0fY\x85\xe1\x9d=\xc9\xe8r\x82D\x01\xb3\xc3Y\xa2,\xc3\bO\a\xdd\xd4\xd2\x17c\xbf\xa9\x02$\n\x98\x1d\xbe\x12e\x1aF\xc8K\xea\xb6\x1f\xd3\xdfo\xca\x18\x88\xac\xf4\x0e\x00\xa6\x84\xafD\x99\x86\x11\xdd-t\x05@\xf7\x91X{N\x11\x82\xad\xb2{,\x9e\xa5\x00\x00 Ip\x95(\xdb0\"\xe0\xf6\xf8\x05_\xbb+)k\xf2\x1cC\b\xddc\x94\t\x00\x92\aO\x89\xea\x18F`\xbf\xc7\xe5r\xf5x\x92a\x9f\x1e\xb0\x15\xee\xe8\xd4u\t\x01\x80\xe4\xc3S\xa2l\xc3\b\x82\xe0\x0f\xe2\x96Wc\xed;E\xf4\xa2\x93FY\x00 \xa9\xf0\x94(\xdb0\x02K\xbe\x92#\xaed\xb8\xcd\xc1\x8c.`vxJTBc\x181\xec\xf2\x8bb=\x90\x94\xa9U\x90(`vxK\x94a\x18\xf1\x8e덱\v-\x9ed<\xb9`\xe4\xe4\x03\x00I\x87\xb7DY\x86\x11\xfd\xadnO\u007f\x12\xee|\b\xbe\xfe\x1ak2\xba\xd7\x00\x10?\xbc%j&\x96 T\x90\x8cid\x00H\x80\xe9,Q_\xff\x18\x06\x00\x933\x9d%\n\x00)\x00H\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rw\x89\x86\r#0\xee\n\x99DD\xbc#\x00\x00P\xc3[\xa2a\xc3\b\x8c\xc7]\xd2*\x80\n\xef\bs\xd0\xd9o\x94\x03\x00\xb8\xc1[\xa2!\xc3\b\xb1\xe9l\x95%\xaa\xf0\x8e0\a\x155F9\x00\x80\x1b\x9c%\x1a6\x8c\xc0]\xae\xae}\x92D\x15\xde\x11\xe6\xa0l\x99Q\x0e\x00\xe0\x06_\x89F\f#\xb0\x10\b-w\xad\xf0\x8e\xe0\xca@&B\r#\xab\n\xb2\xaa\xc8%\xa2\xa52\xbbhm@l\xe6\x91D\x19\xc6u(\xa3\x05\x8fZP\xb1*o\x1d\xb2\xb8\xd6\x16eW\xa9;旫\x1d\x8e\xfd\x1fm{xѦ/\xd9G\x03\x80\x89\xc1W\xa2\x11\xc3\b\x82,Q\x85w\x04W\x84\xd6\x03\x05E9\xf9kW QmΌ:O\xb3\xad,\x88\x03\xdd\xde\"\xbb\xd7\xeb\x15\xdbt\x9f\xd7҄q\x8fӪ\xca;| \x13ٚ\xb6\xe7ܧ*\xec\xfa\x993\xb5\xab\x17\xd7\xee\xdevק:\x87\x03\x80\t\xc1U\xa2\n\xc3\b\x82,Q\x85w\x04o\xca\xd0<\xb1F\xb4\xedtc\xb2d\xe7A\x9a\x1a\xee\xe8ZE\x89\xe2&\xab:/\xb6抚^e\x8b.\xecqG\xfd5|\xe3Zt2\x00\xdc\x14<%\xaa4\x8c \x84ZQ\x85w\x04gʬrw\xf5\x81B\x81\x90朗l\x89\x86\xf2b\xab3\x92\xaa\xe0\xf1jh@\x81ɇ\xa7D\x95\x86\x11\x84\xd0XT\xe5\x1d\xc1\x95\xb2\x8aP \x8f@\x97\xd0\x0fl\x89\x86\xf2\xaaR\x15<\xbe.:\x05\x00n\x1e\x9e\x12U\x1aF\x10d\x89*\xbd#8\x13\x16\xe3\x8a\xc2~\x8a?\x9cJ\xef\xd3R16X\xd5yu%\xfaLt\n\x00\xdc<<%*\xa1\x19\x8b*\xbc#x\x13\x96]\a\xa2։\x1b7\x93W\xbb\x1d\xe3q\x9a\x90\xfd\xa4X\xbd\n\x90(\x90DxK4l\x18!\xf8|\xeeN\xdf8I\x8bxGpE\xe8\xa1s\xb7\x92u\xe1z\xf4@k\xbb\x13\xd1\xcbG\x93u{ۼlR\x9fJ͕ۖ(\xd3=\xac\xc8\xeb\xf3Z\x9c=\xb8\xdfi\xf1*\x9fY\xfc\U0008f0eb\xeb\a\aa4\nL6\xbc%\x1a6\x8c\xe8\x93F\xa5\xd4\xc9%\xe2\x1d\xc1\x93\x81\f:\xfc\\(}\xea\xb0\xdbr\xed\xd2\x1dZ\xa1.7\xcb\xdeK\xa2\x11{VN\xd5F\x84\xea\x14y\xeb\xc4w\xcbP\xb6\xf8Z\xa7(첃\xb2\t\x03\xc0\xe4\xc2[\xa2\x00\x00$\x04H\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00L\rH\x14\x00LM*H\xb4\x06\xd9V%\xe1Ǥ\x00`\x06RA\xa2\xbeNw\xb1-`\x94\v\x00\xd2\x12\xee\x12e\x19F\xa8B&]h v\x06\x00HSxK\x94e\x18\xa1\n\xd9\xf4\xa2\x9e\xd8\x19\x00 M\xe1-Q\x86a\x84*\xd4\x01$\nLW8K\x94e\x18\xa1\f\xf5\x00\x89\x02\xd3\x15\xbe\x12e\x1aF(C=\x06PW\xec\f\x00\x90\xa6\xf0\x95(\xd30\"*d\"\xd8*\xbbǒ\xb0D \x00$\x1b\xae\x12e\x1bFD\x85l\x8e!\x84\xee1\xc8\x03\x00i\bO\x89\xea\x18FD\x85L\x02\xb6\xc2\x1d\x9d\xa3\xb1\xf3\x00@:\xc2S\xa2:\x86\x11Q!\x93^t2v\x06\x00HSxJT\xc70\"*d\x023\xba\xc0t\x85\xa7D%&4\x16\x05\x89\x02\xd3\x15\xde\x12e\x19F(B=z@\xa2\xc04\x85\xb7DY\x86\x11J\xef\b\x16\x82\xaf\xbf\xc6\xca\xdfP\x02\x00\xcc\x00o\x89N\x84%\b\x15\xb4\x1be\x02\x80\xf4$\x15$\xea\xeb\xe7\xee\x9a\x06\x00f!\x15$\n\x00\xd3\x18\x90(\x00\x98\x1a\x90(\x00\x98\x1a\x90(\x00\x98\x1a\x90(\x00\x98\x1a\x90(\x00\x98\x9a\xff\x0f5\x16\x1d\x16\xa8\xc9g\xc2\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/callers2.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03\xfc\x00\x00\x01\xb0\b\x03\x00\x00\x00#z\x9e\xf7\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x04\x06\x02\a\t\x05\n\v\x15\a\x0e\x10\x0f\x11\x0e\x0e\x12\x1d\x15\x16\x15%\x19\x10'\x1a\f\x1e\x1d\x17\x16\x1e.!# #$\"$%#%'%'(&)(\"()'-+ *+),-+-.,12053'O.\x0f352786<:.9;8=?<B@4#Cxb<\x1aAB@j=\x11DFCLH9\x00f\x00\x00g\x00\x00h\x00\x00i\x01JLI\x00j\x02\x02k\x03\x04l\x050R\x95OPNVQ@\tn\a\fo\tRTQ\x83L\x1d\x0fq\v\vr\x17UVT\x0fs\x18WYV\x11t\x19_ZH,`\xae\x14v\x1b7]\xad>]\xa1Z\\Y\x16w\x1d\\^[\x19y\x1e:b\xac_a^Ya\x8bac`\x9aZ\x1d*{!@f\xb1Ke\x9e(|*dfclfP+\u007f,fheMj\xaf.\x81.Fm\xb1ikh0\x8301\x841/\x859Jq\xb5mol\x89j_oqn;\x86:>\x88<\xb3h\"{s[Vu\xb5sur?\x8a>@\x8b?uwtB\x8c@@\x8dG\\z\xba\xadq?y{xJ\x8fI^~\xb8L\x90K\x94wq\x85}d~\x80}O\x93Nb\x83\xbdN\x95U\x81\x83\x80W\x95V\xa7|e\x8e\x85gm\x87\xbcZ\x98Y[\x9aZ\x87\x89\x86]\x9b\\^\x9d]\xba\x82Z\\\x9ddr\x8d\u008a\x8c\x89\x96\x8cnd\x9ddf\x9ff{\x90\xc0\x8f\x91\x8eh\xa1h\xe3\x83+ЇK\u007f\x93\xc4j\xa3jz\x97Ɠ\x95\x92s\xa4l\xa0\x96wq\xa5s\x81\x9aė\x99\x96\xe4\x8b@u\xa9w\x9a\x9c\x99\x86\x9eȜ\x9e\x9b\xef\x904~\xaby\xa8\x9e\u007f\x9e\xa0\x9d\x80\xad|\xa0\xa2\x9f\xf9\x94.\xa1\xa3\xa0\xa2\xa4\xa1\x81\xb1\x85\xff\x952\x92\xa6ˤ\xa6\xa3\xb3\xa6\x82\xa5\xa7\xa4\x8b\xb2\x88\xa7\xa9\xa6\x8d\xb5\x8a\x8e\xb6\x8c\xaa\xac\xa8\xb9\xac\x88\x8d\xb8\x93\x9e\xaeΕ\xb8\x95\xad\xaf\xac\x97\xba\x96\xaf\xb1\xae\x98\xbb\x98\xa3\xb2қ\xbe\x9a\xb3\xb5\xb2µ\x90\xb5\xb7\xb4\xa3\xbf\x9d\xac\xb7Ң\xc0\xa4\xb7\xb9\xb6\xb9\xbb\xb8\xa5ħ\xb1\xbc\u05fb\xbd\xba\xa7Ʃ˾\x98\xbd\xbf\xbc\xa9ȫ\xb8\xc0կǫ\xbf\xc1\xbe\xc1ÿ\xb2ʮ\xc2\xc4\xc1\xbd\xc5\xda\xc4\xc6òͷ\xb9̸\xd6ǝ\xc7\xc9ƻκ\xbcϻ\xc4\xca\xd9\xc9\xccȾѽ\xc0ӿ\xca\xce\xde\xcd\xcf\xcc\xc4\xd0\xde\xc8\xd3\xc1\xcf\xd1\xce\xdfѥ\xc7\xd6\xc9\xd1\xd4\xd0\xd2\xd3\xdd\xca\xd8\xcb\xd3\xd5\xd2\xce\xd6\xdf\xcc\xda\xce\xe7\u05eb\xd6\xd8\xd4\xd4\xdb\xd0\xd8\xd8\xe3\xd8\xda\xd6\xd3\xdb\xe4\xda\xdc\xd9\xe6ݯ\xd7\xde\xd3\xd5\xdf\xda\xdd\xdd\xe5\xdc\xdf\xdb\xd7\xe1\xdc\xde\xe0\xdd\xf0\xe0\xb3\xdc\xe1\xe4\xdf\xe1\xde\xe1\xe3\xe0\xe3\xe5\xe1\xe1\xe6\xe9\xe4\xe6\xe3\xe8\xe5\xea\xe5\xe7\xe4\xe6\xe8\xe5\xe4\xe9\xeb\xe7\xe9\xe6\xef\xf2\xee\xfe\xff\xfc(t:\\\x00\x00 \x00IDATx^\xed\xbd\x0fp\x14G\x9e\xe7\xbb\xcc{\xbe}ϯ\x84zf$\xf5\xae4b\xef8M\xb4BB\xc7\x19\x9e%`\xd7z\b\x8b\xf3\xc2C\x1b\x02\xc1\x03\x9d\xe1\x16\xc6\xd8\xf3\b\xb3+0\xecB\x888\x9be,\xeel\xe4\x85~\x92\xb5\x1e\x99\x91X\xd9 \xa2ό\xa4\xc0\x9a6 ,\x06#\xd9H0\xd8\xc6\v\xde\x18\xf5\x10\xb6\xc5ȱ\xf66a\"\xda1\xd1\xe4M\xbcʪ\xee\xaa\xcc\xea\xcc\xca\xeeVw\xb6\xd4\xf5\xfb\x04!\x15\xa9\xac\xac\xac\xac\xfev\xfd\xe9\xea\xfa\xfc\xc1\xef\x93\a\x01\x000{\xf9\x03Q\xc2m\x10\xb5\r\x00\xc0\f\x06\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0fd+aQ\x05\xa7\x03\xe1\a\xb2\x92@c\xa1\U00084a12Á\xf0\xf7.\x9e\x14U\x91I\xc2ݙZ\xdc+\xaa2\xa3\x90\xd3\xdfpI\x89w  \xaa\xe5p\xe4\x86?\xd0w\xbc\xbd\xfbB\x10O\x06/\xbc\xd1\xfe\x86>I\x94\xf2\xf8\xd7#kk\xf7=\xb0\xab\x11C\xb3\x92\x8b_e\xbe<\xa5ٮZ\x8b\xfd\x9f\xd9\f\x14\xfaDU\f\xa6\xb6\x15歈\xfb\b4\x89\xee\xb4\xe4\x1c\x14U\x91\x8b`t\x92\xeeo\"\xa3~U\xe9\x13U\x01\xa4\x86\u007f\xd2\xeb\xbb\x11\xb8q\xf2\xb8\x9a\xf3`\xe7I<\xd9\x19\xa4J\xb9\xecn8\xfbR\xed}\x9b\n\xb1L\xd5\xe7-U\u007f-ͫ\x9f\xb2\xa9՚\xd3a\xf3W\x1e\xbe\xfc7DU\f\x96\x16z\x1b\xf3l\xdf\xd9\b\x92\xea\x8eon\xab\xa8Jz\x18\x1ce\x16\x8bFG\xd8\xdf$\xdb%\x19V\xfc\xa2*\x80\xd4\xf0\xdf\xf6\xe2\x03\xb1\xa0\xf7\x06B\xfe\xee\x90:\x19\xea\xf6S\xa5<\xeeW\x9fA\x0f\x12\xcb>BM+\xd4\xccM\xe5\xadh\xb2\xa9s\xdbe\xf7W>q\xef\xc9єҊ\xc2\xf1f?\xc9\xee\xecqe\xe6\x00wa=\xbb\\4:\xa2\xfe&\xdb.\xc1\xb02$\xaa\x02H\r?\xd2B0\x89\xc3>\xa0\x9f\xf8\xf5\x0eP\xa5<>\xab~\x97\xffG\x1eM\xf5K\xbbP\xe7\xf2z\xbb<5\x16ś\xcbd\xb9\xa9\xc4\u007f\xac\x9alw\x82E\x8d\xa2*i\xa1\xacNT\x83\x8d\xa8\xbfɶK\x00\xe1\x8f\x03\xb9\xe1W\t\x05\xba}\xea;\xf8T\xe7\xe0Th\xca\xdf9E\x952\xf9vm\xb5\xc61\x84\x8eTW\x9fC\x9f\xd5Voœ\xb5g\x8fm\xad\xdd\xf7[\xad\xceg/\xac\xadm\x88LGi\xaao\xadC+\xbc8\xfc\xc1\xba\"W\xf1ʫj\xe16en\xeb\x93\xc5\xee\x957\xb5*\xa1\x02\xed\x9d!T\x98\xdbT\\4\xb8\xdd]\x15\xe4\xd4%g\v\xe6)J\xceq\xa4U\xc8\xf5\ue61f\xb7\\{ۚZ\xef.ޱÝ\xdfMt!\xe4V4v\xe0\xba9\x9d\xea\x9e])\xb1̆n\u05f9s\vW\x04\x88\ue82bs\x15e\xcf\xcd\xf5\xf3\U000961f8\xb3u.Ο\xbf#\xfaV\xb1'/\x84(\x12n\x81\x81\u007fyq\xae{E1\xafԧ\xaf\x9aRF--\xbeщ\xe9o\x8a\xda5\x19\x84\xf0\x8b\x91\x1c\xfe)\xaf\xd7ۡ\xbd\xe0B\x03\xead_\xc8R\xca\xe4ӱs\xd5=cc_\"\xf4۱\xda\x1e\xf4`\xecH-B\xb7\xce\xd5V7\xf4\xf4\xac~\x01\xd7\x18\xab}\xb6\xe7J\x8fzn@\xd2T\x1fȟ\xfa^\x00\x87ߧ<9ؽ2g\x18\xa1\x1b\xc7\xe7*\xc5\a\x9b\x8b\xf3\xc6q\x95QeP\xab:X\xa0\xecX\xaa\xb8\x0f\x16\xb6p\xeaR\xb3]\xf6\xfb]\xdae9\\Z\xd8\xdcR\x80wT\xa1\x92\xa2\xd6fW^\xfb\xf2\x16\xb2\x0f\xef\xfb\xbb\x94f\xbf_}\x9d\x06\xfc\xb9\xea<C\x8d.z64\x98_\xd62Ь\xb4\x90\xdd\tu\x1f/\x9e_P\xbcc\xbd\x12\xe0\xcd֘\xb3\xdd\xd7ZX\x16yü`}\xa9'\xdcB,\xc3\xca\xfa7\x06\xbcn\x85\x8e\xa9Y\x1a\xbc\xe0\x9f_\xe5\xf7\xfboPK\x8botb\xfa\x9b\xa2v#\x84&\a\x17\xba\x93:\x86r\x16\x92Ï&\x03\xe3\xdd\xf8\xd2^h\xa0\xfbF\xe0F\xf7@\x88*\xe5a\x1e\xf6\xab\xe1G\xa8\xa7V\x9b\\\xad\xee\xe9_lP\xa7\xbeݴ\xef[\xf5\xe79\xfa\xaa@S=*۶\x10i{\xfen\xdcx\x99\xf6\xb9\xafk\x1e\u07bd\x17/\xc6\xd3>\xe5\xb6^\xb7h\xbd:\xedC\x8dOr뒳!\x94\x17\xb9&\xefr\xab/\xcb\xf5\x85\xeaT\x97\xa2\x1e,\xb4*\xe3Ȃyد\xbdt\x9b]\xf4l\xa1bu\xaf\xa6\xbeʵ# \xa3;\xea\xf2\x95\xa5A\xfd\x84\x889\x9bO\xc1\x17\x06\x87\x95.\xbdv@\x89\xbd\x14\x96X\v\xb1\xb4\x16\xe2m\xd3\xea\xa6\xdf\x1d\xa8R\xe2\xf0\xdc\\\x1a\x8actb\xfb\x9b\x9av#<\xa1\x1e8$p\xb2\xe5Xd\x87\x1f\xe1W\xfa\x80y\xc1\xef\x02Uʃ\x1d\xfe\x97\xa2\x93W\xaa?e̤\x86\xbfE9\xa8\x85\x1fM\xb5.\x9fW\x80\x8f$\xd5W\x8evhݪ\xe0\xb8\xf5\x1a\xe1\xefBCJ\x10\xcf«K\xceF\xbc\f\xf1ɫ\x96\xab&7\xc2I\x8f\xf9\f\x9b\x1d~c6\x9f\xf2\xbeY\xb7\x97\b\xbfqM\x8c9[\xfd\xbc\x10\xa68r\xee\x1c`d8\xb1\x16b\t\x14\xcd\xdb\xe6}?l9>\xa7Jɐ\x92\xd7\xf0\x84\xa3\x13\xdb\xdfԴ\x1b!\xd0\xe7-\x81=\xbf\x18\xa9\xe1\x0f\xe9{\x91\xab\xdep\xb8]\u007fͿ\xdf\x1e&J\xb93\xb2\xc3oL\x9e\xa9\xfe\x961\x93\x9a\xe4\xa9\x1d\x93Z\xf8\x87\v\x8b\x9bN\xfa\xab\xf4@k\xaf\xa0A\x05\u007f\x9c4\x14=\xfc,\xeaC\xc3.m\x16^]r6\xe2eh\xe4\xaa\x05\xbf-\xf4Ż\xe7'f#\xd2etG}їE\xa7\x98\xb3\x95EN\x8c#\xf7\xb0\r+ƛ\xa8Ab-0\bz\xebJ\x94B\xeax\xdaRJ\x86\xd4X\x1a\x8act\x18\xfdMI\xbb&~e8\xa6\f\xb0 3\xfc\xe1N\xfd\x94VM|4\xfc\xa3\xea\xa4Yʝ\xd3\x12\xfeW-\xe1\xbfR}\x8b1S\x93\xfe\x81\x11\x0e\u007f\xc9b\xbc\x1f\xa8\xd3\x03\xbd\x1d\xff\xf4*\xb8$芼\x9c\x88\xf0s꒳\xb1^\x86\x81\x9c\x15\x81\xab\xf3\x17Ǭ\x83%\xfc{,\x19\x1cP\x88ϴ\x8d\ue42f\u007f\xe6l\xeb\xe7\x8djD\xae\x976\xbbb\xf7s\x89\xb5\x10\xcbe|\xa8\x13\xecʣ?\x93\xa7J\xb5E\xb4\a\x8c\xc9(\xc2щ\xedoj\xda5\x81\xab\xfdq 3\xfc\xe8\xb8vוv\x80?\x189\xec\x1f\xa4Jy\x10\xe1\u007f\x15\xa1\a\xcfZ\xc2\u007f\xbfa7\xde\xf5\x1f;F\xcdD\x84\xbf\x18\xbf\x84\xc2\xfa^\xc4U\x88O\"\xe7U\xe9\u007f\x9c\xa7\xbfn\x88\xf0s\xeaR\xb31^\x86\xa3J\xa1\xa2T\xc5~\\i\x86?O\xedHx\xa1%\x83\xc1\xa2*<\x10۵\xb7\x16\xa3;䋞9[\x9f\xa2]\xdeޣ\xdf+\x17.Y\x81bH\xa8\x85\xdb\xcd1\xf7\xd54\xeb\xf7\xc8Um\xe3\x97V\xa9\xa31\xa9\xb7#\b)=:\x8c\xfe\xa6\xa4]\x02\b\u007f\x1cH\r\xffM\xef\x00\xbeʧ]\xf0\xeb\xea\x1e\x0f\x8cww\x85\xa8R6\x91\xab\xfd\xdaݽ\xbb\x1bzz\x9e\xad\xae={\xeb˱\xda#c\x0f>=R\x8b?\x05\x18\xab\xddz\xf6ʱ\xea\xb3\xe4\\S\xf5ڋ\"PU?\xa5\xbe\xb4\xeaZ\x0f\x96)\xee\x96!\xf5\x95\xa3\x94u\xb7\xcfw\xebg\xd77s\xb4\x03\xcd\x1b\xee\x96`W\xee\xd5 \x9e\x85Sל\f\r\xf9\xfd\xaeF\xbf?\x88\xaf\xe07\x0e\xa1\xd1\xc6\\\u007f\x00\x8d\xba\x06|\xfe\x80u\x17\xa4_\xed\x1fҊ\x17\x17\x1e<\xb8X\x99\xdbq\x83\x9c\r\r~\xaf\xc4\xebۮ\xb4\x93\xddQ\x97\x80/x\xeb]d\xcf֤\xd4w\xf76*\x9dZ\x95\x16\xc5\x1a\xddD[X\xa9\xe4[\x87\xbfY\xc9o\xf6\x9dl\x8c|\x00\xc1,mv\xb5\xf4.\xcd\x0fPK\x8bgtb\xfb\x9b\x9av\t.3N\x84\x00\vRÏ\x02\x83\xdd\xed'\x87\xb4\xb3\xdc\xd0\xf0Ɏ\x93\xc3!K)\x8boWk\x1f\xf3\xd7\xfe\x06\xff\xe7\xb3ݵ\xab\xf7\xbdZ]}\xe4\b.\xfa\xb4V\xfdyD-\xfe\xcd\v\r\xab\x9f\xa5o\x04jV\x14|]h\x9b\xa24\xa3p\xcb|Wa}\xc7<\x97\xbaKq\xedh,(Z\x1f\xddY\xec\xf9\x9e\xfa\"\t\xab\xbb\x8f\xe3\x05J~7>\x05\xe6\xd45'\x87s\xf4\xb3e/n[\xc9\x1d\xcfW\u007fnC\x17\\\xb8,\xb7\x8a:\xfd\x8c|\xce?W\xbby\xf1fU^\xc1\xf2&\xb5.9\x9bZ\\W\\\xb0\xf0$\xd9\x1dtU_\x82\xbe{\xe4\xcc\xd6W\xe5v/\xd6\xf6\x96ȟ\xb7\x03YH\xb0\x05Ԟ\x1fs\x8e\xdcY\xd5\\\x9c[TEg\x9f.\rmw\xe7U\r\xd3K\x8bct\x18\xfdMI\xbb$\x93s\xeb\xaeN2\xde\x14\x00\x02\xb9\xe1\x9f\t\x98\xe7\xd5\x1a\xdb]\xd6\xfbC\b\x88\xba\x96٬L\xe6o\x9b\f\x85\x82\xc3uӼ\xcal\xdb\x1d6]\xaeF\xee\x1bg\xdc\xf4*\xd3\xeb\xb7=\xd4褤\xbf:6\xa3\xde[bw1\x13\xc08>\xfc\xa8\xa5\x98\xff\x1d\xda\xf8\xc3\xdf\x1b\xf9<<\xec\x9e\xe6\a\xccv\xdda2U\x94\xe4\x97\xe4\b\xc2\x1d\xee'Eu\xa6\x039:\xa9\xe8o\x14\xdbQ\x9f\xbcʸ\x16\x00\x10@\xf8\xed\x88?\xfc\xa39\xfa\x91\xe7x\x0e\xf1\xb9\xfd\xac!\xe0ޑ\xaa\x9d1\x93t\x8dN\xba\xdau\bN\v\xbf~\xb5(>\x88\xba\xc2\xd9\u008dyOv\rv=\x99\x97\xd6=\xe8l%]\xa3\x93\xaev\x1d\x82\xd3¯]-\xba\x8d₨\x1b\xc7l\xbe\xe5E\xae\xa2\xe5\xd3<\xe8\xcfZ\xd25:\xe9j\xd7\x118-\xfc\x00\x00D\x80\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\xa3\x03\aX\x93\x00\x90\xed\xc8\r?[ץ2\xee\xcd\xd8MZ\xff\xecy\x991\xa9\xf1\x91G\xe7z\xccL1\x1c\xf0x\xfaEuf\x12\xa9\xe9\xef\xc5\xcawDU2@j\xd6M̝R\xcf\x1aQ\x1d\x9aSt\xcf2=|R\xc3\xcf\xd6u\xa9\x04\xdb/t\n\xe6M\x1b{\x17\xdceLj\x84?\x189\xe591\xf2\x81͗^.}\xa8\xff\xbe;R\xdaƯ\x958\xd1vSM\x92\xfd\xe5t\xe7|\x85\x94\x94%H\x82\xeb\x96<\xd7\xf6\x97\x8b\xaa\xd0\xdc\x1b\xd9H\xf6,\xd3\xc3'5\xfcl]\x97\x8ao \x90\xa9\xf0Ox~\u00984\xb8\xe6\xf9 \xa6\x8c\xe4\xff\xd9\x15\x9d*O\xe9\v\xcel7\xb5$\xd9_^wf\xe8\xe32\x12Z\xb7iЖ`\xf8\x11\xdaI\xf5,\xc3\xc3'5\xfc\x1c]\x17\x1a\xef\bf,\xfc\xfb\xcb\xef2&\rD\xe1ߐ\\\x98\x84lHS\xf8\x93\xeco\xba\xba\x93&\x12Z\xb7i0\xdd\xf0g\x18\xb9\xe1Wa躂\xed7Q\xa6\xc2\u007f\xa7\xf4\x10c\xd2$\x12\xfe\xe7=\xa5\xa7\u007f\xb2\xaa\xe2\xa9ϩ?\xbe\x13\xb9&\xb0\x01\xff\xa7\xfc\xb0Y\xe1\xe7\x9b+V\xfd\x84>Yh\xf3\xe0\xf3\xbd~\xf5\xe7Q\xf5\u007f\xa76T\xac;\xa5\xfe\xfe\xa8T\xfd\xff\xc4ޚ\x05O\xabc2\xf2TMi\xe535\x96vI&vU\x96.yF}\x8b\n\xeeZVZ\xb3\xf3#\xadИ\r1\x17L\x90H\u007f\xd9\xdd!\xfb{\xaf\xc2\x139\x85\xa5F\xe7뽕\x8f\x1d>\\i=\xa2et\x9d=\xa8D\v\xd4\xe8\x18cF\x8fd\x14\xaa\x94\xb5n̥\x85\x97\x94\xbe\xf2زK\x87\x16m\tZzv\xe2\xc0c\x8f\ue720&\x119Pw\xf7.[\xb4\x8b{\xd8\xcfiW\v\xff!\xb5\x8f\v\xbeNp\xf8҂\xe4\xf03u]>u\xf7\x9f\xa9\xf0\x1f(\xfd\x9c1i\x12\t\xff?\xf7\x97z*\xdbN<B\xef\x00\x83\x1f\x8c\xac\xda2222\x81\xffS\xeeY\xd3\xff\xce\x12\xad\xc2~ϡ\xf3'*7P\au_=\xb7y$\xa8α\xf9\xb9\xaf\xf01\xc6\xd1\xf3G\xcb\xf7\xaa\xa3\xd0\xdf_\xb3\xea\x91\xc7~\xb2\xd7s\a]\xf7\xec\xed\xbfx\xba\xd2\x13\xa6\xdb%x\xafb\xc3\xeb\x17\xdb<'ԳEρ\xf7\xfawz\xae\xa9\x85\xe6l\xec\x05\x13$\xd2_vw\xc8\xfe\xa2\xeb##\xfa.\x96\x1c\x9dКe\xa7\xda\xca+N?u\x82j\x8d\xd5u\xf6\xa0\x12-PK3ƌ\x1aI\x03\xaa\x94\xb5n쥽\xb7\xc8\xf3\x93\x1fy*_[\x12ӳ\x9a\xd7\xdaj*>!'Ɂ\x9aX\xb4\xea\xf4;Oy\xb8{~v\xbbZ\xf8\xef\xee\xf5\x9c\xd06\\\x02×\x1e$\x87\x9f\xa5뺁\xdf\r2\x14\xfe;\xa5\a\x18\x93\x04\xc6a\u007f\xf9\"\xf5\xadao\xa5\xf5\xef\xc4a\xf4\x92\xaf\xd5W\a\xaep\xde\xf3\x966'\xfd\xe6\xfd\x96~ex\xdd\xcf\x11\xba蹈\xf0\xcf\xf3Z\v\x9e\x1f\x05\xb5\x13\xa2S\x95\xda\xfemQ\x98n\xd7$T\xf3t\b\xe7\xef\x1e\xfe\x81\xdf6\xd7\xedD\xd4l\xec\x05S\xc4\xdf_^w\x8c\xfeb\x16D\x8eb\xcd\xd1\xe9\xf7|\x84\xafj\u007fB\xb5\xc5\xe9:{P\xa9\x16\x8c\xa5\x11cF\x8c$\x01Y\xca^7\xe6Җ\xedU뼃\xf6\x1f\xb0\xf4\xacF]潚\x8d\xd4$\xd1\xd8\xe6Uj\xdd\xf0:\xfea?\xa7]5\xfc'\xca\xcfG+\xc5;|iBv\xf8\x11\xb2꺂\xed7\xc2\xe1p\xa03\x9c\x89\xab\x1fϗ\xdeaL\x12\x98\xe1ߏX\xe7xD\x98\x0eD+\xecz<\xa4\xaeQ\xf8\xb1\xfdT͏<\xa1\xd0[\xf7\xc2\xe5\xea\xc6ݿN+Y\xa3U\xd8P\x1eY\xee\xe7\xcbj\x9e?\xfdQ\xc4X\xc5\n\xffy\xcfG\xc6\xf4ק\x9e~|\x91g\x1d=\x1b{\xc1\x14\xf1\xf7\x97\xd7\x1d\xa3\xbf\x18\xe3\xd5k\x8c\xceˋ\x10\xbet\xfa6\xa2`w\x9d=\xa8T\v\xc6҈1#F\x92\x80,e\xaf\x1bsi\xcb\xfa\xd5m\x1cD\x87\x9fCtϴ\x0f}Oy\ue453fc\xf7<\xa7q\xe1Q\x9b\xf0\xb3\xdb\xdd\xd9v\xd4c~\xbe\x17\xef\xf0\xa5\t\xa9\xe1g\xea\xban{\xa3\xc8\u007f\xde\xe2\xdd\xf2\x03\x8cI\x123\xfcx;نߨ\xb0.r\x8e\xbc\x93\xaa\x19*\xfd\xe4\x84z\x06\xebQӴY\xff\xcb\u038dZ\vƙ\xfd\xbdӻ\xd6x\x96\xbc\xaeM\xb3\xc2\u007f\xc2c\x9c\x96_[Rs\xf8\xed\x91-\xeb\xe8\xd9\xd8\v\xa6\x88\xbf\xbf\xbc\xee\x98\xfdEī\xd7h\xec\x84\xe7k\xbc\x83\xb6\xec\xba8]g\x0e*Ղ\xb14b̈\x91$ K\xd9\xeb\xc6\\ڲ\x8b\xe8Z\xa9\x1a\xba\xe7\x18=C#\x9e\x0f\xc9I\xb3\xb1\xeb\x9e\x11\xc4hL\xdc\xee\xce%\x8f\xac1\xc72\xde\xe1K\x132\xc3\xcf\xd1uMM\xaa\x8cwLf\xe01\xeb\x87<\x13\x8cI\x92\xb8\xc2\u007f\xfa\x0eUa\xef\xe3\x1fj|MW]ӿe\xf3\x9a\xb7\xf1\xc1\xe9\xfeǵ\x82\x9a\xfdF\v\x98\xebx\x0fs\xaf\u007f\xc1)\xba]\x93K\xe6\xees\xcdFmO\xbf\x8e\x9e\x8d\xb3`\x92\xf8\xfb\xcb\xeb\x0e\xf5\xb6\x14\xfb\xea\xbd\xe3y\xfa\xceG\xab6[\xb6%\xbb\xeb\xecA\xa5Z0\x96F\x8e\x999\x92$D){ݸ\xe1/\xd7CJ\xf5L\xbb\xf8{Z\xddw\x13\x93fc_{\xb4a\xb1\xf9\x9c\x9f\xd3\xee\xce\xcaO\xee,2\xce\xe7\xe3\x1d\xbe4!3\xfc\x1c]\x97FF\xce\xf9\xef\x96\xefgLR\x88¿e\x8b:\xaf~FiT\xb8\xa8\x9f=\x1f}\x8d\xae\xfa\xdc\xf3\xa5\x17=\a\xf0\x8b\xf9\xbcV\xa1?r\xce\x1f}y\xb7ig\xb5h\xcb\x01\xba]\x93в-x\xd0\x0e\xa9/\xc6\x1a<Sx\xdd:z6z\xc1w\xda\xe8\xe3b\x8d\xf8\xfb\xcb\xeb\x8e \xfc\x1fz\x96x<[\xac\x9f\x99\xb2\xbb\xce\x1eT\xaa\x05ci䘙#IB\x94\xb2\xd7M\x14~\xaagK\xd4\xfe\x06\x1f\xdfBM\x12\x8dm\xacQO\b&\x16D\x1ac\f5\xa7]\xfcQ\xdf\xf9\xd2k\x91J\xf1\x0e_\x9a\x90\x1a~\xb6\xaeK%\x1c\x18\xef\bp\x95\x91i㰹\xb7?\xcc\xda\xf1G\xee\xf0\xbb\x16\xc27\x8d\xed\xbf\x86>\xdc_:b\xd9.m\xe5'\xde\xfeQ\xc5\xe7t\x85\x97=\xcf\xf5\xbf\xbd\xdfC_\x90B\xafU,\n\xafZ\xa0%l\xaf\xe7\xe5\xf3/{\xf6\xaaK\xb8\xa6]H\xd7v\xa9m\x9e\x8a\xb6\xf3\xeal\xef\x91\xedR\\Z\xb0\xe6\xd4\xf9C\xf8t\xb3ͳ\xeb\xd4k\x1b<\x95\xaf_\xa3f\xa3\x16\xbc\xd3Sq\x0fY\x89\xbf\xbf\xcc\xee\x90\xfd\r}02R\xbe\u007fd$H5\xf6Q\xf9\xa5\xf3#wc\xf6\\\xac\xaes\x06\xd5l\x81\\\x9a9f\xd4H\x12\x18\xa5\xecuc/\xed\x9f\x1e=\x11\xea/\xfd$\xf4ܖ\xcf\xc9AE\xe5\x9e\r\xfd\xa7W-\x9a@Ԥ9P\x9fT<\xd6v\xf4QO\xe9[\xff\x84[\x89\x1djv\xbb\xf7F6\xee\xff \x14ڹ\xec\xd2W\x89\r_z\x90\x1a~\x8e\xaeK-ǧ\xfc\xc7mfL\v_U\xeceL\x12\x98\xf7\xf6\x1fP\u007f\x96~\x82?\x99\xb5\\\x19\b\x1dzt\xc1\x96k\xc8R\xe1\xe2\x96\xcaE\x9b\x8dk\xba\x11\xae/:\x8a^\xaf\xd0\xde\xf4\xc3'\xd6U\xac;\x156\x96\xa0\x9d\xcf\xfe|s[M\xe9\xb2-\xefQ\xed\xd2L\xecz쑍ok\r\xac*\xaf\xdcuzU\xe9\x16z6r\xc1\xa7+<1\r$\xd0_fw\xc8\xfe^\x8f\x8c\xcei\xaa\xb1\x0fJqY\xe9f\xebY+\xa3\xeb\x9cA5[ \x97f\x8e\x195\x92\x04F){ݘK\v\xab\xfb\xd9\xfeG<\x15\xfdx)Ġ\xa2\xf2\x9f\xec_\xb4l\xaf\xf66AL\x12\x035\xb1\xf3њ\xc3o\x95\xea\x8d\xc5\f5\xa7\xddSxu\xae\xeb7#$6|iAn\xf8g\x16\xafx\xfe\x991\x99=\xbc\xed\x89\xdd\U000e76ef*\x0e|\x15\x0e\u07fb\xbe\xeb\xd1d\x97=\xfd\x16R\x01q\x8f`<\xb7\v\xa6j\xa8宼\x93ß\xdd\xdf\xe5\r\xbf\xb5(\x03+\xf5\xb6~_\x00\nWZ\x0f|\xe2e\xfa-\xa4\x82\x84\u009f\xba\xa1\x96\xbb\xf2N\x0e\u007fvs\xb7\x92\u007f\x9fo\xfa\xf80\xf2)\xd5'\x1e\xc6\xd5Ƹ\x98~\v\xa9 \xa1\xf0\xa7n\xa8\xe5\xae<\x84\x1fH%\xe1\xfd\x15\a\xfa\xdf\xeb?P\x91\xf4\xaep\xfa-L\x1f\xfd\x12\x9cuR\x02rW\x1e\xc2\x0f\xa4\x96w\x9eZV\xba\xec\xe9\xe9\x1c\xb5N\xbf\x85\xe9\xa2]\x82\xbbc\x9d\x94\x82̕\x87\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0\x03\x80C\x81\xf0g\xf9-\xfe\x00\xc0Cn\xf8\x99\xba\xaeP\x87\xf6\x10\xaf\x8e\x14\xdd\x1e\x9d(6\xba.\x93\x03\x12<K\xfb=\x1eOń\xa8V\x8a\xe8\u05feNZ\xb93\xde{\xd7\xd8k\xfcAe\x1c&3\xe9\xa4Fו\x96m\x8c\x12k7ͣ.5\xfcl]W\xd0\xfb~@eR4w\x9a\xb0\xd1uq\xedVi\xf1,}>2rJ\xa0\b\x11\x12\xb7\xe5+\xf8\x8e畑\x91\x9f\xaf\xab\xb4>\xf2K(\xe6\"+\x9c֟c9\xc3H\x8d\xae+-\xdb\x18%\xd6n\x9aG]j\xf8ٺ\xae`\x06\x9e\xdcib\xaf\xeb\xe2٭\xd2\xf4\xa8\x15\x91\x1fHH\xfc\x96/\xfd\xa1\\_WXc\"\x14s\x91\x15\xfaS\xb1\x8bM\x03\xe2/\xe2\xc5A\x9a\xb6qB\xed\xa6wԥ\x86\x9f\xad\xeb\xcal\xf8\xedu]Iڭ\x92e\xda\xe1\x8f_\xab\x15y\"\xdf:\xeb\f\xc2\x16\xc8\n\x97<\x97\xf8\x153\x88\x94\x8d%\x95\xb4\x8c\xba\xdc\xf0\xab\xc4\xea\xba2\x1a~;]\x17\xc7n%\xf6,\x91\x02\xad(\xcf{<?\x8fH\x9d\x89\xd9h\x19\x14\x11~\xc3\v\xc5\x16s1\x9dW\\\xcb\x17\v=\xfcw\x17\xbcF\xf6\x8cӂ\xb9Ɩ\nף\xf6r\xd6\x1aӥQ\xd9\x16\x01i\xe32W\x88vt\t\xc5gL\xd3X\xf9\xa1\x03\xcb\xf4A\xe5\xb4KJ\xb1X-p\xb6\xb1\tǗfL\x9a\x83J\x99\xbbį\x1d\x93dG=~$\x87\x9f\xa5\xeb\nz\a\xde\xf0\x1e\xf7g\xe6z\x9f\x9d\xae\x8bg\xb7\x12y\x96H\x81\x96\x81~\"\xaaI\x9d\x89\xd9(\x19\x14\x11~\xd3\v\xc5\x16s1\x9dW<\xcb\x17\x93\xbb\x9eӡ\xe0\a\xeb\xd6\x04ɞ\xf1Z0\xd6\xd8R\xe1n\xa5~\xac\xc4\\cZ$\x16\x95m\x11\x906.s\x85hG\x97P|\xc6\x14\x94\xe1gn\xf6\xafÃ\xcan\x97\x94b\xb1[`nc\x02\xf6f1'\x89A%\xcd]\xc2\xd7\x0e\xb3\x0f\t\x8dz\x02H\x0e?K\xd7\x15\xf4v^U'\xbb2\x91~\x91\xae\x8be\xb7\xc2\xd8z\x96(ѕ\t\xf1\xe4hB\x1cEx\xa1\xcc\xf0\x13^(\xb6\x98\x8b\xe7\xbc\x12\x1e\xb4\x1b\xdc\xd5\xf6%\xab\xb4\xf7;\xf2\x99ּ\x16\xa2k̬\xc0^c\xa2\x94\x12\x94\x11\x186.r\x85\xccR\xa1\xf8\x8c#(+_\xa3\xb6\x16Z\xb5\x91\xd7.\xb1\xb1\xf8\x8a\xb3\xd8mL\xc0\xde,\xe48\x98\x83J\x98\xbb\xd8\xed\xf2\x1d]I\x8cz\x02\xc8\x0e?BV]\x17\n\x8fk\x93\x1dC\x82\xf9ҁH\xd7Ų[al=K\x94\xe8ʄ\f\xbf)\x8e\"\xbcPf\xf8I\xc9\x14S\xcc\xc5s^%\x12\xfe\xa3\u05ee]<\xa0}j4\xed\xf0\xb3ט(\xa5\x04e\x04\xa6\xfb\x8bX!\xb3T(>\xe3\b\xca\xca_\xc1?\xb5Ae\xb6Kl,\xbe\xe2,v\x1b\x9307\v9\x0eD\xf8\ts\x17\xb3]\xbe\xa3+\x89QO\x00\xa9\xe1g꺢\u007f\xf4\x9fdϔN\x84\xba.\x96\xdd\nc\xefY\"EW&d\xf8-\x93\xba\x17\xca\f?!\x99b\x8b\xb9xΫD¯\xed\xebv\xadB\xf1\xb5`\xfb2䬱YJ\t\xca\b\f\x1b\x17\xb9Bf\xa9P|\xc61\x8d\x99\x83\xcan\x97\xd8X|\xc5Y\xec6&`o\x16r\x92\b\xbfi\xeeb\xb7\xcbwt%3\xea\xf1#3\xfcl]\x17\x1a\xf0i\x93\x83>\xee\x8ciC\xa8\xebb٭0\xb6\x9e%Jte\xa2\xd5=\x1a\x13~\xd3\ve\x86\x9f\x90L\xb1\xc5\\<\xe7\x15\xcb\xf2\xc5&\x12\xfe\xd3\xf8uG\xf4\x8c\xdb\x02\xfd2\xb4T`\xaf1QJ\t\xca\b\x8c\xd74\xb9Bf\xa9P|ƩP\xae}f\x8b\a\x95\xdd.\xb1\xb1\xf8\x8a3\xdb\xf0\xb37\v9\x0e\xe6\xa0\x12\xf2\x1ev\xbb|GW\x12\xa3\x9e\x002\xc3\xcf\xd1u\xf9\xb4]\xfeT\xc7\xfb\xb6\xf3\xa6\x03\xb1\xae\x8be\xb7\xc2\xd8z\x96(ѕI\xc5a\xf5\xfdocL\xf8M/\x94\x19~\xc2\v\xc5\x16s\xf1\x9cW\xa4\xe5\xeb\xcek\x13\x88O\xa4\xd6\xdeG\xc2TϘ\x9e0\x8c\xf12dU`\xaf1QJ\t\xca\b\x8c8\x92+d\x96\n\xc5g\x9c\n\xe5\x8f\xe1s\xfe5[x\xed\x12\x1b\x8b\xd3\x02\x12\x84\x9f\xbdY\xc8q0\aU\x18~\xbe\xa3+\x89QO\x00\xa9\xe1g\xeb\xba\x02\u07be\x9b\x81\xcb\xed\xbe\xa4\xaf[$\x8dHׅ\xb7M\xac\xddJ\xe8Y\xa2DW&\x9b+_\u007fm#\x16<Q\xe2(S\x06\xa5\xdd\xe1wB\xb7S\x99^(\xb6\x98\x8b\xe7\xbc\"-_;=\xcf .!\xed\x0e\xbf\xb7\x9f\xf3\xbcN\xf6\xcc҂Q\xd9XcN\x05\xf6\x1a\x93\xa5\x84lˀv\x95EW\x88rt\t\xc5g\xec\n垧\xaf]ڌ\a\x95\xdd.)\xc5b\xb6\xc0\xde\xc6\x04\xbc\xcdb\xae\xb11\xa8\xa4\xb9K\xf8\xdaa\xf6\x01%2\xea\t 5\xfc\x1c]\xd7\xe4\xc0\xf1\x0e߸\xfc\xec\vu]l\xbb\x95гD\x89\xaeL&\xb6,x\xe4\xa9WԺ\x948ʔA폴\xab\xed\x9e\f/\x14[\xcc\xc5s^\x91\x96\xafӕ6w\x81\xea\xf7\xf6\x97\xaeӪ\x18=\xb3\xb4\x10\xc5\\cN\x05\xf6\x1a\x93\xa5\x84lˀ\xb4q\x99+D9\xba\x84\xe23v\x855m\xbb\x1e\xd1\a\x95\xdd.%\xc5b\xb5\xc0\xde\xc6\x04\xec\xcdB\xae\xb11\xa8\xa4\xb9K\xf8\xdaa\xf6\x01%2\xea\t 7\xfc3\x8bT꺒\xf6,\x95\xb7!@2Io\xac\xf4\x90\xb1\xee89\xfc\xa9\xfc.oҞ%\b\xbf|\x92\xdeX\xe9!c\xddqr\xf8SIҞ%\b\xbf|\x92\xdeX\xe9!c݁\xf0\xa7\x86$=KreP\x80N\x92\x1b+]d\xac;\x10\xfeT\x91\x94gI\xb6\f\n\xd0Ijc\xa5\x8f\fu\a\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\u009f\xd2[\xfc\x01`\xf6 7\xfcL]\x97ʍ\xbe\x8e\xee\xcbv3\xa6\x11{]\xd7\xd7\a\x96,xF\xff\xdeE\"\x9e%\x06\x91\xaf\x94z\x92W-Y|^\xfaӶ\xe3\xab\x1b'|\xd1U\xecʟb\xd6MR\x95\x95\xe8l\xc4f\x89B\xacqr+\x9f6flϤ\x86\x9f\xad\xeb\xc2O\xf1\x1e\xba=\xea\xbd-\x9a==\xd8\xea\xbaЏ\x96\x9c\xda_\xa1\u007f\xd32\x11\xcf\x12\x83\xf0\aڳ:>\xd0\x1ea\x10\xb7V\x8b\xc4\xea\xf3\xd2\x1e\f\x1dg\xdd\xf8\xe0\x8b\xaebW\xfe\xde\xc8FF]n\v\xec5\xe6\xe8\xd0b+X 6K\x14b\x8d\x93[y\x94\xd8f\x89\xbfn*z\x96\x16\xa4\x86\x9f\xad\xebB\x03\xed\x01\xfc\xc6pC0wz\xb0\xd7u\xdd\xf3\x9c@\xc6\xe3Q\xa7\xfd\xb8\x11\xd3\xc9\x11\xbfV\x8b\x86V\xfa\xc4<R\x96\")\xfd\x0f\xf7K\x86\x8c\x95\xdfɬ\xcbi\x81\xbd\xc6<\x1d\x1a\xa3\x02\t\xb5YL\x885Nj\xe5\x13\xda,\x89ԝ~\xcf҂\xd4\xf0\xb3u]\x01\xef\xfb\xc6\xdf\xe4c\xaf\xeb\x9a\xf0L\xebP߂\xb9\xdd\xe3\u007f\xca.M\xe6\xc2\xcf \xa1\xf0\xb3\xd7x\x83(\xfc\xec\xd98\x9be\xda\x11Kd\xb3$Rw\xfa=K\vrï\x12\xab\xeb\x1aj\x0fM\u007f\xa7\x9a,v\xba\xaeP\xa5~\x96\x8e\x8f\ax\xfe&\xa6-\x8aGd\xbbs\xb5Z\x13\xbb*K\x97<\xa3\xbd\x03E\xedV\x84K\x8bhA=N\u07bbl\xd1.\xeba?\xe9\x90\"\xea\n\xacYT\x05\xc3JFڭ8+\xaf\x86\xff\x90\xfa\x87\x05\xf4\x83o\rU\x96P\x03\xc6ѡ\x99k\xc1\x9e\x8d\xdc,\x9c5\xe6\xac<\x01c|\xd9K#ט\xd93\xa2\x05\xb6\u007f\f\x13۳\xf3\xeaܯD\xd4c\x99Br\xf8Y\xba\xae^ߍ\x93\xde\xe3\x17\xe2MPj\xb1\xd3u\xa1\x8fF\xfa=m#\xfa\x93\x1b\xd9\xfe&\xb6\xeb\x89Gd\xbb\xf3\xa4X\xefUlx\xfdb\x9b\a;\x9b\f\xbb\x15\xa1}\"Z@\x13\x8bV\x9d~\xe7)\x8f%\xfc\x84C\x8a\xa8+\xb2fQ\x15\f+\x19e\xcdb\xaf\xbc\x1a\xfe\xbb{=',\xcf#0TYB\r\x18G\x87f\xae\x05g\xa0\x88\xcd\xc2^c\xc4^y\x02\xd6\xf8\xb2\x97F\xae1\xb3gD\vl\xff\x18&\xb6g\xa1\x0fj\x0e\xdcE_\xb5-\x1a\xc9\xcc\v\x1f#9\xfc,]W\xb7\xa6\xeb:ޝ\x89A\x10麨\xe3\xcbX\xcf\x12\xdf\xf5\xc4\xc4\xfe\xb0?T\xf34~\xe0t\xff=\xdanE=9:\xda\xc2\xe6U!\xfc\xe4hK\xf8)7\x95QWh͢$S\x84\x95̰[a\x18\xf2*5\xfc'\xcac\xbe\x84n\xaa\xb2␁\x10\x87\xfdƂiÖ\xfda?{\x8d\x11s\xe5\tx\xe3\xcb\\\x9a\xb9Ɯ\x9eQ-0\xfdc\xccc\x926|\x88\xb1\x97\xf9\xc4xI\xc8\x0e?B1\xba._;~}\x05;\x86E3\xa6\x01\x91\xae\x8b\x1d~ó\xc4w=1\xb1\x0f\xffy\xf3)N\xa4݊\x15\xfe{\xfa#]\x8fZ\xcf\xf9I7\x95\xb14\xa15\x8b\x92L\x11V2ӥ\x85\x98\xf2\xaa\x9dmG\x19\xe7ބ*K\x98+2A\xe6\x82)Ö\xe0\x9c\x9f\xb9ƈ\xb9\xf2\x04\xbc\xf1e\x87\xdf\\cvϨ\x16\x98\xfe1f\xf8?\xf7|\x82B\x8f\xa4ȶ\x9d\x14R\xc3\xcf\xd6u\rꞮ\xc1^\xee|iC\xa8\xebb\x87\xdf\xd8\xd8|\xd7\x13\x13\xfb\xf0\x9f\xf0\x18/Q\xd2n\xc5\n\xffu\xcf\b\"J\xa3Pn*siBk\x16S2\x85L\xbb\x15\x86\xa1\xb0ع\xe4\x915\xb1롟\x1fh\xfe1a\xae\x98\t\xa2\r[\xf6\xe1\xe7\xac1s\xe5\tx\xe3\xcb\x0e\xbf\xa8g\xcc1\x13\xf7\f=}\x18]\\\x94\x89\xe3\xdd(2\xc3\xcf\xd1u\x8dvh\xef\t\x033Q\xd7%\b?\xdf\xf5\xc4\xc4\x12~\x8b}\xe9\x12\xb1\xe7'\xecV\xdaҢ\xfb\xf8H\v_{\xb4\x8bv\xd6\v~\x94\x9b\xca<\xed\x15Y\xb3b$S\xac(\xb0\xc2_\xf9ɝE\xb4U\x1aW0TYT\xd7YkL\x96\x9a\xed\xc6\x1a\xb6bf36\v{\x8d\x11s\xe5\tx\xe3\xcb\\\x9a\xb0g1- k]v\xf8ߩ\f\xed\x8f\xf3\x981=\xc8\f?G\xd75\xa5}\xd4\x17l\x97\u007f\x8b\x9fX\xd7%\b?\xedz\xb2\xf7c!r\xbb\xb3\xecK\xa1e[\xf0\x98\x1c:DۭH\x97\x96\xd1\xc2\xc6\x1a\xf5\xa8zb\x81%\xfc\x94\x9bʨ+\xb4f\x91ڧ\x84¯N\x9e/\xb5>\u007f\xd4Teš\x01c\xe9Ш\xb5`\xcffl\x16\xf6\x1a#\xe6\xca\x13\xf0Ɨ\xb94a\xcf\xc8\x16\x8c1\x13\xf6\f\u007fl\xf1Σѣ~\xe1k'\x1dH\r?[ׅ.\xb7_\x0e\x8cw\x9e\x94\u007f\x00$\xd2u闕\xaf\xe1\x03\x13\x8e\xbf\x89r=\xd9\xfa\xb1\xa2w\xf8]\xd3V\x93e_B\x97\x16\xac9u\xfe\x90v:OحL\x97\x16\xe1\xf3\xfa\xa4ⱶ\xa3\x8fF\f[\x06\x84C\x8a\xa8+\xb2f\x11\x15\x88u#\xedV̕\xbf7\xb2q\xff\a\xa1\xd0\xcee\x97\xbe\xa2Z3UYB\r\x98YJ\x0e*\xb1\x16\xecو\xcd\xc2^c\xce\xca\x130Ǘ\xb9\xb48zf\xb4\xc0\xf6\x8fqz\xa6\xf2\xf2\xe3ƅH\xfb\xd7N\x9a\x90\x1a~\x8e\xae\v\xdd\xee\xed8yY~\xf6E\xba\xae\xd0\"턾t\x02\xf1\xfdM\xa4\xeb\xc9֏E\xdf\xdbϲ/\xe1\xcf\xf9\x1f{d\xa3fi'\xecV\xa6K\x8b\xf4yM\xec|\xb4\xe6\xf0[\xa5\\\x87\x14QWd\xcd\"*\x10\xebFڭ\x98+\u007fJ[\x19\xac\xfd:J\xb5f\xaa\xb2\x84\x1a0\xc4ԡ\x11k\xc1\x9c\x8d\xdc,\xec5\xe6\xac<\x01s|\x99K\x8b\xa3gF\vl\xff\x18\xa7gxFs\xf3ٿv҄\xdc\xf0\xcf,R\xa9\xeb\x02\x80\x84\t\x95'\xef\xd9K\x05N\x0e?|\x97\x17\xc8(\xfd\x95q\xde\x1d\x96&\x9c\x1c~\x00\xc8\x1cm\xef\xa1\x1f\xb5\x89*\xa5\x17\b?\x00d\x80\x90g\xc3\xf3\xcb$[y\xad@\xf8\x01 \x13\xb4Ul\x99\x10\xd5I3\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10~\x00p(\x10\xfeYA\xef\xe2I\xea\xffS\x8bm\x9e{\x04\xdfY\x00\xe2Bn\xf8Y\xba\xaeP\xa7W\xe7\xb8`f\xe9lSr\xbaEu\xa6K\xa3\xa2(y7E\xb5Z\x94fkI\xceAfMd\xeb\x1fK\xce\x16\x15\x97K+V\xa0\x15\xd7l@\x06\x91\x1a~\xa6\xae+\xe4\x1d\r\xa8\\\xf6^\x15\xcd.\x9b\x80?ך9\x9d\xc1Qfq2\x04\xfc\xfeVeHP\xa95\xa7#\xa6\xcc7\xb7\x95Q\x13c\xe3\x1fK\xcc\x16%ti\x91\xc4\n\xb4\xe2\x9a\r\xc8 R\xc3\xcf\xd6u\x8dk\x0f\xef\xed\xbc \x989\x13\xb8\xd8\xe1_X\xcf,N\x92aQ\xf8o\xbb\x9a\x18\xa5{\\\x01F\xa9\xc8?F>PJ\x84ХE\xc0\x14h\x89g\x032\x89\xd4\xf0\xb3u]\x1a\xbe7\xe4?\xc9G\f'\xfceu\xcc\xe2$\x11\x86\xbf\xb1\x88\xa52\v\x1652JE\xfe\xb1D\xc2/ti\x110\x05Z\xe2ـL\"7\xfc*\xb1\xba.\xcc\r/}AK\x02\xa1\xc2ܦ\xe2\xa2\xc1\xed\xee*|\x16RW\xe4*^\x89O<n\xccU\x94\x95\xa8XQ\xdc껑k{c\x91{\xa5zJ\xeeSO͛P\xb3\xfa\xb3\x1bObʴV:\x17\xe7\xcfߡeӿ\xbc8\u05fd\xa28f9\x1d\x85^\xfc+P\x10\x99\xaf\xc0\xba\xc36\xc3\x1fml\x9b\x92\xeb\xdd1?o\xb9^3T\x10\xdd\xf1\x8f\xed\xdbT\xbbvߦ\a\xfa\xff\xf6\xe4\xb1\xde\xfbI\xf1\xdf\x00\x00 \x00IDAT/\xed\xfcc\x183\xfcQ\xd3\x18\xa5\xe0\xfazo\xe5c\x87\x0fWV\xf4s\\Z\x14Q\xe7\x15)\xd0\"1\xcc]\xc0\x8cDr\xf8Y\xba.Lw\xf4\b@\"\x83\x05ʎ\xa5\x8a\xfb`a\v\x0e\xf7\x93\x83\xdd+s\x86\x11\n\x0f5\xe7\f\xa1\x0e\xa5\x13?Rإ\x94uu\x95卣\xe0\x85\xe2m\x93h\xb2\xb9\xc0\x1f\f^\xf0ϯ\xf2\xfb\xfd\x9aT\xb81g\xbb\xaf\xb5\xb0,\x8c#\xbc\xfe\x8d\x01\xaf[\x89\t\xe4\x13\xcar\xfc+\xd4Ѫ\xd3a\xada\x84\xdfh\xec\xc6\xf1\xb9JasK\x81~\x801\xaa\xe8O<G\x1f\xff\xd9K箜][\xfd;\xfd\xbf\x17\x98G\f\xb6\xfe1D\x84\xdf0\x8d\x91B\xaaКe\xa7\xda\xca+N?u\x82\xe3\xd2\"1\xdd_\xa4\u05cc\xc00w\x013\x12\xc9\xe1g\xe9\xbaP\xf4b\x80l\x8a֫\xa1\xf7\xa1\xc6'\xd5=\u007f7~G*{B+o\\8U\xac_Kw\x95\xe0\xc7P\xcf_\xacN6\xe3=\xfdz\xfdH\xdb8\xec\xf7)\xf8Jܰ҅Pk!^\x95Vw̃\x99n\x1f\xbc\xad\xfd\x9e\xbc\xad\x13s\x88\x13\r?\xd1\x18r\xb9\xd5\x01Y_\x18)\xd7\x1b@g\x1ap\xecϬ\x8e\xec\xf9\x03\xca\x1b֦\xc4\xfe1#\xfc\xa4i\xcc\x14R\xf5cw\xc0)\x8f\x1eW\x96K\x8b\x80r\u007f\xb1\x0f\xfbMs\x170\x03\x91\x1d~\x84bt]*\x03i\xffH\x8dEQ\x17\x1aR\x82\xa8\t_\xbe\x9bj]>\xaf r(\x1f*+\\\xa9\xd7Я\xb4y\x95)\x1c\xb5q\xf5\x00\\?@1\xc2_?/\x84)V\xdf\x13\x02E\xf3\xb6y\xdfgH\xe3#\xdcV\xa2ܶ\xfc%\x1a~\xa21\xe4\xc2?\x9a]Zyot\x8e/\x1b6\x1d;\xfb\xe9\x83o#\xf3\x05\xb4\xb7\t\v\"\xff\x98\x11~\xd24f\n\xa9^^\x84p\x90\xb5'\b\xb3]Z&\x94\xfb\x8b\x1d~\xd3\xdc\x05\xcc@\xa4\x86\x9f\xad\xebR\xe9\x90/\xecP)\xeaC\xc3j\xbep\xf8\x87\v\x8b\x9bN\xfa\xab\xf4\xf0\xa37\x94\xc8G\x0f\xfa\x05?\xbf\x82?\xda[\xb1\x03\xf5\xb9\xf5l\x1b\xe1/\x8b\xe4\x19\x1f1\x04\xbdu%\n>\x85\xe0\xe0\xf7\xe9\xf8\xad\u007f\x88\x86\x9flL[p$\xfcC\xc6\xe1\xfd\xfd\xb3/l\xad^\xdb\xf3 :_\xec\a$B\xff\x98\x11~\xd24fj)Nx\xbe\xc6;\xf3\x98=?\xa1\xf20\xa0\xdc_6\x17\xfc4s\x170\x03\x91\x19~\x8e\xae\v_\t\xb0\xee\r\xa5@\x84\xbfd1>\xec\xaf\xd3\xc3\x1f(\xdaS\xac_\x88t\xed\xc0?\xdb\x15\xfcG\x9f;\xd4\x18\xb9\xbe\xae\x85\xbf\x1d\x1f\x98\xcf\x1b\xd5Pk_\xc6\a\t\xc1\xae<ާ\xef|\xa2\xe1'\x1a\xa3\xc2\x1f\x8c~\xe6p\xebU5\xf6\xf7\xcf՞\xd1\xff\xdb\xec\x8a\xfd\x10@\xe8\x1f3\xc2O\x9a\xc6\xccl\xdf\xf1<}\xe7\xa3U\x9b\xf57i\x96K\x8b\x80r\u007f\xb1\xc3o\x9a\xbb\x80\x19\x88\xcc\xf0st]\xf8\x94?#/\x0f\"\xfc\xc58\xce\xe12-\xfc\xa1\xc5{ГK\xb5\u05ff\xab\x18\x9f\xb4\x96Ti\xc5n\x9f;r\xe5\xadJ-\x98T\xd4S\x95>E;_\xd9sP\x8d\xa2\xa2\xad\\\xd56\xebR\xa2\xe7\xfc\\\xa2\xe1'\x1a\xa3¯\x9e\x0f\xe8a쩾\x82\u007f\xed>\xa2\xfd/\\\xb2\x02Y\x11\xfbnj\xf0\x93\xa613\xdb\x1fz\x96x<[\"\x17\xeeX.-\x02\xca\xfd\xc5\x0e\xbfi\xee\x02f R\xc3\xcf\xd1u\xa1\x1b\xdeL|\xc8\u007f\xc3\xdd\x12\xecʽ\x1a\xac\xaf\n\xa8ѭk=X\xa6\xb8[\x86B\x17\xb6\x15\x06\xd0\xed\x82\xed\x17\xf0G}\xca\xf2\xa1\xc1\xc5n=\xbdM\xf3\"G\xfdj*[z\x97\xe6\xe3k\x94MJ}wo\xa3҉ß\xdf\xec;\xd9\x18\xbd2o\xb2R\x89\r\xa9\x89v\x87_\x8b\xdfO5\x16\xf0\xe76\x0e\xa1\xd1\xc6\\\xad\x18\xdd\xcc\xd1O&z\xaak{\xde}\xf7\xa5\xea1\xed\u007f-J\xec}\x86\"\xff\x18i\x8b2Lc\xa4\x90\xea\xa3\xf2K\xe7G\xeeF.Z\xb2\\Z$\xa6\xf3\x8a\x10h\x91\x10\xe6.`\x06\"5\xfc\\]\x17\xe3\xb2u\xda\t\x17*\xca\xf1\x02%\xbf\x1b\x9fe\x87[\xe6\xbb\n\xeb;湪\xfaԳ\xee\x1dh\xbb\xfaS\x8dqIs]A\xd1\xfa\xc8'\x117\x95'#\xb3\x86\xb6\xbb\U000ea1b5ɾ*\xb7{1\xde\xe7wV5\x17\xe7\x16U\xc5d?\xfa9?\x87\xc6ȉ\xbev\xcf`\xb4\xb1mjA\xeex\xbe\xfaS?\x8e\xd8\xf3=\xed\xec\xfe\xec\xee\x9eM\xb5\r\xbb\xf5\xec\xfb\xf3v\xc44&\xf2\x8fѶ\xa8\xa8i\x8c\x14R}P\x8a\xff\\\xbaY;\xe9g\xb9\xb4H\f\xe7\x15)\xd0\"!\xcc]\xc0\fDn\xf8g5AWl\xb2%\xb1\xdde\xfd8\xa4\xcb\xd5\x18{\xb44m\xff\xd8W\x15\a\xbe\n\x87\xef]\xdf\xf5(\\\xa0w\x00\x10\xfe\xb8\xe9v\xc7\xc6M\x16-Ŗ\xaf\xf4\x16\xb1\xbe\xd47\xed\xef\xf2\xbe\x1d\xb1Ɔ+\xcf\vj\x02Y\x00\x84?>\x9a\a\xd1R\xf6\x8d\xfe\xd9ć\x91\x0f\xf9>\xc1\xf7\xfa\x00\xd9\x0e\x84?.\x82J\xd96\xe6\xd7k\xb2\x8b\xf0\xfe\x8a\x03\xfd\xef\xf5\x1f\xa8H\xea\xb8\x01\x98e@\xf8\xe3\xa39\xbfꆨN6\xf0\xceS\xcbJ\x97=\r\a\xfd\x8e\x00\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\xc2\x0f\x00\x0e\x05\u009f}L\xfb\x16\u007f\xc0\x19\xc8\r?K\xd7EMf\b\x19b.\x84.\x94\xe5/\x1f\x12U\x9a>6\xba.\x11\xd30l\xcd\b]םRϚ8K/V2\x9e>\x12%\x03]\xcf\x04R\xc3\xcf\xd4u\x91\x93\x99B\x86\x98\v\r\xb8ֿQ\xefJ\xff3\xcamt]\"\xa6a\xd8J@\xd7\x15Հ\xa5\x81k\xfb-\x8f\x1b▞\xaf\xb0\x89\xf74\xc6a6!5\xfcl]\x171\x999\xd2/\xe6\n\x15\xe2's<Y\x94\xee\xef\x05\vt]\x02\x92\x95\xec$\xa2\xeb25`\xa9\xc7\xfa\xac1~i\xcc3\xd6)\x92\x1d\x87Y\x85\xd4\xf0\xb3u]VsWFH\xbf\x98\xcb\xeb\xc2_\xc9\x0f\xe4\xda=\xd7'\x15\bt]\x02\x92}\xd1'\xa2\xeb\xda0#\xc2oO\xb2\xe30\xab\x90\x1b~\xc4\xd2uY\xcc]Ҡ\xa4X\xe9\x17s=\xa1=\x06\x14U\xa5\xee턉\x9d\xae\x8b\x10s=\xef\xf1\xfc\\?\x19\x0e/)}\xe5\xb1e\x97\x0e-ڂW\x8e4lE}^\x1f\x95z<G'\xf6\xd6,xڲ\xb7\x8c[\xd7u^\xfd\xe3+\xa8M\xfdIk\xc0\x8cE 4\xf2TMi\xe535\x96\x16\xd8N14\xb1\xab\xb2t\xc93\xda;[\xb4\x0f\xea\xb1\xfa\xdee\x8bvE\x0e\xf0\xcdv\xc9R\x83{\xf8\x99d\xdaa?ݮ\x89#Lc\x92\xc3\xcf\xd4u\xd1\xe6.iPR\xac\xf4\x8b\xb9J\xf4'\x006\x96XgK-v\xba.B̥\x9f\xd5j'\xc3\xef-\xf2\xfc\xe4G\x9e\xcaז\x9c@\x94a\xcb\xf0y\x85\xfa\xfbkV=\xf2\xd8O\xf6zh\vH\xfc\xba\xae\xd0\a5\a\ue8af\xda\x16\x8d\x84(\r\x98\xb1\btݳ\xb7\xff\xe2\xe9J\x8f\xe5\xed\x85\xe9\x14C\xefUlx\xfdb\x9b\xe7\x04Շ\x89E\xabN\xbf\U000d49dcn\x97,%\xb8>2\xa2\xef۩v\t\x1ca\x1a\x93\x1c~\x96\xae\x8b6wɄ\x90b\xa5_\xcc\xe5\xd6u\x9bMn\xebl)E\xa0\xeb2\xc5\\\xc4㸗\xedUw\xcd\xef\xa0\xfd\xb8\xbai\xd8\"}^h\x83\xe7G\xc1\xc8Y\x9bAB\xba\xae6\xbc\xa7߫?M\xdc8\xec'\x16q\xaa\x12\x0f\xe7\xa9E\xf4\xa0\xb2\x9db\xa1\x9a\xa7q\xbb\xfd\xf7\xa8>l^\xa5\x16\x86וӳ\x11\xa5\x16\x16D\x0e\xec\x89!!p\x84iLv\xf8Q\xac\xae\x8b6wɄ\x90b\xa5_\xccU\xb2^\xfbU\x9f\xde=\xbf@\xd7e\x8a\xb9\xc8\xf0\xf7\xabA\t\xa2\xc3\xcf!ҰE\xfa\xbcІ\xf2ض\x12\xd2u}\xeeQ\xf7\xff\x8f\\Ҋ\x8d\xf0\x13\x8b\xf8|Y\xcd\xf3\xa7?\xb2\x0e*\xdb)v\xde|Șه{\x9e\xd3x\xeah95\x1bYj\xc1\b\xbf9$\x04\x8e0\x8dI\r?S\xd7e1wɄPc\xa4_\xcc\xf5\x84~\xe9 \"\x03M\x13\"]\x17a\xdf \xc2\u007f\x11]+E\xe8\xe5碥\x9aa\x8b\xf4y\xa1\r\x1bb\xdbJL\xd7\xf5\xf4atq\x91>\xa8F\xf8\xc9E\xdc;\xbdk\x8dg\xc9\xebt\x03<\xa7\x98\xf1\x1ea\xf6\xe1\xbag\x04E+\x98\xb3\x91\xa5\x16\x8c\xf0\xb3\x84$\xce0\x8d\xc9\f?[\xd7E\x9b\xbb\xa4B\x86?\xedb.\xafv pSI\xeb\xd5~\x91\xae\xcb\x1a\xfe\xa3\xd1\xf0\x97G\xc3o\x18\xb6H\x9f\x17\xf3\x02}b\xba\xaew*C\xfb#\x0e!C\x03F,\xe2:\xbe\x1b\xe9^\xff\x82ST\x03l\xa7\xd8%b\xcfo\xf4\xe1k\x8f6\xabviϜ\x8d,\xb5 \b\xbf\x13Lc2\xc3\xcf\xd1uQ\xe6.\xa9\x90\xe1O\xbb\x98+T\x88\xdfH\xea\n\xd3yiC\xa8\xeb\"^\xe9\x15\x87շ\xe3\x8d1\xe17\f[\xa4ϋ\x19\xfe\xc4t]\xa1\xcaw\x1eՏ\xfaM\r\x18\xb1\x886\xed\xe4\x1dm\xa1\x8fV\xd8N\xb1в-x\x10\x0f\x1d\xa2\xfa\xb0\xb1F=D\x9fXPN\xcfF\x94Z\x10\x84\xdf\t\xa61\xa9\xe1g\xeb\xba(s\x97D()V\xfa\xc5\\\xa8\xcfU\u007f\xb2\xde\xd5gWe\xba\bt]\x94wks\xe5\xeb\xafm\xf4\x94\xbe\xf5O\xff\xf4\xe8\x89P\u007f\xe9'\xa1\xe7\xb6|\x8eHÖ\xe1\xf3\n_\xd3.\xd0ǜ\xf5'\xa6\xebz\xf9\xf1\xe8ռ\xa8\x06\x8cX\x84\x1a\xfe\x8a\xb6\xf3\xea\xe4{t\vL\xa7\x18\xba\xb4`ͩ\xf3\x87\xb4\xd3y\xb3\x0f\x9fT<\xd6v\xf4Q\xbcBd\xbbd\xa9I胑\x91\xf2\xfd##A\xae\x8a\xcc\x11\xa61\xa9\xe1\xe7\xe8\xbaHs\x97D()V\xfa\xc5\\\b]X\x9aW\x96\xd6\xdb\x18E\xba.ʻ5\xb1e\xc1#O\xbd\xa2N.\xf1x\xfa\x1f\xf1T\xf4k\xa7֤a+\xea\xf3\xfa\x888\xf9'IL\xd75aȾ\xa2\x1a0d.\x02\xfd|s[M\xe9\xb2-\x96쳝b\xf8s\xfe\xc7\x1e\xd9\xf86\xfe\xbb\xd1\a\xb5p\xe7\xa35\x87\xdf*\xd5*\x18\xedR\xa5\x06\xd7#\x17\x05NsUd\x8e0\x8d\xc9\r\xff,!\x83b\xaei1m]W:\t\x95\xc7$\x1b\xc8,\x10~\x06\x99\x14sM\x87\x19\xfd]\xde\xfeJ\xe9\x17t\x01{ \xfcV\x9c!\xe6\x92L\xdb{\xe8GN\xb8[~v\x01\xe1\xb7\xe0\x101\x97\\B\x9e\r\xcf/\xcb\xea\xfbef%\x10~+N\x11sI\xa5\xadb˄\xa8\x0e \x1b\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b\xff̾#\x1e\x00҆\xdc\xf0\xb3u]\u1afd\xed'3vW\x1d\xdfn\xf5vi䛟\xa5o\xcb\xf57\xf1\x97FH\xb1b\xfdXl\xf8\x8d\xd9\x1a\xab\xf8\x15\xe2.ݯ\x0e]ńM\x05\vlٖ\x90\xf4\xce\x16ז'\xb6\x85x5g\x0eR\xc3\xcf\xd6u\x85}\x1d\xa3\xb7/\xb7_\x16͝&\xf8v\xab\xd7=##\xa7<'FF<\xaf'\xefo\x12\xba\xa9\x18\x15\xf8K#\xa4X\xb1~,6\xfc\xc6l\x8dU\xfc\nf)\xd9uF\xdd\xcf\xf1\xf0}`S\xc1\n[\xb6%$-\xb3E\xd7-\xae-Ol\v\xd1j\n_\x0f\x12\x91\x1a~\xb6\xae\xeb\xfdv\xac\xeb\xb8ٞ\x99o\xd3\xd8حN\x94\xe2\xe7?\xab\xafފ\x13\xd1':&\x8e\xd0MŬ\xc0Y\x1a!\xc5b\xfa\xb1\xd8p\xbb.<n`W0J\xa9\xae3\xeb^3\xc3/^Z2f\x1d\x8dt\xccf\xae\x9bx\xcbS\xdbB\xb0\x9a\xc2׃D\xa4\x86\x9f\xad\xeb\xf2\xe9O\xb6\xea\xcc̮\xdf\xc6n\x15\x9a\x88\xbcz'B\xf1\xbc\x04\xd8\b\xddT\xcc\n\x9c\xa5\x11O\xcac>4\x8fM\xb2]\x17\"\\7*\xfcq\x90\x8e\x14\xf3\xb1\x9dmC\x02\xe1O`[\xc41f\xf2\x90\x1b~\x95X]\xd7I\xfd\xd1V\xbd>\xc1\x9ci\xc1\xcen\x851^\xbd\xe5\x87M\xab\x93)\x83\"\x89\x8a\xa3L\x13\x16\"\xdcT\xcf{JO\x1cxL3@\xb1+P\x18\xb6(\xa2.!Ţ\xfdX\"\xad\x16S=e\x1a\xab8\xaa,\xb6\xd2\xca,%\xbbN4\x16ܵ\xac\xb4fg\xf4\xf1\xba\xd1\xe1#*\xac\x89̷\x19\xffG\xa0\xd5\"\a\x95\xad\xd5b8\xba(\xff\x98\xd9\x1d\xaa\x05\xceҢP\x9bE\xb0\xe5\xc9ma\xae&\xb5-\x8c\xf1\xe5m\xee\f!9\xfc,]ׅN\xed\f\xa0\xe3\xa4\xfd\xac\xe9\xc1\xcen\x851\xc3\xefY\xd3\xff\xce\x12\xedm۔A\x91\x18\xe2(\u0084E\xb8\xa9\xb0\x17\xaa浶\x9a\x8aO8\x15(\f[\x14Q\x97\x94b\x91~,\xa1V\x8b\xad\x9e2\x8cU<U\x16[ie\x94R]7\x1b;\xef9\xf0^\xffN\x8f\xfe\x88>s\xf8\xcc\n\xf8\xc1\x99##\x1b=\xf8\x11\xfdB\xad\x961\xa8\x1c\xad\x16\xd3\xd1E\xfa\xc7\xcc\xee\x90-p\x96f@\xad\x9bh˓\xdb\xc2XMr[\x98\xe3\xcb\xdb\xdc\x19Br\xf8Y\xba\xae`\x87o2\x14\xe8\xf5v\x8b\xe6M\x03\x02\xbb\x15\x19\xfe%_\xab\x1b\x1f[\x9d(\x8f\x95\x01)\xaf\"\x9f\x06M\x1c>֨\xeb}\xaff#\xb7\x02\x01a\x8b\"\xeb\xb2\x0e\xfb\x85Z-\xbez*\xf2\xf4j\xb6*\x8b\xa8`QZEK\xe9\xaeGJC\xfd\xf8\xad|]\xe4i\x9f\xe4a\u007f\xa4B\x9b\xba\x1b\x0e\xef\xd7D{B\xad\x165\xa8,\xad\x16\xdb\xd1E\xf8\xc7\xc8\xee\x98-\xf0%^\x06\xc4v\x13ly\xcba\xbf9:\xd1mA\x8d\xaf\xa3\x0f\xfbQ\x8c\xae\vM\xf9ԃ\x80!_\xafh\xc64 \xb0[\x91\xe1\xc7o\rZ\x06)\x8f\x95\x01)\xaf\xe2\x84_\xfb\x1cQ3@\x89\xc3oڢD\xe1\x17j\xb5\xf8\xea\xa9\xc8딭\xca\"*X\x94V\xb6\xe1G_\x9fz\xfa\xf1E\x1e}4X\xe1W\t\xed\xd2R$\xd6jQ\x83\xca\xd0j\xb1\x1d]\x94\u007f\x8c\xe8\x8eт\x8d\xc4ˀ\xd8n\x82-\xcf\r\u007ft[P\xe3\xeb\xd8\xf03u]\xda\x1f\xa6¨S\xbe\xabOh\xb7\"\xc3od\x90\xf2X\x19\x90\xf2*N\xf8\xb5W\x85f\x80\x12\x87\x9f]\x97\x15~\xa1V\x8b\xaf\x9e\x8a\xbeN\x99\xaa,\xb2\x02-\xb6\xb0\r\xff\xb5%5\x87\xdf\x1e\xd9b\x17\xfe\xd03\xa5\xdac\xb7\xc5Z-ޠFa;\xbaH\xff\x18\xd9\x1d\xa3\x05\x1b\x89\x97\x81e\xbb\xd9lyn\xf8\x8dmA\x8e\xafS\xc3\xcf\xd6u\xa9/\x06<u\xd3K\xd9\xec\xe5 \xb2[1\xc3Oy\xac\fHy\x95V\xf7(\x91m\xec\xa6B\xe5\xda\xf5D\xcd\x00Ů@@آȺ\xac\xf0\v\xb5Z|\xf5T\xe4u\xcaVe\x11\x15l\xc3\x1f\xedz\xa4t\xcdF\xbc9wل?\xb4\xb9\xfc\xbc>%\xd4j\xc5\f\xaa%\xaflG\x17\xa9 \"\xbbc\xb4`#\xf12 \xb6\x9b`\xcbs\xc3\x1f\xdd\x16\xd4\xf827w\x86\x90\x19~\x8e\xae\xeb\x86wR=5:>(\x989\r\b\xedV\xcc\xf0S\x1e+\x03R^e\x9a\xb0\b7\x95z\xee\x88/p<\xbe\x85[\x81\x80\xb0E\x91uY\xe1\x17j\xb5\xf8\xea\xa9\xe8Y8S\x95ET\xe0\x85\x9f\xeaz\xa4\xb4\x06\xf7 \xbc\x8e\x1f\xfe{\x1b*\xf0~\xf7<m\x04ck\xb5\xc8Ae\x85\x9f\xe3\xe8\"\xc2Ov\xc7l\x81^ڝ6\xc3\xfdgBl7\xc1\x96\x17\x86\x9f\x1a_\xe6\xe6\xce\x10R\xc3\xcf\xd6u\xdd\xf4\x0e\a\xde\xef\xf4e\xe0\x1e\x1f\x81\xddJ\xe5\xc3S\x9e\x13בEteʠHLq\x94i\xc2B\xf8U\x13uS\xe1\x8b\xee\xa7W-\x9a\xe0V  lQf]B\x8aE\xfa\xb1\x84Z-\xa6z\xca4VqTYl\xa5\x151\x1b\xd1u\xaa\xb1]\xa7^\xdb\xe0\xa9|\xfd\x9a~\x87\xdf\t\xadCf\x85{\xeb<\xaf\xe1\xcb\xfd\ap\x9aDZ-sP9Z-\xa6\xa3\x8b\xf4\x8f\x99\xdd![\xa0\x97\xb6\xd3øS2\xban\xe2-Ol\vs5\xc9mA\x8d/ssg\b\xa9\xe1\xe7\xe8\xbaF\xbb;|\xa3q\xdc\xff\x95jDv+\xb5\x93\xf8sۊ\xa0\xd5\x16eʠ\bHqTԄ\x85\x9b0\xdcT\xe5?ٿ(b\x80bW  lQF]B\x8aE\xfb\xb1DZ-\xa6z\xca4VqTYl\xa5\x151\x1b\xd1u\xa24|bUy\xe5\xaeӫJ\xb7h\xf7\xf6cv\x91\x15>\x8a~aB\xbb\xad@\xa0\xd52\a\x95\xa7\xd5b8\xba¤\u007f\xcc\xec\x0e\xed*#\x97v\xba\xc2c\x1d\u007fs݄[\x9e\xdc\x16\xc4j\xea\x13ڶ\xa0Ɨ\xb9\xb93\x84\xdc\xf0\xcf,$ۭ\xca\xdb\x100#y;\xf6\x83\x10G\xe0\xe4\xf0K\xfe./\x84\u007ff\x12~k\x91\x84\xad?\x13qr\xf8%\x03៙ܭ\x8c\xbdU\xdb\x19@\xf8%\xa1_8\x02\x80\x99\x03\x84_\x12څ\xa3\x99\xf1\xf1.\x00h@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8e\xdf\xe2\x0f\x003\x04\xb9\xe1't]\xa4\xa3+\xd0\xdbї\x81\xe7\xf8\xe8\xf0u]\x16R&b\x8a\xcb\x00\x95\x02L!\x15\xd1\xf5$\x84_@\x96\"5\xfc\x84\xae\x8btt\x05\xda\xfd\xb7\xfd\xed\x99J?_ׅ\x84B\xaa\xe4\x88\xcb\x00\xc5$Aד!\xa4\"\xba\x9e\x84\xf0\v\xc8R\xa4\x86\x9f\xd0u\x11\x8e\xae\xf0q\xfc\xe8\xce\v\xc73\xb3\x0f\xb2\xd1u\xa1x\x84TI\x91\xec\x17\xfc\x12u=\x19O\xbd2\xba\x9e\x9c\xf0\v\xc8J\xa4\x86\x9f\xd0u\x11\x8e\xae\x1b\xed\xf8\x15\x18lό\xa7\xd7Fׅ\xd2\xf6\xac\xd5dßhwb\x9fO\x9b\x9c\xf0\v\xc8J\xe4\x86_%\xa2\xeb\"\x1c]\x03\xfa\xfb\x80/\x03O\xf0\xb4\xd7u1\x85T\x94\f\x8am\ue88dU&\x13\xbb*K\x97<\x83\xdf`L\x03\x94Y\x97\x14<Q-Dg\xa3]O\"G\x97)\xa42\x1dR\x89\t\xbf\x98\x12/ \x8b\x90\x1c~C\xd7E8\xbaN\xea\x0f쿐\ti\x87\xad\xae\x8b-\xa4\"ePl\u007f\x13m\xac2x\xafb\xc3\xeb\x17\xdb4U\x8di\x802뒂'\xb2\x05c6\xaa;\"G\x17)\xa42UY\x89\b\xbf8\x12/ {\x90\x1c~C\xd7E8\xba:\x87\xb5\xbf\fw\nfM\a\"]\x17KKAȠ\xd8\xfe&\xdaXe\x94\xd6<\x8d\x9f\xa0ݏ\xaf\xb0\x99\x06(\xaa\xae!x\"J\xc9\xd9\xcc\xee\b\x1d]\x16!\x95\xf1<\xe9\xf8\x85_|\x89\x17\x90%\xc8\x0e?\x8a<\xb7\x9fptE\xce\x00\x063!\xea\x14麘\xe17eP\x1c\u007f\x13e\xac\x8ar\xdec\x9e\b\x98\x06(\xaa\xae)\xdb2K\xc9\xd9\xcc\xee\x88\x1c]V!\x95m\xf8ٍ\xf1%^@\x96 5\xfc\xa6\xaeK\xfb_\xc4\xd15\xa0\xbb\xb9{3p\xce/\xd4u1\xc3oʠ\xd8\xfe&\xdaX\x15\xe5\x84\xc7̑遠\xea\x1a\x82'\xa2\x94\x9c\xcd\xec\x8e\xc8\xd1e\x15Rن\x9f\xd3\x18W\xe2\x05d\t2\xc3O\xe8\xba\x10\xe1\xe8\xba\xe1\xc5G\xac\xda\a\x80\xb2\x11\xea\xbaXB*\xc2\a\xc3\xf67\xd1ƪ(\x97\xc8=\xbf\x11~\xaa\xae\x91m\xa2\xf4R̞\x1fwG\xe4\xe8\xb2\n\xa9l\xc3\xcfn\x8c/\xf1\x02\xb2\x04\x99\xe1'u]\x84\xa3+\xac\xfd\x1c\xcc\xc0\xe7\xfcb]\x17KHE\x84\x9f\xedo\xa2\x8dUQB˶\xe0D\x1f\xc2\x1f)\x98\xe1\xa7\xea\x1a\xc1#J\xc9\xd9\xcc\xee\b\x1d]\x16\xfd\x95m\xf8ٍ\xd1\x12\xaf;\xafM  ː\x1a~B\xd7E:\xba\x02탷\a3q\x87\x9fX\xd7\xc5\x10R\x912(\xb6\xbf\x890V\x91\\Z\xb0\xe6\xd4\xf9C\xea\xc98i\x802\xeb҂'\xb3\x05c6\xb2;BG\x17!\xa4\"\\Z\x89\b\xbfh\x89\xd7N\xcf3\b\xc82\xa4\x86\x9f\xd4u\x91\x8e\xae@_{o\x06\xb2/\xd6u1\x84T\x94\f\x8am\xee\"\x8cU\x14\x13\xbb\x1e{d\xe3۴\x01ʬK\n\x9e\xa8\x16\xa2\xb3\x91\xdd\x11;\xbaL!\x95\xe9\x90JH\xf8EK\xbcNW\x9e\xb6.\x01\x98\xed\xc8\r\xff\xccB\xb2\xae\v\x00f\x16N\x0e?|\x97\x17p4N\x0e?\x008\x1a\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b\xfft\ta\x8c_\x000k\x80\xf0O\x93\v9\x8a\xa2\xe4\x05\x83y\xea\xaf\x1c\xbf\xa86\x00\xcc\x1c \xfcӤ[\xf1\r\x0f\x8f#4><\xecS\xbaE\xb5\x01`\xe6 7\xfc\x1c]\x17B\x83\x19x\x8cO\"lSr8\xc1\xeeV\x8c/#\a\xf4\xf0\xf3\xeb\x02\xc0LBj\xf89\xba.\xfc\x87a\xfb93M\xc0\x9f\xdb\xcc\xfeKl\xf8\xb9u\aG\x99\xc5\x00\x90\x19\xa4\x86\x9f\xad\xebR\xe3\xd2=\xd3Ï\x90+\xee\xf0s\xeb.\xacg\x16\x03@f\x90\x1a~\xb6\xae\v\rz\a\u06dd\x10\xfe\xb2:f1\x00d\x06\xb9\xe1G,]\x17\n\x05\xa3\xe2\x0e\xa9t+\x8aҌ\x9a՟\xdd(XW\xe4*^yU-\xbd:WQ\xf6\xdc\\?/o9\xfd\xc1\x9dk{c\x91{\xe5MF+\x8c\xf0G\xeb\xfa\xd4ƛ\xf4E\xe0IL\x99V\xa3sq\xfe\xfc\x1d\xb4f\x03\x00$#9\xfc,]\x17&\x13\xe1\x0f\xfa\v\xf6L\xa2\xc9=n\u007fPM铃\xdd+s\x86\U0007314f\x17\xcf/(ޱ\xde\f\xb5\x86K)\xeb\xea*\xcb\x1b\xb7\xb6\xc2\f\u007f\xb4n\xf0B\xf16u\x11\xcd\x05\xfe`\xf0\x82\u007f~\x95\xdf\xef\u05eel6\xe6l\xf7\xb5\x16\x96\xc9\u007f^1\x00\x98H\x0e?Kׅ\xc9D\xf8\xd5\f\xe2\x93\xf0\xfaF\xf5G\xb0\x1b\xbf#\x95=\xa1\x15\x97)Kc\xf4W\xc8U\x82\xef䙿\xd8\xda\x063\xfcf\xddf\xbc\xa7_ߨ\x15\x1b\x87\xfd>\xa5C\xfd9\xact!\x00\xc8\x1c\xb2Ïbu]\x98̄\u007f0/\x88\x82y\x9aId\xaau\xf9\xbc\x82\xc81y\x99\x8b\xf1(aW\x13\xfe\xe9U\xa6,\xe5\xcc\xf0\x9bu\x03\xca8\n\x15\fh\xc5F\xf8\xeb\xe7i\xf7\x03\x167\"\x00\xc8\x1cR\xc3\xcf\xd6ua2\x13\xfe\x90\xfb$\xeau\xe3\xce\f\x17\x167\x9d\xf4WE\xc2_ƨ\xab_\xc4\xf3+֏\xeb\xf8\x17\xfc\xf4\xba+v\xa0>\xb7~\xf9\xc0\b\u007fY\xe4\xfc\xff\t\x04\x00\x99Cf\xf89\xba.Lf\u008f\xb6?\x81\x9e؎'J\x16\xe3\xa3\xfc\xbaH\xf8YW\xe5];\xf0\xcfv\xc5z\x95\x8e\x19~\xa2\xae\xcf\x1dj\x8c\xec\xe1\xb5v\xb1\x9cd\xfd\xbcQ\r\xebQ\x04\x00\xc8Df\xf89\xba.L\x86\xc2?\xe4\n\xb8\x86\xf0D1\xcee\xb8\xcc.\xfc\xc5\xf8<\xbe\xa4\xcaZ\xce\f?Q7\xe4\xf6\xb9#kY\xa5\x16L\xe2:}z\xc5=\a\xad\x8d\x01\x80D\xa4\x86\x9f\xa3\xeb\n\x05\x02\x1d\x83\x81I\xd1\xdci \\\xb4\xbcH;\x05iV\xeaZ\x0f\x96)\ue5a1АvU\xfe\xb6\xb5\xaaKY>4\xb8\xd8\x1dSξ\xdaO\xd4m\x9a\x179\xeaGͮ\x96ޥ\xf9\xb8z\x93R\xdf\xddۨtZ\x1b\x03\x00\x89H\r?G\xd7u٫\x91\x89\x8f\xbd[\\-\xda\xefp\xcb|Wa}\xc7<W\xd5\xd5\x1c\xedt|\x85\xb5fIs]A\xd1\xfa\xd8+\x81\xdd\xca\xcd\xe8WzoF\xc3Oս\xa9<\x19\xa9\x1a\xda\xeeΫ\xd2\x0fq\xfa\xaa\xdc\xee\xc5}1\x8d\x01\x80D\xe4\x86?\v\xd1nމ|\xa5W\xf11*\x04]\x83\b\x00f \x10\xfei\x12\xba:\x1c\xfdJ\xef\xf0U\xd6\xd3<\xbaݬR\x00\xc88\x10\xfe\xb4\xd2<\x88\x96r\xbe\x14\x00\x00\x19\x06\u009fN\x82Jٶ\xa2L\\\xcb\x00\x001\x10\xfe\xb4Ҝ_5\xc3\x1fS\x028\x17\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\b?\x008\x14\xb9\xe1g뺂\xfe\xee\xf6^\xe6\x97b\x00\x00H\x1bR\xc3\xcf\xd6u\x05;z\xc7o_\xee\xe8\x85\xf4\x03\x80L\xa4\x86\x9f\xad\xeb\x1a\xec\xc6\xcf\xf4\x98\x8az\xfb\x00\x00\x90\x82\xd4\xf0\xb3u]'\xf5\xe7\xdf\f\xb2\x9e\x84\x01\x00@\xba\x90\x1b~\xc4\xd2u\x05\xf4\xe7]]x\xc3n6\x00\x00R\x8c\xe4\xf0\xf3t]\b\x85\x8f\xfb\xf9\xb3\x01\x00\x90r$\x87\x9f\xa7\xebR\xdf\r:\xe0)\xf6\x00 \x13\xd9\xe1Gl]\x17\x1a\xf2\xc6<\x14\x1b\x00\x80t\"5\xfc\\]Wh\xd0\v\x0f\xbc\x01\x00\xb9\xc8\f?W\xd7\x15\xf4u2Ԙ\x00\x00\xa4\x13\x99\xe1\xe7麦\xbaN\xe2\xdb~\xe0&\x1f\x00\x90\x89\xd4\xf0\xb3u]\x81\xf6\xaeہ@\xe0\x82q\xed\x0f\x00\x00\tH\r?[\xd7էۺ\xbcp\x93\x0f\x00\xc8Dn\xf8\x01\x00\x981@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\xb3\x9a\xb0\xa8\x02\xe0` \xfc\xd9K\xa0\xb1PyBT\tp.\x10\xfe\xac%\\R\xe2\x1d\x80\x87\xa4\x00\\䆟\xad\xeb\"Je3\xb5\xad0oE\x9c\xc7\xc6\x03\x85\xb3\xebK\xc7W\x95>Q\x15\xc0\xd1H\r?[\xd7E\x94Jgi\xa1\xb71/\xce\x05\xfb\xf2g\x97Y`X\x81\x87\xa1\x03vH\r?[\xd7E\x94\xcafJiE\xe18\xb3?뮞\r+C\xa2*\x80\xa3\x91\x1a~\xb6\xae\x8b(\x95\xcdMev\x1d\xc9'\x04\x84\x1f\xb0Gn\xf8\x11K\xd7E\x94J%\xe4V4vh\xffk-\xcb+kU\u007f_\x9d\xab({n\xae\x9f\x97\xb7\x9cz\xa0h0OQr\x8e3Z1\xb9]\xe7\xce-\\\x11\xf3\x16\xd6Q\xe8ſ\x02\x05\xfaҔ\x02\xb2\x06\xb9\xb4`]\x91\xabx\xe5U\xb5t\x9b\x92\xeb\xdd1?o\xb9Vsj\xbd\xbbx\xc7\x0ew>~\xc4a\xe7\xe2\xfc\xf9;\xacG*c\xfb6ծݷ遥\x18\rB\xf8\x01[$\x87\x9f\xad\xeb2J\xe5\xf2\xbe\xbfKi\xf6\xfb\xb5\x885\xba\xf6\xf8\xf6\xb8\xd6\xe3g\v\x1f/\x9e_P\xbcc\xbdB\xc7\xf8\xb2\xdf\xefjf6\x13a0\xbf\xace\xa0Yi\xb1\x96?\xa1,ǿB\x1d\xad:\x1d\xe4\x9b\n\xb94\x9f\xf2\xe4`\xf7ʜa\x84n\x1c\x9f\xab\x146\xb7\x14\xd4\xe1\x1a%E\xadͮ\xbc\xf6\xe5jÍ9\xdb}\xad\x85e\xf4\xbb\xe4\xc7\u007f\xf6ҹ+g\xd7V\xff\x8e*\rM\x0e.t\xcb\x1fR`6!9\xfc\x1c]W\xb4T6\xc6a\u007f\x9fve\\\xff\x89ʔ\xa5\xc1\xc8\xc9\bE\x9e]\xf8C\xc5\xf8P!\xd4\x1d#\x1d\xbb}Pw\x11M\xde֙\xb4\xfc\xddXZ\xb0\x1b/\xb2L\xfbd\xde\xe5V\xdfz\xd6\x17\xaaS]\x8az,Ъ\x8c\xab\x93>\xa5\x03\xe1\xa3\xf9.j\xfe3\r8\xf6gV\xd3{\xfe'\xd4c\x8c,>\xa5\x01R\x81\xec\xf0#\x8e\xae+R*\x19#\xfc\x8d%گ\x92F\xfc\xb3\xccž\xfc`\x1b~\x9f\xf2\xbe\xcd_\xd5\xf7\x00%\x8a\xc5Kf.m\xaau\xf9\xbc\x02\xa5\fO\xbapG\x9a]\xea\x8f&7\xc2\xfd\xc4\xe3T?/\x84)n\xa4\xe6\xff\xb2aӱ\xb3\x9f>\xf8\x96*D\x81>o\t\xec\xf9\x01[\xa4\x86\x9f\xad\xeb\xa2K\xa5b\x84\u007f\xf1J\xed\u05ca\x85\xf8gY\x19\xbb\xb6m\xf8[\x14\x81t\xc4\xefӱ~\xfef,m\xb8\xb0\xb8餿J\x0f?^\x94\x16\xfe\x16e\n\x1f\x92\xe0=\u007fY\xe4\xdd\xc3r\xd7\xde\xfd\xb3/l\xad^\xdb\x13s\xce\xefW\x86\xadE\x00@ 3\xfcl]\x17U*\x19s\xcf?O\xfb5O\xdf\xf3ױkۆ\u007f@\x19\xb5\xf9\xab\r\xc6\xd2J\x16\xe3=u\x9d%\xfc\x81\x9c\x15\x81\xab\xf3\x17\xe3\xb1Y?oT\x83>\xb3\xb8\xf5\xaa\x1a\xfb\xfb\xe7j\xcf \vp\xb5\x1f\xb0Gf\xf89\xba.\xa2T6F\xf8}ډt\x97\xfe_q\xf8o7\xc7$=XT\x85\xdf϶o\xb7\xfe!z\xce\xcf\xc3XZ1\x9e\b\x97Y\xc2?\xaa\x14*J\x95vfЧhWH\xf6\x1c\xa4\xe6奄\x82\u007f\xed>\x82,@\xf8\x01{\xa4\x86\x9f\xad\xeb\"J\xe5\xa2_\xed\x1f\xd2\x0e8\xd6\xe74\xf9\x9ar\xf0\xd5\xfe!\xff\xfc*\xbf\xdf\x1aX\xb5\xd8\xefj\xf4\xfb\xf5N\xaeT\xf2cz;\xf8\xbd\x12\xafo\xbb\xd2n-_\xa9\xac\xb0\x16\x99\x90KkV\xeaZ\x0f\x96)\ue5a1\x80?\xb7q\b\x8d6\xe6\xfa\x03h\xd45\xe0\xf3\a\xf4\x83\xa2&\xa5\xbe\xbb\xb7Q餚詮\xedy\xf7ݗ\xaaǬm_V.X\x8b\x00\x80@j\xf8ٺ.\xb2T&\x91\xcf\xf9\xe7jw\x16\x86\xb5\xcf\xf9\xd5\xfe\\\xcd\xd1J\xad\x81\x1d\u058b\x15\xed3{Ԟ\xcf8\x9f\xbeYW\\\xb0\xf0dLq\xe4s~6\xe4\xd2\xc2-\xf3]\x85\xf5\x1d\xf3\\U\xdbԢ\xdc\xf1|\xf5\xe76t\xc1\x85+\xe4V\xe1\x93~\xd4W\xe5v/\xb6ܱ\u007fvwϦچ\xdd1\xd9G\x93s\xeb\xaeN\xca?\x95\x02f\rrß5\xf4*\x92\x8eS&\xf3\xb7M\x86B\xc1\xe1\xba$.\xdd\xf7\x96\xc4\\\x1c\x04\x00\x13\b\u007f\x12\x84;\xdcO\x8a꤈^\xb7\xbe\xef\x0e\xbb\x93\xf9\xd4~\xf2j\x06\xee\x99\x06f\v\x10\xfe$\b\xb8w\xc8:I\x19\xcdю\xf7\xd1x\x8e\xfdm\x04\x00\x900\x10\xfe\x99M\xb81\xefɮ\xc1\xae'\xf3d\x1dj\x00\xce\x01\xc2?\xd3\xf1-/r\x15-O\xe6\xa0\x1f\x00l\x81\xf0\x03\x80C\x81\xf0g%\xffh\"\xaa\n8\x16\b\u007fV\x02\xe1\a\xc4@\xf8\xb3\x12\b? \x06\u009f\x95@\xf8\x011\x10\xfe\xac\x04\xc2\x0f\x88\x81\xf0g%\x10~@\f\x84?+\x81\xf0\x03b \xfcYI$\xf8\xff\xf5?\xfd\x03\x15\xfe\xa9Ž\b\x00\"\xc8\r?[ץ2\xee\x85[\xd8\x12\xe4Jû\xfc?\xea\xd9\xff\x9b꿲\xec\xf9[r\xe8'\x81\x00NFj\xf8ٺ.\x95`\xfb\x05\xfa\t\x15\x80\x90wk\xcf\xf1\xff\xa8g\xbf\xf6\xbf\xc6\x1c\xf6\xfb液\xe7\x00\x9c\x87\xd4\xf0\xb3u]*\xbe\x81\x00\x84?Qb\x9e\xd8i\x12\xfeǟ\xfd\xe3?\xfe\u007f\xb5\u007f\xc58\xe7\xdf\xc3y41\xe0<\xa4\x86\x9f\xa3\xebB\xe3\x1dA\b\u007f\n\xb9Y\xf6\xc7\u007f\xfc\xef\xff8\xe7\xff\xf8?\u007f\x16\x1b\xfe`\x11\xfd\xe4o\xc0\xb9\xc8\r?b꺂\xed7Q\x16\x85\x9f#\xfcB\xf6\xe6\xae߭\xad}\xb5\xa1a\xec\xd8\xea\xdd\xf7\x11\xba\xffBC\xed\xa6}\xb7\xd4\xe2#յg^jX\xbd\xef3j\x12ݯ\xad\xae\xae\xd6\x0e\xfb\xd5ҳǶ\xd6\xee\xfb-\xfe\xcf\xfd\x17\xd76\xbc\xfa\xea\xda\u007f\xa3TU\xcdɫZ8\xe7\xcf\u007f\xa6\x85\xff\xb3\x17\xd6\xd66\xe85\xd4]\u007f\x9e\xacg\x11\x003\x1c\xc9\xe1g\xea\xba|\x03(\x9b\xc2\xcf\x13~\t\xcc]c\xab\xab\x8f\xed\xae^۳\xf6\x8cz>_\xfd\xd2ع}\xd5\x1f#t\xeb\\m\xf5\xa6\x9e\x9eM\xb5\xb7\xc8I\xb5|l\xac\xb6\aφK\x1bzzV\xbf\xa0N\u007f\xbb\xb5\xe1LOm\xed\x99\xff\xf5\xe0\xef\u007f\u007f\xe3\u007f\xfe\xfe\xf7\x0f\xfd\xfb\u007f\xc0\xe1\x1f\xab}\xb6\xe7JOu\xe4\xd9\xde\x17\u087e\x80\x8e\xe4\xf0\xb3t]7\xf0\xbbA\x16\x85\x1fq\x85_\xf6殆\x17ѕ\xeaw\xd1K/\xe1\xc7\xf0\xab\xbb\xff\a?ƁF\xb5\x9b\xf0\xa1\xc0\xa6g\xe9I\xfc\xbf\x9e\xc8\xef\xd5\xea>\xfd\xc5\x06u\xea\\\xb5\xfa\xbep\xa6\xfa\xe3\x929s\xe6\x84\xeb\xe7\xcc\xf9Ο\xe3\xf0\u007f\xbbi߷\xea\x1b\x03n\x12\x13P\xde@\x00\x80\xe4\x87\x1f\xc5躂\xed7\xc2\xe1\xf5殛\x00\x00\r\xefIDATp\xa03\x9cE\x0f\x9a\xe5\t\xbft8殆s\xe8\xe3\xea\xfb\xe8\xd5\x17\xd5\xe9\xfbg\xf6mZ]\xfdc\\\\\xfb*\xfeyF\xfd\v9\x89\x88\xf0\xab\xef\x16\xa8\xa7V\xfd\xf1\xeaj\xf5\xc7o\xaa\xdf\rl\xffc5\xfc\xff˿\xfb\xf3\xff\x86\x0f\xfb\xafT\u007fJ.&`q\xfd\x01\x8eEj\xf8\x99\xba\xae\xdb\xde(\xd9s\x19\x9a'\xfc\x8a\xc06w5\\A\x1f\xab\x11\xc6\xe1\xff\xb8aӫ\xef\x8e\xed\xd6ïe|\f\xefԉID\x84\x1f\xff\xd6\xc2\u007f\xe6\xcfԷ\x85+շ\xc2\xc1?W\xc3\xffo\xfe\xdf\u007f\xd0.\xf8\x9d\xa9\xa6<~\xc3\xf08\u007f@Gf\xf89\xba\xae\xa9I\x95\xf1\x8e\xc9,z\xc6<\xcf\xf9c\v\x11\xfe\xad\xcf\xe2\x9d\xfb\vz\xf8\x8f\xe1\x9fg\xb5=\xbf9\x89X\xe1\xff\xb2zߗ\xb7\xb6\xee~\x80\xd0\u007f\xc1\xe1\xff\xcf?\xd3>\xea\xbb\x12y\xb3\x88\xd0\xecJ\xfc!\xe0@V\"3\xfc\x1c]\x97F\x96\x9d\xf3\xb3\xc3oo\xee\"¿\t\x9f\xed?\xf8\xb1\x1e\xfe\xb5ډ\xfenz\x12\xb1\xc2\u007f\xabzmu\xf5n|U\x1f\x87\xff\x0f\xff\x93\x1e\xfe\xfb\r\xbb\xf1\xae\xff\x98\xf6\u0381\xc2%6\x02!\xc0QH\r?[ץ\x12\x0e\x8cw\x04b\xcc\xf6\xb3\x14\x8e\xf0\v\t\xcc]\xb7V\x9f\xb9\u007f\xae\xf6\xd6\xfd\x17\xd5\xf4\xf6T\xbfp\xa6\xe7\xc7\xd5k{\xc6\xd4lW?{\xee\xec\xd6տA\xe4\xe4\xb7ccc\xb5G\xc6\xc6\xee\xa3/\xf1\xef\a\x9f\x1e\xa9\x1d\xfb\x12ݪ\xbdre\xec\xb7\xf8\xe6\x1f\x1c\xfe\xff\xed?\xfc\x8d~\x93\xcfX\xedֳW\x8eU\x9f\xd5\x16Ӓ\xacP\x14\xc8:\xa4\x86\x9f\xa3\xebR\xcb\xf1)\xffq\xfe|\xb3\n\x8e\xf0\vٛ\xbb\x1e\xa8;\xeds\xab\xabk\xcfUW\xbf\x80\x1e\x9c\xd9Z\xdb\xf0\xe2٭\xb5\xbb\xf1\xb1\xfeK\xab\x1b^\xfc\x12\xd71'?\xae\xd69\x8b\x8e\xa8?k?\xc5\x1f\xfb\x1fQS\x8e\xcbjw\xdf\xd2\xc2\xff\xbf\xff\xe7\xff\xeb\xbf\xeb7\xf9\xfc慆\xd5\xcf\xea\xdf\x04\xf0\xe7\xed\xe0v\x01p\x18r\xc3\x0f$N\xf4螞d\xf1\xaf\xb5G\xfe\xf5w\xbf\xbb\xff\xf1\v\xab\xefk\xe1\xffo\u007f\x85o\ue9eat\xb9\x1a\xe1\x16\x1f \x02\x84\u007f\xa6\x13\u007f\xf8\xdf]\xad\xdf\xee\xff`\xed\x15=\xfc?\xfb\x9b\xff\xdb\xf2\x95\xde\"\xf8R\x1f`\x00\xe1\x9f\xe9\xc4\x1f\xfe[\x91\xcb\xfa\xb7\xaa?\xfd\xb7\xf8j\xff\u007f\xd0\xce\x02lg\x01\x9c\f\x84\u007ff\xf3[\xedz\x9eu\x92̓\x97j\x8f\x9c\x1b;w\xa4\xf6\xa5\a\x10~@\f\x84\u007ff\xa3]\xcf\xfb\xcc:\xc9\xe1\xc1\xbb\xfb\x1aj\x1b\xf6\xbd\xfb\x00E\x0e\xfb\xe11^\x80\r\x10\xfe\xac\x04\xc2\x0f\x88\x81\xf0g%\x10~@\f\x84?\v\t\xb5\xd6\xe1;\xfc\x9a.\xc0\xc7z\x80\r\x10\xfe\xec#\xbc8\xfa\x95ޓ\x90~\x80\x0f\x84?\xfb\b=t\xf0\xf7\xbf\xff\x9f\xea\x06z\xe8\t\xf8\x0e\x0f\xc0\a\u009f}\x04\x15\xa5\xaa\xea\xa1ª\x85s\x1a\xb3\xe5\xfb\x12@:\x80\xf0g\x1f!\u007f\xb1\xdb=\xdf\xedv/\x1d\x86=?\xc0\a\u009f\x85\x84\x02\xdaS\u0086\xea\n\x95'Du\x01\xe7\x02\xe1\xcfF\xc2\xe1\x90\xfao\xfe|\xef@\xf6<\x1d\tH9r\xc3\xcf\xd4u\x85:\xb4\x87xudӕ\xe9\x81BC?6\xb5\xad0o\x05\xf5\x90\xa2#\x91\xa7nO\x8f\xe8\"\x1a\x15EɻɨpU\xe9c\x94\x02@\x14\xa9\xe1g뺂\xde\xf7\x03*\xf4\xa3lg9\xbe|\xe3\x11\xb9K\v\xbd\x8dyԹ\xf7o\xc7\x04\xdfЉ\x8b\xe8\"\x02~\u007f+\xf3i\xdc\xc3\n\xfd\x8c@\x00\xa0\x91\x1a~\xb6\xae+\x98EO\xee40v\xf5SJ+\n[\xaf\xbb\xa5\"\xfc\xe6\"Ԙ\x0f1\xfe\xce,\x9d\x932b\xdb\x06f\x19R\xc3\xcf\xd6uee\xf8\rn*\f\xffpJ\xc2o\x92H\xf8\xbfI\x11\x10\xfeُ\xdc\xf0#\x96\xae+\xeb\xc2\x1f\xccS\x94\x9c\xe3x*\xe4֟\xcfo}tV\xed\xb1\xa8w˄\x90x1}^h\x9b\x92\xeb\xdd1?o\xb9v\xf4d,\x02\xc3\x0e\xff \x84\x1f\xb0Er\xf8Y\xba\xae\xa0w\xe0\r\xefq\u007f\x16]\xef\xbb\xec\xf7\xbb\x9a\xb5\xa9\xf7\xfd]J\xb3\xdfo}w\xc3O\xe2<\xf7\xe3Z\xea\x91ڄċ\xed\xf3\xbaq|\xaeR\xd8\xdcR\xa0=\x19\xd8\\\x04b\x86?49\xb8\xd0\xcd\xf8\x94\x1f\xc2\x0f\x18H\x0e?K\xd7\x15\xf4v^\r\xdc\xe8\xeeʢ\xf4#\x94\x17M&\xfb\xb0\u007f+\x16hm}\x96*$$^l\x9f\x17r\xb9\xd5w\x91\xf5\x85\x91\xff\xe5م\xff\t\xf5\xb8\x81\xb1`\b?`\";\xfc(Fׅ\xc2\xe3\xfaA\xc0\x90`\xbeY\x85 \xfc\x9aw+j\xdf\xd0!$^\x1c\x9f\x17ra\xbbv\xb3+\xf2?\xdb\xf0\a\xfa\xbc%\xd3\xda\xf3\xcf\xd1\xfe\xd9\xfc=\xb6m`\x96!5\xfcL]W\x14\xffI\xf6L\xb3\x13A\xf8)\xefV\x04B\xe2\xc5\xf6y!\xed@?\xbe\xf0\xab\xf8\x95\xe1\xd8B\x1c\xe87\xffH\x8f\xf5\xbf\xfc\xe5\xc3s\xbe\xffS^\xb8!\xfcY\x8f\xcc\xf0\xb3u]h@O\xc7 \xeb(u\xd6\"\b?\xe5݊\x9b\xc4\xc2Ͻ\xda\xff\x837\xf5X\xff\xc5\x0f~\xf9\xc5/\xff\xe4\x17\x9cpC\xf8\xb3\x1e\x99\xe1\xe7\xe8\xba|\xda.\u007f\xaa\xe3}\xdbyg\x19\x82\xf07h\xe7\xfc\xbbc\xffbK\x8a\xc2\x1f\x8d\xf5\x1f\xfeJ\xfd\xf1\xab\xff\x18I\xf3O\xbf?\xe7\xe1\xbf\xfb\xe6\x9b_\xfe\xf0\xa1\xef\xfc\xf0\xd7F\xf8\u007f\xfa\xdd9\x0f\xff\xe57Ą\xfa\xf79\xdf\xff{\b\u007f6 5\xfcl]W\xc0\xdbw3p\xb9ݗ5\x9e\xceА\xdf\xefj\xf4\xfb\x83ѫ\xfdC\xd6U\xab\xad\xde76\xf6\xac\xa6\xe0\x8a\x9f\x80?\xb7q\b\x8d6\xe6\xfa\x03\xe4\"\xb4;\xfcZb?Q@\x97Y:\xde\xd8\xf0?\x1c\xc9\xfe\x1f\xfe\xf4\x8b_\xaao\x04\xdf\u007f\xf3\x8b_\xff\xe9\x9fF\xc3\xff?\xbe\xff?ԃ\x83\xbf$&\xbe\xff\u05ff\xfe\x97_\xfc\x10\u009f\rH\r?G\xd759p\xbc\xc37\x9e5\xd9Gú\xafK\xf1F?\xe7\x9f{\xc3Rck\xcf\vQ\x05W\xfclS[\xca\x1d\xcfW\u007fn#\x16\xa1\xddۏ\xa9\xb7֟\x9c[w5\xc6|L\x86_?\xec\x8f\x1c\xdc\xff\xd1\xdf\u007fc\xf0뇣\xe1\xff\xc1/\"\xef\x0f\xc6\xc4w~\xa5ׁ\xf0\xcf~\xe4\x86\x1f\x90Io\x89\x12\xf3\x95^2\xfc\xf8\x82\xdf\xc3\u007f\x17\t\xff\x9c_\xeb\xbf\u007f\xa5\x1e\xd6ϙ\x13\r\xffC\xfa\xad\xbc\xc4\xc4_<\xf4\xa7\u007f\xf7+\b\u007fV\x00\xe1\xcff&\xafZO\x06\xc8\xf0k\xbc\xf9]\xfd\xf7C\x91\xf0\xff\xe0/~\xf5\xcd\x17F\xf8\xe7D\xf6\xf3\xe6\xc47\xbf\xf8\xeb\x1f>\xf4\xd7\x10\xfel\x00\xc2\xef,b\xc2\xffÿ\x8c\x84>r\xd8\xff\x9d/\xd4\x13|#\xfc\u007f\xf4\xb7\x91j\xc6\x04\xe6\x97߁\xf0g\x03\x10~gA\x86\xffO~\xf1/\xbf\xfc\xd3?\xfa\x17=\xd0o>\x1c\xb9\xe0\xf7\xd7_\xfc\xe2\xbbF\xf8\xdf|\xe8\xef~\xfdś\u007fBL\xfc\xc9O\xbf\xf8\xe2o\xbf\x0f\xe1\xcf\x06 \xfc\xce\x02\xc7>r\xf6\xfe\xcd\xdf\u007f\xf7\x0f\x1e\xfe\x8b/\xa2\xbb\xf3\xbf\xff\xae\xf6Q\xdf/\xbe?\xe7\xe1\xbf5\xc2\xff͛?\xf8Μ\x1f\xbcIL\xfc\xf4\as\x1e\xfa\xe1/!\xfc\xd9\x00\x84\xdfY\x10\a\xfc\xd3\x03\xc2?\xfb\x81\xf0;\v\b?`\x00\xe1w\x16\x10~\xc0\x00\xc2\xef, \xfc\x80\x01\x84\xdfY@\xf8\x01\x03\b\xbf\xb3`?\x8c3\x19DK\x02f<\x10~\xc0\x96\xec\xf9\xca\x05`\x05\xc2\x0f\xf0\t4\x82\xf0+\x8b\x81\xf0\x03\\\xc2%% \xfc\xcab䆟\xa9\xebR\xb9\xd1\xd7\xd1}\xd9f> \x82\xad\x06,\xe5\x80\xf0+\xbb\x91\x1a~\xb6\xae\v\x85\x06\xbcC\xb7G\xbd\xf4\xc3*\x01\x16\xb6\x1a\xb0\x94\x03¯\xecFj\xf8ٺ.4\xd0\x1e\xc0o\f\xd6'^\x00\f\xec5`)\x86\xfdx0 [\x90\x1a~\xb6\xae+\xe0}\xdf\xf8\x1b\x10/\xccg\x03\xa6\x18\b\u007fv#7\xfc\x88\xa5\xeb\x1aj\x0f\xc1\aJ\xf1 Ҁݪ\xad\xae~\xf5\xb3\x177\xd5\xee\xfb\x1dQ*Ԁ\xa9|\xf6\xc2\xdaچ}\xbfE\x16\x98\xc2/ k\x90\x1c~\x96\xae\xab\xd7w\xe3\xa4\xf7\xf8\x85\xac\x12\xf6\xa4\a\x81\x06\xec\xdbs\xe76m]\xddp\xec\xc5?#\x9f\x0e(Ԁ!4V\xfblϕ\x9e\xea3T!O\xf8\x05d\r\x92\xc3\xcf\xd2uuk\xba\xae\xe3ݐ\xfe8\xb0\u007f$8\xfaq\xf5\xee\xfb\xe8\x01\xad\x03\x10j\xc0\xbeݴ\x0f?I\xfc\x1c=\x1bO\xf8\x05d\r\xb2Ïbu]>\xed\xaa_\xb0\x83\xe1\x97\x01\xac\x88\xc2_\x1b\xf3H`\xb1\x06\xecJ\xf5\xa7֙\x10_\xf8\x05d\rR\xc3\xcf\xd6u\rꞮ\xc1^\xfe\x8c@\x14Q\xf8i\xf7\xa7\x86P\x03v\xa6\xfa\xdbع\xb49Y\xc2/ k\x90\x19~\x8e\xaek\xb4C{/\x18\x80c\xcc8\x10\x85\xff\x05F\xa1\x88+\xb43\xd0\x04\xae\xf6g72\xc3\xcf\xd1uMi\x1f\xf5\x05\xdb\xe1\x16\xbf8HG\xf8\xef7\xecƻ\xfecǬ\u007f\x80\xf0g7R\xc3\xcf\xd6u\xa1\xcb\xed\x97\x03\xe3\x9d'႟\x00\x91\x06\xecwcc[w\x8f\x8d}ƙ\x9d\xcfX\xedֳW\x8eU\x9f\xb5\x963\x85_@\xd6 5\xfc\x1c]\x17\xba\xdd\xdbq\xf22d_\x84H\x03v\xabZc\x1fgv\x1b~\xf3B\xc3\xeagߍ)f\n\xbf\x80\xacAn\xf8\x81\xd9\x05K\xf8\x05d\r\x10~\xc0\x8eX\xe1\x17\x905@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1\xc8\r?K\xd7\x15\xea\xf4\xea\x1c\xb7\x9f\x17\x98!\x10\xca0`V#5\xfcL]W\xc8;\x1aP\xb9\xec\xbd*\x9a\x1d\xc8\x18\x83\xa3\xe64\xa1\f\x03f5R\xc3\xcf\xd6u\x8dk\x0f\xef턇\xc6\xcc`\x16\xd6\x13\xff\x81\xc7{d\tR\xc3\xcf\xd6ui\xf8ހ'\xf9\xcc`\xca\xeaD5\x80ه\xdc\xf0#\x96\xae\v\xa3=\xcf\x13\xc8\x14\xb7\xebܹ\x85+\xb4\xc7v\xb4\x96啵\xaa\xbf\xb7)\xb9\xde\x1d\xf3\xf3\x96\xe37\xea\xc8\xc3\xfe\xcb\x10\xa9\f#*lSr:\xd1m\x97R\xa25ֹ8\u007f\xfe\x0ex\xe0\xff,@r\xf8Y\xba.\x8c\xe6\xf1\x002\xc4`~Y\xcb@\xb3ҢN6\xba\xf6\xf8\xf6\xb8֫o\xc7\xc7\xe7*\x85\xcd-\x05\xea.?x\xc1?\xbf\xca\xef\xf7kO\f4\x94aD\x85\x80?W-\x1ajt\xe1\xf2Ɯ\xed\xbe\xd6\xc2287\x98\xf9H\x0e?Kׅ\xa2\x17\x03\x80\xcc\x10*^\x1e\xc2OT\x9fB\xa8O\xc1\xa7c\xfaO\x97[\xdd(\xeb\v\xb5*\xd4a\u007f\xf4\xf1\xe1D\x05\xed\xfd\xa0\x19\x87ߧt \xfc\xd0\xef.\x04\xcctd\x87\x1f\xc5\xea\xbaT\x06\xba\xedg\x01҉Oy?:٨\x1f\xb9\x974\xaa?\\\xf8\x87\x16h^\xf8\xcd\nf\xf8\xeb\xe7\x850ō\b\x98\xe9H\r?[ץ\xd2\x01\u008e\fҢ\x18\x17[\x17\xaf\xd4~\xadX\x88\xc8@\xf3\xc2oV0'\xcb\"\x17\b\u087f3\x1f\x99\xe1\xe7\xe8\xba\xf0\x95\x00J\x1c\t\xc8e@1>\xc5o\x9c\xa7\xfd\x9a\xa7\xed\xf9\xad\xe1o\x8f\x9c\x9b\xf1¿\aO\xae\x9f7\xaa1\x85\x80\x99\x8e\xcc\xf0st]\xf8\x94\x1f.\x0eg\x90`Q\x15~+\u07be\x1d\x9f\x01\xe0s\xf5.M\x05F\x86\xbf\xaa\n\xa1I%rr\xc6\b\u007f^\x93\xfa\u07be\x10O\xf6\xe9\xb5\xf6\x1cD\xc0LGj\xf89\xba.\xf5\x9d\x00>\xe4\xcf$\x83\xdf+\xf1\xfa\xb6+\xed\xea\xe4\xfa\x9c&_S\xcez\xed\n~\xe3\x10\x1am\xcc\xf5\xe3\xfd}\xb3\xab\xa5wi~\x80T\x86Q\x15\x16\x17\x1e<\xb8X\x99\xdbq\x03\xa1&\xa5\xbe\xbb\xb7Q\xe9\x14-\x14\xc88R\xc3\xcf\xd5u\xc1\xfd\xa2\x99\xe5f]q\xc1B\xedSװ\xf69\u007f\x18\u007fv\xaf(\xb9\xe3\xf9\xea\xcfmjqh\xbb;\xaf\n\xfb\xbaMe\x18U\xe1fU^\xc1\xf2&\xbdn_\x95۽\xb8\xcfvy\xc0\x8c@n\xf8\x01\x00\x981@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8\x01\xc0\xa1@\xf8g\x0f\xf5\x8a{\xfd\rQ%\x00\x88\x17\b\xff\xec!0\xd8Q\xe2\x86'\x1f\x00\xa9Bn\xf8Y\xba.\xfct\xd87\xda߸\x00\xaf\xea8\x18T\xc0k\x04\xa4\n\xa9\xe1g\xea\xbaP\xb0\xf3$.\xed\x84\xf4\x8b\x19V\x86DU\x00 N\xa4\x86\x9f\xad\xeb\xf2wk\x8f\xf0\xef\xf6\v\xe6\x06 \xfc@*\x91\x1a~\xb6\xaek@\u007f|w/x;\xc4@\xf8\x81\xd4!7\xfc\x88\xa5\xeb\x9a\xea\x1c\x9c\nM\xf9;\xe1y\xafb\xae*\x83\xa2*\x00\x10'\x92\xc3\xcf\xd4u\x85\x06\xd4\xd2>x\x86g\x1c\x84\xdc\v/\x04\xc0\x84\x05\xa4\x04\xc9\xe1g\xe9\xbaB\x03\xdd\xf8\x99\xbe\x03\x90\xfe8\xe8S\x14e\xa5\xa8\x12\x00ă\xec\xf0\xa3X]W\xf4\x82\xdf\x05ь\x00\n\x16\xcek\x19\x04\xc3\t\x90\x12\xa4\x86\x9f\xa9\xeb\n\xb7\xeb\xa68\xcd\xe3\x03\xd83\xac\xc0eQ U\xc8\f?[\xd7\x15\r\xff(\x84_\f\\\xed\aR\x87\xcc\xf0st]\x83\x91\xc3~\xb8\x8e-\x06\xc2\x0f\xa4\x0e\xa9\xe1g\xeb\xbaB]\xdd\xe3\x81\xf1\xee.\xb8\xe0'f\b\xc2\x0f\xa4\f\xa9\xe1\xe7\xe8\xbaB\xc3';N\x0eC\xf6E\x84\x02\xa3\xf5\xae\x80\xa8\x16\x00ĉ\xdc\xf0\x03\xd3\xe1\tE)\xee\x15U\x02\x80x\x81\xf0\xcf\x1e\x02\xa3\xb0\xdb\aR\b\x84\x1f\x00\x1c\n\x84\x1f\x00\x1c\n\x84\x1f\x00\x1c\n\x84\x1f\x00\x1c\n\x84\x1f\x00\x1c\xca\xff\x0fL\f\x1em+\xfdz{\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/chan1.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x04\xc0\x00\x00\x02n\b\x03\x00\x00\x00aR\x8e\x00\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\a\n\a\x0f\x11\x0e\x1a\x1a\x14\x1f\x1f\x18!# #$\"\x15%D$%#%'%'(&+)\x1e()'*+)/,!+-*,-+-/,02/63(241564796<9.9;8#?r@=2<>;>@=C@4DA5AB@DFCFHELH:IKHKLJNOMUP?PRORTQTVSVWU]XGWYV_ZI,`\xaeZ[Y7]\xad[]Z\\^[9a\xab;b\xac<c\xad_a^faO>e\xafac`hcQcdbAg\xb2efdCi\xb4fheDl\xb0Mj\xafqjRikhGn\xb2Ip\xb4lmkKr\xb7npmUt\xb4{s\\rtqWv\xb6tvsuwt[y\xb9\\{\xbbxzw]~\xb8e|\xb8\x84|dX\x80\xbf{}za\u007f\xbf|~{~\x80}b\x82\xbc\u007f\x81~d\x84\xbf\x81\x83\x80|\x83\x97\x83\x85\x82l\x86\xbch\x88Ð\x86hn\x88\xbej\x8ać\x88\x86q\x8b\xc1\x89\x8a\x87t\x8e×\x8doz\x8e\xbf\x8c\x8e\x8b|\x90\xc1\x8e\x90\x8dx\x92Ȑ\x92\x8f~\x93ĝ\x93ux\x96Œ\x94\x90\x81\x95Ɠ\x95\x92{\x98Ȕ\x96\x94\xa2\x97y\x96\x98\x95\x81\x9aė\x99\x96\x84\x9cƇ\x9b̙\x9b\x98\x80\x9eͦ\x9c}\x87\x9fɜ\x9e\x9b\x89\xa1˞\xa0\x9d\xa0\xa2\x9f\xa1\xa3\xa0\xa2\xa4\xa1\x91\xa5ʏ\xa7Ѥ\xa6\xa3\x94\xa7̥\xa7\xa4\xb3\xa7\x83\x92\xaaԧ\xa9\xa6\x97\xaaϩ\xab\xa8\x9d\xac̫\xad\xaa\x9b\xaeӟ\xafλ\xae\x89\xad\xaf\xac\x9e\xb1ע\xb1ѯ\xb1\xae\xb1\xb3\xaf\xa5\xb4Ԣ\xb5۳\xb5\xb2ö\x91\xab\xb7ѵ\xb7\xb4\xa8\xb8ح\xb9ӷ\xb9\xb6\xb9\xbb\xb8\xb0\xbc\u05ed\xbdݻ\xbd\xba\xb3\xbeٽ\xbf\xbc\xb7\xbf\xd4\xcd\xc0\x9a\xbf\xc1\xbe\xb6\xc1ܹ\xc1\xd6\xc1ÿ\xbb\xc3\xd8\xc2\xc4\xc1\xbd\xc4ں\xc5\xe0\xc4\xc6\xc3\xc6\xc8\xc5\xc0\xc8\xdd\xd7ȝ\xbb\xca\u07bd\xc9\xe4\xc5\xc9\xd9\xc0\xcb\xe6\xca\xcc\xc8\xc7\xcb\xdb\xc2\xceܿ\xcf\xe2\xc9\xcd\xdd\xcd\xcf\xcc\xc9\xd0\xe6\xcc\xd0\xe0\xc6\xd2\xe0\xdfѤ\xcf\xd2\xce\xd1\xd3\xd0\xd2\xd3\xdd\xd3\xd5\xd2\xcd\xd5\xea\xce\xd7\xdf\xd5\xd7\xd4\xe6ת\xd6\xd8\xd5\xd1\xda\xe2\xd8\xda\xd6\xd9\xd9\xe4\xd3\xdc\xe4\xd5\xdb\xea\xda\xdc\xd9\xd8\xdd\xe0\xdc\xdd\xe7\xdc\xdf\xdb\xda\xdf\xe2\xe0\xde\xe2\xde\xe0\xdd\xf0\xe0\xb3\xd6\xe2\xf0\xdc\xe2\xe4\xe0\xe2\xdf\xde\xe3\xe6\xde\xe2\xf2\xe2\xe4\xe1\xe1\xe6\xe9\xe4\xe6\xe3\xde\xe7\xef\xe8\xe5\xea\xe5\xe7\xe4\xe6\xe8\xe5\xe4\xe9\xeb\xe7\xe9\xe6\xe8\xe8\xf3\xe8\xea\xe7\xe2\xeb\xf3\xe9\xeb\xe8\xec\xee\xeb\xe6\xef\xf7\xe8\xf1\xf9\xef\xf1\xee\xf0\xf0\xfb\xf1\xf3\xf0\xf1\xf6\xf9\xf4\xf6\xf3\xf7\xfa\xf6\xf5\xfa\xfd\xf9\xfb\xf8\xfa\xfc\xf9\xfd\xfb\xff\xf9\xfe\xff\xfc\xfe\xfb\xfe\xff\xfc\xc5\xe5[\xa2\x00\x00 \x00IDATx^\xec\xbdqLS[\xda\xef\xef93\x8b\xab}\x87Ax+\xc3}\xf5^8#\xbe\x1c\xbc^gk\xa9\x17\u007f\xe2A.U\xe1u^\x05މ9\xf6\xe8}\xc9\x18\xc5\x174z\x8fg<W\xb7i\x86\x1e\xa0D\x99`1\xbcD0\f\rp\x022\x04\xa5i\x99\x89\xa9F\xc2;\x8d\x8d\x9c\xd83\x89\xf6L\x8c\x90BL\xbb\xfe\xfc\xe5\x97\xdc\xff&\xbf\xb5\xd6\xdem\xf7nw[@\xd9Px>\t\xddk\xaf\xfd\xac\xb5\xf7j\xd9߮\xf5\xec\xd5\xf5l\xf8\xdb{\x80\x01\x00\x00V\x8e\xbfmH&R\x89HV;\x00\x00\xc02\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\xac\v\x02\xc9\f\x80\x94\x04\x04\fX\xfbx*\xb6\xa0\xfdɌ\x80T\x04\x04\fxO\xda\v\xbc\xc9L\xd4\xc1[Ю| \x90\x97\xc7\xf7\xb8\x95\x8f\x01\xa9\x8d\xda\x02\xe6\xe9j6Y\x06|\xb2\xe4|\x13/М\xa0\xe0_\xaf\x95\xe9k\x83\t\fbiۈ\x046\xb6%3]\x94\xed\x12\xa9C\x9b\xe8\rf\xcd@u\xca\x06w\xd9\x05d\xeds)\x1f\xc6\xd8L\x0eבz\x102\xc53\x890\x9aƪK{ \xecNnByds\x84de(\x9c\xc0\xb1'#\xbb\xb47{:\xf6H2\x1aйd&K`\xec\xd0p2\x13F\xbf\x8e\x13\xd0\xf5\x93KIkP4\x1aG]\x8a\xf9@ꣲ\x80M\xf3V\xa7\xdb\xd9\xd6\xec\x93&g\xf8Q\x0f\xe1\x01?\x9e\xa0\xe4\xe9C\x9d\x17\xf5o\x13\x18\xc4Ҁl\xb6\xaf\xd1e\x9b\r)\xff_SzG\x17n\xbbDB\xa7\xf0\x96f\xec\"\x9b]\xe9\xa5qz,\xbe\x81MGl\xbd\xbfٖ\xeeT>\x8e}f\xd4\xe0\xc5\xde\x06d\xf6ű\x88\x9c\r\xcf\x0f\xb2\x06\r\xfa\xc5\xfd\xc1#\x1a\xf2\xea\xa6\xcd\x1c\x8c)Օ\xb1\x83oَP\xbc3\xc7\xe77if!\x11>q<\x1e=Y\x84\xc1pq\u007f|C\tw8\xbb\xbd\x93\xeb\xb0\xdbw\xdf!{֍W\x95\x8c\x86\x90M)\x1bX\x03\xa8,`.\x9e\xf6\xe4}\xbcS\x96t\xd0\xfb\xd1\xd74\x90\xa0\xe0\x0f\\'\x0e\xce&0Pಆ\xfe\uf4bb5\xfdr\\\x9b\x1d\xa5\v\xb7]\"\xa1S\xe0S{3|؛\xbe\xf7T\\S\r\xed\x9b\xf9r\xf6\xc4;\xee`]\x89^\xe4\x88g 9\x1b\x16\x1b\x14\xa6N\xa3\x94\xcb\xf0f\xee':\xe7۶x\x01\x9bԄZ#=\xb1\x04oaH\xaek.(\x1aD\x90\x19,\xb0\xb3ݡ\xc3\xf817\x81\xb1\xbe\x83\xee\x9e\xd1(\x8d\x14\x15Z\f\xac\x11T\x160̺\x0e^\xde#OR\xeeޚW.\xc2x\xc1-lH!\xc5\xef\x12\xffw]~\x1c\x8f\xfc\x83\v\xb7]\"\xa1S\xe0S\xa5\xbbZp\xd3/J\x93\b\x18>\x97\x1e\xef\x91\xd9\x02\x04,|6\xbc\b\x01;\x95\xceƎ\x97P\xdc\xd1k<*\xb2C\x9dA\xe9\x89%8\xc2\x17[\x95L\xc0\x92\x1a(0\xf7B\x14\xb0\x17stח]\xa1`\x04\x02\xb6vQ[\xc0\b3n\x8b5\x10\x93t\xf2\xf1\xfd/se\x82\x9f\xe3&\xc6\xd78\xae\x0f\xbf\xd0q\xbf\xa4Iݽ\x9b\x95\xfa\xda\xef\x99͋\ve\xbaCbZB\xe4\u007f\xb7\xa9 #\xb7\x9a\xddm\xb6=9\x9b\xb4{\xb7\x92\x11\x87\xe8\xf7ʗَoD茫|k\xfa\x9ey\xec;\x98\xad\xc9\xd9G\x87\xb6\xc7\xd0&\xbe:7c\x8f[V\xc31\xb4\xf1jEN\xc8mu=?c\xfbuy\r\xd2S\x9c*\xbd~\x00\xef\xbdN\x05,R\xaf\x93\xd8\xee\xc39\be\xf9C\x02ְ\xd1/\xb9^\xe9\xe5\xc8\x04,t\xb6\xa4\r\xc2\xd8S\x9e\x9du\x80\r!\xb1\xe2[\xb2M\xb8\xed\xbd\x97\xfc\x92z%-Vn<\xc1\x9f\xf99\xdbF\x9d8\xc4\xd5\\\xab\x139\xad\xb9\xd7\xf1\xb0說\xa1\xd9\xc1\xfb5ŕ7Y\u007f\xda^{XWV{8(3x\xab\xe7\xe8nj\xa3>\xe3W\x17\xcb\f7o\x96\x15\xf7\xc9O\"\b\x98ș\xf4\x19\x1cC/\bؚEu\x01\xf3\xf2</\xbap$I\x8c-=\xf1\xcb\xe0\xa7\xf6>\xae\xd5n\xff\v\xc6\xdf\xdbu\xad88\xf1e\x11\xc6S}:\xeeP띒\xf3\xd4\xe2Qq͝\xb1V\xae#\xbad\xf8n\xadH;n\xbd\xaa\xcd\x0fЬ#\xb7\xbay-\"\xf24`\xcb-\xb4\xd9lN\x99팥yknfNu9r\x93\x1b\xb3\xa2ײ/m\x88\bM\xf3F\xa4\xad\xbb\x94y\x00Kk\xa0\xb9[\xeb\xea\xb6fPI9\xa29c=\xa3)\x97\xd5 =ũRw\x86\xf7'\x1e*`\x91z\x03\x83ui\x83،\x9a\x1ebQ\xc0\x02\xf9ۥ\xd7+\xbd\x1c\a\xb2\xce\xcc\xcc\xdcE\xb2\xb3%m\x10ve\xe6\x9a\xdb\u007f\x814\xf1\xde\x12\u007f\x9ad\xdc\x1c\xaeW\xd2b\xe5\xc6\x13FQ/+\x14u\xe2\x10\x9er\x94\x87>A\xa5n<;a\xaf4\xda\xed\xf6\xe74\xfb\nwc\xa4\xf3P\x15\x19%>\xdd}\xb1\u007f\xec^\x19\xf7Nn\xf0\xd8n\u05f7҄\xf43\x9e;a\xe8l\xd5\xeb\xef\xd5F\u007f\xc8R\x01\x1b\x88Ѫ\xf9\xe9\xde\x1dY\xf1}\x86@j\xa3\xba\x80a\xaf\xc7ai\xf6E'\xdd|\xe2\xc7ܑ!d\x11\xfd\xcfn-b\xc9\x12\xf2\xcd|\xf1\x10I\xcd\x1d\xae%C\x88\xb9\xbe\x1f\xa2˅\xeeV+2\xb3\xbd\x16\xd2\xc3\xd0\xd2{\xef\xeb,\xd6\xf5S\x1eq\xe5\xa3]>6\xc6\xf5Y\xe8\xe5}\xc2\xe6\x10i\xb2\xc8%\x96k\xb1\xbc\x06\xcdVj\x96S\x80q\x17\xeb\x1eu\xa1\xbb\xb2\x1adCH\xfcɱ\x1d\x98\xf5\xc0$\xf5\xe2#\x05\xde\x1c\xe1с\xe6_g|\xe3\aP\x8f\xecz%\x959Ď\x8eCv\xb6\xa4\r\xfat\x1b)\x1bخ\x91\xe7FN\xe1F\x91\xf9\a\xd2VDZ\x1c\xa7\xf1\xa4\x8e\xc9PA\xe5!d\xd7&\xb4鮐\f\x8f\x10\x87\xb9\xfb\x98\xca\x0e\xe9Iu\x1ezG\x92\x9d%A\x99\x01E\x100\xe9g\xdc\xc7=#\xa6\xdc\x14\x8eF*`nt+\xea\xe8~\xf2~Y1\xb0FQ_\xc0\b~Kwt\xb2\xdb\x12ך\xa1,`\x17C\xc9\x11\xee\xa9r\xb9\xd0\xddZ\xba\xcd?O\xc8!c%w\xf6\xd6\u007f\xe6\x1f\x06\x04_W\x1c\x01\v\xfb\x82\xbd\xd7\xf7l\xcbD\xb4K\x845G\xc8\xcb9\r\x96נ\xf9\x82\xbe~\x8d\xbc\xb8\xe2\x13V\"\uf23c\x06\x99\x805\xa0\x06&`\xd2z\xf1\xcc\xf6-\xfb\x04\v\rU'-U\x13\xc9\xf5J*s\xa0KCCC\x97\xa9\x80IΖ\xacA>\xc4\xd3\xcd\x19\x8d,Wr\n\xff\xc6H\x0fLڊH\x8b\xe34\x1e\xb7'\x160o\xb5&\aekN2?~X\x9f\xea\x8fν#\x18\xae`\xfc\xd2p\xf4ƽ\xa7A濊#`\xe1ϸ\xb1\x84\xbc<\xe7\xbe\xc5\xd1\xc8\x05\xac%\uaa3b\x8bσ\x1eؚEe\x01\xf3\v\x1e\xafq> M\x12\xcc\x0f\xe2\x96a(\vX8\xd9\xc1\xcd)\x97\vݭ\xdbž\v\xed\xf3\xf8\xf8\x83yh\x8b\xd0\xe7\x89#`;BY[r>o\xb3\xed\x14\x04\xec\x1c\x0ey\xc2%5\bn\xab^4\x8a?\x15Tho\x81\xac\x06\xb9\x80yɽL\x05LZ/Ʒ\x90\xf8\x00VS14$\xb8Ӥ\xd7\x1b\xa9L\xe2\x03\x93\x9e-I\x83\x1e\b\xb3\b\x04%R|KD\x1f\x98\xbfK^\xaf\xa4\xc5ʍǃ\x91\x11\x9b\x92\x805hy'r\xfeF\xcbޣ\xb0>\x9d\x10\xdd]gI\xfa\xed\xbd\v\x95\\ٝ\x04=\xb0\xc8g\xbc\xfb\x15\xfd\xa6J\xdc\x03\x1b\n\xbd\x95Rlh(6\x13X\x13\xa8+`\x81&\xc1e\xf2\xd0\x14\x90$1u\x87%\x99(\x1d%`\xdfD\t\xd8\x18\x1d^(\x11\xba[˷\x8d2H_\xe0\x01\xed\x01\xf9Zҙ\x03\x9c\xddv&\xb7̖\xe4\x1e\x10\x13y\x05\xf4\xbb\xfb\x80 `\xf46d\xf7\xb0\xb4\x06M5=\xc6#\x1f\xae\xd8Ɗl=\"\xabAr\x8aS\xc2D\x03*`\xd2z\xb1'\xfb\x8b\xad\xc2\\\x03Mx\x8a\xab\xe4z%\x95I\x04Lr\xb6d\r\xf2\"v$ډ/9\x85\xf8\x14\xd2B\xfb\x91\x92VDZ\x1c\xa7\xf1\xd8DŽ\x8d!=q\x18?{\n)\xf4֘>\xdd{I{`O\x18D\x8f\x1e7\x12\xe9zۧ\xef\x94\x19Pb\x05\xec%W\xfb\xf2Y\xa51v~\x85T\xc0\xea4\n\x9d-x\n\xb9vQW\xc0p3\x9b\x12\xed\xa7\x1e{I\x12\xe3I>I'?\"`\xfaF\x8c\x83\xff\x12%`\xb3\x06#\xed\x82ݸ\x11].\xf4\xbfۅ\xd8\x18\xf5\x8b::#\x9e\x9d\xb9\xf0\x18{-\xc4xZ8&\x15\xb0Po\"\x87JG`{\x94\x80Ik\xd0l\xa1\xee\xa9m\x85\xd4\x1fDG/-\x82\xc3E\xd2\x1f\t\x9fB\"`\xd2z\xfd\x05g\xf0\xb1]\x81\xf0)\x18\x92\xeb\x95T&\x110\xc9ْ6\xa8 \x87\x88\x94\xeb'\x1a,˕\x9c\u009by\x80\x88L\xa0p\xab\xbc\x15\x8a\x02&;\x1b\x19\x87\n\x1di\xf9\x89%\xb8\xb3B\x9af4b\xfc\x9a:\xbeƄ'\x8c\x8d\xb7ɇǍ\xb0C\xd7d\x06\x94X\x01{\u0095q\xdc\xe9\xd0sfwCx\xf0*\x11\xb0@\xde^\x1c\v\b\xd8\xdaEe\x01s\xf1\xddN\xb7\x93y\xee%I:\x89\"\xe1\xf4+\xe1)\xe4\x04\xfb\xf25\x1e\xbas\xbb\x86\xd3ݟ\xfa\x8b]\xf7\xe5D\xf0\xe9\x97:\xfat\xf2\x91\xfeD\xe7\xc8\r\xee^T\xc1ѯ\xd1\xe5\a,u\n\x95Z\xda+P\x13\xbd\x037\x9f\xb3\xb6U\b\xcf\xcf\xcei.\xb5\xef\xcapKm\xe7\a\xd9\x135v\u007fԡ\x83\xd7\xeb\xf2\x91\xb6a\xd0c\xdbtd\x10\x8f\x1e\xd9d\xf3\xc8jР|\x8b)7\x8bZ\x97\xa7\x9d\xb2\x9eJ+\x97\xd7\x109\x85\xb7t\xa7\x87\xeczv\x96z%\xf5\xce\f\x1cӺ\xf1df\xf5\x80\x9f\xce\xc4\x0f?\xc6\v_\xaf\xa42\xd9L\xfc\xf0\xd9\xe24H2\x13ߑ\x91Sw&+m\xa3\xd9)\xccĿl\xb3\xb9eo\t\xee\xca(0\xb7\xffb〴\x15\x92\x16\xc7k<\xf9\x14\xd3.ay3\xe3\xd2Z\xd4\xd1\u007f\xba\x98v\xb0\x1aw\xd7\xf7\u007f{\x85JU+W\xdc:\xdc\u007f\x85{$3\x98\x9b\xb0\xdb\xf5_\xda\xedo\xb1\xf43~\xa6\x1f\x1b\xb1\u007f\x1f\xea\x80\xedC!\xa9z\xda\xc9u<\x16ӗ\x91\xd2\xef\x01\x1e(\x8d+\x815\x81\xca\x02\x86==\x16S\x9b\xf0\xf3\x16I\x12\xbbo%*4W\"\xfc܍=b\u007fa\xd4\x17\xd7~\xc3q\u05eeѬ\xff(&\xaf\xf4\xfb\xfb\xf9\x05CqM\xf4\xcfO|\x9b\x11B\xe9B\xe7\xaek\xa76\xebS\xfa@\xac\xa9\xb0.gSv\xa1p\x03\xfa\x8fg\xa5\x17\x0e\xc9lDž\x1f\x11\xb2\xfb#p9W\xa3-5o\xd3\x14\x1e#Y\x9b\x1c\x19\xe4\xf5\x98\xac\x06MuEfv\xb9\x87\x19\xfff{\xc6\xf6\xaf\x03\xf2\x1a\"\xa7\xa8C\x88\xba\x9a\x8e\xd1\xdf3F\xea\xed\"\x86\xd5\xf88y\xed\xa5\xbf\x85\xcc\v_{\xe8z%\x95E~\v\xc9K\xce\x16\xa7A\x0f%\xbf\x85t\xed\xcb\xdazҼ\x91\\\xfa\x11\xd1\xf1U*=\x05\xc1\xf1\x8b\x8c-\xfb\x1c\xb2VHZ\x1c\xaf\xf1\x843?\x19\x9073.s7>\xd3\x1b\x05\xa5\x19;]Vb\xa4}\xaf\xfb\xc6ۇu\x06\xe3#\xb9\xc1S\xd1Iv\x0fK?\xe3\t\xf6\xb3G\x9dQp\x82\x99\xb5\xbcP\xed,=*\xfe\xc8̖~2\xfa\xac\x94\xe9\x8d\aǧ\x03\x18X\x83\xa8-`k\x8eȨo\x9dR\xad\x89\x196.\v\xaf\x8b\xaf\xbd~\xf7\xee\xed\xd3\xf3\x9f\xc5\xfdEl\x8b\xa6B\xf9\xd7\x1c\xedy\b\x96\xd3Y\x9b\x80\x80\xbd'\xeb^\xc0\xf0\xe5\x9c%\xaca\xb1x\xfa\x85\xc9b8X6\x12\xc7\u009b\x1d\xff\x87\xf8\xd3㞸ǀ\x14\x06\x04\xec=\x01\x01S\x89'\xe2\x04\x8a\xa9xS\xfe\x80\xf5\b\b\xd8{!x\xb7\x01\x15\b^\xd1_\xeb{\xd4wM\xff\xd5\x02\x17\xaa\x00\xd6\x03 `\xef\x05\xf3nOb@\x05\x82õ\x06\x9d\xa1v\x18\xf4\v\x88\x00\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x96\"\f\u05fc\x96\xed{\v\"\xeb\xd8\x03\xc0zEm\x01\xf3t5\x9b,\x03\xbe\xa8\xa4o\xe0\x96\xe9\xd6\xc0\xca,\\>\xb9I\xb2\x86M\b\xef\xb1-\xe9{\x17\xbf\x00\xcb_\xaf\x95\xe9k\x170S\xbc_'.\x18\xa3[X\xfci\x1a\x81\xba5\xaaކ\xb4\x0f\x1eC\x1c\x00R\r\x95\x05l\x9a\xb7:\xdd\xce6\xba\x8a\xa1$\xe9kj\xa3ɦ\x95Q\xb0\xc1\xd0Z\xcb\x12vm\xb9~$}\xf1\x97s\xfaP\xe7Eai\xaaGO\x12\xd9\xdd\xe1\xec\xf6N\xae\xc3n\xdf}'\xae\x8d\xac\x86N\x16\xc8G\x9ek\xddx\x15\x03\xc0\xfaFe\x01s\xb1\xb5\xef}\xbcS\x96\xb4Y\xe82N\xf3\x16[\x92\xd2\xcbD(du\x04/\xba\x8a\x03\x8b\u05ef\x1f\xb8N\x1cd\xf1Zq\x8d4@E\f\x1d:q!d}L \xcb0\xd2\x1a^\xe8\x1a\x15r\xcfh\x12\xac\u007f\n\x00\xeb\x01\x95\x05L\x88\x94\xe8\xe5=\xb2d\x8f\xe0\xceiO\x14\xdbv\x19\x89\x150\xd7\xd2\"\tF\x16\xee\x97G؉a\xee\x85(`/\xe2\x04S\xc2\xf2\x1a\xae\x18f\x15r}\xd9\x15\x18\x00\xd65j\v\x18a\xc6m\xb1\x06dIoS\xaf\xd7\xef\xb55y\x13\x17\\\x06<\xe5\xd9Y\a\xc4!dSAFn5QU\xbfVXu\xb9Z\x96;\xbe\x11\xa13\xae\xf2\xad\xe9{d\x8b~\xbe\xbd`\xd0\x1d>KC\"͕\tn\xad\x9b4r\xab@\r\xb5\bޯ)\xae\xbcI\x04虎\xe3\xbeyq\U00068f96\x06s\x8d\x84\xa2\b\x1b`l\xaf=\xac+\xab=\x1c\x94׀犅\x0e\x98<\x97t\xc1\xd2g0\x00\xacgT\x170/\xcf\xf3f_Tr\xa6\x9b$\xbbԿ\x1b]\x99\xb9\xe6\xf6_ \rMW\xa4\x1d\xb7^\xd5\xe6\x13=}hkAu6\x9bG\x96;ciޚ\x9b\x99S]\x8ed\xe3\xb6a\xee\xabG}g9\xb6\x92;\x8b<B#\x8c\xccN\xd8+\x8dv\xbb\x9d\xad\xe1\u007f\x85\xbb1\xd2y\xa8*\x88\xe7\xfa\xfa\x0eW\x16\x1bn\xd6\xeff\x91\xc3\xc2\x02\x166\xc0Ow_\xec\x1f\xbbWƽ\x93׀\x9frv\xb6\x95\xe7b<\x00\xd1v\x80u\x8e\xea\x02\x86\xbd\x1e\x87\x18\x8a(\x9c\xf4w[\x9c\x1e\xa7\xa5[yA\xf3e\xe4\xd3m>\x1a\xddL\x83i813\xa6\x01\xb8X`\xe7\xf0\x10R\x96\x9b\x8fv\xf9đo\x98\xd9>\xd2u\n\x9e8\xcfv\x94\x86\x90\xc3\xcc\xfd\xfeX\x88\x16Vŝ~\x8b\x83\u009a\xee!\x01\x93\x18t\x1e\xa2}\xb3Β\xe80\xaf#\\H\xb2\xe4CS7\xba\x85\x01`=\xa3\xbe\x80a\x1a\f\xb2[\x96\xb4Y\xfc,\xa9v\xf0+\x1fb\x91m\xceh0\rp\xe8\x9f'\xe40\xb7RX\xc0d\xb9\xf9JN\xf3W\x9d\xb5GK\xb8\x13,\xad$`\xf5G\xe7\xde\x11\fWXn\xd1\xcbp\xc1\x90\x80I\f^\x1a\x8e\u07b8\xf748'\xaf\x01\xe3~\xeeE(\x19%`-\x18\x00\xd63*\v\x98_p~\x8d\xf3\x01I2`zȒB\x90n\x15y\x80\xd8s\xcfs\x1a\xf2\xb2]\x8c7Ƃׄ\x05L\x96\x9b\xbf#\xb6\x8aLJ\x0e7\xf6\xdbO\xc7\x17\xb0\x13\xa2\xdf\xea,\xcb\ry\xafpD\xc0\xa4\x06o\xef]\xa8\xe4\xca\xeeD\xf7\xc0&\"\x91[e\x026\x04\xf1\x0e\x81u\x8e\xba\x02\x16h\x12\xc2\t\x12\xa9\x92&E\x01\x1bU[\xc0\xbc\xe8:\xdd0'~\xf9\xb6Q\x06{\x90\x10\x160Yn\xfe\x81\xd8**k\xa8\xf7\xfd\x82\xb2\x80\xdd{I;XO\x18\xaf¹\"\x91\x1eX\xd8\xe0q#\x91\xae\xb7}\xfaNY\rd\x9c\xca\xc2S\xcb\xeb\xa5\xd4i\x16?\xd5\x03\x00\xd6\x12\xea\n\x18nfa\xe9\xfd\x96\x1eY\xb2G\x1cB\xaa>\x8d\xa2 \x87(\x93\xeb'\x1a\x92\xecB,\xbc\xe1\x17,\xc8PX\xc0d\xb9\xf9\ack8L\x05%X\x15#`F#Ư\xa9_kL\xf0~5ަ\xafJ\x02&1h\xe5X\xc40\xe35Y\r\x84\v\x95\xa1i\xf8\xd2\xdc@^(85\x00\xacST\x160\x17\xdf\xedt;\x99\xe7^\x92\x9ci\xb18\xdc\x0eK\x8b\xea\x8f!\x1d\x199ug\xb2\xd26\x9a\x9d\x18\x9fB\xa5\x96\xf6\n\xd4\x14z\n9Ⱥ\x83\xe1\xdc\xf9A[n\xa1\xcd\x16\x1d\xc0\xa3\x95\xbb\xd0y\xbb\x8a\f\xfb&ħ\x90\x13\x82Դ\x16u\xf4\x9f.\xa6=\xa5\xc6\xdd\xf5\xfd\xdf^!\x9a\xf3\xeeO\xec\x19\xa2\xe8\xcez\xda\xc9u\ba\xaa\xc3\x06\xa4\xb2\xe2\xd6\xe1\xfe+\xdc#y\r\x18?\xe7B3\xf6\xa5\xb9\x97\xd1(\x06\x80u\x8d\xca\x02\x86==\x16S۠?*\xe9\x1fj3\xb7\r\xf9\x13\x17]\x0e\\\xfb\xb2\xb6\x9e4oD\xc7H\xbak\xa76\xebӻ\xe4b\xb2\x98\xdbk\xa3\x93Y\x84r\xc7\xd3Xnt\x9f'\xd8QYt\xa8\xfe~\xa5\xce8W\"\xfc\xbaQx`8w\xe33\xbdQ\x10\xa8\xb1\xd3e%Fҵz&\xf8\xbajY\xe6l1I\n\xbf:\n\x1b\xe0\xfb\xc6ۇu\x06\xe3\xa3\xe8\x1a\x88n\xe9E/\x98$ז~\x12\x03\xc0\xfaFm\x01\x03\x96D\xf0\x86\xae/*\xabES\xa1\xfa\xb4\x13\x00Xe\x80\x80\xa5\x06\xc1\x0e\xc3+Y\x867\x1b\x16\xa3\x00\x00\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x10\xb0UG{\x81\xfaљ\"x\vړ\x99\x00\xc0\xaaAm\x01\xf3t5\x9b,\x03\xbe\xa8d`\xbc\xdd\xd4\xe6L\\r\x859\x86\xd2,\xc9l\x16L'\xc7E/.\x11\xa6\x01\x9d\x93\xed\u007f\xd0\x13S\xba\xb5\t\x83^6\xa4\xc1\xafā\x94Ae\x01\x9b\xe6\xadN\xb7\xb3\x8d\xaeb(I\x06\xac\xe6Q\xf7\x03Ӄd\xa5W\x12\x8fmS]2\x9b\x05\xf3\xd6^ӊ\x95\xf9M\x9aY\x9e\xb1\xf4\x13\xf7*\xafwh\u0378\xa5\x98\x1f>\xbe\xf1j\xc2\xe3\x00\xb0zPY\xc0\\<\r\xec\xe3㝲\xe4C\x13\x1d4\xb9L\xab{\x85w\xcd\x12uD\x91\xb3q\x04lRs*&o\xa9'\xdeQ\xaa\x9c\x9f,\xf2\xc0\x19\xa5\xe8K\x00\xb0\x1aQY\xc0\x84\xa8\x8a^\xde#KZ\xd9\xf2\xf8\xb8\xe9A\x9cB\xab\x83\xa5\xea\x88\"\xf1\x04\xac\";Vŗzb\xa55\xfc\x17\x82/\xbb\"\x99\t\x00\xac\x0e\xd4\x160\u008c\xdbb\rȒm,\xba\x19n\xbf\x9b\xa0\xd4r0\xbe\x11\xa13\xae\xf2\xad\xe9{\xe8ڦM\x05\x19\xb9\xd5L>l{r6i\xf7ne6\xae\x03\xdaM[\xf6zHJs\xb2:7cOl\xe7ļ\x85E\x97tg\x8a!\xd82%&\xef\xcat\x8d\x06ã\x1b%\xc6Y2p\xbc`\xd0\x1d>\xfb\x8c\x1d \x02v\x83.*\xfd\n\xe3\xe0\xfd\x9a\xe2ʛ\xb3,۟\xf9y\xa8\xa8҉}\a\xb359\xfb\xc61\xf5\x8cm\xe2\x95.'|\xe9V\xf1j\xf2\xe5\xcd\xf4\xa5#\x94\u058c\xa3k\xf0\x96ksN\x9e\xd4n\x16\xbcmg\xd2U\x8fN\x00\x00KBu\x01\xf3\xf2<o\xf6ɓ\x03M,*\x91\xb9-a\xc9\x0fό\xa5yknfNu9\"wqE\xdaq\xebUm~\x80\x86[<r\xab\x9b\xd7\"\xaaj\xbd\x9b\xf3\x1b\xbaϡ\xcb$\xa9Ay\xcd\xed[bC\xab\xedG{\xe8\xc6o\xbe*`\x96\xae\xed\xff\xa8\x84\xbby\x9a+\xbb]\xd6Acp\u007f\xf5\xa8\xef,\xc7V\xb4'\x02\xf6}\xbd\x10\xd6\xe3\nwc\xa4\xf3P\x15\v\x062\x8azł\x8a'\xb6\xa2\x8a^˾\xb4!\x8c\x9d\xcd\x1b\x91\xb6\xeeRf\xd4\xe5D.\xdd7\xc0\x82\x90\u061cQ\xcd|`\xb3\t=:i\r\xfe\xbc\xec\xaf\xcfi\xd2M\xbf\xb8\xccj\x19@\x83\x18\x00R\x01\xd5\x05\f{=\x0e\x16\x8aH\x92\xf4\x99\xad\xde\x19O;\xffa\x9f\xb6-\x88|\xb4\xcb\xc7F\xb3VD\x9d\xe7C4\xd6\xf5u-\x95\xae\xaf\xb3\x88\x96\xcd\xe4\xec\xf1Ӏo\xd4G\xa7\xd9B^+\xb41UL\xd6\t\xa1\x8a\xa6'\x05\xa6eG\r\x17\xf1\b7\x8c/~\x85\xf1l\x1f\xe9f\x05O\x9c\xa7\xd9D\xc0:\x8aX\x10\xb6a\xee>\xa6A\xd6\xd8cI+\x12\xc3\x1e)\x9f\xd8g\xa1o\xdc',̮&\x8b\xc8Qy\xd4\xe5H.]6\x84\f7\x93\x92.\x0eI#5\xb4 ҫ\xfb\x1a9Dk7\xba\x85\x01 \x15P_\xc00\xbd/\xbb\xe5I\xaf\x95t\xc6\x06\xad+0\x03)?\xe4\xb0.\xdd\xe6\x9f'\xe4T\x90\xfb7{\xeb?\xf3\x0f\x03\xb4#u\x17=\f\x9bj\xa8g\x88E\xf1Vd\x12\x85\x90\r\xeb\f}D\x9cfqc=I\xbf\xea\xac=Z±\x18\x92g[[\xc5 \x92\xf5G\xe7\xde\x11\fW\xe8N{H\xc0\xe2\x9c\xd8{}϶L\xb4\x9d\xe5\x1e\xc1\xb1\x97#\xb9t\xb9\x80I\xfd\xf2a\x01\v\xd7p*\v\xd3`\x98\xa1\xf7\xdfMe\x1c\x00R\x00\x95\x05\xcc/8\xbf\xc6\xf9\x804I\x98\xf1\x06p\xd3@\xfc\x82\xcbE\xfe\x0e1\xb1]T\x1fڻ\xf1\xf1\a\xf3\xd0\x16:\x1d\xea2\x8ax\x834t~V\x9d&\xb6\x0e\x11\x9bU\xc0&\xcb5\x8c\xe0\xc7:\xcc\x04\xec\xf1\xa1Í\xfd\xf6ӂ\x80\x1d*\xa9<\xcfF\x8d'\x84hk\xdcY\xba3\x18\x1a\xbc)\x9fxhK\xce\xe7m\xb6\x9d\xdb\xe5\xb9R\"\x97.\x17\xb0\x1d8BX\xc0\xc25\\F^\x1a\xc47\xd4\x03\x1bB+\xf0I\x00\xc0\x12PW\xc0\x02M\x82\x8b\xe7\xa1) Ib\xcc\u20f9سI\x95\xc9\x0f9\x91ʷ\x8d2ȝ\xfc\x80\xced\xf0\xb5\xa4_ǸG\x12;\x96\xb9\x8e\x12\b\x982\x861\xfc\xb8H\x10\xb0\xca\x1aꩿ \n\xd8ԋ\x92\x0e\x9a\xaa?\xfa\x84\xc1\x82\x0e\xf94\xe2,V\xe5\x13\xe7\x15\xd0Q\xe0\x81\xed\xf2\\\t\x92K\x17\x05\xccĺ^\xf9R_YX\xc0\xc25\xb8\xd3\xf6\xba\xc7s\vB\xf3+\xea4\xab{B\v\x00\x84PW\xc0p3\x9b0\xe1\xb7\xf4ȒN\x9eȆ\xaf9\xe4\xbfV\x93p/\xa5\v1\x0f\xdc\x17䦮C\xec\xd2\n\x8f\xd1\x19\x05\x85t8v\xbc\x1a\xc7\x170wCt\xb8n)\x12\x01;|\x81\xec\a\xab\xc4!$\xc6#:\xea\xc3\x1f\x13\xbc_\x8d\xb7\x99y\xe96AE\x94O\x9cCu(\xb0=\xbe\x80I.\x9d\xbc\x16b<-4K6\xa3\"V\xc0F\xd1\x16\x84vz\xc4ぼ\xe8\xf0\xbd\x00\xb0JQY\xc0\\|\xb7\xd3\xedd\x9e{Yr\xc8\xfd\xb0ɪ\xfa\xd7\xfe\xfc {R'\xe8\xcf)Tji\xaf@MT\x056\x9f\xb3\xb6U\xb0\a\x82\xbd?ɻ~\xf782\xd1\t\xf1G\x06\xf1\xe8\x91M6OT-\xfbb\xc2uK\x98\xfa\xacc\xb6O75[\u007f\xfa{\xdc\xca]\xe8\xbc]ŕݙxk\xaf\xf9rbn\xb6\xd6\xf0\xe85\x91\xae\xdd\xf5\xfd\xdf^\x11\u007f[\xe4J\xbb$\x14T<q\x1d:x\xbd.\x1fi\x1b\x06\xe3\\\x8e\xf4\xd2\xf19ͥ\xf6]\x19nY3\xfd\x836\x9b\xe6\x88\xcd\xe6\x93\xd5;\xaa\xe9\xb1\xda<\xa1\x0e\xd8e\xa4<\x85\x1f\x00V\x1d*\v\x18\xf6\xf4XLm\x83\xfe\xa8\xe4\xa8\xc5l\x1dM6A\xfc\xc33\x9e\xc6\xdc^\xa2\xfet\xed\xd4f}J\xa7\xa25\x15\xd6\xe5l\xca.\x14:\x84\xae\x839\x99\x05mt\xda\x14B\x9b\x1c\x19\xe4\xf5XT-f-\x8f\xe3\x11,㸾b\xae\xb8\x8f\xe3\xce\xe3`Geѡ\xfa\xfb\x95:c'uz=%\x99\x1c\x9d\xcf:v\xba\xac\xc48\"\x968\xf3\x13\xd1\xff\xa4t\xe2\xc0\xe5\\\x8d\xb6ԼMS\x18\xe7rd\x97\xee?\x9e\x95^8$o搐F\xbc\xac\xde\x01\r\xcd\xdbTȜ`\xb6\xf4\x93\x18\x00R\x03\xb5\x05\fHF\xb5F\xf5\xd9$\xde\xcdǼ\xf3\xf3\xbe\xa1\x03Y\xa4\x13ܢ\xa9\x98OV\x00\x00V\t `\xab\x8e\xcb9\xf2\x99d\xcbO\xbb0o\f\a\xb4w\xb17\x1b\x16\xa3\x00R\a\x100\x00\x8f\xa6\t\x13(\x1ci\x91\xc9g\x00\x90\n\x80\x80\x018P\x91~\xac\xa5\xb7\xe5X:\xfc\x88\x1bH1@\xc0\x00\x82uO\xb6&{O\u0085\x0e\x01`\x15\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\xb6\x9ai/\xf0&3\xf9 x\vV`5o\x00x\u007f\xd4\x160OW\xb3\xc92\x10Z\xf9\xcb\xc1\x8b\x93\xbf=\xed\xe6.O\xbc2+\x87\x99\xae2\xa3ݳ\x9c\xcbcur\xe2J`\n4\xa0s\xb2\xfdc(m\xc1+U$\xb7=Bږ\xe1\x12\xd2\ri\xf0\x13n \x15QY\xc0\xa6y\xab\xd3\xedl\x13\xa3\x12\xf9L\x03M,\xe16\xd9\\6\x93,\x18Ɗ\xd2+J\x96ό\x1az\xcd\x05\xe1Xg\xcb\xc0[{M\x9c\x18\xb7\xf87ify\x86Ƕ\xa9N\xd94\x96\xe4\xb6n\x9b\xed\xebp\xfc4\xebƫ\t\x8d\x01`U\xa2\xb2\x80\xb9x\xaaR>\xde\xc9\xf6\xac=n&`\x81f\xba\x88\xdf@\xb3\xfaK\x1a\xc6aG\xa9\x98p\xd0%\x9a\x03\x9f\xe6&\xb4~O\xe2\x05\xe9\x9eԜ\x8a\xc9[L\x90\xee\x05\xd8\x0eE\x02@\x9eѬ\x9e\xef\x0f\x00X(*\v\x98\x10\x9a\xd0+\x84\xefp\x98}\x1e&`N\x13\r\xc1\xe339\xe3\x97S\x97\xf0\x12\xf2L\xc0\xf0o\xd0r\xaev\x1dO\xc0*\xb2cϺ\x00Q\n\xb3\x00[\x89\x80\xf9\xb2a)\n \xf5P[\xc0\b3n\x8b\x95\xf6\xb5|&\x17\x16\x04\xac\xe7.;pw\x19Gjq\xf0\x96ksN\x9e\xd4n\xa6\xee\xa2\xeb\xf9\x19\xdbi4\x1f\xab\x18`-\x1f\x87\x04\xac<\x87\x197\x15d\xe4V3Q\xf1}\x9e\xb7\xb9p0\xe7ntu\xe6-luiw\xa6XE\xa6\xa4W\xf3\xaeL\xd7h0<\xbaQb\x9c%\x03\xc7\v\x06\xdd\xe1\xb3\xcf\xd8\x01\"`78\x8eӿ\xc28x\xbf\xa6\xb8\xf2\xe6,\xcb\xf6g~\x1e*\xea:\xa0ݴe\xaf\x87\xa44'\xabs3\xf6\xb0^\xec\xc1lMξqL\xbd]\x9b\xf8P\xae\x14\xcd\xf1\x8a\xec\xac}\x82\x93+\xd46yR*`\xf8Lz$\x90\x1b\x00\xa4\b\xaa\v\x98\x97\xe7y3S\x01k7\x16\x05\xacMX\x06~@\xf5Ga\xfe\xbc\xec\xaf\xcfi\xd2M\xbf\xb8\x8c\xf1\x11\xcd\x19\xeb\x19M9\x91\x86\x01\x16\x03\xc3F\xfb\x83\x0ed\xf59?G\xac/S\x91v\xdczU\x9bO\xb4\u05f7M{\xe9\xee1\x84B:\x10f?\xdaê5_\x150\xfb%\a\x1f\x95p7Ose\xb7\xcb:h8\xee\xaf\x1e\xf5\x9d\xe5hT\"*`\xdf\xd7s\x1d4}\x85\xbb1\xd2y\xa8\x8aŋ\x1c\r{\xdez7\xe77t\x9fC\xe4\x1a\xb1\x06\xe55\xb7o\xa1\xb1\x89\xac\xa8\xa2ײ/m\x88\xf4_\x9b7\"mݥLi\xe44\xccl\xf3[Z\xb6gе\n\xc3m\x93%\xe5\x026 I\x03@\x8a\xa0\xba\x80a\xaf\xc7\xc1B\x119\xa9\x8c\t\x02\xd64Ď\f5%,\xb8\f\xb4 ҅\xf9\x9a\x05t\xedb}\xad.\xc4zU\x92!$\x85\xdd\xeeVD]\xeaC4huy\x96\x87$\xabc\x05l\xb2N\x88p4=) _\x1b\xdap\x11\x8fp\xc3\xf8\xe2W\x18\xcf\xf6\x91nV\xf0\xc4y\x9aM\x04\xac\xa3\x88E\xe9\x1e\xe6\xee\x93\xd7\xc7\xc2cIk(H\xf7L\xce\x1e?\x8d?GgTh\xb6\x90\xd7\n-I\xf9,\xf4[\xe0\x13\x1a\x87\x17k\xb2H\xef\xab\\\x8b\xe5h\xf2H\x97j&\xb7@\xd66Y3e\x02\xe6F\xb70\x00\xa4\x18\xea\v\x18\xa67c7\xf5x\x05\x02\x01wS\x80\xf4hڄ`ֽmI\xca}pNe\x91\x17\x17\xa2=\xbf\x8aOXN\xde\x11\xfa*\x11\xb0K\x83ւt*%\xa5\xdb\xfc\xf3\x84\x9c\n\x1c\xc8`\xb3\x1b\x9c\xb1\x02&2\x89BȆu\x86>\"N\xb3,D$~\xd5Y{\xb4\x84\x13CD\xb6rL\xbfp\xfdѹw\x04\xc3\x15\xba\xd3\x1e\x12\xb0\xbb(\xb2г\x86:\xaa\xceih\xd2{}϶L$\x84\x88<\x12Ε\xa0\xf9\x82\xbe^G^i\xdbd͌\x12\xb0\x16\f\x00)\x86\xca\x02\xe6\x17\x1e4\x8e\xf3\x81I>\x84\a\xf7\b\xb3\xc1\xda{\x12\x15]\x0e.\x93\xbb\x9btGh\x0f\xec\xd3},go\x01}\x95;\xf1}iԳ\xb5]Ԥ\xfd\xe4VgJ\xeb\x8b+`\xd8f\x15\xb0\xc9r\r#\xf8\xb1N\x88q\xfb\xf8\xd0\xe1\xc6~\xfbi1HwI\xe5y6j<\xc1\t\x9c\xa5;\x83!q\xb9\x8c\"\xce)\x16\xb8\x9bŢ\x1dڒ\xf3y\x9bm\xe7vy\xae\x14\xc1\x89oC\xa3Ҷɚ)\x13\xb0!4\x80\x01 \xc5PW\xc0\x02M\x82_\xe7\xa1)\x10\xf0R\x1cf\xaf7\x80\x9d<\x1d\x0e\x85&W\xa8\x88;m\xaf{<\xb7\x80\xaaj\xc56\x96\xb35\xd2\x03\xa3\xf3\xd2\x04'~&\x15\x88\xf2m\xa3\f/\x0e\b\xa1\xad\x1d\xf1\x05L\x19I\x90\xee\xca\x1aꩿ \n\xd8ԋ\x92\x0e\x9a\xaa?\xfa\x84\xf1\x8a\xee\xf84\xe2,\xd6\x1eI\x9c\xd9H0\xed\xbc\x02\xfa\x9e\x1d\x88\x1f\xa4\x1bkhTolB>i\xdbd͔\tX\x9df9\x1f\xb5\x02\xc0\xb2\xa0\xae\x80\xe1f\xaa\ad\b\x19\xeaky\xc4y`T\xd7z՟\a6\x8a\xb6 \xb4\xd3C\x93V6\x82jA\xac3XX\x88\xf14\xb2\x84\x04lK\xf5x\x1d騱\x99\xed_\x10\xb1(\xd5R\u007fTy\xac\x80\xb9\x1b&\xa3\xb3$H\x04\xec\xf0\x05\xb2\x1f\xac\x12\x87\x90\x18\x8f\xe8\xa8\x0f\u007fL\xf0~5\xdef\xe6\xa5ۄ\xf7×]H\x9f\x05\x1c\xa7z\x14\x91\xaa\x1c\xea\xb3\x0flO$`9\xd4u\x96W(k\x9b\xac\x99R\x01\v\xe4%\x88/\x0e\x00\xab\x14\x95\x05\xcc\xc5w;\xddN\x8b8\x13?\xe0q\x98=T\vܦ\xde\xc9\xde\x15\x98\x89?\xaa\xe9\xb1\xda<\x82N\x94\xa7\x9d\xb2\x9eJ\x13\x1eϝ\xd3\\jߕA\xaeg\x9cy\xbbw\xee=\xf2\tƧP\xa9\xa5\xbd\x02\x11\xc9\xf5d\xe7\\oۯ\x89\x15\xb0}(\x81\nL}\xd61ۧ\x9b\x9a\xad?\xfd=n\xe5.tޮ\xe2\xca\xeeL\xbc\xb5\xd7|917[kx\xf4\x9aH\xd7\xee\xfa\xfeo\xaf\x88\xbf-r\xa5]\x12\n\xf6\xfe$\xef\xfa\xdd\xe3\xc8Dg\xd7\x1f\x19ģG6\xd9<\xb8\x0e\x1d\xbc^\x97\x8f\xb4\r\x83\xd2\\)\x1a\xb4g\xb0\xa7 \x8bJ\xaa\xa4m\x91$\x9b\x89\u007f\xd9f\x13\xde\xf6\xcbh9\u007f0\x05\x00˃\xca\x02\x86==\x16S۠8\xbb\xc0C]`\xcd,\xd5ej\xf7$(\xb6L\fh\xa8WkS!u\x82\x05~\xb3=c\xfbׂ\x98\xf9\x8fg\xa5\x17\x0eal!G\x1b\x88\x8c\xe5ji\x8f\xa5k\xa76\xebS\xf6\xf8\xce[\x91\x93\xbe\xebA\xac\x80\x99\xb5|tV\x98`\x19\xc7\xf5\x15s\xc5}\x1cw\x1e\a;*\x8b\x0e\xd5߯\xd4\x19;\xa9\xd3\xeb)\xc9\xe4\xe8|ֱ\xd3e%\xc6\x11\xb1ę\x9f\x88^)\xd7\xc1\x9ĉ6:\xe3\x8b\\\xac#\x83\xbc\x1eÁ˹\x1am\xa9y\x9b\xa6P\x9a+%\xaf\xee`fv\xb9\x87&%m\x8b$\x8f\x88N=\xf6\xab\x03[\xfaI\f\x00)\x87\xda\x02\xb6\xaa\xf0n>束\xf7\r\x1d\xc8Z\x8a\xfb'\x81\x13\xff\x03Q\xad\xb1$3\xf9@\xb4h*\xe6\x93\xd9\x00\xc0\xeac]\vX{\x96\xd0\xe1\nhc\xe6\xd4/\x80\xe5\x170|9G>\x93l\xb9\xf0f\xc3b\x14@J\xb2\xae\x05l4\xcd\xc1\xb6\x8e\xb4\xc8L\xab\x85\xa3\x82\x80\x01\x00\x90q~\xef\xa6\x00\x00 \x00IDAT\x90u-`\x81\x8a\xf4c-\xbd-\xc7җ\xf2;fW\x17\xaa\x1eT\xfd\xb9)\x00\x00\x12ֵ\x80alݓ\xad\xc9\xdecMf\xa6ħ\b\xa1\x8d\xaedV\x00\x00,#\xeb\\\xc0\x00\x00He@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00P$\x15f9\x82\x80\x01\x00\x10\x8b\xa7b\vڟ\xcch\xe5\x01\x01\x03B\f\u05fcNf\xb2\xec\xb4\x17x\x93\x99(\xb1\xc4b\x80\xb7 N$\x9d@^\x1eߣ\xfe\x02W\x8bFm\x01\xf3t5\x9b,\x03\xa1\xc5\x1f\x1c|x\x12|\xaf\xea˱~\b\xaeq\xe2\xe2]\xcbǣݜ1\x88\xfb9n\xf7\xa3x&S\xb5\x9f\x95\x18\x1f\x9d\x98\x88w|a\xdc\xe1Z\x83\xf8>\xc7q\xb7\xf1m\xf2z/\x81\xe9\v\x1d\xf7K\xb2\xf9\x92F\x83{\x11\xdf̾[\\#[\xff,\xbe\x91\x8c\x06$.C\xfb\xd7ke\xfa\xda`b\xe3\b\xe1b\xb1\xd0\x06q\x9f\xd5>\x8dw|\xa9|\xc5qt\x15\xdd\x0e\x8e\xfb*\xea\xc8ءa\xa5\x02\x1f\x8a\x0fܠ\x864\xe5\xdf\U0004fce5<W?*\v\xd84ou\xba\x9dm₆>\xd3@S\xf8\xc0P\xfcR\xcbH\xef\xfb-\xe3\xf7\xbd]'\tK\xfb\xe8\x89RR\x82rnb\x83\xb91Nodz\xfd\xdc\u061cB\x01\xca\x13\xdd\xd9\xfe\xbe\xf3\xef+\xa5\x9d,$\xd2\xdb\xfb\xdc\xed\xd7\xf8\xf5\x1d\xee\xfe\xdb\x04\xb6\xc1\x89/\x8b0m\xbd\xbd\x93K \x9bs\x13\x87j\xed\x84\xfb\xdc\b^\x10\xbfI3\x8b\xa9Ӈ:/\xea\x13]\x82\x94H\xb1Xh\x83\x1eݯ\x89\xaf\xfeK\xe4e\xf1\x9d\x1f\xc8\xe6\x87;\xc5/\xa3\x8e\f\x17\xf7\x8b\xa9\xa4\x1f\xf7R\xf8 \r\x92\\\x99u\xe3U%\x8b!$\x0f\xe8\xb0ZQY\xc0\\<\v\xca*\xae~o\xedq\x8b\x02汬\x90\x80\xed(Mf\x91\x84\"\x89\x80\xd5\\PJJP\xceMb0\xcb]\xfc\x92tz\xb8\xd9\xd8C\x02\xb5\xa7IW%\xf8\xe5\xfb\t\xd8\v]#\xdbNqc\xe4\xf5\x117\x95ؼ\xb5H\xd8>N$`\x18\x1f\xbdF_\x9f/P\xc0&5\xa7\xc4\xd4\x0f\\'\x0e\xc6mp\x14\x91bJ\xb0\x06\x05\x8d\x95\tL\x96\xc4\t\xa1\x8bz\xefD̑p\xc71\xe9ǽ(\xbc\x85\xc20\xf9C4Hzeg4J#š\x14\t\x13\xaa\xb2\x80a\xd6\xf5\xf2\xf2\x1e\xbaq\x98}\u009a\xf8\xb8\x97\xef5\xad\x8c\x80\x85\xe3\x0f-\x15\xa9\x80U]PJJP\xceMb0\xcb=*\x9eM$`G\x99\xf4Lq\xa1/\xfe%q\xc5 Կ\x1c\x026\u05f9\xb0\xbeTEvȷ\xf0\x82[\xc40,RL\t\xa1A\x9d\xf1\u07fe%r\xfe\x1b\xb6i<\x1f\xdf$\xe9ǽ(\x1cHX\xfc\xe9C4Hze\xbel\xa5\xc5X@\xc0\xe22\xe3\xb6X\xe9\x03Z\x9f\xc9%\x06\xf5\xc03\xbePp[U\xb1\x8a\x8b*\xe7\xd3\x1d۞\x9cMڽ[c\x8c\xcc[\xd82\xd1\xeeL\xd18S\xfe}U\xd4x\xb3R_\xfb=\x8dJ+P#K^\xe3t\x9d_\x19>;\xfbB\x96K\xbeA\xef\xd7\x14W\xded\xff\x83\xf6\xdaú\xb2\xda\xc3A\xb9A\x84Y\xeeEU\xbf(`\xe1b\xad\x1c\x1d2\n+Q\xd7\x1b\xa8\xda\x04Gd\x06\xcft\x1c\xf7͋\x8bG\xf5\xb5凞\xe0\xd7\xeaS6 \xe5抅\x0e\x98T\xc0\xde^0\xe8\x0e\x9f\xa5\xee+Ҋ{b3\xc9\xc0\xb1\xdePr\xe1\xcbh\x01S\xaeW\x100,:\v\x05י\xac2\xfc\xe2B\x99\ue410\xf6g~β\xe6ʄ\xf7\xe1\xe6⊝#\x1fN3n&\xafg\xb0\x04\xa1A\xf5\x06\x9aVz\xd7%\x9f\x101\xe8\xac\xd1Wu\x06\xa3\xce\x16\xb6\x95\xd6\xc0\xc2{b|\xa1Q\xd6\xe2\xb7zN\x1c\xcb+\u007f\xdc\xf2w]\x81\xf1\x8d\xe4\xfa]\xe5[\xd3\xf7ȖȽ\x9aku\"\xa75\xf7z\xdc\x06\xcd6\xfe\xb2\xd88a\x18\x91\xbeg\v\xfb?;\x93\x1e\x89\xdb\x17\xa6\x17\x04L\x19/\xcf\xf3f\xf6\x8di\xed\x0eE%\xa2\xac\x84\x80\xf9\x06l\xb9\x856\x9b\x8d\x0eh\x87Б[ݼ\x16Ŭ\xac\xbc\x1f\xed\xa1\x1b\xbf\xf9\xaa\x80\xd9/;\\\xc4U\xf6\r\x97\x91\xaf\xe1\xd9\t{\xa5\xd1n\xb7?\x97%\xa7\xfat\xdc\xe1۷\x0f매\xb9\xa4\xc3\xc3\xdd\x18\xe9<TE\ue267\xbb/\xf6\x8f\xdd+\xe3\xde\xc9\r\"\x10\x01\xeb\xac\x15\x05,\\\xecu}\x8d}\x96\x940ֿ\xc2/\x0fs\xb5\xb7\xff$x\xc8\xc2\x06s}}\x87+\x8b\r7\xebw\xbf\x9c\xb5\x97\xb4\xbeƯ[KH\tE\x03R\xee)g\x17\xce6ō\xcc\xcd͍P\x01\x1b\xe6\xbez\xd4w\x96{,\xb4\xe2P\xeb\x9d\x12\xda\xdbxQRy\u007f\xb8\x96\x8b\x160\xe5z\x8f^\x99\x9b\xeb0b\xd1Y(\xb8Τ\x95\xe1G\xc55w\xc6Z\x99?\x1c\x8f\xa2^\xa1\xae\xa7\xf6>\xae\xd5n\xff\xcb\xe2\x8ayK\vl>\xf2\x99~Z*[Ɩ4h\xf6y#w[v\x91\x92w]\xf2\ta|\xb1蛑o\x8a.\xca\xcf\x16\xb1\x95\xd6p\xaf\x06O\x18&p\xd5=y\x8b\x1f\xdb\xedz\xd6)W\xfe\xb8\xe5\xef\xba\x023\x96歹\x999\xd5\xe5\xf2\xa0Ȟr\x94\x87>A\xa5\xeex\rz{\xf4\xb3\x8e\x11\xa2]\x9d\xd2\xf7la\xffg\x031Z5?ݻcIˬ\xab\x8f\xea\x02\x86\xbd\x1e\a\x8bJ\xe4\xa42\xb6\xb2\x02\x86%C\xc8\xebZ*]_g\xc5Lޛ\xac\x13B\xa5MO\nD-\xf2\\t\xe8\xaf\xe4\xdf\xe4\x10K+\x0e!\x8b\x8e\x92\xf1\xd3\xdb\xc35\xb2\xdca\xe61\u007fL\xbf\xab;\x0f\xd1\x1b\xa3\xb3$\x18UC\x18\"`\xaf\xf4\xaf\x98\x80I\x8a\xddg_\xb0\xf8\x04\xcd\xf8\xe1\xf6\xbf踒>y\xbd\xa42\xee\xf4[\x1c\xa4\xa3\xb7+\xf5\xe4\xa5\xfeJ|\x03<\u0089\xff\xceS\xe2\xd73\xb9\x9dg\xfb\xc8)\x83'\x98b\x14\x95\x90\xbe\xc8E\xdaLc%ˍ\x12\xb08\xf5\x1e\xa5U\xb1\xbe\x820\xd6\x16F\x9e\x91\xca\xe6\x0e\xd7\x12\xe1\x9d\xeb\xa3\xfep\xd2!\x0e\a\xa5\x8b\f!\x17Q̜\xc76\x9f\x84\xff\xa7\x18B\x83.ҷ7λ\x1e\xf9\x84FX\xe7f\x8c\xb9\xec\"g\x93\xd8Jj\xb0\x97\xe1F]#\xfe\x8c\t\xbf\xe4\x9d\xc4X\x1f\xf2*(}\xdcQ\xb6J\xe4\xa3]>\xd1\xd9\"\xa1k\x13\xda\xc4V>Wn\xd0Ez\xb9\xf8\x06\x110\xe9{\xb6\xa0\xff37\xba\x85\xe5\xec'\xdd\xd8%-\x92\xa7>\xea\v\x18\xa6q!\xbb\xc9\x00\xd2\x19\b\x04\xdcM\x01Q1VZ\xc0\xdc\xd9[\xff\x99\u007f\x18\x90w\xaf$L\xa2\x10QCH\xfa\x14]\xf4\b)\v\x18\x1b\x9bur?Hs\xeb\x8fν#\x18\x88\xa6\xbc4\x1c\xbdq\xefip.\xba\x860D\xc0pm\a\x130I\xb1g\xdc\xdc\xec\xfd\xb7\xef\x8a\xc4\t\nsc\xb5\xf4\xb6\x93\x18\x90ʊB\xdf\xf2\x8f\xf4\xa4\xb7\xa6\u007f\x84\xe3\x1a\xe0~N\x9c\x0e1\xc5\xddy\xfc\xf8q\a\xf3\x81\xbd\xea\xac=Z\xc21/5핰f\xbe\x15\xe6W|\x13%`q\xea=z\xf6\xf1㋱\x02\x16\xaa\x8c(\x86d:@{2\x01KRl<\xcd\xef3\xfb\xe65\xe3X\nm\xd0p\r\x9b\xed\x11\xe7]\x8f|BW\x04\x8f\xfc\x89/\xb1\xf4l\x12[i\rܬ\xf1\xa2q\x96cM\x95\xbc\x93J\x02\x16\xef]W&_\xc1\xab\xee\xad\xd6\xe4\xa0l\xcdIo\x9c\x06\x05\x85\x93NE\t\u0602\xfe\xcf\xdc,V\xa8\x14w\x17\x9f\a=0%\xfc\x82\\\x8d\xf3\x81I>\x84\x87e\xad\xb4\x80a\x1f\u007f0\x0fm\x89\x1f\xdc\xc2f\x15\x88z\xba,\xb9\xc1\xe2\b\x18\xfbϲsO\xa4\xb9'\xc4~\xceY\x92~{\xefB%Wv'Q\x0f\f\xf7W1\x01\x93\x14\x9b\xd3Mup\xad\xcf9\xf2\x0f\xf9\x989j\x82Ƴ\xf2zqUؙ\xf6\xee\xb3~\xdc_\x16\xc4q\r\xf0Dh((\xf1\x81=>t\xb8\xb1\xdf~Z\x10\xb0P3\x1f\vc\xcdh'~\x9cz\xa9\x0flJx\\'U\xa2p\xb2\x83\x93\xcc\r\x19\x8c\fe\x94\x05,I1\xff\xc6\xf1\xcb\xe8_\x9di\xf2/!\xd6 Av\xe3\xbc\xeb\x91O\xc8\xc8.\x1f\xd7\xd6`ى#\xb6\x92\x1a\x82ES\xc5ϊ\xa7t\xc2\xe7&\xf5[\xc6\nX\xbcw]\x99\xfc\x1d\xb1y\rZމ\x9c\xbf\xd1\xd6\xc5i\xd0\xf7\xc2#\x9c\xd9(\x01[\xd0\xff\xd9\x10\x1a\x88>\x1d\xf9wG+sC.\x16u\x05,\xd0$\xb8+\x1e\x9a\x02\x01/\xc5a\xf6z\x05M[I\x01\xa3!u\x1f\xd0G\xf1\xbe\x96\xf4\xc5\x06\xea\x88\x11\xb0{/\xe5ɢ\x1bt\xff\x1e\xf7V\x9a[\u007f\xf4\t\xe3\x15\x91\x80F\xea\xc1\xe8\xd3wF\xd5\x10\x86\n\xd8l\xf1\x98\xd0\x03\v\x17Õ}\xa7\x8d\x95\xfdt i`g\xc0\x8d\x95r\x03\xe9\u007f\xe9\x8d\xf3\xf8<\xb3\x8ag0\x1bz\x9a*\x11\xb0\xca\x1a\xeav\xbb \x17\xb0\xbf\xb2[\x04_\x8c\xe9\x81)\xd6\x1bv\xe2\x8b5|\x13\xa5Dc\x9cd\x8a\xabO\x13\x9e\x8e\x1a%`\v,\x96\u05fc\xf3Ӽ\xf6<,ChP\t-\x1b\xe7]\x8f|BW\x8e2G\xfdQ\xda\xf9\x8a\x9cMb+\xfb\x00\xee\x18\xb0\xa1\xa3\x92\x9dD&\br\x01\x8b\xfa\xb8\x95\xbf\xa4d\xe4\x1fP\xc8\xf4\xb3\xa7\x90T\x9b\x15\x1b\x14\xd43\x9f\xd8\u007fD\x04\xec\x9b\"\x1c\xb7\xc5\xf2\xff\xb3:\x8dBg\v\x9eB*\xd2̦\xf7\xfa-=\xe2\xfe\x8a\xfb\xc0\n\v1\x9eF\x16\xf2)\n3\x8f\v\xe5\xc1a\t\xee\x86I\x9c\x00\xa9\x80\x19\x8d\x18\xbf\x16\x1c\x1d\x91dQ\x19\x91\x81٣FY\xee\x98`\xd5x\x9b>Od\x93\xa4\x8cעj\b\x9f\x98\n\x18\xbeXO\x05LR\f\xd7\xdfЍp\xd7\xe8?b\x99\x81\x0eO\x83\xf4\x9fRj \xbdS\xfe\xa4\xff\x8b\xfeO4\x11\xcf\x00_\xa8d_\xcdR\x01;|\x81U+\x170\\s\x98\x9c\xed\xb9>J\xc0\xe2\xd4+\x110=\x19\xa8\x05\xff%J\x89f\rFڗ\xba!Hp鶀h\x1c\x11\xb0\xc5\x14+\xfdgM\x17:\x165\xb3OhС\x1bS\xb7\xe3\xbd\xeb\x91Oh\x84\x19\xf4\t>\xb0\xf0\xd9$\xb6\xd2f\xd6\u0590o\x05c-;\x89\xb2\x80)}\xdcr\xdb\xc9:\x85\x89\xd4q\xa6\xf6\xb8\xb3\x84\x91\xa5r\x83.\x94\x11\x91\n^d\x02\x16y\xcf\x16\xf2\u007f\x16\xc8\xdb\x1bs.\x10\xb08\xb8\xf8n\xa7\xdbi\x11g\xe2\a<\x0e\xb3\x87\xceΛ\xf1x̽\x1eub \xca9\xa7\xb9Ծ+\xc3M\x05l\xf39k[E\xe8AX\x84}H\xe9\xf3\x15\xf9\x8b]\xf7\xe5D\xf0\xe9\x97:\xfaȌ\xfc\xbbw\xf4\x9f\x16ffG\x92E\\M\u07fdʒ\xe7\xf2\xdc\xc6\xdd\xf5\xfd\xdf^\xa1\xffB\xad\\q\xebp\xff\x15\xee\x91\xdc |\xe2\xb91\xae\u007f\x16?ҳ\xa7\x90\x91b\xf8\xb6\xbe$Xɾw\xcb8C\xebH\xffi\xfds\xa9\xc1\xbb?\xb1GM\xa2g+h\xa85\b\x02\x15\xc7\x00?\xe7\xeeЍt&~+w\xa1\xf3v\x15\x19uLH\x9b9\xa57\xdc\xfe\xe63Nw\u007f\n\xbf\xa43\xf1;\xec\xf6\x97q\xea\xa53\xf1'f\xc5\x13\x18\x0fݹ]C\x8b\xc9\u07b3G\xfa\x13\x9d#7\xc4\xdf-\xb9\xd2.\xb1\xad\xf0\x14r\"\xb8\xc8b\xb8!#3\x90\x9b^\x87eL\xb1\x1b\xf7t\xed\x97'\xe2\xbd\xeb\x92O\xa8\x9ek\x1cn\xe4\xea\xe5\x1f\xac\xd4V\xf2\x01\xdc\xd8}\a\xdf\xd9M4T\xfaN\xceM\xd8\xed\xfa/\xedv\xe6\xa3W\xf8\xb8\xa3\xde\xf5}hsT\xefg~\x90=\x19O\xf0\xa5\xa9ܠ\xbf\x18\x0ew\xf6\x9f\xd73\x01\v\xbfg\v\xfa?\xbb\x8c\x94~\x8d\xf2@i\\\xb9\nQY\xc0\xb0\xa7\xc7bj\x1b\x14\xbd\x14\x1e\xea\x02k&\x89\a\x827l\x05܆\xfe\xe3Y酴\xf3\xd7TX\x97\xb3)\xbb0F\xbf\xb0Y\xcb\xc7\x16\vq\x8d\xe38\xdd\u007f\x14\x93W\xfa\xc56w\xe33\xbd\xf11;\x10I\x16ݼRb\xb8\xf8\x97\xa8\\<v\xba\xac\xc4H\xff\x13\xef\x1bo\x1f\xd6\x19\x8c\x8f\xa2\rB'~\xb4\x9b\xce\xeb\t\xd6\b\x02\x14.\x86\x1f\x93Aĝbj\xfb/\xf7\x1a\u007fY|\xe8\xecsY\xbd\xcf\x04\xe7\x87\xd0A\xc0\xb8\xa3\xa8CL\xc51\xc0\xadzڗ\x12~\vIg\x99\xdd\xc3\xc1\x8eʢC\xf5\xf7+uFY3_\x9c\xfd\xech\xe3}\x1dI^\x14=,\x17\xe2\xd4\xcb~\v\xd9'\xd6\xff¨/\xae\xfd\x86\xd4 \u007fϞ_0\x14ׄ\xa6\xe0\x9e\xf9\t\xbdk\xe6JX\r\xba\xe7\x8b+F\xfe\x8d\xb2\xfe\x157l\x96w\xe5\xe9$8\"\xcdS\x95e\xb4O\xa7\xf8\xaeK>\xa1`\xe7\t\"\x8dA\xf9\a+\xfb\x84\"\x1f\xc0\x88\xfe\x19\x9e*\x1e\x96\xbf\x93Oŷ\x84I\xab\xc2\xc7\x1d\xf5\xae\x9b6G\xbb\x9a\xc6\xd3ؓ\xa2\xf8_\x9aq\x1a\x84_]9\xac?\xfd\x98\tX\xf8=\xc3qZ,\xbd2[\xfaI\xa5\xd3Lo<8>\x1d\xc0\xab\x1e\xb5\x05l\xfd!\x9d\xaa\xbf\x9a\t\xde\xd0\xf5ᕦZcIf\xa2\xc4\x12\x8b\x89\xac\xe4'Ԏ>跶\xe0\xc4_\f-\x9a\x8a\x98\xa9\x8f\x8c\xf6<\x04\xcb\xe9\x00+{{,\x8a`\x87\xe1U2\x9be\xe7rΒ\x1c\tK,&\xb0r\x9fP\xc0\x9c\x15\xe3s}/\x16-`\xde\xec\xf8\xcfݧ\xc7=q\x8f\xad\x1a@\xc0\x96\x9b\x95\xbb=\x80\x85\xb1r\x9f\x90G[\x1dw\xe2\xe1\x92X\xb4\x80\xa5< `\xcb\xcb\xf7\xcc\x19\x9c\xcc\nX9\xd6\xd2'\xf4b\x84\xbb\xf9\xa75Җ\x05\x02\x02\xb6\xbc0gp\x825\xff\x80\x95f-}B\xc65Ԗ\x05\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x96j\x04\x02\xf3\x01\xfa\x97\xcc\x0e\x00\xd6\x01 `)\x86kG^\xde\xdeO\xf2\xf2\xaa?\xe8o\xe8\x00 5\x01\x01K-\xe65hg\xe1G\x19;wl\xf8W\x85P2\x00\xb0\xceP[\xc0<]\xcd&\xcb@\xa8\xf7\xe0\xe0\x85\xd0\x01>\x9b\xc5\xd4>\xae\xfc\xab\xf8\xb5\xc8\xd2\xc3\xc3\xfb>\xae\xfb\xdbߜ\xff\xdf\xdf\xfe\xef\xc7\xfb\xbc\xc9l\x01`ͣ\xb2\x80M\xf3V\xa7\xdb\xd9&.h\xe83\r\xb0\x15Y}\xe6v\x87\xfb\x81\xb9}\xcd+X(\xa2\xfbR\xc2ÿe\vV\xcd|\xb2aÆ@\xe9\x86\r\x1f\xd5IƐ\xbdJK\xd2\x01\xc0\xdaGe\x01s\xf1tY\\\x1f\xefd{\xd6\x1e7\x13\xb0\x1e\vuI{M\x0f\xe2\x17\\\x1b\x84#\xba/:<|\xf0^\xc9i\xba\rx\xaa\xf3\x89\x80\xfdh\u007f\x83K\xb2\x8e\xc1\x8e\xa8e\x94\x01`\x9d\xa0\xb2\x80\t\xd1\xee\xbcB$\"\x87\xd9'\xac\x89\xdf&,Gכ\"\xa1\xe8\x96N\x95L\xc0\x16\x11\x1e~\xaa\x86;+\x84\xa4\x0e\xf8x\"`\x1bG\xbd\xd2uX⬢\x0e\x00k\x1d\xb5\x05\x8c0\xe3\xb6Xi\x8f\xcbgr\x89A=<B\xb4\x82\x81[\tJ\xa5\x16\xaf.\x96\x19n\xde,+\xee\x93D\xab\x97FtO\x16\x1e^\xce\xecM\xce0\x1c\u07b3P\x01sE\x86\xdbV1^e\xbe,.\xfd1\x94ք'5(\x8f\xd94\x15d\xe4\xc2sK`\xed\xa1\xba\x80yy\x9e7\xb3[\xc9\xda-\x8dJD\xfa\x16\xcdQ!\x17S\x97\xb9\x13\x86\xceV\xbd\xfe^m\x87$Z\xbd4\xa2{\xb2\xf0\xf0R\x82\xfd\x06]\xa3\xd0U\x9b{A\xf8:J\xc0|\x03,\f\x84\xcd)\x8bK\xef\xb1m\xaa\xc3x\xf0\x88\x86\x9aT\xa4\x1d\xb7^\xd5\xe6\xc3\xdc1`\xad\xa1\xba\x80a\xaf\xc7\xc1\xa2\x129\xa9\x8cI\x05l\xc0\xbcf\x9e\xab\xf5Ѹ\x85\x9d,\xba\xb54Z\xbdt\bII\x14\x1e>\xc25\xaejJL\xd2\xf5\x9e\xb8\xff\x1c%`X6\x84\x8cĥ\xd7\xd0\xf0<u\x1aL\xfbhfL\x03eE\a`\x06\x80TG}\x01\xc34.d7\x19@:\x03\x81\x80\xbb)\x10\xea\x16\f\xf2\xb1\x01\xd5S\x95\xc6\x12L\x03\x95}K^\xa5\xd1\xea\xa5\x02\x96,<|\x84\xfbE\x9f\xdd\x17W\xd9|>L\xf8_\x89\x05,\x1c\x97>\"`\xa5\xdb\xfc\xf3\x84\x9c\n\f\x00k\v\x95\x05\xcc/\xc8\xd58\x1f\x98\xe4Cxh\xce|\xaf\xf8drMб\xfb\x15\xed{ю\x934Z}\x94\x13?axx\t/j\xb9\x9a\xa9\xc8n\xb4\x0f\f\xcb\x05,\x1c\x97>\"`\xdbE/Y\n\x04\x99\x01\x80E\xa1\xae\x80\x05\x9a\x84\xb8\x8b\x0fM\x81\x80\x97\xe20{\xbd̡om\xf2$,\x99Z\xbc\xe4j_>\xab4\xd2~\x934Z}$\xa2{\xf2\xf0\xf0R$^0\x1c_\xc0L\xac\xeb\x15\x89K\xcf\x04쌆\xbc\x94o\x1be\xac\x99!:\x00\x88\xa8+`\xb8\xb9\x8b\xbe\xfa-=\xe2\xbe\xe8\x03\xf3\xb6\xb4\xf9\x88\xbc\xad\x99\x1f\xc7<\xe1\xca8\xee4\x9b\xf7 \x8dV\x1f\x89\xe8\x9e<<\xbc\x1c\xfa\x1crLL+\bXa!\xc6ӈMF\x89t\xc62>'o\xe9\x0e\rIu\t\x87\xbe\x88\x8aY\r\x00)\x8f\xca\x02\xe6⻝n\xa7E\x9c\x89\x1f\xf08\xcc\x1e\xd2-p\x9bZ\xdc\x1e\x8fg\xe0}\xa2\x93\xae*\x9e\xe9\xc7F\xec\xdf\v\x8e\xabp\xb4z,\x89\xe8\x9e<<|4S\xc6\xd0\xf0SA\xc0\xcei.\xb5\xef\xcap\xcb\xe3\xd2\u007f\xaam\xa8+@\x1b\xcddh~\n\x95Z\xda+\x90\xe4\x89\t\x00\xac\tT\x160\xec鱘\xda\x06\xc5I\x98\x1e\xea\x02k\xc6\xf8\xae\xe8\r[3\x13Y'tԫ\xa53R\xcfU8Z=\x8eDt_@x\xf8\xf8(\b\x98\xffxVz\xe1PT\\zWaz\xe6\x9e/\x10\xa2\xa1S\xbbvj\xb3>\xbd\xabT\x1b\x00\xa42j\vغ\xe0u\xf1\xb5\xd7\xef\u07bd}z\xfe\xb3\xb7\xc9L\x15H\x16\x9cTA\xc0\x00`\x9d\x02\x02\xb6\f\xf4\x97\b\x1d\xae`Y\xf4\x9c\xfa\x85\x00\x02\x06\x00\v\x05\x04l\x19x\xc2\t\xb3\x1e\xa6\xb8%,\x98\x13-`\\\x14\xff\xf9?\xd1\xd5(>\x1f\xf8\xb01\xe9\x01 %\x01\x01[\x06\x82W\xf4\xd7\xfa\x1e\xf5]\xd3\u007f\xb5\x840\xef\xd1\xe1\xe1\xa3\xf4\xeb?\x85\x96\xd3i\x03\x05\x03\x00\x10\xb0\xe5 8\\k\xd0\x19j\x87\x97\xa0_I\xc2\xc3\xcf\xd0\x05\r\xff\u07ff\xfd\xed\xff~\xbc\x1f~\x9b\r\x00 `\xa9\x85\x0f\xa1\x9d;?\u07b2sdž\n\x98\x96\n\x00 `\xa9ż-'++7++k\xd7К\x99\xf6\v\x00K\x06\x04,\xc5\xf0{&]\x93\x93.\x97\x1bF\x90\x00\x00\x02\x96r@\\H\x00\b\x03\x02\x06\x00@\xca\x02\x02\x06\x00@\xca\x02\x02\x96\xfalXq\x92]!\x00,\x13 `\xa9φ7+\f\b\x18\xb0R\x80\x80\xa5> `\xc0\xbaEm\x01\xf3t5\x9b,\x03\xa1)\x00\x0eq\x05\x1dy.\xb08@\xc0\x80u\x8b\xca\x026\xcd[\x9dng\x9b\xb8\xa0\xa1\xcf4\xd0\x14\x9b\v(\xf2\xf6/\U0004e000\x01\xeb\x16\x95\x05\xcc\xc5B\x0f\xf9\xc4\x00\x1e\xd6\x1ewSl.\xa0@\xf0^\xc9\xe9x\xc7$\x02\xb6`-[\xb0\xe1\x9b\x05\u0602\x80\x01+\x85\xca\x02\xc6\x02\x16b\xaf\x10\x89\xc8a\xf6\x89k\xe2Ks\x01\x05\xa6j\xb8\xb3\xdf\xc7;\b\x02\x06\xac[\xd4\x160\u008c\xdbbe\x91\x88L.I`\xdbP\xee\x1a`~˦/r\xb2{\x8fg\x15Ra\xb6\xed\xc9٤ݻ\x95\x1e\xf0\x96ksN\x9e\xd4n\x8e^\xfb\u07fc\x85\xa7\x1bw\xa6\x18\xfe,3*B&\r\xe91,\xcfz\xa6\xe3\xb8o^\\<\xaa\xaf}\a\x02\x06\xac_T\x170/\xcf\xf3f\xd6\xe3\xb2vG\"sGr\xd7\x02\xbd\x99\xa8z\x17\xd26l\xb9L\xe3a\x1f\xb9\xd5\xcdk\xd1<\xc6\xfe\xbc\xec\xaf\xcfi\xd2M\xbf\xb8\x1ce\xbf\x1f\xed\xa1\x1b\xbf\xf9\xaa\x80Y\xb6ԗ$\xa8\xda\xdc\v\x819<\xd7\xd7w\xb8\xb2\xd8p\xb3~\xf7K*`\u007f\xf8\xf9\xc7\x1f\xfd\xf4\u007f\x13)\xf9\xdf?\xfd\xe8\xe3\u007f\xfc3\x11\x95_\xffxÏ\u007fM\x0e|L\xd2\xffH\xfe>\xfe\xa3 6\xbf\xfd\xe9G?\xfa7\x89!)\xf9\xf1\xcf\xff,ɈT\xf1ۿ\xfb\xe8\xc7\xff\xf4&\"`b\x95o6\xd0\x04\xa9#rV\f\x00+\x83\xea\x02\x86\xbd\x1e\a\x8bJ䤂\x15\ue045r\xd7\x06\xd9\xe5؊\xac\xf8H\x05\xc6\u05f5t\xf1篳H\xef\xb2\x05\x8d\x93\x14rĘO\xd6\tq\x84\xa6'\x05\xa6eG\xafqU\xa1\xb0\xb6FqUC#ݩ\xe2N\xbf\xc5\xc1\xb7l\b\xf9\xd3_\xfd\xf9\xbb\u007f\xff9\x91\x92\xbf\xfb\xddw\u007f\xfcG\"X\xff\xe7G\xbf\xfb\xf3\xef~\xf4\xdb7o~\xfc\xfb7\u007f\xd8\xf0\xc77\xff\xfecQ\xbf>\xfe\xedw\u007f\xf8G\x89!\xd9\xfe\xf9\u007f\xfc7IF8\xf1\xef\u007f\xf7\xef\xdf\xfd\xe1\xbf\xfcSX\xc0\xc2Un\xf8\xd1\xef\xbec\x89\xf0Y1\x00\xac\f\xea\v\x18\xa6q!\xbb\xc9\x00\xd2\x19\b\x04\xdcM\x81\x804w\x8d\x90݂\a\x91\x0f\u007f^Jƅ\xd9[\xff\x99\u007f\x18\xa0}\xaaSY\xe4Ņ\xda㕚D!dC\xc8\xfbE\x9f\xdd\x17WF|>,\xf0\x9c\xeeT\x15\xbd\x14r\x89\xc0|$\xf6\xaf6\xfc\x9e\xbc\xfc\x99\xf4\xba\xfe\xfe\xffP\xc9\xf9\xfb7o\xfeǯ\xde\xfcjÿ\xbd\xf9\xa7\xffG0`\xf9RCʟ\u007f$\xc9\b'\xfe\x81&\xfe\xf8㰀\x85\xab\xdc\xf0[\x9a\xf8\x99\xe4\xac\x18\x00V\x06\x95\x05\xcc/\xc8\xd58\x1f\x98\xe4Cx$\xb9\x89ʦ\x10\xd9]xHC\x14\x8b\b\x18\xf6\xf1\a\xf3Ж\x06\x92\xba\x8c\xbc4\xc8ll\x0f,\x84\xcd*`\x93g\xbf\xa8\xe5j\xa6p\fU5b\x82\b\xcc\xff\xfc\xf8\xbf\xff\x1bU\x13Ak\xc8\xeb\xc7\u007f\x16e\xe8\xb7\xff\xf5\xcd\xcf\xfe\xdb\xcf\xdf\xfc\xfdo\x05\xad\xf9\xe8\xcfoB&\xc2\xeb\x1f\u007f\xfe\xf1\x86\r\x1fI2\"U|\xf4\x11\xfd\x99PX\xc0\xc2Un\b%\xc2g\x8d\xbd8\x00P\x05u\x05,\xd0\xd4˶\x0fM\x81\x80\x97\xe20{\xbd\x01In\xa2\xc2)\x84D\xc0\x1e\x9c\"\xfb\xbe\x96\xf4\xeb\xa43\x96\xb6\xd7=\x9e[\xb0\xf8FJ\xbc`\x12\xaaB\x91n\xa9\xc0\xfc\xfeW?\xff\xf8WJ\x02\xf6\xdd\xc7\u007f\xfc\xe8\x8f\xe4\xef;\x89\nI\x05\xecg\xff\xf3\x8fo\xbe\x93\xeaV8\x11\xea_\xc5\x17\xb0\xf0Y\xa3/\r\x00TB]\x01\xc3\xcd]\xf4\xd5o\xe9\x11\xf7\x05\x1fXtn\xca#\x11\xb0:\xc4\x1aWx\f\xe3Q\xb4\x05\xa1\x9d\x9eXsw\xc3dl\xa6\f\xfa\x1cr,*O&`o\x04\u007f}X}X\x8f\x8b\x8e\xf7\xde\xfc\xc3\u007f\xff\a\xf6'\xf0\xb3\xd0\x102\xf4J\x95\xed\xdf\x15\x05\xec\xef\u007f\xfdFj\x1b\xa92<\x84\xa4\xb0\xb3F_.\x00\xa8\x84\xca\x02\xe6⻝ng\xc8]\x1f\xf08\xcc\x1eotn\xea\xe3̺\xeck\xd94\xee+\xdd\xe9&\x02\xb6\xf9\x9c\xb5\xad\x02\x91N樦\xc7j\xf3(t\xc0\xf6\x89\xb1\xb4\x131e\xbc\x80%\xbc\xfb\x93\xbd\xd2h\xb7\xb3\xe0\x1fD`\xfe\xcb\xef\xbe\xfb\xee\xd7?\x95\xa8\xcf\xff\t9\xda\xdf\xfcjï؟\x00\xc9\x13\x9c\xf8!ß\xfe\xea\xbb\xdf\xffXQ\xc0~\xf7\xf1\xbf\xfd\xf9\xbb\xdf\xfdװ\x80\x85\xab\f;\xf1\xc3gU\xbed\x00XvT\x160\xec鱘\xda\x06\xc5i\x02\x1e\xea\x02k\x8e\xceMy\x02\xa4\xa3՜\x892,\b\xed\xc7M\x85u9\x9b\xb2\v\xe9 y@C\x1d\xf4\x9b\nc\x9c`f-\xafPMB\x9e\t\x8f#ki\x9a\b\xcco\u007f\xf6\xd1\xc7?\xff\x83D}\xde\xfc\xfa\xc7\x1f\xb19\x0fo~\xbf\xe1\x0fo\xfe\xc0<\xf3\x82\f\xfd\xddGt\nD\xd8\xf0\xf7?\xfd\xe8G\xbfV\x14\xb07\xbf\xfb\xd9G\x1f\xfd\xecwa\x01\vW\xb9\x81&\xe84\x8a\xf0Y\x93]-\x00,\x13j\v\xd8:ƻ\xf9\x98w~\xde7t \xeb\x03\xf74C\x02\xa3\x161\xe7\x03\x01\x03V\n\x100\xd5h\xcf\x12F\x8f\x01\xed\xdd$\x96\x8b\x04\x04\fX\xb7\x80\x80\xa9\xc6h\x9a0vt\xa4=Lb\xb9H@\xc0\x80u\v\b\x98j\x04*ҏ\xb5\xf4\xb6\x1cK\xafHf\xb9H\xd4\x16\xb0\x18@\xc0\x80\x95\x02\x04LE\xac{\xb25\xd9{\xac\xc9\xcc\x16\v\b\x18\xb0n\x01\x01K}\x92\x85\xdcX~\x92]!\x00,\x13 `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `@\"\xfc333\xf3\x18ϓ\xcdZ\xf9\xa9*\xb0\x96\x00\x01\x03\x120\x90\x86\x10J\xf7\xf9\xd2\xc9&-j\x9dE\x00Xy@\xc0\x00\x05\x86k^\xb3\xad\x05Y\x87\x86\x1c\x18;\x86\x86\xac(:\x98\xd2Bi/\xf0&3!x\v\xda\x15\x92\x00\x90\x10\xb5\x05\xcc\xd3\xd5l\xb2\f\x84\x96cp\xf0\xe1i\xe9\x92$\xf0\x01\xf8\x8a\xe3:Ȧ\x83㾊:2v(*D[,w\xb8Va\x15~Kdy~\xb7 `\xc7P\xda\"\x85\xac\x01\x9dKf\xc2hHkPH\x02@\"T\x16\xb0i\xde\xeat;\xdbĥ\v}\xa6\x81PT\"I\x12\xf8\x10\xbc,\xbe\xf3\x03\xd9\xfcp\xa7\xf8eԑ\xe1\xe2~1\xf5\xe8\tV\xa4\x93\xbb/\xa6b\x05\xccc\xdbT\xa7X\xa8wT1\x1b\xff&ͬ| \x06\xebƫ\nI\x00H\x80\xca\x02\xe6\xe2\xe9\r\xe1\xe3\x9dl\xcf\xda\xe3\x0e\xa9\x96$\t|\x10N\xdcc\x9b{'b\x8e\x04C\x89\x1a\xd9\"\xafa^\xe8\x1aC\xc9X\x01\xc3X\xa3,`;J\x15\xb3'5\xa7\x14\xf3\x958\xa3q+$\x01 >*\v\x18f]//\xef\xa1\x1b\x87\xd9\x17\x8a\v)I\x02\x1f\x86\xf3߰M\xe3\xf9\xf8&U\xca\x02v\xc5\x10\x0e \xb2\b\x01\xcb?\xa8\x98]\x91\xbd\xf0\xe5\x1b}\xd9\x15\nI\x00\x88\x8f\xda\x02F\x98q[\xacti?\x9f\xc9\x15\nl+I\xae\x17\x9a\n2r\xabɽ=\xbe\x11\xa13\xae\xf2\xad\xe9{\xe6%\xc9(c\xf3\x16\xb6\xe6\xb4;S\x8c\x1b\x99)ힴr\x1cׇ\xfb\xc8k\xab\xb4Lc=\xdb\\h\xc4\xcft\x1c\xf7͋\x8bG\xf5\xb5\xef\xf0[=\xb3&\f\x8bArYp\xb6\xe0\xfd\x9a\xe2ʛb\xf8\xef\xe2p\aLY\xc0\x8eWdg\xeds\x91^3\xb9\x92/p\x1dy\xb5X\xc5\v\xcbg\x16\xa1\xb6\x11\xfc\x99\x9f\xd3ͻ2]\xa3\xc1\xf0\xe8F\x89\x91\x9e\xc3^{XWV{\x98\xf6\x04_],3ܼYV\xcc.\t\x9fI\x9f\t\x9dN\x92\x04\x80\xb8\xa8.`^\x9e\xe7\xcd\xec\x9f\xdb\xda\x1d\x8e\xcc-I\xae\x13*Ҏ[\xafj\xf3\x03x\xc6Ҽ573\xa7\xba\x1c\xb9%\xc9(\xeb\xfdh\x0f\xdd\xf8\xcdW\x05\xcc\xd29Y\xaf\xebk\xec\xb3xv\xc2X\xffJZ\xe6^\r\x9e0L\xe0\xaa{x\xae\xaf\xefpe\xb1\xe1f\xfd\xee\x97\x18?\xb6\xdb\xf5L\xe8f'XX\x10;\v\x92{\x85\xbb1\xd2y\xa8\x8a\r.\x9fr\xf6p%\x8a\x02\x86\xf2[Z\xb6g8\xb0o \xe7\xd84\xf6\x9e˴\xf9|\x03\xb6\xdcB\x9b\xcd\xc6\\\x03\xe1\xb6a\x1a\x89I\b\x99\xf7\xa8\x84\xbby\x9a+\xbb]\xd6AN\xb0\xfbb\xffؽ2\xee\x1d\x11\xcb\x13\x86\xceV\xbd\xfe^m\a\xb3\x1a@\x83\xa1\xd3I\x92\x00\x10\x17\xd5\x05\f{=\x0e\x16\u007f\xc8IeLP-Ir\x9d`EԳ=\x84Z\xe8N>\xda\xe5\x13\aג\xa4\x94\xc9:!\xee\xda\xf4\xa4\xc0\xb4\xec\xe8\xfd_\xb2͉\x90\xe7]\xc0^\x86\x1bu\x8d\xf83\xa6FU\xdc\xe9\xb78\xf8V8\xa2\x0f\xf5\xd4\xc2C\xc8a\xe6\xb5\u007f,t\xcdF\xb8\xe7\xe1J\x14\x05,\x8f\xf4\x8dfr\vH\xb2\x8e\xf6\xb8\x8e\b\x83\xbd\xf0\x10R\xd66+\x12#\xc6\x19.\x92\x8a\x87\xf1ů0\xee<D\xa4\vw\x96\x10\xb9\xec\xe3\x9e\xd1g\x06\xa1\xb0\xbdnt\v\xc7&\x01 .\xea\v\x18\xa6\x11 \xbbɨ\xd1\x19\b\x04\xdcM\x81\x804\xb9^(\xdd\xe6\x9f'\xe4\xb0{??\xe2\xb0\xceO軞D!dVϸ\xb9\xd9\xfbo\xdf\x15=\x93\x19\xbf\xe4f\x8d\x17\x8d\xb3\x1c{\bYU$y\x16\x19+`\xf5G\xe7\xde\x11\fW\xe8N?\xf7\"l\xaa(`_\xd0\xd7\xeb4̸\x1b9\xc8 Q\b\xe7\x19\x160Y\xdb\xda\xc3\x02\xd6G\x04r\x96\rl_\x1a\x8e\u07b8\xf748Gr\x1bK\xc8\xcbs\xee\xdb\xf09Zpl\x12\x00⢲\x80\xf9\x05\x8d\x1a\xe7\x03\x93|\b\x8f$\x99\xb8\xf4\xdaa\xbb(D\xfb\xe9N\xfe\x8ep\xbe$\xa9\x84\xcd* \x9f\x13?\xa7\x9b\xea\xe0Z\x9fss\xb2\xdc`\xd1T\xf1\xb3\xe2)\x1d\x1b\x16V\xd5H\x8e\xc4\n\xd8\t\xd1\x1fv\x96\xeeLp\x13a\xd3\xf8N|\x1b\xa2\xd3&\xf6\x9e\xc4]Y\xc2x6,`\xb2\xb6\r\x86F\x82\x86\x11\xfcX'z\xe6\xde\u07bbPɕ\xdd!Wֱ\xfb\x15\xed\xf2\x85z`Ch\x00\xc7&\x01 .\xea\nX\xa0I\xf0\x88<4\x05\x02^\x8a\xc3\xec\xf5J\x93Iʯ\x19ʷ\x8d2\xd8\x14\xf5\xfc\x03\xe1|Ir\x11T\xf6\x9d6V\xf6\xff2:\xf7\x8e\x01\x1b:*YZ\xf6\xbcQ.`\xf7^\xd2\x1e\xd8\x13\x06s\xa2\xcd\x16E\x1e\x06(\nX5}5!:еj\xfd\xe2\bR\x100\x93;\xaam>\x8d8\x8b\xd50\x86\x1f\x17\t\x02\xf6\xb8\x91H\xd7\xdb>}'\xed&־|Vi\fM\xec\xa8ӄGϒ$\x00\xc4E]\x01\xc3\xcd]\xf4\xd5o\xe9\x11\xf7%\x8e\xaf\xb5\xeb\x03\x9b\xac\x8b\x99\xe3\xd9%\xa8\xc1\x17\xac3#\x99\x80\x10g.\x82\xbbaR1_\xa4\xfe\x86n\x84\xbbv!ʶ\xb6\xe6<>od\xa1o\xe3\b\x98ш\xf1k\xea\xf8\x1a\x13\xbc_\x8d\xb7Y\xf6\x85\xca\xf0L1E\x01\xcb!].\u007f^!M\xfb\xb5\xd6,\xf1\xb3,$\x19\xd3\xd4F\xd662\xa0\x14\xbe\x95$\x02\xd6ʍ\xd0\x1c\xe35\x8c\x9fpe\x1cw\xfa{\xf1\x14\x81\xbcp\x84rI\x12\x00⣲\x80\xb9\xf8n\xa7\xdbi\x11g\xe2\a<\x0e\xb3\xc7\x1b\x9d\\s\xecC\x9bcz\x13\xa7P\xa9\xa5\xbd\x025\xe1\xf9A\xf6\xfc\x8e\x8a\x8e$\x19SC\xc2\xdb\xf9\xb6\xbe$X\xa9\xbf\x1de{c\xf7\x1d|g\xf7\r\x8c\xdf\xfd\x89=od\x9e\xad\xb9\t\xbb]\xff\xa5\xdd\xce\xfc\xf9\xadE\x1d\xfd\xa7\xd9L\xfd\xc6\xdd\xf5\xfd\xdf^\x11d\f?\xe7\xee\x84jV~\n\xb9g\xb0\xa7 K\xb8\xccS۲\xc49\x1f\xe74\x97\xdaweP\xf3p\xdb(\xae\xb4Kt3\xf5Y\xc7l\x9fnj\xb6\x9e\xa8U+W\xdc:\xdc\u007f\x85{\x84\xf13\xfd؈\xfd\xfb\x90^^Fa\xa5\x97$\x01 >*\v\x18\xf6\xf4XLm\x83\xe2,\x00\x0f\xf5{5G'\xd7\x1c\xa6\xcdh(&\xb3k\xa76\xebӻ\x18\x8f\xa71\x87\x11\x15\x1dI2\n\xb3\x96\x8f͌\xf0\xb8\xa4\x15\xdf)~\x1ce;\xa2\u007f\x86\xa7\x8a\x87\xa9\x93\x9f\xc1\xfabOEo\x17\x9b\xa6?w\xe33\xbdQ(6v\xba\xac\xc48\"\xd6ת\x0fy\xc1,\xc8\x15ZN\xc7\x15\x12\xb0\xbc\xba\x83\x99\xd9\xe5\x1eaDžB\x13N\xfddz\xd2\v\x85v\x86\xda\xc68\xf3\x93\x01\x8c\x83\xa4\xa3\xd5W\xcc\x15\xf7q\xdcy|\xdfx\xfb\xb0\xce`$\xfa\x85't\xf4btF\xe6\x04\xb3\xa5\x9f\x14\xcbH\x93\x00\x90\x00\xb5\x05l]ҎR˟\x13\xbc\xa1\x13\xfabl\xaejh9\x1d\xa4\x14Pܧ\xe9UȕQ\xad\xb1\xc4;\xf4\xba\xf8\xda\xebw\xef\xde>=\xff\x19\xe9\x11\xb6h*B\x13x%I\x00H\x04\b\xd8r0#\xce\xd7b\x93\xc9\x03\xe6\xacc\xc9\n\xac2\x82\x1d\x06aR\xec\xfc\xf8Ph9\x9d\xa1q%M\xb1h\x93+\xcd\xe5\x1c\xf9\xbc\xb5\b\xfd%\xc2\xe81X6\x82\xbd\xd9\xe1\x15($I\x00H\b\b\xd8rP(\xce$`\x8en\x8f\xb6z\x8d.fZ\u05cbw-l\xa9\x9c\x89'\xb4\x8b\x00\x00 \x00IDAT8<\x11'PLqO\x93X\x02\x80\" `ˁK\x9c\xaf\xe5Jf\x98\xd2\xf8P\xfe\xb1E\xfcT[\x81\xe0\x15\xfd\xb5\xbeG}\xd7\xf4_\x051\x00,\x01\x100`ɜۼә\xcc&1\xc1\xe1Z\x83\xceP;\f\xfa\x05,\r\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x100\x00\x00R\x16\x10\xb0uɺY\xb7\bX\u3000\xad?<\x15[\x84\xd5\x06\x01 \xd5\x01\x01[w\x04\xf2\xf2\xf8\x9eD+W\x03@ʠ\xb6\x80y\xba\x9aM\x96\x81\xd0\xefO\x1c\xbc\x95nf\xcclAi\xf3Z\xfa\xc9`\xb7\xd6\x1aJz\x8fmI\xdf\xfb^\x836k\x96\x15/\x94Љ\x8f \x842\x94~\xcb4\x8e\xba\x14r\x01 \x15QY\xc0\xa6y\xab\xd3\xedl\x13\x174\xf4\x99\x06تw>\xfe\xa1\x87\xb0\xa6\xd63\xb4f\xdc\n%wm\xb9~$\xfd\xbd~3\xf89\xfa<\x99I\x98Љ\xdd6\xdb\u05ca\xa1Ɇ\x90|I}\x00H]T\x160\x17O\xc7.>^\xf8\t\x9d\xb5\xc7-\n\xd8\x1a\x1cф\xbb\\^t\x15\a\xdeK\xbf\xf0\x19t&\x99I\x84H_o(\x8e\x80A\xc4E`\xad\xa0\xb2\x80\t!\x0f\xbdB\xf8!\x87\xd9\xe7Y\xbb\x02\x16ƅ\x16>\xfe\x8bC\x1d\xaaKf\xa2\x04\b\x18\xb0\xd6Q[\xc0\b3n\x8b\x95\xf6\x12|&\x17^\xa3\x02FW0Mc\vd\xfb\xb5\xc2\xca`\xd5Q\x16\xc1\xfb5ŕ7g1~\xa6\xe3\xb8o^\\<\xaa\xaf}'IFY7 \xb6\u009f;S\\g,S\xfa~\x1dC\x9b\xf8\xea܌=\xaco\x1b>1EY\xaazA\xc0\x805\x83\xea\x02\xe6\xa5\xdez\xd6\x0f\xb3v㰀u\xdf\xe2\x9bm3\x89K\xa6\x12\x0fl6!|\"~hkAu6\x9b'\xca\xe0\nwc\xa4\xf3PU\x10\xcf\xf5\xf5\x1d\xae,6ܬ\xdf\xfdR\x92\x8c\xb2\xbe\x8a.Ӎ\xdf|U@\xf6\xb8\xc3ټ\x11i\xeb.e\xb2\x88l\x91\x13cE\x01\x9b\x9f\xeeݑ\xf5~\xe3Y\x00X=\xa8.`\xd8\xebq\xb0\xa8DN*c!\x01k\x1aw;--k\xe9)$N\x0f\xe9\x88\xd2\x10r\x98\xbbO^\x1f\va\x80\xaa\xb8\xd3oq\xf0mTR\n\x8f\x84@\x1d\xd3\xe2R\xd5QK4k\xb2h8F\xad\xb8\x97\x9eH\xc0\xf6\x93\xfe\xdb{\x8fh\x01`\xb5\xa0\xbe\x80a\x1a\x17\xb2\x9b\f \x9d\x81@\xc0\xdd\x14 \xa3ɀ\x83v\xbef\xcckjh\x93P\xc0\xea\x8fν#\x18\xaeН\xaa\xa2p\x8fK\x92\x94bFf\xba\x99D!\xe4Cn\xcd\x11LÚ\x89{\t\x05\xcc\xdd\xc5\xe7A\x0f\fX3\xa8,`~\xe1\x11\xd98\x1f\x98\xe4CxB\amm\xf1\x8a\xa5\"\t\x05\xec\x84\x18\xdd\xec,ݩ\xaa\t\xe7K\x92R\x06\xb2\x04%\xb2\x89KUG̓`ѯ\xeb4\xe2^B\x01#\xd8\x14\x82\xbc\x01@j\xa2\xae\x80\x05\x9a\x84 \\\x0fM\x81\x80\x97\xe20{\xbd\x01\xdc#\xdc\xe1\xbdkjl\x93\xa4\a\xf6\x84\xc1b\xffH\xc2f\xcb\"h/\x18\xe6\xf5Z\xb0\x80\xc1SH`\xed\xa0\xae\x80\xe1f6\t\xdco\x11\xc3ы>0+\xebzy\xcd\x0f\xe3\x94JI\x12\nؘ\xe0\xfdjdѴ\x17 `\x89\xe7\xf1\x83\x80\x01\xeb\x15\x95\x05\xcc\xc5w;\xddN\x8b8\x13?\xe0q\x98\xe9\xfc{7\xdf\xe5r?0Y\xdf\xeb\xe76\xab\t\xff\xa0ͦ9b\xb3\xf9BO!\a\xa3\x9bָ\xbb\xbe\xff\xdb+D\xc6\xde\xfd\xc9^i\xb4\xdb_\x90<I2\n\xeb\xe6\x04\x9dS\x8fmӑA<zd\x93\xcd#=1\x9b\x89\u007f\xd9f\x8b\x99\xa1\xf2\x00\r(U\x03\x00)\x88\xca\x02\x86==\x16S۠\xf8\xb8\xd1C]`t\xd6\xd2tw\xb3\xd9\xeaX3\xfa\x85\x87\xd2\x04_;\x8f\xfdY,\xb11&z\xcf\xd8\xe9\xb2\x12\xe3\b\xc6\xcf\x04gX-\x96%\xa3\xb8\xabU\x8a\x8a-r\x8cԿɑA^\x8fIN\xcc~\vI)\x8d\xb6\x9f\xdexp|z\xed\xbc\xd7\xc0\xbaFm\x01\x03V\x9e\xf6<\x04\xcb\xe9\x00k\x03\x10\xb0\xf5\xc8\xf4\xb8'\x99\t\x00\xa4\x02 `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x00\x00\xa4, `\x80*\\Ϡ\x91\xe1\x06\xb3\xd6T\xf0O`\xc5\x01\x01\x03B\f\u05fcNf\xb2d|\x19\xd5t\x1d\xec\x03\xda\xf9d\x96\x8b\xc4[О\xcc\x04Xè-`\x9e\xaef\x93e \xb4(\xbb\x83\x0f\xads\xe5\xbck\xb6<\x88S\x06H\x88}\xb7\xb8>\xb5\xfeY2S\x8c\xbf\xa4v\xe1\x15\xc7\xfez\xadL_\x1b\x14w\xeep\xad4\xe9Ԛ\xb1I\xeb¸\x02\xa1Kd\xff\x12B\x15Q\x95tk\x17\xbdv\xee\xe8F\u007fv;\x9e\xde\xf4ET~\xf8lK\xa6!\xad!\x99\t\xb0vQY\xc0\xa6y\xab\xd3\xedl\x13\x174\xf4\x99\x06؊\xac\xd8\xdf\xcd\x0fN\x8e\xf2\xef\xf3\u007f\xbcNx\xf4$&kn\xe2P\xad\x9dp\x9f\x1bIj\x8b\xbf\xb7\xdb;\xb9\x89\xd0\xde\xe9C\x9d\x17\xf5b\f\xa4N\x16(\t\xe3\x1eT\x8d\xabQ\x0f\xc6\xee\xcd\rt\xbc\xe7mȌ^\x13њqKL\xf5\x8e\xe2\x851\xa4\tl\xb5\xe0\x064\x19\x95\x1f>\xdbұn\xbc\x9a\xcc\x04X\xb3\xa8,`.\x16\xc2\xd6\xc7\v\xeb\xfbY{܂\x80\xf5\x98<4bd̪\u007f@45JkN\x1f\xbdF_\x9fG\v\x98\xa2-\r\xe6\x16\x12\xb0\x1f\xb8N\x1c\x9c\x15\xd2/t\x8dB\xe2\x01:\x87\xcf!*L\x9f\x98X\x86i{L\x15\xe1\xe5\x10w\xc4,\x97\x18\a\xefF\x13r\x04\xb6\xee\x8aΏ\x9cm\xe9\x9cѬ\xb1\xb8\xc8\xc0\xc2QY\xc00\xebzy\x85HD\x0e\xb3OX\x13\xdf\xc3?\f\x1f\x03\x12\xa2\xb8h\xbe `s\x9dQ\xf1$\xe3,\xb0\x1f\x11\xb0\x17\xdcp8\xf7\x8aAT2\x17\xba\x8c\xaf\"\xda\x19>p\x86e|q\x00\xc7%\xff`\xfccr\x8e\xa3\xbd\xb8\x17\xc5\xf8\xab\"g[:\xbe\xec\xe81.\xb0nP[\xc0\b3n\v[\xfd\xdegr\x89A=\x06M\xf3I\xc2V\x00\x94a\xd1\xd9\x15\x1d{M\x100\xca\xdb\v\x06\xdd\xe1\xb3Ϣl#\xb9\x14Q\xc0\xe6\xca\x04\x83\x9b,s\xaeX\xec\x80a/j\xc2\x16D\a\x8f_\bݫ\xd2/\xf0\xf8F\x84θʷ\xa6\xef\x99Ǿt\x84\xd2\xe8:\xe0\xd8*.Z\x9d\xcf̚\n2r\xab\xc5\xef \xf3\x16\x1eG\x11p\xce\xe3\x83Z\xba\x96\xb8\x85\x14\xa9\xc3u\xe4\xd5\"=[\x1c\x82\xf7k\x8a+o\x12q}\xa6\xe3\xb8o^\\<\xaa\xaf}'I2\x9b3\xe9k(\xa8;\xb0(T\x170/\xcf\xf3f\xf6\u007fn\xed\x0eE%j\xb7:\xdb\xf8\xe6\x01\xf8/L\xc2\xec\x04\x8b\xfaa\u007f\x1e\x95\u007f\xf4\xca\xdc\\\x87\x91\xa6\x86\xb9\xaf\x1e\xf5\x9d\xe5\x1e\xcbm#\xb9\x94P\x0f쩽\x8fk\xb5\xdb\xff\"\xecpv\xb1\xb2@\xce \x1eʡ\xdf'\xa6\x1dx\x90\xec\xe4\xf3x\xc6Ҽ573\xa7\xba\x9c>I|`\xb3\xb10H\xd87`\xcb-\xb4\xd9ll\xe4_\x91v\xdczU\x9b/|\x0f\xedG{p,\xa2\v\xdfg\xcb<\xe3\xc5\xde\u007f͢\xa1G\"g\x8b\xc3\x15\xee\xc6H硪 \x9e\xeb\xeb;\\Yl\xb8Y\xbf\xfb\xa5$\xc9l\x06 \xceҺEu\x01\xc3^\x8f\x83E%rR\x19\x13\x04\xcc\xc27\x8d\xbb\x9d\xcd\x16\u007f\xb2\xb2\x80\xf2\x10\x92\xf6\xa4\f45\xdbG\xfa*\xc1\x13\xe7嶲\\\xe5!\xe4\b\x17\xad\x8a\x18۴\xf8s\xcdI\xace\xb1<\xf3\xd1._x\x94\x1f\x8e\xdc\x16\x1eBZY\xec\xf0!\xd4\xc2\xf6&뢝\xf5\x94\xb0\v\xbf\x82v\xedJ\x174\xee\x1bf\x8f\x16\x1e\vQ誸\xd3oq\xf0mT\x12c7\xba\x15\xaf<\xb0\xc6Q_\xc00\x8d\v\xd9M\x06\x90\xce@ \xe0n\n\x90o_\xab\x89\xde\x18>3D\x8cN\x8a\xb2\x80\x9d}\xfc\xf8\"\x130\xfc\xaa\xb3\xf6h\tw\"\xcaV\x9a\xab,`\xfd\\l477\xf2\x15\x1e\xf9ԇ\x98\x8b<_\xea)\x8f\x15\xb0\xd2m\xfeyBN\"UڶSL\xf4\xa6\xfb\xb0/\xa37\x81i\x98\xfa\xa3s\xef\b\x86+t\xa7\xaa\xe8e(_\x92\xa4\x17\xda\x12[\x12X\x17\xa8,`~a\xb00\xce\a&\xf9\x10\x1e\xdc\xcb\x02\xdb\xe2^\x98\x92\x98\x94\xb8N\xfc\xa9{4\xf5\xf8\xd0\xe1\xc6~\xfb\xe9(\x01\x93\xe5*\v\xd8DdnE\x98\x80Ʊyt\xb3c\x13\xfb\xcc\xf2wH\x8e\xc4\n\xd8v\xd1\x1f\x96 ڑ\r\xb5\x89\xcf/\xe7\xb5m\xb8]\xbb \xaf\xe7\tѕw\x96\xeeTE\x9c\u007fUR?\xe0\x10D\xba\\\xb7\xa8+`\x81&\xe1k\xf7\xa1)\x10\xf0R\x1cf\xaf7\x80G\xcd쟹g\xd1\xd3#\xd7\x1fL\x94\xeeIz\x1f\x94\x88\x13\xbf\xb2\x86>K\xbc \x110j+\xcbU\x16\xb0٢V\x1cCnC6ι\xb4\x8d\xa5\xf3\xa5\xcf\"\xe5\x02f\"}\xb3\xf2m\xa3\x8c\x04\xee\xf8R\xad\x1fW\b\u07b3\xe3\xfb\xf1\xfe\xe3\xf1-%\xd4\x1f}\xc2xEw\xe2\x850\xaf\xd3\xc0\x03\xec\xf5\x8a\xba\x02\x86\x9b\xbb\xe8\xab\xdf\x12\x9a\xb9(\xf8\xc0\xbcl\x1a\x85\xcf\xf4 N) \x8cш\xf1k\xc1#\x84\xdd\r\xa2O)\"`\x87\xe9}\x1d\xac:!\xb7\x95\xe5ƙFq\xa12\x88\xa3\xd9[\xb0\x1f\x1f(\x10\xfc\xf1\xb2\t\x13a\x01+,\xc4x\x9a>M\xec\xa2/\x18\u007f!\x1c\b_\x99\x04\xaf\xe6s<\x8aΥM\x93\xf4\xa0ƣQ\xf0\xbbO\xd6\xc5L\b\x1b\x13\xda\xdax\x9b\xbe\xc6\x11\xb0@\xde^\f\xacST\x160\x17\xdf\xedt;-\xe2L\xfc\x80\xc7a\xf6\xd0\xef\xec\a\xa6\anGSۇ\xfe\x9d\xdc\x1a\xa4\xb5\xa8\xa3\xfft\xb1\xd0\x03ۇ؍Kg\xe2O\x88\x93\xb8Z\xb9\v\x9d\xb7\xab\xb8\xb2;\x13R[I\xeeK:\x13\xbf\xc3n\u007f\x19z\n9!\xea\xd6s\xeeN\xccɪQ\x03n@\xa4\xab4?Ȟ72U\xf2\x0f\xdal\x9a#6\x1b\xfb\b\xcfi.\xb5\xefʠޱS\xa8\xd4\xd2^\x81\x84\x89\xc9\xe2\x95ɸ\x84\\\xb8yk\x80\tW {O\xb6\xc2\br\x1f\xda\x1cӕj\xdc]\xdf\xff\xed\x15\"c\xef\xfe\xc4\x1e\xabRW\x9d$I\xb9\xfc\x9e\x13a\x81\x14Fe\x01Þ\x1e\x8b\xa9mP|\xdc\xe8\xa1.06\xa5\xc8\xd5nn{\x00\xfa\x95\x9c\xb9\x1b\x9f\xe9\x8d\xe2|\b\xb3\x96Ͷb\xbf\x85\x14\xfad8\xd8QYt\xa8\xfe~\xa5\xce(\xb5\x95\xe4^\x14}J\x17\xf0\\\tK\xe8BO\x1f[\xf51^0k\xc68vd\xb4c<\x9e\xc6\x1c\\L\x95\x86\x844b\xe7\xf6\x1f\xcfJ/\x14\x9e\xbdt\xed\xd4f}zW((^\x99\x8cm\xa4\xb3f\xd3X\x85G\x02\x975\x97c\f\xc8Xt3\x8a}\x8e3v\xba\xac\xc48\x82\xf13\xe1\xc2k\xb1,I\xb0\xa5\x9f\x8c)\x04\xac\x17\xd4\x160`\xb5\x12\xbc\xa1\xebKf\xf3\x1eL3\x17~\x01J\xf8ۣv\xb4xgV\x8b\xa6\x02\xbe\xf9\xd6/ `\x80H\xb0\xc3\xf0*\x99\xcd{\xc0z^~W\x82g\x8f\x01sֱ\xf8G\xe3\xe0͆\xc5(\xd63 `\xc0j\xc1\xa3\xad\x86\xa9\xcc\xc0\xe2\x00\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01[\x0eJ\x91\xb6\x1cb\xc4\x01\xc0\xb2\x03\x02\xb6\x1cxz\xcdy\xda\xc5\xff.\x19\x00\x80š\xb6\x80y\xba\x9aM\x96\x81н\xed\xe0\xe9\"\xac\xf3M\xe2\xe2\xd2͉J\xa6\x18\xbdh<\x99\t\x00\x00\xef\x89\xca\x026\xcd[\x9dng\x9b\xb8\xa0\xa1\xcf4@\x17\xc0\x9b\xe1G=\x84\a\xfcZ\xba\xe5\x87 \xd4\x17\x00,;*\v\x98\x8b\xa7\xab\xaa\xf8x\xc1Ad\xedq\xb3\x15<\x1d,(QӚ\x8a\xcc\x00\x02\x06\x00ˏ\xca\x02&\x04\x16\xf4\xf2\x1e\xbaq\x98}\u009a\xf8\x8c\xbb\xb7\xd6Ժt `\x00\xb0\xfc\xa8-`\x84\x19\xb7\xc5J\x97\xb5\xf3\x99\\8\"`N~:A\x99\xd4c\x1c-(\xee!\x00\x00\xef\x81\xea\x02\xe6\xe5y\xde\xcc\xfaa\xd6n,\x11\xb0p\xa0\xa25\x82_[0\xe0^P\xe8C\x00\x00\x96\x8a\xea\x02\x86\xbd\x1e\a\x8bJ\xe4\xa42\x16\x1607/\t\xfc\xbc&\xb8\x8b\x10ڗ\xcc\b\x00\x80\xf7A}\x01\xc34.d7\x19@:\x03\x81\x80\xbb) \xf4R\xba-Iʤ\x1a>\xed\xd6\xcb=kM\x94\x01`\x95\xa1\xb2\x80\xf9\x05\xb9\x1a\xe7\x03\x93|\b\x0f\xcd1?HP*\x15\x19B\xdd\xc9L\x00\x00xO\xd4\x15\xb0@\x93\xe0\xd9~h\n\x04\xbc\x14\x87\xd9륚\xe6]s#Hx\n\t\x00ˏ\xba\x02\x86\x9b\xbb\xe8\xab?\xec\xb1\x0f\xf9\xc0&\xf9\xb5\xf6\xc3\x1b\x100\x00X~T\x160\x17\xdf\xedt;-\xe2L\xfc\x80\xc7a\xf6xi\xcaɯ\xb5\x80Z\x83 `\x00\xb0\xec\xa8,`\xd8\xd3c1\xb5\r\x8aj\xe5\t\xff\x00\xd2}+A\x99\xd4\xc3\xef\x19-\xd5x\x92Y\x01\x00\xf0\x9e\xa8-`\xeb\x83\xfd\bmmOf\x04\x00\xc0\xfb\x02\x02\xb6\x1cxF\xd7\xda3\t\x00X\x95\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\x80\x80\x01\x00\x90\xb2\xaco\x01+E\xdarg2#\x00\x00V+\xeb[\xc0<\xbd\xe6<\xad\xb0\xb4\x8f\xb7 \xfc\xebkI\x12\x00\x80Ռ\xda\x02\xe6\xe9j6Y\x06B\xab\x17:x+\xdb\xfa\x06n\x99n\r\xacȚ\x86\xbdH\x8c\aސ\xd6\x10ʓ$\x01\x00XŨ,`Ӽ\xd5\xe9v\xb6\x89\v\x1a\xfaL\x03lEV_S\x1b\xcdmZ\t\x05\x8b\xac\x9cj\xddx\x15\xc7&\x01\x00X\xbd\xa8,`.\xb6\xf6\xbd\x8f\x17\x1cO\xd6\x1e7\x130\x9b\x85\x06垷\xd8\x12\x94\\.$K?\x9fѸ\x15\x92\x00\x00\xacZT\x160\xcc:Y^!\x12\x91\xc3\xec\x13\xd6\xc4\xef\x11|N\xed+\x11\xdbV\"`\xbe\xec\n\x85$\x00\x00\xab\x16\xb5\x05\x8c0\xe3\xb6Xi$\"\x9f\xc9%\x06\xf5\xf06\xf5z\xfd^[\x937I\xc9\xe5`\x1c\xf5\x86\xd3g\xd2g\x14\x92\x00\x00\xacVT\x170/\xcf\xf3f\xd6\x0f\xb3v\x87\xa3\x12\xcdt\x93ܮ\x15\x91\f\xbf\xb6`\xc0-D\xab\xc4\x03\x91\xde\xd8\x00\xc4\xe4\x00\x80Տ\xea\x02\x86\xbd\x1e\a\x8bJ\xe4\xa42&\b\x98\xbf\xdb\xe2\xf48-\xdd\xf3\xc9\xca.\aw\x11B\xfb\x84\xa4\x1b\xdd\n\xe5J\x92\x00\x00\xacV\xd4\x170L\xe3Bv\x93\x01\xa43\x10\b\xb8\x9b\x02\x01\xea\xc4\xf7\xb3܁d\x05\x97\x01\x9fv\xeb\xe5\x1e\xd1c\xefF-\xa1lI\x12\x00\x80Պ\xca\x02\xe6\x17\x06k\xe3|`\x92\x0f\xe1\t\x98\x1e\xb2܇\xa6@\xa2\xb2\xcb\xc3\x10ꖤ\a\x14\x92\x00\x00\xacV\xd4\x15\xb0@\x93\xe01'R\x15\xf0R\x1cf\xaf7\x10\x12\xb0ѕ\x11\xb0\x88\xb3\xabN\xe3SH\x02\x00\xb0ZQW\xc0ps\x17}\xf5[B\x13&\xc4i\x14\xe2\x10r\x85\xa7Q\x04\xf2\xf6*$\x01\x00X\xb5\xa8,`.\xbe\xdb\xe9vZę\xf8\x01\x8f\xc3\xec\xf1b<\xd3bq\xb8\x1d\x96\x96\x95x\f9\x18\x11\xb0\xcbhT!\t\x00\xc0\xaaEe\x01Þ\x1e\x8b\xa9m\xd0/\xeeP\x17X3I\xf8\x87\xda\xccmC\xfe\x84%\x97\x03\xbfg\xb4T\xe3\x11wl\xe9'ql\x12\x00\x80Ջ\xda\x02\xb6\xba؏\xd0\xd6\xd0\xca\x13-\x9a\x8a\xf9\xd8$\x00\x00\xab\x98\xf5-`\x9e\xd1\xf0O\x1e\xbd\xd9\r\nI\x00\x00V3\xeb[\xc0\x00\x00Hi@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0\x00\x00HY@\xc0V3\xc35\xaf1\xf6\x16\xb4c\x00\x00\x94P[\xc0<]\xcd&\xcb@h\xb5S\aoe\xdb\xc0x\xbb\xa9\xcd\x19\xbf\xd4r2\xb9\t\xe5\xc5dz\x8fmI\xdf\xfb\x81և\x9d\xaa-6\xd4?2\xbc\xc6_r\x1c\xa7\u007f\x91\xcc\\\xc2\x1d\xae5H6\ri\xf0\xe3r\x00PDe\x01\x9b\xe6\xadN\xb7\xb3M\\\xd0\xd0g\x1a`+\xb2\x06\xac\xe6Q\xf7\x03ӃD%\x97\x8f\xc1#\x9a\x98\xbc][\xae\x1fI_آҏ\x9e$>>V\xfc/\xf7\xfaNp\xdc\u007f\xe0\xef\xed\xf6Nn\"\xb1\xb5\x94N\uef90\xb0n\xbc\x9a\xd8\x12\x00\xd6)*\v\x98\x8b\xa7\xeb\xd7\xf8x\xa1\xb7e\xedq3\x01{h\xa2!m]\xa6\x85)\xc6\a\xa7N\x13\x9d\xe3EWq`\x81WSs!\xe1\xe1\x1fJ\xce\xcea<[I\x04\x8c\xf0x\x11\x02\xf6B\xd7\x18J\x9eф\x97\xfd\x01\x00 \x82\xca\x02\x86\x99*xy\x0f\xdd8\xcc>aM|+[)\x1f7=\x88Sh\x99\x89\x150\x17\xb2*\xd8)S\x95X\xc0\x1a\xf5\u007f\xa1\x9b\x0e\xee9\xdd,F\xc0\xae\x18fCI_vE\"K\x00X\xaf\xa8-`\x84\x19\xb7\xc5J\xddK>\x93K\f\xea\xd1fc\a\xda\xef&*\xb6,xʳ\xb3\x0e\x88CȦ\x82\x8c\xdcj\x1f\x8dՍ\x18ղ\xdc\xf1\x8d\b\x9dq\x95oM\xdf#]\xacu\x98\x13\xa8\xa1;\xf6\xdaú\xb2\xda\xc3A\xd9\x19*\xaf\xb0ͫ\x8e9\xba\t\vX\xb0\xb3F_\xd5\x19\x8c*\x16\xbc_S\\ySЭ\xb9\xe2p\a\x8ct\xc1\xd2W\"^\x00\x00\xacvT\x170/\xcf\xf3f\xd6\x0f\xb3v\x87\xa2\x12\r4\xb1\xa8D涄%\x97\x01Wf\xae\xb9\xfd\x17HC\xd3\x15iǭW\xb5\xf9DZ\x1f\xdaZP\x9d\xcd\xe6\x91\xe5\xceX\x9a\xb7\xe6f\xe6T\x97#\xe9hnv\xc2^i\xb4\xdb\xed\xb4{\xf5t\xf7\xc5\xfe\xb1{e\xdc;\xe9\x19\xe6\xb8\x0e\xe9nX\xc0.\x16}3\xf2M\xd1ŨbW\xb8\x1b#\x9d\x87\xaa\x98\xae=\xe5\xec\x91r\x03\x92\xe0o\x00\x00\x84P]\xc0\xb0\xd7\xe3`Q\x89\x9cT\xc6\x04\x01\xf3\x99\xad\xde\x19O;oIV\xf6C\xf3\xe96r\r\x81\xed\x1a\x92\xb4\"3\xa6A\xd6X@\xee\xf0\x10R\x96\x9b\x8fv\xf9\xc4A\xb0\x84\xf0\x10\xb2\xf3\x10\u0560\xce\x12Y\x0f\xec\x05\xf7\xadt7$`#\xdc\x18y\x1d\xe3Fdņ\x99\xd7\xfe1\xd7'\x98<\x8f\x94s\xa3[\x18\x00\x80h\xd4\x170L#@v\x93\x01\xa43\x10\b\xb8\x9b\x02t4鵒~٠U\xed\xf9N>\xc4\xd3\xcd\x19\ry)\xdd\xe6\x9f'\xe40gSX\xc0d\xb9\xf9\x8a\xae\xf4\xb0\x80\xbd4\x1c\xbdq\xefipNvtN\xa7\xd8\x03\xbbr\x82mN|)+V\u007ft\xee\x1d\xc1\xc0F\x9d\xfd\x9cdƅ[\x90P\x00\x00d\xa8,`~an\xd58\x1f\x98\xe4CxhΌ7\x80\x9b\x06\x12\x15]\x06\x1e \xe6|;\xa7!/\xdb\x05\xc7\x17\xdaOs\xc2\x02&\xcb\xcdߡTIĉ\xff\xf6ޅJ\xae쎢\x0fln\x8cmB\x02f<\xcb6\xb55\xb2b'D\x8f\x1a;8!\xf5\xf7\x0f!\xb5\xdf\x1b\x00H\x05\xd4\x15\xb0@S/\xdb>4\x05\x02^\x8a\xc3\xec%ʅ\x99_\xdc%H\x99\x8ax\xd1u\xbaaN\xfc\xf2m\xa3\f:\xa1#\"`\xb2\xdc\xfc\x03J\x950\x01\xbb\xf7\x92\x88S#Ѡ\xb7}\xfaN\xd9\xe1F\xfd+\xba\xe9\xe3^\xd3M\xb8\av\x94\xf9\xec\x8f^\x94\x15\xab?\xfa\x84\xc1J\xcc\x16\xb5Fj\xa9\xd3,pR\a\x00\xac+\xd4\x150\xdc\xcc&L\xf8-=\xe2\xbe\xe0\x03s\xf2D |ͽq\x8b-\x17\x059\xe4Į\x9fhH\xb2\v1\x0f\xdc\x17u\xf45,`\xb2\xdc\xfc\x83Ju\x18\x8d\x18\xbf\xa6n\xabV\xea\xd1\"\xfb\xd7X\xb6\xbba\x92m\u007f(9OF\x87A\xe3Q\xb6\x17\xf1\x81Q?W\x1f-!)6&x\xbf\x1ao3\x9b\v\x95\xe1\xbe\\ o/\x06\x00 \x06\x95\x05\xcc\xc5w;\xddN\x8b8\x13?\xe0q\x98=TB\xf8!\xf7\xc3&\xab\xfa\x9d\fGFNݙ\xac\xb4\x8df'ƧP\xa9\xa5\xbd\x025\x85\x9eB\x0e\xb2\xd1n8w~Ж[h\xb3M\xc6\xd4\xd1Z\xd4\xd1\u007f\xba\xf8%U\xa2\xe2\xd6\xe1\xfe+\xdc#\x96\xbd\x0f\x89\x9a3\xa27\xde\x1f\xae\xd5\x11\xe1zIg\xe2w\xd8\xed\xc4\x16\xd7s\x8dÍ\\=\x96\x17k\xdc]\xdf\xff\xed\x15A\xc6\xf0s\xeeN\xe8\x1c\x97\xd1(\x06\x00 \x06\x95\x05\f{z,\xa6\xb6A\xbf\xb8C]`\xcd$1j1[G?\xd0O\x0f\x17\x85k_\xd6֓\xe6\x8d\xe8\x18Iw\xed\xd4f}z\x97\xf4\x0f\xb3\x98\xdbk\xa3\xf0k\x81P\xeex\x1aˍ\xed\t\xcd\xdd\xf8Lo|L\x12\xf7\x8d\xb7\x0f\xeb\fFA\xbf\xb0Yˋ\x06S\xb5\xfa\xb2\xb3t\x1e\xfeE\xd1\xc5Eǜ\xc1\xce\x13\xfa\x13l\x1e\x98\xac\xd8\xd8\xe9\xb2\x12\xe3\x88X\xb0U/z\xc1l\xe9'1\x00\x00\xb1\xa8-`\xc0\xc2\t\xdeб\xbeX\x8b\xa6B:y\x16\x00\x80\x10 `\xab\x98`\x87\xe1\x15\xc6\xdelX\x8c\x02\x00\x94\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 e\x01\x01\x03\x00 eQ[\xc0<]\xcd&\xcb\x00]\xf9k\xc6\xcc\x16\x946\xb3\xa5u<\xed\xe6.O\xe2\x92+¨\xb0\x88N\xda\x03awr\x13\xca#\x9b#$+\xc3\x15k\xedؓ\x91]ڛ=\x1d{\xe4C\xe1.\xcf\xc9\xf8\xa4N\xfd\x85\xd3\x00`u\xa2\xb2\x80M\xf3V\xa7\xdb\xd9F\x174\xf4\xf1\x0f=\x04\xb6X\xb3\xdbds\xd9L\xab0\xfa\xf4\xfc\xa0\xedkt\xd9\x16Z\xc0\f\x0f\xb2\xe5\xa7\xdd6\x92\x1b\x1b\xe7\xac+c\a߲\x1d!g̑\x0f\x85k\xf3'\x97\xac_d~\x02\n\x06\x00\f\x95\x05\xcc\xc5S\x95\xf2\xf1N\xfa\x12\x16\xac@3\rY1м\x12K\x1a&eH&U\xa1(\xdeC\xb1\x02\xe6\xcd\xdcOtηm\x19\x05l\xffV\x1a\xdf֙\xf1E2C\x00X\x1f\xa8,`BTE/\r\xdf!\x110\xa7\x89ޗ>\xd3\xf2\xdd\xf9\xef\xc1\x82\x05\xecT:\x1b;^B\n\x83\xcb\x0fD\xdeV\xb69\xa0\x18\x1e\t\x00\xd6\x1fj\v\x18a\xc6m\xb1\x06d\x02\xd6s\x97m\xee\xaa\x1c\xd5c~˦/r\xb2{\x8fg\x15\xd2\x11\xed\xc1lMξq\x92\xed܈\xd0>\x9c\x83P\x16\x1b8\x86\xa5\xcaS\x9e\x9du\x80\r!\xa5\xb9\xb8\xa9 #\xf7\xffo\xef\xfcc\xe28\xee\xfe\xff\xfdg\x10\xac\x8c\x0eN\x1cB:\xa4\x039\b\x13Y\xc9`|',\x1cS\x041\x17\xd1`\x93\xafj\xe3\x1f(\xa9\x12\xfb,\x13\x9b\xa8NS94D\xc6`\xf2\x03\xc5%ND\x83c\x14\x1axL\x1d\x91\x1fv\xb8\xa8\x8ay\xda\xe2|\x85\x1e\x92HϵV{\xcf#5\x8e\xb1]\xe1m\x1cR\x82}\x86Z\xa3\xef\xce쯙\xe5\x8e=(\x06\xce\xf9\xbc\x12\xf9\xf6n?\xf3\x99\x99ݝ73\xb3\xb3\xfb\xa9\xa1\xba\x9c͂Gʡ\x034\xd9\xe1\xfb\x1c\xabiȣ*\x94\xd2X\xe3q\x14\x8e\b\x9b\xb2\xdcS\x98\x95\x92\xb1\xce-[iv\xb17Q\x8f\xa4k\xf1\xdc҅qu\xaf\x1a\fes\xf6\xact\x00\xf0\x83d\xc9\x05,D'\xeei{\x0f7v\xbd\xd2\xd8\xdaC\xfb^\xedj\xd0\xc3ޥ\x0el\u06dd\x8ej֢\x8czW\x03\x8d\xc1\xed\xefn\xf3%\xf5+\x03ھ@R\x9f܌Z>dF\xbaT\r\xa5{\x9a\x8f?\x88$Y\xf8U\xf6'Uw\x1cʸo\\\x1eKj0=o\x96\xea:\xea\xa4rE\r[\x93QF\xe0@z\x89\xb0\xa9$\xdf\xfcJWc\x06\x9a\xf5\xaa\xe8\r\xa8\x90~\x8c5\x1fRi\xd6g\xdf8.\xb9\xcag\xff\b\x00?D\x96\\\xc0\xe4\xd0\xe8`\x9b:\x89\xdfrv$\xd8vLi\xa1-\xfdlO\u007f\x8bM\xd2E'\xb3\\\x11\xae\x0ey\xb3\xd2w\n\xb7QU\xcde\x11l\xe5\xcd\xf9\xa1,\xfd=κT\xad\xc9V\f\xc6WK\xe2\xaf\x1d\xa8\x99};&\x8f S\u007f;Q'\xfb\x97\xf6,%\xa7҉*ϐ\x85\xcd\xc3\x19T\xba~\xe1\x9c5\xeb7\x1cP\xe3\x1e}9\xac\x12\xe5\x8e\xe6\xf8\xe6\xd4\x159\xd6\x06\x80\xa5g\xe9\x05L\xa6q!\xbb\x94v8H;_\x97\x9a\x15!hg\x01\xb2\xe5\xee\xf6\xb9\x93->\x99\xc7\xe4>\x14\x96kK\x95\xed\xd0\xe1\xc2\xect\xb4\x9a\xfd~i\xb5˧\xdbhR\x15FllW'\t\xbfʥ\xd9cW\x15\xb2\xfc\xf2X\xb2\xd9\x03\xf3粏\x9c\xcd\xca?\x12\xfd\x87\x05\xff\xe66G2ݏ6~8\x1e\xa5{\xa52\x8ctfߚ}T\x0fZ\t\x00?x\x96X\xc0\xc6\xd4.\xc7\xd9F\xa3\xebѣ\xa8\xd6I\xb5E\x1e\xd7\xc3\xdd.\x19\x99\x9dr\xbf$\xcb;\x14\x01\xebweն\xf7ܯ\n\x98\xfc\n\xea\xd5m4\xa9:\x83\x98ʪJd\n\xd8jMg6\x18s`cJ\xe7k\x8d*\u007f\xeb\xf2\x95\u007f\xa4=\xb2>\xf7\xcfm\x86\x1b\x1f\xcaA\xae\xd8\xd1:z:Tz\xac;¥\xc9\xcd\xd1\x12\x00\xc0\x0f\x91\xa5\x15\xb0\xf1\x16u\x9e\xfeæq]\xb5\xba;hdnuRl\xc9GF\x9c\x80\xe5\xe4\xd32\x94\xa8\x026\x9a\xb9\xcb\x1d\xd2l4\xa9\n!:'/['\xf1˳\a\x18!\xe3.d\x1b\n\xc9~u\x96\xdd\xcdz`4\xaa\xb7&`\xc6\xe6\x99\x1d\xca?\xe1c\xa9\x87\xe5y2z\x9fs\x96\xa6\x01\xc0\x0f\x96\xa5\x150\xb9\x95\xce\r)CH\xa5\xaf\xd5\xc1\x06\x8c\xa1\xe6\x0f\xe9:0\xaak\xddK\xbf\x0e\x8c\x13\xb0,:\xb7>\xbe\x9a\t\xd8X~\x9d\\\xb5V+\x8d.U\xf9Y4\x86\xf8*I\xfc\xb5\x13\xb5я]\x01\xba\x0e\xacD\x19\x12\x8e\x17\xb8\xe9\xcc\xd81\xe5\xc7cl\xac\x17U\xc0\x02l\x92L.\xa8\x92-\x8c\xd4ώ\xfd\xcdq6\xd33\xa4\x94\xef.\xae\xf5\a\x80Db\x89\x05l\xa8\xb1+8\x12d\x93\xf8#\x8d\x9dC#g\x9a\xe8\x8a\ny\xa4\xa9{\xb8{\xe9W\xe2\a\x9d\r\xe1c)gå\xf7\x8f(\x92\xf2\xd0\xe1\xc0}(\xa3\xbe\xefRoUƈ<\x9c^\xd3;Ư\xc4\x1ftd\x05\xea\x9cI\xc9\xcdAu%~CO\x0f-\xf0\x0eT\xdav\u070f\xe8\xfd\x87NG~\xf3\xf1\a\x93\xe9\xe0\xb3<iGǎ\xa4r\xa5\xc7ԓ\xb2\xb9O\x1e\u061c\xd23\xcam*\xb9\xa5\xed\xe9h\xf7\xa3Y\vG|Qb\u007f\x9b\x9cH\xcd\xec\xe8\xe9\xe9\xf1g\xcda\x03\x00? \x96X\xc0\xe4ѓmM\xed\xea\x939_v\xb56w\f\xaa\xfd\x9c\xd1Φ\xe3\xa3s\xa5\xbb\x1b\x8c\xbb\x10jMG\x8e6:\x855\xde\xe0\x912J\x9b\xb3\xa5\x82N\x84P\x8d\\\xad\xfc\xdb-\u007f\xc8=\v9\xe4s\xba\xb75'\xa3*\xf6,$\x85\xce\xfd˝\xf7g8ר\v\xd9\x06\x1ft\xb8|\x83\xcc\xf5\xcfW;V\xffb\x9c.\xfeB(eС\xfc[\xc5m\xca-\x05\x81\xac\x94̂\xd9\vߚ3\x1ag\xfdfR\xa0e\f\vY\x01\x80\xb1\xd4\x02\x06\x00\x00\xb0h\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80\x01\x00\x90\xb0\x80\x80% K\xfe\xd6\x0e\x00X\xa1\x80\x80%\x1a\xa3~\x17\xda`g\x04\x00KD)\xca(_\xf2\x17\xf9\x99\x80\x80%\x18\xe399\x8d'\x97\xfc\xc5C\x00\x10\x83\xd1\xee朌勴\xbc\xd4\x026\xda\xd9\xda\xd4\xd6K\xeb{\xa9\xb9\x91\xa2\x87\xdd\xe9^F\x15\xffw\b\xadu\xaa/\x86~\xb7\b\xab\x14\xbdk\x93\xe4\xdf\xe2\xac\xfa*\xc4\xd7iN\x0f<\xf2\xd6u\xf5\xd7\x0f~\xf4\xdb\xd8I\x9e\xc3\xf8\x1d}\xfbgJ2\xef\x17\x16\x83\xf7\x1e\xc0\xf8S\xf9\x13e\xcfWr<\xbc\xee\xfd\x15\xfb\x14\x9d\xcdY\x86\xb8\bU\xb9R\u05c9\xe3c\xfa\xe6\"Ǽ\x03m\xbe\x8a\x8bhY\xde\xf3\xe2WcX\xfcQ;Y\x9f\xaa_\xbf(\xc2?\x96c\x1c\x1d\x85Ϟ(\xae\xd8\xffQ\xc5_g\xef\x89\r=\xa8\x18oz\xf2\xbfb\x19\xbc\xad\xec~U)*\xc6o\xc52\xf9\xb7\xb9\xfbդt\xa3\xb3v&w\x8d%\x16\xb0/\x1b;\x82#\xc1v5*ч\xa3\n!}G\xff\xdc)\xef\x12\xdd\x03v\x166lˮObu\xf8\x15>w\xeeM\xfc\xfa\xb9s\x0f\xfc\xca.\xcd|\xf9\xe8?\xcd\xed~\xf5\xdd\xfc\xff\xf3+\xfc\xf6\xb9\xf7\xf6\xe3\x97\xd4_\u007f[<\x87j\xfe\xe9\\\xd1K\xe6\xb6R\xc8O,\x06_\xbf\x8b?\xba\"_y\xe4\xb1?\xcaq\xb1\xa5h\v\xfb\x14\x9d\xcdY\x86\xb8X\xeb:\xbc9U\xfcc\xce\xde\x1d9+\x86\xb0\x1d\u007f\xd9\xefݭ|\xec\xf6\xee\xffK\f\x8b\xbf\u007f\xc2N\xd6'Wԯ\xd7?\xf9\xd9z9\xc6\xd1Q\xa4\xb9\xf8\xff\xbe\xf5\xce\x16\x8c\xff߬=s\xf0\xf5'E?;\xf7ћ\x8fx?\x8ba\xf0\xd5\xdb\xf8տ\xca\u007fUNd\xec?\x1b\xfc\x99_\bw\xbf\x9a\x94(Q\x9e\x97\x8c%\x16\xb0!\x16͖\xbd\xfd\x9e\vl\xabt\xccږI\xc0\xf2J\xed,l\xc8\v\xc8\x0e&)\xaf\x17\xc9\xf2\xa7\xf4\xb2\xf0\xben\x97f\xbe<\xb6\xcf\xdc\xd6/\x96\x0f\xb0\xd20\xae?\x87\xb5?\xf0ף$3Y\xff\x92\xb9\xad\x16R\xe4\v\xfc\xb5,\xbfT\xf6\xdf\xd6ߣ\xf35\xdeO\xed\x19\xbc\xb3\xb9\xcb`O\b\x1d\x92\xc7g\x0fF\x16\xd2<\x8e<\xa1t&\xff\xc7\xfbđ9l\xc4\xe3\xf0\xd2\xfah\xbf2\xfeg㓊\x00|\xfd\xc8|[6;\xea_W<\x11k\xffg\xf8\x03\xe5ߏp,\x85\x93\xc53\xbf@\xeez5\x17v\x86\x16\x8b%\x160\x99]\x9f\xa1\xc6QQ\xc0\xba\x1b\xbb\x9b\x96G\xc0\xee{\xc8\xce\u0086\xdc\xe6\x11Ć8W\xbe\xd0.\x8b/\xaeإ\x99/[c\t\x98|e\xe3sѓ\x88\xc4#`\x1f\x14}d\xfd9\x06\x1f\xe1?b\xdd6\x8a\xb3\x053\x14=^\xdcB\x9aǑ\xfd\xbbߑ\xdf~b\xff\xa2\b\xd8\x11\xef\x9f\xe9\xc7\xeb8\xe6h0:\xeaQ\u007f\xc9\x1bK\xd8\xe3\x10\xb0\xadK(`\v\xad\xe6\xc2\xce\xd0b\xb1\xd4\x02\xa6pi\xa4\x8d\xbe\b\x9f\x17\xb0Ka=\xb8\xed\x92ҡ\xbd\xa1\xf9>Y>\x9b\x8cP\xddP\xb9;\xb5\xd0\x1a,\xbb\xd9\xc5^\xf2<\x92\xae\x19\xa7\x8b3\xe8\xeb\xea6\xe4*\x89\x93\xd9\x14\x9evY\xfc\xb1\b\xe3\xa3_<]\xe9}\xe2\xef\xf2W\xfb*\x8a\x1e~\x92\x8e͞\xc3Eo\xfd\xf2\x11\xef\x13\u007f\xa2&\xe7\x9ex\xb8\xa8쉇\xaf\xd3_\xdf|\xb6bӓlJ\xe2\xfa\x9b\x8fy\xb7\xbey]\xf0\xf0[m\x1a\xe315\xbfnA\xc0\xe4\xe7ʔ\xb1\x88\x17\x1b\xb3\\\x86_.c\xa5)=\xff\x8c\x9e\x05w\xed^\u007f\xfb\xb1\xe2G~I\xfbR\x8a\x80}\xb1\xf1U\xeb\xaf\xe6\xa6PH\xf9\xa5\n\xb9BWDݙY\x86w\x8c\xa9\x9dw\x04gf\xc9d\xe3\xa0r\x8ce\xa8\x87\xb7F\xd9\x0e?\x94)e\xf9\xf4y\x15\xa3y\xf4\x14f\xa5d\xacs\xb3\xed\x96|\x87\xa7&\xf6\xd4\xf1\x91\xfdo\ue55fx\x93\n\x98y\x1c>S\x0e\xea\x93\xd7+0\xde\xc8\xfe\xc4\x18\xc7\xe1O\xfb+6\xee\xfb\x99\xb5e\x9bE\u007f\xe4\x19\xf6\xc3_^\xbf\u009d!\xeelF?\xb1\xba\x80\xfd\xaa\xe8\n猿4x\x013\xfcr\x1e\xaa6\xf9\v\x00\x00 \x00IDAT,g~\xd61\xfb{Yё\x8a\x8a\x8f\x9e߸\xf3\xeb\xe5\xac&\x9d\x97\x9d\xfdn\xf4\xa5b\xc9\x05,D'\xee\xd5(j]\xaf4\xb6\xf6\\\xd2~_\x0e\x01\v\xf7\xf6x\nzzz\x14\xf1\xb9\xd4\xd6\xea\xf6\xa4gՔϊ$\xbb\x01\x15ҏ\xb1\xe6C*\xcdb4\xda@\xbat\xe6꺂>6\xf7\xac]\x16W\xdey\xe7\xe1G\x8a+~\xb9\xff\x81\xffV\xae\xc2g?z\xe7I:\x8b\xfa\xd9;E\xf8G/\xfdj\xe3^\xc5\xe2\xf7\x0f<\xfd\xee\ao\x95ῳ_\x1f~\xf5Շ\xd9T\xc9\xd3돾wt\xfdӂ\x87\xaf?9\xf7\xc8\xces\xe7\xceѿ\x8bW\xbf\xec\xces\xaa\xcdV\x13\xb0\xb7\xe8`\xee\xd3s缪\xa2\x98~\xb9\x8c\x95\xa6\x84\x1f{\xe7\x9d-\xdal\x8cq\xed>\x83\x9f\u007f\xef\xcd\x1fm\xbdN\x05\xec\xaf[\x8a\xafX\u007f57\x85Bʻ\xf7\xc9\xfbv\xabƦ3\xa3\f_\x9f\xdb\xf8\xd2_忾\xb4\xf1\xdc\u05fc3\xaed\xb2qPy>\xec9\x86\x02==\xa32\xfd\xc3\xe2\xefn\xf3%iW\x84.`\xfdh\xf3+]\x8d\x19\x88\xfe\x85\xf1'Uw\x1cʸ/悸#\xfb\xffT\xfc\xbf\xde?S\x013\x8f\xc3\xf5\u07fd\x84\u007f'\xbf\xfd\xc0ۿg6zѿ\xd8\xf8\xc8ۿ}\x02[[\xb6Q\xf4+\x98\x9b\x130\xce\x10w6\xa3\x9fXM\xc0\xae?\xb6Ep\xc6]\x1a\x9f\xe1\xf7\xae\\\xb9\xf2\x1e\x16\xce<\xe7\x81?\xf3r\xb4c\xf6\xd1F\xfc\xcbݸ\xecղח\xb3\x9a\xf4\x8fO~\xef\xc82-N\\r\x01\x93C\xa3\x83m\xea$~\xcbّ`\xdb1M\x0f\x96C\xc0da\by\x1fZ\x1b\xd6Ƹ<\xc3\x015\xd0ٗ\xc3*\x96\x90f\xf5\xa8Q\x0e;Ԡ\x1e\\\xc7|+\xde\xfd\x95|\xfd+\xa5=\xbf\xa3\xb4\xe3\xeb[\xe8Y\x97\xd7oT\xfez=\xfd#e\xeb\xcd\x1f\xd1S\xff\xe6F\xf6\x87\xbaR1\xfb\xeaa\xe5\xef\xec{\xecO\xf2\a\xf8=\xc1\x037\x90ؠtQ\xb4a\x96&`\xefi\x1d~M\xc08\xbfB\xc6?V\xd4\xe9\xca#\xea\x9fr\xbd\x90\xbf\xc5o\xb3o\xefP\x01\xdb\xffȏ\u07b4\xfe\xcamr\x85\x94\xaf\x17\xbf.\xbf^\xac\x8d\x8b\xf8\xa1\x88V\x06\xf9\x99\xfd\xca?\xfb\x9f\x11\x9d\xf156\x0f\xaa\x801\x84\f\xb7ѳ\x90\xab\xadv\xd3\x05\xecp\x06\x95\xae_8ǩ\xc25\xb3\x1d\xc7f;Q9\xb2_\xde\xf2\xdcc2\x150\xfe8\\\u007f\xfa\xb1\xbfT\xe87&\xf5\xa2\xef|\x84\x19XZ\xb6Y\xf4/\xf0\u007f\x18~\xf93d\x9e\xcdX'\xf6\xa5+_\xffq/M\xc1\x1fI\xf3\xc4~\xa6\xf5\xb0>\x13\xfc\n\a\x8a\x1fBF9f\x15O+)\u007f+?\xfd\xecrVS\xe1\x84r]\x1a\xa1엖\xa5\x170\x99ƅ\xec\x92\xe5\xf1A\xda\xf9\xbaԬ\x8d\x0fV\x80\x80Is-\xaf\x1aF:\x82U\x1br\xd6\xc8\r\x99ڸ\x93\x13\xb0\xf5\xfa\x8c\xf8_\xde|\xa2r#f\xb7\xed\xd8_X6\v\xf1\xdf\x15\x95Ͽ\xf5\xfb\xeb\xacӳ\x9eMԼ\x89\xffG~F\xbd\xb9\xb7\xe5g\xa2\a\xf32\x1e\xe9l\xcc\x11{`o+\xc9(\x9ax\xf0~\xf9\x8c\x8f\xd2\u007f\xdfTm\xf5B\uebfc\xf2w\x85\x8ag\xa8\x80y?{\xab\xec+˯\xdc&WH\xf9\x8f\xf8\x93+\x9f`\xed\x86e4\x01\xfb\xc8\xfb\xb5\xfc\xb5\xf7#\xd1\x19_\xb2\x18\x98s`\xa1Å\xd9\xe9H\x8b\x92\xae\v\xd8H\xa6\xfb\xd1\xc6\x0f\xc7\xe9\x1f\xbc\xd2챫\nY\xfe\xa8~d&`\xbf¿b\x02\xc6\x1f\a\xf9\xcaֲ'\xf5))\xad\xe8_\xa9\xab\x18\x8eZZ\xb6Y\xf4+Efׄ?C\xe6ٌub\xd9:\x8a\xff\x90\xc5#i\x9e\xd8\xcf\xf0\xaf>\xfd\xf4\xd3\xd7\xe9\x89\xe4\xfc\n\a\xcaf\x0e\xac\xe2\x1d\xa5\xbc_\xd3\xda.c5\x95?8\x19\xee\x86\xe5Z\x9b\xb8\xc4\x026\xa6v4\xcf6\x1a\x1dΞv\xf5s\x05\b\xd8\xdc\xc1\xcaz:T\x84\xc0\xd8_:j\xbaW\rg\a\xb4\xaf\x9c\x80=\xa6\xff\xf4\xa3\x87\x8f\xbc{n\xb7\xaa#\xb4\x85\xab\xd7\xc2Wo\xed{\x04\x97\xfdʜ*9\x87\xffS\xde\xf9$K\xf2\xc4c\x82\a\xf12\xeeA\xea\x81\xd2\x04\xec\xc8F\xf5g]<L\xbf\xb32fY\xc8f!\xb7h\x1d\x80'\xa9\x80\xbd#\xff\xfd\x91#\x96_\xb9M\xdeÛ\xecG\xb5\xbf\x16U\xc0\xfe\xbe\xe9]\xf9ݲ\xeb\xa23\xbe\xc610\x04\xacߕU\xdb\xdes\xbfE\xc0\x94>\xfbC9\xc8EWݭ\xd6\xfe\x96\xc4|\"Ai\xd2\u007f9\xf2W&`\xfcq\x90\xe5w\xcd\xf2jE\xff\x14\x9f\xa3\x1f\xd6\xd9m\xae\xe8\xda\xe4\xd0\x15\xa5W\u009f!\xeel\xc68\xb1\xcf~\xfa\xe9\x17\xd7-θ\x13\xcb́\xf1~\xf9\x03e'`\xefɟ\x16\xb1\xda.c5\xe9\x19꒗\x8b\xa5\x15\xb0\xf1\x16u\xb6\xefæq\xf9\xa4z\xb5vk\x17\xedr\n\x98\x1aR\xf7\xbe\x12\x1b\xdb(\x1cG\xc3r\x89;]\x1fwr\x02\xa6_y\x8f<F'H\xf7Y\x04\xec\xd3#t\x9a\xfd\x1d/\x95\x81\xf5\xcf\xd3}o\xe1\xaf\xe4g*\xe9\x05q\xbd\xf2i\xc1\x83\xb6\xf9\x96\xfaw\xdbr\x17\xf2G\x9a\x95&\x1e\x9c_!c#\v\x99\xff\xe3\xfb\x9f\x8c\xbfh\xcb(\xde\xf3\xfe\xb7\xf8+\xb7\xc9{\xd8\xf7\x98\xd2o\xd0\xef\xefG\x130\xf9\xf9\xbd\xf2\xde\xe7-Y\xf05\x8e\x81!`9\xf9\xf4\x80\x96X\x04\xec\xcc\x0e\xe5\x9f\xf0\xb1\xd4ò\\\x9e=\xc0\bE\xf5#\xabMZ\x81\n\x18\u007f\x1c\xe4?U\x1cy\xf8\u007f5\x1b\xad\xe8\xff\xabj\xf1ӳ\xba&Fяx\xd9j\xb2w\xf0_\x853\x14\xb5e\v'V?\x1e\u00914O,'`\x9c_\xe1@\xf1g>\n\x15\x1fȟ\xaeWk\xbb|\xd5\xfcA݅l\xed\xa4\xff\x8e\xb5\x9d\x94\xe5\x0e\xd6\xf5\n5\u007f\xa8\xeeY&\x01+(P\xbaQ\xa8\x8dn\xc6XQ1R\x1fe\xbaF\xa7\x1d\r\xc9\x1f\xa2Ry\xdc͌\xa2\b\xd8\xc3t\xe3\xfaV\x8b\x80\xbd\xa4\xces\xed\xa4\x8b ֗)\x97\xdeו;\xe9\xd4\x03\x9d$yG\x9b\x033\x05l\xa7\xb2\xef\xaf\xda}FQ\xc0\x8e\xe8C9M<8\xbfB\xc6\x15t\x0el\xcbNf\xa3\x17\xf2\x03\xd5\xe3\x91W5\x01\xbb\xbe\xf3g\xe2\xaf\xdc&WH\xb9\xe2\x97\xca?\xbf\xac\x90\x05g\x14C\xc0~\xe7\xfd\xb3\xf7w\x96,\xf8\x1a\xc78\xa8\x86\x80e\xd1?%\xe3\xab-\x02\x16P\x9fA(\xa8\x92\xe5N\xf5\x8c\xedR{\xbeÁY\xab\x919\x01\xe3\x8fÕ\xc7^\x92\x9f\xdbm\x99\xbe{\xecae\\\xfc_^K\xcb\xe6\x8a\xfe?\x1b\xf7\xd2\x1bs;+\xc53\x14\xb5e\v'\xd6\x100\xfeHF\x150ίp\xa0\xf83\x1f\xe5\x98q\x02\xb6|\xd5\xfcA\t\xd8PcWp$\xc8&\xf1G\x1a;\x87F\xce4\xd1\x15\x15\xf2\xa5\xd1\xd1\xe6\xeeQ\xcb\xf4\xf8\x92\xb0G:p|\xadcD\xbe\xda\xc7nHFiV>\xb4n\xf6\x8f:_:J\xdb\xdd\x1e\xa9:\x90B;\x03\xbf\u007f\x13\xbfN\xef\xfa\xfd\xfdw\xec\xf6\x11[t\xf0\x12\xde\xf7\xe6\xab[\x95\xde\xf6'\u007f>W\xf4\xb3O\xae\xff\xfegE\xe7\xfe\xac\xfcZ\xfc\xd2o\xdf}\x86-\xa7\xa2\xb7\b\xdfzd#\x9d\x8cߏ\x8f\xfc\xf6\b\xde/z\xa0\xd7\xcc\xeb\xef\xee.V\xff\x0e\x9fA\xbd\xf4C]\x89\xff4[\x89\u007f\xe5\x93s\xe7\xbc?;w\xee+\x99\xf7kfL\xb3x\xe2w\x1f=F\xb3\xf8o\xedq\x01\xea\xec\xc8\x03\xfb\xdf\xfd\x8fg\x94kU]\x89/\xbf\xfb\xc0{W\xb8_\x85M\xa3\x90W\xde\xc3G\xbe\x96\xbf>\x82\x15[\xce\x19W\x06\xa5\x11T<Q\xa16\x1f\xd3\x03_\xe3\xa8\aU\xbd\v\xc9\xee\xe6\x06\xd0C\x87\x03\xf7\xa1\x8c\xfa>u%~CO\xcf\b\xfd5mOG\xbb\x9fݲ߁Jێ\xfbQ\x8b\xe6,\xcdr\xeb\xe5\u007f\xf7\xef\xa6k\x9a\xfe\xbc{\xff\xffr\xc7\xe1\xca'\xcf\xfd\xe8O\xf2\x17\x1b\x9f\xff䊾D\xfdwJ\x85?\xf3V\xbczt\x13.z\xfb\xb3\xe8G\x87\xf6Mw\xbe\xfd\xdb'\x8ah\x937\xce\x10w6\xa3\x9fX\xba\x12\xff\xbf\xf4\x02\x19θ\x13+\xac\xc47\xfc\x8a\a\x8a?\xf3\xb3\x8f\xd9g\x9b^\xff\xfa\x9d\xa2Ͼ\u07bf\xfbO\xcbVMJ\xdf\x0fG\xc0\xe4ѓmM\xed}\xec\xce\xe3\x97]\xad\xcd\x1d\x83\xf4\x82\x95ϰ\xc7\"\x1b\x97\xe1\x91бjgj\x81\xd2\xf9;\x9b\xc4&U\xa2hUs\x86u\xc9\x12\xcf\xc9쌪p\x97ǩ\x8ck䯋\xb1\xfa8\xa1\xf6\x04\xda\x13\xd4\xe0\xfa돬\xff\xd1\xfe\xb7\x1f)\xda\xf9\x9c\xf2S\xd1\xff\xa36\xcf\xc9o\xef|\xf5ᢊ\x9d\xec\xfc\xaf\xff\xe53\x1b+\x9ef\x8b\b\xaf\xbf\xb9Ż\x85\xad\x03\xe3<(\xea\xf0\xfc&\xefN\xedq\xb6/\x93\x1f:\xfb\xe5\xb8\xfa,$\xaed\x13\xb3\xbf\xd7\xe61\x94/\x9c_3cY\xde\xf2\xea\xbeb5\x8b\xa75[\xd6\v\xf8`w\xd9Ɲ\xef\xd1?\xb8\xeci\xb9\x9d\xf8\x81O\xb8_\x85M\xa3\x90\x1f<@\x17x\xbd\x8b\xf1\x03\x1f\xf0θ2(\xbc\xbe^\x9f\x106<\xf05\x8evPǜ\xec\x04\xb0\xf5t\xe3\r\x1e)\xa3\xb49[*`\xcfBRJ\x95>zA +%\xb3@\x9d\x84\xe8\xbc?ùF\xbb\xf7۔\x86,\xdd\xf7\x970\xa6\x13:\xcf\xd1\x15i\xe6q\xf8@)\xdf\xf3\xf2\xf3J\xd1?2\xcaK\x8f\xea\x17On\xaa<\xf2v\x91rZ\xa2\x1e\x1d\x99>$\xe8-{\x92-P7\xce\x10w6\xa3\x9fXzP\xb7\x18%ҝq'V}\x16\xf2%\xf5\xa0\x19~\xc5\x03ş\xf9Y\xc7\xecz\x99r*\x8aq\xf1;\x18\xef]\xb6j\xcac\xa3\x03\xa5Ҩ\xbc\\,\xb5\x80\x01\xb3\x10\x96\xc9\xdbs<g\x8e\xc9\xeb\xbb\xc6<\v\xb9\xb4\x1cG\xcb\xf0\xa7\x0fPـ\x90\xfb\xb8\x9d\xd1\xdd\x03\x04lٙ\xb76|yv\xd4\xcedљw!\x97\x8e\xf1fg\x95\x9d\rp\xd7\x18\x1dX\xa6\x05\x14* `\xcb\xce\n\xd6\x06\x93\x15\\\xc8ь\x1a\xf1\xe1\b\xe0\a\x04\b\xd82\xf3'65jg\xb5\xcc$D!\x81\x1f\" `\xcb\f\x9b\x1a\x8d\xf2r\xb9\x15EB\x14\x12\xf8!\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\xb6B\x18\xb73\x00\x00`\x16\xe4\xff\xec\x02\x00\x00HP\xfe\xad\x1e\x18\x00\x00\xc0r\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x02\x02\x06\x00@\xc2\x12\x8f\x80\xc9\xf5\xf9\x19)\xaeu\xafD\xec\fc0F\x13\xb6\xa1\rvv\xf3\x87ynE\x0f\x99\xbfē\x8d\x90`!\x1cF~;\x13\x00\x00\x96\x808\x04\xac9\x15\xa9\xb8G\xecL\xa3r8u\x92ħ,\xf3E\xf5\f\x02\x06\x00?T\xec\x05l\x0fB\x05\xbd\xdfF\xc2\xcdYH\xea\xb73\x8eB\x04!*3\xa3\x87{\xec,\xe7\x8b\xe6YУx\xb2\x01\x01\x03\x80{\x04[\x01\xebA\xe8\x17\xea\xd6\xe4\xfd\xc8\xf9\xed\xdc\xc6\xd1\xd0d\xe6.\x10M\xc0\xe2a\xde\t\xac\x80\x80\x01\xc0\xca\xc0V\xc0\xb2Q\x8d\xbe9\xe9B\xd5s\x99F\a\x04\f\x00\x80\xbb\x84\x9d\x80\x9dAIW\x8d/-(-B\xdb\xff\x81P\x893=\xff\x84\xfa\xe3\xd86\xb7\xe4\xdc0@7\x9bQ\xe3@vj^\x98\x90\xbe\xd2LɑS\xf7\r!\xb5l\xfalT\x9f\x9c\nUe\xa587\xb0\xa1h+j\xf8v[\x96䮛\xa0\xdf\u008f\xbaS\xd2\xd74\v7\nb\x1a3tϊ\x1e}\xb3-Sr?>E\xf49\xb0h\xceµ\xd9J9\x83\xcc\x17\x97\x80/\xab\x98\x8b%K\xae\x9e\xaa\x80\xe5\xa2Z\x02\x00\xc0rb'`{\xd0}\xe6\x97q\x84\xfai\xc3.M\x93\n\v\x92P\x15\xfdm\xc0\x81\xa4\xd5n\x84\x02\x84\nضU\b9\"\xa4\x1a\xa1\xcc\xd5.\xe5\x9f\tr\xbc\x14\xa1\x92\xd21MY:RP\xda}\xca\x0e\xda\xf4[QM&Jw\"\x94\xa3\b͗\xe9ș\xe7A\xe8A.\xef\x98\xc6*\xba\xe7V\x94\xebB.eWnD\x13\xb0h\xcezSQZ\x9e⬇\x88\t\xf8\xb2\x8a\xb9\x88Y\xf2\xf5\x04\x01\x03\x80\x95\x81\x9d\x80\xad\x13F\x8dY\xa8\x996l\xe4Q:Y#Nt\\闤\xa3\xda[\x84\f:Q\x17\x15\xb0$Ow\xff+\xa4\x1f\xa5~\xa8X\x0f\xa6\xa1\xc3\xc6@\x8f)\xcbH\x12\n(j\xd0)\xa1\x16Տ\xd2!\xea\x91P;!\x1bPݴ\xb2?\x1d\xf5\x1a\x99\xc56\xd60\x86\x90({H\xe9H\xa5\xd0\xf2\xb0l\xa28\xbb\x9a\x86\xea\"d\xe6\x00Z5!&\x10\xca*\xe4\"|\x11\xea\xa9\nXG\xe3 \x01\x00`9\xb1\x13\xb0<\xb4\xc7\xfa\xad\x95\x8e\xdb\x14N 7\x1d\xc7\xf9\x88\xfa\xc5C\x05\f\x85\xe8\x97\x1dZ\xa2\x1dT\xfdx\x01+\xd1&\x8f\xdaPF\x84\xfaa\xd6U\xb4+\xe7V}6\x95\xf7\x19\x99\xc56\xd60\x05L\xdbU\xade\x13\xc5\xd9\x1e\xb4\x8e}\x16\xa061\x81PV!\x17\xe1\x8bPO\x98\x03\x03\x80\x95\x81\x9d\x80\xadF\xf5ܷ|\xb4\x8b6\xec5\xecKDR\x1ax\x16\xeaV\xbf$\xa1\xb0\"`n\xd5.\xa2\x8e\xf3\xeaiC\xe7\x04,\x92\x8a\x86\xd4\xfdi(\xa8\xf8\xc9a_\x9aP)!\x85(?8Mx\xe60\xd6-t\x01\xcb\xd5v=\xa4\t\xd8lg$\a\x9dd\x9fcW-\t\x84\xb2\n\xb9\b_\x84z\x82\x80\x01\xc0\xca\xc0N\xc06\b\x13=٨\x816\xec]\xea\xb7\\\xd47\x85Pn>#\x05\xf5+\x02\xb6N3\x8c\x04\xdb\x03\xa5n\x846\v\x02\x16FH\x9b\xc1Z\xa3\x8c\xdeZ\xb5N\rӜ\xa0\x84Pz\xe9qn\x99\xc6\x1c\xc6z&\xba\x80\xa9\xbb\x8e\xd3\xcf\x18Έ\xa4\xf6\xa6\x18B\x02\xa1\xacB.\xfc\x17\xb1\x9e `\x00\xb02\xb0\x13\xb0:\x94o~\x99DtV\xa9U\xef\x94\xe5\xa3\x13\xe3ȤK\x110\xad{\xd4\xe4\xa2?\xac^c\x11\xb0Q\x94\xacy\xf2\xa1f\xa2\xaffP5)\xb4١$I\xae\xbe\xa5g6\x97\xb1\x8ae\x19\x85)`\xb3\x9d\xddBh\xccH'$\x10\xca*\xe4\xc2\u007f\x11\xeb\t\x02\x06\x00+\x03;\x01\x1bBIf\xcb?\x8eR&iîS\xbf\xe6\xa03\x8a\xa4\x85Mc]\xc0\x0e \xf4h\xc7\xf0\x14i\x88\xd9\x03\xcbg\x9d*Q\x93\"\x83\x81\\dJ\xc3\xdc\xc6,AL\x01\x9b\xe5\x8c \xa1\a\xc6%\x10\xca\x1aS\xc0\xc4z\x82\x80\x01\xc0\xca\xc0N\xc0\x88\xc7l\xacS\xd9l\xbbU\x1b(\xdeJQz5\x19\xf4\xae\x1ce0<\xad\v\xd8t\x1ajc\xbfm\xb3\b\xd8\xf4*qZ\x8bS\x8bp\x90m\xb7\xa0d}\xf2j\x0ec\x8d\x98\x026ۙR\r\xf5\x11\xa3\x93\x85MB\x02\xb1\xac1\x05L\xac'\b\x18\x00\xac\fl\x05l\x10\xa1\x03\xea\xd6-\x1fJ\xbdDh\xc3Na\x9d\xb2ct\x89X\x15ʛ\xa1_\xfa\x904\xa1\v\x98\xacuw\xa62\xe9\xf7hw!\xdbQzD\x10\b%\x89L\xb7C(\xc9X\xe7\x15\xd3X'\x96\x80EsV\x8bJاO\xa9\r\x9f@,kl\x01\x13\xea\t\x02\x06\x00+\x03[\x01\xa3c\xac\a\xfb'\xc9\xf8\xf1l\x94\xd4M\u007fhE\xe8>E\xc1\xfaR\xe9\xaa\u0590\x84\xaa\xa7\x94\x91\xa6\x13m3\x86\x90\xd3\xe9l\xe6\u007f\xbc\x10\xb1I\xa6\x14\xd4ukZ\x95\x81\x91dT\xafhJw*j\xb2\bă\xa8P\x11\x9d\xa9R\xe36\xc0\\\xc6:\xaa\xe7\xd9=\xb0(\xce©\xa8~\x9a\xcc\x1cB\x8eq\xb1\a&\x945\xb6\x80\t\xf5\x84u`\x00\xb02\xb0\x170ҡ\xbfN'\x93=G\xa34\xec\xecU\xc9\xf7ek=\xb3n\t\xad\xcaS\xbe\xdc\x1f1\xe7\xc0\x9a\x10r\xfb\xf2\x92\x9c\x01\xb6^!OI:\xa0)OG2J\xcf\xcbDT\x05D\x81\xb8\xe4DR\xce\xeaT\xe4⦚b\x1a먞g\vX4g=\x12r\xe69QJ\x8f\xa5\xcb&\x945\xb6\x80\t\xf5\x84\x95\xf8\x00\xb02\x88C\xc0\x88| ?=)c]\x9bvOOiأ\xbe4\xa7\xef\xac\xfa5\\\xe3\x96R\xf3\x9a\xe8`\u0378\v\xd9\u007f\u007f\x86\x94\xb3\xe7\xdb)\x89\xde\xfb\v\x15\xacJ?\xa1+Ϩ?S\xca,\x19\xd0\xfc0cu\xcf\xd86\x8f\xb4JI\xc3g\x1c\xd3XC\xf5\x1ce\x12?\x9a\xb3PUfrF\xf9(\xb1\b\x98P\xd69\x04\x8c\xaf'\b\x18\x00\xac\f\xe2\x110\vz\xc3\x06\x00\x00X^@\xc0\x00\x00HX@\xc0\x00\x00HX@\xc0\x00\x00HX@\xc0\x00\x00HX\x16 `\x00\x00\x00+\x03\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x96E\x13\xb07\xf0\x8b\xd1w\xc0MK\x00\x00\xee\x12 `\x00\x00$, `\x00\x00$, `\x00\x00$, `\x00\x00$,v\x02v\x1a\xff\xfa\xbb\xe7ʼ[?&wNoY_\xf1\xe2M\xf6\xeb\x1f\x0eV\x14y\xb7\xbc\xfcO\xf6\xe5\U000fd6ca\x9f\xba\xa8\t؍\x17+\x8b6\xed\xbd\xc0yP\x04,\\\xeet\xe4w\x10\xfa\x96z5\"#9`\x04\xfc\xeeI\xd6^\x97\x98\xdcM옏\xed\x029\x84Rh8\xef>\a:\x14ݠ\x9f\x15 \xe3!\xee]\x89\"\x1d\xca\xeeC\x8a\x1fD\xe3~\xdb1\x92\xc4\xdc%\x8d\xa8_\xc7R\xd8\x01\xaaV~rD\xc9 \xe4K\xcb\xf4\x0ff\n\xaf9\x03\x80\x1f2\xf6\x02\xf6\xe2&\\\xb6\x1e㏟\xc5\xde2\x8cw\xd3\x1f_ĸbk\x85\xf2\x0f\x95\xb3S\xf4KQ\xd1n&`\x17\x8a\xb1wk%Ư\x99\x1eZQ\xae\x13\xe5z\x10*'d\"E\v\x0e\xe4AAmw#\n\x06\xdbPK0\x88\x1aI,Ύ\xc4o\xbb@\xf4,&\xfc\x0e\xfa\x96C\x9f\xc3?\x11\xdd0\x12L\xa9\x0e\x0e\x1e\xf38\xcc(G\"S\x1d\xe8\xf0\x04\x99hB\x1dS1,\xcc\xdc\xc8\xf4\x10\xabА\x1e|d\xa8ZR\xfe\x1d\xa7\xd5\x1c\x9a\x95j m\xcd\xf1\xce<!>\x12\x00\xfc\xb0\xb1\x170\xbc\xe52\xb9}\x10{\xbd\xa7\uf40f1\xbe\xa8\xa8\x14\xf6~\xae\xec\xfa\xbc\x18\x9f\"\xe4\"~@\xd9\xf1\xfdS\x98\n؍b|\xf4\xb6\xb2g\x13\xfe\xd8\xf0ЊP\xb6\xd2\xd8\a\x1c4\xfcO\t\n\xd0\xdfF\xf4\x10\xdeJ\xa7Li\xb1ô\xb5\xa6\xb6\xcc\xce]c\x8d?~\xdb\x05\xa2gA\x02%\x8e)2\xe9(\t\xc44\x95\x1a\x94\u007f\xa6\xdcܛaEB\x88\xbeC\xf6,\x8a\xa5p\x84ˍh\x152h\x90\xa2\xfdʘL/\x8d\x10r\xcb\x03\x02\x06\x00:q\b\xd8e\xe5\xe32\xc6oЯ;\xf1iB\x8e>\xf02\xdbw\x14\xbf@\xc8A|\x94n\xdf,\xa3\x02v\x14\xefe{\xde\xc7?6<\xb4jq\u007f\x8e\xa1le\x10\xa8*\xd7.d\xe8C$\xac\xb5ְ\x11Ah\x16\xf9\x9b\xe3\xb7] z\x16$\xe0\xf7u\x91\x13>\xbf\x8d\x80\x91\x86ԙ\x18\xfb\xe3\x100#72\x0f\x01\v\xa4\xb2\xb1c3\b\x18\x00\xe8\xd8\vX%\xfd\xb8\x8d\xf1\xdf\xe8\xe7A\xda\xe9\"\xb7o\xb3}o\xe0gɝ\x8d\xb4OF\xa8v)\x02\xf6\xb0\xd6\xf3R̯\xe9\x1eZ\xd1Z\xf69\x95\xa4\xb4\xbc\x88\x936\xcc\x19\x97\xd8\b\xcd\xd6z\xa2 -\xe7q\xf6\xee\xfd\xa0ϝ\xe2*Q4\xafW\x9b\xf7\xca\x17lG\x93\x11\xaa\x0fWe;6L\x93\xa9\xcdY\x92\xbb\x94\xbe\xed\xbe\x16\xa5\xb4\xd7\xe58|ょZ\x94\xdcZ\xe3\xce(U\xf3l\xcbw䵉\x1e\xf8,\x02\xfe\xb6rR\xf2\n\x150\xd3oH\xb1-%n\x84\x9c\x11]\xc0\x1a\x93#\\y\xf9\xe2\b\x02\xa6\xe7f[!B\xe4\xaa,gy\xf5,\x013\x0e\x89\xa7\x86}\x9fh\x8ep~\xb9\x1aG\xaf<\x00\xdc\xcb\xd8\v\xd8S\xf4\xe3_\x18\u007fO?\x9fe\x02Fn\u007f~\xfa\xb5\x83\x95X\x11\xb0\xef1\xbe\xad\x19\xbeHn*\xe3\xcd\xed\x8c\"l\xcc\xe3\x1b\x81\xbc\xb3i\x18\xb6mh\x872\x9cDyB&Fk\xadI\xda\xd1\xd7\xeaʟ\xa1\x83\xccG\xbb\a\xda]h\x9a\xdc\n\x06s\x1e\f\x06\x83a\xc16r\xb23;'\xdd]W\x85\xae\x92>T3x\xb24iX\x11\x9a\xced\xe4jhN/'\xbc\a\xfak\xf6\xe1\x9fg\xb3i\xabj\xa9\xbe\xaf^\xaa\x12<\xf0Y\x04\xfc\xe3i\x93\xabd*`\xa6ߙ\xa1\x86\xa4!ҁNP5S\x05,?\x8f//_\x9c\x10\xea\x8bD\"\xfdH\xc8ͶB$\xec\xcc\xe9\xe8\xf5!\xab\x80\x99Y$q\xe3f\xc3/W\xe3\xe8\x95\a\x80{\x19{\x01\xdbG?\x14\x01c\xb7\x1c\x99\x80\xdd9U\x861~`\xebNE\xc0\xaea\xac\x1a\x9eW\x04\xec;lbL\x82\xb5\xa2zuc5\xea&d\b\xb9f\x88\x1f\x89sXzk\xedC\x1d\xec[\xa7\xd2\xc3pѶ\xd7\xe6d\xbfG\x1fq\xe5#ߔ\xd2MR\xa4\xa8\x8bN\x97籈H\x92S\xe9\x80T\xb9\x88\xe8A\xcaV,&\xdd\x05\x84\x9caݣ\x01\xaa\xa5\x9c\aa\bI\xf2\xb6\xad!T\xc0x\xbf\xa4\xba`\xc2}\x98mI\xf5\x91[\xa3\xe5\xe8C\xa1\xbc\x9c\xb3\x90\xd6\xc3\n\t\xb9\xd9Vh\xadG\xe9f\xcd\xe4Y\x04\xcc\xccb\f\xf5\x1ai\xf8Z\x985\x8eQy\x00\xb8wY\x88\x80\xbd\x81\x1fx\xe1\xf4śl\b\xa9t\xbaԕ\x15\xef\xab=0c\xe4hЊ\x1eW7ܴ\xcd\x13\x0f:\x1bq$\x8b+\x01\xf4\xd6\xea\xf7LS\xdcՄ\x8cgyj\x8f\x8f\x12\xb5\a\x11C\xc0\xa4\xab\xda\xd6D\xdb\x06\x8fS\xed\xd5Ity\x06\x9bH\xe2=HlF\xab\rM\x92\x9a\xd5,\xc5\xeajу `M\xa8\x91\t\x18\xef\x97D\xf22\x1fR-$\xaaN.\xaa&\\y9g!\xd4<<<\xdcB\x05\x8c\xcbͮB\x93ꪋz\x8b\x80\x99YL'\x9b\xaa\xcf\xd7¬q\x8c\xca\x03\xc0\xbd\xcb\x02\x04\xecv1\x9d\xc9't5ų\xe4\xce&\xfc9\xfb\xf2\x1a\x9d\x03+\xd3;^\x9f\xff\xe3_\xba\x87V-\x92\xe3$Btv\xa6\x01\xd5\xf6\xf3\xb1\x1d)zk\xcd\xd3\xfa.\xb4\xcf3پ9\x17e\xaa\xcb%b\bX\xbe\xfeS\xa6{OOp\x9d*`t|\xa76g\u0383:\xea\x1bD#d\xad\xaaB%\x05\x82\aQ\xc0&\xf6L0\x01\xe3\xfd\x12ҭ\xaf\xfc\x90j\x86\x87\xd5\xe1\x1f_^\xd3\x197\a\xc6\xe7fS\xa1\x11սu\x12\x9f\xcbB\x9b\x03\x9b\x1e\x10\xfdr5\x8e^y\x00\xb8wY\x80\x80\xfdS\xbd1InV\xe0\x83\x84\xbc\xa0\xa8\x98\xc2\xedJ*`\xcf\xe1\xedw\xe8\xb7?`\xef\xf7\xba\x87V\xb4\x8aM+\xff\x02\xb1n\xc3\x18rע\x93b&zk\xad\xf2\x8c0&\x94\xf6L{@S\x9d\x0e6\x01\xce\xda{\xc7U\xc1V\xf9\xb5\\\xdb\xc8-\xa0\xd3\xda\xe5\x16\x01\xe3=Hl\x1a\xae\x1dM\x91j\x0fK\xe2\xa9\x16<pY\x04\xd4\x15\x0eT\xc0x\xbfDάϞ$F\x16\f\xae\xbc\x9c3N\xc0\xb8\xdc\xec*4\x89\xd8\x1e\xeb$>\x97E\xc0\xc1\xfa\xad]hB\xa8ET\x01\x13r\x03\x80{\x96\x05\bؿ6⣊Lѥ_{\t\xb9\xb6\x1e\xff\xfa\x0e\xb9y\x90\xad\x03\xbb\xec\xc5/(#ʋ\x9b\xb8\xe7\x8aZ\x11\xcaS\x14줤\xcd\xe1\u070f\x1c\xe9\x96U\x10zk\x1d@]\xf4\xa3\xfe0\xed\xa8\x9d\xa1\x9b\x85\xdbؿ\x85\x84|\xab\xee\xe3\x05L\xefƸ\xa9t\xcc\xe4Y\x04\x8c\xf7 eN\xd1\x15T\x85tN\x89NXu\xa2>\xc1\x03\x97\x05'`\xbc\xdf\xe9\x82z\xb2\xcd7cd\xc1\xe0\xca\xcb9\xe3\x04\x8c\xcbͶB\x05nE\x1fë,\x02\xc6e1\x99^\xae\f\tg\n=b-\xa2\n\x98\x90\x1b\x00ܳ,@\xc0\xc8\xdb\x18W>\xf5\x13\xbc\xf1e\xbcU\xf9\xe9\xe3\"\\\xf6\x13/\xde\xc74\xeb\xfcz\xec\xdd^\x89\xf1\xeeۆ\x87V\xe4KM\xb9ύ\xf4\xb9\xfc\xe3\xc8x\x8cHc\xa4\r\xb5\x8c\xb0\xad\x00\xf2\x9f\xec\xadF'h\vL?\xd0\xd7S\x8d\x06\xe9\xcf\rRs\x8f/m\x9c\xb7\x9d\x1eb\xb7\xf2\xc6\xd8n\xb4\xb9\xedp>r5\r\xc9\xc1\x94\xea!2R\x9d\x12\x94\x05\x0f\x12\xca\xef:\x9e\xe3\xa4\x03\xbf\xaa\xa4@_ \xa9J\xf4`f1\xe9_\xf7\x8d\xf2\xf5\x9bu\xfeI\xceo$X\xeb\x1a'\x97\x9c\xbb\x82\x11\xba\x12\xdfX\x03b\x94\x97s&\xac\xc47r\x8bQ!n%~\xc8\xe1>T\x9f\x91\x94\xdc\x11RW\xe2\xb7\x04\x83W\x85CB\xce8\xee\xef\xe8\xf5%\a\xf9Zp5\x8eUy\x00\xb8wY\x88\x80\x91\v\xbb˼[^\xfe\xfef\xd1\x037\x94o\u007f;X\xe6\xdd~\xe1c\xb5\xd3u\xed\x85\xca\"\xef\xf6S\xa6~)\x02\x16\x18\xf5\xa59\xd6\xf6kߧ$\xe31\"\x95[\xe9\b\xa1T\xf5\xb9\x9b\x81u\x19Nfy\xa2\xf0\x90;%\xb3Pm\x80\x91\x1d\x19\x8e\a\x87\x05\xdbQ\xf5!\xc2\x12\xfa\xe3LK\x8e\xe4\xf2wx\xa4\xc2Z委P\x9a\xf2o\xad\xe0Az\xbcڙU%3g\xc7\xf2\xb4u`\x9c\a3\x8b\x06\x84\xe8T\xd36\xfa<\xa3\xe9w@1\xac#;\x94\u007f\xcf\xd2g!W\x1be\xd7\xcb\xcb9S\x9f\x85T\xfc\xb0Yy=\xb7\x18\x15\x1a垅\f\x97fd\xef\xe9HV\x8a^\xadM|\xf9\xf9,\b}\x16ґY\x1a\x12j\xc1\xd58V\xe5\x01\xe0\xde\xc5N\xc0\x16\x9fK\xe6cDK\x869\xea\x03\x00\xe0\x1eb\xe9\x05\xac\x1e\x1d\xb03Yt@\xc0\x00\xe0\x9ed\x89\x05,4ֵJ\x92\xed\xac\x16\x1d\x100\x00\xb8'Yb\x01+G\b-\xb9\x98\xa8\xb3\xdb\x00\x00\xdcs,\xb1\x805\xa5\xba\x96~\x00\xc9f\xb7\xc7\xec\xac\x00\x00H8\x96X\xc0\x00\x00\x00\x16\x0f\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x96\xc5\x12\xb0\x1b\xc2\xc3C\x0f\xc56\x04\x00\x00X,\x16G\xc0\xee\x9c\xf2\xde4\xbf\x81\x80\x01\x00\xb0$,\x8e\x80\xdd\xd6\xdf\xcb\xca\x00\x01\x03\x00`I\x00\x01\x03\x00 aI\f\x01\xeb-\x88\x11';~\xb6\xd5\xd8Y\x00VV\xca1\x9b\xbcߌgr\x17X)\xd5\x04\x16\x80\xad\x80]{\xe1ᢍ;\u007f\xa3\xce\xd1\xdfx\xb1\xb2h\xd3^\x161\xed4~\xe3\xfb\x17+\x8a*_\xfe\x9eƄ\xa4\\֓(\x02\x16.w:\xf2i<\x9d\x16\x94\xab\xfex@x\x8d\xe1\xe4\xb6LGI\xacȰ\xb3h\xfc\xf7\x9f\x9f\f\xa3\x00\xa9EI]vvQ\xa0/\xf8B\xae\r#vv\xf3\xa5\x06\xa1fB\x03\xd5\"k\x03\x1ap\xdd\xd5\x06\x1b/+\xe7\x985%\x1d\x8e\xfa\xfb\xa2\x1c\xa8\u007f\xa3\x9a\v\xa4'Y{\xe1[r\xb7\x9d\xe9\xbcl\x17\xc8!\x94B\x0fc\x9f\x03\x1d\x8an\xd0\xcf\n\x90\xf1P̈\xca\xea;\xf0\x0e!\xf5\x1dx6\x8cp\xef\xc0S\x18Ka\x12A߁爒Aȗ\x96\xe9\x1f\xcc\x14\xa3\x00q\xd8\t\xd8\xe5b\xbci\xfb\x8f1\xfe)}\xd7\xfd\x85b\xec\xddZ\x89\xf1k\x84Ł\xac\xc0ś0\xder\x9b\x9c>\x88\xf1\xbe\x837\xf44\xad(\u05c9r=\b\x95\x132\x91\xa2E\xa8\xf6\b\xaf1\xf4e\xbeR\x9d:I\xe2\xe3XR\x87\x9d\xc9lΊ\x8d\xa7jշ\xf4\xa1nN\b9\x83\xb3s64\xfa\x8a\xd5\xc1\x8e\x82E\u007f\xbb\xe9xz\x13=\x02\x93M\xe9\xe3\x96=}i\xdd\xda\xd6\xdc%[lV\xd81\xe3\xb2\xe8Kn\x8dfa\x1e\xa8\xf9\xb0x\xd5\\\xa0A#\xd2^\xb9\x8bbG]ѓ\xc5c\xbb@\xf4,&\xfc\x0e\x9f\xf2\xe1s\xf8c\x8cs\xe8[\x88\x83\x83\xc7<\x8eP\xf4\xfd\xe2[\x88c`\x1c\a\xee-Č!\x16\a\x82\xbd\x85x\xf6+\x17\x06\xd2\xd6\x1c\xef\xccC\xb1\xa3\xd1\xdb\t\xd8>\xfc\xb2\xd2\xf9\xba\xb8\x11\x9fW\xfa_\xc5\xf8\xa8\xf2\xe5\xf3M4\xf6\xd0i\x8c\u007f\xfc9!\xe7\x8bh\x88\"\xeb\x10\x12e+U\x1dp\xd08\x15%\x88Ɨ #\xc2k\f'Q\xab\x16\x8f1\x0e.\xa9A\xd1\xe6\xc9\x1a?\xff-\xacF\xd7\xe5_\xab\xc3\x19\x88\xb6\xb3P_r\xbf6gN\xa3\x05\x90\xa7\xea\xf2q1ʯ\x80M\xc9\xe6\xc9D\xe1\xdc#\xf1\x15v\xcc\xf8,\xea%\xab\xca/\x9cE\xac\xe6\xc2\fZ$-\xe8A\xaa\x18\x1f\x95GO\x16\x8f\xed\x021J\x16(qL\x91IGI\xecvƎΔ\xdb\x12M\xccD\x88F\x1f\x1d\xfe8\f\vRe\x8d\xc4\xc51\x99^\x1a\xa1\xd1,\x16.`\x95\xea\xc8\xf0\xed\x83\u007f\xa0#Ž\xec\xb7\xf7\U0004f640\xb1=\xcf\xe1\xe7\xa2\b\x18\xab\xc81\x94\xadt\x81U\xe5څ\xf8\xa3\x13F\xf3\xe8\xfaWgݲ3\x89\x02\x1f\xb9\x8c\x06\xfba/!\xe3\xafR\xce@\xb4\x9d\x85zv\x8e\xa1\x85\x14c.\xca\xd5(\x01\xf5fl\xa4Yؔl\x9e|9\xd7\x05FV\xdc1㳸\x95e\t\xa4\xf0o\xb0\x88\xd5\\\x98A$\xac\xb5ְ%\xba\r\x87\x9e,\x1e\xdb\x05\u0085\x12\xf4u\x91\x13>\xbf\x8d\x80\x91\x86\xd4X\xb3>q\bX\xf4؈\x949\x04,\x90\xcaƎ\xcd\v\x17\xb0\x9f❟\xeb!\x1e\x1f֢>ަ\xf1kO\xe3-\xec\xcb)\xfa\xd2|\xab\x80\xade\x9fSIJ\xbe\x11'-\u058c\xcb,\xc2t\x86:\xa8\xaf\xa3/\xbaI:A\xc6$:\b\xaeE)\xedu9\x0e\x9f\xfa\x876\\\xeeJ\xc9\xdc\xc0\xae\xac\xe9\xf4=\xec\xa7\x03J\x92N҉\x8c\xe8 \f1ى\x82\xb4\x9cǕ6ӫ\xcd\x1b\xe4kVcɻا\xb4G\xb3\xe5\f\xb8\xcdZ\x94\xdcZ\xe3\xce(\xb5\x1c-\xf5\xecT\xb9\x85,\b\t\xfa\xdc)\xae\x92lk\xb2\xb6|\xfdm\xf5\\\xc9\f[ރ\x19\x00i4Y\xa9U\xb8*۱a\x9aL\xa6\"\x94\xc4b}\x8b\xb5Г\xf1\xb6Q\x89aК\xd3\x17Fᾜ\xb6\xe5<fS{r\xd3\x1f\x1cr\xf7\xf3g\x9eD=\xa8\xd6\xe2ԧZ\x1b\xb0y\xa0\xc4\n\xe9,A5\xa3\x9f\xa19jab\xb6V\xfbd\x9a-\u007fb\xa76gI\xee\xd2Q\x12\xeb:\x8b~Mr\x1e\xf8,\x02\xfe\xb6rR\xf2\n\x150\xd3o(\x99F#u#\xe4\x8c\xe8\x02֘\x1c!\xd1/DA\xc0\xf4\xdcl+D\x88\\\x95\xe5,\xb7\x86\x12\xe4\x0e\x89\x16\vu\xa29B\xa2\xb6\xacZd'`\x9f\x17a\xbc\xf1\xe0i*O71\u07b2\x9dQ\x84/(\x02\xa6v\xc7NG\x13\xb0:u#\x1b\xf5\xd3\xf8\x18;ht0n\x9c4\x1a\xecD\r\xc1\xe07D\x9bz`\x83\xe0Pg2r54\xa7\xb3\xee\xc8`z~\xd3@\x03b\x9d\xe6\x11m\"e\xc2_\x10\x9c\"S\xc1\xb5~~BOHV\x93\xb4\xa3\xafՕ?Cn\x05Y\x90\xa0\xa0~\xb9\xd5h\x03\x10\xa5\xc1t\xf6f*\xb6\x9c\x01\xb7I\x9de\x1f\xfey\xb6e\xac\x1fB}\x91\xf0\x1etX\xc8B)ף\xdd\x03\xed.4-&\xab\x96\xea\xfb\xea\xa5*\xb1d\xa6-\xef\xe1\xf8\x1a2\xe4\x1e\"\xf9\xc7I\xe4dgvN\xba\xbb\xae\n]U\x8c\x83A\xf5z\x11ja$\x13l\xa3\x11\xc3@\xaeB\xab\x95\xff6\x8f/\xe31\x9b\xf4\xb8\x9a\xfak\x11j\xe3\xcf|\xf4\x97\xdcG\xa5\x00\x00 \x00IDAT\x83j-Np\xf6\x9fg\xe3@\t\x152X\x82jF?Cs\xd4\xc2\xc4h\xadq$\xd3l\xf9\x13ۇj\x06O\x96&\rǺ\u03a2_\x93\x9c\a>\x8b\x80\u007f<mr\x95L\x05\xcc\xf4;3Ԑ4D:\xd0\t\xaaf\xeaq\xce\xcf\xe3\xcb\xcb\x17\x87\x9e\xeeH\xa4\x1f\t\xb9\xd9V\x88\x84\x9d9\x1d\xbd>d\x1503\x8b$n\xdc\x1c\xade\x85:\xed\x04\x8c\\>\xe8\xc5\x18\x17\xbdx\x9b|\x87M>\xd6\xc3\x15E\x170\xad\x8f\xb4\x1au+\x17)r\xcd\x10?\x12F\xf0\xe6\x10\x92\x8fj\xe8T.\xa5*\x97\xb2\x15qoP\x14w\xfa$\x9b\xe5\xef\xd3\xfbn\x1d\xea_\xeb\xd5'\x88\x80\x99\xac\x0f\xd1I\xa5a\x163Q\xe8\xb1^M\xa9\xd5l3\x15\x975.b107\xa5\xec)\xa5\x99\xb9\v\bO\x88\xfd\xf1\xa0g\x84Ϣ\xcdE\xe5\xa8\xcd)&;\xc3\xfe\x14\rP\xe5\xe6J\xc6\xd9r\x1e\x82.\xb2G\xdaC\\L\xa0\xf3\x91oʘ\x17t\xe8\xe3\x19\xa3db\xddx\xdbhD78\x93\x82R\xfa\xd9\xd6r\x1d\xb3*'\xedTױ\x18\xbe晏qP\xc5\xc1\xd78\xbd\x96f\xa1\x1f(\xb3B<w\xbf\x9a\xd1\xcfP\xecZ\x98\xe8\xad5\x9ed\\,T\xfd\xc4F\xba\xe8\xd9\xcdc1\xe1\xa3^g1\xaeI\xfe\xd2\xe0\x86\x90$o\xdb\x1a\x16\v\x95\xf7K\xaa\v&\xdc\xea\xed_\xa9>rk\xb4\x1c}\x18\xebB\fi=\xac\x90\x90\x9bm\x85\xd6zn\xd1ȫ\x16\x013\xb3\x18㦚\xa2\xb7,\xdb!\xa4\xc2\xed\xcf_ۊ\xf1\xb3\xb4\av\xcd\xfcuN\x01{\\\xddp\xd3\x1a\x13\x0f:\x1bq$\v\xf7A\xa3\vX\xb5\xbeُFM\xdb\x1e\xa4\xbdLu4)r\xabcrZ\xe2\xf6\x89\xc9\xfc\x9ei\x8a[\x8d\xba\xcd\x1d\xafZ\xfd}\xacR\r1\x86\xdcѯR6\rІ\x84\x1b\xa4!\xd4<\xd4W\xe0\xa0>\xb8,Ƴ<\xb5\xc7Gɴ\x98\xacF\r\xb9\xb6\x9a\xc5\xcc6J\xc6\xd9r\x1e\xae\xa2[\x0f>\xbavJ\xed(\xe5K\\\u007fi\xb6\x80\x89u\x93\x84\xbe\xd5l\xa2\x19L\xd6In\x94%\xed\xa1U[\xaec\xe68\xa0\xee\x13\x05,\xc6A\xb5\nX\xb4u\x0e\x86\x80\x19\x15\xe2\xb9\xfbՌ~\x86b\xd7\xc2Do\xad\xf1$\xe3\x04\xcc8\xb1\x13m\x1b<Nu\\\x13\xf5:\x8bqM\xf2\x97\x06/`M\xa8\x91\t\x18\xef\x97D\xf22\xb5\x15\x9d\x12U'\xb6f%\xfa\x85\xa8\x9c\xee\xe1\xe1\xe1\x16*`\\nv\x15\x9aTW]\xd4[\x04\xcc\xccb:\xd9\xec\xf7DoYv\x02v\xe7\x1f\x9f\xb3\xcf\xdf\xe0\xa2\u007f\x912m\x0e\x8c|\xfe\x8f\u007f\xcd-`\xea݊I\x84h\xf7\xbc\x01\xd5\xf6#\xf1\xfeEt\x0136[\x107\xdf1\xa4\x9f\xbdH\xf2h\xb32\xe8N\xb2̅\x98\xc9\xf2\xb4?\x03\xec\xcf\aw\xbcd\xa9f\x96m\xac\xab\x945\x88A4B8\xd8\x00\u007f2\xa9\x9d\x88YL\xb6o\xceE\x99\x8db\xb2\xb5\xea\x19/) Bn\xa6-\xefA\n\xa5\x8f\xa4\x87R\xd8\xcch>?M2[\xc0ĺ͞R\x11\x89f\xd0\xe8j\x0f\xa1\xd01\x17\xfd\x93\xbaL\xc7l\x1c\xf5\xd0}S\x16\x01\x8bqPŦ?l\x89&\xaab\b\x18WH\x93\xbb_\xcd\x18g(f-L\xf4\xd6\x1aO2N\xc0\xf4\x13;\x9c\xe9\xde\xd3\x13\\g\x89Fo\u007fM\xf2\x97\x06/`\x13{&\x98\x80\xf1~\t\xe9\xd6\x0f\xbaT3<\xac\x0e\x84\xc4#\xa9;\xe3\xe6\xc0\xf8\xdcl*4\xa2\xba\xb7N\xe2sYhs`\xd3\x03$V˲\x11\xb0\xef\xf1\x03\xff\xa4\x9f\x971\xbeM\x9e\xc3\xdb\xe9j0\xf2\a\xec\xfd~n\x01[\xc5\xe6\x15~\xa1F\x80\x1dC\xeeZtRpk\x11\xb0z\x8b\x80}\xc8_%\xb7\x8c\xfbC\xb9\x9d\xeb\xd6\xe6\xf6\xe4\x12\x113Y\x95g\x841A\u007ffǫ\x83\xfd\x81\xa8K\xba4\xcbV007%6{\u05ce\x84їzv\x9c\xb4\xf7\xc0e1B\xff^Mu:ڄd\xd5\x1e\x96\xc4S-\xe4\xc6\xd9\xf2\x85\xcci\xca\"\xeef5E>?\x81#\n\x18-\x99X\xb79\xee[\x92\x98\x06t\xaa5\xa4\xfdu^\x9ec6\x93\xfasu\x9f!`\xf5\x962\xf0\a\x95ύ\x90CR\xb4!s\xbc\x02v\xb7\xaa\x19\xfd\fŮ\x85\x89\xdeZ\xe3I\xc6\t\x98~bs\v\xe8\xdf\xf1r\x8b\x80\xd9_\x93\xfc\xa5ada\xdeM\x12\xfc\x129\xb3>[\xedp\x1am0ƅ\xc8\t\x18\x97\x9b]\x85&م@\xac\x93\xf8\\\x16\x01\a\x1b\xb9u\xa1\x89\x18-\xcbN\xc0\xc8O\xf1O\x15\x05\xbby\x10?\xa5\xa8\x98\x17\xbf\xa0\xe8\xd4\xc5M4\b\xb7 `\xa4\b\u007f|[\xbfYI\x97Q\xe4)\nvR\xd2d\xea~\xe4H\x17\xbbM\xa6\x809\xf6(\x83\xe05\x16\x01\x9b\xca,\xa4\xedl\x17;\x05d\xb3G\xbby믕ΠZ?\x111\x93\r\xa8\xa3\x8cz6l/,$\xe4[\xf6\xc37\x92q\a\x9e\xbfJM\x03nSʜ\xa2\xcbN\n\x99\xc5\xd8a\xf5\xeaV\xcfNf\xdd\xe8/\xf8,\x1a\xd0\x19\x96v\x9b\x90\xac\x8fM\x0et\xa2>!7Ζ/䆂rR~\xbf\x8fe\"\xfc\xa16\x04\xcc(\x99P7\xdev\xac\xc1\xd2%\xb0\x1ap\x8c;\xd5\t\xebe;f\x9b]\xf4\xba\xafb\u05edy\xe6c\x1cT>72\x93\xab\x85P\x17\x89W\xc0\x16\xbb\x9a&\xd1\xceP\xccZ\xe8G\x87\x98\xad5\x9ed\x9c\x80\xe9'\xd6M\xa5c&\xcf\"`\xf6\xd7$\u007fi\x18Yp\x02\xc6\xfb\x9d.\xa8'\xdb|3F\x16\x8c\xe8\x17\"'`\\n\xb6\x15*p+\xfa\x18^e\x110.\x8b\xc9\xf4rE\tf\n=\xb1Z\x96\xad\x80\xdd\u0604\x8b\xb6l\xf5\xe22:\xfdu~=\xf6n\xaf\xc4x\xf7m\xab\x80m\xc7\x18_\xd0Ӵ\"_j\xca}nc\xbd\xc3q$<F\xa4݅Ԧ\xf1\\\x8d\x87\vPrGH\x8d}6R\x9d\x12\x94\x95#\xb1j\xf5+\xfd;\xb4\xe7\x12\xc2I\xcdj\xba\xc3\x0e\xe7L\x8e\xe30\xef\x8a\b\xc9\x02\xc8\u007f\xb2\xb7\x1a\xb1Y\xfe\x06\xa9\xb9ǗF\x1b\xec\xe3\xfa]\x00\xc1\x963\xe06%\x94\xdfu<ǩ&(\xd5\x06\xbe\xa3l\xe2p݆\xea\xfb\xf8,\x1aP\xfa\x81\xbe\x9ejv\x8f\x94KV\x95\x14\xe8\v$U\x89\xb9\xf1\xb6\\!\xebP#i\xa27i\xa7\x87\xd8M\x1a6\x1d\xa3l\a\xa5\xea`pJ,\x99\x91\x8c\xb7e\x85L\xb7\xcc\xcaX\ff\xb3|\xc7\xec\x9bLw[w\xa9\xc4\x04\xcc8\xf3\xb1\x0e*\x9f\x1bi\xb1\x0e\xdd\xf8\x03%\x16R\xe7nV\xd3$\xca\x19\x8a]\x8bRc*e\xa4\r\xb5\xa85\xb2O\xa6\xdb\xf2'\xb6\x01mn;\x9c\x8f\\MC\xb1\xae\xb3hפxi\xe8YL\xfa\xd7}\xa3|\xfdf\x9d\u007f\x92\xf3\x1b\tֺ\xc6\xc9%\xe7\xae`\x84\xae\xc47\xea\x1d\xedB\x14V\xe2\x1b\xb9Ũ\x10\xb7\x12?\xe4p\x1f\xaa\xcfH\xa2\x17\xc1\xb8\xf6\xc0\xc1Uᐐ3\x8e\xfb;z}\xc9A\x12\xbde\xc9A;\x01c\x8f?z\xb7\xbc\xac\x8e\x10\xaf\xbd\xa0|\xd9~J\xd1/\x8b\x80]\xde\xed\xdd\xf8\xbe\x9e\xa4\x15\x05F}i\x8e\xb5\xfd\xda\xf7)I\x98\xbf\x888\xd9\b7\x99\x1d\x92p\xa1#\xdd\x17@\xa8\x96\xc5>\v\xa5)\xff\xd2\xdbB\xe1\xcd\xee\xf4\x82\x1e-A\xfd*5\xf9\x882\"iL\x1f&<b\xb2\x81u\x19N-\xdbȎ\fǃ\xd4\xf6\xdbԪ\xa8\xb6\x86\x01\xbf)=^\xed̪ҚA\x87\x8bN\xe1(\xfdW\x84\x9a\x94&\x99\xe3\xea\xe3\xb38Qxȝ\x92Y8hMv,O_\xadb\xe6\xc6\xdbr\x85\xecs\x8c\x92PZ/\xbd?\xc1\x0e\t\xebdh\x8f\x8a\xa1v\xb1dF2ޖ\x162\x1d\x89G\xc4j0\x9b\xe5;fd\xa2\xda\xed\xf0\x8d0\x013\xce<\x89qP\xf9܂\x8e=Ċy\xa0\xc4B\xea\xdc\xcdj\x9aD9C1k\xa1\x1f\x1d\xa5g\x94\xaed\x95:\x15W2Ö?\xb13-9\x92\xcb\xdf\xe1\x91\nc]gѮI\xf1\xd2гhP\x9f\xc6\xddF\x9fg4\xfd\x0e \xbaTs\x87\xf2\xefY\xfa,\xa4:\x85Η\x97s\xa6>\v\xa9\xf8a}\x0e=\xb7\x18\x15\x1a垅\f\x97fd\xef\xe9HV\x8a^\xad\x9eL\xe4\xe7\xb3P\b\xf9\x1c\x99\xa5!\xa1\x16\\\x8d\xedׁ-\x06\x97\x84Lj\x16\xc0.)\xda\x1d\xa88\t\xc4^\xc5;\x1b\xb3\xab</\x16\x98lQ\xe8\xb1\xce\xca,\x02w\xf7\x98\xa9\x93\xf8\xf3\xa1K\xaa\x9e\xb6\xb3Y\x00w\xb7\x9a\xcbL\xa2\x95w\x81,\x85\x80գ\u007f7\x98m\x8b\xfb[;\x93\x98\xd4Ԑ\xf8Y\xe0Y_`\xb2Šù\xcd\xced\xfe\xdc\xddc6o\x01\x9b\xcc\x12\xe7\r\x16\x8b\x05V32\xa6\xb2\xe8\xcf\xf6,*\xf3>-\x89\xc9]\x17\xb0\xd0X\xd7*iV\xc7{\xa5\xb2\xc0\xb3\xbe\xc0d\x8b\x80\xec\xaa[\xeev4\xef\xca\xcf[\xc0V\x04f5\x1f\xd4F;\xd6\xf9\xfc\x95żOKbr\xd7\x05\xac\\9Ӊr(\xd5\xd9\xc1y\xb3\xc0d\xf7\x06\xf3\xaf|\xf8\f\xaa\x9b_\x8a\x15\x00_\xcdp\xaf\xca<ƟK\xce\xfcOK\x82r\xd7\x05\xac)\xd5\xf5\xef\x0e \x97\f6;\x18\xfb\xee],\x16\x98\xec\xde`\xfe\x95_\x8b\xf4;8\t\xc4\xfc\xab\xb9\xbc$Zy\x17\xcc]\x170\x00\x00\x80\xbb\x05\b\x18\x00\x00\t\v\b\x18\x00\x00\t\v\b\x18\x00\x00\t\v\b\x18\x00\x00\t\xcb\xe2\n\x98\xfe|\xd1ܼA\x1f\x06\xd7X\xfc\x18\x92\x00\x00\xfc`\x00\x01\x03\x00 aY\\\x01\xbb\xfc\xeb\xf3v&\x04\x04\f\x00\x80Ebq\x05,>@\xc0\x00\x00X\x14\xee\x15\x01\xdb6\x9f\xe7r\x01\x00\xb87\xb0\x13\xb0\xdf\xe0S\x17*\xbd?\xb9\xa6\xbe\x18l\xd3^\xed\xad\x85\u05ceT\xaeߴO}_>\xb7\x83\u0381\xbd\xa1σ=\x8b_&\x96d\x9f\xef\xddT\xfc\xd4E\x8b\x80\x85˝\x8e\xfc\x0eB_Z\xa7\xbd.\xfa\x80\xf8\x02\xc48\b\xa3\x00\r5\xf8o\xbcug\xbe\xf4$k\x8f\xf4&wۙ\xce\xcbv\x81\x1cB)\xf4%\xb7}\x0et(\xbaA?+@\xc6C1\x9f\xe1Q\xdf\xe9t\b!\xed=\x92s2½\xd3Ia,\x85\x9d:\xfaN'G\x94\fB\xbe\xb4L\xff`\xe6\xc2\xdf(\x02\x001\xb0\x17\xb0\x17\xbd\x18\x17\xdf&\x17\x8a\xb1wk%Ư\xd1_\xcf{q\xf1\xf62\x8c\xe9\x8c\x17\xbf\x83\n\xd8?p\x11{\xfb\xe1\xedb\x1a\xba[Hv\n㊭EE\xbb\x05\x01\xcbu\xa2\\\x0fB\xe5\x84L\xa4h\x91}=Q\x038\b\x9c\x15_\xd0Y\xb5\xea[-\xd4`\x14\x03\x8b\xedl\x16bЈ\xb4WH\xa2\xc6(\tT\xf4d\xf1\xd8.\x10=\x8b\t\xbf\x83\xbe\x9a\xda\xe7\xf0OD7\xa4o\xd5\f\x0e\x1e\xf3X\xe27\x9a\boՌ\x81q\x1c\xb8\xb7j2\xd4\x00\x8f쭚\xb3\x1f!\x1eH[s\xbc3\x0f\xcd\xe7\xe5[\x00\x10\x1f\xf6\x02\x86+\xcf_8Mn\x14㣷\x95.\xd4&\x1a\x99\xe8\xbbb\xfc\xf2mr\xe7\r\x1a\xdcC\xd8\xc1\xeeB\xeeħi\xca\xf3x+\x11\xf7^\xc4\x0f\x9c\xbeC\xbe\u007f\n\v\x02\x86\xb2\x95&5\u082fX)A4\n\x00\x19\x89\xe3\x05\x88k\xfc\xfc\xb7\xb0\x1aJ\x97\u007f\x83\bg \xdaFa!\x06-\x92\xf6\x12\xefT3\xf2\x93\x15=Y<\xb6\v\xc4(Y\xa0\xc41E&\x1d%\x81\x98\xa6\xec\xe8L\xb9\xc5\xf8P\x1cq\x84\x87\xe7\x8fC\xdc\xe1\xe1'\xd3K#\xf4\xed\xec `\xc0\xe2\x13\x87\x80]\xa6\x9fG\xb5@\xdc\xef\xe3\x1f\x13\xf22\r\xf1\xa1\xb0[\x91*a\a\x13\xb0\xd3\xeaރ\xf8\x94%\xd9A|\x94n\xdf,\x13\x05\x8c5\x98c(\x9b\xbe\\\x94)\xd7.\x14\xbb\x15\xea\x88a+\xaa\xd57\x8e\xf1\x02\x1654V\f\x16b\x10\tk\xad5\x1c\xfb}\\z\xb2xl\x17\b\x17\x1a\xcb\xd7EN\xf8\xfc6\x02F\x1aRgb\xec\x8fC\xc0\xa2\xc7\xfa\xa2\xcc!`\x81T6vl\x06\x01\x03\x16\x1f{\x01\xabd\x9f\x0fk1!o\xd3\xe8\xb6[\xb4/7n\xdc\x11w0\x01\xbbY\x84\xff\xa9\xfc\xeb\xa5\xff\xf2{\xefl\xc4\x17ٗ\xa3\x82\x80\xade\x9fSI\xca\xf5\x1dq\xd2\xcb\u007f\xc6e^\xea\xb5(\xa5\xbd.\xc7\xe1c\xc1\rȉ\x82\xb4\x9c\xc7o\x11ҫM)\xe5kVcɻا\xb4G\xb3\xe5\f\xb8\xcdZ\x94\xdcZ\xe3\xce(\x15\x1b\x92\xe8Lς\x90\xa0ϝ\xe2*ɞ\x9d\x9b\x89\xd9Z\xed\x93i\xb6\xa3\xc9\bՇ\xab\xb2\x1d\x1b\xa6\xc9\xd4\xe6,\xc9]:J,\xd54<\x88\xe5m\xcb\xd7\xdeknz\xe0\xb3\b\xf8\xdb\xcaI\xc9+T\xc0L\xbf\xa1d\x1a]ύ\x903\xa2\vXcr\x84+/_\x1cA\xc0\xf4\xdcl+D\x88\\\x95\xe5,\xb7\x86\xc6\xe2\x0e\x89\x16\xdbo\xa29\xc2\xf9\xe5j\x1c\xbd\xf2\x00\x10\x0f\xf6\x02ƺS71\u07b2\x9dQ\x84/\x90\xf5\xf8o\xfa~q\x87\xba\x90u\x1f\x1dC\xbeO\x13\n{\xbf\xa7\xb1%)\xa7\x05\x01\xabS7\xb2i\x18\x9bm4Dπ\x16\x17\x98\x12\xeaLF\xae\x86\xe6t\x16\u007f\xae&iG_\xab+\u007f\x86\xdc\n\xb2x(A]\x89j$U\xe0$\x94\xdbٛ\xa9\xd8r\x06\xdc&u\x96}\xf8\xe7\xd9\xe24\x90\xe0\xcc\xc8B\x19\xc7>\xda=\xd0\xeeBӳr31Zk\x1c\xc94\xdb\xc8\xc9\xce\xec\x9ctw]\x15\xbaJ\xfaP\xcd\xe0\xc9Ҥa\xb1\x9a\xa6\a\xa1\xbc\xd5R}_\xbdT%x\xe0\xb3\b\xf8\xc7\xd3&W\xc9T\xc0L\xbf3C\rIC\xa4\x03\x9d\xa0j\xa6\nX~\x1e_^\xbe8!\xd4\x17\x89D\xfa\x91\x90\x9bm\x85Hؙ\xd3\xd1\xebCV\x013\xb3H\xe2\xc6͆_\xae\xc6\xd1+\x0f\x00\xf1`/`\a\xe9\xc7w\xd8\xe4c\xa5;uC\xdf/\xec\xd0\x04\xec<\xdeM\xc8S\xf8}\xcb\xdek\x18\xabi\xce\v\x02\xa6\xc5^[\x8d\xbai\x14n\xd7\f\xf1#~\xa6H\xa2\xb1\f\xab\\\x84\xb6Kz\xabr\x98\x85\x87\x13\x063WS\xb4`4R\xe6\xa4\xd2r\\\xc4b`nJ\xd9S\x84L\xba\v\x88\x88a\xc0e\xd1梍\xa8\xcdi\xf1 \xa0\xb7\xd6x\x92q\xb1\xfd\x90O)\x85\xf2\u007f\xa4\x8bN\x97\xe7\xb1\x18\xc7f5y\x0ffyϰ\xee\xd1\x00\vVfz\x10\x86\x90$o\xdb\x1a\x16ۏ\xf7K\xaa\v&\xdc\xea\x1b\xe5\xa5\xfaȭ\xd1r\xf4\xa1\xf5H\xea\xceBZ\x0f+$\xe4f[\xa1\xb5\x9e[4\x92\xa0E\xc0\xcc,ƌ\x18\xa0b-\xcc\x1aǨ<\x00\xd8\x13\xa7\x80ݤ\x03D\x9d;ڼج\x1d\x9a\x80\xddވ\xbf\xff'\xf6\u07b4콩\x87\xef~_\x10\xb0\xc7\xd5\r7mYă\xceF\x1c\xc9\xfc\xfdv\x16z\x94Ͱ\xf8=\xd3\x14\xb7\x1a`\x98kJ\xb5\xfa\xab'Y\x9c\xf89\xc3ó\x19\xa26d\x89\xa4h\x18pY\x8cgyj\x8f\x8f\xaa\x81\xac\xed\x04,\x9ed\x9c\x80Iz\x98扶\r\x1e\xa7\xda\xdf4\xab\xc9{0\xcb[\xa3\x86\xb5Z]-z\x10\x04\xac\t52\x01\xe3\xfd\x92H^\xa6\xb6\xd2N\xa2\xea\xe4\xa2j\"\x1eI\xddY\b5\x0f\x0f\x0f\xb7P\x01\xe3r\xb3\xabФ\xba\xea\xa2\xde\"`f\x16\xd3\xc9\xe6\xdf#\xbe\x16f\x8dcT\x1e\x00\xec\x89S\xc0H\x996\x99E>\xffǿH%V\x9f\x18\xfa\xf8\xa7\xa7\xc4\x1dڳ\x90/\xe2ӧ\xf1\xb3\xd6dw6au\xe1\xd8k\x82\x80\xa9w\xc5&\x11\xa2\xc3\xc0\x06T\xdbo\x04\xffd\x98Ax\xf3\xb4\x1e\x02\xebYpMI\x96\xf4E\xac|t\xe5\xe8\x02\xc6FQ\x83\xd6 \xa9\x86\x01\x9f\xc5d\xfb\xe6\\\x94\xd9h\xf1 \xa0\xb7\xd6x\x92q\x02\xa6O\xa6\rg\xba\xf7\xf4\x04\xd7Y\xa2+\xf3\x1e\xcc\xf2\xaeUU\xa8\xa4@\xf0 \n\xd8Ğ\t&`\xbc_B\xba\xf55)R\xcd\xf0\xb0:\xfc\x13\x8f\xa4\ue31b\x03\xe3s\xb3\xa9Ј\xea\xde:\x89\xcfe\xa1́M\x0f\x88~\xb9\x1aG\xaf<\x00\xd8\x13\xaf\x80=\x87\xb7ߡ\x9f\u007f\xa0K'\x8ejkU\xf7\xe27\xc4\x1d\x9a\x80]\xc4O=\xa5\x06\xea\x16\xf6\xbe\xa0\x8a\xda\xedJA\xc0V\xb1\xf9\xab_\xa8\x913ǐ\xbb\x16\x9d$\x1c\xe6\xc5]\xe5\x19a\xb0\x85N\xac)u\xb0\xbeC]\x92\x1e\xaf}\x96\x80\xa9\x06\xe6\xa6\xc4&\xdcڭ\x91\x14\r\x03.\x8b\x11ڕ\x99\xeat\xb4Y\x9c\xf1\xe8\xad5\x9ed\x9c\x80\x95k\x1b\xb9\x05tZ\xbb\xdc\"`\xbc\a\xb3\xbc\xd5\x1e\x96\xc4S-x\xe0\xb2\xe0\xc2\xc3\xf3~\x89\x9cY\x9f\xadv8\xcd{\xb4\xe2\x91ԝq\x02\xc6\xe5fW\xa1I5Đu\x12\x9f\xcb\"\xe0`=\xea.4!\xd4\"\xaa\x80\t\xb9\x01\x80-\xf1\n\xd8e/~A\x19\x00^\xdcD\xc5\xe7\x86\x17\xbf\xc1ց\x15\u007f'\xee\xd0\xdfFQYTTqgV\xb2k\xeb\xf1\xaf\uf41b\a-\xeb\xc0\xf2\x14\x05;)i3%\xf7#G\xba\xb0\xd6\xc0\xbc\xb8\a\x10[h_\xcfft\n\v\t\xf9\x96\xfd\xf0\x8dd,\xdb\xe7\x05\xcc4\xe06\xa5\xcc)\xba\"\xc9\x1a\x0f\xcb0\xe0\xb2h@gخm\x16gd찮\x97Fk\x8d'\x19'`z7\xc6M\xa5c&\xcf\"`\xbc\a\xb3\xbc}lª\x13\xf5\t\x1e\xb8,8\x01\xe3\xfdN\x17ԓm\xbe\x19#\v\x86p$\rg\x9c\x80q\xb9\xd9V\xa8\xc0\xad\xe8cx\x95E\xc0\xb8,&\xd3˕!\xe1L\xa1G\xacET\x01\x13r\x03\x00[\xe2\x150r~=\xf6n\xaf\xc4x7\xbd\x93x\xbe\boܾ\t\x17\x9d\xb7\xec\xd0\x05\xec\r\xcc\x1e#\xb2&\xfb\xb8\b\x97\xfdċ\xf7\t\x02\xe6KM\xb9ύ\xf4\xb9\xfc\xe3Hx\x8cH\x8d\x0e5R\x9d\x12\x94i e\xff\xc9\xdejt\x82\xeeh\x90\x9a{|i\xb4\xf3\xf6\xb8\xbe\xe8B\xb0\xe5\f\xb8M\t\xe5w\x1d\xcfqZ\xef'\x9a\x06f\x16\r(\xfd@_O5\x1a\x14\r\b)5\x86\xb8#m\xa8E\x1d\x8c\xda'\xd3m\xa7\x87ح<6i׀6\xb7\x1d\xceG\xae\xa6!\xbe\xe8\xbc\a\xae\xbcUI\x81\xbe@R\x95\xe8\xc1\xccbҿ\xee\x1b\xe5\xeb7\xeb\xfc\x93\x9c\xdfH\xb0\xd65N.9w\x05#t%\xbeQo\xa3\xbc\x9c3a%\xbe\x91[\x8c\nq+\xf1C\x0e\xf7\xa1\xfa\x8c\xa4䎐\xba\x12\xbf%\x18\xbc*\x1c\x12r\xc6q\u007fG\xaf/9\xc8ׂ\xabq\xac\xca\x03\x80=q\v\x18\xb9\xf6Be\x91w\xfb)u%\xc4\xe5g+\x8a\xca\x0e^\xb6\xee\xd0\x05\xec\x869\xcd/$\xfb\xdb\xc12\xef\xf6\v\x1f\v\x02\x16\x18\xf5\xa59\xd6\xf6kߧ$\xe11\"\x16\x1d*\x94\xa6\xfcKo4\x0e\xac\xcbpj\x96\x91\x1d\x19\x8e\a\x87\x95\x8doS\xab\xa2\xda\x1a\x06\xfc\xa6\xf4x\xb53\xabJ&\x168[#\x8b\x13\x85\x87\xdc)\x99\x85\x83V\x03\xd2\xe1jW7n\xa5+Y\xa5Nŕ̰\x1dU\x1f\",\xa1?δ\xe4H.\u007f\x87G*\xe4\x8b\xce{\xe0\xcb{,O[\a\xc6y0\xb3h@\x88N5m\xa3\xcf3\x9a~\a\x14\xc3:\xb2C\xf9\xf7,}\x16R\x9dB\xe7\xcb\xcb9S\x9f\x85T\xfc\xb0Yy=\xb7\x18\x15\x1a垅\f\x97fd\xef\xe9HV\x8a^\xadM|\xf9\xf9,\b}\x16ґY\x1a\x12j\xc1\xd58V\xe5\x01\xc0\x1e;\x01[j.\xc5\xf1\x18\x91@`>\v\xbc\x13-Zq\xa2\x95\x17\x00\x96\x98\x95&`\xf5h\x9eapkjH\xfc\x98\x82\x10\x19SY\xf4g{\x16\x15\x100\x00\x98\x93\x15%`\xa1\xb1\xaeUҬ\x01\xde\"b\n\u0083\xdah\xc7:\x9f\xbf\xb2\x00\x01\x03\x809YQ\x02V\xae(\xca]l\xb2\xeal\xb1J\xb8We\x1e\xe3\xcf%\x87//\x00\x00QXQ\x02֔\xea\x9a\xe7\x00r^\xb0\xd9\xe21;\xab\x95C\xa2\x95\x17\x00\x96\x9c\x15%`\x00\x00\x00\xf3\x01\x04\f\x00\x80\x84\x05\x04\f\x00\x80\x84\x05\x04\f\x00\x80\x84\x05\x04\f\x00\x80\x84eq\x05L\u007f\x94hn\xeeF\\H\x00\x00~\x80\x80\x80\x01\x00\x90\xb0,\xae\x80]\xfe\xf5y;\x13\x02\x02\x06\x00\xc0\"\xb1\xb8\x02\x16\x1f `\x00\x00,\n\xf7\x8a\x80m\x9b\xcf3\xdd\x00\x00\xdc\x1b\xd8\t\xd8o\xf0\xa9\v\x95ޟ\\#\xe4Ƌ\x95E\x9b\xf6^P\u007f\xbev\xa4r\xfd\xa6}\xea+\xee\xb9\x1dt\x0e\xec\r}\x1e\xecY\xf6RC!\xd9\xe7{7\x15?u\xd1\"`\xe1r\xa7#\x9fưiA\xb9\xea\x8f\a\x84\x97\x1a\xc6C\x18\x05H-J겳[<z\x92\xb5\xc7\xc1\x93\xbb\xedL\xe7e\xbb@\x0e\xa1\x14\xfaJ\xdb>\a:\x14ݠ\x9f\x15 㡘\x0f\u007f\xaa\xef\x03;\x84\xd4\xf7\x81\xd90½\x0fLa,\x85\x9d:\xfa>0G\x94\fB\xbe\xb4L\xff`&\x1f\xab\x05\x00\x16\x05{\x01{ыq\xf1mr\xa1\x18{\xb7Vb\xfc\x1a\xfd\xf5\xbc\x17\x17o/\xc3,\xb6\a\xbf\x83\n\xd8?p\x11\v>t\xbb\x98\xbe\xd4PHv\n㊭EE\xbb\x05\x01\xcbu\xa2\\\x0fB\xe5\x84L\xa4hQ\xa1=\xc2K\r\xa3rV\x8c\xcbQ\xb5\xea[\xfa\xec3\xf7$8g`\xb1\x9d\xcdB\f\x1a\x91\xf6\xfaQ\x14;\x02\x85\x9e,\x1e\xdb\x05\xa2g1\xe1w\xf8\x94\x0f\x9f\xc3?\x11ݐ\xbe\x9158x\xcc#\x06\xc5\xe4\x10\xde\xc8\x1a\x03\xe38pode\f\xb1w\xe2\xb37\xb2\xce~\xfc| m\xcd\xf1\xce<4\x9f\x17\xb7\x01@|\xd8\v\x18\xae<\u007f\xe14\xb9Q\x8c\x8f\xdeV\xbaP\x9bh\x98\xa1\xef\x8a\xf1\xcb\xec\x9d\xf8\xde\xef\xc5\x1d\xec.\xe4N\x1aזF\u007f\xdcJĽ\x17\xf1\x03\xa7\xef\x90\uf7f2\xbc\x13?[iR\x03\x0e\x1a\x1b\xa2\x04ј\x0ed$\x8e\x97\x1a\xae\xf1\xf3\xdf\xc2jx\\\xfe\xed3\x9c\x81h\x1b\x85\x85\x18\xb4H\xda\v\xe0S\xf9(\x96\"z\xb2xl\x17\x88Q\xb2@\x89c\x8aL:J\x021M\xd9љr\v1\x9fx\x84\xc8\xdc\xd1\xe1\x8fð U֨D\x1c\x93\xe9\xa5\x11\xfaf\u007f\x100`\xf1\x89C\xc0\xd8ˡ\x8f\xe2\xbd\xec\xfb\xfb\xf8DŽ\xbc\xac\x86\xeb&\xbb\x15\xa9\x12v0\x01;\xad\xee=\x88OY\x92\x1d\xc4G\xe9\xf6\xcd2Q\xc0X\x839\x86\xb2\x95\xa1\x96\xaa\\\xbbP\xecV\xa8#\x06:\xabV\xdf\"\xc6\vX\u0530j1X\x88A$\xac\xb5\xd6p\xecw\"\xea\xc9\xe2\xb1] \\X5_\x179\xe1\xf3\xdb\b\x18iH\x9d\x89\xb1?\x0e\x01\x8b\x1e'\x8e2\x87\x80\x05R\xd9ر\x19\x04\fX|\xec\x05\xac\x92}>\xac\x05x\xbcMC\xd5nѾܸqG\xdc\xc1\x04\xecf\x11\xfe\xa7\xf2\xaf\x97\xfe\xcbｳ\x11_d_\x8e\n\x02\xb6\x96}N%)\xd7w\xc4I/\xff\x19\x97y\xa9ע\x94\xf6\xba\x1c\x87O\x8d\xa7q\xa2 -\xe7\xf1[\x84\xf4jSJ\xf9\x9a\xd5X\xf2.\xf6)\xed\xd1l9\x03n\xb3\x16%\xb7ָ3Jņ$:ӳ $\xe8s\xa7\xb8J\xb2g\xe7fb\xb6V\xfbd\x9a\xedh2B\xf5\xe1\xaaldži2\xb59Kr\x97\x8e\x12K5\r\x0fby\xdb\xf2\xb5w\xe2\x9b\x1e\xf8,\x02\xfe\xb6rR\xf2\n\x150\xd3o(\x99Fft#\xe4\x8c\xe8\x02֘\x1c\xe1\xca\xcb\x17G\x100=7\xdb\n\x11\"We9˭aոC\xa2Ņ\x9ch\x8ep~\xb9\x1aG\xaf<\x00ă\xbd\x80\xb1\xee\xd4M\x8c\xb7lg\x14\xe1\vd=\xfe\x9b\xbe_ܡ.d\xddGǐ\xefӄ\xc2\xde\xef1VC{\x9c\x16\x04\xacN\xddȦ\xf1淡\x1d4\"W\x9e\xb1;ԙ\x8c\\\r\xcd\xe9,vaMҎ\xbeVW\xfe\f\xb9\x15d\xb1t\x82\xba\x12\xd5H\xaa\xc0I(\xb7\xb37S\xb1\xe5\f\xb8M\xea,\xfb\xf0ϳ\xc5i \xc1\x99\x91\x852\x8e}\xb4{\xa0݅\xa6g\xe5fb\xb4\xd68\x92i\xb6\x91\x93\x9d\xd99\xe9\xee\xba*t\x95\xf4\xa1\x9a\xc1\x93\xa5I\xc3b5M\x0fBy\xab\xa5\xfa\xbez\xa9J\xf0\xc0g\x11\xf0\x8f\xa7M\xae\x92\xa9\x80\x99~g\x86\x1a\x92\x86H\a:A\xd5L\x15\xb0\xfc<\xbe\xbc|qB\xa8/\x12\x89\xf4#!7\xdb\n\x91\xb03\xa7\xa3ׇ\xac\x02ff\x91č\x9b\r\xbf\\\x8d\xa3W\x1e\x00\xe2\xc1^\xc0XT\xa2\xef\xb0\xc9\xc7Jwꆾ_ء\t\xd8y\xbc\x9b\x90\xa7\xf0\xfb\x96\xbd\xd70VӜ\x17\x04L\x8b\xa7\xb6\x1au\x132\x84\\3ď\xf8\x99\"ɩ\x88S\x95\x8b\xd0vIoU\x0e\xb3Ђ\xc2`\xe6jJ\xadf\x9b9\xa9\xb4\x1c\x17\xb1\x18p\x91\xb9\xb3\xa7\b\x99t\x17\x10\x11Àˢ\xcdE\x1bQ\x9b\xd3\xe2A@o\xad\xf1$\xe3\xe2B\"\x9fR\n\xe5\xffH\x17\x9d.\xcfc\xf1\xb1\xcdj\xf2\x1e\xcc\xf2\x9eaݣ\x01\xd4/x\x10\x86\x90$o\xdb\x1a\x16\x17\x92\xf7K\xaa\v&\xdc,\xfe#\x91\xea#\xb7F\xcbч\xd6#\xa9;\vi=\xac\x90\x90\x9bm\x85\xd6zn\xd1(\x94\x16\x013\xb3\x18\xd3\"~R\xf8Z\x985\x8eQy\x00\xb0'N\x01\xbbI\a\x88:w̠i\xe2\x0eM\xc0no\xc4\xdf\xff\x13{oZ\xf6*_\xd8\xedI\xa5s\xc6\v\xd8\xe3ꆛ\xb6,\xe2Ag#\x8ed\xfe~;\v[\xcbfX\xfc\x9ei\x8a[\rN\xcd5\xa5Z\xfd\xb5\xa5R\r1fc\xa2\v\x18\x9b!jC\x93D\xc00\xe0\xb2\x18\xcf\xf2\xd4\x1e\x1f%\xd3\x16\x0f\x02zk\x8d'\x19'`\x92\x1e\xe2{\xa2m\x83ǩ\xf67\xcdj\xf2\x1e\xcc\xf2֨!\xd1VW\x8b\x1e\x04\x01kB\x8dL\xc0x\xbf$\x92\x97\xa9\xad\xb4\x93\xa8:\xb9\xa8\x9a\x88GRw\x16B\xcd\xc3\xc3\xc3-T\xc0\xb8\xdc\xec*4\xa9\xae\xba\xa8\xb7\b\x98\x99\xc5t\xb2\xf9\xf7\x88\xaf\x85Y\xe3\x18\x95\a\x00{\xe2\x140R\xa6Mf\x91\xcf\xff\xf1/R\x89\xd5'\x86>\xfe\xe9)q\x87\xf6,\xe4\x8b\xf8\xf4i\xfc\xac5ٝMX]8\xf6\x9a `\xea]\xb1I\x84\xe80\xb0\x01\xd5\xf6\x1b\x81c\x19f\xd4\xe6<\xad\x87\xc0z\x16\\S\x92%}\x11+\x1f\x99;\xba\x80\xb1Q\xd4 \xb2\xac\x8a0\f\xf8,&\xdb7\xe7\xa2\xccF\x8b\a\x01\xbd\xb5Ɠ\x8c\x130}2m8ӽ\xa7'\xb8\xce\x12\x99\x9b\xf7`\x96w\xad\xaaB%\x05\x82\aQ\xc0&\xf6L0\x01\xe3\xfd\x12ҭ\xafI\x91j\x86\x87\xd5\xe1\x9fx$ug\xdc\x1c\x18\x9f\x9bM\x85FT\xf7\xd6I|.\vm\x0elz@\xf4\x1b52\xb7\x90\x1b\x00\xd8\x12\xaf\x80=\x87\xb7ߡ\x9f\u007f\xa0K'\x8ejkU\xf7\xe27\xc4\x1d\x9a\x80]\xc4O=\x85/\xccJ\xf6\x82*j\xb7+\x05\x01[\xc5\xe6\xaf~\xa1F]\x1dC\xeeZt\x92p\x98\x17w\x95g\x84\xc1\x16:\xb1\xa6\xd4\xc1\xfa\x0euI\x97f\xd9\n\x06\xe6\xa6\xc4&\xdcڑe\xa5\x93a\xc0e1B\xbb2S\x9d\x8e6\x8b3\x1e\xbd\xb5Ɠ\x8c\x13\xb0rm#\xb7\x80Nk\x97[\x04\x8c\xf7`\x96\xb7\xdaÒx\xaa\x05\x0f\\\x16\x01u\x85\x03\x150\xde/\x913\xeb\xb3\xd5\x0e\xa7y\x8fV<\x92\xba3N\xc0\xb8\xdc\xec*4\x89\xd8\x1e\xeb$>\x97E\xc0\xc1z\xd4]hB\xa8ET\x01\x13r\x03\x00[\xe2\x15\xb0\xcb^\xfc\x822\x00\xbc\xb8\x89\x8a\xcf\r/~\x83\xad\x03+\xfeNܡ\xbf\x8d\xa2\xb2\xa8\xa8\xe2άd\xd7\xd6\xe3_\xdf!7\x0fZց\xe5)\nvR\xd2fJ\xeeG\x8eta\xad\x81yq\x0f \xb6о\x9e\xcd\xe8\x14\x16\x12\xf2-\xfb\xe1\x1b\xc9X\xb6\xcf\v\x98i\xc0mJ\x99StE\x925\x96\x9aa\xc0eрΰ]\xdb,\xce\xc8\xd8a]/\x8d\xd6\x1aO2N\xc0\xf4n\x8c\x9bJ\xc7L\x9eE\xc0x\x0ffy\xfb\u0604U'\xea\x13<pYp\x02\xc6\xfb\x9d.\xa8'\xdb|3F\x16\f\xe1H\x1a\xce8\x01\xe3r\xb3\xadP\x81[\xd1\xc7\xf0*\x8b\x80qYL\xa6\x97+C\u0099B\x8fX\x8b\xa8\x02&\xe4\x06\x00\xb6\xc4+`\xe4\xfcz\xec\xdd^\x89\xf1nz'\xf1|\x11\u07b8}\x13.:o١\v\xd8\x1b\x98=FdM\xf6q\x11.\xfb\x89\x17\xef\x13\x04̗\x9ar\x9f\x1b\xe9s\xf9Ǒ\xf0\x18\x91\x1aYl\xa4:%(\xd3 \xdc\xfe\x93\xbd\xd5\xe8\x04\xdd\xd1 5\xf7\xf8\xd2h\xe7\xedq}х`\xcb\x19p\x9b\x12\xca\xef:\x9e\xe3\xb4\xdeO4\r\xcc,\x1aP\xfa\x81\xbe\x9ej4(\x1a\x10Rj\fqG\xdaP\x8b:\x18\xb5O\xa6\xdbN\x0f\xb1[ylҮ\x01mn;\x9c\x8f\\MC|\xd1y\x0f\\y\xab\x92\x02}\x81\xa4*у\x99Ť\u007f\xdd7\xca\xd7o\xd6\xf9'9\xbf\x91`\xadk\x9c\\r\xee\nF\xe8J|\xa3\xdeFy9g\xc2J|#\xb7\x18\x15\xe2V\xe2\x87\x1c\xeeC\xf5\x19I\xc9\x1d!u%~K0xU8$\xe4\x8c\xe3\xfe\x8e^_r\x90\xaf\x05W\xe3X\x95\a\x00{\xe2\x160r\xed\x85\xca\"\xef\xf6S\xeaJ\x88\xcb\xcfV\x14\x95\x1d\xbclݡ\v\xd8\rs\x9a_H\xf6\xb7\x83e\xde\xed\x17>\x16\x04,0\xeaKs\xac\xed\u05feOI\xc2cD,\xb2X(M\xf9\x97\xdeh\x1cX\x97\xe1\xd4,#;2\x1c\x0f\x0e+\x1bߦVE\xb55\f\xf8M\xe9\xf1jgV\x95L,p\xb6F\x16'\n\x0f\xb9S2\v\a\xad\x06\xa4\xc3ծn\xdcJW\xb2J\x9d\x8a+\x99a;\xaa>DXB\u007f\x9ciɑ\\\xfe\x0e\x8fT\xc8\x17\x9d\xf7\xc0\x97\xf7X\x9e\xb6\x0e\x8c\xf3`fр\x10\x9dj\xdaF\x9fg4\xfd\x0e(\x86ud\x87\xf2\xefY\xfa,\xa4:\x85Η\x97s\xa6>\v\xa9\xf8a\xb3\xf2zn1*4\xca=\v\x19.\xcd\xc8\xdeӑ\xac\x14\xbdZ\x9b\xf8\xf2\xf3Y\x10\xfa,\xa4#\xb34$Ԃ\xabq\xac\xca\x03\x80=v\x02\xb6\xd4\\\x8a\xe31\"\x81\xc0|\x16x'Z\xa4\xebD+/\x00,1+M\xc0\xea\xd1<C\xdb\xd6Ԑ\xf81\x05!2\xa6\xb2\xe8\xcf\xf6,* `\x000'+J\xc0Bc]\xab\xa4Y\x03\xbcE\xc4\x14\x84\a\xb5юu>\u007fe\x01\x02\x06\x00s\xb2\xa2\x04\xac\\Q\x94\xbb\xd8d\xd5\xd9b\x95p\xaf\xca<ƟK\x0e_^\x00\x00\xa2\xb0\xa2\x04\xac)\xd55\xcf\x01\xe4\xbc`\xb3\xc5cvV+\x87D+/\x00,9+J\xc0\x00\x00\x00\xe6\x03\b\x18\x00\x00\t\v\b\x18\x00\x00\t\v\b\x18\x00\x00\t\v\b\x18\x00\x00\t\xcb\xe2\n\x98\xfe(\xd1\xdc܍\xb8\x90\x00\x00\xfc\x00\x01\x01\x03\x00 aY\\\x01\xbb\xfc\xeb\xf3v&\x04\x04\f\x00\x80Ebq\x05,>@\xc0\x00\x00X\x14\xee\x15\x01\xdb6\x9fg\xba\x01\x00\xb87\xb0\x13\xb0\xdf\xe0S\x17*\xbd?\xb9Fȍ\x17+\x8b6\xed\xbd\xa0\xfe|\xedH\xe5\xfaM\xfb\xd4W\xdcs;\xe8\x1c\xd8\x1b\xfa<س쥆B\xb2\xcf\xf7n*~\xea\xa2E\xc0\xc2\xe5NG>\x8daӂr\xd5\x1f\x0f\b/5\x8c\x870\n\x90Z\x94\xd4eg\xb7x\xf4$k\x8f\x83'wۙ\xce\xcbv\x81\x1cB)\xf4\x95\xb6}\x0et(\xbaA?+@\xc6C1\x1f\xfeT\xdf\av\b\xa9\xef\x03\xb3a\x84{\x1f\x98\xc2X\n;u\xf4}`\x8e(\x19\x84|i\x99\xfe\xc1L>V\v\x00,\n\xf6\x02\xf6\xa2\x17\xe3\xe2\xdb\xe4B1\xf6n\xad\xc4\xf85\xfa\xeby/.\xde^\x86Yl\x0f~\a\x15\xb0\u007f\xe0\"\x16|\xe8v1}\xa9\xa1\x90\xec\x14\xc6\x15[\x8b\x8av\v\x02\x96\xebD\xb9\x1e\x84\xca\t\x99HѢB{\x84\x97\x1aF\xe5\xac\x18\x97\xa3jշ\xf4\xd9g\xeeIp\xce\xc0b;\x9b\x85\x184\"\xed\xf5\xa3(v\x04\n=Y<\xb6\vD\xcfb\xc2\xef\xf0)\x1f>\x88\x9f\x8f(\x00\x00\ttIDAT\x87\u007f\"\xba!}#kp\xf0\x98G\f\x8a\xc9!\xbc\x915\x06\xc6q\xe0\xde\xc8\xca\x18b\xef\xc4god\x9d\xfd\xf8\xf9@ښ\xe3\x9dyh>/n\x03\x80\xf8\xb0\x170\\y\xfe\xc2ir\xa3\x18\x1f\xbd\xadt\xa16\xd10C\xdf\x15\xe3\x97\xd9;\xf1\xbdߋ;\xd8]ȝ4\xae-\x8d\xfe\xb8\x95\x88{/\xe2\aN\xdf!\xdf?ey'~\xb6Ҥ\x06\x1c46D\t\xa21\x1d\xc8H\x1c/5\\\xe3翅\xd5\xf0\xb8\xfc\xdbg8\x03\xd16\n\v1h\x91\xb4\x17\xc0\xa7\xf2Q,E\xf4d\xf1\xd8.\x10\xa3d\x81\x12\xc7\x14\x99t\x94\x04b\x9a\xb2\xa33\xe5\x16b>\xf1\b\x91\xb9\xa3\xc3\x1f\x87aA\xaa\xacQ\x898&\xd3K#\xf4\xcd\xfe `\xc0\xe2\x13\x87\x80\xb1\x97C\x1f\xc5{\xd9\xf7\xf7\xf1\x8f\tyY\r\xd7Mv+R%\xec`\x02vZ\xdd{\x10\x9f\xb2$;\x88\x8f\xd2\xed\x9be\xa2\x80\xb1\x06s\fe+C-U\xb9v\xa1حPG\ftV\xad\xbeE\x8c\x17\xb0\xa8a\xd5b\xb0\x10\x83HXk\xad\xe1\xd8\xefDԓ\xc5c\xbb@\xb8\xb0j\xbe.r\xc2\xe7\xb7\x110Ґ:\x13c\u007f\x1c\x02\x16=N\x1ce\x0e\x01\v\xa4\xb2\xb1c3\b\x18\xb0\xf8\xd8\vX%\xfb|X\v\xf0x\x9b\x86\xaaݢ}\xb9q㎸\x83\t\xd8\xcd\"\xfcO\xe5_/\xfd\x97\xdf{g#\xbeȾ\x1c\x15\x04l-\xfb\x9cJR\xae\uf213^\xfe3.\xf3R\xafE)\xedu9\x0e\x9f\x1aO\xe3DAZ\xce\xe3\xb7\b\xe9զ\x94\xf25\xab\xb1\xe4]\xecSڣ\xd9r\x06\xdcf-Jn\xadqg\x94\x8a\rIt\xa6gAH\xd0\xe7Nq\x95d\xcf\xce\xcd\xc4l\xad\xf6\xc94\xdb\xd1d\x84\xea\xc3Uَ\r\xd3djs\x96\xe4.\x1d%\x96j\x1a\x1e\xc4\xf2\xb6\xe5k\xef\xc47=\xf0Y\x04\xfcm\xe5\xa4\xe4\x15*`\xa6\xdfP2\x8d\xcc\xe8F\xc8\x19\xd1\x05\xac19\u0095\x97/\x8e `zn\xb6\x15\"D\xae\xcar\x96[êq\x87D\x8b\v9\xd1\x1c\xe1\xfcr5\x8e^y\x00\x88\a{\x01cݩ\x9b\x18o\xd9\xce(\xc2\x17\xc8z\xfc7}\xbf\xb8C]Ⱥ\x8f\x8e!ߧ\t\x85\xbd\xdfc\xac\x86\xf68-\bX\x9d\xba\x91M\xe3\xcdoC;hD\xae<cw\xa83\x19\xb9\x1a\x9a\xd3Y\xec\u009a\xa4\x1d}\xad\xae\xfc\x19r+\xc8b\xe9\x04u%\xaa\x91T\x81\x93Pngo\xa6b\xcb\x19p\x9b\xd4Y\xf6\xe1\x9fg\x8b\xd3@\x823#\ve\x1c\xfbh\xf7@\xbb\vM\xcf\xca\xcd\xc4h\xadq$\xd3l#';\xb3s\xd2\xdduU\xe8*\xe9C5\x83'K\x93\x86\xc5j\x9a\x1e\x84\xf2VK\xf5}\xf5R\x95\xe0\x81\xcf\"\xe0\x1fO\x9b\\%S\x013\xfd\xce\f5$\r\x91\x0et\x82\xaa\x99*`\xf9y|y\xf9\xe2\x84P_$\x12\xe9GBn\xb6\x15\"agNG\xaf\x0fY\x05\xcc\xcc\"\x89\x1b7\x1b~\xb9\x1aG\xaf<\x00ă\xbd\x80\xb1\xa8D\xdfa\x93\x8f\x95\xee\xd4\r}\xbf\xb0C\x13\xb0\xf3x7!O\xe1\xf7-{\xafa\xac\xa69/\b\x98\x16Om5\xea&d\b\xb9f\x88\x1f\xf13E\x92S\x11\xa7*\x17\xa1\xed\x92ު\x1cf\xa1\x05\x85\xc1\xccՔZ\xcd6sRi9.b1\xe0\"sgO\x112\xe9. \"\x86\x01\x97E\x9b\x8b6\xa26\xa7Ń\x80\xdeZ\xe3I\xc6ŅD>\xa5\x14\xca\xff\x91.:]\x9e\xc7\xe2c\x9b\xd5\xe4=\x98\xe5=úG\x03\xa8_\xf0 \f!I\u07b65,.$\xef\x97T\x17L\xb8Y\xfcG\"\xd5Gn\x8d\x96\xa3\x0f\xadGRw\x16\xd2zX!!7\xdb\n\xad\xf5ܢQ(-\x02ff1\xa6E\xfc\xa4\xf0\xb50k\x1c\xa3\xf2\x00`O\x9c\x02v\x93\x0e\x10u\xee\x98A\xd3\xc4\x1d\x9a\x80\xddވ\xbf\xff'\xf6\u07b4\xecU\xbe\xb0ۓJ\xe7\x8c\x17\xb0\xc7\xd5\r7mYă\xceF\x1c\xc9\xfc\xfdv\x16\xb6\x96Ͱ\xf8=\xd3\x14\xb7\x1a\x9c\x9akJ\xb5\xfakK\xa5\x1ab\xcc\xc6D\x1706CԆ&\x89\x80a\xc0e1\x9e\xe5\xa9=>J\xa6-\x1e\x04\xf4\xd6\x1aO2N\xc0$=\xc4\xf7D\xdb\x06\x8fS\xedo\x9a\xd5\xe4=\x98\xe5\xadQC\xa2\xad\xae\x16=\b\x02ք\x1a\x99\x80\xf1~I$/S[i'QurQ5\x11\x8f\xa4\xee,\x84\x9a\x87\x87\x87[\xa8\x80q\xb9\xd9UhR]uQo\x1103\x8b\xe9d\xf3\xef\x11_\v\xb3\xc61*\x0f\x00\xf6\xc4)`\xa4L\x9b\xcc\"\x9f\xff\xe3_\xa4\x12\xabO\f}\xfc\xd3S\xe2\x0e\xedY\xc8\x17\xf1\xe9\xd3\xf8Yk\xb2;\x9b\xb0\xbap\xec5A\xc0Իb\x93\b\xd1a`\x03\xaa\xed7\x02\xc72̨\xcdyZ\x0f\x81\xf5,\xb8\xa6$K\xfa\"V>2wt\x01c\xa3\xa8AdY\x15a\x18\xf0YL\xb6o\xceE\x99\x8d\x16\x0f\x02zk\x8d'\x19'`\xfad\xdap\xa6{OOp\x9d%27\xef\xc1,\xefZU\x85J\n\x04\x0f\xa2\x80M\xec\x99`\x02\xc6\xfb%\xa4[_\x93\"\xd5\f\x0f\xab\xc3?\xf1H\xeaθ90>7\x9b\n\x8d\xa8\ueb53\xf8\\\x16\xda\x1c\xd8\xf4\x80\xe87jdn!7\x00\xb0%^\x01{\x0eo\xbfC?\xff@\x97N\x1c\xd5֪\xee\xc5o\x88;4\x01\xbb\x88\x9fz\n_\x98\x95\xec\x05U\xd4nW\n\x02\xb6\x8a\xcd_\xfdB\x8d\xba:\x86ܵ\xe8$\xe10/\xee*\xcf\b\x83-tbM\xa9\x83\xf5\x1d\xea\x92.Ͳ\x15\f\xccM\x89M\xb8\xb5#\xcbJ'À\xcbb\x84ve\xa6:\x1dm\x16g<zk\x8d'\x19'`\xe5\xdaFn\x01\x9d\xd6.\xb7\b\x18\xef\xc1,o\xb5\x87%\xf1T\v\x1e\xb8,\x02\xea\n\a*`\xbc_\"g\xd6g\xab\x1dN\xf3\x1e\xadx$ug\x9c\x80q\xb9\xd9Uh\x12\xb1=\xd6I|.\x8b\x80\x83\xf5\xa8\xbbЄP\x8b\xa8\x02&\xe4\x06\x00\xb6\xc4+`\x97\xbd\xf8\x05e\x00xq\x13\x15\x9f\x1b^\xfc\x06[\aV\xfc\x9d\xb8C\u007f\x1bEeQQŝYɮ\xadǿ\xbeCn\x1e\xb4\xac\x03\xcbS\x14줤͔\u070f\x1c\xe9\xc2Z\x03\xf3\xe2\x1e@l\xa1}=\x9b\xd1),$\xe4[\xf6\xc37\x92\xb1l\x9f\x170Ӏ۔2\xa7\xe8\x8a$k,5Àˢ\x01\x9da\xbb\xb6Y\x9c\x91\xb1ú^\x1a\xad5\x9ed\x9c\x80\xe9\xdd\x187\x95\x8e\x99<\x8b\x80\xf1\x1e\xcc\xf2\xf6\xb1\t\xabN\xd4'x\xe0\xb2\xe0\x04\x8c\xf7;]PO\xb6\xf9f\x8c,\x18\u00914\x9cq\x02\xc6\xe5f[\xa1\x02\xb7\xa2\x8f\xe1U\x16\x01㲘L/W\x86\x843\x85\x1e\xb1\x16Q\x05L\xc8\r\x00l\x89W\xc0\xc8\xf9\xf5ػ\xbd\x12\xe3\xdd\xf4N\xe2\xf9\"\xbcq\xfb&\\t\u07b2C\x17\xb070{\x8cȚ\xec\xe3\"\\\xf6\x13/\xde'\b\x98/5\xe5>7\xd2\xe7\xf2\x8f#\xe11\"5\xb2\xd8HuJP\xa6A\xb8\xfd'{\xab\xd1\t\xba\xa3Aj\xee\xf1\xa5\xd1\xce\xdb\xe3\xfa\xa2\v\xc1\x963\xe06%\x94\xdfu<\xc7i\xbd\x9fh\x1a\x98Y4\xa0\xf4\x03}=\xd5hP4 \xa4\xd4\x18⎴\xa1\x16u0j\x9fL\xb7\x9d\x1eb\xb7\xf2ؤ]\x03\xda\xdcv8\x1f\xb9\x9a\x86\xf8\xa2\xf3\x1e\xb8\xf2V%\x05\xfa\x02IU\xa2\a3\x8bI\xff\xbao\x94\xaf߬\xf3Or~#\xc1Z\xd78\xb9\xe4\xdc\x15\x8cЕ\xf8F\xbd\x8d\xf2r΄\x95\xf8Fn1*ĭ\xc4\x0f9܇\xea3\x92\x92;B\xeaJ\xfc\x96`\xf0\xaapH\xc8\x19\xc7\xfd\x1d\xbd\xbe\xe4 _\v\xaeƱ*\x0f\x00\xf6\xc4-`\xe4\xda\v\x95E\xde\xed\xa7ԕ\x10\x97\x9f\xad(*;xٺC\x17\xb0\x1b\xe64\xbf\x90\xeco\a˼\xdb/|,\bX`ԗ\xe6Xۯ}\x9f\x92\x84LjXd\xb1P\x9a\xf2/\xbd\xd18\xb0.éYFvd8\x1e\x1cV6\xbeM\xad\x8ajk\x18\xf0\x9b\xd2\xe3\xd5ά*\x99X\xe0l\x8d,N\x14\x1er\xa7d\x16\x0eZ\rH\x87\xab]ݸ\x95\xaed\x95:\x15W2\xc3vT}\x88\xb0\x84\xfe8Ӓ#\xb9\xfc\x1d\x1e\xa9\x90/:\xef\x81/\xef\xb1<m\x1d\x18\xe7\xc1̢\x01!:մ\x8d>\xcfh\xfa\x1dP\f\xeb\xc8\x0e\xe5߳\xf4YHu\n\x9d//\xe7L}\x16R\xf1\xc3f\xe5\xf5\xdcbTh\x94{\x162\\\x9a\x91\xbd\xa7#Y)z\xb56\xf1\xe5\xe7\xb3 \xf4YHGfiH\xa8\x05W\xe3X\x95\a\x00{\xec\x04l\xa9\xb9\x14\xc7cD\x02\x81\xf9,\xf0N\xb4H\u05c9V^\x00XbV\x9a\x80գy\x86\xb6\xad\xa9!\xf1c\nBdLeџ\xedYT@\xc0\x00`NV\x94\x80\x85ƺVI\xb3\x06x\x8b\x88)\b\x0fj\xa3\x1d\xeb|\xfe\xca\x02\x04\f\x00\xe6dE\tX\xb9\xa2(w\xb1ɪ\xb3\xc5*\xe1^\x95y\x8c?\x97\x1c\xbe\xbc\x00\x00DaE\tXS\xaak\x9e\x03\xc8y\xc1f\x8b\xc7\xec\xacV\x0e\x89V^\x00XrV\x94\x80\x01\x00\x00\xcc\a\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x16\x100\x00\x00\x12\x96\xff\x0f}\xc6-\xc8\xe3>\xf6\xcf\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/chan2a.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x04\x89\x00\x00\x01\x95\b\x03\x00\x00\x00M@Q-\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\n\x03\x01\x04\x06\x02\a\n\x06\x0e\x10\r\r\x12\x14\x0e\x12\x1d\x11\x13\x10\x16\x18\x15\x1b\x1a\x13\x13\x1e7\x1f\x1f\x18!# #$\"%$\x1d%%\x1e$%#%'%'(&+)\x1e()'*+)/,!+-*,-+-/,02/63(241564796<9.9;8<=;=>FA?3>@=#CxDA5AB@DFCFHEKH<MH7IKHKLJNOMUP?PROSTRUVTWXV]XG<Z\xa5_ZIY[Y,`\xae7]\xad[]Z\\^[9a\xab;b\xac<c\xad_a^faO]ao>e\xafac`hcQbdaAg\xb2efdCi\xb3ghfMj\xafEm\xb1qjRikhIp\xb4lmkLr\xb7npm{s\\rtqWv\xb6tvsuwt\\z\xbaxzw]~\xb8e|\xb8\x84|dX\x80\xbf{}za\u007f\xbf|~{~\x80}b\x82\xbc\u007f\x81~d\x85\xbf\x82\x83\x80\x83\x85\x82m\x87\xbdh\x88Ð\x86hj\x8ać\x88\x86r\x8c\xc1\x89\x8b\x88t\x8eė\x8do\x8c\x8e\x8bz\x8f\xc0\x8e\x90\x8dx\x92Ȑ\x92\x8f~\x93\xc3x\x95Ē\x93\x90\x81\x95\xc6{\x98Ȕ\x96\x93\xa0\x96w\x96\x98\x95\x82\x9aė\x99\x96\x83\x9cņ\x9b̀\x9d̚\x9b\x98\xa5\x9b|\x87\x9fɃ\xa0Ϝ\x9e\x9b\x89\xa1̞\xa0\x9d\xaa\xa0\x81\xa0\xa2\x9f\xa1\xa3\xa0\xa2\xa4\xa1\x91\xa5ʮ\xa4\x85\x8f\xa7Ѥ\xa6\xa3\x94\xa7̥\xa7\xa4\xb4\xa7\x83\x92\xaaԧ\xa9\xa6\x97\xabЩ\xab\xa8\x9d\xad̫\xad\xaa\xa5\xad\xc1\x9f\xaeλ\xae\x89\xad\xaf\xac\x9e\xb1ע\xb1ѯ\xb1\xae\xa5\xb4Ԣ\xb5۳\xb5\xb2ö\x91\xb5\xb7\xb4\xac\xb7ҩ\xb8ط\xb9\xb6\xb9\xbb\xb8\xad\xbcܱ\xbc\u05fb\xbd\xba\xb3\xbeٽ\xbf\xbc\xb7\xbfԱ\xc0\xe1\xbf\xc1\xbe\xb6\xc1ܹ\xc1\xd6\xce\xc1\x9b\xc1ÿ\xbb\xc3\xd8\xc2\xc4\xc1\xbd\xc4ں\xc5\xe0\xc4\xc6\xc3\xc6\xc8\xc5\xc0\xc8ݽ\xc9\xe4\xd8ɞ\xc6\xca\xda\xc0\xcb\xe6\xca\xcc\xc9\xc3\xceܿ\xcf\xe2\xc8\xcd\xdc\xcd\xcf\xcc\xc8\xd0\xe6\xcc\xd0\xe0\xcf\xd1\xce\xc6\xd2\xe0\xdbҥ\xe1ѥ\xd1\xd3\xd0\xd2\xd3\xdd\xd3\xd5\xd2\xcd\xd5\xeb\xce\xd7\xdf\xe6\u05eb\xd6\xd8\xd4\xd1\xda\xe2\xd8\xda\xd6\xd8\xd9\xe3\xd6\xda\xea\xd3\xdc\xe4\xda\xdc\xd9\xd8\xdd\xe0\xd2\xde\xec\xdc\xde\xdb\xdc\xdd\xe7\xe0\xde\xe2\xdb\xe0\xe2\xde\xe0\xdd\xf0\xe0\xb3\xd5\xe2\xf0\xe0\xe2\xdf\xde\xe3\xe5\xde\xe2\xf2\xe2\xe4\xe1\xe1\xe6\xe9\xe4\xe6\xe3\xde\xe7\xef\xe8\xe5\xea\xe5\xe7\xe4\xe4\xe9\xec\xe7\xe9\xe6\xe8\xe9\xf3\xe2\xeb\xf3\xe9\xeb\xe8\xec\xee\xea\xe6\xef\xf7\xe8\xf1\xf9\xef\xf1\xee\xf0\xf0\xfb\xf2\xf4\xf1\xf1\xf6\xf9\xf4\xf6\xf3\xf7\xf9\xf6\xf5\xfa\xfd\xf9\xfb\xf8\xfa\xfc\xf9\xfd\xfb\xff\xf9\xfe\xff\xfc\xfe\xfb\xfe\xff\xfc\xfa<^\xc5\x00\x00 \x00IDATx^\xed\xbd\x0fX\x15\u05fd\xef}^\xdb\xf7\xcd\xed\xdb\xc5y`\x1f\xe9\x16\nD\xde\xcb{\xc0s\x94\x83xߛ\x8cA\xbc\xafy\xfd\xcbE\xe5`Qo\x8f1\xb4\xc46\x86T\xebc8\xf14\x98\xee\xa6H\x11o\x12RJ\xbc\x1e\"\t\xdd\x16\"\xd1Rk$\xec<MHKbO\tI(m\xec\xb17x5h\xaa\xd3\xd4\x1eBD=>\xf3\xbc\xb3\xe6\xefZ\xb3g\xefa#\xcc\xf0\xe7\xfbɓ\xbdמ\xf9\xad5k\x96{\xbe\xac\xb5f\xf6\xfa\xfe\x854vD\x00\x00\x18\x17\xfe\xc2In\xa2\xe0T6\x00\x00\x8c\x0e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11и\xec\x14\x00\xc0\xc4\x01%\x02\x94\xbe\xa2T\xb2\xdc)\b\x80\tc\xda+Q}N\x9fSH\x8c\xf4\xe7\xd4;\x85LB\x94v\x88\\\xf5\xac\xac@\xd3\xe9\b\xfb\x00\x98x\\W\xa2\xe6\x10}\xbdT]\xa9R\xa3n\xed\f4D\xcb$\xfe\xcfG\xd7\xe4o\xbb\x125Ğ\x1dd\xbbSH\xcc\xec\x88\xdb\xe1\x14\xe2D\xe7b\u007f\xda\xea\xe6\xb4>q\x1d!\xc4ߥonJ\x89\xde\f\f\xf5Y\xb3\xe7\xd5.\x18u\xb8\xd6\x0e\x91\xaa~\x8a4\xdan\a\xc0%\xdcV\xa2\xbe\xca6\xfav\xbe\xb2\xbdW\xe6X\xe5)e\xeb\x99@Ku\xb4\\\xe2W\v\x0e\xef\xce\xff j\x88-\x15qUN!c\xa0!\xbe\xc2)Ġ\xb9\xddfc\xa3?;\xb0\u007f>!!\xb1'\x18\xdcCZ\xf5\xed\r\xfe\xa7l\xa2M\xcc\xc2*Ha\xfd\x16BF[\x0f\xa3\x1d\"T\xbd\x8d\x04\xed6\x03\xe0\x16.+Qo\xad\xaaDb\xe7\x80\xfc2PݢnnhꉪD\x1f\b\x87\xc4+\x17\xa2E\xd8\xd3\xed\xbb?z@\u007fn\u007f\xf4\x00{\xca|=N!:\xd9+÷\xf5'\xdd;(\x9f}\x06Q\xfa\x87m\xa6\x129a\x14\xd6E\xca\xe4\xd7M\xa3U\"\xa6\x1d\xec\xab\x1eC\x1d\x00\x98\b\xdcU\xa2\xe6\xca\xe6@\x9b\xf9\xf1\xe0S\x97\x94\xf7Ϊ\x81ިJ\xf4\xaep4\xda\xee\x88\x14\xa5\rD\x0f\xe8$\x9d\xd1\x03\xec\x19H+r\n\xd1Y`\xa3D\xf7'*sW\x15D\x19\x96Š\x02Fa\x85)\xb2\x94\x89!\xb2'Z\xb4\t\xd3\x0e\xf6U\x8f\xa1\x0e\x00L\x04\xee*\xd1\xf9\x01\xb1\xba\xcd\xf8\x14\xaaT'\x93\xcf\x06\xba\xc4(Jtq\x8d\xa0\xb0W\x14\x1f\x15\x84#\xe2\xbby\xc2\x06\x9a\xcc;\xbcwC\xfe\xb6\xdf(1\xef>\xb4&\xaf@K\x9b\f&mՓ]+S\x12R\xef\xe9\xe5vWd6\x84H\xa8!s\x0f_\u0095Û\xf37\x1e\xba\xc2\x1d\x82?\x9aܳH<\xcf\x15%\x16\x93\x84\xc0\xa6L\xff\xe2\x1e\xe5Ӟ\x05\xfe\xf9\xb4\xd4\x06\xa2\xb2@\xd9Z\x9d\xe3\xcf\xdcD%!C\x15\x83\xfe\n*'\x86\n\x9cI$$N\x9b73b\x99r\xd9\u0092\xd5\x13\xab8\xcd\x1e\x8d\xaf\x83q4\xae\x1dl\xaaNi\x86\x12\x01oqW\x89d\x18%\xaamR\xdf\x1b\xe4\xf7h}\xa27:\x8e\b\a::\xde\x17\xc5\xdft\xe4\x1d\x10\xaf\xbc\xfa\xc8\x12Q|\xebH\x9ePp\xe0\a+\x1e\xa2\x11//\xdb\xfc\x83\x13\a\x84g-\x19\xdbI\xb3\x96j\x9e\xb3`G\xd3v\xcb`\xa6\xb7\x90d\x91yde\x0f_\xc2\xee%\xfb\x8e\xef[\xb2\x9b;\x04w4\x99\x16\xeb\x95\x1b\xaa\x89')\xdb+\x92\x94;\xe1\xeb|e\re\xbeB\xb9\x03\xd2\x12\xcc\\\x18\f\x06\x95QXQ\\ICEʂ\xcb\xe2`\x1cW\x0f\xa3?r,\x18\xf4i\xf3\xebF,S.S\xd8\x19\xc2L\u007f\x19G\xe3\xea`\x94 \xb2\xed \xdaT]\xbc\xd4ל\x9d\xec\xd0y\x04`b\xf1P\x89\xba+{\x94\xf7P\xd5@t%bGgK\x0e\xc8/\a\x96(\xc9\x15r\x0feg\x81\x9c\xba\xb8v\xdbE\xf9\xf5\x88uJ\xbb\x81t\xab\x89\xf3s\x17\xcbݏ\xc1Z\xeb\xa4Pc\x02I8(\xf2%\x1c\x17N\xc8\x1bN\b\xc7E\xf6\x10lR\xa6\x87\x84M-\xfb\x92{訉\x96\xaa܈j$J\xc9ƀ\xaaAQ\x8f6\xb2_\xec&ܽtvd\x94\xb8\xdd\x12˖k\x16֩\xde\xea:\u007f~\x90?\x9a\x19˖`\xb6\x03%\xbc\xea\xf7\xca\x1d\xadQ߄\x03`B\xf0P\x89\x9aj\x95\xb7\x81@\xe8\xf2\xe5˧\xab\xa3=\xe2k\xafD\xbb\xf5\xe4q\xe1\r\xdbl\xf5\xfa\x15x\x90\x9c\xb4\xd9ݿ\xc97\x97\xa4\xf9\xb6\xf4s%\xecޠ\xbcmxDd\x0f\xc1&Ez9\xef\xb7\x14&\xfa\xd6\xc9/\xdb}\xf2K\xd1<eC\x16\xdd`*\xd1\xea\x8c\xc1K2s\x8b\xc4\xc1x\xfb>\x91h(\x91\x19˖k\x16vVљղ\x824qG3c\xd9\x12\xccv\xa0\x84W\xfdtce\x16\xfaD\xc0[<T\xa2\xaac\xca[w\xa5\x0e?\x8b\xc3b\xafDF\xf2Y\xe1\xa2m\xb6V\xfd\x1a\xaf 6s#⎔\xca\x10\tU\xa4\x94s%\x94nS\u07b6m\x16#\x1c\x8d\xd2FZ,\x85\x89\xca\xc0JQ\x81\x85K\x95\r\xf7\xe4\xd0WC\x89\xe6k\xd3<\xf7\x1a\xf3D\x83\x8dZYaJ\xc4\xc42\xe52\x85\xa5Љ\x9f\xbe:r\xff w43\x96-\xc1l\a\x8aM\xd5E1H\xda\xc27\x02\xe0\x1e\xde)Q\u007f\xa5\xf6\x87\xba\xbfO\xa6\xb3\xaa/ʳ\xd0\x16%\xdagц\x13\xc2/l\xb3\r\xe8\xd3.M\xc4\xee\xa9\x1eqP\xb9wF\xa7\x8d\x99\x12v\xaf\xa7OP^YO\xfb@\x11\x95\xa8\xdcw\xd6Z\x98\xa9\x02E\x19ʆ\f\xb3O\x148-\x0f\x9a2\xda\x15\xfa\x8d{g\xb5Dy\xb3Q\"&6\\\x89\x94\xc2Ri\xad\xeb\xe8\xc4\x17{43\x96-\xc1l\a\x8aM\xd5q\xef\fx\x8ewJ\xd4]y\x86\xd9<\xday\xa2\xfc\xbd\xb2J\xfc7\x8b6\\((\xa5]\x9a\xc7\xf6Z\xf3\xad\xccP\xc7|\x03i\xb9\xf4\xca-\xd9d\r\xe8\xa1\x13+\"W\xc2qሜ:\xa2\xce\x13EP\xa2\xcbY\xf7XKbT\xa0A\x19\xff\xecW\xe7^rs\xe5\xce\v\xa9\xa539\xb5\xf4sY9}\x9eh\xb9\\\x9d˹\xaa\x86\xd8(\x11\x13\xcb)\x91QX\x97\xf2\xc8t.U\"\xf6hf,[\x82\xd9\x0e\xa2}աD\xc0s\xdcU\xa2\xf3\xbd\xbdUͽj\xe7'T9hl\xbf,\xf7\x89z#>c\xa8\xde;{\x95vU\xc4҂\xa7\x9f\xde,\xe4=\xff\xd6\xfb\x1dy\x8f\xbcz\xe5\x8dG\xf2\xe8=\xb5\x97\xf37\x1c>\xfe\x98pؚ\xb3K\xbfK\xd5<;\xeb[\aKH\xc0\x1a`\xc0\x94\xb0Sx\xe2\xa5'\x84\x9d\xa2\xc8\x1c\x82;\x1a\x1d\xedY\xfbX\xbd\xc1\x84u\xadb\xfb\xba\x84\xa0<\xc6,\x8c\xbb\xbf\xe1\xfe\xb8Be\xc7v_E\xfd\"\u007f\x8f\x9c\xba\x9f\xac\xae\xad/\"Tr\x1b\xfd9U\xf5w\xc5\xcb\xc3$\xe5\x19\xeb\x8a`P\xee\xe7\f\xb6\x06\x83\xbeu\xc1\xe0Y6\x96+\x97)\xac\x82\x145\x14\xa9\xcfX\x1bG\xe3b\x99\xa31\xed`Wu\xca1\xbb!\x1b\x00\xee\xe1\xae\x12\x1dS\xe6\x83\x02\xca𠛹\x85\xd3\xcb\xfc\x04-\x8c\x8b+\x94lj\xf2ަ\x1f\xde-\xcd_\xb6m\x9f <\xfa(\xdd\xf4\xcbe\xf2\xeb\xa3\xf2\xe6\xb7\x1f^\xbbl\xb3\xdeob(\x9b\xad]a]+\xe7&\xe5ԅ\a\x18\x98%\\9\xb4Q\u007f\x9e\xc88\x04\u007f\xb4`\xe2\x16k\xf6bBHB\xa7_~-\x96?U\xccW\x9f\xf0\x91\x19,IN\\ئ$\x1bsS\x92\x17*7\xd4\xc4λ\xfc\xa9K\xe9C\x95\xeb\xb4\xf9\x1cy\xd8\xd5\x16\xa7&+\xd9X\xbe\\\xa6\xb0\xfa\xacĜ\x83s\x95\xd2\xf4\xa3\xf1\xb1\xccјv\xb0\xa9:\xa5/~\xe5\xa9>,\v\x02\xbc\xc3]%r\x9fM\xbeZ\xa7\x90\x98\xd9\xef+\xba\xe4\x143\xd9\xd0\xda!b\xd5보\xd9m\x00<a\xba+\x91X1w\xdcW\x05I\xbb\xed\x9f\xe2{\x80\xd2\x0eѪ\xdewj\xbc\x1b\n\x80\xd13\xed\x95\b\x000\x05\x80\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x91\v\x1c\xdd\xfc\xfb\xa9jb\r\x80;\xb8\xaeD\xe1n\xd4竔T\x95\xb9\\Ѥ\xe6\x17t\x89\x92\xddQ\x02\x0e\v\xcaZk&O\v\a\xe8\xdaJ\xe3`b\r\xc0t\xc5m%\xb2q\xa3>Sy\x92\xa6\xa7\xca/\xc1\xff\xf0\xeaƍ\x1d\xbf\x8e\x12\xf0A\xc7\xe6\x03\xec\xe7C\xc2\xf3j\"\x16\x13k\x00f\x16.+\x91\x9d\x1b\xf5\x99\xca\xd3ѲL>\xbeZ\xea\x10\xb0\x8dU\xa2w\xf3\x9eГ1\x98X\x030\xb3pW\x89lݨ\xa7\xb9\x12\xed.\xb8\xa0'c0\xb1\x06`f\xe1\xae\x12ٺQ{\xa8D\xe1&\xd6\u007fX\x93\xb7om\xc1ˏ\xad(\xbd\xc0z_s0Jd8Ws\x85\xc9J\xf4\x98 \b\xf9\xbf\x93\xd3\x17\x971\xeb\xfc\xdb:A\x03\x00\\V\"\xd1\u038d\xfaLe\xd3S\x955A\x0f\xaeQ;\x13\xeb\x97W\b{K\x855O\xafy\x96\xf5\xbe\xe6`\x94\xc8p\xae\xe6\n\x93\x95\xe87;\x85g_\xa3\x9b\xdf\x10:̜\xe1N\xd0\x00\x00\x8a\x87J\xa4\xbbQ\x9f\xad\xac>\xd5\x13\xaa\xdd\xef\xfa\xbd3{\x13낝\xe2qᨸ\xdb\xe2w\xc6`*\x11\xe3\\\xcd\x16&+ѳK^\xd2C\xde6sژX\x03\x00DO\x95Hs\xa3\x16\xc5N\xda\x1d:_\xe5zw\xc1\xdeĺ\xe0\x88\xf8\x9apA|b\xa7\xe8\xacD\x8cs5[ض\x03\a\f\x83\xb6\xa3»fN\x1b\x13k\x00\x80\xe8\xa9\x12in\xd4:\xc1h\x1e@\x13\x82\xbd\x89u\xc1q\xf1\xb5<qtJ\xc48W\xb3\x85m+X\xb1\xe1!u\xf2H|Ux\xd5\xcci\xeb\x04\r\x00\xf0P\x89\f7\xea&\xc5+Uln\xb0\x8d\x9f@\xecM\xac\vN\x88\xaf-a\x95h\x9f\xbd\x12]8\xf0\x01\xeb\\\xcd\x16\xb6\xad\xe0\xadwWh\xb3O\x17\x9607\xd2l\x9d\xa0\x01\x00\x1e*\x91\xe1Fݠt\x86\xfa\xabN\xdag\x988x\x13\xeb\xee\x1d\xaa2\xb2J\xc4x_\x9b\x01\x9a\x12ѩhƹ\x9a-\x8c\xde\xc5?\x9e\xf7\x9a\x1a\xfd\xf0\x86+\xfa\x01흠\x01\x00.+\x91\xad\x1buO\xa0\xb1\xeb\xf4\xb1\x80\xeb]\"\x8b\x89\xf5R\xa2\xc8\xc4[\xab\x9e\xbdp$\xef\xad\v;K\u007f\xc3x_3\x01\u007f\xf8\xf9ƍ\x1d2\x87\xe9M1ù\x9a)샎͏\xbcz\xf1¶\x82\x97\u007fO\xb7\xbf-\xfc@?\x9e\xbd\x134\x00\xc0e%\xb2w\xa3\xeek\xaa\xa9j茜k\xe2`M\xac\xabR\xa8\r\xf4\x955\x82pd\x99\xb0\xec\x88 <\xc4x_\x9b\x01\xe2[\x82F\xfeیs5S\xd8a\xba\xf3\r\xb9\x00A\x1d\x97\x1d\xc8\xd7f\x8a\"8A\x03\x00\\V\xa2\x19ɕ\xbdy\xca/b\xa7\xa2\x895\x00.\x01%\x9ax\xae<\xbb\xf6wS\xd5\xc4\x1a\x00w\x80\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0DS\x18\xb8\\\x83i\x83\xebJ\x14\xeeF-\x13:XU˯%\xeb\x16\xdd\t$+lc\u007fqj\xe2=\x97m\xa2LJR\x81\xda\x17\xd1eC8\xe3\xb4G\xe8J#̢\xd7V\xe0r\r\xa61n+\x91\x8d\x1b\xb58\xd8\x14h\xedn\xaf슞s\x82h]\xe7\v۶(\xf5[\xeb\x12\xcf\xd8\x04\x8f\x0f\xef\xee\x15^\xbe ^\xe8\x10\xf6r\xba\U000db38eC\xec\xa2\xd7V\xe0r\r\xa61.+\x91\x9d\x1b\xb5\xd8\x14\xe8\xa5\x12\x15\x8a\x92o\x02\xd9\x1e\xa6D\xfdD\xbe\xb2\a\xecbljC\xca\xea\xfb\u007f\x10\x0eYw\xbc\x16M\x89\xe0r\r\xa61\xee*\x91\xad\x1bu_\xa5\xb2\x82\xb5Wk͇+Q\x17\x99\xe0\x95l\xc7E\x89\xe0r\r\xa6\x13\xee*\x91\xad\x1buk\xc0\xab\xa5\f{\vӒWj\xa3\xb3\xea\x1c\u007f\xe6&\xb9#4\x98B\x146q[O\xc5\x13R\xd6U\x98\x9e\xb8\xd8R\xd71\xf9Y\x9bJ\xf4\xa8\x90wx\xef\x86|\xbd\x00C\x89\xe0r\rf\x18\xee*\x91h\xe7F]\xdf\x10\xaa\vԴ\xb8\u007f-u%eV\xd5\xdfE\x14%*\x8a+i\xa8HYpY\x14O\x06\xf7\x93\xed\xc1`\x1f\xb7\xf5|mMzf\xd2\xdcM\x85\xe44W\xc4\xd8\xfc\xacM%z\xebH\x9ePp\xe0\a+\x1eRw\x18J\x04\x97k0\xc3\xf0P\x89t7\xea\xda\x00u\xa3\xae\xa9uݍza\x86\xdc۹<\x9f*Q\x03\xa9\x12\xa91\xa2b\xd1j\x8cθ\xad\vȢ\xb3\xd61\xe4\x18\xfd\xac\xd9\xd1ْ\x15rogg\x81\xbaCW\"\xb8\\\x83\x99\x86\x87J\xa4\xbbQ7(^\x1f\x03U\xc6\x0e\x978C\x02\xf4\xad\x8c*\xd1\xea\x8c\xc1K2s\x95\xf9\x16C\x89\xb8\xad\v||w\x882F?kN\x89v3\x01\xba\x12\xc1\xe5\x1a\xcc4<T\"ݍ\xbaY\xb5\xa1nv\xfb\x01\xbdc$Hߔ\x19\xeb\xf9\xea\xe4\x10\xb9\x97n1\x94\x88ۺ ;\xbc\x881\xfaY\x1f\x16h\x0f\xe7\x82b\xb4\xc6\x05\xe8J\x04\x97k0\xd3\xf0N\x89\f7\xea\xf6*\xe5!¦\t\xbea\x15F?\xd9Cߔ\x19\xeb\u008cv\x85~\xba\xc5P\"n낕\xe1E\x8c\xd1ϺCɦ\xce\xf4\xd8*\x11\\\xae\xc1L\xc3;%2ܨ\xfb\x95\xbb\xf8g\x03\xae?d\x9d3W\x96\x98\xae\xd9T\x89\x1aI-\xddRVN_\r%\xe2\xb6\xda)\xd1\x18\xfd\xac/\xac\xa2C\xb2ݫ\xe8mx[%\x82\xcb5\x98i\xb8\xabD\xb6n\xd4\xe2\xb1\xc0\xb1\x9e\xce\xea:\xd7\xef\xe5w\xfa疗%\xc7\xc5W\x85D\xf1~\xb2\xba\xb6\xbe\x88T\xeb\xf7\xce\xd4{Q\xc6\xd6K\xad\xc1̅\xc1`\xb7\xb5\x881\xf9YS\x8dy\xf4\xf8\xa3Tm\xde\xef\xc8{\xe4\xd5+o<\x92\xd7\xf1\xbe\xf8k\xfa\x8c\xf5\xb3\x1d\x1d\xbf\x16\xe1r\rf\x1c\xee*\x91\xbd\x1b\xb5\xd8U_Uw\xccu!\x92\x8f\xbb49}KU<)\x96Ӎ\xb9)\xc9\v\x0f\x8a\xe2`\xb225\x14\xaf>\xf1\xado=\x15\xa7l\r\xefz\x8c\xc5\xcfZ\xe6\xf8\xe6e\x9b\xe5\x0e\x0f}\xe0H\xc8\xfb\xe52\x81\x06\xec\xd6\\\xae\x1f\x16\xe1r\rf\x1c\xee*\x11\x18G\xe0r\r\xa6\x11P\xa2\xa9\v\\\xae\xc1\xf4\x01J\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x98VL\x9cM\x1d\x98P\xa0D`\xfa\xd0W\x94J\x96;\x05\x81I\t\x94\bL\x1f\xb2\xb2\x02M\xe1k\xfc\x82\xa9\x80\xebJ\x14\xe6Fm1\xa6v\x97\xa6\x14c\xa5ȱXP;\x19H3\xbc|\xb7Pz\x85ZP\xdf\xfdr\xe4\xa0\x13\x05\xfa2\xd5\xe2\xff|tM\xfe6c-\xb4\xe84$\x8f~\xbdK\xfd\x8c\xd7\x11B\xfcᶻ\xfd\x8b\x92w\x84'9F}4\xbeu\x98ss\xe2\xe8\x86\xfc\x8dG6\xbe\xe4\x14\x16\xc6)\xd2\xe8\x14\x02&+n+Q\xb8\x1b5gL\xed6\r~c\x95\xa4\xb1XP;\x19H3\\<!\xe4w\x88\x17\x8e\b',K_\xbf\xcc,@\xfbҲ#z\xf2\xab\x05\x87w\xe7\xf3\x9e!\x11\xd9J\xb6:\x85\x18\xe8g\xdc\x13\f\xee\xb1\xf1&ڒ\xb1#\xae/,\xc91\xea\xa3\xf1\xadÜ\x9b-f;\x1c\x12v\x1e\xdd+\x84\xfbR:Ҧ\xaeL\x0e\xa6\".+\x91\x9d\x1b5kL\xed\x1dc\xb5\xa0v\xb0m5\xb9 \xec|D\x14\xdf\x15.\x88<\x9b\x1ff>\x18\x9d\xa0\x0f\xe4\v\xf1\x8a54\x12e\xa4\xcc)Ď6\x1b%\xca.\x17\xfd\xc1\xb0$G,Gc[ǡ\x83g\xb4\xc3\xdbw\xef\x93_\xf7\x8eI\x89`\xfb6eqW\x89lݨ\xadIo\x18\xab\x05u\fJ\xf4\xf2\xb2\v6J\xb4\x91U\"\x83w\x85Q\x8feD\xb1\x9c\x94;\x85\xd8aw\xe1Ϋ\xea!]aI\x8eX\x8e6\xea\xd6a\xdaaw\x01\xed5\xfe\x12J4\xb3pW\x89lݨ-I\xf78\x93HH\x9c2;\xc5[P3\x84\x9bM[\xb7\xda\x19Hwl[\x9b\xb7f\xdbZş\xe3\xf9\xcd\xcb6\xec\xa5\xeasAxw\xe3\x11M\x89\x8cأڊ\xb1\x9b\xe5\x8d\x1f\xe4\v\x82\xb2\x92\xbexq\x8d\xbau\xaf<\xa6\x91\xdf\xf6\x89Ok{\xec\xab#\xee ʄNO\x92抔\xd4\xc3\xec,&\t\x81M\x99\xfe\xc5t\x9by\xc6\x14\xbb\v\xf7\x9e\xb2{睊W\x16\xcfe\x92\x1c\xda\xd1\xc4XZ\xc7<7\xa6I\x18+n\xb6\x1dV=\xa1\x84\x1d\xa2\xeby\x1b\r\xc5\xd9v\x9b\x8d\xca\xd3\f%\x9a\xba\xb8\xabD\xa2\x9d\x1b\xb5%\xe9\"ǂA\xdfv%\xc5ZP3ؙM[\xb6\xda\x18H\xbfq\xf7\xee#'\x0e\xaf\x11\xfe@\xb7\n\x8f\x1d?T\xb0\xf1\x8a\xa2D\x87\xb6iJd\xc4^x\xb5cCiGG\x87\xe2\xe7\xfaZGG\xbe\xbaD\xf5\x1b\x1dG\x84\x03\x1d\x1d\xefӀ\xb5\x8f\xfe^\xfc\xfd\x81\x15\x1d\x17\"U\x87\xae\xa8_A\xdf\x06\xab*T\xaaX;\xddPM<I\xd9^\x91\xa4\xdc\xdd6\xcfX\xb4W\xa2\xf2$߱K\xf7,l\xe5\x93\x1c\xda\xd1bk\x1d\xf3\xdc\xcc&a\xac\xb8\x99v\xf8@x\xde,\xcch(ζ\xdblT\x86K}\xcd\xd9\xc9c\x18^\x83Ɂ\x87J\xa4\xbbQ\xf3I\x97IԯK\xbbљ\xbd\xd94\xbf\xd5\xc6@\xfaP\x01\u0560C+\xae\xd0.\xcd\xf3J\xcc\x11E\x89~\x97\xff;E\x89\x98X\xcb\xe8L\xbfZ\x99\xd1\xd9\x01\xdaOP\x9c\xad\xed\xab#\x13 \xeaJ\xfd}\xdd*\x16A\xf5%\xf7\x88ba\x8a\xf6)1\xaa\x12\xed \x01\xf1\xac\xff\xa0%ɡ\x1f-\x96֡h\xe7\xc64\tgŭ\xb7\xc3/\x95ƹr\xf1\xe2E\xbe\xa1\xccX\xb6\x04\x93{\xe5\xce\xe0\xd8\x06\xd8`2\xe0\xa1\x12\xe9n\xd4|\xd2e\xa2*\x91\xbd\xd94\xbf\xd5\xc6@\xfa\xd7\x05\xeb\x1f;\xfc\xc6\x15:۱s\xfd\xc5?Ȭݭ(\x91\xb8\xedYE\x89\x98Xg%\xfa\xcdݿ\x14/\xae\xa0W\xa4}ud\xaaH\x15}\xeb&:\xbc\x1b\x92o\x9d\xa8Y\xddR\xa2*Q-I\xde$V\xa4]\xe2\x93<\xda\xd1bj\x1d\x8avnL\x93pV\xdcz;\xa8}\xa2\x9d\xf2P\xed\x04\xd7Pf,[\x82\xc9\xe9\xc6\xca,\xf4\x89\xa6.\x1e*\x91\xeeF\xcd']&\xaa\x12ٛM\xf3[m\f\xa4\xc5\x0f\x0e?\xbcAX\xf3\xb4\xdc'ڨ\xcd\u007f<\xa4*ё\x8d\x8a\x12\xb1\xb1\x8eJ$n\xdb+\x1e_A\x0fi_\x1d\x99\x96dUR\x82\r*\x96;^\xcaxlTJ\xd4\xe7\xdf\xd4<\xbb;c;\x9f\xb4\xa0\x1f-\x96֡h\xe7\xc64\tg;i\xb4\xc3\x1a:O\xf4\xfe\x11ቋ\\C\x99\xb1l\t\x1cA\xd2f\xdd\x04\xa6\n\xde)\x91\xe1F\xcd%\xdd&\xaa\x12ٛM\xf3[m\f\xa4_{BN~p$\xff\x10\xfd\xf3\xfd\v\x85ߩJta\xd9\t\xa5Od\xc6jW\xe0\xe1_\xab\xa5\xd9)\xd1\xd1U\x17\x95\xc1Y\x84\xea83z%\xaa\x97{S\xcbӓ\xce\xf0\xc9\b\xc4\xd2:\x14\xa3Od4I\xb8\x12\xd1vؽ\x86j\xd9Qz\xef\x8cm(3\x96-\x81\x03\xf7Φ0\xde)\x91\xe1F\xcd%\xdd&\xaa\x12ٛM\xf3[m\f\xa4\x0f\xa8\x13@\xa5\x8f\xd2\xebR\x99\xcc\xd8\xf7\xb4\xaaD\xe2\xee\x9d\xea<\x91\x11+\x87\x95\x8a\xe2\xef\xf59\x0f;%\xba\xb8\xe6誗\xc3\x0f<zF\xafDu\xa4K<IV\x8b\x97ӻ\x99\xa4hO,\xadC\xd1\u038di\x12N\x89\x8cvx\xfbny\xeb\x95R\xaaDlC\x99\xb1l\t\x1cP\xa2)\x8c\xbbJd\xefF\xcd&\xddd\xb05\x18\xf4\xad\v\x06\xcf\xf2\x16\xd4\fvf\xd3\xecV{\x03\xe9\x03²\x03/\x1d\xdd-P\xf9x\xe2\xee\x9dG\xe4\xe4\x11\xfa\x8c\xf5\x91\vrV\xe5\xde\x19c6-_\\\xcf\x1e\xfd\xea2\xb9\x84\x8b\xafvt\xe4?\xd2\xd1\xf1\x81~\xef\xecU\xed\xe6\xd0\x13\xebW\xfc!\xbc:\f\rs\xa2L\xd5\xf6\x06\x13ֵ\x8a\xed\xeb\x12\x82\xbd\xec\x19+\xcfXW\x04\x83\xdcϴ\xfa\xfc+\xeb\xd23}%\xe5\t}L\xd2R\xa0q\xb4\x18Z\x8797\xb3IX+n\xa6\x1d\xe4\x01\xde\xee\x97v\xab\xcfX\x1b\r\xc5\xc5\x1a%X8F<~<\x16\x8c\x1dw\x95(\x82\x1b5\x93t\x936\xd5b\x9aTZ,\xa8\x19\xc2ͦ\xb9\xad\xf6\x06\xd2ϗ>\xbd6\xaf\xa0T\xfd}ى\xd25+J\x8f+\xbf;\x93/\x9d+\x9b\v\xaep\xb1\xf2E\xfaت\xfc\xd2\xd7\xe4\xc4\x1bZa\x87ŋ+\x94D\xde\xdb\xda\xe1\x04}n\x96\xad\x0e\xc3\xc1\x94\xf0;\\\x06\xc5\xf2\x89%t\xfa\xe5\xd7b挕ߝQVr\xc1M\x19)\xc5\x03M\x99\xc9{\xb8$\x8fy\xb4ѷ\x8eyn\xa2\xd9$\xac\x157\xd3\x0e\xca\xef\xce6\x1f_K;BFC\xf1\xb1z\t\x16\xfa\xe2W\x9e\xea\x8b\xf1\xa7\x83`\x92\xe0\xae\x12\x81\xb1paI\x94\x1f\xcd\x02\x86\xfa,B\xeeu\n\x02\x93\x12(\xd1\xe4\xe7Ț?8\x85\x00\x8d\xbeS\x1e<\xac\x0f\xc6\x01(\xd1$\xe7闯|\xf5\x80\b\xc04\aJ4\xb9\xb9 l~\xb4`\x94\x8b\x83\x000u\x81\x12Mr\x0e,+}\xdb)\x06\x80)\x0f\x94\b\x00\xe0=P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=\xae+Q\x98\x1b\xb5(\x0e\xb4<\x15x\xaae\xc0!\xe34b\x92\x98X\x030yp[\x89\xc2ݨ\xc53\xd5u\xa1\x9eP]\xb5g\xeb6\xba\xce$1\xb1\xa6|\xf0~\xe4}\xcd\xed\x91\xf7\x010\xbe\xb8\xacDvn\xd4\xc1Z\xea\x1fq\xa9vFy\x9a\x8f\xda\x1cu\x02M\xac\xa9\xb1\xe1\x8aR-y\xf9\xd2\xe5\xcb\xf2\xff\xec\xdel~\x155\x00&\x10w\x95\xc8֍\xba\xa9^\xf9P\xef\x89\xf9\xa2WĠD\x13fb-\xbe\xb5YмZ\xbb\xb2\xb3\xb2\ue657\x95\xb5\x89\x1d#/\x80\x12\x01\xd7pW\x89lݨ\xfb\xab\x9b\xfb\a\xfb\x83\xd5\xfd\x91rM=Fo\xd3졉\xf5\x85\xbd\xc2ڗ\xd4\xe4%\x1f\xc9͝\xe5\xcf͞\xf5\xc0ymo\x83\xb6\xba\xec\x02Q<\x15OHYWaz\xe2\xe2K\xc5$\xaeZ\xec\xf6\x91,%\xa6:ǟ\xb9i\x06\xcd\xef\x81\t\xc4]%\x12mݨ\xcf7UVV6\xea\x97\xc04 \x16\x9bf\xafL\xac\xaf\x1c-\xc8{B\xedh]|\xf7\xed\xff\xbd\\\x92B\xc3\xd2\xc8g\x97\xea\u007f\x0f\x06Z\x82\x99\v\x83\xc1`H\xfe\xf7\xa9\xadI\xcfL\x9a\xbb\xa9\x90\x9c\xee\r&l\x17\xc5\xd6u\x8aQHQ\\ICE\xca\x02,\x1c\r\xc6\x01\x0f\x95H\xb7\xa0\x1el\xaa\r\xf5\x86j\x9b\xc2\xddF\xa7(\xb1\xd84{fb\xfd\xa8\xb0\xf1--Y*\xfc?\xff\xe7\xacY\xb3ĕ\xb3f}\xa6\x9c\xb9o\xc0\x8c\xce\x16\x90EgE\x91:!\x98\x96E\r\x8a\x17l\x1b\xd9/\x02p\xdbx\xa8D\xba\x05u\xb0\x96z\f\r\xd6N\x1b\x87\x98Xl\x9a=3\xb1~~ɪ絉\uedcf\x1e\xfd\x1f\xff\xef\xff%+\xd1\u007f\xb8wG\x17\xe3\xf7\xc4*\x91Ow#2\x95hu\xc6\xe0%\x99\xb9E\"\x00\xb7\x8d\x87J\xa4[P\aN*o'\x03v\xe1S\x91Xl\x9a\xbd3\xb1~w\x9b\xb0Y\xef\x15\x89\x97\xcf\x06d%\x8ao\xefg\x8d\xe7X%\xca\xd6S\xa6\x12\xcd\xd7f\x92`\xa6\x01\xc6\x01\xef\x94Ȱ\xa0֔\xa8}\xda(Q,6\xcd\x1e\x9aXә\xa2\xbd\xc6-\xb9Z\xaaD]\xdc\bYQ\xa2\xc0i#\xa9\xa0(Q\x19U\xa2\u008cv\x85it\xa7\x01x\x87wJdXP7k\xa3\xb3\xe6\b9\xa6\x1c\xb1\xd84{jb}a\xafPpBK\xdb(Qn\xae(\xf6\x91Z\x9a4\x95ȿU\xeeAeS%jTw\x95\x95\x8b\x00\xdc6\xee*\x91\xad\x1b\xf5\xf9\xfd\xb5\x9d=\x9d\xb5\xfb\xa7\xcfͳ\x18l\x9a\xbd4\xb1\x96y\xabT\x1f\xe4\xd9(\xd1v_E\xfd\"\u007f\x8fx\xa9U\xb9\x8d\xa6\n\xea\u0094\x1d\xe59$\xbe*$\x8a\xf7\x93յ\xf5E\xa4\xdaZ(\x00\xb1\xe3\xae\x12ٻQ\x0f\xb6\xd5Uյ\xb13\x14S\x9d\xd1\xdb4{ib\xcda\xa3D\x83%ɉ\v\xdbD\xf1\x94\xeaa\xad\njWnb\xd2\xe2\xafPkk\xb9W\x94\x9b\x92\xbc0\x8a\x116\x00\xa3\xc6]%\x02.\x12\x9b\x89\xb5\x8d\x12\x01\xe0\x1eP\xa2iKl&\xd6P\"\xe0)P\xa2鉓\x89\xb5`\xe5\xff\x96\x95\xe8\xff\x80\x12\x01\xaf\x80\x12MK\x1cM\xac\xa1D`r\x01%\x9a\x9e\xc4lb\x8d\xd1\x19\xf0\x14(\x11P\x80\x12\x01O\x81\x12\x01\x05(\x11\xf0\x14(\x11\x90\x19ܳ\x92\xfe\x02vk\xcbtz\xaa\vL%\xa0D@&G_\x15\xa4\x0eR\x04<\x01J\x04D\xf1\xfc\x1d\xe5\x924$I#w,\x9f9\xbe\x06`R\x01%\x02\xa28@Hn\xee\x1d\xa9\xb9ٳ\x8a\xf0\xcbz\xe0\tP\" \x8a\x97\x82s\x93\x933\x93\x93\x93\x17\xb5M\x9f\xdf!\x83)\xc5LV\xa2\x95$\xa50\xe4\x1443\x18\xec\xeb\xee\xea\xee\xee\xea:\x8d\xf5\xf1\x817\xccd%\xeam\xae\xcaJ\xc1\xa5\xa7B\xbd\xce,~g\x00\xb8\x87\xebJd\xe3F}\xf9T}\xa0Λ\xceI39\xe5\x14\x02\x00\x98x\xdcV\"\x1b7j\xb1\xa1\xaa\xbd\xfbX\xe0X\xf4\x8c\x13C\x1biu\n\x01\x00L<.+\x91\x9d\x1b\xf5\xc9\x00\xbd_\xd3\x15\xf0b\x9c\x04%\x8a\xc8,\xcfq\xaa!\x98N\xb8\xabD\xb6n\xd4\r\x8dʇj/:EP\xa2\x88\xcc:\xe71P\xa2\x19\x85\xbbJd\xebF]\x17T>\xd5{\xb1\f\xe9)2m\xd6\xf1\x1fo\xa0D\xc0M\xdcU\"\xd1\u038d\xba\xa5Z\xf1\xf6\xa8\xaa\xb3\xcf0\xa1\f\xa6\xe4\xb4\xf4\xe0\x86\x91\x1dP\"\xe0&\x1e*\x91\xeeF=P\xd5\xd0w\xbe\xb7\xbe\xb2\xd6>\xc3\xc4r\x90\x10\xb2\xd4)hF\x02%\x02n\xe2\xa1\x12\xe9n\xd4b\u007fCee\xa0\xb5\xa1\xde6~b\x19Hɨh\xeev\x8a\x9a\x910J4jQ\x1au\xe0\xb9Q\xc4B\x89f\x14\x1e*Q\x959E}\xbe\xff\xb2\xa8\xdcGs\x9b6\xd2\xe4\x142S\x81\x12\x017\xf1N\x89\f7jQY\x9e\xabK\x9d\xbev\x19\xdc;\x8b\b\x94\b\xb8\x89wJd\xb8Q+\xb7\xd0\xce\xd6xr\x13\vJ\x14\x11Y)~\xfa\xb7w\xcc\xfa\xc2?ɚ\xf0\x8d/̺\xe3\xef~%\xab\xc3\xd7?\xff\xbf}\xfe\xeb\xf2\x8e;\xe4\xf4\xdf\xc9\xff\xdf\xf13U5\xbe\xf3\x85Y\x9f\xfb\x06\x13(\xe7\xfc\xec\xdf\xfe\x8a\xd9`\x16\U0005dfda\xf5\xf9\xbf?g*\x91V\xe4\xb9Y4!\x97a\x1eթ\x86`:\xe1\xae\x12ٺQwU\xb6\xf5\x9c\xacn\xf0\xe2\xc1F\xb1\x15J\x14\tY)\xbe\xf0\xe5_\xbd\xf7\xcf\u007f#k\xc2_>\xf3\xde\xcf\xfeNV\x9e\xef|\xee\x99\u007fy\xe6s\xdf9w\xee/\u007fx\ue9f3~v\xee\x9f\xffRU\x93\xef\xfd\x87\xef\xbd\xf7ӿc\x02\xff\xea\x99\xf7\xfe\xe5\xbf\xfc'f\x83\x91\xf8\xe7\xbf\xfa\xe7\xf7~\xfa\x1f\xff\xdeP\"\xa3\xc8Y\x9f{\xe6\xbdg>\xf7ߙ\xa3:\xd5\x10L'\xdcU\"{7\xea\xf6ڪ\x86\xf6ș&\x8c\xc1\xde\xf6\x95\xbe^\xa7\xa8\x99\x8a\xac\x14\x9f\xd1z<\xb3~(\xbf\xfc\x8b\xdc\x0f\xfa\xe2w\xa8v|\xf1ܹ\xff\xf2\xe5s_\x9e\xf5\x8ds\u007f\xff\xff\xa9\x01_\xfc'K \xe5_>\xc7l0\x12w\xd2\xc4\xcf>o(\x91Q\xe4,%q'sT\xa7\x1a\x82鄻J4\xb9\xb8\x97\x90t/n\xd8M\rd\xa5\xf8\xafw\xfc\xe7oPYPEC~\xfd,\x1d^\xfd\xea\xb3r'\xe8\xaf\xcf\xdd\xf9\x9f\xfe\xe6\xdc\x17\xbf\xa7\x89Ư\xce\xe9!\xea\xeb\xcf\xfe\xe6\x8eY\xb3f1\x1b\x8c\xc4\x1d\xea/9\f%2\x8aT\xca\xf8\xd5\x1d\xccQ\x9dj\b\xa6\x133Y\x89\xfa\xda{\x9cBf0T)~\xf8\xe5\xbf\xfd\xec\x97\xed\x94\xe8\xbd;~\xf6\x99\x9f\xdd\xf1\xb3Y\xef\xa9rr\x87U\x89\xee\xfc\xaf?;\xf7\x9e\xad\x12\xcd\xd2z<\x91\x95\xc88\xaaS\r\xc1tb&+\x11\x88\x86\xa6\x14?\xfd,##\xc6P\xeaܝ\xff\xf9?\xca\xffߩ\xa9ʝ\xfa\xe8L\u007f\xfd\x8c,Q\xcf\xd8*\xd1\x17\xbf~\x8e\x8d\xb5\x19\x9dQ\x94\xa3:\xd5\x10L'\xa0D\xc0\x1eY)\xfe\xfa\xbf\xbf\xf7\xde\u05ff\xc0\xc8\xc8w\x94Ye*\x19_\x9e\xf5e\xe5\u007f\x95g>\xa7\xcdX\xeb\x81_\xf8\xf2{?\xfcK[%z\xe6\x8eo\xfc\xea\xbdg\xfe\xdaP\"\xa3Hu\xc6\xfa{\xccQ\x9dj\b\xa6\x13P\"`\x8f\xac\x14\u07fbs\xd6\x1d\u007f\xf3SFF\xce}\xfd\xf3\xb3\x94[\xee\xe7~8\xeb\xa7\xe7~\xaaLC+\xfc\xd3_\xa9w\xf1\xf5\xc0\x1f~a\xd6\xe7\xben\xabD瞹\xf33\xb3\xee|\xc6P\"\xa3\xc8Y4A\xef\xe2\x1bGu\xaa!\x98N@\x89\x80=\xbaR\xb8E\xd8\xf1\xa0D3\n(\x11\xb0\aJ\x04\xdc\x04J\x04\xec\x81\x12\x017\x81\x12\x01{\xdcV\xa20\xa0D3\n(\x11\xb0\aJ\x04\xdc\x04J\x04쉺ؽ+8\xd5\x10L'\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1eו\xa8Y\xb3\x9d\x1ehy*\xf0T\x8b\xba(Q_}U\xa3\x17+6:\xf1\x88 \b\xf9\xef\xea\x9fN\x14\x1c\x8d\x16\xccrtC\xfe\xc6#\x1b_r\n\x03\x00h\xb8\xadD\x9a\x1b\xb5x\xa6\xba.\xd4\x13\xaa\xab\xa6\xeb6\xf6\x04\x82]\xc1@O\xb4l\xde\U0001b38eC«\xfa\xa7\x97\x96\x1d\x89\x16,\xbe\xfc\v=uH\xd8yt\xaf \x1c\x8a\x16=z\x9a\xbdX\xbb\t\x00wqY\x89\f7\xea`-]\xbd\xfaRmP\x14/\xd7е\xf4[j&\xa5\xed\xd8k\xa6\x12\x89W\xa2\xc4\xc9l~XK\xbc}\xf7>\xf9u\xefx)Q\xf6J\xa7\b\x00\xa6<\xee*\x91\xe9Fݤ.QV\xdf$\x8a\xa1\xc0y95\x10\bE\xce\xe7\x1d\xac\x129\xb0QW\xa2\xdd\x05\x17\xe5\xd7_\x8e\x97\x12-\x80\x12\x81鏻Jd\xbaQ\xf7W7\xf7\x0f\xf6\a\xab\xfbeQRm\xa8\x0fz\xb0\xa4\xfe\xbb\x0f\xad\xc9+\xd8\xf6\x9b([u%\xfa _\x10\x04mtv\xe5\xf9\xcd\xcb6\xec\xbd \x8a\x8f\ny\x87\xf7nȧ\xa1G\x05\x95\xcd\xf2\xfeUO(a\x87~Mc\x0fo\xce\xdfx\xe8\n\x17˔\xc0ГDT\x92z\x98\xad\r\xda\xc6\x05\xa2x*\x9e\x90\xb2\xae\xc2\xf4\xc4ŗ\x8aI\\\xb5\xd8\xed#YJLu\x8e?s\x93'ˀ\x030^\xb8\xabD\xa2\xe9\xedq\xbe\xa9\xb2\xb2\xb2\x91\xf6\x86\xeaT\xa3\xb3\x16\xf7\x17r}y\xd9\xe6\x1f\x9c8 <\x1be\xab\xd1'z\xad\xa3#\xff\x80\x9a\xdc-<v\xfcP\xc1\xc6+\xe2[G\xf2\x84\x82\x03?X\xf1\x90(^x\xb5cCiGG\xc7۲h\tϛ\x85\xed^\xb2\xef\xf8\xbe%\xbbE6\x96)\x81a\xb0\xaaB\xa5j\x90\xd9:\xd0\x12\xcc\\\x18\f\x06\xe5\x0e\xe3\xf9ښ\xf4̤\xb9\x9b\n\xc9\xe9\xde`\xc2vQl]\xe7\xa3!Eq%\r\x15)\v&\xe5\xe0\x16\x80Q\xe2\x95\x12\r6ՆzC\xb5M\x97\x8c-mՑ3M\f\x17\xd7n\x93\x87Q\x17\x8f|\x10e+;:Ӕ\xe8%Ei^SzHKV\xc8}\x9c\x9d\x05\xcav}t\xf6K\xe1\x84\xfcz\xe5\xe2E\xb9\x98\xe3J\xfa\x84p\x9c\x8beK0\xe9\xebV\xb1\xdeEdFg\vȢ\xb3\xa2H\r\t|\xb2\x12\x89۩\x125\x90*\x91\xda%\xed\x17\x01\x98\xbax\xa5D\xc1Z\xfa\x97\xa8\x1c\x16}\x00\x00 \x00IDAT\u007f\xb0V\xee\x0f\xd5\x05\x95-\xcdu\x913M\fDž7\x1c\xb7\xda(\xd1\xce\xf5\x17\xff \xb3V\xee舴\xb7#\x1eX\xa2lוH\xed\x13픇j'\xc4\xdd\x1b\x94M\x1b\x1e\xe1b\xd9\x12\f\xba\x89\x8e\xc5\x1d\x9bU\"\xdfi-e*\xd1\xea\x8c\xc1K2s\x8bD\x00\xa6.^)Q\xe0\xa4\xf2v2 \x8aM\rJ\xb2\xde\xf5y\xa2g\x85\x8b\x8e[m\x94h\xa36%\xf4\x90\x9c^B7Y\x94H\\C\xe7\x89\xde?\"<qQ,ݦlٶ\x99\x8beK0\t6\xa8\x04E\x1eV\x89\xb2\xf5\x94\xa9D\xf35\xfd\xbaW\x04`\xea\xe2\xb1\x12\xb5\a\xa8\x05#\x1dn\x9c\xadt\xfd\xde\xd9\t\xe1\x17b8\xfcV\xdb>\xd1/\x14~'\xda(\xd1\xe1_\x8b\xe2\xee5Tˎ\xd2{g\xbb\xd7ӹ\xa0+\xebws\xb1l\t\xce(J\x148m$\x15\x14%*\xa3JT\x98Ѯ\xd0\x1f!;\x00S\x01\xaf\x94\xa8Y\x1b\x9d5\xd3\xe7\x89ho\xa8\xd9\xfd\xe7\x89.\x14\x94R\xc9xl\xaf\xf2\xa9{G\xb7\xcdV\x1b%:\xa1\xce\xef\xec{Z䕨\xb4T\x14\u007fO\xf7\xbd}\xb7\xbc\xf5J)U\xa2\xe3J\xec\x11u\x9eȈeKp&7W\x14\xfbH-M\x9aJ\xe4\xdf*7\\6U\xa2FuWY\xb9mf\x00\xa6\x06\xee*\x91\xe9F}~\u007fmgOg\xed~z\xf3\xac'\xd0\xdc\xdd\xec\xc53\xd6/\xe7o8|\xfc1\xe1\xb0\xf2a)\xb9Ǻ\xf5\xd7\xf4\x19\xebg;:\xe4~\xce\xc5W;:\xf2\x1f\xe9\xe8\xa0\xf3\xd8Oܽ\xf3\xc8\xd1ݲ\x9a\xbcߑ\xf7ȫW\xdex$\xaf\xe3}\x91\x8a̳G\xbf\xba\x8c\u07ba\u007fV\xd8\xfd\xd2n\xf5\x19\xeb\x9d\xc2\x13/=!\xec\x14\xf9X\xa3\x84Ѱ\xddWQ\xbf\xc8\xdf#^jUn\xa3\xa9z\xb90eGy\x0e\x89\xaf\x92;\x92\xf7\x93յ\xf5E\xc4\xf5\t\u007f\x00\xc6\x11w\x95\x88q\xa3\x1el\xab\xab\xaakSoX\xf76\x06\xea=q\x85~\xfb\xe1\xb5\xcb6k\xbf&\xabJ\xa9\xb4nݭ\xcd\xe7\xc8î7\xb4\xa4\xa2Z'J\u05ec(=N\x9f\x11\x12\x84\xbc_.\x93_\x1f\x95\xb7^|lU~\xe9kJ\tG7\xe4o>\xbe\x96v\x84\xae\x1cڨ?O\xc4\xc6\xea%\x8c\x86\xc1\x92\xe4ąm\xa2x*N\x99\x0fR\xf5\xb2+71i\xf1W\b)\x96Ӎ\xb9)\xc9\v\x0fF-\x03\x80I\x8e\xbbJ\x04\x00\x00v@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=SA\x89V\x92\x94B\xd7\x17/\x02\x00\xb8\xc8TP\xa2\xde檬\x14xW\x000\x8dq]\x89\xecܨͭ\x91h&\xa7\xa2\a\x00\x00\xa62n+\x91\x9d\x1b\xb5\xb95\"m\xa45z\x00\x00`*\xe3\xb2\x12ٹQ3[#\x02%\x02`Z\xe3\xae\x12ٺQ3[#\x02%\x02`Z\xe3\xae\x12ٺQ3[#r\x8a\xb8\xeeA\x04\x00p\x0fw\x95H\xb4s\xa3f\xb7Fb0%\xa7\xa5\xc7u\xf3\x0f\x00\x80Kx\xa5D\x8c\x1b5\xb352\a\t!K\x1db\x00\x00S\x15\xaf\x94\x88q\xa3f\xb6Fd %\xa3\xa2\xd9\xe2\xd2\f\x00\x986x\xa5D\x8c\x1b5\xb35\"m\xa4)z\x00\x00`*\xe3\xb1\x12\xb5\x8fZ\x89p\xef\f\x80i\x8cWJĸQ3[#\x02%\x02`Z\xe3\xae\x12ٻQ\x9b[#\xd2\n%\x02`:\xe3\xae\x12ٻQ3[m\x19\xecm_\xe9\xf3ĭ\x1a\x00\xe0\x0e\xee*\xd1ظ\x97\x90\xf4z\xa7 \x00\xc0\x14f*(Q_{\x8fS\b\x00`J3\x15\x94\b\x000݁\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\\W\"\x1b7\xea\x81`m\xa0\xfeԥh\xb9\x00\x00\xd3\x1a\xb7\x95\xc8ƍ\xfalU}g\xf7\xb1\xaazH\x11\x003\x16\x97\x95\xc8\u038d\xba\xb9\x96\x1a\x99\xf5\a\x8eE\xcb\b\x00\x98θ\xabD\xb6n\xd4u\xb5꾆\b\x99\x00\x00\xd3\x1ew\x95\xc8֍\xba\xb7G\xd9\xd2\xf2T\xe4|\x00\x80鍻J$Fr\xa3\x16\xc5\xcb5A\xfb\f\x00\x80\xe9\x8fWJdq\xa3\x96\xbbDU\xfd\x91\xb2\x00\x00\xa6;^)\x91ōZl\xad\x84\xd74\x003\x17\xaf\x94\x88w\xa3\xbe\xd4\x1c\bE\xca\x00\x00\x98\xfex\xacD\xaa\x1b\xf5@C5\xec\xcc\x00\x98\xc9x\xa5D\xac\x1bu\xff\xfe:\xea\xbah\xce^\x03\x00f\x18\xee*\x91\xad\x1b\xf5\xe9\xc0\xfe\xee\xde\xdeޖZ\xa7\xdc\x00\x80銻Jd\xebF}\xb0R\x05O6\x020cqW\x89\x00\x00\xc0\x0e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xfe\xe2+\x00\x00\xe05\xb7\xd3'\x02\x00\x80\xf1\x01J\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbcg\x14J$\xee\xc8IIH\xbd\xe7\xa9\x11\xa7\xc0\b\fҌ\xb5d\xb9S\\\xec(%א\x95\xe6\x96\xd1\x1c\x86\xcb0\x16\xf6\x90\"\xa7\x10\x00@L8+QU\"QI\xefq\n\xb5eO\xe2\x904:\x89\x88\x15\xb5d(\x11\x00S\x1fG%\xdaNHn\xcbՑ\xb3Us\x89\xaf\xcd)؆\x11B\xa8^\xf4\xee\t:EƊV2',\xa39\f\x94\b\x80I\x87\x93\x12\x05\t٣\xa6\x86rI\xf2\x9f\xa2\aۡ\xe9\xc5\x04`\xa7D\xa3!\xe6\fV\xa0D\x00\x8c7NJ\x94A6\xe9ɡTR\x12-\xd4\x1e(\x11\x00\xc0\x11\a%:F\xe2.\x19\x1f\xaaɜ\x11z!\u007f\xb3\u007ferR\xceAu\xe3\xe0\x96t_\xf2\xbd\xed4YE\x02\xed\x19\x89\xd9\x03\x92Ժ:\xcd\xe7\xcf*\x13%i\xab2\xc5ԫO\xe0\xf4\x15\xcfMH\xbeW\x19\xe5Ր\x8a?m\x99\xebK/\xbbJ?\x9d\xfdRzB\xd2\xc2*nV<b\xb0\x82^\xb2,,\xe2\x964_\xc6\x03Ò>OdW\xd8٭\x19\xbe\xe4\xe5!\xa5,&\x03[W\xfe(\x96C2\xe7\xa9*\xd1<\xb2U\x02\x00\x8c\x0f\x0eJ\xb4\x9d,0?\x88\x84\xb4)\x17\xf2\x1c\xdf\xe2\xdc8RL\xb7\xb5\xfb\x89o~\x06!\xe5\x12U\xa2-\xb3\t\xf1\x8fH%\x84\xa4\xcdO\x95_\xaeJ\xf5\xab\tY\xb9zP\x93\x88\x86\x042g\x81\xbc\x83^\xc35dS\x1aIJ&$KV\x8c\xbe$\x92\x9c\x9dI\xc8]̱#\x06\xab\xe8%אy\xa9$U\xde5oDS\"\xbb\xc2Z\x12ɜl\xb9\xb0\xa0\xc4g`\xeb\xca\x1f\x85?${\x9eP\"\x00\xc6\x1b\a%\xba\x87\x1b\x90\xcd%U\xf4\n%\x99\x03\x92ԝL\xea\xe5\x9eB\x12\xd9zM\x92:\x93I\x13U\xa2\xb8\xcc涧\xa46\x92xR\x8e\xee\x9cC\xbee\x8c\xa1\x14\x898\x1dG\xca\xe5˺\xd1G\xaa\xd5r\xe4.J\xd0G\xea$i9)\xbb!\xefO\"-\xc6\xc1\"\ak\x18\xa33\x92\xd1%wm\x12h}\x94\xc3\xd8\x14vi\x0e)\x1b\x91n~\x93̾\xcag\xe0\xea\xca\x1d\x85\xfb\xc0\x9d\xa7\xaaD\r\x81N\t\x000>8(Q6\xd9n\xfd$_\xa1}\xf4\xc3A\x92A\x87HK%\xf5C&U\"u\xcf\xfdZ\xa6\xfb\xa9\x8c\xb1J\xb4R\x9b`\xa9%)#\xb4\x9c~\xfa\xa1\x98v\xae\xd2\xe5a\x96L\xa0\xb0\xd58X\xe4`\rS\x89\xb4]%\xdaal\n\xdbN\xeeQ\xde\x17\x92Z>\x03WW\xee(\xdc\a\xee<1O\x04\xc0x\xe3\xa0D\xf3\xc9\x0e\xe6S\x0e)\xa3W\xe8B\xe5ÈO\xbeR\xe7\x92f\xf5C\x1c\x19\x90\x95(C\x8d\x1bQ\x87P;\xe8\x15\xcb(\xd1H\"\xe9R\xf7\xcf!!\xb9\x9c,\xe5C\x80N /&9\xa1\x1b\x12K\x94`=BW\xa2y\xe6.E\x89\xc2\v\x93\xb2\xb4z\x0e^\xb2d\xe0\xea\xca\x1d\x85\xfb\xc0\x9d'\x94\b\x80\xf1\xc6A\x89\x96s\x93!\x19\xa4\x82^\xa1_Q?\xcd#\xadÄ\xcc\xcbQH m\xb2\x12ݣ\x05\x8e\x84\xea\xcaW\xa7\x13\xb2\x8eS\xa2\x01B\xb4Y\x9e\x85\xf2\xc0\xa8F\xebf(\xe2\x11\xf2\x11\x92\xb4\xbaޜ\x8f\x8e\x16\xac\x1fDW\"uW=}\x8fP\x98\xe4S\xfb7\n\\\x06\xae\xae\xdcQ\xd8\x0f\xfcyB\x89\x00\x18o\x1c\x94\xa8\x8c\xe4\x98\x1f\x86\b\x9dy\xa9ѻI9\xe4\xa0HL\x9ad%Z\xad\xee\t\xa4\xd2\r\xf3\x17Z\x94\xa8\x8f\xc4k%-%U\x92~3]\x15\x97\xbeu~9K|\xc95\xfd`тU,w\xf1M%\n/\xec\x1a!\x83F>.\x03WW\xee(\xec\a\xfe<\xa1D\x00\x8c7\x0eJ\xd4E\xe2\xccK\xb8\x9e$\f\xd1+\xb4L\xfd\x98E\x8e\xc9\xdat\xc6\f֕蛄|\xa9\xa1{X\xaa\x88\xd8'\xcaQ\xba9\xbc\xb8\x8ct\x96\xcf#\xe65\x1e=X\xc9\x10Q\x89\xc2\n\x93\b\xd7'b2pu\x8d\xa8D\xfcyB\x89\x00\x18o\x9c\x9el\xcc4\xaf\xba\xe1\f%]\xa3\x8d\xc1\xae%\xc8\xfd\x8c\x14z/\x89\xd29pCW\xa2\x1bsH\xad\xb2m\x8bE\x89n\xcc\xe6\xa7~\x98\xcb~ \xa4\xa4\xabI\xbc>\xc1\x13%X#\xa2\x12\x85\x17&\x9f\x86\xfa+\x90\xe6\xc5\x01.\x03_\u05c8Jğ'\x94\b\x80\xf1\xc6I\x89:\t\x9d\x1b\xa2\\[J\x12\xcfK\xf4\nMP\xbaI\xfb\xe9\xa3F\xc5$\xfb&\xfd\xd0J|Wu%\x12\xb5[h\xc3i\xf4\xb3ݽ\xb3:\x924b\x1d\xfd\xd0'\v\xa5~\x12g</\x141X'\x92\x12\xd9\x15\xb6U˷\x94|\x93\xcb\xc0\xd75\xb2\x12q\xe7\t%\x02`\xbcqR\"y\xd8B\xeej\x1b\x92\xc4\xfa\f\x12\xa7\xdc?\xaa!d\x81,E\xad\x89\xf41\xc7~\x1f)\x19\x96\aq\xc9d\x8b1:\xbb\x91\xa4Ls_^L\x94\x89\x98\x04\xd2t\xed\x86z=wǓ\x1d\xb284'\x92\x80\xe5J\xbf\x8b,\x96\xd5cx\xb51\xe7\x1d-XG-9\xbcOdS\xd8@\"\xd9qC\xbaYA\xfc\"\xdf'\xe2\xea\x1aY\x89\xb8\xf3\xc4\xf3D\x00\x8c7\x8eJ$5諂\xa4)?u\x90\xafЌ\xd9\xf1\v2\xb4\xbeR\xb3\x8f\xccΖ?䎘\xf3D\x01Bҗf\xc7%oWn\x97g\xcbY\xdb5\ti\x88'I\xd9i\x84^\xce\xfc\x95~>\x99\xf8\xb2\xe6'\x92\xd4\x01\xe6\xc0\x91\x82uԒÕȮ\xb0\xa0\x8f$g'\x93\x84\xa0\xa5\x13\xc5\xd55\xb2\x12q\xe7\x89g\xac\x01\x18o\x9c\x95H\x12+r\x92\xe2R\xee\xa9\xd5\xeeD\xc9Wh\xef\xd29\xc9KO\xa9\x1f\xcfnJ\xf7%f\a\xe88ȸw֖\x9b\xe2\xcb\xda\xfe\xa7a\x1f\xbdc՟;;\xe9\xa0.!}Ei\xbe\xb4\x95\xedZ9J\xb0\xbagpK\xa6ov\xd6v\xf6\xce{\xe4`\r\xb5d\x9b\x19k\xbb\xc2\xfa\x8b\xd3\xe2S\n{%\x8b\x12qu\x8d\xa2D\xecyB\x89\x00\x18oF\xa1D\x16\xf4+\x14\x00\x00\xc6\v(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x9eؕ\b\x00\x00\xc6\x1b(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x9e\xf1R\xa2\xe7\x84o\xdb\xef\xc0\xad6\x00\x80#P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\xcf$Q\xa2\x96\\n\t\x8f\x98\x18\xcamq\n\x01\x00Ln\x1c\x94\xe8E\xe1\xb9?\u007f{M\xfe\xc6W\xa4[/n\\R\xf0\xddO\x95\xad?ߵ6/\u007fÓ\xff\xa6|x\xe7\xa1U\xcb\x1e\xfc\xad\xa6D\x1f\u007fw}ު\x87\xdedJ\x90\x95h\xa00ٟ\xd3 ѕ\xa5U\xa71\xa9\x82\xb3\x96\xa5\xeb\x95UHc'\x10\xf7\xad\xa8\xfbK\b!\xfe\x81\xa8!:\x9d\x84\xe4JR\xb3\x9c\xe1T\xe4\xa0\xf6TC\xfa\x86\xb6\xa4\xf9\x97ߌ\x1c\n\x00\x18\x15\x8eJ\xf4\xedU\u009a%\x82\xf0\xca\xe3B\xfe\x1aA(\xa5\x1b\xbf-\b\x05\x1b\v\x04a-ե\x17臼\xbc\xaf*J\xf4\xe62!\u007f\xe3zA\xf8\xbeYB\r\x99\x97L\xe6e\x12R(IW\x13\xd4U\xa3\xa5L\x12b\x8f\xb2?\xaeA\xba\x1dZ\xe3k\xa2\xed\xbe\x1c\n\xd5j\xcb\xf3;1r\x92\xf8C\xd2p399\"q\x9c\xea1ӭs\x9a\xf5\xe4Ҵ\xa7J\x12\x87$\x00\xc0\xed\xe1\xa8D\u0086\x0f\xa5뻄\xfc\xfc\x1fߒ^\x11\x84\u007f\x95\xe5Fȧ\x9d\x9ew\x96\t/H\xd2o\x85\xbb_\xbc%}\xf2\xa0@\x95\xe8\xe3e¾\xeb\xf2\x9eU\xc2+F\tԅ\xbe_\xeeG\xf8\xa9\x89\xc6JRN\xb7\x9d&\xe9\xecA\xce\xfb\xca\xf5\xe4\xd5\xc5c\x1a\xa5\xed\xf0]\x8e\x1e\xd0=J%\x92\x86I\xb1\xdc]\x1b$Ö\xed\vm\x17\xd1\x1f\"\xb2\x04ZC\x01\x001\xe3\xacD\x1f\xcao\x1f\n\xc2s\xf4c\xa9\xf0\xa2$\xed\xbb\xfbIe\xdf>\xe1qI\xda%\xec\xa3\xe9O\xd7P%\xda'<\xa4\xec\xf9\x89\xb0\xc1(\xa1Fs\xcf\xd8O\xad\xaa\x83\xaa\x04\x95\x11Cz(%s\x19\xbf\xc5>i\f\\\x9bˏ\xf6\u0088A\x89N%\x8d\xd8(Q\xce:\xbb\xe8\x01\x82)*\x00\xc6\x03G%ZO߮\v\xc2\xff\xa2\xef\xbbh7H\xba~]\xd9\xf7\x03\xe1\x1f\xa5[+h/I\xa2\"$+\xd1Z\xad/$\x87\u007f\xa4\x97PC\x16)\xef\xc3\xd4Q~$\x99*\xc2\xcdT\xd6\xc7P\xba\x91\xb4]\v\xcdj=Cζf)\x0ed\x03\x85\xa9\ti\xcb\x15\xbb\xa0\xda\x1c\u007f6ݶ\x95$ԕe\xf9\x97^\xe6\x92\n;\x12-\xa3)\xbe\x04F\x89\xf4\xc2$)\xb44=!uy\x86\x92>\x98;'\xeb\x01\xaa\x87\xc3d0\xa7YW\"=\xb6E\xf3\x14\xa0~\xb8C\x89\x84\xc45ҽ7Rԭe\xd4|\x88\xc8\xe2Z\xa18\xc4\x02\x00b\xc7Q\x89\x1e\xa4o\xff.\b\x9f\xd0\xf7݊\x12I\xd7\xdfy\xf1\xfb\xbb\xd6\v\xc2n\xe9\x13APe\xe9Dz\x12}*\b\x1b\xefS\xc8\x13\x8cIk\xc326\x83\xba\x12m!\xf7\xcb#5\x92\xcd\x1e\xa3\x87hv=b1\x99/\xff\xb7\x8e\x8aGgRN\xa0\xbd\x82T\xcb\xc9\x12ߎ\xd6\x1d\xbebI\xeao\x8c'\xa9\x15UI\x85\\R!\x14\xde\xe7aJ`\x94\xc8(L\xde\xf4\xa5\xe6\xf6\xbaTB\xdd\x197\xc5\xdd\xdfZ\x93\x9asSQ\xa2\x9a\xe5\x9a\x12\x19\xb1\xd7B\xa1\xac\xbbB\xa1\xd0YZ\xc2\xe9Pȧί\xf7\x86\x1aIE($Ҁ\xf4-\u007f\x92\xaeV$\x870T\x03`,8*\xd1\xc3\xf4MV\"\xe5F\x99\xa2D\xb7^X#\b\xc2\xdd\x1bKe%\xfaH\x10\xd4\xc0\xd7e%\xfa\xb3`bL\x14Ր\x1djb>i\xa6\xee֩7\xa5\"M\x1e4Z\xe5ΒƱ\x04\x92\xd0F\x13#\xe9\xf7ʝ\x9c\x1bMC\xf26B\xdd=ک\x8eI\xbed\xb9\x13T\x9c*\xf1I\x99\xcbĘD\xd6`J\x90L%b\n\xabM\xa5\x1aT\x9b,\xd1\x1a4(1\x8d\x8a\x12]\x9d}UQ\"\xf6\xc0\xfc\xe8̯\xdf\xe93Gg\x15\xb4\xbf\xf4%\x871\"\x00 \x02cP\xa2焻\x1f\xff\xf1o?\x95\xdfw\xd3n\x90zc\xff'j\x9f\xc8\x18\x94\x19Ԑ\a\xd4D\x069)ѻf\xa7F\xfc\xf1ܴt\x90\f\xaa\x89\xa12_:\x99\xeb\xdb.\x8bG\x1b\xe9\xd5wo\x9a\xaf\xbcͧW\xb9\x8f\xbeT\xf8$>)Q%\xb2\x0e\x8b\x98\x12$S\x89\x98\xc2Ĺ\x99[\xeb{%*GE\x997(\xe9%\x8a\x12I˫\x15%b\x0f\xec\xa8D\x97I\xbf4\x92tR\x02\x00\x8c\x85ؕ\xe8\xfa2:m-\xf3]Y\x89n\xad\x12\xdeQ>|\x9f\xce\x13\xadѻB\xef\xfc\xf1\xdf\xf5\x12j4\x87\xb2!\xd5#\xba\x82lmc=\xcb$\xdaO\xd2FN\x81Ժ~ҿ?u\x0f}\xf2Ș\xf7Y\xa4>\x19\xb9r\xa1\xfc\xa2\f\x8b4%2\x93\x12U\x1a\xee\xb1\x00\x89+A2\x95\x88-l\xa8n\xdd<\x92\x16\x90T\vG\xcajU\x89\x9a\xb3\x15%bc\x1d\x95HZ\xfe\x80t,\xf9\x86\x04\x00\x18\v\xb1+ѿ\xa9\xb7ӤO\xd7\n\xbb$\xe9q\xe1\x1f\xe9\x87\xeb\xeb\xa9\x12}[\xb8\xef\x16\xfd\xf4s!\xff\x13\xbd\x84\x1a2[\x994\xdeC\x94.\xc6 I\xdfj\x19I]\xf3\xe9\x17\xf6\r\xe5\xde\x19\xbd\x9cO\x12\xe3\xf9\x9d\x92L\xe5-S\xe9\x13ER\xa2\n\x9fu\x82\x86)A2\x95\x88)\xec4\xbd\u007f7\xdc试\ay\x99=\nWU%\xba6\xa7\x9d*\x11{`U\x89\x1a.\xa9\xa5\xd9)QKꍒM\x12\x00`LĮD\xff\xbeB\xd8'\xeb\xcd\x1f\x1f\x14\xe8=\xfb\x8f\x96\b\xcfݒ>ݥ<O\xf4a\xbe\xf0\xb8<X\xfb\xed*\xe1\xbbF\t5\x84d_\x96\xa4&\x9fv\xd1\xe6\x12\u007f\x92\xe5>\u05faL\xe3)e1Y\xbd\xd75\x9c\xb6\x98\n\xd2W\x94\xfbR\xf4NU#i\x95\"+\xd1\xcdy\xc6OJ\x06\xbfu\xdeZ\x82d*\x11SX\x059F\xb7,\xdeB炔\xb1ݎ=\xaa\x12I%ET\x89\xd8\x03K\x8b\x17Kҟ\xf4!\xa0\x9d\x12\xddHmI\x89\xf2\\6\x00 \x1a\xb1+\x91\xf4#AX\xff\xe0?\b+\x9e\x146ʛ^\xc9\x13\xd6\xfcC\xbe\xf0\xb0\xf2\x8c\xf5\xebK\x84\xfc\xfb\xd6\v\xc2\u05ee\x1b%Ԑ\xa5\x89\t\v҉>q]O,\xbf\xf4\x90\xa4\xb3qU\x92\x95S\xb3\xe7?\xd5v?\xa9\x97\x93\xc5q\xe5\xad\xe5qŲL\x85\x12J\xba\xa4\x9e\x92\x84\x90\xc8$it\xb5\xd9\x01Z\xad\x8f\xfd\xcc\x12D\xfa\x8cuu(t\x89-LV\xa2\xa4\x8a\xd6`\x89r㮜\x145\xb7\x94\x90\x83\xf4\x19\xeb\xe6a\xa93Q\xb9wf\xc6Rͫ\n.\x9d#\x1f\xecFW(\xe4+\tћd\xea\xbd3\xfd\xa6]y&\x06g\x00\x8c\x951(\x91\xf4\xe6\xd7\xd6\xe4ox\xf2\x93O\xf3\xee\xfeX\xfe\xf4\xaf\xbb\xd6\xe4\xdf\xf7\xe6+\xea\xef\xce>z|}^\xfe}/\x98B$+Qy\xdf\xd29\xfeEm\xda\xe7a_ؔ\x8e\xb4cv\xd8&i`]z\xd2\u00a0\x92ܟ\xad?ODHB\xff\x1c\xf9u+\x93\x94w\x84\xfcۍ|\r\xa9u\xd6\x12J\xb4i\xa0\"\xb60\xe9\xe0\xe2\x8a\xf4\x84\xb4\xc5\xea\x13\x04\xed\xf7\xa4$\xd3*v*\x8f\x04\xdd\xccM\xbb\xc9\xc5J\xd2\xc8\xfd)\xfe\xbb\xba\xe5Dw\x9cZX\x1d}8\x8a\x12\u007fV;\x1c\xc1\xe0\f\x80\xb1\xe2\xa0D\xe3\xcfy\xfe\x97\x1e*e\xbe\xdby\"\xb0\xc9W2\tz#þN\xa7\x10\x00@\x04\\W\xa2\x1d\xe4\x9b6[\xab\xd3\xc7\xf4{3\x85\xa1\xb9\xd1\u007f\x8a\xef\x12M)\x93@\x0e\x01\x98\xa2\xb8\xabD\xfd\x83M\xb3}\xa2S\xd4\x14\xa4\xa2SZZ!\x01\x00ƈ\xbbJTH\xc8m\xadD4Y\x19!9[Ӱ8\b\x00c\xc6]%\n$\xa6NG!\x92\xfbDI\xf7\x9cu\x8a\x01\x00D\xc4]%\x02\x00\x00;\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xc6I\x89>\xe6~\xdf1\x1a\x873\x00\x000\x18\x17%\xba\xf5B\xfe\xa7\xe6'(\x11\x00 F\xc6E\x89\xae\xeb+7*@\x89\x00\x001\x02%\x02\x00x\x8fgJԒ;\xb6\u07fcnqg퍡\\8\x99\x01\xe0\x1eNJ\xf4\xd1\xe3k\xf3V\x94\xfeH\x9d\x90f\\\xef_\x14\x9e\xfb\xe4\xbbk\xf3\xd6?\xf9\t\xf5:\xa3|\xa8g\x91\x95h\xa00ٟC\xfd2\xaa\xc9<uc\x85e}\xb4\xc0\x18\u007f\u007fv\x86\x94K[I\xdc\xed,\"2:\x02q\xb7\xfd\v\xff\xbe\xa5sҊ:\xd3\xfe\xa4,\x90\xe4\x1f\xd07\xb7\xa7\x8eZ\xe4Z\xe6\xcd^М\xd3\xea\x14\x06\xc0\x94\xc7A\x89>\\&\xac\xbao\x83 |\x8d\xaeOͺ\u07bf(|\xb7@X\xb6J\x106\\\x97~\xbcK\x10\x1e\xde\xf5\xb1\x9e\xa7\x86\xccK&\xf32\t)\x94\xa4\xab\t\x9a\xa9k&\xbf>\xda\xfe\xb8\x06it\xb0\x86\xf42ų\xffD\xd7ndd\x8c\t\xb0\xc4\xde\x1e\xad\xf15N!\x06\xb6\an\x9f\xb3\xb0\xbe1\x9b\x903\xd2e\xbah\xa4\xbe\xb6\xa3\xd4:\xc7\xea\x88\xc4c\x16\xb6\x9f\x14\xb7l'd\xf4\xf5\x00`\xaa\xe2\xa0D\x0f\vO\xcaݡ߮\x10^\xb7\xb8\u07bf(k\xd0;\x92\xf4z\x1e5\xfa\xb0\x8e\xceHF\xbf|!\xfaI\xad$\xadT\x8d\xa7O\xf3룝\xf7\x19v\xd4W\x17G\x1f\xa5\xf1\x86\xf4\x03\xaa\x8f\xa3\x8fQ\"&\xc0\u07bc~\xac\xec\xf0]\x96F\x89݁\x87\x92V\x8fHҵL\xd5\xefv\xd4v\xd8La\x03ʊ\xbbeP\"0\x03pP\xa2\xf5\xea\xa0\xebG\xbb~nq\xbd\u007fQ\x1b\x8e}\x9b\xae\x1a\x1b\xa6DJ?h?ɠff\x8a\x04\x95\x11Cz(%s\xaf\xe9\xc9>\xad\xd3\x14\tސ\xbeD]݈U\"&\xc0\u07bc~\xac\\\x9bk]p;\"v\a.OT$\xb6\x8a(?ҏA\x89\x8c\u008aS\xa9\xf5\xc0\x19R\x1b-\x1a\x80i\x81\x83\x12}M(}G\xb7.\xe3\\\xef_\xa4r$\xf3\x02]\xe8ڪD\x8b\x94\xf7\xe182@\x17{\x96/\xc1\x9b\xa9j\xcf@\xe3F\x92\xb6\xeetMV\xeb\x19r\xb65\xab\xd6bt\xaf\xdbԳ\x86\xf4\x94\xc1\xf8\xaf(\xef\xbe\xedZ,\x13\xc0$\xb7\x92\xf8\x9aM\xe9)+\a$\v\x03\x85\xa9\ti\xcb\x151\xd3=\xef\x99\x03\xf3u\x90;E\x89\x16\x13\x12>@/\x81\xaf\xa4^u)S\x9dZ\xbfZ\xa5\x14\xa2+\xd1P\"!q\x8dZyz,S.[X\x8a\xdaJ\xfb/\xb1G\xb3o(\x00\xa68\x0eJ\xf4N\x9e \xac\xd8\xf5c\xaa3\xbc\xeb\xfd\x8bZ\a\xe9E;%R\x9d}\xa4\fj伅\xdcOm|\xb2\xd9R{\x88\xb6\xe4\xb3XL\xe6\xcb\xff\xad\x13y\xa3{æ\x9e3\xa4\xa7;\xb4\x01\x93\x8f\xccklI+\xe4\x1c\xeb\x99$-,cOE\x86\xdf\xd2\xdd\xeaL\xca\t\xb4W(^؆\xe7=s`\xae\x0e2!k?\x86\v0J\xe0*iT}$\x8e\xb3\xdc6\xfaD\xa7C!\xbdGg\xc42\xe52\x85\r\x11f.ͮ\xbeL\t\x00Lq\x9c\xee\x9d}\xb8+_\x10\x84\xbco_\xb7\xb8\xdek\xa6\x1f\xaa\"Y\x95H3\x14\x9aO-\x16\xbbH\xeaM\xa9\x88p\x97e\xab\xdcY\xd28\x96@\x12T\xdb\x0f\xd3螱\xa9\xe7\a>\x97\x12\xb6\xaa\t\x1f] qS\xaad\t0\x93\xbe\x8ca\xf9RNϕXF\xd2\xef\x95\xfb'7\x9a\x86x\xcf{\xf3\xc0lR\xa2\x0e\xd3aS\xcbf\x00[\x82y`\xb3ꃄ\xbbCƎ\xce4\xbb4\xf64\xd9\x03\xeb\x85\xf5+G\x90FFF\"\u0557k(\x00\xa62NJ$\xcb\xcc;\xdf\xdf(\b\xffhq\xbd\x8f\xaaD\x0f\xa8\x89\fB}\xe23ɩ\x11\u007f<7-\x1d\xa4\xf6\x86\x94\xa12_:\x99\xeb\xdbN\x17^5\x8d\xee\x19\x9bz^\x89\xb6&h\xf9|\x9b$\xc3v\xd1^\x89\x94i\xa9Z\u00ad\xe8\xdaFz\xf5$\xebyo\x1e\x98MJT\x89\xc2\x1e\x160\x03\xd8\x12\xcc\x03\x9bU\xbf\x11o\xdf'\x92\f%bO\x93=\xb0^ذ\xa23E\xf2P\xedd\x84\xfar\r\x05\xc0T&\xba\x12\xdd\xfa\xa3\xeaz\xff#!\xef\xdfy\xd7\xfb\xa8J\xa4z\x1f\x0e\x11Bgd*\xc8\xd66\xdd\rQ\xa3K\xbf,\x03\xa9u\xfd\xa4\u007f\u007f\xea\x1e\x895uel\xea9\xa1\x11}\xfaS\x8d\xac\x01\xac\xbd\x12)\x17{'\xe7H-U\x13cއ\xf5\xbc\x8fhq\xdd\x1d\xee\xccf\x06\xb0%\x98\af\xaa\xae\xcd\x13\xddh\xd7\xca\nS\"\xf64mOH\x99'\x12\x9bI\xf9H\x84\xfar\r\x05\xc0T&\xba\x12}\"ܭ8.~(\b\xd7y\xd7\xfb\xa8J4[\x99\x13\xdeC\x94?\xe4\x83$}\xabe\x98s\u0378\xf7uC\xb9w\xa6\xd8\xf3\x98\x17\x18cS\xcf\x19җŝײ\x85]\xb8j\x80\x99\xf4)SUu\x8a\x95\xab\xc1IS\x98X\xcf\xfb\x88JT\xe1\xe3\xb2\xf3\x01l\t恙\xaa\x97\xfb\x95\xfa7\x11\xe5\xcdF\x89\xd8Ӵ=\xa1\xe24\xaa\x9cAz\x17\u07fe\xbe\\C\x010\x95q\xbcw\xf65Y\x8a>\xdd%<hq\xbd\xe7\x94H\xca\x13^\xb9\xae\xdfb\xa3w\xf1\xb3/S?Dm\xa6$\x97\xf8\x93,7\xa1\xd6e\x1a\x93\xacb\xb2\xe6:d^`\x8cM=kH/\xfa\x8cQ\b{\xe12\x8e\xf5fҗ6L\x9f\xe5Y\xacD\f~KU\xb0\xe1\xb4\xc5T\xf3\xbeR\xc6{\xdeGR\xa2\x9b\xf3\x8c_\xad\xe8%0\x01l\t恙\xaa\x0f%\x15\xcaG\xbb\xb9X\xd5\x10\x1b%bO\xd3\xf6\x84\x06\x94\xe7\xd0\xef\xa1Jd__\xae\xa1\x00\x98\xca8(\xd1ǫ\x84\xbc\r\x1b\xf3\x855t\x8a\x88u\xbd\xe7\x95\xe8>A\x10\xde\xd4\xf3Ԑ\xa5\x89\t\v҉>q]O,\xbf\xf4\x90\xa4\xb3qU\x96-\x9cѽaS/I\xa6!\xbd\xf4\x80>\xcf\xcd\xc52\x01L\xd2Gr\x9a곒\xd5\f\xab\xf5\xc1\xe1\xa9\xd9\xf3\x9fj\xbb\x9f\xd4K\x8c\xe7=S\x18_\xae<\x983\xbaPZ\t\\\x80Q\x02w`\xa6\xea\xc7\xfc\xb9\r-K\xe3C4_\xa8\x96T\x87Br?\xe7FW(\xe4+\t\x85\x86\xd9\xd8H'TM6\xb5\x96\xa8\xcfX\xdb\u0557o(\x00\xa62N3\xd6\xf4\xa7f\xf9\x1b\x9eT\a_\x8c\xeb=\xafD\x1f\x96\xe6\xaf\xf8\x89\x9e\xa5\x86\x94\xf7-\x9d\xe3_Ԧ}\x1e\xf6\x85Ϸ\xec\x98m\xd9\xc4\x1b\xdd\xeb6\xf5\x12cH\u007f5\xb1\xd86\xd6\b`\x93\xbe\aJ\x92\xe7\x16k\xbd\xad\x86\xd4:-\xe7\xc0\xba\xf4\xa4\x85A%\xa9{\xde3\x85\xf1\xe5\x86\xfc\xdaCOf\t|\x80^\x02w`\xb6\xea}K\xfdi\xab\xfb\xe5D\x896\x9fS$\xf7\x8d\xe2\xd4d\x1d\x1b\x1b\xf1\x84\x82\xf3\x12s\xdb\xd2\xdb\"ԗ?\x1a\x00S\x19'%\x1a\a\xce\xf3\xbf\xf4P)\xf3\xc5\xfa#\xd6r\xee\xe1H\a؇\xb0\xc7F\x93\xaf\x04\xee\xd2\x00\xb8\x85\vJ\xb4\x83|\xd3fkuz\x8c\xf3\xac\x9bbY\x0e䶕hh\xeem\xff\x14\x1f\x000j&Z\x89\xfa\a\x9bf\xfbD\xa7\xa8q綕\b\x00\xe0&\x13\xadD\x85\x84\x8cq%\xa2\xdb@\x9d\xd5\x05\x00L\x19&Z\x89\x02\x89\xa9\xae\v\x91:\xab;\xe8\x14\x05\x00\x984L\xb4\x12\x01\x00\x803P\"\x00\x80\xf7@\x89\x00\x00\xde\x03%\x02\x00x\x0f\x94\b\x00\xe0=\xe3\xaaD\xfaB\x8e\xd1y\x8e.}\xad1:o4\x00\xc04\aJ\x04\x00\xf0\x9eqU\xa2\x0f\x9f{\xdd)D\x82\x12\x01\x00\xc2\x18W%\x1a\x1dP\"\x00\x80\x85i\xa7D-\xb91\xfe\xb26*[b\xf9\xd9-\x88\xc2diɡ\xdcQ{\x81\x8f\x85\xc9r\x9aS\x0f\a%\xfa\x91\xf0\u009b\xeb\xf3\xff\xe1#u\xa1\xa2U\x0fiˡ}\xb4o\xfd\x92U\x0f\xabk\\3;\xe8<\xd1\x0f\xb4\x85\x8b\xa4Dž'%K\xb6w\x1eZ\xb5\xec\xc1\xdfZ\x94h\xa00ٟ\xd3 \xd1u\xc1\xe6\xa9\x1b+\xb8\x95Ն\xb6\xa4\xf9\x97\x8f\xdaG'0\xae\xbfr;Cʥ\xad$.\xd6\x05L(\rt\x15\xa2\xd4{{\xa4qf\x13!t\x95\xb9*B\xac\xdf\xf9\xf6\xd4\t\xbd\xc6n\x8f\xc9Ӓ\x818\xfbU\x16ƥ\xf9n\xe34\xc7H0^[\xfc*>\xbaǹF\xdf\xd29iE\x9di\u007fR\xd6\xcc\xf2\x0f8\x85+t\x12\x92+I\xcdr\x86S\x91\x83\x98\xe6c\xae\xd8\x18\x1a\xd5Q\x89\xbe\x9b/\bˮKo.\x13\xf27\xae\x17\x84\xefӭ\xaf\xe7\v\xcb\xee[#P\x8bjn\aU\xa2?\nyʲjחQ\x93X.\xdb\v\x82P\xb01/\ufadc\x12\xcdK&\xf32\t)\x94\xa4\xab\t\x9a\x1dl&\xb7\xb2\xdaҴ\xa7J\x129\x8f\x8e(\xec\x8fkp\n\x89\x8a\xc5\xe0\xbex\xf6\x9f\xe8\xcfi\x19qc\x02NE\xbd6\x86\x1bȷ:\x1brug\xb7qCL\n\xd0\xc6\x18\n$YW8h\x9d\xa3\u007f\x17\xa3\xd7\xcc\x1d&YK2\x87h\x8d\xb7\xb5\xf76\x9b/\x16\xc6\xef4\xc7\x18\x10 ڂ\xa0$`\x93A\xc5\xcc\xd6>ga}c6!g\xa4\xcb4\xdb\xe8~&>r\x92\xf8C\xd2p39iY\x04\x9a\xad\x0e\xd3|\xcc\x15\x1bC\xa3:*\x91\xb0\xfe\xf57_\x94>^&\xec\xbb.wjVQ\u007f\x8f?/\x13\x9e\xbc.\xddz\x8e\xae\xac\xcf\xedP\ue755\n?\xa69_\x176J\xfc\xde\xdf\nw\xbfxK\xfa\xe4A\x81S\"\x92\xd1/7\x90\x9fZ.\xafT-\xabOs+\xab\r\xd1\xc5S\xc3V\xb6\x8f\xc0y\x1fgz\x1d;\xbc\xc1\xfd\x80\xea!\xc9.1\xc2\x04\xf0\xb1a\xf4)\x16e\x8b\xb2\xa2\x06\x8d\x81lUk\xeb9/K\x1e\x87\x9a\x8d\vW\x17G\x1f\x05O\xb2\x96d\x0f\xb1\xc3wY\x1a/\xc6\xf14\xc7\x16P\xed\xd3\x16IO\xe4\\\xad8\x8clCI\xabG\xe8\xfa\xeeꢃ\xa3vH\x1f&\xc5%\xd4\x1a\xc3z\x19\xda\xd77\xa6+\xd6\xc4Y\x89>\xa4\xef\xfb\xb4\xfb\xf3?\xa1&\xd4O\xd2\xf5\xf5%\xaa9/\xf2;\x14%zQݻKx\xc1\x92m\x97\xb0\x8f\xa6?]\xc3+\x91\xd2\x0f\xdaO2\xa8\x8b\x85\"Ae\x84\x95\x93\x012\xea\xfe\x9d$\x95̽\xe6\x14\x12\x1d\xde\xe0\xbeD]Y\x89\xfdb\xd9z\x1a٢^?\xfb\xc9m\xd6(\x8cBuy\xf0\x1d\xbaS\xad\r\x0e5\x1b\x17\xfa\x88\xc5`\xd7\xc2$kI\xf6\x10\xd7\xe6Z\xd7U\x1f;\xe3x\x9ac\v\x18\x19\xd0$e\xc0\xd2aa0\xb2\x95'*\u007f>\xaa\x88\xe2W\x1c\x83\x12\x9dJ\x1a\xb1Q\"\xfb\xfa\xc6tŚ8*\xd1z\xe5}\xad\xe6uv\x9d\xda/n\xd0>|\xfc\xf1-~\x87\xa2D\x9f\xe6\t\xd4\x0e$\x9f\xbe\xb2{o\xad\x10\xfeU\xf9\xb0\x8fS\xa2E\xca\xfbp\x1c\x19\x90F\x92i\xd3\xdcL5\x97\x89\xbd\x91\xa2\x8e\x81\xcb\xe8J\x1fq\a\xa5A\x1f\x9dK\xe2\xad\xe1\x19\xaf\xfb\x1bI\xea\xd2ӽ\xf2\xd8y\xc7@q\x86\xff\xde\x1b\x15r\xeeF\xa9\x91\x18\xeb\xfb+؛\xcb\xf3\x06\xf7\xf2\x1f\x81\xf8\xaf(\xef\xbe\xed\xe1\xa6\xf5Lr+\x89\xafٔ\x9e\xb2r@\xe2P\xaf\x9f\xe2t\xee\x10\x92\x14Z\x9a\x9e\x90\xba<Ú\xcd\xd6\xf6ވeK(W\xff\x10\x15\x95\xb3\xa7)\r%\x12\x12\xa7x\xc1\xf2g\xa1gccm\xe1\x03\xcc\xfa\x0eo\x9f\x97tW\x97\xba\x96\xb6AMV\xeb\x19r\xb65\xab\xd6˖4j\xc6|5$ۦ\xb6VgG\xa2\xf5\xaa5\x9b\x8f?!\x1d\x17N\xd3\xfe\xdf-\xcaY\x98\x98\x92\xe2\x90M\xf3\xe0\xbbZ5\xc2gӿ}\x11\xber\xc3d0\xa7YW\"=\x96-\xd7l>\xe6\x8ae\xb62\x85E\xfc\":*\x91\xd2\xc1\xf9T\x106ާ\x90'\xbc)-\x11\xfe\x97\xbe\x9fߡ>\xd9\xf8\xb0\xdcU\x92{A\x0fZ\xf6~B=\xd3(?攨LMdP\xa3\xe5-\xe4~j\x9dÌ;zC\x8d\xa4\"Dm,\xd4\xd1wW\x89\xcfb\r\xcfxՄ8\xd0\x00\x00\t)IDAT\xddK=\xda\\\xc2HScFVRFY1\xb9t\xb5(74,\r\x87\x16\x15\xb1\x83\t{sy\xce\xe0\x9e\xee\xd0z\xf1\xf2w\xbc\xb1%\x8d7\xadg\x92\xb4\xb0\x8c=\x15\x19~\xbe\x93\xd0GZG\xcen'{\xb8C\xc8\xff\xfa_jn\xafK%7\xf8l\xb6\xb6\xf7f,[B\xfdB\xa9+\xa3KʩgOS\x1eӆB\xea\x9fb\xee,\x8cl\\\xac\x1d\\\x80y\xb4\xa1\xcc\xd4@\xdbVBj\xb9`\xb1\x98̗\xff['zؒf͘\xaf\x86}S[\xab\x13\n\xef\f\x18\xcdǝ\x90\x81\v\xa7i\xff\xef\x16\xe5,L\fIq\xc86\x12g\xefKl|\xfb\"|\xe5d%\xaaY\xae)\x91\x11\xcbU\xc7h>\xe6\x8ae\xb7\x8e\xe2\x8b\xe8\xa8D\xbb\xe8۟\x05\x93W\xe4\x0e\xce\xc7\xfa~n\x87\xa6D\xaf\v\xa5\x92\xf4\xa0\xf0\x13\xcbޏ\x04A\xcd\xf3:\xa7DZWe>5g\xec\"\xa97\xa5\"\xc25\x97\xd9\xd7c}\xc9\fkx\xc6랺\x82\r\xe8\xd9r\xc8\xd2ae\xb4ڠ\xfe\xa5\x9coq\xe2\x89`.\xcf\xf67/%l\xd5b\xd3\xe4\xd27\xf1\xa6\xf5\\җ!\x1fh(=Wb\xe9S\xfe6(~$\xcc!jS\xe9?rm2\x9f\xcd\xde\xf6\x9e\x89eJ\b\xa5J\xdb}ۥTEt\x8dӤ\xf8\xf5A\x81Q3\xfe\xdc\xd8X;\x8c\x00&[\xb1bGWfQ\"\xb9\xc6\t$A\xed'yՒl\xcdX\x1b:ۦ\xe6\a\x12\x97\x89\xdd<\xaa\xde|\xe6\t\xb1L\xfci\xda\xff\xbbE>\v\x13]R\x9c\xb2\r\xf2\xe3&=\x1b\xf3\xed\xb3\xff\xca\xc9Jtu\xf6UE\x89\xd8o*_\x1d\xe3\xdbǍδ\xad\xa3\xf8\"\x8eN\x89>\xa5c/\x9d[\xda\xdcQ\xd8\x0eM\x89\xae\xaf\x10\xfe\xf8oB\xfe\xa7\x96\xbd\x9f\xeaF\xb1?\xe1\x94\xe8\x015\x91ANJ\xf4\xae٩\x11\u007f<\xdb{\x89\xa0D%z\x92\xf1\xba\xa7\x13M\xc6B\x8d9>Mr{\xe3F\xae5\f\xdd\xf01a|\t\x9c\xb9<۶[\xf5e\x1f\x15\x13\xec\xa8\xde\xd7\xca\xc4V-\xe1\xee\xf0\xf5\x91\xaa\xae\xd6\\?-\x839\x8487sk}\xaf\xe6zkd\xb3\xb7\xbdgb\x99\x12.\x91kw}iѰ\xfa'\xc58MJ\xb8\x12\xf1\xe7\xe6\x8b\xd0\x1d\xd21\x02\x98lj\x99\xfd\x16%\x1a*\U000e54f9\xbe\xed\xf4\x84\xbdjI\xb6f\xe6W#BS[\x95\xc8\xee6\xbb\xa1D\xc6\t\xb1L\xfci\xda\xff\xbbE>\v\x13]R\x9c\xb2݈\xb7\xed\x131\xdf>\xfb\xaf\x9c\xacD\xd2\xf2jE\x89\xd8oj\fJ4\x8a/\xe2\xe8\x94HZ\xa3M\xf8H\xef\xfc\xf1ߥ\xf5\x82\xfa\xa3\x8eW\xbe\xf6\x02\xbfC\xfb\xdd\xd9w\x85\x17_\x14\xfeњ\xed\xd6*A}\x00\xe9\xfb\x9c\x12\xa9\xa6\x88C\x84пp\x15dk\x9bn\x93\xa8a\xafDF\x92\xf1\xba\xa7}*\xa3ם\xa3\x8f\xa6G\xe2\xfb\xaaȎ\xb3q\x96\x99\x01\xb3\x04\xce\\\x9ei[ѧ?\xb0\x13f\x15-Y\x92j\x17\xb4\xd3tj\xa4(\xb3\x1bCq\xd4،=\xc4Pݺy$-\xc0g\xb3\xb7\xbdgb\xd9\x12|}I=I}\t\xca\x03\x1b9\xec\xa4A\xb8\x12\xf1\xe7\x16>\xc1\xc0c\x04\x98\xd9.\x13\xc5\x1dnآD\x81Ժ~ҿ?\x95\xb7\xafu\xb5%\xb9\x9a\xd9ׁij\xfe\xa2\xe9\x0e7\xe0\x93\x18%b*i2\xf1\xa7\x19\xe1\xdf-\xe2Y\x98\xe8\x92\xe2\x98M\x9b'\xba\xd1\xceec\xbf}\xb6_9\xaaD\xcdي\x12\xb1\xb11(\xd1(\xbe\x88\xa3T\xa2o\v\xf7ݢ\xef?\xa7w\xee\xf7i\x0f/>$<\xc7\xefД\xe8\xb7\u0083\x0f\xaa\x96\xb0\xdc\xde\xc7Uu\xba\xbe\x9eS\xa2\xd9ʈr\x0fQ\xb4v\x90\xa4o\xb5\xf4\x9c-J\xb4âD'\xd9\u007f\xcdk\xe6M\x8b\x1cc\x9c?\xaf\xf1\x9eE\xf3\x82\xf3$\x1e\xb3\x04\xce\\^i\xdb\x06E\xb2\xcb\xe2·\xc5r\x01fҧLv\xd5\xf1\xf7\x16\xd4y\xd6d\x9a\x979\xc4i\xfa\xd7p\xb8\xd1_\xcbe\xb3\xb7\xbdgb\xd9Jf\x05\xe6J\xe9Uj\x0e\xf34%\xab\x12њ\xf1\xe7\x16\xe5n\x9b\xc4\x05\x98\xd9n&*eZ\xfbD\xf2\x1fMz\xefL\xed\xd9yӒ\\\xcd̯F\x84\xa6f\x8fFk`7F\x1d\xad\x12M\xd4i\xda\xff\xbbE>\v\x13]R\x1c\xb3\x95\xfb\x95J7\x91\xabl6\xe6\xdbg\xff\x95\xa3JtmN;\xad.\xfbM\xe5\xab\x13U\x89F\xf1E\x1c\xa5\x12}\x98/<.\x8f\xad~\xbbJ\xf8\xae$}\x9c/\xfc@y\x9ehٟ\xf9\x1d\xfao\xf1\xd7\xe7\xe5\x15\xdc\n\xcb\xf6\xd1\x12\xe1\xb9[ҧ\xbb,\xcf\x13e_\xa66\x87Z\xeds\x89?\x89ｘ\xe7E=Yo.\xb4(\x11\xe3u/\xb3.\xf3\xa6\x16l\xcau\xd1V\xdf1\xb2\xd5\xfa\xe4\x83Y\x02g.ox\xd2\xcb\u007f\xe1J\xc2c\xd9\x00&\xe9K\x1b\xa6Oi,V\"\x06\xbf\xa5~!\xd5\xeb'\xad\xaco\x0f{\x88\nrLɻ\x85\xcbfo{\xcfIJ\x95\\\x9e[(\x15\xe6.U\x0eb\xffWɨ\x19wnl\xec`\x85\xe5\xcf1\x17\xc0d[\x97J\xbf<\xc5a\xf3D\x92\xa8L\xd3H\u07b5$[3\xf3\xab\x11\xa1\xa9٣I7\xe7\xa9\u007f\xd8-\x8cV\x89\xc6\xfb4M\xec\xfe\xdd\"\x9e\x85\xde:\x92))\x8eن\x92\n\xe5\xab\xe5\xe6\xe2L.\x1b\xf3\xed\xb3\xff\xcaQ%\x92J\x8a\xc80\xffM\xe5\xaa\x13]\x89\"~\x11MF\xa9D\xd2\xebK\x84\xfc\xfb\xd6\v\xc2\xd7\xe8\xfd\xaf\xd7\xf3\x84\x15\xf7\xad\x12\xf2^\xb7\xecЕ\xe89A\xf9\xa5\x875\xdb+y\u009a\u007f\xc8\x17\x1e\xe6\x94hib\u0082t\xe3\x1e{=\xe1~\xe9\xa1\xcd\xc4k\x9d\xc8\xd4\xca=\xb9$\xbe\xa1\x9f\xb3\x86g\xbc\xee%\xe9l\x1c\xfd%\x045\x9f\xa7\xd3\xfa\xea\xa8\xfd[\xfe\xe4\x9bY\xfe=l\xa9\x91\xcd\xe5MO\xfa\a\xf4\xd9\xefH\xa6\xf5L\xd2Gr\x9a곒\xd5\f\xab\xb5\xe1e\x9f2\xabw\xcf\xf2\x92\x05\xec!*HREk\xb0D\xb9\xc9\xc7d\xb3\xb5\xbdgc\x99J\x96\x91\x80\x14\xa0w\x19\xd9Ӕ\xd3!_I(4\xcc\xd7\xcc\xc8\xc65\t}\x884iH\xe2\xe0\x02̣\x89i\xe9\xb5ͫ}\xe1J\xa4\xe1]K\xb253\xbe\x1a\x91\x9a\x9a=\x9a<\xa2\x0f\x93a\xb3\xf9\xf8J\xeaL\xe4i\x9a\xd8\xfc\xbbE>\x8b\xd5\xc64FO-\xa9>\xad\xa4\x1c\xb3\x1d\xf3\xe76\xb4,\x8d\x0f\xd1Z\xaa\x8ff\xd3\x1e\x8d\xf1\xed\xb3\xffʍ\x9c$\xcd\xc3Rg\xa2҅3c\x99r\x99o\x1fsŲ\xdf\xc9H_D\x93\xd1*\x91\xf4\xd1\xe3\xeb\xf3\xf2\xef{A\xbd\x11\xff\xe1\xe3\x05ykv}hݡ+\xd1\xc7\xe6\x9c6\x97\xed_w\xadɿ\xef\xcdW8%*\xef[:\xc7oX\xbb\x0f\xfb\xb8!\xfcH\xb22\xba\x8cW\xee\x14\x0e,\xf6'--\x0f\xf3\xafg\xbc\xeeeѝM\xb3\xf7\xaa\xe6\xf3\xea_\xbe\xd3\xc9ߔ\x02I\xdd\x12KDsyÓ\xfejb\xb1m,cZo&}\x0f\x94$\xcf-־\xb9\r\xa9tBC\xee\x01\x13\xfa\xfc}_Vj+{\x88\x83\x8b+\xd2\x13\xd2\x16wZ\xb3\xd9\xd9\u07b3\xb1L%[\xfd\xbdRߜ\x16\xfe4\xbb\xd54\xa9\xe3kfd\xe3\x9aD\xaed\x12\xe1[\xc4\x12`\x1e\xedjI\xba\u007f\xe9\xe9\x88J\xe4]K\xb253\xbe\x1aR\x84\xa6f\x8f\x16\xf2o\x97\xac\x98\xcd\xc7WRg\"O\xd3\xc4\xe6\xdf-\xe2Y\xe8\xad#\xf7\xad\x92\xe4C%\x0e\x8f.[\xdfR\u007f\xdajY\xb0\x95ߝQ\x94\xc1\x82\xfe\xed\xb3\xff\xcau\xcaaM\xd2\xcdܴ\x9b\\,S\xae\xd9|\xec\x15\xcb}'#|\x11M\x1c\x94\xc8m\xces\xbf\xf4\x18\x03e\xbe&\xa7\x90QQn>^\xe9\x8c9=\x15\x13c\xcc6.\x04\xc3\x1e\x98\x8d\x86u\xc6:\x16&\xb6%c\xafY\x93\xaf\xe4\x86S\xcc\x18\x98\xd8Ӝ\x01L2%\xdaA\xbe\xe9\x14\xe2@u\xfaU\xa7\x90Ѱi\x934z\xc6\xf8\xc5\x1ac\xb6\xf1\xa0!y\x8bS\bK\xec\u05fb\xc9Ķd\xcc5\x1b\x9ak\xffS\xfc\xdbe\x8c\xa792\xa8\x12\xf9\xa7\x1a3\x85ɤD\xfd\x83M\xb3}a]\xd6)@\xcc\u05cf\xca\x18\xb3\x8d\x03bjYL_\xfd\x98\xaf\xf7\xb1\x12s\x93\xb8V\xb3q\xc5<ͻ\xb4A\x92u\xf2z\xe61\x99\x94\xa8P\xfe\x17\x89\xf5\x9b8\tPg(cf\x8cټ`\xe0\x18)s\xa3\xaa\xb17\x89[5\x1bW\xd8\xd3\x1chQ\x19\x88\x96aF0\x99\x94(\x90\x98:\x05\x85H\x9d\xa1\f\xbf\x17\xe0\xc4\x18\xb3y\xc1\":\a9\xe0\x14u\xfb\xc4\xde$n\xd5l\\\x89\xfd4g\x02\x93I\x89\x00\x003\x15(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\aJ\x04\x00\xf0\x1e(\x11\x00\xc0{\xa0D\x00\x00\xef\x81\x12\x01\x00\xbc\xe7\xff\a\xfd\xa4@\x82&\x8eJ\xdf\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/chan2b.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x04Q\x00\x00\x011\b\x03\x00\x00\x00\x83\v\xcdh\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x03\x06\x02\b\n\x06\x0e\x10\r\x19\x1a\x18!# #$\"$%#%'$&(%'(&()'*+)+-*,-+-.,01/2313425747968:7:;9<>;>@=AB@CEBEGDFHEIKHKLJMOMPROSURUVTVXV,`\xae7]\xad[\\Z8^\xae8`\xaa]^\\:b\xab;b\xac<c\xad_a^Fb\xa1=d\xae?e\xb0ac`Kd\x9dAg\xb2cebefdCi\xb3fheLi\xafDl\xafMk\xb0Fm\xb1ikhei\x8fjliGo\xb3Ip\xb5lnkJq\xb6ll\x8dnolKr\xb7pl\x88Us\xb3Vu\xb4xp\x84Xv\xb6surZx\xb8uwt[z\xba\\{\xbbxzw\\}\xb7\x8evve|\xb8^\u007f\xb9{}z\x95wq_\x80\xba|~{a\x82\xbc~\x80}b\x83\xbd\u007f\x81~c\x84\xbed\x85\xbf\x81\x83\x80k\x86\xbb\x84\x85\x83m\x87\xbdn\x88\xbe\x86\x88\x85p\x8a\xbf\x87\x89\x86\xb3\x81_\x88\x8a\x87q\x8c\xc1\x8a\x8c\x89s\x8dË\x8d\x8ay\x8e\xbe\u0083Wz\x8f\xc0\x8d\x8f\x8c|\x91\xc1\x8f\x91\x8eƇT\x90\x92\x8f~\x93\xc4x\x95Ā\x94Œ\x94\x91z\x97\xc6{\x98Ȕ\x96\x93\x96\x97\x94\u074bE\x81\x9aė\x99\x96\x98\x9a\x97\x84\x9c\xc6\xe1\x8eA\x9a\x9b\x98\xe9\x8e<\x86\x9eț\x9d\x99\x87\x9fʜ\x9e\x9b\x9d\x9f\x9c\x89\xa1˞\xa0\x9d\xf6\x935\xa0\xa2\x9f\x90\xa3ȡ\xa3\xa0\xa2\xa4\xa1\x92\xa5\xca\xff\x952\xa4\xa6\xa3\x94\xa8ͦ\xa8\xa5\x96\xa9Η\xaaϨ\xaa\xa7\x98\xabѩ\xab\xa8\x9d\xac̪\xac\xa9\x9f\xaeά\xae\xab\xa0\xb0Ю\xb0\xad\xa2\xb2Ұ\xb2\xaf\xa4\xb3Բ\xb4\xb1\xa5\xb5ճ\xb5\xb2\xb4\xb6\xb3\xab\xb6ѵ\xb7\xb4\xac\xb7Ҷ\xb8\xb5\xad\xb9ӷ\xb9\xb6\xb9\xbb\xb8\xb0\xbbֻ\xbd\xba\xb2\xbdؼ\xbe\xbb\xb3\xbeٶ\xbeӽ\xbf\xbc\xb8\xc0տ\xc1\xbd\xb9\xc1\xd6\xc1ÿ\xbb\xc3\xd8\xc2\xc4\xc1\xbc\xc4پ\xc5\xdb\xc4\xc6ÿ\xc6\xdc\xc0\xc8ݻ\xca\xde\xc7\xc9\xc6\xc5\xc9\xd9\xc9\xcb\xc7\xc0\xcc\xda\xc7\xcb\xdb\xca\xcc\xc9\xcc\xce\xcb\xc3\xcf\xdd\xca\xce\xde\xce\xd0\xcc\xcc\xd0\xe0\xcf\xd1\xce\xc6\xd2\xe0\xd0\xd2\xcf\xd1\xd3\xd0\xc8\xd4\xe2\xd2\xd2\xdc\xd2\xd4\xd1\xd3\xd5\xd2\xcd\xd6\xde\xd4\xd5\xdf\xd5\xd7\xd4\xcf\xd8\xe0\xd6\xd8\xd5\xd8\xd8\xe3\xd2\xda\xe2\xd8\xda\xd6\xd3\xdc\xe4\xda\xda\xe5\xd9\xdc\xd8\xd8\xdd\xe0\xdb\xdd\xda\xdc\xde\xdb\xdc\xdd\xe7\xd9\xdf\xe1\xdd\xdf\xdc\xe0\xde\xe2\xdb\xe0\xe3\xde\xe0\xdd\xdf\xe1\xde\xdc\xe2\xe4\xe0\xe2\xdf\xdd\xe3\xe5\xe1\xe4\xe0\xdf\xe4\xe6\xe0\xe5\xe8\xe3\xe5\xe1\xe4\xe6\xe3\xe8\xe5\xea\xe2\xe7\xea\xe5\xe7\xe4\xe3\xe8\xeb\xe6\xe8\xe5\xe4\xe9\xec\xe7\xe9\xe6\xe8\xea\xe7\xeb\xed\xea\xf0\xf2\xef\xf4\xf7\xf3\xfa\xfc\xf9\xfe\xff\xfcS\x19\x91\xf7\x00\x00 \x00IDATx^\xed\x9d}P\x14\xd7\xde\xe7\xcdݧQ\t\xa8\xf8\xae\xb9r\x91\xd82\x16\xb8S\xd9I\x14\x1c\xf7֔\x0fٰ\x9aD\xddK\xb6\xa2\\\xa3\x0fX>IH=\x88k\x89Z<P\xeel\x15(W\x85X\x18//F \xa5\x80o1\xbe\x11\x1c\xd1@\xe2\vP\xb7\\ū\xa5\xa4H\x95rE\v\x84\x92\x02\xce>\xcfsS\xdb\xe7\xf4L\xf7\xe9\x99\xd3Ӄ6\r\xcc\xfc>\u007f̜9\xfd;\xa7\xcf\xe9\x9e\xfe\xce\xe9\xd3=\xfd\x1d\xf3\xeb+\x80\x00\x00\x00h\xc6h\xa9\x867\xb4*\a\x00 \xc0\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05xE\xfa\xb5\x02\x80@\x02\x14\x05x\x15Z\xe2\xa7poi\x05\x01\x01\x04(\xca\b\xe6PD\xabV\x881\xb4E\x1cb/\xe8\x9f=\xdb^\xde\xc4^\x06\x04$\x06)ʱzW\xaa\xfe\xf0\xee\xfc\xf38\xd1Q\x95o?t\xa9\xc7-\xa9\xc6\xdfv,\x89I\xee\xf3\x16\xe1A\xe1XNd\xec\x01\xadPL\xdd\xfc\xd0)\x8b\x8fM\xb9\x87\xe2\x85\"\xa1\u05f5\xc2\tG9.\xa2\x1f\x1d\x10\n|\xa3\x1eT>\xb9ȕl]1%dA\xbf{\xae\x1a\x9b\xb9\x8dZ!/AM\xdc\x19\xad\x10\xc2i\x13/b:!4%\xe8\vf\xd0%\xee03\x1f\bX\x8cQ\x94{\xd9߉\x89\x9er\xfb\xa9\xa6\x8b\xd97\x10j\xcf=T\xd7t~wa\x8f\"\xa9\xca'q_\xa7\x9b\x9fx\t\xf0d3WU\x95\xc9m\xad\xaa\xe26\xab\xc6\x1c\xbd\xe8J\x1d\t\x8d\xb0\xef\x9f\xc3q\xf5\xe8\x16.vJ\xb5\bMW9\x17R\x85:\x0ep\xe5]\xca\x05r\xbd\b\x95\x84J\x8a\xf6\xe6\x94\xcc\xf8\x906\xf7\\\x152\x83v\x8b\t\xba2&\xb5\xd7\x06\x11p\xd6|B=\x90\xe2 \xefp\x94\xf2\xc5\x0eǼ\x83§\x92\xb1\xdbYA\xdfq\xc7Y\xd9@\xe0b\x88\xa2\xb4\xe4\xbb\x14\xa5\xdc\xde\"\xfcRg\v#\x96o\xf2\xf1ou\x9b\xfd\xbc\"\xa9\xc6c\xbe\x14\xf5u\xaa/g\xb1u<B\xdfbi\b٪\x1a\xf3\xbb\xc5\xceD\xdbķ\x04Q\xe8\x98ɑ\xc1Է>*\n\xea\xe0\x96\xc6#\xd4\xc4u\xb8\xe5K\xf5b\xa4\xa9\xcb6n;\xeaw\x85jMh\xde\x18\xbf֙RT&\xd3\x1a\xe9:'Z\x9d\xca\f\x90Q\x04\xf88\xd2+6!\xd4\xc0_E\xc8\\\x8c?\xae\x0f\xbe\xc5\b\xf2yC\x01\x81\x82\x11\x8ar,\xfb\x98]T\x94\x96\xec\xef\xf1\x1b\xfe\x95.\xcc'9G\x8b\x14I5\xee\xf2\xbe\r\xd5i\xban8\xbf\xf17\xdc\x06\x10\x14\xe1\xef8\x13kC\xee\xe1\xb7-\u070f\xf8\xcd\xe7\x03\xa5\x83\xfbf\xc2S\x86\xa2H\xf5*\xb8\xcei\x9e\xe9\xc8\xc4OuUʮ\f\xd5qu\xce\xd4J-E\xd1\f`\xd0}ש(w\xbb\xf1ǎ\xa9\xf1\x8c \x9f7\x14\x10(\x18\xa1(]OQ\x9e\xa8(\xa7\xec=\xae\xdf\xe6\x96;\xe4\xed\xe4\x01E\x92Io\xacxB\xbf\v\xa1\x9d|T%\xbao\xe2\x97㤩lW\x82y\xc3\x03\x12s75\xd6\x14\x97\xfc\xc0\xbd\xa8\xfc\x8dϋ\b\x9d\xb5\x8a\x1c\xa3\xc7\xe7O\x1f\x17\xb6`\x06BE\xcey\x96p!s\xa6x\xbc\xb4n\xe9R\x16\xcb\f\x0f\x9d\x93\x89\x14\xc5\xe8\xca:\xb8\xa6\xf0|\x97\xa2\xb8b\xe9z\xdbB8.h/^\xda\x13&\xe6\xaeR\xe4R\x95]\x1a\xcbq\xeb\xaf/\x9d\x112\x1f\x9f\xfe\xf5L\xfc\x98,\xa5+\xa3\xd8>\xab\xa8\x9e\xab/\x99\x95\x89\xce8\xa7;V\xe3쁊Ds®\xe78yy\x83\xcd\x14\x9bl\x1bP\x04<1\xf3x\v\"\xb7\xcd\xf78=֖\x93\x13k\xaeV\xaeDT\x14'\xebC\x18\xc2|\f\x14\x05Pb\x84\xa2\b8\x15\xe5PQ}\xa1}\xefI\xf9\xabٿ\xb7\x8a\x91t禣\x92/p8~F\xe8\x81\xc3T\x80\x06\xaen\x8bF\xa8\xb9\xd2\xc4\xc7\x15\xfc\xd9\xf2\x19\x8e\xa85\xaf\xfe\xaa\xa6\x80/v/)IC|\xd0\a%\xdb'\x87\xf7\xe3S\xff\xf8\x03\xe5\xf60\xae\au\x9c\xac\x9a5\xb7\xaa\xaaJ8\xd1\xe9\nR\x9c\x19\xc9łח\xac\x0f\xfe=\xa2\x8bѕ\t\x8a\xb2}\x81SQ\xa4X\xaa^\x84\xceWU\x05o\"u}_\xb5\x9f\xdbTUբ̕+\xeb\xca\xdf;c\xd6\xc4髖r\xf8\xe2\xc9E\xee\x18Y\xac\xa8L\xa6e)\xf7\x06\xf7[n\xf1\x1d\xd4yő\x90\xe4p8n\xe3쌨\xacs\xa5q+\x85\x13\x9b\x9f楟\xa8)\x8b\xe5_(\x03\x1a\x1c\x8e\x98\x02\x9c\xa07_\xefrk\xe9\xbe\x18s\xd9\x06\xf7\xedG+\xcaI\x0f\xf1\xe8\xb9w\xecw\x93\xdcGg@\x80c\xac\xa2\xe4\xdb\xf3.ݪߛ/\xcd\xc1\x9e\xccmc$=\x91\xcfz\xa2\xf1\xf1P\x10M\x92\x16\xe1\a6=NHuے\x85\xa1yo\xf5c\xf7r.i(\xe2rɧ\xfd\xc2Hb2^{\xe6$2Vr\x9dP4q\x87X\xc5\x0esG\x84\xd7#\xf8\x82\x06U\x8c\xaaLP\x94{\xaf\xdf#\x8aBź\x9d\xa8\x848\xb5Cy\xd6\xe3̥*\x13\x8aqo\xb6\x89'\x85\xa8\x84\xbb\xe1\x8ad\x9f\xf5\x1c\x1eǍs^h\x91Nj\xce\xf2\x15\b\xeb\x800\n)\x8d{!$K-}\x8a\x00\x8c\xa8(\xf4\xe6\xab\xe6\x1b\x85P\xbe\x19\xb9C+\xca-\xce}\f\xf9\x960t\x1a\xc4i\x1c\x10\x10\x18\xab(E\xf6v\xe1\xb5#\xf7[g\xf6\xa9l\xe9^\x06*ɀ\xad(\xe9\xae\xe4\x05\xfe&\xbb\x9cK\x1a\x16\xcf\xec\xc1L\x13\xcem\xeeL\x9d\xb1\xc2\xfe}\xbf(j\xae\x83\xb5g,s\x8c\x12\xff[\xf2\xf6\x86\xb2\x18U\x99\xa0(h\xc1V\xa2(T\xec`\x14\x85\xaaL(\x16,m\x84BNJ\xb2\x14\xa5m\xd5\xf8i\xdc\xd4\xe0\x8f\xc8\xe4\xac$\x18i\xef\xf6\xbe\x10\xb0e \xf4к,\xab\xecf_/R\x04`$E\x916_\x8eEx\xb9͟F\xee(\x15e\xbf\xdbҦ\xc3ٳ\xc3`\x8c\x02(0VQ\x8e\x15\x8ao\x87\xc8[\xcfQ\xbbk,O%\x99\xb0\x15EJ\x16\xf3\xdd\xecr.i\x98㜍\xc0\xb7w\xb6e\xbf3\x9b\x9b\"^Q\x96\x0eV\xe7<J\xcf\x11E\xb1\xb9\v\xc9ۂ\bE1\xaa2\xac(\xf9s\x88\xa2б\x83P\x14\xbae(\\\x9e-9%\x9fd\xb0\x14esXv=W\x9f\x19\xf69\xfe \tƇ\xce)\x93\x14!\xfd\xa4,5\x81_rp@\x11\x80\x91\x14E\xde|\xf3\x1ecU\xf6>F\xf9\x96;\xe9\xb1\x1cUq\xdf\"\x00\xa00VQ.\xee&\xe7\x1a\xe5\xe4\xc0zZ\x94\xd7\xe2\\L%ٸ)\xca\x1e7E\xa9\xe1U\xee\xc8pI\xc3ҙ\x17\t\xc2O\xfay|Q\xb6m\u007f\b\x99o%\a\xab\xbdI\xba֓ϵ\xd2\xc5\xe2g\x92\xb7\x19\xf1\x8abTeXQ:B\xcb\xc9\x18E\x8e\xa5\xea\xc5xU\x14\xaa2\xa1\xd8\xdb\xd2\xe2\x8e`\xe9\xf66Ee.zȵ\x1eq\xa4E\x04\xa3\xe2!\x1e\xa3\\#\b\x02ѐ#hɓʘRE\x00\xc6SQ\x1eF%?lLH\xf4\xbc\xacL+ʧ\xe3\xdb=\x96õ\x1e\xc0\x1dc\x15\xa5\x8d\\=n'w\x9e\xb4\xee? |E\xfb\xbb\x94I\x15dE1\xe7 \xd4\xf7\a7E\xe9\xb4&\xe1\xe1}V\x96{9\xd77\xfe\bG\xaeP\xffQ\xf8I\xdf$\xcetD\xae \xaf\x91\b\xdd\xc3\xcb\xda&\xbe-\x1c\x9d\xfd\x913\x14\xc5J\xc8H\u007f?W\xa2(FU\x86\x15\x05\xc5/ƊB\xc5R\xf5b\xbc*\nU\x99r4\xb2x\xa6\xeb\x8e\x15Ee2w&\xddq\xa6\x92\x92\x10z\xc4Wce%Wkr\x0e\nۅ\xbf@\x16\xedP\x04`<\x15\xe5\x1a\xbf\x84\xe7\u05f9.\x945}!\xcd\xe0P\x8a\xd2?{\x01\xf2\x04\x14\x05p\xc3\bE\xe9ji\xc9=\xdaB\xc6\x00\xe7\xed\xe7o\xd5\xe5\xe1\xbbc\x9b\xec\xfb\x9bZZZN\xe6+\x92l\xc4k=W\xc9ohb\xdc\xc1\x82D\xdeT\xd1\xfc\xb3ô\xed\xea\xc0\xcdm&|\r\xa86f\xf9\xd7\x17\xb2\xf82\xb7\x82\x173\xb9\xad\xe2}sk\xb9\xc5\xf9\x87\xe2\xb9<,\r\x136\x96\x14Ƌ\x97R6\x06o)|3\x14\x1f\x99\x87C#r\x0f\xcd\x1f+\x8c\xec\xef8o\xb5Ń\x82\xa5Ak\x8b\xd6\x06-E\xcabRe]\xe5܁\x0et4\x84\\\xeb\x91c\xa9z{NUU\x05\xc7W\x1dos]\xeb9\x85u\x82ʕ+\x132\xf1U\x1d\xd7X\xe4Ǡ-Δ\xdcH\x15\n\xa2\x8bO\u007fb\xc6C\x90\x9cyi'Ng\xe0\x99\xd9\x02\u07bc\ufb10\xacU\x04\xf4^u8b\xb69.?C\xf4\xe6\xbb\x16Ss\xce\xf1\xc05DYȹ\xb4\xe3f)_\xdc\xe0Lo\xe5Xw\xee\x9eg\x9d\n\x01\x81\x8c\x11\x8ar>\x1bC&eэC\xb9\a\xce\xe3\xb1\xfa\xe1l\x91\"E\x92I\xb7E\xfc\u007f\t\xb9\xfcy7)Ʋa\x0f\xcf\xef܉\xb3\xfeb\x16^w\nٷSm\x96D\xf7\xa9Ŏ\t\x1c\xc79\xefz?\x12\x196i.\x1ef\xe4\xcd\xfdt\xfa\xb8)\x91\xe2\xb5ٮ\x0f\xc2B\xe6\x8aS\x01\xf8\u007f=\v\xf1=c\xf1Ι\r|\xa7j\u007f\xe6\x9c\xd09\x99\xfd\xee\xc5\\\x95\x1d\x13\xc2\xf2Q\u007fĔ~E,U\xefwAbe٨k\x12I\x8c\xadW\xe4R\x95]\x123\xa5\xa1\xc0\xfaםG+\xd5H6\xddY\x8bb\x92\xc4C\xbff]\xace\r\x1e\x9dT\xac)\xb0\x99\xacI\xb5ʀ\x9f\xa2ĉ\x962Do\xbe+\xe4/<\xa65\xe2DJ\xee\xe4l\xb1\xda\xe7x\xa9\xf9\x19I\x1f\x0f\xf9\xc8}\xad\x98{c߹tO\xeb\xee_ \x900BQ\x80\x97c\xd5x\xd5Q\x9b\xae<2\xefx\xf4\xe2œ\x9f>[\xa4\xfaǩ\xfd\xe3\xe3{\x10\x8b\xc2\xd9\x1c<\xcd\x00\xa0\x00E\x19\xc1l\x9dvO+D\x0fN\x8b7\xad\xa0\xbe\xd8\v*\x11mS\xd9\u007f=\xc6ܻ\xe4}R\x1d\b,@Q\x80kQ\xe2\xe9Ns\x94\xca]=\x00\xe03\xa0(@_\x86yGum\xf5\x0esƀV(\x00h\x00\x8a\x02\xa0\x813\x1b\xac&k\xf2Y\x10\x14\xe0\x95\x01E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x19\x1d\x9cI|\xa4\xf8\xac\xea\x1b\n\x00ÊA\x8a\xe2ݥ\xb4\xe5\xc8^{\xfeI\xc6#\xc2\f\xa0i\x1c7\xdb#\x93r\x13\x1d\f\xbeZ\xa9*\f@}\xe2 _\xe0vC\xab\x9ao(\x00\f+\xc6(\x8aw\x97\xd2{\xd9%\xf5w\xea\x0f\xec}꽒!\xe2T|\xb0G\x1e\xe5&:\x18d+UﾡJ\x03P6\x8a\x1aJ\xa3*<rU|C\x01`X1DQ4\\Jod\xe3\xe7\x93=\xcd\xf6\xfa\xec\xea\xa1c\x93\x87\xa2(\xdcD}\x87\xb2R\xf5\xee\x1b\xeaf\x00ʄ\xae\xe1\xae)\x87\x91\xcb\xf6\r\x05\x80a\xc5\bE\xd1r)EdpҚ=L\xcf\xd9\xf0T\x94A\xb9\x89\xcaPV\xaa\xdemA\xdd\f@\x99\xd05dX\x9f3rپ\xa1\x000\xac\x18\xa1(Z.\xa5$\xe6V~\xd1\xe0'.^\x95\x96\xa5S'\xbd\xed<\xebq\x99\x85\xd2n\xa2j\x16\xa2\x12\xcfR\xad&[J#RX\xa9\xb2}C\x1bM<\xbf\xe7n\xfa\xb2\x98dl\xcd%?\x14Z\xcbXT\xa8\xda\"\x0eQ\x94\xb9*\xbe\xa1\x000\xac\x18\xa1(Hӥ\xb45;;;\xd7\xf8\x99\xd9\xeb\x13g\xe5\x1e\x9a\xcf\x11E\x91\x9dGi7Q\x15\vQ\x89\xb3|FmuJ\x14~\x84\xabl\xa5\xca\xf6\r\xed\xae\xae\xb4%Xl\xbb\xd2\xe6\x11\x97\vIQ4\x8dE\xd1M\xdeAޕ\xb9,\xdfP\x00\x18n\x8cU\x14U\x97\xd2֖\xba\xfc\xbd\x86K\xcaܙ\xc2\xe8\xa3\u007f\x0eV\x14\x85Y\xa8t֣f!*\xf1\xbc\xbaS\x18e\xbc\x9fB>\xb0\xcez(\xdfP!\x97\xff\xe4\x19\x1a\x10\x1f\x05\xedR\x14\x1f\x8cE\xcf\xf1\u007f\xf5\xa8\x17\xe3\xe9\x1b\n\x00Í\xb1\x8a\xe2ť\x14\xf5\xe4\x97{\x96\x1bR\xda8;~[\x8f\x15Ea\x16*)\x8a\x9a\x85\xa8\xcc\xe3\xd2\xe4w-\xfc\x87$\xcdR\x14\xca7Tȍ~(\x15t)\x8a\x0fƢ\xa7\xf9\xfb\xae\xa4\x9b\xa2\xb8\xfb\x86\x02\xc0pc\xac\xa2\xb0]J\xbb\xc4\t\x94Kv\x83'R\xces\xe4\x94k#V\x14\x85Y\xa8\xa4(j\x16\xa2\x12\rq\xb6\x9cӎu\xea\x8aB\xfb\x86\xa2\x95\xae\x19\x10$+\x8a\x0fƢWe\x1f.\x85\xa20}C\x01`X1VQ\x98.\xa5\xfdyG\xc9\xc2\xef\x8dV\x94V\x8e8\x95\x92\x99Y\x85Y\xa8\xa4(j\x16\xa2\x12\t\x89xJ5\x95\xad(n\xbe\xa1J=\x90\xc7(\x9aƢϣ\v<\xea\xc50}C\x01`X1VQ\xd8.\xa5{\x89}\xb9\xf1g=(bz\x9b \x1f\xafcEQ\x98\x85J\x8a\xa2j!\xea\u0086\x8f\xf0\xbe\x95\x1e\x8a\xc2\xf2\re+\x8a/Ƣ\xa9\xef\xb9nĥsپ\xa1\x000\xac\x18\xa1(Z.\xa5?f\x97\xd7ߩ\xcf7\xfe\x9eٺ\xd0韮\x0f\v\x1a\x9b[OۘRn\xa2\xaa\x16\xa2.\n\xf8\xd4҂\x95|\xecWW\x15V\xaa,\xdf\xd0\x17?\x90+5\xf7ł\xb2\x01\xa8\x96\xb1\xa8\xc0\xed\xa8?\xbb\xd6G\xe5\xb2}C\x01`X1BQ\xb4\\JQ\xcb7\xf9\xf6\xc2S\xc3ps\xc5\xf5\x85a3>\xca\x1d˭@\xb2Y(\xed&\xaan!꤯8!:.\xad\xe2=S\x92\xc2J\x95\xe5\x1b\xda(\x1a\x84&\x93L\xda\x00T\xc3X\x14\xb3/\xe6\nr\xcfU\xf1\r\x05\x80a\xc5\bE\x01^\x95\x81,S\xb5[\x96\xaao(\x00\f'\xa0(\xa3\x82\x81b\xdb/\x8a\fo\xbe\xa1\x000|\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a2\x829\x14Ѫ\x15b\f\xe0\x89\n\xf8\x8aA\x8a\xe2ݥT\xa0\xce\xfeR\x169CK.~\x80A\xd8\xfc\xa1|\f\xc9\xd7|T\xa5ڲ\xcd\xdcF\xc5\xe7\x15\\P\xbeJ\xa8\aڱ\xf1B\xdfB\xaf{\x8fA\xefd\x8a\xef\xe0\x89\n\xf8\x881\x8a\xe2ݥ\x14ao\xc1\x93y^\xca\x1b\xccQ\xa7\x86\xb4\xe5r_\x1c͍\xe0\x8ey\x0f\u007f\x15\x9e\\N,@l2\x83v+3Z\xaa\xc6mb\x87z\xa2\x1d{\xab\xaa*S˞\xe3;n\xad3\x05\x9e\xa8\x80o\x18\xa2(\x1a.\xa5\x02E\xe5wF\x90\xa2\xfcn\xb13Q\xc7\x1dA\xa8\u007f\xee,\xafѯH\x8a\x8a\xa2\xdc\x18\xbf\x16\xb9\x13쳢\xf8\x14\xfb\xad\x86\xa2\x1c\x9f&)\nx\xa2\x02\xbea\x84\xa2h\xba\x94\xa2\xba\xddO[F\x90\xa2HO\x94%\x8a\x822\xb9\xc1{ \xfb\x8e\x9a\xa2\xc4O\xf5\\\xab\x0f*!\xe1C\xac\x86\xa2\xbc\xc3-\x0e\x95\x14\x05<Q\x01\x9f0BQ4]J\xdb\xed\xd7Ѱ(J\xebҰi\x1f}\x146\x01\xab[fx\xe8\x1c<kP\xe4t\xd4\xc0^\x1a\xa2\xa2,\x9dF\x82]\x86\xa5\xc2\xd1\xf5\xf1\xec\tsOM;\xec^]\xee\x14b\x00tk\xa2\xb3\x8a\x89w\xe4e/\x96\x98rl\xd6\xda,KR'mnJ\x14%\x8b\xe7\xf9\x98\xc7\n\xc3R\xd43\xf1cW\xd1\x1bo\x87\x8d\x9b\xb2\x00\xfb\x06\x04\u007f\xb4jV\xe8|<Xh{g\xea\xf8\xe9\v/!<c2\xce\xeeʥ\t\xfe ~j\xd8Bq\xa2\xc4\xd57eRKQ\ued60I\xf28\t<Q\x01_0BQ\x90\x96KiI9\x1a\x16E\xe9ycJ\xe6\xc6\xe0\x10\xfb\xfc\xad\xd8cc}\xc9\xfa\xe0\xdf\vrq\x92<\xa3\xba\n\xcf%\xd7q%O\xeb?\xe6ȣ\xf0e\x1bӶ\x99a\x9bKVp\x9c\xeb\xc0\x94x\x8b\x9bO\xaaݽ]$\x97~nc\xad\x85ߵ\x8e\x8f=\xb8\xa4Xan\x8a\x15\xe5AZ\x14y\x8c\xb5lX\x8a\xd0Ei\xf6\xe6\u0604\xf0\xcd\xe5\x1b9\xa1\x8d(\x98\x9b\xbd\xf7\xd0\x14\xec\xf2Q\xc4\xc5\x1f\xcb_\x18\xf4-B\xf5{\xc7r\x937m\x99\xe8\xee\xfd\x11̅\xef\xdf?'\xb4\x0eQ}S$5\x15E\x80R\x14\xf0D\x05|\xc1XEa\xbb\x94\xd6\xe7v\f\x8f\xa2\xec\xe7.\xe1s\x1a|\xd0\x1d&\xa3\x91#\x1c\x19wPg=\x98\xa58I\x19\x96\xfe~\x12\x1e/\xac\xf2T\x94\xa6\xcfo\x90\xf7{M\"\xf7\x14K\xad\xe9\xe8\x1c\u007f\x06\xa5g(\xcdM\x05E)\x8e>\x8bS\nG\xd3\x12N\xac\vuM\x9f߅\xbdG\xf0\xa9b\xf0\x94VA\x14&\v\xa9\xa7\xf9x\xb4\xf4[bM\x16<I\x18\x9f,\x9d\x8c\x94\x04\xcf\x16\x8au͊P\xf4M\xd1\xcd\xc1)\nx\xa2\x02\xbe`\xac\xa20]J;\xec\xf5\xfd\xfd\xfdMy\xfd\x06\x1b\x80!\xb4v\x12\xc2\xe6<\x87\x84\xd7\xf8ߒ\x9c7D?RYQ\xb6\x9c*\x89\b\xc1\x9e\x1a\xb2ai\u007f(\xb9\xa8[\xef\xa9(N\x9a8\x17\n3\x0ek\xa5\xa0\x16\x9d('\r)\xccMS\n\xf69}~\x14\x8e\xa6\x85\xae\xc2%\xdc\xf7R\x15\xc1\xb8y\xc4\x03\x11\xb5fΟ9\x91\x9b\xe3\x96K\x11\xfcG\xfc\x9aɵ\xd1}Sts\xb0\x8a\x02\x9e\xa8\x806\xc6*\nӥ\xb4)\xdbE\x8bJ\xe9\xa1b+\u05ca\u007f\xb6\xf1\x18e\xeeB\x92\xb3 \x02\xbf*gfۂ\xb2\x11mXz\x8b#\xbdhWU\x14TU$R\xa5ȵ^@\r&D\x14\x8567M\x89\xb3$|F\x8cI\x15\x8e\xa6\xa7\\G\xfbVN>I\f\xc6Z\xb6\tkǷS\xa6\u007f\\X\x159G\x99K#\xce\xccVq\x17\xe9\xbe)\xba98E\x01OT\xc0\x17\x8cU\x14\xb6Ki+\xa6.\xb7\xb5\xd5\xe8AJSЂ\xa6K\xb3\"\xf0j\xe3g\x92\x9c\x19\xf2\x18\xc5\xde䚙\x9d\x88\x8fXٰ\xb4?\xe4S\x1cT\xa7\xae(l\xac5\xa8!ZT\x14\xda\xdc4%\xae\xf9\xbe\xa5\x18\xa7\x14\x8e\xa6\x1d\xc1\xce\xdb\xdb\xca)\xa3/\xa2\x12D;fG`\xbf\xb4\xb7\xe7(si\x82W\xe1W;\x1e\xa3\xcc$\x19\xb8o\x8an\x0eNQ\xc0\x13\x15\xf0\x05c\x15\x85\xedRJ\x18\x8ey\x94\x8b\xdc\x14\x8e\x8b$\xb2VB\xc6\xf4\xfb\xb9\x12\xfc!2\x12\xa1{ؠTT\x94)\xab.}J\x1b\x96.\x0e\xc37\xc7/ẹ|q\xc3=\x8b\x82R\x14\xda\xdc\x14_=\xbe`\xc2\x13\xb3\nGS\xe14K\x14؎)\x91x\xda\xe9\x03,\x10\xb2vL\xc7\x13\xb1\xfds\xbc)\xca4<\xfd2;R\xd17E7iEi\xdaļ3XV\x14\xf0D\x05|\xc2\bE\xd1r)\x15\xe8o\xa9\xcbmi\xf3Z\xcb\x10p1\xb8\xbc\xa4\xaaE<p\x97\x06\xad-Z\x1bD&a\xd1\xc6\xe0-\x85o\x86\xdeA\xe8\x12\x99\u008c\\\x80\xa7\x1fd\x1bӖ)\xd33\x0f\xbc\x15\xec\xa9(\v=<\a)\x9a\x17\x15?\xaf45>O[\xf7\x8027}r9q\xdb\xd5\xde\xcedk\xed#ڰT\xe0Ǡ-b\xc1\xa3\xaf\xbf\x91Y\xf2\x01g\xc7\xf7\xc1ƟB\x17\xe3\xc7U\xb5\xa0M\xdc;\x99\x9f\x87sa\x9bOѹ4\xc1\xdc\xfcS\xdfDL\xc2\x1aG\xf5MN\xde\xc1\xf7\xccnu\x19\xaf.\xe4&xl\xfe{UU\x13\x16;\xedZ\xc1\x13\x15\xf0\r#\x14Eӥ\x14\xdf\xfa&\xb0\xd7[%C\xc1\xc9\xf1xfd\xdc\\<\x91ҟ9'tN\xa6x\xf4t}\x10\x162\xf7[\x84\U0008595b\x05]\x99\x15\x86\u007f\xd3]\x86\xa5\xc2\xf0*~zț\xe7=\x15%wr\xb6{\x96D\xdf\x12\x9e\xaf\xb4\xf0\xe6j<O\"\x9b\x9b~\xcd\xf3|\xd4O\x95\xc2\xeb>D\x19\x96bֿ\ue738\xb8\xfeδ\x89\x11\x85\xf8\xce\x13\xa1\xb1u\xa1\xc2\xeb\nԿuV\xf0\xe4Ź3\xc7Gҹ4\xb3?}g\xe2ԥ\xe2y\xa5\xdc79\x19\xef\x9c\x18\x12\xef\x0f\xb6O\xe0\\\xd3\xe5\x12\xeb\xc9\xf2\xb1\xe4\x96\x16\xf0D\x05|\xc3\bE\x19\xa9\xb4NX\xd1\xda\xd3\xd3\xf6\xdd\xdba/3:\xea\x18\xec<ʠY5\xde\xe7?\x06\xbe:\x85\x9c\xb7\x8d\x00\x9e\xa8\x80\x8f\x04\xb2\xa2\x14N\x12\x87$\xfda%\x1a\x91,\x86^Q\xd0\xd6i\xca;Z\x86\x8e\xfe\xdcI\xca\x11\x8e\x12\xf0D\x05|%\x90\x15\xe5bP\x1dy\xaf\v\x92\xef\xf8\xf0\x1d\x03\x14\xc58Z\xc2V\xc1=\xf6\x80\x1e\x04\xb2\xa2\xf4LJ\xac\xd8\u007fl\xff\x8a\x90\x97\xf9\x0f\xdc\xf5\xc3ܪSF_\xee\x06\x80\x91N +\nBE\U000e739f:\xff\xa5\x9e\xf54W\x9a\xb4\x04\x00@\"\xb0\x15\x05\x00\x00}\x01E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14e\xd4\x01ޥ\xc0\b\xc6 E\xf1\xeaRڵ\x9b<\xd7 w$\xfe\xbb\xb5n~\xe8\x94\xc5Ǧ\xdc\xf3\xcd\xd4S/\xc0\xbb\x14\x18\xad\x18\xa3(\xde]J۲\xbfo\x11\x18!\xbf\xbc\n\x8e\x84F\xd8\xf7\xcf\xe1\xb8z\x9fL=u\x03\xbcK\x81ъ!\x8a\xa2\xe1Rږ\xadxf\xfc\b\xa2m\xe2[]\xc2hj&G\x86Xڏe\xd5\x0f\xf0.\x05F'F(\x8a\x96K\xe9\xc8U\x94\xb5!\xe4\x01%[\xb8\x1f\xf1\x9b֡\xa6'\xe0]\n\x8cN\x8cP\x14-\x97\xd2\xe1S\x94\xe3\xf3\xa7\x8f\v[0\x03Ѯ\x9f\x1b9\x8eۋ\xf6\n\xaf\xeb\xd1L\xf1xi\xddB\x1e\x1e\"\x1fj\xb2է\\\x03mc\xaa\x00\xbcK\x81\x00\xc2\bEA\x1a.\xa5m\xd9\xe5\a\xb2\xf7\x1e7\xfe\xab\xf9\x1d\x17\u007f\xa0\xdc\x1e\xc6\xf5Ю\x9f\xad\x8b#\x8e\xb7\xa3\xf6\x93s\x17\xdf\xeb\n\xdaJ\x87K\x87\x9al\xf5I\xd5@٘*\x01\xefR \x800VQ\xd8.\xa5m\xd987\u007f\xbfᒒ9\x197$\x13?\x1c\x92r\xfd\xdc=\x9b,\xfcm\x1ej\"v\x83\x12\xaeC\x8d\xb2\xfa\xa4j\xa0lL\x95\x80w)\x10@\x18\xab(L\x97R\xd4_\x87\xb5\xa4k\xb7\xd6\x17Yw\xeeL\x9d\xb1\xc2\xfe}?\xd17\xd9\xf5\xf3RPW\xc7\ued9e\xe0K\xa8g,s\x8cBY}R5\xc86\xa6l\xc0\xbb\x14\b\x04\x8cU\x14\xa6K\xa9\x8b\xe3\x85\xc8hڲߙ\xcdMٌ\x14\xae\x9f]c/m\xe5\xfe\xa9>H\x909\xe7<J\xcf\x11\xf2\xe6:\xd4h\xabO\xb9\x06\xd9\xc6T\x05\xf0.\x05\x02\x00c\x15\x85\xe9R\x8a\xca\xc5G\xd1\x1f}\xa9\xa73\xbe\n\xe7\xf1\x91Ѷ?$S\xe9\xfa9{o\xe4\xdcم\xf8\xdc\xc7y\xad'\x9f#\xf7\xcaHc\x94\x99\xe4\r[}R5\xc86\xa6\x83\x02\xbcK\x01\xbf\xc2XEa\xbb\x94\x96\x90S\xf1\xb6ܗy\"\xfd+\xb1I\x9c9\x88\\\xa1t\xfd\\\xbcb\xfcan\x05v\xc6j\x9b\xf8\xb6pB\xd3\x1f)^\xcbq\x1dj\x94\xd5'U\x03ec\xaa\x04\xbcK\x81\x00\xc2\bE\xd1r)\xbde?|\xbd鼽\xc4\xf0'\xcbo\xe2&l,)\x8c\xc7\xd7Od\xd7O\x84\xbe\b\x9d\xd8?+\x84(\xc3\xe1Ј\xdcC\xf3ǞT\x9az\xcaV\x9fT\r\x94\x8d\xa9\x12\xf0.\x05\x02\b#\x14Eӥ\xf4^\xf9\xdeܢ:\xc3\x05\x05\xe5\xcd\xfdt\xfa\xb8)\x91X\x0ed\xd7O\xa1\xbd\x93\xfe\tm\x9e \xce\x1e\xe3\xff\xf5,$\xd7Z)SO\xd9ꓪ\x81\xb61U\x00ޥ@\x00a\x84\xa2\x00z\x02ޥ\xc0H\x06\x14e\xd4\x01ޥ\xc0\b\x06\x14\x05P\x05\xbcK\x81A\x03\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\xc0K\xc1\xfc'\x1e(\n\x00\x00\x83\xa7%~\n\xf3\xe9b\xa0(\x80\x933\x89\x8f\xb4B\x86\x9c\x97t`}\xc9b\x80&\xaaN\xb4\xfd\xb3g\xdb\xcbY\x1e\x16\x06)\x8aW\x97R:wt\xb1\x93\x8f\xaa֊yEj\xe7\xf1\x89}\xe8\x04\xcfϫU\viL^dYS\xfb\xfe\x15\xb5\xe5\xbeq\x90/\x18@\x15<\xcf\x17\xa0\x02\xe1\xb5\xccK\xe8}\x13\xbf\\x\xdb&\x84\x99慎9\xe69\x1fh\x19Ө\x1e\xa4@r`\xfdێ%1\xc9}ރe܍[\xd9\xe0\xbe\xf1\x8b\x92oj\xc5\r\x96\f\x9e\xc7\x0f\xdb+\xe6\xf9\f\xb7%5qgX\x05\x86\x16\x9d\xbb\xa9\xe6D{\x89\xf3|n\a\xc1\x18E\xf1\xeeRJ\xe5\x1a\xcd\xd1W{`\xd0\x03\x87\x89rꪽ\xc6JR\xb0s\xbd\at\xd7\xf01\x0e\xd4y\x82\xaf\xe9f\x14\xc0\\3\xa5\x9c\xa8\xfc\x8c\xe7_M\xdbJ\xa3\xf0#\xf7\x9fU\xf0\a\x1f\xa1G_\xf1\x15ϼ\xc4\x0e\\\xdd\x16\x8dp\xef\x1d\xa5\xfcU\xf5\xb0\xee+q\xc9\x0e\x81\n\xfe\x02\xf2\tف\xf5\x93\xb8\xaf\xd3\xcdO\xbc\x06\xcbx\x18\xb7\xb2\xc1}\xab\xadHTW\xe6\x97\xe4\xa1\xf9+\xfc\xc4\xce\xc7_Y\x1e\xba-9k>\xe1Li\xeey\xfdХ\x9bT{U\x9ch\xbf㎳\xb2\rR\x14\r\x97R*\xd7h~\xb7X+B\x83hJQV\xa7\xb2\x92\x14\xec\\\x8d\x80N>}\x9b0,\xe0;=\x17\x89lX7 \x1c\xe4\xdb^MQ\xee\x9ar\xc8{3_#\xbc\xd6\xf2\xcd^\xa3QA\xb4\xf8\xde\xe0MQ\x10Z\xb6\x03\xbf\xde\xf6QQd\a\xd6\xc7|)\xeaS\xed\xb0\x1b,\xe3V&\xa4o}k\x12\xb4\xe2\x06\xcb\xfb\x15\xe4\xad\xecC\x8f%\xd2(Ks\xcf\xeb@k\xa4x\xea\xa7G7\xe9\xf6\xb2\x9dhU\x9fFl\x84\xa2h\xb9\x94R\xb9F\x13\xfe\x8eV\x84\x06\xb4\xa2\xacLe%)ع\x1a\x01\x9d|\xad\xf9\xb97EYF\xb4\xa0\x91?\xad\x16\xe0\v\x19VѴp(\x14\xa5\xb7\xd4ۀGFv`\xbd\xcb\x0f\xe2t\x81e\xdc\xcaD\xec[)\xff\\+p\x90|\xb6\x87\xbc\xe5|\xa6\x1e\xa2\xb9\xe7u\xa0\x8e\xab#\xefzt\x93n/ۉvX\x15E˥\x94\xca5\x94\"\xe7\x13\x10\xc3\xf1\a\xdan\x94ƛǨ@tή\x04\xf3\x86\a\b\x9dq\xce\x19\xacV$w\xf2\xa6\xd2\f뢔\xbb\x8a\\\x85\xf3\xe8\xe5\r6Sl\xb2m@\x19 \xd3\xc9\xdf_y©(R\xb1}B\\%\x12\x1f\x1b\x99fŇ\xff\xc09E@\xa3\x89\xe7\xf7\xdcM_\x16\x93\xfc\xa2\x9aw͍T\xb3\x03\x84r\xbd\x16q\x88B+\x8al\x9a*\xf4\xa2\xcc\xd9M\xe1\\'\xcdjI\xdd\xe6\xae(\xeczEE!5DU:\xa7_\x14\x95\xa1\xbb\xa9\xb1\xa6\xb8d\x92v9\xb0\xf6Ɗ\xdba\xd7\xe0\x8a]\x1a\xcbq\xeb\xaf/\x9d\x112\xbf\x876\x9a\xa5\x10\xfb\x96f\xc5i\xd6\x0e\xa0v\x96\x10\xf0\xf5j\xf3\xca\xd2\x01\xb7\x15K\xb1t\r\xc4k\t\xa1\xd4\x1cE矘y\xdcz\xa4\xb6\xe7\x95;\x80\x01\xd5!D[\xe0v|<{\xc2\xdcSӔ\xd3\x18\xdbg\x15\xd5s\xf5%\xb32U\xbbٙ\xb3ܜt\xd5v\x81ި\xbe}\x11\x99N\xb4džSQ\x90\x86K\xa9G\xaeAt\x9c\xac\x9a5\xb7\xaa\xaa\n\x9fm\xd1v\xa3\n\xbcz\x8c\n\x8a\xc2'T\x9eY\"\xfc:u^q$$9\x1c\x8eۊds\xa5\x89\xb7\x15\x14\xd8\xcc\xcdt.\xed<\xfaӼ\xf4\x135e\xb1\xfc\ve\x80\x8c\xa0(\xa5\xc9NE\x91\x8a=JK\xbc\xdc)\x94X\x93\xf6\vzh\x8bJ.\xf8\xa1\x17)\xea\xed\xae\xae\xb4%Xl\xbb\xd2\xe6=\xec\xbcl\xd9\xf7\b=\xdag\x11J0\x03\x84r7y\x87\xb8\xb6f\xfe\\ww\xf7\x05\xac(\xb2i*\xeeE\\\xc1\x9f-\xf8G\xf8\xae%\xa1\xe2\xcc\x06\xde]Q\xd8\xf5.\xcb\xe8\xee.ND\xce\t'q\xfa\x85\xae\f՚W\u007fUS@f6e\a֛\x8eJ\xbe\xc0\xe1\xf8ypź\xf2\xf7Θ5q\xfa\xaa\xa5\\\x13e4\x8b(\x84\xbe=\xbf\x9d\xc3\x17(\xdaK\xed\x00jg!\x94\x1e\xbd\xe7ܞ\xe8t\xe5\x8a\xe5X\xba\x86\xb2\xd5\xe8\xaa\xed*ZY\xa6\xec|\x83\xc3\x11C\xd6\xc5\xde\xf3\xca\x1d\xc0\x80\xea\x10m\x81\xdb63ls\xc9\n\x8e\xcbD4-K\xb97\xb8\xdfr\x8b\xef\xa8u\xf3ɻ\x8b\x8a/\xec\xe4\xf9\xaf\xe9\x8d\xea\xdb\x17\xd1Ӊ\xb6\xe7ޱ\xdfMR\x19\x19\x1a\xab(l\x97R\x8f\\\xe3\x90\xcez(\xbbQ%\xde=FQt\xdc߄\xdd\x12G\xd2̳\x9e\xe8e\u0090\xff\x89-Q\x91K9\x8f\x96\xc6\xe1\xafg\xa9\xa5ϭ\x06\tAQ~\x89\xf9\x85(\nU\xac\x82\xfc\u0088\xa7\xf0\x8f\v\xfe`\xe2-\xd5\xc8\xcd\xd1t%\xff\xc934\x80O82\xf0\x8fhZ\x86z\x00:\xc7\xffU\\[\xb3\xf3\xf7\xa9Yi\x9a\x1am\x11~\xa2\xd3q7\u05fc'\xfc\xa0\xf5}\xe8\xa6(*\xf5.\xc3U\x91\x1fK\xf1\xf4P<Y\x92+\xeb\xb6%w\v\x83\x92j\xe2E$9\xb0\xd2g=\x83*\x16ν\xd9FΞe\xa3Y\x1a\xb1o\xe9x\x80\xa1\xb2\x03\xe4\x9du\x81\xfc\xd0א\x19 y\xc5T,U\x83#\x16\xe5\x98r\xd0\"\"\xca\xd4FE(\xc6uN\xcc\xda\xf3n\xb1,\xa4\x0eQ\x16\xb8\xbf\x9f\x84\x9f;\xbe\xcaMQ\x10:<\x8e\x1bG\xc6-\xecn\xa6\xe3N\xa0,AQ\xe8\x8d\xea\xd3\x17\xd1Ӊ\xf6-a\xf8\xa7\xe6\xaee\xac\xa2\xb0]J\xdds\rDR\x14ڰ\x94\x85\x8a\xc7(\x8a\xc6ǩsV\x81\xad(\xe4t\xa2\x94\u007fL\xe7RΣ\x0f\xad˲\xcan\xf6\xf5\xba\xd7 !(\nJ.&\x8aB\x15k\x8c\xea~^\xf1\xe4E\xb4\xf3\xbalwM2\u007f\xce\xcd\xd1te\xb4\xebǯ6\xe69zn\xaeE\xaa\x01贰\x12B3\xff熆\x86b2\x8fB\x99\xa6\xe2\x1fk\xd2\xcd'\xe2e\xe5=n\x8a\xa2Rﲔ\x86\x86tOEqU&\x1c\xb7\xd4E\xceByӲ\x15E\xb3Xx\xb03)\x1b\xcd\xd2ྜྷM\x8c\xb9\x8fTw\x80\xbc\xb32\xde'E\x96oC\xf4\x8a\xa9X\xba\x06\xfeyR\xfa\x9aN\x9e\xf4\x9aڨ,EQ\xdb\x01l\xa4\x0e\xc9\x16\xb8\xfd\xa1\xe4Jy\xbd\x9b\xa2\xb4\xad\x1a?\x8d\x9b\x1a\xfcQ\xabJ7\xfb\xcc\xd8UAX\xa6T\x14\x9f\xbe\x88\x9eN\xb4M\x87\xb3g\x87\x8d\x881\nۥT\x99k(\xf2̬l7ʆ\xed1J\u007f\xe3U\x14\x85|\xa9\x1c\xfc5:\x97v\x1e}R\x96\x9a\xc0/98\xe0V\x83\x04V\x94\x13+\x89\xa2PźM\x8d\xc5\xfc\xbe\xdbQ\xc2ou\x039\xc3\xefKLqs4])MȼXt\x1a\x9d\x8e\xedC\xaa\x01\xe8\xaa\xeb셚G\xa1MS\xa5n6\x88\xa7G\xee3\xb3*\xf5\xe2y\x94f\xf1J\b-\rR\xb2\x98\xa7.\x89\x9f\x92\a\xd7lE\xd1,\x16\x1e\xeeLPF\xb3\x14\xa4oO\xa2\xb0$\xaa\xec\x00yg%\x92\x9e\xa0\xe4D\xa4h\x83\x1cK\xd5\xd0\x17\xddl\xbefn6\x89\xbf\xee\xf2Fe)\x8a\xda\x0e`#uH\xb6\xc0\xbdő\xa3\xa5\xddMQ6\x87e\xd7s\xf5\x99a\x9f\xabt\xf3\x818q\xdf\xe9\xa6(>}\x11\x99N\xb4U\x9e\xbe+\"\xc6*\nۥT\x91k,DQ\xecM\n\xbb\xd1A\xe1\xa1(\x15\x0f\x95\xc9\xe8,\xfc\xb9\x8c\u007fF\xe7RΣ\r9\xc2.|R\x19S\xeaV\x83\x04V\x94\xe7\xe6\x1aq\x8c\"\x1b\x96&T\xae[\x93p\x1a\x9f\xfbX\xc9\x1aP\xce{n\x8e\xa6Է\"+\x05}F\xa2\xd4\x02\x9e\xbb\xaeYQ\x8aB\x9b\xa6J\xdd\xfc\x1bO\x1a\x9a\xee\xa6(*\xf5J3\xb3\xce\x1a\xf6\xb8IC\rOݧ!9\xb0z(\x8a\xaf\xc5\xc2\xdfv\xa5d\xa3Y\n\xb1o\x16\xfcc\xad\xb2\x03䝕\xf1.\x99}]\xee\x03\xcf]\x00\x00 \x00IDAT\x86\x87'\xf2\x8a\xa9Xž\xf8ʊ\xac\xc5\uf455(\x8eE\xa5\xa2\xb8\xedy\xf6\x0f\x88\x02\xa9C\xb2\x05n\u007fȧ8\xa3\xce\xfd\xac\xa7\x87\\\xeb\xc1clf7\xfb̤)\u007f\x91\x15\x85lT\x9f\xbe\x88L'\xdaa\xbdփ4\\J\xe9\\\x83\x89\x8cD\xe8\x1e\xb6\x17\xa5\xecF\x95x\xf7\x18U(JR\x12B\x8f\xc4\xdbB\xe4d\xf4\x12A\n:\xdfMR\xe4RΣ\x05\xe2\xcd\x1aI;\xdcj\x90V\x8c\x15\x05\xa5\xa7aE\xa1\rKӲL\x17\xf8\x9dx\xc7\xc7Z\xf1׳\x0f\u007f\t\x14\x8e\xa6\xd4\xf7\xf5\x87\x98\x9fc~\xc0\t\xb5\x00\x94\xfa\x9ex\xef\x04\xa5(\xb4i\xaa\xdc\xcdD\x9b\xb0\xb6\xdb1n\x8a\xa2R/\xa5(fᄢ\xef\x0fn\xd2\xd0iM£\xec,Q\x13]\x0e\xac\xb4\xa2\f\xaa\x98<┍f)ľ\xc5e5\x16\xa8\xed\x00yg\x9d#3\x1d\x95\xf8T\x92Z1\x15K\xf789\xf13\xf4Y\xe2\x06\xb2\x12\xb6\xa2\xb0\xf6\xbc2\x96i\b+u\x88\xb2\xc0]\x1c\x86o;Y\xea1\x8f\x82\xeeL\x12/C\xb2\xbb\x99\x1a+췁t\xa2(\xf2F\xf5\xe5\x8b\xc8v\xa2\x1dVE\xd1r)\xa5r\x8dfc\xf0\x96\xc27C\xef(\xedF\x15x\xf5\x18\xfd\xd9a\xdavu\xe0\xe66\x13\xbe0!|\xe9\x8aO\u007fb&\xc2.'\xa3\xf9\xd5\xd5e\t\x96\xbf*se\xe7\xd1\x02\u07bc\ufb10\xacU\x06H+\xee\xae\xe1Ot\xa2Z3\xb9\xd6C\x19\x96\x1e4[\xfa\x12\xc876\x96\xb7\xee\xbb \x14\xbbM\a\xbc\xf8\x81\xcc\xd7\xdf\x17\xdb\xd9g\xdd`\x15\x15C%\x00ݎ\xfa3~\xa3\uf655MS\xe9n6\x9bm\x05{\x16E\x99*\x9a\xd1C|\xcfl\xb1á\xe8\x10Uo\xf7ո\xe4+\xae\xdbh\x12\xe3\x0e\x16$\xf2B1\xc56\xab\x8dY\xfe\xf5\x85,\xe7-\xff.\aV\xf1Z\xcfվ\xc1\x15\xeb9E\xae\xdc5\x91<\xcahV\xa6\x91\x1c3뒷\xbd\xaf\xb6\x03\xa8\x9d\x95\x16\x95s6'*M\xb9\x8f\xe9Xj_d\xcd;\x88\xbe\x9a'\xe8\x1b\xbdQ{\xaf:\x1c1\xdb\x1c\x97\xc9\xc4+cϻ\xed\x00OCXE\x87d\vܖ)\xd33\x0f\xbc\x15\xec\xa9(.\xd8\xdd\xfc\xd9j+=\x91\x12C\x14Eڨ>}\x11\xd9N\xb4\xe7Y\xa7B\x18#\x14EӥT\xce5\x9a\xae\x0f\xc2B\xe6\xe2\x13B\x85\xdd(\x8d7\x8fQ\xb4S8\x055\xfd\xc5,\xbc\xee\x14>ug-\x8aIj \v\xe4d\xf4\xae\f\x8b5\xfdg\xb7\\\xd9y\xb4bM\x81\xcddM\xaau\x0fp\xad\xb8v\x1e\xbe\x8f\xa4/QT\x04ٰ\xb4A\x18\xd6\x1e4\xe3\xd8?\x94\xe5,7ǥ\xdcV\xd4\xdb\x18EΏ\x93źPqt\xb13\xa5\x12\x80\xf6\xc5\xe0\xff\x05\xd1\xff\xeb\x91MS\x15ݼ\x9b\xb2hYN\x85IH\xa6;O\xc2SU\xea%\xff\xeb\xa9t\xd6\u007f7)Ʋa\x8fP\x83r\x9b\xddN\xb5Y\x12]\xf7\xe6\x89\x0e\xac\xdd\x16R\x83\xe9\xf6\xe0\x8a]\n\"3\r\xa2\xfe\xd3F\xb3.\xf0}9_\t\rL\x88=\x8bTv\x00\xb5\xb3\xfaJ?4\u007fXڧ\xdcNJ\x9d%\xef\x8bs\xe6FAi\xcf(7\xeaObZ\x94=ƞw\xdb\x01\x9e\x86\xb0\x8a\x0eQ\x16\xb8\xad\xf1\xd3C\xde<\xaf\xaa(*\xddD\x8f3l1\x9f4\x10E\x916*R\xd9\x0et{U\x9ch\xef\x8d}\xe7ҽ~\xe4\x89\x11\x8a\x12\xd0\xd07Վd\x06\xb2L\xd5Z1C\xceK:\xb0\xbed1O\x86sgy7\x84u\xa7C}\x8c\xe2\rqfv0\xa8:\xd1\x16\xce\xe6\xe0i\x06\xc3\xc1p~I\a\xc5@\xb1\xed\x17\xad\x98!\xe7%\x1dX_\xb2\x98\a÷\xb34\fa=0JQ\xbc9\xd1\u07bb\xd4\xc2\xc8\x05E\x19b\x86\xefK\n\f\x9a\xe1\xdbY\x835\x845JQ\x06\x0f(ʐ\xf2\x80L\xebiE\x01#\x82Q\xb4\xb3\xae\x1f\xe6V\x9db\xcdbx\xe7\xee\x05~\xd7\x0f}hH\x01E\x19Rȴ\xde}\xad(`D0\x8av\xd6\\\x8e\xe3\xc6^\u05ca\xf2`\r\xee\xe1]\xad\xa8W\x03\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd0HQ\xbc\xb9\x94\xf6\xe49\x1fl\xb0W\xbd\xbc\u007f\xa1\xb3\x91$\x00\x8c\x1c\x8cQ\x14\xaf.\xa5]\xd9\x17[\x04\xceg+\x9f3쇸\xbc\x1f_\xc6H\xf2\xd9\xcf\xea\xcb^\xd1k\x15\x00\xf4\xc3\x10E\xd1p)\xad{*\xa4\x9e\xe6\xa9<\x13ʏ\x90\xbc\x1f\am$\xd9WfY\xa7\xbe\xf4\x95\xbdV\x01@/\x8cP\x14-\x97RBɁ\xe1x\x86\x9b\xb1\xacT(\xca \x8c$\x1bW\xf3)\x0f\xd4\x17\xbf\xb2\xd7*\x00\xe8\x85\x11\x8a\xa2\xe5R\x8a\xa9\xcf\xd6\xe7\x999#\x83\xc7鱶\x9c\x9cXs5\xe5vI{?j\x19I*\xe9\xdc\x15e;\x8bԠ\xbcV)_\xcb\x15\\P\x1ej\x1aω\x8f\x83\x97-.\x01`h1BQ\x90\x86K)&\xbf\x9cUl\x94һ\xdcZ\xba/\xc6\\\xb6\xa1\x98r\xbb\xa4\xbd\x1f\xb5\x8c$i\x06N[M9\xe2\xf3\x9f\xbb\xef\x8bPn5\n\xafU\xcaײ\xa5j\xdc&A\xc1\xe3\x83q\x88lq\t\x00C\x8c\xb1\x8a\xc2v)\x15h\xcaV\x1a\x94\x8fn\xaa\xf9F|N\x83}\xf9h\xb7K\xfa\xac\a\xe3\xcdHRf'\xbf\xb2ٙLr\x0es\xd6 %\xd4Y\x8f\xe4k\x89\x82\x05EA\x9b\xb0\xa2P\x16\x97\x000\xc4\x18\xab(l\x97R\x81r\x9d\x1e=<2ȱ\b/\xb7\x89\x8b\x1b\xedvI+\x8a\x96\x91\xa4LE\xf4\xa2\n\xe7\x83\xc5n\x9f\x11q\xf3ZW(\x8a\xcbגR\x14\xd9\xe2\x12\x00\x86\x1ac\x15\x85\xedR*\xb0{\x18ܿ\x86\x8e\xe2y\x8f\xf1\xe8\x04\x0f-h\xb7K\xb7\x99Y\xafF\x92\x14w7\xf0\x89\xcd\xc8\x1b\xb4\xa2\x84\xbbR\xb2\xa2\xc8\x16\x97\x000\xd4\x18\xab(l\x97R|=\xd9\xf5\xcb\xea\x17<\x8cJ~ؘ\x90\x88\x1f\xe8I\xbb]\xcaޏ\xdaF\x924\xd4L\n\x1b\xc9k\x956\xea$\x8a\xb2\x1e+\x8alq\t\x00C\x8d\xb1\x8a\xc2v)\xc5\xd3(\x83\xf1*\x19\xf1\\\xe3\x97\xf0\xfc:r\xb9\x97v\xbb\x94\xbd\x1f\xb5\x8d$\x95t\ue2b2\xd6x\xe4JH^\xab\xf4p%\xf4ca\xebF`E\xa1,.\x01`\x881BQ4]JQ}\xf6\xa0\xac\x05F:\xd7bj\xce9\x1e\x88\xcf\x1c\x97\xdc.\x11\xe5\xfd\xa8m$\xe9N\xf3\x1a\xdaO\xd7\r\x97ת\xc2\xd7r\xee\xe4/>\x8f\xe0\xc6\xe6\xd6\xd3\x16\x97\x000\xc4\x18\xa1(\xda.\xa5M\a\xbcV0ڸb\xc23#\xa65x\xf6Cr\xbbD\xb2\xf7\xa3\x0fF\x92\x83\xc2嵪\xf0\xb5\xbc\x1e\x192q\xfe\x1f9\x0e\x1bK\xc9\x16\x97\x000\xb4\x18\xa1(\x81\xc6#\xf3\x8eG/^<\xf9\xe9\xb3EO\xb4B\x19\x18`\xd2\x04\x00C\x06(\x8a\xfe\x9c\xb6\x88C\x92\xbeX\xf7\xbb_}\x01\x14\x05\x18̀\xa2\xe8ϵ(\xf1bos\xd4\xcb<\xaf\x00\x14\x05\x18̀\xa2\xe8O_\x86yGum\xf5\x0es\xc6KX^\x1aa$\t\x00C\x06(\xca\x100pf\x83\xd5dM>\xfb\x12\x82b\x88\x91$\x00\f\x19\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\xa3\x99C\x11#\xef)Jm\x11\x87\xb4B\x8c\xe7L\xe2\xa3\x11\xda2\xbf\xc3 E\xf1\xe6R\x8a\x1f\xe7~\xc0~\xe0$\xb8?\f\x96\xcd\xdcF\xf2\u07bc\xc1lM\xab\xb5>B\xdbx\x9e7\xfbv\xc3m\xed<>\xb1\x0f\x9d\xe0yoΆ5qg\\ɿ\xedX\x12\x93\xdc\xe7\x9e\xcbbs\xd0\x17\xacl\x83\x1b\xa9\xe0 _\x80\xef_Vi\x19\xa0'\xc6(\x8aW\x97RԖWX\u007f\xab\xfe@\x9e_=\xc7\xcd\x002\x83v\x93\xf7\x1a\xf3\x1f\xca*?\xe4\xf9\xff\x8b\x1e8\x1c\xa5\xfcU\x8db\"\xdd5|\x8c\x03u\x9e\xe0k\x14^\x1d\xb2\x95*\xe6\xac\xf9\x84+\xf9I\xdc\xd7\xe9\xe6'\xee\xb9LJ\xc6n\xf7\xcc4\xba\x914\xa5Q\x15b\x82\xd92@W\fQ\x14\r\x97\xd2*\xe2\xb6ѓ\u007f\xdc[\x1d\x80;7Ư%\xef\x8f-)\xc2\xf1\xd6\xf9\x9ep\xb0\"\xec\xd3\xe1\xdb\xc1\x8a:\xf9\xf4m\b\xdd\xe7\xdd\x1f`\xbb\x9a~X\x9c\xf4{\xff\x98/E}\xaeP\xad?2\xae\x0f\xbe\xe5\x9ee|#e\xee\x9ar\\IF\xcb\x00}1BQ\xb4\\J\xcb\xc5'\xe4\x1f\xf2'\x130\x03\x88\x9f*\x9e'昉\xc9z1OL7\x06q\xb0֚\x9f3\x0e֕\xcc\xc7O\xde彞\xe9(\xe9\x98\xeaa\xe41\x9c\x8d̰Jn\xb0\x8c\x96\x01\xfab\x84\xa2h\xb9\x94\xb6\xe5\x1dk\xedi\xad\xca\x1by\xb3\x8c/͍\xb7\xc3\xc6MY\xd0▤ɝb\xc7o\xb7&:\xad/&\xd2\x16h\x8d&\x9e\xdfs7}YL\xf2\x8b}<\xcfW\xa2J\xe1u\x9f\xb2\x82\x9e\x89\x1f\x8b\x89\xf72\xc8\xdb\xe3brf \x1d\xac\x92=*B\x977\xd8L\xb1\xc96\xf2T~\xc9\x13\xb5\x93\xbf\xbf\xf2\x84\xf3`eZ\xa9>1\xf3|\x14~\xee6\xea\x8d\x15sw)r\xa9ʨ\xf6\x92\x05\xebCܟ\x1blh#\xcf\no{P\x81\xf0\x8a\x9f\n\xdek\x91\x86(\xac\x96\x01\xfab\x84\xa2 -\x97Ү\xf2\xec\xec\xec#~\xb4\xab\x8fM\b\xdf\\\xbe\x91۪L*x\x8b\x9b\x8f\xdfzvo\x17ɥ\x8d仫+m\t\x16ۮ\xb4y\x0f\x1f\xa5%^\xeeD\x9dW֤\xfd\xa2\xac\xe0\"wL\x8c\x8d*\xa6\xb3\xa5\x83U\xb2GE?\xcdK?QS\x16\xcb\xe3\xa3]\xf6D\x15\x0e\xd6\xd2d\xe7\xc1ʴRE\r\x0eG\f1\xfc@7\x1d\x95|\x81\xc3\xf1\xb32W\xae\x8cj/Yp\x92;\x85\x14\x18\xdb\xc8\xe7Wl;\x1e\xa1G\xfb,\x97q\xb9\x9b\xbcC^\xb3G\xcb\x00\x9d1VQ\xd8.\xa5=\xe5\xf9\xf5-\xf5\xf9\xe5\xf415\xaa\xe9\x9a>\xbf\vO\f\xb5)\x92J\x9a>\xbfA\xde\xef5\x89\xb8\x1bɯ\xe4?y\x86\x06\x9e!T\xb1\x9c|~\xbf\xc2-\xa0\x84\x13+\xb8/\x1a\x87\xb9p\x1d\xac\x94=ji\x1c>LK\xf1\xb3*)OT\xe1`\xfd%\xe6\x17r\xb0\xb2\xadT1.\xedP\x9eP8s\xa9ʨ\xf6bnqn\x8f\"7\xba\x91\x05x\xfc\x92.\x8e\x8b\xce\xf1\u007f\x95c=Z\x06茱\x8a\xc2v)=\x9e\x8f\x87'=\xf9'U\n\x8f:J\xb8\xef\x19I&M\x9c\v7\x0f\xb4\x95\xd1\xe2\xcf=j\x8c\xea~^\xf1\xe4Et\xa3[\xc9Bg\x89^\x13\xf3矲G}h]\x96Uv\xb3\xaf\x17ў\xa8\xf8`E\xc9\xc5\xe4`e[\xa9b\xbc*\nU\x19\xd5^\xcc-w\x8fe\xa3\x1b\xf9`\xde_P\xb7\xa5\x86\xa4O\vuHx\xb4\f\xd0\x19c\x15\x85\xe9R\xdao\x17\x0f\xba\xef\xed\xfd\xac\xa2\xa3\x90\xad\\\x17#ɦ\xaaH\xa4\xca-\u007f\xe5jg\xa2\xdb\xd4X\xcc\xef\xbb\x1d\xe5v\xfd\x14\x9dr\x8dߝS\x14\xbd5\xe4\xcdu\xb0\xd2\xf6\xa8O\xcaR\x13\xf8%\a\ahOTr\xb0\x9eXI\x0eV\xb6\x95*ƫ\xa2P\x95Q\xed\xc5|˹\xff:\x18\xdd\xc8\xe4\x1ct\xc1\xd2K\x92W\xe9i`ϖ\x01\xfab\xac\xa20]J]\x8ar\xd1o\x14\xa5\x9c\xbb\xc8H\x0e\x0e\xf9\x98I\xa8\\\xb7&\xe1\xf4r\xf7\x80\x8e`\xf1\xf66\x94\x13CfX\xaa\xf9G\xf8M\xfa\xf9\x97\xedQ\x1br\x84\xe4\x93ʘR\xda\x13\x95\x1c\xac\xcf\xcd5\xe4\xe7\x9fi\xa5\x8a\xd1\x18\xa3H\x95\xb9\x1d㟎oGJ\x8cn\xe4\x99E\xbdΓ\x1e\xf4<ڵ\x1c\xb1Z\x06英\x8a\xc2v)\xfd\x86\x9c\xf5t\xe5\u007f㭆\xd1DǔH<'\xf4\xc1*ERI\xd3\x177<\vR\xc8GhZ\x96\xe9\x02\xbf\xd3\xf9\x91*\xb6x\xa6\xa8\xc0\x8f-\x9f\t?\xc6}I\xcb\xc8'\xd7\xc1J٣\x16\x88s\x0fI;\x10퉊\x0fV\x94\x9e\x86\x0fV\xb6\x95*ƫ\xa2P\x95)\x15\xa5\u007f\xf6\x02W\xd2\xd5^\xa3\x1b\xd9\x1b{f\x91\xeb>\xdb\xd4\xf7\xa4;V\xa8\x96\x01C\x83\x11\x8a\xa2\xe5Rڵ?\xbf\xeeN]\xfe~\xff\xb9\xd8s\xf4\xf572K>\xe0\xecʤ\x82\x85\x9c\x97\xef\xf6\x8b\x1f\xc8Ռ\xfb\xe4\xc3A\xb3\xa5/\xc1u\xd4P\xc5~\f\xda\"&.\x98\x13+\xcel0]A\xe8!\xbe\x1d\xb5\xd8\xe1\xc0?\u07b2=j\x01o\xdew\xf6t\x06\x8f\x8f0\xc9\x13\xb5\xbb\x86?щj\xcd\xe42\n\xd3J\xb5\xf7\xaa\xc3\x11\xb3\xcdq\xf9\x99\xeb2\xcaU|`R\xb9re\x8a\xf6\xe2S=i`&\xb5\xd7\xd0F\xe2:\u07b5\xbcp\xb6\xe1vԟ]\xcd\xd9\xfa\xb2CF\xc0W\x8cP\x14M\x97Ҟo\x0f\xe4\x16~\xeb7\x97z\x04\xae\xbf3mbD\xa1{\x92&wr\xb6G\x9eDc\x14\x99HH&\x1f\x1a,\xfb\x04Ui\xf0,\xb6\xfeu\xe7\x9c@\xf3\x06\U000d253f\b\x89t\xe7\f\x04\x1e/\xc8\xf6\xa8\x15k\nl&k\x92\xf8\x93\xed\xf2D\xad\x9d\x87\xef\xd6\xe8K\xb4\xf6)be+U\xf4\x93\xd8\b\xbe\fu[H\xc2t[\x91KU\xa6h/:\x1e\xf2\x91\xd4F\xb9\xbdF6R\xe06\x9f!5b_\xcc\x151A\xb7\f\x18\x1a\x8cP\x14`\x88X5>_+d\x18\xd8?>~\x04\xfc8tF\xcb\u007f.\x1c\xc82\x91\x13\xa4\x91\xd12?\a\x14e4\xb3u\x9a\xfbm,\xc3O\xdb\xd4\x11\xf1\a\xdf\xea\xd8\x17\xf2\x87\x81b\xdb/#\xa6e~\x0e(\n\xe0\u007f\x14\xd4\x0e|\xe2\xf6\xa7\x05\xc0 @Q\x00\xbf\xe39\xbfz\xa7\xd5\xf3\xa1\x06\x80\x11\x80\xa2\x00\xfe\xc7>\xf3\xba\xdbZ1\xc0\xd0\x00\x8a\x02\x00\x80~\x80\xa2\xe8ϗL\xb4J\x01\x80?\x00\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0\x02\x8a\xa2?\xa0(@\xe0b\x90\xa2xw)\xed\xbfTh/\x94\"F=\xa0(@\xe0b\x8c\xa2xw)\xed/ʽ\xd8t\x9e<\xd8\xcd/piȟ\xfe\x0f(\n\x10h\x18\xa2(\x1a.\xa5\xdf۱\xf7\u05cfv\u007f\xb1RwJ\xc8?\xff\xe7\xff\x06\x8a\x02\x04\x1aF(\x8a\x96Ki\xc9\x11\x92\xcc\xf3\x97A\n\x11\x90\u007f\xfd\xaf\xfc\u007f\x871\n\x10p\x18\xa1(Z.\xa5\x85\xa2\xb3ġ\x12f\xe9ч \x1f\u007f\xfa\x1f\xa6\xff\xf2/_*\x10\x16\xdcM\x8d5\xc5%?@\xca$\x00\xf8\x11F(\n\xd2p)=\x99\x87\xe7g\xbbr\xfd\xc5\xed\xed\xcb/\xff忘\xfe矈\x8e\xfc\xe9\xff\x88\xfcIP\x94Z\xf3\xea\xafj\nx\xec\x85E%\x01\xc0\x9f0VQ\xd8.\xa5\x1d\xbb\x8bZ\xbbZ\x0ee\x8fć\xa6\xbe\f_\xfe\x0f\xfe\xbf\xfe\xabsd\xf2\x8f\xce\xc74\xff㗨ۖ܍Po\xf5cD'\x01\xc0\xaf0VQ\xd8.\xa5\xa8\xad(;\xdb~\xaa\xe8\x10\xbb\xec\xa8\xe3\xcb\u007f6\xfd\xe7\u007fv*\xca\xff\xfe\x17\x91\xff\xfd%\xba\xc0\xdftEPI\x00\xf0+\x8cU\x14\xa6K)\xa6\xab\xad\x1f\xe5\xf9\x8b\u007f\xa4\xa0#\xffM\x1e\xa5H\xf3(żd4J%\x01\xc0\xaf0VQ\x98.\xa5\x82\xb4\xe0\x97\xeb\xd9-̢\xa3\x0f\xac\x1f\xf2L\x8a\xa4(5\xfc5W\x04\x95\x04\x00\xbf\xc2XEa\xbb\x94\xd6g\xb7\n\x8b\xf6\x1e\xf3Z\xc3(\x82\b\b\xbe\xda\xf3\xbf\x14\x8a\xd2iM\xc2\xd6\xdeYY\x88N\x02\x80_a\x84\xa2h\xb9\x94\xfe\x98\xfdݝ\xef\xf3\x8a\x9ej\xd53ZpJȿ\xfe\xe3\u007fW(\n\xaa\x8dY\xfe\xf5\x85,\xe2\xc6G%\x01\xc0\x9f0BQ4]J/\xe6\xe7\x16]\xec\xf7^\xc9(\xe2K&\u0082۩6K\xe2i\x12C%\x01\xc0\x8f0BQ\x02\rUE\x01\x00\xbf\a\x14E\u007f@Q\x80\xc0\x05\x14E\u007f@Q\x80\xc0\x05\x14E\u007f@Q\x80\xc0\x05\x14E\u007f@Q\x80\xc0\x05\x14E\u007f@Q\x80\xc0\x05\x14E\u007f@Q\x80\xc0\x05\x14\x05\x00\x00\xfd\x00E\x01\x00@?@Q\x00\x00\xd0\x0fP\x14\x00\x00\xf4\x03\x14\x05\x00\x00\xfd\x00E\x01\x00#h\xf5\x9f\xbf\xc2z\x05\x14\x05\x00\f\xa0gҍ\xa7\x01\xa1)\x06)\nå\xb4\xe5\xc8^{\xfeI\xf2\x88\x03\xd4r(\xf7\x88\xbf<\xc1\xcd7\x9a7\x98\xadi\xb5\xd6Gh\x1b\xcf\xf3\xe6\xbbZ\xe1\xc0h\xe7\xe9\x98\t\xdfw\x04\x82\xa4\x18\xa3(\f\x97\xd2{\xd9%\xf5w\xea\x0f\xec\xc5\xcfY\xbac\xaf\xbaQe\xbf\xe3\xb5\n\xff\xa2\xc6\xfc\x87\xb2\xca\x0fy\xfe\xff\xa2\a\x0eG)\u007fU+^\x8dg?\xab/;zQ}\x19`4\xedc\xc6L\xbc\xe47\x0f\x15\xf3\x82!\x8a\xc2r)\xbd\x91\x8d\x15\xe4)N\xf6\xef\xc5Ϭ>\xb97\x10\x14\\\xe4\xb1%\xa5\x1b\xa1\xce\xf7\x04E\x11hxYE\xe9+\xb3\xacS_\xfa\xbb\xc5\xea\xcb\x00\xa3i\x1f\x13\xff\x9b\xb0\xfa\x00\x90\x14#\x14\x85\xe9R\x8a\xc8\xc6mŏ\xab\xae\xb7cK\xb0\xa7҃\xf1\xfd\x9f\x1c3\x19[\x14\xf3\xb7\xf1\xdb\xcb*J\xe3j>ŋ+a\xf8;\xea\xcb\x00\xa3i\x1fSx\xfe7S\xebe\xf3;\u007f\xc5\bEa\xba\x94\x92\x05\xb7\U0008b10f\xe5\x87ɧ\x92\xa3\xac£\x92\xcb\x1bl\xa6\xd8dۀpZ\x92j5\xd9R\x1a\x85\xbc}<\xcfW\xa2J\xe1u\x1fz/\x83\x84=.&&\x1b\x92\xa2\f|\xbdڼ\xb2t@Y\x03\x1a\xa8H4'\xecz\uef8e\xce]Q\xb6\xb3\xee\x99\x12E\x9cH8B\x97\xc6r\xdc\xfa\xebKg\x84\xcc\xefY\xc1\x05塦\xf1\xdcl\x12\x93\x17\x11:k\x95\xbf\xd8\u05cft\xda\xc7\x1c\xf8\xf5\xe4k3\u007f\xf4{I1BQ\x10ۥ\xb45;;;\x17\xcf\xcc\x16\x8aF='\v\xd5J\x8f6~\x9a\x97~\xa2\xa6,\x96\u007f\x81\xd0Y>\xa3\xb6:%\xaa\x01\xa1Gi\x89\x97;Q\xe7\x955i\xbftG)\xecI%EI\x8f\xdesnOt\xba\xb2\x06\x94\x11\x95u\xae4ne\x9fb\x15\x03\xa7\xad\xa6\x9cN\x92\xec\xbe/\xa2\xb0\x00\xea8Y5knUU\x950\xee\xeb\xca\xdf;c\xd6\xc4髖rM-U\xe36\t\xba\x1e\x1f\x8cC\xe2\x83>(\xd9>9<p\xce5\x87\x95\xf61\xf9\xbf\xfez\xe4\xb5\xd97\xfc]R\x8cU\x14\xa5KikK]\xfe\xdevi\xe1wy\xaa\xc5G\x19\xa5qX\tJ-\x82\b<\xaf\x16\x0e\xfb\x81\xf7S\x84\xcf\x15\xcb\xc9\xc2\xf7+\xd0}^\xf1\xccj\x97\xa2\\\xe0k\x10\xf6\U000b9828\xe1,_Ab*\xe9\"h'\xbf\xb2ٙLr\x1a\xa1\xaeAJ\xa8\xb3\x9ep\xee\xcd6\xf1d3XP\x14\xb4\t+J\x11\x97+\xbc~\xcb\xedG\x80\x01\xb4\x8f\xd9\xff\xf7_\u007f-|-\xbc\xc9\xcf%\xc5XEqw)E=\xf9\xe5\xc2\x18\xa5\x8a\xa4\x8f\xf9\xcd\x18\xe5\xa1uYV\xd9\xcd>lɃ\x1e\x97&\xbfk\xe1?\x14R\x8dQ\xdd\xcf+\x9e\xbc\x88nD\xbd&\xe6\x18%\xe3}\xf2\xb6|\x9b\xa2\x86\xb4w{_\b\xd82\x14\xab\xa8\x88^T1 &o\x9f\x11\xb9\x8d\x94Њ\x12\xdc\xe4LɊ\xb2xf\x0ffZ<\x02\f\xa0}L\x9e\xa0(\xbf\xe6\xbd6\xb7\xa9\a\xf93\xc6*\n\xe5R\xda%\x8e\xb6/\xd9\xfb\x9d\x16\x83\xe8\xd07̢\xa3\x91'e\xa9\t\xfc\x92\x83\xc2!\xdf\x10g\xcb9\xedX\x87\x15\xa5\xdb\xd4X\xcc\xef\xbb\x1d%\x9c\x9d8\xe7QzkțKQ\x12S\xc8[r\xa2\xa2\x86\x0f\x9dC\x90\x14\xe5*\xeen\xe0\x13\x9b\x917hE\tw\xa5dE\x99\xe3\x9ciy\x8bQ\x14Н\xf61\xbb\xff\x03KJ\xe6\x98\xf9\xfe-)\xc6*\x8a\xecRڟ'\xce\xc3~/(J}6\x1e\xb9\xb4e\xfb͵\x9e\x86\x1cA\t\x9eTƔ\"\x94\x90\x88\xa7TS\xb1\xa2\xa0\x84\xcauk\x12N\xe3s\x9f\x9c\x98_pF5\xff\x88\x84\xbb\xc6(\uf489\xd8e\xe9\x8a\x1a\xd2\u07bdFx\xec\xb6\x12j&\x85\rQ\x14;\x19\x9c\x84\xbf\xed\xca$\x8a\xb2\x1e+\xcaҙ\x17\t\xad*\xc5\x01]i\x1f\x93K\x14\xe5\xd7/Ƽu˟%\xc5XE\xa1\\J\xf7\x1e\xc1\x19䬧\x9f\x18\x94\x1e\xf5\x9f\xfbQ\n\xf0T\bBI;\x10\xb2\xa5\n\x89\xbe\x95DQҲL\x17\xf8\x9d8\xe3\xb1\xe53ᄦ/i\x19\tw)\xca92WRɟS\xd4P\xc3W\xe3d\xceA\x8f\xd5t\ue2b2\xd6x\xe4JDF\"t\x8f\xcb\xc7Iy\xb8\x12\xfa\xb1\xb0\xbd#\xb0\xa2\x1c\x11\x17\xfd\xf1svi@_\xda\xc7\xd8\xff]\x94\x94\xf5c\x96\xde\xf1cI1BQ\x98.\xa5?f\x97\xd7ߩ\xcf'\xf7\xcc\u07b2\x1f\xbdq\xcc~K\xa3\x9a\xd1C\x01o\xdew\xf6t\x06_\x8b\x93\xa9\xa5\x05+\xf9د\x04\xd18h\xb6\xf4%\xc4\x14\xe0\x88\v\xe6Ċ3\x1bLW\x10z\x88\xef\x99-v8\x1e\n\xb9iQ9gs\xa2Ҕ5\xa0\x9cyi'\x84\xa4rfV\xa4yM*#\xd7\xc9\xc6\xe0-\x85o\x86\xdeA=\xa7\xc8e\x1fq&e\xee\xe4/>\x8f\xe0\xc6\xe6\n\xe3\xc1\xb5\xdc\xe2\xfcC\xf1\x9c\xdḟ\x8fl\xda\xc7d;\x15\xe5\xd7U\xaf\xadh\xf1_I1BQ\x98.\xa5\xa8\xe5\x9b|{\xe1)q\xe2\xbb\xe5\xb0\xfd\x90\x1f\xfd\xaf\xa7bM\x81\xcddM\xc2r\xd0W\x9c\x10\x1d\x97V\xf1\x9e)I\x18\x8bX\xf6\t\xaa\xd2@B\x9a7\x98\x97\xa4\xfcEH\xa4;\xa7I\xc8X\xa6\xf4C\xf3\x87\xa5}\xca\x1a\x84QʺX˚\vj+S\xa5냰\x90\xb9\xdf\"t)\x88̗, \x99\xd7#C&\xce\xff#ǭ\x10\xd2G\"\xc3&\xcd=\xec\xbd\x12@'\xda\xc7d\xfeۿ\xff\x87x\xdcĿ\xb6\xca\u007f%\xc5\bE\x01\x80\x80GP\x94\xff\xe7\x1a\xa4\xfc\xfa\xf6kk\xef\xf9\xab\xa4\x80\xa2\x00\x80\x01\xb4\x8f\xd9ޏ\a)\u007f?y\xfc\xf8\xf1c\xaf\xbf\xb6\xb1\xd5O%\x05\x14\x05\x00\f\xa0}\xcc\xd6\x1e2H\x996\x86\xf0\x9b\xedm~s%B\x01(\n\x00\x18@\xfb\x98-]\xe8\xdf\xec\xff\xfek\xf9\x98\x05\xff\xb4y\xf3\x16\xfb7~\xfaP7P\x14\x000\x80\xf61\x9b;z6\xbe\xb6\xf9ￎ\x9ft\xb8\xbe\xa9\xa9\xa9\xd5O\xef\xc6\aE\x01\x00\x03\x10\x14\xa5m\u0558\xff\xf4\x0f\xff\xfe\xeb\xde\xd72[z\xfa\xfb\xfds\x84\x02\x8a\x02\x00\x86 (J\xfc\x987>~-\xf3\xef\u007f\xff\x87Yu~:>\xc1\x80\xa2\x00\x80\x01\xb4\x8f\t\x1d3g\xf7\xa9\xd9\xdc\u007f\xfc\xba\xf97\xf9~:\x87\x82\x01E\x01\x00\x03h\x1f\xf3ZD^]k\xf9k\xb9\u007f\xff\x8f\u07fc\xe5\xc7\u007f\x16\x04E\x01\x00\x03h\u007fma~}G\u007f\xdbl\xee\xdf\xda~\x13Y\x0f\x8a\xc2D\xabr\x00\x00D\x9e\xfe\xd3qAPP\xcf\xe1\xdf\xfc\xa7\xdf\xfcç?\x82\xa20Ѫ\x1c\x00\x00\x91\x9e\xb6V\xf2H\xa0\xf6\xa2\x88\xf9[N\xc2<\n\x1b\xad\xcaG:\x8b\xb9\xb0\xdf\xfb\xcdCY\x80\x91\x8d\xf3rq\u007fۍ\xba\xeb\xfez\a>&\xa0\x15\xa5\xe5h\xee\xec0\xf1a\xf0m\x11\x87\\\xb9T\x12\x00\xf4\xa6\xbf\xa7\xa7\xc7\u007fG(\x86)\x8a\x86K)\x1d`,ǸKbbs\xd0\x17\xae<*\t\x00\xc0\xa00FQ4\\J\xa9\x00\xa3\xf9\x96;\xe5L\x95\x8cݎ<\x93\x00\x00\f\x06C\x14Eå\x94\x0e0\x1aYQ\xd0\xfa\xe0[\x8c$\x00\x00\x83\xc0\bE\xd1r)\xa5\x02\f\x87R\x94\x8e\xa9\xf1\x8c$\x00\x00\x83\xc0\bE\xd1r)\xa5\x02\f\xe7\x12wLJ\xaf\x0f\xe9b$\x01\x00\xf0\x1d#\x14\x05i\xb8\x94R\x01\x86\xd3\x13\x16q\xf2\x8eS\xe4N\xca\xe3\x15*\t\x00\x80\xef\x18\xab(l\x97R*\xc0x\x0es\x1c\xb7PL\xde\xe2\x0e\xb8r\xa9$\x00\x00\xbec\xac\xa2\xb0]J\xa9\x00\xc3\xe9\x98<c\xeb7N\v\xcf[\xb2\a\xf0-\xb0\x03\x06\x80\x97\xc1XEa\xbb\x94R\x01\x86\xf3-WN\xa5O2\x92\x00\x00\xf8\x8e\xb1\x8a\xc2v)\xa5\x02\f\x87\xbaփ>\x1d\xdf\xceH\x02\x00\xe0;\xc6*\nۥ\x94\n0\x1cJQ\xfag/`$\x01\x00\x18\x04F(\x8a\xa6K)\x15`4\xa7dE\xd9\xca]d$\x01\x00\x18\x04F(\x8a\xa6K)\x1d`$=-\x17\x17\a\xbb\xdcQ\x8f\x87|\x84<\x93\x00\x00\f\x06#\x14e\xc4\xf2\x16\xc7\xcd8\xe4L\xef\x1f\x1f\xdf\xe3\x99\x04\x00`P\x04\xb4\xa2\xb4\\\xbc\xe3J\xb6M\xfd\x82\x91\x04\x00`p\x04\xb4\xa2\x00\x00\xa03\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x12(\x9cI|\xa4\x15\x12\x10\x90\xed0\xb4N\xb4\xee\xab\x18ڵ\x8d0\fR\x14\xef.\xa5\x1dU\xf9\xf6C\x97\xe0\xff\xbe\xbeS\xcc\v\xccK(\x1b\x10?\xd6ĝq\x8f\xd8&\x04\x98\xefʟ\x0f\xf2\x058\xb8>,\x17\xd9î\xbbG3\x19L,\x8b\xc6(\xa1\r\x19\xd2GF#u\xa18\xe6\xcfR\xfa\xbe\x89_\ue664qn\a\xb6\x13mc\xf2\"˚\xda\xf7\xaf0\x16\xb9\xf0\xa1\x17\x9e\xab\b$\xdf[c\x14ŻKi{\ue87a\xa6\xf3\xbb\vAR\xd8\xd4^\xf3\xc8z|\x90\xafp\x9cK\xe3\xf7\x89\x1fϚO\xb8G<p8J\xf9\xab\xd2\xc7Ҩ\n\xf2^έB\xab\xb8oH\xfa\xa8\xc6c\xa5\xe8X6\x8c\x96Q\xbc\xb8\xba\xf2}\xc7C\xe9#\xa3\x91Z5\xf8ć\xa6\xf7\xa5\xf4\xc0\xd5mўI\n\xd7v`:\xd1^3\xa5\x9c\xa8\xfc\x8c\xe7\xab\xf1\a\x95\x961{\xa1\x80\xb5\x8a\x00\xf2\xbd5DQ4\\J\xbf\xc9\xc7Ϛm\xb3\x9f\xf7VG\x00\xb3:\xd53\xaf\x86o\x16\x0e\x9a\x9d\xfcm\xf1c\x9fg\x04B\r\xb2\xa2\xdc5刉\xf3\xdcF\xb4\xd1\xf9\x84\xba\xdf-f\x95\x92\xa1cٰZF\xf3I\x12\xfd\x89\xd5H\xad\x1a\xb4\xe9\x8cJ\x8b\xea\x94?\x16D\xb3\x92.\xa4\xed\xc0t\xa2ݰN\x18[\fl\x13\x15E\xade\xccMM\xc1^E\xe0\xf8\xde\x1a\xa1(Z.\xa5\x85\xf9d\xe1\xd1\"v\xf1\x80g\xa5\x9a\xa2\xa0n\xcbN\xcfE\x12\x94\xa2dX\x9f\x8b\x89\xeb\xdcV\xb4\x9d\xbbA\xd2\xe1\xef0\x8bIбlX-\xa3Q*\n\v\xad\x1a\xb4\xa9\xe5\xaf\xf1\xb5\xf2G\xef\x8a\"m\a\xa6\x13\xed2\xa2\x05\x8d\xfci\xfc\xf6\xb2-c\xaf\"p|o\x8dP\x14-\x97\xd2\x16\xf1\xb9G'\x87\xc1t\xeb\xc6\xdba\xe3\xa6, \x0f\x86\xcc\f\x0f\x9d\x93)\xbc\xaf\xe0\xc6\xd9W\xcd\n\x9d\u007fK\x91T%/\"t֪\x0e\x84.\x8d\xe5\xb8\xf5ח\xce\b\x99\xdfC%݂s\xa7\xd8\xf1ۭ\x89\x9c\xc8D\xe9\x89O\x02;ySٮ\x04\xf3\x86\a\xf8\xc3@E\xa29a\x97\xf0\xdd<Ë\xacV\xd6$*\n\xda\x19\x8b\xd0\x133\xcfGU\x92\xdcg\xa9V\x93-\xa5\xd1\x19#+J\xaf\xc5\xf5\xbb\xd9\xca\xe5\xa1|\xae\x15\xa1\"g\x13\xc2I\xb6k;\xac\xe0\xc6n\x8f\x9f\x16\xb6\xf0\xba\"\x96\x8d\xa2e\x977\xd8L\xb1ɶ\x01e\x88\xac(T#\xe5XE\rR\x8f\xd9ۡ\xd1\xc4\xf3{\xee\xa6/\x8bI~\xa1\\G\x81\rYœ\xbf\aiVK\xaax\xaa#%\x95\xc5\xe4\xed\x80XN\xb4iV\xbcQ\a\xceu\xd2-\xa3k\x90{\xa1h\xe4\xe3\xf4X[NN\xac\xb9\xda\xcb*\x02\xc6\xf7\xd6\bEA>\xb8\x94\"Կ\xb7\x8aYt(96!|s\xf9F\xe1\xa7\x18\xa1\xf8\xe0\xf5%\xeb\x83\u007f\x8fP\xfdޱ\xdc\xe4M[&\xbe\xadH\xaa\x11\x1f\xf4A\xc9\xf6\xc9\xe1\xfd\xa8+\u007f\xef\x8cY\x13\xa7\xafZ\xca5QI\xb7跸\xf9\xf8\xadg\xf7v\x91\\Zr\x9a+M|\\\xc1\x9f-\x9f\xe1\x0f\x19QY\xe7J\xe3V\xf6\xa1\xce+\x8e\x84$\x87\xc3q[Y\x93SQ\xcaxa\xc0\xdf\xe0p\xc4\x14\x90ܳ|FmuJT\x83\x18#+\xcaM\xde\xe1L\xf5O;\x85\xbe\x9b&\xc8x\xc7ɪYs\xab\xaa\xaaȔ\xb9\xb4\x1dp\x8fg|\xfe\xe9\x8c\xd0::\x96\rݲ\x9f楟\xa8)\x8b\xe5ݎvj\x8c\"7R\x8eU\xf4M\xea1{;tWW\xda\x12,\xb6]i\xf3\xe4\x99\x19ºT\x94\xba\x0e'\xeeZ\x12*\xcel\xe0\xa3\x15Ie1y; \x96\x13\xedC[Tr\xc1\x0f\xbdH\xd17E\rR/\xe8F\xf6.\xb7\x96\xee\x8b1\x97m(\xf6\xb2\x8a\x80\xf1\xbd5VQ\xd4]J\x85M\x9e\xdb\xc6.;ttM\x9f߅\x1d>ڰY)v\xfb8\xc2\x1d\x16^\x83'\t\x83\x92\xa5\x93\x912ɤ\x88\xcbEآ\x838\x10\x86so\xb69O\xe9\xa8$M\xd3\xe7\xe29Ľ&\x11\xb7\xc7\xffG[\x84\x9f\xbc\xf48\x84\xa5\x01\xcf\xee5\xf0\xe4\xf7P\xfd\xac\a]pN\xa48\x0f\xd6\xe7Ղ\xc0\f\xbc\x9f\"\xc6Ȋr\x8e\xff\xabG\r\xd4Y\x0f\xb5\x1dP\xf0\f\xdc\xf0\xe9\x11\x8cxO\xa4\x96\x95\xc6a-)\xb5\xb8M2(\xcfz\x9c\x8dT\xc4J5\xd0=V\xdb\x0e\xfc'\xcf\xd0\xc03\xa4\xa0\xcf\\\x8c\x8a\u0378\xae5\xef\tC\x99\xbe\x0f\xa3\x95IE1\xc5v`8\xd1>.\xf8\x83\x89\xb7T\x8b\xc5䭮X\xb1\xb3\x17T#\xabyaTX*\xee\x10\xd5U\x04\x8cﭱ\x8a\xa2\xeeR\x8aNe\xbb\xff\xa0\x0f=%\xdc\xf7\xaed\xfco\xc9\xdb\x1b\xf8l7\x18\xbfl\fF\xca$\x93\xc53{0\xd3\xc8Irx\xb0\xd4\x05*ɠ\x89s\xa1\x8c\x8aNGγ\xff\xb4w{_\b\xd8ȵW/\x8aR\xc1?&\x1f]_\xf3ǥ\xc9\xefZ\xf8\x0f\xc5\x0f\xb2\xa2\x9c\xe6\xef#O$E\xa1\xb6\x03\n\xfe#~\xcd\xe4|\x92w\xa9e\x0f\xad˲\xcan\xf6\xf5\xba-g*\x8a\"V\xaa\x81\xee\xb1\xdav\x88v\x1b\x9e`\x1a\xf9+\xddW\xf0!\xfd\x84/ß\xf7D+\x92\xcab\x8a\xed\xc0v\xa2\xed\xaeI\xe6\xcf\xe1\x04\xad(\xf4\x8a%E\x91\x1a\x99c\x11^n\x8b\xb3/\xaa\xab\b\x18\xdf[c\x15Eե\xb4\xe7\xa8]\xbac\xc58\xb6rҹ\xed\\\xd1M}\x01\xfem\x0e\xde(\xbcl\x12\x15EN2\x99\xe3T\x86\xb7\xf0\x87\xf0p)\x9fJ\xb2\xa8*\x12q;ϋ\xc6_V\xf2%\xfd\xd0y\x1eOF\x1b^\x14\x85|\x99\x91\xf45o\x88\xb3\xe5\x9cv\xac\xf3P\x94\xab\xd4ud\x19IQ\xa8퀂7\xe1\xd7c\xbe\x19\x16\xc9-{R\x96\x9a\xc0/9\xa8:\x8f\x82q\x1d\x8bt\xacT\x03\xddc\xb5\xed\xe06\x97D(%\xcbKqo\xc9\xe9\x06.F%\x95\xc5\x14\xdb\xc1Ӊ\xb6\x81̊\xf4%\xbaouŊ%E\x91\x1aY<\xef1\x1e-\x8ac\x14\xb5U\x04\x8cﭱ\x8a\xa2\xe6R\xfa\xb4(\xcfe\x9bc$\xe5\xf2q\x13?\x93\xbc\xcd c\x14|P9\x15EN2Y:\xf3\"\x81L_\x86\xcb\xf3-\xe1^\xa6^ԑ\xbf\xa4i\xef^#\x90\x11\b\xf9nW(\u007f\x9fEE\xe9\x8ds~\xed\x9d_\xf3\x84D|\x9d!\xd5CQ\x9eG\x17 O\x88\xa2؛\x14\xdb\x01\x05\xaf¯\xf6A\x8cQp\xcb\x1ar\x04}xR\x19S\xaa\\.*J\xe7>\xc5@J\x11+\xd5@\xf7\xd8\xdbvp'uuCC\x03\xbe\xd2\xfb7\x9eT\x98\x1e\xadH*\x8b)\xb6\x83\xa7\x13\xad5\x8b\xbc弇_\xa9\xad\xaeX\xb1\xa7\xa2<\x8cJ~ؘ\x90(\x9e\xf1\xa9\xad\"`|o\x8dU\x14\x15\x97\xd2\xd6\xfd\a\x84\xcd\xddo\xf8dxǔHf\b$f\x00\x00\x03\xb5IDAT<\xa3\xf3\xc1*<\xf0ǃ\xd2\xfd\\\tRW\x94\xa6M\x1e?\xdcG8r\xe5\xfb\x8f\x9f\xe3W\xeaj\xacʅ٦/\xbc]\x8b\xa5\xbe\xa45\xe2=\x119\a\xf1k\x92p\\>\x123\xa4\x1aDE\xc9\u1777a9\xbf\xe66\xfc\xd5\xef[\xe9\xa1((\xf5=\xc6m\x14\x91\x91\b\xdd\xc3\x1d\xa0\xb6\x03\n\x9e\xd2!ďt\x0fft\x9ejY\x01\u007f\x81|\xde!ƺ\xba)*\xcaM\xfe2\xf9\xe4l\xa4\"V\xaa\x81\xee\xb1\xcav\xa0\x0fli\x15\xd6]\xc2\xcb.\xab\xf0\x92h\x13t\xe7vL\xb42\xa9,Fm\aʉ\xd6UY\xac\x15+W\x9fX\x80\xda\xea\x1a\x8ar\x8d_\xc2\xf3\xeb\x1e8\x97\xb3W\x118\xbe\xb7F(\x8a\x96Ki\x93}\u007fSKK\xcb\xc9|\xad\x8at\xe7\xe8\xebod\x96|\xc0\xe1K\xbaK\x83\xd6\x16\xad\rZ\x8aPKո\xf8S\xe8b\xfc\xb8\xaa\x16*\x89\xa3\x17r\x13<~\xb9\xd7r\x8b\xf3\x0f\xc5sy\xa8\xe7\x14\xb9v\"\xfc\xe2\xd3I7\x16r^\xbeW?;Lۮ\x0e\xdc\xdcfr\xfc,\x1cC\xf3\xd2N\x9c\xce\x10g$\v\xa2\x8bO\u007fb~H\xd7@\ue67d\x90N\xee\x99\xed\xbd\xeap\xc4ls\\~\x86\x0f\xd6\xd4҂\x95|\xecWW\xd1C|\xcfl\xb1\xc3y\xcf\xea\xed(\xf9Nu\x89\x8d\xc1[\n\xdf\f\xc5\x17\xb0\xa9\xed\x10̅\xe7\xdbgM\xf2P>V\xe7\xe5\x96\x15\xf0\xe6}g\x85\xf6\xd6:cI#_\xfc\xb0\xf2}\x87\xc0\xd7\xc2I\x88\xa2\x91T\xac\xdc7\xa9\xc7\xec\xed\xf0\xe2\ar\xf5\xe5\xbe\xd4\x1c\xb2\x8a\xee\v|N'\xea\xcc\xe1/t\xa3f\xb3\xad`Ϣ(SE3\x95t+Fm\aʉֵ[by\xeb\xbe\vBsn\xd3-\xa3k\x90{A7\xf2ZL\xcd9\xc7\x03\x97\x8e\xb0W\x118\xbe\xb7F(\x8a\x96K\xe9\xe1l\x91a\xb8\xc3\xed\xfa;\xd3&F\x90ɝ\xfe\xcc9\xa1s2\xfb\xf1M(\x1c7\xae.Tx]A%q\x88}\x02'M)K\x1c\x89\f\x9b4\xf70B\x97\x82Ȅ\n\xfejRI7r'g{f\xba\xd8\xc9\xf3\xbc\xe9/f\xe1\x15߶V\xb3.ֲ\x86\xfc\x98\xa3\xee\xacE1I\r\x8a\x1a\xc8\xffz\xf8ed\x02\xf2\xa7(q\xaeA\xf8\xd0W\x9c\x10\x1d\x97V\xf1\x9e)\t\xa5;g \x9c?\xaf\xfbb<\xff\xac\xd2\xf5AX\xc8\\\xb1G\xf2v\b^\x15?q\xeaR\xcfsPf祖U\xac)\xb0\x99\xacI\xce;͜\x8dlt6\x8c\x17\x0eQ\xaa\x91\x8aX\xaao\xae\x1e\xb3\xb7\x83\xb3\xb2d\xa4XE\xcd<|\xcf\xfc\t\x9e\x9fW\x83\xd0ݔE\xcbr*L\xb8\x98\x94t+&o\aډֵ[\xfeP\x96\xb3\xdc\x1c\x97\"^>s\xb5\x8c\xaeA\xee\x05\xdd\xc8+&\x9cgZӬ\xbe\x8a\x00\xf2\xbd5BQ\xfc\x86B\xdff\x17F\"\x03Y\xa6j\xad\x18\x8283\xcb`\x14w\x9eµ\x1dtt\xa2}d\xde\xf1\xe8ŋ'?}\xb6\xe8\t\xf9\xccX\x85\x8ek\x1b\xf1\x80\xa2\xf8L\u007f\xee\xa4\x15Z1#\x97\x81b\xdb/Z1\x18\x15E\x19ݝ\xa7\x10\xb7\x83\x9eN\xb4\xa7\x9dw\xe1\xf4ŊCJ\xcfU蹶\x11\x0f(\x8aϴ\x84\xad2|\xee\xd8xT\x14%0:\xffR\\\x8b\x12Ow\x9a\xa3njD\x06\x04\xa0(\x00\x858\x17\r\f\x86\xbe\f\xf3\x8e\xea\xda\xea\x1d\xe6\f\xb7\xbbq\x02\x13P\x14\x80\x82\xccE3.R\x01^\x188\xb3\xc1j\xb2&\x9f\x05A\xc1\x80\xa2\x00\x00\xa0\x1f\xa0(\x00\x00\xe8\a(\n\x00\x00\xfa\x01\x8a\x02\x00\x80~\x80\xa2\x00\x00\xa0\x1f\xff\x1f\xec\x88D\xdc\xfa\xfa\x88\xfa\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/error1.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x04\xc1\x00\x00\x00\xbd\b\x03\x00\x00\x00\x8d\xa5\x9a\x96\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x02\x05\x01\n\x03\x01\x05\a\x03\x1e\x01\x00\v\r\n\x10\x12\x0f\x16\x17\x13y\x00\x01\x19\x1b\x18\x1b\x1b\x14\x83\x01\x00\x8c\x00\x00\x8c\x00\x04 \x1f\x19!# #$\"%%\x1e$%#&'%'(&+)\x1e()'++$*,)/,!-/,02/63(241\x98\x1b\x1b786;8,\x82%#:;9><0>?=C@4@B@\xa0*,CEB\x9c.-KH<MH7\x00f\x00\x00g\x00\x00h\x00JKI\x00i\x01\x00j\x02MOL\x04l\x05TO>\tn\aPRP\xa9:<WRA\fo\t\x0fp\vTVT\fr\x17\x11t\x19^YG\xaaDCY[X,`\xae7]\xad\x15v\x1c\\^[\x19y\x1e;b\xac_a^faO>e\xaf*{!bda)}*Bh\xb2egdLj\xafpiR.\x81.Em\xb1ikh\xb3XX0\x8301\x841/\x858Jq\xb5mol;\x86:Vu\xb4>\x89={t\\tvs@\x8b?B\x8c@@\x8dG\\z\xbay{xJ\x8eI^~\xb8\x84|d\xbbkkL\x90K~\u007f}O\x93Mb\x83\xbdN\x95UW\x95V\x82\x84\x81\x8f\x85hm\x87\xbdZ\x98Y[\x9aZ\x87\x89\x86\xc0{|]\x9c\\\\\x9dcr\x8d\u0096\x8cnd\x9dd\x8c\x8e\x8b{\x8f\xc0f\x9fg\x90\x92\x8f~\x93\xc4j\xa3jy\x96Ŕ\x96\x93s\xa4l\xa1\x96xq\xa5s\x81\x99×\x99\x96\x83\x9bť\x9b}u\xaaw\x9a\x9c\x98Ǒ\x92\x9c\x9e\x9b~\xaby\x88\xa0ʞ\xa0\x9d\x81\xad|\xab\xa0\x82\x8e\xa2ǡ\xa3\xa0\xa2\xa4\xa1\x81\xb1\x85\x92\xa5ʋ\xb2\x88\xb4\xa7\x83\xa6\xa8\xa5\x8d\xb5\x8a\x97\xabЩ\xab\xa8\x8e\xb6\x8c\x8d\xb8\x93\xab\xad\xaa\xb9\xad\x88\x9f\xaeή\xb0\xad\x96\xba\x96\x98\xbb\x98\xa3\xb2Ұ\xb2\xaf٨\xa6\x9b\xbe\x9aµ\x90\xb4\xb6\xb3\xa3\xbf\x9d\xac\xb7Ҷ\xb8\xb5\xa2\xc0\xa4\xb7\xb9\xb6۰\xb3\xa5ħ\xba\xbc\xb9\xb1\xbdקƩ\xbd\xbf\xbc\xa8ǫ̿\x99\xafƫ\xb8\xc0տ\xc1\xbe\xb2ɮ\xd0Þ\xc2\xc4\xc1\xbc\xc4\xd9⽾\xc4\xc6òͷ\xbb\u0379\xc0\xc8ݻ\xca\xde\xc7\xc9\xc5\xd8ɝ\xbdϻ\xc6\xca\xda\xc0\xcc\xda\xca\xccɿҾ\xd7ϡ\xcd\xcf\xcc\xc4\xd0\xde\xcb\xcf\xdf\xc8\xd3\xc1\xe0ѥ\xd0\xd2\xce\xc8\xd6\xc9\xea\xcc\xcb\xd1\xd3\xd0\xd2\xd3\xdd\xca\xd8\xcb\xd3\xd5\xd2\xdf֨\xcd\xd6\xde\xcc\xda\xce\xe6֪\xd6\xd8\xd5\xd4\xdb\xd0\xeb\xd4\xd2\xd2\xda\xe3\xd8\xd9\xe3\xeaۯ\xda\xdc\xd9\xd7\xde\xd3\xe1\xdb\xda\xd5\xdf\xda\xdc\xdd\xe7\xdc\xdf\xdb\xd7\xe1\xdc\xde\xe0\xdd\xdc\xe1\xe3\xf0\xe0\xb3\xe0\xe2\xdf\xe2\xe4\xe1\xee\xe1\xe2\xdf\xe5\xe7\xe4\xe6\xe3\xe8\xe5\xea\xe5\xe7\xe4\xf2\xe4\xe5\xe6\xe8\xe5\xe3\xe9\xeb\xe7\xe9\xe6\xe8\xea\xe7\xeb\xed\xea\xf6\xf0\xef\xf2\xf4\xf1\xfe\xf8\xf7\xf9\xfb\xf8\xfe\xff\xfc!l\x99S\x00\x00 \x00IDATx^\xed\x9d\x0fXTם\xf7\xf7\xd9\xd9\xd8w\xd3$C\x03\x9b\x12-K^\xd6fm\xfb\xdc\xe1\x19\xa9\xbe+\f\x8d\x1d\x14\xd7?1+\xbeVQ\x8aV1\x1b1\x18\xe7a\x13\xa3\x82ƄL\n\x19%) B\xe6\x89E\x1eY3*\xbe\">\x19Me\xc1\x96hqm\x12\xe8S\xa6ѱ\xb6\xda\xe4\xf2(\xac\xe4y\xaf\xe7\xed\xa6\xe5y\xcf9\xf7߹ý3(\x03\x97\xd1\xdf\xe7\xd1;\x87;\xbf\xf3\xbb眹\xf7;\xe7\xfc\xee\x99{\xfejh\x14 \x00\x00\x00\xf3\x18\x1a\xfa\xabH*\x15\x8eH\xee\x01\x00\x00\xc6\x10P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x173\x15,p\xa0\xaa\xa2\xfa\x18O\x92\u0099\xba\x8a\xba\xceH\x19\x00\x00\x004\x98\xa8`A\xb7\xb7\xb3\xbb\xb3\xae\nK\x98\xe0\xf5\x9c\xee>Yq2R\x16\x00\x00\x00\x16\x13\x15\xac\xcbݍ\xb7\xbc\x1bw\xbd\xceT\\#;*\xf8Hy\x00\x00\x00\x18LT0D\xf5*\xe8\x0e \xe4=@wTB'\f\x00\x80;\xc1L\x05\xc3\xf4wW{\x05\x84\xea|\xf4/\xef\xfe\b\xe6\x00\x00\x00,\xa6*X\xd0\xedv{HO\xecX\xe5\x00\xde\x0ex\xea\"\xe5\x00\x00\x00`0U\xc1P0\xd0^M\"\xf9\xbc\xc7\x1b\xec\x0fx\xddՑ2\x00\x00\x000\x98\xab`\x98\x81\xea&\xbc\xbd\xe6\xc5ݱ\x16\xaf7\x925\x00\x00\x00\x83\x89\n6 З3n\xfa\xda\u007fM@\x95\xc7\xc2f\x00\x00\x00\xd0b\x9e\x82\t\x95b\xf8\xfeL\x05V\xb0A\x92\xea\"\xb7%\x01\x00\x00F\x8cy\n\x86\xaa\xe8\x14\n:\x8a\xect\a\x11\xe2\xab|\x91\xb2\x00\x00\x00\xb0\x98\xa8`]\xee\xa6\xce\xeeN\x1a\xc9\xefr\x9f\xec>S\xe9\x85\t\xad\x00\x00\xdc\x11&*\x18\n4UWԵ\x90y\x14\xe8t\xb5\xc7{Z\x88\x94\x01\x00\x00@\x83\x99\n\x06\x00\x000:@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]bK\xc1\\.\xbd$\x00\x00\xf7+&+X\xbb[z4~\xc0\xeb9\x10\xf1\t\xad\x1fs;u\x92\x84z\x8e\xe3\xcaQ9\xde\xd6\x0fϦ\xd0k\xe3\x16\xe1\x17\x176K\xeb\tc\xa7\xe5\xb8\xe3p\x98w\xef\xd0\xd9\xe8\xc0\a\xab\xc1/5\x1c\xc7\xea\xf7\x8b\x1cר\xfcq\xeeG\x8eY+[\x97|0,\xafH-k\x1b\x81\x17Gd{w\x8d\xfaً\x0e\xfb\x8f\xa2\xf28%\xed\x81\xc3\u007fX\xe3\xc3D(\xc3\xfd\x83\xb9\n\xc6W\x1c\xab\xa4\x89\xee\n_\x97\xaf\xa2;\x82y\x91\xfd\x8aN\x92\xc0\xbf\xcb\xed\xbe\x8e\xae\xbfŽ\x1b\xf6)\x89\x1d.;\xde^\xf2\xfbk9\xa3K|8\xcdi\xe1\xae\xe3;t\xa6\xd2z6\x92\xc5p.\xa5\xbdՇ_\xfaޚq\x89\xd9{\xc5o+\x97\xd3gm\x05\x87\x1a\x9f3\x96\x9e>\xff\xf2r\xa4\x87NqX\xbfa\xb8\xabF\xcdsԺ\xd2\xfa\"Y\x8d\x04\xed\x81\xc3\u007fXw\xd7\xea#\x81\xf5\x1b\xa9\f@41W\xc1\xbcM\xddT\xc1\x84*\xb2\xc6DZ\xaa\xf0_\xca=\\\x89NR\xe4\x02w\x1co[\xb9\v(,\xe5v\xf1\xb5\xe3\x0e.6\x14\xa9\xabpG\xce\x14~P\x18\xc9B\x87%b\x17\xb3~\x89v\xb7]Q\x9a\xd5yd\xeb\n\xd3y*\xd0W%\xdd\xe2\xd8G\xa2`wӨ}\xb8/)\xf4G\xb2\x1a)\xec\x81#|Xw\xd5\xea#@\xe37\xd2\t\x03D\x11S\x15\xac\xdd\xc3\a\xa8\x82uV\x90\xb3\x99\xaf\xe8\fk\xeeR\xfb].m\x17ll\x15,\x12w\xe7l\xd9\xdd\\K\x85e\xf4\xa5,$\xaf\xaa4s\xa9\xc19\xee\x102\xc2@\xc1t\x8b3f\n\xd6\xc3Es\xa0u\a\a\xbe\xabV\x1f\x01c\xe5\x17\x88\x84\x99\n\xc6Wt!Q\xc1\x9a\xf6\xd3\x1d\xfb\xc3.\xf5\xd1k۪\x93\x94`\x14\x8c/̴e\x15\x9c\xc3\u007f\xbe\xc4\xd9\xeaK\x16\xa4\xad\xa6C\xae+E\x99酮a\x17[\xe3ʴ\x05%X?\xcf\xd98\xae\xac\xa7h\xae}\x8d\xe6\x1b\xb4/\x8d\x13\x87d\x82\xc3\xf6jVf\xeb\xd6Yy<\xf1[\xe3\xcaJ/\xe81p\xc6\xda2\x87`\x8as\x98\x13YF\xde\xf7\xafβ9~\x94\x854\xa8\xb5`\xd9)^(\x85;Y\xbfXi\xb6\xba2\xc5\xe2\x14fR\ro\xa6\xbbk\x97\xa5-\xa9\x153\xf6\x14:\xf01\x88\xecc\x05ۊ\x8fl\xff\x8c\xf1\xa0)\x0e\x83\xbdDn\xbeh6\xea\xa0C<\x9a؍\x96\vi\xf0\x01\xe8\xb7\x03[!\xf5\xc0ʇE\x88\xd4\xea\x06\xce\xe4\xe20\xd945fZ]\xc9\xc6\xfaՔA\xc7\x19\x10e\xccT0o\x13\x92\x14\xacN\\(\xf2X]8s\x97\xed\x92NR\xe2\x02\xd7<00\xd0L\x14\xac\x99s\xb56\x16p\x1d\b}\xdch\xe3\x1c\xe553\xc8e\xdf3kA\xfd\xe1\xd5\\\xe8\xc5\xe6\xe2\xb66\xd78\x96\th\xa0\xb11k\xc1\x8c\xac\x92\"\xaeW\xe3\xf8\xac\xdf/\xf6DZgq%y\x9cc\xb7\xa3\x86\xfa\xcd\xda]\x9e\x95v\xc1\xc0\x19c\xcb\xece\x8a\xc3\u007f\xe0_\x90\xe7\xf7\xfb\x89\xe8\x9c\xe5\x8a\x1a\x8f\xd7;8\xed\xd8C\xad\x05K\xfd\x0fPG\xd6\ahY=\xeb\x17+\r\xb7\xac\xb1q\t)No\x16\xb7\xa6\xbccP,\x8e\xbd\xac\xb9\xcc^D\x92\xadi\xcb\xde:^No\x03`\x05\xbbR\xc4\xd5t\xb0\x1e\xd8\xe2\xb0عE\x8d\x87\x1d\xa4\xf9\xa2ڨ\xe7\xfc\x8d\\\xb9\xdfO\x15C)\xa4\x81\xad~;\xb0\x15b\x0e\xac|X\x91[\xdd\xc0\x99R\x1c&\x1b[c\xb6Օl\x1a\xbfl\x19t\x9c\x01Q\xc6D\x05\xeb\xf4\xf0\xb2\x82U\x9e\xa4{NV\x861ﵽ\xa8\x93\x94\xb9 }\r⋸\xbf\x91|C.y\x8e춧c\xa9+r\xe0\xd4\xca\x05x\xaf\xb0$\xe4bk\xe6ޥ\u007f\xd1/\xcde\x1c\xe93\r\xbf\x15 \x9d\x90\x99E\xd8\xfc\xb08\x8d\xc3>\x17\x9b\xf5e-7r\xc6ز\x87P\x8bÌ;j\x1d\xe4r\xa8\x9d\xa5U0\xb6\x16*~\a\xdai+A\x0e\u007f\x88\xdfE\x03X\x02\x16,\xc7ɾ\xdd\xcbm\\:\xd9y\x9cvK\x8fs\xcd\xf8\xad\xac5\xd8`\xb0\x91\x84α\x82\xd5؛\x893m\xe5uG\x91\x0e\xdcSs\x91\xf2F\xb9Q\x95Q$SH}[\xfdv`+\xa4\x1dEJ\x1fV\xc4Vg`\x9c\xb1\xc5a\xb2\xa9IƯ\xa6\f\x1a\xbfR\x19\f\x9c\x01Q\xc5<\x05\xe3+:\x05A\xe8\xae\x14\xf0\x95['\x0e\x1f}\xe1\xfa`/\xd9zu\x922\x17p\xaf\xa2\xa3\xa3\x86\xc6\xc1>\xab]3w\x16G\x83\xddv\"7$N\xd3'N\xb3(\v\xb9\xd8\n\xe7\x0e\xe2B\bYtr\xc22\xfb0\xb7\x14Y\xc1\x1aq6\x1e\xed|\x9e\xec\xa2øZ\x8e\x9e\xbd:\xce\x18[\xf6\x10Jq\x10s\xce_ʜ\xfbR\xfd9a\x10iaj\xa1\xd2\xcb\xf5\xe7\x15\xad\xec'\xdd\x14\x8d\xdfWɛRq\xd0@\xeb\x1arո\x16ѿ\x16Q\x15U\x87a\x05\xe5e\x92|h+\xaf\xab`jy\xa3ۨ\x8a\x821\x854\xb0\xd5m\a\xb6B\xba\n\x16\xb1\xd5\x19\x18glq\x98lj\x92\xf1\xab)\x83\x9e\x82\x198\x03\xa2\x8ay\nv\xd1-\x13@M\xe2\xac02\xac4\xe2\n=\aB\x93\nL\x1c\xacÑ\xb5\xf3\x90?O\xbc\xd8ȹDN\x9c\xb3\x9c\x1f\xa1\xe1A\xe7%R\u05cd~\xc5/\x1b\x16\x1f\x11\x91\x15\xec8\xea\xb0!I\xc1\xe8.?G\xef\xa1\xeb8cl\xd9C(\xc5A\xec9\xdfW_\xb8\b\x0f9\x91\x06\xb6\x16*\x82\xfdBڹ\xb4\v6A\xc7/-N\a\x1d\x9a\t+\vp\a\xa9\x80f)XN&\x90\r(.\n\x1c3\x16\x89\x87\xd6V\xde0\x92O\xcb\x1b\xe5FU\x14\x8c)\xa4\xbe\xad~;\xb0\x15\xd2U\xb0ȭ\xae\xc28c\x8b\xc3dS\x93\x8c_M\x19\xf4\x14\xcc\xc0\x19\x10U\xccS0!Hh\xf7\x04\x83\x02\xeat\x93\xa1\x03\xef\x0es/r+ף\x93T`\x14l\xd1r2\xee(\xd4^l\x9fq\xb5\xe4\xefРs\xd1ܳ\x14\x12\xd66\xbc\x9f\xc4(\x98]V0z'\xa1\x9e\xa3#\x1e\x1dg\x8c-{\x88a\xd7R}/\xd6\x01ҟ\xebk\xb4\xd7j\x0e\xcaւa\xc1[\x99(\xabf\x01\n\xf1K\x83\xe2\xa48\x99/Q\xb32l\xe1\x9aK\x93s]\xa4]\x98>\x98\xe3B\xef,\x1a?\x1a^yR\x1c\x16\xb5\xbcQnT\xb5\x0f\xa6\x16R\xdfV\xbf\x1dZ#\xf5\xc1\"\xb6:\x03\xe3\x8c-\x8e\xae\x821~[\x87\xf5\xc1d\xbfr\x1fL\xdf\x19\x10U\xccS0\x91\x804\x1f\x8c\f#}a\xe6\x83E肱\n\x96EN&a\x89\xf6bC˳\xf0\x10\xab\xc7\x1er\xb1\x1d\x17\x835e\xb4\x03t'\n\xe6\xc0\xd7\x15?\x97N\xbe\xd2s\xc6ز\x87`\xcf\xe3<\x9c\xf9\ny\xaf\x9c\x16\x1d\xe5ic{l-\x18֬|\x0e\x15\xae\\\x8dB\xfcf\x91\x88\xcc\"\xec\xd1A\xaa\x89\x04R\x95fj\xd0H\x06\x94\xfd\x99y\x838\xbd\x95\xe8.\x99M\xd1l\xeb\b\xf1\xa0\x16\x87E-o\x94\x1bUQ0\xa6\x90\xfa\xb6\xfa\xed\xc0VHW\xc1\"\xb6\xba\xbe3\xb68\xba\n\xc6\xf8ՔA\xe3W*\x83\x813\x84zw\x8f\xfc\xc7\v@\x04\xccU0!\xd0\xee\t\\CtN\xfeŰs\xf2K\xd4~W\x89N\x17\x8c\x9d\x93_\xce\x15\xd6\xee^\xc69\xde\xea\xb8ⷹ:\xd0Y\x97\xcd\u007f\x05]H\xcb*/K\xe7l\xef^\x10gq\xd7\xf8\xfd\xbd8\xe3N\xee\xf9\xc6Cd\x02\xa8\xd0A\xef'\xf5\x868\x1e\xfc\xc0ﷻ\xfc~\x1e]H\xaf\xe9o\xb4\x9d\xeb\u007f>\xef\x12\xa27\xff\xea\x17\xa4\xf7 }g\x1a[e/[\x1cr:\xd7\x1c\xcaK\xbbD\x14,\xad\xac\x19\x1b\xb4j\x0e\xac\xd6B\xb3{+\xb7\x1b\xbd\xc5ыF\xf1K\x8a\xb3\xa6\xa3u%)\x8e\x83\xcb,;\x8e\xfd\x92&*\xe2v6\xef\xe4\xc4{\x91\xf6E\xb5\xcd[\xb9z2'\xdf\xf5\xc1`\u007fAf\xebu\x8d\a\xb58*ly\xa3ڨ\xe2\xbd\xc8\x0e\xfa}\xa5\x14\xd2\xc0֠\x1d\x94\n\xb1\aV?\xacȭ\xae\xefL-\x0e\x93M\xe3\x81i3&\x9b\xea\x97-\x83\x9e3b\\\xc0\xfd\b\x01Q\xc2\\\x05\v\x900X\x15M\x1d\xa8\xf0\x86\xf9]\xe4\xf5\xb4\"\x9d\xa4\n\xfb\xbbH\xa1f\x81\xddQX\xbf\xc0\x96\xf7\"\xfe\xdbv\x81L\xd0\xc1\xfd\x9b\x9e\x82\xf4\xb9%\xef\xdap\xd2%\xc52\xe87\xfe\xf1<G\xfa\xcaf2\t\x94R\x10\xe2\xf8\xacd[/88\xaeq\x06\x97\xd6Hc \xf6\x12\u05ec\xcc\"r:\xea9\xd3\xda*\x87\xd0\x14\a\rlM\xb7\xe7\x91˲qey\x96-3O+`L-4\xbb\x9b\xd3\xcea\xdd\x10;0\xb2_<\xd4*/\x9c!\x16gy}٢4\x878SM\xa8Y\x92\xb6\xa4V\xec\xd7\xf6\x14f\xcdX~\x88\xfe.\x92\xe3\xce\xe2\x82qe\x1a\x0fjqT\xd8\xf2F\xb3Q\afѽ6m!\r>\x00\x83vP*\xc4\x1eX\xf9\xb0\x88A\x84V\xd7w\xa6\x16\x87ɦ\xf5\xc0\xb4\x99\x9aM\xf5˖A\xcf\x191\xaew\x84\xfb\xf5.pG\x98\xab`#\xe6U\xeec\x9d\xa4yH\xe3\x04\x00\x00\xcc%F\x14l\xa2=V\a\x14\f\x00&\x041\xa2`\x13\rP0\x00\x98\x10\x80\x82\xdd\x05b`V\xe6\xcdo=\xc4\xf2\xad7\xc3\xe4\x04\x00 \xaa\x80\x82\xdd\x0540\xdb+\xa6\xff\xa8\xd5/\xaaa\u007f\f\x9b\x1b\x00\x80\xa8\x01\n6J\x86\v\x18\x96\xb0H\x99\x00\x00\x88\x0e\xa0`\xa3\xe3M\x1d\x01{\xe8!\x18H\x02\xc0\xf8\x00\n6:\xf4\xba`\xd0\t\x03\x80\xf1\x02\x14lt\xe8\n\xd8C\x0fE\xca\x06\x00@T\x00\x05\x1b\x1d\xa0`\x00`&\xa0`\xa3\x03\x14\f\x00\xcc\x04\x14lt\x80\x82\x01\x80\x99\x80\x82\x8d\x0eP0\x000\x13P\xb0\xd1qo)\x98wf0\x92ɸsm\xa67\x92\tp\x1fc\xb2\x82\xb5\xbb\x95\xd3\xd3\x17~\xb1\xc8\x11\xe3\xb1Z\xadŨ\x18o+\xc2X]\x8c\xb7N\xc3/\xb9\xd8,\xb1+\x8c]$\"+X\xbe5\xae\xda0{\b\xbb\xacqU\x91ldƠ\x9e۰\xc3\xc848\x9dG\xc2\x1a\x1ct:\x9d{\xd1^\xbc=\x18\xc6\xea\xd3l\xe7*\xfc\xf2\n6\x9b\xffi\x18;\xb4-n[\xb8\xb7\x81\xfb\x1bs\x15\x8c\xaf8&/O\x14t\x9f\fk:bx\x8fu[\x10\x05\xb7Y=\xc3W\x1dbh\xc9M\xc0\xdbn\x9fo\x97\xb5%\x9c]\x04\"+X\xc0\x17?\x12]\xa0\xf0G\xa7\xeb\xdb\xfaN\x0f\xdb\x15\xfdz\xee\x8a\xf3D\xb0\xa0\xdch[\xbfW\xf7\x8d\xb6\xf3\x92\xc1A\xe7\xde\xcf\xd1\xe7\xef8\x0f\xdeе\x13\xb9\xfd\xf3W\xb2\xf1\xcb\xef\xdb\xda\x1a\x9c?\x0fc\x87{\x86\x8f\x96\x86}\x1f\xb8\x9f1W\xc1\xbcMݒ\x82\x05\xaa\xa3\xa5`\xa8\xddz\x00o}\xd6\xf6\xf0f\xc5\t\xe2kK\xc4+;\x1c\x91\x15\f\xa1\x84\x11+\x18B\xf3\xf4m\xa7/\x1e\xbe/\xda\xf5\xbc\x18\xbf!\xbc\x81\xc2f}\x05[\xbfEJ|\xe4<\x85\xb7mΏt\xcd\x14\xf6f\x8b\xaf\xe7#(\x18ڔ\x10\xe6\xe9\xbd\xc0\xfd\x8d\xa9\n\xd6\xee\xe1\xc5\xe7\xe4#\x9f\xdbW\x11\xc3\n\xf6\xbf\u007f\xf7_\xff\xf5\xeb\u007f\xfc_x\xfb\xbb\xa7\xc6D\xc1R\xc7A\xc1r\x93\xc3v\xe6\x18\f\x14l\xed\x16)\x11m\x05\xe3\x93s\xc3\x1b\x00\xf7/f*\x18_\xd1%\xad\xf4\x81\xfayy\xd5[]\xaa\x95\x98O5\xe2\x17'ǧ\xcc;\x83\xf7\x9ey\xd4j\xddԵtj\xe2\x9cA֘\xb9\xb2U\xdb|k\xbc{ݴ\xc4\xd9\xf4\xcb<\xb04y\xca\xc2\xdcaWv\xe5\xcc\xc4i\xebx#\xbfݓ\xad\"\x93\xd9\x0e\x81\xa8`o\x92\xb6x\xea_\xc9\xf6_e\x05\x93\xbda\x05\xcb\xcfM\x9e2\x8fF\xa1\x8e\xceN\x89O\x9a\x93B\xb3\xeeJML\xdd%z\xe9Z\x98\x14\x9f<\x87<e\x1b+X>>\xc6cAƃW:p*\xd2\x10\xe5z\x0eL\x96\xbb`m\x9bWd?\xb3y\xc5m\x9c\xbcݰ~\xfeچ\xdbt\xf7\xa7[\x9e\xc9\xce\xd9\xfc{D\x15\xecu\xa7ә\x8d\a\x89\xb7\x0f\xae\x9f\xbf\xea\x8d[\b\x9dp\x8a\xacG\x1a\x05\xbb\xb1%'{\xc5f\"e\xaf8\xb3\x0f\xbe\xb1j>u\x80~\xbf=\xe7\xe9-\xaf\x84*\x98\xe2\xec\xa3l\xa7sϧ\xdbWdo\xfe\x82\xbe\xb1)\xb1\x1f\x01\x80\x1ef*\x18Y\x1e2\xa0,\xd3\x1dN\xc1\xf8\xa3\x937\x05QpӔ\xa3<\xbe\x9es}\xd5\xf3\xe2\xf0\xe5\xd8_]\x95\xf2\xe4\xe4\x94uK\xad\x9aAF\xbb\xd5\xdb\xdf\u07ff\x9f\\٪mgգ֤\xe2\xd2\xc9\v\xb1A\xd7\xe4i\x1e\xeflk蕝\x1b\x97\xef-MJ\x15\f\xfc\x0exJE<\xecR\x85\xa2\x82=\xfc\xe6\xd0\u007f\xfc\xe3C\x0f\u007f\xeb\xd7C\xff\xf6\xb0\xa4`\x8a7\xac`\xd6Ԫ\xaa\xd4D\\\x9e\x93֥\xd5M\xee$+Q\x8c܄M\xdeM\tK\x89\x13_b궦b+\x89\xf6`\x05\v,\x8d+ma\xcb\xc3\x1f\xf3=\x99\xe1\xf3\x85\xde\xea\x88r=O[}\xe2\xfb\xbf\xfc\xfe\xf6#\xa7\x0e>\xe3$\xe2\xb1#{ϩ=\xd9\xdb\xc9\xee\xb6\xf9\xeb\xdf9\xb5\xd7ـ\xa8\x82\xfd~\xbb\xb3\x81\x84\xbdv8_?Ր\xb3\xf66\xba\xd1ֶjc[[\xdbo\x10U\xb0[\xb7n\x9d\"\nv¹\xa3\xed\xc8f'6\xfd\xe8H\xb63g\xef;\xf3\xb7`\x83O\xe7\xaf:xb\xb33T\xc1\x14g\xb7\x8e\x1cY\xb1j~\xce\x1bۿ\u007f\x95\xbeq,R\xff\x11\xb8o1Q\xc1:I\bzd\n\x86/;2\x8cZL\x06\x13|5\xe9ؤ.\xa4\xbbS\xad\xb3\xf9\xd0u\xeaۥ.K\xbb\xd66a\n\xbeN\x97&\xe1T\xc6T\xbcWH\r\xb9\xb2\xbdV\x0f\xfd\xab\xca\xc8o\xf0\xa2\x88f\u0081\x14\xf7zj\xe8\xd7\x0f}\xeb[\x0f\xfdߡ\u007f\x94\xe2`\xac\xb7\x84i\xb8\a\xd1?u&\xeev%\x11\xed\xda5\x05\xeb\xda\x01ڃ:`ݏ\xdfJ\x99\x83Eq\xa0\x9a,ڄ\x15l[\x82wxytG\x91Q\xad\xa7\xd7zQ4l\xc8!\xda\xd5\xf04\xeey\x9d\xa2\x9d)\xba\xbd\xb5b3\xee\x1c\xdd>B\x82\xf3X\xc1\x1a\xb2O\x10\xdb\x13\xf4v\xe3y\xf1\xe6$3\x8a\x14\xc1\nv\x8bd\xb8-\xbe\x93\xfd4\xee\u007fm\xcf\xc1\xa9\x8d\xab\x88\xaf\xb5!\n\xa6u\xe6\xdcx\x03ݖn\x05t[G|;\x17\xb8\xcf0O\xc1\xf8\x8aNA\x10\xba+\x05i\x91\xc8\xf0\n\xe6K\xe4\x11\x9fH{\t\xc1]s\xa6N\x96\x86T\xa9:1\xdevkiKKK)\x8d\x0f1\xb6\tD\xfeHP\x88\xb7\xba\xc9ߛB\xae\xec\xc5S\a\x061)\xb9\x06~/Ze\x86\x8f\"\x1f\xfa\xfb\xa1??\xf5硧\x86\xfe\xfc\xb0\xa4`\xac\xb7\x04:<s[\xaf\xa1\xee\xe4\xa9\xf9\xee3\x02\xe9\xc4\xe5N\xa3\xf9\xa7a\x83\xfd\xd63\x8a\xbfyś\xac\xe2\x04\x13myt\x15,\xaa\xf5\xac\x93\x15\xecjΊ\xd7\x0f\xfe\xea6\x19:\xeeXK\xf7\xacz\x85\xc8دdK\xac`?qR\x01C\xdbW\xdc\xfe\x02\x93\xb3\x83\xfc\xc1(\xd8;\xe7ϟo\xa0q\xb0\x1b\r\x9bW\xccwR?\xd9Ċ\x04\xbfn\x88\xd3,\xf6\x84(\x98\xd6Y\xf6U\xa4\xd0m\x1d\xf1$\x13\xe0>\xc3<\x05\xbb\xe8\x96\x11WY\v\xaf`\x83Iu\xa8.\x89\x88]Krʆ:_\x86\xa4`Ӈ\x9b2\xf1!֖\xc6\xd3ɕ}R\x1c.\x85F\xb8S%}Zh\xe4\xd7\xe7\x15\xf1\xb1;%\x05{过\xfech\xe8\xd7C\xbf\x93\xfe\xd4x\x13#\xf9>\xebi\xb2,\xf9\xe2i\xd6$2\xbfi\xe6<\x9a\u007f\x0e>P\xa9U\x8d\xf2\xccK\x9e<M\xee^\xb2\xe5\t\x1fɏF=\xd58ٍ\x83[V9\x9fy\aK\xd8\xc6\xcdt\xc7\xe6\xf5d\x16\xd8-\xc5ts\xce\xfcU[hpl\xad\xd4ۢvz\x91\xfc\xf39+\xf6\x9ch\xdb(*\x18\xb9\x01@\x14켳\r\xa1\xe1\x91|\xad\xb3\xf5H\xa5\xc5z\f\x01\x80\x1e\xe6)\x98\x10$\xb4{\x82A\xb1\x13\x16^\xc1P\xfeB\xb40\x9f$\xa6\xcd$\x83\x9e\x85\x92\x82-\x1cn\xc9\\٬\xadre_\xb3\xd2\xf8yh\x84{\xe9\xd4Ӕ\xa0\x91_]d\x05\xfb\x0f\xb1=\xfe]V0\xd6[\xc2:bYa\xe5\xd1I\xd2\x1b\xe3\xab\x12q\x01r\xa7\xd2\xfcSqW\xa8ɪ\xce\xf6\x9a\x97\xd4~q2\x9d\xfe\xa4-\x0fQ\xb0\x90\x15\x81\xa3\\O^\xbeez~\x0f\x16\xa7\x1bG\xb2\x1bp\x1fL\f\xe7\xaf\xd8A\xfa`\xe7\x15\xd3\xcd9\x1f}:\x9f\x04\xc4p\xb7\xe9<\x85\x8e\xf6\xa8\x82\x1d\xbc\xaaQ\xb0U\xeb\x89\xf0m\xd1*\xd8\x1fi4\r\xed\x18\xd6\a\vu&S\x1c?\xd2ۤ\xc0\xfd\x86y\n&2\xd28\x18jI\b$\xd0K0\x85\\tB\xaa\xa4`\xe1\xfb&\xac\xadre\xa3\xe9)\xd7\x10\xeaz,\xe4\xca> \xc6Z6\xd1\t\xe0z~u\x91\x15\xec͡\xa1?\xffyh\xe8\xdfd\x05c\xbd%\xa4\x900״\f|xZ4\x94\x91O\xc2Nd`TE\x86\x8c|r\x06\x19W\xe6\x13\xa1#\xb3)\xf6Ǔ\x12iʓ\x813\a\xa5`P\xf76q\xb8\x17\xedz.\x9e*~\x95\xec\xa5\xfa\x836ҡ#\x89I\x1d!;n\xe4l$j\xf6\xfa\x1bH\x9cMq*\x9b(\x9ah\x80\xf6\xd0\xe9\x15\x1b7\"\xf49\xd9\xc1(؊-\x88D\xbc\xb4\n\x86֯\xc0*\xf5\x9b\xec\x10\x05\xd38c\x15L\x986\a\x01\x80.\xe6*\x98\x10h\xf7\x04H\x00\xbb?\x10\xf0\xf8\x02\xe1~\x94'$\xcfN\xa6WX\xb1u\xf1\xaem\xa9x(\xd62\xd8B\xef\xd1]\xd4\x1a\xb2s\xd5Uۀ/>\xb7\x05\x9d\u038d\xf7\x05P{bJ\xf1\xa6)q\x8fz:Ź\xea\xa5>\x1f\xe9\xddl\xb0.\xae\xf6\xe6Z+\x91\xbe_}d\x05\xfbס\xa1\xff\xf3\xefCCO\xc9\n\xa6z#\xf7\"\xe7\xb44͜r\x91\x94=\xb1\xd8[\x97K\x87wK\xe36x7ĉ\xf7\"\x1f\x9b\xe6ޟo\xad s\xf2s[\x06\xf89ɾ\xa0\xc6\x03V\xa4Һىb\x1fl\x9e\x95^\xcfQ\xafgW\x9c8\xf5}\xafs\xfe\xde\x13'vБ\xdev\xe7\x9e\x13{\x9c\xe2\xbd\xc8\xecU\r\xa7^w\x1e$s\xf2_\xf9\xf9\xed\x1b\x9bs\xda>\xc7r\xf3\xfd\xedG\xb0-\x95\x9e\xbd\xd9\r'6ο\xaa\x99\x93\xbf\u05f9\xa5a\xefZ<&\xfd\xf9նl\x9c헯d\xb7]E\x1f\xcd\xcfٻ\xe7ig\xf6\xc1\x8f\xd0U2'\xbf\xa1\xad\x8dD\xbd\x14g_\xfc\x82\xdeؔ\u007flT\xcatR\x01@\x83\xb9\n\x16 a0\xd2\x179)F\xc4\u008d\x15J\x13\xc4\vL(}2!i\xb1gj|ƙ8\x1a\xd0\t\xf9~V\u007f/\xe8fl\xc9$\xab\xf8\xf6D\xbc\xc5\xfd\x9f\xaeyS\xa6\xae\xf3<\x8a\x93\xb9RP\x88vE\x0ed$M\xc9؏\x90\xbe_}d\x05\xfb\xfb\xff\xfa吏\xfa\xef\xdf=\xac(\x98\xe2\r\x8f\xf1\x8a\x17ON^J\xa2}\x95\x19\xc5)\xf1\xc9\x194>%\xd0\xf9`b\xb7\xa7kq\xca\xe4\xe9u\xe4w\x91Vk\xdc\xc9*\xbcݤ\xf1\x80\x06\xf2\xa7$fHq*O\x12\x8d\xd0G\xbf\x9e\x9b\x1e\xa3Ѧ\x83\x1b\xf7\xae\xc8\xce\xd9HCU\xb7\x1b\xd6*\xf3\xc1~\xb3%g\xfe\xfa\x13\xf4w\x91N\xe7/\x8f\xe0\xcdO\xf0\xdeS\x1b\x9fyz#\xed\xb4\xa1[\xaf?\x9d\xbd\xf1\xbc\xf6w\x91\xb7\x1bVe\xe7l?\xb8*{#\xf9\x01d\xf6\xaf\xe6\xe3-\xee\xdc}\xba\xf9\xe9\x15{\x0ef\xe3\xe4\x0e)\xf8\xb5\x051\xce>b\x02b\b\x1dM\\\x87\x00@\x1fs\x15,\xf6yH\x9fH\xd9&&\xeb\xe2'⤅\xaa\xf8\\͌e\x00`\x00\x05\x1b\x1d\xf7\x94\x82\xa1Ҕ\t\xf8t\x9ddx4\x05`\f(\xd8\xe8\x10\x05\x8bi\x91\x98V0\x00\x885@\xc1F\a(\x18\x00\x98\t(\xd8\xe8\x18>\x80\xfc\xeaà`\x000^\x80\x82\x8d\x8ea+\xde>\xfc7\xff\xe3aX\xf1\x16\x00\xc6\tP\xb0\xd1\xf1o\x0f\x85\xf0\xb0\x05K؛\x91\xb2\x01\x00\x10\x15@\xc1FIh'\xec\xab\x16\xcb\xdf\xfcO\xf8\r\f\x00\x8c\x0f\xa0`\xa3\xe4\x8f!\x12\xf6UK\xee_O\xe9\x04\t\x03\x80q\x01\x14lԼ\xa9Ѱ\xafZ\xeaNZ\x92;ᙢ\x000\x1e\x80\x82E\x19\xdeR=t\xcc2\xb5\v$\f\x00\xc6\x01P\xb0(C\x14l\xe8\x80e\xdaE\xf6Y\xd4\x00\x00\x8c\r\xa0`Q\x86\xb7T\xfdeh\xa8\xce2\x1d$\f\x00\xc6\x1eP\xb0(\xc3[*\xb1\x82\rUZ2\xbaA\xc2\x00`\xac1Y\xc1\xda\xdd\xe2C\xe1y_u\x85\xf7̽\xf0\b\x02\xde\xe2\xf9\x92H\xd8.\xcbl\x900\x00\x18k\xccU0\xbe\xe2\x18}\x80\x1f\xef\xf1\xb6w\x9f\xf4\xd4\xdd\x03\x12&+\xd8\xd06\xcbB\x900\x00\x18c\xccU0oS7U\xb0\xa6j\xf2\xa4\xbfkQ[\xb6\xdbDxKŗ\xa2\x84m\xb2,\x05\t\x03\x80\xb1\xc5T\x05k\xf7\xf0\xe2s\xf2\xeb\xc4'\xeb\xf9\xbca\xcdc\x02\xde\xe2\xfe\x93\xa8`C\xeb,\xf9\x01\x900\x00\x18K\xccT0\xbe\xa2KZ\xe9# >\x01\xfe\xd8D|D\xe8\x1d\xc2[v\xfd\xe9\xcb/\xc5\xd6ɵ\xac\x03\t\x03\x80\xb1\xc4L\x05\xf36\xb1k\x15!$Ti\x96b\x8cM\xb0\x82\xfd?\xb9\x136\xb4в!x\x0f\xc4\xf6\x00`\xc2b\xa2\x82uzx\xad\x82\x1d\xf3\\3\xb6\x8e\x15xK\xa9@:a\u007f9v\xf4\xe8Q\xdfc\x96b\x900\x00\x18;\xccS0\xbe\xa2S\x10\x84\xeeJA\x90v\xb4\xb8\xb5+\xba\xc6&X\xc1\x06i',\xc5\"R\xca\v\b\x00\x80\xb1\xc1<\x05\xbb\xe8\x96!됡A\x9f\xbb3R\x96X\x00+X?\xfaSŗCM\x969\x9b\xb6m+u7\x05A\xc1\x00`\xac0O\xc1\x84 \xa1\xdd\x13\xa4W8\xef\xad\fD\xca\x11\x13\xf0\x96m\xfc`\xb1e\xdb_\x86\xe2\xa7\xec\xef\xbcx\xb1;8`\xb9\xe7\x88\xd4\b\x000^\x98\xa7`\"R\x1c\xecZU\x1d\x8fE\xed\x1ex\xa0\x03Q\xb0u\x96I\u007f\xfb\xe5P\x95eW`\x00\x0f\x94\x91\xe5\xe6=\x06(\x180a0W\xc1\x84@\xbb'p\r\xa1\ue2aa\xee@ po̦ؖk\x99\xb6\xc1\xb2\xeb/\u007f\xf9\xdb'\xdb\xe9\\\nP0\x00\x18+\xccU\xb0\x00\t\x83U!\xb4_\x8a\x88\xdd\x133Z\x13-\xa9\x9e\x96i\xd6/\x87\xb6Y\xaa\xe9\b\x19\x14\f\x00\xc6\ns\x15\xec\x1e\x84\xb7X\xa6W\xb6_k\xb2x\xfe\xf2\xa5e\xe1E2\x95\x02\x14\f\x00\xc6\nP\xb0(\xc3[\xe6Uw\xf2\x02?\xcd\xfa'ޒ\xd1I\x86\x91a\x14L\xef\xad\b\x82\x17E=\x8c\xecJ\xdf\x02\x14\f\x980\x80\x82E\x19~\xd3Q,`h\xe0\xc0\x03\x93,_)\xee\xba\xd7\x14\x8c\xee\x00\x05\x03&\f\xa0`Qf\xe0Z\xb0_\x9c\x1e2}v\xe9\xb1k\x11\xe2`\xa0`\x000*@\xc1\xa2\x8d\xf4\x1b\x03\x81\xbf\xd8\xdeu\x8d\xfe\xa2\xc8\"+\x01I\xbc\xf6\xb8e\xd2w?\xc1\u007f\xbc\xfc\xc8_?\xf2\x02\xd9\xff\xe3\xaf[\x1e\xf9\xe1\x1fH\xe2q˃/S\xab\xf7\xbf3\xe9\x81\xef`#˳\x0fZ\x18\x03%\xcbMƑb\xfb\xc2#\x96\xaf\xff\xf4\xe5G,O\xfc\x8cu*\xf1\xb3Ix\xf3]\xfc\u007f҇\xea\x9b8\xcb_?\x82\x8fH|X\x1e\u007f\r'Ȏ\x17nj\xcar\xf3\xa7_yA\xc9Bg\x83\x81\x82\x01\x13\aP\xb0\xb1B\x18\x18\x18\x10\xc5L\xa3`_\xdbw\xf9\xc3\xefb)y\xfb\xc1}\x97\xf7\x11}\xfa\xe9\xdf\xfd\xf4\xf2\xfb\xdf\xfc!\xde\xf3\x95\xb7/\xbf\xffO\xd4\xea\xef\xf6]\xfe\xed?\u007f\x0f'\x9f\xf8\x905\x90\xb3P_\xb2#\xd5\xf6\xfd\xcb\xff\xf2\x00\xd9|\x93ɣ\xf4\xa2\xbe\xf6\xde͟Y>\xbc\xf9\xdeט7-\xd4\xe1\xdb7o>\xfe\xec'\u007f\xf8鷱N=\xb8\xef\xb7\xfb\x1e\xfc\xb1\xa6,x\x1f\x9b\x85\x1e;B\xd5\x01`\xdc\x00\x05\x1b{4\n\xf6\x1e~\xfdO\xdc!z\xe2Ǥ\xa7\x83\xf7\xfc\x03\xd9\xf3\xe1#7o~㵛\xb2\x15\xe1\xb7\x0fJ֊\x81\x92\x85ZɎ\x14\xdb\xf7o\xde\xfc\x84n\x1e`\xf2(\n\xf6\xcf\xcf\xde|\xd6\xf2\xf2\xcd\x1f\xfe3\xf3\xa6\x85:|\xe2\xe6\xcd\a>\x14\x8d\xbeAw|\x83-\xcb\v_\u007f\x9f-\x03(\x180\xb1\x00\x05\x1b{4\n&'&\x91\x91\xe4'$!\xfeP\a\xef\xfcDV\x8d\x9b\x1f~{\x92\xb8\x8b\x8c\x03\x15\x03%\x8bd\x15b\xab\xece\x9d*\xbc\xfd͛O|\xef\xdb7\xbf\xf1v\xe8\x11?\xc1*\xf8/\x93\xbe\xf72\x11\xb1I\xf2\x0e\xa5,?\xfc\xc6oo\xb2e\x00\x05\x03&\x16\xa0`cOx\x05\xb3H\xfd\x1fq\x8f\xf8\xe6\x13\xff\xf2\xe1\x1f\xfe\xa0\xe8\x85\xc6`\x98\x82im\xe5\xc3\xc8y\x14.O\xfa\xf0\x81\x0f'}h\xb9̼\xa9(\xd8\xcd\xf7\x9e\xfdΤg\x19\x05Sʲo\xd2\xdb\xf4U\xc9B7\x91j\f\x00\xe3\x05(\xd8\xd8C\xf4\xea?\x89L\xb0\n\xa6\f\t\xbf\xf1\x82$\x0eO\xbc\xa6\x88\xc4\x03Xg\xf6\xc9֪\x81f\x14\xa9k+o\x94<*\xff\xf0\xbd\u007f\xa0\xff\x997\x95Q$\xe1g\x0f0\xa3H\xb5,\xef}\xe55M\x16\xba\x89Tc\x00\x18/@\xc1\xc6\x1e|\xd5\u007f\xf7\xbb\x1f^\xde\xf75V\xc1\x94\xb0\xfc\xbeI/\u007fry\xdf7q\xe2A%z\xfe\xf8\xb3\x97\xdfS\xac\x15\x03m$_\xdejl卒G\xb2\xc3<ky\x96\xfeg\xdeT\"\xf9\xdf|\xfb\xf2\xe5\x17\x1e\xa7Q\xfb\xcb4\x92ϔ\xe5\xfd\a_`\xb2<\xf26(\x180\x91\x00\x05\x1b{\xb0\f|\xf2O\x93,_\u007f\x8dU\xb0\x9b/?(M\x8d\xd8\xf7\xc4\x03\x96'\xf6\xe1\xc4k_\x97g0\xbc\xf7\xb8\xe5\xc1\x17\x14k\xc5@\xc9\xc2*\x98\xc6V\xd9(y\x14\x05{\xcf\xf2\xfe\xcd\xf7i\xfc_y\x93L\xc0\xa0\xb3)\xde~\xc22\xe9\xdbd\x12\x06\xd9A\xbb[jYn\xfe\xec\x91g\xd5,\xaf=\x02\xb3)\x80\x89\x04(\xd8أ\x88Ƚ\x02(\x180a\x88-\x05s\xb9\xf4\x92\x13\x1dP0\x00\x18+LV\xb0v\xe9\x81:\x81\x03U\x15\xd5\xc7\xf8\b\xd6\x1fs;u\x92\x84fN\xc2\x11f]\x8d\xe3\x8e\xc3\xc6oF\a\xf6\x10\xbd6n\x11M\x80\x82iy\x91\xe3\x1a\x99?\xc7\xe1c\x91\b9\xf0]0z\x0f\x91q\xe1\xd38\xad'\xbc\xcd\xf8\xb5ل\xc7\\\x05\xe3+\x8e\xd1g\xb4\x06\xdd\xde\xce\xeeκ\xaa\b\x12Vd\xbf\xa2\x93$\xf4\u007f`s\xf91;\xb9\xebó\xc94\xa7\x8d\xf9٧9D\x87\xcbN_A\xc1\xb4\\\xf1\xdbʙ?\xc7\xe1c\x91\b9\xf0\x1d\xd0zV|\xbd{\x0f\f\xb23\x03.\xf9\xfd\xb5\xdc\aaMƱ\xcd&<\xe6*\x98\xb7\xa9\x9b*X\x17]\xa6\x88\x8f\xb0\xd6G\x0fW\xa2\x93\x94\xb0\xd33\xab\x91\xfb\f\x193\x0eKnh\x0eQ\x0e\n\xa6\x8f]#\x03\xe3\xf0\xb1\xc8\xd8\xefR\u007f~P(\xa7\xee\xd6\x03\x83\xeä\x8eH\n6\x9em6\xc11U\xc1\xda=\xbc\xf4\x9c|\xda\xf9\n\xba\xc3/\xf6\xe1R\xfb].m\x17\f\xc9gVO\xa8\xb0\x99\x8a\xac`\xf7\x1c\x11\xea\x1d\x91(\xc8\xc0\xddq\xb7\a^\x16M\x05[\x16\x05\x05\x03d\xccT0\xbe\xa2\x8bY\U00076ffb\xda\x1b\xf6\x9b\xa5\u05f6U')\xa3\x9cY/q\xb6\xfa\x92\x05i\xab/\x91\x1e\x19Ǖ\xa3r\x8e\x04/\xfa\xd28)\x86q\xce\xc6qe=Es\xedk\xc8\xe1j\x97\xa5-\xa9\xd5fc\xc0{k\\Y\xe9\x05=F\xd9\xf4\x0f\x81\x87\x1bE\x99\xe9\x85\xd2(\xb2qeڂ\x12\xba\x88\x89\u007fu\x96\xcd\xf1\xa3,\xcd!\x10_\x98i\xcb*8\x87\x8c\xca\xc0x\x18u\xdd\x04\x87\xedլ\xcc֭\xb3\xf2x\x03\xbf\x87\xa5\x80\xe22M\x01\xca\xe8\x01\xc81\xcbpS\x97\xa8\x85\xd4\xf1\xc0\xa2\xd6M\x83}\xab+\x936*Stփ\x9a\x8d\xa9\x10\x89u\xbe*\xd5\xd8\x00\xa5}_\"FJ \xb2\xa7Ёw\x93\xef<\xb6\xe8\nl!\xf5>!M\x93\xe8U^\xc3gE\x8e\xac\x92\x12\a\x1d\xe6\xc9\x1f\x80\x913ր\xb5\r\xaf`\xecy\xa6{F\xddW\x98\xa9`\xde&u\xcd\xee\xa0\xdb\xed\xf6\x84\x0f\x83\xb9l\x97t\x922\xf6\xb2\x81\x81B\xd2\x03\xfb\xb8\xd1\xc69\xcakf\xe0/\xba~\xff\xac\xb2\xeb\xe8z\xd9,?>\xcd\xce\xfa\xfd\xa2\xca\r46f-\x98\x91UR\xc4\xf5\x92\xce\\Ys\x99\xbdH\x93\x8d\x81\xec\xcd\xda]\x9e\x95v\xc1 \x9b\xfe!PϬ\x05\xf5\x87WsT\xc1\\\xdc\xd6\xe6\x1a\xc72,)g\xb9\xa2\xc6\xe3\xf5\x0eN+\xd4͜\xab\xb5\xb1\x80\xeb0*\x03\xe3a\xf4uk\x9dŕ\xe4q\x8eݎ\x1a\x03\xbf\xfc\a\xfe\x05y~\xbf_\x1bJ\xbe\xfe\xfcJ?\x8f\xdf[\xf9\xfcu\xdc\xd4ܢ\xc6ÎB\xa3\x92\xb1\xa8u\xd3`\xe7\x9656.\xc1\x8d\xca\x14\x9d\xf5\xa0fc*\xd4\xffA\u058bW\xe4\x1a뢶\xaf\x18\xaf\x92\x02\x91\xadi\xcb\xde:^\xce\xd5 M\xd1U\x98B\xea~B\x9a&ѫ<\xcb\xe0\xa2\xcc\xda2{Z\xfd\xea\x1a\xe6\x030r\xc6\x18hl#\xf4\xc1\xd4\xf3L\xff\x8c\xba\xaf0Q\xc1:\x89b)}\xb0`\xa0\xbd:l$\xbf\xd7\xf6\xa2NR\xc1N\xbe\xd8\n\xc4d:ַ\"\aI\xbaȩ\xf6\xbc<\xf1B\xe9\xa7-\xe3H\x1f\x04\xff;\xce\x1dGd۬\xcd\xc6\xfa\x9d\x8b\xcd\xfa\xb2\x96\x1bf\xd3=\xc4\xca\x05\xf8*\x13\x96\x90\v\xa8\x99{\x17\x91s\x12\u007fi\xd6:h\xcfh\x96\xf6|\xebo$W\xe4\x92]M\xa7\x00\x00\x00\x11\xe6IDAT\xe7hv\xbd20\x1eF_\xb7\xcc\"\xec\xef0\x9d\x8cb\xe0Ww\x94\xf3\xae؛YDm\x1d\x9f\xe1\xa3\x13[#\x0f\nl\xdd\x18\xec\x8b\x06\xb08-X.\xfd%\x15]\xf5\xa0ɦT\b\x95\x93\x8eK\x91\xf14\x1a\xb6}\xa9S:\x8c\x1f\xc8Z\x83\x8f6\xd8؇آ30G\xd3\xff\x844\xa3H\xddʫ4r\xb83W\xcb\x11qf?\x00\x16\xc5\x19c\xa0\xb5\x8d<\x8a\x94\xdą\xbc\xf7\x11\xe6)\x18_\xd1)\bBw\xa5\xa0\xb4\xfe@uS\x18\xfb\x97l\xbd:I\x05\xbb\xab\xa3c\x89\xa4`\xe4\x1c\x17cP\xad\xf6~ԟ\xe6\x97m\x94\xab\xdc.9pI\x17\xa6K\x9b\x8d\xc1Ngm\xd4r}F\xd9\xf4\x0e\xd1\xc7Փ\x972\xe2\xacp\xee \xae\xa7\x90\x85m/e\xce}\xa9\xfe\x9c\x10:\xe1\xe3\xb3\xda5sgqKhv\xbd20\x1eF_\xb7\xccF|}\xf0h\xe7\xf3\x86~u\x15\xec\x1c7\xd0\xffn\x9f`?\xa7\xb15\xf2\xa0\xc2ԍ\xc1\xfe*ي\x8d\xca(\x98\xea\x81ͦT\b]\xc2\xc200\xa3\x15\x19\xc1\xb6\xaf\xaa`͜:\x8a\x8dTH\x83O\x88U0\xddʫ\xecLG\xe4F\xd3!\xa4\xfd\x00X\x14g\x8c\x81\xd6v\xc4\nfT\xde\xfb\b\xf3\x14\xec\xa2[&\x80\xa4G\x01\x9eq\x1b\u007f\x97\\\xb1\xbbt\x92*\xe4#mnU\x92\xd2i*8\x0e\xa1C\x0e٫z\x95\xcbQ\x9e\x95\xa2\xe6\x15,\xd7fc\x10\xf3\xf8\xb9\xb3F\xd9\xf4\x0eq\x96\xa3\xc2B\x9d-\x91\x02\x1f\xe4+\xbe\xaf\xbep\x11\x1e\xc2!\r\x1d\x8e\xac\x9d\x87\xfcyK\x94\xec\xa1e`=\x8c\xban\x99\xc7Q\x87\rQ\x053\xf0\xab\xab`\x03\xb6s5\\Y\x0f7\xa0\xb15\xf2\xa0\xc0֍\x81mTF\xc1\x14\x0f\x9alJ\x85\x10ZS\x82\x8e\xa7\x87\xb9\\\x99\xf6U\x9d\xd5\xd0B\x8bD,\xa4\xee'4,\x92?\xac\xf2*5\xe4n\xf8q\xda\ac?\x00\x16\xc5\x19c\xa0\xb5\x1d\xb1\x82\x19\x95\xf7>\xc2<\x05\x13\x82\x84vO0(\b\x95>\xba\xebL\x85\xb1\x82m\xe5zt\x92*\xd2Gz\xee3\xedi\xba\xf59\xf4\x9c\x12\xf5W\xafr\xe5[p.}\x99\xebB\x06g7\xb2\xd3\xdc\xf5\x1co\x94M\xef\x10\x9fq\xb5Ԍ8+\x9a{\x96\x82\vv\x96\xf4\xe7\xfa\x1a\xed\xb5\x88e\xd1r2\x88)4V0\xc6\xc3\xe8\xebF\x14\xcc.*\x98\x91_\ua87e\x17iXԘ\xb7r\xd1!\xdaSPm\x8d<\xa8\xb9\x98\xba1\xd8\xe9-c\xb1Q\xf5\x14L\x93\x8d\x11\xd4Î\xc1p\xbf\xc5`ۗ:\xa3\x9d\xe0V\xb6\x0f\x16\xa1\x90\xfa\x9f\x10\xdb$\xfa\x95W\xe9\xe5\xd6\xf4\x9e[\xb0\x92\x9cȚ\xb3\x84Aq\xc6\x18hmG\xac`F彏0O\xc1D\xc48X\xd5\x01\xb2\r7\x8a\x8c\xd4\x05\x93?\xd2̝\xdaӴ\xc3~Ůđ\x87_\xe5\xcd4\x8a\xd1(Ɗ\xf4\x15́Oo~n\x9ea6\xddC,\xcf\xea\xc3c\t;qv\\\f\x94\x94\xe1\xef\xc9r\xee8I\xe6i\xa3xYī\xb0\xc4X\xc1\x18\x0f\xa3\xaf\x1b\xa3`F~\xf3pe\xaf\x84\xde\xf0{\xfe%\xdbq\xeeE\xea[\xb55\xf2\xa0\xc0֍\xc1\x9eE\"S\x8b\U000a4fc6)\x98&\x1b\xa3`\x83\x8e\xc3\xe9\xf2 \xb2\xb7|\xd8-N\xb6}\xd3\xf0\x89 ,'\xce\xfa3\xf3\x06\xf1\xcbV\"\xf6\x91\n\xa9\xff\t\xb1M\xa2_y\x95\xb3\x9c\x83\xe3\xf2\xe8\\\x1f\xcdY\xa2\xe7\x8c1\xd0\xda2\n\xa6SM\x82\xd4fF彏0W\xc1\x84@\xbb'p\x8d\xcchm\xea\xec\xee\f\x17\xc9/Q\xfb]%:]0yN\xbe\u007fV\xc9\x15\xbf\xcdՁκl~r\x1a\t\x99\xab3i\xc7n\xf0\x03\xbfߎmx$tлA\xbd4c\x11\xb7\xb3y'WDg[3\xd9T\xc8m\xb3\xfa\x05\xe9=\x06\xd9\xf4\x0f\x81.\xa4e\x95\x97\xa5s\xb6w\xf1hb'\xf7|\xe3!\x179C˹\xb4\xb2f\x9c\xd4Frʹ\xc2\xda\xdd\xcb8\xc7[\x1dFeP<\x8c\xben\x17\xd2k\xfa\x1bm\xe7\xfa\x9fϻd\xe8\xb7\xdc^s(/-\xe4n\xef\xee\xb4Y\xc2\x02\xfb\ue4062\xf0\xa0\xa0\xd6M\xe3\xccέ\xe9h]\x89\x1b\x95):\xebAͦ\xa9\x10>\xde\xdct\xb9\x9b^\xc0\xa5\xf5!-l\xfb\xaet\xec\u07bd\\\xfc\x00Z\xed\x8bj\x9b\xb7r\xf5#(\xa4\xfe'\xa46\x89~\xe5Y\xce\xd9[\x9b\xfdW\xc4B\xb2g\x89\x8e3\x8d\x81\x9a\xa4s\xf2k\xe4:\xebT\x939ό\xca{\x1fa\xae\x82\x05H\x18\xac\x8a$\x9a\xaa+\xeaZ\xd4xE(\xd7ӊt\x92*\xca\xef\"\xb9\x9a\x17\xf1\xc6v\x81L\x99\xa1_L5\xf6\x1ajqVz\xbf\x1e\x9d\x13\x13b\xe0A\xa8Y\x92\xb6\xa4V\xa0\xbfxc\xb3)\xd8K\\\xb32\x8b\xae \x83l\xfa\x87\xc0\xfd\xaf\x82\xf4\xb9%\xefڨ\xb3\xe3y\x8e\xf4\x95\xe4˵qey\x96-3/\xe4t\x13j\x16\xd8\x1d\x85\xf5\vlyFeP<\x8c\xben\xb8\x83\xd08\x83Kk\x14\xc37\xfa~\a\xb6\xa6\xdb\xf3B'@\x9c\x9dU\x86U\xac#\xd4֠d2j\xdd4\xce\x16\x95\x17Π\x8d\xca\x14\x9d\xf5\xa0f\xd3T\x88\x84ȕ\xfew}ڰI\x1al\xfb\xf6\xe4\xd9g\xac~U,NOa\u058c\xe5\x87FRH\xfdOHm\x12\xfdʳ|`#嵭<\x87BΒ\xe1\xce4\x06j\xd2%5\x89\xd8\xf5ԩ&s\x9e\x19\x95\xf7>\xc2\\\x05\x1b1\xafr\x1f\xeb$\xc7\x03et\x06L\x00\xfa\xed\xea\xc5z\x88\v\xed\x9cL\x00\xae\xa7\xbdx]\x10\xfa\xce\x16\xa6G\xabp\x13\xb2\x9a\x13\x88\x18Q0\xf3\x1e\xab\x03\n6\x91hT\xee\xbd\n\xef\xce\x1a\xdf\x13ad\x1c\x92F\xb9\x82#4\xfauwL\xd0jN bD\xc1\xcc\x03\x14l\xc2Pފ\xf2\xca\xe4?\xae8J\x8c\x83\x0e\xe6qV\xba\xf1y\x8e\xd3\r\xc0\xdf1\x13\xb4\x9a\x13\bP\xb0\xb0\x88\x91[`\"\xd0\xcf-{)s\xa2\x8f\xa8\x04W\x9a\xab\xb1\xb5\x11o#Y\x02\xd1\x01\x14,,4r\xdb\x1b\xc9\n\x18\x17\xca\xd2\xf2\"<\xf8o\"pxu\xa6-sMtƐ@d@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]@\xc1\x00\x00\x88]bK\xc1\xcc\xfby$\x00\x00\x13\x11\x93\x15\xac\xdd\xed\xd5I\x1a\xf11\xb7S')3ҕ\xd8k\x8d\x97\xebR\xd6\xe7\x02\x00 &0W\xc1\xf8\x8ac\x95Ó\x86\x14\xa9\xeb\xdc\x16\r[\xf2v\xc4+\xb1\xf7\xf9\x97\x1b\xfeZ[Z\x9f\v\x00\x80\xd8\xc0\\\x05\xf36uW\x0eO\x1a\xd1Õ\xe8$U\x86=JΈ\x02\xe3\xe7M\f{\xca4\x00\x00\x13\x18S\x15\xac\xdd\xc3\xcb\xebE2IC\\j\xbf\xcb5\xbc\vv\a\x80\x82\x01\xc0=\x82\x99\n\xc6Wt\xc9+\xde2ICzm[u\x92\x12\xba\xab\xd77\xe2}\xe5\xca:\xf5\xea\xb2\xeeX\xc1\xb6\xe2\x9dv\xb2ʌ\xbar\xfc\x95\xa2\xcc\xf4B\x18E\x02@,a\xa6\x82y\x9b\x945\xbb\x99\xa4!.\xdb%\x9d\xa4\x8c\xde\xea\xf5\xfd\xfeYe\xd7\xe5u\xea\x99eݱ\x82])\xe2jȃ\xbfԕ\xe3{f-\xa8?\xbc\x9a\x03\x05\x03\x80\x18\xc2D\x05\xeb\xf4\xf0\xb2l1ICzm/\xea$Y\x94U\xbb\x94\xd5둋,\x97\xf0<\x99x\xc1.\xeb\x8e\x15\xac\xc6N\x9f\xe0Ĭ\x1c\xbfrA?Ys\v\x14\f\x00b\b\xf3\x14\x8c\xaf\xe8\x14\x04\xa1\xbbR\x10ؤ1/\xa9O\x1ad\x92,\x8a\x82\x11\xc5\x12\x03Z\xad\xf6~ԟF\x16\xd0f\x97u/(/\xe3ę\x17\xea\xca\xf1}t\x89!q\x8dT\x00\x00b\x04\xf3\x14\xec\xa2[&\xc0$\r\xcd#.y\xab\xb7r*\x12\x1c\x87\xd0!\xba:\x04\xbb\xac{\x81c\xc6\"q-+u\xe5\xf8\xb3\x1c\xd19\x88\xe4\x03@La\x9e\x82\tAB\xbb'\x18\x14\x98\xa4\xa1\xf9Vu\x9dۭ:K\xde\x12t\x14\fm}\x0e=G\xa3\xfe\xec\xb2\xee\x05\x8e\v\xbd\xb3\xe8R\x8b\xea\xca\xf1\x9fq\xb5\xd4\f\x14\f\x00b\b\xf3\x14L\x84\t~\x85\x8d\x83\x8d\xa0\v\xa6\xab`\x1d\xf6+v\xbaT\a\xbb\xac;\x99M\xd1l#\xbb\x99\x95\xe3\x97g\xf5!\xd4c\x97\x14\xacww\f<\x92\x1d\x00\xee{\xccU0!\xd0\xee\t\\\vM\xeaQ\xa2\xf6\xbbJ\xf4\xba`\xfa\xab\xd7c\xb7\x99\xab3C\x96\x80\xef\xf3/w}0\xd8_\x90\xd9z\x9d]9\xfeBZVyY\xba\xb8N=Y\xec\xfdG\xc3\x0f\x02\x00\xc0\x04\xc3\\\x05\v\x90\xd8WUhR\x87\xebiE:I\x06\xfd\xd5\xeb15\xf6\x1a\xd1BYֽ\x96\u061d%s\xc5\xc8\xe2\x83\xea\xca\xf1=\x05\xe9sK\u07b5\x89\xd9\xea\x1d\xf5:G\x01\x00`ba\xae\x82\x8d\x98W\xb9\x8fu\x92\x00\x00\xdc\xe7Ĉ\x82\xc1cu\x00\x00\xd0!F\x14\f\x00\x00@\aP0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\x00\x00b\x17P0\xf3\x18\xe8\xef\xef\x1fDh\x10\xbf\fD\xb2\x05\x00@\x0fP0\xd38\x16g\xb5Z\x13y>\x11\xbf\xc4\x1d\x8dd\r\x00\x80\x0e\xa0`c\x88wf\x10\xa1k3\r\xd6\"\xaf\xb6z[Z\xda\x11joi\xf1Z\xab\xf5m\x00\x00\b\x8b\xc9\n\xd6\ue997w\xbf\x87>c\xda\x13\x8d\xc1\xd4~\xabDR\x18oMI\x06\xb2\x12\x9ek\xf9I\x89sF\xbc\xb0\xee6k1}\x89ۦ\xfbv\xb5\xb5[Nv߁\x82\xdde\xd1Gʩ\xef;Ern\x871\xca9a\xfc&\x00\x8c#\xe6*\x18_q\x8c>\x98\x95w\x9f\t`\x82\x91\xecG\x02\u007f,>ׇ\xd9`\r\xe3Λ8r\xc9`\x98\x9d\xec\xceM\xe4#YI\xec\x8a\xf3\x88\t\uf8e5z\xefGR0\xdf\xe9\xe1\xfb\xd0]\x17}\xa4\xdcj\xcb~\xa5\r\xb3\xc7\xf9\xb9\xb1щ\xf9G\x8c\xdf\x04\x80q\xc4\\\x05\xf36uK\n\xa6\\\xccQ \x81v}*\xc3)\x18\x1aqG\x8a嚵\x14\t#\x15\xb0\x8b\xf1\x1b\xe4\xe4\xa6\x04\xbd\xeaER\xb0鋇\xef#\xdcU\xd1\xef\x80\xec\xbdd{\xd0y#\x8cM\x98\xfe\x19\x00\x8c'\xa6*X\xbb\x87\x0f\x8c\x99\x82u\xad\x8bdw\xc7tY\xef`\x00\x97\x9b\xach\x1d\x9f\x9c\xabc\x10I\xc1R\r\x14l\xac\x11\x15\xec7o\x80J\x011\x80\x99\n\xc6Wt\xa1\x91)X\xb5\xd5j-F\xc5x[\x8d\xf8\xc5\xc9\xf1)\xf3\xce\xe0\xbdg\x1e\xb5Z7u-\x9d\x9a8gPc-*\x18&\xdf\x1a\xef^7-qvw\x88\x87D\xab5\x8e>\xd0Z\xebaWjb\xea.m6\x86\x81$1\xbc\xb6\x8e\x18\xc4U\xe2>\x96uZ\xa8m\xd7¤\xf8\xe49tɸ\x81\xc9J\x17\fw\xc2\x12\xfb\xd10\xf4\x14\xec\xe8\xec\x94\xf8\xa49)\xb8w*\x05\xf3R\xb5\x85T\x8b\xae9ppiRʺuI\x9a\xf1e\xf7d\xc9\xc5dm=n7\xac\x9f\xbf\xb6\x81\xcaS\xdb\xe6\x15\xd9\xcfl^\x11\"U\xa2\x82a^qf\x1f|c\xd5\xfcͿG\xe8\x88\xd3\xe9܋\xf6\xe2\xed\x11tc>}\xc1|\x94\xedt\xee\xf9t\xfb\x8a\xec\xcd_0~\x99l\x000֘\xa9`\xde&\xa4(XS\xb5\xbb\xea\xa8\xcee.\xc2\x1f\x9d\xbc)\x88\x82\x9b\xa6\x1c\xe5\xf1\xb5\x9d뫞\x17ׂP\u007fuUʓ\x93S\xd6-\xb5j\xafфM\xfd\xfd\x8bI\x0f\xac\xb3\xeaQkRq\xe9\xe4\x85Z\x0f\xe8\xa4\xcf'\xaa\x9c\xc6Cn\xc2&濾\xa5\x9al,g|U\xd6b\x9f\x0f\xebS\xc0\x17\x8f\xb3\xb7\xe4&\x84\xd8\xfa\x12S\xb75\x15[i\xd4\xeb\xb4էf=fmA\xc3\xd0Q\xb0\x93֥\xd5M\xee$+\x96\xaac\xbe'3|>_gH!\x95\xa2\xb3\a\x1e\x98\x96\xbc\xab8!\xb1b6\x1bo\x1b\U00014284\xdc\x1fّ\xbd\xe7Ԟ\xec\xed8\xf5\xcb\xefo?r\xea\xe03\xce/4\xef\xa3\xec\x9fܺ\xb5\xe5\r\x9c\xf8\xe8H\xb63g\xef;\xf3\xb7 t\xa3m\xfeO>G\x9f\xef}\xba\r\x8f-Ϸ\xb5\x89*w\xebȑ\x15\xab\xe6缱\xfd\xfbW\x19\xbfL6\x00\x18kLT\xb0N\x0f\xaf*X\xe5\x99\xee\xce\xea*㻇\xb9dH\xb5\x98\f\xc6\xf8j2:K\x15\xe5%\xd5:\x1b\xff\x15\x12\x9aJ =\x8fybr\n\xbe\xea\x97&i=\x10\x12\xe5~\x9a\xe2\xe1\x80\xf5\x00\"\xdb\xfd\xdal,\xea(\x92\xaaHq\x02\xd2\xd8\xf6\xa7\xcc\xc1\x15\x18\xa8\xa6+.y\xad\x17Ռ\xba\xa3D\x1d\x05ەD\xfb\x82Sh\xa8\x8b\x19Ej\xaa)\x17]=p\x95\x15wIwYۑ\x86\xe0E\x11m8\xf0\x94\xf3\x94\xbcm\xc8!\xda\xd5\xf0th\x1f\x8c܉\xdc,&\x9f\xc6\x1d\xa9\xed9$\xb9\x83h\xde\xf6\x1d\xb2\x8d\xdcO[\xeb\xdcx\x03ݾ\xa1\xf1\xcbf\x03\x80\xb1\xc5<\x05\xe3+:\x05A\xe8\xae\x14\xf0\xe5*\xb4\x93\xeeW\xbfG\xa7\xa7\"\xe1K\xe4\xf1\x10\x8avk\x82\xbb\xe6L\x9dL\x86W\x98T\xbd\x18yBnKK\xaa\xa4`D\xb1D\xa5a< V\xc1d\x0f\xb9\xd3\xe8˴\\m6\x16}\x05Sl\xf7\x13!\x91\xa9\xd3*\x98\xce*L:\n֝<5\xdf}F\x10\x85\x9cU0\xb6\x9a\x8a\x82)\a\xde0\x05\r\x0f\xd2]\x94g\x95h{\xa8;\xd6җU\xaf t5g\xc5\xeb\a\u007fu;4ޕ\xbd\xe3\xfc\xf9\xb5\x92\x82\x11\xc5ڛM\x92mٷЭ\xf9m\xb2\x8d\xa2`\xd9W\xc5\x04\xe3\x97\xcd\x06\x00c\x8by\nv\xd1-\x13\x90w\x1d\xad3\xb4\x1eL\xaaCuI\xa4oҒ\x9c\xb2\xa1Η!)\xd8t\x1d[\"/\xfb\x9b\x94\xa4\xa44\xaa\a\x82\xaa`\xb2\x87\x99\xa2\xe6͙\xae\xcdƢ\xaf`J\xb2\xd4\xca\f\x83[\u0601c\x8b\xf5\x18\x1a\x86^\x1c\x8cw/\x9efM\x12珱\n\xc6VSQ0\xe6\xc0A\xd2{\f\xe9\x83\xf9\xbc\"\xcch\x16\xb3QԦ\xcd\xeb\xf1\xe6\xc6\xc1-\xab\x9cϼ\xa3\x13\a;զ$%)\xfa\xe2\xe9\x13\xe8\xc43\xb2\xa9\xaa`\xeb\xa5\x04\xeb\x97\xc9\x06\x00c\x8by\n&\x04\t\xed\x9e`P@M\xa22\xf8\xc2\xdc\xea\xcb_\x88\x16\xe6\x93Ĵ\x99d4\xb5PR\xb0\x90X\x15E\x8a\xe4\x9f\tj\xa5H\xf1@P\x15L\xf6\x90;\x95\xbeL\xcdE#U\xb0M!\n\xd6defp\xf1\xca\xfd\x04\xf2v\xbc\xce\x1c\f\xbd8\x18\x89\xfe\xf3U\x89\xe4~\x82\xa8`\x15\xd4FS\xcd\xe1\n\xd6\x1d7\xa7\xfb\xccԙ#\x9af\xb1\x83\x06\xeeo\xaf\xc0ݤ\xf3{p\xf2Ƒ\xec\x06\xad\x85\xa4N\x1f\xdd\xd0J\xd1\xeb[Ж\xd7Cl\xb0\x82m\x91\x12\x8c_P0`\xfc0O\xc1D\xc48\x98\x97v\xbe\xaey\x98QX(-\t\x81\x04ګI!W\xb3\x90*)\x98ތ\x03I;\x927h\xa5H\xf1@P\x15L\xf6\xe0\xa5#\xbd**R\x11\x15,\x11\xfb\x16\xa6\x87(\x18\x9f\x9cA\xc6\u007f\xf9\xe24\x8e\xc5S\x15E\x11\xa6\xcdA\xc3\xd1Q\xb0b\x1a\x8bC\x19Th32\xf0\x88Y|CS\xcd\xe1\nvښd\xb5f(]ٰ\x9c\xa2\xb7\x11\x8f\x90x\xd5^\x1a\xb4B\x1b_\xa1oto\x93\x86\xbd\x92:\xe5\xec\xd1J\xd1/\xb2\xaff\xffB\xf62\\\xc1\x18\xbf\xa0`\xc0\xf8a\xae\x82\t\x81vO\xe0\x1a\xbez\xdc\a\xba\xbaOVx\xc3\xf4\"\x84\xe4\xd9\xc9\xf4\xedb\xeb\xe2]\xdbR\xf1P\xabe\xb0\x85ޯc\xe2M\x04yN\xbeo\xf2\xba\x80/>\xb7\x05\x9d\u038d'7\x10U\x0f\x03->_B\xae\xef(\x8f4\x1e\x96\xc6m\xf0n\x88[Jo52\xd9\x14\xc4{\x91-\xd4\xc5̤m\xdbfZ\x1f\xf5tjl}\x8fMs\xefϷVP\xf3\xae8\xe5\xce`\xa9Uoz\xbd\xae\x82%\x16{\xebr\xc5ۘ\xc5\t\xa5u\xb3\x13\xbb5\x85T\x8b\xce\x1e\xf8tB\x93\xd7\x17\x18Q\x17\f\xa1\xed\xce='\xf68I\\~\xafs\xfe\xde\x13'v8\xc5\x11\xe3<+\x95YyN~\xdb\xfc7\xae\xe2\xe4\xcfo\xff\xf2\x95\xec6\x12뺝\xb3Y\xfc\xa1\xd1ퟷQ\x9b\x1b\xe8\x8b_\xb4\xad\xda\xd8\xd6\xf6\xa9֯6\x1b\x00\x8c)\xe6*X\x80\x84\xc1H\xd7'\xd8T\xe5\U000761fd\x06K\x13DE\x10J\x9fLHZ\xec\x99\x1a\x9fq&\x8e\x06\xaaC\xfa7\xca\xef\"\xad\xa5\xf9x\x13\xdfN\x9e\xfd\x90\xcfz8)泺\x91ƃ@\xe7\x83\td\xaa\x95&\x9b\xc4\xc0\x14j\xfbh'\xf9\xa3+#q\xf2\xec\r\xd8@k۵8e\xf2t9\x98\xb7\xe91)\xf8u4Qwrm\xb5\xb5K~\xbaN\x97\xa4`\x95\x19\xc5)\xf1\xc9\x19b\xe4j \u007fJb\x06\xee4\xb2\x85T\x8b\xce\x1e\xf8X<\xd9\x17\x9f\x11\x12\b\xd3\xe7v\xc3Zi>\xd8\xc1\x8d{Wd\xe7l\x94\xa2\xf3\x9e$7y9\xe5\x94ix\x05o\xb2\u007fEf\u007f\xd1^Z\x834\xdc\xfc\xa5\xf4\xfeA\xf4\x91\x98ج\xf5\x1b\x92\r\x00\xc6\x12s\x15\xec\xdef]<ե\xaa\xf8\\\xed\x8c[\t:iUz\xba\x0e\x9d\xc3q\xb7\x04\x13\U000c30c3\xfcɅSF\xfa\x8b'\x00\xb8W\x00\x05\x1bCJS\xc8\xd3u\x92\xf5\x1fM\x81\x06ϴ\xc8O\xd7i9\xa3\xabq#\xa4N\x9c?\x86\x84\xa4\xd1\xe8 \x00\xc4\"\xa0`\xb1\xcf\xe98q\xf8\xd8\x1e\x17\xe6N\b\x00ܓ\x80\x82\xc5>Bnb~\x95\xaf*?Q\xef\xf7\xe3\x00pO\x03\nv/\xe0\x9d\x9d\x1c\x9f<\xe7\x0e\x1e\x9c\x01\x00\xf7\b\xa0`\x00\x00\xc4.\xa0`\x00\x00\xc4.CC\xff\x1f\xf8\xaa\xf0z\xf7Oɏ\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/help.html": `<!--{
-        "Title": "Static analysis features of godoc"
-}-->
-
-<style>
-  span.err { 'font-size:120%; color:darkred; background-color: yellow; }
-  img.ss { margin-left: 1in; } /* screenshot */
-  img.dotted { border: thin dotted; }
-</style>
-
-<!-- Images were grabbed from Chrome/Linux at 150% zoom, and are
-     displayed at 66% of natural size.  This allows users to zoom a
-     little before seeing pixels. -->
-
-<p>
-  When invoked with the <code>-analysis</code> flag, godoc performs
-  static analysis on the Go packages it indexes and displays the
-  results in the source and package views.  This document provides a
-  brief tour of these features.
-</p>
-
-<h2>Type analysis features</h2>
-<p>
-  <code>godoc -analysis=type</code> performs static checking similar
-  to that done by a compiler: it detects ill-formed programs, resolves
-  each identifier to the entity it denotes, computes the type of each
-  expression and the method set of each type, and determines which
-  types are assignable to each interface type.
-
-  <b>Type analysis</b> is relatively quick, requiring about 10 seconds for
-  the &gt;200 packages of the standard library, for example.
-</p>
-
-<h3>Compiler errors</h3>
-<p>
-  If any source file contains a compilation error, the source view
-  will highlight the errant location in red.  Hovering over it
-  displays the error message.
-</p>
-<img class="ss" width='811' src='error1.png'><br/>
-
-<h3>Identifier resolution</h3>
-<p>
-  In the source view, every referring identifier is annotated with
-  information about the language entity it refers to: a package,
-  constant, variable, type, function or statement label.
-
-  Hovering over the identifier reveals the entity's kind and type
-  (e.g. <code>var x int</code> or <code>func f
-  func(int) string</code>).
-</p>
-<img class="ss" width='652' src='ident-field.png'><br/>
-<br/>
-<img class="ss" width='652' src='ident-func.png'>
-<p>
-  Clicking the link takes you to the entity's definition.
-</p>
-<img class="ss" width='652' src='ident-def.png'><br/>
-
-<h3>Type information: size/alignment, method set, interfaces</h3>
-<p>
-  Clicking on the identifier that defines a named type causes a panel
-  to appear, displaying information about the named type, including
-  its size and alignment in bytes, its
-  <a href='http://golang.org/ref/spec#Method_sets'>method set</a>, and its
-  <i>implements</i> relation: the set of types T that are assignable to
-  or from this type U where at least one of T or U is an interface.
-
-  This example shows information about <code>net/rpc.methodType</code>.
-</p>
-<img class="ss" width='470' src='typeinfo-src.png'>
-<p>
-  The method set includes not only the declared methods of the type,
-  but also any methods "promoted" from anonymous fields of structs,
-  such as <code>sync.Mutex</code> in this example.
-
-  In addition, the receiver type is displayed as <code>*T</code> or
-  <code>T</code> depending on whether it requires the address or just
-  a copy of the receiver value.
-</p>
-<p>
-  The method set and <i>implements</i> relation are also available
-  via the package view.
-</p>
-<img class="ss dotted" width='716' src='typeinfo-pkg.png'>
-
-<h2>Pointer analysis features</h2>
-<p>
-  <code>godoc -analysis=pointer</code> additionally performs a precise
-  whole-program <b>pointer analysis</b>.  In other words, it
-  approximates the set of memory locations to which each
-  reference&mdash;not just vars of kind <code>*T</code>, but also
-  <code>[]T</code>, <code>func</code>, <code>map</code>,
-  <code>chan</code>, and <code>interface</code>&mdash;may refer.  This
-  information reveals the possible destinations of each dynamic call
-  (via a <code>func</code> variable or interface method), and the
-  relationship between send and receive operations on the same
-  channel.
-</p>
-<p>
-  Compared to type analysis, pointer analysis requires more time and
-  memory, and is impractical for code bases exceeding a million lines.
-</p>
-
-<h3>Call graph navigation</h3>
-<p>
-  When pointer analysis is complete, the source view annotates the
-  code with <b>callers</b> and <b>callees</b> information: callers
-  information is associated with the <code>func</code> keyword that
-  declares a function, and callees information is associated with the
-  open paren '<span style="color: dark-blue"><code>(</code></span>' of
-  a function call.
-</p>
-<p>
-  In this example, hovering over the declaration of the
-  <code>rot13</code> function (defined in strings/strings_test.go)
-  reveals that it is called in exactly one place.
-</p>
-<img class="ss" width='612' src='callers1.png'>
-<p>
-  Clicking the link navigates to the sole caller.  (If there were
-  multiple callers, a list of choices would be displayed first.)
-</p>
-<img class="ss" width='680' src='callers2.png'>
-<p>
-  Notice that hovering over this call reveals that there are 19
-  possible callees at this site, of which our <code>rot13</code>
-  function was just one: this is a dynamic call through a variable of
-  type <code>func(rune) rune</code>.
-
-  Clicking on the call brings up the list of all 19 potential callees,
-  shown truncated.  Many of them are anonymous functions.
-</p>
-<img class="ss" width='564' src='call3.png'>
-<p>
-  Pointer analysis gives a very precise approximation of the call
-  graph compared to type-based techniques.
-
-  As a case in point, the next example shows the dynamic call inside
-  the <code>testing</code> package responsible for calling all
-  user-defined functions named <code>Example<i>XYZ</i></code>.
-</p>
-<img class="ss" width='361' src='call-eg.png'>
-<p>
-  Recall that all such functions have type <code>func()</code>,
-  i.e. no arguments and no results.  A type-based approximation could
-  only conclude that this call might dispatch to any function matching
-  that type&mdash;and these are very numerous in most
-  programs&mdash;but pointer analysis can track the flow of specific
-  <code>func</code> values through the testing package.
-
-  As an indication of its precision, the result contains only
-  functions whose name starts with <code>Example</code>.
-</p>
-
-<h3>Intra-package call graph</h3>
-<p>
-  The same call graph information is presented in a very different way
-  in the package view.  For each package, an interactive tree view
-  allows exploration of the call graph as it relates to just that
-  package; all functions from other packages are elided.
-
-  The roots of the tree are the external entry points of the package:
-  not only its exported functions, but also any unexported or
-  anonymous functions that are called (dynamically) from outside the
-  package.
-</p>
-<p>
-  This example shows the entry points of the
-  <code>path/filepath</code> package, with the call graph for
-  <code>Glob</code> expanded several levels
-</p>
-<img class="ss dotted" width='501' src='ipcg-pkg.png'>
-<p>
-  Notice that the nodes for Glob and Join appear multiple times: the
-  tree is a partial unrolling of a cyclic graph; the full unrolling
-  is in general infinite.
-</p>
-<p>
-  For each function documented in the package view, another
-  interactive tree view allows exploration of the same graph starting
-  at that function.
-
-  This is a portion of the internal graph of
-  <code>net/http.ListenAndServe</code>.
-</p>
-<img class="ss dotted" width='455' src='ipcg-func.png'>
-
-<h3>Channel peers (send ↔ receive)</h3>
-<p>
-  Because concurrent Go programs use channels to pass not just values
-  but also control between different goroutines, it is natural when
-  reading Go code to want to navigate from a channel send to the
-  corresponding receive so as to understand the sequence of events.
-</p>
-<p>
-  Godoc annotates every channel operation&mdash;make, send, range,
-  receive, close&mdash;with a link to a panel displaying information
-  about other operations that might alias the same channel.
-</p>
-<p>
-  This example, from the tests of <code>net/http</code>, shows a send
-  operation on a <code>chan bool</code>.
-</p>
-<img class="ss" width='811' src='chan1.png'>
-<p>
-  Clicking on the <code>&lt;-</code> send operator reveals that this
-  channel is made at a unique location (line 332) and that there are
-  three receive operations that might read this value.
-
-  It hardly needs pointing out that some channel element types are
-  very widely used (e.g. struct{}, bool, int, interface{}) and that a
-  typical Go program might contain dozens of receive operations on a
-  value of type <code>chan bool</code>; yet the pointer analysis is
-  able to distinguish operations on channels at a much finer precision
-  than based on their type alone.
-</p>
-<p>
-  Notice also that the send occurs in a different (anonymous) function
-  from the outer one containing the <code>make</code> and the receive
-  operations.
-</p>
-<p>
-  Here's another example of send on a different <code>chan
-  bool</code>, also in package <code>net/http</code>:
-</p>
-<img class="ss" width='774' src='chan2a.png'>
-<p>
-  The analysis finds just one receive operation that might receive
-  from this channel, in the test for this feature.
-</p>
-<img class="ss" width='737' src='chan2b.png'>
-
-<h2>Known issues</h2>
-<p>
-  All analysis results pertain to exactly
-  one configuration (e.g. amd64 linux).  Files that are conditionally
-  compiled based on different platforms or build tags are not visible
-  to the analysis.
-</p>
-<p>
-  Files that <code>import "C"</code> require
-  preprocessing by the cgo tool.  The file offsets after preprocessing
-  do not align with the unpreprocessed file, so markup is misaligned.
-</p>
-<p>
-  Files are not periodically re-analyzed.
-  If the files change underneath the running server, the displayed
-  markup is misaligned.
-</p>
-<p>
-  Additional issues are listed at
-  <a href='https://go.googlesource.com/tools/+/master/godoc/analysis/README'>tools/godoc/analysis/README</a>.
-</p>
-`,
-
-	"analysis/ident-def.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03\xd2\x00\x00\x00\xf5\b\x03\x00\x00\x00\x8b\f=\xff\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE!# #$\"$%#($#&'%'(&-'\")+(4,\",.+01/>/\"241A2%685G6$8:7;<:Q9$>@=W>#AB@CEB\\B'cC$GIF\x00f\x00\x00g\x00\x00h\x00gF'\x00i\x01KLJ\x00j\x02\x02k\x03\x04l\x05mJ&\x06m\x06sJ(OQN\vo\b\x0ep\nwN&\nq\x16TUS\x10q\f\fr\x17\x0fs\x18~R%WYV\x12u\x1a,`\xae7]\xad\x15v\x1c\x86T)\x16w\x1d[]Z9a\xab\x19y\x1e^_];b\xac<c\xad\x8dZ(>e\xaf)z ac`+{\"(|*\x92]%cebAh\xb2egd+\u007f,\x9a_)Li\xafDl\xb0.\x81.ikh0\x830Ho\xb31\x841/\x858Jq\xb6mol\xa3f);\x86:Us\xb3\xabg->\x88<Wu\xb5\xaej(sur@\x8b>B\x8c@\xb3m,vxu@\x8dGC\x8dA\\z\xbbxzwI\x8dH]}\xb7K\x8fJ\xb9r*_\x80\xbaM\x91L}\u007f|\xc1s-O\x93MP\x94Oc\x84\xbeN\x95U\x81\x83\x80\xc7x+W\x95VX\x97Xm\x87\xbcY\x98Y\xd1z(Z\x99Z[\x9aZ\x87\x89\x86\\\x9b[r\x8c\xc2\xd6~-^\x9d]\\\x9dc\x8a\x8c\x89d\x9ddz\x8f\xbff\x9ff\x8f\x91\x8eh\xa1hޅ+~\x93\xc4j\xa3j\x92\x94\x91k\xa4ky\x97\xc6s\xa4lq\xa5s\x95\x97\x94\xec\x8a,\x83\x9bŘ\x9a\x96\x9a\x9b\x98u\xaaw\x86\x9e\xc8\xf1\x8e/\x9b\x9d\x9a~\xaay\x88\xa0˞\xa0\x9d\x80\xad|\xf7\x93-\xa0\xa2\x9f\xfd\x92/\x81\xb0\x85\xa2\xa4\xa1\x92\xa5\xca\xff\x952\x82\xb2\x86\xa4\xa6\xa3\x83\xb3\x87\x8b\xb2\x88\xa6\xa8\xa5\x96\xa9\u038d\xb5\x8a\xa9\xab\xa8\x8e\xb6\x8c\x9e\xad͍\xb8\x93\xac\xae\xab\x95\xb8\x95\xa1\xb1ї\xba\x96\xaf\xb1\xae\x98\xbb\x98\xa4\xb3Բ\xb4\xb0\xa5\xb5՛\xbe\x9a\xb5\xb7\xb4\xac\xb7ѣ\xbf\x9d\xa2\xc0\xa4\xb7\xb9\xb6\xa4¦\xb9\xbb\xb8\xa5Ĩ\xb1\xbd\u05fb\xbd\xba\xa8Ǫ\xb7\xbfԯƫ\xbe\xc0\xbd\xb9\xc1\xd6\xc0¾\xb2ɮ\xc1\xc3\xc0\xbb\xc3ؼ\xc4ٱ̶\xc4\xc6ó\u0378\xb9̸\xc1\xc8\u07bb\xca\xde\xc7\xc9ƻκ\xbdϻ\xca\xcc\xc8\xc7\xcbۿҾ\xc4\xcf\xdd\xcd\xcf\xcc\xcb\xcf\xdf\xc8\xd3\xc1\xc6\xd4\xc7\xcd\xd1\xe1\xd0\xd2\xcf\xc8\xd6\xca\xd2\xd2\xdd\xd2\xd4\xd1\xca\xd8\xcc\xd3\xd5\xd2\xce\xd6\xdf\xcc\xda\xcd\xd5\xd7\xd4\xd6\xd8\xd5\xcd\xdc\xcf\xd4\xdb\xd0\xd8\xd9\xe3\xd2\xdb\xe3\xd5\xdc\xd1\xd9\xdb\xd8\xd7\xde\xd3\xd5\xdf\xda\xdc\xde\xdb\xda\xdf\xe2\xd7\xe1\xdc\xe0\xde\xe2\xde\xe0\xdd\xd8\xe2\xdd\xdd\xe2\xe5\xe0\xe2\xdf\xe2\xe4\xe1\xdf\xe5\xe7\xe4\xe6\xe3\xe8\xe5\xea\xe2\xe7\xea\xe5\xe7\xe4\xe6\xe8\xe5\xe4\xe9\xec\xe7\xe9\xe6\xfe\xff\xfc\x93\x8dkM\x00\x00 \x00IDATx^\xed\x9d\u007ft\x14\xd5\xdd\xff\a%\x064*\x15\xe1y<\xb3=lbJ0@\x94\x86F\xac(\x98o崆\xf4\x89i\xfa\x8d\xf6\xa4R\u007f`A\x10\x1a͓ñ\"\x02\x15\x1e\x8c\xf5l\xea\x81ش\x91`h\xf6(\xb89r\xb2\x12\xe4Ⱥ(<\x12\xda''\x94\xd2\xf6!\xc5\b\xc8S(ȓv\xd7Գ\xde\xef\xf9\xde{\xe7\u05fd\xb3wfv\x03a\xc8\xec\xe7\xf5\xc7\xee\xec\xe43\xf7\xde\xf9̼\xf7\xde;;\x99\xb7\xf4\xff.\x00\x04\x00\xc0e\x86\xe4$[;\x9c\n\a\x00\xe0R\x03\x92\x06\x00O\x01\x92\x06\x00O\x01\x92\x06\x00O\x01\x92\x06\x00O1\x92$]_/Z\x04\x00\x80\xc1=I\xf7w4\aZv\x9dS?u\a\x82\xb6ј?\xc9\xeb\x04\x8b\x84_˄9\xed\xc9\xdbX\xf0\xb1O.u\x8a\xb1'\xc5\x12\x9e\x95\xe5\x90S\xccP\xe9$;]\x82\x17z\x17\x14\x16TE\xca\xf6!\x94h\x983\xcd7\xed\x9eF\x84\xa2\xb2\\\x95@!\x1c\x11q*\xc7\x0e\xf1n\xa6\xb8\xf3\xa8\x0eW\x9f\xd7\xe7\x14\xa5s\xb6\xbe(wA\xc2)*\x89\xc8\xf4\x9dN!\x19\x85k\x92>\x11\b\xf6\x1c\xeb\xd9\xd2<@?\x9d\v\xecjr\xd8\x00\xd5\xe6\x9e\x16,\x12ο*\xb7G\xbb\x96\xca\r\xc9\x1bYp\xa0\xce\xef\x14\xe2\x80}\t\x91^\xe5\xfdT\xd4\xd7h\x13\x96\x1aZa&\x06\xf6E\v\x16\x1dƊ\xf6=ڹ}\x11\xfd\xee\x88\xc8\vں\xda\x17\xcaQ\x14\x8fȹQ\x14\vɑ\xb8p\xe3T\x11\xeff\x8a\xe9;\x1e\x8d\xb6\xc9\xfb\x9c\xa2t\xaa\x8b\xda\xea\xf2\xce;E%ѕ\xa7}kZ$*\xc3pM҇\x02\xc7\xf0\xeb@\xa0\x87~\nv\x1cs\x92t\x9f\xbcZ\xb0\xa8\x10\x91\U0006937b\xc4?\xa3TiL霴ö\x84\u007f[\xa2-\xf9/\\\xd2Faf\n\xd7◚j\xb2XG$\xbd\xba\x80\b8>\x05\xa7'&\xd7\xd6\xe1\xfeT\x8eYm\x9b\"\xe2\xddL9}\aS\x97\xf4y\xb9\x15%\x86\xd2\\\xbdc\xb7NT&ᚤ\x11\xed\x9eO\x06\xfa\xc9[w\xd3@\xbf\x93\xa4\xeb\xfc\xa7\x04\x8b\n\x8a\xa4\xe3\x05+Q\xaa\xa4|NZb[B\xf9Ŕt\xb9\xbd\xa4K\xe8\xe0\xa4W\xee\xc4\xfd\\\x05]]QC$\x1dɏ\x8d(I\xf7\xc9\x17:\x80\xb6NT&ឤ1\xb1\xa3-A\xf2\x15{.p\b9I\xfac\xdf*\xc1\xa2\x8a\"i\xb4\xb2\x90\xbcn\xafʻg\xb5r&\xf7-*\xf4\x15-\xa0\xfao+\xcf+k\xa3+O\xd5Θ\xb2H\x1d92\xb1\x1a\xbd>Yn\xe8\xab-ɭI\xb0\x01\x03Kf\xf8J\x16\xf6\x9aK\x88֔\xf8\n\x17\x94p%\xec\x94\x15\xca\xc9\a\xff\xda\xd5\xf7\xe4\xd5\x1c\xa7\u007f\x10ԶR\xf6\xb5'\a\x1c\xc6mX\x88f\xcarA\x9c+\xcc\f\x95\xf4\xd2\"\xba\xf3]x\xbb\xaaEt\xf5\xa2*\"\xe9\x8f\xcbC\x02IkU\xf0\x15\xa7\x91(v\xad\x06\x99\xb37\xa2F\x99\x8c\xfe\xd9D\xe9\x92^)\xcbۍ)\xb8 \x0f\x83\x85\xcan\xae6\x1f\x00\xb59\x89\"ߋ3gDV\x15T\x0fp\u06ddϓ\xd5\xcb\x15\\\xa2D\x87%SpQ\xd2'\x03\x18zy,\u0601\x1c%]\xef;.XTQ%\xdd.\xe3\xe3]/\xaf\xeaj\x9d^NN\x87H~\xf9\xab\x91F<\x9e#\x1d{CW\x83\xff)\xbc\xd4WpO\xfb\xce\x1a\x99\x9e\x93L\xacN<\x14*\x99\x93?su\xad|\x9c\r\xe8\x92\xeb#\xa1\x85\xf2A\xbe\x84\xdf\xcaO\x85\"\xed\x852W\x02\x9e\xe4Ω\x8eF\xa3t\x1a\xe0\x97KC;\x8b\x16Y\xd5\xf6\xa7\x90O\x9e\xde\xf8\xeb|> q\xa0Q>\x80ޔ\xb7\xf7\U00085661\x92>^\"\xd74\x1e\x18$\x9f˖\xd1\xd5\xcbʨ\xa4[\x17(\x92\x8e\u007f\xac\x10g\xab\xe0*N#Q\xecZ\x9dX\xb4\xa0\xe1o\xe8o\r\x05\xd1\x18\x9b(\xa4KZ\xb9\xa6\xa0N\xc1Ey@\xbdѐ\xdc\x18\x8d\x9e6\x1d\x00\xbd9\x91\x02yu\xb5\\\xb8\xb1\xa8\x95\xdb\fo\x17U\x06Bl\xa2\x84\x87%SpQ\xd2\xe8d\u007fwK3\xd6tO`\xc0Q\xd2\xc7}\xcf\n\x165TIw\xe1\xc9t\x97\xfc&\"g\x12\xfe掗\xd4\xe0\xb3x0t\x1e\xa1w\xe9\x85߈܅{\xb29\xf8,O\x94\xf9i\xbc\x1e\xcbQ.\x93\xbe`\x80\v\x88\x85H\xb7R\xb6\x10q%\xb4M\xa7=I\x81\xf9\xdca\x06\xdeEg\xf1I<\x1dY\xd6柂\xcf\xdcڤ\x80\xba\x8a\xb337\x9a\v3C%\x8d\xceo\xac\xf0\xc9S\xc8V\xa5\xb5tum)\x95\xf4\xe9\xdc\xd3T\xd2\xd5j\xffU\xc5WaT\x9cN\xa2\x98\xb5,\xf5K\xf1\xcb2\xf2\xd3\"\x93(\xc4\f\xbc\xa9\xee\x1a\xed\xb2\xce\f\xbc\xf5\x03\xc04\xa7\xa8\x16o\xb9\x13\xd5%\xff|\x99\xab\xcdm\xf4DY\x1d\x96\x8c\xc0MIc\xe2-\x1d\xe4\x12Y\"\x918ڔ\xb0;\x00+}\x1f\v\x165\xf4^\xfa<Zz\xc7 .-1\xb3\x9e\x9c;\xfa\x15\xd0\xfa2\xfaVZ\x87\xce\xcb\xf4\xb7\xae\x06rr1\xb1\x1c\xe5~u\x18\xc0\x06\x9cm\xab\xb9\xa3@.C\\\t\x9f\xce(Y\xd9ޛ\x184\x15\xc0J\x9al\xdbhS\x9b\xbfN\x18\x10/+z4\xa903\x8a\xa4It\xe4G\xe4\xb4W{\xe9\xa5J/\x8d\x16\xb4RI\xf7\xedT\xe8\xe3\xab0*N#Q\xecZ\x96Hn\f\xc5\xf2\xa2dQO\x14A i\xab\xac\xb3\x92\xd6\x0e\x80\xd1\x1cT\x14\u0085\r\xa0\xb5ː\x99dI[\x1d\x96\x8c\xc05I\xc7\x15\x01\xef\x0f$\x8e\x044\xfa-\xa3O\xf9\xeb\x05\x8b:\xaa\xa4\xd7\x16\xe0\xb3Z\xed\x92p/\xd1*\xeb?\xe0T)\xf2x\xb4\x02\xf5\xca\xf4\xbc\xa3'\x17\x13\xcbQ\xaeM\\\x99\x80\x83E%k;\xa3\xd5e\x88+\x01\x9do_R*\x17\xbdj*\xc0|y̮6\xab\x80\x90~a\xc9A\xd2\a\xe9\x148Q\x857\xabR6]\xa8̥Q\xa8\xcc<\x97f\xab0*N#Q\xdc\xce3$\n;Qg!9\xa6F\xa2\b\x02I[e\x9d\x95\xb4v\x00\x8c栢w\xd1A\x1fB\xebR\x91\xb4\xd5a\xc9\bܒt\xa2i\a}ǒN\x9c$t\aN\x9e\xb4\xee\xa6W\xc9}\x82E\x1dE҃\xd3\xf1!\xad\xbd\xa3\x97r\x96\xac5:\x9f;\xe8[I\x1d:+\xd3k?tV\xc7\xc4r\x94/R\x17\x98\x80\xd2\n\"\x8eE\xf8LeK\xe8%\xb7\xbc\xfc=\x94\xdbf.\x81\x9c\\\xed\xa4\xab1Ne\x8b\xda,\x02N\x155\x94\x9c5\x17f\x90\xa0sk*颕tM\xc3\x1c<\xc4V\xa4P^\xa3H:\x96\x171I\x9a\xad¨8\x8dD\xb1k9V-D\x8b\xe8UK#Q\x04^\xd2\rvYg%\xad\x1d\x00\xa39\xa8(\x82\x0e\xfaS\x904I\x94\xd5a\xc9\bܒ4j\xee \xafd\xe0\xad`;\x97>M\a\x89\xe6E\x03E\xd2\xebș\x19Q\xe6h\rx\x1e\x1a+\xaa&C\xafU\xab\xc8В\xac\r\x91\xc1iE\t\x9e2\xf6\xe5*\xa7\xb2\x1eˡ\u007f\xdb3\x01%\xe4,K\x94\x913\x95)\xa1Q~\x97\x04T\x9b\a\x0e\xd5ո\xa5ʌ\x95\x11\x8e\xb06q\xc0`E\x03\xaa\xafN\x98\n3h#\xbd\xe5Y\xf9u\xbcX8\x93ܞ\x91 2X\x9dO\u007f\x97ΫW$\x8dꖙ$\xcdVaT\x9cN\xa2\x98\xb5\x1c\a\xfc\xa7\xfc\a\xc8\x02\x93(\xc4H:\x0f\u007f\xfb$*\xec\xb2\xceJZ;\x00LsR\x90\xb4\x9e(\xabÒ\x11\xb8&\xe9C\x81\x8e\x9ec=-\xea\xddc\x89\xfe\xee@\xff\x19\xcb\xe0\xb5FϼV\xd0I+w\x8f=\xa5\xdc=\xb6N^\x16\uab17\xb7#2\xc1+m\xebZEg\u007f\xb5\xf2\xba\xaeu2\xb9zt8ofc\xc34\xd9\xf7\xe6a.V'q\x80^9U\xe6\xebF@\xa3\xbc\xa4mc\xb9\\\xf8\xea\x01\xb6\x84F9\xbf\xa1\v\a\x98\xef\xbal\xf4\xff\xba\xb3:\xefSr\xa5\xb7\xee\x00\xea\xad\xf3EO\x89k\x13\a\xc4\xf7=;\xfd8\xea+X\xbd/\xce\x14\xc6\x12\x91\x17\x84ެ($+\v墆wq@\x1fY[\xd3\x19\xed\xac\x91;\xc9\xddc\xa1\x18\x8a\xe6\x99\u007f\xc4ҫ\xe0*N#Q\xecZ\x96Č\x9a\x19\xf4\x1b\x88Iԧ\xe4\xee\xb1\xd6h\x94\f0\xaa\xa6\xbf\xba\xb1\xc2:\xeb\xea\x15\xef\x03\t\xd3\x01ЛsxZk,\xe4\xeb\x8d-\xab\xe6\x86+\x83\xfb\xa2Q\u007f]4JO#=QV\x87%#pMҨ\u007fGK`\xebnu\x12\xd7O\xa6\xd2\xcdV\xa1\xa7\xf3j\x05\x8b\x06\xca=\xde%\xea=ޑ\xea\xc2)U]t\xb1o\xc9\xcc\xfc\x8aN\xb2\x94x\xbd,\xaf\xac\x8d\x9es}\v\xa7\x95\xac}\xd3'?\xcb\xc7j\xf4*3\xbdGM\x85%Z\xe7\xf8\xa7/m\x9f\xe3\xabfK\xd8^\xd5X\xe2+\xaaN:u⫦\xe5V\x1f\xa4\xf7x˾\xc3\xe4\xb7S\x8b\xda\xc4\x01\x11\x99\xfcB\xbbJV\xee\xd0\xd6\n\xe3\xe8,\xcf+x\x94ʪ\xa2\xbd\xa14o\xfaB\xf2M\x97h\x98S \x17\xcciL\xd0\x12B\xb8[,2Of\xb4*\xf8\x8a\xd3H\x14\xbb\x96\xa5\xd5\xdfJߙDթ\xb3f\xd2\xe7\xf6U\xe7\xe6\u05fch\x99\x87x\x01\x8d\xf4\xfd\xd9t\x00\xb4\xe6$\x8a\xf0\xfe\xe4\xcby!\xd3\x1c\xfc\xb7j\x15\xf4\xd8뉲:,\x19\x81{\x92N\x83\x17\xe5?\t\x16\x01\x00HfDH\x1a\xfe\xab\x12\x00ReDH\x1a\x00\x80T\x01I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x18I\x92\x86[\xbd\x01\xc0\x11\xf7$m\x18\xe8Ě\x94\xe7\x149\xf8BX\x1b\xe8\x10\x86\xcdF%U\xb7\x98\xa1\xe3\xd8t\xc7\x00\x95\xa1\xda\xf5\xa4it#&\xd5FR\xd2O\xeaP\xf7-\xf3pMҌ\x81ι\xc0\xfe~\xccI\x87-\xac\rt\b\x86\x8d\x8a#i\xfa\xac\xa4f\x95s\x018:\xc08\xedۅ\xda\xf5\xa4it#F\xd8H\xcb\xec\b\x92j\x9fɡ\xee[\xe6ᚤ\x19\x03\x9ds\x81\xa3N\xd1\xc8\xde@\x87\x90\xfa\x03^\xd3\xf5YI\xd1*g\xe88:\xc08\xec\xdbE\xb0\xebI\xc3\x15\xc3\nQ#\xad\xb3\x93\x9cT\xa7L\x0ey\xdf2\f\xd7$\xcd\x18\xe8\xa4&i;\x03\x9d\xf4H\xd7g%E\xab\x9c\x8b\xc0\x10\v\xbb\bv=\x17A\xd2\"\xacw(9\xa9N;?\xe4}\xcb0ܓ4\xd2\rtR\x92\xb4\xad\x81\x8ea\xa3\xc2\xf8\xc2\xe0\xc5\xd6\xfa\x99\xd3\xc8\x13|\x18\xff\x16\vC\x1a\xc3\xf6\x85s\x96\x11\xb9\xc50\xf6,|a\x9a\xf5\x8c\x85\x05\x8f\xd8\xd5\xc5\xc2\x01F\x14\xc0{\xdeh\xa4c\xd7s\xe1F7LR\x11c\xb6#l$\xbfC\xf6\x16<\xe2Lr\xf8W\xd5Ϡ\x15w\xe1\xb8\x17ս0`\xf7-\xa3qQҺ\x81ι@ǖ@s\xd8\xf4\xe0;\x13\xb6\x06:\x86\x8d\n\xe3\vC\x16K66\x96\xe4\x1df\xfd[,\fi\f\xdb\x17\xd6YF\xe8\x16\xc3سp\x85\xe9^/\x16\x16<\x16\xae.B\a\x18a\x00\xe7y\xa3\x93\x8e]υ\x1b\xdd0Ie\xcdv\x84\x8d\xe4Z\xe6`\xc1#\xce$\x87_.\x0f\x85\xcapű}%\xf5\xa7ս0`\xf7-\xa3qQҺ\x81ι@S\xf7ў\x96f\xbb+\xde\xf6\x06:\x04\xedѯ\x86/\f\xf2\x97\xe0\xd1\xfd\xf9\x12b\xe7h<\xe1V<\xc2cm_\x8c\x12\xc4n1\x9c=\x8b^\x18\xe3\xf5\"\xb6\xe0\xb1vu\x11<[^\x1c\xc0\xec\x1bK\x1av=\x17ntc$\x95\xdbcq#\x99\xa7\xf7:Y\xf0Xd\xd2\xc0_\x8aO\x90\xf8\x1cr4\x1bIg\xfe\x94\xf9\x87Lc\xdf2\x1a7%\x8d\xd4\xe7x'\xba\xc9\xc9\x15k\xdam\x13ho\xa0C\xd0\xcf(\xf2\x9coE\xbc\xfe\xff \xafm\xf2ygI\xb3\xb6/z\t\x16n1\x9c=\x8b^\x18\xe3\xf5\x82\x84\x16<֮.\xa9K\xda\xd87\x964\xecz.\xdc\xe8\xc6H*\xb7\xc7\xe2F\xea-s\xb6\xe0\xb1Ȥ\x81\xffE\xf2J\x8f\xe6q\xf90\x8a\xe7\x9b\x1f\x00\xca\xec[&㚤\r\x03\x1dmMx\xabe\xb0\x93\x81\x0eA?\xa3\f\xf1*C\xc1(yb\xbf\x93\xa4Y\xdb\x17=\xd6\xca-\x86\xb5g\xd1\vc\xbc^\x90Ђ\xc7\xda\xd5%uI3{\xc1\x90\x86]υ\x1b\xdd\x18I\xe5\xf6X\xdcH\xbde\xce\x16<\x16\x994`\x8e&\xfa\xd1Z\xf4\xee\x14\U000d78f1o\x19\x8d[\x92f\ftPG\x90.\xee\bZ\x87;\x18\xe8\x10D\x92\xa6\x97ѨE\xad\xe1\xdf\xc2\xf8\xac0\xb0\xb6/z\t\x16n1\x9c=\x8b^\x18\xe3\xf5\x82\x84\x16<֮.\xc9\x0e0\x16\x01v\x92Nͮ\xe7\u008dn\x8c\xa4r{l#iҲ\x14,xę4\xf0\xd3_.\xe9\xd1D;\v\a\x05\x16\x96\xfa\xbee4nI\x9a5\xd0\tn!\x8bg\x02\xfb-\x83\x9d\ft\b\"I\x17\xe1\xb3v\xe0\x8ej\xc4\xfa\xb7\x88\riX\xdb\x17\xa3\x04\xb1[\fgϢ\x17\xc6x\xbd0=\x0e\xe3\x16c\xed\xea\x92\xec\x00c\x11`!\xe94\xecz.\xdc\xe8\xc6H*\xb7\xc7\xe2F\xea-K\xc1\x82G\x9cI\x03\xffL\xe2\x98[J\x8e&\x1a,\xdc9-\xf9\xc1\xfb\xfa\xbea>\xdex\xa1\xb7ÍT\\\x934c\xa0s4\xb0\xed\xd0ѽ\x81\xa0\xf5\x90\xc9\xc1@\x87\xb1Q\xe1|a\xc85\xd2\xf69S\xc8\x06\x8c\u007f\v\x12\x19\xd2\x18\xb6/l\tb\xb7\x18Ξ\xc5(L\xf7z\xb1\xb4\xe0\x11\xb9\xba\x88\x1d`\x84\x01ܾ\xb1\xa4l׃.\xdc\xe8\x86M\xaaa\xb6c\xd5Hc\x87\x9c-x\x04\x994U\\s R5E9\xfc\xeb\ue612|\xba\xe8\xfb\x86Y(/H\xfa{f\xe0\x9a\xa4Y\x03\x9d\x13\x1d́`\xb7\xb5\xa2\x9d\ft\x18\x1b\x15\xce\x17ƿ\xba\xbe`F-=\xffY\xff\x16\x91!\x8da\xfb\u0095 t\x8b\xe1\xecY\x8c\xc2t\xeb\x19\v\v\x1e\xb1\xab\x8b\xd8\x01F\x18\xc0{\xde0\xa4l\xd7C\xb80\xa3\x1b.\xa9\x86َU#\x99\x1dr\xb4\xe0\x11d\x92\xa3\xb4qI\xbeZ1\xb9\x81PtEE\xdb7L\xfb\xf4vA@&\xe0\x9e\xa4\xd3`\xa8\x06:p\xbf\xd10py$5\xe6\xcfLë\x14\x18\x11\x92\x1e\xea\u007fU^\x1eg\x9fǸ<\x92\x1a\x82+\xdbV\x8c\bI\x0f\x95\xcb\xe3\xec\xf3\x18\x97AR\x1b#\xa8\xba\xc1)(c\U00070915\v5\xc0E\xe5rHjL._Yt\xde)*c\xf1\xb0\xa4\xe9\x85\x1a\xe1\x8df\xc0\x90\xb9,\x92ڐ_m\xbe\x11\x1e\xd0\xf1\xb0\xa4\x01 \x13\x01I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x00I\x03\x80\xa7\x18I\x92\x1e\xea\xad\xde\x00\x90A\xb8'i\xc3@\aӳ\xad\xa9e\xaf}\xbc\x83\x81\x0e\x00\x00\x04\xd7$\xcd\x18\xe8\xa0xG`\xf7\x91\xbd\x81C\xf6[\xd8\x1b\xe8\x00\x00@pMҌ\x81\x0e\xea \x9e\x1b'\xe9\xa25N\x06:\x00\x00 \x17%\xcd\x18\xe8\xf4+O\x1d;g\x1f\u007f\xf1\ft\x00\xc0ø'i\xa4\x1b\xe8\xec\x0e\f:\x19\xb99\x18\xe8\x00\x00\xa0⢤u\x03\x9d`\xb0gk\xa0yׅ\x18\xe8\x00\x00\xa0ࢤu\x03\x9d\x16j\xa0\xd3\xdcra\x06:\x00\x00 w%\x8d\xb4\xe7xӾz \xb0\xc7&\xd0\xd9@\a\x00\x00䢤\x19\x03\x1d\xd59'l㶑\x82\x81\x0e\x00\x00\xc8=I\xb3\x06:{\x9b\xa8\xbc;.\xcc@\a\x00\x00䞤Y\x03\x1d\xc5:\xe7\\\xc0\xfa\xf6\xb1T\ft\x00\x00@.J\x9a1\xd0A{\x03{\x8fv7m\x15ش\xaa8\x19\xe8\x00\x00\xa0⚤Y\x03\x1dt(\x18ز\xd7Zю\x06:\x00\x00\xa8\xb8'\xe94\x18\xaa\x81\x0e\x00d\x1e#B\xd2\xf0_\x95\x00\x90*#B\xd2\x00\x00\xa4\nH\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\xc5H\x924\xdc\xea\r\x00\x8e\xb8'i\xdd@g\xb0)\xa0\xd0l\xbf\x81\x9d\x81N\xef\x82\u0082\xaaH\xd9>\xf36\xb6<+\xcb!\xa7\x18\xf2\x88a\xb9\xd4)\xe6\xa2\x11\x99\xbe\xd3)D\xe7l}Q\xee\x02LJ%#T%\x93\xfd\f\xe1\xd7*\xa7P\v,\x12U\x87\x8b\xcc\x13\xfd\xf7z\xaa-\xa3\xa4\x91_-;\x96\x15'\x93\xda1\xf6\x14\xaeI\xda0Љ\x05\xf6\xf6c\xf6*\x0f\xe8\xb7\xc6\xc6@\xa7\xd7\xf7h\xe7\xf6E\xa9\x1e\xbdH\xaf\xf2~*\xeak\xb4\x8f\xa4\x1c\xa8\xf3;\x85\xa4\x88V\xb1\xf5ڮ\xbc\xd4v\x81P]\xd4V\x97w\xde)\n\xa1\xbe\xd5r$\x86bQyuj*H\xc6\"Qǣ\xd16Y\xf4-\x9aj\xcb\x14\x04\xf9\x15'Jώe\xc5ɤr\x8c-j\x1b\xa9\xb8&i\xc6@\xa7\x9b<\xd9d\xa0i\x97\xfd\x06v\x06:5\xd5\xe4\xb5.EI\xff\xdb\x12m\xc9\xefx\xb8\t\x8d\x17K\xd2FŖkS\xed\xdb\x10:/\xb7\xa2\x84\xfd\xb3\xcfUZe\xf2\xa0\x89\x04\x8e\x1f2V\x89:(RV\xea-SHί8Qlv\x84\x15\vq>\xc6V\xb5\x8dP\\\x934c\xa0Cٶ\xc5\xfa\xa9&\x14;\x03\x9d\x92\x06\xf2\xda+w\xa2T(wK\xd2\xe5\xc2sG\xbc֑>9\xd51\xfa\xa5\x96t\xea-SHίsJ.\xa6\xa4\x9dk\x1bQ\xb8'i\xa4\x1b\xe8\x10z\x02'\xeccm\rt\x96\x16\x1d&o]\xb4k\xd8^\x95w\xcfj\xa5\x93`\x165v\xca\n\xe5\xe4\x83\u007f\xed\xea{\xf2j\x8e[\xc5\xe2q[\xed\x8c)\x8bԁa[y^Y\x9b\xb2\xbaoQ\xa1\xafh\xc1)\xb4R\x96\xb7+\x93\xc1D\x91\xefř3\"\xab\n\xaa\a\xd8\xc2Vʾv\xb5\n\xb6\xe2\x81%3|%\v{M\xcd9\x9f'\x1bs\a\xad6\xa6\x04\x86\xc1Be\xb3\xd5\\l\xafO\x96\x1b\xfajKrk\xb8\xceސ\xb4Q\x18\xd7^\xa39\\\tњ\x12_\xe1\x82\x12R\x84\x91(#\x96\x90\xac\xac\xb4Z\xc6\xe5W˙8Q|v\x8c\x8a\x99F\x1a\xb0\x8d\xf4\xaf\xaa\x9f1m\xa12\xe70\x92\xaa\x1d7\xfe|\xf0\x04.JZ7\xd0!\xb4t\xd8\xc6:\x18\xe8\x1c/\x91k\x1a\x0f(\xdd|\xbd\xbc\xaa\xabuzy\x82_\xd4\x19\xd8\x17\x9dS\x1d\x8dF\xffL>\xf8\xe5\xd2\xd0\u03a2E\xa6\xcd\f\xfa\n\xeei\xdfY#\xd3S\xae\xce\xdf\xd0\xd5\xe0\u007f\x8a,F\xf2\xcb_\x8d4b\x89(35:\x19\x8c\x14ȫ\xab\xe5\u008dE\xadla\u007f\n\xf9\xe4鍿\xce_\xc4W\xdc%\xd7GB\v僦\xe6\xf4F\xa3Z\x9f\xa2\xd7Ɣ\xc0\xd2\x1b\rɍ\xd1\xe8i.6\x1e\n\x95\xccɟ\xb9\xbaV\xe6\x12dH\x9a)\x8cm\xaf\xd1\x1c\xb6\x84\xdf\xcaO\x85\"\xed\x852I\x89\x91(#\x96 \xe8,\xd3i\x19\x9b_=g\xe2Dq\xd91*f\x1bi\xc0n\xe6\x97\xcbC\xa1\xb2<\xf2\x9d\xaf7\x879n\xdc\x01\xf0\x04.JZ7\xd0\xc1\x1c\xa13k\x1b\x1c\ft\xceo\xac\xf0\xc9S\xc8wx\x97\xfc&\"G<\xc4-r0\x03\uf8b3\xf8\\\x9a\x8e\xacb\xab\xe6\xe0^#QFN\xb9w\xe5\b~\x8d\xc8]\xf8\xfc,\xa9\xc1\x1a\x19\f\x91\v@\xf4$\xa3#ǢZ\\\xc8NTW\xcf\x17柂O\xe2\xda\xe9|ű\x10\x19\x0e\x94-\xe4\xd7\x12r\x95\x93\x96\xa9\x8d+\x81A\x1f\u07b2\xb1\xa8\\\xa6\xdd.\x17\xc9\x0e\xbc\x8d\u0098\xf6\xf2\xcd\xd1Jh\x9bNt\xd2V@%\xad'\x8a\x8bu\x18x;\xb6\x8c\xc9/w\x00ĉҳ\x83\x8c\x8a\xd9F\x1a\xb0\x9b\xf9K\xf1\xde\xc7\xe7T\x98\x92\xaa\x1f7\x18x\xb38\x15\xeeL\\\xed\x9d;Z\xec\xe3R0ЉG~D\x0e\xd6\xd2;\x06\x13\x98\x99\xf5\xdc\"\a#i\xf2'z`\x85\xb1\xe7\xe5v\xf2\xd6@\x02\xea\xcb\xe8\xaa\xd2:r\xf6\x19\x97H\x19I\x87\xf0y6\x80\xd6.\xe3\v\xa3\x8f\x1dO:wζ\xd5\xdcQ \x97\x99\xd6\"\xfd\xa4ej\xe3J`Ѕ\xc3Ƣr\u007f\xb2\x05 'i\xbd0\xa6\xbd|s\xb4\x12>\x9dQ\xb2\xb2\xbd7A\xc7>F\xa2\xb8X\aI;\xb5\x8c\xcd/w\x00ĉ\x12I\x9am$\x03\xb3\x99\xffE\xf2\xda&\x9f\xe7\x93\n\x92\x16\xe2T\xb8\x1d\x8c\x81\x0e\xa6\xc9\xfa\xb1\xfc\x14\a\x03\x9d\x83\xf4rY\xa2\n\u007f-\x97\xa9s#~\x91\xc3ty\x8c\x1eXal\xaf\x1cEZ@գtգ\x15\x9aD\xcc%\x14\xbd\x8b\x0e\xfa\x10Z\xb7\x8c/Lx\xee\x1c,*Y\xdb\x19\xad\xb6\x964S\x1bW\x02\x83.\x1c6\x16\x95\v\xe6\x84m\xf2\xdf\xf1kL&\xb3Ha{\xf9\xe6\xe8%\x9co_R*\x17\xbd\x8a\xb8\u0378X\aI;\xb5\x8c\xcd/w\x00ĉ\x12I\x9am\xa4\x01\xbb\x992X\x8f\xe2\xafa\xab\xa4\x82\xa4\r\x9c\n\xb7\x815\xd0!~\x1bG\xec\xc3\x1d\ft\x8aVҷ\x869xPyG/\xe5,\xb7\xc8A\x0fa;\xe93\x8c\x03+\x8c=KU\x80\xe8\xe5\x9b\xfa;誒:2t3\xf5Ҵ\x9b)\x8a\xa0\x83~E\"laI\xe7\x0e\xa9\xb8\xb4\x82\f\f\x17\x95\xf1k\tZ/m\xd4\xe6(i6\x16\x95\x9b\xe6܄(m\xaf\xa2\x1fF\xd2F{\xf9\xe6h%\xf4\x92\xdby\xfe\x1e\xca\xe5\xbf\t\xb8X\xa7^ڡel~\xb9\x03 N\x94H\xd2l#\r\xd8\xcd\xfc\xf4B];\x1e\x90$%\xb5\xc1tX\xbc\x81[\x92f\rt\xc8TZ\xbbL&\xc6\xc9@\xa7p&\x99\xd7&\xc8Y\x13Qfc\r\x1b\xb9E\x8e\xeaj\\\x8c2\xd1\xd5\xcfTqlE\t.\xb7/\x97\x04tр\x10\x19\xdbNJ\xaa\xc9@o\x15\xb9\ue7b7\x16\xd7[a\x92\b[\x18+H\xbd\xe2\x12rz'\xca\xcaL\xcdA\xfaI\xcb\xd4\xe6(i6V\xd8\xe3\fL#\xe3\x9a\xfai\x03\xc8B\xd2\\s\xf4\x12\x1a\xe5w\xc9[u=\xb7\x19\x17\xeb iǖ1\xf9\xe5\x0e\x808Q\"I\xb3\x8d4`7\xf3\xcf$\x17>J\xab\xf9\xe6\x18\xc7\xcdt\x00F>\xaeI\x9a5\xd0A=\x01;oig\x03\x9dB\xb9\xa8\xe1\xdd\xcejz\x93\xe0:yY\xa8\xb3^\xde\xce/\xb24\xfa\u007f\x8dc?%\xd7=\xeb\x0e\xa0\xde:_\xf4\x94E\xecἙ\x8d\r\xd3dߛ\x87q7\"\xaf\xebZ'גՑ\xdcҶ\xaeUt\"X5\xfdՍ\x15$\xe0\xf0\xb4\xd6X\xc8\xd7\x1b[V}\x9c)\x8c\xabB\xaf\x18\x9f\x88K\xda6\x96˅\xaf\x1e`\xd7\x0e\xee\x8bF\xfdu\xd1(I\x89^\x1b_\x82\x8er]\xf9\x00\x9d\xb5豉\x03\xf4\xeamҥ\x86\x90\xfclW=9g\x99\xc2\xd8\xf6\x1a\xcdaKh\x94\xf3\x1b\xba\xf0^D\xb860M\xff\x94\xdc\xc4\xd5\x1a\x8d\xf2\xfd[:-c\xf3\xcb\x1e\x00Q\xa2\x98\xec0\x15\x1b\x8dda\xf3\xeb\x97k\x0eD\xaa\xa6\xf4!\xee\x10\xeaǍ\xad\xcd\x1b\xb8&i\xce@\xe7\xc8\x16\xdbPG\x03\x9d\x8a\xf6\x86Ҽ\xe9ꏏ\x91\xea\xc2)U]\xe6E\x86\xf8\xaai\xb9\xd5\a\xe9\xfd\xbf\xb2\xef0\xf9\xb9\xf3Y\xabؾ\x85\xd3J־\xe9#\x01\x89\xd7\xcb\xf2\xcaڔ+\x00}Kf\xe6Wtҥ\xea\xdc\xfc\x9a\x17e\xb9\xbeH\x96C\xf9r^H\x99\rj\x85\xf1Uh\x15\xa3D\xeb\x1c\xff\xf4\xa5\xeds|\xd5\xec\xdaߪ\xd3I\xf2U\xa1\xd7Ɨ\xa0\x11/\xa0\x91>\xfaӋ\x1e۫l\xff(2\xd3U\x9eWNv\xcd(\x8ck\xaf\xd1\x1c\xb6\x84\xedU\x8d%\xbe\xa2\xea\b\xdf\x06\xa6\xe9uj{\xb9\xee7\xbd\x961\xf9e\x0f\x80(QLv\x98\x8a\x8dF\xb2\xb0\xf9-m\\\x92?\xa3V\xb9\xd8b\x1cB\xed\xb8q\x87\xc5\x1b\xb8'\xe94\x00\x03\x1d\x00H\x95\x11!i\xf8\xafJ\x00H\x95\x11!i\x00\x00R\x05$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9e\x02$\r\x00\x9eb$I\x1an\xf5\x06\x00Gܓ\xb4n\xa0\x83\xd0\xc0\xae-\x81-\xbb\x06\x1c6\xb03\xd0ѹ\xf4\x86)\xe9x\xde0\x88Mf:\xc9\xff\f\x92'\xd8\x1a\x8e@\x89\x869\xd3|\xd3\xeei$O'\x91\xab\x12\xd4\t\xc7\xf4\xbf\x84Cm\x83\x90\xce\xd2ܲPy\xd2\u007f\xa4ړ\x86\xa5\r0̸&i\xc3@\a\x9dk\xda\xdas\xb4gK\x93\xfd\x93M\xec\ft\xd26Ź\x88\xa4\xe3y\xc3 6\x99\x19\xd8\x17-Xt\x98s\x04\x8a\xc8\vں\xda\x17\xcaQ\x14\x8fȹQ\x14\v\xc9\x11\xf3\x03#\x84m\x18\x9a/\xcc\xebrm\xe7Z9\xdd\xc7\xf8\xa7ai\x03\f3\xaeI\x9a1\xd0\t\xb7\x90\xe7\xfe\f\xb6\x84m7\xb03\xd0I\xdf\x14\xe7\"\x92\xba\xe7\r\x83\xb5\xc9L\xe1Z\xc49\x02\xad. \x02\x8eOYM\x9e\bX[\x87\xd0\xc7r\xf2v\xa26\f\xc9\x17\xa6On\xc0\xaf\xabӕ4J\xc7\xff\x02\x18V\\\x934c\xa0ӱ\x95\xae\b\xda?\x9d\xdf\xce@'驟\x97=\xd6&3TҌ#P5}\xbe&\xaa\xa8!\x92\x8e\xe4DŽ\x92\x161\xa4\a_>5\x9d|\x81\xfcI\xe6\x1fϗ\n \xe9\xcb\x04\xf7$\x8dt\x03\x9d3M\xe13\xf13\xe1\xa63v\xb1v\x06:\xe9\x99\xe2\xe8\xf67HhSC檍\xa8QV&\xe5Z\t\x16\xce2ix\xde0\x01\xbcɌ\t*i\xc6\x11\xa8Jy\xb2\xe6\xa2*\"\xe9\x8f\xcbCI\x926\xda`a\xd7\xc3y\xff\xe8\xf0N8\x1a\xd3\xd6ҷ\u05cf[l\xc6fG\xe8\xa5\xc3x\xd3 \xab\x03\x00\f'.J\xda0Љu\xe0\xa5\x0e\xfb#og\xa0\x93\x96)\x8ea\u007f#\xb6\xa9\x89E\v\x1a\xfe\x86\xfe\xd6P\x10\x8d1%X9ˤ\xe1y\xc3X\xf0\xb0&3f\xa8\xa4\x19G\xa0\xb2et\xf5\xb22*\xe9\xd6\x05ɽ\xb4\xde\x06\v\xbb\x1e\xd6\xfbǀw\xc2QQ\x1f\x96\xaf ڌ͎\xd0K\x87\xf1\xa6\xb1:\x00\xc0\xb0⢤u\x03\x9dxGKO\u007fOK\x87\x9du\xa5\x83\x81N\x1a\xa68\x8c\xfd\x8d\x85MM\xfdR\xfc\xb2\xac\xde\\\x82\xd0Y\x06\xa5\xeey\xc3\xd9\xc98\f\xbc\x19G\xa0R\xe5\xf9\x89\xb5\xa5TҧsO\x8b\x06\xde\xda\xd3p\x85v=\\\xc5:&o\x1a\x85\xc3\xca\xc5\xf4x<n\xb5\x19\x93\x1d\v/\x1d\xe3\x01\xc1V\x0eF\xc0p⦤\x91\xfa\x1c\xefp\v\xbd\x00\xd4bg0\xedd\xa0\x93\xb2)\x0ek\u007fcaS\x13ɍ\xa1X^\xd4\\\x82\xd0Y\x06\xa5\xeey\xc3\xd9\xc98I\x1a\xe9\x8e@j/\xbdT\xe9\xa5тV[I3\x15\xeb)\xe1*6\xe0\xbdi\x14\xfeN{\xe9e\xf4w2\x8b͌\xecXx\xe9\x18\x92\xb6r0\x02\x86\x13\xd7$m\x18\xe8$\x02\xfb\xb5E\xcbh\a\x03\x9d4LqX\xfb\x1b\vG\x95Da'\xea,L\x98K\x10:ˠ\xd4=o8;\x19\aI3\x8e@UJ\xf3\x17*si\x14*\xb3\x954S\xb1\x9e\x12\xaeb\x1d\x937\x8d\n\xad\xfdt\xa7\xbc.n\xb1\x19\x93\x1d\v/\x1d\xa7\x03\x00\f/nI\x9a1\xd0\xd1$\xfd\xa1\x8d\xa4\x1d\ft\xd20\xc5a\xedo\xacljV-D\x8b\xe8\x158\xde\xd5E\xe4,\x83R\xf7\xbc\xe1\xecdD\x92NЉ/\x15\x15\xe3\bT\xad|\x93\x94\xd7(\x92\x8e\xe5Eґ4I\tW\xb1\x8eɛF\xe5\xa9\"\xf2\x85\xd7I\xae4\x887c\xb2c\xe1\xa5cx\xd3X9\x18\x01É[\x92f\rtv\xa8\x03\xef\x1d\x96\xc1N\x06:\xe9\x98\xe20\xf67V65\a\xfc\xa7\xfc\xc4\a\x83/A\xe8,\x83R\xf7\xbc\xe1\xecdD\x92n#\xaeUg\xe5\xd7\x11\xe7\b\xb4:\x9ff'\xaf^\x914\xaa[\x96\xa2\xa4\xf5\x94p\x15똼iT\x94ߥ\xab\x89\xa4ś1ٱ\xf0\xd21\xbci\xf8\x03\xf0\xf1F\xb8\xbd\xecR\xe0\x9a\xa4\x19\x03\x9dXsK\xf7\xb1\xee\x96f\xebK\xdeN\x06:\xe9\x98\xe2\xb0\xf67\x1665\x89\x1953\x94\x11\x83^\x82\xd8Y&-\xcf\x1bƿ\x855\x99a\x1a&/\b\xbdYQH\x9c\\\x18G\xa0\x88\\\xd3\x19\xed\xac\x91;\xc9\xddc\xa1\x18\x8a\xe6\x99$m\xb4\xc1®\x875\x8e1\xe0L|\fZ\xe5\xfa\xaez\xe5\xee1\xe1fLv,\xbct\x18o\x1a\xee\x00,\x94\x17\x98\x8b\x02\x86\x01\xd7$\xcd\x1a\xe8\xc4\xf7l\tl\xddcm\x8b\xe5h\xa0\x93\x96)\x0ec\u007fceS\xd3\xea\xd7\xee\x9e\xd2J\x10;ˤ\xe3y\xc3\x04p&3\f\x9d\xe5y\x05\x8f\x1e&K\x8c#P\xa2aN\x81\\0\xa71\x81\xc5M~\rNT\x14\xf1_\x05F\x1b,\xecz8\xef\x1f\x1d\xceć\xa1\xb34\xaf\xa2\xab\xa4\xcbj3dd\xc7\xc2K\x87\xf5\xa6a\x0f@\xfbt\xe6\a2`\xd8pO\xd2i\x00\x06:\x00\x90*#B\xd2\xf0_\x95\x00\x90*#B\xd2\x00\x00\xa4\nH\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\xda]6_0N5\x00\x19\x06H\xda]\x9c\x04\xeb\x8cS\r@\x86\x01\x92v\x17'\xc1:\xe3T\x03\x90a\x80\xa4\xdd\xc5I\xb0\xce8\xd5\x00d\x18 iwq\x12\xac3N5\x00\x19\x06H\xda]\x9c\x04\xeb\x8cS\r\x97\x92K\xfbD\xa2K[ۈ\x01$\xed.N\x82uƩ\x86KF\u007f\xe5u\xd2\\\x84\xe6I9\xf3{\x9cb/\x1c\xb56 \t\xefK:8\xf9\xa4Sȥ\xe1\xcc\xe4`\xf2J'\xc1:\xa3\x16\xe4\xfan&&N\ft\x1c%\xffa\x17\x98\x983@W\t\xf7\xf8\xe2\xa0\xd5\x06$ឤ\x19\x03\x9d\xc4\xfe\xad\x81\xad\xf6\xdf\xec\xff\xbb\xe1;\xb3\x9f\xfe\xc26D\xcc\x1ai\x85\xbatd\xb44\xd164\x897\x8a1_\xff\xfe[_:\x05j|2\xab\xf8\x01뿮\x19\xf5\\ҺoK\x84\xeb\xff\xaf\x93pu~v\xa5t=\xb7B-[\xdfM!\x1d9C\x12י\x1f\xe4dߞ\xe2\xf8\xb6[ڦ-\x86%\xe595\xc2=\xbe80\xb5\x01<\xaeI\x9a1\xd0I\x04\x03\x1f\x1e\xd9\x1b\xd8k\x17\xfe\xe4}o\xbd0\xfb3\xbb\b1\xebG5\xe9˻+\xb3l\"\x05|\xf6\x9b\xe2\xb7?z\xff\xf9\xe2ל\x025\xbe\xfc݆;m\xfe\x1c\xbcb\xbdy\xd5+ߖ\x1e\xfc\xc9\xe37KwY(8\x99\x9f\xdcr%\xf7\x99\x16\xc3\ue988`\xf6\x96\xe4\x95;l3N\xb8\xed\xba\x97*\xb3\x1d|\x8d4\xf6Hacq\xb7\xba$\xd8\xe3\x8b\x03S\x1b\xc0㚤\x19\x03\x9d\xfd\x813tŀu\xf4g\xc5o\xa0/\xfea\xfdw+\x8e\x8c^\xcc|Z\x91\xaa\xa4ONUF\xb1\x1f\x14\xff\x11\xebtC\xf1_\xec\xc3\x19^\xb3\x934Z\x9ee\x1e+n~B\xfa)\xd6\xe5\xad\xd2\xcf\xc4\x02\x16\xf0\u007f\x92%\xcd\xef\xa6\bQW;y\x9e`%\xcb\x19i=J\xd8\x1c\x15\x0eC\xc7\xecb\xf2\x1e_\x1c\x98*\x00\x1e\xd7$\xcd\x18\xe8\xa8\xce9M6\x9d\xc6'\xc5\xefY\xffц\xca\xeb\xd832eIwK\xdd\xf4\x9dJ\x1a}~\xf7\x06\xfbp\x06{I\x0f\\WiZ\xa3J\xfa\x97W\xdd*֯\x00\x81\xa4\xf9\xddL\x95IN\x92>$\xa51\\\x17K:y\x8f/\x0e iKܓ4\xd2\rt\xb6*c\xa8\xa0\xd5\xec\xe8\x8b\xef\x14S^FhCq\xf1;\xea\x8cuC\xf1\xac\xb7^~`\xf6\xd3\xffCc>y\xe6;\xb3\xeeS\x97\r\xe2c\xb5ޫ\u007f\xfe\xb8\xab\xbf\xa5\x0e\xbc\x9b&gOxD\xd1\xc0\xa1o匾\xee\xf6~n\xa3\xf5\x13\x82=ROp\xc2K\x9a\xa4ц\xef\xe0\x97/\xdf\xfe\xf1\xdd\x0f\xbc\xfc\x99\xd61\x82\x00\x00\x0f\xfaIDAT9\r1j\xfb\xf2\xad\xc7f?\xfc\x06\x9dl\xff\xcf\xf3\u07fd\xf7\x19e\xe0\xad\xc7\xfeqVq\xf1\xa6O\x9e\xbf\u007f\xf6\xd3\xff\xa4\x1b.\xcf6=`M\x95\xf4\xe6[ǐ\xd7\ao\xbc\xea\xfao\xfc\x92*\xf5g7\x8f\xb9r\xccW\u007fN\x16\xbfw\xc3U7|\x8f\xae\xfc\xf9\u05ee\x19s\xb3:\xf0\xd6b\x91\xb1\x9b-xZ\xbe\x02\xad\xc0\xaf-l\x1d\xe7\xb2%iT3Y\xfa\x814:\xf0Ȅ\xec\xdbq\xcf\x19\x94\x14&\xd1\x10-%\xfb\xaf\x90\xa4\xe5\x87\xe6\x8fϾ}0\x9e\xa3\x04<BJ\x987n\xf4\xb8\xb9\xea\x04\x99\xc9\x19\x93I<\x81\xd6E\xd6͌\x8a\x93\xf6\x18\tkc\x16q\xc0K\x93\xb2'\xe1\xf4#~-K\x18$m\x85\x8b\x92\xd6\rtv5\xd1g`\x06\x04\xd3=\x85?|\xf4N\xf1k\x1f}\xf4W,\x9b\x8ff\xbd\xa6\xceX\xff\xfb\x9dY\xc5\xf7\xbd\xf6\x9b\xbb\x9f!\x11\xffy\xf7c\xbf\xf9\xe05<:\xe7٫\x9d[\x87\xc6N\b\x04o\x93\xa8\xa4+G=\x14\\\x9f3\x89\fE\xc3c'\xad\xe9X!\xad\xe16\xea\x9f/M\x94n\x92\xe6\x1d\xd3%\xfdV1\x1e\xf3\xbfP\xfc\xf2\xfbo\xdc\xf70\xb9D\xc7\xd4\xf6\u009d\x9b\xde\xdft\xe7\xf3x铻\x1fx\xfb\xbd\xa7\x8b\xa9\xa4\xf5\xd8\xcf\xdfy\xe7\xfe\xef\xdf\xfdݗ\x9f\xff\xfa_iٻ\xccg\xa2&\xe9\xefIX\x9d\xb7H\xb7>\xfe\xbd17\xfc\n\u007f\xfe\xc9U7|\xfb\x89\xbb$\xa2\xe4[\xae\xbc\xeb\U0007bbbc\x85\xc8\xfc\xaa\xeb\x1f|\xfc_%*i=\x16\x19\xbb9\x10\x1e\xbb\xfc$:\xb9\xfc\xea0\xdfi\xef\r\x87\xb3\xe8ճ\x9e\xe6+\xa4\x9c\x15k\xc6~\x8bxz\x87'L\r\x87\xc3\xf4\xaa\xa4\x9e\x92XK\xf3W&\x8c\x1d\xf7\xc8|\xe9(\xda\x1fn\x96V\x84\xc3D\xbbA\xa92\xdc2w\xd4\x1e\x12\xcb\xe4\xcc\xc8\xe4\xe0\x89\xf0\xe4\xab\xf5J\xe39\x93w\x1dS\x87\xfaI{,\xae\x8d\xad\x18Uf-\x0f.Ϛ\x8f\xb8\xe60\xf0\xb5\x01<.JZ7\xd0\x19h\n\x9e\x8c\xf5\a\x03-֡\xc6\xc0\xfbNr\xadJ\x19\xde\xdey/\xee'\x9f\xbf\x0f/}~\xffӸK\xfc\xe2\x1d\xf3\xf5\xb3\xa0tDY\x98:\x9e\\\x86\x9b\x94E\xd7\x05\x10\x19\xb8\xe1n+6\xee\xf68yڰ\xd9_o\xdbhi4\x1d2\xa8\x92~\x1fO\xa6\xdf+~\x1b/\xfd\x1e\x0f\x12\xd8\xda\xde/\xfe\x80\x86\xbd\x8fЏ\xbfOV>LZ\xc6\xc4\"\xf4p\xf1\x93\xff@_\xaa\xd7\x01\x8eJ\xa6\xef-M\xd2O\xe0\xc9\xf4\xe3҃x\xe9ߥ\x1f\xe2\x81\xf85\xff\x8a\x85\xfd\xcb\x1f\xbeB\xfe\xf2\xc4f\xf5\xf5\xc6k\xb1\xee\u007fu\x03\x91\xb4\x11\x8b\x98\xddD\x95d,=O0\xd6\xcdV/\x88g]\x8d\xc51?\x87.\xeb\x03o&%x\xadt\x1b>&\xf4\x9a\x98>\xf0\x1eh!\x02\xba\x89\xfc\x0e\xcc\xe4\x8c\xd9l.\xeeΙA\xfa6\xfc\xf1\x9b\xcab\xd2\x1e[֦/n\x93\xc8L\xacC\xb9\xa6\xcd\x04\xe8\x98j\x038ܔ4R\x9f\xe3\x8d\xce\x04q\u007f\xbd;hs\x94Ē~A[|\xbf\xf8\x0f\xc2Ͷ\xaa\xe7\xfa9z\x16\xa1\xe5D\xd2\xf3\xc6\xc7\a1\xe3*ɹ\xb3_\xb0љGF\x8f\x93\xc6e->\xa3K\xfa\xed\xe2\xcf\xd0\xf3\xf7\u007f\xf1O\xccw_\xe0j{A\xf9\xcd\xea\x81\r\xe8\xb3\xe2\xb7\xc8\xd2&\xd2\x1c&\x16K\xfaο\x1ae\x1fUNd\x03M\xd2\x0fJ\xafl\xbe\xf9\xda_\xfe\ns\xcd-\x9b\xb5\xb5\xb4;V~\xb3\xba\xfe\x96ͯ\xd0N{\xf3]D\xd2F,2v\x13w\xa1\xd9\x03h [\xf0@t]\xd2D\xee\xea5\x05]\xd2LJ\xf0Zゖ1\x97>\xf9\xd2\xed\xe3\xc7J7!.g\xccfG\xb7\xe9?Fc\x06rƯߡ6)i\x8f-k\xd3\x17+o\xa2o\x13\xcd\x01:|m\x00\x8fk\x926\ft\xc8[\xecL\x025\xd9xb\x89%\xad/\xbeQ\xfc\xb9p\xb3\xdd\xea\xa8O\x1d\x99\xd2Sy\x92:\x89\xc4]\xcezI\xf4\xe8\xf059\x01<\x97^\x9f\xf3\x9c.\xe9_\xdcM:[\x85\xa7\xb9\xda~\xfc4}{\xfa1\xdc'\u007fD\x96hs\x98X\xfc\xe11\xa6\xec=\x92i'5\xf1~\xe3\xaa͛oP[\xf6Uu\x1c\xaep\xe3W\xe9\xdbWo\xdc\xfcS\xe9'\xba\xa4\x8dXd\xec&\x1e\x92\xe6lE[s\x12(\t]\xd2\xe4\xdd,i&%\xf8\xc3$}#]\xd2{\xae\x1b\xb7xk\xf86\"5&g\xdcfxv\xbbG\xfb\xc3\x1eɰ\nO\xdac\xcb\xda\xf4ũJ\a\xff\xcdɦ\x00\x16\xa66\x80\xc7-I3\x06:\xf8D$K\x87\x02\xfcU*\x0e\x93\xa47\x99$\xfdA\xf1\uf15b\r(SHtF\"\x17[\x10\xbd<6\u007f\xfc^\xcaI2\xb6\xfbP\xb4U\x9c^\xf1&\xf3{E\xd2_\xdc\xf7\f\xe9y\u007fO\xf9\x8c\xab\xed\x85\xfbɕ\xb1/\xef\u007f\x01\xfd\xaf2\x91\u007fA\xe9\xa5\xf5X,\xe9g\x98\xa2W\x8c6\xfdʫ]\xf1\x1es\xf3\xe6\xcd_\xbb\xf6\xa7\x94\x9f\xf3\xbd\xf4\xb5\xf4\xedZ\xbd\x97\xa6\x97njXd\xec&桹h\xeeC(\x19KI\a\x8er)\xc1k\xbf\xa5o\xa4Kz\xe2d\xd2'~\x8bH\x9a\xc9\x19\xb7\x99\xc5\x15\xef\xe4=\xb6\xacM_\xac\x1cO\xdf\xc6W\x9a\x02X\xe0\x8a\xb7%nI\x9a5\xd0\xe9\t\xe0\xa3{\xae\xd9\xee\xde\x01Cҳ\u007f\x815\xf6\x98I\xd2\xff\xb8\xefIr\xd9\xea\xe5\x97\xcd\xdb\xcd\x1b\xaf\xf4X\x93\xc7\xe1a\xf4\xa1,r*w(\x97\x83\x97?G~a\x99J\x84\xfbP\x92\x06\x8e]}\x8c\xbe+\x92\xdeD$\xfc\x8123\xde\xf4\x1b\xae\xb6\xf7\xe9\xdaw\xc8\\\xfa\xb1\xfb\xb1\x82\xff2[\xf9\x86\xd1cyI'&~\x13\xf1\xa8⽋\xbc>Af\xd1x\xf9ۛ7\xbf2\xe6_H7}\xeb7Ȭ\x99\xac\xfd\xa1\xf48\uec2fy\x85\\##\x926bI)\xdan\xe2\x0e;\xab?Kt\xb2\x8b$=u*B'H6\x98\x94p?m\xe9\x92\x1eGt\x95\x98D$\xcd\xe4\x8c\xdb\xccB\xd2\xc9{lY\x1b3\xb5'c\xf5f\xa5r\x8b_\xda@Җ\xb8&i\xc6@\xe7P`ϱ\xfdMA\xebɑr\xc5\xfbw\xf4~\xd0\x1f\xdf\xf7\x9b\xd7\x1e+\x9e\xf5\xf6\u007f\xff\xf5\xa3Y\x1b~\xf7\xe5\x1f6\xcc\"W\xc2\xffs\xf6\x03o\xbd\xff\xb22\x9de94J\xb9\x9aݝ=n\xc5\xf2\x9cQW\x90;[\x16K\xf3Z\x82\x95\x12\xb9\xddjG\xd6ė\xb6=\xa4L\xb4\x05pw\x8fm\xfa\xfa\xf3\xef\xbc\xf7\x02\x15+S\xdb\xf3ś\xde\xdbTL\xaex\xffq\xf6w_\xdbt/i\x19\x13\xfb\xcf\xff\xfa\xe8\xfbO~\xf4\xd1'j\x81k$\xf3o\xef\xf4\xee\xb1'nQ\xee\x1e\xbbK\xfa\xda\x0f\x1f\xbf\x85^\xf8\xfa\xc9U\xd7\u007f\xef\x89[%r\xa3\xe8פ\xbb\x1e\xc7\u007f\xc1K?\xbd\xea\x9ao\xdf5F\xba\xf2\xc1\x9f1\xb1\xa4\x14m7\xb1\x84\xc6\xdd>\xce<\xee\x8e\xef\x0e\x87\xb3*\xc3\xe1s\xa8?<\xbar7\xda[9\x9a^\xc7^\x91\xb5f\xebm\xd9\xe4\xcbKO\xc9\xe0nz\x1d\x9c\u0383\x95+\u07bbIi+\xa4y/=7I\xcaY\xb3\x9b\xcb\x19\x93I2\xb9\xd1G\xd8\xc6D@\xb0\xc7\xe2\xda؊\xd1\xfcQ\x8b\x83\x8bG\xcd7\xad\xe5؛4\x9e\aT\\\x934k\xa0\xf3aK \xf8\xa1`\x02\xa8\xf2\xf9\xbdtf:\xeb/\xe4\xc3'Oξ\xfb\xe9M\xc5\xc5\x1b6\x90U\u007f\xb8\x1b\xbf\x92\x1bA\xfe\xf2\xccw\xef~\xec\xbd\xe4m\x97g)\x87\xfe\xd0ܜ\xf1\x8b\x03WH?\xc0\xcb\x1d\xb7\xe5\\=U\xf9\x11\xfcмqc'oM\xdeL\x81\xde\xe3]|\xbf\xfaE\xf1\xc1\x93߹\xf7\xc7\xef\xd3E\xa3\xb6/\xdexx\xf6\xc3o\xd0/\x9bO\x9e\xbe\xf7\xfe_\xbc=\x8b6G\x8b\xfd#3\xa9&\x17\xaf\x92n\xf2R\xee\xf1\xbeV\xf9\xd9y\xf3\x13\xff2f̍O\xd0ş\xdd|\xcdU7>N\x96~E\u007f\x97\xfe\x15]\xf9\xd51\xd7~\xe3\xc1+\xa5[\x99XZ\x8c\xb6\x9bx\xae\x9b\xc5\xff$\x87\xd93J\x99\xbc\x06\xd0\x0f\xf0\xeb\xe8\xeel\xfcJ\xf2\x10\u007f('{\xaa2%\xd5R\xb2_\t%=k\xfcj\xbax\x05\xf9\x95+\xb1fBVμ\xc0\xf8Ѹ_gs\xc6d\x12\x9d\xb8b\xde\xfe\x13\xf8 \xc6\xfb\xf7\xce\xcb\xd2\xe6P\x82=\x16\xd7\xc6,\xe2\xea\xd6ߔ}\xd3K\t\xd3Z\x0e\xad6 \t\xf7$}\x89xht\x8bSȥ\xa2yt\xa5\xf9\x8e\x89\x8b\xf6\x9fX\x97\xc1nn\x9dH/y͕\xa4\xafh\x17\xcaE{|\x91Pk\x03\x92\xf0\xbc\xa4њq'\x9cB.\rg\xae{.y\xa5\x93`\x9dQ\v\xba\x1cv\xf3\xc4~\xdc;\xf7\u007fxL\xfb,\xdc\xe3\x8b\x06\xad\rH\xc2\xfb\x92\xbe\xbcq\x12\xac3N5\x00\x19\x06H\xda]\x9c\x04\xeb\x8cS\r@\x86\x01\x92v\x17'\xc1:\xe3T\x03\x90a\x80\xa4\xdd\xc5I\xb0\xce8\xd5\x00d\x18 iwq\x12\xac3N5\x00\x19\x06H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\x1a\x00<\x05H\xda+\xc0\r\xcf\x00\x05$\xed\t\xc0N\x06\xd0\x00I{\x01\xb0\x93\x01t\\\x95tw@\xfd\x97\x9d\xfe`\xa0Ý{\xf0\x19g\x19\v\xb7\x18{S\x9c!\x13\xbc:\xf5\a\xe2i\x8d\xac\x94$)\xfb\x90 \x00\xecd\x00\x1d7%}.\xb0K\xf9\xef\xf9c\x81\xf0\xa1p@\xff\a\x9eK\t\xe3,c\xe1\x16\xe3`\x8a3T\x16KN\x06\x19\x06Z#\x8f\x86\xc3/\t\x9f\xe6\x01v2\x80\x8e\x9b\x92\x0ev\x1c\xa3\x92N4\x93\xff\xdf\xdf\xd5\xec\xca\x05\x1e\xbdRk\xb7\x18{\a\x8d!\xb2\\Z\xee\x14b`dF\xfc\x80\x1exl\x0f\xa0㢤\xbb\x9b\x06\xfa\xa9\xa4{\x02䡓\xd4\x1e\xcbE\xac\xddb\x86E\xd2+\xec\xad&\xad\x00I\x03\x0e\xb8'\xe9s\x81CH\x91t\x872\x11\xdc&x\xfc\xf4\xf0b8˰n1,\"S\x1cda\xd7#r\xcd1\x1b\xe8\x18\xacQ<>\x8e\x8eU*\x96Ʋ\xf3\x0e\xc6\xe8\x86i$A,^\xb0\x93\x01tܓ41\xb7S$\xbdUyn\xd6.\xcbg\x80\r\x1b\xba\xb3\f\xeb\x16\xc3 4ű\xb2\xeb\x11\xb9\xe6\x98\rt\f\xd6KԦ5\u07b4^!\x10g\xfe\xc8\x18ݰ\x8dDBI\x83\x9d\f\xc0⚤{\x88\xf7\xac\"\xe9&\xe5\x91v{\xec-\x92\x87\t\xedi\xb8\u0081\xb7\xd8\x14Gl\xd7c\xe5\x9a\xc3\x19\xe8\x18\x04\xd4璞8\xa2`z\xcc\x10kt\xc34R$\xe9\xb9\x12\xd8\xc9\x00\x06nI\x1aϜ\x13\x89\xc4ѦDBw\xae\f_\xfa^\x1a\xd9K\xda\xc2\x14Gl\xd7c\xe5\x9a\xc3\x19\xe8\x184)\xcf\xca=\"i\xf0O\xb6e\x8dn\x1c$\rv2\x00\x8b[\x92>\x12\xd0\xe8G\x1d\x8a\x96\x82\x97|.M\xb0\x93\xb4\x85)\x8eخ\xc7\xca5\x873\xd01\xd8u\xb5\xa2\xcdpP\xc1\xf4+\x14\xfb\b}\aI#\xb0\x93\x01\x18ܒt\xe2$\xa1;p\xf2d\x02\x8f\xc1ɯ\xc1\xe7ܹ\xe2m'i\vS\x1c\xb1]\x8f\x95k\x0eg\xa0\x932\xe9I\x1a\xaex\x03:nIZ\xa1_\xfd]\x9atQ;\xdc\xf9]\xdav.-6\xc5\xe1\xedz\x8e<\xa7\f\x99\xad\\s\xac$m\xbf\xb7 i`\x88\xb8)\xe9D\u007fw\xa0\x9fx;\x1f\r\xec8\x12&~k\x97\x18\xc3Y\x86u\x8ba\x10\x9a\xe2\x98\xecz\xe6J\xb7+\xc1\"\xd7\x1c\x93\x81\x0eCp\xac\xcd%-\xd6\xe8\x86i\xe41r\xf7\xd8\xfap8)S`'\x03\xe8\xb8)\xe9~2\x95\xa6\xbf\xb8\xf6o\v\x04]\xb8\xc7\xdbp\x96a\xddbXD\xa68\x88\xb7\xeb\t\xe4h\x96Z\x02\xd7\x1c\xde@\x87e[\x8e\xcdm٬э\xd1Hz\x8f7!\xc9\xf9\r\xecd\x00\x1d7%\r\\4\xc0N\x06\xd0\x00I{\x04\xb0\x93\x01\x14@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)\\\x95\xb4n\xa0\x83PؕG\x9a\x8c\x14\x86\xc9\xc4\a\xf0\"nJZ7\xd0A\xe8D \x13\x1e\x9e\xb5c\xafS\x84\x05\xc3d\xe2\x03x\x117%\xad\x19\xe8 \xd4ߒ\x11\x92\x9e\x9c\xf4삔\x19\x16\xc7\x0f\xc0\x8b\xb8(i\xdd@\a\x85\x03ጐ\xf4$\x9040\xec\xb8'i\xc3@\a\xc5\x06\xb4\xc7\xf3{\x82\xfdWH\xd2\xf2C\xf3\xc7g\xdf>\x88?5MΞ\xf0\xc8\x00\x1e\x93\xa8O\x19\x9aD\x9eC4\xaa\t\x1d\x19-M\xe4bY\xd7\x1c\x96\xe13\xf1\x01\xbc\x88{\x926\ft\b^\x92t\xac\xa5\xf9+\x13Ǝ{d\xbe\x84\xd5Y9\xea\xa1\xe0\xfa\x9cI\t4\xb0+<aj8L\xae\x03\xf6\x87G\xaf@hwe\x16\x17˹\xe6\x18\f\xa3\x89\x0f\xe0E\\\x934c\xa0C\xf0\x92\xa41\x93\xa4\xdb\xce\xe1\x81\b\xe9\x9b\xc9\xc3\x06\xf7H\xf4\xa9\x89\xc6\xc0\x9b}\xa6\xaf\x1ekr\xcdQ\x19F\x13\x1f\xc0\x8b\xb8%i\xd6@\x87\xe05Ig\xa9\xc3\xe7y\xe3ヘq\x95t\xadX\xd2Z\xac\xc95Ga8M|\x00/▤Y\x03\x1d\x82\xd7$=I[Pg\xd0\xf4\xf1\x9d\x16\x92\xd6bM\xcf\xe3W\x18N\x13\x1f\xc0\x8b\xb8%i\xd6@\x87\xe05Ik\x13\xe2\xf9\xe3\xf7RNҵD\xd2Ԃ\x80\x8awy\x16\x1f+\x94\xb4\x8b&>\xc0\x88\xc4-I+xw.\xad\xf5\xc7\x1dR\vy[\xfe\x1cy\x9d:\x15\xa1\x13tE\xf6b\xfc\xad69\x8b\x8f\x15JzXM|\x00\x0f⦤u\x03\x9dX\u007f\u007f`G\xbf\xc9ay\xe42\xb8\x9b^\xdbVT\xb6X\x9a\xd7\x12\xacT\x9cgWd\xad\xd9z[\xf61\xbc45\xe7\xb9\xe7&KW\x04z\x98X\xd65\x87a\x18M|\x00/⦤u\x03\x9d\xbdʬ\xfa\x9c\xd3\x06#\x84\xfd\x8a\xe5\xcd7\x95O\x1d\xb7\xe5\\=U1ˉ?\x94\x93=\x95\x0eG\x0eM\xcd\x1e{\xfbbI\xfa\x01\x13˺\xe6\xb0\f\x9f\x89\x0f\xe0Eܔ4\x00\x00\x17\x1d\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\n\x904\x00x\x8a\x8c\x96\xf4<)g>X\x02\x00\xde\"\xa3%ݿ#01g\xc0)\n\x00F\x12\xaeJZ3\xd0\x19\b\xb7\x04\x82\xfb\a\x1d\xa2\x87\x85\xb0\xb4\xdf)\x04\x00F\x12nJZ3\xd09\x17\bv\x1f\xd9۴\xd5\rM\xef\x91v;\x85\x00\xc0H\xc2MIk\x06:;Z\xc8\xf3\xc7\xce\x04\x86\xea\x18u!\x80\xa4\x01\x8fᢤu\x03\x9d\xad-\xf4\xf3\x0e\xdd\xc6\xf2\x12\x02\x92\x06<\x86{\x926\ft\xfa\x8f\xd1\x15\xbb\xb6\xd8\xc6\x0f\x0f\xddR\xd8)\x04\x00F\x12\xeeI\x9a7\xd0A(\xd1솸\xe29\x93w\x1dK8E\x01\xc0\x88\xc15I\x9b\ftp'\x1d8c\x1d=|l3\x1e\xfc\a\x00\x1e\xc0-I\x9b\rt\xd0\xee\xc0\x11\xdb\r\x86\x89\x81\x9c\xf1\xebw\xb8R3\x00\f\vnI\xdad\xa03\xb8#\xe0\xcem\\{\xa4\x0e\xa7\x10\x00\x18I\xb8%i\xde@g \xd8\xc4=\x8e\xfe\xd2\x01W\xbc\x01\x8fᖤ\x15Թ\xf4\x99\xe6-\xe7\xb0\xcac\x0e\xd1\xc3\x01H\x1a\xf0\x18nJZ3\xd09\x1ah>\xd2\xdf\u07ff\xab\xc5i\x83a`7H\x1a\xf0\x16nJZ3\xd0٦Ϊ/\xf9\xad&\xf1\xfe\xbd\xf3\xb2\\\x1a\xf1\x03\xc0\xf0ত]g\xae$}\xe5\x92\u007f\x8f\x00\xc0\xb0\x92ђ\xee\xff\xf0\x98S\b\x00\x8c02Z\xd2\x00\xe0=@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)@\xd2\x00\xe0)\xfe??\xe8B\x81\x97E\xcd\x14\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/ident-field.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03\xd2\x00\x00\x00\xde\b\x03\x00\x00\x00\xe6g\xc8\n\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x02\x05\x01\n\x03\x01\x05\b\x03\f\x0e\v\f\x10\x1c\x0e\x11\x14\x10\x12\x0f\r\x15$\x16\x17\x14\x1c\x1b\x15\x1b\x1d\x1a\x1f\x1f\x19\x13#A!# $$\x1d#$\"$%#&'%\x19(G((!'(&+)\x1e\x14+N()'++$*,)/-\"*.0-.,02/63(241685<9-5:=:;9=?=CA5AB@CEBKH<MH7HIG\x00f\x00\x00i\x01JLI\x00j\x02SN=MOL\x05m\x05PRO\fo\t4U\x98XSBTUS\x0fq\v\fr\x177Y\xa3WYV,`\xae7]\xad\x15w\x1c\\^[c^L9a\xab\x19y\x1e_`^;c\xad=d\xae)z!ac`De\xa3?f\xb0)|*Bh\xb3egdghfLi\xafDl\xb0qjSikh/\x82/Ho\xb3/\x859Jq\xb6mol;\x86:Ut\xb4Xv\xb6?\x8a>|u]tvsB\x8c@@\x8dG\\z\xbby{x]~\xb7e|\xb8K\x90J\x85}e_\x80\xba}\u007f|O\x93Nb\x83\xbdN\x95Ud\x85\xbf\x81\x83\x80W\x95Vl\x87\xbc\x90\x86hZ\x98Yo\x89\xbf\x87\x89\x86]\x9c\\\\\x9dds\x8dÕ\x8cn\x8b\x8d\x8az\x8e\xbfe\x9ef\x8d\x8f\x8c|\x90\xc1\x9b\x91s\x90\x92\x8fi\xa2i~\x93\xc4x\x95Ā\x94œ\x94\x91\x9f\x95w{\x98\xc7s\xa4lq\xa5s\x95\x97\x94\x82\x9aė\x99\x96\x83\x9cƙ\x9b\x98u\xaaw\xa6\x9b}\x87\x9f\xc9~\xaay\x9c\x9e\x9b\x89\xa1ˀ\xad|\x9f\xa1\x9e\x8f\xa2ǫ\xa1\x82\xa1\xa3\xa0\xa2\xa4\xa1\x92\xa5ʂ\xb1\x85\xa5\xa7\xa4\x8a\xb2\x87\xb4\xa7\x83\x8b\xb3\x89\x96\xa9Χ\xa9\xa6\x98\xabю\xb6\x8c\xaa\xac\xa9\x9e\xad͍\xb8\x93\xba\xad\x88\xad\xaf\xac\x95\xb9\x95\xa1\xb0Я\xb1\xae\xa3\xb2Ә\xbc\x98\xa5\xb5ճ\xb5\xb2\x9b\xbf\x9bµ\x90\xab\xb7ѵ\xb7\xb4\xa3\xbf\x9d\xa2\xc0\xa4\xad\xb9ӷ\xb9\xb6\xb9\xbb\xb8\xb0\xbc֦Ũ\xbb\xbd\xba\xb3\xbeٽ\xbf\xbc\xa8ǫ\xb7\xbfԯƫ\xbf\xc1\xbd\xce\xc0\x9b\xb9\xc1ֲɮ\xc1ÿ\xbb\xc3\xd8\xc2\xc4\xc1\xbd\xc4ڲ̷\xc4\xc6\xc3\xc0\xc8ݻ\xca\xde\xc7\xc9ƻκ\xd9ɝ\xc6\xca\xd9\xc0\xcc\xda\xc7\xcb\xdb\xca\xccɿҾ\xc9\xcd\xdd\xd7ϡ\xcd\xcf\xcc\xc4\xd0\xde\xc8\xd3\xc1\xcc\xd0\xe0\xcf\xd1\xce\xe1ѥ\xd2\xd2\xdd\xc9\xd7\xcb\xd2\xd4\xd1\xcd\xd6\xde\xcc\xda\xce\xe6֪\xcf\xd8\xe0\xd5\xd8\xd4\xd2\xda\xe2\xd8\xda\xd6\xd8\xd9\xe3\xd5\xdc\xd1\xd3\xdc\xe4\xda\xdc\xd9\xe6ݯ\xd8\xdd\xe0\xd5\xdf\xda\xdc\xde\xdb\xdc\xdd\xe7\xda\xdf\xe2\xd7\xe1\xdc\xe0\xde\xe2\xde\xe0\xdd\xf0\xe0\xb3\xdf\xe1\xde\xdc\xe2\xe4\xde\xe3\xe6\xe1\xe3\xdf\xe3\xe5\xe2\xe1\xe6\xe9\xe8\xe5\xea\xe5\xe7\xe4\xe4\xe9\xeb\xe7\xe9\xe6\xf1\xf3\xf0\xfa\xfc\xf9\xfe\xff\xfcŃ\x89%\x00\x00 \x00IDATx^\xed\x9d\x0fX\x14\u05fd\xf7/\u05fc\xf5m\xea\x9d(o\xb9o/)\x04S\xac\xb6Y\xd9摖p\xcd<f\t\xe8\x8d\x18\xb9\x8a \x1aR\xa4&J\xa3VL\x8c\x18b\x1e5ָ\xc1\x10,i@\xafJ\xb34\x06\xb4\xa4P\xe3\x1fb\xc0\x98\bj0&$/)i\xc0\x98\r\x1a\x93\x9a?\xf8\xc8B\xe0\xb4<\xef9gfg\xce\xcc\xce\xec,\b;\xec\xf2\xfb<\x0f\xbbgg\u007fs\xe6\xec\xd9\xf3\xdd\xf3g\x86\xf9\xfeK\xff\xa0A\x00\x00\x8c8\xfe\xc5H\xb8\xfa\x18e\r\x00\x80\xff\x01I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\x00\x18Zz\x8d\x02\x86\x17\x904\x00\f!\xce\xf4\x89\xdc,\xa3\xa0a%\xd8%]6\xcdi\x14b&\x1d\xd3ʌB\x02\x91Q\\\xebS\xa6\xd8+?4\n\x1aV̓tӾ\xa2\x92cb\xfa\xb4\xdd\xe15\xf6\x9b\x8ds\x13s\xfb\xbc\x86h\xf3\x18\xb7\xc6(d\xa8h]\x95\x94\x92w2\xe5K\xf5\xf6Ol\xfc\"\xadx\x81\xc7Ư\xf3\xd8V\xc4a\xa2f\x1c\xd7\bgh\t\xe5\xa6\xf8\x1a\xeb#$\xb35h\r~,\xf0\x12%\x1c\xd8\x1bC_\xeb\xfbyL\xf2\xaaw\x8c\xe2|D\xabև\x86\x06n\x9fQ\xc8pc\x96\xa4]\x95\xf6\xc3-\xc7\xed\xcd\xf4\xc5\xe5\x82C\xc5^\xa3\x1fJ\xa9\xc8O\xba\xe65D\x93\xcd㋌B\x86\x8a\x13I\xbf\xaa\xa8\xce\xe2\xf9\x0f\xd4o\xf4\x9d\xd9h\xd3\xdaA\xc41a\xb3zӕ\"n]U\xd14\xaeJ+^\xe6pz\x98ϱީ\x12\u007f\x11HfN\xe4|\x8c+\xba\xe2-\x9c\x1e\xd8\v\xc3P\xeb\xd7\xf6\xf3{O\xeeϾ\xf3\xa4Q\xa07N\xbe+%5j}h\xa8\xe5j\x8cB\x86\x1b\xb3$]Y\x80\x87fN{\x13}\xe1\xa8l\xf7*\xe9\xaf\xf8r\xd4\xd7\xe5-B\x9b\x96\xd0e\xde\x03:\xe2:\xbc\a\xf8\xccWɹ=\buexJ\x1a\xa1Ro\x92F+\xc2\xda՛Nӟ\xfa\xb8\xc9\x1a\xd1,k\xc2|\x8f\xf5\xca\xedsĄ\x90Y\x15w\xda[\xb4x`]\x86\xa5\xd6[\xf9\x13\xf8\xd71'\xc3(\xce\x1b\xd9k\xe5\xb4F\xad\x0f\t\xb5\xdca\xa3\x90\xe1\xc6$I;\xedo\x92'\xa138]\xe4rz\x95\xf4y\xfe\x88\xb7\xb7uI\x9f\xd8\xe9=\xe0\xb4Q\xe3\xf5\x99¤\xcf\xc8S9\xff\x91\xe7{\xde%\xdd91]\xbdIP\xd6fΠ\xf4\x8c\xa4\rc\xbd\x123\xa4\x92\x1e\x96Z\xa7\x92\xc6\xd5;\x88\x1fv\x89,F\xd2\x1a\xb5>$\x8c^I\x1f.\xe8\x96\xd2W\n\x9a\x91\x17I\xf7\xcc\xe5)O#\xb4\x85\xe7\xabŹ\xe9\x16\xdeV\xf1tFҪ\x8b4\xe6\xfcڹ\xb6\x94܋\xaa=]\x11Rw\xd1<'*t\xe2\f\xe5\x9a\xcd\xe6Ɏ&\xae\xc91\xf9)\x9cn\\\x95f\x9b\x9b\x9bF\xa6\xeb}\u007f\xcaN\xcax\x1a7\x9d\xf7m<\xbf\xe3|~Z\xe2\xaao\xab\xf1\xf1KQ)O\x8e\xaf\x19\x8026\xd1<\xbf(\xc7}u_EvRV\x05\x9d\xfa_\xccKM^+\f\xbc\xa5ݐ\xaa\xbc+\xc2]H\x89\xa0\xacy\xd1\xf4E\xf1\xb4\xf0\xc9K\x88H\xae̙\x18\x1a}w\x03\xdd\xe8\x9c71rN\xba,iu,\xea\\6%\"\xeep\xf4>\x94ɍ/\x96\xa7\xbfr@͌\xe8Ш\x19x7\a'\x10\x83T\x9268\xb0\x1c\xd00\x81\xe3V4ϛ\x14>\x83|\xa9\xeeZWn\x95\x90k\x9d\xa9>\xfcm\x96oJM\xce=OC\xb4\xbeMA\xd2y\xa9$\xcd\xd4dWᢤ\x9c3\xa9ul\xd3P\x04H_\xec\x11\xa1\x15\xf1\xd9b\x86\x9e\xb5\xae\xf9\x81\x94\x9f⩘\xf0\x18\xd2\\t>\x1b\"u7Z%]\xe6h\xdae/>Dk\xd5Q\x89\xbcI\x1a}\xd0X͗66\xe2^\xf0b\xa3\xadT\x9c\x9b\xb6V\xdb\xf8\x94\xd2?$璈\x93I\xd9{O\x94\xe2ѹ\x92\xe3\xd2\f\xb3*\"\xe6\xb1\xca5\xdc\x06\xc5\xdb\xcey\xdc\x14\xee6n\x0e\x1e\x81\xbdsg\xfe+'*\xe6\xf2\xdf\xe2͛\xf8mu\xe5)Y}\xa8\xa7\xba:-\xe3\x9eԧ\xf3\xee\xfc\xb4\xab1\xf9\xb9/ї\xcf%7vi\a\xf4\xb0\aϷ\xed\xa8\xdba\xcbǩ\xf3\xc9\x19\xfb\x8f\xac⩤\xa5\xdd\xd4\xe5=\xe4\xd1\nNs\x0eW\xd32\x8e.ᤏ\xcftl\x8e\x8a\xe9%\xdaK\xaf*\xb9{|-\xde\xd8\x1c1\xb9\xa8l:\x17\xa6\x1b{yR\xd4c\x8eL\x8e{\n9kB\xd7H\xd3_9\xa0\x96\x9b\xb7\xab\xd2\x1e\xc5u\xa3\xceC5\x93\xe3jjj\x9a\xc4\xcc\\\xae}T\xd2F\a\x96\x03\\%\xc5ѓ#\xa2\x97\xcc\xe3\xc8R\xaf\xbb֕[%\xe4Zg\xaa\x8f|\x9bi\xa5\xa5iI\xadH\xe7\xdbl\xe5\xeb\xba>*Ŀ\xab\x88\xad\xc9ki\xc9\xe5uX\xcd\x15l\xd3`\x03\xe4/\xb6\xebLcFNcc\xa3{\x14\xe5Y\xeb\x9a\x1fH\xf1)\xd2\xc3V8V\x84\xcd\xd3\xfdl\xddΪ\xdb#\xafg\xb84$\x98$\xe9\x12{qC{Sq\t\xd6tSQ\xa7wI\xb3\x03o\x1b\xf9N\x85\x81\xac-\x19\xff\x8e\xe7\xa7\xe0TO\xda*\xdc7\xf6T\u007f\xa5\xda\xcd\xc1\xb5\b\tW\xf4\f\x17\xf9\x1e\xd4S\xb8}\xa1\\(]\xa0\xacH!b.Oƍ\xe0U~?N\x9e#\xdd1\x1e\xaa\xf1\x0f]C}d]nS\x1e~\xc8#]\xb1f\xc0'\xccԠ\x8ev('\xf8:\x84r2\xf0O@_\x96M\xb9\x9b\xaa\xbc\xed\xdc.\xa4\xe44\xed6瑤\x83#KM\xb5\xdc\xf3\xa4\xfc\xa4\xb5\xdcFNz\xc6M\xc2\xc9ޘ0\xdd\xd8y\x91dD\xb2\x84#]J\x18Y~\xa6ce&\xe0\xa9(ҿl\x8e\xa4\xc7c\x06\xde\x02\xa7}80\x13\x80s\xe0\xa6_\x11\xe7QR\xad+\xb62H\xb5\xce֯-\xed\x1aQh\xb6\u07b7\xd9J\xbb\xd8|\xf2\x83\xc8\xd4d>i\x03h\x1b\x964\xdb4\x98\x00\xe6\x8bU\x0e\xbc5j]\xef\x03I\xc9}t\f#<j~\xb6Y\xb8꼟\xba\xf1\a&I\xdaQ@*\xa3\xb3\xa8\x16u\x164\xf5\xf6\xf6~X\xec\xed\x92\x1bmI结uZkR\x982w\xe3rpoj\xbcݱ$4\x9a\x9b\x18\xb6\x04\v\xfd\xd3Դm\x15\x1f\xf4ᦄ\xf2\xd2z\xbeŤҁt\x96\xedS1\xf8db\x17\xeaJ:\xa9\x17\xd0c\x93;\x95M\xc29\xabE\x1b\xd15\xda\xd6\xd0\x0e\x9br7UyۅF\xc4p\x9a\xdbp\xd81-\x9c\x94\xfe\xdeI\xaenL4\x99\xf9u<5cR\x04w\x1b\xee\x839;\t[\x11\xa6\x1b\x1bN\xcf\"5\xa9$\xcd\x04\xb4O\x9c\x94i\u007f\x13\t\x83OF\xd2\x1bjkk7\x10I\x1b\x1e\x98\r@1aRwU\xc6H:LщQ\x98Zg\xeb\xd7VH\x1e\xcb\xf9\xaft\xbe\xcdV\xfe\x0f\xe7^\xcdN\xfc\x04\xb15ٗT*\xbc\xa7\x944S\xd5\xcc\x17\xeb!iu\xad\xeb} )\x99~\x1b}\x9a\xa2\x0e\x90\xf8p\x9f}ʨ\xed\xa5\xab\x84\x9fȪ2\xd4bw\xa3\u007fu\x82\xb6\xa4\xa5d9ߣ\xb9\xdba\xf7\xd8j3\xe79oB\xe8\xb1(;\x9e\xd5m\x8e\"c\xd6k\x15k3\xf8\xb9{\xfbH\xc7!@G\xf4Y\xee\x99\x17\xfa6\xf9\b:2\x97\xfc\xd8k\a\x88s\xe9\x1e\xdcA?H\xdfA\xb9ٸ\xa3h$)ZHf7Uyk\xb9CH\t\x9d\xd2^\x1eO\xe4\x13#\xf6\x9b\xb8\x8b\xac\x9d\x18\xbdlW\xcdtܮ\x8e\tgJ\xe4\xe51u\xac\xd8\x05]QI\x9a\xc9\f]\xb6ϙ\xc2E=F\x8f\xa7\xb5<fx`63\x14s\xbbT\xf8\xc3\xf2\x88\x96\xd9*\xc1\xd6:S\xbf\xf4\xdbD\x8d\xfc\xbb:\xdf&\x9dK\v?\x91rM^\x14\xdaE\x97J\xd2\xec7$\u007f\xb1*I{ֺ\xde\a\x92\x92\xd3\xee\xa6O3\xa6\xa9\x02Xj\xb8Z\xcd\xed~\xc4$I\x1f/\xa2\xbdr%\x1e\xa6t81\xa7\x8b\x9c\xfa\x8aVKz\x87J\xd2'\xf8\xf75w\xeb\f\x13\xafx\xa8\xe44/\xc5pѵW\xa2\xf6s\x85dbV\x9dXA~\xe2ߥ|A\"\x98F\xb0-\x17\xe5n#\t\xed\x80\xc2D\xfa\xba\x9a\xff\x12m\x12V\xd9\xd2\xf2\xd17B/\x9doS\xee\xa6*\xef\x9aP\xf5\xd0TPV\x04)\xfd\xbcI\xc7)\xb8S\x9b2\x8d\x14u\x0eVV\a\x95*b\x96\xc7T\xb1\xbdB/}Z\x964\xedX\x99̎\x915\xac+χӌ\xa8\xa4\v>TH\xda\xf0\xc0L\x00\xf3\xa3\xc0Ժb\xab\x8c\\\xebl\xfd\xdah\xddV\xf0\xd7t\xbeMay,\x99|\xe7rM\x8a\xbd\xf4\a\xb2\xa4w\xa8\xaa\x9a\xf9bţ\xed\x17\xc7\x05\x9e\xb5\xae\xf7\x81\xa4d\xfa$\xfa4)]\x15\xc02zW\xbc;\xe8I\xac+\x05\xee\xcb\xc7|\x9dK'\xe1\xf1Y߯T\x92\xeeJ\xc9!?\xec۶\xa9\xf7\x9b3Y\x18\xcewN\x8c#M(s\x89:\xa0=R8;YJ&\xbex껑\xe8\x8dN\x92\v\xf7\x92GF\xd2o%~\x96\xf8\x16Ih\a\b\xe7\xa5\xfbr\xd2ȸ\x9a\x04T\x93,\xb3\xd3\xf0\x8c\xf0\xa3D\x9br7ey{\xa7\xcc@*\x04eM\\Ұ\x06\xcf\xdcJȖ\x15\xb8S\x8b&\x8d\xa87\x86\x8c\xfe\xa6E\xe3v\xd7\xfc\x830\xdd\xd89Q\xa4aΣ\n\f\xc7\xea\xed\xbd\x9d\xc42\x01k\x84\x19a\\&}\x8c\xc3\xdf\x00y\x8f\x91\xb4ၙ\x00e\x03w\u05fan\xb3w\u05faB\xd2s\xbbpŤ\xe5\xa8k\xa7e\x9d0\x8c\x17$\x9d\xb2\xad\xb5\x94\xadɵs\xb1l\xfb\xf2\xa9\xa4\xe5\xa6\xc1\x040_,~Ĺ\u007f)\xbc\xa7U\xebz\x1fHJ:\xe8X\xfdya\xba\f\x92Vs\xac\xe0X\xfb\xe9\xe2]\xdd\xf4E/\xe9\xa5u/?\x10V\xbc\xcfбӃ){K\xb3y\xdb\xfe\xd6\xcf\x1am\x1b\xcf\xf4\xbd\xb3\xd1FV\xc2O&.\xaa\xa8\x13\x16I\x144\x8f\x17\u05f8\xab~0\xe5)G\xa6\xfee\x8e\xa5|R\xe9\xabG6\xf1d\xae\\xg\xde+8Y\x8d\xbe}\x8b\xae\x91~\"\x84\xf4\xa5\xaeJ\x15.I\xd5\x0e\xa8Kzp\xff\x91U\xb638\x99\xc7\x17\xbeZȓ\xf5\xb4֤\xd4\xd2\x1dɤ\xbc\xccn\xaa\xf2n\xf0\x1cB\bW\x15N\x9fA&o˸{K\xcaҹb\xa2\xc29O\xad\x8b\xc1\x83\xe5\xc3\xe8tx\xf4\x9a\x15\x91\xe3'\x145\xe9\xc4:'F?\xb5kV\x18\x95\xf4\xb4\xa8u\xeb\xa6q$V\x91Y\xc4\x1aǮtauzM؆\xb2\xe9\xe1\xedʫnj\x0e,\at\x1f\xa6k\xe6\xee)\xb4X몭\x9e(\xaa\xcf\xc6gWWd$\x93\xf5hE\xed\xcc\xe2\x04\xe9\xb5Rm\xe6\xe4n\xccbk\U000b3534\x8aWr\x13i\xac\xd44\xd8\x00\xf6\x8bſ\xff\xe5G\x1eJ\x12zi\x8dZ\xd7\xfc@\x8aO1o\xfc2Dz\xf1\xf3\xbc}\xb6c\x1e\xe3y\xbfc\x96\xa4QsYѮc\x82\xa2\x91\x93L\xa5\xf5\xfa\xe9\x9ed:1\xb2ѳ\x0f\xe7s\x12\xefY\xb5\x83\xe7\xb7l!\x9b>H\u008f[\xf0\xe6\x8f֦ޓ-\xaf9K\xac\xf8\x81X\xc1\xcds\xa2#\xa6\xa9\x978e\xfe\x94S\x9afK\xc9\x11.7<\x91379\a7\xa0\xf7\x9993\xa6\\Z\x01\xd3\x0eh]\x9547\x97\xae\xec\xf4\x95g%e\x95S\xfd\x9f\xcfMN+\xdco\xa3\x85t\xef\x86\x14\xe5\xad\t\xf7\x18;\x94\xe0\t\x1d\x9e\xe46L\x8e\"\xfd\xc1\xbe\xe9Q\x91qD\xb6\xbd\x1b&\x87E\xdd[49\x14\xf7\xa9\xcdwGNZR4\x81\xcbԉE\x1d\xe9\xd1\xe1ӏQI7DžG\xccX\xc6q\x99l@qܚ\xe8Љq\xe2\xf9\xa6\xcc\xc8\xf0\xb8Z\xf6\x1ao\xbbၙ\x80\x86\xf1t\x0e*u{B\xad\xab\xb7z\xa0\xa8>\xdbӛ\x92S\xf3\xe9\xe5:\x8ao\xb3(\x8a.ȑ\v\x03p\xa7ۚ1\xf7U\xc4\xd6\xe4\x17\x9b\xd2\x12\x1f:G%-5\r6@\xf1\xc5\xf6lKN\xcc9G\x93\x1a\xb5\x8e4?\x90\xf2Sl\xbe-\xfc\xb6\xcd\x1e[Y\x9c\x13\xe648\xcd\xfd\xefJ\xd3$\xed\x1f\x96\x84\x96\x18\x85\x98\xcb\xf3\xa1\xe9\xddF1\x83\xa6S\x98\xfa\xfa\x9dAԺ\xb0<68\xba<\xc7g\x06\fc\xad\x97M\xe1\xe0\x9f+\x87\x95\r\xd1^\x96\xdḑc\xe2:\xa3\x90\xeb\xc0,I\x0f\xa2\xd6\xfd*\xe9\xe1\xadug\xc3@?\xfc\xd0\x12\xec\x92\x1e\u0558&\xe9\x81\xe3WI\a7 \xe9\xe0\xa5y\x1f\xb7\xc4\xf4\xf5W\x9f\xb8H\x17;\x8d\xa2t8_\xc7?\xfd\xd6`w\x0eB@\xd2\xc1K\x1c\xc7q\x13\x9a\x8d\xa2F\x02t\xb1\xf3\x13\xa3(\x1dr\xc8\xce獢F\x0f i\x00\b*@\xd2\x00\x10T\x80\xa4\x01 \xa8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\xb38\x92\xfd\xe5\xf0Z\xb9\x00\xa3\x13\xf3$\xed6\xd0q\x15\xd1\xdb\x14\x15i\xddK(\x88\xd9˗\x92\x8b\x18\x87\xcf\xca\x05\x18\xa5\x98%i\xd9@\xe7\xb2\xfdMr\xab\"s\xff{\xc5\x1f0\xfe-\xe4\xfec\u007f\x12\x12\xc3f\xe5\x02\x8cR̒\xb4l\xa0s\xd9n\xaeџ\xdf`\xfd[\xce\vw\xc4$\f\x97\x95\v0J1IҌ\x81Ψ\x914{\x83\xcaM)]\xee\xe4pY\xb9\x00\xa3\x14\x93$\xcd\x18\xe8\x98(i\r\xa7\x16\xd6\x14GөŇX-7\x1e\xa5\u007fK\xcf=R'\xadm\xe5\x02\x00\x83\xc5$I3\x06:\x97\xed\x958YcB\xb3\xd6rja\\]\xb4\x9dZ\x8cc5\xddx\x94\xfe-\xef\b7\xf8\x16аr\x01\x80Ac\x92\xa4\x19\x03\x9d+4Y\xf2\xbc\xdf5\xad\xe7\xbb#\xb9\xba\xe88\xb5\x18\xc5\xea\xba\xf1\xc8\x03\xef:\xd6\xe0\xd2\xd3\xca\x05\x00\x06\x8fI\x92\x96\rt\x10:M\xc4\xec*\xf2{W\xa5\xe7\xbb#\xb9\xba\xe88\xb5\x18\xc4\xea\xbb\xf1Ȓ>\xc23\xff\xef\xefi\xe5\x02\x00\x83\xc7$I\xcb\x06:nj\xfc\xdeU\xe9\xf9\xeeH\xae.:N-\x06\xb1\xfan<\xb2\xa4\xcf\xf0g\xe4<<\xad\\\x00`\xf0\x98$i\xc6@\xa7\x92\x9a\x17\xa0*\x87\xd7\x1d\x86\x01=\xdf\x1dIz:N-\x06\xb1\xde\xddx\x04\xff\x96.\xf6\xeey\x9eV.\x000xL\x924c\xa0\xe3\xa0\xddsG\x91\x96\xb9䰢\xed\xd4\xc2\xc8Tǩ\xc5(Vύ\x87\xf5oY\x9b!\xdd\xffN\xc3\xca\x05\x00\x06\x8fI\x92f\ft\xda\xed\xfb\x9a?<V\xe0\xf7NZ۩E\xe1\xea\xa2\xed\xd4b\x14\xab\xe9ƃ\x94\xfe-\x1f\xf1\u007fp\x97B\xcb\xca\x05\x00\x06\x8dY\x92f\ft\x9c\x95\xc5E\x8e\xd3F\xf1Á\x86S\x8b\xd2\x14Gө\xc5(VӍ\a)\xfc[\x10z.Q\x9cMk[\xb9\x00\xc0`1Mҁ\xc8\x10\xde\x03\xbeo\x9b\x8dv\xdd\xc3h\xe5\x02\x8cN@\xd2\x03`\b%\x8d\xfa\xcaS\xbf\x18n+\x17`4\x02\x92\x1e\x00C)i\x00\x18\x1e@Ҿ\x03N-@\x00\x00\x92\xf6\x1dpj\x01\x02\x00\x904\x00\x04\x15 i\x00\b*@\xd2\x00\x10T\x80\xa4\x01 \xa8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x04)\xbdF\x01A\nH\x1a\bF\x9c\xe9\x13\xb9YFA\xc1\tHz\xd4A\x9d{\xae\x9f\x91\xed\xfd3e\x8a\xbdҴ;Ϛ\x8by\x92v\x1b\xe8(\x93\xfe\xa52J\xfa7\xed\x8ę\xf0\x19\xa6\x8c\xd5>\xb1\xf1\x8b\x8cb\x10\xb9\xaf\x12\xe6Ό\n\x9f\xafH\xd5\xc9Wt\xee\xe9\x98\x1e\xf9\x98ƻ\x03`\x88\xbd\u007f\x1c\x91\xbe\xff˼\xfb{K\xe78.\xbcY#\xa0\x81ۧ\xb1ut`\x96\xa4e\x03\x1d6\xe9o\x1c\xe1\xd2\x1dϦO|*=\xfc\xb2\xb7\xe0\xe1\xa2\xef\xccF\x9bQ\f櫽\xfc\xfeƺ<\xfe9\xa3@7\xda\xf9\xba\x9d{\x96Lzl\xfcu\x9a\x16\r\xad\xf7\xcf2n\x99Q\x88\x84\xfb{k\xaf\xa9٬y\xcb\xe4Z\xaeFc\xeb\xe8\xc0,I\xcb\x06:l\xd2<:8\xdc<;\x8d\xa2\x86\x89R_$\x8dN\xf0\xadX\xa7[\xd8\xfb\x05\x1b\xa0\x91\xaf\xe4\xdcs\xfb:\x14~\xbd\xcd~H\xbd\u007fVp+\x8cB\xb4\xa8Ց\xb4\xdfo8;b0IҌ\x81\x0e\x934\x91f\xce\xf7aߐ3\x00I\xa3\x9e\xe4-F\x81\x12\x1a\xf9J\xce=\xb7\x15\xb5s\xd7;0\x1aR\xef\x9f5\xdc\x1a\xa3\x10-@\xd2jL\x924c\xa0\xc3$\xfd\xcb\xe5p\x8e\x1b_LR\xae(\x8e\xe2qˠ\xe2iᓗྻa\x02ǭh\x9e7)|F7\x93T\x05\x8b\xb7/j\x8f\x102\xe3\"T]\x98\x86]\x0fB\x17\xf3R\x93\xd7\n\x03dƂG3V\x904\xda2W7\xb6\xaf\";)K\x98l\xeb\xe4+;\xf7\xccX1\xeb6\xfcY&4i\x1f\xcd7#!\xd9\xfbG\xfc\xf0\n\xa4ݘ\xcc\x14\xf9*x\x8c\xa3s{\xed\xea\xcb\xe4B\xedK&\x87\xcf \xdb\xe4\uf360-\xde*\x90\xf4`0\xca\xda\x1b\x8c\x81\x0e\x93\xf43\xc7jj\u0084\x9e\xe1͚\xe7\xb9555\xea\xb9e\xfa\xf8L\xc7樘^\xe4*)\x8e\x9e\x1c\x11\xbdd\x1e\xf7!\x93TE\x8b7\x19t\x15m\x16P9fk\xd9\xf5\xa0\xf3\xc9\x19\xfb\x8f\xac\xe2\xa9\xf4d\v\x1e\xedXQ\xd2\x15|\x97^l\xbemG\xdd\x0e[\xbe~\xbe\x8csϚ\x88\xb0c\xdd3\xe2\x0e\xeb\x1c\xcd7#!\xd9\xfbG\xfc\xf0\n\xa4ݘ\xcc\x14\xf9*\xd8\xccљ\xb9v\xf55\x15O\xe0\xa2\xd6l\x88\xa0\xe7\xa5\xe4\xef\riJ\xba\xdbYu{\xa4Y\x93(\xf31IҌ\x81\x0e\x93\xf4?\xe1\ue9a15\xf0vpE\x88\xb4\x19j\x86\x11\xc3M\xbf\"N\x0f\x98$\x8b\xfbV\xc0\xce\x16\x01\xe5\x0f\x84\xb6]ON\x06\xd6g_\x16\x91\x1ec\xb6\xa3\x1d+J\x9a\x98\xefh\xc7\xd6\xf1'hX\x9d^\xbe\xacs\xcf:Ύ\xae\x84\x93\x0f}\x1dFB\xb2\xf7\x8f|\x1fd\t\xa5{\x90;3E\x92\xc5\xce\t\xfd\xbcv\xf5\xa1\xb0H\xdcCϋ\x12_\x85{\x93\xf4,\xdcǛ8\x8d2\x1b\x93$\xcd\x18\xe8\xb0^:~ǫ\xa4\xef\x9d\xe4\xea\xc6D\xd3\tcL\x98\xd4+3I\rZ87\x8aF\xaei\xd7sM\xd0\xc6\x0e\"=\xc6lG\xdb\xdaG\x94\xf4~\xfe+\x9d\xd8M\xc29\xabE\x1b\xf5\xf2e\x9c{J\xb8\xc8%h\xc3D2y\xb8\x0e#!\xaf\xde?J\xf7 \x9b\xd4+3I\x96\"\xfa\x03\xaaW}(\x8c|\vk\xc2\xc4W^%\xfd\xe1>\xfb\x14\xe8\xa5\a\x83Q\xd6\xde`\ft<\xbdt\xfc\x88WILjm\x8b\x8e\xf6bn\x97\xb7\xcbI-j\x1c\x02\xca\xf5dM\xbb\x9es\xc28\x98.c1f;\xda\xd6>\xa2\xa4\v\x93\xf5b\x1f\x14n?\x9c\x9b\xad\x97\xaf\xec\xdc\xe3\f_R\xf5\x83\x96I\xf4\xd3_\x87\x91\x90W\xef\x1f\xa5{\x90;3E\x92\xe5P\xa4\xa0M\xed\xeaCt\xa8훤15\x9c)=Ĉ\xc0$I3\x06:L\xd2\xffx\x95\xf4\xbcI\xc7)\x1d\xe4E\xcc\x1ci;\x93\xf4\x1dM\xbb\x9eo\x04m\xe4\v\xbd\xa9d\xb6\xa3m\xed#\xaex\xa7\xacՋ\xdd$XZ\xa7\xe5\xeb\xe5+;\xf7\x94\xe1>p֤\x88\xcbB\xbe\x836\x12\xf2\xea\xfd\xe3\xe9\x1e$\xc0$\a\xc0\xc0$\r+ރ\xc2(ko0\x06:L\xd2\xffx\x95\xf4>\xae\x84<\xad\xa0\x17I\x19KZc:ɠmד\x9d\x86g\xb0\x1f%\x12\xe91f;ڱ\x82\xa4\v\x89\x00\xb5c\xeb\xe8\xd6j2\x97\xd6\xce\x17I\xce=\xbb\xb8f\xf4&w/\xea\x8dn\xb9\x0e#!\xc6\xfb\xa7e\x8d\xc7\x191ŁA\xd2~\xc3$I3\x06:lү\xb8\x0e\xd7Ԅ\xa5\xd7\xd4\\q\xafx{\xb4\x82eܽ%e\xe9\\1\xea>\\39\xae\xa6\x864v&\xa9BkїAˮ\a\xb5&\xa5\x96\xeeH\xe6m\xfb[\x15f;Z\xb1\xc2\xd5c\xf9<\xed'\xb5c\xf3\xf8\xc2W\v\xf9<\xfd|%\xe7\x1eg\xf8\x9c]ѓC3ׅ:\xaf\xc3H\x88\xf1\xfe\x99\xc5\xc5!5\xd2nLf\x8a|\x158\"\xbc\x8cӜ5\xa1\xe9\x87\xd1\xf1\xf4\xd0\x1a'\xfb\xbdѫ\xc76\xd7\xd4x\xacm\x1c\x1b\xc5n\xa0fI\x9a1\xd0a\x93\xfe\xa4v\xbc0U\xb6#W$ML\xf0\xb8\x80m\xdf\xf4\xa8ȸ}\b5\b\xa1\xa4\xb13I\x15Z\xa7fY4\xecz\x10:\x9f\x9b\x9cV\xb8\xdfƓ\xebG\x18\xb3\x1d\x8dXz\x8d7\x9f&\x0ey5c\xfbʳ\x92\xb2\xca\xfb\xbc\xe4+9\xf7TN\x8e\xca쬜\x1c\xf9\x94\xce\xd1|1\x12b\xbd\u007f6\x87E!\x0fܻ1\x99)\xf3e\xd9\x17\xe5\xe5\xb2\xecL\\塧\xc3\xf1c&\xf3\xbd\xd1k\xbc\t\x1e\xc3&\xe7\x849\rNS\xae\xd87\x1f\xd3$\r\x98\x83۹\xe7z\x10\x96ǔ\xde?\xb3\xa6\xebE\x9bB\xd9\x14\x0e\xfe\xb9r\xc0\x18e\r\x8cH\x04\xe7\x9e\xeb\x82JZ\xe9\xfd\xb3nĝ\tv6\xa8\xaf\x1c\x1a%\x80\xa4\x81\x01\xe3i$\xd4\x1e\xb5Y3\x12\xf0? i`\xa0\x80\x91Ј\x06$\r\f\x140\x12\x1aр\xa4\x01 \xa8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\x00\b*@\xd2\x00\x10T\x80\xa4\x01 \xa80OҢkNw\xb1]\xa0\x18\x01\x00pݘ%i\xc95\xc7e?\xee\xc4\x1c\xb37\x18\xed\x12\xe8T\x1dG\x000\xec\x98%i\xd95\xe74\xb9ۯ\xab8\xf8\xefBq\xfb`nY\x06\x00\x03\xc4$I\xab]s\x1c\xfe\xbfO\x91\xdf\x19\xd4]\b\x01`\x80\x98$i\x95kN\x93=x\xfe]]\xe9\xb0\xe3\xb6\xe0q\x88\xb7ԉ!7\xdd\x19_\x8cZB\xb9)\x8aX\xd6\"\x86e`.4\x00`\x92\xa4U\xae9%\x95^\xa3\x03\n\x85Îd\xc1\xd3y\x88ޅ\xb0\xa6\x89\xde\x1ao\r\xfeQK\x0fS\xc4*,b\x18\x06\xe6B\x03\x00&IZ\xe9\x9a\xd3b\x1fBS\xd3\x11\x80䰣\xb4\xe0\x91\x06\xde\xec\rle7\x1e\xa5E\x8c\xc8\x00]h\x00\xc0$I+]s*K\xbcG\a\x1a\x92Î҂G[Ғ\x1b\x8f\xd2\"Fd\x80.4\x00`\x92\xa4\x95\xae9E\xa6ܖ\u007f\xf8\x90\x1cvb\xc4\x19\xb4`\xc1\xa3-iɍGy\xf3y\x91\x01\xba\xd0\x00\x80I\x92V\xb8\xe6tؽ\xd9T\x04 \x92x=-x\nH\x9fLŻ\"L\x19\xab-\xe9\xa1u\xa1\x01F\x01&IZ\xe1\x9a\xd3b\xbfl\x10\x1e`H2UX\xf0\xc4\xc5!\xe4\xa4\x1b\u0097!\xd4{\xbbO\x92\x1eZ\x17\x1a`\x14`\x92\xa4\x15\xae9Mv\xf7\xcaw0\xa0pؑ,x\x10Q놲\xe9\xe1d!pZԺuӸ\tEML,k\x11\xc320\x17\x1a\x000KҬkN\x8b\xdbw<(P:\xec\xb8-x0\xae\xcc\xc8\xf08\xba\x1e\xd8\x1c\x17\x1e1c\x19\xc7e2\xb1\xacE\x8c\x82\x01\xb9\xd0\x00\x80i\x92\x06\x00`8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\x00\b*@\xd2\x00\x10T\x80\xa4\x01 \xa8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\xc5(\x96\xf4\x1c.j^\x93Q\x10\x00\x04\x18\xa3X\xd2Ϊ\xa2)Q\x9dFQ\x00\x10X\x98'i\xd1@\a\xa1\xceC\xbb\nv\x1d2E[U\\\xd0{|\x00\xa3\r\xb3$-\x19\xe8\xa0\xcbŻ\x9aڛv\x15\x9bqg\x93Z\xee\xb0Q\b\x00\x04\x16fIZ6Щ)!7B\xe8.\xa91\xdae\x18\x00I\x03A\x87I\x92f\ft*\x85\xbb\x84\x96\x99qw~\x904\x10t\x98$i\xc6@\xa7\xa3\xb8\xaa\xc3\xd5QS\xdc\xe1-~\x98hઌB\x00 \xb00IҬ\x81\x0e\x9eV\xdb\xed\xfbL\xb9\xa3\xa0+jڡ\xf6^\xa3(\x00\b L\x924c\xa0\xe3\xaa,ir6\x95T\x9ab]\xb9\x8f㸻\x8d\x82\x00 \x800IҌ\x81N\r5\xc6r\x95\x98a0\xdd\x195isU\x90\xf9\x02\x00\xa3\x1c\x93$\xcd\x18\xe8\x14Ѕ2\xf4f\x81\xb7\xf8a\xa2\x963cQ\x0e\x00\x86\x11\x93$\xcd\x18舒>n\x8e\xa4a\xc5\x1b\b2L\x924c\xa0S%\x0e\xbc\xcdX{\x06I\x03A\x87I\x92f\ft\\ϗ\x9cn?]\xf2\xbc\x19KއA\xd2@\xb0a\x96\xa4\x19\x03\x1dW\xed\xae\xa2]\xb5\xfeW\xb4\xcby|N\x98Ҁ\n\x00\x02\x1e\xd3$m>\xb38.\xba\xcc(\b\x00\x02\x8cQ,i\xe7\xf1v\xa3\x10\x00\b8F\xb1\xa4\x01 \x18\x01I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\x00\b*@\xd2\x00\x10T\x80\xa4\x01 \xa8\x00I\x03@P\x01\x92\x06\x80\xa0\x02$\r\x00A\x85y\x92\x96\ftz\x1b\xca\nv\x8d\x1c\xbf\xb9\xd6\xdc\xe4䜓Yg\x8c\xe2\x04N\xa4\x1c\xd1\u007f\xb3\x94\xb7\x91w\xeb\x92\xf8R\xed\x80-<_\xad\xfd\x0e\xfa\xc4\xc6/\xd2ykh\t\x88B\x02\xbec\x96\xa4e\x03\x1d\xe4(:\xder\xac\xe0\x98\xd1\x1e~\xe2][\xee+չ\xfa\xadXūI\xaf\xe8\xbf\xf9E^\xd2C\xf8\xe9\xa1ļ/\x94o\x9c|Wx\xbe\xd8h\xd3\xd1\x11\xea;\xb3Ѧ\xf3\xd6\xd0\x12\x10\x85\x04|\xc7,I\xcb\x06:o\x16\x90\x9b\xf27\x17\x98\xe2s\xe7ɪ\x9c>\xdcT7\xfa*i\xd4\xe7\xed\xcd\xc2ܤk\xe8\xab\xc4\xdcB\xd5\xf6\xec\xb5\ue52eZp\xf7\xe9'\xb5\x04D!\x01\x9f1IҌ\x81\x8ec\x1f\xddR<B\xba\xe94ڲ[y/\xe3i\xdf)\xcc{\xa8\x1a\xfdiU\x9eZ-Y#I-\x01QH\xc0gL\x924c\xa0\xb3K\xf0\xb7+s\xe8\x06\x0f\x0f\xef\xdbx~\xc7\xf9\xfc\xb4\xc4U߲\x9b\xf3RZ\xf1c_]\x17y\xfcSvR\xc6\xd3]\x8a\xd8j\x9eǓ\xceR\x9e\fͯ%\xf1\xf2\b\xfd\xfcڹ\xb6\x94܋\xecnX-\x15\xb9(\xb7\x82\xaaE\xdaz\x84\x17\xc8&{\xd9\n\x9f\xceHZE\xf6B}\x15\xd9IY\x15\xb4\u05ff\x98\x97\x9a\xbcV5\xa6m\x8f\xe0\x04\"Twn\x90\x0f,\xa1\xf8lrqPWᢤ\x9c3\xa9u\x8a\xfd\x87\xb2\x90\x80\xf9\x98$i\xc6@\xe7P1\xbdCh\xd1.\xa3}\x86\x98\x9e\xea괌{R\x9fλ\xf3Sv\xf3\xa7i\xfc\xaaҷzhz\x13\xbf\xad\xae<%\xab\x8f\x8d\xedjL~\xeeK\xf4\xe5sɍ\xb8\xe1\x9fklL\x14{\xb0\x93I\xd9{O\x94\xf2\xe5\xecnX-\x17\x93\xbeI\xfc\x8c\xaaE\xda\xdau\xa61#\xa7\xb1\xb1\xf1#\xb2\x9b\x8dϨ>27\x97$\xf3m;\xeav\xd8\xf2q\xea|r\xc6\xfe#\xabx\xa5Z\\E\x9b\x05\x8a\x94\xb7ic\x0e,\xa1\xf8lrq\xae\xa5%\x97\xd7m\xe1\xf9\nE\x06CYH\xc0|L\x924c\xa0\xd3Y\xe4p\xba\x9ce\xf6\x12\xa3}\x86\x9e,\xfe\xa1k\xa8\xef\x9ar\xe3W\xa5\xbf\xb2\xf1ɤ\xef}\x95ߏ\x1f\xcf\t\xfd\xb0\x1c\xbb)\x0f?\xe4m\x12\xc3EI\xf7\xa4\xad\xea!R\xfaJ\xb1[a\x1e\xcaژ\x8d\x88Z\x94\x99\xc9cڔop\x8e)8Uǟ\xc0\x8f'x܅\xe6d\xe0\x9f\x8b\xbe,\x95Z\x9c-\x02\xca; 2\aV \x95\x979p~2\xe9i\xb7yHz\b\v\t\x98\x8eI\x92f\ftP\x87\xc3n\xb7\x1fv\x98pg\xbf,\x9b\xa2\x83\x96\xe89\xb1\x8a4ڼ\xb4\x9eo1\xa9\x9b\x94\xb1'\x13\xbbPW\xd2I\xf1\x95(\xe9:\xfe\x03\xf7\xde\xccnX-{\xf9\xbdT-\xca\xccd\xb5\x90\xd7tB\xbaI8\x1d\xb4h#\xba&hn\x87R--\x9c\x1b\x85\xe3\x0fs`\x05Ry\xe5\x03\xf7%Ѳ\xb6zJz\xc8\n\t\x98\x8fI\x92f\ft0\xae\x8e^Tl\x82'VV\xb6\xe7\xb6s\u0094\xf1\xc1\\\xd2\xd1\t\xe4*c\xbfM>\x82\x8e\xccu\xaft\x8b\x92.\xe7{\xdc\xef3\xbba\xb5|Q\xf8%U\x8b23\xe5\xca\x13U˃\xf4\x1d\x94\x9b\x8d{\xc9F\x84<W\x9ej\x1c\x025\x8a\xad́\x15H\xe5\x95\x0f|QX\xf3\xeb\xf2\x94\xf4\xd0\x15\x120\x1d\x93$\xcd\x18\xe8 \xbaP\xd6l7\xe1\x8e\xdar\xa3\x95I\xd9F\x9f\n3H\x9f\xf5.\xe5\vU\xec\xb6\\\x94\xbb\xcd\xfdB\x94\xf4\t\xfe}\xf7\x16f\xb7\xc2<aK\xa1Vf\xfbI7*\xabeS\x1a\xf9\x95\xe8K\xcbG\xdf\xf0\xe5\xbd\x1dW\\\xf9>\xa9\x859\xb0\x02\xa9\xbc\xf2\x81\xc5^\xfa\x03OIӸ\x81\x16\x92\xe6\xe2[!\x01?b\x92\xa4\x19\x03\x9d&\"\xe6+\xc5f\xf8簒nY'\x8cg禒Yi\x1fy\xeb\x840\xa7,ܫ\x8a}+\xf1\xb3ķ\xdc/DIw\xa5\xe4\x90\xder\xdb6\xc5n\x8cZ\x14\x99\xe5\xe4 \xf4%\xdd \xab\xa5\x8e\xbe\xae&#\xfe\xec\xff\xfaј1?\xfa\xb9Oja\x0e\x8c\xe4O\xc1\x94\x979\xf0ڹX\xab}\xf9\xa2\xa4ݱ\x83-d\x1a\xae\xa8\x8f\x12}*$\xe0GL\x924c\xa0\xd3l\xafm\u007f\xb3\xd8\xe1w\xb7\x8doߢk\xba\x9f\x88/gq3\xe8\xf3\\>\xa5\xb4\xee\xc8CId\xa9\xb7\xf0μW\x8el\u00adX\x19ۗ\xba*\x95\x8e\xbb{\xce46&nll$\x8bf'\x13\x17U\xd4\t+O\xd2n\xdf\xe4\xe5|\x86_\u007f\x96\x93\xf7\r\xb3\x15\x11y\x94\xe3C|\x8a>k\xb4m<\xd3\xf7\xceF[#\x8e\xcb\xe3\v_-䉾\xde\xff?\xdf).\x18\xf3\u007f\xff\xb3\xa2\x15\x19\xc3\x1cX\xfa\x14\x8a\xf2\xca\a\xfe,%\xad\xe2\x95\xdcDe\xec`\vٚ\x94Z\xba#\x99\xb7\xed\xf7\xa5\x90\x80\xff0KҌ\x81\xce\xf1\x92\"\xc7q\xa3\xf0\xa1\xe7}fڈ)\x8a\xb2\xd3\xe7_U\x14.JJɥ'oЉ\x9c\xb9\xc99u\x1e\xb1\xe56\xe1\x94\xd1;\xe2ԓJ䣵\xa9\xf7d\x1fQ\xecV\xca\xf3dai#O/\x9fvo\xc5\xf4lKN\xcc9G/\x9f\xe6m\x1f\x90\xb3\xdb[\xf0/EyVRV9\xf9\xadp\xfdpV\u007f\u007f\xe4\x8f~N\xb6\x1a\xc3\x1c\xd8\xfd)\x94\xe5\x95\x0f\xfcŦ\xb4ćΉ\x92\x16c\a[Ht>79\xadp\xbfͷB\x02~\xc34I\x03\xfatF\xce\xc1\x92\xbe\xadyxF.\xea\xe51 \xb8\x00I\x8f@\xa8\xa4#nk\x02I\x03\x03\a$\xad\x84\x1f\t\xfc\xe7\xffƒ\xfe\xe1\xff\xfa\xb7\u007f\xfb\xf9p\x88\x1a$\x1d܀\xa4\x95\x18\xa9\xcd/PIG|\xe7\x87\xdf\xfdN\xc3.\xc7\xe5n4\xa4\x9c\xaf\xe3\x9f~\xcb\xeb\xff\x8f\x01\x01\rHz\x04B\a\xde\x13;\xfa\xbbC0\xa1\x87\xdb;\x87R\xd59\xf87\xc3v\xde(\n\bX@\xd2#\x8f\xde+D\xd2w\xe3*\xfe\xde,W\xf3ؐ\x90\xef\xd9;{\x8dv\x02\x00\x01\x90\xf4\x88\xa3%.f,\x96\xf4f\\\xc5ӛ\xfa\xfbӗ\x1c\x8a\v\x99\xde\x01\x9a\x06|\x03$=\xd2pE|\xef\xf6\x1b\xb0\xa4kq\x15/\xfb\a\x96\xb6\xb3\xbf\u007fF\xf80\x9d\xd0\x02\x82\x0f\x90\xf4H\xa3!\xe4p\u007f8\x964\xc2U|\f\xff\x1d\xc6\u007fs\xc2\x1aF\xc8}\x9c\x80\x11\x0fHz\x84ѻ!\xe4\x1f\xfdd.M\xf8\xa7\xf8\a\x92\x06|\x06$=\xc2\xe8\xce\xfc^\u007f\xff\xc49\xfd\xbd\xae\u007f\xf6w\xe3?\x17\xfe\x03I\x03\xbe\x03\x92\x1ea\xb8\xe6\x85\xf5\xf7\xc7d\xfe\xf3\x1f\xfd\xc7\xff\xf1\xcf\xfe\x86\xde\xfe\xfe&\x9040\x00@\xd2#\f\u05ecHZ\xbb\x9b\x1fs\xf6oXw\xa5\u007f\xdd:\x04\x92\x06\x06\x00Hz\x84\xe1\x9a\x1e\xfdO\x0f@ҀϘ#\xe9\xeeb\xbb@1y\xe5,+\xdag\xc2=MF&\xaei\x93\xff\xe1\xc1,\x904\xe0+\xe6H\x94>:\xac\x00\x00\f\bIDAT\xdae?\xee\xc4\x1c\xb37\xe0\x17\xed\x055\xcd5\x05\xaa\x9bS\x8fZ\\\xd3&zn\x8c\x8e\x02I\x03>b\x8e\xa4\xd1iz\xefnz\v\xc1^\xfax\xa8\x18.\x8f\xa2\xb8\x96\x8d\xa9\xb9\xa2bWȽ\xa7AҀo\x98$i\x8a\x83ܧ\b5\x15Py\x17\x8c\x1c\xefJS\xe9m\n\r\xb9Ổ\xb1\x84\x1b0!?(iq\xa1\x90\x00\xc5\xe8\x13\x03C\x8b\x89\x92n\x12n\nZ)xb9̸\x9f\xe0H\xc4uzŬ\xe9230\x99\x8e\x86˽(\xe4j@\x02\x92\xf63&J\xba\xa4\x92>\xed\x12n\xe0}Ȅ[\xf3\x8fL\\Ζ&\x05\xcd-N\xf2\x9fX i\xc0\x17̓t\x8b]X\x11+\xae\xa5O\xb5\xc5ނG\x17\xdd.%\xddt\x9d\x01$\r\xf8\x82y\x92\xae\x14M\xb0D\xe7\xca*\u007f\xdb\xdc\x05\x1c i\xc0\x17̓t\x91h(M\x1d7\x10*\x83\xb9\xb4\x01D\xd2O\x8eŏ\xac\xb6C<\x12\xde\xf0)HB/Z7\x17\xcd7@\xd2~\xc64Iw\xd8E_\x88&;q\xbc\xbbb\x87\x15o\x03\x88`\xc6\xfd\xf9\xaawI\u007f~\xdfMcn\xf8\xe9\xee\xab\xdahi.\xe4\x16\xe1\xf9\x16\x8fl}\x94t\x88F\x8a}\xdb\xe8s\x01C\x8bi\x92n\xb1_\x16\x12\xbd\xd4;\xa7\n\xceK\x1b\x11\xa2%\x1a\xb5\xa4\u007f\xf1\xb3\xd7?\u007f\xfb\xc9[\xd5a^\b\xb9\x89\xfe\x00\xec\xbe\xe9\xfa%\xad\tH\xdaϘ&\xe9&\xbb\xfb>\x1d\xed\x05U-Up\xf5\x98!d\xc8-\x80\x85\xf2\xcc\u007f\x8c\x19w\x9f\xa8\xa7G\xc7\xfd\xeb\xb8߈\xc2\x1a\xf37\xb7\x94\xa4\x88\an\f\x19{\x01'.\x8c}\x9b\xeey\xf3\x98\x1b\x1fe\xdf\u007f\xfc\xc7$\xfcǏ3\xd9\nG\ty\xfc\xe61c\u007fA2\xfc\r9\xc2Uա^\xff\xe9\xd817?\xee\x8e\xc5G!\x85a\xf6\xb9Q\b\x05I\xfb\x19\xd3$\xdd\"/\x879\xf7\x15\x94\xc15ކH\xbd4~x\xf1\xdf_\xbc\xf0\xfa\x8f\xef\xa3\xe9\xdf߸\xfb\xc2\xee\x1bE\x9d\x8d{QT\xb4\x1cq\xeb\xdbW\u007f\xf28\xde\xf2\xf8Oh\xf4w\x9f\xb9\xf0\xfa/\x149܄G\xf3\u007f\xfe\xbe:[\xda\u007f_x\xfbg?\xc3B\xbfq\xf7\xe7\xbbo|Fu\xa8\x9b\x1f\xf8\xdb\xe7/\xfe\xc4\x1d\x8b\x8fB%\xcd\xec#\x84\x82\xa4\xfd\x8ci\x92\x06\x06\n+\xe9[ɜ\xfa\xedqB\x1ak\xed\xea3\xa2Ξ\x19\xfb\xd3\a\xa8\xaa\xe5\b\x9c\xa0#\xf1[\x9f$ѷ<)\x0429<\x8e\x15\xf8\xb3'\xd5\xd9\n{^\xfd\u007fc\xf1>\xf4\b\xb7\xa8\x0eu\xc3\xdb³\x1c\x1b\xc2\xec#\x85\x82\xa4\xfd\fH:``%=\xd6=\x02'i2\xcc\xfd\x9b\xa8\xb3\xab\u007f{\xf4\xae\x9bIW-G|~\xf5\xea\xe7c\u07fe\xfa\xf6\xd8\xcfI\xb4{d\xce\xe6\xf0\xfd\xd7_\xff\xbeG\xb6\xe2\x03y\xbc\x81\x1e\xe1\x06ա\xfe{\xec]\x8f\xbe-\x95\xe9sQ\xd2\xca}@\xd2\xfe\a$\x1d0\xb0\x92\x1e#\xf6\x90\n\xf1H<\xfe}e\xc4իw\xddw\xf5\xbe\xbb\xe4\x1f\x80\xab\xca\xf7\x9f\xbc\xeb\xae'=\xb2Ւ\xb4\xf2P\u007f~\xe0\xa77<\xc0Ƃ\xa4G\x02 送\x95\xf4-\xbf\x91\xb5\xa7\x18\rS\x88\xfa\xd8\b<I\xbe\xe9\xeaM/\n\xd1\xe2\xc0[\xf1\xfe\xcd7_\xf5Ȗ\x91\xa7\xf6\xc0\x9b\xf0\xfa\rz\x92\x86\x81\xb7Y\x80\xa4\x03\x06Vһ\xc7>\xfa\xb7\v\xbb\u007fLӊ5\xab[\x9f|\xfb\xf3\xd7\u007f\xf6\ve\x04\xe6\xa6\an\x12\xf7\xbc\xf1\xf7tyL\xf5\xbe*\xdbq\xbfw\x1f\x8c<\nK]\xea\xe5\xb1\x1f\xff\xfe\u0085\xdf\xdc\xccƲ\x92~f\x1c\x0e\x1d\a\x92\xf6? 送\x95\xf4\xd5ݷ\x8e\x19s\xebn!\xfd\xe8\x8d\xf2\x99\xa5\xdd?\xbda̸\xff\xbe\xa0\x8a\xb8z\xf5\xbe\u007fu\x9f\xf2z\xe6?\x84\x93X\xca\xf7U\xd9>3.$D\x96\xe7\xd5ߌ\v\x11Ob1\x87\xfa\xfd\xadc\xc6\xfe\xe4u6\x96\x954=\x89\xf5\xc0\x18\x90\xb4\xdf\x01I\a\f\x92\xf6\x02\a<\xde\aI\xfb\x1b\x90t\xc0\x10`\x92\xfeş/\xbc\xf8\xef\x0f\x80\xa4\xfd\x0eH:`\b0I?\xfa\xfd17aE\x83\xa4\xfd\rH:`\b0I\xbb\x01I\xfb\x19\x90t\xc0\x00\x92\x06|\x01$\x1d0\x84\x04(F\x9f\v\x18Z@\xd2\x00\x10T\x80\xa4W\xaf\xd6J\x02@\x80b\x8e\xa4\x95\x06:\bU\x99wK\x93\xbfZ\x9e\xd0H\xbayقI\xc0\x89\xf7~\x19\x1f\xbb\xf0\xe8\xfc7pr\xeb\xcc;\xa6\xde1s;B\xf5\x16\xcbB\x84\x0e\xe0\x88\xa3\xea\xfd\x86\x89\xa3\xf1\u007f\x91\xd2mS-\xb3\xbd\x84z\xe7a\x8b\xe5\x80Q̀\x18\xba\x8aZ\x8dìmFQ\x80.\xe6HZa\xa0\x83\x90\xd3^k\xb0\xc3\xf0\xb1\xd2zI#\xe9\xc6\xf5F}\xec\xf2\xf7\x10:;u遗\x96S\x1d\x1c\xb5\xfcr\xcf\xc1\x17\x96Z\xea\x91\xeb\xa8Ŋ\x1f\x0fX\x8e\xba\xd0\x10s\xf4\xac\xe6\xe6\x83VF\x88\xa7V[5\x83|\xe1R\xfd\xd4\xedF1\x03b\xe8*\xea\xe3\xfa\xfa\xff\xb1\xbca\x14\x05\xe8b\x8e\xa4Y\x03\x1d\xac\xe8\x12\xf3$\xddfY\xaf\x91d\x89']\xf7\xe2\xc5$\xb9\x9a\xb4\xd4\xf5\xb1\xb4\xec\xb18\xd8eY\xb9\x9a\xec\xe7CC\x1d \xf3\x97\x1bE`\xb6\x0f^\xd2\bY\x87V\xd2h(+\xea\x14H\xfa:0I\xd2\x14\xc1@\aU٫\nL\x93\xf4j\xb9g^\xed\xd9I\x13hKM\xd8J\x92\uf456\xbax\x01ݼ`1i\xa9Gq\xb3\xf5\xb9\xa5\x0e\x80\x80\x95\xf4\x90T\x14H\xfaz0QҢ\x81\x0er\xb9ܷ\xe7\xf7?mS\xd7k$\x15Ж\xba<\xfe=\x92>\x88\xdb\xe4BAm\xcb\x17\x92\x96\xda6\xff\x80\xba\xa5\x9e\x9dj\xb1lm[\x99`\xbd\x9f\xdc \xf1\xa5\x85֙\xeb\xe9\xfb\xae'f\xc7.|#\xe1 z\xc4byI\x9e\t\xcb\x01\xf5\x8b\x13\xa6\xc6\xff\x12\xcfG\xffb\x11\x98\x8f\x14|m\xb5\x90=)\x97V\xc6\xc7.\xf7\x1cx\xb7-\x8f\xc7Y\xe0_\xa6N\x9cHXJF\xef\x8fX\xa6\xeeY?Ӻ\xf8cU\xa8u\xfd\xea\xf8;\x96\xb6Ѵ\\\x06\x19\xcd\x1c\x0e\xe2\x12\xfc\x16m\xb7h\xce\xc4\aZQdn\xbd]\xccL>\x1aA\x94\xb4^E!\xf4B\xfc\x1e\x04\xe8`\xa2\xa4E\x03\x1d\x82i\x92^=\xf5c\x8d\xa4\x02\xdaR?N\xb0ܿ\xfd\x14\x1dT\xcc\xff5\xdd\xfc\xeb\xf9\xb4\xa5\xee\xfc\xa5\xba\xa5\xba\x0e\xbc\x94036a\xfdJ\xcb\xc7d\x04\xba\xfe\xe0\xce\xf8\xf9X\xdc_'\xc4\xef<\xf8\xb0ŲG\x9cNJ3a9\xe0\xace偣{\xe2-\xbdd^:sa}}}\x9b\xaa$g\xeb\xebž\xb5-v\xe6\v\u007fYlQK\xfa\xb5\xd8\xf9\xbf;\xbaݲ\x93ho\xf5k\a\x96ZN!\xf4ח\xa6Z\xe2\xb7\xef\x8cUw\xfbV\xcb\xfc\x97^\x9ao%\x02\x94\xcb\xc0\xa0\x99\x83덄\x87/\xa1K[c\xeb5\xfa\xdb\x01WT}\xecVwf\xf2\xd1\b\xa2\xa4u*\n\xb3\xdcr?\x02t0O\xd2n\x03\x1d\x82Y\x92\xfex\xea\xc3\x1aI%\xb4\xa5\xa2\xaf\x9f]0\xd5\x12K\xfa\xa6\xd9+\xe9敳iK\xbdd\xbd\xe49\x9e\x9coY܉\xfb9\xa2\x8b?\"\xd2Bqߺ2\x96\f\xeb\xd7[H\xf7B\x85I\x87\xcdL\xc0\x9ex\xd2\\\xff'V\xc8Ag\xe0-Jz\xe1L|\xc8\xde\xf9*I\xbb\x12\xeeǛ\xbb\x0f|M~WH\x99\x84\\\xac\xb1\xf8\xb7ee\xbc:\xa7\xd98\xc25s\x81\xa2\flf\xda9l'C\x87\x95\x9a'\xfb\x06^Q\xabI\xee\xbf&\x99\xb1Gc\x06ޚ\x15\x85i{\xb6\r\x01:\x98'i\xb7\x81\x0e\xc1,I?2\xb5M#\xa9$\xde}f\xcbu\xf4~\xcbA\xa9\xf3Y.t>\xe8\x97;5$m\x15;\xfc\xe5\tݽ\x98\x04\xdcj\xadt\x92\xf9W\x95\xa4\x99\x80\x8f\xe3\x13\x1e\xd9s\x16u\v9x\x95\xf4\xd74\x17\xb4U%\xe9\x83\x16y\x9d\xfc\xef{\xeeO\x88\x15\x86\xeeV\xa2\x19\x8fy\xb7\xf5\xb7\xe4q\x8f\xe5k\xb6\f,\xda9|ly\x0f\xb9b5\xcfE\r\xbc\xa2^\xb3\xba\x90\xcbZO\x92\xcc\xd14%\xadSH\xc0\x13\xf3$\xed6\xd0!\x98$\xe9K\xd6\xd5\x1aI\x15\xb4\xa5\x9e\x12V\xce\x16.\x15\xfe0K\x85)\":0_C\xd2\xeeY\xf0|qV\xbc\x1cK\x81\xce>]*I\xcb\x01X\xa8{\x96϶\xc4\xffN\xd8ѫ\xa4\xcfZ\xa8\f\xd42\xdd)\x17\xe4T|\xc2\x13\a\xea\x17ϗ\xf6\xf1\x944ͩ\x1e\xff\n\xb0e\x90\xd1\xcb\xe1\xfe'\xd0\xd1\xd8n\xa4\xc1\xc0+\xaa7\xfe\x00z\x99\x0eNأiJZ\xbb\x90\x80\x06\xa6IZ2\xd0!\x98$\xe9\xf5\xb8\xa5y&%z\xe9&\xdaR\xe3\x1f\xa1[\xb6\xceDHlw\xf3\x17\v-\xd5e=\xea)iw\xc3[\x99p\x96\xf2w\xd4+H\xe8=YҴ\x8f\x95\x03\xd0Yr\x9c\xaf_\xb2\xee\x91rx\xc1sr/\xe4\xf2w\xa1\x97V/\x8f\x1d\x95{\xe9\xd9\vH\x99\x96{\x934]\f|\xc1\xd2ɖ\x81A/\x87\xbf\xc4w{\\d7\xe8\x8aZ\xbf\x1c-\xa7\xe5`\x8f\xa6\x96\xb4\xba\xa2\x00\xef\x98&i\xc9@\x87`\x8e\xa4\x8d:\xe9=\xa43\xfc;YmB\xf1\t_\x93-Di\xe2\xe9V\xb2\x03i\xa9h\xf5\xaf\xf5%}T蛷>K\x96\x82Ik\\)H\x1a7\xfe\xde\x05Ve\xc0v\xe1Ҫ\x85tJ\xbf\x10wm\x974\x96\x95Ź\xf4\x02R\x9c6\xabJ\xa6\xae\xf8\x85\xa4\xfb\\\x8fE\x92@J\xd0;ߛ\xa4\x13ȼ{\xf6BE\x19\x18\xf4r\xe8\x8e\xff\xcb\x1d\xeaq\xf7\xa0+\xea\x94\xf5\x92\x95.\x89\xb1Gc%\xadUQ\x98\xb6\xedm\b\xd0\xc14I\xcb\x06:.\xa7\xb3\xa8\xcai\x82\xdd\xc6\x13r\xcf\xfc\x84F'M.\u007f:\xf0\xc7\x05\U00064bcc\xb7\xc4o=z`1\xb9P\xf1\xa8\xe5\xfe\x97\xeb_^ly\x99\\\x14u\xc0\x85\xea\xadʖ\xda{\x8a\xaeW\v\xf9=a\xf9\xf5\x81\x97W\x93E\x9dK\xf1\t{\x0e,\xb7RI/\x8c\xffݳ\v,S\xff\xf8\x1e\x1b\xb0\xdd\x12\xbb\xf5\xe0\x81Ֆ\xd7\xc8~ۭ;_^lU\xf6\xd2\xddo\xd4\xd7[W\xd7\xd7w\xe2\xceޚ\xb0}\xeb\x1dB\x0e\fG\xad\xb3\xf7\x1c\\oy\x81d\xb6|ϳ\xf3\xf10\xfeԥ\xfa\xa9\xabO\xa1\xb3\xab\xa7\xd6+Ϻ[-\xf7\x9f:\xba0\xb6\r\xb1e`\xd0\xcdቄX\xb5}\xd9\xe0*\x8a\x10\xbfXX\xb6\x93\x8f&\\=\xb6\xb3\xbe\x9e\xe4\xa6YQ\x98\xa5\xe4\x02S@\x1b\xd3$-\x1b\xe8\x1c\x13.\xf7\xbe\xe2-z8\xb8d]\xa9\x91d90\xdf\x1a\xbb\x94\xaaf\xc1\v[g[\xe3\x85Ӹ[g\xc6Zbɥ˯\xd1S\xaa\xbd\v\xe2\x15M\xfc\xac0\xe9\x13&\x92\xe8\xe8\xe2\xf8\u0605\aI\xea\xef\xab\x13\xac\x8b\xcfRI\xb7-\xb4\xc6.\xfe\xad\xc5\xf20\x1b\xf0\xd2\xc2\xed\tS\xe3\x17\xbeFws\xad\xbfú\xf0\x14R f,\xe4\xb0\xf4\x8e\x84'\xfe8բZ\xa5o[\x9e\x10\xbb\x80tg\xbd;gZ㗿0s\xea\u0087\xf1\x1eS\xdf#\xa7\xb4\x95\xb1\xb3\xb7/\x8f\x8d_)\xc8\\.\xa4\x8cn\x0em\x16\xcf\x01͠*\x8a\xb0Ӻ\x93>\xcbG\xa3\xd7x\xbbg͚\x15EwS/\xe0\x03\x12\xa6I\xda|~k\xf9\xabFrx\x11\x96\xc7\x02\x1a\x97\xf55\xa3\x90\xe1g\xe9b\xa3\x88\xd1\xcb(\x96\xb4\x19\xffU\x19\x04\x92>\xe0\xd9\xd7\xfa\x9dg-\xaa1\x05 3\x8a%m\x06\x81.\xe9\xed\xaf\xa1\xc5[\x8d\x82\x86\x9d\x8f\xe3w\x1a\x85\x8cb@\xd2\xfe\xa4\xed\xa8e\xbdj\x86\x1cP\xb8,\xf3\x1f\x89\xff\xda(\n0\x15\x90\xb4?YHV\x9aڌ\xa2F0[c\x17\xb7\x19\xc5\x00\xe6\x02\x92\x06\x80\xa0\x02$\r\x00A\x05H\x1a\x00\x82\n\x904\x00\x04\x15 i\x00\b*\xfe?\xb6^u\v\xa5[\x1f\x81\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/ident-func.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x03\xd2\x00\x00\x00\xda\b\x03\x00\x00\x00}\xf6\x8a\x1c\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\x01\x04\x00\x02\x05\x01\n\x03\x01\x05\b\x03\t\f\b\t\x0f\x11\x0e\x10\f\x10\x12\x0f\x13\x15\x12\x15\x16\x14\x0f\x17&\x19\x18\x11\x1a\x1a\x13\x1a\x1c\x19\x1c\x1c\x16\x13\x1e7 \x1f\x19!# $$\x1d#$\"$%#'(&)(\"+)\x1e\x14+N++$*,)/-\"-.,.2402/63(241:7+685;9-:;9?<0=?=C@4AB@CEBGE8KH<MI8HIG\x00f\x00\x00i\x01JLI\x00j\x02SN=MOL\x05m\x051S\x96WRAQSP\fo\t\x0fq\vUVT\fr\x175[\xa4XZW,`\xae7]\xad\x15w\x1cb]K\\^[9a\xab\x19y\x1e;c\xad=d\xae`b_)z!?f\xb0)|*Bh\xb3egdLi\xafDl\xb0qjRikh/\x82/Ho\xb3/\x859Jq\xb6mol;\x86:Ut\xb4Xv\xb6?\x8a>|u]tvsB\x8c@@\x8dG\\z\xbby{x]~\xb7e|\xb8\x84|dK\x90J_\x80\xba}\u007f|O\x93Nb\x83\xbd\x8b\x81cN\x95Ud\x85\xbf\x81\x83\x80W\x95Vl\x87\xbc\x8f\x86hZ\x98Yo\x89\xbe\\\x9a[\x87\x89\x86\x93\x89k^\x9d]\\\x9dds\x8dË\x8d\x8a\x96\x8doz\x8e\xbfe\x9ef\x8d\x8f\x8c|\x90\xc1\x9b\x91s\x90\x92\x8fi\xa2i~\x93\xc4x\x95Ā\x94œ\x94\x91{\x98\xc7s\xa4l\xa0\x96xq\xa5s\x97\x99\x96\x83\x9bţ\x99{\x99\x9b\x98u\xaaw\xa7\x9d~\x87\x9fɜ\x9e\x9b\u007f\xabz\x89\xa1˫\xa0\x82\x9f\xa1\x9e\x8f\xa2ǡ\xa3\xa0\xa2\xa4\xa1\x92\xa5ʂ\xb1\x85\xa5\xa7\xa4\x94\xa8ͳ\xa7\x82\x8b\xb3\x89\xa7\xa9\xa6\x96\xaa϶\xa9\x84\x8e\xb6\x8c\x9d\xac̪\xac\xa9\x8d\xb8\x93\xba\xad\x88\x9f\xafέ\xaf\xac\xa1\xb1ѯ\xb1\xae\x97\xbb\x97\xc0\xb3\x8e\xa5\xb4Ԛ\xbe\x9a\xb3\xb5\xb2\xab\xb7ѵ\xb7\xb4\xa3\xbf\x9d\xa2\xc0\xa4Ÿ\x93\xb7\xb9\xb6\xae\xbaԹ\xbb\xb8\xb0\xbc֦Ũ\xbb\xbd\xba\xb2\xbdض\xbeӽ\xbf\xbc\xa8ǫ\xafƫ\xcd\xc0\x9a\xb9\xc0տ\xc1\xbe\xba\xc2ײɮ\xc2\xc4\xc1\xbc\xc4ٲ̷\xd2Š\xc4\xc6\xc3\xd5ƚ\xc0\xc8ݻ\xca\xde\xc7\xc9ƻκ\xd8ɝ\xc0\xcc\xda\xc7\xcb\xdb\xca\xccɿҾ\xc9\xcd\xdd\xd7ϡ\xcd\xcf\xcc\xc4\xd0\xde\xdfϣ\xc8\xd3\xc1\xcc\xd0\xe0\xcf\xd1\xce\xe1Ҧ\xc9\xd7\xcb\xd2\xd4\xd1\xd2\xd3\xdd\xdf֨\xcd\xd6\xde\xcc\xda\xce\xe6֪\xd6\xd8\xd5\xd0\xd9\xe1\xd8\xd9\xe3\xd5\xdc\xd1\xd3\xdc\xe4\xda\xdc\xd9\xe6ݯ\xecܰ\xd5\xdf\xda\xdc\xdc\xe7\xdc\xde\xdb\xda\xdf\xe2\xd7\xe1\xdc\xe0\xde\xe2\xde\xe0\xdd\xf0\xe0\xb3\xdf\xe1\xde\xdd\xe3\xe5\xe1\xe3\xdf\xe3\xe5\xe2\xe1\xe6\xe9\xe8\xe5\xea\xe5\xe7\xe4\xe4\xe9\xeb\xe7\xe9\xe6\xf1\xf3\xf0\xfa\xfc\xf9\xfe\xff\xfcd\x82\x05\xe8\x00\x00 \x00IDATx^\xed\x9d\x0fT\x14\xd7\xdd\xf7\x1fZ\xf3\xc6\xe6M\xda\xd7Q\xf6\xe9S\xe2K\xa9%F\xdbd\x95x\xdeJ\xa0fN\\@\x13\x90*\x82Ę*M\xa2\xb4Q⟜h0\xc4\x1c\xff\xb4.\xc1@\f\th\"I\xa4\xc1\x83A\xa4V\xadx\fA\x03\x96'\xc1D\x92\x87\xa4\xa6nj$QL#\t\x1c\x16\x02\xb7\xf5\xbc\xf7ޙ\x9d\xb93;\xb3\xb3\xc0\xee\x0e\f\xbf\xcf\xd1ݻw\u007f\xf7\xcfܹ\u07fd\u007ff\x98\xdf\u007f\\\x1b<\b\x00\x80\xe1\xc6\u007f\x18\xe9\xd6\aFy\x03\x00\x10r@\xd2\x00`)@\xd2\x00`)@\xd2\x00`)@\xd2\x00\x10`\xfa\x8c\f\x82\nH\x1a\x00\x02\x89+c\x127\xc7\xc8(\x98X^\xd2e3یL̤}f\x99\x91\xc9Hd\x14\xb7\xfaԩ\xce\xcaO\x8c\x8c\x82\x89\x89\x92n\xdeWTrB\f79\xcb}\xda~\xb3y^bN\xbfO\x13m\x9e\xe4\xd6\x19\x99\x04\x8as9I\xa9\xb9\xa7R\xbfR\xc7\u007f\xee\xe0\xefӲ\x17xr\xc2\x06\xaf\xb8\"\x0e\x135\xfb\xa4\x869Ck87\xd5_[?!\x99\xadC\xeb\xf0k\x81\x0f+\xa1`_\x04\xbeիxLr\xce\xfbFv~\xa2\xd5ꁡ\x81\xdbgd\x12dL\x93\xb4\xbb\xd2y\xb4\xf5\xa4\xb3\x85~h/8\\\xec\xd3\xfa\x91Ԋ\xbc\xa4\x0e\x9f&\x9al\x9dPdd\x12(\xea\x93~Sqp)\xcf\u007f\xa4\xfe\xa2\xff\x9d\xcd\x0e\xad\x04\"\xe5\xe1[\xd5QW\x8b\xb8\r\xd5E3\xb9j-{\x99\xa3\x196\xbfm}S-\xfe\"\x90\xcc\xdaPۓ\\\xd1U_\xe6\xb4`\x1f\x04\xa1ջ\xab\xf8\x97NUe\xddu\xca\xc8\xd0\x17\xa7\xceJA\x8dV\x0f\f\xb5\\\x8d\x91I\x901Mҕ\x05.\x84ڜ\xcd\xf4Cy\xa5˧\xa4;\xf8\n\xd4\xdf\xed\xcbB\x9bV\xdbr\xdf\x06mq\x81\x9a v$\xaf\xe9\xc5=/\xd3[\xd2\b\x95\xfa\x924Zis\xa9\xa3\x9a\xe8O\xfd\xcc)\x1a\xd6,\xebl\xfe\xdb\xfadF\x8a\x18\x102\xab\xe6\x9a|Y\x8b\x05\xeb\x12\x94V?\xc7\xd7\xe3_\xc7\xecL#;_d\xad\x97\xc3\x1a\xad\x1e\x10j\xb9\xa3F&A\xc6,I\xbb\x9c\r\xe4M\x18\f\x9a\x8aܾ%}\x81?\xee\xebk]2&u\xfa6h2\xea\xbc~S\x98t\x99\xbc\xed\xe5?\xf5\xfeη\xa4;'e\xa8\xa3\x04em\xe5\fj\xcfH\xda\xd0\xd6'\xd3\x03*頴:\x954\xaa\xe0\a\xf1\xc3.\xb1\x94\x91\xb4F\xab\a\x84\xd1+\xe9\xa3\x05=R\xf8jA\v\xf2!\xe9\xdey<%\x1f\xa1m<\u007fP\\\x9bn\xe3\x1d\x15\xf9\x99I9_P\x9b\v\xeb\xe79RŰ\x8c{\xa24\\\xb4\xa4D\x85O\x9a\xad\xfca\xde:\xa5\xbc\x99k.\x9f\xe2\xc4\xe1ƜtǼ\x9ct\xb2\\\xef\xaf\xcaJ\xca\xcc\xc7]\xe7C\a\xcf０\x97\x9e\x98\xf3\xedA\\~)*\xe5I\xf9\x9a\x06(s\vͳc/\x1e\xab\xfb+\xb2\x92\x96VХ\xff\x17\xb9i\xc9녉\xb7\x94\f\xa9\xea\xbb2\u008d\x94\bʚ\x1fM?\x14ό\x98\xb2\x8c\x88\xe4j\xca$[\xf4\x1c\xfaS\x88\\\xf3'E\xa6dȒVۢ\xce\xe5S'\xc6\x1d\x8dއ\x96p\x13\x8a\xf1\xc0).\u007fe\x83\x9aY\xd1\xe1Q\xb3q\xb2rN`:RIڠ`٠!\x9c\xe3V\xb6̟\x1c1\x9b\x9cTO\xab+c%\xe4Vg\x9a\x8f\x9c\xcd-i\xc9k.P\x13\xad\xb3)H:7\x8d\x84\x99\x96\xec.\xbc/)\xfb\x9d\xb4z\xb6k(\f\xa4\x13{\\\xe8E|\x96\x98\xa1w\xabk\x1e\x90\xf2(\x9c\xd3#\xa6\x93\xee\xa2sl\x88\xb4\xddh\x95tYy\xf3ng\xf1aڪ\xe5\x95ȗ\xa4\xd1G\x8d\a\xf9\xd2\xc6F<\n~\xd1\xe8(\x15צ\xe7\x0e:\xf8\xd4\xd2W\x92\xe9\x0f賓\xacW\xeaK\xf9\xbd\xaa\x84'\xa5\x15f\xf5\xc4\xe9OV\xae\xe36)\xbev\xcd\xe7\xa6r\xb7s)X\xe8\xefߕw\xa4\xbeb\x1e\xff-\x8e\xde\xc2\xe7\xd7W\xa4.\xedG\xbd\a\x0f\xa6gޓ\x96\x9f{\xd7\xe7ݍ\xc9/|\x85\xbez!\xb9\xb1[۠\x97-<ϱ\xb3~\xa7#\x0f\x87.$gV\x1d\xcfᩤ\xa5d\xea\xfa\x1e\xf6\xea\x05M\\\xb9\xbby9G\xb7p2&,)\xdf\x1a5\xbd\x8fh/\xa3\xbad΄Z\x1c\xd92qJQ\xd9,Φk\xdb>9\xea\xc9\xf2%\x1c\xe7D\xae\x9a\xf0u\xd2\xf2W6\xa8\xe5\xe6\xef\xaetFq=\xa8\xf3p͔\xb8\x9a\x9a\x9af13\xb7{\x1f\x95\xb4Q\xc1\xb2\x81\xbb\xa48z\xca\xc4\xe8e\xf39\xb2\xd5\xebiue\xac\x84\xdc\xeaL\U000d1cd9^Z\x9a\x9et\x0e\xe9\x9cM,\xe9\xeeO\v\xf1\xef*b[\xb2#=yo=Vs\x05\xdb5X\x03\xf9\xc4v76ff766zfQޭ\xaey@\x8a\xa3Ȱ\xad,_i\x9b\xaf{l=m\xd53\"\x872]\n\x04fI\xba\xc4Y\xdc\xe0j..\xc1\x9an.\xea\xf4-iv\xe2\xed \xe7T\x98\xc8:\x92\xf1\xefx^*\x0e\xf5\xa6\xe7\u0c71\xf7\xa0z\xff\xac\x9ck\x15\x02\xee\xe8\xd9nr\x1e\xdaU\x06\xfb¹p\xbaAY\x91J\xc4\\\x91\x8c;\xc1q\xbe\n\aϒ\xe1\x18O\xd5\xf8G\xba\x85U\xfc\x96\\\xfc\x92K\x86bM\x83\xcf\xf9\xbfH\xb9\xd6\xd3\x01\x85\xbefg\xe2\xb4\xfdK\x1d\xcad\xaa\xfa\xba\xb8\xddHI\x13\x1d6\xe7\x93`9G\xb6\x9aj\xb9\x17I\xfdIo\xb9\x9d\\\xf4\x9c9\x19\a\xfb\xa6\xdbtm\xe7G\x92\x19\xc92\x8e\f)6\xb2\xfdL\xe7ʌ\x813\x8a\x8c/[#iy\xcc\xc4[\xa0ɏ\x82\x19\x03\x9c\x037몸\x8e\x92Z]\x11\xcb \xb5:۾\x8e\xf4n\xa2\xd0,\xbd\xb3y\x8e\x0e\xb1y\xe4\a\x91i\xc9<\xd2\aP>\x964\xdb5\x18\x03\xe6\xc4*'\xde\x1a\xad\xaew@Rp\x1f\x9d\xc3\b\xaf\x9a\xc76\a7\x9d\xefK7!\xc0,I\x97\x17\x90\xc6\xe8,\xaaE\x9d\x05\xcd}}}\x9f\x14\xfb\xba\xe5F[\xd2y\x9e`\xbd֞\x14\xa6\xccӹʹ\x06\x8d\xafۗ٢\xb9I\xb6eX\xe8\x97\xd3\xd2\xf3+>\xea\xc7]\t\xe5\xa6\xf7~\x8bI\xa3\x13饎\xcfE\xe3S\x89ݨ;锞A\xafC\x1eT\xb6\b\u05ec\xee\xdbL\xb7\xf50;\x1d\xcad\xaa\xfa\xba\x84N\xc4\xd0\xc4m:Z>3\x82\xd4>e\xb2\xbb\a\x13MV~m\xceٓ'r\xb7\xe3\x9aS\xa9\xa2\x956]\xdb\bz\x15\xa9Y%i\xc6\xc05i\xf2\x12g\x03\x12&\x9f\x8c\xa47\xd5\xd6\xd6n\"\x926,\x985@\xd3m\xd2pU\xc6HZ\x8e\x95`Z\x9dm_G!y\xad\xe0;t\xce\xe69\xfe\x95\xb3dz\x12\x89\xb9ܒ\xfdI\xa5\xc2wJI3M͜X/I\xab[]\uf024`\xc6\xed\xf4m\xaa\xda@\xe2\x93}Ω\xa3v\x94\xae\x16~\"\xab\xcbP\xabӃ\xfe\x16\xa4\xb6\xa4\xa5\xe0^\xbeW3\xd9Q\xcf\xdcj+\xe7\xbdnB\xe8\xc9('^\xd5m\x8d\"s֎\x8a\xf5\x99\xfc\xbc\x97\xfa\xc9\xc0!\xb0\x86\x98,\xf5\xac\xbcз\xc9GБy\xe4\xc7^\xdb@\\K\xf7\xe2\xa1\xf9a\xfa\r\xca\xc9\xc2\x03E#\t\xd1J2\xc9T\xf5\xad\xe5\x0e#%tI\xdb>\x81\xc8g\xba8n\xe2!\xb2vR\xf4\xf2\xdd5q\xb8_\x9d\x10\xae\x94\xc8\xdbcj[q\b\xba\xaa\x924\x93\x19jw\xa6L增\xa4\xe5im\x8f\x19\x16\xccf\x86\xa6ϐ*\u007fT\x9e\xd12\xb1\x12l\xab3\xedK\xcf&j\xe4\xcf\xea\x9cM\xba\x96\x16~\"\xe5\x96\xfc\x82?B\xbe\xebVI\x9a=C\xf2\x89UIڻ\xd5\xf5\x0eH\nΜM\xdff\xcfP\x19\xb0\xd4p\xb5\x9a\xf1\xa1\xc3,I\x9f,\xa2\xa3r%\x9e\xa6\xb4\x11\x9a\x8a\xda|\\\xd8PIz\xa7Jҧ\xf8\x0f5\x93u\xda\xc4;\x1e*9\xcd[1\xdct\uf568\xfdl!Y\x98\x1dL\xac ?\xf1g)t\xde\xc7t\x82\xfc5h}>\th\x1b\x14&\xd2\xcf\a\xf9\xaf\xd0\x16a\x97-=\x0f}#\x8c\xd2y\x0ee2U}\xd7\xd9\xd4SSAY\x13I\xed\xe7O>I\xc1\xad3u&\xa9j\x8a<X2\xdbc*\xdb>a\x94n\x92%M\aV&\xb3\x13d\x0f\xeb\xea\x8b\x114#*\xe9\x82O\x14\x926,\x981`~\x14\x98VW\xc4\xcaȭζ\xaf\x83\xb6-\xd9\xd1\xd6>\x9b\xc2\xf6X29\xe7rK\x8a\xa3\xf4G\xb2\xa4w\xaa\x9a\x9a9\xb1biU\xe2\xbc\xc0\xbb\xd5\xf5\x0eH\nfL\xa6o\x933T\x06,\xa3wǻ\x9d^ĺZ\xe0\xb9}\xccߵt\x12\x9e\x9f\xf5\xffF%\xe9\xee\xd4l\xf2Þ\x9f\xafN\x972E\x98\xcewN\x8a#]h\xc92\xb5\x81+R\x98\x1a\x94\xd2\x0e\x83\xb27\x93Y1]$\x17\xbeD^\x19I\xbf\x9bx9\xf1]\x12\xd06\xe8H^O\xf6\xba\xb3\xd3=\x06\aI\x96Y\xe9\xb8[}\x9a\xe8P&Sַo\xeal\xa4BP֤e\r\xeb\xf0ʭ\x84ĬăZ4\xe9D}\xd3\xc9\xecoF4\x9e\xb7\xb6\xd8l\xba\xb6)Q\xa4cΧ\n\x8c\xc0\xea\xed\x9bAl\x19\x83u\u008a0n\t}\x8dÿ\xac\xe4;F҆\x053\x06\xca\x0e\xeeiu\xddn\xefiu\x85\xa4\xe7\xe1\xb5twz\xb6\xbauZ7\b\xd3xAҩ\xf9\xe7Jٖ\\?\x0f\xb7o\u007f\x1e\x95\xb4\xdc5\x18\x03\xe6\xc4\xe2W\x9c\xfbW\xc2wZ\xad\xaew@R\xb0\x9c\xce\xd5_\x14\x96\xcb i5'\nN\xb8\x9a\x8aw\xf7\xd0\x0f}\xae\xa6\"\x97z\xefJB\xd8\xf1~\x87Ν\x1eN}\xa94\x8bwT\x9d\xbb\xdc\xe8\xd8\xfcN\xff\xfb\x9b\x1dd'\xfcT\xe2}\x15\xf5\xc2&\x89\x82\x96\t\xe2\x1ew\xb5m\xaa\xb3|\x89\xfem\x8e\xa5|R\xe9\xf1#[x\xb2V.\xbc+\xf7\xc8_\xb6\xe03\xff\xed\xbbt\x8fT\xfcU\xefO\xcbI\xa3U\xd01\xa8Oz\xb8\xeax\x8e\x83̴s\xf9\xc2\xe3\x85<\xd9O;\x97\x94V\xba3\x99ԗI\xa6\xaa\xef&\xef)\x84pWa\xdcl\xb2x[Υ\x94\x94ep\xc5D\x85)\xce\r\xd3\xf1d\xf9(j\x8a\x88^\xb72rBxQ\xb3\x8e\xadkR\xb4s\xf7\x1c\x1b\x95\xf4̨\r\x1bfr\xc4V\x91\xd9\xc4u\xe5\xbb3\x84\xdd\xe9u\xb6Me\xb3\"\\ʻnj\n\x96\rz\x8e\xd2=s\xcf\x12ZluU\xac7\x8a\xe6s\xf0Y\a+2\x93\xc9~\xb4\xa2u\xe6p\x82\xf4\x04Ig\xe7l^ʶ\xe4\xe5\xd4\xf4\x8a#k\x12\xa9\xad\xd45X\x03\xf6\xc4\xe2\xdf\xff\xbdG\x1e\x11\xee\x1f\xd0ju\xcd\x03R\x1c\xc5\xfc\t\xcb˗O\x98\xef\xeb\xd8Nx\xcd\xe7C\x8di\x92F-eE\xbbO\b\x8aF.\xb2\x94\xd6\x1b\xa7{\x93\xe9\xc2\xc8A\xaf>\\\xc8N\xbc'g'\xcfo\xdbF\xa2>J¯\xdbp\xf4\xa7\xeb\xd3\xee\xc9:\xe2\x9dv\xa5Ml\xe0\x96\x94\xe8\x893\xd4[\x9c2U٥\xe9\x8e\xd4l\xe1v\xc3\xfa\xecy\xc9ٸ\x03}(\xac\xc8rD\x9b\xbd\xd2\x0e\x98\xb6\xc1\xb9\x9c\xa4yk\xe8\xceN\u007f\xc5R\xcfu\xe9\vk\x92\xd3\v\xab\x1c\xb4\x92\x9edHQߚ\b\xaf\xb9C\t^\xd0\xe1EnÔ(2\x1e싋\x8a\x9cId۷i\x8a-*\xa5h\x8a-\x0e\x1fϜ\xc8\xc9ˊ¹%:\xb6\xa8-#:b\xd6\t*閸\x88\x89\xb3\x96s\xdc\x12֠8n]t\xf8\xa48\xf1zӒȈ\xb8Z\xf6\x1eo\xa7a\xc1\x8cA\xc3\x04\xba\x06\x95\x86=\xa1\xd5ձ^(\x9aϑ\xbf%9-O\x90\x1b{6\x8b\xa2\xe8T\x9f\xdc\x18\xf0\nn\xe3\xccyd\xbe&\xb7dǖ\xf4\xc4G\xceRIK]\x835P\x9c\xd8\xde\xfc\xe4\xc4l\xe1\xa6P\x8dVG\x9a\a\xa4<\x8a\xad\xb7Gܾ\xd5+\x96\xa5-<\xa5\xa1\xcdԿ\xae4Oҡa\x99\xad\xc4\xc8\xc4\\^\xb4e\xf4\x18\xd9\f\x9aNa\xe9\x1br\x06\xd1\xea\xc2\xf6\xd8\xe0\xe8\xf6\x9e\x9f\x19\x10\xc4V/\x9b\xca\xc1\x1fW\x06\x95M\xd1\x03\xbf\x9f8\x84\xb4O\n֟\x04\x11̒\xf4 Z=\xa4\x92\x0en\xab\xb75\x04\xe7\xf6q?\xb1\xbc\xa4G5\xa6Iz\xe0\x84TҖ\x06$maZ\xf6q\xcb\xcc\xde\u007f\xf5\x8f/\xe8f\xa7\x91\x95\x0e\x17\xea\xf9\xfcw\a\x9b\xd8z\x80\xa4-\xccL\x8e\xe3\xc2[\x8c\xac\x86\x03t\xb3\xf3s48\xb2I\xe2\vFV\xa3\x06\x904\x00X\n\x904\x00X\n\x904\x00X\n\x904\x00X\n\x904\x00X\n\x904\x00X\n\x904\x00X\n\x904\x00X\n\x90\xb4i\x1c\xcf\xfa*\xb8\xae\\\x80Q\x89\x89\x92\xf68\xd0q\x17\xd1\xc7\x14\x15i=K\xc8¼ė\x92\x9b\x18\x83\xe7\xca\x05\x18\x9d\x98&iفN\xbb\xb3\xc1\x85\x19\xe8\x9f\xee\x8c<\x18\xff-\xe4\x91<UB h\xae\\\x80щi\x92\x96\x1d\xe8\xb4;\xbd\x1f\xb5hIX\xff-\x17\x84'b\x12\x82\xe5\xca\x05\x18\x9d\x98%iƁΨ\x914\xfb\x80\xca-\xa9\x92'\x98`\xb9r\x01F'fI\x9aq\xa0c\xa2\xa45<\xb5\xb0Nq4=\xb5\xf8a\xab\xe5\x8dG\u9fe5\xf7\x1ei\x90\xd6v\xe5\x02\x00\x83\xc4,I3\x0etڝ\x958XcB\xb7\xd6\xf2\xd4\xc2xu\xd1\xf6\xd4bl\xab\xe9\x8dG\xe9\xbf\xe5}\xe1\x01\xdf\x02\x1a\xae\\\x00`\xb0\x98%iƁ\xceU\x1a,y1\xe4\x9a\xd6\xf3\xbb#yu\xd1\xf1\xd4bd\xab\xeb\x8dG\x9ex׳\x0e.\xbd]\xb9\x00\xc0\xa01KҲ\x03\x1d\x84\x9a\x88\x98\xddE!\x1f\xaa\xf4\xfc\xeeH^]t<\xb5\x18\xd8\xea{\xe3\x91%}\x84g\xfe\xde\xdfە\v\x00\f\x1a\xb3$-;\xd0\xf1P\x13\xf2\xa1J\xcf\xef\x8e\xe4\xd5E\xc7S\x8b\x81\xad\xbe7\x1eY\xd2\xef\xf0\xef\xc8yx\xbbr\x01\x80Ac\x96\xa4\x19\a:\x95\x82\xaf\xbf\xear\x9f\t\x82\x80\x9e\xdf\x1dIz:\x9eZ\fl}{\xe3\x11\xfc\xb7t\xb3O\xcf\xf3v\xe5\x02\x00\x83\xc6,I3\x0et\xca\xe9\xf0\xdc^\xd4`\x90$\xe0h{jad\xaa\xe3\xa9\xc5\xc8V\xcf\x1b\x0f\xeb\xbfe}\xa6\xf4\xfc;\rW.\x000h̒4\xe3@\xc7\xe5\xdc\xd7\xf2ɉ\x82\x90\x0f\xd2ڞZ\x14^]\xb4=\xb5\x18\xd9jz\xe3AJ\xff-\x9f\x12\xdf\x11\x02Z\xae\\\x00`\xb0\x98&iƁN[eqQy\x93\x91}0\xd0\xf0Ԣt\x8a\xa3\xe9\xa9\xc5\xc8V\xd3\x1b\x0fR\xf8oA\xe8\x85D\xf12\x96\xb6+\x17\x00\x18$\xe6Iz$\x12\xc0g\xc0\xf7\xe7;\xe8\xd0\x1dDW.\xc0\xa8\x04$=\x10\x02(iԿ7\xad#خ\\\x80Q\bHz \x04R\xd2\x00\x10\x14@\xd2\x03\x00<\xb5\x00\xc3\x1f\x90\xf4\x00\x00O-\xc0\xf0\a$\r\x00\x96\x02$\r\x00\x96\x02$\r\x00\x96\x02$\r\x00\x96\x02$\r\x00\x96\x02$\r\x00\x96\x02$\rX\x95>#\x03k\x02\x92\x06,\x89+c\x127\xc7\xc8Ȓ\x80\xa4G\x1f\xd4s\xcf\xd0\x19\u07be\u007f\xa6NuV\x9a\xf6\xe4YS1Q\xd2\x1e\a:\xca`h\xa9\x8c\x92\xfeL\xbb}IT\xc4lS\xe6j\x9f;\xf8\xfb\x8cl\x10y\xae\x12\xe6\xae\xcc\n\xbf\xefH\xd5\xc9W\xf4\xdc\xd3>+\xf2I\x8do\a@\x80}\xff\x94G\xfa\xff'\xf3\x9e\xf3\x96\xc1q\\D\x8b\x86A\x03\xb7O#vT`\x9a\xa4e\a:l0ԔGHO<\x9b5ə\x11\xd1\xee\xcb8X\xf4\xbf\xb3\xd9ad\x83\xe9x\x89\xafj\xac\xcf\xe5_02\xf4\xa0\x9d\xaf\xc7sϲ\xc9ON\x18\xa2Ӣ\xc0\xfa\xfeY\xce-72\x91\xf0\x9c7WM\xcdV\xcdG&\xd7r5\x1a\xb1\xa3\x02\xd3$-;\xd0a\x83\xe6\xd1\xce\xe1\xee\xd9id\x15$J\xfd\x914\xaa\xe7\xcfa\x9dnc\x9f\x17l\x80F\xbe\x92\xe7\x9e\x19\x1bP\xc4P\xbb}@}\xff\xac\xe4V\x1a\x99hQ\xab#\xe9\x90?pv\xb8`\x96\xa4\x19\a:L\xd0DZ8\xff\xa7}\x01g\x00\x92F\xbd\xc9ی\f%4\xf2\x95<\xf7\xdc^\xe4\xe2\x86:1\n\xa8\xef\x9fu\xdc:#\x13-@\xd2*̒4\xe3@\x87\t\x86\x96\xf6\b\x8e\x9bPLB\xee(\x8e\xe2\xf5Ƞ\xe2\x99\x11S\x96ᱻ!\x9c\xe3V\xb6̟\x1c1\xbb\x87\t\xaa\x8c\xc5\xc7\x17\xb9&\n\x99q\x13UC\x98\x86\xbb\x1e\x84\xbe\xc8MK^/L\x90\x19\x17<\x9a\xb6\x82\xa4Ѷy\xba\xb6\xfd\x15YIK\x85ŶN\xbe\xb2\xe7\x9e\xd9+\xe7\u070e\x8f%\xbcY\xbb4\xff\x1c\tɾ\u007făW %c2S\xe4\xab\xe0I\x8e\xae\xed\xb5\x9bo\t\x17\xee\\6%b\x16\x89\x93\xcf\x1bA[\xbc\xd5 \xe9\xc1`\x94\xb7/\x18\a:L0Ĝ\xa8\xa9\xb1\t#CC͋ܺ\x9a\x1a\xf542c\u0092\xf2\xadQ\xd3\xfb\x90\xbb\xa48z\xca\xc4\xe8e\xf3\xb9O\x98\xa0\xcaZ|Ƞ\xbbh\xab\x80\xcac\xb6\x96\xbb\x1et!9\xb3\xeax\x0eO\xa5'\xbb\xe0Ѷ\x15%]\xc1w\xeb\xd9\xe69v\xd6\xeft\xe4\xe9\xe7\xcbx\xeeY7\xd1v\xa2gv\xdcQ\x9d\xd2\xfcs$$\xfb\xfe\x11\x0f^\x81\x94\x8c\xc9L\x91\xaf\x82\xad\x1c]\x99k7_sq8\x17\xb5n\xd3Dz]J>oHS\xd2=m\xd53\"\xcdZD\x99\x8eY\x92f\x1c\xe80\xc1\xd0\x13\xe1\xe9\x1aZ\x13\xefr\xae\b\x91>C\x9daL\xe7f]\x15\x97\aL\x90\xc5\xf3(\xe0\xb6V\x01\xe5擶\xbb\x9e\xecL\xac\xcf\xfe\xa5Dz\x8c\xb3\x1dm[Q\xd2\xc4\xf9\x8e\xb6m=}\xda0}\xd5Η\xf5ܳ\x81s\xa2\xab\x11䠇\xe0HH\xf6\xfd#?\aYB\xe9=ȓ\x99\"\xc8\xe2\xe4\x84q^\xbb\xf9\x90-\x12\xff\xe0Ώ\x12?E\xf8\x92\xf4\x1c<ƛ\xb8\x8c2\x19\xb3$\xcd8\xd0a}\xe9\x84\x1c\x9f\x92N\x99\xec\xee\xc1D\xd3\x05\xe3t\x9b4*3A\rZ9\x0f\x8aN\xae鮧C\xd0\xc6N\"=\xc6َ\xb6k\x1fQ\xd2U|\x87\x8e\xed\x16\xe1\x9a\xd5}\x9b\xf5\xf2e<\xf7\x94p\x91\xcbЦI=hH\x8e\x84|\xfa\xfeQz\x0frH\xa32\x13d)\xa2?\xa0z͇l\xe4,\xac\xb3\x89\x9f|J\xfa\x93}Ω0J\x0f\x06\xa3\xbc}\xc18\xd0\xf1\xf6\xa5\x13B|Jz\xbaط\xe8lo\xfa\f9^\x0ejQS.\xa0\xdcO\xd6t\xd7sV\x98\a\xd3m,\xc6َ\xb6k\x1fQ҅\xc9z\xb6\x0fS?=('K/_\xd9sO[IJj[\xebdz\xf4Cp$\xe4\xd3\xf7\x8f\xd2{\x90'3E\x90\xe5p\xa4\xa0M\xed\xe6Ct\xaaퟤ15\x9c)#\xc4p\xc0,I3\x0et\x98`\xe8\xf1)\xe9\xf9\x93OR\xe8\x14pz\x8a\x14\xcf\x04\xfdG\xd3]\xcf7\x826\xf2\x84\xd1Tr\xb6\xa3\xed\xdaG\xdc\xf1N]\xafg\xbbEpi\x9d\x9e\xa7\x97\xaf칧\f\x8f\x81s&O\xa4\xd7\xe1\x87\xe0Hȧ\xef\x1fo\xefA\x02Lp\x00\fLҰ\xe3=(\x8c\xf2\xf6\x05\xe3@\x87\t\x86\x1e\x9f\x92\xdeǕ\x90\xb7\x95\xf4&)cIk,'\x19\xb4\xdd\xf5d\xa5\xe3\x0e\xffi\"\x91\x1e\xe3lG\xdbV\x90t!\x11\xa0\xb6\xad\x10{\x90\xac\xa5\xb5\xf3E\x92\xe7\x9e\xdd\\\vj\xe0RP_t\xeb\x10\x1c\t1\xbe\u007fZ\xd7y]\x11S\x14\f\x92\x0e\x15fI\x9aq\xa0\xc3\x06C\x8a\xfbhM\x8d-\xa3\xa6\xe6\xaag\xc7۫\x17,\xe7RJ\xca2\xb8b\xd4s\xb4fJ\\M\r\xe9\xecLP\x85֦/\x83\x96\xbb\x1et.)\xadtg2\xef\xa8:\xa7p\xb6\xa3e+\xdc=\x96\xc7\xd3qR\xdb6\x97/<^\xc8\xe7\xea\xe7+y\xeei\x8bH\xd9\x1d=ŶdCx\xdb\x10\x1c\t1\xbe\u007f\xe6p3\x91\x1a)\x19\x93\x99\"_\x05\xe5\x13}\xcc\xd3\\5\xe1\x19G\xd1Ɍ\xf0\x1a\x17{\xde\xe8\xddc[kj\xbc\xf66N\x8c^o\xa0\xa6I\x9aq\xa0\xc3\x06CI\xed\x04a\xa9\xecD\xeeH\x1a\b\xf7\xba\x81m_\\T\xe4\xcc}X\xf2\x82)\xe9\xecLP\x85֥Y\x16\rw=\b]X\x93\x9c^X\xe5\xe0\xc9\xfd#\x8c\xb3\x1d\r[z\x8f7\x9f.Ny5m\xfb+\x96z\xaeK\xeb\xe4+y\uea5c\x12\xb5\xa4\xb3rJ\xa4S\xa74\u007f\x1c\t\xb1\xbe\u007f\xb6ڢ\x90\x17\x9edLf\xca|Y\xf6E\xf9\xb8-{\t9=M\x11\xf8u\ts\xde\xe8=\xde\x04\xafiS[xJC\x9b)w웎y\x92\x06\x82B_\xfbU\xdfW\x03=\x9e{\x86\x82\xb0=\xa6\xf4\xfd3'N\xcf\xda\x14ʦr\xf0Ǖ\x03\xc6(o \xf4\xb8&\x8d\x193\xc5\xe5SԂ\xe7\x9e!A%\xad\xf4\xfd\xb3a\xd8]\tnk\b\xe0\r\xe8#\b\x90\xf4\x88\x81\xf7\x83_\xfe\xd7\xff*.\x18\xf3_\xbf\xd4\xfe֨\x04\xbf\xf1v$\xe4\x8aڪi\t\x84\x1c\x90\xf4\x88A[\xa6J~\xf9\xbf\xe7\\\xbb\xf6\u007f\xff\xcf\xff\xd3\xfe֨\x04\u007f\x01GB\xc3\x19\x90\xb4\xa5\xe8\x8cL\xb9v-\xf2\xf6\x96\xe0\xde\\\v\x8e\x84\x863 iKA%=\xf1\xf6\xe6\xe0J\x1a\x18\u0380\xa4-\x85 i[ܬ&\x10\xf5h\x05$m)\x04I\x8f\x8d\xfc\xfe\r\r\xbb\xcb\xdbC\u007f\xa9\x1f0\x1f\x90\xb4\xa5\xa0\x92\x9e\xd4~\xad\xe7;aaa\xb6\xa3\xaeNP\xf5\xa8\x03$m%\xfa\xae\x12I\xcf\xc6\xe7\xe6\xfbs\xdc-c\xc3¾\xef\xec\x1c\x9d\xb7P\x8db@\xd2\x16\xa2u\xe6\xf4뱤\xb7\xe2s3\xab\xf9ڵ\x8ce\x87g\x86ŵ\x83\xa6G\x17 i\xeb\xe0\x9e\xf8\xfd\x19\xd7aI\xd7\xe2s\xb3\xfc_X\xdamxĎ\b\xf2\x05-`\xb8\x01\x92\xb6\x0e\raG\xafE`I#|nN\xe0\xffG\xf1\xff\x14[è}\xbc\xc7(\x05$m\x19\xfa6\x85\xfd\xeb\x1aYK\x13\xfe-\xfe\aI\x8f:L\x94\xb4\xe85\xa7\xa7\xd8)P\x8c\x80\xa1г\xe4\xfb\u05eeMJ\xb9\xd6\xe7\xfe\xf7\xb5\x1e\xfcߍ\xff\x13I\x87\x01\xc3\x17\xa3\x93:\bL\x93\xb4\xe45\xc7\xed<\xe9\u009c\x10\x1e\xd0oe\xaaO\xa2`\xe2\x9eo\xbbvm\xfa\x92\u007f\xff\xeb\xda\xc9\u007f\xfd\xfbZCߵk͂\xa4\xbb\x80እ$-{͡7:\xb9\x8b\xad\xff\x14\x8a\x19\x83yd\x99\xff\xb8\xe7D\xd2Ӳ\xf5I\u05f5M\x1b\xae^۰\x01\x81\xa4\x879V\x92\xb4\xdakNy\xe8\x9fS\x14r\x06\xf5\x14B\xffqϊ\xfe\xb7\x17 \xe9a\x8d\x95$\xad\xf2\x9a\xd3\xec\x1c\xa2\x13\xc5a\x84\xd2Î\xc7\x05O\xb9\xf8H\x9d\xe9\xe4\xa1;\x13\x8aQ\xab\x8d\x9b\xaa\xb0e]İ\xf8\xed\x85\xc6=sʿ\xbc\x98\x03\x92\x1e\xceXI\xd2*\xaf9%\x95>\xadG\x14\n\x0f;\x92\v\x9e\xce\xc3\xf4)\x845\xcd\xf4\xd1x\xeb\xf0\x8fZ\x86Ma\xabp\x11\xc3\xe0\xb7\x17\x1a\xf7\xccIȋ\xe8(\"\xe9gn4\xd4\xf5\xfd\xb7\x1aYx\x13F\xff\xe9\u007f\x190\xbc\xf2\xba\xf5~-3\xdf(2Q\x1d\xaeAe\x8d\xda\xef\x89\x1f|\x87\xbe\x87\xdd\xf8\x18y\xf3\xbfvV\x92\xb4\xd2kN\xab\xd3Zϔ\x91<\xec(]\xf0H\x13o\xf6\x01\xb6\xb27\x1e\xa5\x8b\x18\x11\xff\xbdи\x97\x8f\xa9\xb9\xaabwXJ\x13\xee\x8d\xe3^7\xea[\x17ǾE\xbb\x98\x91\x9d\x02}I\xbf>\xde8\xab\xb0\xb0\xb017\xdd\xf6\x94\x91\x19\xc1+\xaf\xb7\xc6^\x14\xbf\x19\\&\xe2\xe1j~\xa7Qq\xa3\xf6\xbb\xe1\xf9/\xe9\xfb\x97\xcf\xdfHޤ\xda\x19b%I+\xbd\xe6T\x96\xf8\xb6\x1eiH\x1ev\x94.x\xb4%-y\xe3Q\xba\x88\x11\xf1\xdf\vM_\xb3-\xec\xfa\x1bn\xb8\xe1{\xdf\xfb\xdeرc\xaf\xc7\\w]\x98\xad\xa4\xd5\xe7X\xea\u125fuu\xdd\xf1\xdb+aW~{\x87\x91\xa9\x8c~\xb6\xbf\xfa\x95\xeeW\x128\xf5\x95\xbf\xfe\xe1Ƿ^12\xd4*\xe8֧\xa4o\x06\x93\t9\\=4\x8eʨ\xfd¾\x14\x03_\n\x96\xb7\xfa\xf5\x1b\xd3e-I+\xbd\xe6\x14\x99\xf2X\xfe\xe0!y\xd8Q\xba\xe0і\xb4\xe4\x8dG\xf9\xf0y\x91\x01x\xa1q7\xad\x9c3+n\x96\xcc\xec\xd9K\xca\x1b\xda\xc3\xc8P\x16&vK\xa2\xef\xa7n\x1e3\xf6\x17\x1f\xe3\x0f\xcf\xde<\xe6\xa6DŽ\xbeu\xdb\x13X\x1b\x8f\xde\x12vˣX\x1c\xcf\xfeh̸\xfb\xbfԲ|t\xdcw\xc7\xd1\x14\x8f\xe1\xc0\xa3a\xaa\xfc\x1e\xfd\x81\x10\x89\x87\xb5?\x93o\u07bam옛\x9fb\x92ɦ]\x1e\x9d|y\v\x99\xa5zJ\xd4/H\xaeԃd\x16\xfc\xc4\x1dC\xca\x04\x1f\xee\xc7t(\xbd8\xf6c1\x1bO\xdd\xe8\xe5beq4\xe6\xadۮ\xbf\xee6\xb6-\xa4\xe2X\xc9\v!O픕\x16j.\xb5\x05\x8d\xf2:\x89C\xc7,I+\xbc\xe6\xb4;}\xb9\xa9\x18\x81H\xe2\xf5v\xc1S@\xc6d*ޕ6\xa5\xad\xb6\xa4\a\xe2\x85\xc6\xdd\xd6ڬ\xa0\xa5\xd5\xd5\xd9'\x8eҲ\xa4ǿ|\xf1\xbd;p\xa7{\xfe\x86g/\xbe\xf5\v\xa1\xef\x8d{K\x96\xf4\xeb?|\xfd\xe2[d=\xe8e\xf9̍/\xff\xe3\xe5\x1b\x9f\xc5\x11?x\xf5\xe2\xab7\x85)\xf3{\xd6\x13\xd9\xf5\xc6x\xfa\xcd\xcd\x0f\xfe\xfd\xca\xeb?g\x92I\xa6\x8c\x0e^\xff\xcf.\xb9D\xfd\x82\xe4J\xfd\xf4\xbfq\xaa\xb7\xc6\r)\x13r\xb8?#?6O\xfd̫Yh\x96\xca\xe2H\xd4\x0f_\xbe\xf8\x8f\xbb\xef\x96s\x97,\xf0\uf0b0\x92&|\x87N\xb9=\xb5S\xe5B^䶠Q\xde'qȘ%i\x85לVg\xbb\x81\xf9\bC\x92\xa9\xc2\x05O\\\x1cBm4\"b9\x9e'\xcf\xf0K\xd2\x03\xf3B\xd3\xe3V҃\u007f8\xbd$\xfd\x06~\xff\x9f\xb1]]?\xfe\x83\xd4\x13\xbb\xc6\\\x94'\u07b7\x10\x83\xf7\xc6iX\xfe\xf8\x19\xfc\xf2̏\xbb\xba~\xf2,\t\x84)\xf3\xa3\x91ϒrȼ\x1b\xbf_\xf7\x9e*\x99d*V\x85pqL\x97\\\xa2~Ar\xa5\xfe\xecI5\x84L\xc8\xe1\xfe\xe1\x16\xfc\xe1\x96?x\xb2\x91\xeaF\xb3T\x16\xe7\x19\x85\xffq\xa3\x9c\xbbd\xd1u\xe5\xb1\xf1]\x1e\xc6?F\x96\x00\x9eکr!/r[\xd0(\xad\x938D̒\xb4\xc2kN\xb3\xd3J\u007f-\xa4\xf0\xb0#\xb9\xe0AD\xad\x9b\xcafE\x90\x8d\xc0\x99Q\x1b6\xcc\xe4\u008b\x9a\x19[\xd6E\f\xcb\xc0\xbc\xd0h\xe0%iO`\xcc\xc7RO\xa4}\xdcc46L\x9c|zY^\xffw\xfc\xf2\xf7\xeb=\x810e~R$\x99w\x93\x88_\x8d\xbd\xfb\x89\xf7\xd8d\x92)\xf3F\xba\xbfT\xa2~Ar\xa5\xaexR\r!\x13r\xb8Wƾ\xd7\xf5\xde\xd8+\x9el\x94\xed\xa3,\x8eD\xfd\xf7\xcf\xc7*r\x97,\xf0T]\xfem\xfc\x03\x8d\xf1\xd4N\x95\xcb\x15\xb6RB\x94\xd1\xc9\x1b\x04\xa6I\x9a\xf5\x9a\xd3\xea\xf1;n\t\x94\x1ev<.x0\xee%\x91\x11qt?\xb0%.b\xe2\xac\xe5\x1c\xb7\x84\xb1e]\xc4(\x18\x90\x17\x1a\r\xc2\xf4$}=#\xe9q\xcc\x0e\xf0\x18qp\xf5\xb6\xf4S\xd2\u007f\x1e'&\xfe\xf3\x83\xb7]\xff\xa0\x81\xa4ɜY*Q\xbf U\xa54&\xde\x03Ʉ\x1e\xee\xdd\xf7w\xdd\u007f\xb7\x94\x8d\xb2}\x94ő\x97\x9f\xfc\xea\xbd//2m!Yt]\xf9-3J\xff\x96(\xd5S;\xef\\Tma-I\x03!B\xec\xa5c\xff\a\xbf\xbc\xc1\xf6ݟ0\x13o\xb2=\xe6\xe1Ǐ\x8a\x01/K퉷d\xe5\x99x\xd3\xfdnQl\u007f\xbd\x8e\x9dl2يo_\x92\xa5\xa6T\xa2~A\xaaJ\xa9\xb6\xc7\x06\x9a\t=\xdc\xd7\xc7w\x8d\u007f]\xcaF\xaa\xdbwȖ\x97\xb28\xf2r\x1d\x1e\xd8_e\xdb\xc2c\xa1\xb1\x96\xf6\xd4\xce;\x17U[\x80\xa4\x81A v\xd7;\xeex\xef\xe2\xcb\xe3پ\xfb\xea\x8d\xcfK\xdbc\xecU\x9d\x97\xaf\u007f\xe2\xe3\x8b/ߪa\xf9\xccMd\x9fI\xbd=\xe6\xb1zv\x1c\x8e\x1c\x87\x03\xe3\xdf\x10\"n}\xfe\xe2\xc5Gof\x92ɒ\x16\xd2]yO\xb8\xfe$\x95\xa8_\x90\xaaR\xf42\xd1\xe03\x11\x0ew\xfc\x83\x9e\xe1\x95=\x8cq\xcf{\xb5\x01y\xb9\xf9\xc1\x8bo\x8cg\xdaB\xb2\xe8\xf2\xa4\x95C\x9e\x8bX\u07b9\xa8\xda\x02$\r\f\x02\xb1\xbb~\xfc\x8b\xb1c~\xf4\x14\xdbw\xbb\x9e\xf9ј\x1f\x88\x17\xb1\x14\xf7^\xbc\xfa\xd3\xeb\xc6\xfc\xf4e-\xcbG\xc7}G\xbc,\xf4\x03\xf9\"\x96d\xf5\xe8M\xdf\x1d\xf7\xe0\x18a\xdeM\"\x9e\xffɘ\xb1?\xff+\x93L)ir\x97\xc8ϞR\x94\xa8_\x90\xb2R\xc2\xcd\x1c\x83\xcfD8\xdc\xfb\xbf\xeb\xb9͋=\x8cgƑկ\xa28\xf2\xf2\xc6\xcdcn\xfa-\xdb\x16Rq]\xea\xeb\xd2\xf2\xad&^\xb9\xa8\xda\x02$\r\f\x82\xb0.\u007f\x18\xcc\r\xa1Z\xe0\xd9,\x9dw\u007f9\xc6\xc8r(\xf8\u007f˥\x0e\x81:\\\x81\x9b\xa4\xbb\xc7n\"o\xfe\xd7\x0e$\r\f\x02\xff$\x1d\b~\xf1狯\xff\xf0Aa\x81\xfa\xfa\xcdF\xd6\x16≛\xc4{\xbcox\xcc\xc0R\x05H\x1a\x18\x04\xa1\x93\xf4\x13\xff9f\xfc\x83B0l\xfc\xab\xbem\x01\x02H\x1a\x18\x04\xa1\x9340P@\xd2\xc0 \x00I\x0f_@\xd2\xc0 \b\x03\x86/F'o\x10\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x8cfI\xa7pQ\U000db34c\x00`d1\x9a%\xed\xaa.\x9a\x1a\x05\xeee\x00ka\xa2\xa4E\a:\bu\x1e\xde]\xb0\xfb\xb0)ڪ\xe6,\xef\xe3\x03\x18e\x98&iɁ\x0ej/\xde\xdd\xecj\xde]lƓMj\xb9\xa3F&\x000\xa20MҲ\x03\x9d\x9a\x12\xf2 \x84\x9e\x92\x1a\xa3$A\x00$\rX\r\xb3$\xcd8Щ\x14\x9e\x12Zf\xc6\xd3\xf9AҀ\xd50KҌ\x03\x9d\xf6\xe2\xeavw{\x8d)\x13\xef\x06\xae\xda\xc8\x04\x00F\x14fI\x9au\xa0\x83\x97\xd5N\xe7>S\x9e(莚q\xd8\xd5gd\x05\x00#\a\xb3$\xcd8\xd0qW\x964\xbb\x9aK*Mq]\xb9O~\xf0\x1f\x00X\x01\xb3$\xcd8Щ\xa1\x8e\xb1\xdc%f8\x98\ue31a\xbc\xb5\xdab~\x01\x80эY\x92f\x1c\xe8\x14\b\x97\x86\x1b\n|\xd9\a\x89ZΌM9\x00\b\x1efI\x9aq\xa0#J\xfa\xa49\x92\x86\x1do\xc0Z\x98%iƁN\xb58\xf16c\xef\x19$\rX\r\xb3$\xcd8\xd0q\xbfX\xd2\xe4j*yь-\xef\xa3 i\xc0b\x98&iƁ\x8e\xbbvw\xd1\xee\xda\xd0+\xda\xed:\x99b\xb3\x96\xafz\x000O\xd2\xe63\x87\xe3\xa2ˌ\x8c\x00`d1\x9a%\xed:\tC4`9F\xb3\xa4\x01\xc0\x82\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x98(iɁN_CY\xc1\xee\xe1\xe3o\xee\\Nrr\xf6\xa9\xa5\x8dFv\x02\xf5\xa9\xc7\xf5\xbf,\xe5\x1d\xe4\xdb\xfa$\xbeT\xdb`\x1b\xcf\x1f\xd4\xfe\x06}\xee\xe0\xef\xd3\xf9*\xb0\x8c\x88J\x02~c\x9a\xa4e\a:\xa8\xbc\xe8d뉂\x13F)B\xc4Yǚ#\a\xd7\xeb\xf7b\x15Ǔ\x8e\xe8\u007fّ\x9b\xf4\b~{$1\xb7C\xf9ũ\xb3\xc2\xfb\x17\x8d\x0e\x1d\x1d\xa1\xfew6;t\xbe\n,#\xa2\x92\x80ߘ&iفNC\x01y(\u007fK\x81)~\xee\xbc\xc9\xc9\xee\xc7]u\xb3\xbf\x92F\xfd\xbe\xbe,\xccI\xea@\x1d\x899\x85\xaa\xf8\xac\xf5\x9e\x90\xaeZ\xf0\xf0\x19\"\xb5\x8c\x88J\x02\xfeb\x96\xa4\x19\a:\xe5\xfbhL\xf10\x19\xa6\xd3i\xcf>\xc7\xfb\x18|\"\x05\xd7\xcf\x00\x00\r\xafIDAT\xfd\xa70\xf7\x91\x83\xa8*'W\xad\x96\xa5\xc3I-#\xa2\x92\x80\xbf\x98%iƁ\xcen\xc1\xbf]Y\xb9\xaeqp\xf8\xd0\xc1\xf3;/\xe4\xa5'\xe6|\xcbF禞ï\xfd\xf5\xdd\xe4\xb5*+)3\xbf[a{\x90\xe7\U00062cd4'S\xf3\x8e$^\x9e\xa1_X?ϑ\x9a\xf3\x05\x9b\f\xab\xa5b=ʩ\xa0j\x91b\x8f\xf3\x02Y$\x95\xa30?3\x89\xa6B\xfd\x15YIK+\xe8\xa8\xffEnZ\xf2z՜\xd65\x91\x13\x98\xa8zr\x83\\\xb0\x84\xe2\xd8\xe4\xea\xa0\xee\xc2\xfb\x92\xb2\xdfI\xabW\xa4\x0fd%\x01\xd31KҌ\x03\x9d\xc3\xc5\xf4\t\xa1E\xbb\x8d\xd2\x04\x98ރ\a\xd33\xefI\xcbϽ\xebs6\xfa\xf3t>\xa7\xf4\xdd^\x1a\xde\xc2\xe7\xd7W\xa4.\xedgm\xbb\x1b\x93_\xf8\n}\xf5Br#\xee\xf8g\x1b\x1b\x13\xc5\x11\xecTR\xd6+\xf5\xa5\xfc^6\x19V\xcb\x17I\xdf$^\xa6j\x91b\xbb\x1b\x1b3\xb3\x1b\x1b\x1b?%\xc9\x1c|\xe6\xc1\xe3\xf3\xe8x\x98\xe7\xd8Y\xbfӑ\x87C\x17\x923\xab\x8e\xe7\xf0J\xb5\xb8\x8b\xb6\n\x14)\x1f\xd3\xc6\x14,\xa186\xb9:\x1d\xe9\xc9{\xeb\xb7\xf1|\x85\"\x83@V\x120\x1d\xb3$\xcd8\xd0\xe9,*os\xbbʜ%Fi\x02\xcfR\xfe\x91n\xd4߭\x8c\xec(\xfd\x8d\x83O&c\xefq\xbe\n\xbf\x9e\x15\xc6a\xd9vK.~\xc9\xdd\"\x9a\x8b\x92\xeeM\xcf\xe9%R\xeaP$+\xccEK7g!\xa2\x16ef\xf2\x9c6\xf5\x1b\x9cc*\x0e\xd5\xf3\xf5\x9e\xd7\xecL\\N\xffR\x95Z\xdaZ\x05\xda\x14\xb1L\xc1\n\xa4\xfa2\x05\xe7%\x93\x916\xdfK\xd2\x01\xac$`6fI\x9aq\xa0\x83\xda˝N\xe7\xd1r\x13\x9e\xec\xb7ԡ\x18\xa0%zO\xe5\x90N\x9b\x9b\xde\xfb-&m\x8b\xd2\xf6Tb7\xeaN:%~\x12%]\xcf\u007f\xe4I\xcd$\xc3jy\x85\u007f\x89\xaaE\x99\x99\xac\x16\xf2\x99.H\xb7\b\x97\x83\xeeی:\x04\xcd\xedT\xaa\xa5\x95\xf3\xa0\xf0\xf8\xc3\x14\xac@\xaa\xaf\\p\u007f\x12\xad\xeb9oI\a\xac\x92\x80\xe9\x98%iƁ\x0e\xc6\xddއ\x8aM\xf0\x89\xb54\xcb;\ueb30d|x\r\x19\xe8\x04\xd6(m\xbfM>\x82\x8e\xcc\xf3\xect\x8b\x92\xde\xcb\xf7z\xbeg\x92a\xb5t\x14~Eբ\xccL\xb9\xf3D\xd5\xf20\xfd\x06\xe5d\xe1Q\x92^\x14W\xef<Ք\v\xd4(b\x99\x82\x15H\xf5\x95\v\xfeB\xd8\xf3\xeb\xf6\x96t\xe0*\t\x98\x8dY\x92f\x1c\xe8 \xbaQ\xd6\xe24\xe1q\x9dr\xa7\x95Iͧo\x85\x99d\xcc:K\xe9P\xd9\xe6\xafA\xeb\xf3=\x1fDI\x9f\xe2?\xf4\xc40\xc9\ns\x85\x98B\xad̪\xc80*\xabeK:\xf9\x95\xe8O\xcfC\xdf\b\x9a\xcb\xf3K-L\xc1\n\xa4\xfa\xca\x05\x8b\xa3\xf4Gޒ\xa6vA\xac$\x10:̒4\xe3@\xa7ى\x17\x87W\x8b\xcd\xf0\x9f\xc3J\xbau\x830\x9f\x9d\x97F\xfas?\xf9\xaa^XS\x16\xbe\xa4\xb2}7\xf1r⻞\x0f\xa2\xa4\xbbS\xb3\xc9h\x99\x9f\xafHƨE\x91Yv6B_\xd1\bY-\x82\xc1A2\xe3\xcfJ\xc7u\xf84\xd1/\xb50\x05#\xf9(\x98\xfa2\x05\xaf\x9f\x87\xf3\xed\xcf\x13%\xed\xb1\rA%\x81\xd0a\x96\xa4\x19\a:-\xceZWCqyȽm|\xfb.\xdd\xd3\xf5\xac\x90\xe7\x88~\xa6\xe7\xf1\xa9\xa5\xf5G\x1eI\"[\xbd\x85w\xe5\x1e\xf9\xcb\x16܋\x95\xb6\xfdi9it\xde\xdd\xfbNcc\xe2\xe6F\xb2\xf7\x8dW\xd8\xf7U\xd4\v;OR\xb2or\xb3/\xe3ϗ\xb3s\xbfab\x11\x91\xc7^\\\xc4et\xb9ѱ\xf9\x9d\xfe\xf77;\x1a\xb1]._x\xbc\x90'\xfa:\x97\x94V\xba3\x99wT\x9dC\xc60\x05KG\xa1\xa8\xaf\\\xf0\xe5\xd4\xf4\x8a#k\x12\x95\xb6!\xa9$\x102L\x934\xe3@\xe7dIQ\xf9I#\xf3\xc0\xf3\xa1\xb0l\xcc\x11?\x16E9\xe9\xfbo*\n\xefKJ]C/ޠ\xfa\xecy\xc9\xd9\xf5^\xb6{\x1d\xc2%\xa3\xf7ť'\x95ȧ\xeb\xd3\xee\xc9:\xa2HV\xca\xf3dci3Oo\x9f\xf6\xc4bz\xf3\x93\x13\xb3\xcf\xd2ۧy\xc7G\xe4\xea\xf66r\xc9w\xa9\xe7\x92\xef\x855\xc9\xe9\x85U\x0e\x12k\fS\xb0\xe7(\x94\xf5\x95\v\xeeؒ\x9e\xf8\xc8YQҢmh*\t\x84\n\xf3$\r\x98\x85z{\f\xb0\x14 \xe9\xd1\aH\xdaҀ\xa4G\x1f iK\x03\x92\x1eu\\\xa8\xe7\xf3\xdf\xf5\xf9\xf7c\xc0H\x06$=\xea\xc8&\xbb]\x17\x8c\xac\x80\x91\nH\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x05H\x1a\x00,\x85I\x92\xee)v\n\x14\x93O\xae\xb2\xa2}&<\xd3\x04\x00,\x88I\x92v;O\xba0'\xe8\xb3M\\\x055-5\x05\xa0i\x00\b\x00&I\x1a5\xd1gw\xd3G\b\xf6\xd1\xd7\xc3\xc5}\x06I\x00\x000\xc6,IS\xca\xc9s\x8aPs\x01\x95w\xc1\xf0\xf1]\t\x00#\x173%M\x9f#\x88P\xa5\xe0\x13\xab܌\xe7\t\x02\x80\xd50S\xd2%\x95\xf4m\xb7\xf0\x00\xef\xc3&<\x9a\x1f\x00,\x87\x89\x92n\x15\x9f\xdc]\\K\xdfj\x8b}\x19\x03\x00\xe0\x17&J\xbaRt\x82%z\xae\xac\x0e\xb5\x9b;\x00\xb0\"&J\xbaHt(])x\xa1-\x83\xb54\x00\f\x1d\xf3$\xdd\xee\x14\xfdB4;\x89ǻ\xabN\xd8\xf1\x06\x80\xa1c\x9e\xa4[\x9d\xedB\xa0\x8f\xfaΩ\x86\xeb\xd2\x00\x10\x00̓t\xb3\xd3\xe32\xc7UP\xddZ\rw\x8f\x01@ 0Oҭ\xf2v\x98k_A\x19(\x1a\x00\x02\x81y\x92\x06\x00 \b\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\x01\xc0R\x80\xa4\xd1ڵZA\x00\x18\x99\x98$i\xa5\x03\x1d\x84\xaa\xcd{\xa4\xc9\xdf\xecOk\x04=\x1c\xb0c\x12p\xe0\x83_\xc7\xc7.:\xb6\xe0m\x1c\xdc>\xf7\xceiw\xce݁P\x9dݾ\b\xa1\xfd\xd8\xe2\x98:]\x908\x16\xff')|~\x9a\xfd^\x1f\xa6\xbeYk\xb7\xef7\xb2\x19\x10\x81k\xa8\xd5\xd8,漑\x15\xa0\x87I\x92V8\xd0A\xa8\xcdYk\x90 x\xac\x8a\xb9\xa4\x11\xf4\xe0~\xbb.v\xc5\a\b\x9d\x99\xf6Ё\xfd+\xa8\x0e\x8e\xd9\u007f\xbd\xe7\xd0k\x0f\xd9\xeb\x90\xfb\x98=\x06\xbf\xee\xb7\x1fs\xa3\x00s\xec\x8cf\xf4\xa1\x18F\x88\xa7W\xc7h\x1a\xf9å\xbai;\x8cl\x06D\xe0\x1a곺\xba=\xf6\xb7\x8d\xac\x00=L\x924\xeb@\a!W\x89y\x92>oߨ\x11d\x89'C\xf7\xe2\xc5$\xb8\x9a\xf4ԍ\xb1\xb4\xee\xb1\xd8\xd8m_\xb5\x9a\xa4\xf3\xa3\xa3\x0e\x90\x05+\x8c,0;\x06/i\x84b\x02+i\x14Ȇ:\r\x92\x1e<fI\x9a\"8\xd0A\xd5\xce\xea\x02\xd3$\xbdZ\x1e\x99W{\x0f\xd2\x04\xdaS\x13\xb6\x93\xe0\a\xf6\x03\xb8\xd3.\xa4\xd1\v\x17\x93\x9ez\fw[\xbf{\xea\x00\x18\xb1\x92\x0eHC\x81\xa4\x87\x80\x99\x92\x16\x1d\xe8 \xb7\xdb\xf3x\xfe\xd0s~\xdaF\x8d\xa0\x02\xdaSW\xc4\u007f@\u0087p\x9f\\$\xa8m\xc5\"\xd2S\xcf/د\xee\xa9g\xa6\xd9\xed\xdbϯJ\x88y\x80< q\xff\xa2\x98\xb9\x1b\xe9\xf7\xee\xa7\xef\x8d]\xf4v\xc2!\xf48\x99\x96J+a٠nq´\xf8_\xe3\xf5\xe8\x9f\xec\x02\v\x90\x82\xafc\xec\xd2\n\xf8Ҫ\xf8\xd8\x15\xde\x13\xef\xf3+\xe2q\x16\xf8\x97\xa9\x13\a\x12\x1e\"\xb3\xf7\xc7\xed\xd3\xf6l\x9c\x1b\xb3\xf83\x95i\xccƵ\xf1w>$\xacY\xe5:\xc8h\xe6p\b\xd7\xe0\xf7h\x87]s%>І\"k\xeb\x1dbfri\x04Q\xd2z\r\x85\xd0k\xf1{\x10\xa0\x8d\x99\x92\x16\x1d\xe8\x10L\x93\xf4\xdai\x9fi\x04\x15О\xfaY\x82\xfd\x81\x1d\xa7\xe9\xa4b\xc1\xefh\xf4\xef\x16О\xba\xeb\xd7\xea\x9e\xea\u07bf?anl\xc2\xc6U\xf6\xcf\xc8\ft\xe3\xa1]\xf1\v\xb0\xb8\xbfN\x88\xdfuh\xadݾG\\NJ+a\xd9\xe0\x8c}\xd5\xfec{\xe2\xed}d]:wQ]]\x9dz\x8f\xe8L]\x9d8\xb6\x9e\x8f\x9d\xfbڟ\x16\xdbՒ~3v\xc1s\xc7v\xd8w\x11\xed\xad}s\xffC\xf6\xd3\b\xfdm\xff4{\xfc\x8e]\xb1\xeaa?ƾ`\xff\xfe\x051D\x80r\x1d\x184sp\xbf\x9d\xb0\xf6\x12\xba\xb4=\xb6Nc\xbc\x1dpC\xd5\xc5n\xf7d&\x97F\x10%\xad\xd3P\x98\x15\xf6\a\x10\xa0\x8d\x89\x92\xf68\xd0!\x98%\xe9Ϧ\xad\xd5\b*\xa1=\x15}\xfd\xdc\xc2i\xf6X26ݻ\x8aF\xaf\xba\x97\xf6\xd4K1\x97\xbc\xe7\x93\v\xec\x8b;\xf18Gt\xf1GDz(N\xb7*\x96L\xeb7\xda\xc9\xf0B\x85I\xa7͌\xc1\x9ex\xd2]\xf7\xc4\n9\xe8L\xbcEI/\x9a\x8b\x8b\xec[\xa0\x92\xb4;\xe1\x01\x1cݳ\xffk\xf2\xbbB\xea$\xe4\x12\x13\x8b\u007f[Vūs\xba\x17[\xb8\xe7.Tԁ\xcdL;\x87\x1dd\xea@\x16\xc6\xde\f\xbc\xa1V\x93\xdc\u007fGڝ-\x8d\x99xk6\x14\xe6\xfcs\xb0%\xae\x87\x89\x92\xf68\xd0!\x98%\xe9ǧ\x9d\xd7\b*\x89\xf7\\\xd9r\x1f{\xc0~H\x1a|V\b\x83\x0f\xfa\xf5.\rILj\x03\xfe\x8a\x84\x9e>L\x02\x96@\f]d\xfeM%i\xc6\xe0\xb3\xf8\x84\xc7\xf7\x9cA=B\x0e>%\xfd5\xcd\x05mWI\xfa\x90]\xde'\xff\xe7\x9e\a\x12b\x85\xa9{\f\x11\xa0\u05fa;\xe6\xf7\xe4u\x8f\xfdk\xb6\x0e,\xda9|f\xff\x00\xb9c5\xafE\r\xbc\xa1ތq#wL\x1d\t2\xa5iJZ\xa7\x92\x80\x17&J\xda\xe3@\x87`\x92\xa4/Ŭ\xd5\b\xaa\xa0=\xf5\xb4\xb0s\xb6\xe8!\xe1?\xe6!a\x89\x88\xf6/А\xb4g\x15\xbc@\\\x15\xaf\xc0R8@\"\xdc*I\xcb\x06X\xa8{V\xdck\x8f\u007fNH\xe8S\xd2g\xecT\x06j\x99\xee\x92+r:>\xe1\xe9\x03u\x8b\x17Hi\xbc%Ms\xaaÿ\x02l\x1dd\xf4rx\xe0it,\xb6\ai0\xf0\x86\xea\x8b?\x80\x0e\xd0\xc9\t[\x9a\xa6\xa4\xb5+\txc\x9e\xa4%\a:\x04\x93$\xbd\xd1~^#(\xd1G\xa3hO\x8d\u007f\x9c\xc6l\x9f\x8b\x90\xd8\xef\x16,\x16z\xaa;昷\xa4=\x1doU\xc2\x19\xca?Q\x9f \xa1\x0fdI\xd31V6@gH9_\xef\x8f\xd9#\xe5\xf0\x9a\xf7\xe2^\xc8\xe5\x9f\xc2(\xad\xde\x1e;&\x8f\xd2\xf7.$uZ\xe1K\xd2\x1b\xc9\xebk\xf6N\xb6\x0e\fz9\xfc)\xbeg\xb5z\xa8\x1ctCm\\\x81Vl$\x01\xb64\xb5\xa4\xd5\r\x05\xf8\xc4<IK\x0et\b\xe6H\xfaR\xccj\x8d\xa0\xcc\x1e2\x18\xfe\x93\xec6\xa1\xf8\x84\xafI\fQ\x9ax\xb9\x95\x8cꤧ\xa2տӗ\xf41a\xed\xb7\xfd9\xb2\x15Lz\xe3*AҸ\xf3\xf7-\x8cQ\x1a\xec\x10n\xadZDg\v\x8b\xf0\xd0vIc[Y\\K/$\xd59\x1f\xa3\x92\xa9;~\x11\x19>7nD(\x81Ԡo\x81/I'\x90u\xf7\xbd\x8b\x14u`\xd0ˡ'\xfeOw\xaa\xe7݃n\xa8\xd31\x97b\xe8\x96\x18[\x1a+i\xad\x86\u009c\xdf\x01ki=̓\xb4\xec@\xc7\xedr\x15U\xbb\xda|Z\a\x85\xa7\xe5\x91\xf9i\x8dA\x9a\xdc\xfe\xb4\xff\x8f\v\xe3\xc9X\x19o\x8f\xdf~\xec\xc0br\xa3\xe21\xfb\x03\a\xea\x0e,\xc6\x13i7\xeegnT\x17\xa3\xec\xa9}\xa7\xe9~\xf5y1\xdf\xdf\xed?@o\xbc\xb8\x14\x9f\xb0\xe7\xc0\x8a\x18*\xe9E\xf1\xcf=\xb7\xd0>\xed\x8f\x1f\xb0\x06;\xec\xb1\xdb\x0f\xe1\xe0\x9b$ݎ\x98]\xb84\xe5(\xdd\xf3v]]\xcc꺺N<\xd8\xc7$\xec\xd8~\xa7\x90\x03ñ\x98{\xf7\x1c\xdah\u007f\x8dd\xb6b\xcfs\v\xf04\xfe\xf4\xa5\xbai\xabO\xa33\xab\xa7\xd5)\xaf\xba\xc7\xd8\x1f8}lQ,\xa9\xa6\\\a\x06\xdd\x1c\x9eN\x88U\xbb/\x1b\\C\x11\xe2\x17\v\xdbvri\xc2\xddc\xbb\xea\xeaHn\x9a\r\x85y\x88\xdc`\nhb\x9e\xa4e\a:'\x84۽\xaf\xfa\xb2\x0e\x06\x97bVi\x04Y\x0e,\x88\x89}\x88\xaaf\xe1k\xdb\uf349\x17.\xe3n\x9f\x1bk\x8f%\xb7.\xbfI/\xa9\xf6-\x8cWt\xf13¢OXH\xa2c\x8b\xe3c\x17\x1d\"\xa1\u007f\xaeN\x88Y|\x86J\xfa\xfc\xa2\x98\xd8ſ\xb7\xdbײ\x06\xfb\x17\xedH\x98\x16\xbf\x88*\x1a\xb97\xde\x19\xb3\xe84R f,\xe4\xf0Н\tO\xffq\x1á\xe1\xfc\x8a\x84\u0605d\xd1\u07b7knL\xfc\x8a\xd7\xe6N[\xb4\x16\xa7\x98\xf6\x01\xb9\xa4\xad\xb4\xbdwNJ\xd8\xf8U\x82\xcc\xe5J\xca\xe8\xe6p^](\x1adC\x11v\xc5\xec\xa2\xefri\xf4\x1eoϪY\xb3\xa1h2\xf5\x06>\xe0\xc1<I\x9b\xcf\xef\xed\u007f\xd3\b\x06\x17a{lD\xe3\x8ey\xd3\xc8$\xf8<\xb4\xd8\xc8b\xd42\x9a%m\xc6_UZ@\xd2\xfb\xbd\xc7ڐ\xf3\x9c]5\xa7\x00$F\xb3\xa4\xcd`\xa4KzǛh\xf1v#\xa3\xa0\xf3Y\xfc.#\x93\xd1\vH:\xa4\x9c?fߨZ!\x8f(\xdc\xf6\x05\x8f\xc7\u007fmd\x05\x98\tH:\xa4,\";M#\xf9\xfa\xcb\xf6\xd8\xc5#\xb9\xfa\xa3\x01\x904\x00X\n\x904\x00X\n\x904\x00X\x8a\xff\x0f\xb8\x98\xba\xeaw\xacpV\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/ipcg-func.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x02\xaa\x00\x00\x01\xb1\b\x03\x00\x00\x00\x9d\xa2d\x9d\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x02\x04\x00\a\t\x05\n\f\b\x0e\x10\r\x13\x15\x12!# '(&+-*2319:8?@>QSPVXU,`\xae7]\xadZ\\Z8^\xae8a\xaa:b\xab;b\xac^`]<c\xad=d\xae?e\xaf@f\xb0Ag\xb2Bh\xb3Ci\xb4fgeCk\xafEj\xb5Lj\xafMk\xb0Fm\xb2Ol\xb2Ho\xb4Ip\xb5Jq\xb6molKr\xb7Ms\xb8Nt\xb9Ou\xbaPv\xbbrtqWv\xb6Xw\xb7Yx\xb8[y\xb9wyv\\{\xbbV~\xbd^|\xbdX\x80\xbf`~\xbeZ\x81\xc0`\x81\xbbb\x80\xc0}\u007f|b\x83\xbd\x80\x81\u007fc\x84\xbed\x85\xbfe\x86\xc0\x82\x84\x81f\x87\xc1\x84\x86\x83h\x88\u0085\x87\x84i\x89Æ\x88\x85j\x8a\xc4k\x8bƈ\x89\x86q\x8b\xc1r\x8d\u008a\x8c\x89s\x8e\xc3t\x8f\xc4v\x90ō\x8f\x8cw\x91Ə\x91\x8ex\x92\xc8q\x94\xc9y\x93\xc9z\x94\xcas\x96ˀ\x94Ł\x95\xc6z\x97Ǔ\x95\x92\x82\x96ǃ\x97Ȗ\x98\x95\x84\x99\xca~\x9b\xca\u007f\x9c̆\x9b̀\x9d́\x9eΈ\x9d\u0382\x9fϛ\x9d\x9a\x88\xa0˄\xa1ѝ\x9f\x9c\x8a\xa2̌\xa4\u038d\xa5Ў\xa6ѣ\xa5\xa1\x8f\xa7Ґ\xa8Ӧ\xa8\xa5\x91\xaaԘ\xabє\xac֙\xacҪ\xac\xa9\x9a\xadӛ\xaeԭ\xaf\xac\x9d\xb0֘\xb4ذ\xb2\xae\x9f\xb3ر\xb3\xb0\xa0\xb4٢\xb5۳\xb5\xb2\xb4\xb6\xb3\xa3\xb7ݝ\xb9ݨ\xb8ض\xb8\xb5\xaa\xb9ٷ\xb9\xb6\xa4\xbcڬ\xbb۹\xbb\xb8\xad\xbcܮ\xbdݯ\xbeߩ\xc0߰\xbfཿ\xbc\xab\xc2\xe1\xb1\xc1\xe1\xb6\xc1\xdc\xc0¾\xad\xc4\xe3\xb7\xc2\xdd\xc1\xc3\xc0\xb8\xc3\u07b2\xc5\u07b9\xc4\xdf\xc3\xc5º\xc5\xe0\xb4\xc7\xe1\xbb\xc7\xe2\xb6\xc9\xe3\xc6\xc8ż\xc8\xe3\xb8\xcb\xe5\xbe\xca\xe5\xc9\xcb\xc8\xc0\xcb\xe6\xba\xce\xe7\xc2\xcd\xe8\xbf\xcf\xe2\xcc\xceʼ\xd0\xe9\xc3\xce\xe9\xc7\xcf\xe4\xc8\xd0\xe6\xc3\xd3\xe6\xca\xd2\xe7\xd1\xd3\xd0\xcc\xd4\xe9\xc6\xd6\xea\xd4\xd6\xd2\xce\xd6\xeb\xcf\xd7\xec\xca\xd9\xed\xd0\xd8\xed\xcb\xdb\xee\xd7\xda\xd6\xd4\xd9\xe9\xcc\xdc\xf0\xd6\xda\xea\xd7\xdb\xeb\xda\xdc\xd9\xd2\xde\xec\xdb\xde\xda\xd9\xdd\xed\xd4\xe0\xee\xdb\xdf\xef\xde\xe0\xdd\xdc\xe0\xf0\xd6\xe2\xf0\xdd\xe1\xf2\xd7\xe3\xf2\xe1\xe3\xe0\xdf\xe3\xf3\xe3\xe5\xe2\xda\xe6\xf4\xe1\xe5\xf5\xde\xe7\xef\xe5\xe7\xe4\xdc\xe8\xf6\xe6\xe8\xe5\xdd\xe9\xf7\xe6\xe7\xf1\xe0\xe9\xf1\xe1\xea\xf2\xe8\xea\xe6\xe2\xeb\xf3\xe9\xeb\xe8\xe3\xec\xf4\xea\xec\xe9\xe5\xee\xf6\xec\xec\xf7\xec\xee\xeb\xed\xed\xf8\xe7\xef\xf8\xe8\xf0\xf9\xee\xf0\xed\xe9\xf1\xfa\xef\xf1\xee\xf0\xf0\xfb\xee\xf3\xf6\xf1\xf3\xf0\xf4\xf2\xf6\xef\xf5\xf7\xf2\xf5\xf1\xf0\xf6\xf8\xf4\xf7\xf3\xf2\xf7\xf9\xf3\xf8\xfb\xf6\xf8\xf4\xf4\xf9\xfc\xf7\xf9\xf6\xf5\xfa\xfd\xf8\xfa\xf7\xf6\xfb\xfe\xf9\xfb\xf8\xfa\xfc\xf9\xfd\xfb\xff\xf7\xfd\xff\xfb\xfd\xfa\xf8\xfe\xff\xf9\xff\xff\xfc\xff\xfb\xfe\xff\xfc\x1d\xe0k\xdb\x00\x00 \x00IDATx^\xed\x9d\tp\x14\u05f9\xef}\x93\xdc\xfb\xde]t2\xaa\xbe3\x12\xd2\x13TI\"b\xb9PzFU\xc0Ř\xb5j\"\x95)!\x97\x8b\x87\x1d+U\x02\xa2\xd8O@L \x18\xa1g\f\x97\xa4,,\x16\x13H\xbc@t\xcbv\n\xd9\xd8V\x99'{\xd8\\Pl\x97\xe0`\x85\xb2͢\xc8\x06\x83\x1fKر@\bMթw\x96\x99\x9e\xd33=\xea\x99Ѩ՟\xfa\xfbE\x91z\xce|}\xba\xc7\xfa\xe9\xcc鞦\xff\x0fQ\x04\x01\xc1CV\x05\b\xe2\fPU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80`\xa1j\x1b\x828\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x84$Tm\x988X\xcb\x1d\xf3\\\xbc\x9e\x12c\n!\xa4\xdc\xd02\x8c\xb5l\x89S\xfd\xe9\xfbq\x9e\x88\xc3H\xd6\x17\xf9ȪJ\xe2g\xa5\xb5r\xf1ͪ\xe2<\xcdW0m\xe9\xe1\x1e\xd7@\xfa\x95\xc4U}\x96\b\xfcq\xbbJ\x88dT=\xbdj\xc8\"\xd3'\xe2\xf1\x8e\xd8\xc3j\xab2\x89\xae\xea\x81i$L\xd6*\x8b\x95\x90\xfe#aU\x0fg\xc8\xdf\xe6\xc2\xf8}%B\x12\xaa\xbe_BHr\xaa>%\xf6p\xc8\xe7Vu\x82\xb0\xaa\x9f\x16\x13\x85eV\xab!\xfdEªna\xbfnj\x15\u007f\\\xbf+~_\x89\x10\xab광#G\xfeѬt\x06IR\xd5\xd6AR\xb7\x97\xad\n\x05aU\xe7\xf3U|\x13ʧ\xe4\xf1\x05-\xc1\xe9\x03b;\t\xab\xfa2\xfb=\x16\xc7\xef'QbU\x8dKҪ\xbe\x1c\x1a\x19'Y\x15\nª\x0ef?\xffן\xd8\xc2\xe7\v\xf9\xcas-VC\xfa\x8b\x84U\xfd\r\xfb5\x8e\x8d\xdfO\xa2\xf4\xa5\xaa\x13\xf9.\xf2\xc1\u007f\x8fU%'\xa4\xea\x01\xee\xe7\x9fdSIz\xfe\x1c\x91>!AU\xcbC\x03\x16\x19\xd9֖\xcd~\xc8#\xf3!l\x89\xbfw\x17\xb0wж\xd6ec\x06\xf9\x8a\x17|\x1aZ\xe3\xf3U~vT]\xf4ě\xc6\xed\xf50W\xdd3\u007fL\x8e\xa6\r\x9e\xb0H\x8837\xbc\xc5M\xfcсg\x8b\xb3\xbc\x85\xe5\xe19\xad\xd9\x06\xdbv\xf1\xd9\xf4G|\x90\\\x10n2\xab\xdbU5ԛ3\xe5U\x83\xaa\xafȧ^\xad\xaa\xaa\x9a/\x17\x8d\x1b\xfc\\8\xbcl\xa8\x967\x83\xff\x97(\x93\xad{\xf8\x06w\xc5V#}B\xdaT\xdd5R\x16\x14\xca\xc9\xecG#\xc3k<\xf5\xa5\xba\xbd\xf8\xaan\xca\n\xaf\x91\xc7\xe7\x8b\x06Uׇ\x9f\xf3K\xe1L6\xd8ֶ\x80=\x18#\xd6+<\x1dj2\xa9{\xd9+\x1fV\x86T=ͧ\xa8ު\xa8\xb3bQ\x1b\x14\xaa\xf2\xfeɣ|\xce\xee\x95{\xb1\x88-N4\xa9F\xfa\x84t\xa9\xaa\r\rW\x88\xb3Y{\x06\x13\x9dy\xea\xf6⪺K($O3\xe4\xb7\x1aUݔ\xa1w6AX\x18\xbbA\xe6\\!\xe1\xee\xbdϛ^\r\xf5\x1d[\xb7E\xef*\x93ȹ\xeas\xf2a^\xc5\xca\xc8\x11c\xf4\x06\xb9\xaa\x83DۊӼ?yN\x8b\xff\rԛT#}B\x82\xaa~\xb8\x85\x9fV-\u07b2\xe5\x9d8\xaa\x12R\xb0\xe2\x9dz\xbe\x90\xc9G\x16n\xa4\xb7zS\xfd\x04\xf6\xd3\U000e1cbd\xb8\xaaV\xb3\x1fU\xbbN\xb7n\xe2\x9d.c[\xdc4\x9e-<\xb1iӁ\xb6Os\xd9Ҙ\x86?\xfe\x8a\x1f\xe1\u05f6\x99nP\x9e\xa2\xc8< \x05\xfaq\xa8\xef\x98:!\x9a6\xff\x9d-O\b\xb3xg\xadcI\x98⥲\xab\x98\r~.\x9e\xce\x1c3\xccs@\x8c\xa5\x13x\x15\xff\xa3\x18\xd4jR\x8d\xf4\t\t\xaa\xaa\x1eV\x99\xab\x9aÏe\xc49xf\xf3\x87\xfc'\u007fW\xffr\f1\x9e\x93\x8f\xab*\u007f?\x16\xf3\xdaM?\x9e\xbf^\x1c\x17\xe9\x87U˸E\xfcd\xe9\x1f\xd9\xf05\xbc\xcdl\x83\x8c\n\"\x8f\xfd\xb9J\xda\x01\xd9wL\x1d\xf7\x99\xac\xe7OU\x91\xb0X\x9f\xf25C\x14l1ݠP\xd5\xc7\xd6\xdf\xce楙\xa1\x037>\xeeW\x99\xee\x1e\xd2\x17\xa4M\xd5gE\v\x1fX\xd8o{1\xe1\xd3FΖ\xe7^1\x9c\x89\x8d\xab*\xf7\xc5W\xf1\xf2\x81\xc8\x13\xba\xaa\xfc\xc8~\x85h\xe2\xe2\xf3\x89l\xcc\x06\x99p>\xb6\xf4\x1b\xb6\xb0\x87k\xb5Dv\x11S\xf7\xac\xbec\x875\xa2\x8f\x81\xef?\x95\x13vU{\xd3l\x83Bէd\xb1\xf8\xa3Z\xcc\xfe\n\a\x87\xfe;\xc4\xee\x1e\xd2\x17\xa4MUy\u07bd\x88\x88\xc9%\x9f\xdaVEoJ\x10W\xd5M!W\x86=\xb5\xa9U>\xa1\xab\xca=*\x9b\xcb\x19\x1e\xdaP\xcc\x06\xdb\xda\xfe\x0f[\xf0\x89\xf7o\xfe\x86>Bv\x11S\xf7c\xa2\x0f\xf2\xfcC\xaa\xda\xf0N\x9c~gѣ>\xb1\xfd\xa1\xa7M6(T\r\u007f\xb2\xc0\xf7\xb4\xb8\xad\xedU\x12:\xb3\x15\xbb{H_\xd0+U\xf9$-\xac\xaa<Q3R\x1a1\x89\xfd\x98\x1f\xbd)A\xfc3\x00\xe2\x1dY\x90/Ǩ\xb0\xaa_\x12\x03\xb5m&\x1b\x94#Zn9g4\xaf\x92\xe7\xc8b\xea\xf8\xdcy\xb1\xdc\xee$\x125\xb3lm\xe0\xbb\xc2\xeac7(T}'T\xf7%?g\xf0\xa1x\x1b\xe0\xeb\x9b\xec\x1e\xd2\x17\xf4JU~\x8e&\xac\xaat\x83\x0fU!U\x9f\x8dޔ\xa0\x87\xf3\xaa\x9b&z¿oq\xf9VX\xd5V\xa3\v\xbc)f\x83rv\xacP!\x9e\x8d\xa9\x9bH\xf4\x8f\x15B\xaa\xbe\xbc\xa8jF\xf8\x84\xc1\x01>\xb0.3٠PU\u007fk\xe7\x1f\xc5\xceoe\xb5\xde?\x99\xef\x1e\xd2\x17\xa4\xa0*\x9f\xf6\x89\xdf\xff\x97\xfc$\x8d\xa9\xaa|\xc4yB4\xb4~d8\xad\xda\xf3\xe5*\a^~B\fl\xc4\xcb\xe7\x00\xfa\x04\xc0\x17\xa9\b\x11\xabj\xb5Q\x98\xd0\\ \xa6\x8e\xf7\x19\x9as\x8e&B\xd5\x12u\x87\xf8\xd8\xfb\xac\xc9\x06\x85\xaa\xfag`\xfc\xb3\x86\x91\xaf\xe8\xeb\xc5\xee\x1e\xd2\x17\xa4\xa0\xea\xe0\x90\x1dr$3U\x95\x1fV\x15\x88S\x8c\xbf&\xdeb\xf5c\xf5\xf8\xaa\xb6n\x97\x9fK\xf1uŨ͵\x12\xc3+\u007fo\x97\xc7I[B\xba\xc4l\xf0\xcb|\x12\xc5\n\xd3:~\x12u\xa4h\xd8Ç\xf0Z\xe9\xb8\x16:\x9d\xb6\x8b\x1fj-3٠QնG\x89\xfc\x04W\n\x1a\xbb{H_\x90\x82\xaa|\xe8\x11\xf6\x89\x93<\xa6\xaa\n\x89\u007f\xc5\x1e\u007f\xce\x1b\u0087Μx\xaa\xee\xe2}D\xa6\x15\x1f\x86\xba\x17\xb3\x88\x85la0\x1f%\xdf!${\xec\x01\xb3\r\x8a\x832\xfd\x13'~\xf2\xf4\xe16\xb3:qҊ[|\xba\x8c/Նv\xb5@|\xb2\xfa\xfe\b\"7\x1d\xb3A\xa1j\xe4\xe4D躘Їb\xb1\xbb\x87\xf4\x05)\xa8\xca\x15\xf2,|\u007f\x8b_\xfc\xbeLUm\x9bƟ\xf2\xd7.*\x0e\xfd\xf2u\xb8\xaa\x85\xe5:[\xf4Q\xb5X\x18s\xb8\xf5C~r>\x8fK\xc0\xaf>͙\xff\xd4\u007f\xca)d\xf1\xab\xbb^\xe1\xdb\x11g\xdfc6\xc8ŋ\x9c\xd2\xe4\xf2\x90\xed\xa6;Ƈ@\xf2D\xc3o\xe4y\xffڶ\xf0\aq\xf9c'ɹ\a?5\x1b\xb3\xc1(U?\xcf\x15\xa5\xa1Kwcw\x0f\xe9\vRP\xf5U\x12\"\x93\x8fB檪\x1f\xac\x1a\xaeʟB\f\xd4ꪾ\xefS\x9a\xf9Ǖm\xb5z\xc9\xca\xc83Y\xc2\xfb\xe8\r\x8a\x93\xa4\x91\x8b\xbeŅ+\x95\xa6;\xf6\xa1\xbe\x99a\xb2\xef\xb6\xc3\xfa\xd5\n\x9c\"!d\xf4\x06\xa3Tm\x9b\xc7\x1f\xeb\x17p\xc5\xec\x1e\xd2\x17\xa4\xa0j\xf8\xe3\xf9\xac\xfaY$\x9e\xaam\x1f\x8d\b\xff\xf6\xaa\f\x1f\x8b\xc7U\xb5\xedͼp\xa3W\x9e\xac:,\xcf\xcbs\xd3\xeb\u0082\xe5ɋ\xb0\xa37\xc8?0\"\xcaG\r\xfc\x9cTN\xab鎽\x19\xba\xfezn\x1d\t\xff\x83\x952\xa23)\xd4I\xd4\x06\xa3U\x15\xb3\x86\xc8e\xb1ѻ\x87\xf4\x05\xa9\xa8\xda\xf6ʣ\xb9\xdea\xf3\xf6\xb4\xf5\xa0j\xdb\xe7+\xa7\f\xd6|ß\n\x9f\x8d\f\x11_ն\xd6\x15S\xf2\xbcZ\xee\x98g\xc3\xce}T>X\x1b<It\xb7g~qn\xe6\xa01\x8bBW.Eo\x90\u007f\x1f\xa3l\x85\xef,?\x19o\xb6c\a\xe6\x16y\x87\x94\xbd٦\xab\xcaF\xf4\xb9c\x06k\u07bc1\xf3\xfeS\xef\xc1\xb8\xc1hU\xdb\xf8\xf5\t\xf5\x91\x87Q\xbb\x87\xf4\x05\t\xab\x8a \xfd\v\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80`\xa1*\x828\x05T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa4]ՉdIlc\xfb\xbd\xd86+V\x90\xa7\xadJBE\tU\x9a\xd3@ʭJ\x10\x87`\x87\xaa\xc1\x95\xbe\xebf\xa5=\x93\x90\x80\xa8\xaa{\xb0C\xd5\x0eBPU\xa4\xb7\xa0\xaaV%\x88C@U\xadJ\x10\x87\xd0\x1bU?~O\xe7\xff\xea\x8dR\xd5\x06Rw\xa9\xba@+\x9a\u007f\x89\xd2\x1a\x11\xfbs\x84\xb5\xb6W\x17i\xb9e;xY=Y\xb5c\xb8o\xec)\xb5\x90\xb1\xbd\xa2@\xf3\x8d^p\x81F\vx\xe2\x99aZ\xee\x8cݦE\xc6ʝe\xf9\xbe\xf1M\x87Ȥ\xc8F\f\xab4\x90\xda\xe3\xe59\xd9\xe3_\v\x8a\a\xe5\x17\xf8\xe6\x17\xa6\xf0\xb7\x84\xd8KoT}\xe4\xefu\xfeMo\f\xabZ]@\xb2s\t\x19\xddA7W\x10R^\xd1N\xe9\x8e,\xe2}\xb8\x88\x90Ŕ[T\xed%$\xabC-\xa4\xb4\x8a\x90\x82\x92<\xf6\xedr\x94\x80M>\x92]\x92OH\x93Y\x91\xa1\xb2\x81\x90\xfc\x12\x8dTHU\xe5F\f\xab0;\xb35\xff\xa3\x1eR\x19\xe4\x0f\x1e\xce#\xf9l\xf3\xc5\x1d\x14q6\xbdQ\xf5\xcc?\xe8\xaa\x1e\xd4\x1bê\x92Ql\bl\xd2\xc8\x06}\x02ОMj\xeePڒK\x1a\xb9E\x9e\xe1M\xcd\x1b\x8c\x85\xcd\xc4LJ\xdc@6Yi\x14\xf0\xebl\xb2\xa0\x83\x06k\x89\xf7\x92I\x91Zy\xd4C\xea\x83\xf4\xf2\f\"U\x95\x1b1\xac¶8\xfc$\xa5\ar\xc9F\xf1`\xd8>J?\xd0\xc8f\x8a8\x9bި\x1a\x19V#\x83jDտ\xf0GU\xa4JW\xb5\x86\x94\x89\x8a7\xc8(n\x119F\xa3\vk2\x16\x89\x8a\x1a2\xc7(\xe0\"\xe2\x0fu\xbeޤH\xad\x9cEj\xf8\x8f\x8eaRU\xb9\x11\xc3*l\x8bG\xf9\x837H\x91x\xd0\xca\x1f\x88\xcd#\x8e\xa6W\xaa\xea\xc3jdP\xd5U-\x16\x8fV\xf1Ö\x90\xaa\x85\xe4m\xd1\xd6\xe1!\xa7\x98EE\u2061\x90ޓo\xc3\xcbȓF\x01\x8bC\xab\xb6\xb7\aM\x8a\x94ʮl)'k\x13\xaaʍ\x18Vi \x13d\x9b\x97\x1c\xd77_\x8f\x87W\x8e\xa7W\xaa\xd2\u007f\x8f\x19TuU\xe5\b\xba\x9e\xcc\b\xabz\x8bM\b\xc7\v4\xd2\xccܐ㤡\x90\x95\xeeް\xb8b(!\xb3\x8d\xaajr\xec\v\x11]\xa4T\xb6\x93̠Xh\x96\xaa\xfacWi\x90\xe3.\xf7\u007f;{ +6ꕈS靪_\xfcC\xf4\xa0\xaa\xab*G\xa9\xf5\xdcD\xa9\xeay%\x05\xb8\x91YT!\n\f\x85\xc1U\xecȉd\x94L\x88R\xf5\x0e!\xed\xfa\x06b\x8b\x94\xcaC$K.|\"U\xad\x88]\xa5\x81,\x95%\xe3\xc8\x1b\xfa\xe6QU\xe7\xd3;U\xe5\xb0\xfa#\xb5%\xae\xaa\xd7\t9\x11)3U\xb5\x96dTn\xde\u007f\x8b\xd6E\xa9\x1a$\xec\xbd:Ll\x91Ry\x82d\x18FՊ\xd8U\x1a\xc8\x02Y;\x9a\r\xee\xa8*\x1cz\xa9\xaa\x18V\xd5A5\xbe\xaat\b?\xf2紜\xec2U\xf5A6;j\xe2TGO\x00\x86\x8b\xb3T\x94\xbe=m\x95I\x91R\xf9\xc0\x1b\x9a\xab\xaeTT5\xae\x12~Ͽ\xa3\xb1\xa1\x1aU\x85C/U\xe5êaP5S\xf5\x1e!\u007f\xa3\xfc(\xbbD\x8cx\xdb\xf9)'3U/\x84\x06\xcf[\x05\xfcIU\xd5\x1a9\x93\xa5e\xa4֤H\xad\xac\x90cfW\xb1\xa2\xaaq\x95\x06\xa2\xb5\xcb-\x97PT\x15\x10\xbdU\x95\r\xab\x86A\xd5LUvT\xd4x\xa7\x8b\x1e\xf7\x9297\xd9,2\x97T\x9bO\x00\xba\x06\x91\x1a&\xf3Y?\xe1k\xa9\x02\x9e\xf6\x91e\x0fh\xb0\x8ed\x9d7)R+\x0fgx\xd6\a\xe9\xcd'\x89\xa2\xaaq\x95\x06BJ\x98\xab\xdb}\xec\xfd\x1fU\x05DoU\xa5\xffn\x1cTMU-a\a5\xcd\xe2<\xbf\xb7d8\x93\xa8#\xce\\\xb5\x9e\x90\xa1\xfe\xb1\x9e\x9cE\xe4\xe1\xe8O\xab4\x92S\x92K\xb4&\xb3\"Ce=\xff\xb4\xcaG\xc6q\xf7\xc2\x1b1\xac\xd2@\x86y3K\x86\x11RKQUH\xf4Z\xd5/\x8c\x83\xaa\xa9\xaa\xc7'zs\xde`?O\xfc\xacH\xf3\x95\xac\xe2\xd7Y\x9b\xaaJ\x9b'\r\xf1\x8e^t首\xd1n\x14\x90\x1e\xaf,\xc8\x1cR\xc1/$\x88-2V6\xfb\ay'47\xf0)Cx#\x86U\xd8\x16\x8f\x94e疵\xa8\x9bGU\x9dO\xafUu(+ȼ8\xcf\xe0\xc5T@\x19h\xaa\x96\x95\x04\xc4ωd]\x9c\nT\x15(\x03M\xd5\xf9☩c1ɽ\x1c\xa7\x02U\x05\xca@S\xf5B\x11\xc9\x1cU\xec#Y\xcd\xf1*PU\xa0\f4U\xe9͕%\xb9\xbe\x115'\xe3\x16\xa0\xaa@\x19p\xaa\"\x03\x15T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 ؤ\xea\xc5o/^\xb9ml\xba}\xe5\xe2\xb5k\xdd\xe6\xe5\b\x12\x83M\xaaF\xf8x\xed\x15\x8a\x82\"\xc9c\xaf\xaa\xf7)]\xfd\xd8_\xf9\x0f\x04I\x12{U\xa5\xfc}\x1f\xc7T$\x15\xecT\xf5\xfe\xfd\xce\xfb\xf7\x0fn\xbb\xc6~t\xa3\xafH\x92ة\xaa`u\xe99\xab\x12\x041\xc1vU\xbb\xafXU \x88\x19v\xa9\xca\xde\xf0\xbf\xd8\xf6۵kּ\xbe\x8d}[\xfb\xd6{\xdfY\xad\x81 \x06\xecR\x95\x1d\xf4\xaf}\xbct\xfa\xe4ɓ\x1fa\xff\x9f\xfe8\x9b\x06\xe0y\x00$\x19lT\xf5\x85\xc9\x1f\u007f\xf6\xe7\xcf\xfe\xcc\xf8\xec\xb3_N>\x83\xaa\"Ia\xa3\xaa/\x96\xde\xd5\x1f\xae)=C;)ڊ$\x8e\x9d\xaaN\xffB\u007f\xf4\xc2\xf43=U#H\fv\xaa:UW\x95.GU\x91$\xb1Q\xd5\xe5\x8f\xdd\xd8\xf6\xa3\x1f\xfd\x1b\xfb_\xe9\xfd\xdfN\xbf\xb8wm\xe7\xc15\xca\xf5\x00G<\x84\x90\xb9\xfa\n;\xf2\x9aL;\xb2\xa0\xde\xfbk\xb3\xe6v\x8d\x14\xf3\x9fGg\xe4\xe7Lk)\xd9mV\x838\x1b\x1bU}~&\xfd\xe5\xf7\xfe\xee\xfb\u007f\xf7\xfd\xef\xfd\xf7\xcemSo\xbf\xfe\xd8\xed?\x94*\aW]\x9f\x8c-\t\x9c\xd7W\xf8 \xfb\xed\xd8^Z\x0eŶ\x19)\xd1J̚\x83\xfb\xaa4\xf6\xe3\x90V\xde\xf4F\x05\tGh#\x90\xb0Q\xd5\x17J\xbf=\xb7m\xdb{\xec\u007f\x1fӗ\xa6\x9e\xbb\xf2Y\xf7\x95/:\xd5\x1a\xbf!<2Hc\x99\xf0\xa4I\xa3\xca\x1dO\xa5\xe7\x96\xe93u\\\xd52?\xeb5X\x85\xaaB\xc4FU\x95\xb9j\xb7\xe9\\\xd5o\x99s:~\xb6EA\v9DZL\x9f\x11\xaa\x0e\xe7\xf9\xaf\xf4(Iin\x81\xf4/v\xaaZzN\xceLٷ\xff\x98z\x86ލ>Y\x15Q\xf5\xba\x8f\x10\xcfV\xb9\xbc\xb3\xacH˟1,H\x9b\x88d\x1co\r\xbe\xf6hv\xf1\xc2\x0eJ\x9f!\xda\xc6\x05\xc5YegEq\xddPZ\xc8\x13\xa9\r\xad\xdfT\x16\xe6\xce\x12\x13\x80'\v\x8e\xf1u\xb7\xdfR{8\x92I\xc8\xd2S\x95\xc3}e]\x8d\xac\xfb:ZG\xc4\x14A/@\x1c\x81\xad\xaa\xde\xd0\x1f\xae)5\xf9\b@\x19U\x0f\x05\x02\xde:\xb1t \xa3\xf2\xed\x1d\x1b\xf3I\x17\xbd\xb3;0zZ \x108\xc1\x9b\xe7yj\xb67\xe4\x8d\x0fҿl\xcd$yu\xbfΑ\x19\xd5\xfeYt6\xefEm=\x95S\xbc\xb9\xa9\x8cpUۋ<eu{\x1ePC\x0f\x1d\x8d[\x87\x8d\x1eT\xb4\xa02\xe3\xeb[;s\x96]\xa2\x97jsw\xdeR\n\x10G`\xa7\xaa3\x9f\u007f\xe9\xc5Ռ\x17W\xbf\xf4\x93GL.\xb06N\x00|R\xd5uy]\xfc{\xae0F\x9f\x00\xbcK~Ǿ\xef'|\xe4\xd5r\xcfRZ\x99Ǜ\x83\xd9\xf5\xb4>[\x94FZ\xa7\x8cb#c\xb0\x84\xabJ\xaf\xae\x98\xa0\x91\xdcƨ\x1e\xe8x\xe2\xbfI\x837\xd9\xd2<>\x1b\xae\xfcYt\x01\xd2\xffب\xea[?}\xact\xaa\xa4\xf4\xa7?\xbf\x98\xa0\xaa\xe7\v\x87\xd7l<\x1c\x94#\xa1\xae\xea\x93#\x1et1\x86\xf2\x93[\xda\x1c\x1a\x9a\x8a\xd2#dw\xc7nr\x84\xaa\xad\xd7\xc9F\xfex\xa9\x16Z\xf5ގ2\xb2\xdd\xd8\x03\x1d\xaf}\x1dz\xb6\xc5\xd7A;\xb2Z\xa26\x818\x00\xbbTe\xdc8w\xe6\x8b0\xe7\xbe5\xb9\xb6\xdaTUz}\xc3\xecb\x92\xbf\xca8\xaa\x96\x84\xe6\xad\xfc\r^\xe3\x85R\xd5\x06\xd1\xd8@\xd5\xd6CDĮ\x8b\x82\xfd\xdf\xf0\xc5\xe0\xa4rc\x0ft\xfc\xb8\xf0V\xbb\xf2\x9bhS~0j\x13\x88\x03\xb0QUK\xa4\xaa\xb7\x96]\x15\x8fB\xaa\x1eZ̼\xb9\xbeշ\x8e?\x10\xaanf#`\xe5\x88C\x02\x9e\xa4\xae\xa8:k\xdc\xfe\xfd\xfb\xc7͢j\xeb߈Xu\x0e/(\xa8\x11}.\x19e쁎\x9f\x15\xde\aZSA+D\x95\xa1\x00\xe9\u007f\xecT\xb5\xbb\xfb~\x98n\xb3\vU\xa4\xaa\x87\xc9N\xf1(\xa4j\x1d\x11q\xe9\xfe\xeap\xc5%~t\xde,O\x8d.YI\r\xaa\x16.d\xdf\x16\x14RC\xeb\xc4\"\xe6\xfeI/_\xcc/\xe4\u007f\x06An\xa6ڃz\x12l\x8f\xf7\x82w\x0f_0\x14 \xfd\x8f\x9d\xaa\xf6Lמ\xb1%\xec\xf8>\xb0\x81\xbda?\xf8$\x10\xf0V\x05v\xde\xe4\xaaf\xd7~\xd04W\x9e-\xad\xd3\xea\x9b\xfc\xd9\xfc#\xad\xc5\x19O\xbf\xcdZߠ\x17\x02Zվ\xe0\xe1*-p\xa1\xa3\x99,\xb9C\xef\xfc\x8a4\xdfSZ鱬\xa2\xba\xa5\x83=\x99\xbf;N\xf3IAms\x93\xdfwR\xed\xa1k\x8f8\xb3\xd0.w#XXV(\x0f\xfa\xf5\x02\xc4\x118Gգ\x9e\xd0\xe4\xd0w\x82\x1e\b-o\xa0\xf4\xb5iuEZ\x81_\x9e\u05ffW3\xd87m\xbfXl\xf6\x0fɝ\xd2\xccϠ\x12\xa2\xb5f\xb3\xef\xcf\xec\xc8\xe0\xe7C\x9b\b\xc9ء\xb4Rz\xaa|\xf0\xf0\xe7~\x97\xc9\x16'l^R\x9c\x9dWq\xd2\xd0\xc3\x11\xb9\xb1\xf2\xd0~\xd4k\xf5\xa1\xa5p\x01\xe2\b\x9c\xa3*\x82\xf4\b\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xf4\xb3\xaa\x18\x12\x84$J?\xab\x1a\x01C\x82\x90\x9eq\x86\xaa\x18\x12\x84X\xe2\fU)\x86\x04!V8AU\f\tB\x12\xc0\t\xaa\n0$\b\xe9\x19Ǩ\x8a!AH\xcf\xf4\xb7\xaa\x18\x12\x84$H\u007f\xab\x8a!AH\x828@U\f\tB\x12\xc1\x01\xaabH\x10\x92\bNP5\xa1\x90\xa0\xa6G/\xc5y&U\xaeN\u009bWC\xc2\t\xaa&\x12\x12\xb4\x8a\xd4Eݓ\xb7\xd7a)\xc1U\x9e\xd8\xfbQa\u038bcq\x80\xaa\x16!A\x82\x06\xcfkQ+\xa6#,e{fCt\x13\xe6\xbc8\x16\a\xa8j\x11\x12\xc4i\xd3\x16\x87\x17/\xfb\xe5]$\xd3\x12\x96\xb2L;\x1bӆ9/\x0e\xc5\x01\xaaZ\x86\x04Q:\xb7@O\x8f8F\x8e\x89\x9fi\tK\xb9S\x10{Oj\xccyq(\x0eP\xd52$\x88>\x18\xb4H.4\x8c~\xf7\x049\xb1}\xf4\xfaT\xc3R\x94\x02\xd1\xe12_L\x82\n\xe6\xbc8\x14'\xa8j\x15\x12D\x0f\xcb{\xa4\xf3_7y\x98\x94\x90Y\xe7S\rKQ\nĚ\xbb\xc9\x1e\x1a\x05\xe6\xbc8\x14G\xa8j\x11\x12D\xb7\x93\x93\xe1\xc5f\x8dh\U000969e9\x86\xa5D\n\x18gI\xcca\x13\xe6\xbc8\x14'\xa8j\x15\x12\xc4\xdetC\xb7\x94\xbe\xba@+$\x85\xde\xe7\xfe&\x1f\xa6\x14\x96\x12)\xa0\\\xd5F\x1a\x05\xe6\xbc8\x14\a\xa8j\x19\x12D\xf7\x91O\xe4ª\xfc\r\xc7\xc9_\x1a\xf2W\xf6\",%R@\xf9p\x15sr\x13s^\x1cJ\u007f\xabJ\x13\b\t\xa2\x1dZH\x18\xfa\x80\x1e#\xc7\xe9\x83`/\xc2R\x94\x02\xaeN\xccI%\xccyq(\x0eP5\x01f\x8d\xd2\x0f+\xce\xe7\xca\x13\xf4)\x87\xa5\xa8\xa7\x9a\x82\xc5\xe1\x04\x00ھ\xb2M.`\u038bCq\x82\xaaV!A\x94\x9e\xf0\xc4|P\x99ZX\x8a\xb1\x80\xd6\x13\xfd\x83\xa7\n2\x83\xff\xc0\x9c\x17\xc7\xe2\x04U\x13`\x997zN\x99ZX\x8a\xb1`\xa7\xef9\xbd\xbf\xcdy\x1b\xf8\x0f\xccyq,@T\r\xce\xd7\x1a\xadj\x92\xa6Q\x9b\xdbeU\x838\x06 \xaa\xd2`\xfd\xd0t\x1fY\\-X\x89'\xd6\x01\x01EU\xc4\xf5\xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\x0eU\x15\x93W\x90h\x1c\xaaj\x04L^A$\xceV\x15\x93W\x10\x1dg\xabJ1y\x05\t\xe3dU1y\x05Qp\xb2\xaa\x02L^A$\x8eW\x15\x93W\x10\x89SU\xc5\xe4\x15$\n\xa7\xaa\x8a\xc9+H\x14\x0eV\x15\x93W\x10\x15\a\xab\x8a\xc9+\x88\x8a\x93UM(y\x05q\vNV5\x91\xe4\x15\f\tr\r\x0eV5\x91\xe4\x15\xdbB\x82\xd2\xd0/\xd2;\x1c\xacj\x02\xc9+\xf6\x85\x04\xa5\xa5_\xa478X\xd5\x04\x92Wl\f\tJK\xbfH/p\xb0\xaa\xd6\xc9+v\x86\x04\xa5\xa5_\xa4\x178YU\xcb\xe4\x15;C\x82R\xeb\x17I\x1f\x8eV\xd5*y\xc5ΐ\xa0\xd4\xfaE҇\x93U\xb5L^\xb15$(\xd5~\x914\xe1`U\xad\x93Wl\r\t\xa2)\xf6\x8b\xa4\t\xa7\xaaJ\x13I^\xb13$(\xe5~\x914\xe1`U\xad\xb13$(\xe5~\x914\xe1dU\xad\x93Wl\f\tJ\xb9_$M8YUk\xec\v\tJ\xb1_$}\xc0Vվ\x90\xa0\x14\xfbE\xd2\apU1$\xc8=\x00W\x15C\x82\xdc\x03tU\x11׀\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10`\xaaڍ!A\xee\x03\xa6\xaa\xf7)}i&\x86\x04\xb9\v\x98\xaa2:\xa3\xc2\x02\x91\x81\x0eLU\xd9;\xff\xde\u05ef\xe1\x04\xc0U\xc0T\x15'\x00.\x04\xa6\xaa\x14'\x00\xee\x03\xa6\xaa8\x01p!0U\xc5\t\x80\v\x81\xa9*\xc5\t\x80\xfb\x80\xa9\xaa\x9c\x00tw\xd2\xee\xfb\xfc\v\x87W7\x00S\xd5\xd0\x04\x00q\x130Uet\xde\xe8y(Ő\xa0\x81\x06LU\xf95\x00o\xdd\xdf\xfbR\xe7\xde\xd5\xec\xeb\xee\xc1\xb51\x15\xb6\x85\x04U\x11B\xb2NŶ\xab\xfc\xad:\xdf7\x03o\x83\xd1K`\xaa\xca\xefi\xfd\x93\xef^\x9fy[|\xdd\xd8\xf6\x93\xe8\x02\xfbB\x82\xce\x06\x02\xeb·y\x8d\x87\xbf`\xc3\x1c\xdf\xf5\x9ek\x10+`\xaaʸ\xfb\x1d\xbd\xf6\xd7\xd0\u05cdsQO\xda\x18\x12D\xf9}\x83{V\xf5*i\xa0\xc1\xe8\xfb\xb5\"\xc9\x02SUq\x06\xe0J\xfc\xe7m\f\t\xa2֪\x9e\xea\xddF\x11\tLU\xc5\x19\x80\xaf\xba\xef\xc69YegH\x10UT\r\xae\x1f\x975v\x9d\x98\x94^\xae\x1c2t\xe1\xc2!ٍ\x0f\x86ț\xad/\x88]\x0fI\n\x98\xaaҞ?\x02\xb03$\x88*\xaa\xceіn_\xaaU\xb1\xa5\a\x0f\x17\xac\xab\xf5\xfa6\x97\xd5\xd3Á\xad\xa4.\x10\xb8\x10\xbb\x1e\x92\x140U\xb5\xb8\x06\xc0\u0590\xa0\x88\xaaͤ9\xfc\xbd\x91\x1c\xa1t\x1d9.\xdaq\x02\x90\x16`\xaajq\r\x80\xcd!AaU畈\x1f\x0f\xb3auq.[8\x19R\x14UM\v0U\xa5=O\x00\xec\f\t\xa2\x11U'\xc9\x1b\xad\x97O\xa4\xb4>\xe32\x1f_\xe5\x11\x1d\xaa\x9a\x16`\xaaj1\x01\xb03$\x88FT\x9d;\x82{\x1e\x1c>\x87ү=e_\x1f\x19=I\x9e\xf6GU\xd3\x02LU\xad.\x02\xb41$\x88FT\xdd.&\xb7[\xf9\x1c\xe3\x10\xc9'\xc4\xff\x8d|\x1eUM\v0U\xa5\x16\x17\x01\xda\x18\x12t\x9e\u007fZU\x1f\b\xf0\tm\xa5g\xf1\xbb\x8b=\x95l\xe9\x90w\xc7\xf6\xc07\xa23y\x06`\x1f~\xae\xda[`\xaaj\xf9\xaf\x00\xec\v\t\x9a\x13\x9a\xd7\xf2\xd3\a\xc1\x86\x92\xac\x12q^u\xb7\xc6۴i\xc7\xe8\xbd\\\xf1t\xe6\t\x8a\xf4\x0e\x98\xaaZM\x00\xfa;$\xe8Rv\xf5\xa5\xae\xae\xeb\a*\x06\xe3'\xffi\x03\xa6\xaa\xd4\xf2_\x01\xf4oHPS\xae\xac\f\xe6c\xccZڀ\xa9\xaa\xe5\x04\xa0\x9f9䑧\xa9\x8ey\x0e[T\"\t\x03SU\xcb\t@?\x13\x9c\xeb\xabnli\xac\xf6U':\x0e#\x96\xc0T\x95ZN\x00\xfa\x99`SY\xa1VX\xf6.\x9a\x9a>`\xaa\xea\xf4\t\x00\xd2\a\xc0T\xd5\xe9\x13\x00\xa4\x0f\x80\xa9*u\xfa\x04\x00I?0U\xc5\t\x80\v\x81\xa9*N\x00\\\bLU)N\x00\xdc\a\xaa\x8a\x00\x01\xa6\xaa8Wu!0UŹ\xaa\v\x81\xa9*\xc5\t\x80\xfb\x00\xa6\xea\xb6\xce+w;\xef\xdfg_{_\xbf\xc2\u007fܧ\xf7\xef\xde\xed\xbck\xb5\x1e\x02\x1f`\xaa\ue95d\xfc\a{\xe7\xff\x8f\xd238\x01p\x15\xc0T\xedԗ\xae\x9c\x89,#n\x00\x98\xaa\xfc\xa0\xff\xe0\x1fV\xbf\xb0|\xf9\xf3\xbf\\\xbe|\xf9\v\xbf\u007f\xeb6\x9e\ap\t\xd0Te\xef\xf9k\x1e/e̔ߧ\x9e\xc3i\x80K\x00\xa8\xea\v\x93\xf7~u\xe6\xab\xef\xe8\xc53_}\xf5\xfcd\x9c\xb1\xba\x05\x80\xaa\xbeX\xfa\x1d[x\xef\x17\xfc\xe1\x9a\xd23\xddw1\xb6\xc2\x15@Tu\xfa\x17l\xe1_\x1e\xda\xcb\x1e-\x9f~\xc6j\rd\x80\x00RU\xae\xe7\xffx\x88\v\x1b_U\x8c\xad\x18h\x00Tu\xf9\xcc\xdb\u007f\xf8\xd7\x1f\xfe\xb7\xef\xfd\xf3\xbf\xfe\xcf\xfb\xafO\xbd\xf2\xf1\x8b\x9d\a_\x8a\xa9\xb3-\xb6\"\x01\x8e\x97e\x17T\xb6\x14\xa4\xfbO\xc7m\x00T\xf5\xf9\x99ݿ\xfc\xc1\xf7\xbf\xf7\xd0\x0f~\xf0\x8f\x9doM\xbd\U00047677\xfb3\xb6\u009a\xe6\xec\t\x1b\xb7\x96\x10\x82\xf7W\xe9\x1d\x00U}\xb1\xf4ܕ\x83\a\u007f\xf8\xfd\xb5\a\xffLWO\xff\xea\xc6W\xf4\xf6\xb7QU\xf6\xc6V\xf4\xcc՜\x8a{\x94\xde\x19\x85\xaa\xf6\x12\x88\xaaN\xfd\x8c-\xfc\xf0!6K\xed^^j:W\xb57\xb6\xa2g\x16\xfb\xfe\x1f\xffQ\x8f\xaa\xf6\x12\x88\xaa\x96^d\v\xa5\xffą]=\xdd\xecd\x95\x8d\xb1\x15\xcf\x10m\xe3\x82⬲\xb3T\xed\xb7\x96u\xb3\x95neߗ\xd1Q?\x13\x85\x97\xeb\xef)\xb9\x16\xcaj\x86\x1e\x90\xf8\x80T\xf5\x9a\xfe\xf0%ӋVl\x8c\xad\xf8\xcb\xd6L\x92W\xf7\xeb\x9c\nC\xbf\x97\x9e~\x94usk\xf7\x94\xca\xcb\xf7<\xe1\xbb\vR%\xd7BY\xcd\xd0\x03\x12\x1f\x88\xaa>\xfe\x8b\xe5\xcf?\xbf\xe6\xf7\xec\xdb\xf2\xc7\x1f1\xbb\xc0\xda\xd6\xd8\n-\xf7,[-ϸ\xdak\xc5\u2e52\xd7h\xbb2\xe5Pr-\x94\xd5\xd4E$>\x00U\xdd\xf6\U000d93d5J\x1e\xfb\xf9/\xae\x98\xa8jkl\x856\x87\xf2\x1b\xaf\x1bW;\xe2\xb9\xd7\xf1\xda\xf5.\xed\b}\x90\x19\x19U\x95\\\ve5u\x11\x89\x0f4U\x19w\xaf\\\xbc\xf8\xed\xb7\xd7\xee\xb2o\xdf^\x89\xcc\x05\x14l\x8d\xad\x10\xb9\x03B4e\xb5{\x99G\xebɲ\x13\x1e6?\r\xcdU\x1f4\x1br-\x94\xd5\xd4E$>\x00U\xa5\xe2R\xc05?\xbd\xe2\x8c؊\x88h\xeaj\xc5[\xfdS\x8a\x9b\xf84`\xb1Ot\xd3H.\xa9\xb9\x16\xa8j\xd2\x00T\xb5\xbb\xb3\xf3Fg\xe7O'\xef\xed\xbcq\xbf\xd3\xfcB\x15;c+\"\xa2\xa9\xab=]\xa35\x93g\xf8\xec\xf7jN\x05;\x98\v\xfa\x87\x1br-Pդ\x01\xa8\xaa\xe4\xf6\x95\x1e.\xa9\xb6/\xb6\xe2B@\xab\xda\x17<\\\xa5\xf1dJ}5JWf\xe5\x04G\xfbV\xf0\x92\xe6\xacI\xbfk*\xcb\xe43\a=\xd7BY\xcd\xd0\x03\x12\x1f\x98\xaavR\xba\xf6\u007f\x9f\xa1\xf1\xffɊm\xb1\x15\xcf\xf0t\x8a\xd6l\xf6\xfd\x19e5J\x0f\xe5\xd6\xd2U\xd9\xfbE\xe9\xf1\xb2\xac\xfc\x8aV\xbe\xa4\xe7Z(\xab\x19{@\xe2\x02Sջ\x94\xb2\t\x00\x8d\xff\x0fU\xfb9\xb6\x02\xe9\x03`\xaaJ-&\x00\xfd\x1d[\x81\xf4\x010U\xc5\x1b\x01\xb9\x10\x98\xaa⍀\\\bLU)\xde\b\xc8}\xc0T\x15'\x00.\x04\xa6\xaa8\x01p!0U\xa58\x01p\x1f0U\xc5\t\x80\v\x81\xa9*N\x00\\\bLU)N\x00\xdc\a\xaa\x8a\x00\x01\xa6\xaa8Wu!0UŹ\xaa\v\x81\xa9*\xc5\t\x80\xfb\x00\xa6*\xc6V\xb8\x17`\xaabl\x85{\x01\xa6*\xc6V\xb8\x17`\xaabl\x85{\x81\xa6*\xc6V\xb8\x16\x80\xaabl\x85;\x01\xa8*\xc6V\xb8\x13\x88\xaabl\x85+\x01\xa9j_\xc7V`@\x85\x13\x01\xa8j\x8a\xb1\x15I\x90r@\x05҇\x00T5\xb5؊\xe4H-\xa0\x02\xe9K\x00\xaa\x9aZlE\x92\xa4\x12P\x81\xf4)\x10UM)\xb6\"IR\t\xa8@\xfa\x14\x88\xaa\xa6\x14[A\xe9\xe9Y\xf9Z\xc1\x8cohb\xe9\x111\x01\x15\x94\xee,+\xd2\xf2g\f\x13\xf7HM8\xf8\x02I\x17 UM%\xb6\x82\xb6d\x8f[\xb5\xa3\x8e\xf0{\xfd%\x92\x1e\x11\x13PA\x0fdT\xbe\xbdcc>\xe1\xb7XK<\xf8\x02I\x17\x10UM)\xb6\xa2\xa3\xa8\xec\x1e\x1bo\x1b\xaf&\x98\x1e\x11\x1bP\xb1.\x8fK\xba.7\x98l\xf0\x05\x92\x16\x00\xaa\x9aZlE39\x1c~:\xa1\xf4\x88\u0600\x8a\xf3\x85\xc3k6\x1e\x0e\xf2<\xa1\xe4\x82/\x90\xb4\x00MU\x9ajlE=\xd1'\x8e\t\xa5G\x98\x04T\\\xdf0\xbb\x98\xe4\xaf\n&\x1b|\x81\xa4\x05\x80\xaaҔb+vD\ue35ePzDl@š\xc5l\xb5\xeb[}\xeb\x92\r\xbe@\xd2\x02@US\x8b\xad\xb8U\xe0\xe7o\xdd5\xf3\x13K\x8f0\t\xa8\xa8\x13\x93[\xea\xafN6\xf8\x02I\v\x00U\x95$\x1b[A[\xbc\x0foh\xae!\x9biB\xe9\x11\xb1\x01\x15L\xd5\xec\xda\x0f\x9a\xe6\x12>\x17M<\xf8\x02I\x170UM!\xb6\x82ғ\xb3\x87\x0e\x9a(\xaeC\xb1N\x8f0\t\xa8\xa0\xafM\xab+\xd2\n\xfc-\xe2A\xc2\xc1\x17H\xba\x80\xa9j_\xc7V`@\x85\x03\x81\xa9*\xed\xdb\xd8\n\f\xa8p\"0U\xc5\x1b\x01\xb9\x10\x98\xaa⍀\\\bLU)\xde\b\xc8}\xc0T\x15'\x00.\x04\xa6\xaa8\x01p!0U\xa58\x01p\x1f0U\xc5\t\x80\v\x81\xa9*N\x00\\\bLU)N\x00\xdc\aXU\x11\xb7\x01SU6I\xfdxm\xfc\xebU\x91\x81\bLUq\xae\xeaB`\xaaJq\xae\xea>`\xaa\x8a'\xab\\\bLUq\x02\xe0B`\xaaJq\x02\xe0>`\xaa\x8a\x13\x00\x17\x02SU\x9c\x00\xb8\x10\x98\xaaR\x9c\x00\xb8\x0f\x98\xaa\xca\t@w'\xed\xbeϿpxu\x030U\rM\x00\x107\x01SUF獞\x87R\x8c\xad\x18h\xc0T\x95_\x03\xf0\xd6\xfd\xbd/u\xee];\xee\x1e\\\x1bS\xd1/\xb1\x15Gg\xe4\xe7Lk)\x89\xbd[\x06\x92\x06`\xaa\xca\xef\xb2\xfa\x93\xef^\x9fy[|\xdd\xe8\xdf؊\x96\xf0-\x83\x0ei\xe5MoT\x10y\xbb*\xbdռ\x16I\x1a\x98\xaa2\xee~G\xaf\xfd5\xf4u\xe3\\ԓ\xb6\xc6VLx2\xb4P\xe6g\x03\xe6\xac֍\x00\x00\aLIDATy\xb0J\xaa\xaa\xb7\x9a\xd7\"I\x03SUq\x06\xe0J\xfc\xe7m\x8d\xad\xd0\xef\x048|\t\xff~\x944\x19Z\xcdk\x91\xa4\x81\xa9\xaa8\x03\xf0U\xf7\xdd8'\xabl\x8c\xadh\n\xdd\xf3\x97\xdf\x0e\xf8\xc9\x02\xfeW\x11\xdc~\xcb\xd0zsv\xa1VT~\x84\x1ak1\xd7\"i`\xaaJ{\xfe\b\xc0\xc6؊;\xbb\xc5M+\x03'Xc{\x91\xa7\xacn\x0f\xbf\x8b\xab\xda\xfa.\xa9ni,\xf7\xec7\xb6b\xaeE\xd2\xc0T\xd5\xe2\x1a\x00\x9bc+\xf47\xf5\xab+&h$\xb7\x91\x1aZ;\x1ao\xb11\xb4\xa4\xc2؊\xb9\x16I\x03SU\x8bk\x00l\x8e\xadP\xe7\x9f\xf7v\x94\x89\xbba+\xad\x97ו\x8d\xc8!r\x9bz+\xe6Z$\rLUi\xcf\x13\x00\x9bc+\xc2\xfa\xed\xe7\xf3`\x1a\x94\xddGZ\v\x8a\x165\x05\xfcQ\xaab\xaeE\xd2\xc0T\xd5b\x02`sl\x05\xd7o\xf3ה\x16\x88\xc4\n\xbad\x94\xa1\xb5x\"\xff\x1b\x99\xa5\xa8\xca[1\xd7\"i`\xaaju\x11\xa0\xad\xb1\x15~?\xa5\x97xC~\xe1U\xbe\xa6L\\\xd1[\x8b\xf8\xc3\xe0X\xa9\xaaފ\xb9\x16I\x03SUjq\x11\xa0}\xb1\x15\xbc]\xabo\xf2g\xb3?\x88|RP\xdb\xdc\xe4\xf7\x9d4\xb4֑\xd9\xebV\x8cg\x13\x87}j+\xe6Z$\rLU-\xff\x15\x80m\xb1\x15\x8c{5\x83}\xd3\xf6\xb3\x85\t\x9b\x97\x14g\xe7U\x9c4\xb6\x06\xebGkyOn\x1e\xa5\xf9\xd5V̵H\x1a\x98\xaaZM\x000\xb6b\x00\x02SUj\xf9\xaf\x000\xb6b\xc0\x01SU\xcb\t\x002\xf0\x80\xa9\xaa\xe5\x04\x00\x19x\xc0T\x95ZN\x00\x90\x01\aLUq\x02\xe0B`\xaa\x8a\x13\x00\x17\x02SU\x8a\x13\x00\xf7\x01SU\x9c\x00\xb8\x10\x98\xaa\xe2\x04\xc0\x85\xc0T\x95\xe2\x04\xc0}\xa0\xaa\b\x10`\xaa\x8asU\x17\x02SU\x9c\xab\xba\x10\x98\xaaR\x9c\x00\xb8\x0f\x98\xaa\xe2\x04\xc0\x85\xc0T\x15'\x00.\x04\xa6\xaa\x14'\x00\xee\x03\xa6\xaa8\x01p!0U\xc5\t\x80\v\x81\xa9*\xc5\t\x80\xfb\x80\xa9*\xc6V\xb8\x10\x98\xaabl\x85\v\x81\xa9*\xed\xdb\xd8\n\x10\xb8.[\x03\xac\xaa\a\xdf\xeb>\xf8\xdbN\xf9\xf5_\xbf\x8fy:\xb1؊\xe6\f\xe2\xd9G?\xf1\x10\xdfu\xabRA\xbdW\u07b5\xa5\x8a\x10\x92u*ܺ#\xaf\ai\x8exXm\xe4~\u007f=\xd6&E\xdcl\x8d\xf0N\x0e4`\xaa\xca\x06\xd4_L\xbe\xb1\x96}=¾\xae\xbd\xfe\xf3\xe8\x02=\xb6\xa2眈\x8e\xb7Ɏ\a\xb4cԄ\x04\xd3$J4y멳\x81\xc0\xba\xf0\xdd\x06)\xfd ;\xfaV\xac\n]\x9f\x8c-\t\x9c\xd7\x1f\x9a֦\x18f\x11'[#\xbc\x93ɑ\xe2>\xd8\bLU\xad\x88\xc4VX\xe4D\xb4\x93[\x94\xd6\x0e\x89\xa8\xd4#w<\x95\x9e\xf0\xfd\x01\xf7GT\xa5=\x8f\xdf\xfc\x96j\x11\xccjS\r\xb30\xcd\xd6Pw2\tR\xdd\a\xfb\x18\x98\xaaFb+,r\"\xb8\xaa͙-=\xd6Dh!\x87H\xb8VU\xb5g\x8c\xaa\x9a\x91j\x98\x85i\xb6\x86\xba\x93I\x90\xea>\xd8ǀT5\x1c[aȉ\xd0c+\x9e!\x99\rՅ\x83\xcb\xf9\\\x93\xa9ڞ\xbbB\xae\xa5\x04I\xe8\x8bj-\xa5uCiamh\x1baU\xaf\xfb\b\xf1\x88ۤ7\xb2-\xd5\xd1:\"\x82\xab\x94\xce\"\xaaFj\x95\f\f\xf30\vC\x8a\x86\xdez$\x93\x90\xa5\xa7*\x87\xfb\xca\xe4-\xb5L\xb25ԝ\x8c\x04u\xa8\x99\x1d&\xaf\xcd\xf8\x1fʡ\fHUñ\x15\x86\x9c\b=\xb6\x82\aT\f[\xb1bX\xd61\xaeꥒA\xf7\xe4ZJ\x90\x84\xbe\xa8\xd62\xe9f\xd1\xd9a\xef\xf4Q\xf5P \xe0\x15w\x1e\xbe\xb53g\xd9%z\xa96w\xe7-Cgʨ\xaa\xd7*\x19\x18\xe6a\x16\x86\x14\r\xbd\xb5\xa3q\xeb\xb0у\x8a\x16Tf|-z\x89\xcd\xd6PwR\t\xeaP\x16\xcd^\x9ba\x1f\x9cʀTU\x89\xad\x88\xa4GDb+\xa86\xfc&\x1b\xe2\x8a&rU\x9f\x1eU\xb0N\x14(A\x12j\xa6D\xa4\x96\x06\xb3\xebi}vh\xb2\xa9N\x00|\xa1\x9bd\xcf\xe3\xf3\xbdʟ\x19;\x8b\x9a\x00\x84j\x95\f\x8c8a\x16\x91\x14\rcH\x06\xf1ߤ\xc1\x9b\xb2>6[C\xd9I\xe5\x15+\x8bq^\x1bN\x00\xfa\a=\xb6B\xf9\r(\xb1\x15T\x1et\xad#W\x99\xaa\xbe㛇\x88_\xbc\x12$\xa1fJDj\xe9\x11\xb2\xbbc79\"\xfb0S\xb5\x85\xbd\x1fwd\xb5\x18;3WU\xc9\xc0\x88\x13f\x11I\xd10\x86dh_G:\x8b\xcd\xd6PvRy\xc5\xcab\x9c׆\xaa\xf6\x0f\xfb\"\x1a\xe9\xbf\x01%\xb6B\xdeJ\x9d\x06\xc8!\xa6\xeaV\xdaU,R\xfc\x94 \t5S\"RK\x1bDc\xe8\x04\x91\x99\xaa]\xf9M\xb4)?h\xec\xcc\\U%\x03#N\x98E\xe4~\xefƐ\fu>i\x92\xad\x11\xd9I\xe5\x15+\x8bq^\x1b\xaa\xda?Db+\"9\x11Jl\x05\xd5\xe6\xf3\xef\x1b\xc9My\xb2\xaa\xd9\xcbOV)A\x12j\xa6D\xa4\x96\xce\x1a\xb7\u007f\xff\xfeq\xb3d\x1ff\xaaҚ\nZ!\xb2+\xd4\x1e\xa4\xaa\xb7\x96]Uk\x95\f\x8c8a\x16\x11U\x8d!\x19\xb3h\x84\xd8l\re'\x95W\xac,\xc6ym\x91}p,\x03RU%\xb6BωPb+\xa8\x96\xcf~\xc3wF\xf8C\xe7U\x83\x93x\x82\x95\x12$\xa1fJDji\xe1B\xf6mA\xa1\xec\xd8T\xd5=\xde\v^q\xa0\xa3\xf6 U=Lv\xaa\xb5J\x06F\x9c0\x8b\x88\xaa\x86\x88\vu\xf43\xc9\xd6PvRy\xc5\xcab\x9c\xd7\x16\xd9\a\xc720U\x8d\xc4VDr\"\x94\xd8\n\x8d\x8ck\xdc<:\xf7$\xedh\xe2\x9fVѷ3\xb6\xdf3\x04I(\x8b\x91\xdaf\xb2\xe4\x0e\xbd\xf3+\xd2|\x8f\x9e\xe7\x9fV\xd5\a\x02l\x10z\xf0\t;\xaa\xaf\n\xec\x14\xf3\xdd`aY\xa1\xfc#\xd1{\xe8\xda3\xb6\x84\x1d[\a6\x90\x80Z\xabf`\x98\x85Y\x18R4\x94\xceđzx&\x1e\x9b\xad\xa1\xee\xa4\xfa\x8a\x95E\xb3\xd7f\xd8\a\xa720U\x8d\xc4V(9\x11\x91\xd8\nm\xe1ܜ\xc2\xca\v|\x88\xe1\xd7\x00\xd0i$\x83\x0f\x91J\x90DdQ\xafݑ\xc1O\x986\x11\x92\xb1\x83\xce\tM\xf8\xd8\x11\xff\x01\x8f\\\x94\xd1\x16\xf5Z}h\x0f\xc2=\x1c\r=O|'\xd4ZC\x06\x86I\x98\x851E#\xdczDv\x10\x1aKM\xb25ԝT_\xb1\xbah\xf2ڌ\xfb\xe0P\x06\xa8\xaa=\xc7VD\xa6\xb2\xd6$Sk/\xbd\xcf\xd6p\xeek3c\x80\xaa\xdaslE2\xbf\xa2djm%\r\xd9\x1a\x8e}m\xa6\fTU{$\x99_Q2\xb5Ѐ\xf5\xda\\\xa8\xea7\xe2\x88ŪJ\x92L-4\xa0\xbd6\x17\xaa*\x8eX\xdaiB$S\v\rh\xafͅ\xaa\"0AU\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\x02\xaa\x8a\x00\x01UE\x80\x80\xaa\"@@U\x11 \xa0\xaa\b\x10PU\x04\b\xa8*\x02\x04T\x15\x01\xc2\xff\amu\xa3\x1c\xa2\xebff\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/ipcg-pkg.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x02\xf0\x00\x00\x03\xc6\b\x03\x00\x00\x00\xb2,^L\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x02\x04\x00\t\v\a\r\x0f\f\x10\x12\x0f\x13\x15\x12\x1b\x1d\x1a !\x1f!#!$%#&(&+-*/1.2416859:8<=;>@=AB@DFCFHEJKIOQNQSPTVSWYV,`\xae7]\xad8^\xae[]Z8a\xaa:b\xab;b\xac_`^<c\xad=d\xae?e\xaf@g\xb1Bh\xb3egdDi\xb4Ck\xafFk\xb6Lj\xafhjgNk\xb1Fn\xb2Ho\xb4Pm\xb2kmjIp\xb5Kr\xb6nomMs\xb8Nt\xb9Ou\xbaPv\xbbrtqXv\xb6Yx\xb8vwuZy\xb9[z\xbaxyw]{\xbbV~\xbd_}\xbeY\x80\xbf`\x81\xbbb\x80\xc0[\x82\xc1~\x80}b\x83\xbdc\x84\xbe\x81\x83\x80e\x85\xc0g\x87\u0084\x86\x83\x85\x87\x84i\x89Æ\x88\x85j\x8aŇ\x89\x86\x88\x8a\x87q\x8c\xc1\x89\x8b\x88s\x8eË\x8d\x8at\x8f\xc4v\x90ō\x8f\x8cw\x91Ǐ\x91\x8eq\x94\xc9y\x93ɑ\x93\x90z\x94ʀ\x94Ł\x95Ɠ\x95\x92{\x98ǂ\x96ǃ\x98ɖ\x98\x95\u007f\x9cˆ\x9a˘\x9a\x97\x80\x9d͈\x9d\u0382\x9fϜ\x9e\x9a\x88\xa0˄\xa1ў\xa0\x9d\x8a\xa2̋\xa3Ρ\xa3\xa0\x8d\xa5ώ\xa6я\xa7Ҥ\xa6\xa3\x90\xa8ӑ\xa9ԧ\xa9\xa5\x92\xabՔ\xac֩\xab\xa8\x98\xacѪ\xac\xa9\x9a\xadӛ\xafԭ\xaf\xab\xae\xb0\xad\x9d\xb1֘\xb4ذ\xb2\xaf\x9f\xb3ء\xb4ڲ\xb4\xb1\xb3\xb5\xb2\xa2\xb6ܣ\xb7ݝ\xb9ݵ\xb7\xb4\xa9\xb8ٶ\xb8\xb5\xa3\xbb٫\xbaڸ\xba\xb7\xac\xbbۦ\xbdܹ\xbb\xb8\xad\xbcܮ\xbdݯ\xbeߩ\xc1\u07fd\xbf\xbb\xb0\xc0\xe0\xab\xc2\xe1\xb2\xc1\xe2\xbf\xc1\xbe\xad\xc4\xe3\xb7\xc2\xdd\xc1ÿ\xb2\xc5\xde\xc2\xc4\xc1\xb9\xc4\xdf\xc3\xc5º\xc5\xe0\xb4\xc7\xe0\xbb\xc7\xe2\xb6\xc9\xe3\xbc\xc8\xe3\xc6\xc9ſ\xca\xe5\xb9\xcd\xe6\xc9\xcc\xc8\xc1\xcc\xe7\xc2\xcd\xe9\xbc\xcf\xe9\xbf\xcf\xe2\xcd\xcf\xcc\xc7\xcf\xe4\xc8\xd0\xe6\xc2\xd2\xe6\xca\xd1\xe7\xcb\xd3\xe9\xc6\xd5\xe9\xd2\xd4\xd1\xce\xd6\xeb\xc9\xd9\xed\xd5\xd8\xd4\xd0\xd8\xed\xcb\xdb\xee\xd4\xd9\xe9\xd8\xda\xd6\xcc\xdc\xf0\xd6\xda\xea\xd7\xdb\xeb\xda\xdc\xd9\xd1\xdd\xeb\xd8\xdc\xec\xd9\xdd\xed\xdc\xdf\xdb\xd4\xe0\xee\xdb\xdf\xef\xde\xe0\xdd\xdd\xe1\xf1\xe0\xe2\xdf\xd7\xe3\xf1\xd9\xe5\xf4\xdf\xe4\xf4\xe3\xe5\xe2\xde\xe6\xef\xe5\xe7\xe4\xdc\xe8\xf6\xdd\xe9\xf7\xe6\xe7\xf1\xe0\xe9\xf1\xe7\xe9\xe6\xe8\xea\xe7\xe2\xeb\xf3\xe9\xeb\xe8\xe3\xec\xf4\xeb\xed\xea\xe5\xee\xf6\xec\xed\xf7\xe7\xef\xf8\xed\xef\xeb\xe8\xf0\xf9\xee\xf0\xed\xf0\xf0\xfb\xf0\xf2\xef\xee\xf3\xf6\xf1\xf3\xf0\xf4\xf2\xf6\xf2\xf4\xf1\xef\xf5\xf7\xf0\xf6\xf8\xf4\xf6\xf3\xf2\xf7\xf9\xf3\xf8\xfb\xf6\xf8\xf4\xf7\xf9\xf6\xf5\xfa\xfd\xf8\xfa\xf7\xf6\xfb\xfe\xf9\xfb\xf8\xfa\xfc\xf9\xfd\xfb\xff\xf7\xfd\xff\xfb\xfd\xfa\xf8\xfe\xff\xf9\xff\xff\xfc\xff\xfb\xfe\xff\xfc\x9fIc\x17\x00\x00 \x00IDATx^\xed\xbd\vlT\xe7\x9d\xff\x9dn\xbb\u007f\x92\xf4\xbe\xffM[\x1e\a\x9d\xe0\x91c\xaf\x16\xd9kհuJ\x9b8\xf0&\u0080\x18\xe3\x80l(\xb7֊X\x87\xb0\x15\x97\x10\x93FXd^BH߄\x05\x8aCK\x92%\x1b\xe3\xd5\xca.V\xc1ZHF@P$\xccE\xa4)I\x1b\xc0\t!\\\x82\x13\b66c\xec\x91~z\xcfs\xce\\\xce̜\xb9ٞ\xe7\xfc\xec\xf9~\x82f\x9e9\xf3\x9ccW\xfd\xcc\xf1\xf7\x9c\x999\xdf;\b\x80,\xe2\x8ed\x13\x00\x18M@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U@x\x90U$\x12\xbe\x03\x80\xd1\x06\x84\aY\x05\x84\aY\x05\x84\aY\x05\x84\aY\x05\x84\aY\x05\x84\aY\x05\x84\aY\x05\x84\aYEj\xc2\xe7\n!\xfe\xdfx\x9b\xf8\xf3\x9f\xe2=\x93\x16%\xfa\xcf\xf8\xafd\x93\"\b\xae\x91\xfe\x9aI\x90\x1b\xfc\xefd\x93\xc0\x88d\xc8\u009f\xd98\xe1i\xfbg\xd2$}m!<H\x9b\xa1\n\xff\xa72! <\x181\fU\xf89\x02\u0083\x11\x04\x84\xb7\x01\u008f^ \xbc\rq\x84?\xfa\xefQ\xe0E1\xf2HO\xf8B!r;\xfeZ\xffP^\xee\x03\xab\xfe\xac?\xae\x15\x01^\x95\xb3\x8e\xfe\xfb\x03\xae\xf1\xc5U\x01\xf7\xfe\xaa/\xfeYG}\xb1V0\xe7L̊:g\xfe\xc3]8>\xc75\xf1\x17\u007f4\x1f\xc7j\xfb\xd7\x17\xdd\x05Zn\xc9/\xfe\xa7#\xf1\x1a\xb1k\x1e\xae-\x19\x9f_\xfej\xc73\xfa3\x9e\xa8_%f3\x9a\x10\x85\x1dG\x97M\xd4\xd7\xf8}x\xc3\xff\xfd7\xcfC\xae\xdc\xc9O\xbfo\xd9\xec\x83\"\x02\xedp\a\x18i\xa4/\xfc\xe1\u007f5\xff\xef.>\x1c%\xfc+\xae\xc0\x03\xb7\xa1\xb4a\xd9*\xf9\xb8<vŎ\x8e??\x1c\x12g\x85\xf13b\xb4}\xeb_\x83\x13~\xf5\xb7\x84kĬ\xf9jn`\xbd:\x11\x16>\xf8\xab\xc4lF\n\xff?\xf9撪\xbf\x067\xbc\xad\xcc\\2\xe9\x84e\xbb\"\x82E\x1d`đ\xb6\xf0Zq\xf0\xffow\xa4\xf0\xaf\x8e\r\x99\xf0\xa8\xbe\x1f5,\xcb3\x96=\x1f\xbbbGG\x95\b\xf3\x9frA\xb4\xb6\x87\xf3\xc3\x13j\x13\xae\x11\xbd\xe6\x1f\xb5\xe0\xb4\t\"$|\xe8W\x89ٌ>;//\xb8dAp\xc3\xc1W\xaf\x98g\xd9\xf2\xcf,\xebb\a?\"I[x}w\xe8\xf9\xe3\x169\x18\xf7玷^\x9d\xaa\x0f~\xf1\xea\xab':\xfe,\xfd|h\xdb\x1f\u007f#\xdd\xd1%3,\xd3'=T\x92s\"vŎ\xff\x95\xf7\xab\xff\xf8\xa7\x8dr\xb5_ɟ\x11\xad\xedt\xfd\xf1\xf8e\xafnyT\xbf\xcfy+\xd1\x1a\xd1k> \xd7\\\xf5\xc7\xff2\xd5\xf6D\xfe*\xb1\x9b1^\x1e\xf9O\xbf\xea1^\x91\xc1\r\x8a\xe2\x8d\u007f\xfa\xddD\xb9%K\xa8\x89\xd8\xc5\xff\xa2\x03\x8c<\xd2\x17>O\xee\xd8\xfe(\xff\x1f\x97ﰆ\x0eZ\xeb\xf5\xc1\x032\x10\xfcQߕN\xec\bX\x96\xab\xcf\xd9k\xb7\xe2\x9f~55\xcfH\x14\x1ea\x04\x8d\x18m\xdf\n\xda\xf7\xb7\x87\xf4\xc1\xb2DkD\xad\xf9?rM#\x8d\xd7ȑ'\xf2W\x89\u074c\x16\xfc\xddNH\xe3݁\r\xe6\x1d\r\xfe\x12\xd67\x92-\xbbx\xec\xe0G$\xe9\v\xff\xefƒ\xbc\x80d!\xe1˅\x11\x18t\xa4\xa0o\x05,\xfbU`\x03\xb1+\xea\xc8\xe0\xd3\xf1\xbc\xfe\xb8L\x0e\xa2\xb4\x95Ǜ\x0f\x19\xa3\xffz\xea\xf7A\xb7\xec\u05c8Zs\xb5\xfep\xb21\xfa\xf3x\x11\x16>\xf8\xab\xc4lF\n\xff\x94\xb1|\xa3>r\x9d17h\xa4\xa8\x8e\t\x91\x9b\xee\xf8\xbd\b\x81\x04?\"I_\xf8\xff0\x96H'\xe4\x91jHx)re\xadD\xe6\x80\xdf\x05,\xfb]`\x03\xb1+\xea\xbc\xff\xdf\xf5s\xfeI\xcez(\xf8\x84ŭ\xaa\x90t\x16\xec\u05c8Z\xb32\xbc\xa6<>\xf5D\xfd*1\x9b\x91\u009b'l\x0e\xcbe\x87\xcd\r\x9a\xbf\xed\xc4\xf0ok2Y\x04\x18\x87\x1d\xfc\x88$}\xe1M\xb5\xfeUD\n\xff7\x11A}\xc0\xb2\xc0\x99?\x9b\x15;~W\x1e:\xb6|X>\x8e\xd2V\xfe\xc5X\xd5\x11A\xbc5l\xd6\f\xbc5\xe0\x16aჿJ\xccf\xe4#\xd3^\xe3\u007fğ\xac/\xca\aD\x94\xf0\xbf\x0f\xae\xfa\x8b\x0e0\x12I_x\xf3ݖ\xa0\tA\xe1\xff*\"x:\xb0\xe4\xad\xc0\x06bV<Si\xcc+\xf9\x85<\xd1\x13O\xf8\u007f\xef\xb0\x10\u007f\x8d\xa85\xe5Q\xeejsh\x15\xfe\xadx\x9b\xd1BO\x1a\xf3\xf6\x9a\x1b\x8c\xfc\x9f\x19&\xb0\x8b\x1f\xf7V\a\x18\x89\f\x97\xf0Ɣ\x88w\x1e\r{\x82\u007f\xf7cV\x94Ǹ\xf9\x1bOtt\xfc\xa7>\xf8\u007f\xe4\x13Q\xda\xce\x13\xc1\xbd\xe8\xfbo\x19\xa7\xe1\xe3\xafa\x13i\x02\x81]\x1ecz\"\u007f\x95\xd8\xcdH\xe1\x8d\xf3\x93\x11\x91&\x9e\xf0\xbf\x17\x06\v:\xc0\x88d8\x847\x8e\xf8\xe4\xa1j\xbd\xf1\xd4\u007f\x9bj%\x16^\xaah\xc4\xe4\xff\xd0\a\x8fʁ\xcdAk\xa1qt\xf9[1\xfe\x81\xdaDkD\xad\xb9J\u007fXl\xacyX\x9e{\x8f\x12>v3Rx\xf3\x05\xf2\xa2>\xca\xefH,\xbc\xb9\x8b\xc7\x0e~\xa42T\xe1\xe7\x89@\xf2\x90\xe7F\xfeI\xbe\xc5\xfaG!\\\x0f\x1f\rXv4\xb0\x81\x98\x15\xf3\x83&UF\xeb\x1b\xe0-\xb9\xfao\xf4\xc1_'\x9bB\xc6_#jM\xe3\xcc\xe73\xfa\xe0}\x19\x8bB\xc2\a~\x95\xd8\xcdH\xe15\x99\xf0\xff,7TՑD\xf8W\xe4\xc6~\xd1\x01F&C\x15\xfeW\xfa}ު_\xfdw\xc7Q9g\xf2\u007f\x1e\xfe}a@\xa4\xc4\xc2˻\u007f}\xab\xe3\xf0/\xe4,\xbb\xb34\xc6\x1bO\xc2\xedyZ\xce\x14\xff\x9bh\x8d\xe85\x8d\x8f\xbc\xcc\xd9Xo~4!J\xf8\xd8\xcd\x18\x87\xb0\xe3\x97m\xab\x97\xdb1\x8em\x13\n\u007f\xe6\x01\xf3\x8d00\"\x19\xaa\xf0\x1e\x11\xb4j\xa3\b\xe1\x92>$\x16\xfe\x19c\xe2xs~\xb1|\"Z[\xebG\v\x96u$Z#z\xcd?\x05&\x89q\x05\"F\xf8\xd8\xcdH\xe1s\x83?\xe9W\xc1\r\xc7\x15^\xa6\xf8_t\x80\x11\xcaP\x85?a~\nE\x1a\xe9\tZS`\x9c\x01L,\xfc_\xa7\x9bssV\xffk`Z\xb4\xb6\x1doM\nlO\xd4\x1a\x9f͉\xbbF̚\xaf\x98\xbf\x89\xf6[\xb9\xca\xf3\x91\xbfJ\xecf\xa4\U0002f598K\x17\x19\xc7lj\x85?\xf3\x00v\xf0#\x97\xa1\n\xdf\xf1VU\xbe\xf6O\xe5\xc6\xf0\xf0\x8a\x9f\xe5\x8f\xcb{\xe8i\xf3\U000ff245\xef8\xe3yȥ\x15\xff\xea-\xe3\x03hu\x1d6\xdav\xfcu\xe3\xf4\u007f\xd2r'\xfe*\xf0\xde~\xdc5b\xd7|\xebW\xc5\xda?\xcd\xfb_#\x16\xfd\u007fQ\xbfJ\xccf\x8cӒ\u007f\xfe\xf7\x12-\u007fz\xc0\xed\xc4\xc2w\xfc\xce\xfay20\xb2HM\xf8\x11\xc5\xdf\xfe\x16\x1a\xcawZ\xff3\xc1T\x83\xf0y\xf8\x149s\xb4\x03\x8cTF\xa1\xf0\u007f\xcc)x\xa8r\x9b\x1c\xfdY此\x1f\x01H[x0\x82\x19\x85\u009f\xc8\x11\xf2\xbd\xa5?\xfd\xe9?\xe4{\x03\x0f$\x9b\x0e\u1ccaQ(\xbc\xf1\xde@\x88\xdf'\x9b\r\u1cca\xd1(\xfc\x9f\xcbC\xba\x8f\xfbM\xb2\xc9\x10>\xbb\x18\x8d\xc2wt\xbc\xfa\x8b\a\xf24-\xff\xa1e\xa9\x88\f\u1cc9\xd1)<\x00q\x80\xf0 \xab\x80\xf0 \xab\x80\xf0 \xab\x80\xf0 \xabH$<\x00\xa3\x0e\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n\b\x0f\xb2\n5\xc2_\xbe\xfcygw\xe4\xa2\xee\xce\xcb_}9`?\x1d\x80L\xa1F\xf80\a\xb7w\x124\a\x8e\xa1T\xf8>\xa2Ms?\x96w\x008\x83R\xe1I&\x19\xec߁\x83(\x14\xbe\xaf\xcf\xd7\xd7w|ϗ\xfa\xdd\x00\xac\aΠPx\x83\x97\x1e\xbb\x98l\n\x00\x99C\xb5\xf0\x03\x9d\xc9f\x00\x90A\x14\t\xafG\x98\xd3{\xfe\xb0}\xeb\xe67\x9b\xb7oݺ\xbdy\xdf\xcddk\x00\x90\t\x14\t\xdfG\xb4}\xfe\xac\x99\xd3fL\x93̜_q\x11\xe7j\x80\x13\xa8\x13~ô\x83\xa7\xdf;\xfd\x9e\xce\xe9\xd3k\xa6\x9d\x83\xf0\xc0\t\x14\n?\xbb7\xf4pk\xc59\xf2\x11\x9c\a\xcaQ(\xfc̳\xa1G\x1bf\x9eK4\x1b\x80L\xa1P\xf8\x19!\xe1i}X~\x00T\xa2N\xf8\xf5s\xbb\xf7\xfc\xf8\xc7?\xd1\xff\xab\xe8{}\xe6\xe7G\xb6\xfb\x8eoU\U0007969f\x8e\x193\xe6\xee\xe3\xc9f\x81,A\x9d\xf0\xeb\xaai\xcd\u05fe\xf6w\xfa\u007f\xdf\xf25\xcf\xe8~cn\xf7\xeeY6\x87\xae\x9d\t\xc2\xce\xee\xb7\xe3?\x17\x97\x0f\x9b\x9bW\x8e\xd9c\f\xcf\xe1M\x80\xacG\x9d\xf0\x1bf_\xbeؼgߞ}\xcd\ai\U000cc2dd\xa7\a:?\xf4E\xcf\x1bX\xfb\xcd\xfb\xec\xd67\xf9\xc1\x8f\xe3?\x97\x88}\x01\xe1\xef\xfb\xe6\xda\xcc\xffE\x01\xacQ'\xfc\v3N\a\x1f\r\xc4\xcb\xf0\a\u007f0\xe6\xfe\x0fm\x9f1\xb8\xe7_\xe2?\x97\x88\xa0\xf0g\xef\x1f\U000c30c9\xa7\x82Q\x8e:\xe17̺h&v\xfdfӌs\xd4\x1bsZ\xb2sƝ\xdf\xddn\x0e\xd7\xfd\xf0\xee\u007f\x98\xd1Mt\xe4\xce1c\xee\xa7\xef\x8d\x19\xf3\xcdޭcL\ue258pP\x9f0\xf7\xf8O\xbew\xf7}\xbeG\xc6ܹv\xda?\xdc}\x9f|\xc5t\xfe\xcbw\xee\xfa\xee\xfd\a\x03\x1b\x0e\nO\xb4\xfd\xbbwNC\xae\xc9f\x14\n?;\xfc\x9d\xa7\xcd\x156\xe9}\xf3w\xee\x9c\xfd\x959\xfc\xf9\x9d\x8fl_\xf9\xed{\xfa\xa8o\xcf\xc2;\xf7к;\xd7\x1d\xa4\xaf\x9a\x9b\xff\xe1G\xcd\xcd\xcd\xc7#&\xdcܰ\xfe{\xff\xf0\xcd\xefM\xfbɝ\xa7\x8f\xac\xbfs̷\x17>\xf9\xcd\u007f֟\xdf>\xe6\xe7\xbb7\xdc\u007f\xe7>ssa\xe1\xe9\xab\xd9w~{S\xf4O\x06كB\xe1\xab\xd7m~a\x93\xce\v\x9b6\xff\xf2\x91د\x81<2枃\x81\xe1\xf61ϒ\xd4\xf49\xf9\xe0\xa7?\xbc\xf8\xbd\xc7\xcd\xe5\xa1H\x131\xe1\x9e1\xf7\xe9;m\xb9\u07fe\xeb\x9b\xfa\xde\xfd'\xdf\xd6G\xdd\x1b\xbe\x94\xcf\xfc\xb39\xdd\"\xbc\xfe7\xe1\x9e1\xd3\bd+\xea\x84o~\xfc\xb1\x8a\x19&\x15\x8f?\xf9y\x8c\xf0\xcf\xde\xf5\xadu\x81\u13ff\xef\x93|\xf7\xa7\xf2\xc1\xcd{\xbe}\u007f`yH\xf8\x88\t\xf7\xdc\x15<8\xb8K>\x9e\u007f\x97\x1c^\\s\xdf\xf7\xbf\x19\x88?\x91¯\xfb\xd6\xddk\td+\x8a\x84\xd7\xe9\xbex6\xc4\xc5\xcb6gK\x8e\xdf7\xe6\x87\a\x8d\xd1=\x81\xb8n\xee\xa07\x8di\x0e\xcc\b\t\x1f1\xe1\x9e\x1f\x04\xb7p\xd7|\xfdf\xa1\x14~߷\xbf;\xeb\xa5\xe6{c\x85?\xf2\xc31\xf7\x87\x0e\x9eA\xf6\xa1N\xf8\x14x\xe9;wΒQ\xe4'\xdf\u007f\xdb\xc0\xf8\xae\xc8\xd9\xef\xcc\xfd\xdee\xf3yC\xf8gOGM\b\x9f\xbb\xb9k!\x05\x84\xff\xbf?\x94\a\f\xff\x12-\xbc\x9e\xe0\x83\x87\xc5 ;Q(\xfc\xc0@_\x90\x818\x1f\x1b\xeb\x9cq\xe7w^'z}\xcc\x06\xf9h\xae\x8c\xee\xbe\x1fV\xd3\xcf\xef3\xe7\xdf{/\xd1\xc7\xf29\xeb\x04[\xe1\xbf+\x97\xf5\xdd\x13%\xfc\x9b\u07fds\xd6W\x04\xb2\x19\x85§\xc4\xc1\x1fIUg\xdf\xf9\xe3\x176\xfft\xccz\xba\xd9\xfcȷ?\xa4\xf7\xbe9\xadY~\xd4r\xfe]On\xbe\xef\xee\xb3\xd6\t\xbe=ƹ\x9b\xf7\xf4eg\x9b\xef\xfc\xe9\x1ez\xfb\xa7w6\x9f\xa5\x85c\xfee\xcd\xe3\xf7\x8c\xf9ֿ\xed\xd1\x177\xaf\x1c\xf3\xeb\xe6f\xfd\x0fÿ\xfc\xe8`\xc2\x1f\x0eF?܄\x0f\xf0\xfa\xbd\xdf\xfa\xe6\x8f\xfe w\xe5c\xc6L\xa3Gƌ\xb9s\xb7\xbe\xb4\xf7\x91o\xdd\xfd\xa3}\x11\x13\xe4y\xf81\xf2\\\xbd<ͣO;r\xb7~\xfb\b\xf5\xfd\xfa\x1f\xee\xfa\xf6\x8f\x9f\xfd\xfe]\xf7\x1a\x9f\xa5\x91\f\xf2]Z0\xba`*<\x00\x99\x01\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x02\u0083\xac\x82\x8b\xf0\xbe\xa8VK\x002\x02\v\xe1\a\x88\x8e\xbc\xf1\xa5\x82\xcb\ue06c\x87\x85\xf0}D\x9b\xabQg\t\x14\xc0BxB\xa4\x01\x8apV\xf8=\xbe\xce^\x9fQgy\xf0\xcdNy\xd7G}\xbd\xbd\xbeps\x02\x00Ë\xb3\xc2\x1f!\xe3r\xaa\xb2\xa1{6Jp\x80\x02\x9c\x15>|\xf5\xe0\xces1W\x12\x06`\xf8qVxyb\xe6\xf8\xeeM\x1b\x9e[\xff\xec\xda\xf5ϭ\xdf\xf0zs7\xceՀL\xe2\xb0\xf0z\x8aٺp\xf6c\xb3fUϟ=k\xd6c\xd53Pg\t2\x8a\xf3\xc2o\x98v\xe4\xfc\xd9\xf37\xe9\xf2\xd9\xf3\xe7\x9fE\x9d%\xc8,\f\x84\xaf\x90\xad\xdc\xfbVʇ[+\xce\r\xc4^7\x1e\x80a\xc3y\xe1_\x98)\x1b\f~t\xc7A\xfd\xd1s\xa8\xb3\x04\x99\xc5y\xe1\xcd\xfe\xd6\xfb\uf437\xa8\xb3\x04\x19\xc6y\xe1\xd7\xcf\xed\xde}\u07fdw\u007f\xed\a\xf7\xfd\xbc\xef\x8d\x19\x9d\a7\xf8\x8eo\x8e\x9a\xb5e\xfco\xe5\xddr\x91\xd3d\xb3\r\x00R\xc7y\xe1\xd7U\x0f\xac\xfd\xc6\xd7\xff\xee\x8eo|\xe3;\xb2\xcerwu\xf7\x9e_F\xcd*\xd3\xca\xe4\xdd\x05\xaf\xe6\xb1\xd9\x06\x00\xa9\xe3\xbc\xf0\x1b*.v\x1e?~\xef\u05f7\x1f\u007f\x8f^\x9ay\xbe\xfb<u_\x8e\x9cԕS\x93\xd3e\x8c <\x18\"\xce\vo\xd6Y\xde+3\xfc\xc0\xfaYv\x19\xde+\x8e\x89\x03\xc6\b\u0083!\xe2\xbc\xf0\x1bf\xc9\x1d\xfa\xac\xefI\xed7ʹ;-\xe9)\xa6b\xd3tm\xc5\x13\xc5\xf9Ug\xe4\xd0[Y\xa2\x15\xcd)\xf1\x13\x00i\xc0@\xf8\x8a/C\x0fm\xeb,ɽ\x88\x16\xbb\x8d\x91&\xa645\x96\xb9N\x11\x1d\x1d\xbb\xb4e\xff\xce\"q;f6\x00\t` \xfc\xfc5\xeb\x9f]\xb7\xf5\xf5\xe7\x9e]\xb7~\xbeM\x9d%\xf9][\xe8e\x97\xb1+\xd7&\xf7\x10\xf5\x94\x96\x135\x14H\xd5\x1b\xf2\xb1\x87\ai\xe1\xbc\xf0{\x9e\xac\x9e;{vEE\xc5\xec\xd9s\x9f\\\xd9\x19+\xfcIq\xa8\xe7\x908)\x87\xda3\xf2v\x87\xb8F\x9f\x15O\\\xb1\xf3\x84\xbf?z2\x00\tqXx\x9d\xde\xce\xcb:_\xf5~\xae\xdfv\xdaU\x8em\x13\x92mrh\x1e\xb4\xea\a\xb1D\xd7w,\x9e,\x8a6b\x0f\x0f\xd2\xc2y\xe1\xc9\xf8\x90\xf0\xe6\xc7;\xe3}0xє\xf6\xf6\xf6)\x8b\xe4P[%ow\x8a\x1b\xd4^\xa7\xab~\xbd1\xb7\xc1~\x1d\x00\xecq^\xf8\x01\x9f\xaf\xdb\xe7{|\xda\x11_w\x9f\xcf\xeeccū\xf5\x9bU\xc5r\xa8\x15\xdf\"\xea\u007fP?\x82\xf5\x886\xb9\xc0\xbd\xccf\x05\x00\xe2\xe2\xbc\xf0&ݝq\xf6\xef=m\xa2\xbe\x8b\xba~#\xdanɳ4\x95\x87\xf7\x97\xe7\u007f$\x85wշ\xb6\xd4\x06\xce\xcf\x03\x90\",\x84\xf7\x11m\u007f\xf2,\xd9~\xc9o\xffX!\x9a\xa8E\x88\xb1\xfb\x89\x1e\xf4,\xce+\xae\xb9\xa4/\xde5\xddS\xa2\x15\xba\xe1;H\x0f\x16\xc2\xf7\x12鑆p\xb1\x02\x90qX\bO\t\"\r\x00\xc3\t\v\xe1q\xa9=\xa0\n\x16\xc2\xe3R{@\x15,\x84'\\j\x0f(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\b\x0f\xb2\n\x16\xc2#\xc3\x03U\xb0\x10\x1e\x19\x1e\xa8\x82\x85\xf0\x84H\x03\x14\xe1\xac\xf0(5\x03\x8aqVx\x94\x9a\x01\xc58+<J̀b\x9c\x15\x1e\xa5f@1\x0e\v\x8fR3\xa0\x16\xe7\x85G\xa9\x19P\b\x03\xe1Qj\x06\xd4\xe1\xbc\xf0(5\x03\nq^x\x94\x9a\x01\x858/|\x92R\xb3F\xe3R\xaa\x13\xe6}\x12o\x13\x00\xa4\x81\xf3\xc2')5\xebj\x15\xbf\xf1zw\x95M\xf8\"\xeeF\x00H\x19\xe7\x85OVjvI4\xea\xb7WsQ\xef\x04\x86\x01\xe7\x85OVjf\nOeKb\x9e\x01 m\x9c\x17>Y\xa9\x99)\xfc\x95\xf1\xcf\x13\xddX\\\xac\x95T\x19] \xd6R3\xff\xaer\xd7\x03\xab{b6\x0e@\f\f\x84ORjvI\xec\xec\xb9\xf1N\xd9\xcfn\x10\xb5\x8ae\a\x9a\xaar\xda)\xb2Ԭ6g\xc5\xdem\x05SQ\x06\x02\x92\xc3@\xf8$\xa5f\x97\x8c\xd34\xa5\x17\xf4aOS\x97\xbe?/\x9bG\x11\xa5f\xadb\x97>l7\x93\x0f\x00\tq^\xf8d\xa5f\x97D}{{\xdb\x13\x13\x8e\xea\xe3\xab\r\x95\x93\xf2\x84졷\x94\x9a-\x99\xd4\u007f[\xa7\xb86v\xf3\x00D\xe1\xb0\xf0\x94\xbc\xd4,pк\xa4\xd4O\xed\x85%O\xb7x\xddRxK\xa9Y\x990\x99\x17\xbb.\x00Q8/<%)5\v\b\xff\x9a\xb8J\x93\xcb\xe5\x91\xe9\")\xbc\xa5Ԭf\xd21\x83\xab\xb6\xab\x03`\xc5yᓕ\x9a\x05\x84_\x9a\xe7\xa7\x12Y\xe5\xe7\u007fX\no)5k\x13MrX\xbf1v]\x00\xa2p^x\x93\xb8\r \xe6;\xad-5\xe2Ei\xf9\xe2\x86秊\xa2\x17ߍ(5\xab\x1b[Ӣ\x0fw\xd9o\x00\x00\v,\x84OTjf~\x96F+۩G\x18\xff\x96R\xad`\xc9k\xa5\x9a;\xb2Ԭ\xcd=!\u007fz\x9b\xdd\xda\x00D\xc2Bx\x94\x9a\x01U\xb0\x10\x9ePj\x06\x14\xc1Bx\\j\x0f\xa8\x82\x85\xf0\xb8\xd4\x1eP\x05\v\xe1\t\x97\xda\x03\x8a`!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x02\u0083\xac\x82\x85\xf0\xc8\xf0@\x15,\x84G\x86\a\xaa`!<!\xd2\x00E8+<J̀b\x9c\x15\x1e\xa5f@1\xce\n\x8fR3\xa0\x18g\x85G\xa9\x19P\x8c\xc3£\xd4\f\xa8\xc5y\xe1Qj\x06\x14\xc2@x\x94\x9a\x01u8/<J̀B\x9c\x17\x1e\xa5f@!\xce\v\x9f\xa4\xd4L\xe7T\xa5\xab\xb0\xe6@\xe1\x15\xaa\x15B\xb8\xce\xd8o\t\x80Tp^\xf8$\xa5fDm\xaeGw6\x96\t\xf1\x01]\xf0z\x1b\xc4;q6\x05@\n8/|\xb2R\xb3ky\xf3n\x11u\x95\xea\u0093\xec=\x80\xf0`\b8/|\xb2R\xb3\xba\xdcK\xf2n\x8b0\xb2\f\x84\aC\xc2yᓕ\x9a\x95>a\xdc]\xddrKޅ\x84\x0f7\x99\x85\xabΖ\vm\xe7\xaa\a\\\x95\x17\b\x00{\x18\b\x9f\xb8\xd4\xecV\xce\x16\xebÐ\xf0\xe1&\xb3p\xd5\xd9_\x1alj\x02\xcfo\xf3\x16\x10\x00\xf60\x10>q\xa9\xd9'\xa2\xc5\xfa0(\xbc\xa5\xc9\xccRuFZ\xbe\xbew\xaf) \x00\xecq^\xf8$\xa5f\xfd\xe3l\xf7\xf0\xd6&\xb3p\xd5\x19iK\xf5\x1b\x8fF\x00\xd8\xe3\xb0\xf0\x94\xbc\xd4,\x90\xe1\xfb\xcd\u0083\xa0\xf0\x96&3kՙ&\v\xea!<\x88\x8b\xf3\xc2S\x92R\xb3\xba\\\xa3\xad\xacI\\\x91wA\xe1-Mf\x96\xaa3\b\x0f\x92\xe0\xbc\xf0\xc9Jͮ\xe5-\xe8\xd73\xba{\xa2\xf1((\xbc\xa5\xc9\xccRu\x06\xe1A\x12\x9c\x17\xde$A\x03H\x9b\xab|WK\xe5\xb8CD\x9f\xc9wZ\xb7x\xbd\x9f\x92\xb5\xc9,\\uvɫվ\xeb?Q\xaby/\xc5\xdb\x18\xc8rX\b\x9f\xa8Ԍ\x8c\xcf\xd2\x14\xcd{_\x1f,\r\x04\xf7%ri\xa8\xc9,\\u\xb6\\֟\xbd\xef\xd2o\x97\xc7\xd9\x14\xc8vX\b\x8fR3\xa0\n\x16\xc2\x13J̀\"X\b\x8fK\xed\x01U\xb0\x10\x1e\x97\xda\x03\xaa`!<\xe1R{@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E@x\x90U\xb0\x10\x1e\x19\x1e\xa8\x82\x85\xf0\xc8\xf0@\x15,\x84'D\x1a\xa0\bg\x85G\xa9\x19P\x8c\xb3£\xd4\f(\xc6Y\xe1Qj\x06\x14\xe3\xac\xf0(5\x03\x8aqXx\x94\x9a\x01\xb58/<J̀B\x18\b\x8fR3\xa0\x0e\xe7\x85G\xa9\x19P\x88\xf3£\xd4\f(\xc4yᓔ\x9am\x91W^\x1a[\xba\xd3o>\xdc_\xd0j\xbb!\x00R\xc2yᓔ\x9a]\xdb(^\xf3\xee]\"\xea͇\xad\xae\x88\xcb\xc5\x03\x90\x1e\xce\v\x9f\xacԬM\x9c\"\xf2/7;\xcd\xf4\x91\xddf\x00H\x11\xe7\x85OVjf\bO=y\xb8\\$\x18\x06\x9c\x17>Y\xa9\x99)<-/\"\xba\x9e+DN\xa3|tr\x9c\x10\xf5gj&\xe6Vގ\xdd(\x00qa |\xe2R\xb3\xa0\xf0;D\x17Q\xbb\xd7;^^\x01\x9ez\x9a\x1aKJ\xf3JVՌ\xfd\x94\x00H\x1d\x06\xc2'.5\v\n\xdf\x16\b\xf1\xb9\x9e\xc0\xf2\xa9\xc2}\x83\xfc7\b\x804p^\xf8$\xa5fA\xe1_\x13\u05cc\x87a\xe15\xec\xdcA\xda8,<%/5\v\b\xffT\x9e\xf90,\xfc\x94ع\x00$\xc1y\xe1)I\xa9\x99)|\u007f\xc1\x12\xf3aX\xf8E\xb6\xd3\x01H\x84\xf3\xc2'+53\x85\xaf\x13\xc7̇a\xe1\x17\xc7\xce\x05 \t\xce\vo\x12\xb7\x01\xc4x\xa7\xb5m\xa9\x90\x9e\xf7\xbf\xe3\xf5\x8e\xaf\xf5zo\xd0\xed\xc3\xde\xd2\xe9^\xef'\xf6\xeb\x00\x10\x0f\x16\xc2'*53>K#&\xee\x90\xe3\xa39f\xa9\xd9\x0e:i\x8e\xaa\xec\xd6\x00 >,\x84G\xa9\x19P\x05\v\xe1\t\xa5f@\x11,\x84ǥ\xf6\x80*X\b\x8fK\xed\x01U\xb0\x10\x9ep\xa9=\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\" <\xc8*X\b\x8f\f\x0fT\xc1Bxdx\xa0\n\x16\xc2\x13\"\rP\x84\xb3£\xd4\f(\xc6Y\xe1Qj\x06\x14\xe3\xac\xf0(5\x03\x8aqVx\x94\x9a\x01\xc58,<J̀Z\x9c\x17\x1e\xa5f@!\f\x84G\xa9\x19P\x87\xf3£\xd4\f(\xc4y\xe1Qj\x06\x14\xe2\xbc\xf0IJ\xcd\xdaƚ\x17_\x12\x05\xfdq\xb6Q\xab?\xe9:c\x8eOΙ\x907\xfd@١8S#\xe6\xda5\xa4\xbd\x12(\\\x00\xa3\x15\xe7\x85ORj\xd6sH\xab\xf5\xeaԉ+q\xb6q\xc1\xebm\x10\xef\x18\xc3cZUˮ\x05B4řj\x9dKv\ri\u05fd\xe5\x1e\x02\xa3\x18\xe7\x85OVjF\x9a\xa1\xe0.q\xd5v\v\x06\xed\x01\x89+\xdd~\"\u007fm|\xe1-s%6\riU\x10~T\xe3\xbc\xf0\xc9J\xcd\x02\u009fY\x95\xa0\xbf/(\xf1\xc4zy{R$\xaa\xb6\xb4\no\x03\x84\x1f\xdd8/|\xb2R\xb3\x80\xf0:Mz\x00\xf7\x90G\xc8\xc8rcq\xb1VRu2\xf0LP\xe2%\x85\xf2\xd2\xda\xfe\xbd]Ԫ\xcfzƘ\xdbX\xa4\xfd\xa6\xb8\xf8\xc0\x8a|wW\xc4\xdcpC\xdar\xa1\xed\\\xf5\x80\xab\xf2\x82|\xa0\v\xbfB_k\xbc\xfe\xf7\xc4[Y\xa2\x15\xcd)AQ\xe6h\x82\x81\xf0IJ\xcdH\xab\xef\xe9Y\xb2Z\x1fty\xf3\xea\xafЕ\xfa|\xaf\x14zف\xa6\xaa\x9cvsJP\xe2OJr*=\x87\xe5\xd1mϡ\x92ern\x9e\xb7\xeb@\x9eX\xe5\x16\x136\x16\xbd\x1c17ܐ\xf6\x97\xc6q\xa2\xc0\xf3ۼ\x05\xf2\x81.\xfc\x85\x9a\x9c-\xfa\x86\x8f\x8e]ڲ\u007fg\x91@O\xe0h\x82\x81\xf0IJ\xcdH\v_\x18\xbbVր\xd4<A\xb2\xc6O\xdf_\xfb\xcb\xe6\x99SB\x12_{\xfeQM\xe4\x1b\x11\xde#+q\x96\xd6\xea7\x855\xb4W\xb4\xd2\xd2e\x91s)ܮ\xa0\xe5\xeb{\xf7\x9a\x029ԅ\u007fY3N\xde4\x14H\xd5\x1b\xf2\xb1\x87\x1fM8/|\xb2R3Җ\xb5\xb7\x97\x99\xc2\x1f\xc8\xed\xa1\x1e\x97W\x0e\xaf6TN\xca\x13e\xe6\x14\xabķ\xf6W\x8a\xbd\xfa\xfd\x85\xb1\xefӭ\xbc\xfd\xfa\xa8\xb0\x91\xde\x15]\xf4tM\xccܐ\xf0K\xf5\x1b\x8f&\x87U\x9eza\x9e\xac\xfc\xacx⊝'\xfc\xf1Ά\x82\x11\x89\xc3\xc2S\xf2R3#÷\xed7\x86\xb7'\xb4PK\x91\xdc\xe5\xb6\x17\x96<\xdd\xe2uG\t\xdfn\xc4p\u007f\xb9\xf1\xf2\xa8\\Mm\xf9R\xd7\xc26j\xd7e\xaeK \xbc\xbc\x0f\b_\x987y\x81\xb9S\xbf\xbec\xf1dQ\xb4\x11{\xf8ф\xf3\xc2S\x92R\xb3\xe0A\xebIyZr\xc5<Z\xb0B>\x9a\\ޣ\xdf.\x8a\x12\xbe\xd0x\x8e\xeaK\xe5m\xeb\x84~#Ѥ)|\xc1\xa9O\xf2\xb6\x18\x13\xebtկ7\xe66\x10\x18=8/|\xb2R\xb3\xa0\xf0\x85u\xfa\xcd\xe1\xf1\x97\xc6\x1f\x96\x8fJd\x87\x9f\xff\xe1(ዊe\x99\xab\xdf,\xf8\xeb/j\xcd7\xfe0\xa4'\xbc\xfc{\xa2Ƀa\x8fh\x93\v\xdc\xcb\b\x8c\x1e\x9c\x17\xde$n\x03H\xf0\x9dVo\x9e<Q\xe3/\xae,6\"\x86G,nx~\xaa(z\xf1]\xfaL\xbe{\xba\xc5\xeb\xfdT\x17^\x14z\xdaZܹ\x1f\x19\xab\xd6Mʗ\x87\x9d\xa7\xf2_\xeei\xd4N\xf6Ը/X\xe7\x86\x1b\xd2.y\xb5\xdaw\xfd'j5\xef\xa5\xeb\xde\xf2\xdaw\xfa\xbb\xaa\n\x0f\\\xd1\u007f\x84\xab\xbe\xb5\xa5V\x1c\xb0\xff\xc5\xc0\x88\x84\x85\xf0\x89J\xcd\xdaD\x10#glь;\xf2o)\xd5\n\x96\xbcV\xaa\xb9ii\xe0\xf9%D\x8f\xee\xac\xff\x99\xab`\x9e\xe9;}$\xe4\xce\xd9_$Dc\x9ep5\t1\xcf:7ܐ\xb6\\\xbf\xd5\xdew\xe9\xb7\xcb_\xd1or\x8e6\xea\xb7\xf5\xb4k\xba\xa7D+t\xc3\xf7Q\x05\v\xe13Tj֥AV\x10\x05\v\xe1)3\xa5fM\x13\xf0\x9e\x11\x88\x82\x85\xf0\x99\xb8Ԟ\xe7\x80\xdf]\x9fl\x12\xc8:X\b\x9f\x81K\xed\xf5\x88)\xcb\v\xaf'\x9b\x05\xb2\x0e\x16\xc2S\x06.\xb5\xe7q\xb9?H6\ad\x1f,\x84\xcfD\xa4\x01\xc0\x0e\x16\xc2g \xd2\x00`\v\v\xe1)\x03\x91\x06\x00;X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\x17\xe1\x01P\x02\v\xe1\xf5\xf0\xfe\xf6\xf6\xb8\x9f\x87\a`\xf8`!<2<P\x05\v\xe1\t\x19\x1e(\x82\x85\xf08-\tT\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1\x11i\x80*X\b\x8fH\x03T\xc1BxB\xa4\x01\x8a`!\xbc\x8c4o~5\u08c1>\xf9\x0f\xbbz\x901X\b\x1f\x884\x00d\x1c\x16\u0093\x8c4ح\x03\x05\xb0\x10^\x8f4\aw\xf7\x1d\xd9\xec;\xf2\x92\xfe\xaf\xf7\xf8v\xcbs\xc9K\xcd\x00H\x1d\x16\xc2\xcb⛅7߬\xee6\xff\xa5Vjv\xe0\x18\x01\x90.,\x84\xd7\xe9\xbdI_~\x1c\xf8\xd7}1\xe2\xa98\xa5f\x8f.!\x00҅\x85\xf0\xc6\x1bO\x9d\xf1\x9e\x8dSj6u\xb1\xddd\x00\x12\xc2Bx\xe3,\xcd\xf9\x81^\xfbӒ\xa1R\xb3Sㄨ\xf2\x97\b\x91\u007f\xab5\x10\xec\xa7\xc4n\f\x80\x04\xb0\x10\x9e\x12\xbe\xf1\x14*5\xf3\x1f\xf6\xe4\x1c\xa6]cw\x9d\xa0\xaeC\xde\xd2\xe9z\xb2ǵ\x96@z\xb0\x10>\xf1gi,\xa5f\xfe\xa5\xe5WK6\x9a\x8b\x11i\xc0 `!|\xe2\xcf\xd2XJͨ\xe7ᢪ@\x96\x87\xf0`\x10\xb0\x10\x9e\x12G\x9ap\xa9\x19Q\x8b8\x14\x18Ax0\bX\b\x9f$\xd2XJ\xcd.\x14֗|a.6\x84\xdf\xf9\xa9\xfd:\x00\xd8\xc3B\xf8$\x91&\\j\xd6_^O\xcb\xdcf\xa6q\xbb\x89\xae\x88&\xfbu\x00\xb0\x87\x85\xf0\x94 \xd2XJ\xcdz\x0e-/\xb8@\x1dy+\x0e\xdd\"Y\xba\xb7\xa5\xc5\xed\xfa,\xcej\x00\xd8\xc2B\xf8D\x91\xc6Rj&\x87\xabh\x85\x10cewӭ\x15\xf9\xb9\xd3\xdb\xedV\x01 .,\x84\xc77\x9e\x80*X\bO\xf8\xc6\x13P\x04\v\xe1\xf1%n\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1\x11i\x80*X\b\x8fH\x03T\xc1BxB\xa4\x01\x8a\xe0\"<\x00J`!<J̀*X\b\x8f\f\x0fT\xc1BxB\x86\a\x8a`!<NK\x02U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fR3\xa0\n\x16£\xd4\f\xa8\x82\x85\xf0\x84R3\xa0\b\x16\xc2'*5\xf3\x06K\xcdƟ\x8c\xbb~\x98\x93s&\xe4M?Pv\x88\xa8V_\xc5u&\xfe\xcc\xe5\"\a\x97\xe9\xcbBX\b\x9f\xa8\xd4\xec֡\xc29\xf2J{\xbbD[\xdc\xf5C\x1cӪZv-\x10\xf2\x8a\x93\x17\xbc\xde\x06\xf1N\xfc\xa9\x17\xbc\xa1f\x11\x90E\xb0\x10\x9e\x12\x96\x9aM\\&o?JE\xf8Jy\xa1U\u007fm\xe0\x12\xab퉄\xb7T\xe9\x80,\x82\x85\xf0\x89K\xcdL\xe1\xfb\xb7݈7!\xcc\xc4zy{R\xb4\x18\x8f <\x88\x81\x85\xf0\x89K\xcdL\xe1uN\x8e\x13\xa2\xfeL\xcd\xc4\xdc\xca\xdb\xfa~\xfc\x95)\xae\x87\x1b\xfct\xbbH\xfbMq\xf1\x81\x15\xf9\xee.\xa2%\x85\xa7\xf4y\xfe\xbd]\xc6\xfc\xa0\xf07\x16\x17k%U\xe6!\x80\xb7\xb2D+\x9aS\"\xaf\xb8\xad=\xb5\xea\x01W\xe5\x05\x02\xd9\x04\v\xe1)\xe1\x1bO\x13k{z^.\xd7\a=M\x8d%\xa5y%\xabj\xc6~J\xb4T\xab\xdf[\xaf\xd5\x12\x1d\xc8\x13\xab\xdcb\xc2Ƣ\x97\x89>)ɩ\xf4\x1c\x0eVv\a\x85o\x15\xcb\x0e4U\xe5\xc8+\r\x1f\x1d\xbb\xb4e\xff\xce\"\xa1\xbfbH\x13\x93\x1b[\x8a\x16\xc4\xf9\xa9`t\xc2B\xf8ğ\xa5\x99(\xcf\xd1\x14\x9a\xe3\xa9\xc2}\x83\xfc7\xe4U\xb4e\xa47n\vkh\xafh\xa5\xa5\xf2\x0f\xc1\xb5\xe7\x1f\xd5D~\xe0\xf4KP\xf8\x9e&}\x8f\xef/\x9b\xa7\x0f\x1b\n\xa4\xea\r\xf9\xc6\x1e\xbe\xf0\v\xa2ڂ\xd8\x1f\bF1,\x84O\xfcY\x9a\x89U\xed\xedK\x83\xc2k\x9f\x9a\x83\xda2\xe3\xeeA}\x17_\xd8H\xef\x8a.z\xba\xc6|\xe6\xd6\xfeJ\xb1\xd7\x18\x852\xfcՆ\xcaIyB\xae\xf1Y\xf1\xc4\x15;O\xf8\x8d\xbf\x01\x9a|\x85x4\x02\xd9\x04\v\xe1)q\xa4\xd1\xc5<\xb5\xd3\x1cO\r6\x11\x97\x9b\xb5~Uz\xd4)l\xa3v]\xdb:]\xf8v#\x91\xfb\x03O\x06\x85o/,y\xba\xc5\xeb6^\"\xd7w,\x9e,\x8a6\x1a{xy\xd0\n\xe1\xb3\f\x16\xc2'\x894\xcb\xc2㩋\x02\x83\xdaI\xd2Y\xffĥ\x11\xc2\x17\xae0\x9e\xac/5\xee\x82\xc2O.\xef\xd1o\x17I\xe1\xdb\xeb\xf4ծ7\xe66\x10\x84\xcfNX\b\x9f$\xd2X\x85_\x1c\x18\xec\x15\x8d\xfam\xa3\f/\x16ዊ\xaf\xe9K\xfd\x81\x97EP\xf8\x12\xf9\xd0\xff\xb0\x14\xdec\x9e\xcdw\xcbMB\xf8l\x84\x85\xf0\x94 \xd2\xdcz\xa7p\xce!\xf34\xe3\xed\xc3F\xdf\xfc'ƃ\x9a\x9c\xbaֺ\x1c]\xf2S\xf9/\xf74j'{j\xdc\x17\xa8H\x14z\xdaZܹ\x1f\xe9i]\xbeӺ\xc5\xeb\xfdTZ\xbe\xb8\xe1\xf9\xa9\xa2\xe8\xc5w\xf5\xa1\xab\xbe\xb5\xa5V\x1c\xa0K^\xad\xf6]\xff\x89Z\xcd{)\xceO\x06\xa3\x11\x16\xc2'\x8a4\xc6giv\x19Ó9\xc2\xd2B\xbf\xad\xccU\xd6\xe0'\u007f\x91\x10\x8dy\xc2\xd5$\xc4<ztg\xfd\xcf\\\x05\xf3t\xdfii\xe0#8K\xf4\xa9[J\xb5\x82%\xaf\x95jn\xda5\xddS\xa2\x15\xba\x0f\xc8\xcf\xd2\b\xa1\xbd\xef\xd2o\x97\xdb\xfdX0Ja!<\xbe\xf1\x04T\xc1Bx\xc27\x9e\x80\"X\b\x8f/q\x03U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x04\x82U\v\x00\x00 \x00IDAT\x16\xc2\x13\"\rP\x04\x84\aY\x05\v\xe1\x91\xe1\x81*X\b\x8f\f\x0fT\xc1BxB\xa4\x01\x8apV\xf8^=\xc6\f\xf8$\a\xdf\xf8\xdc\xe7\xeb\xeb\x93;y$\x1b\x909\x9c\x15>\x80\xae\xf9\xa6\xd9\xe7\x10i@\xe6a!\xbcN\xe79_\xb2)\x00\f\x1d\x87\x85\xd7\xe3\xcb\xf1\xed\xeb֮]\xa3\xb3v\xcdڭ\xafw#рL\xe2\xb0\xf0\xf2\xfc\xcc¹\xd5sM\xaa\xab\xa7\x9dG\xb0\x01\x99\xc4y\xe17\xcc8\xfe\xe5\xe7_\xea\xe87\xebf Ƀ\x8c\xc2@\xf8\x8a\xf0\x19\xc9ͳ\xce\xc9k\b#\u0383L\xe1\xbc\xf0/\xcc\xf80\xf4h\xfd\xac\xb3\x89f\x030T\x9c\x17~\xc3̰\xe4\xcfʹ\x13\xbe\xe5\xc1\xf1e-S[\xe3\xf46\xa1\xac\t\xa4\x81\xf3¯\xaf\xee\xfd\xc3?\xfe\xe3=\xfa\u007f\xff\xec\xdb=\xa3\xf3\xed\xb5\xbdo\xaf\x8d\x98\xb3MԴ<%Ķ8\xbdM(k\x02i\xe0\xbc\xf0\xeb\xaa\xfb\xd6\xfd\xfd\xdf\xff\x1f\xfd\xbf\xef\xfb\x9agt7/\xbc\xd9\\m\x9d\xf2\xd1\xd8z\xfdv\x95\x14\x9e\xeckl <H\x19\xe7\x85\xdf0\xeb\xfcͳ\x1f\x9f\xff\xf8\xfc\xd9˴i\xe6ǾN\xf2}e\x9dR[pK\xbf\xfd@4\x18\x8f <\x18\x12\xce\v\xff\u008cӡGv\a\xad\xf9O\x1bw\xdb>1\xeeB\xc2\a;\x9et\xb4\x15O\x14\xe7W%\xe8d\x05 \x88\xf3\xc2o\x98\x19\xee\xef{if\xcci\xc9\xeb\xe25\xeb\n!\xe1C\x1dO\xb2\xaciJSc\x99\xeb\x14\x01\x90\f\x06\xc2W|\x1ez\xf8Ҭ\x987\x9e\xde7\xae\xe8\xee\xef\xe9\xb9e<\f\no\xe9x\"mr\x0fQOi9\x01\x90\f\xe7\x85ߴ\xf0\xc95+W\xfe\xfa\xd7+W\xae\\S\xfdH\xcc\xd7@\xcc=|\x8d\x10b\xbf|\x18\x14\xde\xd2\xf1D\xda3r\xb8C\\#\x00\x92\xe0\xb0\xf0\x03D\xfbV\xfer~u\xf5\xc2ǫ\xab\xab\xe7\xaf\\\xdb\x19\xf3\xe1\xb1\t2\xc3_j\x11u\xc6.>(\xbc\xa5\xe3)p\xd0\xea\x15\xc7\b\x80$8,\xbcN_o\xb7\x8eo@\xde\xf6\xf6\xc6>_[$Mo\x89:-i\xe9x\"m\x95\\\xb2S\xa4P\xd5\r\xb2\x1d\xe7\x85'c?\xff\xc2\xc2\xcf\xe3|0\xd88\x0f\xefwG\to\xe9x\"\xadX\u007fI\xf4?\xe8\xb6]\x1d\x00+\xce\v?\xd0\xd7\xd7\xed\xf3\xfd۴#\xben_\x9f\xddG%\xb7\x88'Zk\x8dwZ-\xbdM\xe1\x8e'y\x96\xa6\xf2\xf0\xfe\xf2\xfc\x8fl\xd6\x05 \x12\xe7\x857\xe9M\xf0%\xee\x96ɹ\xe5m%m\x11\xbdM\xa1\x8e'\x9d\a=\x8b\xf3\x8ak\xd0M\x06R\x80\x85\xf0>\xa2M\x8f\x9f%|*\x18d\x1c\x16\xc2뇪z\xa4!\x9b#V\x00\x86\x17\x16\xc2S\xe2H\x03\xc0\xb0\xc1Bx\\j\x0f\xa8\x82\x85\xf0\xb8\xd4\x1eP\x05\v\xe1\t\x97\xda\x03\x8a`!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84O\x10i\xb0\xe7\a\xc3\n\v\xe1)\x8e\xd8\xd8\xf3\x83ᆅ\xf0\xf1\xc4\xc6\xc1,\x18nX\b\x8fH\x03T\xc1Bx\x8a/\xf6\x91\xdd\x11\xd7\xdd\x03`h\xb0\x10>&\xd2\xec\xf1u\xf6\xfa\xfa\xfaz\xfb\xfa6T\x9c\x95w}\xd4\xd7\xdb\xeb\xc37D\xc0Pa!|L\xa49\x12\xfa\xba\x1f\xda\xfd\xc0\xb0\xc2Bx\x8a\x8e4\x90\x1cd\b\x16\xc2Ǟ\xa5\x91u\x96\xbb7mxn\xfd\xb3k\xd7?\xb7~\xc3\xebͨ\xb3\x04\xc3\x02\v\xe1c\xcf\xd2\xe8í\vg?6kV\xf5\xfcٳf=V=\xe3\"NN\x82စ\xf0\x14s\x96F^Uxڑ\xf3g\xcfߤ\xcbgϟ\u007fv\x1a\xea,\xc1\xb0\xc0B\xf8\xd8Hc\\F\xfb&\xc9K\xadʇ[+\xe4u\xe3\xe1<\x182,\x84\xb7\x8d4/̔u\x96?\xba\xe3\xa0\xfe蹙\xe7\xe2\xad\v@:\xb0\x10\x9el#\x8dQay\xff\x1d\xf2v=\xea,\xc1\xf0\xc0Bx\xdbH\xb3~n\xf7\xee\xfb\xee\xbd\xfbk?\xb8\xef\xe7}o\xcc\xe8<\xb8\xc1w|s\xc4Z\xa8\xb3\x04\xe9\xc3Bx\xdbH\xb3\xaez`\xed7\xbe\xfeww|\xe3\x1bߑu\x96\xbb\xab\xbb\xf7\xfcҺ\x12\xea,\xc1 `!<\xd9F\x9a\x8a\x8b\x9dǏ\xdf\xfb\xf5\xed\xc7ߣ\x97f\x9e\xef>Oݗ\xadSPg\t\x06\x01\v\xe1m#\x8dYgy\xaf\xcc\xf0\x03\xa8\xb3\x04\xc3\x04\v\xe1m#͆Yr\x87>\xeb{R\xfbM3cNK\xa2\xce\x12\f\x06\x16\u0093}\xa4\xf9R\x1f\x98\x9d\xad\x9b+Pg\t\x86\x05\x16\xc2ۿ\xf14\u007f\xcd\xfag\xd7m\u007f\xe3\xb9g\u05ed\x9f\x8f:K0<\xb0\x10\xde6\xd2\xecy\xb2z\xee\xec\xd9\x15\x15\x15\xb3g\xcf}reg\xcc۬\xa8\xb3\x04\x83\x80\x85\xf0d\xf7\x8d\xa7\xde\xce\xcb\x17/_n^\u007fZ\xbf\xeb\xb4\xf9\xda\x13\xea,\xc1 `!|\x82/q\xaf\x9du>\xceGhPg\t\x06\x01\v\xe1c#\r\xc9\xc3U_\xaf\xcf\xf7\xd2\xfc\xb3\xbe\xde>\x9f\x9d\xf3\xa8\xb3\x04\xe9\xc3Bx\x8a\u007f]\x9a\x83\u007f\x88-\xa3\x0f\x82:K\x906,\x84\x8f\x17i|Dkf\x1e\xc7\x17\xfe\xc0\xf0\xc1Bx\xdbH\x13X>\x1f\x17b\x02\xc3\b\v\xe1ip\x91\x06\x80\xb4a!<.\xb5\aT\xc1B\xf8\x04b\xe3R{`Xa!<\xe1\xea\xc1@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<\xc5\x17\x1b\u0083a\x85\x85\xf0\xf1\"\r2<\x18nX\b\x9f\xe8\xb34\xc8\xf0`8a!<!\xd2\x00E\xb0\x10>AtA\xa9\x19\x18VX\b\x1f\x13]Pj\x062\x04\v\xe1):\xba\xa0\xd4\fd\b\x16\xc2\xc7D\x1aH\x0e2\x04\v\xe1c\xcf\xc6\f\xa0\xd4\fd\x04\x16\u0093ݥ\xf6Pj\x062\x00\v\xe1\xed/\xb5\x87R30\xfc\xb0\x10>6\xd2\xf4\xa1\xd4\fd\x04\x16\u0093]\xa4A\xa9\x19\xc8\x00,\x84\xb7\x8f4\xc9J\xcdNΙ\x907\xfd@١\x88\x85\x91\xfdf\xfb\vZcV\x03Y\r\v\xe1m#M\xb2R\xb3cZUˮ\x05BDV\xf5E\xf6\x9b\xb5\xbaZ\x02\xa3\x03\xb8\x840\x90\xb0\x10\x9e\xec\"M\xb2R\xb3J\xb7\x9f\xc8_+b\xba)\xaduO\xfe\xe0\xe0\xd1%\xd1\xd3@V\xc2Bx\xfbH\x93\xa4\xd4lb\xbd\xbc=)\x82\xfb\xf0\x10v\xfdf4uq\xec2\x90\x85\xb0\x10\xde6\xd2$+5[R(˛\xfc{\xbbh\xb9\x18\xb7mY\xb8\xbe,(\xfc\xf5\\!r\xe4ų\xa95p\xb1\xd5)1\x1b\x01\xd9\x06\v\xe1ɶ\xe3)q\xa9\x19}R\x92S\xe99ܯ\x8f\xfe\xd28N\x94<\xef)\tԗ\x85\xf6\xf0\xed^\xefx\xa3\x04\xa4됷t\xba\xd7\xeb\xfd\x80@\xb6\xc3B\xf88\x91&a\xa9\x19ѵ\xe7\x1f\xd5D\xbe\x11ᵉ7\xf4=z\x89Y_f\x8d4\xb9\xc1\xaaVD\x1a`\xc0Bx\xfb7\x9e\x12\x97\x9a\x19\xdc\xda_iv}\xd4\xc9G\rf}\x19\x84\a\xf1a!<\xd9E\x9ad\xa5f\xed\x17\xe4\xad\xdfh1\x8b\xa8/\x83\xf0 >,\x84\xb7\xfd\xc6S\xb2R\xb3\xc2\x15\xc6]})E\u0557\xc5\x17~\xe7\xa7\x04\xb2\x1c\x16\xc2\xc7F\x9a\xd0\xf2\xf8\xa5fE\xc52\xc0\xf8\xa7.\xd2o\xb5\xa2.\xfd\xd0t\x92Y_f+\xbc[\u007f\xeeJ\xec9{\x90m\xb0\x10\x9e쾬\x9d\xacԬH\x14z\xdaZܹ\xb2\xb3L\x96\xcc\xef,\x95\xf5e\x96~\xb3\xfew\xbc\xde\xf1\xb5^\xaf\xb1\xdb\xf7h[Zܮ\xcfb7\x03\xb2\v\x16\xc2'\xb8.M\xfc\x06\x90Gw\xd6\xff\xccU0\xcf\xe8\xe8\xd3V\xd7\x06\xea\xcb,\xfdfGs\xcc\xe1\x0e9\xe3֊\xfc\xdc\xe9\xed\xb6\x1b\x02\xd9\x04\v\xe1\xe3E\x9a\x94K\xcd4\x0f\x01\x90\n,\x84\xa78ן\xe9K\xb5\xd4\f\u0083\x14a!\xfc\xa0\"\x8d\x15\b\x0fR\x84\x85\xf0\t\xceҤr\xa9\xbd\v^\xad\xf6]?\x01\x90\x1c\x16\xc2\xd3\xd0.\xb5\xb7\\?2\xd5>I6\v\x00b\"|\x82H\x83\xab\a\x83a\x85\x85\xf0C\x8c4\x00\xa4\f\v\xe1ih\x91\x06\x80\x94a!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84O\x10] <\x18VX\b\x1f/\xba Ãᆅ\xf0\x94\xe0\xb34\xc8\xf0`8a!<\"\rP\x05\v\xe1\x13\xec\xc9Qj\x06\x86\x15\x16\xc2S\xf4\x9e\xbcW\xdfۛ\xdfx\xdaP\xf1\xa1\xef\xa6,5#Dy0\f\xb0\x10>A\xa4A\xa9\x19\x18VX\b\x8f\x83S\xa0\n\x16\xc2S\xcc\xc1\xa9\xbe\xb3?\xbe}\xddڵkt֮Y\xbb\xf5u\x94\x9a\x81a\x81\x85\xf0\xb6\x97\xdaۼpn\xf5\\\x93\xea\xeai\xf1.\xd6\x01@Z\xb0\x10>6\xd2\xe8\xc3\r3\x8e\u007f\xf9\xf9\x97:\xfaͺ\x19(5\x03\xc3\x02\v\xe1\xc9\xf6\xea\xc1\x15\xe1E\x9bgɫ\a\x0f\xe0\xf8\x15\f\x15\x16\xc2\xdbF\x9a\x17f|\x18zdw}x\x00\x06\x01\v\xe1\xed#\x8d\xa5\xc8\xec9\xbbR\xb30\x91Mf\x01\x96\x8b\x1c\\Y\x0fD\xc3Bx\xb2\x8b4\xeb\xab{\xff\xf0\x8f\xffx\x8f\xfe\xdf?\xfbv\xcf\xe8|{m\xef\xdbk\xe3\xac\x1c\xd9d\x16Z\x88\x8bw\x80\x18X\bo\x1bi\xd6U\xf7\xad\xfb\xfb\xbf\xff?\xfa\u007fߗ\xa5f\xcd\vo6W\xc7߄]\xb1\x13\x84\a1\xb0\x10\xde>\xd2\xcc:\u007f\xf3\xec\xc7\xe7?>\u007f\xf62m\x9a\xf9\xb1\xaf\x93|\t>V\x03\xe1AJ\xb0\x10\x9el\x9b\xb8\x8dR3\xf3\x91\xedA\xeb՚\tūWOp\x19I=$\xbc\xff\x95)\xae\x87\x1b\x8c\xcb2i+\x9e\bW\x9d\x01 a!\xbcm\xa4\xd90\xb33\xf4𥙱\xa7%\xfb\x1f,l\xf0\x8c\xcf\xddY\xf9\xb2|\x14\x12~\xa9V\xbf\xb7^\xab\x95Cy\x11\xedƲ@\xd5\x19\x00\x12\x16\xc2\xdbG\x9a\x8a\xcf\xf5\xc1\x80\xb1\xf0\xa5Y\xb1o<5\x89\x93\xb2\xd6)\xa0sP\xf86\xd1\x16\xba\xd5&\xf7\x10\xf5\x94\x96\x13\x00AX\bOv\x91f\xd3\xc2'\u05ec\\\xf9\xeb_\xaf\\\xb9rM\xb5M\xa9Y]\xbe~\xf3Q\xb0\x978(|m\x99q\xf7\xa0\xdc\xc5k\xcf\xc8\xe1\x0e\xb3\xea\f\x00\t\v\xe1c#\x8d>ܷ\xf2\x97\xf3\xab\xab\x17>^]]=\u007f\xe5\xda\xd8k\b\xbf<\xf6\xaaܕG\xedፎ3\xa2*\xb9[\x8f\xa8:\x03@\xc2Bxۏ\a\xf7\xf5v\u007f\xd5ݽgù\xee/\xbb{{cW\xfa4\xa7\xf2ӓ\xa5偫\x06\x87\xf6\xf0\x93\xe4\x02\xffĥ\x14Uu\x06\x80\x84\x85\xf0\x14\xffK\xdckf\xc6\xfb\x9c\xfc1Q$\x84\xfbB\xe0QP\xf8\xbdB\x96\xcd7\x9a\xed\xadŷ䱭\xdbvu\x90\x9d\xb0\x10\xde\xf6\x1bO\x03}}\xbd>\xdf\xf6\xc7\xcf\xfaz}}6\xce\x1f\x1b\xbf\u007f\xaf\xf7\x82\xb1\x83\xb74\x99QMN]k]N\x8d\\\xac\x89\xca\xc3\xfb\xcb\xf3?\x8a]\x17d-,\x84\x8f\xf7\x8d'\xfd\x15p\xf0\xf5xץ9\xa4\xc9\xc62m\xfa\xa9\x88&3\xf2o+s\x95\x99\xe7\xe1\x1f\xf4,\x0eT\x9d\x01\x10\x80\x85\xf0\x14'\xd2\xf8\x88~=#N\xa9\xd9\x15ײ+\xb7o_?\xba \xff\xba\xdd\xd3\x00\xd8\xc2B\xf8x_\xe2\xd6w\xf9\xdb\x1f\x8f\xf3]\xa7\x96|\xf3p\xd5_\xd4f\xf74\x00\xb6\xb0\x10~0\x91\xe6X\x8eyB\xf2T\xce\t\xbb\xa7\x01\xb0\x85\x85\xf04\x88K\xed\xf9ks\x975\x1dhZ\x96\xbb\fuf uX\b?\xa8K\xed\xf9[+\x8b\xb5\xe2\xcaV\xf8\x0eҀ\x85\xf0\t\"\r\xae\x1e\f\x86\x15\x16\xc2\xd3 \"\r\x00\x83\x81\x85\xf0\x83\x8a4\x00\f\x02\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1\a\x11i\x10u\xc0\xa0`!|\xba\x91\x06Q\a\f\x16\x16\xc2S\x9a\x91\x06Q\a\f\x16\x16\xc2#\xd2\x00U\xb0\x10>\xe5H\x13h\xf7\xd39\xf8\xc6\xe7>\x1f\xda\xfd@\xba\xb0\x10\x9eҏ4\x9bf\xa3\x13\x04\f\x02\x16\xc2\x0f\"Ҡ\xce\x12\f\n\x16§\x1ci\xe4\x10\xed~`\b\xb0\x10\x9eR\x8e4}h\xf7\x03C\x82\x85\xf0\xa9G\x9a>\xb4\xfb\x81!\xc1B\xf8\xd4#M\x1f\xda\xfd\xc0\x90`!<\xa5\x13i\xd0\xee\a\x86\x00\v\xe1Ӌ4\xc9\xdb\xfdZ\xe4e\xc8&F\u007f\xbb{\u007fA\xab\xddd\x90U\xb0\x10>\xadH\x93B\xbb_\xd7!oޢ\x98\xe2\x8fVWK\xf4\"\x90u\xb0\x10\x9e҉4\xa9\xb5\xfb\x15\xad\x8e]\x86\vz\x00\x1e§\x17iRj\xf7\xb3\x13\x1e\x00\x1e§\x15i\x92\xb6\xfb\x19\x98\u0087+\xfd\xae\xe7\n\x91#/\x1dO˅\xb6s\xd5\x03\xae\xca\xe0\x95\xe5AV\xc1BxJ'\xd2$k\xf731\x85\xb7T\xfa\xb5{\xbd\xe3\x8d\n\x9c\xbf4\x8e\x13\x05\x9e\xdf\xe6-\x88]\t\x8c~X\b\x9f^\xa41\xda\xfdL\xec\xda\xfdL\f᭕~:\xb9\x81\xa2b-_\u07fb\xd7\x14خ\aF9,\x84O+\xd2$k\xf731\x84\xb7V\xfa\x91ExY\x00\xe5\xd1l\xd7\x03\xa3\x1c\x16\xc2Sʑf y\xbb\x9f\x89!\xbc\xb5ҏ,\xc2\xcb{\b\x9f\x9d\xb0\x10>\xf5H\xa3\xd3\xd7ۭ\xe3\x1b\x90\xb7v\xed~\xb7?\x90\a\xa9\x13\x8c=\xbc\xa5ҏ < &§\x1eiB\xcb_X\xf8y\x9c}\xfb+\xc2KtUl\xa3\xc8J?\x82\xf0\x80\x98\bO)G\x1a2\xda\xfd\xba}\xbe\u007f\x9bv\xc4\xd7m\xdb\xeew@\xcci\xd9U>\xe139\x0eW\xfa\xf5\xbf\xe3\xf5\x8e\xaf\xf5zo\xd0%\xafV\xfb\xae\xffD\xad\xe6E\xddY\x16\xc2B\xf8\xb4\"\x8dIo\xfc/q\xb7Lu\xe5W\xbdo\fÕ~Gs̢\xbf\x1d\xb4\\v\xff\xbd\xef\xd2o\x97\xc7\xdd\x04\x18\xb5\xb0\x10>\xddH\xe3#\xda\xf4\xf8Y\xfbv?\x00\x12\xc1BxJ'Ґ\xbcx\x01鑆l\x8eX\x01H\f\v\xe1\x877\xd2\x00\x10\x1f\x16§\x1bi\x12\xbc@\x00H\b\v\xe1)\xcdH\x13o9\x00\xc9`!\xfc \"\r.\xb5\a\x06\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<\r5\xd2\\\xbe\xfcyg\xd4\x06\xba;/\u007f\xf5%^\x12 \n\x16\xc2\x0fc\xa49\xb8=ޗ\xfe\x00 &\xc2\x0fW\xa4\xd17\xb0i.\x0efA\x02X\bOC\x8d4a\xba;\xb1\u007f\a\t`!\xfc\xf0D\x9a\xbe>__\xdf\xf1=_\xeaw\x03\xb0\x1e\xd8\xc3B\xf8\xe1\x8a4:/=v\xd1f)\x00\x01X\bO\xc3\x17i\x06\xc2\xd7\xe1\x03 \x16\x16\xc2\x0f=\xd2諞\xde\xf3\x87\xed[7\xbfټ}\xeb\xd6\xed\xcd\xfbnگ\x06\xb2\x1d\x16\xc2\x0f=\xd2\xe8\xabn\x9f?k\xe6\xb4\x19\xd3$3\xe7W\\Ĺ\x1a`\a\v\xe1iȑF\x1fn\x98v\xf0\xf4{\xa7\xdf\xd39}z\xcd4\xb4\xfb\x01[X\b?\xf4H#\x85\x9f\x1d\xbe\x8a\xc1֊s\xf2\"\x1ep\x1eD\xc3B\xf8a\x894\x96\xb2\xb3\xbe\r3\xcfE\xaf\x03\x80\x84\x85\xf04,\x91fFHxZo\xdf\xee\a\x00\v\xe1\x87%Ҭ\x9f۽\xe7\xc7?\xfe\x89\xfe_E\xdf\xeb3??\xb2\xddw|k\xe4\xe7jNU\xba\nk\x0e\x14^\xa1Z!\x84\xeb\f\x81,\x84\x85\xf0\xc3\x12i\xd6UӚ\xaf}\xed\xef\xf4\xff\xbe%\xdb\xfdޘ۽;\xb2\x1f\xa4\xcd\xf5\xe8\xce\xc62!>\xa0\v^o\x83x'z\xab \x1b`!<\rK\xa4\x99}\xf9b\xf3\x9e}{\xf65\x1f\xa4\xcd3.v\x9e\x1e\xe8\xfc\xd0z\xf5\xc9ky\xf3n\x11u\x95\xea\xc2\xeb\xb4C\xf8섅\xf0\xc3\x12i,\xed~\x03v\x19\xbe.\u05f8<\xf6\x16ad\x19\b\x9f\xa5\xb0\x10~X\"͆Y\x17\xcd%\xfaͦ\x19\xe7\xe4\xa5V#6X\xfa\x84qwu\xcb-y\x17\x12\u07bf\xab\xdc\xf5\xc0\xea\x1e}tcq\xb1VRu\x92\xd0l9\x9aa!<\rO\xa4\tobsE\xcc\x1bO\xb7r\xb6X\x1f\x86\x84\xaf\xcdY\xb1w[\xc1T?Q\xabXv\xa0\xa9*\xa7\x1d͖\xa3\x19\x16\xc2\x0fK\xa4\xd9P\xbdn\xf3\v\x9bt^ش\xf9\x97\xb1\xed~\x9f\x88\x16\xebà\xf0\xadb\x97\U00068468\xa7\xa9K\xdf\xe1\x97͓\x8b\xd1l9Za!\xfc\xb0D\x9a\xe6\xc7\x1f\xab\x98aR\xf1\xf8\x93\x9fGo\xad\u007f\x9c\xed\x1e~ɤ\xfe\xdb:Ų\xd9\xf2jC\xe5\xa4<aT]\xa2\xd9r\xb4\xc2Bx\x1ar\xa4\xd1\xe9\xbex6\xc4\xc5˱\u007f-\x02\x19\xbe\xdfl)\x0e\n_f6\xe1\b}\xbf\xde^X\xf2t\x8b\xd7m\n\x8f\u07b3Q\n\v\xe1\x87\x1eiR\xa0.\xf7\xaa\xbck\x12W\xe4]P\xf8\x9aI\xc7\f\xf4\xe7&\x97\xcbC\xd7E\x10~T\xc3B\xf8\xa1G\x1ac\xe9@_\x90\x81\x98M\xc9\xf3\xf0\v\xfa\xf5\x8c\xee\x9eh<\n\n\xdf&\x9a\xe4]\xfdF\xa2\x92E\xfa\xc0\xff0\x84\x1fհ\x10\x9e\x86#\xd2$\xa5\xcdU\xbe\xab\xa5r\xdc!\xa2\xcf\xe4;\xad[\xbc\xdeO\xf5\xa5uckZZj填G,nx~\xaa(z\xf1]4[\x8e^X\b\xaf$\xd2\x18\x9f\xa5)\x9a\xf7\xbe>X\x1a\b\xeeK\xe4\xd26\xf7\x84\xfc\xe92\xd8\xfb\xb7\x94j\x05K^+\xd5\xdch\xb6\x1c\xbd\xb0\x10~x\"\r\x00\xc9a!<)\x894\x000\x11^Q\xa4\x01\x80\x87\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe13\x1di\xf4\r\xbf\x8d:K a!|\xa6#\r\xfe\"\x80 ,\x84\xa7\xccG\x9a\xb4\xfe\"\x80\xd1\v\v\xe1\x15D\x9a\xb4\xfe\"\x80\xd1\v\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0*\"͛_\r\xf8h\xa0O\xfeK\xeb\x95\x02F\x17,\x84W\x14i\x00\xe0!<\xa9\x884\x89g\xb7\x94_I\xf8\xfc\x90\xb8V\x1eqmz\xe0 ,\x84W\x10i\x0e\xee\xee;\xb2\xd9w\xe4%\xfd_\xef\xf1\xed136\n\x8f?bA\x1a͖\xcbEN\x93\xfd3_,+ʝ\xa3o\xd7\xffb\xceF\xfb\x19\x83\xe4\x13MLN6\a\xd8\xc2Bx\x05\x91慅7߬\xee6\xff\xed\xf9e\xf4\x84m9\xbb\xa2\x96\xa4\xd1ly\xc1k\\k\xd8\x06wᎥ\xb9\xd7\xe5h\xef\xb8m\xf6S\x06\x87\xff\xddZ\\\xd9xp\xb0\x10\x9e2\x1fizoҗ\x1f\a\xfeu_\x8cz\xb2C\xab\v\x0e\xaf\xba\xaf\x06\x87\xa9\x17\xfd\xc5\x11\xfe\x9a\xd8F\xfe.s\\\xaf\roC\x1a.\xe5=HX\b\xaf \xd2\x1cy\xa33\xfe\xf3\xb5\x85=\xc1\xe1)q*8\x1c\xb2\xf0gDkh\xdcUXk;g\xb0@\xf8A\xc2Bx\x05\x91fs\xf5\xf9\x81\xde8\xa7%\xfb\xf3\x9e6\a\xdbJ[?\x10\x1f\xec-}\xc5x\x14\x14>\\gI\x93\x03\xd7ٞN\xad\xfa\xed3\xe4\xd1o\xf5\xfc\xae\xadx\xa28\xbf\xea\x8c\x11\xe7w\x05\x02v\xff\x04s\xea\xaa\xc0\x0f\xa9\xcf\r\xbd\xa8\x02Xk2\xc7m[\x16\xdcBhh\xa9Ԍ\xe8ѼPS\x9c\xbf\b\x91f\x90\xb0\x10\x9e2\x1fi\x12\xfdE8!\xbc\xe6\xe0B\x8dxP\x94\x89E\x9f\x19\x8f\xc2E\u007f\xc1:K\xd2j\xbd:\xe5b#\xf5\x1c*Yv\x85\xae\xd4\xe7y\xf5̢\x89)M\x8de\xaeSf\x9c\x0f\x04\xec\x13\xdeF\xe1\xf1\x86*\x15\x0e\x89\xc3Q?6\xb2&\xb3\xe4yO\x89\xbe\x05\xcb\xd0R\xa9i\xed\xd1<\x93\xf7\xc0k-\x95\x02\xc2\x0f\x0e\x16\xc2+\x894\xf1\xff\"\xec\x15\x1f\x05\x87m\x9a\xd0\xda\x02\xe3\xa0\xf0\x96:K\xcf1}T+\x8c\x03P\xcf\x14\xfdf\xa9\x11T\xb4\xc9\xfa^\xb8\xa7\xb4\x9c\"\xbbr\xac\x91\x86.\x88\xe8S\x93\x115\x99\x13o\x10]/)\x8f\x18Z*5-=\x9a\xd3K{\xe4j\x10~p\xb0\x10^I\xa4\x89\xff\x17\xa1E|b\x0e\xae\xadҊE\xf1\xf8\xa7\xbe0\x1e\x852\xbc\xa5\xceR\x8f*\x8bǚgt.\x8c}\x9fn\xe5\xed\x97C\xed\x19y\xbbC\\K(|̹KkM\xa6q\xd4\xdc`l!4\xb4Vj\x86z4\xaf\x8b\x9d\xf2\xf9z\b?8X\bO\xceF\x9aw\x83fo\x9c\xb0\xe3\x94\xf8˶\"\xf3\xa4yPxk\x9d%\xf5\xccт{\xea\xca\xd5Ԗ\xdf/G\xe6A\xabW\x1cK |\xbb8D\x91\xc4\xd4dZ\xb6`\f-\x95\x9a\xe1\xed\xb6\x9b\xf9\v\a\xad\x83\x84\x85\xf0\x0eG\x9a\x9e\xd0Y\x96~\xe3,M\xbf\xf9\x1eTPxk\x9de\xd7\xf4\xf1\xc1\xc4C\xad\x13\xfa\xcdDC\x9aqd\xbaS\xdc\b\x88Yo#\xbcG\xeb\xa2H\"j2-[\b\r-\x95\x9aa\xe1\xbf\x10\r\xf2\xf9\xa5\x10~p\xb0\x10\xde\xe1HC\x8bJCo\xb3~\x96\xffYp\x18\x14\xdeRgym\x8aK\xee_[\xddry\u007fQk\xbe\x91hH+\xbe\xa5?|P.u=\xad\xcf}4Vx\xff\xe4\xaa\xe0\xf0\x93\x8d\x1d\xd1\xdb%\xadH\u007f9tMrG\f-\x95\x9a\x96\xbf\x1c\xe5%z\xee\xf9h<\x84\x1f\x1c,\x84'g#\r\x9d\xc9\xf9m\xf4\"K\xb3e\xb8\xce\xf2z\x99\xd8(O\xd3<a\xdaV7)\xff\xb61\xd0D\xe5\xe1\xfd\xe5\xf9\xf2з\xbc`\xe3\xf3\xe5bܮS\x81\xb34\xef\x06^J[dZ1\x99'\xe6\x18\xf7\xe1\xed\x9a\xe7yv\x96\x1a[\xb0\fC\x95\x9a\xd6\x1e\xcdS\xae\x12O}~\x8e\xfc\x11 }X\b\xefp\xa4\xd1w\xa2\xe3\xa3\x03\xb6\xa5\xd92\\gyb\\`i\x891\xe7#\xb1̜\xfc\xa0gq^q\x8dq\x02\xf2\x8c;7\xaf\xf2\x19!\x96\xdf\xca7f\x8e\xfb\xc0\x98\xe1\xcd}*\xb4\xe9\xd7\nv\x18\xf7\xe1\xedꖯ\xae\rn\xc12\fUjF\xf4h\x9e\xa9ʟ\xf8Ԯq\xa8\xd4\x1c\x14,\x84w:Ґ\u007f\x85\x16\xe7\xf3_\x89\xe8\xd2\x0e$\x9b\x12\xa0I\xab\xbd\x9dp\x82\xe5\xbd\xdax\x1f\xcc\x01\xc3\x02\v\xe1\xc9\xe1H#\xf7\xb6\xc5W)]\x9a&$\xb68ĵ\u008d\x91\x9fŌ\x01«\x82\x85\xf0\x8eG\x9aA\xe09\xe0w\xd7'\x9b\x942\x10^\x15,\x84w<ҤO\x8f\x98\xb2\xbc\xf0z\xb2Y)r\xc18&\x8d\x1e\x82L\xc0Bxr<Ҥ\x8f\xc7\xe5\xfe ٜT1\x8eI?\x89\x1e\x82L\xc0B\xf8\x91\x18i\xc0Ȅ\x85\xf0#0Ҁ\x11\n\v\xe1i\x04F\x1a02a!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84\xcft\xa4\x01 \b\v\xe13\x1di\x06Pj\x06\x02\xb0\x10\x9e2\x1ciҝ\x0fF/,\x84W\x10iҝ\x0fF),\x84W\x10iҚ\x0fF/,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16«\x884(5\x03\x12\x16\u0093\x9aH\x03\x00\x0f\xe1\x95D\x9a\xc4/\x0f\x94\x9ae\t,\x84W\x10ix\x96\x9a\xed/\xb0\\}2\f:\xcb2\a\v\xe1)\xf3\x91\x86g\xa9Y\xab\xcbv\u05cfβ\xcc\xc1Bx\x05\x91\x86i\xa9Y\xbc\vr\xe0jؙ\x82\x85\xf0\n\"\xcd\b+5\x83\U00019085\xf0\x94\xf9Hð\xd4\xecz\xae\x109\xb2\xce&ngY\xa8\xd4\xec\xd48!\xaa\xfc%B\xe4\xdf\"0$X\b\xaf \xd2$\x9a\xefP\xa9\x19\xb5{\xbd㍿\r\xf1:\xcbB\xa5f\xfeÞ\x9côk\xec\xae\x13\xd1\xdb\x00i\xc2Bx%\x91&\xfe|\x87J\xcd$\xb9\x810d\xdbYf-5\xf3/-\xbfZ2\xbc\xfd\xf5\xd9\t\v\xe1IE\xa4\x89?ߩR3\xb2\bo\xd7Yf-5\xa3\x9e\x87\x8b\xaap\xcdɡ\xc3Bx\x87#\x8dC\xa5f\x92\x90\xf0v\x9de\xd6R3\xf9\xb2\xb4\xdb\x00H\x13\x16\xc2;\x1ci\x1c*5\x93\xc4\bo\xed,\xb3\x96\x9aх\xc2\xfa\x92/l\xb6\x00҃\x85\xf0\xe4l\xa4q\xa8\xd4L\x12#\xbc\xb5\xb3\xccZj\xd6_^O\xcb\xdc\xc84C\x86\x85\xf0\x0eG\x1a\x87J\xcd\xfa\xdf\xf1z\xc7\xd7z\xbd7\xe2v\x96\x85J\xcdz\x0e-/\xb8@\x1dy+\x0e\xe1\xb4\xe4\x10a!\xbcÑơR\xb3\xa39\xe6\xc6v\xc4\xef,\v\x96\x9a\xb5\x19'\xf4W\b16\xd5V)\x10\a\x16\u0093Ñ\xc6\xf9R3\xa0\n\x16\xc2;\x1di\x9c/5\x03\xaa`!\xbc\xe3\x91f\x10\fo\xa9\x19P\x05\v\xe1\xc9\xe9H\x93>\xc3Zj\x06\xd4\xc1Bx\xe7#M\xfa\fg\xa9\x19P\a\v\xe1Gb\xa4\x01#\x13\x16\xc2\xd3ȋ4`\x84\xc2B\xf8\x91\x18i\xc0Ȅ\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10>ӑ\x06\x80 ,\x84\xa7\fG\x9a\x01\x94\x9a\x81\x00,\x84\xcft\xa4I\xf7\x05\x02F/,\x84W\x10i\xd2z\x81\x80\xd1\v\v\xe1)\xf3\x91&\xdd\x17\b\x18\xa5\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\xa4 Ҡ\xd4\fHX\b\xaf(\xd2\x00\xc0Cx%\x91&\xf1n\x1d\xa5fY\x02\v\xe1)\xf3\x91\x86g\xa9YRⴞ\x81A\xc3Bx\x05\x91\x86g\xa9Y\x98\x03\xc7Ȏ8\xadg`а\x10^A\xa4aZj\x16\xe2\xd1%\xf6\xcbq\x01\xa7a\x86\x85\xf0\x94\xf9Hý\xd4l\xea\xe2\x84O\x83ႅ\xf0\n\"\r\xc3R3\xf2V\x96hEsJ\xfc\xc6\xc6$S\x88N\x8e\x13\xa2\xfeL\xcd\xc4\xdc\xca\xdb\xf1ZϮ\xd6L(^\xbdz\x82k\x10W\xc3\x04<\x84W\x10i\x12\xbd@\x1c*5;:vi\xcb\xfe\x9dE\xe26u\x1d\xf2\x96N\xd77\xfc\x81,\x94j,)\xcd+YU3\xf6\xd38\xadg\xfd\x0f\x166x\xc6\xe7\xee\xac|\x99@\xfa\xb0\x10\x9eTD\x9a\xf8/\x10\x87J\xcd\x1a\n\xe4\xb5X\x1b\xf2\x8d\x98n\x894S\x85\xfb\x06\xf9o\x98\x0fb[Ϛ\x84\xfeǦ!\x9c\xbc@Z\xb0\x10^I\xa4\x89\xff\x02q\xa8\xd4\xec\xb3\xe2\x89+v\x9e\xf0\x1b-Q\x11\xc2k\x9f\x86'Ŵ\x9eQ]>\xc9K\xd3\xe3\xec\xcd\xe0`!\xbcÑƩR\xb3\xeb;\x16O\x16E\x1bc\xf6\xf0S,sb;q^\x1e{U6$`\x0f?8X\bO\xceF\x1a\x87J\xcd\xda\xeb\xf4\x9fs\xbd1\xb7A>0\x84\xdfi\xecڧ.\xb2L\x8a\x15\xfeӜ\xcaOO\x96\x96\xe3|\xe5\xe0`!\xbcÑơR3\x8f0^;n\xa37ǭ\xaf|\xc5L=\x11g(c\x85?&\x8a\x84p'>\xab\x0f\xe2\xc2Bx\x87#\x8dC\xa5f\x1e\xe1\xaaom\xa9\x15Fo\x8eG\xdb\xd2\xe2v}F\xb7\x0f\x1b'l>\x91\xcb\xec[ώ\x8d\u07ff\xd7{\x01;\xf8A\xc2Bxr6\xd28Tj\xb6k\xba\xa7D+t\x9b=Q\xb7V\xe4\xe7No':i6\x9d\x19\u007f\x0e\xec[\xcf\x0eir\x996\x1d!~P\xb0\x10\xde\xe9H3\x92Jͮ\xb8\x96]\xb9}\xfb\xfa\xd1\x05\xf9\xe8\x1f\x19\f,\x84w:Ҍ\xa4R\xb3\x16\xf3\xbc=\xf9\x8bBG\xcf \rX\bONG\x9aA\xe0T\xa9ٱ\x1c3˜\xca9\x91d&\xb0\x83\x85\xf0\x8eG\x9a\xf4q\xac\xd4\xcc_\x9b\xbb\xac\xe9@Ӳ\xdce\xc3\xf6G#\xab`!\xbc\xf3\x91&}\x1c+5\xf3\xb7V\x16kŕ\xad\xf0}P\xb0\x10\x9eF`\xa4\x01#\x13\x16\u008f\xc0H\x03F(,\x84\x1f\x89\x91\x06\x8cLX\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1)Ñ\x06\x80 ,\x84\xcft\xa4\x19@\xa9\x19\b\xc0B\xf8LG\x1a\xfcE\x00AX\bO\x99\x8f4i\xfdE\x00\xa3\x17\x16\xc2+\x884i\xfdE\x00\xa3\x17\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1UD\x1a\x94\x9a\x01\t\v\xe1\x15E\x1a\x00x\bO*\"M:\xb3\xc1\xa8\x85\x85\xf0\n\"M\xdcR3\xef\xd8\xc0ŕƟ\x8c\xbb~\x98\x93s&\xe4M?Pv(y\xebY\xfc\xaa3\xe0$,\x84W\x10i▚\xdd:T8G^>o\x97H\xe1:/Ǵ\xaa\x96]\v\x8c֏d\xadg\xf1\xab\u0380\x93\xb0\x10\x9e2\x1fi\x12\x94\x9aM4.\x98\xf7Q*\xc2W\xba\xfdF#\x82\xb9\xefNR\x02\x05\xe19\xc2Bx\x05\x91&A\xa9\x99)|\xff\xb6\x1b\xf1&\x84\x99h\\z\xe9d\xa0\x8d\x00\u008f@X\b\xaf \xd2$(5\x9b\x18\xb8$jD\xa1\x18\xf9_\x99\xe2z\xb8\xc1O\xb7\x8b\xb4\xdf\x14\x17\x1fX\x91\xef\xee\"ZR(/\xfb\xe5\xdfk^\xeaݦ\xf5,\\T\xa6\v\xffT\xa8\x87\f\xb0\x81\x85\xf0\x94\xf9H\x93\xe0/\xc2\xc4ڞ\x9e\x97e?SD\xa1\xd8R\xad~o\xbdVKt O\xacr\x8b\t\x1b\x8b^&\xfa\xa4$\xa7\xd2s\xb8?\xb0\xa2M\xebY\xb8\xa8L^D{rcKт8?\x158\x03\v\xe1\x95D\x9a\xb8\u007f\x11&\xcas4\x85\xe68T(\xd6fDz㶰\x86\xf6\x8aVZ*\xff\x10\\{\xfeQM\xe4\aN\xbfش\x9eY\x8bʴ\xc2/\x88j\vb\u007f p\x10\x16\xc2+\x894q\xff\"L\xacjo_\x1a\x14>X(VkV:=\xa8\xef\xe2\v\x1b\xe9]\xd1EOט\xcf\xdc\xda_)\xf6\x1a#\x9b\xd63kQ\x99&_!\x81\xba'\xc0\x05\x16\u0093\xb3\x91F\x17\xf3\xd4Ns\x1c*\x14+7\x1bj\xaa\xf4\xa8S\xd8F\xed\xba\xb6u\xba\xf0\xedF\"\xf7\a\x9e\xb4k=\xb3\x14\x95Y\xfb\xcd\x00\x17X\b\xefp\xa4Y\x16\x1e\x87\n\xc5j'Ig\xfd\x13\x97F\b_\xb8\xc2x\xb2\xbeԸ\xb3i=\xb3\x16\x95Ax\x8e\xb0\x10\xde\xe1Hc\x15~q`\xb0W\xc8\xce\xf7F\x19^,\xc2\x17\x15_ӗ\xfa\x03/\v\x9b\xd63kQ\x19\x84\xe7\b\v\xe1\xc9\xc1Hs\xeb\x9d\xc29\x87\xccӌ\xd6B1\xaaɩk\xad\xcb\xd1%?\x95\xffrO\xa3v\xb2\xa7\xc6}\x81\x8aD\xa1\xa7\xadŝ\xfbQ\x9c\xd63KQ\x99\xb5\x87\f\xf0\x81\x85\xf0NF\x1a\xe3\xb34f\xb7\xb6\xb5P\x8c\xfc\xdb\xca\\e\r~\xf2\x17\tј'\\MḄGw\xd6\xff\xccU0O\xd6\xf5ٶ\x9eY\x8aʬ=d\x80\x0f,\x84w6Ҁl\x82\x85\xf0\xe4`\xa4\x01\xd9\x05\vᝌ4 \xbb`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2g:\xd2P\xfa\xf3\xc1(\x85\x85\xf0\x99\x8e4\xe9\xce\a\xa3\x17\x16\xc2S\x86#M\xba\xf3\xc1腅\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10^E\xa4A\xa9\x19\x90\xb0\x10\x9e\x14D\x9a\xb9(5\x03\xc4Dx%\x91&\xe5\x97\a\x18Ͱ\x10>ӑF\xe7\xf8\xbe\x81\xe3\u007f\xf0\x05\xfe\xbd\x9elv\xf2\xce2\vޱ\xa2\xdcO-B\x8cݟl\xaay\xad\xa7\xdad\xb3@\xe6`!<e>Ҭ\x99ֽ=\xf0\xef\xab7\x9eL\xb6B\xf2\xce2\v=\xfbE\xae\x97\xbaZ\xc4\xfe\x9edS\xe9\xf6;\x0f\x97y?K6\vd\x0e\x16\xc2+\x88\xc7O\xf3\xe3\x00\x00\x0e\xfdIDAT4\x83 I\x85S\x98.Q\xa3\xef\xb4?\x11]\xc9&J\xdc\xeed3@&a!\xbc\x82H3\b\xd2\x10~\xbf\xab\a\u008f\fX\bO\x19\x8e4\x89h\xd2C\xb5\x87<\xc2(_\r6\x99\x19\x04\x84_.rv\xd1'\x9a\x98\x1c\xd9oF\xfe]\xe5\xae\aV\xcb\x14\xd3%>\x99\xdab\n\x1f\xea7\x8b7\xd7*|h\xe9r\xa1\xedD\x01\x9a\x1aX\b\xefd\xa4\xe9\xf2\xe6\xd5_\xa1+\xf5\xf9\xde.K\x93\x99$ \xbc\xd10\xec\u007f\xb7V\x8b\xec7\xa3ڜ\x15{\xb7\x15L\xf5\x1b\xc2o\x9bc\n\x1f\xee7\x8b3\xd7*|h\xe9_\x1alj\x02\xcfo\xf3P\x80\x96yX\b\xefl\xa4\xa9]\xa2\xdf\xd4<A\x11Mfd\x894\xe1f\x03K\xbfY\xabq\x8d\xedvٛ\xa0\v\u007fu\xfcUCxK\xbf\x99\xfd\\\x8b\xf0֥Z\xbe\xbew\xafA\x01Z\xe6a!<9\x18i\xf4}qn\x0f\xf5\xb8\xbc\x14\xd1dF\xf6\u0087\xfb͖L꿭S\\k\bOs\xb6\x98\x19>\xdcof?\xd7\"\xbcu\xa9\xb6\x94\xd0\x16\xa2\x04\x16\xc2;\x19i\xf4\xb8=\xa1\x85Z\x8adܰ4\x99\x91\xbd\xf0\xe1\xf6\x9b\xb2@!\xc2<S\xf8\x96\x87\r\xe1-\xfdf\xf6s-\xc2[\x97\xa2\x1eG\x15,\x84w6\xd2Њy\xb4\xc0h+\xb34\x99Q\xb4\xf0\xf5Q\xc2\xd7L:fp\xd5\x14\xbeǵ_\no\xe97\xb3\x9f\x1b\x10\xbe\xab\xfeZ\xc4R\b\xaf\n\x16\u0093\xa3\x91\x86\x0e\x8f\xbf4\xfe\xb0\x1cX\x9a\xcc\xc8\"\xbc\xebi\xfdU\xf0h\x94\xf0m¨'\xae\xdfh\nOKk\xa4\xf0\x96~3\xfb\xb9\x01\xe1O\bo\xc4R\b\xaf\n\x16\xc2;\x1bi\xc8_\\Yl\x9e\x8a\f5\x99Y;˨\xbc`\xe3\xf3\xe5bܮS\xd6~3\xaa\x1b[\xd3\xd2R\xab\x1fx\xf6\xec\x17-]\xe4͕\u0087\xfb\xcd\xec\xe7\xde>\xfcp\x99Wg\x87.|x)\n\xd0\xd4\xc1Bx\x87#\rmѶ\x98\x83`\x93YDg\x19\x9dq\xe7\xe6U>#\xc42k\xbf\x99\xbe\xdfvOȟަ\x1f\xf4\x8e\x95\xe7\xf0\xfd\xe5\x85~K\xbf\xd9t\xfb\xb9\x81\xde4!r?\xb0,E\x01\x9a:X\bO\xceF\x1a\x90E\xb0\x10\xde\xe1H\x03\xb2\b\x16\xc2;\x1di@\xf6\xc0BxB\xa4\x01\x8a`!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16§\x1ci\x8e\x9f\xfd\xf0|g\xe4\x9cΏϞ?\x8b}=H\x11\x16\xc2S\xaa\x91\xc6\x17\x1a\x1d߇]<\x18\x04,\x84O9\xd2\x04\xe6\xe87\x1bf\x9eC\x86\a\xe9\xc3B\xf8\x94#Mx|\xf1\xbd\xf0\xde\x1e\x80\x94a!<\xa5\x1ai:\xa5\xf0\x03\x92s\xc7o\xca;\x9b\x95\x00H\x00\v\xe1Ӎ4}\x884`\x90\xb0\x10>\xe5H\x13\x8e1_\x9e\x8e\x9e\f@\n\xb0\x10\x9eR\x8d4\x92\x8bG\xf6\xed۷砼\xddw\xf08\x92<H\v\x16§\x1ci\xa4\xfb\u007fxlƴG\x1e\x996M\xdeTW_F\xb0\x01\xe9\xc0B\xf8\x94#\x8d\x91\xde+v\xbf\xbd\xef\xed\xf7\xce\x1f\xdc\xf7\xf6ۿ~\x04I\x1e\xa4\x05\v\xe1)\xe5H#\x85\x9f-cL\xe7A\xf9p{\xc59\x99\xebq\xb2\x06\xa4\n\v\xe1ӊ4\xf2\xfc\f\xd1}_;H8W\x03҆\x85\xf0iE\x9a\x17f|\xa8\x0f\xee\xbf\xe3\xa2~\xbb~\xe6\xd9\xe8u\x00H\x04\v\xe1)\x9dH\xf3\xdcc\x9dG\x1e\xff\xe5\xf7\xbf>\xed\xf1\xb5\x03\xdbg\\>\xbd\xa7\xef\xf4\x1e\xcb\xca\x1e\xa1\xb5\xe8w{]\xc2\x13\xb3\xbdh\x96\x8b\x9c\xa6ds\xc0肅\xf0iE\x9auմ\xe6\x8e;\xbe\xa6\xffw\xb7\xafyF\xf7\xeb\x15\xddoL;\x1b~Q\\\xadq\xc9\xda0wn\xcd\xd5\xc8-\x1d8F\xd1\x18%\xdb \xab`!|Z\x91\xe6\xb9\xc7>?\xfe\xec\xda\xff\xfb\xf5\xeag7\x0fl\x9fy\xf1\xdc\xc1\xbes\aoZV\xaa\x9b\xe3\xbaN\xd7r\xe7\xd4Em\xec\xd1%\x14\v\x84\xcf6X\bO\xe9D\x9a\x17f\xc87Y\uf2db\xe1\xebj\xdcM\xb4\xab\xb2&Z\xf8\xa9\x8bc\xa6B\xf8샅\xf0iE\x9a\r3?\xd6\a\xff\xfc\x8d\x83d\x9e\xa5\x89~\xaf\xb5\xae\xa6a\x01\xcd\xd9!\x85\xbf\xb1\xb8X+\xa9:\xa9/l\r\x94\xe7M1\xa6\x9cYT\xa4\x15ι\xa0\x8f\xb4\xa7V=઼@ [`!|Z\x91f\xc3\xec^}\xe03>K\x138\x0f\x1fA]\xcd\x05\xd7\x17\xe3/I\xe1[Ų\x03MU9\xedD]\x87\xbc\xa5ӽ^\xaf,\x8b\xa4\x03\xae)/\xee\xf7\bYU\xa9\x89ɍ-E\v\bd\v,\x84\xa7t\"͆Ƕ7\xefn>rz\xdf\xee\xe6\xe6'm\xdei\xad\xab\xa1\xb2e\x8f\x92\x14\xbe\xa7\xa9\x8b\xc8_6\xcfX\x1e\x8a4=%\x95\xb7\x88\xfa\x9b\xae\xe9c\xad\xf0\v\xa2\xda\x02\x02\xd9\x02\v\xe1ӊ4o̝9\xed\x11\x93i\xd5\vc?K\xa3\v\xff\xa2\xd8h\bOW\x1b*'\xe5\x892cyH\xf86q\"4Y[F\xa8|\xcf*X\b\x9fz\xa4ѹ|\xfc\xa0\xce\xdbo\xcb\xdb\xe36\xdf{҅\xbf\xfa\xd4\x15C\xf8\xf6\u0092\xa7[\xbc\xee(᷈\x9e\xd0d\xe3\xa0\x15\xc2g\x11,\x84\xa7\x94#M\n\xe8\xc2K\xa4\xf0\x93˥ڋ,\xc2\xef\xfc\x94h\xbf\b\x9f\x91\x87\xf0\xd9\x06\v\xe1S\x8f4)`\x11\xbed\x91>\xf0?l\n\xefv\x13]\x11M\xfa\x01l\xa1\xbb_\u007f\xbcb\x15A\xf8샅\xf0iE\x9a$|Q㾤\xdf]r\xd7|A\x1e\xb1\xb8\xe1\xf9\xa9\xa2\xe8\xc5wIj\xbd\xa5\xc5\xed\xfaL\x1f\x1d\x18\xff\xe0\x8e\xb6\x15b']\xf2j\xb5\xef\xfaO\xd4j\xdeKI\xb6\nF\v,\x84\xa7a\x8c4\x1e!\x9e\xd0\xef\x96\t\xe1!\xff\x96R\xad`\xc9k\xa5\x9a\xfc\xb0\xc1\xad\x15\xf9\xb9\xd3ۍ9\x1f-.\xce+o\x91\x9f\xa5\x11B{ߥ\xdf.O\xb8M0z`!\xfc\xb0F\x1a\x00\x12\xc0B\xf8\x94#\r\xec\aC\x84\x85\xf0\x94j\xa4\xe9L/\xcf\x03\x10\r\v\xe1S\x8e4i\x1e\xc0\x02\x10\r\v\xe1S\x8e4\x10\x1e\f\x11\x16\xc2S\xaa\x91\x06\u0083!\xc2B\xf8\x94#M7\x84\aC\x83\x85\xf0)G\x1a\x00\x86\b\v\xe1)\xd5H\x03\xc0\x10a!|ʑ\x06\x80!\xc2BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1\x11i\x80*X\b\x8fH\x03T\xc1BxB\xa4\x01\x8a`!<\"\rP\x05\v\xe1\x11i\x80*X\bO\x884@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x89\"͛_\r\xf8h\xa0O\xfeî\x1e\f\x19\x16\xc2S\x82H3\xf7c\x9b'\x00\x18$,\x84O\x18i\xb0[\a\xc3\b\v\xe1\x13\x1c\x9c\x1e\xdf7p\xfc\x0f\xbe\xc0\xbf\xd7-O$-\x15N\xa7\xa1\x18d\r,\x84\xa7\xf8\x91fʹ\xee\xed\x81\u007f_\xbd\xf1\xa4幤\xa5\xc2\xe94\x14\x83\xac\x81\x85\xf0\x83;ߞ\xacc5\xad\x86b\x90%\xb0\x10~p\xe7ۓ\n\x9fNC1\xc8\x12X\bO\x83:\xdf\x1e.\x15\x0e\x17\x10\x13y+K\xb4\xa29%\xfe\x88\x86b\xf2\xef*w=\xb0\xba'\xb2\xa1غ\x1a\xc8\x12X\b?\xc8H\x13*\x15\x0e\x17\x10\xd3ѱK[\xf6\xef,\x12\xb7#\x1a\x8a\xa96g\xc5\xdem\x05S\xfd\x11\rŖ\xd5@\xb6\xc0B\xf8AF\x9aP\xa9\xb0\xa5\x80\xb8\xa1\u0dbc\xcd\xf7G4\x14\xb7\x8a]\xfa\xd2v\xd1(\xd7\v7\x14[{\x8bAv\xc0Bx\x1a\\\xa4\t\x97\n\x87\v\x88?+\x9e\xb8b\xe7\t\xbf\xac\xe9\xb34\x14/\x99\xd4\u007f[\xa7\xb8VN\x0egxko1\xc8\x0eX\b?\xc8H\x13\xaa\x9c\xb4\x16\x10_߱x\xb2(\xda\xe8\x8fh(.\v$wcg\x1e\x12>\xa2\xb7\x18d\a,\x84\x1fd\xa4\t\to) n\xaf\xd3U\xbfޘ\xdb\x10Q\xd8Z3阁qF>\xd4P\x1c\xd1[\f\xb2\x03\x16\xc2\xd3\xe0\"MHxK\x01\xb1G\xb4\xc9\xe7\xdc\xcb\"\x84o\x13ƻ\xb2\xf5\x1b\x8d\xe7\x82\r\xc5\x11\xbd\xc5 ;`!\xfc`\"\x8d\xb5T\xd8R@\xec\x11\xae\xfa֖Zq \xa2\xa1\x98\xea\xc6ִ\xe8K\xe5\xa1k\xb8\xa18\xa2\xb7\x18d\a,\x84\x1fL\xa4\xb1\x96\n[\n\x88wM\xf7\x94h\x85\xee\x03\x91\r\xc5\xfa>\xde=!\u007f\xba\xb1\xf3\x0f7\x14G\xf4\x16\x83쀅\xf04\xa8H\x03@\xfa\xb0\x10~0\x91\x06\x80\xc1\xc0B\xf8\xc1D\x1a\x00\x06\x03\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1BxD\x1a\xa0\n\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"\xb8\b\x0f\x80\x12X\b\xaf\x87\xf7\xb7\xb7w\"Ã\xcc\xc3Bxdx\xa0\n\x16\xc2\x132<P\x04\v\xe1qZ\x12\xa8\x82\x85\xf0\x884@\x15,\x84'D\x1a\xa0\b\x16\xc2#\xd2\x00U\xb0\x10\x1e\x91\x06\xa8\x82\x85\xf0\x84H\x03\x14\xc1Bx4n\x03U\xb0\x10>\x10i\x00\xc88,\x84'4n\x03E\xb0\x10^\x8f4\aw\xf7\x1d\xd9\xec;\xf2\x92\xfe\xaf\xf7\xf8v\xeb\x93\xc7r\x8c\xf2\x8e\xd8\xee\xb1-\xe3\u007f+\xef\x92Vr\x03\x10\x86\x85\xf0\xfa\xce\xfd\x85\x857߬\xee6\xff\xed\xf9\xa5\xf5\xc9\xdb\xefx\x1b\xc4\x16\xef;\xfd\xd1k\x95iF\x95A\xd2Jn\x00°\x10^\xa7\xf7&}\xf9q\xe0_\xf7Ũ'\xdb\xc5;\xb1kt\xe5\xd4\xe4t\x19#\b\x0fR\x86\x85\xf0\xc6\x1bO\x9d\xf1\x9f\xb7\x15\xde+\x8e\x89\x03\xc6\b\u0083\x94a!\xbcq\x96\xe6\xfc@o\xbcӒ!\xe1\xc35\xdbD\x9eb*6M\xd7V<Q\x9c_u&z\x02\x00\xb1\xb0\x10\x9e\x92\xbc\xf1\x14\x14\xdeR\xb3M\xe4^D\x8bͮ\x1aMLij,s\x9d\x8a\x9a\x00@,,\x84O\xf6Y\x9a\xa0\xf0\x96\x9am\xf2\xbb\xb6\xd0\xcb.cW\xaeM\xee!\xea)-\x8f\x9c\x00\x80\r,\x84O\xf6Y\x9a\xa0\xf0\x96\x9am:)\x0e\xf5\x1c\x12'\xe5P{F\xde\xee\x10\xd7\"&\x00`\x03\v\xe1)\xc5Hc\xa9٦m\xc6\xd9\xf9mr\xa9yЪ\x1f\xc4FL\x00\xc0\x06\x16§\x1ai,5۴hJ{{\xfb\x14Y-L\xda*y\xbbS܈\x98\x00\x80\r,\x84O5\xd2Xj\xb6\xa9x\xb5~\xb3\xaaX>֊o\x11\xf5?莜\x00\x80\r,\x84\xa7D\x91&\xf0N\xeb\xe1~\xb2\xd4l\xf7\xb4\x89\xfa.\xea\xfa\x8dh\xbb%\xcf\xd2T\x1e\xde_\x9e\xff\x91u\x02\x00\xb6\xb0\x10>a\xa49\x11\xfe,M\xb8f{\xffX!\x9a\xa8E\x88\xb1\xfb\x89\x1e\xf4,\xce+\xae\x91=\xf3\xe1\t\x00\xd8\xc2B\xf8d\x91\x06\x80ႅ\xf0\x84o<\x01E\xb0\x10>\xd9Y\x1a\x00\x86\v\x16\xc2#\xd2\x00U\xb0\x10\x9e\x10i\x80\"X\b\x8fH\x03T\xc1BxD\x1a\xa0\n\x16\xc2\x13\"\rP\x04\v\xe1\x11i\x80*X\b\x8fH\x03T\xc1BxB\xa4\x01\x8a\x80\xf0 \xab`!<2<P\x05\v\xe1\x91\xe1\x81*X\bO\x884@\x11\xce\n\xbf\xc7\xd7\xd9\xeb\xeb\xeb\xd3\xff\x1d|\xb3S\xde\xf5Q_o\xaf\xaf7\xd9z\x00\f\x12g\x85?B>y\xa7g\x99M\xb3\xcf!Ҁ\xcc\xe3\xac\xf0\xbeШ\xf3\\x\f@\xc6pVxyb\xe6\xf8\xeeM\x1b\x9e[\xff\xec\xda\xf5ϭ\xdf\xf0zs7\xceՀL\xe2\xb0\xf0z\x8aٺp\xf6c\xb3fUϟ=k\xd6c\xd53.\"\u0600L\xe2\xbc\xf0\x1b\xa6\x1d9\u007f\xf6\xfcM\xba|\xf6\xfc\xf9g\xa7!Ƀ\x8c\xc2@\xf8\x8a\x9b\xfa`\xdfJ\xf9pkŹ\x81^\x94\x9a\x81\xcc\xe1\xbc\xf0/\xcc\xfcP\x1f\xfc莃\xfa\xa3\xe7f\x9eK\xb6\x06\x00C\xc1y\xe17\xcc<\xab\x0f\xee\xbfCޮ7\xc6\x00d\f\xe7\x85_?\xb7{\xf7}\xf7\xde\xfd\xb5\x1f\xdc\xf7\xf3\xbe7ft\x1e\xdc\xe0;\xbe9jV\x8b\xbc\x12\xd3\xc4\xe8+\xa4\xee/h%\x00\xd2\xc3y\xe1\xd7U\x0f\xac\xfd\xc6\xd7\xff\xee\x8eo|\xe3;\xbe\xe6\x19ݻ\xa3K\xcdt\xba\x0ey\xf3\x16\x9d\x8a^\xb7\xd5\xd5\x12\xbd\b\x80$8/\xfc\x86\x8a\x8b\x9dǏ\xdf\xfb\xf5\xed\xc7ߣ\x97f\x9e\xef>Oݗc'\x16\xad\x8e]\x86\x8bb\x83\xb4q^\xf8\x17f\x9c\xd6\a\xf7\xca\f?\xb0~V\xbc\fo'<\x00i\xe3\xbc\xf0\x1bf\xc9\x1d\xfa\xac\xefI\xed7͌wZ\xd2\x14\xde\xff\xca\x14\xd7\xc3\rr\xcf~=W\x88\x9cF\xb9l\xb9\xd0v\xaez\xc0Uy!v%\x00\xa2a |ŗ\xa1\x87\x9b+\xe2\xbd\xf1d\n\xbfT\xab\xdf[\xaf\xd5\xcaa\xbb\xd7;\xdeh\xfe\xf8K\xe38Q\xe0\xf9m\xde\x02\xdb\xf5\x00\x88\x80\x81\xf0\xf3\u05ec\u007fv\xdd\xd6ן{v\xdd\xfa\xf9\x8f\xc4\xfb\x1a\x88!|\x9b\xd1w`\xde\xea\xe4\x06\xfaY\xb5|}\xef^S`\xbb\x1e\x00\x118/\xfc\x9e'\xab\xe7Ξ]QQ1{\xf6\xdc'Wv&\x12\xbe\xd6蚧\ak\xcde!\xe1\x97\xea7\x1e\xcdv=\x00\"pXx\x9d\xde\xce\xcb:_\xf5~\xae\xdfv~\x15o\x96!|y\x951\xae*7\x97\x85\x84\x97\xf7\x10\x1e\xa4\x82\xf3\u0093\xf1!\xe1͏w\xc6\xf9`\xf0\xed\x0f\xe4A\xea\x04c\x0f?\xc9hh\x9d\xb8\xd4|\x06\u0083\xb4q^\xf8\x01\x9f\xaf\xdb\xe7{|\xda\x11_w\x9f\xcf&ϼ\"\xbcDW\x8d\x82ʽB\x9e\x97i\x14{\xcdg <H\x1b\xe7\x857\xe9\xee\x8c\xf7ŏ\x03bNˮ\xf2\t\x9f\xc9qMN]k]N\x8d>\xea\u007f\xc7\xeb\x1d_\xeb\xf5ޠK^\xad\xf6]\xff\x89Z\xcd{)\xce\x16\x00\b\xc1Bx\x1f\xd1\xf6'\xcfR\x9c/\xf9\xb5Lu\xe5W\xbdo\f\xfd\xdb\xca\\e\xc6y\xf8\xa3fՙ\xd8A\xcb\xf5[\xed}\x97~\xbb\xdc~}\x00°\x10\xbe\x97H\x8f4\x84\x8b\x15\x80\x8c\xc3BxJ\x14i\x00\x18FX\b\x8fK\xed\x01U\xb0\x10\x1e\x97\xda\x03\xaa`!<\xe1R{@\x11,\x84G\xa4\x01\xaa`!<\"\rP\x05\v\xe1\t\x91\x06(\x82\x85\xf0\x884@\x15,\x84G\xa4\x01\xaa`!<!\xd2\x00E@x\x90U\xb0\x10\x1e\x19\x1e\xa8\x82\x85\xf0\xc8\xf0@\x15,\x84'D\x1a\xa0\bg\x85G\xa9\x19P\xcc\xff\x0f\x19\x026\x1d6\x9ff\xc5\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/typeinfo-pkg.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x042\x00\x00\x03\xa2\b\x03\x00\x00\x00\xb5\xb6\a\xdf\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x03\x00PLTE!# #$\"$%#&(%()'*,),.,/0.231463685;<:>@=BDAGHF\x00f\x00JLI\x00j\x02\x03l\x04OQN\rp\nSUR\fr\x17VXU,`\xae7]\xad8^\xae\x16w\x1d[]Z8a\xaa:b\xab;b\xac<c\xad`a_=d\xae?e\xaf@f\xb0*{!bdaAg\xb2)}*Bh\xb3Ci\xb4egdEj\xb5higMj\xb0Fm\xb2/\x82/Ol\xb1Ho\xb4Pm\xb2Ip\xb5/\x858Jq\xb6molKr\xb7Ms\xb8Nt\xb9pro=\x87<Ou\xbaXv\xb6tvs@\x8b?Yx\xb8Zy\xb9@\x8dG]{\xbbxzwI\x8dH_}\xbdX\x80\xbf`~\xbeZ\x81\xc1|~{`\x81\xbbb\x80\xc0N\x92Mb\x83\xbdM\x95U\x80\x82\u007fd\x84\xbfW\x95Vf\x86\xc1h\x88\xc2Z\x98Y\x85\x87\x84i\x89\xc3j\x8a\xc4q\x8b\xc1^\x9d]\\\x9dc\x8a\x8c\x89s\x8e\xc3d\x9deu\x8fŎ\x90\x8dw\x91\xc7h\xa1hy\x93\xc9z\x94ʀ\x94Œ\x94\x91z\x97Ɓ\x95Ƃ\x96\xc7q\xa5r\x83\x97Ȗ\x98\x95\x84\x99\xca\u007f\x9cˆ\x9b̀\x9d͙\x9b\x98u\xaaw\x81\x9eΈ\x9d\u0383\xa0ψ\xa0\xcb\u007f\xabz\x9d\x9f\x9c\x8a\xa2̠\xa2\x9f\x8c\xa4\u0380\xb0\x84\x8d\xa5Ў\xa6ѣ\xa5\xa2\x82\xb2\x86\x8f\xa7Ҥ\xa6\xa3\x91\xa9Ԍ\xb4\x89\x98\xabє\xac֩\xab\xa8\x99\xacҚ\xadӍ\xb8\x93\x9b\xafԮ\xb0\xad\x9d\xb1֗\xba\x97\x9f\xb3ؠ\xb4٢\xb5ۛ\xbe\x9b\xb3\xb5\xb2\xa3\xb7ݣ\xbf\x9d\xa9\xb8٢\xc1\xa4\xaa\xbaڸ\xba\xb7\xa5\xbd۬\xbbۭ\xbcܦĨ\xae\xbdݯ\xbfߨǪ\xbd\xbf\xbc\xb1\xc0\xe1\xab\xc3\xe1\xb0Ǭ\xb2\xc1\xe2\xb6\xc1\xdc\xc0¿\xb7\xc2ݸ\xc3\u07b2\xc5\u07b9\xc4߳\xc7\xe0\xba\xc5\xe0\xb2ͷ\xc5\xc7Ļ\xc7\xe2\xbc\xc8\xe3\xb7\xca\xe3\xbbκ\xbe\xca\xe5\xb9\xcc\xe6\xc9\xcb\xc8\xc0\xcb\xe6\xc1\xcc\xe7\xc2\xcd\xe9\xbf\xcf\xe2\xc0ӿ\xbc\xd0\xe9\xcd\xcf\xcc\xc7\xcf\xe4\xc8\xd3\xc1\xc8\xd0\xe6\xca\xd1\xe7\xd1\xd3\xd0\xc8\xd7\xca\xcb\xd3\xe9\xc5\xd5\xe8\xce\xd5\xeb\xcc\xda\xce\xd5\xd7\xd4\xcf\xd7\xec\xd0\xd8\xed\xcb\xda\xee\xd5\xdb\xd0\xd4\xd9\xe9\xd6\xda\xea\xd9\xdb\xd8\xd7\xdb\xeb\xd2\xde\xec\xdc\xde\xda\xd9\xdd\xed\xd6\xe0\xdb\xd4\xe0\xee\xdb\xdf\xef\xde\xe0\xdd\xd5\xe1\xf0\xe0\xe2\xdf\xdd\xe1\xf2\xdf\xe3\xf3\xe3\xe5\xe1\xda\xe6\xf5\xe1\xe5\xf5\xde\xe7\xef\xe5\xe7\xe4\xe6\xe7\xf1\xe0\xe9\xf1\xe7\xe9\xe6\xe1\xea\xf2\xe2\xeb\xf3\xe3\xec\xf4\xe5\xee\xf6\xec\xec\xf7\xeb\xee\xea\xed\xed\xf8\xe7\xef\xf8\xe8\xf0\xf9\xf0\xf0\xfb\xed\xf2\xf5\xf0\xf2\xef\xee\xf3\xf6\xf4\xf2\xf6\xf2\xf4\xf1\xef\xf5\xf7\xf0\xf6\xf8\xf2\xf7\xf9\xf3\xf8\xfb\xf7\xf9\xf6\xf5\xfa\xfd\xfa\xfc\xf8\xfd\xfb\xff\xf7\xfd\xff\xf8\xfe\xff\xf9\xff\xff\xfe\xff\xfc\x8c\xab\xeb\xca\x00\x00 \x00IDATx^\xec\xbd\x0fpT\xd5\xdd\xff\u007fu\x8d\x80\x80\x80\x88r\x02\x99\x8d!\x85\x87\x80~ML%\xa0\x86\xca\x17j\x11\xed\xfc\x8c\xa8\x93<\x0fc\xa4\xa2\x8fm\x9c\xaf\xd16T\xa0\xea\x83X\x91g\x88\x98\x87>t(\x14\n\xa2և\xa1\x8c\xed<\x86\xe1\xa9y\x06\xa4)jU\bJ\xad\x04\x19\x89ЂR\xadB\x88$s~\xf7ܿ\xe7\xde=w\xef\x9eݻٽ\xbb\xef\x97#\xb9{\xf7s\xce\xf9\x9c\xb3{\xde{\xef\xb9w\xf7\xadP\x00\x00H\x18\xc5/\x00\x00\x00l \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t|$\xe3\x18\x00\x00p@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12\xc8H\xc6\a\xbf\xf7\xa8D\x8a\xdf6\xce\xf8?ђ\x8a;\x9ey\xdf/\x12\x00\x90u$.\x19\x9f\xb4\\\xb5Գ\x9a\x84\xd9\u007f\a1\x19\xd7\xe2\x17\f\x00\xc86\x12\x96\x8c\xdf\xcf$$u\xc9\xf8`\x06\xe1X\xe1\x17\x0e\x00\xc82\x12\x96\x8cz\x12\x84d,aJQRS?\xb7\x82mD\xff\xe0\x17\x0f\x00\xc8.\xfaY2&\xab\xb5,\xf8@\xdd8\xfc8ӌF\xbfx\x00@vѿ\x92\xb1\x9f\xe9\xc4\a\xfa\xf6lusF\xfcp\x00@\xb6\x91\xa0d4\x9a\xcb\x0f\xcf/P\xff\xb9Y\xdf\xf9[u\xb3X\x15\x80(!\x15\xc7\xf67M+.\x9b\xfb\xbcY`\u007fӍ\xe3\x8a+\xeb\xff\xcbٚ&\x19F\xcc\U000cd34dKD\xc1\x875-Yqm\xb4\xa2\x9e\xe9T\x9d\xbe\xf7\xad\xd1\xea\xf6[q\xa3?9\x06\x00H3Ғ\xc1tb\xf4~kg\xfd1]2~;Y\u007f\xbe\xfe\xb0\xf6ԆqF|\xeda\xbe\xb5O\xd8\x12Fq\xa3\xebb\xad+X\x13\x81\xc7\xd8\xe3\x9a\xff\"\xba(\xa9,e\x8f\xe3G\x1f\x03\x00\xa4\x1bi\xc98VE\xccK\x1d\x15D?dP%c\xc2D3\xe0^\xf6\xcc\xf3\xa3͇\xa4\xc6\xf1ٿT\xdfY1\xff\xb9\xb7\xac}\xee`&\x02\x13\xb4}\xab>\xb9V\xfdW\xbf\x16{\x83\xba\xb5&~\xf41\x00@\xbaIP2\xfe\xf0\xfc\xadꤼ\xf7\xf9\xe7\xf7k\xb3^;3\xf9ou\xe3*\xf6I\x1fe\x13\xb6l\xe9\xf3͕lC=a\xf8\xa0L\xfd\xfb\x9du\xbf}z\x82\xfa\xb7\x99o\xee\xf0\xcdք\xbf\xf1\x19\xfd\xf0!&\xf8\xb0\xf6t\xd1w\xa6\x16\uedcf-~ϔ\xe1\xb0O4\x00 \xdd$(\x19\xdc\xf2'[T\x18͎\x11\x9a\x88qɃI\xc6D\xb6g?ӌ\xdac\xc7V0E`b\xf2[5v\x9a\xa3\xbd\x0f\xe6[\x9aA*\xb4刘`M\x04Jԓ\x97\x9dj\x8dEFc\xec0\xe7\xff\xf9E\x03\x00ҍ\xbcd\x1c\xab!\xfa\x99\t;i\xd0V%\xa2\xd6S-\xeaV\xe9'Z\x84~\x9a\xf0\x1du\xeb\x0f\x8e\x06\x8f\xfd\xfe_\xad\x93\x98\xe8o\x8d\xea\x1c\xc1\x9a\b\xfc\xab\x11]\xabn?\xad\xee\x9bl4\x16?\x1a\x00\x90f\x92\x90\x8c_\xa8[\xb3\xf5S\x85\x1b\xb4\x1dL2\xfe[\xdbz\x8b\xcd߷\x8e1M\xa8kdLS\xb7~\xe1n\xf3\x93\xff^ZS\xa2iƵ\x9f\x1c\x8b\r\xd6D\xc0,\xf4<\xd1.\xc5\x1a\u007f\xfc\xa2\x01\x00i&\t\xc98<AӅ&kG\x94\x18\x97?\xf5\xf9\xfb{}y\xc1Bx[\xf8\xe1uS\xd9s\xffu,6X\xdb\xf3\xdff\x1c[c\xfdñ\xf9F=>\xd1\x00\x804\x93\x84d\x1c\xfbWm\xb2N3V\x19t\xc9\xf8\x83\xb6\xa5\xcdߝ\xaey\xcd\xdd\x00\xf6\x8b\xa5\x8d\xf5\xe6\xad\x1b\xfbK\xb4jb\x83\xb5=\u007f0\x8b\xb0[̗\x1c.1.\xb6\xfaE\x03\x00\xd2K2\x92\xc1.\x95\xdc\xfc\ab\xdd\t\xc1$C\x17\x02\xe3Ą\x89\x81\xeb&.\x1dv\xc7g\xbd\xf9\x80]6m:\x16\x1b|X\xafĀ\xad\xb6\xde\xf0\xbcU\xce'\x1a\x00\x90^\x92\x91\fv\x80Aء\x86\xf1\xedu&\x19\xffO\xdbb˟e\xfa\xca\xe4O\xb5\x1d\xff\xe5\x9c\xcc\xecd\xc6\xfc.\xda[\xac\xd8\nA\xb0K\x04\u0602\xe7͖P\xf8E\x03\x00\xd2J\u00921_?&\xd00n\xc8*1\xee\xecds?ʖ\x13>\x98\xaa\x1f\r\xb0\xaf\x9cMf\xe7\x11\xea\xf1H\xe9\xcd\xdc\xfd\x12\xecЄThG$\xbfg\a\x19d\xa7 X\x13\x01\xbb\xd0/\xf4\xc6*\xf5[\xc2\xfc\xa2\x01\x00i%a\xc9`G\x15\x13\x97\xfc+\xbb,z\xec\xadBm\x16\xcf7\x9e\xd2n\xe5*nZ\xb7\x82\xdd\x18J~k,S\xccx\xfe\xad\xe7\xd9ڥ\xe3>\xeez\xad`\xf9\xcds\xa7j\x1bs\x8f\t\x82]\"p\xb8L\v}\\\u007f\xe4\x17\r\x00H+\tKF\xb36q\x8d{9\xe7j\xdb\xe6\x9a\x02\x93\f\xfd\xa2)1\xceP\x9e#\x16\xe3\xfe\xc07\xf7\xfe\r\x84\xa3j\xbf(\xd8-\x02?d\x8fG\x9b\xe7\x1e~\xd1\x00\x80t\x92\xb0d\xbc\xaf߀\xa5\x9f\x9bh'\v\xe5\xe6\xb7G\xb4\xe5\xcf*}\x1a/\xd0OV\x9aM\t\xf9?\xbfu\xb6\xb7\xbfΞ\xf2s\r\x19p\x05\xbbE@;\x9b\x99k=\xf4\x89\x06\x00\xa4\x93\x84%\xe3\xd8\x1f\xea'G'\x1b\xdfng\x17=\xc9\x0f\xcdg\xb4\x8b\xac\x1f4M\x8dr_~\u007fkɌ\xb2\xa2\t7/\xfd\xe0\x98\x9b\xdf7~gr\xb4\xb8\xe2;?\xb4\xc5\xc4\x19\x1c#\x02\xec\xeb-\xeb\xec\x87>\xd1\x00\x804\x92\xb8d\xf0\xecd\xf3\xd4\xfa\n\xbb}_\x06\x00 \xc7IJ2>ak\x19\xf6\xd7\xcd \x19\x00\xe4\r\xf2\x92\xf1\x8b_<\xc7n\x95\xe0\xee\x03\x87d\x00\x907\xc8KF\xad\xbe\xf8Xa\xff\xdc\x16$\x03\x80\xbcA^2\xfeUS\x8cq\xdc7\xc1 \x19\x00\xe4\r\xf2\x92\xd129Z<\xad\x81\xbfE\x1b\x92\x01@\xde /\x19\x00\x80<\x06\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\xc0G2\x00\x00\x80\a\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90 e\xc9\xf8\xfcD\x17\x00 oHQ2\xbe\xf4\xab\x1f\x00\x90S\xa4&\x19P\f\x00\xf2\x8c\xd4$ïv\x00@\x8e\x91\x92d|\xeeW;\x00 \xc7HI2\xb0\xf2\t@\xbe\x91\x92d\xf8U\x0e\x00\xc85 \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\t\xd0\xe9\x17\x00@\xde\x00\xc9\xf0c\xef\x94A\xcax\xbf \x00\xf2\x05H\x86\x1fC\x87>\xbcr\xb7_\x10\x00\xf9BVH\xc6\xf6\xb1\x03\a\x8cZ}\xf1Z\xbf\xb8L\xb0]Y\xe9\x17\x02@\x1e\x11\xb0d\xac\xde\x14\xbbϗM\x91+\x9e\\<^Q\x9e\xf0\v\x94F&\x1d\x8f\xd8MJV*\x19\x00\x19\"`\xc9\x189)v\x9f/c/g\xffNI\x83dȤ\xe3\x11\v\xc9\x00\x80'`\xc9\x18.1G-\x86\xdc\xc6\xfeݮ<\xe9\x17(\x8dL:\x1e\xb1\x90\f\x00x\x82\x94\x8c\xe5\x8a\xcep}\xf3\xb6\xaey\xea\xbfOLWο\xff\xba\xc1\x03\xafxU\x8bytd\xc1\xd0Y\x1d\xcer\x93.ڮ\x15\xef\xe0\x03^:_\xad\xe1\xd5+\x87\x14\x8c\xed|B\xadf\x9e^\x998\xc0Q\xdbڱ\x83#\x03\xc7\x0ev\xa4\xc3\xc5NW\xce[\xdc\xf5ZD\x19\xaa\x05\xbf6~`d\xd0\xd8\xdd|\xac\x8bՐ\f\x008\x82\x94\x8c\x8e\xb5\xab\x87\x8eZ\xbdz\xf5\xabls\xf0u{\xbb\xf6\xde5`m\xc7\xf6\xc5\xe7+\x83\xe7\xcd\x1b\\\xc0ta\xcayӗ\xdf?p\xb8s\x92\xef\x1e|\xde\xd8yk\xf5}V\xc0_\x9eX<x腃g]\xa9\xec\xeeX;\xe06\xa32q\x00_\xd9&eʓ+\x1f\x1e\xa8t\xf2\xe9p\xb1\xbbWG\xeeRueJ\x84\x05\xaf.\x18~\xcfʻ\x94{\xf8X\x9eν\xabG\x0ep\t\x1c\x00yM\x90\x92\xd1\xc5\x1f\xdd\xdf\xc5>\xb0\xa7La\x9b\x91!\xea\xac\xeb\x18<\x92}\xf0?\xda\xc5f\xf5bg\xa9\x8ey##\xca\x00v\b\xe1\b\x18\xae\\\xce\n\xb2zX\xb5WN\xf1\x0e\xb0yp Ӟ\xfb\ah\x0f\xb8\x93\r;\x96IF\xd7]L2\xfe2\x98\x1d\xa1t>\xd1ኵ\x18\xaf\x1ex,\x8f\xdd\r@\xfe\x926\xc9حl\xef\xea\xbcP\xbb@\x19\xd1\xd6*\xeeW:\xba&\r\xe9d\f\x9e\x12S\xb0s\xe5X69\x1d\x01\xc3#\xe6\xf1\xc3ꂎ\xae?\x17\xac\xee\xf2\f\xb0\xd9}ѐ\xe9\x0f\xbfdܰ\xc9K\x86\x15kK\xc6r\xe5%\xbb\xa0H2v\xaf|p\xe8@\x1ce\x00`\x936\xc9\xe8\x1a;\xabk\xe5\x00m\xe6js\xb4k\xb5\xb2I\xfd\xa8\xd7q\xdeM\xb9I\x9f\xcc#\xaf\xe8r\x06\f\xb7V\x16:\a>ٵ\\;|\xf0\b\xe0\xe8xp\xd2Pe\xd0=\xda6/\x19V\xac-\x19\xf7+\u007f\xb1\xcby,\u007f\xb2\xb4\x01\x00&鐌\x875\tP\xa7\xb8~^\xd2\x15\x99\xc5\xfe}X=ʸr\xc8&\x8dw\x1d\x85.\x9a\xae\xfd\xb9mH\x973`\xb8\xad,\xd3\xc7w\x8dע\xbc\x02,6\xcdQ\xff\xe9X\\\xf0\xa0\x16`\xa7c\xc7j\x92q\x1b\x93\x8c\x951G\x19\x0f\xc7\x1c\xb6\xe0\x8a\t\x00<\x01KƨQ]]{\xf5\x1b,:\a.\x1f\xb8Z\xdb\x19\x19\xc4V\x11\x86\x8cbsT{\xea\xb6y\x8eB\x03\a\xeb\x8b\t\xe3]\x01\xdc\xe7\xfe\xda\xc8\xee\x886u\xbd\x02,\xee\xd2\xef\xd6\x1cu\x9d\xf6\xaf\x9d\x8e\x1d[\xa0\x8aJ\xe7H&\x19\x1d\x17\x8dbG.\xd3g\xb9by \x19\x00\xf0\x04,\x19wE\xeeY~y\x81\xfeQ=g\x88~^\xd2\x15Q\x86?\xf1\xf0\x90\x01\xaf\xb1}ʤ'\x96Oq-\u007f\x0eT.\xbak哗\x17\xbc\xca\at\xea\xd70^3b.\x1a{\x91\xbe\xe1\x15`r\x97Rp\xd7\xf2'\xa7(\x9aZ\x99\xe98bG\r\x9c7o\xa4r\xfe\xa3\xdbճ\x8e\v.~p\xf9t\xe5a>\xd6\x05$\x03\x00\x9e\x80%\xa3s\xfa\xc0\x82Q\xc6\xc9\xff\xab\xcau\xfaFd֔\x01\x17]\xa9Oƕ\x97\x0f\x1c0\xca\xf5\xad\x8d\x91\x0f\xdf6\xb4\xc0\xbcq\xc3\fx\xe9<m\xcdb\xac\x11s\u007f\xe4\x1ec\xcb#\xc0\xe4\xd1Q\xf3\x06G.\x1a\xa5\x1fߘ\xe98b_\x1dUp\xe1\xd8\xdb\x14\x85\x9d\xe8\xbc:i\xf0\x85#\x9ftĺ\xd8{\xfe\xa4\x97\xf6\xe2\xdb\xef\x00\x18\x04,\x19<\x1d\x11}\xde\x1a˟ae\xf9P\xf7r-\x00yL\x1a%㉁Ƈs\xb8%C=\xd0xi\xaf_\b\x00\xf9B\xba$c\xde\xea\xae\xcbM\xa5\b\xbbd\x00\x00,\xd2$\x19\u007fV\x86O\xbfH\xbf\aj\xf7\xea\xc8\x14\xac \x02\x90#\xa4I2\xba\xee*\xb8\xdc\xf8\xbe\xc6tEQ\"\xee\xeb\x1a\x00\x80p\x92.\xc9\x00\x00\xe4$\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x99\x96\x8c;\xef\x14m\x02\x00\xb2\x94\fK\xc6\xff\x0e\xfb\x9e`3E~y\xd9\u007f\xfa\x85X\xbc\xf7ϗ\x8d\xf8\xbf\xfa\xd7\xe7\xccbw\x0e\x1b6\xec\x92\xd7\xe3\x94\xf1\xe6\xf5\x11\xc3\xfe\xc9/&3\b3\x13t\x9e\xc35\x0e\xd9\xdb7ЯdX2n\x1f\xf1'\xc1f\xa2\xfc\xeaw\xc2\xdd?\xbf\xe4Y\xe1~\x11ߺ\xec\xa9;/yO\xdb4\x8b\xfdq˖\xa7\x86m1\x9e\xf7h\u008b\xdf\xdc9\xc2/$\xbdx\xe6+\xcaL\xd0y\x0e\xc78teA\xdf@V\x90Y\xc9x}\xd8݂̈́\xb9\xfa\xbb~\x11~\xbc7\xecߺ\xba\xb8\xdf\f6\xf8\x8d5Ud\x9bx$\xc3\xd3\xca;\xdf\xd8\xcc<:\xcf\xf1\x1b^22\xde7\x90\x15dV2\ued0f,\xee\x94?Ȑ\x9eϱ\xbc>Lx\x0e\x93\x1f\x92\xe1\xd1y\x0eH\x06\x88!\xa3\x92\xf1\xfa\x88\xbb\x05\x9b\xf6\xd3\u07fdl\xc4e\xffWS\x92\xa7\xae\xbe\xe4\xea\xa7Կ\xff2l\xc4Sw\u007f\xe3\x92o\xfd\xb1\xab\xeb?\x87\xe9\\\xad\xee\xee\xf8\xee\x98\x11c\xbe\xad\x1d\x93\xbfw\x89\xbaO;\xc8\xe6b\xbb\xba\xb6|k\x8cZ\xd7\x18G\xfd\x9d\x97\xe95\xdc\xed(\xc60\xa6\n\xdfDW׳\xd7_\xf2\x8d\xef\xa9\x1fʿ\x1b1l\xd8\x0f^\xbf}̈our{\xbb\xba\xfet\xfb\x98K\xbf\x1b{\xf0n\xa6\xee,f\xf2/\xacU}\x99\xc0\x91\xafU\xef\xff\xa8ž\xdd5fذK;Հ\u007f\xbbs̥\xdf~ݫ^q\xbe\xe2\xcc<;o\x17\xe3$\x83\xabA4\x92 \x8fȨd\xdc9⏂M\x93_]r\xf5\x8f\u007f\xf9Ȱ\x9fh\xcf\xfe\xe0\xe7?\x18q{W\xd7\xff>;b\xd8e\x8f\xfc\xe4\x12\xf5\xb3\xf4\xcf[\xb6|\xe3\xfa-[\xb6\xbc\xae>\xff\xf3aw\xfe\xea\xd9o\x0f\xfb\r+\xf6\xbb-[F<\xc26\xb8خ\xdf\r\xbb\xfd\xd9_>u\xd90\xe7\x8fx\xfen˳\xc3\x1eٲ\xe5O\x8eb\fc\xaa\xf0Mt\xdd9\xec\xee\x9f\xff\xdbeWwvu>\xfb\xec\x98o\\2\xe6\xeeۇ\xfd\x91\xdb\xdb\xf5\xfa\xa5\xdfx\xea?\xbf5\xcc-\x19V\xea\x8eb\x16\u007f\xd2ZՖ\t\xf8|\xb9\xd6~\xf3\x88گ\u007f\x1f\xf6\xecﴀ1?~d\xcc%\xff\xe3Q\xaf8_\x8f\xcc<:o\x17\xeb\xb2%\x83\xabA<\x92 \u007fȤd\xfcq\xc4?\v6M:ǰ\x8f\xe3\xceg\xdf\xeb\xea\xfa\xe5\xb0_v\xb1\u007f\u007f\xae\xfe;\xe2Ru\xc6\xdd~\x99\x16b\x1d\x85\xff\xe5ٿ\xf0\x0fͷ\xbf\x1d\xfb\xd4e\xec-\xfeԥ].\x1c\xc7\xe61\x92\xd1\xc5\xd5\xf9\xf3a\xff\xae=\xa1}\x18_=\xec[\xba[#\xb7\xf7\xfao\xa89t^횘|\xeav1\x1e\xadU\xfd\x98\xdf\xce\xd7\xd1ڝ\xdf|ȍ\xf5\xd81j\xe1\xf7\xc6|ӻ^Q\xbe\xe2\xccĝw4l\x8d\x03W\x83\xd7H\x82|!\x93\x92\xf1/#^\x17l\x9a\xfc|\x98\xb5\xf8\u007f\xa7~u\xef\x9f؍\x1b#\xd8?\xc6Y\xb5}\xe2\xfe\xdeS\xdf\x1as\xa9q@\xceI\x86\x15\xfb\xc71c\xfe\xe5\xa9\xdfu\xc5|4&.\x19\xdf\x1d\xa39;\x8e\xd1n\x1e\xb9\xda<&\xb2\xf7\xbe7\x8c\x9d%t\xfd\xc051\xf9\xd4\xedb<\xbcdX\xf9:Z\xeb\xbc\xfa\xb2o\x1b\xb1\xdau视\xbd\xe7Y\xaf _\x8f\xccĝw4l\x8e\x03_\x83\xd7H\x82|!\x83\x92\xf1\xa7\x11w\n6-~b\x1f\xfb^\xafϘo\xab\x9f\xae\xfc\f\xb3\xe7\xc7o.\x1b\xf3\xbd\xff\xd8r}\x8cdر\xef=\xf5\xdd\u007f\x1avُ\xbb\\$.\x19W\x1b\xeb\x04\xda㫯\x8e\xd9\xfb;\xbd\x88{\x89\x90O\xdd.\xc6\xc3K\x86\xb5\xe9h\xad\xebY3\x1d=\xc3-\xaa\x98z\xd5+\xc8\xd7#3q\xe7\x9d\r\x1b\xe3\xe0\xa8\xc1c$A\xbe\x90Aɸ{\xd8\xeb\x82M\x8b_qG\x19\xfab\x9b\xf6\xd1\x17#\x19O\xa9\x9f\xb0\xff\xf4Mvb\xf2]o\xc9\xf8\x1d\xfbx~\xef\xd9\x11Ou9IL2X\x13\xb7\x8f\xf9\x9d\xc6{\xd6^\x86\xbd\xd7\xf8$v/\u007f\xf2\xa9\x8b/gh\xad\xfe\xc0%\x19\x8e\xd6\xfet\xd9\x0f\xc6\xe8wO\xe8k\xc4O\r\xeb\xf0\xacW\x90\xafGf\xe2\xce;\x1av\x1de\xdc\x19o$A\xbe\x909\xc9\xf09\xc8\xe8\xfa\xcbe׳Ì\xbb\xeff\xe7(\xec\xd4\xfaY}-\x83\x93\x8c\xeb\xafW˲\xe7ư\x89\xd2y\xb5\xb7d<\xa2\x9d\xfaw]\xef^1\xf1\x95\f\xab\x89_\xea\xa7\xf7?\xd0>^\xad9\xca\xed\xfd&\x9b֯\x8fpML>u\xb1d\\\xa2\xce\xc1\xceo\xba$\x83o\xad\xf3\x9b?\xe8\xbaS\xbf\xcc2\xe22U\x1a\xff<\xe6z\xefzE\xf9\x8a3\x13w\xde\xd1Mk\x1c\xb8\x1a\xbcF\x12\xe4\v\x99\x93\x8c\xef\xd9G\x16\xdc&ǯF\xfc\xd3S?\xbf[\xfb\x80\xbb}\xd8\xf7~\xfe\xbda\xb7k\x17\x18\xee\xfcM\xd7\xef\xee\x1c\xa1\xad\xf4?2\xe2'\xff\xf1\xadK\xfe\xc8\xde\xc7\xdf}\xea\xc7W\xab\x87˿\xe9\xeaܲE\x8dٲ\xa5\xc3\x11\xfbȰK\x1e\xf9\xf9\u007f\xdc9\xecW\x8e\x16\xf4\x8b\x06\xdau\x16\xbb\x98~\xd7\xe3O\xb6l\xd1\xd6\a\xac&\xd4$\xff\xbfg\xd5\x1a\x9e\xed\xea\xfc\x8dv]\xe2u\xad\nko\xd7\xff\\2\xe6\x91\x1f\\:lĿ\xff\x8f\xa3\r+uG1\x8e\xeb/\xfb\xf1\x8f\xbfɊ9\xfaf\xb7\xb6\xe5\x9f/\xfbc\xd7\xeb\x97\u07bdE\x15\x8d\x11î~\xf6\xa9o\\\xfa\xbaw\xbd\x82|=2\x13w\x9e+ƍ\x03W\x83x$A\xfe\x901\xc9\xf8\xd3%\xb7\v6\x1d\xbc\xfe\xdd1\x97|\xf3?\xb4\xcd\u007f3nB\xf8g\xf54{\xc4\xff\xb0\xdb\bا\\\xe7ݗ\x8e\xb8\x9e\xbd\xe9;\u007f\xf2\x8d\x11\x97}\xf7\xa9o\x8c\xb8^=\xef\xd6y\xca\x11\xfb\xec\xf5\x8f\x8c\x19q\xd9\xf5\xce\xf7y\xe7\xa5Z\xa4\xb6\xf2j\x17Ӿ[a\x9d\xce[M\xa8\x1f\xc0\xd7_v\xe9\xf5?\xb7B\x8d\x15Is\xaf\x9a\xee\xb7/\x1d\xf3\xbd\u007f\x1f1\xcc\xf5\xf9k\xa6\xee,f\xf3\xfa\xf5#.\xf9\xd6\x0f\xd4$\x9d}3\xeb\xfd\xe50v\xef\xc4\xdd꿿b˟w^:\xe6\xf6?ũW\x90\xaf83\x8f\xces\xc5\xf8q\xb0k\x10\x8e$\xc8#2&\x19?\x18\xf6\xbf\x82M\x10\x17\xfb\xd4\t\x80\f\x911\xc9\xc0\xb7ޓ\x00\x92\x012N\xc6$\x03$\x01$\x03d\x1cHFx\xd0\xd7G\x01\xc8(\x90\x8c\xf0\xf0\xcf\xe6r%\x00\x99\x03\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90 Pɘ\xa4\f\x9c\xb2]\xd4\n\x00 G\bT2v\xaf~t\xe8\xc0\x0eQ3\x00\x80\xdc P\xc9PY\xad\xbc$\xd8\v\x00\xc8\x11\x82\x96\x8cM\xcaZ\xc1^\x00@\x8e\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x10\xb4dlWV\v\xf6\x02\x00r\x84\xa0%\xa3s\xe0ȵ\xbb\xe1\x8b\x03@\xae\x12\xb4dt\xadT\x14\xe5\n\xd1\x13\x00\x80\x1c h\xc9\xe8\x188\xe4\xfeկ\t\x9e\x00\x00\xe4\x02AK\xc6&e\xa5`/\x00 G\b^2p\xc5\x04\x80\x1c\x06\x92\x01\x00\x90 h\xc9X\v\xc9\x00 \x97\tT2:wo\x9a\x14\xd9-j\x06\x00\x90\x1b\x04*\x19\xe3\x15e\xf0rQ+\x00\x80\x1c!P\xc9\xd8\xfb\x12\x0e1\x00\xc8m\x02\x95\f\x00@\xae\x03\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x90\x92d\x9c\xf0\xab\x1d\x00\x90c\xa4$\x19\x9f\xfb\xd5\x0e\x00\xc81R\x92\f\x9c\x99\x00\x90o\xa4&\x19_\xfaU\x0f\x00\xc8-R\x93\fh\x06\x00yF\x8a\x92A\xe9\xe7X\x03\x05 \x8fHY2\x00\x00\xf9\x04$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 Aʒ\xb1\xf6\xca\xc1\x91\x01\x17߶\xd7/.\xe3t\x9e\xf5\x8b\xf0\xa0S1\xb8`Ȕ\xddlG\x87\xf182\xf8\xcaMVм\xe1\x05\x91\x8bƯu\x95\r\xcd\xe8\x00\x90 )J\xc6\xd9\xf1\xc6\xf49\xff~\xbf\xd0\f\xf3`\xc1\xe7~!\x1e\xa8\x92Q0@\xe5B\xd6\xcf\xd5Ԗ\f\xc6<=\xe6ш\xf1x,\xdfJxF\a\x80DIQ2\xe6(\x05\x0f\xbe\xfby\xe7K\xea\xdcX\xe9\x17\x9bQ\xce*J\n\x92ѡm|\xbd}\xa8\u0084G\x95\x8c\xbd\x9f\xabt\xbd:VQ^e\xcf\xccR\x94\xf1/u}\xb9\xf7\xae\x882\xeak\xbbdhF\a\x80\x84IM2>\x8f(ơ\xf8\x14eH\xfc\xd0\f\x13\x84d\xa8b\x11Q\x9e\xd0$\xa3S\u007f|v\x882E\xfd\xb3ZQ\x16\xeb;^R\x94G\xad\x82\xe1\x19\x1d\x00\x12&5\xc9xM\x89\x18\x1f\xaa{\xadi\x94\x9d\x04#\x19t\xa4r\x1b/\x19\xf4\x1ee\xb0Z\xf7 e\xba\x190\x9d\x13\x87\xf0\x8c\x0e\x00\t\x93\x9ad\xec\xb5g\xd3\xea\xed_\xb2?\x9d\xb3\x86D\x06\x8e\u007f\x89m>\xaa<\xfcҐ\x82\x91s\x94\xf1z\xc4u\xca]\xc2\x00\xb3\x06\xfb!\x17\xb3X\xb9\xe7\xdd\xf1\x03.\x1c\xb9\xdc3\x82vL\x1f\x1c\x190\xeaQ}u\xd3Q\xf4\xfe\x13\xb3\x06G\x86\xdcv\x82\x9d\"0v\xbb\x82\r\xd6N\xba(R0\xf4\xb6.W\x19\x13^2\x86+s\x1c\x92\xf1\x84r\xa1Z^Q\xfeb\x06t\xdc\xff\xaaU0\xd0\xd1\x01 ;HM2\xe8\x10e\xe8Z\xee䝾T\xa0D\x86\x0f\xd1W\x05\x1fU\xe6\\\xa0(\x05\xef*\x11\xed\xf3\xfd\xec\x85\xca^a\x809}\xad\x87|\xccbeRAd\xec\xa8\xf3\x94\xeb\xbc\"\xf6^\xa8\f\x18>TQƺ\xdb_\xac̺H\xb9p\xa0\xa2\f=K\x97OR\x94\xf1Wv:\x83\r\xa6+\xcaE\xc3\a\xa9\xff\x9cp\x961\xe1$c\xb7\xa2,wH\xc6]\xcaPJoc\xff\x88\brt\x00\xc8\x0eR\x94\x8c\xed\x11E\x190\xfe\xd1\xdd\xc6\xc3\xce\v\x959\xea\xc7\xe9\xf6\x01l\xb9\xefQ\xe5\xbc!\xab7=\xa9\x1e\xcck\x87\b\xab\x95\xe1\x1e\x01\x06\xe6CG\xccbE\x19\xf2g\xf5\x18\u007f\x00\xabD\x181^\xb9M\x9d\x96\xbb\a\xb0u\x03wѡ\xdb\xd5c\x80\x88\xf2\xa4ub\xc2\a\x1blR\nا\xfa\xf6\x02\xe5AW\x19\xb3S\x86d\x9c\xed\\>H\x19r\x96\x97\x8c\x13\x83\x94Y\x94^\xa1-h\b\brt\x00\xc8\x0eR\x94\f\xda1V;\xe4\x1f4\x87\x1d֫\xc7\xffWh{W\xb2\xcf\xddG\x15E\xbb\x1f\xe1\t\xfd3\xfdJ\xe5a\x8f\x00\x03\xf3\xa1#f\xb1\xb1s%[#\x10F\fV\xb4)\xf9\xf0\x95kc\x8bjS}:[i0$\x83\x0f6\x98\xa3\x9d\x11\xb0\xbf\xd3]e\f\xac\xfb2T\x86\xb0gU\xc9\xd8}B\xa5c\xe5\xc5J\xe4]\xb6\xc01\x87\x8a\tpt\x00\xc8\x0eR\x95\fuF=q\xa5z \xaf\\\xc8\xeej\x1a\xacݷ\xa0N\xd0\xf3ԙ\xf7\xa8\xb1\x12x\"r\xde\tv\xf9\xe0\xbc.\x8f\x00\x03\xf3\xa1#f\xb12J\u007f\x10Q\xde\x15G\x8cUFn7\x8f\xfe]E/\xd6\x1e<\xacL\xb2$\x83\x0f69\xab\x1f\xfb\xdfÎ\x15\x1ce\f,\xc98\u007f\xd2r-\x94\xbb/\xe3\xbc\xe5Z\xa5^\x92\x11\xe0\xe8\x00\x90\x1d\xa4.\x19\x8c\xbd\xf3\x06(\x05\x9d\xf4sE\xb9x\xa4FD٤\xbe\xe7\x8d\x15\x83I\xec\x12\xe4r\xf6\xc8#@\xc7x\xe8\x8cY\xcc.Q0.V\xcf%\x84\x11\xaf\xb2\xa3\xff+\x97\x9f\x10\x14\xd5?\xb3\x9f`+\x8c\x86dp\xc16g\xb7?9o\xd2`E\x97\f\xae\x8c\x81*\x19\xef~\xfd\xf5\x97\x9b\x86*c\xf5r\xa6d\\x\xf1,\xed8`\x8ar%\x8dG \xa3\x03@v\x90\xa2d|m~dw^\xa4̣]\xf6ǯz6\xfe\xa89\x93ֲ#\x85\xb1\xec\xfc\xdc#@\xc7x\xe8\x8cYl\xde_9\xd2.\xe0\x8c\xa0{\xa7\x14\xa8\x1b\xe7O\xff2\xa6\xa8~\xa4\xc0K\x06\x17l\xf1\xf0 \x16?|\x94.\x19\\\x19\x03s-\xe3\xc4`e\xb8V\xac\xc3u\xc9\xf4\x1e~\xf9\xf3%\xeeZn\x90\xa3\x03@v\x90\x9ad\x8c4\x8e\xa4U橓\xecs\xeer$\xb5\xdf\xf3g\a(\x9d'\xce+\xf8\x92z\x058\x1e:c\xac\xa3\x8c\xa1\xda\a\xaf \x82\xb2Äy\x17+\xcau1E\x05\x92a\a\x9bܣ(ӗ\xbf\xf6\xa5yb\xe2-\x19t\xbb\xa2\xafp\xb8%c7\xf7\xb8C9Ϻ\xca\x1a\xe8\xe8\x00\x90\x1d\xa4&\x19\xe3\xedk\x05\xf3\xd8\xe6@\xf3\xc6\xe8\xed\x1d_s\xef\xf9Y\xca\xe2'\xf4H\x8f\x00\r\xf3\xa1#f\xb1qx\xfeeD\x9d\x96\u0088?o7J\x9f\xff\xb5\xbbh\xacd\xf0\xc1:_\x17\xb0\x1b:)[{\xf4\x93\fvw\a\xbb\xb8\xe2\x96\f:\x98]71C\x06Z\x97E\x03\x1d\x1d\x00\xb2\x83\xd4$c\xb5\xf5\xe5\x89\xceA\xecb\xe1te\xb86\x15\xd7*\x91\x13\xdc{\xfeUe\xecXm\xb2y\x05h\x98\x0f\x1d1\x8b\x95\x886=\x17\xb3\x8b\x90\xa2\b\xf5h^\xbb\x1c\xf1\xaer\xdeYwQ\xa7d\x9c\xd0\x0e\xfd\xed`\x9d.\xe3\xc2\xc4\xe7\x17\xb1\xca\xe3K\xc6\xe7\ue2ec\x06O*\xfa\x95R\xed\xae\xae\a\xad݁\x8e\x0e\x00\xd9Aj\x92\xa1\x9e\x83+\xe3Wwt\xed~p\x90r\xb1:\x99ލ(\xd3\xd5\x0f\xf3W\a\xb2k\b\xdc{~H$2H\x9b\f^\x01\f\xf3\xa1#f\xb1\xa2\fW\xe7\xe7\xda\x02\xf5\xbcD\x1c1V\x19\xab\xca\xc0\xe7\x93\xd8ራ(?\xfd#\xca\xca/\xbfv\x04\xeb|=@\xbb\xdeѩ\xf6\xe4\n?ɠ+\x15\xe5\x1e\x81d\xa8\xc7\x13ʔ\xed\x9f\u007f\xbd\xf76\xc5\xf1\xb5\xb4`Fg\xf9\xc3\xdb)\x00\xd9B\x8a\x92\xf1\xb9\xf9\xf5nmb\xab\x1f\xac\x11傑C\x14\xe5\xf2\xb3\x8eIq\x8fb.Ix\x040\xac\x87|\xccbe\xc8\x05\xe7\xb3\x1b\"\xef\xf1\x8a\xf8\xcb@%r\xf1\xf0\x02ePGLQ~\xfa\x8fTs\xdc\xe4\f\xd6yXQ\x06_1\xf2\xbc\x01w\xb1\xeb\xab>\x92\xa1\x8a@\xa4C \x19g\xa7\x98\xc3p\x05\xffM\x96`Fgx\x9ck\xb8\x00\xf47)J\x06\xa5/\xcd\x1a: r\xd1\x15ˍ\x0f\u05ceYC\"\x05#\x1ff\x87\xfdܤ\xe8P\x14\xf3\x16Hq\x00u<\xe4b\xd49\xbc\xfb\x8a\x82\x81Wl\xf7\x8c\xa0\x9ds\x86D.\x18z\xd7\tAQm\x97>\xfd\xdf\x1du\xc1\x80\x95\xae`\x9dM\x97\x0f\x8c\xa8{>g\xab%~\x92\xd1\x11Q\x8fOb%\x83\xd2\xedӇ^\x10\xb9h\x92\xfb'v\x82\x18\x1dH\x06\xc8&R\x96\x8c4c\xcea\x00@V\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x90\xed\x92\x01\x00\xc8* \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t\x82\x97\x8c\x1a\xf2S\xbf\x10\xc6*\xf2}\xbf\x10\x1f\x8e\xf7\xfaE\x00\x00\x82&\xb4\x92\xd1\xf7\\\xc9i\xbf\x18\x00@ЄV2z\b\x81d\x00\xd0\xef@2\x00\x00\x12@2\x00\x00\x12\xa4$\x19\xbb_\xb3\xd8m\xed\xd4%c\x1dY\xf5\xd7\xc6\xf2\xe2\x99\xdbhߺ\x19ъ\xa6\xd3ھ\x15\x87\xea'\x96\xde\xfa\xeb>jI\xc6\xf1\xa6\xaahY\xdd.\xeaQ\xc4\x15\xd0|\xaa\xa9\"Z\xb5\xe4\x14\xa5\x8b\b\xe3 \xa5G\x1a*\xa3\x13k\xd6`)\x14\x80~!%ɸM\xb1\x98n\xed4%\xa3q2)\x8f\x12\xb2\xad\x81\x14\x97\x13R\xa3\xed\xab/\x8d\xd6\xd6\x14\x92\x86>S2v\x8d#\xc53\xab\bY\xe6Q\xc4\x15\xd0TAJ\xcb\b\xa9\ue85b\xe7\x13R?\xff8\xfd\xb0\x94\x94\xddTM\xc8\x1d}\x82\xfc\x00\x00A\x93\x92dtEL\xc58\xaf\xc3\xdaiJ\x06\xa9\xfe\x90\xf6\xce'\xc5\xc5/\xf4\xd1W\bٯ\xed\x9b\xf61\xa5\xfb\xcb\xc8FC2\x8e\x97\x92Eݔ\xee)#\xdb\xc4Eb\x02ޤ\xb45J6X'&\xf5d\x89z\x80q`\x02i\xf5J\x12\x00\x10 )I\x86}\x98q\x9d\xbdϒ\x8cC\xea\x9f\x0f\tif;oa\xb3|\x9dv&A\xe9ˤʐ\x8cE\xa4\x8e\xea{\xaa\xc5E\xdc\x01\x1f\xb1\a\x8d\xa4ђ\x8ck\xf5*\xd7ܻ\x93\x02\x00\xd2Oj\x92a\x1efp\a\x19\x96dLc\x0f\xba\t\xf9\x80\xfd\x9dOZ\xd8>\xed\\\x83\xf6\x16\xabڠIF%yE\xdb\xd3SH\x8e\n\x8b\xb8\x02n\xd4\x1e\xb4\x90zK2\xee 5o\x9e\xa3\x00\x80~\"5ɠsb\x0e2,ɨe\x0f\xce\x11r\x92\xfd\xbdO\x97\x8cEz\xc8\f\xb2S\x93\fU\x1dfܪ\x11%m\xa2\"\xee\x00\xfd\x90c\x03'\x19oF\t\x990\u007f\xf3\xdf)\x00\xa0?HQ2\xf4\xc3\f\xfe Ò\x8cz\xf6@\x9d\xff\x9f\xb1\xbf\x86d<c\x86\xbc\xacIƧ\xc4f\x9b\xa8\x880@\x95\x8c:\xfb\"\xeb\x87\vJ\xd4'\x8b\x1a\xbb)\x00 \xfd\xa4(\x19\xfaa\x06\u007f\x90\x11W2\x1e\xd3C\xaa\xd5C\x06&\x19\xa7\t9b\x17\x14\x14\x11\x068%C=\xcfi\u007fz&!\r\x14\x00\x90~R\x95\fv\x98\xe18Ȉ+\x19ڙ\a펒\xe3\xfaZ\xc6U\xecB\bc\xcf\xc7\xe7\x84ED\x01\xbcd\xf4}\xfc\x86\xb6k\r)\u008a\x06\x00\xfd@\xaa\x92\xc1\x0e3\xa68vē\x8c\xe8q\xaa=w\x93qŤ\x91ܤ\xddO\xb1\x93\x14\x9f\x12\x16\x11\x05\xe8\x92\xd1K\xc8?(=IFk\xc1\x87H!n\xe6\x02\xa0\x1fHY2:#\x8a\xe3 #\xaed\x90\x9bT\xcd\xd8Y\xa2\x9e\x97\xe8\x92q\xa8\x98<t\x86ҷ\xcbH\x93\xb8\x88(@\x97\f\x1a%ۺ\xcf\xd1;\xc8\x1dj\xf4\xe9\xf9\xc6\x01\f\x00 \xbd\xa4,\x19t\x8e\xf3 #\xaedL-.\xbai*!+\xa8y\xf7gk\x94\x14ϞF\xc8\xdc\x1eq\x11Q\x80!\x19\xb3\tQ\xa5\xe7X\x19\x89\xde8\xb3\x84\x94\x1f\xa5\x00\x80\xf4\x93\xbadt:\x0f2\xe2JF\xfd\xc1\xbaҲ\xba=l\x8f\xf1\x1d\x93#?\xaa\x8a\x96\xccn\xe9\xf5(\"\n0$\xe3PM\xf1ė\xd9wP\xa6E\x8b\xab\x97\xe2*+\x00\xfdB꒑8\xe6\x94\a\x00\x84\x16H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x82\xfe\x94\f\x00@\xe8\x81d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80dP\xfa\x842\xde/D\xe5Ae\x8a_\x88\x0f\x9dg\xfd\"L\xd0Y\xe9\x00\x00 \x00IDAT\x00\xc8z \x19\xfd&\x19\x0f\x16|\xee\x17\x02@\xd6\x03ɠt\xf7\x83\xab\xfdBh\xea\x92qVQ \x19 \xfc@2\x12\x05\x92\x01\x00\x85d$N\xe6%\xa3\xa9\xc9/\x02\x80\xb4\x13f\xc9\xd8;~Ѐ\xb1ۇo\xf7\x8b\xf3C[\xcbX\xac<\xd89}\xd0\x05\xc3W\xaa\x9b\x17G\x06\xcdb\xd3{\xb1rϻ\xe3\a\\8r9\x8b2$\xa3s\u0590\xc8\xc0\xf1/Q*.\xe2\n\xb8\xffĬ\xc1\x91!\xb7\x9d\xa0t\x8e\xc2\xd8Mi\xc7\xf4\xc1\x91\x01\xa3\x1e\x95_\n=B\x96х\xa4p\x9b_\x9c\x80\x17\b!ʹY\xfdws\x9c\xa8\xe3Q2C\xfdӨ\x86\x8d;\x1a'\x0e\xe45!\x96\x8cݑI\xabW^\xa9(+\xfd\x02\xfd0$c\xfa@ePD\xad\xee:\xe5\x82A\x8a2\x8a\xb2}\x93\n\"cG\x9d\xa7\\GM\xc9x\xa9@\x89\f\x1f\xa2(\U000e8e08+`\xd6Eʅ\x03\x15e\xe8Y\xba|\x92\xa2\x8c\xbf\xb2\x93\xee\xbdP\x190|\xa8\xa2\x8c\x8d\x93\x90\xc1\x9e\x03\x8e\x87\rŧ\xe8\xc9\xf6h\xb30\xc0\x15\xeb\xe2̋\xe4\xb9S\xf4T\vy\xf1L\x9c\xa8\xbew\x1a\xa3ꟿ\xb5\xb7\xaf'olj\x03yM\b%\xe3\xc4\xd8\x13\xda\xdf+\xb4Y7=0\xc9P\x86\xee\xa5g\xafT\"\x17,\xff\x9a\xaeV\x94״}C\xfeL\xe9k\x03\x94\xe5\x86dt^\xa8\xcc\xf9\x92\xd2\xed\x03X\xab\xa2\"1\x01\xea1\xd0ڈ\xf2\xa4ub2^\xb9\xedkU\xee\x06(k\xfdҢ5\x0f\xf0\x8f\x8e\x8e~\x8c\xfd\xe1%\x83\vp\xc6\xc6p\x88\xb4\xa9\xff\xee!\x87\xe2F\xd1\xe6\xa8\xfew\x1f$\x03x\x11B\xc9ث\xec\xd5\xfe\x0e\x99\xa7?J\xe4rG\\L\xc9`\xd5\xeeU\x94{ؾ\x91l\x96\x1b\xfb\xe8Je\x88!\x19s\x94+\xa8\xbeg\xa8\xb8\x88;\xa0\x83=\x98\xaeL\xb7$c0;9\xa1\xf4\xe1+\xfd%\xe3\xd6\xfb\xf8G\x0fE?c\u007fx\xc9\xe0\x02\x9c\xb11@2@P\x84M2\x16\x0f]ۡt\xac\x1d\xfa\x04\xa5S\x06k\xf3y\xed\x97\xec\xdf\xe5\xa3\n.\xbeK\xdd\xda}\xbezN\xd0qݐ\x82\xf1_\xafT\x14\xe5~z\xbf\xa2\x9f\xba\b\x02\xcc:\r\xc9\x18¶\xbfT\xf4)}\xa5\xf20ۧ\x9dkг\x11\xe5]]2\x06\x1b\x02u\xf6<U\fDE\\\x01\x17k\x0f\x1eV&Y\x921V\x19\xb9\xddjYc!\x89n|\xec\xc6qu\u007fc\x0f\xfa~]Sz\xe3\xe3=\x94\xee :\xb7\x18QNj\x16i\u007f\xa3K\x8dX.\x80\xdb\\H\x8a\xd65UN\xaew\xadEp\x92q\xe6\xbe\xcahU\xfdAw\xc3'\x1b*\xcb\x16h'&\x94\x93\f+\x9d\x83E\x84<s\xb4aZI\xdd9\n\xf2\x9a\xb0IF\xd7u\xcap\xf5\xbf)]\xea9\xc0\x90\xf3\xc6\xdf\xff\xaa>\xfdf\x9d7g\xed\xe2A#\xbf\xa6gW\xae\x1c2t\xc0\x90ۮS:\xbf\xdc>\xe0\x9e\x13\xf4\xc4=\x03\xb6\u007f)\x0e0\xeb4$C;\xcf\xf9ZQ\xba\xd8\xdf)\xbadܦG\\\xac\x9eF0\xc9\xf8\\Q.\x1e\xa9\x11Q6\x89\x8a\xb8\x03\xae\xb0\x1b0$\xe3Ո\xa2\f\xb8r\xf9\t\xabG\xf4\xa3\xadE\xa4\xa2\xf9g\x13\xefe\x0f~X\xb8h纊[\xfbh\xf7\x9b\xed\xd5w\xb4\xb7\xb7\x1f1\xa2\x9a\xa2\xda̦Q2ck\xeb5j,\x17\xc0m\xb2ʦ\xaej\x9e:\xeeC\xcas\x88\xec\xec\xe9\xe9ic\x92\xb1\x834\xed\xd9V_\xb8\xcf\xd9\xf0щ7\xbe\xd0ZG\xa2z\xb8%\x19V:=۶N\xad\x9eP\xf5X\xc3\xe8\xbfR\x90ׄM2(\xdd\x14Q\"\x9b\xb4\xad\xcf\xef\x1f\x15Q\x06\xb2C\x88\xb5l\xb1\x81\xbe\xa6/k\x8cT\xaeP\xe7&\x9b\x9e\xb3\u0602\xe5u\xb3\xbc\x03t\fɘĶ]\x921O\x8f\x18\xa9\x16d\x92ѥج\x14\x15\x11\x068$\x83\xee\x9dR\xa0>y\xfe\xf4/\xad\xf6i\xb4L\x95\x83\x86\n\xca\xe6\xf3\x8b\x94\xcdحl7\u007f\xb2q<\xbaЈ\xad\xf8\x87:\x93+\xa8+\xc0ތN;C\xe9\xe9\xaa\x1a\xcas\xc88\x0eQ%\xa3g[\xb7z\xf4p\xd3|-\xd6jxn\xb5z(\xd17;\xaa\x87\x9b\x92\xe1L\x87Ԟ\xa1}\xf1\xd6OA>\x106\xc9\xf8\xfc\xb6\xc8`ep\xe4.\xe3S\xfa\xecK\xe3\xd9:┡_3\x06Og\xfbFF\xcc\xe3\x87\xed\x05_ҳ\x05\xec\"\xacG\x80N\x1c\xc90\x8e2\x86\xaa\x87\f\xc6QF\x87]NPD\x18\xe0\x94\fuk\xfb\xbc\x8b\x15\xed*\x8cA\xf4!j\xac#<pC\xef9\x95k\x1b\xd9n^2\x16F\x8f\x1b\xb1M\xd4Zs\x10K\xc62\xf6\xefz\xf2\x15\xe58D~\xb6o\u07fe5\xdaZ\xc6\x17\xeb\xebn\x98Hfk\xb1fç\xc9F\xf6\xf8\x99\xa8\x1enJ\x863\x9d(\x0e0@\xf8$\xe3\xe1AO\xbe\xabt,\x1e\xf4\xa0z̠MTz\xf9$v\x14\xa0s%\xdb1r\xa4\x19\xfc\xf5\xa0\xd5t\xed v\xea\xe2\x11\xa0\x13G2\xf4K\xa1_FԳ\x18m-c\xa0y}f{\xc7\xd7\xc2\"\xa2\x00\x87d\xfcY\xbf\x8d\xe4Q\xe5|{EC[\xd2\xd4d`\xb6q4\xa0\x1d\x03p\x8ap2\xfa\xa3\x98X/\xc9\xd0\xd6Gۉ\xe3\xaa+\xb7\x96\xb1\xaf\xa2jik{\xedl+\x96Uv\x80\xb4S\x1a\xbb\xfc\xe9L\xc7y\xe0\x02\xf2\x94\xb0I\x06\xfdZ\xbbb¦\xdbEs\xb4\x1d\xf3\x86\xaa'\x1fCwkh\xc7\x1e#\xed\xbb4\xe7\\I\xafԢ\xbc\x024\xe2H\x86~<\xb2X\x19n\\1\x99\xae\f\xd7f\xfaZ%rBXD\x14`I\x86\xdaz\x97\x11\xfc\xaer\x9e}3\x97-\x03\r7\x1c\xd0\xf8\x82\xed\xd6d`\xb3\xf6Ѿ\xa4\xf0XL\xac#\xc0ތ.a\x8f7\x12\xc7\x19\x04'\x193j\xd4S\x10\xba\xc0)\x19\xff \xeb\xd9\xe3\x87\xf4z-\xc9p\xa6\xb3\x80\x02\x10>\xc9Pg\xdd@\xfd\xf0b\xd0`\xed@\x9f\t\xc0&\xfd\xb3}ރ\xe6\x0e\x83W#]\x91WنW\x80F\x1c\xc9P\x86\xab\x9a\xb1\xb6@=/\xd1%\xe3݈2]m\xf5Ձ\xca\x1cq\x11Q\x80\xf1Uو\xb2\xf2˯\xe9Xe\xac\x1a\xfd\xf9$\xfe^.[\x06ڈvs\xe7O\x9fc\xff\xd6\xd6RzJ\xdb\xf1Y\xf1C\xb1\xb1|\x00\xb7\x19\xbd\xa6\x9b\xd2\xee\x1bj\xb5\x88\xe3\xcf\xe9R\xc3IF\x15\x9b\xf9}7;%\x83\xd6T\xa9'2\x1f\x17\xeb\xf5Z\x92\xe1H\xc7\xe7:.\xc8\x13B(\x19&\x83\x94\x8b\xeeٴ\xfa\x8a\x02\xb6x0O\x99\xb2z-\xbb\xab\xeb\xebW\xb7\x0f\x1d\xbb}\xbb\xb9X1\xf8\x8a\xc1\xfa\x86W\x00#\x8ed\f\xb9\xe0|v+'\xbb\xefB\xbf\xfbsuD\xb9`\xa4\xba\xe7\xf2\xb3\xe2\"\xa2\x00C2\xd8\xc9\xd1&\xfa\x97\x81J\xe4\xe2\xe1\x05\xca k\xcd\xe3\xb3\xf6h\xe3;}\xef7F\xdb?\xa3t\xd9\xe8\xef\xbf\xd2\xdaH^fO4G״֖~\xaan=>\xfa\xa8 \x96\v\xe06\xa3\xe4\x96m\x9b\xab\xcb>\xd6\xe2\xe7\x93z\xf6\x87\xbf\xfb\xb3\x99ܷ~խ\xa4\xbc\xe5\x1d\xbe\xb2\x0f\xc7U5?3\xb9\xb0\xe8\xc5C\xf4Sv\xf7\xe7\xba\xf6vv\xc8b\xa5s\xee-\xed\xa2\xccq\n\xf2\x9d\x10Kƨ\xe5\xf3..\x184I\x9fz\x9b\xc6\x0e\x1cx\xb9z,\xb0\xfb<m\xcdb\xbc\x11\xb38\xf2\xa8\xb1\xe5\x11\xc0\x88#\x19\x93v_Q0\xf0\nm\xf9\xc1\xf8\x8eIǬ!\x91\x82\x91\x0f\xb3\xb3\n\xa1d\b\x02\f\xc9xw\xd4\x05\x03\xd4c\x9d\xce9C\"\x17\f\xbd˾ʺ\x90\x10\x12=\\\xaa\xfe\xcb.\x8a\xb4\xd5^U6\xb7M{\xa2w\xd1\xe4\x92;\xf6\xa9\x1b\u007f/i\x10\xc6Z\x01\xfcf\xf4\xf1Ɖ\x95\r\x9f\xe9\xf1/Tl\xd0\xfe\x10\xf3;&\x1biߚ\xeah\xc5\x03/TGk\x1d\x95\x1d\xad\x9f<m\xe9\x8bE\xea\xe6C\xc6\x02\x86v?\xa9\x99\xce\xc1Bm_=\x05\xf9N\x88%#\xfd\x98S>\xd3<M\x8eЄ\xe1o\x0f\x05 p \x19q\xc8\x16\xc9\xf8\x91̷\xde!\x19 \xad@2\xe2\x90-\x92!\x05$\x03\xa4\x15HF\x1cB(\x19'\xb5%M\xbf(\x00\x92\x06\x92\x11\x87\x10J\x86\xb6\xa4\x89\xeb\x1a }@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12\x04.\x19\xfb\b![\xcd\a\xa7\xa3\x84\x1c\x8a\t9ޫ\xfe\xb3\x8e\xd4\xc7<ᤙ4\xfaDhh\xb5\x01\x00\xfa\x87\xb4H\xc6|\xf3\xc1\xafI\xacd\xf4=Wr\x9a\x06&\x19Fm\x00\x80\xfe!\r\x921ztI\x8f\xf1\xa0^ \x19=\x84\x04(\x19Fm\x00\x80\xfe!\r\x92\x11\xad!\xad\xfa\xf6\x99\xe8LH\x06\x009E:$c\riз\xb7\x92fH\x06\x009EJ\x92\xb1\xfb5\x8b\xdd\xe6>U2\x8e\x93\x89\xfa\x92d=9bH\xc6\xf1\xa6\xaahY\xdd.uk\x11a\x1cd\x92\xf1YSE\xb4\xeaq}\xc6\u007f\xd8X\xa9\x06\xb4\xe9u쩛\\Z\xbb\xcf!\x19G\x1a*\xa3\x13k\xd6\xe8\xf5\xc6\xd6\x06\x00\xe8\x1fR\x92\x8c\xdb\x14\x8b\xe9\xe6>U2\xe8̈́Mg\xda]|\xd39]2v\x8d#\xc53\xab\bYF\xe9\xe6\xf9\x84\xd4\xcf?\xaeJ\xc6\xcc\nR^F\xc8\f\xb6\xf0\xf1b\x94\x94\xdeTN\xc8BV\xae\x85\x90\x8a\x99Ѣ\x1aN2>,%e7U\x13rG\x9f\xb86\x00@\xff\x90\x92dtEL\xc58\xaf\xc3\xdc\xc7$\xe39\xd2\xc46\xb7\x91U\xbad\x1c/%\x8b\xbaՃ\x872\xb2\x8d;1!SߡtG\x94l\xa6\xf4@!y\xba\x87\xf6m-&k\xd4\ad\xf4\xfa>z\xaa\x96p\x92QO\x96\xa8\a\x18\a&\xb0U\x12Qm\x00\x80\xfe!%ɰ\x0f3\xae\xb3v1\xc98J*\xd8\xd1\xc0|rT\x97\x8cE\xa4N{\xeeeR\xcdK\xc6a\xb6\xaf\x91\tC=y@\vXO&\xf7\xd2{\xc9\"\xb6}\xfa*N2\xae\xd5O>\xd6ܻS\\\x1b\x00\xa0\u007fHM2\xcc\xc3\f\xfb C\x93\f:\x93\xa8\a\x10\xdd%3\xa9.\x19\x95\xe4\x15\xed\xb9\x9eBrԖ\x8c\x19ھ5\xa4\x9e\xf6\x96\xb0x\x95\xdeR\xf2f\xdf\x04\xb2_{\xb0\x88\x93\x8c;H͛\xe7\x8cmQm\x00\x80\xfe!5ɠs\xdc\a\x19\xbad4\x93\xc7)m%ͺdt\x132\xe3V\x8d(i\xb3%\xa3V\x8bߨ\xfe\xfd\x98\x10\xe3N\x8e\x1a\xb2\xf1\x14!\xdd\xc63\xb6d\xbc\x19%d\xc2\xfc\xcd\u007fW7\x85\xb5\x01\x00\xfa\x87\x14%C?\xcc\xe0\x0e2t\xc98L\xa6R\xba\x80\x1c\xd1%\xe3Sb\xb3\xcd}\x91\x95I\xc6ARd\x94\xae%k\x8e\x10\xa2o\xb7\xf2WL>\\P\xa2\x96.j\xec\x16\xd7\x06\x00\xe8\x1fR\x94\f\xfd0\x83;\xc8\xd0%\x83V\x93\x83=\xeay\x89.\x19\xa7\x89*\x1e\x16\x02\xc9\xf8\x84?\xca\xf8\xbby\x94\xf1\xb2\xf3\xbe\x8c\xde\xf6\xa7g\x12\xd2 \xae\r\x00\xd0?\xa4*\x19\xec0\x83?\xc80$\xe3i\xb2b\x87z^b\xace\\Ům0\xf6||N$\x19\xbd\xc5\xf6ZF{_\x19yK{\xb0̖\x8c\xbe\x8f\xdf\xd0\xfe\xae!E焵\x01\x00\xfa\x87T%\x83\x1dfL\xe1\x1f\xeb\x92q\x80\xccld\a\x03\xbad4\x92\x9b\xd8\x15\x14\xba\x93\x14\x9f\xa2\xbd\x84\xfc\x83:%\x83\xd6\x1b\xf7\x8bn$\x13zh\x83\xfe\xa0\xa7ʖ\x8c\x93d\xf4g\xec\xef!R\xd8+\xac\r\x00\xd0?\xa4,\x19\x9d\x11\x85?\xc80$\x83V\x91q슈.\x19\x87\x8a\xc9Cg(}\xbbL\xbb_#J\xb6u\x9fsJ\xc6\xfe\"\xb2\xa2\x97\xd2\xd6\x12\xd2B\xe9\x91(Y\xd5G\xcf\xcc'\x8e+&w\xa8\x9aqz>\v\x16\xd5\x06\x00\xe8\x1fR\x96\f:\xc7q\x90aJ\xc6ㄝ\x97\x18\x92A[\xa3\xa4x\xf64B\xe6\xb2%\x8bل\x906\xa7d\xd0\xcdEd\xe2\xcd\x15\x844\xb1\xe3\x87mQR~s\t\xa9\xe7$\xe3X\x19\x89\xde8\xb3\x84\x94\x1f\x15\xd7\x06\x00\xe8\x1fR\x97\x8cN\xc7A\x86)\x19\xef\xe8ZaH\x06=\xf2\xa3\xaah\xc9\xec\x16\xed+\"\x87j\x8a'\xbe\xec\x92\fz\xb0\xa1\"zM}\x9b^\xc7\xfb\xf3\xcbKnm\xdb\xc6/\u007f\x1eo\x9a\x16-\xae^\xfaw*\xae\r\x00\xd0?\xa4.\x19\x00\x80<\x02\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92\x01\x00\x90\x00\x92A[kN\xf9\x85H\xf2\xd5\xdcV\xbf\x90\x14\b>\xdf~ \xbdC\x02\xfa\x91\\\x93\x8c\x85\xa4p\x9b\xc7Sǣd\x86`w\vi\xees\xee9X_>\xf1\x8e=7\xbd)\bN\x8c\xbe\x96\xc2\xe7\x84O\xac)\xfe\x99p\xbf\fz\xbe\x8d\x84\x90qG\xcd}\xbb*v\xc4+\x928\a\v\xd5z\x1b\xad\x87\x81\xd5\xeb=$ l\xe4\x8ad\xec9\xa0\xff=\xd9\x1em\xf6\b\xe9{\xa71\x1a\xbbw]\xe1\xaf]{\x0eD\xeb[_\xbe\x97\x10/\xe9I\x84\x9dE\xebD\xbbgGo\x12\xed\xf6\xc1웆\x91\xef\xdf\xda\xdbד\xb7͝;J_\x89)口^\x9dso\xdf|S\xfb\xa7\xd6Ca\xbd\x82b\x89\xe01$ l\xe4\x8ad\xd4<`nyJ\x06\xa5\xcdј]Ǣ\xcb\xcc\xcd/j\xbf\xd0\xfe\xd6ժ\x9f\xe2}\x8d)I\x06]\x11\xfd[\xec\xce\xee\u0086\xc2\xee\xd8\xdd~\xd8}s\xe4\xbbϖ\f\xea:NJ\f\xbe^\x8b\xdaZ\xfe\x91\xa8^a\xb1\x04\x10\x0e\t\b\x1d\xb9\"\x19\xb7\xdegn\xc9IFcE\x8f\xb9\xf9!\xf9P\xfb;\xed\xa7\xec߃$\xa5\x93\xef\xee\n\xfb\xf0ޢ\x9d\x1c {bw\xfba\xf7͑//\x19I\xc1\xd7k\xe1\x94\f\x11\xc2b\t \x1c\x12\x10:\xc2%\x19箉>}m\xe5\x9eEe\xb5\xecú\xef\xd75\xa57>\xaeN\xa1\x1dD\xe7\x16\x16\x13]\xfa؍\xe3\xea\xb4\x0f\xb4\xbe\r\xb7\x8c\xbby\xbd\xf6Iy\xb2\xa1\xb2lA\xec\x89I\uf125\xfaƺ\xea\x1dGȑ\x9d\xd5\x1b(}\xa0\x82IG\xdfNG\x13\a\x8b\by\xe6hô\x92\xbas\xdbԖ\x9ai3\xd1N]D\x01Z\x85+J\xac\xb9m\xd1|-\xad4\x04\xed\x93\x05\xe5ъ\xfa\x93\xceM\xab\xb2\x85\xa4h]S\xe5\xe4\xfa\xa3\xae\xbe\xd9\xf9R[2N\x97\x10R\xb8U\xdf\xf7F]U\xb4\xbc~\xaa\xe3\xe0`!\x89n\xb4\x87D8f\x1c\xb6d\b\xebu\x14\xe3\xf2\x155\x91Ȑ\x80\xd0\x11.ɠ{&\x92\xc7j\xc9U\xcf]\xb3F}\xf0\xc3\xc2E;\xd7U\xdc\xdaG\xbb\xdfl\xaf\xbe\xa3\xbd\xbd\xfd\b\v\x89\x92\x19[[\xaf\xb9\x97m>\x14}f\xe73Q\xf6\xd9vt\xe2\x8d/\xb4֑\xa8\xbb\xbe\xf7I\xbb\xbeq\xb2\x81\xccT\xff[\xa0\x9e\xc7\x1f\xaf*\xack~\xabW\xdbm5ѳm\xeb\xd4\xea\tU\x8f5\x8c\xfek\xf7\x1b\x13W\x9c\xa2\xa7V\x94\xbd\xd1-\x0e\xd0J\xbeI\xder7Fk\x17\xd0\xfb\xf4\x19\xb9\xa7\xf4\x96\x96]\xcdd\x8dsӪ죭Ed\xea\xaa\xe6\xa9\xe3>t\xf6\xcdΗrG\x19\a\xdaۋu%\xda?\xba\xe1\x95]\x1b\xcb\xc99\xbeUVYE\xf3\xcf&jC\"\x1e3\x0e\xee(CT\xaf\xa3\x98#\xdf\xd8&\x12\x19\x12\x10:B&\x19\xb4\xa2\x81\xee$;\xe8CM\xecs\xf2E\xca&\x8e\xf6Aȝ\x98T\xfcC}\xdbV\xa8[m\xa4\xcd\xfcwn\xb5\xfa\x01\xd77;\xea\xaen'\xf9\xd8\xdcl\x8b\x92h\x9b\xb6\xf5ժ\x9a()cK\x19\xce&H\xed\x19\xdawF\xdd\xfa!;\x9bo\xf8\x91w\x80\xca\xdfH\xcc\xcaa_\xe9\x1a\xba\xa6\x94\x1d\x01\xf4Tթ\x92Ի\xed+\xc7&_Yt\x9aZ\xcf\xe9\xaa\x1a\xad^\xfbL\x80\xcb\xd7qbR\xa2O\xed\xf5\x15L,֗\xb9\x96 \xa2e\xea\xc7\u007f\x03\x1b\x12\x8f1\xe3p\x9e\x98\x88굊9\xf2\xf5h\xc2gH@\xf8\b\x9ddl\xa5\xef\x90n\xba\xf4\xfb\xea\t\xc4\r\xbd\xe7T\xae\xd5ΐ9\xc9P\xd5D_\xb5\xf8\xe1Lm\xc7\xccFz\x9ald[\xcfD\xddյ\x92\xe3\xfa\xc6W\x8fE+Ie\xf1\xd2\u007f\xe8\x0f{wՑ\x9d\xee&\xa2\u007f5J\xedQ\x8f\xb0{Ʊ\xcf{\x8f\x00\xca\xe6G\xcc\xf2\xe9A\xf2fϛ\xe4 e2\xf6\x81\xb9\x93\xdb\xe4+\xd3W9\xd7\x13UI\xf8\xa9m\xe5K\x85\x92\xf1i\xe5\xb4E\x1b?\xe8\xeb\xa5N\xa2\x0fQcH<ƌC(\x19\x8ez\xadb\x8e|=\x9a\xf0\x19\x12\x10>B'\x19mt_\x94\xd2e\xaad\xcc6N\xab\xe7\xb3\xfd\xae\xe5O\xed\xcd;\xb7^\xdbQ_C\x0f\xe8\xc7\xf3\xb1˟\xef\x98Ӯ\xa5|\xc3!\xf2Ѻ\xf2\xe7ԩ\xa8\xad0\xf4\xb1\xd2\xce&j\xccR\xe7\xca[ik9\xfb\xc8\xf5\b\xa0lB\xc7\xdcױN\v]\xa7m\xf5\xd8;\xadM\xbe2}\x11\xb7\x9d\xb0\v\x9a\xdc\xd4~\x87\x93\t\x81d\xd0\xd3\x1b\xee\x9bA\xaeiq\x1feXC\xe21f\x1cB\xc9p\xd4k\x15\x8b\xc9WЄϐ\x80\xf0\x11b\xc9h\xb8ဆviT{\x1fof\x1fi\xf6\x9b\xb7\xf1\x06\xf6\x16\xef\x9b\xf6\x10\xfd\aYς\x1e\x8a\xba\xab뱮\xaf\xf4\xd2\x0f\xc9!ګ\x96\xa8X\xa4\xed\xf8i\xb5\xbb\x89\x05V\xb1E\xf3\xe9\xbdZ\x94W\x00\xcb \xe6r\xea\x82[\xf6\xed\xdbw\v\v\xdaE\xac{\x1b\xb8M\xbe\xb2\xe8\x12\xb6g#a\xc7\xf4v߸|\x85\x92q`\x99\x9a\xff\xe9\xad%\xeb\xa9\x03{H<ƌC\x97\x8c\xee\x15_i\x8fD\xf5Z\xc5\x1c\xf9z4\xe13$ |\x84X2\xda\xf4\xe3ܟjw\x15\xb2w\xfa)m\x87\xfd\xe6ݩ\x9dOoeg\x185U\xea\x14\xf8\xb88\x1aS߂j\xeb\x13\xf9\xd32\xfd\x1e\xa6\xf2J6]\xfaػ\xdd\xd1\x04\xf7\xa1\xfcV\xf1g\xc5\xdaR\x9eW\x00\xed\x9bQO\xddT>\xae\xfe\xf3X%e\xd7\x1bk\xd9A\xfe\xa2%\x8eM\xbe\xb2\xe85\xea\xf4\xea\xbeA\x9b\xbfv\xdf\x1c\xf9\n$\xa3Y[\xbd\xa1\xb5Mԁ=$\x1ecF\xe9\xf1\xe7\x8e鱺d\xbcO\xde\xd0\x1e\x89굊9\xf2\x157\xe17$ |\x84L2\x0eM^ӳ5z\xb0\xa7\xa1\xf6o\xaan\x8c\xfe\xfe+\xad\x8d\xe4e\xf6DstMkm\xe9\xa7\xf4\xb3\xf6h\xe3;}\xef7F\xdb?S?\xf0\n\x97\xedXVؠ>\xfdḪ\xe6g&\x17\x16\xbdx\xc8U\xe1\x91\u0098[\xb8\xcbIEs[km\t[h\xb4\x9a8\xf7\x96v\xa5\xc0XI諬\xabԧ\xaeG\x00]c\x1f<\x18\xf4\xb4\x91\x9fv\xd3\xee\xa7I\x9b*\x11{\x8agnh[D6S\xc7&ס(\xb9e\xdb\xe6\xea2m\xb1\xd3\xec\x1b\xc3\xcc\xf7Sv\xf7\xe7\xba\xf6v\xf5þ\xf7\xed\xf6\xf6\xe2\xc6\xf67ΰ\xa9]\xbab\x87Z\x83\xe3\xe6\x0fǐ\x88ƌ1\x9fh\xf3\xf9\xdc[7\xdfԮ\xb2A=\x93\xf3\xaa\xd7.fU&n\xc2wH@\x18\t\x97d\xf4]C\xc8\xd6\t\xa4t\x9b~\xaa\xdcV{U\xd9\xdc6\xed\x99\xdeE\x93K\xee\xd8\xc7\xee\x10 $z\xb8T\xfdw\xa1\x1a\xben\xf6\xb8\xd9\xfa}\x19G\xeb'O[\xfab\x11\xdb\xebdE\xb1\xfb\x04\xbbf\xf3Og\x94V\xcc\xd7/M\x98Mh_\xbe \xc4\xfc\x9c\\\x17]cl\x89\x03\xde(\xb1\xef\x9f0\xd85\x9a\xdd\xc8\xd1J\xc8\xe8]꣏\xef\xbbvB\x8d~\xb3\x18\xb7iw(\xfax\xe3\xc4ʆϴ\xbdf\xdf4\x8c|\x1f2V\f\x1e\xa0t\xbf\xde2\xd9@\xe9\xaf\xefh\xae\x8aV\xd4:o\x17s\f\x89h\xcc\x18/Tl`\u007f\x8c^\x10Rrij^\xae\x98Y\x99\xb8\t\xdf!\x01a$\\\x92\x91\x06\xfa\x96D\xb7\xf9\xc5H\xb3-\xda\xe8\xb85B\x1e\xefoʤ#\xdf~ \xf5!\x01\xd9A\xdeK\x06\xed[s\xed\xdf\xfdb$\xf9\xaa\u2e64\xbe\xf4\xc1\xe1}\xdb{\x1a\xf2\xed\a\x02\x18\x12\x90\x1d@2\xb2\x938ߔ\x01 \x93@2\xb2\x91\x93\xdar\xa2_\x14\x00\x19\x00\x92\x91\x8dhˉ\xf6}\x9e\x00d\x0f\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\x8c4x\x9cf\x8f\x01i\xf0}\x031d\xcf\xcb\xdd/\xe4\x9add\xaf'\xeb\vĴ?\xd9,(bb$\xe9\xb4\\5\xe0jh-2~ע\xa8\x95\xdbl\x1b\xcd\xfeN\xae?b\x96\x88훈\x98bn\xe2\f\xaa\x1fɺ\xbaƼX\xbe9d\xae\x17y\xe67\x9b+\x92\x91\xfd\x9e\xacg^$ϝ\xa2\xa7ZȋgD%\f\x8c$\x9d\x96\xab\x06\\\r-\xc4\xf8U\xae\xd1-\xdcfϛ\xd1\xc6\xf6=\xeb\xaaK>\xd2\v\xc4\xf6M\x88\xbb\x98E\x02\x83j\xe1\xe1Ԛ\x9c[\xac\xe0\xc5\xf2\xcd!\x93\xbd\xc8+\xbf\xd9\\\x91\x8c\x10x\xb2\x1e\xd2~@s\x0fq\xff\x96\xa0\v3I\x81\u007f\xa2]ú\xa8\x11P\xb2\x8e\xdb4:\xdf]Y\xa7\x85s}\xf3\xc1Q\xcc&\xa1A5\xf0rjM\xe0(GL̋\xe5\x9bC\x06{\x91O~\xb3\xb9\"\x19!\xf0d\rR2z?1\x02>\xe9\xe56\xcd\xce7\x97hoq\xaeo>8\x8a\xd9$4\xa8\x06\xc9:\xb5z\x92\xa4dd\xa6\x17\xf9\xe47\x1b.\xc9\b\xb5'+'\x19g\ueaccV\xd53\x13$\x87\x9b\xa9#IK2\xac&\\\xa2\xc3i\x8a\xb5\xa9O\x8a\x96\"\xf6\xa3\xe5f߸\xcc8\xafWʛ\xc1\xda\xc5\xec̼\x06\x95C\xe4\xd4ʏ\x83\xed\xea\xea\xe8\xe6\x17\rW]\xfb\xf8\xe3W\x95z\x1e\xc6q\xe3`w\x9eF\x17\xfdHO}!)|\xd9Z\xec\xe0*\xcbd/\xf2\xc8o6\\\x92\x11jO\xd6CdgOOO\x1b\x9b\xf0;HӞm\xf5\x85\xfb\x9c\x86\xa9\xce$-\x19\xb0\x9a\xe0k\xa0q$\xa3\xef\x96\xd9l\xdb\xec\x1b\x97\x19\xe7\xf5\xea0\x83\xb5\x8bٙy\r\xaa\x8dЩ\xd51\x0e\x96\xab+\xdf\xcdޙ\x15뛋K6י\xbf\xb8\xec\x86\x1f\a\xbb\xf3ڏ\xaeo\x9d\xad\xa6\xae-J\x18\x8b\x1d|e\x99\xecE\x1e\xf9͆L2\xc2\xec\xc9z\xc8\xf8\x10;\xc4ޑ\xaa\xda\xf4ݤ\x19\x8a\xd9n\xa6\xce$M\x19\xe0\x9a\xe0j\xa0\x1e\x92\xb1\xa2\xa7\xe7ང\xfd\x869\xdf7;3\xdb\xeb\x953\x83\xe5\x8a\xf1\x99\t\a\x95C\xec\xd4\xea\x1a\a\xd3o\xcd\xee\xe66\xe61\xb9>\xce\xf9\x197\x0e\x0e\xdb\xd7\x19\xea\xee\x9ej\xe6\xbff\xbb\xa6\xf0\x95e\xb2\x17y\xe47\x1b:\xc9\b\xaf'\xeb!\xf2\xb3}\xfb\xf6\xad\xd1\xdee_\xac\xaf\xbba\"\xd1\x0e\x06,7SW\x92\xa6\fpM\xf05xH\x06S\x94r}\x15\x86\xf3o\xb53\xb3\xbd^93X\xbe\x18\x97\x99pP9\xc4N\xad\xaeq\xb0&\x9beں\xacL\xfd\xe7c\xef\xa5\"~\x1c\x1c\xb6\xafO\xb3\xdd\x1b\x98M\xad-\x19|e\x99\xecE\x1e\xf9͆N2\xc2\xeb\xc9ʭD쫨Z\xda\xda^\xabK\x86\x99\xaf+IS\x06\xb8&\x12X\xcbhڷ\xef\x13c\xf9\x8f\xf3o\xb53\xd3\xcf\xf7\x99\xd7+g\x06\xcb\x15\xe33\x13\x0e*\x8fЩ\xd55\x0e\xd6d\xb3jX3\xfa\vv\xec\xf7!\xf5\x80\x1f\a\x0f\x9bZqe\x99\xecE\x1e\xf9͆X2\xc2\xe6\xc9\xcaM\xf8\x195l\xba.pJ\x86+IS\x06\xb8&\x12\x90\f\xb3;\xd4\xe1\xdfjgf{\xbdrf\xb0\\1>3\xe1\xa0r\x88\x9dZ]\xe3\x10;\xd9\xfeZX\xf7׃\xd5s=\xaf[\xf2\xe3\x10kS\xbb\x99\xd9\xd4j\x95=\xe3\xae,\x93\xbd\xc8#\xbf\xd9\x10KF\xd8<Y\xb9\t_\xc5ގ}7;%Õ\xa4)\x03\\\x13r\x92\xc1\xf5\x8d\xfb\xa0\xb5\xbc^93X\xae\x18\x9f\x99pP9\xc4N\xad\xceq\x10L\xb6\x03\xe4\x1aBjO\x1a\xcf\x1fo\x8e\xb9{\x8a\x1b\a\x87\xed\xeb\xb5l\xede&\xf3\x8c\x1d\xb7TM\xb2\xc6]Y\x06{\x91O~\xb3!\x93\x8c\x10{\xb2\xf2w\u007f6\x93\xfb֯\xba\x95\x94\xb7\xbc\xc3\xe7\xcb%\xc9Y\xae\xdaM8\xef\x1f}_\r0\xda07\xd9\r\x90\xdc\xfd\xd2F\xdf\x1c\x99q^\xaf\x96\x19,_\xccΌz\f\xaa\x8dЩ\x95o\xcdvu\xe5k8P\xbckg\xfbIS\xcd\xeaI\xe9i\xea\x84\u007f\xb1\x1c6\xb5uo\xed\xaa\xd1R\x9f[Ѳ\xaa\x86\xb0\x00\xbb\xb2\x8c\xf6\"\x9f\xfcf\xc3%\x19a\xf6d\xb5\xbf!\xb2\x91\xf6\xad\xa9\x8eV<\xf0Bu\xb4֑\xaf\x9d$g\xb9j7\xc1\xd7@{X\x99\x12mA\xdf\xdalS\xff\xce\xe4\x9a\xd4\xfb\xe6Ȍ\xf7z5\xcd`\xf9bvf\xd4cPm\x84N\xad|k\xb6\xab+_Û\xda2e\xf4\x0e}\x19`s)\xd9G]\xf0/\x96\xfd\x1a\xcfl\xbeo\x82\x91\xfa\xd1ڒ\tuO;+\xcbd/\xf2\xcao6\\\x92\x91\x06\xd2\xe2q\x9a%\x06\xa4\x82\xbe9\xce\\2©ҦS\xe7Ν\xde\u007f\xefd\xfd袕\xb8\x8f2$pW\xd6o8\x1aΒ\x97\xbb\x9f\xc8{\xc9H\x87\xc7i\xd6\x18\x90\xc6\xf6-\xf3\x92Ѫ\xdf\x01A\xfb\xca\xdbؿ/\x965\xc5\r\x8f\x8f\xb3\xb2~\x84o8k^\xee\xfe\x01\x92\x91_d^2\x0e\x14\xeag$\x1f\x16\xb2\xfbBN\x96/\xe9\x8d\x1f\x1f\x17ge\xfdH\xc6\x1a\xce<\x90\x8c|\"\x1b\xbc^\xfb\x1aK\x9a\xb6\xed\xd9\xd6T\xd2\x14@\"\x81V&C\xc6\x1a\xce<\x90\x8c|\"+\xbc^\xfbv\xd4UF+\xebv\x042\xd7\x02\xadL\x86\x8c5\x9cq \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\x00\x00\t \x19\xa0\x1f\xe9\xeb\xd3\xff\a\xe1\x05\x92\x01\xfa\x8b\xcf\x1a+Ƚ\x94>@\xca\x1b\xbd\u007f\xf8\x13d;\x90\x8c4\xf8\x96f¤3\xf8^\x04Mߌ\x19\x1bw\x1dW\x95\xa3\xfd\x85\x19W\xe9?\"\x98\x89\x81\x02)\x92k\x92\x91ݞ\xac\xa4\xbc\xee}A\xbcM\xb2\x16\xa6\t\xba\xafz\x93d\xc3\xffh\xba\xa6\xa4>\xc1\x86\x0f\xea?\u007f\xc5\xd8\xc3~\x9e\x9bz\f\x14\xc8nrE2\x120\xde\xcc\x02O\xd6\xf6\x17jF\xef\x11ś\b\xcd?=\x8cBy\x12t_\xf5&Ɇk+6<T\x92\xe0OU\xec'o\x98\x9b\xf6o\x10敛in\x90+\x92\x91\x90\xf1f̏K\xf7\xbf'k\xdf\xdcjA\xb4\x8d\xe8\x13\xdb\xcb(\xd4&q\xf7UO\x92j\xf8+\xb2\x8e\xf6%\xfa;\xb9\xa2\xdf*\xcd/7\xd3\xdc W$#!\xe3M\x81d\xf4\xbb'+\xef\x05\x90 \xfeF\xa1\x89\xbb\xafJ\xe1\xdb\xf0Q\"q:#\x96\x8c|r3\xcd\r\xc2%\x199\xe0\xc9\xdaPI\xf9zyoO\xdb\xfcSl\x14\xeaٚ\xc0}\x95ږ\xab\\\xbe\xee$\r\x84\xae\xa3\xbe\r\xf7^\xa5\a<Fy\x93Y\xca{\xbdr\xddd\v\x18\xef\x98\r\x1e$\xf6\xe9\x99\xc0\xcdTԚ#u\xeb\x85\xf5\xe8\x10H#ᒌ\xd0{\xb2\x1eYJV9\xeaux{Z\xe6\x9fb\xa3P\xcf\xd6\x04\ueadc\xe5*\x97\xaf;I\x13\x91\xeb\xa8\u007f\xc3\x1f\xb4o%\xcd\xed\xda\xefu\xdb&\xa8\x0e\xafW\xbb\x9b\xe7\xfe\xbe\xa7\xa6\xcc҆ޫj\xde\xfc\xd48\x15\x12\xb8\x99\x8aZs\xa4n\xbd\xb0^\x1d\x02\xe9#d\x92\x11~Oֆ>g1\x97\xb7\xa7a\x98!6\n\xf5jM\xe4\xbe\xca[\xae\xda\xf9\xba\x92\xe4\x88u\x1dM\xa0a\xebĄ3A\xe5\x1a\xe6\x8a\xcdW\xbbΝİ\x9f\x037~\x8c=v\xa0\xbcZ\xb36\xb9\x17ֻC M\x84N2B\xed\xc9\xfaΎ\x9a\x92\xe3\xceb.oOc抍B\xbdZ\x13\xb9\xaf\xf2\x96\xabv\xbe\xae$9b]G\x13h\xd8^˰MP\xb9\x86\xb9b\u007fm\xdb0c\xb2\xb5P\xda]1m\xdd.#\xe7\u0601\xf2j\xcdڴ_X\xea\xdd!\x90&B'\x19!\xf7d=]\xb8\xc1Y\xcc\xe5\xedi\xce\\\xa1Q\xa8Wk\"\xf7U~\x99\xd5\xceו$G\xac\x1fX\x02\r[\x92\xc1\x99\xa0r\r;\x8a\xd1v۰d\x9f\xeeMol\xbb\aʫ5k\xd3~a\xa9w\x87@\x9a\b\xb1d\x84ӓu\xe2\ng1\x97\xb7\xa71s\xc5F\xa1^\xad\x89\xdcWy\xcbU;_W\x92\x1c\x9e\x92\x11\xafaK28\x13T\xaeaG1\x8f+&\x82\x81\xf2j\xcdڴ_X\xea\xdd!\x90&B,\x19\xe1\xf4d\xadXrp\x15_\xcc\xe9\xedi\xce\\\xb1Q\xa8gk\x02\xf7U\xder\xd5\xce\xd7Y\x8cG$\x19\xbe\r[\x92\xc1\x99\xa0r\r;\x8ayH\x86`\xa0\xbcZ\xb36\xb9\x17ֻC M\x84L2B\xec\xc9j\xdc0][\xdfx\x13\x9f:\xe7\xedi\x9b\u007f\x8a\x8dB\xbd[\x13\xb9\xafZ\x96\xab\xd4\xce\xd7U\xccD\xec:\xea۰~\xc5D39\xe0MP\xb9\x86\xf9WH\x15G\xeb\f\xe4\x1d\xfbz\xab\xc8\xcdTԚ#u\xeb\x85\xf5\xe8\x10H#ᒌ0{\xb2\xb2\xdb#ZԸ\xea\xf2\x1d\\1\xde\xdb\xd36\xff\x14\x1b\x85z\xb6&t_\xb5,W\x19F\xbe\xeeb\x06b\xd7Q\xbf\x86{˴\xcd\"v\x15\xd6a\x82\xca5̽B\xf4\xefE\xf7\x1d\xfc\x8c]V\xfe\xec\xfd\x05Q\xd3IY\xecf*h͑\xba\xf5\xc2zt\b\xa4\x91pIF\x1aȰ'k@\xa6\xa2i\xe9Eд\xceԔ~>!S\xcd\vD\x89\x0f\x14\xc8\x16\xf2^22\xec\xc9\x1a\x94\xa9h\x1az\x91\x06N\x1dT\x8f.>;\xf0\xa9\xf9Xb\xa0@\xb6\x00\xc9\xc8,y\xec\xed\t\xc2\t$#\xb3䱷'\b'\x90\x8c\f\x93\xbfޞ \x9c@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00H\x04\xd8\xc9\x1a@2\x00\xf0\x05v\xb26\x90\x8c4\xb8\x99f\xbb\xd5h\xf0=\xceq`'ˑk\x92\x91\u007f\x9e\xac\xed\xa3\xc9\xdc>\xfa\n!\xa3\xed\xdfӌO\xaa\xfe\xad\xbe$ы\x14H\xb25\xd8\xc9&I\xaeHF\xfez\xb2\xf6\xec\"%\xed\xb4\xfb\x15\xb2+\xc6BHL\xca\xfe\xad6\x1e\x99\t{\x916\x92\x183\x06\xecd\x93$W$#\x8f=Y\xbbIC\xa3z\fE\x12\xf4F\r\xc0\xbf\xd5\xc2+\xb3\x04?\xbc\x03\"\x891\x83\x9dl\xf2\xe4\x8ad\xe4\xb1'k7\xd9\xf7\xbad\xee\x00\x00 \x00IDATUړ\xb8d\x04\xe9ߚ\xbd?\xd5\xeb\x9b\x19\xecd\x93%\\\x92\x01OVAk\xdd\xe4\xf8\xad\xaf\xe8\x92aY\xa3z\f\x14\xb5{̹\xaf&R\xccF\x94\x19\x9f\x8e\xd0\xe0\x95\xef\xa6\x10\xd8Ɇ\x86pI\x06<Y\x05\xad\xa9\x92\xb1\xae^\x97\f\xdb\x1aU<P\xd4\xee1羚H1\vaf\x8e\u038b\f^\x1d\xdd\x14\x01;\xd9\xd0\x102ɀ'klk\xaad\xfc\xbd\xf8\xef\x9adp֨^\x03e\xf7\xd8v_M\xa0\x98\x8583W\xe7c\r^]\xdd\x14\x01;\xd9p\x10:ɀ'\xab\xbb5U2h\xfd:}-öF\xf5\x1a(ۿ\x95s_\xf5/f!\xce\xcc\xd5\xf9X\x83WW7E\xc0N6\x1c\x84N2\xe0\xc9\xean\x8dI\xc6+7k\x92\xc1Y\xa3z\r\x94\xed\xdfj\x0fT\x02\xc5l\x84\x99\xb9:\x1fk\xbd\xe6\xea\xa6\b\xd8Ɇ\x83\x10K\x06<Yu\x98d\xf4\x94\xeeb\x92\xc1Y\xa3z\r\x94\xddc{\xa0\x12(f!\xce\xcc\xd5\xf9\xd8I\xec\xea\xa6\b\xd8Ɇ\x83\x10K\x06<Yu\x98dЇ\x1a\x98dp֨^\x03e\xf7\xd8\x1e\xa8D\x8a\x99\x883sv^0\x89\x9d\xdd<\xde,\xb8\xd3\nv\xb2\xe1 d\x92\x01O֘\xd6zv\x91W\xbai{\t\x93\f\xdb\x1a\xd5s\xa0\xcc\x1e\xf3\x03\x95H1\x13af|\xe7\xc5\x06\xaf\\7U\xeaI\xa9\xeb\xbeK\xd8Ɇ\x86pI\x06<Yc[\xdb3\x9a\xdd \xd2WS\xa1\xf6ӲF\x9d\xeb9Pf\x8f\xf9\x81J\xa8\x98\x8103\xbe\xf3b\x83W\xae\x9b*\x9bK\xed\xc5\x01\x1d\xd8Ɇ\x86pIF\x1aH\x8b\x9bi\xe2V\xa3\x01y\xb2ʐ\x96\x1e\xfb\xe0\xeef+\xe9\xb7\xee\x06\x02\xecdm\xf2^2\xd2\xe1f*a5\x1a\x94'\xab\fi\xe8\xb1\x1f\xcen\xf6\xbdX\xd6\x147<\v\x81\x9d\xac\t$#\xb3\xe4\x89'\xab\xb3\x9b'˗\xf4Ə\a\xd9\v$#\xb3\xe4\x89'k\x9et3/\x80dd\x98<\xf1d͓n\xe6\x03\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\x8c48\x94f\x8f_g\xf0}\xeb_\xb2g$\x81I\xaeIF\xf6z\xb2&_\uf87aҊ\x86=\x151\x93ߣC\x1c~\xee\xab\xfe5\x18$\x9b:GR\xbd\xc8_\xe7\xd3\xec%W$#\xfb=Y\x93\xae\xb7\xad\xb4f\xe3\xd6ل\x1cq?!\xee\x10\x87\xaf\xfb\xaao\r\x06ɦΑl/\xf2\xd5\xf94{\xc9\x15\xc9\b\x81'k\x92\xf5~5q~/\xa5\xddձ\x93M\xd8!\x8eD\xdcW\xe3\xd7`\x92d\xea\x1c\xc9\xf7\"O\x9dO\xb3\x97\\\x91\x8c\x10x\xb2&Y\xef\xb2\x12\xed\x97\xe3\xd6\xc8O\xb6D\xdcW\x13\x93\x8c$S\xe7H\xbe\x17y\xea|\x9a\xbd\x84K2B\xedɚ\\\xbd\xb4Z\xb7\n\xfbbM\xafW\x87x\xfbP\xdbT\xd4\xee\x9b\xc3jT\xa6\x06\x8b\xe4R\xe7\x87$\xe9^\b\x9dOA\x06\t\x97d\x84ړ5\xb9z{\v\xb9syq\x878\xefT\xceT\xd4\xee\x1b\xbfW\xaa\x06\x8b\xe4R\xe7\x02\x92\xef\x85\xd0\xf9\x14d\x90\x90IF\x98=Y\x93\xab\xf78w6 \xee\x10W\x19\xeffj\xf7\x8d\xdb+W\x83MR\xa9s\x01\xc9\xf7B8\x92 \x83\x84N2\xc2\xeb\xc9ʐ\xaf\xb7\xb7\xc8\xfe\xc0\x17w\x88\xab\x8cw3\xb5\xfb\xc6핫\xc1\x81|\xea\\@\xf2\xbd\xf0\x1aI\x90)B'\x19\xe1\xf5dM\xb2^c\x15\xa0\xb7ͫC\\,\xeffj\xf7\x8d\xdb+W\x83E\x92\xa9s\x01I\xf7B4\x92 \x93\x84X2\xc2\xe6ɚd\xbd\xcbJ4\a\x81m\xe4\x94G\x87\xb8X\x87\x9b\xa9\xd57n\xaf\\\r\x16I\xa6\xce\x05$\xdd\v\xd1H\x82L\x12b\xc9\b\x9b'k\x92\xf5~5\xf1^v\x95\xa1v\x9aW\x87\xb8X\x87\x9b\xa9\xd57n\xafd\r&I\xa6\xce\x05$\xdf\v\xc1H\x82L\x122\xc9\b\xb3'kr\xf5\xaa\x93i\xdc\xdc\x17[\xeb\x8a\xd8ѹ\xb8C\\,\xeffj\xf7\x8d\xdb+W\x83Ir\xa9;\x02\x92\xee\x85\xc8\xf9\x14d\x90pIF\x98=Y\x93\xac\x97\xb2og\x8c\xbbf\xfea\xb6\xe5\xd1!.\x96w3\xb5\xfbf\uf56c\xc1 \xb9ԝ\x01I\xf6B\xec|\n2G\xb8$#\r\xa4š4K\xfc:\xd3ҷ\xfe%KF\x12\xd8\xe4\xbdd\xa4á4k\xfc:\xd3з\xfe%kF\x12X@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\xd2\xe0[\x9aa'\xd1\xe0;\x1462\xfc\x02\xe46\xb9&\x19\xf9\xe4\xc9ꁟ\x11\xab\x1f\xbb*vx?\xf9\x02\xfb\x05\x8c\xf2\xba\xf7\xbd#\x18\xfaP7\x11\xcdW`\r!M\xae\xe7\xe36A\xb9\x1e7\xaa\xad\x8d;\x1a7V\x04\xac\\\xd3H\xaeHF>z\xb2\x8a\xf15b\xf5cGi\x1c\x13\x803/\x92\xe7\xda_\xa8\x19\xbd\xc7;\x84\x9aC\xfdii\v\xfb\xfd\xbf\xafZ&|\xeaz\xdenb\x8f\xe8'\xb7\xec\x1e\xff\xad\xbd}\xbd\xf9\xab\xc7R\xc0\xca5m\xe4\x8ad\xe4\xa7'\xab\x80D\x8cX}\x88{\x8cr\x88\xf9\x8f\xf4ͭ\x8e\x17C\x8d\xa1\xbeI\xff)\xbeͳc\x9e\xb6\x9a\xb0_7\x1bg\x8f\xf7%%\x19\xb0rM\x1b\xb9\"\x19\xf9\xe9\xc9* \x11#\xd6T\xd0$\xc3û\x80C\x1b\xea{\x9fѶ\u007fz\xafw\x1c\xff\x13\xcb&\xce\x1e')\x19\xb0rM\x17\xe1\x92\fx\xb2\x1a\x1dZH\xa2\x1b\x8dnr\x9b|\x87\x84F\xac\x9e\xc5,N\x97\x10R\xb8U\xdf\xe6\x86\xcfF\x97\x8c\x86J-\xc0J\xf2\xcc}\x95Ѫ\xfa\x83Z\x84=\xd4\xcb\xf4C\x88\a\x969F\xc7n\xc2\xf1\xba\x89{\xccI\x06\x97\xce\x1buU\xd1\xf2\xfa\xa9}T<\x92Z8\xac\\\xd3D\xb8$\x03\x9e\xacF\x87>\xdaZD*\x9a\u007f6\xf1^\xc7&\xf53b\xf5,fs\xa0\xbd\xbd\xb8\xd9\xd5\x1a\xcf!\xb2\xb3\xe7\xc8R\xb2\x8am\xdb6\xaa;HӞm\xf5\x85\xfb\xa8c\xa87\xd7\xd0w\xaaަ\xb7nt\x8e\x8eՄ\xe3u\x13\xf7\x98\x93\f;\x9d\xfd\xa3\x1b^ٵ\xb1\x9c\x9c\xa3R/\x00\b\x84\x90I\x06<Y\xcd\u007f\xa3e\xea\xf1A\x03\xeb&\xbf\xe9g\xc4\xeaU\xccA\x89.\x19|1\x9bC\xdaqA\x03\xfb\x80\xe7mT\xb7\xa92\xd7w\x13\xfb\xd9wn\xa8\xdb\xcb\xe9\xd2\xe8RZ\xae\xa9\x98ctJ̳G\xebu\x13\xf7\x98ڒ\xc1\xa5\xb3\xbe\x82\x89\xc5\xfa\xb2>\xc9\x17\x00\x04A\xe8$\x03\x9e\xac\xacCj7\x1f\xa2\xe6\xe2\f\xb7\xe9c\xc4\xeaÝ1\x9f\xf9b6\x87\xc8\xcf\xde\xd9QS\xc2Z\xe1{\xf1\xc5\xfa\xba\x1b&\x92\xd9\xd41\xd4\u007f%=w4\xcc\xed\xd6Sr\x8cN\xacd\x88{Lm\xc9\xe0\xd2\xf9\xb4rڢ\x8d\x1f\xf4\xf5R\xf9\x17\x00\xa4L\xe8$\x03\x9e\xac\xacC|7\xf9M\x1f#V\xcfb\x0e\x8c\xf9\xcc\x17\xb3\xd1\xd62N\x17n\xa0\x8e$\xf7UT-mm\xafU%\x83\x1f\xea\xbe臥\aJ?\x8cj\xeb\x0f\x8eщ\x95\fq\x8f\xa9-\x19|:\xa77\xdc7\x83\\\xd3\xd2'\xf7\x02\x80@\b\xb1d\xe4\xb3'\xab\xe7\u070fo\xc4*%\x19|1\x1b}\xf9s\xe2\n\xeaHrF\r\x13\xa8\x05\xaad8\x86\xba\xba\xa5\x92V\xae\xd1/\xc8:F\xc7)\x19\xecu\x13\xf7\x98ڒ\xc1\xa5s`\x99\xbayzk\xc9z\xb9\x17\x00\x04B\x88%#\xaf=Y=\xe7~|#V\x19\xc9\xe0\x8bQz\xfc\xb9c\xda_]2*\x96\x1c\\\xc5'Y\xc5&k\xdfͪd8\x86\xba\xae\xe6^z\xef\xdc:\xad\xa0\xe3r\xaa%\x19\xd6\xeb&\xee1\xb5%\x83K\xa7Y__\xa9m\x92{\x01@ \x84L2\xe0ɪw\x88릣\xc7>F\xac\xde\xc5Lz\xdfno/nl\u007f\xe3\f_\x8c1\xdf0J<\xa8M\xd7\xda\xfaƛ\xf8$\x9b\xc9}\xebW\xddJ\xca[\xdeq\f\xf5\x92\xd1-\xb4e\xb4z\xdc\xc4w\x93o\xc2z\xdd<z\xfc)\xbb\xfbs]{\xfb_\x1d\xe94\x93\xd2\x15;\xd4\xd8=T\xea\x05\x00\x81\x10.ɀ'\xab\xd1!\xae\x9b\x8e\x1e\xd3\xf8F\xacq\x8a\x19\xec\xd7\xf3!\x1b\xa8c\xf8(}\xa1\x82\xed\xa2\xec\xe6\x91\x165\xed\xear\xf6-\x11+ɾ5\xd5ъ\a^\xa8\x8e\xd6:\x86z縃\xf4Pi\xab\xb3\x9b|\x13\xd6\xebF\xc5=~H\x0f%\x0f8\xd2\xf9\xf5\x1d\xcdUъ\xda=\x8eb\xfe/\x00\b\x84pIF\x1aH\x8boi&\x9dD\xd3ҡ\xb0\x91\xc9\x17 \xd7\xc9{\xc9H\x87oif\x9dD\xd3С\xb0\x91\xd9\x17 ǁd\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\x00\x00$\x80d\xa4\xc1\xc24Ö\xa0\x01t\xa8\xc9m\x89\b\x92$[F2\xb8\xf7d\xaeIF\xcey\xb22\x13T\xdd\xdddsk\x91\xf1\xeb\x11E\xad\xdcf\xdbh\xf6wr\xfd\x11\xb3D\xaa\x9e\xac*GȲx#\x19\x8f\xc4L[\xe5I\xde\xe05\xa3d\xcdH\x06gS\x9b+\x92\x91\xb3\x9e\xac\xcc\x04\xf5\x14=\xd5B^<\xd3B\x8cߨ\x1a\xdd\xc2m\xf6\xbc\x19ml߳\xae\xba\xe4#\xbd@R\x9e\xac.kԆ\xe2S\xae\x91\xe4\x02\x846\xaa\x16\x89\x99\xb6ʓ\xb4\xc1k?\x93e#\xc95\x11\x94Mm\xaeHF\xeez\xb2\xea?\xb6\xb9\x87\x1c\xa2\xeb\xa2\xc6/a\x96\xac\xe36\x8d\x1ewW\xea?\xb1\x99\x9c'\xab\xd3\x1a\xf5\xe8\xe8\xc7\xd8\x1f~$\xb9\x00\x91\x8d*G\x82\xa6\xad\xd2$i\xf0\x1a4\xe6\xbbċ,\x1bI\xbe\x89\x80ljsE2rדՖ\x8c\xdeO\f\x9d\xf8\xa4\x97\xdb4{\xdc\\\xa2M\x9d\xe4<Y\x9d֨\x0fE\xb5\xdf\x03\xe5G\x92\v\x10٨r$h\xda*M\x92\x06\xafAc\xbeK\xbcȲ\x91\xe4\x9b\bȦ6\\\x92\x91\x8f\x9e\xac\xb6d08SckS\u007fC\xb6\x14\xb1_\x147;\xb4B\xadf+ݪ\xfe\xbb\xc2\xce\xc0i\xc4*\x1e>\x95\xe3E\xba}\x825\x92\\\x00\xb7\xb9\x90\x14\xadk\xaa\x9c\\\u007f\x94:\x10\x9b\xb6\xda6\xaa\x8eb\"\xb7X\xb1\xe5j\x92\x06\xaf\xee\x97%\x06G\x00\x97o\xf7\xd2\x19\xa5w\xbc}m\x9b#\xd8~\x97dp$\xad\xcc\x16\x92\u0097\xad\x15:\xd1P\xbb\xd3\tƦ6\\\x92\x91\x87\x9e\xac\x9a\tjOO\x9b\x9fd\xf4ݢ\x1d\xb1\x9b\x1d:\xf5\xfd\x1a\xb5\x9a\xee7\xe76\xf0?\xea\xe70b\x15\x0f\x9fJ\x93q\x00k\x8d$\x17\xc0m\xb2ʦ\xaej\x9e:\xce\xf9\xb1+6m\xb5mT\x1d\xc5Dn\xb1b\xcb\xd5$\r^\xdd/K\f\x8e\x00\xbb\xb5\xd37\x94\xafi[h\xfc\xa6\xb1\x85\xfd.\xc9\xdcHڙik$\xe6\n\x9dh\xa8\xdd\xe9\x04cS\x1b2\xc9\xc8?OV\xc3\x04\x95ē\x8c\x15==\a\xef%\xbbضա_\xebW\x87f\xba\xd6Bm#V\x8f\xe1cW\x96\x8c\xdf\x1c\xb7G\xd2\xe3p::M\xcd\xfat\x95\xdbN\x8d\xe16m\xe5lT\xb9bb\xb7X\xb1\xe5jr\x06\xaf\xeeX\x11V\x00W\xac\xb1\x8cy\xdb-qI\x06\xff.\xc9\xd4H\xf2\x99\xd9V4\x1eC\xed<\xf7\tƦ6t\x92\x91o\x9e\xac\xcc\x04u\u07fe}k\xe2I\x06{g\x95\xebK$V\x87\x0e\x16\xf6\xf6\xfc\xfa\xf4\xb9\xe8A\xea\xc06b\xf5\x18>\xf509jTa\x8f\xa4\xd7\x1b][i]O\xbe\xa2\x1cb\xd3V\xceF\x95+&v\x8b\x15[\xae&g\xf0\xea\x8e\x15a\x05\xd8\xc5\xfa\xc6iu~\xe4\x92\f\xfe]\x92\xa1\x91tdfK\x86\xc7P\xbb%C\xf4\x9e\x94%t\x92іo\x9e\xac\t\xace4\xed\xdb\xf7\x89q\xd9\xc0\xeaPo\xd1\xc15dő\xc2^\xea\xc0\x1e\x1d\x8f\xe1\xa3'\xa3?\x8a\x89\xf5z\xa3k\xef\xdev\xa7ɐش\x95\xb3Q\xe5\x8ay\xb8\xc5\n-W\x934xuŊ\xb0\x02\xecb\u007f\xd3\x17\xa9\xbb]\x92\xc1\xbdK25\x92\x8e\xcc\xc49pC플`ljC,\x19y\xe2ɚ\x80d\x98}\xa0|\x87fl\xad\x9d;\xa3\xd5}\xf3\x9a=:\x1e\xc3G\x97\x14\x1e\x8b\x89u\x04pC\xbd\x84=\xdeH\x1c\a\xfdb\xd3V\xceF\x95+&v\x8b\xf5\xb0\\M\xce\xe0\xd5\x15+\xc2\n\xb0\x8b\xf5\xe9u\x1ev\x9f\x98\xd8\xef\x92L\x8d\xa4#3\xad\xdeg\xa2\xd4s\xa8\xf9\xd6D\xef\xc9d\b\xb1d\xe4\x89'\xab\x9cd\xd8\x1d\xfa\xfe\xa2h\x1bY\xf8\x00ub\x8f\x8e\xc7\xf0}Vl\xd96\xf3ot;\x80\x1f\xeakԷ`\xf7\r\xb5ZD|\xd3V\xceF\x95+&v\x8b\xf5\xb0\\M\xce\xe0\xd5\x19{\xbcYp\xf7\x94\x15\xc0\x15[P\xaeN\xbe\xbe\x86\x98\xb5\f\xeb]\x92\xb1\x91\xe43\x1b\xb7Tݬa\xf5z\f5\xdfZP6\xb5!\x93\x8c\xfc\xf3d\xe5\xee\xfeTw\xbf\xbf\x9e\xac3*67\xd9ݟ\xd6\xcd\xe2\\\x87\x9e\x1b7\xb1\xaf\xbad\x15\xe5q\x8c\x8eh\xf8(}|\xf4QA,\x17\xc0mF\xc9-\xdb6W\x97\xe9\v\xae~\xa6\xad\xb6\x8d*WL\xe4\x16+\xb6\\M\xd2\xe0\xd5\xf5\xb2ԓ\xd2\xd3ԁ#\xc0n\xed\xb3\x8a\xaa\xf5\xad\xf3\x8bc%\xc3 s#\xc9g6\xb7\xa2eU\r\xd1\xde\xd5\xe2\xa1\xe6[\vʦ6\\\x92\x91\x87\x9e\xac\xf6wL6\xaa\xf2\xc0:V\xa2M\x0fk\xb3M\xfd;\x93k\xc6\xecЁ\xb2\x15\xb4\xa5t\x1f\xe5q\x1a\xb1\n\x86\x8f\xfe\xbd\xa4A\x18\xcby\xa7ڛ\xd1\xc7\x1b'V6\x186\xd0\xf1M[y\x1bU\xae\x98\xc8-Vl\xb9\x9a\xa4\xc1\xabk|7\x97\x12爸\x02\xec־h\xac*\xa9=\xe0)\x19\x99\x1bI>\xb3\xa3\xb5%\x13\xea\x9ev\xe5\xe0\x18>\xae\xb5\xa0lj\xc3%\x19i -\x16\xa6\x99\xb4\x04M\xadCO\x13\xee\x88\xc5\x0f\xc7\x19Q\xe2$Y,\x10Z\x89\xeb(#.\xee\xe5O\x19\xd2;\x92\xf2\x99\x05\xf6\x9e\xcc{\xc9H\x87\x85if-AS\xeaЏ\x9a\xfc\"8\xa4\xdf\xe8:I\x16\v\x80\xbe\x17\xcbd\xfa\x97\xc4ĴI\xefHJg\x16\xdc{\x12\x92\x01\x92F\xfa\x8d\xae\x93d\xb1\x008Y\xbe\xc4u\xd19>\xd2\x133Y\xa4\x87\xa4\xdf2\x8b\x05\x92\x01\x92䤶\xaa\xe7\x17\x15C\x92\xc52\xc1\xd16\xf2\xd8[\xfd\x90\xaa\xfc\x90\xf4Wf\" \x19 I\xb4U\xbd\xe3T\x96$\x8be\x82\xb9j\xaaE\xae\uf2a5\x03\xf9!\xe9\xaf\xccD@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x00\x00\x12@2\x82\xb00u\x11\x9c\xffez\b\xbe\xc7\xfdK\xb6\x8fon\x93k\x92\x91\x93\x9e\xac\xc19sj\xf8\x99\xb6z\fT,Iu\xc8ɡ\xbaҊ\x86=\x151\x12\x167\x87\xe0\xfcE\x81<\xb9\"\x199\xed\xc9\x1a\xa43g\x02\xa6\xad⁊%\xb9\x0e9h+\xadٸu6\x89\xfdi\t\x9f\x1c\x82\xf2\x17\x05\xf2\xe4\x8ad\xe4\xb8'k\x80Μ\x89\x98\xb6\n\x06J@\x92\x1d\xe2\xf8j\xe2\xfc^J\xbb\xabE\xbfF\x13?\x87\x80\xfcE\x81<\xb9\"\x19\xee\xdfw\x17\"x\x17\x86œ58g\xceDL[\x13\x93\x8c$;ı\xacD\xfb\xed\xba5\xf2\x92\x11\x90\xbf(\x90'\\\x92\x91\xbf\x9e\xac\x819sZ=\xa6\xf4\x93\x05\xe5ъz\xe6\xae\"\x1e(\xae2.\xd6&\xb9\x0e\xf1\x03U\xad\x1b}|\xb1\xa6W:\a\x81\xbf\xa8\xa8\t\xa7\xe5\xaaل\xafS+\xf0&\\\x92\x91\xaf\x9e\xac\x01:sZ=\xa6{Joi\xd9\xd5L\xd8H\x8a\aʮ\x8c\x8f\xb5I\xaeC\\@o!\xb7\"!\x99\x83\xc0_TԄ\xe3e\xb1\x9a\xf0uj\x05ބL2\xf2֓50gN\xab\xc7=Uu\xeal\xef\xdd\xf6\x95\xd7@q\x95q\xb1<\xc9u\xc8\x0e8Ν\xd3\xc8\xe6\x10;\xbe^\xaf\x85\xb5\xc9;\xc0\xfa;\xb5\x02\x0fB'\x19\xf9\xe8\xc9\x1a\xa43\xa7\xd5\xe36\xf2\x81\xb9O<P\\e\\\xac\x8b$:d\a\xf4\x16ه-\xb29Ď\xaf\xd7kam\xf2\x0e\xb0\xfeN\xad\xc0\x83\xd0IF~z\xb2\x06\xe7\xcci\xf5\x98[P\x15\x0f\x14W\x99x\xf15\xc9\x0eq\x01\xc6ZFo\x9b|\x0e\xb1\xe3\xeb\xf5ZX\x9b\xbc\x03\xac\xbfS+\xf0 Ē\x91W\x9e\xac\x819sZ=\xdee{g\x89\a\x8a\xabl\x97\xd0g+\xc9\x0eq\x01\xcbJ4\xfb\x84m\xe4\x94t\x0e\xb1\xe3땃\xb5\xc9;\xc0\xfa;\xb5\x02\x0fB,\x19y\xe5\xc9\x1a\x9c3\xa7\xd9\xe3\xee\x8aZvֲh\x89\xd7@q\x95q\xb1\x1cIv\x88\v\xf8j\xe2\xbd\xecZI\xed4\xe9\x1c\x04\xe3땃\xb5\xc9;\xc0:]]\x81\x04!\x93\x8c\xfc\xf3d\rܙ\xd3\xea\xf1\x9e\xe2\x99\x1b\xda\x16\x91\xcd\xd4k\xa0\xb8\xf1\xe5bm\x92\xeb\x90#\xa0m\xdc\xdc\x17[\xeb\x8aޔ\xceA\xe4/*j\xc2њՄ\xeb\xc5\x022\x84K2\xf2Г5hgN\xae\xc7\x1f\xdfw\xed\x84\x1amM\xc4c\xa0\xb8\xf1\xb5cm\x92\xeb\x903\xe0Pݸk\xe6\x1ff[R9\x88\xfdE\x05M8Z\xb3\x9ap%\td\b\x97d\xa4\x81\xd4,L=\b\xcc\xff҇\xa4<\xb3\xd2\xd2\xe3\xfe\xa5\xbf\xc6\x17\b\xc8{\xc9H\xcd\xc2TLp\xfe\x97>$%\x19\xe9\xe8q\xff\xd2o\xe3\v\x04@2\xc2Lr\x92\x01@\n@2BL&\x9d9A\xbe\x02\xc9\b1\x99t\xe6\x04\xf9\n$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$#\r\x0e\xa5Y\xe9\x19\x1a|7\x93$+G\a$L\xaeIF6{\xb2R\xfa\x8f\xa6kJ\xea\x13\xf8RH\x06\x8cX\xe3\x11l:pT\r7\xb9\"\x19!\xf0dU\xa9\xad\xd8\xf0P\xc9i\xd13N2`\xc4\x1a\x8f\xa0Ӂ\xa3j\x98\xc9\x15\xc9\b\x81'\xabzHN\xd6\xd1>\xf7\xaf\xdc\nɄ\x11\xab\x00sH\x82N\a\x8e\xaa!&W$#\x04\x9e\xac\x94\x1e%;bw\nɄ\x11\xab\x00sH\x82N\a\x8e\xaa!&\\\x92\x11fO\xd6ޫ\xf4$\x1fs\xc5r\xae\xa3i7b\xf5jت\x97\x87\x1b\x92\x80\xd3\x11:\xaa\x82\x90\x10.\xc9\b\xb5'\xeb\a\xed[Is;\xfb\xe5sG,\xe7:\x9av#V\x8f\x86\xedzy\xb8!\t8\x1d\xa1\xa3*\b\t!\x93\x8cP{\xb2\xf2'&V,WC?\x18\xb1\x8a\x1b\xe6\xeb屆$\xe0tģ\x03\xc2A\xe8$#̞\xac\xbcd\x98\xb1\\\r\xfd`\xc4*l\xd8Q\xaf\r7$\x01\xa7\xe3\xe5X\v\xc2@\xe8$#\xbc\x9e\xacN\xc90c\xb9\x1a\xfa\xc1\x88Uذ\xa3^\x1bnH\x02NG<: \x1c\x84X2\xc2\xe6\xc9\xea\x94\f3\x96\xab\xa1\x1f\x8cX\x85\r;\xea將$\xe0tģ\x03\xc2A\x88%#l\x9e\xacN\xc90c\xb9\x1a\xfa\xc1\x88U\xdc0_\xaf\x03sH\x82NG8: \x1c\x84L2\xc2\xecɪ_1y\xa7\xcfe\t\xca\xf5\"\xedF\xac\x1e\r\xf3\xf5\n\t:\x1d\x91\xa3*\b\tᒌ0{\xb2\xf6\x96i\x01EGܱ\\/\xd2m\xc4\xea\xd50W\xaf\x88\xa0\xd3\x11;\xaa\x82p\x10.\xc9H\x03iq(M\xabghR\x16i\tt3\xa9z\x93)\x96\xd6\xd1\x01\xe9&\xef%#\x1d\x0e\xa5\xe9\xf5\f\x95\x9f\xa3\f\xffn&W\xaf|\xb1\xf4\x8e\x0eH7\x90\x8c\xd0!=G\x13$\xc9z\x93,\x06\xc2\n$#l\xa4ˈ5\xc9z\x93,\x06B\v$#l\xa4ˈ5\xc9z\x93,\x06B\v$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$\x03\x00 \x01$#\rf\xa5\xd9\xee:\x1a|\x8f\x03%ۇ/\xcf\xc95ɀ'\xab?\xa9سr\xa4-I\x98\xb6f5\xb9\"\x19\xf0dM\x98\x94\xecY9Ҙ$L[\xb3\x98\\\x91\fx\xb2&J\x92\xf6\xac\x1cA:\xb5z\x00\xd3\xd6\xec%W$\x03\x9e\xac\x89\x92\xa4=+G\x90N\xad\x1e\xc0\xb45{\t\x97d\xe4\xbb'\xab\xe5q\xba\x90\x14\xadk\xaa\x9c\\\xaf}\xeb\xdc\xea\xe6B\x12\xddhuފu\xd4\xe0k\xcf*n\xc2\xc6ߩ5\x80$aښńK2\xf2ܓ\xd5\xf68\xfdhk\x11\x99\xba\xaay\xea8\xa6nV7\xd9ފ\xe6\x9fMd\x9d\xb7c\x1dM\xf8ٳz4a\xe3\xeb\xd4\x1aD\x920m\xcdbB&\x19\xf9\xed\xc9\xca{\x9cF\xa7\xa9\x85OW\xd58\xbaI\xa3e\xea\x87w\x03\xeb<\x17\xebH\xd2ǞU܄\x03\x1f\xa7\xd6 \x92\x84ik\x16\x13:\xc9\xc8cOV\x87ǩ\xbe\x88\xb9\x9e|\xc5uS\xdd\xfb\x105:\xcf\xc5:\x92\x8co\xcf\xea\xd1\x04\x87\x9fSk I´5\x8b\t\x9dd\xe4\xb1'\xab\xc3\xe3T_\xe5m'\a\xb8n\xf2\x9d\xe7b\x1dIƷg\xf5h\x82\xc3ϩ5\x90$aښńX2\xf2Γ\xd5\xe1q\x1a]\xc2Jo$g\xb8n\xf2\x9d\xe7b\x1dIƷg\xf5h\x82\xc7ǩ5\x90$aښńX2\xf2ϓ\x95\xf78\x8d^\xa3Ω\xee\x1bj\x1d\xdd\xe4:\xcf\xc5:\x92\xf4\xb1g\x157\xe1$\xbeSk I´5{\t\x99d\xe4\xb7'+\xefq\x1a%\xb7l\xdb\\]ƒ\xb4\xba\xc9w\x9e\x8f\xe5\a\xcaǞգ\t!iL\x12\xa6\xad\xd9K\xb8$#\xcf=Yy\x8f\xd3\xe8\xe3\x8d\x13+\x1b>c\x9bV7\xf9\xce;\xfcP\xb9&|\xecY=\x9a\x10\x91\xc6$aښńK2\xd2@\x02f\xa5\xf2\xf4\x83\xebh\x9c\x9b\\}H\xb8\xc7\xc97a\x92d\r\xfd0| i\xf2^2\x120+\x95\xa6?\\G\x93\x9c\x8d\x8cD{\x9cB\x13\x06\xc9\xd5\xd0\x1f\xc3\a\x92\x06\x92\x11R\x92\x9b\x8dR\xa4\xdeD\xea5\x80\xac\x03\x92\x11JNjk\x88~Q)\x91z\x13\xa9\xd7\x00\xb2\x10HF(\xd1\xd6\x10\x8f\xd3t\x92z\x13\xa9\xd7\x00\xb2\x10H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02H\x06\x00@\x02HF\x1a\x1cJ\xb3\xc7TT\xeb[\xf6\xa4\x03r\x80\\\x93\x8c\xec\xf6d\x8dK\x1a<N\xf5\xbe\xf9\xa5\x93\x86\x86A\xee\x92+\x92\x11\x0eOV!f\xea\x81x\x9c\xee\xe1\u007f\xcd\xca\xea[\xfct\x82o\x18\xe40\xb9\"\x19\xa1\xf0d\x15c\xa5\x1e\x84ǩ=\x0e\x8e\xbe\x89\xd3\t\xd2\\\x95o\x18\xe42\xb9\"\x19\xa1\xf0d\x15c\xa5\x1e\x84\xc7)\xff\x93\xc5\\\xdf\xc4\xe9\x04i\xae\xca7\fr\x99pIF\x98=Y\xd5\x0f\xf5\x86\xab\xae}\xfc\xf1\xabJ\xb7y\xa4\xee\xe1qڽtF\xe9\x1do_\xdb\xc6\xd6i^\xb6VdD&\xa8\x8eq\xb0\xfbƈM\xc7\xdf\\5نAN\x13.\xc9\b\xb5'k\xef̊\xf5\xcd\xc5%\x9b\xeb\xd6x\xa4.\xf68=}C\xf9\x9a\xb6\x85\x84l\xd0\xd7i\xcc\x15\x19\x91\t\xaac\x1c쾉\xd3\xf15WM\xbaa\x90ӄL2\xc2\xecɺ\x8d\x1cdf\x83\x87b\x8a\xd9'&\f\xb7\xc7ic\x19so[\xa2\xce\\\xde\x01\xc4\xc3\x04\x95??\xe0\xfa&\xf68\xf51WM\xbaa\x90ӄN2\xc2\xebɺ\xacL\xfd\xe7cm\x89D\x9c\xba\xd0\xe3\xb4o\x9c\xb66\xf3\x91k\xe6z\x98\xa0\xf23\x97s_\x15\xa5\xe3g\xae\x9a|\xc3 \xa7\t\x9dd\x84דu\xcd\xe8/\xd81χ1\xc5\x1c˟n\x8fӿ\xe9˰ݮ\x99\xeba\x82\xca\xcf\\\xce}U\x94\x8e\x9f\xb9j\xf2\r\x83\x9c&Ē\x116Oֿ\x16\xd6\xfd\xf5`\xf5ܾ\x98bf\xeaB\x8fӾ\x12-\xc3\xc3\xf6\xccՎ\x95<LP\xb9q\xe0\xddW\x85\x1e\xa7>\xe6\xaa\xc97\fr\x9a\x10KF\xd8<Y\x0f\x90k\b\xa9=\x19S\xccJ]\xecq\xba\xa0\\\x9d\x9d}\r\xda\xcc\x1d\xb7Tݬ\x89:k\xe0MP\xb9qp\xf4M\xecq\x1a\xdf\\5\xf9\x86A.\x132\xc9\b\xb3'\xeb\x81\xe2];\xdbO\xba\x8aQ;u\x0f\x8f\xd3\xcf*\xaaַ\xce/\xd6f\xee܊\x96U5D\xeb\x85\xd8\x04ծ\x8c:\xfa\x16\xdf\xe34\xe8\x86A.\x13.\xc9\b\xb3'+}3\xca\x02\xa2w|\xc8\x17\xa3v\xea\x1e\x1e\xa7\xf4\x8bƪ\x92\xda\x03\xda\xcc=Z[2\xa1\xeei\xadob\x13T\xab2\r\xabo\xf1=N\x83o\x18\xe40ᒌ4\x90\xb0C\xa9\f\"S\xd1S\xa5M\xa7Ν;\xbd\xff\xdeɧEE|\xd0W!%1\xfb\x96\x8a\xc7iR\r\x83\x1c&\xef%#a\x87R\t\x84\xa6\xa2\xad\xfa\xfd\v\xb4\xaf\xbc-\xe69\u007f\x92\x9b\xb9z\xdfR\xf28M\xaea\x90\xbb@2\xfa\x8b\x03\x85\xfa\x17:>,\xfc\xc0'RD\xc6fn\xc6\x1a\x06Y\n$\xa3\xbf\xe8k,iڶg[SIS\x12\x1f\xf9G\xdb\xc8co%Q.e2\xd60\xc8V \x19\xfdFߎ\xba\xcaheݎd&\xe0\\BH\xd1Q\xbf\xa84\x90\xb1\x86A\xb6\x02\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\x00\x00H\x00\xc9\xc8iOV\x0eس\x82@\xc85ɀ'\xab\a\xb0g\x05\xc1\x90+\x92\x01O\xd6\xf8\xf4\xa7=+\xc8irE2\xe0\xc9\x1a\x97~\xb5g\x059M\xaeH\x06<Y\xe3ү\xf6\xac \xa7\t\x97d\xe4\xa5'\xab\xe5|\xba\x90\x14\xadk\xaa\x9c\\\xaf}\x17\xdd\xea\xdbB\x12\xddh\xf5؊uԐ\xba=k\x009\x80\x1c!\\\x92\x91\x8f\x9e\xac\xb6\xf3\xe9G[\x8b\xc8\xd4U\xcdS\xc71I\xb3\xfa\xc6\xf6V4\xffl\"\xeb\xb1\x1d\xcbא\xba=k\x109\x80\x1c!d\x92\x91\x87\x9e\xac\xbc\xf3it\x9aZ\xfb\xe9\xaa\x1aG\xdfh\xb4L\xfdto`=\xe6b\x1dM\xa4j\xcf\x1aD\x0e G\b\x9dd\xe4\x9b'\xab\xc3\xf9T_\xc4\\O\xbe\xe2\xfa\xa6\xee}\x88\x1a=\xe6b\x1dM\xa4h\xcf\x1aH\x0e G\b\x9dd\xe4\x9b'\xab\xc3\xf9T_\xdam'\a\xb8\xbe\xf1=\xe6b\x1dM\xa4h\xcf\x1aH\x0e G\b\xb1d\xe4\x87'\xab\xc3\xf94\xba\x84\x15\xd8H\xcep}\xe3{\xcc\xc5:\x9aHў5\x90\x1c@\x8e\x10b\xc9\xc8\x13OV\xde\xf94z\x8d:ۻo\xa8u\xf4\x8d\xeb1\x17\xebh\"U{\xd6@r\x00\xb9A\xc8$#\x0f=Yy\xe7\xd3(\xb9e\xdb\xe6\xea2\x96\x99\xd57\xbe\xc7|,\xdfD\xaa\xf6\xac\x81\xe4\x00r\x83pIF>z\xb2\xf2Χ\xd1\xc7\x1b'V6|\xc66\xad\xbe\xf1=v\xb8\xa4rM\xa4j\xcf\x1aL\x0e '\b\x97d\xa4\x81\x90x\xb2\xeaĹ\xb3Շ \xecYu\x92\xcf\x01\xe4\x04y/\x19!\xf1d\xd5Ia\xba\x06`Ϫ\x93B\x0e \x17\x80d\xf4\x17\xa9y\xb2\xead\xc3t͆\x1c@\x06\x81d\xf4\x17)y\xb2j\x9c\xd4\x16\x19\xfd\xa2\xd2K6\xe4\x002\n$\xa3\xdfHœUC[d\xe4n\xe3\xcc\x04ِ\x03\xc8(\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\f\x00\x80\x04\x90\x8c\xbc\xf2d\r1\xf1\x065\xec}\v\x15\xb9&\x19!\xf6d\xd5ГL\x835jl7\x9dx\x8cN,)\x8f\x0e\xa5\x87\xeaJ+\x1a\xf6T\xc4L\xf3\xb89\xc4\x19T\xbf\xbe\t\xd9U\xb1\xc3/$U\xfa\xa1\x89\xd4\xf0\x9d-\xadE\xc6Ϸ\x16\xd9z\x9d+\x92\x11bOV\az\x92\x81X\xa3\xee\xe1\u007f}+\xb6\x9b.ģ\x13K\x00\xa3\xd3VZ\xb3q\xeblB\x8e\xb8\x9f\xf0\xc9\xc1kP}\xfb&dGi\xac7C\xc0\xa4\xdcĞx?\xa0\x96\x02\tϖ\x16\xd2\u07be\x9e\xacko\x1f\xddb=\x93+\x92\x11bOV\x17Z\x92AX\xa3\xdaC\xe2\xe8\xa6'\x82\xd1\x11\x90\xfa\xe8|5q~/\xa5\xddձ\x92ᗃxP\x13\xe9\x9b\b\x89\x03\x13\xf3\xad!\x8bD\x13B\xf8\x97P\x06\xbf|\x13\x9e-\xeb\xa2\xec\x17\xe9ߦ\xb4\xc4V\xeb\\\x91\x8c\x10{\xb2\xba\xb0%#EkT\xfe\u05cb\xb9nz\x92\x98d\xa4>:\xcbJ\xb4_\x01\\#/\x19\xe2AM\xa4o)b\xbe5\xfa\x1b\xfe%\x94\xc1/߄gK\xef'\x86d|\xd2k\xed\x0f\x97d\x84ٓ\xd5\x11`\x9b\x95\x9e\xb9\xaf2ZU\u007fP\v\xb1\x93\xf4\xb0F\xed^:\xa3\U0010edefmc'\xa1/[\xa7\xfe\"\xefTǐ\U0001eb1f,(\x8fVԳ\xdf9\x17\x8f\x0eo\xa3j\xc7ڤ>:\xd5?\xd2*\xfabM\xaft\x0e\x02\xa3[\xaeo\"3X\x8f\xccN\x97\x10Rh\x9a\xb8qC\"\xf2\x90\xe5\xde\x1a\xe9j\u0082\u007f\x83s/!\xdb|Z\xaf\xd7i\x8a\x1b7߀f\xcb>\xdd\x04\xc7\xca!\\\x92\x11fOVG\x80mV\xba\x834\xed\xd9V_\xb8\x8f:\x92\x14[\xa3\x9e\xbe\xa1|M\xdbBB6\xe8'\xa1橿\xc8;\xd51$\x9c'\xeb\x9e\xd2[Zv5\x136|\xe2\xd1\xe1lT\xb9X\x9b\x94G\xa7\xb7\x90[\x91\x90\xcc!\xd6N\x96\xeb\x9b\xd0\f\xd6+\xb3\x03\xed\xed\xc5\xc6\a,ׄ\xd0C\x96{k\xa4\xab\t\x1b\xee\rν\x84=oV5\xb1z'\xbe\xd1\xed0\xc5\xf5\xc97\x98\xd9bH\x86\x95C\xc8$#̞\xac\\\x00W\xacg\x9b\xfa\xee껉\xfd`:\x97\xa4\xd8\x1a\xb5\xb1\x8c}N-Q%\x837\x0e\xf1\xf0N\xe5\x8fj\xadn\xf6Tթ\xb3\xbdw\xdbW^\xa3\xc3gf\xc7\xf2\xa4::ǹs\x1a\xd9\x1cD\x83j\xf5\xcd\xcb\fV\x94\x19\xa3D\x9f\xcf\\\x13^\x1e\xb2\xd6[#}MXpop\xfe%lf\xc7\x04\r\xday\x99m\x8a\xeb\x9bo \xb3e\x9fi\xb5g\xe4\x10:\xc9\b\xaf'+\x17\xc0\x17\xfbb}\xdd\r\x13\xc9l\xeaHRh\x8d\xda7N{\a~\xe4\x92\f\x0f\xefT^2\xacn\xb6\x11\xeb\x87Gţ\xc3U\xc6źHitz\x8b\xec\xc3\x16\xd9\x1cD\x83j\xf5\xcd\xcb\fV\x94\x19Ø\xcf\\\x13b\x0fY\ueb51\xae&8\xb878\xff\x12\xfem\xf4a\xda;q\x17۴Mq}\xf3\rd\xb6X\x92a\xe4\x10:\xc9\b\xaf'+\x17\xc0\x15\xdbWQ\xb5\xb4\xb5\xbdv6u$)\xb4F\xfd\x9b\xfe\xf9\xdc\xed\x92\f\x0f\xefT^2\xacnr\v\xaa\xe2\xd1\xe1*\x13/\xbe\xa6>:\xc6ZFo\x9b|\x0e\xa2A\xb5\xfdf=\xcc`E\x991\x8c\xf9\xcc5!\xf6\x90\xe5\xde\x1a\xe9j\x82\x83{\x83;^º\xc7i[\x99\ue8edU\xcaLq}\xf3\rd\xb6X\x92a\xe4\x10b\xc9\b\x9b'+\x17\xc0\x15\x9bQ\xc3\xdeN\vT\xc9\xe0\x93\x14Z\xa3\xf6\xe9\xef\xc0ödh\x1f\x04\x1eީܐ\xd8\xdd\xdce[\xa5\x89G\x87\xabl\x97\xd0V-\xf5\xd1YV\xa2\x99@l#\xa7\xa4s\x10\r\xaa\xd57/3XQf\fc>sMxx\xc8\xdao\x8d\xb45a\x13+\x19\xfaK\xb8\xa3\xbc\xf7\xa1\x1fj\x11\xb6)\xaeo\xbe\x81\xcc\x16[2\xf4\x1cB,\x19a\xf3d\xe5\x02\xb8bU\xec\xdd\xd6w\xb3*\x19|\x92bk\xd4\x05\xe5\xea\v\xdeנIƸ\x85CSm\x00\x00\x11\xbeIDAT\xa5\xeafM\xd4Y\x19\xef\x9d\xca\r\x89\xdd\xcd\xee\x8aZ\xf6I\xb5h\x89\xd7\xe8p\x95q\xb1\x1c\xa9\x8f\xceW\x13\xefe\xd7Jj\xa7I\xe7 \xb6\x935\xfb\xe6e\x06+ʌa\xccg\xae\tO\x0fY\xf3\xad\x11t\x13ǛcT\xd9!\x19\xdcK\xd8[\xbec\xb2v^\u0099\xe2\xfa\xe6\x1b\xc8l\xb1%C\xcf!d\x92\x11bOVG\x00owz\xdf\xfaU\xb7\x92\xf2\x96w\xf8$\xc5֨\x9fUT\xado\x9d_\xacI\xc6܊\x96U5D\xeb\x90\xd8;\xd5\xf6z\xa5\\7\xf7\x14\xcf\xdcж\x88l\xa6^\xa3\xc3\r*\x17k\x13\xc0贍\x9b\xfbbk]ћ\xd29\x88\xedd;\t\xcd`=2\xeb}\xbb\xbd\xbd\xb8\xb1\xfd\x8d3\xce&\xfc<d\x83n\xa2\x9e\x94\xba\xac\xf3\x1cop\xc7K\xb8\xec\x862\xfd\xf2=g\x8a\xeb\x93o \xb3\xe5\xfd\xf5d\x9d9\xecZ\x0eᒌ0{\xb2:\x03\xac\xd4\xfb\xd6TG+\x1ex\xa1:Z\xcb%\xe9a\x8dJ\xbfh\xac*\xa9=\xa0I\xc6\xd1ڒ\tuOk\xdd\x14{\xa7ZC\xa2au\xf3\xe3\xfb\xae\x9dP\xa3\xad\x89x\x8c\x0e7\xa8v\xacM\x10\xa3s\xa8n\xdc5\xf3\x0f\xb3-\xa9\x1c\xbc\xecd\x8d\xbe\t\xcd`=2ۯ\xef\xd6F\x92o\xc2\xc7C6\xe8&6\x97\x12\xf3\x05\xd2q\xbd\xc1\xf9\x97\xf0cҤop\xa6\xb8\xf1\xf3\rd\xb6\xf4\xb0gK\xce\xfc\xff\xed\x9d\xcdk\x1cG\x1a\x87\xff\r\x95\xc1\x8c\x91\x05\x8bE\x10h\x1c\x82\x1d\x88\x0f\xc6\x106d/\xc29\x8cN\xc2$\x81\b\x1d,ؕ!\x98\x18\x82ذ>\fYC\xf0\xc5Ɔ\x80C \xe8\xe0\x93M\x0e\x02\x81\x18\x88\xcd\x06\a\x13\xb3X\x84\xb0\x868Ƒ\x8dM\x1c!\xa2\xa1v\xfac\xba\xde\xeayk\xaa\xab\xa7{F\xd5\xf3{ \xc90\xe9\xa9z\xab\xde\xd6o4\x1f\xea'\x1a1\xac\xc1\xaf\xc8(\x81\xa19Y\v#z\xfbӑR\x969\\\x8c\x9b\xea\xf1\xdan\x89̂ޝZ\xfc\x17G#\xd4Յ5\x8c}d\f\xcd\xc9Z\x18\xb9\"\xa3\x8ce\x0e\x97>\x9b\xea\xeb\xda\xda_M\xaf؎IX\x9b\x89\x03s\x84\x91\x11ր\xc8\xf0\x8e|\x91\x01\xf6\x1fOg\xcf\xefَ\x89hn\xb6\x1b\x17\xe3ۣ\x8a\x8cn\r\x88\f\xdfx\xb4.>\xb9[\xe2/1`\xff\xb1+\xde=W\x8f^\u008cL\x8a\x9bԀ\xc8\xf0\x8d\xd3B\x88\x83\x8flG\x81Jќj\xfc\x1c\xdd\x1a\x9d\x14\xb7[\x03\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\x03\x00\xe0\x00\"\xa3\x04\xa1\xe7\xbet\xb2\x0eN\xf1\x1b5\\`u-\x84\xaaE\x86\xd52\xd9C坬\xc1`\x91\\C\xbfX\x8e\x8e\xdd\xc9j3\x9f\xdaG\x88\x19x\u007fau\x1d%U\x89\x8c̖\xc94\xd5w\xb2\x06\x83=\x93\xcf.\x89\xaf\xfe\xe8s\xb4\xd5\xc9j5\x9fZG\x88)`\u007fau\xcdJ\tVתDFf\xcbd\x8aqp\xb2F\x17\x12\xdd\x14\xe9\x8b\x18\xa6`v\x87\x90\xc5|\xda\u007f\x84.\x83\xef/\xac\xae\x99)\xc1\xeaZ\x95\xc8\xc8l\x99L1\x0eN\xd6B\"#\x8b\xf94[d\f\xbe\xbf\xb0\xbaf\xa6\x04\xab\xab_\x91Q\x90eR1\x16NV\x1a\x19\xb6\x89M\v\x82\xd5u\x00\xe5j\xb5\xac\xae~EFA\x96I\xc5X8Y\x83\xc1vw\xd7\xc3ȰMlZ\x10\xac\xae\x03(W\xabeu\xf5,2\x8a\xb1L*\xc6\xc2ɺ\x15?\xd9le\x98ش X]\aR\xaeV\xc9\xea\xea]d\x14a\x99T\x8c\x85\x93\xb53ؽ{\xf7.\a\x91a\x9dش X]C\xf2)W\xabeu\xf5.2\x8a\xb0L*\xc6\xc2\xc9J\xde˰NlZ\x10\xac\xae!\xf9\x94\xabղ\xbaz\x1c\x19\xf9-\x93\x8a\xb1p\xb2\x92ȰNlZ\x10\xac\xae\x11\xf9\x94\xab\x95\xb2\xbaz\x1c\x19\xf9-\x93\x84qp\xb2\x92ȰNl\\\x10\xac\xae!N\xcaUB\x85\xac\xae\x9eEF!\x96I\xca\x188Y\xb5o\u007f\xda&6.\bV\xd7\x10'\xe5*C\xd1S\x8c\xc0\xea\xeaWd\x14b\x99ԩ\xbe\x93U\xfd\x8d\xc9u\xeb\xc4ҸbX]#\\\x94\xab\fEO1\x02\xab\xab_\x91Q\x02\xa5\b=\xf7\x9f\x93upJ٨\xe1\x02\xabktc0\xdf\xda\xd8GF\x19B\xcf\xfd\xe8d\x1d\x9c\x126j\xb8\xc0\xea\x1a\a&\"c\xcc\x18Ud\x80\xfd\xc7(\xac\xae\x88\f߀\x93\x15\xb8S\xa0\xd5\x15\x91\xe1\x1bp\xb2\x82\x1c\x14guEd\x00\x00\x1c@d\x00\x00\x1c@d\x00\x00\x1c@d\x00\x00\x1c@d\x00\x00\x1c@d\x00\x00\x1c@d\x00\x00\x1c@d\x80!\xd2nG\xff\x00\u007fAd\x80a\xb1\xbd\\\x17\xefK\xf9\x91\x98]N_\x83\x00\xf8\x03\"\xa3\x04\x1d\xe7(\x9c\xaců\xa2h\xda'O^\xdfx\xdcI\x8e֍\x933\xa6k\xea\x03\x96Q\x9cQ&\xaa\x16\x19\x9e;Ys;8sIE\t9'~\xb9rtr!\xe3\xc4\xd1e\x83B6Ń>\a\x96H\xcee\xf6\xa55!N\xb7\xe5M!&6l\x87R\xfa\x9c\xa91\xcbB\x88\xc3џ\x06\xe4?\xa3\x8a\xa7*\x91Q\x11'+\xeb\xe0\xcc\xe0\xd5\xcc'\x15%䜸Q\xbfvv2\xe3\x05\x1b~\x10\xdfuo\xdeK.\xd0[\x16\x86\xd2\av\x9c2\xecn\x88ɖܹ)6\x9c~u\xeas\xa6\xc6<i\xb5\xae&\x1b\x95\xf7\x8c*\x9e\xaaDFU\x9c\xac\xdc3\xb6ݫ\x99W*J\xc85\xf1\xef\xe2\x8al\xf7^\u007f\x97\x87\xe4D\xf9\x91a*=\xe3oDN\xec\x88@\x0f\xf2Xd݈.\xb6Ȑ\xdaF\xe5=\xa3\n\xa7*\x91Q\x1d'k/v\xaffIRQ\xebď\x84\xc3\xef\xf9C\x8d\fk\xe9\x05\xb2#6\xa6vK\x8f\x8c\"Ϩ\x81\xf0+2*\xe8d\x95/\x96f\u07b8pafJwp\xb2rU\x9b0U\xbf\xb7k\xf1$\xf5\xa6\x8b\x8cQ\x13\x9f\x13\xb5\xeb\xf1\xf6Y'ޛ\x89\x0e\xf8D\xea\x82W\x93>tS|ߝ\xf0\x81ؔFH\rj\\C\xe75\xb8=\xa3+f\x97I\x1b\xc0\xa2\xe9o9\xa3j'2\x1e\xff\xedf\x14\x19N\xf5\xd6>\xfeG\xa2FUg*\xb9\xa9g+\xa3\x93\xe5ڢ\x9fg\xdd\xc1\f\x9dσ_\x91QA'\xebީ\xfa\xd5\xe6\xa1\xc9/\xe7/S\a'/W\xb5\tS\xb5{\x13\x8b'\xa97]d\x97d\xe2\xc0\xd7Yo~q\xa4\xb3}\xf6\x89\xff\xdb\xfaF4[\xc1\xa5\xdc%\x11\xbc\xf2\xfa\xd0?\x9fo\xceM'\xa7\xfc\xde\xccܝ\xdfL\xaf\x11H\rd\\\xbe\xf3\x14vϴ\x15s\xcb\xd4\x1a\xc0A\xf5\xb7\xacQ5\x88\x8c+\vQd\xb8\xd4\x1b^\xe8\xfb\x9b\xbf\x86jTu\xa6қzd0:Y\xae-ڊ\x93\xc1L\x9dρg\x91Q='\xebZ\xf0\xe1\xc1U\xd1\xfd\xa2B\xec\xad\xe0\xe5\xaaVa*\xb9\x97\xbaH\xa9\xe6S+\x92\x10O,kӝ\xa7ޥzt\xacm\xe2\xe4\x85\t\x11\xbc\xf2\xfa\xd03\x9d'}\xf2\"f]\x90k\x97\xf7\xa0j \xe3\x9a:\x9f\xc0\xefYjŽ\xcbL5\x80A\x99qx\xa3j'2\x9e\x1fz\x1eF\x86K\xbd\xb2v\xb2sR\ue798\xd3\xceTrS\xea\x91\xd1{F\x99ڒ\xdc\xd4\x063u\xde\x15\xef\"\xa3jN\xd6\xd5i\x19\\.\xbe\xfb\xc6I|J\xf3rU\xab0\x95\xdcK]\xa4T\xf3\xa9\x15IH~\x96\xce\xca\xe4M\x1f\xeb\xc4꽌D\xf0jЇ\xfe\xba~\xed\xe4kɋ\xfd\x9d\xfa\x9bW6\xcc\x17\x86\"5\xa8qM\x9dO\xe0\xf7,\xb5\xe2\xdee\xa6\x1a\xc0\xa0\"\x837\xaav\"C.\\\x89\xde\xcbp\xa8W\xd6>\v\xfe}M\xfcN\xceTzS\xa6##}F\x99ڒ\xdc\xd4\x063u\xde\x15\xef\"\xa3\xd7\x11\x199-}u\xb2^\x9ex\x11\xfc\x98=\x8c\xffO\xf7\x94f\xe5\xaaVa*\xb9\x97\xbaH\xa9\xe6S+\x92\x90\xfc,%ۗa\xe2$2\x94\xe0լ\x0fm)\xe3\xc6=\xd1\xf7+\f\xaa\x062\xae\xa9\xf3\nv\xcfR+\xee]f\xaa\x01\fdKX\xa3j\x10\x197\xdf\t#é^\xa5FUg*\xbd)\xf5\xc8\xe8=\xa3LmInj\x83\x99:\xef\x8aǑQ\r'\xeb\xaf\a\xe6\u007f}p\xe2t\xf7en|J\xf3rU\xab0\x95ܫ\xb9H\x89\xe6S+\x92`\x8c\x8c~\x13'\x91\xa1\x04\xaff}h\xf6OLT\rd\\S\xe7\x13\xf8=K\xad\xb8w\x99\xa9\x060(\xfd-oT\r\"cwj#\x88\f\x97zc5\xea\x97\xe2\x0fr\xa6қRߨ\xde3\xcaԖ\xe4\xa66\x98\xa9\xf3\xaex\x1c\x19\xd5p\xb2\xde\x17G\x85h<\xed\x1e\x12\x9fҼ\\\xd5*L%\xf7j.R\xa2\xf94}\xfa\xc8E\x86u\xe2$2\x88\xe0ը\x0f\xe5#\x83\x91\x8a\x92\x1aȸ\xa6\xce'\xf0{\x96Zq\xef2\xf5\x06p\xe5(\xfd-oT\r\"C\x9e]\n\"å^Y{#x\xd3\xe7TC;S\xc9M\xa9m\x14sF\x99ڒ\xdc\xd4\x06+\xeasg\xcf\"\xa3zN\xd6\xfb\x876\xbem=\r\a#\x0eNV\xaej\x15\xa6j\xf7R\x17i\xb7\xde\xd4ú\xa8\x89\xb5\xed\xb3M\x1c}b\x12^ߞ\b^\x8d\xfa\xd0\xfb\xea\x17\xeb\xef\xd5筽RQZ\x83\x1a\xd7\xd8\xf9\x04v\xcfh\xbd\xfc2I\x03\xd8r\xa8\xfe\x965\xaa\xeen\x88\x9b;\xb25\x19D\x86K\xbd\xb2&\xe6\xefn̅jTu\xa6\x92\x9b\xbf\x05\xdf\xfe\xbc\xd2jEoAp:Y\xae-Z\x8f\x93\xc1\f\x9dσ_\x91QA'\xeb\x9dZpo\xed\xbd\x87\x9a\x83\x93\x95\xab\x1ag\xeb\xaeB\xbf\x97\xfaP\xe3z\xd3\x0f\x8bQ\x13k\xdbg\x99xo:\xbcy0\xf8\x14\x96\n^M\xfa\xd0\xe7\a?|\xb0\xddi\xc6\xde\xf6\x8f\x1fԶ\xbbs\xf7HE\xb5\x1a\x92qO\x1b;\x9f\xc0\xee\x19]1\xbfL\xd2\x00ɕC\xf5\xb7\xacQus\"\xf8\x86N{\xaeޖN\xf5\xcaS\xcd\x0f\xff\x12\xabQə\xaan\x9e\x8d\xca\x15\x1f\x05w\xf3:Y\xa6-Z\x8f\x93\xc1\f\x9dσ_\x91Q\x02\xa5\xe88\xb3;Y\x9fM\xad<\xfb\xf3\xcfW?\xbc\xffZƿ\xd4\xe0)e\x15Es\xebT\xf8\xf3sF\x88\xe3\xe4\xf3\t\a\xa9h\x19\xa4\x1b0\xe2rLd?\xa3Jg\xec#\xa3\f\x1d\xa7\x83\x93\xf5V\xf45\x02ٞ]\xef\u007f\xa0\x85\x12VQ\x02\xcf\x1et\x9eS\xb7\xef\xff\xa6\xeeq\x92\x8a\x96\x81ހ\x91\x97c\xc0\xe1\x8c*\x1dD\xc6h\xb9\u007f \xfa\x85\xf8\xe1\x01\xf55\x8aq\"\xbbT\xb4$\xf4\x06\x8c\xbc\x1c\x0f@d\x8c\x96\xf6\xf2\xe4\xca\xda\xe6\xda\xca\xe4ʾy\x16\x19/\xd0\x00W\x10\x19#\xa6}{\xfe\xf5\xda\xeb\xf3\xb7q\u008e\b4\xc0\x11D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x02u\xe9\"2\x00\x00\xfdH\xb9t\x11\x19%\xd8L\xf7\x93A\x93\xa3\xf8\x15\x83\xea\x92v\xe9V-2<w\xb2\xc6E\xde\b\xaem0;\xff\xa3\xed\xe8|8\xf8[՞\x95a3\xe5i\x8aZ\x90\xb8\xdf\x1e\x16Mۡ\xa5Qn\x032B\x9c\xacFr\xb6e\x10\x97nU\"\xa3\"Nָ\xc8?\xbe\x12\xffnݘ\x9b\xe8#\bʏ\x8b\xbfU\xedY\x196S\x9e\x17\x8b\x87\x83\v\xf54&\x17S\xd7ʴ+b\v\xa3\x90\x06\fZ\xaf\xe6d50\x02\x97nU\"\xa3*Nָȭ \xd9ۧOX\x8e̓\xa3\xbf5ٳ\x8c\xcfI\x01ݝ\xcc\xc9\xea\xc2\xe1W\xf2\xf7Ʌt\x9dVEl\x01tK/\xa2\x01\x05\xd4k7Qrm\xb1N<\x90K\xb7*\x91Q\x1d'\xab\x8a\fM,P\x18\x8e\xfeVfϬ<\xecw\x89\u007f;\xab\x8b\x8d5\xf9\xf5\xfcb:2\x8a\xba\xdem?\xba\xa5\x17р\x02\xea\xb5G\x06\x87u\xe2\x81\\\xba~E\x86\xcfNV^\xe8\xa9\xd9AU\x91\xd1\x19\xbb\xf4\xba\xa4ǒ\x11Ή\x83WVz\x84\x9e\xda`\xac>\x94\xacإ\x1c\x17\x9b)\xd9Iݒ\xfaY\xb4g\xda\b\xc4ߪX]\xbc\xfa\xbe\\\xb8։\f\xe2C\xd5z\x9cԻ\xd5\xd9\xf5\x85\xf61!\xa6\rW\xc61\x99pw>=9\xf5\xde\u007f\xdeX\xd7\x0e&\xa5\x1b\x1a\x90<L3\xb5r\x1d\xd2\xea\xe5\xe0+\xd3\x1a\x9b\xfc\xb8\x92\xed\xa3C\x8cƥ\xebWd\xf8\xecd兞\xd4\x0eJ\x8a\xdc\x12\xdf\xee\xfe\xfc\xa9\xf8\\\xab\x81\x8c\x10<\xec\xf8\xe7\xcd\xe3\xbaГ\x0e\xc6\xebCɊ]\xcaq\xb1\x99\x92\x9dTS\xec\xde9\xb6\x12\xecّ\xefv\xe8\b\xd4ߪX]|2\xf5\xf2\xd0v'2\x88\x0f\x95WĶ\xef6\x0fܕ_O|m\xba\xa6\x99\xc1\x84\xfb\xea\xad\xd9\xcb\xeb\xe7\xc2+3\x13H\xe9|\x03\xd4è\xa9\x95\xed\x90V/\a_\x99\xd6\xd8$2\xc8\xf6ic\x8cĥ\xebYd\xf8\xecd兞\xc4\x0eJ\x8a\xdc\n\x9f\a\x96\xda\xfa\x14\xd4:Z{\xb33ѫc\xbaГ\ff\x98M\xadإ\x9c\x80\xec6\xd3d'i\xbd\xcd\xe0YoiY\x1f\x81\x8ac\x15\xab\x8b\xf2\xed\x959\x19\xbe0a\xe5m\xb4\xde\xf6ٹ\x17\xc7\xfa~>řp\x97\xa7\x83'\xd3\xf3\xa9\xc8 \xa5\xf3\r\xa0\x0fS\x95\x19:d\u007f}\xc0UF\x1a+ɋ\x02\xb2}:\xc3w\xe9z\x17\x19\xfe:Yy\xa1\xa7\xb2\x83\xd2\"\xb7\xc4\x17\xdfߞ\x9b|\xac\x1fK\xad\xa3ћ\x98Wu\xa1'Q\x8d\x1afS+v)' \xab͔\xec$\xad\xf7\xc9\xc4Or\xefȆ>\x02\x15\xc7*:\x91qI\\\xea\x13\x19ڂv\xdf9\xda\xff\xe3BƄ\xdb>\x1c=7\xa7\"\x83\x94\xce6@{\x98\xaa\xccС\f\x91\xc18zIc%\x89\f\xb2}:\xc3w\xe9z\x17\x19\xeb\xbc\xe9\xd2\a'++\xf4T\xf5\xd2\"×ү\x0e\\\x93\xfa\xb1\xc4:\xca\n=\xad\xfaP\xeaou(' \xab͔\xec\xa4fI\x9d\xbf ףw\x1c\xd4\b\xfcۋ\x9d\xe6\xbe\xf8\xf4Y\x9f\xc8\xd0\x1d\xa77\x19\xfb-\x851\xe1>\x89rn'\x15\x19\xa4t\xb6\x01\xda\xc3Te\x86\x0ee\x88\f\xc6\xd1K\x1a+\xe9[\x8fj\xfbt\x86\xef\xd2\xf582|s\xb2\xf2BOU/-2z\xf7\xed\xc8E\xa9\x1dK\xad\xa3\x91\xd0\xf3\xba.\xf4\xa4\xde@~6\xb5b\x97r\x022\xdbL\xd5Nj\x96\xd4۳{g\xff\x9e\x1aa\x831\x80E\xcd\xed\xa0\"\xe3_\xb5\xf0\x0e^\x11\xfb\xb4\xfe\xcf\xe3/\x99Q\x12\x18\x13n;Z\xccO\xe9\x17&\xaat\xb6\x01\xda\xc3Te\x86\x0eQ/,\x0f\xe7\xe8%\x8d\x9542\xd4\xf6\xe9\fߥ\xebqd\xf8\xe6d兞\xa4^Rdt\xc6\xd6\xcf?\xf8\x9c\x1eK\xad\xa3\xb5\xa3\x9dH\xday\xab\xa1\x8b7\xd5`\x86\xd9Ԋ]\xca\t\xb0\xd9L\tݝ\xd4,\xa9{\xb3\xb7_\xdbH\x8d\xa0\x89c\xe5\xe3\u007f\xff\x12\xfe\x97F\x86\xf2\xa1\x1a\x14\xb1{s\x17\xe5J#n\"gTeM\xb8\x1f\xccv~\x1c\xdaK=\xefe$\xa5\xf3\r\xa0\x0fS\x95\x19:D\xbd\xb0\xd9+#\x8d\x95\xf4\xc7Um\x9f\xce\xf0]\xba\x9eE\x86\xc7NV^\xe8I\xeb%EF_\xd2m,,\xbfM\x97IG\xa8\x89w\u05fe<\xa1\v=u\x9b)3[@w\xc5.\xe5d\xb1\x992h\x96T\xb9\xfa\xd6t\xf0ޠ\xd6!*\x8e\x95g\"\xff\xdf˥F\xf0f\xfevc\xe9%\xf5\xa1\xaa\x1eS\x1f\xea\x9ds\xf5'\xf2\x97#\xe7\uf13f\xb3\xf7\x1aU\r&\xdc\xed\xfa\xb1\xab\xb7\xce\x1cꍌ.|\x03\xe8\xc3He|\x87H\xbd\x0e\x95\x91\xc6\xeaN\xd6x\xfb(\xa3q\xe9\xfa\x15\x19>;Yy\xa1\xa7VoRd\xf0ՏK\x9d1O\xcc\xde&\xc7j#\xd4.,\x1fI\v=\xe9`\xecl!\xf1\x8a\x1d\xca\xc9d3eЦ\x90\xff\x13\xe1s\xaf\xae}\xa5\xe2\xd8\x1b\xf5k\xc1\u007f\x9aB\x04\x1fF\xad\x04\xdf~!>TV\x11\x1b\xbc\x83\u007f^~,D\xf4\xd5\xee^\xa3\xaa\xc1\x84+_,\x1f\x9bl\xdc7F\x86\xa1\x01\xf4a\xb42\xb6C\xb4^\x87\xcaTc5'kw\xfb(\xa3q\xe9\xfa\x15\x19%P\x8a\xcdt\b\x06\xcd\xe4M\x18g\x8aZ\xb1\xabNv\xa76\xd0_ld\xc2ͨ\x9a~\xfb3#\xb9\x1e\x96\xb92Sc\x87\xb1}<)\x97\xee\xd8GF\x196\xd3a\x184\xf3GFQ+v\xd5ɮ͔\x1d\xa3\xaeF\xd5\\?\xfb\xb9\x1e\xe6P\x99\xa9\xb1\xe5o\x9f\x19ͥ\x8b\xc8\xf0\x94\x01\"\xa3 \x9ct\xb2\xcd\xcdv\xe3\xa2\xed\xa0Aq5\xaa\xe6\xf8\xd9\x0f\xc8\xf10\x87\xca\xd8\xc6\x0ee\xfb2\x82\xc8\xf0\x92\xa7\xe1\xdb]\xb6\xa3\xca\xc5\xc5f\xba+\xde=W\xcf\xf8\x9b\xf9\xd0x\xb4.>\xb9k\xaf=M·e\x83o\xec\xbe\xda>D\x86\x97\x84ow=\x96\xa3\xc5\xc5fڜj\x18\xff\xdabT\x9c\x0e\xde\x04\xb4\\\u0086!\xe7òah\xec~\xda>D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x01D\x06\x00\xc0\x81\xff\x03&\xf2B\xcdI\x1b+\x96\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"analysis/typeinfo-src.png": "\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x02\xc1\x00\x00\x01\xb3\b\x03\x00\x00\x00\xf9m:\x11\x00\x00\x00\x01sRGB\x00\xae\xce\x1c\xe9\x00\x00\x02\xfdPLTE\x00\x01\x00\n\x03\x01\x05\a\x03\x02\r\x14\n\f\b\x10\x12\x0e\x0f\x13\x1e\x1b\x1a\x14 \x1f\x19\x1c \"\x17!;!# #$\"$%#&'%'(&+)\x1e()'\x18-T*,)/,!-/,12053'35386*6758:7<:.<>;>@=CA5&CxAB@EFDIJH\x00g\x00KLJ\x00j\x026NzNOM0R\x95\x06m\x06UP?PRO>V\x82\x0fq\vTVS\rr\x17\\WEVXU,`\xae7]\xad\x15w\x1c[]Z8`\xaa\x19y\x1e;b\xac_a^=d\xae?f\xb0*{!bdaSe\x84)}+Bh\xb3efdDi\xb4ghfLj\xafpiQEm\xb1ikh0\x820Ol\xb2Ip\xb4lnkTp\xa3Kr\xb7npm6\x869Nt\xb9zs[Wu\xb5>\x89=strZx\xb9vwt]{\xbbG\x8eHy{xX\x80\xbf^\u007f\xb9\x85}ea\u007f\xbf}\u007f|O\x93N\u007f\x81~c\x84\xbeW\x95V\x82\x84\x81m\x87\xbch\x88Ð\x86h[\x99Zj\x8ać\x88\x85q\x8b\xc1\x8a\x8c\x89`\x9dd\x96\x8cnt\x8e\xc4z\x8f\xbf\x8f\x91\x8eg\xa1hy\x93\xc9~\x93\xc4x\x95Ē\x94\x91\x81\x95Ɵ\x95w{\x98ǃ\x98ɂ\x9aė\x99\x96u\xa8v\x86\x9b̀\x9d̙\x9b\x98\xa5\x9b|\x85\x9eȂ\xa0ϙ\x9e\xa0\x9c\x9e\x9b\x89\xa1˞\xa0\x9d\xab\xa1\x82\xa0\xa2\x9f\xa1\xa3\xa0\x81\xb0\x83\x91\xa5ʕ\xa5Ď\xa6ѣ\xa5\xa2\x91\xa9Դ\xa7\x83\x95\xa9Χ\xa9\xa6\x8c\xb4\x8a\x94\xac֪\xac\xa9\x99\xadҟ\xaeλ\xae\x89\xad\xaf\xac\x9d\xb1֯\xb1\xae\x98\xbb\x97\xa3\xb3ӡ\xb5ڧ\xb6ֱ\xb5Ĵ\xb6\xb3\xa3\xbf\x9d\xac\xb7\xd2ķ\x92\xaa\xb9ڢ\xc1\xa4\xb7\xb9\xb6\xb3\xbcĭ\xbcܺ\xbc\xb9\xa6Ũ\xb1\xbd\u05fd\xbf\xbb\xb1\xc0\xe1\xb8\xc0կǫ\xcd\xc0\x9a\xc0¾\xb7\xc2ݻ\xc3ؽ\xc4ڲ̷\xc4\xc6ú\xc6\xe1\xc0\xc8\xdd\xc7\xc9żκ\xd8ɝ\xc6\xca\xda\xc0\xcb\xe6\xc9\xcc\xc8\xc2\xcd\xe8\xbf\xcf\xe2\xcd\xcf\xcc\xc4\xd0\xde\xcb\xcf\xdf\xc8\xd3\xc1\xc8\xd0\xe5\xe1ѥ\xd0\xd2\xce\xc8\xd7\xca\xcb\xd3\xe9\xd2\xd4\xd1\xd2\xd3\xdd\xce\xd6\xdf\xdfש\xce\xd6\xec\xcc\xda\xce\xe6֪\xd6\xd8\xd5\xcb\xdb\xee\xd5\xdc\xd1\xd3\xdb\xe4\xd6\xda\xea\xd9\xda\xe4\xda\xdc\xd9\xd2\xde\xec\xd9\xdd\xed\xdc\xdd\xe7\xd7\xe1\xdc\xe0\xde\xe2\xdd\xe0\xdc\xdb\xe0\xe2\xf0\xe0\xb3\xd6\xe2\xf0\xdd\xe1\xf1\xe0\xe2\xdf\xde\xe3\xe6\xe0\xe4\xf4\xe3\xe5\xe2\xe1\xe6\xe9\xde\xe7\xef\xe8\xe5\xea\xe5\xe7\xe4\xe6\xe7\xf2\xe4\xe9\xeb\xe7\xe9\xe6\xe2\xea\xf3\xeb\xee\xea\xec\xed\xf7\xe6\xef\xf7\xe8\xf0\xf9\xf0\xf0\xfb\xf0\xf2\xef\xf4\xf2\xf6\xef\xf4\xf7\xf4\xf6\xf3\xf2\xf8\xfa\xf8\xfb\xf7\xf6\xfb\xfe\xfd\xfb\xff\xf9\xff\xff\xfe\xff\xfc\x11\n֍\x00\x00 \x00IDATx^\xed\x9d\r\\T\xe7\xbd\xe7\xef\xb2\xcd&\xbb\x0f\xcc4w.s?e\x8a\xbd\xbc\xe8z-[\xb2z>\x8c#\xd6-h\x16#,6\xd7\x17\xbc\x94+\x95h\xae\xa2\xb7Jbȍ\x8e\x91\xd8\x05\nac\x12r'\x161vg\xbd)+\x91\x98b,\ti41\xb9\x96H,-\x9b\x17\x92\xb6c\x1a-&\xd4\x13\x93[\xaf\n\xfd\x9c\xcf>/g\xe6<g\xe6\x9cy\x81\xe1\f\a\xfeߴ\xe3\x993\xcfy\xce\x19\xf8\xce3\xff\xf3\xf6\xe3Ϥq#\x02@\xe2\xf9\xb3H\x9e\xea\x13\xa9k\x000\x000\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01sc\xb4\xc1\xde\xde\xc0d\x8f\xdbC\xff\xf5u\xec\xaf\xdb\xdf\xe1\xd3[\x02\x00\xc2a\xb0\xc1\x83\xee.\xff\xe4P]G#\xfd\xb7\xb1\xb5\xb7\xafw\u007f\xe3\x90\xeeB\x00\xa0\x8f\xb1\x06\xf77+\x06{\xda\xfb\xa8\xc1\xde\xe6a\xfc8\xdcܡ\xb7\x10\x00\x84\xc1P\x83\xbdno]\x97<\xddS\xef\xeb\xa7\x06\xb7\xb7\xd2\xe7\xad\xed:\v\x01@8\f5\xd8\xe7\x13\x1b\xbb\xe4ɺ\xd3b\xbf\\Ex\x87\x86\x87\xbcPE\x00\xe3\xc2P\x831~\x83=x\xc8e\x06\x8b\xbev\xb7\xdb\xdd\x06{r\xc0\xb8H\x90\xc1\xbd\xf5>\xbf\xc1\xc3\xedͽ\xfd\xbd\xcd\xed\xc3\xe1\x16\x03\x00\x1d\x12c\xb0\xaf\xaewdd\xa4\xafq\x04Ow4_\x14aO\x0e\x18/\x891\xf8\x8c\xdbO\xbfX\xd7M_\xe8\xae\v\xb7\x18\x00\xe8\x90\x18\x83\xc5ABO\xfd\xe0\xa0\b\x06\x03\x13\"A\x06S\xe4\xa3i\xb4\x8a\xb8\xd8\fGӀ\xf1`\xa8\xc1\xbe\xfe\xfezo\xff {2\xd2\xdfS\xdf?\x84g67\xf7\xf4\xf547\xc3\xc1\b`<\x18jp\x17\xab}\x99\xab\xfdd\xb2\tO\fw\xee\xafo\xed\x84C\x11\xc0\xb80\xd4`\x00\x88;`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\xa6`$R\x83\x99\v\x18<\x0eF\x86GF\xf0\xff#5\x8b\x17\xfd%ihI\xa4F3\x1608fzggf\xe6eef\x96\x1bu=hf\xa6\xbb\xbd/R\xa3\x19\x8b\xd1\x06k\xa4N\x8dt\xb7ֵ*\xb3\x8d\xe2!A8\xa2\xf3\xd2y\xa7\xb0J\x14\x8f9\x05\x86S\xd5n\u0602rs\x93l\xb9s\x936\x1a\xa3p\x0fj\x8b\xd4d&c\xb0\xc1\x1a\xa9S\xa2\xa7\xbe\xbb\xaf+\x90\x84\xa2\x857܋\xb1\xf2\xe2\xab\xec\xdf\xf7O:[t\x9a\\y\xf9\x01\x97(>)\x9c<y@8p\xf2\xe4\x82'\xf9\x17}\xb7l\x93\xa4\xdek\xd2\xe8\x97\x16E\x11q\x11˦\xeb\xb4\xedBp\x13l\x18\x8c5X+u\xaa\xbb\x8e\x88p\xba.̀6\xb7P\xff\xb5\x98\xa9\xd8\xee\x9fr\xe9\x19,\x8a-\xd8\xe0\x03NQ|UxY\x14\xf3\x0f\xf0/\xf92\x93\x92\x92\xc4¤\xa4/UGap,\x9b\xaeӶ\x13uj\xce\a(\x86\x1a\xac\x99:\xe5aߑ\xfc\rt\xc1̎A\x83\x88\xac\x8b\xd6\xe0\xcb\xe7e\x83\xcf_V\xbd\xd6_\x96\x85\r\xbeeѶ\xde(\xee+\x89e\xd3uڂ\xc1a1\xd4`\xcdԩV/\x9d\xd1\xea\xd1Yȃ\x18\xb3\xd9\xe4\x06\xb1\x1a?6\x97\xa1\x94ڕ\x0e\xfb\xa2ӴMc\x8e-C\xbdc\xf5\xe9\ngCqы\xbb\v\xaa.\xe1gW~T\x91\xbfj7\x9e:&\x97\xb6\x15\xa4\x8dk\xdf\xeeU\xf9\x9b\xde'\x93W\x0eT\xe4\xaf;p\x85L\xbe\xbf\xa3\xa8`+\xa9\"\b\xd4`\xb6X\x83\u0602\x1f\x8f<$8\xff\xd7\u007f\xc3\x06\xffǮ\xc1a\xa5_\x15\x1dy\x0e\x8b=/]\xb5\xe9\xdd)\bm<\xbd<ݖ7\\\x86\x92\x1b\xc53\x16\x94I\x1b\x9f)\xb4[\xd2\xf2\xfa\xf9\xb6Ax\xc1\xe0p\x18j\xb0\xa8\x95:\xd5\xd1H\x86\xb2\x8b\xf5\xfbu\x96\xf0ux3r\xbd^\xb2\v\xe8\xebp\xac\x19\x14\a\xabS;|\xbdM)(}[u\xba\xad\a7)I.\xf3\xd4\xdag\xab\x0eo\xbdX \xec\xae\x12\xee|r\x05)\x01v\n\xbb\x8f\x1f(ZwE\xbc\xf4\xf2\xc9UU'O\x9e|\x9b4q\t\xab\x8e\x1c[\xb1\x95L\xeet5\x1cop\xed\xc0S\xe7\vV=sl\x93\xa06\xf8\xd2\xcb\xc5\x0f\xfcZ\xfcuK\xc1\xc9Ko\x1eq\n\xff\x19\x1b\xfc\x1f\xfe\xf70\xd7/O\x17*\xd9\xdf\ueda3aզ77\xa5g\xa4:ʗ\xa3\xbe~\xaf\xa5\x1a\x8f\xac%V\xd2\xd8k\x9b]\xd3^\x8dj\xf8\xb6<Ã\u07b9vc\xf6\x18MJ\x82\f\xe6R\xa7|\xf5\x9eA_\u007f\xab\xbbY\u007f!\xe5뵚\fQ%%dҚ\x8e\xbb\x18r䐡\xae^$_\xb6\xea\x1e\x8av\x88Džc\xe2\xce\a\xc9\x10\xfa\x8cHl\xa4\xc7\x14\xb8*\xa2\xe8\xb7X\xc2\"<u\\8\xee\u007f\xacZ\x85\x87\xd4+k\xd5\x06㲂\x8c\xda;v\xd2\xc5J\xff'1\xf8\u007f\f\xab\xfb\rඓ\x8fdm*}\xc2U\x06\xb3\xd1|\xbc\xc5\xc4F+6X\xac&\x06\xfb\x1cy\x17I`\xd1PP\xdb\x00K\xf0\xb0\xac\xf7\xed\x04\x10\x12c0\x9f:%\x0ey\xdcnw\xa7\xa7U\u007f!\xe5Wۇzċ\xa94Zº\x81<֢!q٬a\x82\xa3D\xb5P\xd1\x11\xec\xd6%q\x1f\x1eXw\x94^\xfe\x14SL\x05\xe4\f\xc6rӊWܹ\x96\xceX\xf5\x80x\x81J)6\x04\x1b\xfc\xfe\x827\xc4\xcb\x05/\xd2\xc5\x1a\x9aI\x15\xf1\xd7\x17\xd4\xfd\x06\xe8s\xa4\x97\xb9\xbbEV$\xf3\x06[\xfd\au\x15\x83=\xa8[YP\xcb\xe0\xbe6w&\x8c\xc1\xe1H\x8c\xc1|\xea\x14\xc674\"6\x869d\xc4\xfdj\xf3\xca\xc56:\xc61\rp\x91\xd8%f\xc9%\xa4\xfa\xbcU\xd1q\xf1U\xa7H\r^+W\xbf\x9b\xc8\xfc\xa0=9jp\x05}E\xdcT\x81\x95=)\xfa犜\xc1\xe2\xa6}\xe2\xf1\x82\xcbl1f\xf0\xab\xea~\x15\x86܅\x99(\xad\x86N\xf3\x06\xcf\xf5O)\x06\xd7\"\xceN\x9d=9\xa8\x83Ò\x18\x83\xf9\xd4)6X\x9df.kC\u007f\xb5ut\x04\xf3؇Y\x11!Z\xcbȣ\x1b+\xb0|V\x17eP\xb5\x101\xd8%\xcac\xf0\xab\x94\vd>5\xf8\x99wE\xde\xe0\x9d\xa5\xa4\x94\xbdR\xbaS\xfc\xad@\x0f\x9d\xed\f1\xf8\xd8\xd2\xcb;\xd9X\xebڭ\x8c\xc1\\\xbf\x01\xba*ER\xf7\xda\xdc\xe4\t\xb7銠\xd4\xe0\x8d\xc4\xe0\xf6\x901\xb8.\xe4\xec\x1b\x1c\x8b\bK\x82\f\xa6\xb0:\xb8\u05cd\xcd\xf35yu\x16 \xe4\xe6b\xe7Y\x99;l\xf7\xd8Y>\x955\x8dT\x95\xb3\xf0Km\xec\xa5\r\xdbT\vq\x06\x1fg\x95j\x03=3QU%\x8a\xbf\xa63\x14\x83Y\x83#\xa4\x0e\xae(\xc6>\xbe\xed\n1\xf8\xf2\x9dǖ\xd2\"Bt\xad\xf0\xd7\xc1\xaa~\x03T\xb3sh\xb9k裲\xe9\x8a\xc16\xec\xf8\xc8\\Z\a\xa7\xe5\x92\x0fpYYP[\x1e08,\x86\x1a\xac\x99:u\xda\xdd\xd5\xd7\xdd\xe8\tW\xebU[kZ\xe7\xdb\xd8\xe0T9\x8b\x15\x11\xa2\x15\xcdn\xae˰\x9f!\xf3в\xfd\xad%\xa8\x91_\xe6ͥ\a.\x1dq\xbeyiG\xd5\xfbX\xe3\x05;\x8e\x1c\xdb\xc9|kq\x1d8V\x95\xff\xae\xf8\xeeI\xe7\x03/_y\xe3\x01\xe7I<\x1e\xef\x10\xf6\x1d\xdb'\x90c\x11o\xe6\x17\xb74,\x15\x9cϼ\x89\x9f\xbcq@8 \x9f\xc2\x13\xf7\x95\x16|J'\\\xc2\u007f!\x06\xff\xdfau\xbf\x01\xaa\x91\xadڃ7\x87~&\xfd\x9b>\xdcI\x0f5\x9c\xa1-r\xec۶堔\xfa^\\\"ܞ\xe9\xf6\x94\xa1:\xbem\x10pN.,\x86\x1a\xac\x9d:ս\xbf\xde\xc3}\x97jp\xb1\xccn˕\a\xa2\xd3h%\x9b\xb0\x96\x97\xa4:\x96\xb3ڣ-\xd7n\xcfU]=pe\x85 \x1cY,\xe4\x1f\x11\x04r\xb8\xecx՝\x05U\xc7\xe9+\x97w/uU\xbdJ\xaf\x8b\x10\x9co\xe4\xe3LJ\xc8\xf1\xe0\xb5\xf9k\xd9\xf1\xe0\U000db596\xee{\xc6I\xe6^\"\xaf\xe6\xcb5\xc2\xdb\u0083lµ\x9b\x1e\x0f>=\xac\xee7@cn\xb5Ò\x96˾T\xfc\x9bޝLK\xf5<:\xf3t\xae-5o\x03Bd\xe4=]\xe8H\xcdiU\xb5\rb0\xa5\xb0{а\v\xe1L\x87\xa1\x06\xc7\x03\x9fU\xae7؞\x9cq\\r\xb1\"BޓK9\x1d\xc5\x19\xb9\xf8К\x19\xbc\x97\n(\x98\xce\xe0f\xb9\x880\xdc\xe0#w\xb2\"\xc2x\x83\xf10\xdc\x1df?w\x86c.\x83\xab\xbd\xe2|\xbf\xb8\x11\f\x16&\x91\xbf\"u\xf0_\xf3s\xc2n\n0\x99\x98\xca`\x1f\x9a]\x96\xc6.\b\xeb\xf7ZJ\xc2\xee\xa2\xeb\xd97q\x9c\u007f\xf5\xe7\xd8\xe0\u007f\xff\xe7\u007f\xedT\xe6\x85\xdb\x12`R1\x95\xc1b\xb5-W\xben\xa0\f\xef\x16Y΄o\x1dGZ\xf2\xab\xdefS\x0f\t\xff\xc9\u007fu\xe5~\x03\xeb\b@\x0fs\x19<\x15\xa0W\xb8_\x95\xa4\xd1[\x96Dq}00ـ\xc1\xb1\xe2C(7\xf7\x96\xb4ܹI+\xc1\xe0)\x00\x18\x1c+\xc3^\x87\xdd>\xcbn\xb7\xcf\xef\x82+n\xa6\x00`p\xcc\\\xec?s\xfa̙ӧ\xfb@\xe0\xa9\x00\x18<\x0eHV\x84\x81y\x11@8\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06'\x8c͛\xb5&\x81\x181\xda`\xf9^\\_=\xbdβ\x9e\x9e\xd5\xeao\xado3͕+-\x82\xf3\x18\xfe\xe7x\xbe\xa0\x9f6\x11\x15\xff\x92}\x9f\xc6$\x10+\x06\x1b\xecO\x9d\x1arw\xf7c\xe8\xc5\xee}u\xde3\xdeЛk\xa6(\x17v\xe4W\xe1\u007f\xaa\\;\xd4\xf7\x16\x05Ҭ\xa2\xe5\x9e9\xefhLF\xcbs\xafL\xb4A,ĵ\xb38c\xac\xc1\x81ԩ!w\xc0ؑ&r\vBG\x93Y\x0eN\xed۔\u007fA\xbc\xe0ڴ/h\xbe\x92f\x15\x15o)\xe3\xee[\xe3\x18\x82\xef\xfa\xeeD\x1b\xc4B\\;\x8b3\x86\x1a\xac\xa4Nq\x06\xf7\xd2\xc44_\x9d\xf1\xe9\x95\xe3cߎ\xaa#\xe2\x8f6\xed\b6x]l\x06oV\xc6\xddͱ\x0f\xc1\x91\x9d\x8a\xd8 \x16\xe2\xdaY\x9c1\xd4`%u\x8a3\xb8\x9d\xdd\x1d\xe4\tw\xab\xe7\xe4prS\xb1\xf3\xceM\xc5W\x82B\xa5\x9e\tdQ\x89\xe7\xb7\xde\xe9,\x92\xa7\xfd\xec\xdbq`\xab\xb8\xe9\x006\x98\xe6\xb7\xcaI\xad\xf2U\x964\xcd*\x90E\xf5\xa6S\x106])\x16\x84\x02u\xf2\x9a\x18~\b\xfe\x87\xec\xecG7/\xfc\xc6w\xdf\x12\xc5W\xb2\xb3\xb3\xf7\xbcu\xcf\xc29\xab\xc9W\xd4Swͻ\xeb)\xfc\xef\xff\xc9f\xdcE\x9b\x1fZ=\xef\x9b\xf7\xb1\xf3\x83o}\xf7\x8e\xec;\xfe\xf6\x1du\x83\x17V/\xc43\x17\x8aA\xf8\xdbr\xfd\xe2\x15\x1f\u009b\x93\xfd-:\xf9\xd4}ߜ\xb7\xfa\x97zkSm\x99\xce*\f\xc1P\x83EQ1\xb8}\xbf\xbb\xa9\x83\xfc\xdc[\xd9}\x8c\x1da\x12O&\x877\x16\xec8r\xfc\x99;\x85O\x83C\xa5\x8aZ\x9e,\xa0YT/\xe6W<y\xbcEPEWb\x83\xdf\xcf\xff\xad\xeb]l0\xcdoeI\xad\xaa4\xab@\x16Օ\xd7[\x84\xd7\xc5\x1f-\xf8\xd1\x1b!+ߜ\xfdK\x8dIƿ\x1c\xca\xce^\xb8g\xcf\xc2y\xaf\x88\x17\x0f\x1dZ\xf8\xcdy\vﻇ\xb4\xd9<gϏ\xf7̹\a\x8f\x04/\xbc\xf0\xcd\xd5/\xbc\xf0\xc2[l\xf1\xfb~\xfc\xe8\x1dw\x11ß\x9bwף\xcf\xed\xc9~T\xd5\xe0\x95\xec{\x0e=\xf7\xd4\x1d\xd9AUZ\xa0-\xd7\xef;/d\xef\x11şn\x9eö\xe1\x8e=\x8f\xce\xfb\xae\xde\xda\xf8-\xd3Y\x851$\xc8`\x9f\xbb\xb1\xa7\xafw\u007f\xf3\xc5\xc0\x9c.՝\xc6Fp\xa0\x88\xdc6t\xa0\x80\xdc\xdfɇJ\x15\xe01w\aɢ\xba\\\xbc\t\x8f\x9d\x97\x8f\xa8w\xd9\xf6\xed\x10\xd7>P!\xd2*B\xb9_\x9f\xab\"\xf8,\xaa+;+.\x14\xaboƧ\xfc2{\xb3\xc6d\x809\v\xf1g\xfb7\v\xbfM\xa6\xef\xca^\xcdª\x9e\xcb~N$\x8f?\xa6s\xfd\xdf\xeb?\xc6\xc3&\xb6\x8e<^\\\xb8zX\x14\x87\x0f\xfdF\xd5\xe0\xa9;\xe8\xf0=O\xbd\x06\xae-\xdf\xef\x1cl\xb0\xb8g\x0ei1\xe7\x1b\xf8Cs\xcf\x1d\xa2\xaa3nmܖi\xaf\xc2 \x12d\xb0\xd8C\x8b\xdf\xfa\xce@v\xa5\xd7\xf01\xf8ݢ\xd2\xddϼq\x85~\xc1\xf3\xa1R\xc4c9E\"t\xec\xa4\x06?)<\x19\xc6`U\x16\xd5\xe5u+6\xa9\x83\x01)\xff\x90\xfd\x96\xc6d\x809\xb4\xaex*\x9b\xb8x\xd7\x1cy\x88\xde\xfc-\xfaϷ\xa8\xf0\x01\xa7\xbe\xbb\x90\xfcQ\x8f\x91\x85\x9b\x89^\xdc!\x83@\x83_ޱ\xf0\x1f\x9ezE\f\xba\x1a\x9fk\xcb\xf7\xcb\x1b\xbc90\xa9\xb96n˴Wa\x10\x892\x98AJ\x87v\x16l\xd7ڮ\xd5|R\xb9\xf0\xcc\xf6U\u008a'\xa9`|\xa8\x94([y@\b)_Ej\xf0\x85}\xbf\x0ec\xb0:\x8b\xeaH 3\x85\xe3\x9d9\x9b5&\x15\xa8H\xe2\vԲ\xbb\xee\x92g\xaef\x1a\xfd-\x1b\x99\xfdN\xdd%W\xa9\xf8\xf9\xa3\xd9\x17\x95.\x94\x9d\xaf\xdf<\xf5\xddoe\xdf\U00068a02k\xcb\xf7\xcb\x1b\xacLj\xae\x8d\xdb2\xedU\x18D\x82\f\x96\xb5\xf5zHf\x0f\x1d\x8e݆\x1f\x8bxu\x1fv\xf7\xc2\x11\x17-s\xb9P\xa9\x80\x95/\nZ\x87xI\b\x10F1\xb8\x813\x98\xa4Y\xa9\xb2\xa8\xde/j(\xfemH\x1f\xf7)\xe3\xee}\x1aCp`\f&?\x99\x80=\x9bٞ\xd2Be\f~\x8a|\xcf/|\x85Bˁ\xe01\x984x\x85\xf4\xf5\x9bCs\x9e\x12y\xb8\xb6|\xbf\xe1\f\x0eZ\x1b\xb7eګ0\x88\x04\x19\xec\xa1i\xc1C\xf5\xdd\xe4x0)#\xbc\xc6\x1f\x0fn\xa1\x91\xabb\xd5\x03\xe4\x91\v\x95\n\x18|\xa9\xa8\x8a\f»w\xd3\xf9}\xdb\xd8my\xbc\xc1\xf9\xf8\xe1J\x0538\x90f\xc5gQ]\xaeh\x11\x1f\xa8\n.#\"\r\xc1\xe2\x9c;H\x81\xb9p5\x99\x0e\xaaA\x0f\xb1:x5~\xed\x1d2\xe39V\x93\xee\xc1\xbe\xf9\xee \xb5\xadx\xdf}\xaa\x06{h\x99+\xaeV\xaf\x87k\xcb\xf7;\x0f?\x1f\xf9v\x88\xc1Zk\xe3\xb6L{\x15\x06a\xa8\xc1J\xeaT\x9f\xbb\xedt_W\x1d\x1d\x89\x13uN\xaeE\xc8o9vl\xa7\xc0ĕC\xa5TYT/\xbaV\x1d8\xbe\x9b届\x8bX\xe0\xceowT\x91\xd4\xc0w\xabv\u0875\xa2\xe8ɖ\n9\xa1ʟf\xc5eQ]~\xf9\xa1\xa2\xf7\xc5\xf3\x05\xbb_V\x97#\x91\x86`qN\xf6]\x87\x9e\xfa\xe67\xde\x12G~J\x8f\x03\xb06\xf7d\xdf\xf7\xe3\xfb\xb2\xef\xa1\xd3{\xe6<zh\xf5\xbc_\xd2\x1e\xee9th35\xeb\xb99\xdfz\n\xb7xJ\xd5`O\xf6\xbc=?\xc6\r\x9eS\xaf\x82k\xcb\xf5\xbb\xfa\x8eG\xf7|;;\xfb\xd0+０\xbd\xf9\xa7\xe2+\x9b\xb3_xG{m\xfc\x96\xe9\xac\xc2\x18\f5\x98K\x9d\x1alo\xaa\xf7\xf4\xb0\xd9\xfdmu\xad\t\xb8.\xe2GU-\xc5\u03a2*9\x89G\x0e\x95ReQ\x89oo/^\\q\x8c5\xa8\xb7\xd30\xca\x16A \xd5\xc6\x03\x02\xb9.\xe2|\x95k\xf1\xa6\x06\xd6֟f%*YT\xc7q7\xbb\xc5݂\xb0\xe0E~\xc5\xef̻Gc\x92g\xce}\x9b\xe7\xddq\xcf;\xec\xa8+\xe6o\xd9\xecG\xe5㶘\xe1\xfb\xbe1g\xf5O\xe9\xe4s\xab\xef\xf8\xc6j:0\x8bo}w\xe1\xbco\x1fR78\xb4z\xcf\xc2\xec;V\x87\xd8ŵU\xfa}k\xf5\x9cy\xab\xf7dgo\xdeLV\xfb\xca<\xfc\xb0Y{m\xfc\x96\xe9\xad\xc2\x10\f5x*\x13\b\x95\x9a|\xf6d\xff\x8b\xc6$\x0fۓ\x03\xa2\x01\f\x96\t\x84JM>\x91/\xab\x04\x83\xa3\a\f&\xb4\xbcx\xa5j\x82\x17K\xc6\x1508z\xc0`\xcc%\xa1\xe2\xa1\"\xf5\x99\xb7D\xc2\xf6\xa2\x80\xe8\x00\x83\tJ\xa8\xd4T\x80\xeeEi\x1d\xa2\x004\x00\x83\x01s\x03\x06\x03\xe6\x06\f\x8e+I\xe6\"\xd2\xdb1\x03`p\\I\xfa\xc8L\x80\xc1@0`\xb0\xe1\x80\xc1q\x05\f6\x1c08\xae\x80\xc1\x86\x03\x06Ǖ\xa8\f\xe6\x1b=rk\xd0\"!3\"\xa1\xd7<\x8an\xc0` \x98\xa4h\xcc\xe1[\xdc\xf6à\x17Cf\x84!)\xf0\xa0\xf9b\xe0\x90\x83N\v0x<h\xa5N\x05\xe6N-\xcaPr\xc8\xdf8\x969cA\x99\x9a/De0OH\xebX\x16\x8f`p\xb8Wً\x81\xedf\x99\x01\xa6\xc4`\x83\xb5R\xa7\x94\xb9S\x03o\x17\xfb\xb7\xdfk\xd1\xfd\x93u\x9d%V\xcd\xf9\xf2\xc0w\xeb/\xb0\x1f\xbf\xba\xe5\xe7I\u007f\u007fۿ\xbb\xed{D\x96G\xbe\x9ct\xdb\xdf\xf8\xc5\xc1\xff\xfbǿH\xba\xe5\xeb?\xff\x88\x8d\x90\xa4\xd5\xdf˯\xa9f$\xfd\x9d\\S\xe0\x8e\x92\xbe\xfc\xc3\xefݖ\xf4\x95\x9f(\x9d\xb1\xf1\xd5\xdf\x15\xd7\xcd\xf7Ȅ\xdf\xe0\x9f\xe8o\x8cb0\xcb\f0%\xc6\x1a\xac\x95:\xc5͝\x1a\xcc\r\xfc\r\xfa0\u007ft\xb1Z\xcf`:\xea}\x8d\x88\xf2\xbd\xff\xfaQҭO\xfc\xea\x89[\u007f\xf0\xd1G?\xfc\xf2\x0f\u007f\xf5\x93\xaf\xfd\x8db\xf0mO\xfc\xeag_\xff:k\xfdȭO\xfc\xe2\x89[\x1f\t\xbc\xa8\xccH\xfa\xea\xcf\xe4\xb9_\xf9ɯ\xfe\xfb\x97\xc8\xc3\u05f8\xce\xd8\x18\xec\xef*\xb0\xd4\x0f\xe8Z\x03c\xb0\xfe\xc6\xf0UD\v\x18\x1c\x05\x9a\xa9S\xdcܩ\xc1\xec\x89\x1b\xfc\xc4m\xf8\xe1\xab\xff\xfcQ\x12\xd1\xf2\x91\xaf\xe2iR\xdd\xfe\xec6\xc5\xe0\u007f&\xcfoa\xad\xff\x92\xb6\xfaK\xc5\xe0\xc0\fڌ\xce\xc5C\xef\xcf\xe9×\xb8Θ\xc1\xfe\xae\x02K}\x85N\x04\f\xd6\xdf\x1808V4S\xa7\xb8\xb9F2\x9cf\xd9\xe0px\xcbRsi`Sc\x8e-\xa3\x1cOy\x10c6\x99i-/ϰ\xe5\xb1-u϶e\xd1ی\xc4\xfe\xe5\x0e{\xa1n\x15\xc1\xb4\xfa\x8bG>\xfa\xc9W\xf04\xf9r\xff9\xb6\xeb\x16~\x97*P,\xcb\x13\xb7\xf8[\xc9\xf3\x94\x19I\xbf\xf8H\x99\x1bx\bt\xa6̥\xb3\x03+\xa3\x13\x81\xf9\xfa\x1b\x93t\x80ރ\xfa\xfe\x8e\xa2\x82\xadPEDIh\xea\x147\xd7P\xbc\xa9\xa8|>\xb2oK\xab\xc1OJ\x92\xcb<\xb5\xf6\xd9#\xa2\xafÛ\x91\xeb\xf5\xb2]K+\xcaljM[B&K\xac\x1b=\x1b\xad\xcb\xf1\xd4\xe9Ԍ\xfa\xd6<\x14\xde\xe0\u007f\xfc\xcaG\u007f\xf3\x8f\x9c4Ir5\xe0\xb7*Z\x83\xb9E\x94\x87@gQ\x1a\xac\xbb1I.r\xdf\xf5\xf9\x82U\xcf\x1c\xdb$\x80\xc1\xd1\x11\x9a:\xc5\xcd5\x96\xb4\xe5x\xc4\xf5\x88%+\xc9\xc8[\x8fgt\"z쁫\"\xc8\x1fq.\xb1\xe3\xa96\xd4\xe6\u007f̝\x85?w#Y\xe1\r\xfe\xe8\xd6\x1f\x92\xaa \xe9\x11\xfc\xf0\b\x1e\xff\xfeR\xdeQ\xf3[\xa528L\x15\xc1-\xa2<\x04:S\x1b\xacWE\xe8oL\xd2q\x128P\xb5\xea\x12ޕ[\v\x06GGh\xea\x14?\xd7PҚ\xb1\xb3>\xb1r\x99(.\x9b5Lp\x94\x90\xf9\x9c\xc1XnV\U00056c03g\x99%\xe2\x10\xa2\xb5\xc4F]\x83o\xfb\x01\x91\xe3\xef\xd8ξ\u007f\xe7\xe9\x89[\xbe\xf7\xf3_=\xf1\xb5\x80x*\x83\x1f\xa1\xad\x1e\t\xbc\xa8\xcc\xd068\xd0\x19]U\xa0\xab\xc0RA{r\xfa\x1b\x93$\xaez@\xbc\xc0\xd2\x04\x1a\xc0\xe0\xe8\bM\x9d\n\x9dk\x10imb\xa7E\xa4\x06g\xc9\xd5/-\x18\x82\xf6\xe4\xa8\xc19\x8b茼\x1c\xb1\vќ7\xfd=\xb9Gn#%\xe6/\xbeD\xbe\xaa\xc9A0v\x00뉯~)\xe9\xabO\x04tT\x19\xfc\x11i\xa5\x1aW\xfd3\xb4\r\x0etFW\xa5\x98\x1a\xe8\xe6{\xb7rG\xd3>\xd2ߘ$qS\x85\xf8\xaap\x92l9\xec\xc9EIh\xea\x147\xd7X\x88\xc1Vf\xf0\xf2Y]\x14z|\x9a\x1aL\x13X\x14\x83Kf\xd1E\xd2\x03c\xb0\xfe\x9e\x1c㑯\a\xfcI<z\x1b\x93t\xa5t\xa7\xf8[\x96.\xbb\x13\f\x8e\x8e\xd0\xd4)n\xae\xb1p\x06\xb7\xb1\nx\xc36\xf2\x98\x9b+\x8a\x83t\x86b\xb0\x87>o\xc6e\xb3\x98\xe3\xc0\xc5\xf1\xe9\xdb\xc3\x1b\xfc\xb3/\xffL[\x9aD\xa0\xbb1IGH\x1d\\Q|A\x14\xdfv\x81\xc1Q\xa0\x9d:\xa5\xcc5\x94^{\x8d\xaf\xd9\xd2\xe3[\x96\x8b\x87\xdbJ\xb4l\u007fk\t\xa2\x19\xc6\xd5֚\xd6\xf9\xb6>rN\xae\xa4S\xec*\xb1x\xfb\xf1(\x9d\\\xe9\xa9L&\xc7\"zl\x8e\xea\x8d\xf6\xe4\x94z\xad3\xe1\xb2%I_\xfa\xc1G\xda\xd2$\x00\xfd\x8dI\x12ȱ\x887\xf3\x8b[\x1a\x96\xca\xd9Y\xe6\xc3P\x83\xb5S\xa7\xb8\xb9\x062\x92\x86PS*\xb25\xb3\xea\xb7-\xd7n\xcfe\u007f\x0f\xe1b\x99ݖ\xdbI\xae\x8b@\xc8\xd2cÏexnm\x96-\xab\x96\xbe~z\x91=\xbd\xbc>\x85\xce\rfJ(\x1b5\xf2\xf1\xe0\U000db596\xee{\xc6I\xb3\xb3̇\xa1\x06O\u007fLfp\xa4\xb7c\x06\xc0ฒd.\"\xbd\x1d3\x00\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807F\x1b\xac\x91:\xe5\xf36\u05f5v\x0f\x87_nr\xa8\xb1\xd6\xe8\xbfؚ\"\xdf{\x94\xb2_\xbfQ\\\xf9\xed\x03+\\\x9b\xae\xd0?\x18*䟏\xd4:\x98cN\x81\xe1<\x12\xa9\xe9t\xc2`\x835R\xa7|\xf5\xad=}]\xf5\xad\x89P8˒\xa5\xffb\r\xf2zkQ\xad\u05cb\xc2h\x1eW\xaa\x8a\x0e\xec̿ \x8a\xef\x9f<y@x9l\xd3\x17_\r\x99\xf5\xa4@\x16;p\xf2\xe4\x82'5\x16\x98\xb6\x18k\xb0V\xeaT{3\xf9\xab\xf6C\x89\x88\xed\xf1%/Oֿ\xb0\xbe\xd6Bn\xc0\xef\x14E[\xadn\x9b\xb8rA8 ^\xb9Ħ_\x8d`p\xc5\xf6\x90Y\a\x9c\xf2b\xf9\a4\x16\x98\xb6\x18j\xb0f\xeaT+\xfb\x8e\xf6\xdf\xf4i$^\xd4\xcd\xee<\xd6\xe4\xe2\x19\xd9\xe03\x17u\xdbĕ\xf3±\xc0t$\x83ׅ\x1a|\xf9\xbc\xbc\xd8\xf9ˡ\xed\xa7/\x86\x1a\xac\x99:\xd5Ϧ:\x8c*69\xaa\x1d\xa2\x83\xdc\xccٍ+ލ\xa7\x97\xa7\xdb\xf2p)3\xb8\xdc\xee(/\xb7\xdb轟\xd4`\x96E\xb5A\xacƏ\xcde(\xa5v\xa5þ\xe84\xed\xc1\x1fV\x15\vo\xe2z\xb5\xe1\xfc\x8eRצOE\xf1ʏ*\xf2W\xed\xc6\x03\xef\xe5;Y\x11\xbb\x9b5\n\x18\x1ch\x809\xbf\xf5NgѦ\xf7\xc5cr\xc1[\x11ҷ\xbc\x18i\xd0 \xb6\xe0\xc7#\x0f\t\xce\x03\x0f\x16-\xddt>\xb8\xb3邡\x06\x8bz\xa9S\xa28Ҥ?\x18N\x1a\xf3\v\xc5\xc2\\\xfc\xaf\xaf\xb9)=#\xd5Q\xbe\x1c\xf5\x89Ùi\xb5\xd5V[]\x1e-~e\x83}\x1d\x8e5\x83\xe2`uj\x87\xaf\xb7)\x05\xa5o\xabN\xb7\x91\x9b\xfc\x02aU\xb1p\xf9ȑ\xe2U\x8b\x8bw\xefX\xf0\xae(\xee\x14v\x1f?P\xb4\x0eﾽq\xf2\x88\xd0r\xf2们Q\xc0`\xa5\x81\xf8b~œ\xc7[p\xa9q\xe9哫\xaaN\x9e<\x19\xfawH\xe5\xc5.\xbd\\\xfc\xc0\xaf\xc5_\xb7\x14\x9c\xbc\xf4\xe6\x11\xa7P\xdc\xd2R\x9c\xff\xa6\xba\xb3iC\x82\f\x0eJ\x9d\xc2Cp\xfd\x90\xde\"\x93ƈ\xadF\xac\xb11\xfdf\xa3\xf9\xf8\xe3\xe4#w\xd4w\xe3\x12\x18\xb1\x9bP\xfd\x06\xe3\xe1\x9aD\x01\x96\xd0L\x1fk:n6\xe4\xc8\t\n\xab\x8a\x85uB\xd5\x05\xf1\xca\x052X>#\x12\xef\xe8\xd1\x03\xad*\x82kp\xb9x\xd3e\xe2?\xfd\x03\xd0\x1aU\x04\xbf\x98\xd8B\xc6\xe7\x1d;ɤ\xab\x14/q\xa1\xb8\"hmӅ\x04\x19\x1c\x94:%v\xf2y\xc2Fэ:|\x1d\x88EV̶\xca\x1bPIb\xd2N#9L(`p\x1fv\xfabj;\x99\xb4n \x8f\xb5hH\x1dV\x15\v\xeb\\\xf2P\xbb\xa3\xf4\xf2\xa7\x98b\xaa\x9a\x96\xc1\\\x83\xe3\xc2\x1b\\\x0f\x11\f~\u007f\xc1\x1b\xe2\xe5\x82\x17ɤ\xab\x81<\x1e\x10.\xa8\xd76]H\x94\xc1\f9uj\xd8\xebNğ!\xa8\xa5G{ف\x86\xd9s\xe5\x995h\x90$\xa0\x04\x8f\xc1b^\xb9\xd8f\xa7G\xfcX\xaa\xb0\x17u\xa9êba\x9d\xbf\x82]+W\xb4\x9b\xc8\x13-\x83\xb9\x06\a\x04n\x0f-\x92\xc1\xe2\xa6}\xe2\xf1\x02\xba\x80\xab\x85<\x9e\x14^U\xafm\xba\x90 \x83U\xa9S>Oc\xbf\xee\x02\x93H\xe1\xec\xce\xceN9%-\x10\x96֗\x9c\xd7ם\x91#?S\f\xf6؇Y\x11!ZiP\x84\x1b\xf9\xd4aU\xb1\xb0n\xab<\xb1\xa3\xf4U\n\xad\f\xb4\xc7\xe0@\x83\x17\x05\xee\x1805\xf8\x99w\xc5 \x14\x83\x8f-\xbd\xbc\x93\x8d\xb5.\xbas\xf8\f\x1d\x83\xb9\xb5M\x17\x12d0\x9f:5Լ\x9f\x96\x14\xfa\vM\x12\x8er\xfcP\xee\xa0\xd3\x01\x83\xbbP\x1aB\xb9\xfeO\x94b\xf0\xb0\xddc\xa7E\x84hM#\x15\xf3\xacܠ\xb0\xaaX\b\x8c\xa0\xc7YM\xda@\xcfAh\x19\xcc5\xb8TTE\xc6\xd4\xddTȪ*Q\xfc\xb5\\\xd0\xf6m;\x13\xbc\x189\xb6ql)-\"D\u05caKx\xe1Ҫ\xa0\xb5M\x17\f5X3u\xaa\xaf\xae\xb9\xaf\xbf\xbf\xbf#\xe6ݡ\t\xe2\xf3\xa0\r>ѷ\x01\xb5]\x1c\ue931\xd7ԃnk\xbb\xc7\xeb\x17\xb8\xab\x16\xd5v\xc9ӕ\xb3X\x11!Z\xd1\xec\xe6\xba\f;i͇UEͧ\xaf\xd3#\t\xe7\xe9\x93}\vv\x1c9\xb6\x93\x98ŎE\xbcL\x8e\x13\xbc+\x9f\\{W\xd5@|ѵ\xea\xc0\xf1\xdd,,\xb5\xc5u\xe0XU>\x1b\x83\x17\xa1<\xb9\xeb7\xf0b\xfe\x81z_i\xc1\xa7t\xc2%T\x1cyfU\xc1\xdb\xeaΦ\r\x86\x1a\xac\x99:\xd5\xc6f\xba\x8d>\xa3\xd1N\x8e\xee\x8a\xfb\xf1c{w2-g\xa9\a\x1d\x162i\xc9%\xdb\xe6#\x91S6\xf9\xcb\xe14Z\xc9&\xac\xe5%\xa9\x8e\xe5Lr.\xac*j\xdeT\x15\xa3ǫ\xee,\xa8:\x8e\xc7\xcc\x02:\xd7ID\xdb)\u05eb\xdb\xf9\x06\x98\xb7\xb7\x17/\xae`\xe3\xf4\xe5\xddK]U\xb2\xac\xf5v\xf6\xe7\x11\xc4K\xf9x\xa1|\xb9Fx[x\x90M\xb8v\xef,(\xda\xf1\xaejm\xd3\bC\r6\x01\x83\xb65\x83\xc3\xc3C]K\xec\xc1U\x8d\xcf*\x1f\xb1\x0e\xf3\xf7a\xa6\x12\x97\\\xac\x88\x90\xf7\xe4\xa6-`\xb0\x9aV\xbb<a\x0f\xfeNh\x96\x8b\b\xb3\x18|\xe4NVD\x80\xc1\xbaD\xeaڔt%\xb3\xe3h=\xc9\xdd\xfc\xecj\xaf8\xdf/\xae\x19\fny\xf1J\x95_\\0X\x8fH]\x9b\x93\x12ۚfo\xf3\x1a\xdbJ~\xa6\x0f\xcd.Kc'\rY\xaa\xf0\x14\xe7\x92P\xf1P\x11\xab\x87\xdf?\xe9|\xe0\xe5iu\x1a9\b08\x18O\x9e\xc3\xe2\xc8\v\xaa!\xaam\xb9\xf29\x17\x9a*\x1c8z5Uiɯ\x92/\x9ax\x88\xec\x1e\x9e\x0f\xdb\xd8܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb91\xda`\x8dԩ\xfe\xb6\xa6\xba\xe6\x0e\xc3/p\xaf'WQ\xda\xf3\xba\xf4[\x94\x90k+O\a͜\xcc,*H\x9d\x1a\a\x06\x1b\xac\x91:5\xe8\xf6\xf4\xf6\xf5\xeeo2Za_=\xda\xe6\xad\xcf\t\x13y\xd2GR\xa7\x82\xaf\x81\x98\xcc,*H\x9d\x1a\a\xc6\x1a\xac\x95:u\x86N\xfa\x8c\xbf׳\a\x91K\xd3s3µ\xe9\f1x\x12\xb3\xa8 uj<\x18j\xb0f\xea\x14\xbbAn\xd0m\xf8͞\xcc\xe0Z\x14n\xf0\x0f5x\x12\xb3\xa8 uj<\x18j\xb0f\xea\x14}\xa1\xaf\xd9蛌\xfc\x06/gwz\xfa\xe3\xa3ԡR~\x83\xb9\xd4)\xed\xb9\xb1dQA\xeaT\\1\xd4`Q;uj\x90\xec\xd3\x19]\x06\x13\x83=\xbe\xdeJDo4\x0e\xc4G\xa9B\xa5\xb4R\xa7\xb4\xe7ƒE\x05\xa9Sq%A\x06\xabS\xa7\x06\xfb{\x9a\rߓ\xc3\x06\x13\x96\x93I>>J\t\x95\x12\xb5S\xa7\xe2\x90E\x05\xa9S\xf1#A\x06\a\xa7N\x89\xc3\xcd\xed\xda\vL\x1e=\xa8\xa6ӓc#W\xab\xf3\xf1QJ\xa8\x94\xa8\x9d:\x15\x87,*H\x9d\x8a\x1f\x892\x98AR\xa7\xe4\x1d\xa2n\xb7F\xebI\x85\xd6\xc1C\xc9d\xbd||\x94\x12*%j\xa7N\xc5!\x8b\nR\xa7\xe2G\x82\f\xe6R\xa7\x1a\xd9\x01\xd9\xee:\xbdE&\v\xb6'\x97J\xcc\xe3㣔P)Q;u*\x0eYT\x90:\x15?\x12d0\x97:\xd5D\x03C\x12RE\x905\xa7\x95\xf7lS\xc5G)\xa1R\xa2v\xeaT\x1c\xb2\xa8 u*~\x18j\xb0f\xea\xd4iw{o_oB\xf6\xe4\xe8\x19\x8d\xbc\x92,U|\x94\x12*\xd5'\x9f}c\a\xfe\x02\xa9S\x13͢\x82ԩ\xb8b\xa8\xc1\x9a\xa9Sb\u007f{s]kg\xdc\xcf\x0fD\xa2\x19\x97\xaa5\xd8\xe3\f\x9am\xa2\xc4G)\xa1R%rA\xcbB\x01\x03\xa9S\x13͢\x82ԩ\xb8b\xa8\xc1\xa6@/\xd0$\x90:\xa5=w\xca\xe5\xa0@\xeaTD\"umR\xf4T\f\xa4Niϝr\x06C\xeaTD\"umR4U\xe4S\xa7\xb4\xe7N-\x83!u*\x1a\"umJ\xb4C\xa5\xb8\xd4)\xed\xb9S,\x8b\nR\xa7\xa2\"RצD'TJI\x9dҞ;ղ\xa8 u*\x1a\"u\r\x00\x06\x00\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01sc\xb4\xc1\x1a\xa9S\x98\x1e\xc3\xff\xa2gt\xf4\xe4\xd9Җy\xd3Tw[pYT\x9a\xb1T\xb1\xd2\x1e\xf2\x97\xeb\x80X0\xd8`\x8d\xd4)\xf2\xac\xae#\xb6?Ml\x10m\xb6\xb9\xee\xe6,\x84T'\x94\xb9,*\xcdX\xaaX\xf1\xd84\x02ؼ]\xa1\xf3\x00M\x8c5X+u\n\xe3i\uf6ca\x06\x0f\xa5.\xb9H\xee\x1cB\xc1\x97DpI>\xa1\xa1>qana\xa4\x16\x80\x8c\xa1\x06k\xa7N\x89=\xf5\xbe\xfe\xa9hp\xa5\x8d~GԠ\xe0Ba\xf2\r\x9e\r\x06G\x8b\xa1\x06k\xa7N\xf9\xeaN\x8b\t0\xb8\fY\xdc\xe5\x19\xb6\xbc>2\x99\xdc(\x9e\xb1\xa0Lq8Ͳ\xc1\xe1\xf0\x96\xa5\xe6\xfaDq\x16\xbb\x81h\xb0\xe6\xa2\xe8+tX\x1c\x8b\xfc\u007f\xa8V\xcb\xe0\x8e<\x87Ş\x97\x1e\xbc\x16\r\x94\xb5ៃ\r\xa1\xe4&67\xb09\x1e\xf9\xee\xa6\xd9\x11:\x02\b\x86\x1a,j\xa6Ny\xda\xc5D\x18L\x82\xa2\xec\xd55\xa9K\xe8ս\xd5X\xc6\x12+\xfe\x9aHE\xe5\xf3\x91}[Z\x8dx1YI\xa7\xf4\xa0\x95\xde\xe6Eɲ\xad\x1a\x06w\xa1\x92\xfd\xedn;Һ\x8f#\bnmx9\xaf\x97]\x1b\xcfm\x8e\xafÛ\x91\xeb\xf5z\rO\xf34%\t2\x98K\x9d\xea%\x91i\t0X\x14\xadv<\xe0-\xa7\u007f̞ZTM\x9cJ[\x8eu\xf5\x88%+\xc5>\xd4\x1ah\xeak&\x1f\xb6\xac%왆\xc1nz\xb7Qm\xaa\x18\r\xca\xda\b6\xf9\xee\x0ens\xa0\x8a\x88\x9e\x04\x19\xac\xa4N\xf9\xeazGFF\xfa\x1a\xf5r\xf2&\x11+\xc9*a\"q\x067c+}b\xe52q8\x85˸\x1et\xe7\xcdJEY쉆\xc1}\x8e\xf42w\xb7\x18\xc5\x10,\xea\x1a\xacl\x0e\x18\x1c=\x892\x98\xd1\xd1*\x9eq\xfb1<@\x98\x13\x893\xb8M초\xc4`\u007f\x1d<܆EMsT\xb6zs\xf5\r\xc6uQa&J\x8b.\xd7]\xc7`n.\x18\x1c5\t2\x98K\x9d\x1a$\xf4\xd4\x0f\x86\ti\x9a$\x82\r\xde\xe87\xd8\xca\f\x96\x8fE4\xa3A13\x87|g\x14\xea\x1b\xdcU2\x10U\xbe\x00\x00\x1e\xa0IDAT)\x92Z\xc3\x16U\xfa\x9b\xb26\x82\xae\xc1u\xaa\x8ce@\x9b\x04\x19̥NQ\x12S\a+\xcaذ\x80#s\x83\f\x1eJ]\x82\xab\x82\x91\xdctQt\x10\xa3F\xb2\xf4\r\xae\xa6\x01@b\xee\x1a1\n\x94\xb5\xd1g\x1a\x06\xe7\xe6\xe2\x8fv\xb8\xfcV\xc0\x8f\xa1\x06k\xa6NaF\xfa{\xea\xfbCn\x05\x9ed\xd8\xed\xc5]%\x16/._r\xec۶堔\xfa\xde^{\x8d\xaf\xd9\xd2\xe3[\x96\xdbG\xce\xc9\xe5Է\xe6\xa5t\x10A\v\xdd\xdbf#{M'\x9fE\xc5MV#[\xb5\xa7\xb5$\xccߕ\xe1\b\xacM\x1c\xee\xf4z\xad%\xde\x0e\x9fzs\xb0\xc85\xad\xf3m0\x06G\x81\xa1\x06k\xa7Na\x99\xc8ܦpKN\x02\xf4\xf6\xe2\x1e\x92 U&\x8a\xa7sm\xa9y\x1b\x10Z\x93\x86PS*\xb25\xb3\xf0Tr]\xc4\"\xb2\x95#5\x19V\xfb\xb2\xfaY\x96\\>\x8b\x8a\x9bḽvX\xd2r\xa3\x128\xb0\xb62\xb1+\x99\xf5\xe0Vo\x8ex\xb1\xccn˝\x94s%\xd3\x0eC\r\x06\x80\xb8\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b\x13\x18\\\x88\xec\xcb\xe1\x961@\a\x13\x18\xdc\xef\xadϴ\x1b\xfe\x17?\x01\x93`\xb4\xc1\xa1\xa9SA\x01T\xdaK\xa1n\x11\x00\xb40\xd8`\x8d\xd4)u\x00\x956\x93\x94+\x02L\x03\x8c5X+uJ\x1d@\xa5\r\x18\f\xe8a\xa8\xc1\x9a\xa9S`00\x11\f5X3u*\x1a\x83{\xa2\xbb\xff\f\x98\x81\x18j\xb0\xa8\x95:\xc5\aP\xe91l\xcf\xe9\xe8K@&\n0\xf5I\x90\xc1\\\xea\x147\xa9O\x1bBhQ\xb8\x06\xc0L%A\x06+\xa9S\xaaI=|\xf6\xf4\xda\xf6\xc8\xc5\x060\x03I\x94\xc1\x8c\x8eV\xad\xc9P:Q{\x98W\x81\x99L\x82\f\xe6R\xa7\xb8I]\xe0X\x04\xa0G\x82\f\xe6R\xa7\x82\x03\xa8\xb4\x00\x83\x01=\f5X3uJ\x1d@\xa5\r\x18\f\xe8a\xa8\xc1کS\xaa\x00*\r\x86\xfb\xbb\n\xad\x86G\xb3\x02&\xc1P\x83\xc7\xc7\x12\x84\xd2\xc3\xed\xe6\x013\x1a\x13\x18\xdc\xdf\r\xc7\xd1\x00]L`0\x00\x84\x01\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807F\x1b\x1c\x9a:\x85\xe9m\xabo\xee\n\xb3\x10\x00\xe8b\xb0\xc1\x1a\xa9S\xe2p\xbb\xbb\xf3L\x97\xfbL\xb8\xe5\x00@\ac\r\xd6J\x9d\x12\xdb\xeb\xfa\x89\xda\x10\xb0\n\x8c\aC\r\xd6L\x9d\xeaw\xd3;\xe4 ^\x15\x18\x17\x86\x1a\xac\x99:\xd5Y\x17.w\x15\x00\xc2c\xa8\xc1\xa2V\xeaT\xab\xa7\xb75R\xea\x14\x00\xe8\x91 \x83\xb9\xa8\xa9f:\xd9\xd4\f#10\x1e\x12d0\x175婋\x9c:\x05\x00z$\xca`\x06\x89\x9a\xf2\xb2\xfb\x90\xbdp;20\x1e\x12d0\x175\xd5U?\xc2\xcd\x01\x80\xd8H\x90\xc1\\\xd4\xd4\x10=\x9a\xe6\x93\x0f\xb3\x01@l\x18j\xb0f\xea\x94\xd8U\xd7\xd5\xd7\xd3\xd8\n{r\xc0x0\xd4`\xed\xd4)\xf1Lk\xfd\xfe.\x10\x18\x18\x17\x86\x1a\f\x00q\a\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0x*0\x12\xa9\x01\xa0\v\x18\x9cp\xfaK\xd2ВH\x8d\x00=\xc0\xe0\x84\x93\x99\xe9n\x87\xbf76n\x8c68$uj\xb8\x91]r\xe9n\x8a\xb0\xe4$s\xbc\xe8X\xa4&\x93C\x0fj\x8b\xd4\x04\b\x83\xc1\x06\x87\xa6N\xf9\xdc]d\xaa\xcb\x1d\xe6/\x83{\xbb\xf4_\x8b\x17\xc7\xf2\x8fDj\xa2A,[\xa6Ӷ\vuh\xce\a\xa2\xc3X\x83\xb5R\xa7\xd8]ˍ\xe1~\x8ds\vü\x18/\xaeDj\xa0E,[\xa6\xd3\x16\xfe\xea\xf9\xc40\xd4`\xcd\xd4)\x8ag\u007f\xb8{4f\xc7\xe0\x89\xb1IJe:m\xc1\xe0\x89\xf1g\x1b\x00\xc0\xccL`\f\x06\x80)\x00\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xccMX\x83\xeb\x11O\u007f\xb8\xa6\x00\x90\x18\xc0`\xc0܄5x\xf4\x1aa.\xaa\xa6\xff\x8e\x86k\n\x00\x89!\x8a:8\a\xd5DjbjJJ\xf8gː\xa8\xd7P\xcdU\xbb\x9b\xfd[\x9e~{\xa6\x9b}\xbc\xdbsli\x85C\xfa\xcb,B\xa3Ѯ\xe0Z\xa5\xc3⨼\x86\xa7jr\"\xb5\x9dр\xc1]\xd6a\xfei\x94\x82I\xa3\xf3\x115\xf8j:*\xac\x9e\x8b\n\xc9\xf46\x94Q]\x92\x92\xea\xd3](z\x83G\xb3Pn\xf5|\x94uC\x92n\xa4\xd5Gj=\x93\x89\xc5\xe0F\x94\xc9&jP\x99Ԅj\x86\nSSs<l\xd6\xc5\xf2t\x8b}I\xb7v\x0f\x9aT\xa2\xe4v\x9d\x97.ZȚ\xbc)r\x01\x9e\xe2\xd5iǓ\x89*#5\xd1d4]\xbdܵh\xfc\x92$1\a1\x83+Q\xabD\xbc\xc7o\xbd\x0f\xe5b\xe1:\x91jLWA\f\x8en\x05\xfbQ9~܀\x1a\xf1c\xbd-\xaaEf(\xb1\x18|Ղ\x06\xe9D\x06\xea\xc5\x06\x17ڬy\xb9\xc9h\r\x99\xd3mC֬t\x84\xb6\xe9\xf6\x12\xa0\xa7\x8f\xfd+\xf6Zj\xf5ڜ.\xb3J\x92\x1b\xf5\xf66\xa3\xc6\xde^\xa6J\x04\xc6k\xb0\a\x85\xf9\xd6\xd7e\u007f*\xcac\x9bU\x92E\x1e\xdb\x11~/k\x10\x1d}+\xf5\xbf\xb2\x88\xc1\xd1Q\x89\u007f\xc4\xe43Q\x86\x1f\xaf٢\xf8\xb1\xceXb1X*d\x86\xf6\xa1t\t\x1b\x8c2\xf0/\xac\xcfNƠ\x8b\xa9\xa8\x12\x0f?=v\xa47\xac*\xe4\x04\x86(\xab\xae\xc1R-6\xb8\xd1\"Ig\xd0iI\xb25\xea\xb6S\xf0\xb8{\"5\xd1$k.\xfd\xa76˖\x9a\xd7%\xd1*\xe2\x8c\xff\xe8\v\xee\xf1Zu:.G\xaf\xe2\x17\x1c\xfe\xb9\x1b\xf1\x93̌\x9e\x0e\xfe\x83UM\u07b8}\xae\xd6\n$\xa9\xbf\xc4aI\xcd픸*·2Ͷh0\x13W\xb8\x85i\xbe\xe5vkNW\xd0\x1a\xdch\xbfD>\x18\xf4\a^\x92zC\xbbg F\x83;\x88\xba\xe4\xbbm\x1b5\x98\x1e^k#\xf3*\xd1\"\x89=\xc9\xd0\xee\x83#j\x83G}\xb2\xc1\xbeh\a\xaeq0\xc8\x1cو\xe6W\x97\xa7\xa2.j\xb0XO\u0600\xec\xa2t-\x13\x97\xa3˓ӱ\xc2e\x852\xa4j\xe8\x1e\x95\x14\x83\xaf\xf5W\xa3\x9cQ\xe9**'uղ\xe02\xf8\xcc\xed\xb65\xd5\xcbRH\x9d\xe17ؗ\x86\x96T\xceJ\xb5\x13\x83mi\x8bZ\xdd\xf6\xe4~\xf5\x1a\xae\xa6\xa7\xb6\x0ez\xec\x0eZ?xP\x87\x04\xe8\x10\x93\xc1\xa3\xa9D\xa8\xd14\xf2\xc5ۄr\xd9<+~\xe6@\xacT\xbd\x91\x8c\xe4\xdf\xdfh\x9ae[\xba\xa3g\x83=\x8f\xecNK\x9e\\[\xe6\xc6\x1b\xe43\xc0\xa0\xbb\xd7\xd6ꍙ\xb6E#\xb4\xfd\xfe\x1c\xdb\xdc\xfdtJ\\\xe3\xb0/'U\x04\x81\x1aLjKR\xa0\xd4\xe2\xc7\xf6J\x94\xd2T\x9en/d\xeb\xf1\xf7;n\x9a\xa9\x1c7R\xf2$b\xf3\"eO\xeeFV\n\xfe\x1e/\xa7\xef]\xb3\xb4U\f\xaeDȁ\u007f\"\xfdhIj\xfa\xf2,d\x0fR8\x0f\x91\xba\xc9K\n\x02\xbf\xc1\x85\xa8\r\xaf!\x97\xfc\x18\ni\xa1\xd0\x15R\x03\r\xcf\xc2\xef\xd6\xc1\xba\x1aD\x1b$@\x87\x98\fƿ\xd0J\xf2\xd3&ߖM\xfe\x9fj\x16꼆PV\x0e\xc5B\x861JO*ژ\x87\xecn\xba#]\x96\\\xd9ٔ\x86ǩ\x1b\xbd\xbd\x99y\xbd\xbd\xbd\xf47cEYm\x1di\xcb\xc9d\x99u[\xe76+\xf9]\xfaR3=\x1d\x8b\x90\xda\xe0\x1b\xbd\xe9\xe5W\xa5\xab5\xa9\xbd7\x86\xdaR\xd0,w\xed,\xdb \xdf\xef\xb8)\xa3\x1f\xb9\x1bɳ\x88\xb7d\xb0\xf7\x1b\xbc\x8c\xecD\x8d\xdeN\xbft\xa4\x9c\x94\xd0O\x89bpWG\x8d\xcd\xd6+\x9dFh\xd9(\xd9\xcd]\xa2n\xd8Iwv\xaf\x92ٲ\xc1ג\xe9'\xb8\x8f\x19L\xde\xe15\x94\xa7^h(ͺѳ\xd1\xca\x14\x1eMΕ\x00\x1db3\xf8\fJ\x1b\x95V\xd2\x1d\xe4&\xff^[\x0ej\x13\x91B\xa0\x10v\xac\xc1cW\x87TVN\xc60\x0f]\xb8\x8d\xb6W\xaa\b\a\xf9rN\x93ȇ\xa2\xcb\xff8?\x03\xcb2:Wm0.+\xc8Ｌ\x8c.6\v\x0f\xeb\xd7\xd2s\x83\xfa\x1d\x1fK\x10\xa9q\xb1Ȗ\xf9n\xba\x9b*\x1b\\C\xf7P\xfbQF\ra6:#\x95-\x91ieK\xaa\xea\xe0^\\>\x9dA\x16\xd2\xd7\xe8\xac\xe4k\xeauHW{=\xd59d\x80\x97\r\ue875\xb4$Y\xa8\xc1d}\xa3h\xbe\xa4ZC.):p\xb7\xecXpj\xe4\xe2l\xc6\x12\x9b\xc1R\x06\xea\x19\xb5\xa5\x90_T\x93\xfc[\x902Q\x17\x1e\x83Cw\xe8\x1dm\xf8wzC\xaa^)I+3F\t\xe9T@\xce`r\xc0\xa8\x86\xb8ZFw襬2<\x18QA\xb6\x05\x1b<\x82\x06q\x11C\x8f\xd6Y\xe9G\xa7\x19]S\xf7;>r\xd9с\xd1\xc6,\xfc\xe9\xcb\xea\xf3\x1b܁\xe6\x92\xf9\xbd\x81\x0ff\x97zON\n2X\x9a\x8b\x86\x87䃍\xcb\xe5#6~\x86\x97\x93z\xa0\x843\xb8]^4\x9d\x1aL\xb5'\x06sk\xb8*\xab\xbb\bу\xd5\x0e\xbb\x04\xe8\x10\xa3\xc15\xa8\xb2\x8b}K6\xc9\xdf{7,\xf8\x87\x1c8\x06ѣ\xecu9\xba\xa43\x16\x89\x1a<W\xfe\xcd,\xa3\xdd)\x06\x93~\xc9>\x9b4\x9f\x9e\x10\x90\ns\xf17k/]O\xb0\xc1Ғj\xa9\xcbN;g;\x80=\xb8\xbaT\xf5;>\x98@\x04ѳ\x04\xd9o0\x83\amvjN\x1fZ\xa9\xbb$3\xf8\x86\x87\xed\x01,A\xfd\xa3\xc9l\xa4\\\x8eT\x85\xf0h&\xaa\xec\xc5%\x10gp\x97\xfc\xfd\x95\xaa6\x98cH\xae\xbc\xcb\xf1\xe0\x8f\xb19$@\x87\x18\r\xbe\x88\xd2+\x99\xadM\xc8r\x91\xfcیf\x93/a:d\xe1\xafu\xab_\bj\xb0\x95\x19\xbc&\xa3\x8fB_\xa3\x06{\x88 TEjp\x19\xfb\xddg\x94\xe1_4ݟ+\v1\xb8#m\x94\x15\x11\x92\x95\x0e\x82\xadx\fV\xf5;>\xca\xe9\x80髦\xe5{!\xfeT\x10\x83\xaf\xa6\xa7\xb0Cs7,\xe9\xf4}5\xd6\x06\x17\x06\x01\x83-T\xaeQ\x87\xe5\x1a\xfeA\xd1\x02$#UU\x97\x9fa\xe7\xebz\xc9'^6Xd\xbe\xfa\x90\xae\xc1\xd7\x10\xfbV\x9a\x8fF\xe8\xabP\a\xeb\x12\xa3\xc1\xf8[\xd7\xc6\x0eN6!4\x1bk\xd8i#\xc5\xeb\x90\x15\x95\xe1\xdf\xf1i;=\x93\xc4\xe0\f\xeeb\xd2o\xa3ߝyyd\xb7\x86\xccP\f\ue925l\x1b\xea\xc4+H\xc7\x1d\xf9n\x0f1x4\xad\xc3\xceN\xf9Y\xd3ȩ\u058c<u\xbf\xe3<\x1e\xdcL\x8f\xa2\x88h6\xb6ntv\xf2U\"\xd8\xe8|\xe4?\x02\xbd\x92\x8e\x96\xbd\xc9\x1au\xa8\\E,\xa7\xffT\x93\xc1\xdaC\xf7\xe4\x1a\xc9\xde\xee\xe8Հ\xf2\xfdT\xbf\x1b\xb9\x9c\xc1x\xc4\xc6k\x1d]\xa2o0nA\xaa)/S\xb7o\x9cgkf\x04\xb1\x1a܊\x10\x1b\t\x9bЬ\xdbSf\xcfB\xecE\xaf\x15\xdd>\x17?\xc9\r\f?C\xf6\xfa\x1bm\x96\xfe\x1b+\xf3F\xe8/\xb8\xbd\xa3\x8c\xedq\xd5X\xeb;\x16\xd9DrN\xae\xec\xb4\xd4Wf\xe9\xc5#ך\xe4\xea\xce\xead\xb2\xf34hK\xaf\xddfON\xf1\x90ʺ\xaf\x195ʧ\xf0\xa4\xea\fVDHV\x94\xd3ޚI\x8fYq\xfd\x8e\xf3\x9c\xdcEvHe#\x9a\xb5ac\x16)q\xb1`5\xc8QS\xbd\x11\xd3A\xaez\xc8ٸ\xd2z\xbb\xffs\xc4!\x1b<\xec@y\x1bsP&\xf1p\x19ʪ^\x82f]%\x9f\xbc\x1c\u007f\xbb\xd1\xd9h\x91\xbbڑ\x99\x96\xc5\x1d\x0fNEK*3\xec\xc4O\x1d\x83\x87\xd3\xd0\"\xdc\x17;2\xd7\bǃ\xf5\x89\xd5\xe0kVV\xa8\x92\xb3\xca\xfd\x8bl\xf6E\xf2\xc8\xe7+O\xb7\xd8\xe6\xd6\x05\x04\x1eMC\xa8-\x15\xd9\xdaY\x95ڕg\xb7\xcfg\a\xdaF+\xed\xb6\xbc3\xf4(*\xb2\f\xda\xf0#Q\xafy\xaemn3\xeb\xa9\xd0>\xabړB\xe6\xdeHů\xda\xe4\xd1\xcc\xe7\x1f߭\x1b\xcbR\x1dk\xd81/\xa5\xdfq\x1a,e\xd1\xe1ut\xff\xdcT\xdb\\v\x85\x83X\xe6ߣ\xc2=^ݘnq,W\xef\x9a1\xfc{rbY\x9a%\xbd\x9an\xe4h}\xa6\xd5QN\x8c\xe4\f&\a\xb8\xad\x99\xb57\x96\xe1\x82 pNn\xa80նd\x88\f\xcb:\x06Kb\xb9ÒV\xc6.:Z\xa2\xaeK\x00\x9e(\fV\xe1c\xa7\xe5\xa8\xc1\xe1[ƛ\x1bV\xf9\xc3\x12\xe6T\xde8\xf0\xb0}\xa5x\xd3\x1dt|W\r\xdb\xdf\x15Qt\aQĔm\x91\x9a\xcc`b5\xb8\xc6? \x1bnp\xbb\\D\xc4\xd9\xe0\t\x1d\x8bӧ,\xec\x15\xa9v\xba\x83\xb81\xca\x03ٵ\xb6\t\xec\xaaN{b2xh\xb8\xfdv\xab|\xa5\x9f\xb1\x06\xd7\xf6H\x8b\xfcN\xc4\xd7`ɛ\xa2\u007f=︹X\x18\xf6Tw5\xca\xd8X\x9d\x1b|\x1eN\x87k\xf6h\xae͛\xb1\xc4d094\xef\xf7\xc8P\x83o\xa0\x9cJ\a\xab\x87\xd9\x0e`<Y\xbe<R\x8b\xf8\xe3\xc9I\xb5e\xd5FW\xddn\x9b\xc8Y\xf3\xe9OL\x06\xd7\xd9\xd2\x02_\x8e\x86\x1a,դ\xe6\xc9#%\xdd\x01\xbc\x18\xbe50\x83\x88\xc9`\x00\x98r\x80\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\xcd\xd46x\u007f\xf0\xfd\x0e\x9a\xb8\xc3\\\x03\x19\x1d\x17\xe1x\x95i\x01\x831n[\xe8œ\x80I\x98\xda\x06\xf7\xbb\xa3\t;\x99\xa8\xc1\xa3\b\x81\xc1\xa6ej\x1b\x1c\x1d`\xf0L\x06\f\x06\x83\xcdM\xdc\f\x8es\f\x1a\x83\xd6\xc1M\xc8=\\\x96v{\x16\xee\xbe)ӚVNlS\xa5\xb6\xc9\x06s\xd1mZ\x8b\x045\xa8\xbdZ\uec24o\xbc\xca\xceS\xd3\xf8\x16_Y\xba%5\xa7~\xc2{u\x1f\n\x98\xbda\x1a\x1c\x15\x84\x13a^\x06ba\xc2\x06OR\f\x1aC6\xb8̎Ҭ\b\xb5\xafA\xb7\xa7!z\xe3\x8d*\xb5\x8d\x19\xccG\xb7i-\x12Ԡ܁R\xed\beސZ\x97!T\xb8\xec\xa24\x98\x8a\xecs3P\x94W\x8c\x85\xe1O\xef}g\xfd\xc0\x17a\x1a\\\x1f\xa8:\x18\xe6e \x16\"\x1a|5/\xfcũQ\x87H\xc5\x16\x83Ɛ\rF\x99\x83\xd2\xe82d\xbd\xdd3*\xb5#\x12\x81\xa3Jm\xa3\x06\xab\xa2۴\x16\tn\x90\xd1+I\x1d\x16rc\xa9\\E,A\x1b\xf1\xf0ۗ\x1a\x87[z\xb6l\x89\xd0`;\x18\x1c/\"\x1a<\x88\xb4n\xb1Q\x88\xda\xe0\xf1Ġ\xf9\r&\x9b0(_ٙC\xa4S\xa5\xb6Q\x83U\xd1mZ\x8b\x047\xa0\t\x17e\xe46\t\xd9\xe0t\xd6e\xdd\xf2Ni\xa2\x80\xc1\xc6\x11\xde\xe0\xa6\xcc\xce!\xe4\xeb\xccܟ\xa0\x184\xd9`z+\xdb\rY\xdae\xa8NR\xa7\xb6Q\x83U\xd1mZ\x8b\x045`\xe9$u\xe4\x1aQ\xd9\xe0<\x94\xd3\x1b\xfc\xe1\x1a\xd8Z\xea\\\xb1\xbdtLz\r\x97\xb6\xff$\x1dď/5\b\xce\xe7\x1f[\x9b\xbf\xf5s\xda\xe2\xb3\xfbW8\x8b\xb6\u007f\xae^\x8c3x\xechE\xfew\x8e\x8e\x05\xb5\xc5\x067\xe0\xbe\\\xd7q\x83\x13U\x8b\xd7>\x86\x1b|\xe8\x14\x84\xa7?\xd9uw\xfe\xd6?I@Ԅ7X\\\x83\xb2\xf0\u007f%b\x82b\xd0d\x83ie\x8a=\xa3\xb7\x87\x94\x90:\x9aOm\xa3\x06\xab\xa3\xdb4\x16\tn\xb0HY\x81lp\xaf\x05\xa1\xd4e\xad|\xd1\xf4\xc1\x82\x87O\x9d}~\x85\xf0'il\xa0\xf4\xfb\u007f\x94\xfex\xb0`\xe0\xe6\xefO8\x85\xa2\x83\x87\v\xee'-\xce-\xae8|\xf6\xa0𬤂3\xf8a\xd7ӯ?\xed\xda\x1b\xd4\x16\x1b\xfc\xf9.\xe1\xd9\x0f\xf1\xe4^\xa1\xe1\xf5\xa3E\xebǤ\xb1\x97N\x94\xae*(}lׂp54\x10D\xa4*\xa2˂,\xf4^\xe0\x84Ġ\xc9\x06\xd3k\xe9\x83\fVRۨ\xc1\xea\xe86\x8dE4\x1b\xa8\f\x96\x06Kȝ\xd3)eʗ\xc0\xd1\"2\x1c\x1e]J\x86Ѓ\x15\xf8\xe1a\xaa\xa2k)\x1eGw\x15ᩱҭ\xf8\xb5\xb1\x97\xaeK*\x14\x83\xcf\ng\xfd\x8f|[l\xf0\xb3\xae\xd7H\x83\xd7\xe8a\x89\x0f\xd9\xc1\x89\xf5\u0096\x9b\xd2\xd8M\t\x88\x9e\xf0\x06_\xdbhIG\x0ek\xf5\xd5\x04Š\x851XIm\xf3\x8f\xc1\\t\x9b\xc6\"\x9a\r\xd4\x06㩞mY\x88;\xba\xfcE\xf1\xdd\r\xcf\xffn\x8c\xd6\x00\x9f/\xf8\x9d4V@|\x94\\\x0f㇃.\x89\xa8\xf9;I\x03\xc5\xe0\xbd\xeb\xe8?\xeb\xf6\xaa\xdbn?\xf8\xb4p\x8aN=x\xf7؟0\xa5\xf4\xa3\xb1\xde\x05\xc3o\xac\x847\u061d\xb6\u007f\b\r5\xa7\xb9\x13\x14\x83\x16\xc6`.\xb5\x8d\xd6\xc1\xaa\xe86\xadE\xb4\x1a\xa8\f\xf6\xb1 \x8cF\x94\xa2\x941\u05cf>\xb8VXq\x98*\xbc\xf51\xe9,\x1d\x8d%\x17\xd9\x0f\xa3\x06?+\x8cI\x1a(\x06\u07fb\x9d\xfe\xb3\xbdJ\xddv{Q\xc1\xda\xfb\xe9\xd3\xf5\x02\x83\xd6$\xeb\xab$ F\"T\x11\xa3\xf4X\x04\xf9\x8d&$\x06-\x8c\xc1\\j\x1b5X\x15ݦ\xb5\x88V\x83\x80\xc1WIz\x03k<\x84\x92\x03\x06\u007f\xf88\xb6\xec\xfa\x89\xfc\xa3\xe4ɩ\x15c\xac\x88\xe0\f>+|(i\xc0\f\xbe\xf9\xf4ui\xef\xdd\xc4ӱ\xbb\x1fV\xb7\xdd^\xf4\xf1g\x05\xb4x\xdeu\xf7\x87\x14Z\x87\xac\xbf_\xa33 ,\x91\xea`I\xb4\xb3\xdb\xeb\r\x8eAc\x841\x98Km\xa3\x06\xab\xa2۴\x16\xd1j _\xfcfA\xed7F\xa5<\x94\x87[_[Ɲ\xd28H\xabXi\xcb\xf7\xc9\xe3؊SK\xe9S\xce\xe0\x9b\xc5[\x88\xa1\r\x8f\xd1\xf9\x9f\x1d\xfe\x8c-\xc7\f\xfe@\x18\x90^\xa7\x05\xee\t\xe1uu[r4\xed\xac\x93\x18}Vx\x89\xb4}\xf20y\\\xff\xa0\x04\xc4HD\x83e\x8c\x8eAc\x841\x98Kmc\xe7\xe4\xf8\xe86\xadE\xb4\x1a\xc8\x06\x93\xf2\xa5K\xf2ّ%3ˆҔ\xfc\x88\x83\xc2⃯\x9d\xda+\x9c\xa3\xcf\x1e\xbf{)ٱ\xfb\xd7\x01\xe7\xde\xf7\xc6>\xd8\xeb\x1c\xf8WI:\xe7Zw\xf4l\x83\xf0<mp\xbf@k\x86?\xfd\xbf\xef\xac\x1f\xc0\x1c\xc5\x06K\xbb\x84\xc7_{\\\xd8E\xe6\a\xda^\x1f\xa8\xc2=\xdc\xdc^|\ue3f8\xd7\x05\x0f\x9e«8\x81\x17\x1bXu\xef\xc0\xc0g\x12\x10\vQ\x1alx\f\x1a#\x8c\xc1\\j\x9b|]\x04\x17ݦi\xb0F\x03\xd9\xe0\xa1\xdc\xdbS\xdb\xc8u\x13\x19\x96\xdb3\xab\xb9\xc3i'\xee=X\xea,\xde\xc2\x04\x96\xfe\xc0.v \ar\x9d\xbf[\x8c\x1f\x1b\xc8\xcc\aK\v\xaa\xd8N\x99\xf4|\x11-7>\x96K[!\xff\x13r<x}\xfez\xf9x\xb0\xbf\xedQ\xf2\xe2\a'\xf0\xc3\xd3x\xee\xd9-w.\xbd\xf7\xac|9\x85\xc0>\x04@\xd4Dip\xfc\x99X\f\x9a\xb1i\x1527]\xe7\"5\x01\f'a\x06O,\x06-!\x06\xbft'\x9c,\x9bz$\xc6\xe0\tǠ\x19o\xf0\xc1sc[\xe0b\x86)HB\f\x9ex\f\x9a\xe1\x06\x8f\t\x15\r\xc5Agހ\xa9@B\f\x9ex\f\x9a\xe1\x06K\a\x17o\xf9$R\x1b \x01$\xc6`\x00\x88\x17`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807\x86\x1b|\xaaꏑ\x9aL\"\xd7\xef=\x15\xa9IT\xd0w\x11\xaf\u0380\x8901\x83\x1b\x04v\x87\x81\x06\x9f9\x85\xb5\x1a\xb3\x0f\v\a5\xef,\xd3%\xe2*N9\xe5\xabq\x9dQ\xf84vX8\x1c23\xf6\x9c3\xf6.4;\x03\ff|\x06\x9f\x93\xef\xf8\xfa|\xc0\xa9w\xbd\xd6\xd8{{]\xa1s\x8fF\x1dy\x17\xf5*\x0e\v\xe4n\x88g\a\x06\x16D\xa5\xd3\xebΣ\xc1\xb3b\xce9\v\xbc\v\x8d\xce\x00\x83\x19\x9f\xc1U\x81\xfb\xb9\\\xfaW\x1c\x1e\f5\xf83\xe7\xe3\xfe\xc9\xeb[\xc2_\xe9\x15\xf5*\x9eu\x92Q\xf4=I\xca\x0f\x8a\x1d\xd1\xe1iWP\xc0\x8e\x14kJ\x14\xf7.\xb4:\x03\fe|\x06\xaf\x8fV\xaf \xf6\x16\aJ\x88\x8f\x85\x8fC^\xe6\x89z\x15c\x9f\xc9\x06\u007f\x16]yr\xb38\xb4`\x88\xcd`\xee]hu\x06\x18J8\x83\xff\xb4\xc2\xf9O\xa5\xc5\xe7\x1a\x96n!)2\x81|\xafSr\xddI2l$\xd7c\x81\b1.!\xec\xf3]\xc5K\xef\x0f\xad\"\xc6\n\xe4\xc1\xeb\xe8\xaa\xd7>\x11>y}\xd5\xd18\xad\x82\x1a,\x05\x85\x9b\x1d\xdd[\xbct;\xbd\"2\xd0/\xe5\xe9\xfc\x10\xd5c\xc99S\xde\x05A\xa33\xc0P\u008e\xc1\xe7\n\x84Ƕ\bw\x1e^A\xbe\x9f\x03\xf9^7\a\xe8=\xb5\x03T\x0e\x97\xb0\xf6ĩ\x154\xe6@I\b\xfb\xa4`\xed\xf3\xa7\xb6\n!\x06\x93\xdb\xcf)\x9f\xef\x12\xd6\xe1\xff\xee\xff\"N\xab\x90\r\x0e\n7+=x\xb04\xffc\xbe_ʀ\xf0\xff\xa4 b\xc99S\xde\x05A\xa33\xc0P\xc2W\x11Ż\xa4ׅS4-L\x9d\xef\xa5|\xc5\x17\xfd\x1b6\x84D\x88q\ta\xf7\xae\"{\xea\xebC\f~]\xf8\x83\u007f\xf2\xacSp\xd2\xf0\x85\xb8\xacB6X\x1dnv7\x1e֯\x97V\x05\xf5\x8b?>B\xc8A\x8b\x18r\xceT\xefB\xb33\xc0P\"\x18|BzO\xb8)=\xfe`p\xbe\x97\xa2\x17yN+^%!\xec:\x8bOx:\xc4\xe0S\x82\x1c\x86p\xfd1g\xb1P\xecz\xec\xdfⴊ\x80\xc1|\xb8\x19\xfd\xae?*\\W\xf7K\xa4\v9<\x17C\xce\x19\xf7.\b\x1a\x9d\x01\x86\x12\xc1\xe0\xb3҇xW\x9f\xe8\xa5\xce\xf7R\xeffQ\xbd\x94\x84\xb0\x0f\xd9\xd7l\xe8\x9e\xdc{~\xd1\x0e\xaf8\xfa{\xe1\xf7GW\x1c\x8e\xd3*\x02\x06\a\x87\x9b\xe1o\xf9\x0f\xd5\xfdJ\xfeeyb\xc89\xe3\xde\x05A\xa33\xc0P\"\x1b\xecbz\xa9\xf3\xbd\x88^ϓC\xa8\x8a^JBؿ\t\xf4(\xe9á{r\x81\xc3\nc\xf4X\x04\t\x85\x8c\xcb*\x14\x83\xb9p3\x9a\x04\xf5<\x1e\xdfU\xfd⮜7\xa5 b\xc89\xe3߅\xa4\xd9\x19`(Q\x1b\xac\xca\xf7\"\xbf\xf1?\xd2\x19\x8a^\\BXU)\x96\xe5\x0f\xae\x10\x83\xa5\xfbW\x05\x86\xb5/\x96~\x11\xbfU(\x06s\xe1f+\xb0[7\xef\xde\x12ԯ4\xb664\x15'\x86\x9c3I\xf5.\xb4:\x03\f%\xac\xc1\xbf_\xfa\xec\xd8\t\xe7\xc7c\xbb\xb6|\xce\xe5{IħgOmY\xfc\x85:BLI\b\xfb8\xbf\xf4\xe0\xd3K\x05\xe7\x89\xdf\au\xf8I\xc8iظ\xac⃣\xf2a\x02)\x10nF\x0eaT\xbc\xf4\xfc\xaa\xa5d\xaf\x8b\xef\x17\x17\a\xca\xd0ʈ-\xe7L\xf5.B;\x03\f&\x9c\xc1c+\x04\xe1D\x81\xb0\xf8%VB\xfa\xf3\xbd\xc8+\rK\xf3\xef\xfd0(B\x8cK\b\xfbd\xfbһ\x1f;\xe1\xa4\xc1b*\x9ev\xa9\xcbƸ\xacb\x8c\xbc\x9a/\u007f\x9b\xff\xc1\u007f\x85\x83뱽\x05Ż\xfe\x95Ns\xfd\x0e\xe4?&\x05\x11c\xce\x19\xf7.4:\x03\ff|\xe7\xe4\xc6\xcdX\x83s\x92\xf7\xdd\x03\xe1fڧ\xf2^r\xee\x9dxt\x94\xff]ĥ3`b\x18l\xb04\xf6l\xe9\xf5Hm&D \xdcL\xd3\xe0\xebŇ\x95\x03\fㇽ\x8b8u\x06L\b\xa3\r\x9e\\\xf8p\xb30\x97S\x00ӈie0\x17n\xf69\xdd\x01\x8c\xd0\x1e\x98\x06L+\x83\xb9p3\xba\x03\bq\xe83\x80\xe9e00\xf3\x00\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb91\xdc\xe0鑛\x16\v\x113\xd6\xe2\xf4#I\xc4{\x9b\x02L\xcc\xe0\x88\xa1f!L\xc5ܴs\v\x84{\xc7HFł\xb3\x1a\x8b0>\u07ba\xb8x\u05f9b\x95j{\xe5K\x8aՓ\xc1D\xccX\x8b\xfeGr\xb6(\xdc[\x9c\xa11n\xe338\xeaP\xb3`\xa6dn\xda\xd8Y!\u007f@\xbayJ8\xabk\xd2\xd9\xc5UϟX/\b*I?'+~/x2\x88\x88\x19k\xd1\xffH\xa4\xd7\x16k\x18\xec\xffAI34\xc6m|\x06G\x1dj\x16\xc4\x14\xcdM\xbb)\xecڋ7Nнi\xf3z\x01\xb9Q\xf9\xe6*!x\x98Un\xd0\xe3'9\"f\xacq\r\"\xa3\xf5\tS~P33\xc6m|\x06G\x1dj\x16\xc4\x14\xcdM\xbb)\x9c]<\x16\xce\xe0\xc7\xf3\xe9\xddJ\xcf\xc6npČ5\xae\xc1\xf8X\xcf\x19<\x13c\xdc 7M\"\x06\u007f\xb6\xfe\x145\xb8\x81$\x05\xd3\xfaZ\xb5e\xab\x1e\xa6\xed\xae?;&\xdd|\xb0\xd8Y\xba\xdd\xffͭe\xf0\xc0\xd6R\xe7\x8a\xed\xa5t%\x113\xd6\xfc\r\xf0\xf6>\x1fx\x9b\x01\x94\xcd\xc1+\xcf\x17\xe4\x18c\xae\xad\xea\a%\xcd\xc8\x187\xc8M\x93\xa8\xc1G\xb7S\x83i\xd5\xcd\xeakn\xcb\xc6\x04\xa5@yM\xd8{\xee\xa5\xed\xfe[\x945\f\xfe`\xc1ç\xce>\xbfB\xa07;E\xccX\xf37 \xdb[t\xf0p\xc1\xfd\xaaW\xb9\xcd\xc1+\x18\x18`_G\\[\xd5\x0fJ\x9a\x911n\x90\x9b&Q\x83\xaf\xbb\xae\xb3*BI\xa7P\xb6\xec3n\x89\xb1\x97n\x92\x15\a\xf2\u007fB\f>ZD\xdc=ʂ\x83\"f\xac)\r\\K\U00058eab(\xe8ues\b\xf9\aC\xdb\xf2U\xc4L\x8cq\x83\xdc4\x89\x1a,m\u007f6\xc4\xe0\xc0\x96\x8d9\xb9\x9d\xc4\xebG\xb7\xde] \xacgO4\f\xfe\xa2\xf8\xee\x86\xe7\u007f7\xc6\x06\xfc\x88\x19kJ\x03\xd7Òƾ\x83\x8e\xc1\\\xdb \x83CW1͉\x9c\xd9\xe3\x9ch\xa8\x99\xc2T\xcdM#\x06\x9f\xfaN\x88\xc1ʖ\xc9u\xf0\x18\xfeh|XT\xfa\xf8\xa9\x81-\xeb\xfd}\x85\xd6\xc1\u05cf>\xb8VX\xc1nc\x8e\x98\xb1\xa64P\xbb\xeaG\xc7`n\xae\xca\xe0\x19\x18\xe3\x16\xd9`\xd7DC\xcd\x14\xa6jn\x1a1xl\xf1Y\xc5\xe0\xa7\xfd\x06\xcb[\xf6x>]\xf6%\xe1\x8f\xd2\xda*\xb2\r\xf7\xafgKj\x18\xfc\xe1\xe3\xb8\xc1\xf5\x13\xf9t\x03#f\xac)\r\xc2\x18\x1c\xf86\xd35\xf8y\xf9π\xcc\xc0\x18\xb7\xa8\r\x1e\u007f\xa8\x19\xc7\x14\xcdM#\x06K\x0f\xef\xa2\x06\xe7\xe3\xe2c\xac*\xc8`v<xl\xcbݒTJF\xf2\xb1\xef\xacgKj\x18|\x90\x16\xebҖ\xef\xd3g\x113\xd6\x02\r\xb4\rV6\x87>\xd30X\xf9A\xe9\xadbz\x03\xb9i\xf4\x9cܩ\x9bҹ|j\xf0\xbdE\x87\x0fV\x91~U[v6\xff\xde\x13\xa7\xb6:\a\x88\xa0\x0f\x1e=\xb8\x1eW\t\xefI_\xc8'\x03\xf1G\x91\x9b<(,>\xf8\x1a^\x1b\x8b\x0e\x8a\x98\xb1&7P\xbdM\x8e\xc0\xe6Hc\xef\r\f\xb8\xf6\x0e\f\xdc\fj\xeb\xffA\x11fb\x8c\x1b\xe4\xa6\xd1\xeb\"\xf0\x186VE\xcf-|\xb2%\xbf`\xeb?\t\xc2^\xf5\x96}\xbc5\u007f\xc5\xfd$\x11{\xec\xd9U\xae\xa2\a\x9f_\xe5\xdc\"=,\xd7\xd7x\x90\xe6&O\xdc{\xb0\xd4Y\xbcEξ\x8a\x9c\xb1\xc6\x1a\xa8\xde&\x87\u007fs\x1a\xa4\x0f\xe4U\x1c\rj\xeb\xffAI34\xc6m|\xe7\xe4\xc6\xcd\xf4\xc8M\x8b\x85\x88\x19k\xf1\xfb\x91\x18\xfeަ\x04\x06\x1b<Mr\xd3b!b\xc6Z\xbc~$\txoS\x01\xa3\r\x9e\\ 7m\xe61\xad\f\x86ܴ\x19ȴ2\x18r\xd3f \xd3\xcb``\xe6\x01\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01sc\xb8\xc1q\n\t\x1b'\x93\x9b-\x161!\r\x88?\x1338b\xa8Y\bч\x84\xc9D\\\xc5\xc4s\xd3\xee\x15H\x10\xc3\t\xfcx/?;L\x16\x1a\xe5\xa8\x10\x94\x17\x151!\r\x98\x04\xc6gpԡf\xc1D\x1f\x12\x16\xf5*&\x9e\x9b\xf6I\x83p\xee\xa6ts@hЋE\xd3\xe4\xfa@\x95j\xcb\"&\xa4\x01\x93\xc1\xf8\f\x8e:\xd4,\x88)\x9a\x9bvT \xdf\v\u007f\x12B\xc4\xd3N\x92\n\xb0\x9d߲\x88\ti\xc0\xa40>\x83\xa3\x0e5\vb\x8a\xe6\xa6\xc5\xc5\xe0\x88\ti\xc0\xa4\x00\xb9i\x12opP|Y\xc0`n\xc5\xd2g\xf7\xafp\x16m'-\xb0\xc1\xe4*N\x17\xf96\x89\x98\x90\x06L\x0e\x90\x9b&\xf1\x06\aŗ\x05\fVV,\x9d[\\q\xf8\xecA\x9a\xa4\x86\r\xc6\xef\x84\xdd&\x1d1!\r\x98\x1c 7MRW\x11\xaa\xf82\u007f\xbf܊\xc7J\xb7\x925\xbfD\xc6]l\xf0\xb3\xae\xd7Xӈ\ti\xc0\xe4\x00\xb9iR\x90\xc1\x0fK\xa1iVʊ\xb1ƿ\v,\xb7\xfd\xe0\xd3\x01U#&\xa4\x01\x93C\xe4\xcc\x1e\xe7DC\xcd\x14\xa6jn\x1aќ$\xf7\x1c\x95\xf8\xb5IJ\xbfʊ\xa5g\x05\xa5\xc4\xdd^T\xb0\xf6~\xf9iĄ4`r\x88l\xb0k\xa2\xa1f\nS57m\x80FݰJV\xd3`e\xc5x\f\xfe0\xb0\xdc\xf6\xa2\x8f?+\x90\x8f\xe1ELH\x03&\x87\xa8\r\x1e\u007f\xa8\x19\xc7T\xcdM[J\xa4\u07fb\x94h\xa7i0\xb7\xe2\x9b\xc5[\xc8{h \x9f\x0fr4\xed\xacS6:bB\x1a0)@n\x1a\xe1\x84\xd0p\xf6\xfb\xe4u~m\\\x16\x1a\xb7b\xe9\x9ck\xddѳ\r\xb8\x0e\xbf>P\x85\xdb\xde\xdc^|\x8e^\xe9\x111!\r\x98\x14 7\x8d5\xa8Z\\E^\xe7\xd7\xc6e\xa1\xf1+\x96\xfe\xf0`iA\xd5)z]\x84 |p\x02?<M\xe7GLH\x03&\x83\xf1\x9d\x93\x1b7\xf1\v\t\xd3#q\xb9i\x11\x13Ҁ\xc9\xc0`\x83\xe3\x16\x12\xa6K\x02s\xd3\"&\xa4\x01\x93\x80\xd1\x06O.\x90\x9b6\xf3\x98V\x06Cn\xda\fdZ\x19\f\xb9i3\x90\xe9e00\xf3\x00\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\r\x18\f\x98\x1b0\x1807`0`n\xc0`\xc0܀\xc1\x80\xb9\x01\x83\x01s\x03\x06\x03\xe6\x06\f\x06\xcc\xcd\xff\aڧC\xea]\xae?U\x00\x00\x00\x00IEND\xaeB`\x82",
-
-	"callgraph.html": `<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Internal call graph</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Internal call graph</span></p>
-		<p>
-		  This viewer shows the portion of the internal call
-		  graph of this package that is reachable from this function.
-		  See the <a href='#pkg-callgraph'>package's call
-		  graph</a> for more information.
-		</p>
-		<ul style="margin-left: 0.5in" id="callgraph-{{.Index}}" class="treeview"></ul>
-	</div>
-</div>
-`,
-
-	"codewalk.html": `<!--
-	Copyright 2010 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<style type='text/css'>@import "/doc/codewalk/codewalk.css";</style>
-<script type="text/javascript" src="/doc/codewalk/codewalk.js"></script>
-
-<div id="codewalk-main">
-  <div class="left" id="code-column">
-    <div id='sizer'></div>
-    <div id="code-area">
-      <div id="code-header" align="center">
-        <a id="code-popout-link" href="" target="_blank">
-          <img title="View code in new window" alt="Pop Out Code" src="/doc/codewalk/popout.png" style="display: block; float: right;"/>
-        </a>
-        <select id="code-selector">
-          {{range .File}}
-          <option value="/doc/codewalk/?fileprint=/{{urlquery .}}">{{html .}}</option>
-          {{end}}
-        </select>
-      </div>
-      <div id="code">
-        <iframe class="code-display" name="code-display" id="code-display"></iframe>
-      </div>
-    </div>
-    <div id="code-options" class="setting">
-      <span>code on <a id="set-code-left" class="selected" href="#">left</a> &bull; <a id="set-code-right" href="#">right</a></span>
-      <span>code width <span id="code-column-width">70%</span></span>
-      <span>filepaths <a id="show-filepaths" class="selected" href="#">shown</a> &bull; <a id="hide-filepaths" href="#">hidden</a></span>
-    </div>
-  </div>
-  <div class="right" id="comment-column">
-    <div id="comment-area">
-      {{range .Step}}
-      <div class="comment first last">
-        <a class="comment-link" href="/doc/codewalk/?fileprint=/{{urlquery .File}}&amp;lo={{urlquery .Lo}}&amp;hi={{urlquery .Hi}}#mark" target="code-display"></a>
-        <div class="comment-title">{{html .Title}}</div>
-        <div class="comment-text">
-	{{with .Err}}
-	ERROR LOADING FILE: {{html .}}<br/><br/>
-	{{end}}
-        {{.XML}}
-        </div>
-        <div class="comment-text file-name"><span class="path-file">{{html .}}</span></div>
-      </div>
-      {{end}}
-    </div>
-    <div id="comment-options" class="setting">
-      <a id="prev-comment" href="#"><span class="hotkey">p</span>revious step</a>
-      &bull;
-      <a id="next-comment" href="#"><span class="hotkey">n</span>ext step</a>
-    </div>
-  </div>
-</div>
-`,
-
-	"codewalkdir.html": `<!--
-	Copyright 2010 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<table class="layout">
-{{range .}}
-<tr>
-	{{$name_html := html .Name}}
-	<td><a href="{{$name_html}}">{{$name_html}}</a></td>
-	<td width="25">&nbsp;</td>
-	<td>{{html .Title}}</td>
-</tr>
-{{end}}
-</table>
-`,
-
-	"dirlist.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<p>
-<table class="layout">
-<tr>
-	<th align="left">File</th>
-	<td width="25">&nbsp;</td>
-	<th align="right">Bytes</th>
-	<td width="25">&nbsp;</td>
-	<th align="left">Modified</th>
-</tr>
-<tr>
-	<td><a href="..">..</a></td>
-</tr>
-{{range .}}
-<tr>
-	{{$name_html := fileInfoName . | html}}
-	<td align="left"><a href="{{$name_html}}">{{$name_html}}</a></td>
-	<td></td>
-	<td align="right">{{html .Size}}</td>
-	<td></td>
-	<td align="left">{{fileInfoTime . | html}}</td>
-</tr>
-{{end}}
-
-</table>
-</p>
-`,
-
-	"error.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-
-<p>
-<span class="alert" style="font-size:120%">{{html .}}</span>
-</p>
-`,
-
-	"example.html": `<div id="example_{{.Name}}" class="toggle">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Example{{example_suffix .Name}}</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Example{{example_suffix .Name}}</span></p>
-		{{with .Doc}}<p>{{html .}}</p>{{end}}
-		{{$output := .Output}}
-		{{with .Play}}
-			<div class="play">
-				<div class="input"><textarea class="code" spellcheck="false">{{html .}}</textarea></div>
-				<div class="output"><pre>{{html $output}}</pre></div>
-				<div class="buttons">
-					<a class="run" title="Run this code [shift-enter]">Run</a>
-					<a class="fmt" title="Format this code">Format</a>
-					{{if not $.GoogleCN}}
-					<a class="share" title="Share this code">Share</a>
-					{{end}}
-				</div>
-			</div>
-		{{else}}
-			<p>Code:</p>
-			<pre class="code">{{.Code}}</pre>
-			{{with .Output}}
-			<p>Output:</p>
-			<pre class="output">{{html .}}</pre>
-			{{end}}
-		{{end}}
-	</div>
-</div>
-`,
-
-	"godoc.html": `<!DOCTYPE html>
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1">
-<meta name="theme-color" content="#375EAB">
-{{with .Tabtitle}}
-  <title>{{html .}} - The Go Programming Language</title>
-{{else}}
-  <title>The Go Programming Language</title>
-{{end}}
-<link type="text/css" rel="stylesheet" href="/lib/godoc/style.css">
-{{if .SearchBox}}
-<link rel="search" type="application/opensearchdescription+xml" title="godoc" href="/opensearch.xml" />
-{{end}}
-<link rel="stylesheet" href="/lib/godoc/jquery.treeview.css">
-<script type="text/javascript">window.initFuncs = [];</script>
-</head>
-<body>
-
-<div id='lowframe' style="position: fixed; bottom: 0; left: 0; height: 0; width: 100%; border-top: thin solid grey; background-color: white; overflow: auto;">
-...
-</div><!-- #lowframe -->
-
-<div id="topbar"{{if .Title}} class="wide"{{end}}><div class="container">
-<div class="top-heading" id="heading-wide"><a href="/">The Go Programming Language</a></div>
-<div class="top-heading" id="heading-narrow"><a href="/">Go</a></div>
-<a href="#" id="menu-button"><span id="menu-button-arrow">&#9661;</span></a>
-<form method="GET" action="/search">
-<div id="menu">
-<a href="/doc/">Documents</a>
-<a href="/pkg/">Packages</a>
-<a href="/project/">The Project</a>
-<a href="/help/">Help</a>
-{{if not .GoogleCN}}
-<a href="/blog/">Blog</a>
-{{end}}
-{{if .Playground}}
-<a id="playgroundButton" href="http://play.golang.org/" title="Show Go Playground">Play</a>
-{{end}}
-<span class="search-box"><input type="search" id="search" name="q" placeholder="Search" aria-label="Search" required><button type="submit"><span><svg width="24" height="24" viewBox="0 0 24 24"><title>submit search</title><path d="M15.5 14h-.79l-.28-.27C15.41 12.59 16 11.11 16 9.5 16 5.91 13.09 3 9.5 3S3 5.91 3 9.5 5.91 16 9.5 16c1.61 0 3.09-.59 4.23-1.57l.27.28v.79l5 4.99L20.49 19l-4.99-5zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z"/><path d="M0 0h24v24H0z" fill="none"/></svg></span></button></span>
-</div>
-</form>
-
-</div></div>
-
-{{if .Playground}}
-<div id="playground" class="play">
-	<div class="input"><textarea class="code" spellcheck="false">package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("Hello, 世界")
-}</textarea></div>
-	<div class="output"></div>
-	<div class="buttons">
-		<a class="run" title="Run this code [shift-enter]">Run</a>
-		<a class="fmt" title="Format this code">Format</a>
-		{{if not $.GoogleCN}}
-		<a class="share" title="Share this code">Share</a>
-		{{end}}
-	</div>
-</div>
-{{end}}
-
-<div id="page"{{if .Title}} class="wide"{{end}}>
-<div class="container">
-
-{{if or .Title .SrcPath}}
-  <h1>
-    {{html .Title}}
-    {{html .SrcPath | srcBreadcrumb}}
-  </h1>
-{{end}}
-
-{{with .Subtitle}}
-  <h2>{{html .}}</h2>
-{{end}}
-
-{{with .SrcPath}}
-  <h2>
-    Documentation: {{html . | srcToPkgLink}}
-  </h2>
-{{end}}
-
-{{/* The Table of Contents is automatically inserted in this <div>.
-     Do not delete this <div>. */}}
-<div id="nav"></div>
-
-{{/* Body is HTML-escaped elsewhere */}}
-{{printf "%s" .Body}}
-
-<div id="footer">
-Build version {{html .Version}}.<br>
-Except as <a href="https://developers.google.com/site-policies#restrictions">noted</a>,
-the content of this page is licensed under the
-Creative Commons Attribution 3.0 License,
-and code is licensed under a <a href="/LICENSE">BSD license</a>.<br>
-<a href="/doc/tos.html">Terms of Service</a> |
-<a href="http://www.google.com/intl/en/policies/privacy/">Privacy Policy</a>
-</div>
-
-</div><!-- .container -->
-</div><!-- #page -->
-
-<!-- TODO(adonovan): load these from <head> using "defer" attribute? -->
-<script type="text/javascript" src="/lib/godoc/jquery.js"></script>
-<script type="text/javascript" src="/lib/godoc/jquery.treeview.js"></script>
-<script type="text/javascript" src="/lib/godoc/jquery.treeview.edit.js"></script>
-
-{{if .Playground}}
-<script type="text/javascript" src="/lib/godoc/playground.js"></script>
-{{end}}
-{{with .Version}}<script>var goVersion = {{printf "%q" .}};</script>{{end}}
-<script type="text/javascript" src="/lib/godoc/godocs.js"></script>
-
-</body>
-</html>
-
-`,
-
-	"godocs.js": `// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/* A little code to ease navigation of these documents.
- *
- * On window load we:
- *  + Generate a table of contents (generateTOC)
- *  + Bind foldable sections (bindToggles)
- *  + Bind links to foldable sections (bindToggleLinks)
- */
-
-(function() {
-'use strict';
-
-// Mobile-friendly topbar menu
-$(function() {
-  var menu = $('#menu');
-  var menuButton = $('#menu-button');
-  var menuButtonArrow = $('#menu-button-arrow');
-  menuButton.click(function(event) {
-    menu.toggleClass('menu-visible');
-    menuButtonArrow.toggleClass('vertical-flip');
-    event.preventDefault();
-    return false;
-  });
-});
-
-/* Generates a table of contents: looks for h2 and h3 elements and generates
- * links. "Decorates" the element with id=="nav" with this table of contents.
- */
-function generateTOC() {
-  if ($('#manual-nav').length > 0) {
-    return;
-  }
-
-  var nav = $('#nav');
-  if (nav.length === 0) {
-    return;
-  }
-
-  var toc_items = [];
-  $(nav).nextAll('h2, h3').each(function() {
-    var node = this;
-    if (node.id == '')
-      node.id = 'tmp_' + toc_items.length;
-    var link = $('<a/>').attr('href', '#' + node.id).text($(node).text());
-    var item;
-    if ($(node).is('h2')) {
-      item = $('<dt/>');
-    } else { // h3
-      item = $('<dd class="indent"/>');
-    }
-    item.append(link);
-    toc_items.push(item);
-  });
-  if (toc_items.length <= 1) {
-    return;
-  }
-
-  var dl1 = $('<dl/>');
-  var dl2 = $('<dl/>');
-
-  var split_index = (toc_items.length / 2) + 1;
-  if (split_index < 8) {
-    split_index = toc_items.length;
-  }
-  for (var i = 0; i < split_index; i++) {
-    dl1.append(toc_items[i]);
-  }
-  for (/* keep using i */; i < toc_items.length; i++) {
-    dl2.append(toc_items[i]);
-  }
-
-  var tocTable = $('<table class="unruled"/>').appendTo(nav);
-  var tocBody = $('<tbody/>').appendTo(tocTable);
-  var tocRow = $('<tr/>').appendTo(tocBody);
-
-  // 1st column
-  $('<td class="first"/>').appendTo(tocRow).append(dl1);
-  // 2nd column
-  $('<td/>').appendTo(tocRow).append(dl2);
-}
-
-function bindToggle(el) {
-  $('.toggleButton', el).click(function() {
-    if ($(this).closest(".toggle, .toggleVisible")[0] != el) {
-      // Only trigger the closest toggle header.
-      return;
-    }
-
-    if ($(el).is('.toggle')) {
-      $(el).addClass('toggleVisible').removeClass('toggle');
-    } else {
-      $(el).addClass('toggle').removeClass('toggleVisible');
-    }
-  });
-}
-
-function bindToggles(selector) {
-  $(selector).each(function(i, el) {
-    bindToggle(el);
-  });
-}
-
-function bindToggleLink(el, prefix) {
-  $(el).click(function() {
-    var href = $(el).attr('href');
-    var i = href.indexOf('#'+prefix);
-    if (i < 0) {
-      return;
-    }
-    var id = '#' + prefix + href.slice(i+1+prefix.length);
-    if ($(id).is('.toggle')) {
-      $(id).find('.toggleButton').first().click();
-    }
-  });
-}
-function bindToggleLinks(selector, prefix) {
-  $(selector).each(function(i, el) {
-    bindToggleLink(el, prefix);
-  });
-}
-
-function setupDropdownPlayground() {
-  if (!$('#page').is('.wide')) {
-    return; // don't show on front page
-  }
-  var button = $('#playgroundButton');
-  var div = $('#playground');
-  var setup = false;
-  button.toggle(function() {
-    button.addClass('active');
-    div.show();
-    if (setup) {
-      return;
-    }
-    setup = true;
-    playground({
-      'codeEl': $('.code', div),
-      'outputEl': $('.output', div),
-      'runEl': $('.run', div),
-      'fmtEl': $('.fmt', div),
-      'shareEl': $('.share', div),
-      'shareRedirect': '//play.golang.org/p/'
-    });
-  },
-  function() {
-    button.removeClass('active');
-    div.hide();
-  });
-  button.show();
-  $('#menu').css('min-width', '+=60');
-}
-
-function setupInlinePlayground() {
-	'use strict';
-	// Set up playground when each element is toggled.
-	$('div.play').each(function (i, el) {
-		// Set up playground for this example.
-		var setup = function() {
-			var code = $('.code', el);
-			playground({
-				'codeEl':   code,
-				'outputEl': $('.output', el),
-				'runEl':    $('.run', el),
-				'fmtEl':    $('.fmt', el),
-				'shareEl':  $('.share', el),
-				'shareRedirect': '//play.golang.org/p/'
-			});
-
-			// Make the code textarea resize to fit content.
-			var resize = function() {
-				code.height(0);
-				var h = code[0].scrollHeight;
-				code.height(h+20); // minimize bouncing.
-				code.closest('.input').height(h);
-			};
-			code.on('keydown', resize);
-			code.on('keyup', resize);
-			code.keyup(); // resize now.
-		};
-		
-		// If example already visible, set up playground now.
-		if ($(el).is(':visible')) {
-			setup();
-			return;
-		}
-
-		// Otherwise, set up playground when example is expanded.
-		var built = false;
-		$(el).closest('.toggle').click(function() {
-			// Only set up once.
-			if (!built) {
-				setup();
-				built = true;
-			}
-		});
-	});
-}
-
-// fixFocus tries to put focus to div#page so that keyboard navigation works.
-function fixFocus() {
-  var page = $('div#page');
-  var topbar = $('div#topbar');
-  page.css('outline', 0); // disable outline when focused
-  page.attr('tabindex', -1); // and set tabindex so that it is focusable
-  $(window).resize(function (evt) {
-    // only focus page when the topbar is at fixed position (that is, it's in
-    // front of page, and keyboard event will go to the former by default.)
-    // by focusing page, keyboard event will go to page so that up/down arrow,
-    // space, etc. will work as expected.
-    if (topbar.css('position') == "fixed")
-      page.focus();
-  }).resize();
-}
-
-function toggleHash() {
-  var id = window.location.hash.substring(1);
-  // Open all of the toggles for a particular hash.
-  var els = $(
-    document.getElementById(id),
-    $('a[name]').filter(function() {
-      return $(this).attr('name') == id;
-    })
-  );
-
-  while (els.length) {
-    for (var i = 0; i < els.length; i++) {
-      var el = $(els[i]);
-      if (el.is('.toggle')) {
-        el.find('.toggleButton').first().click();
-      }
-    }
-    els = el.parent();
-  }
-}
-
-function personalizeInstallInstructions() {
-  var prefix = '?download=';
-  var s = window.location.search;
-  if (s.indexOf(prefix) != 0) {
-    // No 'download' query string; detect "test" instructions from User Agent.
-    if (navigator.platform.indexOf('Win') != -1) {
-      $('.testUnix').hide();
-      $('.testWindows').show();
-    } else {
-      $('.testUnix').show();
-      $('.testWindows').hide();
-    }
-    return;
-  }
-
-  var filename = s.substr(prefix.length);
-  var filenameRE = /^go1\.\d+(\.\d+)?([a-z0-9]+)?\.([a-z0-9]+)(-[a-z0-9]+)?(-osx10\.[68])?\.([a-z.]+)$/;
-  $('.downloadFilename').text(filename);
-  $('.hideFromDownload').hide();
-  var m = filenameRE.exec(filename);
-  if (!m) {
-    // Can't interpret file name; bail.
-    return;
-  }
-
-  var os = m[3];
-  var ext = m[6];
-  if (ext != 'tar.gz') {
-    $('#tarballInstructions').hide();
-  }
-  if (os != 'darwin' || ext != 'pkg') {
-    $('#darwinPackageInstructions').hide();
-  }
-  if (os != 'windows') {
-    $('#windowsInstructions').hide();
-    $('.testUnix').show();
-    $('.testWindows').hide();
-  } else {
-    if (ext != 'msi') {
-      $('#windowsInstallerInstructions').hide();
-    }
-    if (ext != 'zip') {
-      $('#windowsZipInstructions').hide();
-    }
-    $('.testUnix').hide();
-    $('.testWindows').show();
-  }
-
-  var download = "https://storage.googleapis.com/golang/" + filename;
-
-  var message = $('<p class="downloading">'+
-    'Your download should begin shortly. '+
-    'If it does not, click <a>this link</a>.</p>');
-  message.find('a').attr('href', download);
-  message.insertAfter('#nav');
-
-  window.location = download;
-}
-
-function updateVersionTags() {
-  var v = window.goVersion;
-  if (/^go[0-9.]+$/.test(v)) {
-    $(".versionTag").empty().text(v);
-    $(".whereTag").hide();
-  }
-}
-
-function addPermalinks() {
-  function addPermalink(source, parent) {
-    var id = source.attr("id");
-    if (id == "" || id.indexOf("tmp_") === 0) {
-      // Auto-generated permalink.
-      return;
-    }
-    if (parent.find("> .permalink").length) {
-      // Already attached.
-      return;
-    }
-    parent.append(" ").append($("<a class='permalink'>&#xb6;</a>").attr("href", "#" + id));
-  }
-
-  $("#page .container").find("h2[id], h3[id]").each(function() {
-    var el = $(this);
-    addPermalink(el, el);
-  });
-
-  $("#page .container").find("dl[id]").each(function() {
-    var el = $(this);
-    // Add the anchor to the "dt" element.
-    addPermalink(el, el.find("> dt").first());
-  });
-}
-
-$(document).ready(function() {
-  generateTOC();
-  addPermalinks();
-  bindToggles(".toggle");
-  bindToggles(".toggleVisible");
-  bindToggleLinks(".exampleLink", "example_");
-  bindToggleLinks(".overviewLink", "");
-  bindToggleLinks(".examplesLink", "");
-  bindToggleLinks(".indexLink", "");
-  setupDropdownPlayground();
-  setupInlinePlayground();
-  fixFocus();
-  setupTypeInfo();
-  setupCallgraphs();
-  toggleHash();
-  personalizeInstallInstructions();
-  updateVersionTags();
-
-  // godoc.html defines window.initFuncs in the <head> tag, and root.html and
-  // codewalk.js push their on-page-ready functions to the list.
-  // We execute those functions here, to avoid loading jQuery until the page
-  // content is loaded.
-  for (var i = 0; i < window.initFuncs.length; i++) window.initFuncs[i]();
-});
-
-// -- analysis ---------------------------------------------------------
-
-// escapeHTML returns HTML for s, with metacharacters quoted.
-// It is safe for use in both elements and attributes
-// (unlike the "set innerText, read innerHTML" trick).
-function escapeHTML(s) {
-    return s.replace(/&/g, '&amp;').
-             replace(/\"/g, '&quot;').
-             replace(/\'/g, '&#39;').
-             replace(/</g, '&lt;').
-             replace(/>/g, '&gt;');
-}
-
-// makeAnchor returns HTML for an <a> element, given an anchorJSON object.
-function makeAnchor(json) {
-  var html = escapeHTML(json.Text);
-  if (json.Href != "") {
-      html = "<a href='" + escapeHTML(json.Href) + "'>" + html + "</a>";
-  }
-  return html;
-}
-
-function showLowFrame(html) {
-  var lowframe = document.getElementById('lowframe');
-  lowframe.style.height = "200px";
-  lowframe.innerHTML = "<p style='text-align: left;'>" + html + "</p>\n" +
-      "<div onclick='hideLowFrame()' style='position: absolute; top: 0; right: 0; cursor: pointer;'>✘</div>"
-};
-
-document.hideLowFrame = function() {
-  var lowframe = document.getElementById('lowframe');
-  lowframe.style.height = "0px";
-}
-
-// onClickCallers is the onclick action for the 'func' tokens of a
-// function declaration.
-document.onClickCallers = function(index) {
-  var data = document.ANALYSIS_DATA[index]
-  if (data.Callers.length == 1 && data.Callers[0].Sites.length == 1) {
-    document.location = data.Callers[0].Sites[0].Href; // jump to sole caller
-    return;
-  }
-
-  var html = "Callers of <code>" + escapeHTML(data.Callee) + "</code>:<br/>\n";
-  for (var i = 0; i < data.Callers.length; i++) {
-    var caller = data.Callers[i];
-    html += "<code>" + escapeHTML(caller.Func) + "</code>";
-    var sites = caller.Sites;
-    if (sites != null && sites.length > 0) {
-      html += " at line ";
-      for (var j = 0; j < sites.length; j++) {
-        if (j > 0) {
-          html += ", ";
-        }
-        html += "<code>" + makeAnchor(sites[j]) + "</code>";
-      }
-    }
-    html += "<br/>\n";
-  }
-  showLowFrame(html);
-};
-
-// onClickCallees is the onclick action for the '(' token of a function call.
-document.onClickCallees = function(index) {
-  var data = document.ANALYSIS_DATA[index]
-  if (data.Callees.length == 1) {
-    document.location = data.Callees[0].Href; // jump to sole callee
-    return;
-  }
-
-  var html = "Callees of this " + escapeHTML(data.Descr) + ":<br/>\n";
-  for (var i = 0; i < data.Callees.length; i++) {
-    html += "<code>" + makeAnchor(data.Callees[i]) + "</code><br/>\n";
-  }
-  showLowFrame(html);
-};
-
-// onClickTypeInfo is the onclick action for identifiers declaring a named type.
-document.onClickTypeInfo = function(index) {
-  var data = document.ANALYSIS_DATA[index];
-  var html = "Type <code>" + data.Name + "</code>: " +
-  "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<small>(size=" + data.Size + ", align=" + data.Align + ")</small><br/>\n";
-  html += implementsHTML(data);
-  html += methodsetHTML(data);
-  showLowFrame(html);
-};
-
-// implementsHTML returns HTML for the implements relation of the
-// specified TypeInfoJSON value.
-function implementsHTML(info) {
-  var html = "";
-  if (info.ImplGroups != null) {
-    for (var i = 0; i < info.ImplGroups.length; i++) {
-      var group = info.ImplGroups[i];
-      var x = "<code>" + escapeHTML(group.Descr) + "</code> ";
-      for (var j = 0; j < group.Facts.length; j++) {
-        var fact = group.Facts[j];
-        var y = "<code>" + makeAnchor(fact.Other) + "</code>";
-        if (fact.ByKind != null) {
-          html += escapeHTML(fact.ByKind) + " type " + y + " implements " + x;
-        } else {
-          html += x + " implements " + y;
-        }
-        html += "<br/>\n";
-      }
-    }
-  }
-  return html;
-}
-
-
-// methodsetHTML returns HTML for the methodset of the specified
-// TypeInfoJSON value.
-function methodsetHTML(info) {
-  var html = "";
-  if (info.Methods != null) {
-    for (var i = 0; i < info.Methods.length; i++) {
-      html += "<code>" + makeAnchor(info.Methods[i]) + "</code><br/>\n";
-    }
-  }
-  return html;
-}
-
-// onClickComm is the onclick action for channel "make" and "<-"
-// send/receive tokens.
-document.onClickComm = function(index) {
-  var ops = document.ANALYSIS_DATA[index].Ops
-  if (ops.length == 1) {
-    document.location = ops[0].Op.Href; // jump to sole element
-    return;
-  }
-
-  var html = "Operations on this channel:<br/>\n";
-  for (var i = 0; i < ops.length; i++) {
-    html += makeAnchor(ops[i].Op) + " by <code>" + escapeHTML(ops[i].Fn) + "</code><br/>\n";
-  }
-  if (ops.length == 0) {
-    html += "(none)<br/>\n";
-  }
-  showLowFrame(html);
-};
-
-$(window).load(function() {
-    // Scroll window so that first selection is visible.
-    // (This means we don't need to emit id='L%d' spans for each line.)
-    // TODO(adonovan): ideally, scroll it so that it's under the pointer,
-    // but I don't know how to get the pointer y coordinate.
-    var elts = document.getElementsByClassName("selection");
-    if (elts.length > 0) {
-	elts[0].scrollIntoView()
-    }
-});
-
-// setupTypeInfo populates the "Implements" and "Method set" toggle for
-// each type in the package doc.
-function setupTypeInfo() {
-  for (var i in document.ANALYSIS_DATA) {
-    var data = document.ANALYSIS_DATA[i];
-
-    var el = document.getElementById("implements-" + i);
-    if (el != null) {
-      // el != null => data is TypeInfoJSON.
-      if (data.ImplGroups != null) {
-        el.innerHTML = implementsHTML(data);
-        el.parentNode.parentNode.style.display = "block";
-      }
-    }
-
-    var el = document.getElementById("methodset-" + i);
-    if (el != null) {
-      // el != null => data is TypeInfoJSON.
-      if (data.Methods != null) {
-        el.innerHTML = methodsetHTML(data);
-        el.parentNode.parentNode.style.display = "block";
-      }
-    }
-  }
-}
-
-function setupCallgraphs() {
-  if (document.CALLGRAPH == null) {
-    return
-  }
-  document.getElementById("pkg-callgraph").style.display = "block";
-
-  var treeviews = document.getElementsByClassName("treeview");
-  for (var i = 0; i < treeviews.length; i++) {
-    var tree = treeviews[i];
-    if (tree.id == null || tree.id.indexOf("callgraph-") != 0) {
-      continue;
-    }
-    var id = tree.id.substring("callgraph-".length);
-    $(tree).treeview({collapsed: true, animated: "fast"});
-    document.cgAddChildren(tree, tree, [id]);
-    tree.parentNode.parentNode.style.display = "block";
-  }
-}
-
-document.cgAddChildren = function(tree, ul, indices) {
-  if (indices != null) {
-    for (var i = 0; i < indices.length; i++) {
-      var li = cgAddChild(tree, ul, document.CALLGRAPH[indices[i]]);
-      if (i == indices.length - 1) {
-        $(li).addClass("last");
-      }
-    }
-  }
-  $(tree).treeview({animated: "fast", add: ul});
-}
-
-// cgAddChild adds an <li> element for document.CALLGRAPH node cgn to
-// the parent <ul> element ul. tree is the tree's root <ul> element.
-function cgAddChild(tree, ul, cgn) {
-   var li = document.createElement("li");
-   ul.appendChild(li);
-   li.className = "closed";
-
-   var code = document.createElement("code");
-
-   if (cgn.Callees != null) {
-     $(li).addClass("expandable");
-
-     // Event handlers and innerHTML updates don't play nicely together,
-     // hence all this explicit DOM manipulation.
-     var hitarea = document.createElement("div");
-     hitarea.className = "hitarea expandable-hitarea";
-     li.appendChild(hitarea);
-
-     li.appendChild(code);
-
-     var childUL = document.createElement("ul");
-     li.appendChild(childUL);
-     childUL.setAttribute('style', "display: none;");
-
-     var onClick = function() {
-       document.cgAddChildren(tree, childUL, cgn.Callees);
-       hitarea.removeEventListener('click', onClick)
-     };
-     hitarea.addEventListener('click', onClick);
-
-   } else {
-     li.appendChild(code);
-   }
-   code.innerHTML += "&nbsp;" + makeAnchor(cgn.Func);
-   return li
-}
-
-})();
-`,
-
-	"images/minus.gif": "GIF89a\t\x00\t\x00\xf7\x00\x00\x00\x00\x00\x80\x80\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xff\x00,\x00\x00\x00\x00\t\x00\t\x00\x00\b\"\x00\x03\b\x1cH\xf0\x9f\xc1\x83\xff\x04\"<\xa8pa\xc2\x00\xff\x00H\x94\xf8\xd0aE\x87\r\x17\x12\xdc\x18  \x00;",
-
-	"images/plus.gif": "GIF89a\t\x00\t\x00\xf7\x00\x00\x00\x00\x00\x80\x80\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xff\x00,\x00\x00\x00\x00\t\x00\t\x00\x00\b&\x00\x03\b\x1cH\xf0\x9f\xc1\x83\xff\x04\x1e\x04pP\xa1A\x86\x06\x15\x02\x9881a\x80\x85\r/>̈0#A\x82\x01\x01\x00;",
-
-	"images/treeview-black-line.gif": "GIF89a\x10\x00\xf0\x06\xf7\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xff\x00,\x00\x00\x00\x00\x10\x00\xf0\x06\x00\b\xff\x00\xff\t\x1c\xf8\x0f\x00\xc1\x83\b\r\"\\X\x90\xe1B\x85\x0e\tB\x8c(p\"E\x8b\x111:\xd4\xc8\x10\x80Ǐ\x1f\x1fR\x948r G\x91%\x1b\xa6<\x990\xa5ʒ,\x0f\xc6$\xb9\xd2\xe5L\x936s\xd6\xdc\tSgO\x9e#oV\xf4\x19\x94\xe8E\xa3\x19\x91nTڑ)ʟP\x8b\x02=:5iեW\x9bf}*5*U\xafV\xc1b\x15\xab\x95,\u05ef]Ӣ]\x1bVm[\xb6c\xddƅ[Vn]\xbag\xdfꝻ\xf7n\u07fc|\x03\xfb\x15\fx\xb0\xe1\u0088[nUl\x96\xb1\xdd\xc42\x9d:\xc6;\xf9oe\u0097\x0fg\x86L\xb3q\xe4ş=w~\xbc\xb9thҧ)\xa7\xb6\xbc\x1askͯ9\xe3\x04=Zumַ]熽[\xf6PڳE\aG\xdd\xdbt\xf1\xd8Ƈ\xdbV\x8e\x9b\xb9n缡\xfb~Iܥ\xf5\xebسk\xdfν{\xf4\xdf\xc2\xc1W\xff\x17\xbf\x9c|s\xf3\xcf\xd1\u007f\xa7^\x9e\xfdy\xf7\xe9\xe1\xaf\x17*\u007f:\xfd\xfb\x92\x91\xeb?\xce_zr\xf5\xf6\xe5\xd7\x1f\x80\xff\xd5W ~\xc0\x11\xb8\x9f\u007f\v*8\xa0\x81\rB\xf8 \x82\xe1I\xc8\xe0\x84\x02^\xa8\xa1\x83\x1bZ\xc8\xe1\x87\x1e\x86H\xe1x\"f\b\xe2\x88\xed\xa1\xf8\x9e\x8a\xf1\xb18\x9f\x89%&\x18c\x85.\x06(c\x8d\a\u0088c\x84;bx\xa3\x8e@\xfe($\x8dA\x129$\x89=v\x98\xe4\x89E\"\xd9d\x8aO\xae\x18e\x8bS\xbex$\x94WJ\x99%\x95[Zi\xe4\x97Nvi#\x98X\x92\xa9\xa5\x99\\\xa2\xe9e\x98j\x8e\xc9\xe6\x9be\xc2y\xa6\x9ciҹf\x9cxΙg\x9d{ީ\xe7\x9f|\x02\xeag\xa0\x84\x0ej\xa8\x9b}\"*\xa8\xa2\x852zh\x8ebBڦ\xa4v:j)\xa5\x89b\xba\xa8\xa6\x8dr\xfa(\x8fU^\nj\xa4\xa3NZj\xa5\x9e\x8a꣩\xab\xa2zj\xa6\xafn\xff\x1ak\xa7\xb3~\xda*\xac\xb7ʚ+\xad\xbbڪd\xa8\xa9\x06[\xab\xaa\xbf\x92\xda+\xb1L\x1a[,\xab˺z\xac\xb0\xcf\x0e\vm\xb3\xb8R\xab\xab\xb5\xbcb\xebk\xb2\xccr묶\xc8\xce\xf8\xad\xb7Ւ{\xad\xb9٢\xbb\xad\xb8\xe5\xb2{\xae\xbb\xe9»\xee\x92\xf2\x86K\xef\xbd\xc0J\xabo\xb4\xfc\x82;\xad\xba\xf6\xe6\xdb/\xc0\xff\xd6[0\xbe\xca\x12\xbc\xaf\xbf\v+<\xb0\xc1\rC\xfc0\xc2\xddJ\xcc\xf0\xc4\x02_\xac\xb1\xc3\x1b[\xcc\xf1\xc7\x1e\x87L\xf1\xb8\"g\f\xf2\xc8\xed\xa2\xfc\xae\xca\xf1\xb2<\xaf\xc9%'\x1cs\xc5.\a,s\xcd\aÌs\xc4;c|\xb3\xce@\xff,4\xcdA\x13=4\xc9=w\x9c\xf4\xc9E#\xddt\xcaO\xaf\x1cu\xcbS\xbf|4\xd4WK\x9d5\xd5[[m\xf4\xd7Nwm3\xd8X\x93\xad\xb5\xd9\\\xa3\xedu\xd8j\x8f\xcd\xf6\xdbe\xc3}\xb6\xdciӽv\xdcxϝw\xdd{\xdf\xff\xad\xf7\xdf|\x03\xeew\xe0\x84\x0fn\xb8\xdb}#.\xb8\xe2\x853~x\xcebC\u07b6\xe4v;n9\xe5\x89c\xbe\xb8\xe6\x8ds\xfe8\xcfU_\x0ez\xe4\xa3O^z型\xee\xb3髣~z\xe6\xafo\x1e{\xe7\xb3\u007f\xde:\xec\xb7˞;\xed\xbbۮt\xe8\xa9\a_\xbb꿓\xde;\xf1L\x1b_<\xeb˻~\xbc\xf0\xcf\x0f\x0f}\xf3\xb8S\xaf\xbb\xf5\xbcc\xef{\xf2\xccs\xef\xbc\xf6\xc8\xcf\xfc\xbd\xf7Փ\u007f\xbd\xf9٣\xbf\xbd\xf8\xe5\xb3\u007f\xbe\xfb\xe9ÿ\xfe\xd2\xf2\x87O\xff\xfd\xc0K\xaf\u007f\xf4\xfc\x83?\xbd\xfa\xf6\xcb_\xff\x00\xf8\xbf\xfa\x15\x10\u007f\xca#\xe0\xfe\xfc\xb7@\x05\x0eЀ\r\x84\xe0\x03\x11\xd8=\t2p\x82\x02\xbc\xa0\x06\x1d\xb8A\vr\xf0\x83\x1e\f!\x05\xc7'\xc2\f\x82p\x84\xedC\xe1\xfbT\x18?\x16\xceτ%L`\f+\xe8\xc2\x00ʰ\x86\a\x84!\x0e#\xb8C\f\xdeP\x87@\xfc\xa1\x102i\x18D\"\x0e\x91\x84=\xec`\x12OXD$61\x85O\\a\x14[8\xc5\x17\x1e\x11\x8aW\x94b\x16\xa9\xb8E+\x1a\xf1\x8bN\xec\xa2\ri\b\x12\x90\x04\x04\x00;",
-
-	"images/treeview-black.gif": "GIF89a`\x00\x85\x00\xa1\x01\x00\x00\x00\x00\xff\xff\xff\xff\xff\xff\xff\xff\xff!\xf9\x04\x01\x00\x00\x02\x00,\x00\x00\x00\x00`\x00\x85\x00\x00\x02\xfe\x94\x8f\xa9\xcb\xed\x0fE\x98\xc1ш\xb3ި\xf2\x0f\x86\x9a'\x96\xa6I\x9e\xeaʶ\xee\nIJ\xfc\xd6&\xb0\xe0\xf6\xfe\xe9\x82\xef\xe3\t#\xc0Cp\x88d\xe0f\xcbY\xf2\x89(\x1a\x8eP\xa8\xf4W\xcdNs\xda,\xd3\xd9\xedR\xc3^\xb2yl~\xa2\xd3\xc85[\xe8~\xabRF9\x8f\xbe\xb5o.\x96\tW?R\x12\a\x98\x80Gx\x88\x98\b\xf8E\xa3\xa826\xe8\x88\x01)yBY)\xf8\xe3Ą\xd9\xf3\xd7\tr\t\xea\xa9\x109\x9a\xc3hzڠ\xba\xfa\xd0\xea\xca\x1a{3\x9bY\x1b\x02\xebj\x98\xbb\xba\x1b\xcb\xd7\x00\x1c\xf5k\xdb{{\x8c\x9c\xac\x8cʸ\xac\xf4\xe9<\x9c\x87\x15\x9dp\xc5{\xdaD\xc3Y}]m]7\xfdM\r>>\x95j\x9e\xae\xbe\xceގd\xb8\x0e\xff+\xac@\u007f뛎o\xae?\xce\xef\x8e\x1d+\x15@P\xa2\xc6yKwМ\xb6\x18\x9a\x1aEKh0\x1c\xb9\x88\xa5\xd4\tt\x871\xa3\xc6d\x8d\x06\xe4\xe5\xdb豗\x9f>!O\x95\xfcv\xb2ZJ\x8e,\r\xa2C\b\xed[A\x991\xbb5d\xc8\xedaM\x9d\x15a\xf6T\xf8\xb2\xa5СDG\xadtvtY\xd2J\xf6:\x8cT\xb8q`-\xa9\xb3\xa8\x06\xfc\x17\x94b9\xa8?\xb5J\x83\xca)\xa7\xb3\x996\xbb\xd24\xdb-kѵlۺ}\v7.\x82\x02\x00;",
-
-	"images/treeview-default-line.gif": "GIF89a\x10\x00\xf0\x06\xf7\x00\x00\x00\x00\x00\x80\x80\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xff\x00,\x00\x00\x00\x00\x10\x00\xf0\x06\x00\b\xff\x00\xff\t\x1cH\xb0\xa0A\x81\x01\x0e*\\x0!Ç\v\x1dB\x9cHP\"E\x8a\t3\xfe\xd3x\xb1aNj\x16?2\f)R!ɒ\x06O\xa2\xac\xb8rdˈ/M\xc6\xf48\xb3\xa0ʗ7[\xe6\\\xb9\x13eϒ?E\x06\xfd8\xb4cQ\x905m&e\xb9\x14aS\xa7O\x8fb|\xba\x91\xaaԉW!f}\xb8\xd5eT\xab`\xbf\x8am\xda\x15\xe6إee\x9eM\x9a\x96&ٰo\xd7\xd6l\x9b\x12.Z\xbbl\xf1\xce\xd5;\x93\xaeR\xb9}\xf9\xc6\xf4\xcb4\xaeỀ\a\vƹXgc\x9e\x8f}F\x06:Yhe\xa2\x97\xa9j\xde̹3\xd7\xccH\x133\x16\xed\x984dӒQSVm\x995f\xd7FAO\x85\x1d\xfap^ڳm\xefōUvo\xdeZ}\a\a\xfe\x99\xb8W݁\x8d\x9bE\xaeX\xb9Z棡\x97\x96~\x9azj뫱\xb7\xd6\xfe\x9a{l\xe7n\x11{\xff\xaf-\xbe\xfc\xed\xf1\xb9\xcd\xefF\xff\x9b\xfdp\xf7\xc5\xe1\x1fW\x9f\\\xfer\xfa\xcd\xed?\xc7\x1f\x9d\xfft\xff\xd5\x01x\x9d\x80\xd9\x11\xb8\x9d\x81\xdd!\xf8\x9d~ᝧ y\x0eF\xb8ރ\xe9IX\x1f\x85\xeda\xf8\x9e\x86\xf1q8\x9f\x85\xf9yx\x1f\x88\xfd\x91\xf8\x9f\x89\x01\xa28\xa0\x8a\x05\xb2x\xa0\x8b\t¸\xa0\x88\xfb\xc9\b\xe1\x846V\x88\xe3\x8e\x17昡\x8f\x1b\x02١\x90\x1f\xf2\x18\"\x91#\x1aY\xa2\x92'2\x99\xa2\x93+B٢\x94/R\x19\xa3\x953\"Y#\x967\xf6ȥ\x8e^\x86y\xe4\x97?\x92\x19\xa4\x99C\xa2Y\xa4\x98K\xb2٤\x9bO\xc2\x19\xa5\x9cS\xd2Y\xa5\x9dW♥\x9aI\xea\xd9\xe5\x98~\x82\t\xe8\xa0m\x12\xfa\xa6\xa1q\":\xa7\xa2u2z\xa7\xa3yB\xbag\xa0eRz\xa6\xa5ib\xba\xa6\xa4\u007f\x16\xea顟&\x1aꢣ6Z꣧F\x9aꤜ\n\xbaj\xa7\xa0\xc6\xff*\xaa\xac\xa4\xd2j\xaa\xad\xa8⪪\xae\xac\xbe\xea*\xaf\xb0\xce*l\xad\xc3\xdeZl\xae\xc7\xee\x9al\xaf\xc0\xfe\xbal\xb0\xc4Fk\xac\xb4\xc8R\xab\xac\xb5\xcc>\xeb,\xb6\xd0N\xebm\xb5\xdf^\x1bn\xb6\xdcn;n\xb7\xe0\xa6+\xae\xba\xe4\x9ek.\xbb\xe8\xae+o\xbb\xf0\xbe;o\xbc\xf4\xdeko\xbe\xfc\xe2\xeb\xef\xbe\xffVڪ\xc0\xbe\x12ܬ\xc1\xda\"\\\xae\xc2\xee2\\\xaf\xc3\xfaB\xdc/\xc0\x14K\x1c\xf0\xa5\x03c\\\xb0\xc6\as\x9c\xb0\xc7\v\x83ܰ\xc8\x0f\x93\x1c\xb1\xc9\x13[\\1\xca\x17g\x9a\xb1\xcb\x1b\xc3ܱ\xcc\x1f\xd3\x1c\xb2\xcd#\xe3\\\xb2\xce'\xf3\x9c2\xcb+\xfb\xdc\xf2\xa61\x13=\xb3\xd15#}\xb3\xd293\xbd\xb3\xd3=C\xfd\xb3\xd0AK=t\x9f/[]5\xd6Es}\xb4\xd7I\x83\xbd\xb4\xd8M\x93\xfd\xb4\xd9Q\xa3=\xb5\xd6*\xb7\r\xb4\xdbT\xc3\xcd\xf6\xdbt\xc7]\xf7\xdcv\xe7\x8d\xf7\xdej_\xff\xbd\xa5\xa6}o\xfdwց\xcb]\xf8݇\xeb\x9d8߃w\xdd\xf8\u05cf\x87\x1d\xf9ؓ\x97]\xf9ٗ\xa7\x9d\xf9ڋw\xbe\xb9\xdf\r\xf2\xf9\xb9\xe0\xa1\x03>\xba\xe1\xa7#\x9e\xba\xe2\xab3^:\xe1\xad{\xfe\xba\xe3\xb3C^\xbb\xe4\xb7S\x9e\xbb\xe5\xbbc\u07bb\xe6\xbfs\x1e\xfb\xf0\xc1\x83^\x17x\xc73\x98<\x8dœ\xbe\xbc\x96ͣ\x1e\xbd\xeaӳ^\xbd\xebϋ~\xbd\xecٛ\xbe=\xf1\xdd\xc3\xfe\xfd\xf8\xe1\xd3^\xbe\xed\xe7㞾\xee\xeb\xf3\u07be\xef\xef\x03\x1f\xbf\xf0\xe4\xff\xa5\xbc\xfd\xcc\xcfo<\xfe\xd0\xeb\xef<\xff\xda\xf3\x9f\xf4\x04H=\x02Zπ\xd8\x03\xa0\xf7\x10\xc8=\x05\x8a\x8f\x81\xe0s\xa0\xf9$\x88>\n\xaaς\xecà\xfb4\b?\x0e\xcaσ\xf4\x83`\xfd\n\x93?\x10\ue3c4\xfd3\xe1\xffP\x18@\x15\x0eЅ\x05\x84\xe1\x01e\x98@\x16.\x90\x86\r\xb4\xe1\x03q\x18A\x1dNЇ\x15\x04\xe2\x05\xa6\x85\x98A\"nЈ\x1dD\xe2\a\x95\x18B\x1e\x8ep \x84\x81\xa2pf\xc8\xc4\x13J\x11yN\x14\xa1\x16\xb3\xc8\xc5*\xae\xf0\x8a\xf7\xf3\xe2\v\xc5\x18C2R\x11\x8c%4c\rјB5損-tc\x0f\xe1xC9>\x11*a\xa4\xe3\x0e\xed\xb8E>vQ\x8f?\x04d\x10\x059DB\x16ѐGDd\x12\x15\xb9DF6я\x90t\xa4\x15\xf1\x98FI~\x91\x92m\xb4\xe4\x185YFN\x9e\x11\x93q\xf4\xe4\x1aAYGQ\xbe\x91\x94{4\xe5\x1cQ\x19HV\x0eҕ\x85\x84\xe5!e\x99HZ.\xd2)\x1a\xc9H@\x00\x00;",
-
-	"images/treeview-default.gif": "GIF89a`\x00\x85\x00\xa1\x03\x00\x00\x00\x00\x80\x80\x80\xbc\xbc\xbc\xff\xff\xff!\xf9\x04\x01\x00\x00\x03\x00,\x00\x00\x00\x00`\x00\x85\x00\x00\x02\xfe\x9c\x8f\xa9\xcb\xed\x0f\a\x98\xc0ш\xb3ި\xf2\x0f\x86\x9a'\x96\xa6I\x9e\xeaʶ\xee\x1aIJ\xfc\xd6f\xb0\xe0\xf6\xfe\xe9\xd2\xe1\xe3\t#>Rp\x88d\xe0(\x93\x01\ue64c\"\x8a@\xa9uz0^\xb7GCw;\x9c\x89\xc1\xe4\xb2\xd9yN\xab\xa5ߵ\xfb}j\xc3M\x82y\xb2\xae\x90\xdb\x13\x82\xfe\xa3\x8f\xb7\xf7\x11\b\xa2'h@x\xa8\xb8\xc8\xc8&F\xd3(\xf2e\x18\xf90Y\x19r\x89\xd9#\xc1\x84\x06\xb5\x89\xa1\x19\xaa1J*\x9asZ\xfa\x18\xa3\xeajE\xf9*\xeb\x12;k\x1bwې\x98\xfb\x97J\n\xf8\xe7w\xbb\xbbQkG̛\xac\xbc\xfc\xc6\xda\xca\xec\xe5\vM\x15\r\x8df\xa0e\xbd\xe4\te\xbcI}=\x9dU\xa5-\xcd\xec\xecm\xad\xbe\xce\xde\ueb81\xac\x1e\xff\v\xac+l;\x0fM\x9c\xfe\xfb~\xb0\xef/ :u\xa6\x96\x81\xe3\x17\xea \xc1N\x17\xba\x19\x1cWM\x1c6r\x12\x13 \xfc\xe6,\xa0\xc6b\x8d\x1c\xf5i\xcc\xc7\f$\xa6z\xf6DV2\x99\f%/\x95\x1d[\xde\x1aX.\xcfB\x991-.dR\xc1\xa1\xb2\x82;\xcd=\xa49-\xa3ˡD\x8b\x1eb9\xec\xe3\xca{\vH\x1a\x9du\xf1i\xa5\xa8R\x0f\xc1\xac\x88\xa5fV\xac\x14\xcf1l\xa23\x19O\xb1>{\x02='\xb4\xaaڵlۺ}˫\x00\x00;",
-
-	"images/treeview-gray-line.gif": "GIF89a\x10\x00\xf0\x06\xf7\x00\x00\x00\x00\x00\x80\x80\x80\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00\x00!\xf9\x04\x01\x00\x00\xff\x00,\x00\x00\x00\x00\x10\x00\xf0\x06\x00\b\xff\x00\xff\t\x1c\xf8/\x00\xc1\x83\b\r\"\\X\x90\xe1B\x85\x0e\tB\x8c(p\"E\x8b\x111:\xd4\xc80\x80Ǐ\x1f\x1fR\x948r G\x91%\x1b\xa6<\x990\xa5ʒ,\x0f\xc6$\xb9\xd2\xe5L\x936s\xd6\xdc\tSgO\x9e#oV\xf4\x19\x94\xe8E\xa3\x19\x91nTڑ)ʟP\x8b\x02=:5iեW\x9bf}*5*U\xafV\xc1b\x15\xab\x95,\u05ef]Ӣ]\x1bVm[\xb6c\xddƅ[Vn]\xbag\xdfꝻ\xf7n\u07fc|\x03\xfb\x15\fx\xb0\xe1\u0088[nUl\x96\xb1\xdd\xc42\x9d:\xc6;\xf9oe\u0097\x0fg\x86L\xb3q\xe4ş=w~\xbc\xb9thҧ)\xa7\xb6\xbc\x1askͯ9\xe3\x04=Zumַ]熽[\xf6PڳE\aG\xdd\xdbt\xf1\xd8Ƈ\xdbV\x8e\x9b\xb9n缡\xfb~Iܥ\xf5\xebسk\xdfν{\xf4\xdf\xc2\xc1W\xff\x17\xbf\x9c|s\xf3\xcf\xd1\u007f\xa7^\x9e\xfdy\xf7\xe9\xe1\xaf\x17*\u007f:\xfd\xfb\x92\x91\xeb?\xce_zr\xf5\xf6\xe5\xd7\x1f\x80\xff\xd5W ~\xc0\x11\xb8\x9f\u007f\v*8\xa0\x81\rB\xf8 \x82\xe1I\xc8\xe0\x84\x02^\xa8\xa1\x83\x1bZ\xc8\xe1\x87\x1e\x86H\xe1x\"f\b\xe2\x88\xed\xa1\xf8\x9e\x8a\xf1\xb18\x9f\x89%&\x18c\x85.\x06(c\x8d\a\u0088c\x84;bx\xa3\x8e@\xfe($\x8dA\x129$\x89=v\x98\xe4\x89E\"\xd9d\x8aO\xae\x18e\x8bS\xbex$\x94WJ\x99%\x95[Zi\xe4\x97Nvi#\x98X\x92\xa9\xa5\x99\\\xa2\xe9e\x98j\x8e\xc9\xe6\x9be\xc2y\xa6\x9ciҹf\x9cxΙg\x9d{ީ\xe7\x9f|\x02\xeag\xa0\x84\x0ej\xa8\x9b}\"*\xa8\xa2\x852zh\x8ebBڦ\xa4v:j)\xa5\x89b\xba\xa8\xa6\x8dr\xfa(\x8fU^\nj\xa4\xa3NZj\xa5\x9e\x8a꣩\xab\xa2zj\xa6\xafn\xff\x1ak\xa7\xb3~\xda*\xac\xb7ʚ+\xad\xbbڪd\xa8\xa9\x06[\xab\xaa\xbf\x92\xda+\xb1L\x1a[,\xab˺z\xac\xb0\xcf\x0e\vm\xb3\xb8R\xab\xab\xb5\xbcb\xebk\xb2\xccr묶\xc8\xce\xf8\xad\xb7Ւ{\xad\xb9٢\xbb\xad\xb8\xe5\xb2{\xae\xbb\xe9»\xee\x92\xf2\x86K\xef\xbd\xc0J\xabo\xb4\xfc\x82;\xad\xba\xf6\xe6\xdb/\xc0\xff\xd6[0\xbe\xca\x12\xbc\xaf\xbf\v+<\xb0\xc1\rC\xfc0\xc2\xddJ\xcc\xf0\xc4\x02_\xac\xb1\xc3\x1b[\xcc\xf1\xc7\x1e\x87L\xf1\xb8\"g\f\xf2\xc8\xed\xa2\xfc\xae\xca\xf1\xb2<\xaf\xc9%'\x1cs\xc5.\a,s\xcd\aÌs\xc4;c|\xb3\xce@\xff,4\xcdA\x13=4\xc9=w\x9c\xf4\xc9E#\xddt\xcaO\xaf\x1cu\xcbS\xbf|4\xd4WK\x9d5\xd5[[m\xf4\xd7Nwm3\xd8X\x93\xad\xb5\xd9\\\xa3\xedu\xd8j\x8f\xcd\xf6\xdbe\xc3}\xb6\xdciӽv\xdcxϝw\xdd{\xdf\xff\xad\xf7\xdf|\x03\xeew\xe0\x84\x0fn\xb8\xdb}#.\xb8\xe2\x853~x\xcebC\u07b6\xe4v;n9\xe5\x89c\xbe\xb8\xe6\x8ds\xfe8\xcfU_\x0ez\xe4\xa3O^z型\xee\xb3髣~z\xe6\xafo\x1e{\xe7\xb3\u007f\xde:\xec\xb7˞;\xed\xbbۮt\xe8\xa9\a_\xbb꿓\xde;\xf1L\x1b_<\xeb˻~\xbc\xf0\xcf\x0f\x0f}\xf3\xb8S\xaf\xbb\xf5\xbcc\xef{\xf2\xccs\xef\xbc\xf6\xc8\xcf\xfc\xbd\xf7Փ\u007f\xbd\xf9٣\xbf\xbd\xf8\xe5\xb3\u007f\xbe\xfb\xe9ÿ\xfe\xd2\xf2\x87O\xff\xfd\xc0K\xaf\u007f\xf4\xfc\x83?\xbd\xfa\xf6\xcb_\xff\x00\xf8\xbf\xfa\x15\x10\u007f\xca#\xe0\xfe\xfc\xb7@\x05\x0eЀ\r\x84\xe0\x03\x11\xd8=\t2p\x82\x02\xbc\xa0\x06\x1d\xb8A\vr\xf0\x83\x1e\f!\x05\xc7'\xc2\f\x82p\x84\xedC\xe1\xfbT\x18?\x16\xceτ%L`\f+\xe8\xc2\x00ʰ\x86\a\x84!\x0e#\xb8C\f\xdeP\x87@\xfc\xa1\x102i\x18D\"\x0e\x91\x84=\xec`\x12OXD$61\x85O\\a\x14[8\xc5\x17\x1e\x11\x8aW\x94b\x16\xa9\xb8E+\x1a\xf1\x8bN\xec\xa2\ri\b\x12\x90\x04\x04\x00;",
-
-	"images/treeview-gray.gif": "GIF89a`\x00\x85\x00\xa1\x03\x00\x00\x00\x00\x80\x80\x80\xbc\xbc\xbc\xff\xff\xff!\xf9\x04\x01\x00\x00\x03\x00,\x00\x00\x00\x00`\x00\x85\x00\x00\x02\xfe\x9c\x8f\xa9\xcb\xed\x0f\x87\x98\xc2ш\xb3ި\xf2\x0f\x86\x9a'\x96\xa6I\x9e\xeaʶ\xee\x1aIJ\xfc\xd6f\xb0\xe0\xf6\xfe\xe9\x03p\xf0\xf1\x86\x11\x1f\xd0 $*\x198\x80\xd39\x98%\x97Kc\x90\x8aUX\x91\xd9.W\xeb\xedJg\xe1\xf2\xb4,F\xab\xcfj*\xbb\xad|Ç\xf2\xb9*u\xb5\xef\xf0_\xfdh\xf2p\x01\xe67RRG\x98\xc0\x87\xb8\xc8\xd8H8F\xe3\xa8rv(\x89Aiy\x82\x99i\xf8\xf3\x04$\xc5ٓ#*\xb2Y::\x88\xca\x01\x19\xb3\xda\xf9\xaa\x19+;\v[\x1bRyې{\xab\xc8[\xeb;+\xd80\x8c\xf0K\xa8\xa8q여\xeb\xfc\f\rݺ\xfcz\x1a\xadz\x14u\xcdt\x90M\xbd\xda\xf4\x19E\xb6\xdd\xe7]\x8e\x9d\x87\xaen\xbcn\xdc\xea\x1e/?O_\xef\xd5,\x8f\xffJ\x81_\xec\x1c\x9c\x8fT@U\xee\x00\xdac7oZB\x81\xf1\xb6h\x93\xe7\xf0\x1b\xaapO\xc6E*\x17q\xa1\x81ms\x10\x19\xbaSx0\xa4ȑ$%\x90\xd4W\xf0\x9a?\x05+{\x9d|Y2fL\x90\r=\xae\xb3v\xd3&:\x8aPB\xedԉ\x11\xe86\x9c;\xe1\xc9<\x8a4\xe9*\x94똢sZ\xaa\xe5\x01\xa9\xd7$\xea\xb2z\vk-\xad\xb3\xb8\x96\xa2\xf9QhU\xb1ш\x06\xfd\x04\x8a\\P\x829\xd9\xfet\x8bѨҹt\xebڽ\x8b7\xaf\x82\x02\x00;",
-
-	"implements.html": `<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Implements</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Implements</span></p>
-		<div style="margin-left: 1in" id='implements-{{.Index}}'>...</div>
-	</div>
-</div>
-`,
-
-	"jquery.js": `/*! jQuery v1.8.2 jquery.com | jquery.org/license */
-(function(a,b){function G(a){var b=F[a]={};return p.each(a.split(s),function(a,c){b[c]=!0}),b}function J(a,c,d){if(d===b&&a.nodeType===1){var e="data-"+c.replace(I,"-$1").toLowerCase();d=a.getAttribute(e);if(typeof d=="string"){try{d=d==="true"?!0:d==="false"?!1:d==="null"?null:+d+""===d?+d:H.test(d)?p.parseJSON(d):d}catch(f){}p.data(a,c,d)}else d=b}return d}function K(a){var b;for(b in a){if(b==="data"&&p.isEmptyObject(a[b]))continue;if(b!=="toJSON")return!1}return!0}function ba(){return!1}function bb(){return!0}function bh(a){return!a||!a.parentNode||a.parentNode.nodeType===11}function bi(a,b){do a=a[b];while(a&&a.nodeType!==1);return a}function bj(a,b,c){b=b||0;if(p.isFunction(b))return p.grep(a,function(a,d){var e=!!b.call(a,d,a);return e===c});if(b.nodeType)return p.grep(a,function(a,d){return a===b===c});if(typeof b=="string"){var d=p.grep(a,function(a){return a.nodeType===1});if(be.test(b))return p.filter(b,d,!c);b=p.filter(b,d)}return p.grep(a,function(a,d){return p.inArray(a,b)>=0===c})}function bk(a){var b=bl.split("|"),c=a.createDocumentFragment();if(c.createElement)while(b.length)c.createElement(b.pop());return c}function bC(a,b){return a.getElementsByTagName(b)[0]||a.appendChild(a.ownerDocument.createElement(b))}function bD(a,b){if(b.nodeType!==1||!p.hasData(a))return;var c,d,e,f=p._data(a),g=p._data(b,f),h=f.events;if(h){delete g.handle,g.events={};for(c in h)for(d=0,e=h[c].length;d<e;d++)p.event.add(b,c,h[c][d])}g.data&&(g.data=p.extend({},g.data))}function bE(a,b){var c;if(b.nodeType!==1)return;b.clearAttributes&&b.clearAttributes(),b.mergeAttributes&&b.mergeAttributes(a),c=b.nodeName.toLowerCase(),c==="object"?(b.parentNode&&(b.outerHTML=a.outerHTML),p.support.html5Clone&&a.innerHTML&&!p.trim(b.innerHTML)&&(b.innerHTML=a.innerHTML)):c==="input"&&bv.test(a.type)?(b.defaultChecked=b.checked=a.checked,b.value!==a.value&&(b.value=a.value)):c==="option"?b.selected=a.defaultSelected:c==="input"||c==="textarea"?b.defaultValue=a.defaultValue:c==="script"&&b.text!==a.text&&(b.text=a.text),b.removeAttribute(p.expando)}function bF(a){return typeof a.getElementsByTagName!="undefined"?a.getElementsByTagName("*"):typeof a.querySelectorAll!="undefined"?a.querySelectorAll("*"):[]}function bG(a){bv.test(a.type)&&(a.defaultChecked=a.checked)}function bY(a,b){if(b in a)return b;var c=b.charAt(0).toUpperCase()+b.slice(1),d=b,e=bW.length;while(e--){b=bW[e]+c;if(b in a)return b}return d}function bZ(a,b){return a=b||a,p.css(a,"display")==="none"||!p.contains(a.ownerDocument,a)}function b$(a,b){var c,d,e=[],f=0,g=a.length;for(;f<g;f++){c=a[f];if(!c.style)continue;e[f]=p._data(c,"olddisplay"),b?(!e[f]&&c.style.display==="none"&&(c.style.display=""),c.style.display===""&&bZ(c)&&(e[f]=p._data(c,"olddisplay",cc(c.nodeName)))):(d=bH(c,"display"),!e[f]&&d!=="none"&&p._data(c,"olddisplay",d))}for(f=0;f<g;f++){c=a[f];if(!c.style)continue;if(!b||c.style.display==="none"||c.style.display==="")c.style.display=b?e[f]||"":"none"}return a}function b_(a,b,c){var d=bP.exec(b);return d?Math.max(0,d[1]-(c||0))+(d[2]||"px"):b}function ca(a,b,c,d){var e=c===(d?"border":"content")?4:b==="width"?1:0,f=0;for(;e<4;e+=2)c==="margin"&&(f+=p.css(a,c+bV[e],!0)),d?(c==="content"&&(f-=parseFloat(bH(a,"padding"+bV[e]))||0),c!=="margin"&&(f-=parseFloat(bH(a,"border"+bV[e]+"Width"))||0)):(f+=parseFloat(bH(a,"padding"+bV[e]))||0,c!=="padding"&&(f+=parseFloat(bH(a,"border"+bV[e]+"Width"))||0));return f}function cb(a,b,c){var d=b==="width"?a.offsetWidth:a.offsetHeight,e=!0,f=p.support.boxSizing&&p.css(a,"boxSizing")==="border-box";if(d<=0||d==null){d=bH(a,b);if(d<0||d==null)d=a.style[b];if(bQ.test(d))return d;e=f&&(p.support.boxSizingReliable||d===a.style[b]),d=parseFloat(d)||0}return d+ca(a,b,c||(f?"border":"content"),e)+"px"}function cc(a){if(bS[a])return bS[a];var b=p("<"+a+">").appendTo(e.body),c=b.css("display");b.remove();if(c==="none"||c===""){bI=e.body.appendChild(bI||p.extend(e.createElement("iframe"),{frameBorder:0,width:0,height:0}));if(!bJ||!bI.createElement)bJ=(bI.contentWindow||bI.contentDocument).document,bJ.write("<!doctype html><html><body>"),bJ.close();b=bJ.body.appendChild(bJ.createElement(a)),c=bH(b,"display"),e.body.removeChild(bI)}return bS[a]=c,c}function ci(a,b,c,d){var e;if(p.isArray(b))p.each(b,function(b,e){c||ce.test(a)?d(a,e):ci(a+"["+(typeof e=="object"?b:"")+"]",e,c,d)});else if(!c&&p.type(b)==="object")for(e in b)ci(a+"["+e+"]",b[e],c,d);else d(a,b)}function cz(a){return function(b,c){typeof b!="string"&&(c=b,b="*");var d,e,f,g=b.toLowerCase().split(s),h=0,i=g.length;if(p.isFunction(c))for(;h<i;h++)d=g[h],f=/^\+/.test(d),f&&(d=d.substr(1)||"*"),e=a[d]=a[d]||[],e[f?"unshift":"push"](c)}}function cA(a,c,d,e,f,g){f=f||c.dataTypes[0],g=g||{},g[f]=!0;var h,i=a[f],j=0,k=i?i.length:0,l=a===cv;for(;j<k&&(l||!h);j++)h=i[j](c,d,e),typeof h=="string"&&(!l||g[h]?h=b:(c.dataTypes.unshift(h),h=cA(a,c,d,e,h,g)));return(l||!h)&&!g["*"]&&(h=cA(a,c,d,e,"*",g)),h}function cB(a,c){var d,e,f=p.ajaxSettings.flatOptions||{};for(d in c)c[d]!==b&&((f[d]?a:e||(e={}))[d]=c[d]);e&&p.extend(!0,a,e)}function cC(a,c,d){var e,f,g,h,i=a.contents,j=a.dataTypes,k=a.responseFields;for(f in k)f in d&&(c[k[f]]=d[f]);while(j[0]==="*")j.shift(),e===b&&(e=a.mimeType||c.getResponseHeader("content-type"));if(e)for(f in i)if(i[f]&&i[f].test(e)){j.unshift(f);break}if(j[0]in d)g=j[0];else{for(f in d){if(!j[0]||a.converters[f+" "+j[0]]){g=f;break}h||(h=f)}g=g||h}if(g)return g!==j[0]&&j.unshift(g),d[g]}function cD(a,b){var c,d,e,f,g=a.dataTypes.slice(),h=g[0],i={},j=0;a.dataFilter&&(b=a.dataFilter(b,a.dataType));if(g[1])for(c in a.converters)i[c.toLowerCase()]=a.converters[c];for(;e=g[++j];)if(e!=="*"){if(h!=="*"&&h!==e){c=i[h+" "+e]||i["* "+e];if(!c)for(d in i){f=d.split(" ");if(f[1]===e){c=i[h+" "+f[0]]||i["* "+f[0]];if(c){c===!0?c=i[d]:i[d]!==!0&&(e=f[0],g.splice(j--,0,e));break}}}if(c!==!0)if(c&&a["throws"])b=c(b);else try{b=c(b)}catch(k){return{state:"parsererror",error:c?k:"No conversion from "+h+" to "+e}}}h=e}return{state:"success",data:b}}function cL(){try{return new a.XMLHttpRequest}catch(b){}}function cM(){try{return new a.ActiveXObject("Microsoft.XMLHTTP")}catch(b){}}function cU(){return setTimeout(function(){cN=b},0),cN=p.now()}function cV(a,b){p.each(b,function(b,c){var d=(cT[b]||[]).concat(cT["*"]),e=0,f=d.length;for(;e<f;e++)if(d[e].call(a,b,c))return})}function cW(a,b,c){var d,e=0,f=0,g=cS.length,h=p.Deferred().always(function(){delete i.elem}),i=function(){var b=cN||cU(),c=Math.max(0,j.startTime+j.duration-b),d=1-(c/j.duration||0),e=0,f=j.tweens.length;for(;e<f;e++)j.tweens[e].run(d);return h.notifyWith(a,[j,d,c]),d<1&&f?c:(h.resolveWith(a,[j]),!1)},j=h.promise({elem:a,props:p.extend({},b),opts:p.extend(!0,{specialEasing:{}},c),originalProperties:b,originalOptions:c,startTime:cN||cU(),duration:c.duration,tweens:[],createTween:function(b,c,d){var e=p.Tween(a,j.opts,b,c,j.opts.specialEasing[b]||j.opts.easing);return j.tweens.push(e),e},stop:function(b){var c=0,d=b?j.tweens.length:0;for(;c<d;c++)j.tweens[c].run(1);return b?h.resolveWith(a,[j,b]):h.rejectWith(a,[j,b]),this}}),k=j.props;cX(k,j.opts.specialEasing);for(;e<g;e++){d=cS[e].call(j,a,k,j.opts);if(d)return d}return cV(j,k),p.isFunction(j.opts.start)&&j.opts.start.call(a,j),p.fx.timer(p.extend(i,{anim:j,queue:j.opts.queue,elem:a})),j.progress(j.opts.progress).done(j.opts.done,j.opts.complete).fail(j.opts.fail).always(j.opts.always)}function cX(a,b){var c,d,e,f,g;for(c in a){d=p.camelCase(c),e=b[d],f=a[c],p.isArray(f)&&(e=f[1],f=a[c]=f[0]),c!==d&&(a[d]=f,delete a[c]),g=p.cssHooks[d];if(g&&"expand"in g){f=g.expand(f),delete a[d];for(c in f)c in a||(a[c]=f[c],b[c]=e)}else b[d]=e}}function cY(a,b,c){var d,e,f,g,h,i,j,k,l=this,m=a.style,n={},o=[],q=a.nodeType&&bZ(a);c.queue||(j=p._queueHooks(a,"fx"),j.unqueued==null&&(j.unqueued=0,k=j.empty.fire,j.empty.fire=function(){j.unqueued||k()}),j.unqueued++,l.always(function(){l.always(function(){j.unqueued--,p.queue(a,"fx").length||j.empty.fire()})})),a.nodeType===1&&("height"in b||"width"in b)&&(c.overflow=[m.overflow,m.overflowX,m.overflowY],p.css(a,"display")==="inline"&&p.css(a,"float")==="none"&&(!p.support.inlineBlockNeedsLayout||cc(a.nodeName)==="inline"?m.display="inline-block":m.zoom=1)),c.overflow&&(m.overflow="hidden",p.support.shrinkWrapBlocks||l.done(function(){m.overflow=c.overflow[0],m.overflowX=c.overflow[1],m.overflowY=c.overflow[2]}));for(d in b){f=b[d];if(cP.exec(f)){delete b[d];if(f===(q?"hide":"show"))continue;o.push(d)}}g=o.length;if(g){h=p._data(a,"fxshow")||p._data(a,"fxshow",{}),q?p(a).show():l.done(function(){p(a).hide()}),l.done(function(){var b;p.removeData(a,"fxshow",!0);for(b in n)p.style(a,b,n[b])});for(d=0;d<g;d++)e=o[d],i=l.createTween(e,q?h[e]:0),n[e]=h[e]||p.style(a,e),e in h||(h[e]=i.start,q&&(i.end=i.start,i.start=e==="width"||e==="height"?1:0))}}function cZ(a,b,c,d,e){return new cZ.prototype.init(a,b,c,d,e)}function c$(a,b){var c,d={height:a},e=0;b=b?1:0;for(;e<4;e+=2-b)c=bV[e],d["margin"+c]=d["padding"+c]=a;return b&&(d.opacity=d.width=a),d}function da(a){return p.isWindow(a)?a:a.nodeType===9?a.defaultView||a.parentWindow:!1}var c,d,e=a.document,f=a.location,g=a.navigator,h=a.jQuery,i=a.$,j=Array.prototype.push,k=Array.prototype.slice,l=Array.prototype.indexOf,m=Object.prototype.toString,n=Object.prototype.hasOwnProperty,o=String.prototype.trim,p=function(a,b){return new p.fn.init(a,b,c)},q=/[\-+]?(?:\d*\.|)\d+(?:[eE][\-+]?\d+|)/.source,r=/\S/,s=/\s+/,t=/^[\s\uFEFF\xA0]+|[\s\uFEFF\xA0]+$/g,u=/^(?:[^#<]*(<[\w\W]+>)[^>]*$|#([\w\-]*)$)/,v=/^<(\w+)\s*\/?>(?:<\/\1>|)$/,w=/^[\],:{}\s]*$/,x=/(?:^|:|,)(?:\s*\[)+/g,y=/\\(?:["\\\/bfnrt]|u[\da-fA-F]{4})/g,z=/"[^"\\\r\n]*"|true|false|null|-?(?:\d\d*\.|)\d+(?:[eE][\-+]?\d+|)/g,A=/^-ms-/,B=/-([\da-z])/gi,C=function(a,b){return(b+"").toUpperCase()},D=function(){e.addEventListener?(e.removeEventListener("DOMContentLoaded",D,!1),p.ready()):e.readyState==="complete"&&(e.detachEvent("onreadystatechange",D),p.ready())},E={};p.fn=p.prototype={constructor:p,init:function(a,c,d){var f,g,h,i;if(!a)return this;if(a.nodeType)return this.context=this[0]=a,this.length=1,this;if(typeof a=="string"){a.charAt(0)==="<"&&a.charAt(a.length-1)===">"&&a.length>=3?f=[null,a,null]:f=u.exec(a);if(f&&(f[1]||!c)){if(f[1])return c=c instanceof p?c[0]:c,i=c&&c.nodeType?c.ownerDocument||c:e,a=p.parseHTML(f[1],i,!0),v.test(f[1])&&p.isPlainObject(c)&&this.attr.call(a,c,!0),p.merge(this,a);g=e.getElementById(f[2]);if(g&&g.parentNode){if(g.id!==f[2])return d.find(a);this.length=1,this[0]=g}return this.context=e,this.selector=a,this}return!c||c.jquery?(c||d).find(a):this.constructor(c).find(a)}return p.isFunction(a)?d.ready(a):(a.selector!==b&&(this.selector=a.selector,this.context=a.context),p.makeArray(a,this))},selector:"",jquery:"1.8.2",length:0,size:function(){return this.length},toArray:function(){return k.call(this)},get:function(a){return a==null?this.toArray():a<0?this[this.length+a]:this[a]},pushStack:function(a,b,c){var d=p.merge(this.constructor(),a);return d.prevObject=this,d.context=this.context,b==="find"?d.selector=this.selector+(this.selector?" ":"")+c:b&&(d.selector=this.selector+"."+b+"("+c+")"),d},each:function(a,b){return p.each(this,a,b)},ready:function(a){return p.ready.promise().done(a),this},eq:function(a){return a=+a,a===-1?this.slice(a):this.slice(a,a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(k.apply(this,arguments),"slice",k.call(arguments).join(","))},map:function(a){return this.pushStack(p.map(this,function(b,c){return a.call(b,c,b)}))},end:function(){return this.prevObject||this.constructor(null)},push:j,sort:[].sort,splice:[].splice},p.fn.init.prototype=p.fn,p.extend=p.fn.extend=function(){var a,c,d,e,f,g,h=arguments[0]||{},i=1,j=arguments.length,k=!1;typeof h=="boolean"&&(k=h,h=arguments[1]||{},i=2),typeof h!="object"&&!p.isFunction(h)&&(h={}),j===i&&(h=this,--i);for(;i<j;i++)if((a=arguments[i])!=null)for(c in a){d=h[c],e=a[c];if(h===e)continue;k&&e&&(p.isPlainObject(e)||(f=p.isArray(e)))?(f?(f=!1,g=d&&p.isArray(d)?d:[]):g=d&&p.isPlainObject(d)?d:{},h[c]=p.extend(k,g,e)):e!==b&&(h[c]=e)}return h},p.extend({noConflict:function(b){return a.$===p&&(a.$=i),b&&a.jQuery===p&&(a.jQuery=h),p},isReady:!1,readyWait:1,holdReady:function(a){a?p.readyWait++:p.ready(!0)},ready:function(a){if(a===!0?--p.readyWait:p.isReady)return;if(!e.body)return setTimeout(p.ready,1);p.isReady=!0;if(a!==!0&&--p.readyWait>0)return;d.resolveWith(e,[p]),p.fn.trigger&&p(e).trigger("ready").off("ready")},isFunction:function(a){return p.type(a)==="function"},isArray:Array.isArray||function(a){return p.type(a)==="array"},isWindow:function(a){return a!=null&&a==a.window},isNumeric:function(a){return!isNaN(parseFloat(a))&&isFinite(a)},type:function(a){return a==null?String(a):E[m.call(a)]||"object"},isPlainObject:function(a){if(!a||p.type(a)!=="object"||a.nodeType||p.isWindow(a))return!1;try{if(a.constructor&&!n.call(a,"constructor")&&!n.call(a.constructor.prototype,"isPrototypeOf"))return!1}catch(c){return!1}var d;for(d in a);return d===b||n.call(a,d)},isEmptyObject:function(a){var b;for(b in a)return!1;return!0},error:function(a){throw new Error(a)},parseHTML:function(a,b,c){var d;return!a||typeof a!="string"?null:(typeof b=="boolean"&&(c=b,b=0),b=b||e,(d=v.exec(a))?[b.createElement(d[1])]:(d=p.buildFragment([a],b,c?null:[]),p.merge([],(d.cacheable?p.clone(d.fragment):d.fragment).childNodes)))},parseJSON:function(b){if(!b||typeof b!="string")return null;b=p.trim(b);if(a.JSON&&a.JSON.parse)return a.JSON.parse(b);if(w.test(b.replace(y,"@").replace(z,"]").replace(x,"")))return(new Function("return "+b))();p.error("Invalid JSON: "+b)},parseXML:function(c){var d,e;if(!c||typeof c!="string")return null;try{a.DOMParser?(e=new DOMParser,d=e.parseFromString(c,"text/xml")):(d=new ActiveXObject("Microsoft.XMLDOM"),d.async="false",d.loadXML(c))}catch(f){d=b}return(!d||!d.documentElement||d.getElementsByTagName("parsererror").length)&&p.error("Invalid XML: "+c),d},noop:function(){},globalEval:function(b){b&&r.test(b)&&(a.execScript||function(b){a.eval.call(a,b)})(b)},camelCase:function(a){return a.replace(A,"ms-").replace(B,C)},nodeName:function(a,b){return a.nodeName&&a.nodeName.toLowerCase()===b.toLowerCase()},each:function(a,c,d){var e,f=0,g=a.length,h=g===b||p.isFunction(a);if(d){if(h){for(e in a)if(c.apply(a[e],d)===!1)break}else for(;f<g;)if(c.apply(a[f++],d)===!1)break}else if(h){for(e in a)if(c.call(a[e],e,a[e])===!1)break}else for(;f<g;)if(c.call(a[f],f,a[f++])===!1)break;return a},trim:o&&!o.call("` + "\xEF\xBB\xBF" + ` ")?function(a){return a==null?"":o.call(a)}:function(a){return a==null?"":(a+"").replace(t,"")},makeArray:function(a,b){var c,d=b||[];return a!=null&&(c=p.type(a),a.length==null||c==="string"||c==="function"||c==="regexp"||p.isWindow(a)?j.call(d,a):p.merge(d,a)),d},inArray:function(a,b,c){var d;if(b){if(l)return l.call(b,a,c);d=b.length,c=c?c<0?Math.max(0,d+c):c:0;for(;c<d;c++)if(c in b&&b[c]===a)return c}return-1},merge:function(a,c){var d=c.length,e=a.length,f=0;if(typeof d=="number")for(;f<d;f++)a[e++]=c[f];else while(c[f]!==b)a[e++]=c[f++];return a.length=e,a},grep:function(a,b,c){var d,e=[],f=0,g=a.length;c=!!c;for(;f<g;f++)d=!!b(a[f],f),c!==d&&e.push(a[f]);return e},map:function(a,c,d){var e,f,g=[],h=0,i=a.length,j=a instanceof p||i!==b&&typeof i=="number"&&(i>0&&a[0]&&a[i-1]||i===0||p.isArray(a));if(j)for(;h<i;h++)e=c(a[h],h,d),e!=null&&(g[g.length]=e);else for(f in a)e=c(a[f],f,d),e!=null&&(g[g.length]=e);return g.concat.apply([],g)},guid:1,proxy:function(a,c){var d,e,f;return typeof c=="string"&&(d=a[c],c=a,a=d),p.isFunction(a)?(e=k.call(arguments,2),f=function(){return a.apply(c,e.concat(k.call(arguments)))},f.guid=a.guid=a.guid||p.guid++,f):b},access:function(a,c,d,e,f,g,h){var i,j=d==null,k=0,l=a.length;if(d&&typeof d=="object"){for(k in d)p.access(a,c,k,d[k],1,g,e);f=1}else if(e!==b){i=h===b&&p.isFunction(e),j&&(i?(i=c,c=function(a,b,c){return i.call(p(a),c)}):(c.call(a,e),c=null));if(c)for(;k<l;k++)c(a[k],d,i?e.call(a[k],k,c(a[k],d)):e,h);f=1}return f?a:j?c.call(a):l?c(a[0],d):g},now:function(){return(new Date).getTime()}}),p.ready.promise=function(b){if(!d){d=p.Deferred();if(e.readyState==="complete")setTimeout(p.ready,1);else if(e.addEventListener)e.addEventListener("DOMContentLoaded",D,!1),a.addEventListener("load",p.ready,!1);else{e.attachEvent("onreadystatechange",D),a.attachEvent("onload",p.ready);var c=!1;try{c=a.frameElement==null&&e.documentElement}catch(f){}c&&c.doScroll&&function g(){if(!p.isReady){try{c.doScroll("left")}catch(a){return setTimeout(g,50)}p.ready()}}()}}return d.promise(b)},p.each("Boolean Number String Function Array Date RegExp Object".split(" "),function(a,b){E["[object "+b+"]"]=b.toLowerCase()}),c=p(e);var F={};p.Callbacks=function(a){a=typeof a=="string"?F[a]||G(a):p.extend({},a);var c,d,e,f,g,h,i=[],j=!a.once&&[],k=function(b){c=a.memory&&b,d=!0,h=f||0,f=0,g=i.length,e=!0;for(;i&&h<g;h++)if(i[h].apply(b[0],b[1])===!1&&a.stopOnFalse){c=!1;break}e=!1,i&&(j?j.length&&k(j.shift()):c?i=[]:l.disable())},l={add:function(){if(i){var b=i.length;(function d(b){p.each(b,function(b,c){var e=p.type(c);e==="function"&&(!a.unique||!l.has(c))?i.push(c):c&&c.length&&e!=="string"&&d(c)})})(arguments),e?g=i.length:c&&(f=b,k(c))}return this},remove:function(){return i&&p.each(arguments,function(a,b){var c;while((c=p.inArray(b,i,c))>-1)i.splice(c,1),e&&(c<=g&&g--,c<=h&&h--)}),this},has:function(a){return p.inArray(a,i)>-1},empty:function(){return i=[],this},disable:function(){return i=j=c=b,this},disabled:function(){return!i},lock:function(){return j=b,c||l.disable(),this},locked:function(){return!j},fireWith:function(a,b){return b=b||[],b=[a,b.slice?b.slice():b],i&&(!d||j)&&(e?j.push(b):k(b)),this},fire:function(){return l.fireWith(this,arguments),this},fired:function(){return!!d}};return l},p.extend({Deferred:function(a){var b=[["resolve","done",p.Callbacks("once memory"),"resolved"],["reject","fail",p.Callbacks("once memory"),"rejected"],["notify","progress",p.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return p.Deferred(function(c){p.each(b,function(b,d){var f=d[0],g=a[b];e[d[1]](p.isFunction(g)?function(){var a=g.apply(this,arguments);a&&p.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f+"With"](this===e?c:this,[a])}:c[f])}),a=null}).promise()},promise:function(a){return a!=null?p.extend(a,d):d}},e={};return d.pipe=d.then,p.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[a^1][2].disable,b[2][2].lock),e[f[0]]=g.fire,e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var b=0,c=k.call(arguments),d=c.length,e=d!==1||a&&p.isFunction(a.promise)?d:0,f=e===1?a:p.Deferred(),g=function(a,b,c){return function(d){b[a]=this,c[a]=arguments.length>1?k.call(arguments):d,c===h?f.notifyWith(b,c):--e||f.resolveWith(b,c)}},h,i,j;if(d>1){h=new Array(d),i=new Array(d),j=new Array(d);for(;b<d;b++)c[b]&&p.isFunction(c[b].promise)?c[b].promise().done(g(b,j,c)).fail(f.reject).progress(g(b,i,h)):--e}return e||f.resolveWith(j,c),f.promise()}}),p.support=function(){var b,c,d,f,g,h,i,j,k,l,m,n=e.createElement("div");n.setAttribute("className","t"),n.innerHTML="  <link/><table></table><a href='/a'>a</a><input type='checkbox'/>",c=n.getElementsByTagName("*"),d=n.getElementsByTagName("a")[0],d.style.cssText="top:1px;float:left;opacity:.5";if(!c||!c.length)return{};f=e.createElement("select"),g=f.appendChild(e.createElement("option")),h=n.getElementsByTagName("input")[0],b={leadingWhitespace:n.firstChild.nodeType===3,tbody:!n.getElementsByTagName("tbody").length,htmlSerialize:!!n.getElementsByTagName("link").length,style:/top/.test(d.getAttribute("style")),hrefNormalized:d.getAttribute("href")==="/a",opacity:/^0.5/.test(d.style.opacity),cssFloat:!!d.style.cssFloat,checkOn:h.value==="on",optSelected:g.selected,getSetAttribute:n.className!=="t",enctype:!!e.createElement("form").enctype,html5Clone:e.createElement("nav").cloneNode(!0).outerHTML!=="<:nav></:nav>",boxModel:e.compatMode==="CSS1Compat",submitBubbles:!0,changeBubbles:!0,focusinBubbles:!1,deleteExpando:!0,noCloneEvent:!0,inlineBlockNeedsLayout:!1,shrinkWrapBlocks:!1,reliableMarginRight:!0,boxSizingReliable:!0,pixelPosition:!1},h.checked=!0,b.noCloneChecked=h.cloneNode(!0).checked,f.disabled=!0,b.optDisabled=!g.disabled;try{delete n.test}catch(o){b.deleteExpando=!1}!n.addEventListener&&n.attachEvent&&n.fireEvent&&(n.attachEvent("onclick",m=function(){b.noCloneEvent=!1}),n.cloneNode(!0).fireEvent("onclick"),n.detachEvent("onclick",m)),h=e.createElement("input"),h.value="t",h.setAttribute("type","radio"),b.radioValue=h.value==="t",h.setAttribute("checked","checked"),h.setAttribute("name","t"),n.appendChild(h),i=e.createDocumentFragment(),i.appendChild(n.lastChild),b.checkClone=i.cloneNode(!0).cloneNode(!0).lastChild.checked,b.appendChecked=h.checked,i.removeChild(h),i.appendChild(n);if(n.attachEvent)for(k in{submit:!0,change:!0,focusin:!0})j="on"+k,l=j in n,l||(n.setAttribute(j,"return;"),l=typeof n[j]=="function"),b[k+"Bubbles"]=l;return p(function(){var c,d,f,g,h="padding:0;margin:0;border:0;display:block;overflow:hidden;",i=e.getElementsByTagName("body")[0];if(!i)return;c=e.createElement("div"),c.style.cssText="visibility:hidden;border:0;width:0;height:0;position:static;top:0;margin-top:1px",i.insertBefore(c,i.firstChild),d=e.createElement("div"),c.appendChild(d),d.innerHTML="<table><tr><td></td><td>t</td></tr></table>",f=d.getElementsByTagName("td"),f[0].style.cssText="padding:0;margin:0;border:0;display:none",l=f[0].offsetHeight===0,f[0].style.display="",f[1].style.display="none",b.reliableHiddenOffsets=l&&f[0].offsetHeight===0,d.innerHTML="",d.style.cssText="box-sizing:border-box;-moz-box-sizing:border-box;-webkit-box-sizing:border-box;padding:1px;border:1px;display:block;width:4px;margin-top:1%;position:absolute;top:1%;",b.boxSizing=d.offsetWidth===4,b.doesNotIncludeMarginInBodyOffset=i.offsetTop!==1,a.getComputedStyle&&(b.pixelPosition=(a.getComputedStyle(d,null)||{}).top!=="1%",b.boxSizingReliable=(a.getComputedStyle(d,null)||{width:"4px"}).width==="4px",g=e.createElement("div"),g.style.cssText=d.style.cssText=h,g.style.marginRight=g.style.width="0",d.style.width="1px",d.appendChild(g),b.reliableMarginRight=!parseFloat((a.getComputedStyle(g,null)||{}).marginRight)),typeof d.style.zoom!="undefined"&&(d.innerHTML="",d.style.cssText=h+"width:1px;padding:1px;display:inline;zoom:1",b.inlineBlockNeedsLayout=d.offsetWidth===3,d.style.display="block",d.style.overflow="visible",d.innerHTML="<div></div>",d.firstChild.style.width="5px",b.shrinkWrapBlocks=d.offsetWidth!==3,c.style.zoom=1),i.removeChild(c),c=d=f=g=null}),i.removeChild(n),c=d=f=g=h=i=n=null,b}();var H=/(?:\{[\s\S]*\}|\[[\s\S]*\])$/,I=/([A-Z])/g;p.extend({cache:{},deletedIds:[],uuid:0,expando:"jQuery"+(p.fn.jquery+Math.random()).replace(/\D/g,""),noData:{embed:!0,object:"clsid:D27CDB6E-AE6D-11cf-96B8-444553540000",applet:!0},hasData:function(a){return a=a.nodeType?p.cache[a[p.expando]]:a[p.expando],!!a&&!K(a)},data:function(a,c,d,e){if(!p.acceptData(a))return;var f,g,h=p.expando,i=typeof c=="string",j=a.nodeType,k=j?p.cache:a,l=j?a[h]:a[h]&&h;if((!l||!k[l]||!e&&!k[l].data)&&i&&d===b)return;l||(j?a[h]=l=p.deletedIds.pop()||p.guid++:l=h),k[l]||(k[l]={},j||(k[l].toJSON=p.noop));if(typeof c=="object"||typeof c=="function")e?k[l]=p.extend(k[l],c):k[l].data=p.extend(k[l].data,c);return f=k[l],e||(f.data||(f.data={}),f=f.data),d!==b&&(f[p.camelCase(c)]=d),i?(g=f[c],g==null&&(g=f[p.camelCase(c)])):g=f,g},removeData:function(a,b,c){if(!p.acceptData(a))return;var d,e,f,g=a.nodeType,h=g?p.cache:a,i=g?a[p.expando]:p.expando;if(!h[i])return;if(b){d=c?h[i]:h[i].data;if(d){p.isArray(b)||(b in d?b=[b]:(b=p.camelCase(b),b in d?b=[b]:b=b.split(" ")));for(e=0,f=b.length;e<f;e++)delete d[b[e]];if(!(c?K:p.isEmptyObject)(d))return}}if(!c){delete h[i].data;if(!K(h[i]))return}g?p.cleanData([a],!0):p.support.deleteExpando||h!=h.window?delete h[i]:h[i]=null},_data:function(a,b,c){return p.data(a,b,c,!0)},acceptData:function(a){var b=a.nodeName&&p.noData[a.nodeName.toLowerCase()];return!b||b!==!0&&a.getAttribute("classid")===b}}),p.fn.extend({data:function(a,c){var d,e,f,g,h,i=this[0],j=0,k=null;if(a===b){if(this.length){k=p.data(i);if(i.nodeType===1&&!p._data(i,"parsedAttrs")){f=i.attributes;for(h=f.length;j<h;j++)g=f[j].name,g.indexOf("data-")||(g=p.camelCase(g.substring(5)),J(i,g,k[g]));p._data(i,"parsedAttrs",!0)}}return k}return typeof a=="object"?this.each(function(){p.data(this,a)}):(d=a.split(".",2),d[1]=d[1]?"."+d[1]:"",e=d[1]+"!",p.access(this,function(c){if(c===b)return k=this.triggerHandler("getData"+e,[d[0]]),k===b&&i&&(k=p.data(i,a),k=J(i,a,k)),k===b&&d[1]?this.data(d[0]):k;d[1]=c,this.each(function(){var b=p(this);b.triggerHandler("setData"+e,d),p.data(this,a,c),b.triggerHandler("changeData"+e,d)})},null,c,arguments.length>1,null,!1))},removeData:function(a){return this.each(function(){p.removeData(this,a)})}}),p.extend({queue:function(a,b,c){var d;if(a)return b=(b||"fx")+"queue",d=p._data(a,b),c&&(!d||p.isArray(c)?d=p._data(a,b,p.makeArray(c)):d.push(c)),d||[]},dequeue:function(a,b){b=b||"fx";var c=p.queue(a,b),d=c.length,e=c.shift(),f=p._queueHooks(a,b),g=function(){p.dequeue(a,b)};e==="inprogress"&&(e=c.shift(),d--),e&&(b==="fx"&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return p._data(a,c)||p._data(a,c,{empty:p.Callbacks("once memory").add(function(){p.removeData(a,b+"queue",!0),p.removeData(a,c,!0)})})}}),p.fn.extend({queue:function(a,c){var d=2;return typeof a!="string"&&(c=a,a="fx",d--),arguments.length<d?p.queue(this[0],a):c===b?this:this.each(function(){var b=p.queue(this,a,c);p._queueHooks(this,a),a==="fx"&&b[0]!=="inprogress"&&p.dequeue(this,a)})},dequeue:function(a){return this.each(function(){p.dequeue(this,a)})},delay:function(a,b){return a=p.fx?p.fx.speeds[a]||a:a,b=b||"fx",this.queue(b,function(b,c){var d=setTimeout(b,a);c.stop=function(){clearTimeout(d)}})},clearQueue:function(a){return this.queue(a||"fx",[])},promise:function(a,c){var d,e=1,f=p.Deferred(),g=this,h=this.length,i=function(){--e||f.resolveWith(g,[g])};typeof a!="string"&&(c=a,a=b),a=a||"fx";while(h--)d=p._data(g[h],a+"queueHooks"),d&&d.empty&&(e++,d.empty.add(i));return i(),f.promise(c)}});var L,M,N,O=/[\t\r\n]/g,P=/\r/g,Q=/^(?:button|input)$/i,R=/^(?:button|input|object|select|textarea)$/i,S=/^a(?:rea|)$/i,T=/^(?:autofocus|autoplay|async|checked|controls|defer|disabled|hidden|loop|multiple|open|readonly|required|scoped|selected)$/i,U=p.support.getSetAttribute;p.fn.extend({attr:function(a,b){return p.access(this,p.attr,a,b,arguments.length>1)},removeAttr:function(a){return this.each(function(){p.removeAttr(this,a)})},prop:function(a,b){return p.access(this,p.prop,a,b,arguments.length>1)},removeProp:function(a){return a=p.propFix[a]||a,this.each(function(){try{this[a]=b,delete this[a]}catch(c){}})},addClass:function(a){var b,c,d,e,f,g,h;if(p.isFunction(a))return this.each(function(b){p(this).addClass(a.call(this,b,this.className))});if(a&&typeof a=="string"){b=a.split(s);for(c=0,d=this.length;c<d;c++){e=this[c];if(e.nodeType===1)if(!e.className&&b.length===1)e.className=a;else{f=" "+e.className+" ";for(g=0,h=b.length;g<h;g++)f.indexOf(" "+b[g]+" ")<0&&(f+=b[g]+" ");e.className=p.trim(f)}}}return this},removeClass:function(a){var c,d,e,f,g,h,i;if(p.isFunction(a))return this.each(function(b){p(this).removeClass(a.call(this,b,this.className))});if(a&&typeof a=="string"||a===b){c=(a||"").split(s);for(h=0,i=this.length;h<i;h++){e=this[h];if(e.nodeType===1&&e.className){d=(" "+e.className+" ").replace(O," ");for(f=0,g=c.length;f<g;f++)while(d.indexOf(" "+c[f]+" ")>=0)d=d.replace(" "+c[f]+" "," ");e.className=a?p.trim(d):""}}}return this},toggleClass:function(a,b){var c=typeof a,d=typeof b=="boolean";return p.isFunction(a)?this.each(function(c){p(this).toggleClass(a.call(this,c,this.className,b),b)}):this.each(function(){if(c==="string"){var e,f=0,g=p(this),h=b,i=a.split(s);while(e=i[f++])h=d?h:!g.hasClass(e),g[h?"addClass":"removeClass"](e)}else if(c==="undefined"||c==="boolean")this.className&&p._data(this,"__className__",this.className),this.className=this.className||a===!1?"":p._data(this,"__className__")||""})},hasClass:function(a){var b=" "+a+" ",c=0,d=this.length;for(;c<d;c++)if(this[c].nodeType===1&&(" "+this[c].className+" ").replace(O," ").indexOf(b)>=0)return!0;return!1},val:function(a){var c,d,e,f=this[0];if(!arguments.length){if(f)return c=p.valHooks[f.type]||p.valHooks[f.nodeName.toLowerCase()],c&&"get"in c&&(d=c.get(f,"value"))!==b?d:(d=f.value,typeof d=="string"?d.replace(P,""):d==null?"":d);return}return e=p.isFunction(a),this.each(function(d){var f,g=p(this);if(this.nodeType!==1)return;e?f=a.call(this,d,g.val()):f=a,f==null?f="":typeof f=="number"?f+="":p.isArray(f)&&(f=p.map(f,function(a){return a==null?"":a+""})),c=p.valHooks[this.type]||p.valHooks[this.nodeName.toLowerCase()];if(!c||!("set"in c)||c.set(this,f,"value")===b)this.value=f})}}),p.extend({valHooks:{option:{get:function(a){var b=a.attributes.value;return!b||b.specified?a.value:a.text}},select:{get:function(a){var b,c,d,e,f=a.selectedIndex,g=[],h=a.options,i=a.type==="select-one";if(f<0)return null;c=i?f:0,d=i?f+1:h.length;for(;c<d;c++){e=h[c];if(e.selected&&(p.support.optDisabled?!e.disabled:e.getAttribute("disabled")===null)&&(!e.parentNode.disabled||!p.nodeName(e.parentNode,"optgroup"))){b=p(e).val();if(i)return b;g.push(b)}}return i&&!g.length&&h.length?p(h[f]).val():g},set:function(a,b){var c=p.makeArray(b);return p(a).find("option").each(function(){this.selected=p.inArray(p(this).val(),c)>=0}),c.length||(a.selectedIndex=-1),c}}},attrFn:{},attr:function(a,c,d,e){var f,g,h,i=a.nodeType;if(!a||i===3||i===8||i===2)return;if(e&&p.isFunction(p.fn[c]))return p(a)[c](d);if(typeof a.getAttribute=="undefined")return p.prop(a,c,d);h=i!==1||!p.isXMLDoc(a),h&&(c=c.toLowerCase(),g=p.attrHooks[c]||(T.test(c)?M:L));if(d!==b){if(d===null){p.removeAttr(a,c);return}return g&&"set"in g&&h&&(f=g.set(a,d,c))!==b?f:(a.setAttribute(c,d+""),d)}return g&&"get"in g&&h&&(f=g.get(a,c))!==null?f:(f=a.getAttribute(c),f===null?b:f)},removeAttr:function(a,b){var c,d,e,f,g=0;if(b&&a.nodeType===1){d=b.split(s);for(;g<d.length;g++)e=d[g],e&&(c=p.propFix[e]||e,f=T.test(e),f||p.attr(a,e,""),a.removeAttribute(U?e:c),f&&c in a&&(a[c]=!1))}},attrHooks:{type:{set:function(a,b){if(Q.test(a.nodeName)&&a.parentNode)p.error("type property can't be changed");else if(!p.support.radioValue&&b==="radio"&&p.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}},value:{get:function(a,b){return L&&p.nodeName(a,"button")?L.get(a,b):b in a?a.value:null},set:function(a,b,c){if(L&&p.nodeName(a,"button"))return L.set(a,b,c);a.value=b}}},propFix:{tabindex:"tabIndex",readonly:"readOnly","for":"htmlFor","class":"className",maxlength:"maxLength",cellspacing:"cellSpacing",cellpadding:"cellPadding",rowspan:"rowSpan",colspan:"colSpan",usemap:"useMap",frameborder:"frameBorder",contenteditable:"contentEditable"},prop:function(a,c,d){var e,f,g,h=a.nodeType;if(!a||h===3||h===8||h===2)return;return g=h!==1||!p.isXMLDoc(a),g&&(c=p.propFix[c]||c,f=p.propHooks[c]),d!==b?f&&"set"in f&&(e=f.set(a,d,c))!==b?e:a[c]=d:f&&"get"in f&&(e=f.get(a,c))!==null?e:a[c]},propHooks:{tabIndex:{get:function(a){var c=a.getAttributeNode("tabindex");return c&&c.specified?parseInt(c.value,10):R.test(a.nodeName)||S.test(a.nodeName)&&a.href?0:b}}}}),M={get:function(a,c){var d,e=p.prop(a,c);return e===!0||typeof e!="boolean"&&(d=a.getAttributeNode(c))&&d.nodeValue!==!1?c.toLowerCase():b},set:function(a,b,c){var d;return b===!1?p.removeAttr(a,c):(d=p.propFix[c]||c,d in a&&(a[d]=!0),a.setAttribute(c,c.toLowerCase())),c}},U||(N={name:!0,id:!0,coords:!0},L=p.valHooks.button={get:function(a,c){var d;return d=a.getAttributeNode(c),d&&(N[c]?d.value!=="":d.specified)?d.value:b},set:function(a,b,c){var d=a.getAttributeNode(c);return d||(d=e.createAttribute(c),a.setAttributeNode(d)),d.value=b+""}},p.each(["width","height"],function(a,b){p.attrHooks[b]=p.extend(p.attrHooks[b],{set:function(a,c){if(c==="")return a.setAttribute(b,"auto"),c}})}),p.attrHooks.contenteditable={get:L.get,set:function(a,b,c){b===""&&(b="false"),L.set(a,b,c)}}),p.support.hrefNormalized||p.each(["href","src","width","height"],function(a,c){p.attrHooks[c]=p.extend(p.attrHooks[c],{get:function(a){var d=a.getAttribute(c,2);return d===null?b:d}})}),p.support.style||(p.attrHooks.style={get:function(a){return a.style.cssText.toLowerCase()||b},set:function(a,b){return a.style.cssText=b+""}}),p.support.optSelected||(p.propHooks.selected=p.extend(p.propHooks.selected,{get:function(a){var b=a.parentNode;return b&&(b.selectedIndex,b.parentNode&&b.parentNode.selectedIndex),null}})),p.support.enctype||(p.propFix.enctype="encoding"),p.support.checkOn||p.each(["radio","checkbox"],function(){p.valHooks[this]={get:function(a){return a.getAttribute("value")===null?"on":a.value}}}),p.each(["radio","checkbox"],function(){p.valHooks[this]=p.extend(p.valHooks[this],{set:function(a,b){if(p.isArray(b))return a.checked=p.inArray(p(a).val(),b)>=0}})});var V=/^(?:textarea|input|select)$/i,W=/^([^\.]*|)(?:\.(.+)|)$/,X=/(?:^|\s)hover(\.\S+|)\b/,Y=/^key/,Z=/^(?:mouse|contextmenu)|click/,$=/^(?:focusinfocus|focusoutblur)$/,_=function(a){return p.event.special.hover?a:a.replace(X,"mouseenter$1 mouseleave$1")};p.event={add:function(a,c,d,e,f){var g,h,i,j,k,l,m,n,o,q,r;if(a.nodeType===3||a.nodeType===8||!c||!d||!(g=p._data(a)))return;d.handler&&(o=d,d=o.handler,f=o.selector),d.guid||(d.guid=p.guid++),i=g.events,i||(g.events=i={}),h=g.handle,h||(g.handle=h=function(a){return typeof p!="undefined"&&(!a||p.event.triggered!==a.type)?p.event.dispatch.apply(h.elem,arguments):b},h.elem=a),c=p.trim(_(c)).split(" ");for(j=0;j<c.length;j++){k=W.exec(c[j])||[],l=k[1],m=(k[2]||"").split(".").sort(),r=p.event.special[l]||{},l=(f?r.delegateType:r.bindType)||l,r=p.event.special[l]||{},n=p.extend({type:l,origType:k[1],data:e,handler:d,guid:d.guid,selector:f,needsContext:f&&p.expr.match.needsContext.test(f),namespace:m.join(".")},o),q=i[l];if(!q){q=i[l]=[],q.delegateCount=0;if(!r.setup||r.setup.call(a,e,m,h)===!1)a.addEventListener?a.addEventListener(l,h,!1):a.attachEvent&&a.attachEvent("on"+l,h)}r.add&&(r.add.call(a,n),n.handler.guid||(n.handler.guid=d.guid)),f?q.splice(q.delegateCount++,0,n):q.push(n),p.event.global[l]=!0}a=null},global:{},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,n,o,q,r=p.hasData(a)&&p._data(a);if(!r||!(m=r.events))return;b=p.trim(_(b||"")).split(" ");for(f=0;f<b.length;f++){g=W.exec(b[f])||[],h=i=g[1],j=g[2];if(!h){for(h in m)p.event.remove(a,h+b[f],c,d,!0);continue}n=p.event.special[h]||{},h=(d?n.delegateType:n.bindType)||h,o=m[h]||[],k=o.length,j=j?new RegExp("(^|\\.)"+j.split(".").sort().join("\\.(?:.*\\.|)")+"(\\.|$)"):null;for(l=0;l<o.length;l++)q=o[l],(e||i===q.origType)&&(!c||c.guid===q.guid)&&(!j||j.test(q.namespace))&&(!d||d===q.selector||d==="**"&&q.selector)&&(o.splice(l--,1),q.selector&&o.delegateCount--,n.remove&&n.remove.call(a,q));o.length===0&&k!==o.length&&((!n.teardown||n.teardown.call(a,j,r.handle)===!1)&&p.removeEvent(a,h,r.handle),delete m[h])}p.isEmptyObject(m)&&(delete r.handle,p.removeData(a,"events",!0))},customEvent:{getData:!0,setData:!0,changeData:!0},trigger:function(c,d,f,g){if(!f||f.nodeType!==3&&f.nodeType!==8){var h,i,j,k,l,m,n,o,q,r,s=c.type||c,t=[];if($.test(s+p.event.triggered))return;s.indexOf("!")>=0&&(s=s.slice(0,-1),i=!0),s.indexOf(".")>=0&&(t=s.split("."),s=t.shift(),t.sort());if((!f||p.event.customEvent[s])&&!p.event.global[s])return;c=typeof c=="object"?c[p.expando]?c:new p.Event(s,c):new p.Event(s),c.type=s,c.isTrigger=!0,c.exclusive=i,c.namespace=t.join("."),c.namespace_re=c.namespace?new RegExp("(^|\\.)"+t.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,m=s.indexOf(":")<0?"on"+s:"";if(!f){h=p.cache;for(j in h)h[j].events&&h[j].events[s]&&p.event.trigger(c,d,h[j].handle.elem,!0);return}c.result=b,c.target||(c.target=f),d=d!=null?p.makeArray(d):[],d.unshift(c),n=p.event.special[s]||{};if(n.trigger&&n.trigger.apply(f,d)===!1)return;q=[[f,n.bindType||s]];if(!g&&!n.noBubble&&!p.isWindow(f)){r=n.delegateType||s,k=$.test(r+s)?f:f.parentNode;for(l=f;k;k=k.parentNode)q.push([k,r]),l=k;l===(f.ownerDocument||e)&&q.push([l.defaultView||l.parentWindow||a,r])}for(j=0;j<q.length&&!c.isPropagationStopped();j++)k=q[j][0],c.type=q[j][1],o=(p._data(k,"events")||{})[c.type]&&p._data(k,"handle"),o&&o.apply(k,d),o=m&&k[m],o&&p.acceptData(k)&&o.apply&&o.apply(k,d)===!1&&c.preventDefault();return c.type=s,!g&&!c.isDefaultPrevented()&&(!n._default||n._default.apply(f.ownerDocument,d)===!1)&&(s!=="click"||!p.nodeName(f,"a"))&&p.acceptData(f)&&m&&f[s]&&(s!=="focus"&&s!=="blur"||c.target.offsetWidth!==0)&&!p.isWindow(f)&&(l=f[m],l&&(f[m]=null),p.event.triggered=s,f[s](),p.event.triggered=b,l&&(f[m]=l)),c.result}return},dispatch:function(c){c=p.event.fix(c||a.event);var d,e,f,g,h,i,j,l,m,n,o=(p._data(this,"events")||{})[c.type]||[],q=o.delegateCount,r=k.call(arguments),s=!c.exclusive&&!c.namespace,t=p.event.special[c.type]||{},u=[];r[0]=c,c.delegateTarget=this;if(t.preDispatch&&t.preDispatch.call(this,c)===!1)return;if(q&&(!c.button||c.type!=="click"))for(f=c.target;f!=this;f=f.parentNode||this)if(f.disabled!==!0||c.type!=="click"){h={},j=[];for(d=0;d<q;d++)l=o[d],m=l.selector,h[m]===b&&(h[m]=l.needsContext?p(m,this).index(f)>=0:p.find(m,this,null,[f]).length),h[m]&&j.push(l);j.length&&u.push({elem:f,matches:j})}o.length>q&&u.push({elem:this,matches:o.slice(q)});for(d=0;d<u.length&&!c.isPropagationStopped();d++){i=u[d],c.currentTarget=i.elem;for(e=0;e<i.matches.length&&!c.isImmediatePropagationStopped();e++){l=i.matches[e];if(s||!c.namespace&&!l.namespace||c.namespace_re&&c.namespace_re.test(l.namespace))c.data=l.data,c.handleObj=l,g=((p.event.special[l.origType]||{}).handle||l.handler).apply(i.elem,r),g!==b&&(c.result=g,g===!1&&(c.preventDefault(),c.stopPropagation()))}}return t.postDispatch&&t.postDispatch.call(this,c),c.result},props:"attrChange attrName relatedNode srcElement altKey bubbles cancelable ctrlKey currentTarget eventPhase metaKey relatedTarget shiftKey target timeStamp view which".split(" "),fixHooks:{},keyHooks:{props:"char charCode key keyCode".split(" "),filter:function(a,b){return a.which==null&&(a.which=b.charCode!=null?b.charCode:b.keyCode),a}},mouseHooks:{props:"button buttons clientX clientY fromElement offsetX offsetY pageX pageY screenX screenY toElement".split(" "),filter:function(a,c){var d,f,g,h=c.button,i=c.fromElement;return a.pageX==null&&c.clientX!=null&&(d=a.target.ownerDocument||e,f=d.documentElement,g=d.body,a.pageX=c.clientX+(f&&f.scrollLeft||g&&g.scrollLeft||0)-(f&&f.clientLeft||g&&g.clientLeft||0),a.pageY=c.clientY+(f&&f.scrollTop||g&&g.scrollTop||0)-(f&&f.clientTop||g&&g.clientTop||0)),!a.relatedTarget&&i&&(a.relatedTarget=i===a.target?c.toElement:i),!a.which&&h!==b&&(a.which=h&1?1:h&2?3:h&4?2:0),a}},fix:function(a){if(a[p.expando])return a;var b,c,d=a,f=p.event.fixHooks[a.type]||{},g=f.props?this.props.concat(f.props):this.props;a=p.Event(d);for(b=g.length;b;)c=g[--b],a[c]=d[c];return a.target||(a.target=d.srcElement||e),a.target.nodeType===3&&(a.target=a.target.parentNode),a.metaKey=!!a.metaKey,f.filter?f.filter(a,d):a},special:{load:{noBubble:!0},focus:{delegateType:"focusin"},blur:{delegateType:"focusout"},beforeunload:{setup:function(a,b,c){p.isWindow(this)&&(this.onbeforeunload=c)},teardown:function(a,b){this.onbeforeunload===b&&(this.onbeforeunload=null)}}},simulate:function(a,b,c,d){var e=p.extend(new p.Event,c,{type:a,isSimulated:!0,originalEvent:{}});d?p.event.trigger(e,null,b):p.event.dispatch.call(b,e),e.isDefaultPrevented()&&c.preventDefault()}},p.event.handle=p.event.dispatch,p.removeEvent=e.removeEventListener?function(a,b,c){a.removeEventListener&&a.removeEventListener(b,c,!1)}:function(a,b,c){var d="on"+b;a.detachEvent&&(typeof a[d]=="undefined"&&(a[d]=null),a.detachEvent(d,c))},p.Event=function(a,b){if(this instanceof p.Event)a&&a.type?(this.originalEvent=a,this.type=a.type,this.isDefaultPrevented=a.defaultPrevented||a.returnValue===!1||a.getPreventDefault&&a.getPreventDefault()?bb:ba):this.type=a,b&&p.extend(this,b),this.timeStamp=a&&a.timeStamp||p.now(),this[p.expando]=!0;else return new p.Event(a,b)},p.Event.prototype={preventDefault:function(){this.isDefaultPrevented=bb;var a=this.originalEvent;if(!a)return;a.preventDefault?a.preventDefault():a.returnValue=!1},stopPropagation:function(){this.isPropagationStopped=bb;var a=this.originalEvent;if(!a)return;a.stopPropagation&&a.stopPropagation(),a.cancelBubble=!0},stopImmediatePropagation:function(){this.isImmediatePropagationStopped=bb,this.stopPropagation()},isDefaultPrevented:ba,isPropagationStopped:ba,isImmediatePropagationStopped:ba},p.each({mouseenter:"mouseover",mouseleave:"mouseout"},function(a,b){p.event.special[a]={delegateType:b,bindType:b,handle:function(a){var c,d=this,e=a.relatedTarget,f=a.handleObj,g=f.selector;if(!e||e!==d&&!p.contains(d,e))a.type=f.origType,c=f.handler.apply(this,arguments),a.type=b;return c}}}),p.support.submitBubbles||(p.event.special.submit={setup:function(){if(p.nodeName(this,"form"))return!1;p.event.add(this,"click._submit keypress._submit",function(a){var c=a.target,d=p.nodeName(c,"input")||p.nodeName(c,"button")?c.form:b;d&&!p._data(d,"_submit_attached")&&(p.event.add(d,"submit._submit",function(a){a._submit_bubble=!0}),p._data(d,"_submit_attached",!0))})},postDispatch:function(a){a._submit_bubble&&(delete a._submit_bubble,this.parentNode&&!a.isTrigger&&p.event.simulate("submit",this.parentNode,a,!0))},teardown:function(){if(p.nodeName(this,"form"))return!1;p.event.remove(this,"._submit")}}),p.support.changeBubbles||(p.event.special.change={setup:function(){if(V.test(this.nodeName)){if(this.type==="checkbox"||this.type==="radio")p.event.add(this,"propertychange._change",function(a){a.originalEvent.propertyName==="checked"&&(this._just_changed=!0)}),p.event.add(this,"click._change",function(a){this._just_changed&&!a.isTrigger&&(this._just_changed=!1),p.event.simulate("change",this,a,!0)});return!1}p.event.add(this,"beforeactivate._change",function(a){var b=a.target;V.test(b.nodeName)&&!p._data(b,"_change_attached")&&(p.event.add(b,"change._change",function(a){this.parentNode&&!a.isSimulated&&!a.isTrigger&&p.event.simulate("change",this.parentNode,a,!0)}),p._data(b,"_change_attached",!0))})},handle:function(a){var b=a.target;if(this!==b||a.isSimulated||a.isTrigger||b.type!=="radio"&&b.type!=="checkbox")return a.handleObj.handler.apply(this,arguments)},teardown:function(){return p.event.remove(this,"._change"),!V.test(this.nodeName)}}),p.support.focusinBubbles||p.each({focus:"focusin",blur:"focusout"},function(a,b){var c=0,d=function(a){p.event.simulate(b,a.target,p.event.fix(a),!0)};p.event.special[b]={setup:function(){c++===0&&e.addEventListener(a,d,!0)},teardown:function(){--c===0&&e.removeEventListener(a,d,!0)}}}),p.fn.extend({on:function(a,c,d,e,f){var g,h;if(typeof a=="object"){typeof c!="string"&&(d=d||c,c=b);for(h in a)this.on(h,c,d,a[h],f);return this}d==null&&e==null?(e=c,d=c=b):e==null&&(typeof c=="string"?(e=d,d=b):(e=d,d=c,c=b));if(e===!1)e=ba;else if(!e)return this;return f===1&&(g=e,e=function(a){return p().off(a),g.apply(this,arguments)},e.guid=g.guid||(g.guid=p.guid++)),this.each(function(){p.event.add(this,a,e,d,c)})},one:function(a,b,c,d){return this.on(a,b,c,d,1)},off:function(a,c,d){var e,f;if(a&&a.preventDefault&&a.handleObj)return e=a.handleObj,p(a.delegateTarget).off(e.namespace?e.origType+"."+e.namespace:e.origType,e.selector,e.handler),this;if(typeof a=="object"){for(f in a)this.off(f,c,a[f]);return this}if(c===!1||typeof c=="function")d=c,c=b;return d===!1&&(d=ba),this.each(function(){p.event.remove(this,a,d,c)})},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},live:function(a,b,c){return p(this.context).on(a,this.selector,b,c),this},die:function(a,b){return p(this.context).off(a,this.selector||"**",b),this},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return arguments.length===1?this.off(a,"**"):this.off(b,a||"**",c)},trigger:function(a,b){return this.each(function(){p.event.trigger(a,b,this)})},triggerHandler:function(a,b){if(this[0])return p.event.trigger(a,b,this[0],!0)},toggle:function(a){var b=arguments,c=a.guid||p.guid++,d=0,e=function(c){var e=(p._data(this,"lastToggle"+a.guid)||0)%d;return p._data(this,"lastToggle"+a.guid,e+1),c.preventDefault(),b[e].apply(this,arguments)||!1};e.guid=c;while(d<b.length)b[d++].guid=c;return this.click(e)},hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)}}),p.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){p.fn[b]=function(a,c){return c==null&&(c=a,a=null),arguments.length>0?this.on(b,null,a,c):this.trigger(b)},Y.test(b)&&(p.event.fixHooks[b]=p.event.keyHooks),Z.test(b)&&(p.event.fixHooks[b]=p.event.mouseHooks)}),function(a,b){function bc(a,b,c,d){c=c||[],b=b||r;var e,f,i,j,k=b.nodeType;if(!a||typeof a!="string")return c;if(k!==1&&k!==9)return[];i=g(b);if(!i&&!d)if(e=P.exec(a))if(j=e[1]){if(k===9){f=b.getElementById(j);if(!f||!f.parentNode)return c;if(f.id===j)return c.push(f),c}else if(b.ownerDocument&&(f=b.ownerDocument.getElementById(j))&&h(b,f)&&f.id===j)return c.push(f),c}else{if(e[2])return w.apply(c,x.call(b.getElementsByTagName(a),0)),c;if((j=e[3])&&_&&b.getElementsByClassName)return w.apply(c,x.call(b.getElementsByClassName(j),0)),c}return bp(a.replace(L,"$1"),b,c,d,i)}function bd(a){return function(b){var c=b.nodeName.toLowerCase();return c==="input"&&b.type===a}}function be(a){return function(b){var c=b.nodeName.toLowerCase();return(c==="input"||c==="button")&&b.type===a}}function bf(a){return z(function(b){return b=+b,z(function(c,d){var e,f=a([],c.length,b),g=f.length;while(g--)c[e=f[g]]&&(c[e]=!(d[e]=c[e]))})})}function bg(a,b,c){if(a===b)return c;var d=a.nextSibling;while(d){if(d===b)return-1;d=d.nextSibling}return 1}function bh(a,b){var c,d,f,g,h,i,j,k=C[o][a];if(k)return b?0:k.slice(0);h=a,i=[],j=e.preFilter;while(h){if(!c||(d=M.exec(h)))d&&(h=h.slice(d[0].length)),i.push(f=[]);c=!1;if(d=N.exec(h))f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=d[0].replace(L," ");for(g in e.filter)(d=W[g].exec(h))&&(!j[g]||(d=j[g](d,r,!0)))&&(f.push(c=new q(d.shift())),h=h.slice(c.length),c.type=g,c.matches=d);if(!c)break}return b?h.length:h?bc.error(a):C(a,i).slice(0)}function bi(a,b,d){var e=b.dir,f=d&&b.dir==="parentNode",g=u++;return b.first?function(b,c,d){while(b=b[e])if(f||b.nodeType===1)return a(b,c,d)}:function(b,d,h){if(!h){var i,j=t+" "+g+" ",k=j+c;while(b=b[e])if(f||b.nodeType===1){if((i=b[o])===k)return b.sizset;if(typeof i=="string"&&i.indexOf(j)===0){if(b.sizset)return b}else{b[o]=k;if(a(b,d,h))return b.sizset=!0,b;b.sizset=!1}}}else while(b=b[e])if(f||b.nodeType===1)if(a(b,d,h))return b}}function bj(a){return a.length>1?function(b,c,d){var e=a.length;while(e--)if(!a[e](b,c,d))return!1;return!0}:a[0]}function bk(a,b,c,d,e){var f,g=[],h=0,i=a.length,j=b!=null;for(;h<i;h++)if(f=a[h])if(!c||c(f,d,e))g.push(f),j&&b.push(h);return g}function bl(a,b,c,d,e,f){return d&&!d[o]&&(d=bl(d)),e&&!e[o]&&(e=bl(e,f)),z(function(f,g,h,i){if(f&&e)return;var j,k,l,m=[],n=[],o=g.length,p=f||bo(b||"*",h.nodeType?[h]:h,[],f),q=a&&(f||!b)?bk(p,m,a,h,i):p,r=c?e||(f?a:o||d)?[]:g:q;c&&c(q,r,h,i);if(d){l=bk(r,n),d(l,[],h,i),j=l.length;while(j--)if(k=l[j])r[n[j]]=!(q[n[j]]=k)}if(f){j=a&&r.length;while(j--)if(k=r[j])f[m[j]]=!(g[m[j]]=k)}else r=bk(r===g?r.splice(o,r.length):r),e?e(null,g,r,i):w.apply(g,r)})}function bm(a){var b,c,d,f=a.length,g=e.relative[a[0].type],h=g||e.relative[" "],i=g?1:0,j=bi(function(a){return a===b},h,!0),k=bi(function(a){return y.call(b,a)>-1},h,!0),m=[function(a,c,d){return!g&&(d||c!==l)||((b=c).nodeType?j(a,c,d):k(a,c,d))}];for(;i<f;i++)if(c=e.relative[a[i].type])m=[bi(bj(m),c)];else{c=e.filter[a[i].type].apply(null,a[i].matches);if(c[o]){d=++i;for(;d<f;d++)if(e.relative[a[d].type])break;return bl(i>1&&bj(m),i>1&&a.slice(0,i-1).join("").replace(L,"$1"),c,i<d&&bm(a.slice(i,d)),d<f&&bm(a=a.slice(d)),d<f&&a.join(""))}m.push(c)}return bj(m)}function bn(a,b){var d=b.length>0,f=a.length>0,g=function(h,i,j,k,m){var n,o,p,q=[],s=0,u="0",x=h&&[],y=m!=null,z=l,A=h||f&&e.find.TAG("*",m&&i.parentNode||i),B=t+=z==null?1:Math.E;y&&(l=i!==r&&i,c=g.el);for(;(n=A[u])!=null;u++){if(f&&n){for(o=0;p=a[o];o++)if(p(n,i,j)){k.push(n);break}y&&(t=B,c=++g.el)}d&&((n=!p&&n)&&s--,h&&x.push(n))}s+=u;if(d&&u!==s){for(o=0;p=b[o];o++)p(x,q,i,j);if(h){if(s>0)while(u--)!x[u]&&!q[u]&&(q[u]=v.call(k));q=bk(q)}w.apply(k,q),y&&!h&&q.length>0&&s+b.length>1&&bc.uniqueSort(k)}return y&&(t=B,l=z),x};return g.el=0,d?z(g):g}function bo(a,b,c,d){var e=0,f=b.length;for(;e<f;e++)bc(a,b[e],c,d);return c}function bp(a,b,c,d,f){var g,h,j,k,l,m=bh(a),n=m.length;if(!d&&m.length===1){h=m[0]=m[0].slice(0);if(h.length>2&&(j=h[0]).type==="ID"&&b.nodeType===9&&!f&&e.relative[h[1].type]){b=e.find.ID(j.matches[0].replace(V,""),b,f)[0];if(!b)return c;a=a.slice(h.shift().length)}for(g=W.POS.test(a)?-1:h.length-1;g>=0;g--){j=h[g];if(e.relative[k=j.type])break;if(l=e.find[k])if(d=l(j.matches[0].replace(V,""),R.test(h[0].type)&&b.parentNode||b,f)){h.splice(g,1),a=d.length&&h.join("");if(!a)return w.apply(c,x.call(d,0)),c;break}}}return i(a,m)(d,b,f,c,R.test(a)),c}function bq(){}var c,d,e,f,g,h,i,j,k,l,m=!0,n="undefined",o=("sizcache"+Math.random()).replace(".",""),q=String,r=a.document,s=r.documentElement,t=0,u=0,v=[].pop,w=[].push,x=[].slice,y=[].indexOf||function(a){var b=0,c=this.length;for(;b<c;b++)if(this[b]===a)return b;return-1},z=function(a,b){return a[o]=b==null||b,a},A=function(){var a={},b=[];return z(function(c,d){return b.push(c)>e.cacheLength&&delete a[b.shift()],a[c]=d},a)},B=A(),C=A(),D=A(),E="[\\x20\\t\\r\\n\\f]",F="(?:\\\\.|[-\\w]|[^\\x00-\\xa0])+",G=F.replace("w","w#"),H="([*^$|!~]?=)",I="\\["+E+"*("+F+")"+E+"*(?:"+H+E+"*(?:(['\"])((?:\\\\.|[^\\\\])*?)\\3|("+G+")|)|)"+E+"*\\]",J=":("+F+")(?:\\((?:(['\"])((?:\\\\.|[^\\\\])*?)\\2|([^()[\\]]*|(?:(?:"+I+")|[^:]|\\\\.)*|.*))\\)|)",K=":(even|odd|eq|gt|lt|nth|first|last)(?:\\("+E+"*((?:-\\d)?\\d*)"+E+"*\\)|)(?=[^-]|$)",L=new RegExp("^"+E+"+|((?:^|[^\\\\])(?:\\\\.)*)"+E+"+$","g"),M=new RegExp("^"+E+"*,"+E+"*"),N=new RegExp("^"+E+"*([\\x20\\t\\r\\n\\f>+~])"+E+"*"),O=new RegExp(J),P=/^(?:#([\w\-]+)|(\w+)|\.([\w\-]+))$/,Q=/^:not/,R=/[\x20\t\r\n\f]*[+~]/,S=/:not\($/,T=/h\d/i,U=/input|select|textarea|button/i,V=/\\(?!\\)/g,W={ID:new RegExp("^#("+F+")"),CLASS:new RegExp("^\\.("+F+")"),NAME:new RegExp("^\\[name=['\"]?("+F+")['\"]?\\]"),TAG:new RegExp("^("+F.replace("w","w*")+")"),ATTR:new RegExp("^"+I),PSEUDO:new RegExp("^"+J),POS:new RegExp(K,"i"),CHILD:new RegExp("^:(only|nth|first|last)-child(?:\\("+E+"*(even|odd|(([+-]|)(\\d*)n|)"+E+"*(?:([+-]|)"+E+"*(\\d+)|))"+E+"*\\)|)","i"),needsContext:new RegExp("^"+E+"*[>+~]|"+K,"i")},X=function(a){var b=r.createElement("div");try{return a(b)}catch(c){return!1}finally{b=null}},Y=X(function(a){return a.appendChild(r.createComment("")),!a.getElementsByTagName("*").length}),Z=X(function(a){return a.innerHTML="<a href='#'></a>",a.firstChild&&typeof a.firstChild.getAttribute!==n&&a.firstChild.getAttribute("href")==="#"}),$=X(function(a){a.innerHTML="<select></select>";var b=typeof a.lastChild.getAttribute("multiple");return b!=="boolean"&&b!=="string"}),_=X(function(a){return a.innerHTML="<div class='hidden e'></div><div class='hidden'></div>",!a.getElementsByClassName||!a.getElementsByClassName("e").length?!1:(a.lastChild.className="e",a.getElementsByClassName("e").length===2)}),ba=X(function(a){a.id=o+0,a.innerHTML="<a name='"+o+"'></a><div name='"+o+"'></div>",s.insertBefore(a,s.firstChild);var b=r.getElementsByName&&r.getElementsByName(o).length===2+r.getElementsByName(o+0).length;return d=!r.getElementById(o),s.removeChild(a),b});try{x.call(s.childNodes,0)[0].nodeType}catch(bb){x=function(a){var b,c=[];for(;b=this[a];a++)c.push(b);return c}}bc.matches=function(a,b){return bc(a,null,null,b)},bc.matchesSelector=function(a,b){return bc(b,null,null,[a]).length>0},f=bc.getText=function(a){var b,c="",d=0,e=a.nodeType;if(e){if(e===1||e===9||e===11){if(typeof a.textContent=="string")return a.textContent;for(a=a.firstChild;a;a=a.nextSibling)c+=f(a)}else if(e===3||e===4)return a.nodeValue}else for(;b=a[d];d++)c+=f(b);return c},g=bc.isXML=function(a){var b=a&&(a.ownerDocument||a).documentElement;return b?b.nodeName!=="HTML":!1},h=bc.contains=s.contains?function(a,b){var c=a.nodeType===9?a.documentElement:a,d=b&&b.parentNode;return a===d||!!(d&&d.nodeType===1&&c.contains&&c.contains(d))}:s.compareDocumentPosition?function(a,b){return b&&!!(a.compareDocumentPosition(b)&16)}:function(a,b){while(b=b.parentNode)if(b===a)return!0;return!1},bc.attr=function(a,b){var c,d=g(a);return d||(b=b.toLowerCase()),(c=e.attrHandle[b])?c(a):d||$?a.getAttribute(b):(c=a.getAttributeNode(b),c?typeof a[b]=="boolean"?a[b]?b:null:c.specified?c.value:null:null)},e=bc.selectors={cacheLength:50,createPseudo:z,match:W,attrHandle:Z?{}:{href:function(a){return a.getAttribute("href",2)},type:function(a){return a.getAttribute("type")}},find:{ID:d?function(a,b,c){if(typeof b.getElementById!==n&&!c){var d=b.getElementById(a);return d&&d.parentNode?[d]:[]}}:function(a,c,d){if(typeof c.getElementById!==n&&!d){var e=c.getElementById(a);return e?e.id===a||typeof e.getAttributeNode!==n&&e.getAttributeNode("id").value===a?[e]:b:[]}},TAG:Y?function(a,b){if(typeof b.getElementsByTagName!==n)return b.getElementsByTagName(a)}:function(a,b){var c=b.getElementsByTagName(a);if(a==="*"){var d,e=[],f=0;for(;d=c[f];f++)d.nodeType===1&&e.push(d);return e}return c},NAME:ba&&function(a,b){if(typeof b.getElementsByName!==n)return b.getElementsByName(name)},CLASS:_&&function(a,b,c){if(typeof b.getElementsByClassName!==n&&!c)return b.getElementsByClassName(a)}},relative:{">":{dir:"parentNode",first:!0}," ":{dir:"parentNode"},"+":{dir:"previousSibling",first:!0},"~":{dir:"previousSibling"}},preFilter:{ATTR:function(a){return a[1]=a[1].replace(V,""),a[3]=(a[4]||a[5]||"").replace(V,""),a[2]==="~="&&(a[3]=" "+a[3]+" "),a.slice(0,4)},CHILD:function(a){return a[1]=a[1].toLowerCase(),a[1]==="nth"?(a[2]||bc.error(a[0]),a[3]=+(a[3]?a[4]+(a[5]||1):2*(a[2]==="even"||a[2]==="odd")),a[4]=+(a[6]+a[7]||a[2]==="odd")):a[2]&&bc.error(a[0]),a},PSEUDO:function(a){var b,c;if(W.CHILD.test(a[0]))return null;if(a[3])a[2]=a[3];else if(b=a[4])O.test(b)&&(c=bh(b,!0))&&(c=b.indexOf(")",b.length-c)-b.length)&&(b=b.slice(0,c),a[0]=a[0].slice(0,c)),a[2]=b;return a.slice(0,3)}},filter:{ID:d?function(a){return a=a.replace(V,""),function(b){return b.getAttribute("id")===a}}:function(a){return a=a.replace(V,""),function(b){var c=typeof b.getAttributeNode!==n&&b.getAttributeNode("id");return c&&c.value===a}},TAG:function(a){return a==="*"?function(){return!0}:(a=a.replace(V,"").toLowerCase(),function(b){return b.nodeName&&b.nodeName.toLowerCase()===a})},CLASS:function(a){var b=B[o][a];return b||(b=B(a,new RegExp("(^|"+E+")"+a+"("+E+"|$)"))),function(a){return b.test(a.className||typeof a.getAttribute!==n&&a.getAttribute("class")||"")}},ATTR:function(a,b,c){return function(d,e){var f=bc.attr(d,a);return f==null?b==="!=":b?(f+="",b==="="?f===c:b==="!="?f!==c:b==="^="?c&&f.indexOf(c)===0:b==="*="?c&&f.indexOf(c)>-1:b==="$="?c&&f.substr(f.length-c.length)===c:b==="~="?(" "+f+" ").indexOf(c)>-1:b==="|="?f===c||f.substr(0,c.length+1)===c+"-":!1):!0}},CHILD:function(a,b,c,d){return a==="nth"?function(a){var b,e,f=a.parentNode;if(c===1&&d===0)return!0;if(f){e=0;for(b=f.firstChild;b;b=b.nextSibling)if(b.nodeType===1){e++;if(a===b)break}}return e-=d,e===c||e%c===0&&e/c>=0}:function(b){var c=b;switch(a){case"only":case"first":while(c=c.previousSibling)if(c.nodeType===1)return!1;if(a==="first")return!0;c=b;case"last":while(c=c.nextSibling)if(c.nodeType===1)return!1;return!0}}},PSEUDO:function(a,b){var c,d=e.pseudos[a]||e.setFilters[a.toLowerCase()]||bc.error("unsupported pseudo: "+a);return d[o]?d(b):d.length>1?(c=[a,a,"",b],e.setFilters.hasOwnProperty(a.toLowerCase())?z(function(a,c){var e,f=d(a,b),g=f.length;while(g--)e=y.call(a,f[g]),a[e]=!(c[e]=f[g])}):function(a){return d(a,0,c)}):d}},pseudos:{not:z(function(a){var b=[],c=[],d=i(a.replace(L,"$1"));return d[o]?z(function(a,b,c,e){var f,g=d(a,null,e,[]),h=a.length;while(h--)if(f=g[h])a[h]=!(b[h]=f)}):function(a,e,f){return b[0]=a,d(b,null,f,c),!c.pop()}}),has:z(function(a){return function(b){return bc(a,b).length>0}}),contains:z(function(a){return function(b){return(b.textContent||b.innerText||f(b)).indexOf(a)>-1}}),enabled:function(a){return a.disabled===!1},disabled:function(a){return a.disabled===!0},checked:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&!!a.checked||b==="option"&&!!a.selected},selected:function(a){return a.parentNode&&a.parentNode.selectedIndex,a.selected===!0},parent:function(a){return!e.pseudos.empty(a)},empty:function(a){var b;a=a.firstChild;while(a){if(a.nodeName>"@"||(b=a.nodeType)===3||b===4)return!1;a=a.nextSibling}return!0},header:function(a){return T.test(a.nodeName)},text:function(a){var b,c;return a.nodeName.toLowerCase()==="input"&&(b=a.type)==="text"&&((c=a.getAttribute("type"))==null||c.toLowerCase()===b)},radio:bd("radio"),checkbox:bd("checkbox"),file:bd("file"),password:bd("password"),image:bd("image"),submit:be("submit"),reset:be("reset"),button:function(a){var b=a.nodeName.toLowerCase();return b==="input"&&a.type==="button"||b==="button"},input:function(a){return U.test(a.nodeName)},focus:function(a){var b=a.ownerDocument;return a===b.activeElement&&(!b.hasFocus||b.hasFocus())&&(!!a.type||!!a.href)},active:function(a){return a===a.ownerDocument.activeElement},first:bf(function(a,b,c){return[0]}),last:bf(function(a,b,c){return[b-1]}),eq:bf(function(a,b,c){return[c<0?c+b:c]}),even:bf(function(a,b,c){for(var d=0;d<b;d+=2)a.push(d);return a}),odd:bf(function(a,b,c){for(var d=1;d<b;d+=2)a.push(d);return a}),lt:bf(function(a,b,c){for(var d=c<0?c+b:c;--d>=0;)a.push(d);return a}),gt:bf(function(a,b,c){for(var d=c<0?c+b:c;++d<b;)a.push(d);return a})}},j=s.compareDocumentPosition?function(a,b){return a===b?(k=!0,0):(!a.compareDocumentPosition||!b.compareDocumentPosition?a.compareDocumentPosition:a.compareDocumentPosition(b)&4)?-1:1}:function(a,b){if(a===b)return k=!0,0;if(a.sourceIndex&&b.sourceIndex)return a.sourceIndex-b.sourceIndex;var c,d,e=[],f=[],g=a.parentNode,h=b.parentNode,i=g;if(g===h)return bg(a,b);if(!g)return-1;if(!h)return 1;while(i)e.unshift(i),i=i.parentNode;i=h;while(i)f.unshift(i),i=i.parentNode;c=e.length,d=f.length;for(var j=0;j<c&&j<d;j++)if(e[j]!==f[j])return bg(e[j],f[j]);return j===c?bg(a,f[j],-1):bg(e[j],b,1)},[0,0].sort(j),m=!k,bc.uniqueSort=function(a){var b,c=1;k=m,a.sort(j);if(k)for(;b=a[c];c++)b===a[c-1]&&a.splice(c--,1);return a},bc.error=function(a){throw new Error("Syntax error, unrecognized expression: "+a)},i=bc.compile=function(a,b){var c,d=[],e=[],f=D[o][a];if(!f){b||(b=bh(a)),c=b.length;while(c--)f=bm(b[c]),f[o]?d.push(f):e.push(f);f=D(a,bn(e,d))}return f},r.querySelectorAll&&function(){var a,b=bp,c=/'|\\/g,d=/\=[\x20\t\r\n\f]*([^'"\]]*)[\x20\t\r\n\f]*\]/g,e=[":focus"],f=[":active",":focus"],h=s.matchesSelector||s.mozMatchesSelector||s.webkitMatchesSelector||s.oMatchesSelector||s.msMatchesSelector;X(function(a){a.innerHTML="<select><option selected=''></option></select>",a.querySelectorAll("[selected]").length||e.push("\\["+E+"*(?:checked|disabled|ismap|multiple|readonly|selected|value)"),a.querySelectorAll(":checked").length||e.push(":checked")}),X(function(a){a.innerHTML="<p test=''></p>",a.querySelectorAll("[test^='']").length&&e.push("[*^$]="+E+"*(?:\"\"|'')"),a.innerHTML="<input type='hidden'/>",a.querySelectorAll(":enabled").length||e.push(":enabled",":disabled")}),e=new RegExp(e.join("|")),bp=function(a,d,f,g,h){if(!g&&!h&&(!e||!e.test(a))){var i,j,k=!0,l=o,m=d,n=d.nodeType===9&&a;if(d.nodeType===1&&d.nodeName.toLowerCase()!=="object"){i=bh(a),(k=d.getAttribute("id"))?l=k.replace(c,"\\$&"):d.setAttribute("id",l),l="[id='"+l+"'] ",j=i.length;while(j--)i[j]=l+i[j].join("");m=R.test(a)&&d.parentNode||d,n=i.join(",")}if(n)try{return w.apply(f,x.call(m.querySelectorAll(n),0)),f}catch(p){}finally{k||d.removeAttribute("id")}}return b(a,d,f,g,h)},h&&(X(function(b){a=h.call(b,"div");try{h.call(b,"[test!='']:sizzle"),f.push("!=",J)}catch(c){}}),f=new RegExp(f.join("|")),bc.matchesSelector=function(b,c){c=c.replace(d,"='$1']");if(!g(b)&&!f.test(c)&&(!e||!e.test(c)))try{var i=h.call(b,c);if(i||a||b.document&&b.document.nodeType!==11)return i}catch(j){}return bc(c,null,null,[b]).length>0})}(),e.pseudos.nth=e.pseudos.eq,e.filters=bq.prototype=e.pseudos,e.setFilters=new bq,bc.attr=p.attr,p.find=bc,p.expr=bc.selectors,p.expr[":"]=p.expr.pseudos,p.unique=bc.uniqueSort,p.text=bc.getText,p.isXMLDoc=bc.isXML,p.contains=bc.contains}(a);var bc=/Until$/,bd=/^(?:parents|prev(?:Until|All))/,be=/^.[^:#\[\.,]*$/,bf=p.expr.match.needsContext,bg={children:!0,contents:!0,next:!0,prev:!0};p.fn.extend({find:function(a){var b,c,d,e,f,g,h=this;if(typeof a!="string")return p(a).filter(function(){for(b=0,c=h.length;b<c;b++)if(p.contains(h[b],this))return!0});g=this.pushStack("","find",a);for(b=0,c=this.length;b<c;b++){d=g.length,p.find(a,this[b],g);if(b>0)for(e=d;e<g.length;e++)for(f=0;f<d;f++)if(g[f]===g[e]){g.splice(e--,1);break}}return g},has:function(a){var b,c=p(a,this),d=c.length;return this.filter(function(){for(b=0;b<d;b++)if(p.contains(this,c[b]))return!0})},not:function(a){return this.pushStack(bj(this,a,!1),"not",a)},filter:function(a){return this.pushStack(bj(this,a,!0),"filter",a)},is:function(a){return!!a&&(typeof a=="string"?bf.test(a)?p(a,this.context).index(this[0])>=0:p.filter(a,this).length>0:this.filter(a).length>0)},closest:function(a,b){var c,d=0,e=this.length,f=[],g=bf.test(a)||typeof a!="string"?p(a,b||this.context):0;for(;d<e;d++){c=this[d];while(c&&c.ownerDocument&&c!==b&&c.nodeType!==11){if(g?g.index(c)>-1:p.find.matchesSelector(c,a)){f.push(c);break}c=c.parentNode}}return f=f.length>1?p.unique(f):f,this.pushStack(f,"closest",a)},index:function(a){return a?typeof a=="string"?p.inArray(this[0],p(a)):p.inArray(a.jquery?a[0]:a,this):this[0]&&this[0].parentNode?this.prevAll().length:-1},add:function(a,b){var c=typeof a=="string"?p(a,b):p.makeArray(a&&a.nodeType?[a]:a),d=p.merge(this.get(),c);return this.pushStack(bh(c[0])||bh(d[0])?d:p.unique(d))},addBack:function(a){return this.add(a==null?this.prevObject:this.prevObject.filter(a))}}),p.fn.andSelf=p.fn.addBack,p.each({parent:function(a){var b=a.parentNode;return b&&b.nodeType!==11?b:null},parents:function(a){return p.dir(a,"parentNode")},parentsUntil:function(a,b,c){return p.dir(a,"parentNode",c)},next:function(a){return bi(a,"nextSibling")},prev:function(a){return bi(a,"previousSibling")},nextAll:function(a){return p.dir(a,"nextSibling")},prevAll:function(a){return p.dir(a,"previousSibling")},nextUntil:function(a,b,c){return p.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return p.dir(a,"previousSibling",c)},siblings:function(a){return p.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return p.sibling(a.firstChild)},contents:function(a){return p.nodeName(a,"iframe")?a.contentDocument||a.contentWindow.document:p.merge([],a.childNodes)}},function(a,b){p.fn[a]=function(c,d){var e=p.map(this,b,c);return bc.test(a)||(d=c),d&&typeof d=="string"&&(e=p.filter(d,e)),e=this.length>1&&!bg[a]?p.unique(e):e,this.length>1&&bd.test(a)&&(e=e.reverse()),this.pushStack(e,a,k.call(arguments).join(","))}}),p.extend({filter:function(a,b,c){return c&&(a=":not("+a+")"),b.length===1?p.find.matchesSelector(b[0],a)?[b[0]]:[]:p.find.matches(a,b)},dir:function(a,c,d){var e=[],f=a[c];while(f&&f.nodeType!==9&&(d===b||f.nodeType!==1||!p(f).is(d)))f.nodeType===1&&e.push(f),f=f[c];return e},sibling:function(a,b){var c=[];for(;a;a=a.nextSibling)a.nodeType===1&&a!==b&&c.push(a);return c}});var bl="abbr|article|aside|audio|bdi|canvas|data|datalist|details|figcaption|figure|footer|header|hgroup|mark|meter|nav|output|progress|section|summary|time|video",bm=/ jQuery\d+="(?:null|\d+)"/g,bn=/^\s+/,bo=/<(?!area|br|col|embed|hr|img|input|link|meta|param)(([\w:]+)[^>]*)\/>/gi,bp=/<([\w:]+)/,bq=/<tbody/i,br=/<|&#?\w+;/,bs=/<(?:script|style|link)/i,bt=/<(?:script|object|embed|option|style)/i,bu=new RegExp("<(?:"+bl+")[\\s/>]","i"),bv=/^(?:checkbox|radio)$/,bw=/checked\s*(?:[^=]|=\s*.checked.)/i,bx=/\/(java|ecma)script/i,by=/^\s*<!(?:\[CDATA\[|\-\-)|[\]\-]{2}>\s*$/g,bz={option:[1,"<select multiple='multiple'>","</select>"],legend:[1,"<fieldset>","</fieldset>"],thead:[1,"<table>","</table>"],tr:[2,"<table><tbody>","</tbody></table>"],td:[3,"<table><tbody><tr>","</tr></tbody></table>"],col:[2,"<table><tbody></tbody><colgroup>","</colgroup></table>"],area:[1,"<map>","</map>"],_default:[0,"",""]},bA=bk(e),bB=bA.appendChild(e.createElement("div"));bz.optgroup=bz.option,bz.tbody=bz.tfoot=bz.colgroup=bz.caption=bz.thead,bz.th=bz.td,p.support.htmlSerialize||(bz._default=[1,"X<div>","</div>"]),p.fn.extend({text:function(a){return p.access(this,function(a){return a===b?p.text(this):this.empty().append((this[0]&&this[0].ownerDocument||e).createTextNode(a))},null,a,arguments.length)},wrapAll:function(a){if(p.isFunction(a))return this.each(function(b){p(this).wrapAll(a.call(this,b))});if(this[0]){var b=p(a,this[0].ownerDocument).eq(0).clone(!0);this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){var a=this;while(a.firstChild&&a.firstChild.nodeType===1)a=a.firstChild;return a}).append(this)}return this},wrapInner:function(a){return p.isFunction(a)?this.each(function(b){p(this).wrapInner(a.call(this,b))}):this.each(function(){var b=p(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=p.isFunction(a);return this.each(function(c){p(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){p.nodeName(this,"body")||p(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.appendChild(a)})},prepend:function(){return this.domManip(arguments,!0,function(a){(this.nodeType===1||this.nodeType===11)&&this.insertBefore(a,this.firstChild)})},before:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(a,this),"before",this.selector)}},after:function(){if(!bh(this[0]))return this.domManip(arguments,!1,function(a){this.parentNode.insertBefore(a,this.nextSibling)});if(arguments.length){var a=p.clean(arguments);return this.pushStack(p.merge(this,a),"after",this.selector)}},remove:function(a,b){var c,d=0;for(;(c=this[d])!=null;d++)if(!a||p.filter(a,[c]).length)!b&&c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),p.cleanData([c])),c.parentNode&&c.parentNode.removeChild(c);return this},empty:function(){var a,b=0;for(;(a=this[b])!=null;b++){a.nodeType===1&&p.cleanData(a.getElementsByTagName("*"));while(a.firstChild)a.removeChild(a.firstChild)}return this},clone:function(a,b){return a=a==null?!1:a,b=b==null?a:b,this.map(function(){return p.clone(this,a,b)})},html:function(a){return p.access(this,function(a){var c=this[0]||{},d=0,e=this.length;if(a===b)return c.nodeType===1?c.innerHTML.replace(bm,""):b;if(typeof a=="string"&&!bs.test(a)&&(p.support.htmlSerialize||!bu.test(a))&&(p.support.leadingWhitespace||!bn.test(a))&&!bz[(bp.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(bo,"<$1></$2>");try{for(;d<e;d++)c=this[d]||{},c.nodeType===1&&(p.cleanData(c.getElementsByTagName("*")),c.innerHTML=a);c=0}catch(f){}}c&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(a){return bh(this[0])?this.length?this.pushStack(p(p.isFunction(a)?a():a),"replaceWith",a):this:p.isFunction(a)?this.each(function(b){var c=p(this),d=c.html();c.replaceWith(a.call(this,b,d))}):(typeof a!="string"&&(a=p(a).detach()),this.each(function(){var b=this.nextSibling,c=this.parentNode;p(this).remove(),b?p(b).before(a):p(c).append(a)}))},detach:function(a){return this.remove(a,!0)},domManip:function(a,c,d){a=[].concat.apply([],a);var e,f,g,h,i=0,j=a[0],k=[],l=this.length;if(!p.support.checkClone&&l>1&&typeof j=="string"&&bw.test(j))return this.each(function(){p(this).domManip(a,c,d)});if(p.isFunction(j))return this.each(function(e){var f=p(this);a[0]=j.call(this,e,c?f.html():b),f.domManip(a,c,d)});if(this[0]){e=p.buildFragment(a,this,k),g=e.fragment,f=g.firstChild,g.childNodes.length===1&&(g=f);if(f){c=c&&p.nodeName(f,"tr");for(h=e.cacheable||l-1;i<l;i++)d.call(c&&p.nodeName(this[i],"table")?bC(this[i],"tbody"):this[i],i===h?g:p.clone(g,!0,!0))}g=f=null,k.length&&p.each(k,function(a,b){b.src?p.ajax?p.ajax({url:b.src,type:"GET",dataType:"script",async:!1,global:!1,"throws":!0}):p.error("no ajax"):p.globalEval((b.text||b.textContent||b.innerHTML||"").replace(by,"")),b.parentNode&&b.parentNode.removeChild(b)})}return this}}),p.buildFragment=function(a,c,d){var f,g,h,i=a[0];return c=c||e,c=!c.nodeType&&c[0]||c,c=c.ownerDocument||c,a.length===1&&typeof i=="string"&&i.length<512&&c===e&&i.charAt(0)==="<"&&!bt.test(i)&&(p.support.checkClone||!bw.test(i))&&(p.support.html5Clone||!bu.test(i))&&(g=!0,f=p.fragments[i],h=f!==b),f||(f=c.createDocumentFragment(),p.clean(a,c,f,d),g&&(p.fragments[i]=h&&f)),{fragment:f,cacheable:g}},p.fragments={},p.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){p.fn[a]=function(c){var d,e=0,f=[],g=p(c),h=g.length,i=this.length===1&&this[0].parentNode;if((i==null||i&&i.nodeType===11&&i.childNodes.length===1)&&h===1)return g[b](this[0]),this;for(;e<h;e++)d=(e>0?this.clone(!0):this).get(),p(g[e])[b](d),f=f.concat(d);return this.pushStack(f,a,g.selector)}}),p.extend({clone:function(a,b,c){var d,e,f,g;p.support.html5Clone||p.isXMLDoc(a)||!bu.test("<"+a.nodeName+">")?g=a.cloneNode(!0):(bB.innerHTML=a.outerHTML,bB.removeChild(g=bB.firstChild));if((!p.support.noCloneEvent||!p.support.noCloneChecked)&&(a.nodeType===1||a.nodeType===11)&&!p.isXMLDoc(a)){bE(a,g),d=bF(a),e=bF(g);for(f=0;d[f];++f)e[f]&&bE(d[f],e[f])}if(b){bD(a,g);if(c){d=bF(a),e=bF(g);for(f=0;d[f];++f)bD(d[f],e[f])}}return d=e=null,g},clean:function(a,b,c,d){var f,g,h,i,j,k,l,m,n,o,q,r,s=b===e&&bA,t=[];if(!b||typeof b.createDocumentFragment=="undefined")b=e;for(f=0;(h=a[f])!=null;f++){typeof h=="number"&&(h+="");if(!h)continue;if(typeof h=="string")if(!br.test(h))h=b.createTextNode(h);else{s=s||bk(b),l=b.createElement("div"),s.appendChild(l),h=h.replace(bo,"<$1></$2>"),i=(bp.exec(h)||["",""])[1].toLowerCase(),j=bz[i]||bz._default,k=j[0],l.innerHTML=j[1]+h+j[2];while(k--)l=l.lastChild;if(!p.support.tbody){m=bq.test(h),n=i==="table"&&!m?l.firstChild&&l.firstChild.childNodes:j[1]==="<table>"&&!m?l.childNodes:[];for(g=n.length-1;g>=0;--g)p.nodeName(n[g],"tbody")&&!n[g].childNodes.length&&n[g].parentNode.removeChild(n[g])}!p.support.leadingWhitespace&&bn.test(h)&&l.insertBefore(b.createTextNode(bn.exec(h)[0]),l.firstChild),h=l.childNodes,l.parentNode.removeChild(l)}h.nodeType?t.push(h):p.merge(t,h)}l&&(h=l=s=null);if(!p.support.appendChecked)for(f=0;(h=t[f])!=null;f++)p.nodeName(h,"input")?bG(h):typeof h.getElementsByTagName!="undefined"&&p.grep(h.getElementsByTagName("input"),bG);if(c){q=function(a){if(!a.type||bx.test(a.type))return d?d.push(a.parentNode?a.parentNode.removeChild(a):a):c.appendChild(a)};for(f=0;(h=t[f])!=null;f++)if(!p.nodeName(h,"script")||!q(h))c.appendChild(h),typeof h.getElementsByTagName!="undefined"&&(r=p.grep(p.merge([],h.getElementsByTagName("script")),q),t.splice.apply(t,[f+1,0].concat(r)),f+=r.length)}return t},cleanData:function(a,b){var c,d,e,f,g=0,h=p.expando,i=p.cache,j=p.support.deleteExpando,k=p.event.special;for(;(e=a[g])!=null;g++)if(b||p.acceptData(e)){d=e[h],c=d&&i[d];if(c){if(c.events)for(f in c.events)k[f]?p.event.remove(e,f):p.removeEvent(e,f,c.handle);i[d]&&(delete i[d],j?delete e[h]:e.removeAttribute?e.removeAttribute(h):e[h]=null,p.deletedIds.push(d))}}}}),function(){var a,b;p.uaMatch=function(a){a=a.toLowerCase();var b=/(chrome)[ \/]([\w.]+)/.exec(a)||/(webkit)[ \/]([\w.]+)/.exec(a)||/(opera)(?:.*version|)[ \/]([\w.]+)/.exec(a)||/(msie) ([\w.]+)/.exec(a)||a.indexOf("compatible")<0&&/(mozilla)(?:.*? rv:([\w.]+)|)/.exec(a)||[];return{browser:b[1]||"",version:b[2]||"0"}},a=p.uaMatch(g.userAgent),b={},a.browser&&(b[a.browser]=!0,b.version=a.version),b.chrome?b.webkit=!0:b.webkit&&(b.safari=!0),p.browser=b,p.sub=function(){function a(b,c){return new a.fn.init(b,c)}p.extend(!0,a,this),a.superclass=this,a.fn=a.prototype=this(),a.fn.constructor=a,a.sub=this.sub,a.fn.init=function c(c,d){return d&&d instanceof p&&!(d instanceof a)&&(d=a(d)),p.fn.init.call(this,c,d,b)},a.fn.init.prototype=a.fn;var b=a(e);return a}}();var bH,bI,bJ,bK=/alpha\([^)]*\)/i,bL=/opacity=([^)]*)/,bM=/^(top|right|bottom|left)$/,bN=/^(none|table(?!-c[ea]).+)/,bO=/^margin/,bP=new RegExp("^("+q+")(.*)$","i"),bQ=new RegExp("^("+q+")(?!px)[a-z%]+$","i"),bR=new RegExp("^([-+])=("+q+")","i"),bS={},bT={position:"absolute",visibility:"hidden",display:"block"},bU={letterSpacing:0,fontWeight:400},bV=["Top","Right","Bottom","Left"],bW=["Webkit","O","Moz","ms"],bX=p.fn.toggle;p.fn.extend({css:function(a,c){return p.access(this,function(a,c,d){return d!==b?p.style(a,c,d):p.css(a,c)},a,c,arguments.length>1)},show:function(){return b$(this,!0)},hide:function(){return b$(this)},toggle:function(a,b){var c=typeof a=="boolean";return p.isFunction(a)&&p.isFunction(b)?bX.apply(this,arguments):this.each(function(){(c?a:bZ(this))?p(this).show():p(this).hide()})}}),p.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=bH(a,"opacity");return c===""?"1":c}}}},cssNumber:{fillOpacity:!0,fontWeight:!0,lineHeight:!0,opacity:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{"float":p.support.cssFloat?"cssFloat":"styleFloat"},style:function(a,c,d,e){if(!a||a.nodeType===3||a.nodeType===8||!a.style)return;var f,g,h,i=p.camelCase(c),j=a.style;c=p.cssProps[i]||(p.cssProps[i]=bY(j,i)),h=p.cssHooks[c]||p.cssHooks[i];if(d===b)return h&&"get"in h&&(f=h.get(a,!1,e))!==b?f:j[c];g=typeof d,g==="string"&&(f=bR.exec(d))&&(d=(f[1]+1)*f[2]+parseFloat(p.css(a,c)),g="number");if(d==null||g==="number"&&isNaN(d))return;g==="number"&&!p.cssNumber[i]&&(d+="px");if(!h||!("set"in h)||(d=h.set(a,d,e))!==b)try{j[c]=d}catch(k){}},css:function(a,c,d,e){var f,g,h,i=p.camelCase(c);return c=p.cssProps[i]||(p.cssProps[i]=bY(a.style,i)),h=p.cssHooks[c]||p.cssHooks[i],h&&"get"in h&&(f=h.get(a,!0,e)),f===b&&(f=bH(a,c)),f==="normal"&&c in bU&&(f=bU[c]),d||e!==b?(g=parseFloat(f),d||p.isNumeric(g)?g||0:f):f},swap:function(a,b,c){var d,e,f={};for(e in b)f[e]=a.style[e],a.style[e]=b[e];d=c.call(a);for(e in b)a.style[e]=f[e];return d}}),a.getComputedStyle?bH=function(b,c){var d,e,f,g,h=a.getComputedStyle(b,null),i=b.style;return h&&(d=h[c],d===""&&!p.contains(b.ownerDocument,b)&&(d=p.style(b,c)),bQ.test(d)&&bO.test(c)&&(e=i.width,f=i.minWidth,g=i.maxWidth,i.minWidth=i.maxWidth=i.width=d,d=h.width,i.width=e,i.minWidth=f,i.maxWidth=g)),d}:e.documentElement.currentStyle&&(bH=function(a,b){var c,d,e=a.currentStyle&&a.currentStyle[b],f=a.style;return e==null&&f&&f[b]&&(e=f[b]),bQ.test(e)&&!bM.test(b)&&(c=f.left,d=a.runtimeStyle&&a.runtimeStyle.left,d&&(a.runtimeStyle.left=a.currentStyle.left),f.left=b==="fontSize"?"1em":e,e=f.pixelLeft+"px",f.left=c,d&&(a.runtimeStyle.left=d)),e===""?"auto":e}),p.each(["height","width"],function(a,b){p.cssHooks[b]={get:function(a,c,d){if(c)return a.offsetWidth===0&&bN.test(bH(a,"display"))?p.swap(a,bT,function(){return cb(a,b,d)}):cb(a,b,d)},set:function(a,c,d){return b_(a,c,d?ca(a,b,d,p.support.boxSizing&&p.css(a,"boxSizing")==="border-box"):0)}}}),p.support.opacity||(p.cssHooks.opacity={get:function(a,b){return bL.test((b&&a.currentStyle?a.currentStyle.filter:a.style.filter)||"")?.01*parseFloat(RegExp.$1)+"":b?"1":""},set:function(a,b){var c=a.style,d=a.currentStyle,e=p.isNumeric(b)?"alpha(opacity="+b*100+")":"",f=d&&d.filter||c.filter||"";c.zoom=1;if(b>=1&&p.trim(f.replace(bK,""))===""&&c.removeAttribute){c.removeAttribute("filter");if(d&&!d.filter)return}c.filter=bK.test(f)?f.replace(bK,e):f+" "+e}}),p(function(){p.support.reliableMarginRight||(p.cssHooks.marginRight={get:function(a,b){return p.swap(a,{display:"inline-block"},function(){if(b)return bH(a,"marginRight")})}}),!p.support.pixelPosition&&p.fn.position&&p.each(["top","left"],function(a,b){p.cssHooks[b]={get:function(a,c){if(c){var d=bH(a,b);return bQ.test(d)?p(a).position()[b]+"px":d}}}})}),p.expr&&p.expr.filters&&(p.expr.filters.hidden=function(a){return a.offsetWidth===0&&a.offsetHeight===0||!p.support.reliableHiddenOffsets&&(a.style&&a.style.display||bH(a,"display"))==="none"},p.expr.filters.visible=function(a){return!p.expr.filters.hidden(a)}),p.each({margin:"",padding:"",border:"Width"},function(a,b){p.cssHooks[a+b]={expand:function(c){var d,e=typeof c=="string"?c.split(" "):[c],f={};for(d=0;d<4;d++)f[a+bV[d]+b]=e[d]||e[d-2]||e[0];return f}},bO.test(a)||(p.cssHooks[a+b].set=b_)});var cd=/%20/g,ce=/\[\]$/,cf=/\r?\n/g,cg=/^(?:color|date|datetime|datetime-local|email|hidden|month|number|password|range|search|tel|text|time|url|week)$/i,ch=/^(?:select|textarea)/i;p.fn.extend({serialize:function(){return p.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?p.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ch.test(this.nodeName)||cg.test(this.type))}).map(function(a,b){var c=p(this).val();return c==null?null:p.isArray(c)?p.map(c,function(a,c){return{name:b.name,value:a.replace(cf,"\r\n")}}):{name:b.name,value:c.replace(cf,"\r\n")}}).get()}}),p.param=function(a,c){var d,e=[],f=function(a,b){b=p.isFunction(b)?b():b==null?"":b,e[e.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};c===b&&(c=p.ajaxSettings&&p.ajaxSettings.traditional);if(p.isArray(a)||a.jquery&&!p.isPlainObject(a))p.each(a,function(){f(this.name,this.value)});else for(d in a)ci(d,a[d],c,f);return e.join("&").replace(cd,"+")};var cj,ck,cl=/#.*$/,cm=/^(.*?):[ \t]*([^\r\n]*)\r?$/mg,cn=/^(?:about|app|app\-storage|.+\-extension|file|res|widget):$/,co=/^(?:GET|HEAD)$/,cp=/^\/\//,cq=/\?/,cr=/<script\b[^<]*(?:(?!<\/script>)<[^<]*)*<\/script>/gi,cs=/([?&])_=[^&]*/,ct=/^([\w\+\.\-]+:)(?:\/\/([^\/?#:]*)(?::(\d+)|)|)/,cu=p.fn.load,cv={},cw={},cx=["*/"]+["*"];try{ck=f.href}catch(cy){ck=e.createElement("a"),ck.href="",ck=ck.href}cj=ct.exec(ck.toLowerCase())||[],p.fn.load=function(a,c,d){if(typeof a!="string"&&cu)return cu.apply(this,arguments);if(!this.length)return this;var e,f,g,h=this,i=a.indexOf(" ");return i>=0&&(e=a.slice(i,a.length),a=a.slice(0,i)),p.isFunction(c)?(d=c,c=b):c&&typeof c=="object"&&(f="POST"),p.ajax({url:a,type:f,dataType:"html",data:c,complete:function(a,b){d&&h.each(d,g||[a.responseText,b,a])}}).done(function(a){g=arguments,h.html(e?p("<div>").append(a.replace(cr,"")).find(e):a)}),this},p.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "),function(a,b){p.fn[b]=function(a){return this.on(b,a)}}),p.each(["get","post"],function(a,c){p[c]=function(a,d,e,f){return p.isFunction(d)&&(f=f||e,e=d,d=b),p.ajax({type:c,url:a,data:d,success:e,dataType:f})}}),p.extend({getScript:function(a,c){return p.get(a,b,c,"script")},getJSON:function(a,b,c){return p.get(a,b,c,"json")},ajaxSetup:function(a,b){return b?cB(a,p.ajaxSettings):(b=a,a=p.ajaxSettings),cB(a,b),a},ajaxSettings:{url:ck,isLocal:cn.test(cj[1]),global:!0,type:"GET",contentType:"application/x-www-form-urlencoded; charset=UTF-8",processData:!0,async:!0,accepts:{xml:"application/xml, text/xml",html:"text/html",text:"text/plain",json:"application/json, text/javascript","*":cx},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText"},converters:{"* text":a.String,"text html":!0,"text json":p.parseJSON,"text xml":p.parseXML},flatOptions:{context:!0,url:!0}},ajaxPrefilter:cz(cv),ajaxTransport:cz(cw),ajax:function(a,c){function y(a,c,f,i){var k,s,t,u,w,y=c;if(v===2)return;v=2,h&&clearTimeout(h),g=b,e=i||"",x.readyState=a>0?4:0,f&&(u=cC(l,x,f));if(a>=200&&a<300||a===304)l.ifModified&&(w=x.getResponseHeader("Last-Modified"),w&&(p.lastModified[d]=w),w=x.getResponseHeader("Etag"),w&&(p.etag[d]=w)),a===304?(y="notmodified",k=!0):(k=cD(l,u),y=k.state,s=k.data,t=k.error,k=!t);else{t=y;if(!y||a)y="error",a<0&&(a=0)}x.status=a,x.statusText=(c||y)+"",k?o.resolveWith(m,[s,y,x]):o.rejectWith(m,[x,y,t]),x.statusCode(r),r=b,j&&n.trigger("ajax"+(k?"Success":"Error"),[x,l,k?s:t]),q.fireWith(m,[x,y]),j&&(n.trigger("ajaxComplete",[x,l]),--p.active||p.event.trigger("ajaxStop"))}typeof a=="object"&&(c=a,a=b),c=c||{};var d,e,f,g,h,i,j,k,l=p.ajaxSetup({},c),m=l.context||l,n=m!==l&&(m.nodeType||m instanceof p)?p(m):p.event,o=p.Deferred(),q=p.Callbacks("once memory"),r=l.statusCode||{},t={},u={},v=0,w="canceled",x={readyState:0,setRequestHeader:function(a,b){if(!v){var c=a.toLowerCase();a=u[c]=u[c]||a,t[a]=b}return this},getAllResponseHeaders:function(){return v===2?e:null},getResponseHeader:function(a){var c;if(v===2){if(!f){f={};while(c=cm.exec(e))f[c[1].toLowerCase()]=c[2]}c=f[a.toLowerCase()]}return c===b?null:c},overrideMimeType:function(a){return v||(l.mimeType=a),this},abort:function(a){return a=a||w,g&&g.abort(a),y(0,a),this}};o.promise(x),x.success=x.done,x.error=x.fail,x.complete=q.add,x.statusCode=function(a){if(a){var b;if(v<2)for(b in a)r[b]=[r[b],a[b]];else b=a[x.status],x.always(b)}return this},l.url=((a||l.url)+"").replace(cl,"").replace(cp,cj[1]+"//"),l.dataTypes=p.trim(l.dataType||"*").toLowerCase().split(s),l.crossDomain==null&&(i=ct.exec(l.url.toLowerCase())||!1,l.crossDomain=i&&i.join(":")+(i[3]?"":i[1]==="http:"?80:443)!==cj.join(":")+(cj[3]?"":cj[1]==="http:"?80:443)),l.data&&l.processData&&typeof l.data!="string"&&(l.data=p.param(l.data,l.traditional)),cA(cv,l,c,x);if(v===2)return x;j=l.global,l.type=l.type.toUpperCase(),l.hasContent=!co.test(l.type),j&&p.active++===0&&p.event.trigger("ajaxStart");if(!l.hasContent){l.data&&(l.url+=(cq.test(l.url)?"&":"?")+l.data,delete l.data),d=l.url;if(l.cache===!1){var z=p.now(),A=l.url.replace(cs,"$1_="+z);l.url=A+(A===l.url?(cq.test(l.url)?"&":"?")+"_="+z:"")}}(l.data&&l.hasContent&&l.contentType!==!1||c.contentType)&&x.setRequestHeader("Content-Type",l.contentType),l.ifModified&&(d=d||l.url,p.lastModified[d]&&x.setRequestHeader("If-Modified-Since",p.lastModified[d]),p.etag[d]&&x.setRequestHeader("If-None-Match",p.etag[d])),x.setRequestHeader("Accept",l.dataTypes[0]&&l.accepts[l.dataTypes[0]]?l.accepts[l.dataTypes[0]]+(l.dataTypes[0]!=="*"?", "+cx+"; q=0.01":""):l.accepts["*"]);for(k in l.headers)x.setRequestHeader(k,l.headers[k]);if(!l.beforeSend||l.beforeSend.call(m,x,l)!==!1&&v!==2){w="abort";for(k in{success:1,error:1,complete:1})x[k](l[k]);g=cA(cw,l,c,x);if(!g)y(-1,"No Transport");else{x.readyState=1,j&&n.trigger("ajaxSend",[x,l]),l.async&&l.timeout>0&&(h=setTimeout(function(){x.abort("timeout")},l.timeout));try{v=1,g.send(t,y)}catch(B){if(v<2)y(-1,B);else throw B}}return x}return x.abort()},active:0,lastModified:{},etag:{}});var cE=[],cF=/\?/,cG=/(=)\?(?=&|$)|\?\?/,cH=p.now();p.ajaxSetup({jsonp:"callback",jsonpCallback:function(){var a=cE.pop()||p.expando+"_"+cH++;return this[a]=!0,a}}),p.ajaxPrefilter("json jsonp",function(c,d,e){var f,g,h,i=c.data,j=c.url,k=c.jsonp!==!1,l=k&&cG.test(j),m=k&&!l&&typeof i=="string"&&!(c.contentType||"").indexOf("application/x-www-form-urlencoded")&&cG.test(i);if(c.dataTypes[0]==="jsonp"||l||m)return f=c.jsonpCallback=p.isFunction(c.jsonpCallback)?c.jsonpCallback():c.jsonpCallback,g=a[f],l?c.url=j.replace(cG,"$1"+f):m?c.data=i.replace(cG,"$1"+f):k&&(c.url+=(cF.test(j)?"&":"?")+c.jsonp+"="+f),c.converters["script json"]=function(){return h||p.error(f+" was not called"),h[0]},c.dataTypes[0]="json",a[f]=function(){h=arguments},e.always(function(){a[f]=g,c[f]&&(c.jsonpCallback=d.jsonpCallback,cE.push(f)),h&&p.isFunction(g)&&g(h[0]),h=g=b}),"script"}),p.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/javascript|ecmascript/},converters:{"text script":function(a){return p.globalEval(a),a}}}),p.ajaxPrefilter("script",function(a){a.cache===b&&(a.cache=!1),a.crossDomain&&(a.type="GET",a.global=!1)}),p.ajaxTransport("script",function(a){if(a.crossDomain){var c,d=e.head||e.getElementsByTagName("head")[0]||e.documentElement;return{send:function(f,g){c=e.createElement("script"),c.async="async",a.scriptCharset&&(c.charset=a.scriptCharset),c.src=a.url,c.onload=c.onreadystatechange=function(a,e){if(e||!c.readyState||/loaded|complete/.test(c.readyState))c.onload=c.onreadystatechange=null,d&&c.parentNode&&d.removeChild(c),c=b,e||g(200,"success")},d.insertBefore(c,d.firstChild)},abort:function(){c&&c.onload(0,1)}}}});var cI,cJ=a.ActiveXObject?function(){for(var a in cI)cI[a](0,1)}:!1,cK=0;p.ajaxSettings.xhr=a.ActiveXObject?function(){return!this.isLocal&&cL()||cM()}:cL,function(a){p.extend(p.support,{ajax:!!a,cors:!!a&&"withCredentials"in a})}(p.ajaxSettings.xhr()),p.support.ajax&&p.ajaxTransport(function(c){if(!c.crossDomain||p.support.cors){var d;return{send:function(e,f){var g,h,i=c.xhr();c.username?i.open(c.type,c.url,c.async,c.username,c.password):i.open(c.type,c.url,c.async);if(c.xhrFields)for(h in c.xhrFields)i[h]=c.xhrFields[h];c.mimeType&&i.overrideMimeType&&i.overrideMimeType(c.mimeType),!c.crossDomain&&!e["X-Requested-With"]&&(e["X-Requested-With"]="XMLHttpRequest");try{for(h in e)i.setRequestHeader(h,e[h])}catch(j){}i.send(c.hasContent&&c.data||null),d=function(a,e){var h,j,k,l,m;try{if(d&&(e||i.readyState===4)){d=b,g&&(i.onreadystatechange=p.noop,cJ&&delete cI[g]);if(e)i.readyState!==4&&i.abort();else{h=i.status,k=i.getAllResponseHeaders(),l={},m=i.responseXML,m&&m.documentElement&&(l.xml=m);try{l.text=i.responseText}catch(a){}try{j=i.statusText}catch(n){j=""}!h&&c.isLocal&&!c.crossDomain?h=l.text?200:404:h===1223&&(h=204)}}}catch(o){e||f(-1,o)}l&&f(h,j,l,k)},c.async?i.readyState===4?setTimeout(d,0):(g=++cK,cJ&&(cI||(cI={},p(a).unload(cJ)),cI[g]=d),i.onreadystatechange=d):d()},abort:function(){d&&d(0,1)}}}});var cN,cO,cP=/^(?:toggle|show|hide)$/,cQ=new RegExp("^(?:([-+])=|)("+q+")([a-z%]*)$","i"),cR=/queueHooks$/,cS=[cY],cT={"*":[function(a,b){var c,d,e=this.createTween(a,b),f=cQ.exec(b),g=e.cur(),h=+g||0,i=1,j=20;if(f){c=+f[2],d=f[3]||(p.cssNumber[a]?"":"px");if(d!=="px"&&h){h=p.css(e.elem,a,!0)||c||1;do i=i||".5",h=h/i,p.style(e.elem,a,h+d);while(i!==(i=e.cur()/g)&&i!==1&&--j)}e.unit=d,e.start=h,e.end=f[1]?h+(f[1]+1)*c:c}return e}]};p.Animation=p.extend(cW,{tweener:function(a,b){p.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");var c,d=0,e=a.length;for(;d<e;d++)c=a[d],cT[c]=cT[c]||[],cT[c].unshift(b)},prefilter:function(a,b){b?cS.unshift(a):cS.push(a)}}),p.Tween=cZ,cZ.prototype={constructor:cZ,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(p.cssNumber[c]?"":"px")},cur:function(){var a=cZ.propHooks[this.prop];return a&&a.get?a.get(this):cZ.propHooks._default.get(this)},run:function(a){var b,c=cZ.propHooks[this.prop];return this.options.duration?this.pos=b=p.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):this.pos=b=a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):cZ.propHooks._default.set(this),this}},cZ.prototype.init.prototype=cZ.prototype,cZ.propHooks={_default:{get:function(a){var b;return a.elem[a.prop]==null||!!a.elem.style&&a.elem.style[a.prop]!=null?(b=p.css(a.elem,a.prop,!1,""),!b||b==="auto"?0:b):a.elem[a.prop]},set:function(a){p.fx.step[a.prop]?p.fx.step[a.prop](a):a.elem.style&&(a.elem.style[p.cssProps[a.prop]]!=null||p.cssHooks[a.prop])?p.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},cZ.propHooks.scrollTop=cZ.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},p.each(["toggle","show","hide"],function(a,b){var c=p.fn[b];p.fn[b]=function(d,e,f){return d==null||typeof d=="boolean"||!a&&p.isFunction(d)&&p.isFunction(e)?c.apply(this,arguments):this.animate(c$(b,!0),d,e,f)}}),p.fn.extend({fadeTo:function(a,b,c,d){return this.filter(bZ).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=p.isEmptyObject(a),f=p.speed(b,c,d),g=function(){var b=cW(this,p.extend({},a),f);e&&b.stop(!0)};return e||f.queue===!1?this.each(g):this.queue(f.queue,g)},stop:function(a,c,d){var e=function(a){var b=a.stop;delete a.stop,b(d)};return typeof a!="string"&&(d=c,c=a,a=b),c&&a!==!1&&this.queue(a||"fx",[]),this.each(function(){var b=!0,c=a!=null&&a+"queueHooks",f=p.timers,g=p._data(this);if(c)g[c]&&g[c].stop&&e(g[c]);else for(c in g)g[c]&&g[c].stop&&cR.test(c)&&e(g[c]);for(c=f.length;c--;)f[c].elem===this&&(a==null||f[c].queue===a)&&(f[c].anim.stop(d),b=!1,f.splice(c,1));(b||!d)&&p.dequeue(this,a)})}}),p.each({slideDown:c$("show"),slideUp:c$("hide"),slideToggle:c$("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){p.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),p.speed=function(a,b,c){var d=a&&typeof a=="object"?p.extend({},a):{complete:c||!c&&b||p.isFunction(a)&&a,duration:a,easing:c&&b||b&&!p.isFunction(b)&&b};d.duration=p.fx.off?0:typeof d.duration=="number"?d.duration:d.duration in p.fx.speeds?p.fx.speeds[d.duration]:p.fx.speeds._default;if(d.queue==null||d.queue===!0)d.queue="fx";return d.old=d.complete,d.complete=function(){p.isFunction(d.old)&&d.old.call(this),d.queue&&p.dequeue(this,d.queue)},d},p.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},p.timers=[],p.fx=cZ.prototype.init,p.fx.tick=function(){var a,b=p.timers,c=0;for(;c<b.length;c++)a=b[c],!a()&&b[c]===a&&b.splice(c--,1);b.length||p.fx.stop()},p.fx.timer=function(a){a()&&p.timers.push(a)&&!cO&&(cO=setInterval(p.fx.tick,p.fx.interval))},p.fx.interval=13,p.fx.stop=function(){clearInterval(cO),cO=null},p.fx.speeds={slow:600,fast:200,_default:400},p.fx.step={},p.expr&&p.expr.filters&&(p.expr.filters.animated=function(a){return p.grep(p.timers,function(b){return a===b.elem}).length});var c_=/^(?:body|html)$/i;p.fn.offset=function(a){if(arguments.length)return a===b?this:this.each(function(b){p.offset.setOffset(this,a,b)});var c,d,e,f,g,h,i,j={top:0,left:0},k=this[0],l=k&&k.ownerDocument;if(!l)return;return(d=l.body)===k?p.offset.bodyOffset(k):(c=l.documentElement,p.contains(c,k)?(typeof k.getBoundingClientRect!="undefined"&&(j=k.getBoundingClientRect()),e=da(l),f=c.clientTop||d.clientTop||0,g=c.clientLeft||d.clientLeft||0,h=e.pageYOffset||c.scrollTop,i=e.pageXOffset||c.scrollLeft,{top:j.top+h-f,left:j.left+i-g}):j)},p.offset={bodyOffset:function(a){var b=a.offsetTop,c=a.offsetLeft;return p.support.doesNotIncludeMarginInBodyOffset&&(b+=parseFloat(p.css(a,"marginTop"))||0,c+=parseFloat(p.css(a,"marginLeft"))||0),{top:b,left:c}},setOffset:function(a,b,c){var d=p.css(a,"position");d==="static"&&(a.style.position="relative");var e=p(a),f=e.offset(),g=p.css(a,"top"),h=p.css(a,"left"),i=(d==="absolute"||d==="fixed")&&p.inArray("auto",[g,h])>-1,j={},k={},l,m;i?(k=e.position(),l=k.top,m=k.left):(l=parseFloat(g)||0,m=parseFloat(h)||0),p.isFunction(b)&&(b=b.call(a,c,f)),b.top!=null&&(j.top=b.top-f.top+l),b.left!=null&&(j.left=b.left-f.left+m),"using"in b?b.using.call(a,j):e.css(j)}},p.fn.extend({position:function(){if(!this[0])return;var a=this[0],b=this.offsetParent(),c=this.offset(),d=c_.test(b[0].nodeName)?{top:0,left:0}:b.offset();return c.top-=parseFloat(p.css(a,"marginTop"))||0,c.left-=parseFloat(p.css(a,"marginLeft"))||0,d.top+=parseFloat(p.css(b[0],"borderTopWidth"))||0,d.left+=parseFloat(p.css(b[0],"borderLeftWidth"))||0,{top:c.top-d.top,left:c.left-d.left}},offsetParent:function(){return this.map(function(){var a=this.offsetParent||e.body;while(a&&!c_.test(a.nodeName)&&p.css(a,"position")==="static")a=a.offsetParent;return a||e.body})}}),p.each({scrollLeft:"pageXOffset",scrollTop:"pageYOffset"},function(a,c){var d=/Y/.test(c);p.fn[a]=function(e){return p.access(this,function(a,e,f){var g=da(a);if(f===b)return g?c in g?g[c]:g.document.documentElement[e]:a[e];g?g.scrollTo(d?p(g).scrollLeft():f,d?f:p(g).scrollTop()):a[e]=f},a,e,arguments.length,null)}}),p.each({Height:"height",Width:"width"},function(a,c){p.each({padding:"inner"+a,content:c,"":"outer"+a},function(d,e){p.fn[e]=function(e,f){var g=arguments.length&&(d||typeof e!="boolean"),h=d||(e===!0||f===!0?"margin":"border");return p.access(this,function(c,d,e){var f;return p.isWindow(c)?c.document.documentElement["client"+a]:c.nodeType===9?(f=c.documentElement,Math.max(c.body["scroll"+a],f["scroll"+a],c.body["offset"+a],f["offset"+a],f["client"+a])):e===b?p.css(c,d,e,h):p.style(c,d,e,h)},c,g?e:b,g,null)}})}),a.jQuery=a.$=p,typeof define=="function"&&define.amd&&define.amd.jQuery&&define("jquery",[],function(){return p})})(window);`,
-
-	"jquery.treeview.css": `/* https://github.com/jzaefferer/jquery-treeview/blob/master/jquery.treeview.css */
-/* License: MIT. */
-.treeview, .treeview ul {
-	padding: 0;
-	margin: 0;
-	list-style: none;
-}
-
-.treeview ul {
-	background-color: white;
-	margin-top: 4px;
-}
-
-.treeview .hitarea {
-	background: url(images/treeview-default.gif) -64px -25px no-repeat;
-	height: 16px;
-	width: 16px;
-	margin-left: -16px;
-	float: left;
-	cursor: pointer;
-}
-/* fix for IE6 */
-* html .hitarea {
-	display: inline;
-	float:none;
-}
-
-.treeview li {
-	margin: 0;
-	padding: 3px 0pt 3px 16px;
-}
-
-.treeview a.selected {
-	background-color: #eee;
-}
-
-#treecontrol { margin: 1em 0; display: none; }
-
-.treeview .hover { color: red; cursor: pointer; }
-
-.treeview li { background: url(images/treeview-default-line.gif) 0 0 no-repeat; }
-.treeview li.collapsable, .treeview li.expandable { background-position: 0 -176px; }
-
-.treeview .expandable-hitarea { background-position: -80px -3px; }
-
-.treeview li.last { background-position: 0 -1766px }
-.treeview li.lastCollapsable, .treeview li.lastExpandable { background-image: url(images/treeview-default.gif); }
-.treeview li.lastCollapsable { background-position: 0 -111px }
-.treeview li.lastExpandable { background-position: -32px -67px }
-
-.treeview div.lastCollapsable-hitarea, .treeview div.lastExpandable-hitarea { background-position: 0; }
-
-.treeview-red li { background-image: url(images/treeview-red-line.gif); }
-.treeview-red .hitarea, .treeview-red li.lastCollapsable, .treeview-red li.lastExpandable { background-image: url(images/treeview-red.gif); }
-
-.treeview-black li { background-image: url(images/treeview-black-line.gif); }
-.treeview-black .hitarea, .treeview-black li.lastCollapsable, .treeview-black li.lastExpandable { background-image: url(images/treeview-black.gif); }
-
-.treeview-gray li { background-image: url(images/treeview-gray-line.gif); }
-.treeview-gray .hitarea, .treeview-gray li.lastCollapsable, .treeview-gray li.lastExpandable { background-image: url(images/treeview-gray.gif); }
-
-.treeview-famfamfam li { background-image: url(images/treeview-famfamfam-line.gif); }
-.treeview-famfamfam .hitarea, .treeview-famfamfam li.lastCollapsable, .treeview-famfamfam li.lastExpandable { background-image: url(images/treeview-famfamfam.gif); }
-
-.treeview .placeholder {
-	background: url(images/ajax-loader.gif) 0 0 no-repeat;
-	height: 16px;
-	width: 16px;
-	display: block;
-}
-
-.filetree li { padding: 3px 0 2px 16px; }
-.filetree span.folder, .filetree span.file { padding: 1px 0 1px 16px; display: block; }
-.filetree span.folder { background: url(images/folder.gif) 0 0 no-repeat; }
-.filetree li.expandable span.folder { background: url(images/folder-closed.gif) 0 0 no-repeat; }
-.filetree span.file { background: url(images/file.gif) 0 0 no-repeat; }
-`,
-
-	"jquery.treeview.edit.js": `/* https://github.com/jzaefferer/jquery-treeview/blob/master/jquery.treeview.edit.js */
-/* License: MIT. */
-(function($) {
-	var CLASSES = $.treeview.classes;
-	var proxied = $.fn.treeview;
-	$.fn.treeview = function(settings) {
-		settings = $.extend({}, settings);
-		if (settings.add) {
-			return this.trigger("add", [settings.add]);
-		}
-		if (settings.remove) {
-			return this.trigger("remove", [settings.remove]);
-		}
-		return proxied.apply(this, arguments).bind("add", function(event, branches) {
-			$(branches).prev()
-				.removeClass(CLASSES.last)
-				.removeClass(CLASSES.lastCollapsable)
-				.removeClass(CLASSES.lastExpandable)
-			.find(">.hitarea")
-				.removeClass(CLASSES.lastCollapsableHitarea)
-				.removeClass(CLASSES.lastExpandableHitarea);
-			$(branches).find("li").andSelf().prepareBranches(settings).applyClasses(settings, $(this).data("toggler"));
-		}).bind("remove", function(event, branches) {
-			var prev = $(branches).prev();
-			var parent = $(branches).parent();
-			$(branches).remove();
-			prev.filter(":last-child").addClass(CLASSES.last)
-				.filter("." + CLASSES.expandable).replaceClass(CLASSES.last, CLASSES.lastExpandable).end()
-				.find(">.hitarea").replaceClass(CLASSES.expandableHitarea, CLASSES.lastExpandableHitarea).end()
-				.filter("." + CLASSES.collapsable).replaceClass(CLASSES.last, CLASSES.lastCollapsable).end()
-				.find(">.hitarea").replaceClass(CLASSES.collapsableHitarea, CLASSES.lastCollapsableHitarea);
-			if (parent.is(":not(:has(>))") && parent[0] != this) {
-				parent.parent().removeClass(CLASSES.collapsable).removeClass(CLASSES.expandable)
-				parent.siblings(".hitarea").andSelf().remove();
-			}
-		});
-	};
-	
-})(jQuery);
-`,
-
-	"jquery.treeview.js": `/*
- * Treeview 1.4.1 - jQuery plugin to hide and show branches of a tree
- * 
- * http://bassistance.de/jquery-plugins/jquery-plugin-treeview/
- * http://docs.jquery.com/Plugins/Treeview
- *
- * Copyright (c) 2007 Jörn Zaefferer
- *
- * Dual licensed under the MIT and GPL licenses:
- *   http://www.opensource.org/licenses/mit-license.php
- *   http://www.gnu.org/licenses/gpl.html
- *
- * Revision: $Id: jquery.treeview.js 5759 2008-07-01 07:50:28Z joern.zaefferer $
- *
- */
-
-;(function($) {
-
-	// TODO rewrite as a widget, removing all the extra plugins
-	$.extend($.fn, {
-		swapClass: function(c1, c2) {
-			var c1Elements = this.filter('.' + c1);
-			this.filter('.' + c2).removeClass(c2).addClass(c1);
-			c1Elements.removeClass(c1).addClass(c2);
-			return this;
-		},
-		replaceClass: function(c1, c2) {
-			return this.filter('.' + c1).removeClass(c1).addClass(c2).end();
-		},
-		hoverClass: function(className) {
-			className = className || "hover";
-			return this.hover(function() {
-				$(this).addClass(className);
-			}, function() {
-				$(this).removeClass(className);
-			});
-		},
-		heightToggle: function(animated, callback) {
-			animated ?
-				this.animate({ height: "toggle" }, animated, callback) :
-				this.each(function(){
-					jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ]();
-					if(callback)
-						callback.apply(this, arguments);
-				});
-		},
-		heightHide: function(animated, callback) {
-			if (animated) {
-				this.animate({ height: "hide" }, animated, callback);
-			} else {
-				this.hide();
-				if (callback)
-					this.each(callback);				
-			}
-		},
-		prepareBranches: function(settings) {
-			if (!settings.prerendered) {
-				// mark last tree items
-				this.filter(":last-child:not(ul)").addClass(CLASSES.last);
-				// collapse whole tree, or only those marked as closed, anyway except those marked as open
-				this.filter((settings.collapsed ? "" : "." + CLASSES.closed) + ":not(." + CLASSES.open + ")").find(">ul").hide();
-			}
-			// return all items with sublists
-			return this.filter(":has(>ul)");
-		},
-		applyClasses: function(settings, toggler) {
-			// TODO use event delegation
-			this.filter(":has(>ul):not(:has(>a))").find(">span").unbind("click.treeview").bind("click.treeview", function(event) {
-				// don't handle click events on children, eg. checkboxes
-				if ( this == event.target )
-					toggler.apply($(this).next());
-			}).add( $("a", this) ).hoverClass();
-			
-			if (!settings.prerendered) {
-				// handle closed ones first
-				this.filter(":has(>ul:hidden)")
-						.addClass(CLASSES.expandable)
-						.replaceClass(CLASSES.last, CLASSES.lastExpandable);
-						
-				// handle open ones
-				this.not(":has(>ul:hidden)")
-						.addClass(CLASSES.collapsable)
-						.replaceClass(CLASSES.last, CLASSES.lastCollapsable);
-						
-	            // create hitarea if not present
-				var hitarea = this.find("div." + CLASSES.hitarea);
-				if (!hitarea.length)
-					hitarea = this.prepend("<div class=\"" + CLASSES.hitarea + "\"/>").find("div." + CLASSES.hitarea);
-				hitarea.removeClass().addClass(CLASSES.hitarea).each(function() {
-					var classes = "";
-					$.each($(this).parent().attr("class").split(" "), function() {
-						classes += this + "-hitarea ";
-					});
-					$(this).addClass( classes );
-				})
-			}
-			
-			// apply event to hitarea
-			this.find("div." + CLASSES.hitarea).click( toggler );
-		},
-		treeview: function(settings) {
-			
-			settings = $.extend({
-				cookieId: "treeview"
-			}, settings);
-			
-			if ( settings.toggle ) {
-				var callback = settings.toggle;
-				settings.toggle = function() {
-					return callback.apply($(this).parent()[0], arguments);
-				};
-			}
-		
-			// factory for treecontroller
-			function treeController(tree, control) {
-				// factory for click handlers
-				function handler(filter) {
-					return function() {
-						// reuse toggle event handler, applying the elements to toggle
-						// start searching for all hitareas
-						toggler.apply( $("div." + CLASSES.hitarea, tree).filter(function() {
-							// for plain toggle, no filter is provided, otherwise we need to check the parent element
-							return filter ? $(this).parent("." + filter).length : true;
-						}) );
-						return false;
-					};
-				}
-				// click on first element to collapse tree
-				$("a:eq(0)", control).click( handler(CLASSES.collapsable) );
-				// click on second to expand tree
-				$("a:eq(1)", control).click( handler(CLASSES.expandable) );
-				// click on third to toggle tree
-				$("a:eq(2)", control).click( handler() ); 
-			}
-		
-			// handle toggle event
-			function toggler() {
-				$(this)
-					.parent()
-					// swap classes for hitarea
-					.find(">.hitarea")
-						.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-						.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
-					.end()
-					// swap classes for parent li
-					.swapClass( CLASSES.collapsable, CLASSES.expandable )
-					.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-					// find child lists
-					.find( ">ul" )
-					// toggle them
-					.heightToggle( settings.animated, settings.toggle );
-				if ( settings.unique ) {
-					$(this).parent()
-						.siblings()
-						// swap classes for hitarea
-						.find(">.hitarea")
-							.replaceClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-							.replaceClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea )
-						.end()
-						.replaceClass( CLASSES.collapsable, CLASSES.expandable )
-						.replaceClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-						.find( ">ul" )
-						.heightHide( settings.animated, settings.toggle );
-				}
-			}
-			this.data("toggler", toggler);
-			
-			function serialize() {
-				function binary(arg) {
-					return arg ? 1 : 0;
-				}
-				var data = [];
-				branches.each(function(i, e) {
-					data[i] = $(e).is(":has(>ul:visible)") ? 1 : 0;
-				});
-				$.cookie(settings.cookieId, data.join(""), settings.cookieOptions );
-			}
-			
-			function deserialize() {
-				var stored = $.cookie(settings.cookieId);
-				if ( stored ) {
-					var data = stored.split("");
-					branches.each(function(i, e) {
-						$(e).find(">ul")[ parseInt(data[i]) ? "show" : "hide" ]();
-					});
-				}
-			}
-			
-			// add treeview class to activate styles
-			this.addClass("treeview");
-			
-			// prepare branches and find all tree items with child lists
-			var branches = this.find("li").prepareBranches(settings);
-			
-			switch(settings.persist) {
-			case "cookie":
-				var toggleCallback = settings.toggle;
-				settings.toggle = function() {
-					serialize();
-					if (toggleCallback) {
-						toggleCallback.apply(this, arguments);
-					}
-				};
-				deserialize();
-				break;
-			case "location":
-				var current = this.find("a").filter(function() {
-					return this.href.toLowerCase() == location.href.toLowerCase();
-				});
-				if ( current.length ) {
-					// TODO update the open/closed classes
-					var items = current.addClass("selected").parents("ul, li").add( current.next() ).show();
-					if (settings.prerendered) {
-						// if prerendered is on, replicate the basic class swapping
-						items.filter("li")
-							.swapClass( CLASSES.collapsable, CLASSES.expandable )
-							.swapClass( CLASSES.lastCollapsable, CLASSES.lastExpandable )
-							.find(">.hitarea")
-								.swapClass( CLASSES.collapsableHitarea, CLASSES.expandableHitarea )
-								.swapClass( CLASSES.lastCollapsableHitarea, CLASSES.lastExpandableHitarea );
-					}
-				}
-				break;
-			}
-			
-			branches.applyClasses(settings, toggler);
-				
-			// if control option is set, create the treecontroller and show it
-			if ( settings.control ) {
-				treeController(this, settings.control);
-				$(settings.control).show();
-			}
-			
-			return this;
-		}
-	});
-	
-	// classes used by the plugin
-	// need to be styled via external stylesheet, see first example
-	$.treeview = {};
-	var CLASSES = ($.treeview.classes = {
-		open: "open",
-		closed: "closed",
-		expandable: "expandable",
-		expandableHitarea: "expandable-hitarea",
-		lastExpandableHitarea: "lastExpandable-hitarea",
-		collapsable: "collapsable",
-		collapsableHitarea: "collapsable-hitarea",
-		lastCollapsableHitarea: "lastCollapsable-hitarea",
-		lastCollapsable: "lastCollapsable",
-		lastExpandable: "lastExpandable",
-		last: "last",
-		hitarea: "hitarea"
-	});
-	
-})(jQuery);
-`,
-
-	"methodset.html": `<div class="toggle" style="display: none">
-	<div class="collapsed">
-		<p class="exampleHeading toggleButton">▹ <span class="text">Method set</span></p>
-	</div>
-	<div class="expanded">
-		<p class="exampleHeading toggleButton">▾ <span class="text">Method set</span></p>
-		<div style="margin-left: 1in" id='methodset-{{.Index}}'>...</div>
-	</div>
-</div>
-`,
-
-	"opensearch.xml": `<?xml version="1.0" encoding="UTF-8"?>
-<OpenSearchDescription xmlns="http://a9.com/-/spec/opensearch/1.1/">
-  <ShortName>godoc</ShortName>
-  <Description>The Go Programming Language</Description>
-  <Tags>go golang</Tags>
-  <Contact />
-  <Url type="text/html" template="{{.BaseURL}}/search?q={searchTerms}" />
-  <Image height="15" width="16" type="image/x-icon">/favicon.ico</Image>
-  <OutputEncoding>UTF-8</OutputEncoding>
-  <InputEncoding>UTF-8</InputEncoding>
-</OpenSearchDescription>
-`,
-
-	"package.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-<!--
-	Note: Static (i.e., not template-generated) href and id
-	attributes start with "pkg-" to make it impossible for
-	them to conflict with generated attributes (some of which
-	correspond to Go identifiers).
--->
-{{with .PDoc}}
-	<script type='text/javascript'>
-	document.ANALYSIS_DATA = {{$.AnalysisData}};
-	document.CALLGRAPH = {{$.CallGraph}};
-	</script>
-
-	{{if $.IsMain}}
-		{{/* command documentation */}}
-		{{comment_html .Doc}}
-	{{else}}
-		{{/* package documentation */}}
-		<div id="short-nav">
-			<dl>
-			<dd><code>import "{{html .ImportPath}}"</code></dd>
-			</dl>
-			<dl>
-			<dd><a href="#pkg-overview" class="overviewLink">Overview</a></dd>
-			<dd><a href="#pkg-index" class="indexLink">Index</a></dd>
-			{{if $.Examples}}
-				<dd><a href="#pkg-examples" class="examplesLink">Examples</a></dd>
-			{{end}}
-			{{if $.Dirs}}
-				<dd><a href="#pkg-subdirectories">Subdirectories</a></dd>
-			{{end}}
-			</dl>
-		</div>
-		<!-- The package's Name is printed as title by the top-level template -->
-		<div id="pkg-overview" class="toggleVisible">
-			<div class="collapsed">
-				<h2 class="toggleButton" title="Click to show Overview section">Overview ▹</h2>
-			</div>
-			<div class="expanded">
-				<h2 class="toggleButton" title="Click to hide Overview section">Overview ▾</h2>
-				{{comment_html .Doc}}
-			</div>
-		</div>
-		{{example_html $ ""}}
-
-		<div id="pkg-index" class="toggleVisible">
-		<div class="collapsed">
-			<h2 class="toggleButton" title="Click to show Index section">Index ▹</h2>
-		</div>
-		<div class="expanded">
-			<h2 class="toggleButton" title="Click to hide Index section">Index ▾</h2>
-
-		<!-- Table of contents for API; must be named manual-nav to turn off auto nav. -->
-			<div id="manual-nav">
-			<dl>
-			{{if .Consts}}
-				<dd><a href="#pkg-constants">Constants</a></dd>
-			{{end}}
-			{{if .Vars}}
-				<dd><a href="#pkg-variables">Variables</a></dd>
-			{{end}}
-			{{range .Funcs}}
-				{{$name_html := html .Name}}
-				<dd><a href="#{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-			{{end}}
-			{{range .Types}}
-				{{$tname_html := html .Name}}
-				<dd><a href="#{{$tname_html}}">type {{$tname_html}}</a></dd>
-				{{range .Funcs}}
-					{{$name_html := html .Name}}
-					<dd>&nbsp; &nbsp; <a href="#{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-				{{end}}
-				{{range .Methods}}
-					{{$name_html := html .Name}}
-					<dd>&nbsp; &nbsp; <a href="#{{$tname_html}}.{{$name_html}}">{{node_html $ .Decl false | sanitize}}</a></dd>
-				{{end}}
-			{{end}}
-			{{if $.Notes}}
-				{{range $marker, $item := $.Notes}}
-				<dd><a href="#pkg-note-{{$marker}}">{{noteTitle $marker | html}}s</a></dd>
-				{{end}}
-			{{end}}
-			</dl>
-			</div><!-- #manual-nav -->
-
-		{{if $.Examples}}
-		<div id="pkg-examples">
-			<h3>Examples</h3>
-			<dl>
-			{{range $.Examples}}
-			<dd><a class="exampleLink" href="#example_{{.Name}}">{{example_name .Name}}</a></dd>
-			{{end}}
-			</dl>
-		</div>
-		{{end}}
-
-		{{with .Filenames}}
-			<h3>Package files</h3>
-			<p>
-			<span style="font-size:90%">
-			{{range .}}
-				<a href="{{.|srcLink|html}}">{{.|filename|html}}</a>
-			{{end}}
-			</span>
-			</p>
-		{{end}}
-		</div><!-- .expanded -->
-		</div><!-- #pkg-index -->
-
-		<div id="pkg-callgraph" class="toggle" style="display: none">
-		<div class="collapsed">
-			<h2 class="toggleButton" title="Click to show Internal Call Graph section">Internal call graph ▹</h2>
-		</div> <!-- .expanded -->
-		<div class="expanded">
-			<h2 class="toggleButton" title="Click to hide Internal Call Graph section">Internal call graph ▾</h2>
-			<p>
-			  In the call graph viewer below, each node
-			  is a function belonging to this package
-			  and its children are the functions it
-			  calls&mdash;perhaps dynamically.
-			</p>
-			<p>
-			  The root nodes are the entry points of the
-			  package: functions that may be called from
-			  outside the package.
-			  There may be non-exported or anonymous
-			  functions among them if they are called
-			  dynamically from another package.
-			</p>
-			<p>
-			  Click a node to visit that function's source code.
-			  From there you can visit its callers by
-			  clicking its declaring <code>func</code>
-			  token.
-			</p>
-			<p>
-			  Functions may be omitted if they were
-			  determined to be unreachable in the
-			  particular programs or tests that were
-			  analyzed.
-			</p>
-			<!-- Zero means show all package entry points. -->
-			<ul style="margin-left: 0.5in" id="callgraph-0" class="treeview"></ul>
-		</div>
-		</div> <!-- #pkg-callgraph -->
-
-		{{with .Consts}}
-			<h2 id="pkg-constants">Constants</h2>
-			{{range .}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-		{{end}}
-		{{with .Vars}}
-			<h2 id="pkg-variables">Variables</h2>
-			{{range .}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-		{{end}}
-		{{range .Funcs}}
-			{{/* Name is a string - no need for FSet */}}
-			{{$name_html := html .Name}}
-			<h2 id="{{$name_html}}">func <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-				<a class="permalink" href="#{{$name_html}}">&#xb6;</a>
-			</h2>
-			<pre>{{node_html $ .Decl true}}</pre>
-			{{comment_html .Doc}}
-			{{example_html $ .Name}}
-			{{callgraph_html $ "" .Name}}
-
-		{{end}}
-		{{range .Types}}
-			{{$tname := .Name}}
-			{{$tname_html := html .Name}}
-			<h2 id="{{$tname_html}}">type <a href="{{posLink_url $ .Decl}}">{{$tname_html}}</a>
-				<a class="permalink" href="#{{$tname_html}}">&#xb6;</a>
-			</h2>
-			{{comment_html .Doc}}
-			<pre>{{node_html $ .Decl true}}</pre>
-
-			{{range .Consts}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-
-			{{range .Vars}}
-				{{comment_html .Doc}}
-				<pre>{{node_html $ .Decl true}}</pre>
-			{{end}}
-
-			{{example_html $ $tname}}
-			{{implements_html $ $tname}}
-			{{methodset_html $ $tname}}
-
-			{{range .Funcs}}
-				{{$name_html := html .Name}}
-				<h3 id="{{$name_html}}">func <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-					<a class="permalink" href="#{{$name_html}}">&#xb6;</a>
-				</h3>
-				<pre>{{node_html $ .Decl true}}</pre>
-				{{comment_html .Doc}}
-				{{example_html $ .Name}}
-				{{callgraph_html $ "" .Name}}
-			{{end}}
-
-			{{range .Methods}}
-				{{$name_html := html .Name}}
-				<h3 id="{{$tname_html}}.{{$name_html}}">func ({{html .Recv}}) <a href="{{posLink_url $ .Decl}}">{{$name_html}}</a>
-					<a class="permalink" href="#{{$tname_html}}.{{$name_html}}">&#xb6;</a>
-				</h3>
-				<pre>{{node_html $ .Decl true}}</pre>
-				{{comment_html .Doc}}
-				{{$name := printf "%s_%s" $tname .Name}}
-				{{example_html $ $name}}
-				{{callgraph_html $ .Recv .Name}}
-			{{end}}
-		{{end}}
-	{{end}}
-
-	{{with $.Notes}}
-		{{range $marker, $content := .}}
-			<h2 id="pkg-note-{{$marker}}">{{noteTitle $marker | html}}s</h2>
-			<ul style="list-style: none; padding: 0;">
-			{{range .}}
-			<li><a href="{{posLink_url $ .}}" style="float: left;">&#x261e;</a> {{comment_html .Body}}</li>
-			{{end}}
-			</ul>
-		{{end}}
-	{{end}}
-{{end}}
-
-{{with .PAst}}
-	{{range $filename, $ast := .}}
-		<a href="{{$filename|srcLink|html}}">{{$filename|filename|html}}</a>:<pre>{{node_html $ $ast false}}</pre>
-	{{end}}
-{{end}}
-
-{{with .Dirs}}
-	{{/* DirList entries are numbers and strings - no need for FSet */}}
-	{{if $.PDoc}}
-		<h2 id="pkg-subdirectories">Subdirectories</h2>
-	{{end}}
-	{{if eq $.Dirname "/src"}}
-		<div id="manual-nav">
-			<dl>
-				<dt><a href="#stdlib">Standard library</a></dt>
-				<dt><a href="#other">Other packages</a></dt>
-				<dd><a href="#subrepo">Sub-repositories</a></dd>
-				<dd><a href="#community">Community</a></dd>
-			</dl>
-		</div>
-		<h2 id="stdlib">Standard library</h2>
-		<img alt="" class="gopher" src="/doc/gopher/pkg.png"/>
-	{{end}}
-
-
-	<div class="pkg-dir">
-		<table>
-			<tr>
-				<th class="pkg-name">Name</th>
-				<th class="pkg-synopsis">Synopsis</th>
-			</tr>
-
-			{{if not (or (eq $.Dirname "/src") (eq $.Dirname "/src/cmd") $.DirFlat)}}
-			<tr>
-				<td colspan="2"><a href="..">..</a></td>
-			</tr>
-			{{end}}
-
-			{{range .List}}
-				{{if $.DirFlat}}
-					{{if .HasPkg}}
-						<tr>
-							<td class="pkg-name">
-								<a href="{{html .Path}}/{{modeQueryString $.Mode | html}}">{{html .Path}}</a>
-							</td>
-							<td class="pkg-synopsis">
-								{{html .Synopsis}}
-							</td>
-						</tr>
-					{{end}}
-				{{else}}
-					<tr>
-						<td class="pkg-name" style="padding-left: {{multiply .Depth 20}}px;">
-							<a href="{{html .Path}}/{{modeQueryString $.Mode | html}}">{{html .Name}}</a>
-						</td>
-						<td class="pkg-synopsis">
-							{{html .Synopsis}}
-						</td>
-					</tr>
-				{{end}}
-			{{end}}
-		</table>
-	</div>
-
-
-	{{if eq $.Dirname "/src"}}
-	<h2 id="other">Other packages</h2>
-
-	<h3 id="subrepo">Sub-repositories</h3>
-	<p>
-	These packages are part of the Go Project but outside the main Go tree.
-	They are developed under looser <a href="/doc/go1compat">compatibility requirements</a> than the Go core.
-	Install them with "<a href="/cmd/go/#hdr-Download_and_install_packages_and_dependencies">go get</a>".
-	</p>
-	<ul>
-		<li><a href="//godoc.org/golang.org/x/benchmarks">benchmarks</a> — benchmarks to measure Go as it is developed.</li>
-		<li><a href="//godoc.org/golang.org/x/blog">blog</a> — <a href="//blog.golang.org">blog.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/build">build</a> — <a href="//build.golang.org">build.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/crypto">crypto</a> — additional cryptography packages.</li>
-		<li><a href="//godoc.org/golang.org/x/debug">debug</a> — an experimental debugger for Go.</li>
-		<li><a href="//godoc.org/golang.org/x/image">image</a> — additional imaging packages.</li>
-		<li><a href="//godoc.org/golang.org/x/mobile">mobile</a> — experimental support for Go on mobile platforms.</li>
-		<li><a href="//godoc.org/golang.org/x/net">net</a> — additional networking packages.</li>
-		<li><a href="//godoc.org/golang.org/x/sys">sys</a> — packages for making system calls.</li>
-		<li><a href="//godoc.org/golang.org/x/text">text</a> — packages for working with text.</li>
-		<li><a href="//godoc.org/golang.org/x/tools">tools</a> — godoc, goimports, gorename, and other tools.</li>
-		<li><a href="//godoc.org/golang.org/x/tour">tour</a> — <a href="//tour.golang.org">tour.golang.org</a>'s implementation.</li>
-		<li><a href="//godoc.org/golang.org/x/exp">exp</a> — experimental and deprecated packages (handle with care; may change without warning).</li>
-	</ul>
-
-	<h3 id="community">Community</h3>
-	<p>
-	These services can help you find Open Source packages provided by the community.
-	</p>
-	<ul>
-		<li><a href="//godoc.org">GoDoc</a> - a package index and search engine.</li>
-		<li><a href="http://go-search.org">Go Search</a> - a code search engine.</li>
-		<li><a href="/wiki/Projects">Projects at the Go Wiki</a> - a curated list of Go projects.</li>
-	</ul>
-	{{end}}
-{{end}}
-`,
-
-	"package.txt": `{{$info := .}}{{$filtered := .IsFiltered}}{{/*
-
----------------------------------------
-
-*/}}{{if $filtered}}{{range .PAst}}{{range .Decls}}{{node $info .}}
-
-{{end}}{{end}}{{else}}{{with .PAst}}{{range $filename, $ast := .}}{{$filename}}:
-{{node $ $ast}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if and $filtered (not (or .PDoc .PAst))}}No match found.
-{{end}}{{with .PDoc}}{{if $.IsMain}}COMMAND DOCUMENTATION
-
-{{comment_text .Doc "    " "\t"}}
-{{else}}{{if not $filtered}}PACKAGE DOCUMENTATION
-
-package {{.Name}}
-    import "{{.ImportPath}}"
-
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ "" "    "}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Consts}}{{if not $filtered}}CONSTANTS
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Vars}}{{if not $filtered}}VARIABLES
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Funcs}}{{if not $filtered}}FUNCTIONS
-
-{{end}}{{range .}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ .Name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with .Types}}{{if not $filtered}}TYPES
-
-{{end}}{{range .}}{{$tname := .Name}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{/*
-
----------------------------------------
-
-*/}}{{if .Consts}}{{range .Consts}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Vars}}{{range .Vars}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{range $name := .Names}}{{example_text $ $name "    "}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Funcs}}{{range .Funcs}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{example_text $ .Name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if .Methods}}{{range .Methods}}{{node $ .Decl}}
-{{comment_text .Doc "    " "\t"}}
-{{$name := printf "%s_%s" $tname .Name}}{{example_text $ $name "    "}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if and $filtered (not (or .Consts (or .Vars (or .Funcs .Types))))}}No match found.
-{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{with $.Notes}}
-{{range $marker, $content := .}}
-{{$marker}}S
-
-{{range $content}}{{comment_text .Body "   " "\t"}}
-{{end}}{{end}}{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{if not $filtered}}{{with .Dirs}}SUBDIRECTORIES
-{{if $.DirFlat}}{{range .List}}{{if .HasPkg}}
-	{{.Path}}{{end}}{{end}}
-{{else}}{{range .List}}
-	{{repeat ` + "`" + `. ` + "`" + ` .Depth}}{{.Name}}{{end}}
-{{end}}{{end}}{{/*
-
----------------------------------------
-
-*/}}{{end}}{{/*
-Make sure there is no newline at the end of this file.
-perl -i -pe 'chomp if eof' package.txt
-*/}}
-`,
-
-	"play.js": `// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-function initPlayground(transport) {
-	'use strict';
-
-	function text(node) {
-		var s = '';
-		for (var i = 0; i < node.childNodes.length; i++) {
-			var n = node.childNodes[i];
-			if (n.nodeType === 1) {
-				if (n.tagName === 'BUTTON') continue
-				if (n.tagName === 'SPAN' && n.className === 'number') continue;
-				if (n.tagName === 'DIV' || n.tagName == 'BR') {
-					s += "\n";
-				}
-				s += text(n);
-				continue;
-			}
-			if (n.nodeType === 3) {
-				s += n.nodeValue;
-			}
-		}
-		return s.replace('\xA0', ' '); // replace non-breaking spaces
-	}
-
-	// When presenter notes are enabled, the index passed
-	// here will identify the playground to be synced
-	function init(code, index) {
-		var output = document.createElement('div');
-		var outpre = document.createElement('pre');
-		var running;
-
-		if ($ && $(output).resizable) {
-			$(output).resizable({
-				handles: 	'n,w,nw',
-				minHeight:	27,
-				minWidth:	135,
-				maxHeight:	608,
-				maxWidth:	990
-			});
-		}
-
-		function onKill() {
-			if (running) running.Kill();
-			if (window.notesEnabled) updatePlayStorage('onKill', index);
-		}
-
-		function onRun(e) {
-			var sk = e.shiftKey || localStorage.getItem('play-shiftKey') === 'true';
-			if (running) running.Kill();
-			output.style.display = 'block';
-			outpre.innerHTML = '';
-			run1.style.display = 'none';
-			var options = {Race: sk};
-			running = transport.Run(text(code), PlaygroundOutput(outpre), options);
-			if (window.notesEnabled) updatePlayStorage('onRun', index, e);
-		}
-
-		function onClose() {
-			if (running) running.Kill();
-			output.style.display = 'none';
-			run1.style.display = 'inline-block';
-			if (window.notesEnabled) updatePlayStorage('onClose', index);
-		}
-
-		if (window.notesEnabled) {
-			playgroundHandlers.onRun.push(onRun);
-			playgroundHandlers.onClose.push(onClose);
-			playgroundHandlers.onKill.push(onKill);
-		}
-
-		var run1 = document.createElement('button');
-		run1.innerHTML = 'Run';
-		run1.className = 'run';
-		run1.addEventListener("click", onRun, false);
-		var run2 = document.createElement('button');
-		run2.className = 'run';
-		run2.innerHTML = 'Run';
-		run2.addEventListener("click", onRun, false);
-		var kill = document.createElement('button');
-		kill.className = 'kill';
-		kill.innerHTML = 'Kill';
-		kill.addEventListener("click", onKill, false);
-		var close = document.createElement('button');
-		close.className = 'close';
-		close.innerHTML = 'Close';
-		close.addEventListener("click", onClose, false);
-
-		var button = document.createElement('div');
-		button.classList.add('buttons');
-		button.appendChild(run1);
-		// Hack to simulate insertAfter
-		code.parentNode.insertBefore(button, code.nextSibling);
-
-		var buttons = document.createElement('div');
-		buttons.classList.add('buttons');
-		buttons.appendChild(run2);
-		buttons.appendChild(kill);
-		buttons.appendChild(close);
-
-		output.classList.add('output');
-		output.appendChild(buttons);
-		output.appendChild(outpre);
-		output.style.display = 'none';
-		code.parentNode.insertBefore(output, button.nextSibling);
-	}
-
-	var play = document.querySelectorAll('div.playground');
-	for (var i = 0; i < play.length; i++) {
-		init(play[i], i);
-	}
-}
-`,
-
-	"playground.js": `// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-In the absence of any formal way to specify interfaces in JavaScript,
-here's a skeleton implementation of a playground transport.
-
-        function Transport() {
-                // Set up any transport state (eg, make a websocket connection).
-                return {
-                        Run: function(body, output, options) {
-                                // Compile and run the program 'body' with 'options'.
-				// Call the 'output' callback to display program output.
-                                return {
-                                        Kill: function() {
-                                                // Kill the running program.
-                                        }
-                                };
-                        }
-                };
-        }
-
-	// The output callback is called multiple times, and each time it is
-	// passed an object of this form.
-        var write = {
-                Kind: 'string', // 'start', 'stdout', 'stderr', 'end'
-                Body: 'string'  // content of write or end status message
-        }
-
-	// The first call must be of Kind 'start' with no body.
-	// Subsequent calls may be of Kind 'stdout' or 'stderr'
-	// and must have a non-null Body string.
-	// The final call should be of Kind 'end' with an optional
-	// Body string, signifying a failure ("killed", for example).
-
-	// The output callback must be of this form.
-	// See PlaygroundOutput (below) for an implementation.
-        function outputCallback(write) {
-        }
-*/
-
-function HTTPTransport() {
-	'use strict';
-
-	// TODO(adg): support stderr
-
-	function playback(output, events) {
-		var timeout;
-		output({Kind: 'start'});
-		function next() {
-			if (!events || events.length === 0) {
-				output({Kind: 'end'});
-				return;
-			}
-			var e = events.shift();
-			if (e.Delay === 0) {
-				output({Kind: 'stdout', Body: e.Message});
-				next();
-				return;
-			}
-			timeout = setTimeout(function() {
-				output({Kind: 'stdout', Body: e.Message});
-				next();
-			}, e.Delay / 1000000);
-		}
-		next();
-		return {
-			Stop: function() {
-				clearTimeout(timeout);
-			}
-		}
-	}
-
-	function error(output, msg) {
-		output({Kind: 'start'});
-		output({Kind: 'stderr', Body: msg});
-		output({Kind: 'end'});
-	}
-
-	var seq = 0;
-	return {
-		Run: function(body, output, options) {
-			seq++;
-			var cur = seq;
-			var playing;
-			$.ajax('/compile', {
-				type: 'POST',
-				data: {'version': 2, 'body': body},
-				dataType: 'json',
-				success: function(data) {
-					if (seq != cur) return;
-					if (!data) return;
-					if (playing != null) playing.Stop();
-					if (data.Errors) {
-						error(output, data.Errors);
-						return;
-					}
-					playing = playback(output, data.Events);
-				},
-				error: function() {
-					error(output, 'Error communicating with remote server.');
-				}
-			});
-			return {
-				Kill: function() {
-					if (playing != null) playing.Stop();
-					output({Kind: 'end', Body: 'killed'});
-				}
-			};
-		}
-	};
-}
-
-function SocketTransport() {
-	'use strict';
-
-	var id = 0;
-	var outputs = {};
-	var started = {};
-	var websocket = new WebSocket('ws://' + window.location.host + '/socket');
-
-	websocket.onclose = function() {
-		console.log('websocket connection closed');
-	}
-
-	websocket.onmessage = function(e) {
-		var m = JSON.parse(e.data);
-		var output = outputs[m.Id];
-		if (output === null)
-			return;
-		if (!started[m.Id]) {
-			output({Kind: 'start'});
-			started[m.Id] = true;
-		}
-		output({Kind: m.Kind, Body: m.Body});
-	}
-
-	function send(m) {
-		websocket.send(JSON.stringify(m));
-	}
-
-	return {
-		Run: function(body, output, options) {
-			var thisID = id+'';
-			id++;
-			outputs[thisID] = output;
-			send({Id: thisID, Kind: 'run', Body: body, Options: options});
-			return {
-				Kill: function() {
-					send({Id: thisID, Kind: 'kill'});
-				}
-			};
-		}
-	};
-}
-
-function PlaygroundOutput(el) {
-	'use strict';
-
-	return function(write) {
-		if (write.Kind == 'start') {
-			el.innerHTML = '';
-			return;
-		}
-
-		var cl = 'system';
-		if (write.Kind == 'stdout' || write.Kind == 'stderr')
-			cl = write.Kind;
-
-		var m = write.Body;
-		if (write.Kind == 'end') {
-			m = '\nProgram exited' + (m?(': '+m):'.');
-		}
-
-		if (m.indexOf('IMAGE:') === 0) {
-			// TODO(adg): buffer all writes before creating image
-			var url = 'data:image/png;base64,' + m.substr(6);
-			var img = document.createElement('img');
-			img.src = url;
-			el.appendChild(img);
-			return;
-		}
-
-		// ^L clears the screen.
-		var s = m.split('\x0c');
-		if (s.length > 1) {
-			el.innerHTML = '';
-			m = s.pop();
-		}
-
-		m = m.replace(/&/g, '&amp;');
-		m = m.replace(/</g, '&lt;');
-		m = m.replace(/>/g, '&gt;');
-
-		var needScroll = (el.scrollTop + el.offsetHeight) == el.scrollHeight;
-
-		var span = document.createElement('span');
-		span.className = cl;
-		span.innerHTML = m;
-		el.appendChild(span);
-
-		if (needScroll)
-			el.scrollTop = el.scrollHeight - el.offsetHeight;
-	}
-}
-
-(function() {
-  function lineHighlight(error) {
-    var regex = /prog.go:([0-9]+)/g;
-    var r = regex.exec(error);
-    while (r) {
-      $(".lines div").eq(r[1]-1).addClass("lineerror");
-      r = regex.exec(error);
-    }
-  }
-  function highlightOutput(wrappedOutput) {
-    return function(write) {
-      if (write.Body) lineHighlight(write.Body);
-      wrappedOutput(write);
-    }
-  }
-  function lineClear() {
-    $(".lineerror").removeClass("lineerror");
-  }
-
-  // opts is an object with these keys
-  //  codeEl - code editor element
-  //  outputEl - program output element
-  //  runEl - run button element
-  //  fmtEl - fmt button element (optional)
-  //  fmtImportEl - fmt "imports" checkbox element (optional)
-  //  shareEl - share button element (optional)
-  //  shareURLEl - share URL text input element (optional)
-  //  shareRedirect - base URL to redirect to on share (optional)
-  //  toysEl - toys select element (optional)
-  //  enableHistory - enable using HTML5 history API (optional)
-  //  transport - playground transport to use (default is HTTPTransport)
-  //  enableShortcuts - whether to enable shortcuts (Ctrl+S/Cmd+S to save) (default is false)
-  function playground(opts) {
-    var code = $(opts.codeEl);
-    var transport = opts['transport'] || new HTTPTransport();
-    var running;
-
-    // autoindent helpers.
-    function insertTabs(n) {
-      // find the selection start and end
-      var start = code[0].selectionStart;
-      var end   = code[0].selectionEnd;
-      // split the textarea content into two, and insert n tabs
-      var v = code[0].value;
-      var u = v.substr(0, start);
-      for (var i=0; i<n; i++) {
-        u += "\t";
-      }
-      u += v.substr(end);
-      // set revised content
-      code[0].value = u;
-      // reset caret position after inserted tabs
-      code[0].selectionStart = start+n;
-      code[0].selectionEnd = start+n;
-    }
-    function autoindent(el) {
-      var curpos = el.selectionStart;
-      var tabs = 0;
-      while (curpos > 0) {
-        curpos--;
-        if (el.value[curpos] == "\t") {
-          tabs++;
-        } else if (tabs > 0 || el.value[curpos] == "\n") {
-          break;
-        }
-      }
-      setTimeout(function() {
-        insertTabs(tabs);
-      }, 1);
-    }
-
-    // NOTE(cbro): e is a jQuery event, not a DOM event.
-    function handleSaveShortcut(e) {
-      if (e.isDefaultPrevented()) return false;
-      if (!e.metaKey && !e.ctrlKey) return false;
-      if (e.key != "S" && e.key != "s") return false;
-
-      e.preventDefault();
-
-      // Share and save
-      share(function(url) {
-        window.location.href = url + ".go?download=true";
-      });
-
-      return true;
-    }
-
-    function keyHandler(e) {
-      if (opts.enableShortcuts && handleSaveShortcut(e)) return;
-
-      if (e.keyCode == 9 && !e.ctrlKey) { // tab (but not ctrl-tab)
-        insertTabs(1);
-        e.preventDefault();
-        return false;
-      }
-      if (e.keyCode == 13) { // enter
-        if (e.shiftKey) { // +shift
-          run();
-          e.preventDefault();
-          return false;
-        } if (e.ctrlKey) { // +control
-          fmt();
-          e.preventDefault();
-        } else {
-          autoindent(e.target);
-        }
-      }
-      return true;
-    }
-    code.unbind('keydown').bind('keydown', keyHandler);
-    var outdiv = $(opts.outputEl).empty();
-    var output = $('<pre/>').appendTo(outdiv);
-
-    function body() {
-      return $(opts.codeEl).val();
-    }
-    function setBody(text) {
-      $(opts.codeEl).val(text);
-    }
-    function origin(href) {
-      return (""+href).split("/").slice(0, 3).join("/");
-    }
-
-    var pushedEmpty = (window.location.pathname == "/");
-    function inputChanged() {
-      if (pushedEmpty) {
-        return;
-      }
-      pushedEmpty = true;
-      $(opts.shareURLEl).hide();
-      window.history.pushState(null, "", "/");
-    }
-    function popState(e) {
-      if (e === null) {
-        return;
-      }
-      if (e && e.state && e.state.code) {
-        setBody(e.state.code);
-      }
-    }
-    var rewriteHistory = false;
-    if (window.history && window.history.pushState && window.addEventListener && opts.enableHistory) {
-      rewriteHistory = true;
-      code[0].addEventListener('input', inputChanged);
-      window.addEventListener('popstate', popState);
-    }
-
-    function setError(error) {
-      if (running) running.Kill();
-      lineClear();
-      lineHighlight(error);
-      output.empty().addClass("error").text(error);
-    }
-    function loading() {
-      lineClear();
-      if (running) running.Kill();
-      output.removeClass("error").text('Waiting for remote server...');
-    }
-    function run() {
-      loading();
-      running = transport.Run(body(), highlightOutput(PlaygroundOutput(output[0])));
-    }
-
-    function fmt() {
-      loading();
-      var data = {"body": body()};
-      if ($(opts.fmtImportEl).is(":checked")) {
-        data["imports"] = "true";
-      }
-      $.ajax("/fmt", {
-        data: data,
-        type: "POST",
-        dataType: "json",
-        success: function(data) {
-          if (data.Error) {
-            setError(data.Error);
-          } else {
-            setBody(data.Body);
-            setError("");
-          }
-        }
-      });
-    }
-
-    var shareURL; // jQuery element to show the shared URL.
-    var sharing = false; // true if there is a pending request.
-    var shareCallbacks = [];
-    function share(opt_callback) {
-      if (opt_callback) shareCallbacks.push(opt_callback);
-
-      if (sharing) return;
-      sharing = true;
-
-      var sharingData = body();
-      $.ajax("/share", {
-        processData: false,
-        data: sharingData,
-        type: "POST",
-        complete: function(xhr) {
-          sharing = false;
-          if (xhr.status != 200) {
-            alert("Server error; try again.");
-            return;
-          }
-          if (opts.shareRedirect) {
-            window.location = opts.shareRedirect + xhr.responseText;
-          }
-          var path = "/p/" + xhr.responseText;
-          var url = origin(window.location) + path;
-
-          for (var i = 0; i < shareCallbacks.length; i++) {
-            shareCallbacks[i](url);
-          }
-          shareCallbacks = [];
-
-          if (shareURL) {
-            shareURL.show().val(url).focus().select();
-
-            if (rewriteHistory) {
-              var historyData = {"code": sharingData};
-              window.history.pushState(historyData, "", path);
-              pushedEmpty = false;
-            }
-          }
-        }
-      });
-    }
-
-    $(opts.runEl).click(run);
-    $(opts.fmtEl).click(fmt);
-
-    if (opts.shareEl !== null && (opts.shareURLEl !== null || opts.shareRedirect !== null)) {
-      if (opts.shareURLEl) {
-        shareURL = $(opts.shareURLEl).hide();
-      }
-      $(opts.shareEl).click(function() {
-        share();
-      });
-    }
-
-    if (opts.toysEl !== null) {
-      $(opts.toysEl).bind('change', function() {
-        var toy = $(this).val();
-        $.ajax("/doc/play/"+toy, {
-          processData: false,
-          type: "GET",
-          complete: function(xhr) {
-            if (xhr.status != 200) {
-              alert("Server error; try again.");
-              return;
-            }
-            setBody(xhr.responseText);
-          }
-        });
-      });
-    }
-  }
-
-  window.playground = playground;
-})();
-`,
-
-	"search.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{with .Alert}}
-	<p>
-	<span class="alert" style="font-size:120%">{{html .}}</span>
-	</p>
-{{end}}
-{{with .Alt}}
-	<p>
-	<span class="alert" style="font-size:120%">Did you mean: </span>
-	{{range .Alts}}
-		<a href="search?q={{urlquery .}}" style="font-size:120%">{{html .}}</a>
-	{{end}}
-	</p>
-{{end}}
-`,
-
-	"search.txt": `QUERY
-	{{.Query}}
-
-{{with .Alert}}{{.}}
-{{end}}{{/* .Alert */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Alt}}DID YOU MEAN
-
-{{range .Alts}}	{{.}}
-{{end}}
-{{end}}{{/* .Alt */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Pak}}PACKAGE {{$.Query}}
-
-{{range .}}	{{pkgLink .Pak.Path}}
-{{end}}
-{{end}}{{/* .Pak */}}{{/*
-
----------------------------------------
-
-*/}}{{range $key, $val := .Idents}}{{if $val}}{{$key.Name}}
-{{range $val}}    {{.Path}}.{{.Name}}
-{{end}}
-{{end}}{{end}}{{/* .Idents */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Hit}}{{with .Decls}}PACKAGE-LEVEL DECLARATIONS
-
-{{range .}}package {{.Pak.Name}}
-{{range $file := .Files}}{{range .Groups}}{{range .}}	{{srcLink $file.File.Path}}:{{infoLine .}}{{end}}
-{{end}}{{end}}{{/* .Files */}}
-{{end}}{{end}}{{/* .Decls */}}{{/*
-
----------------------------------------
-
-*/}}{{with .Others}}LOCAL DECLARATIONS AND USES
-
-{{range .}}package {{.Pak.Name}}
-{{range $file := .Files}}{{range .Groups}}{{range .}}	{{srcLink $file.File.Path}}:{{infoLine .}}
-{{end}}{{end}}{{end}}{{/* .Files */}}
-{{end}}{{end}}{{/* .Others */}}{{end}}{{/* .Hit */}}{{/*
-
----------------------------------------
-
-*/}}{{if .Textual}}{{if .Complete}}{{.Found}} TEXTUAL OCCURRENCES{{else}}MORE THAN {{.Found}} TEXTUAL OCCURRENCES{{end}}
-
-{{range .Textual}}{{len .Lines}}	{{srcLink .Filename}}
-{{end}}{{if not .Complete}}...	...
-{{end}}{{end}}
-`,
-
-	"searchcode.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{$query_url := urlquery .Query}}
-{{if not .Idents}}
-	{{with .Pak}}
-		<h2 id="Packages">Package {{html $.Query}}</h2>
-		<p>
-		<table class="layout">
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<tr><td><a href="/{{$pkg_html}}">{{$pkg_html}}</a></td></tr>
-		{{end}}
-		</table>
-		</p>
-	{{end}}
-{{end}}
-{{with .Hit}}
-	{{with .Decls}}
-		<h2 id="Global">Package-level declarations</h2>
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<h3 id="Global_{{$pkg_html}}">package <a href="/{{$pkg_html}}">{{html .Pak.Name}}</a></h3>
-			{{range .Files}}
-				{{$file := .File.Path}}
-				{{range .Groups}}
-					{{range .}}
-						{{$line := infoLine .}}
-						<a href="{{queryLink $file $query_url $line | html}}">{{$file}}:{{$line}}</a>
-						{{infoSnippet_html .}}
-					{{end}}
-				{{end}}
-			{{end}}
-		{{end}}
-	{{end}}
-	{{with .Others}}
-		<h2 id="Local">Local declarations and uses</h2>
-		{{range .}}
-			{{$pkg_html := pkgLink .Pak.Path | html}}
-			<h3 id="Local_{{$pkg_html}}">package <a href="/{{$pkg_html}}">{{html .Pak.Name}}</a></h3>
-			{{range .Files}}
-				{{$file := .File.Path}}
-				<a href="{{queryLink $file $query_url 0 | html}}">{{$file}}</a>
-				<table class="layout">
-				{{range .Groups}}
-					<tr>
-					<td width="25"></td>
-					<th align="left" valign="top">{{index . 0 | infoKind_html}}</th>
-					<td align="left" width="4"></td>
-					<td>
-					{{range .}}
-						{{$line := infoLine .}}
-						<a href="{{queryLink $file $query_url $line | html}}">{{$line}}</a>
-					{{end}}
-					</td>
-					</tr>
-				{{end}}
-				</table>
-			{{end}}
-		{{end}}
-	{{end}}
-{{end}}
-`,
-
-	"searchdoc.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{range $key, $val := .Idents}}
-	{{if $val}}
-		<h2 id="{{$key.Name}}">{{$key.Name}}</h2>
-		{{range $val}}
-			{{$pkg_html := pkgLink .Path | html}}
-			{{if eq "Packages" $key.Name}}
-				<a href="/{{$pkg_html}}">{{html .Path}}</a>
-			{{else}}
-				{{$doc_html := docLink .Path .Name| html}}
-				<a href="/{{$pkg_html}}">{{html .Package}}</a>.<a href="{{$doc_html}}">{{.Name}}</a>
-			{{end}}
-			{{if .Doc}}
-				<p>{{comment_html .Doc}}</p>
-			{{else}}
-				<p><em>No documentation available</em></p>
-			{{end}}
-		{{end}}
-	{{end}}
-{{end}}
-`,
-
-	"searchtxt.html": `<!--
-	Copyright 2009 The Go Authors. All rights reserved.
-	Use of this source code is governed by a BSD-style
-	license that can be found in the LICENSE file.
--->
-{{$query_url := urlquery .Query}}
-{{with .Textual}}
-	{{if $.Complete}}
-		<h2 id="Textual">{{html $.Found}} textual occurrences</h2>
-	{{else}}
-		<h2 id="Textual">More than {{html $.Found}} textual occurrences</h2>
-		<p>
-		<span class="alert" style="font-size:120%">Not all files or lines containing "{{html $.Query}}" are shown.</span>
-		</p>
-	{{end}}
-	<p>
-	<table class="layout">
-	{{range .}}
-		{{$file := .Filename}}
-		<tr>
-		<td align="left" valign="top">
-		<a href="{{queryLink $file $query_url 0}}">{{$file}}</a>:
-		</td>
-		<td align="left" width="4"></td>
-		<th align="left" valign="top">{{len .Lines}}</th>
-		<td align="left" width="4"></td>
-		<td align="left">
-		{{range .Lines}}
-			<a href="{{queryLink $file $query_url .}}">{{html .}}</a>
-		{{end}}
-		{{if not $.Complete}}
-			...
-		{{end}}
-		</td>
-		</tr>
-	{{end}}
-	{{if not $.Complete}}
-		<tr><td align="left">...</td></tr>
-	{{end}}
-	</table>
-	</p>
-{{end}}
-`,
-
-	"style.css": `body {
-	margin: 0;
-	font-family: Arial, sans-serif;
-	font-size: 16px;
-	background-color: #fff;
-	line-height: 1.3em;
-}
-pre,
-code {
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-pre {
-	line-height: 1.4em;
-	overflow-x: auto;
-}
-pre .comment {
-	color: #006600;
-}
-pre .highlight,
-pre .highlight-comment,
-pre .selection-highlight,
-pre .selection-highlight-comment {
-	background: #FFFF00;
-}
-pre .selection,
-pre .selection-comment {
-	background: #FF9632;
-}
-pre .ln {
-	color: #999;
-	background: #efefef;
-}
-.ln {
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-.ln::before {
-	/* Inserting the line numbers as a ::before pseudo-element avoids making
-	 * them selectable; it's the trick Github uses as well. */
-	content: attr(data-content);
-}
-body {
-	color: #222;
-}
-a,
-.exampleHeading .text {
-	color: #375EAB;
-	text-decoration: none;
-}
-a:hover,
-.exampleHeading .text:hover {
-	text-decoration: underline;
-}
-.article a {
-	text-decoration: underline;
-}
-.article .title a {
-	text-decoration: none;
-}
-
-.permalink {
-	display: none;
-}
-:hover > .permalink {
-	display: inline;
-}
-
-p, li {
-	max-width: 800px;
-	word-wrap: break-word;
-}
-p,
-pre,
-ul,
-ol {
-	margin: 20px;
-}
-pre {
-	background: #EFEFEF;
-	padding: 10px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-h1,
-h2,
-h3,
-h4,
-.rootHeading {
-	margin: 20px 0 20px;
-	padding: 0;
-	color: #375EAB;
-	font-weight: bold;
-}
-h1 {
-	font-size: 28px;
-	line-height: 1;
-}
-h1 .text-muted {
-	color:#777;
-}
-h2 {
-	font-size: 20px;
-	background: #E0EBF5;
-	padding: 8px;
-	line-height: 1.25;
-	font-weight: normal;
-}
-h2 a {
-	font-weight: bold;
-}
-h3 {
-	font-size: 20px;
-}
-h3,
-h4 {
-	margin: 20px 5px;
-}
-h4 {
-	font-size: 16px;
-}
-.rootHeading {
-	font-size: 20px;
-	margin: 0;
-}
-
-dl {
-	margin: 20px;
-}
-dd {
-	margin: 0 0 0 20px;
-}
-dl,
-dd {
-	font-size: 14px;
-}
-div#nav table td {
-	vertical-align: top;
-}
-
-
-#pkg-index h3 {
-	font-size: 16px;
-}
-.pkg-dir {
-	padding: 0 10px;
-}
-.pkg-dir table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-.pkg-name {
-	padding-right: 10px;
-}
-.alert {
-	color: #AA0000;
-}
-
-.top-heading {
-	float: left;
-	padding: 21px 0;
-	font-size: 20px;
-	font-weight: normal;
-}
-.top-heading a {
-	color: #222;
-	text-decoration: none;
-}
-
-div#topbar {
-	background: #E0EBF5;
-	height: 64px;
-	overflow: hidden;
-}
-
-body {
-	text-align: center;
-}
-div#page {
-	width: 100%;
-}
-div#page > .container,
-div#topbar > .container {
-	text-align: left;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 0 20px;
-}
-div#topbar > .container,
-div#page > .container {
-	max-width: 950px;
-}
-div#page.wide > .container,
-div#topbar.wide > .container {
-	max-width: none;
-}
-div#plusone {
-	float: right;
-	clear: right;
-	margin-top: 5px;
-}
-
-div#footer {
-	text-align: center;
-	color: #666;
-	font-size: 14px;
-	margin: 40px 0;
-}
-
-div#menu > a,
-input#search,
-div#learn .buttons a,
-div.play .buttons a,
-div#blog .read a,
-#menu-button {
-	padding: 10px;
-
-	text-decoration: none;
-	font-size: 16px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-div#playground .buttons a,
-div#menu > a,
-input#search,
-#menu-button {
-	border: 1px solid #375EAB;
-}
-div#playground .buttons a,
-div#menu > a,
-#menu-button {
-	color: white;
-	background: #375EAB;
-}
-#playgroundButton.active {
-	background: white;
-	color: #375EAB;
-}
-a#start,
-div#learn .buttons a,
-div.play .buttons a,
-div#blog .read a {
-	color: #222;
-	border: 1px solid #375EAB;
-	background: #E0EBF5;
-}
-.download {
-	width: 150px;
-}
-
-div#menu {
-	text-align: right;
-	padding: 10px;
-	white-space: nowrap;
-	max-height: 0;
-	-moz-transition: max-height .25s linear;
-	transition: max-height .25s linear;
-	width: 100%;
-}
-div#menu.menu-visible {
-	max-height: 500px;
-}
-div#menu > a,
-#menu-button {
-	margin: 10px 2px;
-	padding: 10px;
-}
-::-webkit-input-placeholder {
-	color: #7f7f7f;
-	opacity: 1;
-}
-::placeholder {
-	color: #7f7f7f;
-	opacity: 1;
-}
-#menu .search-box {
-	display: inline-flex;
-	width: 140px;
-}
-input#search {
-	background: white;
-	color: #222;
-	box-sizing: border-box;
-	-webkit-appearance: none;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-	border-right: 0;
-	margin-right: 0;
-	flex-grow: 1;
-	max-width: 100%;
-	min-width: 90px;
-}
-input#search:-moz-ui-invalid {
-	box-shadow: unset;
-}
-input#search + button {
-	display: inline;
-	font-size: 1em;
-	background-color: #375EAB;
-	color: white;
-	border: 1px solid #375EAB;
-	border-top-right-radius: 5px;
-	border-bottom-right-radius: 5px;
-	margin-left: 0;
-	cursor: pointer;
-}
-input#search + button span {
-	display: flex;
-}
-input#search + button svg {
-	fill: white
-}
-
-#menu-button {
-	display: none;
-	position: absolute;
-	right: 5px;
-	top: 0;
-	margin-right: 5px;
-}
-#menu-button-arrow {
-	display: inline-block;
-}
-.vertical-flip {
-	transform: rotate(-180deg);
-}
-
-div.left {
-	float: left;
-	clear: left;
-	margin-right: 2.5%;
-}
-div.right {
-	float: right;
-	clear: right;
-	margin-left: 2.5%;
-}
-div.left,
-div.right {
-	width: 45%;
-}
-
-div#learn,
-div#about {
-	padding-top: 20px;
-}
-div#learn h2,
-div#about {
-	margin: 0;
-}
-div#about {
-	font-size: 20px;
-	margin: 0 auto 30px;
-}
-div#gopher {
-	background: url(/doc/gopher/frontpage.png) no-repeat;
-	background-position: center top;
-	height: 155px;
-}
-a#start {
-	display: block;
-	padding: 10px;
-
-	text-align: center;
-	text-decoration: none;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-a#start .big {
-	display: block;
-	font-weight: bold;
-	font-size: 20px;
-}
-a#start .desc {
-	display: block;
-	font-size: 14px;
-	font-weight: normal;
-	margin-top: 5px;
-}
-
-div#learn .popout {
-	float: right;
-	display: block;
-	cursor: pointer;
-	font-size: 12px;
-	background: url(/doc/share.png) no-repeat;
-	background-position: right top;
-	padding: 5px 27px;
-}
-div#learn pre,
-div#learn textarea {
-	padding: 0;
-	margin: 0;
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-div#learn .input {
-	padding: 10px;
-	margin-top: 10px;
-	height: 150px;
-
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-	-moz-border-radius-topleft: 5px;
-	-moz-border-radius-topright: 5px;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-}
-div#learn .input textarea {
-	width: 100%;
-	height: 100%;
-	border: none;
-	outline: none;
-	resize: none;
-}
-div#learn .output {
-	border-top: none !important;
-
-	padding: 10px;
-	height: 59px;
-	overflow: auto;
-
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-div#learn .output pre {
-	padding: 0;
-
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-	border-radius: 0;
-}
-div#learn .input,
-div#learn .input textarea,
-div#learn .output,
-div#learn .output pre {
-	background: #FFFFD8;
-}
-div#learn .input,
-div#learn .output {
-	border: 1px solid #375EAB;
-}
-div#learn .buttons {
-	float: right;
-	padding: 20px 0 10px 0;
-	text-align: right;
-}
-div#learn .buttons a {
-	height: 16px;
-	margin-left: 5px;
-	padding: 10px;
-}
-div#learn .toys {
-	margin-top: 8px;
-}
-div#learn .toys select {
-	border: 1px solid #375EAB;
-	margin: 0;
-}
-div#learn .output .exit {
-	display: none;
-}
-
-div#video {
-	max-width: 100%;
-}
-div#blog,
-div#video {
-	margin-top: 40px;
-}
-div#blog > a,
-div#blog > div,
-div#blog > h2,
-div#video > a,
-div#video > div,
-div#video > h2 {
-	margin-bottom: 10px;
-}
-div#blog .title,
-div#video .title {
-	display: block;
-	font-size: 20px;
-}
-div#blog .when {
-	color: #666;
-	font-size: 14px;
-}
-div#blog .read {
-	text-align: right;
-}
-
-.toggleButton { cursor: pointer; }
-.toggle > .collapsed { display: block; }
-.toggle > .expanded { display: none; }
-.toggleVisible > .collapsed { display: none; }
-.toggleVisible > .expanded { display: block; }
-
-table.codetable { margin-left: auto; margin-right: auto; border-style: none; }
-table.codetable td { padding-right: 10px; }
-hr { border-style: none; border-top: 1px solid black; }
-
-img.gopher {
-	float: right;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	z-index: -1;
-}
-h2 { clear: right; }
-
-/* example and drop-down playground */
-div.play {
-	padding: 0 20px 40px 20px;
-}
-div.play pre,
-div.play textarea,
-div.play .lines {
-	padding: 0;
-	margin: 0;
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-div.play .input {
-	padding: 10px;
-	margin-top: 10px;
-
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-	-moz-border-radius-topleft: 5px;
-	-moz-border-radius-topright: 5px;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-
-	overflow: hidden;
-}
-div.play .input textarea {
-	width: 100%;
-	height: 100%;
-	border: none;
-	outline: none;
-	resize: none;
-
-	overflow: hidden;
-}
-div#playground .input textarea {
-	overflow: auto;
-	resize: auto;
-}
-div.play .output {
-	border-top: none !important;
-
-	padding: 10px;
-	max-height: 200px;
-	overflow: auto;
-
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-div.play .output pre {
-	padding: 0;
-
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-	border-radius: 0;
-}
-div.play .input,
-div.play .input textarea,
-div.play .output,
-div.play .output pre {
-	background: #FFFFD8;
-}
-div.play .input,
-div.play .output {
-	border: 1px solid #375EAB;
-}
-div.play .buttons {
-	float: right;
-	padding: 20px 0 10px 0;
-	text-align: right;
-}
-div.play .buttons a {
-	height: 16px;
-	margin-left: 5px;
-	padding: 10px;
-	cursor: pointer;
-}
-.output .stderr {
-	color: #933;
-}
-.output .system {
-	color: #999;
-}
-
-/* drop-down playground */
-#playgroundButton,
-div#playground {
-	/* start hidden; revealed by javascript */
-	display: none;
-}
-div#playground {
-	position: absolute;
-	top: 63px;
-	right: 20px;
-	padding: 0 10px 10px 10px;
-	z-index: 1;
-	text-align: left;
-	background: #E0EBF5;
-
-	border: 1px solid #B0BBC5;
-	border-top: none;
-
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-bottomright: 5px;
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-}
-div#playground .code {
-	width: 520px;
-	height: 200px;
-}
-div#playground .output {
-	height: 100px;
-}
-
-/* Inline runnable snippets (play.js/initPlayground) */
-#content .code pre, #content .playground pre, #content .output pre {
-        margin: 0;
-        padding: 0;
-        background: none;
-        border: none;
-	outline: 0px solid transparent;
-        overflow: auto;
-}
-#content .playground .number, #content .code .number {
-        color: #999;
-}
-#content .code, #content .playground, #content .output {
-	width: auto;
-        margin: 20px;
-        padding: 10px;
-        -webkit-border-radius: 5px;
-        -moz-border-radius: 5px;
-        border-radius: 5px;
-}
-#content .code, #content .playground {
-        background: #e9e9e9;
-}
-#content .output {
-        background: #202020;
-}
-#content .output .stdout, #content .output pre {
-        color: #e6e6e6;
-}
-#content .output .stderr, #content .output .error {
-        color: rgb(244, 74, 63);
-}
-#content .output .system, #content .output .exit {
-        color: rgb(255, 209, 77)
-}
-#content .buttons {
-        position: relative;
-        float: right;
-        top: -50px;
-        right: 30px;
-}
-#content .output .buttons {
-        top: -60px;
-        right: 0;
-        height: 0;
-}
-#content .buttons .kill {
-        display: none;
-        visibility: hidden;
-}
-a.error {
-	font-weight: bold;
-        color: white;
-	background-color: darkred;
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        padding: 2px 4px 2px 4px; /* TRBL */
-}
-
-
-#heading-narrow {
-	display: none;
-}
-
-.downloading {
-	background: #F9F9BE;
-	padding: 10px;
-	text-align: center;
-	border-radius: 5px;
-}
-
-@media (max-width: 930px) {
-	#heading-wide {
-		display: none;
-	}
-	#heading-narrow {
-		display: block;
-	}
-}
-
-
-@media (max-width: 760px) {
-	.container .left,
-	.container .right {
-		width: auto;
-		float: none;
-	}
-
-	div#about {
-		max-width: 500px;
-		text-align: center;
-	}
-}
-
-@media (min-width: 700px) and (max-width: 1000px) {
-	div#menu > a {
-		margin: 5px 0;
-		font-size: 14px;
-	}
-
-	input#search {
-		font-size: 14px;
-	}
-}
-
-@media (max-width: 700px) {
-	body {
-		font-size: 15px;
-	}
-
-	pre,
-	code {
-		font-size: 13px;
-	}
-
-	div#page > .container {
-		padding: 0 10px;
-	}
-
-	div#topbar {
-		height: auto;
-		padding: 10px;
-	}
-
-	div#topbar > .container {
-		padding: 0;
-	}
-
-	#heading-wide {
-		display: block;
-	}
-	#heading-narrow {
-		display: none;
-	}
-
-	.top-heading {
-		float: none;
-		display: inline-block;
-		padding: 12px;
-	}
-
-	div#menu {
-		padding: 0;
-		min-width: 0;
-		text-align: left;
-		float: left;
-	}
-
-	div#menu > a {
-		display: block;
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	#menu .search-box {
-		display: flex;
-		width: 100%;
-	}
-
-	#menu-button {
-		display: inline-block;
-	}
-
-	p,
-	pre,
-	ul,
-	ol {
-		margin: 10px;
-	}
-
-	.pkg-synopsis {
-		display: none;
-	}
-
-	img.gopher {
-		display: none;
-	}
-}
-
-@media (max-width: 480px) {
-	#heading-wide {
-		display: none;
-	}
-	#heading-narrow {
-		display: block;
-	}
-}
-
-@media print {
-	pre {
-		background: #FFF;
-		border: 1px solid #BBB;
-		white-space: pre-wrap;
-	}
-}
-`,
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/static/style.css b/installer/vendor/golang.org/x/tools/godoc/static/style.css
deleted file mode 100644
index 036e4177a4..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/static/style.css
+++ /dev/null
@@ -1,839 +0,0 @@
-body {
-	margin: 0;
-	font-family: Arial, sans-serif;
-	font-size: 16px;
-	background-color: #fff;
-	line-height: 1.3em;
-}
-pre,
-code {
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-pre {
-	line-height: 1.4em;
-	overflow-x: auto;
-}
-pre .comment {
-	color: #006600;
-}
-pre .highlight,
-pre .highlight-comment,
-pre .selection-highlight,
-pre .selection-highlight-comment {
-	background: #FFFF00;
-}
-pre .selection,
-pre .selection-comment {
-	background: #FF9632;
-}
-pre .ln {
-	color: #999;
-	background: #efefef;
-}
-.ln {
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	-ms-user-select: none;
-	user-select: none;
-}
-.ln::before {
-	/* Inserting the line numbers as a ::before pseudo-element avoids making
-	 * them selectable; it's the trick Github uses as well. */
-	content: attr(data-content);
-}
-body {
-	color: #222;
-}
-a,
-.exampleHeading .text {
-	color: #375EAB;
-	text-decoration: none;
-}
-a:hover,
-.exampleHeading .text:hover {
-	text-decoration: underline;
-}
-.article a {
-	text-decoration: underline;
-}
-.article .title a {
-	text-decoration: none;
-}
-
-.permalink {
-	display: none;
-}
-:hover > .permalink {
-	display: inline;
-}
-
-p, li {
-	max-width: 800px;
-	word-wrap: break-word;
-}
-p,
-pre,
-ul,
-ol {
-	margin: 20px;
-}
-pre {
-	background: #EFEFEF;
-	padding: 10px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-
-h1,
-h2,
-h3,
-h4,
-.rootHeading {
-	margin: 20px 0 20px;
-	padding: 0;
-	color: #375EAB;
-	font-weight: bold;
-}
-h1 {
-	font-size: 28px;
-	line-height: 1;
-}
-h1 .text-muted {
-	color:#777;
-}
-h2 {
-	font-size: 20px;
-	background: #E0EBF5;
-	padding: 8px;
-	line-height: 1.25;
-	font-weight: normal;
-}
-h2 a {
-	font-weight: bold;
-}
-h3 {
-	font-size: 20px;
-}
-h3,
-h4 {
-	margin: 20px 5px;
-}
-h4 {
-	font-size: 16px;
-}
-.rootHeading {
-	font-size: 20px;
-	margin: 0;
-}
-
-dl {
-	margin: 20px;
-}
-dd {
-	margin: 0 0 0 20px;
-}
-dl,
-dd {
-	font-size: 14px;
-}
-div#nav table td {
-	vertical-align: top;
-}
-
-
-#pkg-index h3 {
-	font-size: 16px;
-}
-.pkg-dir {
-	padding: 0 10px;
-}
-.pkg-dir table {
-	border-collapse: collapse;
-	border-spacing: 0;
-}
-.pkg-name {
-	padding-right: 10px;
-}
-.alert {
-	color: #AA0000;
-}
-
-.top-heading {
-	float: left;
-	padding: 21px 0;
-	font-size: 20px;
-	font-weight: normal;
-}
-.top-heading a {
-	color: #222;
-	text-decoration: none;
-}
-
-div#topbar {
-	background: #E0EBF5;
-	height: 64px;
-	overflow: hidden;
-}
-
-body {
-	text-align: center;
-}
-div#page {
-	width: 100%;
-}
-div#page > .container,
-div#topbar > .container {
-	text-align: left;
-	margin-left: auto;
-	margin-right: auto;
-	padding: 0 20px;
-}
-div#topbar > .container,
-div#page > .container {
-	max-width: 950px;
-}
-div#page.wide > .container,
-div#topbar.wide > .container {
-	max-width: none;
-}
-div#plusone {
-	float: right;
-	clear: right;
-	margin-top: 5px;
-}
-
-div#footer {
-	text-align: center;
-	color: #666;
-	font-size: 14px;
-	margin: 40px 0;
-}
-
-div#menu > a,
-input#search,
-div#learn .buttons a,
-div.play .buttons a,
-div#blog .read a,
-#menu-button {
-	padding: 10px;
-
-	text-decoration: none;
-	font-size: 16px;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-div#playground .buttons a,
-div#menu > a,
-input#search,
-#menu-button {
-	border: 1px solid #375EAB;
-}
-div#playground .buttons a,
-div#menu > a,
-#menu-button {
-	color: white;
-	background: #375EAB;
-}
-#playgroundButton.active {
-	background: white;
-	color: #375EAB;
-}
-a#start,
-div#learn .buttons a,
-div.play .buttons a,
-div#blog .read a {
-	color: #222;
-	border: 1px solid #375EAB;
-	background: #E0EBF5;
-}
-.download {
-	width: 150px;
-}
-
-div#menu {
-	text-align: right;
-	padding: 10px;
-	white-space: nowrap;
-	max-height: 0;
-	-moz-transition: max-height .25s linear;
-	transition: max-height .25s linear;
-	width: 100%;
-}
-div#menu.menu-visible {
-	max-height: 500px;
-}
-div#menu > a,
-#menu-button {
-	margin: 10px 2px;
-	padding: 10px;
-}
-::-webkit-input-placeholder {
-	color: #7f7f7f;
-	opacity: 1;
-}
-::placeholder {
-	color: #7f7f7f;
-	opacity: 1;
-}
-#menu .search-box {
-	display: inline-flex;
-	width: 140px;
-}
-input#search {
-	background: white;
-	color: #222;
-	box-sizing: border-box;
-	-webkit-appearance: none;
-	border-top-right-radius: 0;
-	border-bottom-right-radius: 0;
-	border-right: 0;
-	margin-right: 0;
-	flex-grow: 1;
-	max-width: 100%;
-	min-width: 90px;
-}
-input#search:-moz-ui-invalid {
-	box-shadow: unset;
-}
-input#search + button {
-	display: inline;
-	font-size: 1em;
-	background-color: #375EAB;
-	color: white;
-	border: 1px solid #375EAB;
-	border-top-right-radius: 5px;
-	border-bottom-right-radius: 5px;
-	margin-left: 0;
-	cursor: pointer;
-}
-input#search + button span {
-	display: flex;
-}
-input#search + button svg {
-	fill: white
-}
-
-#menu-button {
-	display: none;
-	position: absolute;
-	right: 5px;
-	top: 0;
-	margin-right: 5px;
-}
-#menu-button-arrow {
-	display: inline-block;
-}
-.vertical-flip {
-	transform: rotate(-180deg);
-}
-
-div.left {
-	float: left;
-	clear: left;
-	margin-right: 2.5%;
-}
-div.right {
-	float: right;
-	clear: right;
-	margin-left: 2.5%;
-}
-div.left,
-div.right {
-	width: 45%;
-}
-
-div#learn,
-div#about {
-	padding-top: 20px;
-}
-div#learn h2,
-div#about {
-	margin: 0;
-}
-div#about {
-	font-size: 20px;
-	margin: 0 auto 30px;
-}
-div#gopher {
-	background: url(/doc/gopher/frontpage.png) no-repeat;
-	background-position: center top;
-	height: 155px;
-}
-a#start {
-	display: block;
-	padding: 10px;
-
-	text-align: center;
-	text-decoration: none;
-
-	-webkit-border-radius: 5px;
-	-moz-border-radius: 5px;
-	border-radius: 5px;
-}
-a#start .big {
-	display: block;
-	font-weight: bold;
-	font-size: 20px;
-}
-a#start .desc {
-	display: block;
-	font-size: 14px;
-	font-weight: normal;
-	margin-top: 5px;
-}
-
-div#learn .popout {
-	float: right;
-	display: block;
-	cursor: pointer;
-	font-size: 12px;
-	background: url(/doc/share.png) no-repeat;
-	background-position: right top;
-	padding: 5px 27px;
-}
-div#learn pre,
-div#learn textarea {
-	padding: 0;
-	margin: 0;
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-div#learn .input {
-	padding: 10px;
-	margin-top: 10px;
-	height: 150px;
-
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-	-moz-border-radius-topleft: 5px;
-	-moz-border-radius-topright: 5px;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-}
-div#learn .input textarea {
-	width: 100%;
-	height: 100%;
-	border: none;
-	outline: none;
-	resize: none;
-}
-div#learn .output {
-	border-top: none !important;
-
-	padding: 10px;
-	height: 59px;
-	overflow: auto;
-
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-div#learn .output pre {
-	padding: 0;
-
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-	border-radius: 0;
-}
-div#learn .input,
-div#learn .input textarea,
-div#learn .output,
-div#learn .output pre {
-	background: #FFFFD8;
-}
-div#learn .input,
-div#learn .output {
-	border: 1px solid #375EAB;
-}
-div#learn .buttons {
-	float: right;
-	padding: 20px 0 10px 0;
-	text-align: right;
-}
-div#learn .buttons a {
-	height: 16px;
-	margin-left: 5px;
-	padding: 10px;
-}
-div#learn .toys {
-	margin-top: 8px;
-}
-div#learn .toys select {
-	border: 1px solid #375EAB;
-	margin: 0;
-}
-div#learn .output .exit {
-	display: none;
-}
-
-div#video {
-	max-width: 100%;
-}
-div#blog,
-div#video {
-	margin-top: 40px;
-}
-div#blog > a,
-div#blog > div,
-div#blog > h2,
-div#video > a,
-div#video > div,
-div#video > h2 {
-	margin-bottom: 10px;
-}
-div#blog .title,
-div#video .title {
-	display: block;
-	font-size: 20px;
-}
-div#blog .when {
-	color: #666;
-	font-size: 14px;
-}
-div#blog .read {
-	text-align: right;
-}
-
-.toggleButton { cursor: pointer; }
-.toggle > .collapsed { display: block; }
-.toggle > .expanded { display: none; }
-.toggleVisible > .collapsed { display: none; }
-.toggleVisible > .expanded { display: block; }
-
-table.codetable { margin-left: auto; margin-right: auto; border-style: none; }
-table.codetable td { padding-right: 10px; }
-hr { border-style: none; border-top: 1px solid black; }
-
-img.gopher {
-	float: right;
-	margin-left: 10px;
-	margin-bottom: 10px;
-	z-index: -1;
-}
-h2 { clear: right; }
-
-/* example and drop-down playground */
-div.play {
-	padding: 0 20px 40px 20px;
-}
-div.play pre,
-div.play textarea,
-div.play .lines {
-	padding: 0;
-	margin: 0;
-	font-family: Menlo, monospace;
-	font-size: 14px;
-}
-div.play .input {
-	padding: 10px;
-	margin-top: 10px;
-
-	-webkit-border-top-left-radius: 5px;
-	-webkit-border-top-right-radius: 5px;
-	-moz-border-radius-topleft: 5px;
-	-moz-border-radius-topright: 5px;
-	border-top-left-radius: 5px;
-	border-top-right-radius: 5px;
-
-	overflow: hidden;
-}
-div.play .input textarea {
-	width: 100%;
-	height: 100%;
-	border: none;
-	outline: none;
-	resize: none;
-
-	overflow: hidden;
-}
-div#playground .input textarea {
-	overflow: auto;
-	resize: auto;
-}
-div.play .output {
-	border-top: none !important;
-
-	padding: 10px;
-	max-height: 200px;
-	overflow: auto;
-
-	-webkit-border-bottom-right-radius: 5px;
-	-webkit-border-bottom-left-radius: 5px;
-	-moz-border-radius-bottomright: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	border-bottom-right-radius: 5px;
-	border-bottom-left-radius: 5px;
-}
-div.play .output pre {
-	padding: 0;
-
-	-webkit-border-radius: 0;
-	-moz-border-radius: 0;
-	border-radius: 0;
-}
-div.play .input,
-div.play .input textarea,
-div.play .output,
-div.play .output pre {
-	background: #FFFFD8;
-}
-div.play .input,
-div.play .output {
-	border: 1px solid #375EAB;
-}
-div.play .buttons {
-	float: right;
-	padding: 20px 0 10px 0;
-	text-align: right;
-}
-div.play .buttons a {
-	height: 16px;
-	margin-left: 5px;
-	padding: 10px;
-	cursor: pointer;
-}
-.output .stderr {
-	color: #933;
-}
-.output .system {
-	color: #999;
-}
-
-/* drop-down playground */
-#playgroundButton,
-div#playground {
-	/* start hidden; revealed by javascript */
-	display: none;
-}
-div#playground {
-	position: absolute;
-	top: 63px;
-	right: 20px;
-	padding: 0 10px 10px 10px;
-	z-index: 1;
-	text-align: left;
-	background: #E0EBF5;
-
-	border: 1px solid #B0BBC5;
-	border-top: none;
-
-	-webkit-border-bottom-left-radius: 5px;
-	-webkit-border-bottom-right-radius: 5px;
-	-moz-border-radius-bottomleft: 5px;
-	-moz-border-radius-bottomright: 5px;
-	border-bottom-left-radius: 5px;
-	border-bottom-right-radius: 5px;
-}
-div#playground .code {
-	width: 520px;
-	height: 200px;
-}
-div#playground .output {
-	height: 100px;
-}
-
-/* Inline runnable snippets (play.js/initPlayground) */
-#content .code pre, #content .playground pre, #content .output pre {
-        margin: 0;
-        padding: 0;
-        background: none;
-        border: none;
-	outline: 0px solid transparent;
-        overflow: auto;
-}
-#content .playground .number, #content .code .number {
-        color: #999;
-}
-#content .code, #content .playground, #content .output {
-	width: auto;
-        margin: 20px;
-        padding: 10px;
-        -webkit-border-radius: 5px;
-        -moz-border-radius: 5px;
-        border-radius: 5px;
-}
-#content .code, #content .playground {
-        background: #e9e9e9;
-}
-#content .output {
-        background: #202020;
-}
-#content .output .stdout, #content .output pre {
-        color: #e6e6e6;
-}
-#content .output .stderr, #content .output .error {
-        color: rgb(244, 74, 63);
-}
-#content .output .system, #content .output .exit {
-        color: rgb(255, 209, 77)
-}
-#content .buttons {
-        position: relative;
-        float: right;
-        top: -50px;
-        right: 30px;
-}
-#content .output .buttons {
-        top: -60px;
-        right: 0;
-        height: 0;
-}
-#content .buttons .kill {
-        display: none;
-        visibility: hidden;
-}
-a.error {
-	font-weight: bold;
-        color: white;
-	background-color: darkred;
-        border-bottom-left-radius: 4px;
-        border-bottom-right-radius: 4px;
-        border-top-left-radius: 4px;
-        border-top-right-radius: 4px;
-        padding: 2px 4px 2px 4px; /* TRBL */
-}
-
-
-#heading-narrow {
-	display: none;
-}
-
-.downloading {
-	background: #F9F9BE;
-	padding: 10px;
-	text-align: center;
-	border-radius: 5px;
-}
-
-@media (max-width: 930px) {
-	#heading-wide {
-		display: none;
-	}
-	#heading-narrow {
-		display: block;
-	}
-}
-
-
-@media (max-width: 760px) {
-	.container .left,
-	.container .right {
-		width: auto;
-		float: none;
-	}
-
-	div#about {
-		max-width: 500px;
-		text-align: center;
-	}
-}
-
-@media (min-width: 700px) and (max-width: 1000px) {
-	div#menu > a {
-		margin: 5px 0;
-		font-size: 14px;
-	}
-
-	input#search {
-		font-size: 14px;
-	}
-}
-
-@media (max-width: 700px) {
-	body {
-		font-size: 15px;
-	}
-
-	pre,
-	code {
-		font-size: 13px;
-	}
-
-	div#page > .container {
-		padding: 0 10px;
-	}
-
-	div#topbar {
-		height: auto;
-		padding: 10px;
-	}
-
-	div#topbar > .container {
-		padding: 0;
-	}
-
-	#heading-wide {
-		display: block;
-	}
-	#heading-narrow {
-		display: none;
-	}
-
-	.top-heading {
-		float: none;
-		display: inline-block;
-		padding: 12px;
-	}
-
-	div#menu {
-		padding: 0;
-		min-width: 0;
-		text-align: left;
-		float: left;
-	}
-
-	div#menu > a {
-		display: block;
-		margin-left: 0;
-		margin-right: 0;
-	}
-
-	#menu .search-box {
-		display: flex;
-		width: 100%;
-	}
-
-	#menu-button {
-		display: inline-block;
-	}
-
-	p,
-	pre,
-	ul,
-	ol {
-		margin: 10px;
-	}
-
-	.pkg-synopsis {
-		display: none;
-	}
-
-	img.gopher {
-		display: none;
-	}
-}
-
-@media (max-width: 480px) {
-	#heading-wide {
-		display: none;
-	}
-	#heading-narrow {
-		display: block;
-	}
-}
-
-@media print {
-	pre {
-		background: #FFF;
-		border: 1px solid #BBB;
-		white-space: pre-wrap;
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/tab.go b/installer/vendor/golang.org/x/tools/godoc/tab.go
deleted file mode 100644
index d314ac7224..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/tab.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// TODO(bradfitz,adg): move to util
-
-package godoc
-
-import "io"
-
-var spaces = []byte("                                ") // 32 spaces seems like a good number
-
-const (
-	indenting = iota
-	collecting
-)
-
-// A tconv is an io.Writer filter for converting leading tabs into spaces.
-type tconv struct {
-	output io.Writer
-	state  int // indenting or collecting
-	indent int // valid if state == indenting
-	p      *Presentation
-}
-
-func (p *tconv) writeIndent() (err error) {
-	i := p.indent
-	for i >= len(spaces) {
-		i -= len(spaces)
-		if _, err = p.output.Write(spaces); err != nil {
-			return
-		}
-	}
-	// i < len(spaces)
-	if i > 0 {
-		_, err = p.output.Write(spaces[0:i])
-	}
-	return
-}
-
-func (p *tconv) Write(data []byte) (n int, err error) {
-	if len(data) == 0 {
-		return
-	}
-	pos := 0 // valid if p.state == collecting
-	var b byte
-	for n, b = range data {
-		switch p.state {
-		case indenting:
-			switch b {
-			case '\t':
-				p.indent += p.p.TabWidth
-			case '\n':
-				p.indent = 0
-				if _, err = p.output.Write(data[n : n+1]); err != nil {
-					return
-				}
-			case ' ':
-				p.indent++
-			default:
-				p.state = collecting
-				pos = n
-				if err = p.writeIndent(); err != nil {
-					return
-				}
-			}
-		case collecting:
-			if b == '\n' {
-				p.state = indenting
-				p.indent = 0
-				if _, err = p.output.Write(data[pos : n+1]); err != nil {
-					return
-				}
-			}
-		}
-	}
-	n = len(data)
-	if pos < n && p.state == collecting {
-		_, err = p.output.Write(data[pos:])
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/template.go b/installer/vendor/golang.org/x/tools/godoc/template.go
deleted file mode 100644
index eda5874d0f..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/template.go
+++ /dev/null
@@ -1,179 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Template support for writing HTML documents.
-// Documents that include Template: true in their
-// metadata are executed as input to text/template.
-//
-// This file defines functions for those templates to invoke.
-
-// The template uses the function "code" to inject program
-// source into the output by extracting code from files and
-// injecting them as HTML-escaped <pre> blocks.
-//
-// The syntax is simple: 1, 2, or 3 space-separated arguments:
-//
-// Whole file:
-//	{{code "foo.go"}}
-// One line (here the signature of main):
-//	{{code "foo.go" `/^func.main/`}}
-// Block of text, determined by start and end (here the body of main):
-//	{{code "foo.go" `/^func.main/` `/^}/`
-//
-// Patterns can be `/regular expression/`, a decimal number, or "$"
-// to signify the end of the file. In multi-line matches,
-// lines that end with the four characters
-//	OMIT
-// are omitted from the output, making it easy to provide marker
-// lines in the input that will not appear in the output but are easy
-// to identify by pattern.
-
-package godoc
-
-import (
-	"bytes"
-	"fmt"
-	"log"
-	"regexp"
-	"strings"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// Functions in this file panic on error, but the panic is recovered
-// to an error by 'code'.
-
-// contents reads and returns the content of the named file
-// (from the virtual file system, so for example /doc refers to $GOROOT/doc).
-func (c *Corpus) contents(name string) string {
-	file, err := vfs.ReadFile(c.fs, name)
-	if err != nil {
-		log.Panic(err)
-	}
-	return string(file)
-}
-
-// stringFor returns a textual representation of the arg, formatted according to its nature.
-func stringFor(arg interface{}) string {
-	switch arg := arg.(type) {
-	case int:
-		return fmt.Sprintf("%d", arg)
-	case string:
-		if len(arg) > 2 && arg[0] == '/' && arg[len(arg)-1] == '/' {
-			return fmt.Sprintf("%#q", arg)
-		}
-		return fmt.Sprintf("%q", arg)
-	default:
-		log.Panicf("unrecognized argument: %v type %T", arg, arg)
-	}
-	return ""
-}
-
-func (p *Presentation) code(file string, arg ...interface{}) (s string, err error) {
-	defer func() {
-		if r := recover(); r != nil {
-			err = fmt.Errorf("%v", r)
-		}
-	}()
-
-	text := p.Corpus.contents(file)
-	var command string
-	switch len(arg) {
-	case 0:
-		// text is already whole file.
-		command = fmt.Sprintf("code %q", file)
-	case 1:
-		command = fmt.Sprintf("code %q %s", file, stringFor(arg[0]))
-		text = p.Corpus.oneLine(file, text, arg[0])
-	case 2:
-		command = fmt.Sprintf("code %q %s %s", file, stringFor(arg[0]), stringFor(arg[1]))
-		text = p.Corpus.multipleLines(file, text, arg[0], arg[1])
-	default:
-		return "", fmt.Errorf("incorrect code invocation: code %q %q", file, arg)
-	}
-	// Trim spaces from output.
-	text = strings.Trim(text, "\n")
-	// Replace tabs by spaces, which work better in HTML.
-	text = strings.Replace(text, "\t", "    ", -1)
-	var buf bytes.Buffer
-	// HTML-escape text and syntax-color comments like elsewhere.
-	FormatText(&buf, []byte(text), -1, true, "", nil)
-	// Include the command as a comment.
-	text = fmt.Sprintf("<pre><!--{{%s}}\n-->%s</pre>", command, buf.Bytes())
-	return text, nil
-}
-
-// parseArg returns the integer or string value of the argument and tells which it is.
-func parseArg(arg interface{}, file string, max int) (ival int, sval string, isInt bool) {
-	switch n := arg.(type) {
-	case int:
-		if n <= 0 || n > max {
-			log.Panicf("%q:%d is out of range", file, n)
-		}
-		return n, "", true
-	case string:
-		return 0, n, false
-	}
-	log.Panicf("unrecognized argument %v type %T", arg, arg)
-	return
-}
-
-// oneLine returns the single line generated by a two-argument code invocation.
-func (c *Corpus) oneLine(file, text string, arg interface{}) string {
-	lines := strings.SplitAfter(c.contents(file), "\n")
-	line, pattern, isInt := parseArg(arg, file, len(lines))
-	if isInt {
-		return lines[line-1]
-	}
-	return lines[match(file, 0, lines, pattern)-1]
-}
-
-// multipleLines returns the text generated by a three-argument code invocation.
-func (c *Corpus) multipleLines(file, text string, arg1, arg2 interface{}) string {
-	lines := strings.SplitAfter(c.contents(file), "\n")
-	line1, pattern1, isInt1 := parseArg(arg1, file, len(lines))
-	line2, pattern2, isInt2 := parseArg(arg2, file, len(lines))
-	if !isInt1 {
-		line1 = match(file, 0, lines, pattern1)
-	}
-	if !isInt2 {
-		line2 = match(file, line1, lines, pattern2)
-	} else if line2 < line1 {
-		log.Panicf("lines out of order for %q: %d %d", text, line1, line2)
-	}
-	for k := line1 - 1; k < line2; k++ {
-		if strings.HasSuffix(lines[k], "OMIT\n") {
-			lines[k] = ""
-		}
-	}
-	return strings.Join(lines[line1-1:line2], "")
-}
-
-// match identifies the input line that matches the pattern in a code invocation.
-// If start>0, match lines starting there rather than at the beginning.
-// The return value is 1-indexed.
-func match(file string, start int, lines []string, pattern string) int {
-	// $ matches the end of the file.
-	if pattern == "$" {
-		if len(lines) == 0 {
-			log.Panicf("%q: empty file", file)
-		}
-		return len(lines)
-	}
-	// /regexp/ matches the line that matches the regexp.
-	if len(pattern) > 2 && pattern[0] == '/' && pattern[len(pattern)-1] == '/' {
-		re, err := regexp.Compile(pattern[1 : len(pattern)-1])
-		if err != nil {
-			log.Panic(err)
-		}
-		for i := start; i < len(lines); i++ {
-			if re.MatchString(lines[i]) {
-				return i + 1
-			}
-		}
-		log.Panicf("%s: no match for %#q", file, pattern)
-	}
-	log.Panicf("unrecognized pattern: %q", pattern)
-	return 0
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/util/throttle.go b/installer/vendor/golang.org/x/tools/godoc/util/throttle.go
deleted file mode 100644
index 53d9ba621e..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/util/throttle.go
+++ /dev/null
@@ -1,88 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package util
-
-import "time"
-
-// A Throttle permits throttling of a goroutine by
-// calling the Throttle method repeatedly.
-//
-type Throttle struct {
-	f  float64       // f = (1-r)/r for 0 < r < 1
-	dt time.Duration // minimum run time slice; >= 0
-	tr time.Duration // accumulated time running
-	ts time.Duration // accumulated time stopped
-	tt time.Time     // earliest throttle time (= time Throttle returned + tm)
-}
-
-// NewThrottle creates a new Throttle with a throttle value r and
-// a minimum allocated run time slice of dt:
-//
-//	r == 0: "empty" throttle; the goroutine is always sleeping
-//	r == 1: full throttle; the goroutine is never sleeping
-//
-// A value of r == 0.6 throttles a goroutine such that it runs
-// approx. 60% of the time, and sleeps approx. 40% of the time.
-// Values of r < 0 or r > 1 are clamped down to values between 0 and 1.
-// Values of dt < 0 are set to 0.
-//
-func NewThrottle(r float64, dt time.Duration) *Throttle {
-	var f float64
-	switch {
-	case r <= 0:
-		f = -1 // indicates always sleep
-	case r >= 1:
-		f = 0 // assume r == 1 (never sleep)
-	default:
-		// 0 < r < 1
-		f = (1 - r) / r
-	}
-	if dt < 0 {
-		dt = 0
-	}
-	return &Throttle{f: f, dt: dt, tt: time.Now().Add(dt)}
-}
-
-// Throttle calls time.Sleep such that over time the ratio tr/ts between
-// accumulated run (tr) and sleep times (ts) approximates the value 1/(1-r)
-// where r is the throttle value. Throttle returns immediately (w/o sleeping)
-// if less than tm ns have passed since the last call to Throttle.
-//
-func (p *Throttle) Throttle() {
-	if p.f < 0 {
-		select {} // always sleep
-	}
-
-	t0 := time.Now()
-	if t0.Before(p.tt) {
-		return // keep running (minimum time slice not exhausted yet)
-	}
-
-	// accumulate running time
-	p.tr += t0.Sub(p.tt) + p.dt
-
-	// compute sleep time
-	// Over time we want:
-	//
-	//	tr/ts = r/(1-r)
-	//
-	// Thus:
-	//
-	//	ts = tr*f with f = (1-r)/r
-	//
-	// After some incremental run time δr added to the total run time
-	// tr, the incremental sleep-time δs to get to the same ratio again
-	// after waking up from time.Sleep is:
-	if δs := time.Duration(float64(p.tr)*p.f) - p.ts; δs > 0 {
-		time.Sleep(δs)
-	}
-
-	// accumulate (actual) sleep time
-	t1 := time.Now()
-	p.ts += t1.Sub(t0)
-
-	// set earliest next throttle time
-	p.tt = t1.Add(p.dt)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/util/util.go b/installer/vendor/golang.org/x/tools/godoc/util/util.go
deleted file mode 100644
index feedb7688a..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/util/util.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package util contains utility types and functions for godoc.
-package util // import "golang.org/x/tools/godoc/util"
-
-import (
-	pathpkg "path"
-	"sync"
-	"time"
-	"unicode/utf8"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// An RWValue wraps a value and permits mutually exclusive
-// access to it and records the time the value was last set.
-type RWValue struct {
-	mutex     sync.RWMutex
-	value     interface{}
-	timestamp time.Time // time of last set()
-}
-
-func (v *RWValue) Set(value interface{}) {
-	v.mutex.Lock()
-	v.value = value
-	v.timestamp = time.Now()
-	v.mutex.Unlock()
-}
-
-func (v *RWValue) Get() (interface{}, time.Time) {
-	v.mutex.RLock()
-	defer v.mutex.RUnlock()
-	return v.value, v.timestamp
-}
-
-// IsText reports whether a significant prefix of s looks like correct UTF-8;
-// that is, if it is likely that s is human-readable text.
-func IsText(s []byte) bool {
-	const max = 1024 // at least utf8.UTFMax
-	if len(s) > max {
-		s = s[0:max]
-	}
-	for i, c := range string(s) {
-		if i+utf8.UTFMax > len(s) {
-			// last char may be incomplete - ignore
-			break
-		}
-		if c == 0xFFFD || c < ' ' && c != '\n' && c != '\t' && c != '\f' {
-			// decoding error or control character - not a text file
-			return false
-		}
-	}
-	return true
-}
-
-// textExt[x] is true if the extension x indicates a text file, and false otherwise.
-var textExt = map[string]bool{
-	".css": false, // must be served raw
-	".js":  false, // must be served raw
-}
-
-// IsTextFile reports whether the file has a known extension indicating
-// a text file, or if a significant chunk of the specified file looks like
-// correct UTF-8; that is, if it is likely that the file contains human-
-// readable text.
-func IsTextFile(fs vfs.Opener, filename string) bool {
-	// if the extension is known, use it for decision making
-	if isText, found := textExt[pathpkg.Ext(filename)]; found {
-		return isText
-	}
-
-	// the extension is not known; read an initial chunk
-	// of the file and check if it looks like text
-	f, err := fs.Open(filename)
-	if err != nil {
-		return false
-	}
-	defer f.Close()
-
-	var buf [1024]byte
-	n, err := f.Read(buf[0:])
-	if err != nil {
-		return false
-	}
-
-	return IsText(buf[0:n])
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs.go
deleted file mode 100644
index 01b6942f0a..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs.go
+++ /dev/null
@@ -1,85 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vfs
-
-import (
-	"fmt"
-	"os"
-	"time"
-)
-
-// NewNameSpace returns a NameSpace pre-initialized with an empty
-// emulated directory mounted on the root mount point "/". This
-// allows directory traversal routines to work properly even if
-// a folder is not explicitly mounted at root by the user.
-func NewNameSpace() NameSpace {
-	ns := NameSpace{}
-	ns.Bind("/", &emptyVFS{}, "/", BindReplace)
-	return ns
-}
-
-// type emptyVFS emulates a FileSystem consisting of an empty directory
-type emptyVFS struct{}
-
-// Open implements Opener. Since emptyVFS is an empty directory, all
-// attempts to open a file should returns errors.
-func (e *emptyVFS) Open(path string) (ReadSeekCloser, error) {
-	if path == "/" {
-		return nil, fmt.Errorf("open: / is a directory")
-	}
-	return nil, os.ErrNotExist
-}
-
-// Stat returns os.FileInfo  for an empty directory if the path is
-// is root "/" or error. os.FileInfo is implemented by emptyVFS
-func (e *emptyVFS) Stat(path string) (os.FileInfo, error) {
-	if path == "/" {
-		return e, nil
-	}
-	return nil, os.ErrNotExist
-}
-
-func (e *emptyVFS) Lstat(path string) (os.FileInfo, error) {
-	return e.Stat(path)
-}
-
-// ReadDir returns an empty os.FileInfo slice for "/", else error.
-func (e *emptyVFS) ReadDir(path string) ([]os.FileInfo, error) {
-	if path == "/" {
-		return []os.FileInfo{}, nil
-	}
-	return nil, os.ErrNotExist
-}
-
-func (e *emptyVFS) String() string {
-	return "emptyVFS(/)"
-}
-
-// These functions below implement os.FileInfo for the single
-// empty emulated directory.
-
-func (e *emptyVFS) Name() string {
-	return "/"
-}
-
-func (e *emptyVFS) Size() int64 {
-	return 0
-}
-
-func (e *emptyVFS) Mode() os.FileMode {
-	return os.ModeDir | os.ModePerm
-}
-
-func (e *emptyVFS) ModTime() time.Time {
-	return time.Time{}
-}
-
-func (e *emptyVFS) IsDir() bool {
-	return true
-}
-
-func (e *emptyVFS) Sys() interface{} {
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs_test.go b/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs_test.go
deleted file mode 100644
index 8ea9b01646..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/emptyvfs_test.go
+++ /dev/null
@@ -1,58 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vfs_test
-
-import (
-	"testing"
-	"time"
-
-	"golang.org/x/tools/godoc/vfs"
-	"golang.org/x/tools/godoc/vfs/mapfs"
-)
-
-func TestNewNameSpace(t *testing.T) {
-
-	// We will mount this filesystem under /fs1
-	mount := mapfs.New(map[string]string{"fs1file": "abcdefgh"})
-
-	// Existing process. This should give error on Stat("/")
-	t1 := vfs.NameSpace{}
-	t1.Bind("/fs1", mount, "/", vfs.BindReplace)
-
-	// using NewNameSpace. This should work fine.
-	t2 := vfs.NewNameSpace()
-	t2.Bind("/fs1", mount, "/", vfs.BindReplace)
-
-	testcases := map[string][]bool{
-		"/":            {false, true},
-		"/fs1":         {true, true},
-		"/fs1/fs1file": {true, true},
-	}
-
-	fss := []vfs.FileSystem{t1, t2}
-
-	for j, fs := range fss {
-		for k, v := range testcases {
-			_, err := fs.Stat(k)
-			result := err == nil
-			if result != v[j] {
-				t.Errorf("fs: %d, testcase: %s, want: %v, got: %v, err: %s", j, k, v[j], result, err)
-			}
-		}
-	}
-
-	fi, err := t2.Stat("/")
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if fi.Name() != "/" {
-		t.Errorf("t2.Name() : want:%s got:%s", "/", fi.Name())
-	}
-
-	if !fi.ModTime().IsZero() {
-		t.Errorf("t2.Modime() : want:%v got:%v", time.Time{}, fi.ModTime())
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/gatefs/gatefs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/gatefs/gatefs.go
deleted file mode 100644
index 7045a5cadd..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/gatefs/gatefs.go
+++ /dev/null
@@ -1,89 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package gatefs provides an implementation of the FileSystem
-// interface that wraps another FileSystem and limits its concurrency.
-package gatefs // import "golang.org/x/tools/godoc/vfs/gatefs"
-
-import (
-	"fmt"
-	"os"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// New returns a new FileSystem that delegates to fs.
-// If gateCh is non-nil and buffered, it's used as a gate
-// to limit concurrency on calls to fs.
-func New(fs vfs.FileSystem, gateCh chan bool) vfs.FileSystem {
-	if cap(gateCh) == 0 {
-		return fs
-	}
-	return gatefs{fs, gate(gateCh)}
-}
-
-type gate chan bool
-
-func (g gate) enter() { g <- true }
-func (g gate) leave() { <-g }
-
-type gatefs struct {
-	fs vfs.FileSystem
-	gate
-}
-
-func (fs gatefs) String() string {
-	return fmt.Sprintf("gated(%s, %d)", fs.fs.String(), cap(fs.gate))
-}
-
-func (fs gatefs) Open(p string) (vfs.ReadSeekCloser, error) {
-	fs.enter()
-	defer fs.leave()
-	rsc, err := fs.fs.Open(p)
-	if err != nil {
-		return nil, err
-	}
-	return gatef{rsc, fs.gate}, nil
-}
-
-func (fs gatefs) Lstat(p string) (os.FileInfo, error) {
-	fs.enter()
-	defer fs.leave()
-	return fs.fs.Lstat(p)
-}
-
-func (fs gatefs) Stat(p string) (os.FileInfo, error) {
-	fs.enter()
-	defer fs.leave()
-	return fs.fs.Stat(p)
-}
-
-func (fs gatefs) ReadDir(p string) ([]os.FileInfo, error) {
-	fs.enter()
-	defer fs.leave()
-	return fs.fs.ReadDir(p)
-}
-
-type gatef struct {
-	rsc vfs.ReadSeekCloser
-	gate
-}
-
-func (f gatef) Read(p []byte) (n int, err error) {
-	f.enter()
-	defer f.leave()
-	return f.rsc.Read(p)
-}
-
-func (f gatef) Seek(offset int64, whence int) (ret int64, err error) {
-	f.enter()
-	defer f.leave()
-	return f.rsc.Seek(offset, whence)
-}
-
-func (f gatef) Close() error {
-	f.enter()
-	defer f.leave()
-	return f.rsc.Close()
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/httpfs/httpfs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/httpfs/httpfs.go
deleted file mode 100644
index f232f03ffd..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/httpfs/httpfs.go
+++ /dev/null
@@ -1,94 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package httpfs implements http.FileSystem using a godoc vfs.FileSystem.
-package httpfs // import "golang.org/x/tools/godoc/vfs/httpfs"
-
-import (
-	"fmt"
-	"io"
-	"net/http"
-	"os"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-func New(fs vfs.FileSystem) http.FileSystem {
-	return &httpFS{fs}
-}
-
-type httpFS struct {
-	fs vfs.FileSystem
-}
-
-func (h *httpFS) Open(name string) (http.File, error) {
-	fi, err := h.fs.Stat(name)
-	if err != nil {
-		return nil, err
-	}
-	if fi.IsDir() {
-		return &httpDir{h.fs, name, nil}, nil
-	}
-	f, err := h.fs.Open(name)
-	if err != nil {
-		return nil, err
-	}
-	return &httpFile{h.fs, f, name}, nil
-}
-
-// httpDir implements http.File for a directory in a FileSystem.
-type httpDir struct {
-	fs      vfs.FileSystem
-	name    string
-	pending []os.FileInfo
-}
-
-func (h *httpDir) Close() error               { return nil }
-func (h *httpDir) Stat() (os.FileInfo, error) { return h.fs.Stat(h.name) }
-func (h *httpDir) Read([]byte) (int, error) {
-	return 0, fmt.Errorf("cannot Read from directory %s", h.name)
-}
-
-func (h *httpDir) Seek(offset int64, whence int) (int64, error) {
-	if offset == 0 && whence == 0 {
-		h.pending = nil
-		return 0, nil
-	}
-	return 0, fmt.Errorf("unsupported Seek in directory %s", h.name)
-}
-
-func (h *httpDir) Readdir(count int) ([]os.FileInfo, error) {
-	if h.pending == nil {
-		d, err := h.fs.ReadDir(h.name)
-		if err != nil {
-			return nil, err
-		}
-		if d == nil {
-			d = []os.FileInfo{} // not nil
-		}
-		h.pending = d
-	}
-
-	if len(h.pending) == 0 && count > 0 {
-		return nil, io.EOF
-	}
-	if count <= 0 || count > len(h.pending) {
-		count = len(h.pending)
-	}
-	d := h.pending[:count]
-	h.pending = h.pending[count:]
-	return d, nil
-}
-
-// httpFile implements http.File for a file (not directory) in a FileSystem.
-type httpFile struct {
-	fs vfs.FileSystem
-	vfs.ReadSeekCloser
-	name string
-}
-
-func (h *httpFile) Stat() (os.FileInfo, error) { return h.fs.Stat(h.name) }
-func (h *httpFile) Readdir(int) ([]os.FileInfo, error) {
-	return nil, fmt.Errorf("cannot Readdir from file %s", h.name)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs.go
deleted file mode 100644
index 660b1ca787..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs.go
+++ /dev/null
@@ -1,152 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package mapfs file provides an implementation of the FileSystem
-// interface based on the contents of a map[string]string.
-package mapfs // import "golang.org/x/tools/godoc/vfs/mapfs"
-
-import (
-	"io"
-	"os"
-	pathpkg "path"
-	"sort"
-	"strings"
-	"time"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// New returns a new FileSystem from the provided map.
-// Map keys should be forward slash-separated pathnames
-// and not contain a leading slash.
-func New(m map[string]string) vfs.FileSystem {
-	return mapFS(m)
-}
-
-// mapFS is the map based implementation of FileSystem
-type mapFS map[string]string
-
-func (fs mapFS) String() string { return "mapfs" }
-
-func (fs mapFS) Close() error { return nil }
-
-func filename(p string) string {
-	return strings.TrimPrefix(p, "/")
-}
-
-func (fs mapFS) Open(p string) (vfs.ReadSeekCloser, error) {
-	b, ok := fs[filename(p)]
-	if !ok {
-		return nil, os.ErrNotExist
-	}
-	return nopCloser{strings.NewReader(b)}, nil
-}
-
-func fileInfo(name, contents string) os.FileInfo {
-	return mapFI{name: pathpkg.Base(name), size: len(contents)}
-}
-
-func dirInfo(name string) os.FileInfo {
-	return mapFI{name: pathpkg.Base(name), dir: true}
-}
-
-func (fs mapFS) Lstat(p string) (os.FileInfo, error) {
-	b, ok := fs[filename(p)]
-	if ok {
-		return fileInfo(p, b), nil
-	}
-	ents, _ := fs.ReadDir(p)
-	if len(ents) > 0 {
-		return dirInfo(p), nil
-	}
-	return nil, os.ErrNotExist
-}
-
-func (fs mapFS) Stat(p string) (os.FileInfo, error) {
-	return fs.Lstat(p)
-}
-
-// slashdir returns path.Dir(p), but special-cases paths not beginning
-// with a slash to be in the root.
-func slashdir(p string) string {
-	d := pathpkg.Dir(p)
-	if d == "." {
-		return "/"
-	}
-	if strings.HasPrefix(p, "/") {
-		return d
-	}
-	return "/" + d
-}
-
-func (fs mapFS) ReadDir(p string) ([]os.FileInfo, error) {
-	p = pathpkg.Clean(p)
-	var ents []string
-	fim := make(map[string]os.FileInfo) // base -> fi
-	for fn, b := range fs {
-		dir := slashdir(fn)
-		isFile := true
-		var lastBase string
-		for {
-			if dir == p {
-				base := lastBase
-				if isFile {
-					base = pathpkg.Base(fn)
-				}
-				if fim[base] == nil {
-					var fi os.FileInfo
-					if isFile {
-						fi = fileInfo(fn, b)
-					} else {
-						fi = dirInfo(base)
-					}
-					ents = append(ents, base)
-					fim[base] = fi
-				}
-			}
-			if dir == "/" {
-				break
-			} else {
-				isFile = false
-				lastBase = pathpkg.Base(dir)
-				dir = pathpkg.Dir(dir)
-			}
-		}
-	}
-	if len(ents) == 0 {
-		return nil, os.ErrNotExist
-	}
-
-	sort.Strings(ents)
-	var list []os.FileInfo
-	for _, dir := range ents {
-		list = append(list, fim[dir])
-	}
-	return list, nil
-}
-
-// mapFI is the map-based implementation of FileInfo.
-type mapFI struct {
-	name string
-	size int
-	dir  bool
-}
-
-func (fi mapFI) IsDir() bool        { return fi.dir }
-func (fi mapFI) ModTime() time.Time { return time.Time{} }
-func (fi mapFI) Mode() os.FileMode {
-	if fi.IsDir() {
-		return 0755 | os.ModeDir
-	}
-	return 0444
-}
-func (fi mapFI) Name() string     { return pathpkg.Base(fi.name) }
-func (fi mapFI) Size() int64      { return int64(fi.size) }
-func (fi mapFI) Sys() interface{} { return nil }
-
-type nopCloser struct {
-	io.ReadSeeker
-}
-
-func (nc nopCloser) Close() error { return nil }
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs_test.go b/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs_test.go
deleted file mode 100644
index 6b7db290ee..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/mapfs/mapfs_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package mapfs
-
-import (
-	"io/ioutil"
-	"os"
-	"reflect"
-	"testing"
-)
-
-func TestOpenRoot(t *testing.T) {
-	fs := New(map[string]string{
-		"foo/bar/three.txt": "a",
-		"foo/bar.txt":       "b",
-		"top.txt":           "c",
-		"other-top.txt":     "d",
-	})
-	tests := []struct {
-		path string
-		want string
-	}{
-		{"/foo/bar/three.txt", "a"},
-		{"foo/bar/three.txt", "a"},
-		{"foo/bar.txt", "b"},
-		{"top.txt", "c"},
-		{"/top.txt", "c"},
-		{"other-top.txt", "d"},
-		{"/other-top.txt", "d"},
-	}
-	for _, tt := range tests {
-		rsc, err := fs.Open(tt.path)
-		if err != nil {
-			t.Errorf("Open(%q) = %v", tt.path, err)
-			continue
-		}
-		slurp, err := ioutil.ReadAll(rsc)
-		if err != nil {
-			t.Error(err)
-		}
-		if string(slurp) != tt.want {
-			t.Errorf("Read(%q) = %q; want %q", tt.path, tt.want, slurp)
-		}
-		rsc.Close()
-	}
-
-	_, err := fs.Open("/xxxx")
-	if !os.IsNotExist(err) {
-		t.Errorf("ReadDir /xxxx = %v; want os.IsNotExist error", err)
-	}
-}
-
-func TestReaddir(t *testing.T) {
-	fs := New(map[string]string{
-		"foo/bar/three.txt": "333",
-		"foo/bar.txt":       "22",
-		"top.txt":           "top.txt file",
-		"other-top.txt":     "other-top.txt file",
-	})
-	tests := []struct {
-		dir  string
-		want []os.FileInfo
-	}{
-		{
-			dir: "/",
-			want: []os.FileInfo{
-				mapFI{name: "foo", dir: true},
-				mapFI{name: "other-top.txt", size: len("other-top.txt file")},
-				mapFI{name: "top.txt", size: len("top.txt file")},
-			},
-		},
-		{
-			dir: "/foo",
-			want: []os.FileInfo{
-				mapFI{name: "bar", dir: true},
-				mapFI{name: "bar.txt", size: 2},
-			},
-		},
-		{
-			dir: "/foo/",
-			want: []os.FileInfo{
-				mapFI{name: "bar", dir: true},
-				mapFI{name: "bar.txt", size: 2},
-			},
-		},
-		{
-			dir: "/foo/bar",
-			want: []os.FileInfo{
-				mapFI{name: "three.txt", size: 3},
-			},
-		},
-	}
-	for _, tt := range tests {
-		fis, err := fs.ReadDir(tt.dir)
-		if err != nil {
-			t.Errorf("ReadDir(%q) = %v", tt.dir, err)
-			continue
-		}
-		if !reflect.DeepEqual(fis, tt.want) {
-			t.Errorf("ReadDir(%q) = %#v; want %#v", tt.dir, fis, tt.want)
-			continue
-		}
-	}
-
-	_, err := fs.ReadDir("/xxxx")
-	if !os.IsNotExist(err) {
-		t.Errorf("ReadDir /xxxx = %v; want os.IsNotExist error", err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/namespace.go b/installer/vendor/golang.org/x/tools/godoc/vfs/namespace.go
deleted file mode 100644
index ca1213eb24..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/namespace.go
+++ /dev/null
@@ -1,389 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vfs
-
-import (
-	"fmt"
-	"io"
-	"os"
-	pathpkg "path"
-	"sort"
-	"strings"
-	"time"
-)
-
-// Setting debugNS = true will enable debugging prints about
-// name space translations.
-const debugNS = false
-
-// A NameSpace is a file system made up of other file systems
-// mounted at specific locations in the name space.
-//
-// The representation is a map from mount point locations
-// to the list of file systems mounted at that location.  A traditional
-// Unix mount table would use a single file system per mount point,
-// but we want to be able to mount multiple file systems on a single
-// mount point and have the system behave as if the union of those
-// file systems were present at the mount point.
-// For example, if the OS file system has a Go installation in
-// c:\Go and additional Go path trees in  d:\Work1 and d:\Work2, then
-// this name space creates the view we want for the godoc server:
-//
-//	NameSpace{
-//		"/": {
-//			{old: "/", fs: OS(`c:\Go`), new: "/"},
-//		},
-//		"/src/pkg": {
-//			{old: "/src/pkg", fs: OS(`c:\Go`), new: "/src/pkg"},
-//			{old: "/src/pkg", fs: OS(`d:\Work1`), new: "/src"},
-//			{old: "/src/pkg", fs: OS(`d:\Work2`), new: "/src"},
-//		},
-//	}
-//
-// This is created by executing:
-//
-//	ns := NameSpace{}
-//	ns.Bind("/", OS(`c:\Go`), "/", BindReplace)
-//	ns.Bind("/src/pkg", OS(`d:\Work1`), "/src", BindAfter)
-//	ns.Bind("/src/pkg", OS(`d:\Work2`), "/src", BindAfter)
-//
-// A particular mount point entry is a triple (old, fs, new), meaning that to
-// operate on a path beginning with old, replace that prefix (old) with new
-// and then pass that path to the FileSystem implementation fs.
-//
-// If you do not explicitly mount a FileSystem at the root mountpoint "/" of the
-// NameSpace like above, Stat("/") will return a "not found" error which could
-// break typical directory traversal routines. In such cases, use NewNameSpace()
-// to get a NameSpace pre-initialized with an emulated empty directory at root.
-//
-// Given this name space, a ReadDir of /src/pkg/code will check each prefix
-// of the path for a mount point (first /src/pkg/code, then /src/pkg, then /src,
-// then /), stopping when it finds one.  For the above example, /src/pkg/code
-// will find the mount point at /src/pkg:
-//
-//	{old: "/src/pkg", fs: OS(`c:\Go`), new: "/src/pkg"},
-//	{old: "/src/pkg", fs: OS(`d:\Work1`), new: "/src"},
-//	{old: "/src/pkg", fs: OS(`d:\Work2`), new: "/src"},
-//
-// ReadDir will when execute these three calls and merge the results:
-//
-//	OS(`c:\Go`).ReadDir("/src/pkg/code")
-//	OS(`d:\Work1').ReadDir("/src/code")
-//	OS(`d:\Work2').ReadDir("/src/code")
-//
-// Note that the "/src/pkg" in "/src/pkg/code" has been replaced by
-// just "/src" in the final two calls.
-//
-// OS is itself an implementation of a file system: it implements
-// OS(`c:\Go`).ReadDir("/src/pkg/code") as ioutil.ReadDir(`c:\Go\src\pkg\code`).
-//
-// Because the new path is evaluated by fs (here OS(root)), another way
-// to read the mount table is to mentally combine fs+new, so that this table:
-//
-//	{old: "/src/pkg", fs: OS(`c:\Go`), new: "/src/pkg"},
-//	{old: "/src/pkg", fs: OS(`d:\Work1`), new: "/src"},
-//	{old: "/src/pkg", fs: OS(`d:\Work2`), new: "/src"},
-//
-// reads as:
-//
-//	"/src/pkg" -> c:\Go\src\pkg
-//	"/src/pkg" -> d:\Work1\src
-//	"/src/pkg" -> d:\Work2\src
-//
-// An invariant (a redundancy) of the name space representation is that
-// ns[mtpt][i].old is always equal to mtpt (in the example, ns["/src/pkg"]'s
-// mount table entries always have old == "/src/pkg").  The 'old' field is
-// useful to callers, because they receive just a []mountedFS and not any
-// other indication of which mount point was found.
-//
-type NameSpace map[string][]mountedFS
-
-// A mountedFS handles requests for path by replacing
-// a prefix 'old' with 'new' and then calling the fs methods.
-type mountedFS struct {
-	old string
-	fs  FileSystem
-	new string
-}
-
-// hasPathPrefix returns true if x == y or x == y + "/" + more
-func hasPathPrefix(x, y string) bool {
-	return x == y || strings.HasPrefix(x, y) && (strings.HasSuffix(y, "/") || strings.HasPrefix(x[len(y):], "/"))
-}
-
-// translate translates path for use in m, replacing old with new.
-//
-// mountedFS{"/src/pkg", fs, "/src"}.translate("/src/pkg/code") == "/src/code".
-func (m mountedFS) translate(path string) string {
-	path = pathpkg.Clean("/" + path)
-	if !hasPathPrefix(path, m.old) {
-		panic("translate " + path + " but old=" + m.old)
-	}
-	return pathpkg.Join(m.new, path[len(m.old):])
-}
-
-func (NameSpace) String() string {
-	return "ns"
-}
-
-// Fprint writes a text representation of the name space to w.
-func (ns NameSpace) Fprint(w io.Writer) {
-	fmt.Fprint(w, "name space {\n")
-	var all []string
-	for mtpt := range ns {
-		all = append(all, mtpt)
-	}
-	sort.Strings(all)
-	for _, mtpt := range all {
-		fmt.Fprintf(w, "\t%s:\n", mtpt)
-		for _, m := range ns[mtpt] {
-			fmt.Fprintf(w, "\t\t%s %s\n", m.fs, m.new)
-		}
-	}
-	fmt.Fprint(w, "}\n")
-}
-
-// clean returns a cleaned, rooted path for evaluation.
-// It canonicalizes the path so that we can use string operations
-// to analyze it.
-func (NameSpace) clean(path string) string {
-	return pathpkg.Clean("/" + path)
-}
-
-type BindMode int
-
-const (
-	BindReplace BindMode = iota
-	BindBefore
-	BindAfter
-)
-
-// Bind causes references to old to redirect to the path new in newfs.
-// If mode is BindReplace, old redirections are discarded.
-// If mode is BindBefore, this redirection takes priority over existing ones,
-// but earlier ones are still consulted for paths that do not exist in newfs.
-// If mode is BindAfter, this redirection happens only after existing ones
-// have been tried and failed.
-func (ns NameSpace) Bind(old string, newfs FileSystem, new string, mode BindMode) {
-	old = ns.clean(old)
-	new = ns.clean(new)
-	m := mountedFS{old, newfs, new}
-	var mtpt []mountedFS
-	switch mode {
-	case BindReplace:
-		mtpt = append(mtpt, m)
-	case BindAfter:
-		mtpt = append(mtpt, ns.resolve(old)...)
-		mtpt = append(mtpt, m)
-	case BindBefore:
-		mtpt = append(mtpt, m)
-		mtpt = append(mtpt, ns.resolve(old)...)
-	}
-
-	// Extend m.old, m.new in inherited mount point entries.
-	for i := range mtpt {
-		m := &mtpt[i]
-		if m.old != old {
-			if !hasPathPrefix(old, m.old) {
-				// This should not happen.  If it does, panic so
-				// that we can see the call trace that led to it.
-				panic(fmt.Sprintf("invalid Bind: old=%q m={%q, %s, %q}", old, m.old, m.fs.String(), m.new))
-			}
-			suffix := old[len(m.old):]
-			m.old = pathpkg.Join(m.old, suffix)
-			m.new = pathpkg.Join(m.new, suffix)
-		}
-	}
-
-	ns[old] = mtpt
-}
-
-// resolve resolves a path to the list of mountedFS to use for path.
-func (ns NameSpace) resolve(path string) []mountedFS {
-	path = ns.clean(path)
-	for {
-		if m := ns[path]; m != nil {
-			if debugNS {
-				fmt.Printf("resolve %s: %v\n", path, m)
-			}
-			return m
-		}
-		if path == "/" {
-			break
-		}
-		path = pathpkg.Dir(path)
-	}
-	return nil
-}
-
-// Open implements the FileSystem Open method.
-func (ns NameSpace) Open(path string) (ReadSeekCloser, error) {
-	var err error
-	for _, m := range ns.resolve(path) {
-		if debugNS {
-			fmt.Printf("tx %s: %v\n", path, m.translate(path))
-		}
-		tp := m.translate(path)
-		r, err1 := m.fs.Open(tp)
-		if err1 == nil {
-			return r, nil
-		}
-		// IsNotExist errors in overlay FSes can mask real errors in
-		// the underlying FS, so ignore them if there is another error.
-		if err == nil || os.IsNotExist(err) {
-			err = err1
-		}
-	}
-	if err == nil {
-		err = &os.PathError{Op: "open", Path: path, Err: os.ErrNotExist}
-	}
-	return nil, err
-}
-
-// stat implements the FileSystem Stat and Lstat methods.
-func (ns NameSpace) stat(path string, f func(FileSystem, string) (os.FileInfo, error)) (os.FileInfo, error) {
-	var err error
-	for _, m := range ns.resolve(path) {
-		fi, err1 := f(m.fs, m.translate(path))
-		if err1 == nil {
-			return fi, nil
-		}
-		if err == nil {
-			err = err1
-		}
-	}
-	if err == nil {
-		err = &os.PathError{Op: "stat", Path: path, Err: os.ErrNotExist}
-	}
-	return nil, err
-}
-
-func (ns NameSpace) Stat(path string) (os.FileInfo, error) {
-	return ns.stat(path, FileSystem.Stat)
-}
-
-func (ns NameSpace) Lstat(path string) (os.FileInfo, error) {
-	return ns.stat(path, FileSystem.Lstat)
-}
-
-// dirInfo is a trivial implementation of os.FileInfo for a directory.
-type dirInfo string
-
-func (d dirInfo) Name() string       { return string(d) }
-func (d dirInfo) Size() int64        { return 0 }
-func (d dirInfo) Mode() os.FileMode  { return os.ModeDir | 0555 }
-func (d dirInfo) ModTime() time.Time { return startTime }
-func (d dirInfo) IsDir() bool        { return true }
-func (d dirInfo) Sys() interface{}   { return nil }
-
-var startTime = time.Now()
-
-// ReadDir implements the FileSystem ReadDir method.  It's where most of the magic is.
-// (The rest is in resolve.)
-//
-// Logically, ReadDir must return the union of all the directories that are named
-// by path.  In order to avoid misinterpreting Go packages, of all the directories
-// that contain Go source code, we only include the files from the first,
-// but we include subdirectories from all.
-//
-// ReadDir must also return directory entries needed to reach mount points.
-// If the name space looks like the example in the type NameSpace comment,
-// but c:\Go does not have a src/pkg subdirectory, we still want to be able
-// to find that subdirectory, because we've mounted d:\Work1 and d:\Work2
-// there.  So if we don't see "src" in the directory listing for c:\Go, we add an
-// entry for it before returning.
-//
-func (ns NameSpace) ReadDir(path string) ([]os.FileInfo, error) {
-	path = ns.clean(path)
-
-	var (
-		haveGo   = false
-		haveName = map[string]bool{}
-		all      []os.FileInfo
-		err      error
-		first    []os.FileInfo
-	)
-
-	for _, m := range ns.resolve(path) {
-		dir, err1 := m.fs.ReadDir(m.translate(path))
-		if err1 != nil {
-			if err == nil {
-				err = err1
-			}
-			continue
-		}
-
-		if dir == nil {
-			dir = []os.FileInfo{}
-		}
-
-		if first == nil {
-			first = dir
-		}
-
-		// If we don't yet have Go files in 'all' and this directory
-		// has some, add all the files from this directory.
-		// Otherwise, only add subdirectories.
-		useFiles := false
-		if !haveGo {
-			for _, d := range dir {
-				if strings.HasSuffix(d.Name(), ".go") {
-					useFiles = true
-					haveGo = true
-					break
-				}
-			}
-		}
-
-		for _, d := range dir {
-			name := d.Name()
-			if (d.IsDir() || useFiles) && !haveName[name] {
-				haveName[name] = true
-				all = append(all, d)
-			}
-		}
-	}
-
-	// We didn't find any directories containing Go files.
-	// If some directory returned successfully, use that.
-	if !haveGo {
-		for _, d := range first {
-			if !haveName[d.Name()] {
-				haveName[d.Name()] = true
-				all = append(all, d)
-			}
-		}
-	}
-
-	// Built union.  Add any missing directories needed to reach mount points.
-	for old := range ns {
-		if hasPathPrefix(old, path) && old != path {
-			// Find next element after path in old.
-			elem := old[len(path):]
-			elem = strings.TrimPrefix(elem, "/")
-			if i := strings.Index(elem, "/"); i >= 0 {
-				elem = elem[:i]
-			}
-			if !haveName[elem] {
-				haveName[elem] = true
-				all = append(all, dirInfo(elem))
-			}
-		}
-	}
-
-	if len(all) == 0 {
-		return nil, err
-	}
-
-	sort.Sort(byName(all))
-	return all, nil
-}
-
-// byName implements sort.Interface.
-type byName []os.FileInfo
-
-func (f byName) Len() int           { return len(f) }
-func (f byName) Less(i, j int) bool { return f[i].Name() < f[j].Name() }
-func (f byName) Swap(i, j int)      { f[i], f[j] = f[j], f[i] }
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/os.go b/installer/vendor/golang.org/x/tools/godoc/vfs/os.go
deleted file mode 100644
index fa98142484..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/os.go
+++ /dev/null
@@ -1,65 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package vfs
-
-import (
-	"fmt"
-	"io/ioutil"
-	"os"
-	pathpkg "path"
-	"path/filepath"
-)
-
-// OS returns an implementation of FileSystem reading from the
-// tree rooted at root.  Recording a root is convenient everywhere
-// but necessary on Windows, because the slash-separated path
-// passed to Open has no way to specify a drive letter.  Using a root
-// lets code refer to OS(`c:\`), OS(`d:\`) and so on.
-func OS(root string) FileSystem {
-	return osFS(root)
-}
-
-type osFS string
-
-func (root osFS) String() string { return "os(" + string(root) + ")" }
-
-func (root osFS) resolve(path string) string {
-	// Clean the path so that it cannot possibly begin with ../.
-	// If it did, the result of filepath.Join would be outside the
-	// tree rooted at root.  We probably won't ever see a path
-	// with .. in it, but be safe anyway.
-	path = pathpkg.Clean("/" + path)
-
-	return filepath.Join(string(root), path)
-}
-
-func (root osFS) Open(path string) (ReadSeekCloser, error) {
-	f, err := os.Open(root.resolve(path))
-	if err != nil {
-		return nil, err
-	}
-	fi, err := f.Stat()
-	if err != nil {
-		f.Close()
-		return nil, err
-	}
-	if fi.IsDir() {
-		f.Close()
-		return nil, fmt.Errorf("Open: %s is a directory", path)
-	}
-	return f, nil
-}
-
-func (root osFS) Lstat(path string) (os.FileInfo, error) {
-	return os.Lstat(root.resolve(path))
-}
-
-func (root osFS) Stat(path string) (os.FileInfo, error) {
-	return os.Stat(root.resolve(path))
-}
-
-func (root osFS) ReadDir(path string) ([]os.FileInfo, error) {
-	return ioutil.ReadDir(root.resolve(path)) // is sorted
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/vfs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/vfs.go
deleted file mode 100644
index ad06b1a1d5..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/vfs.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package vfs defines types for abstract file system access and provides an
-// implementation accessing the file system of the underlying OS.
-package vfs // import "golang.org/x/tools/godoc/vfs"
-
-import (
-	"io"
-	"io/ioutil"
-	"os"
-)
-
-// The FileSystem interface specifies the methods godoc is using
-// to access the file system for which it serves documentation.
-type FileSystem interface {
-	Opener
-	Lstat(path string) (os.FileInfo, error)
-	Stat(path string) (os.FileInfo, error)
-	ReadDir(path string) ([]os.FileInfo, error)
-	String() string
-}
-
-// Opener is a minimal virtual filesystem that can only open regular files.
-type Opener interface {
-	Open(name string) (ReadSeekCloser, error)
-}
-
-// A ReadSeekCloser can Read, Seek, and Close.
-type ReadSeekCloser interface {
-	io.Reader
-	io.Seeker
-	io.Closer
-}
-
-// ReadFile reads the file named by path from fs and returns the contents.
-func ReadFile(fs Opener, path string) ([]byte, error) {
-	rc, err := fs.Open(path)
-	if err != nil {
-		return nil, err
-	}
-	defer rc.Close()
-	return ioutil.ReadAll(rc)
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs.go b/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs.go
deleted file mode 100644
index e554446e46..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs.go
+++ /dev/null
@@ -1,264 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package zipfs file provides an implementation of the FileSystem
-// interface based on the contents of a .zip file.
-//
-// Assumptions:
-//
-// - The file paths stored in the zip file must use a slash ('/') as path
-//   separator; and they must be relative (i.e., they must not start with
-//   a '/' - this is usually the case if the file was created w/o special
-//   options).
-// - The zip file system treats the file paths found in the zip internally
-//   like absolute paths w/o a leading '/'; i.e., the paths are considered
-//   relative to the root of the file system.
-// - All path arguments to file system methods must be absolute paths.
-package zipfs // import "golang.org/x/tools/godoc/vfs/zipfs"
-
-import (
-	"archive/zip"
-	"fmt"
-	"io"
-	"os"
-	"path"
-	"sort"
-	"strings"
-	"time"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-// zipFI is the zip-file based implementation of FileInfo
-type zipFI struct {
-	name string    // directory-local name
-	file *zip.File // nil for a directory
-}
-
-func (fi zipFI) Name() string {
-	return fi.name
-}
-
-func (fi zipFI) Size() int64 {
-	if f := fi.file; f != nil {
-		return int64(f.UncompressedSize)
-	}
-	return 0 // directory
-}
-
-func (fi zipFI) ModTime() time.Time {
-	if f := fi.file; f != nil {
-		return f.ModTime()
-	}
-	return time.Time{} // directory has no modified time entry
-}
-
-func (fi zipFI) Mode() os.FileMode {
-	if fi.file == nil {
-		// Unix directories typically are executable, hence 555.
-		return os.ModeDir | 0555
-	}
-	return 0444
-}
-
-func (fi zipFI) IsDir() bool {
-	return fi.file == nil
-}
-
-func (fi zipFI) Sys() interface{} {
-	return nil
-}
-
-// zipFS is the zip-file based implementation of FileSystem
-type zipFS struct {
-	*zip.ReadCloser
-	list zipList
-	name string
-}
-
-func (fs *zipFS) String() string {
-	return "zip(" + fs.name + ")"
-}
-
-func (fs *zipFS) Close() error {
-	fs.list = nil
-	return fs.ReadCloser.Close()
-}
-
-func zipPath(name string) (string, error) {
-	name = path.Clean(name)
-	if !path.IsAbs(name) {
-		return "", fmt.Errorf("stat: not an absolute path: %s", name)
-	}
-	return name[1:], nil // strip leading '/'
-}
-
-func isRoot(abspath string) bool {
-	return path.Clean(abspath) == "/"
-}
-
-func (fs *zipFS) stat(abspath string) (int, zipFI, error) {
-	if isRoot(abspath) {
-		return 0, zipFI{
-			name: "",
-			file: nil,
-		}, nil
-	}
-	zippath, err := zipPath(abspath)
-	if err != nil {
-		return 0, zipFI{}, err
-	}
-	i, exact := fs.list.lookup(zippath)
-	if i < 0 {
-		// zippath has leading '/' stripped - print it explicitly
-		return -1, zipFI{}, &os.PathError{Path: "/" + zippath, Err: os.ErrNotExist}
-	}
-	_, name := path.Split(zippath)
-	var file *zip.File
-	if exact {
-		file = fs.list[i] // exact match found - must be a file
-	}
-	return i, zipFI{name, file}, nil
-}
-
-func (fs *zipFS) Open(abspath string) (vfs.ReadSeekCloser, error) {
-	_, fi, err := fs.stat(abspath)
-	if err != nil {
-		return nil, err
-	}
-	if fi.IsDir() {
-		return nil, fmt.Errorf("Open: %s is a directory", abspath)
-	}
-	r, err := fi.file.Open()
-	if err != nil {
-		return nil, err
-	}
-	return &zipSeek{fi.file, r}, nil
-}
-
-type zipSeek struct {
-	file *zip.File
-	io.ReadCloser
-}
-
-func (f *zipSeek) Seek(offset int64, whence int) (int64, error) {
-	if whence == 0 && offset == 0 {
-		r, err := f.file.Open()
-		if err != nil {
-			return 0, err
-		}
-		f.Close()
-		f.ReadCloser = r
-		return 0, nil
-	}
-	return 0, fmt.Errorf("unsupported Seek in %s", f.file.Name)
-}
-
-func (fs *zipFS) Lstat(abspath string) (os.FileInfo, error) {
-	_, fi, err := fs.stat(abspath)
-	return fi, err
-}
-
-func (fs *zipFS) Stat(abspath string) (os.FileInfo, error) {
-	_, fi, err := fs.stat(abspath)
-	return fi, err
-}
-
-func (fs *zipFS) ReadDir(abspath string) ([]os.FileInfo, error) {
-	i, fi, err := fs.stat(abspath)
-	if err != nil {
-		return nil, err
-	}
-	if !fi.IsDir() {
-		return nil, fmt.Errorf("ReadDir: %s is not a directory", abspath)
-	}
-
-	var list []os.FileInfo
-
-	// make dirname the prefix that file names must start with to be considered
-	// in this directory. we must special case the root directory because, per
-	// the spec of this package, zip file entries MUST NOT start with /, so we
-	// should not append /, as we would in every other case.
-	var dirname string
-	if isRoot(abspath) {
-		dirname = ""
-	} else {
-		zippath, err := zipPath(abspath)
-		if err != nil {
-			return nil, err
-		}
-		dirname = zippath + "/"
-	}
-	prevname := ""
-	for _, e := range fs.list[i:] {
-		if !strings.HasPrefix(e.Name, dirname) {
-			break // not in the same directory anymore
-		}
-		name := e.Name[len(dirname):] // local name
-		file := e
-		if i := strings.IndexRune(name, '/'); i >= 0 {
-			// We infer directories from files in subdirectories.
-			// If we have x/y, return a directory entry for x.
-			name = name[0:i] // keep local directory name only
-			file = nil
-		}
-		// If we have x/y and x/z, don't return two directory entries for x.
-		// TODO(gri): It should be possible to do this more efficiently
-		// by determining the (fs.list) range of local directory entries
-		// (via two binary searches).
-		if name != prevname {
-			list = append(list, zipFI{name, file})
-			prevname = name
-		}
-	}
-
-	return list, nil
-}
-
-func New(rc *zip.ReadCloser, name string) vfs.FileSystem {
-	list := make(zipList, len(rc.File))
-	copy(list, rc.File) // sort a copy of rc.File
-	sort.Sort(list)
-	return &zipFS{rc, list, name}
-}
-
-type zipList []*zip.File
-
-// zipList implements sort.Interface
-func (z zipList) Len() int           { return len(z) }
-func (z zipList) Less(i, j int) bool { return z[i].Name < z[j].Name }
-func (z zipList) Swap(i, j int)      { z[i], z[j] = z[j], z[i] }
-
-// lookup returns the smallest index of an entry with an exact match
-// for name, or an inexact match starting with name/. If there is no
-// such entry, the result is -1, false.
-func (z zipList) lookup(name string) (index int, exact bool) {
-	// look for exact match first (name comes before name/ in z)
-	i := sort.Search(len(z), func(i int) bool {
-		return name <= z[i].Name
-	})
-	if i >= len(z) {
-		return -1, false
-	}
-	// 0 <= i < len(z)
-	if z[i].Name == name {
-		return i, true
-	}
-
-	// look for inexact match (must be in z[i:], if present)
-	z = z[i:]
-	name += "/"
-	j := sort.Search(len(z), func(i int) bool {
-		return name <= z[i].Name
-	})
-	if j >= len(z) {
-		return -1, false
-	}
-	// 0 <= j < len(z)
-	if strings.HasPrefix(z[j].Name, name) {
-		return i + j, false
-	}
-
-	return -1, false
-}
diff --git a/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs_test.go b/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs_test.go
deleted file mode 100644
index 19407e489c..0000000000
--- a/installer/vendor/golang.org/x/tools/godoc/vfs/zipfs/zipfs_test.go
+++ /dev/null
@@ -1,189 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.package zipfs
-package zipfs
-
-import (
-	"archive/zip"
-	"bytes"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"reflect"
-	"testing"
-
-	"golang.org/x/tools/godoc/vfs"
-)
-
-var (
-
-	// files to use to build zip used by zipfs in testing; maps path : contents
-	files = map[string]string{"foo": "foo", "bar/baz": "baz", "a/b/c": "c"}
-
-	// expected info for each entry in a file system described by files
-	tests = []struct {
-		Path      string
-		IsDir     bool
-		IsRegular bool
-		Name      string
-		Contents  string
-		Files     map[string]bool
-	}{
-		{"/", true, false, "", "", map[string]bool{"foo": true, "bar": true, "a": true}},
-		{"//", true, false, "", "", map[string]bool{"foo": true, "bar": true, "a": true}},
-		{"/foo", false, true, "foo", "foo", nil},
-		{"/foo/", false, true, "foo", "foo", nil},
-		{"/foo//", false, true, "foo", "foo", nil},
-		{"/bar", true, false, "bar", "", map[string]bool{"baz": true}},
-		{"/bar/", true, false, "bar", "", map[string]bool{"baz": true}},
-		{"/bar/baz", false, true, "baz", "baz", nil},
-		{"//bar//baz", false, true, "baz", "baz", nil},
-		{"/a/b", true, false, "b", "", map[string]bool{"c": true}},
-	}
-
-	// to be initialized in setup()
-	fs        vfs.FileSystem
-	statFuncs []statFunc
-)
-
-type statFunc struct {
-	Name string
-	Func func(string) (os.FileInfo, error)
-}
-
-func TestMain(t *testing.M) {
-	if err := setup(); err != nil {
-		fmt.Fprintf(os.Stderr, "Error setting up zipfs testing state: %v.\n", err)
-		os.Exit(1)
-	}
-	os.Exit(t.Run())
-}
-
-// setups state each of the tests uses
-func setup() error {
-	// create zipfs
-	b := new(bytes.Buffer)
-	zw := zip.NewWriter(b)
-	for file, contents := range files {
-		w, err := zw.Create(file)
-		if err != nil {
-			return err
-		}
-		_, err = io.WriteString(w, contents)
-		if err != nil {
-			return err
-		}
-	}
-	zw.Close()
-	zr, err := zip.NewReader(bytes.NewReader(b.Bytes()), int64(b.Len()))
-	if err != nil {
-		return err
-	}
-	rc := &zip.ReadCloser{
-		Reader: *zr,
-	}
-	fs = New(rc, "foo")
-
-	// pull out different stat functions
-	statFuncs = []statFunc{
-		{"Stat", fs.Stat},
-		{"Lstat", fs.Lstat},
-	}
-
-	return nil
-}
-
-func TestZipFSReadDir(t *testing.T) {
-	for _, test := range tests {
-		if test.IsDir {
-			infos, err := fs.ReadDir(test.Path)
-			if err != nil {
-				t.Errorf("Failed to read directory %v\n", test.Path)
-				continue
-			}
-			got := make(map[string]bool)
-			for _, info := range infos {
-				got[info.Name()] = true
-			}
-			if want := test.Files; !reflect.DeepEqual(got, want) {
-				t.Errorf("ReadDir %v got %v\nwanted %v\n", test.Path, got, want)
-			}
-		}
-	}
-}
-
-func TestZipFSStatFuncs(t *testing.T) {
-	for _, test := range tests {
-		for _, statFunc := range statFuncs {
-
-			// test can stat
-			info, err := statFunc.Func(test.Path)
-			if err != nil {
-				t.Errorf("Unexpected error using %v for %v: %v\n", statFunc.Name, test.Path, err)
-				continue
-			}
-
-			// test info.Name()
-			if got, want := info.Name(), test.Name; got != want {
-				t.Errorf("Using %v for %v info.Name() got %v wanted %v\n", statFunc.Name, test.Path, got, want)
-			}
-			// test info.IsDir()
-			if got, want := info.IsDir(), test.IsDir; got != want {
-				t.Errorf("Using %v for %v info.IsDir() got %v wanted %v\n", statFunc.Name, test.Path, got, want)
-			}
-			// test info.Mode().IsDir()
-			if got, want := info.Mode().IsDir(), test.IsDir; got != want {
-				t.Errorf("Using %v for %v info.Mode().IsDir() got %v wanted %v\n", statFunc.Name, test.Path, got, want)
-			}
-			// test info.Mode().IsRegular()
-			if got, want := info.Mode().IsRegular(), test.IsRegular; got != want {
-				t.Errorf("Using %v for %v info.Mode().IsRegular() got %v wanted %v\n", statFunc.Name, test.Path, got, want)
-			}
-			// test info.Size()
-			if test.IsRegular {
-				if got, want := info.Size(), int64(len(test.Contents)); got != want {
-					t.Errorf("Using %v for %v inf.Size() got %v wanted %v", statFunc.Name, test.Path, got, want)
-				}
-			}
-		}
-	}
-}
-
-func TestZipFSNotExist(t *testing.T) {
-	_, err := fs.Open("/does-not-exist")
-	if err == nil {
-		t.Fatalf("Expected an error.\n")
-	}
-	if !os.IsNotExist(err) {
-		t.Errorf("Expected an error satisfying os.IsNotExist: %v\n", err)
-	}
-}
-
-func TestZipFSOpenSeek(t *testing.T) {
-	for _, test := range tests {
-		if test.IsRegular {
-
-			// test Open()
-			f, err := fs.Open(test.Path)
-			if err != nil {
-				t.Error(err)
-				return
-			}
-			defer f.Close()
-
-			// test Seek() multiple times
-			for i := 0; i < 3; i++ {
-				all, err := ioutil.ReadAll(f)
-				if err != nil {
-					t.Error(err)
-					return
-				}
-				if got, want := string(all), test.Contents; got != want {
-					t.Errorf("File contents for %v got %v wanted %v\n", test.Path, got, want)
-				}
-				f.Seek(0, 0)
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk.go b/installer/vendor/golang.org/x/tools/imports/fastwalk.go
deleted file mode 100644
index 31e6e27b0d..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk.go
+++ /dev/null
@@ -1,187 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// A faster implementation of filepath.Walk.
-//
-// filepath.Walk's design necessarily calls os.Lstat on each file,
-// even if the caller needs less info. And goimports only need to know
-// the type of each file. The kernel interface provides the type in
-// the Readdir call but the standard library ignored it.
-// fastwalk_unix.go contains a fork of the syscall routines.
-//
-// See golang.org/issue/16399
-
-package imports
-
-import (
-	"errors"
-	"os"
-	"path/filepath"
-	"runtime"
-	"sync"
-)
-
-// traverseLink is a sentinel error for fastWalk, similar to filepath.SkipDir.
-var traverseLink = errors.New("traverse symlink, assuming target is a directory")
-
-// fastWalk walks the file tree rooted at root, calling walkFn for
-// each file or directory in the tree, including root.
-//
-// If fastWalk returns filepath.SkipDir, the directory is skipped.
-//
-// Unlike filepath.Walk:
-//   * file stat calls must be done by the user.
-//     The only provided metadata is the file type, which does not include
-//     any permission bits.
-//   * multiple goroutines stat the filesystem concurrently. The provided
-//     walkFn must be safe for concurrent use.
-//   * fastWalk can follow symlinks if walkFn returns the traverseLink
-//     sentinel error. It is the walkFn's responsibility to prevent
-//     fastWalk from going into symlink cycles.
-func fastWalk(root string, walkFn func(path string, typ os.FileMode) error) error {
-	// TODO(bradfitz): make numWorkers configurable? We used a
-	// minimum of 4 to give the kernel more info about multiple
-	// things we want, in hopes its I/O scheduling can take
-	// advantage of that. Hopefully most are in cache. Maybe 4 is
-	// even too low of a minimum. Profile more.
-	numWorkers := 4
-	if n := runtime.NumCPU(); n > numWorkers {
-		numWorkers = n
-	}
-
-	// Make sure to wait for all workers to finish, otherwise
-	// walkFn could still be called after returning. This Wait call
-	// runs after close(e.donec) below.
-	var wg sync.WaitGroup
-	defer wg.Wait()
-
-	w := &walker{
-		fn:       walkFn,
-		enqueuec: make(chan walkItem, numWorkers), // buffered for performance
-		workc:    make(chan walkItem, numWorkers), // buffered for performance
-		donec:    make(chan struct{}),
-
-		// buffered for correctness & not leaking goroutines:
-		resc: make(chan error, numWorkers),
-	}
-	defer close(w.donec)
-
-	for i := 0; i < numWorkers; i++ {
-		wg.Add(1)
-		go w.doWork(&wg)
-	}
-	todo := []walkItem{{dir: root}}
-	out := 0
-	for {
-		workc := w.workc
-		var workItem walkItem
-		if len(todo) == 0 {
-			workc = nil
-		} else {
-			workItem = todo[len(todo)-1]
-		}
-		select {
-		case workc <- workItem:
-			todo = todo[:len(todo)-1]
-			out++
-		case it := <-w.enqueuec:
-			todo = append(todo, it)
-		case err := <-w.resc:
-			out--
-			if err != nil {
-				return err
-			}
-			if out == 0 && len(todo) == 0 {
-				// It's safe to quit here, as long as the buffered
-				// enqueue channel isn't also readable, which might
-				// happen if the worker sends both another unit of
-				// work and its result before the other select was
-				// scheduled and both w.resc and w.enqueuec were
-				// readable.
-				select {
-				case it := <-w.enqueuec:
-					todo = append(todo, it)
-				default:
-					return nil
-				}
-			}
-		}
-	}
-}
-
-// doWork reads directories as instructed (via workc) and runs the
-// user's callback function.
-func (w *walker) doWork(wg *sync.WaitGroup) {
-	defer wg.Done()
-	for {
-		select {
-		case <-w.donec:
-			return
-		case it := <-w.workc:
-			select {
-			case <-w.donec:
-				return
-			case w.resc <- w.walk(it.dir, !it.callbackDone):
-			}
-		}
-	}
-}
-
-type walker struct {
-	fn func(path string, typ os.FileMode) error
-
-	donec    chan struct{} // closed on fastWalk's return
-	workc    chan walkItem // to workers
-	enqueuec chan walkItem // from workers
-	resc     chan error    // from workers
-}
-
-type walkItem struct {
-	dir          string
-	callbackDone bool // callback already called; don't do it again
-}
-
-func (w *walker) enqueue(it walkItem) {
-	select {
-	case w.enqueuec <- it:
-	case <-w.donec:
-	}
-}
-
-func (w *walker) onDirEnt(dirName, baseName string, typ os.FileMode) error {
-	joined := dirName + string(os.PathSeparator) + baseName
-	if typ == os.ModeDir {
-		w.enqueue(walkItem{dir: joined})
-		return nil
-	}
-
-	err := w.fn(joined, typ)
-	if typ == os.ModeSymlink {
-		if err == traverseLink {
-			// Set callbackDone so we don't call it twice for both the
-			// symlink-as-symlink and the symlink-as-directory later:
-			w.enqueue(walkItem{dir: joined, callbackDone: true})
-			return nil
-		}
-		if err == filepath.SkipDir {
-			// Permit SkipDir on symlinks too.
-			return nil
-		}
-	}
-	return err
-}
-
-func (w *walker) walk(root string, runUserCallback bool) error {
-	if runUserCallback {
-		err := w.fn(root, os.ModeDir)
-		if err == filepath.SkipDir {
-			return nil
-		}
-		if err != nil {
-			return err
-		}
-	}
-
-	return readDir(root, w.onDirEnt)
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_fileno.go b/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_fileno.go
deleted file mode 100644
index f1fd64949d..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_fileno.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build freebsd openbsd netbsd
-
-package imports
-
-import "syscall"
-
-func direntInode(dirent *syscall.Dirent) uint64 {
-	return uint64(dirent.Fileno)
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_ino.go b/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_ino.go
deleted file mode 100644
index 9fc6de0387..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk_dirent_ino.go
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin
-// +build !appengine
-
-package imports
-
-import "syscall"
-
-func direntInode(dirent *syscall.Dirent) uint64 {
-	return uint64(dirent.Ino)
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk_portable.go b/installer/vendor/golang.org/x/tools/imports/fastwalk_portable.go
deleted file mode 100644
index 6c2658347d..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk_portable.go
+++ /dev/null
@@ -1,29 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine !linux,!darwin,!freebsd,!openbsd,!netbsd
-
-package imports
-
-import (
-	"io/ioutil"
-	"os"
-)
-
-// readDir calls fn for each directory entry in dirName.
-// It does not descend into directories or follow symlinks.
-// If fn returns a non-nil error, readDir returns with that error
-// immediately.
-func readDir(dirName string, fn func(dirName, entName string, typ os.FileMode) error) error {
-	fis, err := ioutil.ReadDir(dirName)
-	if err != nil {
-		return err
-	}
-	for _, fi := range fis {
-		if err := fn(dirName, fi.Name(), fi.Mode()&os.ModeType); err != nil {
-			return err
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk_test.go b/installer/vendor/golang.org/x/tools/imports/fastwalk_test.go
deleted file mode 100644
index 5b307d11ba..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk_test.go
+++ /dev/null
@@ -1,171 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package imports
-
-import (
-	"bytes"
-	"flag"
-	"fmt"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"sort"
-	"strings"
-	"sync"
-	"testing"
-)
-
-func formatFileModes(m map[string]os.FileMode) string {
-	var keys []string
-	for k := range m {
-		keys = append(keys, k)
-	}
-	sort.Strings(keys)
-	var buf bytes.Buffer
-	for _, k := range keys {
-		fmt.Fprintf(&buf, "%-20s: %v\n", k, m[k])
-	}
-	return buf.String()
-}
-
-func testFastWalk(t *testing.T, files map[string]string, callback func(path string, typ os.FileMode) error, want map[string]os.FileMode) {
-	testConfig{
-		gopathFiles: files,
-	}.test(t, func(t *goimportTest) {
-		got := map[string]os.FileMode{}
-		var mu sync.Mutex
-		if err := fastWalk(t.gopath, func(path string, typ os.FileMode) error {
-			mu.Lock()
-			defer mu.Unlock()
-			if !strings.HasPrefix(path, t.gopath) {
-				t.Fatalf("bogus prefix on %q, expect %q", path, t.gopath)
-			}
-			key := filepath.ToSlash(strings.TrimPrefix(path, t.gopath))
-			if old, dup := got[key]; dup {
-				t.Fatalf("callback called twice for key %q: %v -> %v", key, old, typ)
-			}
-			got[key] = typ
-			return callback(path, typ)
-		}); err != nil {
-			t.Fatalf("callback returned: %v", err)
-		}
-		if !reflect.DeepEqual(got, want) {
-			t.Errorf("walk mismatch.\n got:\n%v\nwant:\n%v", formatFileModes(got), formatFileModes(want))
-		}
-	})
-}
-
-func TestFastWalk_Basic(t *testing.T) {
-	testFastWalk(t, map[string]string{
-		"foo/foo.go":   "one",
-		"bar/bar.go":   "two",
-		"skip/skip.go": "skip",
-	},
-		func(path string, typ os.FileMode) error {
-			return nil
-		},
-		map[string]os.FileMode{
-			"":                  os.ModeDir,
-			"/src":              os.ModeDir,
-			"/src/bar":          os.ModeDir,
-			"/src/bar/bar.go":   0,
-			"/src/foo":          os.ModeDir,
-			"/src/foo/foo.go":   0,
-			"/src/skip":         os.ModeDir,
-			"/src/skip/skip.go": 0,
-		})
-}
-
-func TestFastWalk_Symlink(t *testing.T) {
-	switch runtime.GOOS {
-	case "windows", "plan9":
-		t.Skipf("skipping on %s", runtime.GOOS)
-	}
-	testFastWalk(t, map[string]string{
-		"foo/foo.go": "one",
-		"bar/bar.go": "LINK:../foo.go",
-		"symdir":     "LINK:foo",
-	},
-		func(path string, typ os.FileMode) error {
-			return nil
-		},
-		map[string]os.FileMode{
-			"":                os.ModeDir,
-			"/src":            os.ModeDir,
-			"/src/bar":        os.ModeDir,
-			"/src/bar/bar.go": os.ModeSymlink,
-			"/src/foo":        os.ModeDir,
-			"/src/foo/foo.go": 0,
-			"/src/symdir":     os.ModeSymlink,
-		})
-}
-
-func TestFastWalk_SkipDir(t *testing.T) {
-	testFastWalk(t, map[string]string{
-		"foo/foo.go":   "one",
-		"bar/bar.go":   "two",
-		"skip/skip.go": "skip",
-	},
-		func(path string, typ os.FileMode) error {
-			if typ == os.ModeDir && strings.HasSuffix(path, "skip") {
-				return filepath.SkipDir
-			}
-			return nil
-		},
-		map[string]os.FileMode{
-			"":                os.ModeDir,
-			"/src":            os.ModeDir,
-			"/src/bar":        os.ModeDir,
-			"/src/bar/bar.go": 0,
-			"/src/foo":        os.ModeDir,
-			"/src/foo/foo.go": 0,
-			"/src/skip":       os.ModeDir,
-		})
-}
-
-func TestFastWalk_TraverseSymlink(t *testing.T) {
-	switch runtime.GOOS {
-	case "windows", "plan9":
-		t.Skipf("skipping on %s", runtime.GOOS)
-	}
-
-	testFastWalk(t, map[string]string{
-		"foo/foo.go":   "one",
-		"bar/bar.go":   "two",
-		"skip/skip.go": "skip",
-		"symdir":       "LINK:foo",
-	},
-		func(path string, typ os.FileMode) error {
-			if typ == os.ModeSymlink {
-				return traverseLink
-			}
-			return nil
-		},
-		map[string]os.FileMode{
-			"":                   os.ModeDir,
-			"/src":               os.ModeDir,
-			"/src/bar":           os.ModeDir,
-			"/src/bar/bar.go":    0,
-			"/src/foo":           os.ModeDir,
-			"/src/foo/foo.go":    0,
-			"/src/skip":          os.ModeDir,
-			"/src/skip/skip.go":  0,
-			"/src/symdir":        os.ModeSymlink,
-			"/src/symdir/foo.go": 0,
-		})
-}
-
-var benchDir = flag.String("benchdir", runtime.GOROOT(), "The directory to scan for BenchmarkFastWalk")
-
-func BenchmarkFastWalk(b *testing.B) {
-	b.ReportAllocs()
-	for i := 0; i < b.N; i++ {
-		err := fastWalk(*benchDir, func(path string, typ os.FileMode) error { return nil })
-		if err != nil {
-			b.Fatal(err)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fastwalk_unix.go b/installer/vendor/golang.org/x/tools/imports/fastwalk_unix.go
deleted file mode 100644
index db6ee8dafb..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fastwalk_unix.go
+++ /dev/null
@@ -1,123 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build linux darwin freebsd openbsd netbsd
-// +build !appengine
-
-package imports
-
-import (
-	"bytes"
-	"fmt"
-	"os"
-	"syscall"
-	"unsafe"
-)
-
-const blockSize = 8 << 10
-
-// unknownFileMode is a sentinel (and bogus) os.FileMode
-// value used to represent a syscall.DT_UNKNOWN Dirent.Type.
-const unknownFileMode os.FileMode = os.ModeNamedPipe | os.ModeSocket | os.ModeDevice
-
-func readDir(dirName string, fn func(dirName, entName string, typ os.FileMode) error) error {
-	fd, err := syscall.Open(dirName, 0, 0)
-	if err != nil {
-		return err
-	}
-	defer syscall.Close(fd)
-
-	// The buffer must be at least a block long.
-	buf := make([]byte, blockSize) // stack-allocated; doesn't escape
-	bufp := 0                      // starting read position in buf
-	nbuf := 0                      // end valid data in buf
-	for {
-		if bufp >= nbuf {
-			bufp = 0
-			nbuf, err = syscall.ReadDirent(fd, buf)
-			if err != nil {
-				return os.NewSyscallError("readdirent", err)
-			}
-			if nbuf <= 0 {
-				return nil
-			}
-		}
-		consumed, name, typ := parseDirEnt(buf[bufp:nbuf])
-		bufp += consumed
-		if name == "" || name == "." || name == ".." {
-			continue
-		}
-		// Fallback for filesystems (like old XFS) that don't
-		// support Dirent.Type and have DT_UNKNOWN (0) there
-		// instead.
-		if typ == unknownFileMode {
-			fi, err := os.Lstat(dirName + "/" + name)
-			if err != nil {
-				// It got deleted in the meantime.
-				if os.IsNotExist(err) {
-					continue
-				}
-				return err
-			}
-			typ = fi.Mode() & os.ModeType
-		}
-		if err := fn(dirName, name, typ); err != nil {
-			return err
-		}
-	}
-}
-
-func parseDirEnt(buf []byte) (consumed int, name string, typ os.FileMode) {
-	// golang.org/issue/15653
-	dirent := (*syscall.Dirent)(unsafe.Pointer(&buf[0]))
-	if v := unsafe.Offsetof(dirent.Reclen) + unsafe.Sizeof(dirent.Reclen); uintptr(len(buf)) < v {
-		panic(fmt.Sprintf("buf size of %d smaller than dirent header size %d", len(buf), v))
-	}
-	if len(buf) < int(dirent.Reclen) {
-		panic(fmt.Sprintf("buf size %d < record length %d", len(buf), dirent.Reclen))
-	}
-	consumed = int(dirent.Reclen)
-	if direntInode(dirent) == 0 { // File absent in directory.
-		return
-	}
-	switch dirent.Type {
-	case syscall.DT_REG:
-		typ = 0
-	case syscall.DT_DIR:
-		typ = os.ModeDir
-	case syscall.DT_LNK:
-		typ = os.ModeSymlink
-	case syscall.DT_BLK:
-		typ = os.ModeDevice
-	case syscall.DT_FIFO:
-		typ = os.ModeNamedPipe
-	case syscall.DT_SOCK:
-		typ = os.ModeSocket
-	case syscall.DT_UNKNOWN:
-		typ = unknownFileMode
-	default:
-		// Skip weird things.
-		// It's probably a DT_WHT (http://lwn.net/Articles/325369/)
-		// or something. Revisit if/when this package is moved outside
-		// of goimports. goimports only cares about regular files,
-		// symlinks, and directories.
-		return
-	}
-
-	nameBuf := (*[unsafe.Sizeof(dirent.Name)]byte)(unsafe.Pointer(&dirent.Name[0]))
-	nameLen := bytes.IndexByte(nameBuf[:], 0)
-	if nameLen < 0 {
-		panic("failed to find terminating 0 byte in dirent")
-	}
-
-	// Special cases for common things:
-	if nameLen == 1 && nameBuf[0] == '.' {
-		name = "."
-	} else if nameLen == 2 && nameBuf[0] == '.' && nameBuf[1] == '.' {
-		name = ".."
-	} else {
-		name = string(nameBuf[:nameLen])
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fix.go b/installer/vendor/golang.org/x/tools/imports/fix.go
deleted file mode 100644
index e246084976..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fix.go
+++ /dev/null
@@ -1,1008 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package imports
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"sort"
-	"strings"
-	"sync"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// Debug controls verbose logging.
-var Debug = false
-
-var (
-	inTests = false      // set true by fix_test.go; if false, no need to use testMu
-	testMu  sync.RWMutex // guards globals reset by tests; used only if inTests
-)
-
-// LocalPrefix, if set, instructs Process to sort import paths with the given
-// prefix into another group after 3rd-party packages.
-var LocalPrefix string
-
-// importToGroup is a list of functions which map from an import path to
-// a group number.
-var importToGroup = []func(importPath string) (num int, ok bool){
-	func(importPath string) (num int, ok bool) {
-		if LocalPrefix != "" && strings.HasPrefix(importPath, LocalPrefix) {
-			return 3, true
-		}
-		return
-	},
-	func(importPath string) (num int, ok bool) {
-		if strings.HasPrefix(importPath, "appengine") {
-			return 2, true
-		}
-		return
-	},
-	func(importPath string) (num int, ok bool) {
-		if strings.Contains(importPath, ".") {
-			return 1, true
-		}
-		return
-	},
-}
-
-func importGroup(importPath string) int {
-	for _, fn := range importToGroup {
-		if n, ok := fn(importPath); ok {
-			return n
-		}
-	}
-	return 0
-}
-
-// importInfo is a summary of information about one import.
-type importInfo struct {
-	Path  string // full import path (e.g. "crypto/rand")
-	Alias string // import alias, if present (e.g. "crand")
-}
-
-// packageInfo is a summary of features found in a package.
-type packageInfo struct {
-	Globals map[string]bool       // symbol => true
-	Imports map[string]importInfo // pkg base name or alias => info
-}
-
-// dirPackageInfo exposes the dirPackageInfoFile function so that it can be overridden.
-var dirPackageInfo = dirPackageInfoFile
-
-// dirPackageInfoFile gets information from other files in the package.
-func dirPackageInfoFile(pkgName, srcDir, filename string) (*packageInfo, error) {
-	considerTests := strings.HasSuffix(filename, "_test.go")
-
-	// Handle file from stdin
-	if _, err := os.Stat(filename); err != nil {
-		if os.IsNotExist(err) {
-			return &packageInfo{}, nil
-		}
-		return nil, err
-	}
-
-	fileBase := filepath.Base(filename)
-	packageFileInfos, err := ioutil.ReadDir(srcDir)
-	if err != nil {
-		return nil, err
-	}
-
-	info := &packageInfo{Globals: make(map[string]bool), Imports: make(map[string]importInfo)}
-	for _, fi := range packageFileInfos {
-		if fi.Name() == fileBase || !strings.HasSuffix(fi.Name(), ".go") {
-			continue
-		}
-		if !considerTests && strings.HasSuffix(fi.Name(), "_test.go") {
-			continue
-		}
-
-		fileSet := token.NewFileSet()
-		root, err := parser.ParseFile(fileSet, filepath.Join(srcDir, fi.Name()), nil, 0)
-		if err != nil {
-			continue
-		}
-
-		for _, decl := range root.Decls {
-			genDecl, ok := decl.(*ast.GenDecl)
-			if !ok {
-				continue
-			}
-
-			for _, spec := range genDecl.Specs {
-				valueSpec, ok := spec.(*ast.ValueSpec)
-				if !ok {
-					continue
-				}
-				info.Globals[valueSpec.Names[0].Name] = true
-			}
-		}
-
-		for _, imp := range root.Imports {
-			impInfo := importInfo{Path: strings.Trim(imp.Path.Value, `"`)}
-			name := path.Base(impInfo.Path)
-			if imp.Name != nil {
-				name = strings.Trim(imp.Name.Name, `"`)
-				impInfo.Alias = name
-			}
-			info.Imports[name] = impInfo
-		}
-	}
-	return info, nil
-}
-
-func fixImports(fset *token.FileSet, f *ast.File, filename string) (added []string, err error) {
-	// refs are a set of possible package references currently unsatisfied by imports.
-	// first key: either base package (e.g. "fmt") or renamed package
-	// second key: referenced package symbol (e.g. "Println")
-	refs := make(map[string]map[string]bool)
-
-	// decls are the current package imports. key is base package or renamed package.
-	decls := make(map[string]*ast.ImportSpec)
-
-	abs, err := filepath.Abs(filename)
-	if err != nil {
-		return nil, err
-	}
-	srcDir := filepath.Dir(abs)
-	if Debug {
-		log.Printf("fixImports(filename=%q), abs=%q, srcDir=%q ...", filename, abs, srcDir)
-	}
-
-	var packageInfo *packageInfo
-	var loadedPackageInfo bool
-
-	// collect potential uses of packages.
-	var visitor visitFn
-	visitor = visitFn(func(node ast.Node) ast.Visitor {
-		if node == nil {
-			return visitor
-		}
-		switch v := node.(type) {
-		case *ast.ImportSpec:
-			if v.Name != nil {
-				decls[v.Name.Name] = v
-				break
-			}
-			ipath := strings.Trim(v.Path.Value, `"`)
-			if ipath == "C" {
-				break
-			}
-			local := importPathToName(ipath, srcDir)
-			decls[local] = v
-		case *ast.SelectorExpr:
-			xident, ok := v.X.(*ast.Ident)
-			if !ok {
-				break
-			}
-			if xident.Obj != nil {
-				// if the parser can resolve it, it's not a package ref
-				break
-			}
-			pkgName := xident.Name
-			if refs[pkgName] == nil {
-				refs[pkgName] = make(map[string]bool)
-			}
-			if !loadedPackageInfo {
-				loadedPackageInfo = true
-				packageInfo, _ = dirPackageInfo(f.Name.Name, srcDir, filename)
-			}
-			if decls[pkgName] == nil && (packageInfo == nil || !packageInfo.Globals[pkgName]) {
-				refs[pkgName][v.Sel.Name] = true
-			}
-		}
-		return visitor
-	})
-	ast.Walk(visitor, f)
-
-	// Nil out any unused ImportSpecs, to be removed in following passes
-	unusedImport := map[string]string{}
-	for pkg, is := range decls {
-		if refs[pkg] == nil && pkg != "_" && pkg != "." {
-			name := ""
-			if is.Name != nil {
-				name = is.Name.Name
-			}
-			unusedImport[strings.Trim(is.Path.Value, `"`)] = name
-		}
-	}
-	for ipath, name := range unusedImport {
-		if ipath == "C" {
-			// Don't remove cgo stuff.
-			continue
-		}
-		astutil.DeleteNamedImport(fset, f, name, ipath)
-	}
-
-	for pkgName, symbols := range refs {
-		if len(symbols) == 0 {
-			// skip over packages already imported
-			delete(refs, pkgName)
-		}
-	}
-
-	// Fast path, all references already imported.
-	if len(refs) == 0 {
-		return nil, nil
-	}
-
-	// Can assume this will be necessary in all cases now.
-	if !loadedPackageInfo {
-		packageInfo, _ = dirPackageInfo(f.Name.Name, srcDir, filename)
-	}
-
-	// Search for imports matching potential package references.
-	searches := 0
-	type result struct {
-		ipath string // import path (if err == nil)
-		name  string // optional name to rename import as
-		err   error
-	}
-	results := make(chan result)
-	for pkgName, symbols := range refs {
-		go func(pkgName string, symbols map[string]bool) {
-			if packageInfo != nil {
-				sibling := packageInfo.Imports[pkgName]
-				if sibling.Path != "" {
-					results <- result{ipath: sibling.Path, name: sibling.Alias}
-					return
-				}
-			}
-			ipath, rename, err := findImport(pkgName, symbols, filename)
-			r := result{ipath: ipath, err: err}
-			if rename {
-				r.name = pkgName
-			}
-			results <- r
-		}(pkgName, symbols)
-		searches++
-	}
-	for i := 0; i < searches; i++ {
-		result := <-results
-		if result.err != nil {
-			return nil, result.err
-		}
-		if result.ipath != "" {
-			if result.name != "" {
-				astutil.AddNamedImport(fset, f, result.name, result.ipath)
-			} else {
-				astutil.AddImport(fset, f, result.ipath)
-			}
-			added = append(added, result.ipath)
-		}
-	}
-
-	return added, nil
-}
-
-// importPathToName returns the package name for the given import path.
-var importPathToName func(importPath, srcDir string) (packageName string) = importPathToNameGoPath
-
-// importPathToNameBasic assumes the package name is the base of import path.
-func importPathToNameBasic(importPath, srcDir string) (packageName string) {
-	return path.Base(importPath)
-}
-
-// importPathToNameGoPath finds out the actual package name, as declared in its .go files.
-// If there's a problem, it falls back to using importPathToNameBasic.
-func importPathToNameGoPath(importPath, srcDir string) (packageName string) {
-	// Fast path for standard library without going to disk.
-	if pkg, ok := stdImportPackage[importPath]; ok {
-		return pkg
-	}
-
-	pkgName, err := importPathToNameGoPathParse(importPath, srcDir)
-	if Debug {
-		log.Printf("importPathToNameGoPathParse(%q, srcDir=%q) = %q, %v", importPath, srcDir, pkgName, err)
-	}
-	if err == nil {
-		return pkgName
-	}
-	return importPathToNameBasic(importPath, srcDir)
-}
-
-// importPathToNameGoPathParse is a faster version of build.Import if
-// the only thing desired is the package name. It uses build.FindOnly
-// to find the directory and then only parses one file in the package,
-// trusting that the files in the directory are consistent.
-func importPathToNameGoPathParse(importPath, srcDir string) (packageName string, err error) {
-	buildPkg, err := build.Import(importPath, srcDir, build.FindOnly)
-	if err != nil {
-		return "", err
-	}
-	d, err := os.Open(buildPkg.Dir)
-	if err != nil {
-		return "", err
-	}
-	names, err := d.Readdirnames(-1)
-	d.Close()
-	if err != nil {
-		return "", err
-	}
-	sort.Strings(names) // to have predictable behavior
-	var lastErr error
-	var nfile int
-	for _, name := range names {
-		if !strings.HasSuffix(name, ".go") {
-			continue
-		}
-		if strings.HasSuffix(name, "_test.go") {
-			continue
-		}
-		nfile++
-		fullFile := filepath.Join(buildPkg.Dir, name)
-
-		fset := token.NewFileSet()
-		f, err := parser.ParseFile(fset, fullFile, nil, parser.PackageClauseOnly)
-		if err != nil {
-			lastErr = err
-			continue
-		}
-		pkgName := f.Name.Name
-		if pkgName == "documentation" {
-			// Special case from go/build.ImportDir, not
-			// handled by ctx.MatchFile.
-			continue
-		}
-		if pkgName == "main" {
-			// Also skip package main, assuming it's a +build ignore generator or example.
-			// Since you can't import a package main anyway, there's no harm here.
-			continue
-		}
-		return pkgName, nil
-	}
-	if lastErr != nil {
-		return "", lastErr
-	}
-	return "", fmt.Errorf("no importable package found in %d Go files", nfile)
-}
-
-var stdImportPackage = map[string]string{} // "net/http" => "http"
-
-func init() {
-	// Nothing in the standard library has a package name not
-	// matching its import base name.
-	for _, pkg := range stdlib {
-		if _, ok := stdImportPackage[pkg]; !ok {
-			stdImportPackage[pkg] = path.Base(pkg)
-		}
-	}
-}
-
-// Directory-scanning state.
-var (
-	// scanGoRootOnce guards calling scanGoRoot (for $GOROOT)
-	scanGoRootOnce sync.Once
-	// scanGoPathOnce guards calling scanGoPath (for $GOPATH)
-	scanGoPathOnce sync.Once
-
-	// populateIgnoreOnce guards calling populateIgnore
-	populateIgnoreOnce sync.Once
-	ignoredDirs        []os.FileInfo
-
-	dirScanMu sync.RWMutex
-	dirScan   map[string]*pkg // abs dir path => *pkg
-)
-
-type pkg struct {
-	dir             string // absolute file path to pkg directory ("/usr/lib/go/src/net/http")
-	importPath      string // full pkg import path ("net/http", "foo/bar/vendor/a/b")
-	importPathShort string // vendorless import path ("net/http", "a/b")
-}
-
-// byImportPathShortLength sorts by the short import path length, breaking ties on the
-// import string itself.
-type byImportPathShortLength []*pkg
-
-func (s byImportPathShortLength) Len() int { return len(s) }
-func (s byImportPathShortLength) Less(i, j int) bool {
-	vi, vj := s[i].importPathShort, s[j].importPathShort
-	return len(vi) < len(vj) || (len(vi) == len(vj) && vi < vj)
-
-}
-func (s byImportPathShortLength) Swap(i, j int) { s[i], s[j] = s[j], s[i] }
-
-// guarded by populateIgnoreOnce; populates ignoredDirs.
-func populateIgnore() {
-	for _, srcDir := range build.Default.SrcDirs() {
-		if srcDir == filepath.Join(build.Default.GOROOT, "src") {
-			continue
-		}
-		populateIgnoredDirs(srcDir)
-	}
-}
-
-// populateIgnoredDirs reads an optional config file at <path>/.goimportsignore
-// of relative directories to ignore when scanning for go files.
-// The provided path is one of the $GOPATH entries with "src" appended.
-func populateIgnoredDirs(path string) {
-	file := filepath.Join(path, ".goimportsignore")
-	slurp, err := ioutil.ReadFile(file)
-	if Debug {
-		if err != nil {
-			log.Print(err)
-		} else {
-			log.Printf("Read %s", file)
-		}
-	}
-	if err != nil {
-		return
-	}
-	bs := bufio.NewScanner(bytes.NewReader(slurp))
-	for bs.Scan() {
-		line := strings.TrimSpace(bs.Text())
-		if line == "" || strings.HasPrefix(line, "#") {
-			continue
-		}
-		full := filepath.Join(path, line)
-		if fi, err := os.Stat(full); err == nil {
-			ignoredDirs = append(ignoredDirs, fi)
-			if Debug {
-				log.Printf("Directory added to ignore list: %s", full)
-			}
-		} else if Debug {
-			log.Printf("Error statting entry in .goimportsignore: %v", err)
-		}
-	}
-}
-
-func skipDir(fi os.FileInfo) bool {
-	for _, ignoredDir := range ignoredDirs {
-		if os.SameFile(fi, ignoredDir) {
-			return true
-		}
-	}
-	return false
-}
-
-// shouldTraverse reports whether the symlink fi should, found in dir,
-// should be followed.  It makes sure symlinks were never visited
-// before to avoid symlink loops.
-func shouldTraverse(dir string, fi os.FileInfo) bool {
-	path := filepath.Join(dir, fi.Name())
-	target, err := filepath.EvalSymlinks(path)
-	if err != nil {
-		if !os.IsNotExist(err) {
-			fmt.Fprintln(os.Stderr, err)
-		}
-		return false
-	}
-	ts, err := os.Stat(target)
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		return false
-	}
-	if !ts.IsDir() {
-		return false
-	}
-	if skipDir(ts) {
-		return false
-	}
-	// Check for symlink loops by statting each directory component
-	// and seeing if any are the same file as ts.
-	for {
-		parent := filepath.Dir(path)
-		if parent == path {
-			// Made it to the root without seeing a cycle.
-			// Use this symlink.
-			return true
-		}
-		parentInfo, err := os.Stat(parent)
-		if err != nil {
-			return false
-		}
-		if os.SameFile(ts, parentInfo) {
-			// Cycle. Don't traverse.
-			return false
-		}
-		path = parent
-	}
-
-}
-
-var testHookScanDir = func(dir string) {}
-
-var scanGoRootDone = make(chan struct{}) // closed when scanGoRoot is done
-
-func scanGoRoot() {
-	go func() {
-		scanGoDirs(true)
-		close(scanGoRootDone)
-	}()
-}
-
-func scanGoPath() { scanGoDirs(false) }
-
-func scanGoDirs(goRoot bool) {
-	if Debug {
-		which := "$GOROOT"
-		if !goRoot {
-			which = "$GOPATH"
-		}
-		log.Printf("scanning " + which)
-		defer log.Printf("scanned " + which)
-	}
-	dirScanMu.Lock()
-	if dirScan == nil {
-		dirScan = make(map[string]*pkg)
-	}
-	dirScanMu.Unlock()
-
-	for _, srcDir := range build.Default.SrcDirs() {
-		isGoroot := srcDir == filepath.Join(build.Default.GOROOT, "src")
-		if isGoroot != goRoot {
-			continue
-		}
-		testHookScanDir(srcDir)
-		walkFn := func(path string, typ os.FileMode) error {
-			dir := filepath.Dir(path)
-			if typ.IsRegular() {
-				if dir == srcDir {
-					// Doesn't make sense to have regular files
-					// directly in your $GOPATH/src or $GOROOT/src.
-					return nil
-				}
-				if !strings.HasSuffix(path, ".go") {
-					return nil
-				}
-				dirScanMu.Lock()
-				if _, dup := dirScan[dir]; !dup {
-					importpath := filepath.ToSlash(dir[len(srcDir)+len("/"):])
-					dirScan[dir] = &pkg{
-						importPath:      importpath,
-						importPathShort: vendorlessImportPath(importpath),
-						dir:             dir,
-					}
-				}
-				dirScanMu.Unlock()
-				return nil
-			}
-			if typ == os.ModeDir {
-				base := filepath.Base(path)
-				if base == "" || base[0] == '.' || base[0] == '_' ||
-					base == "testdata" || base == "node_modules" {
-					return filepath.SkipDir
-				}
-				fi, err := os.Lstat(path)
-				if err == nil && skipDir(fi) {
-					if Debug {
-						log.Printf("skipping directory %q under %s", fi.Name(), dir)
-					}
-					return filepath.SkipDir
-				}
-				return nil
-			}
-			if typ == os.ModeSymlink {
-				base := filepath.Base(path)
-				if strings.HasPrefix(base, ".#") {
-					// Emacs noise.
-					return nil
-				}
-				fi, err := os.Lstat(path)
-				if err != nil {
-					// Just ignore it.
-					return nil
-				}
-				if shouldTraverse(dir, fi) {
-					return traverseLink
-				}
-			}
-			return nil
-		}
-		if err := fastWalk(srcDir, walkFn); err != nil {
-			log.Printf("goimports: scanning directory %v: %v", srcDir, err)
-		}
-	}
-}
-
-// vendorlessImportPath returns the devendorized version of the provided import path.
-// e.g. "foo/bar/vendor/a/b" => "a/b"
-func vendorlessImportPath(ipath string) string {
-	// Devendorize for use in import statement.
-	if i := strings.LastIndex(ipath, "/vendor/"); i >= 0 {
-		return ipath[i+len("/vendor/"):]
-	}
-	if strings.HasPrefix(ipath, "vendor/") {
-		return ipath[len("vendor/"):]
-	}
-	return ipath
-}
-
-// loadExports returns the set of exported symbols in the package at dir.
-// It returns nil on error or if the package name in dir does not match expectPackage.
-var loadExports func(expectPackage, dir string) map[string]bool = loadExportsGoPath
-
-func loadExportsGoPath(expectPackage, dir string) map[string]bool {
-	if Debug {
-		log.Printf("loading exports in dir %s (seeking package %s)", dir, expectPackage)
-	}
-	exports := make(map[string]bool)
-
-	ctx := build.Default
-
-	// ReadDir is like ioutil.ReadDir, but only returns *.go files
-	// and filters out _test.go files since they're not relevant
-	// and only slow things down.
-	ctx.ReadDir = func(dir string) (notTests []os.FileInfo, err error) {
-		all, err := ioutil.ReadDir(dir)
-		if err != nil {
-			return nil, err
-		}
-		notTests = all[:0]
-		for _, fi := range all {
-			name := fi.Name()
-			if strings.HasSuffix(name, ".go") && !strings.HasSuffix(name, "_test.go") {
-				notTests = append(notTests, fi)
-			}
-		}
-		return notTests, nil
-	}
-
-	files, err := ctx.ReadDir(dir)
-	if err != nil {
-		log.Print(err)
-		return nil
-	}
-
-	fset := token.NewFileSet()
-
-	for _, fi := range files {
-		match, err := ctx.MatchFile(dir, fi.Name())
-		if err != nil || !match {
-			continue
-		}
-		fullFile := filepath.Join(dir, fi.Name())
-		f, err := parser.ParseFile(fset, fullFile, nil, 0)
-		if err != nil {
-			if Debug {
-				log.Printf("Parsing %s: %v", fullFile, err)
-			}
-			return nil
-		}
-		pkgName := f.Name.Name
-		if pkgName == "documentation" {
-			// Special case from go/build.ImportDir, not
-			// handled by ctx.MatchFile.
-			continue
-		}
-		if pkgName != expectPackage {
-			if Debug {
-				log.Printf("scan of dir %v is not expected package %v (actually %v)", dir, expectPackage, pkgName)
-			}
-			return nil
-		}
-		for name := range f.Scope.Objects {
-			if ast.IsExported(name) {
-				exports[name] = true
-			}
-		}
-	}
-
-	if Debug {
-		exportList := make([]string, 0, len(exports))
-		for k := range exports {
-			exportList = append(exportList, k)
-		}
-		sort.Strings(exportList)
-		log.Printf("loaded exports in dir %v (package %v): %v", dir, expectPackage, strings.Join(exportList, ", "))
-	}
-	return exports
-}
-
-// findImport searches for a package with the given symbols.
-// If no package is found, findImport returns ("", false, nil)
-//
-// This is declared as a variable rather than a function so goimports
-// can be easily extended by adding a file with an init function.
-//
-// The rename value tells goimports whether to use the package name as
-// a local qualifier in an import. For example, if findImports("pkg",
-// "X") returns ("foo/bar", rename=true), then goimports adds the
-// import line:
-// 	import pkg "foo/bar"
-// to satisfy uses of pkg.X in the file.
-var findImport func(pkgName string, symbols map[string]bool, filename string) (foundPkg string, rename bool, err error) = findImportGoPath
-
-// findImportGoPath is the normal implementation of findImport.
-// (Some companies have their own internally.)
-func findImportGoPath(pkgName string, symbols map[string]bool, filename string) (foundPkg string, rename bool, err error) {
-	if inTests {
-		testMu.RLock()
-		defer testMu.RUnlock()
-	}
-
-	// Fast path for the standard library.
-	// In the common case we hopefully never have to scan the GOPATH, which can
-	// be slow with moving disks.
-	if pkg, rename, ok := findImportStdlib(pkgName, symbols); ok {
-		return pkg, rename, nil
-	}
-	if pkgName == "rand" && symbols["Read"] {
-		// Special-case rand.Read.
-		//
-		// If findImportStdlib didn't find it above, don't go
-		// searching for it, lest it find and pick math/rand
-		// in GOROOT (new as of Go 1.6)
-		//
-		// crypto/rand is the safer choice.
-		return "", false, nil
-	}
-
-	// TODO(sameer): look at the import lines for other Go files in the
-	// local directory, since the user is likely to import the same packages
-	// in the current Go file.  Return rename=true when the other Go files
-	// use a renamed package that's also used in the current file.
-
-	// Read all the $GOPATH/src/.goimportsignore files before scanning directories.
-	populateIgnoreOnce.Do(populateIgnore)
-
-	// Start scanning the $GOROOT asynchronously, then run the
-	// GOPATH scan synchronously if needed, and then wait for the
-	// $GOROOT to finish.
-	//
-	// TODO(bradfitz): run each $GOPATH entry async. But nobody
-	// really has more than one anyway, so low priority.
-	scanGoRootOnce.Do(scanGoRoot) // async
-	if !fileInDir(filename, build.Default.GOROOT) {
-		scanGoPathOnce.Do(scanGoPath) // blocking
-	}
-	<-scanGoRootDone
-
-	// Find candidate packages, looking only at their directory names first.
-	var candidates []*pkg
-	for _, pkg := range dirScan {
-		if pkgIsCandidate(filename, pkgName, pkg) {
-			candidates = append(candidates, pkg)
-		}
-	}
-
-	// Sort the candidates by their import package length,
-	// assuming that shorter package names are better than long
-	// ones.  Note that this sorts by the de-vendored name, so
-	// there's no "penalty" for vendoring.
-	sort.Sort(byImportPathShortLength(candidates))
-	if Debug {
-		for i, pkg := range candidates {
-			log.Printf("%s candidate %d/%d: %v in %v", pkgName, i+1, len(candidates), pkg.importPathShort, pkg.dir)
-		}
-	}
-
-	// Collect exports for packages with matching names.
-
-	done := make(chan struct{}) // closed when we find the answer
-	defer close(done)
-
-	rescv := make([]chan *pkg, len(candidates))
-	for i := range candidates {
-		rescv[i] = make(chan *pkg)
-	}
-	const maxConcurrentPackageImport = 4
-	loadExportsSem := make(chan struct{}, maxConcurrentPackageImport)
-
-	go func() {
-		for i, pkg := range candidates {
-			select {
-			case loadExportsSem <- struct{}{}:
-				select {
-				case <-done:
-					return
-				default:
-				}
-			case <-done:
-				return
-			}
-			pkg := pkg
-			resc := rescv[i]
-			go func() {
-				if inTests {
-					testMu.RLock()
-					defer testMu.RUnlock()
-				}
-				defer func() { <-loadExportsSem }()
-				exports := loadExports(pkgName, pkg.dir)
-
-				// If it doesn't have the right
-				// symbols, send nil to mean no match.
-				for symbol := range symbols {
-					if !exports[symbol] {
-						pkg = nil
-						break
-					}
-				}
-				select {
-				case resc <- pkg:
-				case <-done:
-				}
-			}()
-		}
-	}()
-	for _, resc := range rescv {
-		pkg := <-resc
-		if pkg == nil {
-			continue
-		}
-		// If the package name in the source doesn't match the import path's base,
-		// return true so the rewriter adds a name (import foo "github.com/bar/go-foo")
-		needsRename := path.Base(pkg.importPath) != pkgName
-		return pkg.importPathShort, needsRename, nil
-	}
-	return "", false, nil
-}
-
-// pkgIsCandidate reports whether pkg is a candidate for satisfying the
-// finding which package pkgIdent in the file named by filename is trying
-// to refer to.
-//
-// This check is purely lexical and is meant to be as fast as possible
-// because it's run over all $GOPATH directories to filter out poor
-// candidates in order to limit the CPU and I/O later parsing the
-// exports in candidate packages.
-//
-// filename is the file being formatted.
-// pkgIdent is the package being searched for, like "client" (if
-// searching for "client.New")
-func pkgIsCandidate(filename, pkgIdent string, pkg *pkg) bool {
-	// Check "internal" and "vendor" visibility:
-	if !canUse(filename, pkg.dir) {
-		return false
-	}
-
-	// Speed optimization to minimize disk I/O:
-	// the last two components on disk must contain the
-	// package name somewhere.
-	//
-	// This permits mismatch naming like directory
-	// "go-foo" being package "foo", or "pkg.v3" being "pkg",
-	// or directory "google.golang.org/api/cloudbilling/v1"
-	// being package "cloudbilling", but doesn't
-	// permit a directory "foo" to be package
-	// "bar", which is strongly discouraged
-	// anyway. There's no reason goimports needs
-	// to be slow just to accomodate that.
-	lastTwo := lastTwoComponents(pkg.importPathShort)
-	if strings.Contains(lastTwo, pkgIdent) {
-		return true
-	}
-	if hasHyphenOrUpperASCII(lastTwo) && !hasHyphenOrUpperASCII(pkgIdent) {
-		lastTwo = lowerASCIIAndRemoveHyphen(lastTwo)
-		if strings.Contains(lastTwo, pkgIdent) {
-			return true
-		}
-	}
-
-	return false
-}
-
-func hasHyphenOrUpperASCII(s string) bool {
-	for i := 0; i < len(s); i++ {
-		b := s[i]
-		if b == '-' || ('A' <= b && b <= 'Z') {
-			return true
-		}
-	}
-	return false
-}
-
-func lowerASCIIAndRemoveHyphen(s string) (ret string) {
-	buf := make([]byte, 0, len(s))
-	for i := 0; i < len(s); i++ {
-		b := s[i]
-		switch {
-		case b == '-':
-			continue
-		case 'A' <= b && b <= 'Z':
-			buf = append(buf, b+('a'-'A'))
-		default:
-			buf = append(buf, b)
-		}
-	}
-	return string(buf)
-}
-
-// canUse reports whether the package in dir is usable from filename,
-// respecting the Go "internal" and "vendor" visibility rules.
-func canUse(filename, dir string) bool {
-	// Fast path check, before any allocations. If it doesn't contain vendor
-	// or internal, it's not tricky:
-	// Note that this can false-negative on directories like "notinternal",
-	// but we check it correctly below. This is just a fast path.
-	if !strings.Contains(dir, "vendor") && !strings.Contains(dir, "internal") {
-		return true
-	}
-
-	dirSlash := filepath.ToSlash(dir)
-	if !strings.Contains(dirSlash, "/vendor/") && !strings.Contains(dirSlash, "/internal/") && !strings.HasSuffix(dirSlash, "/internal") {
-		return true
-	}
-	// Vendor or internal directory only visible from children of parent.
-	// That means the path from the current directory to the target directory
-	// can contain ../vendor or ../internal but not ../foo/vendor or ../foo/internal
-	// or bar/vendor or bar/internal.
-	// After stripping all the leading ../, the only okay place to see vendor or internal
-	// is at the very beginning of the path.
-	absfile, err := filepath.Abs(filename)
-	if err != nil {
-		return false
-	}
-	absdir, err := filepath.Abs(dir)
-	if err != nil {
-		return false
-	}
-	rel, err := filepath.Rel(absfile, absdir)
-	if err != nil {
-		return false
-	}
-	relSlash := filepath.ToSlash(rel)
-	if i := strings.LastIndex(relSlash, "../"); i >= 0 {
-		relSlash = relSlash[i+len("../"):]
-	}
-	return !strings.Contains(relSlash, "/vendor/") && !strings.Contains(relSlash, "/internal/") && !strings.HasSuffix(relSlash, "/internal")
-}
-
-// lastTwoComponents returns at most the last two path components
-// of v, using either / or \ as the path separator.
-func lastTwoComponents(v string) string {
-	nslash := 0
-	for i := len(v) - 1; i >= 0; i-- {
-		if v[i] == '/' || v[i] == '\\' {
-			nslash++
-			if nslash == 2 {
-				return v[i:]
-			}
-		}
-	}
-	return v
-}
-
-type visitFn func(node ast.Node) ast.Visitor
-
-func (fn visitFn) Visit(node ast.Node) ast.Visitor {
-	return fn(node)
-}
-
-func findImportStdlib(shortPkg string, symbols map[string]bool) (importPath string, rename, ok bool) {
-	for symbol := range symbols {
-		key := shortPkg + "." + symbol
-		path := stdlib[key]
-		if path == "" {
-			if key == "rand.Read" {
-				continue
-			}
-			return "", false, false
-		}
-		if importPath != "" && importPath != path {
-			// Ambiguous. Symbols pointed to different things.
-			return "", false, false
-		}
-		importPath = path
-	}
-	if importPath == "" && shortPkg == "rand" && symbols["Read"] {
-		return "crypto/rand", false, true
-	}
-	return importPath, false, importPath != ""
-}
-
-// fileInDir reports whether the provided file path looks like
-// it's in dir. (without hitting the filesystem)
-func fileInDir(file, dir string) bool {
-	rest := strings.TrimPrefix(file, dir)
-	if len(rest) == len(file) {
-		// dir is not a prefix of file.
-		return false
-	}
-	// Check for boundary: either nothing (file == dir), or a slash.
-	return len(rest) == 0 || rest[0] == '/' || rest[0] == '\\'
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/fix_test.go b/installer/vendor/golang.org/x/tools/imports/fix_test.go
deleted file mode 100644
index 89c7e7bce6..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/fix_test.go
+++ /dev/null
@@ -1,1880 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package imports
-
-import (
-	"bytes"
-	"flag"
-	"go/build"
-	"io/ioutil"
-	"os"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"sync"
-	"testing"
-)
-
-var only = flag.String("only", "", "If non-empty, the fix test to run")
-
-var tests = []struct {
-	name       string
-	formatOnly bool
-	in, out    string
-}{
-	// Adding an import to an existing parenthesized import
-	{
-		name: "factored_imports_add",
-		in: `package foo
-import (
-  "fmt"
-)
-func bar() {
-var b bytes.Buffer
-fmt.Println(b.String())
-}
-`,
-		out: `package foo
-
-import (
-	"bytes"
-	"fmt"
-)
-
-func bar() {
-	var b bytes.Buffer
-	fmt.Println(b.String())
-}
-`,
-	},
-
-	// Adding an import to an existing parenthesized import,
-	// verifying it goes into the first section.
-	{
-		name: "factored_imports_add_first_sec",
-		in: `package foo
-import (
-  "fmt"
-
-  "appengine"
-)
-func bar() {
-var b bytes.Buffer
-_ = appengine.IsDevServer
-fmt.Println(b.String())
-}
-`,
-		out: `package foo
-
-import (
-	"bytes"
-	"fmt"
-
-	"appengine"
-)
-
-func bar() {
-	var b bytes.Buffer
-	_ = appengine.IsDevServer
-	fmt.Println(b.String())
-}
-`,
-	},
-
-	// Adding an import to an existing parenthesized import,
-	// verifying it goes into the first section. (test 2)
-	{
-		name: "factored_imports_add_first_sec_2",
-		in: `package foo
-import (
-  "fmt"
-
-  "appengine"
-)
-func bar() {
-_ = math.NaN
-_ = fmt.Sprintf
-_ = appengine.IsDevServer
-}
-`,
-		out: `package foo
-
-import (
-	"fmt"
-	"math"
-
-	"appengine"
-)
-
-func bar() {
-	_ = math.NaN
-	_ = fmt.Sprintf
-	_ = appengine.IsDevServer
-}
-`,
-	},
-
-	// Adding a new import line, without parens
-	{
-		name: "add_import_section",
-		in: `package foo
-func bar() {
-var b bytes.Buffer
-}
-`,
-		out: `package foo
-
-import "bytes"
-
-func bar() {
-	var b bytes.Buffer
-}
-`,
-	},
-
-	// Adding two new imports, which should make a parenthesized import decl.
-	{
-		name: "add_import_paren_section",
-		in: `package foo
-func bar() {
-_, _ := bytes.Buffer, zip.NewReader
-}
-`,
-		out: `package foo
-
-import (
-	"archive/zip"
-	"bytes"
-)
-
-func bar() {
-	_, _ := bytes.Buffer, zip.NewReader
-}
-`,
-	},
-
-	// Make sure we don't add things twice
-	{
-		name: "no_double_add",
-		in: `package foo
-func bar() {
-_, _ := bytes.Buffer, bytes.NewReader
-}
-`,
-		out: `package foo
-
-import "bytes"
-
-func bar() {
-	_, _ := bytes.Buffer, bytes.NewReader
-}
-`,
-	},
-
-	// Remove unused imports, 1 of a factored block
-	{
-		name: "remove_unused_1_of_2",
-		in: `package foo
-import (
-"bytes"
-"fmt"
-)
-
-func bar() {
-_, _ := bytes.Buffer, bytes.NewReader
-}
-`,
-		out: `package foo
-
-import (
-	"bytes"
-)
-
-func bar() {
-	_, _ := bytes.Buffer, bytes.NewReader
-}
-`,
-	},
-
-	// Remove unused imports, 2 of 2
-	{
-		name: "remove_unused_2_of_2",
-		in: `package foo
-import (
-"bytes"
-"fmt"
-)
-
-func bar() {
-}
-`,
-		out: `package foo
-
-func bar() {
-}
-`,
-	},
-
-	// Remove unused imports, 1 of 1
-	{
-		name: "remove_unused_1_of_1",
-		in: `package foo
-
-import "fmt"
-
-func bar() {
-}
-`,
-		out: `package foo
-
-func bar() {
-}
-`,
-	},
-
-	// Don't remove empty imports.
-	{
-		name: "dont_remove_empty_imports",
-		in: `package foo
-import (
-_ "image/png"
-_ "image/jpeg"
-)
-`,
-		out: `package foo
-
-import (
-	_ "image/jpeg"
-	_ "image/png"
-)
-`,
-	},
-
-	// Don't remove dot imports.
-	{
-		name: "dont_remove_dot_imports",
-		in: `package foo
-import (
-. "foo"
-. "bar"
-)
-`,
-		out: `package foo
-
-import (
-	. "bar"
-	. "foo"
-)
-`,
-	},
-
-	// Skip refs the parser can resolve.
-	{
-		name: "skip_resolved_refs",
-		in: `package foo
-
-func f() {
-	type t struct{ Println func(string) }
-	fmt := t{Println: func(string) {}}
-	fmt.Println("foo")
-}
-`,
-		out: `package foo
-
-func f() {
-	type t struct{ Println func(string) }
-	fmt := t{Println: func(string) {}}
-	fmt.Println("foo")
-}
-`,
-	},
-
-	// Do not add a package we already have a resolution for.
-	{
-		name: "skip_template",
-		in: `package foo
-
-import "html/template"
-
-func f() { t = template.New("sometemplate") }
-`,
-		out: `package foo
-
-import "html/template"
-
-func f() { t = template.New("sometemplate") }
-`,
-	},
-
-	// Don't touch cgo
-	{
-		name: "cgo",
-		in: `package foo
-
-/*
-#include <foo.h>
-*/
-import "C"
-`,
-		out: `package foo
-
-/*
-#include <foo.h>
-*/
-import "C"
-`,
-	},
-
-	// Put some things in their own section
-	{
-		name: "make_sections",
-		in: `package foo
-
-import (
-"os"
-)
-
-func foo () {
-_, _ = os.Args, fmt.Println
-_, _ = appengine.FooSomething, user.Current
-}
-`,
-		out: `package foo
-
-import (
-	"fmt"
-	"os"
-
-	"appengine"
-	"appengine/user"
-)
-
-func foo() {
-	_, _ = os.Args, fmt.Println
-	_, _ = appengine.FooSomething, user.Current
-}
-`,
-	},
-
-	// Delete existing empty import block
-	{
-		name: "delete_empty_import_block",
-		in: `package foo
-
-import ()
-`,
-		out: `package foo
-`,
-	},
-
-	// Use existing empty import block
-	{
-		name: "use_empty_import_block",
-		in: `package foo
-
-import ()
-
-func f() {
-	_ = fmt.Println
-}
-`,
-		out: `package foo
-
-import "fmt"
-
-func f() {
-	_ = fmt.Println
-}
-`,
-	},
-
-	// Blank line before adding new section.
-	{
-		name: "blank_line_before_new_group",
-		in: `package foo
-
-import (
-	"fmt"
-	"net"
-)
-
-func f() {
-	_ = net.Dial
-	_ = fmt.Printf
-	_ = snappy.Foo
-}
-`,
-		out: `package foo
-
-import (
-	"fmt"
-	"net"
-
-	"code.google.com/p/snappy-go/snappy"
-)
-
-func f() {
-	_ = net.Dial
-	_ = fmt.Printf
-	_ = snappy.Foo
-}
-`,
-	},
-
-	// Blank line between standard library and third-party stuff.
-	{
-		name: "blank_line_separating_std_and_third_party",
-		in: `package foo
-
-import (
-	"code.google.com/p/snappy-go/snappy"
-	"fmt"
-	"net"
-)
-
-func f() {
-	_ = net.Dial
-	_ = fmt.Printf
-	_ = snappy.Foo
-}
-`,
-		out: `package foo
-
-import (
-	"fmt"
-	"net"
-
-	"code.google.com/p/snappy-go/snappy"
-)
-
-func f() {
-	_ = net.Dial
-	_ = fmt.Printf
-	_ = snappy.Foo
-}
-`,
-	},
-
-	// golang.org/issue/6884
-	{
-		name: "issue 6884",
-		in: `package main
-
-// A comment
-func main() {
-	fmt.Println("Hello, world")
-}
-`,
-		out: `package main
-
-import "fmt"
-
-// A comment
-func main() {
-	fmt.Println("Hello, world")
-}
-`,
-	},
-
-	// golang.org/issue/7132
-	{
-		name: "issue 7132",
-		in: `package main
-
-import (
-"fmt"
-
-"gu"
-"github.com/foo/bar"
-)
-
-var (
-a = bar.a
-b = gu.a
-c = fmt.Printf
-)
-`,
-		out: `package main
-
-import (
-	"fmt"
-
-	"gu"
-
-	"github.com/foo/bar"
-)
-
-var (
-	a = bar.a
-	b = gu.a
-	c = fmt.Printf
-)
-`,
-	},
-
-	{
-		name: "renamed package",
-		in: `package main
-
-var _ = str.HasPrefix
-`,
-		out: `package main
-
-import str "strings"
-
-var _ = str.HasPrefix
-`,
-	},
-
-	{
-		name: "fragment with main",
-		in:   `func main(){fmt.Println("Hello, world")}`,
-		out: `package main
-
-import "fmt"
-
-func main() { fmt.Println("Hello, world") }
-`,
-	},
-
-	{
-		name: "fragment without main",
-		in:   `func notmain(){fmt.Println("Hello, world")}`,
-		out: `import "fmt"
-
-func notmain() { fmt.Println("Hello, world") }`,
-	},
-
-	// Remove first import within in a 2nd/3rd/4th/etc. section.
-	// golang.org/issue/7679
-	{
-		name: "issue 7679",
-		in: `package main
-
-import (
-	"fmt"
-
-	"github.com/foo/bar"
-	"github.com/foo/qux"
-)
-
-func main() {
-	var _ = fmt.Println
-	//var _ = bar.A
-	var _ = qux.B
-}
-`,
-		out: `package main
-
-import (
-	"fmt"
-
-	"github.com/foo/qux"
-)
-
-func main() {
-	var _ = fmt.Println
-	//var _ = bar.A
-	var _ = qux.B
-}
-`,
-	},
-
-	// Blank line can be added before all types of import declarations.
-	// golang.org/issue/7866
-	{
-		name: "issue 7866",
-		in: `package main
-
-import (
-	"fmt"
-	renamed_bar "github.com/foo/bar"
-
-	. "github.com/foo/baz"
-	"io"
-
-	_ "github.com/foo/qux"
-	"strings"
-)
-
-func main() {
-	_, _, _, _, _ = fmt.Errorf, io.Copy, strings.Contains, renamed_bar.A, B
-}
-`,
-		out: `package main
-
-import (
-	"fmt"
-
-	renamed_bar "github.com/foo/bar"
-
-	"io"
-
-	. "github.com/foo/baz"
-
-	"strings"
-
-	_ "github.com/foo/qux"
-)
-
-func main() {
-	_, _, _, _, _ = fmt.Errorf, io.Copy, strings.Contains, renamed_bar.A, B
-}
-`,
-	},
-
-	// Non-idempotent comment formatting
-	// golang.org/issue/8035
-	{
-		name: "issue 8035",
-		in: `package main
-
-import (
-	"fmt"                     // A
-	"go/ast"                  // B
-	_ "launchpad.net/gocheck" // C
-)
-
-func main() { _, _ = fmt.Print, ast.Walk }
-`,
-		out: `package main
-
-import (
-	"fmt"    // A
-	"go/ast" // B
-
-	_ "launchpad.net/gocheck" // C
-)
-
-func main() { _, _ = fmt.Print, ast.Walk }
-`,
-	},
-
-	// Failure to delete all duplicate imports
-	// golang.org/issue/8459
-	{
-		name: "issue 8459",
-		in: `package main
-
-import (
-	"fmt"
-	"log"
-	"log"
-	"math"
-)
-
-func main() { fmt.Println("pi:", math.Pi) }
-`,
-		out: `package main
-
-import (
-	"fmt"
-	"math"
-)
-
-func main() { fmt.Println("pi:", math.Pi) }
-`,
-	},
-
-	// Too aggressive prefix matching
-	// golang.org/issue/9961
-	{
-		name: "issue 9961",
-		in: `package p
-
-import (
-	"zip"
-
-	"rsc.io/p"
-)
-
-var (
-	_ = fmt.Print
-	_ = zip.Store
-	_ p.P
-	_ = regexp.Compile
-)
-`,
-		out: `package p
-
-import (
-	"fmt"
-	"regexp"
-	"zip"
-
-	"rsc.io/p"
-)
-
-var (
-	_ = fmt.Print
-	_ = zip.Store
-	_ p.P
-	_ = regexp.Compile
-)
-`,
-	},
-
-	// Unused named import is mistaken for unnamed import
-	// golang.org/issue/8149
-	{
-		name: "issue 8149",
-		in: `package main
-
-import foo "fmt"
-
-func main() { fmt.Println() }
-`,
-		out: `package main
-
-import "fmt"
-
-func main() { fmt.Println() }
-`,
-	},
-
-	// Unused named import is mistaken for unnamed import
-	// golang.org/issue/8149
-	{
-		name: "issue 8149",
-		in: `package main
-
-import (
-	"fmt"
-	x "fmt"
-)
-
-func main() { fmt.Println() }
-`,
-		out: `package main
-
-import (
-	"fmt"
-)
-
-func main() { fmt.Println() }
-`,
-	},
-
-	// FormatOnly
-	{
-		name:       "format only",
-		formatOnly: true,
-		in: `package main
-
-import (
-"fmt"
-"golang.org/x/foo"
-)
-
-func main() {}
-`,
-		out: `package main
-
-import (
-	"fmt"
-
-	"golang.org/x/foo"
-)
-
-func main() {}
-`,
-	},
-
-	{
-		name: "do not make grouped imports non-grouped",
-		in: `package p
-
-import (
-	"bytes"
-	"fmt"
-)
-
-var _ = fmt.Sprintf
-`,
-		out: `package p
-
-import (
-	"fmt"
-)
-
-var _ = fmt.Sprintf
-`,
-	},
-
-	{
-		name: "issue #19190 1",
-		in: `package main
-
-import (
-	"time"
-)
-
-func main() {
-	_ = snappy.Encode
-	_ = p.P
-	_ = time.Parse
-}
-`,
-		out: `package main
-
-import (
-	"time"
-
-	"code.google.com/p/snappy-go/snappy"
-	"rsc.io/p"
-)
-
-func main() {
-	_ = snappy.Encode
-	_ = p.P
-	_ = time.Parse
-}
-`,
-	},
-
-	{
-		name: "issue #19190 2",
-		in: `package main
-
-import (
-	"time"
-
-	"code.google.com/p/snappy-go/snappy"
-)
-
-func main() {
-	_ = snappy.Encode
-	_ = p.P
-	_ = time.Parse
-}
-`,
-		out: `package main
-
-import (
-	"time"
-
-	"code.google.com/p/snappy-go/snappy"
-	"rsc.io/p"
-)
-
-func main() {
-	_ = snappy.Encode
-	_ = p.P
-	_ = time.Parse
-}
-`,
-	},
-}
-
-func TestFixImports(t *testing.T) {
-	simplePkgs := map[string]string{
-		"appengine": "appengine",
-		"bytes":     "bytes",
-		"fmt":       "fmt",
-		"math":      "math",
-		"os":        "os",
-		"p":         "rsc.io/p",
-		"regexp":    "regexp",
-		"snappy":    "code.google.com/p/snappy-go/snappy",
-		"str":       "strings",
-		"user":      "appengine/user",
-		"zip":       "archive/zip",
-	}
-	old := findImport
-	defer func() {
-		findImport = old
-	}()
-	findImport = func(pkgName string, symbols map[string]bool, filename string) (string, bool, error) {
-		return simplePkgs[pkgName], pkgName == "str", nil
-	}
-
-	options := &Options{
-		TabWidth:  8,
-		TabIndent: true,
-		Comments:  true,
-		Fragment:  true,
-	}
-
-	for _, tt := range tests {
-		options.FormatOnly = tt.formatOnly
-		if *only != "" && tt.name != *only {
-			continue
-		}
-		buf, err := Process(tt.name+".go", []byte(tt.in), options)
-		if err != nil {
-			t.Errorf("error on %q: %v", tt.name, err)
-			continue
-		}
-		if got := string(buf); got != tt.out {
-			t.Errorf("results diff on %q\nGOT:\n%s\nWANT:\n%s\n", tt.name, got, tt.out)
-		}
-	}
-}
-
-// Test support for packages in GOPATH that are actually symlinks.
-// Also test that a symlink loop does not block the process.
-func TestImportSymlinks(t *testing.T) {
-	switch runtime.GOOS {
-	case "windows", "plan9":
-		t.Skipf("skipping test on %q as there are no symlinks", runtime.GOOS)
-	}
-
-	newGoPath, err := ioutil.TempDir("", "symlinktest")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(newGoPath)
-
-	// Create:
-	//    $GOPATH/target/
-	//    $GOPATH/target/f.go  // package mypkg\nvar Foo = 123\n
-	//    $GOPATH/src/x/
-	//    $GOPATH/src/x/mypkg => $GOPATH/target   // symlink
-	//    $GOPATH/src/x/apkg  => $GOPATH/src/x    // symlink loop
-	// Test:
-	//    $GOPATH/src/myotherpkg/toformat.go referencing mypkg.Foo
-
-	targetPath := newGoPath + "/target"
-	if err := os.MkdirAll(targetPath, 0755); err != nil {
-		t.Fatal(err)
-	}
-	if err := ioutil.WriteFile(targetPath+"/f.go", []byte("package mypkg\nvar Foo = 123\n"), 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	symlinkPath := newGoPath + "/src/x/mypkg"
-	if err := os.MkdirAll(filepath.Dir(symlinkPath), 0755); err != nil {
-		t.Fatal(err)
-	}
-	if err := os.Symlink(targetPath, symlinkPath); err != nil {
-		t.Fatal(err)
-	}
-
-	// Add a symlink loop.
-	if err := os.Symlink(newGoPath+"/src/x", newGoPath+"/src/x/apkg"); err != nil {
-		t.Fatal(err)
-	}
-
-	withEmptyGoPath(func() {
-		build.Default.GOPATH = newGoPath
-
-		input := `package p
-
-var (
-	_ = fmt.Print
-	_ = mypkg.Foo
-)
-`
-		output := `package p
-
-import (
-	"fmt"
-	"x/mypkg"
-)
-
-var (
-	_ = fmt.Print
-	_ = mypkg.Foo
-)
-`
-		buf, err := Process(newGoPath+"/src/myotherpkg/toformat.go", []byte(input), &Options{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got := string(buf); got != output {
-			t.Fatalf("results differ\nGOT:\n%s\nWANT:\n%s\n", got, output)
-		}
-	})
-
-	// Add a .goimportsignore and ensure it is respected.
-	if err := ioutil.WriteFile(newGoPath+"/src/.goimportsignore", []byte("x/mypkg\n"), 0666); err != nil {
-		t.Fatal(err)
-	}
-
-	withEmptyGoPath(func() {
-		build.Default.GOPATH = newGoPath
-
-		input := `package p
-
-var (
-	_ = fmt.Print
-	_ = mypkg.Foo
-)
-`
-		output := `package p
-
-import "fmt"
-
-var (
-	_ = fmt.Print
-	_ = mypkg.Foo
-)
-`
-		buf, err := Process(newGoPath+"/src/myotherpkg/toformat.go", []byte(input), &Options{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got := string(buf); got != output {
-			t.Fatalf("ignored results differ\nGOT:\n%s\nWANT:\n%s\n", got, output)
-		}
-	})
-
-}
-
-// Test for correctly identifying the name of a vendored package when it
-// differs from its directory name. In this test, the import line
-// "mypkg.com/mypkg.v1" would be removed if goimports wasn't able to detect
-// that the package name is "mypkg".
-func TestFixImportsVendorPackage(t *testing.T) {
-	// Skip this test on go versions with no vendor support.
-	if _, err := os.Stat(filepath.Join(runtime.GOROOT(), "src/vendor")); err != nil {
-		t.Skip(err)
-	}
-	testConfig{
-		gopathFiles: map[string]string{
-			"mypkg.com/outpkg/vendor/mypkg.com/mypkg.v1/f.go": "package mypkg\nvar Foo = 123\n",
-		},
-	}.test(t, func(t *goimportTest) {
-		input := `package p
-
-import (
-	"fmt"
-
-	"mypkg.com/mypkg.v1"
-)
-
-var (
-	_ = fmt.Print
-	_ = mypkg.Foo
-)
-`
-		buf, err := Process(filepath.Join(t.gopath, "src/mypkg.com/outpkg/toformat.go"), []byte(input), &Options{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got := string(buf); got != input {
-			t.Fatalf("results differ\nGOT:\n%s\nWANT:\n%s\n", got, input)
-		}
-	})
-}
-
-func TestFindImportGoPath(t *testing.T) {
-	goroot, err := ioutil.TempDir("", "goimports-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(goroot)
-
-	origStdlib := stdlib
-	defer func() {
-		stdlib = origStdlib
-	}()
-	stdlib = nil
-
-	withEmptyGoPath(func() {
-		// Test against imaginary bits/bytes package in std lib
-		bytesDir := filepath.Join(goroot, "src", "pkg", "bits", "bytes")
-		for _, tag := range build.Default.ReleaseTags {
-			// Go 1.4 rearranged the GOROOT tree to remove the "pkg" path component.
-			if tag == "go1.4" {
-				bytesDir = filepath.Join(goroot, "src", "bits", "bytes")
-			}
-		}
-		if err := os.MkdirAll(bytesDir, 0755); err != nil {
-			t.Fatal(err)
-		}
-		bytesSrcPath := filepath.Join(bytesDir, "bytes.go")
-		bytesPkgPath := "bits/bytes"
-		bytesSrc := []byte(`package bytes
-
-type Buffer2 struct {}
-`)
-		if err := ioutil.WriteFile(bytesSrcPath, bytesSrc, 0775); err != nil {
-			t.Fatal(err)
-		}
-		build.Default.GOROOT = goroot
-
-		got, rename, err := findImportGoPath("bytes", map[string]bool{"Buffer2": true}, "x.go")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got != bytesPkgPath || rename {
-			t.Errorf(`findImportGoPath("bytes", Buffer2 ...)=%q, %t, want "%s", false`, got, rename, bytesPkgPath)
-		}
-
-		got, rename, err = findImportGoPath("bytes", map[string]bool{"Missing": true}, "x.go")
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got != "" || rename {
-			t.Errorf(`findImportGoPath("bytes", Missing ...)=%q, %t, want "", false`, got, rename)
-		}
-	})
-}
-
-func init() {
-	inTests = true
-}
-
-func withEmptyGoPath(fn func()) {
-	testMu.Lock()
-
-	dirScanMu.Lock()
-	populateIgnoreOnce = sync.Once{}
-	scanGoRootOnce = sync.Once{}
-	scanGoPathOnce = sync.Once{}
-	dirScan = nil
-	ignoredDirs = nil
-	scanGoRootDone = make(chan struct{})
-	dirScanMu.Unlock()
-
-	oldGOPATH := build.Default.GOPATH
-	oldGOROOT := build.Default.GOROOT
-	build.Default.GOPATH = ""
-	testHookScanDir = func(string) {}
-	testMu.Unlock()
-
-	defer func() {
-		testMu.Lock()
-		testHookScanDir = func(string) {}
-		build.Default.GOPATH = oldGOPATH
-		build.Default.GOROOT = oldGOROOT
-		testMu.Unlock()
-	}()
-
-	fn()
-}
-
-func TestFindImportInternal(t *testing.T) {
-	withEmptyGoPath(func() {
-		// Check for src/internal/race, not just src/internal,
-		// so that we can run this test also against go1.5
-		// (which doesn't contain that file).
-		_, err := os.Stat(filepath.Join(runtime.GOROOT(), "src/internal/race"))
-		if err != nil {
-			t.Skip(err)
-		}
-
-		got, rename, err := findImportGoPath("race", map[string]bool{"Acquire": true}, filepath.Join(runtime.GOROOT(), "src/math/x.go"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got != "internal/race" || rename {
-			t.Errorf(`findImportGoPath("race", Acquire ...) = %q, %t; want "internal/race", false`, got, rename)
-		}
-
-		// should not be able to use internal from outside that tree
-		got, rename, err = findImportGoPath("race", map[string]bool{"Acquire": true}, filepath.Join(runtime.GOROOT(), "x.go"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		if got != "" || rename {
-			t.Errorf(`findImportGoPath("race", Acquire ...)=%q, %t, want "", false`, got, rename)
-		}
-	})
-}
-
-// rand.Read should prefer crypto/rand.Read, not math/rand.Read.
-func TestFindImportRandRead(t *testing.T) {
-	withEmptyGoPath(func() {
-		file := filepath.Join(runtime.GOROOT(), "src/foo/x.go") // dummy
-		tests := []struct {
-			syms []string
-			want string
-		}{
-			{
-				syms: []string{"Read"},
-				want: "crypto/rand",
-			},
-			{
-				syms: []string{"Read", "NewZipf"},
-				want: "math/rand",
-			},
-			{
-				syms: []string{"NewZipf"},
-				want: "math/rand",
-			},
-			{
-				syms: []string{"Read", "Prime"},
-				want: "crypto/rand",
-			},
-		}
-		for _, tt := range tests {
-			m := map[string]bool{}
-			for _, sym := range tt.syms {
-				m[sym] = true
-			}
-			got, _, err := findImportGoPath("rand", m, file)
-			if err != nil {
-				t.Errorf("for %q: %v", tt.syms, err)
-				continue
-			}
-			if got != tt.want {
-				t.Errorf("for %q, findImportGoPath = %q; want %q", tt.syms, got, tt.want)
-			}
-		}
-	})
-}
-
-func TestFindImportVendor(t *testing.T) {
-	testConfig{
-		gorootFiles: map[string]string{
-			"vendor/golang.org/x/net/http2/hpack/huffman.go": "package hpack\nfunc HuffmanDecode() { }\n",
-		},
-	}.test(t, func(t *goimportTest) {
-		got, rename, err := findImportGoPath("hpack", map[string]bool{"HuffmanDecode": true}, filepath.Join(t.goroot, "src/math/x.go"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		want := "golang.org/x/net/http2/hpack"
-		if got != want || rename {
-			t.Errorf(`findImportGoPath("hpack", HuffmanDecode ...) = %q, %t; want %q, false`, got, rename, want)
-		}
-	})
-}
-
-func TestProcessVendor(t *testing.T) {
-	withEmptyGoPath(func() {
-		_, err := os.Stat(filepath.Join(runtime.GOROOT(), "src/vendor"))
-		if err != nil {
-			t.Skip(err)
-		}
-
-		target := filepath.Join(runtime.GOROOT(), "src/math/x.go")
-		out, err := Process(target, []byte("package http\nimport \"bytes\"\nfunc f() { strings.NewReader(); hpack.HuffmanDecode() }\n"), nil)
-
-		if err != nil {
-			t.Fatal(err)
-		}
-
-		want := "golang_org/x/net/http2/hpack"
-		if _, err := os.Stat(filepath.Join(runtime.GOROOT(), "src/vendor", want)); os.IsNotExist(err) {
-			want = "golang.org/x/net/http2/hpack"
-		}
-
-		if !bytes.Contains(out, []byte(want)) {
-			t.Fatalf("Process(%q) did not add expected hpack import %q; got:\n%s", target, want, out)
-		}
-	})
-}
-
-func TestFindImportStdlib(t *testing.T) {
-	tests := []struct {
-		pkg     string
-		symbols []string
-		want    string
-	}{
-		{"http", []string{"Get"}, "net/http"},
-		{"http", []string{"Get", "Post"}, "net/http"},
-		{"http", []string{"Get", "Foo"}, ""},
-		{"bytes", []string{"Buffer"}, "bytes"},
-		{"ioutil", []string{"Discard"}, "io/ioutil"},
-	}
-	for _, tt := range tests {
-		got, rename, ok := findImportStdlib(tt.pkg, strSet(tt.symbols))
-		if (got != "") != ok {
-			t.Error("findImportStdlib return value inconsistent")
-		}
-		if got != tt.want || rename {
-			t.Errorf("findImportStdlib(%q, %q) = %q, %t; want %q, false", tt.pkg, tt.symbols, got, rename, tt.want)
-		}
-	}
-}
-
-type testConfig struct {
-	// goroot and gopath optionally specifies the path on disk
-	// to use for the GOROOT and GOPATH. If empty, a temp directory
-	// is made if needed.
-	goroot, gopath string
-
-	// gorootFiles optionally specifies the complete contents of GOROOT to use,
-	// If nil, the normal current $GOROOT is used.
-	gorootFiles map[string]string // paths relative to $GOROOT/src to contents
-
-	// gopathFiles is like gorootFiles, but for $GOPATH.
-	// If nil, there is no GOPATH, though.
-	gopathFiles map[string]string // paths relative to $GOPATH/src to contents
-}
-
-func mustTempDir(t *testing.T, prefix string) string {
-	dir, err := ioutil.TempDir("", prefix)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return dir
-}
-
-func mapToDir(destDir string, files map[string]string) error {
-	for path, contents := range files {
-		file := filepath.Join(destDir, "src", path)
-		if err := os.MkdirAll(filepath.Dir(file), 0755); err != nil {
-			return err
-		}
-		var err error
-		if strings.HasPrefix(contents, "LINK:") {
-			err = os.Symlink(strings.TrimPrefix(contents, "LINK:"), file)
-		} else {
-			err = ioutil.WriteFile(file, []byte(contents), 0644)
-		}
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func (c testConfig) test(t *testing.T, fn func(*goimportTest)) {
-	goroot := c.goroot
-	gopath := c.gopath
-
-	if c.gorootFiles != nil && goroot == "" {
-		goroot = mustTempDir(t, "goroot-")
-		defer os.RemoveAll(goroot)
-	}
-	if err := mapToDir(goroot, c.gorootFiles); err != nil {
-		t.Fatal(err)
-	}
-
-	if c.gopathFiles != nil && gopath == "" {
-		gopath = mustTempDir(t, "gopath-")
-		defer os.RemoveAll(gopath)
-	}
-	if err := mapToDir(gopath, c.gopathFiles); err != nil {
-		t.Fatal(err)
-	}
-
-	withEmptyGoPath(func() {
-		if goroot != "" {
-			build.Default.GOROOT = goroot
-		}
-		build.Default.GOPATH = gopath
-
-		it := &goimportTest{
-			T:      t,
-			goroot: build.Default.GOROOT,
-			gopath: gopath,
-			ctx:    &build.Default,
-		}
-		fn(it)
-	})
-}
-
-type goimportTest struct {
-	*testing.T
-	ctx    *build.Context
-	goroot string
-	gopath string
-}
-
-// Tests that added imports are renamed when the import path's base doesn't
-// match its package name. For example, we want to generate:
-//
-//     import cloudbilling "google.golang.org/api/cloudbilling/v1"
-func TestRenameWhenPackageNameMismatch(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			"foo/bar/v1/x.go": "package bar \n const X = 1",
-		},
-	}.test(t, func(t *goimportTest) {
-		buf, err := Process(t.gopath+"/src/test/t.go", []byte("package main \n const Y = bar.X"), &Options{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		const want = `package main
-
-import bar "foo/bar/v1"
-
-const Y = bar.X
-`
-		if string(buf) != want {
-			t.Errorf("Got:\n%s\nWant:\n%s", buf, want)
-		}
-	})
-}
-
-// Tests that the LocalPrefix option causes imports
-// to be added into a later group (num=3).
-func TestLocalPrefix(t *testing.T) {
-	defer func(s string) { LocalPrefix = s }(LocalPrefix)
-	LocalPrefix = "foo/"
-
-	testConfig{
-		gopathFiles: map[string]string{
-			"foo/bar/bar.go": "package bar \n const X = 1",
-		},
-	}.test(t, func(t *goimportTest) {
-		buf, err := Process(t.gopath+"/src/test/t.go", []byte("package main \n const Y = bar.X \n const _ = runtime.GOOS"), &Options{})
-		if err != nil {
-			t.Fatal(err)
-		}
-		const want = `package main
-
-import (
-	"runtime"
-
-	"foo/bar"
-)
-
-const Y = bar.X
-const _ = runtime.GOOS
-`
-		if string(buf) != want {
-			t.Errorf("Got:\n%s\nWant:\n%s", buf, want)
-		}
-	})
-}
-
-// Tests that running goimport on files in GOROOT (for people hacking
-// on Go itself) don't cause the GOPATH to be scanned (which might be
-// much bigger).
-func TestOptimizationWhenInGoroot(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			"foo/foo.go": "package foo\nconst X = 1\n",
-		},
-	}.test(t, func(t *goimportTest) {
-		testHookScanDir = func(dir string) {
-			if dir != filepath.Join(build.Default.GOROOT, "src") {
-				t.Errorf("unexpected dir scan of %s", dir)
-			}
-		}
-		const in = "package foo\n\nconst Y = bar.X\n"
-		buf, err := Process(t.goroot+"/src/foo/foo.go", []byte(in), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != in {
-			t.Errorf("got:\n%q\nwant unchanged:\n%q\n", in, buf)
-		}
-	})
-}
-
-// Tests that "package documentation" files are ignored.
-func TestIgnoreDocumentationPackage(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			"foo/foo.go": "package foo\nconst X = 1\n",
-			"foo/doc.go": "package documentation \n // just to confuse things\n",
-		},
-	}.test(t, func(t *goimportTest) {
-		const in = "package x\n\nconst Y = foo.X\n"
-		const want = "package x\n\nimport \"foo\"\n\nconst Y = foo.X\n"
-		buf, err := Process(t.gopath+"/src/x/x.go", []byte(in), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != want {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", in, want)
-		}
-	})
-}
-
-// Tests importPathToNameGoPathParse and in particular that it stops
-// after finding the first non-documentation package name, not
-// reporting an error on inconsistent package names (since it should
-// never make it that far).
-func TestImportPathToNameGoPathParse(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			"example.net/pkg/doc.go": "package documentation\n", // ignored
-			"example.net/pkg/gen.go": "package main\n",          // also ignored
-			"example.net/pkg/pkg.go": "package the_pkg_name_to_find\n  and this syntax error is ignored because of parser.PackageClauseOnly",
-			"example.net/pkg/z.go":   "package inconsistent\n", // inconsistent but ignored
-		},
-	}.test(t, func(t *goimportTest) {
-		got, err := importPathToNameGoPathParse("example.net/pkg", filepath.Join(t.gopath, "src", "other.net"))
-		if err != nil {
-			t.Fatal(err)
-		}
-		const want = "the_pkg_name_to_find"
-		if got != want {
-			t.Errorf("importPathToNameGoPathParse(..) = %q; want %q", got, want)
-		}
-	})
-}
-
-func TestIgnoreConfiguration(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			".goimportsignore":                                     "# comment line\n\n example.net", // tests comment, blank line, whitespace trimming
-			"example.net/pkg/pkg.go":                               "package pkg\nconst X = 1",
-			"otherwise-longer-so-worse.example.net/foo/pkg/pkg.go": "package pkg\nconst X = 1",
-		},
-	}.test(t, func(t *goimportTest) {
-		const in = "package x\n\nconst _ = pkg.X\n"
-		const want = "package x\n\nimport \"otherwise-longer-so-worse.example.net/foo/pkg\"\n\nconst _ = pkg.X\n"
-		buf, err := Process(t.gopath+"/src/x/x.go", []byte(in), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != want {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", buf, want)
-		}
-	})
-}
-
-// Skip "node_modules" directory.
-func TestSkipNodeModules(t *testing.T) {
-	testConfig{
-		gopathFiles: map[string]string{
-			"example.net/node_modules/pkg/a.go":         "package pkg\nconst X = 1",
-			"otherwise-longer.net/not_modules/pkg/a.go": "package pkg\nconst X = 1",
-		},
-	}.test(t, func(t *goimportTest) {
-		const in = "package x\n\nconst _ = pkg.X\n"
-		const want = "package x\n\nimport \"otherwise-longer.net/not_modules/pkg\"\n\nconst _ = pkg.X\n"
-		buf, err := Process(t.gopath+"/src/x/x.go", []byte(in), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != want {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", buf, want)
-		}
-	})
-}
-
-// golang.org/issue/16458 -- if GOROOT is a prefix of GOPATH, GOPATH is ignored.
-func TestGoRootPrefixOfGoPath(t *testing.T) {
-	dir := mustTempDir(t, "importstest")
-	defer os.RemoveAll(dir)
-	testConfig{
-		goroot: filepath.Join(dir, "go"),
-		gopath: filepath.Join(dir, "gopath"),
-		gopathFiles: map[string]string{
-			"example.com/foo/pkg.go": "package foo\nconst X = 1",
-		},
-	}.test(t, func(t *goimportTest) {
-		const in = "package x\n\nconst _ = foo.X\n"
-		const want = "package x\n\nimport \"example.com/foo\"\n\nconst _ = foo.X\n"
-		buf, err := Process(t.gopath+"/src/x/x.go", []byte(in), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != want {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", buf, want)
-		}
-	})
-
-}
-
-const testGlobalImportsUsesGlobal = `package globalimporttest
-
-func doSomething() {
-	t := time.Now()
-}
-`
-
-const testGlobalImportsGlobalDecl = `package globalimporttest
-
-type Time struct{}
-
-func (t Time) Now() Time {
-	return Time{}
-}
-
-var time Time
-`
-
-// Tests that package global variables with the same name and function name as
-// a function in a separate package do not result in an import which masks
-// the global variable
-func TestGlobalImports(t *testing.T) {
-	const pkg = "globalimporttest"
-	const usesGlobalFile = pkg + "/uses_global.go"
-	testConfig{
-		gopathFiles: map[string]string{
-			usesGlobalFile:     testGlobalImportsUsesGlobal,
-			pkg + "/global.go": testGlobalImportsGlobalDecl,
-		},
-	}.test(t, func(t *goimportTest) {
-		buf, err := Process(
-			t.gopath+"/src/"+usesGlobalFile, []byte(testGlobalImportsUsesGlobal), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != testGlobalImportsUsesGlobal {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", buf, testGlobalImportsUsesGlobal)
-		}
-	})
-}
-
-// Tests that sibling files - other files in the same package - can provide an
-// import that may not be the default one otherwise.
-func TestSiblingImports(t *testing.T) {
-
-	// provide is the sibling file that provides the desired import.
-	const provide = `package siblingimporttest
-
-import "local/log"
-
-func LogSomething() {
-	log.Print("Something")
-}
-`
-
-	// need is the file being tested that needs the import.
-	const need = `package siblingimporttest
-
-func LogSomethingElse() {
-	log.Print("Something else")
-}
-`
-
-	// want is the expected result file
-	const want = `package siblingimporttest
-
-import "local/log"
-
-func LogSomethingElse() {
-	log.Print("Something else")
-}
-`
-
-	const pkg = "siblingimporttest"
-	const siblingFile = pkg + "/needs_import.go"
-	testConfig{
-		gopathFiles: map[string]string{
-			siblingFile:                 need,
-			pkg + "/provides_import.go": provide,
-		},
-	}.test(t, func(t *goimportTest) {
-		buf, err := Process(
-			t.gopath+"/src/"+siblingFile, []byte(need), nil)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if string(buf) != want {
-			t.Errorf("wrong output.\ngot:\n%q\nwant:\n%q\n", buf, want)
-		}
-	})
-}
-
-func strSet(ss []string) map[string]bool {
-	m := make(map[string]bool)
-	for _, s := range ss {
-		m[s] = true
-	}
-	return m
-}
-
-func TestPkgIsCandidate(t *testing.T) {
-	tests := [...]struct {
-		filename string
-		pkgIdent string
-		pkg      *pkg
-		want     bool
-	}{
-		// normal match
-		0: {
-			filename: "/gopath/src/my/pkg/pkg.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/client",
-				importPath:      "client",
-				importPathShort: "client",
-			},
-			want: true,
-		},
-		// not a match
-		1: {
-			filename: "/gopath/src/my/pkg/pkg.go",
-			pkgIdent: "zzz",
-			pkg: &pkg{
-				dir:             "/gopath/src/client",
-				importPath:      "client",
-				importPathShort: "client",
-			},
-			want: false,
-		},
-		// would be a match, but "client" appears too deep.
-		2: {
-			filename: "/gopath/src/my/pkg/pkg.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/client/foo/foo/foo",
-				importPath:      "client/foo/foo",
-				importPathShort: "client/foo/foo",
-			},
-			want: false,
-		},
-		// not an exact match, but substring is good enough.
-		3: {
-			filename: "/gopath/src/my/pkg/pkg.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/go-client",
-				importPath:      "foo/go-client",
-				importPathShort: "foo/go-client",
-			},
-			want: true,
-		},
-		// "internal" package, and not visible
-		4: {
-			filename: "/gopath/src/my/pkg/pkg.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/internal/client",
-				importPath:      "foo/internal/client",
-				importPathShort: "foo/internal/client",
-			},
-			want: false,
-		},
-		// "internal" package but visible
-		5: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/internal/client",
-				importPath:      "foo/internal/client",
-				importPathShort: "foo/internal/client",
-			},
-			want: true,
-		},
-		// "vendor" package not visible
-		6: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/other/vendor/client",
-				importPath:      "other/vendor/client",
-				importPathShort: "client",
-			},
-			want: false,
-		},
-		// "vendor" package, visible
-		7: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "client",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/vendor/client",
-				importPath:      "other/foo/client",
-				importPathShort: "client",
-			},
-			want: true,
-		},
-		// Ignore hyphens.
-		8: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "socketio",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/socket-io",
-				importPath:      "foo/socket-io",
-				importPathShort: "foo/socket-io",
-			},
-			want: true,
-		},
-		// Ignore case.
-		9: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "fooprod",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/FooPROD",
-				importPath:      "foo/FooPROD",
-				importPathShort: "foo/FooPROD",
-			},
-			want: true,
-		},
-		// Ignoring both hyphens and case together.
-		10: {
-			filename: "/gopath/src/foo/bar.go",
-			pkgIdent: "fooprod",
-			pkg: &pkg{
-				dir:             "/gopath/src/foo/Foo-PROD",
-				importPath:      "foo/Foo-PROD",
-				importPathShort: "foo/Foo-PROD",
-			},
-			want: true,
-		},
-	}
-	for i, tt := range tests {
-		got := pkgIsCandidate(tt.filename, tt.pkgIdent, tt.pkg)
-		if got != tt.want {
-			t.Errorf("test %d. pkgIsCandidate(%q, %q, %+v) = %v; want %v",
-				i, tt.filename, tt.pkgIdent, *tt.pkg, got, tt.want)
-		}
-	}
-}
-
-func TestShouldTraverse(t *testing.T) {
-	switch runtime.GOOS {
-	case "windows", "plan9":
-		t.Skipf("skipping symlink-requiring test on %s", runtime.GOOS)
-	}
-
-	dir, err := ioutil.TempDir("", "goimports-")
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.RemoveAll(dir)
-
-	// Note: mapToDir prepends "src" to each element, since
-	// mapToDir was made for creating GOPATHs.
-	if err := mapToDir(dir, map[string]string{
-		"foo/foo2/file.txt":        "",
-		"foo/foo2/link-to-src":     "LINK:" + dir + "/src",
-		"foo/foo2/link-to-src-foo": "LINK:" + dir + "/src/foo",
-		"foo/foo2/link-to-dot":     "LINK:.",
-		"bar/bar2/file.txt":        "",
-		"bar/bar2/link-to-src-foo": "LINK:" + dir + "/src/foo",
-
-		"a/b/c": "LINK:" + dir + "/src/a/d",
-		"a/d/e": "LINK:" + dir + "/src/a/b",
-	}); err != nil {
-		t.Fatal(err)
-	}
-	tests := []struct {
-		dir  string
-		file string
-		want bool
-	}{
-		{
-			dir:  dir + "/src/foo/foo2",
-			file: "link-to-src-foo",
-			want: false, // loop
-		},
-		{
-			dir:  dir + "/src/foo/foo2",
-			file: "link-to-src",
-			want: false, // loop
-		},
-		{
-			dir:  dir + "/src/foo/foo2",
-			file: "link-to-dot",
-			want: false, // loop
-		},
-		{
-			dir:  dir + "/src/bar/bar2",
-			file: "link-to-src-foo",
-			want: true, // not a loop
-		},
-		{
-			dir:  dir + "/src/a/b/c",
-			file: "e",
-			want: false, // loop: "e" is the same as "b".
-		},
-	}
-	for i, tt := range tests {
-		fi, err := os.Stat(filepath.Join(tt.dir, tt.file))
-		if err != nil {
-			t.Errorf("%d. Stat = %v", i, err)
-			continue
-		}
-		got := shouldTraverse(tt.dir, fi)
-		if got != tt.want {
-			t.Errorf("%d. shouldTraverse(%q, %q) = %v; want %v", i, tt.dir, tt.file, got, tt.want)
-		}
-	}
-}
-
-// Issue 20941: this used to panic on Windows.
-func TestProcessStdin(t *testing.T) {
-	got, err := Process("<standard input>", []byte("package main\nfunc main() {\n\tfmt.Println(123)\n}\n"), nil)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if !strings.Contains(string(got), `"fmt"`) {
-		t.Errorf("expected fmt import; got: %s", got)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/imports.go b/installer/vendor/golang.org/x/tools/imports/imports.go
deleted file mode 100644
index 67573f497e..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/imports.go
+++ /dev/null
@@ -1,289 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-//go:generate go run mkstdlib.go
-
-// Package imports implements a Go pretty-printer (like package "go/format")
-// that also adds or removes import statements as necessary.
-package imports // import "golang.org/x/tools/imports"
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/format"
-	"go/parser"
-	"go/printer"
-	"go/token"
-	"io"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// Options specifies options for processing files.
-type Options struct {
-	Fragment  bool // Accept fragment of a source file (no package statement)
-	AllErrors bool // Report all errors (not just the first 10 on different lines)
-
-	Comments  bool // Print comments (true if nil *Options provided)
-	TabIndent bool // Use tabs for indent (true if nil *Options provided)
-	TabWidth  int  // Tab width (8 if nil *Options provided)
-
-	FormatOnly bool // Disable the insertion and deletion of imports
-}
-
-// Process formats and adjusts imports for the provided file.
-// If opt is nil the defaults are used.
-//
-// Note that filename's directory influences which imports can be chosen,
-// so it is important that filename be accurate.
-// To process data ``as if'' it were in filename, pass the data as a non-nil src.
-func Process(filename string, src []byte, opt *Options) ([]byte, error) {
-	if opt == nil {
-		opt = &Options{Comments: true, TabIndent: true, TabWidth: 8}
-	}
-
-	fileSet := token.NewFileSet()
-	file, adjust, err := parse(fileSet, filename, src, opt)
-	if err != nil {
-		return nil, err
-	}
-
-	if !opt.FormatOnly {
-		_, err = fixImports(fileSet, file, filename)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	sortImports(fileSet, file)
-	imps := astutil.Imports(fileSet, file)
-
-	var spacesBefore []string // import paths we need spaces before
-	for _, impSection := range imps {
-		// Within each block of contiguous imports, see if any
-		// import lines are in different group numbers. If so,
-		// we'll need to put a space between them so it's
-		// compatible with gofmt.
-		lastGroup := -1
-		for _, importSpec := range impSection {
-			importPath, _ := strconv.Unquote(importSpec.Path.Value)
-			groupNum := importGroup(importPath)
-			if groupNum != lastGroup && lastGroup != -1 {
-				spacesBefore = append(spacesBefore, importPath)
-			}
-			lastGroup = groupNum
-		}
-
-	}
-
-	printerMode := printer.UseSpaces
-	if opt.TabIndent {
-		printerMode |= printer.TabIndent
-	}
-	printConfig := &printer.Config{Mode: printerMode, Tabwidth: opt.TabWidth}
-
-	var buf bytes.Buffer
-	err = printConfig.Fprint(&buf, fileSet, file)
-	if err != nil {
-		return nil, err
-	}
-	out := buf.Bytes()
-	if adjust != nil {
-		out = adjust(src, out)
-	}
-	if len(spacesBefore) > 0 {
-		out = addImportSpaces(bytes.NewReader(out), spacesBefore)
-	}
-
-	out, err = format.Source(out)
-	if err != nil {
-		return nil, err
-	}
-	return out, nil
-}
-
-// parse parses src, which was read from filename,
-// as a Go source file or statement list.
-func parse(fset *token.FileSet, filename string, src []byte, opt *Options) (*ast.File, func(orig, src []byte) []byte, error) {
-	parserMode := parser.Mode(0)
-	if opt.Comments {
-		parserMode |= parser.ParseComments
-	}
-	if opt.AllErrors {
-		parserMode |= parser.AllErrors
-	}
-
-	// Try as whole source file.
-	file, err := parser.ParseFile(fset, filename, src, parserMode)
-	if err == nil {
-		return file, nil, nil
-	}
-	// If the error is that the source file didn't begin with a
-	// package line and we accept fragmented input, fall through to
-	// try as a source fragment.  Stop and return on any other error.
-	if !opt.Fragment || !strings.Contains(err.Error(), "expected 'package'") {
-		return nil, nil, err
-	}
-
-	// If this is a declaration list, make it a source file
-	// by inserting a package clause.
-	// Insert using a ;, not a newline, so that the line numbers
-	// in psrc match the ones in src.
-	psrc := append([]byte("package main;"), src...)
-	file, err = parser.ParseFile(fset, filename, psrc, parserMode)
-	if err == nil {
-		// If a main function exists, we will assume this is a main
-		// package and leave the file.
-		if containsMainFunc(file) {
-			return file, nil, nil
-		}
-
-		adjust := func(orig, src []byte) []byte {
-			// Remove the package clause.
-			// Gofmt has turned the ; into a \n.
-			src = src[len("package main\n"):]
-			return matchSpace(orig, src)
-		}
-		return file, adjust, nil
-	}
-	// If the error is that the source file didn't begin with a
-	// declaration, fall through to try as a statement list.
-	// Stop and return on any other error.
-	if !strings.Contains(err.Error(), "expected declaration") {
-		return nil, nil, err
-	}
-
-	// If this is a statement list, make it a source file
-	// by inserting a package clause and turning the list
-	// into a function body.  This handles expressions too.
-	// Insert using a ;, not a newline, so that the line numbers
-	// in fsrc match the ones in src.
-	fsrc := append(append([]byte("package p; func _() {"), src...), '}')
-	file, err = parser.ParseFile(fset, filename, fsrc, parserMode)
-	if err == nil {
-		adjust := func(orig, src []byte) []byte {
-			// Remove the wrapping.
-			// Gofmt has turned the ; into a \n\n.
-			src = src[len("package p\n\nfunc _() {"):]
-			src = src[:len(src)-len("}\n")]
-			// Gofmt has also indented the function body one level.
-			// Remove that indent.
-			src = bytes.Replace(src, []byte("\n\t"), []byte("\n"), -1)
-			return matchSpace(orig, src)
-		}
-		return file, adjust, nil
-	}
-
-	// Failed, and out of options.
-	return nil, nil, err
-}
-
-// containsMainFunc checks if a file contains a function declaration with the
-// function signature 'func main()'
-func containsMainFunc(file *ast.File) bool {
-	for _, decl := range file.Decls {
-		if f, ok := decl.(*ast.FuncDecl); ok {
-			if f.Name.Name != "main" {
-				continue
-			}
-
-			if len(f.Type.Params.List) != 0 {
-				continue
-			}
-
-			if f.Type.Results != nil && len(f.Type.Results.List) != 0 {
-				continue
-			}
-
-			return true
-		}
-	}
-
-	return false
-}
-
-func cutSpace(b []byte) (before, middle, after []byte) {
-	i := 0
-	for i < len(b) && (b[i] == ' ' || b[i] == '\t' || b[i] == '\n') {
-		i++
-	}
-	j := len(b)
-	for j > 0 && (b[j-1] == ' ' || b[j-1] == '\t' || b[j-1] == '\n') {
-		j--
-	}
-	if i <= j {
-		return b[:i], b[i:j], b[j:]
-	}
-	return nil, nil, b[j:]
-}
-
-// matchSpace reformats src to use the same space context as orig.
-// 1) If orig begins with blank lines, matchSpace inserts them at the beginning of src.
-// 2) matchSpace copies the indentation of the first non-blank line in orig
-//    to every non-blank line in src.
-// 3) matchSpace copies the trailing space from orig and uses it in place
-//   of src's trailing space.
-func matchSpace(orig []byte, src []byte) []byte {
-	before, _, after := cutSpace(orig)
-	i := bytes.LastIndex(before, []byte{'\n'})
-	before, indent := before[:i+1], before[i+1:]
-
-	_, src, _ = cutSpace(src)
-
-	var b bytes.Buffer
-	b.Write(before)
-	for len(src) > 0 {
-		line := src
-		if i := bytes.IndexByte(line, '\n'); i >= 0 {
-			line, src = line[:i+1], line[i+1:]
-		} else {
-			src = nil
-		}
-		if len(line) > 0 && line[0] != '\n' { // not blank
-			b.Write(indent)
-		}
-		b.Write(line)
-	}
-	b.Write(after)
-	return b.Bytes()
-}
-
-var impLine = regexp.MustCompile(`^\s+(?:[\w\.]+\s+)?"(.+)"`)
-
-func addImportSpaces(r io.Reader, breaks []string) []byte {
-	var out bytes.Buffer
-	sc := bufio.NewScanner(r)
-	inImports := false
-	done := false
-	for sc.Scan() {
-		s := sc.Text()
-
-		if !inImports && !done && strings.HasPrefix(s, "import") {
-			inImports = true
-		}
-		if inImports && (strings.HasPrefix(s, "var") ||
-			strings.HasPrefix(s, "func") ||
-			strings.HasPrefix(s, "const") ||
-			strings.HasPrefix(s, "type")) {
-			done = true
-			inImports = false
-		}
-		if inImports && len(breaks) > 0 {
-			if m := impLine.FindStringSubmatch(s); m != nil {
-				if m[1] == breaks[0] {
-					out.WriteByte('\n')
-					breaks = breaks[1:]
-				}
-			}
-		}
-
-		fmt.Fprintln(&out, s)
-	}
-	return out.Bytes()
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/mkindex.go b/installer/vendor/golang.org/x/tools/imports/mkindex.go
deleted file mode 100644
index 755e2394f2..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/mkindex.go
+++ /dev/null
@@ -1,173 +0,0 @@
-// +build ignore
-
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Command mkindex creates the file "pkgindex.go" containing an index of the Go
-// standard library. The file is intended to be built as part of the imports
-// package, so that the package may be used in environments where a GOROOT is
-// not available (such as App Engine).
-package main
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"strings"
-)
-
-var (
-	pkgIndex = make(map[string][]pkg)
-	exports  = make(map[string]map[string]bool)
-)
-
-func main() {
-	// Don't use GOPATH.
-	ctx := build.Default
-	ctx.GOPATH = ""
-
-	// Populate pkgIndex global from GOROOT.
-	for _, path := range ctx.SrcDirs() {
-		f, err := os.Open(path)
-		if err != nil {
-			log.Print(err)
-			continue
-		}
-		children, err := f.Readdir(-1)
-		f.Close()
-		if err != nil {
-			log.Print(err)
-			continue
-		}
-		for _, child := range children {
-			if child.IsDir() {
-				loadPkg(path, child.Name())
-			}
-		}
-	}
-	// Populate exports global.
-	for _, ps := range pkgIndex {
-		for _, p := range ps {
-			e := loadExports(p.dir)
-			if e != nil {
-				exports[p.dir] = e
-			}
-		}
-	}
-
-	// Construct source file.
-	var buf bytes.Buffer
-	fmt.Fprint(&buf, pkgIndexHead)
-	fmt.Fprintf(&buf, "var pkgIndexMaster = %#v\n", pkgIndex)
-	fmt.Fprintf(&buf, "var exportsMaster = %#v\n", exports)
-	src := buf.Bytes()
-
-	// Replace main.pkg type name with pkg.
-	src = bytes.Replace(src, []byte("main.pkg"), []byte("pkg"), -1)
-	// Replace actual GOROOT with "/go".
-	src = bytes.Replace(src, []byte(ctx.GOROOT), []byte("/go"), -1)
-	// Add some line wrapping.
-	src = bytes.Replace(src, []byte("}, "), []byte("},\n"), -1)
-	src = bytes.Replace(src, []byte("true, "), []byte("true,\n"), -1)
-
-	var err error
-	src, err = format.Source(src)
-	if err != nil {
-		log.Fatal(err)
-	}
-
-	// Write out source file.
-	err = ioutil.WriteFile("pkgindex.go", src, 0644)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-const pkgIndexHead = `package imports
-
-func init() {
-	pkgIndexOnce.Do(func() {
-		pkgIndex.m = pkgIndexMaster
-	})
-	loadExports = func(dir string) map[string]bool {
-		return exportsMaster[dir]
-	}
-}
-`
-
-type pkg struct {
-	importpath string // full pkg import path, e.g. "net/http"
-	dir        string // absolute file path to pkg directory e.g. "/usr/lib/go/src/fmt"
-}
-
-var fset = token.NewFileSet()
-
-func loadPkg(root, importpath string) {
-	shortName := path.Base(importpath)
-	if shortName == "testdata" {
-		return
-	}
-
-	dir := filepath.Join(root, importpath)
-	pkgIndex[shortName] = append(pkgIndex[shortName], pkg{
-		importpath: importpath,
-		dir:        dir,
-	})
-
-	pkgDir, err := os.Open(dir)
-	if err != nil {
-		return
-	}
-	children, err := pkgDir.Readdir(-1)
-	pkgDir.Close()
-	if err != nil {
-		return
-	}
-	for _, child := range children {
-		name := child.Name()
-		if name == "" {
-			continue
-		}
-		if c := name[0]; c == '.' || ('0' <= c && c <= '9') {
-			continue
-		}
-		if child.IsDir() {
-			loadPkg(root, filepath.Join(importpath, name))
-		}
-	}
-}
-
-func loadExports(dir string) map[string]bool {
-	exports := make(map[string]bool)
-	buildPkg, err := build.ImportDir(dir, 0)
-	if err != nil {
-		if strings.Contains(err.Error(), "no buildable Go source files in") {
-			return nil
-		}
-		log.Printf("could not import %q: %v", dir, err)
-		return nil
-	}
-	for _, file := range buildPkg.GoFiles {
-		f, err := parser.ParseFile(fset, filepath.Join(dir, file), nil, 0)
-		if err != nil {
-			log.Printf("could not parse %q: %v", file, err)
-			continue
-		}
-		for name := range f.Scope.Objects {
-			if ast.IsExported(name) {
-				exports[name] = true
-			}
-		}
-	}
-	return exports
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/mkstdlib.go b/installer/vendor/golang.org/x/tools/imports/mkstdlib.go
deleted file mode 100644
index 6e6e1d6dc6..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/mkstdlib.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// +build ignore
-
-// mkstdlib generates the zstdlib.go file, containing the Go standard
-// library API symbols. It's baked into the binary to avoid scanning
-// GOPATH in the common case.
-package main
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"go/format"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"path"
-	"path/filepath"
-	"regexp"
-	"sort"
-	"strings"
-)
-
-func mustOpen(name string) io.Reader {
-	f, err := os.Open(name)
-	if err != nil {
-		log.Fatal(err)
-	}
-	return f
-}
-
-func api(base string) string {
-	return filepath.Join(os.Getenv("GOROOT"), "api", base)
-}
-
-var sym = regexp.MustCompile(`^pkg (\S+).*?, (?:var|func|type|const) ([A-Z]\w*)`)
-
-func main() {
-	var buf bytes.Buffer
-	outf := func(format string, args ...interface{}) {
-		fmt.Fprintf(&buf, format, args...)
-	}
-	outf("// Code generated by mkstdlib.go. DO NOT EDIT.\n\n")
-	outf("package imports\n")
-	outf("var stdlib = map[string]string{\n")
-	f := io.MultiReader(
-		mustOpen(api("go1.txt")),
-		mustOpen(api("go1.1.txt")),
-		mustOpen(api("go1.2.txt")),
-		mustOpen(api("go1.3.txt")),
-		mustOpen(api("go1.4.txt")),
-		mustOpen(api("go1.5.txt")),
-		mustOpen(api("go1.6.txt")),
-		mustOpen(api("go1.7.txt")),
-		mustOpen(api("go1.8.txt")),
-		mustOpen(api("go1.9.txt")),
-	)
-	sc := bufio.NewScanner(f)
-	fullImport := map[string]string{} // "zip.NewReader" => "archive/zip"
-	ambiguous := map[string]bool{}
-	var keys []string
-	for sc.Scan() {
-		l := sc.Text()
-		has := func(v string) bool { return strings.Contains(l, v) }
-		if has("struct, ") || has("interface, ") || has(", method (") {
-			continue
-		}
-		if m := sym.FindStringSubmatch(l); m != nil {
-			full := m[1]
-			key := path.Base(full) + "." + m[2]
-			if exist, ok := fullImport[key]; ok {
-				if exist != full {
-					ambiguous[key] = true
-				}
-			} else {
-				fullImport[key] = full
-				keys = append(keys, key)
-			}
-		}
-	}
-	if err := sc.Err(); err != nil {
-		log.Fatal(err)
-	}
-	sort.Strings(keys)
-	for _, key := range keys {
-		if ambiguous[key] {
-			outf("\t// %q is ambiguous\n", key)
-		} else {
-			outf("\t%q: %q,\n", key, fullImport[key])
-		}
-	}
-	outf("\n")
-	for _, sym := range [...]string{"Alignof", "ArbitraryType", "Offsetof", "Pointer", "Sizeof"} {
-		outf("\t%q: %q,\n", "unsafe."+sym, "unsafe")
-	}
-	outf("}\n")
-	fmtbuf, err := format.Source(buf.Bytes())
-	if err != nil {
-		log.Fatal(err)
-	}
-	err = ioutil.WriteFile("zstdlib.go", fmtbuf, 0666)
-	if err != nil {
-		log.Fatal(err)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/imports/sortimports.go b/installer/vendor/golang.org/x/tools/imports/sortimports.go
deleted file mode 100644
index 653afc5177..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/sortimports.go
+++ /dev/null
@@ -1,212 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Hacked up copy of go/ast/import.go
-
-package imports
-
-import (
-	"go/ast"
-	"go/token"
-	"sort"
-	"strconv"
-)
-
-// sortImports sorts runs of consecutive import lines in import blocks in f.
-// It also removes duplicate imports when it is possible to do so without data loss.
-func sortImports(fset *token.FileSet, f *ast.File) {
-	for i, d := range f.Decls {
-		d, ok := d.(*ast.GenDecl)
-		if !ok || d.Tok != token.IMPORT {
-			// Not an import declaration, so we're done.
-			// Imports are always first.
-			break
-		}
-
-		if len(d.Specs) == 0 {
-			// Empty import block, remove it.
-			f.Decls = append(f.Decls[:i], f.Decls[i+1:]...)
-		}
-
-		if !d.Lparen.IsValid() {
-			// Not a block: sorted by default.
-			continue
-		}
-
-		// Identify and sort runs of specs on successive lines.
-		i := 0
-		specs := d.Specs[:0]
-		for j, s := range d.Specs {
-			if j > i && fset.Position(s.Pos()).Line > 1+fset.Position(d.Specs[j-1].End()).Line {
-				// j begins a new run.  End this one.
-				specs = append(specs, sortSpecs(fset, f, d.Specs[i:j])...)
-				i = j
-			}
-		}
-		specs = append(specs, sortSpecs(fset, f, d.Specs[i:])...)
-		d.Specs = specs
-
-		// Deduping can leave a blank line before the rparen; clean that up.
-		if len(d.Specs) > 0 {
-			lastSpec := d.Specs[len(d.Specs)-1]
-			lastLine := fset.Position(lastSpec.Pos()).Line
-			if rParenLine := fset.Position(d.Rparen).Line; rParenLine > lastLine+1 {
-				fset.File(d.Rparen).MergeLine(rParenLine - 1)
-			}
-		}
-	}
-}
-
-func importPath(s ast.Spec) string {
-	t, err := strconv.Unquote(s.(*ast.ImportSpec).Path.Value)
-	if err == nil {
-		return t
-	}
-	return ""
-}
-
-func importName(s ast.Spec) string {
-	n := s.(*ast.ImportSpec).Name
-	if n == nil {
-		return ""
-	}
-	return n.Name
-}
-
-func importComment(s ast.Spec) string {
-	c := s.(*ast.ImportSpec).Comment
-	if c == nil {
-		return ""
-	}
-	return c.Text()
-}
-
-// collapse indicates whether prev may be removed, leaving only next.
-func collapse(prev, next ast.Spec) bool {
-	if importPath(next) != importPath(prev) || importName(next) != importName(prev) {
-		return false
-	}
-	return prev.(*ast.ImportSpec).Comment == nil
-}
-
-type posSpan struct {
-	Start token.Pos
-	End   token.Pos
-}
-
-func sortSpecs(fset *token.FileSet, f *ast.File, specs []ast.Spec) []ast.Spec {
-	// Can't short-circuit here even if specs are already sorted,
-	// since they might yet need deduplication.
-	// A lone import, however, may be safely ignored.
-	if len(specs) <= 1 {
-		return specs
-	}
-
-	// Record positions for specs.
-	pos := make([]posSpan, len(specs))
-	for i, s := range specs {
-		pos[i] = posSpan{s.Pos(), s.End()}
-	}
-
-	// Identify comments in this range.
-	// Any comment from pos[0].Start to the final line counts.
-	lastLine := fset.Position(pos[len(pos)-1].End).Line
-	cstart := len(f.Comments)
-	cend := len(f.Comments)
-	for i, g := range f.Comments {
-		if g.Pos() < pos[0].Start {
-			continue
-		}
-		if i < cstart {
-			cstart = i
-		}
-		if fset.Position(g.End()).Line > lastLine {
-			cend = i
-			break
-		}
-	}
-	comments := f.Comments[cstart:cend]
-
-	// Assign each comment to the import spec preceding it.
-	importComment := map[*ast.ImportSpec][]*ast.CommentGroup{}
-	specIndex := 0
-	for _, g := range comments {
-		for specIndex+1 < len(specs) && pos[specIndex+1].Start <= g.Pos() {
-			specIndex++
-		}
-		s := specs[specIndex].(*ast.ImportSpec)
-		importComment[s] = append(importComment[s], g)
-	}
-
-	// Sort the import specs by import path.
-	// Remove duplicates, when possible without data loss.
-	// Reassign the import paths to have the same position sequence.
-	// Reassign each comment to abut the end of its spec.
-	// Sort the comments by new position.
-	sort.Sort(byImportSpec(specs))
-
-	// Dedup. Thanks to our sorting, we can just consider
-	// adjacent pairs of imports.
-	deduped := specs[:0]
-	for i, s := range specs {
-		if i == len(specs)-1 || !collapse(s, specs[i+1]) {
-			deduped = append(deduped, s)
-		} else {
-			p := s.Pos()
-			fset.File(p).MergeLine(fset.Position(p).Line)
-		}
-	}
-	specs = deduped
-
-	// Fix up comment positions
-	for i, s := range specs {
-		s := s.(*ast.ImportSpec)
-		if s.Name != nil {
-			s.Name.NamePos = pos[i].Start
-		}
-		s.Path.ValuePos = pos[i].Start
-		s.EndPos = pos[i].End
-		for _, g := range importComment[s] {
-			for _, c := range g.List {
-				c.Slash = pos[i].End
-			}
-		}
-	}
-
-	sort.Sort(byCommentPos(comments))
-
-	return specs
-}
-
-type byImportSpec []ast.Spec // slice of *ast.ImportSpec
-
-func (x byImportSpec) Len() int      { return len(x) }
-func (x byImportSpec) Swap(i, j int) { x[i], x[j] = x[j], x[i] }
-func (x byImportSpec) Less(i, j int) bool {
-	ipath := importPath(x[i])
-	jpath := importPath(x[j])
-
-	igroup := importGroup(ipath)
-	jgroup := importGroup(jpath)
-	if igroup != jgroup {
-		return igroup < jgroup
-	}
-
-	if ipath != jpath {
-		return ipath < jpath
-	}
-	iname := importName(x[i])
-	jname := importName(x[j])
-
-	if iname != jname {
-		return iname < jname
-	}
-	return importComment(x[i]) < importComment(x[j])
-}
-
-type byCommentPos []*ast.CommentGroup
-
-func (x byCommentPos) Len() int           { return len(x) }
-func (x byCommentPos) Swap(i, j int)      { x[i], x[j] = x[j], x[i] }
-func (x byCommentPos) Less(i, j int) bool { return x[i].Pos() < x[j].Pos() }
diff --git a/installer/vendor/golang.org/x/tools/imports/zstdlib.go b/installer/vendor/golang.org/x/tools/imports/zstdlib.go
deleted file mode 100644
index 974c2d0401..0000000000
--- a/installer/vendor/golang.org/x/tools/imports/zstdlib.go
+++ /dev/null
@@ -1,9448 +0,0 @@
-// Code generated by mkstdlib.go. DO NOT EDIT.
-
-package imports
-
-var stdlib = map[string]string{
-	"adler32.Checksum":                              "hash/adler32",
-	"adler32.New":                                   "hash/adler32",
-	"adler32.Size":                                  "hash/adler32",
-	"aes.BlockSize":                                 "crypto/aes",
-	"aes.KeySizeError":                              "crypto/aes",
-	"aes.NewCipher":                                 "crypto/aes",
-	"ascii85.CorruptInputError":                     "encoding/ascii85",
-	"ascii85.Decode":                                "encoding/ascii85",
-	"ascii85.Encode":                                "encoding/ascii85",
-	"ascii85.MaxEncodedLen":                         "encoding/ascii85",
-	"ascii85.NewDecoder":                            "encoding/ascii85",
-	"ascii85.NewEncoder":                            "encoding/ascii85",
-	"asn1.BitString":                                "encoding/asn1",
-	"asn1.ClassApplication":                         "encoding/asn1",
-	"asn1.ClassContextSpecific":                     "encoding/asn1",
-	"asn1.ClassPrivate":                             "encoding/asn1",
-	"asn1.ClassUniversal":                           "encoding/asn1",
-	"asn1.Enumerated":                               "encoding/asn1",
-	"asn1.Flag":                                     "encoding/asn1",
-	"asn1.Marshal":                                  "encoding/asn1",
-	"asn1.NullBytes":                                "encoding/asn1",
-	"asn1.NullRawValue":                             "encoding/asn1",
-	"asn1.ObjectIdentifier":                         "encoding/asn1",
-	"asn1.RawContent":                               "encoding/asn1",
-	"asn1.RawValue":                                 "encoding/asn1",
-	"asn1.StructuralError":                          "encoding/asn1",
-	"asn1.SyntaxError":                              "encoding/asn1",
-	"asn1.TagBitString":                             "encoding/asn1",
-	"asn1.TagBoolean":                               "encoding/asn1",
-	"asn1.TagEnum":                                  "encoding/asn1",
-	"asn1.TagGeneralString":                         "encoding/asn1",
-	"asn1.TagGeneralizedTime":                       "encoding/asn1",
-	"asn1.TagIA5String":                             "encoding/asn1",
-	"asn1.TagInteger":                               "encoding/asn1",
-	"asn1.TagNull":                                  "encoding/asn1",
-	"asn1.TagOID":                                   "encoding/asn1",
-	"asn1.TagOctetString":                           "encoding/asn1",
-	"asn1.TagPrintableString":                       "encoding/asn1",
-	"asn1.TagSequence":                              "encoding/asn1",
-	"asn1.TagSet":                                   "encoding/asn1",
-	"asn1.TagT61String":                             "encoding/asn1",
-	"asn1.TagUTCTime":                               "encoding/asn1",
-	"asn1.TagUTF8String":                            "encoding/asn1",
-	"asn1.Unmarshal":                                "encoding/asn1",
-	"asn1.UnmarshalWithParams":                      "encoding/asn1",
-	"ast.ArrayType":                                 "go/ast",
-	"ast.AssignStmt":                                "go/ast",
-	"ast.Bad":                                       "go/ast",
-	"ast.BadDecl":                                   "go/ast",
-	"ast.BadExpr":                                   "go/ast",
-	"ast.BadStmt":                                   "go/ast",
-	"ast.BasicLit":                                  "go/ast",
-	"ast.BinaryExpr":                                "go/ast",
-	"ast.BlockStmt":                                 "go/ast",
-	"ast.BranchStmt":                                "go/ast",
-	"ast.CallExpr":                                  "go/ast",
-	"ast.CaseClause":                                "go/ast",
-	"ast.ChanDir":                                   "go/ast",
-	"ast.ChanType":                                  "go/ast",
-	"ast.CommClause":                                "go/ast",
-	"ast.Comment":                                   "go/ast",
-	"ast.CommentGroup":                              "go/ast",
-	"ast.CommentMap":                                "go/ast",
-	"ast.CompositeLit":                              "go/ast",
-	"ast.Con":                                       "go/ast",
-	"ast.DeclStmt":                                  "go/ast",
-	"ast.DeferStmt":                                 "go/ast",
-	"ast.Ellipsis":                                  "go/ast",
-	"ast.EmptyStmt":                                 "go/ast",
-	"ast.ExprStmt":                                  "go/ast",
-	"ast.Field":                                     "go/ast",
-	"ast.FieldFilter":                               "go/ast",
-	"ast.FieldList":                                 "go/ast",
-	"ast.File":                                      "go/ast",
-	"ast.FileExports":                               "go/ast",
-	"ast.Filter":                                    "go/ast",
-	"ast.FilterDecl":                                "go/ast",
-	"ast.FilterFile":                                "go/ast",
-	"ast.FilterFuncDuplicates":                      "go/ast",
-	"ast.FilterImportDuplicates":                    "go/ast",
-	"ast.FilterPackage":                             "go/ast",
-	"ast.FilterUnassociatedComments":                "go/ast",
-	"ast.ForStmt":                                   "go/ast",
-	"ast.Fprint":                                    "go/ast",
-	"ast.Fun":                                       "go/ast",
-	"ast.FuncDecl":                                  "go/ast",
-	"ast.FuncLit":                                   "go/ast",
-	"ast.FuncType":                                  "go/ast",
-	"ast.GenDecl":                                   "go/ast",
-	"ast.GoStmt":                                    "go/ast",
-	"ast.Ident":                                     "go/ast",
-	"ast.IfStmt":                                    "go/ast",
-	"ast.ImportSpec":                                "go/ast",
-	"ast.Importer":                                  "go/ast",
-	"ast.IncDecStmt":                                "go/ast",
-	"ast.IndexExpr":                                 "go/ast",
-	"ast.Inspect":                                   "go/ast",
-	"ast.InterfaceType":                             "go/ast",
-	"ast.IsExported":                                "go/ast",
-	"ast.KeyValueExpr":                              "go/ast",
-	"ast.LabeledStmt":                               "go/ast",
-	"ast.Lbl":                                       "go/ast",
-	"ast.MapType":                                   "go/ast",
-	"ast.MergeMode":                                 "go/ast",
-	"ast.MergePackageFiles":                         "go/ast",
-	"ast.NewCommentMap":                             "go/ast",
-	"ast.NewIdent":                                  "go/ast",
-	"ast.NewObj":                                    "go/ast",
-	"ast.NewPackage":                                "go/ast",
-	"ast.NewScope":                                  "go/ast",
-	"ast.Node":                                      "go/ast",
-	"ast.NotNilFilter":                              "go/ast",
-	"ast.ObjKind":                                   "go/ast",
-	"ast.Object":                                    "go/ast",
-	"ast.Package":                                   "go/ast",
-	"ast.PackageExports":                            "go/ast",
-	"ast.ParenExpr":                                 "go/ast",
-	"ast.Pkg":                                       "go/ast",
-	"ast.Print":                                     "go/ast",
-	"ast.RECV":                                      "go/ast",
-	"ast.RangeStmt":                                 "go/ast",
-	"ast.ReturnStmt":                                "go/ast",
-	"ast.SEND":                                      "go/ast",
-	"ast.Scope":                                     "go/ast",
-	"ast.SelectStmt":                                "go/ast",
-	"ast.SelectorExpr":                              "go/ast",
-	"ast.SendStmt":                                  "go/ast",
-	"ast.SliceExpr":                                 "go/ast",
-	"ast.SortImports":                               "go/ast",
-	"ast.StarExpr":                                  "go/ast",
-	"ast.StructType":                                "go/ast",
-	"ast.SwitchStmt":                                "go/ast",
-	"ast.Typ":                                       "go/ast",
-	"ast.TypeAssertExpr":                            "go/ast",
-	"ast.TypeSpec":                                  "go/ast",
-	"ast.TypeSwitchStmt":                            "go/ast",
-	"ast.UnaryExpr":                                 "go/ast",
-	"ast.ValueSpec":                                 "go/ast",
-	"ast.Var":                                       "go/ast",
-	"ast.Visitor":                                   "go/ast",
-	"ast.Walk":                                      "go/ast",
-	"atomic.AddInt32":                               "sync/atomic",
-	"atomic.AddInt64":                               "sync/atomic",
-	"atomic.AddUint32":                              "sync/atomic",
-	"atomic.AddUint64":                              "sync/atomic",
-	"atomic.AddUintptr":                             "sync/atomic",
-	"atomic.CompareAndSwapInt32":                    "sync/atomic",
-	"atomic.CompareAndSwapInt64":                    "sync/atomic",
-	"atomic.CompareAndSwapPointer":                  "sync/atomic",
-	"atomic.CompareAndSwapUint32":                   "sync/atomic",
-	"atomic.CompareAndSwapUint64":                   "sync/atomic",
-	"atomic.CompareAndSwapUintptr":                  "sync/atomic",
-	"atomic.LoadInt32":                              "sync/atomic",
-	"atomic.LoadInt64":                              "sync/atomic",
-	"atomic.LoadPointer":                            "sync/atomic",
-	"atomic.LoadUint32":                             "sync/atomic",
-	"atomic.LoadUint64":                             "sync/atomic",
-	"atomic.LoadUintptr":                            "sync/atomic",
-	"atomic.StoreInt32":                             "sync/atomic",
-	"atomic.StoreInt64":                             "sync/atomic",
-	"atomic.StorePointer":                           "sync/atomic",
-	"atomic.StoreUint32":                            "sync/atomic",
-	"atomic.StoreUint64":                            "sync/atomic",
-	"atomic.StoreUintptr":                           "sync/atomic",
-	"atomic.SwapInt32":                              "sync/atomic",
-	"atomic.SwapInt64":                              "sync/atomic",
-	"atomic.SwapPointer":                            "sync/atomic",
-	"atomic.SwapUint32":                             "sync/atomic",
-	"atomic.SwapUint64":                             "sync/atomic",
-	"atomic.SwapUintptr":                            "sync/atomic",
-	"atomic.Value":                                  "sync/atomic",
-	"base32.CorruptInputError":                      "encoding/base32",
-	"base32.Encoding":                               "encoding/base32",
-	"base32.HexEncoding":                            "encoding/base32",
-	"base32.NewDecoder":                             "encoding/base32",
-	"base32.NewEncoder":                             "encoding/base32",
-	"base32.NewEncoding":                            "encoding/base32",
-	"base32.NoPadding":                              "encoding/base32",
-	"base32.StdEncoding":                            "encoding/base32",
-	"base32.StdPadding":                             "encoding/base32",
-	"base64.CorruptInputError":                      "encoding/base64",
-	"base64.Encoding":                               "encoding/base64",
-	"base64.NewDecoder":                             "encoding/base64",
-	"base64.NewEncoder":                             "encoding/base64",
-	"base64.NewEncoding":                            "encoding/base64",
-	"base64.NoPadding":                              "encoding/base64",
-	"base64.RawStdEncoding":                         "encoding/base64",
-	"base64.RawURLEncoding":                         "encoding/base64",
-	"base64.StdEncoding":                            "encoding/base64",
-	"base64.StdPadding":                             "encoding/base64",
-	"base64.URLEncoding":                            "encoding/base64",
-	"big.Above":                                     "math/big",
-	"big.Accuracy":                                  "math/big",
-	"big.AwayFromZero":                              "math/big",
-	"big.Below":                                     "math/big",
-	"big.ErrNaN":                                    "math/big",
-	"big.Exact":                                     "math/big",
-	"big.Float":                                     "math/big",
-	"big.Int":                                       "math/big",
-	"big.Jacobi":                                    "math/big",
-	"big.MaxBase":                                   "math/big",
-	"big.MaxExp":                                    "math/big",
-	"big.MaxPrec":                                   "math/big",
-	"big.MinExp":                                    "math/big",
-	"big.NewFloat":                                  "math/big",
-	"big.NewInt":                                    "math/big",
-	"big.NewRat":                                    "math/big",
-	"big.ParseFloat":                                "math/big",
-	"big.Rat":                                       "math/big",
-	"big.RoundingMode":                              "math/big",
-	"big.ToNearestAway":                             "math/big",
-	"big.ToNearestEven":                             "math/big",
-	"big.ToNegativeInf":                             "math/big",
-	"big.ToPositiveInf":                             "math/big",
-	"big.ToZero":                                    "math/big",
-	"big.Word":                                      "math/big",
-	"binary.BigEndian":                              "encoding/binary",
-	"binary.ByteOrder":                              "encoding/binary",
-	"binary.LittleEndian":                           "encoding/binary",
-	"binary.MaxVarintLen16":                         "encoding/binary",
-	"binary.MaxVarintLen32":                         "encoding/binary",
-	"binary.MaxVarintLen64":                         "encoding/binary",
-	"binary.PutUvarint":                             "encoding/binary",
-	"binary.PutVarint":                              "encoding/binary",
-	"binary.Read":                                   "encoding/binary",
-	"binary.ReadUvarint":                            "encoding/binary",
-	"binary.ReadVarint":                             "encoding/binary",
-	"binary.Size":                                   "encoding/binary",
-	"binary.Uvarint":                                "encoding/binary",
-	"binary.Varint":                                 "encoding/binary",
-	"binary.Write":                                  "encoding/binary",
-	"bits.LeadingZeros":                             "math/bits",
-	"bits.LeadingZeros16":                           "math/bits",
-	"bits.LeadingZeros32":                           "math/bits",
-	"bits.LeadingZeros64":                           "math/bits",
-	"bits.LeadingZeros8":                            "math/bits",
-	"bits.Len":                                      "math/bits",
-	"bits.Len16":                                    "math/bits",
-	"bits.Len32":                                    "math/bits",
-	"bits.Len64":                                    "math/bits",
-	"bits.Len8":                                     "math/bits",
-	"bits.OnesCount":                                "math/bits",
-	"bits.OnesCount16":                              "math/bits",
-	"bits.OnesCount32":                              "math/bits",
-	"bits.OnesCount64":                              "math/bits",
-	"bits.OnesCount8":                               "math/bits",
-	"bits.Reverse":                                  "math/bits",
-	"bits.Reverse16":                                "math/bits",
-	"bits.Reverse32":                                "math/bits",
-	"bits.Reverse64":                                "math/bits",
-	"bits.Reverse8":                                 "math/bits",
-	"bits.ReverseBytes":                             "math/bits",
-	"bits.ReverseBytes16":                           "math/bits",
-	"bits.ReverseBytes32":                           "math/bits",
-	"bits.ReverseBytes64":                           "math/bits",
-	"bits.RotateLeft":                               "math/bits",
-	"bits.RotateLeft16":                             "math/bits",
-	"bits.RotateLeft32":                             "math/bits",
-	"bits.RotateLeft64":                             "math/bits",
-	"bits.RotateLeft8":                              "math/bits",
-	"bits.TrailingZeros":                            "math/bits",
-	"bits.TrailingZeros16":                          "math/bits",
-	"bits.TrailingZeros32":                          "math/bits",
-	"bits.TrailingZeros64":                          "math/bits",
-	"bits.TrailingZeros8":                           "math/bits",
-	"bits.UintSize":                                 "math/bits",
-	"bufio.ErrAdvanceTooFar":                        "bufio",
-	"bufio.ErrBufferFull":                           "bufio",
-	"bufio.ErrFinalToken":                           "bufio",
-	"bufio.ErrInvalidUnreadByte":                    "bufio",
-	"bufio.ErrInvalidUnreadRune":                    "bufio",
-	"bufio.ErrNegativeAdvance":                      "bufio",
-	"bufio.ErrNegativeCount":                        "bufio",
-	"bufio.ErrTooLong":                              "bufio",
-	"bufio.MaxScanTokenSize":                        "bufio",
-	"bufio.NewReadWriter":                           "bufio",
-	"bufio.NewReader":                               "bufio",
-	"bufio.NewReaderSize":                           "bufio",
-	"bufio.NewScanner":                              "bufio",
-	"bufio.NewWriter":                               "bufio",
-	"bufio.NewWriterSize":                           "bufio",
-	"bufio.ReadWriter":                              "bufio",
-	"bufio.Reader":                                  "bufio",
-	"bufio.ScanBytes":                               "bufio",
-	"bufio.ScanLines":                               "bufio",
-	"bufio.ScanRunes":                               "bufio",
-	"bufio.ScanWords":                               "bufio",
-	"bufio.Scanner":                                 "bufio",
-	"bufio.SplitFunc":                               "bufio",
-	"bufio.Writer":                                  "bufio",
-	"build.AllowBinary":                             "go/build",
-	"build.ArchChar":                                "go/build",
-	"build.Context":                                 "go/build",
-	"build.Default":                                 "go/build",
-	"build.FindOnly":                                "go/build",
-	"build.IgnoreVendor":                            "go/build",
-	"build.Import":                                  "go/build",
-	"build.ImportComment":                           "go/build",
-	"build.ImportDir":                               "go/build",
-	"build.ImportMode":                              "go/build",
-	"build.IsLocalImport":                           "go/build",
-	"build.MultiplePackageError":                    "go/build",
-	"build.NoGoError":                               "go/build",
-	"build.Package":                                 "go/build",
-	"build.ToolDir":                                 "go/build",
-	"bytes.Buffer":                                  "bytes",
-	"bytes.Compare":                                 "bytes",
-	"bytes.Contains":                                "bytes",
-	"bytes.ContainsAny":                             "bytes",
-	"bytes.ContainsRune":                            "bytes",
-	"bytes.Count":                                   "bytes",
-	"bytes.Equal":                                   "bytes",
-	"bytes.EqualFold":                               "bytes",
-	"bytes.ErrTooLarge":                             "bytes",
-	"bytes.Fields":                                  "bytes",
-	"bytes.FieldsFunc":                              "bytes",
-	"bytes.HasPrefix":                               "bytes",
-	"bytes.HasSuffix":                               "bytes",
-	"bytes.Index":                                   "bytes",
-	"bytes.IndexAny":                                "bytes",
-	"bytes.IndexByte":                               "bytes",
-	"bytes.IndexFunc":                               "bytes",
-	"bytes.IndexRune":                               "bytes",
-	"bytes.Join":                                    "bytes",
-	"bytes.LastIndex":                               "bytes",
-	"bytes.LastIndexAny":                            "bytes",
-	"bytes.LastIndexByte":                           "bytes",
-	"bytes.LastIndexFunc":                           "bytes",
-	"bytes.Map":                                     "bytes",
-	"bytes.MinRead":                                 "bytes",
-	"bytes.NewBuffer":                               "bytes",
-	"bytes.NewBufferString":                         "bytes",
-	"bytes.NewReader":                               "bytes",
-	"bytes.Reader":                                  "bytes",
-	"bytes.Repeat":                                  "bytes",
-	"bytes.Replace":                                 "bytes",
-	"bytes.Runes":                                   "bytes",
-	"bytes.Split":                                   "bytes",
-	"bytes.SplitAfter":                              "bytes",
-	"bytes.SplitAfterN":                             "bytes",
-	"bytes.SplitN":                                  "bytes",
-	"bytes.Title":                                   "bytes",
-	"bytes.ToLower":                                 "bytes",
-	"bytes.ToLowerSpecial":                          "bytes",
-	"bytes.ToTitle":                                 "bytes",
-	"bytes.ToTitleSpecial":                          "bytes",
-	"bytes.ToUpper":                                 "bytes",
-	"bytes.ToUpperSpecial":                          "bytes",
-	"bytes.Trim":                                    "bytes",
-	"bytes.TrimFunc":                                "bytes",
-	"bytes.TrimLeft":                                "bytes",
-	"bytes.TrimLeftFunc":                            "bytes",
-	"bytes.TrimPrefix":                              "bytes",
-	"bytes.TrimRight":                               "bytes",
-	"bytes.TrimRightFunc":                           "bytes",
-	"bytes.TrimSpace":                               "bytes",
-	"bytes.TrimSuffix":                              "bytes",
-	"bzip2.NewReader":                               "compress/bzip2",
-	"bzip2.StructuralError":                         "compress/bzip2",
-	"cgi.Handler":                                   "net/http/cgi",
-	"cgi.Request":                                   "net/http/cgi",
-	"cgi.RequestFromMap":                            "net/http/cgi",
-	"cgi.Serve":                                     "net/http/cgi",
-	"cipher.AEAD":                                   "crypto/cipher",
-	"cipher.Block":                                  "crypto/cipher",
-	"cipher.BlockMode":                              "crypto/cipher",
-	"cipher.NewCBCDecrypter":                        "crypto/cipher",
-	"cipher.NewCBCEncrypter":                        "crypto/cipher",
-	"cipher.NewCFBDecrypter":                        "crypto/cipher",
-	"cipher.NewCFBEncrypter":                        "crypto/cipher",
-	"cipher.NewCTR":                                 "crypto/cipher",
-	"cipher.NewGCM":                                 "crypto/cipher",
-	"cipher.NewGCMWithNonceSize":                    "crypto/cipher",
-	"cipher.NewOFB":                                 "crypto/cipher",
-	"cipher.Stream":                                 "crypto/cipher",
-	"cipher.StreamReader":                           "crypto/cipher",
-	"cipher.StreamWriter":                           "crypto/cipher",
-	"cmplx.Abs":                                     "math/cmplx",
-	"cmplx.Acos":                                    "math/cmplx",
-	"cmplx.Acosh":                                   "math/cmplx",
-	"cmplx.Asin":                                    "math/cmplx",
-	"cmplx.Asinh":                                   "math/cmplx",
-	"cmplx.Atan":                                    "math/cmplx",
-	"cmplx.Atanh":                                   "math/cmplx",
-	"cmplx.Conj":                                    "math/cmplx",
-	"cmplx.Cos":                                     "math/cmplx",
-	"cmplx.Cosh":                                    "math/cmplx",
-	"cmplx.Cot":                                     "math/cmplx",
-	"cmplx.Exp":                                     "math/cmplx",
-	"cmplx.Inf":                                     "math/cmplx",
-	"cmplx.IsInf":                                   "math/cmplx",
-	"cmplx.IsNaN":                                   "math/cmplx",
-	"cmplx.Log":                                     "math/cmplx",
-	"cmplx.Log10":                                   "math/cmplx",
-	"cmplx.NaN":                                     "math/cmplx",
-	"cmplx.Phase":                                   "math/cmplx",
-	"cmplx.Polar":                                   "math/cmplx",
-	"cmplx.Pow":                                     "math/cmplx",
-	"cmplx.Rect":                                    "math/cmplx",
-	"cmplx.Sin":                                     "math/cmplx",
-	"cmplx.Sinh":                                    "math/cmplx",
-	"cmplx.Sqrt":                                    "math/cmplx",
-	"cmplx.Tan":                                     "math/cmplx",
-	"cmplx.Tanh":                                    "math/cmplx",
-	"color.Alpha":                                   "image/color",
-	"color.Alpha16":                                 "image/color",
-	"color.Alpha16Model":                            "image/color",
-	"color.AlphaModel":                              "image/color",
-	"color.Black":                                   "image/color",
-	"color.CMYK":                                    "image/color",
-	"color.CMYKModel":                               "image/color",
-	"color.CMYKToRGB":                               "image/color",
-	"color.Color":                                   "image/color",
-	"color.Gray":                                    "image/color",
-	"color.Gray16":                                  "image/color",
-	"color.Gray16Model":                             "image/color",
-	"color.GrayModel":                               "image/color",
-	"color.Model":                                   "image/color",
-	"color.ModelFunc":                               "image/color",
-	"color.NRGBA":                                   "image/color",
-	"color.NRGBA64":                                 "image/color",
-	"color.NRGBA64Model":                            "image/color",
-	"color.NRGBAModel":                              "image/color",
-	"color.NYCbCrA":                                 "image/color",
-	"color.NYCbCrAModel":                            "image/color",
-	"color.Opaque":                                  "image/color",
-	"color.Palette":                                 "image/color",
-	"color.RGBA":                                    "image/color",
-	"color.RGBA64":                                  "image/color",
-	"color.RGBA64Model":                             "image/color",
-	"color.RGBAModel":                               "image/color",
-	"color.RGBToCMYK":                               "image/color",
-	"color.RGBToYCbCr":                              "image/color",
-	"color.Transparent":                             "image/color",
-	"color.White":                                   "image/color",
-	"color.YCbCr":                                   "image/color",
-	"color.YCbCrModel":                              "image/color",
-	"color.YCbCrToRGB":                              "image/color",
-	"constant.BinaryOp":                             "go/constant",
-	"constant.BitLen":                               "go/constant",
-	"constant.Bool":                                 "go/constant",
-	"constant.BoolVal":                              "go/constant",
-	"constant.Bytes":                                "go/constant",
-	"constant.Compare":                              "go/constant",
-	"constant.Complex":                              "go/constant",
-	"constant.Denom":                                "go/constant",
-	"constant.Float":                                "go/constant",
-	"constant.Float32Val":                           "go/constant",
-	"constant.Float64Val":                           "go/constant",
-	"constant.Imag":                                 "go/constant",
-	"constant.Int":                                  "go/constant",
-	"constant.Int64Val":                             "go/constant",
-	"constant.Kind":                                 "go/constant",
-	"constant.MakeBool":                             "go/constant",
-	"constant.MakeFloat64":                          "go/constant",
-	"constant.MakeFromBytes":                        "go/constant",
-	"constant.MakeFromLiteral":                      "go/constant",
-	"constant.MakeImag":                             "go/constant",
-	"constant.MakeInt64":                            "go/constant",
-	"constant.MakeString":                           "go/constant",
-	"constant.MakeUint64":                           "go/constant",
-	"constant.MakeUnknown":                          "go/constant",
-	"constant.Num":                                  "go/constant",
-	"constant.Real":                                 "go/constant",
-	"constant.Shift":                                "go/constant",
-	"constant.Sign":                                 "go/constant",
-	"constant.String":                               "go/constant",
-	"constant.StringVal":                            "go/constant",
-	"constant.ToComplex":                            "go/constant",
-	"constant.ToFloat":                              "go/constant",
-	"constant.ToInt":                                "go/constant",
-	"constant.Uint64Val":                            "go/constant",
-	"constant.UnaryOp":                              "go/constant",
-	"constant.Unknown":                              "go/constant",
-	"context.Background":                            "context",
-	"context.CancelFunc":                            "context",
-	"context.Canceled":                              "context",
-	"context.Context":                               "context",
-	"context.DeadlineExceeded":                      "context",
-	"context.TODO":                                  "context",
-	"context.WithCancel":                            "context",
-	"context.WithDeadline":                          "context",
-	"context.WithTimeout":                           "context",
-	"context.WithValue":                             "context",
-	"cookiejar.Jar":                                 "net/http/cookiejar",
-	"cookiejar.New":                                 "net/http/cookiejar",
-	"cookiejar.Options":                             "net/http/cookiejar",
-	"cookiejar.PublicSuffixList":                    "net/http/cookiejar",
-	"crc32.Castagnoli":                              "hash/crc32",
-	"crc32.Checksum":                                "hash/crc32",
-	"crc32.ChecksumIEEE":                            "hash/crc32",
-	"crc32.IEEE":                                    "hash/crc32",
-	"crc32.IEEETable":                               "hash/crc32",
-	"crc32.Koopman":                                 "hash/crc32",
-	"crc32.MakeTable":                               "hash/crc32",
-	"crc32.New":                                     "hash/crc32",
-	"crc32.NewIEEE":                                 "hash/crc32",
-	"crc32.Size":                                    "hash/crc32",
-	"crc32.Table":                                   "hash/crc32",
-	"crc32.Update":                                  "hash/crc32",
-	"crc64.Checksum":                                "hash/crc64",
-	"crc64.ECMA":                                    "hash/crc64",
-	"crc64.ISO":                                     "hash/crc64",
-	"crc64.MakeTable":                               "hash/crc64",
-	"crc64.New":                                     "hash/crc64",
-	"crc64.Size":                                    "hash/crc64",
-	"crc64.Table":                                   "hash/crc64",
-	"crc64.Update":                                  "hash/crc64",
-	"crypto.BLAKE2b_256":                            "crypto",
-	"crypto.BLAKE2b_384":                            "crypto",
-	"crypto.BLAKE2b_512":                            "crypto",
-	"crypto.BLAKE2s_256":                            "crypto",
-	"crypto.Decrypter":                              "crypto",
-	"crypto.DecrypterOpts":                          "crypto",
-	"crypto.Hash":                                   "crypto",
-	"crypto.MD4":                                    "crypto",
-	"crypto.MD5":                                    "crypto",
-	"crypto.MD5SHA1":                                "crypto",
-	"crypto.PrivateKey":                             "crypto",
-	"crypto.PublicKey":                              "crypto",
-	"crypto.RIPEMD160":                              "crypto",
-	"crypto.RegisterHash":                           "crypto",
-	"crypto.SHA1":                                   "crypto",
-	"crypto.SHA224":                                 "crypto",
-	"crypto.SHA256":                                 "crypto",
-	"crypto.SHA384":                                 "crypto",
-	"crypto.SHA3_224":                               "crypto",
-	"crypto.SHA3_256":                               "crypto",
-	"crypto.SHA3_384":                               "crypto",
-	"crypto.SHA3_512":                               "crypto",
-	"crypto.SHA512":                                 "crypto",
-	"crypto.SHA512_224":                             "crypto",
-	"crypto.SHA512_256":                             "crypto",
-	"crypto.Signer":                                 "crypto",
-	"crypto.SignerOpts":                             "crypto",
-	"csv.ErrBareQuote":                              "encoding/csv",
-	"csv.ErrFieldCount":                             "encoding/csv",
-	"csv.ErrQuote":                                  "encoding/csv",
-	"csv.ErrTrailingComma":                          "encoding/csv",
-	"csv.NewReader":                                 "encoding/csv",
-	"csv.NewWriter":                                 "encoding/csv",
-	"csv.ParseError":                                "encoding/csv",
-	"csv.Reader":                                    "encoding/csv",
-	"csv.Writer":                                    "encoding/csv",
-	"debug.FreeOSMemory":                            "runtime/debug",
-	"debug.GCStats":                                 "runtime/debug",
-	"debug.PrintStack":                              "runtime/debug",
-	"debug.ReadGCStats":                             "runtime/debug",
-	"debug.SetGCPercent":                            "runtime/debug",
-	"debug.SetMaxStack":                             "runtime/debug",
-	"debug.SetMaxThreads":                           "runtime/debug",
-	"debug.SetPanicOnFault":                         "runtime/debug",
-	"debug.SetTraceback":                            "runtime/debug",
-	"debug.Stack":                                   "runtime/debug",
-	"debug.WriteHeapDump":                           "runtime/debug",
-	"des.BlockSize":                                 "crypto/des",
-	"des.KeySizeError":                              "crypto/des",
-	"des.NewCipher":                                 "crypto/des",
-	"des.NewTripleDESCipher":                        "crypto/des",
-	"doc.AllDecls":                                  "go/doc",
-	"doc.AllMethods":                                "go/doc",
-	"doc.Example":                                   "go/doc",
-	"doc.Examples":                                  "go/doc",
-	"doc.Filter":                                    "go/doc",
-	"doc.Func":                                      "go/doc",
-	"doc.IllegalPrefixes":                           "go/doc",
-	"doc.IsPredeclared":                             "go/doc",
-	"doc.Mode":                                      "go/doc",
-	"doc.New":                                       "go/doc",
-	"doc.Note":                                      "go/doc",
-	"doc.Package":                                   "go/doc",
-	"doc.Synopsis":                                  "go/doc",
-	"doc.ToHTML":                                    "go/doc",
-	"doc.ToText":                                    "go/doc",
-	"doc.Type":                                      "go/doc",
-	"doc.Value":                                     "go/doc",
-	"draw.Draw":                                     "image/draw",
-	"draw.DrawMask":                                 "image/draw",
-	"draw.Drawer":                                   "image/draw",
-	"draw.FloydSteinberg":                           "image/draw",
-	"draw.Image":                                    "image/draw",
-	"draw.Op":                                       "image/draw",
-	"draw.Over":                                     "image/draw",
-	"draw.Quantizer":                                "image/draw",
-	"draw.Src":                                      "image/draw",
-	"driver.Bool":                                   "database/sql/driver",
-	"driver.ColumnConverter":                        "database/sql/driver",
-	"driver.Conn":                                   "database/sql/driver",
-	"driver.ConnBeginTx":                            "database/sql/driver",
-	"driver.ConnPrepareContext":                     "database/sql/driver",
-	"driver.DefaultParameterConverter":              "database/sql/driver",
-	"driver.Driver":                                 "database/sql/driver",
-	"driver.ErrBadConn":                             "database/sql/driver",
-	"driver.ErrRemoveArgument":                      "database/sql/driver",
-	"driver.ErrSkip":                                "database/sql/driver",
-	"driver.Execer":                                 "database/sql/driver",
-	"driver.ExecerContext":                          "database/sql/driver",
-	"driver.Int32":                                  "database/sql/driver",
-	"driver.IsScanValue":                            "database/sql/driver",
-	"driver.IsValue":                                "database/sql/driver",
-	"driver.IsolationLevel":                         "database/sql/driver",
-	"driver.NamedValue":                             "database/sql/driver",
-	"driver.NamedValueChecker":                      "database/sql/driver",
-	"driver.NotNull":                                "database/sql/driver",
-	"driver.Null":                                   "database/sql/driver",
-	"driver.Pinger":                                 "database/sql/driver",
-	"driver.Queryer":                                "database/sql/driver",
-	"driver.QueryerContext":                         "database/sql/driver",
-	"driver.Result":                                 "database/sql/driver",
-	"driver.ResultNoRows":                           "database/sql/driver",
-	"driver.Rows":                                   "database/sql/driver",
-	"driver.RowsAffected":                           "database/sql/driver",
-	"driver.RowsColumnTypeDatabaseTypeName":         "database/sql/driver",
-	"driver.RowsColumnTypeLength":                   "database/sql/driver",
-	"driver.RowsColumnTypeNullable":                 "database/sql/driver",
-	"driver.RowsColumnTypePrecisionScale":           "database/sql/driver",
-	"driver.RowsColumnTypeScanType":                 "database/sql/driver",
-	"driver.RowsNextResultSet":                      "database/sql/driver",
-	"driver.Stmt":                                   "database/sql/driver",
-	"driver.StmtExecContext":                        "database/sql/driver",
-	"driver.StmtQueryContext":                       "database/sql/driver",
-	"driver.String":                                 "database/sql/driver",
-	"driver.Tx":                                     "database/sql/driver",
-	"driver.TxOptions":                              "database/sql/driver",
-	"driver.Value":                                  "database/sql/driver",
-	"driver.ValueConverter":                         "database/sql/driver",
-	"driver.Valuer":                                 "database/sql/driver",
-	"dsa.ErrInvalidPublicKey":                       "crypto/dsa",
-	"dsa.GenerateKey":                               "crypto/dsa",
-	"dsa.GenerateParameters":                        "crypto/dsa",
-	"dsa.L1024N160":                                 "crypto/dsa",
-	"dsa.L2048N224":                                 "crypto/dsa",
-	"dsa.L2048N256":                                 "crypto/dsa",
-	"dsa.L3072N256":                                 "crypto/dsa",
-	"dsa.ParameterSizes":                            "crypto/dsa",
-	"dsa.Parameters":                                "crypto/dsa",
-	"dsa.PrivateKey":                                "crypto/dsa",
-	"dsa.PublicKey":                                 "crypto/dsa",
-	"dsa.Sign":                                      "crypto/dsa",
-	"dsa.Verify":                                    "crypto/dsa",
-	"dwarf.AddrType":                                "debug/dwarf",
-	"dwarf.ArrayType":                               "debug/dwarf",
-	"dwarf.Attr":                                    "debug/dwarf",
-	"dwarf.AttrAbstractOrigin":                      "debug/dwarf",
-	"dwarf.AttrAccessibility":                       "debug/dwarf",
-	"dwarf.AttrAddrClass":                           "debug/dwarf",
-	"dwarf.AttrAllocated":                           "debug/dwarf",
-	"dwarf.AttrArtificial":                          "debug/dwarf",
-	"dwarf.AttrAssociated":                          "debug/dwarf",
-	"dwarf.AttrBaseTypes":                           "debug/dwarf",
-	"dwarf.AttrBitOffset":                           "debug/dwarf",
-	"dwarf.AttrBitSize":                             "debug/dwarf",
-	"dwarf.AttrByteSize":                            "debug/dwarf",
-	"dwarf.AttrCallColumn":                          "debug/dwarf",
-	"dwarf.AttrCallFile":                            "debug/dwarf",
-	"dwarf.AttrCallLine":                            "debug/dwarf",
-	"dwarf.AttrCalling":                             "debug/dwarf",
-	"dwarf.AttrCommonRef":                           "debug/dwarf",
-	"dwarf.AttrCompDir":                             "debug/dwarf",
-	"dwarf.AttrConstValue":                          "debug/dwarf",
-	"dwarf.AttrContainingType":                      "debug/dwarf",
-	"dwarf.AttrCount":                               "debug/dwarf",
-	"dwarf.AttrDataLocation":                        "debug/dwarf",
-	"dwarf.AttrDataMemberLoc":                       "debug/dwarf",
-	"dwarf.AttrDeclColumn":                          "debug/dwarf",
-	"dwarf.AttrDeclFile":                            "debug/dwarf",
-	"dwarf.AttrDeclLine":                            "debug/dwarf",
-	"dwarf.AttrDeclaration":                         "debug/dwarf",
-	"dwarf.AttrDefaultValue":                        "debug/dwarf",
-	"dwarf.AttrDescription":                         "debug/dwarf",
-	"dwarf.AttrDiscr":                               "debug/dwarf",
-	"dwarf.AttrDiscrList":                           "debug/dwarf",
-	"dwarf.AttrDiscrValue":                          "debug/dwarf",
-	"dwarf.AttrEncoding":                            "debug/dwarf",
-	"dwarf.AttrEntrypc":                             "debug/dwarf",
-	"dwarf.AttrExtension":                           "debug/dwarf",
-	"dwarf.AttrExternal":                            "debug/dwarf",
-	"dwarf.AttrFrameBase":                           "debug/dwarf",
-	"dwarf.AttrFriend":                              "debug/dwarf",
-	"dwarf.AttrHighpc":                              "debug/dwarf",
-	"dwarf.AttrIdentifierCase":                      "debug/dwarf",
-	"dwarf.AttrImport":                              "debug/dwarf",
-	"dwarf.AttrInline":                              "debug/dwarf",
-	"dwarf.AttrIsOptional":                          "debug/dwarf",
-	"dwarf.AttrLanguage":                            "debug/dwarf",
-	"dwarf.AttrLocation":                            "debug/dwarf",
-	"dwarf.AttrLowerBound":                          "debug/dwarf",
-	"dwarf.AttrLowpc":                               "debug/dwarf",
-	"dwarf.AttrMacroInfo":                           "debug/dwarf",
-	"dwarf.AttrName":                                "debug/dwarf",
-	"dwarf.AttrNamelistItem":                        "debug/dwarf",
-	"dwarf.AttrOrdering":                            "debug/dwarf",
-	"dwarf.AttrPriority":                            "debug/dwarf",
-	"dwarf.AttrProducer":                            "debug/dwarf",
-	"dwarf.AttrPrototyped":                          "debug/dwarf",
-	"dwarf.AttrRanges":                              "debug/dwarf",
-	"dwarf.AttrReturnAddr":                          "debug/dwarf",
-	"dwarf.AttrSegment":                             "debug/dwarf",
-	"dwarf.AttrSibling":                             "debug/dwarf",
-	"dwarf.AttrSpecification":                       "debug/dwarf",
-	"dwarf.AttrStartScope":                          "debug/dwarf",
-	"dwarf.AttrStaticLink":                          "debug/dwarf",
-	"dwarf.AttrStmtList":                            "debug/dwarf",
-	"dwarf.AttrStride":                              "debug/dwarf",
-	"dwarf.AttrStrideSize":                          "debug/dwarf",
-	"dwarf.AttrStringLength":                        "debug/dwarf",
-	"dwarf.AttrTrampoline":                          "debug/dwarf",
-	"dwarf.AttrType":                                "debug/dwarf",
-	"dwarf.AttrUpperBound":                          "debug/dwarf",
-	"dwarf.AttrUseLocation":                         "debug/dwarf",
-	"dwarf.AttrUseUTF8":                             "debug/dwarf",
-	"dwarf.AttrVarParam":                            "debug/dwarf",
-	"dwarf.AttrVirtuality":                          "debug/dwarf",
-	"dwarf.AttrVisibility":                          "debug/dwarf",
-	"dwarf.AttrVtableElemLoc":                       "debug/dwarf",
-	"dwarf.BasicType":                               "debug/dwarf",
-	"dwarf.BoolType":                                "debug/dwarf",
-	"dwarf.CharType":                                "debug/dwarf",
-	"dwarf.Class":                                   "debug/dwarf",
-	"dwarf.ClassAddress":                            "debug/dwarf",
-	"dwarf.ClassBlock":                              "debug/dwarf",
-	"dwarf.ClassConstant":                           "debug/dwarf",
-	"dwarf.ClassExprLoc":                            "debug/dwarf",
-	"dwarf.ClassFlag":                               "debug/dwarf",
-	"dwarf.ClassLinePtr":                            "debug/dwarf",
-	"dwarf.ClassLocListPtr":                         "debug/dwarf",
-	"dwarf.ClassMacPtr":                             "debug/dwarf",
-	"dwarf.ClassRangeListPtr":                       "debug/dwarf",
-	"dwarf.ClassReference":                          "debug/dwarf",
-	"dwarf.ClassReferenceAlt":                       "debug/dwarf",
-	"dwarf.ClassReferenceSig":                       "debug/dwarf",
-	"dwarf.ClassString":                             "debug/dwarf",
-	"dwarf.ClassStringAlt":                          "debug/dwarf",
-	"dwarf.ClassUnknown":                            "debug/dwarf",
-	"dwarf.CommonType":                              "debug/dwarf",
-	"dwarf.ComplexType":                             "debug/dwarf",
-	"dwarf.Data":                                    "debug/dwarf",
-	"dwarf.DecodeError":                             "debug/dwarf",
-	"dwarf.DotDotDotType":                           "debug/dwarf",
-	"dwarf.Entry":                                   "debug/dwarf",
-	"dwarf.EnumType":                                "debug/dwarf",
-	"dwarf.EnumValue":                               "debug/dwarf",
-	"dwarf.ErrUnknownPC":                            "debug/dwarf",
-	"dwarf.Field":                                   "debug/dwarf",
-	"dwarf.FloatType":                               "debug/dwarf",
-	"dwarf.FuncType":                                "debug/dwarf",
-	"dwarf.IntType":                                 "debug/dwarf",
-	"dwarf.LineEntry":                               "debug/dwarf",
-	"dwarf.LineFile":                                "debug/dwarf",
-	"dwarf.LineReader":                              "debug/dwarf",
-	"dwarf.LineReaderPos":                           "debug/dwarf",
-	"dwarf.New":                                     "debug/dwarf",
-	"dwarf.Offset":                                  "debug/dwarf",
-	"dwarf.PtrType":                                 "debug/dwarf",
-	"dwarf.QualType":                                "debug/dwarf",
-	"dwarf.Reader":                                  "debug/dwarf",
-	"dwarf.StructField":                             "debug/dwarf",
-	"dwarf.StructType":                              "debug/dwarf",
-	"dwarf.Tag":                                     "debug/dwarf",
-	"dwarf.TagAccessDeclaration":                    "debug/dwarf",
-	"dwarf.TagArrayType":                            "debug/dwarf",
-	"dwarf.TagBaseType":                             "debug/dwarf",
-	"dwarf.TagCatchDwarfBlock":                      "debug/dwarf",
-	"dwarf.TagClassType":                            "debug/dwarf",
-	"dwarf.TagCommonDwarfBlock":                     "debug/dwarf",
-	"dwarf.TagCommonInclusion":                      "debug/dwarf",
-	"dwarf.TagCompileUnit":                          "debug/dwarf",
-	"dwarf.TagCondition":                            "debug/dwarf",
-	"dwarf.TagConstType":                            "debug/dwarf",
-	"dwarf.TagConstant":                             "debug/dwarf",
-	"dwarf.TagDwarfProcedure":                       "debug/dwarf",
-	"dwarf.TagEntryPoint":                           "debug/dwarf",
-	"dwarf.TagEnumerationType":                      "debug/dwarf",
-	"dwarf.TagEnumerator":                           "debug/dwarf",
-	"dwarf.TagFileType":                             "debug/dwarf",
-	"dwarf.TagFormalParameter":                      "debug/dwarf",
-	"dwarf.TagFriend":                               "debug/dwarf",
-	"dwarf.TagImportedDeclaration":                  "debug/dwarf",
-	"dwarf.TagImportedModule":                       "debug/dwarf",
-	"dwarf.TagImportedUnit":                         "debug/dwarf",
-	"dwarf.TagInheritance":                          "debug/dwarf",
-	"dwarf.TagInlinedSubroutine":                    "debug/dwarf",
-	"dwarf.TagInterfaceType":                        "debug/dwarf",
-	"dwarf.TagLabel":                                "debug/dwarf",
-	"dwarf.TagLexDwarfBlock":                        "debug/dwarf",
-	"dwarf.TagMember":                               "debug/dwarf",
-	"dwarf.TagModule":                               "debug/dwarf",
-	"dwarf.TagMutableType":                          "debug/dwarf",
-	"dwarf.TagNamelist":                             "debug/dwarf",
-	"dwarf.TagNamelistItem":                         "debug/dwarf",
-	"dwarf.TagNamespace":                            "debug/dwarf",
-	"dwarf.TagPackedType":                           "debug/dwarf",
-	"dwarf.TagPartialUnit":                          "debug/dwarf",
-	"dwarf.TagPointerType":                          "debug/dwarf",
-	"dwarf.TagPtrToMemberType":                      "debug/dwarf",
-	"dwarf.TagReferenceType":                        "debug/dwarf",
-	"dwarf.TagRestrictType":                         "debug/dwarf",
-	"dwarf.TagRvalueReferenceType":                  "debug/dwarf",
-	"dwarf.TagSetType":                              "debug/dwarf",
-	"dwarf.TagSharedType":                           "debug/dwarf",
-	"dwarf.TagStringType":                           "debug/dwarf",
-	"dwarf.TagStructType":                           "debug/dwarf",
-	"dwarf.TagSubprogram":                           "debug/dwarf",
-	"dwarf.TagSubrangeType":                         "debug/dwarf",
-	"dwarf.TagSubroutineType":                       "debug/dwarf",
-	"dwarf.TagTemplateAlias":                        "debug/dwarf",
-	"dwarf.TagTemplateTypeParameter":                "debug/dwarf",
-	"dwarf.TagTemplateValueParameter":               "debug/dwarf",
-	"dwarf.TagThrownType":                           "debug/dwarf",
-	"dwarf.TagTryDwarfBlock":                        "debug/dwarf",
-	"dwarf.TagTypeUnit":                             "debug/dwarf",
-	"dwarf.TagTypedef":                              "debug/dwarf",
-	"dwarf.TagUnionType":                            "debug/dwarf",
-	"dwarf.TagUnspecifiedParameters":                "debug/dwarf",
-	"dwarf.TagUnspecifiedType":                      "debug/dwarf",
-	"dwarf.TagVariable":                             "debug/dwarf",
-	"dwarf.TagVariant":                              "debug/dwarf",
-	"dwarf.TagVariantPart":                          "debug/dwarf",
-	"dwarf.TagVolatileType":                         "debug/dwarf",
-	"dwarf.TagWithStmt":                             "debug/dwarf",
-	"dwarf.Type":                                    "debug/dwarf",
-	"dwarf.TypedefType":                             "debug/dwarf",
-	"dwarf.UcharType":                               "debug/dwarf",
-	"dwarf.UintType":                                "debug/dwarf",
-	"dwarf.UnspecifiedType":                         "debug/dwarf",
-	"dwarf.VoidType":                                "debug/dwarf",
-	"ecdsa.GenerateKey":                             "crypto/ecdsa",
-	"ecdsa.PrivateKey":                              "crypto/ecdsa",
-	"ecdsa.PublicKey":                               "crypto/ecdsa",
-	"ecdsa.Sign":                                    "crypto/ecdsa",
-	"ecdsa.Verify":                                  "crypto/ecdsa",
-	"elf.ARM_MAGIC_TRAMP_NUMBER":                    "debug/elf",
-	"elf.COMPRESS_HIOS":                             "debug/elf",
-	"elf.COMPRESS_HIPROC":                           "debug/elf",
-	"elf.COMPRESS_LOOS":                             "debug/elf",
-	"elf.COMPRESS_LOPROC":                           "debug/elf",
-	"elf.COMPRESS_ZLIB":                             "debug/elf",
-	"elf.Chdr32":                                    "debug/elf",
-	"elf.Chdr64":                                    "debug/elf",
-	"elf.Class":                                     "debug/elf",
-	"elf.CompressionType":                           "debug/elf",
-	"elf.DF_BIND_NOW":                               "debug/elf",
-	"elf.DF_ORIGIN":                                 "debug/elf",
-	"elf.DF_STATIC_TLS":                             "debug/elf",
-	"elf.DF_SYMBOLIC":                               "debug/elf",
-	"elf.DF_TEXTREL":                                "debug/elf",
-	"elf.DT_BIND_NOW":                               "debug/elf",
-	"elf.DT_DEBUG":                                  "debug/elf",
-	"elf.DT_ENCODING":                               "debug/elf",
-	"elf.DT_FINI":                                   "debug/elf",
-	"elf.DT_FINI_ARRAY":                             "debug/elf",
-	"elf.DT_FINI_ARRAYSZ":                           "debug/elf",
-	"elf.DT_FLAGS":                                  "debug/elf",
-	"elf.DT_HASH":                                   "debug/elf",
-	"elf.DT_HIOS":                                   "debug/elf",
-	"elf.DT_HIPROC":                                 "debug/elf",
-	"elf.DT_INIT":                                   "debug/elf",
-	"elf.DT_INIT_ARRAY":                             "debug/elf",
-	"elf.DT_INIT_ARRAYSZ":                           "debug/elf",
-	"elf.DT_JMPREL":                                 "debug/elf",
-	"elf.DT_LOOS":                                   "debug/elf",
-	"elf.DT_LOPROC":                                 "debug/elf",
-	"elf.DT_NEEDED":                                 "debug/elf",
-	"elf.DT_NULL":                                   "debug/elf",
-	"elf.DT_PLTGOT":                                 "debug/elf",
-	"elf.DT_PLTREL":                                 "debug/elf",
-	"elf.DT_PLTRELSZ":                               "debug/elf",
-	"elf.DT_PREINIT_ARRAY":                          "debug/elf",
-	"elf.DT_PREINIT_ARRAYSZ":                        "debug/elf",
-	"elf.DT_REL":                                    "debug/elf",
-	"elf.DT_RELA":                                   "debug/elf",
-	"elf.DT_RELAENT":                                "debug/elf",
-	"elf.DT_RELASZ":                                 "debug/elf",
-	"elf.DT_RELENT":                                 "debug/elf",
-	"elf.DT_RELSZ":                                  "debug/elf",
-	"elf.DT_RPATH":                                  "debug/elf",
-	"elf.DT_RUNPATH":                                "debug/elf",
-	"elf.DT_SONAME":                                 "debug/elf",
-	"elf.DT_STRSZ":                                  "debug/elf",
-	"elf.DT_STRTAB":                                 "debug/elf",
-	"elf.DT_SYMBOLIC":                               "debug/elf",
-	"elf.DT_SYMENT":                                 "debug/elf",
-	"elf.DT_SYMTAB":                                 "debug/elf",
-	"elf.DT_TEXTREL":                                "debug/elf",
-	"elf.DT_VERNEED":                                "debug/elf",
-	"elf.DT_VERNEEDNUM":                             "debug/elf",
-	"elf.DT_VERSYM":                                 "debug/elf",
-	"elf.Data":                                      "debug/elf",
-	"elf.Dyn32":                                     "debug/elf",
-	"elf.Dyn64":                                     "debug/elf",
-	"elf.DynFlag":                                   "debug/elf",
-	"elf.DynTag":                                    "debug/elf",
-	"elf.EI_ABIVERSION":                             "debug/elf",
-	"elf.EI_CLASS":                                  "debug/elf",
-	"elf.EI_DATA":                                   "debug/elf",
-	"elf.EI_NIDENT":                                 "debug/elf",
-	"elf.EI_OSABI":                                  "debug/elf",
-	"elf.EI_PAD":                                    "debug/elf",
-	"elf.EI_VERSION":                                "debug/elf",
-	"elf.ELFCLASS32":                                "debug/elf",
-	"elf.ELFCLASS64":                                "debug/elf",
-	"elf.ELFCLASSNONE":                              "debug/elf",
-	"elf.ELFDATA2LSB":                               "debug/elf",
-	"elf.ELFDATA2MSB":                               "debug/elf",
-	"elf.ELFDATANONE":                               "debug/elf",
-	"elf.ELFMAG":                                    "debug/elf",
-	"elf.ELFOSABI_86OPEN":                           "debug/elf",
-	"elf.ELFOSABI_AIX":                              "debug/elf",
-	"elf.ELFOSABI_ARM":                              "debug/elf",
-	"elf.ELFOSABI_FREEBSD":                          "debug/elf",
-	"elf.ELFOSABI_HPUX":                             "debug/elf",
-	"elf.ELFOSABI_HURD":                             "debug/elf",
-	"elf.ELFOSABI_IRIX":                             "debug/elf",
-	"elf.ELFOSABI_LINUX":                            "debug/elf",
-	"elf.ELFOSABI_MODESTO":                          "debug/elf",
-	"elf.ELFOSABI_NETBSD":                           "debug/elf",
-	"elf.ELFOSABI_NONE":                             "debug/elf",
-	"elf.ELFOSABI_NSK":                              "debug/elf",
-	"elf.ELFOSABI_OPENBSD":                          "debug/elf",
-	"elf.ELFOSABI_OPENVMS":                          "debug/elf",
-	"elf.ELFOSABI_SOLARIS":                          "debug/elf",
-	"elf.ELFOSABI_STANDALONE":                       "debug/elf",
-	"elf.ELFOSABI_TRU64":                            "debug/elf",
-	"elf.EM_386":                                    "debug/elf",
-	"elf.EM_486":                                    "debug/elf",
-	"elf.EM_68HC12":                                 "debug/elf",
-	"elf.EM_68K":                                    "debug/elf",
-	"elf.EM_860":                                    "debug/elf",
-	"elf.EM_88K":                                    "debug/elf",
-	"elf.EM_960":                                    "debug/elf",
-	"elf.EM_AARCH64":                                "debug/elf",
-	"elf.EM_ALPHA":                                  "debug/elf",
-	"elf.EM_ALPHA_STD":                              "debug/elf",
-	"elf.EM_ARC":                                    "debug/elf",
-	"elf.EM_ARM":                                    "debug/elf",
-	"elf.EM_COLDFIRE":                               "debug/elf",
-	"elf.EM_FR20":                                   "debug/elf",
-	"elf.EM_H8S":                                    "debug/elf",
-	"elf.EM_H8_300":                                 "debug/elf",
-	"elf.EM_H8_300H":                                "debug/elf",
-	"elf.EM_H8_500":                                 "debug/elf",
-	"elf.EM_IA_64":                                  "debug/elf",
-	"elf.EM_M32":                                    "debug/elf",
-	"elf.EM_ME16":                                   "debug/elf",
-	"elf.EM_MIPS":                                   "debug/elf",
-	"elf.EM_MIPS_RS3_LE":                            "debug/elf",
-	"elf.EM_MIPS_RS4_BE":                            "debug/elf",
-	"elf.EM_MIPS_X":                                 "debug/elf",
-	"elf.EM_MMA":                                    "debug/elf",
-	"elf.EM_NCPU":                                   "debug/elf",
-	"elf.EM_NDR1":                                   "debug/elf",
-	"elf.EM_NONE":                                   "debug/elf",
-	"elf.EM_PARISC":                                 "debug/elf",
-	"elf.EM_PCP":                                    "debug/elf",
-	"elf.EM_PPC":                                    "debug/elf",
-	"elf.EM_PPC64":                                  "debug/elf",
-	"elf.EM_RCE":                                    "debug/elf",
-	"elf.EM_RH32":                                   "debug/elf",
-	"elf.EM_S370":                                   "debug/elf",
-	"elf.EM_S390":                                   "debug/elf",
-	"elf.EM_SH":                                     "debug/elf",
-	"elf.EM_SPARC":                                  "debug/elf",
-	"elf.EM_SPARC32PLUS":                            "debug/elf",
-	"elf.EM_SPARCV9":                                "debug/elf",
-	"elf.EM_ST100":                                  "debug/elf",
-	"elf.EM_STARCORE":                               "debug/elf",
-	"elf.EM_TINYJ":                                  "debug/elf",
-	"elf.EM_TRICORE":                                "debug/elf",
-	"elf.EM_V800":                                   "debug/elf",
-	"elf.EM_VPP500":                                 "debug/elf",
-	"elf.EM_X86_64":                                 "debug/elf",
-	"elf.ET_CORE":                                   "debug/elf",
-	"elf.ET_DYN":                                    "debug/elf",
-	"elf.ET_EXEC":                                   "debug/elf",
-	"elf.ET_HIOS":                                   "debug/elf",
-	"elf.ET_HIPROC":                                 "debug/elf",
-	"elf.ET_LOOS":                                   "debug/elf",
-	"elf.ET_LOPROC":                                 "debug/elf",
-	"elf.ET_NONE":                                   "debug/elf",
-	"elf.ET_REL":                                    "debug/elf",
-	"elf.EV_CURRENT":                                "debug/elf",
-	"elf.EV_NONE":                                   "debug/elf",
-	"elf.ErrNoSymbols":                              "debug/elf",
-	"elf.File":                                      "debug/elf",
-	"elf.FileHeader":                                "debug/elf",
-	"elf.FormatError":                               "debug/elf",
-	"elf.Header32":                                  "debug/elf",
-	"elf.Header64":                                  "debug/elf",
-	"elf.ImportedSymbol":                            "debug/elf",
-	"elf.Machine":                                   "debug/elf",
-	"elf.NT_FPREGSET":                               "debug/elf",
-	"elf.NT_PRPSINFO":                               "debug/elf",
-	"elf.NT_PRSTATUS":                               "debug/elf",
-	"elf.NType":                                     "debug/elf",
-	"elf.NewFile":                                   "debug/elf",
-	"elf.OSABI":                                     "debug/elf",
-	"elf.Open":                                      "debug/elf",
-	"elf.PF_MASKOS":                                 "debug/elf",
-	"elf.PF_MASKPROC":                               "debug/elf",
-	"elf.PF_R":                                      "debug/elf",
-	"elf.PF_W":                                      "debug/elf",
-	"elf.PF_X":                                      "debug/elf",
-	"elf.PT_DYNAMIC":                                "debug/elf",
-	"elf.PT_HIOS":                                   "debug/elf",
-	"elf.PT_HIPROC":                                 "debug/elf",
-	"elf.PT_INTERP":                                 "debug/elf",
-	"elf.PT_LOAD":                                   "debug/elf",
-	"elf.PT_LOOS":                                   "debug/elf",
-	"elf.PT_LOPROC":                                 "debug/elf",
-	"elf.PT_NOTE":                                   "debug/elf",
-	"elf.PT_NULL":                                   "debug/elf",
-	"elf.PT_PHDR":                                   "debug/elf",
-	"elf.PT_SHLIB":                                  "debug/elf",
-	"elf.PT_TLS":                                    "debug/elf",
-	"elf.Prog":                                      "debug/elf",
-	"elf.Prog32":                                    "debug/elf",
-	"elf.Prog64":                                    "debug/elf",
-	"elf.ProgFlag":                                  "debug/elf",
-	"elf.ProgHeader":                                "debug/elf",
-	"elf.ProgType":                                  "debug/elf",
-	"elf.R_386":                                     "debug/elf",
-	"elf.R_386_32":                                  "debug/elf",
-	"elf.R_386_COPY":                                "debug/elf",
-	"elf.R_386_GLOB_DAT":                            "debug/elf",
-	"elf.R_386_GOT32":                               "debug/elf",
-	"elf.R_386_GOTOFF":                              "debug/elf",
-	"elf.R_386_GOTPC":                               "debug/elf",
-	"elf.R_386_JMP_SLOT":                            "debug/elf",
-	"elf.R_386_NONE":                                "debug/elf",
-	"elf.R_386_PC32":                                "debug/elf",
-	"elf.R_386_PLT32":                               "debug/elf",
-	"elf.R_386_RELATIVE":                            "debug/elf",
-	"elf.R_386_TLS_DTPMOD32":                        "debug/elf",
-	"elf.R_386_TLS_DTPOFF32":                        "debug/elf",
-	"elf.R_386_TLS_GD":                              "debug/elf",
-	"elf.R_386_TLS_GD_32":                           "debug/elf",
-	"elf.R_386_TLS_GD_CALL":                         "debug/elf",
-	"elf.R_386_TLS_GD_POP":                          "debug/elf",
-	"elf.R_386_TLS_GD_PUSH":                         "debug/elf",
-	"elf.R_386_TLS_GOTIE":                           "debug/elf",
-	"elf.R_386_TLS_IE":                              "debug/elf",
-	"elf.R_386_TLS_IE_32":                           "debug/elf",
-	"elf.R_386_TLS_LDM":                             "debug/elf",
-	"elf.R_386_TLS_LDM_32":                          "debug/elf",
-	"elf.R_386_TLS_LDM_CALL":                        "debug/elf",
-	"elf.R_386_TLS_LDM_POP":                         "debug/elf",
-	"elf.R_386_TLS_LDM_PUSH":                        "debug/elf",
-	"elf.R_386_TLS_LDO_32":                          "debug/elf",
-	"elf.R_386_TLS_LE":                              "debug/elf",
-	"elf.R_386_TLS_LE_32":                           "debug/elf",
-	"elf.R_386_TLS_TPOFF":                           "debug/elf",
-	"elf.R_386_TLS_TPOFF32":                         "debug/elf",
-	"elf.R_390":                                     "debug/elf",
-	"elf.R_390_12":                                  "debug/elf",
-	"elf.R_390_16":                                  "debug/elf",
-	"elf.R_390_20":                                  "debug/elf",
-	"elf.R_390_32":                                  "debug/elf",
-	"elf.R_390_64":                                  "debug/elf",
-	"elf.R_390_8":                                   "debug/elf",
-	"elf.R_390_COPY":                                "debug/elf",
-	"elf.R_390_GLOB_DAT":                            "debug/elf",
-	"elf.R_390_GOT12":                               "debug/elf",
-	"elf.R_390_GOT16":                               "debug/elf",
-	"elf.R_390_GOT20":                               "debug/elf",
-	"elf.R_390_GOT32":                               "debug/elf",
-	"elf.R_390_GOT64":                               "debug/elf",
-	"elf.R_390_GOTENT":                              "debug/elf",
-	"elf.R_390_GOTOFF":                              "debug/elf",
-	"elf.R_390_GOTOFF16":                            "debug/elf",
-	"elf.R_390_GOTOFF64":                            "debug/elf",
-	"elf.R_390_GOTPC":                               "debug/elf",
-	"elf.R_390_GOTPCDBL":                            "debug/elf",
-	"elf.R_390_GOTPLT12":                            "debug/elf",
-	"elf.R_390_GOTPLT16":                            "debug/elf",
-	"elf.R_390_GOTPLT20":                            "debug/elf",
-	"elf.R_390_GOTPLT32":                            "debug/elf",
-	"elf.R_390_GOTPLT64":                            "debug/elf",
-	"elf.R_390_GOTPLTENT":                           "debug/elf",
-	"elf.R_390_GOTPLTOFF16":                         "debug/elf",
-	"elf.R_390_GOTPLTOFF32":                         "debug/elf",
-	"elf.R_390_GOTPLTOFF64":                         "debug/elf",
-	"elf.R_390_JMP_SLOT":                            "debug/elf",
-	"elf.R_390_NONE":                                "debug/elf",
-	"elf.R_390_PC16":                                "debug/elf",
-	"elf.R_390_PC16DBL":                             "debug/elf",
-	"elf.R_390_PC32":                                "debug/elf",
-	"elf.R_390_PC32DBL":                             "debug/elf",
-	"elf.R_390_PC64":                                "debug/elf",
-	"elf.R_390_PLT16DBL":                            "debug/elf",
-	"elf.R_390_PLT32":                               "debug/elf",
-	"elf.R_390_PLT32DBL":                            "debug/elf",
-	"elf.R_390_PLT64":                               "debug/elf",
-	"elf.R_390_RELATIVE":                            "debug/elf",
-	"elf.R_390_TLS_DTPMOD":                          "debug/elf",
-	"elf.R_390_TLS_DTPOFF":                          "debug/elf",
-	"elf.R_390_TLS_GD32":                            "debug/elf",
-	"elf.R_390_TLS_GD64":                            "debug/elf",
-	"elf.R_390_TLS_GDCALL":                          "debug/elf",
-	"elf.R_390_TLS_GOTIE12":                         "debug/elf",
-	"elf.R_390_TLS_GOTIE20":                         "debug/elf",
-	"elf.R_390_TLS_GOTIE32":                         "debug/elf",
-	"elf.R_390_TLS_GOTIE64":                         "debug/elf",
-	"elf.R_390_TLS_IE32":                            "debug/elf",
-	"elf.R_390_TLS_IE64":                            "debug/elf",
-	"elf.R_390_TLS_IEENT":                           "debug/elf",
-	"elf.R_390_TLS_LDCALL":                          "debug/elf",
-	"elf.R_390_TLS_LDM32":                           "debug/elf",
-	"elf.R_390_TLS_LDM64":                           "debug/elf",
-	"elf.R_390_TLS_LDO32":                           "debug/elf",
-	"elf.R_390_TLS_LDO64":                           "debug/elf",
-	"elf.R_390_TLS_LE32":                            "debug/elf",
-	"elf.R_390_TLS_LE64":                            "debug/elf",
-	"elf.R_390_TLS_LOAD":                            "debug/elf",
-	"elf.R_390_TLS_TPOFF":                           "debug/elf",
-	"elf.R_AARCH64":                                 "debug/elf",
-	"elf.R_AARCH64_ABS16":                           "debug/elf",
-	"elf.R_AARCH64_ABS32":                           "debug/elf",
-	"elf.R_AARCH64_ABS64":                           "debug/elf",
-	"elf.R_AARCH64_ADD_ABS_LO12_NC":                 "debug/elf",
-	"elf.R_AARCH64_ADR_GOT_PAGE":                    "debug/elf",
-	"elf.R_AARCH64_ADR_PREL_LO21":                   "debug/elf",
-	"elf.R_AARCH64_ADR_PREL_PG_HI21":                "debug/elf",
-	"elf.R_AARCH64_ADR_PREL_PG_HI21_NC":             "debug/elf",
-	"elf.R_AARCH64_CALL26":                          "debug/elf",
-	"elf.R_AARCH64_CONDBR19":                        "debug/elf",
-	"elf.R_AARCH64_COPY":                            "debug/elf",
-	"elf.R_AARCH64_GLOB_DAT":                        "debug/elf",
-	"elf.R_AARCH64_GOT_LD_PREL19":                   "debug/elf",
-	"elf.R_AARCH64_IRELATIVE":                       "debug/elf",
-	"elf.R_AARCH64_JUMP26":                          "debug/elf",
-	"elf.R_AARCH64_JUMP_SLOT":                       "debug/elf",
-	"elf.R_AARCH64_LD64_GOT_LO12_NC":                "debug/elf",
-	"elf.R_AARCH64_LDST128_ABS_LO12_NC":             "debug/elf",
-	"elf.R_AARCH64_LDST16_ABS_LO12_NC":              "debug/elf",
-	"elf.R_AARCH64_LDST32_ABS_LO12_NC":              "debug/elf",
-	"elf.R_AARCH64_LDST64_ABS_LO12_NC":              "debug/elf",
-	"elf.R_AARCH64_LDST8_ABS_LO12_NC":               "debug/elf",
-	"elf.R_AARCH64_LD_PREL_LO19":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_SABS_G0":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_SABS_G1":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_SABS_G2":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G0":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G0_NC":                 "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G1":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G1_NC":                 "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G2":                    "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G2_NC":                 "debug/elf",
-	"elf.R_AARCH64_MOVW_UABS_G3":                    "debug/elf",
-	"elf.R_AARCH64_NONE":                            "debug/elf",
-	"elf.R_AARCH64_NULL":                            "debug/elf",
-	"elf.R_AARCH64_P32_ABS16":                       "debug/elf",
-	"elf.R_AARCH64_P32_ABS32":                       "debug/elf",
-	"elf.R_AARCH64_P32_ADD_ABS_LO12_NC":             "debug/elf",
-	"elf.R_AARCH64_P32_ADR_GOT_PAGE":                "debug/elf",
-	"elf.R_AARCH64_P32_ADR_PREL_LO21":               "debug/elf",
-	"elf.R_AARCH64_P32_ADR_PREL_PG_HI21":            "debug/elf",
-	"elf.R_AARCH64_P32_CALL26":                      "debug/elf",
-	"elf.R_AARCH64_P32_CONDBR19":                    "debug/elf",
-	"elf.R_AARCH64_P32_COPY":                        "debug/elf",
-	"elf.R_AARCH64_P32_GLOB_DAT":                    "debug/elf",
-	"elf.R_AARCH64_P32_GOT_LD_PREL19":               "debug/elf",
-	"elf.R_AARCH64_P32_IRELATIVE":                   "debug/elf",
-	"elf.R_AARCH64_P32_JUMP26":                      "debug/elf",
-	"elf.R_AARCH64_P32_JUMP_SLOT":                   "debug/elf",
-	"elf.R_AARCH64_P32_LD32_GOT_LO12_NC":            "debug/elf",
-	"elf.R_AARCH64_P32_LDST128_ABS_LO12_NC":         "debug/elf",
-	"elf.R_AARCH64_P32_LDST16_ABS_LO12_NC":          "debug/elf",
-	"elf.R_AARCH64_P32_LDST32_ABS_LO12_NC":          "debug/elf",
-	"elf.R_AARCH64_P32_LDST64_ABS_LO12_NC":          "debug/elf",
-	"elf.R_AARCH64_P32_LDST8_ABS_LO12_NC":           "debug/elf",
-	"elf.R_AARCH64_P32_LD_PREL_LO19":                "debug/elf",
-	"elf.R_AARCH64_P32_MOVW_SABS_G0":                "debug/elf",
-	"elf.R_AARCH64_P32_MOVW_UABS_G0":                "debug/elf",
-	"elf.R_AARCH64_P32_MOVW_UABS_G0_NC":             "debug/elf",
-	"elf.R_AARCH64_P32_MOVW_UABS_G1":                "debug/elf",
-	"elf.R_AARCH64_P32_PREL16":                      "debug/elf",
-	"elf.R_AARCH64_P32_PREL32":                      "debug/elf",
-	"elf.R_AARCH64_P32_RELATIVE":                    "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC":                     "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_ADD_LO12_NC":         "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_ADR_PAGE21":          "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_ADR_PREL21":          "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_CALL":                "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_LD32_LO12_NC":        "debug/elf",
-	"elf.R_AARCH64_P32_TLSDESC_LD_PREL19":           "debug/elf",
-	"elf.R_AARCH64_P32_TLSGD_ADD_LO12_NC":           "debug/elf",
-	"elf.R_AARCH64_P32_TLSGD_ADR_PAGE21":            "debug/elf",
-	"elf.R_AARCH64_P32_TLSIE_ADR_GOTTPREL_PAGE21":   "debug/elf",
-	"elf.R_AARCH64_P32_TLSIE_LD32_GOTTPREL_LO12_NC": "debug/elf",
-	"elf.R_AARCH64_P32_TLSIE_LD_GOTTPREL_PREL19":    "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_ADD_TPREL_HI12":        "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_ADD_TPREL_LO12":        "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_ADD_TPREL_LO12_NC":     "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_MOVW_TPREL_G0":         "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_MOVW_TPREL_G0_NC":      "debug/elf",
-	"elf.R_AARCH64_P32_TLSLE_MOVW_TPREL_G1":         "debug/elf",
-	"elf.R_AARCH64_P32_TLS_DTPMOD":                  "debug/elf",
-	"elf.R_AARCH64_P32_TLS_DTPREL":                  "debug/elf",
-	"elf.R_AARCH64_P32_TLS_TPREL":                   "debug/elf",
-	"elf.R_AARCH64_P32_TSTBR14":                     "debug/elf",
-	"elf.R_AARCH64_PREL16":                          "debug/elf",
-	"elf.R_AARCH64_PREL32":                          "debug/elf",
-	"elf.R_AARCH64_PREL64":                          "debug/elf",
-	"elf.R_AARCH64_RELATIVE":                        "debug/elf",
-	"elf.R_AARCH64_TLSDESC":                         "debug/elf",
-	"elf.R_AARCH64_TLSDESC_ADD":                     "debug/elf",
-	"elf.R_AARCH64_TLSDESC_ADD_LO12_NC":             "debug/elf",
-	"elf.R_AARCH64_TLSDESC_ADR_PAGE21":              "debug/elf",
-	"elf.R_AARCH64_TLSDESC_ADR_PREL21":              "debug/elf",
-	"elf.R_AARCH64_TLSDESC_CALL":                    "debug/elf",
-	"elf.R_AARCH64_TLSDESC_LD64_LO12_NC":            "debug/elf",
-	"elf.R_AARCH64_TLSDESC_LDR":                     "debug/elf",
-	"elf.R_AARCH64_TLSDESC_LD_PREL19":               "debug/elf",
-	"elf.R_AARCH64_TLSDESC_OFF_G0_NC":               "debug/elf",
-	"elf.R_AARCH64_TLSDESC_OFF_G1":                  "debug/elf",
-	"elf.R_AARCH64_TLSGD_ADD_LO12_NC":               "debug/elf",
-	"elf.R_AARCH64_TLSGD_ADR_PAGE21":                "debug/elf",
-	"elf.R_AARCH64_TLSIE_ADR_GOTTPREL_PAGE21":       "debug/elf",
-	"elf.R_AARCH64_TLSIE_LD64_GOTTPREL_LO12_NC":     "debug/elf",
-	"elf.R_AARCH64_TLSIE_LD_GOTTPREL_PREL19":        "debug/elf",
-	"elf.R_AARCH64_TLSIE_MOVW_GOTTPREL_G0_NC":       "debug/elf",
-	"elf.R_AARCH64_TLSIE_MOVW_GOTTPREL_G1":          "debug/elf",
-	"elf.R_AARCH64_TLSLE_ADD_TPREL_HI12":            "debug/elf",
-	"elf.R_AARCH64_TLSLE_ADD_TPREL_LO12":            "debug/elf",
-	"elf.R_AARCH64_TLSLE_ADD_TPREL_LO12_NC":         "debug/elf",
-	"elf.R_AARCH64_TLSLE_MOVW_TPREL_G0":             "debug/elf",
-	"elf.R_AARCH64_TLSLE_MOVW_TPREL_G0_NC":          "debug/elf",
-	"elf.R_AARCH64_TLSLE_MOVW_TPREL_G1":             "debug/elf",
-	"elf.R_AARCH64_TLSLE_MOVW_TPREL_G1_NC":          "debug/elf",
-	"elf.R_AARCH64_TLSLE_MOVW_TPREL_G2":             "debug/elf",
-	"elf.R_AARCH64_TLS_DTPMOD64":                    "debug/elf",
-	"elf.R_AARCH64_TLS_DTPREL64":                    "debug/elf",
-	"elf.R_AARCH64_TLS_TPREL64":                     "debug/elf",
-	"elf.R_AARCH64_TSTBR14":                         "debug/elf",
-	"elf.R_ALPHA":                                   "debug/elf",
-	"elf.R_ALPHA_BRADDR":                            "debug/elf",
-	"elf.R_ALPHA_COPY":                              "debug/elf",
-	"elf.R_ALPHA_GLOB_DAT":                          "debug/elf",
-	"elf.R_ALPHA_GPDISP":                            "debug/elf",
-	"elf.R_ALPHA_GPREL32":                           "debug/elf",
-	"elf.R_ALPHA_GPRELHIGH":                         "debug/elf",
-	"elf.R_ALPHA_GPRELLOW":                          "debug/elf",
-	"elf.R_ALPHA_GPVALUE":                           "debug/elf",
-	"elf.R_ALPHA_HINT":                              "debug/elf",
-	"elf.R_ALPHA_IMMED_BR_HI32":                     "debug/elf",
-	"elf.R_ALPHA_IMMED_GP_16":                       "debug/elf",
-	"elf.R_ALPHA_IMMED_GP_HI32":                     "debug/elf",
-	"elf.R_ALPHA_IMMED_LO32":                        "debug/elf",
-	"elf.R_ALPHA_IMMED_SCN_HI32":                    "debug/elf",
-	"elf.R_ALPHA_JMP_SLOT":                          "debug/elf",
-	"elf.R_ALPHA_LITERAL":                           "debug/elf",
-	"elf.R_ALPHA_LITUSE":                            "debug/elf",
-	"elf.R_ALPHA_NONE":                              "debug/elf",
-	"elf.R_ALPHA_OP_PRSHIFT":                        "debug/elf",
-	"elf.R_ALPHA_OP_PSUB":                           "debug/elf",
-	"elf.R_ALPHA_OP_PUSH":                           "debug/elf",
-	"elf.R_ALPHA_OP_STORE":                          "debug/elf",
-	"elf.R_ALPHA_REFLONG":                           "debug/elf",
-	"elf.R_ALPHA_REFQUAD":                           "debug/elf",
-	"elf.R_ALPHA_RELATIVE":                          "debug/elf",
-	"elf.R_ALPHA_SREL16":                            "debug/elf",
-	"elf.R_ALPHA_SREL32":                            "debug/elf",
-	"elf.R_ALPHA_SREL64":                            "debug/elf",
-	"elf.R_ARM":                                     "debug/elf",
-	"elf.R_ARM_ABS12":                               "debug/elf",
-	"elf.R_ARM_ABS16":                               "debug/elf",
-	"elf.R_ARM_ABS32":                               "debug/elf",
-	"elf.R_ARM_ABS8":                                "debug/elf",
-	"elf.R_ARM_AMP_VCALL9":                          "debug/elf",
-	"elf.R_ARM_COPY":                                "debug/elf",
-	"elf.R_ARM_GLOB_DAT":                            "debug/elf",
-	"elf.R_ARM_GNU_VTENTRY":                         "debug/elf",
-	"elf.R_ARM_GNU_VTINHERIT":                       "debug/elf",
-	"elf.R_ARM_GOT32":                               "debug/elf",
-	"elf.R_ARM_GOTOFF":                              "debug/elf",
-	"elf.R_ARM_GOTPC":                               "debug/elf",
-	"elf.R_ARM_JUMP_SLOT":                           "debug/elf",
-	"elf.R_ARM_NONE":                                "debug/elf",
-	"elf.R_ARM_PC13":                                "debug/elf",
-	"elf.R_ARM_PC24":                                "debug/elf",
-	"elf.R_ARM_PLT32":                               "debug/elf",
-	"elf.R_ARM_RABS32":                              "debug/elf",
-	"elf.R_ARM_RBASE":                               "debug/elf",
-	"elf.R_ARM_REL32":                               "debug/elf",
-	"elf.R_ARM_RELATIVE":                            "debug/elf",
-	"elf.R_ARM_RPC24":                               "debug/elf",
-	"elf.R_ARM_RREL32":                              "debug/elf",
-	"elf.R_ARM_RSBREL32":                            "debug/elf",
-	"elf.R_ARM_SBREL32":                             "debug/elf",
-	"elf.R_ARM_SWI24":                               "debug/elf",
-	"elf.R_ARM_THM_ABS5":                            "debug/elf",
-	"elf.R_ARM_THM_PC22":                            "debug/elf",
-	"elf.R_ARM_THM_PC8":                             "debug/elf",
-	"elf.R_ARM_THM_RPC22":                           "debug/elf",
-	"elf.R_ARM_THM_SWI8":                            "debug/elf",
-	"elf.R_ARM_THM_XPC22":                           "debug/elf",
-	"elf.R_ARM_XPC25":                               "debug/elf",
-	"elf.R_INFO":                                    "debug/elf",
-	"elf.R_INFO32":                                  "debug/elf",
-	"elf.R_MIPS":                                    "debug/elf",
-	"elf.R_MIPS_16":                                 "debug/elf",
-	"elf.R_MIPS_26":                                 "debug/elf",
-	"elf.R_MIPS_32":                                 "debug/elf",
-	"elf.R_MIPS_64":                                 "debug/elf",
-	"elf.R_MIPS_ADD_IMMEDIATE":                      "debug/elf",
-	"elf.R_MIPS_CALL16":                             "debug/elf",
-	"elf.R_MIPS_CALL_HI16":                          "debug/elf",
-	"elf.R_MIPS_CALL_LO16":                          "debug/elf",
-	"elf.R_MIPS_DELETE":                             "debug/elf",
-	"elf.R_MIPS_GOT16":                              "debug/elf",
-	"elf.R_MIPS_GOT_DISP":                           "debug/elf",
-	"elf.R_MIPS_GOT_HI16":                           "debug/elf",
-	"elf.R_MIPS_GOT_LO16":                           "debug/elf",
-	"elf.R_MIPS_GOT_OFST":                           "debug/elf",
-	"elf.R_MIPS_GOT_PAGE":                           "debug/elf",
-	"elf.R_MIPS_GPREL16":                            "debug/elf",
-	"elf.R_MIPS_GPREL32":                            "debug/elf",
-	"elf.R_MIPS_HI16":                               "debug/elf",
-	"elf.R_MIPS_HIGHER":                             "debug/elf",
-	"elf.R_MIPS_HIGHEST":                            "debug/elf",
-	"elf.R_MIPS_INSERT_A":                           "debug/elf",
-	"elf.R_MIPS_INSERT_B":                           "debug/elf",
-	"elf.R_MIPS_JALR":                               "debug/elf",
-	"elf.R_MIPS_LITERAL":                            "debug/elf",
-	"elf.R_MIPS_LO16":                               "debug/elf",
-	"elf.R_MIPS_NONE":                               "debug/elf",
-	"elf.R_MIPS_PC16":                               "debug/elf",
-	"elf.R_MIPS_PJUMP":                              "debug/elf",
-	"elf.R_MIPS_REL16":                              "debug/elf",
-	"elf.R_MIPS_REL32":                              "debug/elf",
-	"elf.R_MIPS_RELGOT":                             "debug/elf",
-	"elf.R_MIPS_SCN_DISP":                           "debug/elf",
-	"elf.R_MIPS_SHIFT5":                             "debug/elf",
-	"elf.R_MIPS_SHIFT6":                             "debug/elf",
-	"elf.R_MIPS_SUB":                                "debug/elf",
-	"elf.R_MIPS_TLS_DTPMOD32":                       "debug/elf",
-	"elf.R_MIPS_TLS_DTPMOD64":                       "debug/elf",
-	"elf.R_MIPS_TLS_DTPREL32":                       "debug/elf",
-	"elf.R_MIPS_TLS_DTPREL64":                       "debug/elf",
-	"elf.R_MIPS_TLS_DTPREL_HI16":                    "debug/elf",
-	"elf.R_MIPS_TLS_DTPREL_LO16":                    "debug/elf",
-	"elf.R_MIPS_TLS_GD":                             "debug/elf",
-	"elf.R_MIPS_TLS_GOTTPREL":                       "debug/elf",
-	"elf.R_MIPS_TLS_LDM":                            "debug/elf",
-	"elf.R_MIPS_TLS_TPREL32":                        "debug/elf",
-	"elf.R_MIPS_TLS_TPREL64":                        "debug/elf",
-	"elf.R_MIPS_TLS_TPREL_HI16":                     "debug/elf",
-	"elf.R_MIPS_TLS_TPREL_LO16":                     "debug/elf",
-	"elf.R_PPC":                                     "debug/elf",
-	"elf.R_PPC64":                                   "debug/elf",
-	"elf.R_PPC64_ADDR14":                            "debug/elf",
-	"elf.R_PPC64_ADDR14_BRNTAKEN":                   "debug/elf",
-	"elf.R_PPC64_ADDR14_BRTAKEN":                    "debug/elf",
-	"elf.R_PPC64_ADDR16":                            "debug/elf",
-	"elf.R_PPC64_ADDR16_DS":                         "debug/elf",
-	"elf.R_PPC64_ADDR16_HA":                         "debug/elf",
-	"elf.R_PPC64_ADDR16_HI":                         "debug/elf",
-	"elf.R_PPC64_ADDR16_HIGHER":                     "debug/elf",
-	"elf.R_PPC64_ADDR16_HIGHERA":                    "debug/elf",
-	"elf.R_PPC64_ADDR16_HIGHEST":                    "debug/elf",
-	"elf.R_PPC64_ADDR16_HIGHESTA":                   "debug/elf",
-	"elf.R_PPC64_ADDR16_LO":                         "debug/elf",
-	"elf.R_PPC64_ADDR16_LO_DS":                      "debug/elf",
-	"elf.R_PPC64_ADDR24":                            "debug/elf",
-	"elf.R_PPC64_ADDR32":                            "debug/elf",
-	"elf.R_PPC64_ADDR64":                            "debug/elf",
-	"elf.R_PPC64_DTPMOD64":                          "debug/elf",
-	"elf.R_PPC64_DTPREL16":                          "debug/elf",
-	"elf.R_PPC64_DTPREL16_DS":                       "debug/elf",
-	"elf.R_PPC64_DTPREL16_HA":                       "debug/elf",
-	"elf.R_PPC64_DTPREL16_HI":                       "debug/elf",
-	"elf.R_PPC64_DTPREL16_HIGHER":                   "debug/elf",
-	"elf.R_PPC64_DTPREL16_HIGHERA":                  "debug/elf",
-	"elf.R_PPC64_DTPREL16_HIGHEST":                  "debug/elf",
-	"elf.R_PPC64_DTPREL16_HIGHESTA":                 "debug/elf",
-	"elf.R_PPC64_DTPREL16_LO":                       "debug/elf",
-	"elf.R_PPC64_DTPREL16_LO_DS":                    "debug/elf",
-	"elf.R_PPC64_DTPREL64":                          "debug/elf",
-	"elf.R_PPC64_GOT16":                             "debug/elf",
-	"elf.R_PPC64_GOT16_DS":                          "debug/elf",
-	"elf.R_PPC64_GOT16_HA":                          "debug/elf",
-	"elf.R_PPC64_GOT16_HI":                          "debug/elf",
-	"elf.R_PPC64_GOT16_LO":                          "debug/elf",
-	"elf.R_PPC64_GOT16_LO_DS":                       "debug/elf",
-	"elf.R_PPC64_GOT_DTPREL16_DS":                   "debug/elf",
-	"elf.R_PPC64_GOT_DTPREL16_HA":                   "debug/elf",
-	"elf.R_PPC64_GOT_DTPREL16_HI":                   "debug/elf",
-	"elf.R_PPC64_GOT_DTPREL16_LO_DS":                "debug/elf",
-	"elf.R_PPC64_GOT_TLSGD16":                       "debug/elf",
-	"elf.R_PPC64_GOT_TLSGD16_HA":                    "debug/elf",
-	"elf.R_PPC64_GOT_TLSGD16_HI":                    "debug/elf",
-	"elf.R_PPC64_GOT_TLSGD16_LO":                    "debug/elf",
-	"elf.R_PPC64_GOT_TLSLD16":                       "debug/elf",
-	"elf.R_PPC64_GOT_TLSLD16_HA":                    "debug/elf",
-	"elf.R_PPC64_GOT_TLSLD16_HI":                    "debug/elf",
-	"elf.R_PPC64_GOT_TLSLD16_LO":                    "debug/elf",
-	"elf.R_PPC64_GOT_TPREL16_DS":                    "debug/elf",
-	"elf.R_PPC64_GOT_TPREL16_HA":                    "debug/elf",
-	"elf.R_PPC64_GOT_TPREL16_HI":                    "debug/elf",
-	"elf.R_PPC64_GOT_TPREL16_LO_DS":                 "debug/elf",
-	"elf.R_PPC64_JMP_SLOT":                          "debug/elf",
-	"elf.R_PPC64_NONE":                              "debug/elf",
-	"elf.R_PPC64_REL14":                             "debug/elf",
-	"elf.R_PPC64_REL14_BRNTAKEN":                    "debug/elf",
-	"elf.R_PPC64_REL14_BRTAKEN":                     "debug/elf",
-	"elf.R_PPC64_REL16":                             "debug/elf",
-	"elf.R_PPC64_REL16_HA":                          "debug/elf",
-	"elf.R_PPC64_REL16_HI":                          "debug/elf",
-	"elf.R_PPC64_REL16_LO":                          "debug/elf",
-	"elf.R_PPC64_REL24":                             "debug/elf",
-	"elf.R_PPC64_REL32":                             "debug/elf",
-	"elf.R_PPC64_REL64":                             "debug/elf",
-	"elf.R_PPC64_TLS":                               "debug/elf",
-	"elf.R_PPC64_TLSGD":                             "debug/elf",
-	"elf.R_PPC64_TLSLD":                             "debug/elf",
-	"elf.R_PPC64_TOC":                               "debug/elf",
-	"elf.R_PPC64_TOC16":                             "debug/elf",
-	"elf.R_PPC64_TOC16_DS":                          "debug/elf",
-	"elf.R_PPC64_TOC16_HA":                          "debug/elf",
-	"elf.R_PPC64_TOC16_HI":                          "debug/elf",
-	"elf.R_PPC64_TOC16_LO":                          "debug/elf",
-	"elf.R_PPC64_TOC16_LO_DS":                       "debug/elf",
-	"elf.R_PPC64_TPREL16":                           "debug/elf",
-	"elf.R_PPC64_TPREL16_DS":                        "debug/elf",
-	"elf.R_PPC64_TPREL16_HA":                        "debug/elf",
-	"elf.R_PPC64_TPREL16_HI":                        "debug/elf",
-	"elf.R_PPC64_TPREL16_HIGHER":                    "debug/elf",
-	"elf.R_PPC64_TPREL16_HIGHERA":                   "debug/elf",
-	"elf.R_PPC64_TPREL16_HIGHEST":                   "debug/elf",
-	"elf.R_PPC64_TPREL16_HIGHESTA":                  "debug/elf",
-	"elf.R_PPC64_TPREL16_LO":                        "debug/elf",
-	"elf.R_PPC64_TPREL16_LO_DS":                     "debug/elf",
-	"elf.R_PPC64_TPREL64":                           "debug/elf",
-	"elf.R_PPC_ADDR14":                              "debug/elf",
-	"elf.R_PPC_ADDR14_BRNTAKEN":                     "debug/elf",
-	"elf.R_PPC_ADDR14_BRTAKEN":                      "debug/elf",
-	"elf.R_PPC_ADDR16":                              "debug/elf",
-	"elf.R_PPC_ADDR16_HA":                           "debug/elf",
-	"elf.R_PPC_ADDR16_HI":                           "debug/elf",
-	"elf.R_PPC_ADDR16_LO":                           "debug/elf",
-	"elf.R_PPC_ADDR24":                              "debug/elf",
-	"elf.R_PPC_ADDR32":                              "debug/elf",
-	"elf.R_PPC_COPY":                                "debug/elf",
-	"elf.R_PPC_DTPMOD32":                            "debug/elf",
-	"elf.R_PPC_DTPREL16":                            "debug/elf",
-	"elf.R_PPC_DTPREL16_HA":                         "debug/elf",
-	"elf.R_PPC_DTPREL16_HI":                         "debug/elf",
-	"elf.R_PPC_DTPREL16_LO":                         "debug/elf",
-	"elf.R_PPC_DTPREL32":                            "debug/elf",
-	"elf.R_PPC_EMB_BIT_FLD":                         "debug/elf",
-	"elf.R_PPC_EMB_MRKREF":                          "debug/elf",
-	"elf.R_PPC_EMB_NADDR16":                         "debug/elf",
-	"elf.R_PPC_EMB_NADDR16_HA":                      "debug/elf",
-	"elf.R_PPC_EMB_NADDR16_HI":                      "debug/elf",
-	"elf.R_PPC_EMB_NADDR16_LO":                      "debug/elf",
-	"elf.R_PPC_EMB_NADDR32":                         "debug/elf",
-	"elf.R_PPC_EMB_RELSDA":                          "debug/elf",
-	"elf.R_PPC_EMB_RELSEC16":                        "debug/elf",
-	"elf.R_PPC_EMB_RELST_HA":                        "debug/elf",
-	"elf.R_PPC_EMB_RELST_HI":                        "debug/elf",
-	"elf.R_PPC_EMB_RELST_LO":                        "debug/elf",
-	"elf.R_PPC_EMB_SDA21":                           "debug/elf",
-	"elf.R_PPC_EMB_SDA2I16":                         "debug/elf",
-	"elf.R_PPC_EMB_SDA2REL":                         "debug/elf",
-	"elf.R_PPC_EMB_SDAI16":                          "debug/elf",
-	"elf.R_PPC_GLOB_DAT":                            "debug/elf",
-	"elf.R_PPC_GOT16":                               "debug/elf",
-	"elf.R_PPC_GOT16_HA":                            "debug/elf",
-	"elf.R_PPC_GOT16_HI":                            "debug/elf",
-	"elf.R_PPC_GOT16_LO":                            "debug/elf",
-	"elf.R_PPC_GOT_TLSGD16":                         "debug/elf",
-	"elf.R_PPC_GOT_TLSGD16_HA":                      "debug/elf",
-	"elf.R_PPC_GOT_TLSGD16_HI":                      "debug/elf",
-	"elf.R_PPC_GOT_TLSGD16_LO":                      "debug/elf",
-	"elf.R_PPC_GOT_TLSLD16":                         "debug/elf",
-	"elf.R_PPC_GOT_TLSLD16_HA":                      "debug/elf",
-	"elf.R_PPC_GOT_TLSLD16_HI":                      "debug/elf",
-	"elf.R_PPC_GOT_TLSLD16_LO":                      "debug/elf",
-	"elf.R_PPC_GOT_TPREL16":                         "debug/elf",
-	"elf.R_PPC_GOT_TPREL16_HA":                      "debug/elf",
-	"elf.R_PPC_GOT_TPREL16_HI":                      "debug/elf",
-	"elf.R_PPC_GOT_TPREL16_LO":                      "debug/elf",
-	"elf.R_PPC_JMP_SLOT":                            "debug/elf",
-	"elf.R_PPC_LOCAL24PC":                           "debug/elf",
-	"elf.R_PPC_NONE":                                "debug/elf",
-	"elf.R_PPC_PLT16_HA":                            "debug/elf",
-	"elf.R_PPC_PLT16_HI":                            "debug/elf",
-	"elf.R_PPC_PLT16_LO":                            "debug/elf",
-	"elf.R_PPC_PLT32":                               "debug/elf",
-	"elf.R_PPC_PLTREL24":                            "debug/elf",
-	"elf.R_PPC_PLTREL32":                            "debug/elf",
-	"elf.R_PPC_REL14":                               "debug/elf",
-	"elf.R_PPC_REL14_BRNTAKEN":                      "debug/elf",
-	"elf.R_PPC_REL14_BRTAKEN":                       "debug/elf",
-	"elf.R_PPC_REL24":                               "debug/elf",
-	"elf.R_PPC_REL32":                               "debug/elf",
-	"elf.R_PPC_RELATIVE":                            "debug/elf",
-	"elf.R_PPC_SDAREL16":                            "debug/elf",
-	"elf.R_PPC_SECTOFF":                             "debug/elf",
-	"elf.R_PPC_SECTOFF_HA":                          "debug/elf",
-	"elf.R_PPC_SECTOFF_HI":                          "debug/elf",
-	"elf.R_PPC_SECTOFF_LO":                          "debug/elf",
-	"elf.R_PPC_TLS":                                 "debug/elf",
-	"elf.R_PPC_TPREL16":                             "debug/elf",
-	"elf.R_PPC_TPREL16_HA":                          "debug/elf",
-	"elf.R_PPC_TPREL16_HI":                          "debug/elf",
-	"elf.R_PPC_TPREL16_LO":                          "debug/elf",
-	"elf.R_PPC_TPREL32":                             "debug/elf",
-	"elf.R_PPC_UADDR16":                             "debug/elf",
-	"elf.R_PPC_UADDR32":                             "debug/elf",
-	"elf.R_SPARC":                                   "debug/elf",
-	"elf.R_SPARC_10":                                "debug/elf",
-	"elf.R_SPARC_11":                                "debug/elf",
-	"elf.R_SPARC_13":                                "debug/elf",
-	"elf.R_SPARC_16":                                "debug/elf",
-	"elf.R_SPARC_22":                                "debug/elf",
-	"elf.R_SPARC_32":                                "debug/elf",
-	"elf.R_SPARC_5":                                 "debug/elf",
-	"elf.R_SPARC_6":                                 "debug/elf",
-	"elf.R_SPARC_64":                                "debug/elf",
-	"elf.R_SPARC_7":                                 "debug/elf",
-	"elf.R_SPARC_8":                                 "debug/elf",
-	"elf.R_SPARC_COPY":                              "debug/elf",
-	"elf.R_SPARC_DISP16":                            "debug/elf",
-	"elf.R_SPARC_DISP32":                            "debug/elf",
-	"elf.R_SPARC_DISP64":                            "debug/elf",
-	"elf.R_SPARC_DISP8":                             "debug/elf",
-	"elf.R_SPARC_GLOB_DAT":                          "debug/elf",
-	"elf.R_SPARC_GLOB_JMP":                          "debug/elf",
-	"elf.R_SPARC_GOT10":                             "debug/elf",
-	"elf.R_SPARC_GOT13":                             "debug/elf",
-	"elf.R_SPARC_GOT22":                             "debug/elf",
-	"elf.R_SPARC_H44":                               "debug/elf",
-	"elf.R_SPARC_HH22":                              "debug/elf",
-	"elf.R_SPARC_HI22":                              "debug/elf",
-	"elf.R_SPARC_HIPLT22":                           "debug/elf",
-	"elf.R_SPARC_HIX22":                             "debug/elf",
-	"elf.R_SPARC_HM10":                              "debug/elf",
-	"elf.R_SPARC_JMP_SLOT":                          "debug/elf",
-	"elf.R_SPARC_L44":                               "debug/elf",
-	"elf.R_SPARC_LM22":                              "debug/elf",
-	"elf.R_SPARC_LO10":                              "debug/elf",
-	"elf.R_SPARC_LOPLT10":                           "debug/elf",
-	"elf.R_SPARC_LOX10":                             "debug/elf",
-	"elf.R_SPARC_M44":                               "debug/elf",
-	"elf.R_SPARC_NONE":                              "debug/elf",
-	"elf.R_SPARC_OLO10":                             "debug/elf",
-	"elf.R_SPARC_PC10":                              "debug/elf",
-	"elf.R_SPARC_PC22":                              "debug/elf",
-	"elf.R_SPARC_PCPLT10":                           "debug/elf",
-	"elf.R_SPARC_PCPLT22":                           "debug/elf",
-	"elf.R_SPARC_PCPLT32":                           "debug/elf",
-	"elf.R_SPARC_PC_HH22":                           "debug/elf",
-	"elf.R_SPARC_PC_HM10":                           "debug/elf",
-	"elf.R_SPARC_PC_LM22":                           "debug/elf",
-	"elf.R_SPARC_PLT32":                             "debug/elf",
-	"elf.R_SPARC_PLT64":                             "debug/elf",
-	"elf.R_SPARC_REGISTER":                          "debug/elf",
-	"elf.R_SPARC_RELATIVE":                          "debug/elf",
-	"elf.R_SPARC_UA16":                              "debug/elf",
-	"elf.R_SPARC_UA32":                              "debug/elf",
-	"elf.R_SPARC_UA64":                              "debug/elf",
-	"elf.R_SPARC_WDISP16":                           "debug/elf",
-	"elf.R_SPARC_WDISP19":                           "debug/elf",
-	"elf.R_SPARC_WDISP22":                           "debug/elf",
-	"elf.R_SPARC_WDISP30":                           "debug/elf",
-	"elf.R_SPARC_WPLT30":                            "debug/elf",
-	"elf.R_SYM32":                                   "debug/elf",
-	"elf.R_SYM64":                                   "debug/elf",
-	"elf.R_TYPE32":                                  "debug/elf",
-	"elf.R_TYPE64":                                  "debug/elf",
-	"elf.R_X86_64":                                  "debug/elf",
-	"elf.R_X86_64_16":                               "debug/elf",
-	"elf.R_X86_64_32":                               "debug/elf",
-	"elf.R_X86_64_32S":                              "debug/elf",
-	"elf.R_X86_64_64":                               "debug/elf",
-	"elf.R_X86_64_8":                                "debug/elf",
-	"elf.R_X86_64_COPY":                             "debug/elf",
-	"elf.R_X86_64_DTPMOD64":                         "debug/elf",
-	"elf.R_X86_64_DTPOFF32":                         "debug/elf",
-	"elf.R_X86_64_DTPOFF64":                         "debug/elf",
-	"elf.R_X86_64_GLOB_DAT":                         "debug/elf",
-	"elf.R_X86_64_GOT32":                            "debug/elf",
-	"elf.R_X86_64_GOTPCREL":                         "debug/elf",
-	"elf.R_X86_64_GOTTPOFF":                         "debug/elf",
-	"elf.R_X86_64_JMP_SLOT":                         "debug/elf",
-	"elf.R_X86_64_NONE":                             "debug/elf",
-	"elf.R_X86_64_PC16":                             "debug/elf",
-	"elf.R_X86_64_PC32":                             "debug/elf",
-	"elf.R_X86_64_PC8":                              "debug/elf",
-	"elf.R_X86_64_PLT32":                            "debug/elf",
-	"elf.R_X86_64_RELATIVE":                         "debug/elf",
-	"elf.R_X86_64_TLSGD":                            "debug/elf",
-	"elf.R_X86_64_TLSLD":                            "debug/elf",
-	"elf.R_X86_64_TPOFF32":                          "debug/elf",
-	"elf.R_X86_64_TPOFF64":                          "debug/elf",
-	"elf.Rel32":                                     "debug/elf",
-	"elf.Rel64":                                     "debug/elf",
-	"elf.Rela32":                                    "debug/elf",
-	"elf.Rela64":                                    "debug/elf",
-	"elf.SHF_ALLOC":                                 "debug/elf",
-	"elf.SHF_COMPRESSED":                            "debug/elf",
-	"elf.SHF_EXECINSTR":                             "debug/elf",
-	"elf.SHF_GROUP":                                 "debug/elf",
-	"elf.SHF_INFO_LINK":                             "debug/elf",
-	"elf.SHF_LINK_ORDER":                            "debug/elf",
-	"elf.SHF_MASKOS":                                "debug/elf",
-	"elf.SHF_MASKPROC":                              "debug/elf",
-	"elf.SHF_MERGE":                                 "debug/elf",
-	"elf.SHF_OS_NONCONFORMING":                      "debug/elf",
-	"elf.SHF_STRINGS":                               "debug/elf",
-	"elf.SHF_TLS":                                   "debug/elf",
-	"elf.SHF_WRITE":                                 "debug/elf",
-	"elf.SHN_ABS":                                   "debug/elf",
-	"elf.SHN_COMMON":                                "debug/elf",
-	"elf.SHN_HIOS":                                  "debug/elf",
-	"elf.SHN_HIPROC":                                "debug/elf",
-	"elf.SHN_HIRESERVE":                             "debug/elf",
-	"elf.SHN_LOOS":                                  "debug/elf",
-	"elf.SHN_LOPROC":                                "debug/elf",
-	"elf.SHN_LORESERVE":                             "debug/elf",
-	"elf.SHN_UNDEF":                                 "debug/elf",
-	"elf.SHN_XINDEX":                                "debug/elf",
-	"elf.SHT_DYNAMIC":                               "debug/elf",
-	"elf.SHT_DYNSYM":                                "debug/elf",
-	"elf.SHT_FINI_ARRAY":                            "debug/elf",
-	"elf.SHT_GNU_ATTRIBUTES":                        "debug/elf",
-	"elf.SHT_GNU_HASH":                              "debug/elf",
-	"elf.SHT_GNU_LIBLIST":                           "debug/elf",
-	"elf.SHT_GNU_VERDEF":                            "debug/elf",
-	"elf.SHT_GNU_VERNEED":                           "debug/elf",
-	"elf.SHT_GNU_VERSYM":                            "debug/elf",
-	"elf.SHT_GROUP":                                 "debug/elf",
-	"elf.SHT_HASH":                                  "debug/elf",
-	"elf.SHT_HIOS":                                  "debug/elf",
-	"elf.SHT_HIPROC":                                "debug/elf",
-	"elf.SHT_HIUSER":                                "debug/elf",
-	"elf.SHT_INIT_ARRAY":                            "debug/elf",
-	"elf.SHT_LOOS":                                  "debug/elf",
-	"elf.SHT_LOPROC":                                "debug/elf",
-	"elf.SHT_LOUSER":                                "debug/elf",
-	"elf.SHT_NOBITS":                                "debug/elf",
-	"elf.SHT_NOTE":                                  "debug/elf",
-	"elf.SHT_NULL":                                  "debug/elf",
-	"elf.SHT_PREINIT_ARRAY":                         "debug/elf",
-	"elf.SHT_PROGBITS":                              "debug/elf",
-	"elf.SHT_REL":                                   "debug/elf",
-	"elf.SHT_RELA":                                  "debug/elf",
-	"elf.SHT_SHLIB":                                 "debug/elf",
-	"elf.SHT_STRTAB":                                "debug/elf",
-	"elf.SHT_SYMTAB":                                "debug/elf",
-	"elf.SHT_SYMTAB_SHNDX":                          "debug/elf",
-	"elf.STB_GLOBAL":                                "debug/elf",
-	"elf.STB_HIOS":                                  "debug/elf",
-	"elf.STB_HIPROC":                                "debug/elf",
-	"elf.STB_LOCAL":                                 "debug/elf",
-	"elf.STB_LOOS":                                  "debug/elf",
-	"elf.STB_LOPROC":                                "debug/elf",
-	"elf.STB_WEAK":                                  "debug/elf",
-	"elf.STT_COMMON":                                "debug/elf",
-	"elf.STT_FILE":                                  "debug/elf",
-	"elf.STT_FUNC":                                  "debug/elf",
-	"elf.STT_HIOS":                                  "debug/elf",
-	"elf.STT_HIPROC":                                "debug/elf",
-	"elf.STT_LOOS":                                  "debug/elf",
-	"elf.STT_LOPROC":                                "debug/elf",
-	"elf.STT_NOTYPE":                                "debug/elf",
-	"elf.STT_OBJECT":                                "debug/elf",
-	"elf.STT_SECTION":                               "debug/elf",
-	"elf.STT_TLS":                                   "debug/elf",
-	"elf.STV_DEFAULT":                               "debug/elf",
-	"elf.STV_HIDDEN":                                "debug/elf",
-	"elf.STV_INTERNAL":                              "debug/elf",
-	"elf.STV_PROTECTED":                             "debug/elf",
-	"elf.ST_BIND":                                   "debug/elf",
-	"elf.ST_INFO":                                   "debug/elf",
-	"elf.ST_TYPE":                                   "debug/elf",
-	"elf.ST_VISIBILITY":                             "debug/elf",
-	"elf.Section":                                   "debug/elf",
-	"elf.Section32":                                 "debug/elf",
-	"elf.Section64":                                 "debug/elf",
-	"elf.SectionFlag":                               "debug/elf",
-	"elf.SectionHeader":                             "debug/elf",
-	"elf.SectionIndex":                              "debug/elf",
-	"elf.SectionType":                               "debug/elf",
-	"elf.Sym32":                                     "debug/elf",
-	"elf.Sym32Size":                                 "debug/elf",
-	"elf.Sym64":                                     "debug/elf",
-	"elf.Sym64Size":                                 "debug/elf",
-	"elf.SymBind":                                   "debug/elf",
-	"elf.SymType":                                   "debug/elf",
-	"elf.SymVis":                                    "debug/elf",
-	"elf.Symbol":                                    "debug/elf",
-	"elf.Type":                                      "debug/elf",
-	"elf.Version":                                   "debug/elf",
-	"elliptic.Curve":                                "crypto/elliptic",
-	"elliptic.CurveParams":                          "crypto/elliptic",
-	"elliptic.GenerateKey":                          "crypto/elliptic",
-	"elliptic.Marshal":                              "crypto/elliptic",
-	"elliptic.P224":                                 "crypto/elliptic",
-	"elliptic.P256":                                 "crypto/elliptic",
-	"elliptic.P384":                                 "crypto/elliptic",
-	"elliptic.P521":                                 "crypto/elliptic",
-	"elliptic.Unmarshal":                            "crypto/elliptic",
-	"encoding.BinaryMarshaler":                      "encoding",
-	"encoding.BinaryUnmarshaler":                    "encoding",
-	"encoding.TextMarshaler":                        "encoding",
-	"encoding.TextUnmarshaler":                      "encoding",
-	"errors.New":                                    "errors",
-	"exec.Cmd":                                      "os/exec",
-	"exec.Command":                                  "os/exec",
-	"exec.CommandContext":                           "os/exec",
-	"exec.ErrNotFound":                              "os/exec",
-	"exec.Error":                                    "os/exec",
-	"exec.ExitError":                                "os/exec",
-	"exec.LookPath":                                 "os/exec",
-	"expvar.Do":                                     "expvar",
-	"expvar.Float":                                  "expvar",
-	"expvar.Func":                                   "expvar",
-	"expvar.Get":                                    "expvar",
-	"expvar.Handler":                                "expvar",
-	"expvar.Int":                                    "expvar",
-	"expvar.KeyValue":                               "expvar",
-	"expvar.Map":                                    "expvar",
-	"expvar.NewFloat":                               "expvar",
-	"expvar.NewInt":                                 "expvar",
-	"expvar.NewMap":                                 "expvar",
-	"expvar.NewString":                              "expvar",
-	"expvar.Publish":                                "expvar",
-	"expvar.String":                                 "expvar",
-	"expvar.Var":                                    "expvar",
-	"fcgi.ErrConnClosed":                            "net/http/fcgi",
-	"fcgi.ErrRequestAborted":                        "net/http/fcgi",
-	"fcgi.ProcessEnv":                               "net/http/fcgi",
-	"fcgi.Serve":                                    "net/http/fcgi",
-	"filepath.Abs":                                  "path/filepath",
-	"filepath.Base":                                 "path/filepath",
-	"filepath.Clean":                                "path/filepath",
-	"filepath.Dir":                                  "path/filepath",
-	"filepath.ErrBadPattern":                        "path/filepath",
-	"filepath.EvalSymlinks":                         "path/filepath",
-	"filepath.Ext":                                  "path/filepath",
-	"filepath.FromSlash":                            "path/filepath",
-	"filepath.Glob":                                 "path/filepath",
-	"filepath.HasPrefix":                            "path/filepath",
-	"filepath.IsAbs":                                "path/filepath",
-	"filepath.Join":                                 "path/filepath",
-	"filepath.ListSeparator":                        "path/filepath",
-	"filepath.Match":                                "path/filepath",
-	"filepath.Rel":                                  "path/filepath",
-	"filepath.Separator":                            "path/filepath",
-	"filepath.SkipDir":                              "path/filepath",
-	"filepath.Split":                                "path/filepath",
-	"filepath.SplitList":                            "path/filepath",
-	"filepath.ToSlash":                              "path/filepath",
-	"filepath.VolumeName":                           "path/filepath",
-	"filepath.Walk":                                 "path/filepath",
-	"filepath.WalkFunc":                             "path/filepath",
-	"flag.Arg":                                      "flag",
-	"flag.Args":                                     "flag",
-	"flag.Bool":                                     "flag",
-	"flag.BoolVar":                                  "flag",
-	"flag.CommandLine":                              "flag",
-	"flag.ContinueOnError":                          "flag",
-	"flag.Duration":                                 "flag",
-	"flag.DurationVar":                              "flag",
-	"flag.ErrHelp":                                  "flag",
-	"flag.ErrorHandling":                            "flag",
-	"flag.ExitOnError":                              "flag",
-	"flag.Flag":                                     "flag",
-	"flag.FlagSet":                                  "flag",
-	"flag.Float64":                                  "flag",
-	"flag.Float64Var":                               "flag",
-	"flag.Getter":                                   "flag",
-	"flag.Int":                                      "flag",
-	"flag.Int64":                                    "flag",
-	"flag.Int64Var":                                 "flag",
-	"flag.IntVar":                                   "flag",
-	"flag.Lookup":                                   "flag",
-	"flag.NArg":                                     "flag",
-	"flag.NFlag":                                    "flag",
-	"flag.NewFlagSet":                               "flag",
-	"flag.PanicOnError":                             "flag",
-	"flag.Parse":                                    "flag",
-	"flag.Parsed":                                   "flag",
-	"flag.PrintDefaults":                            "flag",
-	"flag.Set":                                      "flag",
-	"flag.String":                                   "flag",
-	"flag.StringVar":                                "flag",
-	"flag.Uint":                                     "flag",
-	"flag.Uint64":                                   "flag",
-	"flag.Uint64Var":                                "flag",
-	"flag.UintVar":                                  "flag",
-	"flag.UnquoteUsage":                             "flag",
-	"flag.Usage":                                    "flag",
-	"flag.Value":                                    "flag",
-	"flag.Var":                                      "flag",
-	"flag.Visit":                                    "flag",
-	"flag.VisitAll":                                 "flag",
-	"flate.BestCompression":                         "compress/flate",
-	"flate.BestSpeed":                               "compress/flate",
-	"flate.CorruptInputError":                       "compress/flate",
-	"flate.DefaultCompression":                      "compress/flate",
-	"flate.HuffmanOnly":                             "compress/flate",
-	"flate.InternalError":                           "compress/flate",
-	"flate.NewReader":                               "compress/flate",
-	"flate.NewReaderDict":                           "compress/flate",
-	"flate.NewWriter":                               "compress/flate",
-	"flate.NewWriterDict":                           "compress/flate",
-	"flate.NoCompression":                           "compress/flate",
-	"flate.ReadError":                               "compress/flate",
-	"flate.Reader":                                  "compress/flate",
-	"flate.Resetter":                                "compress/flate",
-	"flate.WriteError":                              "compress/flate",
-	"flate.Writer":                                  "compress/flate",
-	"fmt.Errorf":                                    "fmt",
-	"fmt.Formatter":                                 "fmt",
-	"fmt.Fprint":                                    "fmt",
-	"fmt.Fprintf":                                   "fmt",
-	"fmt.Fprintln":                                  "fmt",
-	"fmt.Fscan":                                     "fmt",
-	"fmt.Fscanf":                                    "fmt",
-	"fmt.Fscanln":                                   "fmt",
-	"fmt.GoStringer":                                "fmt",
-	"fmt.Print":                                     "fmt",
-	"fmt.Printf":                                    "fmt",
-	"fmt.Println":                                   "fmt",
-	"fmt.Scan":                                      "fmt",
-	"fmt.ScanState":                                 "fmt",
-	"fmt.Scanf":                                     "fmt",
-	"fmt.Scanln":                                    "fmt",
-	"fmt.Scanner":                                   "fmt",
-	"fmt.Sprint":                                    "fmt",
-	"fmt.Sprintf":                                   "fmt",
-	"fmt.Sprintln":                                  "fmt",
-	"fmt.Sscan":                                     "fmt",
-	"fmt.Sscanf":                                    "fmt",
-	"fmt.Sscanln":                                   "fmt",
-	"fmt.State":                                     "fmt",
-	"fmt.Stringer":                                  "fmt",
-	"fnv.New128":                                    "hash/fnv",
-	"fnv.New128a":                                   "hash/fnv",
-	"fnv.New32":                                     "hash/fnv",
-	"fnv.New32a":                                    "hash/fnv",
-	"fnv.New64":                                     "hash/fnv",
-	"fnv.New64a":                                    "hash/fnv",
-	"format.Node":                                   "go/format",
-	"format.Source":                                 "go/format",
-	"gif.Decode":                                    "image/gif",
-	"gif.DecodeAll":                                 "image/gif",
-	"gif.DecodeConfig":                              "image/gif",
-	"gif.DisposalBackground":                        "image/gif",
-	"gif.DisposalNone":                              "image/gif",
-	"gif.DisposalPrevious":                          "image/gif",
-	"gif.Encode":                                    "image/gif",
-	"gif.EncodeAll":                                 "image/gif",
-	"gif.GIF":                                       "image/gif",
-	"gif.Options":                                   "image/gif",
-	"gob.CommonType":                                "encoding/gob",
-	"gob.Decoder":                                   "encoding/gob",
-	"gob.Encoder":                                   "encoding/gob",
-	"gob.GobDecoder":                                "encoding/gob",
-	"gob.GobEncoder":                                "encoding/gob",
-	"gob.NewDecoder":                                "encoding/gob",
-	"gob.NewEncoder":                                "encoding/gob",
-	"gob.Register":                                  "encoding/gob",
-	"gob.RegisterName":                              "encoding/gob",
-	"gosym.DecodingError":                           "debug/gosym",
-	"gosym.Func":                                    "debug/gosym",
-	"gosym.LineTable":                               "debug/gosym",
-	"gosym.NewLineTable":                            "debug/gosym",
-	"gosym.NewTable":                                "debug/gosym",
-	"gosym.Obj":                                     "debug/gosym",
-	"gosym.Sym":                                     "debug/gosym",
-	"gosym.Table":                                   "debug/gosym",
-	"gosym.UnknownFileError":                        "debug/gosym",
-	"gosym.UnknownLineError":                        "debug/gosym",
-	"gzip.BestCompression":                          "compress/gzip",
-	"gzip.BestSpeed":                                "compress/gzip",
-	"gzip.DefaultCompression":                       "compress/gzip",
-	"gzip.ErrChecksum":                              "compress/gzip",
-	"gzip.ErrHeader":                                "compress/gzip",
-	"gzip.Header":                                   "compress/gzip",
-	"gzip.HuffmanOnly":                              "compress/gzip",
-	"gzip.NewReader":                                "compress/gzip",
-	"gzip.NewWriter":                                "compress/gzip",
-	"gzip.NewWriterLevel":                           "compress/gzip",
-	"gzip.NoCompression":                            "compress/gzip",
-	"gzip.Reader":                                   "compress/gzip",
-	"gzip.Writer":                                   "compress/gzip",
-	"hash.Hash":                                     "hash",
-	"hash.Hash32":                                   "hash",
-	"hash.Hash64":                                   "hash",
-	"heap.Fix":                                      "container/heap",
-	"heap.Init":                                     "container/heap",
-	"heap.Interface":                                "container/heap",
-	"heap.Pop":                                      "container/heap",
-	"heap.Push":                                     "container/heap",
-	"heap.Remove":                                   "container/heap",
-	"hex.Decode":                                    "encoding/hex",
-	"hex.DecodeString":                              "encoding/hex",
-	"hex.DecodedLen":                                "encoding/hex",
-	"hex.Dump":                                      "encoding/hex",
-	"hex.Dumper":                                    "encoding/hex",
-	"hex.Encode":                                    "encoding/hex",
-	"hex.EncodeToString":                            "encoding/hex",
-	"hex.EncodedLen":                                "encoding/hex",
-	"hex.ErrLength":                                 "encoding/hex",
-	"hex.InvalidByteError":                          "encoding/hex",
-	"hmac.Equal":                                    "crypto/hmac",
-	"hmac.New":                                      "crypto/hmac",
-	"html.EscapeString":                             "html",
-	"html.UnescapeString":                           "html",
-	"http.CanonicalHeaderKey":                       "net/http",
-	"http.Client":                                   "net/http",
-	"http.CloseNotifier":                            "net/http",
-	"http.ConnState":                                "net/http",
-	"http.Cookie":                                   "net/http",
-	"http.CookieJar":                                "net/http",
-	"http.DefaultClient":                            "net/http",
-	"http.DefaultMaxHeaderBytes":                    "net/http",
-	"http.DefaultMaxIdleConnsPerHost":               "net/http",
-	"http.DefaultServeMux":                          "net/http",
-	"http.DefaultTransport":                         "net/http",
-	"http.DetectContentType":                        "net/http",
-	"http.Dir":                                      "net/http",
-	"http.ErrAbortHandler":                          "net/http",
-	"http.ErrBodyNotAllowed":                        "net/http",
-	"http.ErrBodyReadAfterClose":                    "net/http",
-	"http.ErrContentLength":                         "net/http",
-	"http.ErrHandlerTimeout":                        "net/http",
-	"http.ErrHeaderTooLong":                         "net/http",
-	"http.ErrHijacked":                              "net/http",
-	"http.ErrLineTooLong":                           "net/http",
-	"http.ErrMissingBoundary":                       "net/http",
-	"http.ErrMissingContentLength":                  "net/http",
-	"http.ErrMissingFile":                           "net/http",
-	"http.ErrNoCookie":                              "net/http",
-	"http.ErrNoLocation":                            "net/http",
-	"http.ErrNotMultipart":                          "net/http",
-	"http.ErrNotSupported":                          "net/http",
-	"http.ErrServerClosed":                          "net/http",
-	"http.ErrShortBody":                             "net/http",
-	"http.ErrSkipAltProtocol":                       "net/http",
-	"http.ErrUnexpectedTrailer":                     "net/http",
-	"http.ErrUseLastResponse":                       "net/http",
-	"http.ErrWriteAfterFlush":                       "net/http",
-	"http.Error":                                    "net/http",
-	"http.File":                                     "net/http",
-	"http.FileServer":                               "net/http",
-	"http.FileSystem":                               "net/http",
-	"http.Flusher":                                  "net/http",
-	"http.Get":                                      "net/http",
-	"http.Handle":                                   "net/http",
-	"http.HandleFunc":                               "net/http",
-	"http.Handler":                                  "net/http",
-	"http.HandlerFunc":                              "net/http",
-	"http.Head":                                     "net/http",
-	"http.Header":                                   "net/http",
-	"http.Hijacker":                                 "net/http",
-	"http.ListenAndServe":                           "net/http",
-	"http.ListenAndServeTLS":                        "net/http",
-	"http.LocalAddrContextKey":                      "net/http",
-	"http.MaxBytesReader":                           "net/http",
-	"http.MethodConnect":                            "net/http",
-	"http.MethodDelete":                             "net/http",
-	"http.MethodGet":                                "net/http",
-	"http.MethodHead":                               "net/http",
-	"http.MethodOptions":                            "net/http",
-	"http.MethodPatch":                              "net/http",
-	"http.MethodPost":                               "net/http",
-	"http.MethodPut":                                "net/http",
-	"http.MethodTrace":                              "net/http",
-	"http.NewFileTransport":                         "net/http",
-	"http.NewRequest":                               "net/http",
-	"http.NewServeMux":                              "net/http",
-	"http.NoBody":                                   "net/http",
-	"http.NotFound":                                 "net/http",
-	"http.NotFoundHandler":                          "net/http",
-	"http.ParseHTTPVersion":                         "net/http",
-	"http.ParseTime":                                "net/http",
-	"http.Post":                                     "net/http",
-	"http.PostForm":                                 "net/http",
-	"http.ProtocolError":                            "net/http",
-	"http.ProxyFromEnvironment":                     "net/http",
-	"http.ProxyURL":                                 "net/http",
-	"http.PushOptions":                              "net/http",
-	"http.Pusher":                                   "net/http",
-	"http.ReadRequest":                              "net/http",
-	"http.ReadResponse":                             "net/http",
-	"http.Redirect":                                 "net/http",
-	"http.RedirectHandler":                          "net/http",
-	"http.Request":                                  "net/http",
-	"http.Response":                                 "net/http",
-	"http.ResponseWriter":                           "net/http",
-	"http.RoundTripper":                             "net/http",
-	"http.Serve":                                    "net/http",
-	"http.ServeContent":                             "net/http",
-	"http.ServeFile":                                "net/http",
-	"http.ServeMux":                                 "net/http",
-	"http.ServeTLS":                                 "net/http",
-	"http.Server":                                   "net/http",
-	"http.ServerContextKey":                         "net/http",
-	"http.SetCookie":                                "net/http",
-	"http.StateActive":                              "net/http",
-	"http.StateClosed":                              "net/http",
-	"http.StateHijacked":                            "net/http",
-	"http.StateIdle":                                "net/http",
-	"http.StateNew":                                 "net/http",
-	"http.StatusAccepted":                           "net/http",
-	"http.StatusAlreadyReported":                    "net/http",
-	"http.StatusBadGateway":                         "net/http",
-	"http.StatusBadRequest":                         "net/http",
-	"http.StatusConflict":                           "net/http",
-	"http.StatusContinue":                           "net/http",
-	"http.StatusCreated":                            "net/http",
-	"http.StatusExpectationFailed":                  "net/http",
-	"http.StatusFailedDependency":                   "net/http",
-	"http.StatusForbidden":                          "net/http",
-	"http.StatusFound":                              "net/http",
-	"http.StatusGatewayTimeout":                     "net/http",
-	"http.StatusGone":                               "net/http",
-	"http.StatusHTTPVersionNotSupported":            "net/http",
-	"http.StatusIMUsed":                             "net/http",
-	"http.StatusInsufficientStorage":                "net/http",
-	"http.StatusInternalServerError":                "net/http",
-	"http.StatusLengthRequired":                     "net/http",
-	"http.StatusLocked":                             "net/http",
-	"http.StatusLoopDetected":                       "net/http",
-	"http.StatusMethodNotAllowed":                   "net/http",
-	"http.StatusMovedPermanently":                   "net/http",
-	"http.StatusMultiStatus":                        "net/http",
-	"http.StatusMultipleChoices":                    "net/http",
-	"http.StatusNetworkAuthenticationRequired":      "net/http",
-	"http.StatusNoContent":                          "net/http",
-	"http.StatusNonAuthoritativeInfo":               "net/http",
-	"http.StatusNotAcceptable":                      "net/http",
-	"http.StatusNotExtended":                        "net/http",
-	"http.StatusNotFound":                           "net/http",
-	"http.StatusNotImplemented":                     "net/http",
-	"http.StatusNotModified":                        "net/http",
-	"http.StatusOK":                                 "net/http",
-	"http.StatusPartialContent":                     "net/http",
-	"http.StatusPaymentRequired":                    "net/http",
-	"http.StatusPermanentRedirect":                  "net/http",
-	"http.StatusPreconditionFailed":                 "net/http",
-	"http.StatusPreconditionRequired":               "net/http",
-	"http.StatusProcessing":                         "net/http",
-	"http.StatusProxyAuthRequired":                  "net/http",
-	"http.StatusRequestEntityTooLarge":              "net/http",
-	"http.StatusRequestHeaderFieldsTooLarge":        "net/http",
-	"http.StatusRequestTimeout":                     "net/http",
-	"http.StatusRequestURITooLong":                  "net/http",
-	"http.StatusRequestedRangeNotSatisfiable":       "net/http",
-	"http.StatusResetContent":                       "net/http",
-	"http.StatusSeeOther":                           "net/http",
-	"http.StatusServiceUnavailable":                 "net/http",
-	"http.StatusSwitchingProtocols":                 "net/http",
-	"http.StatusTeapot":                             "net/http",
-	"http.StatusTemporaryRedirect":                  "net/http",
-	"http.StatusText":                               "net/http",
-	"http.StatusTooManyRequests":                    "net/http",
-	"http.StatusUnauthorized":                       "net/http",
-	"http.StatusUnavailableForLegalReasons":         "net/http",
-	"http.StatusUnprocessableEntity":                "net/http",
-	"http.StatusUnsupportedMediaType":               "net/http",
-	"http.StatusUpgradeRequired":                    "net/http",
-	"http.StatusUseProxy":                           "net/http",
-	"http.StatusVariantAlsoNegotiates":              "net/http",
-	"http.StripPrefix":                              "net/http",
-	"http.TimeFormat":                               "net/http",
-	"http.TimeoutHandler":                           "net/http",
-	"http.TrailerPrefix":                            "net/http",
-	"http.Transport":                                "net/http",
-	"httptest.DefaultRemoteAddr":                    "net/http/httptest",
-	"httptest.NewRecorder":                          "net/http/httptest",
-	"httptest.NewRequest":                           "net/http/httptest",
-	"httptest.NewServer":                            "net/http/httptest",
-	"httptest.NewTLSServer":                         "net/http/httptest",
-	"httptest.NewUnstartedServer":                   "net/http/httptest",
-	"httptest.ResponseRecorder":                     "net/http/httptest",
-	"httptest.Server":                               "net/http/httptest",
-	"httptrace.ClientTrace":                         "net/http/httptrace",
-	"httptrace.ContextClientTrace":                  "net/http/httptrace",
-	"httptrace.DNSDoneInfo":                         "net/http/httptrace",
-	"httptrace.DNSStartInfo":                        "net/http/httptrace",
-	"httptrace.GotConnInfo":                         "net/http/httptrace",
-	"httptrace.WithClientTrace":                     "net/http/httptrace",
-	"httptrace.WroteRequestInfo":                    "net/http/httptrace",
-	"httputil.BufferPool":                           "net/http/httputil",
-	"httputil.ClientConn":                           "net/http/httputil",
-	"httputil.DumpRequest":                          "net/http/httputil",
-	"httputil.DumpRequestOut":                       "net/http/httputil",
-	"httputil.DumpResponse":                         "net/http/httputil",
-	"httputil.ErrClosed":                            "net/http/httputil",
-	"httputil.ErrLineTooLong":                       "net/http/httputil",
-	"httputil.ErrPersistEOF":                        "net/http/httputil",
-	"httputil.ErrPipeline":                          "net/http/httputil",
-	"httputil.NewChunkedReader":                     "net/http/httputil",
-	"httputil.NewChunkedWriter":                     "net/http/httputil",
-	"httputil.NewClientConn":                        "net/http/httputil",
-	"httputil.NewProxyClientConn":                   "net/http/httputil",
-	"httputil.NewServerConn":                        "net/http/httputil",
-	"httputil.NewSingleHostReverseProxy":            "net/http/httputil",
-	"httputil.ReverseProxy":                         "net/http/httputil",
-	"httputil.ServerConn":                           "net/http/httputil",
-	"image.Alpha":                                   "image",
-	"image.Alpha16":                                 "image",
-	"image.Black":                                   "image",
-	"image.CMYK":                                    "image",
-	"image.Config":                                  "image",
-	"image.Decode":                                  "image",
-	"image.DecodeConfig":                            "image",
-	"image.ErrFormat":                               "image",
-	"image.Gray":                                    "image",
-	"image.Gray16":                                  "image",
-	"image.Image":                                   "image",
-	"image.NRGBA":                                   "image",
-	"image.NRGBA64":                                 "image",
-	"image.NYCbCrA":                                 "image",
-	"image.NewAlpha":                                "image",
-	"image.NewAlpha16":                              "image",
-	"image.NewCMYK":                                 "image",
-	"image.NewGray":                                 "image",
-	"image.NewGray16":                               "image",
-	"image.NewNRGBA":                                "image",
-	"image.NewNRGBA64":                              "image",
-	"image.NewNYCbCrA":                              "image",
-	"image.NewPaletted":                             "image",
-	"image.NewRGBA":                                 "image",
-	"image.NewRGBA64":                               "image",
-	"image.NewUniform":                              "image",
-	"image.NewYCbCr":                                "image",
-	"image.Opaque":                                  "image",
-	"image.Paletted":                                "image",
-	"image.PalettedImage":                           "image",
-	"image.Point":                                   "image",
-	"image.Pt":                                      "image",
-	"image.RGBA":                                    "image",
-	"image.RGBA64":                                  "image",
-	"image.Rect":                                    "image",
-	"image.Rectangle":                               "image",
-	"image.RegisterFormat":                          "image",
-	"image.Transparent":                             "image",
-	"image.Uniform":                                 "image",
-	"image.White":                                   "image",
-	"image.YCbCr":                                   "image",
-	"image.YCbCrSubsampleRatio":                     "image",
-	"image.YCbCrSubsampleRatio410":                  "image",
-	"image.YCbCrSubsampleRatio411":                  "image",
-	"image.YCbCrSubsampleRatio420":                  "image",
-	"image.YCbCrSubsampleRatio422":                  "image",
-	"image.YCbCrSubsampleRatio440":                  "image",
-	"image.YCbCrSubsampleRatio444":                  "image",
-	"image.ZP":                                      "image",
-	"image.ZR":                                      "image",
-	"importer.Default":                              "go/importer",
-	"importer.For":                                  "go/importer",
-	"importer.Lookup":                               "go/importer",
-	"io.ByteReader":                                 "io",
-	"io.ByteScanner":                                "io",
-	"io.ByteWriter":                                 "io",
-	"io.Closer":                                     "io",
-	"io.Copy":                                       "io",
-	"io.CopyBuffer":                                 "io",
-	"io.CopyN":                                      "io",
-	"io.EOF":                                        "io",
-	"io.ErrClosedPipe":                              "io",
-	"io.ErrNoProgress":                              "io",
-	"io.ErrShortBuffer":                             "io",
-	"io.ErrShortWrite":                              "io",
-	"io.ErrUnexpectedEOF":                           "io",
-	"io.LimitReader":                                "io",
-	"io.LimitedReader":                              "io",
-	"io.MultiReader":                                "io",
-	"io.MultiWriter":                                "io",
-	"io.NewSectionReader":                           "io",
-	"io.Pipe":                                       "io",
-	"io.PipeReader":                                 "io",
-	"io.PipeWriter":                                 "io",
-	"io.ReadAtLeast":                                "io",
-	"io.ReadCloser":                                 "io",
-	"io.ReadFull":                                   "io",
-	"io.ReadSeeker":                                 "io",
-	"io.ReadWriteCloser":                            "io",
-	"io.ReadWriteSeeker":                            "io",
-	"io.ReadWriter":                                 "io",
-	"io.Reader":                                     "io",
-	"io.ReaderAt":                                   "io",
-	"io.ReaderFrom":                                 "io",
-	"io.RuneReader":                                 "io",
-	"io.RuneScanner":                                "io",
-	"io.SectionReader":                              "io",
-	"io.SeekCurrent":                                "io",
-	"io.SeekEnd":                                    "io",
-	"io.SeekStart":                                  "io",
-	"io.Seeker":                                     "io",
-	"io.TeeReader":                                  "io",
-	"io.WriteCloser":                                "io",
-	"io.WriteSeeker":                                "io",
-	"io.WriteString":                                "io",
-	"io.Writer":                                     "io",
-	"io.WriterAt":                                   "io",
-	"io.WriterTo":                                   "io",
-	"iotest.DataErrReader":                          "testing/iotest",
-	"iotest.ErrTimeout":                             "testing/iotest",
-	"iotest.HalfReader":                             "testing/iotest",
-	"iotest.NewReadLogger":                          "testing/iotest",
-	"iotest.NewWriteLogger":                         "testing/iotest",
-	"iotest.OneByteReader":                          "testing/iotest",
-	"iotest.TimeoutReader":                          "testing/iotest",
-	"iotest.TruncateWriter":                         "testing/iotest",
-	"ioutil.Discard":                                "io/ioutil",
-	"ioutil.NopCloser":                              "io/ioutil",
-	"ioutil.ReadAll":                                "io/ioutil",
-	"ioutil.ReadDir":                                "io/ioutil",
-	"ioutil.ReadFile":                               "io/ioutil",
-	"ioutil.TempDir":                                "io/ioutil",
-	"ioutil.TempFile":                               "io/ioutil",
-	"ioutil.WriteFile":                              "io/ioutil",
-	"jpeg.Decode":                                   "image/jpeg",
-	"jpeg.DecodeConfig":                             "image/jpeg",
-	"jpeg.DefaultQuality":                           "image/jpeg",
-	"jpeg.Encode":                                   "image/jpeg",
-	"jpeg.FormatError":                              "image/jpeg",
-	"jpeg.Options":                                  "image/jpeg",
-	"jpeg.Reader":                                   "image/jpeg",
-	"jpeg.UnsupportedError":                         "image/jpeg",
-	"json.Compact":                                  "encoding/json",
-	"json.Decoder":                                  "encoding/json",
-	"json.Delim":                                    "encoding/json",
-	"json.Encoder":                                  "encoding/json",
-	"json.HTMLEscape":                               "encoding/json",
-	"json.Indent":                                   "encoding/json",
-	"json.InvalidUTF8Error":                         "encoding/json",
-	"json.InvalidUnmarshalError":                    "encoding/json",
-	"json.Marshal":                                  "encoding/json",
-	"json.MarshalIndent":                            "encoding/json",
-	"json.Marshaler":                                "encoding/json",
-	"json.MarshalerError":                           "encoding/json",
-	"json.NewDecoder":                               "encoding/json",
-	"json.NewEncoder":                               "encoding/json",
-	"json.Number":                                   "encoding/json",
-	"json.RawMessage":                               "encoding/json",
-	"json.SyntaxError":                              "encoding/json",
-	"json.Token":                                    "encoding/json",
-	"json.Unmarshal":                                "encoding/json",
-	"json.UnmarshalFieldError":                      "encoding/json",
-	"json.UnmarshalTypeError":                       "encoding/json",
-	"json.Unmarshaler":                              "encoding/json",
-	"json.UnsupportedTypeError":                     "encoding/json",
-	"json.UnsupportedValueError":                    "encoding/json",
-	"json.Valid":                                    "encoding/json",
-	"jsonrpc.Dial":                                  "net/rpc/jsonrpc",
-	"jsonrpc.NewClient":                             "net/rpc/jsonrpc",
-	"jsonrpc.NewClientCodec":                        "net/rpc/jsonrpc",
-	"jsonrpc.NewServerCodec":                        "net/rpc/jsonrpc",
-	"jsonrpc.ServeConn":                             "net/rpc/jsonrpc",
-	"list.Element":                                  "container/list",
-	"list.List":                                     "container/list",
-	"list.New":                                      "container/list",
-	"log.Fatal":                                     "log",
-	"log.Fatalf":                                    "log",
-	"log.Fatalln":                                   "log",
-	"log.Flags":                                     "log",
-	"log.LUTC":                                      "log",
-	"log.Ldate":                                     "log",
-	"log.Llongfile":                                 "log",
-	"log.Lmicroseconds":                             "log",
-	"log.Logger":                                    "log",
-	"log.Lshortfile":                                "log",
-	"log.LstdFlags":                                 "log",
-	"log.Ltime":                                     "log",
-	"log.New":                                       "log",
-	"log.Output":                                    "log",
-	"log.Panic":                                     "log",
-	"log.Panicf":                                    "log",
-	"log.Panicln":                                   "log",
-	"log.Prefix":                                    "log",
-	"log.Print":                                     "log",
-	"log.Printf":                                    "log",
-	"log.Println":                                   "log",
-	"log.SetFlags":                                  "log",
-	"log.SetOutput":                                 "log",
-	"log.SetPrefix":                                 "log",
-	"lzw.LSB":                                       "compress/lzw",
-	"lzw.MSB":                                       "compress/lzw",
-	"lzw.NewReader":                                 "compress/lzw",
-	"lzw.NewWriter":                                 "compress/lzw",
-	"lzw.Order":                                     "compress/lzw",
-	"macho.Cpu":                                     "debug/macho",
-	"macho.Cpu386":                                  "debug/macho",
-	"macho.CpuAmd64":                                "debug/macho",
-	"macho.CpuArm":                                  "debug/macho",
-	"macho.CpuPpc":                                  "debug/macho",
-	"macho.CpuPpc64":                                "debug/macho",
-	"macho.Dylib":                                   "debug/macho",
-	"macho.DylibCmd":                                "debug/macho",
-	"macho.Dysymtab":                                "debug/macho",
-	"macho.DysymtabCmd":                             "debug/macho",
-	"macho.ErrNotFat":                               "debug/macho",
-	"macho.FatArch":                                 "debug/macho",
-	"macho.FatArchHeader":                           "debug/macho",
-	"macho.FatFile":                                 "debug/macho",
-	"macho.File":                                    "debug/macho",
-	"macho.FileHeader":                              "debug/macho",
-	"macho.FormatError":                             "debug/macho",
-	"macho.Load":                                    "debug/macho",
-	"macho.LoadBytes":                               "debug/macho",
-	"macho.LoadCmd":                                 "debug/macho",
-	"macho.LoadCmdDylib":                            "debug/macho",
-	"macho.LoadCmdDylinker":                         "debug/macho",
-	"macho.LoadCmdDysymtab":                         "debug/macho",
-	"macho.LoadCmdSegment":                          "debug/macho",
-	"macho.LoadCmdSegment64":                        "debug/macho",
-	"macho.LoadCmdSymtab":                           "debug/macho",
-	"macho.LoadCmdThread":                           "debug/macho",
-	"macho.LoadCmdUnixThread":                       "debug/macho",
-	"macho.Magic32":                                 "debug/macho",
-	"macho.Magic64":                                 "debug/macho",
-	"macho.MagicFat":                                "debug/macho",
-	"macho.NewFatFile":                              "debug/macho",
-	"macho.NewFile":                                 "debug/macho",
-	"macho.Nlist32":                                 "debug/macho",
-	"macho.Nlist64":                                 "debug/macho",
-	"macho.Open":                                    "debug/macho",
-	"macho.OpenFat":                                 "debug/macho",
-	"macho.Regs386":                                 "debug/macho",
-	"macho.RegsAMD64":                               "debug/macho",
-	"macho.Section":                                 "debug/macho",
-	"macho.Section32":                               "debug/macho",
-	"macho.Section64":                               "debug/macho",
-	"macho.SectionHeader":                           "debug/macho",
-	"macho.Segment":                                 "debug/macho",
-	"macho.Segment32":                               "debug/macho",
-	"macho.Segment64":                               "debug/macho",
-	"macho.SegmentHeader":                           "debug/macho",
-	"macho.Symbol":                                  "debug/macho",
-	"macho.Symtab":                                  "debug/macho",
-	"macho.SymtabCmd":                               "debug/macho",
-	"macho.Thread":                                  "debug/macho",
-	"macho.Type":                                    "debug/macho",
-	"macho.TypeBundle":                              "debug/macho",
-	"macho.TypeDylib":                               "debug/macho",
-	"macho.TypeExec":                                "debug/macho",
-	"macho.TypeObj":                                 "debug/macho",
-	"mail.Address":                                  "net/mail",
-	"mail.AddressParser":                            "net/mail",
-	"mail.ErrHeaderNotPresent":                      "net/mail",
-	"mail.Header":                                   "net/mail",
-	"mail.Message":                                  "net/mail",
-	"mail.ParseAddress":                             "net/mail",
-	"mail.ParseAddressList":                         "net/mail",
-	"mail.ParseDate":                                "net/mail",
-	"mail.ReadMessage":                              "net/mail",
-	"math.Abs":                                      "math",
-	"math.Acos":                                     "math",
-	"math.Acosh":                                    "math",
-	"math.Asin":                                     "math",
-	"math.Asinh":                                    "math",
-	"math.Atan":                                     "math",
-	"math.Atan2":                                    "math",
-	"math.Atanh":                                    "math",
-	"math.Cbrt":                                     "math",
-	"math.Ceil":                                     "math",
-	"math.Copysign":                                 "math",
-	"math.Cos":                                      "math",
-	"math.Cosh":                                     "math",
-	"math.Dim":                                      "math",
-	"math.E":                                        "math",
-	"math.Erf":                                      "math",
-	"math.Erfc":                                     "math",
-	"math.Exp":                                      "math",
-	"math.Exp2":                                     "math",
-	"math.Expm1":                                    "math",
-	"math.Float32bits":                              "math",
-	"math.Float32frombits":                          "math",
-	"math.Float64bits":                              "math",
-	"math.Float64frombits":                          "math",
-	"math.Floor":                                    "math",
-	"math.Frexp":                                    "math",
-	"math.Gamma":                                    "math",
-	"math.Hypot":                                    "math",
-	"math.Ilogb":                                    "math",
-	"math.Inf":                                      "math",
-	"math.IsInf":                                    "math",
-	"math.IsNaN":                                    "math",
-	"math.J0":                                       "math",
-	"math.J1":                                       "math",
-	"math.Jn":                                       "math",
-	"math.Ldexp":                                    "math",
-	"math.Lgamma":                                   "math",
-	"math.Ln10":                                     "math",
-	"math.Ln2":                                      "math",
-	"math.Log":                                      "math",
-	"math.Log10":                                    "math",
-	"math.Log10E":                                   "math",
-	"math.Log1p":                                    "math",
-	"math.Log2":                                     "math",
-	"math.Log2E":                                    "math",
-	"math.Logb":                                     "math",
-	"math.Max":                                      "math",
-	"math.MaxFloat32":                               "math",
-	"math.MaxFloat64":                               "math",
-	"math.MaxInt16":                                 "math",
-	"math.MaxInt32":                                 "math",
-	"math.MaxInt64":                                 "math",
-	"math.MaxInt8":                                  "math",
-	"math.MaxUint16":                                "math",
-	"math.MaxUint32":                                "math",
-	"math.MaxUint64":                                "math",
-	"math.MaxUint8":                                 "math",
-	"math.Min":                                      "math",
-	"math.MinInt16":                                 "math",
-	"math.MinInt32":                                 "math",
-	"math.MinInt64":                                 "math",
-	"math.MinInt8":                                  "math",
-	"math.Mod":                                      "math",
-	"math.Modf":                                     "math",
-	"math.NaN":                                      "math",
-	"math.Nextafter":                                "math",
-	"math.Nextafter32":                              "math",
-	"math.Phi":                                      "math",
-	"math.Pi":                                       "math",
-	"math.Pow":                                      "math",
-	"math.Pow10":                                    "math",
-	"math.Remainder":                                "math",
-	"math.Signbit":                                  "math",
-	"math.Sin":                                      "math",
-	"math.Sincos":                                   "math",
-	"math.Sinh":                                     "math",
-	"math.SmallestNonzeroFloat32":                   "math",
-	"math.SmallestNonzeroFloat64":                   "math",
-	"math.Sqrt":                                     "math",
-	"math.Sqrt2":                                    "math",
-	"math.SqrtE":                                    "math",
-	"math.SqrtPhi":                                  "math",
-	"math.SqrtPi":                                   "math",
-	"math.Tan":                                      "math",
-	"math.Tanh":                                     "math",
-	"math.Trunc":                                    "math",
-	"math.Y0":                                       "math",
-	"math.Y1":                                       "math",
-	"math.Yn":                                       "math",
-	"md5.BlockSize":                                 "crypto/md5",
-	"md5.New":                                       "crypto/md5",
-	"md5.Size":                                      "crypto/md5",
-	"md5.Sum":                                       "crypto/md5",
-	"mime.AddExtensionType":                         "mime",
-	"mime.BEncoding":                                "mime",
-	"mime.ErrInvalidMediaParameter":                 "mime",
-	"mime.ExtensionsByType":                         "mime",
-	"mime.FormatMediaType":                          "mime",
-	"mime.ParseMediaType":                           "mime",
-	"mime.QEncoding":                                "mime",
-	"mime.TypeByExtension":                          "mime",
-	"mime.WordDecoder":                              "mime",
-	"mime.WordEncoder":                              "mime",
-	"multipart.ErrMessageTooLarge":                  "mime/multipart",
-	"multipart.File":                                "mime/multipart",
-	"multipart.FileHeader":                          "mime/multipart",
-	"multipart.Form":                                "mime/multipart",
-	"multipart.NewReader":                           "mime/multipart",
-	"multipart.NewWriter":                           "mime/multipart",
-	"multipart.Part":                                "mime/multipart",
-	"multipart.Reader":                              "mime/multipart",
-	"multipart.Writer":                              "mime/multipart",
-	"net.Addr":                                      "net",
-	"net.AddrError":                                 "net",
-	"net.Buffers":                                   "net",
-	"net.CIDRMask":                                  "net",
-	"net.Conn":                                      "net",
-	"net.DNSConfigError":                            "net",
-	"net.DNSError":                                  "net",
-	"net.DefaultResolver":                           "net",
-	"net.Dial":                                      "net",
-	"net.DialIP":                                    "net",
-	"net.DialTCP":                                   "net",
-	"net.DialTimeout":                               "net",
-	"net.DialUDP":                                   "net",
-	"net.DialUnix":                                  "net",
-	"net.Dialer":                                    "net",
-	"net.ErrWriteToConnected":                       "net",
-	"net.Error":                                     "net",
-	"net.FileConn":                                  "net",
-	"net.FileListener":                              "net",
-	"net.FilePacketConn":                            "net",
-	"net.FlagBroadcast":                             "net",
-	"net.FlagLoopback":                              "net",
-	"net.FlagMulticast":                             "net",
-	"net.FlagPointToPoint":                          "net",
-	"net.FlagUp":                                    "net",
-	"net.Flags":                                     "net",
-	"net.HardwareAddr":                              "net",
-	"net.IP":                                        "net",
-	"net.IPAddr":                                    "net",
-	"net.IPConn":                                    "net",
-	"net.IPMask":                                    "net",
-	"net.IPNet":                                     "net",
-	"net.IPv4":                                      "net",
-	"net.IPv4Mask":                                  "net",
-	"net.IPv4allrouter":                             "net",
-	"net.IPv4allsys":                                "net",
-	"net.IPv4bcast":                                 "net",
-	"net.IPv4len":                                   "net",
-	"net.IPv4zero":                                  "net",
-	"net.IPv6interfacelocalallnodes":                "net",
-	"net.IPv6len":                                   "net",
-	"net.IPv6linklocalallnodes":                     "net",
-	"net.IPv6linklocalallrouters":                   "net",
-	"net.IPv6loopback":                              "net",
-	"net.IPv6unspecified":                           "net",
-	"net.IPv6zero":                                  "net",
-	"net.Interface":                                 "net",
-	"net.InterfaceAddrs":                            "net",
-	"net.InterfaceByIndex":                          "net",
-	"net.InterfaceByName":                           "net",
-	"net.Interfaces":                                "net",
-	"net.InvalidAddrError":                          "net",
-	"net.JoinHostPort":                              "net",
-	"net.Listen":                                    "net",
-	"net.ListenIP":                                  "net",
-	"net.ListenMulticastUDP":                        "net",
-	"net.ListenPacket":                              "net",
-	"net.ListenTCP":                                 "net",
-	"net.ListenUDP":                                 "net",
-	"net.ListenUnix":                                "net",
-	"net.ListenUnixgram":                            "net",
-	"net.Listener":                                  "net",
-	"net.LookupAddr":                                "net",
-	"net.LookupCNAME":                               "net",
-	"net.LookupHost":                                "net",
-	"net.LookupIP":                                  "net",
-	"net.LookupMX":                                  "net",
-	"net.LookupNS":                                  "net",
-	"net.LookupPort":                                "net",
-	"net.LookupSRV":                                 "net",
-	"net.LookupTXT":                                 "net",
-	"net.MX":                                        "net",
-	"net.NS":                                        "net",
-	"net.OpError":                                   "net",
-	"net.PacketConn":                                "net",
-	"net.ParseCIDR":                                 "net",
-	"net.ParseError":                                "net",
-	"net.ParseIP":                                   "net",
-	"net.ParseMAC":                                  "net",
-	"net.Pipe":                                      "net",
-	"net.ResolveIPAddr":                             "net",
-	"net.ResolveTCPAddr":                            "net",
-	"net.ResolveUDPAddr":                            "net",
-	"net.ResolveUnixAddr":                           "net",
-	"net.Resolver":                                  "net",
-	"net.SRV":                                       "net",
-	"net.SplitHostPort":                             "net",
-	"net.TCPAddr":                                   "net",
-	"net.TCPConn":                                   "net",
-	"net.TCPListener":                               "net",
-	"net.UDPAddr":                                   "net",
-	"net.UDPConn":                                   "net",
-	"net.UnixAddr":                                  "net",
-	"net.UnixConn":                                  "net",
-	"net.UnixListener":                              "net",
-	"net.UnknownNetworkError":                       "net",
-	"os.Args":                                       "os",
-	"os.Chdir":                                      "os",
-	"os.Chmod":                                      "os",
-	"os.Chown":                                      "os",
-	"os.Chtimes":                                    "os",
-	"os.Clearenv":                                   "os",
-	"os.Create":                                     "os",
-	"os.DevNull":                                    "os",
-	"os.Environ":                                    "os",
-	"os.ErrClosed":                                  "os",
-	"os.ErrExist":                                   "os",
-	"os.ErrInvalid":                                 "os",
-	"os.ErrNotExist":                                "os",
-	"os.ErrPermission":                              "os",
-	"os.Executable":                                 "os",
-	"os.Exit":                                       "os",
-	"os.Expand":                                     "os",
-	"os.ExpandEnv":                                  "os",
-	"os.File":                                       "os",
-	"os.FileInfo":                                   "os",
-	"os.FileMode":                                   "os",
-	"os.FindProcess":                                "os",
-	"os.Getegid":                                    "os",
-	"os.Getenv":                                     "os",
-	"os.Geteuid":                                    "os",
-	"os.Getgid":                                     "os",
-	"os.Getgroups":                                  "os",
-	"os.Getpagesize":                                "os",
-	"os.Getpid":                                     "os",
-	"os.Getppid":                                    "os",
-	"os.Getuid":                                     "os",
-	"os.Getwd":                                      "os",
-	"os.Hostname":                                   "os",
-	"os.Interrupt":                                  "os",
-	"os.IsExist":                                    "os",
-	"os.IsNotExist":                                 "os",
-	"os.IsPathSeparator":                            "os",
-	"os.IsPermission":                               "os",
-	"os.Kill":                                       "os",
-	"os.Lchown":                                     "os",
-	"os.Link":                                       "os",
-	"os.LinkError":                                  "os",
-	"os.LookupEnv":                                  "os",
-	"os.Lstat":                                      "os",
-	"os.Mkdir":                                      "os",
-	"os.MkdirAll":                                   "os",
-	"os.ModeAppend":                                 "os",
-	"os.ModeCharDevice":                             "os",
-	"os.ModeDevice":                                 "os",
-	"os.ModeDir":                                    "os",
-	"os.ModeExclusive":                              "os",
-	"os.ModeNamedPipe":                              "os",
-	"os.ModePerm":                                   "os",
-	"os.ModeSetgid":                                 "os",
-	"os.ModeSetuid":                                 "os",
-	"os.ModeSocket":                                 "os",
-	"os.ModeSticky":                                 "os",
-	"os.ModeSymlink":                                "os",
-	"os.ModeTemporary":                              "os",
-	"os.ModeType":                                   "os",
-	"os.NewFile":                                    "os",
-	"os.NewSyscallError":                            "os",
-	"os.O_APPEND":                                   "os",
-	"os.O_CREATE":                                   "os",
-	"os.O_EXCL":                                     "os",
-	"os.O_RDONLY":                                   "os",
-	"os.O_RDWR":                                     "os",
-	"os.O_SYNC":                                     "os",
-	"os.O_TRUNC":                                    "os",
-	"os.O_WRONLY":                                   "os",
-	"os.Open":                                       "os",
-	"os.OpenFile":                                   "os",
-	"os.PathError":                                  "os",
-	"os.PathListSeparator":                          "os",
-	"os.PathSeparator":                              "os",
-	"os.Pipe":                                       "os",
-	"os.ProcAttr":                                   "os",
-	"os.Process":                                    "os",
-	"os.ProcessState":                               "os",
-	"os.Readlink":                                   "os",
-	"os.Remove":                                     "os",
-	"os.RemoveAll":                                  "os",
-	"os.Rename":                                     "os",
-	"os.SEEK_CUR":                                   "os",
-	"os.SEEK_END":                                   "os",
-	"os.SEEK_SET":                                   "os",
-	"os.SameFile":                                   "os",
-	"os.Setenv":                                     "os",
-	"os.Signal":                                     "os",
-	"os.StartProcess":                               "os",
-	"os.Stat":                                       "os",
-	"os.Stderr":                                     "os",
-	"os.Stdin":                                      "os",
-	"os.Stdout":                                     "os",
-	"os.Symlink":                                    "os",
-	"os.SyscallError":                               "os",
-	"os.TempDir":                                    "os",
-	"os.Truncate":                                   "os",
-	"os.Unsetenv":                                   "os",
-	"palette.Plan9":                                 "image/color/palette",
-	"palette.WebSafe":                               "image/color/palette",
-	"parse.ActionNode":                              "text/template/parse",
-	"parse.BoolNode":                                "text/template/parse",
-	"parse.BranchNode":                              "text/template/parse",
-	"parse.ChainNode":                               "text/template/parse",
-	"parse.CommandNode":                             "text/template/parse",
-	"parse.DotNode":                                 "text/template/parse",
-	"parse.FieldNode":                               "text/template/parse",
-	"parse.IdentifierNode":                          "text/template/parse",
-	"parse.IfNode":                                  "text/template/parse",
-	"parse.IsEmptyTree":                             "text/template/parse",
-	"parse.ListNode":                                "text/template/parse",
-	"parse.New":                                     "text/template/parse",
-	"parse.NewIdentifier":                           "text/template/parse",
-	"parse.NilNode":                                 "text/template/parse",
-	"parse.Node":                                    "text/template/parse",
-	"parse.NodeAction":                              "text/template/parse",
-	"parse.NodeBool":                                "text/template/parse",
-	"parse.NodeChain":                               "text/template/parse",
-	"parse.NodeCommand":                             "text/template/parse",
-	"parse.NodeDot":                                 "text/template/parse",
-	"parse.NodeField":                               "text/template/parse",
-	"parse.NodeIdentifier":                          "text/template/parse",
-	"parse.NodeIf":                                  "text/template/parse",
-	"parse.NodeList":                                "text/template/parse",
-	"parse.NodeNil":                                 "text/template/parse",
-	"parse.NodeNumber":                              "text/template/parse",
-	"parse.NodePipe":                                "text/template/parse",
-	"parse.NodeRange":                               "text/template/parse",
-	"parse.NodeString":                              "text/template/parse",
-	"parse.NodeTemplate":                            "text/template/parse",
-	"parse.NodeText":                                "text/template/parse",
-	"parse.NodeType":                                "text/template/parse",
-	"parse.NodeVariable":                            "text/template/parse",
-	"parse.NodeWith":                                "text/template/parse",
-	"parse.NumberNode":                              "text/template/parse",
-	"parse.Parse":                                   "text/template/parse",
-	"parse.PipeNode":                                "text/template/parse",
-	"parse.Pos":                                     "text/template/parse",
-	"parse.RangeNode":                               "text/template/parse",
-	"parse.StringNode":                              "text/template/parse",
-	"parse.TemplateNode":                            "text/template/parse",
-	"parse.TextNode":                                "text/template/parse",
-	"parse.Tree":                                    "text/template/parse",
-	"parse.VariableNode":                            "text/template/parse",
-	"parse.WithNode":                                "text/template/parse",
-	"parser.AllErrors":                              "go/parser",
-	"parser.DeclarationErrors":                      "go/parser",
-	"parser.ImportsOnly":                            "go/parser",
-	"parser.Mode":                                   "go/parser",
-	"parser.PackageClauseOnly":                      "go/parser",
-	"parser.ParseComments":                          "go/parser",
-	"parser.ParseDir":                               "go/parser",
-	"parser.ParseExpr":                              "go/parser",
-	"parser.ParseExprFrom":                          "go/parser",
-	"parser.ParseFile":                              "go/parser",
-	"parser.SpuriousErrors":                         "go/parser",
-	"parser.Trace":                                  "go/parser",
-	"path.Base":                                     "path",
-	"path.Clean":                                    "path",
-	"path.Dir":                                      "path",
-	"path.ErrBadPattern":                            "path",
-	"path.Ext":                                      "path",
-	"path.IsAbs":                                    "path",
-	"path.Join":                                     "path",
-	"path.Match":                                    "path",
-	"path.Split":                                    "path",
-	"pe.COFFSymbol":                                 "debug/pe",
-	"pe.COFFSymbolSize":                             "debug/pe",
-	"pe.DataDirectory":                              "debug/pe",
-	"pe.File":                                       "debug/pe",
-	"pe.FileHeader":                                 "debug/pe",
-	"pe.FormatError":                                "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_AM33":                    "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_AMD64":                   "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_ARM":                     "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_EBC":                     "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_I386":                    "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_IA64":                    "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_M32R":                    "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_MIPS16":                  "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_MIPSFPU":                 "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_MIPSFPU16":               "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_POWERPC":                 "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_POWERPCFP":               "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_R4000":                   "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_SH3":                     "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_SH3DSP":                  "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_SH4":                     "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_SH5":                     "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_THUMB":                   "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_UNKNOWN":                 "debug/pe",
-	"pe.IMAGE_FILE_MACHINE_WCEMIPSV2":               "debug/pe",
-	"pe.ImportDirectory":                            "debug/pe",
-	"pe.NewFile":                                    "debug/pe",
-	"pe.Open":                                       "debug/pe",
-	"pe.OptionalHeader32":                           "debug/pe",
-	"pe.OptionalHeader64":                           "debug/pe",
-	"pe.Reloc":                                      "debug/pe",
-	"pe.Section":                                    "debug/pe",
-	"pe.SectionHeader":                              "debug/pe",
-	"pe.SectionHeader32":                            "debug/pe",
-	"pe.StringTable":                                "debug/pe",
-	"pe.Symbol":                                     "debug/pe",
-	"pem.Block":                                     "encoding/pem",
-	"pem.Decode":                                    "encoding/pem",
-	"pem.Encode":                                    "encoding/pem",
-	"pem.EncodeToMemory":                            "encoding/pem",
-	"pkix.AlgorithmIdentifier":                      "crypto/x509/pkix",
-	"pkix.AttributeTypeAndValue":                    "crypto/x509/pkix",
-	"pkix.AttributeTypeAndValueSET":                 "crypto/x509/pkix",
-	"pkix.CertificateList":                          "crypto/x509/pkix",
-	"pkix.Extension":                                "crypto/x509/pkix",
-	"pkix.Name":                                     "crypto/x509/pkix",
-	"pkix.RDNSequence":                              "crypto/x509/pkix",
-	"pkix.RelativeDistinguishedNameSET":             "crypto/x509/pkix",
-	"pkix.RevokedCertificate":                       "crypto/x509/pkix",
-	"pkix.TBSCertificateList":                       "crypto/x509/pkix",
-	"plan9obj.File":                                 "debug/plan9obj",
-	"plan9obj.FileHeader":                           "debug/plan9obj",
-	"plan9obj.Magic386":                             "debug/plan9obj",
-	"plan9obj.Magic64":                              "debug/plan9obj",
-	"plan9obj.MagicAMD64":                           "debug/plan9obj",
-	"plan9obj.MagicARM":                             "debug/plan9obj",
-	"plan9obj.NewFile":                              "debug/plan9obj",
-	"plan9obj.Open":                                 "debug/plan9obj",
-	"plan9obj.Section":                              "debug/plan9obj",
-	"plan9obj.SectionHeader":                        "debug/plan9obj",
-	"plan9obj.Sym":                                  "debug/plan9obj",
-	"plugin.Open":                                   "plugin",
-	"plugin.Plugin":                                 "plugin",
-	"plugin.Symbol":                                 "plugin",
-	"png.BestCompression":                           "image/png",
-	"png.BestSpeed":                                 "image/png",
-	"png.CompressionLevel":                          "image/png",
-	"png.Decode":                                    "image/png",
-	"png.DecodeConfig":                              "image/png",
-	"png.DefaultCompression":                        "image/png",
-	"png.Encode":                                    "image/png",
-	"png.Encoder":                                   "image/png",
-	"png.EncoderBuffer":                             "image/png",
-	"png.EncoderBufferPool":                         "image/png",
-	"png.FormatError":                               "image/png",
-	"png.NoCompression":                             "image/png",
-	"png.UnsupportedError":                          "image/png",
-	"pprof.Cmdline":                                 "net/http/pprof",
-	"pprof.Do":                                      "runtime/pprof",
-	"pprof.ForLabels":                               "runtime/pprof",
-	"pprof.Handler":                                 "net/http/pprof",
-	"pprof.Index":                                   "net/http/pprof",
-	"pprof.Label":                                   "runtime/pprof",
-	"pprof.LabelSet":                                "runtime/pprof",
-	"pprof.Labels":                                  "runtime/pprof",
-	"pprof.Lookup":                                  "runtime/pprof",
-	"pprof.NewProfile":                              "runtime/pprof",
-	// "pprof.Profile" is ambiguous
-	"pprof.Profiles":            "runtime/pprof",
-	"pprof.SetGoroutineLabels":  "runtime/pprof",
-	"pprof.StartCPUProfile":     "runtime/pprof",
-	"pprof.StopCPUProfile":      "runtime/pprof",
-	"pprof.Symbol":              "net/http/pprof",
-	"pprof.Trace":               "net/http/pprof",
-	"pprof.WithLabels":          "runtime/pprof",
-	"pprof.WriteHeapProfile":    "runtime/pprof",
-	"printer.CommentedNode":     "go/printer",
-	"printer.Config":            "go/printer",
-	"printer.Fprint":            "go/printer",
-	"printer.Mode":              "go/printer",
-	"printer.RawFormat":         "go/printer",
-	"printer.SourcePos":         "go/printer",
-	"printer.TabIndent":         "go/printer",
-	"printer.UseSpaces":         "go/printer",
-	"quick.Check":               "testing/quick",
-	"quick.CheckEqual":          "testing/quick",
-	"quick.CheckEqualError":     "testing/quick",
-	"quick.CheckError":          "testing/quick",
-	"quick.Config":              "testing/quick",
-	"quick.Generator":           "testing/quick",
-	"quick.SetupError":          "testing/quick",
-	"quick.Value":               "testing/quick",
-	"quotedprintable.NewReader": "mime/quotedprintable",
-	"quotedprintable.NewWriter": "mime/quotedprintable",
-	"quotedprintable.Reader":    "mime/quotedprintable",
-	"quotedprintable.Writer":    "mime/quotedprintable",
-	"rand.ExpFloat64":           "math/rand",
-	"rand.Float32":              "math/rand",
-	"rand.Float64":              "math/rand",
-	// "rand.Int" is ambiguous
-	"rand.Int31":       "math/rand",
-	"rand.Int31n":      "math/rand",
-	"rand.Int63":       "math/rand",
-	"rand.Int63n":      "math/rand",
-	"rand.Intn":        "math/rand",
-	"rand.New":         "math/rand",
-	"rand.NewSource":   "math/rand",
-	"rand.NewZipf":     "math/rand",
-	"rand.NormFloat64": "math/rand",
-	"rand.Perm":        "math/rand",
-	"rand.Prime":       "crypto/rand",
-	"rand.Rand":        "math/rand",
-	// "rand.Read" is ambiguous
-	"rand.Reader":                     "crypto/rand",
-	"rand.Seed":                       "math/rand",
-	"rand.Source":                     "math/rand",
-	"rand.Source64":                   "math/rand",
-	"rand.Uint32":                     "math/rand",
-	"rand.Uint64":                     "math/rand",
-	"rand.Zipf":                       "math/rand",
-	"rc4.Cipher":                      "crypto/rc4",
-	"rc4.KeySizeError":                "crypto/rc4",
-	"rc4.NewCipher":                   "crypto/rc4",
-	"reflect.Append":                  "reflect",
-	"reflect.AppendSlice":             "reflect",
-	"reflect.Array":                   "reflect",
-	"reflect.ArrayOf":                 "reflect",
-	"reflect.Bool":                    "reflect",
-	"reflect.BothDir":                 "reflect",
-	"reflect.Chan":                    "reflect",
-	"reflect.ChanDir":                 "reflect",
-	"reflect.ChanOf":                  "reflect",
-	"reflect.Complex128":              "reflect",
-	"reflect.Complex64":               "reflect",
-	"reflect.Copy":                    "reflect",
-	"reflect.DeepEqual":               "reflect",
-	"reflect.Float32":                 "reflect",
-	"reflect.Float64":                 "reflect",
-	"reflect.Func":                    "reflect",
-	"reflect.FuncOf":                  "reflect",
-	"reflect.Indirect":                "reflect",
-	"reflect.Int":                     "reflect",
-	"reflect.Int16":                   "reflect",
-	"reflect.Int32":                   "reflect",
-	"reflect.Int64":                   "reflect",
-	"reflect.Int8":                    "reflect",
-	"reflect.Interface":               "reflect",
-	"reflect.Invalid":                 "reflect",
-	"reflect.Kind":                    "reflect",
-	"reflect.MakeChan":                "reflect",
-	"reflect.MakeFunc":                "reflect",
-	"reflect.MakeMap":                 "reflect",
-	"reflect.MakeMapWithSize":         "reflect",
-	"reflect.MakeSlice":               "reflect",
-	"reflect.Map":                     "reflect",
-	"reflect.MapOf":                   "reflect",
-	"reflect.Method":                  "reflect",
-	"reflect.New":                     "reflect",
-	"reflect.NewAt":                   "reflect",
-	"reflect.Ptr":                     "reflect",
-	"reflect.PtrTo":                   "reflect",
-	"reflect.RecvDir":                 "reflect",
-	"reflect.Select":                  "reflect",
-	"reflect.SelectCase":              "reflect",
-	"reflect.SelectDefault":           "reflect",
-	"reflect.SelectDir":               "reflect",
-	"reflect.SelectRecv":              "reflect",
-	"reflect.SelectSend":              "reflect",
-	"reflect.SendDir":                 "reflect",
-	"reflect.Slice":                   "reflect",
-	"reflect.SliceHeader":             "reflect",
-	"reflect.SliceOf":                 "reflect",
-	"reflect.String":                  "reflect",
-	"reflect.StringHeader":            "reflect",
-	"reflect.Struct":                  "reflect",
-	"reflect.StructField":             "reflect",
-	"reflect.StructOf":                "reflect",
-	"reflect.StructTag":               "reflect",
-	"reflect.Swapper":                 "reflect",
-	"reflect.TypeOf":                  "reflect",
-	"reflect.Uint":                    "reflect",
-	"reflect.Uint16":                  "reflect",
-	"reflect.Uint32":                  "reflect",
-	"reflect.Uint64":                  "reflect",
-	"reflect.Uint8":                   "reflect",
-	"reflect.Uintptr":                 "reflect",
-	"reflect.UnsafePointer":           "reflect",
-	"reflect.Value":                   "reflect",
-	"reflect.ValueError":              "reflect",
-	"reflect.ValueOf":                 "reflect",
-	"reflect.Zero":                    "reflect",
-	"regexp.Compile":                  "regexp",
-	"regexp.CompilePOSIX":             "regexp",
-	"regexp.Match":                    "regexp",
-	"regexp.MatchReader":              "regexp",
-	"regexp.MatchString":              "regexp",
-	"regexp.MustCompile":              "regexp",
-	"regexp.MustCompilePOSIX":         "regexp",
-	"regexp.QuoteMeta":                "regexp",
-	"regexp.Regexp":                   "regexp",
-	"ring.New":                        "container/ring",
-	"ring.Ring":                       "container/ring",
-	"rpc.Accept":                      "net/rpc",
-	"rpc.Call":                        "net/rpc",
-	"rpc.Client":                      "net/rpc",
-	"rpc.ClientCodec":                 "net/rpc",
-	"rpc.DefaultDebugPath":            "net/rpc",
-	"rpc.DefaultRPCPath":              "net/rpc",
-	"rpc.DefaultServer":               "net/rpc",
-	"rpc.Dial":                        "net/rpc",
-	"rpc.DialHTTP":                    "net/rpc",
-	"rpc.DialHTTPPath":                "net/rpc",
-	"rpc.ErrShutdown":                 "net/rpc",
-	"rpc.HandleHTTP":                  "net/rpc",
-	"rpc.NewClient":                   "net/rpc",
-	"rpc.NewClientWithCodec":          "net/rpc",
-	"rpc.NewServer":                   "net/rpc",
-	"rpc.Register":                    "net/rpc",
-	"rpc.RegisterName":                "net/rpc",
-	"rpc.Request":                     "net/rpc",
-	"rpc.Response":                    "net/rpc",
-	"rpc.ServeCodec":                  "net/rpc",
-	"rpc.ServeConn":                   "net/rpc",
-	"rpc.ServeRequest":                "net/rpc",
-	"rpc.Server":                      "net/rpc",
-	"rpc.ServerCodec":                 "net/rpc",
-	"rpc.ServerError":                 "net/rpc",
-	"rsa.CRTValue":                    "crypto/rsa",
-	"rsa.DecryptOAEP":                 "crypto/rsa",
-	"rsa.DecryptPKCS1v15":             "crypto/rsa",
-	"rsa.DecryptPKCS1v15SessionKey":   "crypto/rsa",
-	"rsa.EncryptOAEP":                 "crypto/rsa",
-	"rsa.EncryptPKCS1v15":             "crypto/rsa",
-	"rsa.ErrDecryption":               "crypto/rsa",
-	"rsa.ErrMessageTooLong":           "crypto/rsa",
-	"rsa.ErrVerification":             "crypto/rsa",
-	"rsa.GenerateKey":                 "crypto/rsa",
-	"rsa.GenerateMultiPrimeKey":       "crypto/rsa",
-	"rsa.OAEPOptions":                 "crypto/rsa",
-	"rsa.PKCS1v15DecryptOptions":      "crypto/rsa",
-	"rsa.PSSOptions":                  "crypto/rsa",
-	"rsa.PSSSaltLengthAuto":           "crypto/rsa",
-	"rsa.PSSSaltLengthEqualsHash":     "crypto/rsa",
-	"rsa.PrecomputedValues":           "crypto/rsa",
-	"rsa.PrivateKey":                  "crypto/rsa",
-	"rsa.PublicKey":                   "crypto/rsa",
-	"rsa.SignPKCS1v15":                "crypto/rsa",
-	"rsa.SignPSS":                     "crypto/rsa",
-	"rsa.VerifyPKCS1v15":              "crypto/rsa",
-	"rsa.VerifyPSS":                   "crypto/rsa",
-	"runtime.BlockProfile":            "runtime",
-	"runtime.BlockProfileRecord":      "runtime",
-	"runtime.Breakpoint":              "runtime",
-	"runtime.CPUProfile":              "runtime",
-	"runtime.Caller":                  "runtime",
-	"runtime.Callers":                 "runtime",
-	"runtime.CallersFrames":           "runtime",
-	"runtime.Compiler":                "runtime",
-	"runtime.Error":                   "runtime",
-	"runtime.Frame":                   "runtime",
-	"runtime.Frames":                  "runtime",
-	"runtime.Func":                    "runtime",
-	"runtime.FuncForPC":               "runtime",
-	"runtime.GC":                      "runtime",
-	"runtime.GOARCH":                  "runtime",
-	"runtime.GOMAXPROCS":              "runtime",
-	"runtime.GOOS":                    "runtime",
-	"runtime.GOROOT":                  "runtime",
-	"runtime.Goexit":                  "runtime",
-	"runtime.GoroutineProfile":        "runtime",
-	"runtime.Gosched":                 "runtime",
-	"runtime.KeepAlive":               "runtime",
-	"runtime.LockOSThread":            "runtime",
-	"runtime.MemProfile":              "runtime",
-	"runtime.MemProfileRate":          "runtime",
-	"runtime.MemProfileRecord":        "runtime",
-	"runtime.MemStats":                "runtime",
-	"runtime.MutexProfile":            "runtime",
-	"runtime.NumCPU":                  "runtime",
-	"runtime.NumCgoCall":              "runtime",
-	"runtime.NumGoroutine":            "runtime",
-	"runtime.ReadMemStats":            "runtime",
-	"runtime.ReadTrace":               "runtime",
-	"runtime.SetBlockProfileRate":     "runtime",
-	"runtime.SetCPUProfileRate":       "runtime",
-	"runtime.SetCgoTraceback":         "runtime",
-	"runtime.SetFinalizer":            "runtime",
-	"runtime.SetMutexProfileFraction": "runtime",
-	"runtime.Stack":                   "runtime",
-	"runtime.StackRecord":             "runtime",
-	"runtime.StartTrace":              "runtime",
-	"runtime.StopTrace":               "runtime",
-	"runtime.ThreadCreateProfile":     "runtime",
-	"runtime.TypeAssertionError":      "runtime",
-	"runtime.UnlockOSThread":          "runtime",
-	"runtime.Version":                 "runtime",
-	"scanner.Char":                    "text/scanner",
-	"scanner.Comment":                 "text/scanner",
-	"scanner.EOF":                     "text/scanner",
-	"scanner.Error":                   "go/scanner",
-	"scanner.ErrorHandler":            "go/scanner",
-	"scanner.ErrorList":               "go/scanner",
-	"scanner.Float":                   "text/scanner",
-	"scanner.GoTokens":                "text/scanner",
-	"scanner.GoWhitespace":            "text/scanner",
-	"scanner.Ident":                   "text/scanner",
-	"scanner.Int":                     "text/scanner",
-	"scanner.Mode":                    "go/scanner",
-	"scanner.Position":                "text/scanner",
-	"scanner.PrintError":              "go/scanner",
-	"scanner.RawString":               "text/scanner",
-	"scanner.ScanChars":               "text/scanner",
-	// "scanner.ScanComments" is ambiguous
-	"scanner.ScanFloats":     "text/scanner",
-	"scanner.ScanIdents":     "text/scanner",
-	"scanner.ScanInts":       "text/scanner",
-	"scanner.ScanRawStrings": "text/scanner",
-	"scanner.ScanStrings":    "text/scanner",
-	// "scanner.Scanner" is ambiguous
-	"scanner.SkipComments":                                 "text/scanner",
-	"scanner.String":                                       "text/scanner",
-	"scanner.TokenString":                                  "text/scanner",
-	"sha1.BlockSize":                                       "crypto/sha1",
-	"sha1.New":                                             "crypto/sha1",
-	"sha1.Size":                                            "crypto/sha1",
-	"sha1.Sum":                                             "crypto/sha1",
-	"sha256.BlockSize":                                     "crypto/sha256",
-	"sha256.New":                                           "crypto/sha256",
-	"sha256.New224":                                        "crypto/sha256",
-	"sha256.Size":                                          "crypto/sha256",
-	"sha256.Size224":                                       "crypto/sha256",
-	"sha256.Sum224":                                        "crypto/sha256",
-	"sha256.Sum256":                                        "crypto/sha256",
-	"sha512.BlockSize":                                     "crypto/sha512",
-	"sha512.New":                                           "crypto/sha512",
-	"sha512.New384":                                        "crypto/sha512",
-	"sha512.New512_224":                                    "crypto/sha512",
-	"sha512.New512_256":                                    "crypto/sha512",
-	"sha512.Size":                                          "crypto/sha512",
-	"sha512.Size224":                                       "crypto/sha512",
-	"sha512.Size256":                                       "crypto/sha512",
-	"sha512.Size384":                                       "crypto/sha512",
-	"sha512.Sum384":                                        "crypto/sha512",
-	"sha512.Sum512":                                        "crypto/sha512",
-	"sha512.Sum512_224":                                    "crypto/sha512",
-	"sha512.Sum512_256":                                    "crypto/sha512",
-	"signal.Ignore":                                        "os/signal",
-	"signal.Notify":                                        "os/signal",
-	"signal.Reset":                                         "os/signal",
-	"signal.Stop":                                          "os/signal",
-	"smtp.Auth":                                            "net/smtp",
-	"smtp.CRAMMD5Auth":                                     "net/smtp",
-	"smtp.Client":                                          "net/smtp",
-	"smtp.Dial":                                            "net/smtp",
-	"smtp.NewClient":                                       "net/smtp",
-	"smtp.PlainAuth":                                       "net/smtp",
-	"smtp.SendMail":                                        "net/smtp",
-	"smtp.ServerInfo":                                      "net/smtp",
-	"sort.Float64Slice":                                    "sort",
-	"sort.Float64s":                                        "sort",
-	"sort.Float64sAreSorted":                               "sort",
-	"sort.IntSlice":                                        "sort",
-	"sort.Interface":                                       "sort",
-	"sort.Ints":                                            "sort",
-	"sort.IntsAreSorted":                                   "sort",
-	"sort.IsSorted":                                        "sort",
-	"sort.Reverse":                                         "sort",
-	"sort.Search":                                          "sort",
-	"sort.SearchFloat64s":                                  "sort",
-	"sort.SearchInts":                                      "sort",
-	"sort.SearchStrings":                                   "sort",
-	"sort.Slice":                                           "sort",
-	"sort.SliceIsSorted":                                   "sort",
-	"sort.SliceStable":                                     "sort",
-	"sort.Sort":                                            "sort",
-	"sort.Stable":                                          "sort",
-	"sort.StringSlice":                                     "sort",
-	"sort.Strings":                                         "sort",
-	"sort.StringsAreSorted":                                "sort",
-	"sql.ColumnType":                                       "database/sql",
-	"sql.Conn":                                             "database/sql",
-	"sql.DB":                                               "database/sql",
-	"sql.DBStats":                                          "database/sql",
-	"sql.Drivers":                                          "database/sql",
-	"sql.ErrConnDone":                                      "database/sql",
-	"sql.ErrNoRows":                                        "database/sql",
-	"sql.ErrTxDone":                                        "database/sql",
-	"sql.IsolationLevel":                                   "database/sql",
-	"sql.LevelDefault":                                     "database/sql",
-	"sql.LevelLinearizable":                                "database/sql",
-	"sql.LevelReadCommitted":                               "database/sql",
-	"sql.LevelReadUncommitted":                             "database/sql",
-	"sql.LevelRepeatableRead":                              "database/sql",
-	"sql.LevelSerializable":                                "database/sql",
-	"sql.LevelSnapshot":                                    "database/sql",
-	"sql.LevelWriteCommitted":                              "database/sql",
-	"sql.Named":                                            "database/sql",
-	"sql.NamedArg":                                         "database/sql",
-	"sql.NullBool":                                         "database/sql",
-	"sql.NullFloat64":                                      "database/sql",
-	"sql.NullInt64":                                        "database/sql",
-	"sql.NullString":                                       "database/sql",
-	"sql.Open":                                             "database/sql",
-	"sql.Out":                                              "database/sql",
-	"sql.RawBytes":                                         "database/sql",
-	"sql.Register":                                         "database/sql",
-	"sql.Result":                                           "database/sql",
-	"sql.Row":                                              "database/sql",
-	"sql.Rows":                                             "database/sql",
-	"sql.Scanner":                                          "database/sql",
-	"sql.Stmt":                                             "database/sql",
-	"sql.Tx":                                               "database/sql",
-	"sql.TxOptions":                                        "database/sql",
-	"strconv.AppendBool":                                   "strconv",
-	"strconv.AppendFloat":                                  "strconv",
-	"strconv.AppendInt":                                    "strconv",
-	"strconv.AppendQuote":                                  "strconv",
-	"strconv.AppendQuoteRune":                              "strconv",
-	"strconv.AppendQuoteRuneToASCII":                       "strconv",
-	"strconv.AppendQuoteRuneToGraphic":                     "strconv",
-	"strconv.AppendQuoteToASCII":                           "strconv",
-	"strconv.AppendQuoteToGraphic":                         "strconv",
-	"strconv.AppendUint":                                   "strconv",
-	"strconv.Atoi":                                         "strconv",
-	"strconv.CanBackquote":                                 "strconv",
-	"strconv.ErrRange":                                     "strconv",
-	"strconv.ErrSyntax":                                    "strconv",
-	"strconv.FormatBool":                                   "strconv",
-	"strconv.FormatFloat":                                  "strconv",
-	"strconv.FormatInt":                                    "strconv",
-	"strconv.FormatUint":                                   "strconv",
-	"strconv.IntSize":                                      "strconv",
-	"strconv.IsGraphic":                                    "strconv",
-	"strconv.IsPrint":                                      "strconv",
-	"strconv.Itoa":                                         "strconv",
-	"strconv.NumError":                                     "strconv",
-	"strconv.ParseBool":                                    "strconv",
-	"strconv.ParseFloat":                                   "strconv",
-	"strconv.ParseInt":                                     "strconv",
-	"strconv.ParseUint":                                    "strconv",
-	"strconv.Quote":                                        "strconv",
-	"strconv.QuoteRune":                                    "strconv",
-	"strconv.QuoteRuneToASCII":                             "strconv",
-	"strconv.QuoteRuneToGraphic":                           "strconv",
-	"strconv.QuoteToASCII":                                 "strconv",
-	"strconv.QuoteToGraphic":                               "strconv",
-	"strconv.Unquote":                                      "strconv",
-	"strconv.UnquoteChar":                                  "strconv",
-	"strings.Compare":                                      "strings",
-	"strings.Contains":                                     "strings",
-	"strings.ContainsAny":                                  "strings",
-	"strings.ContainsRune":                                 "strings",
-	"strings.Count":                                        "strings",
-	"strings.EqualFold":                                    "strings",
-	"strings.Fields":                                       "strings",
-	"strings.FieldsFunc":                                   "strings",
-	"strings.HasPrefix":                                    "strings",
-	"strings.HasSuffix":                                    "strings",
-	"strings.Index":                                        "strings",
-	"strings.IndexAny":                                     "strings",
-	"strings.IndexByte":                                    "strings",
-	"strings.IndexFunc":                                    "strings",
-	"strings.IndexRune":                                    "strings",
-	"strings.Join":                                         "strings",
-	"strings.LastIndex":                                    "strings",
-	"strings.LastIndexAny":                                 "strings",
-	"strings.LastIndexByte":                                "strings",
-	"strings.LastIndexFunc":                                "strings",
-	"strings.Map":                                          "strings",
-	"strings.NewReader":                                    "strings",
-	"strings.NewReplacer":                                  "strings",
-	"strings.Reader":                                       "strings",
-	"strings.Repeat":                                       "strings",
-	"strings.Replace":                                      "strings",
-	"strings.Replacer":                                     "strings",
-	"strings.Split":                                        "strings",
-	"strings.SplitAfter":                                   "strings",
-	"strings.SplitAfterN":                                  "strings",
-	"strings.SplitN":                                       "strings",
-	"strings.Title":                                        "strings",
-	"strings.ToLower":                                      "strings",
-	"strings.ToLowerSpecial":                               "strings",
-	"strings.ToTitle":                                      "strings",
-	"strings.ToTitleSpecial":                               "strings",
-	"strings.ToUpper":                                      "strings",
-	"strings.ToUpperSpecial":                               "strings",
-	"strings.Trim":                                         "strings",
-	"strings.TrimFunc":                                     "strings",
-	"strings.TrimLeft":                                     "strings",
-	"strings.TrimLeftFunc":                                 "strings",
-	"strings.TrimPrefix":                                   "strings",
-	"strings.TrimRight":                                    "strings",
-	"strings.TrimRightFunc":                                "strings",
-	"strings.TrimSpace":                                    "strings",
-	"strings.TrimSuffix":                                   "strings",
-	"subtle.ConstantTimeByteEq":                            "crypto/subtle",
-	"subtle.ConstantTimeCompare":                           "crypto/subtle",
-	"subtle.ConstantTimeCopy":                              "crypto/subtle",
-	"subtle.ConstantTimeEq":                                "crypto/subtle",
-	"subtle.ConstantTimeLessOrEq":                          "crypto/subtle",
-	"subtle.ConstantTimeSelect":                            "crypto/subtle",
-	"suffixarray.Index":                                    "index/suffixarray",
-	"suffixarray.New":                                      "index/suffixarray",
-	"sync.Cond":                                            "sync",
-	"sync.Locker":                                          "sync",
-	"sync.Map":                                             "sync",
-	"sync.Mutex":                                           "sync",
-	"sync.NewCond":                                         "sync",
-	"sync.Once":                                            "sync",
-	"sync.Pool":                                            "sync",
-	"sync.RWMutex":                                         "sync",
-	"sync.WaitGroup":                                       "sync",
-	"syntax.ClassNL":                                       "regexp/syntax",
-	"syntax.Compile":                                       "regexp/syntax",
-	"syntax.DotNL":                                         "regexp/syntax",
-	"syntax.EmptyBeginLine":                                "regexp/syntax",
-	"syntax.EmptyBeginText":                                "regexp/syntax",
-	"syntax.EmptyEndLine":                                  "regexp/syntax",
-	"syntax.EmptyEndText":                                  "regexp/syntax",
-	"syntax.EmptyNoWordBoundary":                           "regexp/syntax",
-	"syntax.EmptyOp":                                       "regexp/syntax",
-	"syntax.EmptyOpContext":                                "regexp/syntax",
-	"syntax.EmptyWordBoundary":                             "regexp/syntax",
-	"syntax.ErrInternalError":                              "regexp/syntax",
-	"syntax.ErrInvalidCharClass":                           "regexp/syntax",
-	"syntax.ErrInvalidCharRange":                           "regexp/syntax",
-	"syntax.ErrInvalidEscape":                              "regexp/syntax",
-	"syntax.ErrInvalidNamedCapture":                        "regexp/syntax",
-	"syntax.ErrInvalidPerlOp":                              "regexp/syntax",
-	"syntax.ErrInvalidRepeatOp":                            "regexp/syntax",
-	"syntax.ErrInvalidRepeatSize":                          "regexp/syntax",
-	"syntax.ErrInvalidUTF8":                                "regexp/syntax",
-	"syntax.ErrMissingBracket":                             "regexp/syntax",
-	"syntax.ErrMissingParen":                               "regexp/syntax",
-	"syntax.ErrMissingRepeatArgument":                      "regexp/syntax",
-	"syntax.ErrTrailingBackslash":                          "regexp/syntax",
-	"syntax.ErrUnexpectedParen":                            "regexp/syntax",
-	"syntax.Error":                                         "regexp/syntax",
-	"syntax.ErrorCode":                                     "regexp/syntax",
-	"syntax.Flags":                                         "regexp/syntax",
-	"syntax.FoldCase":                                      "regexp/syntax",
-	"syntax.Inst":                                          "regexp/syntax",
-	"syntax.InstAlt":                                       "regexp/syntax",
-	"syntax.InstAltMatch":                                  "regexp/syntax",
-	"syntax.InstCapture":                                   "regexp/syntax",
-	"syntax.InstEmptyWidth":                                "regexp/syntax",
-	"syntax.InstFail":                                      "regexp/syntax",
-	"syntax.InstMatch":                                     "regexp/syntax",
-	"syntax.InstNop":                                       "regexp/syntax",
-	"syntax.InstOp":                                        "regexp/syntax",
-	"syntax.InstRune":                                      "regexp/syntax",
-	"syntax.InstRune1":                                     "regexp/syntax",
-	"syntax.InstRuneAny":                                   "regexp/syntax",
-	"syntax.InstRuneAnyNotNL":                              "regexp/syntax",
-	"syntax.IsWordChar":                                    "regexp/syntax",
-	"syntax.Literal":                                       "regexp/syntax",
-	"syntax.MatchNL":                                       "regexp/syntax",
-	"syntax.NonGreedy":                                     "regexp/syntax",
-	"syntax.OneLine":                                       "regexp/syntax",
-	"syntax.Op":                                            "regexp/syntax",
-	"syntax.OpAlternate":                                   "regexp/syntax",
-	"syntax.OpAnyChar":                                     "regexp/syntax",
-	"syntax.OpAnyCharNotNL":                                "regexp/syntax",
-	"syntax.OpBeginLine":                                   "regexp/syntax",
-	"syntax.OpBeginText":                                   "regexp/syntax",
-	"syntax.OpCapture":                                     "regexp/syntax",
-	"syntax.OpCharClass":                                   "regexp/syntax",
-	"syntax.OpConcat":                                      "regexp/syntax",
-	"syntax.OpEmptyMatch":                                  "regexp/syntax",
-	"syntax.OpEndLine":                                     "regexp/syntax",
-	"syntax.OpEndText":                                     "regexp/syntax",
-	"syntax.OpLiteral":                                     "regexp/syntax",
-	"syntax.OpNoMatch":                                     "regexp/syntax",
-	"syntax.OpNoWordBoundary":                              "regexp/syntax",
-	"syntax.OpPlus":                                        "regexp/syntax",
-	"syntax.OpQuest":                                       "regexp/syntax",
-	"syntax.OpRepeat":                                      "regexp/syntax",
-	"syntax.OpStar":                                        "regexp/syntax",
-	"syntax.OpWordBoundary":                                "regexp/syntax",
-	"syntax.POSIX":                                         "regexp/syntax",
-	"syntax.Parse":                                         "regexp/syntax",
-	"syntax.Perl":                                          "regexp/syntax",
-	"syntax.PerlX":                                         "regexp/syntax",
-	"syntax.Prog":                                          "regexp/syntax",
-	"syntax.Regexp":                                        "regexp/syntax",
-	"syntax.Simple":                                        "regexp/syntax",
-	"syntax.UnicodeGroups":                                 "regexp/syntax",
-	"syntax.WasDollar":                                     "regexp/syntax",
-	"syscall.AF_ALG":                                       "syscall",
-	"syscall.AF_APPLETALK":                                 "syscall",
-	"syscall.AF_ARP":                                       "syscall",
-	"syscall.AF_ASH":                                       "syscall",
-	"syscall.AF_ATM":                                       "syscall",
-	"syscall.AF_ATMPVC":                                    "syscall",
-	"syscall.AF_ATMSVC":                                    "syscall",
-	"syscall.AF_AX25":                                      "syscall",
-	"syscall.AF_BLUETOOTH":                                 "syscall",
-	"syscall.AF_BRIDGE":                                    "syscall",
-	"syscall.AF_CAIF":                                      "syscall",
-	"syscall.AF_CAN":                                       "syscall",
-	"syscall.AF_CCITT":                                     "syscall",
-	"syscall.AF_CHAOS":                                     "syscall",
-	"syscall.AF_CNT":                                       "syscall",
-	"syscall.AF_COIP":                                      "syscall",
-	"syscall.AF_DATAKIT":                                   "syscall",
-	"syscall.AF_DECnet":                                    "syscall",
-	"syscall.AF_DLI":                                       "syscall",
-	"syscall.AF_E164":                                      "syscall",
-	"syscall.AF_ECMA":                                      "syscall",
-	"syscall.AF_ECONET":                                    "syscall",
-	"syscall.AF_ENCAP":                                     "syscall",
-	"syscall.AF_FILE":                                      "syscall",
-	"syscall.AF_HYLINK":                                    "syscall",
-	"syscall.AF_IEEE80211":                                 "syscall",
-	"syscall.AF_IEEE802154":                                "syscall",
-	"syscall.AF_IMPLINK":                                   "syscall",
-	"syscall.AF_INET":                                      "syscall",
-	"syscall.AF_INET6":                                     "syscall",
-	"syscall.AF_INET6_SDP":                                 "syscall",
-	"syscall.AF_INET_SDP":                                  "syscall",
-	"syscall.AF_IPX":                                       "syscall",
-	"syscall.AF_IRDA":                                      "syscall",
-	"syscall.AF_ISDN":                                      "syscall",
-	"syscall.AF_ISO":                                       "syscall",
-	"syscall.AF_IUCV":                                      "syscall",
-	"syscall.AF_KEY":                                       "syscall",
-	"syscall.AF_LAT":                                       "syscall",
-	"syscall.AF_LINK":                                      "syscall",
-	"syscall.AF_LLC":                                       "syscall",
-	"syscall.AF_LOCAL":                                     "syscall",
-	"syscall.AF_MAX":                                       "syscall",
-	"syscall.AF_MPLS":                                      "syscall",
-	"syscall.AF_NATM":                                      "syscall",
-	"syscall.AF_NDRV":                                      "syscall",
-	"syscall.AF_NETBEUI":                                   "syscall",
-	"syscall.AF_NETBIOS":                                   "syscall",
-	"syscall.AF_NETGRAPH":                                  "syscall",
-	"syscall.AF_NETLINK":                                   "syscall",
-	"syscall.AF_NETROM":                                    "syscall",
-	"syscall.AF_NS":                                        "syscall",
-	"syscall.AF_OROUTE":                                    "syscall",
-	"syscall.AF_OSI":                                       "syscall",
-	"syscall.AF_PACKET":                                    "syscall",
-	"syscall.AF_PHONET":                                    "syscall",
-	"syscall.AF_PPP":                                       "syscall",
-	"syscall.AF_PPPOX":                                     "syscall",
-	"syscall.AF_PUP":                                       "syscall",
-	"syscall.AF_RDS":                                       "syscall",
-	"syscall.AF_RESERVED_36":                               "syscall",
-	"syscall.AF_ROSE":                                      "syscall",
-	"syscall.AF_ROUTE":                                     "syscall",
-	"syscall.AF_RXRPC":                                     "syscall",
-	"syscall.AF_SCLUSTER":                                  "syscall",
-	"syscall.AF_SECURITY":                                  "syscall",
-	"syscall.AF_SIP":                                       "syscall",
-	"syscall.AF_SLOW":                                      "syscall",
-	"syscall.AF_SNA":                                       "syscall",
-	"syscall.AF_SYSTEM":                                    "syscall",
-	"syscall.AF_TIPC":                                      "syscall",
-	"syscall.AF_UNIX":                                      "syscall",
-	"syscall.AF_UNSPEC":                                    "syscall",
-	"syscall.AF_VENDOR00":                                  "syscall",
-	"syscall.AF_VENDOR01":                                  "syscall",
-	"syscall.AF_VENDOR02":                                  "syscall",
-	"syscall.AF_VENDOR03":                                  "syscall",
-	"syscall.AF_VENDOR04":                                  "syscall",
-	"syscall.AF_VENDOR05":                                  "syscall",
-	"syscall.AF_VENDOR06":                                  "syscall",
-	"syscall.AF_VENDOR07":                                  "syscall",
-	"syscall.AF_VENDOR08":                                  "syscall",
-	"syscall.AF_VENDOR09":                                  "syscall",
-	"syscall.AF_VENDOR10":                                  "syscall",
-	"syscall.AF_VENDOR11":                                  "syscall",
-	"syscall.AF_VENDOR12":                                  "syscall",
-	"syscall.AF_VENDOR13":                                  "syscall",
-	"syscall.AF_VENDOR14":                                  "syscall",
-	"syscall.AF_VENDOR15":                                  "syscall",
-	"syscall.AF_VENDOR16":                                  "syscall",
-	"syscall.AF_VENDOR17":                                  "syscall",
-	"syscall.AF_VENDOR18":                                  "syscall",
-	"syscall.AF_VENDOR19":                                  "syscall",
-	"syscall.AF_VENDOR20":                                  "syscall",
-	"syscall.AF_VENDOR21":                                  "syscall",
-	"syscall.AF_VENDOR22":                                  "syscall",
-	"syscall.AF_VENDOR23":                                  "syscall",
-	"syscall.AF_VENDOR24":                                  "syscall",
-	"syscall.AF_VENDOR25":                                  "syscall",
-	"syscall.AF_VENDOR26":                                  "syscall",
-	"syscall.AF_VENDOR27":                                  "syscall",
-	"syscall.AF_VENDOR28":                                  "syscall",
-	"syscall.AF_VENDOR29":                                  "syscall",
-	"syscall.AF_VENDOR30":                                  "syscall",
-	"syscall.AF_VENDOR31":                                  "syscall",
-	"syscall.AF_VENDOR32":                                  "syscall",
-	"syscall.AF_VENDOR33":                                  "syscall",
-	"syscall.AF_VENDOR34":                                  "syscall",
-	"syscall.AF_VENDOR35":                                  "syscall",
-	"syscall.AF_VENDOR36":                                  "syscall",
-	"syscall.AF_VENDOR37":                                  "syscall",
-	"syscall.AF_VENDOR38":                                  "syscall",
-	"syscall.AF_VENDOR39":                                  "syscall",
-	"syscall.AF_VENDOR40":                                  "syscall",
-	"syscall.AF_VENDOR41":                                  "syscall",
-	"syscall.AF_VENDOR42":                                  "syscall",
-	"syscall.AF_VENDOR43":                                  "syscall",
-	"syscall.AF_VENDOR44":                                  "syscall",
-	"syscall.AF_VENDOR45":                                  "syscall",
-	"syscall.AF_VENDOR46":                                  "syscall",
-	"syscall.AF_VENDOR47":                                  "syscall",
-	"syscall.AF_WANPIPE":                                   "syscall",
-	"syscall.AF_X25":                                       "syscall",
-	"syscall.AI_CANONNAME":                                 "syscall",
-	"syscall.AI_NUMERICHOST":                               "syscall",
-	"syscall.AI_PASSIVE":                                   "syscall",
-	"syscall.APPLICATION_ERROR":                            "syscall",
-	"syscall.ARPHRD_ADAPT":                                 "syscall",
-	"syscall.ARPHRD_APPLETLK":                              "syscall",
-	"syscall.ARPHRD_ARCNET":                                "syscall",
-	"syscall.ARPHRD_ASH":                                   "syscall",
-	"syscall.ARPHRD_ATM":                                   "syscall",
-	"syscall.ARPHRD_AX25":                                  "syscall",
-	"syscall.ARPHRD_BIF":                                   "syscall",
-	"syscall.ARPHRD_CHAOS":                                 "syscall",
-	"syscall.ARPHRD_CISCO":                                 "syscall",
-	"syscall.ARPHRD_CSLIP":                                 "syscall",
-	"syscall.ARPHRD_CSLIP6":                                "syscall",
-	"syscall.ARPHRD_DDCMP":                                 "syscall",
-	"syscall.ARPHRD_DLCI":                                  "syscall",
-	"syscall.ARPHRD_ECONET":                                "syscall",
-	"syscall.ARPHRD_EETHER":                                "syscall",
-	"syscall.ARPHRD_ETHER":                                 "syscall",
-	"syscall.ARPHRD_EUI64":                                 "syscall",
-	"syscall.ARPHRD_FCAL":                                  "syscall",
-	"syscall.ARPHRD_FCFABRIC":                              "syscall",
-	"syscall.ARPHRD_FCPL":                                  "syscall",
-	"syscall.ARPHRD_FCPP":                                  "syscall",
-	"syscall.ARPHRD_FDDI":                                  "syscall",
-	"syscall.ARPHRD_FRAD":                                  "syscall",
-	"syscall.ARPHRD_FRELAY":                                "syscall",
-	"syscall.ARPHRD_HDLC":                                  "syscall",
-	"syscall.ARPHRD_HIPPI":                                 "syscall",
-	"syscall.ARPHRD_HWX25":                                 "syscall",
-	"syscall.ARPHRD_IEEE1394":                              "syscall",
-	"syscall.ARPHRD_IEEE802":                               "syscall",
-	"syscall.ARPHRD_IEEE80211":                             "syscall",
-	"syscall.ARPHRD_IEEE80211_PRISM":                       "syscall",
-	"syscall.ARPHRD_IEEE80211_RADIOTAP":                    "syscall",
-	"syscall.ARPHRD_IEEE802154":                            "syscall",
-	"syscall.ARPHRD_IEEE802154_PHY":                        "syscall",
-	"syscall.ARPHRD_IEEE802_TR":                            "syscall",
-	"syscall.ARPHRD_INFINIBAND":                            "syscall",
-	"syscall.ARPHRD_IPDDP":                                 "syscall",
-	"syscall.ARPHRD_IPGRE":                                 "syscall",
-	"syscall.ARPHRD_IRDA":                                  "syscall",
-	"syscall.ARPHRD_LAPB":                                  "syscall",
-	"syscall.ARPHRD_LOCALTLK":                              "syscall",
-	"syscall.ARPHRD_LOOPBACK":                              "syscall",
-	"syscall.ARPHRD_METRICOM":                              "syscall",
-	"syscall.ARPHRD_NETROM":                                "syscall",
-	"syscall.ARPHRD_NONE":                                  "syscall",
-	"syscall.ARPHRD_PIMREG":                                "syscall",
-	"syscall.ARPHRD_PPP":                                   "syscall",
-	"syscall.ARPHRD_PRONET":                                "syscall",
-	"syscall.ARPHRD_RAWHDLC":                               "syscall",
-	"syscall.ARPHRD_ROSE":                                  "syscall",
-	"syscall.ARPHRD_RSRVD":                                 "syscall",
-	"syscall.ARPHRD_SIT":                                   "syscall",
-	"syscall.ARPHRD_SKIP":                                  "syscall",
-	"syscall.ARPHRD_SLIP":                                  "syscall",
-	"syscall.ARPHRD_SLIP6":                                 "syscall",
-	"syscall.ARPHRD_STRIP":                                 "syscall",
-	"syscall.ARPHRD_TUNNEL":                                "syscall",
-	"syscall.ARPHRD_TUNNEL6":                               "syscall",
-	"syscall.ARPHRD_VOID":                                  "syscall",
-	"syscall.ARPHRD_X25":                                   "syscall",
-	"syscall.AUTHTYPE_CLIENT":                              "syscall",
-	"syscall.AUTHTYPE_SERVER":                              "syscall",
-	"syscall.Accept":                                       "syscall",
-	"syscall.Accept4":                                      "syscall",
-	"syscall.AcceptEx":                                     "syscall",
-	"syscall.Access":                                       "syscall",
-	"syscall.Acct":                                         "syscall",
-	"syscall.AddrinfoW":                                    "syscall",
-	"syscall.Adjtime":                                      "syscall",
-	"syscall.Adjtimex":                                     "syscall",
-	"syscall.AttachLsf":                                    "syscall",
-	"syscall.B0":                                           "syscall",
-	"syscall.B1000000":                                     "syscall",
-	"syscall.B110":                                         "syscall",
-	"syscall.B115200":                                      "syscall",
-	"syscall.B1152000":                                     "syscall",
-	"syscall.B1200":                                        "syscall",
-	"syscall.B134":                                         "syscall",
-	"syscall.B14400":                                       "syscall",
-	"syscall.B150":                                         "syscall",
-	"syscall.B1500000":                                     "syscall",
-	"syscall.B1800":                                        "syscall",
-	"syscall.B19200":                                       "syscall",
-	"syscall.B200":                                         "syscall",
-	"syscall.B2000000":                                     "syscall",
-	"syscall.B230400":                                      "syscall",
-	"syscall.B2400":                                        "syscall",
-	"syscall.B2500000":                                     "syscall",
-	"syscall.B28800":                                       "syscall",
-	"syscall.B300":                                         "syscall",
-	"syscall.B3000000":                                     "syscall",
-	"syscall.B3500000":                                     "syscall",
-	"syscall.B38400":                                       "syscall",
-	"syscall.B4000000":                                     "syscall",
-	"syscall.B460800":                                      "syscall",
-	"syscall.B4800":                                        "syscall",
-	"syscall.B50":                                          "syscall",
-	"syscall.B500000":                                      "syscall",
-	"syscall.B57600":                                       "syscall",
-	"syscall.B576000":                                      "syscall",
-	"syscall.B600":                                         "syscall",
-	"syscall.B7200":                                        "syscall",
-	"syscall.B75":                                          "syscall",
-	"syscall.B76800":                                       "syscall",
-	"syscall.B921600":                                      "syscall",
-	"syscall.B9600":                                        "syscall",
-	"syscall.BASE_PROTOCOL":                                "syscall",
-	"syscall.BIOCFEEDBACK":                                 "syscall",
-	"syscall.BIOCFLUSH":                                    "syscall",
-	"syscall.BIOCGBLEN":                                    "syscall",
-	"syscall.BIOCGDIRECTION":                               "syscall",
-	"syscall.BIOCGDIRFILT":                                 "syscall",
-	"syscall.BIOCGDLT":                                     "syscall",
-	"syscall.BIOCGDLTLIST":                                 "syscall",
-	"syscall.BIOCGETBUFMODE":                               "syscall",
-	"syscall.BIOCGETIF":                                    "syscall",
-	"syscall.BIOCGETZMAX":                                  "syscall",
-	"syscall.BIOCGFEEDBACK":                                "syscall",
-	"syscall.BIOCGFILDROP":                                 "syscall",
-	"syscall.BIOCGHDRCMPLT":                                "syscall",
-	"syscall.BIOCGRSIG":                                    "syscall",
-	"syscall.BIOCGRTIMEOUT":                                "syscall",
-	"syscall.BIOCGSEESENT":                                 "syscall",
-	"syscall.BIOCGSTATS":                                   "syscall",
-	"syscall.BIOCGSTATSOLD":                                "syscall",
-	"syscall.BIOCGTSTAMP":                                  "syscall",
-	"syscall.BIOCIMMEDIATE":                                "syscall",
-	"syscall.BIOCLOCK":                                     "syscall",
-	"syscall.BIOCPROMISC":                                  "syscall",
-	"syscall.BIOCROTZBUF":                                  "syscall",
-	"syscall.BIOCSBLEN":                                    "syscall",
-	"syscall.BIOCSDIRECTION":                               "syscall",
-	"syscall.BIOCSDIRFILT":                                 "syscall",
-	"syscall.BIOCSDLT":                                     "syscall",
-	"syscall.BIOCSETBUFMODE":                               "syscall",
-	"syscall.BIOCSETF":                                     "syscall",
-	"syscall.BIOCSETFNR":                                   "syscall",
-	"syscall.BIOCSETIF":                                    "syscall",
-	"syscall.BIOCSETWF":                                    "syscall",
-	"syscall.BIOCSETZBUF":                                  "syscall",
-	"syscall.BIOCSFEEDBACK":                                "syscall",
-	"syscall.BIOCSFILDROP":                                 "syscall",
-	"syscall.BIOCSHDRCMPLT":                                "syscall",
-	"syscall.BIOCSRSIG":                                    "syscall",
-	"syscall.BIOCSRTIMEOUT":                                "syscall",
-	"syscall.BIOCSSEESENT":                                 "syscall",
-	"syscall.BIOCSTCPF":                                    "syscall",
-	"syscall.BIOCSTSTAMP":                                  "syscall",
-	"syscall.BIOCSUDPF":                                    "syscall",
-	"syscall.BIOCVERSION":                                  "syscall",
-	"syscall.BPF_A":                                        "syscall",
-	"syscall.BPF_ABS":                                      "syscall",
-	"syscall.BPF_ADD":                                      "syscall",
-	"syscall.BPF_ALIGNMENT":                                "syscall",
-	"syscall.BPF_ALIGNMENT32":                              "syscall",
-	"syscall.BPF_ALU":                                      "syscall",
-	"syscall.BPF_AND":                                      "syscall",
-	"syscall.BPF_B":                                        "syscall",
-	"syscall.BPF_BUFMODE_BUFFER":                           "syscall",
-	"syscall.BPF_BUFMODE_ZBUF":                             "syscall",
-	"syscall.BPF_DFLTBUFSIZE":                              "syscall",
-	"syscall.BPF_DIRECTION_IN":                             "syscall",
-	"syscall.BPF_DIRECTION_OUT":                            "syscall",
-	"syscall.BPF_DIV":                                      "syscall",
-	"syscall.BPF_H":                                        "syscall",
-	"syscall.BPF_IMM":                                      "syscall",
-	"syscall.BPF_IND":                                      "syscall",
-	"syscall.BPF_JA":                                       "syscall",
-	"syscall.BPF_JEQ":                                      "syscall",
-	"syscall.BPF_JGE":                                      "syscall",
-	"syscall.BPF_JGT":                                      "syscall",
-	"syscall.BPF_JMP":                                      "syscall",
-	"syscall.BPF_JSET":                                     "syscall",
-	"syscall.BPF_K":                                        "syscall",
-	"syscall.BPF_LD":                                       "syscall",
-	"syscall.BPF_LDX":                                      "syscall",
-	"syscall.BPF_LEN":                                      "syscall",
-	"syscall.BPF_LSH":                                      "syscall",
-	"syscall.BPF_MAJOR_VERSION":                            "syscall",
-	"syscall.BPF_MAXBUFSIZE":                               "syscall",
-	"syscall.BPF_MAXINSNS":                                 "syscall",
-	"syscall.BPF_MEM":                                      "syscall",
-	"syscall.BPF_MEMWORDS":                                 "syscall",
-	"syscall.BPF_MINBUFSIZE":                               "syscall",
-	"syscall.BPF_MINOR_VERSION":                            "syscall",
-	"syscall.BPF_MISC":                                     "syscall",
-	"syscall.BPF_MSH":                                      "syscall",
-	"syscall.BPF_MUL":                                      "syscall",
-	"syscall.BPF_NEG":                                      "syscall",
-	"syscall.BPF_OR":                                       "syscall",
-	"syscall.BPF_RELEASE":                                  "syscall",
-	"syscall.BPF_RET":                                      "syscall",
-	"syscall.BPF_RSH":                                      "syscall",
-	"syscall.BPF_ST":                                       "syscall",
-	"syscall.BPF_STX":                                      "syscall",
-	"syscall.BPF_SUB":                                      "syscall",
-	"syscall.BPF_TAX":                                      "syscall",
-	"syscall.BPF_TXA":                                      "syscall",
-	"syscall.BPF_T_BINTIME":                                "syscall",
-	"syscall.BPF_T_BINTIME_FAST":                           "syscall",
-	"syscall.BPF_T_BINTIME_MONOTONIC":                      "syscall",
-	"syscall.BPF_T_BINTIME_MONOTONIC_FAST":                 "syscall",
-	"syscall.BPF_T_FAST":                                   "syscall",
-	"syscall.BPF_T_FLAG_MASK":                              "syscall",
-	"syscall.BPF_T_FORMAT_MASK":                            "syscall",
-	"syscall.BPF_T_MICROTIME":                              "syscall",
-	"syscall.BPF_T_MICROTIME_FAST":                         "syscall",
-	"syscall.BPF_T_MICROTIME_MONOTONIC":                    "syscall",
-	"syscall.BPF_T_MICROTIME_MONOTONIC_FAST":               "syscall",
-	"syscall.BPF_T_MONOTONIC":                              "syscall",
-	"syscall.BPF_T_MONOTONIC_FAST":                         "syscall",
-	"syscall.BPF_T_NANOTIME":                               "syscall",
-	"syscall.BPF_T_NANOTIME_FAST":                          "syscall",
-	"syscall.BPF_T_NANOTIME_MONOTONIC":                     "syscall",
-	"syscall.BPF_T_NANOTIME_MONOTONIC_FAST":                "syscall",
-	"syscall.BPF_T_NONE":                                   "syscall",
-	"syscall.BPF_T_NORMAL":                                 "syscall",
-	"syscall.BPF_W":                                        "syscall",
-	"syscall.BPF_X":                                        "syscall",
-	"syscall.BRKINT":                                       "syscall",
-	"syscall.Bind":                                         "syscall",
-	"syscall.BindToDevice":                                 "syscall",
-	"syscall.BpfBuflen":                                    "syscall",
-	"syscall.BpfDatalink":                                  "syscall",
-	"syscall.BpfHdr":                                       "syscall",
-	"syscall.BpfHeadercmpl":                                "syscall",
-	"syscall.BpfInsn":                                      "syscall",
-	"syscall.BpfInterface":                                 "syscall",
-	"syscall.BpfJump":                                      "syscall",
-	"syscall.BpfProgram":                                   "syscall",
-	"syscall.BpfStat":                                      "syscall",
-	"syscall.BpfStats":                                     "syscall",
-	"syscall.BpfStmt":                                      "syscall",
-	"syscall.BpfTimeout":                                   "syscall",
-	"syscall.BpfTimeval":                                   "syscall",
-	"syscall.BpfVersion":                                   "syscall",
-	"syscall.BpfZbuf":                                      "syscall",
-	"syscall.BpfZbufHeader":                                "syscall",
-	"syscall.ByHandleFileInformation":                      "syscall",
-	"syscall.BytePtrFromString":                            "syscall",
-	"syscall.ByteSliceFromString":                          "syscall",
-	"syscall.CCR0_FLUSH":                                   "syscall",
-	"syscall.CERT_CHAIN_POLICY_AUTHENTICODE":               "syscall",
-	"syscall.CERT_CHAIN_POLICY_AUTHENTICODE_TS":            "syscall",
-	"syscall.CERT_CHAIN_POLICY_BASE":                       "syscall",
-	"syscall.CERT_CHAIN_POLICY_BASIC_CONSTRAINTS":          "syscall",
-	"syscall.CERT_CHAIN_POLICY_EV":                         "syscall",
-	"syscall.CERT_CHAIN_POLICY_MICROSOFT_ROOT":             "syscall",
-	"syscall.CERT_CHAIN_POLICY_NT_AUTH":                    "syscall",
-	"syscall.CERT_CHAIN_POLICY_SSL":                        "syscall",
-	"syscall.CERT_E_CN_NO_MATCH":                           "syscall",
-	"syscall.CERT_E_EXPIRED":                               "syscall",
-	"syscall.CERT_E_PURPOSE":                               "syscall",
-	"syscall.CERT_E_ROLE":                                  "syscall",
-	"syscall.CERT_E_UNTRUSTEDROOT":                         "syscall",
-	"syscall.CERT_STORE_ADD_ALWAYS":                        "syscall",
-	"syscall.CERT_STORE_DEFER_CLOSE_UNTIL_LAST_FREE_FLAG":  "syscall",
-	"syscall.CERT_STORE_PROV_MEMORY":                       "syscall",
-	"syscall.CERT_TRUST_HAS_EXCLUDED_NAME_CONSTRAINT":      "syscall",
-	"syscall.CERT_TRUST_HAS_NOT_DEFINED_NAME_CONSTRAINT":   "syscall",
-	"syscall.CERT_TRUST_HAS_NOT_PERMITTED_NAME_CONSTRAINT": "syscall",
-	"syscall.CERT_TRUST_HAS_NOT_SUPPORTED_CRITICAL_EXT":    "syscall",
-	"syscall.CERT_TRUST_HAS_NOT_SUPPORTED_NAME_CONSTRAINT": "syscall",
-	"syscall.CERT_TRUST_INVALID_BASIC_CONSTRAINTS":         "syscall",
-	"syscall.CERT_TRUST_INVALID_EXTENSION":                 "syscall",
-	"syscall.CERT_TRUST_INVALID_NAME_CONSTRAINTS":          "syscall",
-	"syscall.CERT_TRUST_INVALID_POLICY_CONSTRAINTS":        "syscall",
-	"syscall.CERT_TRUST_IS_CYCLIC":                         "syscall",
-	"syscall.CERT_TRUST_IS_EXPLICIT_DISTRUST":              "syscall",
-	"syscall.CERT_TRUST_IS_NOT_SIGNATURE_VALID":            "syscall",
-	"syscall.CERT_TRUST_IS_NOT_TIME_VALID":                 "syscall",
-	"syscall.CERT_TRUST_IS_NOT_VALID_FOR_USAGE":            "syscall",
-	"syscall.CERT_TRUST_IS_OFFLINE_REVOCATION":             "syscall",
-	"syscall.CERT_TRUST_IS_REVOKED":                        "syscall",
-	"syscall.CERT_TRUST_IS_UNTRUSTED_ROOT":                 "syscall",
-	"syscall.CERT_TRUST_NO_ERROR":                          "syscall",
-	"syscall.CERT_TRUST_NO_ISSUANCE_CHAIN_POLICY":          "syscall",
-	"syscall.CERT_TRUST_REVOCATION_STATUS_UNKNOWN":         "syscall",
-	"syscall.CFLUSH":                                       "syscall",
-	"syscall.CLOCAL":                                       "syscall",
-	"syscall.CLONE_CHILD_CLEARTID":                         "syscall",
-	"syscall.CLONE_CHILD_SETTID":                           "syscall",
-	"syscall.CLONE_CSIGNAL":                                "syscall",
-	"syscall.CLONE_DETACHED":                               "syscall",
-	"syscall.CLONE_FILES":                                  "syscall",
-	"syscall.CLONE_FS":                                     "syscall",
-	"syscall.CLONE_IO":                                     "syscall",
-	"syscall.CLONE_NEWIPC":                                 "syscall",
-	"syscall.CLONE_NEWNET":                                 "syscall",
-	"syscall.CLONE_NEWNS":                                  "syscall",
-	"syscall.CLONE_NEWPID":                                 "syscall",
-	"syscall.CLONE_NEWUSER":                                "syscall",
-	"syscall.CLONE_NEWUTS":                                 "syscall",
-	"syscall.CLONE_PARENT":                                 "syscall",
-	"syscall.CLONE_PARENT_SETTID":                          "syscall",
-	"syscall.CLONE_PID":                                    "syscall",
-	"syscall.CLONE_PTRACE":                                 "syscall",
-	"syscall.CLONE_SETTLS":                                 "syscall",
-	"syscall.CLONE_SIGHAND":                                "syscall",
-	"syscall.CLONE_SYSVSEM":                                "syscall",
-	"syscall.CLONE_THREAD":                                 "syscall",
-	"syscall.CLONE_UNTRACED":                               "syscall",
-	"syscall.CLONE_VFORK":                                  "syscall",
-	"syscall.CLONE_VM":                                     "syscall",
-	"syscall.CPUID_CFLUSH":                                 "syscall",
-	"syscall.CREAD":                                        "syscall",
-	"syscall.CREATE_ALWAYS":                                "syscall",
-	"syscall.CREATE_NEW":                                   "syscall",
-	"syscall.CREATE_NEW_PROCESS_GROUP":                     "syscall",
-	"syscall.CREATE_UNICODE_ENVIRONMENT":                   "syscall",
-	"syscall.CRYPT_DEFAULT_CONTAINER_OPTIONAL":             "syscall",
-	"syscall.CRYPT_DELETEKEYSET":                           "syscall",
-	"syscall.CRYPT_MACHINE_KEYSET":                         "syscall",
-	"syscall.CRYPT_NEWKEYSET":                              "syscall",
-	"syscall.CRYPT_SILENT":                                 "syscall",
-	"syscall.CRYPT_VERIFYCONTEXT":                          "syscall",
-	"syscall.CS5":                                          "syscall",
-	"syscall.CS6":                                          "syscall",
-	"syscall.CS7":                                          "syscall",
-	"syscall.CS8":                                          "syscall",
-	"syscall.CSIZE":                                        "syscall",
-	"syscall.CSTART":                                       "syscall",
-	"syscall.CSTATUS":                                      "syscall",
-	"syscall.CSTOP":                                        "syscall",
-	"syscall.CSTOPB":                                       "syscall",
-	"syscall.CSUSP":                                        "syscall",
-	"syscall.CTL_MAXNAME":                                  "syscall",
-	"syscall.CTL_NET":                                      "syscall",
-	"syscall.CTL_QUERY":                                    "syscall",
-	"syscall.CTRL_BREAK_EVENT":                             "syscall",
-	"syscall.CTRL_C_EVENT":                                 "syscall",
-	"syscall.CancelIo":                                     "syscall",
-	"syscall.CancelIoEx":                                   "syscall",
-	"syscall.CertAddCertificateContextToStore":             "syscall",
-	"syscall.CertChainContext":                             "syscall",
-	"syscall.CertChainElement":                             "syscall",
-	"syscall.CertChainPara":                                "syscall",
-	"syscall.CertChainPolicyPara":                          "syscall",
-	"syscall.CertChainPolicyStatus":                        "syscall",
-	"syscall.CertCloseStore":                               "syscall",
-	"syscall.CertContext":                                  "syscall",
-	"syscall.CertCreateCertificateContext":                 "syscall",
-	"syscall.CertEnhKeyUsage":                              "syscall",
-	"syscall.CertEnumCertificatesInStore":                  "syscall",
-	"syscall.CertFreeCertificateChain":                     "syscall",
-	"syscall.CertFreeCertificateContext":                   "syscall",
-	"syscall.CertGetCertificateChain":                      "syscall",
-	"syscall.CertOpenStore":                                "syscall",
-	"syscall.CertOpenSystemStore":                          "syscall",
-	"syscall.CertRevocationInfo":                           "syscall",
-	"syscall.CertSimpleChain":                              "syscall",
-	"syscall.CertTrustStatus":                              "syscall",
-	"syscall.CertUsageMatch":                               "syscall",
-	"syscall.CertVerifyCertificateChainPolicy":             "syscall",
-	"syscall.Chdir":                                        "syscall",
-	"syscall.CheckBpfVersion":                              "syscall",
-	"syscall.Chflags":                                      "syscall",
-	"syscall.Chmod":                                        "syscall",
-	"syscall.Chown":                                        "syscall",
-	"syscall.Chroot":                                       "syscall",
-	"syscall.Clearenv":                                     "syscall",
-	"syscall.Close":                                        "syscall",
-	"syscall.CloseHandle":                                  "syscall",
-	"syscall.CloseOnExec":                                  "syscall",
-	"syscall.Closesocket":                                  "syscall",
-	"syscall.CmsgLen":                                      "syscall",
-	"syscall.CmsgSpace":                                    "syscall",
-	"syscall.Cmsghdr":                                      "syscall",
-	"syscall.CommandLineToArgv":                            "syscall",
-	"syscall.ComputerName":                                 "syscall",
-	"syscall.Conn":                                         "syscall",
-	"syscall.Connect":                                      "syscall",
-	"syscall.ConnectEx":                                    "syscall",
-	"syscall.ConvertSidToStringSid":                        "syscall",
-	"syscall.ConvertStringSidToSid":                        "syscall",
-	"syscall.CopySid":                                      "syscall",
-	"syscall.Creat":                                        "syscall",
-	"syscall.CreateDirectory":                              "syscall",
-	"syscall.CreateFile":                                   "syscall",
-	"syscall.CreateFileMapping":                            "syscall",
-	"syscall.CreateHardLink":                               "syscall",
-	"syscall.CreateIoCompletionPort":                       "syscall",
-	"syscall.CreatePipe":                                   "syscall",
-	"syscall.CreateProcess":                                "syscall",
-	"syscall.CreateSymbolicLink":                           "syscall",
-	"syscall.CreateToolhelp32Snapshot":                     "syscall",
-	"syscall.Credential":                                   "syscall",
-	"syscall.CryptAcquireContext":                          "syscall",
-	"syscall.CryptGenRandom":                               "syscall",
-	"syscall.CryptReleaseContext":                          "syscall",
-	"syscall.DIOCBSFLUSH":                                  "syscall",
-	"syscall.DIOCOSFPFLUSH":                                "syscall",
-	"syscall.DLL":                                          "syscall",
-	"syscall.DLLError":                                     "syscall",
-	"syscall.DLT_A429":                                     "syscall",
-	"syscall.DLT_A653_ICM":                                 "syscall",
-	"syscall.DLT_AIRONET_HEADER":                           "syscall",
-	"syscall.DLT_AOS":                                      "syscall",
-	"syscall.DLT_APPLE_IP_OVER_IEEE1394":                   "syscall",
-	"syscall.DLT_ARCNET":                                   "syscall",
-	"syscall.DLT_ARCNET_LINUX":                             "syscall",
-	"syscall.DLT_ATM_CLIP":                                 "syscall",
-	"syscall.DLT_ATM_RFC1483":                              "syscall",
-	"syscall.DLT_AURORA":                                   "syscall",
-	"syscall.DLT_AX25":                                     "syscall",
-	"syscall.DLT_AX25_KISS":                                "syscall",
-	"syscall.DLT_BACNET_MS_TP":                             "syscall",
-	"syscall.DLT_BLUETOOTH_HCI_H4":                         "syscall",
-	"syscall.DLT_BLUETOOTH_HCI_H4_WITH_PHDR":               "syscall",
-	"syscall.DLT_CAN20B":                                   "syscall",
-	"syscall.DLT_CAN_SOCKETCAN":                            "syscall",
-	"syscall.DLT_CHAOS":                                    "syscall",
-	"syscall.DLT_CHDLC":                                    "syscall",
-	"syscall.DLT_CISCO_IOS":                                "syscall",
-	"syscall.DLT_C_HDLC":                                   "syscall",
-	"syscall.DLT_C_HDLC_WITH_DIR":                          "syscall",
-	"syscall.DLT_DBUS":                                     "syscall",
-	"syscall.DLT_DECT":                                     "syscall",
-	"syscall.DLT_DOCSIS":                                   "syscall",
-	"syscall.DLT_DVB_CI":                                   "syscall",
-	"syscall.DLT_ECONET":                                   "syscall",
-	"syscall.DLT_EN10MB":                                   "syscall",
-	"syscall.DLT_EN3MB":                                    "syscall",
-	"syscall.DLT_ENC":                                      "syscall",
-	"syscall.DLT_ERF":                                      "syscall",
-	"syscall.DLT_ERF_ETH":                                  "syscall",
-	"syscall.DLT_ERF_POS":                                  "syscall",
-	"syscall.DLT_FC_2":                                     "syscall",
-	"syscall.DLT_FC_2_WITH_FRAME_DELIMS":                   "syscall",
-	"syscall.DLT_FDDI":                                     "syscall",
-	"syscall.DLT_FLEXRAY":                                  "syscall",
-	"syscall.DLT_FRELAY":                                   "syscall",
-	"syscall.DLT_FRELAY_WITH_DIR":                          "syscall",
-	"syscall.DLT_GCOM_SERIAL":                              "syscall",
-	"syscall.DLT_GCOM_T1E1":                                "syscall",
-	"syscall.DLT_GPF_F":                                    "syscall",
-	"syscall.DLT_GPF_T":                                    "syscall",
-	"syscall.DLT_GPRS_LLC":                                 "syscall",
-	"syscall.DLT_GSMTAP_ABIS":                              "syscall",
-	"syscall.DLT_GSMTAP_UM":                                "syscall",
-	"syscall.DLT_HDLC":                                     "syscall",
-	"syscall.DLT_HHDLC":                                    "syscall",
-	"syscall.DLT_HIPPI":                                    "syscall",
-	"syscall.DLT_IBM_SN":                                   "syscall",
-	"syscall.DLT_IBM_SP":                                   "syscall",
-	"syscall.DLT_IEEE802":                                  "syscall",
-	"syscall.DLT_IEEE802_11":                               "syscall",
-	"syscall.DLT_IEEE802_11_RADIO":                         "syscall",
-	"syscall.DLT_IEEE802_11_RADIO_AVS":                     "syscall",
-	"syscall.DLT_IEEE802_15_4":                             "syscall",
-	"syscall.DLT_IEEE802_15_4_LINUX":                       "syscall",
-	"syscall.DLT_IEEE802_15_4_NOFCS":                       "syscall",
-	"syscall.DLT_IEEE802_15_4_NONASK_PHY":                  "syscall",
-	"syscall.DLT_IEEE802_16_MAC_CPS":                       "syscall",
-	"syscall.DLT_IEEE802_16_MAC_CPS_RADIO":                 "syscall",
-	"syscall.DLT_IPFILTER":                                 "syscall",
-	"syscall.DLT_IPMB":                                     "syscall",
-	"syscall.DLT_IPMB_LINUX":                               "syscall",
-	"syscall.DLT_IPNET":                                    "syscall",
-	"syscall.DLT_IPOIB":                                    "syscall",
-	"syscall.DLT_IPV4":                                     "syscall",
-	"syscall.DLT_IPV6":                                     "syscall",
-	"syscall.DLT_IP_OVER_FC":                               "syscall",
-	"syscall.DLT_JUNIPER_ATM1":                             "syscall",
-	"syscall.DLT_JUNIPER_ATM2":                             "syscall",
-	"syscall.DLT_JUNIPER_ATM_CEMIC":                        "syscall",
-	"syscall.DLT_JUNIPER_CHDLC":                            "syscall",
-	"syscall.DLT_JUNIPER_ES":                               "syscall",
-	"syscall.DLT_JUNIPER_ETHER":                            "syscall",
-	"syscall.DLT_JUNIPER_FIBRECHANNEL":                     "syscall",
-	"syscall.DLT_JUNIPER_FRELAY":                           "syscall",
-	"syscall.DLT_JUNIPER_GGSN":                             "syscall",
-	"syscall.DLT_JUNIPER_ISM":                              "syscall",
-	"syscall.DLT_JUNIPER_MFR":                              "syscall",
-	"syscall.DLT_JUNIPER_MLFR":                             "syscall",
-	"syscall.DLT_JUNIPER_MLPPP":                            "syscall",
-	"syscall.DLT_JUNIPER_MONITOR":                          "syscall",
-	"syscall.DLT_JUNIPER_PIC_PEER":                         "syscall",
-	"syscall.DLT_JUNIPER_PPP":                              "syscall",
-	"syscall.DLT_JUNIPER_PPPOE":                            "syscall",
-	"syscall.DLT_JUNIPER_PPPOE_ATM":                        "syscall",
-	"syscall.DLT_JUNIPER_SERVICES":                         "syscall",
-	"syscall.DLT_JUNIPER_SRX_E2E":                          "syscall",
-	"syscall.DLT_JUNIPER_ST":                               "syscall",
-	"syscall.DLT_JUNIPER_VP":                               "syscall",
-	"syscall.DLT_JUNIPER_VS":                               "syscall",
-	"syscall.DLT_LAPB_WITH_DIR":                            "syscall",
-	"syscall.DLT_LAPD":                                     "syscall",
-	"syscall.DLT_LIN":                                      "syscall",
-	"syscall.DLT_LINUX_EVDEV":                              "syscall",
-	"syscall.DLT_LINUX_IRDA":                               "syscall",
-	"syscall.DLT_LINUX_LAPD":                               "syscall",
-	"syscall.DLT_LINUX_PPP_WITHDIRECTION":                  "syscall",
-	"syscall.DLT_LINUX_SLL":                                "syscall",
-	"syscall.DLT_LOOP":                                     "syscall",
-	"syscall.DLT_LTALK":                                    "syscall",
-	"syscall.DLT_MATCHING_MAX":                             "syscall",
-	"syscall.DLT_MATCHING_MIN":                             "syscall",
-	"syscall.DLT_MFR":                                      "syscall",
-	"syscall.DLT_MOST":                                     "syscall",
-	"syscall.DLT_MPEG_2_TS":                                "syscall",
-	"syscall.DLT_MPLS":                                     "syscall",
-	"syscall.DLT_MTP2":                                     "syscall",
-	"syscall.DLT_MTP2_WITH_PHDR":                           "syscall",
-	"syscall.DLT_MTP3":                                     "syscall",
-	"syscall.DLT_MUX27010":                                 "syscall",
-	"syscall.DLT_NETANALYZER":                              "syscall",
-	"syscall.DLT_NETANALYZER_TRANSPARENT":                  "syscall",
-	"syscall.DLT_NFC_LLCP":                                 "syscall",
-	"syscall.DLT_NFLOG":                                    "syscall",
-	"syscall.DLT_NG40":                                     "syscall",
-	"syscall.DLT_NULL":                                     "syscall",
-	"syscall.DLT_PCI_EXP":                                  "syscall",
-	"syscall.DLT_PFLOG":                                    "syscall",
-	"syscall.DLT_PFSYNC":                                   "syscall",
-	"syscall.DLT_PPI":                                      "syscall",
-	"syscall.DLT_PPP":                                      "syscall",
-	"syscall.DLT_PPP_BSDOS":                                "syscall",
-	"syscall.DLT_PPP_ETHER":                                "syscall",
-	"syscall.DLT_PPP_PPPD":                                 "syscall",
-	"syscall.DLT_PPP_SERIAL":                               "syscall",
-	"syscall.DLT_PPP_WITH_DIR":                             "syscall",
-	"syscall.DLT_PPP_WITH_DIRECTION":                       "syscall",
-	"syscall.DLT_PRISM_HEADER":                             "syscall",
-	"syscall.DLT_PRONET":                                   "syscall",
-	"syscall.DLT_RAIF1":                                    "syscall",
-	"syscall.DLT_RAW":                                      "syscall",
-	"syscall.DLT_RAWAF_MASK":                               "syscall",
-	"syscall.DLT_RIO":                                      "syscall",
-	"syscall.DLT_SCCP":                                     "syscall",
-	"syscall.DLT_SITA":                                     "syscall",
-	"syscall.DLT_SLIP":                                     "syscall",
-	"syscall.DLT_SLIP_BSDOS":                               "syscall",
-	"syscall.DLT_STANAG_5066_D_PDU":                        "syscall",
-	"syscall.DLT_SUNATM":                                   "syscall",
-	"syscall.DLT_SYMANTEC_FIREWALL":                        "syscall",
-	"syscall.DLT_TZSP":                                     "syscall",
-	"syscall.DLT_USB":                                      "syscall",
-	"syscall.DLT_USB_LINUX":                                "syscall",
-	"syscall.DLT_USB_LINUX_MMAPPED":                        "syscall",
-	"syscall.DLT_USER0":                                    "syscall",
-	"syscall.DLT_USER1":                                    "syscall",
-	"syscall.DLT_USER10":                                   "syscall",
-	"syscall.DLT_USER11":                                   "syscall",
-	"syscall.DLT_USER12":                                   "syscall",
-	"syscall.DLT_USER13":                                   "syscall",
-	"syscall.DLT_USER14":                                   "syscall",
-	"syscall.DLT_USER15":                                   "syscall",
-	"syscall.DLT_USER2":                                    "syscall",
-	"syscall.DLT_USER3":                                    "syscall",
-	"syscall.DLT_USER4":                                    "syscall",
-	"syscall.DLT_USER5":                                    "syscall",
-	"syscall.DLT_USER6":                                    "syscall",
-	"syscall.DLT_USER7":                                    "syscall",
-	"syscall.DLT_USER8":                                    "syscall",
-	"syscall.DLT_USER9":                                    "syscall",
-	"syscall.DLT_WIHART":                                   "syscall",
-	"syscall.DLT_X2E_SERIAL":                               "syscall",
-	"syscall.DLT_X2E_XORAYA":                               "syscall",
-	"syscall.DNSMXData":                                    "syscall",
-	"syscall.DNSPTRData":                                   "syscall",
-	"syscall.DNSRecord":                                    "syscall",
-	"syscall.DNSSRVData":                                   "syscall",
-	"syscall.DNSTXTData":                                   "syscall",
-	"syscall.DNS_INFO_NO_RECORDS":                          "syscall",
-	"syscall.DNS_TYPE_A":                                   "syscall",
-	"syscall.DNS_TYPE_A6":                                  "syscall",
-	"syscall.DNS_TYPE_AAAA":                                "syscall",
-	"syscall.DNS_TYPE_ADDRS":                               "syscall",
-	"syscall.DNS_TYPE_AFSDB":                               "syscall",
-	"syscall.DNS_TYPE_ALL":                                 "syscall",
-	"syscall.DNS_TYPE_ANY":                                 "syscall",
-	"syscall.DNS_TYPE_ATMA":                                "syscall",
-	"syscall.DNS_TYPE_AXFR":                                "syscall",
-	"syscall.DNS_TYPE_CERT":                                "syscall",
-	"syscall.DNS_TYPE_CNAME":                               "syscall",
-	"syscall.DNS_TYPE_DHCID":                               "syscall",
-	"syscall.DNS_TYPE_DNAME":                               "syscall",
-	"syscall.DNS_TYPE_DNSKEY":                              "syscall",
-	"syscall.DNS_TYPE_DS":                                  "syscall",
-	"syscall.DNS_TYPE_EID":                                 "syscall",
-	"syscall.DNS_TYPE_GID":                                 "syscall",
-	"syscall.DNS_TYPE_GPOS":                                "syscall",
-	"syscall.DNS_TYPE_HINFO":                               "syscall",
-	"syscall.DNS_TYPE_ISDN":                                "syscall",
-	"syscall.DNS_TYPE_IXFR":                                "syscall",
-	"syscall.DNS_TYPE_KEY":                                 "syscall",
-	"syscall.DNS_TYPE_KX":                                  "syscall",
-	"syscall.DNS_TYPE_LOC":                                 "syscall",
-	"syscall.DNS_TYPE_MAILA":                               "syscall",
-	"syscall.DNS_TYPE_MAILB":                               "syscall",
-	"syscall.DNS_TYPE_MB":                                  "syscall",
-	"syscall.DNS_TYPE_MD":                                  "syscall",
-	"syscall.DNS_TYPE_MF":                                  "syscall",
-	"syscall.DNS_TYPE_MG":                                  "syscall",
-	"syscall.DNS_TYPE_MINFO":                               "syscall",
-	"syscall.DNS_TYPE_MR":                                  "syscall",
-	"syscall.DNS_TYPE_MX":                                  "syscall",
-	"syscall.DNS_TYPE_NAPTR":                               "syscall",
-	"syscall.DNS_TYPE_NBSTAT":                              "syscall",
-	"syscall.DNS_TYPE_NIMLOC":                              "syscall",
-	"syscall.DNS_TYPE_NS":                                  "syscall",
-	"syscall.DNS_TYPE_NSAP":                                "syscall",
-	"syscall.DNS_TYPE_NSAPPTR":                             "syscall",
-	"syscall.DNS_TYPE_NSEC":                                "syscall",
-	"syscall.DNS_TYPE_NULL":                                "syscall",
-	"syscall.DNS_TYPE_NXT":                                 "syscall",
-	"syscall.DNS_TYPE_OPT":                                 "syscall",
-	"syscall.DNS_TYPE_PTR":                                 "syscall",
-	"syscall.DNS_TYPE_PX":                                  "syscall",
-	"syscall.DNS_TYPE_RP":                                  "syscall",
-	"syscall.DNS_TYPE_RRSIG":                               "syscall",
-	"syscall.DNS_TYPE_RT":                                  "syscall",
-	"syscall.DNS_TYPE_SIG":                                 "syscall",
-	"syscall.DNS_TYPE_SINK":                                "syscall",
-	"syscall.DNS_TYPE_SOA":                                 "syscall",
-	"syscall.DNS_TYPE_SRV":                                 "syscall",
-	"syscall.DNS_TYPE_TEXT":                                "syscall",
-	"syscall.DNS_TYPE_TKEY":                                "syscall",
-	"syscall.DNS_TYPE_TSIG":                                "syscall",
-	"syscall.DNS_TYPE_UID":                                 "syscall",
-	"syscall.DNS_TYPE_UINFO":                               "syscall",
-	"syscall.DNS_TYPE_UNSPEC":                              "syscall",
-	"syscall.DNS_TYPE_WINS":                                "syscall",
-	"syscall.DNS_TYPE_WINSR":                               "syscall",
-	"syscall.DNS_TYPE_WKS":                                 "syscall",
-	"syscall.DNS_TYPE_X25":                                 "syscall",
-	"syscall.DT_BLK":                                       "syscall",
-	"syscall.DT_CHR":                                       "syscall",
-	"syscall.DT_DIR":                                       "syscall",
-	"syscall.DT_FIFO":                                      "syscall",
-	"syscall.DT_LNK":                                       "syscall",
-	"syscall.DT_REG":                                       "syscall",
-	"syscall.DT_SOCK":                                      "syscall",
-	"syscall.DT_UNKNOWN":                                   "syscall",
-	"syscall.DT_WHT":                                       "syscall",
-	"syscall.DUPLICATE_CLOSE_SOURCE":                       "syscall",
-	"syscall.DUPLICATE_SAME_ACCESS":                        "syscall",
-	"syscall.DeleteFile":                                   "syscall",
-	"syscall.DetachLsf":                                    "syscall",
-	"syscall.DeviceIoControl":                              "syscall",
-	"syscall.Dirent":                                       "syscall",
-	"syscall.DnsNameCompare":                               "syscall",
-	"syscall.DnsQuery":                                     "syscall",
-	"syscall.DnsRecordListFree":                            "syscall",
-	"syscall.DnsSectionAdditional":                         "syscall",
-	"syscall.DnsSectionAnswer":                             "syscall",
-	"syscall.DnsSectionAuthority":                          "syscall",
-	"syscall.DnsSectionQuestion":                           "syscall",
-	"syscall.Dup":                                          "syscall",
-	"syscall.Dup2":                                         "syscall",
-	"syscall.Dup3":                                         "syscall",
-	"syscall.DuplicateHandle":                              "syscall",
-	"syscall.E2BIG":                                        "syscall",
-	"syscall.EACCES":                                       "syscall",
-	"syscall.EADDRINUSE":                                   "syscall",
-	"syscall.EADDRNOTAVAIL":                                "syscall",
-	"syscall.EADV":                                         "syscall",
-	"syscall.EAFNOSUPPORT":                                 "syscall",
-	"syscall.EAGAIN":                                       "syscall",
-	"syscall.EALREADY":                                     "syscall",
-	"syscall.EAUTH":                                        "syscall",
-	"syscall.EBADARCH":                                     "syscall",
-	"syscall.EBADE":                                        "syscall",
-	"syscall.EBADEXEC":                                     "syscall",
-	"syscall.EBADF":                                        "syscall",
-	"syscall.EBADFD":                                       "syscall",
-	"syscall.EBADMACHO":                                    "syscall",
-	"syscall.EBADMSG":                                      "syscall",
-	"syscall.EBADR":                                        "syscall",
-	"syscall.EBADRPC":                                      "syscall",
-	"syscall.EBADRQC":                                      "syscall",
-	"syscall.EBADSLT":                                      "syscall",
-	"syscall.EBFONT":                                       "syscall",
-	"syscall.EBUSY":                                        "syscall",
-	"syscall.ECANCELED":                                    "syscall",
-	"syscall.ECAPMODE":                                     "syscall",
-	"syscall.ECHILD":                                       "syscall",
-	"syscall.ECHO":                                         "syscall",
-	"syscall.ECHOCTL":                                      "syscall",
-	"syscall.ECHOE":                                        "syscall",
-	"syscall.ECHOK":                                        "syscall",
-	"syscall.ECHOKE":                                       "syscall",
-	"syscall.ECHONL":                                       "syscall",
-	"syscall.ECHOPRT":                                      "syscall",
-	"syscall.ECHRNG":                                       "syscall",
-	"syscall.ECOMM":                                        "syscall",
-	"syscall.ECONNABORTED":                                 "syscall",
-	"syscall.ECONNREFUSED":                                 "syscall",
-	"syscall.ECONNRESET":                                   "syscall",
-	"syscall.EDEADLK":                                      "syscall",
-	"syscall.EDEADLOCK":                                    "syscall",
-	"syscall.EDESTADDRREQ":                                 "syscall",
-	"syscall.EDEVERR":                                      "syscall",
-	"syscall.EDOM":                                         "syscall",
-	"syscall.EDOOFUS":                                      "syscall",
-	"syscall.EDOTDOT":                                      "syscall",
-	"syscall.EDQUOT":                                       "syscall",
-	"syscall.EEXIST":                                       "syscall",
-	"syscall.EFAULT":                                       "syscall",
-	"syscall.EFBIG":                                        "syscall",
-	"syscall.EFER_LMA":                                     "syscall",
-	"syscall.EFER_LME":                                     "syscall",
-	"syscall.EFER_NXE":                                     "syscall",
-	"syscall.EFER_SCE":                                     "syscall",
-	"syscall.EFTYPE":                                       "syscall",
-	"syscall.EHOSTDOWN":                                    "syscall",
-	"syscall.EHOSTUNREACH":                                 "syscall",
-	"syscall.EHWPOISON":                                    "syscall",
-	"syscall.EIDRM":                                        "syscall",
-	"syscall.EILSEQ":                                       "syscall",
-	"syscall.EINPROGRESS":                                  "syscall",
-	"syscall.EINTR":                                        "syscall",
-	"syscall.EINVAL":                                       "syscall",
-	"syscall.EIO":                                          "syscall",
-	"syscall.EIPSEC":                                       "syscall",
-	"syscall.EISCONN":                                      "syscall",
-	"syscall.EISDIR":                                       "syscall",
-	"syscall.EISNAM":                                       "syscall",
-	"syscall.EKEYEXPIRED":                                  "syscall",
-	"syscall.EKEYREJECTED":                                 "syscall",
-	"syscall.EKEYREVOKED":                                  "syscall",
-	"syscall.EL2HLT":                                       "syscall",
-	"syscall.EL2NSYNC":                                     "syscall",
-	"syscall.EL3HLT":                                       "syscall",
-	"syscall.EL3RST":                                       "syscall",
-	"syscall.ELAST":                                        "syscall",
-	"syscall.ELF_NGREG":                                    "syscall",
-	"syscall.ELF_PRARGSZ":                                  "syscall",
-	"syscall.ELIBACC":                                      "syscall",
-	"syscall.ELIBBAD":                                      "syscall",
-	"syscall.ELIBEXEC":                                     "syscall",
-	"syscall.ELIBMAX":                                      "syscall",
-	"syscall.ELIBSCN":                                      "syscall",
-	"syscall.ELNRNG":                                       "syscall",
-	"syscall.ELOOP":                                        "syscall",
-	"syscall.EMEDIUMTYPE":                                  "syscall",
-	"syscall.EMFILE":                                       "syscall",
-	"syscall.EMLINK":                                       "syscall",
-	"syscall.EMSGSIZE":                                     "syscall",
-	"syscall.EMT_TAGOVF":                                   "syscall",
-	"syscall.EMULTIHOP":                                    "syscall",
-	"syscall.EMUL_ENABLED":                                 "syscall",
-	"syscall.EMUL_LINUX":                                   "syscall",
-	"syscall.EMUL_LINUX32":                                 "syscall",
-	"syscall.EMUL_MAXID":                                   "syscall",
-	"syscall.EMUL_NATIVE":                                  "syscall",
-	"syscall.ENAMETOOLONG":                                 "syscall",
-	"syscall.ENAVAIL":                                      "syscall",
-	"syscall.ENDRUNDISC":                                   "syscall",
-	"syscall.ENEEDAUTH":                                    "syscall",
-	"syscall.ENETDOWN":                                     "syscall",
-	"syscall.ENETRESET":                                    "syscall",
-	"syscall.ENETUNREACH":                                  "syscall",
-	"syscall.ENFILE":                                       "syscall",
-	"syscall.ENOANO":                                       "syscall",
-	"syscall.ENOATTR":                                      "syscall",
-	"syscall.ENOBUFS":                                      "syscall",
-	"syscall.ENOCSI":                                       "syscall",
-	"syscall.ENODATA":                                      "syscall",
-	"syscall.ENODEV":                                       "syscall",
-	"syscall.ENOENT":                                       "syscall",
-	"syscall.ENOEXEC":                                      "syscall",
-	"syscall.ENOKEY":                                       "syscall",
-	"syscall.ENOLCK":                                       "syscall",
-	"syscall.ENOLINK":                                      "syscall",
-	"syscall.ENOMEDIUM":                                    "syscall",
-	"syscall.ENOMEM":                                       "syscall",
-	"syscall.ENOMSG":                                       "syscall",
-	"syscall.ENONET":                                       "syscall",
-	"syscall.ENOPKG":                                       "syscall",
-	"syscall.ENOPOLICY":                                    "syscall",
-	"syscall.ENOPROTOOPT":                                  "syscall",
-	"syscall.ENOSPC":                                       "syscall",
-	"syscall.ENOSR":                                        "syscall",
-	"syscall.ENOSTR":                                       "syscall",
-	"syscall.ENOSYS":                                       "syscall",
-	"syscall.ENOTBLK":                                      "syscall",
-	"syscall.ENOTCAPABLE":                                  "syscall",
-	"syscall.ENOTCONN":                                     "syscall",
-	"syscall.ENOTDIR":                                      "syscall",
-	"syscall.ENOTEMPTY":                                    "syscall",
-	"syscall.ENOTNAM":                                      "syscall",
-	"syscall.ENOTRECOVERABLE":                              "syscall",
-	"syscall.ENOTSOCK":                                     "syscall",
-	"syscall.ENOTSUP":                                      "syscall",
-	"syscall.ENOTTY":                                       "syscall",
-	"syscall.ENOTUNIQ":                                     "syscall",
-	"syscall.ENXIO":                                        "syscall",
-	"syscall.EN_SW_CTL_INF":                                "syscall",
-	"syscall.EN_SW_CTL_PREC":                               "syscall",
-	"syscall.EN_SW_CTL_ROUND":                              "syscall",
-	"syscall.EN_SW_DATACHAIN":                              "syscall",
-	"syscall.EN_SW_DENORM":                                 "syscall",
-	"syscall.EN_SW_INVOP":                                  "syscall",
-	"syscall.EN_SW_OVERFLOW":                               "syscall",
-	"syscall.EN_SW_PRECLOSS":                               "syscall",
-	"syscall.EN_SW_UNDERFLOW":                              "syscall",
-	"syscall.EN_SW_ZERODIV":                                "syscall",
-	"syscall.EOPNOTSUPP":                                   "syscall",
-	"syscall.EOVERFLOW":                                    "syscall",
-	"syscall.EOWNERDEAD":                                   "syscall",
-	"syscall.EPERM":                                        "syscall",
-	"syscall.EPFNOSUPPORT":                                 "syscall",
-	"syscall.EPIPE":                                        "syscall",
-	"syscall.EPOLLERR":                                     "syscall",
-	"syscall.EPOLLET":                                      "syscall",
-	"syscall.EPOLLHUP":                                     "syscall",
-	"syscall.EPOLLIN":                                      "syscall",
-	"syscall.EPOLLMSG":                                     "syscall",
-	"syscall.EPOLLONESHOT":                                 "syscall",
-	"syscall.EPOLLOUT":                                     "syscall",
-	"syscall.EPOLLPRI":                                     "syscall",
-	"syscall.EPOLLRDBAND":                                  "syscall",
-	"syscall.EPOLLRDHUP":                                   "syscall",
-	"syscall.EPOLLRDNORM":                                  "syscall",
-	"syscall.EPOLLWRBAND":                                  "syscall",
-	"syscall.EPOLLWRNORM":                                  "syscall",
-	"syscall.EPOLL_CLOEXEC":                                "syscall",
-	"syscall.EPOLL_CTL_ADD":                                "syscall",
-	"syscall.EPOLL_CTL_DEL":                                "syscall",
-	"syscall.EPOLL_CTL_MOD":                                "syscall",
-	"syscall.EPOLL_NONBLOCK":                               "syscall",
-	"syscall.EPROCLIM":                                     "syscall",
-	"syscall.EPROCUNAVAIL":                                 "syscall",
-	"syscall.EPROGMISMATCH":                                "syscall",
-	"syscall.EPROGUNAVAIL":                                 "syscall",
-	"syscall.EPROTO":                                       "syscall",
-	"syscall.EPROTONOSUPPORT":                              "syscall",
-	"syscall.EPROTOTYPE":                                   "syscall",
-	"syscall.EPWROFF":                                      "syscall",
-	"syscall.ERANGE":                                       "syscall",
-	"syscall.EREMCHG":                                      "syscall",
-	"syscall.EREMOTE":                                      "syscall",
-	"syscall.EREMOTEIO":                                    "syscall",
-	"syscall.ERESTART":                                     "syscall",
-	"syscall.ERFKILL":                                      "syscall",
-	"syscall.EROFS":                                        "syscall",
-	"syscall.ERPCMISMATCH":                                 "syscall",
-	"syscall.ERROR_ACCESS_DENIED":                          "syscall",
-	"syscall.ERROR_ALREADY_EXISTS":                         "syscall",
-	"syscall.ERROR_BROKEN_PIPE":                            "syscall",
-	"syscall.ERROR_BUFFER_OVERFLOW":                        "syscall",
-	"syscall.ERROR_DIR_NOT_EMPTY":                          "syscall",
-	"syscall.ERROR_ENVVAR_NOT_FOUND":                       "syscall",
-	"syscall.ERROR_FILE_EXISTS":                            "syscall",
-	"syscall.ERROR_FILE_NOT_FOUND":                         "syscall",
-	"syscall.ERROR_HANDLE_EOF":                             "syscall",
-	"syscall.ERROR_INSUFFICIENT_BUFFER":                    "syscall",
-	"syscall.ERROR_IO_PENDING":                             "syscall",
-	"syscall.ERROR_MOD_NOT_FOUND":                          "syscall",
-	"syscall.ERROR_MORE_DATA":                              "syscall",
-	"syscall.ERROR_NETNAME_DELETED":                        "syscall",
-	"syscall.ERROR_NOT_FOUND":                              "syscall",
-	"syscall.ERROR_NO_MORE_FILES":                          "syscall",
-	"syscall.ERROR_OPERATION_ABORTED":                      "syscall",
-	"syscall.ERROR_PATH_NOT_FOUND":                         "syscall",
-	"syscall.ERROR_PRIVILEGE_NOT_HELD":                     "syscall",
-	"syscall.ERROR_PROC_NOT_FOUND":                         "syscall",
-	"syscall.ESHLIBVERS":                                   "syscall",
-	"syscall.ESHUTDOWN":                                    "syscall",
-	"syscall.ESOCKTNOSUPPORT":                              "syscall",
-	"syscall.ESPIPE":                                       "syscall",
-	"syscall.ESRCH":                                        "syscall",
-	"syscall.ESRMNT":                                       "syscall",
-	"syscall.ESTALE":                                       "syscall",
-	"syscall.ESTRPIPE":                                     "syscall",
-	"syscall.ETHERCAP_JUMBO_MTU":                           "syscall",
-	"syscall.ETHERCAP_VLAN_HWTAGGING":                      "syscall",
-	"syscall.ETHERCAP_VLAN_MTU":                            "syscall",
-	"syscall.ETHERMIN":                                     "syscall",
-	"syscall.ETHERMTU":                                     "syscall",
-	"syscall.ETHERMTU_JUMBO":                               "syscall",
-	"syscall.ETHERTYPE_8023":                               "syscall",
-	"syscall.ETHERTYPE_AARP":                               "syscall",
-	"syscall.ETHERTYPE_ACCTON":                             "syscall",
-	"syscall.ETHERTYPE_AEONIC":                             "syscall",
-	"syscall.ETHERTYPE_ALPHA":                              "syscall",
-	"syscall.ETHERTYPE_AMBER":                              "syscall",
-	"syscall.ETHERTYPE_AMOEBA":                             "syscall",
-	"syscall.ETHERTYPE_AOE":                                "syscall",
-	"syscall.ETHERTYPE_APOLLO":                             "syscall",
-	"syscall.ETHERTYPE_APOLLODOMAIN":                       "syscall",
-	"syscall.ETHERTYPE_APPLETALK":                          "syscall",
-	"syscall.ETHERTYPE_APPLITEK":                           "syscall",
-	"syscall.ETHERTYPE_ARGONAUT":                           "syscall",
-	"syscall.ETHERTYPE_ARP":                                "syscall",
-	"syscall.ETHERTYPE_AT":                                 "syscall",
-	"syscall.ETHERTYPE_ATALK":                              "syscall",
-	"syscall.ETHERTYPE_ATOMIC":                             "syscall",
-	"syscall.ETHERTYPE_ATT":                                "syscall",
-	"syscall.ETHERTYPE_ATTSTANFORD":                        "syscall",
-	"syscall.ETHERTYPE_AUTOPHON":                           "syscall",
-	"syscall.ETHERTYPE_AXIS":                               "syscall",
-	"syscall.ETHERTYPE_BCLOOP":                             "syscall",
-	"syscall.ETHERTYPE_BOFL":                               "syscall",
-	"syscall.ETHERTYPE_CABLETRON":                          "syscall",
-	"syscall.ETHERTYPE_CHAOS":                              "syscall",
-	"syscall.ETHERTYPE_COMDESIGN":                          "syscall",
-	"syscall.ETHERTYPE_COMPUGRAPHIC":                       "syscall",
-	"syscall.ETHERTYPE_COUNTERPOINT":                       "syscall",
-	"syscall.ETHERTYPE_CRONUS":                             "syscall",
-	"syscall.ETHERTYPE_CRONUSVLN":                          "syscall",
-	"syscall.ETHERTYPE_DCA":                                "syscall",
-	"syscall.ETHERTYPE_DDE":                                "syscall",
-	"syscall.ETHERTYPE_DEBNI":                              "syscall",
-	"syscall.ETHERTYPE_DECAM":                              "syscall",
-	"syscall.ETHERTYPE_DECCUST":                            "syscall",
-	"syscall.ETHERTYPE_DECDIAG":                            "syscall",
-	"syscall.ETHERTYPE_DECDNS":                             "syscall",
-	"syscall.ETHERTYPE_DECDTS":                             "syscall",
-	"syscall.ETHERTYPE_DECEXPER":                           "syscall",
-	"syscall.ETHERTYPE_DECLAST":                            "syscall",
-	"syscall.ETHERTYPE_DECLTM":                             "syscall",
-	"syscall.ETHERTYPE_DECMUMPS":                           "syscall",
-	"syscall.ETHERTYPE_DECNETBIOS":                         "syscall",
-	"syscall.ETHERTYPE_DELTACON":                           "syscall",
-	"syscall.ETHERTYPE_DIDDLE":                             "syscall",
-	"syscall.ETHERTYPE_DLOG1":                              "syscall",
-	"syscall.ETHERTYPE_DLOG2":                              "syscall",
-	"syscall.ETHERTYPE_DN":                                 "syscall",
-	"syscall.ETHERTYPE_DOGFIGHT":                           "syscall",
-	"syscall.ETHERTYPE_DSMD":                               "syscall",
-	"syscall.ETHERTYPE_ECMA":                               "syscall",
-	"syscall.ETHERTYPE_ENCRYPT":                            "syscall",
-	"syscall.ETHERTYPE_ES":                                 "syscall",
-	"syscall.ETHERTYPE_EXCELAN":                            "syscall",
-	"syscall.ETHERTYPE_EXPERDATA":                          "syscall",
-	"syscall.ETHERTYPE_FLIP":                               "syscall",
-	"syscall.ETHERTYPE_FLOWCONTROL":                        "syscall",
-	"syscall.ETHERTYPE_FRARP":                              "syscall",
-	"syscall.ETHERTYPE_GENDYN":                             "syscall",
-	"syscall.ETHERTYPE_HAYES":                              "syscall",
-	"syscall.ETHERTYPE_HIPPI_FP":                           "syscall",
-	"syscall.ETHERTYPE_HITACHI":                            "syscall",
-	"syscall.ETHERTYPE_HP":                                 "syscall",
-	"syscall.ETHERTYPE_IEEEPUP":                            "syscall",
-	"syscall.ETHERTYPE_IEEEPUPAT":                          "syscall",
-	"syscall.ETHERTYPE_IMLBL":                              "syscall",
-	"syscall.ETHERTYPE_IMLBLDIAG":                          "syscall",
-	"syscall.ETHERTYPE_IP":                                 "syscall",
-	"syscall.ETHERTYPE_IPAS":                               "syscall",
-	"syscall.ETHERTYPE_IPV6":                               "syscall",
-	"syscall.ETHERTYPE_IPX":                                "syscall",
-	"syscall.ETHERTYPE_IPXNEW":                             "syscall",
-	"syscall.ETHERTYPE_KALPANA":                            "syscall",
-	"syscall.ETHERTYPE_LANBRIDGE":                          "syscall",
-	"syscall.ETHERTYPE_LANPROBE":                           "syscall",
-	"syscall.ETHERTYPE_LAT":                                "syscall",
-	"syscall.ETHERTYPE_LBACK":                              "syscall",
-	"syscall.ETHERTYPE_LITTLE":                             "syscall",
-	"syscall.ETHERTYPE_LLDP":                               "syscall",
-	"syscall.ETHERTYPE_LOGICRAFT":                          "syscall",
-	"syscall.ETHERTYPE_LOOPBACK":                           "syscall",
-	"syscall.ETHERTYPE_MATRA":                              "syscall",
-	"syscall.ETHERTYPE_MAX":                                "syscall",
-	"syscall.ETHERTYPE_MERIT":                              "syscall",
-	"syscall.ETHERTYPE_MICP":                               "syscall",
-	"syscall.ETHERTYPE_MOPDL":                              "syscall",
-	"syscall.ETHERTYPE_MOPRC":                              "syscall",
-	"syscall.ETHERTYPE_MOTOROLA":                           "syscall",
-	"syscall.ETHERTYPE_MPLS":                               "syscall",
-	"syscall.ETHERTYPE_MPLS_MCAST":                         "syscall",
-	"syscall.ETHERTYPE_MUMPS":                              "syscall",
-	"syscall.ETHERTYPE_NBPCC":                              "syscall",
-	"syscall.ETHERTYPE_NBPCLAIM":                           "syscall",
-	"syscall.ETHERTYPE_NBPCLREQ":                           "syscall",
-	"syscall.ETHERTYPE_NBPCLRSP":                           "syscall",
-	"syscall.ETHERTYPE_NBPCREQ":                            "syscall",
-	"syscall.ETHERTYPE_NBPCRSP":                            "syscall",
-	"syscall.ETHERTYPE_NBPDG":                              "syscall",
-	"syscall.ETHERTYPE_NBPDGB":                             "syscall",
-	"syscall.ETHERTYPE_NBPDLTE":                            "syscall",
-	"syscall.ETHERTYPE_NBPRAR":                             "syscall",
-	"syscall.ETHERTYPE_NBPRAS":                             "syscall",
-	"syscall.ETHERTYPE_NBPRST":                             "syscall",
-	"syscall.ETHERTYPE_NBPSCD":                             "syscall",
-	"syscall.ETHERTYPE_NBPVCD":                             "syscall",
-	"syscall.ETHERTYPE_NBS":                                "syscall",
-	"syscall.ETHERTYPE_NCD":                                "syscall",
-	"syscall.ETHERTYPE_NESTAR":                             "syscall",
-	"syscall.ETHERTYPE_NETBEUI":                            "syscall",
-	"syscall.ETHERTYPE_NOVELL":                             "syscall",
-	"syscall.ETHERTYPE_NS":                                 "syscall",
-	"syscall.ETHERTYPE_NSAT":                               "syscall",
-	"syscall.ETHERTYPE_NSCOMPAT":                           "syscall",
-	"syscall.ETHERTYPE_NTRAILER":                           "syscall",
-	"syscall.ETHERTYPE_OS9":                                "syscall",
-	"syscall.ETHERTYPE_OS9NET":                             "syscall",
-	"syscall.ETHERTYPE_PACER":                              "syscall",
-	"syscall.ETHERTYPE_PAE":                                "syscall",
-	"syscall.ETHERTYPE_PCS":                                "syscall",
-	"syscall.ETHERTYPE_PLANNING":                           "syscall",
-	"syscall.ETHERTYPE_PPP":                                "syscall",
-	"syscall.ETHERTYPE_PPPOE":                              "syscall",
-	"syscall.ETHERTYPE_PPPOEDISC":                          "syscall",
-	"syscall.ETHERTYPE_PRIMENTS":                           "syscall",
-	"syscall.ETHERTYPE_PUP":                                "syscall",
-	"syscall.ETHERTYPE_PUPAT":                              "syscall",
-	"syscall.ETHERTYPE_QINQ":                               "syscall",
-	"syscall.ETHERTYPE_RACAL":                              "syscall",
-	"syscall.ETHERTYPE_RATIONAL":                           "syscall",
-	"syscall.ETHERTYPE_RAWFR":                              "syscall",
-	"syscall.ETHERTYPE_RCL":                                "syscall",
-	"syscall.ETHERTYPE_RDP":                                "syscall",
-	"syscall.ETHERTYPE_RETIX":                              "syscall",
-	"syscall.ETHERTYPE_REVARP":                             "syscall",
-	"syscall.ETHERTYPE_SCA":                                "syscall",
-	"syscall.ETHERTYPE_SECTRA":                             "syscall",
-	"syscall.ETHERTYPE_SECUREDATA":                         "syscall",
-	"syscall.ETHERTYPE_SGITW":                              "syscall",
-	"syscall.ETHERTYPE_SG_BOUNCE":                          "syscall",
-	"syscall.ETHERTYPE_SG_DIAG":                            "syscall",
-	"syscall.ETHERTYPE_SG_NETGAMES":                        "syscall",
-	"syscall.ETHERTYPE_SG_RESV":                            "syscall",
-	"syscall.ETHERTYPE_SIMNET":                             "syscall",
-	"syscall.ETHERTYPE_SLOW":                               "syscall",
-	"syscall.ETHERTYPE_SLOWPROTOCOLS":                      "syscall",
-	"syscall.ETHERTYPE_SNA":                                "syscall",
-	"syscall.ETHERTYPE_SNMP":                               "syscall",
-	"syscall.ETHERTYPE_SONIX":                              "syscall",
-	"syscall.ETHERTYPE_SPIDER":                             "syscall",
-	"syscall.ETHERTYPE_SPRITE":                             "syscall",
-	"syscall.ETHERTYPE_STP":                                "syscall",
-	"syscall.ETHERTYPE_TALARIS":                            "syscall",
-	"syscall.ETHERTYPE_TALARISMC":                          "syscall",
-	"syscall.ETHERTYPE_TCPCOMP":                            "syscall",
-	"syscall.ETHERTYPE_TCPSM":                              "syscall",
-	"syscall.ETHERTYPE_TEC":                                "syscall",
-	"syscall.ETHERTYPE_TIGAN":                              "syscall",
-	"syscall.ETHERTYPE_TRAIL":                              "syscall",
-	"syscall.ETHERTYPE_TRANSETHER":                         "syscall",
-	"syscall.ETHERTYPE_TYMSHARE":                           "syscall",
-	"syscall.ETHERTYPE_UBBST":                              "syscall",
-	"syscall.ETHERTYPE_UBDEBUG":                            "syscall",
-	"syscall.ETHERTYPE_UBDIAGLOOP":                         "syscall",
-	"syscall.ETHERTYPE_UBDL":                               "syscall",
-	"syscall.ETHERTYPE_UBNIU":                              "syscall",
-	"syscall.ETHERTYPE_UBNMC":                              "syscall",
-	"syscall.ETHERTYPE_VALID":                              "syscall",
-	"syscall.ETHERTYPE_VARIAN":                             "syscall",
-	"syscall.ETHERTYPE_VAXELN":                             "syscall",
-	"syscall.ETHERTYPE_VEECO":                              "syscall",
-	"syscall.ETHERTYPE_VEXP":                               "syscall",
-	"syscall.ETHERTYPE_VGLAB":                              "syscall",
-	"syscall.ETHERTYPE_VINES":                              "syscall",
-	"syscall.ETHERTYPE_VINESECHO":                          "syscall",
-	"syscall.ETHERTYPE_VINESLOOP":                          "syscall",
-	"syscall.ETHERTYPE_VITAL":                              "syscall",
-	"syscall.ETHERTYPE_VLAN":                               "syscall",
-	"syscall.ETHERTYPE_VLTLMAN":                            "syscall",
-	"syscall.ETHERTYPE_VPROD":                              "syscall",
-	"syscall.ETHERTYPE_VURESERVED":                         "syscall",
-	"syscall.ETHERTYPE_WATERLOO":                           "syscall",
-	"syscall.ETHERTYPE_WELLFLEET":                          "syscall",
-	"syscall.ETHERTYPE_X25":                                "syscall",
-	"syscall.ETHERTYPE_X75":                                "syscall",
-	"syscall.ETHERTYPE_XNSSM":                              "syscall",
-	"syscall.ETHERTYPE_XTP":                                "syscall",
-	"syscall.ETHER_ADDR_LEN":                               "syscall",
-	"syscall.ETHER_ALIGN":                                  "syscall",
-	"syscall.ETHER_CRC_LEN":                                "syscall",
-	"syscall.ETHER_CRC_POLY_BE":                            "syscall",
-	"syscall.ETHER_CRC_POLY_LE":                            "syscall",
-	"syscall.ETHER_HDR_LEN":                                "syscall",
-	"syscall.ETHER_MAX_DIX_LEN":                            "syscall",
-	"syscall.ETHER_MAX_LEN":                                "syscall",
-	"syscall.ETHER_MAX_LEN_JUMBO":                          "syscall",
-	"syscall.ETHER_MIN_LEN":                                "syscall",
-	"syscall.ETHER_PPPOE_ENCAP_LEN":                        "syscall",
-	"syscall.ETHER_TYPE_LEN":                               "syscall",
-	"syscall.ETHER_VLAN_ENCAP_LEN":                         "syscall",
-	"syscall.ETH_P_1588":                                   "syscall",
-	"syscall.ETH_P_8021Q":                                  "syscall",
-	"syscall.ETH_P_802_2":                                  "syscall",
-	"syscall.ETH_P_802_3":                                  "syscall",
-	"syscall.ETH_P_AARP":                                   "syscall",
-	"syscall.ETH_P_ALL":                                    "syscall",
-	"syscall.ETH_P_AOE":                                    "syscall",
-	"syscall.ETH_P_ARCNET":                                 "syscall",
-	"syscall.ETH_P_ARP":                                    "syscall",
-	"syscall.ETH_P_ATALK":                                  "syscall",
-	"syscall.ETH_P_ATMFATE":                                "syscall",
-	"syscall.ETH_P_ATMMPOA":                                "syscall",
-	"syscall.ETH_P_AX25":                                   "syscall",
-	"syscall.ETH_P_BPQ":                                    "syscall",
-	"syscall.ETH_P_CAIF":                                   "syscall",
-	"syscall.ETH_P_CAN":                                    "syscall",
-	"syscall.ETH_P_CONTROL":                                "syscall",
-	"syscall.ETH_P_CUST":                                   "syscall",
-	"syscall.ETH_P_DDCMP":                                  "syscall",
-	"syscall.ETH_P_DEC":                                    "syscall",
-	"syscall.ETH_P_DIAG":                                   "syscall",
-	"syscall.ETH_P_DNA_DL":                                 "syscall",
-	"syscall.ETH_P_DNA_RC":                                 "syscall",
-	"syscall.ETH_P_DNA_RT":                                 "syscall",
-	"syscall.ETH_P_DSA":                                    "syscall",
-	"syscall.ETH_P_ECONET":                                 "syscall",
-	"syscall.ETH_P_EDSA":                                   "syscall",
-	"syscall.ETH_P_FCOE":                                   "syscall",
-	"syscall.ETH_P_FIP":                                    "syscall",
-	"syscall.ETH_P_HDLC":                                   "syscall",
-	"syscall.ETH_P_IEEE802154":                             "syscall",
-	"syscall.ETH_P_IEEEPUP":                                "syscall",
-	"syscall.ETH_P_IEEEPUPAT":                              "syscall",
-	"syscall.ETH_P_IP":                                     "syscall",
-	"syscall.ETH_P_IPV6":                                   "syscall",
-	"syscall.ETH_P_IPX":                                    "syscall",
-	"syscall.ETH_P_IRDA":                                   "syscall",
-	"syscall.ETH_P_LAT":                                    "syscall",
-	"syscall.ETH_P_LINK_CTL":                               "syscall",
-	"syscall.ETH_P_LOCALTALK":                              "syscall",
-	"syscall.ETH_P_LOOP":                                   "syscall",
-	"syscall.ETH_P_MOBITEX":                                "syscall",
-	"syscall.ETH_P_MPLS_MC":                                "syscall",
-	"syscall.ETH_P_MPLS_UC":                                "syscall",
-	"syscall.ETH_P_PAE":                                    "syscall",
-	"syscall.ETH_P_PAUSE":                                  "syscall",
-	"syscall.ETH_P_PHONET":                                 "syscall",
-	"syscall.ETH_P_PPPTALK":                                "syscall",
-	"syscall.ETH_P_PPP_DISC":                               "syscall",
-	"syscall.ETH_P_PPP_MP":                                 "syscall",
-	"syscall.ETH_P_PPP_SES":                                "syscall",
-	"syscall.ETH_P_PUP":                                    "syscall",
-	"syscall.ETH_P_PUPAT":                                  "syscall",
-	"syscall.ETH_P_RARP":                                   "syscall",
-	"syscall.ETH_P_SCA":                                    "syscall",
-	"syscall.ETH_P_SLOW":                                   "syscall",
-	"syscall.ETH_P_SNAP":                                   "syscall",
-	"syscall.ETH_P_TEB":                                    "syscall",
-	"syscall.ETH_P_TIPC":                                   "syscall",
-	"syscall.ETH_P_TRAILER":                                "syscall",
-	"syscall.ETH_P_TR_802_2":                               "syscall",
-	"syscall.ETH_P_WAN_PPP":                                "syscall",
-	"syscall.ETH_P_WCCP":                                   "syscall",
-	"syscall.ETH_P_X25":                                    "syscall",
-	"syscall.ETIME":                                        "syscall",
-	"syscall.ETIMEDOUT":                                    "syscall",
-	"syscall.ETOOMANYREFS":                                 "syscall",
-	"syscall.ETXTBSY":                                      "syscall",
-	"syscall.EUCLEAN":                                      "syscall",
-	"syscall.EUNATCH":                                      "syscall",
-	"syscall.EUSERS":                                       "syscall",
-	"syscall.EVFILT_AIO":                                   "syscall",
-	"syscall.EVFILT_FS":                                    "syscall",
-	"syscall.EVFILT_LIO":                                   "syscall",
-	"syscall.EVFILT_MACHPORT":                              "syscall",
-	"syscall.EVFILT_PROC":                                  "syscall",
-	"syscall.EVFILT_READ":                                  "syscall",
-	"syscall.EVFILT_SIGNAL":                                "syscall",
-	"syscall.EVFILT_SYSCOUNT":                              "syscall",
-	"syscall.EVFILT_THREADMARKER":                          "syscall",
-	"syscall.EVFILT_TIMER":                                 "syscall",
-	"syscall.EVFILT_USER":                                  "syscall",
-	"syscall.EVFILT_VM":                                    "syscall",
-	"syscall.EVFILT_VNODE":                                 "syscall",
-	"syscall.EVFILT_WRITE":                                 "syscall",
-	"syscall.EV_ADD":                                       "syscall",
-	"syscall.EV_CLEAR":                                     "syscall",
-	"syscall.EV_DELETE":                                    "syscall",
-	"syscall.EV_DISABLE":                                   "syscall",
-	"syscall.EV_DISPATCH":                                  "syscall",
-	"syscall.EV_DROP":                                      "syscall",
-	"syscall.EV_ENABLE":                                    "syscall",
-	"syscall.EV_EOF":                                       "syscall",
-	"syscall.EV_ERROR":                                     "syscall",
-	"syscall.EV_FLAG0":                                     "syscall",
-	"syscall.EV_FLAG1":                                     "syscall",
-	"syscall.EV_ONESHOT":                                   "syscall",
-	"syscall.EV_OOBAND":                                    "syscall",
-	"syscall.EV_POLL":                                      "syscall",
-	"syscall.EV_RECEIPT":                                   "syscall",
-	"syscall.EV_SYSFLAGS":                                  "syscall",
-	"syscall.EWINDOWS":                                     "syscall",
-	"syscall.EWOULDBLOCK":                                  "syscall",
-	"syscall.EXDEV":                                        "syscall",
-	"syscall.EXFULL":                                       "syscall",
-	"syscall.EXTA":                                         "syscall",
-	"syscall.EXTB":                                         "syscall",
-	"syscall.EXTPROC":                                      "syscall",
-	"syscall.Environ":                                      "syscall",
-	"syscall.EpollCreate":                                  "syscall",
-	"syscall.EpollCreate1":                                 "syscall",
-	"syscall.EpollCtl":                                     "syscall",
-	"syscall.EpollEvent":                                   "syscall",
-	"syscall.EpollWait":                                    "syscall",
-	"syscall.Errno":                                        "syscall",
-	"syscall.EscapeArg":                                    "syscall",
-	"syscall.Exchangedata":                                 "syscall",
-	"syscall.Exec":                                         "syscall",
-	"syscall.Exit":                                         "syscall",
-	"syscall.ExitProcess":                                  "syscall",
-	"syscall.FD_CLOEXEC":                                   "syscall",
-	"syscall.FD_SETSIZE":                                   "syscall",
-	"syscall.FILE_ACTION_ADDED":                            "syscall",
-	"syscall.FILE_ACTION_MODIFIED":                         "syscall",
-	"syscall.FILE_ACTION_REMOVED":                          "syscall",
-	"syscall.FILE_ACTION_RENAMED_NEW_NAME":                 "syscall",
-	"syscall.FILE_ACTION_RENAMED_OLD_NAME":                 "syscall",
-	"syscall.FILE_APPEND_DATA":                             "syscall",
-	"syscall.FILE_ATTRIBUTE_ARCHIVE":                       "syscall",
-	"syscall.FILE_ATTRIBUTE_DIRECTORY":                     "syscall",
-	"syscall.FILE_ATTRIBUTE_HIDDEN":                        "syscall",
-	"syscall.FILE_ATTRIBUTE_NORMAL":                        "syscall",
-	"syscall.FILE_ATTRIBUTE_READONLY":                      "syscall",
-	"syscall.FILE_ATTRIBUTE_REPARSE_POINT":                 "syscall",
-	"syscall.FILE_ATTRIBUTE_SYSTEM":                        "syscall",
-	"syscall.FILE_BEGIN":                                   "syscall",
-	"syscall.FILE_CURRENT":                                 "syscall",
-	"syscall.FILE_END":                                     "syscall",
-	"syscall.FILE_FLAG_BACKUP_SEMANTICS":                   "syscall",
-	"syscall.FILE_FLAG_OPEN_REPARSE_POINT":                 "syscall",
-	"syscall.FILE_FLAG_OVERLAPPED":                         "syscall",
-	"syscall.FILE_LIST_DIRECTORY":                          "syscall",
-	"syscall.FILE_MAP_COPY":                                "syscall",
-	"syscall.FILE_MAP_EXECUTE":                             "syscall",
-	"syscall.FILE_MAP_READ":                                "syscall",
-	"syscall.FILE_MAP_WRITE":                               "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_ATTRIBUTES":                "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_CREATION":                  "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_DIR_NAME":                  "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_FILE_NAME":                 "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_LAST_ACCESS":               "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_LAST_WRITE":                "syscall",
-	"syscall.FILE_NOTIFY_CHANGE_SIZE":                      "syscall",
-	"syscall.FILE_SHARE_DELETE":                            "syscall",
-	"syscall.FILE_SHARE_READ":                              "syscall",
-	"syscall.FILE_SHARE_WRITE":                             "syscall",
-	"syscall.FILE_SKIP_COMPLETION_PORT_ON_SUCCESS":         "syscall",
-	"syscall.FILE_SKIP_SET_EVENT_ON_HANDLE":                "syscall",
-	"syscall.FILE_TYPE_CHAR":                               "syscall",
-	"syscall.FILE_TYPE_DISK":                               "syscall",
-	"syscall.FILE_TYPE_PIPE":                               "syscall",
-	"syscall.FILE_TYPE_REMOTE":                             "syscall",
-	"syscall.FILE_TYPE_UNKNOWN":                            "syscall",
-	"syscall.FILE_WRITE_ATTRIBUTES":                        "syscall",
-	"syscall.FLUSHO":                                       "syscall",
-	"syscall.FORMAT_MESSAGE_ALLOCATE_BUFFER":               "syscall",
-	"syscall.FORMAT_MESSAGE_ARGUMENT_ARRAY":                "syscall",
-	"syscall.FORMAT_MESSAGE_FROM_HMODULE":                  "syscall",
-	"syscall.FORMAT_MESSAGE_FROM_STRING":                   "syscall",
-	"syscall.FORMAT_MESSAGE_FROM_SYSTEM":                   "syscall",
-	"syscall.FORMAT_MESSAGE_IGNORE_INSERTS":                "syscall",
-	"syscall.FORMAT_MESSAGE_MAX_WIDTH_MASK":                "syscall",
-	"syscall.FSCTL_GET_REPARSE_POINT":                      "syscall",
-	"syscall.F_ADDFILESIGS":                                "syscall",
-	"syscall.F_ADDSIGS":                                    "syscall",
-	"syscall.F_ALLOCATEALL":                                "syscall",
-	"syscall.F_ALLOCATECONTIG":                             "syscall",
-	"syscall.F_CANCEL":                                     "syscall",
-	"syscall.F_CHKCLEAN":                                   "syscall",
-	"syscall.F_CLOSEM":                                     "syscall",
-	"syscall.F_DUP2FD":                                     "syscall",
-	"syscall.F_DUP2FD_CLOEXEC":                             "syscall",
-	"syscall.F_DUPFD":                                      "syscall",
-	"syscall.F_DUPFD_CLOEXEC":                              "syscall",
-	"syscall.F_EXLCK":                                      "syscall",
-	"syscall.F_FLUSH_DATA":                                 "syscall",
-	"syscall.F_FREEZE_FS":                                  "syscall",
-	"syscall.F_FSCTL":                                      "syscall",
-	"syscall.F_FSDIRMASK":                                  "syscall",
-	"syscall.F_FSIN":                                       "syscall",
-	"syscall.F_FSINOUT":                                    "syscall",
-	"syscall.F_FSOUT":                                      "syscall",
-	"syscall.F_FSPRIV":                                     "syscall",
-	"syscall.F_FSVOID":                                     "syscall",
-	"syscall.F_FULLFSYNC":                                  "syscall",
-	"syscall.F_GETFD":                                      "syscall",
-	"syscall.F_GETFL":                                      "syscall",
-	"syscall.F_GETLEASE":                                   "syscall",
-	"syscall.F_GETLK":                                      "syscall",
-	"syscall.F_GETLK64":                                    "syscall",
-	"syscall.F_GETLKPID":                                   "syscall",
-	"syscall.F_GETNOSIGPIPE":                               "syscall",
-	"syscall.F_GETOWN":                                     "syscall",
-	"syscall.F_GETOWN_EX":                                  "syscall",
-	"syscall.F_GETPATH":                                    "syscall",
-	"syscall.F_GETPATH_MTMINFO":                            "syscall",
-	"syscall.F_GETPIPE_SZ":                                 "syscall",
-	"syscall.F_GETPROTECTIONCLASS":                         "syscall",
-	"syscall.F_GETSIG":                                     "syscall",
-	"syscall.F_GLOBAL_NOCACHE":                             "syscall",
-	"syscall.F_LOCK":                                       "syscall",
-	"syscall.F_LOG2PHYS":                                   "syscall",
-	"syscall.F_LOG2PHYS_EXT":                               "syscall",
-	"syscall.F_MARKDEPENDENCY":                             "syscall",
-	"syscall.F_MAXFD":                                      "syscall",
-	"syscall.F_NOCACHE":                                    "syscall",
-	"syscall.F_NODIRECT":                                   "syscall",
-	"syscall.F_NOTIFY":                                     "syscall",
-	"syscall.F_OGETLK":                                     "syscall",
-	"syscall.F_OK":                                         "syscall",
-	"syscall.F_OSETLK":                                     "syscall",
-	"syscall.F_OSETLKW":                                    "syscall",
-	"syscall.F_PARAM_MASK":                                 "syscall",
-	"syscall.F_PARAM_MAX":                                  "syscall",
-	"syscall.F_PATHPKG_CHECK":                              "syscall",
-	"syscall.F_PEOFPOSMODE":                                "syscall",
-	"syscall.F_PREALLOCATE":                                "syscall",
-	"syscall.F_RDADVISE":                                   "syscall",
-	"syscall.F_RDAHEAD":                                    "syscall",
-	"syscall.F_RDLCK":                                      "syscall",
-	"syscall.F_READAHEAD":                                  "syscall",
-	"syscall.F_READBOOTSTRAP":                              "syscall",
-	"syscall.F_SETBACKINGSTORE":                            "syscall",
-	"syscall.F_SETFD":                                      "syscall",
-	"syscall.F_SETFL":                                      "syscall",
-	"syscall.F_SETLEASE":                                   "syscall",
-	"syscall.F_SETLK":                                      "syscall",
-	"syscall.F_SETLK64":                                    "syscall",
-	"syscall.F_SETLKW":                                     "syscall",
-	"syscall.F_SETLKW64":                                   "syscall",
-	"syscall.F_SETLK_REMOTE":                               "syscall",
-	"syscall.F_SETNOSIGPIPE":                               "syscall",
-	"syscall.F_SETOWN":                                     "syscall",
-	"syscall.F_SETOWN_EX":                                  "syscall",
-	"syscall.F_SETPIPE_SZ":                                 "syscall",
-	"syscall.F_SETPROTECTIONCLASS":                         "syscall",
-	"syscall.F_SETSIG":                                     "syscall",
-	"syscall.F_SETSIZE":                                    "syscall",
-	"syscall.F_SHLCK":                                      "syscall",
-	"syscall.F_TEST":                                       "syscall",
-	"syscall.F_THAW_FS":                                    "syscall",
-	"syscall.F_TLOCK":                                      "syscall",
-	"syscall.F_ULOCK":                                      "syscall",
-	"syscall.F_UNLCK":                                      "syscall",
-	"syscall.F_UNLCKSYS":                                   "syscall",
-	"syscall.F_VOLPOSMODE":                                 "syscall",
-	"syscall.F_WRITEBOOTSTRAP":                             "syscall",
-	"syscall.F_WRLCK":                                      "syscall",
-	"syscall.Faccessat":                                    "syscall",
-	"syscall.Fallocate":                                    "syscall",
-	"syscall.Fbootstraptransfer_t":                         "syscall",
-	"syscall.Fchdir":                                       "syscall",
-	"syscall.Fchflags":                                     "syscall",
-	"syscall.Fchmod":                                       "syscall",
-	"syscall.Fchmodat":                                     "syscall",
-	"syscall.Fchown":                                       "syscall",
-	"syscall.Fchownat":                                     "syscall",
-	"syscall.FcntlFlock":                                   "syscall",
-	"syscall.FdSet":                                        "syscall",
-	"syscall.Fdatasync":                                    "syscall",
-	"syscall.FileNotifyInformation":                        "syscall",
-	"syscall.Filetime":                                     "syscall",
-	"syscall.FindClose":                                    "syscall",
-	"syscall.FindFirstFile":                                "syscall",
-	"syscall.FindNextFile":                                 "syscall",
-	"syscall.Flock":                                        "syscall",
-	"syscall.Flock_t":                                      "syscall",
-	"syscall.FlushBpf":                                     "syscall",
-	"syscall.FlushFileBuffers":                             "syscall",
-	"syscall.FlushViewOfFile":                              "syscall",
-	"syscall.ForkExec":                                     "syscall",
-	"syscall.ForkLock":                                     "syscall",
-	"syscall.FormatMessage":                                "syscall",
-	"syscall.Fpathconf":                                    "syscall",
-	"syscall.FreeAddrInfoW":                                "syscall",
-	"syscall.FreeEnvironmentStrings":                       "syscall",
-	"syscall.FreeLibrary":                                  "syscall",
-	"syscall.Fsid":                                         "syscall",
-	"syscall.Fstat":                                        "syscall",
-	"syscall.Fstatfs":                                      "syscall",
-	"syscall.Fstore_t":                                     "syscall",
-	"syscall.Fsync":                                        "syscall",
-	"syscall.Ftruncate":                                    "syscall",
-	"syscall.FullPath":                                     "syscall",
-	"syscall.Futimes":                                      "syscall",
-	"syscall.Futimesat":                                    "syscall",
-	"syscall.GENERIC_ALL":                                  "syscall",
-	"syscall.GENERIC_EXECUTE":                              "syscall",
-	"syscall.GENERIC_READ":                                 "syscall",
-	"syscall.GENERIC_WRITE":                                "syscall",
-	"syscall.GUID":                                         "syscall",
-	"syscall.GetAcceptExSockaddrs":                         "syscall",
-	"syscall.GetAdaptersInfo":                              "syscall",
-	"syscall.GetAddrInfoW":                                 "syscall",
-	"syscall.GetCommandLine":                               "syscall",
-	"syscall.GetComputerName":                              "syscall",
-	"syscall.GetConsoleMode":                               "syscall",
-	"syscall.GetCurrentDirectory":                          "syscall",
-	"syscall.GetCurrentProcess":                            "syscall",
-	"syscall.GetEnvironmentStrings":                        "syscall",
-	"syscall.GetEnvironmentVariable":                       "syscall",
-	"syscall.GetExitCodeProcess":                           "syscall",
-	"syscall.GetFileAttributes":                            "syscall",
-	"syscall.GetFileAttributesEx":                          "syscall",
-	"syscall.GetFileExInfoStandard":                        "syscall",
-	"syscall.GetFileExMaxInfoLevel":                        "syscall",
-	"syscall.GetFileInformationByHandle":                   "syscall",
-	"syscall.GetFileType":                                  "syscall",
-	"syscall.GetFullPathName":                              "syscall",
-	"syscall.GetHostByName":                                "syscall",
-	"syscall.GetIfEntry":                                   "syscall",
-	"syscall.GetLastError":                                 "syscall",
-	"syscall.GetLengthSid":                                 "syscall",
-	"syscall.GetLongPathName":                              "syscall",
-	"syscall.GetProcAddress":                               "syscall",
-	"syscall.GetProcessTimes":                              "syscall",
-	"syscall.GetProtoByName":                               "syscall",
-	"syscall.GetQueuedCompletionStatus":                    "syscall",
-	"syscall.GetServByName":                                "syscall",
-	"syscall.GetShortPathName":                             "syscall",
-	"syscall.GetStartupInfo":                               "syscall",
-	"syscall.GetStdHandle":                                 "syscall",
-	"syscall.GetSystemTimeAsFileTime":                      "syscall",
-	"syscall.GetTempPath":                                  "syscall",
-	"syscall.GetTimeZoneInformation":                       "syscall",
-	"syscall.GetTokenInformation":                          "syscall",
-	"syscall.GetUserNameEx":                                "syscall",
-	"syscall.GetUserProfileDirectory":                      "syscall",
-	"syscall.GetVersion":                                   "syscall",
-	"syscall.Getcwd":                                       "syscall",
-	"syscall.Getdents":                                     "syscall",
-	"syscall.Getdirentries":                                "syscall",
-	"syscall.Getdtablesize":                                "syscall",
-	"syscall.Getegid":                                      "syscall",
-	"syscall.Getenv":                                       "syscall",
-	"syscall.Geteuid":                                      "syscall",
-	"syscall.Getfsstat":                                    "syscall",
-	"syscall.Getgid":                                       "syscall",
-	"syscall.Getgroups":                                    "syscall",
-	"syscall.Getpagesize":                                  "syscall",
-	"syscall.Getpeername":                                  "syscall",
-	"syscall.Getpgid":                                      "syscall",
-	"syscall.Getpgrp":                                      "syscall",
-	"syscall.Getpid":                                       "syscall",
-	"syscall.Getppid":                                      "syscall",
-	"syscall.Getpriority":                                  "syscall",
-	"syscall.Getrlimit":                                    "syscall",
-	"syscall.Getrusage":                                    "syscall",
-	"syscall.Getsid":                                       "syscall",
-	"syscall.Getsockname":                                  "syscall",
-	"syscall.Getsockopt":                                   "syscall",
-	"syscall.GetsockoptByte":                               "syscall",
-	"syscall.GetsockoptICMPv6Filter":                       "syscall",
-	"syscall.GetsockoptIPMreq":                             "syscall",
-	"syscall.GetsockoptIPMreqn":                            "syscall",
-	"syscall.GetsockoptIPv6MTUInfo":                        "syscall",
-	"syscall.GetsockoptIPv6Mreq":                           "syscall",
-	"syscall.GetsockoptInet4Addr":                          "syscall",
-	"syscall.GetsockoptInt":                                "syscall",
-	"syscall.GetsockoptUcred":                              "syscall",
-	"syscall.Gettid":                                       "syscall",
-	"syscall.Gettimeofday":                                 "syscall",
-	"syscall.Getuid":                                       "syscall",
-	"syscall.Getwd":                                        "syscall",
-	"syscall.Getxattr":                                     "syscall",
-	"syscall.HANDLE_FLAG_INHERIT":                          "syscall",
-	"syscall.HKEY_CLASSES_ROOT":                            "syscall",
-	"syscall.HKEY_CURRENT_CONFIG":                          "syscall",
-	"syscall.HKEY_CURRENT_USER":                            "syscall",
-	"syscall.HKEY_DYN_DATA":                                "syscall",
-	"syscall.HKEY_LOCAL_MACHINE":                           "syscall",
-	"syscall.HKEY_PERFORMANCE_DATA":                        "syscall",
-	"syscall.HKEY_USERS":                                   "syscall",
-	"syscall.HUPCL":                                        "syscall",
-	"syscall.Handle":                                       "syscall",
-	"syscall.Hostent":                                      "syscall",
-	"syscall.ICANON":                                       "syscall",
-	"syscall.ICMP6_FILTER":                                 "syscall",
-	"syscall.ICMPV6_FILTER":                                "syscall",
-	"syscall.ICMPv6Filter":                                 "syscall",
-	"syscall.ICRNL":                                        "syscall",
-	"syscall.IEXTEN":                                       "syscall",
-	"syscall.IFAN_ARRIVAL":                                 "syscall",
-	"syscall.IFAN_DEPARTURE":                               "syscall",
-	"syscall.IFA_ADDRESS":                                  "syscall",
-	"syscall.IFA_ANYCAST":                                  "syscall",
-	"syscall.IFA_BROADCAST":                                "syscall",
-	"syscall.IFA_CACHEINFO":                                "syscall",
-	"syscall.IFA_F_DADFAILED":                              "syscall",
-	"syscall.IFA_F_DEPRECATED":                             "syscall",
-	"syscall.IFA_F_HOMEADDRESS":                            "syscall",
-	"syscall.IFA_F_NODAD":                                  "syscall",
-	"syscall.IFA_F_OPTIMISTIC":                             "syscall",
-	"syscall.IFA_F_PERMANENT":                              "syscall",
-	"syscall.IFA_F_SECONDARY":                              "syscall",
-	"syscall.IFA_F_TEMPORARY":                              "syscall",
-	"syscall.IFA_F_TENTATIVE":                              "syscall",
-	"syscall.IFA_LABEL":                                    "syscall",
-	"syscall.IFA_LOCAL":                                    "syscall",
-	"syscall.IFA_MAX":                                      "syscall",
-	"syscall.IFA_MULTICAST":                                "syscall",
-	"syscall.IFA_ROUTE":                                    "syscall",
-	"syscall.IFA_UNSPEC":                                   "syscall",
-	"syscall.IFF_ALLMULTI":                                 "syscall",
-	"syscall.IFF_ALTPHYS":                                  "syscall",
-	"syscall.IFF_AUTOMEDIA":                                "syscall",
-	"syscall.IFF_BROADCAST":                                "syscall",
-	"syscall.IFF_CANTCHANGE":                               "syscall",
-	"syscall.IFF_CANTCONFIG":                               "syscall",
-	"syscall.IFF_DEBUG":                                    "syscall",
-	"syscall.IFF_DRV_OACTIVE":                              "syscall",
-	"syscall.IFF_DRV_RUNNING":                              "syscall",
-	"syscall.IFF_DYING":                                    "syscall",
-	"syscall.IFF_DYNAMIC":                                  "syscall",
-	"syscall.IFF_LINK0":                                    "syscall",
-	"syscall.IFF_LINK1":                                    "syscall",
-	"syscall.IFF_LINK2":                                    "syscall",
-	"syscall.IFF_LOOPBACK":                                 "syscall",
-	"syscall.IFF_MASTER":                                   "syscall",
-	"syscall.IFF_MONITOR":                                  "syscall",
-	"syscall.IFF_MULTICAST":                                "syscall",
-	"syscall.IFF_NOARP":                                    "syscall",
-	"syscall.IFF_NOTRAILERS":                               "syscall",
-	"syscall.IFF_NO_PI":                                    "syscall",
-	"syscall.IFF_OACTIVE":                                  "syscall",
-	"syscall.IFF_ONE_QUEUE":                                "syscall",
-	"syscall.IFF_POINTOPOINT":                              "syscall",
-	"syscall.IFF_POINTTOPOINT":                             "syscall",
-	"syscall.IFF_PORTSEL":                                  "syscall",
-	"syscall.IFF_PPROMISC":                                 "syscall",
-	"syscall.IFF_PROMISC":                                  "syscall",
-	"syscall.IFF_RENAMING":                                 "syscall",
-	"syscall.IFF_RUNNING":                                  "syscall",
-	"syscall.IFF_SIMPLEX":                                  "syscall",
-	"syscall.IFF_SLAVE":                                    "syscall",
-	"syscall.IFF_SMART":                                    "syscall",
-	"syscall.IFF_STATICARP":                                "syscall",
-	"syscall.IFF_TAP":                                      "syscall",
-	"syscall.IFF_TUN":                                      "syscall",
-	"syscall.IFF_TUN_EXCL":                                 "syscall",
-	"syscall.IFF_UP":                                       "syscall",
-	"syscall.IFF_VNET_HDR":                                 "syscall",
-	"syscall.IFLA_ADDRESS":                                 "syscall",
-	"syscall.IFLA_BROADCAST":                               "syscall",
-	"syscall.IFLA_COST":                                    "syscall",
-	"syscall.IFLA_IFALIAS":                                 "syscall",
-	"syscall.IFLA_IFNAME":                                  "syscall",
-	"syscall.IFLA_LINK":                                    "syscall",
-	"syscall.IFLA_LINKINFO":                                "syscall",
-	"syscall.IFLA_LINKMODE":                                "syscall",
-	"syscall.IFLA_MAP":                                     "syscall",
-	"syscall.IFLA_MASTER":                                  "syscall",
-	"syscall.IFLA_MAX":                                     "syscall",
-	"syscall.IFLA_MTU":                                     "syscall",
-	"syscall.IFLA_NET_NS_PID":                              "syscall",
-	"syscall.IFLA_OPERSTATE":                               "syscall",
-	"syscall.IFLA_PRIORITY":                                "syscall",
-	"syscall.IFLA_PROTINFO":                                "syscall",
-	"syscall.IFLA_QDISC":                                   "syscall",
-	"syscall.IFLA_STATS":                                   "syscall",
-	"syscall.IFLA_TXQLEN":                                  "syscall",
-	"syscall.IFLA_UNSPEC":                                  "syscall",
-	"syscall.IFLA_WEIGHT":                                  "syscall",
-	"syscall.IFLA_WIRELESS":                                "syscall",
-	"syscall.IFNAMSIZ":                                     "syscall",
-	"syscall.IFT_1822":                                     "syscall",
-	"syscall.IFT_A12MPPSWITCH":                             "syscall",
-	"syscall.IFT_AAL2":                                     "syscall",
-	"syscall.IFT_AAL5":                                     "syscall",
-	"syscall.IFT_ADSL":                                     "syscall",
-	"syscall.IFT_AFLANE8023":                               "syscall",
-	"syscall.IFT_AFLANE8025":                               "syscall",
-	"syscall.IFT_ARAP":                                     "syscall",
-	"syscall.IFT_ARCNET":                                   "syscall",
-	"syscall.IFT_ARCNETPLUS":                               "syscall",
-	"syscall.IFT_ASYNC":                                    "syscall",
-	"syscall.IFT_ATM":                                      "syscall",
-	"syscall.IFT_ATMDXI":                                   "syscall",
-	"syscall.IFT_ATMFUNI":                                  "syscall",
-	"syscall.IFT_ATMIMA":                                   "syscall",
-	"syscall.IFT_ATMLOGICAL":                               "syscall",
-	"syscall.IFT_ATMRADIO":                                 "syscall",
-	"syscall.IFT_ATMSUBINTERFACE":                          "syscall",
-	"syscall.IFT_ATMVCIENDPT":                              "syscall",
-	"syscall.IFT_ATMVIRTUAL":                               "syscall",
-	"syscall.IFT_BGPPOLICYACCOUNTING":                      "syscall",
-	"syscall.IFT_BLUETOOTH":                                "syscall",
-	"syscall.IFT_BRIDGE":                                   "syscall",
-	"syscall.IFT_BSC":                                      "syscall",
-	"syscall.IFT_CARP":                                     "syscall",
-	"syscall.IFT_CCTEMUL":                                  "syscall",
-	"syscall.IFT_CELLULAR":                                 "syscall",
-	"syscall.IFT_CEPT":                                     "syscall",
-	"syscall.IFT_CES":                                      "syscall",
-	"syscall.IFT_CHANNEL":                                  "syscall",
-	"syscall.IFT_CNR":                                      "syscall",
-	"syscall.IFT_COFFEE":                                   "syscall",
-	"syscall.IFT_COMPOSITELINK":                            "syscall",
-	"syscall.IFT_DCN":                                      "syscall",
-	"syscall.IFT_DIGITALPOWERLINE":                         "syscall",
-	"syscall.IFT_DIGITALWRAPPEROVERHEADCHANNEL":            "syscall",
-	"syscall.IFT_DLSW":                                     "syscall",
-	"syscall.IFT_DOCSCABLEDOWNSTREAM":                      "syscall",
-	"syscall.IFT_DOCSCABLEMACLAYER":                        "syscall",
-	"syscall.IFT_DOCSCABLEUPSTREAM":                        "syscall",
-	"syscall.IFT_DOCSCABLEUPSTREAMCHANNEL":                 "syscall",
-	"syscall.IFT_DS0":                                      "syscall",
-	"syscall.IFT_DS0BUNDLE":                                "syscall",
-	"syscall.IFT_DS1FDL":                                   "syscall",
-	"syscall.IFT_DS3":                                      "syscall",
-	"syscall.IFT_DTM":                                      "syscall",
-	"syscall.IFT_DUMMY":                                    "syscall",
-	"syscall.IFT_DVBASILN":                                 "syscall",
-	"syscall.IFT_DVBASIOUT":                                "syscall",
-	"syscall.IFT_DVBRCCDOWNSTREAM":                         "syscall",
-	"syscall.IFT_DVBRCCMACLAYER":                           "syscall",
-	"syscall.IFT_DVBRCCUPSTREAM":                           "syscall",
-	"syscall.IFT_ECONET":                                   "syscall",
-	"syscall.IFT_ENC":                                      "syscall",
-	"syscall.IFT_EON":                                      "syscall",
-	"syscall.IFT_EPLRS":                                    "syscall",
-	"syscall.IFT_ESCON":                                    "syscall",
-	"syscall.IFT_ETHER":                                    "syscall",
-	"syscall.IFT_FAITH":                                    "syscall",
-	"syscall.IFT_FAST":                                     "syscall",
-	"syscall.IFT_FASTETHER":                                "syscall",
-	"syscall.IFT_FASTETHERFX":                              "syscall",
-	"syscall.IFT_FDDI":                                     "syscall",
-	"syscall.IFT_FIBRECHANNEL":                             "syscall",
-	"syscall.IFT_FRAMERELAYINTERCONNECT":                   "syscall",
-	"syscall.IFT_FRAMERELAYMPI":                            "syscall",
-	"syscall.IFT_FRDLCIENDPT":                              "syscall",
-	"syscall.IFT_FRELAY":                                   "syscall",
-	"syscall.IFT_FRELAYDCE":                                "syscall",
-	"syscall.IFT_FRF16MFRBUNDLE":                           "syscall",
-	"syscall.IFT_FRFORWARD":                                "syscall",
-	"syscall.IFT_G703AT2MB":                                "syscall",
-	"syscall.IFT_G703AT64K":                                "syscall",
-	"syscall.IFT_GIF":                                      "syscall",
-	"syscall.IFT_GIGABITETHERNET":                          "syscall",
-	"syscall.IFT_GR303IDT":                                 "syscall",
-	"syscall.IFT_GR303RDT":                                 "syscall",
-	"syscall.IFT_H323GATEKEEPER":                           "syscall",
-	"syscall.IFT_H323PROXY":                                "syscall",
-	"syscall.IFT_HDH1822":                                  "syscall",
-	"syscall.IFT_HDLC":                                     "syscall",
-	"syscall.IFT_HDSL2":                                    "syscall",
-	"syscall.IFT_HIPERLAN2":                                "syscall",
-	"syscall.IFT_HIPPI":                                    "syscall",
-	"syscall.IFT_HIPPIINTERFACE":                           "syscall",
-	"syscall.IFT_HOSTPAD":                                  "syscall",
-	"syscall.IFT_HSSI":                                     "syscall",
-	"syscall.IFT_HY":                                       "syscall",
-	"syscall.IFT_IBM370PARCHAN":                            "syscall",
-	"syscall.IFT_IDSL":                                     "syscall",
-	"syscall.IFT_IEEE1394":                                 "syscall",
-	"syscall.IFT_IEEE80211":                                "syscall",
-	"syscall.IFT_IEEE80212":                                "syscall",
-	"syscall.IFT_IEEE8023ADLAG":                            "syscall",
-	"syscall.IFT_IFGSN":                                    "syscall",
-	"syscall.IFT_IMT":                                      "syscall",
-	"syscall.IFT_INFINIBAND":                               "syscall",
-	"syscall.IFT_INTERLEAVE":                               "syscall",
-	"syscall.IFT_IP":                                       "syscall",
-	"syscall.IFT_IPFORWARD":                                "syscall",
-	"syscall.IFT_IPOVERATM":                                "syscall",
-	"syscall.IFT_IPOVERCDLC":                               "syscall",
-	"syscall.IFT_IPOVERCLAW":                               "syscall",
-	"syscall.IFT_IPSWITCH":                                 "syscall",
-	"syscall.IFT_IPXIP":                                    "syscall",
-	"syscall.IFT_ISDN":                                     "syscall",
-	"syscall.IFT_ISDNBASIC":                                "syscall",
-	"syscall.IFT_ISDNPRIMARY":                              "syscall",
-	"syscall.IFT_ISDNS":                                    "syscall",
-	"syscall.IFT_ISDNU":                                    "syscall",
-	"syscall.IFT_ISO88022LLC":                              "syscall",
-	"syscall.IFT_ISO88023":                                 "syscall",
-	"syscall.IFT_ISO88024":                                 "syscall",
-	"syscall.IFT_ISO88025":                                 "syscall",
-	"syscall.IFT_ISO88025CRFPINT":                          "syscall",
-	"syscall.IFT_ISO88025DTR":                              "syscall",
-	"syscall.IFT_ISO88025FIBER":                            "syscall",
-	"syscall.IFT_ISO88026":                                 "syscall",
-	"syscall.IFT_ISUP":                                     "syscall",
-	"syscall.IFT_L2VLAN":                                   "syscall",
-	"syscall.IFT_L3IPVLAN":                                 "syscall",
-	"syscall.IFT_L3IPXVLAN":                                "syscall",
-	"syscall.IFT_LAPB":                                     "syscall",
-	"syscall.IFT_LAPD":                                     "syscall",
-	"syscall.IFT_LAPF":                                     "syscall",
-	"syscall.IFT_LINEGROUP":                                "syscall",
-	"syscall.IFT_LOCALTALK":                                "syscall",
-	"syscall.IFT_LOOP":                                     "syscall",
-	"syscall.IFT_MEDIAMAILOVERIP":                          "syscall",
-	"syscall.IFT_MFSIGLINK":                                "syscall",
-	"syscall.IFT_MIOX25":                                   "syscall",
-	"syscall.IFT_MODEM":                                    "syscall",
-	"syscall.IFT_MPC":                                      "syscall",
-	"syscall.IFT_MPLS":                                     "syscall",
-	"syscall.IFT_MPLSTUNNEL":                               "syscall",
-	"syscall.IFT_MSDSL":                                    "syscall",
-	"syscall.IFT_MVL":                                      "syscall",
-	"syscall.IFT_MYRINET":                                  "syscall",
-	"syscall.IFT_NFAS":                                     "syscall",
-	"syscall.IFT_NSIP":                                     "syscall",
-	"syscall.IFT_OPTICALCHANNEL":                           "syscall",
-	"syscall.IFT_OPTICALTRANSPORT":                         "syscall",
-	"syscall.IFT_OTHER":                                    "syscall",
-	"syscall.IFT_P10":                                      "syscall",
-	"syscall.IFT_P80":                                      "syscall",
-	"syscall.IFT_PARA":                                     "syscall",
-	"syscall.IFT_PDP":                                      "syscall",
-	"syscall.IFT_PFLOG":                                    "syscall",
-	"syscall.IFT_PFLOW":                                    "syscall",
-	"syscall.IFT_PFSYNC":                                   "syscall",
-	"syscall.IFT_PLC":                                      "syscall",
-	"syscall.IFT_PON155":                                   "syscall",
-	"syscall.IFT_PON622":                                   "syscall",
-	"syscall.IFT_POS":                                      "syscall",
-	"syscall.IFT_PPP":                                      "syscall",
-	"syscall.IFT_PPPMULTILINKBUNDLE":                       "syscall",
-	"syscall.IFT_PROPATM":                                  "syscall",
-	"syscall.IFT_PROPBWAP2MP":                              "syscall",
-	"syscall.IFT_PROPCNLS":                                 "syscall",
-	"syscall.IFT_PROPDOCSWIRELESSDOWNSTREAM":               "syscall",
-	"syscall.IFT_PROPDOCSWIRELESSMACLAYER":                 "syscall",
-	"syscall.IFT_PROPDOCSWIRELESSUPSTREAM":                 "syscall",
-	"syscall.IFT_PROPMUX":                                  "syscall",
-	"syscall.IFT_PROPVIRTUAL":                              "syscall",
-	"syscall.IFT_PROPWIRELESSP2P":                          "syscall",
-	"syscall.IFT_PTPSERIAL":                                "syscall",
-	"syscall.IFT_PVC":                                      "syscall",
-	"syscall.IFT_Q2931":                                    "syscall",
-	"syscall.IFT_QLLC":                                     "syscall",
-	"syscall.IFT_RADIOMAC":                                 "syscall",
-	"syscall.IFT_RADSL":                                    "syscall",
-	"syscall.IFT_REACHDSL":                                 "syscall",
-	"syscall.IFT_RFC1483":                                  "syscall",
-	"syscall.IFT_RS232":                                    "syscall",
-	"syscall.IFT_RSRB":                                     "syscall",
-	"syscall.IFT_SDLC":                                     "syscall",
-	"syscall.IFT_SDSL":                                     "syscall",
-	"syscall.IFT_SHDSL":                                    "syscall",
-	"syscall.IFT_SIP":                                      "syscall",
-	"syscall.IFT_SIPSIG":                                   "syscall",
-	"syscall.IFT_SIPTG":                                    "syscall",
-	"syscall.IFT_SLIP":                                     "syscall",
-	"syscall.IFT_SMDSDXI":                                  "syscall",
-	"syscall.IFT_SMDSICIP":                                 "syscall",
-	"syscall.IFT_SONET":                                    "syscall",
-	"syscall.IFT_SONETOVERHEADCHANNEL":                     "syscall",
-	"syscall.IFT_SONETPATH":                                "syscall",
-	"syscall.IFT_SONETVT":                                  "syscall",
-	"syscall.IFT_SRP":                                      "syscall",
-	"syscall.IFT_SS7SIGLINK":                               "syscall",
-	"syscall.IFT_STACKTOSTACK":                             "syscall",
-	"syscall.IFT_STARLAN":                                  "syscall",
-	"syscall.IFT_STF":                                      "syscall",
-	"syscall.IFT_T1":                                       "syscall",
-	"syscall.IFT_TDLC":                                     "syscall",
-	"syscall.IFT_TELINK":                                   "syscall",
-	"syscall.IFT_TERMPAD":                                  "syscall",
-	"syscall.IFT_TR008":                                    "syscall",
-	"syscall.IFT_TRANSPHDLC":                               "syscall",
-	"syscall.IFT_TUNNEL":                                   "syscall",
-	"syscall.IFT_ULTRA":                                    "syscall",
-	"syscall.IFT_USB":                                      "syscall",
-	"syscall.IFT_V11":                                      "syscall",
-	"syscall.IFT_V35":                                      "syscall",
-	"syscall.IFT_V36":                                      "syscall",
-	"syscall.IFT_V37":                                      "syscall",
-	"syscall.IFT_VDSL":                                     "syscall",
-	"syscall.IFT_VIRTUALIPADDRESS":                         "syscall",
-	"syscall.IFT_VIRTUALTG":                                "syscall",
-	"syscall.IFT_VOICEDID":                                 "syscall",
-	"syscall.IFT_VOICEEM":                                  "syscall",
-	"syscall.IFT_VOICEEMFGD":                               "syscall",
-	"syscall.IFT_VOICEENCAP":                               "syscall",
-	"syscall.IFT_VOICEFGDEANA":                             "syscall",
-	"syscall.IFT_VOICEFXO":                                 "syscall",
-	"syscall.IFT_VOICEFXS":                                 "syscall",
-	"syscall.IFT_VOICEOVERATM":                             "syscall",
-	"syscall.IFT_VOICEOVERCABLE":                           "syscall",
-	"syscall.IFT_VOICEOVERFRAMERELAY":                      "syscall",
-	"syscall.IFT_VOICEOVERIP":                              "syscall",
-	"syscall.IFT_X213":                                     "syscall",
-	"syscall.IFT_X25":                                      "syscall",
-	"syscall.IFT_X25DDN":                                   "syscall",
-	"syscall.IFT_X25HUNTGROUP":                             "syscall",
-	"syscall.IFT_X25MLP":                                   "syscall",
-	"syscall.IFT_X25PLE":                                   "syscall",
-	"syscall.IFT_XETHER":                                   "syscall",
-	"syscall.IGNBRK":                                       "syscall",
-	"syscall.IGNCR":                                        "syscall",
-	"syscall.IGNORE":                                       "syscall",
-	"syscall.IGNPAR":                                       "syscall",
-	"syscall.IMAXBEL":                                      "syscall",
-	"syscall.INFINITE":                                     "syscall",
-	"syscall.INLCR":                                        "syscall",
-	"syscall.INPCK":                                        "syscall",
-	"syscall.INVALID_FILE_ATTRIBUTES":                      "syscall",
-	"syscall.IN_ACCESS":                                    "syscall",
-	"syscall.IN_ALL_EVENTS":                                "syscall",
-	"syscall.IN_ATTRIB":                                    "syscall",
-	"syscall.IN_CLASSA_HOST":                               "syscall",
-	"syscall.IN_CLASSA_MAX":                                "syscall",
-	"syscall.IN_CLASSA_NET":                                "syscall",
-	"syscall.IN_CLASSA_NSHIFT":                             "syscall",
-	"syscall.IN_CLASSB_HOST":                               "syscall",
-	"syscall.IN_CLASSB_MAX":                                "syscall",
-	"syscall.IN_CLASSB_NET":                                "syscall",
-	"syscall.IN_CLASSB_NSHIFT":                             "syscall",
-	"syscall.IN_CLASSC_HOST":                               "syscall",
-	"syscall.IN_CLASSC_NET":                                "syscall",
-	"syscall.IN_CLASSC_NSHIFT":                             "syscall",
-	"syscall.IN_CLASSD_HOST":                               "syscall",
-	"syscall.IN_CLASSD_NET":                                "syscall",
-	"syscall.IN_CLASSD_NSHIFT":                             "syscall",
-	"syscall.IN_CLOEXEC":                                   "syscall",
-	"syscall.IN_CLOSE":                                     "syscall",
-	"syscall.IN_CLOSE_NOWRITE":                             "syscall",
-	"syscall.IN_CLOSE_WRITE":                               "syscall",
-	"syscall.IN_CREATE":                                    "syscall",
-	"syscall.IN_DELETE":                                    "syscall",
-	"syscall.IN_DELETE_SELF":                               "syscall",
-	"syscall.IN_DONT_FOLLOW":                               "syscall",
-	"syscall.IN_EXCL_UNLINK":                               "syscall",
-	"syscall.IN_IGNORED":                                   "syscall",
-	"syscall.IN_ISDIR":                                     "syscall",
-	"syscall.IN_LINKLOCALNETNUM":                           "syscall",
-	"syscall.IN_LOOPBACKNET":                               "syscall",
-	"syscall.IN_MASK_ADD":                                  "syscall",
-	"syscall.IN_MODIFY":                                    "syscall",
-	"syscall.IN_MOVE":                                      "syscall",
-	"syscall.IN_MOVED_FROM":                                "syscall",
-	"syscall.IN_MOVED_TO":                                  "syscall",
-	"syscall.IN_MOVE_SELF":                                 "syscall",
-	"syscall.IN_NONBLOCK":                                  "syscall",
-	"syscall.IN_ONESHOT":                                   "syscall",
-	"syscall.IN_ONLYDIR":                                   "syscall",
-	"syscall.IN_OPEN":                                      "syscall",
-	"syscall.IN_Q_OVERFLOW":                                "syscall",
-	"syscall.IN_RFC3021_HOST":                              "syscall",
-	"syscall.IN_RFC3021_MASK":                              "syscall",
-	"syscall.IN_RFC3021_NET":                               "syscall",
-	"syscall.IN_RFC3021_NSHIFT":                            "syscall",
-	"syscall.IN_UNMOUNT":                                   "syscall",
-	"syscall.IOC_IN":                                       "syscall",
-	"syscall.IOC_INOUT":                                    "syscall",
-	"syscall.IOC_OUT":                                      "syscall",
-	"syscall.IOC_VENDOR":                                   "syscall",
-	"syscall.IOC_WS2":                                      "syscall",
-	"syscall.IO_REPARSE_TAG_SYMLINK":                       "syscall",
-	"syscall.IPMreq":                                       "syscall",
-	"syscall.IPMreqn":                                      "syscall",
-	"syscall.IPPROTO_3PC":                                  "syscall",
-	"syscall.IPPROTO_ADFS":                                 "syscall",
-	"syscall.IPPROTO_AH":                                   "syscall",
-	"syscall.IPPROTO_AHIP":                                 "syscall",
-	"syscall.IPPROTO_APES":                                 "syscall",
-	"syscall.IPPROTO_ARGUS":                                "syscall",
-	"syscall.IPPROTO_AX25":                                 "syscall",
-	"syscall.IPPROTO_BHA":                                  "syscall",
-	"syscall.IPPROTO_BLT":                                  "syscall",
-	"syscall.IPPROTO_BRSATMON":                             "syscall",
-	"syscall.IPPROTO_CARP":                                 "syscall",
-	"syscall.IPPROTO_CFTP":                                 "syscall",
-	"syscall.IPPROTO_CHAOS":                                "syscall",
-	"syscall.IPPROTO_CMTP":                                 "syscall",
-	"syscall.IPPROTO_COMP":                                 "syscall",
-	"syscall.IPPROTO_CPHB":                                 "syscall",
-	"syscall.IPPROTO_CPNX":                                 "syscall",
-	"syscall.IPPROTO_DCCP":                                 "syscall",
-	"syscall.IPPROTO_DDP":                                  "syscall",
-	"syscall.IPPROTO_DGP":                                  "syscall",
-	"syscall.IPPROTO_DIVERT":                               "syscall",
-	"syscall.IPPROTO_DIVERT_INIT":                          "syscall",
-	"syscall.IPPROTO_DIVERT_RESP":                          "syscall",
-	"syscall.IPPROTO_DONE":                                 "syscall",
-	"syscall.IPPROTO_DSTOPTS":                              "syscall",
-	"syscall.IPPROTO_EGP":                                  "syscall",
-	"syscall.IPPROTO_EMCON":                                "syscall",
-	"syscall.IPPROTO_ENCAP":                                "syscall",
-	"syscall.IPPROTO_EON":                                  "syscall",
-	"syscall.IPPROTO_ESP":                                  "syscall",
-	"syscall.IPPROTO_ETHERIP":                              "syscall",
-	"syscall.IPPROTO_FRAGMENT":                             "syscall",
-	"syscall.IPPROTO_GGP":                                  "syscall",
-	"syscall.IPPROTO_GMTP":                                 "syscall",
-	"syscall.IPPROTO_GRE":                                  "syscall",
-	"syscall.IPPROTO_HELLO":                                "syscall",
-	"syscall.IPPROTO_HMP":                                  "syscall",
-	"syscall.IPPROTO_HOPOPTS":                              "syscall",
-	"syscall.IPPROTO_ICMP":                                 "syscall",
-	"syscall.IPPROTO_ICMPV6":                               "syscall",
-	"syscall.IPPROTO_IDP":                                  "syscall",
-	"syscall.IPPROTO_IDPR":                                 "syscall",
-	"syscall.IPPROTO_IDRP":                                 "syscall",
-	"syscall.IPPROTO_IGMP":                                 "syscall",
-	"syscall.IPPROTO_IGP":                                  "syscall",
-	"syscall.IPPROTO_IGRP":                                 "syscall",
-	"syscall.IPPROTO_IL":                                   "syscall",
-	"syscall.IPPROTO_INLSP":                                "syscall",
-	"syscall.IPPROTO_INP":                                  "syscall",
-	"syscall.IPPROTO_IP":                                   "syscall",
-	"syscall.IPPROTO_IPCOMP":                               "syscall",
-	"syscall.IPPROTO_IPCV":                                 "syscall",
-	"syscall.IPPROTO_IPEIP":                                "syscall",
-	"syscall.IPPROTO_IPIP":                                 "syscall",
-	"syscall.IPPROTO_IPPC":                                 "syscall",
-	"syscall.IPPROTO_IPV4":                                 "syscall",
-	"syscall.IPPROTO_IPV6":                                 "syscall",
-	"syscall.IPPROTO_IPV6_ICMP":                            "syscall",
-	"syscall.IPPROTO_IRTP":                                 "syscall",
-	"syscall.IPPROTO_KRYPTOLAN":                            "syscall",
-	"syscall.IPPROTO_LARP":                                 "syscall",
-	"syscall.IPPROTO_LEAF1":                                "syscall",
-	"syscall.IPPROTO_LEAF2":                                "syscall",
-	"syscall.IPPROTO_MAX":                                  "syscall",
-	"syscall.IPPROTO_MAXID":                                "syscall",
-	"syscall.IPPROTO_MEAS":                                 "syscall",
-	"syscall.IPPROTO_MH":                                   "syscall",
-	"syscall.IPPROTO_MHRP":                                 "syscall",
-	"syscall.IPPROTO_MICP":                                 "syscall",
-	"syscall.IPPROTO_MOBILE":                               "syscall",
-	"syscall.IPPROTO_MPLS":                                 "syscall",
-	"syscall.IPPROTO_MTP":                                  "syscall",
-	"syscall.IPPROTO_MUX":                                  "syscall",
-	"syscall.IPPROTO_ND":                                   "syscall",
-	"syscall.IPPROTO_NHRP":                                 "syscall",
-	"syscall.IPPROTO_NONE":                                 "syscall",
-	"syscall.IPPROTO_NSP":                                  "syscall",
-	"syscall.IPPROTO_NVPII":                                "syscall",
-	"syscall.IPPROTO_OLD_DIVERT":                           "syscall",
-	"syscall.IPPROTO_OSPFIGP":                              "syscall",
-	"syscall.IPPROTO_PFSYNC":                               "syscall",
-	"syscall.IPPROTO_PGM":                                  "syscall",
-	"syscall.IPPROTO_PIGP":                                 "syscall",
-	"syscall.IPPROTO_PIM":                                  "syscall",
-	"syscall.IPPROTO_PRM":                                  "syscall",
-	"syscall.IPPROTO_PUP":                                  "syscall",
-	"syscall.IPPROTO_PVP":                                  "syscall",
-	"syscall.IPPROTO_RAW":                                  "syscall",
-	"syscall.IPPROTO_RCCMON":                               "syscall",
-	"syscall.IPPROTO_RDP":                                  "syscall",
-	"syscall.IPPROTO_ROUTING":                              "syscall",
-	"syscall.IPPROTO_RSVP":                                 "syscall",
-	"syscall.IPPROTO_RVD":                                  "syscall",
-	"syscall.IPPROTO_SATEXPAK":                             "syscall",
-	"syscall.IPPROTO_SATMON":                               "syscall",
-	"syscall.IPPROTO_SCCSP":                                "syscall",
-	"syscall.IPPROTO_SCTP":                                 "syscall",
-	"syscall.IPPROTO_SDRP":                                 "syscall",
-	"syscall.IPPROTO_SEND":                                 "syscall",
-	"syscall.IPPROTO_SEP":                                  "syscall",
-	"syscall.IPPROTO_SKIP":                                 "syscall",
-	"syscall.IPPROTO_SPACER":                               "syscall",
-	"syscall.IPPROTO_SRPC":                                 "syscall",
-	"syscall.IPPROTO_ST":                                   "syscall",
-	"syscall.IPPROTO_SVMTP":                                "syscall",
-	"syscall.IPPROTO_SWIPE":                                "syscall",
-	"syscall.IPPROTO_TCF":                                  "syscall",
-	"syscall.IPPROTO_TCP":                                  "syscall",
-	"syscall.IPPROTO_TLSP":                                 "syscall",
-	"syscall.IPPROTO_TP":                                   "syscall",
-	"syscall.IPPROTO_TPXX":                                 "syscall",
-	"syscall.IPPROTO_TRUNK1":                               "syscall",
-	"syscall.IPPROTO_TRUNK2":                               "syscall",
-	"syscall.IPPROTO_TTP":                                  "syscall",
-	"syscall.IPPROTO_UDP":                                  "syscall",
-	"syscall.IPPROTO_UDPLITE":                              "syscall",
-	"syscall.IPPROTO_VINES":                                "syscall",
-	"syscall.IPPROTO_VISA":                                 "syscall",
-	"syscall.IPPROTO_VMTP":                                 "syscall",
-	"syscall.IPPROTO_VRRP":                                 "syscall",
-	"syscall.IPPROTO_WBEXPAK":                              "syscall",
-	"syscall.IPPROTO_WBMON":                                "syscall",
-	"syscall.IPPROTO_WSN":                                  "syscall",
-	"syscall.IPPROTO_XNET":                                 "syscall",
-	"syscall.IPPROTO_XTP":                                  "syscall",
-	"syscall.IPV6_2292DSTOPTS":                             "syscall",
-	"syscall.IPV6_2292HOPLIMIT":                            "syscall",
-	"syscall.IPV6_2292HOPOPTS":                             "syscall",
-	"syscall.IPV6_2292NEXTHOP":                             "syscall",
-	"syscall.IPV6_2292PKTINFO":                             "syscall",
-	"syscall.IPV6_2292PKTOPTIONS":                          "syscall",
-	"syscall.IPV6_2292RTHDR":                               "syscall",
-	"syscall.IPV6_ADDRFORM":                                "syscall",
-	"syscall.IPV6_ADD_MEMBERSHIP":                          "syscall",
-	"syscall.IPV6_AUTHHDR":                                 "syscall",
-	"syscall.IPV6_AUTH_LEVEL":                              "syscall",
-	"syscall.IPV6_AUTOFLOWLABEL":                           "syscall",
-	"syscall.IPV6_BINDANY":                                 "syscall",
-	"syscall.IPV6_BINDV6ONLY":                              "syscall",
-	"syscall.IPV6_BOUND_IF":                                "syscall",
-	"syscall.IPV6_CHECKSUM":                                "syscall",
-	"syscall.IPV6_DEFAULT_MULTICAST_HOPS":                  "syscall",
-	"syscall.IPV6_DEFAULT_MULTICAST_LOOP":                  "syscall",
-	"syscall.IPV6_DEFHLIM":                                 "syscall",
-	"syscall.IPV6_DONTFRAG":                                "syscall",
-	"syscall.IPV6_DROP_MEMBERSHIP":                         "syscall",
-	"syscall.IPV6_DSTOPTS":                                 "syscall",
-	"syscall.IPV6_ESP_NETWORK_LEVEL":                       "syscall",
-	"syscall.IPV6_ESP_TRANS_LEVEL":                         "syscall",
-	"syscall.IPV6_FAITH":                                   "syscall",
-	"syscall.IPV6_FLOWINFO_MASK":                           "syscall",
-	"syscall.IPV6_FLOWLABEL_MASK":                          "syscall",
-	"syscall.IPV6_FRAGTTL":                                 "syscall",
-	"syscall.IPV6_FW_ADD":                                  "syscall",
-	"syscall.IPV6_FW_DEL":                                  "syscall",
-	"syscall.IPV6_FW_FLUSH":                                "syscall",
-	"syscall.IPV6_FW_GET":                                  "syscall",
-	"syscall.IPV6_FW_ZERO":                                 "syscall",
-	"syscall.IPV6_HLIMDEC":                                 "syscall",
-	"syscall.IPV6_HOPLIMIT":                                "syscall",
-	"syscall.IPV6_HOPOPTS":                                 "syscall",
-	"syscall.IPV6_IPCOMP_LEVEL":                            "syscall",
-	"syscall.IPV6_IPSEC_POLICY":                            "syscall",
-	"syscall.IPV6_JOIN_ANYCAST":                            "syscall",
-	"syscall.IPV6_JOIN_GROUP":                              "syscall",
-	"syscall.IPV6_LEAVE_ANYCAST":                           "syscall",
-	"syscall.IPV6_LEAVE_GROUP":                             "syscall",
-	"syscall.IPV6_MAXHLIM":                                 "syscall",
-	"syscall.IPV6_MAXOPTHDR":                               "syscall",
-	"syscall.IPV6_MAXPACKET":                               "syscall",
-	"syscall.IPV6_MAX_GROUP_SRC_FILTER":                    "syscall",
-	"syscall.IPV6_MAX_MEMBERSHIPS":                         "syscall",
-	"syscall.IPV6_MAX_SOCK_SRC_FILTER":                     "syscall",
-	"syscall.IPV6_MIN_MEMBERSHIPS":                         "syscall",
-	"syscall.IPV6_MMTU":                                    "syscall",
-	"syscall.IPV6_MSFILTER":                                "syscall",
-	"syscall.IPV6_MTU":                                     "syscall",
-	"syscall.IPV6_MTU_DISCOVER":                            "syscall",
-	"syscall.IPV6_MULTICAST_HOPS":                          "syscall",
-	"syscall.IPV6_MULTICAST_IF":                            "syscall",
-	"syscall.IPV6_MULTICAST_LOOP":                          "syscall",
-	"syscall.IPV6_NEXTHOP":                                 "syscall",
-	"syscall.IPV6_OPTIONS":                                 "syscall",
-	"syscall.IPV6_PATHMTU":                                 "syscall",
-	"syscall.IPV6_PIPEX":                                   "syscall",
-	"syscall.IPV6_PKTINFO":                                 "syscall",
-	"syscall.IPV6_PMTUDISC_DO":                             "syscall",
-	"syscall.IPV6_PMTUDISC_DONT":                           "syscall",
-	"syscall.IPV6_PMTUDISC_PROBE":                          "syscall",
-	"syscall.IPV6_PMTUDISC_WANT":                           "syscall",
-	"syscall.IPV6_PORTRANGE":                               "syscall",
-	"syscall.IPV6_PORTRANGE_DEFAULT":                       "syscall",
-	"syscall.IPV6_PORTRANGE_HIGH":                          "syscall",
-	"syscall.IPV6_PORTRANGE_LOW":                           "syscall",
-	"syscall.IPV6_PREFER_TEMPADDR":                         "syscall",
-	"syscall.IPV6_RECVDSTOPTS":                             "syscall",
-	"syscall.IPV6_RECVDSTPORT":                             "syscall",
-	"syscall.IPV6_RECVERR":                                 "syscall",
-	"syscall.IPV6_RECVHOPLIMIT":                            "syscall",
-	"syscall.IPV6_RECVHOPOPTS":                             "syscall",
-	"syscall.IPV6_RECVPATHMTU":                             "syscall",
-	"syscall.IPV6_RECVPKTINFO":                             "syscall",
-	"syscall.IPV6_RECVRTHDR":                               "syscall",
-	"syscall.IPV6_RECVTCLASS":                              "syscall",
-	"syscall.IPV6_ROUTER_ALERT":                            "syscall",
-	"syscall.IPV6_RTABLE":                                  "syscall",
-	"syscall.IPV6_RTHDR":                                   "syscall",
-	"syscall.IPV6_RTHDRDSTOPTS":                            "syscall",
-	"syscall.IPV6_RTHDR_LOOSE":                             "syscall",
-	"syscall.IPV6_RTHDR_STRICT":                            "syscall",
-	"syscall.IPV6_RTHDR_TYPE_0":                            "syscall",
-	"syscall.IPV6_RXDSTOPTS":                               "syscall",
-	"syscall.IPV6_RXHOPOPTS":                               "syscall",
-	"syscall.IPV6_SOCKOPT_RESERVED1":                       "syscall",
-	"syscall.IPV6_TCLASS":                                  "syscall",
-	"syscall.IPV6_UNICAST_HOPS":                            "syscall",
-	"syscall.IPV6_USE_MIN_MTU":                             "syscall",
-	"syscall.IPV6_V6ONLY":                                  "syscall",
-	"syscall.IPV6_VERSION":                                 "syscall",
-	"syscall.IPV6_VERSION_MASK":                            "syscall",
-	"syscall.IPV6_XFRM_POLICY":                             "syscall",
-	"syscall.IP_ADD_MEMBERSHIP":                            "syscall",
-	"syscall.IP_ADD_SOURCE_MEMBERSHIP":                     "syscall",
-	"syscall.IP_AUTH_LEVEL":                                "syscall",
-	"syscall.IP_BINDANY":                                   "syscall",
-	"syscall.IP_BLOCK_SOURCE":                              "syscall",
-	"syscall.IP_BOUND_IF":                                  "syscall",
-	"syscall.IP_DEFAULT_MULTICAST_LOOP":                    "syscall",
-	"syscall.IP_DEFAULT_MULTICAST_TTL":                     "syscall",
-	"syscall.IP_DF":                                        "syscall",
-	"syscall.IP_DIVERTFL":                                  "syscall",
-	"syscall.IP_DONTFRAG":                                  "syscall",
-	"syscall.IP_DROP_MEMBERSHIP":                           "syscall",
-	"syscall.IP_DROP_SOURCE_MEMBERSHIP":                    "syscall",
-	"syscall.IP_DUMMYNET3":                                 "syscall",
-	"syscall.IP_DUMMYNET_CONFIGURE":                        "syscall",
-	"syscall.IP_DUMMYNET_DEL":                              "syscall",
-	"syscall.IP_DUMMYNET_FLUSH":                            "syscall",
-	"syscall.IP_DUMMYNET_GET":                              "syscall",
-	"syscall.IP_EF":                                        "syscall",
-	"syscall.IP_ERRORMTU":                                  "syscall",
-	"syscall.IP_ESP_NETWORK_LEVEL":                         "syscall",
-	"syscall.IP_ESP_TRANS_LEVEL":                           "syscall",
-	"syscall.IP_FAITH":                                     "syscall",
-	"syscall.IP_FREEBIND":                                  "syscall",
-	"syscall.IP_FW3":                                       "syscall",
-	"syscall.IP_FW_ADD":                                    "syscall",
-	"syscall.IP_FW_DEL":                                    "syscall",
-	"syscall.IP_FW_FLUSH":                                  "syscall",
-	"syscall.IP_FW_GET":                                    "syscall",
-	"syscall.IP_FW_NAT_CFG":                                "syscall",
-	"syscall.IP_FW_NAT_DEL":                                "syscall",
-	"syscall.IP_FW_NAT_GET_CONFIG":                         "syscall",
-	"syscall.IP_FW_NAT_GET_LOG":                            "syscall",
-	"syscall.IP_FW_RESETLOG":                               "syscall",
-	"syscall.IP_FW_TABLE_ADD":                              "syscall",
-	"syscall.IP_FW_TABLE_DEL":                              "syscall",
-	"syscall.IP_FW_TABLE_FLUSH":                            "syscall",
-	"syscall.IP_FW_TABLE_GETSIZE":                          "syscall",
-	"syscall.IP_FW_TABLE_LIST":                             "syscall",
-	"syscall.IP_FW_ZERO":                                   "syscall",
-	"syscall.IP_HDRINCL":                                   "syscall",
-	"syscall.IP_IPCOMP_LEVEL":                              "syscall",
-	"syscall.IP_IPSECFLOWINFO":                             "syscall",
-	"syscall.IP_IPSEC_LOCAL_AUTH":                          "syscall",
-	"syscall.IP_IPSEC_LOCAL_CRED":                          "syscall",
-	"syscall.IP_IPSEC_LOCAL_ID":                            "syscall",
-	"syscall.IP_IPSEC_POLICY":                              "syscall",
-	"syscall.IP_IPSEC_REMOTE_AUTH":                         "syscall",
-	"syscall.IP_IPSEC_REMOTE_CRED":                         "syscall",
-	"syscall.IP_IPSEC_REMOTE_ID":                           "syscall",
-	"syscall.IP_MAXPACKET":                                 "syscall",
-	"syscall.IP_MAX_GROUP_SRC_FILTER":                      "syscall",
-	"syscall.IP_MAX_MEMBERSHIPS":                           "syscall",
-	"syscall.IP_MAX_SOCK_MUTE_FILTER":                      "syscall",
-	"syscall.IP_MAX_SOCK_SRC_FILTER":                       "syscall",
-	"syscall.IP_MAX_SOURCE_FILTER":                         "syscall",
-	"syscall.IP_MF":                                        "syscall",
-	"syscall.IP_MINFRAGSIZE":                               "syscall",
-	"syscall.IP_MINTTL":                                    "syscall",
-	"syscall.IP_MIN_MEMBERSHIPS":                           "syscall",
-	"syscall.IP_MSFILTER":                                  "syscall",
-	"syscall.IP_MSS":                                       "syscall",
-	"syscall.IP_MTU":                                       "syscall",
-	"syscall.IP_MTU_DISCOVER":                              "syscall",
-	"syscall.IP_MULTICAST_IF":                              "syscall",
-	"syscall.IP_MULTICAST_IFINDEX":                         "syscall",
-	"syscall.IP_MULTICAST_LOOP":                            "syscall",
-	"syscall.IP_MULTICAST_TTL":                             "syscall",
-	"syscall.IP_MULTICAST_VIF":                             "syscall",
-	"syscall.IP_NAT__XXX":                                  "syscall",
-	"syscall.IP_OFFMASK":                                   "syscall",
-	"syscall.IP_OLD_FW_ADD":                                "syscall",
-	"syscall.IP_OLD_FW_DEL":                                "syscall",
-	"syscall.IP_OLD_FW_FLUSH":                              "syscall",
-	"syscall.IP_OLD_FW_GET":                                "syscall",
-	"syscall.IP_OLD_FW_RESETLOG":                           "syscall",
-	"syscall.IP_OLD_FW_ZERO":                               "syscall",
-	"syscall.IP_ONESBCAST":                                 "syscall",
-	"syscall.IP_OPTIONS":                                   "syscall",
-	"syscall.IP_ORIGDSTADDR":                               "syscall",
-	"syscall.IP_PASSSEC":                                   "syscall",
-	"syscall.IP_PIPEX":                                     "syscall",
-	"syscall.IP_PKTINFO":                                   "syscall",
-	"syscall.IP_PKTOPTIONS":                                "syscall",
-	"syscall.IP_PMTUDISC":                                  "syscall",
-	"syscall.IP_PMTUDISC_DO":                               "syscall",
-	"syscall.IP_PMTUDISC_DONT":                             "syscall",
-	"syscall.IP_PMTUDISC_PROBE":                            "syscall",
-	"syscall.IP_PMTUDISC_WANT":                             "syscall",
-	"syscall.IP_PORTRANGE":                                 "syscall",
-	"syscall.IP_PORTRANGE_DEFAULT":                         "syscall",
-	"syscall.IP_PORTRANGE_HIGH":                            "syscall",
-	"syscall.IP_PORTRANGE_LOW":                             "syscall",
-	"syscall.IP_RECVDSTADDR":                               "syscall",
-	"syscall.IP_RECVDSTPORT":                               "syscall",
-	"syscall.IP_RECVERR":                                   "syscall",
-	"syscall.IP_RECVIF":                                    "syscall",
-	"syscall.IP_RECVOPTS":                                  "syscall",
-	"syscall.IP_RECVORIGDSTADDR":                           "syscall",
-	"syscall.IP_RECVPKTINFO":                               "syscall",
-	"syscall.IP_RECVRETOPTS":                               "syscall",
-	"syscall.IP_RECVRTABLE":                                "syscall",
-	"syscall.IP_RECVTOS":                                   "syscall",
-	"syscall.IP_RECVTTL":                                   "syscall",
-	"syscall.IP_RETOPTS":                                   "syscall",
-	"syscall.IP_RF":                                        "syscall",
-	"syscall.IP_ROUTER_ALERT":                              "syscall",
-	"syscall.IP_RSVP_OFF":                                  "syscall",
-	"syscall.IP_RSVP_ON":                                   "syscall",
-	"syscall.IP_RSVP_VIF_OFF":                              "syscall",
-	"syscall.IP_RSVP_VIF_ON":                               "syscall",
-	"syscall.IP_RTABLE":                                    "syscall",
-	"syscall.IP_SENDSRCADDR":                               "syscall",
-	"syscall.IP_STRIPHDR":                                  "syscall",
-	"syscall.IP_TOS":                                       "syscall",
-	"syscall.IP_TRAFFIC_MGT_BACKGROUND":                    "syscall",
-	"syscall.IP_TRANSPARENT":                               "syscall",
-	"syscall.IP_TTL":                                       "syscall",
-	"syscall.IP_UNBLOCK_SOURCE":                            "syscall",
-	"syscall.IP_XFRM_POLICY":                               "syscall",
-	"syscall.IPv6MTUInfo":                                  "syscall",
-	"syscall.IPv6Mreq":                                     "syscall",
-	"syscall.ISIG":                                         "syscall",
-	"syscall.ISTRIP":                                       "syscall",
-	"syscall.IUCLC":                                        "syscall",
-	"syscall.IUTF8":                                        "syscall",
-	"syscall.IXANY":                                        "syscall",
-	"syscall.IXOFF":                                        "syscall",
-	"syscall.IXON":                                         "syscall",
-	"syscall.IfAddrmsg":                                    "syscall",
-	"syscall.IfAnnounceMsghdr":                             "syscall",
-	"syscall.IfData":                                       "syscall",
-	"syscall.IfInfomsg":                                    "syscall",
-	"syscall.IfMsghdr":                                     "syscall",
-	"syscall.IfaMsghdr":                                    "syscall",
-	"syscall.IfmaMsghdr":                                   "syscall",
-	"syscall.IfmaMsghdr2":                                  "syscall",
-	"syscall.ImplementsGetwd":                              "syscall",
-	"syscall.Inet4Pktinfo":                                 "syscall",
-	"syscall.Inet6Pktinfo":                                 "syscall",
-	"syscall.InotifyAddWatch":                              "syscall",
-	"syscall.InotifyEvent":                                 "syscall",
-	"syscall.InotifyInit":                                  "syscall",
-	"syscall.InotifyInit1":                                 "syscall",
-	"syscall.InotifyRmWatch":                               "syscall",
-	"syscall.InterfaceAddrMessage":                         "syscall",
-	"syscall.InterfaceAnnounceMessage":                     "syscall",
-	"syscall.InterfaceInfo":                                "syscall",
-	"syscall.InterfaceMessage":                             "syscall",
-	"syscall.InterfaceMulticastAddrMessage":                "syscall",
-	"syscall.InvalidHandle":                                "syscall",
-	"syscall.Ioperm":                                       "syscall",
-	"syscall.Iopl":                                         "syscall",
-	"syscall.Iovec":                                        "syscall",
-	"syscall.IpAdapterInfo":                                "syscall",
-	"syscall.IpAddrString":                                 "syscall",
-	"syscall.IpAddressString":                              "syscall",
-	"syscall.IpMaskString":                                 "syscall",
-	"syscall.Issetugid":                                    "syscall",
-	"syscall.KEY_ALL_ACCESS":                               "syscall",
-	"syscall.KEY_CREATE_LINK":                              "syscall",
-	"syscall.KEY_CREATE_SUB_KEY":                           "syscall",
-	"syscall.KEY_ENUMERATE_SUB_KEYS":                       "syscall",
-	"syscall.KEY_EXECUTE":                                  "syscall",
-	"syscall.KEY_NOTIFY":                                   "syscall",
-	"syscall.KEY_QUERY_VALUE":                              "syscall",
-	"syscall.KEY_READ":                                     "syscall",
-	"syscall.KEY_SET_VALUE":                                "syscall",
-	"syscall.KEY_WOW64_32KEY":                              "syscall",
-	"syscall.KEY_WOW64_64KEY":                              "syscall",
-	"syscall.KEY_WRITE":                                    "syscall",
-	"syscall.Kevent":                                       "syscall",
-	"syscall.Kevent_t":                                     "syscall",
-	"syscall.Kill":                                         "syscall",
-	"syscall.Klogctl":                                      "syscall",
-	"syscall.Kqueue":                                       "syscall",
-	"syscall.LANG_ENGLISH":                                 "syscall",
-	"syscall.LAYERED_PROTOCOL":                             "syscall",
-	"syscall.LCNT_OVERLOAD_FLUSH":                          "syscall",
-	"syscall.LINUX_REBOOT_CMD_CAD_OFF":                     "syscall",
-	"syscall.LINUX_REBOOT_CMD_CAD_ON":                      "syscall",
-	"syscall.LINUX_REBOOT_CMD_HALT":                        "syscall",
-	"syscall.LINUX_REBOOT_CMD_KEXEC":                       "syscall",
-	"syscall.LINUX_REBOOT_CMD_POWER_OFF":                   "syscall",
-	"syscall.LINUX_REBOOT_CMD_RESTART":                     "syscall",
-	"syscall.LINUX_REBOOT_CMD_RESTART2":                    "syscall",
-	"syscall.LINUX_REBOOT_CMD_SW_SUSPEND":                  "syscall",
-	"syscall.LINUX_REBOOT_MAGIC1":                          "syscall",
-	"syscall.LINUX_REBOOT_MAGIC2":                          "syscall",
-	"syscall.LOCK_EX":                                      "syscall",
-	"syscall.LOCK_NB":                                      "syscall",
-	"syscall.LOCK_SH":                                      "syscall",
-	"syscall.LOCK_UN":                                      "syscall",
-	"syscall.LazyDLL":                                      "syscall",
-	"syscall.LazyProc":                                     "syscall",
-	"syscall.Lchown":                                       "syscall",
-	"syscall.Linger":                                       "syscall",
-	"syscall.Link":                                         "syscall",
-	"syscall.Listen":                                       "syscall",
-	"syscall.Listxattr":                                    "syscall",
-	"syscall.LoadCancelIoEx":                               "syscall",
-	"syscall.LoadConnectEx":                                "syscall",
-	"syscall.LoadCreateSymbolicLink":                       "syscall",
-	"syscall.LoadDLL":                                      "syscall",
-	"syscall.LoadGetAddrInfo":                              "syscall",
-	"syscall.LoadLibrary":                                  "syscall",
-	"syscall.LoadSetFileCompletionNotificationModes":       "syscall",
-	"syscall.LocalFree":                                    "syscall",
-	"syscall.Log2phys_t":                                   "syscall",
-	"syscall.LookupAccountName":                            "syscall",
-	"syscall.LookupAccountSid":                             "syscall",
-	"syscall.LookupSID":                                    "syscall",
-	"syscall.LsfJump":                                      "syscall",
-	"syscall.LsfSocket":                                    "syscall",
-	"syscall.LsfStmt":                                      "syscall",
-	"syscall.Lstat":                                        "syscall",
-	"syscall.MADV_AUTOSYNC":                                "syscall",
-	"syscall.MADV_CAN_REUSE":                               "syscall",
-	"syscall.MADV_CORE":                                    "syscall",
-	"syscall.MADV_DOFORK":                                  "syscall",
-	"syscall.MADV_DONTFORK":                                "syscall",
-	"syscall.MADV_DONTNEED":                                "syscall",
-	"syscall.MADV_FREE":                                    "syscall",
-	"syscall.MADV_FREE_REUSABLE":                           "syscall",
-	"syscall.MADV_FREE_REUSE":                              "syscall",
-	"syscall.MADV_HUGEPAGE":                                "syscall",
-	"syscall.MADV_HWPOISON":                                "syscall",
-	"syscall.MADV_MERGEABLE":                               "syscall",
-	"syscall.MADV_NOCORE":                                  "syscall",
-	"syscall.MADV_NOHUGEPAGE":                              "syscall",
-	"syscall.MADV_NORMAL":                                  "syscall",
-	"syscall.MADV_NOSYNC":                                  "syscall",
-	"syscall.MADV_PROTECT":                                 "syscall",
-	"syscall.MADV_RANDOM":                                  "syscall",
-	"syscall.MADV_REMOVE":                                  "syscall",
-	"syscall.MADV_SEQUENTIAL":                              "syscall",
-	"syscall.MADV_SPACEAVAIL":                              "syscall",
-	"syscall.MADV_UNMERGEABLE":                             "syscall",
-	"syscall.MADV_WILLNEED":                                "syscall",
-	"syscall.MADV_ZERO_WIRED_PAGES":                        "syscall",
-	"syscall.MAP_32BIT":                                    "syscall",
-	"syscall.MAP_ALIGNED_SUPER":                            "syscall",
-	"syscall.MAP_ALIGNMENT_16MB":                           "syscall",
-	"syscall.MAP_ALIGNMENT_1TB":                            "syscall",
-	"syscall.MAP_ALIGNMENT_256TB":                          "syscall",
-	"syscall.MAP_ALIGNMENT_4GB":                            "syscall",
-	"syscall.MAP_ALIGNMENT_64KB":                           "syscall",
-	"syscall.MAP_ALIGNMENT_64PB":                           "syscall",
-	"syscall.MAP_ALIGNMENT_MASK":                           "syscall",
-	"syscall.MAP_ALIGNMENT_SHIFT":                          "syscall",
-	"syscall.MAP_ANON":                                     "syscall",
-	"syscall.MAP_ANONYMOUS":                                "syscall",
-	"syscall.MAP_COPY":                                     "syscall",
-	"syscall.MAP_DENYWRITE":                                "syscall",
-	"syscall.MAP_EXECUTABLE":                               "syscall",
-	"syscall.MAP_FILE":                                     "syscall",
-	"syscall.MAP_FIXED":                                    "syscall",
-	"syscall.MAP_FLAGMASK":                                 "syscall",
-	"syscall.MAP_GROWSDOWN":                                "syscall",
-	"syscall.MAP_HASSEMAPHORE":                             "syscall",
-	"syscall.MAP_HUGETLB":                                  "syscall",
-	"syscall.MAP_INHERIT":                                  "syscall",
-	"syscall.MAP_INHERIT_COPY":                             "syscall",
-	"syscall.MAP_INHERIT_DEFAULT":                          "syscall",
-	"syscall.MAP_INHERIT_DONATE_COPY":                      "syscall",
-	"syscall.MAP_INHERIT_NONE":                             "syscall",
-	"syscall.MAP_INHERIT_SHARE":                            "syscall",
-	"syscall.MAP_JIT":                                      "syscall",
-	"syscall.MAP_LOCKED":                                   "syscall",
-	"syscall.MAP_NOCACHE":                                  "syscall",
-	"syscall.MAP_NOCORE":                                   "syscall",
-	"syscall.MAP_NOEXTEND":                                 "syscall",
-	"syscall.MAP_NONBLOCK":                                 "syscall",
-	"syscall.MAP_NORESERVE":                                "syscall",
-	"syscall.MAP_NOSYNC":                                   "syscall",
-	"syscall.MAP_POPULATE":                                 "syscall",
-	"syscall.MAP_PREFAULT_READ":                            "syscall",
-	"syscall.MAP_PRIVATE":                                  "syscall",
-	"syscall.MAP_RENAME":                                   "syscall",
-	"syscall.MAP_RESERVED0080":                             "syscall",
-	"syscall.MAP_RESERVED0100":                             "syscall",
-	"syscall.MAP_SHARED":                                   "syscall",
-	"syscall.MAP_STACK":                                    "syscall",
-	"syscall.MAP_TRYFIXED":                                 "syscall",
-	"syscall.MAP_TYPE":                                     "syscall",
-	"syscall.MAP_WIRED":                                    "syscall",
-	"syscall.MAXIMUM_REPARSE_DATA_BUFFER_SIZE":             "syscall",
-	"syscall.MAXLEN_IFDESCR":                               "syscall",
-	"syscall.MAXLEN_PHYSADDR":                              "syscall",
-	"syscall.MAX_ADAPTER_ADDRESS_LENGTH":                   "syscall",
-	"syscall.MAX_ADAPTER_DESCRIPTION_LENGTH":               "syscall",
-	"syscall.MAX_ADAPTER_NAME_LENGTH":                      "syscall",
-	"syscall.MAX_COMPUTERNAME_LENGTH":                      "syscall",
-	"syscall.MAX_INTERFACE_NAME_LEN":                       "syscall",
-	"syscall.MAX_LONG_PATH":                                "syscall",
-	"syscall.MAX_PATH":                                     "syscall",
-	"syscall.MAX_PROTOCOL_CHAIN":                           "syscall",
-	"syscall.MCL_CURRENT":                                  "syscall",
-	"syscall.MCL_FUTURE":                                   "syscall",
-	"syscall.MNT_DETACH":                                   "syscall",
-	"syscall.MNT_EXPIRE":                                   "syscall",
-	"syscall.MNT_FORCE":                                    "syscall",
-	"syscall.MSG_BCAST":                                    "syscall",
-	"syscall.MSG_CMSG_CLOEXEC":                             "syscall",
-	"syscall.MSG_COMPAT":                                   "syscall",
-	"syscall.MSG_CONFIRM":                                  "syscall",
-	"syscall.MSG_CONTROLMBUF":                              "syscall",
-	"syscall.MSG_CTRUNC":                                   "syscall",
-	"syscall.MSG_DONTROUTE":                                "syscall",
-	"syscall.MSG_DONTWAIT":                                 "syscall",
-	"syscall.MSG_EOF":                                      "syscall",
-	"syscall.MSG_EOR":                                      "syscall",
-	"syscall.MSG_ERRQUEUE":                                 "syscall",
-	"syscall.MSG_FASTOPEN":                                 "syscall",
-	"syscall.MSG_FIN":                                      "syscall",
-	"syscall.MSG_FLUSH":                                    "syscall",
-	"syscall.MSG_HAVEMORE":                                 "syscall",
-	"syscall.MSG_HOLD":                                     "syscall",
-	"syscall.MSG_IOVUSRSPACE":                              "syscall",
-	"syscall.MSG_LENUSRSPACE":                              "syscall",
-	"syscall.MSG_MCAST":                                    "syscall",
-	"syscall.MSG_MORE":                                     "syscall",
-	"syscall.MSG_NAMEMBUF":                                 "syscall",
-	"syscall.MSG_NBIO":                                     "syscall",
-	"syscall.MSG_NEEDSA":                                   "syscall",
-	"syscall.MSG_NOSIGNAL":                                 "syscall",
-	"syscall.MSG_NOTIFICATION":                             "syscall",
-	"syscall.MSG_OOB":                                      "syscall",
-	"syscall.MSG_PEEK":                                     "syscall",
-	"syscall.MSG_PROXY":                                    "syscall",
-	"syscall.MSG_RCVMORE":                                  "syscall",
-	"syscall.MSG_RST":                                      "syscall",
-	"syscall.MSG_SEND":                                     "syscall",
-	"syscall.MSG_SYN":                                      "syscall",
-	"syscall.MSG_TRUNC":                                    "syscall",
-	"syscall.MSG_TRYHARD":                                  "syscall",
-	"syscall.MSG_USERFLAGS":                                "syscall",
-	"syscall.MSG_WAITALL":                                  "syscall",
-	"syscall.MSG_WAITFORONE":                               "syscall",
-	"syscall.MSG_WAITSTREAM":                               "syscall",
-	"syscall.MS_ACTIVE":                                    "syscall",
-	"syscall.MS_ASYNC":                                     "syscall",
-	"syscall.MS_BIND":                                      "syscall",
-	"syscall.MS_DEACTIVATE":                                "syscall",
-	"syscall.MS_DIRSYNC":                                   "syscall",
-	"syscall.MS_INVALIDATE":                                "syscall",
-	"syscall.MS_I_VERSION":                                 "syscall",
-	"syscall.MS_KERNMOUNT":                                 "syscall",
-	"syscall.MS_KILLPAGES":                                 "syscall",
-	"syscall.MS_MANDLOCK":                                  "syscall",
-	"syscall.MS_MGC_MSK":                                   "syscall",
-	"syscall.MS_MGC_VAL":                                   "syscall",
-	"syscall.MS_MOVE":                                      "syscall",
-	"syscall.MS_NOATIME":                                   "syscall",
-	"syscall.MS_NODEV":                                     "syscall",
-	"syscall.MS_NODIRATIME":                                "syscall",
-	"syscall.MS_NOEXEC":                                    "syscall",
-	"syscall.MS_NOSUID":                                    "syscall",
-	"syscall.MS_NOUSER":                                    "syscall",
-	"syscall.MS_POSIXACL":                                  "syscall",
-	"syscall.MS_PRIVATE":                                   "syscall",
-	"syscall.MS_RDONLY":                                    "syscall",
-	"syscall.MS_REC":                                       "syscall",
-	"syscall.MS_RELATIME":                                  "syscall",
-	"syscall.MS_REMOUNT":                                   "syscall",
-	"syscall.MS_RMT_MASK":                                  "syscall",
-	"syscall.MS_SHARED":                                    "syscall",
-	"syscall.MS_SILENT":                                    "syscall",
-	"syscall.MS_SLAVE":                                     "syscall",
-	"syscall.MS_STRICTATIME":                               "syscall",
-	"syscall.MS_SYNC":                                      "syscall",
-	"syscall.MS_SYNCHRONOUS":                               "syscall",
-	"syscall.MS_UNBINDABLE":                                "syscall",
-	"syscall.Madvise":                                      "syscall",
-	"syscall.MapViewOfFile":                                "syscall",
-	"syscall.MaxTokenInfoClass":                            "syscall",
-	"syscall.Mclpool":                                      "syscall",
-	"syscall.MibIfRow":                                     "syscall",
-	"syscall.Mkdir":                                        "syscall",
-	"syscall.Mkdirat":                                      "syscall",
-	"syscall.Mkfifo":                                       "syscall",
-	"syscall.Mknod":                                        "syscall",
-	"syscall.Mknodat":                                      "syscall",
-	"syscall.Mlock":                                        "syscall",
-	"syscall.Mlockall":                                     "syscall",
-	"syscall.Mmap":                                         "syscall",
-	"syscall.Mount":                                        "syscall",
-	"syscall.MoveFile":                                     "syscall",
-	"syscall.Mprotect":                                     "syscall",
-	"syscall.Msghdr":                                       "syscall",
-	"syscall.Munlock":                                      "syscall",
-	"syscall.Munlockall":                                   "syscall",
-	"syscall.Munmap":                                       "syscall",
-	"syscall.MustLoadDLL":                                  "syscall",
-	"syscall.NAME_MAX":                                     "syscall",
-	"syscall.NETLINK_ADD_MEMBERSHIP":                       "syscall",
-	"syscall.NETLINK_AUDIT":                                "syscall",
-	"syscall.NETLINK_BROADCAST_ERROR":                      "syscall",
-	"syscall.NETLINK_CONNECTOR":                            "syscall",
-	"syscall.NETLINK_DNRTMSG":                              "syscall",
-	"syscall.NETLINK_DROP_MEMBERSHIP":                      "syscall",
-	"syscall.NETLINK_ECRYPTFS":                             "syscall",
-	"syscall.NETLINK_FIB_LOOKUP":                           "syscall",
-	"syscall.NETLINK_FIREWALL":                             "syscall",
-	"syscall.NETLINK_GENERIC":                              "syscall",
-	"syscall.NETLINK_INET_DIAG":                            "syscall",
-	"syscall.NETLINK_IP6_FW":                               "syscall",
-	"syscall.NETLINK_ISCSI":                                "syscall",
-	"syscall.NETLINK_KOBJECT_UEVENT":                       "syscall",
-	"syscall.NETLINK_NETFILTER":                            "syscall",
-	"syscall.NETLINK_NFLOG":                                "syscall",
-	"syscall.NETLINK_NO_ENOBUFS":                           "syscall",
-	"syscall.NETLINK_PKTINFO":                              "syscall",
-	"syscall.NETLINK_RDMA":                                 "syscall",
-	"syscall.NETLINK_ROUTE":                                "syscall",
-	"syscall.NETLINK_SCSITRANSPORT":                        "syscall",
-	"syscall.NETLINK_SELINUX":                              "syscall",
-	"syscall.NETLINK_UNUSED":                               "syscall",
-	"syscall.NETLINK_USERSOCK":                             "syscall",
-	"syscall.NETLINK_XFRM":                                 "syscall",
-	"syscall.NET_RT_DUMP":                                  "syscall",
-	"syscall.NET_RT_DUMP2":                                 "syscall",
-	"syscall.NET_RT_FLAGS":                                 "syscall",
-	"syscall.NET_RT_IFLIST":                                "syscall",
-	"syscall.NET_RT_IFLIST2":                               "syscall",
-	"syscall.NET_RT_IFLISTL":                               "syscall",
-	"syscall.NET_RT_IFMALIST":                              "syscall",
-	"syscall.NET_RT_MAXID":                                 "syscall",
-	"syscall.NET_RT_OIFLIST":                               "syscall",
-	"syscall.NET_RT_OOIFLIST":                              "syscall",
-	"syscall.NET_RT_STAT":                                  "syscall",
-	"syscall.NET_RT_STATS":                                 "syscall",
-	"syscall.NET_RT_TABLE":                                 "syscall",
-	"syscall.NET_RT_TRASH":                                 "syscall",
-	"syscall.NLA_ALIGNTO":                                  "syscall",
-	"syscall.NLA_F_NESTED":                                 "syscall",
-	"syscall.NLA_F_NET_BYTEORDER":                          "syscall",
-	"syscall.NLA_HDRLEN":                                   "syscall",
-	"syscall.NLMSG_ALIGNTO":                                "syscall",
-	"syscall.NLMSG_DONE":                                   "syscall",
-	"syscall.NLMSG_ERROR":                                  "syscall",
-	"syscall.NLMSG_HDRLEN":                                 "syscall",
-	"syscall.NLMSG_MIN_TYPE":                               "syscall",
-	"syscall.NLMSG_NOOP":                                   "syscall",
-	"syscall.NLMSG_OVERRUN":                                "syscall",
-	"syscall.NLM_F_ACK":                                    "syscall",
-	"syscall.NLM_F_APPEND":                                 "syscall",
-	"syscall.NLM_F_ATOMIC":                                 "syscall",
-	"syscall.NLM_F_CREATE":                                 "syscall",
-	"syscall.NLM_F_DUMP":                                   "syscall",
-	"syscall.NLM_F_ECHO":                                   "syscall",
-	"syscall.NLM_F_EXCL":                                   "syscall",
-	"syscall.NLM_F_MATCH":                                  "syscall",
-	"syscall.NLM_F_MULTI":                                  "syscall",
-	"syscall.NLM_F_REPLACE":                                "syscall",
-	"syscall.NLM_F_REQUEST":                                "syscall",
-	"syscall.NLM_F_ROOT":                                   "syscall",
-	"syscall.NOFLSH":                                       "syscall",
-	"syscall.NOTE_ABSOLUTE":                                "syscall",
-	"syscall.NOTE_ATTRIB":                                  "syscall",
-	"syscall.NOTE_CHILD":                                   "syscall",
-	"syscall.NOTE_DELETE":                                  "syscall",
-	"syscall.NOTE_EOF":                                     "syscall",
-	"syscall.NOTE_EXEC":                                    "syscall",
-	"syscall.NOTE_EXIT":                                    "syscall",
-	"syscall.NOTE_EXITSTATUS":                              "syscall",
-	"syscall.NOTE_EXTEND":                                  "syscall",
-	"syscall.NOTE_FFAND":                                   "syscall",
-	"syscall.NOTE_FFCOPY":                                  "syscall",
-	"syscall.NOTE_FFCTRLMASK":                              "syscall",
-	"syscall.NOTE_FFLAGSMASK":                              "syscall",
-	"syscall.NOTE_FFNOP":                                   "syscall",
-	"syscall.NOTE_FFOR":                                    "syscall",
-	"syscall.NOTE_FORK":                                    "syscall",
-	"syscall.NOTE_LINK":                                    "syscall",
-	"syscall.NOTE_LOWAT":                                   "syscall",
-	"syscall.NOTE_NONE":                                    "syscall",
-	"syscall.NOTE_NSECONDS":                                "syscall",
-	"syscall.NOTE_PCTRLMASK":                               "syscall",
-	"syscall.NOTE_PDATAMASK":                               "syscall",
-	"syscall.NOTE_REAP":                                    "syscall",
-	"syscall.NOTE_RENAME":                                  "syscall",
-	"syscall.NOTE_RESOURCEEND":                             "syscall",
-	"syscall.NOTE_REVOKE":                                  "syscall",
-	"syscall.NOTE_SECONDS":                                 "syscall",
-	"syscall.NOTE_SIGNAL":                                  "syscall",
-	"syscall.NOTE_TRACK":                                   "syscall",
-	"syscall.NOTE_TRACKERR":                                "syscall",
-	"syscall.NOTE_TRIGGER":                                 "syscall",
-	"syscall.NOTE_TRUNCATE":                                "syscall",
-	"syscall.NOTE_USECONDS":                                "syscall",
-	"syscall.NOTE_VM_ERROR":                                "syscall",
-	"syscall.NOTE_VM_PRESSURE":                             "syscall",
-	"syscall.NOTE_VM_PRESSURE_SUDDEN_TERMINATE":            "syscall",
-	"syscall.NOTE_VM_PRESSURE_TERMINATE":                   "syscall",
-	"syscall.NOTE_WRITE":                                   "syscall",
-	"syscall.NameCanonical":                                "syscall",
-	"syscall.NameCanonicalEx":                              "syscall",
-	"syscall.NameDisplay":                                  "syscall",
-	"syscall.NameDnsDomain":                                "syscall",
-	"syscall.NameFullyQualifiedDN":                         "syscall",
-	"syscall.NameSamCompatible":                            "syscall",
-	"syscall.NameServicePrincipal":                         "syscall",
-	"syscall.NameUniqueId":                                 "syscall",
-	"syscall.NameUnknown":                                  "syscall",
-	"syscall.NameUserPrincipal":                            "syscall",
-	"syscall.Nanosleep":                                    "syscall",
-	"syscall.NetApiBufferFree":                             "syscall",
-	"syscall.NetGetJoinInformation":                        "syscall",
-	"syscall.NetSetupDomainName":                           "syscall",
-	"syscall.NetSetupUnjoined":                             "syscall",
-	"syscall.NetSetupUnknownStatus":                        "syscall",
-	"syscall.NetSetupWorkgroupName":                        "syscall",
-	"syscall.NetUserGetInfo":                               "syscall",
-	"syscall.NetlinkMessage":                               "syscall",
-	"syscall.NetlinkRIB":                                   "syscall",
-	"syscall.NetlinkRouteAttr":                             "syscall",
-	"syscall.NetlinkRouteRequest":                          "syscall",
-	"syscall.NewCallback":                                  "syscall",
-	"syscall.NewCallbackCDecl":                             "syscall",
-	"syscall.NewLazyDLL":                                   "syscall",
-	"syscall.NlAttr":                                       "syscall",
-	"syscall.NlMsgerr":                                     "syscall",
-	"syscall.NlMsghdr":                                     "syscall",
-	"syscall.NsecToFiletime":                               "syscall",
-	"syscall.NsecToTimespec":                               "syscall",
-	"syscall.NsecToTimeval":                                "syscall",
-	"syscall.Ntohs":                                        "syscall",
-	"syscall.OCRNL":                                        "syscall",
-	"syscall.OFDEL":                                        "syscall",
-	"syscall.OFILL":                                        "syscall",
-	"syscall.OFIOGETBMAP":                                  "syscall",
-	"syscall.OID_PKIX_KP_SERVER_AUTH":                      "syscall",
-	"syscall.OID_SERVER_GATED_CRYPTO":                      "syscall",
-	"syscall.OID_SGC_NETSCAPE":                             "syscall",
-	"syscall.OLCUC":                                        "syscall",
-	"syscall.ONLCR":                                        "syscall",
-	"syscall.ONLRET":                                       "syscall",
-	"syscall.ONOCR":                                        "syscall",
-	"syscall.ONOEOT":                                       "syscall",
-	"syscall.OPEN_ALWAYS":                                  "syscall",
-	"syscall.OPEN_EXISTING":                                "syscall",
-	"syscall.OPOST":                                        "syscall",
-	"syscall.O_ACCMODE":                                    "syscall",
-	"syscall.O_ALERT":                                      "syscall",
-	"syscall.O_ALT_IO":                                     "syscall",
-	"syscall.O_APPEND":                                     "syscall",
-	"syscall.O_ASYNC":                                      "syscall",
-	"syscall.O_CLOEXEC":                                    "syscall",
-	"syscall.O_CREAT":                                      "syscall",
-	"syscall.O_DIRECT":                                     "syscall",
-	"syscall.O_DIRECTORY":                                  "syscall",
-	"syscall.O_DSYNC":                                      "syscall",
-	"syscall.O_EVTONLY":                                    "syscall",
-	"syscall.O_EXCL":                                       "syscall",
-	"syscall.O_EXEC":                                       "syscall",
-	"syscall.O_EXLOCK":                                     "syscall",
-	"syscall.O_FSYNC":                                      "syscall",
-	"syscall.O_LARGEFILE":                                  "syscall",
-	"syscall.O_NDELAY":                                     "syscall",
-	"syscall.O_NOATIME":                                    "syscall",
-	"syscall.O_NOCTTY":                                     "syscall",
-	"syscall.O_NOFOLLOW":                                   "syscall",
-	"syscall.O_NONBLOCK":                                   "syscall",
-	"syscall.O_NOSIGPIPE":                                  "syscall",
-	"syscall.O_POPUP":                                      "syscall",
-	"syscall.O_RDONLY":                                     "syscall",
-	"syscall.O_RDWR":                                       "syscall",
-	"syscall.O_RSYNC":                                      "syscall",
-	"syscall.O_SHLOCK":                                     "syscall",
-	"syscall.O_SYMLINK":                                    "syscall",
-	"syscall.O_SYNC":                                       "syscall",
-	"syscall.O_TRUNC":                                      "syscall",
-	"syscall.O_TTY_INIT":                                   "syscall",
-	"syscall.O_WRONLY":                                     "syscall",
-	"syscall.Open":                                         "syscall",
-	"syscall.OpenCurrentProcessToken":                      "syscall",
-	"syscall.OpenProcess":                                  "syscall",
-	"syscall.OpenProcessToken":                             "syscall",
-	"syscall.Openat":                                       "syscall",
-	"syscall.Overlapped":                                   "syscall",
-	"syscall.PACKET_ADD_MEMBERSHIP":                        "syscall",
-	"syscall.PACKET_BROADCAST":                             "syscall",
-	"syscall.PACKET_DROP_MEMBERSHIP":                       "syscall",
-	"syscall.PACKET_FASTROUTE":                             "syscall",
-	"syscall.PACKET_HOST":                                  "syscall",
-	"syscall.PACKET_LOOPBACK":                              "syscall",
-	"syscall.PACKET_MR_ALLMULTI":                           "syscall",
-	"syscall.PACKET_MR_MULTICAST":                          "syscall",
-	"syscall.PACKET_MR_PROMISC":                            "syscall",
-	"syscall.PACKET_MULTICAST":                             "syscall",
-	"syscall.PACKET_OTHERHOST":                             "syscall",
-	"syscall.PACKET_OUTGOING":                              "syscall",
-	"syscall.PACKET_RECV_OUTPUT":                           "syscall",
-	"syscall.PACKET_RX_RING":                               "syscall",
-	"syscall.PACKET_STATISTICS":                            "syscall",
-	"syscall.PAGE_EXECUTE_READ":                            "syscall",
-	"syscall.PAGE_EXECUTE_READWRITE":                       "syscall",
-	"syscall.PAGE_EXECUTE_WRITECOPY":                       "syscall",
-	"syscall.PAGE_READONLY":                                "syscall",
-	"syscall.PAGE_READWRITE":                               "syscall",
-	"syscall.PAGE_WRITECOPY":                               "syscall",
-	"syscall.PARENB":                                       "syscall",
-	"syscall.PARMRK":                                       "syscall",
-	"syscall.PARODD":                                       "syscall",
-	"syscall.PENDIN":                                       "syscall",
-	"syscall.PFL_HIDDEN":                                   "syscall",
-	"syscall.PFL_MATCHES_PROTOCOL_ZERO":                    "syscall",
-	"syscall.PFL_MULTIPLE_PROTO_ENTRIES":                   "syscall",
-	"syscall.PFL_NETWORKDIRECT_PROVIDER":                   "syscall",
-	"syscall.PFL_RECOMMENDED_PROTO_ENTRY":                  "syscall",
-	"syscall.PF_FLUSH":                                     "syscall",
-	"syscall.PKCS_7_ASN_ENCODING":                          "syscall",
-	"syscall.PMC5_PIPELINE_FLUSH":                          "syscall",
-	"syscall.PRIO_PGRP":                                    "syscall",
-	"syscall.PRIO_PROCESS":                                 "syscall",
-	"syscall.PRIO_USER":                                    "syscall",
-	"syscall.PRI_IOFLUSH":                                  "syscall",
-	"syscall.PROCESS_QUERY_INFORMATION":                    "syscall",
-	"syscall.PROCESS_TERMINATE":                            "syscall",
-	"syscall.PROT_EXEC":                                    "syscall",
-	"syscall.PROT_GROWSDOWN":                               "syscall",
-	"syscall.PROT_GROWSUP":                                 "syscall",
-	"syscall.PROT_NONE":                                    "syscall",
-	"syscall.PROT_READ":                                    "syscall",
-	"syscall.PROT_WRITE":                                   "syscall",
-	"syscall.PROV_DH_SCHANNEL":                             "syscall",
-	"syscall.PROV_DSS":                                     "syscall",
-	"syscall.PROV_DSS_DH":                                  "syscall",
-	"syscall.PROV_EC_ECDSA_FULL":                           "syscall",
-	"syscall.PROV_EC_ECDSA_SIG":                            "syscall",
-	"syscall.PROV_EC_ECNRA_FULL":                           "syscall",
-	"syscall.PROV_EC_ECNRA_SIG":                            "syscall",
-	"syscall.PROV_FORTEZZA":                                "syscall",
-	"syscall.PROV_INTEL_SEC":                               "syscall",
-	"syscall.PROV_MS_EXCHANGE":                             "syscall",
-	"syscall.PROV_REPLACE_OWF":                             "syscall",
-	"syscall.PROV_RNG":                                     "syscall",
-	"syscall.PROV_RSA_AES":                                 "syscall",
-	"syscall.PROV_RSA_FULL":                                "syscall",
-	"syscall.PROV_RSA_SCHANNEL":                            "syscall",
-	"syscall.PROV_RSA_SIG":                                 "syscall",
-	"syscall.PROV_SPYRUS_LYNKS":                            "syscall",
-	"syscall.PROV_SSL":                                     "syscall",
-	"syscall.PR_CAPBSET_DROP":                              "syscall",
-	"syscall.PR_CAPBSET_READ":                              "syscall",
-	"syscall.PR_CLEAR_SECCOMP_FILTER":                      "syscall",
-	"syscall.PR_ENDIAN_BIG":                                "syscall",
-	"syscall.PR_ENDIAN_LITTLE":                             "syscall",
-	"syscall.PR_ENDIAN_PPC_LITTLE":                         "syscall",
-	"syscall.PR_FPEMU_NOPRINT":                             "syscall",
-	"syscall.PR_FPEMU_SIGFPE":                              "syscall",
-	"syscall.PR_FP_EXC_ASYNC":                              "syscall",
-	"syscall.PR_FP_EXC_DISABLED":                           "syscall",
-	"syscall.PR_FP_EXC_DIV":                                "syscall",
-	"syscall.PR_FP_EXC_INV":                                "syscall",
-	"syscall.PR_FP_EXC_NONRECOV":                           "syscall",
-	"syscall.PR_FP_EXC_OVF":                                "syscall",
-	"syscall.PR_FP_EXC_PRECISE":                            "syscall",
-	"syscall.PR_FP_EXC_RES":                                "syscall",
-	"syscall.PR_FP_EXC_SW_ENABLE":                          "syscall",
-	"syscall.PR_FP_EXC_UND":                                "syscall",
-	"syscall.PR_GET_DUMPABLE":                              "syscall",
-	"syscall.PR_GET_ENDIAN":                                "syscall",
-	"syscall.PR_GET_FPEMU":                                 "syscall",
-	"syscall.PR_GET_FPEXC":                                 "syscall",
-	"syscall.PR_GET_KEEPCAPS":                              "syscall",
-	"syscall.PR_GET_NAME":                                  "syscall",
-	"syscall.PR_GET_PDEATHSIG":                             "syscall",
-	"syscall.PR_GET_SECCOMP":                               "syscall",
-	"syscall.PR_GET_SECCOMP_FILTER":                        "syscall",
-	"syscall.PR_GET_SECUREBITS":                            "syscall",
-	"syscall.PR_GET_TIMERSLACK":                            "syscall",
-	"syscall.PR_GET_TIMING":                                "syscall",
-	"syscall.PR_GET_TSC":                                   "syscall",
-	"syscall.PR_GET_UNALIGN":                               "syscall",
-	"syscall.PR_MCE_KILL":                                  "syscall",
-	"syscall.PR_MCE_KILL_CLEAR":                            "syscall",
-	"syscall.PR_MCE_KILL_DEFAULT":                          "syscall",
-	"syscall.PR_MCE_KILL_EARLY":                            "syscall",
-	"syscall.PR_MCE_KILL_GET":                              "syscall",
-	"syscall.PR_MCE_KILL_LATE":                             "syscall",
-	"syscall.PR_MCE_KILL_SET":                              "syscall",
-	"syscall.PR_SECCOMP_FILTER_EVENT":                      "syscall",
-	"syscall.PR_SECCOMP_FILTER_SYSCALL":                    "syscall",
-	"syscall.PR_SET_DUMPABLE":                              "syscall",
-	"syscall.PR_SET_ENDIAN":                                "syscall",
-	"syscall.PR_SET_FPEMU":                                 "syscall",
-	"syscall.PR_SET_FPEXC":                                 "syscall",
-	"syscall.PR_SET_KEEPCAPS":                              "syscall",
-	"syscall.PR_SET_NAME":                                  "syscall",
-	"syscall.PR_SET_PDEATHSIG":                             "syscall",
-	"syscall.PR_SET_PTRACER":                               "syscall",
-	"syscall.PR_SET_SECCOMP":                               "syscall",
-	"syscall.PR_SET_SECCOMP_FILTER":                        "syscall",
-	"syscall.PR_SET_SECUREBITS":                            "syscall",
-	"syscall.PR_SET_TIMERSLACK":                            "syscall",
-	"syscall.PR_SET_TIMING":                                "syscall",
-	"syscall.PR_SET_TSC":                                   "syscall",
-	"syscall.PR_SET_UNALIGN":                               "syscall",
-	"syscall.PR_TASK_PERF_EVENTS_DISABLE":                  "syscall",
-	"syscall.PR_TASK_PERF_EVENTS_ENABLE":                   "syscall",
-	"syscall.PR_TIMING_STATISTICAL":                        "syscall",
-	"syscall.PR_TIMING_TIMESTAMP":                          "syscall",
-	"syscall.PR_TSC_ENABLE":                                "syscall",
-	"syscall.PR_TSC_SIGSEGV":                               "syscall",
-	"syscall.PR_UNALIGN_NOPRINT":                           "syscall",
-	"syscall.PR_UNALIGN_SIGBUS":                            "syscall",
-	"syscall.PTRACE_ARCH_PRCTL":                            "syscall",
-	"syscall.PTRACE_ATTACH":                                "syscall",
-	"syscall.PTRACE_CONT":                                  "syscall",
-	"syscall.PTRACE_DETACH":                                "syscall",
-	"syscall.PTRACE_EVENT_CLONE":                           "syscall",
-	"syscall.PTRACE_EVENT_EXEC":                            "syscall",
-	"syscall.PTRACE_EVENT_EXIT":                            "syscall",
-	"syscall.PTRACE_EVENT_FORK":                            "syscall",
-	"syscall.PTRACE_EVENT_VFORK":                           "syscall",
-	"syscall.PTRACE_EVENT_VFORK_DONE":                      "syscall",
-	"syscall.PTRACE_GETCRUNCHREGS":                         "syscall",
-	"syscall.PTRACE_GETEVENTMSG":                           "syscall",
-	"syscall.PTRACE_GETFPREGS":                             "syscall",
-	"syscall.PTRACE_GETFPXREGS":                            "syscall",
-	"syscall.PTRACE_GETHBPREGS":                            "syscall",
-	"syscall.PTRACE_GETREGS":                               "syscall",
-	"syscall.PTRACE_GETREGSET":                             "syscall",
-	"syscall.PTRACE_GETSIGINFO":                            "syscall",
-	"syscall.PTRACE_GETVFPREGS":                            "syscall",
-	"syscall.PTRACE_GETWMMXREGS":                           "syscall",
-	"syscall.PTRACE_GET_THREAD_AREA":                       "syscall",
-	"syscall.PTRACE_KILL":                                  "syscall",
-	"syscall.PTRACE_OLDSETOPTIONS":                         "syscall",
-	"syscall.PTRACE_O_MASK":                                "syscall",
-	"syscall.PTRACE_O_TRACECLONE":                          "syscall",
-	"syscall.PTRACE_O_TRACEEXEC":                           "syscall",
-	"syscall.PTRACE_O_TRACEEXIT":                           "syscall",
-	"syscall.PTRACE_O_TRACEFORK":                           "syscall",
-	"syscall.PTRACE_O_TRACESYSGOOD":                        "syscall",
-	"syscall.PTRACE_O_TRACEVFORK":                          "syscall",
-	"syscall.PTRACE_O_TRACEVFORKDONE":                      "syscall",
-	"syscall.PTRACE_PEEKDATA":                              "syscall",
-	"syscall.PTRACE_PEEKTEXT":                              "syscall",
-	"syscall.PTRACE_PEEKUSR":                               "syscall",
-	"syscall.PTRACE_POKEDATA":                              "syscall",
-	"syscall.PTRACE_POKETEXT":                              "syscall",
-	"syscall.PTRACE_POKEUSR":                               "syscall",
-	"syscall.PTRACE_SETCRUNCHREGS":                         "syscall",
-	"syscall.PTRACE_SETFPREGS":                             "syscall",
-	"syscall.PTRACE_SETFPXREGS":                            "syscall",
-	"syscall.PTRACE_SETHBPREGS":                            "syscall",
-	"syscall.PTRACE_SETOPTIONS":                            "syscall",
-	"syscall.PTRACE_SETREGS":                               "syscall",
-	"syscall.PTRACE_SETREGSET":                             "syscall",
-	"syscall.PTRACE_SETSIGINFO":                            "syscall",
-	"syscall.PTRACE_SETVFPREGS":                            "syscall",
-	"syscall.PTRACE_SETWMMXREGS":                           "syscall",
-	"syscall.PTRACE_SET_SYSCALL":                           "syscall",
-	"syscall.PTRACE_SET_THREAD_AREA":                       "syscall",
-	"syscall.PTRACE_SINGLEBLOCK":                           "syscall",
-	"syscall.PTRACE_SINGLESTEP":                            "syscall",
-	"syscall.PTRACE_SYSCALL":                               "syscall",
-	"syscall.PTRACE_SYSEMU":                                "syscall",
-	"syscall.PTRACE_SYSEMU_SINGLESTEP":                     "syscall",
-	"syscall.PTRACE_TRACEME":                               "syscall",
-	"syscall.PT_ATTACH":                                    "syscall",
-	"syscall.PT_ATTACHEXC":                                 "syscall",
-	"syscall.PT_CONTINUE":                                  "syscall",
-	"syscall.PT_DATA_ADDR":                                 "syscall",
-	"syscall.PT_DENY_ATTACH":                               "syscall",
-	"syscall.PT_DETACH":                                    "syscall",
-	"syscall.PT_FIRSTMACH":                                 "syscall",
-	"syscall.PT_FORCEQUOTA":                                "syscall",
-	"syscall.PT_KILL":                                      "syscall",
-	"syscall.PT_MASK":                                      "syscall",
-	"syscall.PT_READ_D":                                    "syscall",
-	"syscall.PT_READ_I":                                    "syscall",
-	"syscall.PT_READ_U":                                    "syscall",
-	"syscall.PT_SIGEXC":                                    "syscall",
-	"syscall.PT_STEP":                                      "syscall",
-	"syscall.PT_TEXT_ADDR":                                 "syscall",
-	"syscall.PT_TEXT_END_ADDR":                             "syscall",
-	"syscall.PT_THUPDATE":                                  "syscall",
-	"syscall.PT_TRACE_ME":                                  "syscall",
-	"syscall.PT_WRITE_D":                                   "syscall",
-	"syscall.PT_WRITE_I":                                   "syscall",
-	"syscall.PT_WRITE_U":                                   "syscall",
-	"syscall.ParseDirent":                                  "syscall",
-	"syscall.ParseNetlinkMessage":                          "syscall",
-	"syscall.ParseNetlinkRouteAttr":                        "syscall",
-	"syscall.ParseRoutingMessage":                          "syscall",
-	"syscall.ParseRoutingSockaddr":                         "syscall",
-	"syscall.ParseSocketControlMessage":                    "syscall",
-	"syscall.ParseUnixCredentials":                         "syscall",
-	"syscall.ParseUnixRights":                              "syscall",
-	"syscall.PathMax":                                      "syscall",
-	"syscall.Pathconf":                                     "syscall",
-	"syscall.Pause":                                        "syscall",
-	"syscall.Pipe":                                         "syscall",
-	"syscall.Pipe2":                                        "syscall",
-	"syscall.PivotRoot":                                    "syscall",
-	"syscall.PostQueuedCompletionStatus":                   "syscall",
-	"syscall.Pread":                                        "syscall",
-	"syscall.Proc":                                         "syscall",
-	"syscall.ProcAttr":                                     "syscall",
-	"syscall.Process32First":                               "syscall",
-	"syscall.Process32Next":                                "syscall",
-	"syscall.ProcessEntry32":                               "syscall",
-	"syscall.ProcessInformation":                           "syscall",
-	"syscall.Protoent":                                     "syscall",
-	"syscall.PtraceAttach":                                 "syscall",
-	"syscall.PtraceCont":                                   "syscall",
-	"syscall.PtraceDetach":                                 "syscall",
-	"syscall.PtraceGetEventMsg":                            "syscall",
-	"syscall.PtraceGetRegs":                                "syscall",
-	"syscall.PtracePeekData":                               "syscall",
-	"syscall.PtracePeekText":                               "syscall",
-	"syscall.PtracePokeData":                               "syscall",
-	"syscall.PtracePokeText":                               "syscall",
-	"syscall.PtraceRegs":                                   "syscall",
-	"syscall.PtraceSetOptions":                             "syscall",
-	"syscall.PtraceSetRegs":                                "syscall",
-	"syscall.PtraceSingleStep":                             "syscall",
-	"syscall.PtraceSyscall":                                "syscall",
-	"syscall.Pwrite":                                       "syscall",
-	"syscall.REG_BINARY":                                   "syscall",
-	"syscall.REG_DWORD":                                    "syscall",
-	"syscall.REG_DWORD_BIG_ENDIAN":                         "syscall",
-	"syscall.REG_DWORD_LITTLE_ENDIAN":                      "syscall",
-	"syscall.REG_EXPAND_SZ":                                "syscall",
-	"syscall.REG_FULL_RESOURCE_DESCRIPTOR":                 "syscall",
-	"syscall.REG_LINK":                                     "syscall",
-	"syscall.REG_MULTI_SZ":                                 "syscall",
-	"syscall.REG_NONE":                                     "syscall",
-	"syscall.REG_QWORD":                                    "syscall",
-	"syscall.REG_QWORD_LITTLE_ENDIAN":                      "syscall",
-	"syscall.REG_RESOURCE_LIST":                            "syscall",
-	"syscall.REG_RESOURCE_REQUIREMENTS_LIST":               "syscall",
-	"syscall.REG_SZ":                                       "syscall",
-	"syscall.RLIMIT_AS":                                    "syscall",
-	"syscall.RLIMIT_CORE":                                  "syscall",
-	"syscall.RLIMIT_CPU":                                   "syscall",
-	"syscall.RLIMIT_DATA":                                  "syscall",
-	"syscall.RLIMIT_FSIZE":                                 "syscall",
-	"syscall.RLIMIT_NOFILE":                                "syscall",
-	"syscall.RLIMIT_STACK":                                 "syscall",
-	"syscall.RLIM_INFINITY":                                "syscall",
-	"syscall.RTAX_ADVMSS":                                  "syscall",
-	"syscall.RTAX_AUTHOR":                                  "syscall",
-	"syscall.RTAX_BRD":                                     "syscall",
-	"syscall.RTAX_CWND":                                    "syscall",
-	"syscall.RTAX_DST":                                     "syscall",
-	"syscall.RTAX_FEATURES":                                "syscall",
-	"syscall.RTAX_FEATURE_ALLFRAG":                         "syscall",
-	"syscall.RTAX_FEATURE_ECN":                             "syscall",
-	"syscall.RTAX_FEATURE_SACK":                            "syscall",
-	"syscall.RTAX_FEATURE_TIMESTAMP":                       "syscall",
-	"syscall.RTAX_GATEWAY":                                 "syscall",
-	"syscall.RTAX_GENMASK":                                 "syscall",
-	"syscall.RTAX_HOPLIMIT":                                "syscall",
-	"syscall.RTAX_IFA":                                     "syscall",
-	"syscall.RTAX_IFP":                                     "syscall",
-	"syscall.RTAX_INITCWND":                                "syscall",
-	"syscall.RTAX_INITRWND":                                "syscall",
-	"syscall.RTAX_LABEL":                                   "syscall",
-	"syscall.RTAX_LOCK":                                    "syscall",
-	"syscall.RTAX_MAX":                                     "syscall",
-	"syscall.RTAX_MTU":                                     "syscall",
-	"syscall.RTAX_NETMASK":                                 "syscall",
-	"syscall.RTAX_REORDERING":                              "syscall",
-	"syscall.RTAX_RTO_MIN":                                 "syscall",
-	"syscall.RTAX_RTT":                                     "syscall",
-	"syscall.RTAX_RTTVAR":                                  "syscall",
-	"syscall.RTAX_SRC":                                     "syscall",
-	"syscall.RTAX_SRCMASK":                                 "syscall",
-	"syscall.RTAX_SSTHRESH":                                "syscall",
-	"syscall.RTAX_TAG":                                     "syscall",
-	"syscall.RTAX_UNSPEC":                                  "syscall",
-	"syscall.RTAX_WINDOW":                                  "syscall",
-	"syscall.RTA_ALIGNTO":                                  "syscall",
-	"syscall.RTA_AUTHOR":                                   "syscall",
-	"syscall.RTA_BRD":                                      "syscall",
-	"syscall.RTA_CACHEINFO":                                "syscall",
-	"syscall.RTA_DST":                                      "syscall",
-	"syscall.RTA_FLOW":                                     "syscall",
-	"syscall.RTA_GATEWAY":                                  "syscall",
-	"syscall.RTA_GENMASK":                                  "syscall",
-	"syscall.RTA_IFA":                                      "syscall",
-	"syscall.RTA_IFP":                                      "syscall",
-	"syscall.RTA_IIF":                                      "syscall",
-	"syscall.RTA_LABEL":                                    "syscall",
-	"syscall.RTA_MAX":                                      "syscall",
-	"syscall.RTA_METRICS":                                  "syscall",
-	"syscall.RTA_MULTIPATH":                                "syscall",
-	"syscall.RTA_NETMASK":                                  "syscall",
-	"syscall.RTA_OIF":                                      "syscall",
-	"syscall.RTA_PREFSRC":                                  "syscall",
-	"syscall.RTA_PRIORITY":                                 "syscall",
-	"syscall.RTA_SRC":                                      "syscall",
-	"syscall.RTA_SRCMASK":                                  "syscall",
-	"syscall.RTA_TABLE":                                    "syscall",
-	"syscall.RTA_TAG":                                      "syscall",
-	"syscall.RTA_UNSPEC":                                   "syscall",
-	"syscall.RTCF_DIRECTSRC":                               "syscall",
-	"syscall.RTCF_DOREDIRECT":                              "syscall",
-	"syscall.RTCF_LOG":                                     "syscall",
-	"syscall.RTCF_MASQ":                                    "syscall",
-	"syscall.RTCF_NAT":                                     "syscall",
-	"syscall.RTCF_VALVE":                                   "syscall",
-	"syscall.RTF_ADDRCLASSMASK":                            "syscall",
-	"syscall.RTF_ADDRCONF":                                 "syscall",
-	"syscall.RTF_ALLONLINK":                                "syscall",
-	"syscall.RTF_ANNOUNCE":                                 "syscall",
-	"syscall.RTF_BLACKHOLE":                                "syscall",
-	"syscall.RTF_BROADCAST":                                "syscall",
-	"syscall.RTF_CACHE":                                    "syscall",
-	"syscall.RTF_CLONED":                                   "syscall",
-	"syscall.RTF_CLONING":                                  "syscall",
-	"syscall.RTF_CONDEMNED":                                "syscall",
-	"syscall.RTF_DEFAULT":                                  "syscall",
-	"syscall.RTF_DELCLONE":                                 "syscall",
-	"syscall.RTF_DONE":                                     "syscall",
-	"syscall.RTF_DYNAMIC":                                  "syscall",
-	"syscall.RTF_FLOW":                                     "syscall",
-	"syscall.RTF_FMASK":                                    "syscall",
-	"syscall.RTF_GATEWAY":                                  "syscall",
-	"syscall.RTF_GWFLAG_COMPAT":                            "syscall",
-	"syscall.RTF_HOST":                                     "syscall",
-	"syscall.RTF_IFREF":                                    "syscall",
-	"syscall.RTF_IFSCOPE":                                  "syscall",
-	"syscall.RTF_INTERFACE":                                "syscall",
-	"syscall.RTF_IRTT":                                     "syscall",
-	"syscall.RTF_LINKRT":                                   "syscall",
-	"syscall.RTF_LLDATA":                                   "syscall",
-	"syscall.RTF_LLINFO":                                   "syscall",
-	"syscall.RTF_LOCAL":                                    "syscall",
-	"syscall.RTF_MASK":                                     "syscall",
-	"syscall.RTF_MODIFIED":                                 "syscall",
-	"syscall.RTF_MPATH":                                    "syscall",
-	"syscall.RTF_MPLS":                                     "syscall",
-	"syscall.RTF_MSS":                                      "syscall",
-	"syscall.RTF_MTU":                                      "syscall",
-	"syscall.RTF_MULTICAST":                                "syscall",
-	"syscall.RTF_NAT":                                      "syscall",
-	"syscall.RTF_NOFORWARD":                                "syscall",
-	"syscall.RTF_NONEXTHOP":                                "syscall",
-	"syscall.RTF_NOPMTUDISC":                               "syscall",
-	"syscall.RTF_PERMANENT_ARP":                            "syscall",
-	"syscall.RTF_PINNED":                                   "syscall",
-	"syscall.RTF_POLICY":                                   "syscall",
-	"syscall.RTF_PRCLONING":                                "syscall",
-	"syscall.RTF_PROTO1":                                   "syscall",
-	"syscall.RTF_PROTO2":                                   "syscall",
-	"syscall.RTF_PROTO3":                                   "syscall",
-	"syscall.RTF_REINSTATE":                                "syscall",
-	"syscall.RTF_REJECT":                                   "syscall",
-	"syscall.RTF_RNH_LOCKED":                               "syscall",
-	"syscall.RTF_SOURCE":                                   "syscall",
-	"syscall.RTF_SRC":                                      "syscall",
-	"syscall.RTF_STATIC":                                   "syscall",
-	"syscall.RTF_STICKY":                                   "syscall",
-	"syscall.RTF_THROW":                                    "syscall",
-	"syscall.RTF_TUNNEL":                                   "syscall",
-	"syscall.RTF_UP":                                       "syscall",
-	"syscall.RTF_USETRAILERS":                              "syscall",
-	"syscall.RTF_WASCLONED":                                "syscall",
-	"syscall.RTF_WINDOW":                                   "syscall",
-	"syscall.RTF_XRESOLVE":                                 "syscall",
-	"syscall.RTM_ADD":                                      "syscall",
-	"syscall.RTM_BASE":                                     "syscall",
-	"syscall.RTM_CHANGE":                                   "syscall",
-	"syscall.RTM_CHGADDR":                                  "syscall",
-	"syscall.RTM_DELACTION":                                "syscall",
-	"syscall.RTM_DELADDR":                                  "syscall",
-	"syscall.RTM_DELADDRLABEL":                             "syscall",
-	"syscall.RTM_DELETE":                                   "syscall",
-	"syscall.RTM_DELLINK":                                  "syscall",
-	"syscall.RTM_DELMADDR":                                 "syscall",
-	"syscall.RTM_DELNEIGH":                                 "syscall",
-	"syscall.RTM_DELQDISC":                                 "syscall",
-	"syscall.RTM_DELROUTE":                                 "syscall",
-	"syscall.RTM_DELRULE":                                  "syscall",
-	"syscall.RTM_DELTCLASS":                                "syscall",
-	"syscall.RTM_DELTFILTER":                               "syscall",
-	"syscall.RTM_DESYNC":                                   "syscall",
-	"syscall.RTM_F_CLONED":                                 "syscall",
-	"syscall.RTM_F_EQUALIZE":                               "syscall",
-	"syscall.RTM_F_NOTIFY":                                 "syscall",
-	"syscall.RTM_F_PREFIX":                                 "syscall",
-	"syscall.RTM_GET":                                      "syscall",
-	"syscall.RTM_GET2":                                     "syscall",
-	"syscall.RTM_GETACTION":                                "syscall",
-	"syscall.RTM_GETADDR":                                  "syscall",
-	"syscall.RTM_GETADDRLABEL":                             "syscall",
-	"syscall.RTM_GETANYCAST":                               "syscall",
-	"syscall.RTM_GETDCB":                                   "syscall",
-	"syscall.RTM_GETLINK":                                  "syscall",
-	"syscall.RTM_GETMULTICAST":                             "syscall",
-	"syscall.RTM_GETNEIGH":                                 "syscall",
-	"syscall.RTM_GETNEIGHTBL":                              "syscall",
-	"syscall.RTM_GETQDISC":                                 "syscall",
-	"syscall.RTM_GETROUTE":                                 "syscall",
-	"syscall.RTM_GETRULE":                                  "syscall",
-	"syscall.RTM_GETTCLASS":                                "syscall",
-	"syscall.RTM_GETTFILTER":                               "syscall",
-	"syscall.RTM_IEEE80211":                                "syscall",
-	"syscall.RTM_IFANNOUNCE":                               "syscall",
-	"syscall.RTM_IFINFO":                                   "syscall",
-	"syscall.RTM_IFINFO2":                                  "syscall",
-	"syscall.RTM_LLINFO_UPD":                               "syscall",
-	"syscall.RTM_LOCK":                                     "syscall",
-	"syscall.RTM_LOSING":                                   "syscall",
-	"syscall.RTM_MAX":                                      "syscall",
-	"syscall.RTM_MAXSIZE":                                  "syscall",
-	"syscall.RTM_MISS":                                     "syscall",
-	"syscall.RTM_NEWACTION":                                "syscall",
-	"syscall.RTM_NEWADDR":                                  "syscall",
-	"syscall.RTM_NEWADDRLABEL":                             "syscall",
-	"syscall.RTM_NEWLINK":                                  "syscall",
-	"syscall.RTM_NEWMADDR":                                 "syscall",
-	"syscall.RTM_NEWMADDR2":                                "syscall",
-	"syscall.RTM_NEWNDUSEROPT":                             "syscall",
-	"syscall.RTM_NEWNEIGH":                                 "syscall",
-	"syscall.RTM_NEWNEIGHTBL":                              "syscall",
-	"syscall.RTM_NEWPREFIX":                                "syscall",
-	"syscall.RTM_NEWQDISC":                                 "syscall",
-	"syscall.RTM_NEWROUTE":                                 "syscall",
-	"syscall.RTM_NEWRULE":                                  "syscall",
-	"syscall.RTM_NEWTCLASS":                                "syscall",
-	"syscall.RTM_NEWTFILTER":                               "syscall",
-	"syscall.RTM_NR_FAMILIES":                              "syscall",
-	"syscall.RTM_NR_MSGTYPES":                              "syscall",
-	"syscall.RTM_OIFINFO":                                  "syscall",
-	"syscall.RTM_OLDADD":                                   "syscall",
-	"syscall.RTM_OLDDEL":                                   "syscall",
-	"syscall.RTM_OOIFINFO":                                 "syscall",
-	"syscall.RTM_REDIRECT":                                 "syscall",
-	"syscall.RTM_RESOLVE":                                  "syscall",
-	"syscall.RTM_RTTUNIT":                                  "syscall",
-	"syscall.RTM_SETDCB":                                   "syscall",
-	"syscall.RTM_SETGATE":                                  "syscall",
-	"syscall.RTM_SETLINK":                                  "syscall",
-	"syscall.RTM_SETNEIGHTBL":                              "syscall",
-	"syscall.RTM_VERSION":                                  "syscall",
-	"syscall.RTNH_ALIGNTO":                                 "syscall",
-	"syscall.RTNH_F_DEAD":                                  "syscall",
-	"syscall.RTNH_F_ONLINK":                                "syscall",
-	"syscall.RTNH_F_PERVASIVE":                             "syscall",
-	"syscall.RTNLGRP_IPV4_IFADDR":                          "syscall",
-	"syscall.RTNLGRP_IPV4_MROUTE":                          "syscall",
-	"syscall.RTNLGRP_IPV4_ROUTE":                           "syscall",
-	"syscall.RTNLGRP_IPV4_RULE":                            "syscall",
-	"syscall.RTNLGRP_IPV6_IFADDR":                          "syscall",
-	"syscall.RTNLGRP_IPV6_IFINFO":                          "syscall",
-	"syscall.RTNLGRP_IPV6_MROUTE":                          "syscall",
-	"syscall.RTNLGRP_IPV6_PREFIX":                          "syscall",
-	"syscall.RTNLGRP_IPV6_ROUTE":                           "syscall",
-	"syscall.RTNLGRP_IPV6_RULE":                            "syscall",
-	"syscall.RTNLGRP_LINK":                                 "syscall",
-	"syscall.RTNLGRP_ND_USEROPT":                           "syscall",
-	"syscall.RTNLGRP_NEIGH":                                "syscall",
-	"syscall.RTNLGRP_NONE":                                 "syscall",
-	"syscall.RTNLGRP_NOTIFY":                               "syscall",
-	"syscall.RTNLGRP_TC":                                   "syscall",
-	"syscall.RTN_ANYCAST":                                  "syscall",
-	"syscall.RTN_BLACKHOLE":                                "syscall",
-	"syscall.RTN_BROADCAST":                                "syscall",
-	"syscall.RTN_LOCAL":                                    "syscall",
-	"syscall.RTN_MAX":                                      "syscall",
-	"syscall.RTN_MULTICAST":                                "syscall",
-	"syscall.RTN_NAT":                                      "syscall",
-	"syscall.RTN_PROHIBIT":                                 "syscall",
-	"syscall.RTN_THROW":                                    "syscall",
-	"syscall.RTN_UNICAST":                                  "syscall",
-	"syscall.RTN_UNREACHABLE":                              "syscall",
-	"syscall.RTN_UNSPEC":                                   "syscall",
-	"syscall.RTN_XRESOLVE":                                 "syscall",
-	"syscall.RTPROT_BIRD":                                  "syscall",
-	"syscall.RTPROT_BOOT":                                  "syscall",
-	"syscall.RTPROT_DHCP":                                  "syscall",
-	"syscall.RTPROT_DNROUTED":                              "syscall",
-	"syscall.RTPROT_GATED":                                 "syscall",
-	"syscall.RTPROT_KERNEL":                                "syscall",
-	"syscall.RTPROT_MRT":                                   "syscall",
-	"syscall.RTPROT_NTK":                                   "syscall",
-	"syscall.RTPROT_RA":                                    "syscall",
-	"syscall.RTPROT_REDIRECT":                              "syscall",
-	"syscall.RTPROT_STATIC":                                "syscall",
-	"syscall.RTPROT_UNSPEC":                                "syscall",
-	"syscall.RTPROT_XORP":                                  "syscall",
-	"syscall.RTPROT_ZEBRA":                                 "syscall",
-	"syscall.RTV_EXPIRE":                                   "syscall",
-	"syscall.RTV_HOPCOUNT":                                 "syscall",
-	"syscall.RTV_MTU":                                      "syscall",
-	"syscall.RTV_RPIPE":                                    "syscall",
-	"syscall.RTV_RTT":                                      "syscall",
-	"syscall.RTV_RTTVAR":                                   "syscall",
-	"syscall.RTV_SPIPE":                                    "syscall",
-	"syscall.RTV_SSTHRESH":                                 "syscall",
-	"syscall.RTV_WEIGHT":                                   "syscall",
-	"syscall.RT_CACHING_CONTEXT":                           "syscall",
-	"syscall.RT_CLASS_DEFAULT":                             "syscall",
-	"syscall.RT_CLASS_LOCAL":                               "syscall",
-	"syscall.RT_CLASS_MAIN":                                "syscall",
-	"syscall.RT_CLASS_MAX":                                 "syscall",
-	"syscall.RT_CLASS_UNSPEC":                              "syscall",
-	"syscall.RT_DEFAULT_FIB":                               "syscall",
-	"syscall.RT_NORTREF":                                   "syscall",
-	"syscall.RT_SCOPE_HOST":                                "syscall",
-	"syscall.RT_SCOPE_LINK":                                "syscall",
-	"syscall.RT_SCOPE_NOWHERE":                             "syscall",
-	"syscall.RT_SCOPE_SITE":                                "syscall",
-	"syscall.RT_SCOPE_UNIVERSE":                            "syscall",
-	"syscall.RT_TABLEID_MAX":                               "syscall",
-	"syscall.RT_TABLE_COMPAT":                              "syscall",
-	"syscall.RT_TABLE_DEFAULT":                             "syscall",
-	"syscall.RT_TABLE_LOCAL":                               "syscall",
-	"syscall.RT_TABLE_MAIN":                                "syscall",
-	"syscall.RT_TABLE_MAX":                                 "syscall",
-	"syscall.RT_TABLE_UNSPEC":                              "syscall",
-	"syscall.RUSAGE_CHILDREN":                              "syscall",
-	"syscall.RUSAGE_SELF":                                  "syscall",
-	"syscall.RUSAGE_THREAD":                                "syscall",
-	"syscall.Radvisory_t":                                  "syscall",
-	"syscall.RawConn":                                      "syscall",
-	"syscall.RawSockaddr":                                  "syscall",
-	"syscall.RawSockaddrAny":                               "syscall",
-	"syscall.RawSockaddrDatalink":                          "syscall",
-	"syscall.RawSockaddrInet4":                             "syscall",
-	"syscall.RawSockaddrInet6":                             "syscall",
-	"syscall.RawSockaddrLinklayer":                         "syscall",
-	"syscall.RawSockaddrNetlink":                           "syscall",
-	"syscall.RawSockaddrUnix":                              "syscall",
-	"syscall.RawSyscall":                                   "syscall",
-	"syscall.RawSyscall6":                                  "syscall",
-	"syscall.Read":                                         "syscall",
-	"syscall.ReadConsole":                                  "syscall",
-	"syscall.ReadDirectoryChanges":                         "syscall",
-	"syscall.ReadDirent":                                   "syscall",
-	"syscall.ReadFile":                                     "syscall",
-	"syscall.Readlink":                                     "syscall",
-	"syscall.Reboot":                                       "syscall",
-	"syscall.Recvfrom":                                     "syscall",
-	"syscall.Recvmsg":                                      "syscall",
-	"syscall.RegCloseKey":                                  "syscall",
-	"syscall.RegEnumKeyEx":                                 "syscall",
-	"syscall.RegOpenKeyEx":                                 "syscall",
-	"syscall.RegQueryInfoKey":                              "syscall",
-	"syscall.RegQueryValueEx":                              "syscall",
-	"syscall.RemoveDirectory":                              "syscall",
-	"syscall.Removexattr":                                  "syscall",
-	"syscall.Rename":                                       "syscall",
-	"syscall.Renameat":                                     "syscall",
-	"syscall.Revoke":                                       "syscall",
-	"syscall.Rlimit":                                       "syscall",
-	"syscall.Rmdir":                                        "syscall",
-	"syscall.RouteMessage":                                 "syscall",
-	"syscall.RouteRIB":                                     "syscall",
-	"syscall.RtAttr":                                       "syscall",
-	"syscall.RtGenmsg":                                     "syscall",
-	"syscall.RtMetrics":                                    "syscall",
-	"syscall.RtMsg":                                        "syscall",
-	"syscall.RtMsghdr":                                     "syscall",
-	"syscall.RtNexthop":                                    "syscall",
-	"syscall.Rusage":                                       "syscall",
-	"syscall.SCM_BINTIME":                                  "syscall",
-	"syscall.SCM_CREDENTIALS":                              "syscall",
-	"syscall.SCM_CREDS":                                    "syscall",
-	"syscall.SCM_RIGHTS":                                   "syscall",
-	"syscall.SCM_TIMESTAMP":                                "syscall",
-	"syscall.SCM_TIMESTAMPING":                             "syscall",
-	"syscall.SCM_TIMESTAMPNS":                              "syscall",
-	"syscall.SCM_TIMESTAMP_MONOTONIC":                      "syscall",
-	"syscall.SHUT_RD":                                      "syscall",
-	"syscall.SHUT_RDWR":                                    "syscall",
-	"syscall.SHUT_WR":                                      "syscall",
-	"syscall.SID":                                          "syscall",
-	"syscall.SIDAndAttributes":                             "syscall",
-	"syscall.SIGABRT":                                      "syscall",
-	"syscall.SIGALRM":                                      "syscall",
-	"syscall.SIGBUS":                                       "syscall",
-	"syscall.SIGCHLD":                                      "syscall",
-	"syscall.SIGCLD":                                       "syscall",
-	"syscall.SIGCONT":                                      "syscall",
-	"syscall.SIGEMT":                                       "syscall",
-	"syscall.SIGFPE":                                       "syscall",
-	"syscall.SIGHUP":                                       "syscall",
-	"syscall.SIGILL":                                       "syscall",
-	"syscall.SIGINFO":                                      "syscall",
-	"syscall.SIGINT":                                       "syscall",
-	"syscall.SIGIO":                                        "syscall",
-	"syscall.SIGIOT":                                       "syscall",
-	"syscall.SIGKILL":                                      "syscall",
-	"syscall.SIGLIBRT":                                     "syscall",
-	"syscall.SIGLWP":                                       "syscall",
-	"syscall.SIGPIPE":                                      "syscall",
-	"syscall.SIGPOLL":                                      "syscall",
-	"syscall.SIGPROF":                                      "syscall",
-	"syscall.SIGPWR":                                       "syscall",
-	"syscall.SIGQUIT":                                      "syscall",
-	"syscall.SIGSEGV":                                      "syscall",
-	"syscall.SIGSTKFLT":                                    "syscall",
-	"syscall.SIGSTOP":                                      "syscall",
-	"syscall.SIGSYS":                                       "syscall",
-	"syscall.SIGTERM":                                      "syscall",
-	"syscall.SIGTHR":                                       "syscall",
-	"syscall.SIGTRAP":                                      "syscall",
-	"syscall.SIGTSTP":                                      "syscall",
-	"syscall.SIGTTIN":                                      "syscall",
-	"syscall.SIGTTOU":                                      "syscall",
-	"syscall.SIGUNUSED":                                    "syscall",
-	"syscall.SIGURG":                                       "syscall",
-	"syscall.SIGUSR1":                                      "syscall",
-	"syscall.SIGUSR2":                                      "syscall",
-	"syscall.SIGVTALRM":                                    "syscall",
-	"syscall.SIGWINCH":                                     "syscall",
-	"syscall.SIGXCPU":                                      "syscall",
-	"syscall.SIGXFSZ":                                      "syscall",
-	"syscall.SIOCADDDLCI":                                  "syscall",
-	"syscall.SIOCADDMULTI":                                 "syscall",
-	"syscall.SIOCADDRT":                                    "syscall",
-	"syscall.SIOCAIFADDR":                                  "syscall",
-	"syscall.SIOCAIFGROUP":                                 "syscall",
-	"syscall.SIOCALIFADDR":                                 "syscall",
-	"syscall.SIOCARPIPLL":                                  "syscall",
-	"syscall.SIOCATMARK":                                   "syscall",
-	"syscall.SIOCAUTOADDR":                                 "syscall",
-	"syscall.SIOCAUTONETMASK":                              "syscall",
-	"syscall.SIOCBRDGADD":                                  "syscall",
-	"syscall.SIOCBRDGADDS":                                 "syscall",
-	"syscall.SIOCBRDGARL":                                  "syscall",
-	"syscall.SIOCBRDGDADDR":                                "syscall",
-	"syscall.SIOCBRDGDEL":                                  "syscall",
-	"syscall.SIOCBRDGDELS":                                 "syscall",
-	"syscall.SIOCBRDGFLUSH":                                "syscall",
-	"syscall.SIOCBRDGFRL":                                  "syscall",
-	"syscall.SIOCBRDGGCACHE":                               "syscall",
-	"syscall.SIOCBRDGGFD":                                  "syscall",
-	"syscall.SIOCBRDGGHT":                                  "syscall",
-	"syscall.SIOCBRDGGIFFLGS":                              "syscall",
-	"syscall.SIOCBRDGGMA":                                  "syscall",
-	"syscall.SIOCBRDGGPARAM":                               "syscall",
-	"syscall.SIOCBRDGGPRI":                                 "syscall",
-	"syscall.SIOCBRDGGRL":                                  "syscall",
-	"syscall.SIOCBRDGGSIFS":                                "syscall",
-	"syscall.SIOCBRDGGTO":                                  "syscall",
-	"syscall.SIOCBRDGIFS":                                  "syscall",
-	"syscall.SIOCBRDGRTS":                                  "syscall",
-	"syscall.SIOCBRDGSADDR":                                "syscall",
-	"syscall.SIOCBRDGSCACHE":                               "syscall",
-	"syscall.SIOCBRDGSFD":                                  "syscall",
-	"syscall.SIOCBRDGSHT":                                  "syscall",
-	"syscall.SIOCBRDGSIFCOST":                              "syscall",
-	"syscall.SIOCBRDGSIFFLGS":                              "syscall",
-	"syscall.SIOCBRDGSIFPRIO":                              "syscall",
-	"syscall.SIOCBRDGSMA":                                  "syscall",
-	"syscall.SIOCBRDGSPRI":                                 "syscall",
-	"syscall.SIOCBRDGSPROTO":                               "syscall",
-	"syscall.SIOCBRDGSTO":                                  "syscall",
-	"syscall.SIOCBRDGSTXHC":                                "syscall",
-	"syscall.SIOCDARP":                                     "syscall",
-	"syscall.SIOCDELDLCI":                                  "syscall",
-	"syscall.SIOCDELMULTI":                                 "syscall",
-	"syscall.SIOCDELRT":                                    "syscall",
-	"syscall.SIOCDEVPRIVATE":                               "syscall",
-	"syscall.SIOCDIFADDR":                                  "syscall",
-	"syscall.SIOCDIFGROUP":                                 "syscall",
-	"syscall.SIOCDIFPHYADDR":                               "syscall",
-	"syscall.SIOCDLIFADDR":                                 "syscall",
-	"syscall.SIOCDRARP":                                    "syscall",
-	"syscall.SIOCGARP":                                     "syscall",
-	"syscall.SIOCGDRVSPEC":                                 "syscall",
-	"syscall.SIOCGETKALIVE":                                "syscall",
-	"syscall.SIOCGETLABEL":                                 "syscall",
-	"syscall.SIOCGETPFLOW":                                 "syscall",
-	"syscall.SIOCGETPFSYNC":                                "syscall",
-	"syscall.SIOCGETSGCNT":                                 "syscall",
-	"syscall.SIOCGETVIFCNT":                                "syscall",
-	"syscall.SIOCGETVLAN":                                  "syscall",
-	"syscall.SIOCGHIWAT":                                   "syscall",
-	"syscall.SIOCGIFADDR":                                  "syscall",
-	"syscall.SIOCGIFADDRPREF":                              "syscall",
-	"syscall.SIOCGIFALIAS":                                 "syscall",
-	"syscall.SIOCGIFALTMTU":                                "syscall",
-	"syscall.SIOCGIFASYNCMAP":                              "syscall",
-	"syscall.SIOCGIFBOND":                                  "syscall",
-	"syscall.SIOCGIFBR":                                    "syscall",
-	"syscall.SIOCGIFBRDADDR":                               "syscall",
-	"syscall.SIOCGIFCAP":                                   "syscall",
-	"syscall.SIOCGIFCONF":                                  "syscall",
-	"syscall.SIOCGIFCOUNT":                                 "syscall",
-	"syscall.SIOCGIFDATA":                                  "syscall",
-	"syscall.SIOCGIFDESCR":                                 "syscall",
-	"syscall.SIOCGIFDEVMTU":                                "syscall",
-	"syscall.SIOCGIFDLT":                                   "syscall",
-	"syscall.SIOCGIFDSTADDR":                               "syscall",
-	"syscall.SIOCGIFENCAP":                                 "syscall",
-	"syscall.SIOCGIFFIB":                                   "syscall",
-	"syscall.SIOCGIFFLAGS":                                 "syscall",
-	"syscall.SIOCGIFGATTR":                                 "syscall",
-	"syscall.SIOCGIFGENERIC":                               "syscall",
-	"syscall.SIOCGIFGMEMB":                                 "syscall",
-	"syscall.SIOCGIFGROUP":                                 "syscall",
-	"syscall.SIOCGIFHARDMTU":                               "syscall",
-	"syscall.SIOCGIFHWADDR":                                "syscall",
-	"syscall.SIOCGIFINDEX":                                 "syscall",
-	"syscall.SIOCGIFKPI":                                   "syscall",
-	"syscall.SIOCGIFMAC":                                   "syscall",
-	"syscall.SIOCGIFMAP":                                   "syscall",
-	"syscall.SIOCGIFMEDIA":                                 "syscall",
-	"syscall.SIOCGIFMEM":                                   "syscall",
-	"syscall.SIOCGIFMETRIC":                                "syscall",
-	"syscall.SIOCGIFMTU":                                   "syscall",
-	"syscall.SIOCGIFNAME":                                  "syscall",
-	"syscall.SIOCGIFNETMASK":                               "syscall",
-	"syscall.SIOCGIFPDSTADDR":                              "syscall",
-	"syscall.SIOCGIFPFLAGS":                                "syscall",
-	"syscall.SIOCGIFPHYS":                                  "syscall",
-	"syscall.SIOCGIFPRIORITY":                              "syscall",
-	"syscall.SIOCGIFPSRCADDR":                              "syscall",
-	"syscall.SIOCGIFRDOMAIN":                               "syscall",
-	"syscall.SIOCGIFRTLABEL":                               "syscall",
-	"syscall.SIOCGIFSLAVE":                                 "syscall",
-	"syscall.SIOCGIFSTATUS":                                "syscall",
-	"syscall.SIOCGIFTIMESLOT":                              "syscall",
-	"syscall.SIOCGIFTXQLEN":                                "syscall",
-	"syscall.SIOCGIFVLAN":                                  "syscall",
-	"syscall.SIOCGIFWAKEFLAGS":                             "syscall",
-	"syscall.SIOCGIFXFLAGS":                                "syscall",
-	"syscall.SIOCGLIFADDR":                                 "syscall",
-	"syscall.SIOCGLIFPHYADDR":                              "syscall",
-	"syscall.SIOCGLIFPHYRTABLE":                            "syscall",
-	"syscall.SIOCGLIFPHYTTL":                               "syscall",
-	"syscall.SIOCGLINKSTR":                                 "syscall",
-	"syscall.SIOCGLOWAT":                                   "syscall",
-	"syscall.SIOCGPGRP":                                    "syscall",
-	"syscall.SIOCGPRIVATE_0":                               "syscall",
-	"syscall.SIOCGPRIVATE_1":                               "syscall",
-	"syscall.SIOCGRARP":                                    "syscall",
-	"syscall.SIOCGSPPPPARAMS":                              "syscall",
-	"syscall.SIOCGSTAMP":                                   "syscall",
-	"syscall.SIOCGSTAMPNS":                                 "syscall",
-	"syscall.SIOCGVH":                                      "syscall",
-	"syscall.SIOCGVNETID":                                  "syscall",
-	"syscall.SIOCIFCREATE":                                 "syscall",
-	"syscall.SIOCIFCREATE2":                                "syscall",
-	"syscall.SIOCIFDESTROY":                                "syscall",
-	"syscall.SIOCIFGCLONERS":                               "syscall",
-	"syscall.SIOCINITIFADDR":                               "syscall",
-	"syscall.SIOCPROTOPRIVATE":                             "syscall",
-	"syscall.SIOCRSLVMULTI":                                "syscall",
-	"syscall.SIOCRTMSG":                                    "syscall",
-	"syscall.SIOCSARP":                                     "syscall",
-	"syscall.SIOCSDRVSPEC":                                 "syscall",
-	"syscall.SIOCSETKALIVE":                                "syscall",
-	"syscall.SIOCSETLABEL":                                 "syscall",
-	"syscall.SIOCSETPFLOW":                                 "syscall",
-	"syscall.SIOCSETPFSYNC":                                "syscall",
-	"syscall.SIOCSETVLAN":                                  "syscall",
-	"syscall.SIOCSHIWAT":                                   "syscall",
-	"syscall.SIOCSIFADDR":                                  "syscall",
-	"syscall.SIOCSIFADDRPREF":                              "syscall",
-	"syscall.SIOCSIFALTMTU":                                "syscall",
-	"syscall.SIOCSIFASYNCMAP":                              "syscall",
-	"syscall.SIOCSIFBOND":                                  "syscall",
-	"syscall.SIOCSIFBR":                                    "syscall",
-	"syscall.SIOCSIFBRDADDR":                               "syscall",
-	"syscall.SIOCSIFCAP":                                   "syscall",
-	"syscall.SIOCSIFDESCR":                                 "syscall",
-	"syscall.SIOCSIFDSTADDR":                               "syscall",
-	"syscall.SIOCSIFENCAP":                                 "syscall",
-	"syscall.SIOCSIFFIB":                                   "syscall",
-	"syscall.SIOCSIFFLAGS":                                 "syscall",
-	"syscall.SIOCSIFGATTR":                                 "syscall",
-	"syscall.SIOCSIFGENERIC":                               "syscall",
-	"syscall.SIOCSIFHWADDR":                                "syscall",
-	"syscall.SIOCSIFHWBROADCAST":                           "syscall",
-	"syscall.SIOCSIFKPI":                                   "syscall",
-	"syscall.SIOCSIFLINK":                                  "syscall",
-	"syscall.SIOCSIFLLADDR":                                "syscall",
-	"syscall.SIOCSIFMAC":                                   "syscall",
-	"syscall.SIOCSIFMAP":                                   "syscall",
-	"syscall.SIOCSIFMEDIA":                                 "syscall",
-	"syscall.SIOCSIFMEM":                                   "syscall",
-	"syscall.SIOCSIFMETRIC":                                "syscall",
-	"syscall.SIOCSIFMTU":                                   "syscall",
-	"syscall.SIOCSIFNAME":                                  "syscall",
-	"syscall.SIOCSIFNETMASK":                               "syscall",
-	"syscall.SIOCSIFPFLAGS":                                "syscall",
-	"syscall.SIOCSIFPHYADDR":                               "syscall",
-	"syscall.SIOCSIFPHYS":                                  "syscall",
-	"syscall.SIOCSIFPRIORITY":                              "syscall",
-	"syscall.SIOCSIFRDOMAIN":                               "syscall",
-	"syscall.SIOCSIFRTLABEL":                               "syscall",
-	"syscall.SIOCSIFRVNET":                                 "syscall",
-	"syscall.SIOCSIFSLAVE":                                 "syscall",
-	"syscall.SIOCSIFTIMESLOT":                              "syscall",
-	"syscall.SIOCSIFTXQLEN":                                "syscall",
-	"syscall.SIOCSIFVLAN":                                  "syscall",
-	"syscall.SIOCSIFVNET":                                  "syscall",
-	"syscall.SIOCSIFXFLAGS":                                "syscall",
-	"syscall.SIOCSLIFPHYADDR":                              "syscall",
-	"syscall.SIOCSLIFPHYRTABLE":                            "syscall",
-	"syscall.SIOCSLIFPHYTTL":                               "syscall",
-	"syscall.SIOCSLINKSTR":                                 "syscall",
-	"syscall.SIOCSLOWAT":                                   "syscall",
-	"syscall.SIOCSPGRP":                                    "syscall",
-	"syscall.SIOCSRARP":                                    "syscall",
-	"syscall.SIOCSSPPPPARAMS":                              "syscall",
-	"syscall.SIOCSVH":                                      "syscall",
-	"syscall.SIOCSVNETID":                                  "syscall",
-	"syscall.SIOCZIFDATA":                                  "syscall",
-	"syscall.SIO_GET_EXTENSION_FUNCTION_POINTER":           "syscall",
-	"syscall.SIO_GET_INTERFACE_LIST":                       "syscall",
-	"syscall.SIO_KEEPALIVE_VALS":                           "syscall",
-	"syscall.SIO_UDP_CONNRESET":                            "syscall",
-	"syscall.SOCK_CLOEXEC":                                 "syscall",
-	"syscall.SOCK_DCCP":                                    "syscall",
-	"syscall.SOCK_DGRAM":                                   "syscall",
-	"syscall.SOCK_FLAGS_MASK":                              "syscall",
-	"syscall.SOCK_MAXADDRLEN":                              "syscall",
-	"syscall.SOCK_NONBLOCK":                                "syscall",
-	"syscall.SOCK_NOSIGPIPE":                               "syscall",
-	"syscall.SOCK_PACKET":                                  "syscall",
-	"syscall.SOCK_RAW":                                     "syscall",
-	"syscall.SOCK_RDM":                                     "syscall",
-	"syscall.SOCK_SEQPACKET":                               "syscall",
-	"syscall.SOCK_STREAM":                                  "syscall",
-	"syscall.SOL_AAL":                                      "syscall",
-	"syscall.SOL_ATM":                                      "syscall",
-	"syscall.SOL_DECNET":                                   "syscall",
-	"syscall.SOL_ICMPV6":                                   "syscall",
-	"syscall.SOL_IP":                                       "syscall",
-	"syscall.SOL_IPV6":                                     "syscall",
-	"syscall.SOL_IRDA":                                     "syscall",
-	"syscall.SOL_PACKET":                                   "syscall",
-	"syscall.SOL_RAW":                                      "syscall",
-	"syscall.SOL_SOCKET":                                   "syscall",
-	"syscall.SOL_TCP":                                      "syscall",
-	"syscall.SOL_X25":                                      "syscall",
-	"syscall.SOMAXCONN":                                    "syscall",
-	"syscall.SO_ACCEPTCONN":                                "syscall",
-	"syscall.SO_ACCEPTFILTER":                              "syscall",
-	"syscall.SO_ATTACH_FILTER":                             "syscall",
-	"syscall.SO_BINDANY":                                   "syscall",
-	"syscall.SO_BINDTODEVICE":                              "syscall",
-	"syscall.SO_BINTIME":                                   "syscall",
-	"syscall.SO_BROADCAST":                                 "syscall",
-	"syscall.SO_BSDCOMPAT":                                 "syscall",
-	"syscall.SO_DEBUG":                                     "syscall",
-	"syscall.SO_DETACH_FILTER":                             "syscall",
-	"syscall.SO_DOMAIN":                                    "syscall",
-	"syscall.SO_DONTROUTE":                                 "syscall",
-	"syscall.SO_DONTTRUNC":                                 "syscall",
-	"syscall.SO_ERROR":                                     "syscall",
-	"syscall.SO_KEEPALIVE":                                 "syscall",
-	"syscall.SO_LABEL":                                     "syscall",
-	"syscall.SO_LINGER":                                    "syscall",
-	"syscall.SO_LINGER_SEC":                                "syscall",
-	"syscall.SO_LISTENINCQLEN":                             "syscall",
-	"syscall.SO_LISTENQLEN":                                "syscall",
-	"syscall.SO_LISTENQLIMIT":                              "syscall",
-	"syscall.SO_MARK":                                      "syscall",
-	"syscall.SO_NETPROC":                                   "syscall",
-	"syscall.SO_NKE":                                       "syscall",
-	"syscall.SO_NOADDRERR":                                 "syscall",
-	"syscall.SO_NOHEADER":                                  "syscall",
-	"syscall.SO_NOSIGPIPE":                                 "syscall",
-	"syscall.SO_NOTIFYCONFLICT":                            "syscall",
-	"syscall.SO_NO_CHECK":                                  "syscall",
-	"syscall.SO_NO_DDP":                                    "syscall",
-	"syscall.SO_NO_OFFLOAD":                                "syscall",
-	"syscall.SO_NP_EXTENSIONS":                             "syscall",
-	"syscall.SO_NREAD":                                     "syscall",
-	"syscall.SO_NWRITE":                                    "syscall",
-	"syscall.SO_OOBINLINE":                                 "syscall",
-	"syscall.SO_OVERFLOWED":                                "syscall",
-	"syscall.SO_PASSCRED":                                  "syscall",
-	"syscall.SO_PASSSEC":                                   "syscall",
-	"syscall.SO_PEERCRED":                                  "syscall",
-	"syscall.SO_PEERLABEL":                                 "syscall",
-	"syscall.SO_PEERNAME":                                  "syscall",
-	"syscall.SO_PEERSEC":                                   "syscall",
-	"syscall.SO_PRIORITY":                                  "syscall",
-	"syscall.SO_PROTOCOL":                                  "syscall",
-	"syscall.SO_PROTOTYPE":                                 "syscall",
-	"syscall.SO_RANDOMPORT":                                "syscall",
-	"syscall.SO_RCVBUF":                                    "syscall",
-	"syscall.SO_RCVBUFFORCE":                               "syscall",
-	"syscall.SO_RCVLOWAT":                                  "syscall",
-	"syscall.SO_RCVTIMEO":                                  "syscall",
-	"syscall.SO_RESTRICTIONS":                              "syscall",
-	"syscall.SO_RESTRICT_DENYIN":                           "syscall",
-	"syscall.SO_RESTRICT_DENYOUT":                          "syscall",
-	"syscall.SO_RESTRICT_DENYSET":                          "syscall",
-	"syscall.SO_REUSEADDR":                                 "syscall",
-	"syscall.SO_REUSEPORT":                                 "syscall",
-	"syscall.SO_REUSESHAREUID":                             "syscall",
-	"syscall.SO_RTABLE":                                    "syscall",
-	"syscall.SO_RXQ_OVFL":                                  "syscall",
-	"syscall.SO_SECURITY_AUTHENTICATION":                   "syscall",
-	"syscall.SO_SECURITY_ENCRYPTION_NETWORK":               "syscall",
-	"syscall.SO_SECURITY_ENCRYPTION_TRANSPORT":             "syscall",
-	"syscall.SO_SETFIB":                                    "syscall",
-	"syscall.SO_SNDBUF":                                    "syscall",
-	"syscall.SO_SNDBUFFORCE":                               "syscall",
-	"syscall.SO_SNDLOWAT":                                  "syscall",
-	"syscall.SO_SNDTIMEO":                                  "syscall",
-	"syscall.SO_SPLICE":                                    "syscall",
-	"syscall.SO_TIMESTAMP":                                 "syscall",
-	"syscall.SO_TIMESTAMPING":                              "syscall",
-	"syscall.SO_TIMESTAMPNS":                               "syscall",
-	"syscall.SO_TIMESTAMP_MONOTONIC":                       "syscall",
-	"syscall.SO_TYPE":                                      "syscall",
-	"syscall.SO_UPCALLCLOSEWAIT":                           "syscall",
-	"syscall.SO_UPDATE_ACCEPT_CONTEXT":                     "syscall",
-	"syscall.SO_UPDATE_CONNECT_CONTEXT":                    "syscall",
-	"syscall.SO_USELOOPBACK":                               "syscall",
-	"syscall.SO_USER_COOKIE":                               "syscall",
-	"syscall.SO_VENDOR":                                    "syscall",
-	"syscall.SO_WANTMORE":                                  "syscall",
-	"syscall.SO_WANTOOBFLAG":                               "syscall",
-	"syscall.SSLExtraCertChainPolicyPara":                  "syscall",
-	"syscall.STANDARD_RIGHTS_ALL":                          "syscall",
-	"syscall.STANDARD_RIGHTS_EXECUTE":                      "syscall",
-	"syscall.STANDARD_RIGHTS_READ":                         "syscall",
-	"syscall.STANDARD_RIGHTS_REQUIRED":                     "syscall",
-	"syscall.STANDARD_RIGHTS_WRITE":                        "syscall",
-	"syscall.STARTF_USESHOWWINDOW":                         "syscall",
-	"syscall.STARTF_USESTDHANDLES":                         "syscall",
-	"syscall.STD_ERROR_HANDLE":                             "syscall",
-	"syscall.STD_INPUT_HANDLE":                             "syscall",
-	"syscall.STD_OUTPUT_HANDLE":                            "syscall",
-	"syscall.SUBLANG_ENGLISH_US":                           "syscall",
-	"syscall.SW_FORCEMINIMIZE":                             "syscall",
-	"syscall.SW_HIDE":                                      "syscall",
-	"syscall.SW_MAXIMIZE":                                  "syscall",
-	"syscall.SW_MINIMIZE":                                  "syscall",
-	"syscall.SW_NORMAL":                                    "syscall",
-	"syscall.SW_RESTORE":                                   "syscall",
-	"syscall.SW_SHOW":                                      "syscall",
-	"syscall.SW_SHOWDEFAULT":                               "syscall",
-	"syscall.SW_SHOWMAXIMIZED":                             "syscall",
-	"syscall.SW_SHOWMINIMIZED":                             "syscall",
-	"syscall.SW_SHOWMINNOACTIVE":                           "syscall",
-	"syscall.SW_SHOWNA":                                    "syscall",
-	"syscall.SW_SHOWNOACTIVATE":                            "syscall",
-	"syscall.SW_SHOWNORMAL":                                "syscall",
-	"syscall.SYMBOLIC_LINK_FLAG_DIRECTORY":                 "syscall",
-	"syscall.SYNCHRONIZE":                                  "syscall",
-	"syscall.SYSCTL_VERSION":                               "syscall",
-	"syscall.SYSCTL_VERS_0":                                "syscall",
-	"syscall.SYSCTL_VERS_1":                                "syscall",
-	"syscall.SYSCTL_VERS_MASK":                             "syscall",
-	"syscall.SYS_ABORT2":                                   "syscall",
-	"syscall.SYS_ACCEPT":                                   "syscall",
-	"syscall.SYS_ACCEPT4":                                  "syscall",
-	"syscall.SYS_ACCEPT_NOCANCEL":                          "syscall",
-	"syscall.SYS_ACCESS":                                   "syscall",
-	"syscall.SYS_ACCESS_EXTENDED":                          "syscall",
-	"syscall.SYS_ACCT":                                     "syscall",
-	"syscall.SYS_ADD_KEY":                                  "syscall",
-	"syscall.SYS_ADD_PROFIL":                               "syscall",
-	"syscall.SYS_ADJFREQ":                                  "syscall",
-	"syscall.SYS_ADJTIME":                                  "syscall",
-	"syscall.SYS_ADJTIMEX":                                 "syscall",
-	"syscall.SYS_AFS_SYSCALL":                              "syscall",
-	"syscall.SYS_AIO_CANCEL":                               "syscall",
-	"syscall.SYS_AIO_ERROR":                                "syscall",
-	"syscall.SYS_AIO_FSYNC":                                "syscall",
-	"syscall.SYS_AIO_READ":                                 "syscall",
-	"syscall.SYS_AIO_RETURN":                               "syscall",
-	"syscall.SYS_AIO_SUSPEND":                              "syscall",
-	"syscall.SYS_AIO_SUSPEND_NOCANCEL":                     "syscall",
-	"syscall.SYS_AIO_WRITE":                                "syscall",
-	"syscall.SYS_ALARM":                                    "syscall",
-	"syscall.SYS_ARCH_PRCTL":                               "syscall",
-	"syscall.SYS_ARM_FADVISE64_64":                         "syscall",
-	"syscall.SYS_ARM_SYNC_FILE_RANGE":                      "syscall",
-	"syscall.SYS_ATGETMSG":                                 "syscall",
-	"syscall.SYS_ATPGETREQ":                                "syscall",
-	"syscall.SYS_ATPGETRSP":                                "syscall",
-	"syscall.SYS_ATPSNDREQ":                                "syscall",
-	"syscall.SYS_ATPSNDRSP":                                "syscall",
-	"syscall.SYS_ATPUTMSG":                                 "syscall",
-	"syscall.SYS_ATSOCKET":                                 "syscall",
-	"syscall.SYS_AUDIT":                                    "syscall",
-	"syscall.SYS_AUDITCTL":                                 "syscall",
-	"syscall.SYS_AUDITON":                                  "syscall",
-	"syscall.SYS_AUDIT_SESSION_JOIN":                       "syscall",
-	"syscall.SYS_AUDIT_SESSION_PORT":                       "syscall",
-	"syscall.SYS_AUDIT_SESSION_SELF":                       "syscall",
-	"syscall.SYS_BDFLUSH":                                  "syscall",
-	"syscall.SYS_BIND":                                     "syscall",
-	"syscall.SYS_BINDAT":                                   "syscall",
-	"syscall.SYS_BREAK":                                    "syscall",
-	"syscall.SYS_BRK":                                      "syscall",
-	"syscall.SYS_BSDTHREAD_CREATE":                         "syscall",
-	"syscall.SYS_BSDTHREAD_REGISTER":                       "syscall",
-	"syscall.SYS_BSDTHREAD_TERMINATE":                      "syscall",
-	"syscall.SYS_CAPGET":                                   "syscall",
-	"syscall.SYS_CAPSET":                                   "syscall",
-	"syscall.SYS_CAP_ENTER":                                "syscall",
-	"syscall.SYS_CAP_FCNTLS_GET":                           "syscall",
-	"syscall.SYS_CAP_FCNTLS_LIMIT":                         "syscall",
-	"syscall.SYS_CAP_GETMODE":                              "syscall",
-	"syscall.SYS_CAP_GETRIGHTS":                            "syscall",
-	"syscall.SYS_CAP_IOCTLS_GET":                           "syscall",
-	"syscall.SYS_CAP_IOCTLS_LIMIT":                         "syscall",
-	"syscall.SYS_CAP_NEW":                                  "syscall",
-	"syscall.SYS_CAP_RIGHTS_GET":                           "syscall",
-	"syscall.SYS_CAP_RIGHTS_LIMIT":                         "syscall",
-	"syscall.SYS_CHDIR":                                    "syscall",
-	"syscall.SYS_CHFLAGS":                                  "syscall",
-	"syscall.SYS_CHFLAGSAT":                                "syscall",
-	"syscall.SYS_CHMOD":                                    "syscall",
-	"syscall.SYS_CHMOD_EXTENDED":                           "syscall",
-	"syscall.SYS_CHOWN":                                    "syscall",
-	"syscall.SYS_CHOWN32":                                  "syscall",
-	"syscall.SYS_CHROOT":                                   "syscall",
-	"syscall.SYS_CHUD":                                     "syscall",
-	"syscall.SYS_CLOCK_ADJTIME":                            "syscall",
-	"syscall.SYS_CLOCK_GETCPUCLOCKID2":                     "syscall",
-	"syscall.SYS_CLOCK_GETRES":                             "syscall",
-	"syscall.SYS_CLOCK_GETTIME":                            "syscall",
-	"syscall.SYS_CLOCK_NANOSLEEP":                          "syscall",
-	"syscall.SYS_CLOCK_SETTIME":                            "syscall",
-	"syscall.SYS_CLONE":                                    "syscall",
-	"syscall.SYS_CLOSE":                                    "syscall",
-	"syscall.SYS_CLOSEFROM":                                "syscall",
-	"syscall.SYS_CLOSE_NOCANCEL":                           "syscall",
-	"syscall.SYS_CONNECT":                                  "syscall",
-	"syscall.SYS_CONNECTAT":                                "syscall",
-	"syscall.SYS_CONNECT_NOCANCEL":                         "syscall",
-	"syscall.SYS_COPYFILE":                                 "syscall",
-	"syscall.SYS_CPUSET":                                   "syscall",
-	"syscall.SYS_CPUSET_GETAFFINITY":                       "syscall",
-	"syscall.SYS_CPUSET_GETID":                             "syscall",
-	"syscall.SYS_CPUSET_SETAFFINITY":                       "syscall",
-	"syscall.SYS_CPUSET_SETID":                             "syscall",
-	"syscall.SYS_CREAT":                                    "syscall",
-	"syscall.SYS_CREATE_MODULE":                            "syscall",
-	"syscall.SYS_CSOPS":                                    "syscall",
-	"syscall.SYS_DELETE":                                   "syscall",
-	"syscall.SYS_DELETE_MODULE":                            "syscall",
-	"syscall.SYS_DUP":                                      "syscall",
-	"syscall.SYS_DUP2":                                     "syscall",
-	"syscall.SYS_DUP3":                                     "syscall",
-	"syscall.SYS_EACCESS":                                  "syscall",
-	"syscall.SYS_EPOLL_CREATE":                             "syscall",
-	"syscall.SYS_EPOLL_CREATE1":                            "syscall",
-	"syscall.SYS_EPOLL_CTL":                                "syscall",
-	"syscall.SYS_EPOLL_CTL_OLD":                            "syscall",
-	"syscall.SYS_EPOLL_PWAIT":                              "syscall",
-	"syscall.SYS_EPOLL_WAIT":                               "syscall",
-	"syscall.SYS_EPOLL_WAIT_OLD":                           "syscall",
-	"syscall.SYS_EVENTFD":                                  "syscall",
-	"syscall.SYS_EVENTFD2":                                 "syscall",
-	"syscall.SYS_EXCHANGEDATA":                             "syscall",
-	"syscall.SYS_EXECVE":                                   "syscall",
-	"syscall.SYS_EXIT":                                     "syscall",
-	"syscall.SYS_EXIT_GROUP":                               "syscall",
-	"syscall.SYS_EXTATTRCTL":                               "syscall",
-	"syscall.SYS_EXTATTR_DELETE_FD":                        "syscall",
-	"syscall.SYS_EXTATTR_DELETE_FILE":                      "syscall",
-	"syscall.SYS_EXTATTR_DELETE_LINK":                      "syscall",
-	"syscall.SYS_EXTATTR_GET_FD":                           "syscall",
-	"syscall.SYS_EXTATTR_GET_FILE":                         "syscall",
-	"syscall.SYS_EXTATTR_GET_LINK":                         "syscall",
-	"syscall.SYS_EXTATTR_LIST_FD":                          "syscall",
-	"syscall.SYS_EXTATTR_LIST_FILE":                        "syscall",
-	"syscall.SYS_EXTATTR_LIST_LINK":                        "syscall",
-	"syscall.SYS_EXTATTR_SET_FD":                           "syscall",
-	"syscall.SYS_EXTATTR_SET_FILE":                         "syscall",
-	"syscall.SYS_EXTATTR_SET_LINK":                         "syscall",
-	"syscall.SYS_FACCESSAT":                                "syscall",
-	"syscall.SYS_FADVISE64":                                "syscall",
-	"syscall.SYS_FADVISE64_64":                             "syscall",
-	"syscall.SYS_FALLOCATE":                                "syscall",
-	"syscall.SYS_FANOTIFY_INIT":                            "syscall",
-	"syscall.SYS_FANOTIFY_MARK":                            "syscall",
-	"syscall.SYS_FCHDIR":                                   "syscall",
-	"syscall.SYS_FCHFLAGS":                                 "syscall",
-	"syscall.SYS_FCHMOD":                                   "syscall",
-	"syscall.SYS_FCHMODAT":                                 "syscall",
-	"syscall.SYS_FCHMOD_EXTENDED":                          "syscall",
-	"syscall.SYS_FCHOWN":                                   "syscall",
-	"syscall.SYS_FCHOWN32":                                 "syscall",
-	"syscall.SYS_FCHOWNAT":                                 "syscall",
-	"syscall.SYS_FCHROOT":                                  "syscall",
-	"syscall.SYS_FCNTL":                                    "syscall",
-	"syscall.SYS_FCNTL64":                                  "syscall",
-	"syscall.SYS_FCNTL_NOCANCEL":                           "syscall",
-	"syscall.SYS_FDATASYNC":                                "syscall",
-	"syscall.SYS_FEXECVE":                                  "syscall",
-	"syscall.SYS_FFCLOCK_GETCOUNTER":                       "syscall",
-	"syscall.SYS_FFCLOCK_GETESTIMATE":                      "syscall",
-	"syscall.SYS_FFCLOCK_SETESTIMATE":                      "syscall",
-	"syscall.SYS_FFSCTL":                                   "syscall",
-	"syscall.SYS_FGETATTRLIST":                             "syscall",
-	"syscall.SYS_FGETXATTR":                                "syscall",
-	"syscall.SYS_FHOPEN":                                   "syscall",
-	"syscall.SYS_FHSTAT":                                   "syscall",
-	"syscall.SYS_FHSTATFS":                                 "syscall",
-	"syscall.SYS_FILEPORT_MAKEFD":                          "syscall",
-	"syscall.SYS_FILEPORT_MAKEPORT":                        "syscall",
-	"syscall.SYS_FKTRACE":                                  "syscall",
-	"syscall.SYS_FLISTXATTR":                               "syscall",
-	"syscall.SYS_FLOCK":                                    "syscall",
-	"syscall.SYS_FORK":                                     "syscall",
-	"syscall.SYS_FPATHCONF":                                "syscall",
-	"syscall.SYS_FREEBSD6_FTRUNCATE":                       "syscall",
-	"syscall.SYS_FREEBSD6_LSEEK":                           "syscall",
-	"syscall.SYS_FREEBSD6_MMAP":                            "syscall",
-	"syscall.SYS_FREEBSD6_PREAD":                           "syscall",
-	"syscall.SYS_FREEBSD6_PWRITE":                          "syscall",
-	"syscall.SYS_FREEBSD6_TRUNCATE":                        "syscall",
-	"syscall.SYS_FREMOVEXATTR":                             "syscall",
-	"syscall.SYS_FSCTL":                                    "syscall",
-	"syscall.SYS_FSETATTRLIST":                             "syscall",
-	"syscall.SYS_FSETXATTR":                                "syscall",
-	"syscall.SYS_FSGETPATH":                                "syscall",
-	"syscall.SYS_FSTAT":                                    "syscall",
-	"syscall.SYS_FSTAT64":                                  "syscall",
-	"syscall.SYS_FSTAT64_EXTENDED":                         "syscall",
-	"syscall.SYS_FSTATAT":                                  "syscall",
-	"syscall.SYS_FSTATAT64":                                "syscall",
-	"syscall.SYS_FSTATFS":                                  "syscall",
-	"syscall.SYS_FSTATFS64":                                "syscall",
-	"syscall.SYS_FSTATV":                                   "syscall",
-	"syscall.SYS_FSTATVFS1":                                "syscall",
-	"syscall.SYS_FSTAT_EXTENDED":                           "syscall",
-	"syscall.SYS_FSYNC":                                    "syscall",
-	"syscall.SYS_FSYNC_NOCANCEL":                           "syscall",
-	"syscall.SYS_FSYNC_RANGE":                              "syscall",
-	"syscall.SYS_FTIME":                                    "syscall",
-	"syscall.SYS_FTRUNCATE":                                "syscall",
-	"syscall.SYS_FTRUNCATE64":                              "syscall",
-	"syscall.SYS_FUTEX":                                    "syscall",
-	"syscall.SYS_FUTIMENS":                                 "syscall",
-	"syscall.SYS_FUTIMES":                                  "syscall",
-	"syscall.SYS_FUTIMESAT":                                "syscall",
-	"syscall.SYS_GETATTRLIST":                              "syscall",
-	"syscall.SYS_GETAUDIT":                                 "syscall",
-	"syscall.SYS_GETAUDIT_ADDR":                            "syscall",
-	"syscall.SYS_GETAUID":                                  "syscall",
-	"syscall.SYS_GETCONTEXT":                               "syscall",
-	"syscall.SYS_GETCPU":                                   "syscall",
-	"syscall.SYS_GETCWD":                                   "syscall",
-	"syscall.SYS_GETDENTS":                                 "syscall",
-	"syscall.SYS_GETDENTS64":                               "syscall",
-	"syscall.SYS_GETDIRENTRIES":                            "syscall",
-	"syscall.SYS_GETDIRENTRIES64":                          "syscall",
-	"syscall.SYS_GETDIRENTRIESATTR":                        "syscall",
-	"syscall.SYS_GETDTABLECOUNT":                           "syscall",
-	"syscall.SYS_GETDTABLESIZE":                            "syscall",
-	"syscall.SYS_GETEGID":                                  "syscall",
-	"syscall.SYS_GETEGID32":                                "syscall",
-	"syscall.SYS_GETEUID":                                  "syscall",
-	"syscall.SYS_GETEUID32":                                "syscall",
-	"syscall.SYS_GETFH":                                    "syscall",
-	"syscall.SYS_GETFSSTAT":                                "syscall",
-	"syscall.SYS_GETFSSTAT64":                              "syscall",
-	"syscall.SYS_GETGID":                                   "syscall",
-	"syscall.SYS_GETGID32":                                 "syscall",
-	"syscall.SYS_GETGROUPS":                                "syscall",
-	"syscall.SYS_GETGROUPS32":                              "syscall",
-	"syscall.SYS_GETHOSTUUID":                              "syscall",
-	"syscall.SYS_GETITIMER":                                "syscall",
-	"syscall.SYS_GETLCID":                                  "syscall",
-	"syscall.SYS_GETLOGIN":                                 "syscall",
-	"syscall.SYS_GETLOGINCLASS":                            "syscall",
-	"syscall.SYS_GETPEERNAME":                              "syscall",
-	"syscall.SYS_GETPGID":                                  "syscall",
-	"syscall.SYS_GETPGRP":                                  "syscall",
-	"syscall.SYS_GETPID":                                   "syscall",
-	"syscall.SYS_GETPMSG":                                  "syscall",
-	"syscall.SYS_GETPPID":                                  "syscall",
-	"syscall.SYS_GETPRIORITY":                              "syscall",
-	"syscall.SYS_GETRESGID":                                "syscall",
-	"syscall.SYS_GETRESGID32":                              "syscall",
-	"syscall.SYS_GETRESUID":                                "syscall",
-	"syscall.SYS_GETRESUID32":                              "syscall",
-	"syscall.SYS_GETRLIMIT":                                "syscall",
-	"syscall.SYS_GETRTABLE":                                "syscall",
-	"syscall.SYS_GETRUSAGE":                                "syscall",
-	"syscall.SYS_GETSGROUPS":                               "syscall",
-	"syscall.SYS_GETSID":                                   "syscall",
-	"syscall.SYS_GETSOCKNAME":                              "syscall",
-	"syscall.SYS_GETSOCKOPT":                               "syscall",
-	"syscall.SYS_GETTHRID":                                 "syscall",
-	"syscall.SYS_GETTID":                                   "syscall",
-	"syscall.SYS_GETTIMEOFDAY":                             "syscall",
-	"syscall.SYS_GETUID":                                   "syscall",
-	"syscall.SYS_GETUID32":                                 "syscall",
-	"syscall.SYS_GETVFSSTAT":                               "syscall",
-	"syscall.SYS_GETWGROUPS":                               "syscall",
-	"syscall.SYS_GETXATTR":                                 "syscall",
-	"syscall.SYS_GET_KERNEL_SYMS":                          "syscall",
-	"syscall.SYS_GET_MEMPOLICY":                            "syscall",
-	"syscall.SYS_GET_ROBUST_LIST":                          "syscall",
-	"syscall.SYS_GET_THREAD_AREA":                          "syscall",
-	"syscall.SYS_GTTY":                                     "syscall",
-	"syscall.SYS_IDENTITYSVC":                              "syscall",
-	"syscall.SYS_IDLE":                                     "syscall",
-	"syscall.SYS_INITGROUPS":                               "syscall",
-	"syscall.SYS_INIT_MODULE":                              "syscall",
-	"syscall.SYS_INOTIFY_ADD_WATCH":                        "syscall",
-	"syscall.SYS_INOTIFY_INIT":                             "syscall",
-	"syscall.SYS_INOTIFY_INIT1":                            "syscall",
-	"syscall.SYS_INOTIFY_RM_WATCH":                         "syscall",
-	"syscall.SYS_IOCTL":                                    "syscall",
-	"syscall.SYS_IOPERM":                                   "syscall",
-	"syscall.SYS_IOPL":                                     "syscall",
-	"syscall.SYS_IOPOLICYSYS":                              "syscall",
-	"syscall.SYS_IOPRIO_GET":                               "syscall",
-	"syscall.SYS_IOPRIO_SET":                               "syscall",
-	"syscall.SYS_IO_CANCEL":                                "syscall",
-	"syscall.SYS_IO_DESTROY":                               "syscall",
-	"syscall.SYS_IO_GETEVENTS":                             "syscall",
-	"syscall.SYS_IO_SETUP":                                 "syscall",
-	"syscall.SYS_IO_SUBMIT":                                "syscall",
-	"syscall.SYS_IPC":                                      "syscall",
-	"syscall.SYS_ISSETUGID":                                "syscall",
-	"syscall.SYS_JAIL":                                     "syscall",
-	"syscall.SYS_JAIL_ATTACH":                              "syscall",
-	"syscall.SYS_JAIL_GET":                                 "syscall",
-	"syscall.SYS_JAIL_REMOVE":                              "syscall",
-	"syscall.SYS_JAIL_SET":                                 "syscall",
-	"syscall.SYS_KDEBUG_TRACE":                             "syscall",
-	"syscall.SYS_KENV":                                     "syscall",
-	"syscall.SYS_KEVENT":                                   "syscall",
-	"syscall.SYS_KEVENT64":                                 "syscall",
-	"syscall.SYS_KEXEC_LOAD":                               "syscall",
-	"syscall.SYS_KEYCTL":                                   "syscall",
-	"syscall.SYS_KILL":                                     "syscall",
-	"syscall.SYS_KLDFIND":                                  "syscall",
-	"syscall.SYS_KLDFIRSTMOD":                              "syscall",
-	"syscall.SYS_KLDLOAD":                                  "syscall",
-	"syscall.SYS_KLDNEXT":                                  "syscall",
-	"syscall.SYS_KLDSTAT":                                  "syscall",
-	"syscall.SYS_KLDSYM":                                   "syscall",
-	"syscall.SYS_KLDUNLOAD":                                "syscall",
-	"syscall.SYS_KLDUNLOADF":                               "syscall",
-	"syscall.SYS_KQUEUE":                                   "syscall",
-	"syscall.SYS_KQUEUE1":                                  "syscall",
-	"syscall.SYS_KTIMER_CREATE":                            "syscall",
-	"syscall.SYS_KTIMER_DELETE":                            "syscall",
-	"syscall.SYS_KTIMER_GETOVERRUN":                        "syscall",
-	"syscall.SYS_KTIMER_GETTIME":                           "syscall",
-	"syscall.SYS_KTIMER_SETTIME":                           "syscall",
-	"syscall.SYS_KTRACE":                                   "syscall",
-	"syscall.SYS_LCHFLAGS":                                 "syscall",
-	"syscall.SYS_LCHMOD":                                   "syscall",
-	"syscall.SYS_LCHOWN":                                   "syscall",
-	"syscall.SYS_LCHOWN32":                                 "syscall",
-	"syscall.SYS_LGETFH":                                   "syscall",
-	"syscall.SYS_LGETXATTR":                                "syscall",
-	"syscall.SYS_LINK":                                     "syscall",
-	"syscall.SYS_LINKAT":                                   "syscall",
-	"syscall.SYS_LIO_LISTIO":                               "syscall",
-	"syscall.SYS_LISTEN":                                   "syscall",
-	"syscall.SYS_LISTXATTR":                                "syscall",
-	"syscall.SYS_LLISTXATTR":                               "syscall",
-	"syscall.SYS_LOCK":                                     "syscall",
-	"syscall.SYS_LOOKUP_DCOOKIE":                           "syscall",
-	"syscall.SYS_LPATHCONF":                                "syscall",
-	"syscall.SYS_LREMOVEXATTR":                             "syscall",
-	"syscall.SYS_LSEEK":                                    "syscall",
-	"syscall.SYS_LSETXATTR":                                "syscall",
-	"syscall.SYS_LSTAT":                                    "syscall",
-	"syscall.SYS_LSTAT64":                                  "syscall",
-	"syscall.SYS_LSTAT64_EXTENDED":                         "syscall",
-	"syscall.SYS_LSTATV":                                   "syscall",
-	"syscall.SYS_LSTAT_EXTENDED":                           "syscall",
-	"syscall.SYS_LUTIMES":                                  "syscall",
-	"syscall.SYS_MAC_SYSCALL":                              "syscall",
-	"syscall.SYS_MADVISE":                                  "syscall",
-	"syscall.SYS_MADVISE1":                                 "syscall",
-	"syscall.SYS_MAXSYSCALL":                               "syscall",
-	"syscall.SYS_MBIND":                                    "syscall",
-	"syscall.SYS_MIGRATE_PAGES":                            "syscall",
-	"syscall.SYS_MINCORE":                                  "syscall",
-	"syscall.SYS_MINHERIT":                                 "syscall",
-	"syscall.SYS_MKCOMPLEX":                                "syscall",
-	"syscall.SYS_MKDIR":                                    "syscall",
-	"syscall.SYS_MKDIRAT":                                  "syscall",
-	"syscall.SYS_MKDIR_EXTENDED":                           "syscall",
-	"syscall.SYS_MKFIFO":                                   "syscall",
-	"syscall.SYS_MKFIFOAT":                                 "syscall",
-	"syscall.SYS_MKFIFO_EXTENDED":                          "syscall",
-	"syscall.SYS_MKNOD":                                    "syscall",
-	"syscall.SYS_MKNODAT":                                  "syscall",
-	"syscall.SYS_MLOCK":                                    "syscall",
-	"syscall.SYS_MLOCKALL":                                 "syscall",
-	"syscall.SYS_MMAP":                                     "syscall",
-	"syscall.SYS_MMAP2":                                    "syscall",
-	"syscall.SYS_MODCTL":                                   "syscall",
-	"syscall.SYS_MODFIND":                                  "syscall",
-	"syscall.SYS_MODFNEXT":                                 "syscall",
-	"syscall.SYS_MODIFY_LDT":                               "syscall",
-	"syscall.SYS_MODNEXT":                                  "syscall",
-	"syscall.SYS_MODSTAT":                                  "syscall",
-	"syscall.SYS_MODWATCH":                                 "syscall",
-	"syscall.SYS_MOUNT":                                    "syscall",
-	"syscall.SYS_MOVE_PAGES":                               "syscall",
-	"syscall.SYS_MPROTECT":                                 "syscall",
-	"syscall.SYS_MPX":                                      "syscall",
-	"syscall.SYS_MQUERY":                                   "syscall",
-	"syscall.SYS_MQ_GETSETATTR":                            "syscall",
-	"syscall.SYS_MQ_NOTIFY":                                "syscall",
-	"syscall.SYS_MQ_OPEN":                                  "syscall",
-	"syscall.SYS_MQ_TIMEDRECEIVE":                          "syscall",
-	"syscall.SYS_MQ_TIMEDSEND":                             "syscall",
-	"syscall.SYS_MQ_UNLINK":                                "syscall",
-	"syscall.SYS_MREMAP":                                   "syscall",
-	"syscall.SYS_MSGCTL":                                   "syscall",
-	"syscall.SYS_MSGGET":                                   "syscall",
-	"syscall.SYS_MSGRCV":                                   "syscall",
-	"syscall.SYS_MSGRCV_NOCANCEL":                          "syscall",
-	"syscall.SYS_MSGSND":                                   "syscall",
-	"syscall.SYS_MSGSND_NOCANCEL":                          "syscall",
-	"syscall.SYS_MSGSYS":                                   "syscall",
-	"syscall.SYS_MSYNC":                                    "syscall",
-	"syscall.SYS_MSYNC_NOCANCEL":                           "syscall",
-	"syscall.SYS_MUNLOCK":                                  "syscall",
-	"syscall.SYS_MUNLOCKALL":                               "syscall",
-	"syscall.SYS_MUNMAP":                                   "syscall",
-	"syscall.SYS_NAME_TO_HANDLE_AT":                        "syscall",
-	"syscall.SYS_NANOSLEEP":                                "syscall",
-	"syscall.SYS_NEWFSTATAT":                               "syscall",
-	"syscall.SYS_NFSCLNT":                                  "syscall",
-	"syscall.SYS_NFSSERVCTL":                               "syscall",
-	"syscall.SYS_NFSSVC":                                   "syscall",
-	"syscall.SYS_NFSTAT":                                   "syscall",
-	"syscall.SYS_NICE":                                     "syscall",
-	"syscall.SYS_NLSTAT":                                   "syscall",
-	"syscall.SYS_NMOUNT":                                   "syscall",
-	"syscall.SYS_NSTAT":                                    "syscall",
-	"syscall.SYS_NTP_ADJTIME":                              "syscall",
-	"syscall.SYS_NTP_GETTIME":                              "syscall",
-	"syscall.SYS_OABI_SYSCALL_BASE":                        "syscall",
-	"syscall.SYS_OBREAK":                                   "syscall",
-	"syscall.SYS_OLDFSTAT":                                 "syscall",
-	"syscall.SYS_OLDLSTAT":                                 "syscall",
-	"syscall.SYS_OLDOLDUNAME":                              "syscall",
-	"syscall.SYS_OLDSTAT":                                  "syscall",
-	"syscall.SYS_OLDUNAME":                                 "syscall",
-	"syscall.SYS_OPEN":                                     "syscall",
-	"syscall.SYS_OPENAT":                                   "syscall",
-	"syscall.SYS_OPENBSD_POLL":                             "syscall",
-	"syscall.SYS_OPEN_BY_HANDLE_AT":                        "syscall",
-	"syscall.SYS_OPEN_EXTENDED":                            "syscall",
-	"syscall.SYS_OPEN_NOCANCEL":                            "syscall",
-	"syscall.SYS_OVADVISE":                                 "syscall",
-	"syscall.SYS_PACCEPT":                                  "syscall",
-	"syscall.SYS_PATHCONF":                                 "syscall",
-	"syscall.SYS_PAUSE":                                    "syscall",
-	"syscall.SYS_PCICONFIG_IOBASE":                         "syscall",
-	"syscall.SYS_PCICONFIG_READ":                           "syscall",
-	"syscall.SYS_PCICONFIG_WRITE":                          "syscall",
-	"syscall.SYS_PDFORK":                                   "syscall",
-	"syscall.SYS_PDGETPID":                                 "syscall",
-	"syscall.SYS_PDKILL":                                   "syscall",
-	"syscall.SYS_PERF_EVENT_OPEN":                          "syscall",
-	"syscall.SYS_PERSONALITY":                              "syscall",
-	"syscall.SYS_PID_HIBERNATE":                            "syscall",
-	"syscall.SYS_PID_RESUME":                               "syscall",
-	"syscall.SYS_PID_SHUTDOWN_SOCKETS":                     "syscall",
-	"syscall.SYS_PID_SUSPEND":                              "syscall",
-	"syscall.SYS_PIPE":                                     "syscall",
-	"syscall.SYS_PIPE2":                                    "syscall",
-	"syscall.SYS_PIVOT_ROOT":                               "syscall",
-	"syscall.SYS_PMC_CONTROL":                              "syscall",
-	"syscall.SYS_PMC_GET_INFO":                             "syscall",
-	"syscall.SYS_POLL":                                     "syscall",
-	"syscall.SYS_POLLTS":                                   "syscall",
-	"syscall.SYS_POLL_NOCANCEL":                            "syscall",
-	"syscall.SYS_POSIX_FADVISE":                            "syscall",
-	"syscall.SYS_POSIX_FALLOCATE":                          "syscall",
-	"syscall.SYS_POSIX_OPENPT":                             "syscall",
-	"syscall.SYS_POSIX_SPAWN":                              "syscall",
-	"syscall.SYS_PPOLL":                                    "syscall",
-	"syscall.SYS_PRCTL":                                    "syscall",
-	"syscall.SYS_PREAD":                                    "syscall",
-	"syscall.SYS_PREAD64":                                  "syscall",
-	"syscall.SYS_PREADV":                                   "syscall",
-	"syscall.SYS_PREAD_NOCANCEL":                           "syscall",
-	"syscall.SYS_PRLIMIT64":                                "syscall",
-	"syscall.SYS_PROCCTL":                                  "syscall",
-	"syscall.SYS_PROCESS_POLICY":                           "syscall",
-	"syscall.SYS_PROCESS_VM_READV":                         "syscall",
-	"syscall.SYS_PROCESS_VM_WRITEV":                        "syscall",
-	"syscall.SYS_PROC_INFO":                                "syscall",
-	"syscall.SYS_PROF":                                     "syscall",
-	"syscall.SYS_PROFIL":                                   "syscall",
-	"syscall.SYS_PSELECT":                                  "syscall",
-	"syscall.SYS_PSELECT6":                                 "syscall",
-	"syscall.SYS_PSET_ASSIGN":                              "syscall",
-	"syscall.SYS_PSET_CREATE":                              "syscall",
-	"syscall.SYS_PSET_DESTROY":                             "syscall",
-	"syscall.SYS_PSYNCH_CVBROAD":                           "syscall",
-	"syscall.SYS_PSYNCH_CVCLRPREPOST":                      "syscall",
-	"syscall.SYS_PSYNCH_CVSIGNAL":                          "syscall",
-	"syscall.SYS_PSYNCH_CVWAIT":                            "syscall",
-	"syscall.SYS_PSYNCH_MUTEXDROP":                         "syscall",
-	"syscall.SYS_PSYNCH_MUTEXWAIT":                         "syscall",
-	"syscall.SYS_PSYNCH_RW_DOWNGRADE":                      "syscall",
-	"syscall.SYS_PSYNCH_RW_LONGRDLOCK":                     "syscall",
-	"syscall.SYS_PSYNCH_RW_RDLOCK":                         "syscall",
-	"syscall.SYS_PSYNCH_RW_UNLOCK":                         "syscall",
-	"syscall.SYS_PSYNCH_RW_UNLOCK2":                        "syscall",
-	"syscall.SYS_PSYNCH_RW_UPGRADE":                        "syscall",
-	"syscall.SYS_PSYNCH_RW_WRLOCK":                         "syscall",
-	"syscall.SYS_PSYNCH_RW_YIELDWRLOCK":                    "syscall",
-	"syscall.SYS_PTRACE":                                   "syscall",
-	"syscall.SYS_PUTPMSG":                                  "syscall",
-	"syscall.SYS_PWRITE":                                   "syscall",
-	"syscall.SYS_PWRITE64":                                 "syscall",
-	"syscall.SYS_PWRITEV":                                  "syscall",
-	"syscall.SYS_PWRITE_NOCANCEL":                          "syscall",
-	"syscall.SYS_QUERY_MODULE":                             "syscall",
-	"syscall.SYS_QUOTACTL":                                 "syscall",
-	"syscall.SYS_RASCTL":                                   "syscall",
-	"syscall.SYS_RCTL_ADD_RULE":                            "syscall",
-	"syscall.SYS_RCTL_GET_LIMITS":                          "syscall",
-	"syscall.SYS_RCTL_GET_RACCT":                           "syscall",
-	"syscall.SYS_RCTL_GET_RULES":                           "syscall",
-	"syscall.SYS_RCTL_REMOVE_RULE":                         "syscall",
-	"syscall.SYS_READ":                                     "syscall",
-	"syscall.SYS_READAHEAD":                                "syscall",
-	"syscall.SYS_READDIR":                                  "syscall",
-	"syscall.SYS_READLINK":                                 "syscall",
-	"syscall.SYS_READLINKAT":                               "syscall",
-	"syscall.SYS_READV":                                    "syscall",
-	"syscall.SYS_READV_NOCANCEL":                           "syscall",
-	"syscall.SYS_READ_NOCANCEL":                            "syscall",
-	"syscall.SYS_REBOOT":                                   "syscall",
-	"syscall.SYS_RECV":                                     "syscall",
-	"syscall.SYS_RECVFROM":                                 "syscall",
-	"syscall.SYS_RECVFROM_NOCANCEL":                        "syscall",
-	"syscall.SYS_RECVMMSG":                                 "syscall",
-	"syscall.SYS_RECVMSG":                                  "syscall",
-	"syscall.SYS_RECVMSG_NOCANCEL":                         "syscall",
-	"syscall.SYS_REMAP_FILE_PAGES":                         "syscall",
-	"syscall.SYS_REMOVEXATTR":                              "syscall",
-	"syscall.SYS_RENAME":                                   "syscall",
-	"syscall.SYS_RENAMEAT":                                 "syscall",
-	"syscall.SYS_REQUEST_KEY":                              "syscall",
-	"syscall.SYS_RESTART_SYSCALL":                          "syscall",
-	"syscall.SYS_REVOKE":                                   "syscall",
-	"syscall.SYS_RFORK":                                    "syscall",
-	"syscall.SYS_RMDIR":                                    "syscall",
-	"syscall.SYS_RTPRIO":                                   "syscall",
-	"syscall.SYS_RTPRIO_THREAD":                            "syscall",
-	"syscall.SYS_RT_SIGACTION":                             "syscall",
-	"syscall.SYS_RT_SIGPENDING":                            "syscall",
-	"syscall.SYS_RT_SIGPROCMASK":                           "syscall",
-	"syscall.SYS_RT_SIGQUEUEINFO":                          "syscall",
-	"syscall.SYS_RT_SIGRETURN":                             "syscall",
-	"syscall.SYS_RT_SIGSUSPEND":                            "syscall",
-	"syscall.SYS_RT_SIGTIMEDWAIT":                          "syscall",
-	"syscall.SYS_RT_TGSIGQUEUEINFO":                        "syscall",
-	"syscall.SYS_SBRK":                                     "syscall",
-	"syscall.SYS_SCHED_GETAFFINITY":                        "syscall",
-	"syscall.SYS_SCHED_GETPARAM":                           "syscall",
-	"syscall.SYS_SCHED_GETSCHEDULER":                       "syscall",
-	"syscall.SYS_SCHED_GET_PRIORITY_MAX":                   "syscall",
-	"syscall.SYS_SCHED_GET_PRIORITY_MIN":                   "syscall",
-	"syscall.SYS_SCHED_RR_GET_INTERVAL":                    "syscall",
-	"syscall.SYS_SCHED_SETAFFINITY":                        "syscall",
-	"syscall.SYS_SCHED_SETPARAM":                           "syscall",
-	"syscall.SYS_SCHED_SETSCHEDULER":                       "syscall",
-	"syscall.SYS_SCHED_YIELD":                              "syscall",
-	"syscall.SYS_SCTP_GENERIC_RECVMSG":                     "syscall",
-	"syscall.SYS_SCTP_GENERIC_SENDMSG":                     "syscall",
-	"syscall.SYS_SCTP_GENERIC_SENDMSG_IOV":                 "syscall",
-	"syscall.SYS_SCTP_PEELOFF":                             "syscall",
-	"syscall.SYS_SEARCHFS":                                 "syscall",
-	"syscall.SYS_SECURITY":                                 "syscall",
-	"syscall.SYS_SELECT":                                   "syscall",
-	"syscall.SYS_SELECT_NOCANCEL":                          "syscall",
-	"syscall.SYS_SEMCONFIG":                                "syscall",
-	"syscall.SYS_SEMCTL":                                   "syscall",
-	"syscall.SYS_SEMGET":                                   "syscall",
-	"syscall.SYS_SEMOP":                                    "syscall",
-	"syscall.SYS_SEMSYS":                                   "syscall",
-	"syscall.SYS_SEMTIMEDOP":                               "syscall",
-	"syscall.SYS_SEM_CLOSE":                                "syscall",
-	"syscall.SYS_SEM_DESTROY":                              "syscall",
-	"syscall.SYS_SEM_GETVALUE":                             "syscall",
-	"syscall.SYS_SEM_INIT":                                 "syscall",
-	"syscall.SYS_SEM_OPEN":                                 "syscall",
-	"syscall.SYS_SEM_POST":                                 "syscall",
-	"syscall.SYS_SEM_TRYWAIT":                              "syscall",
-	"syscall.SYS_SEM_UNLINK":                               "syscall",
-	"syscall.SYS_SEM_WAIT":                                 "syscall",
-	"syscall.SYS_SEM_WAIT_NOCANCEL":                        "syscall",
-	"syscall.SYS_SEND":                                     "syscall",
-	"syscall.SYS_SENDFILE":                                 "syscall",
-	"syscall.SYS_SENDFILE64":                               "syscall",
-	"syscall.SYS_SENDMMSG":                                 "syscall",
-	"syscall.SYS_SENDMSG":                                  "syscall",
-	"syscall.SYS_SENDMSG_NOCANCEL":                         "syscall",
-	"syscall.SYS_SENDTO":                                   "syscall",
-	"syscall.SYS_SENDTO_NOCANCEL":                          "syscall",
-	"syscall.SYS_SETATTRLIST":                              "syscall",
-	"syscall.SYS_SETAUDIT":                                 "syscall",
-	"syscall.SYS_SETAUDIT_ADDR":                            "syscall",
-	"syscall.SYS_SETAUID":                                  "syscall",
-	"syscall.SYS_SETCONTEXT":                               "syscall",
-	"syscall.SYS_SETDOMAINNAME":                            "syscall",
-	"syscall.SYS_SETEGID":                                  "syscall",
-	"syscall.SYS_SETEUID":                                  "syscall",
-	"syscall.SYS_SETFIB":                                   "syscall",
-	"syscall.SYS_SETFSGID":                                 "syscall",
-	"syscall.SYS_SETFSGID32":                               "syscall",
-	"syscall.SYS_SETFSUID":                                 "syscall",
-	"syscall.SYS_SETFSUID32":                               "syscall",
-	"syscall.SYS_SETGID":                                   "syscall",
-	"syscall.SYS_SETGID32":                                 "syscall",
-	"syscall.SYS_SETGROUPS":                                "syscall",
-	"syscall.SYS_SETGROUPS32":                              "syscall",
-	"syscall.SYS_SETHOSTNAME":                              "syscall",
-	"syscall.SYS_SETITIMER":                                "syscall",
-	"syscall.SYS_SETLCID":                                  "syscall",
-	"syscall.SYS_SETLOGIN":                                 "syscall",
-	"syscall.SYS_SETLOGINCLASS":                            "syscall",
-	"syscall.SYS_SETNS":                                    "syscall",
-	"syscall.SYS_SETPGID":                                  "syscall",
-	"syscall.SYS_SETPRIORITY":                              "syscall",
-	"syscall.SYS_SETPRIVEXEC":                              "syscall",
-	"syscall.SYS_SETREGID":                                 "syscall",
-	"syscall.SYS_SETREGID32":                               "syscall",
-	"syscall.SYS_SETRESGID":                                "syscall",
-	"syscall.SYS_SETRESGID32":                              "syscall",
-	"syscall.SYS_SETRESUID":                                "syscall",
-	"syscall.SYS_SETRESUID32":                              "syscall",
-	"syscall.SYS_SETREUID":                                 "syscall",
-	"syscall.SYS_SETREUID32":                               "syscall",
-	"syscall.SYS_SETRLIMIT":                                "syscall",
-	"syscall.SYS_SETRTABLE":                                "syscall",
-	"syscall.SYS_SETSGROUPS":                               "syscall",
-	"syscall.SYS_SETSID":                                   "syscall",
-	"syscall.SYS_SETSOCKOPT":                               "syscall",
-	"syscall.SYS_SETTID":                                   "syscall",
-	"syscall.SYS_SETTID_WITH_PID":                          "syscall",
-	"syscall.SYS_SETTIMEOFDAY":                             "syscall",
-	"syscall.SYS_SETUID":                                   "syscall",
-	"syscall.SYS_SETUID32":                                 "syscall",
-	"syscall.SYS_SETWGROUPS":                               "syscall",
-	"syscall.SYS_SETXATTR":                                 "syscall",
-	"syscall.SYS_SET_MEMPOLICY":                            "syscall",
-	"syscall.SYS_SET_ROBUST_LIST":                          "syscall",
-	"syscall.SYS_SET_THREAD_AREA":                          "syscall",
-	"syscall.SYS_SET_TID_ADDRESS":                          "syscall",
-	"syscall.SYS_SGETMASK":                                 "syscall",
-	"syscall.SYS_SHARED_REGION_CHECK_NP":                   "syscall",
-	"syscall.SYS_SHARED_REGION_MAP_AND_SLIDE_NP":           "syscall",
-	"syscall.SYS_SHMAT":                                    "syscall",
-	"syscall.SYS_SHMCTL":                                   "syscall",
-	"syscall.SYS_SHMDT":                                    "syscall",
-	"syscall.SYS_SHMGET":                                   "syscall",
-	"syscall.SYS_SHMSYS":                                   "syscall",
-	"syscall.SYS_SHM_OPEN":                                 "syscall",
-	"syscall.SYS_SHM_UNLINK":                               "syscall",
-	"syscall.SYS_SHUTDOWN":                                 "syscall",
-	"syscall.SYS_SIGACTION":                                "syscall",
-	"syscall.SYS_SIGALTSTACK":                              "syscall",
-	"syscall.SYS_SIGNAL":                                   "syscall",
-	"syscall.SYS_SIGNALFD":                                 "syscall",
-	"syscall.SYS_SIGNALFD4":                                "syscall",
-	"syscall.SYS_SIGPENDING":                               "syscall",
-	"syscall.SYS_SIGPROCMASK":                              "syscall",
-	"syscall.SYS_SIGQUEUE":                                 "syscall",
-	"syscall.SYS_SIGQUEUEINFO":                             "syscall",
-	"syscall.SYS_SIGRETURN":                                "syscall",
-	"syscall.SYS_SIGSUSPEND":                               "syscall",
-	"syscall.SYS_SIGSUSPEND_NOCANCEL":                      "syscall",
-	"syscall.SYS_SIGTIMEDWAIT":                             "syscall",
-	"syscall.SYS_SIGWAIT":                                  "syscall",
-	"syscall.SYS_SIGWAITINFO":                              "syscall",
-	"syscall.SYS_SOCKET":                                   "syscall",
-	"syscall.SYS_SOCKETCALL":                               "syscall",
-	"syscall.SYS_SOCKETPAIR":                               "syscall",
-	"syscall.SYS_SPLICE":                                   "syscall",
-	"syscall.SYS_SSETMASK":                                 "syscall",
-	"syscall.SYS_SSTK":                                     "syscall",
-	"syscall.SYS_STACK_SNAPSHOT":                           "syscall",
-	"syscall.SYS_STAT":                                     "syscall",
-	"syscall.SYS_STAT64":                                   "syscall",
-	"syscall.SYS_STAT64_EXTENDED":                          "syscall",
-	"syscall.SYS_STATFS":                                   "syscall",
-	"syscall.SYS_STATFS64":                                 "syscall",
-	"syscall.SYS_STATV":                                    "syscall",
-	"syscall.SYS_STATVFS1":                                 "syscall",
-	"syscall.SYS_STAT_EXTENDED":                            "syscall",
-	"syscall.SYS_STIME":                                    "syscall",
-	"syscall.SYS_STTY":                                     "syscall",
-	"syscall.SYS_SWAPCONTEXT":                              "syscall",
-	"syscall.SYS_SWAPCTL":                                  "syscall",
-	"syscall.SYS_SWAPOFF":                                  "syscall",
-	"syscall.SYS_SWAPON":                                   "syscall",
-	"syscall.SYS_SYMLINK":                                  "syscall",
-	"syscall.SYS_SYMLINKAT":                                "syscall",
-	"syscall.SYS_SYNC":                                     "syscall",
-	"syscall.SYS_SYNCFS":                                   "syscall",
-	"syscall.SYS_SYNC_FILE_RANGE":                          "syscall",
-	"syscall.SYS_SYSARCH":                                  "syscall",
-	"syscall.SYS_SYSCALL":                                  "syscall",
-	"syscall.SYS_SYSCALL_BASE":                             "syscall",
-	"syscall.SYS_SYSFS":                                    "syscall",
-	"syscall.SYS_SYSINFO":                                  "syscall",
-	"syscall.SYS_SYSLOG":                                   "syscall",
-	"syscall.SYS_TEE":                                      "syscall",
-	"syscall.SYS_TGKILL":                                   "syscall",
-	"syscall.SYS_THREAD_SELFID":                            "syscall",
-	"syscall.SYS_THR_CREATE":                               "syscall",
-	"syscall.SYS_THR_EXIT":                                 "syscall",
-	"syscall.SYS_THR_KILL":                                 "syscall",
-	"syscall.SYS_THR_KILL2":                                "syscall",
-	"syscall.SYS_THR_NEW":                                  "syscall",
-	"syscall.SYS_THR_SELF":                                 "syscall",
-	"syscall.SYS_THR_SET_NAME":                             "syscall",
-	"syscall.SYS_THR_SUSPEND":                              "syscall",
-	"syscall.SYS_THR_WAKE":                                 "syscall",
-	"syscall.SYS_TIME":                                     "syscall",
-	"syscall.SYS_TIMERFD_CREATE":                           "syscall",
-	"syscall.SYS_TIMERFD_GETTIME":                          "syscall",
-	"syscall.SYS_TIMERFD_SETTIME":                          "syscall",
-	"syscall.SYS_TIMER_CREATE":                             "syscall",
-	"syscall.SYS_TIMER_DELETE":                             "syscall",
-	"syscall.SYS_TIMER_GETOVERRUN":                         "syscall",
-	"syscall.SYS_TIMER_GETTIME":                            "syscall",
-	"syscall.SYS_TIMER_SETTIME":                            "syscall",
-	"syscall.SYS_TIMES":                                    "syscall",
-	"syscall.SYS_TKILL":                                    "syscall",
-	"syscall.SYS_TRUNCATE":                                 "syscall",
-	"syscall.SYS_TRUNCATE64":                               "syscall",
-	"syscall.SYS_TUXCALL":                                  "syscall",
-	"syscall.SYS_UGETRLIMIT":                               "syscall",
-	"syscall.SYS_ULIMIT":                                   "syscall",
-	"syscall.SYS_UMASK":                                    "syscall",
-	"syscall.SYS_UMASK_EXTENDED":                           "syscall",
-	"syscall.SYS_UMOUNT":                                   "syscall",
-	"syscall.SYS_UMOUNT2":                                  "syscall",
-	"syscall.SYS_UNAME":                                    "syscall",
-	"syscall.SYS_UNDELETE":                                 "syscall",
-	"syscall.SYS_UNLINK":                                   "syscall",
-	"syscall.SYS_UNLINKAT":                                 "syscall",
-	"syscall.SYS_UNMOUNT":                                  "syscall",
-	"syscall.SYS_UNSHARE":                                  "syscall",
-	"syscall.SYS_USELIB":                                   "syscall",
-	"syscall.SYS_USTAT":                                    "syscall",
-	"syscall.SYS_UTIME":                                    "syscall",
-	"syscall.SYS_UTIMENSAT":                                "syscall",
-	"syscall.SYS_UTIMES":                                   "syscall",
-	"syscall.SYS_UTRACE":                                   "syscall",
-	"syscall.SYS_UUIDGEN":                                  "syscall",
-	"syscall.SYS_VADVISE":                                  "syscall",
-	"syscall.SYS_VFORK":                                    "syscall",
-	"syscall.SYS_VHANGUP":                                  "syscall",
-	"syscall.SYS_VM86":                                     "syscall",
-	"syscall.SYS_VM86OLD":                                  "syscall",
-	"syscall.SYS_VMSPLICE":                                 "syscall",
-	"syscall.SYS_VM_PRESSURE_MONITOR":                      "syscall",
-	"syscall.SYS_VSERVER":                                  "syscall",
-	"syscall.SYS_WAIT4":                                    "syscall",
-	"syscall.SYS_WAIT4_NOCANCEL":                           "syscall",
-	"syscall.SYS_WAIT6":                                    "syscall",
-	"syscall.SYS_WAITEVENT":                                "syscall",
-	"syscall.SYS_WAITID":                                   "syscall",
-	"syscall.SYS_WAITID_NOCANCEL":                          "syscall",
-	"syscall.SYS_WAITPID":                                  "syscall",
-	"syscall.SYS_WATCHEVENT":                               "syscall",
-	"syscall.SYS_WORKQ_KERNRETURN":                         "syscall",
-	"syscall.SYS_WORKQ_OPEN":                               "syscall",
-	"syscall.SYS_WRITE":                                    "syscall",
-	"syscall.SYS_WRITEV":                                   "syscall",
-	"syscall.SYS_WRITEV_NOCANCEL":                          "syscall",
-	"syscall.SYS_WRITE_NOCANCEL":                           "syscall",
-	"syscall.SYS_YIELD":                                    "syscall",
-	"syscall.SYS__LLSEEK":                                  "syscall",
-	"syscall.SYS__LWP_CONTINUE":                            "syscall",
-	"syscall.SYS__LWP_CREATE":                              "syscall",
-	"syscall.SYS__LWP_CTL":                                 "syscall",
-	"syscall.SYS__LWP_DETACH":                              "syscall",
-	"syscall.SYS__LWP_EXIT":                                "syscall",
-	"syscall.SYS__LWP_GETNAME":                             "syscall",
-	"syscall.SYS__LWP_GETPRIVATE":                          "syscall",
-	"syscall.SYS__LWP_KILL":                                "syscall",
-	"syscall.SYS__LWP_PARK":                                "syscall",
-	"syscall.SYS__LWP_SELF":                                "syscall",
-	"syscall.SYS__LWP_SETNAME":                             "syscall",
-	"syscall.SYS__LWP_SETPRIVATE":                          "syscall",
-	"syscall.SYS__LWP_SUSPEND":                             "syscall",
-	"syscall.SYS__LWP_UNPARK":                              "syscall",
-	"syscall.SYS__LWP_UNPARK_ALL":                          "syscall",
-	"syscall.SYS__LWP_WAIT":                                "syscall",
-	"syscall.SYS__LWP_WAKEUP":                              "syscall",
-	"syscall.SYS__NEWSELECT":                               "syscall",
-	"syscall.SYS__PSET_BIND":                               "syscall",
-	"syscall.SYS__SCHED_GETAFFINITY":                       "syscall",
-	"syscall.SYS__SCHED_GETPARAM":                          "syscall",
-	"syscall.SYS__SCHED_SETAFFINITY":                       "syscall",
-	"syscall.SYS__SCHED_SETPARAM":                          "syscall",
-	"syscall.SYS__SYSCTL":                                  "syscall",
-	"syscall.SYS__UMTX_LOCK":                               "syscall",
-	"syscall.SYS__UMTX_OP":                                 "syscall",
-	"syscall.SYS__UMTX_UNLOCK":                             "syscall",
-	"syscall.SYS___ACL_ACLCHECK_FD":                        "syscall",
-	"syscall.SYS___ACL_ACLCHECK_FILE":                      "syscall",
-	"syscall.SYS___ACL_ACLCHECK_LINK":                      "syscall",
-	"syscall.SYS___ACL_DELETE_FD":                          "syscall",
-	"syscall.SYS___ACL_DELETE_FILE":                        "syscall",
-	"syscall.SYS___ACL_DELETE_LINK":                        "syscall",
-	"syscall.SYS___ACL_GET_FD":                             "syscall",
-	"syscall.SYS___ACL_GET_FILE":                           "syscall",
-	"syscall.SYS___ACL_GET_LINK":                           "syscall",
-	"syscall.SYS___ACL_SET_FD":                             "syscall",
-	"syscall.SYS___ACL_SET_FILE":                           "syscall",
-	"syscall.SYS___ACL_SET_LINK":                           "syscall",
-	"syscall.SYS___CLONE":                                  "syscall",
-	"syscall.SYS___DISABLE_THREADSIGNAL":                   "syscall",
-	"syscall.SYS___GETCWD":                                 "syscall",
-	"syscall.SYS___GETLOGIN":                               "syscall",
-	"syscall.SYS___GET_TCB":                                "syscall",
-	"syscall.SYS___MAC_EXECVE":                             "syscall",
-	"syscall.SYS___MAC_GETFSSTAT":                          "syscall",
-	"syscall.SYS___MAC_GET_FD":                             "syscall",
-	"syscall.SYS___MAC_GET_FILE":                           "syscall",
-	"syscall.SYS___MAC_GET_LCID":                           "syscall",
-	"syscall.SYS___MAC_GET_LCTX":                           "syscall",
-	"syscall.SYS___MAC_GET_LINK":                           "syscall",
-	"syscall.SYS___MAC_GET_MOUNT":                          "syscall",
-	"syscall.SYS___MAC_GET_PID":                            "syscall",
-	"syscall.SYS___MAC_GET_PROC":                           "syscall",
-	"syscall.SYS___MAC_MOUNT":                              "syscall",
-	"syscall.SYS___MAC_SET_FD":                             "syscall",
-	"syscall.SYS___MAC_SET_FILE":                           "syscall",
-	"syscall.SYS___MAC_SET_LCTX":                           "syscall",
-	"syscall.SYS___MAC_SET_LINK":                           "syscall",
-	"syscall.SYS___MAC_SET_PROC":                           "syscall",
-	"syscall.SYS___MAC_SYSCALL":                            "syscall",
-	"syscall.SYS___OLD_SEMWAIT_SIGNAL":                     "syscall",
-	"syscall.SYS___OLD_SEMWAIT_SIGNAL_NOCANCEL":            "syscall",
-	"syscall.SYS___POSIX_CHOWN":                            "syscall",
-	"syscall.SYS___POSIX_FCHOWN":                           "syscall",
-	"syscall.SYS___POSIX_LCHOWN":                           "syscall",
-	"syscall.SYS___POSIX_RENAME":                           "syscall",
-	"syscall.SYS___PTHREAD_CANCELED":                       "syscall",
-	"syscall.SYS___PTHREAD_CHDIR":                          "syscall",
-	"syscall.SYS___PTHREAD_FCHDIR":                         "syscall",
-	"syscall.SYS___PTHREAD_KILL":                           "syscall",
-	"syscall.SYS___PTHREAD_MARKCANCEL":                     "syscall",
-	"syscall.SYS___PTHREAD_SIGMASK":                        "syscall",
-	"syscall.SYS___QUOTACTL":                               "syscall",
-	"syscall.SYS___SEMCTL":                                 "syscall",
-	"syscall.SYS___SEMWAIT_SIGNAL":                         "syscall",
-	"syscall.SYS___SEMWAIT_SIGNAL_NOCANCEL":                "syscall",
-	"syscall.SYS___SETLOGIN":                               "syscall",
-	"syscall.SYS___SETUGID":                                "syscall",
-	"syscall.SYS___SET_TCB":                                "syscall",
-	"syscall.SYS___SIGACTION_SIGTRAMP":                     "syscall",
-	"syscall.SYS___SIGTIMEDWAIT":                           "syscall",
-	"syscall.SYS___SIGWAIT":                                "syscall",
-	"syscall.SYS___SIGWAIT_NOCANCEL":                       "syscall",
-	"syscall.SYS___SYSCTL":                                 "syscall",
-	"syscall.SYS___TFORK":                                  "syscall",
-	"syscall.SYS___THREXIT":                                "syscall",
-	"syscall.SYS___THRSIGDIVERT":                           "syscall",
-	"syscall.SYS___THRSLEEP":                               "syscall",
-	"syscall.SYS___THRWAKEUP":                              "syscall",
-	"syscall.S_ARCH1":                                      "syscall",
-	"syscall.S_ARCH2":                                      "syscall",
-	"syscall.S_BLKSIZE":                                    "syscall",
-	"syscall.S_IEXEC":                                      "syscall",
-	"syscall.S_IFBLK":                                      "syscall",
-	"syscall.S_IFCHR":                                      "syscall",
-	"syscall.S_IFDIR":                                      "syscall",
-	"syscall.S_IFIFO":                                      "syscall",
-	"syscall.S_IFLNK":                                      "syscall",
-	"syscall.S_IFMT":                                       "syscall",
-	"syscall.S_IFREG":                                      "syscall",
-	"syscall.S_IFSOCK":                                     "syscall",
-	"syscall.S_IFWHT":                                      "syscall",
-	"syscall.S_IREAD":                                      "syscall",
-	"syscall.S_IRGRP":                                      "syscall",
-	"syscall.S_IROTH":                                      "syscall",
-	"syscall.S_IRUSR":                                      "syscall",
-	"syscall.S_IRWXG":                                      "syscall",
-	"syscall.S_IRWXO":                                      "syscall",
-	"syscall.S_IRWXU":                                      "syscall",
-	"syscall.S_ISGID":                                      "syscall",
-	"syscall.S_ISTXT":                                      "syscall",
-	"syscall.S_ISUID":                                      "syscall",
-	"syscall.S_ISVTX":                                      "syscall",
-	"syscall.S_IWGRP":                                      "syscall",
-	"syscall.S_IWOTH":                                      "syscall",
-	"syscall.S_IWRITE":                                     "syscall",
-	"syscall.S_IWUSR":                                      "syscall",
-	"syscall.S_IXGRP":                                      "syscall",
-	"syscall.S_IXOTH":                                      "syscall",
-	"syscall.S_IXUSR":                                      "syscall",
-	"syscall.S_LOGIN_SET":                                  "syscall",
-	"syscall.SecurityAttributes":                           "syscall",
-	"syscall.Seek":                                         "syscall",
-	"syscall.Select":                                       "syscall",
-	"syscall.Sendfile":                                     "syscall",
-	"syscall.Sendmsg":                                      "syscall",
-	"syscall.SendmsgN":                                     "syscall",
-	"syscall.Sendto":                                       "syscall",
-	"syscall.Servent":                                      "syscall",
-	"syscall.SetBpf":                                       "syscall",
-	"syscall.SetBpfBuflen":                                 "syscall",
-	"syscall.SetBpfDatalink":                               "syscall",
-	"syscall.SetBpfHeadercmpl":                             "syscall",
-	"syscall.SetBpfImmediate":                              "syscall",
-	"syscall.SetBpfInterface":                              "syscall",
-	"syscall.SetBpfPromisc":                                "syscall",
-	"syscall.SetBpfTimeout":                                "syscall",
-	"syscall.SetCurrentDirectory":                          "syscall",
-	"syscall.SetEndOfFile":                                 "syscall",
-	"syscall.SetEnvironmentVariable":                       "syscall",
-	"syscall.SetFileAttributes":                            "syscall",
-	"syscall.SetFileCompletionNotificationModes":           "syscall",
-	"syscall.SetFilePointer":                               "syscall",
-	"syscall.SetFileTime":                                  "syscall",
-	"syscall.SetHandleInformation":                         "syscall",
-	"syscall.SetKevent":                                    "syscall",
-	"syscall.SetLsfPromisc":                                "syscall",
-	"syscall.SetNonblock":                                  "syscall",
-	"syscall.Setdomainname":                                "syscall",
-	"syscall.Setegid":                                      "syscall",
-	"syscall.Setenv":                                       "syscall",
-	"syscall.Seteuid":                                      "syscall",
-	"syscall.Setfsgid":                                     "syscall",
-	"syscall.Setfsuid":                                     "syscall",
-	"syscall.Setgid":                                       "syscall",
-	"syscall.Setgroups":                                    "syscall",
-	"syscall.Sethostname":                                  "syscall",
-	"syscall.Setlogin":                                     "syscall",
-	"syscall.Setpgid":                                      "syscall",
-	"syscall.Setpriority":                                  "syscall",
-	"syscall.Setprivexec":                                  "syscall",
-	"syscall.Setregid":                                     "syscall",
-	"syscall.Setresgid":                                    "syscall",
-	"syscall.Setresuid":                                    "syscall",
-	"syscall.Setreuid":                                     "syscall",
-	"syscall.Setrlimit":                                    "syscall",
-	"syscall.Setsid":                                       "syscall",
-	"syscall.Setsockopt":                                   "syscall",
-	"syscall.SetsockoptByte":                               "syscall",
-	"syscall.SetsockoptICMPv6Filter":                       "syscall",
-	"syscall.SetsockoptIPMreq":                             "syscall",
-	"syscall.SetsockoptIPMreqn":                            "syscall",
-	"syscall.SetsockoptIPv6Mreq":                           "syscall",
-	"syscall.SetsockoptInet4Addr":                          "syscall",
-	"syscall.SetsockoptInt":                                "syscall",
-	"syscall.SetsockoptLinger":                             "syscall",
-	"syscall.SetsockoptString":                             "syscall",
-	"syscall.SetsockoptTimeval":                            "syscall",
-	"syscall.Settimeofday":                                 "syscall",
-	"syscall.Setuid":                                       "syscall",
-	"syscall.Setxattr":                                     "syscall",
-	"syscall.Shutdown":                                     "syscall",
-	"syscall.SidTypeAlias":                                 "syscall",
-	"syscall.SidTypeComputer":                              "syscall",
-	"syscall.SidTypeDeletedAccount":                        "syscall",
-	"syscall.SidTypeDomain":                                "syscall",
-	"syscall.SidTypeGroup":                                 "syscall",
-	"syscall.SidTypeInvalid":                               "syscall",
-	"syscall.SidTypeLabel":                                 "syscall",
-	"syscall.SidTypeUnknown":                               "syscall",
-	"syscall.SidTypeUser":                                  "syscall",
-	"syscall.SidTypeWellKnownGroup":                        "syscall",
-	"syscall.Signal":                                       "syscall",
-	"syscall.SizeofBpfHdr":                                 "syscall",
-	"syscall.SizeofBpfInsn":                                "syscall",
-	"syscall.SizeofBpfProgram":                             "syscall",
-	"syscall.SizeofBpfStat":                                "syscall",
-	"syscall.SizeofBpfVersion":                             "syscall",
-	"syscall.SizeofBpfZbuf":                                "syscall",
-	"syscall.SizeofBpfZbufHeader":                          "syscall",
-	"syscall.SizeofCmsghdr":                                "syscall",
-	"syscall.SizeofICMPv6Filter":                           "syscall",
-	"syscall.SizeofIPMreq":                                 "syscall",
-	"syscall.SizeofIPMreqn":                                "syscall",
-	"syscall.SizeofIPv6MTUInfo":                            "syscall",
-	"syscall.SizeofIPv6Mreq":                               "syscall",
-	"syscall.SizeofIfAddrmsg":                              "syscall",
-	"syscall.SizeofIfAnnounceMsghdr":                       "syscall",
-	"syscall.SizeofIfData":                                 "syscall",
-	"syscall.SizeofIfInfomsg":                              "syscall",
-	"syscall.SizeofIfMsghdr":                               "syscall",
-	"syscall.SizeofIfaMsghdr":                              "syscall",
-	"syscall.SizeofIfmaMsghdr":                             "syscall",
-	"syscall.SizeofIfmaMsghdr2":                            "syscall",
-	"syscall.SizeofInet4Pktinfo":                           "syscall",
-	"syscall.SizeofInet6Pktinfo":                           "syscall",
-	"syscall.SizeofInotifyEvent":                           "syscall",
-	"syscall.SizeofLinger":                                 "syscall",
-	"syscall.SizeofMsghdr":                                 "syscall",
-	"syscall.SizeofNlAttr":                                 "syscall",
-	"syscall.SizeofNlMsgerr":                               "syscall",
-	"syscall.SizeofNlMsghdr":                               "syscall",
-	"syscall.SizeofRtAttr":                                 "syscall",
-	"syscall.SizeofRtGenmsg":                               "syscall",
-	"syscall.SizeofRtMetrics":                              "syscall",
-	"syscall.SizeofRtMsg":                                  "syscall",
-	"syscall.SizeofRtMsghdr":                               "syscall",
-	"syscall.SizeofRtNexthop":                              "syscall",
-	"syscall.SizeofSockFilter":                             "syscall",
-	"syscall.SizeofSockFprog":                              "syscall",
-	"syscall.SizeofSockaddrAny":                            "syscall",
-	"syscall.SizeofSockaddrDatalink":                       "syscall",
-	"syscall.SizeofSockaddrInet4":                          "syscall",
-	"syscall.SizeofSockaddrInet6":                          "syscall",
-	"syscall.SizeofSockaddrLinklayer":                      "syscall",
-	"syscall.SizeofSockaddrNetlink":                        "syscall",
-	"syscall.SizeofSockaddrUnix":                           "syscall",
-	"syscall.SizeofTCPInfo":                                "syscall",
-	"syscall.SizeofUcred":                                  "syscall",
-	"syscall.SlicePtrFromStrings":                          "syscall",
-	"syscall.SockFilter":                                   "syscall",
-	"syscall.SockFprog":                                    "syscall",
-	"syscall.SockaddrDatalink":                             "syscall",
-	"syscall.SockaddrGen":                                  "syscall",
-	"syscall.SockaddrInet4":                                "syscall",
-	"syscall.SockaddrInet6":                                "syscall",
-	"syscall.SockaddrLinklayer":                            "syscall",
-	"syscall.SockaddrNetlink":                              "syscall",
-	"syscall.SockaddrUnix":                                 "syscall",
-	"syscall.Socket":                                       "syscall",
-	"syscall.SocketControlMessage":                         "syscall",
-	"syscall.SocketDisableIPv6":                            "syscall",
-	"syscall.Socketpair":                                   "syscall",
-	"syscall.Splice":                                       "syscall",
-	"syscall.StartProcess":                                 "syscall",
-	"syscall.StartupInfo":                                  "syscall",
-	"syscall.Stat":                                         "syscall",
-	"syscall.Stat_t":                                       "syscall",
-	"syscall.Statfs":                                       "syscall",
-	"syscall.Statfs_t":                                     "syscall",
-	"syscall.Stderr":                                       "syscall",
-	"syscall.Stdin":                                        "syscall",
-	"syscall.Stdout":                                       "syscall",
-	"syscall.StringBytePtr":                                "syscall",
-	"syscall.StringByteSlice":                              "syscall",
-	"syscall.StringSlicePtr":                               "syscall",
-	"syscall.StringToSid":                                  "syscall",
-	"syscall.StringToUTF16":                                "syscall",
-	"syscall.StringToUTF16Ptr":                             "syscall",
-	"syscall.Symlink":                                      "syscall",
-	"syscall.Sync":                                         "syscall",
-	"syscall.SyncFileRange":                                "syscall",
-	"syscall.SysProcAttr":                                  "syscall",
-	"syscall.SysProcIDMap":                                 "syscall",
-	"syscall.Syscall":                                      "syscall",
-	"syscall.Syscall12":                                    "syscall",
-	"syscall.Syscall15":                                    "syscall",
-	"syscall.Syscall6":                                     "syscall",
-	"syscall.Syscall9":                                     "syscall",
-	"syscall.Sysctl":                                       "syscall",
-	"syscall.SysctlUint32":                                 "syscall",
-	"syscall.Sysctlnode":                                   "syscall",
-	"syscall.Sysinfo":                                      "syscall",
-	"syscall.Sysinfo_t":                                    "syscall",
-	"syscall.Systemtime":                                   "syscall",
-	"syscall.TCGETS":                                       "syscall",
-	"syscall.TCIFLUSH":                                     "syscall",
-	"syscall.TCIOFLUSH":                                    "syscall",
-	"syscall.TCOFLUSH":                                     "syscall",
-	"syscall.TCPInfo":                                      "syscall",
-	"syscall.TCPKeepalive":                                 "syscall",
-	"syscall.TCP_CA_NAME_MAX":                              "syscall",
-	"syscall.TCP_CONGCTL":                                  "syscall",
-	"syscall.TCP_CONGESTION":                               "syscall",
-	"syscall.TCP_CONNECTIONTIMEOUT":                        "syscall",
-	"syscall.TCP_CORK":                                     "syscall",
-	"syscall.TCP_DEFER_ACCEPT":                             "syscall",
-	"syscall.TCP_INFO":                                     "syscall",
-	"syscall.TCP_KEEPALIVE":                                "syscall",
-	"syscall.TCP_KEEPCNT":                                  "syscall",
-	"syscall.TCP_KEEPIDLE":                                 "syscall",
-	"syscall.TCP_KEEPINIT":                                 "syscall",
-	"syscall.TCP_KEEPINTVL":                                "syscall",
-	"syscall.TCP_LINGER2":                                  "syscall",
-	"syscall.TCP_MAXBURST":                                 "syscall",
-	"syscall.TCP_MAXHLEN":                                  "syscall",
-	"syscall.TCP_MAXOLEN":                                  "syscall",
-	"syscall.TCP_MAXSEG":                                   "syscall",
-	"syscall.TCP_MAXWIN":                                   "syscall",
-	"syscall.TCP_MAX_SACK":                                 "syscall",
-	"syscall.TCP_MAX_WINSHIFT":                             "syscall",
-	"syscall.TCP_MD5SIG":                                   "syscall",
-	"syscall.TCP_MD5SIG_MAXKEYLEN":                         "syscall",
-	"syscall.TCP_MINMSS":                                   "syscall",
-	"syscall.TCP_MINMSSOVERLOAD":                           "syscall",
-	"syscall.TCP_MSS":                                      "syscall",
-	"syscall.TCP_NODELAY":                                  "syscall",
-	"syscall.TCP_NOOPT":                                    "syscall",
-	"syscall.TCP_NOPUSH":                                   "syscall",
-	"syscall.TCP_NSTATES":                                  "syscall",
-	"syscall.TCP_QUICKACK":                                 "syscall",
-	"syscall.TCP_RXT_CONNDROPTIME":                         "syscall",
-	"syscall.TCP_RXT_FINDROP":                              "syscall",
-	"syscall.TCP_SACK_ENABLE":                              "syscall",
-	"syscall.TCP_SYNCNT":                                   "syscall",
-	"syscall.TCP_VENDOR":                                   "syscall",
-	"syscall.TCP_WINDOW_CLAMP":                             "syscall",
-	"syscall.TCSAFLUSH":                                    "syscall",
-	"syscall.TCSETS":                                       "syscall",
-	"syscall.TF_DISCONNECT":                                "syscall",
-	"syscall.TF_REUSE_SOCKET":                              "syscall",
-	"syscall.TF_USE_DEFAULT_WORKER":                        "syscall",
-	"syscall.TF_USE_KERNEL_APC":                            "syscall",
-	"syscall.TF_USE_SYSTEM_THREAD":                         "syscall",
-	"syscall.TF_WRITE_BEHIND":                              "syscall",
-	"syscall.TH32CS_INHERIT":                               "syscall",
-	"syscall.TH32CS_SNAPALL":                               "syscall",
-	"syscall.TH32CS_SNAPHEAPLIST":                          "syscall",
-	"syscall.TH32CS_SNAPMODULE":                            "syscall",
-	"syscall.TH32CS_SNAPMODULE32":                          "syscall",
-	"syscall.TH32CS_SNAPPROCESS":                           "syscall",
-	"syscall.TH32CS_SNAPTHREAD":                            "syscall",
-	"syscall.TIME_ZONE_ID_DAYLIGHT":                        "syscall",
-	"syscall.TIME_ZONE_ID_STANDARD":                        "syscall",
-	"syscall.TIME_ZONE_ID_UNKNOWN":                         "syscall",
-	"syscall.TIOCCBRK":                                     "syscall",
-	"syscall.TIOCCDTR":                                     "syscall",
-	"syscall.TIOCCONS":                                     "syscall",
-	"syscall.TIOCDCDTIMESTAMP":                             "syscall",
-	"syscall.TIOCDRAIN":                                    "syscall",
-	"syscall.TIOCDSIMICROCODE":                             "syscall",
-	"syscall.TIOCEXCL":                                     "syscall",
-	"syscall.TIOCEXT":                                      "syscall",
-	"syscall.TIOCFLAG_CDTRCTS":                             "syscall",
-	"syscall.TIOCFLAG_CLOCAL":                              "syscall",
-	"syscall.TIOCFLAG_CRTSCTS":                             "syscall",
-	"syscall.TIOCFLAG_MDMBUF":                              "syscall",
-	"syscall.TIOCFLAG_PPS":                                 "syscall",
-	"syscall.TIOCFLAG_SOFTCAR":                             "syscall",
-	"syscall.TIOCFLUSH":                                    "syscall",
-	"syscall.TIOCGDEV":                                     "syscall",
-	"syscall.TIOCGDRAINWAIT":                               "syscall",
-	"syscall.TIOCGETA":                                     "syscall",
-	"syscall.TIOCGETD":                                     "syscall",
-	"syscall.TIOCGFLAGS":                                   "syscall",
-	"syscall.TIOCGICOUNT":                                  "syscall",
-	"syscall.TIOCGLCKTRMIOS":                               "syscall",
-	"syscall.TIOCGLINED":                                   "syscall",
-	"syscall.TIOCGPGRP":                                    "syscall",
-	"syscall.TIOCGPTN":                                     "syscall",
-	"syscall.TIOCGQSIZE":                                   "syscall",
-	"syscall.TIOCGRANTPT":                                  "syscall",
-	"syscall.TIOCGRS485":                                   "syscall",
-	"syscall.TIOCGSERIAL":                                  "syscall",
-	"syscall.TIOCGSID":                                     "syscall",
-	"syscall.TIOCGSIZE":                                    "syscall",
-	"syscall.TIOCGSOFTCAR":                                 "syscall",
-	"syscall.TIOCGTSTAMP":                                  "syscall",
-	"syscall.TIOCGWINSZ":                                   "syscall",
-	"syscall.TIOCINQ":                                      "syscall",
-	"syscall.TIOCIXOFF":                                    "syscall",
-	"syscall.TIOCIXON":                                     "syscall",
-	"syscall.TIOCLINUX":                                    "syscall",
-	"syscall.TIOCMBIC":                                     "syscall",
-	"syscall.TIOCMBIS":                                     "syscall",
-	"syscall.TIOCMGDTRWAIT":                                "syscall",
-	"syscall.TIOCMGET":                                     "syscall",
-	"syscall.TIOCMIWAIT":                                   "syscall",
-	"syscall.TIOCMODG":                                     "syscall",
-	"syscall.TIOCMODS":                                     "syscall",
-	"syscall.TIOCMSDTRWAIT":                                "syscall",
-	"syscall.TIOCMSET":                                     "syscall",
-	"syscall.TIOCM_CAR":                                    "syscall",
-	"syscall.TIOCM_CD":                                     "syscall",
-	"syscall.TIOCM_CTS":                                    "syscall",
-	"syscall.TIOCM_DCD":                                    "syscall",
-	"syscall.TIOCM_DSR":                                    "syscall",
-	"syscall.TIOCM_DTR":                                    "syscall",
-	"syscall.TIOCM_LE":                                     "syscall",
-	"syscall.TIOCM_RI":                                     "syscall",
-	"syscall.TIOCM_RNG":                                    "syscall",
-	"syscall.TIOCM_RTS":                                    "syscall",
-	"syscall.TIOCM_SR":                                     "syscall",
-	"syscall.TIOCM_ST":                                     "syscall",
-	"syscall.TIOCNOTTY":                                    "syscall",
-	"syscall.TIOCNXCL":                                     "syscall",
-	"syscall.TIOCOUTQ":                                     "syscall",
-	"syscall.TIOCPKT":                                      "syscall",
-	"syscall.TIOCPKT_DATA":                                 "syscall",
-	"syscall.TIOCPKT_DOSTOP":                               "syscall",
-	"syscall.TIOCPKT_FLUSHREAD":                            "syscall",
-	"syscall.TIOCPKT_FLUSHWRITE":                           "syscall",
-	"syscall.TIOCPKT_IOCTL":                                "syscall",
-	"syscall.TIOCPKT_NOSTOP":                               "syscall",
-	"syscall.TIOCPKT_START":                                "syscall",
-	"syscall.TIOCPKT_STOP":                                 "syscall",
-	"syscall.TIOCPTMASTER":                                 "syscall",
-	"syscall.TIOCPTMGET":                                   "syscall",
-	"syscall.TIOCPTSNAME":                                  "syscall",
-	"syscall.TIOCPTYGNAME":                                 "syscall",
-	"syscall.TIOCPTYGRANT":                                 "syscall",
-	"syscall.TIOCPTYUNLK":                                  "syscall",
-	"syscall.TIOCRCVFRAME":                                 "syscall",
-	"syscall.TIOCREMOTE":                                   "syscall",
-	"syscall.TIOCSBRK":                                     "syscall",
-	"syscall.TIOCSCONS":                                    "syscall",
-	"syscall.TIOCSCTTY":                                    "syscall",
-	"syscall.TIOCSDRAINWAIT":                               "syscall",
-	"syscall.TIOCSDTR":                                     "syscall",
-	"syscall.TIOCSERCONFIG":                                "syscall",
-	"syscall.TIOCSERGETLSR":                                "syscall",
-	"syscall.TIOCSERGETMULTI":                              "syscall",
-	"syscall.TIOCSERGSTRUCT":                               "syscall",
-	"syscall.TIOCSERGWILD":                                 "syscall",
-	"syscall.TIOCSERSETMULTI":                              "syscall",
-	"syscall.TIOCSERSWILD":                                 "syscall",
-	"syscall.TIOCSER_TEMT":                                 "syscall",
-	"syscall.TIOCSETA":                                     "syscall",
-	"syscall.TIOCSETAF":                                    "syscall",
-	"syscall.TIOCSETAW":                                    "syscall",
-	"syscall.TIOCSETD":                                     "syscall",
-	"syscall.TIOCSFLAGS":                                   "syscall",
-	"syscall.TIOCSIG":                                      "syscall",
-	"syscall.TIOCSLCKTRMIOS":                               "syscall",
-	"syscall.TIOCSLINED":                                   "syscall",
-	"syscall.TIOCSPGRP":                                    "syscall",
-	"syscall.TIOCSPTLCK":                                   "syscall",
-	"syscall.TIOCSQSIZE":                                   "syscall",
-	"syscall.TIOCSRS485":                                   "syscall",
-	"syscall.TIOCSSERIAL":                                  "syscall",
-	"syscall.TIOCSSIZE":                                    "syscall",
-	"syscall.TIOCSSOFTCAR":                                 "syscall",
-	"syscall.TIOCSTART":                                    "syscall",
-	"syscall.TIOCSTAT":                                     "syscall",
-	"syscall.TIOCSTI":                                      "syscall",
-	"syscall.TIOCSTOP":                                     "syscall",
-	"syscall.TIOCSTSTAMP":                                  "syscall",
-	"syscall.TIOCSWINSZ":                                   "syscall",
-	"syscall.TIOCTIMESTAMP":                                "syscall",
-	"syscall.TIOCUCNTL":                                    "syscall",
-	"syscall.TIOCVHANGUP":                                  "syscall",
-	"syscall.TIOCXMTFRAME":                                 "syscall",
-	"syscall.TOKEN_ADJUST_DEFAULT":                         "syscall",
-	"syscall.TOKEN_ADJUST_GROUPS":                          "syscall",
-	"syscall.TOKEN_ADJUST_PRIVILEGES":                      "syscall",
-	"syscall.TOKEN_ALL_ACCESS":                             "syscall",
-	"syscall.TOKEN_ASSIGN_PRIMARY":                         "syscall",
-	"syscall.TOKEN_DUPLICATE":                              "syscall",
-	"syscall.TOKEN_EXECUTE":                                "syscall",
-	"syscall.TOKEN_IMPERSONATE":                            "syscall",
-	"syscall.TOKEN_QUERY":                                  "syscall",
-	"syscall.TOKEN_QUERY_SOURCE":                           "syscall",
-	"syscall.TOKEN_READ":                                   "syscall",
-	"syscall.TOKEN_WRITE":                                  "syscall",
-	"syscall.TOSTOP":                                       "syscall",
-	"syscall.TRUNCATE_EXISTING":                            "syscall",
-	"syscall.TUNATTACHFILTER":                              "syscall",
-	"syscall.TUNDETACHFILTER":                              "syscall",
-	"syscall.TUNGETFEATURES":                               "syscall",
-	"syscall.TUNGETIFF":                                    "syscall",
-	"syscall.TUNGETSNDBUF":                                 "syscall",
-	"syscall.TUNGETVNETHDRSZ":                              "syscall",
-	"syscall.TUNSETDEBUG":                                  "syscall",
-	"syscall.TUNSETGROUP":                                  "syscall",
-	"syscall.TUNSETIFF":                                    "syscall",
-	"syscall.TUNSETLINK":                                   "syscall",
-	"syscall.TUNSETNOCSUM":                                 "syscall",
-	"syscall.TUNSETOFFLOAD":                                "syscall",
-	"syscall.TUNSETOWNER":                                  "syscall",
-	"syscall.TUNSETPERSIST":                                "syscall",
-	"syscall.TUNSETSNDBUF":                                 "syscall",
-	"syscall.TUNSETTXFILTER":                               "syscall",
-	"syscall.TUNSETVNETHDRSZ":                              "syscall",
-	"syscall.Tee":                                          "syscall",
-	"syscall.TerminateProcess":                             "syscall",
-	"syscall.Termios":                                      "syscall",
-	"syscall.Tgkill":                                       "syscall",
-	"syscall.Time":                                         "syscall",
-	"syscall.Time_t":                                       "syscall",
-	"syscall.Times":                                        "syscall",
-	"syscall.Timespec":                                     "syscall",
-	"syscall.TimespecToNsec":                               "syscall",
-	"syscall.Timeval":                                      "syscall",
-	"syscall.Timeval32":                                    "syscall",
-	"syscall.TimevalToNsec":                                "syscall",
-	"syscall.Timex":                                        "syscall",
-	"syscall.Timezoneinformation":                          "syscall",
-	"syscall.Tms":                                          "syscall",
-	"syscall.Token":                                        "syscall",
-	"syscall.TokenAccessInformation":                       "syscall",
-	"syscall.TokenAuditPolicy":                             "syscall",
-	"syscall.TokenDefaultDacl":                             "syscall",
-	"syscall.TokenElevation":                               "syscall",
-	"syscall.TokenElevationType":                           "syscall",
-	"syscall.TokenGroups":                                  "syscall",
-	"syscall.TokenGroupsAndPrivileges":                     "syscall",
-	"syscall.TokenHasRestrictions":                         "syscall",
-	"syscall.TokenImpersonationLevel":                      "syscall",
-	"syscall.TokenIntegrityLevel":                          "syscall",
-	"syscall.TokenLinkedToken":                             "syscall",
-	"syscall.TokenLogonSid":                                "syscall",
-	"syscall.TokenMandatoryPolicy":                         "syscall",
-	"syscall.TokenOrigin":                                  "syscall",
-	"syscall.TokenOwner":                                   "syscall",
-	"syscall.TokenPrimaryGroup":                            "syscall",
-	"syscall.TokenPrivileges":                              "syscall",
-	"syscall.TokenRestrictedSids":                          "syscall",
-	"syscall.TokenSandBoxInert":                            "syscall",
-	"syscall.TokenSessionId":                               "syscall",
-	"syscall.TokenSessionReference":                        "syscall",
-	"syscall.TokenSource":                                  "syscall",
-	"syscall.TokenStatistics":                              "syscall",
-	"syscall.TokenType":                                    "syscall",
-	"syscall.TokenUIAccess":                                "syscall",
-	"syscall.TokenUser":                                    "syscall",
-	"syscall.TokenVirtualizationAllowed":                   "syscall",
-	"syscall.TokenVirtualizationEnabled":                   "syscall",
-	"syscall.Tokenprimarygroup":                            "syscall",
-	"syscall.Tokenuser":                                    "syscall",
-	"syscall.TranslateAccountName":                         "syscall",
-	"syscall.TranslateName":                                "syscall",
-	"syscall.TransmitFile":                                 "syscall",
-	"syscall.TransmitFileBuffers":                          "syscall",
-	"syscall.Truncate":                                     "syscall",
-	"syscall.USAGE_MATCH_TYPE_AND":                         "syscall",
-	"syscall.USAGE_MATCH_TYPE_OR":                          "syscall",
-	"syscall.UTF16FromString":                              "syscall",
-	"syscall.UTF16PtrFromString":                           "syscall",
-	"syscall.UTF16ToString":                                "syscall",
-	"syscall.Ucred":                                        "syscall",
-	"syscall.Umask":                                        "syscall",
-	"syscall.Uname":                                        "syscall",
-	"syscall.Undelete":                                     "syscall",
-	"syscall.UnixCredentials":                              "syscall",
-	"syscall.UnixRights":                                   "syscall",
-	"syscall.Unlink":                                       "syscall",
-	"syscall.Unlinkat":                                     "syscall",
-	"syscall.UnmapViewOfFile":                              "syscall",
-	"syscall.Unmount":                                      "syscall",
-	"syscall.Unsetenv":                                     "syscall",
-	"syscall.Unshare":                                      "syscall",
-	"syscall.UserInfo10":                                   "syscall",
-	"syscall.Ustat":                                        "syscall",
-	"syscall.Ustat_t":                                      "syscall",
-	"syscall.Utimbuf":                                      "syscall",
-	"syscall.Utime":                                        "syscall",
-	"syscall.Utimes":                                       "syscall",
-	"syscall.UtimesNano":                                   "syscall",
-	"syscall.Utsname":                                      "syscall",
-	"syscall.VDISCARD":                                     "syscall",
-	"syscall.VDSUSP":                                       "syscall",
-	"syscall.VEOF":                                         "syscall",
-	"syscall.VEOL":                                         "syscall",
-	"syscall.VEOL2":                                        "syscall",
-	"syscall.VERASE":                                       "syscall",
-	"syscall.VERASE2":                                      "syscall",
-	"syscall.VINTR":                                        "syscall",
-	"syscall.VKILL":                                        "syscall",
-	"syscall.VLNEXT":                                       "syscall",
-	"syscall.VMIN":                                         "syscall",
-	"syscall.VQUIT":                                        "syscall",
-	"syscall.VREPRINT":                                     "syscall",
-	"syscall.VSTART":                                       "syscall",
-	"syscall.VSTATUS":                                      "syscall",
-	"syscall.VSTOP":                                        "syscall",
-	"syscall.VSUSP":                                        "syscall",
-	"syscall.VSWTC":                                        "syscall",
-	"syscall.VT0":                                          "syscall",
-	"syscall.VT1":                                          "syscall",
-	"syscall.VTDLY":                                        "syscall",
-	"syscall.VTIME":                                        "syscall",
-	"syscall.VWERASE":                                      "syscall",
-	"syscall.VirtualLock":                                  "syscall",
-	"syscall.VirtualUnlock":                                "syscall",
-	"syscall.WAIT_ABANDONED":                               "syscall",
-	"syscall.WAIT_FAILED":                                  "syscall",
-	"syscall.WAIT_OBJECT_0":                                "syscall",
-	"syscall.WAIT_TIMEOUT":                                 "syscall",
-	"syscall.WALL":                                         "syscall",
-	"syscall.WALLSIG":                                      "syscall",
-	"syscall.WALTSIG":                                      "syscall",
-	"syscall.WCLONE":                                       "syscall",
-	"syscall.WCONTINUED":                                   "syscall",
-	"syscall.WCOREFLAG":                                    "syscall",
-	"syscall.WEXITED":                                      "syscall",
-	"syscall.WLINUXCLONE":                                  "syscall",
-	"syscall.WNOHANG":                                      "syscall",
-	"syscall.WNOTHREAD":                                    "syscall",
-	"syscall.WNOWAIT":                                      "syscall",
-	"syscall.WNOZOMBIE":                                    "syscall",
-	"syscall.WOPTSCHECKED":                                 "syscall",
-	"syscall.WORDSIZE":                                     "syscall",
-	"syscall.WSABuf":                                       "syscall",
-	"syscall.WSACleanup":                                   "syscall",
-	"syscall.WSADESCRIPTION_LEN":                           "syscall",
-	"syscall.WSAData":                                      "syscall",
-	"syscall.WSAEACCES":                                    "syscall",
-	"syscall.WSAECONNABORTED":                              "syscall",
-	"syscall.WSAECONNRESET":                                "syscall",
-	"syscall.WSAEnumProtocols":                             "syscall",
-	"syscall.WSAID_CONNECTEX":                              "syscall",
-	"syscall.WSAIoctl":                                     "syscall",
-	"syscall.WSAPROTOCOL_LEN":                              "syscall",
-	"syscall.WSAProtocolChain":                             "syscall",
-	"syscall.WSAProtocolInfo":                              "syscall",
-	"syscall.WSARecv":                                      "syscall",
-	"syscall.WSARecvFrom":                                  "syscall",
-	"syscall.WSASYS_STATUS_LEN":                            "syscall",
-	"syscall.WSASend":                                      "syscall",
-	"syscall.WSASendTo":                                    "syscall",
-	"syscall.WSASendto":                                    "syscall",
-	"syscall.WSAStartup":                                   "syscall",
-	"syscall.WSTOPPED":                                     "syscall",
-	"syscall.WTRAPPED":                                     "syscall",
-	"syscall.WUNTRACED":                                    "syscall",
-	"syscall.Wait4":                                        "syscall",
-	"syscall.WaitForSingleObject":                          "syscall",
-	"syscall.WaitStatus":                                   "syscall",
-	"syscall.Win32FileAttributeData":                       "syscall",
-	"syscall.Win32finddata":                                "syscall",
-	"syscall.Write":                                        "syscall",
-	"syscall.WriteConsole":                                 "syscall",
-	"syscall.WriteFile":                                    "syscall",
-	"syscall.X509_ASN_ENCODING":                            "syscall",
-	"syscall.XCASE":                                        "syscall",
-	"syscall.XP1_CONNECTIONLESS":                           "syscall",
-	"syscall.XP1_CONNECT_DATA":                             "syscall",
-	"syscall.XP1_DISCONNECT_DATA":                          "syscall",
-	"syscall.XP1_EXPEDITED_DATA":                           "syscall",
-	"syscall.XP1_GRACEFUL_CLOSE":                           "syscall",
-	"syscall.XP1_GUARANTEED_DELIVERY":                      "syscall",
-	"syscall.XP1_GUARANTEED_ORDER":                         "syscall",
-	"syscall.XP1_IFS_HANDLES":                              "syscall",
-	"syscall.XP1_MESSAGE_ORIENTED":                         "syscall",
-	"syscall.XP1_MULTIPOINT_CONTROL_PLANE":                 "syscall",
-	"syscall.XP1_MULTIPOINT_DATA_PLANE":                    "syscall",
-	"syscall.XP1_PARTIAL_MESSAGE":                          "syscall",
-	"syscall.XP1_PSEUDO_STREAM":                            "syscall",
-	"syscall.XP1_QOS_SUPPORTED":                            "syscall",
-	"syscall.XP1_SAN_SUPPORT_SDP":                          "syscall",
-	"syscall.XP1_SUPPORT_BROADCAST":                        "syscall",
-	"syscall.XP1_SUPPORT_MULTIPOINT":                       "syscall",
-	"syscall.XP1_UNI_RECV":                                 "syscall",
-	"syscall.XP1_UNI_SEND":                                 "syscall",
-	"syslog.Dial":                                          "log/syslog",
-	"syslog.LOG_ALERT":                                     "log/syslog",
-	"syslog.LOG_AUTH":                                      "log/syslog",
-	"syslog.LOG_AUTHPRIV":                                  "log/syslog",
-	"syslog.LOG_CRIT":                                      "log/syslog",
-	"syslog.LOG_CRON":                                      "log/syslog",
-	"syslog.LOG_DAEMON":                                    "log/syslog",
-	"syslog.LOG_DEBUG":                                     "log/syslog",
-	"syslog.LOG_EMERG":                                     "log/syslog",
-	"syslog.LOG_ERR":                                       "log/syslog",
-	"syslog.LOG_FTP":                                       "log/syslog",
-	"syslog.LOG_INFO":                                      "log/syslog",
-	"syslog.LOG_KERN":                                      "log/syslog",
-	"syslog.LOG_LOCAL0":                                    "log/syslog",
-	"syslog.LOG_LOCAL1":                                    "log/syslog",
-	"syslog.LOG_LOCAL2":                                    "log/syslog",
-	"syslog.LOG_LOCAL3":                                    "log/syslog",
-	"syslog.LOG_LOCAL4":                                    "log/syslog",
-	"syslog.LOG_LOCAL5":                                    "log/syslog",
-	"syslog.LOG_LOCAL6":                                    "log/syslog",
-	"syslog.LOG_LOCAL7":                                    "log/syslog",
-	"syslog.LOG_LPR":                                       "log/syslog",
-	"syslog.LOG_MAIL":                                      "log/syslog",
-	"syslog.LOG_NEWS":                                      "log/syslog",
-	"syslog.LOG_NOTICE":                                    "log/syslog",
-	"syslog.LOG_SYSLOG":                                    "log/syslog",
-	"syslog.LOG_USER":                                      "log/syslog",
-	"syslog.LOG_UUCP":                                      "log/syslog",
-	"syslog.LOG_WARNING":                                   "log/syslog",
-	"syslog.New":                                           "log/syslog",
-	"syslog.NewLogger":                                     "log/syslog",
-	"syslog.Priority":                                      "log/syslog",
-	"syslog.Writer":                                        "log/syslog",
-	"tabwriter.AlignRight":                                 "text/tabwriter",
-	"tabwriter.Debug":                                      "text/tabwriter",
-	"tabwriter.DiscardEmptyColumns":                        "text/tabwriter",
-	"tabwriter.Escape":                                     "text/tabwriter",
-	"tabwriter.FilterHTML":                                 "text/tabwriter",
-	"tabwriter.NewWriter":                                  "text/tabwriter",
-	"tabwriter.StripEscape":                                "text/tabwriter",
-	"tabwriter.TabIndent":                                  "text/tabwriter",
-	"tabwriter.Writer":                                     "text/tabwriter",
-	"tar.ErrFieldTooLong":                                  "archive/tar",
-	"tar.ErrHeader":                                        "archive/tar",
-	"tar.ErrWriteAfterClose":                               "archive/tar",
-	"tar.ErrWriteTooLong":                                  "archive/tar",
-	"tar.FileInfoHeader":                                   "archive/tar",
-	"tar.Header":                                           "archive/tar",
-	"tar.NewReader":                                        "archive/tar",
-	"tar.NewWriter":                                        "archive/tar",
-	"tar.Reader":                                           "archive/tar",
-	"tar.TypeBlock":                                        "archive/tar",
-	"tar.TypeChar":                                         "archive/tar",
-	"tar.TypeCont":                                         "archive/tar",
-	"tar.TypeDir":                                          "archive/tar",
-	"tar.TypeFifo":                                         "archive/tar",
-	"tar.TypeGNULongLink":                                  "archive/tar",
-	"tar.TypeGNULongName":                                  "archive/tar",
-	"tar.TypeGNUSparse":                                    "archive/tar",
-	"tar.TypeLink":                                         "archive/tar",
-	"tar.TypeReg":                                          "archive/tar",
-	"tar.TypeRegA":                                         "archive/tar",
-	"tar.TypeSymlink":                                      "archive/tar",
-	"tar.TypeXGlobalHeader":                                "archive/tar",
-	"tar.TypeXHeader":                                      "archive/tar",
-	"tar.Writer":                                           "archive/tar",
-	"template.CSS":                                         "html/template",
-	"template.ErrAmbigContext":                             "html/template",
-	"template.ErrBadHTML":                                  "html/template",
-	"template.ErrBranchEnd":                                "html/template",
-	"template.ErrEndContext":                               "html/template",
-	"template.ErrNoSuchTemplate":                           "html/template",
-	"template.ErrOutputContext":                            "html/template",
-	"template.ErrPartialCharset":                           "html/template",
-	"template.ErrPartialEscape":                            "html/template",
-	"template.ErrPredefinedEscaper":                        "html/template",
-	"template.ErrRangeLoopReentry":                         "html/template",
-	"template.ErrSlashAmbig":                               "html/template",
-	"template.Error":                                       "html/template",
-	"template.ErrorCode":                                   "html/template",
-	"template.ExecError":                                   "text/template",
-	// "template.FuncMap" is ambiguous
-	"template.HTML":     "html/template",
-	"template.HTMLAttr": "html/template",
-	// "template.HTMLEscape" is ambiguous
-	// "template.HTMLEscapeString" is ambiguous
-	// "template.HTMLEscaper" is ambiguous
-	// "template.IsTrue" is ambiguous
-	"template.JS": "html/template",
-	// "template.JSEscape" is ambiguous
-	// "template.JSEscapeString" is ambiguous
-	// "template.JSEscaper" is ambiguous
-	"template.JSStr": "html/template",
-	// "template.Must" is ambiguous
-	// "template.New" is ambiguous
-	"template.OK": "html/template",
-	// "template.ParseFiles" is ambiguous
-	// "template.ParseGlob" is ambiguous
-	// "template.Template" is ambiguous
-	"template.URL": "html/template",
-	// "template.URLQueryEscaper" is ambiguous
-	"testing.AllocsPerRun":                        "testing",
-	"testing.B":                                   "testing",
-	"testing.Benchmark":                           "testing",
-	"testing.BenchmarkResult":                     "testing",
-	"testing.Cover":                               "testing",
-	"testing.CoverBlock":                          "testing",
-	"testing.CoverMode":                           "testing",
-	"testing.Coverage":                            "testing",
-	"testing.InternalBenchmark":                   "testing",
-	"testing.InternalExample":                     "testing",
-	"testing.InternalTest":                        "testing",
-	"testing.M":                                   "testing",
-	"testing.Main":                                "testing",
-	"testing.MainStart":                           "testing",
-	"testing.PB":                                  "testing",
-	"testing.RegisterCover":                       "testing",
-	"testing.RunBenchmarks":                       "testing",
-	"testing.RunExamples":                         "testing",
-	"testing.RunTests":                            "testing",
-	"testing.Short":                               "testing",
-	"testing.T":                                   "testing",
-	"testing.Verbose":                             "testing",
-	"textproto.CanonicalMIMEHeaderKey":            "net/textproto",
-	"textproto.Conn":                              "net/textproto",
-	"textproto.Dial":                              "net/textproto",
-	"textproto.Error":                             "net/textproto",
-	"textproto.MIMEHeader":                        "net/textproto",
-	"textproto.NewConn":                           "net/textproto",
-	"textproto.NewReader":                         "net/textproto",
-	"textproto.NewWriter":                         "net/textproto",
-	"textproto.Pipeline":                          "net/textproto",
-	"textproto.ProtocolError":                     "net/textproto",
-	"textproto.Reader":                            "net/textproto",
-	"textproto.TrimBytes":                         "net/textproto",
-	"textproto.TrimString":                        "net/textproto",
-	"textproto.Writer":                            "net/textproto",
-	"time.ANSIC":                                  "time",
-	"time.After":                                  "time",
-	"time.AfterFunc":                              "time",
-	"time.April":                                  "time",
-	"time.August":                                 "time",
-	"time.Date":                                   "time",
-	"time.December":                               "time",
-	"time.Duration":                               "time",
-	"time.February":                               "time",
-	"time.FixedZone":                              "time",
-	"time.Friday":                                 "time",
-	"time.Hour":                                   "time",
-	"time.January":                                "time",
-	"time.July":                                   "time",
-	"time.June":                                   "time",
-	"time.Kitchen":                                "time",
-	"time.LoadLocation":                           "time",
-	"time.Local":                                  "time",
-	"time.Location":                               "time",
-	"time.March":                                  "time",
-	"time.May":                                    "time",
-	"time.Microsecond":                            "time",
-	"time.Millisecond":                            "time",
-	"time.Minute":                                 "time",
-	"time.Monday":                                 "time",
-	"time.Month":                                  "time",
-	"time.Nanosecond":                             "time",
-	"time.NewTicker":                              "time",
-	"time.NewTimer":                               "time",
-	"time.November":                               "time",
-	"time.Now":                                    "time",
-	"time.October":                                "time",
-	"time.Parse":                                  "time",
-	"time.ParseDuration":                          "time",
-	"time.ParseError":                             "time",
-	"time.ParseInLocation":                        "time",
-	"time.RFC1123":                                "time",
-	"time.RFC1123Z":                               "time",
-	"time.RFC3339":                                "time",
-	"time.RFC3339Nano":                            "time",
-	"time.RFC822":                                 "time",
-	"time.RFC822Z":                                "time",
-	"time.RFC850":                                 "time",
-	"time.RubyDate":                               "time",
-	"time.Saturday":                               "time",
-	"time.Second":                                 "time",
-	"time.September":                              "time",
-	"time.Since":                                  "time",
-	"time.Sleep":                                  "time",
-	"time.Stamp":                                  "time",
-	"time.StampMicro":                             "time",
-	"time.StampMilli":                             "time",
-	"time.StampNano":                              "time",
-	"time.Sunday":                                 "time",
-	"time.Thursday":                               "time",
-	"time.Tick":                                   "time",
-	"time.Ticker":                                 "time",
-	"time.Time":                                   "time",
-	"time.Timer":                                  "time",
-	"time.Tuesday":                                "time",
-	"time.UTC":                                    "time",
-	"time.Unix":                                   "time",
-	"time.UnixDate":                               "time",
-	"time.Until":                                  "time",
-	"time.Wednesday":                              "time",
-	"time.Weekday":                                "time",
-	"tls.Certificate":                             "crypto/tls",
-	"tls.CertificateRequestInfo":                  "crypto/tls",
-	"tls.Client":                                  "crypto/tls",
-	"tls.ClientAuthType":                          "crypto/tls",
-	"tls.ClientHelloInfo":                         "crypto/tls",
-	"tls.ClientSessionCache":                      "crypto/tls",
-	"tls.ClientSessionState":                      "crypto/tls",
-	"tls.Config":                                  "crypto/tls",
-	"tls.Conn":                                    "crypto/tls",
-	"tls.ConnectionState":                         "crypto/tls",
-	"tls.CurveID":                                 "crypto/tls",
-	"tls.CurveP256":                               "crypto/tls",
-	"tls.CurveP384":                               "crypto/tls",
-	"tls.CurveP521":                               "crypto/tls",
-	"tls.Dial":                                    "crypto/tls",
-	"tls.DialWithDialer":                          "crypto/tls",
-	"tls.ECDSAWithP256AndSHA256":                  "crypto/tls",
-	"tls.ECDSAWithP384AndSHA384":                  "crypto/tls",
-	"tls.ECDSAWithP521AndSHA512":                  "crypto/tls",
-	"tls.Listen":                                  "crypto/tls",
-	"tls.LoadX509KeyPair":                         "crypto/tls",
-	"tls.NewLRUClientSessionCache":                "crypto/tls",
-	"tls.NewListener":                             "crypto/tls",
-	"tls.NoClientCert":                            "crypto/tls",
-	"tls.PKCS1WithSHA1":                           "crypto/tls",
-	"tls.PKCS1WithSHA256":                         "crypto/tls",
-	"tls.PKCS1WithSHA384":                         "crypto/tls",
-	"tls.PKCS1WithSHA512":                         "crypto/tls",
-	"tls.PSSWithSHA256":                           "crypto/tls",
-	"tls.PSSWithSHA384":                           "crypto/tls",
-	"tls.PSSWithSHA512":                           "crypto/tls",
-	"tls.RecordHeaderError":                       "crypto/tls",
-	"tls.RenegotiateFreelyAsClient":               "crypto/tls",
-	"tls.RenegotiateNever":                        "crypto/tls",
-	"tls.RenegotiateOnceAsClient":                 "crypto/tls",
-	"tls.RenegotiationSupport":                    "crypto/tls",
-	"tls.RequestClientCert":                       "crypto/tls",
-	"tls.RequireAndVerifyClientCert":              "crypto/tls",
-	"tls.RequireAnyClientCert":                    "crypto/tls",
-	"tls.Server":                                  "crypto/tls",
-	"tls.SignatureScheme":                         "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA":    "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA256": "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256": "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA":    "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384": "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_CHACHA20_POLY1305":  "crypto/tls",
-	"tls.TLS_ECDHE_ECDSA_WITH_RC4_128_SHA":        "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_3DES_EDE_CBC_SHA":     "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA":      "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256":   "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256":   "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA":      "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384":   "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_CHACHA20_POLY1305":    "crypto/tls",
-	"tls.TLS_ECDHE_RSA_WITH_RC4_128_SHA":          "crypto/tls",
-	"tls.TLS_FALLBACK_SCSV":                       "crypto/tls",
-	"tls.TLS_RSA_WITH_3DES_EDE_CBC_SHA":           "crypto/tls",
-	"tls.TLS_RSA_WITH_AES_128_CBC_SHA":            "crypto/tls",
-	"tls.TLS_RSA_WITH_AES_128_CBC_SHA256":         "crypto/tls",
-	"tls.TLS_RSA_WITH_AES_128_GCM_SHA256":         "crypto/tls",
-	"tls.TLS_RSA_WITH_AES_256_CBC_SHA":            "crypto/tls",
-	"tls.TLS_RSA_WITH_AES_256_GCM_SHA384":         "crypto/tls",
-	"tls.TLS_RSA_WITH_RC4_128_SHA":                "crypto/tls",
-	"tls.VerifyClientCertIfGiven":                 "crypto/tls",
-	"tls.VersionSSL30":                            "crypto/tls",
-	"tls.VersionTLS10":                            "crypto/tls",
-	"tls.VersionTLS11":                            "crypto/tls",
-	"tls.VersionTLS12":                            "crypto/tls",
-	"tls.X25519":                                  "crypto/tls",
-	"tls.X509KeyPair":                             "crypto/tls",
-	"token.ADD":                                   "go/token",
-	"token.ADD_ASSIGN":                            "go/token",
-	"token.AND":                                   "go/token",
-	"token.AND_ASSIGN":                            "go/token",
-	"token.AND_NOT":                               "go/token",
-	"token.AND_NOT_ASSIGN":                        "go/token",
-	"token.ARROW":                                 "go/token",
-	"token.ASSIGN":                                "go/token",
-	"token.BREAK":                                 "go/token",
-	"token.CASE":                                  "go/token",
-	"token.CHAN":                                  "go/token",
-	"token.CHAR":                                  "go/token",
-	"token.COLON":                                 "go/token",
-	"token.COMMA":                                 "go/token",
-	"token.COMMENT":                               "go/token",
-	"token.CONST":                                 "go/token",
-	"token.CONTINUE":                              "go/token",
-	"token.DEC":                                   "go/token",
-	"token.DEFAULT":                               "go/token",
-	"token.DEFER":                                 "go/token",
-	"token.DEFINE":                                "go/token",
-	"token.ELLIPSIS":                              "go/token",
-	"token.ELSE":                                  "go/token",
-	"token.EOF":                                   "go/token",
-	"token.EQL":                                   "go/token",
-	"token.FALLTHROUGH":                           "go/token",
-	"token.FLOAT":                                 "go/token",
-	"token.FOR":                                   "go/token",
-	"token.FUNC":                                  "go/token",
-	"token.File":                                  "go/token",
-	"token.FileSet":                               "go/token",
-	"token.GEQ":                                   "go/token",
-	"token.GO":                                    "go/token",
-	"token.GOTO":                                  "go/token",
-	"token.GTR":                                   "go/token",
-	"token.HighestPrec":                           "go/token",
-	"token.IDENT":                                 "go/token",
-	"token.IF":                                    "go/token",
-	"token.ILLEGAL":                               "go/token",
-	"token.IMAG":                                  "go/token",
-	"token.IMPORT":                                "go/token",
-	"token.INC":                                   "go/token",
-	"token.INT":                                   "go/token",
-	"token.INTERFACE":                             "go/token",
-	"token.LAND":                                  "go/token",
-	"token.LBRACE":                                "go/token",
-	"token.LBRACK":                                "go/token",
-	"token.LEQ":                                   "go/token",
-	"token.LOR":                                   "go/token",
-	"token.LPAREN":                                "go/token",
-	"token.LSS":                                   "go/token",
-	"token.Lookup":                                "go/token",
-	"token.LowestPrec":                            "go/token",
-	"token.MAP":                                   "go/token",
-	"token.MUL":                                   "go/token",
-	"token.MUL_ASSIGN":                            "go/token",
-	"token.NEQ":                                   "go/token",
-	"token.NOT":                                   "go/token",
-	"token.NewFileSet":                            "go/token",
-	"token.NoPos":                                 "go/token",
-	"token.OR":                                    "go/token",
-	"token.OR_ASSIGN":                             "go/token",
-	"token.PACKAGE":                               "go/token",
-	"token.PERIOD":                                "go/token",
-	"token.Pos":                                   "go/token",
-	"token.Position":                              "go/token",
-	"token.QUO":                                   "go/token",
-	"token.QUO_ASSIGN":                            "go/token",
-	"token.RANGE":                                 "go/token",
-	"token.RBRACE":                                "go/token",
-	"token.RBRACK":                                "go/token",
-	"token.REM":                                   "go/token",
-	"token.REM_ASSIGN":                            "go/token",
-	"token.RETURN":                                "go/token",
-	"token.RPAREN":                                "go/token",
-	"token.SELECT":                                "go/token",
-	"token.SEMICOLON":                             "go/token",
-	"token.SHL":                                   "go/token",
-	"token.SHL_ASSIGN":                            "go/token",
-	"token.SHR":                                   "go/token",
-	"token.SHR_ASSIGN":                            "go/token",
-	"token.STRING":                                "go/token",
-	"token.STRUCT":                                "go/token",
-	"token.SUB":                                   "go/token",
-	"token.SUB_ASSIGN":                            "go/token",
-	"token.SWITCH":                                "go/token",
-	"token.TYPE":                                  "go/token",
-	"token.Token":                                 "go/token",
-	"token.UnaryPrec":                             "go/token",
-	"token.VAR":                                   "go/token",
-	"token.XOR":                                   "go/token",
-	"token.XOR_ASSIGN":                            "go/token",
-	"trace.Start":                                 "runtime/trace",
-	"trace.Stop":                                  "runtime/trace",
-	"types.Array":                                 "go/types",
-	"types.AssertableTo":                          "go/types",
-	"types.AssignableTo":                          "go/types",
-	"types.Basic":                                 "go/types",
-	"types.BasicInfo":                             "go/types",
-	"types.BasicKind":                             "go/types",
-	"types.Bool":                                  "go/types",
-	"types.Builtin":                               "go/types",
-	"types.Byte":                                  "go/types",
-	"types.Chan":                                  "go/types",
-	"types.ChanDir":                               "go/types",
-	"types.Checker":                               "go/types",
-	"types.Comparable":                            "go/types",
-	"types.Complex128":                            "go/types",
-	"types.Complex64":                             "go/types",
-	"types.Config":                                "go/types",
-	"types.Const":                                 "go/types",
-	"types.ConvertibleTo":                         "go/types",
-	"types.DefPredeclaredTestFuncs":               "go/types",
-	"types.Default":                               "go/types",
-	"types.Error":                                 "go/types",
-	"types.Eval":                                  "go/types",
-	"types.ExprString":                            "go/types",
-	"types.FieldVal":                              "go/types",
-	"types.Float32":                               "go/types",
-	"types.Float64":                               "go/types",
-	"types.Func":                                  "go/types",
-	"types.Id":                                    "go/types",
-	"types.Identical":                             "go/types",
-	"types.IdenticalIgnoreTags":                   "go/types",
-	"types.Implements":                            "go/types",
-	"types.ImportMode":                            "go/types",
-	"types.Importer":                              "go/types",
-	"types.ImporterFrom":                          "go/types",
-	"types.Info":                                  "go/types",
-	"types.Initializer":                           "go/types",
-	"types.Int":                                   "go/types",
-	"types.Int16":                                 "go/types",
-	"types.Int32":                                 "go/types",
-	"types.Int64":                                 "go/types",
-	"types.Int8":                                  "go/types",
-	"types.Interface":                             "go/types",
-	"types.Invalid":                               "go/types",
-	"types.IsBoolean":                             "go/types",
-	"types.IsComplex":                             "go/types",
-	"types.IsConstType":                           "go/types",
-	"types.IsFloat":                               "go/types",
-	"types.IsInteger":                             "go/types",
-	"types.IsInterface":                           "go/types",
-	"types.IsNumeric":                             "go/types",
-	"types.IsOrdered":                             "go/types",
-	"types.IsString":                              "go/types",
-	"types.IsUnsigned":                            "go/types",
-	"types.IsUntyped":                             "go/types",
-	"types.Label":                                 "go/types",
-	"types.LookupFieldOrMethod":                   "go/types",
-	"types.Map":                                   "go/types",
-	"types.MethodExpr":                            "go/types",
-	"types.MethodSet":                             "go/types",
-	"types.MethodVal":                             "go/types",
-	"types.MissingMethod":                         "go/types",
-	"types.Named":                                 "go/types",
-	"types.NewArray":                              "go/types",
-	"types.NewChan":                               "go/types",
-	"types.NewChecker":                            "go/types",
-	"types.NewConst":                              "go/types",
-	"types.NewField":                              "go/types",
-	"types.NewFunc":                               "go/types",
-	"types.NewInterface":                          "go/types",
-	"types.NewLabel":                              "go/types",
-	"types.NewMap":                                "go/types",
-	"types.NewMethodSet":                          "go/types",
-	"types.NewNamed":                              "go/types",
-	"types.NewPackage":                            "go/types",
-	"types.NewParam":                              "go/types",
-	"types.NewPkgName":                            "go/types",
-	"types.NewPointer":                            "go/types",
-	"types.NewScope":                              "go/types",
-	"types.NewSignature":                          "go/types",
-	"types.NewSlice":                              "go/types",
-	"types.NewStruct":                             "go/types",
-	"types.NewTuple":                              "go/types",
-	"types.NewTypeName":                           "go/types",
-	"types.NewVar":                                "go/types",
-	"types.Nil":                                   "go/types",
-	"types.ObjectString":                          "go/types",
-	"types.Package":                               "go/types",
-	"types.PkgName":                               "go/types",
-	"types.Pointer":                               "go/types",
-	"types.Qualifier":                             "go/types",
-	"types.RecvOnly":                              "go/types",
-	"types.RelativeTo":                            "go/types",
-	"types.Rune":                                  "go/types",
-	"types.Scope":                                 "go/types",
-	"types.Selection":                             "go/types",
-	"types.SelectionKind":                         "go/types",
-	"types.SelectionString":                       "go/types",
-	"types.SendOnly":                              "go/types",
-	"types.SendRecv":                              "go/types",
-	"types.Signature":                             "go/types",
-	"types.Sizes":                                 "go/types",
-	"types.SizesFor":                              "go/types",
-	"types.Slice":                                 "go/types",
-	"types.StdSizes":                              "go/types",
-	"types.String":                                "go/types",
-	"types.Struct":                                "go/types",
-	"types.Tuple":                                 "go/types",
-	"types.Typ":                                   "go/types",
-	"types.Type":                                  "go/types",
-	"types.TypeAndValue":                          "go/types",
-	"types.TypeName":                              "go/types",
-	"types.TypeString":                            "go/types",
-	"types.Uint":                                  "go/types",
-	"types.Uint16":                                "go/types",
-	"types.Uint32":                                "go/types",
-	"types.Uint64":                                "go/types",
-	"types.Uint8":                                 "go/types",
-	"types.Uintptr":                               "go/types",
-	"types.Universe":                              "go/types",
-	"types.Unsafe":                                "go/types",
-	"types.UnsafePointer":                         "go/types",
-	"types.UntypedBool":                           "go/types",
-	"types.UntypedComplex":                        "go/types",
-	"types.UntypedFloat":                          "go/types",
-	"types.UntypedInt":                            "go/types",
-	"types.UntypedNil":                            "go/types",
-	"types.UntypedRune":                           "go/types",
-	"types.UntypedString":                         "go/types",
-	"types.Var":                                   "go/types",
-	"types.WriteExpr":                             "go/types",
-	"types.WriteSignature":                        "go/types",
-	"types.WriteType":                             "go/types",
-	"unicode.ASCII_Hex_Digit":                     "unicode",
-	"unicode.Adlam":                               "unicode",
-	"unicode.Ahom":                                "unicode",
-	"unicode.Anatolian_Hieroglyphs":               "unicode",
-	"unicode.Arabic":                              "unicode",
-	"unicode.Armenian":                            "unicode",
-	"unicode.Avestan":                             "unicode",
-	"unicode.AzeriCase":                           "unicode",
-	"unicode.Balinese":                            "unicode",
-	"unicode.Bamum":                               "unicode",
-	"unicode.Bassa_Vah":                           "unicode",
-	"unicode.Batak":                               "unicode",
-	"unicode.Bengali":                             "unicode",
-	"unicode.Bhaiksuki":                           "unicode",
-	"unicode.Bidi_Control":                        "unicode",
-	"unicode.Bopomofo":                            "unicode",
-	"unicode.Brahmi":                              "unicode",
-	"unicode.Braille":                             "unicode",
-	"unicode.Buginese":                            "unicode",
-	"unicode.Buhid":                               "unicode",
-	"unicode.C":                                   "unicode",
-	"unicode.Canadian_Aboriginal":                 "unicode",
-	"unicode.Carian":                              "unicode",
-	"unicode.CaseRange":                           "unicode",
-	"unicode.CaseRanges":                          "unicode",
-	"unicode.Categories":                          "unicode",
-	"unicode.Caucasian_Albanian":                  "unicode",
-	"unicode.Cc":                                  "unicode",
-	"unicode.Cf":                                  "unicode",
-	"unicode.Chakma":                              "unicode",
-	"unicode.Cham":                                "unicode",
-	"unicode.Cherokee":                            "unicode",
-	"unicode.Co":                                  "unicode",
-	"unicode.Common":                              "unicode",
-	"unicode.Coptic":                              "unicode",
-	"unicode.Cs":                                  "unicode",
-	"unicode.Cuneiform":                           "unicode",
-	"unicode.Cypriot":                             "unicode",
-	"unicode.Cyrillic":                            "unicode",
-	"unicode.Dash":                                "unicode",
-	"unicode.Deprecated":                          "unicode",
-	"unicode.Deseret":                             "unicode",
-	"unicode.Devanagari":                          "unicode",
-	"unicode.Diacritic":                           "unicode",
-	"unicode.Digit":                               "unicode",
-	"unicode.Duployan":                            "unicode",
-	"unicode.Egyptian_Hieroglyphs":                "unicode",
-	"unicode.Elbasan":                             "unicode",
-	"unicode.Ethiopic":                            "unicode",
-	"unicode.Extender":                            "unicode",
-	"unicode.FoldCategory":                        "unicode",
-	"unicode.FoldScript":                          "unicode",
-	"unicode.Georgian":                            "unicode",
-	"unicode.Glagolitic":                          "unicode",
-	"unicode.Gothic":                              "unicode",
-	"unicode.Grantha":                             "unicode",
-	"unicode.GraphicRanges":                       "unicode",
-	"unicode.Greek":                               "unicode",
-	"unicode.Gujarati":                            "unicode",
-	"unicode.Gurmukhi":                            "unicode",
-	"unicode.Han":                                 "unicode",
-	"unicode.Hangul":                              "unicode",
-	"unicode.Hanunoo":                             "unicode",
-	"unicode.Hatran":                              "unicode",
-	"unicode.Hebrew":                              "unicode",
-	"unicode.Hex_Digit":                           "unicode",
-	"unicode.Hiragana":                            "unicode",
-	"unicode.Hyphen":                              "unicode",
-	"unicode.IDS_Binary_Operator":                 "unicode",
-	"unicode.IDS_Trinary_Operator":                "unicode",
-	"unicode.Ideographic":                         "unicode",
-	"unicode.Imperial_Aramaic":                    "unicode",
-	"unicode.In":                                  "unicode",
-	"unicode.Inherited":                           "unicode",
-	"unicode.Inscriptional_Pahlavi":               "unicode",
-	"unicode.Inscriptional_Parthian":              "unicode",
-	"unicode.Is":                                  "unicode",
-	"unicode.IsControl":                           "unicode",
-	"unicode.IsDigit":                             "unicode",
-	"unicode.IsGraphic":                           "unicode",
-	"unicode.IsLetter":                            "unicode",
-	"unicode.IsLower":                             "unicode",
-	"unicode.IsMark":                              "unicode",
-	"unicode.IsNumber":                            "unicode",
-	"unicode.IsOneOf":                             "unicode",
-	"unicode.IsPrint":                             "unicode",
-	"unicode.IsPunct":                             "unicode",
-	"unicode.IsSpace":                             "unicode",
-	"unicode.IsSymbol":                            "unicode",
-	"unicode.IsTitle":                             "unicode",
-	"unicode.IsUpper":                             "unicode",
-	"unicode.Javanese":                            "unicode",
-	"unicode.Join_Control":                        "unicode",
-	"unicode.Kaithi":                              "unicode",
-	"unicode.Kannada":                             "unicode",
-	"unicode.Katakana":                            "unicode",
-	"unicode.Kayah_Li":                            "unicode",
-	"unicode.Kharoshthi":                          "unicode",
-	"unicode.Khmer":                               "unicode",
-	"unicode.Khojki":                              "unicode",
-	"unicode.Khudawadi":                           "unicode",
-	"unicode.L":                                   "unicode",
-	"unicode.Lao":                                 "unicode",
-	"unicode.Latin":                               "unicode",
-	"unicode.Lepcha":                              "unicode",
-	"unicode.Letter":                              "unicode",
-	"unicode.Limbu":                               "unicode",
-	"unicode.Linear_A":                            "unicode",
-	"unicode.Linear_B":                            "unicode",
-	"unicode.Lisu":                                "unicode",
-	"unicode.Ll":                                  "unicode",
-	"unicode.Lm":                                  "unicode",
-	"unicode.Lo":                                  "unicode",
-	"unicode.Logical_Order_Exception":             "unicode",
-	"unicode.Lower":                               "unicode",
-	"unicode.LowerCase":                           "unicode",
-	"unicode.Lt":                                  "unicode",
-	"unicode.Lu":                                  "unicode",
-	"unicode.Lycian":                              "unicode",
-	"unicode.Lydian":                              "unicode",
-	"unicode.M":                                   "unicode",
-	"unicode.Mahajani":                            "unicode",
-	"unicode.Malayalam":                           "unicode",
-	"unicode.Mandaic":                             "unicode",
-	"unicode.Manichaean":                          "unicode",
-	"unicode.Marchen":                             "unicode",
-	"unicode.Mark":                                "unicode",
-	"unicode.MaxASCII":                            "unicode",
-	"unicode.MaxCase":                             "unicode",
-	"unicode.MaxLatin1":                           "unicode",
-	"unicode.MaxRune":                             "unicode",
-	"unicode.Mc":                                  "unicode",
-	"unicode.Me":                                  "unicode",
-	"unicode.Meetei_Mayek":                        "unicode",
-	"unicode.Mende_Kikakui":                       "unicode",
-	"unicode.Meroitic_Cursive":                    "unicode",
-	"unicode.Meroitic_Hieroglyphs":                "unicode",
-	"unicode.Miao":                                "unicode",
-	"unicode.Mn":                                  "unicode",
-	"unicode.Modi":                                "unicode",
-	"unicode.Mongolian":                           "unicode",
-	"unicode.Mro":                                 "unicode",
-	"unicode.Multani":                             "unicode",
-	"unicode.Myanmar":                             "unicode",
-	"unicode.N":                                   "unicode",
-	"unicode.Nabataean":                           "unicode",
-	"unicode.Nd":                                  "unicode",
-	"unicode.New_Tai_Lue":                         "unicode",
-	"unicode.Newa":                                "unicode",
-	"unicode.Nko":                                 "unicode",
-	"unicode.Nl":                                  "unicode",
-	"unicode.No":                                  "unicode",
-	"unicode.Noncharacter_Code_Point":             "unicode",
-	"unicode.Number":                              "unicode",
-	"unicode.Ogham":                               "unicode",
-	"unicode.Ol_Chiki":                            "unicode",
-	"unicode.Old_Hungarian":                       "unicode",
-	"unicode.Old_Italic":                          "unicode",
-	"unicode.Old_North_Arabian":                   "unicode",
-	"unicode.Old_Permic":                          "unicode",
-	"unicode.Old_Persian":                         "unicode",
-	"unicode.Old_South_Arabian":                   "unicode",
-	"unicode.Old_Turkic":                          "unicode",
-	"unicode.Oriya":                               "unicode",
-	"unicode.Osage":                               "unicode",
-	"unicode.Osmanya":                             "unicode",
-	"unicode.Other":                               "unicode",
-	"unicode.Other_Alphabetic":                    "unicode",
-	"unicode.Other_Default_Ignorable_Code_Point":  "unicode",
-	"unicode.Other_Grapheme_Extend":               "unicode",
-	"unicode.Other_ID_Continue":                   "unicode",
-	"unicode.Other_ID_Start":                      "unicode",
-	"unicode.Other_Lowercase":                     "unicode",
-	"unicode.Other_Math":                          "unicode",
-	"unicode.Other_Uppercase":                     "unicode",
-	"unicode.P":                                   "unicode",
-	"unicode.Pahawh_Hmong":                        "unicode",
-	"unicode.Palmyrene":                           "unicode",
-	"unicode.Pattern_Syntax":                      "unicode",
-	"unicode.Pattern_White_Space":                 "unicode",
-	"unicode.Pau_Cin_Hau":                         "unicode",
-	"unicode.Pc":                                  "unicode",
-	"unicode.Pd":                                  "unicode",
-	"unicode.Pe":                                  "unicode",
-	"unicode.Pf":                                  "unicode",
-	"unicode.Phags_Pa":                            "unicode",
-	"unicode.Phoenician":                          "unicode",
-	"unicode.Pi":                                  "unicode",
-	"unicode.Po":                                  "unicode",
-	"unicode.Prepended_Concatenation_Mark":        "unicode",
-	"unicode.PrintRanges":                         "unicode",
-	"unicode.Properties":                          "unicode",
-	"unicode.Ps":                                  "unicode",
-	"unicode.Psalter_Pahlavi":                     "unicode",
-	"unicode.Punct":                               "unicode",
-	"unicode.Quotation_Mark":                      "unicode",
-	"unicode.Radical":                             "unicode",
-	"unicode.Range16":                             "unicode",
-	"unicode.Range32":                             "unicode",
-	"unicode.RangeTable":                          "unicode",
-	"unicode.Rejang":                              "unicode",
-	"unicode.ReplacementChar":                     "unicode",
-	"unicode.Runic":                               "unicode",
-	"unicode.S":                                   "unicode",
-	"unicode.STerm":                               "unicode",
-	"unicode.Samaritan":                           "unicode",
-	"unicode.Saurashtra":                          "unicode",
-	"unicode.Sc":                                  "unicode",
-	"unicode.Scripts":                             "unicode",
-	"unicode.Sentence_Terminal":                   "unicode",
-	"unicode.Sharada":                             "unicode",
-	"unicode.Shavian":                             "unicode",
-	"unicode.Siddham":                             "unicode",
-	"unicode.SignWriting":                         "unicode",
-	"unicode.SimpleFold":                          "unicode",
-	"unicode.Sinhala":                             "unicode",
-	"unicode.Sk":                                  "unicode",
-	"unicode.Sm":                                  "unicode",
-	"unicode.So":                                  "unicode",
-	"unicode.Soft_Dotted":                         "unicode",
-	"unicode.Sora_Sompeng":                        "unicode",
-	"unicode.Space":                               "unicode",
-	"unicode.SpecialCase":                         "unicode",
-	"unicode.Sundanese":                           "unicode",
-	"unicode.Syloti_Nagri":                        "unicode",
-	"unicode.Symbol":                              "unicode",
-	"unicode.Syriac":                              "unicode",
-	"unicode.Tagalog":                             "unicode",
-	"unicode.Tagbanwa":                            "unicode",
-	"unicode.Tai_Le":                              "unicode",
-	"unicode.Tai_Tham":                            "unicode",
-	"unicode.Tai_Viet":                            "unicode",
-	"unicode.Takri":                               "unicode",
-	"unicode.Tamil":                               "unicode",
-	"unicode.Tangut":                              "unicode",
-	"unicode.Telugu":                              "unicode",
-	"unicode.Terminal_Punctuation":                "unicode",
-	"unicode.Thaana":                              "unicode",
-	"unicode.Thai":                                "unicode",
-	"unicode.Tibetan":                             "unicode",
-	"unicode.Tifinagh":                            "unicode",
-	"unicode.Tirhuta":                             "unicode",
-	"unicode.Title":                               "unicode",
-	"unicode.TitleCase":                           "unicode",
-	"unicode.To":                                  "unicode",
-	"unicode.ToLower":                             "unicode",
-	"unicode.ToTitle":                             "unicode",
-	"unicode.ToUpper":                             "unicode",
-	"unicode.TurkishCase":                         "unicode",
-	"unicode.Ugaritic":                            "unicode",
-	"unicode.Unified_Ideograph":                   "unicode",
-	"unicode.Upper":                               "unicode",
-	"unicode.UpperCase":                           "unicode",
-	"unicode.UpperLower":                          "unicode",
-	"unicode.Vai":                                 "unicode",
-	"unicode.Variation_Selector":                  "unicode",
-	"unicode.Version":                             "unicode",
-	"unicode.Warang_Citi":                         "unicode",
-	"unicode.White_Space":                         "unicode",
-	"unicode.Yi":                                  "unicode",
-	"unicode.Z":                                   "unicode",
-	"unicode.Zl":                                  "unicode",
-	"unicode.Zp":                                  "unicode",
-	"unicode.Zs":                                  "unicode",
-	"url.Error":                                   "net/url",
-	"url.EscapeError":                             "net/url",
-	"url.InvalidHostError":                        "net/url",
-	"url.Parse":                                   "net/url",
-	"url.ParseQuery":                              "net/url",
-	"url.ParseRequestURI":                         "net/url",
-	"url.PathEscape":                              "net/url",
-	"url.PathUnescape":                            "net/url",
-	"url.QueryEscape":                             "net/url",
-	"url.QueryUnescape":                           "net/url",
-	"url.URL":                                     "net/url",
-	"url.User":                                    "net/url",
-	"url.UserPassword":                            "net/url",
-	"url.Userinfo":                                "net/url",
-	"url.Values":                                  "net/url",
-	"user.Current":                                "os/user",
-	"user.Group":                                  "os/user",
-	"user.Lookup":                                 "os/user",
-	"user.LookupGroup":                            "os/user",
-	"user.LookupGroupId":                          "os/user",
-	"user.LookupId":                               "os/user",
-	"user.UnknownGroupError":                      "os/user",
-	"user.UnknownGroupIdError":                    "os/user",
-	"user.UnknownUserError":                       "os/user",
-	"user.UnknownUserIdError":                     "os/user",
-	"user.User":                                   "os/user",
-	"utf16.Decode":                                "unicode/utf16",
-	"utf16.DecodeRune":                            "unicode/utf16",
-	"utf16.Encode":                                "unicode/utf16",
-	"utf16.EncodeRune":                            "unicode/utf16",
-	"utf16.IsSurrogate":                           "unicode/utf16",
-	"utf8.DecodeLastRune":                         "unicode/utf8",
-	"utf8.DecodeLastRuneInString":                 "unicode/utf8",
-	"utf8.DecodeRune":                             "unicode/utf8",
-	"utf8.DecodeRuneInString":                     "unicode/utf8",
-	"utf8.EncodeRune":                             "unicode/utf8",
-	"utf8.FullRune":                               "unicode/utf8",
-	"utf8.FullRuneInString":                       "unicode/utf8",
-	"utf8.MaxRune":                                "unicode/utf8",
-	"utf8.RuneCount":                              "unicode/utf8",
-	"utf8.RuneCountInString":                      "unicode/utf8",
-	"utf8.RuneError":                              "unicode/utf8",
-	"utf8.RuneLen":                                "unicode/utf8",
-	"utf8.RuneSelf":                               "unicode/utf8",
-	"utf8.RuneStart":                              "unicode/utf8",
-	"utf8.UTFMax":                                 "unicode/utf8",
-	"utf8.Valid":                                  "unicode/utf8",
-	"utf8.ValidRune":                              "unicode/utf8",
-	"utf8.ValidString":                            "unicode/utf8",
-	"x509.CANotAuthorizedForThisName":             "crypto/x509",
-	"x509.CertPool":                               "crypto/x509",
-	"x509.Certificate":                            "crypto/x509",
-	"x509.CertificateInvalidError":                "crypto/x509",
-	"x509.CertificateRequest":                     "crypto/x509",
-	"x509.ConstraintViolationError":               "crypto/x509",
-	"x509.CreateCertificate":                      "crypto/x509",
-	"x509.CreateCertificateRequest":               "crypto/x509",
-	"x509.DSA":                                    "crypto/x509",
-	"x509.DSAWithSHA1":                            "crypto/x509",
-	"x509.DSAWithSHA256":                          "crypto/x509",
-	"x509.DecryptPEMBlock":                        "crypto/x509",
-	"x509.ECDSA":                                  "crypto/x509",
-	"x509.ECDSAWithSHA1":                          "crypto/x509",
-	"x509.ECDSAWithSHA256":                        "crypto/x509",
-	"x509.ECDSAWithSHA384":                        "crypto/x509",
-	"x509.ECDSAWithSHA512":                        "crypto/x509",
-	"x509.EncryptPEMBlock":                        "crypto/x509",
-	"x509.ErrUnsupportedAlgorithm":                "crypto/x509",
-	"x509.Expired":                                "crypto/x509",
-	"x509.ExtKeyUsage":                            "crypto/x509",
-	"x509.ExtKeyUsageAny":                         "crypto/x509",
-	"x509.ExtKeyUsageClientAuth":                  "crypto/x509",
-	"x509.ExtKeyUsageCodeSigning":                 "crypto/x509",
-	"x509.ExtKeyUsageEmailProtection":             "crypto/x509",
-	"x509.ExtKeyUsageIPSECEndSystem":              "crypto/x509",
-	"x509.ExtKeyUsageIPSECTunnel":                 "crypto/x509",
-	"x509.ExtKeyUsageIPSECUser":                   "crypto/x509",
-	"x509.ExtKeyUsageMicrosoftServerGatedCrypto":  "crypto/x509",
-	"x509.ExtKeyUsageNetscapeServerGatedCrypto":   "crypto/x509",
-	"x509.ExtKeyUsageOCSPSigning":                 "crypto/x509",
-	"x509.ExtKeyUsageServerAuth":                  "crypto/x509",
-	"x509.ExtKeyUsageTimeStamping":                "crypto/x509",
-	"x509.HostnameError":                          "crypto/x509",
-	"x509.IncompatibleUsage":                      "crypto/x509",
-	"x509.IncorrectPasswordError":                 "crypto/x509",
-	"x509.InsecureAlgorithmError":                 "crypto/x509",
-	"x509.InvalidReason":                          "crypto/x509",
-	"x509.IsEncryptedPEMBlock":                    "crypto/x509",
-	"x509.KeyUsage":                               "crypto/x509",
-	"x509.KeyUsageCRLSign":                        "crypto/x509",
-	"x509.KeyUsageCertSign":                       "crypto/x509",
-	"x509.KeyUsageContentCommitment":              "crypto/x509",
-	"x509.KeyUsageDataEncipherment":               "crypto/x509",
-	"x509.KeyUsageDecipherOnly":                   "crypto/x509",
-	"x509.KeyUsageDigitalSignature":               "crypto/x509",
-	"x509.KeyUsageEncipherOnly":                   "crypto/x509",
-	"x509.KeyUsageKeyAgreement":                   "crypto/x509",
-	"x509.KeyUsageKeyEncipherment":                "crypto/x509",
-	"x509.MD2WithRSA":                             "crypto/x509",
-	"x509.MD5WithRSA":                             "crypto/x509",
-	"x509.MarshalECPrivateKey":                    "crypto/x509",
-	"x509.MarshalPKCS1PrivateKey":                 "crypto/x509",
-	"x509.MarshalPKIXPublicKey":                   "crypto/x509",
-	"x509.NameMismatch":                           "crypto/x509",
-	"x509.NewCertPool":                            "crypto/x509",
-	"x509.NotAuthorizedToSign":                    "crypto/x509",
-	"x509.PEMCipher":                              "crypto/x509",
-	"x509.PEMCipher3DES":                          "crypto/x509",
-	"x509.PEMCipherAES128":                        "crypto/x509",
-	"x509.PEMCipherAES192":                        "crypto/x509",
-	"x509.PEMCipherAES256":                        "crypto/x509",
-	"x509.PEMCipherDES":                           "crypto/x509",
-	"x509.ParseCRL":                               "crypto/x509",
-	"x509.ParseCertificate":                       "crypto/x509",
-	"x509.ParseCertificateRequest":                "crypto/x509",
-	"x509.ParseCertificates":                      "crypto/x509",
-	"x509.ParseDERCRL":                            "crypto/x509",
-	"x509.ParseECPrivateKey":                      "crypto/x509",
-	"x509.ParsePKCS1PrivateKey":                   "crypto/x509",
-	"x509.ParsePKCS8PrivateKey":                   "crypto/x509",
-	"x509.ParsePKIXPublicKey":                     "crypto/x509",
-	"x509.PublicKeyAlgorithm":                     "crypto/x509",
-	"x509.RSA":                                    "crypto/x509",
-	"x509.SHA1WithRSA":                            "crypto/x509",
-	"x509.SHA256WithRSA":                          "crypto/x509",
-	"x509.SHA256WithRSAPSS":                       "crypto/x509",
-	"x509.SHA384WithRSA":                          "crypto/x509",
-	"x509.SHA384WithRSAPSS":                       "crypto/x509",
-	"x509.SHA512WithRSA":                          "crypto/x509",
-	"x509.SHA512WithRSAPSS":                       "crypto/x509",
-	"x509.SignatureAlgorithm":                     "crypto/x509",
-	"x509.SystemCertPool":                         "crypto/x509",
-	"x509.SystemRootsError":                       "crypto/x509",
-	"x509.TooManyIntermediates":                   "crypto/x509",
-	"x509.UnhandledCriticalExtension":             "crypto/x509",
-	"x509.UnknownAuthorityError":                  "crypto/x509",
-	"x509.UnknownPublicKeyAlgorithm":              "crypto/x509",
-	"x509.UnknownSignatureAlgorithm":              "crypto/x509",
-	"x509.VerifyOptions":                          "crypto/x509",
-	"xml.Attr":                                    "encoding/xml",
-	"xml.CharData":                                "encoding/xml",
-	"xml.Comment":                                 "encoding/xml",
-	"xml.CopyToken":                               "encoding/xml",
-	"xml.Decoder":                                 "encoding/xml",
-	"xml.Directive":                               "encoding/xml",
-	"xml.Encoder":                                 "encoding/xml",
-	"xml.EndElement":                              "encoding/xml",
-	"xml.Escape":                                  "encoding/xml",
-	"xml.EscapeText":                              "encoding/xml",
-	"xml.HTMLAutoClose":                           "encoding/xml",
-	"xml.HTMLEntity":                              "encoding/xml",
-	"xml.Header":                                  "encoding/xml",
-	"xml.Marshal":                                 "encoding/xml",
-	"xml.MarshalIndent":                           "encoding/xml",
-	"xml.Marshaler":                               "encoding/xml",
-	"xml.MarshalerAttr":                           "encoding/xml",
-	"xml.Name":                                    "encoding/xml",
-	"xml.NewDecoder":                              "encoding/xml",
-	"xml.NewEncoder":                              "encoding/xml",
-	"xml.ProcInst":                                "encoding/xml",
-	"xml.StartElement":                            "encoding/xml",
-	"xml.SyntaxError":                             "encoding/xml",
-	"xml.TagPathError":                            "encoding/xml",
-	"xml.Token":                                   "encoding/xml",
-	"xml.Unmarshal":                               "encoding/xml",
-	"xml.UnmarshalError":                          "encoding/xml",
-	"xml.Unmarshaler":                             "encoding/xml",
-	"xml.UnmarshalerAttr":                         "encoding/xml",
-	"xml.UnsupportedTypeError":                    "encoding/xml",
-	"zip.Compressor":                              "archive/zip",
-	"zip.Decompressor":                            "archive/zip",
-	"zip.Deflate":                                 "archive/zip",
-	"zip.ErrAlgorithm":                            "archive/zip",
-	"zip.ErrChecksum":                             "archive/zip",
-	"zip.ErrFormat":                               "archive/zip",
-	"zip.File":                                    "archive/zip",
-	"zip.FileHeader":                              "archive/zip",
-	"zip.FileInfoHeader":                          "archive/zip",
-	"zip.NewReader":                               "archive/zip",
-	"zip.NewWriter":                               "archive/zip",
-	"zip.OpenReader":                              "archive/zip",
-	"zip.ReadCloser":                              "archive/zip",
-	"zip.Reader":                                  "archive/zip",
-	"zip.RegisterCompressor":                      "archive/zip",
-	"zip.RegisterDecompressor":                    "archive/zip",
-	"zip.Store":                                   "archive/zip",
-	"zip.Writer":                                  "archive/zip",
-	"zlib.BestCompression":                        "compress/zlib",
-	"zlib.BestSpeed":                              "compress/zlib",
-	"zlib.DefaultCompression":                     "compress/zlib",
-	"zlib.ErrChecksum":                            "compress/zlib",
-	"zlib.ErrDictionary":                          "compress/zlib",
-	"zlib.ErrHeader":                              "compress/zlib",
-	"zlib.HuffmanOnly":                            "compress/zlib",
-	"zlib.NewReader":                              "compress/zlib",
-	"zlib.NewReaderDict":                          "compress/zlib",
-	"zlib.NewWriter":                              "compress/zlib",
-	"zlib.NewWriterLevel":                         "compress/zlib",
-	"zlib.NewWriterLevelDict":                     "compress/zlib",
-	"zlib.NoCompression":                          "compress/zlib",
-	"zlib.Resetter":                               "compress/zlib",
-	"zlib.Writer":                                 "compress/zlib",
-
-	"unsafe.Alignof":       "unsafe",
-	"unsafe.ArbitraryType": "unsafe",
-	"unsafe.Offsetof":      "unsafe",
-	"unsafe.Pointer":       "unsafe",
-	"unsafe.Sizeof":        "unsafe",
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/appengine.go b/installer/vendor/golang.org/x/tools/playground/appengine.go
deleted file mode 100644
index 94c5d52325..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/appengine.go
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appengine
-
-package playground
-
-import (
-	"net/http"
-
-	"appengine"
-	"appengine/urlfetch"
-)
-
-func init() {
-	onAppengine = !appengine.IsDevAppServer()
-}
-
-func client(r *http.Request) *http.Client {
-	return urlfetch.Client(appengine.NewContext(r))
-}
-
-func report(r *http.Request, err error) {
-	appengine.NewContext(r).Errorf("%v", err)
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/appenginevm.go b/installer/vendor/golang.org/x/tools/playground/appenginevm.go
deleted file mode 100644
index aa3a21268e..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/appenginevm.go
+++ /dev/null
@@ -1,11 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build appenginevm
-
-package playground
-
-func init() {
-	onAppengine = true
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/common.go b/installer/vendor/golang.org/x/tools/playground/common.go
deleted file mode 100644
index 186537a6e3..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/common.go
+++ /dev/null
@@ -1,63 +0,0 @@
-// Copyright 2013 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package playground registers HTTP handlers at "/compile" and "/share" that
-// proxy requests to the golang.org playground service.
-// This package may be used unaltered on App Engine.
-package playground // import "golang.org/x/tools/playground"
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-const baseURL = "https://golang.org"
-
-func init() {
-	http.HandleFunc("/compile", bounce)
-	http.HandleFunc("/share", bounce)
-}
-
-func bounce(w http.ResponseWriter, r *http.Request) {
-	b := new(bytes.Buffer)
-	if err := passThru(b, r); err != nil {
-		http.Error(w, "Server error.", http.StatusInternalServerError)
-		report(r, err)
-		return
-	}
-	io.Copy(w, b)
-}
-
-func passThru(w io.Writer, req *http.Request) error {
-	if req.URL.Path == "/share" && !allowShare(req) {
-		return errors.New("Forbidden")
-	}
-	defer req.Body.Close()
-	url := baseURL + req.URL.Path
-	r, err := client(req).Post(url, req.Header.Get("Content-type"), req.Body)
-	if err != nil {
-		return fmt.Errorf("making POST request: %v", err)
-	}
-	defer r.Body.Close()
-	if _, err := io.Copy(w, r.Body); err != nil {
-		return fmt.Errorf("copying response Body: %v", err)
-	}
-	return nil
-}
-
-var onAppengine = false // will be overriden by appengine.go and appenginevm.go
-
-func allowShare(r *http.Request) bool {
-	if !onAppengine {
-		return true
-	}
-	switch r.Header.Get("X-AppEngine-Country") {
-	case "", "ZZ", "CN":
-		return false
-	}
-	return true
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/local.go b/installer/vendor/golang.org/x/tools/playground/local.go
deleted file mode 100644
index b114b87785..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/local.go
+++ /dev/null
@@ -1,20 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-package playground
-
-import (
-	"log"
-	"net/http"
-)
-
-func client(r *http.Request) *http.Client {
-	return http.DefaultClient
-}
-
-func report(r *http.Request, err error) {
-	log.Println(err)
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/socket/socket.go b/installer/vendor/golang.org/x/tools/playground/socket/socket.go
deleted file mode 100644
index 0c275bffa9..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/socket/socket.go
+++ /dev/null
@@ -1,524 +0,0 @@
-// Copyright 2012 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// +build !appengine
-
-// Package socket implements an WebSocket-based playground backend.
-// Clients connect to a websocket handler and send run/kill commands, and
-// the server sends the output and exit status of the running processes.
-// Multiple clients running multiple processes may be served concurrently.
-// The wire format is JSON and is described by the Message type.
-//
-// This will not run on App Engine as WebSockets are not supported there.
-package socket // import "golang.org/x/tools/playground/socket"
-
-import (
-	"bytes"
-	"encoding/json"
-	"errors"
-	"go/parser"
-	"go/token"
-	"io"
-	"io/ioutil"
-	"log"
-	"net"
-	"net/http"
-	"net/url"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strconv"
-	"strings"
-	"time"
-	"unicode/utf8"
-
-	"golang.org/x/net/websocket"
-)
-
-// RunScripts specifies whether the socket handler should execute shell scripts
-// (snippets that start with a shebang).
-var RunScripts = true
-
-// Environ provides an environment when a binary, such as the go tool, is
-// invoked.
-var Environ func() []string = os.Environ
-
-const (
-	// The maximum number of messages to send per session (avoid flooding).
-	msgLimit = 1000
-
-	// Batch messages sent in this interval and send as a single message.
-	msgDelay = 10 * time.Millisecond
-)
-
-// Message is the wire format for the websocket connection to the browser.
-// It is used for both sending output messages and receiving commands, as
-// distinguished by the Kind field.
-type Message struct {
-	Id      string // client-provided unique id for the process
-	Kind    string // in: "run", "kill" out: "stdout", "stderr", "end"
-	Body    string
-	Options *Options `json:",omitempty"`
-}
-
-// Options specify additional message options.
-type Options struct {
-	Race bool // use -race flag when building code (for "run" only)
-}
-
-// NewHandler returns a websocket server which checks the origin of requests.
-func NewHandler(origin *url.URL) websocket.Server {
-	return websocket.Server{
-		Config:    websocket.Config{Origin: origin},
-		Handshake: handshake,
-		Handler:   websocket.Handler(socketHandler),
-	}
-}
-
-// handshake checks the origin of a request during the websocket handshake.
-func handshake(c *websocket.Config, req *http.Request) error {
-	o, err := websocket.Origin(c, req)
-	if err != nil {
-		log.Println("bad websocket origin:", err)
-		return websocket.ErrBadWebSocketOrigin
-	}
-	_, port, err := net.SplitHostPort(c.Origin.Host)
-	if err != nil {
-		log.Println("bad websocket origin:", err)
-		return websocket.ErrBadWebSocketOrigin
-	}
-	ok := c.Origin.Scheme == o.Scheme && (c.Origin.Host == o.Host || c.Origin.Host == net.JoinHostPort(o.Host, port))
-	if !ok {
-		log.Println("bad websocket origin:", o)
-		return websocket.ErrBadWebSocketOrigin
-	}
-	log.Println("accepting connection from:", req.RemoteAddr)
-	return nil
-}
-
-// socketHandler handles the websocket connection for a given present session.
-// It handles transcoding Messages to and from JSON format, and starting
-// and killing processes.
-func socketHandler(c *websocket.Conn) {
-	in, out := make(chan *Message), make(chan *Message)
-	errc := make(chan error, 1)
-
-	// Decode messages from client and send to the in channel.
-	go func() {
-		dec := json.NewDecoder(c)
-		for {
-			var m Message
-			if err := dec.Decode(&m); err != nil {
-				errc <- err
-				return
-			}
-			in <- &m
-		}
-	}()
-
-	// Receive messages from the out channel and encode to the client.
-	go func() {
-		enc := json.NewEncoder(c)
-		for m := range out {
-			if err := enc.Encode(m); err != nil {
-				errc <- err
-				return
-			}
-		}
-	}()
-	defer close(out)
-
-	// Start and kill processes and handle errors.
-	proc := make(map[string]*process)
-	for {
-		select {
-		case m := <-in:
-			switch m.Kind {
-			case "run":
-				log.Println("running snippet from:", c.Request().RemoteAddr)
-				proc[m.Id].Kill()
-				proc[m.Id] = startProcess(m.Id, m.Body, out, m.Options)
-			case "kill":
-				proc[m.Id].Kill()
-			}
-		case err := <-errc:
-			if err != io.EOF {
-				// A encode or decode has failed; bail.
-				log.Println(err)
-			}
-			// Shut down any running processes.
-			for _, p := range proc {
-				p.Kill()
-			}
-			return
-		}
-	}
-}
-
-// process represents a running process.
-type process struct {
-	out  chan<- *Message
-	done chan struct{} // closed when wait completes
-	run  *exec.Cmd
-	bin  string
-}
-
-// startProcess builds and runs the given program, sending its output
-// and end event as Messages on the provided channel.
-func startProcess(id, body string, dest chan<- *Message, opt *Options) *process {
-	var (
-		done = make(chan struct{})
-		out  = make(chan *Message)
-		p    = &process{out: out, done: done}
-	)
-	go func() {
-		defer close(done)
-		for m := range buffer(limiter(out, p), time.After) {
-			m.Id = id
-			dest <- m
-		}
-	}()
-	var err error
-	if path, args := shebang(body); path != "" {
-		if RunScripts {
-			err = p.startProcess(path, args, body)
-		} else {
-			err = errors.New("script execution is not allowed")
-		}
-	} else {
-		err = p.start(body, opt)
-	}
-	if err != nil {
-		p.end(err)
-		return nil
-	}
-	go func() {
-		p.end(p.run.Wait())
-	}()
-	return p
-}
-
-// end sends an "end" message to the client, containing the process id and the
-// given error value. It also removes the binary, if present.
-func (p *process) end(err error) {
-	if p.bin != "" {
-		defer os.Remove(p.bin)
-	}
-	m := &Message{Kind: "end"}
-	if err != nil {
-		m.Body = err.Error()
-	}
-	p.out <- m
-	close(p.out)
-}
-
-// A killer provides a mechanism to terminate a process.
-// The Kill method returns only once the process has exited.
-type killer interface {
-	Kill()
-}
-
-// limiter returns a channel that wraps the given channel.
-// It receives Messages from the given channel and sends them to the returned
-// channel until it passes msgLimit messages, at which point it will kill the
-// process and pass only the "end" message.
-// When the given channel is closed, or when the "end" message is received,
-// it closes the returned channel.
-func limiter(in <-chan *Message, p killer) <-chan *Message {
-	out := make(chan *Message)
-	go func() {
-		defer close(out)
-		n := 0
-		for m := range in {
-			switch {
-			case n < msgLimit || m.Kind == "end":
-				out <- m
-				if m.Kind == "end" {
-					return
-				}
-			case n == msgLimit:
-				// Kill in a goroutine as Kill will not return
-				// until the process' output has been
-				// processed, and we're doing that in this loop.
-				go p.Kill()
-			default:
-				continue // don't increment
-			}
-			n++
-		}
-	}()
-	return out
-}
-
-// buffer returns a channel that wraps the given channel. It receives messages
-// from the given channel and sends them to the returned channel.
-// Message bodies are gathered over the period msgDelay and coalesced into a
-// single Message before they are passed on. Messages of the same kind are
-// coalesced; when a message of a different kind is received, any buffered
-// messages are flushed. When the given channel is closed, buffer flushes the
-// remaining buffered messages and closes the returned channel.
-// The timeAfter func should be time.After. It exists for testing.
-func buffer(in <-chan *Message, timeAfter func(time.Duration) <-chan time.Time) <-chan *Message {
-	out := make(chan *Message)
-	go func() {
-		defer close(out)
-		var (
-			tc    <-chan time.Time
-			buf   []byte
-			kind  string
-			flush = func() {
-				if len(buf) == 0 {
-					return
-				}
-				out <- &Message{Kind: kind, Body: safeString(buf)}
-				buf = buf[:0] // recycle buffer
-				kind = ""
-			}
-		)
-		for {
-			select {
-			case m, ok := <-in:
-				if !ok {
-					flush()
-					return
-				}
-				if m.Kind == "end" {
-					flush()
-					out <- m
-					return
-				}
-				if kind != m.Kind {
-					flush()
-					kind = m.Kind
-					if tc == nil {
-						tc = timeAfter(msgDelay)
-					}
-				}
-				buf = append(buf, m.Body...)
-			case <-tc:
-				flush()
-				tc = nil
-			}
-		}
-	}()
-	return out
-}
-
-// Kill stops the process if it is running and waits for it to exit.
-func (p *process) Kill() {
-	if p == nil || p.run == nil {
-		return
-	}
-	p.run.Process.Kill()
-	<-p.done // block until process exits
-}
-
-// shebang looks for a shebang ('#!') at the beginning of the passed string.
-// If found, it returns the path and args after the shebang.
-// args includes the command as args[0].
-func shebang(body string) (path string, args []string) {
-	body = strings.TrimSpace(body)
-	if !strings.HasPrefix(body, "#!") {
-		return "", nil
-	}
-	if i := strings.Index(body, "\n"); i >= 0 {
-		body = body[:i]
-	}
-	fs := strings.Fields(body[2:])
-	return fs[0], fs
-}
-
-// startProcess starts a given program given its path and passing the given body
-// to the command standard input.
-func (p *process) startProcess(path string, args []string, body string) error {
-	cmd := &exec.Cmd{
-		Path:   path,
-		Args:   args,
-		Stdin:  strings.NewReader(body),
-		Stdout: &messageWriter{kind: "stdout", out: p.out},
-		Stderr: &messageWriter{kind: "stderr", out: p.out},
-	}
-	if err := cmd.Start(); err != nil {
-		return err
-	}
-	p.run = cmd
-	return nil
-}
-
-// start builds and starts the given program, sending its output to p.out,
-// and stores the running *exec.Cmd in the run field.
-func (p *process) start(body string, opt *Options) error {
-	// We "go build" and then exec the binary so that the
-	// resultant *exec.Cmd is a handle to the user's program
-	// (rather than the go tool process).
-	// This makes Kill work.
-
-	bin := filepath.Join(tmpdir, "compile"+strconv.Itoa(<-uniq))
-	src := bin + ".go"
-	if runtime.GOOS == "windows" {
-		bin += ".exe"
-	}
-
-	// write body to x.go
-	defer os.Remove(src)
-	err := ioutil.WriteFile(src, []byte(body), 0666)
-	if err != nil {
-		return err
-	}
-
-	// build x.go, creating x
-	p.bin = bin // to be removed by p.end
-	dir, file := filepath.Split(src)
-	args := []string{"go", "build", "-tags", "OMIT"}
-	if opt != nil && opt.Race {
-		p.out <- &Message{
-			Kind: "stderr",
-			Body: "Running with race detector.\n",
-		}
-		args = append(args, "-race")
-	}
-	args = append(args, "-o", bin, file)
-	cmd := p.cmd(dir, args...)
-	cmd.Stdout = cmd.Stderr // send compiler output to stderr
-	if err := cmd.Run(); err != nil {
-		return err
-	}
-
-	// run x
-	if isNacl() {
-		cmd, err = p.naclCmd(bin)
-		if err != nil {
-			return err
-		}
-	} else {
-		cmd = p.cmd("", bin)
-	}
-	if opt != nil && opt.Race {
-		cmd.Env = append(cmd.Env, "GOMAXPROCS=2")
-	}
-	if err := cmd.Start(); err != nil {
-		// If we failed to exec, that might be because they built
-		// a non-main package instead of an executable.
-		// Check and report that.
-		if name, err := packageName(body); err == nil && name != "main" {
-			return errors.New(`executable programs must use "package main"`)
-		}
-		return err
-	}
-	p.run = cmd
-	return nil
-}
-
-// cmd builds an *exec.Cmd that writes its standard output and error to the
-// process' output channel.
-func (p *process) cmd(dir string, args ...string) *exec.Cmd {
-	cmd := exec.Command(args[0], args[1:]...)
-	cmd.Dir = dir
-	cmd.Env = Environ()
-	cmd.Stdout = &messageWriter{kind: "stdout", out: p.out}
-	cmd.Stderr = &messageWriter{kind: "stderr", out: p.out}
-	return cmd
-}
-
-func isNacl() bool {
-	for _, v := range append(Environ(), os.Environ()...) {
-		if v == "GOOS=nacl" {
-			return true
-		}
-	}
-	return false
-}
-
-// naclCmd returns an *exec.Cmd that executes bin under native client.
-func (p *process) naclCmd(bin string) (*exec.Cmd, error) {
-	pwd, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-	var args []string
-	env := []string{
-		"NACLENV_GOOS=" + runtime.GOOS,
-		"NACLENV_GOROOT=/go",
-		"NACLENV_NACLPWD=" + strings.Replace(pwd, runtime.GOROOT(), "/go", 1),
-	}
-	switch runtime.GOARCH {
-	case "amd64":
-		env = append(env, "NACLENV_GOARCH=amd64p32")
-		args = []string{"sel_ldr_x86_64"}
-	case "386":
-		env = append(env, "NACLENV_GOARCH=386")
-		args = []string{"sel_ldr_x86_32"}
-	case "arm":
-		env = append(env, "NACLENV_GOARCH=arm")
-		selLdr, err := exec.LookPath("sel_ldr_arm")
-		if err != nil {
-			return nil, err
-		}
-		args = []string{"nacl_helper_bootstrap_arm", selLdr, "--reserved_at_zero=0xXXXXXXXXXXXXXXXX"}
-	default:
-		return nil, errors.New("native client does not support GOARCH=" + runtime.GOARCH)
-	}
-
-	cmd := p.cmd("", append(args, "-l", "/dev/null", "-S", "-e", bin)...)
-	cmd.Env = append(cmd.Env, env...)
-
-	return cmd, nil
-}
-
-func packageName(body string) (string, error) {
-	f, err := parser.ParseFile(token.NewFileSet(), "prog.go",
-		strings.NewReader(body), parser.PackageClauseOnly)
-	if err != nil {
-		return "", err
-	}
-	return f.Name.String(), nil
-}
-
-// messageWriter is an io.Writer that converts all writes to Message sends on
-// the out channel with the specified id and kind.
-type messageWriter struct {
-	kind string
-	out  chan<- *Message
-}
-
-func (w *messageWriter) Write(b []byte) (n int, err error) {
-	w.out <- &Message{Kind: w.kind, Body: safeString(b)}
-	return len(b), nil
-}
-
-// safeString returns b as a valid UTF-8 string.
-func safeString(b []byte) string {
-	if utf8.Valid(b) {
-		return string(b)
-	}
-	var buf bytes.Buffer
-	for len(b) > 0 {
-		r, size := utf8.DecodeRune(b)
-		b = b[size:]
-		buf.WriteRune(r)
-	}
-	return buf.String()
-}
-
-var tmpdir string
-
-func init() {
-	// find real path to temporary directory
-	var err error
-	tmpdir, err = filepath.EvalSymlinks(os.TempDir())
-	if err != nil {
-		log.Fatal(err)
-	}
-}
-
-var uniq = make(chan int) // a source of numbers for naming temporary files
-
-func init() {
-	go func() {
-		for i := 0; ; i++ {
-			uniq <- i
-		}
-	}()
-}
diff --git a/installer/vendor/golang.org/x/tools/playground/socket/socket_test.go b/installer/vendor/golang.org/x/tools/playground/socket/socket_test.go
deleted file mode 100644
index 0ceb2500f2..0000000000
--- a/installer/vendor/golang.org/x/tools/playground/socket/socket_test.go
+++ /dev/null
@@ -1,77 +0,0 @@
-// Copyright 2015 The Go Authors.  All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package socket
-
-import (
-	"testing"
-	"time"
-)
-
-func TestBuffer(t *testing.T) {
-	afterChan := make(chan time.Time)
-	ch := make(chan *Message)
-	go func() {
-		ch <- &Message{Kind: "err", Body: "a"}
-		ch <- &Message{Kind: "err", Body: "b"}
-		ch <- &Message{Kind: "out", Body: "1"}
-		ch <- &Message{Kind: "out", Body: "2"}
-		afterChan <- time.Time{} // value itself doesn't matter
-		ch <- &Message{Kind: "out", Body: "3"}
-		ch <- &Message{Kind: "out", Body: "4"}
-		close(ch)
-	}()
-
-	var ms []*Message
-	timeAfter := func(d time.Duration) <-chan time.Time {
-		return afterChan
-	}
-	for m := range buffer(ch, timeAfter) {
-		ms = append(ms, m)
-	}
-	if len(ms) != 3 {
-		t.Fatalf("got %v messages, want 3", len(ms))
-	}
-	if g, w := ms[0].Body, "ab"; g != w {
-		t.Errorf("message 0 body = %q, want %q", g, w)
-	}
-	if g, w := ms[1].Body, "12"; g != w {
-		t.Errorf("message 1 body = %q, want %q", g, w)
-	}
-	if g, w := ms[2].Body, "34"; g != w {
-		t.Errorf("message 2 body = %q, want %q", g, w)
-	}
-}
-
-type killRecorder chan struct{}
-
-func (k killRecorder) Kill() { close(k) }
-
-func TestLimiter(t *testing.T) {
-	ch := make(chan *Message)
-	go func() {
-		var m Message
-		for i := 0; i < msgLimit+10; i++ {
-			ch <- &m
-		}
-		ch <- &Message{Kind: "end"}
-	}()
-
-	kr := make(killRecorder)
-	n := 0
-	for m := range limiter(ch, kr) {
-		n++
-		if n > msgLimit && m.Kind != "end" {
-			t.Errorf("received non-end message after limit")
-		}
-	}
-	if n != msgLimit+1 {
-		t.Errorf("received %v messages, want %v", n, msgLimit+1)
-	}
-	select {
-	case <-kr:
-	case <-time.After(100 * time.Millisecond):
-		t.Errorf("process wasn't killed after reaching limit")
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/present/args.go b/installer/vendor/golang.org/x/tools/present/args.go
deleted file mode 100644
index 49ee1a98a7..0000000000
--- a/installer/vendor/golang.org/x/tools/present/args.go
+++ /dev/null
@@ -1,229 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"errors"
-	"regexp"
-	"strconv"
-	"unicode/utf8"
-)
-
-// This file is stolen from go/src/cmd/godoc/codewalk.go.
-// It's an evaluator for the file address syntax implemented by acme and sam,
-// but using Go-native regular expressions.
-// To keep things reasonably close, this version uses (?m:re) for all user-provided
-// regular expressions. That is the only change to the code from codewalk.go.
-// See http://plan9.bell-labs.com/sys/doc/sam/sam.html Table II
-// for details on the syntax.
-
-// addrToByte evaluates the given address starting at offset start in data.
-// It returns the lo and hi byte offset of the matched region within data.
-func addrToByteRange(addr string, start int, data []byte) (lo, hi int, err error) {
-	if addr == "" {
-		lo, hi = start, len(data)
-		return
-	}
-	var (
-		dir        byte
-		prevc      byte
-		charOffset bool
-	)
-	lo = start
-	hi = start
-	for addr != "" && err == nil {
-		c := addr[0]
-		switch c {
-		default:
-			err = errors.New("invalid address syntax near " + string(c))
-		case ',':
-			if len(addr) == 1 {
-				hi = len(data)
-			} else {
-				_, hi, err = addrToByteRange(addr[1:], hi, data)
-			}
-			return
-
-		case '+', '-':
-			if prevc == '+' || prevc == '-' {
-				lo, hi, err = addrNumber(data, lo, hi, prevc, 1, charOffset)
-			}
-			dir = c
-
-		case '$':
-			lo = len(data)
-			hi = len(data)
-			if len(addr) > 1 {
-				dir = '+'
-			}
-
-		case '#':
-			charOffset = true
-
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			var i int
-			for i = 1; i < len(addr); i++ {
-				if addr[i] < '0' || addr[i] > '9' {
-					break
-				}
-			}
-			var n int
-			n, err = strconv.Atoi(addr[0:i])
-			if err != nil {
-				break
-			}
-			lo, hi, err = addrNumber(data, lo, hi, dir, n, charOffset)
-			dir = 0
-			charOffset = false
-			prevc = c
-			addr = addr[i:]
-			continue
-
-		case '/':
-			var i, j int
-		Regexp:
-			for i = 1; i < len(addr); i++ {
-				switch addr[i] {
-				case '\\':
-					i++
-				case '/':
-					j = i + 1
-					break Regexp
-				}
-			}
-			if j == 0 {
-				j = i
-			}
-			pattern := addr[1:i]
-			lo, hi, err = addrRegexp(data, lo, hi, dir, pattern)
-			prevc = c
-			addr = addr[j:]
-			continue
-		}
-		prevc = c
-		addr = addr[1:]
-	}
-
-	if err == nil && dir != 0 {
-		lo, hi, err = addrNumber(data, lo, hi, dir, 1, charOffset)
-	}
-	if err != nil {
-		return 0, 0, err
-	}
-	return lo, hi, nil
-}
-
-// addrNumber applies the given dir, n, and charOffset to the address lo, hi.
-// dir is '+' or '-', n is the count, and charOffset is true if the syntax
-// used was #n.  Applying +n (or +#n) means to advance n lines
-// (or characters) after hi.  Applying -n (or -#n) means to back up n lines
-// (or characters) before lo.
-// The return value is the new lo, hi.
-func addrNumber(data []byte, lo, hi int, dir byte, n int, charOffset bool) (int, int, error) {
-	switch dir {
-	case 0:
-		lo = 0
-		hi = 0
-		fallthrough
-
-	case '+':
-		if charOffset {
-			pos := hi
-			for ; n > 0 && pos < len(data); n-- {
-				_, size := utf8.DecodeRune(data[pos:])
-				pos += size
-			}
-			if n == 0 {
-				return pos, pos, nil
-			}
-			break
-		}
-		// find next beginning of line
-		if hi > 0 {
-			for hi < len(data) && data[hi-1] != '\n' {
-				hi++
-			}
-		}
-		lo = hi
-		if n == 0 {
-			return lo, hi, nil
-		}
-		for ; hi < len(data); hi++ {
-			if data[hi] != '\n' {
-				continue
-			}
-			switch n--; n {
-			case 1:
-				lo = hi + 1
-			case 0:
-				return lo, hi + 1, nil
-			}
-		}
-
-	case '-':
-		if charOffset {
-			// Scan backward for bytes that are not UTF-8 continuation bytes.
-			pos := lo
-			for ; pos > 0 && n > 0; pos-- {
-				if data[pos]&0xc0 != 0x80 {
-					n--
-				}
-			}
-			if n == 0 {
-				return pos, pos, nil
-			}
-			break
-		}
-		// find earlier beginning of line
-		for lo > 0 && data[lo-1] != '\n' {
-			lo--
-		}
-		hi = lo
-		if n == 0 {
-			return lo, hi, nil
-		}
-		for ; lo >= 0; lo-- {
-			if lo > 0 && data[lo-1] != '\n' {
-				continue
-			}
-			switch n--; n {
-			case 1:
-				hi = lo
-			case 0:
-				return lo, hi, nil
-			}
-		}
-	}
-
-	return 0, 0, errors.New("address out of range")
-}
-
-// addrRegexp searches for pattern in the given direction starting at lo, hi.
-// The direction dir is '+' (search forward from hi) or '-' (search backward from lo).
-// Backward searches are unimplemented.
-func addrRegexp(data []byte, lo, hi int, dir byte, pattern string) (int, int, error) {
-	// We want ^ and $ to work as in sam/acme, so use ?m.
-	re, err := regexp.Compile("(?m:" + pattern + ")")
-	if err != nil {
-		return 0, 0, err
-	}
-	if dir == '-' {
-		// Could implement reverse search using binary search
-		// through file, but that seems like overkill.
-		return 0, 0, errors.New("reverse search not implemented")
-	}
-	m := re.FindIndex(data[hi:])
-	if len(m) > 0 {
-		m[0] += hi
-		m[1] += hi
-	} else if hi > 0 {
-		// No match.  Wrap to beginning of data.
-		m = re.FindIndex(data)
-	}
-	if len(m) == 0 {
-		return 0, 0, errors.New("no match for " + pattern)
-	}
-	return m[0], m[1], nil
-}
diff --git a/installer/vendor/golang.org/x/tools/present/caption.go b/installer/vendor/golang.org/x/tools/present/caption.go
deleted file mode 100644
index 00e0b5d058..0000000000
--- a/installer/vendor/golang.org/x/tools/present/caption.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import "strings"
-
-func init() {
-	Register("caption", parseCaption)
-}
-
-type Caption struct {
-	Text string
-}
-
-func (c Caption) TemplateName() string { return "caption" }
-
-func parseCaption(_ *Context, _ string, _ int, text string) (Elem, error) {
-	text = strings.TrimSpace(strings.TrimPrefix(text, ".caption"))
-	return Caption{text}, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/present/code.go b/installer/vendor/golang.org/x/tools/present/code.go
deleted file mode 100644
index b47a72a506..0000000000
--- a/installer/vendor/golang.org/x/tools/present/code.go
+++ /dev/null
@@ -1,267 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"bufio"
-	"bytes"
-	"fmt"
-	"html/template"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-)
-
-// PlayEnabled specifies whether runnable playground snippets should be
-// displayed in the present user interface.
-var PlayEnabled = false
-
-// TODO(adg): replace the PlayEnabled flag with something less spaghetti-like.
-// Instead this will probably be determined by a template execution Context
-// value that contains various global metadata required when rendering
-// templates.
-
-// NotesEnabled specifies whether presenter notes should be displayed in the
-// present user interface.
-var NotesEnabled = false
-
-func init() {
-	Register("code", parseCode)
-	Register("play", parseCode)
-}
-
-type Code struct {
-	Text     template.HTML
-	Play     bool   // runnable code
-	Edit     bool   // editable code
-	FileName string // file name
-	Ext      string // file extension
-	Raw      []byte // content of the file
-}
-
-func (c Code) TemplateName() string { return "code" }
-
-// The input line is a .code or .play entry with a file name and an optional HLfoo marker on the end.
-// Anything between the file and HL (if any) is an address expression, which we treat as a string here.
-// We pick off the HL first, for easy parsing.
-var (
-	highlightRE = regexp.MustCompile(`\s+HL([a-zA-Z0-9_]+)?$`)
-	hlCommentRE = regexp.MustCompile(`(.+) // HL(.*)$`)
-	codeRE      = regexp.MustCompile(`\.(code|play)\s+((?:(?:-edit|-numbers)\s+)*)([^\s]+)(?:\s+(.*))?$`)
-)
-
-// parseCode parses a code present directive. Its syntax:
-//   .code [-numbers] [-edit] <filename> [address] [highlight]
-// The directive may also be ".play" if the snippet is executable.
-func parseCode(ctx *Context, sourceFile string, sourceLine int, cmd string) (Elem, error) {
-	cmd = strings.TrimSpace(cmd)
-
-	// Pull off the HL, if any, from the end of the input line.
-	highlight := ""
-	if hl := highlightRE.FindStringSubmatchIndex(cmd); len(hl) == 4 {
-		if hl[2] < 0 || hl[3] < 0 {
-			return nil, fmt.Errorf("%s:%d invalid highlight syntax", sourceFile, sourceLine)
-		}
-		highlight = cmd[hl[2]:hl[3]]
-		cmd = cmd[:hl[2]-2]
-	}
-
-	// Parse the remaining command line.
-	// Arguments:
-	// args[0]: whole match
-	// args[1]:  .code/.play
-	// args[2]: flags ("-edit -numbers")
-	// args[3]: file name
-	// args[4]: optional address
-	args := codeRE.FindStringSubmatch(cmd)
-	if len(args) != 5 {
-		return nil, fmt.Errorf("%s:%d: syntax error for .code/.play invocation", sourceFile, sourceLine)
-	}
-	command, flags, file, addr := args[1], args[2], args[3], strings.TrimSpace(args[4])
-	play := command == "play" && PlayEnabled
-
-	// Read in code file and (optionally) match address.
-	filename := filepath.Join(filepath.Dir(sourceFile), file)
-	textBytes, err := ctx.ReadFile(filename)
-	if err != nil {
-		return nil, fmt.Errorf("%s:%d: %v", sourceFile, sourceLine, err)
-	}
-	lo, hi, err := addrToByteRange(addr, 0, textBytes)
-	if err != nil {
-		return nil, fmt.Errorf("%s:%d: %v", sourceFile, sourceLine, err)
-	}
-	if lo > hi {
-		// The search in addrToByteRange can wrap around so we might
-		// end up with the range ending before its starting point
-		hi, lo = lo, hi
-	}
-
-	// Acme pattern matches can stop mid-line,
-	// so run to end of line in both directions if not at line start/end.
-	for lo > 0 && textBytes[lo-1] != '\n' {
-		lo--
-	}
-	if hi > 0 {
-		for hi < len(textBytes) && textBytes[hi-1] != '\n' {
-			hi++
-		}
-	}
-
-	lines := codeLines(textBytes, lo, hi)
-
-	data := &codeTemplateData{
-		Lines:   formatLines(lines, highlight),
-		Edit:    strings.Contains(flags, "-edit"),
-		Numbers: strings.Contains(flags, "-numbers"),
-	}
-
-	// Include before and after in a hidden span for playground code.
-	if play {
-		data.Prefix = textBytes[:lo]
-		data.Suffix = textBytes[hi:]
-	}
-
-	var buf bytes.Buffer
-	if err := codeTemplate.Execute(&buf, data); err != nil {
-		return nil, err
-	}
-	return Code{
-		Text:     template.HTML(buf.String()),
-		Play:     play,
-		Edit:     data.Edit,
-		FileName: filepath.Base(filename),
-		Ext:      filepath.Ext(filename),
-		Raw:      rawCode(lines),
-	}, nil
-}
-
-// formatLines returns a new slice of codeLine with the given lines
-// replacing tabs with spaces and adding highlighting where needed.
-func formatLines(lines []codeLine, highlight string) []codeLine {
-	formatted := make([]codeLine, len(lines))
-	for i, line := range lines {
-		// Replace tabs with spaces, which work better in HTML.
-		line.L = strings.Replace(line.L, "\t", "    ", -1)
-
-		// Highlight lines that end with "// HL[highlight]"
-		// and strip the magic comment.
-		if m := hlCommentRE.FindStringSubmatch(line.L); m != nil {
-			line.L = m[1]
-			line.HL = m[2] == highlight
-		}
-
-		formatted[i] = line
-	}
-	return formatted
-}
-
-// rawCode returns the code represented by the given codeLines without any kind
-// of formatting.
-func rawCode(lines []codeLine) []byte {
-	b := new(bytes.Buffer)
-	for _, line := range lines {
-		b.WriteString(line.L)
-		b.WriteByte('\n')
-	}
-	return b.Bytes()
-}
-
-type codeTemplateData struct {
-	Lines          []codeLine
-	Prefix, Suffix []byte
-	Edit, Numbers  bool
-}
-
-var leadingSpaceRE = regexp.MustCompile(`^[ \t]*`)
-
-var codeTemplate = template.Must(template.New("code").Funcs(template.FuncMap{
-	"trimSpace":    strings.TrimSpace,
-	"leadingSpace": leadingSpaceRE.FindString,
-}).Parse(codeTemplateHTML))
-
-const codeTemplateHTML = `
-{{with .Prefix}}<pre style="display: none"><span>{{printf "%s" .}}</span></pre>{{end}}
-
-<pre{{if .Edit}} contenteditable="true" spellcheck="false"{{end}}{{if .Numbers}} class="numbers"{{end}}>{{/*
-	*/}}{{range .Lines}}<span num="{{.N}}">{{/*
-	*/}}{{if .HL}}{{leadingSpace .L}}<b>{{trimSpace .L}}</b>{{/*
-	*/}}{{else}}{{.L}}{{end}}{{/*
-*/}}</span>
-{{end}}</pre>
-
-{{with .Suffix}}<pre style="display: none"><span>{{printf "%s" .}}</span></pre>{{end}}
-`
-
-// codeLine represents a line of code extracted from a source file.
-type codeLine struct {
-	L  string // The line of code.
-	N  int    // The line number from the source file.
-	HL bool   // Whether the line should be highlighted.
-}
-
-// codeLines takes a source file and returns the lines that
-// span the byte range specified by start and end.
-// It discards lines that end in "OMIT".
-func codeLines(src []byte, start, end int) (lines []codeLine) {
-	startLine := 1
-	for i, b := range src {
-		if i == start {
-			break
-		}
-		if b == '\n' {
-			startLine++
-		}
-	}
-	s := bufio.NewScanner(bytes.NewReader(src[start:end]))
-	for n := startLine; s.Scan(); n++ {
-		l := s.Text()
-		if strings.HasSuffix(l, "OMIT") {
-			continue
-		}
-		lines = append(lines, codeLine{L: l, N: n})
-	}
-	// Trim leading and trailing blank lines.
-	for len(lines) > 0 && len(lines[0].L) == 0 {
-		lines = lines[1:]
-	}
-	for len(lines) > 0 && len(lines[len(lines)-1].L) == 0 {
-		lines = lines[:len(lines)-1]
-	}
-	return
-}
-
-func parseArgs(name string, line int, args []string) (res []interface{}, err error) {
-	res = make([]interface{}, len(args))
-	for i, v := range args {
-		if len(v) == 0 {
-			return nil, fmt.Errorf("%s:%d bad code argument %q", name, line, v)
-		}
-		switch v[0] {
-		case '0', '1', '2', '3', '4', '5', '6', '7', '8', '9':
-			n, err := strconv.Atoi(v)
-			if err != nil {
-				return nil, fmt.Errorf("%s:%d bad code argument %q", name, line, v)
-			}
-			res[i] = n
-		case '/':
-			if len(v) < 2 || v[len(v)-1] != '/' {
-				return nil, fmt.Errorf("%s:%d bad code argument %q", name, line, v)
-			}
-			res[i] = v
-		case '$':
-			res[i] = "$"
-		case '_':
-			if len(v) == 1 {
-				// Do nothing; "_" indicates an intentionally empty parameter.
-				break
-			}
-			fallthrough
-		default:
-			return nil, fmt.Errorf("%s:%d bad code argument %q", name, line, v)
-		}
-	}
-	return
-}
diff --git a/installer/vendor/golang.org/x/tools/present/code_test.go b/installer/vendor/golang.org/x/tools/present/code_test.go
deleted file mode 100644
index b01a4e3105..0000000000
--- a/installer/vendor/golang.org/x/tools/present/code_test.go
+++ /dev/null
@@ -1,225 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"html/template"
-	"strings"
-	"testing"
-)
-
-func TestParseCode(t *testing.T) {
-	// Enable play but revert the change at the end.
-	defer func(play bool) { PlayEnabled = play }(PlayEnabled)
-	PlayEnabled = true
-
-	helloTest := []byte(`
-package main
-
-import "fmt"
-
-func main() {
-	fmt.Println("hello, test")
-}
-`)
-	helloTestHTML := template.HTML(`
-<pre><span num="2">package main</span>
-<span num="3"></span>
-<span num="4">import &#34;fmt&#34;</span>
-<span num="5"></span>
-<span num="6">func main() {</span>
-<span num="7">    fmt.Println(&#34;hello, test&#34;)</span>
-<span num="8">}</span>
-</pre>
-`)
-	helloTestHL := []byte(`
-package main
-
-import "fmt" // HLimport
-
-func main() { // HLfunc
-	fmt.Println("hello, test") // HL
-}
-`)
-	highlight := func(h template.HTML, s string) template.HTML {
-		return template.HTML(strings.Replace(string(h), s, "<b>"+s+"</b>", -1))
-	}
-	read := func(b []byte, err error) func(string) ([]byte, error) {
-		return func(string) ([]byte, error) { return b, err }
-	}
-
-	tests := []struct {
-		name       string
-		readFile   func(string) ([]byte, error)
-		sourceFile string
-		cmd        string
-		err        string
-		Code
-	}{
-		{
-			name:       "all code, no play",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Raw:      helloTest,
-				Text:     helloTestHTML,
-			},
-		},
-		{
-			name:       "all code, play",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".play main.go",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Play:     true,
-				Raw:      helloTest,
-				Text:     helloTestHTML,
-			},
-		},
-		{
-			name:       "all code, highlighted",
-			readFile:   read(helloTestHL, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Raw:      helloTestHL,
-				Text:     highlight(helloTestHTML, "fmt.Println(&#34;hello, test&#34;)"),
-			},
-		},
-		{
-			name:       "highlight only func",
-			readFile:   read(helloTestHL, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go HLfunc",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Play:     false,
-				Raw:      []byte("package main\n\nimport \"fmt\" // HLimport\n\nfunc main() { // HLfunc\n\tfmt.Println(\"hello, test\") // HL\n}"),
-				Text:     highlight(helloTestHTML, "func main() {"),
-			},
-		},
-		{
-			name:       "bad highlight syntax",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go HL",
-			err:        "invalid highlight syntax",
-		},
-		{
-			name:       "error reading file",
-			readFile:   read(nil, fmt.Errorf("nope")),
-			sourceFile: "main.go",
-			cmd:        ".code main.go",
-			err:        "main.go:0: nope",
-		},
-		{
-			name:       "from func main to the end",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go /func main/,",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Play:     false,
-				Raw:      []byte("func main() {\n\tfmt.Println(\"hello, test\")\n}"),
-				Text:     "<pre><span num=\"6\">func main() {</span>\n<span num=\"7\">    fmt.Println(&#34;hello, test&#34;)</span>\n<span num=\"8\">}</span>\n</pre>",
-			},
-		},
-		{
-			name:       "just func main",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go /func main/",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Play:     false,
-				Raw:      []byte("func main() {"),
-				Text:     "<pre><span num=\"6\">func main() {</span>\n</pre>",
-			},
-		},
-		{
-			name:       "bad address",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code main.go /function main/",
-			err:        "main.go:0: no match for function main",
-		},
-		{
-			name:       "all code with  numbers",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code -numbers main.go",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Raw:      helloTest,
-				// Replacing the first "<pre>"
-				Text: "<pre class=\"numbers\">" + helloTestHTML[6:],
-			},
-		},
-		{
-			name:       "all code editable",
-			readFile:   read(helloTest, nil),
-			sourceFile: "main.go",
-			cmd:        ".code -edit main.go",
-			Code: Code{
-				Ext:      ".go",
-				FileName: "main.go",
-				Raw:      helloTest,
-				Text:     "<pre contenteditable=\"true\" spellcheck=\"false\">" + helloTestHTML[6:],
-			},
-		},
-	}
-
-	trimHTML := func(t template.HTML) string { return strings.TrimSpace(string(t)) }
-	trimBytes := func(b []byte) string { return strings.TrimSpace(string(b)) }
-
-	for _, tt := range tests {
-		ctx := &Context{tt.readFile}
-		e, err := parseCode(ctx, tt.sourceFile, 0, tt.cmd)
-		if err != nil {
-			if tt.err == "" {
-				t.Errorf("%s: unexpected error %v", tt.name, err)
-			} else if !strings.Contains(err.Error(), tt.err) {
-				t.Errorf("%s: expected error %s; got %v", tt.name, tt.err, err)
-			}
-			continue
-		}
-		if tt.err != "" {
-			t.Errorf("%s: expected error %s; but got none", tt.name, tt.err)
-			continue
-		}
-		c, ok := e.(Code)
-		if !ok {
-			t.Errorf("%s: expected a Code value; got %T", tt.name, e)
-			continue
-		}
-		if c.FileName != tt.FileName {
-			t.Errorf("%s: expected FileName %s; got %s", tt.name, tt.FileName, c.FileName)
-		}
-		if c.Ext != tt.Ext {
-			t.Errorf("%s: expected Ext %s; got %s", tt.name, tt.Ext, c.Ext)
-		}
-		if c.Play != tt.Play {
-			t.Errorf("%s: expected Play %v; got %v", tt.name, tt.Play, c.Play)
-		}
-		if got, wants := trimBytes(c.Raw), trimBytes(tt.Raw); got != wants {
-			t.Errorf("%s: expected Raw \n%q\n; got \n%q\n", tt.name, wants, got)
-		}
-		if got, wants := trimHTML(c.Text), trimHTML(tt.Text); got != wants {
-			t.Errorf("%s: expected Text \n%q\n; got \n%q\n", tt.name, wants, got)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/present/doc.go b/installer/vendor/golang.org/x/tools/present/doc.go
deleted file mode 100644
index 1eae9c8e03..0000000000
--- a/installer/vendor/golang.org/x/tools/present/doc.go
+++ /dev/null
@@ -1,262 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-/*
-The present file format
-
-Present files have the following format.  The first non-blank non-comment
-line is the title, so the header looks like
-
-	Title of document
-	Subtitle of document
-	15:04 2 Jan 2006
-	Tags: foo, bar, baz
-	<blank line>
-	Author Name
-	Job title, Company
-	joe@example.com
-	http://url/
-	@twitter_name
-
-The subtitle, date, and tags lines are optional.
-
-The date line may be written without a time:
-	2 Jan 2006
-In this case, the time will be interpreted as 10am UTC on that date.
-
-The tags line is a comma-separated list of tags that may be used to categorize
-the document.
-
-The author section may contain a mixture of text, twitter names, and links.
-For slide presentations, only the plain text lines will be displayed on the
-first slide.
-
-Multiple presenters may be specified, separated by a blank line.
-
-After that come slides/sections, each after a blank line:
-
-	* Title of slide or section (must have asterisk)
-
-	Some Text
-
-	** Subsection
-
-	- bullets
-	- more bullets
-	- a bullet with
-
-	*** Sub-subsection
-
-	Some More text
-
-	  Preformatted text
-	  is indented (however you like)
-
-	Further Text, including invocations like:
-
-	.code x.go /^func main/,/^}/
-	.play y.go
-	.image image.jpg
-	.background image.jpg
-	.iframe http://foo
-	.link http://foo label
-	.html file.html
-	.caption _Gopher_ by [[https://www.instagram.com/reneefrench/][Renée French]]
-
-	Again, more text
-
-Blank lines are OK (not mandatory) after the title and after the
-text.  Text, bullets, and .code etc. are all optional; title is
-not.
-
-Lines starting with # in column 1 are commentary.
-
-Fonts:
-
-Within the input for plain text or lists, text bracketed by font
-markers will be presented in italic, bold, or program font.
-Marker characters are _ (italic), * (bold) and ` (program font).
-An opening marker must be preceded by a space or punctuation
-character or else be at start of a line; similarly, a closing
-marker must be followed by a space or punctuation character or
-else be at the end of a line. Unmatched markers appear as plain text.
-There must be no spaces between markers. Within marked text,
-a single marker character becomes a space and a doubled single
-marker quotes the marker character.
-
-	_italic_
-	*bold*
-	`program`
-	Markup—_especially_italic_text_—can easily be overused.
-	_Why_use_scoped__ptr_? Use plain ***ptr* instead.
-
-Inline links:
-
-Links can be included in any text with the form [[url][label]], or
-[[url]] to use the URL itself as the label.
-
-Functions:
-
-A number of template functions are available through invocations
-in the input text. Each such invocation contains a period as the
-first character on the line, followed immediately by the name of
-the function, followed by any arguments. A typical invocation might
-be
-	.play demo.go /^func show/,/^}/
-(except that the ".play" must be at the beginning of the line and
-not be indented like this.)
-
-Here follows a description of the functions:
-
-code:
-
-Injects program source into the output by extracting code from files
-and injecting them as HTML-escaped <pre> blocks.  The argument is
-a file name followed by an optional address that specifies what
-section of the file to display. The address syntax is similar in
-its simplest form to that of ed, but comes from sam and is more
-general. See
-	http://plan9.bell-labs.com/sys/doc/sam/sam.html Table II
-for full details. The displayed block is always rounded out to a
-full line at both ends.
-
-If no pattern is present, the entire file is displayed.
-
-Any line in the program that ends with the four characters
-	OMIT
-is deleted from the source before inclusion, making it easy
-to write things like
-	.code test.go /START OMIT/,/END OMIT/
-to find snippets like this
-	tedious_code = boring_function()
-	// START OMIT
-	interesting_code = fascinating_function()
-	// END OMIT
-and see only this:
-	interesting_code = fascinating_function()
-
-Also, inside the displayed text a line that ends
-	// HL
-will be highlighted in the display; the 'h' key in the browser will
-toggle extra emphasis of any highlighted lines. A highlighting mark
-may have a suffix word, such as
-	// HLxxx
-Such highlights are enabled only if the code invocation ends with
-"HL" followed by the word:
-	.code test.go /^type Foo/,/^}/ HLxxx
-
-The .code function may take one or more flags immediately preceding
-the filename. This command shows test.go in an editable text area:
-	.code -edit test.go
-This command shows test.go with line numbers:
-	.code -numbers test.go
-
-play:
-
-The function "play" is the same as "code" but puts a button
-on the displayed source so the program can be run from the browser.
-Although only the selected text is shown, all the source is included
-in the HTML output so it can be presented to the compiler.
-
-link:
-
-Create a hyperlink. The syntax is 1 or 2 space-separated arguments.
-The first argument is always the HTTP URL.  If there is a second
-argument, it is the text label to display for this link.
-
-	.link http://golang.org golang.org
-
-image:
-
-The template uses the function "image" to inject picture files.
-
-The syntax is simple: 1 or 3 space-separated arguments.
-The first argument is always the file name.
-If there are more arguments, they are the height and width;
-both must be present, or substituted with an underscore.
-Replacing a dimension argument with the underscore parameter
-preserves the aspect ratio of the image when scaling.
-
-	.image images/betsy.jpg 100 200
-
-	.image images/janet.jpg _ 300
-
-video:
-
-The template uses the function "video" to inject video files.
-
-The syntax is simple: 2 or 4 space-separated arguments.
-The first argument is always the file name.
-The second argument is always the file content-type.
-If there are more arguments, they are the height and width;
-both must be present, or substituted with an underscore.
-Replacing a dimension argument with the underscore parameter
-preserves the aspect ratio of the video when scaling.
-
-	.video videos/evangeline.mp4 video/mp4 400 600
-
-	.video videos/mabel.ogg video/ogg 500 _
-
-background:
-
-The template uses the function "background" to set the background image for
-a slide.  The only argument is the file name of the image.
-
-	.background images/susan.jpg
-
-caption:
-
-The template uses the function "caption" to inject figure captions.
-
-The text after ".caption" is embedded in a figcaption element after
-processing styling and links as in standard text lines.
-
-	.caption _Gopher_ by [[http://www.reneefrench.com][Renée French]]
-
-iframe:
-
-The function "iframe" injects iframes (pages inside pages).
-Its syntax is the same as that of image.
-
-html:
-
-The function html includes the contents of the specified file as
-unescaped HTML. This is useful for including custom HTML elements
-that cannot be created using only the slide format.
-It is your responsibilty to make sure the included HTML is valid and safe.
-
-	.html file.html
-
-Presenter notes:
-
-Presenter notes may be enabled by appending the "-notes" flag when you run
-your "present" binary.
-
-This will allow you to open a second window by pressing 'N' from your browser
-displaying your slides. The second window is completely synced with your main
-window, except that presenter notes are only visible on the second window.
-
-Lines that begin with ": " are treated as presenter notes.
-
-	* Title of slide
-
-	Some Text
-
-	: Presenter notes (first paragraph)
-	: Presenter notes (subsequent paragraph(s))
-
-Notes may appear anywhere within the slide text. For example:
-
-	* Title of slide
-
-	: Presenter notes (first paragraph)
-
-	Some Text
-
-	: Presenter notes (subsequent paragraph(s))
-
-This has the same result as the example above.
-
-*/
-package present // import "golang.org/x/tools/present"
diff --git a/installer/vendor/golang.org/x/tools/present/html.go b/installer/vendor/golang.org/x/tools/present/html.go
deleted file mode 100644
index cca90ef4af..0000000000
--- a/installer/vendor/golang.org/x/tools/present/html.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package present
-
-import (
-	"errors"
-	"html/template"
-	"path/filepath"
-	"strings"
-)
-
-func init() {
-	Register("html", parseHTML)
-}
-
-func parseHTML(ctx *Context, fileName string, lineno int, text string) (Elem, error) {
-	p := strings.Fields(text)
-	if len(p) != 2 {
-		return nil, errors.New("invalid .html args")
-	}
-	name := filepath.Join(filepath.Dir(fileName), p[1])
-	b, err := ctx.ReadFile(name)
-	if err != nil {
-		return nil, err
-	}
-	return HTML{template.HTML(b)}, nil
-}
-
-type HTML struct {
-	template.HTML
-}
-
-func (s HTML) TemplateName() string { return "html" }
diff --git a/installer/vendor/golang.org/x/tools/present/iframe.go b/installer/vendor/golang.org/x/tools/present/iframe.go
deleted file mode 100644
index 46649f0f1e..0000000000
--- a/installer/vendor/golang.org/x/tools/present/iframe.go
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"strings"
-)
-
-func init() {
-	Register("iframe", parseIframe)
-}
-
-type Iframe struct {
-	URL    string
-	Width  int
-	Height int
-}
-
-func (i Iframe) TemplateName() string { return "iframe" }
-
-func parseIframe(ctx *Context, fileName string, lineno int, text string) (Elem, error) {
-	args := strings.Fields(text)
-	i := Iframe{URL: args[1]}
-	a, err := parseArgs(fileName, lineno, args[2:])
-	if err != nil {
-		return nil, err
-	}
-	switch len(a) {
-	case 0:
-		// no size parameters
-	case 2:
-		if v, ok := a[0].(int); ok {
-			i.Height = v
-		}
-		if v, ok := a[1].(int); ok {
-			i.Width = v
-		}
-	default:
-		return nil, fmt.Errorf("incorrect iframe invocation: %q", text)
-	}
-	return i, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/present/image.go b/installer/vendor/golang.org/x/tools/present/image.go
deleted file mode 100644
index cfa2af9ba2..0000000000
--- a/installer/vendor/golang.org/x/tools/present/image.go
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"strings"
-)
-
-func init() {
-	Register("image", parseImage)
-}
-
-type Image struct {
-	URL    string
-	Width  int
-	Height int
-}
-
-func (i Image) TemplateName() string { return "image" }
-
-func parseImage(ctx *Context, fileName string, lineno int, text string) (Elem, error) {
-	args := strings.Fields(text)
-	img := Image{URL: args[1]}
-	a, err := parseArgs(fileName, lineno, args[2:])
-	if err != nil {
-		return nil, err
-	}
-	switch len(a) {
-	case 0:
-		// no size parameters
-	case 2:
-		// If a parameter is empty (underscore) or invalid
-		// leave the field set to zero. The "image" action
-		// template will then omit that img tag attribute and
-		// the browser will calculate the value to preserve
-		// the aspect ratio.
-		if v, ok := a[0].(int); ok {
-			img.Height = v
-		}
-		if v, ok := a[1].(int); ok {
-			img.Width = v
-		}
-	default:
-		return nil, fmt.Errorf("incorrect image invocation: %q", text)
-	}
-	return img, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/present/link.go b/installer/vendor/golang.org/x/tools/present/link.go
deleted file mode 100644
index 2aead352e9..0000000000
--- a/installer/vendor/golang.org/x/tools/present/link.go
+++ /dev/null
@@ -1,100 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"log"
-	"net/url"
-	"strings"
-)
-
-func init() {
-	Register("link", parseLink)
-}
-
-type Link struct {
-	URL   *url.URL
-	Label string
-}
-
-func (l Link) TemplateName() string { return "link" }
-
-func parseLink(ctx *Context, fileName string, lineno int, text string) (Elem, error) {
-	args := strings.Fields(text)
-	if len(args) < 2 {
-		return nil, fmt.Errorf("link element must have at least 2 arguments")
-	}
-	url, err := url.Parse(args[1])
-	if err != nil {
-		return nil, err
-	}
-	label := ""
-	if len(args) > 2 {
-		label = strings.Join(args[2:], " ")
-	} else {
-		scheme := url.Scheme + "://"
-		if url.Scheme == "mailto" {
-			scheme = "mailto:"
-		}
-		label = strings.Replace(url.String(), scheme, "", 1)
-	}
-	return Link{url, label}, nil
-}
-
-func renderLink(href, text string) string {
-	text = font(text)
-	if text == "" {
-		text = href
-	}
-	// Open links in new window only when their url is absolute.
-	target := "_blank"
-	if u, err := url.Parse(href); err != nil {
-		log.Println("renderLink parsing url:", err)
-	} else if !u.IsAbs() || u.Scheme == "javascript" {
-		target = "_self"
-	}
-
-	return fmt.Sprintf(`<a href="%s" target="%s">%s</a>`, href, target, text)
-}
-
-// parseInlineLink parses an inline link at the start of s, and returns
-// a rendered HTML link and the total length of the raw inline link.
-// If no inline link is present, it returns all zeroes.
-func parseInlineLink(s string) (link string, length int) {
-	if !strings.HasPrefix(s, "[[") {
-		return
-	}
-	end := strings.Index(s, "]]")
-	if end == -1 {
-		return
-	}
-	urlEnd := strings.Index(s, "]")
-	rawURL := s[2:urlEnd]
-	const badURLChars = `<>"{}|\^[] ` + "`" // per RFC2396 section 2.4.3
-	if strings.ContainsAny(rawURL, badURLChars) {
-		return
-	}
-	if urlEnd == end {
-		simpleUrl := ""
-		url, err := url.Parse(rawURL)
-		if err == nil {
-			// If the URL is http://foo.com, drop the http://
-			// In other words, render [[http://golang.org]] as:
-			//   <a href="http://golang.org">golang.org</a>
-			if strings.HasPrefix(rawURL, url.Scheme+"://") {
-				simpleUrl = strings.TrimPrefix(rawURL, url.Scheme+"://")
-			} else if strings.HasPrefix(rawURL, url.Scheme+":") {
-				simpleUrl = strings.TrimPrefix(rawURL, url.Scheme+":")
-			}
-		}
-		return renderLink(rawURL, simpleUrl), end + 2
-	}
-	if s[urlEnd:urlEnd+2] != "][" {
-		return
-	}
-	text := s[urlEnd+2 : end]
-	return renderLink(rawURL, text), end + 2
-}
diff --git a/installer/vendor/golang.org/x/tools/present/link_test.go b/installer/vendor/golang.org/x/tools/present/link_test.go
deleted file mode 100644
index 334e72bdcc..0000000000
--- a/installer/vendor/golang.org/x/tools/present/link_test.go
+++ /dev/null
@@ -1,40 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import "testing"
-
-func TestInlineParsing(t *testing.T) {
-	var tests = []struct {
-		in     string
-		link   string
-		text   string
-		length int
-	}{
-		{"[[http://golang.org]]", "http://golang.org", "golang.org", 21},
-		{"[[http://golang.org][]]", "http://golang.org", "http://golang.org", 23},
-		{"[[http://golang.org]] this is ignored", "http://golang.org", "golang.org", 21},
-		{"[[http://golang.org][link]]", "http://golang.org", "link", 27},
-		{"[[http://golang.org][two words]]", "http://golang.org", "two words", 32},
-		{"[[http://golang.org][*link*]]", "http://golang.org", "<b>link</b>", 29},
-		{"[[http://bad[url]]", "", "", 0},
-		{"[[http://golang.org][a [[link]] ]]", "http://golang.org", "a [[link", 31},
-		{"[[http:// *spaces* .com]]", "", "", 0},
-		{"[[http://bad`char.com]]", "", "", 0},
-		{" [[http://google.com]]", "", "", 0},
-		{"[[mailto:gopher@golang.org][Gopher]]", "mailto:gopher@golang.org", "Gopher", 36},
-		{"[[mailto:gopher@golang.org]]", "mailto:gopher@golang.org", "gopher@golang.org", 28},
-	}
-
-	for i, test := range tests {
-		link, length := parseInlineLink(test.in)
-		if length == 0 && test.length == 0 {
-			continue
-		}
-		if a := renderLink(test.link, test.text); length != test.length || link != a {
-			t.Errorf("#%d: parseInlineLink(%q):\ngot\t%q, %d\nwant\t%q, %d", i, test.in, link, length, a, test.length)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/present/parse.go b/installer/vendor/golang.org/x/tools/present/parse.go
deleted file mode 100644
index d7289dbaf2..0000000000
--- a/installer/vendor/golang.org/x/tools/present/parse.go
+++ /dev/null
@@ -1,559 +0,0 @@
-// Copyright 2011 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"bufio"
-	"bytes"
-	"errors"
-	"fmt"
-	"html/template"
-	"io"
-	"io/ioutil"
-	"log"
-	"net/url"
-	"regexp"
-	"strings"
-	"time"
-	"unicode"
-	"unicode/utf8"
-)
-
-var (
-	parsers = make(map[string]ParseFunc)
-	funcs   = template.FuncMap{}
-)
-
-// Template returns an empty template with the action functions in its FuncMap.
-func Template() *template.Template {
-	return template.New("").Funcs(funcs)
-}
-
-// Render renders the doc to the given writer using the provided template.
-func (d *Doc) Render(w io.Writer, t *template.Template) error {
-	data := struct {
-		*Doc
-		Template     *template.Template
-		PlayEnabled  bool
-		NotesEnabled bool
-	}{d, t, PlayEnabled, NotesEnabled}
-	return t.ExecuteTemplate(w, "root", data)
-}
-
-// Render renders the section to the given writer using the provided template.
-func (s *Section) Render(w io.Writer, t *template.Template) error {
-	data := struct {
-		*Section
-		Template    *template.Template
-		PlayEnabled bool
-	}{s, t, PlayEnabled}
-	return t.ExecuteTemplate(w, "section", data)
-}
-
-type ParseFunc func(ctx *Context, fileName string, lineNumber int, inputLine string) (Elem, error)
-
-// Register binds the named action, which does not begin with a period, to the
-// specified parser to be invoked when the name, with a period, appears in the
-// present input text.
-func Register(name string, parser ParseFunc) {
-	if len(name) == 0 || name[0] == ';' {
-		panic("bad name in Register: " + name)
-	}
-	parsers["."+name] = parser
-}
-
-// Doc represents an entire document.
-type Doc struct {
-	Title      string
-	Subtitle   string
-	Time       time.Time
-	Authors    []Author
-	TitleNotes []string
-	Sections   []Section
-	Tags       []string
-}
-
-// Author represents the person who wrote and/or is presenting the document.
-type Author struct {
-	Elem []Elem
-}
-
-// TextElem returns the first text elements of the author details.
-// This is used to display the author' name, job title, and company
-// without the contact details.
-func (p *Author) TextElem() (elems []Elem) {
-	for _, el := range p.Elem {
-		if _, ok := el.(Text); !ok {
-			break
-		}
-		elems = append(elems, el)
-	}
-	return
-}
-
-// Section represents a section of a document (such as a presentation slide)
-// comprising a title and a list of elements.
-type Section struct {
-	Number  []int
-	Title   string
-	Elem    []Elem
-	Notes   []string
-	Classes []string
-	Styles  []string
-}
-
-// HTMLAttributes for the section
-func (s Section) HTMLAttributes() template.HTMLAttr {
-	if len(s.Classes) == 0 && len(s.Styles) == 0 {
-		return ""
-	}
-
-	var class string
-	if len(s.Classes) > 0 {
-		class = fmt.Sprintf(`class=%q`, strings.Join(s.Classes, " "))
-	}
-	var style string
-	if len(s.Styles) > 0 {
-		style = fmt.Sprintf(`style=%q`, strings.Join(s.Styles, " "))
-	}
-	return template.HTMLAttr(strings.Join([]string{class, style}, " "))
-}
-
-// Sections contained within the section.
-func (s Section) Sections() (sections []Section) {
-	for _, e := range s.Elem {
-		if section, ok := e.(Section); ok {
-			sections = append(sections, section)
-		}
-	}
-	return
-}
-
-// Level returns the level of the given section.
-// The document title is level 1, main section 2, etc.
-func (s Section) Level() int {
-	return len(s.Number) + 1
-}
-
-// FormattedNumber returns a string containing the concatenation of the
-// numbers identifying a Section.
-func (s Section) FormattedNumber() string {
-	b := &bytes.Buffer{}
-	for _, n := range s.Number {
-		fmt.Fprintf(b, "%v.", n)
-	}
-	return b.String()
-}
-
-func (s Section) TemplateName() string { return "section" }
-
-// Elem defines the interface for a present element. That is, something that
-// can provide the name of the template used to render the element.
-type Elem interface {
-	TemplateName() string
-}
-
-// renderElem implements the elem template function, used to render
-// sub-templates.
-func renderElem(t *template.Template, e Elem) (template.HTML, error) {
-	var data interface{} = e
-	if s, ok := e.(Section); ok {
-		data = struct {
-			Section
-			Template *template.Template
-		}{s, t}
-	}
-	return execTemplate(t, e.TemplateName(), data)
-}
-
-func init() {
-	funcs["elem"] = renderElem
-}
-
-// execTemplate is a helper to execute a template and return the output as a
-// template.HTML value.
-func execTemplate(t *template.Template, name string, data interface{}) (template.HTML, error) {
-	b := new(bytes.Buffer)
-	err := t.ExecuteTemplate(b, name, data)
-	if err != nil {
-		return "", err
-	}
-	return template.HTML(b.String()), nil
-}
-
-// Text represents an optionally preformatted paragraph.
-type Text struct {
-	Lines []string
-	Pre   bool
-}
-
-func (t Text) TemplateName() string { return "text" }
-
-// List represents a bulleted list.
-type List struct {
-	Bullet []string
-}
-
-func (l List) TemplateName() string { return "list" }
-
-// Lines is a helper for parsing line-based input.
-type Lines struct {
-	line int // 0 indexed, so has 1-indexed number of last line returned
-	text []string
-}
-
-func readLines(r io.Reader) (*Lines, error) {
-	var lines []string
-	s := bufio.NewScanner(r)
-	for s.Scan() {
-		lines = append(lines, s.Text())
-	}
-	if err := s.Err(); err != nil {
-		return nil, err
-	}
-	return &Lines{0, lines}, nil
-}
-
-func (l *Lines) next() (text string, ok bool) {
-	for {
-		current := l.line
-		l.line++
-		if current >= len(l.text) {
-			return "", false
-		}
-		text = l.text[current]
-		// Lines starting with # are comments.
-		if len(text) == 0 || text[0] != '#' {
-			ok = true
-			break
-		}
-	}
-	return
-}
-
-func (l *Lines) back() {
-	l.line--
-}
-
-func (l *Lines) nextNonEmpty() (text string, ok bool) {
-	for {
-		text, ok = l.next()
-		if !ok {
-			return
-		}
-		if len(text) > 0 {
-			break
-		}
-	}
-	return
-}
-
-// A Context specifies the supporting context for parsing a presentation.
-type Context struct {
-	// ReadFile reads the file named by filename and returns the contents.
-	ReadFile func(filename string) ([]byte, error)
-}
-
-// ParseMode represents flags for the Parse function.
-type ParseMode int
-
-const (
-	// If set, parse only the title and subtitle.
-	TitlesOnly ParseMode = 1
-)
-
-// Parse parses a document from r.
-func (ctx *Context) Parse(r io.Reader, name string, mode ParseMode) (*Doc, error) {
-	doc := new(Doc)
-	lines, err := readLines(r)
-	if err != nil {
-		return nil, err
-	}
-
-	for i := lines.line; i < len(lines.text); i++ {
-		if strings.HasPrefix(lines.text[i], "*") {
-			break
-		}
-
-		if isSpeakerNote(lines.text[i]) {
-			doc.TitleNotes = append(doc.TitleNotes, lines.text[i][2:])
-		}
-	}
-
-	err = parseHeader(doc, lines)
-	if err != nil {
-		return nil, err
-	}
-	if mode&TitlesOnly != 0 {
-		return doc, nil
-	}
-
-	// Authors
-	if doc.Authors, err = parseAuthors(lines); err != nil {
-		return nil, err
-	}
-	// Sections
-	if doc.Sections, err = parseSections(ctx, name, lines, []int{}); err != nil {
-		return nil, err
-	}
-	return doc, nil
-}
-
-// Parse parses a document from r. Parse reads assets used by the presentation
-// from the file system using ioutil.ReadFile.
-func Parse(r io.Reader, name string, mode ParseMode) (*Doc, error) {
-	ctx := Context{ReadFile: ioutil.ReadFile}
-	return ctx.Parse(r, name, mode)
-}
-
-// isHeading matches any section heading.
-var isHeading = regexp.MustCompile(`^\*+ `)
-
-// lesserHeading returns true if text is a heading of a lesser or equal level
-// than that denoted by prefix.
-func lesserHeading(text, prefix string) bool {
-	return isHeading.MatchString(text) && !strings.HasPrefix(text, prefix+"*")
-}
-
-// parseSections parses Sections from lines for the section level indicated by
-// number (a nil number indicates the top level).
-func parseSections(ctx *Context, name string, lines *Lines, number []int) ([]Section, error) {
-	var sections []Section
-	for i := 1; ; i++ {
-		// Next non-empty line is title.
-		text, ok := lines.nextNonEmpty()
-		for ok && text == "" {
-			text, ok = lines.next()
-		}
-		if !ok {
-			break
-		}
-		prefix := strings.Repeat("*", len(number)+1)
-		if !strings.HasPrefix(text, prefix+" ") {
-			lines.back()
-			break
-		}
-		section := Section{
-			Number: append(append([]int{}, number...), i),
-			Title:  text[len(prefix)+1:],
-		}
-		text, ok = lines.nextNonEmpty()
-		for ok && !lesserHeading(text, prefix) {
-			var e Elem
-			r, _ := utf8.DecodeRuneInString(text)
-			switch {
-			case unicode.IsSpace(r):
-				i := strings.IndexFunc(text, func(r rune) bool {
-					return !unicode.IsSpace(r)
-				})
-				if i < 0 {
-					break
-				}
-				indent := text[:i]
-				var s []string
-				for ok && (strings.HasPrefix(text, indent) || text == "") {
-					if text != "" {
-						text = text[i:]
-					}
-					s = append(s, text)
-					text, ok = lines.next()
-				}
-				lines.back()
-				pre := strings.Join(s, "\n")
-				pre = strings.Replace(pre, "\t", "    ", -1) // browsers treat tabs badly
-				pre = strings.TrimRightFunc(pre, unicode.IsSpace)
-				e = Text{Lines: []string{pre}, Pre: true}
-			case strings.HasPrefix(text, "- "):
-				var b []string
-				for ok && strings.HasPrefix(text, "- ") {
-					b = append(b, text[2:])
-					text, ok = lines.next()
-				}
-				lines.back()
-				e = List{Bullet: b}
-			case isSpeakerNote(text):
-				section.Notes = append(section.Notes, text[2:])
-			case strings.HasPrefix(text, prefix+"* "):
-				lines.back()
-				subsecs, err := parseSections(ctx, name, lines, section.Number)
-				if err != nil {
-					return nil, err
-				}
-				for _, ss := range subsecs {
-					section.Elem = append(section.Elem, ss)
-				}
-			case strings.HasPrefix(text, "."):
-				args := strings.Fields(text)
-				if args[0] == ".background" {
-					section.Classes = append(section.Classes, "background")
-					section.Styles = append(section.Styles, "background-image: url('"+args[1]+"')")
-					break
-				}
-				parser := parsers[args[0]]
-				if parser == nil {
-					return nil, fmt.Errorf("%s:%d: unknown command %q\n", name, lines.line, text)
-				}
-				t, err := parser(ctx, name, lines.line, text)
-				if err != nil {
-					return nil, err
-				}
-				e = t
-			default:
-				var l []string
-				for ok && strings.TrimSpace(text) != "" {
-					if text[0] == '.' { // Command breaks text block.
-						lines.back()
-						break
-					}
-					if strings.HasPrefix(text, `\.`) { // Backslash escapes initial period.
-						text = text[1:]
-					}
-					l = append(l, text)
-					text, ok = lines.next()
-				}
-				if len(l) > 0 {
-					e = Text{Lines: l}
-				}
-			}
-			if e != nil {
-				section.Elem = append(section.Elem, e)
-			}
-			text, ok = lines.nextNonEmpty()
-		}
-		if isHeading.MatchString(text) {
-			lines.back()
-		}
-		sections = append(sections, section)
-	}
-	return sections, nil
-}
-
-func parseHeader(doc *Doc, lines *Lines) error {
-	var ok bool
-	// First non-empty line starts header.
-	doc.Title, ok = lines.nextNonEmpty()
-	if !ok {
-		return errors.New("unexpected EOF; expected title")
-	}
-	for {
-		text, ok := lines.next()
-		if !ok {
-			return errors.New("unexpected EOF")
-		}
-		if text == "" {
-			break
-		}
-		if isSpeakerNote(text) {
-			continue
-		}
-		const tagPrefix = "Tags:"
-		if strings.HasPrefix(text, tagPrefix) {
-			tags := strings.Split(text[len(tagPrefix):], ",")
-			for i := range tags {
-				tags[i] = strings.TrimSpace(tags[i])
-			}
-			doc.Tags = append(doc.Tags, tags...)
-		} else if t, ok := parseTime(text); ok {
-			doc.Time = t
-		} else if doc.Subtitle == "" {
-			doc.Subtitle = text
-		} else {
-			return fmt.Errorf("unexpected header line: %q", text)
-		}
-	}
-	return nil
-}
-
-func parseAuthors(lines *Lines) (authors []Author, err error) {
-	// This grammar demarcates authors with blanks.
-
-	// Skip blank lines.
-	if _, ok := lines.nextNonEmpty(); !ok {
-		return nil, errors.New("unexpected EOF")
-	}
-	lines.back()
-
-	var a *Author
-	for {
-		text, ok := lines.next()
-		if !ok {
-			return nil, errors.New("unexpected EOF")
-		}
-
-		// If we find a section heading, we're done.
-		if strings.HasPrefix(text, "* ") {
-			lines.back()
-			break
-		}
-
-		if isSpeakerNote(text) {
-			continue
-		}
-
-		// If we encounter a blank we're done with this author.
-		if a != nil && len(text) == 0 {
-			authors = append(authors, *a)
-			a = nil
-			continue
-		}
-		if a == nil {
-			a = new(Author)
-		}
-
-		// Parse the line. Those that
-		// - begin with @ are twitter names,
-		// - contain slashes are links, or
-		// - contain an @ symbol are an email address.
-		// The rest is just text.
-		var el Elem
-		switch {
-		case strings.HasPrefix(text, "@"):
-			el = parseURL("http://twitter.com/" + text[1:])
-		case strings.Contains(text, ":"):
-			el = parseURL(text)
-		case strings.Contains(text, "@"):
-			el = parseURL("mailto:" + text)
-		}
-		if l, ok := el.(Link); ok {
-			l.Label = text
-			el = l
-		}
-		if el == nil {
-			el = Text{Lines: []string{text}}
-		}
-		a.Elem = append(a.Elem, el)
-	}
-	if a != nil {
-		authors = append(authors, *a)
-	}
-	return authors, nil
-}
-
-func parseURL(text string) Elem {
-	u, err := url.Parse(text)
-	if err != nil {
-		log.Printf("Parse(%q): %v", text, err)
-		return nil
-	}
-	return Link{URL: u}
-}
-
-func parseTime(text string) (t time.Time, ok bool) {
-	t, err := time.Parse("15:04 2 Jan 2006", text)
-	if err == nil {
-		return t, true
-	}
-	t, err = time.Parse("2 Jan 2006", text)
-	if err == nil {
-		// at 11am UTC it is the same date everywhere
-		t = t.Add(time.Hour * 11)
-		return t, true
-	}
-	return time.Time{}, false
-}
-
-func isSpeakerNote(s string) bool {
-	return strings.HasPrefix(s, ": ")
-}
diff --git a/installer/vendor/golang.org/x/tools/present/style.go b/installer/vendor/golang.org/x/tools/present/style.go
deleted file mode 100644
index e2c228e55a..0000000000
--- a/installer/vendor/golang.org/x/tools/present/style.go
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"bytes"
-	"html"
-	"html/template"
-	"strings"
-	"unicode"
-	"unicode/utf8"
-)
-
-/*
-	Fonts are demarcated by an initial and final char bracketing a
-	space-delimited word, plus possibly some terminal punctuation.
-	The chars are
-		_ for italic
-		* for bold
-		` (back quote) for fixed width.
-	Inner appearances of the char become spaces. For instance,
-		_this_is_italic_!
-	becomes
-		<i>this is italic</i>!
-*/
-
-func init() {
-	funcs["style"] = Style
-}
-
-// Style returns s with HTML entities escaped and font indicators turned into
-// HTML font tags.
-func Style(s string) template.HTML {
-	return template.HTML(font(html.EscapeString(s)))
-}
-
-// font returns s with font indicators turned into HTML font tags.
-func font(s string) string {
-	if !strings.ContainsAny(s, "[`_*") {
-		return s
-	}
-	words := split(s)
-	var b bytes.Buffer
-Word:
-	for w, word := range words {
-		if len(word) < 2 {
-			continue Word
-		}
-		if link, _ := parseInlineLink(word); link != "" {
-			words[w] = link
-			continue Word
-		}
-		const marker = "_*`"
-		// Initial punctuation is OK but must be peeled off.
-		first := strings.IndexAny(word, marker)
-		if first == -1 {
-			continue Word
-		}
-		// Opening marker must be at the beginning of the token or else preceded by punctuation.
-		if first != 0 {
-			r, _ := utf8.DecodeLastRuneInString(word[:first])
-			if !unicode.IsPunct(r) {
-				continue Word
-			}
-		}
-		open, word := word[:first], word[first:]
-		char := word[0] // ASCII is OK.
-		close := ""
-		switch char {
-		default:
-			continue Word
-		case '_':
-			open += "<i>"
-			close = "</i>"
-		case '*':
-			open += "<b>"
-			close = "</b>"
-		case '`':
-			open += "<code>"
-			close = "</code>"
-		}
-		// Closing marker must be at the end of the token or else followed by punctuation.
-		last := strings.LastIndex(word, word[:1])
-		if last == 0 {
-			continue Word
-		}
-		if last+1 != len(word) {
-			r, _ := utf8.DecodeRuneInString(word[last+1:])
-			if !unicode.IsPunct(r) {
-				continue Word
-			}
-		}
-		head, tail := word[:last+1], word[last+1:]
-		b.Reset()
-		b.WriteString(open)
-		var wid int
-		for i := 1; i < len(head)-1; i += wid {
-			var r rune
-			r, wid = utf8.DecodeRuneInString(head[i:])
-			if r != rune(char) {
-				// Ordinary character.
-				b.WriteRune(r)
-				continue
-			}
-			if head[i+1] != char {
-				// Inner char becomes space.
-				b.WriteRune(' ')
-				continue
-			}
-			// Doubled char becomes real char.
-			// Not worth worrying about "_x__".
-			b.WriteByte(char)
-			wid++ // Consumed two chars, both ASCII.
-		}
-		b.WriteString(close) // Write closing tag.
-		b.WriteString(tail)  // Restore trailing punctuation.
-		words[w] = b.String()
-	}
-	return strings.Join(words, "")
-}
-
-// split is like strings.Fields but also returns the runs of spaces
-// and treats inline links as distinct words.
-func split(s string) []string {
-	var (
-		words = make([]string, 0, 10)
-		start = 0
-	)
-
-	// appendWord appends the string s[start:end] to the words slice.
-	// If the word contains the beginning of a link, the non-link portion
-	// of the word and the entire link are appended as separate words,
-	// and the start index is advanced to the end of the link.
-	appendWord := func(end int) {
-		if j := strings.Index(s[start:end], "[["); j > -1 {
-			if _, l := parseInlineLink(s[start+j:]); l > 0 {
-				// Append portion before link, if any.
-				if j > 0 {
-					words = append(words, s[start:start+j])
-				}
-				// Append link itself.
-				words = append(words, s[start+j:start+j+l])
-				// Advance start index to end of link.
-				start = start + j + l
-				return
-			}
-		}
-		// No link; just add the word.
-		words = append(words, s[start:end])
-		start = end
-	}
-
-	wasSpace := false
-	for i, r := range s {
-		isSpace := unicode.IsSpace(r)
-		if i > start && isSpace != wasSpace {
-			appendWord(i)
-		}
-		wasSpace = isSpace
-	}
-	for start < len(s) {
-		appendWord(len(s))
-	}
-	return words
-}
diff --git a/installer/vendor/golang.org/x/tools/present/style_test.go b/installer/vendor/golang.org/x/tools/present/style_test.go
deleted file mode 100644
index cef5a62f5c..0000000000
--- a/installer/vendor/golang.org/x/tools/present/style_test.go
+++ /dev/null
@@ -1,124 +0,0 @@
-// Copyright 2012 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"reflect"
-	"testing"
-)
-
-func TestSplit(t *testing.T) {
-	var tests = []struct {
-		in  string
-		out []string
-	}{
-		{"", []string{}},
-		{" ", []string{" "}},
-		{"abc", []string{"abc"}},
-		{"abc def", []string{"abc", " ", "def"}},
-		{"abc def ", []string{"abc", " ", "def", " "}},
-		{"hey [[http://golang.org][Gophers]] around",
-			[]string{"hey", " ", "[[http://golang.org][Gophers]]", " ", "around"}},
-		{"A [[http://golang.org/doc][two words]] link",
-			[]string{"A", " ", "[[http://golang.org/doc][two words]]", " ", "link"}},
-		{"Visit [[http://golang.org/doc]] now",
-			[]string{"Visit", " ", "[[http://golang.org/doc]]", " ", "now"}},
-		{"not [[http://golang.org/doc][a [[link]] ]] around",
-			[]string{"not", " ", "[[http://golang.org/doc][a [[link]]", " ", "]]", " ", "around"}},
-		{"[[http://golang.org][foo bar]]",
-			[]string{"[[http://golang.org][foo bar]]"}},
-		{"ends with [[http://golang.org][link]]",
-			[]string{"ends", " ", "with", " ", "[[http://golang.org][link]]"}},
-		{"my talk ([[http://talks.golang.org/][slides here]])",
-			[]string{"my", " ", "talk", " ", "(", "[[http://talks.golang.org/][slides here]]", ")"}},
-	}
-	for _, test := range tests {
-		out := split(test.in)
-		if !reflect.DeepEqual(out, test.out) {
-			t.Errorf("split(%q):\ngot\t%q\nwant\t%q", test.in, out, test.out)
-		}
-	}
-}
-
-func TestFont(t *testing.T) {
-	var tests = []struct {
-		in  string
-		out string
-	}{
-		{"", ""},
-		{" ", " "},
-		{"\tx", "\tx"},
-		{"_a_", "<i>a</i>"},
-		{"*a*", "<b>a</b>"},
-		{"`a`", "<code>a</code>"},
-		{"_a_b_", "<i>a b</i>"},
-		{"_a__b_", "<i>a_b</i>"},
-		{"_a___b_", "<i>a_ b</i>"},
-		{"*a**b*?", "<b>a*b</b>?"},
-		{"_a_<>_b_.", "<i>a <> b</i>."},
-		{"(_a_)", "(<i>a</i>)"},
-		{"((_a_), _b_, _c_).", "((<i>a</i>), <i>b</i>, <i>c</i>)."},
-		{"(_a)", "(_a)"},
-		{"(_a)", "(_a)"},
-		{"_Why_use_scoped__ptr_? Use plain ***ptr* instead.", "<i>Why use scoped_ptr</i>? Use plain <b>*ptr</b> instead."},
-		{"_hey_ [[http://golang.org][*Gophers*]] *around*",
-			`<i>hey</i> <a href="http://golang.org" target="_blank"><b>Gophers</b></a> <b>around</b>`},
-		{"_hey_ [[http://golang.org][so _many_ *Gophers*]] *around*",
-			`<i>hey</i> <a href="http://golang.org" target="_blank">so <i>many</i> <b>Gophers</b></a> <b>around</b>`},
-		{"Visit [[http://golang.org]] now",
-			`Visit <a href="http://golang.org" target="_blank">golang.org</a> now`},
-		{"my talk ([[http://talks.golang.org/][slides here]])",
-			`my talk (<a href="http://talks.golang.org/" target="_blank">slides here</a>)`},
-		{"Markup—_especially_italic_text_—can easily be overused.",
-			`Markup—<i>especially italic text</i>—can easily be overused.`},
-		{"`go`get`'s codebase", // ascii U+0027 ' before s
-			`<code>go get</code>'s codebase`},
-		{"`go`get`’s codebase", // unicode right single quote U+2019 ’ before s
-			`<code>go get</code>’s codebase`},
-		{"a_variable_name",
-			`a_variable_name`},
-	}
-	for _, test := range tests {
-		out := font(test.in)
-		if out != test.out {
-			t.Errorf("font(%q):\ngot\t%q\nwant\t%q", test.in, out, test.out)
-		}
-	}
-}
-
-func TestStyle(t *testing.T) {
-	var tests = []struct {
-		in  string
-		out string
-	}{
-		{"", ""},
-		{" ", " "},
-		{"\tx", "\tx"},
-		{"_a_", "<i>a</i>"},
-		{"*a*", "<b>a</b>"},
-		{"`a`", "<code>a</code>"},
-		{"_a_b_", "<i>a b</i>"},
-		{"_a__b_", "<i>a_b</i>"},
-		{"_a___b_", "<i>a_ b</i>"},
-		{"*a**b*?", "<b>a*b</b>?"},
-		{"_a_<>_b_.", "<i>a &lt;&gt; b</i>."},
-		{"(_a_<>_b_)", "(<i>a &lt;&gt; b</i>)"},
-		{"((_a_), _b_, _c_).", "((<i>a</i>), <i>b</i>, <i>c</i>)."},
-		{"(_a)", "(_a)"},
-	}
-	for _, test := range tests {
-		out := string(Style(test.in))
-		if out != test.out {
-			t.Errorf("style(%q):\ngot\t%q\nwant\t%q", test.in, out, test.out)
-		}
-	}
-}
-
-func ExampleStyle() {
-	const s = "*Gophers* are _clearly_ > *cats*!"
-	fmt.Println(Style(s))
-	// Output: <b>Gophers</b> are <i>clearly</i> &gt; <b>cats</b>!
-}
diff --git a/installer/vendor/golang.org/x/tools/present/video.go b/installer/vendor/golang.org/x/tools/present/video.go
deleted file mode 100644
index 913822e66b..0000000000
--- a/installer/vendor/golang.org/x/tools/present/video.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright 2016 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package present
-
-import (
-	"fmt"
-	"strings"
-)
-
-func init() {
-	Register("video", parseVideo)
-}
-
-type Video struct {
-	URL        string
-	SourceType string
-	Width      int
-	Height     int
-}
-
-func (v Video) TemplateName() string { return "video" }
-
-func parseVideo(ctx *Context, fileName string, lineno int, text string) (Elem, error) {
-	args := strings.Fields(text)
-	vid := Video{URL: args[1], SourceType: args[2]}
-	a, err := parseArgs(fileName, lineno, args[3:])
-	if err != nil {
-		return nil, err
-	}
-	switch len(a) {
-	case 0:
-		// no size parameters
-	case 2:
-		// If a parameter is empty (underscore) or invalid
-		// leave the field set to zero. The "video" action
-		// template will then omit that vid tag attribute and
-		// the browser will calculate the value to preserve
-		// the aspect ratio.
-		if v, ok := a[0].(int); ok {
-			vid.Height = v
-		}
-		if v, ok := a[1].(int); ok {
-			vid.Width = v
-		}
-	default:
-		return nil, fmt.Errorf("incorrect video invocation: %q", text)
-	}
-	return vid, nil
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/README b/installer/vendor/golang.org/x/tools/refactor/README
deleted file mode 100644
index a3157845cf..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/README
+++ /dev/null
@@ -1 +0,0 @@
-golang.org/x/tools/refactor: libraries for refactoring tools.
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/eg.go b/installer/vendor/golang.org/x/tools/refactor/eg/eg.go
deleted file mode 100644
index bf0ee29098..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/eg.go
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package eg implements the example-based refactoring tool whose
-// command-line is defined in golang.org/x/tools/cmd/eg.
-package eg // import "golang.org/x/tools/refactor/eg"
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/format"
-	"go/printer"
-	"go/token"
-	"go/types"
-	"os"
-)
-
-const Help = `
-This tool implements example-based refactoring of expressions.
-
-The transformation is specified as a Go file defining two functions,
-'before' and 'after', of identical types.  Each function body consists
-of a single statement: either a return statement with a single
-(possibly multi-valued) expression, or an expression statement.  The
-'before' expression specifies a pattern and the 'after' expression its
-replacement.
-
-	package P
- 	import ( "errors"; "fmt" )
- 	func before(s string) error { return fmt.Errorf("%s", s) }
- 	func after(s string)  error { return errors.New(s) }
-
-The expression statement form is useful when the expression has no
-result, for example:
-
- 	func before(msg string) { log.Fatalf("%s", msg) }
- 	func after(msg string)  { log.Fatal(msg) }
-
-The parameters of both functions are wildcards that may match any
-expression assignable to that type.  If the pattern contains multiple
-occurrences of the same parameter, each must match the same expression
-in the input for the pattern to match.  If the replacement contains
-multiple occurrences of the same parameter, the expression will be
-duplicated, possibly changing the side-effects.
-
-The tool analyses all Go code in the packages specified by the
-arguments, replacing all occurrences of the pattern with the
-substitution.
-
-So, the transform above would change this input:
-	err := fmt.Errorf("%s", "error: " + msg)
-to this output:
-	err := errors.New("error: " + msg)
-
-Identifiers, including qualified identifiers (p.X) are considered to
-match only if they denote the same object.  This allows correct
-matching even in the presence of dot imports, named imports and
-locally shadowed package names in the input program.
-
-Matching of type syntax is semantic, not syntactic: type syntax in the
-pattern matches type syntax in the input if the types are identical.
-Thus, func(x int) matches func(y int).
-
-This tool was inspired by other example-based refactoring tools,
-'gofmt -r' for Go and Refaster for Java.
-
-
-LIMITATIONS
-===========
-
-EXPRESSIVENESS
-
-Only refactorings that replace one expression with another, regardless
-of the expression's context, may be expressed.  Refactoring arbitrary
-statements (or sequences of statements) is a less well-defined problem
-and is less amenable to this approach.
-
-A pattern that contains a function literal (and hence statements)
-never matches.
-
-There is no way to generalize over related types, e.g. to express that
-a wildcard may have any integer type, for example.
-
-It is not possible to replace an expression by one of a different
-type, even in contexts where this is legal, such as x in fmt.Print(x).
-
-The struct literals T{x} and T{K: x} cannot both be matched by a single
-template.
-
-
-SAFETY
-
-Verifying that a transformation does not introduce type errors is very
-complex in the general case.  An innocuous-looking replacement of one
-constant by another (e.g. 1 to 2) may cause type errors relating to
-array types and indices, for example.  The tool performs only very
-superficial checks of type preservation.
-
-
-IMPORTS
-
-Although the matching algorithm is fully aware of scoping rules, the
-replacement algorithm is not, so the replacement code may contain
-incorrect identifier syntax for imported objects if there are dot
-imports, named imports or locally shadowed package names in the input
-program.
-
-Imports are added as needed, but they are not removed as needed.
-Run 'goimports' on the modified file for now.
-
-Dot imports are forbidden in the template.
-
-
-TIPS
-====
-
-Sometimes a little creativity is required to implement the desired
-migration.  This section lists a few tips and tricks.
-
-To remove the final parameter from a function, temporarily change the
-function signature so that the final parameter is variadic, as this
-allows legal calls both with and without the argument.  Then use eg to
-remove the final argument from all callers, and remove the variadic
-parameter by hand.  The reverse process can be used to add a final
-parameter.
-
-To add or remove parameters other than the final one, you must do it in
-stages: (1) declare a variant function f' with a different name and the
-desired parameters; (2) use eg to transform calls to f into calls to f',
-changing the arguments as needed; (3) change the declaration of f to
-match f'; (4) use eg to rename f' to f in all calls; (5) delete f'.
-`
-
-// TODO(adonovan): expand upon the above documentation as an HTML page.
-
-// A Transformer represents a single example-based transformation.
-type Transformer struct {
-	fset           *token.FileSet
-	verbose        bool
-	info           *types.Info // combined type info for template/input/output ASTs
-	seenInfos      map[*types.Info]bool
-	wildcards      map[*types.Var]bool                // set of parameters in func before()
-	env            map[string]ast.Expr                // maps parameter name to wildcard binding
-	importedObjs   map[types.Object]*ast.SelectorExpr // objects imported by after().
-	before, after  ast.Expr
-	allowWildcards bool
-
-	// Working state of Transform():
-	nsubsts    int            // number of substitutions made
-	currentPkg *types.Package // package of current call
-}
-
-// NewTransformer returns a transformer based on the specified template,
-// a single-file package containing "before" and "after" functions as
-// described in the package documentation.
-// tmplInfo is the type information for tmplFile.
-//
-func NewTransformer(fset *token.FileSet, tmplPkg *types.Package, tmplFile *ast.File, tmplInfo *types.Info, verbose bool) (*Transformer, error) {
-	// Check the template.
-	beforeSig := funcSig(tmplPkg, "before")
-	if beforeSig == nil {
-		return nil, fmt.Errorf("no 'before' func found in template")
-	}
-	afterSig := funcSig(tmplPkg, "after")
-	if afterSig == nil {
-		return nil, fmt.Errorf("no 'after' func found in template")
-	}
-
-	// TODO(adonovan): should we also check the names of the params match?
-	if !types.Identical(afterSig, beforeSig) {
-		return nil, fmt.Errorf("before %s and after %s functions have different signatures",
-			beforeSig, afterSig)
-	}
-
-	for _, imp := range tmplFile.Imports {
-		if imp.Name != nil && imp.Name.Name == "." {
-			// Dot imports are currently forbidden.  We
-			// make the simplifying assumption that all
-			// imports are regular, without local renames.
-			return nil, fmt.Errorf("dot-import (of %s) in template", imp.Path.Value)
-		}
-	}
-	var beforeDecl, afterDecl *ast.FuncDecl
-	for _, decl := range tmplFile.Decls {
-		if decl, ok := decl.(*ast.FuncDecl); ok {
-			switch decl.Name.Name {
-			case "before":
-				beforeDecl = decl
-			case "after":
-				afterDecl = decl
-			}
-		}
-	}
-
-	before, err := soleExpr(beforeDecl)
-	if err != nil {
-		return nil, fmt.Errorf("before: %s", err)
-	}
-	after, err := soleExpr(afterDecl)
-	if err != nil {
-		return nil, fmt.Errorf("after: %s", err)
-	}
-
-	wildcards := make(map[*types.Var]bool)
-	for i := 0; i < beforeSig.Params().Len(); i++ {
-		wildcards[beforeSig.Params().At(i)] = true
-	}
-
-	// checkExprTypes returns an error if Tb (type of before()) is not
-	// safe to replace with Ta (type of after()).
-	//
-	// Only superficial checks are performed, and they may result in both
-	// false positives and negatives.
-	//
-	// Ideally, we would only require that the replacement be assignable
-	// to the context of a specific pattern occurrence, but the type
-	// checker doesn't record that information and it's complex to deduce.
-	// A Go type cannot capture all the constraints of a given expression
-	// context, which may include the size, constness, signedness,
-	// namedness or constructor of its type, and even the specific value
-	// of the replacement.  (Consider the rule that array literal keys
-	// must be unique.)  So we cannot hope to prove the safety of a
-	// transformation in general.
-	Tb := tmplInfo.TypeOf(before)
-	Ta := tmplInfo.TypeOf(after)
-	if types.AssignableTo(Tb, Ta) {
-		// safe: replacement is assignable to pattern.
-	} else if tuple, ok := Tb.(*types.Tuple); ok && tuple.Len() == 0 {
-		// safe: pattern has void type (must appear in an ExprStmt).
-	} else {
-		return nil, fmt.Errorf("%s is not a safe replacement for %s", Ta, Tb)
-	}
-
-	tr := &Transformer{
-		fset:           fset,
-		verbose:        verbose,
-		wildcards:      wildcards,
-		allowWildcards: true,
-		seenInfos:      make(map[*types.Info]bool),
-		importedObjs:   make(map[types.Object]*ast.SelectorExpr),
-		before:         before,
-		after:          after,
-	}
-
-	// Combine type info from the template and input packages, and
-	// type info for the synthesized ASTs too.  This saves us
-	// having to book-keep where each ast.Node originated as we
-	// construct the resulting hybrid AST.
-	tr.info = &types.Info{
-		Types:      make(map[ast.Expr]types.TypeAndValue),
-		Defs:       make(map[*ast.Ident]types.Object),
-		Uses:       make(map[*ast.Ident]types.Object),
-		Selections: make(map[*ast.SelectorExpr]*types.Selection),
-	}
-	mergeTypeInfo(tr.info, tmplInfo)
-
-	// Compute set of imported objects required by after().
-	// TODO(adonovan): reject dot-imports in pattern
-	ast.Inspect(after, func(n ast.Node) bool {
-		if n, ok := n.(*ast.SelectorExpr); ok {
-			if _, ok := tr.info.Selections[n]; !ok {
-				// qualified ident
-				obj := tr.info.Uses[n.Sel]
-				tr.importedObjs[obj] = n
-				return false // prune
-			}
-		}
-		return true // recur
-	})
-
-	return tr, nil
-}
-
-// WriteAST is a convenience function that writes AST f to the specified file.
-func WriteAST(fset *token.FileSet, filename string, f *ast.File) (err error) {
-	fh, err := os.Create(filename)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err2 := fh.Close(); err != nil {
-			err = err2 // prefer earlier error
-		}
-	}()
-	return format.Node(fh, fset, f)
-}
-
-// -- utilities --------------------------------------------------------
-
-// funcSig returns the signature of the specified package-level function.
-func funcSig(pkg *types.Package, name string) *types.Signature {
-	if f, ok := pkg.Scope().Lookup(name).(*types.Func); ok {
-		return f.Type().(*types.Signature)
-	}
-	return nil
-}
-
-// soleExpr returns the sole expression in the before/after template function.
-func soleExpr(fn *ast.FuncDecl) (ast.Expr, error) {
-	if fn.Body == nil {
-		return nil, fmt.Errorf("no body")
-	}
-	if len(fn.Body.List) != 1 {
-		return nil, fmt.Errorf("must contain a single statement")
-	}
-	switch stmt := fn.Body.List[0].(type) {
-	case *ast.ReturnStmt:
-		if len(stmt.Results) != 1 {
-			return nil, fmt.Errorf("return statement must have a single operand")
-		}
-		return stmt.Results[0], nil
-
-	case *ast.ExprStmt:
-		return stmt.X, nil
-	}
-
-	return nil, fmt.Errorf("must contain a single return or expression statement")
-}
-
-// mergeTypeInfo adds type info from src to dst.
-func mergeTypeInfo(dst, src *types.Info) {
-	for k, v := range src.Types {
-		dst.Types[k] = v
-	}
-	for k, v := range src.Defs {
-		dst.Defs[k] = v
-	}
-	for k, v := range src.Uses {
-		dst.Uses[k] = v
-	}
-	for k, v := range src.Selections {
-		dst.Selections[k] = v
-	}
-}
-
-// (debugging only)
-func astString(fset *token.FileSet, n ast.Node) string {
-	var buf bytes.Buffer
-	printer.Fprint(&buf, fset, n)
-	return buf.String()
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/eg_test.go b/installer/vendor/golang.org/x/tools/refactor/eg/eg_test.go
deleted file mode 100644
index 896bc9b08c..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/eg_test.go
+++ /dev/null
@@ -1,160 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// No testdata on Android.
-
-// +build !android
-
-package eg_test
-
-import (
-	"bytes"
-	"flag"
-	exact "go/constant"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/refactor/eg"
-)
-
-// TODO(adonovan): more tests:
-// - of command-line tool
-// - of all parts of syntax
-// - of applying a template to a package it imports:
-//   the replacement syntax should use unqualified names for its objects.
-
-var (
-	updateFlag  = flag.Bool("update", false, "update the golden files")
-	verboseFlag = flag.Bool("verbose", false, "show matcher information")
-)
-
-func Test(t *testing.T) {
-	switch runtime.GOOS {
-	case "windows":
-		t.Skipf("skipping test on %q (no /usr/bin/diff)", runtime.GOOS)
-	}
-
-	conf := loader.Config{
-		Fset:       token.NewFileSet(),
-		ParserMode: parser.ParseComments,
-	}
-
-	// Each entry is a single-file package.
-	// (Multi-file packages aren't interesting for this test.)
-	// Order matters: each non-template package is processed using
-	// the preceding template package.
-	for _, filename := range []string{
-		"testdata/A.template",
-		"testdata/A1.go",
-		"testdata/A2.go",
-
-		"testdata/B.template",
-		"testdata/B1.go",
-
-		"testdata/C.template",
-		"testdata/C1.go",
-
-		"testdata/D.template",
-		"testdata/D1.go",
-
-		"testdata/E.template",
-		"testdata/E1.go",
-
-		"testdata/F.template",
-		"testdata/F1.go",
-
-		"testdata/G.template",
-		"testdata/G1.go",
-
-		"testdata/H.template",
-		"testdata/H1.go",
-
-		"testdata/bad_type.template",
-		"testdata/no_before.template",
-		"testdata/no_after_return.template",
-		"testdata/type_mismatch.template",
-		"testdata/expr_type_mismatch.template",
-	} {
-		pkgname := strings.TrimSuffix(filepath.Base(filename), ".go")
-		conf.CreateFromFilenames(pkgname, filename)
-	}
-	iprog, err := conf.Load()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	var xform *eg.Transformer
-	for _, info := range iprog.Created {
-		file := info.Files[0]
-		filename := iprog.Fset.File(file.Pos()).Name() // foo.go
-
-		if strings.HasSuffix(filename, "template") {
-			// a new template
-			shouldFail, _ := info.Pkg.Scope().Lookup("shouldFail").(*types.Const)
-			xform, err = eg.NewTransformer(iprog.Fset, info.Pkg, file, &info.Info, *verboseFlag)
-			if err != nil {
-				if shouldFail == nil {
-					t.Errorf("NewTransformer(%s): %s", filename, err)
-				} else if want := exact.StringVal(shouldFail.Val()); !strings.Contains(err.Error(), want) {
-					t.Errorf("NewTransformer(%s): got error %q, want error %q", filename, err, want)
-				}
-			} else if shouldFail != nil {
-				t.Errorf("NewTransformer(%s) succeeded unexpectedly; want error %q",
-					filename, shouldFail.Val())
-			}
-			continue
-		}
-
-		if xform == nil {
-			t.Errorf("%s: no previous template", filename)
-			continue
-		}
-
-		// apply previous template to this package
-		n := xform.Transform(&info.Info, info.Pkg, file)
-		if n == 0 {
-			t.Errorf("%s: no matches", filename)
-			continue
-		}
-
-		got := filename + "t"       // foo.got
-		golden := filename + "lden" // foo.golden
-
-		// Write actual output to foo.got.
-		if err := eg.WriteAST(iprog.Fset, got, file); err != nil {
-			t.Error(err)
-		}
-		defer os.Remove(got)
-
-		// Compare foo.got with foo.golden.
-		var cmd *exec.Cmd
-		switch runtime.GOOS {
-		case "plan9":
-			cmd = exec.Command("/bin/diff", "-c", golden, got)
-		default:
-			cmd = exec.Command("/usr/bin/diff", "-u", golden, got)
-		}
-		buf := new(bytes.Buffer)
-		cmd.Stdout = buf
-		cmd.Stderr = os.Stderr
-		if err := cmd.Run(); err != nil {
-			t.Errorf("eg tests for %s failed: %s.\n%s\n", filename, err, buf)
-
-			if *updateFlag {
-				t.Logf("Updating %s...", golden)
-				if err := exec.Command("/bin/cp", got, golden).Run(); err != nil {
-					t.Errorf("Update failed: %s", err)
-				}
-			}
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/match.go b/installer/vendor/golang.org/x/tools/refactor/eg/match.go
deleted file mode 100644
index 43466202aa..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/match.go
+++ /dev/null
@@ -1,249 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package eg
-
-import (
-	"fmt"
-	"go/ast"
-	exact "go/constant"
-	"go/token"
-	"go/types"
-	"log"
-	"os"
-	"reflect"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// matchExpr reports whether pattern x matches y.
-//
-// If tr.allowWildcards, Idents in x that refer to parameters are
-// treated as wildcards, and match any y that is assignable to the
-// parameter type; matchExpr records this correspondence in tr.env.
-// Otherwise, matchExpr simply reports whether the two trees are
-// equivalent.
-//
-// A wildcard appearing more than once in the pattern must
-// consistently match the same tree.
-//
-func (tr *Transformer) matchExpr(x, y ast.Expr) bool {
-	if x == nil && y == nil {
-		return true
-	}
-	if x == nil || y == nil {
-		return false
-	}
-	x = unparen(x)
-	y = unparen(y)
-
-	// Is x a wildcard?  (a reference to a 'before' parameter)
-	if xobj, ok := tr.wildcardObj(x); ok {
-		return tr.matchWildcard(xobj, y)
-	}
-
-	// Object identifiers (including pkg-qualified ones)
-	// are handled semantically, not syntactically.
-	xobj := isRef(x, tr.info)
-	yobj := isRef(y, tr.info)
-	if xobj != nil {
-		return xobj == yobj
-	}
-	if yobj != nil {
-		return false
-	}
-
-	// TODO(adonovan): audit: we cannot assume these ast.Exprs
-	// contain non-nil pointers.  e.g. ImportSpec.Name may be a
-	// nil *ast.Ident.
-
-	if reflect.TypeOf(x) != reflect.TypeOf(y) {
-		return false
-	}
-	switch x := x.(type) {
-	case *ast.Ident:
-		log.Fatalf("unexpected Ident: %s", astString(tr.fset, x))
-
-	case *ast.BasicLit:
-		y := y.(*ast.BasicLit)
-		xval := exact.MakeFromLiteral(x.Value, x.Kind, 0)
-		yval := exact.MakeFromLiteral(y.Value, y.Kind, 0)
-		return exact.Compare(xval, token.EQL, yval)
-
-	case *ast.FuncLit:
-		// func literals (and thus statement syntax) never match.
-		return false
-
-	case *ast.CompositeLit:
-		y := y.(*ast.CompositeLit)
-		return (x.Type == nil) == (y.Type == nil) &&
-			(x.Type == nil || tr.matchType(x.Type, y.Type)) &&
-			tr.matchExprs(x.Elts, y.Elts)
-
-	case *ast.SelectorExpr:
-		y := y.(*ast.SelectorExpr)
-		return tr.matchSelectorExpr(x, y) &&
-			tr.info.Selections[x].Obj() == tr.info.Selections[y].Obj()
-
-	case *ast.IndexExpr:
-		y := y.(*ast.IndexExpr)
-		return tr.matchExpr(x.X, y.X) &&
-			tr.matchExpr(x.Index, y.Index)
-
-	case *ast.SliceExpr:
-		y := y.(*ast.SliceExpr)
-		return tr.matchExpr(x.X, y.X) &&
-			tr.matchExpr(x.Low, y.Low) &&
-			tr.matchExpr(x.High, y.High) &&
-			tr.matchExpr(x.Max, y.Max) &&
-			x.Slice3 == y.Slice3
-
-	case *ast.TypeAssertExpr:
-		y := y.(*ast.TypeAssertExpr)
-		return tr.matchExpr(x.X, y.X) &&
-			tr.matchType(x.Type, y.Type)
-
-	case *ast.CallExpr:
-		y := y.(*ast.CallExpr)
-		match := tr.matchExpr // function call
-		if tr.info.Types[x.Fun].IsType() {
-			match = tr.matchType // type conversion
-		}
-		return x.Ellipsis.IsValid() == y.Ellipsis.IsValid() &&
-			match(x.Fun, y.Fun) &&
-			tr.matchExprs(x.Args, y.Args)
-
-	case *ast.StarExpr:
-		y := y.(*ast.StarExpr)
-		return tr.matchExpr(x.X, y.X)
-
-	case *ast.UnaryExpr:
-		y := y.(*ast.UnaryExpr)
-		return x.Op == y.Op &&
-			tr.matchExpr(x.X, y.X)
-
-	case *ast.BinaryExpr:
-		y := y.(*ast.BinaryExpr)
-		return x.Op == y.Op &&
-			tr.matchExpr(x.X, y.X) &&
-			tr.matchExpr(x.Y, y.Y)
-
-	case *ast.KeyValueExpr:
-		y := y.(*ast.KeyValueExpr)
-		return tr.matchExpr(x.Key, y.Key) &&
-			tr.matchExpr(x.Value, y.Value)
-	}
-
-	panic(fmt.Sprintf("unhandled AST node type: %T", x))
-}
-
-func (tr *Transformer) matchExprs(xx, yy []ast.Expr) bool {
-	if len(xx) != len(yy) {
-		return false
-	}
-	for i := range xx {
-		if !tr.matchExpr(xx[i], yy[i]) {
-			return false
-		}
-	}
-	return true
-}
-
-// matchType reports whether the two type ASTs denote identical types.
-func (tr *Transformer) matchType(x, y ast.Expr) bool {
-	tx := tr.info.Types[x].Type
-	ty := tr.info.Types[y].Type
-	return types.Identical(tx, ty)
-}
-
-func (tr *Transformer) wildcardObj(x ast.Expr) (*types.Var, bool) {
-	if x, ok := x.(*ast.Ident); ok && x != nil && tr.allowWildcards {
-		if xobj, ok := tr.info.Uses[x].(*types.Var); ok && tr.wildcards[xobj] {
-			return xobj, true
-		}
-	}
-	return nil, false
-}
-
-func (tr *Transformer) matchSelectorExpr(x, y *ast.SelectorExpr) bool {
-	if xobj, ok := tr.wildcardObj(x.X); ok {
-		field := x.Sel.Name
-		yt := tr.info.TypeOf(y.X)
-		o, _, _ := types.LookupFieldOrMethod(yt, true, tr.currentPkg, field)
-		if o != nil {
-			tr.env[xobj.Name()] = y.X // record binding
-			return true
-		}
-	}
-	return tr.matchExpr(x.X, y.X)
-}
-
-func (tr *Transformer) matchWildcard(xobj *types.Var, y ast.Expr) bool {
-	name := xobj.Name()
-
-	if tr.verbose {
-		fmt.Fprintf(os.Stderr, "%s: wildcard %s -> %s?: ",
-			tr.fset.Position(y.Pos()), name, astString(tr.fset, y))
-	}
-
-	// Check that y is assignable to the declared type of the param.
-	yt := tr.info.TypeOf(y)
-	if yt == nil {
-		// y has no type.
-		// Perhaps it is an *ast.Ellipsis in [...]T{}, or
-		// an *ast.KeyValueExpr in T{k: v}.
-		// Clearly these pseudo-expressions cannot match a
-		// wildcard, but it would nice if we had a way to ignore
-		// the difference between T{v} and T{k:v} for structs.
-		return false
-	}
-	if !types.AssignableTo(yt, xobj.Type()) {
-		if tr.verbose {
-			fmt.Fprintf(os.Stderr, "%s not assignable to %s\n", yt, xobj.Type())
-		}
-		return false
-	}
-
-	// A wildcard matches any expression.
-	// If it appears multiple times in the pattern, it must match
-	// the same expression each time.
-	if old, ok := tr.env[name]; ok {
-		// found existing binding
-		tr.allowWildcards = false
-		r := tr.matchExpr(old, y)
-		if tr.verbose {
-			fmt.Fprintf(os.Stderr, "%t secondary match, primary was %s\n",
-				r, astString(tr.fset, old))
-		}
-		tr.allowWildcards = true
-		return r
-	}
-
-	if tr.verbose {
-		fmt.Fprintf(os.Stderr, "primary match\n")
-	}
-
-	tr.env[name] = y // record binding
-	return true
-}
-
-// -- utilities --------------------------------------------------------
-
-func unparen(e ast.Expr) ast.Expr { return astutil.Unparen(e) }
-
-// isRef returns the object referred to by this (possibly qualified)
-// identifier, or nil if the node is not a referring identifier.
-func isRef(n ast.Node, info *types.Info) types.Object {
-	switch n := n.(type) {
-	case *ast.Ident:
-		return info.Uses[n]
-
-	case *ast.SelectorExpr:
-		if _, ok := info.Selections[n]; !ok {
-			// qualified ident
-			return info.Uses[n.Sel]
-		}
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/rewrite.go b/installer/vendor/golang.org/x/tools/refactor/eg/rewrite.go
deleted file mode 100644
index dd28aa5781..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/rewrite.go
+++ /dev/null
@@ -1,343 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package eg
-
-// This file defines the AST rewriting pass.
-// Most of it was plundered directly from
-// $GOROOT/src/cmd/gofmt/rewrite.go (after convergent evolution).
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-	"os"
-	"reflect"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-// Transform applies the transformation to the specified parsed file,
-// whose type information is supplied in info, and returns the number
-// of replacements that were made.
-//
-// It mutates the AST in place (the identity of the root node is
-// unchanged), and may add nodes for which no type information is
-// available in info.
-//
-// Derived from rewriteFile in $GOROOT/src/cmd/gofmt/rewrite.go.
-//
-func (tr *Transformer) Transform(info *types.Info, pkg *types.Package, file *ast.File) int {
-	if !tr.seenInfos[info] {
-		tr.seenInfos[info] = true
-		mergeTypeInfo(tr.info, info)
-	}
-	tr.currentPkg = pkg
-	tr.nsubsts = 0
-
-	if tr.verbose {
-		fmt.Fprintf(os.Stderr, "before: %s\n", astString(tr.fset, tr.before))
-		fmt.Fprintf(os.Stderr, "after: %s\n", astString(tr.fset, tr.after))
-	}
-
-	var f func(rv reflect.Value) reflect.Value
-	f = func(rv reflect.Value) reflect.Value {
-		// don't bother if val is invalid to start with
-		if !rv.IsValid() {
-			return reflect.Value{}
-		}
-
-		rv = apply(f, rv)
-
-		e := rvToExpr(rv)
-		if e != nil {
-			savedEnv := tr.env
-			tr.env = make(map[string]ast.Expr) // inefficient!  Use a slice of k/v pairs
-
-			if tr.matchExpr(tr.before, e) {
-				if tr.verbose {
-					fmt.Fprintf(os.Stderr, "%s matches %s",
-						astString(tr.fset, tr.before), astString(tr.fset, e))
-					if len(tr.env) > 0 {
-						fmt.Fprintf(os.Stderr, " with:")
-						for name, ast := range tr.env {
-							fmt.Fprintf(os.Stderr, " %s->%s",
-								name, astString(tr.fset, ast))
-						}
-					}
-					fmt.Fprintf(os.Stderr, "\n")
-				}
-				tr.nsubsts++
-
-				// Clone the replacement tree, performing parameter substitution.
-				// We update all positions to n.Pos() to aid comment placement.
-				rv = tr.subst(tr.env, reflect.ValueOf(tr.after),
-					reflect.ValueOf(e.Pos()))
-			}
-			tr.env = savedEnv
-		}
-
-		return rv
-	}
-	file2 := apply(f, reflect.ValueOf(file)).Interface().(*ast.File)
-
-	// By construction, the root node is unchanged.
-	if file != file2 {
-		panic("BUG")
-	}
-
-	// Add any necessary imports.
-	// TODO(adonovan): remove no-longer needed imports too.
-	if tr.nsubsts > 0 {
-		pkgs := make(map[string]*types.Package)
-		for obj := range tr.importedObjs {
-			pkgs[obj.Pkg().Path()] = obj.Pkg()
-		}
-
-		for _, imp := range file.Imports {
-			path, _ := strconv.Unquote(imp.Path.Value)
-			delete(pkgs, path)
-		}
-		delete(pkgs, pkg.Path()) // don't import self
-
-		// NB: AddImport may completely replace the AST!
-		// It thus renders info and tr.info no longer relevant to file.
-		var paths []string
-		for path := range pkgs {
-			paths = append(paths, path)
-		}
-		sort.Strings(paths)
-		for _, path := range paths {
-			astutil.AddImport(tr.fset, file, path)
-		}
-	}
-
-	tr.currentPkg = nil
-
-	return tr.nsubsts
-}
-
-// setValue is a wrapper for x.SetValue(y); it protects
-// the caller from panics if x cannot be changed to y.
-func setValue(x, y reflect.Value) {
-	// don't bother if y is invalid to start with
-	if !y.IsValid() {
-		return
-	}
-	defer func() {
-		if x := recover(); x != nil {
-			if s, ok := x.(string); ok &&
-				(strings.Contains(s, "type mismatch") || strings.Contains(s, "not assignable")) {
-				// x cannot be set to y - ignore this rewrite
-				return
-			}
-			panic(x)
-		}
-	}()
-	x.Set(y)
-}
-
-// Values/types for special cases.
-var (
-	objectPtrNil = reflect.ValueOf((*ast.Object)(nil))
-	scopePtrNil  = reflect.ValueOf((*ast.Scope)(nil))
-
-	identType        = reflect.TypeOf((*ast.Ident)(nil))
-	selectorExprType = reflect.TypeOf((*ast.SelectorExpr)(nil))
-	objectPtrType    = reflect.TypeOf((*ast.Object)(nil))
-	positionType     = reflect.TypeOf(token.NoPos)
-	scopePtrType     = reflect.TypeOf((*ast.Scope)(nil))
-)
-
-// apply replaces each AST field x in val with f(x), returning val.
-// To avoid extra conversions, f operates on the reflect.Value form.
-func apply(f func(reflect.Value) reflect.Value, val reflect.Value) reflect.Value {
-	if !val.IsValid() {
-		return reflect.Value{}
-	}
-
-	// *ast.Objects introduce cycles and are likely incorrect after
-	// rewrite; don't follow them but replace with nil instead
-	if val.Type() == objectPtrType {
-		return objectPtrNil
-	}
-
-	// similarly for scopes: they are likely incorrect after a rewrite;
-	// replace them with nil
-	if val.Type() == scopePtrType {
-		return scopePtrNil
-	}
-
-	switch v := reflect.Indirect(val); v.Kind() {
-	case reflect.Slice:
-		for i := 0; i < v.Len(); i++ {
-			e := v.Index(i)
-			setValue(e, f(e))
-		}
-	case reflect.Struct:
-		for i := 0; i < v.NumField(); i++ {
-			e := v.Field(i)
-			setValue(e, f(e))
-		}
-	case reflect.Interface:
-		e := v.Elem()
-		setValue(v, f(e))
-	}
-	return val
-}
-
-// subst returns a copy of (replacement) pattern with values from env
-// substituted in place of wildcards and pos used as the position of
-// tokens from the pattern.  if env == nil, subst returns a copy of
-// pattern and doesn't change the line number information.
-func (tr *Transformer) subst(env map[string]ast.Expr, pattern, pos reflect.Value) reflect.Value {
-	if !pattern.IsValid() {
-		return reflect.Value{}
-	}
-
-	// *ast.Objects introduce cycles and are likely incorrect after
-	// rewrite; don't follow them but replace with nil instead
-	if pattern.Type() == objectPtrType {
-		return objectPtrNil
-	}
-
-	// similarly for scopes: they are likely incorrect after a rewrite;
-	// replace them with nil
-	if pattern.Type() == scopePtrType {
-		return scopePtrNil
-	}
-
-	// Wildcard gets replaced with map value.
-	if env != nil && pattern.Type() == identType {
-		id := pattern.Interface().(*ast.Ident)
-		if old, ok := env[id.Name]; ok {
-			return tr.subst(nil, reflect.ValueOf(old), reflect.Value{})
-		}
-	}
-
-	// Emit qualified identifiers in the pattern by appropriate
-	// (possibly qualified) identifier in the input.
-	//
-	// The template cannot contain dot imports, so all identifiers
-	// for imported objects are explicitly qualified.
-	//
-	// We assume (unsoundly) that there are no dot or named
-	// imports in the input code, nor are any imported package
-	// names shadowed, so the usual normal qualified identifier
-	// syntax may be used.
-	// TODO(adonovan): fix: avoid this assumption.
-	//
-	// A refactoring may be applied to a package referenced by the
-	// template.  Objects belonging to the current package are
-	// denoted by unqualified identifiers.
-	//
-	if tr.importedObjs != nil && pattern.Type() == selectorExprType {
-		obj := isRef(pattern.Interface().(*ast.SelectorExpr), tr.info)
-		if obj != nil {
-			if sel, ok := tr.importedObjs[obj]; ok {
-				var id ast.Expr
-				if obj.Pkg() == tr.currentPkg {
-					id = sel.Sel // unqualified
-				} else {
-					id = sel // pkg-qualified
-				}
-
-				// Return a clone of id.
-				saved := tr.importedObjs
-				tr.importedObjs = nil // break cycle
-				r := tr.subst(nil, reflect.ValueOf(id), pos)
-				tr.importedObjs = saved
-				return r
-			}
-		}
-	}
-
-	if pos.IsValid() && pattern.Type() == positionType {
-		// use new position only if old position was valid in the first place
-		if old := pattern.Interface().(token.Pos); !old.IsValid() {
-			return pattern
-		}
-		return pos
-	}
-
-	// Otherwise copy.
-	switch p := pattern; p.Kind() {
-	case reflect.Slice:
-		v := reflect.MakeSlice(p.Type(), p.Len(), p.Len())
-		for i := 0; i < p.Len(); i++ {
-			v.Index(i).Set(tr.subst(env, p.Index(i), pos))
-		}
-		return v
-
-	case reflect.Struct:
-		v := reflect.New(p.Type()).Elem()
-		for i := 0; i < p.NumField(); i++ {
-			v.Field(i).Set(tr.subst(env, p.Field(i), pos))
-		}
-		return v
-
-	case reflect.Ptr:
-		v := reflect.New(p.Type()).Elem()
-		if elem := p.Elem(); elem.IsValid() {
-			v.Set(tr.subst(env, elem, pos).Addr())
-		}
-
-		// Duplicate type information for duplicated ast.Expr.
-		// All ast.Node implementations are *structs,
-		// so this case catches them all.
-		if e := rvToExpr(v); e != nil {
-			updateTypeInfo(tr.info, e, p.Interface().(ast.Expr))
-		}
-		return v
-
-	case reflect.Interface:
-		v := reflect.New(p.Type()).Elem()
-		if elem := p.Elem(); elem.IsValid() {
-			v.Set(tr.subst(env, elem, pos))
-		}
-		return v
-	}
-
-	return pattern
-}
-
-// -- utilities -------------------------------------------------------
-
-func rvToExpr(rv reflect.Value) ast.Expr {
-	if rv.CanInterface() {
-		if e, ok := rv.Interface().(ast.Expr); ok {
-			return e
-		}
-	}
-	return nil
-}
-
-// updateTypeInfo duplicates type information for the existing AST old
-// so that it also applies to duplicated AST new.
-func updateTypeInfo(info *types.Info, new, old ast.Expr) {
-	switch new := new.(type) {
-	case *ast.Ident:
-		orig := old.(*ast.Ident)
-		if obj, ok := info.Defs[orig]; ok {
-			info.Defs[new] = obj
-		}
-		if obj, ok := info.Uses[orig]; ok {
-			info.Uses[new] = obj
-		}
-
-	case *ast.SelectorExpr:
-		orig := old.(*ast.SelectorExpr)
-		if sel, ok := info.Selections[orig]; ok {
-			info.Selections[new] = sel
-		}
-	}
-
-	if tv, ok := info.Types[old]; ok {
-		info.Types[new] = tv
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A.template
deleted file mode 100644
index f6119618b4..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A.template
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build ignore
-
-package template
-
-// Basic test of type-aware expression refactoring.
-
-import (
-	"errors"
-	"fmt"
-)
-
-func before(s string) error { return fmt.Errorf("%s", s) }
-func after(s string) error  { return errors.New(s) }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.go
deleted file mode 100644
index 9e65eb36af..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.go
+++ /dev/null
@@ -1,51 +0,0 @@
-// +build ignore
-
-package A1
-
-import (
-	. "fmt"
-	myfmt "fmt"
-	"os"
-	"strings"
-)
-
-func example(n int) {
-	x := "foo" + strings.Repeat("\t", n)
-	// Match, despite named import.
-	myfmt.Errorf("%s", x)
-
-	// Match, despite dot import.
-	Errorf("%s", x)
-
-	// Match: multiple matches in same function are possible.
-	myfmt.Errorf("%s", x)
-
-	// No match: wildcarded operand has the wrong type.
-	myfmt.Errorf("%s", 3)
-
-	// No match: function operand doesn't match.
-	myfmt.Printf("%s", x)
-
-	// No match again, dot import.
-	Printf("%s", x)
-
-	// Match.
-	myfmt.Fprint(os.Stderr, myfmt.Errorf("%s", x+"foo"))
-
-	// No match: though this literally matches the template,
-	// fmt doesn't resolve to a package here.
-	var fmt struct{ Errorf func(string, string) }
-	fmt.Errorf("%s", x)
-
-	// Recursive matching:
-
-	// Match: both matches are well-typed, so both succeed.
-	myfmt.Errorf("%s", myfmt.Errorf("%s", x+"foo").Error())
-
-	// Outer match succeeds, inner doesn't: 3 has wrong type.
-	myfmt.Errorf("%s", myfmt.Errorf("%s", 3).Error())
-
-	// Inner match succeeds, outer doesn't: the inner replacement
-	// has the wrong type (error not string).
-	myfmt.Errorf("%s", myfmt.Errorf("%s", x+"foo"))
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.golden
deleted file mode 100644
index 7eb2934f6f..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A1.golden
+++ /dev/null
@@ -1,52 +0,0 @@
-// +build ignore
-
-package A1
-
-import (
-	"errors"
-	. "fmt"
-	myfmt "fmt"
-	"os"
-	"strings"
-)
-
-func example(n int) {
-	x := "foo" + strings.Repeat("\t", n)
-	// Match, despite named import.
-	errors.New(x)
-
-	// Match, despite dot import.
-	errors.New(x)
-
-	// Match: multiple matches in same function are possible.
-	errors.New(x)
-
-	// No match: wildcarded operand has the wrong type.
-	myfmt.Errorf("%s", 3)
-
-	// No match: function operand doesn't match.
-	myfmt.Printf("%s", x)
-
-	// No match again, dot import.
-	Printf("%s", x)
-
-	// Match.
-	myfmt.Fprint(os.Stderr, errors.New(x+"foo"))
-
-	// No match: though this literally matches the template,
-	// fmt doesn't resolve to a package here.
-	var fmt struct{ Errorf func(string, string) }
-	fmt.Errorf("%s", x)
-
-	// Recursive matching:
-
-	// Match: both matches are well-typed, so both succeed.
-	errors.New(errors.New(x + "foo").Error())
-
-	// Outer match succeeds, inner doesn't: 3 has wrong type.
-	errors.New(myfmt.Errorf("%s", 3).Error())
-
-	// Inner match succeeds, outer doesn't: the inner replacement
-	// has the wrong type (error not string).
-	myfmt.Errorf("%s", errors.New(x+"foo"))
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.go
deleted file mode 100644
index 3ae29ad771..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package A2
-
-// This refactoring causes addition of "errors" import.
-// TODO(adonovan): fix: it should also remove "fmt".
-
-import myfmt "fmt"
-
-func example(n int) {
-	myfmt.Errorf("%s", "")
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.golden
deleted file mode 100644
index b6e3a6d7ae..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/A2.golden
+++ /dev/null
@@ -1,15 +0,0 @@
-// +build ignore
-
-package A2
-
-// This refactoring causes addition of "errors" import.
-// TODO(adonovan): fix: it should also remove "fmt".
-
-import (
-	"errors"
-	myfmt "fmt"
-)
-
-func example(n int) {
-	errors.New("")
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B.template
deleted file mode 100644
index c16627bd55..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B.template
+++ /dev/null
@@ -1,9 +0,0 @@
-package template
-
-// Basic test of expression refactoring.
-// (Types are not important in this case; it could be done with gofmt -r.)
-
-import "time"
-
-func before(t time.Time) time.Duration { return time.Now().Sub(t) }
-func after(t time.Time) time.Duration  { return time.Since(t) }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.go
deleted file mode 100644
index 8b52546346..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.go
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build ignore
-
-package B1
-
-import "time"
-
-var startup = time.Now()
-
-func example() time.Duration {
-	before := time.Now()
-	time.Sleep(1)
-	return time.Now().Sub(before)
-}
-
-func msSinceStartup() int64 {
-	return int64(time.Now().Sub(startup) / time.Millisecond)
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.golden
deleted file mode 100644
index 4d4da2185d..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/B1.golden
+++ /dev/null
@@ -1,17 +0,0 @@
-// +build ignore
-
-package B1
-
-import "time"
-
-var startup = time.Now()
-
-func example() time.Duration {
-	before := time.Now()
-	time.Sleep(1)
-	return time.Since(before)
-}
-
-func msSinceStartup() int64 {
-	return int64(time.Since(startup) / time.Millisecond)
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C.template
deleted file mode 100644
index f6f94d4aa9..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C.template
+++ /dev/null
@@ -1,10 +0,0 @@
-package template
-
-// Test of repeated use of wildcard in pattern.
-
-// NB: multiple patterns would be required to handle variants such as
-// s[:len(s)], s[x:len(s)], etc, since a wildcard can't match nothing at all.
-// TODO(adonovan): support multiple templates in a single pass.
-
-func before(s string) string { return s[:len(s)] }
-func after(s string) string  { return s }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.go
deleted file mode 100644
index 523b3885dd..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.go
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build ignore
-
-package C1
-
-import "strings"
-
-func example() {
-	x := "foo"
-	println(x[:len(x)])
-
-	// Match, but the transformation is not sound w.r.t. possible side effects.
-	println(strings.Repeat("*", 3)[:len(strings.Repeat("*", 3))])
-
-	// No match, since second use of wildcard doesn't match first.
-	println(strings.Repeat("*", 3)[:len(strings.Repeat("*", 2))])
-
-	// Recursive match demonstrating bottom-up rewrite:
-	// only after the inner replacement occurs does the outer syntax match.
-	println((x[:len(x)])[:len(x[:len(x)])])
-	// -> (x[:len(x)])
-	// -> x
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.golden
deleted file mode 100644
index ae7759d79c..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/C1.golden
+++ /dev/null
@@ -1,22 +0,0 @@
-// +build ignore
-
-package C1
-
-import "strings"
-
-func example() {
-	x := "foo"
-	println(x)
-
-	// Match, but the transformation is not sound w.r.t. possible side effects.
-	println(strings.Repeat("*", 3))
-
-	// No match, since second use of wildcard doesn't match first.
-	println(strings.Repeat("*", 3)[:len(strings.Repeat("*", 2))])
-
-	// Recursive match demonstrating bottom-up rewrite:
-	// only after the inner replacement occurs does the outer syntax match.
-	println(x)
-	// -> (x[:len(x)])
-	// -> x
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D.template
deleted file mode 100644
index 6d3b6feb71..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D.template
+++ /dev/null
@@ -1,8 +0,0 @@
-package template
-
-import "fmt"
-
-// Test of semantic (not syntactic) matching of basic literals.
-
-func before() (int, error) { return fmt.Println(123, "a") }
-func after() (int, error)  { return fmt.Println(456, "!") }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.go
deleted file mode 100644
index ae0a806050..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package D1
-
-import "fmt"
-
-func example() {
-	fmt.Println(123, "a")         // match
-	fmt.Println(0x7b, `a`)        // match
-	fmt.Println(0173, "\x61")     // match
-	fmt.Println(100+20+3, "a"+"") // no match: constant expressions, but not basic literals
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.golden
deleted file mode 100644
index 2932652873..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/D1.golden
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package D1
-
-import "fmt"
-
-func example() {
-	fmt.Println(456, "!")         // match
-	fmt.Println(456, "!")         // match
-	fmt.Println(456, "!")         // match
-	fmt.Println(100+20+3, "a"+"") // no match: constant expressions, but not basic literals
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E.template
deleted file mode 100644
index 4bbbd1139b..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E.template
+++ /dev/null
@@ -1,12 +0,0 @@
-package template
-
-import (
-	"fmt"
-	"log"
-	"os"
-)
-
-// Replace call to void function by call to non-void function.
-
-func before(x interface{}) { log.Fatal(x) }
-func after(x interface{})  { fmt.Fprintf(os.Stderr, "warning: %v", x) }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.go
deleted file mode 100644
index 3ea1793f96..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build ignore
-
-package E1
-
-import "log"
-
-func example() {
-	log.Fatal("oops") // match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.golden
deleted file mode 100644
index 796364f2d1..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/E1.golden
+++ /dev/null
@@ -1,13 +0,0 @@
-// +build ignore
-
-package E1
-
-import (
-	"fmt"
-	"log"
-	"os"
-)
-
-func example() {
-	fmt.Fprintf(os.Stderr, "warning: %v", "oops") // match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F.template
deleted file mode 100644
index 21e1bd2a4f..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F.template
+++ /dev/null
@@ -1,8 +0,0 @@
-package templates
-
-// Test 
-
-import "sync"
-
-func before(s sync.RWMutex) { s.Lock() }
-func after(s sync.RWMutex) { s.RLock() }
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.go
deleted file mode 100644
index 2258abda5f..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.go
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build ignore
-
-package F1
-
-import "sync"
-
-func example(n int) {
-	var x struct {
-		mutex sync.RWMutex
-	}
-
-	var y struct {
-		sync.RWMutex
-	}
-
-	type l struct {
-		sync.RWMutex
-	}
-
-	var z struct {
-		l
-	}
-
-	var a struct {
-		*l
-	}
-
-	var b struct{ Lock func() }
-
-	// Match
-	x.mutex.Lock()
-
-	// Match
-	y.Lock()
-
-	// Match indirect
-	z.Lock()
-
-	// Should be no match however currently matches due to:
-	// https://golang.org/issue/8584
-	// Will start failing when this is fixed then just change golden to
-	// No match pointer indirect
-	// a.Lock()
-	a.Lock()
-
-	// No match
-	b.Lock()
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.golden
deleted file mode 100644
index 5ffda69855..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/F1.golden
+++ /dev/null
@@ -1,48 +0,0 @@
-// +build ignore
-
-package F1
-
-import "sync"
-
-func example(n int) {
-	var x struct {
-		mutex sync.RWMutex
-	}
-
-	var y struct {
-		sync.RWMutex
-	}
-
-	type l struct {
-		sync.RWMutex
-	}
-
-	var z struct {
-		l
-	}
-
-	var a struct {
-		*l
-	}
-
-	var b struct{ Lock func() }
-
-	// Match
-	x.mutex.RLock()
-
-	// Match
-	y.RLock()
-
-	// Match indirect
-	z.RLock()
-
-	// Should be no match however currently matches due to:
-	// https://golang.org/issue/8584
-	// Will start failing when this is fixed then just change golden to
-	// No match pointer indirect
-	// a.Lock()
-	a.RLock()
-
-	// No match
-	b.Lock()
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G.template
deleted file mode 100644
index 69d84fe9f4..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G.template
+++ /dev/null
@@ -1,10 +0,0 @@
-package templates
-
-import (
-	"go/ast" // defines many unencapsulated structs
-	"go/token"
-)
-
-func before(from, to token.Pos) ast.BadExpr { return ast.BadExpr{From: from, To: to} }
-func after(from, to token.Pos) ast.BadExpr  { return ast.BadExpr{from, to} }
-     
\ No newline at end of file
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.go
deleted file mode 100644
index 07aaff916c..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package G1
-
-import "go/ast"
-
-func example() {
-	_ = ast.BadExpr{From: 123, To: 456} // match
-	_ = ast.BadExpr{123, 456}           // no match
-	_ = ast.BadExpr{From: 123}          // no match
-	_ = ast.BadExpr{To: 456}            // no match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.golden
deleted file mode 100644
index c93c53fc3b..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/G1.golden
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package G1
-
-import "go/ast"
-
-func example() {
-	_ = ast.BadExpr{123, 456}  // match
-	_ = ast.BadExpr{123, 456}  // no match
-	_ = ast.BadExpr{From: 123} // no match
-	_ = ast.BadExpr{To: 456}   // no match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H.template
deleted file mode 100644
index fa6f802c8a..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H.template
+++ /dev/null
@@ -1,9 +0,0 @@
-package templates
-
-import (
-	"go/ast" // defines many unencapsulated structs
-	"go/token"
-)
-
-func before(from, to token.Pos) ast.BadExpr { return ast.BadExpr{from, to} }
-func after(from, to token.Pos) ast.BadExpr  { return ast.BadExpr{From: from, To: to} }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.go b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.go
deleted file mode 100644
index ef4291c18a..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.go
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package H1
-
-import "go/ast"
-
-func example() {
-	_ = ast.BadExpr{From: 123, To: 456} // no match
-	_ = ast.BadExpr{123, 456}           // match
-	_ = ast.BadExpr{From: 123}          // no match
-	_ = ast.BadExpr{To: 456}            // no match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.golden b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.golden
deleted file mode 100644
index a1e5961264..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/H1.golden
+++ /dev/null
@@ -1,12 +0,0 @@
-// +build ignore
-
-package H1
-
-import "go/ast"
-
-func example() {
-	_ = ast.BadExpr{From: 123, To: 456} // no match
-	_ = ast.BadExpr{From: 123, To: 456} // match
-	_ = ast.BadExpr{From: 123}          // no match
-	_ = ast.BadExpr{To: 456}            // no match
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/bad_type.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/bad_type.template
deleted file mode 100644
index 6d53d7e570..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/bad_type.template
+++ /dev/null
@@ -1,8 +0,0 @@
-package template
-
-// Test in which replacement has a different type.
-
-const shouldFail = "int is not a safe replacement for string"
-
-func before() interface{} { return "three" }
-func after() interface{}  { return 3 }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/expr_type_mismatch.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/expr_type_mismatch.template
deleted file mode 100644
index 2c5c3f0dc6..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/expr_type_mismatch.template
+++ /dev/null
@@ -1,15 +0,0 @@
-package template
-
-import (
-	"crypto/x509"
-	"fmt"
-)
-
-// This test demonstrates a false negative: according to the language
-// rules this replacement should be ok, but types.Assignable doesn't work
-// in the expected way (elementwise assignability) for tuples.
-// Perhaps that's even a type-checker bug?
-const shouldFail = "(n int, err error) is not a safe replacement for (key interface{}, err error)"
-
-func before() (interface{}, error) { return x509.ParsePKCS8PrivateKey(nil) }
-func after() (interface{}, error)  { return fmt.Print() }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_after_return.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_after_return.template
deleted file mode 100644
index 536b01e678..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_after_return.template
+++ /dev/null
@@ -1,6 +0,0 @@
-package template
-
-const shouldFail = "after: must contain a single statement"
-
-func before() int { return 0 }
-func after() int  { println(); return 0 }
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_before.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_before.template
deleted file mode 100644
index 9205e6677a..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/no_before.template
+++ /dev/null
@@ -1,5 +0,0 @@
-package template
-
-const shouldFail = "no 'before' func found in template"
-
-func Before() {}
diff --git a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/type_mismatch.template b/installer/vendor/golang.org/x/tools/refactor/eg/testdata/type_mismatch.template
deleted file mode 100644
index 787c9a7a8c..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/eg/testdata/type_mismatch.template
+++ /dev/null
@@ -1,6 +0,0 @@
-package template
-
-const shouldFail = "different signatures"
-
-func before() int   { return 0 }
-func after() string { return "" }
diff --git a/installer/vendor/golang.org/x/tools/refactor/importgraph/graph.go b/installer/vendor/golang.org/x/tools/refactor/importgraph/graph.go
deleted file mode 100644
index d2d8f098b3..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/importgraph/graph.go
+++ /dev/null
@@ -1,167 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package importgraph computes the forward and reverse import
-// dependency graphs for all packages in a Go workspace.
-package importgraph // import "golang.org/x/tools/refactor/importgraph"
-
-import (
-	"go/build"
-	"sync"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-// A Graph is an import dependency graph, either forward or reverse.
-//
-// The graph maps each node (a package import path) to the set of its
-// successors in the graph.  For a forward graph, this is the set of
-// imported packages (prerequisites); for a reverse graph, it is the set
-// of importing packages (clients).
-//
-// Graph construction inspects all imports in each package's directory,
-// including those in _test.go files, so the resulting graph may be cyclic.
-type Graph map[string]map[string]bool
-
-func (g Graph) addEdge(from, to string) {
-	edges := g[from]
-	if edges == nil {
-		edges = make(map[string]bool)
-		g[from] = edges
-	}
-	edges[to] = true
-}
-
-// Search returns all the nodes of the graph reachable from
-// any of the specified roots, by following edges forwards.
-// Relationally, this is the reflexive transitive closure.
-func (g Graph) Search(roots ...string) map[string]bool {
-	seen := make(map[string]bool)
-	var visit func(x string)
-	visit = func(x string) {
-		if !seen[x] {
-			seen[x] = true
-			for y := range g[x] {
-				visit(y)
-			}
-		}
-	}
-	for _, root := range roots {
-		visit(root)
-	}
-	return seen
-}
-
-// Build scans the specified Go workspace and builds the forward and
-// reverse import dependency graphs for all its packages.
-// It also returns a mapping from canonical import paths to errors for packages
-// whose loading was not entirely successful.
-// A package may appear in the graph and in the errors mapping.
-// All package paths are canonical and may contain "/vendor/".
-func Build(ctxt *build.Context) (forward, reverse Graph, errors map[string]error) {
-	type importEdge struct {
-		from, to string
-	}
-	type pathError struct {
-		path string
-		err  error
-	}
-
-	ch := make(chan interface{})
-
-	go func() {
-		sema := make(chan int, 20) // I/O concurrency limiting semaphore
-		var wg sync.WaitGroup
-		buildutil.ForEachPackage(ctxt, func(path string, err error) {
-			if err != nil {
-				ch <- pathError{path, err}
-				return
-			}
-
-			wg.Add(1)
-			go func() {
-				defer wg.Done()
-
-				sema <- 1
-				bp, err := ctxt.Import(path, "", 0)
-				<-sema
-
-				if err != nil {
-					if _, ok := err.(*build.NoGoError); ok {
-						// empty directory is not an error
-					} else {
-						ch <- pathError{path, err}
-					}
-					// Even in error cases, Import usually returns a package.
-				}
-
-				// absolutize resolves an import path relative
-				// to the current package bp.
-				// The absolute form may contain "vendor".
-				//
-				// The vendoring feature slows down Build by 3×.
-				// Here are timings from a 1400 package workspace:
-				//    1100ms: current code (with vendor check)
-				//     880ms: with a nonblocking cache around ctxt.IsDir
-				//     840ms: nonblocking cache with duplicate suppression
-				//     340ms: original code (no vendor check)
-				// TODO(adonovan): optimize, somehow.
-				memo := make(map[string]string)
-				absolutize := func(path string) string {
-					canon, ok := memo[path]
-					if !ok {
-						sema <- 1
-						bp2, _ := ctxt.Import(path, bp.Dir, build.FindOnly)
-						<-sema
-
-						if bp2 != nil {
-							canon = bp2.ImportPath
-						} else {
-							canon = path
-						}
-						memo[path] = canon
-					}
-					return canon
-				}
-
-				if bp != nil {
-					for _, imp := range bp.Imports {
-						ch <- importEdge{path, absolutize(imp)}
-					}
-					for _, imp := range bp.TestImports {
-						ch <- importEdge{path, absolutize(imp)}
-					}
-					for _, imp := range bp.XTestImports {
-						ch <- importEdge{path, absolutize(imp)}
-					}
-				}
-
-			}()
-		})
-		wg.Wait()
-		close(ch)
-	}()
-
-	forward = make(Graph)
-	reverse = make(Graph)
-
-	for e := range ch {
-		switch e := e.(type) {
-		case pathError:
-			if errors == nil {
-				errors = make(map[string]error)
-			}
-			errors[e.path] = e.err
-
-		case importEdge:
-			if e.to == "C" {
-				continue // "C" is fake
-			}
-			forward.addEdge(e.from, e.to)
-			reverse.addEdge(e.to, e.from)
-		}
-	}
-
-	return forward, reverse, errors
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/importgraph/graph_test.go b/installer/vendor/golang.org/x/tools/refactor/importgraph/graph_test.go
deleted file mode 100644
index 52dd769590..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/importgraph/graph_test.go
+++ /dev/null
@@ -1,99 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Incomplete std lib sources on Android.
-
-// +build !android
-
-package importgraph_test
-
-import (
-	"go/build"
-	"sort"
-	"testing"
-
-	"golang.org/x/tools/refactor/importgraph"
-
-	_ "crypto/hmac" // just for test, below
-)
-
-const this = "golang.org/x/tools/refactor/importgraph"
-
-func TestBuild(t *testing.T) {
-	forward, reverse, errors := importgraph.Build(&build.Default)
-
-	// Test direct edges.
-	// We throw in crypto/hmac to prove that external test files
-	// (such as this one) are inspected.
-	for _, p := range []string{"go/build", "testing", "crypto/hmac"} {
-		if !forward[this][p] {
-			t.Errorf("forward[importgraph][%s] not found", p)
-		}
-		if !reverse[p][this] {
-			t.Errorf("reverse[%s][importgraph] not found", p)
-		}
-	}
-
-	// Test non-existent direct edges
-	for _, p := range []string{"errors", "reflect"} {
-		if forward[this][p] {
-			t.Errorf("unexpected: forward[importgraph][%s] found", p)
-		}
-		if reverse[p][this] {
-			t.Errorf("unexpected: reverse[%s][importgraph] found", p)
-		}
-	}
-
-	// Test Search is reflexive.
-	if !forward.Search(this)[this] {
-		t.Errorf("irreflexive: forward.Search(importgraph)[importgraph] not found")
-	}
-	if !reverse.Search(this)[this] {
-		t.Errorf("irrefexive: reverse.Search(importgraph)[importgraph] not found")
-	}
-
-	// Test Search is transitive.  (There is no direct edge to these packages.)
-	for _, p := range []string{"errors", "reflect", "unsafe"} {
-		if !forward.Search(this)[p] {
-			t.Errorf("intransitive: forward.Search(importgraph)[%s] not found", p)
-		}
-		if !reverse.Search(p)[this] {
-			t.Errorf("intransitive: reverse.Search(%s)[importgraph] not found", p)
-		}
-	}
-
-	// Test strongly-connected components.  Because A's external
-	// test package can depend on B, and vice versa, most of the
-	// standard libraries are mutually dependent when their external
-	// tests are considered.
-	//
-	// For any nodes x, y in the same SCC, y appears in the results
-	// of both forward and reverse searches starting from x
-	if !forward.Search("fmt")["io"] ||
-		!forward.Search("io")["fmt"] ||
-		!reverse.Search("fmt")["io"] ||
-		!reverse.Search("io")["fmt"] {
-		t.Errorf("fmt and io are not mutually reachable despite being in the same SCC")
-	}
-
-	// debugging
-	if false {
-		for path, err := range errors {
-			t.Logf("%s: %s", path, err)
-		}
-		printSorted := func(direction string, g importgraph.Graph, start string) {
-			t.Log(direction)
-			var pkgs []string
-			for pkg := range g.Search(start) {
-				pkgs = append(pkgs, pkg)
-			}
-			sort.Strings(pkgs)
-			for _, pkg := range pkgs {
-				t.Logf("\t%s", pkg)
-			}
-		}
-		printSorted("forward", forward, this)
-		printSorted("reverse", reverse, this)
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/check.go b/installer/vendor/golang.org/x/tools/refactor/rename/check.go
deleted file mode 100644
index 838fc7b79e..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/check.go
+++ /dev/null
@@ -1,858 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rename
-
-// This file defines the safety checks for each kind of renaming.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/refactor/satisfy"
-)
-
-// errorf reports an error (e.g. conflict) and prevents file modification.
-func (r *renamer) errorf(pos token.Pos, format string, args ...interface{}) {
-	r.hadConflicts = true
-	reportError(r.iprog.Fset.Position(pos), fmt.Sprintf(format, args...))
-}
-
-// check performs safety checks of the renaming of the 'from' object to r.to.
-func (r *renamer) check(from types.Object) {
-	if r.objsToUpdate[from] {
-		return
-	}
-	r.objsToUpdate[from] = true
-
-	// NB: order of conditions is important.
-	if from_, ok := from.(*types.PkgName); ok {
-		r.checkInFileBlock(from_)
-	} else if from_, ok := from.(*types.Label); ok {
-		r.checkLabel(from_)
-	} else if isPackageLevel(from) {
-		r.checkInPackageBlock(from)
-	} else if v, ok := from.(*types.Var); ok && v.IsField() {
-		r.checkStructField(v)
-	} else if f, ok := from.(*types.Func); ok && recv(f) != nil {
-		r.checkMethod(f)
-	} else if isLocal(from) {
-		r.checkInLocalScope(from)
-	} else {
-		r.errorf(from.Pos(), "unexpected %s object %q (please report a bug)\n",
-			objectKind(from), from)
-	}
-}
-
-// checkInFileBlock performs safety checks for renames of objects in the file block,
-// i.e. imported package names.
-func (r *renamer) checkInFileBlock(from *types.PkgName) {
-	// Check import name is not "init".
-	if r.to == "init" {
-		r.errorf(from.Pos(), "%q is not a valid imported package name", r.to)
-	}
-
-	// Check for conflicts between file and package block.
-	if prev := from.Pkg().Scope().Lookup(r.to); prev != nil {
-		r.errorf(from.Pos(), "renaming this %s %q to %q would conflict",
-			objectKind(from), from.Name(), r.to)
-		r.errorf(prev.Pos(), "\twith this package member %s",
-			objectKind(prev))
-		return // since checkInPackageBlock would report redundant errors
-	}
-
-	// Check for conflicts in lexical scope.
-	r.checkInLexicalScope(from, r.packages[from.Pkg()])
-
-	// Finally, modify ImportSpec syntax to add or remove the Name as needed.
-	info, path, _ := r.iprog.PathEnclosingInterval(from.Pos(), from.Pos())
-	if from.Imported().Name() == r.to {
-		// ImportSpec.Name not needed
-		path[1].(*ast.ImportSpec).Name = nil
-	} else {
-		// ImportSpec.Name needed
-		if spec := path[1].(*ast.ImportSpec); spec.Name == nil {
-			spec.Name = &ast.Ident{NamePos: spec.Path.Pos(), Name: r.to}
-			info.Defs[spec.Name] = from
-		}
-	}
-}
-
-// checkInPackageBlock performs safety checks for renames of
-// func/var/const/type objects in the package block.
-func (r *renamer) checkInPackageBlock(from types.Object) {
-	// Check that there are no references to the name from another
-	// package if the renaming would make it unexported.
-	if ast.IsExported(from.Name()) && !ast.IsExported(r.to) {
-		for pkg, info := range r.packages {
-			if pkg == from.Pkg() {
-				continue
-			}
-			if id := someUse(info, from); id != nil &&
-				!r.checkExport(id, pkg, from) {
-				break
-			}
-		}
-	}
-
-	info := r.packages[from.Pkg()]
-
-	// Check that in the package block, "init" is a function, and never referenced.
-	if r.to == "init" {
-		kind := objectKind(from)
-		if kind == "func" {
-			// Reject if intra-package references to it exist.
-			for id, obj := range info.Uses {
-				if obj == from {
-					r.errorf(from.Pos(),
-						"renaming this func %q to %q would make it a package initializer",
-						from.Name(), r.to)
-					r.errorf(id.Pos(), "\tbut references to it exist")
-					break
-				}
-			}
-		} else {
-			r.errorf(from.Pos(), "you cannot have a %s at package level named %q",
-				kind, r.to)
-		}
-	}
-
-	// Check for conflicts between package block and all file blocks.
-	for _, f := range info.Files {
-		fileScope := info.Info.Scopes[f]
-		b, prev := fileScope.LookupParent(r.to, token.NoPos)
-		if b == fileScope {
-			r.errorf(from.Pos(), "renaming this %s %q to %q would conflict",
-				objectKind(from), from.Name(), r.to)
-			r.errorf(prev.Pos(), "\twith this %s",
-				objectKind(prev))
-			return // since checkInPackageBlock would report redundant errors
-		}
-	}
-
-	// Check for conflicts in lexical scope.
-	if from.Exported() {
-		for _, info := range r.packages {
-			r.checkInLexicalScope(from, info)
-		}
-	} else {
-		r.checkInLexicalScope(from, info)
-	}
-}
-
-func (r *renamer) checkInLocalScope(from types.Object) {
-	info := r.packages[from.Pkg()]
-
-	// Is this object an implicit local var for a type switch?
-	// Each case has its own var, whose position is the decl of y,
-	// but Ident in that decl does not appear in the Uses map.
-	//
-	//   switch y := x.(type) {	 // Defs[Ident(y)] is undefined
-	//   case int:    print(y)       // Implicits[CaseClause(int)]    = Var(y_int)
-	//   case string: print(y)       // Implicits[CaseClause(string)] = Var(y_string)
-	//   }
-	//
-	var isCaseVar bool
-	for syntax, obj := range info.Implicits {
-		if _, ok := syntax.(*ast.CaseClause); ok && obj.Pos() == from.Pos() {
-			isCaseVar = true
-			r.check(obj)
-		}
-	}
-
-	r.checkInLexicalScope(from, info)
-
-	// Finally, if this was a type switch, change the variable y.
-	if isCaseVar {
-		_, path, _ := r.iprog.PathEnclosingInterval(from.Pos(), from.Pos())
-		path[0].(*ast.Ident).Name = r.to // path is [Ident AssignStmt TypeSwitchStmt...]
-	}
-}
-
-// checkInLexicalScope performs safety checks that a renaming does not
-// change the lexical reference structure of the specified package.
-//
-// For objects in lexical scope, there are three kinds of conflicts:
-// same-, sub-, and super-block conflicts.  We will illustrate all three
-// using this example:
-//
-//	var x int
-//	var z int
-//
-//	func f(y int) {
-//		print(x)
-//		print(y)
-//	}
-//
-// Renaming x to z encounters a SAME-BLOCK CONFLICT, because an object
-// with the new name already exists, defined in the same lexical block
-// as the old object.
-//
-// Renaming x to y encounters a SUB-BLOCK CONFLICT, because there exists
-// a reference to x from within (what would become) a hole in its scope.
-// The definition of y in an (inner) sub-block would cast a shadow in
-// the scope of the renamed variable.
-//
-// Renaming y to x encounters a SUPER-BLOCK CONFLICT.  This is the
-// converse situation: there is an existing definition of the new name
-// (x) in an (enclosing) super-block, and the renaming would create a
-// hole in its scope, within which there exist references to it.  The
-// new name casts a shadow in scope of the existing definition of x in
-// the super-block.
-//
-// Removing the old name (and all references to it) is always safe, and
-// requires no checks.
-//
-func (r *renamer) checkInLexicalScope(from types.Object, info *loader.PackageInfo) {
-	b := from.Parent() // the block defining the 'from' object
-	if b != nil {
-		toBlock, to := b.LookupParent(r.to, from.Parent().End())
-		if toBlock == b {
-			// same-block conflict
-			r.errorf(from.Pos(), "renaming this %s %q to %q",
-				objectKind(from), from.Name(), r.to)
-			r.errorf(to.Pos(), "\tconflicts with %s in same block",
-				objectKind(to))
-			return
-		} else if toBlock != nil {
-			// Check for super-block conflict.
-			// The name r.to is defined in a superblock.
-			// Is that name referenced from within this block?
-			forEachLexicalRef(info, to, func(id *ast.Ident, block *types.Scope) bool {
-				_, obj := lexicalLookup(block, from.Name(), id.Pos())
-				if obj == from {
-					// super-block conflict
-					r.errorf(from.Pos(), "renaming this %s %q to %q",
-						objectKind(from), from.Name(), r.to)
-					r.errorf(id.Pos(), "\twould shadow this reference")
-					r.errorf(to.Pos(), "\tto the %s declared here",
-						objectKind(to))
-					return false // stop
-				}
-				return true
-			})
-		}
-	}
-
-	// Check for sub-block conflict.
-	// Is there an intervening definition of r.to between
-	// the block defining 'from' and some reference to it?
-	forEachLexicalRef(info, from, func(id *ast.Ident, block *types.Scope) bool {
-		// Find the block that defines the found reference.
-		// It may be an ancestor.
-		fromBlock, _ := lexicalLookup(block, from.Name(), id.Pos())
-
-		// See what r.to would resolve to in the same scope.
-		toBlock, to := lexicalLookup(block, r.to, id.Pos())
-		if to != nil {
-			// sub-block conflict
-			if deeper(toBlock, fromBlock) {
-				r.errorf(from.Pos(), "renaming this %s %q to %q",
-					objectKind(from), from.Name(), r.to)
-				r.errorf(id.Pos(), "\twould cause this reference to become shadowed")
-				r.errorf(to.Pos(), "\tby this intervening %s definition",
-					objectKind(to))
-				return false // stop
-			}
-		}
-		return true
-	})
-
-	// Renaming a type that is used as an embedded field
-	// requires renaming the field too. e.g.
-	// 	type T int // if we rename this to U..
-	// 	var s struct {T}
-	// 	print(s.T) // ...this must change too
-	if _, ok := from.(*types.TypeName); ok {
-		for id, obj := range info.Uses {
-			if obj == from {
-				if field := info.Defs[id]; field != nil {
-					r.check(field)
-				}
-			}
-		}
-	}
-}
-
-// lexicalLookup is like (*types.Scope).LookupParent but respects the
-// environment visible at pos.  It assumes the relative position
-// information is correct with each file.
-func lexicalLookup(block *types.Scope, name string, pos token.Pos) (*types.Scope, types.Object) {
-	for b := block; b != nil; b = b.Parent() {
-		obj := b.Lookup(name)
-		// The scope of a package-level object is the entire package,
-		// so ignore pos in that case.
-		// No analogous clause is needed for file-level objects
-		// since no reference can appear before an import decl.
-		if obj != nil && (b == obj.Pkg().Scope() || obj.Pos() < pos) {
-			return b, obj
-		}
-	}
-	return nil, nil
-}
-
-// deeper reports whether block x is lexically deeper than y.
-func deeper(x, y *types.Scope) bool {
-	if x == y || x == nil {
-		return false
-	} else if y == nil {
-		return true
-	} else {
-		return deeper(x.Parent(), y.Parent())
-	}
-}
-
-// forEachLexicalRef calls fn(id, block) for each identifier id in package
-// info that is a reference to obj in lexical scope.  block is the
-// lexical block enclosing the reference.  If fn returns false the
-// iteration is terminated and findLexicalRefs returns false.
-func forEachLexicalRef(info *loader.PackageInfo, obj types.Object, fn func(id *ast.Ident, block *types.Scope) bool) bool {
-	ok := true
-	var stack []ast.Node
-
-	var visit func(n ast.Node) bool
-	visit = func(n ast.Node) bool {
-		if n == nil {
-			stack = stack[:len(stack)-1] // pop
-			return false
-		}
-		if !ok {
-			return false // bail out
-		}
-
-		stack = append(stack, n) // push
-		switch n := n.(type) {
-		case *ast.Ident:
-			if info.Uses[n] == obj {
-				block := enclosingBlock(&info.Info, stack)
-				if !fn(n, block) {
-					ok = false
-				}
-			}
-			return visit(nil) // pop stack
-
-		case *ast.SelectorExpr:
-			// don't visit n.Sel
-			ast.Inspect(n.X, visit)
-			return visit(nil) // pop stack, don't descend
-
-		case *ast.CompositeLit:
-			// Handle recursion ourselves for struct literals
-			// so we don't visit field identifiers.
-			tv := info.Types[n]
-			if _, ok := deref(tv.Type).Underlying().(*types.Struct); ok {
-				if n.Type != nil {
-					ast.Inspect(n.Type, visit)
-				}
-				for _, elt := range n.Elts {
-					if kv, ok := elt.(*ast.KeyValueExpr); ok {
-						ast.Inspect(kv.Value, visit)
-					} else {
-						ast.Inspect(elt, visit)
-					}
-				}
-				return visit(nil) // pop stack, don't descend
-			}
-		}
-		return true
-	}
-
-	for _, f := range info.Files {
-		ast.Inspect(f, visit)
-		if len(stack) != 0 {
-			panic(stack)
-		}
-		if !ok {
-			break
-		}
-	}
-	return ok
-}
-
-// enclosingBlock returns the innermost block enclosing the specified
-// AST node, specified in the form of a path from the root of the file,
-// [file...n].
-func enclosingBlock(info *types.Info, stack []ast.Node) *types.Scope {
-	for i := range stack {
-		n := stack[len(stack)-1-i]
-		// For some reason, go/types always associates a
-		// function's scope with its FuncType.
-		// TODO(adonovan): feature or a bug?
-		switch f := n.(type) {
-		case *ast.FuncDecl:
-			n = f.Type
-		case *ast.FuncLit:
-			n = f.Type
-		}
-		if b := info.Scopes[n]; b != nil {
-			return b
-		}
-	}
-	panic("no Scope for *ast.File")
-}
-
-func (r *renamer) checkLabel(label *types.Label) {
-	// Check there are no identical labels in the function's label block.
-	// (Label blocks don't nest, so this is easy.)
-	if prev := label.Parent().Lookup(r.to); prev != nil {
-		r.errorf(label.Pos(), "renaming this label %q to %q", label.Name(), prev.Name())
-		r.errorf(prev.Pos(), "\twould conflict with this one")
-	}
-}
-
-// checkStructField checks that the field renaming will not cause
-// conflicts at its declaration, or ambiguity or changes to any selection.
-func (r *renamer) checkStructField(from *types.Var) {
-	// Check that the struct declaration is free of field conflicts,
-	// and field/method conflicts.
-
-	// go/types offers no easy way to get from a field (or interface
-	// method) to its declaring struct (or interface), so we must
-	// ascend the AST.
-	info, path, _ := r.iprog.PathEnclosingInterval(from.Pos(), from.Pos())
-	// path matches this pattern:
-	// [Ident SelectorExpr? StarExpr? Field FieldList StructType ParenExpr* ... File]
-
-	// Ascend to FieldList.
-	var i int
-	for {
-		if _, ok := path[i].(*ast.FieldList); ok {
-			break
-		}
-		i++
-	}
-	i++
-	tStruct := path[i].(*ast.StructType)
-	i++
-	// Ascend past parens (unlikely).
-	for {
-		_, ok := path[i].(*ast.ParenExpr)
-		if !ok {
-			break
-		}
-		i++
-	}
-	if spec, ok := path[i].(*ast.TypeSpec); ok {
-		// This struct is also a named type.
-		// We must check for direct (non-promoted) field/field
-		// and method/field conflicts.
-		named := info.Defs[spec.Name].Type()
-		prev, indices, _ := types.LookupFieldOrMethod(named, true, info.Pkg, r.to)
-		if len(indices) == 1 {
-			r.errorf(from.Pos(), "renaming this field %q to %q",
-				from.Name(), r.to)
-			r.errorf(prev.Pos(), "\twould conflict with this %s",
-				objectKind(prev))
-			return // skip checkSelections to avoid redundant errors
-		}
-	} else {
-		// This struct is not a named type.
-		// We need only check for direct (non-promoted) field/field conflicts.
-		T := info.Types[tStruct].Type.Underlying().(*types.Struct)
-		for i := 0; i < T.NumFields(); i++ {
-			if prev := T.Field(i); prev.Name() == r.to {
-				r.errorf(from.Pos(), "renaming this field %q to %q",
-					from.Name(), r.to)
-				r.errorf(prev.Pos(), "\twould conflict with this field")
-				return // skip checkSelections to avoid redundant errors
-			}
-		}
-	}
-
-	// Renaming an anonymous field requires renaming the type too. e.g.
-	// 	print(s.T)       // if we rename T to U,
-	// 	type T int       // this and
-	// 	var s struct {T} // this must change too.
-	if from.Anonymous() {
-		if named, ok := from.Type().(*types.Named); ok {
-			r.check(named.Obj())
-		} else if named, ok := deref(from.Type()).(*types.Named); ok {
-			r.check(named.Obj())
-		}
-	}
-
-	// Check integrity of existing (field and method) selections.
-	r.checkSelections(from)
-}
-
-// checkSelection checks that all uses and selections that resolve to
-// the specified object would continue to do so after the renaming.
-func (r *renamer) checkSelections(from types.Object) {
-	for pkg, info := range r.packages {
-		if id := someUse(info, from); id != nil {
-			if !r.checkExport(id, pkg, from) {
-				return
-			}
-		}
-
-		for syntax, sel := range info.Selections {
-			// There may be extant selections of only the old
-			// name or only the new name, so we must check both.
-			// (If neither, the renaming is sound.)
-			//
-			// In both cases, we wish to compare the lengths
-			// of the implicit field path (Selection.Index)
-			// to see if the renaming would change it.
-			//
-			// If a selection that resolves to 'from', when renamed,
-			// would yield a path of the same or shorter length,
-			// this indicates ambiguity or a changed referent,
-			// analogous to same- or sub-block lexical conflict.
-			//
-			// If a selection using the name 'to' would
-			// yield a path of the same or shorter length,
-			// this indicates ambiguity or shadowing,
-			// analogous to same- or super-block lexical conflict.
-
-			// TODO(adonovan): fix: derive from Types[syntax.X].Mode
-			// TODO(adonovan): test with pointer, value, addressable value.
-			isAddressable := true
-
-			if sel.Obj() == from {
-				if obj, indices, _ := types.LookupFieldOrMethod(sel.Recv(), isAddressable, from.Pkg(), r.to); obj != nil {
-					// Renaming this existing selection of
-					// 'from' may block access to an existing
-					// type member named 'to'.
-					delta := len(indices) - len(sel.Index())
-					if delta > 0 {
-						continue // no ambiguity
-					}
-					r.selectionConflict(from, delta, syntax, obj)
-					return
-				}
-
-			} else if sel.Obj().Name() == r.to {
-				if obj, indices, _ := types.LookupFieldOrMethod(sel.Recv(), isAddressable, from.Pkg(), from.Name()); obj == from {
-					// Renaming 'from' may cause this existing
-					// selection of the name 'to' to change
-					// its meaning.
-					delta := len(indices) - len(sel.Index())
-					if delta > 0 {
-						continue //  no ambiguity
-					}
-					r.selectionConflict(from, -delta, syntax, sel.Obj())
-					return
-				}
-			}
-		}
-	}
-}
-
-func (r *renamer) selectionConflict(from types.Object, delta int, syntax *ast.SelectorExpr, obj types.Object) {
-	r.errorf(from.Pos(), "renaming this %s %q to %q",
-		objectKind(from), from.Name(), r.to)
-
-	switch {
-	case delta < 0:
-		// analogous to sub-block conflict
-		r.errorf(syntax.Sel.Pos(),
-			"\twould change the referent of this selection")
-		r.errorf(obj.Pos(), "\tof this %s", objectKind(obj))
-	case delta == 0:
-		// analogous to same-block conflict
-		r.errorf(syntax.Sel.Pos(),
-			"\twould make this reference ambiguous")
-		r.errorf(obj.Pos(), "\twith this %s", objectKind(obj))
-	case delta > 0:
-		// analogous to super-block conflict
-		r.errorf(syntax.Sel.Pos(),
-			"\twould shadow this selection")
-		r.errorf(obj.Pos(), "\tof the %s declared here",
-			objectKind(obj))
-	}
-}
-
-// checkMethod performs safety checks for renaming a method.
-// There are three hazards:
-// - declaration conflicts
-// - selection ambiguity/changes
-// - entailed renamings of assignable concrete/interface types.
-//   We reject renamings initiated at concrete methods if it would
-//   change the assignability relation.  For renamings of abstract
-//   methods, we rename all methods transitively coupled to it via
-//   assignability.
-func (r *renamer) checkMethod(from *types.Func) {
-	// e.g. error.Error
-	if from.Pkg() == nil {
-		r.errorf(from.Pos(), "you cannot rename built-in method %s", from)
-		return
-	}
-
-	// ASSIGNABILITY: We reject renamings of concrete methods that
-	// would break a 'satisfy' constraint; but renamings of abstract
-	// methods are allowed to proceed, and we rename affected
-	// concrete and abstract methods as necessary.  It is the
-	// initial method that determines the policy.
-
-	// Check for conflict at point of declaration.
-	// Check to ensure preservation of assignability requirements.
-	R := recv(from).Type()
-	if isInterface(R) {
-		// Abstract method
-
-		// declaration
-		prev, _, _ := types.LookupFieldOrMethod(R, false, from.Pkg(), r.to)
-		if prev != nil {
-			r.errorf(from.Pos(), "renaming this interface method %q to %q",
-				from.Name(), r.to)
-			r.errorf(prev.Pos(), "\twould conflict with this method")
-			return
-		}
-
-		// Check all interfaces that embed this one for
-		// declaration conflicts too.
-		for _, info := range r.packages {
-			// Start with named interface types (better errors)
-			for _, obj := range info.Defs {
-				if obj, ok := obj.(*types.TypeName); ok && isInterface(obj.Type()) {
-					f, _, _ := types.LookupFieldOrMethod(
-						obj.Type(), false, from.Pkg(), from.Name())
-					if f == nil {
-						continue
-					}
-					t, _, _ := types.LookupFieldOrMethod(
-						obj.Type(), false, from.Pkg(), r.to)
-					if t == nil {
-						continue
-					}
-					r.errorf(from.Pos(), "renaming this interface method %q to %q",
-						from.Name(), r.to)
-					r.errorf(t.Pos(), "\twould conflict with this method")
-					r.errorf(obj.Pos(), "\tin named interface type %q", obj.Name())
-				}
-			}
-
-			// Now look at all literal interface types (includes named ones again).
-			for e, tv := range info.Types {
-				if e, ok := e.(*ast.InterfaceType); ok {
-					_ = e
-					_ = tv.Type.(*types.Interface)
-					// TODO(adonovan): implement same check as above.
-				}
-			}
-		}
-
-		// assignability
-		//
-		// Find the set of concrete or abstract methods directly
-		// coupled to abstract method 'from' by some
-		// satisfy.Constraint, and rename them too.
-		for key := range r.satisfy() {
-			// key = (lhs, rhs) where lhs is always an interface.
-
-			lsel := r.msets.MethodSet(key.LHS).Lookup(from.Pkg(), from.Name())
-			if lsel == nil {
-				continue
-			}
-			rmethods := r.msets.MethodSet(key.RHS)
-			rsel := rmethods.Lookup(from.Pkg(), from.Name())
-			if rsel == nil {
-				continue
-			}
-
-			// If both sides have a method of this name,
-			// and one of them is m, the other must be coupled.
-			var coupled *types.Func
-			switch from {
-			case lsel.Obj():
-				coupled = rsel.Obj().(*types.Func)
-			case rsel.Obj():
-				coupled = lsel.Obj().(*types.Func)
-			default:
-				continue
-			}
-
-			// We must treat concrete-to-interface
-			// constraints like an implicit selection C.f of
-			// each interface method I.f, and check that the
-			// renaming leaves the selection unchanged and
-			// unambiguous.
-			//
-			// Fun fact: the implicit selection of C.f
-			// 	type I interface{f()}
-			// 	type C struct{I}
-			// 	func (C) g()
-			//      var _ I = C{} // here
-			// yields abstract method I.f.  This can make error
-			// messages less than obvious.
-			//
-			if !isInterface(key.RHS) {
-				// The logic below was derived from checkSelections.
-
-				rtosel := rmethods.Lookup(from.Pkg(), r.to)
-				if rtosel != nil {
-					rto := rtosel.Obj().(*types.Func)
-					delta := len(rsel.Index()) - len(rtosel.Index())
-					if delta < 0 {
-						continue // no ambiguity
-					}
-
-					// TODO(adonovan): record the constraint's position.
-					keyPos := token.NoPos
-
-					r.errorf(from.Pos(), "renaming this method %q to %q",
-						from.Name(), r.to)
-					if delta == 0 {
-						// analogous to same-block conflict
-						r.errorf(keyPos, "\twould make the %s method of %s invoked via interface %s ambiguous",
-							r.to, key.RHS, key.LHS)
-						r.errorf(rto.Pos(), "\twith (%s).%s",
-							recv(rto).Type(), r.to)
-					} else {
-						// analogous to super-block conflict
-						r.errorf(keyPos, "\twould change the %s method of %s invoked via interface %s",
-							r.to, key.RHS, key.LHS)
-						r.errorf(coupled.Pos(), "\tfrom (%s).%s",
-							recv(coupled).Type(), r.to)
-						r.errorf(rto.Pos(), "\tto (%s).%s",
-							recv(rto).Type(), r.to)
-					}
-					return // one error is enough
-				}
-			}
-
-			if !r.changeMethods {
-				// This should be unreachable.
-				r.errorf(from.Pos(), "internal error: during renaming of abstract method %s", from)
-				r.errorf(coupled.Pos(), "\tchangedMethods=false, coupled method=%s", coupled)
-				r.errorf(from.Pos(), "\tPlease file a bug report")
-				return
-			}
-
-			// Rename the coupled method to preserve assignability.
-			r.check(coupled)
-		}
-	} else {
-		// Concrete method
-
-		// declaration
-		prev, indices, _ := types.LookupFieldOrMethod(R, true, from.Pkg(), r.to)
-		if prev != nil && len(indices) == 1 {
-			r.errorf(from.Pos(), "renaming this method %q to %q",
-				from.Name(), r.to)
-			r.errorf(prev.Pos(), "\twould conflict with this %s",
-				objectKind(prev))
-			return
-		}
-
-		// assignability
-		//
-		// Find the set of abstract methods coupled to concrete
-		// method 'from' by some satisfy.Constraint, and rename
-		// them too.
-		//
-		// Coupling may be indirect, e.g. I.f <-> C.f via type D.
-		//
-		// 	type I interface {f()}
-		//	type C int
-		//	type (C) f()
-		//	type D struct{C}
-		//	var _ I = D{}
-		//
-		for key := range r.satisfy() {
-			// key = (lhs, rhs) where lhs is always an interface.
-			if isInterface(key.RHS) {
-				continue
-			}
-			rsel := r.msets.MethodSet(key.RHS).Lookup(from.Pkg(), from.Name())
-			if rsel == nil || rsel.Obj() != from {
-				continue // rhs does not have the method
-			}
-			lsel := r.msets.MethodSet(key.LHS).Lookup(from.Pkg(), from.Name())
-			if lsel == nil {
-				continue
-			}
-			imeth := lsel.Obj().(*types.Func)
-
-			// imeth is the abstract method (e.g. I.f)
-			// and key.RHS is the concrete coupling type (e.g. D).
-			if !r.changeMethods {
-				r.errorf(from.Pos(), "renaming this method %q to %q",
-					from.Name(), r.to)
-				var pos token.Pos
-				var iface string
-
-				I := recv(imeth).Type()
-				if named, ok := I.(*types.Named); ok {
-					pos = named.Obj().Pos()
-					iface = "interface " + named.Obj().Name()
-				} else {
-					pos = from.Pos()
-					iface = I.String()
-				}
-				r.errorf(pos, "\twould make %s no longer assignable to %s",
-					key.RHS, iface)
-				r.errorf(imeth.Pos(), "\t(rename %s.%s if you intend to change both types)",
-					I, from.Name())
-				return // one error is enough
-			}
-
-			// Rename the coupled interface method to preserve assignability.
-			r.check(imeth)
-		}
-	}
-
-	// Check integrity of existing (field and method) selections.
-	// We skip this if there were errors above, to avoid redundant errors.
-	r.checkSelections(from)
-}
-
-func (r *renamer) checkExport(id *ast.Ident, pkg *types.Package, from types.Object) bool {
-	// Reject cross-package references if r.to is unexported.
-	// (Such references may be qualified identifiers or field/method
-	// selections.)
-	if !ast.IsExported(r.to) && pkg != from.Pkg() {
-		r.errorf(from.Pos(),
-			"renaming this %s %q to %q would make it unexported",
-			objectKind(from), from.Name(), r.to)
-		r.errorf(id.Pos(), "\tbreaking references from packages such as %q",
-			pkg.Path())
-		return false
-	}
-	return true
-}
-
-// satisfy returns the set of interface satisfaction constraints.
-func (r *renamer) satisfy() map[satisfy.Constraint]bool {
-	if r.satisfyConstraints == nil {
-		// Compute on demand: it's expensive.
-		var f satisfy.Finder
-		for _, info := range r.packages {
-			f.Find(&info.Info, info.Files)
-		}
-		r.satisfyConstraints = f.Result
-	}
-	return r.satisfyConstraints
-}
-
-// -- helpers ----------------------------------------------------------
-
-// recv returns the method's receiver.
-func recv(meth *types.Func) *types.Var {
-	return meth.Type().(*types.Signature).Recv()
-}
-
-// someUse returns an arbitrary use of obj within info.
-func someUse(info *loader.PackageInfo, obj types.Object) *ast.Ident {
-	for id, o := range info.Uses {
-		if o == obj {
-			return id
-		}
-	}
-	return nil
-}
-
-// -- Plundered from golang.org/x/tools/go/ssa -----------------
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
-
-func deref(typ types.Type) types.Type {
-	if p, _ := typ.(*types.Pointer); p != nil {
-		return p.Elem()
-	}
-	return typ
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg.go b/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg.go
deleted file mode 100644
index cd416c56f9..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg.go
+++ /dev/null
@@ -1,373 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// licence that can be found in the LICENSE file.
-
-// This file contains the implementation of the 'gomvpkg' command
-// whose main function is in golang.org/x/tools/cmd/gomvpkg.
-
-package rename
-
-// TODO(matloob):
-// - think about what happens if the package is moving across version control systems.
-// - think about windows, which uses "\" as its directory separator.
-// - dot imports are not supported. Make sure it's clearly documented.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/format"
-	"go/token"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strconv"
-	"strings"
-	"text/template"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/refactor/importgraph"
-)
-
-// Move, given a package path and a destination package path, will try
-// to move the given package to the new path. The Move function will
-// first check for any conflicts preventing the move, such as a
-// package already existing at the destination package path. If the
-// move can proceed, it builds an import graph to find all imports of
-// the packages whose paths need to be renamed. This includes uses of
-// the subpackages of the package to be moved as those packages will
-// also need to be moved. It then renames all imports to point to the
-// new paths, and then moves the packages to their new paths.
-func Move(ctxt *build.Context, from, to, moveTmpl string) error {
-	srcDir, err := srcDir(ctxt, from)
-	if err != nil {
-		return err
-	}
-
-	// This should be the only place in the program that constructs
-	// file paths.
-	// TODO(matloob): test on Microsoft Windows.
-	fromDir := buildutil.JoinPath(ctxt, srcDir, filepath.FromSlash(from))
-	toDir := buildutil.JoinPath(ctxt, srcDir, filepath.FromSlash(to))
-	toParent := filepath.Dir(toDir)
-	if !buildutil.IsDir(ctxt, toParent) {
-		return fmt.Errorf("parent directory does not exist for path %s", toDir)
-	}
-
-	// Build the import graph and figure out which packages to update.
-	_, rev, errors := importgraph.Build(ctxt)
-	if len(errors) > 0 {
-		// With a large GOPATH tree, errors are inevitable.
-		// Report them but proceed.
-		fmt.Fprintf(os.Stderr, "While scanning Go workspace:\n")
-		for path, err := range errors {
-			fmt.Fprintf(os.Stderr, "Package %q: %s.\n", path, err)
-		}
-	}
-
-	// Determine the affected packages---the set of packages whose import
-	// statements need updating.
-	affectedPackages := map[string]bool{from: true}
-	destinations := make(map[string]string) // maps old import path to new import path
-	for pkg := range subpackages(ctxt, srcDir, from) {
-		for r := range rev[pkg] {
-			affectedPackages[r] = true
-		}
-		// Ensure directories have a trailing separator.
-		dest := strings.Replace(pkg,
-			filepath.Join(from, ""),
-			filepath.Join(to, ""),
-			1)
-		destinations[pkg] = filepath.ToSlash(dest)
-	}
-
-	// Load all the affected packages.
-	iprog, err := loadProgram(ctxt, affectedPackages)
-	if err != nil {
-		return err
-	}
-
-	// Prepare the move command, if one was supplied.
-	var cmd string
-	if moveTmpl != "" {
-		if cmd, err = moveCmd(moveTmpl, fromDir, toDir); err != nil {
-			return err
-		}
-	}
-
-	m := mover{
-		ctxt:             ctxt,
-		rev:              rev,
-		iprog:            iprog,
-		from:             from,
-		to:               to,
-		fromDir:          fromDir,
-		toDir:            toDir,
-		affectedPackages: affectedPackages,
-		destinations:     destinations,
-		cmd:              cmd,
-	}
-
-	if err := m.checkValid(); err != nil {
-		return err
-	}
-
-	m.move()
-
-	return nil
-}
-
-// srcDir returns the absolute path of the srcdir containing pkg.
-func srcDir(ctxt *build.Context, pkg string) (string, error) {
-	for _, srcDir := range ctxt.SrcDirs() {
-		path := buildutil.JoinPath(ctxt, srcDir, pkg)
-		if buildutil.IsDir(ctxt, path) {
-			return srcDir, nil
-		}
-	}
-	return "", fmt.Errorf("src dir not found for package: %s", pkg)
-}
-
-// subpackages returns the set of packages in the given srcDir whose
-// import paths start with dir.
-func subpackages(ctxt *build.Context, srcDir string, dir string) map[string]bool {
-	subs := map[string]bool{dir: true}
-
-	// Find all packages under srcDir whose import paths start with dir.
-	buildutil.ForEachPackage(ctxt, func(pkg string, err error) {
-		if err != nil {
-			log.Fatalf("unexpected error in ForEachPackage: %v", err)
-		}
-
-		if !strings.HasPrefix(pkg, path.Join(dir, "")) {
-			return
-		}
-
-		p, err := ctxt.Import(pkg, "", build.FindOnly)
-		if err != nil {
-			log.Fatalf("unexpected: package %s can not be located by build context: %s", pkg, err)
-		}
-		if p.SrcRoot == "" {
-			log.Fatalf("unexpected: could not determine srcDir for package %s: %s", pkg, err)
-		}
-		if p.SrcRoot != srcDir {
-			return
-		}
-
-		subs[pkg] = true
-	})
-
-	return subs
-}
-
-type mover struct {
-	// iprog contains all packages whose contents need to be updated
-	// with new package names or import paths.
-	iprog *loader.Program
-	ctxt  *build.Context
-	// rev is the reverse import graph.
-	rev importgraph.Graph
-	// from and to are the source and destination import
-	// paths. fromDir and toDir are the source and destination
-	// absolute paths that package source files will be moved between.
-	from, to, fromDir, toDir string
-	// affectedPackages is the set of all packages whose contents need
-	// to be updated to reflect new package names or import paths.
-	affectedPackages map[string]bool
-	// destinations maps each subpackage to be moved to its
-	// destination path.
-	destinations map[string]string
-	// cmd, if not empty, will be executed to move fromDir to toDir.
-	cmd string
-}
-
-func (m *mover) checkValid() error {
-	const prefix = "invalid move destination"
-
-	match, err := regexp.MatchString("^[_\\pL][_\\pL\\p{Nd}]*$", path.Base(m.to))
-	if err != nil {
-		panic("regexp.MatchString failed")
-	}
-	if !match {
-		return fmt.Errorf("%s: %s; gomvpkg does not support move destinations "+
-			"whose base names are not valid go identifiers", prefix, m.to)
-	}
-
-	if buildutil.FileExists(m.ctxt, m.toDir) {
-		return fmt.Errorf("%s: %s conflicts with file %s", prefix, m.to, m.toDir)
-	}
-	if buildutil.IsDir(m.ctxt, m.toDir) {
-		return fmt.Errorf("%s: %s conflicts with directory %s", prefix, m.to, m.toDir)
-	}
-
-	for _, toSubPkg := range m.destinations {
-		if _, err := m.ctxt.Import(toSubPkg, "", build.FindOnly); err == nil {
-			return fmt.Errorf("%s: %s; package or subpackage %s already exists",
-				prefix, m.to, toSubPkg)
-		}
-	}
-
-	return nil
-}
-
-// moveCmd produces the version control move command used to move fromDir to toDir by
-// executing the given template.
-func moveCmd(moveTmpl, fromDir, toDir string) (string, error) {
-	tmpl, err := template.New("movecmd").Parse(moveTmpl)
-	if err != nil {
-		return "", err
-	}
-
-	var buf bytes.Buffer
-	err = tmpl.Execute(&buf, struct {
-		Src string
-		Dst string
-	}{fromDir, toDir})
-	return buf.String(), err
-}
-
-func (m *mover) move() error {
-	filesToUpdate := make(map[*ast.File]bool)
-
-	// Change the moved package's "package" declaration to its new base name.
-	pkg, ok := m.iprog.Imported[m.from]
-	if !ok {
-		log.Fatalf("unexpected: package %s is not in import map", m.from)
-	}
-	newName := filepath.Base(m.to)
-	for _, f := range pkg.Files {
-		// Update all import comments.
-		for _, cg := range f.Comments {
-			c := cg.List[0]
-			if c.Slash >= f.Name.End() &&
-				sameLine(m.iprog.Fset, c.Slash, f.Name.End()) &&
-				(f.Decls == nil || c.Slash < f.Decls[0].Pos()) {
-				if strings.HasPrefix(c.Text, `// import "`) {
-					c.Text = `// import "` + m.to + `"`
-					break
-				}
-				if strings.HasPrefix(c.Text, `/* import "`) {
-					c.Text = `/* import "` + m.to + `" */`
-					break
-				}
-			}
-		}
-		f.Name.Name = newName // change package decl
-		filesToUpdate[f] = true
-	}
-
-	// Look through the external test packages (m.iprog.Created contains the external test packages).
-	for _, info := range m.iprog.Created {
-		// Change the "package" declaration of the external test package.
-		if info.Pkg.Path() == m.from+"_test" {
-			for _, f := range info.Files {
-				f.Name.Name = newName + "_test" // change package decl
-				filesToUpdate[f] = true
-			}
-		}
-
-		// Mark all the loaded external test packages, which import the "from" package,
-		// as affected packages and update the imports.
-		for _, imp := range info.Pkg.Imports() {
-			if imp.Path() == m.from {
-				m.affectedPackages[info.Pkg.Path()] = true
-				m.iprog.Imported[info.Pkg.Path()] = info
-				if err := importName(m.iprog, info, m.from, path.Base(m.from), newName); err != nil {
-					return err
-				}
-			}
-		}
-	}
-
-	// Update imports of that package to use the new import name.
-	// None of the subpackages will change their name---only the from package
-	// itself will.
-	for p := range m.rev[m.from] {
-		if err := importName(m.iprog, m.iprog.Imported[p], m.from, path.Base(m.from), newName); err != nil {
-			return err
-		}
-	}
-
-	// Update import paths for all imports by affected packages.
-	for ap := range m.affectedPackages {
-		info, ok := m.iprog.Imported[ap]
-		if !ok {
-			log.Fatalf("unexpected: package %s is not in import map", ap)
-		}
-		for _, f := range info.Files {
-			for _, imp := range f.Imports {
-				importPath, _ := strconv.Unquote(imp.Path.Value)
-				if newPath, ok := m.destinations[importPath]; ok {
-					imp.Path.Value = strconv.Quote(newPath)
-
-					oldName := path.Base(importPath)
-					if imp.Name != nil {
-						oldName = imp.Name.Name
-					}
-
-					newName := path.Base(newPath)
-					if imp.Name == nil && oldName != newName {
-						imp.Name = ast.NewIdent(oldName)
-					} else if imp.Name == nil || imp.Name.Name == newName {
-						imp.Name = nil
-					}
-					filesToUpdate[f] = true
-				}
-			}
-		}
-	}
-
-	for f := range filesToUpdate {
-		var buf bytes.Buffer
-		if err := format.Node(&buf, m.iprog.Fset, f); err != nil {
-			log.Printf("failed to pretty-print syntax tree: %v", err)
-			continue
-		}
-		tokenFile := m.iprog.Fset.File(f.Pos())
-		writeFile(tokenFile.Name(), buf.Bytes())
-	}
-
-	// Move the directories.
-	// If either the fromDir or toDir are contained under version control it is
-	// the user's responsibility to provide a custom move command that updates
-	// version control to reflect the move.
-	// TODO(matloob): If the parent directory of toDir does not exist, create it.
-	//      For now, it's required that it does exist.
-
-	if m.cmd != "" {
-		// TODO(matloob): Verify that the windows and plan9 cases are correct.
-		var cmd *exec.Cmd
-		switch runtime.GOOS {
-		case "windows":
-			cmd = exec.Command("cmd", "/c", m.cmd)
-		case "plan9":
-			cmd = exec.Command("rc", "-c", m.cmd)
-		default:
-			cmd = exec.Command("sh", "-c", m.cmd)
-		}
-		cmd.Stderr = os.Stderr
-		cmd.Stdout = os.Stdout
-		if err := cmd.Run(); err != nil {
-			return fmt.Errorf("version control system's move command failed: %v", err)
-		}
-
-		return nil
-	}
-
-	return moveDirectory(m.fromDir, m.toDir)
-}
-
-// sameLine reports whether two positions in the same file are on the same line.
-func sameLine(fset *token.FileSet, x, y token.Pos) bool {
-	return fset.Position(x).Line == fset.Position(y).Line
-}
-
-var moveDirectory = func(from, to string) error {
-	return os.Rename(from, to)
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg_test.go b/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg_test.go
deleted file mode 100644
index 7f5b135381..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/mvpkg_test.go
+++ /dev/null
@@ -1,444 +0,0 @@
-// Copyright 2015 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// licence that can be found in the LICENSE file.
-
-package rename
-
-import (
-	"fmt"
-	"go/build"
-	"go/token"
-	"io/ioutil"
-	"path/filepath"
-	"reflect"
-	"regexp"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-func TestErrors(t *testing.T) {
-	tests := []struct {
-		ctxt     *build.Context
-		from, to string
-		want     string // regexp to match error, or "OK"
-	}{
-		// Simple example.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"bar": {`package bar`},
-				"main": {`package main
-
-import "foo"
-
-var _ foo.T
-`},
-			}),
-			from: "foo", to: "bar",
-			want: `invalid move destination: bar conflicts with directory .go.src.bar`,
-		},
-		// Subpackage already exists.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo":     {`package foo; type T int`},
-				"foo/sub": {`package sub`},
-				"bar/sub": {`package sub`},
-				"main": {`package main
-
-import "foo"
-
-var _ foo.T
-`},
-			}),
-			from: "foo", to: "bar",
-			want: "invalid move destination: bar; package or subpackage bar/sub already exists",
-		},
-		// Invalid base name.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-var _ foo.T
-`},
-			}),
-			from: "foo", to: "bar-v2.0",
-			want: "invalid move destination: bar-v2.0; gomvpkg does not " +
-				"support move destinations whose base names are not valid " +
-				"go identifiers",
-		},
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {``},
-				"bar": {`package bar`},
-			}),
-			from: "foo", to: "bar",
-			want: `no initial packages were loaded`,
-		},
-	}
-
-	for _, test := range tests {
-		ctxt := test.ctxt
-
-		got := make(map[string]string)
-		writeFile = func(filename string, content []byte) error {
-			got[filename] = string(content)
-			return nil
-		}
-		moveDirectory = func(from, to string) error {
-			for path, contents := range got {
-				if strings.HasPrefix(path, from) {
-					newPath := strings.Replace(path, from, to, 1)
-					delete(got, path)
-					got[newPath] = contents
-				}
-			}
-			return nil
-		}
-
-		err := Move(ctxt, test.from, test.to, "")
-		prefix := fmt.Sprintf("-from %q -to %q", test.from, test.to)
-		if err == nil {
-			t.Errorf("%s: nil error. Expected error: %s", prefix, test.want)
-			continue
-		}
-		matched, err2 := regexp.MatchString(test.want, err.Error())
-		if err2 != nil {
-			t.Errorf("regexp.MatchString failed %s", err2)
-			continue
-		}
-		if !matched {
-			t.Errorf("%s: conflict does not match expectation:\n"+
-				"Error: %q\n"+
-				"Pattern: %q",
-				prefix, err.Error(), test.want)
-		}
-	}
-}
-
-func TestMoves(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skip("broken on Windows; see golang.org/issue/16384")
-	}
-	tests := []struct {
-		ctxt         *build.Context
-		from, to     string
-		want         map[string]string
-		wantWarnings []string
-	}{
-		// Simple example.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-var _ foo.T
-`},
-			}),
-			from: "foo", to: "bar",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-import "bar"
-
-var _ bar.T
-`,
-				"/go/src/bar/0.go": `package bar
-
-type T int
-`,
-			},
-		},
-
-		// Example with subpackage.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo":     {`package foo; type T int`},
-				"foo/sub": {`package sub; type T int`},
-				"main": {`package main
-
-import "foo"
-import "foo/sub"
-
-var _ foo.T
-var _ sub.T
-`},
-			}),
-			from: "foo", to: "bar",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-import "bar"
-import "bar/sub"
-
-var _ bar.T
-var _ sub.T
-`,
-				"/go/src/bar/0.go": `package bar
-
-type T int
-`,
-				"/go/src/bar/sub/0.go": `package sub; type T int`,
-			},
-		},
-
-		// References into subpackages
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo":   {`package foo; import "foo/a"; var _ a.T`},
-				"foo/a": {`package a; type T int`},
-				"foo/b": {`package b; import "foo/a"; var _ a.T`},
-			}),
-			from: "foo", to: "bar",
-			want: map[string]string{
-				"/go/src/bar/0.go": `package bar
-
-import "bar/a"
-
-var _ a.T
-`,
-				"/go/src/bar/a/0.go": `package a; type T int`,
-				"/go/src/bar/b/0.go": `package b
-
-import "bar/a"
-
-var _ a.T
-`,
-			},
-		},
-
-		// External test packages
-		{
-			ctxt: buildutil.FakeContext(map[string]map[string]string{
-				"foo": {
-					"0.go":      `package foo; type T int`,
-					"0_test.go": `package foo_test; import "foo"; var _ foo.T`,
-				},
-				"baz": {
-					"0_test.go": `package baz_test; import "foo"; var _ foo.T`,
-				},
-			}),
-			from: "foo", to: "bar",
-			want: map[string]string{
-				"/go/src/bar/0.go": `package bar
-
-type T int
-`,
-				"/go/src/bar/0_test.go": `package bar_test
-
-import "bar"
-
-var _ bar.T
-`,
-				"/go/src/baz/0_test.go": `package baz_test
-
-import "bar"
-
-var _ bar.T
-`,
-			},
-		},
-		// package import comments
-		{
-			ctxt: fakeContext(map[string][]string{"foo": {`package foo // import "baz"`}}),
-			from: "foo", to: "bar",
-			want: map[string]string{"/go/src/bar/0.go": `package bar // import "bar"
-`},
-		},
-		{
-			ctxt: fakeContext(map[string][]string{"foo": {`package foo /* import "baz" */`}}),
-			from: "foo", to: "bar",
-			want: map[string]string{"/go/src/bar/0.go": `package bar /* import "bar" */
-`},
-		},
-		{
-			ctxt: fakeContext(map[string][]string{"foo": {`package foo       // import "baz"`}}),
-			from: "foo", to: "bar",
-			want: map[string]string{"/go/src/bar/0.go": `package bar // import "bar"
-`},
-		},
-		{
-			ctxt: fakeContext(map[string][]string{"foo": {`package foo
-// import " this is not an import comment`}}),
-			from: "foo", to: "bar",
-			want: map[string]string{"/go/src/bar/0.go": `package bar
-
-// import " this is not an import comment
-`},
-		},
-		{
-			ctxt: fakeContext(map[string][]string{"foo": {`package foo
-/* import " this is not an import comment */`}}),
-			from: "foo", to: "bar",
-			want: map[string]string{"/go/src/bar/0.go": `package bar
-
-/* import " this is not an import comment */
-`},
-		},
-		// Import name conflict generates a warning, not an error.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"x": {},
-				"a": {`package a; type A int`},
-				"b": {`package b; type B int`},
-				"conflict": {`package conflict
-
-import "a"
-import "b"
-var _ a.A
-var _ b.B
-`},
-				"ok": {`package ok
-import "b"
-var _ b.B
-`},
-			}),
-			from: "b", to: "x/a",
-			want: map[string]string{
-				"/go/src/a/0.go": `package a; type A int`,
-				"/go/src/ok/0.go": `package ok
-
-import "x/a"
-
-var _ a.B
-`,
-				"/go/src/conflict/0.go": `package conflict
-
-import "a"
-import "x/a"
-
-var _ a.A
-var _ b.B
-`,
-				"/go/src/x/a/0.go": `package a
-
-type B int
-`,
-			},
-			wantWarnings: []string{
-				`/go/src/conflict/0.go:4:8: renaming this imported package name "b" to "a"`,
-				`/go/src/conflict/0.go:3:8: 	conflicts with imported package name in same block`,
-				`/go/src/conflict/0.go:3:8: skipping update of this file`,
-			},
-		},
-		// Rename with same base name.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"x": {},
-				"y": {},
-				"x/foo": {`package foo
-
-type T int
-`},
-				"main": {`package main; import "x/foo"; var _ foo.T`},
-			}),
-			from: "x/foo", to: "y/foo",
-			want: map[string]string{
-				"/go/src/y/foo/0.go": `package foo
-
-type T int
-`,
-				"/go/src/main/0.go": `package main
-
-import "y/foo"
-
-var _ foo.T
-`,
-			},
-		},
-	}
-
-	for _, test := range tests {
-		ctxt := test.ctxt
-
-		got := make(map[string]string)
-		// Populate got with starting file set. rewriteFile and moveDirectory
-		// will mutate got to produce resulting file set.
-		buildutil.ForEachPackage(ctxt, func(importPath string, err error) {
-			if err != nil {
-				return
-			}
-			path := filepath.Join("/go/src", importPath, "0.go")
-			if !buildutil.FileExists(ctxt, path) {
-				return
-			}
-			f, err := ctxt.OpenFile(path)
-			if err != nil {
-				t.Errorf("unexpected error opening file: %s", err)
-				return
-			}
-			bytes, err := ioutil.ReadAll(f)
-			f.Close()
-			if err != nil {
-				t.Errorf("unexpected error reading file: %s", err)
-				return
-			}
-			got[path] = string(bytes)
-		})
-		var warnings []string
-		reportError = func(posn token.Position, message string) {
-			warning := fmt.Sprintf("%s:%d:%d: %s",
-				filepath.ToSlash(posn.Filename), // for MS Windows
-				posn.Line,
-				posn.Column,
-				message)
-			warnings = append(warnings, warning)
-
-		}
-		writeFile = func(filename string, content []byte) error {
-			got[filename] = string(content)
-			return nil
-		}
-		moveDirectory = func(from, to string) error {
-			for path, contents := range got {
-				if strings.HasPrefix(path, from) {
-					newPath := strings.Replace(path, from, to, 1)
-					delete(got, path)
-					got[newPath] = contents
-				}
-			}
-			return nil
-		}
-
-		err := Move(ctxt, test.from, test.to, "")
-		prefix := fmt.Sprintf("-from %q -to %q", test.from, test.to)
-		if err != nil {
-			t.Errorf("%s: unexpected error: %s", prefix, err)
-			continue
-		}
-
-		if !reflect.DeepEqual(warnings, test.wantWarnings) {
-			t.Errorf("%s: unexpected warnings:\n%s\nwant:\n%s",
-				prefix,
-				strings.Join(warnings, "\n"),
-				strings.Join(test.wantWarnings, "\n"))
-		}
-
-		for file, wantContent := range test.want {
-			k := filepath.FromSlash(file)
-			gotContent, ok := got[k]
-			delete(got, k)
-			if !ok {
-				// TODO(matloob): some testcases might have files that won't be
-				// rewritten
-				t.Errorf("%s: file %s not rewritten", prefix, file)
-				continue
-			}
-			if gotContent != wantContent {
-				t.Errorf("%s: rewritten file %s does not match expectation; got <<<%s>>>\n"+
-					"want <<<%s>>>", prefix, file, gotContent, wantContent)
-			}
-		}
-		// got should now be empty
-		for file := range got {
-			t.Errorf("%s: unexpected rewrite of file %s", prefix, file)
-		}
-	}
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/rename.go b/installer/vendor/golang.org/x/tools/refactor/rename/rename.go
deleted file mode 100644
index b026e78772..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/rename.go
+++ /dev/null
@@ -1,603 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package rename contains the implementation of the 'gorename' command
-// whose main function is in golang.org/x/tools/cmd/gorename.
-// See the Usage constant for the command documentation.
-package rename // import "golang.org/x/tools/refactor/rename"
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/format"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"io"
-	"io/ioutil"
-	"log"
-	"os"
-	"os/exec"
-	"path"
-	"regexp"
-	"sort"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/loader"
-	"golang.org/x/tools/go/types/typeutil"
-	"golang.org/x/tools/refactor/importgraph"
-	"golang.org/x/tools/refactor/satisfy"
-)
-
-const Usage = `gorename: precise type-safe renaming of identifiers in Go source code.
-
-Usage:
-
- gorename (-from <spec> | -offset <file>:#<byte-offset>) -to <name> [-force]
-
-You must specify the object (named entity) to rename using the -offset
-or -from flag.  Exactly one must be specified.
-
-Flags:
-
--offset    specifies the filename and byte offset of an identifier to rename.
-           This form is intended for use by text editors.
-
--from      specifies the object to rename using a query notation;
-           This form is intended for interactive use at the command line.
-           A legal -from query has one of the following forms:
-
-  "encoding/json".Decoder.Decode        method of package-level named type
-  (*"encoding/json".Decoder).Decode     ditto, alternative syntax
-  "encoding/json".Decoder.buf           field of package-level named struct type
-  "encoding/json".HTMLEscape            package member (const, func, var, type)
-  "encoding/json".Decoder.Decode::x     local object x within a method
-  "encoding/json".HTMLEscape::x         local object x within a function
-  "encoding/json"::x                    object x anywhere within a package
-  json.go::x                            object x within file json.go
-
-           Double-quotes must be escaped when writing a shell command.
-           Quotes may be omitted for single-segment import paths such as "fmt".
-
-           For methods, the parens and '*' on the receiver type are both
-           optional.
-
-           It is an error if one of the ::x queries matches multiple
-           objects.
-
--to        the new name.
-
--force     causes the renaming to proceed even if conflicts were reported.
-           The resulting program may be ill-formed, or experience a change
-           in behaviour.
-
-           WARNING: this flag may even cause the renaming tool to crash.
-           (In due course this bug will be fixed by moving certain
-           analyses into the type-checker.)
-
--d         display diffs instead of rewriting files
-
--v         enables verbose logging.
-
-gorename automatically computes the set of packages that might be
-affected.  For a local renaming, this is just the package specified by
--from or -offset, but for a potentially exported name, gorename scans
-the workspace ($GOROOT and $GOPATH).
-
-gorename rejects renamings of concrete methods that would change the
-assignability relation between types and interfaces.  If the interface
-change was intentional, initiate the renaming at the interface method.
-
-gorename rejects any renaming that would create a conflict at the point
-of declaration, or a reference conflict (ambiguity or shadowing), or
-anything else that could cause the resulting program not to compile.
-
-
-Examples:
-
-$ gorename -offset file.go:#123 -to foo
-
-  Rename the object whose identifier is at byte offset 123 within file file.go.
-
-$ gorename -from '"bytes".Buffer.Len' -to Size
-
-  Rename the "Len" method of the *bytes.Buffer type to "Size".
-
----- TODO ----
-
-Correctness:
-- handle dot imports correctly
-- document limitations (reflection, 'implements' algorithm).
-- sketch a proof of exhaustiveness.
-
-Features:
-- support running on packages specified as *.go files on the command line
-- support running on programs containing errors (loader.Config.AllowErrors)
-- allow users to specify a scope other than "global" (to avoid being
-  stuck by neglected packages in $GOPATH that don't build).
-- support renaming the package clause (no object)
-- support renaming an import path (no ident or object)
-  (requires filesystem + SCM updates).
-- detect and reject edits to autogenerated files (cgo, protobufs)
-  and optionally $GOROOT packages.
-- report all conflicts, or at least all qualitatively distinct ones.
-  Sometimes we stop to avoid redundancy, but
-  it may give a disproportionate sense of safety in -force mode.
-- support renaming all instances of a pattern, e.g.
-  all receiver vars of a given type,
-  all local variables of a given type,
-  all PkgNames for a given package.
-- emit JSON output for other editors and tools.
-`
-
-var (
-	// Force enables patching of the source files even if conflicts were reported.
-	// The resulting program may be ill-formed.
-	// It may even cause gorename to crash.  TODO(adonovan): fix that.
-	Force bool
-
-	// Diff causes the tool to display diffs instead of rewriting files.
-	Diff bool
-
-	// DiffCmd specifies the diff command used by the -d feature.
-	// (The command must accept a -u flag and two filename arguments.)
-	DiffCmd = "diff"
-
-	// ConflictError is returned by Main when it aborts the renaming due to conflicts.
-	// (It is distinguished because the interesting errors are the conflicts themselves.)
-	ConflictError = errors.New("renaming aborted due to conflicts")
-
-	// Verbose enables extra logging.
-	Verbose bool
-)
-
-var stdout io.Writer = os.Stdout
-
-type renamer struct {
-	iprog              *loader.Program
-	objsToUpdate       map[types.Object]bool
-	hadConflicts       bool
-	from, to           string
-	satisfyConstraints map[satisfy.Constraint]bool
-	packages           map[*types.Package]*loader.PackageInfo // subset of iprog.AllPackages to inspect
-	msets              typeutil.MethodSetCache
-	changeMethods      bool
-}
-
-var reportError = func(posn token.Position, message string) {
-	fmt.Fprintf(os.Stderr, "%s: %s\n", posn, message)
-}
-
-// importName renames imports of fromPath within the package specified by info.
-// If fromName is not empty, importName renames only imports as fromName.
-// If the renaming would lead to a conflict, the file is left unchanged.
-func importName(iprog *loader.Program, info *loader.PackageInfo, fromPath, fromName, to string) error {
-	if fromName == to {
-		return nil // no-op (e.g. rename x/foo to y/foo)
-	}
-	for _, f := range info.Files {
-		var from types.Object
-		for _, imp := range f.Imports {
-			importPath, _ := strconv.Unquote(imp.Path.Value)
-			importName := path.Base(importPath)
-			if imp.Name != nil {
-				importName = imp.Name.Name
-			}
-			if importPath == fromPath && (fromName == "" || importName == fromName) {
-				from = info.Implicits[imp]
-				break
-			}
-		}
-		if from == nil {
-			continue
-		}
-		r := renamer{
-			iprog:        iprog,
-			objsToUpdate: make(map[types.Object]bool),
-			to:           to,
-			packages:     map[*types.Package]*loader.PackageInfo{info.Pkg: info},
-		}
-		r.check(from)
-		if r.hadConflicts {
-			reportError(iprog.Fset.Position(f.Imports[0].Pos()),
-				"skipping update of this file")
-			continue // ignore errors; leave the existing name
-		}
-		if err := r.update(); err != nil {
-			return err
-		}
-	}
-	return nil
-}
-
-func Main(ctxt *build.Context, offsetFlag, fromFlag, to string) error {
-	// -- Parse the -from or -offset specifier ----------------------------
-
-	if (offsetFlag == "") == (fromFlag == "") {
-		return fmt.Errorf("exactly one of the -from and -offset flags must be specified")
-	}
-
-	if !isValidIdentifier(to) {
-		return fmt.Errorf("-to %q: not a valid identifier", to)
-	}
-
-	if Diff {
-		defer func(saved func(string, []byte) error) { writeFile = saved }(writeFile)
-		writeFile = diff
-	}
-
-	var spec *spec
-	var err error
-	if fromFlag != "" {
-		spec, err = parseFromFlag(ctxt, fromFlag)
-	} else {
-		spec, err = parseOffsetFlag(ctxt, offsetFlag)
-	}
-	if err != nil {
-		return err
-	}
-
-	if spec.fromName == to {
-		return fmt.Errorf("the old and new names are the same: %s", to)
-	}
-
-	// -- Load the program consisting of the initial package  -------------
-
-	iprog, err := loadProgram(ctxt, map[string]bool{spec.pkg: true})
-	if err != nil {
-		return err
-	}
-
-	fromObjects, err := findFromObjects(iprog, spec)
-	if err != nil {
-		return err
-	}
-
-	// -- Load a larger program, for global renamings ---------------------
-
-	if requiresGlobalRename(fromObjects, to) {
-		// For a local refactoring, we needn't load more
-		// packages, but if the renaming affects the package's
-		// API, we we must load all packages that depend on the
-		// package defining the object, plus their tests.
-
-		if Verbose {
-			log.Print("Potentially global renaming; scanning workspace...")
-		}
-
-		// Scan the workspace and build the import graph.
-		_, rev, errors := importgraph.Build(ctxt)
-		if len(errors) > 0 {
-			// With a large GOPATH tree, errors are inevitable.
-			// Report them but proceed.
-			fmt.Fprintf(os.Stderr, "While scanning Go workspace:\n")
-			for path, err := range errors {
-				fmt.Fprintf(os.Stderr, "Package %q: %s.\n", path, err)
-			}
-		}
-
-		// Enumerate the set of potentially affected packages.
-		affectedPackages := make(map[string]bool)
-		for _, obj := range fromObjects {
-			// External test packages are never imported,
-			// so they will never appear in the graph.
-			for path := range rev.Search(obj.Pkg().Path()) {
-				affectedPackages[path] = true
-			}
-		}
-
-		// TODO(adonovan): allow the user to specify the scope,
-		// or -ignore patterns?  Computing the scope when we
-		// don't (yet) support inputs containing errors can make
-		// the tool rather brittle.
-
-		// Re-load the larger program.
-		iprog, err = loadProgram(ctxt, affectedPackages)
-		if err != nil {
-			return err
-		}
-
-		fromObjects, err = findFromObjects(iprog, spec)
-		if err != nil {
-			return err
-		}
-	}
-
-	// -- Do the renaming -------------------------------------------------
-
-	r := renamer{
-		iprog:        iprog,
-		objsToUpdate: make(map[types.Object]bool),
-		from:         spec.fromName,
-		to:           to,
-		packages:     make(map[*types.Package]*loader.PackageInfo),
-	}
-
-	// A renaming initiated at an interface method indicates the
-	// intention to rename abstract and concrete methods as needed
-	// to preserve assignability.
-	for _, obj := range fromObjects {
-		if obj, ok := obj.(*types.Func); ok {
-			recv := obj.Type().(*types.Signature).Recv()
-			if recv != nil && isInterface(recv.Type().Underlying()) {
-				r.changeMethods = true
-				break
-			}
-		}
-	}
-
-	// Only the initially imported packages (iprog.Imported) and
-	// their external tests (iprog.Created) should be inspected or
-	// modified, as only they have type-checked functions bodies.
-	// The rest are just dependencies, needed only for package-level
-	// type information.
-	for _, info := range iprog.Imported {
-		r.packages[info.Pkg] = info
-	}
-	for _, info := range iprog.Created { // (tests)
-		r.packages[info.Pkg] = info
-	}
-
-	for _, from := range fromObjects {
-		r.check(from)
-	}
-	if r.hadConflicts && !Force {
-		return ConflictError
-	}
-	return r.update()
-}
-
-// loadProgram loads the specified set of packages (plus their tests)
-// and all their dependencies, from source, through the specified build
-// context.  Only packages in pkgs will have their functions bodies typechecked.
-func loadProgram(ctxt *build.Context, pkgs map[string]bool) (*loader.Program, error) {
-	conf := loader.Config{
-		Build:      ctxt,
-		ParserMode: parser.ParseComments,
-
-		// TODO(adonovan): enable this.  Requires making a lot of code more robust!
-		AllowErrors: false,
-	}
-	// Optimization: don't type-check the bodies of functions in our
-	// dependencies, since we only need exported package members.
-	conf.TypeCheckFuncBodies = func(p string) bool {
-		return pkgs[p] || pkgs[strings.TrimSuffix(p, "_test")]
-	}
-
-	if Verbose {
-		var list []string
-		for pkg := range pkgs {
-			list = append(list, pkg)
-		}
-		sort.Strings(list)
-		for _, pkg := range list {
-			log.Printf("Loading package: %s", pkg)
-		}
-	}
-
-	for pkg := range pkgs {
-		conf.ImportWithTests(pkg)
-	}
-
-	// Ideally we would just return conf.Load() here, but go/types
-	// reports certain "soft" errors that gc does not (Go issue 14596).
-	// As a workaround, we set AllowErrors=true and then duplicate
-	// the loader's error checking but allow soft errors.
-	// It would be nice if the loader API permitted "AllowErrors: soft".
-	conf.AllowErrors = true
-	prog, err := conf.Load()
-	if err != nil {
-		return nil, err
-	}
-
-	var errpkgs []string
-	// Report hard errors in indirectly imported packages.
-	for _, info := range prog.AllPackages {
-		if containsHardErrors(info.Errors) {
-			errpkgs = append(errpkgs, info.Pkg.Path())
-		}
-	}
-	if errpkgs != nil {
-		var more string
-		if len(errpkgs) > 3 {
-			more = fmt.Sprintf(" and %d more", len(errpkgs)-3)
-			errpkgs = errpkgs[:3]
-		}
-		return nil, fmt.Errorf("couldn't load packages due to errors: %s%s",
-			strings.Join(errpkgs, ", "), more)
-	}
-	return prog, nil
-}
-
-func containsHardErrors(errors []error) bool {
-	for _, err := range errors {
-		if err, ok := err.(types.Error); ok && err.Soft {
-			continue
-		}
-		return true
-	}
-	return false
-}
-
-// requiresGlobalRename reports whether this renaming could potentially
-// affect other packages in the Go workspace.
-func requiresGlobalRename(fromObjects []types.Object, to string) bool {
-	var tfm bool
-	for _, from := range fromObjects {
-		if from.Exported() {
-			return true
-		}
-		switch objectKind(from) {
-		case "type", "field", "method":
-			tfm = true
-		}
-	}
-	if ast.IsExported(to) && tfm {
-		// A global renaming may be necessary even if we're
-		// exporting a previous unexported name, since if it's
-		// the name of a type, field or method, this could
-		// change selections in other packages.
-		// (We include "type" in this list because a type
-		// used as an embedded struct field entails a field
-		// renaming.)
-		return true
-	}
-	return false
-}
-
-// update updates the input files.
-func (r *renamer) update() error {
-	// We use token.File, not filename, since a file may appear to
-	// belong to multiple packages and be parsed more than once.
-	// token.File captures this distinction; filename does not.
-
-	var nidents int
-	var filesToUpdate = make(map[*token.File]bool)
-	docRegexp := regexp.MustCompile(`\b` + r.from + `\b`)
-	for _, info := range r.packages {
-		// Mutate the ASTs and note the filenames.
-		for id, obj := range info.Defs {
-			if r.objsToUpdate[obj] {
-				nidents++
-				id.Name = r.to
-				filesToUpdate[r.iprog.Fset.File(id.Pos())] = true
-				// Perform the rename in doc comments too.
-				if doc := r.docComment(id); doc != nil {
-					for _, comment := range doc.List {
-						comment.Text = docRegexp.ReplaceAllString(comment.Text, r.to)
-					}
-				}
-			}
-		}
-
-		for id, obj := range info.Uses {
-			if r.objsToUpdate[obj] {
-				nidents++
-				id.Name = r.to
-				filesToUpdate[r.iprog.Fset.File(id.Pos())] = true
-			}
-		}
-	}
-
-	// Renaming not supported if cgo files are affected.
-	var generatedFileNames []string
-	for _, info := range r.packages {
-		for _, f := range info.Files {
-			tokenFile := r.iprog.Fset.File(f.Pos())
-			if filesToUpdate[tokenFile] && generated(f, tokenFile) {
-				generatedFileNames = append(generatedFileNames, tokenFile.Name())
-			}
-		}
-	}
-	if len(generatedFileNames) > 0 {
-		return fmt.Errorf("refusing to modify generated file%s containing DO NOT EDIT marker: %v", plural(len(generatedFileNames)), generatedFileNames)
-	}
-
-	// Write affected files.
-	var nerrs, npkgs int
-	for _, info := range r.packages {
-		first := true
-		for _, f := range info.Files {
-			tokenFile := r.iprog.Fset.File(f.Pos())
-			if filesToUpdate[tokenFile] {
-				if first {
-					npkgs++
-					first = false
-					if Verbose {
-						log.Printf("Updating package %s", info.Pkg.Path())
-					}
-				}
-
-				filename := tokenFile.Name()
-				var buf bytes.Buffer
-				if err := format.Node(&buf, r.iprog.Fset, f); err != nil {
-					log.Printf("failed to pretty-print syntax tree: %v", err)
-					nerrs++
-					continue
-				}
-				if err := writeFile(filename, buf.Bytes()); err != nil {
-					log.Print(err)
-					nerrs++
-				}
-			}
-		}
-	}
-	if !Diff {
-		fmt.Printf("Renamed %d occurrence%s in %d file%s in %d package%s.\n",
-			nidents, plural(nidents),
-			len(filesToUpdate), plural(len(filesToUpdate)),
-			npkgs, plural(npkgs))
-	}
-	if nerrs > 0 {
-		return fmt.Errorf("failed to rewrite %d file%s", nerrs, plural(nerrs))
-	}
-	return nil
-}
-
-// docComment returns the doc for an identifier.
-func (r *renamer) docComment(id *ast.Ident) *ast.CommentGroup {
-	_, nodes, _ := r.iprog.PathEnclosingInterval(id.Pos(), id.End())
-	for _, node := range nodes {
-		switch decl := node.(type) {
-		case *ast.FuncDecl:
-			return decl.Doc
-		case *ast.Field:
-			return decl.Doc
-		case *ast.GenDecl:
-			return decl.Doc
-		// For {Type,Value}Spec, if the doc on the spec is absent,
-		// search for the enclosing GenDecl
-		case *ast.TypeSpec:
-			if decl.Doc != nil {
-				return decl.Doc
-			}
-		case *ast.ValueSpec:
-			if decl.Doc != nil {
-				return decl.Doc
-			}
-		case *ast.Ident:
-		default:
-			return nil
-		}
-	}
-	return nil
-}
-
-func plural(n int) string {
-	if n != 1 {
-		return "s"
-	}
-	return ""
-}
-
-// writeFile is a seam for testing and for the -d flag.
-var writeFile = reallyWriteFile
-
-func reallyWriteFile(filename string, content []byte) error {
-	return ioutil.WriteFile(filename, content, 0644)
-}
-
-func diff(filename string, content []byte) error {
-	renamed := fmt.Sprintf("%s.%d.renamed", filename, os.Getpid())
-	if err := ioutil.WriteFile(renamed, content, 0644); err != nil {
-		return err
-	}
-	defer os.Remove(renamed)
-
-	diff, err := exec.Command(DiffCmd, "-u", filename, renamed).CombinedOutput()
-	if len(diff) > 0 {
-		// diff exits with a non-zero status when the files don't match.
-		// Ignore that failure as long as we get output.
-		stdout.Write(diff)
-		return nil
-	}
-	if err != nil {
-		return fmt.Errorf("computing diff: %v", err)
-	}
-	return nil
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/rename_test.go b/installer/vendor/golang.org/x/tools/refactor/rename/rename_test.go
deleted file mode 100644
index 87134a4d1d..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/rename_test.go
+++ /dev/null
@@ -1,1334 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rename
-
-import (
-	"bytes"
-	"fmt"
-	"go/build"
-	"go/token"
-	"os"
-	"path/filepath"
-	"regexp"
-	"runtime"
-	"strings"
-	"testing"
-
-	"golang.org/x/tools/go/buildutil"
-)
-
-// TODO(adonovan): test reported source positions, somehow.
-
-func TestConflicts(t *testing.T) {
-	defer func(savedWriteFile func(string, []byte) error, savedReportError func(token.Position, string)) {
-		writeFile = savedWriteFile
-		reportError = savedReportError
-	}(writeFile, reportError)
-	writeFile = func(string, []byte) error { return nil }
-
-	var ctxt *build.Context
-	for _, test := range []struct {
-		ctxt             *build.Context // nil => use previous
-		offset, from, to string         // values of the -offset/-from and -to flags
-		want             string         // regexp to match conflict errors, or "OK"
-	}{
-		// init() checks
-		{
-			ctxt: fakeContext(map[string][]string{
-				"fmt": {`package fmt; type Stringer interface { String() }`},
-				"main": {`
-package main
-
-import foo "fmt"
-
-var v foo.Stringer
-
-func f() { v.String(); f() }
-`,
-					`package main; var w int`},
-			}),
-			from: "main.v", to: "init",
-			want: `you cannot have a var at package level named "init"`,
-		},
-		{
-			from: "main.f", to: "init",
-			want: `renaming this func "f" to "init" would make it a package initializer.*` +
-				`but references to it exist`,
-		},
-		{
-			from: "/go/src/main/0.go::foo", to: "init",
-			want: `"init" is not a valid imported package name`,
-		},
-
-		// Export checks
-		{
-			from: "fmt.Stringer", to: "stringer",
-			want: `renaming this type "Stringer" to "stringer" would make it unexported.*` +
-				`breaking references from packages such as "main"`,
-		},
-		{
-			from: "(fmt.Stringer).String", to: "string",
-			want: `renaming this method "String" to "string" would make it unexported.*` +
-				`breaking references from packages such as "main"`,
-		},
-
-		// Lexical scope checks
-		{
-			// file/package conflict, same file
-			from: "main.v", to: "foo",
-			want: `renaming this var "v" to "foo" would conflict.*` +
-				`with this imported package name`,
-		},
-		{
-			// file/package conflict, same file
-			from: "main::foo", to: "v",
-			want: `renaming this imported package name "foo" to "v" would conflict.*` +
-				`with this package member var`,
-		},
-		{
-			// file/package conflict, different files
-			from: "main.w", to: "foo",
-			want: `renaming this var "w" to "foo" would conflict.*` +
-				`with this imported package name`,
-		},
-		{
-			// file/package conflict, different files
-			from: "main::foo", to: "w",
-			want: `renaming this imported package name "foo" to "w" would conflict.*` +
-				`with this package member var`,
-		},
-		{
-			ctxt: main(`
-package main
-
-var x, z int
-
-func f(y int) {
-	print(x)
-	print(y)
-}
-
-func g(w int) {
-	print(x)
-	x := 1
-	print(x)
-}`),
-			from: "main.x", to: "y",
-			want: `renaming this var "x" to "y".*` +
-				`would cause this reference to become shadowed.*` +
-				`by this intervening var definition`,
-		},
-		{
-			from: "main.g::x", to: "w",
-			want: `renaming this var "x" to "w".*` +
-				`conflicts with var in same block`,
-		},
-		{
-			from: "main.f::y", to: "x",
-			want: `renaming this var "y" to "x".*` +
-				`would shadow this reference.*` +
-				`to the var declared here`,
-		},
-		{
-			from: "main.g::w", to: "x",
-			want: `renaming this var "w" to "x".*` +
-				`conflicts with var in same block`,
-		},
-		{
-			from: "main.z", to: "y", want: "OK",
-		},
-
-		// Label checks
-		{
-			ctxt: main(`
-package main
-
-func f() {
-foo:
-	goto foo
-bar:
-	goto bar
-	func(x int) {
-	wiz:
-		goto wiz
-	}(0)
-}
-`),
-			from: "main.f::foo", to: "bar",
-			want: `renaming this label "foo" to "bar".*` +
-				`would conflict with this one`,
-		},
-		{
-			from: "main.f::foo", to: "wiz", want: "OK",
-		},
-		{
-			from: "main.f::wiz", to: "x", want: "OK",
-		},
-		{
-			from: "main.f::x", to: "wiz", want: "OK",
-		},
-		{
-			from: "main.f::wiz", to: "foo", want: "OK",
-		},
-
-		// Struct fields
-		{
-			ctxt: main(`
-package main
-
-type U struct { u int }
-type V struct { v int }
-
-func (V) x() {}
-
-type W (struct {
-	U
-	V
-	w int
-})
-
-func f() {
-	var w W
-	print(w.u) // NB: there is no selection of w.v
-	var _ struct { yy, zz int }
-}
-`),
-			// field/field conflict in named struct declaration
-			from: "(main.W).U", to: "w",
-			want: `renaming this field "U" to "w".*` +
-				`would conflict with this field`,
-		},
-		{
-			// rename type used as embedded field
-			// => rename field
-			// => field/field conflict
-			// This is an entailed renaming;
-			// it would be nice if we checked source positions.
-			from: "main.U", to: "w",
-			want: `renaming this field "U" to "w".*` +
-				`would conflict with this field`,
-		},
-		{
-			// field/field conflict in unnamed struct declaration
-			from: "main.f::zz", to: "yy",
-			want: `renaming this field "zz" to "yy".*` +
-				`would conflict with this field`,
-		},
-
-		// Now we test both directions of (u,v) (u,w) (v,w) (u,x) (v,x).
-		// Too bad we don't test position info...
-		{
-			// field/field ambiguity at same promotion level ('from' selection)
-			from: "(main.U).u", to: "v",
-			want: `renaming this field "u" to "v".*` +
-				`would make this reference ambiguous.*` +
-				`with this field`,
-		},
-		{
-			// field/field ambiguity at same promotion level ('to' selection)
-			from: "(main.V).v", to: "u",
-			want: `renaming this field "v" to "u".*` +
-				`would make this reference ambiguous.*` +
-				`with this field`,
-		},
-		{
-			// field/method conflict at different promotion level ('from' selection)
-			from: "(main.U).u", to: "w",
-			want: `renaming this field "u" to "w".*` +
-				`would change the referent of this selection.*` +
-				`of this field`,
-		},
-		{
-			// field/field shadowing at different promotion levels ('to' selection)
-			from: "(main.W).w", to: "u",
-			want: `renaming this field "w" to "u".*` +
-				`would shadow this selection.*` +
-				`of the field declared here`,
-		},
-		{
-			from: "(main.V).v", to: "w",
-			want: "OK", // since no selections are made ambiguous
-		},
-		{
-			from: "(main.W).w", to: "v",
-			want: "OK", // since no selections are made ambiguous
-		},
-		{
-			// field/method ambiguity at same promotion level ('from' selection)
-			from: "(main.U).u", to: "x",
-			want: `renaming this field "u" to "x".*` +
-				`would make this reference ambiguous.*` +
-				`with this method`,
-		},
-		{
-			// field/field ambiguity at same promotion level ('to' selection)
-			from: "(main.V).x", to: "u",
-			want: `renaming this method "x" to "u".*` +
-				`would make this reference ambiguous.*` +
-				`with this field`,
-		},
-		{
-			// field/method conflict at named struct declaration
-			from: "(main.V).v", to: "x",
-			want: `renaming this field "v" to "x".*` +
-				`would conflict with this method`,
-		},
-		{
-			// field/method conflict at named struct declaration
-			from: "(main.V).x", to: "v",
-			want: `renaming this method "x" to "v".*` +
-				`would conflict with this field`,
-		},
-
-		// Methods
-		{
-			ctxt: main(`
-package main
-type C int
-func (C) f()
-func (C) g()
-type D int
-func (*D) f()
-func (*D) g()
-type I interface { f(); g() }
-type J interface { I; h() }
-var _ I = new(D)
-var _ interface {f()} = C(0)
-`),
-			from: "(main.I).f", to: "g",
-			want: `renaming this interface method "f" to "g".*` +
-				`would conflict with this method`,
-		},
-		{
-			from: `("main".I).f`, to: "h", // NB: exercises quoted import paths too
-			want: `renaming this interface method "f" to "h".*` +
-				`would conflict with this method.*` +
-				`in named interface type "J"`,
-		},
-		{
-			// type J interface { h; h() } is not a conflict, amusingly.
-			from: "main.I", to: "h",
-			want: `OK`,
-		},
-		{
-			from: "(main.J).h", to: "f",
-			want: `renaming this interface method "h" to "f".*` +
-				`would conflict with this method`,
-		},
-		{
-			from: "(main.C).f", to: "e",
-			want: `renaming this method "f" to "e".*` +
-				`would make main.C no longer assignable to interface{f..}.*` +
-				`(rename interface{f..}.f if you intend to change both types)`,
-		},
-		{
-			from: "(main.D).g", to: "e",
-			want: `renaming this method "g" to "e".*` +
-				`would make \*main.D no longer assignable to interface I.*` +
-				`(rename main.I.g if you intend to change both types)`,
-		},
-		{
-			from: "(main.I).f", to: "e",
-			want: `OK`,
-		},
-		// Indirect C/I method coupling via another concrete type D.
-		{
-			ctxt: main(`
-package main
-type I interface { f() }
-type C int
-func (C) f()
-type D struct{C}
-var _ I = D{}
-`),
-			from: "(main.C).f", to: "F",
-			want: `renaming this method "f" to "F".*` +
-				`would make main.D no longer assignable to interface I.*` +
-				`(rename main.I.f if you intend to change both types)`,
-		},
-		// Renaming causes promoted method to become shadowed; C no longer satisfies I.
-		{
-			ctxt: main(`
-package main
-type I interface { f() }
-type C struct { I }
-func (C) g() int
-var _ I = C{}
-`),
-			from: "main.I.f", to: "g",
-			want: `renaming this method "f" to "g".*` +
-				`would change the g method of main.C invoked via interface main.I.*` +
-				`from \(main.I\).g.*` +
-				`to \(main.C\).g`,
-		},
-		// Renaming causes promoted method to become ambiguous; C no longer satisfies I.
-		{
-			ctxt: main(`
-package main
-type I interface{f()}
-type C int
-func (C) f()
-type D int
-func (D) g()
-type E struct{C;D}
-var _ I = E{}
-`),
-			from: "main.I.f", to: "g",
-			want: `renaming this method "f" to "g".*` +
-				`would make the g method of main.E invoked via interface main.I ambiguous.*` +
-				`with \(main.D\).g`,
-		},
-	} {
-		var conflicts []string
-		reportError = func(posn token.Position, message string) {
-			conflicts = append(conflicts, message)
-		}
-		if test.ctxt != nil {
-			ctxt = test.ctxt
-		}
-		err := Main(ctxt, test.offset, test.from, test.to)
-		var prefix string
-		if test.offset == "" {
-			prefix = fmt.Sprintf("-from %q -to %q", test.from, test.to)
-		} else {
-			prefix = fmt.Sprintf("-offset %q -to %q", test.offset, test.to)
-		}
-		if err == ConflictError {
-			got := strings.Join(conflicts, "\n")
-			if false {
-				t.Logf("%s: %s", prefix, got)
-			}
-			pattern := "(?s:" + test.want + ")" // enable multi-line matching
-			if !regexp.MustCompile(pattern).MatchString(got) {
-				t.Errorf("%s: conflict does not match pattern:\n"+
-					"Conflict:\t%s\n"+
-					"Pattern: %s",
-					prefix, got, test.want)
-			}
-		} else if err != nil {
-			t.Errorf("%s: unexpected error: %s", prefix, err)
-		} else if test.want != "OK" {
-			t.Errorf("%s: unexpected success, want conflicts matching:\n%s",
-				prefix, test.want)
-		}
-	}
-}
-
-func TestInvalidIdentifiers(t *testing.T) {
-	ctxt := fakeContext(map[string][]string{
-		"main": {`
-package main
-
-func f() { }
-`}})
-
-	for _, test := range []struct {
-		from, to string // values of the -offset/-from and -to flags
-		want     string // expected error message
-	}{
-		{
-			from: "main.f", to: "_",
-			want: `-to "_": not a valid identifier`,
-		},
-		{
-			from: "main.f", to: "123",
-			want: `-to "123": not a valid identifier`,
-		},
-		{
-			from: "main.f", to: "for",
-			want: `-to "for": not a valid identifier`,
-		},
-		{
-			from: "switch", to: "v",
-			want: `-from "switch": invalid expression`,
-		},
-	} {
-		err := Main(ctxt, "", test.from, test.to)
-		prefix := fmt.Sprintf("-from %q -to %q", test.from, test.to)
-		if err == nil {
-			t.Errorf("%s: expected error %q", prefix, test.want)
-		} else if err.Error() != test.want {
-			t.Errorf("%s: unexpected error\nwant: %s\n got: %s", prefix, test.want, err.Error())
-		}
-	}
-}
-
-func TestRewrites(t *testing.T) {
-	defer func(savedWriteFile func(string, []byte) error) {
-		writeFile = savedWriteFile
-	}(writeFile)
-
-	var ctxt *build.Context
-	for _, test := range []struct {
-		ctxt             *build.Context    // nil => use previous
-		offset, from, to string            // values of the -from/-offset and -to flags
-		want             map[string]string // contents of updated files
-	}{
-		// Elimination of renaming import.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import foo2 "foo"
-
-var _ foo2.T
-`},
-			}),
-			from: "main::foo2", to: "foo",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-import "foo"
-
-var _ foo.T
-`,
-			},
-		},
-		// Introduction of renaming import.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-var _ foo.T
-`},
-			}),
-			offset: "/go/src/main/0.go:#36", to: "foo2", // the "foo" in foo.T
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-import foo2 "foo"
-
-var _ foo2.T
-`,
-			},
-		},
-		// Renaming of package-level member.
-		{
-			from: "foo.T", to: "U",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-import "foo"
-
-var _ foo.U
-`,
-				"/go/src/foo/0.go": `package foo
-
-type U int
-`,
-			},
-		},
-		// Rename package-level func plus doc
-		{
-			ctxt: main(`package main
-
-// Foo is a no-op.
-// Calling Foo does nothing.
-func Foo() {
-}
-`),
-			from: "main.Foo", to: "FooBar",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-// FooBar is a no-op.
-// Calling FooBar does nothing.
-func FooBar() {
-}
-`,
-			},
-		},
-		// Rename method plus doc
-		{
-			ctxt: main(`package main
-
-type Foo struct{}
-
-// Bar does nothing.
-func (Foo) Bar() {
-}
-`),
-			from: "main.Foo.Bar", to: "Baz",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type Foo struct{}
-
-// Baz does nothing.
-func (Foo) Baz() {
-}
-`,
-			},
-		},
-		// Rename type spec plus doc
-		{
-			ctxt: main(`package main
-
-type (
-	// Test but not Testing.
-	Test struct{}
-)
-`),
-			from: "main.Test", to: "Type",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type (
-	// Type but not Testing.
-	Type struct{}
-)
-`,
-			},
-		},
-		// Rename type in gen decl plus doc
-		{
-			ctxt: main(`package main
-
-// T is a test type.
-type T struct{}
-`),
-			from: "main.T", to: "Type",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-// Type is a test type.
-type Type struct{}
-`,
-			},
-		},
-		// Rename value spec with doc
-		{
-			ctxt: main(`package main
-
-const (
-	// C is the speed of light.
-	C = 2.998e8
-)
-`),
-			from: "main.C", to: "Lightspeed",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-const (
-	// Lightspeed is the speed of light.
-	Lightspeed = 2.998e8
-)
-`,
-			},
-		},
-		// Rename value inside gen decl with doc
-		{
-			ctxt: main(`package main
-
-var out *string
-`),
-			from: "main.out", to: "discard",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-var discard *string
-`,
-			},
-		},
-		// Rename field plus doc
-		{
-			ctxt: main(`package main
-
-type Struct struct {
-	// Field is a struct field.
-	Field string
-}
-`),
-			from: "main.Struct.Field", to: "Foo",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type Struct struct {
-	// Foo is a struct field.
-	Foo string
-}
-`,
-			},
-		},
-		// Label renamings.
-		{
-			ctxt: main(`package main
-func f() {
-loop:
-	loop := 0
-	go func() {
-	loop:
-		goto loop
-	}()
-	loop++
-	goto loop
-}
-`),
-			offset: "/go/src/main/0.go:#25", to: "loop2", // def of outer label "loop"
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func f() {
-loop2:
-	loop := 0
-	go func() {
-	loop:
-		goto loop
-	}()
-	loop++
-	goto loop2
-}
-`,
-			},
-		},
-		{
-			offset: "/go/src/main/0.go:#70", to: "loop2", // ref to inner label "loop"
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func f() {
-loop:
-	loop := 0
-	go func() {
-	loop2:
-		goto loop2
-	}()
-	loop++
-	goto loop
-}
-`,
-			},
-		},
-		// Renaming of type used as embedded field.
-		{
-			ctxt: main(`package main
-
-type T int
-type U struct { T }
-
-var _ = U{}.T
-`),
-			from: "main.T", to: "T2",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type T2 int
-type U struct{ T2 }
-
-var _ = U{}.T2
-`,
-			},
-		},
-		// Renaming of embedded field.
-		{
-			ctxt: main(`package main
-
-type T int
-type U struct { T }
-
-var _ = U{}.T
-`),
-			offset: "/go/src/main/0.go:#58", to: "T2", // T in "U{}.T"
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type T2 int
-type U struct{ T2 }
-
-var _ = U{}.T2
-`,
-			},
-		},
-		// Renaming of pointer embedded field.
-		{
-			ctxt: main(`package main
-
-type T int
-type U struct { *T }
-
-var _ = U{}.T
-`),
-			offset: "/go/src/main/0.go:#59", to: "T2", // T in "U{}.T"
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type T2 int
-type U struct{ *T2 }
-
-var _ = U{}.T2
-`,
-			},
-		},
-
-		// Lexical scope tests.
-		{
-			ctxt: main(`package main
-
-var y int
-
-func f() {
-	print(y)
-	y := ""
-	print(y)
-}
-`),
-			from: "main.y", to: "x",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-var x int
-
-func f() {
-	print(x)
-	y := ""
-	print(y)
-}
-`,
-			},
-		},
-		{
-			from: "main.f::y", to: "x",
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-var y int
-
-func f() {
-	print(y)
-	x := ""
-	print(x)
-}
-`,
-			},
-		},
-		// Renaming of typeswitch vars (a corner case).
-		{
-			ctxt: main(`package main
-
-func f(z interface{}) {
-	switch y := z.(type) {
-	case int:
-		print(y)
-	default:
-		print(y)
-	}
-}
-`),
-			offset: "/go/src/main/0.go:#46", to: "x", // def of y
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func f(z interface{}) {
-	switch x := z.(type) {
-	case int:
-		print(x)
-	default:
-		print(x)
-	}
-}
-`},
-		},
-		{
-			offset: "/go/src/main/0.go:#81", to: "x", // ref of y in case int
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func f(z interface{}) {
-	switch x := z.(type) {
-	case int:
-		print(x)
-	default:
-		print(x)
-	}
-}
-`},
-		},
-		{
-			offset: "/go/src/main/0.go:#102", to: "x", // ref of y in default case
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func f(z interface{}) {
-	switch x := z.(type) {
-	case int:
-		print(x)
-	default:
-		print(x)
-	}
-}
-`},
-		},
-
-		// Renaming of embedded field that is a qualified reference.
-		// (Regression test for bug 8924.)
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-type _ struct{ *foo.T }
-`},
-			}),
-			offset: "/go/src/main/0.go:#48", to: "U", // the "T" in *foo.T
-			want: map[string]string{
-				"/go/src/foo/0.go": `package foo
-
-type U int
-`,
-				"/go/src/main/0.go": `package main
-
-import "foo"
-
-type _ struct{ *foo.U }
-`,
-			},
-		},
-
-		// Renaming of embedded field that is a qualified reference with the '-from' flag.
-		// (Regression test for bug 12038.)
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-type V struct{ *foo.T }
-`},
-			}),
-			from: "(main.V).T", to: "U", // the "T" in *foo.T
-			want: map[string]string{
-				"/go/src/foo/0.go": `package foo
-
-type U int
-`,
-				"/go/src/main/0.go": `package main
-
-import "foo"
-
-type V struct{ *foo.U }
-`,
-			},
-		},
-		{
-			ctxt: fakeContext(map[string][]string{
-				"foo": {`package foo; type T int`},
-				"main": {`package main
-
-import "foo"
-
-type V struct{ foo.T }
-`},
-			}),
-			from: "(main.V).T", to: "U", // the "T" in *foo.T
-			want: map[string]string{
-				"/go/src/foo/0.go": `package foo
-
-type U int
-`,
-				"/go/src/main/0.go": `package main
-
-import "foo"
-
-type V struct{ foo.U }
-`,
-			},
-		},
-
-		// Interface method renaming.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`
-package main
-type I interface {
-	f()
-}
-type J interface { f(); g() }
-type A int
-func (A) f()
-type B int
-func (B) f()
-func (B) g()
-type C int
-func (C) f()
-func (C) g()
-var _, _ I = A(0), B(0)
-var _, _ J = B(0), C(0)
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#34", to: "F", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	F()
-}
-type J interface {
-	F()
-	g()
-}
-type A int
-
-func (A) F()
-
-type B int
-
-func (B) F()
-func (B) g()
-
-type C int
-
-func (C) F()
-func (C) g()
-
-var _, _ I = A(0), B(0)
-var _, _ J = B(0), C(0)
-`,
-			},
-		},
-		{
-			offset: "/go/src/main/0.go:#59", to: "F", // abstract method J.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	F()
-}
-type J interface {
-	F()
-	g()
-}
-type A int
-
-func (A) F()
-
-type B int
-
-func (B) F()
-func (B) g()
-
-type C int
-
-func (C) F()
-func (C) g()
-
-var _, _ I = A(0), B(0)
-var _, _ J = B(0), C(0)
-`,
-			},
-		},
-		{
-			offset: "/go/src/main/0.go:#64", to: "G", // abstract method J.g
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	f()
-}
-type J interface {
-	f()
-	G()
-}
-type A int
-
-func (A) f()
-
-type B int
-
-func (B) f()
-func (B) G()
-
-type C int
-
-func (C) f()
-func (C) G()
-
-var _, _ I = A(0), B(0)
-var _, _ J = B(0), C(0)
-`,
-			},
-		},
-		// Indirect coupling of I.f to C.f from D->I assignment and anonymous field of D.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`
-package main
-type I interface {
-	f()
-}
-type C int
-func (C) f()
-type D struct{C}
-var _ I = D{}
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#34", to: "F", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	F()
-}
-type C int
-
-func (C) F()
-
-type D struct{ C }
-
-var _ I = D{}
-`,
-			},
-		},
-		// Interface embedded in struct.  No conflict if C need not satisfy I.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`
-package main
-type I interface {
-	f()
-}
-type C struct{I}
-func (C) g() int
-var _ int = C{}.g()
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#34", to: "g", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	g()
-}
-type C struct{ I }
-
-func (C) g() int
-
-var _ int = C{}.g()
-`,
-			},
-		},
-		// A type assertion causes method coupling iff signatures match.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`package main
-type I interface{
-	f()
-}
-type J interface{
-	f()
-}
-var _ = I(nil).(J)
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#32", to: "g", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	g()
-}
-type J interface {
-	g()
-}
-
-var _ = I(nil).(J)
-`,
-			},
-		},
-		// Impossible type assertion: no method coupling.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`package main
-type I interface{
-	f()
-}
-type J interface{
-	f()int
-}
-var _ = I(nil).(J)
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#32", to: "g", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	g()
-}
-type J interface {
-	f() int
-}
-
-var _ = I(nil).(J)
-`,
-			},
-		},
-		// Impossible type assertion: no method coupling C.f<->J.f.
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`package main
-type I interface{
-	f()
-}
-type C int
-func (C) f()
-type J interface{
-	f()int
-}
-var _ = I(C(0)).(J)
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#32", to: "g", // abstract method I.f
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-type I interface {
-	g()
-}
-type C int
-
-func (C) g()
-
-type J interface {
-	f() int
-}
-
-var _ = I(C(0)).(J)
-`,
-			},
-		},
-		// Progress after "soft" type errors (Go issue 14596).
-		{
-			ctxt: fakeContext(map[string][]string{
-				"main": {`package main
-
-func main() {
-	var unused, x int
-	print(x)
-}
-`,
-				},
-			}),
-			offset: "/go/src/main/0.go:#54", to: "y", // var x
-			want: map[string]string{
-				"/go/src/main/0.go": `package main
-
-func main() {
-	var unused, y int
-	print(y)
-}
-`,
-			},
-		},
-	} {
-		if test.ctxt != nil {
-			ctxt = test.ctxt
-		}
-
-		got := make(map[string]string)
-		writeFile = func(filename string, content []byte) error {
-			got[filepath.ToSlash(filename)] = string(content)
-			return nil
-		}
-
-		err := Main(ctxt, test.offset, test.from, test.to)
-		var prefix string
-		if test.offset == "" {
-			prefix = fmt.Sprintf("-from %q -to %q", test.from, test.to)
-		} else {
-			prefix = fmt.Sprintf("-offset %q -to %q", test.offset, test.to)
-		}
-		if err != nil {
-			t.Errorf("%s: unexpected error: %s", prefix, err)
-			continue
-		}
-
-		for file, wantContent := range test.want {
-			gotContent, ok := got[file]
-			delete(got, file)
-			if !ok {
-				t.Errorf("%s: file %s not rewritten", prefix, file)
-				continue
-			}
-			if gotContent != wantContent {
-				t.Errorf("%s: rewritten file %s does not match expectation; got <<<%s>>>\n"+
-					"want <<<%s>>>", prefix, file, gotContent, wantContent)
-			}
-		}
-		// got should now be empty
-		for file := range got {
-			t.Errorf("%s: unexpected rewrite of file %s", prefix, file)
-		}
-	}
-}
-
-func TestDiff(t *testing.T) {
-	if runtime.GOOS == "windows" {
-		t.Skipf("diff tool non-existent for windows on builders")
-	}
-	if runtime.GOOS == "plan9" {
-		t.Skipf("plan9 diff tool doesn't support -u flag")
-	}
-
-	defer func() {
-		Diff = false
-		stdout = os.Stdout
-	}()
-	Diff = true
-	stdout = new(bytes.Buffer)
-
-	if err := Main(&build.Default, "", `"golang.org/x/tools/refactor/rename".justHereForTestingDiff`, "Foo"); err != nil {
-		t.Fatal(err)
-	}
-
-	// NB: there are tabs in the string literal!
-	if !strings.Contains(stdout.(fmt.Stringer).String(), `
--func justHereForTestingDiff() {
--	justHereForTestingDiff()
-+func Foo() {
-+	Foo()
- }
-`) {
-		t.Errorf("unexpected diff:\n<<%s>>", stdout)
-	}
-}
-
-func justHereForTestingDiff() {
-	justHereForTestingDiff()
-}
-
-// ---------------------------------------------------------------------
-
-// Simplifying wrapper around buildutil.FakeContext for packages whose
-// filenames are sequentially numbered (%d.go).  pkgs maps a package
-// import path to its list of file contents.
-func fakeContext(pkgs map[string][]string) *build.Context {
-	pkgs2 := make(map[string]map[string]string)
-	for path, files := range pkgs {
-		filemap := make(map[string]string)
-		for i, contents := range files {
-			filemap[fmt.Sprintf("%d.go", i)] = contents
-		}
-		pkgs2[path] = filemap
-	}
-	return buildutil.FakeContext(pkgs2)
-}
-
-// helper for single-file main packages with no imports.
-func main(content string) *build.Context {
-	return fakeContext(map[string][]string{"main": {content}})
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/spec.go b/installer/vendor/golang.org/x/tools/refactor/rename/spec.go
deleted file mode 100644
index 0c4526d151..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/spec.go
+++ /dev/null
@@ -1,593 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rename
-
-// This file contains logic related to specifying a renaming: parsing of
-// the flags as a form of query, and finding the object(s) it denotes.
-// See Usage for flag details.
-
-import (
-	"bytes"
-	"fmt"
-	"go/ast"
-	"go/build"
-	"go/parser"
-	"go/token"
-	"go/types"
-	"log"
-	"os"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
-
-	"golang.org/x/tools/go/buildutil"
-	"golang.org/x/tools/go/loader"
-)
-
-// A spec specifies an entity to rename.
-//
-// It is populated from an -offset flag or -from query;
-// see Usage for the allowed -from query forms.
-//
-type spec struct {
-	// pkg is the package containing the position
-	// specified by the -from or -offset flag.
-	// If filename == "", our search for the 'from' entity
-	// is restricted to this package.
-	pkg string
-
-	// The original name of the entity being renamed.
-	// If the query had a ::from component, this is that;
-	// otherwise it's the last segment, e.g.
-	//   (encoding/json.Decoder).from
-	//   encoding/json.from
-	fromName string
-
-	// -- The remaining fields are private to this file.  All are optional. --
-
-	// The query's ::x suffix, if any.
-	searchFor string
-
-	// e.g. "Decoder" in "(encoding/json.Decoder).fieldOrMethod"
-	//                or "encoding/json.Decoder
-	pkgMember string
-
-	// e.g. fieldOrMethod in "(encoding/json.Decoder).fieldOrMethod"
-	typeMember string
-
-	// Restricts the query to this file.
-	// Implied by -from="file.go::x" and -offset flags.
-	filename string
-
-	// Byte offset of the 'from' identifier within the file named 'filename'.
-	// -offset mode only.
-	offset int
-}
-
-// parseFromFlag interprets the "-from" flag value as a renaming specification.
-// See Usage in rename.go for valid formats.
-func parseFromFlag(ctxt *build.Context, fromFlag string) (*spec, error) {
-	var spec spec
-	var main string // sans "::x" suffix
-	switch parts := strings.Split(fromFlag, "::"); len(parts) {
-	case 1:
-		main = parts[0]
-	case 2:
-		main = parts[0]
-		spec.searchFor = parts[1]
-		if parts[1] == "" {
-			// error
-		}
-	default:
-		return nil, fmt.Errorf("-from %q: invalid identifier specification (see -help for formats)", fromFlag)
-	}
-
-	if strings.HasSuffix(main, ".go") {
-		// main is "filename.go"
-		if spec.searchFor == "" {
-			return nil, fmt.Errorf("-from: filename %q must have a ::name suffix", main)
-		}
-		spec.filename = main
-		if !buildutil.FileExists(ctxt, spec.filename) {
-			return nil, fmt.Errorf("no such file: %s", spec.filename)
-		}
-
-		bp, err := buildutil.ContainingPackage(ctxt, wd, spec.filename)
-		if err != nil {
-			return nil, err
-		}
-		spec.pkg = bp.ImportPath
-
-	} else {
-		// main is one of:
-		//  "importpath"
-		//  "importpath".member
-		//  (*"importpath".type).fieldormethod           (parens and star optional)
-		if err := parseObjectSpec(&spec, main); err != nil {
-			return nil, err
-		}
-	}
-
-	if spec.searchFor != "" {
-		spec.fromName = spec.searchFor
-	}
-
-	cwd, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-
-	// Sanitize the package.
-	bp, err := ctxt.Import(spec.pkg, cwd, build.FindOnly)
-	if err != nil {
-		return nil, fmt.Errorf("can't find package %q", spec.pkg)
-	}
-	spec.pkg = bp.ImportPath
-
-	if !isValidIdentifier(spec.fromName) {
-		return nil, fmt.Errorf("-from: invalid identifier %q", spec.fromName)
-	}
-
-	if Verbose {
-		log.Printf("-from spec: %+v", spec)
-	}
-
-	return &spec, nil
-}
-
-// parseObjectSpec parses main as one of the non-filename forms of
-// object specification.
-func parseObjectSpec(spec *spec, main string) error {
-	// Parse main as a Go expression, albeit a strange one.
-	e, _ := parser.ParseExpr(main)
-
-	if pkg := parseImportPath(e); pkg != "" {
-		// e.g. bytes or "encoding/json": a package
-		spec.pkg = pkg
-		if spec.searchFor == "" {
-			return fmt.Errorf("-from %q: package import path %q must have a ::name suffix",
-				main, main)
-		}
-		return nil
-	}
-
-	if e, ok := e.(*ast.SelectorExpr); ok {
-		x := unparen(e.X)
-
-		// Strip off star constructor, if any.
-		if star, ok := x.(*ast.StarExpr); ok {
-			x = star.X
-		}
-
-		if pkg := parseImportPath(x); pkg != "" {
-			// package member e.g. "encoding/json".HTMLEscape
-			spec.pkg = pkg              // e.g. "encoding/json"
-			spec.pkgMember = e.Sel.Name // e.g. "HTMLEscape"
-			spec.fromName = e.Sel.Name
-			return nil
-		}
-
-		if x, ok := x.(*ast.SelectorExpr); ok {
-			// field/method of type e.g. ("encoding/json".Decoder).Decode
-			y := unparen(x.X)
-			if pkg := parseImportPath(y); pkg != "" {
-				spec.pkg = pkg               // e.g. "encoding/json"
-				spec.pkgMember = x.Sel.Name  // e.g. "Decoder"
-				spec.typeMember = e.Sel.Name // e.g. "Decode"
-				spec.fromName = e.Sel.Name
-				return nil
-			}
-		}
-	}
-
-	return fmt.Errorf("-from %q: invalid expression", main)
-}
-
-// parseImportPath returns the import path of the package denoted by e.
-// Any import path may be represented as a string literal;
-// single-segment import paths (e.g. "bytes") may also be represented as
-// ast.Ident.  parseImportPath returns "" for all other expressions.
-func parseImportPath(e ast.Expr) string {
-	switch e := e.(type) {
-	case *ast.Ident:
-		return e.Name // e.g. bytes
-
-	case *ast.BasicLit:
-		if e.Kind == token.STRING {
-			pkgname, _ := strconv.Unquote(e.Value)
-			return pkgname // e.g. "encoding/json"
-		}
-	}
-	return ""
-}
-
-// parseOffsetFlag interprets the "-offset" flag value as a renaming specification.
-func parseOffsetFlag(ctxt *build.Context, offsetFlag string) (*spec, error) {
-	var spec spec
-	// Validate -offset, e.g. file.go:#123
-	parts := strings.Split(offsetFlag, ":#")
-	if len(parts) != 2 {
-		return nil, fmt.Errorf("-offset %q: invalid offset specification", offsetFlag)
-	}
-
-	spec.filename = parts[0]
-	if !buildutil.FileExists(ctxt, spec.filename) {
-		return nil, fmt.Errorf("no such file: %s", spec.filename)
-	}
-
-	bp, err := buildutil.ContainingPackage(ctxt, wd, spec.filename)
-	if err != nil {
-		return nil, err
-	}
-	spec.pkg = bp.ImportPath
-
-	for _, r := range parts[1] {
-		if !isDigit(r) {
-			return nil, fmt.Errorf("-offset %q: non-numeric offset", offsetFlag)
-		}
-	}
-	spec.offset, err = strconv.Atoi(parts[1])
-	if err != nil {
-		return nil, fmt.Errorf("-offset %q: non-numeric offset", offsetFlag)
-	}
-
-	// Parse the file and check there's an identifier at that offset.
-	fset := token.NewFileSet()
-	f, err := buildutil.ParseFile(fset, ctxt, nil, wd, spec.filename, parser.ParseComments)
-	if err != nil {
-		return nil, fmt.Errorf("-offset %q: cannot parse file: %s", offsetFlag, err)
-	}
-
-	id := identAtOffset(fset, f, spec.offset)
-	if id == nil {
-		return nil, fmt.Errorf("-offset %q: no identifier at this position", offsetFlag)
-	}
-
-	spec.fromName = id.Name
-
-	return &spec, nil
-}
-
-var wd = func() string {
-	wd, err := os.Getwd()
-	if err != nil {
-		panic("cannot get working directory: " + err.Error())
-	}
-	return wd
-}()
-
-// For source trees built with 'go build', the -from or -offset
-// spec identifies exactly one initial 'from' object to rename ,
-// but certain proprietary build systems allow a single file to
-// appear in multiple packages (e.g. the test package contains a
-// copy of its library), so there may be multiple objects for
-// the same source entity.
-
-func findFromObjects(iprog *loader.Program, spec *spec) ([]types.Object, error) {
-	if spec.filename != "" {
-		return findFromObjectsInFile(iprog, spec)
-	}
-
-	// Search for objects defined in specified package.
-
-	// TODO(adonovan): the iprog.ImportMap has an entry {"main": ...}
-	// for main packages, even though that's not an import path.
-	// Seems like a bug.
-	//
-	// pkg := iprog.ImportMap[spec.pkg]
-	// if pkg == nil {
-	// 	return fmt.Errorf("cannot find package %s", spec.pkg) // can't happen?
-	// }
-	// info := iprog.AllPackages[pkg]
-
-	// Workaround: lookup by value.
-	var info *loader.PackageInfo
-	var pkg *types.Package
-	for pkg, info = range iprog.AllPackages {
-		if pkg.Path() == spec.pkg {
-			break
-		}
-	}
-	if info == nil {
-		return nil, fmt.Errorf("package %q was not loaded", spec.pkg)
-	}
-
-	objects, err := findObjects(info, spec)
-	if err != nil {
-		return nil, err
-	}
-	if len(objects) > 1 {
-		// ambiguous "*" scope query
-		return nil, ambiguityError(iprog.Fset, objects)
-	}
-	return objects, nil
-}
-
-func findFromObjectsInFile(iprog *loader.Program, spec *spec) ([]types.Object, error) {
-	var fromObjects []types.Object
-	for _, info := range iprog.AllPackages {
-		// restrict to specified filename
-		// NB: under certain proprietary build systems, a given
-		// filename may appear in multiple packages.
-		for _, f := range info.Files {
-			thisFile := iprog.Fset.File(f.Pos())
-			if !sameFile(thisFile.Name(), spec.filename) {
-				continue
-			}
-			// This package contains the query file.
-
-			if spec.offset != 0 {
-				// We cannot refactor generated files since position information is invalidated.
-				if generated(f, thisFile) {
-					return nil, fmt.Errorf("cannot rename identifiers in generated file containing DO NOT EDIT marker: %s", thisFile.Name())
-				}
-
-				// Search for a specific ident by file/offset.
-				id := identAtOffset(iprog.Fset, f, spec.offset)
-				if id == nil {
-					// can't happen?
-					return nil, fmt.Errorf("identifier not found")
-				}
-				obj := info.Uses[id]
-				if obj == nil {
-					obj = info.Defs[id]
-					if obj == nil {
-						// Ident without Object.
-
-						// Package clause?
-						pos := thisFile.Pos(spec.offset)
-						_, path, _ := iprog.PathEnclosingInterval(pos, pos)
-						if len(path) == 2 { // [Ident File]
-							// TODO(adonovan): support this case.
-							return nil, fmt.Errorf("cannot rename %q: renaming package clauses is not yet supported",
-								path[1].(*ast.File).Name.Name)
-						}
-
-						// Implicit y in "switch y := x.(type) {"?
-						if obj := typeSwitchVar(&info.Info, path); obj != nil {
-							return []types.Object{obj}, nil
-						}
-
-						// Probably a type error.
-						return nil, fmt.Errorf("cannot find object for %q", id.Name)
-					}
-				}
-				if obj.Pkg() == nil {
-					return nil, fmt.Errorf("cannot rename predeclared identifiers (%s)", obj)
-
-				}
-
-				fromObjects = append(fromObjects, obj)
-			} else {
-				// do a package-wide query
-				objects, err := findObjects(info, spec)
-				if err != nil {
-					return nil, err
-				}
-
-				// filter results: only objects defined in thisFile
-				var filtered []types.Object
-				for _, obj := range objects {
-					if iprog.Fset.File(obj.Pos()) == thisFile {
-						filtered = append(filtered, obj)
-					}
-				}
-				if len(filtered) == 0 {
-					return nil, fmt.Errorf("no object %q declared in file %s",
-						spec.fromName, spec.filename)
-				} else if len(filtered) > 1 {
-					return nil, ambiguityError(iprog.Fset, filtered)
-				}
-				fromObjects = append(fromObjects, filtered[0])
-			}
-			break
-		}
-	}
-	if len(fromObjects) == 0 {
-		// can't happen?
-		return nil, fmt.Errorf("file %s was not part of the loaded program", spec.filename)
-	}
-	return fromObjects, nil
-}
-
-func typeSwitchVar(info *types.Info, path []ast.Node) types.Object {
-	if len(path) > 3 {
-		// [Ident AssignStmt TypeSwitchStmt...]
-		if sw, ok := path[2].(*ast.TypeSwitchStmt); ok {
-			// choose the first case.
-			if len(sw.Body.List) > 0 {
-				obj := info.Implicits[sw.Body.List[0].(*ast.CaseClause)]
-				if obj != nil {
-					return obj
-				}
-			}
-		}
-	}
-	return nil
-}
-
-// On success, findObjects returns the list of objects named
-// spec.fromName matching the spec.  On success, the result has exactly
-// one element unless spec.searchFor!="", in which case it has at least one
-// element.
-//
-func findObjects(info *loader.PackageInfo, spec *spec) ([]types.Object, error) {
-	if spec.pkgMember == "" {
-		if spec.searchFor == "" {
-			panic(spec)
-		}
-		objects := searchDefs(&info.Info, spec.searchFor)
-		if objects == nil {
-			return nil, fmt.Errorf("no object %q declared in package %q",
-				spec.searchFor, info.Pkg.Path())
-		}
-		return objects, nil
-	}
-
-	pkgMember := info.Pkg.Scope().Lookup(spec.pkgMember)
-	if pkgMember == nil {
-		return nil, fmt.Errorf("package %q has no member %q",
-			info.Pkg.Path(), spec.pkgMember)
-	}
-
-	var searchFunc *types.Func
-	if spec.typeMember == "" {
-		// package member
-		if spec.searchFor == "" {
-			return []types.Object{pkgMember}, nil
-		}
-
-		// Search within pkgMember, which must be a function.
-		searchFunc, _ = pkgMember.(*types.Func)
-		if searchFunc == nil {
-			return nil, fmt.Errorf("cannot search for %q within %s %q",
-				spec.searchFor, objectKind(pkgMember), pkgMember)
-		}
-	} else {
-		// field/method of type
-		// e.g. (encoding/json.Decoder).Decode
-		// or ::x within it.
-
-		tName, _ := pkgMember.(*types.TypeName)
-		if tName == nil {
-			return nil, fmt.Errorf("%s.%s is a %s, not a type",
-				info.Pkg.Path(), pkgMember.Name(), objectKind(pkgMember))
-		}
-
-		// search within named type.
-		obj, _, _ := types.LookupFieldOrMethod(tName.Type(), true, info.Pkg, spec.typeMember)
-		if obj == nil {
-			return nil, fmt.Errorf("cannot find field or method %q of %s %s.%s",
-				spec.typeMember, typeKind(tName.Type()), info.Pkg.Path(), tName.Name())
-		}
-
-		if spec.searchFor == "" {
-			// If it is an embedded field, return the type of the field.
-			if v, ok := obj.(*types.Var); ok && v.Anonymous() {
-				switch t := v.Type().(type) {
-				case *types.Pointer:
-					return []types.Object{t.Elem().(*types.Named).Obj()}, nil
-				case *types.Named:
-					return []types.Object{t.Obj()}, nil
-				}
-			}
-			return []types.Object{obj}, nil
-		}
-
-		searchFunc, _ = obj.(*types.Func)
-		if searchFunc == nil {
-			return nil, fmt.Errorf("cannot search for local name %q within %s (%s.%s).%s; need a function",
-				spec.searchFor, objectKind(obj), info.Pkg.Path(), tName.Name(),
-				obj.Name())
-		}
-		if isInterface(tName.Type()) {
-			return nil, fmt.Errorf("cannot search for local name %q within abstract method (%s.%s).%s",
-				spec.searchFor, info.Pkg.Path(), tName.Name(), searchFunc.Name())
-		}
-	}
-
-	// -- search within function or method --
-
-	decl := funcDecl(info, searchFunc)
-	if decl == nil {
-		return nil, fmt.Errorf("cannot find syntax for %s", searchFunc) // can't happen?
-	}
-
-	var objects []types.Object
-	for _, obj := range searchDefs(&info.Info, spec.searchFor) {
-		// We use positions, not scopes, to determine whether
-		// the obj is within searchFunc.  This is clumsy, but the
-		// alternative, using the types.Scope tree, doesn't
-		// account for non-lexical objects like fields and
-		// interface methods.
-		if decl.Pos() <= obj.Pos() && obj.Pos() < decl.End() && obj != searchFunc {
-			objects = append(objects, obj)
-		}
-	}
-	if objects == nil {
-		return nil, fmt.Errorf("no local definition of %q within %s",
-			spec.searchFor, searchFunc)
-	}
-	return objects, nil
-}
-
-func funcDecl(info *loader.PackageInfo, fn *types.Func) *ast.FuncDecl {
-	for _, f := range info.Files {
-		for _, d := range f.Decls {
-			if d, ok := d.(*ast.FuncDecl); ok && info.Defs[d.Name] == fn {
-				return d
-			}
-		}
-	}
-	return nil
-}
-
-func searchDefs(info *types.Info, name string) []types.Object {
-	var objects []types.Object
-	for id, obj := range info.Defs {
-		if obj == nil {
-			// e.g. blank ident.
-			// TODO(adonovan): but also implicit y in
-			//    switch y := x.(type)
-			// Needs some thought.
-			continue
-		}
-		if id.Name == name {
-			objects = append(objects, obj)
-		}
-	}
-	return objects
-}
-
-func identAtOffset(fset *token.FileSet, f *ast.File, offset int) *ast.Ident {
-	var found *ast.Ident
-	ast.Inspect(f, func(n ast.Node) bool {
-		if id, ok := n.(*ast.Ident); ok {
-			idpos := fset.Position(id.Pos()).Offset
-			if idpos <= offset && offset < idpos+len(id.Name) {
-				found = id
-			}
-		}
-		return found == nil // keep traversing only until found
-	})
-	return found
-}
-
-// ambiguityError returns an error describing an ambiguous "*" scope query.
-func ambiguityError(fset *token.FileSet, objects []types.Object) error {
-	var buf bytes.Buffer
-	for i, obj := range objects {
-		if i > 0 {
-			buf.WriteString(", ")
-		}
-		posn := fset.Position(obj.Pos())
-		fmt.Fprintf(&buf, "%s at %s:%d:%d",
-			objectKind(obj), filepath.Base(posn.Filename), posn.Line, posn.Column)
-	}
-	return fmt.Errorf("ambiguous specifier %s matches %s",
-		objects[0].Name(), buf.String())
-}
-
-// Matches cgo generated comment as well as the proposed standard:
-//	https://golang.org/s/generatedcode
-var generatedRx = regexp.MustCompile(`// .*DO NOT EDIT\.?`)
-
-// generated reports whether ast.File is a generated file.
-func generated(f *ast.File, tokenFile *token.File) bool {
-
-	// Iterate over the comments in the file
-	for _, commentGroup := range f.Comments {
-		for _, comment := range commentGroup.List {
-			if matched := generatedRx.MatchString(comment.Text); matched {
-				// Check if comment is at the beginning of the line in source
-				if pos := tokenFile.Position(comment.Slash); pos.Column == 1 {
-					return true
-				}
-			}
-		}
-	}
-	return false
-}
diff --git a/installer/vendor/golang.org/x/tools/refactor/rename/util.go b/installer/vendor/golang.org/x/tools/refactor/rename/util.go
deleted file mode 100644
index e8f8d7498a..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/rename/util.go
+++ /dev/null
@@ -1,105 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-package rename
-
-import (
-	"go/ast"
-	"go/token"
-	"go/types"
-	"os"
-	"path/filepath"
-	"reflect"
-	"runtime"
-	"strings"
-	"unicode"
-
-	"golang.org/x/tools/go/ast/astutil"
-)
-
-func objectKind(obj types.Object) string {
-	switch obj := obj.(type) {
-	case *types.PkgName:
-		return "imported package name"
-	case *types.TypeName:
-		return "type"
-	case *types.Var:
-		if obj.IsField() {
-			return "field"
-		}
-	case *types.Func:
-		if obj.Type().(*types.Signature).Recv() != nil {
-			return "method"
-		}
-	}
-	// label, func, var, const
-	return strings.ToLower(strings.TrimPrefix(reflect.TypeOf(obj).String(), "*types."))
-}
-
-func typeKind(T types.Type) string {
-	return strings.ToLower(strings.TrimPrefix(reflect.TypeOf(T.Underlying()).String(), "*types."))
-}
-
-// NB: for renamings, blank is not considered valid.
-func isValidIdentifier(id string) bool {
-	if id == "" || id == "_" {
-		return false
-	}
-	for i, r := range id {
-		if !isLetter(r) && (i == 0 || !isDigit(r)) {
-			return false
-		}
-	}
-	return token.Lookup(id) == token.IDENT
-}
-
-// isLocal reports whether obj is local to some function.
-// Precondition: not a struct field or interface method.
-func isLocal(obj types.Object) bool {
-	// [... 5=stmt 4=func 3=file 2=pkg 1=universe]
-	var depth int
-	for scope := obj.Parent(); scope != nil; scope = scope.Parent() {
-		depth++
-	}
-	return depth >= 4
-}
-
-func isPackageLevel(obj types.Object) bool {
-	return obj.Pkg().Scope().Lookup(obj.Name()) == obj
-}
-
-// -- Plundered from go/scanner: ---------------------------------------
-
-func isLetter(ch rune) bool {
-	return 'a' <= ch && ch <= 'z' || 'A' <= ch && ch <= 'Z' || ch == '_' || ch >= 0x80 && unicode.IsLetter(ch)
-}
-
-func isDigit(ch rune) bool {
-	return '0' <= ch && ch <= '9' || ch >= 0x80 && unicode.IsDigit(ch)
-}
-
-// -- Plundered from golang.org/x/tools/cmd/guru -----------------
-
-// sameFile returns true if x and y have the same basename and denote
-// the same file.
-//
-func sameFile(x, y string) bool {
-	if runtime.GOOS == "windows" {
-		x = filepath.ToSlash(x)
-		y = filepath.ToSlash(y)
-	}
-	if x == y {
-		return true
-	}
-	if filepath.Base(x) == filepath.Base(y) { // (optimisation)
-		if xi, err := os.Stat(x); err == nil {
-			if yi, err := os.Stat(y); err == nil {
-				return os.SameFile(xi, yi)
-			}
-		}
-	}
-	return false
-}
-
-func unparen(e ast.Expr) ast.Expr { return astutil.Unparen(e) }
diff --git a/installer/vendor/golang.org/x/tools/refactor/satisfy/find.go b/installer/vendor/golang.org/x/tools/refactor/satisfy/find.go
deleted file mode 100644
index 9b365b9b33..0000000000
--- a/installer/vendor/golang.org/x/tools/refactor/satisfy/find.go
+++ /dev/null
@@ -1,705 +0,0 @@
-// Copyright 2014 The Go Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style
-// license that can be found in the LICENSE file.
-
-// Package satisfy inspects the type-checked ASTs of Go packages and
-// reports the set of discovered type constraints of the form (lhs, rhs
-// Type) where lhs is a non-trivial interface, rhs satisfies this
-// interface, and this fact is necessary for the package to be
-// well-typed.
-//
-// THIS PACKAGE IS EXPERIMENTAL AND MAY CHANGE AT ANY TIME.
-//
-// It is provided only for the gorename tool.  Ideally this
-// functionality will become part of the type-checker in due course,
-// since it is computing it anyway, and it is robust for ill-typed
-// inputs, which this package is not.
-//
-package satisfy // import "golang.org/x/tools/refactor/satisfy"
-
-// NOTES:
-//
-// We don't care about numeric conversions, so we don't descend into
-// types or constant expressions.  This is unsound because
-// constant expressions can contain arbitrary statements, e.g.
-//   const x = len([1]func(){func() {
-//     ...
-//   }})
-//
-// TODO(adonovan): make this robust against ill-typed input.
-// Or move it into the type-checker.
-//
-// Assignability conversions are possible in the following places:
-// - in assignments y = x, y := x, var y = x.
-// - from call argument types to formal parameter types
-// - in append and delete calls
-// - from return operands to result parameter types
-// - in composite literal T{k:v}, from k and v to T's field/element/key type
-// - in map[key] from key to the map's key type
-// - in comparisons x==y and switch x { case y: }.
-// - in explicit conversions T(x)
-// - in sends ch <- x, from x to the channel element type
-// - in type assertions x.(T) and switch x.(type) { case T: }
-//
-// The results of this pass provide information equivalent to the
-// ssa.MakeInterface and ssa.ChangeInterface instructions.
-
-import (
-	"fmt"
-	"go/ast"
-	"go/token"
-	"go/types"
-
-	"golang.org/x/tools/go/ast/astutil"
-	"golang.org/x/tools/go/types/typeutil"
-)
-
-// A Constraint records the fact that the RHS type does and must
-// satisify the LHS type, which is an interface.
-// The names are suggestive of an assignment statement LHS = RHS.
-type Constraint struct {
-	LHS, RHS types.Type
-}
-
-// A Finder inspects the type-checked ASTs of Go packages and
-// accumulates the set of type constraints (x, y) such that x is
-// assignable to y, y is an interface, and both x and y have methods.
-//
-// In other words, it returns the subset of the "implements" relation
-// that is checked during compilation of a package.  Refactoring tools
-// will need to preserve at least this part of the relation to ensure
-// continued compilation.
-//
-type Finder struct {
-	Result    map[Constraint]bool
-	msetcache typeutil.MethodSetCache
-
-	// per-Find state
-	info *types.Info
-	sig  *types.Signature
-}
-
-// Find inspects a single package, populating Result with its pairs of
-// constrained types.
-//
-// The result is non-canonical and thus may contain duplicates (but this
-// tends to preserves names of interface types better).
-//
-// The package must be free of type errors, and
-// info.{Defs,Uses,Selections,Types} must have been populated by the
-// type-checker.
-//
-func (f *Finder) Find(info *types.Info, files []*ast.File) {
-	if f.Result == nil {
-		f.Result = make(map[Constraint]bool)
-	}
-
-	f.info = info
-	for _, file := range files {
-		for _, d := range file.Decls {
-			switch d := d.(type) {
-			case *ast.GenDecl:
-				if d.Tok == token.VAR { // ignore consts
-					for _, spec := range d.Specs {
-						f.valueSpec(spec.(*ast.ValueSpec))
-					}
-				}
-
-			case *ast.FuncDecl:
-				if d.Body != nil {
-					f.sig = f.info.Defs[d.Name].Type().(*types.Signature)
-					f.stmt(d.Body)
-					f.sig = nil
-				}
-			}
-		}
-	}
-	f.info = nil
-}
-
-var (
-	tInvalid     = types.Typ[types.Invalid]
-	tUntypedBool = types.Typ[types.UntypedBool]
-	tUntypedNil  = types.Typ[types.UntypedNil]
-)
-
-// exprN visits an expression in a multi-value context.
-func (f *Finder) exprN(e ast.Expr) types.Type {
-	typ := f.info.Types[e].Type.(*types.Tuple)
-	switch e := e.(type) {
-	case *ast.ParenExpr:
-		return f.exprN(e.X)
-
-	case *ast.CallExpr:
-		// x, err := f(args)
-		sig := f.expr(e.Fun).Underlying().(*types.Signature)
-		f.call(sig, e.Args)
-
-	case *ast.IndexExpr:
-		// y, ok := x[i]
-		x := f.expr(e.X)
-		f.assign(f.expr(e.Index), x.Underlying().(*types.Map).Key())
-
-	case *ast.TypeAssertExpr:
-		// y, ok := x.(T)
-		f.typeAssert(f.expr(e.X), typ.At(0).Type())
-
-	case *ast.UnaryExpr: // must be receive <-
-		// y, ok := <-x
-		f.expr(e.X)
-
-	default:
-		panic(e)
-	}
-	return typ
-}
-
-func (f *Finder) call(sig *types.Signature, args []ast.Expr) {
-	if len(args) == 0 {
-		return
-	}
-
-	// Ellipsis call?  e.g. f(x, y, z...)
-	if _, ok := args[len(args)-1].(*ast.Ellipsis); ok {
-		for i, arg := range args {
-			// The final arg is a slice, and so is the final param.
-			f.assign(sig.Params().At(i).Type(), f.expr(arg))
-		}
-		return
-	}
-
-	var argtypes []types.Type
-
-	// Gather the effective actual parameter types.
-	if tuple, ok := f.info.Types[args[0]].Type.(*types.Tuple); ok {
-		// f(g()) call where g has multiple results?
-		f.expr(args[0])
-		// unpack the tuple
-		for i := 0; i < tuple.Len(); i++ {
-			argtypes = append(argtypes, tuple.At(i).Type())
-		}
-	} else {
-		for _, arg := range args {
-			argtypes = append(argtypes, f.expr(arg))
-		}
-	}
-
-	// Assign the actuals to the formals.
-	if !sig.Variadic() {
-		for i, argtype := range argtypes {
-			f.assign(sig.Params().At(i).Type(), argtype)
-		}
-	} else {
-		// The first n-1 parameters are assigned normally.
-		nnormals := sig.Params().Len() - 1
-		for i, argtype := range argtypes[:nnormals] {
-			f.assign(sig.Params().At(i).Type(), argtype)
-		}
-		// Remaining args are assigned to elements of varargs slice.
-		tElem := sig.Params().At(nnormals).Type().(*types.Slice).Elem()
-		for i := nnormals; i < len(argtypes); i++ {
-			f.assign(tElem, argtypes[i])
-		}
-	}
-}
-
-func (f *Finder) builtin(obj *types.Builtin, sig *types.Signature, args []ast.Expr, T types.Type) types.Type {
-	switch obj.Name() {
-	case "make", "new":
-		// skip the type operand
-		for _, arg := range args[1:] {
-			f.expr(arg)
-		}
-
-	case "append":
-		s := f.expr(args[0])
-		if _, ok := args[len(args)-1].(*ast.Ellipsis); ok && len(args) == 2 {
-			// append(x, y...)   including append([]byte, "foo"...)
-			f.expr(args[1])
-		} else {
-			// append(x, y, z)
-			tElem := s.Underlying().(*types.Slice).Elem()
-			for _, arg := range args[1:] {
-				f.assign(tElem, f.expr(arg))
-			}
-		}
-
-	case "delete":
-		m := f.expr(args[0])
-		k := f.expr(args[1])
-		f.assign(m.Underlying().(*types.Map).Key(), k)
-
-	default:
-		// ordinary call
-		f.call(sig, args)
-	}
-
-	return T
-}
-
-func (f *Finder) extract(tuple types.Type, i int) types.Type {
-	if tuple, ok := tuple.(*types.Tuple); ok && i < tuple.Len() {
-		return tuple.At(i).Type()
-	}
-	return tInvalid
-}
-
-func (f *Finder) valueSpec(spec *ast.ValueSpec) {
-	var T types.Type
-	if spec.Type != nil {
-		T = f.info.Types[spec.Type].Type
-	}
-	switch len(spec.Values) {
-	case len(spec.Names): // e.g. var x, y = f(), g()
-		for _, value := range spec.Values {
-			v := f.expr(value)
-			if T != nil {
-				f.assign(T, v)
-			}
-		}
-
-	case 1: // e.g. var x, y = f()
-		tuple := f.exprN(spec.Values[0])
-		for i := range spec.Names {
-			if T != nil {
-				f.assign(T, f.extract(tuple, i))
-			}
-		}
-	}
-}
-
-// assign records pairs of distinct types that are related by
-// assignability, where the left-hand side is an interface and both
-// sides have methods.
-//
-// It should be called for all assignability checks, type assertions,
-// explicit conversions and comparisons between two types, unless the
-// types are uninteresting (e.g. lhs is a concrete type, or the empty
-// interface; rhs has no methods).
-//
-func (f *Finder) assign(lhs, rhs types.Type) {
-	if types.Identical(lhs, rhs) {
-		return
-	}
-	if !isInterface(lhs) {
-		return
-	}
-
-	if f.msetcache.MethodSet(lhs).Len() == 0 {
-		return
-	}
-	if f.msetcache.MethodSet(rhs).Len() == 0 {
-		return
-	}
-	// record the pair
-	f.Result[Constraint{lhs, rhs}] = true
-}
-
-// typeAssert must be called for each type assertion x.(T) where x has
-// interface type I.
-func (f *Finder) typeAssert(I, T types.Type) {
-	// Type assertions are slightly subtle, because they are allowed
-	// to be "impossible", e.g.
-	//
-	// 	var x interface{f()}
-	//	_ = x.(interface{f()int}) // legal
-	//
-	// (In hindsight, the language spec should probably not have
-	// allowed this, but it's too late to fix now.)
-	//
-	// This means that a type assert from I to T isn't exactly a
-	// constraint that T is assignable to I, but for a refactoring
-	// tool it is a conditional constraint that, if T is assignable
-	// to I before a refactoring, it should remain so after.
-
-	if types.AssignableTo(T, I) {
-		f.assign(I, T)
-	}
-}
-
-// compare must be called for each comparison x==y.
-func (f *Finder) compare(x, y types.Type) {
-	if types.AssignableTo(x, y) {
-		f.assign(y, x)
-	} else if types.AssignableTo(y, x) {
-		f.assign(x, y)
-	}
-}
-
-// expr visits a true expression (not a type or defining ident)
-// and returns its type.
-func (f *Finder) expr(e ast.Expr) types.Type {
-	tv := f.info.Types[e]
-	if tv.Value != nil {
-		return tv.Type // prune the descent for constants
-	}
-
-	// tv.Type may be nil for an ast.Ident.
-
-	switch e := e.(type) {
-	case *ast.BadExpr, *ast.BasicLit:
-		// no-op
-
-	case *ast.Ident:
-		// (referring idents only)
-		if obj, ok := f.info.Uses[e]; ok {
-			return obj.Type()
-		}
-		if e.Name == "_" { // e.g. "for _ = range x"
-			return tInvalid
-		}
-		panic("undefined ident: " + e.Name)
-
-	case *ast.Ellipsis:
-		if e.Elt != nil {
-			f.expr(e.Elt)
-		}
-
-	case *ast.FuncLit:
-		saved := f.sig
-		f.sig = tv.Type.(*types.Signature)
-		f.stmt(e.Body)
-		f.sig = saved
-
-	case *ast.CompositeLit:
-		switch T := deref(tv.Type).Underlying().(type) {
-		case *types.Struct:
-			for i, elem := range e.Elts {
-				if kv, ok := elem.(*ast.KeyValueExpr); ok {
-					f.assign(f.info.Uses[kv.Key.(*ast.Ident)].Type(), f.expr(kv.Value))
-				} else {
-					f.assign(T.Field(i).Type(), f.expr(elem))
-				}
-			}
-
-		case *types.Map:
-			for _, elem := range e.Elts {
-				elem := elem.(*ast.KeyValueExpr)
-				f.assign(T.Key(), f.expr(elem.Key))
-				f.assign(T.Elem(), f.expr(elem.Value))
-			}
-
-		case *types.Array, *types.Slice:
-			tElem := T.(interface {
-				Elem() types.Type
-			}).Elem()
-			for _, elem := range e.Elts {
-				if kv, ok := elem.(*ast.KeyValueExpr); ok {
-					// ignore the key
-					f.assign(tElem, f.expr(kv.Value))
-				} else {
-					f.assign(tElem, f.expr(elem))
-				}
-			}
-
-		default:
-			panic("unexpected composite literal type: " + tv.Type.String())
-		}
-
-	case *ast.ParenExpr:
-		f.expr(e.X)
-
-	case *ast.SelectorExpr:
-		if _, ok := f.info.Selections[e]; ok {
-			f.expr(e.X) // selection
-		} else {
-			return f.info.Uses[e.Sel].Type() // qualified identifier
-		}
-
-	case *ast.IndexExpr:
-		x := f.expr(e.X)
-		i := f.expr(e.Index)
-		if ux, ok := x.Underlying().(*types.Map); ok {
-			f.assign(ux.Key(), i)
-		}
-
-	case *ast.SliceExpr:
-		f.expr(e.X)
-		if e.Low != nil {
-			f.expr(e.Low)
-		}
-		if e.High != nil {
-			f.expr(e.High)
-		}
-		if e.Max != nil {
-			f.expr(e.Max)
-		}
-
-	case *ast.TypeAssertExpr:
-		x := f.expr(e.X)
-		f.typeAssert(x, f.info.Types[e.Type].Type)
-
-	case *ast.CallExpr:
-		if tvFun := f.info.Types[e.Fun]; tvFun.IsType() {
-			// conversion
-			arg0 := f.expr(e.Args[0])
-			f.assign(tvFun.Type, arg0)
-		} else {
-			// function call
-			if id, ok := unparen(e.Fun).(*ast.Ident); ok {
-				if obj, ok := f.info.Uses[id].(*types.Builtin); ok {
-					sig := f.info.Types[id].Type.(*types.Signature)
-					return f.builtin(obj, sig, e.Args, tv.Type)
-				}
-			}
-			// ordinary call
-			f.call(f.expr(e.Fun).Underlying().(*types.Signature), e.Args)
-		}
-
-	case *ast.StarExpr:
-		f.expr(e.X)
-
-	case *ast.UnaryExpr:
-		f.expr(e.X)
-
-	case *ast.BinaryExpr:
-		x := f.expr(e.X)
-		y := f.expr(e.Y)
-		if e.Op == token.EQL || e.Op == token.NEQ {
-			f.compare(x, y)
-		}
-
-	case *ast.KeyValueExpr:
-		f.expr(e.Key)
-		f.expr(e.Value)
-
-	case *ast.ArrayType,
-		*ast.StructType,
-		*ast.FuncType,
-		*ast.InterfaceType,
-		*ast.MapType,
-		*ast.ChanType:
-		panic(e)
-	}
-
-	if tv.Type == nil {
-		panic(fmt.Sprintf("no type for %T", e))
-	}
-
-	return tv.Type
-}
-
-func (f *Finder) stmt(s ast.Stmt) {
-	switch s := s.(type) {
-	case *ast.BadStmt,
-		*ast.EmptyStmt,
-		*ast.BranchStmt:
-		// no-op
-
-	case *ast.DeclStmt:
-		d := s.Decl.(*ast.GenDecl)
-		if d.Tok == token.VAR { // ignore consts
-			for _, spec := range d.Specs {
-				f.valueSpec(spec.(*ast.ValueSpec))
-			}
-		}
-
-	case *ast.LabeledStmt:
-		f.stmt(s.Stmt)
-
-	case *ast.ExprStmt:
-		f.expr(s.X)
-
-	case *ast.SendStmt:
-		ch := f.expr(s.Chan)
-		val := f.expr(s.Value)
-		f.assign(ch.Underlying().(*types.Chan).Elem(), val)
-
-	case *ast.IncDecStmt:
-		f.expr(s.X)
-
-	case *ast.AssignStmt:
-		switch s.Tok {
-		case token.ASSIGN, token.DEFINE:
-			// y := x   or   y = x
-			var rhsTuple types.Type
-			if len(s.Lhs) != len(s.Rhs) {
-				rhsTuple = f.exprN(s.Rhs[0])
-			}
-			for i := range s.Lhs {
-				var lhs, rhs types.Type
-				if rhsTuple == nil {
-					rhs = f.expr(s.Rhs[i]) // 1:1 assignment
-				} else {
-					rhs = f.extract(rhsTuple, i) // n:1 assignment
-				}
-
-				if id, ok := s.Lhs[i].(*ast.Ident); ok {
-					if id.Name != "_" {
-						if obj, ok := f.info.Defs[id]; ok {
-							lhs = obj.Type() // definition
-						}
-					}
-				}
-				if lhs == nil {
-					lhs = f.expr(s.Lhs[i]) // assignment
-				}
-				f.assign(lhs, rhs)
-			}
-
-		default:
-			// y op= x
-			f.expr(s.Lhs[0])
-			f.expr(s.Rhs[0])
-		}
-
-	case *ast.GoStmt:
-		f.expr(s.Call)
-
-	case *ast.DeferStmt:
-		f.expr(s.Call)
-
-	case *ast.ReturnStmt:
-		formals := f.sig.Results()
-		switch len(s.Results) {
-		case formals.Len(): // 1:1
-			for i, result := range s.Results {
-				f.assign(formals.At(i).Type(), f.expr(result))
-			}
-
-		case 1: // n:1
-			tuple := f.exprN(s.Results[0])
-			for i := 0; i < formals.Len(); i++ {
-				f.assign(formals.At(i).Type(), f.extract(tuple, i))
-			}
-		}
-
-	case *ast.SelectStmt:
-		f.stmt(s.Body)
-
-	case *ast.BlockStmt:
-		for _, s := range s.List {
-			f.stmt(s)
-		}
-
-	case *ast.IfStmt:
-		if s.Init != nil {
-			f.stmt(s.Init)
-		}
-		f.expr(s.Cond)
-		f.stmt(s.Body)
-		if s.Else != nil {
-			f.stmt(s.Else)
-		}
-
-	case *ast.SwitchStmt:
-		if s.Init != nil {
-			f.stmt(s.Init)
-		}
-		var tag types.Type = tUntypedBool
-		if s.Tag != nil {
-			tag = f.expr(s.Tag)
-		}
-		for _, cc := range s.Body.List {
-			cc := cc.(*ast.CaseClause)
-			for _, cond := range cc.List {
-				f.compare(tag, f.info.Types[cond].Type)
-			}
-			for _, s := range cc.Body {
-				f.stmt(s)
-			}
-		}
-
-	case *ast.TypeSwitchStmt:
-		if s.Init != nil {
-			f.stmt(s.Init)
-		}
-		var I types.Type
-		switch ass := s.Assign.(type) {
-		case *ast.ExprStmt: // x.(type)
-			I = f.expr(unparen(ass.X).(*ast.TypeAssertExpr).X)
-		case *ast.AssignStmt: // y := x.(type)
-			I = f.expr(unparen(ass.Rhs[0]).(*ast.TypeAssertExpr).X)
-		}
-		for _, cc := range s.Body.List {
-			cc := cc.(*ast.CaseClause)
-			for _, cond := range cc.List {
-				tCase := f.info.Types[cond].Type
-				if tCase != tUntypedNil {
-					f.typeAssert(I, tCase)
-				}
-			}
-			for _, s := range cc.Body {
-				f.stmt(s)
-			}
-		}
-
-	case *ast.CommClause:
-		if s.Comm != nil {
-			f.stmt(s.Comm)
-		}
-		for _, s := range s.Body {
-			f.stmt(s)
-		}
-
-	case *ast.ForStmt:
-		if s.Init != nil {
-			f.stmt(s.Init)
-		}
-		if s.Cond != nil {
-			f.expr(s.Cond)
-		}
-		if s.Post != nil {
-			f.stmt(s.Post)
-		}
-		f.stmt(s.Body)
-
-	case *ast.RangeStmt:
-		x := f.expr(s.X)
-		// No conversions are involved when Tok==DEFINE.
-		if s.Tok == token.ASSIGN {
-			if s.Key != nil {
-				k := f.expr(s.Key)
-				var xelem types.Type
-				// keys of array, *array, slice, string aren't interesting
-				switch ux := x.Underlying().(type) {
-				case *types.Chan:
-					xelem = ux.Elem()
-				case *types.Map:
-					xelem = ux.Key()
-				}
-				if xelem != nil {
-					f.assign(xelem, k)
-				}
-			}
-			if s.Value != nil {
-				val := f.expr(s.Value)
-				var xelem types.Type
-				// values of strings aren't interesting
-				switch ux := x.Underlying().(type) {
-				case *types.Array:
-					xelem = ux.Elem()
-				case *types.Chan:
-					xelem = ux.Elem()
-				case *types.Map:
-					xelem = ux.Elem()
-				case *types.Pointer: // *array
-					xelem = deref(ux).(*types.Array).Elem()
-				case *types.Slice:
-					xelem = ux.Elem()
-				}
-				if xelem != nil {
-					f.assign(xelem, val)
-				}
-			}
-		}
-		f.stmt(s.Body)
-
-	default:
-		panic(s)
-	}
-}
-
-// -- Plundered from golang.org/x/tools/go/ssa -----------------
-
-// deref returns a pointer's element type; otherwise it returns typ.
-func deref(typ types.Type) types.Type {
-	if p, ok := typ.Underlying().(*types.Pointer); ok {
-		return p.Elem()
-	}
-	return typ
-}
-
-func unparen(e ast.Expr) ast.Expr { return astutil.Unparen(e) }
-
-func isInterface(T types.Type) bool { return types.IsInterface(T) }
diff --git a/installer/vendor/golang.org/x/tools/third_party/moduleloader/moduleloader.js b/installer/vendor/golang.org/x/tools/third_party/moduleloader/moduleloader.js
deleted file mode 100644
index c9bc6ce16d..0000000000
--- a/installer/vendor/golang.org/x/tools/third_party/moduleloader/moduleloader.js
+++ /dev/null
@@ -1,7 +0,0 @@
-/*
- *  es6-module-loader v0.17.11
- *  https://github.com/ModuleLoader/es6-module-loader
- *  Copyright (c) 2016 Guy Bedford, Luke Hoban, Addy Osmani; Licensed MIT
- */
-
-!function(a){function b(a,c){if("string"!=typeof a)throw new TypeError("URL must be a string");var d=String(a).replace(/^\s+|\s+$/g,"").match(/^([^:\/?#]+:)?(?:\/\/(?:([^:@\/?#]*)(?::([^:@\/?#]*))?@)?(([^:\/?#]*)(?::(\d*))?))?([^?#]*)(\?[^#]*)?(#[\s\S]*)?/);if(!d)throw new RangeError("Invalid URL format");var e=d[1]||"",f=d[2]||"",g=d[3]||"",h=d[4]||"",i=d[5]||"",j=d[6]||"",k=d[7]||"",l=d[8]||"",m=d[9]||"";if(void 0!==c){var n=c instanceof b?c:new b(c),o=!e&&!h&&!f;!o||k||l||(l=n.search),o&&"/"!==k[0]&&(k=k?(!n.host&&!n.username||n.pathname?"":"/")+n.pathname.slice(0,n.pathname.lastIndexOf("/")+1)+k:n.pathname);var p=[];k.replace(/^(\.\.?(\/|$))+/,"").replace(/\/(\.(\/|$))+/g,"/").replace(/\/\.\.$/,"/../").replace(/\/?[^\/]*/g,function(a){"/.."===a?p.pop():p.push(a)}),k=p.join("").replace(/^\//,"/"===k[0]?"/":""),o&&(j=n.port,i=n.hostname,h=n.host,g=n.password,f=n.username),e||(e=n.protocol)}"file:"==e&&(k=k.replace(/\\/g,"/")),this.origin=h?e+(""!==e||""!==h?"//":"")+h:"",this.href=e+(e&&h||"file:"==e?"//":"")+(""!==f?f+(""!==g?":"+g:"")+"@":"")+h+k+l+m,this.protocol=e,this.username=f,this.password=g,this.host=h,this.hostname=i,this.port=j,this.pathname=k,this.search=l,this.hash=m}a.URLPolyfill=b}("undefined"!=typeof self?self:global),function(a){function b(a,b){return a instanceof Error?(a.message=b+"\n	"+a.message,Error.call(a,a.message)):a=b+"\n	"+a,a}function c(a,c,d){try{new Function(a).call(d)}catch(e){throw b(e,"Evaluating "+c)}}function d(){}function e(b){this._loader={loaderObj:this,loads:[],modules:{},importPromises:{},moduleRecords:{}},k(this,"global",{get:function(){return a}})}function f(){e.call(this),this.paths={}}function g(a,b){var c,d="",e=0;for(var f in a){var g=f.split("*");if(g.length>2)throw new TypeError("Only one wildcard in a path is permitted");if(1==g.length){if(b==f)return a[f];if(b.substr(0,f.length-1)==f.substr(0,f.length-1)&&(b.length<f.length||b[f.length-1]==f[f.length-1])&&"/"==a[f][a[f].length-1])return a[f].substr(0,a[f].length-1)+(b.length>f.length?"/"+b.substr(f.length):"")}else{var h=g[0].length;h>=e&&b.substr(0,g[0].length)==g[0]&&b.substr(b.length-g[1].length)==g[1]&&(e=h,d=f,c=b.substr(g[0].length,b.length-g[1].length-g[0].length))}}var i=a[d];return"string"==typeof c&&(i=i.replace("*",c)),i}function h(){}var i=("undefined"==typeof window&&"undefined"!=typeof self&&"undefined"!=typeof importScripts,"undefined"!=typeof window&&"undefined"!=typeof document),j="undefined"!=typeof process&&"undefined"!=typeof process.platform&&!!process.platform.match(/^win/);a.console||(a.console={assert:function(){}});var k,l=Array.prototype.indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(this[b]===a)return b;return-1};!function(){try{Object.defineProperty({},"a",{})&&(k=Object.defineProperty)}catch(a){k=function(a,b,c){try{a[b]=c.value||c.get.call(a)}catch(d){}}}}();var m;if("undefined"!=typeof document&&document.getElementsByTagName){if(m=document.baseURI,!m){var n=document.getElementsByTagName("base");m=n[0]&&n[0].href||window.location.href}m=m.split("#")[0].split("?")[0],m=m.substr(0,m.lastIndexOf("/")+1)}else if("undefined"!=typeof process&&process.cwd)m="file://"+(j?"/":"")+process.cwd()+"/",j&&(m=m.replace(/\\/g,"/"));else{if("undefined"==typeof location)throw new TypeError("No environment baseURI");m=a.location.href}var o=a.URLPolyfill||a.URL;k(d.prototype,"toString",{value:function(){return"Module"}}),function(){function f(a){return{status:"loading",name:a,linkSets:[],dependencies:[],metadata:{}}}function g(a,b,c){return new Promise(n({step:c.address?"fetch":"locate",loader:a,moduleName:b,moduleMetadata:c&&c.metadata||{},moduleSource:c.source,moduleAddress:c.address}))}function h(a,b,c,d){return new Promise(function(e,f){e(a.loaderObj.normalize(b,c,d))}).then(function(b){var c;if(a.modules[b])return c=f(b),c.status="linked",c.module=a.modules[b],c;for(var d=0,e=a.loads.length;e>d;d++)if(c=a.loads[d],c.name==b)return c;return c=f(b),a.loads.push(c),i(a,c),c})}function i(a,b){j(a,b,Promise.resolve().then(function(){return a.loaderObj.locate({name:b.name,metadata:b.metadata})}))}function j(a,b,c){m(a,b,c.then(function(c){return"loading"==b.status?(b.address=c,a.loaderObj.fetch({name:b.name,metadata:b.metadata,address:c})):void 0}))}function m(b,d,e){e.then(function(e){return"loading"==d.status?Promise.resolve(b.loaderObj.translate({name:d.name,metadata:d.metadata,address:d.address,source:e})).then(function(a){return d.source=a,b.loaderObj.instantiate({name:d.name,metadata:d.metadata,address:d.address,source:a})}).then(function(e){if(void 0===e)return d.address=d.address||"<Anonymous Module "+ ++F+">",d.isDeclarative=!0,q.call(b.loaderObj,d).then(function(b){var e=a.System,f=e.register;e.register=function(a,b,c){"string"!=typeof a&&(c=b,b=a),d.declare=c,d.depsList=b},c(b,d.address,{}),e.register=f});if("object"!=typeof e)throw TypeError("Invalid instantiate return value");d.depsList=e.deps||[],d.execute=e.execute,d.isDeclarative=!1}).then(function(){d.dependencies=[];for(var a=d.depsList,c=[],e=0,f=a.length;f>e;e++)(function(a,e){c.push(h(b,a,d.name,d.address).then(function(b){if(d.dependencies[e]={key:a,value:b.name},"linked"!=b.status)for(var c=d.linkSets.concat([]),f=0,g=c.length;g>f;f++)p(c[f],b)}))})(a[e],e);return Promise.all(c)}).then(function(){d.status="loaded";for(var a=d.linkSets.concat([]),b=0,c=a.length;c>b;b++)s(a[b],d)}):void 0})["catch"](function(a){d.status="failed",d.exception=a;for(var b=d.linkSets.concat([]),c=0,e=b.length;e>c;c++)t(b[c],d,a)})}function n(a){return function(b,c){var d=a.loader,e=a.moduleName,g=a.step;if(d.modules[e])throw new TypeError('"'+e+'" already exists in the module table');for(var h,k=0,l=d.loads.length;l>k;k++)if(d.loads[k].name==e&&(h=d.loads[k],"translate"!=g||h.source||(h.address=a.moduleAddress,m(d,h,Promise.resolve(a.moduleSource))),h.linkSets.length&&h.linkSets[0].loads[0].name==h.name))return h.linkSets[0].done.then(function(){b(h)});var n=h||f(e);n.metadata=a.moduleMetadata;var p=o(d,n);d.loads.push(n),b(p.done),"locate"==g?i(d,n):"fetch"==g?j(d,n,Promise.resolve(a.moduleAddress)):(n.address=a.moduleAddress,m(d,n,Promise.resolve(a.moduleSource)))}}function o(a,b){var c={loader:a,loads:[],startingLoad:b,loadingCount:0};return c.done=new Promise(function(a,b){c.resolve=a,c.reject=b}),p(c,b),c}function p(a,b){if("failed"!=b.status){for(var c=0,d=a.loads.length;d>c;c++)if(a.loads[c]==b)return;a.loads.push(b),b.linkSets.push(a),"loaded"!=b.status&&a.loadingCount++;for(var e=a.loader,c=0,d=b.dependencies.length;d>c;c++)if(b.dependencies[c]){var f=b.dependencies[c].value;if(!e.modules[f])for(var g=0,h=e.loads.length;h>g;g++)if(e.loads[g].name==f){p(a,e.loads[g]);break}}}}function r(a){var b=!1;try{y(a,function(c,d){t(a,c,d),b=!0})}catch(c){t(a,null,c),b=!0}return b}function s(a,b){if(a.loadingCount--,!(a.loadingCount>0)){var c=a.startingLoad;if(a.loader.loaderObj.execute===!1){for(var d=[].concat(a.loads),e=0,f=d.length;f>e;e++){var b=d[e];b.module=b.isDeclarative?{name:b.name,module:G({}),evaluated:!0}:{module:G({})},b.status="linked",u(a.loader,b)}return a.resolve(c)}var g=r(a);g||a.resolve(c)}}function t(a,c,d){var e=a.loader;a:if(c)if(a.loads[0].name==c.name)d=b(d,"Error loading "+c.name);else{for(var f=0;f<a.loads.length;f++)for(var g=a.loads[f],h=0;h<g.dependencies.length;h++){var i=g.dependencies[h];if(i.value==c.name){d=b(d,"Error loading "+c.name+' as "'+i.key+'" from '+g.name);break a}}d=b(d,"Error loading "+c.name+" from "+a.loads[0].name)}else d=b(d,"Error linking "+a.loads[0].name);for(var j=a.loads.concat([]),f=0,k=j.length;k>f;f++){var c=j[f];e.loaderObj.failed=e.loaderObj.failed||[],-1==l.call(e.loaderObj.failed,c)&&e.loaderObj.failed.push(c);var m=l.call(c.linkSets,a);if(c.linkSets.splice(m,1),0==c.linkSets.length){var n=l.call(a.loader.loads,c);-1!=n&&a.loader.loads.splice(n,1)}}a.reject(d)}function u(a,b){if(a.loaderObj.trace){a.loaderObj.loads||(a.loaderObj.loads={});var c={};b.dependencies.forEach(function(a){c[a.key]=a.value}),a.loaderObj.loads[b.name]={name:b.name,deps:b.dependencies.map(function(a){return a.key}),depMap:c,address:b.address,metadata:b.metadata,source:b.source,kind:b.isDeclarative?"declarative":"dynamic"}}b.name&&(a.modules[b.name]=b.module);var d=l.call(a.loads,b);-1!=d&&a.loads.splice(d,1);for(var e=0,f=b.linkSets.length;f>e;e++)d=l.call(b.linkSets[e].loads,b),-1!=d&&b.linkSets[e].loads.splice(d,1);b.linkSets.splice(0,b.linkSets.length)}function v(a,b,c){try{var e=b.execute()}catch(f){return void c(b,f)}return e&&e instanceof d?e:void c(b,new TypeError("Execution must define a Module instance"))}function w(a,b,c){var d=a._loader.importPromises;return d[b]=c.then(function(a){return d[b]=void 0,a},function(a){throw d[b]=void 0,a})}function x(a,b,c){if(c[a.groupIndex]=c[a.groupIndex]||[],-1==l.call(c[a.groupIndex],a)){c[a.groupIndex].push(a);for(var d=0,e=b.length;e>d;d++)for(var f=b[d],g=0;g<a.dependencies.length;g++)if(f.name==a.dependencies[g].value){var h=a.groupIndex+(f.isDeclarative!=a.isDeclarative);if(void 0===f.groupIndex||f.groupIndex<h){if(void 0!==f.groupIndex&&(c[f.groupIndex].splice(l.call(c[f.groupIndex],f),1),0==c[f.groupIndex].length))throw new TypeError("Mixed dependency cycle detected");f.groupIndex=h}x(f,b,c)}}}function y(a,b){var c=a.loader;if(a.loads.length){var d=[],e=a.loads[0];e.groupIndex=0,x(e,a.loads,d);for(var f=e.isDeclarative==d.length%2,g=d.length-1;g>=0;g--){for(var h=d[g],i=0;i<h.length;i++){var j=h[i];if(f)A(j,a.loads,c);else{var k=v(a,j,b);if(!k)return;j.module={name:j.name,module:k},j.status="linked"}u(c,j)}f=!f}}}function z(a,b){var c=b.moduleRecords;return c[a]||(c[a]={name:a,dependencies:[],module:new d,importers:[]})}function A(b,c,d){if(!b.module){var e=b.module=z(b.name,d),f=b.module.module,g=b.declare.call(a,function(a,b){if(e.locked=!0,"object"==typeof a)for(var c in a)f[c]=a[c];else f[a]=b;for(var d=0,g=e.importers.length;g>d;d++){var h=e.importers[d];if(!h.locked)for(var i=0;i<h.dependencies.length;++i)h.dependencies[i]===e&&h.setters[i](f)}return e.locked=!1,b},{id:b.name});e.setters=g.setters,e.execute=g.execute;for(var h=0,i=b.dependencies.length;i>h;h++){var j=b.dependencies[h].value,k=d.modules[j];if(!k)for(var l=0;l<c.length;l++)c[l].name==j&&(c[l].module?k=z(j,d):(A(c[l],c,d),k=c[l].module));k.importers?(e.dependencies.push(k),k.importers.push(e)):e.dependencies.push(null),e.setters[h]&&e.setters[h](k.module)}b.status="linked"}}function B(b){try{b.execute.call(a)}catch(c){return c}}function C(a,b){return D(b.module,[],a),b.module.module}function D(a,b,c){var d=E(a,b,c);if(d)throw d}function E(a,c,d){if(!a.evaluated&&a.dependencies){c.push(a);for(var e,f=a.dependencies,g=0,h=f.length;h>g;g++){var i=f[g];if(i&&-1==l.call(c,i)&&(e=E(i,c,d)))return e=b(e,"Error evaluating "+i.name)}if(a.failed)return new Error("Module failed execution.");if(!a.evaluated)return a.evaluated=!0,e=B(a),e?a.failed=!0:Object.preventExtensions&&Object.preventExtensions(a.module),a.execute=void 0,e}}var F=0;e.prototype={constructor:e,define:function(a,b,c){if(this._loader.importPromises[a])throw new TypeError("Module is already loading.");return w(this,a,new Promise(n({step:"translate",loader:this._loader,moduleName:a,moduleMetadata:c&&c.metadata||{},moduleSource:b,moduleAddress:c&&c.address})))},"delete":function(a){var b=this._loader;return delete b.importPromises[a],delete b.moduleRecords[a],b.modules[a]?delete b.modules[a]:!1},get:function(a){return this._loader.modules[a]?(D(this._loader.modules[a],[],this),this._loader.modules[a].module):void 0},has:function(a){return!!this._loader.modules[a]},"import":function(a,b,c){"object"==typeof b&&(b=b.name);var d=this;return Promise.resolve(d.normalize(a,b)).then(function(a){var b=d._loader;return b.modules[a]?(D(b.modules[a],[],b._loader),b.modules[a].module):b.importPromises[a]||w(d,a,g(b,a,{}).then(function(c){return delete b.importPromises[a],C(b,c)}))})},load:function(a){var b=this._loader;return b.modules[a]?Promise.resolve():b.importPromises[a]||w(this,a,new Promise(n({step:"locate",loader:b,moduleName:a,moduleMetadata:{},moduleSource:void 0,moduleAddress:void 0})).then(function(){delete b.importPromises[a]}))},module:function(a,b){var c=f();c.address=b&&b.address;var d=o(this._loader,c),e=Promise.resolve(a),g=this._loader,h=d.done.then(function(){return C(g,c)});return m(g,c,e),h},newModule:function(a){if("object"!=typeof a)throw new TypeError("Expected object");var b=new d,c=[];if(Object.getOwnPropertyNames&&null!=a)c=Object.getOwnPropertyNames(a);else for(var e in a)c.push(e);for(var f=0;f<c.length;f++)(function(c){k(b,c,{configurable:!1,enumerable:!0,get:function(){return a[c]},set:function(){throw new Error("Module exports cannot be changed externally.")}})})(c[f]);return Object.freeze&&Object.freeze(b),b},set:function(a,b){if(!(b instanceof d))throw new TypeError("Loader.set("+a+", module) must be a module");this._loader.modules[a]={module:b}},normalize:function(a,b,c){return a},locate:function(a){return a.name},fetch:function(a){},translate:function(a){return a.source},instantiate:function(a){}};var G=e.prototype.newModule}();var p,q=function(){function b(b){var d=this;return Promise.resolve(a["typescript"==d.transpiler?"ts":d.transpiler]||(d.pluginLoader||d)["import"](d.transpiler)).then(function(a){a.__useDefault&&(a=a["default"]);var e;return e=a.Compiler?c:a.createLanguageService?g:f,"(function(__moduleName){"+e.call(d,b,a)+'\n})("'+b.name+'");\n//# sourceURL='+b.address+"!transpiled"})}function c(a,b){var c=this.traceurOptions||{};c.modules="instantiate",c.script=!1,void 0===c.sourceMaps&&(c.sourceMaps="inline"),c.filename=a.address,c.inputSourceMap=a.metadata.sourceMap,c.moduleName=!1;var e=new b.Compiler(c);return d(a.source,e,c.filename)}function d(a,b,c){try{return b.compile(a,c)}catch(d){if(d.length)throw d[0];throw d}}function f(a,b){var c=this.babelOptions||{};return c.modules="system",void 0===c.sourceMap&&(c.sourceMap="inline"),c.inputSourceMap=a.metadata.sourceMap,c.filename=a.address,c.code=!0,c.ast=!1,b.transform(a.source,c).code}function g(a,b){var c=this.typescriptOptions||{};return c.target=c.target||b.ScriptTarget.ES5,void 0===c.sourceMap&&(c.sourceMap=!0),c.sourceMap&&c.inlineSourceMap!==!1&&(c.inlineSourceMap=!0),c.module=b.ModuleKind.System,b.transpile(a.source,c,a.address)}return e.prototype.transpiler="traceur",b}();h.prototype=e.prototype,f.prototype=new h;var r=/^([^\/]+:\/\/|\/)/;f.prototype.normalize=function(a,b,c){return a=a.match(r)||"."==a[0]?new o(a,b||m).href:new o(g(this.paths,a)||a,m).href},f.prototype.locate=function(a){return a.name},f.prototype.instantiate=function(b){var d=this;return Promise.resolve(d.normalize(d.transpiler)).then(function(e){return b.address===e?{deps:[],execute:function(){var e=a.System,f=a.Reflect.Loader;return c("(function(require,exports,module){"+b.source+"})();",b.address,a),a.System=e,a.Reflect.Loader=f,d.newModule({"default":a[d.transpiler],__useDefault:!0})}}:void 0})};var s;if("undefined"!=typeof XMLHttpRequest)s=function(a,b,c,d){function e(){c(g.responseText)}function f(){d(new Error("XHR error"+(g.status?" ("+g.status+(g.statusText?" "+g.statusText:"")+")":"")+" loading "+a))}var g=new XMLHttpRequest,h=!0,i=!1;if(!("withCredentials"in g)){var j=/^(\w+:)?\/\/([^\/]+)/.exec(a);j&&(h=j[2]===window.location.host,j[1]&&(h&=j[1]===window.location.protocol))}h||"undefined"==typeof XDomainRequest||(g=new XDomainRequest,g.onload=e,g.onerror=f,g.ontimeout=f,g.onprogress=function(){},g.timeout=0,i=!0),g.onreadystatechange=function(){4===g.readyState&&(0==g.status?g.responseText?e():(g.addEventListener("error",f),g.addEventListener("load",e)):200===g.status?e():f())},g.open("GET",a,!0),g.setRequestHeader&&(g.setRequestHeader("Accept","application/x-es-module, */*"),b&&("string"==typeof b&&g.setRequestHeader("Authorization",b),g.withCredentials=!0)),i?setTimeout(function(){g.send()},0):g.send(null)};else if("undefined"!=typeof require&&"undefined"!=typeof process){var t;s=function(a,b,c,d){if("file:///"!=a.substr(0,8))throw new Error('Unable to fetch "'+a+'". Only file URLs of the form file:/// allowed running in Node.');return t=t||require("fs"),a=j?a.replace(/\//g,"\\").substr(8):a.substr(7),t.readFile(a,function(a,b){if(a)return d(a);var e=b+"";"\ufeff"===e[0]&&(e=e.substr(1)),c(e)})}}else{if("undefined"==typeof self||"undefined"==typeof self.fetch)throw new TypeError("No environment fetch API available.");s=function(a,b,c,d){var e={headers:{Accept:"application/x-es-module, */*"}};b&&("string"==typeof b&&(e.headers.Authorization=b),e.credentials="include"),fetch(a,e).then(function(a){if(a.ok)return a.text();throw new Error("Fetch error: "+a.status+" "+a.statusText)}).then(c,d)}}f.prototype.fetch=function(a){return new Promise(function(b,c){s(a.address,void 0,b,c)})},function(){function a(){document.removeEventListener("DOMContentLoaded",a,!1),window.removeEventListener("load",a,!1),b()}function b(){for(var a=document.getElementsByTagName("script"),b=0;b<a.length;b++){var c=a[b];if("module"==c.type){var d=c.innerHTML.substr(1);p.module(d)["catch"](function(a){setTimeout(function(){throw a})})}}}if(i&&"undefined"!=typeof document.getElementsByTagName){var c=document.getElementsByTagName("script");c=c[c.length-1],"complete"===document.readyState?setTimeout(b):document.addEventListener&&(document.addEventListener("DOMContentLoaded",a,!1),window.addEventListener("load",a,!1))}}(),"object"==typeof exports&&(module.exports=e),a.Reflect=a.Reflect||{},a.Reflect.Loader=a.Reflect.Loader||e,a.Reflect.global=a.Reflect.global||a,a.LoaderPolyfill=e,p||(p=new f,p.constructor=f),"object"==typeof exports&&(module.exports=p),a.System=p}("undefined"!=typeof self?self:global);
diff --git a/installer/vendor/golang.org/x/tools/third_party/typescript/typescript.js b/installer/vendor/golang.org/x/tools/third_party/typescript/typescript.js
deleted file mode 100644
index 3b28d8f0e6..0000000000
--- a/installer/vendor/golang.org/x/tools/third_party/typescript/typescript.js
+++ /dev/null
@@ -1,60312 +0,0 @@
-/*! *****************************************************************************
-Copyright (c) Microsoft Corporation. All rights reserved. 
-Licensed under the Apache License, Version 2.0 (the "License"); you may not use
-this file except in compliance with the License. You may obtain a copy of the
-License at http://www.apache.org/licenses/LICENSE-2.0  
- 
-THIS CODE IS PROVIDED ON AN *AS IS* BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-KIND, EITHER EXPRESS OR IMPLIED, INCLUDING WITHOUT LIMITATION ANY IMPLIED
-WARRANTIES OR CONDITIONS OF TITLE, FITNESS FOR A PARTICULAR PURPOSE, 
-MERCHANTABLITY OR NON-INFRINGEMENT. 
- 
-See the Apache Version 2.0 License for specific language governing permissions
-and limitations under the License.
-***************************************************************************** */
-
-var __extends = (this && this.__extends) || function (d, b) {
-    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-    function __() { this.constructor = d; }
-    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
-var ts;
-(function (ts) {
-    // token > SyntaxKind.Identifer => token is a keyword
-    // Also, If you add a new SyntaxKind be sure to keep the `Markers` section at the bottom in sync
-    (function (SyntaxKind) {
-        SyntaxKind[SyntaxKind["Unknown"] = 0] = "Unknown";
-        SyntaxKind[SyntaxKind["EndOfFileToken"] = 1] = "EndOfFileToken";
-        SyntaxKind[SyntaxKind["SingleLineCommentTrivia"] = 2] = "SingleLineCommentTrivia";
-        SyntaxKind[SyntaxKind["MultiLineCommentTrivia"] = 3] = "MultiLineCommentTrivia";
-        SyntaxKind[SyntaxKind["NewLineTrivia"] = 4] = "NewLineTrivia";
-        SyntaxKind[SyntaxKind["WhitespaceTrivia"] = 5] = "WhitespaceTrivia";
-        // We detect and preserve #! on the first line
-        SyntaxKind[SyntaxKind["ShebangTrivia"] = 6] = "ShebangTrivia";
-        // We detect and provide better error recovery when we encounter a git merge marker.  This
-        // allows us to edit files with git-conflict markers in them in a much more pleasant manner.
-        SyntaxKind[SyntaxKind["ConflictMarkerTrivia"] = 7] = "ConflictMarkerTrivia";
-        // Literals
-        SyntaxKind[SyntaxKind["NumericLiteral"] = 8] = "NumericLiteral";
-        SyntaxKind[SyntaxKind["StringLiteral"] = 9] = "StringLiteral";
-        SyntaxKind[SyntaxKind["RegularExpressionLiteral"] = 10] = "RegularExpressionLiteral";
-        SyntaxKind[SyntaxKind["NoSubstitutionTemplateLiteral"] = 11] = "NoSubstitutionTemplateLiteral";
-        // Pseudo-literals
-        SyntaxKind[SyntaxKind["TemplateHead"] = 12] = "TemplateHead";
-        SyntaxKind[SyntaxKind["TemplateMiddle"] = 13] = "TemplateMiddle";
-        SyntaxKind[SyntaxKind["TemplateTail"] = 14] = "TemplateTail";
-        // Punctuation
-        SyntaxKind[SyntaxKind["OpenBraceToken"] = 15] = "OpenBraceToken";
-        SyntaxKind[SyntaxKind["CloseBraceToken"] = 16] = "CloseBraceToken";
-        SyntaxKind[SyntaxKind["OpenParenToken"] = 17] = "OpenParenToken";
-        SyntaxKind[SyntaxKind["CloseParenToken"] = 18] = "CloseParenToken";
-        SyntaxKind[SyntaxKind["OpenBracketToken"] = 19] = "OpenBracketToken";
-        SyntaxKind[SyntaxKind["CloseBracketToken"] = 20] = "CloseBracketToken";
-        SyntaxKind[SyntaxKind["DotToken"] = 21] = "DotToken";
-        SyntaxKind[SyntaxKind["DotDotDotToken"] = 22] = "DotDotDotToken";
-        SyntaxKind[SyntaxKind["SemicolonToken"] = 23] = "SemicolonToken";
-        SyntaxKind[SyntaxKind["CommaToken"] = 24] = "CommaToken";
-        SyntaxKind[SyntaxKind["LessThanToken"] = 25] = "LessThanToken";
-        SyntaxKind[SyntaxKind["LessThanSlashToken"] = 26] = "LessThanSlashToken";
-        SyntaxKind[SyntaxKind["GreaterThanToken"] = 27] = "GreaterThanToken";
-        SyntaxKind[SyntaxKind["LessThanEqualsToken"] = 28] = "LessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanEqualsToken"] = 29] = "GreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsToken"] = 30] = "EqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsToken"] = 31] = "ExclamationEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsEqualsEqualsToken"] = 32] = "EqualsEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["ExclamationEqualsEqualsToken"] = 33] = "ExclamationEqualsEqualsToken";
-        SyntaxKind[SyntaxKind["EqualsGreaterThanToken"] = 34] = "EqualsGreaterThanToken";
-        SyntaxKind[SyntaxKind["PlusToken"] = 35] = "PlusToken";
-        SyntaxKind[SyntaxKind["MinusToken"] = 36] = "MinusToken";
-        SyntaxKind[SyntaxKind["AsteriskToken"] = 37] = "AsteriskToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskToken"] = 38] = "AsteriskAsteriskToken";
-        SyntaxKind[SyntaxKind["SlashToken"] = 39] = "SlashToken";
-        SyntaxKind[SyntaxKind["PercentToken"] = 40] = "PercentToken";
-        SyntaxKind[SyntaxKind["PlusPlusToken"] = 41] = "PlusPlusToken";
-        SyntaxKind[SyntaxKind["MinusMinusToken"] = 42] = "MinusMinusToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanToken"] = 43] = "LessThanLessThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanToken"] = 44] = "GreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanToken"] = 45] = "GreaterThanGreaterThanGreaterThanToken";
-        SyntaxKind[SyntaxKind["AmpersandToken"] = 46] = "AmpersandToken";
-        SyntaxKind[SyntaxKind["BarToken"] = 47] = "BarToken";
-        SyntaxKind[SyntaxKind["CaretToken"] = 48] = "CaretToken";
-        SyntaxKind[SyntaxKind["ExclamationToken"] = 49] = "ExclamationToken";
-        SyntaxKind[SyntaxKind["TildeToken"] = 50] = "TildeToken";
-        SyntaxKind[SyntaxKind["AmpersandAmpersandToken"] = 51] = "AmpersandAmpersandToken";
-        SyntaxKind[SyntaxKind["BarBarToken"] = 52] = "BarBarToken";
-        SyntaxKind[SyntaxKind["QuestionToken"] = 53] = "QuestionToken";
-        SyntaxKind[SyntaxKind["ColonToken"] = 54] = "ColonToken";
-        SyntaxKind[SyntaxKind["AtToken"] = 55] = "AtToken";
-        // Assignments
-        SyntaxKind[SyntaxKind["EqualsToken"] = 56] = "EqualsToken";
-        SyntaxKind[SyntaxKind["PlusEqualsToken"] = 57] = "PlusEqualsToken";
-        SyntaxKind[SyntaxKind["MinusEqualsToken"] = 58] = "MinusEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskEqualsToken"] = 59] = "AsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["AsteriskAsteriskEqualsToken"] = 60] = "AsteriskAsteriskEqualsToken";
-        SyntaxKind[SyntaxKind["SlashEqualsToken"] = 61] = "SlashEqualsToken";
-        SyntaxKind[SyntaxKind["PercentEqualsToken"] = 62] = "PercentEqualsToken";
-        SyntaxKind[SyntaxKind["LessThanLessThanEqualsToken"] = 63] = "LessThanLessThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanEqualsToken"] = 64] = "GreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["GreaterThanGreaterThanGreaterThanEqualsToken"] = 65] = "GreaterThanGreaterThanGreaterThanEqualsToken";
-        SyntaxKind[SyntaxKind["AmpersandEqualsToken"] = 66] = "AmpersandEqualsToken";
-        SyntaxKind[SyntaxKind["BarEqualsToken"] = 67] = "BarEqualsToken";
-        SyntaxKind[SyntaxKind["CaretEqualsToken"] = 68] = "CaretEqualsToken";
-        // Identifiers
-        SyntaxKind[SyntaxKind["Identifier"] = 69] = "Identifier";
-        // Reserved words
-        SyntaxKind[SyntaxKind["BreakKeyword"] = 70] = "BreakKeyword";
-        SyntaxKind[SyntaxKind["CaseKeyword"] = 71] = "CaseKeyword";
-        SyntaxKind[SyntaxKind["CatchKeyword"] = 72] = "CatchKeyword";
-        SyntaxKind[SyntaxKind["ClassKeyword"] = 73] = "ClassKeyword";
-        SyntaxKind[SyntaxKind["ConstKeyword"] = 74] = "ConstKeyword";
-        SyntaxKind[SyntaxKind["ContinueKeyword"] = 75] = "ContinueKeyword";
-        SyntaxKind[SyntaxKind["DebuggerKeyword"] = 76] = "DebuggerKeyword";
-        SyntaxKind[SyntaxKind["DefaultKeyword"] = 77] = "DefaultKeyword";
-        SyntaxKind[SyntaxKind["DeleteKeyword"] = 78] = "DeleteKeyword";
-        SyntaxKind[SyntaxKind["DoKeyword"] = 79] = "DoKeyword";
-        SyntaxKind[SyntaxKind["ElseKeyword"] = 80] = "ElseKeyword";
-        SyntaxKind[SyntaxKind["EnumKeyword"] = 81] = "EnumKeyword";
-        SyntaxKind[SyntaxKind["ExportKeyword"] = 82] = "ExportKeyword";
-        SyntaxKind[SyntaxKind["ExtendsKeyword"] = 83] = "ExtendsKeyword";
-        SyntaxKind[SyntaxKind["FalseKeyword"] = 84] = "FalseKeyword";
-        SyntaxKind[SyntaxKind["FinallyKeyword"] = 85] = "FinallyKeyword";
-        SyntaxKind[SyntaxKind["ForKeyword"] = 86] = "ForKeyword";
-        SyntaxKind[SyntaxKind["FunctionKeyword"] = 87] = "FunctionKeyword";
-        SyntaxKind[SyntaxKind["IfKeyword"] = 88] = "IfKeyword";
-        SyntaxKind[SyntaxKind["ImportKeyword"] = 89] = "ImportKeyword";
-        SyntaxKind[SyntaxKind["InKeyword"] = 90] = "InKeyword";
-        SyntaxKind[SyntaxKind["InstanceOfKeyword"] = 91] = "InstanceOfKeyword";
-        SyntaxKind[SyntaxKind["NewKeyword"] = 92] = "NewKeyword";
-        SyntaxKind[SyntaxKind["NullKeyword"] = 93] = "NullKeyword";
-        SyntaxKind[SyntaxKind["ReturnKeyword"] = 94] = "ReturnKeyword";
-        SyntaxKind[SyntaxKind["SuperKeyword"] = 95] = "SuperKeyword";
-        SyntaxKind[SyntaxKind["SwitchKeyword"] = 96] = "SwitchKeyword";
-        SyntaxKind[SyntaxKind["ThisKeyword"] = 97] = "ThisKeyword";
-        SyntaxKind[SyntaxKind["ThrowKeyword"] = 98] = "ThrowKeyword";
-        SyntaxKind[SyntaxKind["TrueKeyword"] = 99] = "TrueKeyword";
-        SyntaxKind[SyntaxKind["TryKeyword"] = 100] = "TryKeyword";
-        SyntaxKind[SyntaxKind["TypeOfKeyword"] = 101] = "TypeOfKeyword";
-        SyntaxKind[SyntaxKind["VarKeyword"] = 102] = "VarKeyword";
-        SyntaxKind[SyntaxKind["VoidKeyword"] = 103] = "VoidKeyword";
-        SyntaxKind[SyntaxKind["WhileKeyword"] = 104] = "WhileKeyword";
-        SyntaxKind[SyntaxKind["WithKeyword"] = 105] = "WithKeyword";
-        // Strict mode reserved words
-        SyntaxKind[SyntaxKind["ImplementsKeyword"] = 106] = "ImplementsKeyword";
-        SyntaxKind[SyntaxKind["InterfaceKeyword"] = 107] = "InterfaceKeyword";
-        SyntaxKind[SyntaxKind["LetKeyword"] = 108] = "LetKeyword";
-        SyntaxKind[SyntaxKind["PackageKeyword"] = 109] = "PackageKeyword";
-        SyntaxKind[SyntaxKind["PrivateKeyword"] = 110] = "PrivateKeyword";
-        SyntaxKind[SyntaxKind["ProtectedKeyword"] = 111] = "ProtectedKeyword";
-        SyntaxKind[SyntaxKind["PublicKeyword"] = 112] = "PublicKeyword";
-        SyntaxKind[SyntaxKind["StaticKeyword"] = 113] = "StaticKeyword";
-        SyntaxKind[SyntaxKind["YieldKeyword"] = 114] = "YieldKeyword";
-        // Contextual keywords
-        SyntaxKind[SyntaxKind["AbstractKeyword"] = 115] = "AbstractKeyword";
-        SyntaxKind[SyntaxKind["AsKeyword"] = 116] = "AsKeyword";
-        SyntaxKind[SyntaxKind["AnyKeyword"] = 117] = "AnyKeyword";
-        SyntaxKind[SyntaxKind["AsyncKeyword"] = 118] = "AsyncKeyword";
-        SyntaxKind[SyntaxKind["AwaitKeyword"] = 119] = "AwaitKeyword";
-        SyntaxKind[SyntaxKind["BooleanKeyword"] = 120] = "BooleanKeyword";
-        SyntaxKind[SyntaxKind["ConstructorKeyword"] = 121] = "ConstructorKeyword";
-        SyntaxKind[SyntaxKind["DeclareKeyword"] = 122] = "DeclareKeyword";
-        SyntaxKind[SyntaxKind["GetKeyword"] = 123] = "GetKeyword";
-        SyntaxKind[SyntaxKind["IsKeyword"] = 124] = "IsKeyword";
-        SyntaxKind[SyntaxKind["ModuleKeyword"] = 125] = "ModuleKeyword";
-        SyntaxKind[SyntaxKind["NamespaceKeyword"] = 126] = "NamespaceKeyword";
-        SyntaxKind[SyntaxKind["NeverKeyword"] = 127] = "NeverKeyword";
-        SyntaxKind[SyntaxKind["ReadonlyKeyword"] = 128] = "ReadonlyKeyword";
-        SyntaxKind[SyntaxKind["RequireKeyword"] = 129] = "RequireKeyword";
-        SyntaxKind[SyntaxKind["NumberKeyword"] = 130] = "NumberKeyword";
-        SyntaxKind[SyntaxKind["SetKeyword"] = 131] = "SetKeyword";
-        SyntaxKind[SyntaxKind["StringKeyword"] = 132] = "StringKeyword";
-        SyntaxKind[SyntaxKind["SymbolKeyword"] = 133] = "SymbolKeyword";
-        SyntaxKind[SyntaxKind["TypeKeyword"] = 134] = "TypeKeyword";
-        SyntaxKind[SyntaxKind["UndefinedKeyword"] = 135] = "UndefinedKeyword";
-        SyntaxKind[SyntaxKind["FromKeyword"] = 136] = "FromKeyword";
-        SyntaxKind[SyntaxKind["GlobalKeyword"] = 137] = "GlobalKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 138] = "OfKeyword";
-        // Parse tree nodes
-        // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 139] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 140] = "ComputedPropertyName";
-        // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 141] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 142] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 143] = "Decorator";
-        // TypeMember
-        SyntaxKind[SyntaxKind["PropertySignature"] = 144] = "PropertySignature";
-        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 145] = "PropertyDeclaration";
-        SyntaxKind[SyntaxKind["MethodSignature"] = 146] = "MethodSignature";
-        SyntaxKind[SyntaxKind["MethodDeclaration"] = 147] = "MethodDeclaration";
-        SyntaxKind[SyntaxKind["Constructor"] = 148] = "Constructor";
-        SyntaxKind[SyntaxKind["GetAccessor"] = 149] = "GetAccessor";
-        SyntaxKind[SyntaxKind["SetAccessor"] = 150] = "SetAccessor";
-        SyntaxKind[SyntaxKind["CallSignature"] = 151] = "CallSignature";
-        SyntaxKind[SyntaxKind["ConstructSignature"] = 152] = "ConstructSignature";
-        SyntaxKind[SyntaxKind["IndexSignature"] = 153] = "IndexSignature";
-        // Type
-        SyntaxKind[SyntaxKind["TypePredicate"] = 154] = "TypePredicate";
-        SyntaxKind[SyntaxKind["TypeReference"] = 155] = "TypeReference";
-        SyntaxKind[SyntaxKind["FunctionType"] = 156] = "FunctionType";
-        SyntaxKind[SyntaxKind["ConstructorType"] = 157] = "ConstructorType";
-        SyntaxKind[SyntaxKind["TypeQuery"] = 158] = "TypeQuery";
-        SyntaxKind[SyntaxKind["TypeLiteral"] = 159] = "TypeLiteral";
-        SyntaxKind[SyntaxKind["ArrayType"] = 160] = "ArrayType";
-        SyntaxKind[SyntaxKind["TupleType"] = 161] = "TupleType";
-        SyntaxKind[SyntaxKind["UnionType"] = 162] = "UnionType";
-        SyntaxKind[SyntaxKind["IntersectionType"] = 163] = "IntersectionType";
-        SyntaxKind[SyntaxKind["ParenthesizedType"] = 164] = "ParenthesizedType";
-        SyntaxKind[SyntaxKind["ThisType"] = 165] = "ThisType";
-        SyntaxKind[SyntaxKind["StringLiteralType"] = 166] = "StringLiteralType";
-        // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 167] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 168] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 169] = "BindingElement";
-        // Expression
-        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 170] = "ArrayLiteralExpression";
-        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 171] = "ObjectLiteralExpression";
-        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 172] = "PropertyAccessExpression";
-        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 173] = "ElementAccessExpression";
-        SyntaxKind[SyntaxKind["CallExpression"] = 174] = "CallExpression";
-        SyntaxKind[SyntaxKind["NewExpression"] = 175] = "NewExpression";
-        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 176] = "TaggedTemplateExpression";
-        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 177] = "TypeAssertionExpression";
-        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 178] = "ParenthesizedExpression";
-        SyntaxKind[SyntaxKind["FunctionExpression"] = 179] = "FunctionExpression";
-        SyntaxKind[SyntaxKind["ArrowFunction"] = 180] = "ArrowFunction";
-        SyntaxKind[SyntaxKind["DeleteExpression"] = 181] = "DeleteExpression";
-        SyntaxKind[SyntaxKind["TypeOfExpression"] = 182] = "TypeOfExpression";
-        SyntaxKind[SyntaxKind["VoidExpression"] = 183] = "VoidExpression";
-        SyntaxKind[SyntaxKind["AwaitExpression"] = 184] = "AwaitExpression";
-        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 185] = "PrefixUnaryExpression";
-        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 186] = "PostfixUnaryExpression";
-        SyntaxKind[SyntaxKind["BinaryExpression"] = 187] = "BinaryExpression";
-        SyntaxKind[SyntaxKind["ConditionalExpression"] = 188] = "ConditionalExpression";
-        SyntaxKind[SyntaxKind["TemplateExpression"] = 189] = "TemplateExpression";
-        SyntaxKind[SyntaxKind["YieldExpression"] = 190] = "YieldExpression";
-        SyntaxKind[SyntaxKind["SpreadElementExpression"] = 191] = "SpreadElementExpression";
-        SyntaxKind[SyntaxKind["ClassExpression"] = 192] = "ClassExpression";
-        SyntaxKind[SyntaxKind["OmittedExpression"] = 193] = "OmittedExpression";
-        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 194] = "ExpressionWithTypeArguments";
-        SyntaxKind[SyntaxKind["AsExpression"] = 195] = "AsExpression";
-        SyntaxKind[SyntaxKind["NonNullExpression"] = 196] = "NonNullExpression";
-        // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 197] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 198] = "SemicolonClassElement";
-        // Element
-        SyntaxKind[SyntaxKind["Block"] = 199] = "Block";
-        SyntaxKind[SyntaxKind["VariableStatement"] = 200] = "VariableStatement";
-        SyntaxKind[SyntaxKind["EmptyStatement"] = 201] = "EmptyStatement";
-        SyntaxKind[SyntaxKind["ExpressionStatement"] = 202] = "ExpressionStatement";
-        SyntaxKind[SyntaxKind["IfStatement"] = 203] = "IfStatement";
-        SyntaxKind[SyntaxKind["DoStatement"] = 204] = "DoStatement";
-        SyntaxKind[SyntaxKind["WhileStatement"] = 205] = "WhileStatement";
-        SyntaxKind[SyntaxKind["ForStatement"] = 206] = "ForStatement";
-        SyntaxKind[SyntaxKind["ForInStatement"] = 207] = "ForInStatement";
-        SyntaxKind[SyntaxKind["ForOfStatement"] = 208] = "ForOfStatement";
-        SyntaxKind[SyntaxKind["ContinueStatement"] = 209] = "ContinueStatement";
-        SyntaxKind[SyntaxKind["BreakStatement"] = 210] = "BreakStatement";
-        SyntaxKind[SyntaxKind["ReturnStatement"] = 211] = "ReturnStatement";
-        SyntaxKind[SyntaxKind["WithStatement"] = 212] = "WithStatement";
-        SyntaxKind[SyntaxKind["SwitchStatement"] = 213] = "SwitchStatement";
-        SyntaxKind[SyntaxKind["LabeledStatement"] = 214] = "LabeledStatement";
-        SyntaxKind[SyntaxKind["ThrowStatement"] = 215] = "ThrowStatement";
-        SyntaxKind[SyntaxKind["TryStatement"] = 216] = "TryStatement";
-        SyntaxKind[SyntaxKind["DebuggerStatement"] = 217] = "DebuggerStatement";
-        SyntaxKind[SyntaxKind["VariableDeclaration"] = 218] = "VariableDeclaration";
-        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 219] = "VariableDeclarationList";
-        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 220] = "FunctionDeclaration";
-        SyntaxKind[SyntaxKind["ClassDeclaration"] = 221] = "ClassDeclaration";
-        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 222] = "InterfaceDeclaration";
-        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 223] = "TypeAliasDeclaration";
-        SyntaxKind[SyntaxKind["EnumDeclaration"] = 224] = "EnumDeclaration";
-        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 225] = "ModuleDeclaration";
-        SyntaxKind[SyntaxKind["ModuleBlock"] = 226] = "ModuleBlock";
-        SyntaxKind[SyntaxKind["CaseBlock"] = 227] = "CaseBlock";
-        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 228] = "NamespaceExportDeclaration";
-        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 229] = "ImportEqualsDeclaration";
-        SyntaxKind[SyntaxKind["ImportDeclaration"] = 230] = "ImportDeclaration";
-        SyntaxKind[SyntaxKind["ImportClause"] = 231] = "ImportClause";
-        SyntaxKind[SyntaxKind["NamespaceImport"] = 232] = "NamespaceImport";
-        SyntaxKind[SyntaxKind["NamedImports"] = 233] = "NamedImports";
-        SyntaxKind[SyntaxKind["ImportSpecifier"] = 234] = "ImportSpecifier";
-        SyntaxKind[SyntaxKind["ExportAssignment"] = 235] = "ExportAssignment";
-        SyntaxKind[SyntaxKind["ExportDeclaration"] = 236] = "ExportDeclaration";
-        SyntaxKind[SyntaxKind["NamedExports"] = 237] = "NamedExports";
-        SyntaxKind[SyntaxKind["ExportSpecifier"] = 238] = "ExportSpecifier";
-        SyntaxKind[SyntaxKind["MissingDeclaration"] = 239] = "MissingDeclaration";
-        // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 240] = "ExternalModuleReference";
-        // JSX
-        SyntaxKind[SyntaxKind["JsxElement"] = 241] = "JsxElement";
-        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 242] = "JsxSelfClosingElement";
-        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 243] = "JsxOpeningElement";
-        SyntaxKind[SyntaxKind["JsxText"] = 244] = "JsxText";
-        SyntaxKind[SyntaxKind["JsxClosingElement"] = 245] = "JsxClosingElement";
-        SyntaxKind[SyntaxKind["JsxAttribute"] = 246] = "JsxAttribute";
-        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 247] = "JsxSpreadAttribute";
-        SyntaxKind[SyntaxKind["JsxExpression"] = 248] = "JsxExpression";
-        // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 249] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 250] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 251] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 252] = "CatchClause";
-        // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 253] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 254] = "ShorthandPropertyAssignment";
-        // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 255] = "EnumMember";
-        // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 256] = "SourceFile";
-        // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 257] = "JSDocTypeExpression";
-        // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 258] = "JSDocAllType";
-        // The ? type
-        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 259] = "JSDocUnknownType";
-        SyntaxKind[SyntaxKind["JSDocArrayType"] = 260] = "JSDocArrayType";
-        SyntaxKind[SyntaxKind["JSDocUnionType"] = 261] = "JSDocUnionType";
-        SyntaxKind[SyntaxKind["JSDocTupleType"] = 262] = "JSDocTupleType";
-        SyntaxKind[SyntaxKind["JSDocNullableType"] = 263] = "JSDocNullableType";
-        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 264] = "JSDocNonNullableType";
-        SyntaxKind[SyntaxKind["JSDocRecordType"] = 265] = "JSDocRecordType";
-        SyntaxKind[SyntaxKind["JSDocRecordMember"] = 266] = "JSDocRecordMember";
-        SyntaxKind[SyntaxKind["JSDocTypeReference"] = 267] = "JSDocTypeReference";
-        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 268] = "JSDocOptionalType";
-        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 269] = "JSDocFunctionType";
-        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 270] = "JSDocVariadicType";
-        SyntaxKind[SyntaxKind["JSDocConstructorType"] = 271] = "JSDocConstructorType";
-        SyntaxKind[SyntaxKind["JSDocThisType"] = 272] = "JSDocThisType";
-        SyntaxKind[SyntaxKind["JSDocComment"] = 273] = "JSDocComment";
-        SyntaxKind[SyntaxKind["JSDocTag"] = 274] = "JSDocTag";
-        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 275] = "JSDocParameterTag";
-        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 276] = "JSDocReturnTag";
-        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 277] = "JSDocTypeTag";
-        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 278] = "JSDocTemplateTag";
-        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 279] = "JSDocTypedefTag";
-        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 280] = "JSDocPropertyTag";
-        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 281] = "JSDocTypeLiteral";
-        // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 282] = "SyntaxList";
-        // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 283] = "Count";
-        // Markers
-        SyntaxKind[SyntaxKind["FirstAssignment"] = 56] = "FirstAssignment";
-        SyntaxKind[SyntaxKind["LastAssignment"] = 68] = "LastAssignment";
-        SyntaxKind[SyntaxKind["FirstReservedWord"] = 70] = "FirstReservedWord";
-        SyntaxKind[SyntaxKind["LastReservedWord"] = 105] = "LastReservedWord";
-        SyntaxKind[SyntaxKind["FirstKeyword"] = 70] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 138] = "LastKeyword";
-        SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 106] = "FirstFutureReservedWord";
-        SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 114] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 154] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 166] = "LastTypeNode";
-        SyntaxKind[SyntaxKind["FirstPunctuation"] = 15] = "FirstPunctuation";
-        SyntaxKind[SyntaxKind["LastPunctuation"] = 68] = "LastPunctuation";
-        SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 138] = "LastToken";
-        SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
-        SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
-        SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
-        SyntaxKind[SyntaxKind["LastLiteralToken"] = 11] = "LastLiteralToken";
-        SyntaxKind[SyntaxKind["FirstTemplateToken"] = 11] = "FirstTemplateToken";
-        SyntaxKind[SyntaxKind["LastTemplateToken"] = 14] = "LastTemplateToken";
-        SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 25] = "FirstBinaryOperator";
-        SyntaxKind[SyntaxKind["LastBinaryOperator"] = 68] = "LastBinaryOperator";
-        SyntaxKind[SyntaxKind["FirstNode"] = 139] = "FirstNode";
-        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 257] = "FirstJSDocNode";
-        SyntaxKind[SyntaxKind["LastJSDocNode"] = 281] = "LastJSDocNode";
-        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 273] = "FirstJSDocTagNode";
-        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 281] = "LastJSDocTagNode";
-    })(ts.SyntaxKind || (ts.SyntaxKind = {}));
-    var SyntaxKind = ts.SyntaxKind;
-    (function (NodeFlags) {
-        NodeFlags[NodeFlags["None"] = 0] = "None";
-        NodeFlags[NodeFlags["Export"] = 1] = "Export";
-        NodeFlags[NodeFlags["Ambient"] = 2] = "Ambient";
-        NodeFlags[NodeFlags["Public"] = 4] = "Public";
-        NodeFlags[NodeFlags["Private"] = 8] = "Private";
-        NodeFlags[NodeFlags["Protected"] = 16] = "Protected";
-        NodeFlags[NodeFlags["Static"] = 32] = "Static";
-        NodeFlags[NodeFlags["Readonly"] = 64] = "Readonly";
-        NodeFlags[NodeFlags["Abstract"] = 128] = "Abstract";
-        NodeFlags[NodeFlags["Async"] = 256] = "Async";
-        NodeFlags[NodeFlags["Default"] = 512] = "Default";
-        NodeFlags[NodeFlags["Let"] = 1024] = "Let";
-        NodeFlags[NodeFlags["Const"] = 2048] = "Const";
-        NodeFlags[NodeFlags["Namespace"] = 4096] = "Namespace";
-        NodeFlags[NodeFlags["ExportContext"] = 8192] = "ExportContext";
-        NodeFlags[NodeFlags["ContainsThis"] = 16384] = "ContainsThis";
-        NodeFlags[NodeFlags["HasImplicitReturn"] = 32768] = "HasImplicitReturn";
-        NodeFlags[NodeFlags["HasExplicitReturn"] = 65536] = "HasExplicitReturn";
-        NodeFlags[NodeFlags["GlobalAugmentation"] = 131072] = "GlobalAugmentation";
-        NodeFlags[NodeFlags["HasClassExtends"] = 262144] = "HasClassExtends";
-        NodeFlags[NodeFlags["HasDecorators"] = 524288] = "HasDecorators";
-        NodeFlags[NodeFlags["HasParamDecorators"] = 1048576] = "HasParamDecorators";
-        NodeFlags[NodeFlags["HasAsyncFunctions"] = 2097152] = "HasAsyncFunctions";
-        NodeFlags[NodeFlags["DisallowInContext"] = 4194304] = "DisallowInContext";
-        NodeFlags[NodeFlags["YieldContext"] = 8388608] = "YieldContext";
-        NodeFlags[NodeFlags["DecoratorContext"] = 16777216] = "DecoratorContext";
-        NodeFlags[NodeFlags["AwaitContext"] = 33554432] = "AwaitContext";
-        NodeFlags[NodeFlags["ThisNodeHasError"] = 67108864] = "ThisNodeHasError";
-        NodeFlags[NodeFlags["JavaScriptFile"] = 134217728] = "JavaScriptFile";
-        NodeFlags[NodeFlags["ThisNodeOrAnySubNodesHasError"] = 268435456] = "ThisNodeOrAnySubNodesHasError";
-        NodeFlags[NodeFlags["HasAggregatedChildData"] = 536870912] = "HasAggregatedChildData";
-        NodeFlags[NodeFlags["HasJsxSpreadAttribute"] = 1073741824] = "HasJsxSpreadAttribute";
-        NodeFlags[NodeFlags["Modifier"] = 1023] = "Modifier";
-        NodeFlags[NodeFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
-        // Accessibility modifiers and 'readonly' can be attached to a parameter in a constructor to make it a property.
-        NodeFlags[NodeFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
-        NodeFlags[NodeFlags["BlockScoped"] = 3072] = "BlockScoped";
-        NodeFlags[NodeFlags["ReachabilityCheckFlags"] = 98304] = "ReachabilityCheckFlags";
-        NodeFlags[NodeFlags["EmitHelperFlags"] = 3932160] = "EmitHelperFlags";
-        NodeFlags[NodeFlags["ReachabilityAndEmitFlags"] = 4030464] = "ReachabilityAndEmitFlags";
-        // Parsing context flags
-        NodeFlags[NodeFlags["ContextFlags"] = 197132288] = "ContextFlags";
-        // Exclude these flags when parsing a Type
-        NodeFlags[NodeFlags["TypeExcludesFlags"] = 41943040] = "TypeExcludesFlags";
-    })(ts.NodeFlags || (ts.NodeFlags = {}));
-    var NodeFlags = ts.NodeFlags;
-    (function (JsxFlags) {
-        JsxFlags[JsxFlags["None"] = 0] = "None";
-        /** An element from a named property of the JSX.IntrinsicElements interface */
-        JsxFlags[JsxFlags["IntrinsicNamedElement"] = 1] = "IntrinsicNamedElement";
-        /** An element inferred from the string index signature of the JSX.IntrinsicElements interface */
-        JsxFlags[JsxFlags["IntrinsicIndexedElement"] = 2] = "IntrinsicIndexedElement";
-        JsxFlags[JsxFlags["IntrinsicElement"] = 3] = "IntrinsicElement";
-    })(ts.JsxFlags || (ts.JsxFlags = {}));
-    var JsxFlags = ts.JsxFlags;
-    /* @internal */
-    (function (RelationComparisonResult) {
-        RelationComparisonResult[RelationComparisonResult["Succeeded"] = 1] = "Succeeded";
-        RelationComparisonResult[RelationComparisonResult["Failed"] = 2] = "Failed";
-        RelationComparisonResult[RelationComparisonResult["FailedAndReported"] = 3] = "FailedAndReported";
-    })(ts.RelationComparisonResult || (ts.RelationComparisonResult = {}));
-    var RelationComparisonResult = ts.RelationComparisonResult;
-    (function (FlowFlags) {
-        FlowFlags[FlowFlags["Unreachable"] = 1] = "Unreachable";
-        FlowFlags[FlowFlags["Start"] = 2] = "Start";
-        FlowFlags[FlowFlags["BranchLabel"] = 4] = "BranchLabel";
-        FlowFlags[FlowFlags["LoopLabel"] = 8] = "LoopLabel";
-        FlowFlags[FlowFlags["Assignment"] = 16] = "Assignment";
-        FlowFlags[FlowFlags["TrueCondition"] = 32] = "TrueCondition";
-        FlowFlags[FlowFlags["FalseCondition"] = 64] = "FalseCondition";
-        FlowFlags[FlowFlags["SwitchClause"] = 128] = "SwitchClause";
-        FlowFlags[FlowFlags["Referenced"] = 256] = "Referenced";
-        FlowFlags[FlowFlags["Shared"] = 512] = "Shared";
-        FlowFlags[FlowFlags["Label"] = 12] = "Label";
-        FlowFlags[FlowFlags["Condition"] = 96] = "Condition";
-    })(ts.FlowFlags || (ts.FlowFlags = {}));
-    var FlowFlags = ts.FlowFlags;
-    var OperationCanceledException = (function () {
-        function OperationCanceledException() {
-        }
-        return OperationCanceledException;
-    }());
-    ts.OperationCanceledException = OperationCanceledException;
-    /** Return code used by getEmitOutput function to indicate status of the function */
-    (function (ExitStatus) {
-        // Compiler ran successfully.  Either this was a simple do-nothing compilation (for example,
-        // when -version or -help was provided, or this was a normal compilation, no diagnostics
-        // were produced, and all outputs were generated successfully.
-        ExitStatus[ExitStatus["Success"] = 0] = "Success";
-        // Diagnostics were produced and because of them no code was generated.
-        ExitStatus[ExitStatus["DiagnosticsPresent_OutputsSkipped"] = 1] = "DiagnosticsPresent_OutputsSkipped";
-        // Diagnostics were produced and outputs were generated in spite of them.
-        ExitStatus[ExitStatus["DiagnosticsPresent_OutputsGenerated"] = 2] = "DiagnosticsPresent_OutputsGenerated";
-    })(ts.ExitStatus || (ts.ExitStatus = {}));
-    var ExitStatus = ts.ExitStatus;
-    (function (TypeFormatFlags) {
-        TypeFormatFlags[TypeFormatFlags["None"] = 0] = "None";
-        TypeFormatFlags[TypeFormatFlags["WriteArrayAsGenericType"] = 1] = "WriteArrayAsGenericType";
-        TypeFormatFlags[TypeFormatFlags["UseTypeOfFunction"] = 2] = "UseTypeOfFunction";
-        TypeFormatFlags[TypeFormatFlags["NoTruncation"] = 4] = "NoTruncation";
-        TypeFormatFlags[TypeFormatFlags["WriteArrowStyleSignature"] = 8] = "WriteArrowStyleSignature";
-        TypeFormatFlags[TypeFormatFlags["WriteOwnNameForAnyLike"] = 16] = "WriteOwnNameForAnyLike";
-        TypeFormatFlags[TypeFormatFlags["WriteTypeArgumentsOfSignature"] = 32] = "WriteTypeArgumentsOfSignature";
-        TypeFormatFlags[TypeFormatFlags["InElementType"] = 64] = "InElementType";
-        TypeFormatFlags[TypeFormatFlags["UseFullyQualifiedType"] = 128] = "UseFullyQualifiedType";
-        TypeFormatFlags[TypeFormatFlags["InFirstTypeArgument"] = 256] = "InFirstTypeArgument";
-    })(ts.TypeFormatFlags || (ts.TypeFormatFlags = {}));
-    var TypeFormatFlags = ts.TypeFormatFlags;
-    (function (SymbolFormatFlags) {
-        SymbolFormatFlags[SymbolFormatFlags["None"] = 0] = "None";
-        // Write symbols's type argument if it is instantiated symbol
-        // eg. class C<T> { p: T }   <-- Show p as C<T>.p here
-        //     var a: C<number>;
-        //     var p = a.p;  <--- Here p is property of C<number> so show it as C<number>.p instead of just C.p
-        SymbolFormatFlags[SymbolFormatFlags["WriteTypeParametersOrArguments"] = 1] = "WriteTypeParametersOrArguments";
-        // Use only external alias information to get the symbol name in the given context
-        // eg.  module m { export class c { } } import x = m.c;
-        // When this flag is specified m.c will be used to refer to the class instead of alias symbol x
-        SymbolFormatFlags[SymbolFormatFlags["UseOnlyExternalAliasing"] = 2] = "UseOnlyExternalAliasing";
-    })(ts.SymbolFormatFlags || (ts.SymbolFormatFlags = {}));
-    var SymbolFormatFlags = ts.SymbolFormatFlags;
-    /* @internal */
-    (function (SymbolAccessibility) {
-        SymbolAccessibility[SymbolAccessibility["Accessible"] = 0] = "Accessible";
-        SymbolAccessibility[SymbolAccessibility["NotAccessible"] = 1] = "NotAccessible";
-        SymbolAccessibility[SymbolAccessibility["CannotBeNamed"] = 2] = "CannotBeNamed";
-    })(ts.SymbolAccessibility || (ts.SymbolAccessibility = {}));
-    var SymbolAccessibility = ts.SymbolAccessibility;
-    (function (TypePredicateKind) {
-        TypePredicateKind[TypePredicateKind["This"] = 0] = "This";
-        TypePredicateKind[TypePredicateKind["Identifier"] = 1] = "Identifier";
-    })(ts.TypePredicateKind || (ts.TypePredicateKind = {}));
-    var TypePredicateKind = ts.TypePredicateKind;
-    /** Indicates how to serialize the name for a TypeReferenceNode when emitting decorator
-      * metadata */
-    /* @internal */
-    (function (TypeReferenceSerializationKind) {
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["Unknown"] = 0] = "Unknown";
-        // should be emitted using a safe fallback.
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithConstructSignatureAndValue"] = 1] = "TypeWithConstructSignatureAndValue";
-        // function that can be reached at runtime (e.g. a `class`
-        // declaration or a `var` declaration for the static side
-        // of a type, such as the global `Promise` type in lib.d.ts).
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["VoidType"] = 2] = "VoidType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["NumberLikeType"] = 3] = "NumberLikeType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["StringLikeType"] = 4] = "StringLikeType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["BooleanType"] = 5] = "BooleanType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ArrayLikeType"] = 6] = "ArrayLikeType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ESSymbolType"] = 7] = "ESSymbolType";
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["TypeWithCallSignature"] = 8] = "TypeWithCallSignature";
-        // with call signatures.
-        TypeReferenceSerializationKind[TypeReferenceSerializationKind["ObjectType"] = 9] = "ObjectType";
-    })(ts.TypeReferenceSerializationKind || (ts.TypeReferenceSerializationKind = {}));
-    var TypeReferenceSerializationKind = ts.TypeReferenceSerializationKind;
-    (function (SymbolFlags) {
-        SymbolFlags[SymbolFlags["None"] = 0] = "None";
-        SymbolFlags[SymbolFlags["FunctionScopedVariable"] = 1] = "FunctionScopedVariable";
-        SymbolFlags[SymbolFlags["BlockScopedVariable"] = 2] = "BlockScopedVariable";
-        SymbolFlags[SymbolFlags["Property"] = 4] = "Property";
-        SymbolFlags[SymbolFlags["EnumMember"] = 8] = "EnumMember";
-        SymbolFlags[SymbolFlags["Function"] = 16] = "Function";
-        SymbolFlags[SymbolFlags["Class"] = 32] = "Class";
-        SymbolFlags[SymbolFlags["Interface"] = 64] = "Interface";
-        SymbolFlags[SymbolFlags["ConstEnum"] = 128] = "ConstEnum";
-        SymbolFlags[SymbolFlags["RegularEnum"] = 256] = "RegularEnum";
-        SymbolFlags[SymbolFlags["ValueModule"] = 512] = "ValueModule";
-        SymbolFlags[SymbolFlags["NamespaceModule"] = 1024] = "NamespaceModule";
-        SymbolFlags[SymbolFlags["TypeLiteral"] = 2048] = "TypeLiteral";
-        SymbolFlags[SymbolFlags["ObjectLiteral"] = 4096] = "ObjectLiteral";
-        SymbolFlags[SymbolFlags["Method"] = 8192] = "Method";
-        SymbolFlags[SymbolFlags["Constructor"] = 16384] = "Constructor";
-        SymbolFlags[SymbolFlags["GetAccessor"] = 32768] = "GetAccessor";
-        SymbolFlags[SymbolFlags["SetAccessor"] = 65536] = "SetAccessor";
-        SymbolFlags[SymbolFlags["Signature"] = 131072] = "Signature";
-        SymbolFlags[SymbolFlags["TypeParameter"] = 262144] = "TypeParameter";
-        SymbolFlags[SymbolFlags["TypeAlias"] = 524288] = "TypeAlias";
-        SymbolFlags[SymbolFlags["ExportValue"] = 1048576] = "ExportValue";
-        SymbolFlags[SymbolFlags["ExportType"] = 2097152] = "ExportType";
-        SymbolFlags[SymbolFlags["ExportNamespace"] = 4194304] = "ExportNamespace";
-        SymbolFlags[SymbolFlags["Alias"] = 8388608] = "Alias";
-        SymbolFlags[SymbolFlags["Instantiated"] = 16777216] = "Instantiated";
-        SymbolFlags[SymbolFlags["Merged"] = 33554432] = "Merged";
-        SymbolFlags[SymbolFlags["Transient"] = 67108864] = "Transient";
-        SymbolFlags[SymbolFlags["Prototype"] = 134217728] = "Prototype";
-        SymbolFlags[SymbolFlags["SyntheticProperty"] = 268435456] = "SyntheticProperty";
-        SymbolFlags[SymbolFlags["Optional"] = 536870912] = "Optional";
-        SymbolFlags[SymbolFlags["ExportStar"] = 1073741824] = "ExportStar";
-        SymbolFlags[SymbolFlags["Enum"] = 384] = "Enum";
-        SymbolFlags[SymbolFlags["Variable"] = 3] = "Variable";
-        SymbolFlags[SymbolFlags["Value"] = 107455] = "Value";
-        SymbolFlags[SymbolFlags["Type"] = 793056] = "Type";
-        SymbolFlags[SymbolFlags["Namespace"] = 1536] = "Namespace";
-        SymbolFlags[SymbolFlags["Module"] = 1536] = "Module";
-        SymbolFlags[SymbolFlags["Accessor"] = 98304] = "Accessor";
-        // Variables can be redeclared, but can not redeclare a block-scoped declaration with the
-        // same name, or any other value that is not a variable, e.g. ValueModule or Class
-        SymbolFlags[SymbolFlags["FunctionScopedVariableExcludes"] = 107454] = "FunctionScopedVariableExcludes";
-        // Block-scoped declarations are not allowed to be re-declared
-        // they can not merge with anything in the value space
-        SymbolFlags[SymbolFlags["BlockScopedVariableExcludes"] = 107455] = "BlockScopedVariableExcludes";
-        SymbolFlags[SymbolFlags["ParameterExcludes"] = 107455] = "ParameterExcludes";
-        SymbolFlags[SymbolFlags["PropertyExcludes"] = 0] = "PropertyExcludes";
-        SymbolFlags[SymbolFlags["EnumMemberExcludes"] = 107455] = "EnumMemberExcludes";
-        SymbolFlags[SymbolFlags["FunctionExcludes"] = 106927] = "FunctionExcludes";
-        SymbolFlags[SymbolFlags["ClassExcludes"] = 899519] = "ClassExcludes";
-        SymbolFlags[SymbolFlags["InterfaceExcludes"] = 792960] = "InterfaceExcludes";
-        SymbolFlags[SymbolFlags["RegularEnumExcludes"] = 899327] = "RegularEnumExcludes";
-        SymbolFlags[SymbolFlags["ConstEnumExcludes"] = 899967] = "ConstEnumExcludes";
-        SymbolFlags[SymbolFlags["ValueModuleExcludes"] = 106639] = "ValueModuleExcludes";
-        SymbolFlags[SymbolFlags["NamespaceModuleExcludes"] = 0] = "NamespaceModuleExcludes";
-        SymbolFlags[SymbolFlags["MethodExcludes"] = 99263] = "MethodExcludes";
-        SymbolFlags[SymbolFlags["GetAccessorExcludes"] = 41919] = "GetAccessorExcludes";
-        SymbolFlags[SymbolFlags["SetAccessorExcludes"] = 74687] = "SetAccessorExcludes";
-        SymbolFlags[SymbolFlags["TypeParameterExcludes"] = 530912] = "TypeParameterExcludes";
-        SymbolFlags[SymbolFlags["TypeAliasExcludes"] = 793056] = "TypeAliasExcludes";
-        SymbolFlags[SymbolFlags["AliasExcludes"] = 8388608] = "AliasExcludes";
-        SymbolFlags[SymbolFlags["ModuleMember"] = 8914931] = "ModuleMember";
-        SymbolFlags[SymbolFlags["ExportHasLocal"] = 944] = "ExportHasLocal";
-        SymbolFlags[SymbolFlags["HasExports"] = 1952] = "HasExports";
-        SymbolFlags[SymbolFlags["HasMembers"] = 6240] = "HasMembers";
-        SymbolFlags[SymbolFlags["BlockScoped"] = 418] = "BlockScoped";
-        SymbolFlags[SymbolFlags["PropertyOrAccessor"] = 98308] = "PropertyOrAccessor";
-        SymbolFlags[SymbolFlags["Export"] = 7340032] = "Export";
-        SymbolFlags[SymbolFlags["ClassMember"] = 106500] = "ClassMember";
-        /* @internal */
-        // The set of things we consider semantically classifiable.  Used to speed up the LS during
-        // classification.
-        SymbolFlags[SymbolFlags["Classifiable"] = 788448] = "Classifiable";
-    })(ts.SymbolFlags || (ts.SymbolFlags = {}));
-    var SymbolFlags = ts.SymbolFlags;
-    /* @internal */
-    (function (NodeCheckFlags) {
-        NodeCheckFlags[NodeCheckFlags["TypeChecked"] = 1] = "TypeChecked";
-        NodeCheckFlags[NodeCheckFlags["LexicalThis"] = 2] = "LexicalThis";
-        NodeCheckFlags[NodeCheckFlags["CaptureThis"] = 4] = "CaptureThis";
-        NodeCheckFlags[NodeCheckFlags["SuperInstance"] = 256] = "SuperInstance";
-        NodeCheckFlags[NodeCheckFlags["SuperStatic"] = 512] = "SuperStatic";
-        NodeCheckFlags[NodeCheckFlags["ContextChecked"] = 1024] = "ContextChecked";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuper"] = 2048] = "AsyncMethodWithSuper";
-        NodeCheckFlags[NodeCheckFlags["AsyncMethodWithSuperBinding"] = 4096] = "AsyncMethodWithSuperBinding";
-        NodeCheckFlags[NodeCheckFlags["CaptureArguments"] = 8192] = "CaptureArguments";
-        NodeCheckFlags[NodeCheckFlags["EnumValuesComputed"] = 16384] = "EnumValuesComputed";
-        NodeCheckFlags[NodeCheckFlags["LexicalModuleMergesWithClass"] = 32768] = "LexicalModuleMergesWithClass";
-        NodeCheckFlags[NodeCheckFlags["LoopWithCapturedBlockScopedBinding"] = 65536] = "LoopWithCapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["CapturedBlockScopedBinding"] = 131072] = "CapturedBlockScopedBinding";
-        NodeCheckFlags[NodeCheckFlags["BlockScopedBindingInLoop"] = 262144] = "BlockScopedBindingInLoop";
-        NodeCheckFlags[NodeCheckFlags["ClassWithBodyScopedClassBinding"] = 524288] = "ClassWithBodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["BodyScopedClassBinding"] = 1048576] = "BodyScopedClassBinding";
-        NodeCheckFlags[NodeCheckFlags["NeedsLoopOutParameter"] = 2097152] = "NeedsLoopOutParameter";
-    })(ts.NodeCheckFlags || (ts.NodeCheckFlags = {}));
-    var NodeCheckFlags = ts.NodeCheckFlags;
-    (function (TypeFlags) {
-        TypeFlags[TypeFlags["Any"] = 1] = "Any";
-        TypeFlags[TypeFlags["String"] = 2] = "String";
-        TypeFlags[TypeFlags["Number"] = 4] = "Number";
-        TypeFlags[TypeFlags["Boolean"] = 8] = "Boolean";
-        TypeFlags[TypeFlags["Void"] = 16] = "Void";
-        TypeFlags[TypeFlags["Undefined"] = 32] = "Undefined";
-        TypeFlags[TypeFlags["Null"] = 64] = "Null";
-        TypeFlags[TypeFlags["Enum"] = 128] = "Enum";
-        TypeFlags[TypeFlags["StringLiteral"] = 256] = "StringLiteral";
-        TypeFlags[TypeFlags["TypeParameter"] = 512] = "TypeParameter";
-        TypeFlags[TypeFlags["Class"] = 1024] = "Class";
-        TypeFlags[TypeFlags["Interface"] = 2048] = "Interface";
-        TypeFlags[TypeFlags["Reference"] = 4096] = "Reference";
-        TypeFlags[TypeFlags["Tuple"] = 8192] = "Tuple";
-        TypeFlags[TypeFlags["Union"] = 16384] = "Union";
-        TypeFlags[TypeFlags["Intersection"] = 32768] = "Intersection";
-        TypeFlags[TypeFlags["Anonymous"] = 65536] = "Anonymous";
-        TypeFlags[TypeFlags["Instantiated"] = 131072] = "Instantiated";
-        /* @internal */
-        TypeFlags[TypeFlags["FromSignature"] = 262144] = "FromSignature";
-        TypeFlags[TypeFlags["ObjectLiteral"] = 524288] = "ObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["FreshObjectLiteral"] = 1048576] = "FreshObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsWideningType"] = 2097152] = "ContainsWideningType";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsObjectLiteral"] = 4194304] = "ContainsObjectLiteral";
-        /* @internal */
-        TypeFlags[TypeFlags["ContainsAnyFunctionType"] = 8388608] = "ContainsAnyFunctionType";
-        TypeFlags[TypeFlags["ESSymbol"] = 16777216] = "ESSymbol";
-        TypeFlags[TypeFlags["ThisType"] = 33554432] = "ThisType";
-        TypeFlags[TypeFlags["ObjectLiteralPatternWithComputedProperties"] = 67108864] = "ObjectLiteralPatternWithComputedProperties";
-        TypeFlags[TypeFlags["Never"] = 134217728] = "Never";
-        /* @internal */
-        TypeFlags[TypeFlags["Nullable"] = 96] = "Nullable";
-        /* @internal */
-        TypeFlags[TypeFlags["Falsy"] = 112] = "Falsy";
-        /* @internal */
-        TypeFlags[TypeFlags["Intrinsic"] = 150995071] = "Intrinsic";
-        /* @internal */
-        TypeFlags[TypeFlags["Primitive"] = 16777726] = "Primitive";
-        TypeFlags[TypeFlags["StringLike"] = 258] = "StringLike";
-        TypeFlags[TypeFlags["NumberLike"] = 132] = "NumberLike";
-        TypeFlags[TypeFlags["ObjectType"] = 80896] = "ObjectType";
-        TypeFlags[TypeFlags["UnionOrIntersection"] = 49152] = "UnionOrIntersection";
-        TypeFlags[TypeFlags["StructuredType"] = 130048] = "StructuredType";
-        // 'Narrowable' types are types where narrowing actually narrows.
-        // This *should* be every type other than null, undefined, void, and never
-        TypeFlags[TypeFlags["Narrowable"] = 16908175] = "Narrowable";
-        /* @internal */
-        TypeFlags[TypeFlags["RequiresWidening"] = 6291456] = "RequiresWidening";
-        /* @internal */
-        TypeFlags[TypeFlags["PropagatingFlags"] = 14680064] = "PropagatingFlags";
-    })(ts.TypeFlags || (ts.TypeFlags = {}));
-    var TypeFlags = ts.TypeFlags;
-    (function (SignatureKind) {
-        SignatureKind[SignatureKind["Call"] = 0] = "Call";
-        SignatureKind[SignatureKind["Construct"] = 1] = "Construct";
-    })(ts.SignatureKind || (ts.SignatureKind = {}));
-    var SignatureKind = ts.SignatureKind;
-    (function (IndexKind) {
-        IndexKind[IndexKind["String"] = 0] = "String";
-        IndexKind[IndexKind["Number"] = 1] = "Number";
-    })(ts.IndexKind || (ts.IndexKind = {}));
-    var IndexKind = ts.IndexKind;
-    /* @internal */
-    (function (SpecialPropertyAssignmentKind) {
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["None"] = 0] = "None";
-        /// exports.name = expr
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ExportsProperty"] = 1] = "ExportsProperty";
-        /// module.exports = expr
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ModuleExports"] = 2] = "ModuleExports";
-        /// className.prototype.name = expr
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["PrototypeProperty"] = 3] = "PrototypeProperty";
-        /// this.name = expr
-        SpecialPropertyAssignmentKind[SpecialPropertyAssignmentKind["ThisProperty"] = 4] = "ThisProperty";
-    })(ts.SpecialPropertyAssignmentKind || (ts.SpecialPropertyAssignmentKind = {}));
-    var SpecialPropertyAssignmentKind = ts.SpecialPropertyAssignmentKind;
-    (function (DiagnosticCategory) {
-        DiagnosticCategory[DiagnosticCategory["Warning"] = 0] = "Warning";
-        DiagnosticCategory[DiagnosticCategory["Error"] = 1] = "Error";
-        DiagnosticCategory[DiagnosticCategory["Message"] = 2] = "Message";
-    })(ts.DiagnosticCategory || (ts.DiagnosticCategory = {}));
-    var DiagnosticCategory = ts.DiagnosticCategory;
-    (function (ModuleResolutionKind) {
-        ModuleResolutionKind[ModuleResolutionKind["Classic"] = 1] = "Classic";
-        ModuleResolutionKind[ModuleResolutionKind["NodeJs"] = 2] = "NodeJs";
-    })(ts.ModuleResolutionKind || (ts.ModuleResolutionKind = {}));
-    var ModuleResolutionKind = ts.ModuleResolutionKind;
-    (function (ModuleKind) {
-        ModuleKind[ModuleKind["None"] = 0] = "None";
-        ModuleKind[ModuleKind["CommonJS"] = 1] = "CommonJS";
-        ModuleKind[ModuleKind["AMD"] = 2] = "AMD";
-        ModuleKind[ModuleKind["UMD"] = 3] = "UMD";
-        ModuleKind[ModuleKind["System"] = 4] = "System";
-        ModuleKind[ModuleKind["ES6"] = 5] = "ES6";
-        ModuleKind[ModuleKind["ES2015"] = 5] = "ES2015";
-    })(ts.ModuleKind || (ts.ModuleKind = {}));
-    var ModuleKind = ts.ModuleKind;
-    (function (JsxEmit) {
-        JsxEmit[JsxEmit["None"] = 0] = "None";
-        JsxEmit[JsxEmit["Preserve"] = 1] = "Preserve";
-        JsxEmit[JsxEmit["React"] = 2] = "React";
-    })(ts.JsxEmit || (ts.JsxEmit = {}));
-    var JsxEmit = ts.JsxEmit;
-    (function (NewLineKind) {
-        NewLineKind[NewLineKind["CarriageReturnLineFeed"] = 0] = "CarriageReturnLineFeed";
-        NewLineKind[NewLineKind["LineFeed"] = 1] = "LineFeed";
-    })(ts.NewLineKind || (ts.NewLineKind = {}));
-    var NewLineKind = ts.NewLineKind;
-    (function (ScriptKind) {
-        ScriptKind[ScriptKind["Unknown"] = 0] = "Unknown";
-        ScriptKind[ScriptKind["JS"] = 1] = "JS";
-        ScriptKind[ScriptKind["JSX"] = 2] = "JSX";
-        ScriptKind[ScriptKind["TS"] = 3] = "TS";
-        ScriptKind[ScriptKind["TSX"] = 4] = "TSX";
-    })(ts.ScriptKind || (ts.ScriptKind = {}));
-    var ScriptKind = ts.ScriptKind;
-    (function (ScriptTarget) {
-        ScriptTarget[ScriptTarget["ES3"] = 0] = "ES3";
-        ScriptTarget[ScriptTarget["ES5"] = 1] = "ES5";
-        ScriptTarget[ScriptTarget["ES6"] = 2] = "ES6";
-        ScriptTarget[ScriptTarget["ES2015"] = 2] = "ES2015";
-        ScriptTarget[ScriptTarget["Latest"] = 2] = "Latest";
-    })(ts.ScriptTarget || (ts.ScriptTarget = {}));
-    var ScriptTarget = ts.ScriptTarget;
-    (function (LanguageVariant) {
-        LanguageVariant[LanguageVariant["Standard"] = 0] = "Standard";
-        LanguageVariant[LanguageVariant["JSX"] = 1] = "JSX";
-    })(ts.LanguageVariant || (ts.LanguageVariant = {}));
-    var LanguageVariant = ts.LanguageVariant;
-    /* @internal */
-    (function (DiagnosticStyle) {
-        DiagnosticStyle[DiagnosticStyle["Simple"] = 0] = "Simple";
-        DiagnosticStyle[DiagnosticStyle["Pretty"] = 1] = "Pretty";
-    })(ts.DiagnosticStyle || (ts.DiagnosticStyle = {}));
-    var DiagnosticStyle = ts.DiagnosticStyle;
-    (function (WatchDirectoryFlags) {
-        WatchDirectoryFlags[WatchDirectoryFlags["None"] = 0] = "None";
-        WatchDirectoryFlags[WatchDirectoryFlags["Recursive"] = 1] = "Recursive";
-    })(ts.WatchDirectoryFlags || (ts.WatchDirectoryFlags = {}));
-    var WatchDirectoryFlags = ts.WatchDirectoryFlags;
-    /* @internal */
-    (function (CharacterCodes) {
-        CharacterCodes[CharacterCodes["nullCharacter"] = 0] = "nullCharacter";
-        CharacterCodes[CharacterCodes["maxAsciiCharacter"] = 127] = "maxAsciiCharacter";
-        CharacterCodes[CharacterCodes["lineFeed"] = 10] = "lineFeed";
-        CharacterCodes[CharacterCodes["carriageReturn"] = 13] = "carriageReturn";
-        CharacterCodes[CharacterCodes["lineSeparator"] = 8232] = "lineSeparator";
-        CharacterCodes[CharacterCodes["paragraphSeparator"] = 8233] = "paragraphSeparator";
-        CharacterCodes[CharacterCodes["nextLine"] = 133] = "nextLine";
-        // Unicode 3.0 space characters
-        CharacterCodes[CharacterCodes["space"] = 32] = "space";
-        CharacterCodes[CharacterCodes["nonBreakingSpace"] = 160] = "nonBreakingSpace";
-        CharacterCodes[CharacterCodes["enQuad"] = 8192] = "enQuad";
-        CharacterCodes[CharacterCodes["emQuad"] = 8193] = "emQuad";
-        CharacterCodes[CharacterCodes["enSpace"] = 8194] = "enSpace";
-        CharacterCodes[CharacterCodes["emSpace"] = 8195] = "emSpace";
-        CharacterCodes[CharacterCodes["threePerEmSpace"] = 8196] = "threePerEmSpace";
-        CharacterCodes[CharacterCodes["fourPerEmSpace"] = 8197] = "fourPerEmSpace";
-        CharacterCodes[CharacterCodes["sixPerEmSpace"] = 8198] = "sixPerEmSpace";
-        CharacterCodes[CharacterCodes["figureSpace"] = 8199] = "figureSpace";
-        CharacterCodes[CharacterCodes["punctuationSpace"] = 8200] = "punctuationSpace";
-        CharacterCodes[CharacterCodes["thinSpace"] = 8201] = "thinSpace";
-        CharacterCodes[CharacterCodes["hairSpace"] = 8202] = "hairSpace";
-        CharacterCodes[CharacterCodes["zeroWidthSpace"] = 8203] = "zeroWidthSpace";
-        CharacterCodes[CharacterCodes["narrowNoBreakSpace"] = 8239] = "narrowNoBreakSpace";
-        CharacterCodes[CharacterCodes["ideographicSpace"] = 12288] = "ideographicSpace";
-        CharacterCodes[CharacterCodes["mathematicalSpace"] = 8287] = "mathematicalSpace";
-        CharacterCodes[CharacterCodes["ogham"] = 5760] = "ogham";
-        CharacterCodes[CharacterCodes["_"] = 95] = "_";
-        CharacterCodes[CharacterCodes["$"] = 36] = "$";
-        CharacterCodes[CharacterCodes["_0"] = 48] = "_0";
-        CharacterCodes[CharacterCodes["_1"] = 49] = "_1";
-        CharacterCodes[CharacterCodes["_2"] = 50] = "_2";
-        CharacterCodes[CharacterCodes["_3"] = 51] = "_3";
-        CharacterCodes[CharacterCodes["_4"] = 52] = "_4";
-        CharacterCodes[CharacterCodes["_5"] = 53] = "_5";
-        CharacterCodes[CharacterCodes["_6"] = 54] = "_6";
-        CharacterCodes[CharacterCodes["_7"] = 55] = "_7";
-        CharacterCodes[CharacterCodes["_8"] = 56] = "_8";
-        CharacterCodes[CharacterCodes["_9"] = 57] = "_9";
-        CharacterCodes[CharacterCodes["a"] = 97] = "a";
-        CharacterCodes[CharacterCodes["b"] = 98] = "b";
-        CharacterCodes[CharacterCodes["c"] = 99] = "c";
-        CharacterCodes[CharacterCodes["d"] = 100] = "d";
-        CharacterCodes[CharacterCodes["e"] = 101] = "e";
-        CharacterCodes[CharacterCodes["f"] = 102] = "f";
-        CharacterCodes[CharacterCodes["g"] = 103] = "g";
-        CharacterCodes[CharacterCodes["h"] = 104] = "h";
-        CharacterCodes[CharacterCodes["i"] = 105] = "i";
-        CharacterCodes[CharacterCodes["j"] = 106] = "j";
-        CharacterCodes[CharacterCodes["k"] = 107] = "k";
-        CharacterCodes[CharacterCodes["l"] = 108] = "l";
-        CharacterCodes[CharacterCodes["m"] = 109] = "m";
-        CharacterCodes[CharacterCodes["n"] = 110] = "n";
-        CharacterCodes[CharacterCodes["o"] = 111] = "o";
-        CharacterCodes[CharacterCodes["p"] = 112] = "p";
-        CharacterCodes[CharacterCodes["q"] = 113] = "q";
-        CharacterCodes[CharacterCodes["r"] = 114] = "r";
-        CharacterCodes[CharacterCodes["s"] = 115] = "s";
-        CharacterCodes[CharacterCodes["t"] = 116] = "t";
-        CharacterCodes[CharacterCodes["u"] = 117] = "u";
-        CharacterCodes[CharacterCodes["v"] = 118] = "v";
-        CharacterCodes[CharacterCodes["w"] = 119] = "w";
-        CharacterCodes[CharacterCodes["x"] = 120] = "x";
-        CharacterCodes[CharacterCodes["y"] = 121] = "y";
-        CharacterCodes[CharacterCodes["z"] = 122] = "z";
-        CharacterCodes[CharacterCodes["A"] = 65] = "A";
-        CharacterCodes[CharacterCodes["B"] = 66] = "B";
-        CharacterCodes[CharacterCodes["C"] = 67] = "C";
-        CharacterCodes[CharacterCodes["D"] = 68] = "D";
-        CharacterCodes[CharacterCodes["E"] = 69] = "E";
-        CharacterCodes[CharacterCodes["F"] = 70] = "F";
-        CharacterCodes[CharacterCodes["G"] = 71] = "G";
-        CharacterCodes[CharacterCodes["H"] = 72] = "H";
-        CharacterCodes[CharacterCodes["I"] = 73] = "I";
-        CharacterCodes[CharacterCodes["J"] = 74] = "J";
-        CharacterCodes[CharacterCodes["K"] = 75] = "K";
-        CharacterCodes[CharacterCodes["L"] = 76] = "L";
-        CharacterCodes[CharacterCodes["M"] = 77] = "M";
-        CharacterCodes[CharacterCodes["N"] = 78] = "N";
-        CharacterCodes[CharacterCodes["O"] = 79] = "O";
-        CharacterCodes[CharacterCodes["P"] = 80] = "P";
-        CharacterCodes[CharacterCodes["Q"] = 81] = "Q";
-        CharacterCodes[CharacterCodes["R"] = 82] = "R";
-        CharacterCodes[CharacterCodes["S"] = 83] = "S";
-        CharacterCodes[CharacterCodes["T"] = 84] = "T";
-        CharacterCodes[CharacterCodes["U"] = 85] = "U";
-        CharacterCodes[CharacterCodes["V"] = 86] = "V";
-        CharacterCodes[CharacterCodes["W"] = 87] = "W";
-        CharacterCodes[CharacterCodes["X"] = 88] = "X";
-        CharacterCodes[CharacterCodes["Y"] = 89] = "Y";
-        CharacterCodes[CharacterCodes["Z"] = 90] = "Z";
-        CharacterCodes[CharacterCodes["ampersand"] = 38] = "ampersand";
-        CharacterCodes[CharacterCodes["asterisk"] = 42] = "asterisk";
-        CharacterCodes[CharacterCodes["at"] = 64] = "at";
-        CharacterCodes[CharacterCodes["backslash"] = 92] = "backslash";
-        CharacterCodes[CharacterCodes["backtick"] = 96] = "backtick";
-        CharacterCodes[CharacterCodes["bar"] = 124] = "bar";
-        CharacterCodes[CharacterCodes["caret"] = 94] = "caret";
-        CharacterCodes[CharacterCodes["closeBrace"] = 125] = "closeBrace";
-        CharacterCodes[CharacterCodes["closeBracket"] = 93] = "closeBracket";
-        CharacterCodes[CharacterCodes["closeParen"] = 41] = "closeParen";
-        CharacterCodes[CharacterCodes["colon"] = 58] = "colon";
-        CharacterCodes[CharacterCodes["comma"] = 44] = "comma";
-        CharacterCodes[CharacterCodes["dot"] = 46] = "dot";
-        CharacterCodes[CharacterCodes["doubleQuote"] = 34] = "doubleQuote";
-        CharacterCodes[CharacterCodes["equals"] = 61] = "equals";
-        CharacterCodes[CharacterCodes["exclamation"] = 33] = "exclamation";
-        CharacterCodes[CharacterCodes["greaterThan"] = 62] = "greaterThan";
-        CharacterCodes[CharacterCodes["hash"] = 35] = "hash";
-        CharacterCodes[CharacterCodes["lessThan"] = 60] = "lessThan";
-        CharacterCodes[CharacterCodes["minus"] = 45] = "minus";
-        CharacterCodes[CharacterCodes["openBrace"] = 123] = "openBrace";
-        CharacterCodes[CharacterCodes["openBracket"] = 91] = "openBracket";
-        CharacterCodes[CharacterCodes["openParen"] = 40] = "openParen";
-        CharacterCodes[CharacterCodes["percent"] = 37] = "percent";
-        CharacterCodes[CharacterCodes["plus"] = 43] = "plus";
-        CharacterCodes[CharacterCodes["question"] = 63] = "question";
-        CharacterCodes[CharacterCodes["semicolon"] = 59] = "semicolon";
-        CharacterCodes[CharacterCodes["singleQuote"] = 39] = "singleQuote";
-        CharacterCodes[CharacterCodes["slash"] = 47] = "slash";
-        CharacterCodes[CharacterCodes["tilde"] = 126] = "tilde";
-        CharacterCodes[CharacterCodes["backspace"] = 8] = "backspace";
-        CharacterCodes[CharacterCodes["formFeed"] = 12] = "formFeed";
-        CharacterCodes[CharacterCodes["byteOrderMark"] = 65279] = "byteOrderMark";
-        CharacterCodes[CharacterCodes["tab"] = 9] = "tab";
-        CharacterCodes[CharacterCodes["verticalTab"] = 11] = "verticalTab";
-    })(ts.CharacterCodes || (ts.CharacterCodes = {}));
-    var CharacterCodes = ts.CharacterCodes;
-})(ts || (ts = {}));
-/// <reference path="types.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    /**
-     * Ternary values are defined such that
-     * x & y is False if either x or y is False.
-     * x & y is Maybe if either x or y is Maybe, but neither x or y is False.
-     * x & y is True if both x and y are True.
-     * x | y is False if both x and y are False.
-     * x | y is Maybe if either x or y is Maybe, but neither x or y is True.
-     * x | y is True if either x or y is True.
-     */
-    (function (Ternary) {
-        Ternary[Ternary["False"] = 0] = "False";
-        Ternary[Ternary["Maybe"] = 1] = "Maybe";
-        Ternary[Ternary["True"] = -1] = "True";
-    })(ts.Ternary || (ts.Ternary = {}));
-    var Ternary = ts.Ternary;
-    function createFileMap(keyMapper) {
-        var files = {};
-        return {
-            get: get,
-            set: set,
-            contains: contains,
-            remove: remove,
-            forEachValue: forEachValueInMap,
-            clear: clear
-        };
-        function forEachValueInMap(f) {
-            for (var key in files) {
-                f(key, files[key]);
-            }
-        }
-        // path should already be well-formed so it does not need to be normalized
-        function get(path) {
-            return files[toKey(path)];
-        }
-        function set(path, value) {
-            files[toKey(path)] = value;
-        }
-        function contains(path) {
-            return hasProperty(files, toKey(path));
-        }
-        function remove(path) {
-            var key = toKey(path);
-            delete files[key];
-        }
-        function clear() {
-            files = {};
-        }
-        function toKey(path) {
-            return keyMapper ? keyMapper(path) : path;
-        }
-    }
-    ts.createFileMap = createFileMap;
-    function toPath(fileName, basePath, getCanonicalFileName) {
-        var nonCanonicalizedPath = isRootedDiskPath(fileName)
-            ? normalizePath(fileName)
-            : getNormalizedAbsolutePath(fileName, basePath);
-        return getCanonicalFileName(nonCanonicalizedPath);
-    }
-    ts.toPath = toPath;
-    (function (Comparison) {
-        Comparison[Comparison["LessThan"] = -1] = "LessThan";
-        Comparison[Comparison["EqualTo"] = 0] = "EqualTo";
-        Comparison[Comparison["GreaterThan"] = 1] = "GreaterThan";
-    })(ts.Comparison || (ts.Comparison = {}));
-    var Comparison = ts.Comparison;
-    /**
-     * Iterates through 'array' by index and performs the callback on each element of array until the callback
-     * returns a truthy value, then returns that value.
-     * If no such value is found, the callback is applied to each element of array and undefined is returned.
-     */
-    function forEach(array, callback) {
-        if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
-                var result = callback(array[i], i);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.forEach = forEach;
-    function contains(array, value, areEqual) {
-        if (array) {
-            for (var _i = 0, array_1 = array; _i < array_1.length; _i++) {
-                var v = array_1[_i];
-                if (areEqual ? areEqual(v, value) : v === value) {
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    ts.contains = contains;
-    function indexOf(array, value) {
-        if (array) {
-            for (var i = 0, len = array.length; i < len; i++) {
-                if (array[i] === value) {
-                    return i;
-                }
-            }
-        }
-        return -1;
-    }
-    ts.indexOf = indexOf;
-    function indexOfAnyCharCode(text, charCodes, start) {
-        for (var i = start || 0, len = text.length; i < len; i++) {
-            if (contains(charCodes, text.charCodeAt(i))) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    ts.indexOfAnyCharCode = indexOfAnyCharCode;
-    function countWhere(array, predicate) {
-        var count = 0;
-        if (array) {
-            for (var _i = 0, array_2 = array; _i < array_2.length; _i++) {
-                var v = array_2[_i];
-                if (predicate(v)) {
-                    count++;
-                }
-            }
-        }
-        return count;
-    }
-    ts.countWhere = countWhere;
-    function filter(array, f) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_3 = array; _i < array_3.length; _i++) {
-                var item = array_3[_i];
-                if (f(item)) {
-                    result.push(item);
-                }
-            }
-        }
-        return result;
-    }
-    ts.filter = filter;
-    function filterMutate(array, f) {
-        var outIndex = 0;
-        for (var _i = 0, array_4 = array; _i < array_4.length; _i++) {
-            var item = array_4[_i];
-            if (f(item)) {
-                array[outIndex] = item;
-                outIndex++;
-            }
-        }
-        array.length = outIndex;
-    }
-    ts.filterMutate = filterMutate;
-    function map(array, f) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_5 = array; _i < array_5.length; _i++) {
-                var v = array_5[_i];
-                result.push(f(v));
-            }
-        }
-        return result;
-    }
-    ts.map = map;
-    function concatenate(array1, array2) {
-        if (!array2 || !array2.length)
-            return array1;
-        if (!array1 || !array1.length)
-            return array2;
-        return array1.concat(array2);
-    }
-    ts.concatenate = concatenate;
-    function deduplicate(array, areEqual) {
-        var result;
-        if (array) {
-            result = [];
-            for (var _i = 0, array_6 = array; _i < array_6.length; _i++) {
-                var item = array_6[_i];
-                if (!contains(result, item, areEqual)) {
-                    result.push(item);
-                }
-            }
-        }
-        return result;
-    }
-    ts.deduplicate = deduplicate;
-    function sum(array, prop) {
-        var result = 0;
-        for (var _i = 0, array_7 = array; _i < array_7.length; _i++) {
-            var v = array_7[_i];
-            result += v[prop];
-        }
-        return result;
-    }
-    ts.sum = sum;
-    function addRange(to, from) {
-        if (to && from) {
-            for (var _i = 0, from_1 = from; _i < from_1.length; _i++) {
-                var v = from_1[_i];
-                to.push(v);
-            }
-        }
-    }
-    ts.addRange = addRange;
-    function rangeEquals(array1, array2, pos, end) {
-        while (pos < end) {
-            if (array1[pos] !== array2[pos]) {
-                return false;
-            }
-            pos++;
-        }
-        return true;
-    }
-    ts.rangeEquals = rangeEquals;
-    /**
-     * Returns the last element of an array if non-empty, undefined otherwise.
-     */
-    function lastOrUndefined(array) {
-        if (array.length === 0) {
-            return undefined;
-        }
-        return array[array.length - 1];
-    }
-    ts.lastOrUndefined = lastOrUndefined;
-    /**
-     * Performs a binary search, finding the index at which 'value' occurs in 'array'.
-     * If no such index is found, returns the 2's-complement of first index at which
-     * number[index] exceeds number.
-     * @param array A sorted array whose first element must be no larger than number
-     * @param number The value to be searched for in the array.
-     */
-    function binarySearch(array, value) {
-        var low = 0;
-        var high = array.length - 1;
-        while (low <= high) {
-            var middle = low + ((high - low) >> 1);
-            var midValue = array[middle];
-            if (midValue === value) {
-                return middle;
-            }
-            else if (midValue > value) {
-                high = middle - 1;
-            }
-            else {
-                low = middle + 1;
-            }
-        }
-        return ~low;
-    }
-    ts.binarySearch = binarySearch;
-    function reduceLeft(array, f, initial) {
-        if (array) {
-            var count = array.length;
-            if (count > 0) {
-                var pos = 0;
-                var result = void 0;
-                if (arguments.length <= 2) {
-                    result = array[pos];
-                    pos++;
-                }
-                else {
-                    result = initial;
-                }
-                while (pos < count) {
-                    result = f(result, array[pos]);
-                    pos++;
-                }
-                return result;
-            }
-        }
-        return initial;
-    }
-    ts.reduceLeft = reduceLeft;
-    function reduceRight(array, f, initial) {
-        if (array) {
-            var pos = array.length - 1;
-            if (pos >= 0) {
-                var result = void 0;
-                if (arguments.length <= 2) {
-                    result = array[pos];
-                    pos--;
-                }
-                else {
-                    result = initial;
-                }
-                while (pos >= 0) {
-                    result = f(result, array[pos]);
-                    pos--;
-                }
-                return result;
-            }
-        }
-        return initial;
-    }
-    ts.reduceRight = reduceRight;
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-    function hasProperty(map, key) {
-        return hasOwnProperty.call(map, key);
-    }
-    ts.hasProperty = hasProperty;
-    function getKeys(map) {
-        var keys = [];
-        for (var key in map) {
-            keys.push(key);
-        }
-        return keys;
-    }
-    ts.getKeys = getKeys;
-    function getProperty(map, key) {
-        return hasOwnProperty.call(map, key) ? map[key] : undefined;
-    }
-    ts.getProperty = getProperty;
-    function isEmpty(map) {
-        for (var id in map) {
-            if (hasProperty(map, id)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.isEmpty = isEmpty;
-    function clone(object) {
-        var result = {};
-        for (var id in object) {
-            result[id] = object[id];
-        }
-        return result;
-    }
-    ts.clone = clone;
-    function extend(first, second) {
-        var result = {};
-        for (var id in first) {
-            result[id] = first[id];
-        }
-        for (var id in second) {
-            if (!hasProperty(result, id)) {
-                result[id] = second[id];
-            }
-        }
-        return result;
-    }
-    ts.extend = extend;
-    function forEachValue(map, callback) {
-        var result;
-        for (var id in map) {
-            if (result = callback(map[id]))
-                break;
-        }
-        return result;
-    }
-    ts.forEachValue = forEachValue;
-    function forEachKey(map, callback) {
-        var result;
-        for (var id in map) {
-            if (result = callback(id))
-                break;
-        }
-        return result;
-    }
-    ts.forEachKey = forEachKey;
-    function lookUp(map, key) {
-        return hasProperty(map, key) ? map[key] : undefined;
-    }
-    ts.lookUp = lookUp;
-    function copyMap(source, target) {
-        for (var p in source) {
-            target[p] = source[p];
-        }
-    }
-    ts.copyMap = copyMap;
-    /**
-     * Creates a map from the elements of an array.
-     *
-     * @param array the array of input elements.
-     * @param makeKey a function that produces a key for a given element.
-     *
-     * This function makes no effort to avoid collisions; if any two elements produce
-     * the same key with the given 'makeKey' function, then the element with the higher
-     * index in the array will be the one associated with the produced key.
-     */
-    function arrayToMap(array, makeKey) {
-        var result = {};
-        forEach(array, function (value) {
-            result[makeKey(value)] = value;
-        });
-        return result;
-    }
-    ts.arrayToMap = arrayToMap;
-    /**
-     * Reduce the properties of a map.
-     *
-     * @param map The map to reduce
-     * @param callback An aggregation function that is called for each entry in the map
-     * @param initial The initial value for the reduction.
-     */
-    function reduceProperties(map, callback, initial) {
-        var result = initial;
-        if (map) {
-            for (var key in map) {
-                if (hasProperty(map, key)) {
-                    result = callback(result, map[key], String(key));
-                }
-            }
-        }
-        return result;
-    }
-    ts.reduceProperties = reduceProperties;
-    /**
-     * Tests whether a value is an array.
-     */
-    function isArray(value) {
-        return Array.isArray ? Array.isArray(value) : value instanceof Array;
-    }
-    ts.isArray = isArray;
-    function memoize(callback) {
-        var value;
-        return function () {
-            if (callback) {
-                value = callback();
-                callback = undefined;
-            }
-            return value;
-        };
-    }
-    ts.memoize = memoize;
-    function formatStringFromArgs(text, args, baseIndex) {
-        baseIndex = baseIndex || 0;
-        return text.replace(/{(\d+)}/g, function (match, index) { return args[+index + baseIndex]; });
-    }
-    ts.localizedDiagnosticMessages = undefined;
-    function getLocaleSpecificMessage(message) {
-        return ts.localizedDiagnosticMessages && ts.localizedDiagnosticMessages[message.key]
-            ? ts.localizedDiagnosticMessages[message.key]
-            : message.message;
-    }
-    ts.getLocaleSpecificMessage = getLocaleSpecificMessage;
-    function createFileDiagnostic(file, start, length, message) {
-        var end = start + length;
-        Debug.assert(start >= 0, "start must be non-negative, is " + start);
-        Debug.assert(length >= 0, "length must be non-negative, is " + length);
-        if (file) {
-            Debug.assert(start <= file.text.length, "start must be within the bounds of the file. " + start + " > " + file.text.length);
-            Debug.assert(end <= file.text.length, "end must be the bounds of the file. " + end + " > " + file.text.length);
-        }
-        var text = getLocaleSpecificMessage(message);
-        if (arguments.length > 4) {
-            text = formatStringFromArgs(text, arguments, 4);
-        }
-        return {
-            file: file,
-            start: start,
-            length: length,
-            messageText: text,
-            category: message.category,
-            code: message.code
-        };
-    }
-    ts.createFileDiagnostic = createFileDiagnostic;
-    /* internal */
-    function formatMessage(dummy, message) {
-        var text = getLocaleSpecificMessage(message);
-        if (arguments.length > 2) {
-            text = formatStringFromArgs(text, arguments, 2);
-        }
-        return text;
-    }
-    ts.formatMessage = formatMessage;
-    function createCompilerDiagnostic(message) {
-        var text = getLocaleSpecificMessage(message);
-        if (arguments.length > 1) {
-            text = formatStringFromArgs(text, arguments, 1);
-        }
-        return {
-            file: undefined,
-            start: undefined,
-            length: undefined,
-            messageText: text,
-            category: message.category,
-            code: message.code
-        };
-    }
-    ts.createCompilerDiagnostic = createCompilerDiagnostic;
-    function chainDiagnosticMessages(details, message) {
-        var text = getLocaleSpecificMessage(message);
-        if (arguments.length > 2) {
-            text = formatStringFromArgs(text, arguments, 2);
-        }
-        return {
-            messageText: text,
-            category: message.category,
-            code: message.code,
-            next: details
-        };
-    }
-    ts.chainDiagnosticMessages = chainDiagnosticMessages;
-    function concatenateDiagnosticMessageChains(headChain, tailChain) {
-        var lastChain = headChain;
-        while (lastChain.next) {
-            lastChain = lastChain.next;
-        }
-        lastChain.next = tailChain;
-        return headChain;
-    }
-    ts.concatenateDiagnosticMessageChains = concatenateDiagnosticMessageChains;
-    function compareValues(a, b) {
-        if (a === b)
-            return 0 /* EqualTo */;
-        if (a === undefined)
-            return -1 /* LessThan */;
-        if (b === undefined)
-            return 1 /* GreaterThan */;
-        return a < b ? -1 /* LessThan */ : 1 /* GreaterThan */;
-    }
-    ts.compareValues = compareValues;
-    function compareStrings(a, b, ignoreCase) {
-        if (a === b)
-            return 0 /* EqualTo */;
-        if (a === undefined)
-            return -1 /* LessThan */;
-        if (b === undefined)
-            return 1 /* GreaterThan */;
-        if (ignoreCase) {
-            if (String.prototype.localeCompare) {
-                var result = a.localeCompare(b, /*locales*/ undefined, { usage: "sort", sensitivity: "accent" });
-                return result < 0 ? -1 /* LessThan */ : result > 0 ? 1 /* GreaterThan */ : 0 /* EqualTo */;
-            }
-            a = a.toUpperCase();
-            b = b.toUpperCase();
-            if (a === b)
-                return 0 /* EqualTo */;
-        }
-        return a < b ? -1 /* LessThan */ : 1 /* GreaterThan */;
-    }
-    ts.compareStrings = compareStrings;
-    function compareStringsCaseInsensitive(a, b) {
-        return compareStrings(a, b, /*ignoreCase*/ true);
-    }
-    ts.compareStringsCaseInsensitive = compareStringsCaseInsensitive;
-    function getDiagnosticFileName(diagnostic) {
-        return diagnostic.file ? diagnostic.file.fileName : undefined;
-    }
-    function compareDiagnostics(d1, d2) {
-        return compareValues(getDiagnosticFileName(d1), getDiagnosticFileName(d2)) ||
-            compareValues(d1.start, d2.start) ||
-            compareValues(d1.length, d2.length) ||
-            compareValues(d1.code, d2.code) ||
-            compareMessageText(d1.messageText, d2.messageText) ||
-            0 /* EqualTo */;
-    }
-    ts.compareDiagnostics = compareDiagnostics;
-    function compareMessageText(text1, text2) {
-        while (text1 && text2) {
-            // We still have both chains.
-            var string1 = typeof text1 === "string" ? text1 : text1.messageText;
-            var string2 = typeof text2 === "string" ? text2 : text2.messageText;
-            var res = compareValues(string1, string2);
-            if (res) {
-                return res;
-            }
-            text1 = typeof text1 === "string" ? undefined : text1.next;
-            text2 = typeof text2 === "string" ? undefined : text2.next;
-        }
-        if (!text1 && !text2) {
-            // if the chains are done, then these messages are the same.
-            return 0 /* EqualTo */;
-        }
-        // We still have one chain remaining.  The shorter chain should come first.
-        return text1 ? 1 /* GreaterThan */ : -1 /* LessThan */;
-    }
-    function sortAndDeduplicateDiagnostics(diagnostics) {
-        return deduplicateSortedDiagnostics(diagnostics.sort(compareDiagnostics));
-    }
-    ts.sortAndDeduplicateDiagnostics = sortAndDeduplicateDiagnostics;
-    function deduplicateSortedDiagnostics(diagnostics) {
-        if (diagnostics.length < 2) {
-            return diagnostics;
-        }
-        var newDiagnostics = [diagnostics[0]];
-        var previousDiagnostic = diagnostics[0];
-        for (var i = 1; i < diagnostics.length; i++) {
-            var currentDiagnostic = diagnostics[i];
-            var isDupe = compareDiagnostics(currentDiagnostic, previousDiagnostic) === 0 /* EqualTo */;
-            if (!isDupe) {
-                newDiagnostics.push(currentDiagnostic);
-                previousDiagnostic = currentDiagnostic;
-            }
-        }
-        return newDiagnostics;
-    }
-    ts.deduplicateSortedDiagnostics = deduplicateSortedDiagnostics;
-    function normalizeSlashes(path) {
-        return path.replace(/\\/g, "/");
-    }
-    ts.normalizeSlashes = normalizeSlashes;
-    // Returns length of path root (i.e. length of "/", "x:/", "//server/share/, file:///user/files")
-    function getRootLength(path) {
-        if (path.charCodeAt(0) === 47 /* slash */) {
-            if (path.charCodeAt(1) !== 47 /* slash */)
-                return 1;
-            var p1 = path.indexOf("/", 2);
-            if (p1 < 0)
-                return 2;
-            var p2 = path.indexOf("/", p1 + 1);
-            if (p2 < 0)
-                return p1 + 1;
-            return p2 + 1;
-        }
-        if (path.charCodeAt(1) === 58 /* colon */) {
-            if (path.charCodeAt(2) === 47 /* slash */)
-                return 3;
-            return 2;
-        }
-        // Per RFC 1738 'file' URI schema has the shape file://<host>/<path>
-        // if <host> is omitted then it is assumed that host value is 'localhost',
-        // however slash after the omitted <host> is not removed.
-        // file:///folder1/file1 - this is a correct URI
-        // file://folder2/file2 - this is an incorrect URI
-        if (path.lastIndexOf("file:///", 0) === 0) {
-            return "file:///".length;
-        }
-        var idx = path.indexOf("://");
-        if (idx !== -1) {
-            return idx + "://".length;
-        }
-        return 0;
-    }
-    ts.getRootLength = getRootLength;
-    ts.directorySeparator = "/";
-    function getNormalizedParts(normalizedSlashedPath, rootLength) {
-        var parts = normalizedSlashedPath.substr(rootLength).split(ts.directorySeparator);
-        var normalized = [];
-        for (var _i = 0, parts_1 = parts; _i < parts_1.length; _i++) {
-            var part = parts_1[_i];
-            if (part !== ".") {
-                if (part === ".." && normalized.length > 0 && lastOrUndefined(normalized) !== "..") {
-                    normalized.pop();
-                }
-                else {
-                    // A part may be an empty string (which is 'falsy') if the path had consecutive slashes,
-                    // e.g. "path//file.ts".  Drop these before re-joining the parts.
-                    if (part) {
-                        normalized.push(part);
-                    }
-                }
-            }
-        }
-        return normalized;
-    }
-    function normalizePath(path) {
-        path = normalizeSlashes(path);
-        var rootLength = getRootLength(path);
-        var normalized = getNormalizedParts(path, rootLength);
-        return path.substr(0, rootLength) + normalized.join(ts.directorySeparator);
-    }
-    ts.normalizePath = normalizePath;
-    function getDirectoryPath(path) {
-        return path.substr(0, Math.max(getRootLength(path), path.lastIndexOf(ts.directorySeparator)));
-    }
-    ts.getDirectoryPath = getDirectoryPath;
-    function isUrl(path) {
-        return path && !isRootedDiskPath(path) && path.indexOf("://") !== -1;
-    }
-    ts.isUrl = isUrl;
-    function isRootedDiskPath(path) {
-        return getRootLength(path) !== 0;
-    }
-    ts.isRootedDiskPath = isRootedDiskPath;
-    function normalizedPathComponents(path, rootLength) {
-        var normalizedParts = getNormalizedParts(path, rootLength);
-        return [path.substr(0, rootLength)].concat(normalizedParts);
-    }
-    function getNormalizedPathComponents(path, currentDirectory) {
-        path = normalizeSlashes(path);
-        var rootLength = getRootLength(path);
-        if (rootLength === 0) {
-            // If the path is not rooted it is relative to current directory
-            path = combinePaths(normalizeSlashes(currentDirectory), path);
-            rootLength = getRootLength(path);
-        }
-        return normalizedPathComponents(path, rootLength);
-    }
-    ts.getNormalizedPathComponents = getNormalizedPathComponents;
-    function getNormalizedAbsolutePath(fileName, currentDirectory) {
-        return getNormalizedPathFromPathComponents(getNormalizedPathComponents(fileName, currentDirectory));
-    }
-    ts.getNormalizedAbsolutePath = getNormalizedAbsolutePath;
-    function getNormalizedPathFromPathComponents(pathComponents) {
-        if (pathComponents && pathComponents.length) {
-            return pathComponents[0] + pathComponents.slice(1).join(ts.directorySeparator);
-        }
-    }
-    ts.getNormalizedPathFromPathComponents = getNormalizedPathFromPathComponents;
-    function getNormalizedPathComponentsOfUrl(url) {
-        // Get root length of http://www.website.com/folder1/folder2/
-        // In this example the root is:  http://www.website.com/
-        // normalized path components should be ["http://www.website.com/", "folder1", "folder2"]
-        var urlLength = url.length;
-        // Initial root length is http:// part
-        var rootLength = url.indexOf("://") + "://".length;
-        while (rootLength < urlLength) {
-            // Consume all immediate slashes in the protocol
-            // eg.initial rootlength is just file:// but it needs to consume another "/" in file:///
-            if (url.charCodeAt(rootLength) === 47 /* slash */) {
-                rootLength++;
-            }
-            else {
-                // non slash character means we continue proceeding to next component of root search
-                break;
-            }
-        }
-        // there are no parts after http:// just return current string as the pathComponent
-        if (rootLength === urlLength) {
-            return [url];
-        }
-        // Find the index of "/" after website.com so the root can be http://www.website.com/ (from existing http://)
-        var indexOfNextSlash = url.indexOf(ts.directorySeparator, rootLength);
-        if (indexOfNextSlash !== -1) {
-            // Found the "/" after the website.com so the root is length of http://www.website.com/
-            // and get components after the root normally like any other folder components
-            rootLength = indexOfNextSlash + 1;
-            return normalizedPathComponents(url, rootLength);
-        }
-        else {
-            // Can't find the host assume the rest of the string as component
-            // but make sure we append "/"  to it as root is not joined using "/"
-            // eg. if url passed in was http://website.com we want to use root as [http://website.com/]
-            // so that other path manipulations will be correct and it can be merged with relative paths correctly
-            return [url + ts.directorySeparator];
-        }
-    }
-    function getNormalizedPathOrUrlComponents(pathOrUrl, currentDirectory) {
-        if (isUrl(pathOrUrl)) {
-            return getNormalizedPathComponentsOfUrl(pathOrUrl);
-        }
-        else {
-            return getNormalizedPathComponents(pathOrUrl, currentDirectory);
-        }
-    }
-    function getRelativePathToDirectoryOrUrl(directoryPathOrUrl, relativeOrAbsolutePath, currentDirectory, getCanonicalFileName, isAbsolutePathAnUrl) {
-        var pathComponents = getNormalizedPathOrUrlComponents(relativeOrAbsolutePath, currentDirectory);
-        var directoryComponents = getNormalizedPathOrUrlComponents(directoryPathOrUrl, currentDirectory);
-        if (directoryComponents.length > 1 && lastOrUndefined(directoryComponents) === "") {
-            // If the directory path given was of type test/cases/ then we really need components of directory to be only till its name
-            // that is  ["test", "cases", ""] needs to be actually ["test", "cases"]
-            directoryComponents.length--;
-        }
-        // Find the component that differs
-        var joinStartIndex;
-        for (joinStartIndex = 0; joinStartIndex < pathComponents.length && joinStartIndex < directoryComponents.length; joinStartIndex++) {
-            if (getCanonicalFileName(directoryComponents[joinStartIndex]) !== getCanonicalFileName(pathComponents[joinStartIndex])) {
-                break;
-            }
-        }
-        // Get the relative path
-        if (joinStartIndex) {
-            var relativePath = "";
-            var relativePathComponents = pathComponents.slice(joinStartIndex, pathComponents.length);
-            for (; joinStartIndex < directoryComponents.length; joinStartIndex++) {
-                if (directoryComponents[joinStartIndex] !== "") {
-                    relativePath = relativePath + ".." + ts.directorySeparator;
-                }
-            }
-            return relativePath + relativePathComponents.join(ts.directorySeparator);
-        }
-        // Cant find the relative path, get the absolute path
-        var absolutePath = getNormalizedPathFromPathComponents(pathComponents);
-        if (isAbsolutePathAnUrl && isRootedDiskPath(absolutePath)) {
-            absolutePath = "file:///" + absolutePath;
-        }
-        return absolutePath;
-    }
-    ts.getRelativePathToDirectoryOrUrl = getRelativePathToDirectoryOrUrl;
-    function getBaseFileName(path) {
-        if (path === undefined) {
-            return undefined;
-        }
-        var i = path.lastIndexOf(ts.directorySeparator);
-        return i < 0 ? path : path.substring(i + 1);
-    }
-    ts.getBaseFileName = getBaseFileName;
-    function combinePaths(path1, path2) {
-        if (!(path1 && path1.length))
-            return path2;
-        if (!(path2 && path2.length))
-            return path1;
-        if (getRootLength(path2) !== 0)
-            return path2;
-        if (path1.charAt(path1.length - 1) === ts.directorySeparator)
-            return path1 + path2;
-        return path1 + ts.directorySeparator + path2;
-    }
-    ts.combinePaths = combinePaths;
-    /**
-     * Removes a trailing directory separator from a path.
-     * @param path The path.
-     */
-    function removeTrailingDirectorySeparator(path) {
-        if (path.charAt(path.length - 1) === ts.directorySeparator) {
-            return path.substr(0, path.length - 1);
-        }
-        return path;
-    }
-    ts.removeTrailingDirectorySeparator = removeTrailingDirectorySeparator;
-    /**
-     * Adds a trailing directory separator to a path, if it does not already have one.
-     * @param path The path.
-     */
-    function ensureTrailingDirectorySeparator(path) {
-        if (path.charAt(path.length - 1) !== ts.directorySeparator) {
-            return path + ts.directorySeparator;
-        }
-        return path;
-    }
-    ts.ensureTrailingDirectorySeparator = ensureTrailingDirectorySeparator;
-    function comparePaths(a, b, currentDirectory, ignoreCase) {
-        if (a === b)
-            return 0 /* EqualTo */;
-        if (a === undefined)
-            return -1 /* LessThan */;
-        if (b === undefined)
-            return 1 /* GreaterThan */;
-        a = removeTrailingDirectorySeparator(a);
-        b = removeTrailingDirectorySeparator(b);
-        var aComponents = getNormalizedPathComponents(a, currentDirectory);
-        var bComponents = getNormalizedPathComponents(b, currentDirectory);
-        var sharedLength = Math.min(aComponents.length, bComponents.length);
-        for (var i = 0; i < sharedLength; i++) {
-            var result = compareStrings(aComponents[i], bComponents[i], ignoreCase);
-            if (result !== 0 /* EqualTo */) {
-                return result;
-            }
-        }
-        return compareValues(aComponents.length, bComponents.length);
-    }
-    ts.comparePaths = comparePaths;
-    function containsPath(parent, child, currentDirectory, ignoreCase) {
-        if (parent === undefined || child === undefined)
-            return false;
-        if (parent === child)
-            return true;
-        parent = removeTrailingDirectorySeparator(parent);
-        child = removeTrailingDirectorySeparator(child);
-        if (parent === child)
-            return true;
-        var parentComponents = getNormalizedPathComponents(parent, currentDirectory);
-        var childComponents = getNormalizedPathComponents(child, currentDirectory);
-        if (childComponents.length < parentComponents.length) {
-            return false;
-        }
-        for (var i = 0; i < parentComponents.length; i++) {
-            var result = compareStrings(parentComponents[i], childComponents[i], ignoreCase);
-            if (result !== 0 /* EqualTo */) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.containsPath = containsPath;
-    function fileExtensionIs(path, extension) {
-        var pathLen = path.length;
-        var extLen = extension.length;
-        return pathLen > extLen && path.substr(pathLen - extLen, extLen) === extension;
-    }
-    ts.fileExtensionIs = fileExtensionIs;
-    function fileExtensionIsAny(path, extensions) {
-        for (var _i = 0, extensions_1 = extensions; _i < extensions_1.length; _i++) {
-            var extension = extensions_1[_i];
-            if (fileExtensionIs(path, extension)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.fileExtensionIsAny = fileExtensionIsAny;
-    // Reserved characters, forces escaping of any non-word (or digit), non-whitespace character.
-    // It may be inefficient (we could just match (/[-[\]{}()*+?.,\\^$|#\s]/g), but this is future
-    // proof.
-    var reservedCharacterPattern = /[^\w\s\/]/g;
-    var wildcardCharCodes = [42 /* asterisk */, 63 /* question */];
-    function getRegularExpressionForWildcard(specs, basePath, usage) {
-        if (specs === undefined || specs.length === 0) {
-            return undefined;
-        }
-        var pattern = "";
-        var hasWrittenSubpattern = false;
-        spec: for (var _i = 0, specs_1 = specs; _i < specs_1.length; _i++) {
-            var spec = specs_1[_i];
-            if (!spec) {
-                continue;
-            }
-            var subpattern = "";
-            var hasRecursiveDirectoryWildcard = false;
-            var hasWrittenComponent = false;
-            var components = getNormalizedPathComponents(spec, basePath);
-            if (usage !== "exclude" && components[components.length - 1] === "**") {
-                continue spec;
-            }
-            // getNormalizedPathComponents includes the separator for the root component.
-            // We need to remove to create our regex correctly.
-            components[0] = removeTrailingDirectorySeparator(components[0]);
-            var optionalCount = 0;
-            for (var _a = 0, components_1 = components; _a < components_1.length; _a++) {
-                var component = components_1[_a];
-                if (component === "**") {
-                    if (hasRecursiveDirectoryWildcard) {
-                        continue spec;
-                    }
-                    subpattern += "(/.+?)?";
-                    hasRecursiveDirectoryWildcard = true;
-                    hasWrittenComponent = true;
-                }
-                else {
-                    if (usage === "directories") {
-                        subpattern += "(";
-                        optionalCount++;
-                    }
-                    if (hasWrittenComponent) {
-                        subpattern += ts.directorySeparator;
-                    }
-                    subpattern += component.replace(reservedCharacterPattern, replaceWildcardCharacter);
-                    hasWrittenComponent = true;
-                }
-            }
-            while (optionalCount > 0) {
-                subpattern += ")?";
-                optionalCount--;
-            }
-            if (hasWrittenSubpattern) {
-                pattern += "|";
-            }
-            pattern += "(" + subpattern + ")";
-            hasWrittenSubpattern = true;
-        }
-        if (!pattern) {
-            return undefined;
-        }
-        return "^(" + pattern + (usage === "exclude" ? ")($|/)" : ")$");
-    }
-    ts.getRegularExpressionForWildcard = getRegularExpressionForWildcard;
-    function replaceWildcardCharacter(match) {
-        return match === "*" ? "[^/]*" : match === "?" ? "[^/]" : "\\" + match;
-    }
-    function getFileMatcherPatterns(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory) {
-        path = normalizePath(path);
-        currentDirectory = normalizePath(currentDirectory);
-        var absolutePath = combinePaths(currentDirectory, path);
-        return {
-            includeFilePattern: getRegularExpressionForWildcard(includes, absolutePath, "files"),
-            includeDirectoryPattern: getRegularExpressionForWildcard(includes, absolutePath, "directories"),
-            excludePattern: getRegularExpressionForWildcard(excludes, absolutePath, "exclude"),
-            basePaths: getBasePaths(path, includes, useCaseSensitiveFileNames)
-        };
-    }
-    ts.getFileMatcherPatterns = getFileMatcherPatterns;
-    function matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, getFileSystemEntries) {
-        path = normalizePath(path);
-        currentDirectory = normalizePath(currentDirectory);
-        var patterns = getFileMatcherPatterns(path, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory);
-        var regexFlag = useCaseSensitiveFileNames ? "" : "i";
-        var includeFileRegex = patterns.includeFilePattern && new RegExp(patterns.includeFilePattern, regexFlag);
-        var includeDirectoryRegex = patterns.includeDirectoryPattern && new RegExp(patterns.includeDirectoryPattern, regexFlag);
-        var excludeRegex = patterns.excludePattern && new RegExp(patterns.excludePattern, regexFlag);
-        var result = [];
-        for (var _i = 0, _a = patterns.basePaths; _i < _a.length; _i++) {
-            var basePath = _a[_i];
-            visitDirectory(basePath, combinePaths(currentDirectory, basePath));
-        }
-        return result;
-        function visitDirectory(path, absolutePath) {
-            var _a = getFileSystemEntries(path), files = _a.files, directories = _a.directories;
-            for (var _i = 0, files_1 = files; _i < files_1.length; _i++) {
-                var current = files_1[_i];
-                var name_1 = combinePaths(path, current);
-                var absoluteName = combinePaths(absolutePath, current);
-                if ((!extensions || fileExtensionIsAny(name_1, extensions)) &&
-                    (!includeFileRegex || includeFileRegex.test(absoluteName)) &&
-                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    result.push(name_1);
-                }
-            }
-            for (var _b = 0, directories_1 = directories; _b < directories_1.length; _b++) {
-                var current = directories_1[_b];
-                var name_2 = combinePaths(path, current);
-                var absoluteName = combinePaths(absolutePath, current);
-                if ((!includeDirectoryRegex || includeDirectoryRegex.test(absoluteName)) &&
-                    (!excludeRegex || !excludeRegex.test(absoluteName))) {
-                    visitDirectory(name_2, absoluteName);
-                }
-            }
-        }
-    }
-    ts.matchFiles = matchFiles;
-    /**
-     * Computes the unique non-wildcard base paths amongst the provided include patterns.
-     */
-    function getBasePaths(path, includes, useCaseSensitiveFileNames) {
-        // Storage for our results in the form of literal paths (e.g. the paths as written by the user).
-        var basePaths = [path];
-        if (includes) {
-            // Storage for literal base paths amongst the include patterns.
-            var includeBasePaths = [];
-            for (var _i = 0, includes_1 = includes; _i < includes_1.length; _i++) {
-                var include = includes_1[_i];
-                // We also need to check the relative paths by converting them to absolute and normalizing
-                // in case they escape the base path (e.g "..\somedirectory")
-                var absolute = isRootedDiskPath(include) ? include : normalizePath(combinePaths(path, include));
-                var wildcardOffset = indexOfAnyCharCode(absolute, wildcardCharCodes);
-                var includeBasePath = wildcardOffset < 0
-                    ? removeTrailingDirectorySeparator(getDirectoryPath(absolute))
-                    : absolute.substring(0, absolute.lastIndexOf(ts.directorySeparator, wildcardOffset));
-                // Append the literal and canonical candidate base paths.
-                includeBasePaths.push(includeBasePath);
-            }
-            // Sort the offsets array using either the literal or canonical path representations.
-            includeBasePaths.sort(useCaseSensitiveFileNames ? compareStrings : compareStringsCaseInsensitive);
-            // Iterate over each include base path and include unique base paths that are not a
-            // subpath of an existing base path
-            include: for (var i = 0; i < includeBasePaths.length; i++) {
-                var includeBasePath = includeBasePaths[i];
-                for (var j = 0; j < basePaths.length; j++) {
-                    if (containsPath(basePaths[j], includeBasePath, path, !useCaseSensitiveFileNames)) {
-                        continue include;
-                    }
-                }
-                basePaths.push(includeBasePath);
-            }
-        }
-        return basePaths;
-    }
-    function ensureScriptKind(fileName, scriptKind) {
-        // Using scriptKind as a condition handles both:
-        // - 'scriptKind' is unspecified and thus it is `undefined`
-        // - 'scriptKind' is set and it is `Unknown` (0)
-        // If the 'scriptKind' is 'undefined' or 'Unknown' then we attempt
-        // to get the ScriptKind from the file name. If it cannot be resolved
-        // from the file name then the default 'TS' script kind is returned.
-        return (scriptKind || getScriptKindFromFileName(fileName)) || 3 /* TS */;
-    }
-    ts.ensureScriptKind = ensureScriptKind;
-    function getScriptKindFromFileName(fileName) {
-        var ext = fileName.substr(fileName.lastIndexOf("."));
-        switch (ext.toLowerCase()) {
-            case ".js":
-                return 1 /* JS */;
-            case ".jsx":
-                return 2 /* JSX */;
-            case ".ts":
-                return 3 /* TS */;
-            case ".tsx":
-                return 4 /* TSX */;
-            default:
-                return 0 /* Unknown */;
-        }
-    }
-    ts.getScriptKindFromFileName = getScriptKindFromFileName;
-    /**
-     *  List of supported extensions in order of file resolution precedence.
-     */
-    ts.supportedTypeScriptExtensions = [".ts", ".tsx", ".d.ts"];
-    ts.supportedJavascriptExtensions = [".js", ".jsx"];
-    var allSupportedExtensions = ts.supportedTypeScriptExtensions.concat(ts.supportedJavascriptExtensions);
-    function getSupportedExtensions(options) {
-        return options && options.allowJs ? allSupportedExtensions : ts.supportedTypeScriptExtensions;
-    }
-    ts.getSupportedExtensions = getSupportedExtensions;
-    function isSupportedSourceFileName(fileName, compilerOptions) {
-        if (!fileName) {
-            return false;
-        }
-        for (var _i = 0, _a = getSupportedExtensions(compilerOptions); _i < _a.length; _i++) {
-            var extension = _a[_i];
-            if (fileExtensionIs(fileName, extension)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.isSupportedSourceFileName = isSupportedSourceFileName;
-    /**
-     * Extension boundaries by priority. Lower numbers indicate higher priorities, and are
-     * aligned to the offset of the highest priority extension in the
-     * allSupportedExtensions array.
-     */
-    (function (ExtensionPriority) {
-        ExtensionPriority[ExtensionPriority["TypeScriptFiles"] = 0] = "TypeScriptFiles";
-        ExtensionPriority[ExtensionPriority["DeclarationAndJavaScriptFiles"] = 2] = "DeclarationAndJavaScriptFiles";
-        ExtensionPriority[ExtensionPriority["Limit"] = 5] = "Limit";
-        ExtensionPriority[ExtensionPriority["Highest"] = 0] = "Highest";
-        ExtensionPriority[ExtensionPriority["Lowest"] = 2] = "Lowest";
-    })(ts.ExtensionPriority || (ts.ExtensionPriority = {}));
-    var ExtensionPriority = ts.ExtensionPriority;
-    function getExtensionPriority(path, supportedExtensions) {
-        for (var i = supportedExtensions.length - 1; i >= 0; i--) {
-            if (fileExtensionIs(path, supportedExtensions[i])) {
-                return adjustExtensionPriority(i);
-            }
-        }
-        // If its not in the list of supported extensions, this is likely a
-        // TypeScript file with a non-ts extension
-        return 0 /* Highest */;
-    }
-    ts.getExtensionPriority = getExtensionPriority;
-    /**
-     * Adjusts an extension priority to be the highest priority within the same range.
-     */
-    function adjustExtensionPriority(extensionPriority) {
-        if (extensionPriority < 2 /* DeclarationAndJavaScriptFiles */) {
-            return 0 /* TypeScriptFiles */;
-        }
-        else if (extensionPriority < 5 /* Limit */) {
-            return 2 /* DeclarationAndJavaScriptFiles */;
-        }
-        else {
-            return 5 /* Limit */;
-        }
-    }
-    ts.adjustExtensionPriority = adjustExtensionPriority;
-    /**
-     * Gets the next lowest extension priority for a given priority.
-     */
-    function getNextLowestExtensionPriority(extensionPriority) {
-        if (extensionPriority < 2 /* DeclarationAndJavaScriptFiles */) {
-            return 2 /* DeclarationAndJavaScriptFiles */;
-        }
-        else {
-            return 5 /* Limit */;
-        }
-    }
-    ts.getNextLowestExtensionPriority = getNextLowestExtensionPriority;
-    var extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
-    function removeFileExtension(path) {
-        for (var _i = 0, extensionsToRemove_1 = extensionsToRemove; _i < extensionsToRemove_1.length; _i++) {
-            var ext = extensionsToRemove_1[_i];
-            var extensionless = tryRemoveExtension(path, ext);
-            if (extensionless !== undefined) {
-                return extensionless;
-            }
-        }
-        return path;
-    }
-    ts.removeFileExtension = removeFileExtension;
-    function tryRemoveExtension(path, extension) {
-        return fileExtensionIs(path, extension) ? path.substring(0, path.length - extension.length) : undefined;
-    }
-    ts.tryRemoveExtension = tryRemoveExtension;
-    function isJsxOrTsxExtension(ext) {
-        return ext === ".jsx" || ext === ".tsx";
-    }
-    ts.isJsxOrTsxExtension = isJsxOrTsxExtension;
-    function changeExtension(path, newExtension) {
-        return (removeFileExtension(path) + newExtension);
-    }
-    ts.changeExtension = changeExtension;
-    function Symbol(flags, name) {
-        this.flags = flags;
-        this.name = name;
-        this.declarations = undefined;
-    }
-    function Type(checker, flags) {
-        this.flags = flags;
-    }
-    function Signature(checker) {
-    }
-    function Node(kind, pos, end) {
-        this.kind = kind;
-        this.pos = pos;
-        this.end = end;
-        this.flags = 0 /* None */;
-        this.parent = undefined;
-    }
-    ts.objectAllocator = {
-        getNodeConstructor: function () { return Node; },
-        getSourceFileConstructor: function () { return Node; },
-        getSymbolConstructor: function () { return Symbol; },
-        getTypeConstructor: function () { return Type; },
-        getSignatureConstructor: function () { return Signature; }
-    };
-    (function (AssertionLevel) {
-        AssertionLevel[AssertionLevel["None"] = 0] = "None";
-        AssertionLevel[AssertionLevel["Normal"] = 1] = "Normal";
-        AssertionLevel[AssertionLevel["Aggressive"] = 2] = "Aggressive";
-        AssertionLevel[AssertionLevel["VeryAggressive"] = 3] = "VeryAggressive";
-    })(ts.AssertionLevel || (ts.AssertionLevel = {}));
-    var AssertionLevel = ts.AssertionLevel;
-    var Debug;
-    (function (Debug) {
-        var currentAssertionLevel = 0 /* None */;
-        function shouldAssert(level) {
-            return currentAssertionLevel >= level;
-        }
-        Debug.shouldAssert = shouldAssert;
-        function assert(expression, message, verboseDebugInfo) {
-            if (!expression) {
-                var verboseDebugString = "";
-                if (verboseDebugInfo) {
-                    verboseDebugString = "\r\nVerbose Debug Information: " + verboseDebugInfo();
-                }
-                debugger;
-                throw new Error("Debug Failure. False expression: " + (message || "") + verboseDebugString);
-            }
-        }
-        Debug.assert = assert;
-        function fail(message) {
-            Debug.assert(/*expression*/ false, message);
-        }
-        Debug.fail = fail;
-    })(Debug = ts.Debug || (ts.Debug = {}));
-    function copyListRemovingItem(item, list) {
-        var copiedList = [];
-        for (var _i = 0, list_1 = list; _i < list_1.length; _i++) {
-            var e = list_1[_i];
-            if (e !== item) {
-                copiedList.push(e);
-            }
-        }
-        return copiedList;
-    }
-    ts.copyListRemovingItem = copyListRemovingItem;
-    function createGetCanonicalFileName(useCaseSensitivefileNames) {
-        return useCaseSensitivefileNames
-            ? (function (fileName) { return fileName; })
-            : (function (fileName) { return fileName.toLowerCase(); });
-    }
-    ts.createGetCanonicalFileName = createGetCanonicalFileName;
-})(ts || (ts = {}));
-/// <reference path="core.ts"/>
-var ts;
-(function (ts) {
-    ts.sys = (function () {
-        function getWScriptSystem() {
-            var fso = new ActiveXObject("Scripting.FileSystemObject");
-            var shell = new ActiveXObject("WScript.Shell");
-            var fileStream = new ActiveXObject("ADODB.Stream");
-            fileStream.Type = 2 /*text*/;
-            var binaryStream = new ActiveXObject("ADODB.Stream");
-            binaryStream.Type = 1 /*binary*/;
-            var args = [];
-            for (var i = 0; i < WScript.Arguments.length; i++) {
-                args[i] = WScript.Arguments.Item(i);
-            }
-            function readFile(fileName, encoding) {
-                if (!fso.FileExists(fileName)) {
-                    return undefined;
-                }
-                fileStream.Open();
-                try {
-                    if (encoding) {
-                        fileStream.Charset = encoding;
-                        fileStream.LoadFromFile(fileName);
-                    }
-                    else {
-                        // Load file and read the first two bytes into a string with no interpretation
-                        fileStream.Charset = "x-ansi";
-                        fileStream.LoadFromFile(fileName);
-                        var bom = fileStream.ReadText(2) || "";
-                        // Position must be at 0 before encoding can be changed
-                        fileStream.Position = 0;
-                        // [0xFF,0xFE] and [0xFE,0xFF] mean utf-16 (little or big endian), otherwise default to utf-8
-                        fileStream.Charset = bom.length >= 2 && (bom.charCodeAt(0) === 0xFF && bom.charCodeAt(1) === 0xFE || bom.charCodeAt(0) === 0xFE && bom.charCodeAt(1) === 0xFF) ? "unicode" : "utf-8";
-                    }
-                    // ReadText method always strips byte order mark from resulting string
-                    return fileStream.ReadText();
-                }
-                catch (e) {
-                    throw e;
-                }
-                finally {
-                    fileStream.Close();
-                }
-            }
-            function writeFile(fileName, data, writeByteOrderMark) {
-                fileStream.Open();
-                binaryStream.Open();
-                try {
-                    // Write characters in UTF-8 encoding
-                    fileStream.Charset = "utf-8";
-                    fileStream.WriteText(data);
-                    // If we don't want the BOM, then skip it by setting the starting location to 3 (size of BOM).
-                    // If not, start from position 0, as the BOM will be added automatically when charset==utf8.
-                    if (writeByteOrderMark) {
-                        fileStream.Position = 0;
-                    }
-                    else {
-                        fileStream.Position = 3;
-                    }
-                    fileStream.CopyTo(binaryStream);
-                    binaryStream.SaveToFile(fileName, 2 /*overwrite*/);
-                }
-                finally {
-                    binaryStream.Close();
-                    fileStream.Close();
-                }
-            }
-            function getNames(collection) {
-                var result = [];
-                for (var e = new Enumerator(collection); !e.atEnd(); e.moveNext()) {
-                    result.push(e.item().Name);
-                }
-                return result.sort();
-            }
-            function getDirectories(path) {
-                var folder = fso.GetFolder(path);
-                return getNames(folder.subfolders);
-            }
-            function getAccessibleFileSystemEntries(path) {
-                try {
-                    var folder = fso.GetFolder(path || ".");
-                    var files = getNames(folder.files);
-                    var directories = getNames(folder.subfolders);
-                    return { files: files, directories: directories };
-                }
-                catch (e) {
-                    return { files: [], directories: [] };
-                }
-            }
-            function readDirectory(path, extensions, excludes, includes) {
-                return ts.matchFiles(path, extensions, excludes, includes, /*useCaseSensitiveFileNames*/ false, shell.CurrentDirectory, getAccessibleFileSystemEntries);
-            }
-            return {
-                args: args,
-                newLine: "\r\n",
-                useCaseSensitiveFileNames: false,
-                write: function (s) {
-                    WScript.StdOut.Write(s);
-                },
-                readFile: readFile,
-                writeFile: writeFile,
-                resolvePath: function (path) {
-                    return fso.GetAbsolutePathName(path);
-                },
-                fileExists: function (path) {
-                    return fso.FileExists(path);
-                },
-                directoryExists: function (path) {
-                    return fso.FolderExists(path);
-                },
-                createDirectory: function (directoryName) {
-                    if (!this.directoryExists(directoryName)) {
-                        fso.CreateFolder(directoryName);
-                    }
-                },
-                getExecutingFilePath: function () {
-                    return WScript.ScriptFullName;
-                },
-                getCurrentDirectory: function () {
-                    return shell.CurrentDirectory;
-                },
-                getDirectories: getDirectories,
-                readDirectory: readDirectory,
-                exit: function (exitCode) {
-                    try {
-                        WScript.Quit(exitCode);
-                    }
-                    catch (e) {
-                    }
-                }
-            };
-        }
-        function getNodeSystem() {
-            var _fs = require("fs");
-            var _path = require("path");
-            var _os = require("os");
-            var _crypto = require("crypto");
-            var useNonPollingWatchers = process.env["TSC_NONPOLLING_WATCHER"];
-            function createWatchedFileSet() {
-                var dirWatchers = {};
-                // One file can have multiple watchers
-                var fileWatcherCallbacks = {};
-                return { addFile: addFile, removeFile: removeFile };
-                function reduceDirWatcherRefCountForFile(fileName) {
-                    var dirName = ts.getDirectoryPath(fileName);
-                    if (ts.hasProperty(dirWatchers, dirName)) {
-                        var watcher = dirWatchers[dirName];
-                        watcher.referenceCount -= 1;
-                        if (watcher.referenceCount <= 0) {
-                            watcher.close();
-                            delete dirWatchers[dirName];
-                        }
-                    }
-                }
-                function addDirWatcher(dirPath) {
-                    if (ts.hasProperty(dirWatchers, dirPath)) {
-                        var watcher_1 = dirWatchers[dirPath];
-                        watcher_1.referenceCount += 1;
-                        return;
-                    }
-                    var watcher = _fs.watch(dirPath, { persistent: true }, function (eventName, relativeFileName) { return fileEventHandler(eventName, relativeFileName, dirPath); });
-                    watcher.referenceCount = 1;
-                    dirWatchers[dirPath] = watcher;
-                    return;
-                }
-                function addFileWatcherCallback(filePath, callback) {
-                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
-                        fileWatcherCallbacks[filePath].push(callback);
-                    }
-                    else {
-                        fileWatcherCallbacks[filePath] = [callback];
-                    }
-                }
-                function addFile(fileName, callback) {
-                    addFileWatcherCallback(fileName, callback);
-                    addDirWatcher(ts.getDirectoryPath(fileName));
-                    return { fileName: fileName, callback: callback };
-                }
-                function removeFile(watchedFile) {
-                    removeFileWatcherCallback(watchedFile.fileName, watchedFile.callback);
-                    reduceDirWatcherRefCountForFile(watchedFile.fileName);
-                }
-                function removeFileWatcherCallback(filePath, callback) {
-                    if (ts.hasProperty(fileWatcherCallbacks, filePath)) {
-                        var newCallbacks = ts.copyListRemovingItem(callback, fileWatcherCallbacks[filePath]);
-                        if (newCallbacks.length === 0) {
-                            delete fileWatcherCallbacks[filePath];
-                        }
-                        else {
-                            fileWatcherCallbacks[filePath] = newCallbacks;
-                        }
-                    }
-                }
-                function fileEventHandler(eventName, relativeFileName, baseDirPath) {
-                    // When files are deleted from disk, the triggered "rename" event would have a relativefileName of "undefined"
-                    var fileName = typeof relativeFileName !== "string"
-                        ? undefined
-                        : ts.getNormalizedAbsolutePath(relativeFileName, baseDirPath);
-                    // Some applications save a working file via rename operations
-                    if ((eventName === "change" || eventName === "rename") && ts.hasProperty(fileWatcherCallbacks, fileName)) {
-                        for (var _i = 0, _a = fileWatcherCallbacks[fileName]; _i < _a.length; _i++) {
-                            var fileCallback = _a[_i];
-                            fileCallback(fileName);
-                        }
-                    }
-                }
-            }
-            var watchedFileSet = createWatchedFileSet();
-            function isNode4OrLater() {
-                return parseInt(process.version.charAt(1)) >= 4;
-            }
-            var platform = _os.platform();
-            // win32\win64 are case insensitive platforms, MacOS (darwin) by default is also case insensitive
-            var useCaseSensitiveFileNames = platform !== "win32" && platform !== "win64" && platform !== "darwin";
-            function readFile(fileName, encoding) {
-                if (!fileExists(fileName)) {
-                    return undefined;
-                }
-                var buffer = _fs.readFileSync(fileName);
-                var len = buffer.length;
-                if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
-                    // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
-                    // flip all byte pairs and treat as little endian.
-                    len &= ~1;
-                    for (var i = 0; i < len; i += 2) {
-                        var temp = buffer[i];
-                        buffer[i] = buffer[i + 1];
-                        buffer[i + 1] = temp;
-                    }
-                    return buffer.toString("utf16le", 2);
-                }
-                if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
-                    // Little endian UTF-16 byte order mark detected
-                    return buffer.toString("utf16le", 2);
-                }
-                if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
-                    // UTF-8 byte order mark detected
-                    return buffer.toString("utf8", 3);
-                }
-                // Default is UTF-8 with no byte order mark
-                return buffer.toString("utf8");
-            }
-            function writeFile(fileName, data, writeByteOrderMark) {
-                // If a BOM is required, emit one
-                if (writeByteOrderMark) {
-                    data = "\uFEFF" + data;
-                }
-                var fd;
-                try {
-                    fd = _fs.openSync(fileName, "w");
-                    _fs.writeSync(fd, data, undefined, "utf8");
-                }
-                finally {
-                    if (fd !== undefined) {
-                        _fs.closeSync(fd);
-                    }
-                }
-            }
-            function getAccessibleFileSystemEntries(path) {
-                try {
-                    var entries = _fs.readdirSync(path || ".").sort();
-                    var files = [];
-                    var directories = [];
-                    for (var _i = 0, entries_1 = entries; _i < entries_1.length; _i++) {
-                        var entry = entries_1[_i];
-                        // This is necessary because on some file system node fails to exclude
-                        // "." and "..". See https://github.com/nodejs/node/issues/4002
-                        if (entry === "." || entry === "..") {
-                            continue;
-                        }
-                        var name_3 = ts.combinePaths(path, entry);
-                        var stat = void 0;
-                        try {
-                            stat = _fs.statSync(name_3);
-                        }
-                        catch (e) {
-                            continue;
-                        }
-                        if (stat.isFile()) {
-                            files.push(entry);
-                        }
-                        else if (stat.isDirectory()) {
-                            directories.push(entry);
-                        }
-                    }
-                    return { files: files, directories: directories };
-                }
-                catch (e) {
-                    return { files: [], directories: [] };
-                }
-            }
-            function readDirectory(path, extensions, excludes, includes) {
-                return ts.matchFiles(path, extensions, excludes, includes, useCaseSensitiveFileNames, process.cwd(), getAccessibleFileSystemEntries);
-            }
-            var FileSystemEntryKind;
-            (function (FileSystemEntryKind) {
-                FileSystemEntryKind[FileSystemEntryKind["File"] = 0] = "File";
-                FileSystemEntryKind[FileSystemEntryKind["Directory"] = 1] = "Directory";
-            })(FileSystemEntryKind || (FileSystemEntryKind = {}));
-            function fileSystemEntryExists(path, entryKind) {
-                try {
-                    var stat = _fs.statSync(path);
-                    switch (entryKind) {
-                        case 0 /* File */: return stat.isFile();
-                        case 1 /* Directory */: return stat.isDirectory();
-                    }
-                }
-                catch (e) {
-                    return false;
-                }
-            }
-            function fileExists(path) {
-                return fileSystemEntryExists(path, 0 /* File */);
-            }
-            function directoryExists(path) {
-                return fileSystemEntryExists(path, 1 /* Directory */);
-            }
-            function getDirectories(path) {
-                return ts.filter(_fs.readdirSync(path), function (p) { return fileSystemEntryExists(ts.combinePaths(path, p), 1 /* Directory */); });
-            }
-            return {
-                args: process.argv.slice(2),
-                newLine: _os.EOL,
-                useCaseSensitiveFileNames: useCaseSensitiveFileNames,
-                write: function (s) {
-                    process.stdout.write(s);
-                },
-                readFile: readFile,
-                writeFile: writeFile,
-                watchFile: function (fileName, callback) {
-                    if (useNonPollingWatchers) {
-                        var watchedFile_1 = watchedFileSet.addFile(fileName, callback);
-                        return {
-                            close: function () { return watchedFileSet.removeFile(watchedFile_1); }
-                        };
-                    }
-                    else {
-                        _fs.watchFile(fileName, { persistent: true, interval: 250 }, fileChanged);
-                        return {
-                            close: function () { return _fs.unwatchFile(fileName, fileChanged); }
-                        };
-                    }
-                    function fileChanged(curr, prev) {
-                        if (+curr.mtime <= +prev.mtime) {
-                            return;
-                        }
-                        callback(fileName);
-                    }
-                },
-                watchDirectory: function (directoryName, callback, recursive) {
-                    // Node 4.0 `fs.watch` function supports the "recursive" option on both OSX and Windows
-                    // (ref: https://github.com/nodejs/node/pull/2649 and https://github.com/Microsoft/TypeScript/issues/4643)
-                    var options;
-                    if (isNode4OrLater() && (process.platform === "win32" || process.platform === "darwin")) {
-                        options = { persistent: true, recursive: !!recursive };
-                    }
-                    else {
-                        options = { persistent: true };
-                    }
-                    return _fs.watch(directoryName, options, function (eventName, relativeFileName) {
-                        // In watchDirectory we only care about adding and removing files (when event name is
-                        // "rename"); changes made within files are handled by corresponding fileWatchers (when
-                        // event name is "change")
-                        if (eventName === "rename") {
-                            // When deleting a file, the passed baseFileName is null
-                            callback(!relativeFileName ? relativeFileName : ts.normalizePath(ts.combinePaths(directoryName, relativeFileName)));
-                        }
-                        ;
-                    });
-                },
-                resolvePath: function (path) {
-                    return _path.resolve(path);
-                },
-                fileExists: fileExists,
-                directoryExists: directoryExists,
-                createDirectory: function (directoryName) {
-                    if (!this.directoryExists(directoryName)) {
-                        _fs.mkdirSync(directoryName);
-                    }
-                },
-                getExecutingFilePath: function () {
-                    return __filename;
-                },
-                getCurrentDirectory: function () {
-                    return process.cwd();
-                },
-                getDirectories: getDirectories,
-                readDirectory: readDirectory,
-                getModifiedTime: function (path) {
-                    try {
-                        return _fs.statSync(path).mtime;
-                    }
-                    catch (e) {
-                        return undefined;
-                    }
-                },
-                createHash: function (data) {
-                    var hash = _crypto.createHash("md5");
-                    hash.update(data);
-                    return hash.digest("hex");
-                },
-                getMemoryUsage: function () {
-                    if (global.gc) {
-                        global.gc();
-                    }
-                    return process.memoryUsage().heapUsed;
-                },
-                getFileSize: function (path) {
-                    try {
-                        var stat = _fs.statSync(path);
-                        if (stat.isFile()) {
-                            return stat.size;
-                        }
-                    }
-                    catch (e) { }
-                    return 0;
-                },
-                exit: function (exitCode) {
-                    process.exit(exitCode);
-                },
-                realpath: function (path) {
-                    return _fs.realpathSync(path);
-                }
-            };
-        }
-        function getChakraSystem() {
-            var realpath = ChakraHost.realpath && (function (path) { return ChakraHost.realpath(path); });
-            return {
-                newLine: ChakraHost.newLine || "\r\n",
-                args: ChakraHost.args,
-                useCaseSensitiveFileNames: !!ChakraHost.useCaseSensitiveFileNames,
-                write: ChakraHost.echo,
-                readFile: function (path, encoding) {
-                    // encoding is automatically handled by the implementation in ChakraHost
-                    return ChakraHost.readFile(path);
-                },
-                writeFile: function (path, data, writeByteOrderMark) {
-                    // If a BOM is required, emit one
-                    if (writeByteOrderMark) {
-                        data = "\uFEFF" + data;
-                    }
-                    ChakraHost.writeFile(path, data);
-                },
-                resolvePath: ChakraHost.resolvePath,
-                fileExists: ChakraHost.fileExists,
-                directoryExists: ChakraHost.directoryExists,
-                createDirectory: ChakraHost.createDirectory,
-                getExecutingFilePath: function () { return ChakraHost.executingFile; },
-                getCurrentDirectory: function () { return ChakraHost.currentDirectory; },
-                getDirectories: ChakraHost.getDirectories,
-                readDirectory: function (path, extensions, excludes, includes) {
-                    var pattern = ts.getFileMatcherPatterns(path, extensions, excludes, includes, !!ChakraHost.useCaseSensitiveFileNames, ChakraHost.currentDirectory);
-                    return ChakraHost.readDirectory(path, extensions, pattern.basePaths, pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern);
-                },
-                exit: ChakraHost.quit,
-                realpath: realpath
-            };
-        }
-        if (typeof ChakraHost !== "undefined") {
-            return getChakraSystem();
-        }
-        else if (typeof WScript !== "undefined" && typeof ActiveXObject === "function") {
-            return getWScriptSystem();
-        }
-        else if (typeof process !== "undefined" && process.nextTick && !process.browser && typeof require !== "undefined") {
-            // process and process.nextTick checks if current environment is node-like
-            // process.browser check excludes webpack and browserify
-            return getNodeSystem();
-        }
-        else {
-            return undefined; // Unsupported host
-        }
-    })();
-})(ts || (ts = {}));
-// <auto-generated />
-/// <reference path="types.ts" />
-/* @internal */
-var ts;
-(function (ts) {
-    ts.Diagnostics = {
-        Unterminated_string_literal: { code: 1002, category: ts.DiagnosticCategory.Error, key: "Unterminated_string_literal_1002", message: "Unterminated string literal." },
-        Identifier_expected: { code: 1003, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_1003", message: "Identifier expected." },
-        _0_expected: { code: 1005, category: ts.DiagnosticCategory.Error, key: "_0_expected_1005", message: "'{0}' expected." },
-        A_file_cannot_have_a_reference_to_itself: { code: 1006, category: ts.DiagnosticCategory.Error, key: "A_file_cannot_have_a_reference_to_itself_1006", message: "A file cannot have a reference to itself." },
-        Trailing_comma_not_allowed: { code: 1009, category: ts.DiagnosticCategory.Error, key: "Trailing_comma_not_allowed_1009", message: "Trailing comma not allowed." },
-        Asterisk_Slash_expected: { code: 1010, category: ts.DiagnosticCategory.Error, key: "Asterisk_Slash_expected_1010", message: "'*/' expected." },
-        Unexpected_token: { code: 1012, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_1012", message: "Unexpected token." },
-        A_rest_parameter_must_be_last_in_a_parameter_list: { code: 1014, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_last_in_a_parameter_list_1014", message: "A rest parameter must be last in a parameter list." },
-        Parameter_cannot_have_question_mark_and_initializer: { code: 1015, category: ts.DiagnosticCategory.Error, key: "Parameter_cannot_have_question_mark_and_initializer_1015", message: "Parameter cannot have question mark and initializer." },
-        A_required_parameter_cannot_follow_an_optional_parameter: { code: 1016, category: ts.DiagnosticCategory.Error, key: "A_required_parameter_cannot_follow_an_optional_parameter_1016", message: "A required parameter cannot follow an optional parameter." },
-        An_index_signature_cannot_have_a_rest_parameter: { code: 1017, category: ts.DiagnosticCategory.Error, key: "An_index_signature_cannot_have_a_rest_parameter_1017", message: "An index signature cannot have a rest parameter." },
-        An_index_signature_parameter_cannot_have_an_accessibility_modifier: { code: 1018, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_accessibility_modifier_1018", message: "An index signature parameter cannot have an accessibility modifier." },
-        An_index_signature_parameter_cannot_have_a_question_mark: { code: 1019, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_a_question_mark_1019", message: "An index signature parameter cannot have a question mark." },
-        An_index_signature_parameter_cannot_have_an_initializer: { code: 1020, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_cannot_have_an_initializer_1020", message: "An index signature parameter cannot have an initializer." },
-        An_index_signature_must_have_a_type_annotation: { code: 1021, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_a_type_annotation_1021", message: "An index signature must have a type annotation." },
-        An_index_signature_parameter_must_have_a_type_annotation: { code: 1022, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_must_have_a_type_annotation_1022", message: "An index signature parameter must have a type annotation." },
-        An_index_signature_parameter_type_must_be_string_or_number: { code: 1023, category: ts.DiagnosticCategory.Error, key: "An_index_signature_parameter_type_must_be_string_or_number_1023", message: "An index signature parameter type must be 'string' or 'number'." },
-        readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature: { code: 1024, category: ts.DiagnosticCategory.Error, key: "readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature_1024", message: "'readonly' modifier can only appear on a property declaration or index signature." },
-        Accessibility_modifier_already_seen: { code: 1028, category: ts.DiagnosticCategory.Error, key: "Accessibility_modifier_already_seen_1028", message: "Accessibility modifier already seen." },
-        _0_modifier_must_precede_1_modifier: { code: 1029, category: ts.DiagnosticCategory.Error, key: "_0_modifier_must_precede_1_modifier_1029", message: "'{0}' modifier must precede '{1}' modifier." },
-        _0_modifier_already_seen: { code: 1030, category: ts.DiagnosticCategory.Error, key: "_0_modifier_already_seen_1030", message: "'{0}' modifier already seen." },
-        _0_modifier_cannot_appear_on_a_class_element: { code: 1031, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_class_element_1031", message: "'{0}' modifier cannot appear on a class element." },
-        super_must_be_followed_by_an_argument_list_or_member_access: { code: 1034, category: ts.DiagnosticCategory.Error, key: "super_must_be_followed_by_an_argument_list_or_member_access_1034", message: "'super' must be followed by an argument list or member access." },
-        Only_ambient_modules_can_use_quoted_names: { code: 1035, category: ts.DiagnosticCategory.Error, key: "Only_ambient_modules_can_use_quoted_names_1035", message: "Only ambient modules can use quoted names." },
-        Statements_are_not_allowed_in_ambient_contexts: { code: 1036, category: ts.DiagnosticCategory.Error, key: "Statements_are_not_allowed_in_ambient_contexts_1036", message: "Statements are not allowed in ambient contexts." },
-        A_declare_modifier_cannot_be_used_in_an_already_ambient_context: { code: 1038, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_cannot_be_used_in_an_already_ambient_context_1038", message: "A 'declare' modifier cannot be used in an already ambient context." },
-        Initializers_are_not_allowed_in_ambient_contexts: { code: 1039, category: ts.DiagnosticCategory.Error, key: "Initializers_are_not_allowed_in_ambient_contexts_1039", message: "Initializers are not allowed in ambient contexts." },
-        _0_modifier_cannot_be_used_in_an_ambient_context: { code: 1040, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_in_an_ambient_context_1040", message: "'{0}' modifier cannot be used in an ambient context." },
-        _0_modifier_cannot_be_used_with_a_class_declaration: { code: 1041, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_a_class_declaration_1041", message: "'{0}' modifier cannot be used with a class declaration." },
-        _0_modifier_cannot_be_used_here: { code: 1042, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_here_1042", message: "'{0}' modifier cannot be used here." },
-        _0_modifier_cannot_appear_on_a_data_property: { code: 1043, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_data_property_1043", message: "'{0}' modifier cannot appear on a data property." },
-        _0_modifier_cannot_appear_on_a_module_or_namespace_element: { code: 1044, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_module_or_namespace_element_1044", message: "'{0}' modifier cannot appear on a module or namespace element." },
-        A_0_modifier_cannot_be_used_with_an_interface_declaration: { code: 1045, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_interface_declaration_1045", message: "A '{0}' modifier cannot be used with an interface declaration." },
-        A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file: { code: 1046, category: ts.DiagnosticCategory.Error, key: "A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file_1046", message: "A 'declare' modifier is required for a top level declaration in a .d.ts file." },
-        A_rest_parameter_cannot_be_optional: { code: 1047, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_be_optional_1047", message: "A rest parameter cannot be optional." },
-        A_rest_parameter_cannot_have_an_initializer: { code: 1048, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_cannot_have_an_initializer_1048", message: "A rest parameter cannot have an initializer." },
-        A_set_accessor_must_have_exactly_one_parameter: { code: 1049, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_must_have_exactly_one_parameter_1049", message: "A 'set' accessor must have exactly one parameter." },
-        A_set_accessor_cannot_have_an_optional_parameter: { code: 1051, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_an_optional_parameter_1051", message: "A 'set' accessor cannot have an optional parameter." },
-        A_set_accessor_parameter_cannot_have_an_initializer: { code: 1052, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_parameter_cannot_have_an_initializer_1052", message: "A 'set' accessor parameter cannot have an initializer." },
-        A_set_accessor_cannot_have_rest_parameter: { code: 1053, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_rest_parameter_1053", message: "A 'set' accessor cannot have rest parameter." },
-        A_get_accessor_cannot_have_parameters: { code: 1054, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_cannot_have_parameters_1054", message: "A 'get' accessor cannot have parameters." },
-        Type_0_is_not_a_valid_async_function_return_type: { code: 1055, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_valid_async_function_return_type_1055", message: "Type '{0}' is not a valid async function return type." },
-        Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher: { code: 1056, category: ts.DiagnosticCategory.Error, key: "Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher_1056", message: "Accessors are only available when targeting ECMAScript 5 and higher." },
-        An_async_function_or_method_must_have_a_valid_awaitable_return_type: { code: 1057, category: ts.DiagnosticCategory.Error, key: "An_async_function_or_method_must_have_a_valid_awaitable_return_type_1057", message: "An async function or method must have a valid awaitable return type." },
-        Operand_for_await_does_not_have_a_valid_callable_then_member: { code: 1058, category: ts.DiagnosticCategory.Error, key: "Operand_for_await_does_not_have_a_valid_callable_then_member_1058", message: "Operand for 'await' does not have a valid callable 'then' member." },
-        Return_expression_in_async_function_does_not_have_a_valid_callable_then_member: { code: 1059, category: ts.DiagnosticCategory.Error, key: "Return_expression_in_async_function_does_not_have_a_valid_callable_then_member_1059", message: "Return expression in async function does not have a valid callable 'then' member." },
-        Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member: { code: 1060, category: ts.DiagnosticCategory.Error, key: "Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member_1060", message: "Expression body for async arrow function does not have a valid callable 'then' member." },
-        Enum_member_must_have_initializer: { code: 1061, category: ts.DiagnosticCategory.Error, key: "Enum_member_must_have_initializer_1061", message: "Enum member must have initializer." },
-        _0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method: { code: 1062, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method_1062", message: "{0} is referenced directly or indirectly in the fulfillment callback of its own 'then' method." },
-        An_export_assignment_cannot_be_used_in_a_namespace: { code: 1063, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_namespace_1063", message: "An export assignment cannot be used in a namespace." },
-        The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type: { code: 1064, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type_1064", message: "The return type of an async function or method must be the global Promise<T> type." },
-        In_ambient_enum_declarations_member_initializer_must_be_constant_expression: { code: 1066, category: ts.DiagnosticCategory.Error, key: "In_ambient_enum_declarations_member_initializer_must_be_constant_expression_1066", message: "In ambient enum declarations member initializer must be constant expression." },
-        Unexpected_token_A_constructor_method_accessor_or_property_was_expected: { code: 1068, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_A_constructor_method_accessor_or_property_was_expected_1068", message: "Unexpected token. A constructor, method, accessor, or property was expected." },
-        _0_modifier_cannot_appear_on_a_type_member: { code: 1070, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_type_member_1070", message: "'{0}' modifier cannot appear on a type member." },
-        _0_modifier_cannot_appear_on_an_index_signature: { code: 1071, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_an_index_signature_1071", message: "'{0}' modifier cannot appear on an index signature." },
-        A_0_modifier_cannot_be_used_with_an_import_declaration: { code: 1079, category: ts.DiagnosticCategory.Error, key: "A_0_modifier_cannot_be_used_with_an_import_declaration_1079", message: "A '{0}' modifier cannot be used with an import declaration." },
-        Invalid_reference_directive_syntax: { code: 1084, category: ts.DiagnosticCategory.Error, key: "Invalid_reference_directive_syntax_1084", message: "Invalid 'reference' directive syntax." },
-        Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher: { code: 1085, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher_1085", message: "Octal literals are not available when targeting ECMAScript 5 and higher." },
-        An_accessor_cannot_be_declared_in_an_ambient_context: { code: 1086, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_be_declared_in_an_ambient_context_1086", message: "An accessor cannot be declared in an ambient context." },
-        _0_modifier_cannot_appear_on_a_constructor_declaration: { code: 1089, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_constructor_declaration_1089", message: "'{0}' modifier cannot appear on a constructor declaration." },
-        _0_modifier_cannot_appear_on_a_parameter: { code: 1090, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_appear_on_a_parameter_1090", message: "'{0}' modifier cannot appear on a parameter." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement: { code: 1091, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement_1091", message: "Only a single variable declaration is allowed in a 'for...in' statement." },
-        Type_parameters_cannot_appear_on_a_constructor_declaration: { code: 1092, category: ts.DiagnosticCategory.Error, key: "Type_parameters_cannot_appear_on_a_constructor_declaration_1092", message: "Type parameters cannot appear on a constructor declaration." },
-        Type_annotation_cannot_appear_on_a_constructor_declaration: { code: 1093, category: ts.DiagnosticCategory.Error, key: "Type_annotation_cannot_appear_on_a_constructor_declaration_1093", message: "Type annotation cannot appear on a constructor declaration." },
-        An_accessor_cannot_have_type_parameters: { code: 1094, category: ts.DiagnosticCategory.Error, key: "An_accessor_cannot_have_type_parameters_1094", message: "An accessor cannot have type parameters." },
-        A_set_accessor_cannot_have_a_return_type_annotation: { code: 1095, category: ts.DiagnosticCategory.Error, key: "A_set_accessor_cannot_have_a_return_type_annotation_1095", message: "A 'set' accessor cannot have a return type annotation." },
-        An_index_signature_must_have_exactly_one_parameter: { code: 1096, category: ts.DiagnosticCategory.Error, key: "An_index_signature_must_have_exactly_one_parameter_1096", message: "An index signature must have exactly one parameter." },
-        _0_list_cannot_be_empty: { code: 1097, category: ts.DiagnosticCategory.Error, key: "_0_list_cannot_be_empty_1097", message: "'{0}' list cannot be empty." },
-        Type_parameter_list_cannot_be_empty: { code: 1098, category: ts.DiagnosticCategory.Error, key: "Type_parameter_list_cannot_be_empty_1098", message: "Type parameter list cannot be empty." },
-        Type_argument_list_cannot_be_empty: { code: 1099, category: ts.DiagnosticCategory.Error, key: "Type_argument_list_cannot_be_empty_1099", message: "Type argument list cannot be empty." },
-        Invalid_use_of_0_in_strict_mode: { code: 1100, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_in_strict_mode_1100", message: "Invalid use of '{0}' in strict mode." },
-        with_statements_are_not_allowed_in_strict_mode: { code: 1101, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_strict_mode_1101", message: "'with' statements are not allowed in strict mode." },
-        delete_cannot_be_called_on_an_identifier_in_strict_mode: { code: 1102, category: ts.DiagnosticCategory.Error, key: "delete_cannot_be_called_on_an_identifier_in_strict_mode_1102", message: "'delete' cannot be called on an identifier in strict mode." },
-        A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement: { code: 1104, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement_1104", message: "A 'continue' statement can only be used within an enclosing iteration statement." },
-        A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement: { code: 1105, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement_1105", message: "A 'break' statement can only be used within an enclosing iteration or switch statement." },
-        Jump_target_cannot_cross_function_boundary: { code: 1107, category: ts.DiagnosticCategory.Error, key: "Jump_target_cannot_cross_function_boundary_1107", message: "Jump target cannot cross function boundary." },
-        A_return_statement_can_only_be_used_within_a_function_body: { code: 1108, category: ts.DiagnosticCategory.Error, key: "A_return_statement_can_only_be_used_within_a_function_body_1108", message: "A 'return' statement can only be used within a function body." },
-        Expression_expected: { code: 1109, category: ts.DiagnosticCategory.Error, key: "Expression_expected_1109", message: "Expression expected." },
-        Type_expected: { code: 1110, category: ts.DiagnosticCategory.Error, key: "Type_expected_1110", message: "Type expected." },
-        A_default_clause_cannot_appear_more_than_once_in_a_switch_statement: { code: 1113, category: ts.DiagnosticCategory.Error, key: "A_default_clause_cannot_appear_more_than_once_in_a_switch_statement_1113", message: "A 'default' clause cannot appear more than once in a 'switch' statement." },
-        Duplicate_label_0: { code: 1114, category: ts.DiagnosticCategory.Error, key: "Duplicate_label_0_1114", message: "Duplicate label '{0}'" },
-        A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement: { code: 1115, category: ts.DiagnosticCategory.Error, key: "A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement_1115", message: "A 'continue' statement can only jump to a label of an enclosing iteration statement." },
-        A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement: { code: 1116, category: ts.DiagnosticCategory.Error, key: "A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement_1116", message: "A 'break' statement can only jump to a label of an enclosing statement." },
-        An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode: { code: 1117, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode_1117", message: "An object literal cannot have multiple properties with the same name in strict mode." },
-        An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name: { code: 1118, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name_1118", message: "An object literal cannot have multiple get/set accessors with the same name." },
-        An_object_literal_cannot_have_property_and_accessor_with_the_same_name: { code: 1119, category: ts.DiagnosticCategory.Error, key: "An_object_literal_cannot_have_property_and_accessor_with_the_same_name_1119", message: "An object literal cannot have property and accessor with the same name." },
-        An_export_assignment_cannot_have_modifiers: { code: 1120, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_have_modifiers_1120", message: "An export assignment cannot have modifiers." },
-        Octal_literals_are_not_allowed_in_strict_mode: { code: 1121, category: ts.DiagnosticCategory.Error, key: "Octal_literals_are_not_allowed_in_strict_mode_1121", message: "Octal literals are not allowed in strict mode." },
-        A_tuple_type_element_list_cannot_be_empty: { code: 1122, category: ts.DiagnosticCategory.Error, key: "A_tuple_type_element_list_cannot_be_empty_1122", message: "A tuple type element list cannot be empty." },
-        Variable_declaration_list_cannot_be_empty: { code: 1123, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_list_cannot_be_empty_1123", message: "Variable declaration list cannot be empty." },
-        Digit_expected: { code: 1124, category: ts.DiagnosticCategory.Error, key: "Digit_expected_1124", message: "Digit expected." },
-        Hexadecimal_digit_expected: { code: 1125, category: ts.DiagnosticCategory.Error, key: "Hexadecimal_digit_expected_1125", message: "Hexadecimal digit expected." },
-        Unexpected_end_of_text: { code: 1126, category: ts.DiagnosticCategory.Error, key: "Unexpected_end_of_text_1126", message: "Unexpected end of text." },
-        Invalid_character: { code: 1127, category: ts.DiagnosticCategory.Error, key: "Invalid_character_1127", message: "Invalid character." },
-        Declaration_or_statement_expected: { code: 1128, category: ts.DiagnosticCategory.Error, key: "Declaration_or_statement_expected_1128", message: "Declaration or statement expected." },
-        Statement_expected: { code: 1129, category: ts.DiagnosticCategory.Error, key: "Statement_expected_1129", message: "Statement expected." },
-        case_or_default_expected: { code: 1130, category: ts.DiagnosticCategory.Error, key: "case_or_default_expected_1130", message: "'case' or 'default' expected." },
-        Property_or_signature_expected: { code: 1131, category: ts.DiagnosticCategory.Error, key: "Property_or_signature_expected_1131", message: "Property or signature expected." },
-        Enum_member_expected: { code: 1132, category: ts.DiagnosticCategory.Error, key: "Enum_member_expected_1132", message: "Enum member expected." },
-        Variable_declaration_expected: { code: 1134, category: ts.DiagnosticCategory.Error, key: "Variable_declaration_expected_1134", message: "Variable declaration expected." },
-        Argument_expression_expected: { code: 1135, category: ts.DiagnosticCategory.Error, key: "Argument_expression_expected_1135", message: "Argument expression expected." },
-        Property_assignment_expected: { code: 1136, category: ts.DiagnosticCategory.Error, key: "Property_assignment_expected_1136", message: "Property assignment expected." },
-        Expression_or_comma_expected: { code: 1137, category: ts.DiagnosticCategory.Error, key: "Expression_or_comma_expected_1137", message: "Expression or comma expected." },
-        Parameter_declaration_expected: { code: 1138, category: ts.DiagnosticCategory.Error, key: "Parameter_declaration_expected_1138", message: "Parameter declaration expected." },
-        Type_parameter_declaration_expected: { code: 1139, category: ts.DiagnosticCategory.Error, key: "Type_parameter_declaration_expected_1139", message: "Type parameter declaration expected." },
-        Type_argument_expected: { code: 1140, category: ts.DiagnosticCategory.Error, key: "Type_argument_expected_1140", message: "Type argument expected." },
-        String_literal_expected: { code: 1141, category: ts.DiagnosticCategory.Error, key: "String_literal_expected_1141", message: "String literal expected." },
-        Line_break_not_permitted_here: { code: 1142, category: ts.DiagnosticCategory.Error, key: "Line_break_not_permitted_here_1142", message: "Line break not permitted here." },
-        or_expected: { code: 1144, category: ts.DiagnosticCategory.Error, key: "or_expected_1144", message: "'{' or ';' expected." },
-        Declaration_expected: { code: 1146, category: ts.DiagnosticCategory.Error, key: "Declaration_expected_1146", message: "Declaration expected." },
-        Import_declarations_in_a_namespace_cannot_reference_a_module: { code: 1147, category: ts.DiagnosticCategory.Error, key: "Import_declarations_in_a_namespace_cannot_reference_a_module_1147", message: "Import declarations in a namespace cannot reference a module." },
-        Cannot_use_imports_exports_or_module_augmentations_when_module_is_none: { code: 1148, category: ts.DiagnosticCategory.Error, key: "Cannot_use_imports_exports_or_module_augmentations_when_module_is_none_1148", message: "Cannot use imports, exports, or module augmentations when '--module' is 'none'." },
-        File_name_0_differs_from_already_included_file_name_1_only_in_casing: { code: 1149, category: ts.DiagnosticCategory.Error, key: "File_name_0_differs_from_already_included_file_name_1_only_in_casing_1149", message: "File name '{0}' differs from already included file name '{1}' only in casing" },
-        new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead: { code: 1150, category: ts.DiagnosticCategory.Error, key: "new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead_1150", message: "'new T[]' cannot be used to create an array. Use 'new Array<T>()' instead." },
-        const_declarations_must_be_initialized: { code: 1155, category: ts.DiagnosticCategory.Error, key: "const_declarations_must_be_initialized_1155", message: "'const' declarations must be initialized" },
-        const_declarations_can_only_be_declared_inside_a_block: { code: 1156, category: ts.DiagnosticCategory.Error, key: "const_declarations_can_only_be_declared_inside_a_block_1156", message: "'const' declarations can only be declared inside a block." },
-        let_declarations_can_only_be_declared_inside_a_block: { code: 1157, category: ts.DiagnosticCategory.Error, key: "let_declarations_can_only_be_declared_inside_a_block_1157", message: "'let' declarations can only be declared inside a block." },
-        Unterminated_template_literal: { code: 1160, category: ts.DiagnosticCategory.Error, key: "Unterminated_template_literal_1160", message: "Unterminated template literal." },
-        Unterminated_regular_expression_literal: { code: 1161, category: ts.DiagnosticCategory.Error, key: "Unterminated_regular_expression_literal_1161", message: "Unterminated regular expression literal." },
-        An_object_member_cannot_be_declared_optional: { code: 1162, category: ts.DiagnosticCategory.Error, key: "An_object_member_cannot_be_declared_optional_1162", message: "An object member cannot be declared optional." },
-        A_yield_expression_is_only_allowed_in_a_generator_body: { code: 1163, category: ts.DiagnosticCategory.Error, key: "A_yield_expression_is_only_allowed_in_a_generator_body_1163", message: "A 'yield' expression is only allowed in a generator body." },
-        Computed_property_names_are_not_allowed_in_enums: { code: 1164, category: ts.DiagnosticCategory.Error, key: "Computed_property_names_are_not_allowed_in_enums_1164", message: "Computed property names are not allowed in enums." },
-        A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol: { code: 1165, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol_1165", message: "A computed property name in an ambient context must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol: { code: 1166, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol_1166", message: "A computed property name in a class property declaration must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol: { code: 1168, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol_1168", message: "A computed property name in a method overload must directly refer to a built-in symbol." },
-        A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol: { code: 1169, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol_1169", message: "A computed property name in an interface must directly refer to a built-in symbol." },
-        A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol: { code: 1170, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol_1170", message: "A computed property name in a type literal must directly refer to a built-in symbol." },
-        A_comma_expression_is_not_allowed_in_a_computed_property_name: { code: 1171, category: ts.DiagnosticCategory.Error, key: "A_comma_expression_is_not_allowed_in_a_computed_property_name_1171", message: "A comma expression is not allowed in a computed property name." },
-        extends_clause_already_seen: { code: 1172, category: ts.DiagnosticCategory.Error, key: "extends_clause_already_seen_1172", message: "'extends' clause already seen." },
-        extends_clause_must_precede_implements_clause: { code: 1173, category: ts.DiagnosticCategory.Error, key: "extends_clause_must_precede_implements_clause_1173", message: "'extends' clause must precede 'implements' clause." },
-        Classes_can_only_extend_a_single_class: { code: 1174, category: ts.DiagnosticCategory.Error, key: "Classes_can_only_extend_a_single_class_1174", message: "Classes can only extend a single class." },
-        implements_clause_already_seen: { code: 1175, category: ts.DiagnosticCategory.Error, key: "implements_clause_already_seen_1175", message: "'implements' clause already seen." },
-        Interface_declaration_cannot_have_implements_clause: { code: 1176, category: ts.DiagnosticCategory.Error, key: "Interface_declaration_cannot_have_implements_clause_1176", message: "Interface declaration cannot have 'implements' clause." },
-        Binary_digit_expected: { code: 1177, category: ts.DiagnosticCategory.Error, key: "Binary_digit_expected_1177", message: "Binary digit expected." },
-        Octal_digit_expected: { code: 1178, category: ts.DiagnosticCategory.Error, key: "Octal_digit_expected_1178", message: "Octal digit expected." },
-        Unexpected_token_expected: { code: 1179, category: ts.DiagnosticCategory.Error, key: "Unexpected_token_expected_1179", message: "Unexpected token. '{' expected." },
-        Property_destructuring_pattern_expected: { code: 1180, category: ts.DiagnosticCategory.Error, key: "Property_destructuring_pattern_expected_1180", message: "Property destructuring pattern expected." },
-        Array_element_destructuring_pattern_expected: { code: 1181, category: ts.DiagnosticCategory.Error, key: "Array_element_destructuring_pattern_expected_1181", message: "Array element destructuring pattern expected." },
-        A_destructuring_declaration_must_have_an_initializer: { code: 1182, category: ts.DiagnosticCategory.Error, key: "A_destructuring_declaration_must_have_an_initializer_1182", message: "A destructuring declaration must have an initializer." },
-        An_implementation_cannot_be_declared_in_ambient_contexts: { code: 1183, category: ts.DiagnosticCategory.Error, key: "An_implementation_cannot_be_declared_in_ambient_contexts_1183", message: "An implementation cannot be declared in ambient contexts." },
-        Modifiers_cannot_appear_here: { code: 1184, category: ts.DiagnosticCategory.Error, key: "Modifiers_cannot_appear_here_1184", message: "Modifiers cannot appear here." },
-        Merge_conflict_marker_encountered: { code: 1185, category: ts.DiagnosticCategory.Error, key: "Merge_conflict_marker_encountered_1185", message: "Merge conflict marker encountered." },
-        A_rest_element_cannot_have_an_initializer: { code: 1186, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_have_an_initializer_1186", message: "A rest element cannot have an initializer." },
-        A_parameter_property_may_not_be_declared_using_a_binding_pattern: { code: 1187, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_may_not_be_declared_using_a_binding_pattern_1187", message: "A parameter property may not be declared using a binding pattern." },
-        Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement: { code: 1188, category: ts.DiagnosticCategory.Error, key: "Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement_1188", message: "Only a single variable declaration is allowed in a 'for...of' statement." },
-        The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer: { code: 1189, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer_1189", message: "The variable declaration of a 'for...in' statement cannot have an initializer." },
-        The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer: { code: 1190, category: ts.DiagnosticCategory.Error, key: "The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer_1190", message: "The variable declaration of a 'for...of' statement cannot have an initializer." },
-        An_import_declaration_cannot_have_modifiers: { code: 1191, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_cannot_have_modifiers_1191", message: "An import declaration cannot have modifiers." },
-        Module_0_has_no_default_export: { code: 1192, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_default_export_1192", message: "Module '{0}' has no default export." },
-        An_export_declaration_cannot_have_modifiers: { code: 1193, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_cannot_have_modifiers_1193", message: "An export declaration cannot have modifiers." },
-        Export_declarations_are_not_permitted_in_a_namespace: { code: 1194, category: ts.DiagnosticCategory.Error, key: "Export_declarations_are_not_permitted_in_a_namespace_1194", message: "Export declarations are not permitted in a namespace." },
-        Catch_clause_variable_name_must_be_an_identifier: { code: 1195, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_name_must_be_an_identifier_1195", message: "Catch clause variable name must be an identifier." },
-        Catch_clause_variable_cannot_have_a_type_annotation: { code: 1196, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_a_type_annotation_1196", message: "Catch clause variable cannot have a type annotation." },
-        Catch_clause_variable_cannot_have_an_initializer: { code: 1197, category: ts.DiagnosticCategory.Error, key: "Catch_clause_variable_cannot_have_an_initializer_1197", message: "Catch clause variable cannot have an initializer." },
-        An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive: { code: 1198, category: ts.DiagnosticCategory.Error, key: "An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive_1198", message: "An extended Unicode escape value must be between 0x0 and 0x10FFFF inclusive." },
-        Unterminated_Unicode_escape_sequence: { code: 1199, category: ts.DiagnosticCategory.Error, key: "Unterminated_Unicode_escape_sequence_1199", message: "Unterminated Unicode escape sequence." },
-        Line_terminator_not_permitted_before_arrow: { code: 1200, category: ts.DiagnosticCategory.Error, key: "Line_terminator_not_permitted_before_arrow_1200", message: "Line terminator not permitted before arrow." },
-        Import_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead: { code: 1202, category: ts.DiagnosticCategory.Error, key: "Import_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_import_Asteri_1202", message: "Import assignment cannot be used when targeting ECMAScript 2015 modules. Consider using 'import * as ns from \"mod\"', 'import {a} from \"mod\"', 'import d from \"mod\"', or another module format instead." },
-        Export_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_export_default_or_another_module_format_instead: { code: 1203, category: ts.DiagnosticCategory.Error, key: "Export_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_export_defaul_1203", message: "Export assignment cannot be used when targeting ECMAScript 2015 modules. Consider using 'export default' or another module format instead." },
-        Decorators_are_not_valid_here: { code: 1206, category: ts.DiagnosticCategory.Error, key: "Decorators_are_not_valid_here_1206", message: "Decorators are not valid here." },
-        Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name: { code: 1207, category: ts.DiagnosticCategory.Error, key: "Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name_1207", message: "Decorators cannot be applied to multiple get/set accessors of the same name." },
-        Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided: { code: 1208, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided_1208", message: "Cannot compile namespaces when the '--isolatedModules' flag is provided." },
-        Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided: { code: 1209, category: ts.DiagnosticCategory.Error, key: "Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided_1209", message: "Ambient const enums are not allowed when the '--isolatedModules' flag is provided." },
-        Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode: { code: 1210, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode_1210", message: "Invalid use of '{0}'. Class definitions are automatically in strict mode." },
-        A_class_declaration_without_the_default_modifier_must_have_a_name: { code: 1211, category: ts.DiagnosticCategory.Error, key: "A_class_declaration_without_the_default_modifier_must_have_a_name_1211", message: "A class declaration without the 'default' modifier must have a name" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode: { code: 1212, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_1212", message: "Identifier expected. '{0}' is a reserved word in strict mode" },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode: { code: 1213, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_stric_1213", message: "Identifier expected. '{0}' is a reserved word in strict mode. Class definitions are automatically in strict mode." },
-        Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode: { code: 1214, category: ts.DiagnosticCategory.Error, key: "Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode_1214", message: "Identifier expected. '{0}' is a reserved word in strict mode. Modules are automatically in strict mode." },
-        Invalid_use_of_0_Modules_are_automatically_in_strict_mode: { code: 1215, category: ts.DiagnosticCategory.Error, key: "Invalid_use_of_0_Modules_are_automatically_in_strict_mode_1215", message: "Invalid use of '{0}'. Modules are automatically in strict mode." },
-        Export_assignment_is_not_supported_when_module_flag_is_system: { code: 1218, category: ts.DiagnosticCategory.Error, key: "Export_assignment_is_not_supported_when_module_flag_is_system_1218", message: "Export assignment is not supported when '--module' flag is 'system'." },
-        Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning: { code: 1219, category: ts.DiagnosticCategory.Error, key: "Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_t_1219", message: "Experimental support for decorators is a feature that is subject to change in a future release. Set the 'experimentalDecorators' option to remove this warning." },
-        Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher: { code: 1220, category: ts.DiagnosticCategory.Error, key: "Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher_1220", message: "Generators are only available when targeting ECMAScript 2015 or higher." },
-        Generators_are_not_allowed_in_an_ambient_context: { code: 1221, category: ts.DiagnosticCategory.Error, key: "Generators_are_not_allowed_in_an_ambient_context_1221", message: "Generators are not allowed in an ambient context." },
-        An_overload_signature_cannot_be_declared_as_a_generator: { code: 1222, category: ts.DiagnosticCategory.Error, key: "An_overload_signature_cannot_be_declared_as_a_generator_1222", message: "An overload signature cannot be declared as a generator." },
-        _0_tag_already_specified: { code: 1223, category: ts.DiagnosticCategory.Error, key: "_0_tag_already_specified_1223", message: "'{0}' tag already specified." },
-        Signature_0_must_have_a_type_predicate: { code: 1224, category: ts.DiagnosticCategory.Error, key: "Signature_0_must_have_a_type_predicate_1224", message: "Signature '{0}' must have a type predicate." },
-        Cannot_find_parameter_0: { code: 1225, category: ts.DiagnosticCategory.Error, key: "Cannot_find_parameter_0_1225", message: "Cannot find parameter '{0}'." },
-        Type_predicate_0_is_not_assignable_to_1: { code: 1226, category: ts.DiagnosticCategory.Error, key: "Type_predicate_0_is_not_assignable_to_1_1226", message: "Type predicate '{0}' is not assignable to '{1}'." },
-        Parameter_0_is_not_in_the_same_position_as_parameter_1: { code: 1227, category: ts.DiagnosticCategory.Error, key: "Parameter_0_is_not_in_the_same_position_as_parameter_1_1227", message: "Parameter '{0}' is not in the same position as parameter '{1}'." },
-        A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: { code: 1228, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", message: "A type predicate is only allowed in return type position for functions and methods." },
-        A_type_predicate_cannot_reference_a_rest_parameter: { code: 1229, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_a_rest_parameter_1229", message: "A type predicate cannot reference a rest parameter." },
-        A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: { code: 1230, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", message: "A type predicate cannot reference element '{0}' in a binding pattern." },
-        An_export_assignment_can_only_be_used_in_a_module: { code: 1231, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_can_only_be_used_in_a_module_1231", message: "An export assignment can only be used in a module." },
-        An_import_declaration_can_only_be_used_in_a_namespace_or_module: { code: 1232, category: ts.DiagnosticCategory.Error, key: "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", message: "An import declaration can only be used in a namespace or module." },
-        An_export_declaration_can_only_be_used_in_a_module: { code: 1233, category: ts.DiagnosticCategory.Error, key: "An_export_declaration_can_only_be_used_in_a_module_1233", message: "An export declaration can only be used in a module." },
-        An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: { code: 1234, category: ts.DiagnosticCategory.Error, key: "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", message: "An ambient module declaration is only allowed at the top level in a file." },
-        A_namespace_declaration_is_only_allowed_in_a_namespace_or_module: { code: 1235, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_is_only_allowed_in_a_namespace_or_module_1235", message: "A namespace declaration is only allowed in a namespace or module." },
-        The_return_type_of_a_property_decorator_function_must_be_either_void_or_any: { code: 1236, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_property_decorator_function_must_be_either_void_or_any_1236", message: "The return type of a property decorator function must be either 'void' or 'any'." },
-        The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any: { code: 1237, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any_1237", message: "The return type of a parameter decorator function must be either 'void' or 'any'." },
-        Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression: { code: 1238, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression_1238", message: "Unable to resolve signature of class decorator when called as an expression." },
-        Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression: { code: 1239, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression_1239", message: "Unable to resolve signature of parameter decorator when called as an expression." },
-        Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression: { code: 1240, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression_1240", message: "Unable to resolve signature of property decorator when called as an expression." },
-        Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression: { code: 1241, category: ts.DiagnosticCategory.Error, key: "Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression_1241", message: "Unable to resolve signature of method decorator when called as an expression." },
-        abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration: { code: 1242, category: ts.DiagnosticCategory.Error, key: "abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration_1242", message: "'abstract' modifier can only appear on a class, method, or property declaration." },
-        _0_modifier_cannot_be_used_with_1_modifier: { code: 1243, category: ts.DiagnosticCategory.Error, key: "_0_modifier_cannot_be_used_with_1_modifier_1243", message: "'{0}' modifier cannot be used with '{1}' modifier." },
-        Abstract_methods_can_only_appear_within_an_abstract_class: { code: 1244, category: ts.DiagnosticCategory.Error, key: "Abstract_methods_can_only_appear_within_an_abstract_class_1244", message: "Abstract methods can only appear within an abstract class." },
-        Method_0_cannot_have_an_implementation_because_it_is_marked_abstract: { code: 1245, category: ts.DiagnosticCategory.Error, key: "Method_0_cannot_have_an_implementation_because_it_is_marked_abstract_1245", message: "Method '{0}' cannot have an implementation because it is marked abstract." },
-        An_interface_property_cannot_have_an_initializer: { code: 1246, category: ts.DiagnosticCategory.Error, key: "An_interface_property_cannot_have_an_initializer_1246", message: "An interface property cannot have an initializer." },
-        A_type_literal_property_cannot_have_an_initializer: { code: 1247, category: ts.DiagnosticCategory.Error, key: "A_type_literal_property_cannot_have_an_initializer_1247", message: "A type literal property cannot have an initializer." },
-        A_class_member_cannot_have_the_0_keyword: { code: 1248, category: ts.DiagnosticCategory.Error, key: "A_class_member_cannot_have_the_0_keyword_1248", message: "A class member cannot have the '{0}' keyword." },
-        A_decorator_can_only_decorate_a_method_implementation_not_an_overload: { code: 1249, category: ts.DiagnosticCategory.Error, key: "A_decorator_can_only_decorate_a_method_implementation_not_an_overload_1249", message: "A decorator can only decorate a method implementation, not an overload." },
-        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5: { code: 1250, category: ts.DiagnosticCategory.Error, key: "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_1250", message: "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'." },
-        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode: { code: 1251, category: ts.DiagnosticCategory.Error, key: "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_d_1251", message: "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Class definitions are automatically in strict mode." },
-        Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode: { code: 1252, category: ts.DiagnosticCategory.Error, key: "Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_1252", message: "Function declarations are not allowed inside blocks in strict mode when targeting 'ES3' or 'ES5'. Modules are automatically in strict mode." },
-        _0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag: { code: 1253, category: ts.DiagnosticCategory.Error, key: "_0_tag_cannot_be_used_independently_as_a_top_level_JSDoc_tag_1253", message: "'{0}' tag cannot be used independently as a top level JSDoc tag." },
-        with_statements_are_not_allowed_in_an_async_function_block: { code: 1300, category: ts.DiagnosticCategory.Error, key: "with_statements_are_not_allowed_in_an_async_function_block_1300", message: "'with' statements are not allowed in an async function block." },
-        await_expression_is_only_allowed_within_an_async_function: { code: 1308, category: ts.DiagnosticCategory.Error, key: "await_expression_is_only_allowed_within_an_async_function_1308", message: "'await' expression is only allowed within an async function." },
-        Async_functions_are_only_available_when_targeting_ECMAScript_2015_or_higher: { code: 1311, category: ts.DiagnosticCategory.Error, key: "Async_functions_are_only_available_when_targeting_ECMAScript_2015_or_higher_1311", message: "Async functions are only available when targeting ECMAScript 2015 or higher." },
-        can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment: { code: 1312, category: ts.DiagnosticCategory.Error, key: "can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment_1312", message: "'=' can only be used in an object literal property inside a destructuring assignment." },
-        The_body_of_an_if_statement_cannot_be_the_empty_statement: { code: 1313, category: ts.DiagnosticCategory.Error, key: "The_body_of_an_if_statement_cannot_be_the_empty_statement_1313", message: "The body of an 'if' statement cannot be the empty statement." },
-        Global_module_exports_may_only_appear_in_module_files: { code: 1314, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_module_files_1314", message: "Global module exports may only appear in module files." },
-        Global_module_exports_may_only_appear_in_declaration_files: { code: 1315, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_in_declaration_files_1315", message: "Global module exports may only appear in declaration files." },
-        Global_module_exports_may_only_appear_at_top_level: { code: 1316, category: ts.DiagnosticCategory.Error, key: "Global_module_exports_may_only_appear_at_top_level_1316", message: "Global module exports may only appear at top level." },
-        A_parameter_property_cannot_be_declared_using_a_rest_parameter: { code: 1317, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_cannot_be_declared_using_a_rest_parameter_1317", message: "A parameter property cannot be declared using a rest parameter." },
-        Duplicate_identifier_0: { code: 2300, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_2300", message: "Duplicate identifier '{0}'." },
-        Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor: { code: 2301, category: ts.DiagnosticCategory.Error, key: "Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor_2301", message: "Initializer of instance member variable '{0}' cannot reference identifier '{1}' declared in the constructor." },
-        Static_members_cannot_reference_class_type_parameters: { code: 2302, category: ts.DiagnosticCategory.Error, key: "Static_members_cannot_reference_class_type_parameters_2302", message: "Static members cannot reference class type parameters." },
-        Circular_definition_of_import_alias_0: { code: 2303, category: ts.DiagnosticCategory.Error, key: "Circular_definition_of_import_alias_0_2303", message: "Circular definition of import alias '{0}'." },
-        Cannot_find_name_0: { code: 2304, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_2304", message: "Cannot find name '{0}'." },
-        Module_0_has_no_exported_member_1: { code: 2305, category: ts.DiagnosticCategory.Error, key: "Module_0_has_no_exported_member_1_2305", message: "Module '{0}' has no exported member '{1}'." },
-        File_0_is_not_a_module: { code: 2306, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_a_module_2306", message: "File '{0}' is not a module." },
-        Cannot_find_module_0: { code: 2307, category: ts.DiagnosticCategory.Error, key: "Cannot_find_module_0_2307", message: "Cannot find module '{0}'." },
-        Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity: { code: 2308, category: ts.DiagnosticCategory.Error, key: "Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambig_2308", message: "Module {0} has already exported a member named '{1}'. Consider explicitly re-exporting to resolve the ambiguity." },
-        An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements: { code: 2309, category: ts.DiagnosticCategory.Error, key: "An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements_2309", message: "An export assignment cannot be used in a module with other exported elements." },
-        Type_0_recursively_references_itself_as_a_base_type: { code: 2310, category: ts.DiagnosticCategory.Error, key: "Type_0_recursively_references_itself_as_a_base_type_2310", message: "Type '{0}' recursively references itself as a base type." },
-        A_class_may_only_extend_another_class: { code: 2311, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_extend_another_class_2311", message: "A class may only extend another class." },
-        An_interface_may_only_extend_a_class_or_another_interface: { code: 2312, category: ts.DiagnosticCategory.Error, key: "An_interface_may_only_extend_a_class_or_another_interface_2312", message: "An interface may only extend a class or another interface." },
-        Type_parameter_0_has_a_circular_constraint: { code: 2313, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_has_a_circular_constraint_2313", message: "Type parameter '{0}' has a circular constraint." },
-        Generic_type_0_requires_1_type_argument_s: { code: 2314, category: ts.DiagnosticCategory.Error, key: "Generic_type_0_requires_1_type_argument_s_2314", message: "Generic type '{0}' requires {1} type argument(s)." },
-        Type_0_is_not_generic: { code: 2315, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_generic_2315", message: "Type '{0}' is not generic." },
-        Global_type_0_must_be_a_class_or_interface_type: { code: 2316, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_be_a_class_or_interface_type_2316", message: "Global type '{0}' must be a class or interface type." },
-        Global_type_0_must_have_1_type_parameter_s: { code: 2317, category: ts.DiagnosticCategory.Error, key: "Global_type_0_must_have_1_type_parameter_s_2317", message: "Global type '{0}' must have {1} type parameter(s)." },
-        Cannot_find_global_type_0: { code: 2318, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_type_0_2318", message: "Cannot find global type '{0}'." },
-        Named_property_0_of_types_1_and_2_are_not_identical: { code: 2319, category: ts.DiagnosticCategory.Error, key: "Named_property_0_of_types_1_and_2_are_not_identical_2319", message: "Named property '{0}' of types '{1}' and '{2}' are not identical." },
-        Interface_0_cannot_simultaneously_extend_types_1_and_2: { code: 2320, category: ts.DiagnosticCategory.Error, key: "Interface_0_cannot_simultaneously_extend_types_1_and_2_2320", message: "Interface '{0}' cannot simultaneously extend types '{1}' and '{2}'." },
-        Excessive_stack_depth_comparing_types_0_and_1: { code: 2321, category: ts.DiagnosticCategory.Error, key: "Excessive_stack_depth_comparing_types_0_and_1_2321", message: "Excessive stack depth comparing types '{0}' and '{1}'." },
-        Type_0_is_not_assignable_to_type_1: { code: 2322, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_assignable_to_type_1_2322", message: "Type '{0}' is not assignable to type '{1}'." },
-        Cannot_redeclare_exported_variable_0: { code: 2323, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_exported_variable_0_2323", message: "Cannot redeclare exported variable '{0}'." },
-        Property_0_is_missing_in_type_1: { code: 2324, category: ts.DiagnosticCategory.Error, key: "Property_0_is_missing_in_type_1_2324", message: "Property '{0}' is missing in type '{1}'." },
-        Property_0_is_private_in_type_1_but_not_in_type_2: { code: 2325, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_in_type_1_but_not_in_type_2_2325", message: "Property '{0}' is private in type '{1}' but not in type '{2}'." },
-        Types_of_property_0_are_incompatible: { code: 2326, category: ts.DiagnosticCategory.Error, key: "Types_of_property_0_are_incompatible_2326", message: "Types of property '{0}' are incompatible." },
-        Property_0_is_optional_in_type_1_but_required_in_type_2: { code: 2327, category: ts.DiagnosticCategory.Error, key: "Property_0_is_optional_in_type_1_but_required_in_type_2_2327", message: "Property '{0}' is optional in type '{1}' but required in type '{2}'." },
-        Types_of_parameters_0_and_1_are_incompatible: { code: 2328, category: ts.DiagnosticCategory.Error, key: "Types_of_parameters_0_and_1_are_incompatible_2328", message: "Types of parameters '{0}' and '{1}' are incompatible." },
-        Index_signature_is_missing_in_type_0: { code: 2329, category: ts.DiagnosticCategory.Error, key: "Index_signature_is_missing_in_type_0_2329", message: "Index signature is missing in type '{0}'." },
-        Index_signatures_are_incompatible: { code: 2330, category: ts.DiagnosticCategory.Error, key: "Index_signatures_are_incompatible_2330", message: "Index signatures are incompatible." },
-        this_cannot_be_referenced_in_a_module_or_namespace_body: { code: 2331, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_module_or_namespace_body_2331", message: "'this' cannot be referenced in a module or namespace body." },
-        this_cannot_be_referenced_in_current_location: { code: 2332, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_current_location_2332", message: "'this' cannot be referenced in current location." },
-        this_cannot_be_referenced_in_constructor_arguments: { code: 2333, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_constructor_arguments_2333", message: "'this' cannot be referenced in constructor arguments." },
-        this_cannot_be_referenced_in_a_static_property_initializer: { code: 2334, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_static_property_initializer_2334", message: "'this' cannot be referenced in a static property initializer." },
-        super_can_only_be_referenced_in_a_derived_class: { code: 2335, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_a_derived_class_2335", message: "'super' can only be referenced in a derived class." },
-        super_cannot_be_referenced_in_constructor_arguments: { code: 2336, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_constructor_arguments_2336", message: "'super' cannot be referenced in constructor arguments." },
-        Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors: { code: 2337, category: ts.DiagnosticCategory.Error, key: "Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors_2337", message: "Super calls are not permitted outside constructors or in nested functions inside constructors." },
-        super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class: { code: 2338, category: ts.DiagnosticCategory.Error, key: "super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_der_2338", message: "'super' property access is permitted only in a constructor, member function, or member accessor of a derived class." },
-        Property_0_does_not_exist_on_type_1: { code: 2339, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_type_1_2339", message: "Property '{0}' does not exist on type '{1}'." },
-        Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword: { code: 2340, category: ts.DiagnosticCategory.Error, key: "Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword_2340", message: "Only public and protected methods of the base class are accessible via the 'super' keyword." },
-        Property_0_is_private_and_only_accessible_within_class_1: { code: 2341, category: ts.DiagnosticCategory.Error, key: "Property_0_is_private_and_only_accessible_within_class_1_2341", message: "Property '{0}' is private and only accessible within class '{1}'." },
-        An_index_expression_argument_must_be_of_type_string_number_symbol_or_any: { code: 2342, category: ts.DiagnosticCategory.Error, key: "An_index_expression_argument_must_be_of_type_string_number_symbol_or_any_2342", message: "An index expression argument must be of type 'string', 'number', 'symbol', or 'any'." },
-        Type_0_does_not_satisfy_the_constraint_1: { code: 2344, category: ts.DiagnosticCategory.Error, key: "Type_0_does_not_satisfy_the_constraint_1_2344", message: "Type '{0}' does not satisfy the constraint '{1}'." },
-        Argument_of_type_0_is_not_assignable_to_parameter_of_type_1: { code: 2345, category: ts.DiagnosticCategory.Error, key: "Argument_of_type_0_is_not_assignable_to_parameter_of_type_1_2345", message: "Argument of type '{0}' is not assignable to parameter of type '{1}'." },
-        Supplied_parameters_do_not_match_any_signature_of_call_target: { code: 2346, category: ts.DiagnosticCategory.Error, key: "Supplied_parameters_do_not_match_any_signature_of_call_target_2346", message: "Supplied parameters do not match any signature of call target." },
-        Untyped_function_calls_may_not_accept_type_arguments: { code: 2347, category: ts.DiagnosticCategory.Error, key: "Untyped_function_calls_may_not_accept_type_arguments_2347", message: "Untyped function calls may not accept type arguments." },
-        Value_of_type_0_is_not_callable_Did_you_mean_to_include_new: { code: 2348, category: ts.DiagnosticCategory.Error, key: "Value_of_type_0_is_not_callable_Did_you_mean_to_include_new_2348", message: "Value of type '{0}' is not callable. Did you mean to include 'new'?" },
-        Cannot_invoke_an_expression_whose_type_lacks_a_call_signature: { code: 2349, category: ts.DiagnosticCategory.Error, key: "Cannot_invoke_an_expression_whose_type_lacks_a_call_signature_2349", message: "Cannot invoke an expression whose type lacks a call signature." },
-        Only_a_void_function_can_be_called_with_the_new_keyword: { code: 2350, category: ts.DiagnosticCategory.Error, key: "Only_a_void_function_can_be_called_with_the_new_keyword_2350", message: "Only a void function can be called with the 'new' keyword." },
-        Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature: { code: 2351, category: ts.DiagnosticCategory.Error, key: "Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature_2351", message: "Cannot use 'new' with an expression whose type lacks a call or construct signature." },
-        Type_0_cannot_be_converted_to_type_1: { code: 2352, category: ts.DiagnosticCategory.Error, key: "Type_0_cannot_be_converted_to_type_1_2352", message: "Type '{0}' cannot be converted to type '{1}'." },
-        Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1: { code: 2353, category: ts.DiagnosticCategory.Error, key: "Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1_2353", message: "Object literal may only specify known properties, and '{0}' does not exist in type '{1}'." },
-        No_best_common_type_exists_among_return_expressions: { code: 2354, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_return_expressions_2354", message: "No best common type exists among return expressions." },
-        A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value: { code: 2355, category: ts.DiagnosticCategory.Error, key: "A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value_2355", message: "A function whose declared type is neither 'void' nor 'any' must return a value." },
-        An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type: { code: 2356, category: ts.DiagnosticCategory.Error, key: "An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type_2356", message: "An arithmetic operand must be of type 'any', 'number' or an enum type." },
-        The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer: { code: 2357, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer_2357", message: "The operand of an increment or decrement operator must be a variable, property or indexer." },
-        The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2358, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_paramete_2358", message: "The left-hand side of an 'instanceof' expression must be of type 'any', an object type or a type parameter." },
-        The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type: { code: 2359, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_F_2359", message: "The right-hand side of an 'instanceof' expression must be of type 'any' or of a type assignable to the 'Function' interface type." },
-        The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol: { code: 2360, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol_2360", message: "The left-hand side of an 'in' expression must be of type 'any', 'string', 'number', or 'symbol'." },
-        The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2361, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter_2361", message: "The right-hand side of an 'in' expression must be of type 'any', an object type or a type parameter" },
-        The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2362, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2362", message: "The left-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type: { code: 2363, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type_2363", message: "The right-hand side of an arithmetic operation must be of type 'any', 'number' or an enum type." },
-        Invalid_left_hand_side_of_assignment_expression: { code: 2364, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_of_assignment_expression_2364", message: "Invalid left-hand side of assignment expression." },
-        Operator_0_cannot_be_applied_to_types_1_and_2: { code: 2365, category: ts.DiagnosticCategory.Error, key: "Operator_0_cannot_be_applied_to_types_1_and_2_2365", message: "Operator '{0}' cannot be applied to types '{1}' and '{2}'." },
-        Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined: { code: 2366, category: ts.DiagnosticCategory.Error, key: "Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined_2366", message: "Function lacks ending return statement and return type does not include 'undefined'." },
-        Type_parameter_name_cannot_be_0: { code: 2368, category: ts.DiagnosticCategory.Error, key: "Type_parameter_name_cannot_be_0_2368", message: "Type parameter name cannot be '{0}'" },
-        A_parameter_property_is_only_allowed_in_a_constructor_implementation: { code: 2369, category: ts.DiagnosticCategory.Error, key: "A_parameter_property_is_only_allowed_in_a_constructor_implementation_2369", message: "A parameter property is only allowed in a constructor implementation." },
-        A_rest_parameter_must_be_of_an_array_type: { code: 2370, category: ts.DiagnosticCategory.Error, key: "A_rest_parameter_must_be_of_an_array_type_2370", message: "A rest parameter must be of an array type." },
-        A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation: { code: 2371, category: ts.DiagnosticCategory.Error, key: "A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation_2371", message: "A parameter initializer is only allowed in a function or constructor implementation." },
-        Parameter_0_cannot_be_referenced_in_its_initializer: { code: 2372, category: ts.DiagnosticCategory.Error, key: "Parameter_0_cannot_be_referenced_in_its_initializer_2372", message: "Parameter '{0}' cannot be referenced in its initializer." },
-        Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it: { code: 2373, category: ts.DiagnosticCategory.Error, key: "Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it_2373", message: "Initializer of parameter '{0}' cannot reference identifier '{1}' declared after it." },
-        Duplicate_string_index_signature: { code: 2374, category: ts.DiagnosticCategory.Error, key: "Duplicate_string_index_signature_2374", message: "Duplicate string index signature." },
-        Duplicate_number_index_signature: { code: 2375, category: ts.DiagnosticCategory.Error, key: "Duplicate_number_index_signature_2375", message: "Duplicate number index signature." },
-        A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties: { code: 2376, category: ts.DiagnosticCategory.Error, key: "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", message: "A 'super' call must be the first statement in the constructor when a class contains initialized properties or has parameter properties." },
-        Constructors_for_derived_classes_must_contain_a_super_call: { code: 2377, category: ts.DiagnosticCategory.Error, key: "Constructors_for_derived_classes_must_contain_a_super_call_2377", message: "Constructors for derived classes must contain a 'super' call." },
-        A_get_accessor_must_return_a_value: { code: 2378, category: ts.DiagnosticCategory.Error, key: "A_get_accessor_must_return_a_value_2378", message: "A 'get' accessor must return a value." },
-        Getter_and_setter_accessors_do_not_agree_in_visibility: { code: 2379, category: ts.DiagnosticCategory.Error, key: "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", message: "Getter and setter accessors do not agree in visibility." },
-        get_and_set_accessor_must_have_the_same_type: { code: 2380, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_type_2380", message: "'get' and 'set' accessor must have the same type." },
-        A_signature_with_an_implementation_cannot_use_a_string_literal_type: { code: 2381, category: ts.DiagnosticCategory.Error, key: "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", message: "A signature with an implementation cannot use a string literal type." },
-        Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: { code: 2382, category: ts.DiagnosticCategory.Error, key: "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", message: "Specialized overload signature is not assignable to any non-specialized signature." },
-        Overload_signatures_must_all_be_exported_or_non_exported: { code: 2383, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_exported_or_non_exported_2383", message: "Overload signatures must all be exported or non-exported." },
-        Overload_signatures_must_all_be_ambient_or_non_ambient: { code: 2384, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_ambient_or_non_ambient_2384", message: "Overload signatures must all be ambient or non-ambient." },
-        Overload_signatures_must_all_be_public_private_or_protected: { code: 2385, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_public_private_or_protected_2385", message: "Overload signatures must all be public, private or protected." },
-        Overload_signatures_must_all_be_optional_or_required: { code: 2386, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_optional_or_required_2386", message: "Overload signatures must all be optional or required." },
-        Function_overload_must_be_static: { code: 2387, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_be_static_2387", message: "Function overload must be static." },
-        Function_overload_must_not_be_static: { code: 2388, category: ts.DiagnosticCategory.Error, key: "Function_overload_must_not_be_static_2388", message: "Function overload must not be static." },
-        Function_implementation_name_must_be_0: { code: 2389, category: ts.DiagnosticCategory.Error, key: "Function_implementation_name_must_be_0_2389", message: "Function implementation name must be '{0}'." },
-        Constructor_implementation_is_missing: { code: 2390, category: ts.DiagnosticCategory.Error, key: "Constructor_implementation_is_missing_2390", message: "Constructor implementation is missing." },
-        Function_implementation_is_missing_or_not_immediately_following_the_declaration: { code: 2391, category: ts.DiagnosticCategory.Error, key: "Function_implementation_is_missing_or_not_immediately_following_the_declaration_2391", message: "Function implementation is missing or not immediately following the declaration." },
-        Multiple_constructor_implementations_are_not_allowed: { code: 2392, category: ts.DiagnosticCategory.Error, key: "Multiple_constructor_implementations_are_not_allowed_2392", message: "Multiple constructor implementations are not allowed." },
-        Duplicate_function_implementation: { code: 2393, category: ts.DiagnosticCategory.Error, key: "Duplicate_function_implementation_2393", message: "Duplicate function implementation." },
-        Overload_signature_is_not_compatible_with_function_implementation: { code: 2394, category: ts.DiagnosticCategory.Error, key: "Overload_signature_is_not_compatible_with_function_implementation_2394", message: "Overload signature is not compatible with function implementation." },
-        Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local: { code: 2395, category: ts.DiagnosticCategory.Error, key: "Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local_2395", message: "Individual declarations in merged declaration '{0}' must be all exported or all local." },
-        Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters: { code: 2396, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters_2396", message: "Duplicate identifier 'arguments'. Compiler uses 'arguments' to initialize rest parameters." },
-        Declaration_name_conflicts_with_built_in_global_identifier_0: { code: 2397, category: ts.DiagnosticCategory.Error, key: "Declaration_name_conflicts_with_built_in_global_identifier_0_2397", message: "Declaration name conflicts with built-in global identifier '{0}'." },
-        Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference: { code: 2399, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference_2399", message: "Duplicate identifier '_this'. Compiler uses variable declaration '_this' to capture 'this' reference." },
-        Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference: { code: 2400, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference_2400", message: "Expression resolves to variable declaration '_this' that compiler uses to capture 'this' reference." },
-        Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference: { code: 2401, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference_2401", message: "Duplicate identifier '_super'. Compiler uses '_super' to capture base class reference." },
-        Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference: { code: 2402, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference_2402", message: "Expression resolves to '_super' that compiler uses to capture base class reference." },
-        Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2: { code: 2403, category: ts.DiagnosticCategory.Error, key: "Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_t_2403", message: "Subsequent variable declarations must have the same type.  Variable '{0}' must be of type '{1}', but here has type '{2}'." },
-        The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation: { code: 2404, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation_2404", message: "The left-hand side of a 'for...in' statement cannot use a type annotation." },
-        The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any: { code: 2405, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any_2405", message: "The left-hand side of a 'for...in' statement must be of type 'string' or 'any'." },
-        Invalid_left_hand_side_in_for_in_statement: { code: 2406, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_in_statement_2406", message: "Invalid left-hand side in 'for...in' statement." },
-        The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter: { code: 2407, category: ts.DiagnosticCategory.Error, key: "The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter_2407", message: "The right-hand side of a 'for...in' statement must be of type 'any', an object type or a type parameter." },
-        Setters_cannot_return_a_value: { code: 2408, category: ts.DiagnosticCategory.Error, key: "Setters_cannot_return_a_value_2408", message: "Setters cannot return a value." },
-        Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class: { code: 2409, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class_2409", message: "Return type of constructor signature must be assignable to the instance type of the class" },
-        All_symbols_within_a_with_block_will_be_resolved_to_any: { code: 2410, category: ts.DiagnosticCategory.Error, key: "All_symbols_within_a_with_block_will_be_resolved_to_any_2410", message: "All symbols within a 'with' block will be resolved to 'any'." },
-        Property_0_of_type_1_is_not_assignable_to_string_index_type_2: { code: 2411, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_string_index_type_2_2411", message: "Property '{0}' of type '{1}' is not assignable to string index type '{2}'." },
-        Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2: { code: 2412, category: ts.DiagnosticCategory.Error, key: "Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2_2412", message: "Property '{0}' of type '{1}' is not assignable to numeric index type '{2}'." },
-        Numeric_index_type_0_is_not_assignable_to_string_index_type_1: { code: 2413, category: ts.DiagnosticCategory.Error, key: "Numeric_index_type_0_is_not_assignable_to_string_index_type_1_2413", message: "Numeric index type '{0}' is not assignable to string index type '{1}'." },
-        Class_name_cannot_be_0: { code: 2414, category: ts.DiagnosticCategory.Error, key: "Class_name_cannot_be_0_2414", message: "Class name cannot be '{0}'" },
-        Class_0_incorrectly_extends_base_class_1: { code: 2415, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_extends_base_class_1_2415", message: "Class '{0}' incorrectly extends base class '{1}'." },
-        Class_static_side_0_incorrectly_extends_base_class_static_side_1: { code: 2417, category: ts.DiagnosticCategory.Error, key: "Class_static_side_0_incorrectly_extends_base_class_static_side_1_2417", message: "Class static side '{0}' incorrectly extends base class static side '{1}'." },
-        Class_0_incorrectly_implements_interface_1: { code: 2420, category: ts.DiagnosticCategory.Error, key: "Class_0_incorrectly_implements_interface_1_2420", message: "Class '{0}' incorrectly implements interface '{1}'." },
-        A_class_may_only_implement_another_class_or_interface: { code: 2422, category: ts.DiagnosticCategory.Error, key: "A_class_may_only_implement_another_class_or_interface_2422", message: "A class may only implement another class or interface." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor: { code: 2423, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_access_2423", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member accessor." },
-        Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property: { code: 2424, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_proper_2424", message: "Class '{0}' defines instance member function '{1}', but extended class '{2}' defines it as instance member property." },
-        Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2425, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_functi_2425", message: "Class '{0}' defines instance member property '{1}', but extended class '{2}' defines it as instance member function." },
-        Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function: { code: 2426, category: ts.DiagnosticCategory.Error, key: "Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_functi_2426", message: "Class '{0}' defines instance member accessor '{1}', but extended class '{2}' defines it as instance member function." },
-        Interface_name_cannot_be_0: { code: 2427, category: ts.DiagnosticCategory.Error, key: "Interface_name_cannot_be_0_2427", message: "Interface name cannot be '{0}'" },
-        All_declarations_of_0_must_have_identical_type_parameters: { code: 2428, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_type_parameters_2428", message: "All declarations of '{0}' must have identical type parameters." },
-        Interface_0_incorrectly_extends_interface_1: { code: 2430, category: ts.DiagnosticCategory.Error, key: "Interface_0_incorrectly_extends_interface_1_2430", message: "Interface '{0}' incorrectly extends interface '{1}'." },
-        Enum_name_cannot_be_0: { code: 2431, category: ts.DiagnosticCategory.Error, key: "Enum_name_cannot_be_0_2431", message: "Enum name cannot be '{0}'" },
-        In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element: { code: 2432, category: ts.DiagnosticCategory.Error, key: "In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enu_2432", message: "In an enum with multiple declarations, only one declaration can omit an initializer for its first enum element." },
-        A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged: { code: 2433, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merg_2433", message: "A namespace declaration cannot be in a different file from a class or function with which it is merged" },
-        A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged: { code: 2434, category: ts.DiagnosticCategory.Error, key: "A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged_2434", message: "A namespace declaration cannot be located prior to a class or function with which it is merged" },
-        Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces: { code: 2435, category: ts.DiagnosticCategory.Error, key: "Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces_2435", message: "Ambient modules cannot be nested in other modules or namespaces." },
-        Ambient_module_declaration_cannot_specify_relative_module_name: { code: 2436, category: ts.DiagnosticCategory.Error, key: "Ambient_module_declaration_cannot_specify_relative_module_name_2436", message: "Ambient module declaration cannot specify relative module name." },
-        Module_0_is_hidden_by_a_local_declaration_with_the_same_name: { code: 2437, category: ts.DiagnosticCategory.Error, key: "Module_0_is_hidden_by_a_local_declaration_with_the_same_name_2437", message: "Module '{0}' is hidden by a local declaration with the same name" },
-        Import_name_cannot_be_0: { code: 2438, category: ts.DiagnosticCategory.Error, key: "Import_name_cannot_be_0_2438", message: "Import name cannot be '{0}'" },
-        Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name: { code: 2439, category: ts.DiagnosticCategory.Error, key: "Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relati_2439", message: "Import or export declaration in an ambient module declaration cannot reference module through relative module name." },
-        Import_declaration_conflicts_with_local_declaration_of_0: { code: 2440, category: ts.DiagnosticCategory.Error, key: "Import_declaration_conflicts_with_local_declaration_of_0_2440", message: "Import declaration conflicts with local declaration of '{0}'" },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module: { code: 2441, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_2441", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module." },
-        Types_have_separate_declarations_of_a_private_property_0: { code: 2442, category: ts.DiagnosticCategory.Error, key: "Types_have_separate_declarations_of_a_private_property_0_2442", message: "Types have separate declarations of a private property '{0}'." },
-        Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: { code: 2443, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", message: "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'." },
-        Property_0_is_protected_in_type_1_but_public_in_type_2: { code: 2444, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", message: "Property '{0}' is protected in type '{1}' but public in type '{2}'." },
-        Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: { code: 2445, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", message: "Property '{0}' is protected and only accessible within class '{1}' and its subclasses." },
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: { code: 2446, category: ts.DiagnosticCategory.Error, key: "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", message: "Property '{0}' is protected and only accessible through an instance of class '{1}'." },
-        The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: { code: 2447, category: ts.DiagnosticCategory.Error, key: "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", message: "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead." },
-        Block_scoped_variable_0_used_before_its_declaration: { code: 2448, category: ts.DiagnosticCategory.Error, key: "Block_scoped_variable_0_used_before_its_declaration_2448", message: "Block-scoped variable '{0}' used before its declaration." },
-        The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property: { code: 2449, category: ts.DiagnosticCategory.Error, key: "The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property_2449", message: "The operand of an increment or decrement operator cannot be a constant or a read-only property." },
-        Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property: { code: 2450, category: ts.DiagnosticCategory.Error, key: "Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property_2450", message: "Left-hand side of assignment expression cannot be a constant or a read-only property." },
-        Cannot_redeclare_block_scoped_variable_0: { code: 2451, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_block_scoped_variable_0_2451", message: "Cannot redeclare block-scoped variable '{0}'." },
-        An_enum_member_cannot_have_a_numeric_name: { code: 2452, category: ts.DiagnosticCategory.Error, key: "An_enum_member_cannot_have_a_numeric_name_2452", message: "An enum member cannot have a numeric name." },
-        The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly: { code: 2453, category: ts.DiagnosticCategory.Error, key: "The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_typ_2453", message: "The type argument for type parameter '{0}' cannot be inferred from the usage. Consider specifying the type arguments explicitly." },
-        Variable_0_is_used_before_being_assigned: { code: 2454, category: ts.DiagnosticCategory.Error, key: "Variable_0_is_used_before_being_assigned_2454", message: "Variable '{0}' is used before being assigned." },
-        Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0: { code: 2455, category: ts.DiagnosticCategory.Error, key: "Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0_2455", message: "Type argument candidate '{1}' is not a valid type argument because it is not a supertype of candidate '{0}'." },
-        Type_alias_0_circularly_references_itself: { code: 2456, category: ts.DiagnosticCategory.Error, key: "Type_alias_0_circularly_references_itself_2456", message: "Type alias '{0}' circularly references itself." },
-        Type_alias_name_cannot_be_0: { code: 2457, category: ts.DiagnosticCategory.Error, key: "Type_alias_name_cannot_be_0_2457", message: "Type alias name cannot be '{0}'" },
-        An_AMD_module_cannot_have_multiple_name_assignments: { code: 2458, category: ts.DiagnosticCategory.Error, key: "An_AMD_module_cannot_have_multiple_name_assignments_2458", message: "An AMD module cannot have multiple name assignments." },
-        Type_0_has_no_property_1_and_no_string_index_signature: { code: 2459, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_and_no_string_index_signature_2459", message: "Type '{0}' has no property '{1}' and no string index signature." },
-        Type_0_has_no_property_1: { code: 2460, category: ts.DiagnosticCategory.Error, key: "Type_0_has_no_property_1_2460", message: "Type '{0}' has no property '{1}'." },
-        Type_0_is_not_an_array_type: { code: 2461, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_2461", message: "Type '{0}' is not an array type." },
-        A_rest_element_must_be_last_in_an_array_destructuring_pattern: { code: 2462, category: ts.DiagnosticCategory.Error, key: "A_rest_element_must_be_last_in_an_array_destructuring_pattern_2462", message: "A rest element must be last in an array destructuring pattern" },
-        A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature: { code: 2463, category: ts.DiagnosticCategory.Error, key: "A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature_2463", message: "A binding pattern parameter cannot be optional in an implementation signature." },
-        A_computed_property_name_must_be_of_type_string_number_symbol_or_any: { code: 2464, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_must_be_of_type_string_number_symbol_or_any_2464", message: "A computed property name must be of type 'string', 'number', 'symbol', or 'any'." },
-        this_cannot_be_referenced_in_a_computed_property_name: { code: 2465, category: ts.DiagnosticCategory.Error, key: "this_cannot_be_referenced_in_a_computed_property_name_2465", message: "'this' cannot be referenced in a computed property name." },
-        super_cannot_be_referenced_in_a_computed_property_name: { code: 2466, category: ts.DiagnosticCategory.Error, key: "super_cannot_be_referenced_in_a_computed_property_name_2466", message: "'super' cannot be referenced in a computed property name." },
-        A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type: { code: 2467, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type_2467", message: "A computed property name cannot reference a type parameter from its containing type." },
-        Cannot_find_global_value_0: { code: 2468, category: ts.DiagnosticCategory.Error, key: "Cannot_find_global_value_0_2468", message: "Cannot find global value '{0}'." },
-        The_0_operator_cannot_be_applied_to_type_symbol: { code: 2469, category: ts.DiagnosticCategory.Error, key: "The_0_operator_cannot_be_applied_to_type_symbol_2469", message: "The '{0}' operator cannot be applied to type 'symbol'." },
-        Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object: { code: 2470, category: ts.DiagnosticCategory.Error, key: "Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object_2470", message: "'Symbol' reference does not refer to the global Symbol constructor object." },
-        A_computed_property_name_of_the_form_0_must_be_of_type_symbol: { code: 2471, category: ts.DiagnosticCategory.Error, key: "A_computed_property_name_of_the_form_0_must_be_of_type_symbol_2471", message: "A computed property name of the form '{0}' must be of type 'symbol'." },
-        Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher: { code: 2472, category: ts.DiagnosticCategory.Error, key: "Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher_2472", message: "Spread operator in 'new' expressions is only available when targeting ECMAScript 5 and higher." },
-        Enum_declarations_must_all_be_const_or_non_const: { code: 2473, category: ts.DiagnosticCategory.Error, key: "Enum_declarations_must_all_be_const_or_non_const_2473", message: "Enum declarations must all be const or non-const." },
-        In_const_enum_declarations_member_initializer_must_be_constant_expression: { code: 2474, category: ts.DiagnosticCategory.Error, key: "In_const_enum_declarations_member_initializer_must_be_constant_expression_2474", message: "In 'const' enum declarations member initializer must be constant expression." },
-        const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment: { code: 2475, category: ts.DiagnosticCategory.Error, key: "const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_im_2475", message: "'const' enums can only be used in property or index access expressions or the right hand side of an import declaration or export assignment." },
-        A_const_enum_member_can_only_be_accessed_using_a_string_literal: { code: 2476, category: ts.DiagnosticCategory.Error, key: "A_const_enum_member_can_only_be_accessed_using_a_string_literal_2476", message: "A const enum member can only be accessed using a string literal." },
-        const_enum_member_initializer_was_evaluated_to_a_non_finite_value: { code: 2477, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_a_non_finite_value_2477", message: "'const' enum member initializer was evaluated to a non-finite value." },
-        const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN: { code: 2478, category: ts.DiagnosticCategory.Error, key: "const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN_2478", message: "'const' enum member initializer was evaluated to disallowed value 'NaN'." },
-        Property_0_does_not_exist_on_const_enum_1: { code: 2479, category: ts.DiagnosticCategory.Error, key: "Property_0_does_not_exist_on_const_enum_1_2479", message: "Property '{0}' does not exist on 'const' enum '{1}'." },
-        let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations: { code: 2480, category: ts.DiagnosticCategory.Error, key: "let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations_2480", message: "'let' is not allowed to be used as a name in 'let' or 'const' declarations." },
-        Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1: { code: 2481, category: ts.DiagnosticCategory.Error, key: "Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1_2481", message: "Cannot initialize outer scoped variable '{0}' in the same scope as block scoped declaration '{1}'." },
-        The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation: { code: 2483, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation_2483", message: "The left-hand side of a 'for...of' statement cannot use a type annotation." },
-        Export_declaration_conflicts_with_exported_declaration_of_0: { code: 2484, category: ts.DiagnosticCategory.Error, key: "Export_declaration_conflicts_with_exported_declaration_of_0_2484", message: "Export declaration conflicts with exported declaration of '{0}'" },
-        The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2485, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property_2485", message: "The left-hand side of a 'for...of' statement cannot be a constant or a read-only property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property: { code: 2486, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property_2486", message: "The left-hand side of a 'for...in' statement cannot be a constant or a read-only property." },
-        Invalid_left_hand_side_in_for_of_statement: { code: 2487, category: ts.DiagnosticCategory.Error, key: "Invalid_left_hand_side_in_for_of_statement_2487", message: "Invalid left-hand side in 'for...of' statement." },
-        Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator: { code: 2488, category: ts.DiagnosticCategory.Error, key: "Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator_2488", message: "Type must have a '[Symbol.iterator]()' method that returns an iterator." },
-        An_iterator_must_have_a_next_method: { code: 2489, category: ts.DiagnosticCategory.Error, key: "An_iterator_must_have_a_next_method_2489", message: "An iterator must have a 'next()' method." },
-        The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property: { code: 2490, category: ts.DiagnosticCategory.Error, key: "The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property_2490", message: "The type returned by the 'next()' method of an iterator must have a 'value' property." },
-        The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern: { code: 2491, category: ts.DiagnosticCategory.Error, key: "The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern_2491", message: "The left-hand side of a 'for...in' statement cannot be a destructuring pattern." },
-        Cannot_redeclare_identifier_0_in_catch_clause: { code: 2492, category: ts.DiagnosticCategory.Error, key: "Cannot_redeclare_identifier_0_in_catch_clause_2492", message: "Cannot redeclare identifier '{0}' in catch clause" },
-        Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2: { code: 2493, category: ts.DiagnosticCategory.Error, key: "Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2_2493", message: "Tuple type '{0}' with length '{1}' cannot be assigned to tuple with length '{2}'." },
-        Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher: { code: 2494, category: ts.DiagnosticCategory.Error, key: "Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher_2494", message: "Using a string in a 'for...of' statement is only supported in ECMAScript 5 and higher." },
-        Type_0_is_not_an_array_type_or_a_string_type: { code: 2495, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_an_array_type_or_a_string_type_2495", message: "Type '{0}' is not an array type or a string type." },
-        The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression: { code: 2496, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_stand_2496", message: "The 'arguments' object cannot be referenced in an arrow function in ES3 and ES5. Consider using a standard function expression." },
-        Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct: { code: 2497, category: ts.DiagnosticCategory.Error, key: "Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct_2497", message: "Module '{0}' resolves to a non-module entity and cannot be imported using this construct." },
-        Module_0_uses_export_and_cannot_be_used_with_export_Asterisk: { code: 2498, category: ts.DiagnosticCategory.Error, key: "Module_0_uses_export_and_cannot_be_used_with_export_Asterisk_2498", message: "Module '{0}' uses 'export =' and cannot be used with 'export *'." },
-        An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2499, category: ts.DiagnosticCategory.Error, key: "An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments_2499", message: "An interface can only extend an identifier/qualified-name with optional type arguments." },
-        A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments: { code: 2500, category: ts.DiagnosticCategory.Error, key: "A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments_2500", message: "A class can only implement an identifier/qualified-name with optional type arguments." },
-        A_rest_element_cannot_contain_a_binding_pattern: { code: 2501, category: ts.DiagnosticCategory.Error, key: "A_rest_element_cannot_contain_a_binding_pattern_2501", message: "A rest element cannot contain a binding pattern." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_type_annotation: { code: 2502, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_type_annotation_2502", message: "'{0}' is referenced directly or indirectly in its own type annotation." },
-        Cannot_find_namespace_0: { code: 2503, category: ts.DiagnosticCategory.Error, key: "Cannot_find_namespace_0_2503", message: "Cannot find namespace '{0}'." },
-        No_best_common_type_exists_among_yield_expressions: { code: 2504, category: ts.DiagnosticCategory.Error, key: "No_best_common_type_exists_among_yield_expressions_2504", message: "No best common type exists among yield expressions." },
-        A_generator_cannot_have_a_void_type_annotation: { code: 2505, category: ts.DiagnosticCategory.Error, key: "A_generator_cannot_have_a_void_type_annotation_2505", message: "A generator cannot have a 'void' type annotation." },
-        _0_is_referenced_directly_or_indirectly_in_its_own_base_expression: { code: 2506, category: ts.DiagnosticCategory.Error, key: "_0_is_referenced_directly_or_indirectly_in_its_own_base_expression_2506", message: "'{0}' is referenced directly or indirectly in its own base expression." },
-        Type_0_is_not_a_constructor_function_type: { code: 2507, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_a_constructor_function_type_2507", message: "Type '{0}' is not a constructor function type." },
-        No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: ts.DiagnosticCategory.Error, key: "No_base_constructor_has_the_specified_number_of_type_arguments_2508", message: "No base constructor has the specified number of type arguments." },
-        Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: ts.DiagnosticCategory.Error, key: "Base_constructor_return_type_0_is_not_a_class_or_interface_type_2509", message: "Base constructor return type '{0}' is not a class or interface type." },
-        Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: ts.DiagnosticCategory.Error, key: "Base_constructors_must_all_have_the_same_return_type_2510", message: "Base constructors must all have the same return type." },
-        Cannot_create_an_instance_of_the_abstract_class_0: { code: 2511, category: ts.DiagnosticCategory.Error, key: "Cannot_create_an_instance_of_the_abstract_class_0_2511", message: "Cannot create an instance of the abstract class '{0}'." },
-        Overload_signatures_must_all_be_abstract_or_non_abstract: { code: 2512, category: ts.DiagnosticCategory.Error, key: "Overload_signatures_must_all_be_abstract_or_non_abstract_2512", message: "Overload signatures must all be abstract or non-abstract." },
-        Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression: { code: 2513, category: ts.DiagnosticCategory.Error, key: "Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression_2513", message: "Abstract method '{0}' in class '{1}' cannot be accessed via super expression." },
-        Classes_containing_abstract_methods_must_be_marked_abstract: { code: 2514, category: ts.DiagnosticCategory.Error, key: "Classes_containing_abstract_methods_must_be_marked_abstract_2514", message: "Classes containing abstract methods must be marked abstract." },
-        Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2: { code: 2515, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2_2515", message: "Non-abstract class '{0}' does not implement inherited abstract member '{1}' from class '{2}'." },
-        All_declarations_of_an_abstract_method_must_be_consecutive: { code: 2516, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_an_abstract_method_must_be_consecutive_2516", message: "All declarations of an abstract method must be consecutive." },
-        Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type: { code: 2517, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type_2517", message: "Cannot assign an abstract constructor type to a non-abstract constructor type." },
-        A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard: { code: 2518, category: ts.DiagnosticCategory.Error, key: "A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard_2518", message: "A 'this'-based type guard is not compatible with a parameter-based type guard." },
-        Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions: { code: 2520, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions_2520", message: "Duplicate identifier '{0}'. Compiler uses declaration '{1}' to support async functions." },
-        Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions: { code: 2521, category: ts.DiagnosticCategory.Error, key: "Expression_resolves_to_variable_declaration_0_that_compiler_uses_to_support_async_functions_2521", message: "Expression resolves to variable declaration '{0}' that compiler uses to support async functions." },
-        The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_function_expression: { code: 2522, category: ts.DiagnosticCategory.Error, key: "The_arguments_object_cannot_be_referenced_in_an_async_arrow_function_Consider_using_a_standard_async_2522", message: "The 'arguments' object cannot be referenced in an async arrow function. Consider using a standard async function expression." },
-        yield_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2523, category: ts.DiagnosticCategory.Error, key: "yield_expressions_cannot_be_used_in_a_parameter_initializer_2523", message: "'yield' expressions cannot be used in a parameter initializer." },
-        await_expressions_cannot_be_used_in_a_parameter_initializer: { code: 2524, category: ts.DiagnosticCategory.Error, key: "await_expressions_cannot_be_used_in_a_parameter_initializer_2524", message: "'await' expressions cannot be used in a parameter initializer." },
-        Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value: { code: 2525, category: ts.DiagnosticCategory.Error, key: "Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value_2525", message: "Initializer provides no value for this binding element and the binding element has no default value." },
-        A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface: { code: 2526, category: ts.DiagnosticCategory.Error, key: "A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface_2526", message: "A 'this' type is available only in a non-static member of a class or interface." },
-        The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary: { code: 2527, category: ts.DiagnosticCategory.Error, key: "The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary_2527", message: "The inferred type of '{0}' references an inaccessible 'this' type. A type annotation is necessary." },
-        A_module_cannot_have_multiple_default_exports: { code: 2528, category: ts.DiagnosticCategory.Error, key: "A_module_cannot_have_multiple_default_exports_2528", message: "A module cannot have multiple default exports." },
-        Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions: { code: 2529, category: ts.DiagnosticCategory.Error, key: "Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_func_2529", message: "Duplicate identifier '{0}'. Compiler reserves name '{1}' in top level scope of a module containing async functions." },
-        Property_0_is_incompatible_with_index_signature: { code: 2530, category: ts.DiagnosticCategory.Error, key: "Property_0_is_incompatible_with_index_signature_2530", message: "Property '{0}' is incompatible with index signature." },
-        Object_is_possibly_null: { code: 2531, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_2531", message: "Object is possibly 'null'." },
-        Object_is_possibly_undefined: { code: 2532, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_undefined_2532", message: "Object is possibly 'undefined'." },
-        Object_is_possibly_null_or_undefined: { code: 2533, category: ts.DiagnosticCategory.Error, key: "Object_is_possibly_null_or_undefined_2533", message: "Object is possibly 'null' or 'undefined'." },
-        A_function_returning_never_cannot_have_a_reachable_end_point: { code: 2534, category: ts.DiagnosticCategory.Error, key: "A_function_returning_never_cannot_have_a_reachable_end_point_2534", message: "A function returning 'never' cannot have a reachable end point." },
-        JSX_element_attributes_type_0_may_not_be_a_union_type: { code: 2600, category: ts.DiagnosticCategory.Error, key: "JSX_element_attributes_type_0_may_not_be_a_union_type_2600", message: "JSX element attributes type '{0}' may not be a union type." },
-        The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: ts.DiagnosticCategory.Error, key: "The_return_type_of_a_JSX_element_constructor_must_return_an_object_type_2601", message: "The return type of a JSX element constructor must return an object type." },
-        JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist_2602", message: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
-        Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: ts.DiagnosticCategory.Error, key: "Property_0_in_type_1_is_not_assignable_to_type_2_2603", message: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
-        JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_does_not_have_any_construct_or_call_signatures_2604", message: "JSX element type '{0}' does not have any construct or call signatures." },
-        JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: ts.DiagnosticCategory.Error, key: "JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements_2605", message: "JSX element type '{0}' is not a constructor function for JSX elements." },
-        Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: ts.DiagnosticCategory.Error, key: "Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property_2606", message: "Property '{0}' of JSX spread attribute is not assignable to target property." },
-        JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: ts.DiagnosticCategory.Error, key: "JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property_2607", message: "JSX element class does not support attributes because it does not have a '{0}' property" },
-        The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: ts.DiagnosticCategory.Error, key: "The_global_type_JSX_0_may_not_have_more_than_one_property_2608", message: "The global type 'JSX.{0}' may not have more than one property" },
-        Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: ts.DiagnosticCategory.Error, key: "Cannot_emit_namespaced_JSX_elements_in_React_2650", message: "Cannot emit namespaced JSX elements in React" },
-        A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: { code: 2651, category: ts.DiagnosticCategory.Error, key: "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", message: "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums." },
-        Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: { code: 2652, category: ts.DiagnosticCategory.Error, key: "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", message: "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead." },
-        Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1: { code: 2653, category: ts.DiagnosticCategory.Error, key: "Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1_2653", message: "Non-abstract class expression does not implement inherited abstract member '{0}' from class '{1}'." },
-        Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_package_author_to_update_the_package_definition: { code: 2654, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_cannot_contain_tripleslash_references_Please_contact_the_pack_2654", message: "Exported external package typings file cannot contain tripleslash references. Please contact the package author to update the package definition." },
-        Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_the_package_definition: { code: 2656, category: ts.DiagnosticCategory.Error, key: "Exported_external_package_typings_file_0_is_not_a_module_Please_contact_the_package_author_to_update_2656", message: "Exported external package typings file '{0}' is not a module. Please contact the package author to update the package definition." },
-        JSX_expressions_must_have_one_parent_element: { code: 2657, category: ts.DiagnosticCategory.Error, key: "JSX_expressions_must_have_one_parent_element_2657", message: "JSX expressions must have one parent element" },
-        Type_0_provides_no_match_for_the_signature_1: { code: 2658, category: ts.DiagnosticCategory.Error, key: "Type_0_provides_no_match_for_the_signature_1_2658", message: "Type '{0}' provides no match for the signature '{1}'" },
-        super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher: { code: 2659, category: ts.DiagnosticCategory.Error, key: "super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_highe_2659", message: "'super' is only allowed in members of object literal expressions when option 'target' is 'ES2015' or higher." },
-        super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions: { code: 2660, category: ts.DiagnosticCategory.Error, key: "super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions_2660", message: "'super' can only be referenced in members of derived classes or object literal expressions." },
-        Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module: { code: 2661, category: ts.DiagnosticCategory.Error, key: "Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module_2661", message: "Cannot export '{0}'. Only local declarations can be exported from a module." },
-        Cannot_find_name_0_Did_you_mean_the_static_member_1_0: { code: 2662, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_static_member_1_0_2662", message: "Cannot find name '{0}'. Did you mean the static member '{1}.{0}'?" },
-        Cannot_find_name_0_Did_you_mean_the_instance_member_this_0: { code: 2663, category: ts.DiagnosticCategory.Error, key: "Cannot_find_name_0_Did_you_mean_the_instance_member_this_0_2663", message: "Cannot find name '{0}'. Did you mean the instance member 'this.{0}'?" },
-        Invalid_module_name_in_augmentation_module_0_cannot_be_found: { code: 2664, category: ts.DiagnosticCategory.Error, key: "Invalid_module_name_in_augmentation_module_0_cannot_be_found_2664", message: "Invalid module name in augmentation, module '{0}' cannot be found." },
-        Exports_and_export_assignments_are_not_permitted_in_module_augmentations: { code: 2666, category: ts.DiagnosticCategory.Error, key: "Exports_and_export_assignments_are_not_permitted_in_module_augmentations_2666", message: "Exports and export assignments are not permitted in module augmentations." },
-        Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module: { code: 2667, category: ts.DiagnosticCategory.Error, key: "Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_mod_2667", message: "Imports are not permitted in module augmentations. Consider moving them to the enclosing external module." },
-        export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible: { code: 2668, category: ts.DiagnosticCategory.Error, key: "export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always__2668", message: "'export' modifier cannot be applied to ambient modules and module augmentations since they are always visible." },
-        Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations: { code: 2669, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_2669", message: "Augmentations for the global scope can only be directly nested in external modules or ambient module declarations." },
-        Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context: { code: 2670, category: ts.DiagnosticCategory.Error, key: "Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambien_2670", message: "Augmentations for the global scope should have 'declare' modifier unless they appear in already ambient context." },
-        Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity: { code: 2671, category: ts.DiagnosticCategory.Error, key: "Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity_2671", message: "Cannot augment module '{0}' because it resolves to a non-module entity." },
-        Cannot_assign_a_0_constructor_type_to_a_1_constructor_type: { code: 2672, category: ts.DiagnosticCategory.Error, key: "Cannot_assign_a_0_constructor_type_to_a_1_constructor_type_2672", message: "Cannot assign a '{0}' constructor type to a '{1}' constructor type." },
-        Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration: { code: 2673, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration_2673", message: "Constructor of class '{0}' is private and only accessible within the class declaration." },
-        Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration: { code: 2674, category: ts.DiagnosticCategory.Error, key: "Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration_2674", message: "Constructor of class '{0}' is protected and only accessible within the class declaration." },
-        Cannot_extend_a_class_0_Class_constructor_is_marked_as_private: { code: 2675, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_a_class_0_Class_constructor_is_marked_as_private_2675", message: "Cannot extend a class '{0}'. Class constructor is marked as private." },
-        Accessors_must_both_be_abstract_or_non_abstract: { code: 2676, category: ts.DiagnosticCategory.Error, key: "Accessors_must_both_be_abstract_or_non_abstract_2676", message: "Accessors must both be abstract or non-abstract." },
-        A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type: { code: 2677, category: ts.DiagnosticCategory.Error, key: "A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type_2677", message: "A type predicate's type must be assignable to its parameter's type." },
-        Type_0_is_not_comparable_to_type_1: { code: 2678, category: ts.DiagnosticCategory.Error, key: "Type_0_is_not_comparable_to_type_1_2678", message: "Type '{0}' is not comparable to type '{1}'." },
-        A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void: { code: 2679, category: ts.DiagnosticCategory.Error, key: "A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void_2679", message: "A function that is called with the 'new' keyword cannot have a 'this' type that is 'void'." },
-        A_this_parameter_must_be_the_first_parameter: { code: 2680, category: ts.DiagnosticCategory.Error, key: "A_this_parameter_must_be_the_first_parameter_2680", message: "A 'this' parameter must be the first parameter." },
-        A_constructor_cannot_have_a_this_parameter: { code: 2681, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_have_a_this_parameter_2681", message: "A constructor cannot have a 'this' parameter." },
-        get_and_set_accessor_must_have_the_same_this_type: { code: 2682, category: ts.DiagnosticCategory.Error, key: "get_and_set_accessor_must_have_the_same_this_type_2682", message: "'get' and 'set' accessor must have the same 'this' type." },
-        this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation: { code: 2683, category: ts.DiagnosticCategory.Error, key: "this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_2683", message: "'this' implicitly has type 'any' because it does not have a type annotation." },
-        The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1: { code: 2684, category: ts.DiagnosticCategory.Error, key: "The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1_2684", message: "The 'this' context of type '{0}' is not assignable to method's 'this' of type '{1}'." },
-        The_this_types_of_each_signature_are_incompatible: { code: 2685, category: ts.DiagnosticCategory.Error, key: "The_this_types_of_each_signature_are_incompatible_2685", message: "The 'this' types of each signature are incompatible." },
-        Identifier_0_must_be_imported_from_a_module: { code: 2686, category: ts.DiagnosticCategory.Error, key: "Identifier_0_must_be_imported_from_a_module_2686", message: "Identifier '{0}' must be imported from a module" },
-        All_declarations_of_0_must_have_identical_modifiers: { code: 2687, category: ts.DiagnosticCategory.Error, key: "All_declarations_of_0_must_have_identical_modifiers_2687", message: "All declarations of '{0}' must have identical modifiers." },
-        Cannot_find_type_definition_file_for_0: { code: 2688, category: ts.DiagnosticCategory.Error, key: "Cannot_find_type_definition_file_for_0_2688", message: "Cannot find type definition file for '{0}'." },
-        Cannot_extend_an_interface_0_Did_you_mean_implements: { code: 2689, category: ts.DiagnosticCategory.Error, key: "Cannot_extend_an_interface_0_Did_you_mean_implements_2689", message: "Cannot extend an interface '{0}'. Did you mean 'implements'?" },
-        Import_declaration_0_is_using_private_name_1: { code: 4000, category: ts.DiagnosticCategory.Error, key: "Import_declaration_0_is_using_private_name_1_4000", message: "Import declaration '{0}' is using private name '{1}'." },
-        Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_class_has_or_is_using_private_name_1_4002", message: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1_4004", message: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4006, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4006", message: "Type parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4008, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4008", message: "Type parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4010, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4010", message: "Type parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4012, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4012", message: "Type parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4014, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4014", message: "Type parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Type_parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4016, category: ts.DiagnosticCategory.Error, key: "Type_parameter_0_of_exported_function_has_or_is_using_private_name_1_4016", message: "Type parameter '{0}' of exported function has or is using private name '{1}'." },
-        Implements_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4019, category: ts.DiagnosticCategory.Error, key: "Implements_clause_of_exported_class_0_has_or_is_using_private_name_1_4019", message: "Implements clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_class_0_has_or_is_using_private_name_1: { code: 4020, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_class_0_has_or_is_using_private_name_1_4020", message: "Extends clause of exported class '{0}' has or is using private name '{1}'." },
-        Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1: { code: 4022, category: ts.DiagnosticCategory.Error, key: "Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1_4022", message: "Extends clause of exported interface '{0}' has or is using private name '{1}'." },
-        Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4023, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4023", message: "Exported variable '{0}' has or is using name '{1}' from external module {2} but cannot be named." },
-        Exported_variable_0_has_or_is_using_name_1_from_private_module_2: { code: 4024, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_name_1_from_private_module_2_4024", message: "Exported variable '{0}' has or is using name '{1}' from private module '{2}'." },
-        Exported_variable_0_has_or_is_using_private_name_1: { code: 4025, category: ts.DiagnosticCategory.Error, key: "Exported_variable_0_has_or_is_using_private_name_1_4025", message: "Exported variable '{0}' has or is using private name '{1}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4026, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot__4026", message: "Public static property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4027, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4027", message: "Public static property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_static_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4028, category: ts.DiagnosticCategory.Error, key: "Public_static_property_0_of_exported_class_has_or_is_using_private_name_1_4028", message: "Public static property '{0}' of exported class has or is using private name '{1}'." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4029, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_name_4029", message: "Public property '{0}' of exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4030, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2_4030", message: "Public property '{0}' of exported class has or is using name '{1}' from private module '{2}'." },
-        Public_property_0_of_exported_class_has_or_is_using_private_name_1: { code: 4031, category: ts.DiagnosticCategory.Error, key: "Public_property_0_of_exported_class_has_or_is_using_private_name_1_4031", message: "Public property '{0}' of exported class has or is using private name '{1}'." },
-        Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4032, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2_4032", message: "Property '{0}' of exported interface has or is using name '{1}' from private module '{2}'." },
-        Property_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4033, category: ts.DiagnosticCategory.Error, key: "Property_0_of_exported_interface_has_or_is_using_private_name_1_4033", message: "Property '{0}' of exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4034, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_4034", message: "Parameter '{0}' of public static property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4035, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1_4035", message: "Parameter '{0}' of public static property setter from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4036, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_4036", message: "Parameter '{0}' of public property setter from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1: { code: 4037, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1_4037", message: "Parameter '{0}' of public property setter from exported class has or is using private name '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4038, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_externa_4038", message: "Return type of public static property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4039, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_4039", message: "Return type of public static property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4040, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0_4040", message: "Return type of public static property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4041, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_modul_4041", message: "Return type of public property getter from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4042, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_4042", message: "Return type of public property getter from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0: { code: 4043, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0_4043", message: "Return type of public property getter from exported class has or is using private name '{0}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4044, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_mod_4044", message: "Return type of constructor signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4045, category: ts.DiagnosticCategory.Error, key: "Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0_4045", message: "Return type of constructor signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4046, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4046", message: "Return type of call signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4047, category: ts.DiagnosticCategory.Error, key: "Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0_4047", message: "Return type of call signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4048, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4048", message: "Return type of index signature from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0: { code: 4049, category: ts.DiagnosticCategory.Error, key: "Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0_4049", message: "Return type of index signature from exported interface has or is using private name '{0}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4050, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module__4050", message: "Return type of public static method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4051, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4051", message: "Return type of public static method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0: { code: 4052, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0_4052", message: "Return type of public static method from exported class has or is using private name '{0}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4053, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_c_4053", message: "Return type of public method from exported class has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1: { code: 4054, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1_4054", message: "Return type of public method from exported class has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0: { code: 4055, category: ts.DiagnosticCategory.Error, key: "Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0_4055", message: "Return type of public method from exported class has or is using private name '{0}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1: { code: 4056, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1_4056", message: "Return type of method from exported interface has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0: { code: 4057, category: ts.DiagnosticCategory.Error, key: "Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0_4057", message: "Return type of method from exported interface has or is using private name '{0}'." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named: { code: 4058, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named_4058", message: "Return type of exported function has or is using name '{0}' from external module {1} but cannot be named." },
-        Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1: { code: 4059, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1_4059", message: "Return type of exported function has or is using name '{0}' from private module '{1}'." },
-        Return_type_of_exported_function_has_or_is_using_private_name_0: { code: 4060, category: ts.DiagnosticCategory.Error, key: "Return_type_of_exported_function_has_or_is_using_private_name_0_4060", message: "Return type of exported function has or is using private name '{0}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4061, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_can_4061", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4062, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2_4062", message: "Parameter '{0}' of constructor from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1: { code: 4063, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1_4063", message: "Parameter '{0}' of constructor from exported class has or is using private name '{1}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4064, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_mod_4064", message: "Parameter '{0}' of constructor signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4065, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1_4065", message: "Parameter '{0}' of constructor signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4066, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4066", message: "Parameter '{0}' of call signature from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1: { code: 4067, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1_4067", message: "Parameter '{0}' of call signature from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4068, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module__4068", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4069, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4069", message: "Parameter '{0}' of public static method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1: { code: 4070, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1_4070", message: "Parameter '{0}' of public static method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4071, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_c_4071", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2: { code: 4072, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2_4072", message: "Parameter '{0}' of public method from exported class has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1: { code: 4073, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1_4073", message: "Parameter '{0}' of public method from exported class has or is using private name '{1}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2: { code: 4074, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2_4074", message: "Parameter '{0}' of method from exported interface has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1: { code: 4075, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1_4075", message: "Parameter '{0}' of method from exported interface has or is using private name '{1}'." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named: { code: 4076, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named_4076", message: "Parameter '{0}' of exported function has or is using name '{1}' from external module {2} but cannot be named." },
-        Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2: { code: 4077, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2_4077", message: "Parameter '{0}' of exported function has or is using name '{1}' from private module '{2}'." },
-        Parameter_0_of_exported_function_has_or_is_using_private_name_1: { code: 4078, category: ts.DiagnosticCategory.Error, key: "Parameter_0_of_exported_function_has_or_is_using_private_name_1_4078", message: "Parameter '{0}' of exported function has or is using private name '{1}'." },
-        Exported_type_alias_0_has_or_is_using_private_name_1: { code: 4081, category: ts.DiagnosticCategory.Error, key: "Exported_type_alias_0_has_or_is_using_private_name_1_4081", message: "Exported type alias '{0}' has or is using private name '{1}'." },
-        Default_export_of_the_module_has_or_is_using_private_name_0: { code: 4082, category: ts.DiagnosticCategory.Error, key: "Default_export_of_the_module_has_or_is_using_private_name_0_4082", message: "Default export of the module has or is using private name '{0}'." },
-        Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict: { code: 4090, category: ts.DiagnosticCategory.Message, key: "Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_t_4090", message: "Conflicting library definitions for '{0}' found at '{1}' and '{2}'. Copy the correct file to the 'typings' folder to resolve this conflict." },
-        The_current_host_does_not_support_the_0_option: { code: 5001, category: ts.DiagnosticCategory.Error, key: "The_current_host_does_not_support_the_0_option_5001", message: "The current host does not support the '{0}' option." },
-        Cannot_find_the_common_subdirectory_path_for_the_input_files: { code: 5009, category: ts.DiagnosticCategory.Error, key: "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", message: "Cannot find the common subdirectory path for the input files." },
-        File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5010, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", message: "File specification cannot end in a recursive directory wildcard ('**'): '{0}'." },
-        File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0: { code: 5011, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0_5011", message: "File specification cannot contain multiple recursive directory wildcards ('**'): '{0}'." },
-        Cannot_read_file_0_Colon_1: { code: 5012, category: ts.DiagnosticCategory.Error, key: "Cannot_read_file_0_Colon_1_5012", message: "Cannot read file '{0}': {1}" },
-        Unsupported_file_encoding: { code: 5013, category: ts.DiagnosticCategory.Error, key: "Unsupported_file_encoding_5013", message: "Unsupported file encoding." },
-        Failed_to_parse_file_0_Colon_1: { code: 5014, category: ts.DiagnosticCategory.Error, key: "Failed_to_parse_file_0_Colon_1_5014", message: "Failed to parse file '{0}': {1}." },
-        Unknown_compiler_option_0: { code: 5023, category: ts.DiagnosticCategory.Error, key: "Unknown_compiler_option_0_5023", message: "Unknown compiler option '{0}'." },
-        Compiler_option_0_requires_a_value_of_type_1: { code: 5024, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_requires_a_value_of_type_1_5024", message: "Compiler option '{0}' requires a value of type {1}." },
-        Could_not_write_file_0_Colon_1: { code: 5033, category: ts.DiagnosticCategory.Error, key: "Could_not_write_file_0_Colon_1_5033", message: "Could not write file '{0}': {1}" },
-        Option_project_cannot_be_mixed_with_source_files_on_a_command_line: { code: 5042, category: ts.DiagnosticCategory.Error, key: "Option_project_cannot_be_mixed_with_source_files_on_a_command_line_5042", message: "Option 'project' cannot be mixed with source files on a command line." },
-        Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher: { code: 5047, category: ts.DiagnosticCategory.Error, key: "Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES_5047", message: "Option 'isolatedModules' can only be used when either option '--module' is provided or option 'target' is 'ES2015' or higher." },
-        Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided: { code: 5051, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided_5051", message: "Option '{0} can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided." },
-        Option_0_cannot_be_specified_without_specifying_option_1: { code: 5052, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_without_specifying_option_1_5052", message: "Option '{0}' cannot be specified without specifying option '{1}'." },
-        Option_0_cannot_be_specified_with_option_1: { code: 5053, category: ts.DiagnosticCategory.Error, key: "Option_0_cannot_be_specified_with_option_1_5053", message: "Option '{0}' cannot be specified with option '{1}'." },
-        A_tsconfig_json_file_is_already_defined_at_Colon_0: { code: 5054, category: ts.DiagnosticCategory.Error, key: "A_tsconfig_json_file_is_already_defined_at_Colon_0_5054", message: "A 'tsconfig.json' file is already defined at: '{0}'." },
-        Cannot_write_file_0_because_it_would_overwrite_input_file: { code: 5055, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_overwrite_input_file_5055", message: "Cannot write file '{0}' because it would overwrite input file." },
-        Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files: { code: 5056, category: ts.DiagnosticCategory.Error, key: "Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files_5056", message: "Cannot write file '{0}' because it would be overwritten by multiple input files." },
-        Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0: { code: 5057, category: ts.DiagnosticCategory.Error, key: "Cannot_find_a_tsconfig_json_file_at_the_specified_directory_Colon_0_5057", message: "Cannot find a tsconfig.json file at the specified directory: '{0}'" },
-        The_specified_path_does_not_exist_Colon_0: { code: 5058, category: ts.DiagnosticCategory.Error, key: "The_specified_path_does_not_exist_Colon_0_5058", message: "The specified path does not exist: '{0}'" },
-        Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier: { code: 5059, category: ts.DiagnosticCategory.Error, key: "Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier_5059", message: "Invalid value for '--reactNamespace'. '{0}' is not a valid identifier." },
-        Option_paths_cannot_be_used_without_specifying_baseUrl_option: { code: 5060, category: ts.DiagnosticCategory.Error, key: "Option_paths_cannot_be_used_without_specifying_baseUrl_option_5060", message: "Option 'paths' cannot be used without specifying '--baseUrl' option." },
-        Pattern_0_can_have_at_most_one_Asterisk_character: { code: 5061, category: ts.DiagnosticCategory.Error, key: "Pattern_0_can_have_at_most_one_Asterisk_character_5061", message: "Pattern '{0}' can have at most one '*' character" },
-        Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character: { code: 5062, category: ts.DiagnosticCategory.Error, key: "Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character_5062", message: "Substitution '{0}' in pattern '{1}' in can have at most one '*' character" },
-        Substitutions_for_pattern_0_should_be_an_array: { code: 5063, category: ts.DiagnosticCategory.Error, key: "Substitutions_for_pattern_0_should_be_an_array_5063", message: "Substitutions for pattern '{0}' should be an array." },
-        Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2: { code: 5064, category: ts.DiagnosticCategory.Error, key: "Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2_5064", message: "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'." },
-        File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: { code: 5065, category: ts.DiagnosticCategory.Error, key: "File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildca_5065", message: "File specification cannot contain a parent directory ('..') that appears after a recursive directory wildcard ('**'): '{0}'." },
-        Concatenate_and_emit_output_to_single_file: { code: 6001, category: ts.DiagnosticCategory.Message, key: "Concatenate_and_emit_output_to_single_file_6001", message: "Concatenate and emit output to single file." },
-        Generates_corresponding_d_ts_file: { code: 6002, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_d_ts_file_6002", message: "Generates corresponding '.d.ts' file." },
-        Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations: { code: 6003, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations_6003", message: "Specify the location where debugger should locate map files instead of generated locations." },
-        Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations: { code: 6004, category: ts.DiagnosticCategory.Message, key: "Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations_6004", message: "Specify the location where debugger should locate TypeScript files instead of source locations." },
-        Watch_input_files: { code: 6005, category: ts.DiagnosticCategory.Message, key: "Watch_input_files_6005", message: "Watch input files." },
-        Redirect_output_structure_to_the_directory: { code: 6006, category: ts.DiagnosticCategory.Message, key: "Redirect_output_structure_to_the_directory_6006", message: "Redirect output structure to the directory." },
-        Do_not_erase_const_enum_declarations_in_generated_code: { code: 6007, category: ts.DiagnosticCategory.Message, key: "Do_not_erase_const_enum_declarations_in_generated_code_6007", message: "Do not erase const enum declarations in generated code." },
-        Do_not_emit_outputs_if_any_errors_were_reported: { code: 6008, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_if_any_errors_were_reported_6008", message: "Do not emit outputs if any errors were reported." },
-        Do_not_emit_comments_to_output: { code: 6009, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_comments_to_output_6009", message: "Do not emit comments to output." },
-        Do_not_emit_outputs: { code: 6010, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_outputs_6010", message: "Do not emit outputs." },
-        Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking: { code: 6011, category: ts.DiagnosticCategory.Message, key: "Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typech_6011", message: "Allow default imports from modules with no default export. This does not affect code emit, just typechecking." },
-        Skip_type_checking_of_declaration_files: { code: 6012, category: ts.DiagnosticCategory.Message, key: "Skip_type_checking_of_declaration_files_6012", message: "Skip type checking of declaration files." },
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015: { code: 6015, category: ts.DiagnosticCategory.Message, key: "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015_6015", message: "Specify ECMAScript target version: 'ES3' (default), 'ES5', or 'ES2015'" },
-        Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015: { code: 6016, category: ts.DiagnosticCategory.Message, key: "Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015_6016", message: "Specify module code generation: 'commonjs', 'amd', 'system', 'umd' or 'es2015'" },
-        Print_this_message: { code: 6017, category: ts.DiagnosticCategory.Message, key: "Print_this_message_6017", message: "Print this message." },
-        Print_the_compiler_s_version: { code: 6019, category: ts.DiagnosticCategory.Message, key: "Print_the_compiler_s_version_6019", message: "Print the compiler's version." },
-        Compile_the_project_in_the_given_directory: { code: 6020, category: ts.DiagnosticCategory.Message, key: "Compile_the_project_in_the_given_directory_6020", message: "Compile the project in the given directory." },
-        Syntax_Colon_0: { code: 6023, category: ts.DiagnosticCategory.Message, key: "Syntax_Colon_0_6023", message: "Syntax: {0}" },
-        options: { code: 6024, category: ts.DiagnosticCategory.Message, key: "options_6024", message: "options" },
-        file: { code: 6025, category: ts.DiagnosticCategory.Message, key: "file_6025", message: "file" },
-        Examples_Colon_0: { code: 6026, category: ts.DiagnosticCategory.Message, key: "Examples_Colon_0_6026", message: "Examples: {0}" },
-        Options_Colon: { code: 6027, category: ts.DiagnosticCategory.Message, key: "Options_Colon_6027", message: "Options:" },
-        Version_0: { code: 6029, category: ts.DiagnosticCategory.Message, key: "Version_0_6029", message: "Version {0}" },
-        Insert_command_line_options_and_files_from_a_file: { code: 6030, category: ts.DiagnosticCategory.Message, key: "Insert_command_line_options_and_files_from_a_file_6030", message: "Insert command line options and files from a file." },
-        File_change_detected_Starting_incremental_compilation: { code: 6032, category: ts.DiagnosticCategory.Message, key: "File_change_detected_Starting_incremental_compilation_6032", message: "File change detected. Starting incremental compilation..." },
-        KIND: { code: 6034, category: ts.DiagnosticCategory.Message, key: "KIND_6034", message: "KIND" },
-        FILE: { code: 6035, category: ts.DiagnosticCategory.Message, key: "FILE_6035", message: "FILE" },
-        VERSION: { code: 6036, category: ts.DiagnosticCategory.Message, key: "VERSION_6036", message: "VERSION" },
-        LOCATION: { code: 6037, category: ts.DiagnosticCategory.Message, key: "LOCATION_6037", message: "LOCATION" },
-        DIRECTORY: { code: 6038, category: ts.DiagnosticCategory.Message, key: "DIRECTORY_6038", message: "DIRECTORY" },
-        Compilation_complete_Watching_for_file_changes: { code: 6042, category: ts.DiagnosticCategory.Message, key: "Compilation_complete_Watching_for_file_changes_6042", message: "Compilation complete. Watching for file changes." },
-        Generates_corresponding_map_file: { code: 6043, category: ts.DiagnosticCategory.Message, key: "Generates_corresponding_map_file_6043", message: "Generates corresponding '.map' file." },
-        Compiler_option_0_expects_an_argument: { code: 6044, category: ts.DiagnosticCategory.Error, key: "Compiler_option_0_expects_an_argument_6044", message: "Compiler option '{0}' expects an argument." },
-        Unterminated_quoted_string_in_response_file_0: { code: 6045, category: ts.DiagnosticCategory.Error, key: "Unterminated_quoted_string_in_response_file_0_6045", message: "Unterminated quoted string in response file '{0}'." },
-        Argument_for_0_option_must_be_Colon_1: { code: 6046, category: ts.DiagnosticCategory.Error, key: "Argument_for_0_option_must_be_Colon_1_6046", message: "Argument for '{0}' option must be: {1}" },
-        Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1: { code: 6048, category: ts.DiagnosticCategory.Error, key: "Locale_must_be_of_the_form_language_or_language_territory_For_example_0_or_1_6048", message: "Locale must be of the form <language> or <language>-<territory>. For example '{0}' or '{1}'." },
-        Unsupported_locale_0: { code: 6049, category: ts.DiagnosticCategory.Error, key: "Unsupported_locale_0_6049", message: "Unsupported locale '{0}'." },
-        Unable_to_open_file_0: { code: 6050, category: ts.DiagnosticCategory.Error, key: "Unable_to_open_file_0_6050", message: "Unable to open file '{0}'." },
-        Corrupted_locale_file_0: { code: 6051, category: ts.DiagnosticCategory.Error, key: "Corrupted_locale_file_0_6051", message: "Corrupted locale file {0}." },
-        Raise_error_on_expressions_and_declarations_with_an_implied_any_type: { code: 6052, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_expressions_and_declarations_with_an_implied_any_type_6052", message: "Raise error on expressions and declarations with an implied 'any' type." },
-        File_0_not_found: { code: 6053, category: ts.DiagnosticCategory.Error, key: "File_0_not_found_6053", message: "File '{0}' not found." },
-        File_0_has_unsupported_extension_The_only_supported_extensions_are_1: { code: 6054, category: ts.DiagnosticCategory.Error, key: "File_0_has_unsupported_extension_The_only_supported_extensions_are_1_6054", message: "File '{0}' has unsupported extension. The only supported extensions are {1}." },
-        Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures: { code: 6055, category: ts.DiagnosticCategory.Message, key: "Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures_6055", message: "Suppress noImplicitAny errors for indexing objects lacking index signatures." },
-        Do_not_emit_declarations_for_code_that_has_an_internal_annotation: { code: 6056, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_declarations_for_code_that_has_an_internal_annotation_6056", message: "Do not emit declarations for code that has an '@internal' annotation." },
-        Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir: { code: 6058, category: ts.DiagnosticCategory.Message, key: "Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir_6058", message: "Specify the root directory of input files. Use to control the output directory structure with --outDir." },
-        File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files: { code: 6059, category: ts.DiagnosticCategory.Error, key: "File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files_6059", message: "File '{0}' is not under 'rootDir' '{1}'. 'rootDir' is expected to contain all source files." },
-        Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: ts.DiagnosticCategory.Message, key: "Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix_6060", message: "Specify the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
-        NEWLINE: { code: 6061, category: ts.DiagnosticCategory.Message, key: "NEWLINE_6061", message: "NEWLINE" },
-        Option_0_can_only_be_specified_in_tsconfig_json_file: { code: 6064, category: ts.DiagnosticCategory.Error, key: "Option_0_can_only_be_specified_in_tsconfig_json_file_6064", message: "Option '{0}' can only be specified in 'tsconfig.json' file." },
-        Enables_experimental_support_for_ES7_decorators: { code: 6065, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_decorators_6065", message: "Enables experimental support for ES7 decorators." },
-        Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_emitting_type_metadata_for_decorators_6066", message: "Enables experimental support for emitting type metadata for decorators." },
-        Enables_experimental_support_for_ES7_async_functions: { code: 6068, category: ts.DiagnosticCategory.Message, key: "Enables_experimental_support_for_ES7_async_functions_6068", message: "Enables experimental support for ES7 async functions." },
-        Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6: { code: 6069, category: ts.DiagnosticCategory.Message, key: "Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6_6069", message: "Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6)." },
-        Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file: { code: 6070, category: ts.DiagnosticCategory.Message, key: "Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file_6070", message: "Initializes a TypeScript project and creates a tsconfig.json file." },
-        Successfully_created_a_tsconfig_json_file: { code: 6071, category: ts.DiagnosticCategory.Message, key: "Successfully_created_a_tsconfig_json_file_6071", message: "Successfully created a tsconfig.json file." },
-        Suppress_excess_property_checks_for_object_literals: { code: 6072, category: ts.DiagnosticCategory.Message, key: "Suppress_excess_property_checks_for_object_literals_6072", message: "Suppress excess property checks for object literals." },
-        Stylize_errors_and_messages_using_color_and_context_experimental: { code: 6073, category: ts.DiagnosticCategory.Message, key: "Stylize_errors_and_messages_using_color_and_context_experimental_6073", message: "Stylize errors and messages using color and context. (experimental)" },
-        Do_not_report_errors_on_unused_labels: { code: 6074, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unused_labels_6074", message: "Do not report errors on unused labels." },
-        Report_error_when_not_all_code_paths_in_function_return_a_value: { code: 6075, category: ts.DiagnosticCategory.Message, key: "Report_error_when_not_all_code_paths_in_function_return_a_value_6075", message: "Report error when not all code paths in function return a value." },
-        Report_errors_for_fallthrough_cases_in_switch_statement: { code: 6076, category: ts.DiagnosticCategory.Message, key: "Report_errors_for_fallthrough_cases_in_switch_statement_6076", message: "Report errors for fallthrough cases in switch statement." },
-        Do_not_report_errors_on_unreachable_code: { code: 6077, category: ts.DiagnosticCategory.Message, key: "Do_not_report_errors_on_unreachable_code_6077", message: "Do not report errors on unreachable code." },
-        Disallow_inconsistently_cased_references_to_the_same_file: { code: 6078, category: ts.DiagnosticCategory.Message, key: "Disallow_inconsistently_cased_references_to_the_same_file_6078", message: "Disallow inconsistently-cased references to the same file." },
-        Specify_library_files_to_be_included_in_the_compilation_Colon: { code: 6079, category: ts.DiagnosticCategory.Message, key: "Specify_library_files_to_be_included_in_the_compilation_Colon_6079", message: "Specify library files to be included in the compilation: " },
-        Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: ts.DiagnosticCategory.Message, key: "Specify_JSX_code_generation_Colon_preserve_or_react_6080", message: "Specify JSX code generation: 'preserve' or 'react'" },
-        Only_amd_and_system_modules_are_supported_alongside_0: { code: 6082, category: ts.DiagnosticCategory.Error, key: "Only_amd_and_system_modules_are_supported_alongside_0_6082", message: "Only 'amd' and 'system' modules are supported alongside --{0}." },
-        Base_directory_to_resolve_non_absolute_module_names: { code: 6083, category: ts.DiagnosticCategory.Message, key: "Base_directory_to_resolve_non_absolute_module_names_6083", message: "Base directory to resolve non-absolute module names." },
-        Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit: { code: 6084, category: ts.DiagnosticCategory.Message, key: "Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit_6084", message: "Specify the object invoked for createElement and __spread when targeting 'react' JSX emit" },
-        Enable_tracing_of_the_name_resolution_process: { code: 6085, category: ts.DiagnosticCategory.Message, key: "Enable_tracing_of_the_name_resolution_process_6085", message: "Enable tracing of the name resolution process." },
-        Resolving_module_0_from_1: { code: 6086, category: ts.DiagnosticCategory.Message, key: "Resolving_module_0_from_1_6086", message: "======== Resolving module '{0}' from '{1}'. ========" },
-        Explicitly_specified_module_resolution_kind_Colon_0: { code: 6087, category: ts.DiagnosticCategory.Message, key: "Explicitly_specified_module_resolution_kind_Colon_0_6087", message: "Explicitly specified module resolution kind: '{0}'." },
-        Module_resolution_kind_is_not_specified_using_0: { code: 6088, category: ts.DiagnosticCategory.Message, key: "Module_resolution_kind_is_not_specified_using_0_6088", message: "Module resolution kind is not specified, using '{0}'." },
-        Module_name_0_was_successfully_resolved_to_1: { code: 6089, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_successfully_resolved_to_1_6089", message: "======== Module name '{0}' was successfully resolved to '{1}'. ========" },
-        Module_name_0_was_not_resolved: { code: 6090, category: ts.DiagnosticCategory.Message, key: "Module_name_0_was_not_resolved_6090", message: "======== Module name '{0}' was not resolved. ========" },
-        paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0: { code: 6091, category: ts.DiagnosticCategory.Message, key: "paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0_6091", message: "'paths' option is specified, looking for a pattern to match module name '{0}'." },
-        Module_name_0_matched_pattern_1: { code: 6092, category: ts.DiagnosticCategory.Message, key: "Module_name_0_matched_pattern_1_6092", message: "Module name '{0}', matched pattern '{1}'." },
-        Trying_substitution_0_candidate_module_location_Colon_1: { code: 6093, category: ts.DiagnosticCategory.Message, key: "Trying_substitution_0_candidate_module_location_Colon_1_6093", message: "Trying substitution '{0}', candidate module location: '{1}'." },
-        Resolving_module_name_0_relative_to_base_url_1_2: { code: 6094, category: ts.DiagnosticCategory.Message, key: "Resolving_module_name_0_relative_to_base_url_1_2_6094", message: "Resolving module name '{0}' relative to base url '{1}' - '{2}'." },
-        Loading_module_as_file_Slash_folder_candidate_module_location_0: { code: 6095, category: ts.DiagnosticCategory.Message, key: "Loading_module_as_file_Slash_folder_candidate_module_location_0_6095", message: "Loading module as file / folder, candidate module location '{0}'." },
-        File_0_does_not_exist: { code: 6096, category: ts.DiagnosticCategory.Message, key: "File_0_does_not_exist_6096", message: "File '{0}' does not exist." },
-        File_0_exist_use_it_as_a_name_resolution_result: { code: 6097, category: ts.DiagnosticCategory.Message, key: "File_0_exist_use_it_as_a_name_resolution_result_6097", message: "File '{0}' exist - use it as a name resolution result." },
-        Loading_module_0_from_node_modules_folder: { code: 6098, category: ts.DiagnosticCategory.Message, key: "Loading_module_0_from_node_modules_folder_6098", message: "Loading module '{0}' from 'node_modules' folder." },
-        Found_package_json_at_0: { code: 6099, category: ts.DiagnosticCategory.Message, key: "Found_package_json_at_0_6099", message: "Found 'package.json' at '{0}'." },
-        package_json_does_not_have_types_field: { code: 6100, category: ts.DiagnosticCategory.Message, key: "package_json_does_not_have_types_field_6100", message: "'package.json' does not have 'types' field." },
-        package_json_has_0_field_1_that_references_2: { code: 6101, category: ts.DiagnosticCategory.Message, key: "package_json_has_0_field_1_that_references_2_6101", message: "'package.json' has '{0}' field '{1}' that references '{2}'." },
-        Allow_javascript_files_to_be_compiled: { code: 6102, category: ts.DiagnosticCategory.Message, key: "Allow_javascript_files_to_be_compiled_6102", message: "Allow javascript files to be compiled." },
-        Option_0_should_have_array_of_strings_as_a_value: { code: 6103, category: ts.DiagnosticCategory.Error, key: "Option_0_should_have_array_of_strings_as_a_value_6103", message: "Option '{0}' should have array of strings as a value." },
-        Checking_if_0_is_the_longest_matching_prefix_for_1_2: { code: 6104, category: ts.DiagnosticCategory.Message, key: "Checking_if_0_is_the_longest_matching_prefix_for_1_2_6104", message: "Checking if '{0}' is the longest matching prefix for '{1}' - '{2}'." },
-        Expected_type_of_0_field_in_package_json_to_be_string_got_1: { code: 6105, category: ts.DiagnosticCategory.Message, key: "Expected_type_of_0_field_in_package_json_to_be_string_got_1_6105", message: "Expected type of '{0}' field in 'package.json' to be 'string', got '{1}'." },
-        baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1: { code: 6106, category: ts.DiagnosticCategory.Message, key: "baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1_6106", message: "'baseUrl' option is set to '{0}', using this value to resolve non-relative module name '{1}'" },
-        rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0: { code: 6107, category: ts.DiagnosticCategory.Message, key: "rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0_6107", message: "'rootDirs' option is set, using it to resolve relative module name '{0}'" },
-        Longest_matching_prefix_for_0_is_1: { code: 6108, category: ts.DiagnosticCategory.Message, key: "Longest_matching_prefix_for_0_is_1_6108", message: "Longest matching prefix for '{0}' is '{1}'" },
-        Loading_0_from_the_root_dir_1_candidate_location_2: { code: 6109, category: ts.DiagnosticCategory.Message, key: "Loading_0_from_the_root_dir_1_candidate_location_2_6109", message: "Loading '{0}' from the root dir '{1}', candidate location '{2}'" },
-        Trying_other_entries_in_rootDirs: { code: 6110, category: ts.DiagnosticCategory.Message, key: "Trying_other_entries_in_rootDirs_6110", message: "Trying other entries in 'rootDirs'" },
-        Module_resolution_using_rootDirs_has_failed: { code: 6111, category: ts.DiagnosticCategory.Message, key: "Module_resolution_using_rootDirs_has_failed_6111", message: "Module resolution using 'rootDirs' has failed" },
-        Do_not_emit_use_strict_directives_in_module_output: { code: 6112, category: ts.DiagnosticCategory.Message, key: "Do_not_emit_use_strict_directives_in_module_output_6112", message: "Do not emit 'use strict' directives in module output." },
-        Enable_strict_null_checks: { code: 6113, category: ts.DiagnosticCategory.Message, key: "Enable_strict_null_checks_6113", message: "Enable strict null checks." },
-        Unknown_option_excludes_Did_you_mean_exclude: { code: 6114, category: ts.DiagnosticCategory.Error, key: "Unknown_option_excludes_Did_you_mean_exclude_6114", message: "Unknown option 'excludes'. Did you mean 'exclude'?" },
-        Raise_error_on_this_expressions_with_an_implied_any_type: { code: 6115, category: ts.DiagnosticCategory.Message, key: "Raise_error_on_this_expressions_with_an_implied_any_type_6115", message: "Raise error on 'this' expressions with an implied 'any' type." },
-        Resolving_type_reference_directive_0_containing_file_1_root_directory_2: { code: 6116, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_2_6116", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory '{2}'. ========" },
-        Resolving_using_primary_search_paths: { code: 6117, category: ts.DiagnosticCategory.Message, key: "Resolving_using_primary_search_paths_6117", message: "Resolving using primary search paths..." },
-        Resolving_from_node_modules_folder: { code: 6118, category: ts.DiagnosticCategory.Message, key: "Resolving_from_node_modules_folder_6118", message: "Resolving from node_modules folder..." },
-        Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2: { code: 6119, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2_6119", message: "======== Type reference directive '{0}' was successfully resolved to '{1}', primary: {2}. ========" },
-        Type_reference_directive_0_was_not_resolved: { code: 6120, category: ts.DiagnosticCategory.Message, key: "Type_reference_directive_0_was_not_resolved_6120", message: "======== Type reference directive '{0}' was not resolved. ========" },
-        Resolving_with_primary_search_path_0: { code: 6121, category: ts.DiagnosticCategory.Message, key: "Resolving_with_primary_search_path_0_6121", message: "Resolving with primary search path '{0}'" },
-        Root_directory_cannot_be_determined_skipping_primary_search_paths: { code: 6122, category: ts.DiagnosticCategory.Message, key: "Root_directory_cannot_be_determined_skipping_primary_search_paths_6122", message: "Root directory cannot be determined, skipping primary search paths." },
-        Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set: { code: 6123, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set_6123", message: "======== Resolving type reference directive '{0}', containing file '{1}', root directory not set. ========" },
-        Type_declaration_files_to_be_included_in_compilation: { code: 6124, category: ts.DiagnosticCategory.Message, key: "Type_declaration_files_to_be_included_in_compilation_6124", message: "Type declaration files to be included in compilation." },
-        Looking_up_in_node_modules_folder_initial_location_0: { code: 6125, category: ts.DiagnosticCategory.Message, key: "Looking_up_in_node_modules_folder_initial_location_0_6125", message: "Looking up in 'node_modules' folder, initial location '{0}'" },
-        Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder: { code: 6126, category: ts.DiagnosticCategory.Message, key: "Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_mod_6126", message: "Containing file is not specified and root directory cannot be determined, skipping lookup in 'node_modules' folder." },
-        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1: { code: 6127, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1_6127", message: "======== Resolving type reference directive '{0}', containing file not set, root directory '{1}'. ========" },
-        Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set: { code: 6128, category: ts.DiagnosticCategory.Message, key: "Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set_6128", message: "======== Resolving type reference directive '{0}', containing file not set, root directory not set. ========" },
-        The_config_file_0_found_doesn_t_contain_any_source_files: { code: 6129, category: ts.DiagnosticCategory.Error, key: "The_config_file_0_found_doesn_t_contain_any_source_files_6129", message: "The config file '{0}' found doesn't contain any source files." },
-        Resolving_real_path_for_0_result_1: { code: 6130, category: ts.DiagnosticCategory.Message, key: "Resolving_real_path_for_0_result_1_6130", message: "Resolving real path for '{0}', result '{1}'" },
-        Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system: { code: 6131, category: ts.DiagnosticCategory.Error, key: "Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system_6131", message: "Cannot compile modules using option '{0}' unless the '--module' flag is 'amd' or 'system'." },
-        File_name_0_has_a_1_extension_stripping_it: { code: 6132, category: ts.DiagnosticCategory.Message, key: "File_name_0_has_a_1_extension_stripping_it_6132", message: "File name '{0}' has a '{1}' extension - stripping it" },
-        _0_is_declared_but_never_used: { code: 6133, category: ts.DiagnosticCategory.Error, key: "_0_is_declared_but_never_used_6133", message: "'{0}' is declared but never used." },
-        Report_Errors_on_Unused_Locals: { code: 6134, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Locals_6134", message: "Report Errors on Unused Locals." },
-        Report_Errors_on_Unused_Parameters: { code: 6135, category: ts.DiagnosticCategory.Message, key: "Report_Errors_on_Unused_Parameters_6135", message: "Report Errors on Unused Parameters." },
-        The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files: { code: 6136, category: ts.DiagnosticCategory.Message, key: "The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files_6136", message: "The maximum dependency depth to search under node_modules and load JavaScript files" },
-        No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0: { code: 6137, category: ts.DiagnosticCategory.Message, key: "No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0_6137", message: "No types specified in 'package.json' but 'allowJs' is set, so returning 'main' value of '{0}'" },
-        Variable_0_implicitly_has_an_1_type: { code: 7005, category: ts.DiagnosticCategory.Error, key: "Variable_0_implicitly_has_an_1_type_7005", message: "Variable '{0}' implicitly has an '{1}' type." },
-        Parameter_0_implicitly_has_an_1_type: { code: 7006, category: ts.DiagnosticCategory.Error, key: "Parameter_0_implicitly_has_an_1_type_7006", message: "Parameter '{0}' implicitly has an '{1}' type." },
-        Member_0_implicitly_has_an_1_type: { code: 7008, category: ts.DiagnosticCategory.Error, key: "Member_0_implicitly_has_an_1_type_7008", message: "Member '{0}' implicitly has an '{1}' type." },
-        new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type: { code: 7009, category: ts.DiagnosticCategory.Error, key: "new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type_7009", message: "'new' expression, whose target lacks a construct signature, implicitly has an 'any' type." },
-        _0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type: { code: 7010, category: ts.DiagnosticCategory.Error, key: "_0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type_7010", message: "'{0}', which lacks return-type annotation, implicitly has an '{1}' return type." },
-        Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type: { code: 7011, category: ts.DiagnosticCategory.Error, key: "Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type_7011", message: "Function expression, which lacks return-type annotation, implicitly has an '{0}' return type." },
-        Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7013, category: ts.DiagnosticCategory.Error, key: "Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7013", message: "Construct signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number: { code: 7015, category: ts.DiagnosticCategory.Error, key: "Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number_7015", message: "Element implicitly has an 'any' type because index expression is not of type 'number'." },
-        Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation: { code: 7016, category: ts.DiagnosticCategory.Error, key: "Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation_7016", message: "Property '{0}' implicitly has type 'any', because its 'set' accessor lacks a type annotation." },
-        Index_signature_of_object_type_implicitly_has_an_any_type: { code: 7017, category: ts.DiagnosticCategory.Error, key: "Index_signature_of_object_type_implicitly_has_an_any_type_7017", message: "Index signature of object type implicitly has an 'any' type." },
-        Object_literal_s_property_0_implicitly_has_an_1_type: { code: 7018, category: ts.DiagnosticCategory.Error, key: "Object_literal_s_property_0_implicitly_has_an_1_type_7018", message: "Object literal's property '{0}' implicitly has an '{1}' type." },
-        Rest_parameter_0_implicitly_has_an_any_type: { code: 7019, category: ts.DiagnosticCategory.Error, key: "Rest_parameter_0_implicitly_has_an_any_type_7019", message: "Rest parameter '{0}' implicitly has an 'any[]' type." },
-        Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type: { code: 7020, category: ts.DiagnosticCategory.Error, key: "Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type_7020", message: "Call signature, which lacks return-type annotation, implicitly has an 'any' return type." },
-        _0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer: { code: 7022, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or__7022", message: "'{0}' implicitly has type 'any' because it does not have a type annotation and is referenced directly or indirectly in its own initializer." },
-        _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: ts.DiagnosticCategory.Error, key: "_0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_reference_7023", message: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: ts.DiagnosticCategory.Error, key: "Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_ref_7024", message: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
-        Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: ts.DiagnosticCategory.Error, key: "Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_typ_7025", message: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
-        JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: ts.DiagnosticCategory.Error, key: "JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists_7026", message: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
-        Unreachable_code_detected: { code: 7027, category: ts.DiagnosticCategory.Error, key: "Unreachable_code_detected_7027", message: "Unreachable code detected." },
-        Unused_label: { code: 7028, category: ts.DiagnosticCategory.Error, key: "Unused_label_7028", message: "Unused label." },
-        Fallthrough_case_in_switch: { code: 7029, category: ts.DiagnosticCategory.Error, key: "Fallthrough_case_in_switch_7029", message: "Fallthrough case in switch." },
-        Not_all_code_paths_return_a_value: { code: 7030, category: ts.DiagnosticCategory.Error, key: "Not_all_code_paths_return_a_value_7030", message: "Not all code paths return a value." },
-        Binding_element_0_implicitly_has_an_1_type: { code: 7031, category: ts.DiagnosticCategory.Error, key: "Binding_element_0_implicitly_has_an_1_type_7031", message: "Binding element '{0}' implicitly has an '{1}' type." },
-        You_cannot_rename_this_element: { code: 8000, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_this_element_8000", message: "You cannot rename this element." },
-        You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: ts.DiagnosticCategory.Error, key: "You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library_8001", message: "You cannot rename elements that are defined in the standard TypeScript library." },
-        import_can_only_be_used_in_a_ts_file: { code: 8002, category: ts.DiagnosticCategory.Error, key: "import_can_only_be_used_in_a_ts_file_8002", message: "'import ... =' can only be used in a .ts file." },
-        export_can_only_be_used_in_a_ts_file: { code: 8003, category: ts.DiagnosticCategory.Error, key: "export_can_only_be_used_in_a_ts_file_8003", message: "'export=' can only be used in a .ts file." },
-        type_parameter_declarations_can_only_be_used_in_a_ts_file: { code: 8004, category: ts.DiagnosticCategory.Error, key: "type_parameter_declarations_can_only_be_used_in_a_ts_file_8004", message: "'type parameter declarations' can only be used in a .ts file." },
-        implements_clauses_can_only_be_used_in_a_ts_file: { code: 8005, category: ts.DiagnosticCategory.Error, key: "implements_clauses_can_only_be_used_in_a_ts_file_8005", message: "'implements clauses' can only be used in a .ts file." },
-        interface_declarations_can_only_be_used_in_a_ts_file: { code: 8006, category: ts.DiagnosticCategory.Error, key: "interface_declarations_can_only_be_used_in_a_ts_file_8006", message: "'interface declarations' can only be used in a .ts file." },
-        module_declarations_can_only_be_used_in_a_ts_file: { code: 8007, category: ts.DiagnosticCategory.Error, key: "module_declarations_can_only_be_used_in_a_ts_file_8007", message: "'module declarations' can only be used in a .ts file." },
-        type_aliases_can_only_be_used_in_a_ts_file: { code: 8008, category: ts.DiagnosticCategory.Error, key: "type_aliases_can_only_be_used_in_a_ts_file_8008", message: "'type aliases' can only be used in a .ts file." },
-        _0_can_only_be_used_in_a_ts_file: { code: 8009, category: ts.DiagnosticCategory.Error, key: "_0_can_only_be_used_in_a_ts_file_8009", message: "'{0}' can only be used in a .ts file." },
-        types_can_only_be_used_in_a_ts_file: { code: 8010, category: ts.DiagnosticCategory.Error, key: "types_can_only_be_used_in_a_ts_file_8010", message: "'types' can only be used in a .ts file." },
-        type_arguments_can_only_be_used_in_a_ts_file: { code: 8011, category: ts.DiagnosticCategory.Error, key: "type_arguments_can_only_be_used_in_a_ts_file_8011", message: "'type arguments' can only be used in a .ts file." },
-        parameter_modifiers_can_only_be_used_in_a_ts_file: { code: 8012, category: ts.DiagnosticCategory.Error, key: "parameter_modifiers_can_only_be_used_in_a_ts_file_8012", message: "'parameter modifiers' can only be used in a .ts file." },
-        enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: ts.DiagnosticCategory.Error, key: "enum_declarations_can_only_be_used_in_a_ts_file_8015", message: "'enum declarations' can only be used in a .ts file." },
-        type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: ts.DiagnosticCategory.Error, key: "type_assertion_expressions_can_only_be_used_in_a_ts_file_8016", message: "'type assertion expressions' can only be used in a .ts file." },
-        Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: ts.DiagnosticCategory.Error, key: "Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_clas_9002", message: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
-        class_expressions_are_not_currently_supported: { code: 9003, category: ts.DiagnosticCategory.Error, key: "class_expressions_are_not_currently_supported_9003", message: "'class' expressions are not currently supported." },
-        JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: ts.DiagnosticCategory.Error, key: "JSX_attributes_must_only_be_assigned_a_non_empty_expression_17000", message: "JSX attributes must only be assigned a non-empty 'expression'." },
-        JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: ts.DiagnosticCategory.Error, key: "JSX_elements_cannot_have_multiple_attributes_with_the_same_name_17001", message: "JSX elements cannot have multiple attributes with the same name." },
-        Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: ts.DiagnosticCategory.Error, key: "Expected_corresponding_JSX_closing_tag_for_0_17002", message: "Expected corresponding JSX closing tag for '{0}'." },
-        JSX_attribute_expected: { code: 17003, category: ts.DiagnosticCategory.Error, key: "JSX_attribute_expected_17003", message: "JSX attribute expected." },
-        Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: ts.DiagnosticCategory.Error, key: "Cannot_use_JSX_unless_the_jsx_flag_is_provided_17004", message: "Cannot use JSX unless the '--jsx' flag is provided." },
-        A_constructor_cannot_contain_a_super_call_when_its_class_extends_null: { code: 17005, category: ts.DiagnosticCategory.Error, key: "A_constructor_cannot_contain_a_super_call_when_its_class_extends_null_17005", message: "A constructor cannot contain a 'super' call when its class extends 'null'" },
-        An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17006, category: ts.DiagnosticCategory.Error, key: "An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_ex_17006", message: "An unary expression with the '{0}' operator is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses: { code: 17007, category: ts.DiagnosticCategory.Error, key: "A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Con_17007", message: "A type assertion expression is not allowed in the left-hand side of an exponentiation expression. Consider enclosing the expression in parentheses." },
-        JSX_element_0_has_no_corresponding_closing_tag: { code: 17008, category: ts.DiagnosticCategory.Error, key: "JSX_element_0_has_no_corresponding_closing_tag_17008", message: "JSX element '{0}' has no corresponding closing tag." },
-        super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class: { code: 17009, category: ts.DiagnosticCategory.Error, key: "super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class_17009", message: "'super' must be called before accessing 'this' in the constructor of a derived class." },
-        Unknown_typing_option_0: { code: 17010, category: ts.DiagnosticCategory.Error, key: "Unknown_typing_option_0_17010", message: "Unknown typing option '{0}'." }
-    };
-})(ts || (ts = {}));
-/// <reference path="core.ts"/>
-/// <reference path="diagnosticInformationMap.generated.ts"/>
-var ts;
-(function (ts) {
-    /* @internal */
-    function tokenIsIdentifierOrKeyword(token) {
-        return token >= 69 /* Identifier */;
-    }
-    ts.tokenIsIdentifierOrKeyword = tokenIsIdentifierOrKeyword;
-    var textToToken = {
-        "abstract": 115 /* AbstractKeyword */,
-        "any": 117 /* AnyKeyword */,
-        "as": 116 /* AsKeyword */,
-        "boolean": 120 /* BooleanKeyword */,
-        "break": 70 /* BreakKeyword */,
-        "case": 71 /* CaseKeyword */,
-        "catch": 72 /* CatchKeyword */,
-        "class": 73 /* ClassKeyword */,
-        "continue": 75 /* ContinueKeyword */,
-        "const": 74 /* ConstKeyword */,
-        "constructor": 121 /* ConstructorKeyword */,
-        "debugger": 76 /* DebuggerKeyword */,
-        "declare": 122 /* DeclareKeyword */,
-        "default": 77 /* DefaultKeyword */,
-        "delete": 78 /* DeleteKeyword */,
-        "do": 79 /* DoKeyword */,
-        "else": 80 /* ElseKeyword */,
-        "enum": 81 /* EnumKeyword */,
-        "export": 82 /* ExportKeyword */,
-        "extends": 83 /* ExtendsKeyword */,
-        "false": 84 /* FalseKeyword */,
-        "finally": 85 /* FinallyKeyword */,
-        "for": 86 /* ForKeyword */,
-        "from": 136 /* FromKeyword */,
-        "function": 87 /* FunctionKeyword */,
-        "get": 123 /* GetKeyword */,
-        "if": 88 /* IfKeyword */,
-        "implements": 106 /* ImplementsKeyword */,
-        "import": 89 /* ImportKeyword */,
-        "in": 90 /* InKeyword */,
-        "instanceof": 91 /* InstanceOfKeyword */,
-        "interface": 107 /* InterfaceKeyword */,
-        "is": 124 /* IsKeyword */,
-        "let": 108 /* LetKeyword */,
-        "module": 125 /* ModuleKeyword */,
-        "namespace": 126 /* NamespaceKeyword */,
-        "never": 127 /* NeverKeyword */,
-        "new": 92 /* NewKeyword */,
-        "null": 93 /* NullKeyword */,
-        "number": 130 /* NumberKeyword */,
-        "package": 109 /* PackageKeyword */,
-        "private": 110 /* PrivateKeyword */,
-        "protected": 111 /* ProtectedKeyword */,
-        "public": 112 /* PublicKeyword */,
-        "readonly": 128 /* ReadonlyKeyword */,
-        "require": 129 /* RequireKeyword */,
-        "global": 137 /* GlobalKeyword */,
-        "return": 94 /* ReturnKeyword */,
-        "set": 131 /* SetKeyword */,
-        "static": 113 /* StaticKeyword */,
-        "string": 132 /* StringKeyword */,
-        "super": 95 /* SuperKeyword */,
-        "switch": 96 /* SwitchKeyword */,
-        "symbol": 133 /* SymbolKeyword */,
-        "this": 97 /* ThisKeyword */,
-        "throw": 98 /* ThrowKeyword */,
-        "true": 99 /* TrueKeyword */,
-        "try": 100 /* TryKeyword */,
-        "type": 134 /* TypeKeyword */,
-        "typeof": 101 /* TypeOfKeyword */,
-        "undefined": 135 /* UndefinedKeyword */,
-        "var": 102 /* VarKeyword */,
-        "void": 103 /* VoidKeyword */,
-        "while": 104 /* WhileKeyword */,
-        "with": 105 /* WithKeyword */,
-        "yield": 114 /* YieldKeyword */,
-        "async": 118 /* AsyncKeyword */,
-        "await": 119 /* AwaitKeyword */,
-        "of": 138 /* OfKeyword */,
-        "{": 15 /* OpenBraceToken */,
-        "}": 16 /* CloseBraceToken */,
-        "(": 17 /* OpenParenToken */,
-        ")": 18 /* CloseParenToken */,
-        "[": 19 /* OpenBracketToken */,
-        "]": 20 /* CloseBracketToken */,
-        ".": 21 /* DotToken */,
-        "...": 22 /* DotDotDotToken */,
-        ";": 23 /* SemicolonToken */,
-        ",": 24 /* CommaToken */,
-        "<": 25 /* LessThanToken */,
-        ">": 27 /* GreaterThanToken */,
-        "<=": 28 /* LessThanEqualsToken */,
-        ">=": 29 /* GreaterThanEqualsToken */,
-        "==": 30 /* EqualsEqualsToken */,
-        "!=": 31 /* ExclamationEqualsToken */,
-        "===": 32 /* EqualsEqualsEqualsToken */,
-        "!==": 33 /* ExclamationEqualsEqualsToken */,
-        "=>": 34 /* EqualsGreaterThanToken */,
-        "+": 35 /* PlusToken */,
-        "-": 36 /* MinusToken */,
-        "**": 38 /* AsteriskAsteriskToken */,
-        "*": 37 /* AsteriskToken */,
-        "/": 39 /* SlashToken */,
-        "%": 40 /* PercentToken */,
-        "++": 41 /* PlusPlusToken */,
-        "--": 42 /* MinusMinusToken */,
-        "<<": 43 /* LessThanLessThanToken */,
-        "</": 26 /* LessThanSlashToken */,
-        ">>": 44 /* GreaterThanGreaterThanToken */,
-        ">>>": 45 /* GreaterThanGreaterThanGreaterThanToken */,
-        "&": 46 /* AmpersandToken */,
-        "|": 47 /* BarToken */,
-        "^": 48 /* CaretToken */,
-        "!": 49 /* ExclamationToken */,
-        "~": 50 /* TildeToken */,
-        "&&": 51 /* AmpersandAmpersandToken */,
-        "||": 52 /* BarBarToken */,
-        "?": 53 /* QuestionToken */,
-        ":": 54 /* ColonToken */,
-        "=": 56 /* EqualsToken */,
-        "+=": 57 /* PlusEqualsToken */,
-        "-=": 58 /* MinusEqualsToken */,
-        "*=": 59 /* AsteriskEqualsToken */,
-        "**=": 60 /* AsteriskAsteriskEqualsToken */,
-        "/=": 61 /* SlashEqualsToken */,
-        "%=": 62 /* PercentEqualsToken */,
-        "<<=": 63 /* LessThanLessThanEqualsToken */,
-        ">>=": 64 /* GreaterThanGreaterThanEqualsToken */,
-        ">>>=": 65 /* GreaterThanGreaterThanGreaterThanEqualsToken */,
-        "&=": 66 /* AmpersandEqualsToken */,
-        "|=": 67 /* BarEqualsToken */,
-        "^=": 68 /* CaretEqualsToken */,
-        "@": 55 /* AtToken */
-    };
-    /*
-        As per ECMAScript Language Specification 3th Edition, Section 7.6: Identifiers
-        IdentifierStart ::
-            Can contain Unicode 3.0.0  categories:
-            Uppercase letter (Lu),
-            Lowercase letter (Ll),
-            Titlecase letter (Lt),
-            Modifier letter (Lm),
-            Other letter (Lo), or
-            Letter number (Nl).
-        IdentifierPart :: =
-            Can contain IdentifierStart + Unicode 3.0.0  categories:
-            Non-spacing mark (Mn),
-            Combining spacing mark (Mc),
-            Decimal number (Nd), or
-            Connector punctuation (Pc).
-
-        Codepoint ranges for ES3 Identifiers are extracted from the Unicode 3.0.0 specification at:
-        http://www.unicode.org/Public/3.0-Update/UnicodeData-3.0.0.txt
-    */
-    var unicodeES3IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1610, 1649, 1747, 1749, 1749, 1765, 1766, 1786, 1788, 1808, 1808, 1810, 1836, 1920, 1957, 2309, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2784, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3294, 3294, 3296, 3297, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3424, 3425, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3805, 3840, 3840, 3904, 3911, 3913, 3946, 3976, 3979, 4096, 4129, 4131, 4135, 4137, 4138, 4176, 4181, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6067, 6176, 6263, 6272, 6312, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8319, 8319, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12346, 12353, 12436, 12445, 12446, 12449, 12538, 12540, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65138, 65140, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES3IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 543, 546, 563, 592, 685, 688, 696, 699, 705, 720, 721, 736, 740, 750, 750, 768, 846, 864, 866, 890, 890, 902, 902, 904, 906, 908, 908, 910, 929, 931, 974, 976, 983, 986, 1011, 1024, 1153, 1155, 1158, 1164, 1220, 1223, 1224, 1227, 1228, 1232, 1269, 1272, 1273, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1441, 1443, 1465, 1467, 1469, 1471, 1471, 1473, 1474, 1476, 1476, 1488, 1514, 1520, 1522, 1569, 1594, 1600, 1621, 1632, 1641, 1648, 1747, 1749, 1756, 1759, 1768, 1770, 1773, 1776, 1788, 1808, 1836, 1840, 1866, 1920, 1968, 2305, 2307, 2309, 2361, 2364, 2381, 2384, 2388, 2392, 2403, 2406, 2415, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2492, 2494, 2500, 2503, 2504, 2507, 2509, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2562, 2562, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2649, 2652, 2654, 2654, 2662, 2676, 2689, 2691, 2693, 2699, 2701, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2784, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2870, 2873, 2876, 2883, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2913, 2918, 2927, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 2997, 2999, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3031, 3031, 3047, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3134, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3168, 3169, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3262, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3297, 3302, 3311, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3368, 3370, 3385, 3390, 3395, 3398, 3400, 3402, 3405, 3415, 3415, 3424, 3425, 3430, 3439, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3805, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3946, 3953, 3972, 3974, 3979, 3984, 3991, 3993, 4028, 4038, 4038, 4096, 4129, 4131, 4135, 4137, 4138, 4140, 4146, 4150, 4153, 4160, 4169, 4176, 4185, 4256, 4293, 4304, 4342, 4352, 4441, 4447, 4514, 4520, 4601, 4608, 4614, 4616, 4678, 4680, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4742, 4744, 4744, 4746, 4749, 4752, 4782, 4784, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4814, 4816, 4822, 4824, 4846, 4848, 4878, 4880, 4880, 4882, 4885, 4888, 4894, 4896, 4934, 4936, 4954, 4969, 4977, 5024, 5108, 5121, 5740, 5743, 5750, 5761, 5786, 5792, 5866, 6016, 6099, 6112, 6121, 6160, 6169, 6176, 6263, 6272, 6313, 7680, 7835, 7840, 7929, 7936, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8255, 8256, 8319, 8319, 8400, 8412, 8417, 8417, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8497, 8499, 8505, 8544, 8579, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12346, 12353, 12436, 12441, 12442, 12445, 12446, 12449, 12542, 12549, 12588, 12593, 12686, 12704, 12727, 13312, 19893, 19968, 40869, 40960, 42124, 44032, 55203, 63744, 64045, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65056, 65059, 65075, 65076, 65101, 65103, 65136, 65138, 65140, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65381, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    /*
-        As per ECMAScript Language Specification 5th Edition, Section 7.6: ISyntaxToken Names and Identifiers
-        IdentifierStart ::
-            Can contain Unicode 6.2  categories:
-            Uppercase letter (Lu),
-            Lowercase letter (Ll),
-            Titlecase letter (Lt),
-            Modifier letter (Lm),
-            Other letter (Lo), or
-            Letter number (Nl).
-        IdentifierPart ::
-            Can contain IdentifierStart + Unicode 6.2  categories:
-            Non-spacing mark (Mn),
-            Combining spacing mark (Mc),
-            Decimal number (Nd),
-            Connector punctuation (Pc),
-            <ZWNJ>, or
-            <ZWJ>.
-
-        Codepoint ranges for ES5 Identifiers are extracted from the Unicode 6.2 specification at:
-        http://www.unicode.org/Public/6.2.0/ucd/UnicodeData.txt
-    */
-    var unicodeES5IdentifierStart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 880, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1488, 1514, 1520, 1522, 1568, 1610, 1646, 1647, 1649, 1747, 1749, 1749, 1765, 1766, 1774, 1775, 1786, 1788, 1791, 1791, 1808, 1808, 1810, 1839, 1869, 1957, 1969, 1969, 1994, 2026, 2036, 2037, 2042, 2042, 2048, 2069, 2074, 2074, 2084, 2084, 2088, 2088, 2112, 2136, 2208, 2208, 2210, 2220, 2308, 2361, 2365, 2365, 2384, 2384, 2392, 2401, 2417, 2423, 2425, 2431, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2493, 2493, 2510, 2510, 2524, 2525, 2527, 2529, 2544, 2545, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2649, 2652, 2654, 2654, 2674, 2676, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2749, 2749, 2768, 2768, 2784, 2785, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2877, 2877, 2908, 2909, 2911, 2913, 2929, 2929, 2947, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3024, 3024, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3133, 3160, 3161, 3168, 3169, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3261, 3261, 3294, 3294, 3296, 3297, 3313, 3314, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3389, 3406, 3406, 3424, 3425, 3450, 3455, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3585, 3632, 3634, 3635, 3648, 3654, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3760, 3762, 3763, 3773, 3773, 3776, 3780, 3782, 3782, 3804, 3807, 3840, 3840, 3904, 3911, 3913, 3948, 3976, 3980, 4096, 4138, 4159, 4159, 4176, 4181, 4186, 4189, 4193, 4193, 4197, 4198, 4206, 4208, 4213, 4225, 4238, 4238, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5905, 5920, 5937, 5952, 5969, 5984, 5996, 5998, 6000, 6016, 6067, 6103, 6103, 6108, 6108, 6176, 6263, 6272, 6312, 6314, 6314, 6320, 6389, 6400, 6428, 6480, 6509, 6512, 6516, 6528, 6571, 6593, 6599, 6656, 6678, 6688, 6740, 6823, 6823, 6917, 6963, 6981, 6987, 7043, 7072, 7086, 7087, 7098, 7141, 7168, 7203, 7245, 7247, 7258, 7293, 7401, 7404, 7406, 7409, 7413, 7414, 7424, 7615, 7680, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8305, 8305, 8319, 8319, 8336, 8348, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11502, 11506, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11648, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11823, 11823, 12293, 12295, 12321, 12329, 12337, 12341, 12344, 12348, 12353, 12438, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42527, 42538, 42539, 42560, 42606, 42623, 42647, 42656, 42735, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43009, 43011, 43013, 43015, 43018, 43020, 43042, 43072, 43123, 43138, 43187, 43250, 43255, 43259, 43259, 43274, 43301, 43312, 43334, 43360, 43388, 43396, 43442, 43471, 43471, 43520, 43560, 43584, 43586, 43588, 43595, 43616, 43638, 43642, 43642, 43648, 43695, 43697, 43697, 43701, 43702, 43705, 43709, 43712, 43712, 43714, 43714, 43739, 43741, 43744, 43754, 43762, 43764, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44002, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64285, 64287, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65136, 65140, 65142, 65276, 65313, 65338, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    var unicodeES5IdentifierPart = [170, 170, 181, 181, 186, 186, 192, 214, 216, 246, 248, 705, 710, 721, 736, 740, 748, 748, 750, 750, 768, 884, 886, 887, 890, 893, 902, 902, 904, 906, 908, 908, 910, 929, 931, 1013, 1015, 1153, 1155, 1159, 1162, 1319, 1329, 1366, 1369, 1369, 1377, 1415, 1425, 1469, 1471, 1471, 1473, 1474, 1476, 1477, 1479, 1479, 1488, 1514, 1520, 1522, 1552, 1562, 1568, 1641, 1646, 1747, 1749, 1756, 1759, 1768, 1770, 1788, 1791, 1791, 1808, 1866, 1869, 1969, 1984, 2037, 2042, 2042, 2048, 2093, 2112, 2139, 2208, 2208, 2210, 2220, 2276, 2302, 2304, 2403, 2406, 2415, 2417, 2423, 2425, 2431, 2433, 2435, 2437, 2444, 2447, 2448, 2451, 2472, 2474, 2480, 2482, 2482, 2486, 2489, 2492, 2500, 2503, 2504, 2507, 2510, 2519, 2519, 2524, 2525, 2527, 2531, 2534, 2545, 2561, 2563, 2565, 2570, 2575, 2576, 2579, 2600, 2602, 2608, 2610, 2611, 2613, 2614, 2616, 2617, 2620, 2620, 2622, 2626, 2631, 2632, 2635, 2637, 2641, 2641, 2649, 2652, 2654, 2654, 2662, 2677, 2689, 2691, 2693, 2701, 2703, 2705, 2707, 2728, 2730, 2736, 2738, 2739, 2741, 2745, 2748, 2757, 2759, 2761, 2763, 2765, 2768, 2768, 2784, 2787, 2790, 2799, 2817, 2819, 2821, 2828, 2831, 2832, 2835, 2856, 2858, 2864, 2866, 2867, 2869, 2873, 2876, 2884, 2887, 2888, 2891, 2893, 2902, 2903, 2908, 2909, 2911, 2915, 2918, 2927, 2929, 2929, 2946, 2947, 2949, 2954, 2958, 2960, 2962, 2965, 2969, 2970, 2972, 2972, 2974, 2975, 2979, 2980, 2984, 2986, 2990, 3001, 3006, 3010, 3014, 3016, 3018, 3021, 3024, 3024, 3031, 3031, 3046, 3055, 3073, 3075, 3077, 3084, 3086, 3088, 3090, 3112, 3114, 3123, 3125, 3129, 3133, 3140, 3142, 3144, 3146, 3149, 3157, 3158, 3160, 3161, 3168, 3171, 3174, 3183, 3202, 3203, 3205, 3212, 3214, 3216, 3218, 3240, 3242, 3251, 3253, 3257, 3260, 3268, 3270, 3272, 3274, 3277, 3285, 3286, 3294, 3294, 3296, 3299, 3302, 3311, 3313, 3314, 3330, 3331, 3333, 3340, 3342, 3344, 3346, 3386, 3389, 3396, 3398, 3400, 3402, 3406, 3415, 3415, 3424, 3427, 3430, 3439, 3450, 3455, 3458, 3459, 3461, 3478, 3482, 3505, 3507, 3515, 3517, 3517, 3520, 3526, 3530, 3530, 3535, 3540, 3542, 3542, 3544, 3551, 3570, 3571, 3585, 3642, 3648, 3662, 3664, 3673, 3713, 3714, 3716, 3716, 3719, 3720, 3722, 3722, 3725, 3725, 3732, 3735, 3737, 3743, 3745, 3747, 3749, 3749, 3751, 3751, 3754, 3755, 3757, 3769, 3771, 3773, 3776, 3780, 3782, 3782, 3784, 3789, 3792, 3801, 3804, 3807, 3840, 3840, 3864, 3865, 3872, 3881, 3893, 3893, 3895, 3895, 3897, 3897, 3902, 3911, 3913, 3948, 3953, 3972, 3974, 3991, 3993, 4028, 4038, 4038, 4096, 4169, 4176, 4253, 4256, 4293, 4295, 4295, 4301, 4301, 4304, 4346, 4348, 4680, 4682, 4685, 4688, 4694, 4696, 4696, 4698, 4701, 4704, 4744, 4746, 4749, 4752, 4784, 4786, 4789, 4792, 4798, 4800, 4800, 4802, 4805, 4808, 4822, 4824, 4880, 4882, 4885, 4888, 4954, 4957, 4959, 4992, 5007, 5024, 5108, 5121, 5740, 5743, 5759, 5761, 5786, 5792, 5866, 5870, 5872, 5888, 5900, 5902, 5908, 5920, 5940, 5952, 5971, 5984, 5996, 5998, 6000, 6002, 6003, 6016, 6099, 6103, 6103, 6108, 6109, 6112, 6121, 6155, 6157, 6160, 6169, 6176, 6263, 6272, 6314, 6320, 6389, 6400, 6428, 6432, 6443, 6448, 6459, 6470, 6509, 6512, 6516, 6528, 6571, 6576, 6601, 6608, 6617, 6656, 6683, 6688, 6750, 6752, 6780, 6783, 6793, 6800, 6809, 6823, 6823, 6912, 6987, 6992, 7001, 7019, 7027, 7040, 7155, 7168, 7223, 7232, 7241, 7245, 7293, 7376, 7378, 7380, 7414, 7424, 7654, 7676, 7957, 7960, 7965, 7968, 8005, 8008, 8013, 8016, 8023, 8025, 8025, 8027, 8027, 8029, 8029, 8031, 8061, 8064, 8116, 8118, 8124, 8126, 8126, 8130, 8132, 8134, 8140, 8144, 8147, 8150, 8155, 8160, 8172, 8178, 8180, 8182, 8188, 8204, 8205, 8255, 8256, 8276, 8276, 8305, 8305, 8319, 8319, 8336, 8348, 8400, 8412, 8417, 8417, 8421, 8432, 8450, 8450, 8455, 8455, 8458, 8467, 8469, 8469, 8473, 8477, 8484, 8484, 8486, 8486, 8488, 8488, 8490, 8493, 8495, 8505, 8508, 8511, 8517, 8521, 8526, 8526, 8544, 8584, 11264, 11310, 11312, 11358, 11360, 11492, 11499, 11507, 11520, 11557, 11559, 11559, 11565, 11565, 11568, 11623, 11631, 11631, 11647, 11670, 11680, 11686, 11688, 11694, 11696, 11702, 11704, 11710, 11712, 11718, 11720, 11726, 11728, 11734, 11736, 11742, 11744, 11775, 11823, 11823, 12293, 12295, 12321, 12335, 12337, 12341, 12344, 12348, 12353, 12438, 12441, 12442, 12445, 12447, 12449, 12538, 12540, 12543, 12549, 12589, 12593, 12686, 12704, 12730, 12784, 12799, 13312, 19893, 19968, 40908, 40960, 42124, 42192, 42237, 42240, 42508, 42512, 42539, 42560, 42607, 42612, 42621, 42623, 42647, 42655, 42737, 42775, 42783, 42786, 42888, 42891, 42894, 42896, 42899, 42912, 42922, 43000, 43047, 43072, 43123, 43136, 43204, 43216, 43225, 43232, 43255, 43259, 43259, 43264, 43309, 43312, 43347, 43360, 43388, 43392, 43456, 43471, 43481, 43520, 43574, 43584, 43597, 43600, 43609, 43616, 43638, 43642, 43643, 43648, 43714, 43739, 43741, 43744, 43759, 43762, 43766, 43777, 43782, 43785, 43790, 43793, 43798, 43808, 43814, 43816, 43822, 43968, 44010, 44012, 44013, 44016, 44025, 44032, 55203, 55216, 55238, 55243, 55291, 63744, 64109, 64112, 64217, 64256, 64262, 64275, 64279, 64285, 64296, 64298, 64310, 64312, 64316, 64318, 64318, 64320, 64321, 64323, 64324, 64326, 64433, 64467, 64829, 64848, 64911, 64914, 64967, 65008, 65019, 65024, 65039, 65056, 65062, 65075, 65076, 65101, 65103, 65136, 65140, 65142, 65276, 65296, 65305, 65313, 65338, 65343, 65343, 65345, 65370, 65382, 65470, 65474, 65479, 65482, 65487, 65490, 65495, 65498, 65500,];
-    function lookupInUnicodeMap(code, map) {
-        // Bail out quickly if it couldn't possibly be in the map.
-        if (code < map[0]) {
-            return false;
-        }
-        // Perform binary search in one of the Unicode range maps
-        var lo = 0;
-        var hi = map.length;
-        var mid;
-        while (lo + 1 < hi) {
-            mid = lo + (hi - lo) / 2;
-            // mid has to be even to catch a range's beginning
-            mid -= mid % 2;
-            if (map[mid] <= code && code <= map[mid + 1]) {
-                return true;
-            }
-            if (code < map[mid]) {
-                hi = mid;
-            }
-            else {
-                lo = mid + 2;
-            }
-        }
-        return false;
-    }
-    /* @internal */ function isUnicodeIdentifierStart(code, languageVersion) {
-        return languageVersion >= 1 /* ES5 */ ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierStart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierStart);
-    }
-    ts.isUnicodeIdentifierStart = isUnicodeIdentifierStart;
-    function isUnicodeIdentifierPart(code, languageVersion) {
-        return languageVersion >= 1 /* ES5 */ ?
-            lookupInUnicodeMap(code, unicodeES5IdentifierPart) :
-            lookupInUnicodeMap(code, unicodeES3IdentifierPart);
-    }
-    function makeReverseMap(source) {
-        var result = [];
-        for (var name_4 in source) {
-            if (source.hasOwnProperty(name_4)) {
-                result[source[name_4]] = name_4;
-            }
-        }
-        return result;
-    }
-    var tokenStrings = makeReverseMap(textToToken);
-    function tokenToString(t) {
-        return tokenStrings[t];
-    }
-    ts.tokenToString = tokenToString;
-    /* @internal */
-    function stringToToken(s) {
-        return textToToken[s];
-    }
-    ts.stringToToken = stringToToken;
-    /* @internal */
-    function computeLineStarts(text) {
-        var result = new Array();
-        var pos = 0;
-        var lineStart = 0;
-        while (pos < text.length) {
-            var ch = text.charCodeAt(pos);
-            pos++;
-            switch (ch) {
-                case 13 /* carriageReturn */:
-                    if (text.charCodeAt(pos) === 10 /* lineFeed */) {
-                        pos++;
-                    }
-                case 10 /* lineFeed */:
-                    result.push(lineStart);
-                    lineStart = pos;
-                    break;
-                default:
-                    if (ch > 127 /* maxAsciiCharacter */ && isLineBreak(ch)) {
-                        result.push(lineStart);
-                        lineStart = pos;
-                    }
-                    break;
-            }
-        }
-        result.push(lineStart);
-        return result;
-    }
-    ts.computeLineStarts = computeLineStarts;
-    function getPositionOfLineAndCharacter(sourceFile, line, character) {
-        return computePositionOfLineAndCharacter(getLineStarts(sourceFile), line, character);
-    }
-    ts.getPositionOfLineAndCharacter = getPositionOfLineAndCharacter;
-    /* @internal */
-    function computePositionOfLineAndCharacter(lineStarts, line, character) {
-        ts.Debug.assert(line >= 0 && line < lineStarts.length);
-        return lineStarts[line] + character;
-    }
-    ts.computePositionOfLineAndCharacter = computePositionOfLineAndCharacter;
-    /* @internal */
-    function getLineStarts(sourceFile) {
-        return sourceFile.lineMap || (sourceFile.lineMap = computeLineStarts(sourceFile.text));
-    }
-    ts.getLineStarts = getLineStarts;
-    /* @internal */
-    /**
-     * We assume the first line starts at position 0 and 'position' is non-negative.
-     */
-    function computeLineAndCharacterOfPosition(lineStarts, position) {
-        var lineNumber = ts.binarySearch(lineStarts, position);
-        if (lineNumber < 0) {
-            // If the actual position was not found,
-            // the binary search returns the 2's-complement of the next line start
-            // e.g. if the line starts at [5, 10, 23, 80] and the position requested was 20
-            // then the search will return -2.
-            //
-            // We want the index of the previous line start, so we subtract 1.
-            // Review 2's-complement if this is confusing.
-            lineNumber = ~lineNumber - 1;
-            ts.Debug.assert(lineNumber !== -1, "position cannot precede the beginning of the file");
-        }
-        return {
-            line: lineNumber,
-            character: position - lineStarts[lineNumber]
-        };
-    }
-    ts.computeLineAndCharacterOfPosition = computeLineAndCharacterOfPosition;
-    function getLineAndCharacterOfPosition(sourceFile, position) {
-        return computeLineAndCharacterOfPosition(getLineStarts(sourceFile), position);
-    }
-    ts.getLineAndCharacterOfPosition = getLineAndCharacterOfPosition;
-    var hasOwnProperty = Object.prototype.hasOwnProperty;
-    function isWhiteSpace(ch) {
-        return isWhiteSpaceSingleLine(ch) || isLineBreak(ch);
-    }
-    ts.isWhiteSpace = isWhiteSpace;
-    /** Does not include line breaks. For that, see isWhiteSpaceLike. */
-    function isWhiteSpaceSingleLine(ch) {
-        // Note: nextLine is in the Zs space, and should be considered to be a whitespace.
-        // It is explicitly not a line-break as it isn't in the exact set specified by EcmaScript.
-        return ch === 32 /* space */ ||
-            ch === 9 /* tab */ ||
-            ch === 11 /* verticalTab */ ||
-            ch === 12 /* formFeed */ ||
-            ch === 160 /* nonBreakingSpace */ ||
-            ch === 133 /* nextLine */ ||
-            ch === 5760 /* ogham */ ||
-            ch >= 8192 /* enQuad */ && ch <= 8203 /* zeroWidthSpace */ ||
-            ch === 8239 /* narrowNoBreakSpace */ ||
-            ch === 8287 /* mathematicalSpace */ ||
-            ch === 12288 /* ideographicSpace */ ||
-            ch === 65279 /* byteOrderMark */;
-    }
-    ts.isWhiteSpaceSingleLine = isWhiteSpaceSingleLine;
-    function isLineBreak(ch) {
-        // ES5 7.3:
-        // The ECMAScript line terminator characters are listed in Table 3.
-        //     Table 3: Line Terminator Characters
-        //     Code Unit Value     Name                    Formal Name
-        //     \u000A              Line Feed               <LF>
-        //     \u000D              Carriage Return         <CR>
-        //     \u2028              Line separator          <LS>
-        //     \u2029              Paragraph separator     <PS>
-        // Only the characters in Table 3 are treated as line terminators. Other new line or line
-        // breaking characters are treated as white space but not as line terminators.
-        return ch === 10 /* lineFeed */ ||
-            ch === 13 /* carriageReturn */ ||
-            ch === 8232 /* lineSeparator */ ||
-            ch === 8233 /* paragraphSeparator */;
-    }
-    ts.isLineBreak = isLineBreak;
-    function isDigit(ch) {
-        return ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
-    }
-    /* @internal */
-    function isOctalDigit(ch) {
-        return ch >= 48 /* _0 */ && ch <= 55 /* _7 */;
-    }
-    ts.isOctalDigit = isOctalDigit;
-    function couldStartTrivia(text, pos) {
-        // Keep in sync with skipTrivia
-        var ch = text.charCodeAt(pos);
-        switch (ch) {
-            case 13 /* carriageReturn */:
-            case 10 /* lineFeed */:
-            case 9 /* tab */:
-            case 11 /* verticalTab */:
-            case 12 /* formFeed */:
-            case 32 /* space */:
-            case 47 /* slash */:
-            // starts of normal trivia
-            case 60 /* lessThan */:
-            case 61 /* equals */:
-            case 62 /* greaterThan */:
-                // Starts of conflict marker trivia
-                return true;
-            case 35 /* hash */:
-                // Only if its the beginning can we have #! trivia
-                return pos === 0;
-            default:
-                return ch > 127 /* maxAsciiCharacter */;
-        }
-    }
-    ts.couldStartTrivia = couldStartTrivia;
-    /* @internal */
-    function skipTrivia(text, pos, stopAfterLineBreak, stopAtComments) {
-        if (stopAtComments === void 0) { stopAtComments = false; }
-        // Using ! with a greater than test is a fast way of testing the following conditions:
-        //  pos === undefined || pos === null || isNaN(pos) || pos < 0;
-        if (!(pos >= 0)) {
-            return pos;
-        }
-        // Keep in sync with couldStartTrivia
-        while (true) {
-            var ch = text.charCodeAt(pos);
-            switch (ch) {
-                case 13 /* carriageReturn */:
-                    if (text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
-                        pos++;
-                    }
-                case 10 /* lineFeed */:
-                    pos++;
-                    if (stopAfterLineBreak) {
-                        return pos;
-                    }
-                    continue;
-                case 9 /* tab */:
-                case 11 /* verticalTab */:
-                case 12 /* formFeed */:
-                case 32 /* space */:
-                    pos++;
-                    continue;
-                case 47 /* slash */:
-                    if (stopAtComments) {
-                        break;
-                    }
-                    if (text.charCodeAt(pos + 1) === 47 /* slash */) {
-                        pos += 2;
-                        while (pos < text.length) {
-                            if (isLineBreak(text.charCodeAt(pos))) {
-                                break;
-                            }
-                            pos++;
-                        }
-                        continue;
-                    }
-                    if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
-                        pos += 2;
-                        while (pos < text.length) {
-                            if (text.charCodeAt(pos) === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
-                                pos += 2;
-                                break;
-                            }
-                            pos++;
-                        }
-                        continue;
-                    }
-                    break;
-                case 60 /* lessThan */:
-                case 61 /* equals */:
-                case 62 /* greaterThan */:
-                    if (isConflictMarkerTrivia(text, pos)) {
-                        pos = scanConflictMarkerTrivia(text, pos);
-                        continue;
-                    }
-                    break;
-                case 35 /* hash */:
-                    if (pos === 0 && isShebangTrivia(text, pos)) {
-                        pos = scanShebangTrivia(text, pos);
-                        continue;
-                    }
-                    break;
-                default:
-                    if (ch > 127 /* maxAsciiCharacter */ && (isWhiteSpace(ch))) {
-                        pos++;
-                        continue;
-                    }
-                    break;
-            }
-            return pos;
-        }
-    }
-    ts.skipTrivia = skipTrivia;
-    // All conflict markers consist of the same character repeated seven times.  If it is
-    // a <<<<<<< or >>>>>>> marker then it is also followed by a space.
-    var mergeConflictMarkerLength = "<<<<<<<".length;
-    function isConflictMarkerTrivia(text, pos) {
-        ts.Debug.assert(pos >= 0);
-        // Conflict markers must be at the start of a line.
-        if (pos === 0 || isLineBreak(text.charCodeAt(pos - 1))) {
-            var ch = text.charCodeAt(pos);
-            if ((pos + mergeConflictMarkerLength) < text.length) {
-                for (var i = 0, n = mergeConflictMarkerLength; i < n; i++) {
-                    if (text.charCodeAt(pos + i) !== ch) {
-                        return false;
-                    }
-                }
-                return ch === 61 /* equals */ ||
-                    text.charCodeAt(pos + mergeConflictMarkerLength) === 32 /* space */;
-            }
-        }
-        return false;
-    }
-    function scanConflictMarkerTrivia(text, pos, error) {
-        if (error) {
-            error(ts.Diagnostics.Merge_conflict_marker_encountered, mergeConflictMarkerLength);
-        }
-        var ch = text.charCodeAt(pos);
-        var len = text.length;
-        if (ch === 60 /* lessThan */ || ch === 62 /* greaterThan */) {
-            while (pos < len && !isLineBreak(text.charCodeAt(pos))) {
-                pos++;
-            }
-        }
-        else {
-            ts.Debug.assert(ch === 61 /* equals */);
-            // Consume everything from the start of the mid-conflict marker to the start of the next
-            // end-conflict marker.
-            while (pos < len) {
-                var ch_1 = text.charCodeAt(pos);
-                if (ch_1 === 62 /* greaterThan */ && isConflictMarkerTrivia(text, pos)) {
-                    break;
-                }
-                pos++;
-            }
-        }
-        return pos;
-    }
-    var shebangTriviaRegex = /^#!.*/;
-    function isShebangTrivia(text, pos) {
-        // Shebangs check must only be done at the start of the file
-        ts.Debug.assert(pos === 0);
-        return shebangTriviaRegex.test(text);
-    }
-    function scanShebangTrivia(text, pos) {
-        var shebang = shebangTriviaRegex.exec(text)[0];
-        pos = pos + shebang.length;
-        return pos;
-    }
-    /**
-     * Extract comments from text prefixing the token closest following `pos`.
-     * The return value is an array containing a TextRange for each comment.
-     * Single-line comment ranges include the beginning '//' characters but not the ending line break.
-     * Multi - line comment ranges include the beginning '/* and ending '<asterisk>/' characters.
-     * The return value is undefined if no comments were found.
-     * @param trailing
-     * If false, whitespace is skipped until the first line break and comments between that location
-     * and the next token are returned.
-     * If true, comments occurring between the given position and the next line break are returned.
-     */
-    function getCommentRanges(text, pos, trailing) {
-        var result;
-        var collecting = trailing || pos === 0;
-        while (pos < text.length) {
-            var ch = text.charCodeAt(pos);
-            switch (ch) {
-                case 13 /* carriageReturn */:
-                    if (text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
-                        pos++;
-                    }
-                case 10 /* lineFeed */:
-                    pos++;
-                    if (trailing) {
-                        return result;
-                    }
-                    collecting = true;
-                    if (result && result.length) {
-                        ts.lastOrUndefined(result).hasTrailingNewLine = true;
-                    }
-                    continue;
-                case 9 /* tab */:
-                case 11 /* verticalTab */:
-                case 12 /* formFeed */:
-                case 32 /* space */:
-                    pos++;
-                    continue;
-                case 47 /* slash */:
-                    var nextChar = text.charCodeAt(pos + 1);
-                    var hasTrailingNewLine = false;
-                    if (nextChar === 47 /* slash */ || nextChar === 42 /* asterisk */) {
-                        var kind = nextChar === 47 /* slash */ ? 2 /* SingleLineCommentTrivia */ : 3 /* MultiLineCommentTrivia */;
-                        var startPos = pos;
-                        pos += 2;
-                        if (nextChar === 47 /* slash */) {
-                            while (pos < text.length) {
-                                if (isLineBreak(text.charCodeAt(pos))) {
-                                    hasTrailingNewLine = true;
-                                    break;
-                                }
-                                pos++;
-                            }
-                        }
-                        else {
-                            while (pos < text.length) {
-                                if (text.charCodeAt(pos) === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
-                                    pos += 2;
-                                    break;
-                                }
-                                pos++;
-                            }
-                        }
-                        if (collecting) {
-                            if (!result) {
-                                result = [];
-                            }
-                            result.push({ pos: startPos, end: pos, hasTrailingNewLine: hasTrailingNewLine, kind: kind });
-                        }
-                        continue;
-                    }
-                    break;
-                default:
-                    if (ch > 127 /* maxAsciiCharacter */ && (isWhiteSpace(ch))) {
-                        if (result && result.length && isLineBreak(ch)) {
-                            ts.lastOrUndefined(result).hasTrailingNewLine = true;
-                        }
-                        pos++;
-                        continue;
-                    }
-                    break;
-            }
-            return result;
-        }
-        return result;
-    }
-    function getLeadingCommentRanges(text, pos) {
-        return getCommentRanges(text, pos, /*trailing*/ false);
-    }
-    ts.getLeadingCommentRanges = getLeadingCommentRanges;
-    function getTrailingCommentRanges(text, pos) {
-        return getCommentRanges(text, pos, /*trailing*/ true);
-    }
-    ts.getTrailingCommentRanges = getTrailingCommentRanges;
-    /** Optionally, get the shebang */
-    function getShebang(text) {
-        return shebangTriviaRegex.test(text)
-            ? shebangTriviaRegex.exec(text)[0]
-            : undefined;
-    }
-    ts.getShebang = getShebang;
-    function isIdentifierStart(ch, languageVersion) {
-        return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ ||
-            ch === 36 /* $ */ || ch === 95 /* _ */ ||
-            ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierStart(ch, languageVersion);
-    }
-    ts.isIdentifierStart = isIdentifierStart;
-    function isIdentifierPart(ch, languageVersion) {
-        return ch >= 65 /* A */ && ch <= 90 /* Z */ || ch >= 97 /* a */ && ch <= 122 /* z */ ||
-            ch >= 48 /* _0 */ && ch <= 57 /* _9 */ || ch === 36 /* $ */ || ch === 95 /* _ */ ||
-            ch > 127 /* maxAsciiCharacter */ && isUnicodeIdentifierPart(ch, languageVersion);
-    }
-    ts.isIdentifierPart = isIdentifierPart;
-    /* @internal */
-    function isIdentifier(name, languageVersion) {
-        if (!isIdentifierStart(name.charCodeAt(0), languageVersion)) {
-            return false;
-        }
-        for (var i = 1, n = name.length; i < n; i++) {
-            if (!isIdentifierPart(name.charCodeAt(i), languageVersion)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.isIdentifier = isIdentifier;
-    // Creates a scanner over a (possibly unspecified) range of a piece of text.
-    function createScanner(languageVersion, skipTrivia, languageVariant, text, onError, start, length) {
-        if (languageVariant === void 0) { languageVariant = 0 /* Standard */; }
-        // Current position (end position of text of current token)
-        var pos;
-        // end of text
-        var end;
-        // Start position of whitespace before current token
-        var startPos;
-        // Start position of text of current token
-        var tokenPos;
-        var token;
-        var tokenValue;
-        var precedingLineBreak;
-        var hasExtendedUnicodeEscape;
-        var tokenIsUnterminated;
-        setText(text, start, length);
-        return {
-            getStartPos: function () { return startPos; },
-            getTextPos: function () { return pos; },
-            getToken: function () { return token; },
-            getTokenPos: function () { return tokenPos; },
-            getTokenText: function () { return text.substring(tokenPos, pos); },
-            getTokenValue: function () { return tokenValue; },
-            hasExtendedUnicodeEscape: function () { return hasExtendedUnicodeEscape; },
-            hasPrecedingLineBreak: function () { return precedingLineBreak; },
-            isIdentifier: function () { return token === 69 /* Identifier */ || token > 105 /* LastReservedWord */; },
-            isReservedWord: function () { return token >= 70 /* FirstReservedWord */ && token <= 105 /* LastReservedWord */; },
-            isUnterminated: function () { return tokenIsUnterminated; },
-            reScanGreaterToken: reScanGreaterToken,
-            reScanSlashToken: reScanSlashToken,
-            reScanTemplateToken: reScanTemplateToken,
-            scanJsxIdentifier: scanJsxIdentifier,
-            reScanJsxToken: reScanJsxToken,
-            scanJsxToken: scanJsxToken,
-            scanJSDocToken: scanJSDocToken,
-            scan: scan,
-            getText: getText,
-            setText: setText,
-            setScriptTarget: setScriptTarget,
-            setLanguageVariant: setLanguageVariant,
-            setOnError: setOnError,
-            setTextPos: setTextPos,
-            tryScan: tryScan,
-            lookAhead: lookAhead,
-            scanRange: scanRange
-        };
-        function error(message, length) {
-            if (onError) {
-                onError(message, length || 0);
-            }
-        }
-        function scanNumber() {
-            var start = pos;
-            while (isDigit(text.charCodeAt(pos)))
-                pos++;
-            if (text.charCodeAt(pos) === 46 /* dot */) {
-                pos++;
-                while (isDigit(text.charCodeAt(pos)))
-                    pos++;
-            }
-            var end = pos;
-            if (text.charCodeAt(pos) === 69 /* E */ || text.charCodeAt(pos) === 101 /* e */) {
-                pos++;
-                if (text.charCodeAt(pos) === 43 /* plus */ || text.charCodeAt(pos) === 45 /* minus */)
-                    pos++;
-                if (isDigit(text.charCodeAt(pos))) {
-                    pos++;
-                    while (isDigit(text.charCodeAt(pos)))
-                        pos++;
-                    end = pos;
-                }
-                else {
-                    error(ts.Diagnostics.Digit_expected);
-                }
-            }
-            return "" + +(text.substring(start, end));
-        }
-        function scanOctalDigits() {
-            var start = pos;
-            while (isOctalDigit(text.charCodeAt(pos))) {
-                pos++;
-            }
-            return +(text.substring(start, pos));
-        }
-        /**
-         * Scans the given number of hexadecimal digits in the text,
-         * returning -1 if the given number is unavailable.
-         */
-        function scanExactNumberOfHexDigits(count) {
-            return scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ false);
-        }
-        /**
-         * Scans as many hexadecimal digits as are available in the text,
-         * returning -1 if the given number of digits was unavailable.
-         */
-        function scanMinimumNumberOfHexDigits(count) {
-            return scanHexDigits(/*minCount*/ count, /*scanAsManyAsPossible*/ true);
-        }
-        function scanHexDigits(minCount, scanAsManyAsPossible) {
-            var digits = 0;
-            var value = 0;
-            while (digits < minCount || scanAsManyAsPossible) {
-                var ch = text.charCodeAt(pos);
-                if (ch >= 48 /* _0 */ && ch <= 57 /* _9 */) {
-                    value = value * 16 + ch - 48 /* _0 */;
-                }
-                else if (ch >= 65 /* A */ && ch <= 70 /* F */) {
-                    value = value * 16 + ch - 65 /* A */ + 10;
-                }
-                else if (ch >= 97 /* a */ && ch <= 102 /* f */) {
-                    value = value * 16 + ch - 97 /* a */ + 10;
-                }
-                else {
-                    break;
-                }
-                pos++;
-                digits++;
-            }
-            if (digits < minCount) {
-                value = -1;
-            }
-            return value;
-        }
-        function scanString() {
-            var quote = text.charCodeAt(pos);
-            pos++;
-            var result = "";
-            var start = pos;
-            while (true) {
-                if (pos >= end) {
-                    result += text.substring(start, pos);
-                    tokenIsUnterminated = true;
-                    error(ts.Diagnostics.Unterminated_string_literal);
-                    break;
-                }
-                var ch = text.charCodeAt(pos);
-                if (ch === quote) {
-                    result += text.substring(start, pos);
-                    pos++;
-                    break;
-                }
-                if (ch === 92 /* backslash */) {
-                    result += text.substring(start, pos);
-                    result += scanEscapeSequence();
-                    start = pos;
-                    continue;
-                }
-                if (isLineBreak(ch)) {
-                    result += text.substring(start, pos);
-                    tokenIsUnterminated = true;
-                    error(ts.Diagnostics.Unterminated_string_literal);
-                    break;
-                }
-                pos++;
-            }
-            return result;
-        }
-        /**
-         * Sets the current 'tokenValue' and returns a NoSubstitutionTemplateLiteral or
-         * a literal component of a TemplateExpression.
-         */
-        function scanTemplateAndSetTokenValue() {
-            var startedWithBacktick = text.charCodeAt(pos) === 96 /* backtick */;
-            pos++;
-            var start = pos;
-            var contents = "";
-            var resultingToken;
-            while (true) {
-                if (pos >= end) {
-                    contents += text.substring(start, pos);
-                    tokenIsUnterminated = true;
-                    error(ts.Diagnostics.Unterminated_template_literal);
-                    resultingToken = startedWithBacktick ? 11 /* NoSubstitutionTemplateLiteral */ : 14 /* TemplateTail */;
-                    break;
-                }
-                var currChar = text.charCodeAt(pos);
-                // '`'
-                if (currChar === 96 /* backtick */) {
-                    contents += text.substring(start, pos);
-                    pos++;
-                    resultingToken = startedWithBacktick ? 11 /* NoSubstitutionTemplateLiteral */ : 14 /* TemplateTail */;
-                    break;
-                }
-                // '${'
-                if (currChar === 36 /* $ */ && pos + 1 < end && text.charCodeAt(pos + 1) === 123 /* openBrace */) {
-                    contents += text.substring(start, pos);
-                    pos += 2;
-                    resultingToken = startedWithBacktick ? 12 /* TemplateHead */ : 13 /* TemplateMiddle */;
-                    break;
-                }
-                // Escape character
-                if (currChar === 92 /* backslash */) {
-                    contents += text.substring(start, pos);
-                    contents += scanEscapeSequence();
-                    start = pos;
-                    continue;
-                }
-                // Speculated ECMAScript 6 Spec 11.8.6.1:
-                // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for Template Values
-                if (currChar === 13 /* carriageReturn */) {
-                    contents += text.substring(start, pos);
-                    pos++;
-                    if (pos < end && text.charCodeAt(pos) === 10 /* lineFeed */) {
-                        pos++;
-                    }
-                    contents += "\n";
-                    start = pos;
-                    continue;
-                }
-                pos++;
-            }
-            ts.Debug.assert(resultingToken !== undefined);
-            tokenValue = contents;
-            return resultingToken;
-        }
-        function scanEscapeSequence() {
-            pos++;
-            if (pos >= end) {
-                error(ts.Diagnostics.Unexpected_end_of_text);
-                return "";
-            }
-            var ch = text.charCodeAt(pos);
-            pos++;
-            switch (ch) {
-                case 48 /* _0 */:
-                    return "\0";
-                case 98 /* b */:
-                    return "\b";
-                case 116 /* t */:
-                    return "\t";
-                case 110 /* n */:
-                    return "\n";
-                case 118 /* v */:
-                    return "\v";
-                case 102 /* f */:
-                    return "\f";
-                case 114 /* r */:
-                    return "\r";
-                case 39 /* singleQuote */:
-                    return "\'";
-                case 34 /* doubleQuote */:
-                    return "\"";
-                case 117 /* u */:
-                    // '\u{DDDDDDDD}'
-                    if (pos < end && text.charCodeAt(pos) === 123 /* openBrace */) {
-                        hasExtendedUnicodeEscape = true;
-                        pos++;
-                        return scanExtendedUnicodeEscape();
-                    }
-                    // '\uDDDD'
-                    return scanHexadecimalEscape(/*numDigits*/ 4);
-                case 120 /* x */:
-                    // '\xDD'
-                    return scanHexadecimalEscape(/*numDigits*/ 2);
-                // when encountering a LineContinuation (i.e. a backslash and a line terminator sequence),
-                // the line terminator is interpreted to be "the empty code unit sequence".
-                case 13 /* carriageReturn */:
-                    if (pos < end && text.charCodeAt(pos) === 10 /* lineFeed */) {
-                        pos++;
-                    }
-                // fall through
-                case 10 /* lineFeed */:
-                case 8232 /* lineSeparator */:
-                case 8233 /* paragraphSeparator */:
-                    return "";
-                default:
-                    return String.fromCharCode(ch);
-            }
-        }
-        function scanHexadecimalEscape(numDigits) {
-            var escapedValue = scanExactNumberOfHexDigits(numDigits);
-            if (escapedValue >= 0) {
-                return String.fromCharCode(escapedValue);
-            }
-            else {
-                error(ts.Diagnostics.Hexadecimal_digit_expected);
-                return "";
-            }
-        }
-        function scanExtendedUnicodeEscape() {
-            var escapedValue = scanMinimumNumberOfHexDigits(1);
-            var isInvalidExtendedEscape = false;
-            // Validate the value of the digit
-            if (escapedValue < 0) {
-                error(ts.Diagnostics.Hexadecimal_digit_expected);
-                isInvalidExtendedEscape = true;
-            }
-            else if (escapedValue > 0x10FFFF) {
-                error(ts.Diagnostics.An_extended_Unicode_escape_value_must_be_between_0x0_and_0x10FFFF_inclusive);
-                isInvalidExtendedEscape = true;
-            }
-            if (pos >= end) {
-                error(ts.Diagnostics.Unexpected_end_of_text);
-                isInvalidExtendedEscape = true;
-            }
-            else if (text.charCodeAt(pos) === 125 /* closeBrace */) {
-                // Only swallow the following character up if it's a '}'.
-                pos++;
-            }
-            else {
-                error(ts.Diagnostics.Unterminated_Unicode_escape_sequence);
-                isInvalidExtendedEscape = true;
-            }
-            if (isInvalidExtendedEscape) {
-                return "";
-            }
-            return utf16EncodeAsString(escapedValue);
-        }
-        // Derived from the 10.1.1 UTF16Encoding of the ES6 Spec.
-        function utf16EncodeAsString(codePoint) {
-            ts.Debug.assert(0x0 <= codePoint && codePoint <= 0x10FFFF);
-            if (codePoint <= 65535) {
-                return String.fromCharCode(codePoint);
-            }
-            var codeUnit1 = Math.floor((codePoint - 65536) / 1024) + 0xD800;
-            var codeUnit2 = ((codePoint - 65536) % 1024) + 0xDC00;
-            return String.fromCharCode(codeUnit1, codeUnit2);
-        }
-        // Current character is known to be a backslash. Check for Unicode escape of the form '\uXXXX'
-        // and return code point value if valid Unicode escape is found. Otherwise return -1.
-        function peekUnicodeEscape() {
-            if (pos + 5 < end && text.charCodeAt(pos + 1) === 117 /* u */) {
-                var start_1 = pos;
-                pos += 2;
-                var value = scanExactNumberOfHexDigits(4);
-                pos = start_1;
-                return value;
-            }
-            return -1;
-        }
-        function scanIdentifierParts() {
-            var result = "";
-            var start = pos;
-            while (pos < end) {
-                var ch = text.charCodeAt(pos);
-                if (isIdentifierPart(ch, languageVersion)) {
-                    pos++;
-                }
-                else if (ch === 92 /* backslash */) {
-                    ch = peekUnicodeEscape();
-                    if (!(ch >= 0 && isIdentifierPart(ch, languageVersion))) {
-                        break;
-                    }
-                    result += text.substring(start, pos);
-                    result += String.fromCharCode(ch);
-                    // Valid Unicode escape is always six characters
-                    pos += 6;
-                    start = pos;
-                }
-                else {
-                    break;
-                }
-            }
-            result += text.substring(start, pos);
-            return result;
-        }
-        function getIdentifierToken() {
-            // Reserved words are between 2 and 11 characters long and start with a lowercase letter
-            var len = tokenValue.length;
-            if (len >= 2 && len <= 11) {
-                var ch = tokenValue.charCodeAt(0);
-                if (ch >= 97 /* a */ && ch <= 122 /* z */ && hasOwnProperty.call(textToToken, tokenValue)) {
-                    return token = textToToken[tokenValue];
-                }
-            }
-            return token = 69 /* Identifier */;
-        }
-        function scanBinaryOrOctalDigits(base) {
-            ts.Debug.assert(base !== 2 || base !== 8, "Expected either base 2 or base 8");
-            var value = 0;
-            // For counting number of digits; Valid binaryIntegerLiteral must have at least one binary digit following B or b.
-            // Similarly valid octalIntegerLiteral must have at least one octal digit following o or O.
-            var numberOfDigits = 0;
-            while (true) {
-                var ch = text.charCodeAt(pos);
-                var valueOfCh = ch - 48 /* _0 */;
-                if (!isDigit(ch) || valueOfCh >= base) {
-                    break;
-                }
-                value = value * base + valueOfCh;
-                pos++;
-                numberOfDigits++;
-            }
-            // Invalid binaryIntegerLiteral or octalIntegerLiteral
-            if (numberOfDigits === 0) {
-                return -1;
-            }
-            return value;
-        }
-        function scan() {
-            startPos = pos;
-            hasExtendedUnicodeEscape = false;
-            precedingLineBreak = false;
-            tokenIsUnterminated = false;
-            while (true) {
-                tokenPos = pos;
-                if (pos >= end) {
-                    return token = 1 /* EndOfFileToken */;
-                }
-                var ch = text.charCodeAt(pos);
-                // Special handling for shebang
-                if (ch === 35 /* hash */ && pos === 0 && isShebangTrivia(text, pos)) {
-                    pos = scanShebangTrivia(text, pos);
-                    if (skipTrivia) {
-                        continue;
-                    }
-                    else {
-                        return token = 6 /* ShebangTrivia */;
-                    }
-                }
-                switch (ch) {
-                    case 10 /* lineFeed */:
-                    case 13 /* carriageReturn */:
-                        precedingLineBreak = true;
-                        if (skipTrivia) {
-                            pos++;
-                            continue;
-                        }
-                        else {
-                            if (ch === 13 /* carriageReturn */ && pos + 1 < end && text.charCodeAt(pos + 1) === 10 /* lineFeed */) {
-                                // consume both CR and LF
-                                pos += 2;
-                            }
-                            else {
-                                pos++;
-                            }
-                            return token = 4 /* NewLineTrivia */;
-                        }
-                    case 9 /* tab */:
-                    case 11 /* verticalTab */:
-                    case 12 /* formFeed */:
-                    case 32 /* space */:
-                        if (skipTrivia) {
-                            pos++;
-                            continue;
-                        }
-                        else {
-                            while (pos < end && isWhiteSpaceSingleLine(text.charCodeAt(pos))) {
-                                pos++;
-                            }
-                            return token = 5 /* WhitespaceTrivia */;
-                        }
-                    case 33 /* exclamation */:
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 33 /* ExclamationEqualsEqualsToken */;
-                            }
-                            return pos += 2, token = 31 /* ExclamationEqualsToken */;
-                        }
-                        pos++;
-                        return token = 49 /* ExclamationToken */;
-                    case 34 /* doubleQuote */:
-                    case 39 /* singleQuote */:
-                        tokenValue = scanString();
-                        return token = 9 /* StringLiteral */;
-                    case 96 /* backtick */:
-                        return token = scanTemplateAndSetTokenValue();
-                    case 37 /* percent */:
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 62 /* PercentEqualsToken */;
-                        }
-                        pos++;
-                        return token = 40 /* PercentToken */;
-                    case 38 /* ampersand */:
-                        if (text.charCodeAt(pos + 1) === 38 /* ampersand */) {
-                            return pos += 2, token = 51 /* AmpersandAmpersandToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 66 /* AmpersandEqualsToken */;
-                        }
-                        pos++;
-                        return token = 46 /* AmpersandToken */;
-                    case 40 /* openParen */:
-                        pos++;
-                        return token = 17 /* OpenParenToken */;
-                    case 41 /* closeParen */:
-                        pos++;
-                        return token = 18 /* CloseParenToken */;
-                    case 42 /* asterisk */:
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 59 /* AsteriskEqualsToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
-                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 60 /* AsteriskAsteriskEqualsToken */;
-                            }
-                            return pos += 2, token = 38 /* AsteriskAsteriskToken */;
-                        }
-                        pos++;
-                        return token = 37 /* AsteriskToken */;
-                    case 43 /* plus */:
-                        if (text.charCodeAt(pos + 1) === 43 /* plus */) {
-                            return pos += 2, token = 41 /* PlusPlusToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 57 /* PlusEqualsToken */;
-                        }
-                        pos++;
-                        return token = 35 /* PlusToken */;
-                    case 44 /* comma */:
-                        pos++;
-                        return token = 24 /* CommaToken */;
-                    case 45 /* minus */:
-                        if (text.charCodeAt(pos + 1) === 45 /* minus */) {
-                            return pos += 2, token = 42 /* MinusMinusToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 58 /* MinusEqualsToken */;
-                        }
-                        pos++;
-                        return token = 36 /* MinusToken */;
-                    case 46 /* dot */:
-                        if (isDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = scanNumber();
-                            return token = 8 /* NumericLiteral */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 46 /* dot */ && text.charCodeAt(pos + 2) === 46 /* dot */) {
-                            return pos += 3, token = 22 /* DotDotDotToken */;
-                        }
-                        pos++;
-                        return token = 21 /* DotToken */;
-                    case 47 /* slash */:
-                        // Single-line comment
-                        if (text.charCodeAt(pos + 1) === 47 /* slash */) {
-                            pos += 2;
-                            while (pos < end) {
-                                if (isLineBreak(text.charCodeAt(pos))) {
-                                    break;
-                                }
-                                pos++;
-                            }
-                            if (skipTrivia) {
-                                continue;
-                            }
-                            else {
-                                return token = 2 /* SingleLineCommentTrivia */;
-                            }
-                        }
-                        // Multi-line comment
-                        if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
-                            pos += 2;
-                            var commentClosed = false;
-                            while (pos < end) {
-                                var ch_2 = text.charCodeAt(pos);
-                                if (ch_2 === 42 /* asterisk */ && text.charCodeAt(pos + 1) === 47 /* slash */) {
-                                    pos += 2;
-                                    commentClosed = true;
-                                    break;
-                                }
-                                if (isLineBreak(ch_2)) {
-                                    precedingLineBreak = true;
-                                }
-                                pos++;
-                            }
-                            if (!commentClosed) {
-                                error(ts.Diagnostics.Asterisk_Slash_expected);
-                            }
-                            if (skipTrivia) {
-                                continue;
-                            }
-                            else {
-                                tokenIsUnterminated = !commentClosed;
-                                return token = 3 /* MultiLineCommentTrivia */;
-                            }
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 61 /* SlashEqualsToken */;
-                        }
-                        pos++;
-                        return token = 39 /* SlashToken */;
-                    case 48 /* _0 */:
-                        if (pos + 2 < end && (text.charCodeAt(pos + 1) === 88 /* X */ || text.charCodeAt(pos + 1) === 120 /* x */)) {
-                            pos += 2;
-                            var value = scanMinimumNumberOfHexDigits(1);
-                            if (value < 0) {
-                                error(ts.Diagnostics.Hexadecimal_digit_expected);
-                                value = 0;
-                            }
-                            tokenValue = "" + value;
-                            return token = 8 /* NumericLiteral */;
-                        }
-                        else if (pos + 2 < end && (text.charCodeAt(pos + 1) === 66 /* B */ || text.charCodeAt(pos + 1) === 98 /* b */)) {
-                            pos += 2;
-                            var value = scanBinaryOrOctalDigits(/* base */ 2);
-                            if (value < 0) {
-                                error(ts.Diagnostics.Binary_digit_expected);
-                                value = 0;
-                            }
-                            tokenValue = "" + value;
-                            return token = 8 /* NumericLiteral */;
-                        }
-                        else if (pos + 2 < end && (text.charCodeAt(pos + 1) === 79 /* O */ || text.charCodeAt(pos + 1) === 111 /* o */)) {
-                            pos += 2;
-                            var value = scanBinaryOrOctalDigits(/* base */ 8);
-                            if (value < 0) {
-                                error(ts.Diagnostics.Octal_digit_expected);
-                                value = 0;
-                            }
-                            tokenValue = "" + value;
-                            return token = 8 /* NumericLiteral */;
-                        }
-                        // Try to parse as an octal
-                        if (pos + 1 < end && isOctalDigit(text.charCodeAt(pos + 1))) {
-                            tokenValue = "" + scanOctalDigits();
-                            return token = 8 /* NumericLiteral */;
-                        }
-                    // This fall-through is a deviation from the EcmaScript grammar. The grammar says that a leading zero
-                    // can only be followed by an octal digit, a dot, or the end of the number literal. However, we are being
-                    // permissive and allowing decimal digits of the form 08* and 09* (which many browsers also do).
-                    case 49 /* _1 */:
-                    case 50 /* _2 */:
-                    case 51 /* _3 */:
-                    case 52 /* _4 */:
-                    case 53 /* _5 */:
-                    case 54 /* _6 */:
-                    case 55 /* _7 */:
-                    case 56 /* _8 */:
-                    case 57 /* _9 */:
-                        tokenValue = scanNumber();
-                        return token = 8 /* NumericLiteral */;
-                    case 58 /* colon */:
-                        pos++;
-                        return token = 54 /* ColonToken */;
-                    case 59 /* semicolon */:
-                        pos++;
-                        return token = 23 /* SemicolonToken */;
-                    case 60 /* lessThan */:
-                        if (isConflictMarkerTrivia(text, pos)) {
-                            pos = scanConflictMarkerTrivia(text, pos, error);
-                            if (skipTrivia) {
-                                continue;
-                            }
-                            else {
-                                return token = 7 /* ConflictMarkerTrivia */;
-                            }
-                        }
-                        if (text.charCodeAt(pos + 1) === 60 /* lessThan */) {
-                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 63 /* LessThanLessThanEqualsToken */;
-                            }
-                            return pos += 2, token = 43 /* LessThanLessThanToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 28 /* LessThanEqualsToken */;
-                        }
-                        if (languageVariant === 1 /* JSX */ &&
-                            text.charCodeAt(pos + 1) === 47 /* slash */ &&
-                            text.charCodeAt(pos + 2) !== 42 /* asterisk */) {
-                            return pos += 2, token = 26 /* LessThanSlashToken */;
-                        }
-                        pos++;
-                        return token = 25 /* LessThanToken */;
-                    case 61 /* equals */:
-                        if (isConflictMarkerTrivia(text, pos)) {
-                            pos = scanConflictMarkerTrivia(text, pos, error);
-                            if (skipTrivia) {
-                                continue;
-                            }
-                            else {
-                                return token = 7 /* ConflictMarkerTrivia */;
-                            }
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                                return pos += 3, token = 32 /* EqualsEqualsEqualsToken */;
-                            }
-                            return pos += 2, token = 30 /* EqualsEqualsToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
-                            return pos += 2, token = 34 /* EqualsGreaterThanToken */;
-                        }
-                        pos++;
-                        return token = 56 /* EqualsToken */;
-                    case 62 /* greaterThan */:
-                        if (isConflictMarkerTrivia(text, pos)) {
-                            pos = scanConflictMarkerTrivia(text, pos, error);
-                            if (skipTrivia) {
-                                continue;
-                            }
-                            else {
-                                return token = 7 /* ConflictMarkerTrivia */;
-                            }
-                        }
-                        pos++;
-                        return token = 27 /* GreaterThanToken */;
-                    case 63 /* question */:
-                        pos++;
-                        return token = 53 /* QuestionToken */;
-                    case 91 /* openBracket */:
-                        pos++;
-                        return token = 19 /* OpenBracketToken */;
-                    case 93 /* closeBracket */:
-                        pos++;
-                        return token = 20 /* CloseBracketToken */;
-                    case 94 /* caret */:
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 68 /* CaretEqualsToken */;
-                        }
-                        pos++;
-                        return token = 48 /* CaretToken */;
-                    case 123 /* openBrace */:
-                        pos++;
-                        return token = 15 /* OpenBraceToken */;
-                    case 124 /* bar */:
-                        if (text.charCodeAt(pos + 1) === 124 /* bar */) {
-                            return pos += 2, token = 52 /* BarBarToken */;
-                        }
-                        if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                            return pos += 2, token = 67 /* BarEqualsToken */;
-                        }
-                        pos++;
-                        return token = 47 /* BarToken */;
-                    case 125 /* closeBrace */:
-                        pos++;
-                        return token = 16 /* CloseBraceToken */;
-                    case 126 /* tilde */:
-                        pos++;
-                        return token = 50 /* TildeToken */;
-                    case 64 /* at */:
-                        pos++;
-                        return token = 55 /* AtToken */;
-                    case 92 /* backslash */:
-                        var cookedChar = peekUnicodeEscape();
-                        if (cookedChar >= 0 && isIdentifierStart(cookedChar, languageVersion)) {
-                            pos += 6;
-                            tokenValue = String.fromCharCode(cookedChar) + scanIdentifierParts();
-                            return token = getIdentifierToken();
-                        }
-                        error(ts.Diagnostics.Invalid_character);
-                        pos++;
-                        return token = 0 /* Unknown */;
-                    default:
-                        if (isIdentifierStart(ch, languageVersion)) {
-                            pos++;
-                            while (pos < end && isIdentifierPart(ch = text.charCodeAt(pos), languageVersion))
-                                pos++;
-                            tokenValue = text.substring(tokenPos, pos);
-                            if (ch === 92 /* backslash */) {
-                                tokenValue += scanIdentifierParts();
-                            }
-                            return token = getIdentifierToken();
-                        }
-                        else if (isWhiteSpaceSingleLine(ch)) {
-                            pos++;
-                            continue;
-                        }
-                        else if (isLineBreak(ch)) {
-                            precedingLineBreak = true;
-                            pos++;
-                            continue;
-                        }
-                        error(ts.Diagnostics.Invalid_character);
-                        pos++;
-                        return token = 0 /* Unknown */;
-                }
-            }
-        }
-        function reScanGreaterToken() {
-            if (token === 27 /* GreaterThanToken */) {
-                if (text.charCodeAt(pos) === 62 /* greaterThan */) {
-                    if (text.charCodeAt(pos + 1) === 62 /* greaterThan */) {
-                        if (text.charCodeAt(pos + 2) === 61 /* equals */) {
-                            return pos += 3, token = 65 /* GreaterThanGreaterThanGreaterThanEqualsToken */;
-                        }
-                        return pos += 2, token = 45 /* GreaterThanGreaterThanGreaterThanToken */;
-                    }
-                    if (text.charCodeAt(pos + 1) === 61 /* equals */) {
-                        return pos += 2, token = 64 /* GreaterThanGreaterThanEqualsToken */;
-                    }
-                    pos++;
-                    return token = 44 /* GreaterThanGreaterThanToken */;
-                }
-                if (text.charCodeAt(pos) === 61 /* equals */) {
-                    pos++;
-                    return token = 29 /* GreaterThanEqualsToken */;
-                }
-            }
-            return token;
-        }
-        function reScanSlashToken() {
-            if (token === 39 /* SlashToken */ || token === 61 /* SlashEqualsToken */) {
-                var p = tokenPos + 1;
-                var inEscape = false;
-                var inCharacterClass = false;
-                while (true) {
-                    // If we reach the end of a file, or hit a newline, then this is an unterminated
-                    // regex.  Report error and return what we have so far.
-                    if (p >= end) {
-                        tokenIsUnterminated = true;
-                        error(ts.Diagnostics.Unterminated_regular_expression_literal);
-                        break;
-                    }
-                    var ch = text.charCodeAt(p);
-                    if (isLineBreak(ch)) {
-                        tokenIsUnterminated = true;
-                        error(ts.Diagnostics.Unterminated_regular_expression_literal);
-                        break;
-                    }
-                    if (inEscape) {
-                        // Parsing an escape character;
-                        // reset the flag and just advance to the next char.
-                        inEscape = false;
-                    }
-                    else if (ch === 47 /* slash */ && !inCharacterClass) {
-                        // A slash within a character class is permissible,
-                        // but in general it signals the end of the regexp literal.
-                        p++;
-                        break;
-                    }
-                    else if (ch === 91 /* openBracket */) {
-                        inCharacterClass = true;
-                    }
-                    else if (ch === 92 /* backslash */) {
-                        inEscape = true;
-                    }
-                    else if (ch === 93 /* closeBracket */) {
-                        inCharacterClass = false;
-                    }
-                    p++;
-                }
-                while (p < end && isIdentifierPart(text.charCodeAt(p), languageVersion)) {
-                    p++;
-                }
-                pos = p;
-                tokenValue = text.substring(tokenPos, pos);
-                token = 10 /* RegularExpressionLiteral */;
-            }
-            return token;
-        }
-        /**
-         * Unconditionally back up and scan a template expression portion.
-         */
-        function reScanTemplateToken() {
-            ts.Debug.assert(token === 16 /* CloseBraceToken */, "'reScanTemplateToken' should only be called on a '}'");
-            pos = tokenPos;
-            return token = scanTemplateAndSetTokenValue();
-        }
-        function reScanJsxToken() {
-            pos = tokenPos = startPos;
-            return token = scanJsxToken();
-        }
-        function scanJsxToken() {
-            startPos = tokenPos = pos;
-            if (pos >= end) {
-                return token = 1 /* EndOfFileToken */;
-            }
-            var char = text.charCodeAt(pos);
-            if (char === 60 /* lessThan */) {
-                if (text.charCodeAt(pos + 1) === 47 /* slash */) {
-                    pos += 2;
-                    return token = 26 /* LessThanSlashToken */;
-                }
-                pos++;
-                return token = 25 /* LessThanToken */;
-            }
-            if (char === 123 /* openBrace */) {
-                pos++;
-                return token = 15 /* OpenBraceToken */;
-            }
-            while (pos < end) {
-                pos++;
-                char = text.charCodeAt(pos);
-                if ((char === 123 /* openBrace */) || (char === 60 /* lessThan */)) {
-                    break;
-                }
-            }
-            return token = 244 /* JsxText */;
-        }
-        // Scans a JSX identifier; these differ from normal identifiers in that
-        // they allow dashes
-        function scanJsxIdentifier() {
-            if (tokenIsIdentifierOrKeyword(token)) {
-                var firstCharPosition = pos;
-                while (pos < end) {
-                    var ch = text.charCodeAt(pos);
-                    if (ch === 45 /* minus */ || ((firstCharPosition === pos) ? isIdentifierStart(ch, languageVersion) : isIdentifierPart(ch, languageVersion))) {
-                        pos++;
-                    }
-                    else {
-                        break;
-                    }
-                }
-                tokenValue += text.substr(firstCharPosition, pos - firstCharPosition);
-            }
-            return token;
-        }
-        function scanJSDocToken() {
-            if (pos >= end) {
-                return token = 1 /* EndOfFileToken */;
-            }
-            startPos = pos;
-            // Eat leading whitespace
-            var ch = text.charCodeAt(pos);
-            while (pos < end) {
-                ch = text.charCodeAt(pos);
-                if (isWhiteSpaceSingleLine(ch)) {
-                    pos++;
-                }
-                else {
-                    break;
-                }
-            }
-            tokenPos = pos;
-            switch (ch) {
-                case 64 /* at */:
-                    return pos += 1, token = 55 /* AtToken */;
-                case 10 /* lineFeed */:
-                case 13 /* carriageReturn */:
-                    return pos += 1, token = 4 /* NewLineTrivia */;
-                case 42 /* asterisk */:
-                    return pos += 1, token = 37 /* AsteriskToken */;
-                case 123 /* openBrace */:
-                    return pos += 1, token = 15 /* OpenBraceToken */;
-                case 125 /* closeBrace */:
-                    return pos += 1, token = 16 /* CloseBraceToken */;
-                case 91 /* openBracket */:
-                    return pos += 1, token = 19 /* OpenBracketToken */;
-                case 93 /* closeBracket */:
-                    return pos += 1, token = 20 /* CloseBracketToken */;
-                case 61 /* equals */:
-                    return pos += 1, token = 56 /* EqualsToken */;
-                case 44 /* comma */:
-                    return pos += 1, token = 24 /* CommaToken */;
-            }
-            if (isIdentifierStart(ch, 2 /* Latest */)) {
-                pos++;
-                while (isIdentifierPart(text.charCodeAt(pos), 2 /* Latest */) && pos < end) {
-                    pos++;
-                }
-                return token = 69 /* Identifier */;
-            }
-            else {
-                return pos += 1, token = 0 /* Unknown */;
-            }
-        }
-        function speculationHelper(callback, isLookahead) {
-            var savePos = pos;
-            var saveStartPos = startPos;
-            var saveTokenPos = tokenPos;
-            var saveToken = token;
-            var saveTokenValue = tokenValue;
-            var savePrecedingLineBreak = precedingLineBreak;
-            var result = callback();
-            // If our callback returned something 'falsy' or we're just looking ahead,
-            // then unconditionally restore us to where we were.
-            if (!result || isLookahead) {
-                pos = savePos;
-                startPos = saveStartPos;
-                tokenPos = saveTokenPos;
-                token = saveToken;
-                tokenValue = saveTokenValue;
-                precedingLineBreak = savePrecedingLineBreak;
-            }
-            return result;
-        }
-        function scanRange(start, length, callback) {
-            var saveEnd = end;
-            var savePos = pos;
-            var saveStartPos = startPos;
-            var saveTokenPos = tokenPos;
-            var saveToken = token;
-            var savePrecedingLineBreak = precedingLineBreak;
-            var saveTokenValue = tokenValue;
-            var saveHasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
-            var saveTokenIsUnterminated = tokenIsUnterminated;
-            setText(text, start, length);
-            var result = callback();
-            end = saveEnd;
-            pos = savePos;
-            startPos = saveStartPos;
-            tokenPos = saveTokenPos;
-            token = saveToken;
-            precedingLineBreak = savePrecedingLineBreak;
-            tokenValue = saveTokenValue;
-            hasExtendedUnicodeEscape = saveHasExtendedUnicodeEscape;
-            tokenIsUnterminated = saveTokenIsUnterminated;
-            return result;
-        }
-        function lookAhead(callback) {
-            return speculationHelper(callback, /*isLookahead*/ true);
-        }
-        function tryScan(callback) {
-            return speculationHelper(callback, /*isLookahead*/ false);
-        }
-        function getText() {
-            return text;
-        }
-        function setText(newText, start, length) {
-            text = newText || "";
-            end = length === undefined ? text.length : start + length;
-            setTextPos(start || 0);
-        }
-        function setOnError(errorCallback) {
-            onError = errorCallback;
-        }
-        function setScriptTarget(scriptTarget) {
-            languageVersion = scriptTarget;
-        }
-        function setLanguageVariant(variant) {
-            languageVariant = variant;
-        }
-        function setTextPos(textPos) {
-            ts.Debug.assert(textPos >= 0);
-            pos = textPos;
-            startPos = textPos;
-            tokenPos = textPos;
-            token = 0 /* Unknown */;
-            precedingLineBreak = false;
-            tokenValue = undefined;
-            hasExtendedUnicodeEscape = false;
-            tokenIsUnterminated = false;
-        }
-    }
-    ts.createScanner = createScanner;
-})(ts || (ts = {}));
-/// <reference path="sys.ts" />
-/* @internal */
-var ts;
-(function (ts) {
-    function getDeclarationOfKind(symbol, kind) {
-        var declarations = symbol.declarations;
-        if (declarations) {
-            for (var _i = 0, declarations_1 = declarations; _i < declarations_1.length; _i++) {
-                var declaration = declarations_1[_i];
-                if (declaration.kind === kind) {
-                    return declaration;
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getDeclarationOfKind = getDeclarationOfKind;
-    // Pool writers to avoid needing to allocate them for every symbol we write.
-    var stringWriters = [];
-    function getSingleLineStringWriter() {
-        if (stringWriters.length === 0) {
-            var str_1 = "";
-            var writeText = function (text) { return str_1 += text; };
-            return {
-                string: function () { return str_1; },
-                writeKeyword: writeText,
-                writeOperator: writeText,
-                writePunctuation: writeText,
-                writeSpace: writeText,
-                writeStringLiteral: writeText,
-                writeParameter: writeText,
-                writeSymbol: writeText,
-                // Completely ignore indentation for string writers.  And map newlines to
-                // a single space.
-                writeLine: function () { return str_1 += " "; },
-                increaseIndent: function () { },
-                decreaseIndent: function () { },
-                clear: function () { return str_1 = ""; },
-                trackSymbol: function () { },
-                reportInaccessibleThisError: function () { }
-            };
-        }
-        return stringWriters.pop();
-    }
-    ts.getSingleLineStringWriter = getSingleLineStringWriter;
-    function releaseStringWriter(writer) {
-        writer.clear();
-        stringWriters.push(writer);
-    }
-    ts.releaseStringWriter = releaseStringWriter;
-    function getFullWidth(node) {
-        return node.end - node.pos;
-    }
-    ts.getFullWidth = getFullWidth;
-    function mapIsEqualTo(map1, map2) {
-        if (!map1 || !map2) {
-            return map1 === map2;
-        }
-        return containsAll(map1, map2) && containsAll(map2, map1);
-    }
-    ts.mapIsEqualTo = mapIsEqualTo;
-    function containsAll(map, other) {
-        for (var key in map) {
-            if (!ts.hasProperty(map, key)) {
-                continue;
-            }
-            if (!ts.hasProperty(other, key) || map[key] !== other[key]) {
-                return false;
-            }
-        }
-        return true;
-    }
-    function arrayIsEqualTo(array1, array2, equaler) {
-        if (!array1 || !array2) {
-            return array1 === array2;
-        }
-        if (array1.length !== array2.length) {
-            return false;
-        }
-        for (var i = 0; i < array1.length; i++) {
-            var equals = equaler ? equaler(array1[i], array2[i]) : array1[i] === array2[i];
-            if (!equals) {
-                return false;
-            }
-        }
-        return true;
-    }
-    ts.arrayIsEqualTo = arrayIsEqualTo;
-    function hasResolvedModule(sourceFile, moduleNameText) {
-        return sourceFile.resolvedModules && ts.hasProperty(sourceFile.resolvedModules, moduleNameText);
-    }
-    ts.hasResolvedModule = hasResolvedModule;
-    function getResolvedModule(sourceFile, moduleNameText) {
-        return hasResolvedModule(sourceFile, moduleNameText) ? sourceFile.resolvedModules[moduleNameText] : undefined;
-    }
-    ts.getResolvedModule = getResolvedModule;
-    function setResolvedModule(sourceFile, moduleNameText, resolvedModule) {
-        if (!sourceFile.resolvedModules) {
-            sourceFile.resolvedModules = {};
-        }
-        sourceFile.resolvedModules[moduleNameText] = resolvedModule;
-    }
-    ts.setResolvedModule = setResolvedModule;
-    function setResolvedTypeReferenceDirective(sourceFile, typeReferenceDirectiveName, resolvedTypeReferenceDirective) {
-        if (!sourceFile.resolvedTypeReferenceDirectiveNames) {
-            sourceFile.resolvedTypeReferenceDirectiveNames = {};
-        }
-        sourceFile.resolvedTypeReferenceDirectiveNames[typeReferenceDirectiveName] = resolvedTypeReferenceDirective;
-    }
-    ts.setResolvedTypeReferenceDirective = setResolvedTypeReferenceDirective;
-    /* @internal */
-    function moduleResolutionIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.isExternalLibraryImport === newResolution.isExternalLibraryImport;
-    }
-    ts.moduleResolutionIsEqualTo = moduleResolutionIsEqualTo;
-    /* @internal */
-    function typeDirectiveIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
-    }
-    ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
-    /* @internal */
-    function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
-        if (names.length !== newResolutions.length) {
-            return false;
-        }
-        for (var i = 0; i < names.length; i++) {
-            var newResolution = newResolutions[i];
-            var oldResolution = oldResolutions && ts.hasProperty(oldResolutions, names[i]) ? oldResolutions[names[i]] : undefined;
-            var changed = oldResolution
-                ? !newResolution || !comparer(oldResolution, newResolution)
-                : newResolution;
-            if (changed) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.hasChangesInResolutions = hasChangesInResolutions;
-    // Returns true if this node contains a parse error anywhere underneath it.
-    function containsParseError(node) {
-        aggregateChildData(node);
-        return (node.flags & 268435456 /* ThisNodeOrAnySubNodesHasError */) !== 0;
-    }
-    ts.containsParseError = containsParseError;
-    function aggregateChildData(node) {
-        if (!(node.flags & 536870912 /* HasAggregatedChildData */)) {
-            // A node is considered to contain a parse error if:
-            //  a) the parser explicitly marked that it had an error
-            //  b) any of it's children reported that it had an error.
-            var thisNodeOrAnySubNodesHasError = ((node.flags & 67108864 /* ThisNodeHasError */) !== 0) ||
-                ts.forEachChild(node, containsParseError);
-            // If so, mark ourselves accordingly.
-            if (thisNodeOrAnySubNodesHasError) {
-                node.flags |= 268435456 /* ThisNodeOrAnySubNodesHasError */;
-            }
-            // Also mark that we've propagated the child information to this node.  This way we can
-            // always consult the bit directly on this node without needing to check its children
-            // again.
-            node.flags |= 536870912 /* HasAggregatedChildData */;
-        }
-    }
-    function getSourceFileOfNode(node) {
-        while (node && node.kind !== 256 /* SourceFile */) {
-            node = node.parent;
-        }
-        return node;
-    }
-    ts.getSourceFileOfNode = getSourceFileOfNode;
-    function isStatementWithLocals(node) {
-        switch (node.kind) {
-            case 199 /* Block */:
-            case 227 /* CaseBlock */:
-            case 206 /* ForStatement */:
-            case 207 /* ForInStatement */:
-            case 208 /* ForOfStatement */:
-                return true;
-        }
-        return false;
-    }
-    ts.isStatementWithLocals = isStatementWithLocals;
-    function getStartPositionOfLine(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        return ts.getLineStarts(sourceFile)[line];
-    }
-    ts.getStartPositionOfLine = getStartPositionOfLine;
-    // This is a useful function for debugging purposes.
-    function nodePosToString(node) {
-        var file = getSourceFileOfNode(node);
-        var loc = ts.getLineAndCharacterOfPosition(file, node.pos);
-        return file.fileName + "(" + (loc.line + 1) + "," + (loc.character + 1) + ")";
-    }
-    ts.nodePosToString = nodePosToString;
-    function getStartPosOfNode(node) {
-        return node.pos;
-    }
-    ts.getStartPosOfNode = getStartPosOfNode;
-    function getEndLinePosition(line, sourceFile) {
-        ts.Debug.assert(line >= 0);
-        var lineStarts = ts.getLineStarts(sourceFile);
-        var lineIndex = line;
-        var sourceText = sourceFile.text;
-        if (lineIndex + 1 === lineStarts.length) {
-            // last line - return EOF
-            return sourceText.length - 1;
-        }
-        else {
-            // current line start
-            var start = lineStarts[lineIndex];
-            // take the start position of the next line - 1 = it should be some line break
-            var pos = lineStarts[lineIndex + 1] - 1;
-            ts.Debug.assert(ts.isLineBreak(sourceText.charCodeAt(pos)));
-            // walk backwards skipping line breaks, stop the the beginning of current line.
-            // i.e:
-            // <some text>
-            // $ <- end of line for this position should match the start position
-            while (start <= pos && ts.isLineBreak(sourceText.charCodeAt(pos))) {
-                pos--;
-            }
-            return pos;
-        }
-    }
-    ts.getEndLinePosition = getEndLinePosition;
-    // Returns true if this node is missing from the actual source code. A 'missing' node is different
-    // from 'undefined/defined'. When a node is undefined (which can happen for optional nodes
-    // in the tree), it is definitely missing. However, a node may be defined, but still be
-    // missing.  This happens whenever the parser knows it needs to parse something, but can't
-    // get anything in the source code that it expects at that location. For example:
-    //
-    //          let a: ;
-    //
-    // Here, the Type in the Type-Annotation is not-optional (as there is a colon in the source
-    // code). So the parser will attempt to parse out a type, and will create an actual node.
-    // However, this node will be 'missing' in the sense that no actual source-code/tokens are
-    // contained within it.
-    function nodeIsMissing(node) {
-        if (!node) {
-            return true;
-        }
-        return node.pos === node.end && node.pos >= 0 && node.kind !== 1 /* EndOfFileToken */;
-    }
-    ts.nodeIsMissing = nodeIsMissing;
-    function nodeIsPresent(node) {
-        return !nodeIsMissing(node);
-    }
-    ts.nodeIsPresent = nodeIsPresent;
-    function getTokenPosOfNode(node, sourceFile, includeJsDocComment) {
-        // With nodes that have no width (i.e. 'Missing' nodes), we actually *don't*
-        // want to skip trivia because this will launch us forward to the next token.
-        if (nodeIsMissing(node)) {
-            return node.pos;
-        }
-        if (isJSDocNode(node)) {
-            return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, /*stopAfterLineBreak*/ false, /*stopAtComments*/ true);
-        }
-        if (includeJsDocComment && node.jsDocComments && node.jsDocComments.length > 0) {
-            return getTokenPosOfNode(node.jsDocComments[0]);
-        }
-        // For a syntax list, it is possible that one of its children has JSDocComment nodes, while
-        // the syntax list itself considers them as normal trivia. Therefore if we simply skip
-        // trivia for the list, we may have skipped the JSDocComment as well. So we should process its
-        // first child to determine the actual position of its first token.
-        if (node.kind === 282 /* SyntaxList */ && node._children.length > 0) {
-            return getTokenPosOfNode(node._children[0], sourceFile, includeJsDocComment);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
-    }
-    ts.getTokenPosOfNode = getTokenPosOfNode;
-    function isJSDocNode(node) {
-        return node.kind >= 257 /* FirstJSDocNode */ && node.kind <= 281 /* LastJSDocNode */;
-    }
-    ts.isJSDocNode = isJSDocNode;
-    function getNonDecoratorTokenPosOfNode(node, sourceFile) {
-        if (nodeIsMissing(node) || !node.decorators) {
-            return getTokenPosOfNode(node, sourceFile);
-        }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.decorators.end);
-    }
-    ts.getNonDecoratorTokenPosOfNode = getNonDecoratorTokenPosOfNode;
-    function getSourceTextOfNodeFromSourceFile(sourceFile, node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        var text = sourceFile.text;
-        return text.substring(includeTrivia ? node.pos : ts.skipTrivia(text, node.pos), node.end);
-    }
-    ts.getSourceTextOfNodeFromSourceFile = getSourceTextOfNodeFromSourceFile;
-    function getTextOfNodeFromSourceText(sourceText, node) {
-        if (nodeIsMissing(node)) {
-            return "";
-        }
-        return sourceText.substring(ts.skipTrivia(sourceText, node.pos), node.end);
-    }
-    ts.getTextOfNodeFromSourceText = getTextOfNodeFromSourceText;
-    function getTextOfNode(node, includeTrivia) {
-        if (includeTrivia === void 0) { includeTrivia = false; }
-        return getSourceTextOfNodeFromSourceFile(getSourceFileOfNode(node), node, includeTrivia);
-    }
-    ts.getTextOfNode = getTextOfNode;
-    // Add an extra underscore to identifiers that start with two underscores to avoid issues with magic names like '__proto__'
-    function escapeIdentifier(identifier) {
-        return identifier.length >= 2 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ ? "_" + identifier : identifier;
-    }
-    ts.escapeIdentifier = escapeIdentifier;
-    // Remove extra underscore from escaped identifier
-    function unescapeIdentifier(identifier) {
-        return identifier.length >= 3 && identifier.charCodeAt(0) === 95 /* _ */ && identifier.charCodeAt(1) === 95 /* _ */ && identifier.charCodeAt(2) === 95 /* _ */ ? identifier.substr(1) : identifier;
-    }
-    ts.unescapeIdentifier = unescapeIdentifier;
-    // Make an identifier from an external module name by extracting the string after the last "/" and replacing
-    // all non-alphanumeric characters with underscores
-    function makeIdentifierFromModuleName(moduleName) {
-        return ts.getBaseFileName(moduleName).replace(/^(\d)/, "_$1").replace(/\W/g, "_");
-    }
-    ts.makeIdentifierFromModuleName = makeIdentifierFromModuleName;
-    function isBlockOrCatchScoped(declaration) {
-        return (getCombinedNodeFlags(declaration) & 3072 /* BlockScoped */) !== 0 ||
-            isCatchClauseVariableDeclaration(declaration);
-    }
-    ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
-    function isAmbientModule(node) {
-        return node && node.kind === 225 /* ModuleDeclaration */ &&
-            (node.name.kind === 9 /* StringLiteral */ || isGlobalScopeAugmentation(node));
-    }
-    ts.isAmbientModule = isAmbientModule;
-    function isShorthandAmbientModule(node) {
-        // The only kind of module that can be missing a body is a shorthand ambient module.
-        return node.kind === 225 /* ModuleDeclaration */ && (!node.body);
-    }
-    ts.isShorthandAmbientModule = isShorthandAmbientModule;
-    function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 256 /* SourceFile */ ||
-            node.kind === 225 /* ModuleDeclaration */ ||
-            isFunctionLike(node) ||
-            isFunctionBlock(node);
-    }
-    ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
-    function isGlobalScopeAugmentation(module) {
-        return !!(module.flags & 131072 /* GlobalAugmentation */);
-    }
-    ts.isGlobalScopeAugmentation = isGlobalScopeAugmentation;
-    function isExternalModuleAugmentation(node) {
-        // external module augmentation is a ambient module declaration that is either:
-        // - defined in the top level scope and source file is an external module
-        // - defined inside ambient module declaration located in the top level scope and source file not an external module
-        if (!node || !isAmbientModule(node)) {
-            return false;
-        }
-        switch (node.parent.kind) {
-            case 256 /* SourceFile */:
-                return ts.isExternalModule(node.parent);
-            case 226 /* ModuleBlock */:
-                return isAmbientModule(node.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
-        }
-        return false;
-    }
-    ts.isExternalModuleAugmentation = isExternalModuleAugmentation;
-    // Gets the nearest enclosing block scope container that has the provided node
-    // as a descendant, that is not the provided node.
-    function getEnclosingBlockScopeContainer(node) {
-        var current = node.parent;
-        while (current) {
-            if (isFunctionLike(current)) {
-                return current;
-            }
-            switch (current.kind) {
-                case 256 /* SourceFile */:
-                case 227 /* CaseBlock */:
-                case 252 /* CatchClause */:
-                case 225 /* ModuleDeclaration */:
-                case 206 /* ForStatement */:
-                case 207 /* ForInStatement */:
-                case 208 /* ForOfStatement */:
-                    return current;
-                case 199 /* Block */:
-                    // function block is not considered block-scope container
-                    // see comment in binder.ts: bind(...), case for SyntaxKind.Block
-                    if (!isFunctionLike(current.parent)) {
-                        return current;
-                    }
-            }
-            current = current.parent;
-        }
-    }
-    ts.getEnclosingBlockScopeContainer = getEnclosingBlockScopeContainer;
-    function isCatchClauseVariableDeclaration(declaration) {
-        return declaration &&
-            declaration.kind === 218 /* VariableDeclaration */ &&
-            declaration.parent &&
-            declaration.parent.kind === 252 /* CatchClause */;
-    }
-    ts.isCatchClauseVariableDeclaration = isCatchClauseVariableDeclaration;
-    // Return display name of an identifier
-    // Computed property names will just be emitted as "[<expr>]", where <expr> is the source
-    // text of the expression in the computed property.
-    function declarationNameToString(name) {
-        return getFullWidth(name) === 0 ? "(Missing)" : getTextOfNode(name);
-    }
-    ts.declarationNameToString = declarationNameToString;
-    function createDiagnosticForNode(node, message, arg0, arg1, arg2) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2);
-    }
-    ts.createDiagnosticForNode = createDiagnosticForNode;
-    function createDiagnosticForNodeFromMessageChain(node, messageChain) {
-        var sourceFile = getSourceFileOfNode(node);
-        var span = getErrorSpanForNode(sourceFile, node);
-        return {
-            file: sourceFile,
-            start: span.start,
-            length: span.length,
-            code: messageChain.code,
-            category: messageChain.category,
-            messageText: messageChain.next ? messageChain : messageChain.messageText
-        };
-    }
-    ts.createDiagnosticForNodeFromMessageChain = createDiagnosticForNodeFromMessageChain;
-    function getSpanOfTokenAtPosition(sourceFile, pos) {
-        var scanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ true, sourceFile.languageVariant, sourceFile.text, /*onError:*/ undefined, pos);
-        scanner.scan();
-        var start = scanner.getTokenPos();
-        return ts.createTextSpanFromBounds(start, scanner.getTextPos());
-    }
-    ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
-    function getErrorSpanForArrowFunction(sourceFile, node) {
-        var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 199 /* Block */) {
-            var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
-            var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
-            if (startLine < endLine) {
-                // The arrow function spans multiple lines,
-                // make the error span be the first line, inclusive.
-                return ts.createTextSpan(pos, getEndLinePosition(startLine, sourceFile) - pos + 1);
-            }
-        }
-        return ts.createTextSpanFromBounds(pos, node.end);
-    }
-    function getErrorSpanForNode(sourceFile, node) {
-        var errorNode = node;
-        switch (node.kind) {
-            case 256 /* SourceFile */:
-                var pos_1 = ts.skipTrivia(sourceFile.text, 0, /*stopAfterLineBreak*/ false);
-                if (pos_1 === sourceFile.text.length) {
-                    // file is empty - return span for the beginning of the file
-                    return ts.createTextSpan(0, 0);
-                }
-                return getSpanOfTokenAtPosition(sourceFile, pos_1);
-            // This list is a work in progress. Add missing node kinds to improve their error
-            // spans.
-            case 218 /* VariableDeclaration */:
-            case 169 /* BindingElement */:
-            case 221 /* ClassDeclaration */:
-            case 192 /* ClassExpression */:
-            case 222 /* InterfaceDeclaration */:
-            case 225 /* ModuleDeclaration */:
-            case 224 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 220 /* FunctionDeclaration */:
-            case 179 /* FunctionExpression */:
-            case 147 /* MethodDeclaration */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 223 /* TypeAliasDeclaration */:
-                errorNode = node.name;
-                break;
-            case 180 /* ArrowFunction */:
-                return getErrorSpanForArrowFunction(sourceFile, node);
-        }
-        if (errorNode === undefined) {
-            // If we don't have a better node, then just set the error on the first token of
-            // construct.
-            return getSpanOfTokenAtPosition(sourceFile, node.pos);
-        }
-        var pos = nodeIsMissing(errorNode)
-            ? errorNode.pos
-            : ts.skipTrivia(sourceFile.text, errorNode.pos);
-        return ts.createTextSpanFromBounds(pos, errorNode.end);
-    }
-    ts.getErrorSpanForNode = getErrorSpanForNode;
-    function isExternalOrCommonJsModule(file) {
-        return (file.externalModuleIndicator || file.commonJsModuleIndicator) !== undefined;
-    }
-    ts.isExternalOrCommonJsModule = isExternalOrCommonJsModule;
-    function isDeclarationFile(file) {
-        return file.isDeclarationFile;
-    }
-    ts.isDeclarationFile = isDeclarationFile;
-    function isConstEnumDeclaration(node) {
-        return node.kind === 224 /* EnumDeclaration */ && isConst(node);
-    }
-    ts.isConstEnumDeclaration = isConstEnumDeclaration;
-    function walkUpBindingElementsAndPatterns(node) {
-        while (node && (node.kind === 169 /* BindingElement */ || isBindingPattern(node))) {
-            node = node.parent;
-        }
-        return node;
-    }
-    // Returns the node flags for this node and all relevant parent nodes.  This is done so that
-    // nodes like variable declarations and binding elements can returned a view of their flags
-    // that includes the modifiers from their container.  i.e. flags like export/declare aren't
-    // stored on the variable declaration directly, but on the containing variable statement
-    // (if it has one).  Similarly, flags for let/const are store on the variable declaration
-    // list.  By calling this function, all those flags are combined so that the client can treat
-    // the node as if it actually had those flags.
-    function getCombinedNodeFlags(node) {
-        node = walkUpBindingElementsAndPatterns(node);
-        var flags = node.flags;
-        if (node.kind === 218 /* VariableDeclaration */) {
-            node = node.parent;
-        }
-        if (node && node.kind === 219 /* VariableDeclarationList */) {
-            flags |= node.flags;
-            node = node.parent;
-        }
-        if (node && node.kind === 200 /* VariableStatement */) {
-            flags |= node.flags;
-        }
-        return flags;
-    }
-    ts.getCombinedNodeFlags = getCombinedNodeFlags;
-    function isConst(node) {
-        return !!(getCombinedNodeFlags(node) & 2048 /* Const */);
-    }
-    ts.isConst = isConst;
-    function isLet(node) {
-        return !!(getCombinedNodeFlags(node) & 1024 /* Let */);
-    }
-    ts.isLet = isLet;
-    function isSuperCallExpression(n) {
-        return n.kind === 174 /* CallExpression */ && n.expression.kind === 95 /* SuperKeyword */;
-    }
-    ts.isSuperCallExpression = isSuperCallExpression;
-    function isPrologueDirective(node) {
-        return node.kind === 202 /* ExpressionStatement */ && node.expression.kind === 9 /* StringLiteral */;
-    }
-    ts.isPrologueDirective = isPrologueDirective;
-    function getLeadingCommentRangesOfNode(node, sourceFileOfNode) {
-        return ts.getLeadingCommentRanges(sourceFileOfNode.text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
-    function getLeadingCommentRangesOfNodeFromText(node, text) {
-        return ts.getLeadingCommentRanges(text, node.pos);
-    }
-    ts.getLeadingCommentRangesOfNodeFromText = getLeadingCommentRangesOfNodeFromText;
-    function getJsDocComments(node, sourceFileOfNode) {
-        return getJsDocCommentsFromText(node, sourceFileOfNode.text);
-    }
-    ts.getJsDocComments = getJsDocComments;
-    function getJsDocCommentsFromText(node, text) {
-        var commentRanges = (node.kind === 142 /* Parameter */ ||
-            node.kind === 141 /* TypeParameter */ ||
-            node.kind === 179 /* FunctionExpression */ ||
-            node.kind === 180 /* ArrowFunction */) ?
-            ts.concatenate(ts.getTrailingCommentRanges(text, node.pos), ts.getLeadingCommentRanges(text, node.pos)) :
-            getLeadingCommentRangesOfNodeFromText(node, text);
-        return ts.filter(commentRanges, isJsDocComment);
-        function isJsDocComment(comment) {
-            // True if the comment starts with '/**' but not if it is '/**/'
-            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                text.charCodeAt(comment.pos + 2) === 42 /* asterisk */ &&
-                text.charCodeAt(comment.pos + 3) !== 47 /* slash */;
-        }
-    }
-    ts.getJsDocCommentsFromText = getJsDocCommentsFromText;
-    ts.fullTripleSlashReferencePathRegEx = /^(\/\/\/\s*<reference\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx = /^(\/\/\/\s*<reference\s+types\s*=\s*)('|")(.+?)\2.*?\/>/;
-    ts.fullTripleSlashAMDReferencePathRegEx = /^(\/\/\/\s*<amd-dependency\s+path\s*=\s*)('|")(.+?)\2.*?\/>/;
-    function isTypeNode(node) {
-        if (154 /* FirstTypeNode */ <= node.kind && node.kind <= 166 /* LastTypeNode */) {
-            return true;
-        }
-        switch (node.kind) {
-            case 117 /* AnyKeyword */:
-            case 130 /* NumberKeyword */:
-            case 132 /* StringKeyword */:
-            case 120 /* BooleanKeyword */:
-            case 133 /* SymbolKeyword */:
-            case 135 /* UndefinedKeyword */:
-            case 127 /* NeverKeyword */:
-                return true;
-            case 103 /* VoidKeyword */:
-                return node.parent.kind !== 183 /* VoidExpression */;
-            case 194 /* ExpressionWithTypeArguments */:
-                return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            // Identifiers and qualified names may be type nodes, depending on their context. Climb
-            // above them to find the lowest container
-            case 69 /* Identifier */:
-                // If the identifier is the RHS of a qualified name, then it's a type iff its parent is.
-                if (node.parent.kind === 139 /* QualifiedName */ && node.parent.right === node) {
-                    node = node.parent;
-                }
-                else if (node.parent.kind === 172 /* PropertyAccessExpression */ && node.parent.name === node) {
-                    node = node.parent;
-                }
-                // At this point, node is either a qualified name or an identifier
-                ts.Debug.assert(node.kind === 69 /* Identifier */ || node.kind === 139 /* QualifiedName */ || node.kind === 172 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isTypeNode'.");
-            case 139 /* QualifiedName */:
-            case 172 /* PropertyAccessExpression */:
-            case 97 /* ThisKeyword */:
-                var parent_1 = node.parent;
-                if (parent_1.kind === 158 /* TypeQuery */) {
-                    return false;
-                }
-                // Do not recursively call isTypeNode on the parent. In the example:
-                //
-                //     let a: A.B.C;
-                //
-                // Calling isTypeNode would consider the qualified name A.B a type node. Only C or
-                // A.B.C is a type node.
-                if (154 /* FirstTypeNode */ <= parent_1.kind && parent_1.kind <= 166 /* LastTypeNode */) {
-                    return true;
-                }
-                switch (parent_1.kind) {
-                    case 194 /* ExpressionWithTypeArguments */:
-                        return !isExpressionWithTypeArgumentsInClassExtendsClause(parent_1);
-                    case 141 /* TypeParameter */:
-                        return node === parent_1.constraint;
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                    case 142 /* Parameter */:
-                    case 218 /* VariableDeclaration */:
-                        return node === parent_1.type;
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 148 /* Constructor */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        return node === parent_1.type;
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 153 /* IndexSignature */:
-                        return node === parent_1.type;
-                    case 177 /* TypeAssertionExpression */:
-                        return node === parent_1.type;
-                    case 174 /* CallExpression */:
-                    case 175 /* NewExpression */:
-                        return parent_1.typeArguments && ts.indexOf(parent_1.typeArguments, node) >= 0;
-                    case 176 /* TaggedTemplateExpression */:
-                        // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
-                        return false;
-                }
-        }
-        return false;
-    }
-    ts.isTypeNode = isTypeNode;
-    // Warning: This has the same semantics as the forEach family of functions,
-    //          in that traversal terminates in the event that 'visitor' supplies a truthy value.
-    function forEachReturnStatement(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 211 /* ReturnStatement */:
-                    return visitor(node);
-                case 227 /* CaseBlock */:
-                case 199 /* Block */:
-                case 203 /* IfStatement */:
-                case 204 /* DoStatement */:
-                case 205 /* WhileStatement */:
-                case 206 /* ForStatement */:
-                case 207 /* ForInStatement */:
-                case 208 /* ForOfStatement */:
-                case 212 /* WithStatement */:
-                case 213 /* SwitchStatement */:
-                case 249 /* CaseClause */:
-                case 250 /* DefaultClause */:
-                case 214 /* LabeledStatement */:
-                case 216 /* TryStatement */:
-                case 252 /* CatchClause */:
-                    return ts.forEachChild(node, traverse);
-            }
-        }
-    }
-    ts.forEachReturnStatement = forEachReturnStatement;
-    function forEachYieldExpression(body, visitor) {
-        return traverse(body);
-        function traverse(node) {
-            switch (node.kind) {
-                case 190 /* YieldExpression */:
-                    visitor(node);
-                    var operand = node.expression;
-                    if (operand) {
-                        traverse(operand);
-                    }
-                case 224 /* EnumDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 225 /* ModuleDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                case 221 /* ClassDeclaration */:
-                case 192 /* ClassExpression */:
-                    // These are not allowed inside a generator now, but eventually they may be allowed
-                    // as local types. Regardless, any yield statements contained within them should be
-                    // skipped in this traversal.
-                    return;
-                default:
-                    if (isFunctionLike(node)) {
-                        var name_5 = node.name;
-                        if (name_5 && name_5.kind === 140 /* ComputedPropertyName */) {
-                            // Note that we will not include methods/accessors of a class because they would require
-                            // first descending into the class. This is by design.
-                            traverse(name_5.expression);
-                            return;
-                        }
-                    }
-                    else if (!isTypeNode(node)) {
-                        // This is the general case, which should include mostly expressions and statements.
-                        // Also includes NodeArrays.
-                        ts.forEachChild(node, traverse);
-                    }
-            }
-        }
-    }
-    ts.forEachYieldExpression = forEachYieldExpression;
-    function isVariableLike(node) {
-        if (node) {
-            switch (node.kind) {
-                case 169 /* BindingElement */:
-                case 255 /* EnumMember */:
-                case 142 /* Parameter */:
-                case 253 /* PropertyAssignment */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 218 /* VariableDeclaration */:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isVariableLike = isVariableLike;
-    function isAccessor(node) {
-        return node && (node.kind === 149 /* GetAccessor */ || node.kind === 150 /* SetAccessor */);
-    }
-    ts.isAccessor = isAccessor;
-    function isClassLike(node) {
-        return node && (node.kind === 221 /* ClassDeclaration */ || node.kind === 192 /* ClassExpression */);
-    }
-    ts.isClassLike = isClassLike;
-    function isFunctionLike(node) {
-        return node && isFunctionLikeKind(node.kind);
-    }
-    ts.isFunctionLike = isFunctionLike;
-    function isFunctionLikeKind(kind) {
-        switch (kind) {
-            case 148 /* Constructor */:
-            case 179 /* FunctionExpression */:
-            case 220 /* FunctionDeclaration */:
-            case 180 /* ArrowFunction */:
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 151 /* CallSignature */:
-            case 152 /* ConstructSignature */:
-            case 153 /* IndexSignature */:
-            case 156 /* FunctionType */:
-            case 157 /* ConstructorType */:
-                return true;
-        }
-        return false;
-    }
-    ts.isFunctionLikeKind = isFunctionLikeKind;
-    function introducesArgumentsExoticObject(node) {
-        switch (node.kind) {
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 148 /* Constructor */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 220 /* FunctionDeclaration */:
-            case 179 /* FunctionExpression */:
-                return true;
-        }
-        return false;
-    }
-    ts.introducesArgumentsExoticObject = introducesArgumentsExoticObject;
-    function isIterationStatement(node, lookInLabeledStatements) {
-        switch (node.kind) {
-            case 206 /* ForStatement */:
-            case 207 /* ForInStatement */:
-            case 208 /* ForOfStatement */:
-            case 204 /* DoStatement */:
-            case 205 /* WhileStatement */:
-                return true;
-            case 214 /* LabeledStatement */:
-                return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
-        }
-        return false;
-    }
-    ts.isIterationStatement = isIterationStatement;
-    function isFunctionBlock(node) {
-        return node && node.kind === 199 /* Block */ && isFunctionLike(node.parent);
-    }
-    ts.isFunctionBlock = isFunctionBlock;
-    function isObjectLiteralMethod(node) {
-        return node && node.kind === 147 /* MethodDeclaration */ && node.parent.kind === 171 /* ObjectLiteralExpression */;
-    }
-    ts.isObjectLiteralMethod = isObjectLiteralMethod;
-    function isIdentifierTypePredicate(predicate) {
-        return predicate && predicate.kind === 1 /* Identifier */;
-    }
-    ts.isIdentifierTypePredicate = isIdentifierTypePredicate;
-    function isThisTypePredicate(predicate) {
-        return predicate && predicate.kind === 0 /* This */;
-    }
-    ts.isThisTypePredicate = isThisTypePredicate;
-    function getContainingFunction(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isFunctionLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingFunction = getContainingFunction;
-    function getContainingClass(node) {
-        while (true) {
-            node = node.parent;
-            if (!node || isClassLike(node)) {
-                return node;
-            }
-        }
-    }
-    ts.getContainingClass = getContainingClass;
-    function getThisContainer(node, includeArrowFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return undefined;
-            }
-            switch (node.kind) {
-                case 140 /* ComputedPropertyName */:
-                    // If the grandparent node is an object literal (as opposed to a class),
-                    // then the computed property is not a 'this' container.
-                    // A computed property name in a class needs to be a this container
-                    // so that we can error on it.
-                    if (isClassLike(node.parent.parent)) {
-                        return node;
-                    }
-                    // If this is a computed property, then the parent should not
-                    // make it a this container. The parent might be a property
-                    // in an object literal, like a method or accessor. But in order for
-                    // such a parent to be a this container, the reference must be in
-                    // the *body* of the container.
-                    node = node.parent;
-                    break;
-                case 143 /* Decorator */:
-                    // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 142 /* Parameter */ && isClassElement(node.parent.parent)) {
-                        // If the decorator's parent is a Parameter, we resolve the this container from
-                        // the grandparent class declaration.
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        // If the decorator's parent is a class element, we resolve the 'this' container
-                        // from the parent class declaration.
-                        node = node.parent;
-                    }
-                    break;
-                case 180 /* ArrowFunction */:
-                    if (!includeArrowFunctions) {
-                        continue;
-                    }
-                // Fall through
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 225 /* ModuleDeclaration */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 148 /* Constructor */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                case 153 /* IndexSignature */:
-                case 224 /* EnumDeclaration */:
-                case 256 /* SourceFile */:
-                    return node;
-            }
-        }
-    }
-    ts.getThisContainer = getThisContainer;
-    /**
-      * Given an super call\property node returns a closest node where either
-      * - super call\property is legal in the node and not legal in the parent node the node.
-      *   i.e. super call is legal in constructor but not legal in the class body.
-      * - node is arrow function (so caller might need to call getSuperContainer in case it needs to climb higher)
-      * - super call\property is definitely illegal in the node (but might be legal in some subnode)
-      *   i.e. super property access is illegal in function declaration but can be legal in the statement list
-      */
-    function getSuperContainer(node, stopOnFunctions) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return node;
-            }
-            switch (node.kind) {
-                case 140 /* ComputedPropertyName */:
-                    node = node.parent;
-                    break;
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    if (!stopOnFunctions) {
-                        continue;
-                    }
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 148 /* Constructor */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                    return node;
-                case 143 /* Decorator */:
-                    // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 142 /* Parameter */ && isClassElement(node.parent.parent)) {
-                        // If the decorator's parent is a Parameter, we resolve the this container from
-                        // the grandparent class declaration.
-                        node = node.parent.parent;
-                    }
-                    else if (isClassElement(node.parent)) {
-                        // If the decorator's parent is a class element, we resolve the 'this' container
-                        // from the parent class declaration.
-                        node = node.parent;
-                    }
-                    break;
-            }
-        }
-    }
-    ts.getSuperContainer = getSuperContainer;
-    function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 179 /* FunctionExpression */ || func.kind === 180 /* ArrowFunction */) {
-            var prev = func;
-            var parent_2 = func.parent;
-            while (parent_2.kind === 178 /* ParenthesizedExpression */) {
-                prev = parent_2;
-                parent_2 = parent_2.parent;
-            }
-            if (parent_2.kind === 174 /* CallExpression */ && parent_2.expression === prev) {
-                return parent_2;
-            }
-        }
-    }
-    ts.getImmediatelyInvokedFunctionExpression = getImmediatelyInvokedFunctionExpression;
-    /**
-     * Determines whether a node is a property or element access expression for super.
-     */
-    function isSuperPropertyOrElementAccess(node) {
-        return (node.kind === 172 /* PropertyAccessExpression */
-            || node.kind === 173 /* ElementAccessExpression */)
-            && node.expression.kind === 95 /* SuperKeyword */;
-    }
-    ts.isSuperPropertyOrElementAccess = isSuperPropertyOrElementAccess;
-    function getEntityNameFromTypeNode(node) {
-        if (node) {
-            switch (node.kind) {
-                case 155 /* TypeReference */:
-                    return node.typeName;
-                case 194 /* ExpressionWithTypeArguments */:
-                    return node.expression;
-                case 69 /* Identifier */:
-                case 139 /* QualifiedName */:
-                    return node;
-            }
-        }
-        return undefined;
-    }
-    ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
-    function getInvokedExpression(node) {
-        if (node.kind === 176 /* TaggedTemplateExpression */) {
-            return node.tag;
-        }
-        // Will either be a CallExpression, NewExpression, or Decorator.
-        return node.expression;
-    }
-    ts.getInvokedExpression = getInvokedExpression;
-    function nodeCanBeDecorated(node) {
-        switch (node.kind) {
-            case 221 /* ClassDeclaration */:
-                // classes are valid targets
-                return true;
-            case 145 /* PropertyDeclaration */:
-                // property declarations are valid if their parent is a class declaration.
-                return node.parent.kind === 221 /* ClassDeclaration */;
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 147 /* MethodDeclaration */:
-                // if this method has a body and its parent is a class declaration, this is a valid target.
-                return node.body !== undefined
-                    && node.parent.kind === 221 /* ClassDeclaration */;
-            case 142 /* Parameter */:
-                // if the parameter's parent has a body and its grandparent is a class declaration, this is a valid target;
-                return node.parent.body !== undefined
-                    && (node.parent.kind === 148 /* Constructor */
-                        || node.parent.kind === 147 /* MethodDeclaration */
-                        || node.parent.kind === 150 /* SetAccessor */)
-                    && node.parent.parent.kind === 221 /* ClassDeclaration */;
-        }
-        return false;
-    }
-    ts.nodeCanBeDecorated = nodeCanBeDecorated;
-    function nodeIsDecorated(node) {
-        return node.decorators !== undefined
-            && nodeCanBeDecorated(node);
-    }
-    ts.nodeIsDecorated = nodeIsDecorated;
-    function isPropertyAccessExpression(node) {
-        return node.kind === 172 /* PropertyAccessExpression */;
-    }
-    ts.isPropertyAccessExpression = isPropertyAccessExpression;
-    function isElementAccessExpression(node) {
-        return node.kind === 173 /* ElementAccessExpression */;
-    }
-    ts.isElementAccessExpression = isElementAccessExpression;
-    function isJSXTagName(node) {
-        var parent = node.parent;
-        if (parent.kind === 243 /* JsxOpeningElement */ ||
-            parent.kind === 242 /* JsxSelfClosingElement */ ||
-            parent.kind === 245 /* JsxClosingElement */) {
-            return parent.tagName === node;
-        }
-        return false;
-    }
-    ts.isJSXTagName = isJSXTagName;
-    function isExpression(node) {
-        switch (node.kind) {
-            case 97 /* ThisKeyword */:
-            case 95 /* SuperKeyword */:
-            case 93 /* NullKeyword */:
-            case 99 /* TrueKeyword */:
-            case 84 /* FalseKeyword */:
-            case 10 /* RegularExpressionLiteral */:
-            case 170 /* ArrayLiteralExpression */:
-            case 171 /* ObjectLiteralExpression */:
-            case 172 /* PropertyAccessExpression */:
-            case 173 /* ElementAccessExpression */:
-            case 174 /* CallExpression */:
-            case 175 /* NewExpression */:
-            case 176 /* TaggedTemplateExpression */:
-            case 195 /* AsExpression */:
-            case 177 /* TypeAssertionExpression */:
-            case 196 /* NonNullExpression */:
-            case 178 /* ParenthesizedExpression */:
-            case 179 /* FunctionExpression */:
-            case 192 /* ClassExpression */:
-            case 180 /* ArrowFunction */:
-            case 183 /* VoidExpression */:
-            case 181 /* DeleteExpression */:
-            case 182 /* TypeOfExpression */:
-            case 185 /* PrefixUnaryExpression */:
-            case 186 /* PostfixUnaryExpression */:
-            case 187 /* BinaryExpression */:
-            case 188 /* ConditionalExpression */:
-            case 191 /* SpreadElementExpression */:
-            case 189 /* TemplateExpression */:
-            case 11 /* NoSubstitutionTemplateLiteral */:
-            case 193 /* OmittedExpression */:
-            case 241 /* JsxElement */:
-            case 242 /* JsxSelfClosingElement */:
-            case 190 /* YieldExpression */:
-            case 184 /* AwaitExpression */:
-                return true;
-            case 139 /* QualifiedName */:
-                while (node.parent.kind === 139 /* QualifiedName */) {
-                    node = node.parent;
-                }
-                return node.parent.kind === 158 /* TypeQuery */ || isJSXTagName(node);
-            case 69 /* Identifier */:
-                if (node.parent.kind === 158 /* TypeQuery */ || isJSXTagName(node)) {
-                    return true;
-                }
-            // fall through
-            case 8 /* NumericLiteral */:
-            case 9 /* StringLiteral */:
-            case 97 /* ThisKeyword */:
-                var parent_3 = node.parent;
-                switch (parent_3.kind) {
-                    case 218 /* VariableDeclaration */:
-                    case 142 /* Parameter */:
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                    case 255 /* EnumMember */:
-                    case 253 /* PropertyAssignment */:
-                    case 169 /* BindingElement */:
-                        return parent_3.initializer === node;
-                    case 202 /* ExpressionStatement */:
-                    case 203 /* IfStatement */:
-                    case 204 /* DoStatement */:
-                    case 205 /* WhileStatement */:
-                    case 211 /* ReturnStatement */:
-                    case 212 /* WithStatement */:
-                    case 213 /* SwitchStatement */:
-                    case 249 /* CaseClause */:
-                    case 215 /* ThrowStatement */:
-                    case 213 /* SwitchStatement */:
-                        return parent_3.expression === node;
-                    case 206 /* ForStatement */:
-                        var forStatement = parent_3;
-                        return (forStatement.initializer === node && forStatement.initializer.kind !== 219 /* VariableDeclarationList */) ||
-                            forStatement.condition === node ||
-                            forStatement.incrementor === node;
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                        var forInStatement = parent_3;
-                        return (forInStatement.initializer === node && forInStatement.initializer.kind !== 219 /* VariableDeclarationList */) ||
-                            forInStatement.expression === node;
-                    case 177 /* TypeAssertionExpression */:
-                    case 195 /* AsExpression */:
-                        return node === parent_3.expression;
-                    case 197 /* TemplateSpan */:
-                        return node === parent_3.expression;
-                    case 140 /* ComputedPropertyName */:
-                        return node === parent_3.expression;
-                    case 143 /* Decorator */:
-                    case 248 /* JsxExpression */:
-                    case 247 /* JsxSpreadAttribute */:
-                        return true;
-                    case 194 /* ExpressionWithTypeArguments */:
-                        return parent_3.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent_3);
-                    default:
-                        if (isExpression(parent_3)) {
-                            return true;
-                        }
-                }
-        }
-        return false;
-    }
-    ts.isExpression = isExpression;
-    function isExternalModuleNameRelative(moduleName) {
-        // TypeScript 1.0 spec (April 2014): 11.2.1
-        // An external module name is "relative" if the first term is "." or "..".
-        return moduleName.substr(0, 2) === "./" || moduleName.substr(0, 3) === "../" || moduleName.substr(0, 2) === ".\\" || moduleName.substr(0, 3) === "..\\";
-    }
-    ts.isExternalModuleNameRelative = isExternalModuleNameRelative;
-    function isInstantiatedModule(node, preserveConstEnums) {
-        var moduleState = ts.getModuleInstanceState(node);
-        return moduleState === 1 /* Instantiated */ ||
-            (preserveConstEnums && moduleState === 2 /* ConstEnumOnly */);
-    }
-    ts.isInstantiatedModule = isInstantiatedModule;
-    function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 229 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 240 /* ExternalModuleReference */;
-    }
-    ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
-    function getExternalModuleImportEqualsDeclarationExpression(node) {
-        ts.Debug.assert(isExternalModuleImportEqualsDeclaration(node));
-        return node.moduleReference.expression;
-    }
-    ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
-    function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 229 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 240 /* ExternalModuleReference */;
-    }
-    ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
-    function isSourceFileJavaScript(file) {
-        return isInJavaScriptFile(file);
-    }
-    ts.isSourceFileJavaScript = isSourceFileJavaScript;
-    function isInJavaScriptFile(node) {
-        return node && !!(node.flags & 134217728 /* JavaScriptFile */);
-    }
-    ts.isInJavaScriptFile = isInJavaScriptFile;
-    /**
-     * Returns true if the node is a CallExpression to the identifier 'require' with
-     * exactly one argument.
-     * This function does not test if the node is in a JavaScript file or not.
-    */
-    function isRequireCall(expression, checkArgumentIsStringLiteral) {
-        // of the form 'require("name")'
-        var isRequire = expression.kind === 174 /* CallExpression */ &&
-            expression.expression.kind === 69 /* Identifier */ &&
-            expression.expression.text === "require" &&
-            expression.arguments.length === 1;
-        return isRequire && (!checkArgumentIsStringLiteral || expression.arguments[0].kind === 9 /* StringLiteral */);
-    }
-    ts.isRequireCall = isRequireCall;
-    function isSingleOrDoubleQuote(charCode) {
-        return charCode === 39 /* singleQuote */ || charCode === 34 /* doubleQuote */;
-    }
-    ts.isSingleOrDoubleQuote = isSingleOrDoubleQuote;
-    /**
-     * Returns true if the node is a variable declaration whose initializer is a function expression.
-     * This function does not test if the node is in a JavaScript file or not.
-     */
-    function isDeclarationOfFunctionExpression(s) {
-        if (s.valueDeclaration && s.valueDeclaration.kind === 218 /* VariableDeclaration */) {
-            var declaration = s.valueDeclaration;
-            return declaration.initializer && declaration.initializer.kind === 179 /* FunctionExpression */;
-        }
-        return false;
-    }
-    ts.isDeclarationOfFunctionExpression = isDeclarationOfFunctionExpression;
-    /// Given a BinaryExpression, returns SpecialPropertyAssignmentKind for the various kinds of property
-    /// assignments we treat as special in the binder
-    function getSpecialPropertyAssignmentKind(expression) {
-        if (!isInJavaScriptFile(expression)) {
-            return 0 /* None */;
-        }
-        if (expression.kind !== 187 /* BinaryExpression */) {
-            return 0 /* None */;
-        }
-        var expr = expression;
-        if (expr.operatorToken.kind !== 56 /* EqualsToken */ || expr.left.kind !== 172 /* PropertyAccessExpression */) {
-            return 0 /* None */;
-        }
-        var lhs = expr.left;
-        if (lhs.expression.kind === 69 /* Identifier */) {
-            var lhsId = lhs.expression;
-            if (lhsId.text === "exports") {
-                // exports.name = expr
-                return 1 /* ExportsProperty */;
-            }
-            else if (lhsId.text === "module" && lhs.name.text === "exports") {
-                // module.exports = expr
-                return 2 /* ModuleExports */;
-            }
-        }
-        else if (lhs.expression.kind === 97 /* ThisKeyword */) {
-            return 4 /* ThisProperty */;
-        }
-        else if (lhs.expression.kind === 172 /* PropertyAccessExpression */) {
-            // chained dot, e.g. x.y.z = expr; this var is the 'x.y' part
-            var innerPropertyAccess = lhs.expression;
-            if (innerPropertyAccess.expression.kind === 69 /* Identifier */) {
-                // module.exports.name = expr
-                var innerPropertyAccessIdentifier = innerPropertyAccess.expression;
-                if (innerPropertyAccessIdentifier.text === "module" && innerPropertyAccess.name.text === "exports") {
-                    return 1 /* ExportsProperty */;
-                }
-                if (innerPropertyAccess.name.text === "prototype") {
-                    return 3 /* PrototypeProperty */;
-                }
-            }
-        }
-        return 0 /* None */;
-    }
-    ts.getSpecialPropertyAssignmentKind = getSpecialPropertyAssignmentKind;
-    function getExternalModuleName(node) {
-        if (node.kind === 230 /* ImportDeclaration */) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 229 /* ImportEqualsDeclaration */) {
-            var reference = node.moduleReference;
-            if (reference.kind === 240 /* ExternalModuleReference */) {
-                return reference.expression;
-            }
-        }
-        if (node.kind === 236 /* ExportDeclaration */) {
-            return node.moduleSpecifier;
-        }
-        if (node.kind === 225 /* ModuleDeclaration */ && node.name.kind === 9 /* StringLiteral */) {
-            return node.name;
-        }
-    }
-    ts.getExternalModuleName = getExternalModuleName;
-    function hasQuestionToken(node) {
-        if (node) {
-            switch (node.kind) {
-                case 142 /* Parameter */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 253 /* PropertyAssignment */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    return node.questionToken !== undefined;
-            }
-        }
-        return false;
-    }
-    ts.hasQuestionToken = hasQuestionToken;
-    function isJSDocConstructSignature(node) {
-        return node.kind === 269 /* JSDocFunctionType */ &&
-            node.parameters.length > 0 &&
-            node.parameters[0].type.kind === 271 /* JSDocConstructorType */;
-    }
-    ts.isJSDocConstructSignature = isJSDocConstructSignature;
-    function getJSDocTag(node, kind, checkParentVariableStatement) {
-        if (!node) {
-            return undefined;
-        }
-        var jsDocComments = getJSDocComments(node, checkParentVariableStatement);
-        if (!jsDocComments) {
-            return undefined;
-        }
-        for (var _i = 0, jsDocComments_1 = jsDocComments; _i < jsDocComments_1.length; _i++) {
-            var jsDocComment = jsDocComments_1[_i];
-            for (var _a = 0, _b = jsDocComment.tags; _a < _b.length; _a++) {
-                var tag = _b[_a];
-                if (tag.kind === kind) {
-                    return tag;
-                }
-            }
-        }
-    }
-    function getJSDocComments(node, checkParentVariableStatement) {
-        if (node.jsDocComments) {
-            return node.jsDocComments;
-        }
-        // Try to recognize this pattern when node is initializer of variable declaration and JSDoc comments are on containing variable statement.
-        // /**
-        //   * @param {number} name
-        //   * @returns {number}
-        //   */
-        // var x = function(name) { return name.length; }
-        if (checkParentVariableStatement) {
-            var isInitializerOfVariableDeclarationInStatement = node.parent.kind === 218 /* VariableDeclaration */ &&
-                node.parent.initializer === node &&
-                node.parent.parent.parent.kind === 200 /* VariableStatement */;
-            var variableStatementNode = isInitializerOfVariableDeclarationInStatement ? node.parent.parent.parent : undefined;
-            if (variableStatementNode) {
-                return variableStatementNode.jsDocComments;
-            }
-            // Also recognize when the node is the RHS of an assignment expression
-            var parent_4 = node.parent;
-            var isSourceOfAssignmentExpressionStatement = parent_4 && parent_4.parent &&
-                parent_4.kind === 187 /* BinaryExpression */ &&
-                parent_4.operatorToken.kind === 56 /* EqualsToken */ &&
-                parent_4.parent.kind === 202 /* ExpressionStatement */;
-            if (isSourceOfAssignmentExpressionStatement) {
-                return parent_4.parent.jsDocComments;
-            }
-            var isPropertyAssignmentExpression = parent_4 && parent_4.kind === 253 /* PropertyAssignment */;
-            if (isPropertyAssignmentExpression) {
-                return parent_4.jsDocComments;
-            }
-        }
-        return undefined;
-    }
-    function getJSDocTypeTag(node) {
-        return getJSDocTag(node, 277 /* JSDocTypeTag */, /*checkParentVariableStatement*/ false);
-    }
-    ts.getJSDocTypeTag = getJSDocTypeTag;
-    function getJSDocReturnTag(node) {
-        return getJSDocTag(node, 276 /* JSDocReturnTag */, /*checkParentVariableStatement*/ true);
-    }
-    ts.getJSDocReturnTag = getJSDocReturnTag;
-    function getJSDocTemplateTag(node) {
-        return getJSDocTag(node, 278 /* JSDocTemplateTag */, /*checkParentVariableStatement*/ false);
-    }
-    ts.getJSDocTemplateTag = getJSDocTemplateTag;
-    function getCorrespondingJSDocParameterTag(parameter) {
-        if (parameter.name && parameter.name.kind === 69 /* Identifier */) {
-            // If it's a parameter, see if the parent has a jsdoc comment with an @param
-            // annotation.
-            var parameterName = parameter.name.text;
-            var jsDocComments = getJSDocComments(parameter.parent, /*checkParentVariableStatement*/ true);
-            if (jsDocComments) {
-                for (var _i = 0, jsDocComments_2 = jsDocComments; _i < jsDocComments_2.length; _i++) {
-                    var jsDocComment = jsDocComments_2[_i];
-                    for (var _a = 0, _b = jsDocComment.tags; _a < _b.length; _a++) {
-                        var tag = _b[_a];
-                        if (tag.kind === 275 /* JSDocParameterTag */) {
-                            var parameterTag = tag;
-                            var name_6 = parameterTag.preParameterName || parameterTag.postParameterName;
-                            if (name_6.text === parameterName) {
-                                return parameterTag;
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getCorrespondingJSDocParameterTag = getCorrespondingJSDocParameterTag;
-    function hasRestParameter(s) {
-        return isRestParameter(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasRestParameter = hasRestParameter;
-    function hasDeclaredRestParameter(s) {
-        return isDeclaredRestParam(ts.lastOrUndefined(s.parameters));
-    }
-    ts.hasDeclaredRestParameter = hasDeclaredRestParameter;
-    function isRestParameter(node) {
-        if (node && (node.flags & 134217728 /* JavaScriptFile */)) {
-            if (node.type && node.type.kind === 270 /* JSDocVariadicType */) {
-                return true;
-            }
-            var paramTag = getCorrespondingJSDocParameterTag(node);
-            if (paramTag && paramTag.typeExpression) {
-                return paramTag.typeExpression.type.kind === 270 /* JSDocVariadicType */;
-            }
-        }
-        return isDeclaredRestParam(node);
-    }
-    ts.isRestParameter = isRestParameter;
-    function isDeclaredRestParam(node) {
-        return node && node.dotDotDotToken !== undefined;
-    }
-    ts.isDeclaredRestParam = isDeclaredRestParam;
-    function isLiteralKind(kind) {
-        return 8 /* FirstLiteralToken */ <= kind && kind <= 11 /* LastLiteralToken */;
-    }
-    ts.isLiteralKind = isLiteralKind;
-    function isTextualLiteralKind(kind) {
-        return kind === 9 /* StringLiteral */ || kind === 11 /* NoSubstitutionTemplateLiteral */;
-    }
-    ts.isTextualLiteralKind = isTextualLiteralKind;
-    function isTemplateLiteralKind(kind) {
-        return 11 /* FirstTemplateToken */ <= kind && kind <= 14 /* LastTemplateToken */;
-    }
-    ts.isTemplateLiteralKind = isTemplateLiteralKind;
-    function isBindingPattern(node) {
-        return !!node && (node.kind === 168 /* ArrayBindingPattern */ || node.kind === 167 /* ObjectBindingPattern */);
-    }
-    ts.isBindingPattern = isBindingPattern;
-    // A node is an assignment target if it is on the left hand side of an '=' token, if it is parented by a property
-    // assignment in an object literal that is an assignment target, or if it is parented by an array literal that is
-    // an assignment target. Examples include 'a = xxx', '{ p: a } = xxx', '[{ p: a}] = xxx'.
-    function isAssignmentTarget(node) {
-        while (node.parent.kind === 178 /* ParenthesizedExpression */) {
-            node = node.parent;
-        }
-        while (true) {
-            var parent_5 = node.parent;
-            if (parent_5.kind === 170 /* ArrayLiteralExpression */ || parent_5.kind === 191 /* SpreadElementExpression */) {
-                node = parent_5;
-                continue;
-            }
-            if (parent_5.kind === 253 /* PropertyAssignment */ || parent_5.kind === 254 /* ShorthandPropertyAssignment */) {
-                node = parent_5.parent;
-                continue;
-            }
-            return parent_5.kind === 187 /* BinaryExpression */ &&
-                parent_5.operatorToken.kind === 56 /* EqualsToken */ &&
-                parent_5.left === node ||
-                (parent_5.kind === 207 /* ForInStatement */ || parent_5.kind === 208 /* ForOfStatement */) &&
-                    parent_5.initializer === node;
-        }
-    }
-    ts.isAssignmentTarget = isAssignmentTarget;
-    function isNodeDescendentOf(node, ancestor) {
-        while (node) {
-            if (node === ancestor)
-                return true;
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isNodeDescendentOf = isNodeDescendentOf;
-    function isInAmbientContext(node) {
-        while (node) {
-            if (node.flags & 2 /* Ambient */ || (node.kind === 256 /* SourceFile */ && node.isDeclarationFile)) {
-                return true;
-            }
-            node = node.parent;
-        }
-        return false;
-    }
-    ts.isInAmbientContext = isInAmbientContext;
-    function isDeclaration(node) {
-        switch (node.kind) {
-            case 180 /* ArrowFunction */:
-            case 169 /* BindingElement */:
-            case 221 /* ClassDeclaration */:
-            case 192 /* ClassExpression */:
-            case 148 /* Constructor */:
-            case 224 /* EnumDeclaration */:
-            case 255 /* EnumMember */:
-            case 238 /* ExportSpecifier */:
-            case 220 /* FunctionDeclaration */:
-            case 179 /* FunctionExpression */:
-            case 149 /* GetAccessor */:
-            case 231 /* ImportClause */:
-            case 229 /* ImportEqualsDeclaration */:
-            case 234 /* ImportSpecifier */:
-            case 222 /* InterfaceDeclaration */:
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 225 /* ModuleDeclaration */:
-            case 232 /* NamespaceImport */:
-            case 142 /* Parameter */:
-            case 253 /* PropertyAssignment */:
-            case 145 /* PropertyDeclaration */:
-            case 144 /* PropertySignature */:
-            case 150 /* SetAccessor */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 223 /* TypeAliasDeclaration */:
-            case 141 /* TypeParameter */:
-            case 218 /* VariableDeclaration */:
-            case 279 /* JSDocTypedefTag */:
-                return true;
-        }
-        return false;
-    }
-    ts.isDeclaration = isDeclaration;
-    function isStatement(n) {
-        switch (n.kind) {
-            case 210 /* BreakStatement */:
-            case 209 /* ContinueStatement */:
-            case 217 /* DebuggerStatement */:
-            case 204 /* DoStatement */:
-            case 202 /* ExpressionStatement */:
-            case 201 /* EmptyStatement */:
-            case 207 /* ForInStatement */:
-            case 208 /* ForOfStatement */:
-            case 206 /* ForStatement */:
-            case 203 /* IfStatement */:
-            case 214 /* LabeledStatement */:
-            case 211 /* ReturnStatement */:
-            case 213 /* SwitchStatement */:
-            case 215 /* ThrowStatement */:
-            case 216 /* TryStatement */:
-            case 200 /* VariableStatement */:
-            case 205 /* WhileStatement */:
-            case 212 /* WithStatement */:
-            case 235 /* ExportAssignment */:
-                return true;
-            default:
-                return false;
-        }
-    }
-    ts.isStatement = isStatement;
-    function isClassElement(n) {
-        switch (n.kind) {
-            case 148 /* Constructor */:
-            case 145 /* PropertyDeclaration */:
-            case 147 /* MethodDeclaration */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 146 /* MethodSignature */:
-            case 153 /* IndexSignature */:
-                return true;
-            default:
-                return false;
-        }
-    }
-    ts.isClassElement = isClassElement;
-    // True if the given identifier, string literal, or number literal is the name of a declaration node
-    function isDeclarationName(name) {
-        if (name.kind !== 69 /* Identifier */ && name.kind !== 9 /* StringLiteral */ && name.kind !== 8 /* NumericLiteral */) {
-            return false;
-        }
-        var parent = name.parent;
-        if (parent.kind === 234 /* ImportSpecifier */ || parent.kind === 238 /* ExportSpecifier */) {
-            if (parent.propertyName) {
-                return true;
-            }
-        }
-        if (isDeclaration(parent)) {
-            return parent.name === name;
-        }
-        return false;
-    }
-    ts.isDeclarationName = isDeclarationName;
-    function isLiteralComputedPropertyDeclarationName(node) {
-        return (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) &&
-            node.parent.kind === 140 /* ComputedPropertyName */ &&
-            isDeclaration(node.parent.parent);
-    }
-    ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
-    // Return true if the given identifier is classified as an IdentifierName
-    function isIdentifierName(node) {
-        var parent = node.parent;
-        switch (parent.kind) {
-            case 145 /* PropertyDeclaration */:
-            case 144 /* PropertySignature */:
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 255 /* EnumMember */:
-            case 253 /* PropertyAssignment */:
-            case 172 /* PropertyAccessExpression */:
-                // Name in member declaration or property name in property access
-                return parent.name === node;
-            case 139 /* QualifiedName */:
-                // Name on right hand side of dot in a type query
-                if (parent.right === node) {
-                    while (parent.kind === 139 /* QualifiedName */) {
-                        parent = parent.parent;
-                    }
-                    return parent.kind === 158 /* TypeQuery */;
-                }
-                return false;
-            case 169 /* BindingElement */:
-            case 234 /* ImportSpecifier */:
-                // Property name in binding element or import specifier
-                return parent.propertyName === node;
-            case 238 /* ExportSpecifier */:
-                // Any name in an export specifier
-                return true;
-        }
-        return false;
-    }
-    ts.isIdentifierName = isIdentifierName;
-    // An alias symbol is created by one of the following declarations:
-    // import <symbol> = ...
-    // import <symbol> from ...
-    // import * as <symbol> from ...
-    // import { x as <symbol> } from ...
-    // export { x as <symbol> } from ...
-    // export = ...
-    // export default ...
-    function isAliasSymbolDeclaration(node) {
-        return node.kind === 229 /* ImportEqualsDeclaration */ ||
-            node.kind === 228 /* NamespaceExportDeclaration */ ||
-            node.kind === 231 /* ImportClause */ && !!node.name ||
-            node.kind === 232 /* NamespaceImport */ ||
-            node.kind === 234 /* ImportSpecifier */ ||
-            node.kind === 238 /* ExportSpecifier */ ||
-            node.kind === 235 /* ExportAssignment */ && node.expression.kind === 69 /* Identifier */;
-    }
-    ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
-    function getClassExtendsHeritageClauseElement(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 83 /* ExtendsKeyword */);
-        return heritageClause && heritageClause.types.length > 0 ? heritageClause.types[0] : undefined;
-    }
-    ts.getClassExtendsHeritageClauseElement = getClassExtendsHeritageClauseElement;
-    function getClassImplementsHeritageClauseElements(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 106 /* ImplementsKeyword */);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getClassImplementsHeritageClauseElements = getClassImplementsHeritageClauseElements;
-    function getInterfaceBaseTypeNodes(node) {
-        var heritageClause = getHeritageClause(node.heritageClauses, 83 /* ExtendsKeyword */);
-        return heritageClause ? heritageClause.types : undefined;
-    }
-    ts.getInterfaceBaseTypeNodes = getInterfaceBaseTypeNodes;
-    function getHeritageClause(clauses, kind) {
-        if (clauses) {
-            for (var _i = 0, clauses_1 = clauses; _i < clauses_1.length; _i++) {
-                var clause = clauses_1[_i];
-                if (clause.token === kind) {
-                    return clause;
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getHeritageClause = getHeritageClause;
-    function tryResolveScriptReference(host, sourceFile, reference) {
-        if (!host.getCompilerOptions().noResolve) {
-            var referenceFileName = ts.isRootedDiskPath(reference.fileName) ? reference.fileName : ts.combinePaths(ts.getDirectoryPath(sourceFile.fileName), reference.fileName);
-            return host.getSourceFile(referenceFileName);
-        }
-    }
-    ts.tryResolveScriptReference = tryResolveScriptReference;
-    function getAncestor(node, kind) {
-        while (node) {
-            if (node.kind === kind) {
-                return node;
-            }
-            node = node.parent;
-        }
-        return undefined;
-    }
-    ts.getAncestor = getAncestor;
-    function getFileReferenceFromReferencePath(comment, commentRange) {
-        var simpleReferenceRegEx = /^\/\/\/\s*<reference\s+/gim;
-        var isNoDefaultLibRegEx = /^(\/\/\/\s*<reference\s+no-default-lib\s*=\s*)('|")(.+?)\2\s*\/>/gim;
-        if (simpleReferenceRegEx.test(comment)) {
-            if (isNoDefaultLibRegEx.test(comment)) {
-                return {
-                    isNoDefaultLib: true
-                };
-            }
-            else {
-                var refMatchResult = ts.fullTripleSlashReferencePathRegEx.exec(comment);
-                var refLibResult = !refMatchResult && ts.fullTripleSlashReferenceTypeReferenceDirectiveRegEx.exec(comment);
-                if (refMatchResult || refLibResult) {
-                    var start = commentRange.pos;
-                    var end = commentRange.end;
-                    return {
-                        fileReference: {
-                            pos: start,
-                            end: end,
-                            fileName: (refMatchResult || refLibResult)[3]
-                        },
-                        isNoDefaultLib: false,
-                        isTypeReferenceDirective: !!refLibResult
-                    };
-                }
-                return {
-                    diagnosticMessage: ts.Diagnostics.Invalid_reference_directive_syntax,
-                    isNoDefaultLib: false
-                };
-            }
-        }
-        return undefined;
-    }
-    ts.getFileReferenceFromReferencePath = getFileReferenceFromReferencePath;
-    function isKeyword(token) {
-        return 70 /* FirstKeyword */ <= token && token <= 138 /* LastKeyword */;
-    }
-    ts.isKeyword = isKeyword;
-    function isTrivia(token) {
-        return 2 /* FirstTriviaToken */ <= token && token <= 7 /* LastTriviaToken */;
-    }
-    ts.isTrivia = isTrivia;
-    function isAsyncFunctionLike(node) {
-        return isFunctionLike(node) && (node.flags & 256 /* Async */) !== 0 && !isAccessor(node);
-    }
-    ts.isAsyncFunctionLike = isAsyncFunctionLike;
-    function isStringOrNumericLiteral(kind) {
-        return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */;
-    }
-    ts.isStringOrNumericLiteral = isStringOrNumericLiteral;
-    /**
-     * A declaration has a dynamic name if both of the following are true:
-     *   1. The declaration has a computed property name
-     *   2. The computed name is *not* expressed as Symbol.<name>, where name
-     *      is a property of the Symbol constructor that denotes a built in
-     *      Symbol.
-     */
-    function hasDynamicName(declaration) {
-        return declaration.name && isDynamicName(declaration.name);
-    }
-    ts.hasDynamicName = hasDynamicName;
-    function isDynamicName(name) {
-        return name.kind === 140 /* ComputedPropertyName */ &&
-            !isStringOrNumericLiteral(name.expression.kind) &&
-            !isWellKnownSymbolSyntactically(name.expression);
-    }
-    ts.isDynamicName = isDynamicName;
-    /**
-     * Checks if the expression is of the form:
-     *    Symbol.name
-     * where Symbol is literally the word "Symbol", and name is any identifierName
-     */
-    function isWellKnownSymbolSyntactically(node) {
-        return isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
-    }
-    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
-    function getPropertyNameForPropertyNameNode(name) {
-        if (name.kind === 69 /* Identifier */ || name.kind === 9 /* StringLiteral */ || name.kind === 8 /* NumericLiteral */ || name.kind === 142 /* Parameter */) {
-            return name.text;
-        }
-        if (name.kind === 140 /* ComputedPropertyName */) {
-            var nameExpression = name.expression;
-            if (isWellKnownSymbolSyntactically(nameExpression)) {
-                var rightHandSideName = nameExpression.name.text;
-                return getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            else if (nameExpression.kind === 9 /* StringLiteral */ || nameExpression.kind === 8 /* NumericLiteral */) {
-                return nameExpression.text;
-            }
-        }
-        return undefined;
-    }
-    ts.getPropertyNameForPropertyNameNode = getPropertyNameForPropertyNameNode;
-    function getPropertyNameForKnownSymbolName(symbolName) {
-        return "__@" + symbolName;
-    }
-    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
-    /**
-     * Includes the word "Symbol" with unicode escapes
-     */
-    function isESSymbolIdentifier(node) {
-        return node.kind === 69 /* Identifier */ && node.text === "Symbol";
-    }
-    ts.isESSymbolIdentifier = isESSymbolIdentifier;
-    function isModifierKind(token) {
-        switch (token) {
-            case 115 /* AbstractKeyword */:
-            case 118 /* AsyncKeyword */:
-            case 74 /* ConstKeyword */:
-            case 122 /* DeclareKeyword */:
-            case 77 /* DefaultKeyword */:
-            case 82 /* ExportKeyword */:
-            case 112 /* PublicKeyword */:
-            case 110 /* PrivateKeyword */:
-            case 111 /* ProtectedKeyword */:
-            case 128 /* ReadonlyKeyword */:
-            case 113 /* StaticKeyword */:
-                return true;
-        }
-        return false;
-    }
-    ts.isModifierKind = isModifierKind;
-    function isParameterDeclaration(node) {
-        var root = getRootDeclaration(node);
-        return root.kind === 142 /* Parameter */;
-    }
-    ts.isParameterDeclaration = isParameterDeclaration;
-    function getRootDeclaration(node) {
-        while (node.kind === 169 /* BindingElement */) {
-            node = node.parent.parent;
-        }
-        return node;
-    }
-    ts.getRootDeclaration = getRootDeclaration;
-    function nodeStartsNewLexicalEnvironment(n) {
-        return isFunctionLike(n) || n.kind === 225 /* ModuleDeclaration */ || n.kind === 256 /* SourceFile */;
-    }
-    ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
-    /**
-     * Creates a shallow, memberwise clone of a node. The "kind", "pos", "end", "flags", and "parent"
-     * properties are excluded by default, and can be provided via the "location", "flags", and
-     * "parent" parameters.
-     * @param node The node to clone.
-     * @param location An optional TextRange to use to supply the new position.
-     * @param flags The NodeFlags to use for the cloned node.
-     * @param parent The parent for the new node.
-     */
-    function cloneNode(node, location, flags, parent) {
-        // We don't use "clone" from core.ts here, as we need to preserve the prototype chain of
-        // the original node. We also need to exclude specific properties and only include own-
-        // properties (to skip members already defined on the shared prototype).
-        var clone = location !== undefined
-            ? ts.createNode(node.kind, location.pos, location.end)
-            : createSynthesizedNode(node.kind);
-        for (var key in node) {
-            if (clone.hasOwnProperty(key) || !node.hasOwnProperty(key)) {
-                continue;
-            }
-            clone[key] = node[key];
-        }
-        if (flags !== undefined) {
-            clone.flags = flags;
-        }
-        if (parent !== undefined) {
-            clone.parent = parent;
-        }
-        return clone;
-    }
-    ts.cloneNode = cloneNode;
-    /**
-     * Creates a deep clone of an EntityName, with new parent pointers.
-     * @param node The EntityName to clone.
-     * @param parent The parent for the cloned node.
-     */
-    function cloneEntityName(node, parent) {
-        var clone = cloneNode(node, node, node.flags, parent);
-        if (isQualifiedName(clone)) {
-            var left = clone.left, right = clone.right;
-            clone.left = cloneEntityName(left, clone);
-            clone.right = cloneNode(right, right, right.flags, parent);
-        }
-        return clone;
-    }
-    ts.cloneEntityName = cloneEntityName;
-    function isQualifiedName(node) {
-        return node.kind === 139 /* QualifiedName */;
-    }
-    ts.isQualifiedName = isQualifiedName;
-    function nodeIsSynthesized(node) {
-        return node.pos === -1;
-    }
-    ts.nodeIsSynthesized = nodeIsSynthesized;
-    function createSynthesizedNode(kind, startsOnNewLine) {
-        var node = ts.createNode(kind, /* pos */ -1, /* end */ -1);
-        node.startsOnNewLine = startsOnNewLine;
-        return node;
-    }
-    ts.createSynthesizedNode = createSynthesizedNode;
-    function createSynthesizedNodeArray() {
-        var array = [];
-        array.pos = -1;
-        array.end = -1;
-        return array;
-    }
-    ts.createSynthesizedNodeArray = createSynthesizedNodeArray;
-    function createDiagnosticCollection() {
-        var nonFileDiagnostics = [];
-        var fileDiagnostics = {};
-        var diagnosticsModified = false;
-        var modificationCount = 0;
-        return {
-            add: add,
-            getGlobalDiagnostics: getGlobalDiagnostics,
-            getDiagnostics: getDiagnostics,
-            getModificationCount: getModificationCount,
-            reattachFileDiagnostics: reattachFileDiagnostics
-        };
-        function getModificationCount() {
-            return modificationCount;
-        }
-        function reattachFileDiagnostics(newFile) {
-            if (!ts.hasProperty(fileDiagnostics, newFile.fileName)) {
-                return;
-            }
-            for (var _i = 0, _a = fileDiagnostics[newFile.fileName]; _i < _a.length; _i++) {
-                var diagnostic = _a[_i];
-                diagnostic.file = newFile;
-            }
-        }
-        function add(diagnostic) {
-            var diagnostics;
-            if (diagnostic.file) {
-                diagnostics = fileDiagnostics[diagnostic.file.fileName];
-                if (!diagnostics) {
-                    diagnostics = [];
-                    fileDiagnostics[diagnostic.file.fileName] = diagnostics;
-                }
-            }
-            else {
-                diagnostics = nonFileDiagnostics;
-            }
-            diagnostics.push(diagnostic);
-            diagnosticsModified = true;
-            modificationCount++;
-        }
-        function getGlobalDiagnostics() {
-            sortAndDeduplicate();
-            return nonFileDiagnostics;
-        }
-        function getDiagnostics(fileName) {
-            sortAndDeduplicate();
-            if (fileName) {
-                return fileDiagnostics[fileName] || [];
-            }
-            var allDiagnostics = [];
-            function pushDiagnostic(d) {
-                allDiagnostics.push(d);
-            }
-            ts.forEach(nonFileDiagnostics, pushDiagnostic);
-            for (var key in fileDiagnostics) {
-                if (ts.hasProperty(fileDiagnostics, key)) {
-                    ts.forEach(fileDiagnostics[key], pushDiagnostic);
-                }
-            }
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function sortAndDeduplicate() {
-            if (!diagnosticsModified) {
-                return;
-            }
-            diagnosticsModified = false;
-            nonFileDiagnostics = ts.sortAndDeduplicateDiagnostics(nonFileDiagnostics);
-            for (var key in fileDiagnostics) {
-                if (ts.hasProperty(fileDiagnostics, key)) {
-                    fileDiagnostics[key] = ts.sortAndDeduplicateDiagnostics(fileDiagnostics[key]);
-                }
-            }
-        }
-    }
-    ts.createDiagnosticCollection = createDiagnosticCollection;
-    // This consists of the first 19 unprintable ASCII characters, canonical escapes, lineSeparator,
-    // paragraphSeparator, and nextLine. The latter three are just desirable to suppress new lines in
-    // the language service. These characters should be escaped when printing, and if any characters are added,
-    // the map below must be updated. Note that this regexp *does not* include the 'delete' character.
-    // There is no reason for this other than that JSON.stringify does not handle it either.
-    var escapedCharsRegExp = /[\\\"\u0000-\u001f\t\v\f\b\r\n\u2028\u2029\u0085]/g;
-    var escapedCharsMap = {
-        "\0": "\\0",
-        "\t": "\\t",
-        "\v": "\\v",
-        "\f": "\\f",
-        "\b": "\\b",
-        "\r": "\\r",
-        "\n": "\\n",
-        "\\": "\\\\",
-        "\"": "\\\"",
-        "\u2028": "\\u2028",
-        "\u2029": "\\u2029",
-        "\u0085": "\\u0085" // nextLine
-    };
-    /**
-     * Based heavily on the abstract 'Quote'/'QuoteJSONString' operation from ECMA-262 (24.3.2.2),
-     * but augmented for a few select characters (e.g. lineSeparator, paragraphSeparator, nextLine)
-     * Note that this doesn't actually wrap the input in double quotes.
-     */
-    function escapeString(s) {
-        s = escapedCharsRegExp.test(s) ? s.replace(escapedCharsRegExp, getReplacement) : s;
-        return s;
-        function getReplacement(c) {
-            return escapedCharsMap[c] || get16BitUnicodeEscapeSequence(c.charCodeAt(0));
-        }
-    }
-    ts.escapeString = escapeString;
-    function isIntrinsicJsxName(name) {
-        var ch = name.substr(0, 1);
-        return ch.toLowerCase() === ch;
-    }
-    ts.isIntrinsicJsxName = isIntrinsicJsxName;
-    function get16BitUnicodeEscapeSequence(charCode) {
-        var hexCharCode = charCode.toString(16).toUpperCase();
-        var paddedHexCode = ("0000" + hexCharCode).slice(-4);
-        return "\\u" + paddedHexCode;
-    }
-    var nonAsciiCharacters = /[^\u0000-\u007F]/g;
-    function escapeNonAsciiCharacters(s) {
-        // Replace non-ASCII characters with '\uNNNN' escapes if any exist.
-        // Otherwise just return the original string.
-        return nonAsciiCharacters.test(s) ?
-            s.replace(nonAsciiCharacters, function (c) { return get16BitUnicodeEscapeSequence(c.charCodeAt(0)); }) :
-            s;
-    }
-    ts.escapeNonAsciiCharacters = escapeNonAsciiCharacters;
-    var indentStrings = ["", "    "];
-    function getIndentString(level) {
-        if (indentStrings[level] === undefined) {
-            indentStrings[level] = getIndentString(level - 1) + indentStrings[1];
-        }
-        return indentStrings[level];
-    }
-    ts.getIndentString = getIndentString;
-    function getIndentSize() {
-        return indentStrings[1].length;
-    }
-    ts.getIndentSize = getIndentSize;
-    function createTextWriter(newLine) {
-        var output;
-        var indent;
-        var lineStart;
-        var lineCount;
-        var linePos;
-        function write(s) {
-            if (s && s.length) {
-                if (lineStart) {
-                    output += getIndentString(indent);
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function reset() {
-            output = "";
-            indent = 0;
-            lineStart = true;
-            lineCount = 0;
-            linePos = 0;
-        }
-        function rawWrite(s) {
-            if (s !== undefined) {
-                if (lineStart) {
-                    lineStart = false;
-                }
-                output += s;
-            }
-        }
-        function writeLiteral(s) {
-            if (s && s.length) {
-                write(s);
-                var lineStartsOfS = ts.computeLineStarts(s);
-                if (lineStartsOfS.length > 1) {
-                    lineCount = lineCount + lineStartsOfS.length - 1;
-                    linePos = output.length - s.length + ts.lastOrUndefined(lineStartsOfS);
-                }
-            }
-        }
-        function writeLine() {
-            if (!lineStart) {
-                output += newLine;
-                lineCount++;
-                linePos = output.length;
-                lineStart = true;
-            }
-        }
-        function writeTextOfNode(text, node) {
-            write(getTextOfNodeFromSourceText(text, node));
-        }
-        reset();
-        return {
-            write: write,
-            rawWrite: rawWrite,
-            writeTextOfNode: writeTextOfNode,
-            writeLiteral: writeLiteral,
-            writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
-            getIndent: function () { return indent; },
-            getTextPos: function () { return output.length; },
-            getLine: function () { return lineCount + 1; },
-            getColumn: function () { return lineStart ? indent * getIndentSize() + 1 : output.length - linePos + 1; },
-            getText: function () { return output; },
-            reset: reset
-        };
-    }
-    ts.createTextWriter = createTextWriter;
-    /**
-     * Resolves a local path to a path which is absolute to the base of the emit
-     */
-    function getExternalModuleNameFromPath(host, fileName) {
-        var getCanonicalFileName = function (f) { return host.getCanonicalFileName(f); };
-        var dir = ts.toPath(host.getCommonSourceDirectory(), host.getCurrentDirectory(), getCanonicalFileName);
-        var filePath = ts.getNormalizedAbsolutePath(fileName, host.getCurrentDirectory());
-        var relativePath = ts.getRelativePathToDirectoryOrUrl(dir, filePath, dir, getCanonicalFileName, /*isAbsolutePathAnUrl*/ false);
-        return ts.removeFileExtension(relativePath);
-    }
-    ts.getExternalModuleNameFromPath = getExternalModuleNameFromPath;
-    function getOwnEmitOutputFilePath(sourceFile, host, extension) {
-        var compilerOptions = host.getCompilerOptions();
-        var emitOutputFilePathWithoutExtension;
-        if (compilerOptions.outDir) {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(getSourceFilePathInNewDir(sourceFile, host, compilerOptions.outDir));
-        }
-        else {
-            emitOutputFilePathWithoutExtension = ts.removeFileExtension(sourceFile.fileName);
-        }
-        return emitOutputFilePathWithoutExtension + extension;
-    }
-    ts.getOwnEmitOutputFilePath = getOwnEmitOutputFilePath;
-    function getDeclarationEmitOutputFilePath(sourceFile, host) {
-        var options = host.getCompilerOptions();
-        var outputDir = options.declarationDir || options.outDir; // Prefer declaration folder if specified
-        if (options.declaration) {
-            var path = outputDir
-                ? getSourceFilePathInNewDir(sourceFile, host, outputDir)
-                : sourceFile.fileName;
-            return ts.removeFileExtension(path) + ".d.ts";
-        }
-    }
-    ts.getDeclarationEmitOutputFilePath = getDeclarationEmitOutputFilePath;
-    function getEmitScriptTarget(compilerOptions) {
-        return compilerOptions.target || 0 /* ES3 */;
-    }
-    ts.getEmitScriptTarget = getEmitScriptTarget;
-    function getEmitModuleKind(compilerOptions) {
-        return typeof compilerOptions.module === "number" ?
-            compilerOptions.module :
-            getEmitScriptTarget(compilerOptions) === 2 /* ES6 */ ? ts.ModuleKind.ES6 : ts.ModuleKind.CommonJS;
-    }
-    ts.getEmitModuleKind = getEmitModuleKind;
-    function forEachExpectedEmitFile(host, action, targetSourceFile) {
-        var options = host.getCompilerOptions();
-        // Emit on each source file
-        if (options.outFile || options.out) {
-            onBundledEmit(host);
-        }
-        else {
-            var sourceFiles = targetSourceFile === undefined ? host.getSourceFiles() : [targetSourceFile];
-            for (var _i = 0, sourceFiles_1 = sourceFiles; _i < sourceFiles_1.length; _i++) {
-                var sourceFile = sourceFiles_1[_i];
-                // Don't emit if source file is a declaration file, or was located under node_modules
-                if (!isDeclarationFile(sourceFile) && !host.isSourceFileFromExternalLibrary(sourceFile)) {
-                    onSingleFileEmit(host, sourceFile);
-                }
-            }
-        }
-        function onSingleFileEmit(host, sourceFile) {
-            // JavaScript files are always LanguageVariant.JSX, as JSX syntax is allowed in .js files also.
-            // So for JavaScript files, '.jsx' is only emitted if the input was '.jsx', and JsxEmit.Preserve.
-            // For TypeScript, the only time to emit with a '.jsx' extension, is on JSX input, and JsxEmit.Preserve
-            var extension = ".js";
-            if (options.jsx === 1 /* Preserve */) {
-                if (isSourceFileJavaScript(sourceFile)) {
-                    if (ts.fileExtensionIs(sourceFile.fileName, ".jsx")) {
-                        extension = ".jsx";
-                    }
-                }
-                else if (sourceFile.languageVariant === 1 /* JSX */) {
-                    // TypeScript source file preserving JSX syntax
-                    extension = ".jsx";
-                }
-            }
-            var jsFilePath = getOwnEmitOutputFilePath(sourceFile, host, extension);
-            var emitFileNames = {
-                jsFilePath: jsFilePath,
-                sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                declarationFilePath: !isSourceFileJavaScript(sourceFile) ? getDeclarationEmitOutputFilePath(sourceFile, host) : undefined
-            };
-            action(emitFileNames, [sourceFile], /*isBundledEmit*/ false);
-        }
-        function onBundledEmit(host) {
-            // Can emit only sources that are not declaration file and are either non module code or module with
-            // --module or --target es6 specified. Files included by searching under node_modules are also not emitted.
-            var bundledSources = ts.filter(host.getSourceFiles(), function (sourceFile) { return !isDeclarationFile(sourceFile) &&
-                !host.isSourceFileFromExternalLibrary(sourceFile) &&
-                (!ts.isExternalModule(sourceFile) ||
-                    !!getEmitModuleKind(options)); });
-            if (bundledSources.length) {
-                var jsFilePath = options.outFile || options.out;
-                var emitFileNames = {
-                    jsFilePath: jsFilePath,
-                    sourceMapFilePath: getSourceMapFilePath(jsFilePath, options),
-                    declarationFilePath: options.declaration ? ts.removeFileExtension(jsFilePath) + ".d.ts" : undefined
-                };
-                action(emitFileNames, bundledSources, /*isBundledEmit*/ true);
-            }
-        }
-        function getSourceMapFilePath(jsFilePath, options) {
-            return options.sourceMap ? jsFilePath + ".map" : undefined;
-        }
-    }
-    ts.forEachExpectedEmitFile = forEachExpectedEmitFile;
-    function getSourceFilePathInNewDir(sourceFile, host, newDirPath) {
-        var sourceFilePath = ts.getNormalizedAbsolutePath(sourceFile.fileName, host.getCurrentDirectory());
-        var commonSourceDirectory = host.getCommonSourceDirectory();
-        var isSourceFileInCommonSourceDirectory = host.getCanonicalFileName(sourceFilePath).indexOf(host.getCanonicalFileName(commonSourceDirectory)) === 0;
-        sourceFilePath = isSourceFileInCommonSourceDirectory ? sourceFilePath.substring(commonSourceDirectory.length) : sourceFilePath;
-        return ts.combinePaths(newDirPath, sourceFilePath);
-    }
-    ts.getSourceFilePathInNewDir = getSourceFilePathInNewDir;
-    function writeFile(host, diagnostics, fileName, data, writeByteOrderMark, sourceFiles) {
-        host.writeFile(fileName, data, writeByteOrderMark, function (hostErrorMessage) {
-            diagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Could_not_write_file_0_Colon_1, fileName, hostErrorMessage));
-        }, sourceFiles);
-    }
-    ts.writeFile = writeFile;
-    function getLineOfLocalPosition(currentSourceFile, pos) {
-        return ts.getLineAndCharacterOfPosition(currentSourceFile, pos).line;
-    }
-    ts.getLineOfLocalPosition = getLineOfLocalPosition;
-    function getLineOfLocalPositionFromLineMap(lineMap, pos) {
-        return ts.computeLineAndCharacterOfPosition(lineMap, pos).line;
-    }
-    ts.getLineOfLocalPositionFromLineMap = getLineOfLocalPositionFromLineMap;
-    function getFirstConstructorWithBody(node) {
-        return ts.forEach(node.members, function (member) {
-            if (member.kind === 148 /* Constructor */ && nodeIsPresent(member.body)) {
-                return member;
-            }
-        });
-    }
-    ts.getFirstConstructorWithBody = getFirstConstructorWithBody;
-    function getSetAccessorTypeAnnotationNode(accessor) {
-        if (accessor && accessor.parameters.length > 0) {
-            var hasThis = accessor.parameters.length === 2 &&
-                accessor.parameters[0].name.kind === 69 /* Identifier */ &&
-                accessor.parameters[0].name.originalKeywordKind === 97 /* ThisKeyword */;
-            return accessor.parameters[hasThis ? 1 : 0].type;
-        }
-    }
-    ts.getSetAccessorTypeAnnotationNode = getSetAccessorTypeAnnotationNode;
-    function getAllAccessorDeclarations(declarations, accessor) {
-        var firstAccessor;
-        var secondAccessor;
-        var getAccessor;
-        var setAccessor;
-        if (hasDynamicName(accessor)) {
-            firstAccessor = accessor;
-            if (accessor.kind === 149 /* GetAccessor */) {
-                getAccessor = accessor;
-            }
-            else if (accessor.kind === 150 /* SetAccessor */) {
-                setAccessor = accessor;
-            }
-            else {
-                ts.Debug.fail("Accessor has wrong kind");
-            }
-        }
-        else {
-            ts.forEach(declarations, function (member) {
-                if ((member.kind === 149 /* GetAccessor */ || member.kind === 150 /* SetAccessor */)
-                    && (member.flags & 32 /* Static */) === (accessor.flags & 32 /* Static */)) {
-                    var memberName = getPropertyNameForPropertyNameNode(member.name);
-                    var accessorName = getPropertyNameForPropertyNameNode(accessor.name);
-                    if (memberName === accessorName) {
-                        if (!firstAccessor) {
-                            firstAccessor = member;
-                        }
-                        else if (!secondAccessor) {
-                            secondAccessor = member;
-                        }
-                        if (member.kind === 149 /* GetAccessor */ && !getAccessor) {
-                            getAccessor = member;
-                        }
-                        if (member.kind === 150 /* SetAccessor */ && !setAccessor) {
-                            setAccessor = member;
-                        }
-                    }
-                }
-            });
-        }
-        return {
-            firstAccessor: firstAccessor,
-            secondAccessor: secondAccessor,
-            getAccessor: getAccessor,
-            setAccessor: setAccessor
-        };
-    }
-    ts.getAllAccessorDeclarations = getAllAccessorDeclarations;
-    function emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments) {
-        // If the leading comments start on different line than the start of node, write new line
-        if (leadingComments && leadingComments.length && node.pos !== leadingComments[0].pos &&
-            getLineOfLocalPositionFromLineMap(lineMap, node.pos) !== getLineOfLocalPositionFromLineMap(lineMap, leadingComments[0].pos)) {
-            writer.writeLine();
-        }
-    }
-    ts.emitNewLineBeforeLeadingComments = emitNewLineBeforeLeadingComments;
-    function emitComments(text, lineMap, writer, comments, trailingSeparator, newLine, writeComment) {
-        var emitLeadingSpace = !trailingSeparator;
-        ts.forEach(comments, function (comment) {
-            if (emitLeadingSpace) {
-                writer.write(" ");
-                emitLeadingSpace = false;
-            }
-            writeComment(text, lineMap, writer, comment, newLine);
-            if (comment.hasTrailingNewLine) {
-                writer.writeLine();
-            }
-            else if (trailingSeparator) {
-                writer.write(" ");
-            }
-            else {
-                // Emit leading space to separate comment during next comment emit
-                emitLeadingSpace = true;
-            }
-        });
-    }
-    ts.emitComments = emitComments;
-    /**
-     * Detached comment is a comment at the top of file or function body that is separated from
-     * the next statement by space.
-     */
-    function emitDetachedComments(text, lineMap, writer, writeComment, node, newLine, removeComments) {
-        var leadingComments;
-        var currentDetachedCommentInfo;
-        if (removeComments) {
-            // removeComments is true, only reserve pinned comment at the top of file
-            // For example:
-            //      /*! Pinned Comment */
-            //
-            //      var x = 10;
-            if (node.pos === 0) {
-                leadingComments = ts.filter(ts.getLeadingCommentRanges(text, node.pos), isPinnedComment);
-            }
-        }
-        else {
-            // removeComments is false, just get detached as normal and bypass the process to filter comment
-            leadingComments = ts.getLeadingCommentRanges(text, node.pos);
-        }
-        if (leadingComments) {
-            var detachedComments = [];
-            var lastComment = void 0;
-            for (var _i = 0, leadingComments_1 = leadingComments; _i < leadingComments_1.length; _i++) {
-                var comment = leadingComments_1[_i];
-                if (lastComment) {
-                    var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, lastComment.end);
-                    var commentLine = getLineOfLocalPositionFromLineMap(lineMap, comment.pos);
-                    if (commentLine >= lastCommentLine + 2) {
-                        // There was a blank line between the last comment and this comment.  This
-                        // comment is not part of the copyright comments.  Return what we have so
-                        // far.
-                        break;
-                    }
-                }
-                detachedComments.push(comment);
-                lastComment = comment;
-            }
-            if (detachedComments.length) {
-                // All comments look like they could have been part of the copyright header.  Make
-                // sure there is at least one blank line between it and the node.  If not, it's not
-                // a copyright header.
-                var lastCommentLine = getLineOfLocalPositionFromLineMap(lineMap, ts.lastOrUndefined(detachedComments).end);
-                var nodeLine = getLineOfLocalPositionFromLineMap(lineMap, ts.skipTrivia(text, node.pos));
-                if (nodeLine >= lastCommentLine + 2) {
-                    // Valid detachedComments
-                    emitNewLineBeforeLeadingComments(lineMap, writer, node, leadingComments);
-                    emitComments(text, lineMap, writer, detachedComments, /*trailingSeparator*/ true, newLine, writeComment);
-                    currentDetachedCommentInfo = { nodePos: node.pos, detachedCommentEndPos: ts.lastOrUndefined(detachedComments).end };
-                }
-            }
-        }
-        return currentDetachedCommentInfo;
-        function isPinnedComment(comment) {
-            return text.charCodeAt(comment.pos + 1) === 42 /* asterisk */ &&
-                text.charCodeAt(comment.pos + 2) === 33 /* exclamation */;
-        }
-    }
-    ts.emitDetachedComments = emitDetachedComments;
-    function writeCommentRange(text, lineMap, writer, comment, newLine) {
-        if (text.charCodeAt(comment.pos + 1) === 42 /* asterisk */) {
-            var firstCommentLineAndCharacter = ts.computeLineAndCharacterOfPosition(lineMap, comment.pos);
-            var lineCount = lineMap.length;
-            var firstCommentLineIndent = void 0;
-            for (var pos = comment.pos, currentLine = firstCommentLineAndCharacter.line; pos < comment.end; currentLine++) {
-                var nextLineStart = (currentLine + 1) === lineCount
-                    ? text.length + 1
-                    : lineMap[currentLine + 1];
-                if (pos !== comment.pos) {
-                    // If we are not emitting first line, we need to write the spaces to adjust the alignment
-                    if (firstCommentLineIndent === undefined) {
-                        firstCommentLineIndent = calculateIndent(text, lineMap[firstCommentLineAndCharacter.line], comment.pos);
-                    }
-                    // These are number of spaces writer is going to write at current indent
-                    var currentWriterIndentSpacing = writer.getIndent() * getIndentSize();
-                    // Number of spaces we want to be writing
-                    // eg: Assume writer indent
-                    // module m {
-                    //         /* starts at character 9 this is line 1
-                    //    * starts at character pos 4 line                        --1  = 8 - 8 + 3
-                    //   More left indented comment */                            --2  = 8 - 8 + 2
-                    //     class c { }
-                    // }
-                    // module m {
-                    //     /* this is line 1 -- Assume current writer indent 8
-                    //      * line                                                --3 = 8 - 4 + 5
-                    //            More right indented comment */                  --4 = 8 - 4 + 11
-                    //     class c { }
-                    // }
-                    var spacesToEmit = currentWriterIndentSpacing - firstCommentLineIndent + calculateIndent(text, pos, nextLineStart);
-                    if (spacesToEmit > 0) {
-                        var numberOfSingleSpacesToEmit = spacesToEmit % getIndentSize();
-                        var indentSizeSpaceString = getIndentString((spacesToEmit - numberOfSingleSpacesToEmit) / getIndentSize());
-                        // Write indent size string ( in eg 1: = "", 2: "" , 3: string with 8 spaces 4: string with 12 spaces
-                        writer.rawWrite(indentSizeSpaceString);
-                        // Emit the single spaces (in eg: 1: 3 spaces, 2: 2 spaces, 3: 1 space, 4: 3 spaces)
-                        while (numberOfSingleSpacesToEmit) {
-                            writer.rawWrite(" ");
-                            numberOfSingleSpacesToEmit--;
-                        }
-                    }
-                    else {
-                        // No spaces to emit write empty string
-                        writer.rawWrite("");
-                    }
-                }
-                // Write the comment line text
-                writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart);
-                pos = nextLineStart;
-            }
-        }
-        else {
-            // Single line comment of style //....
-            writer.write(text.substring(comment.pos, comment.end));
-        }
-    }
-    ts.writeCommentRange = writeCommentRange;
-    function writeTrimmedCurrentLine(text, comment, writer, newLine, pos, nextLineStart) {
-        var end = Math.min(comment.end, nextLineStart - 1);
-        var currentLineText = text.substring(pos, end).replace(/^\s+|\s+$/g, "");
-        if (currentLineText) {
-            // trimmed forward and ending spaces text
-            writer.write(currentLineText);
-            if (end !== comment.end) {
-                writer.writeLine();
-            }
-        }
-        else {
-            // Empty string - make sure we write empty line
-            writer.writeLiteral(newLine);
-        }
-    }
-    function calculateIndent(text, pos, end) {
-        var currentLineIndent = 0;
-        for (; pos < end && ts.isWhiteSpaceSingleLine(text.charCodeAt(pos)); pos++) {
-            if (text.charCodeAt(pos) === 9 /* tab */) {
-                // Tabs = TabSize = indent size and go to next tabStop
-                currentLineIndent += getIndentSize() - (currentLineIndent % getIndentSize());
-            }
-            else {
-                // Single space
-                currentLineIndent++;
-            }
-        }
-        return currentLineIndent;
-    }
-    function modifierToFlag(token) {
-        switch (token) {
-            case 113 /* StaticKeyword */: return 32 /* Static */;
-            case 112 /* PublicKeyword */: return 4 /* Public */;
-            case 111 /* ProtectedKeyword */: return 16 /* Protected */;
-            case 110 /* PrivateKeyword */: return 8 /* Private */;
-            case 115 /* AbstractKeyword */: return 128 /* Abstract */;
-            case 82 /* ExportKeyword */: return 1 /* Export */;
-            case 122 /* DeclareKeyword */: return 2 /* Ambient */;
-            case 74 /* ConstKeyword */: return 2048 /* Const */;
-            case 77 /* DefaultKeyword */: return 512 /* Default */;
-            case 118 /* AsyncKeyword */: return 256 /* Async */;
-            case 128 /* ReadonlyKeyword */: return 64 /* Readonly */;
-        }
-        return 0;
-    }
-    ts.modifierToFlag = modifierToFlag;
-    function isLeftHandSideExpression(expr) {
-        if (expr) {
-            switch (expr.kind) {
-                case 172 /* PropertyAccessExpression */:
-                case 173 /* ElementAccessExpression */:
-                case 175 /* NewExpression */:
-                case 174 /* CallExpression */:
-                case 196 /* NonNullExpression */:
-                case 241 /* JsxElement */:
-                case 242 /* JsxSelfClosingElement */:
-                case 176 /* TaggedTemplateExpression */:
-                case 170 /* ArrayLiteralExpression */:
-                case 178 /* ParenthesizedExpression */:
-                case 171 /* ObjectLiteralExpression */:
-                case 192 /* ClassExpression */:
-                case 179 /* FunctionExpression */:
-                case 69 /* Identifier */:
-                case 10 /* RegularExpressionLiteral */:
-                case 8 /* NumericLiteral */:
-                case 9 /* StringLiteral */:
-                case 11 /* NoSubstitutionTemplateLiteral */:
-                case 189 /* TemplateExpression */:
-                case 84 /* FalseKeyword */:
-                case 93 /* NullKeyword */:
-                case 97 /* ThisKeyword */:
-                case 99 /* TrueKeyword */:
-                case 95 /* SuperKeyword */:
-                    return true;
-            }
-        }
-        return false;
-    }
-    ts.isLeftHandSideExpression = isLeftHandSideExpression;
-    function isAssignmentOperator(token) {
-        return token >= 56 /* FirstAssignment */ && token <= 68 /* LastAssignment */;
-    }
-    ts.isAssignmentOperator = isAssignmentOperator;
-    function isExpressionWithTypeArgumentsInClassExtendsClause(node) {
-        return node.kind === 194 /* ExpressionWithTypeArguments */ &&
-            node.parent.token === 83 /* ExtendsKeyword */ &&
-            isClassLike(node.parent.parent);
-    }
-    ts.isExpressionWithTypeArgumentsInClassExtendsClause = isExpressionWithTypeArgumentsInClassExtendsClause;
-    // Returns false if this heritage clause element's expression contains something unsupported
-    // (i.e. not a name or dotted name).
-    function isSupportedExpressionWithTypeArguments(node) {
-        return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-    }
-    ts.isSupportedExpressionWithTypeArguments = isSupportedExpressionWithTypeArguments;
-    function isSupportedExpressionWithTypeArgumentsRest(node) {
-        if (node.kind === 69 /* Identifier */) {
-            return true;
-        }
-        else if (isPropertyAccessExpression(node)) {
-            return isSupportedExpressionWithTypeArgumentsRest(node.expression);
-        }
-        else {
-            return false;
-        }
-    }
-    function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 139 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 172 /* PropertyAccessExpression */ && node.parent.name === node);
-    }
-    ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
-    function isEmptyObjectLiteralOrArrayLiteral(expression) {
-        var kind = expression.kind;
-        if (kind === 171 /* ObjectLiteralExpression */) {
-            return expression.properties.length === 0;
-        }
-        if (kind === 170 /* ArrayLiteralExpression */) {
-            return expression.elements.length === 0;
-        }
-        return false;
-    }
-    ts.isEmptyObjectLiteralOrArrayLiteral = isEmptyObjectLiteralOrArrayLiteral;
-    function getLocalSymbolForExportDefault(symbol) {
-        return symbol && symbol.valueDeclaration && (symbol.valueDeclaration.flags & 512 /* Default */) ? symbol.valueDeclaration.localSymbol : undefined;
-    }
-    ts.getLocalSymbolForExportDefault = getLocalSymbolForExportDefault;
-    function hasJavaScriptFileExtension(fileName) {
-        return ts.forEach(ts.supportedJavascriptExtensions, function (extension) { return ts.fileExtensionIs(fileName, extension); });
-    }
-    ts.hasJavaScriptFileExtension = hasJavaScriptFileExtension;
-    function hasTypeScriptFileExtension(fileName) {
-        return ts.forEach(ts.supportedTypeScriptExtensions, function (extension) { return ts.fileExtensionIs(fileName, extension); });
-    }
-    ts.hasTypeScriptFileExtension = hasTypeScriptFileExtension;
-    /**
-     * Replace each instance of non-ascii characters by one, two, three, or four escape sequences
-     * representing the UTF-8 encoding of the character, and return the expanded char code list.
-     */
-    function getExpandedCharCodes(input) {
-        var output = [];
-        var length = input.length;
-        for (var i = 0; i < length; i++) {
-            var charCode = input.charCodeAt(i);
-            // handel utf8
-            if (charCode < 0x80) {
-                output.push(charCode);
-            }
-            else if (charCode < 0x800) {
-                output.push((charCode >> 6) | 192);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x10000) {
-                output.push((charCode >> 12) | 224);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else if (charCode < 0x20000) {
-                output.push((charCode >> 18) | 240);
-                output.push(((charCode >> 12) & 63) | 128);
-                output.push(((charCode >> 6) & 63) | 128);
-                output.push((charCode & 63) | 128);
-            }
-            else {
-                ts.Debug.assert(false, "Unexpected code point");
-            }
-        }
-        return output;
-    }
-    /**
-     * Serialize an object graph into a JSON string. This is intended only for use on an acyclic graph
-     * as the fallback implementation does not check for circular references by default.
-     */
-    ts.stringify = typeof JSON !== "undefined" && JSON.stringify
-        ? JSON.stringify
-        : stringifyFallback;
-    /**
-     * Serialize an object graph into a JSON string.
-     */
-    function stringifyFallback(value) {
-        // JSON.stringify returns `undefined` here, instead of the string "undefined".
-        return value === undefined ? undefined : stringifyValue(value);
-    }
-    function stringifyValue(value) {
-        return typeof value === "string" ? "\"" + escapeString(value) + "\""
-            : typeof value === "number" ? isFinite(value) ? String(value) : "null"
-                : typeof value === "boolean" ? value ? "true" : "false"
-                    : typeof value === "object" && value ? ts.isArray(value) ? cycleCheck(stringifyArray, value) : cycleCheck(stringifyObject, value)
-                        : "null";
-    }
-    function cycleCheck(cb, value) {
-        ts.Debug.assert(!value.hasOwnProperty("__cycle"), "Converting circular structure to JSON");
-        value.__cycle = true;
-        var result = cb(value);
-        delete value.__cycle;
-        return result;
-    }
-    function stringifyArray(value) {
-        return "[" + ts.reduceLeft(value, stringifyElement, "") + "]";
-    }
-    function stringifyElement(memo, value) {
-        return (memo ? memo + "," : memo) + stringifyValue(value);
-    }
-    function stringifyObject(value) {
-        return "{" + ts.reduceProperties(value, stringifyProperty, "") + "}";
-    }
-    function stringifyProperty(memo, value, key) {
-        return value === undefined || typeof value === "function" || key === "__cycle" ? memo
-            : (memo ? memo + "," : memo) + ("\"" + escapeString(key) + "\":" + stringifyValue(value));
-    }
-    var base64Digits = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=";
-    /**
-     * Converts a string to a base-64 encoded ASCII string.
-     */
-    function convertToBase64(input) {
-        var result = "";
-        var charCodes = getExpandedCharCodes(input);
-        var i = 0;
-        var length = charCodes.length;
-        var byte1, byte2, byte3, byte4;
-        while (i < length) {
-            // Convert every 6-bits in the input 3 character points
-            // into a base64 digit
-            byte1 = charCodes[i] >> 2;
-            byte2 = (charCodes[i] & 3) << 4 | charCodes[i + 1] >> 4;
-            byte3 = (charCodes[i + 1] & 15) << 2 | charCodes[i + 2] >> 6;
-            byte4 = charCodes[i + 2] & 63;
-            // We are out of characters in the input, set the extra
-            // digits to 64 (padding character).
-            if (i + 1 >= length) {
-                byte3 = byte4 = 64;
-            }
-            else if (i + 2 >= length) {
-                byte4 = 64;
-            }
-            // Write to the output
-            result += base64Digits.charAt(byte1) + base64Digits.charAt(byte2) + base64Digits.charAt(byte3) + base64Digits.charAt(byte4);
-            i += 3;
-        }
-        return result;
-    }
-    ts.convertToBase64 = convertToBase64;
-    function convertToRelativePath(absoluteOrRelativePath, basePath, getCanonicalFileName) {
-        return !ts.isRootedDiskPath(absoluteOrRelativePath)
-            ? absoluteOrRelativePath
-            : ts.getRelativePathToDirectoryOrUrl(basePath, absoluteOrRelativePath, basePath, getCanonicalFileName, /* isAbsolutePathAnUrl */ false);
-    }
-    ts.convertToRelativePath = convertToRelativePath;
-    var carriageReturnLineFeed = "\r\n";
-    var lineFeed = "\n";
-    function getNewLineCharacter(options) {
-        if (options.newLine === 0 /* CarriageReturnLineFeed */) {
-            return carriageReturnLineFeed;
-        }
-        else if (options.newLine === 1 /* LineFeed */) {
-            return lineFeed;
-        }
-        else if (ts.sys) {
-            return ts.sys.newLine;
-        }
-        return carriageReturnLineFeed;
-    }
-    ts.getNewLineCharacter = getNewLineCharacter;
-    function isWatchSet(options) {
-        // Firefox has Object.prototype.watch
-        return options.watch && options.hasOwnProperty("watch");
-    }
-    ts.isWatchSet = isWatchSet;
-})(ts || (ts = {}));
-var ts;
-(function (ts) {
-    function getDefaultLibFileName(options) {
-        return options.target === 2 /* ES6 */ ? "lib.es6.d.ts" : "lib.d.ts";
-    }
-    ts.getDefaultLibFileName = getDefaultLibFileName;
-    function textSpanEnd(span) {
-        return span.start + span.length;
-    }
-    ts.textSpanEnd = textSpanEnd;
-    function textSpanIsEmpty(span) {
-        return span.length === 0;
-    }
-    ts.textSpanIsEmpty = textSpanIsEmpty;
-    function textSpanContainsPosition(span, position) {
-        return position >= span.start && position < textSpanEnd(span);
-    }
-    ts.textSpanContainsPosition = textSpanContainsPosition;
-    // Returns true if 'span' contains 'other'.
-    function textSpanContainsTextSpan(span, other) {
-        return other.start >= span.start && textSpanEnd(other) <= textSpanEnd(span);
-    }
-    ts.textSpanContainsTextSpan = textSpanContainsTextSpan;
-    function textSpanOverlapsWith(span, other) {
-        var overlapStart = Math.max(span.start, other.start);
-        var overlapEnd = Math.min(textSpanEnd(span), textSpanEnd(other));
-        return overlapStart < overlapEnd;
-    }
-    ts.textSpanOverlapsWith = textSpanOverlapsWith;
-    function textSpanOverlap(span1, span2) {
-        var overlapStart = Math.max(span1.start, span2.start);
-        var overlapEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (overlapStart < overlapEnd) {
-            return createTextSpanFromBounds(overlapStart, overlapEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanOverlap = textSpanOverlap;
-    function textSpanIntersectsWithTextSpan(span, other) {
-        return other.start <= textSpanEnd(span) && textSpanEnd(other) >= span.start;
-    }
-    ts.textSpanIntersectsWithTextSpan = textSpanIntersectsWithTextSpan;
-    function textSpanIntersectsWith(span, start, length) {
-        var end = start + length;
-        return start <= textSpanEnd(span) && end >= span.start;
-    }
-    ts.textSpanIntersectsWith = textSpanIntersectsWith;
-    function decodedTextSpanIntersectsWith(start1, length1, start2, length2) {
-        var end1 = start1 + length1;
-        var end2 = start2 + length2;
-        return start2 <= end1 && end2 >= start1;
-    }
-    ts.decodedTextSpanIntersectsWith = decodedTextSpanIntersectsWith;
-    function textSpanIntersectsWithPosition(span, position) {
-        return position <= textSpanEnd(span) && position >= span.start;
-    }
-    ts.textSpanIntersectsWithPosition = textSpanIntersectsWithPosition;
-    function textSpanIntersection(span1, span2) {
-        var intersectStart = Math.max(span1.start, span2.start);
-        var intersectEnd = Math.min(textSpanEnd(span1), textSpanEnd(span2));
-        if (intersectStart <= intersectEnd) {
-            return createTextSpanFromBounds(intersectStart, intersectEnd);
-        }
-        return undefined;
-    }
-    ts.textSpanIntersection = textSpanIntersection;
-    function createTextSpan(start, length) {
-        if (start < 0) {
-            throw new Error("start < 0");
-        }
-        if (length < 0) {
-            throw new Error("length < 0");
-        }
-        return { start: start, length: length };
-    }
-    ts.createTextSpan = createTextSpan;
-    function createTextSpanFromBounds(start, end) {
-        return createTextSpan(start, end - start);
-    }
-    ts.createTextSpanFromBounds = createTextSpanFromBounds;
-    function textChangeRangeNewSpan(range) {
-        return createTextSpan(range.span.start, range.newLength);
-    }
-    ts.textChangeRangeNewSpan = textChangeRangeNewSpan;
-    function textChangeRangeIsUnchanged(range) {
-        return textSpanIsEmpty(range.span) && range.newLength === 0;
-    }
-    ts.textChangeRangeIsUnchanged = textChangeRangeIsUnchanged;
-    function createTextChangeRange(span, newLength) {
-        if (newLength < 0) {
-            throw new Error("newLength < 0");
-        }
-        return { span: span, newLength: newLength };
-    }
-    ts.createTextChangeRange = createTextChangeRange;
-    ts.unchangedTextChangeRange = createTextChangeRange(createTextSpan(0, 0), 0);
-    /**
-     * Called to merge all the changes that occurred across several versions of a script snapshot
-     * into a single change.  i.e. if a user keeps making successive edits to a script we will
-     * have a text change from V1 to V2, V2 to V3, ..., Vn.
-     *
-     * This function will then merge those changes into a single change range valid between V1 and
-     * Vn.
-     */
-    function collapseTextChangeRangesAcrossMultipleVersions(changes) {
-        if (changes.length === 0) {
-            return ts.unchangedTextChangeRange;
-        }
-        if (changes.length === 1) {
-            return changes[0];
-        }
-        // We change from talking about { { oldStart, oldLength }, newLength } to { oldStart, oldEnd, newEnd }
-        // as it makes things much easier to reason about.
-        var change0 = changes[0];
-        var oldStartN = change0.span.start;
-        var oldEndN = textSpanEnd(change0.span);
-        var newEndN = oldStartN + change0.newLength;
-        for (var i = 1; i < changes.length; i++) {
-            var nextChange = changes[i];
-            // Consider the following case:
-            // i.e. two edits.  The first represents the text change range { { 10, 50 }, 30 }.  i.e. The span starting
-            // at 10, with length 50 is reduced to length 30.  The second represents the text change range { { 30, 30 }, 40 }.
-            // i.e. the span starting at 30 with length 30 is increased to length 40.
-            //
-            //      0         10        20        30        40        50        60        70        80        90        100
-            //      -------------------------------------------------------------------------------------------------------
-            //                |                                                 /
-            //                |                                            /----
-            //  T1            |                                       /----
-            //                |                                  /----
-            //                |                             /----
-            //      -------------------------------------------------------------------------------------------------------
-            //                                     |                            \
-            //                                     |                               \
-            //   T2                                |                                 \
-            //                                     |                                   \
-            //                                     |                                      \
-            //      -------------------------------------------------------------------------------------------------------
-            //
-            // Merging these turns out to not be too difficult.  First, determining the new start of the change is trivial
-            // it's just the min of the old and new starts.  i.e.:
-            //
-            //      0         10        20        30        40        50        60        70        80        90        100
-            //      ------------------------------------------------------------*------------------------------------------
-            //                |                                                 /
-            //                |                                            /----
-            //  T1            |                                       /----
-            //                |                                  /----
-            //                |                             /----
-            //      ----------------------------------------$-------------------$------------------------------------------
-            //                .                    |                            \
-            //                .                    |                               \
-            //   T2           .                    |                                 \
-            //                .                    |                                   \
-            //                .                    |                                      \
-            //      ----------------------------------------------------------------------*--------------------------------
-            //
-            // (Note the dots represent the newly inferred start.
-            // Determining the new and old end is also pretty simple.  Basically it boils down to paying attention to the
-            // absolute positions at the asterisks, and the relative change between the dollar signs. Basically, we see
-            // which if the two $'s precedes the other, and we move that one forward until they line up.  in this case that
-            // means:
-            //
-            //      0         10        20        30        40        50        60        70        80        90        100
-            //      --------------------------------------------------------------------------------*----------------------
-            //                |                                                                     /
-            //                |                                                                /----
-            //  T1            |                                                           /----
-            //                |                                                      /----
-            //                |                                                 /----
-            //      ------------------------------------------------------------$------------------------------------------
-            //                .                    |                            \
-            //                .                    |                               \
-            //   T2           .                    |                                 \
-            //                .                    |                                   \
-            //                .                    |                                      \
-            //      ----------------------------------------------------------------------*--------------------------------
-            //
-            // In other words (in this case), we're recognizing that the second edit happened after where the first edit
-            // ended with a delta of 20 characters (60 - 40).  Thus, if we go back in time to where the first edit started
-            // that's the same as if we started at char 80 instead of 60.
-            //
-            // As it so happens, the same logic applies if the second edit precedes the first edit.  In that case rather
-            // than pushing the first edit forward to match the second, we'll push the second edit forward to match the
-            // first.
-            //
-            // In this case that means we have { oldStart: 10, oldEnd: 80, newEnd: 70 } or, in TextChangeRange
-            // semantics: { { start: 10, length: 70 }, newLength: 60 }
-            //
-            // The math then works out as follows.
-            // If we have { oldStart1, oldEnd1, newEnd1 } and { oldStart2, oldEnd2, newEnd2 } then we can compute the
-            // final result like so:
-            //
-            // {
-            //      oldStart3: Min(oldStart1, oldStart2),
-            //      oldEnd3  : Max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1)),
-            //      newEnd3  : Max(newEnd2, newEnd2 + (newEnd1 - oldEnd2))
-            // }
-            var oldStart1 = oldStartN;
-            var oldEnd1 = oldEndN;
-            var newEnd1 = newEndN;
-            var oldStart2 = nextChange.span.start;
-            var oldEnd2 = textSpanEnd(nextChange.span);
-            var newEnd2 = oldStart2 + nextChange.newLength;
-            oldStartN = Math.min(oldStart1, oldStart2);
-            oldEndN = Math.max(oldEnd1, oldEnd1 + (oldEnd2 - newEnd1));
-            newEndN = Math.max(newEnd2, newEnd2 + (newEnd1 - oldEnd2));
-        }
-        return createTextChangeRange(createTextSpanFromBounds(oldStartN, oldEndN), /*newLength:*/ newEndN - oldStartN);
-    }
-    ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
-    function getTypeParameterOwner(d) {
-        if (d && d.kind === 141 /* TypeParameter */) {
-            for (var current = d; current; current = current.parent) {
-                if (ts.isFunctionLike(current) || ts.isClassLike(current) || current.kind === 222 /* InterfaceDeclaration */) {
-                    return current;
-                }
-            }
-        }
-    }
-    ts.getTypeParameterOwner = getTypeParameterOwner;
-    function isParameterPropertyDeclaration(node) {
-        return node.flags & 92 /* ParameterPropertyModifier */ && node.parent.kind === 148 /* Constructor */ && ts.isClassLike(node.parent.parent);
-    }
-    ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
-    function startsWith(str, prefix) {
-        return str.lastIndexOf(prefix, 0) === 0;
-    }
-    ts.startsWith = startsWith;
-    function endsWith(str, suffix) {
-        var expectedPos = str.length - suffix.length;
-        return str.indexOf(suffix, expectedPos) === expectedPos;
-    }
-    ts.endsWith = endsWith;
-})(ts || (ts = {}));
-/// <reference path="utilities.ts"/>
-/// <reference path="scanner.ts"/>
-var ts;
-(function (ts) {
-    /* @internal */ ts.parseTime = 0;
-    var NodeConstructor;
-    var SourceFileConstructor;
-    function createNode(kind, pos, end) {
-        if (kind === 256 /* SourceFile */) {
-            return new (SourceFileConstructor || (SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor()))(kind, pos, end);
-        }
-        else {
-            return new (NodeConstructor || (NodeConstructor = ts.objectAllocator.getNodeConstructor()))(kind, pos, end);
-        }
-    }
-    ts.createNode = createNode;
-    function visitNode(cbNode, node) {
-        if (node) {
-            return cbNode(node);
-        }
-    }
-    function visitNodeArray(cbNodes, nodes) {
-        if (nodes) {
-            return cbNodes(nodes);
-        }
-    }
-    function visitEachNode(cbNode, nodes) {
-        if (nodes) {
-            for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
-                var node = nodes_1[_i];
-                var result = cbNode(node);
-                if (result) {
-                    return result;
-                }
-            }
-        }
-    }
-    // Invokes a callback for each child of the given node. The 'cbNode' callback is invoked for all child nodes
-    // stored in properties. If a 'cbNodes' callback is specified, it is invoked for embedded arrays; otherwise,
-    // embedded arrays are flattened and the 'cbNode' callback is invoked for each element. If a callback returns
-    // a truthy value, iteration stops and that value is returned. Otherwise, undefined is returned.
-    function forEachChild(node, cbNode, cbNodeArray) {
-        if (!node) {
-            return;
-        }
-        // The visitXXX functions could be written as local functions that close over the cbNode and cbNodeArray
-        // callback parameters, but that causes a closure allocation for each invocation with noticeable effects
-        // on performance.
-        var visitNodes = cbNodeArray ? visitNodeArray : visitEachNode;
-        var cbNodes = cbNodeArray || cbNode;
-        switch (node.kind) {
-            case 139 /* QualifiedName */:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.right);
-            case 141 /* TypeParameter */:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.constraint) ||
-                    visitNode(cbNode, node.expression);
-            case 254 /* ShorthandPropertyAssignment */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.equalsToken) ||
-                    visitNode(cbNode, node.objectAssignmentInitializer);
-            case 142 /* Parameter */:
-            case 145 /* PropertyDeclaration */:
-            case 144 /* PropertySignature */:
-            case 253 /* PropertyAssignment */:
-            case 218 /* VariableDeclaration */:
-            case 169 /* BindingElement */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.dotDotDotToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.initializer);
-            case 156 /* FunctionType */:
-            case 157 /* ConstructorType */:
-            case 151 /* CallSignature */:
-            case 152 /* ConstructSignature */:
-            case 153 /* IndexSignature */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 148 /* Constructor */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 179 /* FunctionExpression */:
-            case 220 /* FunctionDeclaration */:
-            case 180 /* ArrowFunction */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.equalsGreaterThanToken) ||
-                    visitNode(cbNode, node.body);
-            case 155 /* TypeReference */:
-                return visitNode(cbNode, node.typeName) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 154 /* TypePredicate */:
-                return visitNode(cbNode, node.parameterName) ||
-                    visitNode(cbNode, node.type);
-            case 158 /* TypeQuery */:
-                return visitNode(cbNode, node.exprName);
-            case 159 /* TypeLiteral */:
-                return visitNodes(cbNodes, node.members);
-            case 160 /* ArrayType */:
-                return visitNode(cbNode, node.elementType);
-            case 161 /* TupleType */:
-                return visitNodes(cbNodes, node.elementTypes);
-            case 162 /* UnionType */:
-            case 163 /* IntersectionType */:
-                return visitNodes(cbNodes, node.types);
-            case 164 /* ParenthesizedType */:
-                return visitNode(cbNode, node.type);
-            case 167 /* ObjectBindingPattern */:
-            case 168 /* ArrayBindingPattern */:
-                return visitNodes(cbNodes, node.elements);
-            case 170 /* ArrayLiteralExpression */:
-                return visitNodes(cbNodes, node.elements);
-            case 171 /* ObjectLiteralExpression */:
-                return visitNodes(cbNodes, node.properties);
-            case 172 /* PropertyAccessExpression */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.name);
-            case 173 /* ElementAccessExpression */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.argumentExpression);
-            case 174 /* CallExpression */:
-            case 175 /* NewExpression */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.typeArguments) ||
-                    visitNodes(cbNodes, node.arguments);
-            case 176 /* TaggedTemplateExpression */:
-                return visitNode(cbNode, node.tag) ||
-                    visitNode(cbNode, node.template);
-            case 177 /* TypeAssertionExpression */:
-                return visitNode(cbNode, node.type) ||
-                    visitNode(cbNode, node.expression);
-            case 178 /* ParenthesizedExpression */:
-                return visitNode(cbNode, node.expression);
-            case 181 /* DeleteExpression */:
-                return visitNode(cbNode, node.expression);
-            case 182 /* TypeOfExpression */:
-                return visitNode(cbNode, node.expression);
-            case 183 /* VoidExpression */:
-                return visitNode(cbNode, node.expression);
-            case 185 /* PrefixUnaryExpression */:
-                return visitNode(cbNode, node.operand);
-            case 190 /* YieldExpression */:
-                return visitNode(cbNode, node.asteriskToken) ||
-                    visitNode(cbNode, node.expression);
-            case 184 /* AwaitExpression */:
-                return visitNode(cbNode, node.expression);
-            case 186 /* PostfixUnaryExpression */:
-                return visitNode(cbNode, node.operand);
-            case 187 /* BinaryExpression */:
-                return visitNode(cbNode, node.left) ||
-                    visitNode(cbNode, node.operatorToken) ||
-                    visitNode(cbNode, node.right);
-            case 195 /* AsExpression */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.type);
-            case 196 /* NonNullExpression */:
-                return visitNode(cbNode, node.expression);
-            case 188 /* ConditionalExpression */:
-                return visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.questionToken) ||
-                    visitNode(cbNode, node.whenTrue) ||
-                    visitNode(cbNode, node.colonToken) ||
-                    visitNode(cbNode, node.whenFalse);
-            case 191 /* SpreadElementExpression */:
-                return visitNode(cbNode, node.expression);
-            case 199 /* Block */:
-            case 226 /* ModuleBlock */:
-                return visitNodes(cbNodes, node.statements);
-            case 256 /* SourceFile */:
-                return visitNodes(cbNodes, node.statements) ||
-                    visitNode(cbNode, node.endOfFileToken);
-            case 200 /* VariableStatement */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.declarationList);
-            case 219 /* VariableDeclarationList */:
-                return visitNodes(cbNodes, node.declarations);
-            case 202 /* ExpressionStatement */:
-                return visitNode(cbNode, node.expression);
-            case 203 /* IfStatement */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.thenStatement) ||
-                    visitNode(cbNode, node.elseStatement);
-            case 204 /* DoStatement */:
-                return visitNode(cbNode, node.statement) ||
-                    visitNode(cbNode, node.expression);
-            case 205 /* WhileStatement */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 206 /* ForStatement */:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.condition) ||
-                    visitNode(cbNode, node.incrementor) ||
-                    visitNode(cbNode, node.statement);
-            case 207 /* ForInStatement */:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 208 /* ForOfStatement */:
-                return visitNode(cbNode, node.initializer) ||
-                    visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 209 /* ContinueStatement */:
-            case 210 /* BreakStatement */:
-                return visitNode(cbNode, node.label);
-            case 211 /* ReturnStatement */:
-                return visitNode(cbNode, node.expression);
-            case 212 /* WithStatement */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.statement);
-            case 213 /* SwitchStatement */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNode(cbNode, node.caseBlock);
-            case 227 /* CaseBlock */:
-                return visitNodes(cbNodes, node.clauses);
-            case 249 /* CaseClause */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.statements);
-            case 250 /* DefaultClause */:
-                return visitNodes(cbNodes, node.statements);
-            case 214 /* LabeledStatement */:
-                return visitNode(cbNode, node.label) ||
-                    visitNode(cbNode, node.statement);
-            case 215 /* ThrowStatement */:
-                return visitNode(cbNode, node.expression);
-            case 216 /* TryStatement */:
-                return visitNode(cbNode, node.tryBlock) ||
-                    visitNode(cbNode, node.catchClause) ||
-                    visitNode(cbNode, node.finallyBlock);
-            case 252 /* CatchClause */:
-                return visitNode(cbNode, node.variableDeclaration) ||
-                    visitNode(cbNode, node.block);
-            case 143 /* Decorator */:
-                return visitNode(cbNode, node.expression);
-            case 221 /* ClassDeclaration */:
-            case 192 /* ClassExpression */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 222 /* InterfaceDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNodes(cbNodes, node.heritageClauses) ||
-                    visitNodes(cbNodes, node.members);
-            case 223 /* TypeAliasDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeParameters) ||
-                    visitNode(cbNode, node.type);
-            case 224 /* EnumDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.members);
-            case 255 /* EnumMember */:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
-            case 225 /* ModuleDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.body);
-            case 229 /* ImportEqualsDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.moduleReference);
-            case 230 /* ImportDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.importClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
-            case 231 /* ImportClause */:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.namedBindings);
-            case 228 /* NamespaceExportDeclaration */:
-                return visitNode(cbNode, node.name);
-            case 232 /* NamespaceImport */:
-                return visitNode(cbNode, node.name);
-            case 233 /* NamedImports */:
-            case 237 /* NamedExports */:
-                return visitNodes(cbNodes, node.elements);
-            case 236 /* ExportDeclaration */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.exportClause) ||
-                    visitNode(cbNode, node.moduleSpecifier);
-            case 234 /* ImportSpecifier */:
-            case 238 /* ExportSpecifier */:
-                return visitNode(cbNode, node.propertyName) ||
-                    visitNode(cbNode, node.name);
-            case 235 /* ExportAssignment */:
-                return visitNodes(cbNodes, node.decorators) ||
-                    visitNodes(cbNodes, node.modifiers) ||
-                    visitNode(cbNode, node.expression);
-            case 189 /* TemplateExpression */:
-                return visitNode(cbNode, node.head) || visitNodes(cbNodes, node.templateSpans);
-            case 197 /* TemplateSpan */:
-                return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 140 /* ComputedPropertyName */:
-                return visitNode(cbNode, node.expression);
-            case 251 /* HeritageClause */:
-                return visitNodes(cbNodes, node.types);
-            case 194 /* ExpressionWithTypeArguments */:
-                return visitNode(cbNode, node.expression) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 240 /* ExternalModuleReference */:
-                return visitNode(cbNode, node.expression);
-            case 239 /* MissingDeclaration */:
-                return visitNodes(cbNodes, node.decorators);
-            case 241 /* JsxElement */:
-                return visitNode(cbNode, node.openingElement) ||
-                    visitNodes(cbNodes, node.children) ||
-                    visitNode(cbNode, node.closingElement);
-            case 242 /* JsxSelfClosingElement */:
-            case 243 /* JsxOpeningElement */:
-                return visitNode(cbNode, node.tagName) ||
-                    visitNodes(cbNodes, node.attributes);
-            case 246 /* JsxAttribute */:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.initializer);
-            case 247 /* JsxSpreadAttribute */:
-                return visitNode(cbNode, node.expression);
-            case 248 /* JsxExpression */:
-                return visitNode(cbNode, node.expression);
-            case 245 /* JsxClosingElement */:
-                return visitNode(cbNode, node.tagName);
-            case 257 /* JSDocTypeExpression */:
-                return visitNode(cbNode, node.type);
-            case 261 /* JSDocUnionType */:
-                return visitNodes(cbNodes, node.types);
-            case 262 /* JSDocTupleType */:
-                return visitNodes(cbNodes, node.types);
-            case 260 /* JSDocArrayType */:
-                return visitNode(cbNode, node.elementType);
-            case 264 /* JSDocNonNullableType */:
-                return visitNode(cbNode, node.type);
-            case 263 /* JSDocNullableType */:
-                return visitNode(cbNode, node.type);
-            case 265 /* JSDocRecordType */:
-                return visitNodes(cbNodes, node.members);
-            case 267 /* JSDocTypeReference */:
-                return visitNode(cbNode, node.name) ||
-                    visitNodes(cbNodes, node.typeArguments);
-            case 268 /* JSDocOptionalType */:
-                return visitNode(cbNode, node.type);
-            case 269 /* JSDocFunctionType */:
-                return visitNodes(cbNodes, node.parameters) ||
-                    visitNode(cbNode, node.type);
-            case 270 /* JSDocVariadicType */:
-                return visitNode(cbNode, node.type);
-            case 271 /* JSDocConstructorType */:
-                return visitNode(cbNode, node.type);
-            case 272 /* JSDocThisType */:
-                return visitNode(cbNode, node.type);
-            case 266 /* JSDocRecordMember */:
-                return visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.type);
-            case 273 /* JSDocComment */:
-                return visitNodes(cbNodes, node.tags);
-            case 275 /* JSDocParameterTag */:
-                return visitNode(cbNode, node.preParameterName) ||
-                    visitNode(cbNode, node.typeExpression) ||
-                    visitNode(cbNode, node.postParameterName);
-            case 276 /* JSDocReturnTag */:
-                return visitNode(cbNode, node.typeExpression);
-            case 277 /* JSDocTypeTag */:
-                return visitNode(cbNode, node.typeExpression);
-            case 278 /* JSDocTemplateTag */:
-                return visitNodes(cbNodes, node.typeParameters);
-            case 279 /* JSDocTypedefTag */:
-                return visitNode(cbNode, node.typeExpression) ||
-                    visitNode(cbNode, node.name) ||
-                    visitNode(cbNode, node.jsDocTypeLiteral);
-            case 281 /* JSDocTypeLiteral */:
-                return visitNodes(cbNodes, node.jsDocPropertyTags);
-            case 280 /* JSDocPropertyTag */:
-                return visitNode(cbNode, node.typeExpression) ||
-                    visitNode(cbNode, node.name);
-        }
-    }
-    ts.forEachChild = forEachChild;
-    function createSourceFile(fileName, sourceText, languageVersion, setParentNodes, scriptKind) {
-        if (setParentNodes === void 0) { setParentNodes = false; }
-        var start = new Date().getTime();
-        var result = Parser.parseSourceFile(fileName, sourceText, languageVersion, /*syntaxCursor*/ undefined, setParentNodes, scriptKind);
-        ts.parseTime += new Date().getTime() - start;
-        return result;
-    }
-    ts.createSourceFile = createSourceFile;
-    function isExternalModule(file) {
-        return file.externalModuleIndicator !== undefined;
-    }
-    ts.isExternalModule = isExternalModule;
-    // Produces a new SourceFile for the 'newText' provided. The 'textChangeRange' parameter
-    // indicates what changed between the 'text' that this SourceFile has and the 'newText'.
-    // The SourceFile will be created with the compiler attempting to reuse as many nodes from
-    // this file as possible.
-    //
-    // Note: this function mutates nodes from this SourceFile. That means any existing nodes
-    // from this SourceFile that are being held onto may change as a result (including
-    // becoming detached from any SourceFile).  It is recommended that this SourceFile not
-    // be used once 'update' is called on it.
-    function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
-        return IncrementalParser.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
-    }
-    ts.updateSourceFile = updateSourceFile;
-    /* @internal */
-    function parseIsolatedJSDocComment(content, start, length) {
-        var result = Parser.JSDocParser.parseIsolatedJSDocComment(content, start, length);
-        if (result && result.jsDocComment) {
-            // because the jsDocComment was parsed out of the source file, it might
-            // not be covered by the fixupParentReferences.
-            Parser.fixupParentReferences(result.jsDocComment);
-        }
-        return result;
-    }
-    ts.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
-    /* @internal */
-    // Exposed only for testing.
-    function parseJSDocTypeExpressionForTests(content, start, length) {
-        return Parser.JSDocParser.parseJSDocTypeExpressionForTests(content, start, length);
-    }
-    ts.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-    // Implement the parser as a singleton module.  We do this for perf reasons because creating
-    // parser instances can actually be expensive enough to impact us on projects with many source
-    // files.
-    var Parser;
-    (function (Parser) {
-        // Share a single scanner across all calls to parse a source file.  This helps speed things
-        // up by avoiding the cost of creating/compiling scanners over and over again.
-        var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
-        var disallowInAndDecoratorContext = 4194304 /* DisallowInContext */ | 16777216 /* DecoratorContext */;
-        // capture constructors in 'initializeState' to avoid null checks
-        var NodeConstructor;
-        var SourceFileConstructor;
-        var sourceFile;
-        var parseDiagnostics;
-        var syntaxCursor;
-        var token;
-        var sourceText;
-        var nodeCount;
-        var identifiers;
-        var identifierCount;
-        var parsingContext;
-        // Flags that dictate what parsing context we're in.  For example:
-        // Whether or not we are in strict parsing mode.  All that changes in strict parsing mode is
-        // that some tokens that would be considered identifiers may be considered keywords.
-        //
-        // When adding more parser context flags, consider which is the more common case that the
-        // flag will be in.  This should be the 'false' state for that flag.  The reason for this is
-        // that we don't store data in our nodes unless the value is in the *non-default* state.  So,
-        // for example, more often than code 'allows-in' (or doesn't 'disallow-in').  We opt for
-        // 'disallow-in' set to 'false'.  Otherwise, if we had 'allowsIn' set to 'true', then almost
-        // all nodes would need extra state on them to store this info.
-        //
-        // Note:  'allowIn' and 'allowYield' track 1:1 with the [in] and [yield] concepts in the ES6
-        // grammar specification.
-        //
-        // An important thing about these context concepts.  By default they are effectively inherited
-        // while parsing through every grammar production.  i.e. if you don't change them, then when
-        // you parse a sub-production, it will have the same context values as the parent production.
-        // This is great most of the time.  After all, consider all the 'expression' grammar productions
-        // and how nearly all of them pass along the 'in' and 'yield' context values:
-        //
-        // EqualityExpression[In, Yield] :
-        //      RelationalExpression[?In, ?Yield]
-        //      EqualityExpression[?In, ?Yield] == RelationalExpression[?In, ?Yield]
-        //      EqualityExpression[?In, ?Yield] != RelationalExpression[?In, ?Yield]
-        //      EqualityExpression[?In, ?Yield] === RelationalExpression[?In, ?Yield]
-        //      EqualityExpression[?In, ?Yield] !== RelationalExpression[?In, ?Yield]
-        //
-        // Where you have to be careful is then understanding what the points are in the grammar
-        // where the values are *not* passed along.  For example:
-        //
-        // SingleNameBinding[Yield,GeneratorParameter]
-        //      [+GeneratorParameter]BindingIdentifier[Yield] Initializer[In]opt
-        //      [~GeneratorParameter]BindingIdentifier[?Yield]Initializer[In, ?Yield]opt
-        //
-        // Here this is saying that if the GeneratorParameter context flag is set, that we should
-        // explicitly set the 'yield' context flag to false before calling into the BindingIdentifier
-        // and we should explicitly unset the 'yield' context flag before calling into the Initializer.
-        // production.  Conversely, if the GeneratorParameter context flag is not set, then we
-        // should leave the 'yield' context flag alone.
-        //
-        // Getting this all correct is tricky and requires careful reading of the grammar to
-        // understand when these values should be changed versus when they should be inherited.
-        //
-        // Note: it should not be necessary to save/restore these flags during speculative/lookahead
-        // parsing.  These context flags are naturally stored and restored through normal recursive
-        // descent parsing and unwinding.
-        var contextFlags;
-        // Whether or not we've had a parse error since creating the last AST node.  If we have
-        // encountered an error, it will be stored on the next AST node we create.  Parse errors
-        // can be broken down into three categories:
-        //
-        // 1) An error that occurred during scanning.  For example, an unterminated literal, or a
-        //    character that was completely not understood.
-        //
-        // 2) A token was expected, but was not present.  This type of error is commonly produced
-        //    by the 'parseExpected' function.
-        //
-        // 3) A token was present that no parsing function was able to consume.  This type of error
-        //    only occurs in the 'abortParsingListOrMoveToNextToken' function when the parser
-        //    decides to skip the token.
-        //
-        // In all of these cases, we want to mark the next node as having had an error before it.
-        // With this mark, we can know in incremental settings if this node can be reused, or if
-        // we have to reparse it.  If we don't keep this information around, we may just reuse the
-        // node.  in that event we would then not produce the same errors as we did before, causing
-        // significant confusion problems.
-        //
-        // Note: it is necessary that this value be saved/restored during speculative/lookahead
-        // parsing.  During lookahead parsing, we will often create a node.  That node will have
-        // this value attached, and then this value will be set back to 'false'.  If we decide to
-        // rewind, we must get back to the same value we had prior to the lookahead.
-        //
-        // Note: any errors at the end of the file that do not precede a regular node, should get
-        // attached to the EOF token.
-        var parseErrorBeforeNextFinishedNode = false;
-        function parseSourceFile(fileName, _sourceText, languageVersion, _syntaxCursor, setParentNodes, scriptKind) {
-            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
-            initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind);
-            var result = parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind);
-            clearState();
-            return result;
-        }
-        Parser.parseSourceFile = parseSourceFile;
-        function getLanguageVariant(scriptKind) {
-            // .tsx and .jsx files are treated as jsx language variant.
-            return scriptKind === 4 /* TSX */ || scriptKind === 2 /* JSX */ || scriptKind === 1 /* JS */ ? 1 /* JSX */ : 0 /* Standard */;
-        }
-        function initializeState(fileName, _sourceText, languageVersion, _syntaxCursor, scriptKind) {
-            NodeConstructor = ts.objectAllocator.getNodeConstructor();
-            SourceFileConstructor = ts.objectAllocator.getSourceFileConstructor();
-            sourceText = _sourceText;
-            syntaxCursor = _syntaxCursor;
-            parseDiagnostics = [];
-            parsingContext = 0;
-            identifiers = {};
-            identifierCount = 0;
-            nodeCount = 0;
-            contextFlags = scriptKind === 1 /* JS */ || scriptKind === 2 /* JSX */ ? 134217728 /* JavaScriptFile */ : 0 /* None */;
-            parseErrorBeforeNextFinishedNode = false;
-            // Initialize and prime the scanner before parsing the source elements.
-            scanner.setText(sourceText);
-            scanner.setOnError(scanError);
-            scanner.setScriptTarget(languageVersion);
-            scanner.setLanguageVariant(getLanguageVariant(scriptKind));
-        }
-        function clearState() {
-            // Clear out the text the scanner is pointing at, so it doesn't keep anything alive unnecessarily.
-            scanner.setText("");
-            scanner.setOnError(undefined);
-            // Clear any data.  We don't want to accidentally hold onto it for too long.
-            parseDiagnostics = undefined;
-            sourceFile = undefined;
-            identifiers = undefined;
-            syntaxCursor = undefined;
-            sourceText = undefined;
-        }
-        function parseSourceFileWorker(fileName, languageVersion, setParentNodes, scriptKind) {
-            sourceFile = createSourceFile(fileName, languageVersion, scriptKind);
-            sourceFile.flags = contextFlags;
-            // Prime the scanner.
-            token = nextToken();
-            processReferenceComments(sourceFile);
-            sourceFile.statements = parseList(0 /* SourceElements */, parseStatement);
-            ts.Debug.assert(token === 1 /* EndOfFileToken */);
-            sourceFile.endOfFileToken = parseTokenNode();
-            setExternalModuleIndicator(sourceFile);
-            sourceFile.nodeCount = nodeCount;
-            sourceFile.identifierCount = identifierCount;
-            sourceFile.identifiers = identifiers;
-            sourceFile.parseDiagnostics = parseDiagnostics;
-            if (setParentNodes) {
-                fixupParentReferences(sourceFile);
-            }
-            return sourceFile;
-        }
-        function addJSDocComment(node) {
-            if (contextFlags & 134217728 /* JavaScriptFile */) {
-                var comments = ts.getLeadingCommentRangesOfNode(node, sourceFile);
-                if (comments) {
-                    for (var _i = 0, comments_1 = comments; _i < comments_1.length; _i++) {
-                        var comment = comments_1[_i];
-                        var jsDocComment = JSDocParser.parseJSDocComment(node, comment.pos, comment.end - comment.pos);
-                        if (!jsDocComment) {
-                            continue;
-                        }
-                        if (!node.jsDocComments) {
-                            node.jsDocComments = [];
-                        }
-                        node.jsDocComments.push(jsDocComment);
-                    }
-                }
-            }
-            return node;
-        }
-        function fixupParentReferences(rootNode) {
-            // normally parent references are set during binding. However, for clients that only need
-            // a syntax tree, and no semantic features, then the binding process is an unnecessary
-            // overhead.  This functions allows us to set all the parents, without all the expense of
-            // binding.
-            var parent = rootNode;
-            forEachChild(rootNode, visitNode);
-            return;
-            function visitNode(n) {
-                // walk down setting parents that differ from the parent we think it should be.  This
-                // allows us to quickly bail out of setting parents for subtrees during incremental
-                // parsing
-                if (n.parent !== parent) {
-                    n.parent = parent;
-                    var saveParent = parent;
-                    parent = n;
-                    forEachChild(n, visitNode);
-                    if (n.jsDocComments) {
-                        for (var _i = 0, _a = n.jsDocComments; _i < _a.length; _i++) {
-                            var jsDocComment = _a[_i];
-                            jsDocComment.parent = n;
-                            parent = jsDocComment;
-                            forEachChild(jsDocComment, visitNode);
-                        }
-                    }
-                    parent = saveParent;
-                }
-            }
-        }
-        Parser.fixupParentReferences = fixupParentReferences;
-        function createSourceFile(fileName, languageVersion, scriptKind) {
-            // code from createNode is inlined here so createNode won't have to deal with special case of creating source files
-            // this is quite rare comparing to other nodes and createNode should be as fast as possible
-            var sourceFile = new SourceFileConstructor(256 /* SourceFile */, /*pos*/ 0, /* end */ sourceText.length);
-            nodeCount++;
-            sourceFile.text = sourceText;
-            sourceFile.bindDiagnostics = [];
-            sourceFile.languageVersion = languageVersion;
-            sourceFile.fileName = ts.normalizePath(fileName);
-            sourceFile.languageVariant = getLanguageVariant(scriptKind);
-            sourceFile.isDeclarationFile = ts.fileExtensionIs(sourceFile.fileName, ".d.ts");
-            sourceFile.scriptKind = scriptKind;
-            return sourceFile;
-        }
-        function setContextFlag(val, flag) {
-            if (val) {
-                contextFlags |= flag;
-            }
-            else {
-                contextFlags &= ~flag;
-            }
-        }
-        function setDisallowInContext(val) {
-            setContextFlag(val, 4194304 /* DisallowInContext */);
-        }
-        function setYieldContext(val) {
-            setContextFlag(val, 8388608 /* YieldContext */);
-        }
-        function setDecoratorContext(val) {
-            setContextFlag(val, 16777216 /* DecoratorContext */);
-        }
-        function setAwaitContext(val) {
-            setContextFlag(val, 33554432 /* AwaitContext */);
-        }
-        function doOutsideOfContext(context, func) {
-            // contextFlagsToClear will contain only the context flags that are
-            // currently set that we need to temporarily clear
-            // We don't just blindly reset to the previous flags to ensure
-            // that we do not mutate cached flags for the incremental
-            // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
-            // HasAggregatedChildData).
-            var contextFlagsToClear = context & contextFlags;
-            if (contextFlagsToClear) {
-                // clear the requested context flags
-                setContextFlag(/*val*/ false, contextFlagsToClear);
-                var result = func();
-                // restore the context flags we just cleared
-                setContextFlag(/*val*/ true, contextFlagsToClear);
-                return result;
-            }
-            // no need to do anything special as we are not in any of the requested contexts
-            return func();
-        }
-        function doInsideOfContext(context, func) {
-            // contextFlagsToSet will contain only the context flags that
-            // are not currently set that we need to temporarily enable.
-            // We don't just blindly reset to the previous flags to ensure
-            // that we do not mutate cached flags for the incremental
-            // parser (ThisNodeHasError, ThisNodeOrAnySubNodesHasError, and
-            // HasAggregatedChildData).
-            var contextFlagsToSet = context & ~contextFlags;
-            if (contextFlagsToSet) {
-                // set the requested context flags
-                setContextFlag(/*val*/ true, contextFlagsToSet);
-                var result = func();
-                // reset the context flags we just set
-                setContextFlag(/*val*/ false, contextFlagsToSet);
-                return result;
-            }
-            // no need to do anything special as we are already in all of the requested contexts
-            return func();
-        }
-        function allowInAnd(func) {
-            return doOutsideOfContext(4194304 /* DisallowInContext */, func);
-        }
-        function disallowInAnd(func) {
-            return doInsideOfContext(4194304 /* DisallowInContext */, func);
-        }
-        function doInYieldContext(func) {
-            return doInsideOfContext(8388608 /* YieldContext */, func);
-        }
-        function doInDecoratorContext(func) {
-            return doInsideOfContext(16777216 /* DecoratorContext */, func);
-        }
-        function doInAwaitContext(func) {
-            return doInsideOfContext(33554432 /* AwaitContext */, func);
-        }
-        function doOutsideOfAwaitContext(func) {
-            return doOutsideOfContext(33554432 /* AwaitContext */, func);
-        }
-        function doInYieldAndAwaitContext(func) {
-            return doInsideOfContext(8388608 /* YieldContext */ | 33554432 /* AwaitContext */, func);
-        }
-        function inContext(flags) {
-            return (contextFlags & flags) !== 0;
-        }
-        function inYieldContext() {
-            return inContext(8388608 /* YieldContext */);
-        }
-        function inDisallowInContext() {
-            return inContext(4194304 /* DisallowInContext */);
-        }
-        function inDecoratorContext() {
-            return inContext(16777216 /* DecoratorContext */);
-        }
-        function inAwaitContext() {
-            return inContext(33554432 /* AwaitContext */);
-        }
-        function parseErrorAtCurrentToken(message, arg0) {
-            var start = scanner.getTokenPos();
-            var length = scanner.getTextPos() - start;
-            parseErrorAtPosition(start, length, message, arg0);
-        }
-        function parseErrorAtPosition(start, length, message, arg0) {
-            // Don't report another error if it would just be at the same position as the last error.
-            var lastError = ts.lastOrUndefined(parseDiagnostics);
-            if (!lastError || start !== lastError.start) {
-                parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, start, length, message, arg0));
-            }
-            // Mark that we've encountered an error.  We'll set an appropriate bit on the next
-            // node we finish so that it can't be reused incrementally.
-            parseErrorBeforeNextFinishedNode = true;
-        }
-        function scanError(message, length) {
-            var pos = scanner.getTextPos();
-            parseErrorAtPosition(pos, length || 0, message);
-        }
-        function getNodePos() {
-            return scanner.getStartPos();
-        }
-        function getNodeEnd() {
-            return scanner.getStartPos();
-        }
-        function nextToken() {
-            return token = scanner.scan();
-        }
-        function reScanGreaterToken() {
-            return token = scanner.reScanGreaterToken();
-        }
-        function reScanSlashToken() {
-            return token = scanner.reScanSlashToken();
-        }
-        function reScanTemplateToken() {
-            return token = scanner.reScanTemplateToken();
-        }
-        function scanJsxIdentifier() {
-            return token = scanner.scanJsxIdentifier();
-        }
-        function scanJsxText() {
-            return token = scanner.scanJsxToken();
-        }
-        function speculationHelper(callback, isLookAhead) {
-            // Keep track of the state we'll need to rollback to if lookahead fails (or if the
-            // caller asked us to always reset our state).
-            var saveToken = token;
-            var saveParseDiagnosticsLength = parseDiagnostics.length;
-            var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
-            // Note: it is not actually necessary to save/restore the context flags here.  That's
-            // because the saving/restoring of these flags happens naturally through the recursive
-            // descent nature of our parser.  However, we still store this here just so we can
-            // assert that that invariant holds.
-            var saveContextFlags = contextFlags;
-            // If we're only looking ahead, then tell the scanner to only lookahead as well.
-            // Otherwise, if we're actually speculatively parsing, then tell the scanner to do the
-            // same.
-            var result = isLookAhead
-                ? scanner.lookAhead(callback)
-                : scanner.tryScan(callback);
-            ts.Debug.assert(saveContextFlags === contextFlags);
-            // If our callback returned something 'falsy' or we're just looking ahead,
-            // then unconditionally restore us to where we were.
-            if (!result || isLookAhead) {
-                token = saveToken;
-                parseDiagnostics.length = saveParseDiagnosticsLength;
-                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
-            }
-            return result;
-        }
-        /** Invokes the provided callback then unconditionally restores the parser to the state it
-         * was in immediately prior to invoking the callback.  The result of invoking the callback
-         * is returned from this function.
-         */
-        function lookAhead(callback) {
-            return speculationHelper(callback, /*isLookAhead*/ true);
-        }
-        /** Invokes the provided callback.  If the callback returns something falsy, then it restores
-         * the parser to the state it was in immediately prior to invoking the callback.  If the
-         * callback returns something truthy, then the parser state is not rolled back.  The result
-         * of invoking the callback is returned from this function.
-         */
-        function tryParse(callback) {
-            return speculationHelper(callback, /*isLookAhead*/ false);
-        }
-        // Ignore strict mode flag because we will report an error in type checker instead.
-        function isIdentifier() {
-            if (token === 69 /* Identifier */) {
-                return true;
-            }
-            // If we have a 'yield' keyword, and we're in the [yield] context, then 'yield' is
-            // considered a keyword and is not an identifier.
-            if (token === 114 /* YieldKeyword */ && inYieldContext()) {
-                return false;
-            }
-            // If we have a 'await' keyword, and we're in the [Await] context, then 'await' is
-            // considered a keyword and is not an identifier.
-            if (token === 119 /* AwaitKeyword */ && inAwaitContext()) {
-                return false;
-            }
-            return token > 105 /* LastReservedWord */;
-        }
-        function parseExpected(kind, diagnosticMessage, shouldAdvance) {
-            if (shouldAdvance === void 0) { shouldAdvance = true; }
-            if (token === kind) {
-                if (shouldAdvance) {
-                    nextToken();
-                }
-                return true;
-            }
-            // Report specific message if provided with one.  Otherwise, report generic fallback message.
-            if (diagnosticMessage) {
-                parseErrorAtCurrentToken(diagnosticMessage);
-            }
-            else {
-                parseErrorAtCurrentToken(ts.Diagnostics._0_expected, ts.tokenToString(kind));
-            }
-            return false;
-        }
-        function parseOptional(t) {
-            if (token === t) {
-                nextToken();
-                return true;
-            }
-            return false;
-        }
-        function parseOptionalToken(t) {
-            if (token === t) {
-                return parseTokenNode();
-            }
-            return undefined;
-        }
-        function parseExpectedToken(t, reportAtCurrentPosition, diagnosticMessage, arg0) {
-            return parseOptionalToken(t) ||
-                createMissingNode(t, reportAtCurrentPosition, diagnosticMessage, arg0);
-        }
-        function parseTokenNode() {
-            var node = createNode(token);
-            nextToken();
-            return finishNode(node);
-        }
-        function canParseSemicolon() {
-            // If there's a real semicolon, then we can always parse it out.
-            if (token === 23 /* SemicolonToken */) {
-                return true;
-            }
-            // We can parse out an optional semicolon in ASI cases in the following cases.
-            return token === 16 /* CloseBraceToken */ || token === 1 /* EndOfFileToken */ || scanner.hasPrecedingLineBreak();
-        }
-        function parseSemicolon() {
-            if (canParseSemicolon()) {
-                if (token === 23 /* SemicolonToken */) {
-                    // consume the semicolon if it was explicitly provided.
-                    nextToken();
-                }
-                return true;
-            }
-            else {
-                return parseExpected(23 /* SemicolonToken */);
-            }
-        }
-        // note: this function creates only node
-        function createNode(kind, pos) {
-            nodeCount++;
-            if (!(pos >= 0)) {
-                pos = scanner.getStartPos();
-            }
-            return new NodeConstructor(kind, pos, pos);
-        }
-        function finishNode(node, end) {
-            node.end = end === undefined ? scanner.getStartPos() : end;
-            if (contextFlags) {
-                node.flags |= contextFlags;
-            }
-            // Keep track on the node if we encountered an error while parsing it.  If we did, then
-            // we cannot reuse the node incrementally.  Once we've marked this node, clear out the
-            // flag so that we don't mark any subsequent nodes.
-            if (parseErrorBeforeNextFinishedNode) {
-                parseErrorBeforeNextFinishedNode = false;
-                node.flags |= 67108864 /* ThisNodeHasError */;
-            }
-            return node;
-        }
-        function createMissingNode(kind, reportAtCurrentPosition, diagnosticMessage, arg0) {
-            if (reportAtCurrentPosition) {
-                parseErrorAtPosition(scanner.getStartPos(), 0, diagnosticMessage, arg0);
-            }
-            else {
-                parseErrorAtCurrentToken(diagnosticMessage, arg0);
-            }
-            var result = createNode(kind, scanner.getStartPos());
-            result.text = "";
-            return finishNode(result);
-        }
-        function internIdentifier(text) {
-            text = ts.escapeIdentifier(text);
-            return ts.hasProperty(identifiers, text) ? identifiers[text] : (identifiers[text] = text);
-        }
-        // An identifier that starts with two underscores has an extra underscore character prepended to it to avoid issues
-        // with magic property names like '__proto__'. The 'identifiers' object is used to share a single string instance for
-        // each identifier in order to reduce memory consumption.
-        function createIdentifier(isIdentifier, diagnosticMessage) {
-            identifierCount++;
-            if (isIdentifier) {
-                var node = createNode(69 /* Identifier */);
-                // Store original token kind if it is not just an Identifier so we can report appropriate error later in type checker
-                if (token !== 69 /* Identifier */) {
-                    node.originalKeywordKind = token;
-                }
-                node.text = internIdentifier(scanner.getTokenValue());
-                nextToken();
-                return finishNode(node);
-            }
-            return createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ false, diagnosticMessage || ts.Diagnostics.Identifier_expected);
-        }
-        function parseIdentifier(diagnosticMessage) {
-            return createIdentifier(isIdentifier(), diagnosticMessage);
-        }
-        function parseIdentifierName() {
-            return createIdentifier(ts.tokenIsIdentifierOrKeyword(token));
-        }
-        function isLiteralPropertyName() {
-            return ts.tokenIsIdentifierOrKeyword(token) ||
-                token === 9 /* StringLiteral */ ||
-                token === 8 /* NumericLiteral */;
-        }
-        function parsePropertyNameWorker(allowComputedPropertyNames) {
-            if (token === 9 /* StringLiteral */ || token === 8 /* NumericLiteral */) {
-                return parseLiteralNode(/*internName*/ true);
-            }
-            if (allowComputedPropertyNames && token === 19 /* OpenBracketToken */) {
-                return parseComputedPropertyName();
-            }
-            return parseIdentifierName();
-        }
-        function parsePropertyName() {
-            return parsePropertyNameWorker(/*allowComputedPropertyNames*/ true);
-        }
-        function parseSimplePropertyName() {
-            return parsePropertyNameWorker(/*allowComputedPropertyNames*/ false);
-        }
-        function isSimplePropertyName() {
-            return token === 9 /* StringLiteral */ || token === 8 /* NumericLiteral */ || ts.tokenIsIdentifierOrKeyword(token);
-        }
-        function parseComputedPropertyName() {
-            // PropertyName [Yield]:
-            //      LiteralPropertyName
-            //      ComputedPropertyName[?Yield]
-            var node = createNode(140 /* ComputedPropertyName */);
-            parseExpected(19 /* OpenBracketToken */);
-            // We parse any expression (including a comma expression). But the grammar
-            // says that only an assignment expression is allowed, so the grammar checker
-            // will error if it sees a comma expression.
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(20 /* CloseBracketToken */);
-            return finishNode(node);
-        }
-        function parseContextualModifier(t) {
-            return token === t && tryParse(nextTokenCanFollowModifier);
-        }
-        function nextTokenIsOnSameLineAndCanFollowModifier() {
-            nextToken();
-            if (scanner.hasPrecedingLineBreak()) {
-                return false;
-            }
-            return canFollowModifier();
-        }
-        function nextTokenCanFollowModifier() {
-            if (token === 74 /* ConstKeyword */) {
-                // 'const' is only a modifier if followed by 'enum'.
-                return nextToken() === 81 /* EnumKeyword */;
-            }
-            if (token === 82 /* ExportKeyword */) {
-                nextToken();
-                if (token === 77 /* DefaultKeyword */) {
-                    return lookAhead(nextTokenIsClassOrFunctionOrAsync);
-                }
-                return token !== 37 /* AsteriskToken */ && token !== 116 /* AsKeyword */ && token !== 15 /* OpenBraceToken */ && canFollowModifier();
-            }
-            if (token === 77 /* DefaultKeyword */) {
-                return nextTokenIsClassOrFunctionOrAsync();
-            }
-            if (token === 113 /* StaticKeyword */) {
-                nextToken();
-                return canFollowModifier();
-            }
-            return nextTokenIsOnSameLineAndCanFollowModifier();
-        }
-        function parseAnyContextualModifier() {
-            return ts.isModifierKind(token) && tryParse(nextTokenCanFollowModifier);
-        }
-        function canFollowModifier() {
-            return token === 19 /* OpenBracketToken */
-                || token === 15 /* OpenBraceToken */
-                || token === 37 /* AsteriskToken */
-                || token === 22 /* DotDotDotToken */
-                || isLiteralPropertyName();
-        }
-        function nextTokenIsClassOrFunctionOrAsync() {
-            nextToken();
-            return token === 73 /* ClassKeyword */ || token === 87 /* FunctionKeyword */ ||
-                (token === 118 /* AsyncKeyword */ && lookAhead(nextTokenIsFunctionKeywordOnSameLine));
-        }
-        // True if positioned at the start of a list element
-        function isListElement(parsingContext, inErrorRecovery) {
-            var node = currentNode(parsingContext);
-            if (node) {
-                return true;
-            }
-            switch (parsingContext) {
-                case 0 /* SourceElements */:
-                case 1 /* BlockStatements */:
-                case 3 /* SwitchClauseStatements */:
-                    // If we're in error recovery, then we don't want to treat ';' as an empty statement.
-                    // The problem is that ';' can show up in far too many contexts, and if we see one
-                    // and assume it's a statement, then we may bail out inappropriately from whatever
-                    // we're parsing.  For example, if we have a semicolon in the middle of a class, then
-                    // we really don't want to assume the class is over and we're on a statement in the
-                    // outer module.  We just want to consume and move on.
-                    return !(token === 23 /* SemicolonToken */ && inErrorRecovery) && isStartOfStatement();
-                case 2 /* SwitchClauses */:
-                    return token === 71 /* CaseKeyword */ || token === 77 /* DefaultKeyword */;
-                case 4 /* TypeMembers */:
-                    return lookAhead(isTypeMemberStart);
-                case 5 /* ClassMembers */:
-                    // We allow semicolons as class elements (as specified by ES6) as long as we're
-                    // not in error recovery.  If we're in error recovery, we don't want an errant
-                    // semicolon to be treated as a class member (since they're almost always used
-                    // for statements.
-                    return lookAhead(isClassMemberStart) || (token === 23 /* SemicolonToken */ && !inErrorRecovery);
-                case 6 /* EnumMembers */:
-                    // Include open bracket computed properties. This technically also lets in indexers,
-                    // which would be a candidate for improved error reporting.
-                    return token === 19 /* OpenBracketToken */ || isLiteralPropertyName();
-                case 12 /* ObjectLiteralMembers */:
-                    return token === 19 /* OpenBracketToken */ || token === 37 /* AsteriskToken */ || isLiteralPropertyName();
-                case 9 /* ObjectBindingElements */:
-                    return token === 19 /* OpenBracketToken */ || isLiteralPropertyName();
-                case 7 /* HeritageClauseElement */:
-                    // If we see { } then only consume it as an expression if it is followed by , or {
-                    // That way we won't consume the body of a class in its heritage clause.
-                    if (token === 15 /* OpenBraceToken */) {
-                        return lookAhead(isValidHeritageClauseObjectLiteral);
-                    }
-                    if (!inErrorRecovery) {
-                        return isStartOfLeftHandSideExpression() && !isHeritageClauseExtendsOrImplementsKeyword();
-                    }
-                    else {
-                        // If we're in error recovery we tighten up what we're willing to match.
-                        // That way we don't treat something like "this" as a valid heritage clause
-                        // element during recovery.
-                        return isIdentifier() && !isHeritageClauseExtendsOrImplementsKeyword();
-                    }
-                case 8 /* VariableDeclarations */:
-                    return isIdentifierOrPattern();
-                case 10 /* ArrayBindingElements */:
-                    return token === 24 /* CommaToken */ || token === 22 /* DotDotDotToken */ || isIdentifierOrPattern();
-                case 17 /* TypeParameters */:
-                    return isIdentifier();
-                case 11 /* ArgumentExpressions */:
-                case 15 /* ArrayLiteralMembers */:
-                    return token === 24 /* CommaToken */ || token === 22 /* DotDotDotToken */ || isStartOfExpression();
-                case 16 /* Parameters */:
-                    return isStartOfParameter();
-                case 18 /* TypeArguments */:
-                case 19 /* TupleElementTypes */:
-                    return token === 24 /* CommaToken */ || isStartOfType();
-                case 20 /* HeritageClauses */:
-                    return isHeritageClause();
-                case 21 /* ImportOrExportSpecifiers */:
-                    return ts.tokenIsIdentifierOrKeyword(token);
-                case 13 /* JsxAttributes */:
-                    return ts.tokenIsIdentifierOrKeyword(token) || token === 15 /* OpenBraceToken */;
-                case 14 /* JsxChildren */:
-                    return true;
-                case 22 /* JSDocFunctionParameters */:
-                case 23 /* JSDocTypeArguments */:
-                case 25 /* JSDocTupleTypes */:
-                    return JSDocParser.isJSDocType();
-                case 24 /* JSDocRecordMembers */:
-                    return isSimplePropertyName();
-            }
-            ts.Debug.fail("Non-exhaustive case in 'isListElement'.");
-        }
-        function isValidHeritageClauseObjectLiteral() {
-            ts.Debug.assert(token === 15 /* OpenBraceToken */);
-            if (nextToken() === 16 /* CloseBraceToken */) {
-                // if we see  "extends {}" then only treat the {} as what we're extending (and not
-                // the class body) if we have:
-                //
-                //      extends {} {
-                //      extends {},
-                //      extends {} extends
-                //      extends {} implements
-                var next = nextToken();
-                return next === 24 /* CommaToken */ || next === 15 /* OpenBraceToken */ || next === 83 /* ExtendsKeyword */ || next === 106 /* ImplementsKeyword */;
-            }
-            return true;
-        }
-        function nextTokenIsIdentifier() {
-            nextToken();
-            return isIdentifier();
-        }
-        function nextTokenIsIdentifierOrKeyword() {
-            nextToken();
-            return ts.tokenIsIdentifierOrKeyword(token);
-        }
-        function isHeritageClauseExtendsOrImplementsKeyword() {
-            if (token === 106 /* ImplementsKeyword */ ||
-                token === 83 /* ExtendsKeyword */) {
-                return lookAhead(nextTokenIsStartOfExpression);
-            }
-            return false;
-        }
-        function nextTokenIsStartOfExpression() {
-            nextToken();
-            return isStartOfExpression();
-        }
-        // True if positioned at a list terminator
-        function isListTerminator(kind) {
-            if (token === 1 /* EndOfFileToken */) {
-                // Being at the end of the file ends all lists.
-                return true;
-            }
-            switch (kind) {
-                case 1 /* BlockStatements */:
-                case 2 /* SwitchClauses */:
-                case 4 /* TypeMembers */:
-                case 5 /* ClassMembers */:
-                case 6 /* EnumMembers */:
-                case 12 /* ObjectLiteralMembers */:
-                case 9 /* ObjectBindingElements */:
-                case 21 /* ImportOrExportSpecifiers */:
-                    return token === 16 /* CloseBraceToken */;
-                case 3 /* SwitchClauseStatements */:
-                    return token === 16 /* CloseBraceToken */ || token === 71 /* CaseKeyword */ || token === 77 /* DefaultKeyword */;
-                case 7 /* HeritageClauseElement */:
-                    return token === 15 /* OpenBraceToken */ || token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */;
-                case 8 /* VariableDeclarations */:
-                    return isVariableDeclaratorListTerminator();
-                case 17 /* TypeParameters */:
-                    // Tokens other than '>' are here for better error recovery
-                    return token === 27 /* GreaterThanToken */ || token === 17 /* OpenParenToken */ || token === 15 /* OpenBraceToken */ || token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */;
-                case 11 /* ArgumentExpressions */:
-                    // Tokens other than ')' are here for better error recovery
-                    return token === 18 /* CloseParenToken */ || token === 23 /* SemicolonToken */;
-                case 15 /* ArrayLiteralMembers */:
-                case 19 /* TupleElementTypes */:
-                case 10 /* ArrayBindingElements */:
-                    return token === 20 /* CloseBracketToken */;
-                case 16 /* Parameters */:
-                    // Tokens other than ')' and ']' (the latter for index signatures) are here for better error recovery
-                    return token === 18 /* CloseParenToken */ || token === 20 /* CloseBracketToken */ /*|| token === SyntaxKind.OpenBraceToken*/;
-                case 18 /* TypeArguments */:
-                    // Tokens other than '>' are here for better error recovery
-                    return token === 27 /* GreaterThanToken */ || token === 17 /* OpenParenToken */;
-                case 20 /* HeritageClauses */:
-                    return token === 15 /* OpenBraceToken */ || token === 16 /* CloseBraceToken */;
-                case 13 /* JsxAttributes */:
-                    return token === 27 /* GreaterThanToken */ || token === 39 /* SlashToken */;
-                case 14 /* JsxChildren */:
-                    return token === 25 /* LessThanToken */ && lookAhead(nextTokenIsSlash);
-                case 22 /* JSDocFunctionParameters */:
-                    return token === 18 /* CloseParenToken */ || token === 54 /* ColonToken */ || token === 16 /* CloseBraceToken */;
-                case 23 /* JSDocTypeArguments */:
-                    return token === 27 /* GreaterThanToken */ || token === 16 /* CloseBraceToken */;
-                case 25 /* JSDocTupleTypes */:
-                    return token === 20 /* CloseBracketToken */ || token === 16 /* CloseBraceToken */;
-                case 24 /* JSDocRecordMembers */:
-                    return token === 16 /* CloseBraceToken */;
-            }
-        }
-        function isVariableDeclaratorListTerminator() {
-            // If we can consume a semicolon (either explicitly, or with ASI), then consider us done
-            // with parsing the list of  variable declarators.
-            if (canParseSemicolon()) {
-                return true;
-            }
-            // in the case where we're parsing the variable declarator of a 'for-in' statement, we
-            // are done if we see an 'in' keyword in front of us. Same with for-of
-            if (isInOrOfKeyword(token)) {
-                return true;
-            }
-            // ERROR RECOVERY TWEAK:
-            // For better error recovery, if we see an '=>' then we just stop immediately.  We've got an
-            // arrow function here and it's going to be very unlikely that we'll resynchronize and get
-            // another variable declaration.
-            if (token === 34 /* EqualsGreaterThanToken */) {
-                return true;
-            }
-            // Keep trying to parse out variable declarators.
-            return false;
-        }
-        // True if positioned at element or terminator of the current list or any enclosing list
-        function isInSomeParsingContext() {
-            for (var kind = 0; kind < 26 /* Count */; kind++) {
-                if (parsingContext & (1 << kind)) {
-                    if (isListElement(kind, /*inErrorRecovery*/ true) || isListTerminator(kind)) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        // Parses a list of elements
-        function parseList(kind, parseElement) {
-            var saveParsingContext = parsingContext;
-            parsingContext |= 1 << kind;
-            var result = [];
-            result.pos = getNodePos();
-            while (!isListTerminator(kind)) {
-                if (isListElement(kind, /*inErrorRecovery*/ false)) {
-                    var element = parseListElement(kind, parseElement);
-                    result.push(element);
-                    continue;
-                }
-                if (abortParsingListOrMoveToNextToken(kind)) {
-                    break;
-                }
-            }
-            result.end = getNodeEnd();
-            parsingContext = saveParsingContext;
-            return result;
-        }
-        function parseListElement(parsingContext, parseElement) {
-            var node = currentNode(parsingContext);
-            if (node) {
-                return consumeNode(node);
-            }
-            return parseElement();
-        }
-        function currentNode(parsingContext) {
-            // If there is an outstanding parse error that we've encountered, but not attached to
-            // some node, then we cannot get a node from the old source tree.  This is because we
-            // want to mark the next node we encounter as being unusable.
-            //
-            // Note: This may be too conservative.  Perhaps we could reuse the node and set the bit
-            // on it (or its leftmost child) as having the error.  For now though, being conservative
-            // is nice and likely won't ever affect perf.
-            if (parseErrorBeforeNextFinishedNode) {
-                return undefined;
-            }
-            if (!syntaxCursor) {
-                // if we don't have a cursor, we could never return a node from the old tree.
-                return undefined;
-            }
-            var node = syntaxCursor.currentNode(scanner.getStartPos());
-            // Can't reuse a missing node.
-            if (ts.nodeIsMissing(node)) {
-                return undefined;
-            }
-            // Can't reuse a node that intersected the change range.
-            if (node.intersectsChange) {
-                return undefined;
-            }
-            // Can't reuse a node that contains a parse error.  This is necessary so that we
-            // produce the same set of errors again.
-            if (ts.containsParseError(node)) {
-                return undefined;
-            }
-            // We can only reuse a node if it was parsed under the same strict mode that we're
-            // currently in.  i.e. if we originally parsed a node in non-strict mode, but then
-            // the user added 'using strict' at the top of the file, then we can't use that node
-            // again as the presence of strict mode may cause us to parse the tokens in the file
-            // differently.
-            //
-            // Note: we *can* reuse tokens when the strict mode changes.  That's because tokens
-            // are unaffected by strict mode.  It's just the parser will decide what to do with it
-            // differently depending on what mode it is in.
-            //
-            // This also applies to all our other context flags as well.
-            var nodeContextFlags = node.flags & 197132288 /* ContextFlags */;
-            if (nodeContextFlags !== contextFlags) {
-                return undefined;
-            }
-            // Ok, we have a node that looks like it could be reused.  Now verify that it is valid
-            // in the current list parsing context that we're currently at.
-            if (!canReuseNode(node, parsingContext)) {
-                return undefined;
-            }
-            return node;
-        }
-        function consumeNode(node) {
-            // Move the scanner so it is after the node we just consumed.
-            scanner.setTextPos(node.end);
-            nextToken();
-            return node;
-        }
-        function canReuseNode(node, parsingContext) {
-            switch (parsingContext) {
-                case 5 /* ClassMembers */:
-                    return isReusableClassMember(node);
-                case 2 /* SwitchClauses */:
-                    return isReusableSwitchClause(node);
-                case 0 /* SourceElements */:
-                case 1 /* BlockStatements */:
-                case 3 /* SwitchClauseStatements */:
-                    return isReusableStatement(node);
-                case 6 /* EnumMembers */:
-                    return isReusableEnumMember(node);
-                case 4 /* TypeMembers */:
-                    return isReusableTypeMember(node);
-                case 8 /* VariableDeclarations */:
-                    return isReusableVariableDeclaration(node);
-                case 16 /* Parameters */:
-                    return isReusableParameter(node);
-                // Any other lists we do not care about reusing nodes in.  But feel free to add if
-                // you can do so safely.  Danger areas involve nodes that may involve speculative
-                // parsing.  If speculative parsing is involved with the node, then the range the
-                // parser reached while looking ahead might be in the edited range (see the example
-                // in canReuseVariableDeclaratorNode for a good case of this).
-                case 20 /* HeritageClauses */:
-                // This would probably be safe to reuse.  There is no speculative parsing with
-                // heritage clauses.
-                case 17 /* TypeParameters */:
-                // This would probably be safe to reuse.  There is no speculative parsing with
-                // type parameters.  Note that that's because type *parameters* only occur in
-                // unambiguous *type* contexts.  While type *arguments* occur in very ambiguous
-                // *expression* contexts.
-                case 19 /* TupleElementTypes */:
-                // This would probably be safe to reuse.  There is no speculative parsing with
-                // tuple types.
-                // Technically, type argument list types are probably safe to reuse.  While
-                // speculative parsing is involved with them (since type argument lists are only
-                // produced from speculative parsing a < as a type argument list), we only have
-                // the types because speculative parsing succeeded.  Thus, the lookahead never
-                // went past the end of the list and rewound.
-                case 18 /* TypeArguments */:
-                // Note: these are almost certainly not safe to ever reuse.  Expressions commonly
-                // need a large amount of lookahead, and we should not reuse them as they may
-                // have actually intersected the edit.
-                case 11 /* ArgumentExpressions */:
-                // This is not safe to reuse for the same reason as the 'AssignmentExpression'
-                // cases.  i.e. a property assignment may end with an expression, and thus might
-                // have lookahead far beyond it's old node.
-                case 12 /* ObjectLiteralMembers */:
-                // This is probably not safe to reuse.  There can be speculative parsing with
-                // type names in a heritage clause.  There can be generic names in the type
-                // name list, and there can be left hand side expressions (which can have type
-                // arguments.)
-                case 7 /* HeritageClauseElement */:
-                // Perhaps safe to reuse, but it's unlikely we'd see more than a dozen attributes
-                // on any given element. Same for children.
-                case 13 /* JsxAttributes */:
-                case 14 /* JsxChildren */:
-            }
-            return false;
-        }
-        function isReusableClassMember(node) {
-            if (node) {
-                switch (node.kind) {
-                    case 148 /* Constructor */:
-                    case 153 /* IndexSignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 145 /* PropertyDeclaration */:
-                    case 198 /* SemicolonClassElement */:
-                        return true;
-                    case 147 /* MethodDeclaration */:
-                        // Method declarations are not necessarily reusable.  An object-literal
-                        // may have a method calls "constructor(...)" and we must reparse that
-                        // into an actual .ConstructorDeclaration.
-                        var methodDeclaration = node;
-                        var nameIsConstructor = methodDeclaration.name.kind === 69 /* Identifier */ &&
-                            methodDeclaration.name.originalKeywordKind === 121 /* ConstructorKeyword */;
-                        return !nameIsConstructor;
-                }
-            }
-            return false;
-        }
-        function isReusableSwitchClause(node) {
-            if (node) {
-                switch (node.kind) {
-                    case 249 /* CaseClause */:
-                    case 250 /* DefaultClause */:
-                        return true;
-                }
-            }
-            return false;
-        }
-        function isReusableStatement(node) {
-            if (node) {
-                switch (node.kind) {
-                    case 220 /* FunctionDeclaration */:
-                    case 200 /* VariableStatement */:
-                    case 199 /* Block */:
-                    case 203 /* IfStatement */:
-                    case 202 /* ExpressionStatement */:
-                    case 215 /* ThrowStatement */:
-                    case 211 /* ReturnStatement */:
-                    case 213 /* SwitchStatement */:
-                    case 210 /* BreakStatement */:
-                    case 209 /* ContinueStatement */:
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                    case 206 /* ForStatement */:
-                    case 205 /* WhileStatement */:
-                    case 212 /* WithStatement */:
-                    case 201 /* EmptyStatement */:
-                    case 216 /* TryStatement */:
-                    case 214 /* LabeledStatement */:
-                    case 204 /* DoStatement */:
-                    case 217 /* DebuggerStatement */:
-                    case 230 /* ImportDeclaration */:
-                    case 229 /* ImportEqualsDeclaration */:
-                    case 236 /* ExportDeclaration */:
-                    case 235 /* ExportAssignment */:
-                    case 225 /* ModuleDeclaration */:
-                    case 221 /* ClassDeclaration */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                        return true;
-                }
-            }
-            return false;
-        }
-        function isReusableEnumMember(node) {
-            return node.kind === 255 /* EnumMember */;
-        }
-        function isReusableTypeMember(node) {
-            if (node) {
-                switch (node.kind) {
-                    case 152 /* ConstructSignature */:
-                    case 146 /* MethodSignature */:
-                    case 153 /* IndexSignature */:
-                    case 144 /* PropertySignature */:
-                    case 151 /* CallSignature */:
-                        return true;
-                }
-            }
-            return false;
-        }
-        function isReusableVariableDeclaration(node) {
-            if (node.kind !== 218 /* VariableDeclaration */) {
-                return false;
-            }
-            // Very subtle incremental parsing bug.  Consider the following code:
-            //
-            //      let v = new List < A, B
-            //
-            // This is actually legal code.  It's a list of variable declarators "v = new List<A"
-            // on one side and "B" on the other. If you then change that to:
-            //
-            //      let v = new List < A, B >()
-            //
-            // then we have a problem.  "v = new List<A" doesn't intersect the change range, so we
-            // start reparsing at "B" and we completely fail to handle this properly.
-            //
-            // In order to prevent this, we do not allow a variable declarator to be reused if it
-            // has an initializer.
-            var variableDeclarator = node;
-            return variableDeclarator.initializer === undefined;
-        }
-        function isReusableParameter(node) {
-            if (node.kind !== 142 /* Parameter */) {
-                return false;
-            }
-            // See the comment in isReusableVariableDeclaration for why we do this.
-            var parameter = node;
-            return parameter.initializer === undefined;
-        }
-        // Returns true if we should abort parsing.
-        function abortParsingListOrMoveToNextToken(kind) {
-            parseErrorAtCurrentToken(parsingContextErrors(kind));
-            if (isInSomeParsingContext()) {
-                return true;
-            }
-            nextToken();
-            return false;
-        }
-        function parsingContextErrors(context) {
-            switch (context) {
-                case 0 /* SourceElements */: return ts.Diagnostics.Declaration_or_statement_expected;
-                case 1 /* BlockStatements */: return ts.Diagnostics.Declaration_or_statement_expected;
-                case 2 /* SwitchClauses */: return ts.Diagnostics.case_or_default_expected;
-                case 3 /* SwitchClauseStatements */: return ts.Diagnostics.Statement_expected;
-                case 4 /* TypeMembers */: return ts.Diagnostics.Property_or_signature_expected;
-                case 5 /* ClassMembers */: return ts.Diagnostics.Unexpected_token_A_constructor_method_accessor_or_property_was_expected;
-                case 6 /* EnumMembers */: return ts.Diagnostics.Enum_member_expected;
-                case 7 /* HeritageClauseElement */: return ts.Diagnostics.Expression_expected;
-                case 8 /* VariableDeclarations */: return ts.Diagnostics.Variable_declaration_expected;
-                case 9 /* ObjectBindingElements */: return ts.Diagnostics.Property_destructuring_pattern_expected;
-                case 10 /* ArrayBindingElements */: return ts.Diagnostics.Array_element_destructuring_pattern_expected;
-                case 11 /* ArgumentExpressions */: return ts.Diagnostics.Argument_expression_expected;
-                case 12 /* ObjectLiteralMembers */: return ts.Diagnostics.Property_assignment_expected;
-                case 15 /* ArrayLiteralMembers */: return ts.Diagnostics.Expression_or_comma_expected;
-                case 16 /* Parameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 17 /* TypeParameters */: return ts.Diagnostics.Type_parameter_declaration_expected;
-                case 18 /* TypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 19 /* TupleElementTypes */: return ts.Diagnostics.Type_expected;
-                case 20 /* HeritageClauses */: return ts.Diagnostics.Unexpected_token_expected;
-                case 21 /* ImportOrExportSpecifiers */: return ts.Diagnostics.Identifier_expected;
-                case 13 /* JsxAttributes */: return ts.Diagnostics.Identifier_expected;
-                case 14 /* JsxChildren */: return ts.Diagnostics.Identifier_expected;
-                case 22 /* JSDocFunctionParameters */: return ts.Diagnostics.Parameter_declaration_expected;
-                case 23 /* JSDocTypeArguments */: return ts.Diagnostics.Type_argument_expected;
-                case 25 /* JSDocTupleTypes */: return ts.Diagnostics.Type_expected;
-                case 24 /* JSDocRecordMembers */: return ts.Diagnostics.Property_assignment_expected;
-            }
-        }
-        ;
-        // Parses a comma-delimited list of elements
-        function parseDelimitedList(kind, parseElement, considerSemicolonAsDelimiter) {
-            var saveParsingContext = parsingContext;
-            parsingContext |= 1 << kind;
-            var result = [];
-            result.pos = getNodePos();
-            var commaStart = -1; // Meaning the previous token was not a comma
-            while (true) {
-                if (isListElement(kind, /*inErrorRecovery*/ false)) {
-                    result.push(parseListElement(kind, parseElement));
-                    commaStart = scanner.getTokenPos();
-                    if (parseOptional(24 /* CommaToken */)) {
-                        continue;
-                    }
-                    commaStart = -1; // Back to the state where the last token was not a comma
-                    if (isListTerminator(kind)) {
-                        break;
-                    }
-                    // We didn't get a comma, and the list wasn't terminated, explicitly parse
-                    // out a comma so we give a good error message.
-                    parseExpected(24 /* CommaToken */);
-                    // If the token was a semicolon, and the caller allows that, then skip it and
-                    // continue.  This ensures we get back on track and don't result in tons of
-                    // parse errors.  For example, this can happen when people do things like use
-                    // a semicolon to delimit object literal members.   Note: we'll have already
-                    // reported an error when we called parseExpected above.
-                    if (considerSemicolonAsDelimiter && token === 23 /* SemicolonToken */ && !scanner.hasPrecedingLineBreak()) {
-                        nextToken();
-                    }
-                    continue;
-                }
-                if (isListTerminator(kind)) {
-                    break;
-                }
-                if (abortParsingListOrMoveToNextToken(kind)) {
-                    break;
-                }
-            }
-            // Recording the trailing comma is deliberately done after the previous
-            // loop, and not just if we see a list terminator. This is because the list
-            // may have ended incorrectly, but it is still important to know if there
-            // was a trailing comma.
-            // Check if the last token was a comma.
-            if (commaStart >= 0) {
-                // Always preserve a trailing comma by marking it on the NodeArray
-                result.hasTrailingComma = true;
-            }
-            result.end = getNodeEnd();
-            parsingContext = saveParsingContext;
-            return result;
-        }
-        function createMissingList() {
-            var pos = getNodePos();
-            var result = [];
-            result.pos = pos;
-            result.end = pos;
-            return result;
-        }
-        function parseBracketedList(kind, parseElement, open, close) {
-            if (parseExpected(open)) {
-                var result = parseDelimitedList(kind, parseElement);
-                parseExpected(close);
-                return result;
-            }
-            return createMissingList();
-        }
-        // The allowReservedWords parameter controls whether reserved words are permitted after the first dot
-        function parseEntityName(allowReservedWords, diagnosticMessage) {
-            var entity = parseIdentifier(diagnosticMessage);
-            while (parseOptional(21 /* DotToken */)) {
-                var node = createNode(139 /* QualifiedName */, entity.pos); // !!!
-                node.left = entity;
-                node.right = parseRightSideOfDot(allowReservedWords);
-                entity = finishNode(node);
-            }
-            return entity;
-        }
-        function parseRightSideOfDot(allowIdentifierNames) {
-            // Technically a keyword is valid here as all identifiers and keywords are identifier names.
-            // However, often we'll encounter this in error situations when the identifier or keyword
-            // is actually starting another valid construct.
-            //
-            // So, we check for the following specific case:
-            //
-            //      name.
-            //      identifierOrKeyword identifierNameOrKeyword
-            //
-            // Note: the newlines are important here.  For example, if that above code
-            // were rewritten into:
-            //
-            //      name.identifierOrKeyword
-            //      identifierNameOrKeyword
-            //
-            // Then we would consider it valid.  That's because ASI would take effect and
-            // the code would be implicitly: "name.identifierOrKeyword; identifierNameOrKeyword".
-            // In the first case though, ASI will not take effect because there is not a
-            // line terminator after the identifier or keyword.
-            if (scanner.hasPrecedingLineBreak() && ts.tokenIsIdentifierOrKeyword(token)) {
-                var matchesPattern = lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
-                if (matchesPattern) {
-                    // Report that we need an identifier.  However, report it right after the dot,
-                    // and not on the next token.  This is because the next token might actually
-                    // be an identifier and the error would be quite confusing.
-                    return createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Identifier_expected);
-                }
-            }
-            return allowIdentifierNames ? parseIdentifierName() : parseIdentifier();
-        }
-        function parseTemplateExpression() {
-            var template = createNode(189 /* TemplateExpression */);
-            template.head = parseTemplateLiteralFragment();
-            ts.Debug.assert(template.head.kind === 12 /* TemplateHead */, "Template head has wrong token kind");
-            var templateSpans = [];
-            templateSpans.pos = getNodePos();
-            do {
-                templateSpans.push(parseTemplateSpan());
-            } while (ts.lastOrUndefined(templateSpans).literal.kind === 13 /* TemplateMiddle */);
-            templateSpans.end = getNodeEnd();
-            template.templateSpans = templateSpans;
-            return finishNode(template);
-        }
-        function parseTemplateSpan() {
-            var span = createNode(197 /* TemplateSpan */);
-            span.expression = allowInAnd(parseExpression);
-            var literal;
-            if (token === 16 /* CloseBraceToken */) {
-                reScanTemplateToken();
-                literal = parseTemplateLiteralFragment();
-            }
-            else {
-                literal = parseExpectedToken(14 /* TemplateTail */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(16 /* CloseBraceToken */));
-            }
-            span.literal = literal;
-            return finishNode(span);
-        }
-        function parseStringLiteralTypeNode() {
-            return parseLiteralLikeNode(166 /* StringLiteralType */, /*internName*/ true);
-        }
-        function parseLiteralNode(internName) {
-            return parseLiteralLikeNode(token, internName);
-        }
-        function parseTemplateLiteralFragment() {
-            return parseLiteralLikeNode(token, /*internName*/ false);
-        }
-        function parseLiteralLikeNode(kind, internName) {
-            var node = createNode(kind);
-            var text = scanner.getTokenValue();
-            node.text = internName ? internIdentifier(text) : text;
-            if (scanner.hasExtendedUnicodeEscape()) {
-                node.hasExtendedUnicodeEscape = true;
-            }
-            if (scanner.isUnterminated()) {
-                node.isUnterminated = true;
-            }
-            var tokenPos = scanner.getTokenPos();
-            nextToken();
-            finishNode(node);
-            // Octal literals are not allowed in strict mode or ES5
-            // Note that theoretically the following condition would hold true literals like 009,
-            // which is not octal.But because of how the scanner separates the tokens, we would
-            // never get a token like this. Instead, we would get 00 and 9 as two separate tokens.
-            // We also do not need to check for negatives because any prefix operator would be part of a
-            // parent unary expression.
-            if (node.kind === 8 /* NumericLiteral */
-                && sourceText.charCodeAt(tokenPos) === 48 /* _0 */
-                && ts.isOctalDigit(sourceText.charCodeAt(tokenPos + 1))) {
-                node.isOctalLiteral = true;
-            }
-            return node;
-        }
-        // TYPES
-        function parseTypeReference() {
-            var typeName = parseEntityName(/*allowReservedWords*/ false, ts.Diagnostics.Type_expected);
-            var node = createNode(155 /* TypeReference */, typeName.pos);
-            node.typeName = typeName;
-            if (!scanner.hasPrecedingLineBreak() && token === 25 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
-            }
-            return finishNode(node);
-        }
-        function parseThisTypePredicate(lhs) {
-            nextToken();
-            var node = createNode(154 /* TypePredicate */, lhs.pos);
-            node.parameterName = lhs;
-            node.type = parseType();
-            return finishNode(node);
-        }
-        function parseThisTypeNode() {
-            var node = createNode(165 /* ThisType */);
-            nextToken();
-            return finishNode(node);
-        }
-        function parseTypeQuery() {
-            var node = createNode(158 /* TypeQuery */);
-            parseExpected(101 /* TypeOfKeyword */);
-            node.exprName = parseEntityName(/*allowReservedWords*/ true);
-            return finishNode(node);
-        }
-        function parseTypeParameter() {
-            var node = createNode(141 /* TypeParameter */);
-            node.name = parseIdentifier();
-            if (parseOptional(83 /* ExtendsKeyword */)) {
-                // It's not uncommon for people to write improper constraints to a generic.  If the
-                // user writes a constraint that is an expression and not an actual type, then parse
-                // it out as an expression (so we can recover well), but report that a type is needed
-                // instead.
-                if (isStartOfType() || !isStartOfExpression()) {
-                    node.constraint = parseType();
-                }
-                else {
-                    // It was not a type, and it looked like an expression.  Parse out an expression
-                    // here so we recover well.  Note: it is important that we call parseUnaryExpression
-                    // and not parseExpression here.  If the user has:
-                    //
-                    //      <T extends "">
-                    //
-                    // We do *not* want to consume the  >  as we're consuming the expression for "".
-                    node.expression = parseUnaryExpressionOrHigher();
-                }
-            }
-            return finishNode(node);
-        }
-        function parseTypeParameters() {
-            if (token === 25 /* LessThanToken */) {
-                return parseBracketedList(17 /* TypeParameters */, parseTypeParameter, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
-            }
-        }
-        function parseParameterType() {
-            if (parseOptional(54 /* ColonToken */)) {
-                return parseType();
-            }
-            return undefined;
-        }
-        function isStartOfParameter() {
-            return token === 22 /* DotDotDotToken */ || isIdentifierOrPattern() || ts.isModifierKind(token) || token === 55 /* AtToken */ || token === 97 /* ThisKeyword */;
-        }
-        function setModifiers(node, modifiers) {
-            if (modifiers) {
-                node.flags |= modifiers.flags;
-                node.modifiers = modifiers;
-            }
-        }
-        function parseParameter() {
-            var node = createNode(142 /* Parameter */);
-            if (token === 97 /* ThisKeyword */) {
-                node.name = createIdentifier(/*isIdentifier*/ true, undefined);
-                node.type = parseParameterType();
-                return finishNode(node);
-            }
-            node.decorators = parseDecorators();
-            setModifiers(node, parseModifiers());
-            node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
-            // FormalParameter [Yield,Await]:
-            //      BindingElement[?Yield,?Await]
-            node.name = parseIdentifierOrPattern();
-            if (ts.getFullWidth(node.name) === 0 && node.flags === 0 && ts.isModifierKind(token)) {
-                // in cases like
-                // 'use strict'
-                // function foo(static)
-                // isParameter('static') === true, because of isModifier('static')
-                // however 'static' is not a legal identifier in a strict mode.
-                // so result of this function will be ParameterDeclaration (flags = 0, name = missing, type = undefined, initializer = undefined)
-                // and current token will not change => parsing of the enclosing parameter list will last till the end of time (or OOM)
-                // to avoid this we'll advance cursor to the next token.
-                nextToken();
-            }
-            node.questionToken = parseOptionalToken(53 /* QuestionToken */);
-            node.type = parseParameterType();
-            node.initializer = parseBindingElementInitializer(/*inParameter*/ true);
-            // Do not check for initializers in an ambient context for parameters. This is not
-            // a grammar error because the grammar allows arbitrary call signatures in
-            // an ambient context.
-            // It is actually not necessary for this to be an error at all. The reason is that
-            // function/constructor implementations are syntactically disallowed in ambient
-            // contexts. In addition, parameter initializers are semantically disallowed in
-            // overload signatures. So parameter initializers are transitively disallowed in
-            // ambient contexts.
-            return addJSDocComment(finishNode(node));
-        }
-        function parseBindingElementInitializer(inParameter) {
-            return inParameter ? parseParameterInitializer() : parseNonParameterInitializer();
-        }
-        function parseParameterInitializer() {
-            return parseInitializer(/*inParameter*/ true);
-        }
-        function fillSignature(returnToken, yieldContext, awaitContext, requireCompleteParameterList, signature) {
-            var returnTokenRequired = returnToken === 34 /* EqualsGreaterThanToken */;
-            signature.typeParameters = parseTypeParameters();
-            signature.parameters = parseParameterList(yieldContext, awaitContext, requireCompleteParameterList);
-            if (returnTokenRequired) {
-                parseExpected(returnToken);
-                signature.type = parseTypeOrTypePredicate();
-            }
-            else if (parseOptional(returnToken)) {
-                signature.type = parseTypeOrTypePredicate();
-            }
-        }
-        function parseParameterList(yieldContext, awaitContext, requireCompleteParameterList) {
-            // FormalParameters [Yield,Await]: (modified)
-            //      [empty]
-            //      FormalParameterList[?Yield,Await]
-            //
-            // FormalParameter[Yield,Await]: (modified)
-            //      BindingElement[?Yield,Await]
-            //
-            // BindingElement [Yield,Await]: (modified)
-            //      SingleNameBinding[?Yield,?Await]
-            //      BindingPattern[?Yield,?Await]Initializer [In, ?Yield,?Await] opt
-            //
-            // SingleNameBinding [Yield,Await]:
-            //      BindingIdentifier[?Yield,?Await]Initializer [In, ?Yield,?Await] opt
-            if (parseExpected(17 /* OpenParenToken */)) {
-                var savedYieldContext = inYieldContext();
-                var savedAwaitContext = inAwaitContext();
-                setYieldContext(yieldContext);
-                setAwaitContext(awaitContext);
-                var result = parseDelimitedList(16 /* Parameters */, parseParameter);
-                setYieldContext(savedYieldContext);
-                setAwaitContext(savedAwaitContext);
-                if (!parseExpected(18 /* CloseParenToken */) && requireCompleteParameterList) {
-                    // Caller insisted that we had to end with a )   We didn't.  So just return
-                    // undefined here.
-                    return undefined;
-                }
-                return result;
-            }
-            // We didn't even have an open paren.  If the caller requires a complete parameter list,
-            // we definitely can't provide that.  However, if they're ok with an incomplete one,
-            // then just return an empty set of parameters.
-            return requireCompleteParameterList ? undefined : createMissingList();
-        }
-        function parseTypeMemberSemicolon() {
-            // We allow type members to be separated by commas or (possibly ASI) semicolons.
-            // First check if it was a comma.  If so, we're done with the member.
-            if (parseOptional(24 /* CommaToken */)) {
-                return;
-            }
-            // Didn't have a comma.  We must have a (possible ASI) semicolon.
-            parseSemicolon();
-        }
-        function parseSignatureMember(kind) {
-            var node = createNode(kind);
-            if (kind === 152 /* ConstructSignature */) {
-                parseExpected(92 /* NewKeyword */);
-            }
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
-            parseTypeMemberSemicolon();
-            return finishNode(node);
-        }
-        function isIndexSignature() {
-            if (token !== 19 /* OpenBracketToken */) {
-                return false;
-            }
-            return lookAhead(isUnambiguouslyIndexSignature);
-        }
-        function isUnambiguouslyIndexSignature() {
-            // The only allowed sequence is:
-            //
-            //   [id:
-            //
-            // However, for error recovery, we also check the following cases:
-            //
-            //   [...
-            //   [id,
-            //   [id?,
-            //   [id?:
-            //   [id?]
-            //   [public id
-            //   [private id
-            //   [protected id
-            //   []
-            //
-            nextToken();
-            if (token === 22 /* DotDotDotToken */ || token === 20 /* CloseBracketToken */) {
-                return true;
-            }
-            if (ts.isModifierKind(token)) {
-                nextToken();
-                if (isIdentifier()) {
-                    return true;
-                }
-            }
-            else if (!isIdentifier()) {
-                return false;
-            }
-            else {
-                // Skip the identifier
-                nextToken();
-            }
-            // A colon signifies a well formed indexer
-            // A comma should be a badly formed indexer because comma expressions are not allowed
-            // in computed properties.
-            if (token === 54 /* ColonToken */ || token === 24 /* CommaToken */) {
-                return true;
-            }
-            // Question mark could be an indexer with an optional property,
-            // or it could be a conditional expression in a computed property.
-            if (token !== 53 /* QuestionToken */) {
-                return false;
-            }
-            // If any of the following tokens are after the question mark, it cannot
-            // be a conditional expression, so treat it as an indexer.
-            nextToken();
-            return token === 54 /* ColonToken */ || token === 24 /* CommaToken */ || token === 20 /* CloseBracketToken */;
-        }
-        function parseIndexSignatureDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(153 /* IndexSignature */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            node.parameters = parseBracketedList(16 /* Parameters */, parseParameter, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
-            node.type = parseTypeAnnotation();
-            parseTypeMemberSemicolon();
-            return finishNode(node);
-        }
-        function parsePropertyOrMethodSignature(fullStart, modifiers) {
-            var name = parsePropertyName();
-            var questionToken = parseOptionalToken(53 /* QuestionToken */);
-            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                var method = createNode(146 /* MethodSignature */, fullStart);
-                setModifiers(method, modifiers);
-                method.name = name;
-                method.questionToken = questionToken;
-                // Method signatures don't exist in expression contexts.  So they have neither
-                // [Yield] nor [Await]
-                fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, method);
-                parseTypeMemberSemicolon();
-                return finishNode(method);
-            }
-            else {
-                var property = createNode(144 /* PropertySignature */, fullStart);
-                setModifiers(property, modifiers);
-                property.name = name;
-                property.questionToken = questionToken;
-                property.type = parseTypeAnnotation();
-                if (token === 56 /* EqualsToken */) {
-                    // Although type literal properties cannot not have initializers, we attempt
-                    // to parse an initializer so we can report in the checker that an interface
-                    // property or type literal property cannot have an initializer.
-                    property.initializer = parseNonParameterInitializer();
-                }
-                parseTypeMemberSemicolon();
-                return finishNode(property);
-            }
-        }
-        function isTypeMemberStart() {
-            var idToken;
-            // Return true if we have the start of a signature member
-            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                return true;
-            }
-            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier
-            while (ts.isModifierKind(token)) {
-                idToken = token;
-                nextToken();
-            }
-            // Index signatures and computed property names are type members
-            if (token === 19 /* OpenBracketToken */) {
-                return true;
-            }
-            // Try to get the first property-like token following all modifiers
-            if (isLiteralPropertyName()) {
-                idToken = token;
-                nextToken();
-            }
-            // If we were able to get any potential identifier, check that it is
-            // the start of a member declaration
-            if (idToken) {
-                return token === 17 /* OpenParenToken */ ||
-                    token === 25 /* LessThanToken */ ||
-                    token === 53 /* QuestionToken */ ||
-                    token === 54 /* ColonToken */ ||
-                    canParseSemicolon();
-            }
-            return false;
-        }
-        function parseTypeMember() {
-            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                return parseSignatureMember(151 /* CallSignature */);
-            }
-            if (token === 92 /* NewKeyword */ && lookAhead(isStartOfConstructSignature)) {
-                return parseSignatureMember(152 /* ConstructSignature */);
-            }
-            var fullStart = getNodePos();
-            var modifiers = parseModifiers();
-            if (isIndexSignature()) {
-                return parseIndexSignatureDeclaration(fullStart, /*decorators*/ undefined, modifiers);
-            }
-            return parsePropertyOrMethodSignature(fullStart, modifiers);
-        }
-        function isStartOfConstructSignature() {
-            nextToken();
-            return token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */;
-        }
-        function parseTypeLiteral() {
-            var node = createNode(159 /* TypeLiteral */);
-            node.members = parseObjectTypeMembers();
-            return finishNode(node);
-        }
-        function parseObjectTypeMembers() {
-            var members;
-            if (parseExpected(15 /* OpenBraceToken */)) {
-                members = parseList(4 /* TypeMembers */, parseTypeMember);
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                members = createMissingList();
-            }
-            return members;
-        }
-        function parseTupleType() {
-            var node = createNode(161 /* TupleType */);
-            node.elementTypes = parseBracketedList(19 /* TupleElementTypes */, parseType, 19 /* OpenBracketToken */, 20 /* CloseBracketToken */);
-            return finishNode(node);
-        }
-        function parseParenthesizedType() {
-            var node = createNode(164 /* ParenthesizedType */);
-            parseExpected(17 /* OpenParenToken */);
-            node.type = parseType();
-            parseExpected(18 /* CloseParenToken */);
-            return finishNode(node);
-        }
-        function parseFunctionOrConstructorType(kind) {
-            var node = createNode(kind);
-            if (kind === 157 /* ConstructorType */) {
-                parseExpected(92 /* NewKeyword */);
-            }
-            fillSignature(34 /* EqualsGreaterThanToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
-            return finishNode(node);
-        }
-        function parseKeywordAndNoDot() {
-            var node = parseTokenNode();
-            return token === 21 /* DotToken */ ? undefined : node;
-        }
-        function parseNonArrayType() {
-            switch (token) {
-                case 117 /* AnyKeyword */:
-                case 132 /* StringKeyword */:
-                case 130 /* NumberKeyword */:
-                case 120 /* BooleanKeyword */:
-                case 133 /* SymbolKeyword */:
-                case 135 /* UndefinedKeyword */:
-                case 127 /* NeverKeyword */:
-                    // If these are followed by a dot, then parse these out as a dotted type reference instead.
-                    var node = tryParse(parseKeywordAndNoDot);
-                    return node || parseTypeReference();
-                case 9 /* StringLiteral */:
-                    return parseStringLiteralTypeNode();
-                case 103 /* VoidKeyword */:
-                case 93 /* NullKeyword */:
-                    return parseTokenNode();
-                case 97 /* ThisKeyword */: {
-                    var thisKeyword = parseThisTypeNode();
-                    if (token === 124 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
-                        return parseThisTypePredicate(thisKeyword);
-                    }
-                    else {
-                        return thisKeyword;
-                    }
-                }
-                case 101 /* TypeOfKeyword */:
-                    return parseTypeQuery();
-                case 15 /* OpenBraceToken */:
-                    return parseTypeLiteral();
-                case 19 /* OpenBracketToken */:
-                    return parseTupleType();
-                case 17 /* OpenParenToken */:
-                    return parseParenthesizedType();
-                default:
-                    return parseTypeReference();
-            }
-        }
-        function isStartOfType() {
-            switch (token) {
-                case 117 /* AnyKeyword */:
-                case 132 /* StringKeyword */:
-                case 130 /* NumberKeyword */:
-                case 120 /* BooleanKeyword */:
-                case 133 /* SymbolKeyword */:
-                case 103 /* VoidKeyword */:
-                case 135 /* UndefinedKeyword */:
-                case 93 /* NullKeyword */:
-                case 97 /* ThisKeyword */:
-                case 101 /* TypeOfKeyword */:
-                case 127 /* NeverKeyword */:
-                case 15 /* OpenBraceToken */:
-                case 19 /* OpenBracketToken */:
-                case 25 /* LessThanToken */:
-                case 92 /* NewKeyword */:
-                case 9 /* StringLiteral */:
-                    return true;
-                case 17 /* OpenParenToken */:
-                    // Only consider '(' the start of a type if followed by ')', '...', an identifier, a modifier,
-                    // or something that starts a type. We don't want to consider things like '(1)' a type.
-                    return lookAhead(isStartOfParenthesizedOrFunctionType);
-                default:
-                    return isIdentifier();
-            }
-        }
-        function isStartOfParenthesizedOrFunctionType() {
-            nextToken();
-            return token === 18 /* CloseParenToken */ || isStartOfParameter() || isStartOfType();
-        }
-        function parseArrayTypeOrHigher() {
-            var type = parseNonArrayType();
-            while (!scanner.hasPrecedingLineBreak() && parseOptional(19 /* OpenBracketToken */)) {
-                parseExpected(20 /* CloseBracketToken */);
-                var node = createNode(160 /* ArrayType */, type.pos);
-                node.elementType = type;
-                type = finishNode(node);
-            }
-            return type;
-        }
-        function parseUnionOrIntersectionType(kind, parseConstituentType, operator) {
-            var type = parseConstituentType();
-            if (token === operator) {
-                var types = [type];
-                types.pos = type.pos;
-                while (parseOptional(operator)) {
-                    types.push(parseConstituentType());
-                }
-                types.end = getNodeEnd();
-                var node = createNode(kind, type.pos);
-                node.types = types;
-                type = finishNode(node);
-            }
-            return type;
-        }
-        function parseIntersectionTypeOrHigher() {
-            return parseUnionOrIntersectionType(163 /* IntersectionType */, parseArrayTypeOrHigher, 46 /* AmpersandToken */);
-        }
-        function parseUnionTypeOrHigher() {
-            return parseUnionOrIntersectionType(162 /* UnionType */, parseIntersectionTypeOrHigher, 47 /* BarToken */);
-        }
-        function isStartOfFunctionType() {
-            if (token === 25 /* LessThanToken */) {
-                return true;
-            }
-            return token === 17 /* OpenParenToken */ && lookAhead(isUnambiguouslyStartOfFunctionType);
-        }
-        function skipParameterStart() {
-            if (ts.isModifierKind(token)) {
-                // Skip modifiers
-                parseModifiers();
-            }
-            if (isIdentifier() || token === 97 /* ThisKeyword */) {
-                nextToken();
-                return true;
-            }
-            if (token === 19 /* OpenBracketToken */ || token === 15 /* OpenBraceToken */) {
-                // Return true if we can parse an array or object binding pattern with no errors
-                var previousErrorCount = parseDiagnostics.length;
-                parseIdentifierOrPattern();
-                return previousErrorCount === parseDiagnostics.length;
-            }
-            return false;
-        }
-        function isUnambiguouslyStartOfFunctionType() {
-            nextToken();
-            if (token === 18 /* CloseParenToken */ || token === 22 /* DotDotDotToken */) {
-                // ( )
-                // ( ...
-                return true;
-            }
-            if (skipParameterStart()) {
-                // We successfully skipped modifiers (if any) and an identifier or binding pattern,
-                // now see if we have something that indicates a parameter declaration
-                if (token === 54 /* ColonToken */ || token === 24 /* CommaToken */ ||
-                    token === 53 /* QuestionToken */ || token === 56 /* EqualsToken */) {
-                    // ( xxx :
-                    // ( xxx ,
-                    // ( xxx ?
-                    // ( xxx =
-                    return true;
-                }
-                if (token === 18 /* CloseParenToken */) {
-                    nextToken();
-                    if (token === 34 /* EqualsGreaterThanToken */) {
-                        // ( xxx ) =>
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function parseTypeOrTypePredicate() {
-            var typePredicateVariable = isIdentifier() && tryParse(parseTypePredicatePrefix);
-            var type = parseType();
-            if (typePredicateVariable) {
-                var node = createNode(154 /* TypePredicate */, typePredicateVariable.pos);
-                node.parameterName = typePredicateVariable;
-                node.type = type;
-                return finishNode(node);
-            }
-            else {
-                return type;
-            }
-        }
-        function parseTypePredicatePrefix() {
-            var id = parseIdentifier();
-            if (token === 124 /* IsKeyword */ && !scanner.hasPrecedingLineBreak()) {
-                nextToken();
-                return id;
-            }
-        }
-        function parseType() {
-            // The rules about 'yield' only apply to actual code/expression contexts.  They don't
-            // apply to 'type' contexts.  So we disable these parameters here before moving on.
-            return doOutsideOfContext(41943040 /* TypeExcludesFlags */, parseTypeWorker);
-        }
-        function parseTypeWorker() {
-            if (isStartOfFunctionType()) {
-                return parseFunctionOrConstructorType(156 /* FunctionType */);
-            }
-            if (token === 92 /* NewKeyword */) {
-                return parseFunctionOrConstructorType(157 /* ConstructorType */);
-            }
-            return parseUnionTypeOrHigher();
-        }
-        function parseTypeAnnotation() {
-            return parseOptional(54 /* ColonToken */) ? parseType() : undefined;
-        }
-        // EXPRESSIONS
-        function isStartOfLeftHandSideExpression() {
-            switch (token) {
-                case 97 /* ThisKeyword */:
-                case 95 /* SuperKeyword */:
-                case 93 /* NullKeyword */:
-                case 99 /* TrueKeyword */:
-                case 84 /* FalseKeyword */:
-                case 8 /* NumericLiteral */:
-                case 9 /* StringLiteral */:
-                case 11 /* NoSubstitutionTemplateLiteral */:
-                case 12 /* TemplateHead */:
-                case 17 /* OpenParenToken */:
-                case 19 /* OpenBracketToken */:
-                case 15 /* OpenBraceToken */:
-                case 87 /* FunctionKeyword */:
-                case 73 /* ClassKeyword */:
-                case 92 /* NewKeyword */:
-                case 39 /* SlashToken */:
-                case 61 /* SlashEqualsToken */:
-                case 69 /* Identifier */:
-                    return true;
-                default:
-                    return isIdentifier();
-            }
-        }
-        function isStartOfExpression() {
-            if (isStartOfLeftHandSideExpression()) {
-                return true;
-            }
-            switch (token) {
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 50 /* TildeToken */:
-                case 49 /* ExclamationToken */:
-                case 78 /* DeleteKeyword */:
-                case 101 /* TypeOfKeyword */:
-                case 103 /* VoidKeyword */:
-                case 41 /* PlusPlusToken */:
-                case 42 /* MinusMinusToken */:
-                case 25 /* LessThanToken */:
-                case 119 /* AwaitKeyword */:
-                case 114 /* YieldKeyword */:
-                    // Yield/await always starts an expression.  Either it is an identifier (in which case
-                    // it is definitely an expression).  Or it's a keyword (either because we're in
-                    // a generator or async function, or in strict mode (or both)) and it started a yield or await expression.
-                    return true;
-                default:
-                    // Error tolerance.  If we see the start of some binary operator, we consider
-                    // that the start of an expression.  That way we'll parse out a missing identifier,
-                    // give a good message about an identifier being missing, and then consume the
-                    // rest of the binary expression.
-                    if (isBinaryOperator()) {
-                        return true;
-                    }
-                    return isIdentifier();
-            }
-        }
-        function isStartOfExpressionStatement() {
-            // As per the grammar, none of '{' or 'function' or 'class' can start an expression statement.
-            return token !== 15 /* OpenBraceToken */ &&
-                token !== 87 /* FunctionKeyword */ &&
-                token !== 73 /* ClassKeyword */ &&
-                token !== 55 /* AtToken */ &&
-                isStartOfExpression();
-        }
-        function parseExpression() {
-            // Expression[in]:
-            //      AssignmentExpression[in]
-            //      Expression[in] , AssignmentExpression[in]
-            // clear the decorator context when parsing Expression, as it should be unambiguous when parsing a decorator
-            var saveDecoratorContext = inDecoratorContext();
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ false);
-            }
-            var expr = parseAssignmentExpressionOrHigher();
-            var operatorToken;
-            while ((operatorToken = parseOptionalToken(24 /* CommaToken */))) {
-                expr = makeBinaryExpression(expr, operatorToken, parseAssignmentExpressionOrHigher());
-            }
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ true);
-            }
-            return expr;
-        }
-        function parseInitializer(inParameter) {
-            if (token !== 56 /* EqualsToken */) {
-                // It's not uncommon during typing for the user to miss writing the '=' token.  Check if
-                // there is no newline after the last token and if we're on an expression.  If so, parse
-                // this as an equals-value clause with a missing equals.
-                // NOTE: There are two places where we allow equals-value clauses.  The first is in a
-                // variable declarator.  The second is with a parameter.  For variable declarators
-                // it's more likely that a { would be a allowed (as an object literal).  While this
-                // is also allowed for parameters, the risk is that we consume the { as an object
-                // literal when it really will be for the block following the parameter.
-                if (scanner.hasPrecedingLineBreak() || (inParameter && token === 15 /* OpenBraceToken */) || !isStartOfExpression()) {
-                    // preceding line break, open brace in a parameter (likely a function body) or current token is not an expression -
-                    // do not try to parse initializer
-                    return undefined;
-                }
-            }
-            // Initializer[In, Yield] :
-            //     = AssignmentExpression[?In, ?Yield]
-            parseExpected(56 /* EqualsToken */);
-            return parseAssignmentExpressionOrHigher();
-        }
-        function parseAssignmentExpressionOrHigher() {
-            //  AssignmentExpression[in,yield]:
-            //      1) ConditionalExpression[?in,?yield]
-            //      2) LeftHandSideExpression = AssignmentExpression[?in,?yield]
-            //      3) LeftHandSideExpression AssignmentOperator AssignmentExpression[?in,?yield]
-            //      4) ArrowFunctionExpression[?in,?yield]
-            //      5) AsyncArrowFunctionExpression[in,yield,await]
-            //      6) [+Yield] YieldExpression[?In]
-            //
-            // Note: for ease of implementation we treat productions '2' and '3' as the same thing.
-            // (i.e. they're both BinaryExpressions with an assignment operator in it).
-            // First, do the simple check if we have a YieldExpression (production '5').
-            if (isYieldExpression()) {
-                return parseYieldExpression();
-            }
-            // Then, check if we have an arrow function (production '4' and '5') that starts with a parenthesized
-            // parameter list or is an async arrow function.
-            // AsyncArrowFunctionExpression:
-            //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
-            //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            // Production (1) of AsyncArrowFunctionExpression is parsed in "tryParseAsyncSimpleArrowFunctionExpression".
-            // And production (2) is parsed in "tryParseParenthesizedArrowFunctionExpression".
-            //
-            // If we do successfully parse arrow-function, we must *not* recurse for productions 1, 2 or 3. An ArrowFunction is
-            // not a  LeftHandSideExpression, nor does it start a ConditionalExpression.  So we are done
-            // with AssignmentExpression if we see one.
-            var arrowExpression = tryParseParenthesizedArrowFunctionExpression() || tryParseAsyncSimpleArrowFunctionExpression();
-            if (arrowExpression) {
-                return arrowExpression;
-            }
-            // Now try to see if we're in production '1', '2' or '3'.  A conditional expression can
-            // start with a LogicalOrExpression, while the assignment productions can only start with
-            // LeftHandSideExpressions.
-            //
-            // So, first, we try to just parse out a BinaryExpression.  If we get something that is a
-            // LeftHandSide or higher, then we can try to parse out the assignment expression part.
-            // Otherwise, we try to parse out the conditional expression bit.  We want to allow any
-            // binary expression here, so we pass in the 'lowest' precedence here so that it matches
-            // and consumes anything.
-            var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-            // To avoid a look-ahead, we did not handle the case of an arrow function with a single un-parenthesized
-            // parameter ('x => ...') above. We handle it here by checking if the parsed expression was a single
-            // identifier and the current token is an arrow.
-            if (expr.kind === 69 /* Identifier */ && token === 34 /* EqualsGreaterThanToken */) {
-                return parseSimpleArrowFunctionExpression(expr);
-            }
-            // Now see if we might be in cases '2' or '3'.
-            // If the expression was a LHS expression, and we have an assignment operator, then
-            // we're in '2' or '3'. Consume the assignment and return.
-            //
-            // Note: we call reScanGreaterToken so that we get an appropriately merged token
-            // for cases like > > =  becoming >>=
-            if (ts.isLeftHandSideExpression(expr) && ts.isAssignmentOperator(reScanGreaterToken())) {
-                return makeBinaryExpression(expr, parseTokenNode(), parseAssignmentExpressionOrHigher());
-            }
-            // It wasn't an assignment or a lambda.  This is a conditional expression:
-            return parseConditionalExpressionRest(expr);
-        }
-        function isYieldExpression() {
-            if (token === 114 /* YieldKeyword */) {
-                // If we have a 'yield' keyword, and this is a context where yield expressions are
-                // allowed, then definitely parse out a yield expression.
-                if (inYieldContext()) {
-                    return true;
-                }
-                // We're in a context where 'yield expr' is not allowed.  However, if we can
-                // definitely tell that the user was trying to parse a 'yield expr' and not
-                // just a normal expr that start with a 'yield' identifier, then parse out
-                // a 'yield expr'.  We can then report an error later that they are only
-                // allowed in generator expressions.
-                //
-                // for example, if we see 'yield(foo)', then we'll have to treat that as an
-                // invocation expression of something called 'yield'.  However, if we have
-                // 'yield foo' then that is not legal as a normal expression, so we can
-                // definitely recognize this as a yield expression.
-                //
-                // for now we just check if the next token is an identifier.  More heuristics
-                // can be added here later as necessary.  We just need to make sure that we
-                // don't accidentally consume something legal.
-                return lookAhead(nextTokenIsIdentifierOrKeywordOrNumberOnSameLine);
-            }
-            return false;
-        }
-        function nextTokenIsIdentifierOnSameLine() {
-            nextToken();
-            return !scanner.hasPrecedingLineBreak() && isIdentifier();
-        }
-        function parseYieldExpression() {
-            var node = createNode(190 /* YieldExpression */);
-            // YieldExpression[In] :
-            //      yield
-            //      yield [no LineTerminator here] [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
-            //      yield [no LineTerminator here] * [Lexical goal InputElementRegExp]AssignmentExpression[?In, Yield]
-            nextToken();
-            if (!scanner.hasPrecedingLineBreak() &&
-                (token === 37 /* AsteriskToken */ || isStartOfExpression())) {
-                node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-                node.expression = parseAssignmentExpressionOrHigher();
-                return finishNode(node);
-            }
-            else {
-                // if the next token is not on the same line as yield.  or we don't have an '*' or
-                // the start of an expression, then this is just a simple "yield" expression.
-                return finishNode(node);
-            }
-        }
-        function parseSimpleArrowFunctionExpression(identifier, asyncModifier) {
-            ts.Debug.assert(token === 34 /* EqualsGreaterThanToken */, "parseSimpleArrowFunctionExpression should only have been called if we had a =>");
-            var node;
-            if (asyncModifier) {
-                node = createNode(180 /* ArrowFunction */, asyncModifier.pos);
-                setModifiers(node, asyncModifier);
-            }
-            else {
-                node = createNode(180 /* ArrowFunction */, identifier.pos);
-            }
-            var parameter = createNode(142 /* Parameter */, identifier.pos);
-            parameter.name = identifier;
-            finishNode(parameter);
-            node.parameters = [parameter];
-            node.parameters.pos = parameter.pos;
-            node.parameters.end = parameter.end;
-            node.equalsGreaterThanToken = parseExpectedToken(34 /* EqualsGreaterThanToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, "=>");
-            node.body = parseArrowFunctionExpressionBody(/*isAsync*/ !!asyncModifier);
-            return finishNode(node);
-        }
-        function tryParseParenthesizedArrowFunctionExpression() {
-            var triState = isParenthesizedArrowFunctionExpression();
-            if (triState === 0 /* False */) {
-                // It's definitely not a parenthesized arrow function expression.
-                return undefined;
-            }
-            // If we definitely have an arrow function, then we can just parse one, not requiring a
-            // following => or { token. Otherwise, we *might* have an arrow function.  Try to parse
-            // it out, but don't allow any ambiguity, and return 'undefined' if this could be an
-            // expression instead.
-            var arrowFunction = triState === 1 /* True */
-                ? parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ true)
-                : tryParse(parsePossibleParenthesizedArrowFunctionExpressionHead);
-            if (!arrowFunction) {
-                // Didn't appear to actually be a parenthesized arrow function.  Just bail out.
-                return undefined;
-            }
-            var isAsync = !!(arrowFunction.flags & 256 /* Async */);
-            // If we have an arrow, then try to parse the body. Even if not, try to parse if we
-            // have an opening brace, just in case we're in an error state.
-            var lastToken = token;
-            arrowFunction.equalsGreaterThanToken = parseExpectedToken(34 /* EqualsGreaterThanToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, "=>");
-            arrowFunction.body = (lastToken === 34 /* EqualsGreaterThanToken */ || lastToken === 15 /* OpenBraceToken */)
-                ? parseArrowFunctionExpressionBody(isAsync)
-                : parseIdentifier();
-            return finishNode(arrowFunction);
-        }
-        //  True        -> We definitely expect a parenthesized arrow function here.
-        //  False       -> There *cannot* be a parenthesized arrow function here.
-        //  Unknown     -> There *might* be a parenthesized arrow function here.
-        //                 Speculatively look ahead to be sure, and rollback if not.
-        function isParenthesizedArrowFunctionExpression() {
-            if (token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */ || token === 118 /* AsyncKeyword */) {
-                return lookAhead(isParenthesizedArrowFunctionExpressionWorker);
-            }
-            if (token === 34 /* EqualsGreaterThanToken */) {
-                // ERROR RECOVERY TWEAK:
-                // If we see a standalone => try to parse it as an arrow function expression as that's
-                // likely what the user intended to write.
-                return 1 /* True */;
-            }
-            // Definitely not a parenthesized arrow function.
-            return 0 /* False */;
-        }
-        function isParenthesizedArrowFunctionExpressionWorker() {
-            if (token === 118 /* AsyncKeyword */) {
-                nextToken();
-                if (scanner.hasPrecedingLineBreak()) {
-                    return 0 /* False */;
-                }
-                if (token !== 17 /* OpenParenToken */ && token !== 25 /* LessThanToken */) {
-                    return 0 /* False */;
-                }
-            }
-            var first = token;
-            var second = nextToken();
-            if (first === 17 /* OpenParenToken */) {
-                if (second === 18 /* CloseParenToken */) {
-                    // Simple cases: "() =>", "(): ", and  "() {".
-                    // This is an arrow function with no parameters.
-                    // The last one is not actually an arrow function,
-                    // but this is probably what the user intended.
-                    var third = nextToken();
-                    switch (third) {
-                        case 34 /* EqualsGreaterThanToken */:
-                        case 54 /* ColonToken */:
-                        case 15 /* OpenBraceToken */:
-                            return 1 /* True */;
-                        default:
-                            return 0 /* False */;
-                    }
-                }
-                // If encounter "([" or "({", this could be the start of a binding pattern.
-                // Examples:
-                //      ([ x ]) => { }
-                //      ({ x }) => { }
-                //      ([ x ])
-                //      ({ x })
-                if (second === 19 /* OpenBracketToken */ || second === 15 /* OpenBraceToken */) {
-                    return 2 /* Unknown */;
-                }
-                // Simple case: "(..."
-                // This is an arrow function with a rest parameter.
-                if (second === 22 /* DotDotDotToken */) {
-                    return 1 /* True */;
-                }
-                // If we had "(" followed by something that's not an identifier,
-                // then this definitely doesn't look like a lambda.
-                // Note: we could be a little more lenient and allow
-                // "(public" or "(private". These would not ever actually be allowed,
-                // but we could provide a good error message instead of bailing out.
-                if (!isIdentifier()) {
-                    return 0 /* False */;
-                }
-                // If we have something like "(a:", then we must have a
-                // type-annotated parameter in an arrow function expression.
-                if (nextToken() === 54 /* ColonToken */) {
-                    return 1 /* True */;
-                }
-                // This *could* be a parenthesized arrow function.
-                // Return Unknown to let the caller know.
-                return 2 /* Unknown */;
-            }
-            else {
-                ts.Debug.assert(first === 25 /* LessThanToken */);
-                // If we have "<" not followed by an identifier,
-                // then this definitely is not an arrow function.
-                if (!isIdentifier()) {
-                    return 0 /* False */;
-                }
-                // JSX overrides
-                if (sourceFile.languageVariant === 1 /* JSX */) {
-                    var isArrowFunctionInJsx = lookAhead(function () {
-                        var third = nextToken();
-                        if (third === 83 /* ExtendsKeyword */) {
-                            var fourth = nextToken();
-                            switch (fourth) {
-                                case 56 /* EqualsToken */:
-                                case 27 /* GreaterThanToken */:
-                                    return false;
-                                default:
-                                    return true;
-                            }
-                        }
-                        else if (third === 24 /* CommaToken */) {
-                            return true;
-                        }
-                        return false;
-                    });
-                    if (isArrowFunctionInJsx) {
-                        return 1 /* True */;
-                    }
-                    return 0 /* False */;
-                }
-                // This *could* be a parenthesized arrow function.
-                return 2 /* Unknown */;
-            }
-        }
-        function parsePossibleParenthesizedArrowFunctionExpressionHead() {
-            return parseParenthesizedArrowFunctionExpressionHead(/*allowAmbiguity*/ false);
-        }
-        function tryParseAsyncSimpleArrowFunctionExpression() {
-            // We do a check here so that we won't be doing unnecessarily call to "lookAhead"
-            if (token === 118 /* AsyncKeyword */) {
-                var isUnParenthesizedAsyncArrowFunction = lookAhead(isUnParenthesizedAsyncArrowFunctionWorker);
-                if (isUnParenthesizedAsyncArrowFunction === 1 /* True */) {
-                    var asyncModifier = parseModifiersForArrowFunction();
-                    var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                    return parseSimpleArrowFunctionExpression(expr, asyncModifier);
-                }
-            }
-            return undefined;
-        }
-        function isUnParenthesizedAsyncArrowFunctionWorker() {
-            // AsyncArrowFunctionExpression:
-            //      1) async[no LineTerminator here]AsyncArrowBindingIdentifier[?Yield][no LineTerminator here]=>AsyncConciseBody[?In]
-            //      2) CoverCallExpressionAndAsyncArrowHead[?Yield, ?Await][no LineTerminator here]=>AsyncConciseBody[?In]
-            if (token === 118 /* AsyncKeyword */) {
-                nextToken();
-                // If the "async" is followed by "=>" token then it is not a begining of an async arrow-function
-                // but instead a simple arrow-function which will be parsed inside "parseAssignmentExpressionOrHigher"
-                if (scanner.hasPrecedingLineBreak() || token === 34 /* EqualsGreaterThanToken */) {
-                    return 0 /* False */;
-                }
-                // Check for un-parenthesized AsyncArrowFunction
-                var expr = parseBinaryExpressionOrHigher(/*precedence*/ 0);
-                if (!scanner.hasPrecedingLineBreak() && expr.kind === 69 /* Identifier */ && token === 34 /* EqualsGreaterThanToken */) {
-                    return 1 /* True */;
-                }
-            }
-            return 0 /* False */;
-        }
-        function parseParenthesizedArrowFunctionExpressionHead(allowAmbiguity) {
-            var node = createNode(180 /* ArrowFunction */);
-            setModifiers(node, parseModifiersForArrowFunction());
-            var isAsync = !!(node.flags & 256 /* Async */);
-            // Arrow functions are never generators.
-            //
-            // If we're speculatively parsing a signature for a parenthesized arrow function, then
-            // we have to have a complete parameter list.  Otherwise we might see something like
-            // a => (b => c)
-            // And think that "(b =>" was actually a parenthesized arrow function with a missing
-            // close paren.
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ !allowAmbiguity, node);
-            // If we couldn't get parameters, we definitely could not parse out an arrow function.
-            if (!node.parameters) {
-                return undefined;
-            }
-            // Parsing a signature isn't enough.
-            // Parenthesized arrow signatures often look like other valid expressions.
-            // For instance:
-            //  - "(x = 10)" is an assignment expression parsed as a signature with a default parameter value.
-            //  - "(x,y)" is a comma expression parsed as a signature with two parameters.
-            //  - "a ? (b): c" will have "(b):" parsed as a signature with a return type annotation.
-            //
-            // So we need just a bit of lookahead to ensure that it can only be a signature.
-            if (!allowAmbiguity && token !== 34 /* EqualsGreaterThanToken */ && token !== 15 /* OpenBraceToken */) {
-                // Returning undefined here will cause our caller to rewind to where we started from.
-                return undefined;
-            }
-            return node;
-        }
-        function parseArrowFunctionExpressionBody(isAsync) {
-            if (token === 15 /* OpenBraceToken */) {
-                return parseFunctionBlock(/*allowYield*/ false, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false);
-            }
-            if (token !== 23 /* SemicolonToken */ &&
-                token !== 87 /* FunctionKeyword */ &&
-                token !== 73 /* ClassKeyword */ &&
-                isStartOfStatement() &&
-                !isStartOfExpressionStatement()) {
-                // Check if we got a plain statement (i.e. no expression-statements, no function/class expressions/declarations)
-                //
-                // Here we try to recover from a potential error situation in the case where the
-                // user meant to supply a block. For example, if the user wrote:
-                //
-                //  a =>
-                //      let v = 0;
-                //  }
-                //
-                // they may be missing an open brace.  Check to see if that's the case so we can
-                // try to recover better.  If we don't do this, then the next close curly we see may end
-                // up preemptively closing the containing construct.
-                //
-                // Note: even when 'ignoreMissingOpenBrace' is passed as true, parseBody will still error.
-                return parseFunctionBlock(/*allowYield*/ false, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ true);
-            }
-            return isAsync
-                ? doInAwaitContext(parseAssignmentExpressionOrHigher)
-                : doOutsideOfAwaitContext(parseAssignmentExpressionOrHigher);
-        }
-        function parseConditionalExpressionRest(leftOperand) {
-            // Note: we are passed in an expression which was produced from parseBinaryExpressionOrHigher.
-            var questionToken = parseOptionalToken(53 /* QuestionToken */);
-            if (!questionToken) {
-                return leftOperand;
-            }
-            // Note: we explicitly 'allowIn' in the whenTrue part of the condition expression, and
-            // we do not that for the 'whenFalse' part.
-            var node = createNode(188 /* ConditionalExpression */, leftOperand.pos);
-            node.condition = leftOperand;
-            node.questionToken = questionToken;
-            node.whenTrue = doOutsideOfContext(disallowInAndDecoratorContext, parseAssignmentExpressionOrHigher);
-            node.colonToken = parseExpectedToken(54 /* ColonToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics._0_expected, ts.tokenToString(54 /* ColonToken */));
-            node.whenFalse = parseAssignmentExpressionOrHigher();
-            return finishNode(node);
-        }
-        function parseBinaryExpressionOrHigher(precedence) {
-            var leftOperand = parseUnaryExpressionOrHigher();
-            return parseBinaryExpressionRest(precedence, leftOperand);
-        }
-        function isInOrOfKeyword(t) {
-            return t === 90 /* InKeyword */ || t === 138 /* OfKeyword */;
-        }
-        function parseBinaryExpressionRest(precedence, leftOperand) {
-            while (true) {
-                // We either have a binary operator here, or we're finished.  We call
-                // reScanGreaterToken so that we merge token sequences like > and = into >=
-                reScanGreaterToken();
-                var newPrecedence = getBinaryOperatorPrecedence();
-                // Check the precedence to see if we should "take" this operator
-                // - For left associative operator (all operator but **), consume the operator,
-                //   recursively call the function below, and parse binaryExpression as a rightOperand
-                //   of the caller if the new precedence of the operator is greater then or equal to the current precedence.
-                //   For example:
-                //      a - b - c;
-                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
-                //      a * b - c
-                //            ^token; leftOperand = b. Return b to the caller as a rightOperand
-                //      a - b * c;
-                //            ^token; leftOperand = b. Return b * c to the caller as a rightOperand
-                // - For right associative operator (**), consume the operator, recursively call the function
-                //   and parse binaryExpression as a rightOperand of the caller if the new precedence of
-                //   the operator is strictly grater than the current precedence
-                //   For example:
-                //      a ** b ** c;
-                //             ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
-                //      a - b ** c;
-                //            ^^token; leftOperand = b. Return b ** c to the caller as a rightOperand
-                //      a ** b - c
-                //             ^token; leftOperand = b. Return b to the caller as a rightOperand
-                var consumeCurrentOperator = token === 38 /* AsteriskAsteriskToken */ ?
-                    newPrecedence >= precedence :
-                    newPrecedence > precedence;
-                if (!consumeCurrentOperator) {
-                    break;
-                }
-                if (token === 90 /* InKeyword */ && inDisallowInContext()) {
-                    break;
-                }
-                if (token === 116 /* AsKeyword */) {
-                    // Make sure we *do* perform ASI for constructs like this:
-                    //    var x = foo
-                    //    as (Bar)
-                    // This should be parsed as an initialized variable, followed
-                    // by a function call to 'as' with the argument 'Bar'
-                    if (scanner.hasPrecedingLineBreak()) {
-                        break;
-                    }
-                    else {
-                        nextToken();
-                        leftOperand = makeAsExpression(leftOperand, parseType());
-                    }
-                }
-                else {
-                    leftOperand = makeBinaryExpression(leftOperand, parseTokenNode(), parseBinaryExpressionOrHigher(newPrecedence));
-                }
-            }
-            return leftOperand;
-        }
-        function isBinaryOperator() {
-            if (inDisallowInContext() && token === 90 /* InKeyword */) {
-                return false;
-            }
-            return getBinaryOperatorPrecedence() > 0;
-        }
-        function getBinaryOperatorPrecedence() {
-            switch (token) {
-                case 52 /* BarBarToken */:
-                    return 1;
-                case 51 /* AmpersandAmpersandToken */:
-                    return 2;
-                case 47 /* BarToken */:
-                    return 3;
-                case 48 /* CaretToken */:
-                    return 4;
-                case 46 /* AmpersandToken */:
-                    return 5;
-                case 30 /* EqualsEqualsToken */:
-                case 31 /* ExclamationEqualsToken */:
-                case 32 /* EqualsEqualsEqualsToken */:
-                case 33 /* ExclamationEqualsEqualsToken */:
-                    return 6;
-                case 25 /* LessThanToken */:
-                case 27 /* GreaterThanToken */:
-                case 28 /* LessThanEqualsToken */:
-                case 29 /* GreaterThanEqualsToken */:
-                case 91 /* InstanceOfKeyword */:
-                case 90 /* InKeyword */:
-                case 116 /* AsKeyword */:
-                    return 7;
-                case 43 /* LessThanLessThanToken */:
-                case 44 /* GreaterThanGreaterThanToken */:
-                case 45 /* GreaterThanGreaterThanGreaterThanToken */:
-                    return 8;
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                    return 9;
-                case 37 /* AsteriskToken */:
-                case 39 /* SlashToken */:
-                case 40 /* PercentToken */:
-                    return 10;
-                case 38 /* AsteriskAsteriskToken */:
-                    return 11;
-            }
-            // -1 is lower than all other precedences.  Returning it will cause binary expression
-            // parsing to stop.
-            return -1;
-        }
-        function makeBinaryExpression(left, operatorToken, right) {
-            var node = createNode(187 /* BinaryExpression */, left.pos);
-            node.left = left;
-            node.operatorToken = operatorToken;
-            node.right = right;
-            return finishNode(node);
-        }
-        function makeAsExpression(left, right) {
-            var node = createNode(195 /* AsExpression */, left.pos);
-            node.expression = left;
-            node.type = right;
-            return finishNode(node);
-        }
-        function parsePrefixUnaryExpression() {
-            var node = createNode(185 /* PrefixUnaryExpression */);
-            node.operator = token;
-            nextToken();
-            node.operand = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function parseDeleteExpression() {
-            var node = createNode(181 /* DeleteExpression */);
-            nextToken();
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function parseTypeOfExpression() {
-            var node = createNode(182 /* TypeOfExpression */);
-            nextToken();
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function parseVoidExpression() {
-            var node = createNode(183 /* VoidExpression */);
-            nextToken();
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function isAwaitExpression() {
-            if (token === 119 /* AwaitKeyword */) {
-                if (inAwaitContext()) {
-                    return true;
-                }
-                // here we are using similar heuristics as 'isYieldExpression'
-                return lookAhead(nextTokenIsIdentifierOnSameLine);
-            }
-            return false;
-        }
-        function parseAwaitExpression() {
-            var node = createNode(184 /* AwaitExpression */);
-            nextToken();
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        /**
-         * Parse ES7 unary expression and await expression
-         *
-         * ES7 UnaryExpression:
-         *      1) SimpleUnaryExpression[?yield]
-         *      2) IncrementExpression[?yield] ** UnaryExpression[?yield]
-         */
-        function parseUnaryExpressionOrHigher() {
-            if (isAwaitExpression()) {
-                return parseAwaitExpression();
-            }
-            if (isIncrementExpression()) {
-                var incrementExpression = parseIncrementExpression();
-                return token === 38 /* AsteriskAsteriskToken */ ?
-                    parseBinaryExpressionRest(getBinaryOperatorPrecedence(), incrementExpression) :
-                    incrementExpression;
-            }
-            var unaryOperator = token;
-            var simpleUnaryExpression = parseSimpleUnaryExpression();
-            if (token === 38 /* AsteriskAsteriskToken */) {
-                var start = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
-                if (simpleUnaryExpression.kind === 177 /* TypeAssertionExpression */) {
-                    parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.A_type_assertion_expression_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses);
-                }
-                else {
-                    parseErrorAtPosition(start, simpleUnaryExpression.end - start, ts.Diagnostics.An_unary_expression_with_the_0_operator_is_not_allowed_in_the_left_hand_side_of_an_exponentiation_expression_Consider_enclosing_the_expression_in_parentheses, ts.tokenToString(unaryOperator));
-                }
-            }
-            return simpleUnaryExpression;
-        }
-        /**
-         * Parse ES7 simple-unary expression or higher:
-         *
-         * ES7 SimpleUnaryExpression:
-         *      1) IncrementExpression[?yield]
-         *      2) delete UnaryExpression[?yield]
-         *      3) void UnaryExpression[?yield]
-         *      4) typeof UnaryExpression[?yield]
-         *      5) + UnaryExpression[?yield]
-         *      6) - UnaryExpression[?yield]
-         *      7) ~ UnaryExpression[?yield]
-         *      8) ! UnaryExpression[?yield]
-         */
-        function parseSimpleUnaryExpression() {
-            switch (token) {
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 50 /* TildeToken */:
-                case 49 /* ExclamationToken */:
-                    return parsePrefixUnaryExpression();
-                case 78 /* DeleteKeyword */:
-                    return parseDeleteExpression();
-                case 101 /* TypeOfKeyword */:
-                    return parseTypeOfExpression();
-                case 103 /* VoidKeyword */:
-                    return parseVoidExpression();
-                case 25 /* LessThanToken */:
-                    // This is modified UnaryExpression grammar in TypeScript
-                    //  UnaryExpression (modified):
-                    //      < type > UnaryExpression
-                    return parseTypeAssertion();
-                default:
-                    return parseIncrementExpression();
-            }
-        }
-        /**
-         * Check if the current token can possibly be an ES7 increment expression.
-         *
-         * ES7 IncrementExpression:
-         *      LeftHandSideExpression[?Yield]
-         *      LeftHandSideExpression[?Yield][no LineTerminator here]++
-         *      LeftHandSideExpression[?Yield][no LineTerminator here]--
-         *      ++LeftHandSideExpression[?Yield]
-         *      --LeftHandSideExpression[?Yield]
-         */
-        function isIncrementExpression() {
-            // This function is called inside parseUnaryExpression to decide
-            // whether to call parseSimpleUnaryExpression or call parseIncrementExpression directly
-            switch (token) {
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 50 /* TildeToken */:
-                case 49 /* ExclamationToken */:
-                case 78 /* DeleteKeyword */:
-                case 101 /* TypeOfKeyword */:
-                case 103 /* VoidKeyword */:
-                    return false;
-                case 25 /* LessThanToken */:
-                    // If we are not in JSX context, we are parsing TypeAssertion which is an UnaryExpression
-                    if (sourceFile.languageVariant !== 1 /* JSX */) {
-                        return false;
-                    }
-                // We are in JSX context and the token is part of JSXElement.
-                // Fall through
-                default:
-                    return true;
-            }
-        }
-        /**
-         * Parse ES7 IncrementExpression. IncrementExpression is used instead of ES6's PostFixExpression.
-         *
-         * ES7 IncrementExpression[yield]:
-         *      1) LeftHandSideExpression[?yield]
-         *      2) LeftHandSideExpression[?yield] [[no LineTerminator here]]++
-         *      3) LeftHandSideExpression[?yield] [[no LineTerminator here]]--
-         *      4) ++LeftHandSideExpression[?yield]
-         *      5) --LeftHandSideExpression[?yield]
-         * In TypeScript (2), (3) are parsed as PostfixUnaryExpression. (4), (5) are parsed as PrefixUnaryExpression
-         */
-        function parseIncrementExpression() {
-            if (token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) {
-                var node = createNode(185 /* PrefixUnaryExpression */);
-                node.operator = token;
-                nextToken();
-                node.operand = parseLeftHandSideExpressionOrHigher();
-                return finishNode(node);
-            }
-            else if (sourceFile.languageVariant === 1 /* JSX */ && token === 25 /* LessThanToken */ && lookAhead(nextTokenIsIdentifierOrKeyword)) {
-                // JSXElement is part of primaryExpression
-                return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true);
-            }
-            var expression = parseLeftHandSideExpressionOrHigher();
-            ts.Debug.assert(ts.isLeftHandSideExpression(expression));
-            if ((token === 41 /* PlusPlusToken */ || token === 42 /* MinusMinusToken */) && !scanner.hasPrecedingLineBreak()) {
-                var node = createNode(186 /* PostfixUnaryExpression */, expression.pos);
-                node.operand = expression;
-                node.operator = token;
-                nextToken();
-                return finishNode(node);
-            }
-            return expression;
-        }
-        function parseLeftHandSideExpressionOrHigher() {
-            // Original Ecma:
-            // LeftHandSideExpression: See 11.2
-            //      NewExpression
-            //      CallExpression
-            //
-            // Our simplification:
-            //
-            // LeftHandSideExpression: See 11.2
-            //      MemberExpression
-            //      CallExpression
-            //
-            // See comment in parseMemberExpressionOrHigher on how we replaced NewExpression with
-            // MemberExpression to make our lives easier.
-            //
-            // to best understand the below code, it's important to see how CallExpression expands
-            // out into its own productions:
-            //
-            // CallExpression:
-            //      MemberExpression Arguments
-            //      CallExpression Arguments
-            //      CallExpression[Expression]
-            //      CallExpression.IdentifierName
-            //      super   (   ArgumentListopt   )
-            //      super.IdentifierName
-            //
-            // Because of the recursion in these calls, we need to bottom out first.  There are two
-            // bottom out states we can run into.  Either we see 'super' which must start either of
-            // the last two CallExpression productions.  Or we have a MemberExpression which either
-            // completes the LeftHandSideExpression, or starts the beginning of the first four
-            // CallExpression productions.
-            var expression = token === 95 /* SuperKeyword */
-                ? parseSuperExpression()
-                : parseMemberExpressionOrHigher();
-            // Now, we *may* be complete.  However, we might have consumed the start of a
-            // CallExpression.  As such, we need to consume the rest of it here to be complete.
-            return parseCallExpressionRest(expression);
-        }
-        function parseMemberExpressionOrHigher() {
-            // Note: to make our lives simpler, we decompose the the NewExpression productions and
-            // place ObjectCreationExpression and FunctionExpression into PrimaryExpression.
-            // like so:
-            //
-            //   PrimaryExpression : See 11.1
-            //      this
-            //      Identifier
-            //      Literal
-            //      ArrayLiteral
-            //      ObjectLiteral
-            //      (Expression)
-            //      FunctionExpression
-            //      new MemberExpression Arguments?
-            //
-            //   MemberExpression : See 11.2
-            //      PrimaryExpression
-            //      MemberExpression[Expression]
-            //      MemberExpression.IdentifierName
-            //
-            //   CallExpression : See 11.2
-            //      MemberExpression
-            //      CallExpression Arguments
-            //      CallExpression[Expression]
-            //      CallExpression.IdentifierName
-            //
-            // Technically this is ambiguous.  i.e. CallExpression defines:
-            //
-            //   CallExpression:
-            //      CallExpression Arguments
-            //
-            // If you see: "new Foo()"
-            //
-            // Then that could be treated as a single ObjectCreationExpression, or it could be
-            // treated as the invocation of "new Foo".  We disambiguate that in code (to match
-            // the original grammar) by making sure that if we see an ObjectCreationExpression
-            // we always consume arguments if they are there. So we treat "new Foo()" as an
-            // object creation only, and not at all as an invocation)  Another way to think
-            // about this is that for every "new" that we see, we will consume an argument list if
-            // it is there as part of the *associated* object creation node.  Any additional
-            // argument lists we see, will become invocation expressions.
-            //
-            // Because there are no other places in the grammar now that refer to FunctionExpression
-            // or ObjectCreationExpression, it is safe to push down into the PrimaryExpression
-            // production.
-            //
-            // Because CallExpression and MemberExpression are left recursive, we need to bottom out
-            // of the recursion immediately.  So we parse out a primary expression to start with.
-            var expression = parsePrimaryExpression();
-            return parseMemberExpressionRest(expression);
-        }
-        function parseSuperExpression() {
-            var expression = parseTokenNode();
-            if (token === 17 /* OpenParenToken */ || token === 21 /* DotToken */ || token === 19 /* OpenBracketToken */) {
-                return expression;
-            }
-            // If we have seen "super" it must be followed by '(' or '.'.
-            // If it wasn't then just try to parse out a '.' and report an error.
-            var node = createNode(172 /* PropertyAccessExpression */, expression.pos);
-            node.expression = expression;
-            parseExpectedToken(21 /* DotToken */, /*reportAtCurrentPosition*/ false, ts.Diagnostics.super_must_be_followed_by_an_argument_list_or_member_access);
-            node.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
-            return finishNode(node);
-        }
-        function tagNamesAreEquivalent(lhs, rhs) {
-            if (lhs.kind !== rhs.kind) {
-                return false;
-            }
-            if (lhs.kind === 69 /* Identifier */) {
-                return lhs.text === rhs.text;
-            }
-            if (lhs.kind === 97 /* ThisKeyword */) {
-                return true;
-            }
-            // If we are at this statement then we must have PropertyAccessExpression and because tag name in Jsx element can only
-            // take forms of JsxTagNameExpression which includes an identifier, "this" expression, or another propertyAccessExpression
-            // it is safe to case the expression property as such. See parseJsxElementName for how we parse tag name in Jsx element
-            return lhs.name.text === rhs.name.text &&
-                tagNamesAreEquivalent(lhs.expression, rhs.expression);
-        }
-        function parseJsxElementOrSelfClosingElement(inExpressionContext) {
-            var opening = parseJsxOpeningOrSelfClosingElement(inExpressionContext);
-            var result;
-            if (opening.kind === 243 /* JsxOpeningElement */) {
-                var node = createNode(241 /* JsxElement */, opening.pos);
-                node.openingElement = opening;
-                node.children = parseJsxChildren(node.openingElement.tagName);
-                node.closingElement = parseJsxClosingElement(inExpressionContext);
-                if (!tagNamesAreEquivalent(node.openingElement.tagName, node.closingElement.tagName)) {
-                    parseErrorAtPosition(node.closingElement.pos, node.closingElement.end - node.closingElement.pos, ts.Diagnostics.Expected_corresponding_JSX_closing_tag_for_0, ts.getTextOfNodeFromSourceText(sourceText, node.openingElement.tagName));
-                }
-                result = finishNode(node);
-            }
-            else {
-                ts.Debug.assert(opening.kind === 242 /* JsxSelfClosingElement */);
-                // Nothing else to do for self-closing elements
-                result = opening;
-            }
-            // If the user writes the invalid code '<div></div><div></div>' in an expression context (i.e. not wrapped in
-            // an enclosing tag), we'll naively try to parse   ^ this as a 'less than' operator and the remainder of the tag
-            // as garbage, which will cause the formatter to badly mangle the JSX. Perform a speculative parse of a JSX
-            // element if we see a < token so that we can wrap it in a synthetic binary expression so the formatter
-            // does less damage and we can report a better error.
-            // Since JSX elements are invalid < operands anyway, this lookahead parse will only occur in error scenarios
-            // of one sort or another.
-            if (inExpressionContext && token === 25 /* LessThanToken */) {
-                var invalidElement = tryParse(function () { return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ true); });
-                if (invalidElement) {
-                    parseErrorAtCurrentToken(ts.Diagnostics.JSX_expressions_must_have_one_parent_element);
-                    var badNode = createNode(187 /* BinaryExpression */, result.pos);
-                    badNode.end = invalidElement.end;
-                    badNode.left = result;
-                    badNode.right = invalidElement;
-                    badNode.operatorToken = createMissingNode(24 /* CommaToken */, /*reportAtCurrentPosition*/ false, /*diagnosticMessage*/ undefined);
-                    badNode.operatorToken.pos = badNode.operatorToken.end = badNode.right.pos;
-                    return badNode;
-                }
-            }
-            return result;
-        }
-        function parseJsxText() {
-            var node = createNode(244 /* JsxText */, scanner.getStartPos());
-            token = scanner.scanJsxToken();
-            return finishNode(node);
-        }
-        function parseJsxChild() {
-            switch (token) {
-                case 244 /* JsxText */:
-                    return parseJsxText();
-                case 15 /* OpenBraceToken */:
-                    return parseJsxExpression(/*inExpressionContext*/ false);
-                case 25 /* LessThanToken */:
-                    return parseJsxElementOrSelfClosingElement(/*inExpressionContext*/ false);
-            }
-            ts.Debug.fail("Unknown JSX child kind " + token);
-        }
-        function parseJsxChildren(openingTagName) {
-            var result = [];
-            result.pos = scanner.getStartPos();
-            var saveParsingContext = parsingContext;
-            parsingContext |= 1 << 14 /* JsxChildren */;
-            while (true) {
-                token = scanner.reScanJsxToken();
-                if (token === 26 /* LessThanSlashToken */) {
-                    // Closing tag
-                    break;
-                }
-                else if (token === 1 /* EndOfFileToken */) {
-                    // If we hit EOF, issue the error at the tag that lacks the closing element
-                    // rather than at the end of the file (which is useless)
-                    parseErrorAtPosition(openingTagName.pos, openingTagName.end - openingTagName.pos, ts.Diagnostics.JSX_element_0_has_no_corresponding_closing_tag, ts.getTextOfNodeFromSourceText(sourceText, openingTagName));
-                    break;
-                }
-                result.push(parseJsxChild());
-            }
-            result.end = scanner.getTokenPos();
-            parsingContext = saveParsingContext;
-            return result;
-        }
-        function parseJsxOpeningOrSelfClosingElement(inExpressionContext) {
-            var fullStart = scanner.getStartPos();
-            parseExpected(25 /* LessThanToken */);
-            var tagName = parseJsxElementName();
-            var attributes = parseList(13 /* JsxAttributes */, parseJsxAttribute);
-            var node;
-            if (token === 27 /* GreaterThanToken */) {
-                // Closing tag, so scan the immediately-following text with the JSX scanning instead
-                // of regular scanning to avoid treating illegal characters (e.g. '#') as immediate
-                // scanning errors
-                node = createNode(243 /* JsxOpeningElement */, fullStart);
-                scanJsxText();
-            }
-            else {
-                parseExpected(39 /* SlashToken */);
-                if (inExpressionContext) {
-                    parseExpected(27 /* GreaterThanToken */);
-                }
-                else {
-                    parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
-                    scanJsxText();
-                }
-                node = createNode(242 /* JsxSelfClosingElement */, fullStart);
-            }
-            node.tagName = tagName;
-            node.attributes = attributes;
-            return finishNode(node);
-        }
-        function parseJsxElementName() {
-            scanJsxIdentifier();
-            // JsxElement can have name in the form of
-            //      propertyAccessExpression
-            //      primaryExpression in the form of an identifier and "this" keyword
-            // We can't just simply use parseLeftHandSideExpressionOrHigher because then we will start consider class,function etc as a keyword
-            // We only want to consider "this" as a primaryExpression
-            var expression = token === 97 /* ThisKeyword */ ?
-                parseTokenNode() : parseIdentifierName();
-            while (parseOptional(21 /* DotToken */)) {
-                var propertyAccess = createNode(172 /* PropertyAccessExpression */, expression.pos);
-                propertyAccess.expression = expression;
-                propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
-                expression = finishNode(propertyAccess);
-            }
-            return expression;
-        }
-        function parseJsxExpression(inExpressionContext) {
-            var node = createNode(248 /* JsxExpression */);
-            parseExpected(15 /* OpenBraceToken */);
-            if (token !== 16 /* CloseBraceToken */) {
-                node.expression = parseAssignmentExpressionOrHigher();
-            }
-            if (inExpressionContext) {
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                parseExpected(16 /* CloseBraceToken */, /*message*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
-            }
-            return finishNode(node);
-        }
-        function parseJsxAttribute() {
-            if (token === 15 /* OpenBraceToken */) {
-                return parseJsxSpreadAttribute();
-            }
-            scanJsxIdentifier();
-            var node = createNode(246 /* JsxAttribute */);
-            node.name = parseIdentifierName();
-            if (parseOptional(56 /* EqualsToken */)) {
-                switch (token) {
-                    case 9 /* StringLiteral */:
-                        node.initializer = parseLiteralNode();
-                        break;
-                    default:
-                        node.initializer = parseJsxExpression(/*inExpressionContext*/ true);
-                        break;
-                }
-            }
-            return finishNode(node);
-        }
-        function parseJsxSpreadAttribute() {
-            var node = createNode(247 /* JsxSpreadAttribute */);
-            parseExpected(15 /* OpenBraceToken */);
-            parseExpected(22 /* DotDotDotToken */);
-            node.expression = parseExpression();
-            parseExpected(16 /* CloseBraceToken */);
-            return finishNode(node);
-        }
-        function parseJsxClosingElement(inExpressionContext) {
-            var node = createNode(245 /* JsxClosingElement */);
-            parseExpected(26 /* LessThanSlashToken */);
-            node.tagName = parseJsxElementName();
-            if (inExpressionContext) {
-                parseExpected(27 /* GreaterThanToken */);
-            }
-            else {
-                parseExpected(27 /* GreaterThanToken */, /*diagnostic*/ undefined, /*shouldAdvance*/ false);
-                scanJsxText();
-            }
-            return finishNode(node);
-        }
-        function parseTypeAssertion() {
-            var node = createNode(177 /* TypeAssertionExpression */);
-            parseExpected(25 /* LessThanToken */);
-            node.type = parseType();
-            parseExpected(27 /* GreaterThanToken */);
-            node.expression = parseSimpleUnaryExpression();
-            return finishNode(node);
-        }
-        function parseMemberExpressionRest(expression) {
-            while (true) {
-                var dotToken = parseOptionalToken(21 /* DotToken */);
-                if (dotToken) {
-                    var propertyAccess = createNode(172 /* PropertyAccessExpression */, expression.pos);
-                    propertyAccess.expression = expression;
-                    propertyAccess.name = parseRightSideOfDot(/*allowIdentifierNames*/ true);
-                    expression = finishNode(propertyAccess);
-                    continue;
-                }
-                if (token === 49 /* ExclamationToken */ && !scanner.hasPrecedingLineBreak()) {
-                    nextToken();
-                    var nonNullExpression = createNode(196 /* NonNullExpression */, expression.pos);
-                    nonNullExpression.expression = expression;
-                    expression = finishNode(nonNullExpression);
-                    continue;
-                }
-                // when in the [Decorator] context, we do not parse ElementAccess as it could be part of a ComputedPropertyName
-                if (!inDecoratorContext() && parseOptional(19 /* OpenBracketToken */)) {
-                    var indexedAccess = createNode(173 /* ElementAccessExpression */, expression.pos);
-                    indexedAccess.expression = expression;
-                    // It's not uncommon for a user to write: "new Type[]".
-                    // Check for that common pattern and report a better error message.
-                    if (token !== 20 /* CloseBracketToken */) {
-                        indexedAccess.argumentExpression = allowInAnd(parseExpression);
-                        if (indexedAccess.argumentExpression.kind === 9 /* StringLiteral */ || indexedAccess.argumentExpression.kind === 8 /* NumericLiteral */) {
-                            var literal = indexedAccess.argumentExpression;
-                            literal.text = internIdentifier(literal.text);
-                        }
-                    }
-                    parseExpected(20 /* CloseBracketToken */);
-                    expression = finishNode(indexedAccess);
-                    continue;
-                }
-                if (token === 11 /* NoSubstitutionTemplateLiteral */ || token === 12 /* TemplateHead */) {
-                    var tagExpression = createNode(176 /* TaggedTemplateExpression */, expression.pos);
-                    tagExpression.tag = expression;
-                    tagExpression.template = token === 11 /* NoSubstitutionTemplateLiteral */
-                        ? parseLiteralNode()
-                        : parseTemplateExpression();
-                    expression = finishNode(tagExpression);
-                    continue;
-                }
-                return expression;
-            }
-        }
-        function parseCallExpressionRest(expression) {
-            while (true) {
-                expression = parseMemberExpressionRest(expression);
-                if (token === 25 /* LessThanToken */) {
-                    // See if this is the start of a generic invocation.  If so, consume it and
-                    // keep checking for postfix expressions.  Otherwise, it's just a '<' that's
-                    // part of an arithmetic expression.  Break out so we consume it higher in the
-                    // stack.
-                    var typeArguments = tryParse(parseTypeArgumentsInExpression);
-                    if (!typeArguments) {
-                        return expression;
-                    }
-                    var callExpr = createNode(174 /* CallExpression */, expression.pos);
-                    callExpr.expression = expression;
-                    callExpr.typeArguments = typeArguments;
-                    callExpr.arguments = parseArgumentList();
-                    expression = finishNode(callExpr);
-                    continue;
-                }
-                else if (token === 17 /* OpenParenToken */) {
-                    var callExpr = createNode(174 /* CallExpression */, expression.pos);
-                    callExpr.expression = expression;
-                    callExpr.arguments = parseArgumentList();
-                    expression = finishNode(callExpr);
-                    continue;
-                }
-                return expression;
-            }
-        }
-        function parseArgumentList() {
-            parseExpected(17 /* OpenParenToken */);
-            var result = parseDelimitedList(11 /* ArgumentExpressions */, parseArgumentExpression);
-            parseExpected(18 /* CloseParenToken */);
-            return result;
-        }
-        function parseTypeArgumentsInExpression() {
-            if (!parseOptional(25 /* LessThanToken */)) {
-                return undefined;
-            }
-            var typeArguments = parseDelimitedList(18 /* TypeArguments */, parseType);
-            if (!parseExpected(27 /* GreaterThanToken */)) {
-                // If it doesn't have the closing >  then it's definitely not an type argument list.
-                return undefined;
-            }
-            // If we have a '<', then only parse this as a argument list if the type arguments
-            // are complete and we have an open paren.  if we don't, rewind and return nothing.
-            return typeArguments && canFollowTypeArgumentsInExpression()
-                ? typeArguments
-                : undefined;
-        }
-        function canFollowTypeArgumentsInExpression() {
-            switch (token) {
-                case 17 /* OpenParenToken */: // foo<x>(
-                // this case are the only case where this token can legally follow a type argument
-                // list.  So we definitely want to treat this as a type arg list.
-                case 21 /* DotToken */: // foo<x>.
-                case 18 /* CloseParenToken */: // foo<x>)
-                case 20 /* CloseBracketToken */: // foo<x>]
-                case 54 /* ColonToken */: // foo<x>:
-                case 23 /* SemicolonToken */: // foo<x>;
-                case 53 /* QuestionToken */: // foo<x>?
-                case 30 /* EqualsEqualsToken */: // foo<x> ==
-                case 32 /* EqualsEqualsEqualsToken */: // foo<x> ===
-                case 31 /* ExclamationEqualsToken */: // foo<x> !=
-                case 33 /* ExclamationEqualsEqualsToken */: // foo<x> !==
-                case 51 /* AmpersandAmpersandToken */: // foo<x> &&
-                case 52 /* BarBarToken */: // foo<x> ||
-                case 48 /* CaretToken */: // foo<x> ^
-                case 46 /* AmpersandToken */: // foo<x> &
-                case 47 /* BarToken */: // foo<x> |
-                case 16 /* CloseBraceToken */: // foo<x> }
-                case 1 /* EndOfFileToken */:
-                    // these cases can't legally follow a type arg list.  However, they're not legal
-                    // expressions either.  The user is probably in the middle of a generic type. So
-                    // treat it as such.
-                    return true;
-                case 24 /* CommaToken */: // foo<x>,
-                case 15 /* OpenBraceToken */: // foo<x> {
-                // We don't want to treat these as type arguments.  Otherwise we'll parse this
-                // as an invocation expression.  Instead, we want to parse out the expression
-                // in isolation from the type arguments.
-                default:
-                    // Anything else treat as an expression.
-                    return false;
-            }
-        }
-        function parsePrimaryExpression() {
-            switch (token) {
-                case 8 /* NumericLiteral */:
-                case 9 /* StringLiteral */:
-                case 11 /* NoSubstitutionTemplateLiteral */:
-                    return parseLiteralNode();
-                case 97 /* ThisKeyword */:
-                case 95 /* SuperKeyword */:
-                case 93 /* NullKeyword */:
-                case 99 /* TrueKeyword */:
-                case 84 /* FalseKeyword */:
-                    return parseTokenNode();
-                case 17 /* OpenParenToken */:
-                    return parseParenthesizedExpression();
-                case 19 /* OpenBracketToken */:
-                    return parseArrayLiteralExpression();
-                case 15 /* OpenBraceToken */:
-                    return parseObjectLiteralExpression();
-                case 118 /* AsyncKeyword */:
-                    // Async arrow functions are parsed earlier in parseAssignmentExpressionOrHigher.
-                    // If we encounter `async [no LineTerminator here] function` then this is an async
-                    // function; otherwise, its an identifier.
-                    if (!lookAhead(nextTokenIsFunctionKeywordOnSameLine)) {
-                        break;
-                    }
-                    return parseFunctionExpression();
-                case 73 /* ClassKeyword */:
-                    return parseClassExpression();
-                case 87 /* FunctionKeyword */:
-                    return parseFunctionExpression();
-                case 92 /* NewKeyword */:
-                    return parseNewExpression();
-                case 39 /* SlashToken */:
-                case 61 /* SlashEqualsToken */:
-                    if (reScanSlashToken() === 10 /* RegularExpressionLiteral */) {
-                        return parseLiteralNode();
-                    }
-                    break;
-                case 12 /* TemplateHead */:
-                    return parseTemplateExpression();
-            }
-            return parseIdentifier(ts.Diagnostics.Expression_expected);
-        }
-        function parseParenthesizedExpression() {
-            var node = createNode(178 /* ParenthesizedExpression */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            return finishNode(node);
-        }
-        function parseSpreadElement() {
-            var node = createNode(191 /* SpreadElementExpression */);
-            parseExpected(22 /* DotDotDotToken */);
-            node.expression = parseAssignmentExpressionOrHigher();
-            return finishNode(node);
-        }
-        function parseArgumentOrArrayLiteralElement() {
-            return token === 22 /* DotDotDotToken */ ? parseSpreadElement() :
-                token === 24 /* CommaToken */ ? createNode(193 /* OmittedExpression */) :
-                    parseAssignmentExpressionOrHigher();
-        }
-        function parseArgumentExpression() {
-            return doOutsideOfContext(disallowInAndDecoratorContext, parseArgumentOrArrayLiteralElement);
-        }
-        function parseArrayLiteralExpression() {
-            var node = createNode(170 /* ArrayLiteralExpression */);
-            parseExpected(19 /* OpenBracketToken */);
-            if (scanner.hasPrecedingLineBreak()) {
-                node.multiLine = true;
-            }
-            node.elements = parseDelimitedList(15 /* ArrayLiteralMembers */, parseArgumentOrArrayLiteralElement);
-            parseExpected(20 /* CloseBracketToken */);
-            return finishNode(node);
-        }
-        function tryParseAccessorDeclaration(fullStart, decorators, modifiers) {
-            if (parseContextualModifier(123 /* GetKeyword */)) {
-                return addJSDocComment(parseAccessorDeclaration(149 /* GetAccessor */, fullStart, decorators, modifiers));
-            }
-            else if (parseContextualModifier(131 /* SetKeyword */)) {
-                return parseAccessorDeclaration(150 /* SetAccessor */, fullStart, decorators, modifiers);
-            }
-            return undefined;
-        }
-        function parseObjectLiteralElement() {
-            var fullStart = scanner.getStartPos();
-            var decorators = parseDecorators();
-            var modifiers = parseModifiers();
-            var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
-            if (accessor) {
-                return accessor;
-            }
-            var asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            var tokenIsIdentifier = isIdentifier();
-            var propertyName = parsePropertyName();
-            // Disallowing of optional property assignments happens in the grammar checker.
-            var questionToken = parseOptionalToken(53 /* QuestionToken */);
-            if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, propertyName, questionToken);
-            }
-            // check if it is short-hand property assignment or normal property assignment
-            // NOTE: if token is EqualsToken it is interpreted as CoverInitializedName production
-            // CoverInitializedName[Yield] :
-            //     IdentifierReference[?Yield] Initializer[In, ?Yield]
-            // this is necessary because ObjectLiteral productions are also used to cover grammar for ObjectAssignmentPattern
-            var isShorthandPropertyAssignment = tokenIsIdentifier && (token === 24 /* CommaToken */ || token === 16 /* CloseBraceToken */ || token === 56 /* EqualsToken */);
-            if (isShorthandPropertyAssignment) {
-                var shorthandDeclaration = createNode(254 /* ShorthandPropertyAssignment */, fullStart);
-                shorthandDeclaration.name = propertyName;
-                shorthandDeclaration.questionToken = questionToken;
-                var equalsToken = parseOptionalToken(56 /* EqualsToken */);
-                if (equalsToken) {
-                    shorthandDeclaration.equalsToken = equalsToken;
-                    shorthandDeclaration.objectAssignmentInitializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                }
-                return addJSDocComment(finishNode(shorthandDeclaration));
-            }
-            else {
-                var propertyAssignment = createNode(253 /* PropertyAssignment */, fullStart);
-                propertyAssignment.modifiers = modifiers;
-                propertyAssignment.name = propertyName;
-                propertyAssignment.questionToken = questionToken;
-                parseExpected(54 /* ColonToken */);
-                propertyAssignment.initializer = allowInAnd(parseAssignmentExpressionOrHigher);
-                return addJSDocComment(finishNode(propertyAssignment));
-            }
-        }
-        function parseObjectLiteralExpression() {
-            var node = createNode(171 /* ObjectLiteralExpression */);
-            parseExpected(15 /* OpenBraceToken */);
-            if (scanner.hasPrecedingLineBreak()) {
-                node.multiLine = true;
-            }
-            node.properties = parseDelimitedList(12 /* ObjectLiteralMembers */, parseObjectLiteralElement, /*considerSemicolonAsDelimiter*/ true);
-            parseExpected(16 /* CloseBraceToken */);
-            return finishNode(node);
-        }
-        function parseFunctionExpression() {
-            // GeneratorExpression:
-            //      function* BindingIdentifier [Yield][opt](FormalParameters[Yield]){ GeneratorBody }
-            //
-            // FunctionExpression:
-            //      function BindingIdentifier[opt](FormalParameters){ FunctionBody }
-            var saveDecoratorContext = inDecoratorContext();
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ false);
-            }
-            var node = createNode(179 /* FunctionExpression */);
-            setModifiers(node, parseModifiers());
-            parseExpected(87 /* FunctionKeyword */);
-            node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 256 /* Async */);
-            node.name =
-                isGenerator && isAsync ? doInYieldAndAwaitContext(parseOptionalIdentifier) :
-                    isGenerator ? doInYieldContext(parseOptionalIdentifier) :
-                        isAsync ? doInAwaitContext(parseOptionalIdentifier) :
-                            parseOptionalIdentifier();
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
-            node.body = parseFunctionBlock(/*allowYield*/ isGenerator, /*allowAwait*/ isAsync, /*ignoreMissingOpenBrace*/ false);
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ true);
-            }
-            return addJSDocComment(finishNode(node));
-        }
-        function parseOptionalIdentifier() {
-            return isIdentifier() ? parseIdentifier() : undefined;
-        }
-        function parseNewExpression() {
-            var node = createNode(175 /* NewExpression */);
-            parseExpected(92 /* NewKeyword */);
-            node.expression = parseMemberExpressionOrHigher();
-            node.typeArguments = tryParse(parseTypeArgumentsInExpression);
-            if (node.typeArguments || token === 17 /* OpenParenToken */) {
-                node.arguments = parseArgumentList();
-            }
-            return finishNode(node);
-        }
-        // STATEMENTS
-        function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
-            var node = createNode(199 /* Block */);
-            if (parseExpected(15 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
-                node.statements = parseList(1 /* BlockStatements */, parseStatement);
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                node.statements = createMissingList();
-            }
-            return finishNode(node);
-        }
-        function parseFunctionBlock(allowYield, allowAwait, ignoreMissingOpenBrace, diagnosticMessage) {
-            var savedYieldContext = inYieldContext();
-            setYieldContext(allowYield);
-            var savedAwaitContext = inAwaitContext();
-            setAwaitContext(allowAwait);
-            // We may be in a [Decorator] context when parsing a function expression or
-            // arrow function. The body of the function is not in [Decorator] context.
-            var saveDecoratorContext = inDecoratorContext();
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ false);
-            }
-            var block = parseBlock(ignoreMissingOpenBrace, diagnosticMessage);
-            if (saveDecoratorContext) {
-                setDecoratorContext(/*val*/ true);
-            }
-            setYieldContext(savedYieldContext);
-            setAwaitContext(savedAwaitContext);
-            return block;
-        }
-        function parseEmptyStatement() {
-            var node = createNode(201 /* EmptyStatement */);
-            parseExpected(23 /* SemicolonToken */);
-            return finishNode(node);
-        }
-        function parseIfStatement() {
-            var node = createNode(203 /* IfStatement */);
-            parseExpected(88 /* IfKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            node.thenStatement = parseStatement();
-            node.elseStatement = parseOptional(80 /* ElseKeyword */) ? parseStatement() : undefined;
-            return finishNode(node);
-        }
-        function parseDoStatement() {
-            var node = createNode(204 /* DoStatement */);
-            parseExpected(79 /* DoKeyword */);
-            node.statement = parseStatement();
-            parseExpected(104 /* WhileKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            // From: https://mail.mozilla.org/pipermail/es-discuss/2011-August/016188.html
-            // 157 min --- All allen at wirfs-brock.com CONF --- "do{;}while(false)false" prohibited in
-            // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby
-            //  do;while(0)x will have a semicolon inserted before x.
-            parseOptional(23 /* SemicolonToken */);
-            return finishNode(node);
-        }
-        function parseWhileStatement() {
-            var node = createNode(205 /* WhileStatement */);
-            parseExpected(104 /* WhileKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            node.statement = parseStatement();
-            return finishNode(node);
-        }
-        function parseForOrForInOrForOfStatement() {
-            var pos = getNodePos();
-            parseExpected(86 /* ForKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            var initializer = undefined;
-            if (token !== 23 /* SemicolonToken */) {
-                if (token === 102 /* VarKeyword */ || token === 108 /* LetKeyword */ || token === 74 /* ConstKeyword */) {
-                    initializer = parseVariableDeclarationList(/*inForStatementInitializer*/ true);
-                }
-                else {
-                    initializer = disallowInAnd(parseExpression);
-                }
-            }
-            var forOrForInOrForOfStatement;
-            if (parseOptional(90 /* InKeyword */)) {
-                var forInStatement = createNode(207 /* ForInStatement */, pos);
-                forInStatement.initializer = initializer;
-                forInStatement.expression = allowInAnd(parseExpression);
-                parseExpected(18 /* CloseParenToken */);
-                forOrForInOrForOfStatement = forInStatement;
-            }
-            else if (parseOptional(138 /* OfKeyword */)) {
-                var forOfStatement = createNode(208 /* ForOfStatement */, pos);
-                forOfStatement.initializer = initializer;
-                forOfStatement.expression = allowInAnd(parseAssignmentExpressionOrHigher);
-                parseExpected(18 /* CloseParenToken */);
-                forOrForInOrForOfStatement = forOfStatement;
-            }
-            else {
-                var forStatement = createNode(206 /* ForStatement */, pos);
-                forStatement.initializer = initializer;
-                parseExpected(23 /* SemicolonToken */);
-                if (token !== 23 /* SemicolonToken */ && token !== 18 /* CloseParenToken */) {
-                    forStatement.condition = allowInAnd(parseExpression);
-                }
-                parseExpected(23 /* SemicolonToken */);
-                if (token !== 18 /* CloseParenToken */) {
-                    forStatement.incrementor = allowInAnd(parseExpression);
-                }
-                parseExpected(18 /* CloseParenToken */);
-                forOrForInOrForOfStatement = forStatement;
-            }
-            forOrForInOrForOfStatement.statement = parseStatement();
-            return finishNode(forOrForInOrForOfStatement);
-        }
-        function parseBreakOrContinueStatement(kind) {
-            var node = createNode(kind);
-            parseExpected(kind === 210 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */);
-            if (!canParseSemicolon()) {
-                node.label = parseIdentifier();
-            }
-            parseSemicolon();
-            return finishNode(node);
-        }
-        function parseReturnStatement() {
-            var node = createNode(211 /* ReturnStatement */);
-            parseExpected(94 /* ReturnKeyword */);
-            if (!canParseSemicolon()) {
-                node.expression = allowInAnd(parseExpression);
-            }
-            parseSemicolon();
-            return finishNode(node);
-        }
-        function parseWithStatement() {
-            var node = createNode(212 /* WithStatement */);
-            parseExpected(105 /* WithKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            node.statement = parseStatement();
-            return finishNode(node);
-        }
-        function parseCaseClause() {
-            var node = createNode(249 /* CaseClause */);
-            parseExpected(71 /* CaseKeyword */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(54 /* ColonToken */);
-            node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
-            return finishNode(node);
-        }
-        function parseDefaultClause() {
-            var node = createNode(250 /* DefaultClause */);
-            parseExpected(77 /* DefaultKeyword */);
-            parseExpected(54 /* ColonToken */);
-            node.statements = parseList(3 /* SwitchClauseStatements */, parseStatement);
-            return finishNode(node);
-        }
-        function parseCaseOrDefaultClause() {
-            return token === 71 /* CaseKeyword */ ? parseCaseClause() : parseDefaultClause();
-        }
-        function parseSwitchStatement() {
-            var node = createNode(213 /* SwitchStatement */);
-            parseExpected(96 /* SwitchKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = allowInAnd(parseExpression);
-            parseExpected(18 /* CloseParenToken */);
-            var caseBlock = createNode(227 /* CaseBlock */, scanner.getStartPos());
-            parseExpected(15 /* OpenBraceToken */);
-            caseBlock.clauses = parseList(2 /* SwitchClauses */, parseCaseOrDefaultClause);
-            parseExpected(16 /* CloseBraceToken */);
-            node.caseBlock = finishNode(caseBlock);
-            return finishNode(node);
-        }
-        function parseThrowStatement() {
-            // ThrowStatement[Yield] :
-            //      throw [no LineTerminator here]Expression[In, ?Yield];
-            // Because of automatic semicolon insertion, we need to report error if this
-            // throw could be terminated with a semicolon.  Note: we can't call 'parseExpression'
-            // directly as that might consume an expression on the following line.
-            // We just return 'undefined' in that case.  The actual error will be reported in the
-            // grammar walker.
-            var node = createNode(215 /* ThrowStatement */);
-            parseExpected(98 /* ThrowKeyword */);
-            node.expression = scanner.hasPrecedingLineBreak() ? undefined : allowInAnd(parseExpression);
-            parseSemicolon();
-            return finishNode(node);
-        }
-        // TODO: Review for error recovery
-        function parseTryStatement() {
-            var node = createNode(216 /* TryStatement */);
-            parseExpected(100 /* TryKeyword */);
-            node.tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            node.catchClause = token === 72 /* CatchKeyword */ ? parseCatchClause() : undefined;
-            // If we don't have a catch clause, then we must have a finally clause.  Try to parse
-            // one out no matter what.
-            if (!node.catchClause || token === 85 /* FinallyKeyword */) {
-                parseExpected(85 /* FinallyKeyword */);
-                node.finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            }
-            return finishNode(node);
-        }
-        function parseCatchClause() {
-            var result = createNode(252 /* CatchClause */);
-            parseExpected(72 /* CatchKeyword */);
-            if (parseExpected(17 /* OpenParenToken */)) {
-                result.variableDeclaration = parseVariableDeclaration();
-            }
-            parseExpected(18 /* CloseParenToken */);
-            result.block = parseBlock(/*ignoreMissingOpenBrace*/ false);
-            return finishNode(result);
-        }
-        function parseDebuggerStatement() {
-            var node = createNode(217 /* DebuggerStatement */);
-            parseExpected(76 /* DebuggerKeyword */);
-            parseSemicolon();
-            return finishNode(node);
-        }
-        function parseExpressionOrLabeledStatement() {
-            // Avoiding having to do the lookahead for a labeled statement by just trying to parse
-            // out an expression, seeing if it is identifier and then seeing if it is followed by
-            // a colon.
-            var fullStart = scanner.getStartPos();
-            var expression = allowInAnd(parseExpression);
-            if (expression.kind === 69 /* Identifier */ && parseOptional(54 /* ColonToken */)) {
-                var labeledStatement = createNode(214 /* LabeledStatement */, fullStart);
-                labeledStatement.label = expression;
-                labeledStatement.statement = parseStatement();
-                return addJSDocComment(finishNode(labeledStatement));
-            }
-            else {
-                var expressionStatement = createNode(202 /* ExpressionStatement */, fullStart);
-                expressionStatement.expression = expression;
-                parseSemicolon();
-                return addJSDocComment(finishNode(expressionStatement));
-            }
-        }
-        function nextTokenIsIdentifierOrKeywordOnSameLine() {
-            nextToken();
-            return ts.tokenIsIdentifierOrKeyword(token) && !scanner.hasPrecedingLineBreak();
-        }
-        function nextTokenIsFunctionKeywordOnSameLine() {
-            nextToken();
-            return token === 87 /* FunctionKeyword */ && !scanner.hasPrecedingLineBreak();
-        }
-        function nextTokenIsIdentifierOrKeywordOrNumberOnSameLine() {
-            nextToken();
-            return (ts.tokenIsIdentifierOrKeyword(token) || token === 8 /* NumericLiteral */) && !scanner.hasPrecedingLineBreak();
-        }
-        function isDeclaration() {
-            while (true) {
-                switch (token) {
-                    case 102 /* VarKeyword */:
-                    case 108 /* LetKeyword */:
-                    case 74 /* ConstKeyword */:
-                    case 87 /* FunctionKeyword */:
-                    case 73 /* ClassKeyword */:
-                    case 81 /* EnumKeyword */:
-                        return true;
-                    // 'declare', 'module', 'namespace', 'interface'* and 'type' are all legal JavaScript identifiers;
-                    // however, an identifier cannot be followed by another identifier on the same line. This is what we
-                    // count on to parse out the respective declarations. For instance, we exploit this to say that
-                    //
-                    //    namespace n
-                    //
-                    // can be none other than the beginning of a namespace declaration, but need to respect that JavaScript sees
-                    //
-                    //    namespace
-                    //    n
-                    //
-                    // as the identifier 'namespace' on one line followed by the identifier 'n' on another.
-                    // We need to look one token ahead to see if it permissible to try parsing a declaration.
-                    //
-                    // *Note*: 'interface' is actually a strict mode reserved word. So while
-                    //
-                    //   "use strict"
-                    //   interface
-                    //   I {}
-                    //
-                    // could be legal, it would add complexity for very little gain.
-                    case 107 /* InterfaceKeyword */:
-                    case 134 /* TypeKeyword */:
-                        return nextTokenIsIdentifierOnSameLine();
-                    case 125 /* ModuleKeyword */:
-                    case 126 /* NamespaceKeyword */:
-                        return nextTokenIsIdentifierOrStringLiteralOnSameLine();
-                    case 115 /* AbstractKeyword */:
-                    case 118 /* AsyncKeyword */:
-                    case 122 /* DeclareKeyword */:
-                    case 110 /* PrivateKeyword */:
-                    case 111 /* ProtectedKeyword */:
-                    case 112 /* PublicKeyword */:
-                    case 128 /* ReadonlyKeyword */:
-                        nextToken();
-                        // ASI takes effect for this modifier.
-                        if (scanner.hasPrecedingLineBreak()) {
-                            return false;
-                        }
-                        continue;
-                    case 137 /* GlobalKeyword */:
-                        nextToken();
-                        return token === 15 /* OpenBraceToken */ || token === 69 /* Identifier */ || token === 82 /* ExportKeyword */;
-                    case 89 /* ImportKeyword */:
-                        nextToken();
-                        return token === 9 /* StringLiteral */ || token === 37 /* AsteriskToken */ ||
-                            token === 15 /* OpenBraceToken */ || ts.tokenIsIdentifierOrKeyword(token);
-                    case 82 /* ExportKeyword */:
-                        nextToken();
-                        if (token === 56 /* EqualsToken */ || token === 37 /* AsteriskToken */ ||
-                            token === 15 /* OpenBraceToken */ || token === 77 /* DefaultKeyword */ ||
-                            token === 116 /* AsKeyword */) {
-                            return true;
-                        }
-                        continue;
-                    case 113 /* StaticKeyword */:
-                        nextToken();
-                        continue;
-                    default:
-                        return false;
-                }
-            }
-        }
-        function isStartOfDeclaration() {
-            return lookAhead(isDeclaration);
-        }
-        function isStartOfStatement() {
-            switch (token) {
-                case 55 /* AtToken */:
-                case 23 /* SemicolonToken */:
-                case 15 /* OpenBraceToken */:
-                case 102 /* VarKeyword */:
-                case 108 /* LetKeyword */:
-                case 87 /* FunctionKeyword */:
-                case 73 /* ClassKeyword */:
-                case 81 /* EnumKeyword */:
-                case 88 /* IfKeyword */:
-                case 79 /* DoKeyword */:
-                case 104 /* WhileKeyword */:
-                case 86 /* ForKeyword */:
-                case 75 /* ContinueKeyword */:
-                case 70 /* BreakKeyword */:
-                case 94 /* ReturnKeyword */:
-                case 105 /* WithKeyword */:
-                case 96 /* SwitchKeyword */:
-                case 98 /* ThrowKeyword */:
-                case 100 /* TryKeyword */:
-                case 76 /* DebuggerKeyword */:
-                // 'catch' and 'finally' do not actually indicate that the code is part of a statement,
-                // however, we say they are here so that we may gracefully parse them and error later.
-                case 72 /* CatchKeyword */:
-                case 85 /* FinallyKeyword */:
-                    return true;
-                case 74 /* ConstKeyword */:
-                case 82 /* ExportKeyword */:
-                case 89 /* ImportKeyword */:
-                    return isStartOfDeclaration();
-                case 118 /* AsyncKeyword */:
-                case 122 /* DeclareKeyword */:
-                case 107 /* InterfaceKeyword */:
-                case 125 /* ModuleKeyword */:
-                case 126 /* NamespaceKeyword */:
-                case 134 /* TypeKeyword */:
-                case 137 /* GlobalKeyword */:
-                    // When these don't start a declaration, they're an identifier in an expression statement
-                    return true;
-                case 112 /* PublicKeyword */:
-                case 110 /* PrivateKeyword */:
-                case 111 /* ProtectedKeyword */:
-                case 113 /* StaticKeyword */:
-                case 128 /* ReadonlyKeyword */:
-                    // When these don't start a declaration, they may be the start of a class member if an identifier
-                    // immediately follows. Otherwise they're an identifier in an expression statement.
-                    return isStartOfDeclaration() || !lookAhead(nextTokenIsIdentifierOrKeywordOnSameLine);
-                default:
-                    return isStartOfExpression();
-            }
-        }
-        function nextTokenIsIdentifierOrStartOfDestructuring() {
-            nextToken();
-            return isIdentifier() || token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */;
-        }
-        function isLetDeclaration() {
-            // In ES6 'let' always starts a lexical declaration if followed by an identifier or {
-            // or [.
-            return lookAhead(nextTokenIsIdentifierOrStartOfDestructuring);
-        }
-        function parseStatement() {
-            switch (token) {
-                case 23 /* SemicolonToken */:
-                    return parseEmptyStatement();
-                case 15 /* OpenBraceToken */:
-                    return parseBlock(/*ignoreMissingOpenBrace*/ false);
-                case 102 /* VarKeyword */:
-                    return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined);
-                case 108 /* LetKeyword */:
-                    if (isLetDeclaration()) {
-                        return parseVariableStatement(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined);
-                    }
-                    break;
-                case 87 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined);
-                case 73 /* ClassKeyword */:
-                    return parseClassDeclaration(scanner.getStartPos(), /*decorators*/ undefined, /*modifiers*/ undefined);
-                case 88 /* IfKeyword */:
-                    return parseIfStatement();
-                case 79 /* DoKeyword */:
-                    return parseDoStatement();
-                case 104 /* WhileKeyword */:
-                    return parseWhileStatement();
-                case 86 /* ForKeyword */:
-                    return parseForOrForInOrForOfStatement();
-                case 75 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(209 /* ContinueStatement */);
-                case 70 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(210 /* BreakStatement */);
-                case 94 /* ReturnKeyword */:
-                    return parseReturnStatement();
-                case 105 /* WithKeyword */:
-                    return parseWithStatement();
-                case 96 /* SwitchKeyword */:
-                    return parseSwitchStatement();
-                case 98 /* ThrowKeyword */:
-                    return parseThrowStatement();
-                case 100 /* TryKeyword */:
-                // Include 'catch' and 'finally' for error recovery.
-                case 72 /* CatchKeyword */:
-                case 85 /* FinallyKeyword */:
-                    return parseTryStatement();
-                case 76 /* DebuggerKeyword */:
-                    return parseDebuggerStatement();
-                case 55 /* AtToken */:
-                    return parseDeclaration();
-                case 118 /* AsyncKeyword */:
-                case 107 /* InterfaceKeyword */:
-                case 134 /* TypeKeyword */:
-                case 125 /* ModuleKeyword */:
-                case 126 /* NamespaceKeyword */:
-                case 122 /* DeclareKeyword */:
-                case 74 /* ConstKeyword */:
-                case 81 /* EnumKeyword */:
-                case 82 /* ExportKeyword */:
-                case 89 /* ImportKeyword */:
-                case 110 /* PrivateKeyword */:
-                case 111 /* ProtectedKeyword */:
-                case 112 /* PublicKeyword */:
-                case 115 /* AbstractKeyword */:
-                case 113 /* StaticKeyword */:
-                case 128 /* ReadonlyKeyword */:
-                case 137 /* GlobalKeyword */:
-                    if (isStartOfDeclaration()) {
-                        return parseDeclaration();
-                    }
-                    break;
-            }
-            return parseExpressionOrLabeledStatement();
-        }
-        function parseDeclaration() {
-            var fullStart = getNodePos();
-            var decorators = parseDecorators();
-            var modifiers = parseModifiers();
-            switch (token) {
-                case 102 /* VarKeyword */:
-                case 108 /* LetKeyword */:
-                case 74 /* ConstKeyword */:
-                    return parseVariableStatement(fullStart, decorators, modifiers);
-                case 87 /* FunctionKeyword */:
-                    return parseFunctionDeclaration(fullStart, decorators, modifiers);
-                case 73 /* ClassKeyword */:
-                    return parseClassDeclaration(fullStart, decorators, modifiers);
-                case 107 /* InterfaceKeyword */:
-                    return parseInterfaceDeclaration(fullStart, decorators, modifiers);
-                case 134 /* TypeKeyword */:
-                    return parseTypeAliasDeclaration(fullStart, decorators, modifiers);
-                case 81 /* EnumKeyword */:
-                    return parseEnumDeclaration(fullStart, decorators, modifiers);
-                case 137 /* GlobalKeyword */:
-                case 125 /* ModuleKeyword */:
-                case 126 /* NamespaceKeyword */:
-                    return parseModuleDeclaration(fullStart, decorators, modifiers);
-                case 89 /* ImportKeyword */:
-                    return parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers);
-                case 82 /* ExportKeyword */:
-                    nextToken();
-                    switch (token) {
-                        case 77 /* DefaultKeyword */:
-                        case 56 /* EqualsToken */:
-                            return parseExportAssignment(fullStart, decorators, modifiers);
-                        case 116 /* AsKeyword */:
-                            return parseNamespaceExportDeclaration(fullStart, decorators, modifiers);
-                        default:
-                            return parseExportDeclaration(fullStart, decorators, modifiers);
-                    }
-                default:
-                    if (decorators || modifiers) {
-                        // We reached this point because we encountered decorators and/or modifiers and assumed a declaration
-                        // would follow. For recovery and error reporting purposes, return an incomplete declaration.
-                        var node = createMissingNode(239 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
-                        node.pos = fullStart;
-                        node.decorators = decorators;
-                        setModifiers(node, modifiers);
-                        return finishNode(node);
-                    }
-            }
-        }
-        function nextTokenIsIdentifierOrStringLiteralOnSameLine() {
-            nextToken();
-            return !scanner.hasPrecedingLineBreak() && (isIdentifier() || token === 9 /* StringLiteral */);
-        }
-        function parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage) {
-            if (token !== 15 /* OpenBraceToken */ && canParseSemicolon()) {
-                parseSemicolon();
-                return;
-            }
-            return parseFunctionBlock(isGenerator, isAsync, /*ignoreMissingOpenBrace*/ false, diagnosticMessage);
-        }
-        // DECLARATIONS
-        function parseArrayBindingElement() {
-            if (token === 24 /* CommaToken */) {
-                return createNode(193 /* OmittedExpression */);
-            }
-            var node = createNode(169 /* BindingElement */);
-            node.dotDotDotToken = parseOptionalToken(22 /* DotDotDotToken */);
-            node.name = parseIdentifierOrPattern();
-            node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
-            return finishNode(node);
-        }
-        function parseObjectBindingElement() {
-            var node = createNode(169 /* BindingElement */);
-            var tokenIsIdentifier = isIdentifier();
-            var propertyName = parsePropertyName();
-            if (tokenIsIdentifier && token !== 54 /* ColonToken */) {
-                node.name = propertyName;
-            }
-            else {
-                parseExpected(54 /* ColonToken */);
-                node.propertyName = propertyName;
-                node.name = parseIdentifierOrPattern();
-            }
-            node.initializer = parseBindingElementInitializer(/*inParameter*/ false);
-            return finishNode(node);
-        }
-        function parseObjectBindingPattern() {
-            var node = createNode(167 /* ObjectBindingPattern */);
-            parseExpected(15 /* OpenBraceToken */);
-            node.elements = parseDelimitedList(9 /* ObjectBindingElements */, parseObjectBindingElement);
-            parseExpected(16 /* CloseBraceToken */);
-            return finishNode(node);
-        }
-        function parseArrayBindingPattern() {
-            var node = createNode(168 /* ArrayBindingPattern */);
-            parseExpected(19 /* OpenBracketToken */);
-            node.elements = parseDelimitedList(10 /* ArrayBindingElements */, parseArrayBindingElement);
-            parseExpected(20 /* CloseBracketToken */);
-            return finishNode(node);
-        }
-        function isIdentifierOrPattern() {
-            return token === 15 /* OpenBraceToken */ || token === 19 /* OpenBracketToken */ || isIdentifier();
-        }
-        function parseIdentifierOrPattern() {
-            if (token === 19 /* OpenBracketToken */) {
-                return parseArrayBindingPattern();
-            }
-            if (token === 15 /* OpenBraceToken */) {
-                return parseObjectBindingPattern();
-            }
-            return parseIdentifier();
-        }
-        function parseVariableDeclaration() {
-            var node = createNode(218 /* VariableDeclaration */);
-            node.name = parseIdentifierOrPattern();
-            node.type = parseTypeAnnotation();
-            if (!isInOrOfKeyword(token)) {
-                node.initializer = parseInitializer(/*inParameter*/ false);
-            }
-            return finishNode(node);
-        }
-        function parseVariableDeclarationList(inForStatementInitializer) {
-            var node = createNode(219 /* VariableDeclarationList */);
-            switch (token) {
-                case 102 /* VarKeyword */:
-                    break;
-                case 108 /* LetKeyword */:
-                    node.flags |= 1024 /* Let */;
-                    break;
-                case 74 /* ConstKeyword */:
-                    node.flags |= 2048 /* Const */;
-                    break;
-                default:
-                    ts.Debug.fail();
-            }
-            nextToken();
-            // The user may have written the following:
-            //
-            //    for (let of X) { }
-            //
-            // In this case, we want to parse an empty declaration list, and then parse 'of'
-            // as a keyword. The reason this is not automatic is that 'of' is a valid identifier.
-            // So we need to look ahead to determine if 'of' should be treated as a keyword in
-            // this context.
-            // The checker will then give an error that there is an empty declaration list.
-            if (token === 138 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
-                node.declarations = createMissingList();
-            }
-            else {
-                var savedDisallowIn = inDisallowInContext();
-                setDisallowInContext(inForStatementInitializer);
-                node.declarations = parseDelimitedList(8 /* VariableDeclarations */, parseVariableDeclaration);
-                setDisallowInContext(savedDisallowIn);
-            }
-            return finishNode(node);
-        }
-        function canFollowContextualOfKeyword() {
-            return nextTokenIsIdentifier() && nextToken() === 18 /* CloseParenToken */;
-        }
-        function parseVariableStatement(fullStart, decorators, modifiers) {
-            var node = createNode(200 /* VariableStatement */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            node.declarationList = parseVariableDeclarationList(/*inForStatementInitializer*/ false);
-            parseSemicolon();
-            return addJSDocComment(finishNode(node));
-        }
-        function parseFunctionDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(220 /* FunctionDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(87 /* FunctionKeyword */);
-            node.asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            node.name = node.flags & 512 /* Default */ ? parseOptionalIdentifier() : parseIdentifier();
-            var isGenerator = !!node.asteriskToken;
-            var isAsync = !!(node.flags & 256 /* Async */);
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, node);
-            node.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, ts.Diagnostics.or_expected);
-            return addJSDocComment(finishNode(node));
-        }
-        function parseConstructorDeclaration(pos, decorators, modifiers) {
-            var node = createNode(148 /* Constructor */, pos);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(121 /* ConstructorKeyword */);
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
-            node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false, ts.Diagnostics.or_expected);
-            return addJSDocComment(finishNode(node));
-        }
-        function parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, diagnosticMessage) {
-            var method = createNode(147 /* MethodDeclaration */, fullStart);
-            method.decorators = decorators;
-            setModifiers(method, modifiers);
-            method.asteriskToken = asteriskToken;
-            method.name = name;
-            method.questionToken = questionToken;
-            var isGenerator = !!asteriskToken;
-            var isAsync = !!(method.flags & 256 /* Async */);
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ isGenerator, /*awaitContext*/ isAsync, /*requireCompleteParameterList*/ false, method);
-            method.body = parseFunctionBlockOrSemicolon(isGenerator, isAsync, diagnosticMessage);
-            return addJSDocComment(finishNode(method));
-        }
-        function parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken) {
-            var property = createNode(145 /* PropertyDeclaration */, fullStart);
-            property.decorators = decorators;
-            setModifiers(property, modifiers);
-            property.name = name;
-            property.questionToken = questionToken;
-            property.type = parseTypeAnnotation();
-            // For instance properties specifically, since they are evaluated inside the constructor,
-            // we do *not * want to parse yield expressions, so we specifically turn the yield context
-            // off. The grammar would look something like this:
-            //
-            //    MemberVariableDeclaration[Yield]:
-            //        AccessibilityModifier_opt   PropertyName   TypeAnnotation_opt   Initializer_opt[In];
-            //        AccessibilityModifier_opt  static_opt  PropertyName   TypeAnnotation_opt   Initializer_opt[In, ?Yield];
-            //
-            // The checker may still error in the static case to explicitly disallow the yield expression.
-            property.initializer = modifiers && modifiers.flags & 32 /* Static */
-                ? allowInAnd(parseNonParameterInitializer)
-                : doOutsideOfContext(8388608 /* YieldContext */ | 4194304 /* DisallowInContext */, parseNonParameterInitializer);
-            parseSemicolon();
-            return finishNode(property);
-        }
-        function parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers) {
-            var asteriskToken = parseOptionalToken(37 /* AsteriskToken */);
-            var name = parsePropertyName();
-            // Note: this is not legal as per the grammar.  But we allow it in the parser and
-            // report an error in the grammar checker.
-            var questionToken = parseOptionalToken(53 /* QuestionToken */);
-            if (asteriskToken || token === 17 /* OpenParenToken */ || token === 25 /* LessThanToken */) {
-                return parseMethodDeclaration(fullStart, decorators, modifiers, asteriskToken, name, questionToken, ts.Diagnostics.or_expected);
-            }
-            else {
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name, questionToken);
-            }
-        }
-        function parseNonParameterInitializer() {
-            return parseInitializer(/*inParameter*/ false);
-        }
-        function parseAccessorDeclaration(kind, fullStart, decorators, modifiers) {
-            var node = createNode(kind, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            node.name = parsePropertyName();
-            fillSignature(54 /* ColonToken */, /*yieldContext*/ false, /*awaitContext*/ false, /*requireCompleteParameterList*/ false, node);
-            node.body = parseFunctionBlockOrSemicolon(/*isGenerator*/ false, /*isAsync*/ false);
-            return finishNode(node);
-        }
-        function isClassMemberModifier(idToken) {
-            switch (idToken) {
-                case 112 /* PublicKeyword */:
-                case 110 /* PrivateKeyword */:
-                case 111 /* ProtectedKeyword */:
-                case 113 /* StaticKeyword */:
-                case 128 /* ReadonlyKeyword */:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-        function isClassMemberStart() {
-            var idToken;
-            if (token === 55 /* AtToken */) {
-                return true;
-            }
-            // Eat up all modifiers, but hold on to the last one in case it is actually an identifier.
-            while (ts.isModifierKind(token)) {
-                idToken = token;
-                // If the idToken is a class modifier (protected, private, public, and static), it is
-                // certain that we are starting to parse class member. This allows better error recovery
-                // Example:
-                //      public foo() ...     // true
-                //      public @dec blah ... // true; we will then report an error later
-                //      export public ...    // true; we will then report an error later
-                if (isClassMemberModifier(idToken)) {
-                    return true;
-                }
-                nextToken();
-            }
-            if (token === 37 /* AsteriskToken */) {
-                return true;
-            }
-            // Try to get the first property-like token following all modifiers.
-            // This can either be an identifier or the 'get' or 'set' keywords.
-            if (isLiteralPropertyName()) {
-                idToken = token;
-                nextToken();
-            }
-            // Index signatures and computed properties are class members; we can parse.
-            if (token === 19 /* OpenBracketToken */) {
-                return true;
-            }
-            // If we were able to get any potential identifier...
-            if (idToken !== undefined) {
-                // If we have a non-keyword identifier, or if we have an accessor, then it's safe to parse.
-                if (!ts.isKeyword(idToken) || idToken === 131 /* SetKeyword */ || idToken === 123 /* GetKeyword */) {
-                    return true;
-                }
-                // If it *is* a keyword, but not an accessor, check a little farther along
-                // to see if it should actually be parsed as a class member.
-                switch (token) {
-                    case 17 /* OpenParenToken */: // Method declaration
-                    case 25 /* LessThanToken */: // Generic Method declaration
-                    case 54 /* ColonToken */: // Type Annotation for declaration
-                    case 56 /* EqualsToken */: // Initializer for declaration
-                    case 53 /* QuestionToken */:
-                        return true;
-                    default:
-                        // Covers
-                        //  - Semicolons     (declaration termination)
-                        //  - Closing braces (end-of-class, must be declaration)
-                        //  - End-of-files   (not valid, but permitted so that it gets caught later on)
-                        //  - Line-breaks    (enabling *automatic semicolon insertion*)
-                        return canParseSemicolon();
-                }
-            }
-            return false;
-        }
-        function parseDecorators() {
-            var decorators;
-            while (true) {
-                var decoratorStart = getNodePos();
-                if (!parseOptional(55 /* AtToken */)) {
-                    break;
-                }
-                if (!decorators) {
-                    decorators = [];
-                    decorators.pos = decoratorStart;
-                }
-                var decorator = createNode(143 /* Decorator */, decoratorStart);
-                decorator.expression = doInDecoratorContext(parseLeftHandSideExpressionOrHigher);
-                decorators.push(finishNode(decorator));
-            }
-            if (decorators) {
-                decorators.end = getNodeEnd();
-            }
-            return decorators;
-        }
-        /*
-         * There are situations in which a modifier like 'const' will appear unexpectedly, such as on a class member.
-         * In those situations, if we are entirely sure that 'const' is not valid on its own (such as when ASI takes effect
-         * and turns it into a standalone declaration), then it is better to parse it and report an error later.
-         *
-         * In such situations, 'permitInvalidConstAsModifier' should be set to true.
-         */
-        function parseModifiers(permitInvalidConstAsModifier) {
-            var flags = 0;
-            var modifiers;
-            while (true) {
-                var modifierStart = scanner.getStartPos();
-                var modifierKind = token;
-                if (token === 74 /* ConstKeyword */ && permitInvalidConstAsModifier) {
-                    // We need to ensure that any subsequent modifiers appear on the same line
-                    // so that when 'const' is a standalone declaration, we don't issue an error.
-                    if (!tryParse(nextTokenIsOnSameLineAndCanFollowModifier)) {
-                        break;
-                    }
-                }
-                else {
-                    if (!parseAnyContextualModifier()) {
-                        break;
-                    }
-                }
-                if (!modifiers) {
-                    modifiers = [];
-                    modifiers.pos = modifierStart;
-                }
-                flags |= ts.modifierToFlag(modifierKind);
-                modifiers.push(finishNode(createNode(modifierKind, modifierStart)));
-            }
-            if (modifiers) {
-                modifiers.flags = flags;
-                modifiers.end = scanner.getStartPos();
-            }
-            return modifiers;
-        }
-        function parseModifiersForArrowFunction() {
-            var flags = 0;
-            var modifiers;
-            if (token === 118 /* AsyncKeyword */) {
-                var modifierStart = scanner.getStartPos();
-                var modifierKind = token;
-                nextToken();
-                modifiers = [];
-                modifiers.pos = modifierStart;
-                flags |= ts.modifierToFlag(modifierKind);
-                modifiers.push(finishNode(createNode(modifierKind, modifierStart)));
-                modifiers.flags = flags;
-                modifiers.end = scanner.getStartPos();
-            }
-            return modifiers;
-        }
-        function parseClassElement() {
-            if (token === 23 /* SemicolonToken */) {
-                var result = createNode(198 /* SemicolonClassElement */);
-                nextToken();
-                return finishNode(result);
-            }
-            var fullStart = getNodePos();
-            var decorators = parseDecorators();
-            var modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
-            var accessor = tryParseAccessorDeclaration(fullStart, decorators, modifiers);
-            if (accessor) {
-                return accessor;
-            }
-            if (token === 121 /* ConstructorKeyword */) {
-                return parseConstructorDeclaration(fullStart, decorators, modifiers);
-            }
-            if (isIndexSignature()) {
-                return parseIndexSignatureDeclaration(fullStart, decorators, modifiers);
-            }
-            // It is very important that we check this *after* checking indexers because
-            // the [ token can start an index signature or a computed property name
-            if (ts.tokenIsIdentifierOrKeyword(token) ||
-                token === 9 /* StringLiteral */ ||
-                token === 8 /* NumericLiteral */ ||
-                token === 37 /* AsteriskToken */ ||
-                token === 19 /* OpenBracketToken */) {
-                return parsePropertyOrMethodDeclaration(fullStart, decorators, modifiers);
-            }
-            if (decorators || modifiers) {
-                // treat this as a property declaration with a missing name.
-                var name_7 = createMissingNode(69 /* Identifier */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
-                return parsePropertyDeclaration(fullStart, decorators, modifiers, name_7, /*questionToken*/ undefined);
-            }
-            // 'isClassMemberStart' should have hinted not to attempt parsing.
-            ts.Debug.fail("Should not have attempted to parse class member declaration.");
-        }
-        function parseClassExpression() {
-            return parseClassDeclarationOrExpression(
-            /*fullStart*/ scanner.getStartPos(), 
-            /*decorators*/ undefined, 
-            /*modifiers*/ undefined, 192 /* ClassExpression */);
-        }
-        function parseClassDeclaration(fullStart, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(fullStart, decorators, modifiers, 221 /* ClassDeclaration */);
-        }
-        function parseClassDeclarationOrExpression(fullStart, decorators, modifiers, kind) {
-            var node = createNode(kind, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(73 /* ClassKeyword */);
-            node.name = parseNameOfClassDeclarationOrExpression();
-            node.typeParameters = parseTypeParameters();
-            node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ true);
-            if (parseExpected(15 /* OpenBraceToken */)) {
-                // ClassTail[Yield,Await] : (Modified) See 14.5
-                //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
-                node.members = parseClassMembers();
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                node.members = createMissingList();
-            }
-            return finishNode(node);
-        }
-        function parseNameOfClassDeclarationOrExpression() {
-            // implements is a future reserved word so
-            // 'class implements' might mean either
-            // - class expression with omitted name, 'implements' starts heritage clause
-            // - class with name 'implements'
-            // 'isImplementsClause' helps to disambiguate between these two cases
-            return isIdentifier() && !isImplementsClause()
-                ? parseIdentifier()
-                : undefined;
-        }
-        function isImplementsClause() {
-            return token === 106 /* ImplementsKeyword */ && lookAhead(nextTokenIsIdentifierOrKeyword);
-        }
-        function parseHeritageClauses(isClassHeritageClause) {
-            // ClassTail[Yield,Await] : (Modified) See 14.5
-            //      ClassHeritage[?Yield,?Await]opt { ClassBody[?Yield,?Await]opt }
-            if (isHeritageClause()) {
-                return parseList(20 /* HeritageClauses */, parseHeritageClause);
-            }
-            return undefined;
-        }
-        function parseHeritageClause() {
-            if (token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */) {
-                var node = createNode(251 /* HeritageClause */);
-                node.token = token;
-                nextToken();
-                node.types = parseDelimitedList(7 /* HeritageClauseElement */, parseExpressionWithTypeArguments);
-                return finishNode(node);
-            }
-            return undefined;
-        }
-        function parseExpressionWithTypeArguments() {
-            var node = createNode(194 /* ExpressionWithTypeArguments */);
-            node.expression = parseLeftHandSideExpressionOrHigher();
-            if (token === 25 /* LessThanToken */) {
-                node.typeArguments = parseBracketedList(18 /* TypeArguments */, parseType, 25 /* LessThanToken */, 27 /* GreaterThanToken */);
-            }
-            return finishNode(node);
-        }
-        function isHeritageClause() {
-            return token === 83 /* ExtendsKeyword */ || token === 106 /* ImplementsKeyword */;
-        }
-        function parseClassMembers() {
-            return parseList(5 /* ClassMembers */, parseClassElement);
-        }
-        function parseInterfaceDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(222 /* InterfaceDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(107 /* InterfaceKeyword */);
-            node.name = parseIdentifier();
-            node.typeParameters = parseTypeParameters();
-            node.heritageClauses = parseHeritageClauses(/*isClassHeritageClause*/ false);
-            node.members = parseObjectTypeMembers();
-            return finishNode(node);
-        }
-        function parseTypeAliasDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(223 /* TypeAliasDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(134 /* TypeKeyword */);
-            node.name = parseIdentifier();
-            node.typeParameters = parseTypeParameters();
-            parseExpected(56 /* EqualsToken */);
-            node.type = parseType();
-            parseSemicolon();
-            return finishNode(node);
-        }
-        // In an ambient declaration, the grammar only allows integer literals as initializers.
-        // In a non-ambient declaration, the grammar allows uninitialized members only in a
-        // ConstantEnumMemberSection, which starts at the beginning of an enum declaration
-        // or any time an integer literal initializer is encountered.
-        function parseEnumMember() {
-            var node = createNode(255 /* EnumMember */, scanner.getStartPos());
-            node.name = parsePropertyName();
-            node.initializer = allowInAnd(parseNonParameterInitializer);
-            return finishNode(node);
-        }
-        function parseEnumDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(224 /* EnumDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            parseExpected(81 /* EnumKeyword */);
-            node.name = parseIdentifier();
-            if (parseExpected(15 /* OpenBraceToken */)) {
-                node.members = parseDelimitedList(6 /* EnumMembers */, parseEnumMember);
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                node.members = createMissingList();
-            }
-            return finishNode(node);
-        }
-        function parseModuleBlock() {
-            var node = createNode(226 /* ModuleBlock */, scanner.getStartPos());
-            if (parseExpected(15 /* OpenBraceToken */)) {
-                node.statements = parseList(1 /* BlockStatements */, parseStatement);
-                parseExpected(16 /* CloseBraceToken */);
-            }
-            else {
-                node.statements = createMissingList();
-            }
-            return finishNode(node);
-        }
-        function parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags) {
-            var node = createNode(225 /* ModuleDeclaration */, fullStart);
-            // If we are parsing a dotted namespace name, we want to
-            // propagate the 'Namespace' flag across the names if set.
-            var namespaceFlag = flags & 4096 /* Namespace */;
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            node.flags |= flags;
-            node.name = parseIdentifier();
-            node.body = parseOptional(21 /* DotToken */)
-                ? parseModuleOrNamespaceDeclaration(getNodePos(), /*decorators*/ undefined, /*modifiers*/ undefined, 1 /* Export */ | namespaceFlag)
-                : parseModuleBlock();
-            return finishNode(node);
-        }
-        function parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(225 /* ModuleDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            if (token === 137 /* GlobalKeyword */) {
-                // parse 'global' as name of global scope augmentation
-                node.name = parseIdentifier();
-                node.flags |= 131072 /* GlobalAugmentation */;
-            }
-            else {
-                node.name = parseLiteralNode(/*internName*/ true);
-            }
-            if (token === 15 /* OpenBraceToken */) {
-                node.body = parseModuleBlock();
-            }
-            else {
-                parseSemicolon();
-            }
-            return finishNode(node);
-        }
-        function parseModuleDeclaration(fullStart, decorators, modifiers) {
-            var flags = modifiers ? modifiers.flags : 0;
-            if (token === 137 /* GlobalKeyword */) {
-                // global augmentation
-                return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
-            }
-            else if (parseOptional(126 /* NamespaceKeyword */)) {
-                flags |= 4096 /* Namespace */;
-            }
-            else {
-                parseExpected(125 /* ModuleKeyword */);
-                if (token === 9 /* StringLiteral */) {
-                    return parseAmbientExternalModuleDeclaration(fullStart, decorators, modifiers);
-                }
-            }
-            return parseModuleOrNamespaceDeclaration(fullStart, decorators, modifiers, flags);
-        }
-        function isExternalModuleReference() {
-            return token === 129 /* RequireKeyword */ &&
-                lookAhead(nextTokenIsOpenParen);
-        }
-        function nextTokenIsOpenParen() {
-            return nextToken() === 17 /* OpenParenToken */;
-        }
-        function nextTokenIsSlash() {
-            return nextToken() === 39 /* SlashToken */;
-        }
-        function parseNamespaceExportDeclaration(fullStart, decorators, modifiers) {
-            var exportDeclaration = createNode(228 /* NamespaceExportDeclaration */, fullStart);
-            exportDeclaration.decorators = decorators;
-            exportDeclaration.modifiers = modifiers;
-            parseExpected(116 /* AsKeyword */);
-            parseExpected(126 /* NamespaceKeyword */);
-            exportDeclaration.name = parseIdentifier();
-            parseExpected(23 /* SemicolonToken */);
-            return finishNode(exportDeclaration);
-        }
-        function parseImportDeclarationOrImportEqualsDeclaration(fullStart, decorators, modifiers) {
-            parseExpected(89 /* ImportKeyword */);
-            var afterImportPos = scanner.getStartPos();
-            var identifier;
-            if (isIdentifier()) {
-                identifier = parseIdentifier();
-                if (token !== 24 /* CommaToken */ && token !== 136 /* FromKeyword */) {
-                    // ImportEquals declaration of type:
-                    // import x = require("mod"); or
-                    // import x = M.x;
-                    var importEqualsDeclaration = createNode(229 /* ImportEqualsDeclaration */, fullStart);
-                    importEqualsDeclaration.decorators = decorators;
-                    setModifiers(importEqualsDeclaration, modifiers);
-                    importEqualsDeclaration.name = identifier;
-                    parseExpected(56 /* EqualsToken */);
-                    importEqualsDeclaration.moduleReference = parseModuleReference();
-                    parseSemicolon();
-                    return finishNode(importEqualsDeclaration);
-                }
-            }
-            // Import statement
-            var importDeclaration = createNode(230 /* ImportDeclaration */, fullStart);
-            importDeclaration.decorators = decorators;
-            setModifiers(importDeclaration, modifiers);
-            // ImportDeclaration:
-            //  import ImportClause from ModuleSpecifier ;
-            //  import ModuleSpecifier;
-            if (identifier ||
-                token === 37 /* AsteriskToken */ ||
-                token === 15 /* OpenBraceToken */) {
-                importDeclaration.importClause = parseImportClause(identifier, afterImportPos);
-                parseExpected(136 /* FromKeyword */);
-            }
-            importDeclaration.moduleSpecifier = parseModuleSpecifier();
-            parseSemicolon();
-            return finishNode(importDeclaration);
-        }
-        function parseImportClause(identifier, fullStart) {
-            // ImportClause:
-            //  ImportedDefaultBinding
-            //  NameSpaceImport
-            //  NamedImports
-            //  ImportedDefaultBinding, NameSpaceImport
-            //  ImportedDefaultBinding, NamedImports
-            var importClause = createNode(231 /* ImportClause */, fullStart);
-            if (identifier) {
-                // ImportedDefaultBinding:
-                //  ImportedBinding
-                importClause.name = identifier;
-            }
-            // If there was no default import or if there is comma token after default import
-            // parse namespace or named imports
-            if (!importClause.name ||
-                parseOptional(24 /* CommaToken */)) {
-                importClause.namedBindings = token === 37 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(233 /* NamedImports */);
-            }
-            return finishNode(importClause);
-        }
-        function parseModuleReference() {
-            return isExternalModuleReference()
-                ? parseExternalModuleReference()
-                : parseEntityName(/*allowReservedWords*/ false);
-        }
-        function parseExternalModuleReference() {
-            var node = createNode(240 /* ExternalModuleReference */);
-            parseExpected(129 /* RequireKeyword */);
-            parseExpected(17 /* OpenParenToken */);
-            node.expression = parseModuleSpecifier();
-            parseExpected(18 /* CloseParenToken */);
-            return finishNode(node);
-        }
-        function parseModuleSpecifier() {
-            if (token === 9 /* StringLiteral */) {
-                var result = parseLiteralNode();
-                internIdentifier(result.text);
-                return result;
-            }
-            else {
-                // We allow arbitrary expressions here, even though the grammar only allows string
-                // literals.  We check to ensure that it is only a string literal later in the grammar
-                // check pass.
-                return parseExpression();
-            }
-        }
-        function parseNamespaceImport() {
-            // NameSpaceImport:
-            //  * as ImportedBinding
-            var namespaceImport = createNode(232 /* NamespaceImport */);
-            parseExpected(37 /* AsteriskToken */);
-            parseExpected(116 /* AsKeyword */);
-            namespaceImport.name = parseIdentifier();
-            return finishNode(namespaceImport);
-        }
-        function parseNamedImportsOrExports(kind) {
-            var node = createNode(kind);
-            // NamedImports:
-            //  { }
-            //  { ImportsList }
-            //  { ImportsList, }
-            // ImportsList:
-            //  ImportSpecifier
-            //  ImportsList, ImportSpecifier
-            node.elements = parseBracketedList(21 /* ImportOrExportSpecifiers */, kind === 233 /* NamedImports */ ? parseImportSpecifier : parseExportSpecifier, 15 /* OpenBraceToken */, 16 /* CloseBraceToken */);
-            return finishNode(node);
-        }
-        function parseExportSpecifier() {
-            return parseImportOrExportSpecifier(238 /* ExportSpecifier */);
-        }
-        function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(234 /* ImportSpecifier */);
-        }
-        function parseImportOrExportSpecifier(kind) {
-            var node = createNode(kind);
-            // ImportSpecifier:
-            //   BindingIdentifier
-            //   IdentifierName as BindingIdentifier
-            // ExportSpecifier:
-            //   IdentifierName
-            //   IdentifierName as IdentifierName
-            var checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier();
-            var checkIdentifierStart = scanner.getTokenPos();
-            var checkIdentifierEnd = scanner.getTextPos();
-            var identifierName = parseIdentifierName();
-            if (token === 116 /* AsKeyword */) {
-                node.propertyName = identifierName;
-                parseExpected(116 /* AsKeyword */);
-                checkIdentifierIsKeyword = ts.isKeyword(token) && !isIdentifier();
-                checkIdentifierStart = scanner.getTokenPos();
-                checkIdentifierEnd = scanner.getTextPos();
-                node.name = parseIdentifierName();
-            }
-            else {
-                node.name = identifierName;
-            }
-            if (kind === 234 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
-                // Report error identifier expected
-                parseErrorAtPosition(checkIdentifierStart, checkIdentifierEnd - checkIdentifierStart, ts.Diagnostics.Identifier_expected);
-            }
-            return finishNode(node);
-        }
-        function parseExportDeclaration(fullStart, decorators, modifiers) {
-            var node = createNode(236 /* ExportDeclaration */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            if (parseOptional(37 /* AsteriskToken */)) {
-                parseExpected(136 /* FromKeyword */);
-                node.moduleSpecifier = parseModuleSpecifier();
-            }
-            else {
-                node.exportClause = parseNamedImportsOrExports(237 /* NamedExports */);
-                // It is not uncommon to accidentally omit the 'from' keyword. Additionally, in editing scenarios,
-                // the 'from' keyword can be parsed as a named export when the export clause is unterminated (i.e. `export { from "moduleName";`)
-                // If we don't have a 'from' keyword, see if we have a string literal such that ASI won't take effect.
-                if (token === 136 /* FromKeyword */ || (token === 9 /* StringLiteral */ && !scanner.hasPrecedingLineBreak())) {
-                    parseExpected(136 /* FromKeyword */);
-                    node.moduleSpecifier = parseModuleSpecifier();
-                }
-            }
-            parseSemicolon();
-            return finishNode(node);
-        }
-        function parseExportAssignment(fullStart, decorators, modifiers) {
-            var node = createNode(235 /* ExportAssignment */, fullStart);
-            node.decorators = decorators;
-            setModifiers(node, modifiers);
-            if (parseOptional(56 /* EqualsToken */)) {
-                node.isExportEquals = true;
-            }
-            else {
-                parseExpected(77 /* DefaultKeyword */);
-            }
-            node.expression = parseAssignmentExpressionOrHigher();
-            parseSemicolon();
-            return finishNode(node);
-        }
-        function processReferenceComments(sourceFile) {
-            var triviaScanner = ts.createScanner(sourceFile.languageVersion, /*skipTrivia*/ false, 0 /* Standard */, sourceText);
-            var referencedFiles = [];
-            var typeReferenceDirectives = [];
-            var amdDependencies = [];
-            var amdModuleName;
-            // Keep scanning all the leading trivia in the file until we get to something that
-            // isn't trivia.  Any single line comment will be analyzed to see if it is a
-            // reference comment.
-            while (true) {
-                var kind = triviaScanner.scan();
-                if (kind !== 2 /* SingleLineCommentTrivia */) {
-                    if (ts.isTrivia(kind)) {
-                        continue;
-                    }
-                    else {
-                        break;
-                    }
-                }
-                var range = { pos: triviaScanner.getTokenPos(), end: triviaScanner.getTextPos(), kind: triviaScanner.getToken() };
-                var comment = sourceText.substring(range.pos, range.end);
-                var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, range);
-                if (referencePathMatchResult) {
-                    var fileReference = referencePathMatchResult.fileReference;
-                    sourceFile.hasNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
-                    var diagnosticMessage = referencePathMatchResult.diagnosticMessage;
-                    if (fileReference) {
-                        if (referencePathMatchResult.isTypeReferenceDirective) {
-                            typeReferenceDirectives.push(fileReference);
-                        }
-                        else {
-                            referencedFiles.push(fileReference);
-                        }
-                    }
-                    if (diagnosticMessage) {
-                        parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, diagnosticMessage));
-                    }
-                }
-                else {
-                    var amdModuleNameRegEx = /^\/\/\/\s*<amd-module\s+name\s*=\s*('|")(.+?)\1/gim;
-                    var amdModuleNameMatchResult = amdModuleNameRegEx.exec(comment);
-                    if (amdModuleNameMatchResult) {
-                        if (amdModuleName) {
-                            parseDiagnostics.push(ts.createFileDiagnostic(sourceFile, range.pos, range.end - range.pos, ts.Diagnostics.An_AMD_module_cannot_have_multiple_name_assignments));
-                        }
-                        amdModuleName = amdModuleNameMatchResult[2];
-                    }
-                    var amdDependencyRegEx = /^\/\/\/\s*<amd-dependency\s/gim;
-                    var pathRegex = /\spath\s*=\s*('|")(.+?)\1/gim;
-                    var nameRegex = /\sname\s*=\s*('|")(.+?)\1/gim;
-                    var amdDependencyMatchResult = amdDependencyRegEx.exec(comment);
-                    if (amdDependencyMatchResult) {
-                        var pathMatchResult = pathRegex.exec(comment);
-                        var nameMatchResult = nameRegex.exec(comment);
-                        if (pathMatchResult) {
-                            var amdDependency = { path: pathMatchResult[2], name: nameMatchResult ? nameMatchResult[2] : undefined };
-                            amdDependencies.push(amdDependency);
-                        }
-                    }
-                }
-            }
-            sourceFile.referencedFiles = referencedFiles;
-            sourceFile.typeReferenceDirectives = typeReferenceDirectives;
-            sourceFile.amdDependencies = amdDependencies;
-            sourceFile.moduleName = amdModuleName;
-        }
-        function setExternalModuleIndicator(sourceFile) {
-            sourceFile.externalModuleIndicator = ts.forEach(sourceFile.statements, function (node) {
-                return node.flags & 1 /* Export */
-                    || node.kind === 229 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 240 /* ExternalModuleReference */
-                    || node.kind === 230 /* ImportDeclaration */
-                    || node.kind === 235 /* ExportAssignment */
-                    || node.kind === 236 /* ExportDeclaration */
-                    ? node
-                    : undefined;
-            });
-        }
-        var ParsingContext;
-        (function (ParsingContext) {
-            ParsingContext[ParsingContext["SourceElements"] = 0] = "SourceElements";
-            ParsingContext[ParsingContext["BlockStatements"] = 1] = "BlockStatements";
-            ParsingContext[ParsingContext["SwitchClauses"] = 2] = "SwitchClauses";
-            ParsingContext[ParsingContext["SwitchClauseStatements"] = 3] = "SwitchClauseStatements";
-            ParsingContext[ParsingContext["TypeMembers"] = 4] = "TypeMembers";
-            ParsingContext[ParsingContext["ClassMembers"] = 5] = "ClassMembers";
-            ParsingContext[ParsingContext["EnumMembers"] = 6] = "EnumMembers";
-            ParsingContext[ParsingContext["HeritageClauseElement"] = 7] = "HeritageClauseElement";
-            ParsingContext[ParsingContext["VariableDeclarations"] = 8] = "VariableDeclarations";
-            ParsingContext[ParsingContext["ObjectBindingElements"] = 9] = "ObjectBindingElements";
-            ParsingContext[ParsingContext["ArrayBindingElements"] = 10] = "ArrayBindingElements";
-            ParsingContext[ParsingContext["ArgumentExpressions"] = 11] = "ArgumentExpressions";
-            ParsingContext[ParsingContext["ObjectLiteralMembers"] = 12] = "ObjectLiteralMembers";
-            ParsingContext[ParsingContext["JsxAttributes"] = 13] = "JsxAttributes";
-            ParsingContext[ParsingContext["JsxChildren"] = 14] = "JsxChildren";
-            ParsingContext[ParsingContext["ArrayLiteralMembers"] = 15] = "ArrayLiteralMembers";
-            ParsingContext[ParsingContext["Parameters"] = 16] = "Parameters";
-            ParsingContext[ParsingContext["TypeParameters"] = 17] = "TypeParameters";
-            ParsingContext[ParsingContext["TypeArguments"] = 18] = "TypeArguments";
-            ParsingContext[ParsingContext["TupleElementTypes"] = 19] = "TupleElementTypes";
-            ParsingContext[ParsingContext["HeritageClauses"] = 20] = "HeritageClauses";
-            ParsingContext[ParsingContext["ImportOrExportSpecifiers"] = 21] = "ImportOrExportSpecifiers";
-            ParsingContext[ParsingContext["JSDocFunctionParameters"] = 22] = "JSDocFunctionParameters";
-            ParsingContext[ParsingContext["JSDocTypeArguments"] = 23] = "JSDocTypeArguments";
-            ParsingContext[ParsingContext["JSDocRecordMembers"] = 24] = "JSDocRecordMembers";
-            ParsingContext[ParsingContext["JSDocTupleTypes"] = 25] = "JSDocTupleTypes";
-            ParsingContext[ParsingContext["Count"] = 26] = "Count"; // Number of parsing contexts
-        })(ParsingContext || (ParsingContext = {}));
-        var Tristate;
-        (function (Tristate) {
-            Tristate[Tristate["False"] = 0] = "False";
-            Tristate[Tristate["True"] = 1] = "True";
-            Tristate[Tristate["Unknown"] = 2] = "Unknown";
-        })(Tristate || (Tristate = {}));
-        var JSDocParser;
-        (function (JSDocParser) {
-            function isJSDocType() {
-                switch (token) {
-                    case 37 /* AsteriskToken */:
-                    case 53 /* QuestionToken */:
-                    case 17 /* OpenParenToken */:
-                    case 19 /* OpenBracketToken */:
-                    case 49 /* ExclamationToken */:
-                    case 15 /* OpenBraceToken */:
-                    case 87 /* FunctionKeyword */:
-                    case 22 /* DotDotDotToken */:
-                    case 92 /* NewKeyword */:
-                    case 97 /* ThisKeyword */:
-                        return true;
-                }
-                return ts.tokenIsIdentifierOrKeyword(token);
-            }
-            JSDocParser.isJSDocType = isJSDocType;
-            function parseJSDocTypeExpressionForTests(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                scanner.setText(content, start, length);
-                token = scanner.scan();
-                var jsDocTypeExpression = parseJSDocTypeExpression();
-                var diagnostics = parseDiagnostics;
-                clearState();
-                return jsDocTypeExpression ? { jsDocTypeExpression: jsDocTypeExpression, diagnostics: diagnostics } : undefined;
-            }
-            JSDocParser.parseJSDocTypeExpressionForTests = parseJSDocTypeExpressionForTests;
-            // Parses out a JSDoc type expression.
-            /* @internal */
-            function parseJSDocTypeExpression() {
-                var result = createNode(257 /* JSDocTypeExpression */, scanner.getTokenPos());
-                parseExpected(15 /* OpenBraceToken */);
-                result.type = parseJSDocTopLevelType();
-                parseExpected(16 /* CloseBraceToken */);
-                fixupParentReferences(result);
-                return finishNode(result);
-            }
-            JSDocParser.parseJSDocTypeExpression = parseJSDocTypeExpression;
-            function parseJSDocTopLevelType() {
-                var type = parseJSDocType();
-                if (token === 47 /* BarToken */) {
-                    var unionType = createNode(261 /* JSDocUnionType */, type.pos);
-                    unionType.types = parseJSDocTypeList(type);
-                    type = finishNode(unionType);
-                }
-                if (token === 56 /* EqualsToken */) {
-                    var optionalType = createNode(268 /* JSDocOptionalType */, type.pos);
-                    nextToken();
-                    optionalType.type = type;
-                    type = finishNode(optionalType);
-                }
-                return type;
-            }
-            function parseJSDocType() {
-                var type = parseBasicTypeExpression();
-                while (true) {
-                    if (token === 19 /* OpenBracketToken */) {
-                        var arrayType = createNode(260 /* JSDocArrayType */, type.pos);
-                        arrayType.elementType = type;
-                        nextToken();
-                        parseExpected(20 /* CloseBracketToken */);
-                        type = finishNode(arrayType);
-                    }
-                    else if (token === 53 /* QuestionToken */) {
-                        var nullableType = createNode(263 /* JSDocNullableType */, type.pos);
-                        nullableType.type = type;
-                        nextToken();
-                        type = finishNode(nullableType);
-                    }
-                    else if (token === 49 /* ExclamationToken */) {
-                        var nonNullableType = createNode(264 /* JSDocNonNullableType */, type.pos);
-                        nonNullableType.type = type;
-                        nextToken();
-                        type = finishNode(nonNullableType);
-                    }
-                    else {
-                        break;
-                    }
-                }
-                return type;
-            }
-            function parseBasicTypeExpression() {
-                switch (token) {
-                    case 37 /* AsteriskToken */:
-                        return parseJSDocAllType();
-                    case 53 /* QuestionToken */:
-                        return parseJSDocUnknownOrNullableType();
-                    case 17 /* OpenParenToken */:
-                        return parseJSDocUnionType();
-                    case 19 /* OpenBracketToken */:
-                        return parseJSDocTupleType();
-                    case 49 /* ExclamationToken */:
-                        return parseJSDocNonNullableType();
-                    case 15 /* OpenBraceToken */:
-                        return parseJSDocRecordType();
-                    case 87 /* FunctionKeyword */:
-                        return parseJSDocFunctionType();
-                    case 22 /* DotDotDotToken */:
-                        return parseJSDocVariadicType();
-                    case 92 /* NewKeyword */:
-                        return parseJSDocConstructorType();
-                    case 97 /* ThisKeyword */:
-                        return parseJSDocThisType();
-                    case 117 /* AnyKeyword */:
-                    case 132 /* StringKeyword */:
-                    case 130 /* NumberKeyword */:
-                    case 120 /* BooleanKeyword */:
-                    case 133 /* SymbolKeyword */:
-                    case 103 /* VoidKeyword */:
-                        return parseTokenNode();
-                }
-                // TODO (drosen): Parse string literal types in JSDoc as well.
-                return parseJSDocTypeReference();
-            }
-            function parseJSDocThisType() {
-                var result = createNode(272 /* JSDocThisType */);
-                nextToken();
-                parseExpected(54 /* ColonToken */);
-                result.type = parseJSDocType();
-                return finishNode(result);
-            }
-            function parseJSDocConstructorType() {
-                var result = createNode(271 /* JSDocConstructorType */);
-                nextToken();
-                parseExpected(54 /* ColonToken */);
-                result.type = parseJSDocType();
-                return finishNode(result);
-            }
-            function parseJSDocVariadicType() {
-                var result = createNode(270 /* JSDocVariadicType */);
-                nextToken();
-                result.type = parseJSDocType();
-                return finishNode(result);
-            }
-            function parseJSDocFunctionType() {
-                var result = createNode(269 /* JSDocFunctionType */);
-                nextToken();
-                parseExpected(17 /* OpenParenToken */);
-                result.parameters = parseDelimitedList(22 /* JSDocFunctionParameters */, parseJSDocParameter);
-                checkForTrailingComma(result.parameters);
-                parseExpected(18 /* CloseParenToken */);
-                if (token === 54 /* ColonToken */) {
-                    nextToken();
-                    result.type = parseJSDocType();
-                }
-                return finishNode(result);
-            }
-            function parseJSDocParameter() {
-                var parameter = createNode(142 /* Parameter */);
-                parameter.type = parseJSDocType();
-                if (parseOptional(56 /* EqualsToken */)) {
-                    parameter.questionToken = createNode(56 /* EqualsToken */);
-                }
-                return finishNode(parameter);
-            }
-            function parseJSDocTypeReference() {
-                var result = createNode(267 /* JSDocTypeReference */);
-                result.name = parseSimplePropertyName();
-                if (token === 25 /* LessThanToken */) {
-                    result.typeArguments = parseTypeArguments();
-                }
-                else {
-                    while (parseOptional(21 /* DotToken */)) {
-                        if (token === 25 /* LessThanToken */) {
-                            result.typeArguments = parseTypeArguments();
-                            break;
-                        }
-                        else {
-                            result.name = parseQualifiedName(result.name);
-                        }
-                    }
-                }
-                return finishNode(result);
-            }
-            function parseTypeArguments() {
-                // Move past the <
-                nextToken();
-                var typeArguments = parseDelimitedList(23 /* JSDocTypeArguments */, parseJSDocType);
-                checkForTrailingComma(typeArguments);
-                checkForEmptyTypeArgumentList(typeArguments);
-                parseExpected(27 /* GreaterThanToken */);
-                return typeArguments;
-            }
-            function checkForEmptyTypeArgumentList(typeArguments) {
-                if (parseDiagnostics.length === 0 && typeArguments && typeArguments.length === 0) {
-                    var start = typeArguments.pos - "<".length;
-                    var end = ts.skipTrivia(sourceText, typeArguments.end) + ">".length;
-                    return parseErrorAtPosition(start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty);
-                }
-            }
-            function parseQualifiedName(left) {
-                var result = createNode(139 /* QualifiedName */, left.pos);
-                result.left = left;
-                result.right = parseIdentifierName();
-                return finishNode(result);
-            }
-            function parseJSDocRecordType() {
-                var result = createNode(265 /* JSDocRecordType */);
-                nextToken();
-                result.members = parseDelimitedList(24 /* JSDocRecordMembers */, parseJSDocRecordMember);
-                checkForTrailingComma(result.members);
-                parseExpected(16 /* CloseBraceToken */);
-                return finishNode(result);
-            }
-            function parseJSDocRecordMember() {
-                var result = createNode(266 /* JSDocRecordMember */);
-                result.name = parseSimplePropertyName();
-                if (token === 54 /* ColonToken */) {
-                    nextToken();
-                    result.type = parseJSDocType();
-                }
-                return finishNode(result);
-            }
-            function parseJSDocNonNullableType() {
-                var result = createNode(264 /* JSDocNonNullableType */);
-                nextToken();
-                result.type = parseJSDocType();
-                return finishNode(result);
-            }
-            function parseJSDocTupleType() {
-                var result = createNode(262 /* JSDocTupleType */);
-                nextToken();
-                result.types = parseDelimitedList(25 /* JSDocTupleTypes */, parseJSDocType);
-                checkForTrailingComma(result.types);
-                parseExpected(20 /* CloseBracketToken */);
-                return finishNode(result);
-            }
-            function checkForTrailingComma(list) {
-                if (parseDiagnostics.length === 0 && list.hasTrailingComma) {
-                    var start = list.end - ",".length;
-                    parseErrorAtPosition(start, ",".length, ts.Diagnostics.Trailing_comma_not_allowed);
-                }
-            }
-            function parseJSDocUnionType() {
-                var result = createNode(261 /* JSDocUnionType */);
-                nextToken();
-                result.types = parseJSDocTypeList(parseJSDocType());
-                parseExpected(18 /* CloseParenToken */);
-                return finishNode(result);
-            }
-            function parseJSDocTypeList(firstType) {
-                ts.Debug.assert(!!firstType);
-                var types = [];
-                types.pos = firstType.pos;
-                types.push(firstType);
-                while (parseOptional(47 /* BarToken */)) {
-                    types.push(parseJSDocType());
-                }
-                types.end = scanner.getStartPos();
-                return types;
-            }
-            function parseJSDocAllType() {
-                var result = createNode(258 /* JSDocAllType */);
-                nextToken();
-                return finishNode(result);
-            }
-            function parseJSDocUnknownOrNullableType() {
-                var pos = scanner.getStartPos();
-                // skip the ?
-                nextToken();
-                // Need to lookahead to decide if this is a nullable or unknown type.
-                // Here are cases where we'll pick the unknown type:
-                //
-                //      Foo(?,
-                //      { a: ? }
-                //      Foo(?)
-                //      Foo<?>
-                //      Foo(?=
-                //      (?|
-                if (token === 24 /* CommaToken */ ||
-                    token === 16 /* CloseBraceToken */ ||
-                    token === 18 /* CloseParenToken */ ||
-                    token === 27 /* GreaterThanToken */ ||
-                    token === 56 /* EqualsToken */ ||
-                    token === 47 /* BarToken */) {
-                    var result = createNode(259 /* JSDocUnknownType */, pos);
-                    return finishNode(result);
-                }
-                else {
-                    var result = createNode(263 /* JSDocNullableType */, pos);
-                    result.type = parseJSDocType();
-                    return finishNode(result);
-                }
-            }
-            function parseIsolatedJSDocComment(content, start, length) {
-                initializeState("file.js", content, 2 /* Latest */, /*_syntaxCursor:*/ undefined, 1 /* JS */);
-                sourceFile = { languageVariant: 0 /* Standard */, text: content };
-                var jsDocComment = parseJSDocCommentWorker(start, length);
-                var diagnostics = parseDiagnostics;
-                clearState();
-                return jsDocComment ? { jsDocComment: jsDocComment, diagnostics: diagnostics } : undefined;
-            }
-            JSDocParser.parseIsolatedJSDocComment = parseIsolatedJSDocComment;
-            function parseJSDocComment(parent, start, length) {
-                var saveToken = token;
-                var saveParseDiagnosticsLength = parseDiagnostics.length;
-                var saveParseErrorBeforeNextFinishedNode = parseErrorBeforeNextFinishedNode;
-                var comment = parseJSDocCommentWorker(start, length);
-                if (comment) {
-                    comment.parent = parent;
-                }
-                token = saveToken;
-                parseDiagnostics.length = saveParseDiagnosticsLength;
-                parseErrorBeforeNextFinishedNode = saveParseErrorBeforeNextFinishedNode;
-                return comment;
-            }
-            JSDocParser.parseJSDocComment = parseJSDocComment;
-            function parseJSDocCommentWorker(start, length) {
-                var content = sourceText;
-                start = start || 0;
-                var end = length === undefined ? content.length : start + length;
-                length = end - start;
-                ts.Debug.assert(start >= 0);
-                ts.Debug.assert(start <= end);
-                ts.Debug.assert(end <= content.length);
-                var tags;
-                var result;
-                // Check for /** (JSDoc opening part)
-                if (content.charCodeAt(start) === 47 /* slash */ &&
-                    content.charCodeAt(start + 1) === 42 /* asterisk */ &&
-                    content.charCodeAt(start + 2) === 42 /* asterisk */ &&
-                    content.charCodeAt(start + 3) !== 42 /* asterisk */) {
-                    // + 3 for leading /**, - 5 in total for /** */
-                    scanner.scanRange(start + 3, length - 5, function () {
-                        // Initially we can parse out a tag.  We also have seen a starting asterisk.
-                        // This is so that /** * @type */ doesn't parse.
-                        var canParseTag = true;
-                        var seenAsterisk = true;
-                        nextJSDocToken();
-                        while (token !== 1 /* EndOfFileToken */) {
-                            switch (token) {
-                                case 55 /* AtToken */:
-                                    if (canParseTag) {
-                                        parseTag();
-                                    }
-                                    // This will take us to the end of the line, so it's OK to parse a tag on the next pass through the loop
-                                    seenAsterisk = false;
-                                    break;
-                                case 4 /* NewLineTrivia */:
-                                    // After a line break, we can parse a tag, and we haven't seen an asterisk on the next line yet
-                                    canParseTag = true;
-                                    seenAsterisk = false;
-                                    break;
-                                case 37 /* AsteriskToken */:
-                                    if (seenAsterisk) {
-                                        // If we've already seen an asterisk, then we can no longer parse a tag on this line
-                                        canParseTag = false;
-                                    }
-                                    // Ignore the first asterisk on a line
-                                    seenAsterisk = true;
-                                    break;
-                                case 69 /* Identifier */:
-                                    // Anything else is doc comment text.  We can't do anything with it.  Because it
-                                    // wasn't a tag, we can no longer parse a tag on this line until we hit the next
-                                    // line break.
-                                    canParseTag = false;
-                                    break;
-                                case 1 /* EndOfFileToken */:
-                                    break;
-                            }
-                            nextJSDocToken();
-                        }
-                        result = createJSDocComment();
-                    });
-                }
-                return result;
-                function createJSDocComment() {
-                    if (!tags) {
-                        return undefined;
-                    }
-                    var result = createNode(273 /* JSDocComment */, start);
-                    result.tags = tags;
-                    return finishNode(result, end);
-                }
-                function skipWhitespace() {
-                    while (token === 5 /* WhitespaceTrivia */ || token === 4 /* NewLineTrivia */) {
-                        nextJSDocToken();
-                    }
-                }
-                function parseTag() {
-                    ts.Debug.assert(token === 55 /* AtToken */);
-                    var atToken = createNode(55 /* AtToken */, scanner.getTokenPos());
-                    atToken.end = scanner.getTextPos();
-                    nextJSDocToken();
-                    var tagName = parseJSDocIdentifierName();
-                    if (!tagName) {
-                        return;
-                    }
-                    var tag = handleTag(atToken, tagName) || handleUnknownTag(atToken, tagName);
-                    addTag(tag);
-                }
-                function handleTag(atToken, tagName) {
-                    if (tagName) {
-                        switch (tagName.text) {
-                            case "param":
-                                return handleParamTag(atToken, tagName);
-                            case "return":
-                            case "returns":
-                                return handleReturnTag(atToken, tagName);
-                            case "template":
-                                return handleTemplateTag(atToken, tagName);
-                            case "type":
-                                return handleTypeTag(atToken, tagName);
-                            case "typedef":
-                                return handleTypedefTag(atToken, tagName);
-                        }
-                    }
-                    return undefined;
-                }
-                function handleUnknownTag(atToken, tagName) {
-                    var result = createNode(274 /* JSDocTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    return finishNode(result);
-                }
-                function addTag(tag) {
-                    if (tag) {
-                        if (!tags) {
-                            tags = [];
-                            tags.pos = tag.pos;
-                        }
-                        tags.push(tag);
-                        tags.end = tag.end;
-                    }
-                }
-                function tryParseTypeExpression() {
-                    if (token !== 15 /* OpenBraceToken */) {
-                        return undefined;
-                    }
-                    var typeExpression = parseJSDocTypeExpression();
-                    return typeExpression;
-                }
-                function handleParamTag(atToken, tagName) {
-                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespace();
-                    var name;
-                    var isBracketed;
-                    // Looking for something like '[foo]' or 'foo'
-                    if (parseOptionalToken(19 /* OpenBracketToken */)) {
-                        name = parseJSDocIdentifierName();
-                        isBracketed = true;
-                        // May have an optional default, e.g. '[foo = 42]'
-                        if (parseOptionalToken(56 /* EqualsToken */)) {
-                            parseExpression();
-                        }
-                        parseExpected(20 /* CloseBracketToken */);
-                    }
-                    else if (ts.tokenIsIdentifierOrKeyword(token)) {
-                        name = parseJSDocIdentifierName();
-                    }
-                    if (!name) {
-                        parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
-                        return undefined;
-                    }
-                    var preName, postName;
-                    if (typeExpression) {
-                        postName = name;
-                    }
-                    else {
-                        preName = name;
-                    }
-                    if (!typeExpression) {
-                        typeExpression = tryParseTypeExpression();
-                    }
-                    var result = createNode(275 /* JSDocParameterTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    result.preParameterName = preName;
-                    result.typeExpression = typeExpression;
-                    result.postParameterName = postName;
-                    result.isBracketed = isBracketed;
-                    return finishNode(result);
-                }
-                function handleReturnTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 276 /* JSDocReturnTag */; })) {
-                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
-                    }
-                    var result = createNode(276 /* JSDocReturnTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result);
-                }
-                function handleTypeTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 277 /* JSDocTypeTag */; })) {
-                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
-                    }
-                    var result = createNode(277 /* JSDocTypeTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    result.typeExpression = tryParseTypeExpression();
-                    return finishNode(result);
-                }
-                function handlePropertyTag(atToken, tagName) {
-                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespace();
-                    var name = parseJSDocIdentifierName();
-                    if (!name) {
-                        parseErrorAtPosition(scanner.getStartPos(), /*length*/ 0, ts.Diagnostics.Identifier_expected);
-                        return undefined;
-                    }
-                    var result = createNode(280 /* JSDocPropertyTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    result.name = name;
-                    result.typeExpression = typeExpression;
-                    return finishNode(result);
-                }
-                function handleTypedefTag(atToken, tagName) {
-                    var typeExpression = tryParseTypeExpression();
-                    skipWhitespace();
-                    var typedefTag = createNode(279 /* JSDocTypedefTag */, atToken.pos);
-                    typedefTag.atToken = atToken;
-                    typedefTag.tagName = tagName;
-                    typedefTag.name = parseJSDocIdentifierName();
-                    typedefTag.typeExpression = typeExpression;
-                    if (typeExpression) {
-                        if (typeExpression.type.kind === 267 /* JSDocTypeReference */) {
-                            var jsDocTypeReference = typeExpression.type;
-                            if (jsDocTypeReference.name.kind === 69 /* Identifier */) {
-                                var name_8 = jsDocTypeReference.name;
-                                if (name_8.text === "Object") {
-                                    typedefTag.jsDocTypeLiteral = scanChildTags();
-                                }
-                            }
-                        }
-                        if (!typedefTag.jsDocTypeLiteral) {
-                            typedefTag.jsDocTypeLiteral = typeExpression.type;
-                        }
-                    }
-                    else {
-                        typedefTag.jsDocTypeLiteral = scanChildTags();
-                    }
-                    return finishNode(typedefTag);
-                    function scanChildTags() {
-                        var jsDocTypeLiteral = createNode(281 /* JSDocTypeLiteral */, scanner.getStartPos());
-                        var resumePos = scanner.getStartPos();
-                        var canParseTag = true;
-                        var seenAsterisk = false;
-                        var parentTagTerminated = false;
-                        while (token !== 1 /* EndOfFileToken */ && !parentTagTerminated) {
-                            nextJSDocToken();
-                            switch (token) {
-                                case 55 /* AtToken */:
-                                    if (canParseTag) {
-                                        parentTagTerminated = !tryParseChildTag(jsDocTypeLiteral);
-                                    }
-                                    seenAsterisk = false;
-                                    break;
-                                case 4 /* NewLineTrivia */:
-                                    resumePos = scanner.getStartPos() - 1;
-                                    canParseTag = true;
-                                    seenAsterisk = false;
-                                    break;
-                                case 37 /* AsteriskToken */:
-                                    if (seenAsterisk) {
-                                        canParseTag = false;
-                                    }
-                                    seenAsterisk = true;
-                                    break;
-                                case 69 /* Identifier */:
-                                    canParseTag = false;
-                                case 1 /* EndOfFileToken */:
-                                    break;
-                            }
-                        }
-                        scanner.setTextPos(resumePos);
-                        return finishNode(jsDocTypeLiteral);
-                    }
-                }
-                function tryParseChildTag(parentTag) {
-                    ts.Debug.assert(token === 55 /* AtToken */);
-                    var atToken = createNode(55 /* AtToken */, scanner.getStartPos());
-                    atToken.end = scanner.getTextPos();
-                    nextJSDocToken();
-                    var tagName = parseJSDocIdentifierName();
-                    if (!tagName) {
-                        return false;
-                    }
-                    switch (tagName.text) {
-                        case "type":
-                            if (parentTag.jsDocTypeTag) {
-                                // already has a @type tag, terminate the parent tag now.
-                                return false;
-                            }
-                            parentTag.jsDocTypeTag = handleTypeTag(atToken, tagName);
-                            return true;
-                        case "prop":
-                        case "property":
-                            if (!parentTag.jsDocPropertyTags) {
-                                parentTag.jsDocPropertyTags = [];
-                            }
-                            var propertyTag = handlePropertyTag(atToken, tagName);
-                            parentTag.jsDocPropertyTags.push(propertyTag);
-                            return true;
-                    }
-                    return false;
-                }
-                function handleTemplateTag(atToken, tagName) {
-                    if (ts.forEach(tags, function (t) { return t.kind === 278 /* JSDocTemplateTag */; })) {
-                        parseErrorAtPosition(tagName.pos, scanner.getTokenPos() - tagName.pos, ts.Diagnostics._0_tag_already_specified, tagName.text);
-                    }
-                    // Type parameter list looks like '@template T,U,V'
-                    var typeParameters = [];
-                    typeParameters.pos = scanner.getStartPos();
-                    while (true) {
-                        var name_9 = parseJSDocIdentifierName();
-                        if (!name_9) {
-                            parseErrorAtPosition(scanner.getStartPos(), 0, ts.Diagnostics.Identifier_expected);
-                            return undefined;
-                        }
-                        var typeParameter = createNode(141 /* TypeParameter */, name_9.pos);
-                        typeParameter.name = name_9;
-                        finishNode(typeParameter);
-                        typeParameters.push(typeParameter);
-                        if (token === 24 /* CommaToken */) {
-                            nextJSDocToken();
-                        }
-                        else {
-                            break;
-                        }
-                    }
-                    var result = createNode(278 /* JSDocTemplateTag */, atToken.pos);
-                    result.atToken = atToken;
-                    result.tagName = tagName;
-                    result.typeParameters = typeParameters;
-                    finishNode(result);
-                    typeParameters.end = result.end;
-                    return result;
-                }
-                function nextJSDocToken() {
-                    return token = scanner.scanJSDocToken();
-                }
-                function parseJSDocIdentifierName() {
-                    return createJSDocIdentifier(ts.tokenIsIdentifierOrKeyword(token));
-                }
-                function createJSDocIdentifier(isIdentifier) {
-                    if (!isIdentifier) {
-                        parseErrorAtCurrentToken(ts.Diagnostics.Identifier_expected);
-                        return undefined;
-                    }
-                    var pos = scanner.getTokenPos();
-                    var end = scanner.getTextPos();
-                    var result = createNode(69 /* Identifier */, pos);
-                    result.text = content.substring(pos, end);
-                    finishNode(result, end);
-                    nextJSDocToken();
-                    return result;
-                }
-            }
-            JSDocParser.parseJSDocCommentWorker = parseJSDocCommentWorker;
-        })(JSDocParser = Parser.JSDocParser || (Parser.JSDocParser = {}));
-    })(Parser || (Parser = {}));
-    var IncrementalParser;
-    (function (IncrementalParser) {
-        function updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks) {
-            aggressiveChecks = aggressiveChecks || ts.Debug.shouldAssert(2 /* Aggressive */);
-            checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks);
-            if (ts.textChangeRangeIsUnchanged(textChangeRange)) {
-                // if the text didn't change, then we can just return our current source file as-is.
-                return sourceFile;
-            }
-            if (sourceFile.statements.length === 0) {
-                // If we don't have any statements in the current source file, then there's no real
-                // way to incrementally parse.  So just do a full parse instead.
-                return Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, /*syntaxCursor*/ undefined, /*setParentNodes*/ true, sourceFile.scriptKind);
-            }
-            // Make sure we're not trying to incrementally update a source file more than once.  Once
-            // we do an update the original source file is considered unusable from that point onwards.
-            //
-            // This is because we do incremental parsing in-place.  i.e. we take nodes from the old
-            // tree and give them new positions and parents.  From that point on, trusting the old
-            // tree at all is not possible as far too much of it may violate invariants.
-            var incrementalSourceFile = sourceFile;
-            ts.Debug.assert(!incrementalSourceFile.hasBeenIncrementallyParsed);
-            incrementalSourceFile.hasBeenIncrementallyParsed = true;
-            var oldText = sourceFile.text;
-            var syntaxCursor = createSyntaxCursor(sourceFile);
-            // Make the actual change larger so that we know to reparse anything whose lookahead
-            // might have intersected the change.
-            var changeRange = extendToAffectedRange(sourceFile, textChangeRange);
-            checkChangeRange(sourceFile, newText, changeRange, aggressiveChecks);
-            // Ensure that extending the affected range only moved the start of the change range
-            // earlier in the file.
-            ts.Debug.assert(changeRange.span.start <= textChangeRange.span.start);
-            ts.Debug.assert(ts.textSpanEnd(changeRange.span) === ts.textSpanEnd(textChangeRange.span));
-            ts.Debug.assert(ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)) === ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)));
-            // The is the amount the nodes after the edit range need to be adjusted.  It can be
-            // positive (if the edit added characters), negative (if the edit deleted characters)
-            // or zero (if this was a pure overwrite with nothing added/removed).
-            var delta = ts.textChangeRangeNewSpan(changeRange).length - changeRange.span.length;
-            // If we added or removed characters during the edit, then we need to go and adjust all
-            // the nodes after the edit.  Those nodes may move forward (if we inserted chars) or they
-            // may move backward (if we deleted chars).
-            //
-            // Doing this helps us out in two ways.  First, it means that any nodes/tokens we want
-            // to reuse are already at the appropriate position in the new text.  That way when we
-            // reuse them, we don't have to figure out if they need to be adjusted.  Second, it makes
-            // it very easy to determine if we can reuse a node.  If the node's position is at where
-            // we are in the text, then we can reuse it.  Otherwise we can't.  If the node's position
-            // is ahead of us, then we'll need to rescan tokens.  If the node's position is behind
-            // us, then we'll need to skip it or crumble it as appropriate
-            //
-            // We will also adjust the positions of nodes that intersect the change range as well.
-            // By doing this, we ensure that all the positions in the old tree are consistent, not
-            // just the positions of nodes entirely before/after the change range.  By being
-            // consistent, we can then easily map from positions to nodes in the old tree easily.
-            //
-            // Also, mark any syntax elements that intersect the changed span.  We know, up front,
-            // that we cannot reuse these elements.
-            updateTokenPositionsAndMarkElements(incrementalSourceFile, changeRange.span.start, ts.textSpanEnd(changeRange.span), ts.textSpanEnd(ts.textChangeRangeNewSpan(changeRange)), delta, oldText, newText, aggressiveChecks);
-            // Now that we've set up our internal incremental state just proceed and parse the
-            // source file in the normal fashion.  When possible the parser will retrieve and
-            // reuse nodes from the old tree.
-            //
-            // Note: passing in 'true' for setNodeParents is very important.  When incrementally
-            // parsing, we will be reusing nodes from the old tree, and placing it into new
-            // parents.  If we don't set the parents now, we'll end up with an observably
-            // inconsistent tree.  Setting the parents on the new tree should be very fast.  We
-            // will immediately bail out of walking any subtrees when we can see that their parents
-            // are already correct.
-            var result = Parser.parseSourceFile(sourceFile.fileName, newText, sourceFile.languageVersion, syntaxCursor, /*setParentNodes*/ true, sourceFile.scriptKind);
-            return result;
-        }
-        IncrementalParser.updateSourceFile = updateSourceFile;
-        function moveElementEntirelyPastChangeRange(element, isArray, delta, oldText, newText, aggressiveChecks) {
-            if (isArray) {
-                visitArray(element);
-            }
-            else {
-                visitNode(element);
-            }
-            return;
-            function visitNode(node) {
-                var text = "";
-                if (aggressiveChecks && shouldCheckNode(node)) {
-                    text = oldText.substring(node.pos, node.end);
-                }
-                // Ditch any existing LS children we may have created.  This way we can avoid
-                // moving them forward.
-                if (node._children) {
-                    node._children = undefined;
-                }
-                node.pos += delta;
-                node.end += delta;
-                if (aggressiveChecks && shouldCheckNode(node)) {
-                    ts.Debug.assert(text === newText.substring(node.pos, node.end));
-                }
-                forEachChild(node, visitNode, visitArray);
-                if (node.jsDocComments) {
-                    for (var _i = 0, _a = node.jsDocComments; _i < _a.length; _i++) {
-                        var jsDocComment = _a[_i];
-                        forEachChild(jsDocComment, visitNode, visitArray);
-                    }
-                }
-                checkNodePositions(node, aggressiveChecks);
-            }
-            function visitArray(array) {
-                array._children = undefined;
-                array.pos += delta;
-                array.end += delta;
-                for (var _i = 0, array_8 = array; _i < array_8.length; _i++) {
-                    var node = array_8[_i];
-                    visitNode(node);
-                }
-            }
-        }
-        function shouldCheckNode(node) {
-            switch (node.kind) {
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                case 69 /* Identifier */:
-                    return true;
-            }
-            return false;
-        }
-        function adjustIntersectingElement(element, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta) {
-            ts.Debug.assert(element.end >= changeStart, "Adjusting an element that was entirely before the change range");
-            ts.Debug.assert(element.pos <= changeRangeOldEnd, "Adjusting an element that was entirely after the change range");
-            ts.Debug.assert(element.pos <= element.end);
-            // We have an element that intersects the change range in some way.  It may have its
-            // start, or its end (or both) in the changed range.  We want to adjust any part
-            // that intersects such that the final tree is in a consistent state.  i.e. all
-            // children have spans within the span of their parent, and all siblings are ordered
-            // properly.
-            // We may need to update both the 'pos' and the 'end' of the element.
-            // If the 'pos' is before the start of the change, then we don't need to touch it.
-            // If it isn't, then the 'pos' must be inside the change.  How we update it will
-            // depend if delta is  positive or negative.  If delta is positive then we have
-            // something like:
-            //
-            //  -------------------AAA-----------------
-            //  -------------------BBBCCCCCCC-----------------
-            //
-            // In this case, we consider any node that started in the change range to still be
-            // starting at the same position.
-            //
-            // however, if the delta is negative, then we instead have something like this:
-            //
-            //  -------------------XXXYYYYYYY-----------------
-            //  -------------------ZZZ-----------------
-            //
-            // In this case, any element that started in the 'X' range will keep its position.
-            // However any element that started after that will have their pos adjusted to be
-            // at the end of the new range.  i.e. any node that started in the 'Y' range will
-            // be adjusted to have their start at the end of the 'Z' range.
-            //
-            // The element will keep its position if possible.  Or Move backward to the new-end
-            // if it's in the 'Y' range.
-            element.pos = Math.min(element.pos, changeRangeNewEnd);
-            // If the 'end' is after the change range, then we always adjust it by the delta
-            // amount.  However, if the end is in the change range, then how we adjust it
-            // will depend on if delta is  positive or negative.  If delta is positive then we
-            // have something like:
-            //
-            //  -------------------AAA-----------------
-            //  -------------------BBBCCCCCCC-----------------
-            //
-            // In this case, we consider any node that ended inside the change range to keep its
-            // end position.
-            //
-            // however, if the delta is negative, then we instead have something like this:
-            //
-            //  -------------------XXXYYYYYYY-----------------
-            //  -------------------ZZZ-----------------
-            //
-            // In this case, any element that ended in the 'X' range will keep its position.
-            // However any element that ended after that will have their pos adjusted to be
-            // at the end of the new range.  i.e. any node that ended in the 'Y' range will
-            // be adjusted to have their end at the end of the 'Z' range.
-            if (element.end >= changeRangeOldEnd) {
-                // Element ends after the change range.  Always adjust the end pos.
-                element.end += delta;
-            }
-            else {
-                // Element ends in the change range.  The element will keep its position if
-                // possible. Or Move backward to the new-end if it's in the 'Y' range.
-                element.end = Math.min(element.end, changeRangeNewEnd);
-            }
-            ts.Debug.assert(element.pos <= element.end);
-            if (element.parent) {
-                ts.Debug.assert(element.pos >= element.parent.pos);
-                ts.Debug.assert(element.end <= element.parent.end);
-            }
-        }
-        function checkNodePositions(node, aggressiveChecks) {
-            if (aggressiveChecks) {
-                var pos_2 = node.pos;
-                forEachChild(node, function (child) {
-                    ts.Debug.assert(child.pos >= pos_2);
-                    pos_2 = child.end;
-                });
-                ts.Debug.assert(pos_2 <= node.end);
-            }
-        }
-        function updateTokenPositionsAndMarkElements(sourceFile, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta, oldText, newText, aggressiveChecks) {
-            visitNode(sourceFile);
-            return;
-            function visitNode(child) {
-                ts.Debug.assert(child.pos <= child.end);
-                if (child.pos > changeRangeOldEnd) {
-                    // Node is entirely past the change range.  We need to move both its pos and
-                    // end, forward or backward appropriately.
-                    moveElementEntirelyPastChangeRange(child, /*isArray*/ false, delta, oldText, newText, aggressiveChecks);
-                    return;
-                }
-                // Check if the element intersects the change range.  If it does, then it is not
-                // reusable.  Also, we'll need to recurse to see what constituent portions we may
-                // be able to use.
-                var fullEnd = child.end;
-                if (fullEnd >= changeStart) {
-                    child.intersectsChange = true;
-                    child._children = undefined;
-                    // Adjust the pos or end (or both) of the intersecting element accordingly.
-                    adjustIntersectingElement(child, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    forEachChild(child, visitNode, visitArray);
-                    checkNodePositions(child, aggressiveChecks);
-                    return;
-                }
-                // Otherwise, the node is entirely before the change range.  No need to do anything with it.
-                ts.Debug.assert(fullEnd < changeStart);
-            }
-            function visitArray(array) {
-                ts.Debug.assert(array.pos <= array.end);
-                if (array.pos > changeRangeOldEnd) {
-                    // Array is entirely after the change range.  We need to move it, and move any of
-                    // its children.
-                    moveElementEntirelyPastChangeRange(array, /*isArray*/ true, delta, oldText, newText, aggressiveChecks);
-                    return;
-                }
-                // Check if the element intersects the change range.  If it does, then it is not
-                // reusable.  Also, we'll need to recurse to see what constituent portions we may
-                // be able to use.
-                var fullEnd = array.end;
-                if (fullEnd >= changeStart) {
-                    array.intersectsChange = true;
-                    array._children = undefined;
-                    // Adjust the pos or end (or both) of the intersecting array accordingly.
-                    adjustIntersectingElement(array, changeStart, changeRangeOldEnd, changeRangeNewEnd, delta);
-                    for (var _i = 0, array_9 = array; _i < array_9.length; _i++) {
-                        var node = array_9[_i];
-                        visitNode(node);
-                    }
-                    return;
-                }
-                // Otherwise, the array is entirely before the change range.  No need to do anything with it.
-                ts.Debug.assert(fullEnd < changeStart);
-            }
-        }
-        function extendToAffectedRange(sourceFile, changeRange) {
-            // Consider the following code:
-            //      void foo() { /; }
-            //
-            // If the text changes with an insertion of / just before the semicolon then we end up with:
-            //      void foo() { //; }
-            //
-            // If we were to just use the changeRange a is, then we would not rescan the { token
-            // (as it does not intersect the actual original change range).  Because an edit may
-            // change the token touching it, we actually need to look back *at least* one token so
-            // that the prior token sees that change.
-            var maxLookahead = 1;
-            var start = changeRange.span.start;
-            // the first iteration aligns us with the change start. subsequent iteration move us to
-            // the left by maxLookahead tokens.  We only need to do this as long as we're not at the
-            // start of the tree.
-            for (var i = 0; start > 0 && i <= maxLookahead; i++) {
-                var nearestNode = findNearestNodeStartingBeforeOrAtPosition(sourceFile, start);
-                ts.Debug.assert(nearestNode.pos <= start);
-                var position = nearestNode.pos;
-                start = Math.max(0, position - 1);
-            }
-            var finalSpan = ts.createTextSpanFromBounds(start, ts.textSpanEnd(changeRange.span));
-            var finalLength = changeRange.newLength + (changeRange.span.start - start);
-            return ts.createTextChangeRange(finalSpan, finalLength);
-        }
-        function findNearestNodeStartingBeforeOrAtPosition(sourceFile, position) {
-            var bestResult = sourceFile;
-            var lastNodeEntirelyBeforePosition;
-            forEachChild(sourceFile, visit);
-            if (lastNodeEntirelyBeforePosition) {
-                var lastChildOfLastEntireNodeBeforePosition = getLastChild(lastNodeEntirelyBeforePosition);
-                if (lastChildOfLastEntireNodeBeforePosition.pos > bestResult.pos) {
-                    bestResult = lastChildOfLastEntireNodeBeforePosition;
-                }
-            }
-            return bestResult;
-            function getLastChild(node) {
-                while (true) {
-                    var lastChild = getLastChildWorker(node);
-                    if (lastChild) {
-                        node = lastChild;
-                    }
-                    else {
-                        return node;
-                    }
-                }
-            }
-            function getLastChildWorker(node) {
-                var last = undefined;
-                forEachChild(node, function (child) {
-                    if (ts.nodeIsPresent(child)) {
-                        last = child;
-                    }
-                });
-                return last;
-            }
-            function visit(child) {
-                if (ts.nodeIsMissing(child)) {
-                    // Missing nodes are effectively invisible to us.  We never even consider them
-                    // When trying to find the nearest node before us.
-                    return;
-                }
-                // If the child intersects this position, then this node is currently the nearest
-                // node that starts before the position.
-                if (child.pos <= position) {
-                    if (child.pos >= bestResult.pos) {
-                        // This node starts before the position, and is closer to the position than
-                        // the previous best node we found.  It is now the new best node.
-                        bestResult = child;
-                    }
-                    // Now, the node may overlap the position, or it may end entirely before the
-                    // position.  If it overlaps with the position, then either it, or one of its
-                    // children must be the nearest node before the position.  So we can just
-                    // recurse into this child to see if we can find something better.
-                    if (position < child.end) {
-                        // The nearest node is either this child, or one of the children inside
-                        // of it.  We've already marked this child as the best so far.  Recurse
-                        // in case one of the children is better.
-                        forEachChild(child, visit);
-                        // Once we look at the children of this node, then there's no need to
-                        // continue any further.
-                        return true;
-                    }
-                    else {
-                        ts.Debug.assert(child.end <= position);
-                        // The child ends entirely before this position.  Say you have the following
-                        // (where $ is the position)
-                        //
-                        //      <complex expr 1> ? <complex expr 2> $ : <...> <...>
-                        //
-                        // We would want to find the nearest preceding node in "complex expr 2".
-                        // To support that, we keep track of this node, and once we're done searching
-                        // for a best node, we recurse down this node to see if we can find a good
-                        // result in it.
-                        //
-                        // This approach allows us to quickly skip over nodes that are entirely
-                        // before the position, while still allowing us to find any nodes in the
-                        // last one that might be what we want.
-                        lastNodeEntirelyBeforePosition = child;
-                    }
-                }
-                else {
-                    ts.Debug.assert(child.pos > position);
-                    // We're now at a node that is entirely past the position we're searching for.
-                    // This node (and all following nodes) could never contribute to the result,
-                    // so just skip them by returning 'true' here.
-                    return true;
-                }
-            }
-        }
-        function checkChangeRange(sourceFile, newText, textChangeRange, aggressiveChecks) {
-            var oldText = sourceFile.text;
-            if (textChangeRange) {
-                ts.Debug.assert((oldText.length - textChangeRange.span.length + textChangeRange.newLength) === newText.length);
-                if (aggressiveChecks || ts.Debug.shouldAssert(3 /* VeryAggressive */)) {
-                    var oldTextPrefix = oldText.substr(0, textChangeRange.span.start);
-                    var newTextPrefix = newText.substr(0, textChangeRange.span.start);
-                    ts.Debug.assert(oldTextPrefix === newTextPrefix);
-                    var oldTextSuffix = oldText.substring(ts.textSpanEnd(textChangeRange.span), oldText.length);
-                    var newTextSuffix = newText.substring(ts.textSpanEnd(ts.textChangeRangeNewSpan(textChangeRange)), newText.length);
-                    ts.Debug.assert(oldTextSuffix === newTextSuffix);
-                }
-            }
-        }
-        function createSyntaxCursor(sourceFile) {
-            var currentArray = sourceFile.statements;
-            var currentArrayIndex = 0;
-            ts.Debug.assert(currentArrayIndex < currentArray.length);
-            var current = currentArray[currentArrayIndex];
-            var lastQueriedPosition = -1 /* Value */;
-            return {
-                currentNode: function (position) {
-                    // Only compute the current node if the position is different than the last time
-                    // we were asked.  The parser commonly asks for the node at the same position
-                    // twice.  Once to know if can read an appropriate list element at a certain point,
-                    // and then to actually read and consume the node.
-                    if (position !== lastQueriedPosition) {
-                        // Much of the time the parser will need the very next node in the array that
-                        // we just returned a node from.So just simply check for that case and move
-                        // forward in the array instead of searching for the node again.
-                        if (current && current.end === position && currentArrayIndex < (currentArray.length - 1)) {
-                            currentArrayIndex++;
-                            current = currentArray[currentArrayIndex];
-                        }
-                        // If we don't have a node, or the node we have isn't in the right position,
-                        // then try to find a viable node at the position requested.
-                        if (!current || current.pos !== position) {
-                            findHighestListElementThatStartsAtPosition(position);
-                        }
-                    }
-                    // Cache this query so that we don't do any extra work if the parser calls back
-                    // into us.  Note: this is very common as the parser will make pairs of calls like
-                    // 'isListElement -> parseListElement'.  If we were unable to find a node when
-                    // called with 'isListElement', we don't want to redo the work when parseListElement
-                    // is called immediately after.
-                    lastQueriedPosition = position;
-                    // Either we don'd have a node, or we have a node at the position being asked for.
-                    ts.Debug.assert(!current || current.pos === position);
-                    return current;
-                }
-            };
-            // Finds the highest element in the tree we can find that starts at the provided position.
-            // The element must be a direct child of some node list in the tree.  This way after we
-            // return it, we can easily return its next sibling in the list.
-            function findHighestListElementThatStartsAtPosition(position) {
-                // Clear out any cached state about the last node we found.
-                currentArray = undefined;
-                currentArrayIndex = -1 /* Value */;
-                current = undefined;
-                // Recurse into the source file to find the highest node at this position.
-                forEachChild(sourceFile, visitNode, visitArray);
-                return;
-                function visitNode(node) {
-                    if (position >= node.pos && position < node.end) {
-                        // Position was within this node.  Keep searching deeper to find the node.
-                        forEachChild(node, visitNode, visitArray);
-                        // don't proceed any further in the search.
-                        return true;
-                    }
-                    // position wasn't in this node, have to keep searching.
-                    return false;
-                }
-                function visitArray(array) {
-                    if (position >= array.pos && position < array.end) {
-                        // position was in this array.  Search through this array to see if we find a
-                        // viable element.
-                        for (var i = 0, n = array.length; i < n; i++) {
-                            var child = array[i];
-                            if (child) {
-                                if (child.pos === position) {
-                                    // Found the right node.  We're done.
-                                    currentArray = array;
-                                    currentArrayIndex = i;
-                                    current = child;
-                                    return true;
-                                }
-                                else {
-                                    if (child.pos < position && position < child.end) {
-                                        // Position in somewhere within this child.  Search in it and
-                                        // stop searching in this array.
-                                        forEachChild(child, visitNode, visitArray);
-                                        return true;
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    // position wasn't in this array, have to keep searching.
-                    return false;
-                }
-            }
-        }
-        var InvalidPosition;
-        (function (InvalidPosition) {
-            InvalidPosition[InvalidPosition["Value"] = -1] = "Value";
-        })(InvalidPosition || (InvalidPosition = {}));
-    })(IncrementalParser || (IncrementalParser = {}));
-})(ts || (ts = {}));
-/// <reference path="utilities.ts"/>
-/// <reference path="parser.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    ts.bindTime = 0;
-    (function (ModuleInstanceState) {
-        ModuleInstanceState[ModuleInstanceState["NonInstantiated"] = 0] = "NonInstantiated";
-        ModuleInstanceState[ModuleInstanceState["Instantiated"] = 1] = "Instantiated";
-        ModuleInstanceState[ModuleInstanceState["ConstEnumOnly"] = 2] = "ConstEnumOnly";
-    })(ts.ModuleInstanceState || (ts.ModuleInstanceState = {}));
-    var ModuleInstanceState = ts.ModuleInstanceState;
-    function getModuleInstanceState(node) {
-        // A module is uninstantiated if it contains only
-        // 1. interface declarations, type alias declarations
-        if (node.kind === 222 /* InterfaceDeclaration */ || node.kind === 223 /* TypeAliasDeclaration */) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (ts.isConstEnumDeclaration(node)) {
-            return 2 /* ConstEnumOnly */;
-        }
-        else if ((node.kind === 230 /* ImportDeclaration */ || node.kind === 229 /* ImportEqualsDeclaration */) && !(node.flags & 1 /* Export */)) {
-            return 0 /* NonInstantiated */;
-        }
-        else if (node.kind === 226 /* ModuleBlock */) {
-            var state_1 = 0 /* NonInstantiated */;
-            ts.forEachChild(node, function (n) {
-                switch (getModuleInstanceState(n)) {
-                    case 0 /* NonInstantiated */:
-                        // child is non-instantiated - continue searching
-                        return false;
-                    case 2 /* ConstEnumOnly */:
-                        // child is const enum only - record state and continue searching
-                        state_1 = 2 /* ConstEnumOnly */;
-                        return false;
-                    case 1 /* Instantiated */:
-                        // child is instantiated - record state and stop
-                        state_1 = 1 /* Instantiated */;
-                        return true;
-                }
-            });
-            return state_1;
-        }
-        else if (node.kind === 225 /* ModuleDeclaration */) {
-            var body = node.body;
-            return body ? getModuleInstanceState(body) : 1 /* Instantiated */;
-        }
-        else {
-            return 1 /* Instantiated */;
-        }
-    }
-    ts.getModuleInstanceState = getModuleInstanceState;
-    var ContainerFlags;
-    (function (ContainerFlags) {
-        // The current node is not a container, and no container manipulation should happen before
-        // recursing into it.
-        ContainerFlags[ContainerFlags["None"] = 0] = "None";
-        // The current node is a container.  It should be set as the current container (and block-
-        // container) before recursing into it.  The current node does not have locals.  Examples:
-        //
-        //      Classes, ObjectLiterals, TypeLiterals, Interfaces...
-        ContainerFlags[ContainerFlags["IsContainer"] = 1] = "IsContainer";
-        // The current node is a block-scoped-container.  It should be set as the current block-
-        // container before recursing into it.  Examples:
-        //
-        //      Blocks (when not parented by functions), Catch clauses, For/For-in/For-of statements...
-        ContainerFlags[ContainerFlags["IsBlockScopedContainer"] = 2] = "IsBlockScopedContainer";
-        // The current node is the container of a control flow path. The current control flow should
-        // be saved and restored, and a new control flow initialized within the container.
-        ContainerFlags[ContainerFlags["IsControlFlowContainer"] = 4] = "IsControlFlowContainer";
-        ContainerFlags[ContainerFlags["IsFunctionLike"] = 8] = "IsFunctionLike";
-        ContainerFlags[ContainerFlags["IsFunctionExpression"] = 16] = "IsFunctionExpression";
-        ContainerFlags[ContainerFlags["HasLocals"] = 32] = "HasLocals";
-        ContainerFlags[ContainerFlags["IsInterface"] = 64] = "IsInterface";
-    })(ContainerFlags || (ContainerFlags = {}));
-    var binder = createBinder();
-    function bindSourceFile(file, options) {
-        var start = new Date().getTime();
-        binder(file, options);
-        ts.bindTime += new Date().getTime() - start;
-    }
-    ts.bindSourceFile = bindSourceFile;
-    function createBinder() {
-        var file;
-        var options;
-        var languageVersion;
-        var parent;
-        var container;
-        var blockScopeContainer;
-        var lastContainer;
-        var seenThisKeyword;
-        // state used by control flow analysis
-        var currentFlow;
-        var currentBreakTarget;
-        var currentContinueTarget;
-        var currentReturnTarget;
-        var currentTrueTarget;
-        var currentFalseTarget;
-        var preSwitchCaseFlow;
-        var activeLabels;
-        var hasExplicitReturn;
-        // state used for emit helpers
-        var emitFlags;
-        // If this file is an external module, then it is automatically in strict-mode according to
-        // ES6.  If it is not an external module, then we'll determine if it is in strict mode or
-        // not depending on if we see "use strict" in certain places (or if we hit a class/namespace).
-        var inStrictMode;
-        var symbolCount = 0;
-        var Symbol;
-        var classifiableNames;
-        var unreachableFlow = { flags: 1 /* Unreachable */ };
-        var reportedUnreachableFlow = { flags: 1 /* Unreachable */ };
-        function bindSourceFile(f, opts) {
-            file = f;
-            options = opts;
-            languageVersion = ts.getEmitScriptTarget(options);
-            inStrictMode = !!file.externalModuleIndicator;
-            classifiableNames = {};
-            symbolCount = 0;
-            Symbol = ts.objectAllocator.getSymbolConstructor();
-            if (!file.locals) {
-                bind(file);
-                file.symbolCount = symbolCount;
-                file.classifiableNames = classifiableNames;
-            }
-            file = undefined;
-            options = undefined;
-            languageVersion = undefined;
-            parent = undefined;
-            container = undefined;
-            blockScopeContainer = undefined;
-            lastContainer = undefined;
-            seenThisKeyword = false;
-            currentFlow = undefined;
-            currentBreakTarget = undefined;
-            currentContinueTarget = undefined;
-            currentReturnTarget = undefined;
-            currentTrueTarget = undefined;
-            currentFalseTarget = undefined;
-            activeLabels = undefined;
-            hasExplicitReturn = false;
-            emitFlags = 0 /* None */;
-        }
-        return bindSourceFile;
-        function createSymbol(flags, name) {
-            symbolCount++;
-            return new Symbol(flags, name);
-        }
-        function addDeclarationToSymbol(symbol, node, symbolFlags) {
-            symbol.flags |= symbolFlags;
-            node.symbol = symbol;
-            if (!symbol.declarations) {
-                symbol.declarations = [];
-            }
-            symbol.declarations.push(node);
-            if (symbolFlags & 1952 /* HasExports */ && !symbol.exports) {
-                symbol.exports = {};
-            }
-            if (symbolFlags & 6240 /* HasMembers */ && !symbol.members) {
-                symbol.members = {};
-            }
-            if (symbolFlags & 107455 /* Value */) {
-                var valueDeclaration = symbol.valueDeclaration;
-                if (!valueDeclaration ||
-                    (valueDeclaration.kind !== node.kind && valueDeclaration.kind === 225 /* ModuleDeclaration */)) {
-                    // other kinds of value declarations take precedence over modules
-                    symbol.valueDeclaration = node;
-                }
-            }
-        }
-        // Should not be called on a declaration with a computed property name,
-        // unless it is a well known Symbol.
-        function getDeclarationName(node) {
-            if (node.name) {
-                if (ts.isAmbientModule(node)) {
-                    return ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + node.name.text + "\"";
-                }
-                if (node.name.kind === 140 /* ComputedPropertyName */) {
-                    var nameExpression = node.name.expression;
-                    // treat computed property names where expression is string/numeric literal as just string/numeric literal
-                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
-                        return nameExpression.text;
-                    }
-                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
-                    return ts.getPropertyNameForKnownSymbolName(nameExpression.name.text);
-                }
-                return node.name.text;
-            }
-            switch (node.kind) {
-                case 148 /* Constructor */:
-                    return "__constructor";
-                case 156 /* FunctionType */:
-                case 151 /* CallSignature */:
-                    return "__call";
-                case 157 /* ConstructorType */:
-                case 152 /* ConstructSignature */:
-                    return "__new";
-                case 153 /* IndexSignature */:
-                    return "__index";
-                case 236 /* ExportDeclaration */:
-                    return "__export";
-                case 235 /* ExportAssignment */:
-                    return node.isExportEquals ? "export=" : "default";
-                case 187 /* BinaryExpression */:
-                    switch (ts.getSpecialPropertyAssignmentKind(node)) {
-                        case 2 /* ModuleExports */:
-                            // module.exports = ...
-                            return "export=";
-                        case 1 /* ExportsProperty */:
-                        case 4 /* ThisProperty */:
-                            // exports.x = ... or this.y = ...
-                            return node.left.name.text;
-                        case 3 /* PrototypeProperty */:
-                            // className.prototype.methodName = ...
-                            return node.left.expression.name.text;
-                    }
-                    ts.Debug.fail("Unknown binary declaration kind");
-                    break;
-                case 220 /* FunctionDeclaration */:
-                case 221 /* ClassDeclaration */:
-                    return node.flags & 512 /* Default */ ? "default" : undefined;
-                case 269 /* JSDocFunctionType */:
-                    return ts.isJSDocConstructSignature(node) ? "__new" : "__call";
-                case 142 /* Parameter */:
-                    // Parameters with names are handled at the top of this function.  Parameters
-                    // without names can only come from JSDocFunctionTypes.
-                    ts.Debug.assert(node.parent.kind === 269 /* JSDocFunctionType */);
-                    var functionType = node.parent;
-                    var index = ts.indexOf(functionType.parameters, node);
-                    return "p" + index;
-                case 279 /* JSDocTypedefTag */:
-                    var parentNode = node.parent && node.parent.parent;
-                    var nameFromParentNode = void 0;
-                    if (parentNode && parentNode.kind === 200 /* VariableStatement */) {
-                        if (parentNode.declarationList.declarations.length > 0) {
-                            var nameIdentifier = parentNode.declarationList.declarations[0].name;
-                            if (nameIdentifier.kind === 69 /* Identifier */) {
-                                nameFromParentNode = nameIdentifier.text;
-                            }
-                        }
-                    }
-                    return nameFromParentNode;
-            }
-        }
-        function getDisplayName(node) {
-            return node.name ? ts.declarationNameToString(node.name) : getDeclarationName(node);
-        }
-        /**
-         * Declares a Symbol for the node and adds it to symbols. Reports errors for conflicting identifier names.
-         * @param symbolTable - The symbol table which node will be added to.
-         * @param parent - node's parent declaration.
-         * @param node - The declaration to be added to the symbol table
-         * @param includes - The SymbolFlags that node has in addition to its declaration type (eg: export, ambient, etc.)
-         * @param excludes - The flags which node cannot be declared alongside in a symbol table. Used to report forbidden declarations.
-         */
-        function declareSymbol(symbolTable, parent, node, includes, excludes) {
-            ts.Debug.assert(!ts.hasDynamicName(node));
-            var isDefaultExport = node.flags & 512 /* Default */;
-            // The exported symbol for an export default function/class node is always named "default"
-            var name = isDefaultExport && parent ? "default" : getDeclarationName(node);
-            var symbol;
-            if (name !== undefined) {
-                // Check and see if the symbol table already has a symbol with this name.  If not,
-                // create a new symbol with this name and add it to the table.  Note that we don't
-                // give the new symbol any flags *yet*.  This ensures that it will not conflict
-                // with the 'excludes' flags we pass in.
-                //
-                // If we do get an existing symbol, see if it conflicts with the new symbol we're
-                // creating.  For example, a 'var' symbol and a 'class' symbol will conflict within
-                // the same symbol table.  If we have a conflict, report the issue on each
-                // declaration we have for this symbol, and then create a new symbol for this
-                // declaration.
-                //
-                // If we created a new symbol, either because we didn't have a symbol with this name
-                // in the symbol table, or we conflicted with an existing symbol, then just add this
-                // node as the sole declaration of the new symbol.
-                //
-                // Otherwise, we'll be merging into a compatible existing symbol (for example when
-                // you have multiple 'vars' with the same name in the same container).  In this case
-                // just add this node into the declarations list of the symbol.
-                symbol = ts.hasProperty(symbolTable, name)
-                    ? symbolTable[name]
-                    : (symbolTable[name] = createSymbol(0 /* None */, name));
-                if (name && (includes & 788448 /* Classifiable */)) {
-                    classifiableNames[name] = name;
-                }
-                if (symbol.flags & excludes) {
-                    if (node.name) {
-                        node.name.parent = node;
-                    }
-                    // Report errors every position with duplicate declaration
-                    // Report errors on previous encountered declarations
-                    var message_1 = symbol.flags & 2 /* BlockScopedVariable */
-                        ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0
-                        : ts.Diagnostics.Duplicate_identifier_0;
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        if (declaration.flags & 512 /* Default */) {
-                            message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
-                        }
-                    });
-                    ts.forEach(symbol.declarations, function (declaration) {
-                        file.bindDiagnostics.push(ts.createDiagnosticForNode(declaration.name || declaration, message_1, getDisplayName(declaration)));
-                    });
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node.name || node, message_1, getDisplayName(node)));
-                    symbol = createSymbol(0 /* None */, name);
-                }
-            }
-            else {
-                symbol = createSymbol(0 /* None */, "__missing");
-            }
-            addDeclarationToSymbol(symbol, node, includes);
-            symbol.parent = parent;
-            return symbol;
-        }
-        function declareModuleMember(node, symbolFlags, symbolExcludes) {
-            var hasExportModifier = ts.getCombinedNodeFlags(node) & 1 /* Export */;
-            if (symbolFlags & 8388608 /* Alias */) {
-                if (node.kind === 238 /* ExportSpecifier */ || (node.kind === 229 /* ImportEqualsDeclaration */ && hasExportModifier)) {
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-            else {
-                // Exported module members are given 2 symbols: A local symbol that is classified with an ExportValue,
-                // ExportType, or ExportContainer flag, and an associated export symbol with all the correct flags set
-                // on it. There are 2 main reasons:
-                //
-                //   1. We treat locals and exports of the same name as mutually exclusive within a container.
-                //      That means the binder will issue a Duplicate Identifier error if you mix locals and exports
-                //      with the same name in the same container.
-                //      TODO: Make this a more specific error and decouple it from the exclusion logic.
-                //   2. When we checkIdentifier in the checker, we set its resolved symbol to the local symbol,
-                //      but return the export symbol (by calling getExportSymbolOfValueSymbolIfExported). That way
-                //      when the emitter comes back to it, it knows not to qualify the name if it was found in a containing scope.
-                // NOTE: Nested ambient modules always should go to to 'locals' table to prevent their automatic merge
-                //       during global merging in the checker. Why? The only case when ambient module is permitted inside another module is module augmentation
-                //       and this case is specially handled. Module augmentations should only be merged with original module definition
-                //       and should never be merged directly with other augmentation, and the latter case would be possible if automatic merge is allowed.
-                if (!ts.isAmbientModule(node) && (hasExportModifier || container.flags & 8192 /* ExportContext */)) {
-                    var exportKind = (symbolFlags & 107455 /* Value */ ? 1048576 /* ExportValue */ : 0) |
-                        (symbolFlags & 793056 /* Type */ ? 2097152 /* ExportType */ : 0) |
-                        (symbolFlags & 1536 /* Namespace */ ? 4194304 /* ExportNamespace */ : 0);
-                    var local = declareSymbol(container.locals, undefined, node, exportKind, symbolExcludes);
-                    local.exportSymbol = declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                    node.localSymbol = local;
-                    return local;
-                }
-                else {
-                    return declareSymbol(container.locals, undefined, node, symbolFlags, symbolExcludes);
-                }
-            }
-        }
-        // All container nodes are kept on a linked list in declaration order. This list is used by
-        // the getLocalNameOfContainer function in the type checker to validate that the local name
-        // used for a container is unique.
-        function bindContainer(node, containerFlags) {
-            // Before we recurse into a node's children, we first save the existing parent, container
-            // and block-container.  Then after we pop out of processing the children, we restore
-            // these saved values.
-            var saveContainer = container;
-            var savedBlockScopeContainer = blockScopeContainer;
-            // Depending on what kind of node this is, we may have to adjust the current container
-            // and block-container.   If the current node is a container, then it is automatically
-            // considered the current block-container as well.  Also, for containers that we know
-            // may contain locals, we proactively initialize the .locals field. We do this because
-            // it's highly likely that the .locals will be needed to place some child in (for example,
-            // a parameter, or variable declaration).
-            //
-            // However, we do not proactively create the .locals for block-containers because it's
-            // totally normal and common for block-containers to never actually have a block-scoped
-            // variable in them.  We don't want to end up allocating an object for every 'block' we
-            // run into when most of them won't be necessary.
-            //
-            // Finally, if this is a block-container, then we clear out any existing .locals object
-            // it may contain within it.  This happens in incremental scenarios.  Because we can be
-            // reusing a node from a previous compilation, that node may have had 'locals' created
-            // for it.  We must clear this so we don't accidentally move any stale data forward from
-            // a previous compilation.
-            if (containerFlags & 1 /* IsContainer */) {
-                container = blockScopeContainer = node;
-                if (containerFlags & 32 /* HasLocals */) {
-                    container.locals = {};
-                }
-                addToContainerChain(container);
-            }
-            else if (containerFlags & 2 /* IsBlockScopedContainer */) {
-                blockScopeContainer = node;
-                blockScopeContainer.locals = undefined;
-            }
-            if (containerFlags & 4 /* IsControlFlowContainer */) {
-                var saveCurrentFlow = currentFlow;
-                var saveBreakTarget = currentBreakTarget;
-                var saveContinueTarget = currentContinueTarget;
-                var saveReturnTarget = currentReturnTarget;
-                var saveActiveLabels = activeLabels;
-                var saveHasExplicitReturn = hasExplicitReturn;
-                var isIIFE = containerFlags & 16 /* IsFunctionExpression */ && !!ts.getImmediatelyInvokedFunctionExpression(node);
-                // An IIFE is considered part of the containing control flow. Return statements behave
-                // similarly to break statements that exit to a label just past the statement body.
-                if (isIIFE) {
-                    currentReturnTarget = createBranchLabel();
-                }
-                else {
-                    currentFlow = { flags: 2 /* Start */ };
-                    if (containerFlags & 16 /* IsFunctionExpression */) {
-                        currentFlow.container = node;
-                    }
-                    currentReturnTarget = undefined;
-                }
-                currentBreakTarget = undefined;
-                currentContinueTarget = undefined;
-                activeLabels = undefined;
-                hasExplicitReturn = false;
-                bindChildren(node);
-                // Reset all reachability check related flags on node (for incremental scenarios)
-                // Reset all emit helper flags on node (for incremental scenarios)
-                node.flags &= ~4030464 /* ReachabilityAndEmitFlags */;
-                if (!(currentFlow.flags & 1 /* Unreachable */) && containerFlags & 8 /* IsFunctionLike */ && ts.nodeIsPresent(node.body)) {
-                    node.flags |= 32768 /* HasImplicitReturn */;
-                    if (hasExplicitReturn)
-                        node.flags |= 65536 /* HasExplicitReturn */;
-                }
-                if (node.kind === 256 /* SourceFile */) {
-                    node.flags |= emitFlags;
-                }
-                if (isIIFE) {
-                    addAntecedent(currentReturnTarget, currentFlow);
-                    currentFlow = finishFlowLabel(currentReturnTarget);
-                }
-                else {
-                    currentFlow = saveCurrentFlow;
-                }
-                currentBreakTarget = saveBreakTarget;
-                currentContinueTarget = saveContinueTarget;
-                currentReturnTarget = saveReturnTarget;
-                activeLabels = saveActiveLabels;
-                hasExplicitReturn = saveHasExplicitReturn;
-            }
-            else if (containerFlags & 64 /* IsInterface */) {
-                seenThisKeyword = false;
-                bindChildren(node);
-                node.flags = seenThisKeyword ? node.flags | 16384 /* ContainsThis */ : node.flags & ~16384 /* ContainsThis */;
-            }
-            else {
-                bindChildren(node);
-            }
-            container = saveContainer;
-            blockScopeContainer = savedBlockScopeContainer;
-        }
-        function bindChildren(node) {
-            // Binding of JsDocComment should be done before the current block scope container changes.
-            // because the scope of JsDocComment should not be affected by whether the current node is a
-            // container or not.
-            if (ts.isInJavaScriptFile(node) && node.jsDocComments) {
-                for (var _i = 0, _a = node.jsDocComments; _i < _a.length; _i++) {
-                    var jsDocComment = _a[_i];
-                    bind(jsDocComment);
-                }
-            }
-            if (checkUnreachable(node)) {
-                ts.forEachChild(node, bind);
-                return;
-            }
-            switch (node.kind) {
-                case 205 /* WhileStatement */:
-                    bindWhileStatement(node);
-                    break;
-                case 204 /* DoStatement */:
-                    bindDoStatement(node);
-                    break;
-                case 206 /* ForStatement */:
-                    bindForStatement(node);
-                    break;
-                case 207 /* ForInStatement */:
-                case 208 /* ForOfStatement */:
-                    bindForInOrForOfStatement(node);
-                    break;
-                case 203 /* IfStatement */:
-                    bindIfStatement(node);
-                    break;
-                case 211 /* ReturnStatement */:
-                case 215 /* ThrowStatement */:
-                    bindReturnOrThrow(node);
-                    break;
-                case 210 /* BreakStatement */:
-                case 209 /* ContinueStatement */:
-                    bindBreakOrContinueStatement(node);
-                    break;
-                case 216 /* TryStatement */:
-                    bindTryStatement(node);
-                    break;
-                case 213 /* SwitchStatement */:
-                    bindSwitchStatement(node);
-                    break;
-                case 227 /* CaseBlock */:
-                    bindCaseBlock(node);
-                    break;
-                case 249 /* CaseClause */:
-                    bindCaseClause(node);
-                    break;
-                case 214 /* LabeledStatement */:
-                    bindLabeledStatement(node);
-                    break;
-                case 185 /* PrefixUnaryExpression */:
-                    bindPrefixUnaryExpressionFlow(node);
-                    break;
-                case 187 /* BinaryExpression */:
-                    bindBinaryExpressionFlow(node);
-                    break;
-                case 181 /* DeleteExpression */:
-                    bindDeleteExpressionFlow(node);
-                    break;
-                case 188 /* ConditionalExpression */:
-                    bindConditionalExpressionFlow(node);
-                    break;
-                case 218 /* VariableDeclaration */:
-                    bindVariableDeclarationFlow(node);
-                    break;
-                case 174 /* CallExpression */:
-                    bindCallExpressionFlow(node);
-                    break;
-                default:
-                    ts.forEachChild(node, bind);
-                    break;
-            }
-        }
-        function isNarrowingExpression(expr) {
-            switch (expr.kind) {
-                case 69 /* Identifier */:
-                case 97 /* ThisKeyword */:
-                case 172 /* PropertyAccessExpression */:
-                    return isNarrowableReference(expr);
-                case 174 /* CallExpression */:
-                    return hasNarrowableArgument(expr);
-                case 178 /* ParenthesizedExpression */:
-                    return isNarrowingExpression(expr.expression);
-                case 187 /* BinaryExpression */:
-                    return isNarrowingBinaryExpression(expr);
-                case 185 /* PrefixUnaryExpression */:
-                    return expr.operator === 49 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-            }
-            return false;
-        }
-        function isNarrowableReference(expr) {
-            return expr.kind === 69 /* Identifier */ ||
-                expr.kind === 97 /* ThisKeyword */ ||
-                expr.kind === 172 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
-        }
-        function hasNarrowableArgument(expr) {
-            if (expr.arguments) {
-                for (var _i = 0, _a = expr.arguments; _i < _a.length; _i++) {
-                    var argument = _a[_i];
-                    if (isNarrowableReference(argument)) {
-                        return true;
-                    }
-                }
-            }
-            if (expr.expression.kind === 172 /* PropertyAccessExpression */ &&
-                isNarrowableReference(expr.expression.expression)) {
-                return true;
-            }
-            return false;
-        }
-        function isNarrowingNullCheckOperands(expr1, expr2) {
-            return (expr1.kind === 93 /* NullKeyword */ || expr1.kind === 69 /* Identifier */ && expr1.text === "undefined") && isNarrowableOperand(expr2);
-        }
-        function isNarrowingTypeofOperands(expr1, expr2) {
-            return expr1.kind === 182 /* TypeOfExpression */ && isNarrowableOperand(expr1.expression) && expr2.kind === 9 /* StringLiteral */;
-        }
-        function isNarrowingDiscriminant(expr) {
-            return expr.kind === 172 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
-        }
-        function isNarrowingBinaryExpression(expr) {
-            switch (expr.operatorToken.kind) {
-                case 56 /* EqualsToken */:
-                    return isNarrowableReference(expr.left);
-                case 30 /* EqualsEqualsToken */:
-                case 31 /* ExclamationEqualsToken */:
-                case 32 /* EqualsEqualsEqualsToken */:
-                case 33 /* ExclamationEqualsEqualsToken */:
-                    return isNarrowingNullCheckOperands(expr.right, expr.left) || isNarrowingNullCheckOperands(expr.left, expr.right) ||
-                        isNarrowingTypeofOperands(expr.right, expr.left) || isNarrowingTypeofOperands(expr.left, expr.right) ||
-                        isNarrowingDiscriminant(expr.left) || isNarrowingDiscriminant(expr.right);
-                case 91 /* InstanceOfKeyword */:
-                    return isNarrowableOperand(expr.left);
-                case 24 /* CommaToken */:
-                    return isNarrowingExpression(expr.right);
-            }
-            return false;
-        }
-        function isNarrowableOperand(expr) {
-            switch (expr.kind) {
-                case 178 /* ParenthesizedExpression */:
-                    return isNarrowableOperand(expr.expression);
-                case 187 /* BinaryExpression */:
-                    switch (expr.operatorToken.kind) {
-                        case 56 /* EqualsToken */:
-                            return isNarrowableOperand(expr.left);
-                        case 24 /* CommaToken */:
-                            return isNarrowableOperand(expr.right);
-                    }
-            }
-            return isNarrowableReference(expr);
-        }
-        function isNarrowingSwitchStatement(switchStatement) {
-            var expr = switchStatement.expression;
-            return expr.kind === 172 /* PropertyAccessExpression */ && isNarrowableReference(expr.expression);
-        }
-        function createBranchLabel() {
-            return {
-                flags: 4 /* BranchLabel */,
-                antecedents: undefined
-            };
-        }
-        function createLoopLabel() {
-            return {
-                flags: 8 /* LoopLabel */,
-                antecedents: undefined
-            };
-        }
-        function setFlowNodeReferenced(flow) {
-            // On first reference we set the Referenced flag, thereafter we set the Shared flag
-            flow.flags |= flow.flags & 256 /* Referenced */ ? 512 /* Shared */ : 256 /* Referenced */;
-        }
-        function addAntecedent(label, antecedent) {
-            if (!(antecedent.flags & 1 /* Unreachable */) && !ts.contains(label.antecedents, antecedent)) {
-                (label.antecedents || (label.antecedents = [])).push(antecedent);
-                setFlowNodeReferenced(antecedent);
-            }
-        }
-        function createFlowCondition(flags, antecedent, expression) {
-            if (antecedent.flags & 1 /* Unreachable */) {
-                return antecedent;
-            }
-            if (!expression) {
-                return flags & 32 /* TrueCondition */ ? antecedent : unreachableFlow;
-            }
-            if (expression.kind === 99 /* TrueKeyword */ && flags & 64 /* FalseCondition */ ||
-                expression.kind === 84 /* FalseKeyword */ && flags & 32 /* TrueCondition */) {
-                return unreachableFlow;
-            }
-            if (!isNarrowingExpression(expression)) {
-                return antecedent;
-            }
-            setFlowNodeReferenced(antecedent);
-            return {
-                flags: flags,
-                expression: expression,
-                antecedent: antecedent
-            };
-        }
-        function createFlowSwitchClause(antecedent, switchStatement, clauseStart, clauseEnd) {
-            if (!isNarrowingSwitchStatement(switchStatement)) {
-                return antecedent;
-            }
-            setFlowNodeReferenced(antecedent);
-            return {
-                flags: 128 /* SwitchClause */,
-                switchStatement: switchStatement,
-                clauseStart: clauseStart,
-                clauseEnd: clauseEnd,
-                antecedent: antecedent
-            };
-        }
-        function createFlowAssignment(antecedent, node) {
-            setFlowNodeReferenced(antecedent);
-            return {
-                flags: 16 /* Assignment */,
-                antecedent: antecedent,
-                node: node
-            };
-        }
-        function finishFlowLabel(flow) {
-            var antecedents = flow.antecedents;
-            if (!antecedents) {
-                return unreachableFlow;
-            }
-            if (antecedents.length === 1) {
-                return antecedents[0];
-            }
-            return flow;
-        }
-        function isStatementCondition(node) {
-            var parent = node.parent;
-            switch (parent.kind) {
-                case 203 /* IfStatement */:
-                case 205 /* WhileStatement */:
-                case 204 /* DoStatement */:
-                    return parent.expression === node;
-                case 206 /* ForStatement */:
-                case 188 /* ConditionalExpression */:
-                    return parent.condition === node;
-            }
-            return false;
-        }
-        function isLogicalExpression(node) {
-            while (true) {
-                if (node.kind === 178 /* ParenthesizedExpression */) {
-                    node = node.expression;
-                }
-                else if (node.kind === 185 /* PrefixUnaryExpression */ && node.operator === 49 /* ExclamationToken */) {
-                    node = node.operand;
-                }
-                else {
-                    return node.kind === 187 /* BinaryExpression */ && (node.operatorToken.kind === 51 /* AmpersandAmpersandToken */ ||
-                        node.operatorToken.kind === 52 /* BarBarToken */);
-                }
-            }
-        }
-        function isTopLevelLogicalExpression(node) {
-            while (node.parent.kind === 178 /* ParenthesizedExpression */ ||
-                node.parent.kind === 185 /* PrefixUnaryExpression */ &&
-                    node.parent.operator === 49 /* ExclamationToken */) {
-                node = node.parent;
-            }
-            return !isStatementCondition(node) && !isLogicalExpression(node.parent);
-        }
-        function bindCondition(node, trueTarget, falseTarget) {
-            var saveTrueTarget = currentTrueTarget;
-            var saveFalseTarget = currentFalseTarget;
-            currentTrueTarget = trueTarget;
-            currentFalseTarget = falseTarget;
-            bind(node);
-            currentTrueTarget = saveTrueTarget;
-            currentFalseTarget = saveFalseTarget;
-            if (!node || !isLogicalExpression(node)) {
-                addAntecedent(trueTarget, createFlowCondition(32 /* TrueCondition */, currentFlow, node));
-                addAntecedent(falseTarget, createFlowCondition(64 /* FalseCondition */, currentFlow, node));
-            }
-        }
-        function bindIterativeStatement(node, breakTarget, continueTarget) {
-            var saveBreakTarget = currentBreakTarget;
-            var saveContinueTarget = currentContinueTarget;
-            currentBreakTarget = breakTarget;
-            currentContinueTarget = continueTarget;
-            bind(node);
-            currentBreakTarget = saveBreakTarget;
-            currentContinueTarget = saveContinueTarget;
-        }
-        function bindWhileStatement(node) {
-            var preWhileLabel = createLoopLabel();
-            var preBodyLabel = createBranchLabel();
-            var postWhileLabel = createBranchLabel();
-            addAntecedent(preWhileLabel, currentFlow);
-            currentFlow = preWhileLabel;
-            bindCondition(node.expression, preBodyLabel, postWhileLabel);
-            currentFlow = finishFlowLabel(preBodyLabel);
-            bindIterativeStatement(node.statement, postWhileLabel, preWhileLabel);
-            addAntecedent(preWhileLabel, currentFlow);
-            currentFlow = finishFlowLabel(postWhileLabel);
-        }
-        function bindDoStatement(node) {
-            var preDoLabel = createLoopLabel();
-            var preConditionLabel = createBranchLabel();
-            var postDoLabel = createBranchLabel();
-            addAntecedent(preDoLabel, currentFlow);
-            currentFlow = preDoLabel;
-            bindIterativeStatement(node.statement, postDoLabel, preConditionLabel);
-            addAntecedent(preConditionLabel, currentFlow);
-            currentFlow = finishFlowLabel(preConditionLabel);
-            bindCondition(node.expression, preDoLabel, postDoLabel);
-            currentFlow = finishFlowLabel(postDoLabel);
-        }
-        function bindForStatement(node) {
-            var preLoopLabel = createLoopLabel();
-            var preBodyLabel = createBranchLabel();
-            var postLoopLabel = createBranchLabel();
-            bind(node.initializer);
-            addAntecedent(preLoopLabel, currentFlow);
-            currentFlow = preLoopLabel;
-            bindCondition(node.condition, preBodyLabel, postLoopLabel);
-            currentFlow = finishFlowLabel(preBodyLabel);
-            bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
-            bind(node.incrementor);
-            addAntecedent(preLoopLabel, currentFlow);
-            currentFlow = finishFlowLabel(postLoopLabel);
-        }
-        function bindForInOrForOfStatement(node) {
-            var preLoopLabel = createLoopLabel();
-            var postLoopLabel = createBranchLabel();
-            addAntecedent(preLoopLabel, currentFlow);
-            currentFlow = preLoopLabel;
-            bind(node.expression);
-            addAntecedent(postLoopLabel, currentFlow);
-            bind(node.initializer);
-            if (node.initializer.kind !== 219 /* VariableDeclarationList */) {
-                bindAssignmentTargetFlow(node.initializer);
-            }
-            bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
-            addAntecedent(preLoopLabel, currentFlow);
-            currentFlow = finishFlowLabel(postLoopLabel);
-        }
-        function bindIfStatement(node) {
-            var thenLabel = createBranchLabel();
-            var elseLabel = createBranchLabel();
-            var postIfLabel = createBranchLabel();
-            bindCondition(node.expression, thenLabel, elseLabel);
-            currentFlow = finishFlowLabel(thenLabel);
-            bind(node.thenStatement);
-            addAntecedent(postIfLabel, currentFlow);
-            currentFlow = finishFlowLabel(elseLabel);
-            bind(node.elseStatement);
-            addAntecedent(postIfLabel, currentFlow);
-            currentFlow = finishFlowLabel(postIfLabel);
-        }
-        function bindReturnOrThrow(node) {
-            bind(node.expression);
-            if (node.kind === 211 /* ReturnStatement */) {
-                hasExplicitReturn = true;
-                if (currentReturnTarget) {
-                    addAntecedent(currentReturnTarget, currentFlow);
-                }
-            }
-            currentFlow = unreachableFlow;
-        }
-        function findActiveLabel(name) {
-            if (activeLabels) {
-                for (var _i = 0, activeLabels_1 = activeLabels; _i < activeLabels_1.length; _i++) {
-                    var label = activeLabels_1[_i];
-                    if (label.name === name) {
-                        return label;
-                    }
-                }
-            }
-            return undefined;
-        }
-        function bindbreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 210 /* BreakStatement */ ? breakTarget : continueTarget;
-            if (flowLabel) {
-                addAntecedent(flowLabel, currentFlow);
-                currentFlow = unreachableFlow;
-            }
-        }
-        function bindBreakOrContinueStatement(node) {
-            bind(node.label);
-            if (node.label) {
-                var activeLabel = findActiveLabel(node.label.text);
-                if (activeLabel) {
-                    activeLabel.referenced = true;
-                    bindbreakOrContinueFlow(node, activeLabel.breakTarget, activeLabel.continueTarget);
-                }
-            }
-            else {
-                bindbreakOrContinueFlow(node, currentBreakTarget, currentContinueTarget);
-            }
-        }
-        function bindTryStatement(node) {
-            var postFinallyLabel = createBranchLabel();
-            var preTryFlow = currentFlow;
-            // TODO: Every statement in try block is potentially an exit point!
-            bind(node.tryBlock);
-            addAntecedent(postFinallyLabel, currentFlow);
-            if (node.catchClause) {
-                currentFlow = preTryFlow;
-                bind(node.catchClause);
-                addAntecedent(postFinallyLabel, currentFlow);
-            }
-            if (node.finallyBlock) {
-                currentFlow = preTryFlow;
-                bind(node.finallyBlock);
-            }
-            currentFlow = finishFlowLabel(postFinallyLabel);
-        }
-        function bindSwitchStatement(node) {
-            var postSwitchLabel = createBranchLabel();
-            bind(node.expression);
-            var saveBreakTarget = currentBreakTarget;
-            var savePreSwitchCaseFlow = preSwitchCaseFlow;
-            currentBreakTarget = postSwitchLabel;
-            preSwitchCaseFlow = currentFlow;
-            bind(node.caseBlock);
-            addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 250 /* DefaultClause */; });
-            // We mark a switch statement as possibly exhaustive if it has no default clause and if all
-            // case clauses have unreachable end points (e.g. they all return).
-            node.possiblyExhaustive = !hasDefault && !postSwitchLabel.antecedents;
-            if (!hasDefault) {
-                addAntecedent(postSwitchLabel, createFlowSwitchClause(preSwitchCaseFlow, node, 0, 0));
-            }
-            currentBreakTarget = saveBreakTarget;
-            preSwitchCaseFlow = savePreSwitchCaseFlow;
-            currentFlow = finishFlowLabel(postSwitchLabel);
-        }
-        function bindCaseBlock(node) {
-            var clauses = node.clauses;
-            var fallthroughFlow = unreachableFlow;
-            for (var i = 0; i < clauses.length; i++) {
-                var clauseStart = i;
-                while (!clauses[i].statements.length && i + 1 < clauses.length) {
-                    bind(clauses[i]);
-                    i++;
-                }
-                var preCaseLabel = createBranchLabel();
-                addAntecedent(preCaseLabel, createFlowSwitchClause(preSwitchCaseFlow, node.parent, clauseStart, i + 1));
-                addAntecedent(preCaseLabel, fallthroughFlow);
-                currentFlow = finishFlowLabel(preCaseLabel);
-                var clause = clauses[i];
-                bind(clause);
-                fallthroughFlow = currentFlow;
-                if (!(currentFlow.flags & 1 /* Unreachable */) && i !== clauses.length - 1 && options.noFallthroughCasesInSwitch) {
-                    errorOnFirstToken(clause, ts.Diagnostics.Fallthrough_case_in_switch);
-                }
-            }
-        }
-        function bindCaseClause(node) {
-            var saveCurrentFlow = currentFlow;
-            currentFlow = preSwitchCaseFlow;
-            bind(node.expression);
-            currentFlow = saveCurrentFlow;
-            ts.forEach(node.statements, bind);
-        }
-        function pushActiveLabel(name, breakTarget, continueTarget) {
-            var activeLabel = {
-                name: name,
-                breakTarget: breakTarget,
-                continueTarget: continueTarget,
-                referenced: false
-            };
-            (activeLabels || (activeLabels = [])).push(activeLabel);
-            return activeLabel;
-        }
-        function popActiveLabel() {
-            activeLabels.pop();
-        }
-        function bindLabeledStatement(node) {
-            var preStatementLabel = createLoopLabel();
-            var postStatementLabel = createBranchLabel();
-            bind(node.label);
-            addAntecedent(preStatementLabel, currentFlow);
-            var activeLabel = pushActiveLabel(node.label.text, postStatementLabel, preStatementLabel);
-            bind(node.statement);
-            popActiveLabel();
-            if (!activeLabel.referenced && !options.allowUnusedLabels) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node.label, ts.Diagnostics.Unused_label));
-            }
-            addAntecedent(postStatementLabel, currentFlow);
-            currentFlow = finishFlowLabel(postStatementLabel);
-        }
-        function bindDestructuringTargetFlow(node) {
-            if (node.kind === 187 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */) {
-                bindAssignmentTargetFlow(node.left);
-            }
-            else {
-                bindAssignmentTargetFlow(node);
-            }
-        }
-        function bindAssignmentTargetFlow(node) {
-            if (isNarrowableReference(node)) {
-                currentFlow = createFlowAssignment(currentFlow, node);
-            }
-            else if (node.kind === 170 /* ArrayLiteralExpression */) {
-                for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
-                    var e = _a[_i];
-                    if (e.kind === 191 /* SpreadElementExpression */) {
-                        bindAssignmentTargetFlow(e.expression);
-                    }
-                    else {
-                        bindDestructuringTargetFlow(e);
-                    }
-                }
-            }
-            else if (node.kind === 171 /* ObjectLiteralExpression */) {
-                for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
-                    var p = _c[_b];
-                    if (p.kind === 253 /* PropertyAssignment */) {
-                        bindDestructuringTargetFlow(p.initializer);
-                    }
-                    else if (p.kind === 254 /* ShorthandPropertyAssignment */) {
-                        bindAssignmentTargetFlow(p.name);
-                    }
-                }
-            }
-        }
-        function bindLogicalExpression(node, trueTarget, falseTarget) {
-            var preRightLabel = createBranchLabel();
-            if (node.operatorToken.kind === 51 /* AmpersandAmpersandToken */) {
-                bindCondition(node.left, preRightLabel, falseTarget);
-            }
-            else {
-                bindCondition(node.left, trueTarget, preRightLabel);
-            }
-            currentFlow = finishFlowLabel(preRightLabel);
-            bind(node.operatorToken);
-            bindCondition(node.right, trueTarget, falseTarget);
-        }
-        function bindPrefixUnaryExpressionFlow(node) {
-            if (node.operator === 49 /* ExclamationToken */) {
-                var saveTrueTarget = currentTrueTarget;
-                currentTrueTarget = currentFalseTarget;
-                currentFalseTarget = saveTrueTarget;
-                ts.forEachChild(node, bind);
-                currentFalseTarget = currentTrueTarget;
-                currentTrueTarget = saveTrueTarget;
-            }
-            else {
-                ts.forEachChild(node, bind);
-            }
-        }
-        function bindBinaryExpressionFlow(node) {
-            var operator = node.operatorToken.kind;
-            if (operator === 51 /* AmpersandAmpersandToken */ || operator === 52 /* BarBarToken */) {
-                if (isTopLevelLogicalExpression(node)) {
-                    var postExpressionLabel = createBranchLabel();
-                    bindLogicalExpression(node, postExpressionLabel, postExpressionLabel);
-                    currentFlow = finishFlowLabel(postExpressionLabel);
-                }
-                else {
-                    bindLogicalExpression(node, currentTrueTarget, currentFalseTarget);
-                }
-            }
-            else {
-                ts.forEachChild(node, bind);
-                if (operator === 56 /* EqualsToken */ && !ts.isAssignmentTarget(node)) {
-                    bindAssignmentTargetFlow(node.left);
-                }
-            }
-        }
-        function bindDeleteExpressionFlow(node) {
-            ts.forEachChild(node, bind);
-            if (node.expression.kind === 172 /* PropertyAccessExpression */) {
-                bindAssignmentTargetFlow(node.expression);
-            }
-        }
-        function bindConditionalExpressionFlow(node) {
-            var trueLabel = createBranchLabel();
-            var falseLabel = createBranchLabel();
-            var postExpressionLabel = createBranchLabel();
-            bindCondition(node.condition, trueLabel, falseLabel);
-            currentFlow = finishFlowLabel(trueLabel);
-            bind(node.whenTrue);
-            addAntecedent(postExpressionLabel, currentFlow);
-            currentFlow = finishFlowLabel(falseLabel);
-            bind(node.whenFalse);
-            addAntecedent(postExpressionLabel, currentFlow);
-            currentFlow = finishFlowLabel(postExpressionLabel);
-        }
-        function bindInitializedVariableFlow(node) {
-            var name = node.name;
-            if (ts.isBindingPattern(name)) {
-                for (var _i = 0, _a = name.elements; _i < _a.length; _i++) {
-                    var child = _a[_i];
-                    bindInitializedVariableFlow(child);
-                }
-            }
-            else {
-                currentFlow = createFlowAssignment(currentFlow, node);
-            }
-        }
-        function bindVariableDeclarationFlow(node) {
-            ts.forEachChild(node, bind);
-            if (node.initializer || node.parent.parent.kind === 207 /* ForInStatement */ || node.parent.parent.kind === 208 /* ForOfStatement */) {
-                bindInitializedVariableFlow(node);
-            }
-        }
-        function bindCallExpressionFlow(node) {
-            // If the target of the call expression is a function expression or arrow function we have
-            // an immediately invoked function expression (IIFE). Initialize the flowNode property to
-            // the current control flow (which includes evaluation of the IIFE arguments).
-            var expr = node.expression;
-            while (expr.kind === 178 /* ParenthesizedExpression */) {
-                expr = expr.expression;
-            }
-            if (expr.kind === 179 /* FunctionExpression */ || expr.kind === 180 /* ArrowFunction */) {
-                ts.forEach(node.typeArguments, bind);
-                ts.forEach(node.arguments, bind);
-                bind(node.expression);
-            }
-            else {
-                ts.forEachChild(node, bind);
-            }
-        }
-        function getContainerFlags(node) {
-            switch (node.kind) {
-                case 192 /* ClassExpression */:
-                case 221 /* ClassDeclaration */:
-                case 224 /* EnumDeclaration */:
-                case 171 /* ObjectLiteralExpression */:
-                case 159 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
-                    return 1 /* IsContainer */;
-                case 222 /* InterfaceDeclaration */:
-                    return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 269 /* JSDocFunctionType */:
-                case 225 /* ModuleDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                    return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 256 /* SourceFile */:
-                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 148 /* Constructor */:
-                case 220 /* FunctionDeclaration */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                case 153 /* IndexSignature */:
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 226 /* ModuleBlock */:
-                    return 4 /* IsControlFlowContainer */;
-                case 145 /* PropertyDeclaration */:
-                    return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 252 /* CatchClause */:
-                case 206 /* ForStatement */:
-                case 207 /* ForInStatement */:
-                case 208 /* ForOfStatement */:
-                case 227 /* CaseBlock */:
-                    return 2 /* IsBlockScopedContainer */;
-                case 199 /* Block */:
-                    // do not treat blocks directly inside a function as a block-scoped-container.
-                    // Locals that reside in this block should go to the function locals. Otherwise 'x'
-                    // would not appear to be a redeclaration of a block scoped local in the following
-                    // example:
-                    //
-                    //      function foo() {
-                    //          var x;
-                    //          let x;
-                    //      }
-                    //
-                    // If we placed 'var x' into the function locals and 'let x' into the locals of
-                    // the block, then there would be no collision.
-                    //
-                    // By not creating a new block-scoped-container here, we ensure that both 'var x'
-                    // and 'let x' go into the Function-container's locals, and we do get a collision
-                    // conflict.
-                    return ts.isFunctionLike(node.parent) ? 0 /* None */ : 2 /* IsBlockScopedContainer */;
-            }
-            return 0 /* None */;
-        }
-        function addToContainerChain(next) {
-            if (lastContainer) {
-                lastContainer.nextContainer = next;
-            }
-            lastContainer = next;
-        }
-        function declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes) {
-            // Just call this directly so that the return type of this function stays "void".
-            return declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes);
-        }
-        function declareSymbolAndAddToSymbolTableWorker(node, symbolFlags, symbolExcludes) {
-            switch (container.kind) {
-                // Modules, source files, and classes need specialized handling for how their
-                // members are declared (for example, a member of a class will go into a specific
-                // symbol table depending on if it is static or not). We defer to specialized
-                // handlers to take care of declaring these child members.
-                case 225 /* ModuleDeclaration */:
-                    return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 256 /* SourceFile */:
-                    return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 192 /* ClassExpression */:
-                case 221 /* ClassDeclaration */:
-                    return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 224 /* EnumDeclaration */:
-                    return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 159 /* TypeLiteral */:
-                case 171 /* ObjectLiteralExpression */:
-                case 222 /* InterfaceDeclaration */:
-                case 265 /* JSDocRecordType */:
-                case 281 /* JSDocTypeLiteral */:
-                    // Interface/Object-types always have their children added to the 'members' of
-                    // their container. They are only accessible through an instance of their
-                    // container, and are never in scope otherwise (even inside the body of the
-                    // object / type / interface declaring them). An exception is type parameters,
-                    // which are in scope without qualification (similar to 'locals').
-                    return declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                case 153 /* IndexSignature */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 148 /* Constructor */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                case 269 /* JSDocFunctionType */:
-                case 223 /* TypeAliasDeclaration */:
-                    // All the children of these container types are never visible through another
-                    // symbol (i.e. through another symbol's 'exports' or 'members').  Instead,
-                    // they're only accessed 'lexically' (i.e. from code that exists underneath
-                    // their container in the tree.  To accomplish this, we simply add their declared
-                    // symbol to the 'locals' of the container.  These symbols can then be found as
-                    // the type checker walks up the containers, checking them for matching names.
-                    return declareSymbol(container.locals, /*parent*/ undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function declareClassMember(node, symbolFlags, symbolExcludes) {
-            return node.flags & 32 /* Static */
-                ? declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes)
-                : declareSymbol(container.symbol.members, container.symbol, node, symbolFlags, symbolExcludes);
-        }
-        function declareSourceFileMember(node, symbolFlags, symbolExcludes) {
-            return ts.isExternalModule(file)
-                ? declareModuleMember(node, symbolFlags, symbolExcludes)
-                : declareSymbol(file.locals, undefined, node, symbolFlags, symbolExcludes);
-        }
-        function hasExportDeclarations(node) {
-            var body = node.kind === 256 /* SourceFile */ ? node : node.body;
-            if (body && (body.kind === 256 /* SourceFile */ || body.kind === 226 /* ModuleBlock */)) {
-                for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                    var stat = _a[_i];
-                    if (stat.kind === 236 /* ExportDeclaration */ || stat.kind === 235 /* ExportAssignment */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function setExportContextFlag(node) {
-            // A declaration source file or ambient module declaration that contains no export declarations (but possibly regular
-            // declarations with export modifiers) is an export context in which declarations are implicitly exported.
-            if (ts.isInAmbientContext(node) && !hasExportDeclarations(node)) {
-                node.flags |= 8192 /* ExportContext */;
-            }
-            else {
-                node.flags &= ~8192 /* ExportContext */;
-            }
-        }
-        function bindModuleDeclaration(node) {
-            setExportContextFlag(node);
-            if (ts.isAmbientModule(node)) {
-                if (node.flags & 1 /* Export */) {
-                    errorOnFirstToken(node, ts.Diagnostics.export_modifier_cannot_be_applied_to_ambient_modules_and_module_augmentations_since_they_are_always_visible);
-                }
-                if (ts.isExternalModuleAugmentation(node)) {
-                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
-                }
-                else {
-                    var pattern = void 0;
-                    if (node.name.kind === 9 /* StringLiteral */) {
-                        var text = node.name.text;
-                        if (ts.hasZeroOrOneAsteriskCharacter(text)) {
-                            pattern = ts.tryParsePattern(text);
-                        }
-                        else {
-                            errorOnFirstToken(node.name, ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, text);
-                        }
-                    }
-                    var symbol = declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-                    if (pattern) {
-                        (file.patternAmbientModules || (file.patternAmbientModules = [])).push({ pattern: pattern, symbol: symbol });
-                    }
-                }
-            }
-            else {
-                var state = getModuleInstanceState(node);
-                if (state === 0 /* NonInstantiated */) {
-                    declareSymbolAndAddToSymbolTable(node, 1024 /* NamespaceModule */, 0 /* NamespaceModuleExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 512 /* ValueModule */, 106639 /* ValueModuleExcludes */);
-                    if (node.symbol.flags & (16 /* Function */ | 32 /* Class */ | 256 /* RegularEnum */)) {
-                        // if module was already merged with some function, class or non-const enum
-                        // treat is a non-const-enum-only
-                        node.symbol.constEnumOnlyModule = false;
-                    }
-                    else {
-                        var currentModuleIsConstEnumOnly = state === 2 /* ConstEnumOnly */;
-                        if (node.symbol.constEnumOnlyModule === undefined) {
-                            // non-merged case - use the current state
-                            node.symbol.constEnumOnlyModule = currentModuleIsConstEnumOnly;
-                        }
-                        else {
-                            // merged case: module is const enum only if all its pieces are non-instantiated or const enum
-                            node.symbol.constEnumOnlyModule = node.symbol.constEnumOnlyModule && currentModuleIsConstEnumOnly;
-                        }
-                    }
-                }
-            }
-        }
-        function bindFunctionOrConstructorType(node) {
-            // For a given function symbol "<...>(...) => T" we want to generate a symbol identical
-            // to the one we would get for: { <...>(...): T }
-            //
-            // We do that by making an anonymous type literal symbol, and then setting the function
-            // symbol as its sole member. To the rest of the system, this symbol will be  indistinguishable
-            // from an actual type literal symbol you would have gotten had you used the long form.
-            var symbol = createSymbol(131072 /* Signature */, getDeclarationName(node));
-            addDeclarationToSymbol(symbol, node, 131072 /* Signature */);
-            var typeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type");
-            addDeclarationToSymbol(typeLiteralSymbol, node, 2048 /* TypeLiteral */);
-            typeLiteralSymbol.members = (_a = {}, _a[symbol.name] = symbol, _a);
-            var _a;
-        }
-        function bindObjectLiteralExpression(node) {
-            var ElementKind;
-            (function (ElementKind) {
-                ElementKind[ElementKind["Property"] = 1] = "Property";
-                ElementKind[ElementKind["Accessor"] = 2] = "Accessor";
-            })(ElementKind || (ElementKind = {}));
-            if (inStrictMode) {
-                var seen = {};
-                for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (prop.name.kind !== 69 /* Identifier */) {
-                        continue;
-                    }
-                    var identifier = prop.name;
-                    // ECMA-262 11.1.5 Object Initializer
-                    // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
-                    // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
-                    // IsDataDescriptor(propId.descriptor) is true.
-                    //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
-                    //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
-                    //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
-                    // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                    var currentKind = prop.kind === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */ || prop.kind === 147 /* MethodDeclaration */
-                        ? 1 /* Property */
-                        : 2 /* Accessor */;
-                    var existingKind = seen[identifier.text];
-                    if (!existingKind) {
-                        seen[identifier.text] = currentKind;
-                        continue;
-                    }
-                    if (currentKind === 1 /* Property */ && existingKind === 1 /* Property */) {
-                        var span = ts.getErrorSpanForNode(file, identifier);
-                        file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.An_object_literal_cannot_have_multiple_properties_with_the_same_name_in_strict_mode));
-                    }
-                }
-            }
-            return bindAnonymousDeclaration(node, 4096 /* ObjectLiteral */, "__object");
-        }
-        function bindAnonymousDeclaration(node, symbolFlags, name) {
-            var symbol = createSymbol(symbolFlags, name);
-            addDeclarationToSymbol(symbol, node, symbolFlags);
-        }
-        function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
-            switch (blockScopeContainer.kind) {
-                case 225 /* ModuleDeclaration */:
-                    declareModuleMember(node, symbolFlags, symbolExcludes);
-                    break;
-                case 256 /* SourceFile */:
-                    if (ts.isExternalModule(container)) {
-                        declareModuleMember(node, symbolFlags, symbolExcludes);
-                        break;
-                    }
-                // fall through.
-                default:
-                    if (!blockScopeContainer.locals) {
-                        blockScopeContainer.locals = {};
-                        addToContainerChain(blockScopeContainer);
-                    }
-                    declareSymbol(blockScopeContainer.locals, undefined, node, symbolFlags, symbolExcludes);
-            }
-        }
-        function bindBlockScopedVariableDeclaration(node) {
-            bindBlockScopedDeclaration(node, 2 /* BlockScopedVariable */, 107455 /* BlockScopedVariableExcludes */);
-        }
-        // The binder visits every node in the syntax tree so it is a convenient place to perform a single localized
-        // check for reserved words used as identifiers in strict mode code.
-        function checkStrictModeIdentifier(node) {
-            if (inStrictMode &&
-                node.originalKeywordKind >= 106 /* FirstFutureReservedWord */ &&
-                node.originalKeywordKind <= 114 /* LastFutureReservedWord */ &&
-                !ts.isIdentifierName(node) &&
-                !ts.isInAmbientContext(node)) {
-                // Report error only if there are no parse errors in file
-                if (!file.parseDiagnostics.length) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, getStrictModeIdentifierMessage(node), ts.declarationNameToString(node)));
-                }
-            }
-        }
-        function getStrictModeIdentifierMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Identifier_expected_0_is_a_reserved_word_in_strict_mode;
-        }
-        function checkStrictModeBinaryExpression(node) {
-            if (inStrictMode && ts.isLeftHandSideExpression(node.left) && ts.isAssignmentOperator(node.operatorToken.kind)) {
-                // ECMA 262 (Annex C) The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-                // Assignment operator(11.13) or of a PostfixExpression(11.3)
-                checkStrictModeEvalOrArguments(node, node.left);
-            }
-        }
-        function checkStrictModeCatchClause(node) {
-            // It is a SyntaxError if a TryStatement with a Catch occurs within strict code and the Identifier of the
-            // Catch production is eval or arguments
-            if (inStrictMode && node.variableDeclaration) {
-                checkStrictModeEvalOrArguments(node, node.variableDeclaration.name);
-            }
-        }
-        function checkStrictModeDeleteExpression(node) {
-            // Grammar checking
-            if (inStrictMode && node.expression.kind === 69 /* Identifier */) {
-                // When a delete operator occurs within strict mode code, a SyntaxError is thrown if its
-                // UnaryExpression is a direct reference to a variable, function argument, or function name
-                var span = ts.getErrorSpanForNode(file, node.expression);
-                file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, ts.Diagnostics.delete_cannot_be_called_on_an_identifier_in_strict_mode));
-            }
-        }
-        function isEvalOrArgumentsIdentifier(node) {
-            return node.kind === 69 /* Identifier */ &&
-                (node.text === "eval" || node.text === "arguments");
-        }
-        function checkStrictModeEvalOrArguments(contextNode, name) {
-            if (name && name.kind === 69 /* Identifier */) {
-                var identifier = name;
-                if (isEvalOrArgumentsIdentifier(identifier)) {
-                    // We check first if the name is inside class declaration or class expression; if so give explicit message
-                    // otherwise report generic error message.
-                    var span = ts.getErrorSpanForNode(file, name);
-                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, getStrictModeEvalOrArgumentsMessage(contextNode), identifier.text));
-                }
-            }
-        }
-        function getStrictModeEvalOrArgumentsMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Invalid_use_of_0_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Invalid_use_of_0_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Invalid_use_of_0_in_strict_mode;
-        }
-        function checkStrictModeFunctionName(node) {
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a strict mode FunctionDeclaration or FunctionExpression (13.1))
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-        }
-        function getStrictModeBlockScopeFunctionDeclarationMessage(node) {
-            // Provide specialized messages to help the user understand why we think they're in
-            // strict mode.
-            if (ts.getContainingClass(node)) {
-                return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Class_definitions_are_automatically_in_strict_mode;
-            }
-            if (file.externalModuleIndicator) {
-                return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5_Modules_are_automatically_in_strict_mode;
-            }
-            return ts.Diagnostics.Function_declarations_are_not_allowed_inside_blocks_in_strict_mode_when_targeting_ES3_or_ES5;
-        }
-        function checkStrictModeFunctionDeclaration(node) {
-            if (languageVersion < 2 /* ES6 */) {
-                // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 256 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 225 /* ModuleDeclaration */ &&
-                    !ts.isFunctionLike(blockScopeContainer)) {
-                    // We check first if the name is inside class declaration or class expression; if so give explicit message
-                    // otherwise report generic error message.
-                    var errorSpan = ts.getErrorSpanForNode(file, node);
-                    file.bindDiagnostics.push(ts.createFileDiagnostic(file, errorSpan.start, errorSpan.length, getStrictModeBlockScopeFunctionDeclarationMessage(node)));
-                }
-            }
-        }
-        function checkStrictModeNumericLiteral(node) {
-            if (inStrictMode && node.isOctalLiteral) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Octal_literals_are_not_allowed_in_strict_mode));
-            }
-        }
-        function checkStrictModePostfixUnaryExpression(node) {
-            // Grammar checking
-            // The identifier eval or arguments may not appear as the LeftHandSideExpression of an
-            // Assignment operator(11.13) or of a PostfixExpression(11.3) or as the UnaryExpression
-            // operated upon by a Prefix Increment(11.4.4) or a Prefix Decrement(11.4.5) operator.
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.operand);
-            }
-        }
-        function checkStrictModePrefixUnaryExpression(node) {
-            // Grammar checking
-            if (inStrictMode) {
-                if (node.operator === 41 /* PlusPlusToken */ || node.operator === 42 /* MinusMinusToken */) {
-                    checkStrictModeEvalOrArguments(node, node.operand);
-                }
-            }
-        }
-        function checkStrictModeWithStatement(node) {
-            // Grammar checking for withStatement
-            if (inStrictMode) {
-                errorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_strict_mode);
-            }
-        }
-        function errorOnFirstToken(node, message, arg0, arg1, arg2) {
-            var span = ts.getSpanOfTokenAtPosition(file, node.pos);
-            file.bindDiagnostics.push(ts.createFileDiagnostic(file, span.start, span.length, message, arg0, arg1, arg2));
-        }
-        function getDestructuringParameterName(node) {
-            return "__" + ts.indexOf(node.parent.parameters, node);
-        }
-        function bind(node) {
-            if (!node) {
-                return;
-            }
-            node.parent = parent;
-            var saveInStrictMode = inStrictMode;
-            // First we bind declaration nodes to a symbol if possible. We'll both create a symbol
-            // and then potentially add the symbol to an appropriate symbol table. Possible
-            // destination symbol tables are:
-            //
-            //  1) The 'exports' table of the current container's symbol.
-            //  2) The 'members' table of the current container's symbol.
-            //  3) The 'locals' table of the current container.
-            //
-            // However, not all symbols will end up in any of these tables. 'Anonymous' symbols
-            // (like TypeLiterals for example) will not be put in any table.
-            bindWorker(node);
-            // Then we recurse into the children of the node to bind them as well. For certain
-            // symbols we do specialized work when we recurse. For example, we'll keep track of
-            // the current 'container' node when it changes. This helps us know which symbol table
-            // a local should go into for example. Since terminal nodes are known not to have
-            // children, as an optimization we don't process those.
-            if (node.kind > 138 /* LastToken */) {
-                var saveParent = parent;
-                parent = node;
-                var containerFlags = getContainerFlags(node);
-                if (containerFlags === 0 /* None */) {
-                    bindChildren(node);
-                }
-                else {
-                    bindContainer(node, containerFlags);
-                }
-                parent = saveParent;
-            }
-            inStrictMode = saveInStrictMode;
-        }
-        function updateStrictModeStatementList(statements) {
-            if (!inStrictMode) {
-                for (var _i = 0, statements_1 = statements; _i < statements_1.length; _i++) {
-                    var statement = statements_1[_i];
-                    if (!ts.isPrologueDirective(statement)) {
-                        return;
-                    }
-                    if (isUseStrictPrologueDirective(statement)) {
-                        inStrictMode = true;
-                        return;
-                    }
-                }
-            }
-        }
-        /// Should be called only on prologue directives (isPrologueDirective(node) should be true)
-        function isUseStrictPrologueDirective(node) {
-            var nodeText = ts.getTextOfNodeFromSourceText(file.text, node.expression);
-            // Note: the node text must be exactly "use strict" or 'use strict'.  It is not ok for the
-            // string to contain unicode escapes (as per ES5).
-            return nodeText === '"use strict"' || nodeText === "'use strict'";
-        }
-        function bindWorker(node) {
-            switch (node.kind) {
-                /* Strict mode checks */
-                case 69 /* Identifier */:
-                case 97 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 254 /* ShorthandPropertyAssignment */)) {
-                        node.flowNode = currentFlow;
-                    }
-                    return checkStrictModeIdentifier(node);
-                case 172 /* PropertyAccessExpression */:
-                    if (currentFlow && isNarrowableReference(node)) {
-                        node.flowNode = currentFlow;
-                    }
-                    break;
-                case 187 /* BinaryExpression */:
-                    if (ts.isInJavaScriptFile(node)) {
-                        var specialKind = ts.getSpecialPropertyAssignmentKind(node);
-                        switch (specialKind) {
-                            case 1 /* ExportsProperty */:
-                                bindExportsPropertyAssignment(node);
-                                break;
-                            case 2 /* ModuleExports */:
-                                bindModuleExportsAssignment(node);
-                                break;
-                            case 3 /* PrototypeProperty */:
-                                bindPrototypePropertyAssignment(node);
-                                break;
-                            case 4 /* ThisProperty */:
-                                bindThisPropertyAssignment(node);
-                                break;
-                            case 0 /* None */:
-                                // Nothing to do
-                                break;
-                            default:
-                                ts.Debug.fail("Unknown special property assignment kind");
-                        }
-                    }
-                    return checkStrictModeBinaryExpression(node);
-                case 252 /* CatchClause */:
-                    return checkStrictModeCatchClause(node);
-                case 181 /* DeleteExpression */:
-                    return checkStrictModeDeleteExpression(node);
-                case 8 /* NumericLiteral */:
-                    return checkStrictModeNumericLiteral(node);
-                case 186 /* PostfixUnaryExpression */:
-                    return checkStrictModePostfixUnaryExpression(node);
-                case 185 /* PrefixUnaryExpression */:
-                    return checkStrictModePrefixUnaryExpression(node);
-                case 212 /* WithStatement */:
-                    return checkStrictModeWithStatement(node);
-                case 165 /* ThisType */:
-                    seenThisKeyword = true;
-                    return;
-                case 154 /* TypePredicate */:
-                    return checkTypePredicate(node);
-                case 141 /* TypeParameter */:
-                    return declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 530912 /* TypeParameterExcludes */);
-                case 142 /* Parameter */:
-                    return bindParameter(node);
-                case 218 /* VariableDeclaration */:
-                case 169 /* BindingElement */:
-                    return bindVariableDeclarationOrBindingElement(node);
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 266 /* JSDocRecordMember */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
-                case 280 /* JSDocPropertyTag */:
-                    return bindJSDocProperty(node);
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
-                    return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 255 /* EnumMember */:
-                    return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 107455 /* EnumMemberExcludes */);
-                case 247 /* JsxSpreadAttribute */:
-                    emitFlags |= 1073741824 /* HasJsxSpreadAttribute */;
-                    return;
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                case 153 /* IndexSignature */:
-                    return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                    // If this is an ObjectLiteralExpression method, then it sits in the same space
-                    // as other properties in the object literal.  So we use SymbolFlags.PropertyExcludes
-                    // so that it will conflict with any other object literal members with the same
-                    // name.
-                    return bindPropertyOrMethodOrAccessor(node, 8192 /* Method */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), ts.isObjectLiteralMethod(node) ? 0 /* PropertyExcludes */ : 99263 /* MethodExcludes */);
-                case 220 /* FunctionDeclaration */:
-                    return bindFunctionDeclaration(node);
-                case 148 /* Constructor */:
-                    return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 149 /* GetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 41919 /* GetAccessorExcludes */);
-                case 150 /* SetAccessor */:
-                    return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 74687 /* SetAccessorExcludes */);
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                case 269 /* JSDocFunctionType */:
-                    return bindFunctionOrConstructorType(node);
-                case 159 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 265 /* JSDocRecordType */:
-                    return bindAnonymousDeclaration(node, 2048 /* TypeLiteral */, "__type");
-                case 171 /* ObjectLiteralExpression */:
-                    return bindObjectLiteralExpression(node);
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    return bindFunctionExpression(node);
-                case 174 /* CallExpression */:
-                    if (ts.isInJavaScriptFile(node)) {
-                        bindCallExpression(node);
-                    }
-                    break;
-                // Members of classes, interfaces, and modules
-                case 192 /* ClassExpression */:
-                case 221 /* ClassDeclaration */:
-                    // All classes are automatically in strict mode in ES6.
-                    inStrictMode = true;
-                    return bindClassLikeDeclaration(node);
-                case 222 /* InterfaceDeclaration */:
-                    return bindBlockScopedDeclaration(node, 64 /* Interface */, 792960 /* InterfaceExcludes */);
-                case 279 /* JSDocTypedefTag */:
-                case 223 /* TypeAliasDeclaration */:
-                    return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 793056 /* TypeAliasExcludes */);
-                case 224 /* EnumDeclaration */:
-                    return bindEnumDeclaration(node);
-                case 225 /* ModuleDeclaration */:
-                    return bindModuleDeclaration(node);
-                // Imports and exports
-                case 229 /* ImportEqualsDeclaration */:
-                case 232 /* NamespaceImport */:
-                case 234 /* ImportSpecifier */:
-                case 238 /* ExportSpecifier */:
-                    return declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-                case 228 /* NamespaceExportDeclaration */:
-                    return bindNamespaceExportDeclaration(node);
-                case 231 /* ImportClause */:
-                    return bindImportClause(node);
-                case 236 /* ExportDeclaration */:
-                    return bindExportDeclaration(node);
-                case 235 /* ExportAssignment */:
-                    return bindExportAssignment(node);
-                case 256 /* SourceFile */:
-                    updateStrictModeStatementList(node.statements);
-                    return bindSourceFileIfExternalModule();
-                case 199 /* Block */:
-                    if (!ts.isFunctionLike(node.parent)) {
-                        return;
-                    }
-                // Fall through
-                case 226 /* ModuleBlock */:
-                    return updateStrictModeStatementList(node.statements);
-            }
-        }
-        function checkTypePredicate(node) {
-            var parameterName = node.parameterName, type = node.type;
-            if (parameterName && parameterName.kind === 69 /* Identifier */) {
-                checkStrictModeIdentifier(parameterName);
-            }
-            if (parameterName && parameterName.kind === 165 /* ThisType */) {
-                seenThisKeyword = true;
-            }
-            bind(type);
-        }
-        function bindSourceFileIfExternalModule() {
-            setExportContextFlag(file);
-            if (ts.isExternalModule(file)) {
-                bindSourceFileAsExternalModule();
-            }
-        }
-        function bindSourceFileAsExternalModule() {
-            bindAnonymousDeclaration(file, 512 /* ValueModule */, "\"" + ts.removeFileExtension(file.fileName) + "\"");
-        }
-        function bindExportAssignment(node) {
-            var boundExpression = node.kind === 235 /* ExportAssignment */ ? node.expression : node.right;
-            if (!container.symbol || !container.symbol.exports) {
-                // Export assignment in some sort of block construct
-                bindAnonymousDeclaration(node, 8388608 /* Alias */, getDeclarationName(node));
-            }
-            else if (boundExpression.kind === 69 /* Identifier */ && node.kind === 235 /* ExportAssignment */) {
-                // An export default clause with an identifier exports all meanings of that identifier
-                declareSymbol(container.symbol.exports, container.symbol, node, 8388608 /* Alias */, 0 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-            else {
-                // An export default clause with an expression exports a value
-                declareSymbol(container.symbol.exports, container.symbol, node, 4 /* Property */, 0 /* PropertyExcludes */ | 8388608 /* AliasExcludes */);
-            }
-        }
-        function bindNamespaceExportDeclaration(node) {
-            if (node.modifiers && node.modifiers.length) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Modifiers_cannot_appear_here));
-            }
-            if (node.parent.kind !== 256 /* SourceFile */) {
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_at_top_level));
-                return;
-            }
-            else {
-                var parent_6 = node.parent;
-                if (!ts.isExternalModule(parent_6)) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_module_files));
-                    return;
-                }
-                if (!parent_6.isDeclarationFile) {
-                    file.bindDiagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Global_module_exports_may_only_appear_in_declaration_files));
-                    return;
-                }
-            }
-            file.symbol.globalExports = file.symbol.globalExports || {};
-            declareSymbol(file.symbol.globalExports, file.symbol, node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-        }
-        function bindExportDeclaration(node) {
-            if (!container.symbol || !container.symbol.exports) {
-                // Export * in some sort of block construct
-                bindAnonymousDeclaration(node, 1073741824 /* ExportStar */, getDeclarationName(node));
-            }
-            else if (!node.exportClause) {
-                // All export * declarations are collected in an __export symbol
-                declareSymbol(container.symbol.exports, container.symbol, node, 1073741824 /* ExportStar */, 0 /* None */);
-            }
-        }
-        function bindImportClause(node) {
-            if (node.name) {
-                declareSymbolAndAddToSymbolTable(node, 8388608 /* Alias */, 8388608 /* AliasExcludes */);
-            }
-        }
-        function setCommonJsModuleIndicator(node) {
-            if (!file.commonJsModuleIndicator) {
-                file.commonJsModuleIndicator = node;
-                bindSourceFileAsExternalModule();
-            }
-        }
-        function bindExportsPropertyAssignment(node) {
-            // When we create a property via 'exports.foo = bar', the 'exports.foo' property access
-            // expression is the declaration
-            setCommonJsModuleIndicator(node);
-            declareSymbol(file.symbol.exports, file.symbol, node.left, 4 /* Property */ | 7340032 /* Export */, 0 /* None */);
-        }
-        function bindModuleExportsAssignment(node) {
-            // 'module.exports = expr' assignment
-            setCommonJsModuleIndicator(node);
-            declareSymbol(file.symbol.exports, file.symbol, node, 4 /* Property */ | 7340032 /* Export */ | 512 /* ValueModule */, 0 /* None */);
-        }
-        function bindThisPropertyAssignment(node) {
-            // Declare a 'member' in case it turns out the container was an ES5 class or ES6 constructor
-            var assignee;
-            if (container.kind === 220 /* FunctionDeclaration */ || container.kind === 220 /* FunctionDeclaration */) {
-                assignee = container;
-            }
-            else if (container.kind === 148 /* Constructor */) {
-                assignee = container.parent;
-            }
-            else {
-                return;
-            }
-            assignee.symbol.members = assignee.symbol.members || {};
-            // It's acceptable for multiple 'this' assignments of the same identifier to occur
-            declareSymbol(assignee.symbol.members, assignee.symbol, node, 4 /* Property */, 0 /* PropertyExcludes */ & ~4 /* Property */);
-        }
-        function bindPrototypePropertyAssignment(node) {
-            // We saw a node of the form 'x.prototype.y = z'. Declare a 'member' y on x if x was a function.
-            // Look up the function in the local scope, since prototype assignments should
-            // follow the function declaration
-            var leftSideOfAssignment = node.left;
-            var classPrototype = leftSideOfAssignment.expression;
-            var constructorFunction = classPrototype.expression;
-            // Fix up parent pointers since we're going to use these nodes before we bind into them
-            leftSideOfAssignment.parent = node;
-            constructorFunction.parent = classPrototype;
-            classPrototype.parent = leftSideOfAssignment;
-            var funcSymbol = container.locals[constructorFunction.text];
-            if (!funcSymbol || !(funcSymbol.flags & 16 /* Function */ || ts.isDeclarationOfFunctionExpression(funcSymbol))) {
-                return;
-            }
-            // Set up the members collection if it doesn't exist already
-            if (!funcSymbol.members) {
-                funcSymbol.members = {};
-            }
-            // Declare the method/property
-            declareSymbol(funcSymbol.members, funcSymbol, leftSideOfAssignment, 4 /* Property */, 0 /* PropertyExcludes */);
-        }
-        function bindCallExpression(node) {
-            // We're only inspecting call expressions to detect CommonJS modules, so we can skip
-            // this check if we've already seen the module indicator
-            if (!file.commonJsModuleIndicator && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ false)) {
-                setCommonJsModuleIndicator(node);
-            }
-        }
-        function bindClassLikeDeclaration(node) {
-            if (!ts.isDeclarationFile(file) && !ts.isInAmbientContext(node)) {
-                if (ts.getClassExtendsHeritageClauseElement(node) !== undefined) {
-                    emitFlags |= 262144 /* HasClassExtends */;
-                }
-                if (ts.nodeIsDecorated(node)) {
-                    emitFlags |= 524288 /* HasDecorators */;
-                }
-            }
-            if (node.kind === 221 /* ClassDeclaration */) {
-                bindBlockScopedDeclaration(node, 32 /* Class */, 899519 /* ClassExcludes */);
-            }
-            else {
-                var bindingName = node.name ? node.name.text : "__class";
-                bindAnonymousDeclaration(node, 32 /* Class */, bindingName);
-                // Add name of class expression into the map for semantic classifier
-                if (node.name) {
-                    classifiableNames[node.name.text] = node.name.text;
-                }
-            }
-            var symbol = node.symbol;
-            // TypeScript 1.0 spec (April 2014): 8.4
-            // Every class automatically contains a static property member named 'prototype', the
-            // type of which is an instantiation of the class type with type Any supplied as a type
-            // argument for each type parameter. It is an error to explicitly declare a static
-            // property member with the name 'prototype'.
-            //
-            // Note: we check for this here because this class may be merging into a module.  The
-            // module might have an exported variable called 'prototype'.  We can't allow that as
-            // that would clash with the built-in 'prototype' for the class.
-            var prototypeSymbol = createSymbol(4 /* Property */ | 134217728 /* Prototype */, "prototype");
-            if (ts.hasProperty(symbol.exports, prototypeSymbol.name)) {
-                if (node.name) {
-                    node.name.parent = node;
-                }
-                file.bindDiagnostics.push(ts.createDiagnosticForNode(symbol.exports[prototypeSymbol.name].declarations[0], ts.Diagnostics.Duplicate_identifier_0, prototypeSymbol.name));
-            }
-            symbol.exports[prototypeSymbol.name] = prototypeSymbol;
-            prototypeSymbol.parent = symbol;
-        }
-        function bindEnumDeclaration(node) {
-            return ts.isConst(node)
-                ? bindBlockScopedDeclaration(node, 128 /* ConstEnum */, 899967 /* ConstEnumExcludes */)
-                : bindBlockScopedDeclaration(node, 256 /* RegularEnum */, 899327 /* RegularEnumExcludes */);
-        }
-        function bindVariableDeclarationOrBindingElement(node) {
-            if (inStrictMode) {
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (!ts.isBindingPattern(node.name)) {
-                if (ts.isBlockOrCatchScoped(node)) {
-                    bindBlockScopedVariableDeclaration(node);
-                }
-                else if (ts.isParameterDeclaration(node)) {
-                    // It is safe to walk up parent chain to find whether the node is a destructing parameter declaration
-                    // because its parent chain has already been set up, since parents are set before descending into children.
-                    //
-                    // If node is a binding element in parameter declaration, we need to use ParameterExcludes.
-                    // Using ParameterExcludes flag allows the compiler to report an error on duplicate identifiers in Parameter Declaration
-                    // For example:
-                    //      function foo([a,a]) {} // Duplicate Identifier error
-                    //      function bar(a,a) {}   // Duplicate Identifier error, parameter declaration in this case is handled in bindParameter
-                    //                             // which correctly set excluded symbols
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-                }
-                else {
-                    declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107454 /* FunctionScopedVariableExcludes */);
-                }
-            }
-        }
-        function bindParameter(node) {
-            if (!ts.isDeclarationFile(file) &&
-                !ts.isInAmbientContext(node) &&
-                ts.nodeIsDecorated(node)) {
-                emitFlags |= (524288 /* HasDecorators */ | 1048576 /* HasParamDecorators */);
-            }
-            if (inStrictMode) {
-                // It is a SyntaxError if the identifier eval or arguments appears within a FormalParameterList of a
-                // strict mode FunctionLikeDeclaration or FunctionExpression(13.1)
-                checkStrictModeEvalOrArguments(node, node.name);
-            }
-            if (ts.isBindingPattern(node.name)) {
-                bindAnonymousDeclaration(node, 1 /* FunctionScopedVariable */, getDestructuringParameterName(node));
-            }
-            else {
-                declareSymbolAndAddToSymbolTable(node, 1 /* FunctionScopedVariable */, 107455 /* ParameterExcludes */);
-            }
-            // If this is a property-parameter, then also declare the property symbol into the
-            // containing class.
-            if (ts.isParameterPropertyDeclaration(node)) {
-                var classDeclaration = node.parent.parent;
-                declareSymbol(classDeclaration.symbol.members, classDeclaration.symbol, node, 4 /* Property */ | (node.questionToken ? 536870912 /* Optional */ : 0 /* None */), 0 /* PropertyExcludes */);
-            }
-        }
-        function bindFunctionDeclaration(node) {
-            if (!ts.isDeclarationFile(file) && !ts.isInAmbientContext(node)) {
-                if (ts.isAsyncFunctionLike(node)) {
-                    emitFlags |= 2097152 /* HasAsyncFunctions */;
-                }
-            }
-            checkStrictModeFunctionName(node);
-            if (inStrictMode) {
-                checkStrictModeFunctionDeclaration(node);
-                bindBlockScopedDeclaration(node, 16 /* Function */, 106927 /* FunctionExcludes */);
-            }
-            else {
-                declareSymbolAndAddToSymbolTable(node, 16 /* Function */, 106927 /* FunctionExcludes */);
-            }
-        }
-        function bindFunctionExpression(node) {
-            if (!ts.isDeclarationFile(file) && !ts.isInAmbientContext(node)) {
-                if (ts.isAsyncFunctionLike(node)) {
-                    emitFlags |= 2097152 /* HasAsyncFunctions */;
-                }
-            }
-            if (currentFlow) {
-                node.flowNode = currentFlow;
-            }
-            checkStrictModeFunctionName(node);
-            var bindingName = node.name ? node.name.text : "__function";
-            return bindAnonymousDeclaration(node, 16 /* Function */, bindingName);
-        }
-        function bindPropertyOrMethodOrAccessor(node, symbolFlags, symbolExcludes) {
-            if (!ts.isDeclarationFile(file) && !ts.isInAmbientContext(node)) {
-                if (ts.isAsyncFunctionLike(node)) {
-                    emitFlags |= 2097152 /* HasAsyncFunctions */;
-                }
-                if (ts.nodeIsDecorated(node)) {
-                    emitFlags |= 524288 /* HasDecorators */;
-                }
-            }
-            return ts.hasDynamicName(node)
-                ? bindAnonymousDeclaration(node, symbolFlags, "__computed")
-                : declareSymbolAndAddToSymbolTable(node, symbolFlags, symbolExcludes);
-        }
-        function bindJSDocProperty(node) {
-            return declareSymbolAndAddToSymbolTable(node, 4 /* Property */, 0 /* PropertyExcludes */);
-        }
-        // reachability checks
-        function shouldReportErrorOnModuleDeclaration(node) {
-            var instanceState = getModuleInstanceState(node);
-            return instanceState === 1 /* Instantiated */ || (instanceState === 2 /* ConstEnumOnly */ && options.preserveConstEnums);
-        }
-        function checkUnreachable(node) {
-            if (!(currentFlow.flags & 1 /* Unreachable */)) {
-                return false;
-            }
-            if (currentFlow === unreachableFlow) {
-                var reportError = 
-                // report error on all statements except empty ones
-                (ts.isStatement(node) && node.kind !== 201 /* EmptyStatement */) ||
-                    // report error on class declarations
-                    node.kind === 221 /* ClassDeclaration */ ||
-                    // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 225 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node)) ||
-                    // report error on regular enums and const enums if preserveConstEnums is set
-                    (node.kind === 224 /* EnumDeclaration */ && (!ts.isConstEnumDeclaration(node) || options.preserveConstEnums));
-                if (reportError) {
-                    currentFlow = reportedUnreachableFlow;
-                    // unreachable code is reported if
-                    // - user has explicitly asked about it AND
-                    // - statement is in not ambient context (statements in ambient context is already an error
-                    //   so we should not report extras) AND
-                    //   - node is not variable statement OR
-                    //   - node is block scoped variable statement OR
-                    //   - node is not block scoped variable statement and at least one variable declaration has initializer
-                    //   Rationale: we don't want to report errors on non-initialized var's since they are hoisted
-                    //   On the other side we do want to report errors on non-initialized 'lets' because of TDZ
-                    var reportUnreachableCode = !options.allowUnreachableCode &&
-                        !ts.isInAmbientContext(node) &&
-                        (node.kind !== 200 /* VariableStatement */ ||
-                            ts.getCombinedNodeFlags(node.declarationList) & 3072 /* BlockScoped */ ||
-                            ts.forEach(node.declarationList.declarations, function (d) { return d.initializer; }));
-                    if (reportUnreachableCode) {
-                        errorOnFirstToken(node, ts.Diagnostics.Unreachable_code_detected);
-                    }
-                }
-            }
-            return true;
-        }
-    }
-})(ts || (ts = {}));
-/// <reference path="binder.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var nextSymbolId = 1;
-    var nextNodeId = 1;
-    var nextMergeId = 1;
-    var nextFlowId = 1;
-    function getNodeId(node) {
-        if (!node.id) {
-            node.id = nextNodeId;
-            nextNodeId++;
-        }
-        return node.id;
-    }
-    ts.getNodeId = getNodeId;
-    ts.checkTime = 0;
-    function getSymbolId(symbol) {
-        if (!symbol.id) {
-            symbol.id = nextSymbolId;
-            nextSymbolId++;
-        }
-        return symbol.id;
-    }
-    ts.getSymbolId = getSymbolId;
-    function createTypeChecker(host, produceDiagnostics) {
-        // Cancellation that controls whether or not we can cancel in the middle of type checking.
-        // In general cancelling is *not* safe for the type checker.  We might be in the middle of
-        // computing something, and we will leave our internals in an inconsistent state.  Callers
-        // who set the cancellation token should catch if a cancellation exception occurs, and
-        // should throw away and create a new TypeChecker.
-        //
-        // Currently we only support setting the cancellation token when getting diagnostics.  This
-        // is because diagnostics can be quite expensive, and we want to allow hosts to bail out if
-        // they no longer need the information (for example, if the user started editing again).
-        var cancellationToken;
-        var Symbol = ts.objectAllocator.getSymbolConstructor();
-        var Type = ts.objectAllocator.getTypeConstructor();
-        var Signature = ts.objectAllocator.getSignatureConstructor();
-        var typeCount = 0;
-        var symbolCount = 0;
-        var emptyArray = [];
-        var emptySymbols = {};
-        var compilerOptions = host.getCompilerOptions();
-        var languageVersion = compilerOptions.target || 0 /* ES3 */;
-        var modulekind = ts.getEmitModuleKind(compilerOptions);
-        var noUnusedIdentifiers = !!compilerOptions.noUnusedLocals || !!compilerOptions.noUnusedParameters;
-        var allowSyntheticDefaultImports = typeof compilerOptions.allowSyntheticDefaultImports !== "undefined" ? compilerOptions.allowSyntheticDefaultImports : modulekind === ts.ModuleKind.System;
-        var strictNullChecks = compilerOptions.strictNullChecks;
-        var emitResolver = createResolver();
-        var undefinedSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "undefined");
-        undefinedSymbol.declarations = [];
-        var argumentsSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "arguments");
-        var checker = {
-            getNodeCount: function () { return ts.sum(host.getSourceFiles(), "nodeCount"); },
-            getIdentifierCount: function () { return ts.sum(host.getSourceFiles(), "identifierCount"); },
-            getSymbolCount: function () { return ts.sum(host.getSourceFiles(), "symbolCount") + symbolCount; },
-            getTypeCount: function () { return typeCount; },
-            isUndefinedSymbol: function (symbol) { return symbol === undefinedSymbol; },
-            isArgumentsSymbol: function (symbol) { return symbol === argumentsSymbol; },
-            isUnknownSymbol: function (symbol) { return symbol === unknownSymbol; },
-            getDiagnostics: getDiagnostics,
-            getGlobalDiagnostics: getGlobalDiagnostics,
-            getTypeOfSymbolAtLocation: getTypeOfSymbolAtLocation,
-            getSymbolsOfParameterPropertyDeclaration: getSymbolsOfParameterPropertyDeclaration,
-            getDeclaredTypeOfSymbol: getDeclaredTypeOfSymbol,
-            getPropertiesOfType: getPropertiesOfType,
-            getPropertyOfType: getPropertyOfType,
-            getSignaturesOfType: getSignaturesOfType,
-            getIndexTypeOfType: getIndexTypeOfType,
-            getBaseTypes: getBaseTypes,
-            getReturnTypeOfSignature: getReturnTypeOfSignature,
-            getNonNullableType: getNonNullableType,
-            getSymbolsInScope: getSymbolsInScope,
-            getSymbolAtLocation: getSymbolAtLocation,
-            getShorthandAssignmentValueSymbol: getShorthandAssignmentValueSymbol,
-            getExportSpecifierLocalTargetSymbol: getExportSpecifierLocalTargetSymbol,
-            getTypeAtLocation: getTypeOfNode,
-            getPropertySymbolOfDestructuringAssignment: getPropertySymbolOfDestructuringAssignment,
-            typeToString: typeToString,
-            getSymbolDisplayBuilder: getSymbolDisplayBuilder,
-            symbolToString: symbolToString,
-            getAugmentedPropertiesOfType: getAugmentedPropertiesOfType,
-            getRootSymbols: getRootSymbols,
-            getContextualType: getContextualType,
-            getFullyQualifiedName: getFullyQualifiedName,
-            getResolvedSignature: getResolvedSignature,
-            getConstantValue: getConstantValue,
-            isValidPropertyAccess: isValidPropertyAccess,
-            getSignatureFromDeclaration: getSignatureFromDeclaration,
-            isImplementationOfOverload: isImplementationOfOverload,
-            getAliasedSymbol: resolveAlias,
-            getEmitResolver: getEmitResolver,
-            getExportsOfModule: getExportsOfModuleAsArray,
-            getJsxElementAttributesType: getJsxElementAttributesType,
-            getJsxIntrinsicTagNames: getJsxIntrinsicTagNames,
-            isOptionalParameter: isOptionalParameter
-        };
-        var unknownSymbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "unknown");
-        var resolvingSymbol = createSymbol(67108864 /* Transient */, "__resolving__");
-        var anyType = createIntrinsicType(1 /* Any */, "any");
-        var stringType = createIntrinsicType(2 /* String */, "string");
-        var numberType = createIntrinsicType(4 /* Number */, "number");
-        var booleanType = createIntrinsicType(8 /* Boolean */, "boolean");
-        var esSymbolType = createIntrinsicType(16777216 /* ESSymbol */, "symbol");
-        var voidType = createIntrinsicType(16 /* Void */, "void");
-        var undefinedType = createIntrinsicType(32 /* Undefined */, "undefined");
-        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32 /* Undefined */ | 2097152 /* ContainsWideningType */, "undefined");
-        var nullType = createIntrinsicType(64 /* Null */, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(64 /* Null */ | 2097152 /* ContainsWideningType */, "null");
-        var unknownType = createIntrinsicType(1 /* Any */, "unknown");
-        var neverType = createIntrinsicType(134217728 /* Never */, "never");
-        var emptyObjectType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var emptyGenericType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        emptyGenericType.instantiations = {};
-        var anyFunctionType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
-        // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.flags |= 8388608 /* ContainsAnyFunctionType */;
-        var noConstraintType = createAnonymousType(undefined, emptySymbols, emptyArray, emptyArray, undefined, undefined);
-        var anySignature = createSignature(undefined, undefined, undefined, emptyArray, anyType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
-        var unknownSignature = createSignature(undefined, undefined, undefined, emptyArray, unknownType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false);
-        var enumNumberIndexInfo = createIndexInfo(stringType, /*isReadonly*/ true);
-        var globals = {};
-        /**
-         * List of every ambient module with a "*" wildcard.
-         * Unlike other ambient modules, these can't be stored in `globals` because symbol tables only deal with exact matches.
-         * This is only used if there is no exact match.
-        */
-        var patternAmbientModules;
-        var getGlobalESSymbolConstructorSymbol;
-        var getGlobalPromiseConstructorSymbol;
-        var globalObjectType;
-        var globalFunctionType;
-        var globalArrayType;
-        var globalReadonlyArrayType;
-        var globalStringType;
-        var globalNumberType;
-        var globalBooleanType;
-        var globalRegExpType;
-        var anyArrayType;
-        var anyReadonlyArrayType;
-        // The library files are only loaded when the feature is used.
-        // This allows users to just specify library files they want to used through --lib
-        // and they will not get an error from not having unrelated library files
-        var getGlobalTemplateStringsArrayType;
-        var getGlobalESSymbolType;
-        var getGlobalIterableType;
-        var getGlobalIteratorType;
-        var getGlobalIterableIteratorType;
-        var getGlobalClassDecoratorType;
-        var getGlobalParameterDecoratorType;
-        var getGlobalPropertyDecoratorType;
-        var getGlobalMethodDecoratorType;
-        var getGlobalTypedPropertyDescriptorType;
-        var getGlobalPromiseType;
-        var tryGetGlobalPromiseType;
-        var getGlobalPromiseLikeType;
-        var getInstantiatedGlobalPromiseLikeType;
-        var getGlobalPromiseConstructorLikeType;
-        var getGlobalThenableType;
-        var jsxElementClassType;
-        var deferredNodes;
-        var deferredUnusedIdentifierNodes;
-        var flowLoopStart = 0;
-        var flowLoopCount = 0;
-        var visitedFlowCount = 0;
-        var tupleTypes = {};
-        var unionTypes = {};
-        var intersectionTypes = {};
-        var stringLiteralTypes = {};
-        var resolutionTargets = [];
-        var resolutionResults = [];
-        var resolutionPropertyNames = [];
-        var mergedSymbols = [];
-        var symbolLinks = [];
-        var nodeLinks = [];
-        var flowLoopCaches = [];
-        var flowLoopNodes = [];
-        var flowLoopKeys = [];
-        var flowLoopTypes = [];
-        var visitedFlowNodes = [];
-        var visitedFlowTypes = [];
-        var potentialThisCollisions = [];
-        var awaitedTypeStack = [];
-        var diagnostics = ts.createDiagnosticCollection();
-        var TypeFacts;
-        (function (TypeFacts) {
-            TypeFacts[TypeFacts["None"] = 0] = "None";
-            TypeFacts[TypeFacts["TypeofEQString"] = 1] = "TypeofEQString";
-            TypeFacts[TypeFacts["TypeofEQNumber"] = 2] = "TypeofEQNumber";
-            TypeFacts[TypeFacts["TypeofEQBoolean"] = 4] = "TypeofEQBoolean";
-            TypeFacts[TypeFacts["TypeofEQSymbol"] = 8] = "TypeofEQSymbol";
-            TypeFacts[TypeFacts["TypeofEQObject"] = 16] = "TypeofEQObject";
-            TypeFacts[TypeFacts["TypeofEQFunction"] = 32] = "TypeofEQFunction";
-            TypeFacts[TypeFacts["TypeofEQHostObject"] = 64] = "TypeofEQHostObject";
-            TypeFacts[TypeFacts["TypeofNEString"] = 128] = "TypeofNEString";
-            TypeFacts[TypeFacts["TypeofNENumber"] = 256] = "TypeofNENumber";
-            TypeFacts[TypeFacts["TypeofNEBoolean"] = 512] = "TypeofNEBoolean";
-            TypeFacts[TypeFacts["TypeofNESymbol"] = 1024] = "TypeofNESymbol";
-            TypeFacts[TypeFacts["TypeofNEObject"] = 2048] = "TypeofNEObject";
-            TypeFacts[TypeFacts["TypeofNEFunction"] = 4096] = "TypeofNEFunction";
-            TypeFacts[TypeFacts["TypeofNEHostObject"] = 8192] = "TypeofNEHostObject";
-            TypeFacts[TypeFacts["EQUndefined"] = 16384] = "EQUndefined";
-            TypeFacts[TypeFacts["EQNull"] = 32768] = "EQNull";
-            TypeFacts[TypeFacts["EQUndefinedOrNull"] = 65536] = "EQUndefinedOrNull";
-            TypeFacts[TypeFacts["NEUndefined"] = 131072] = "NEUndefined";
-            TypeFacts[TypeFacts["NENull"] = 262144] = "NENull";
-            TypeFacts[TypeFacts["NEUndefinedOrNull"] = 524288] = "NEUndefinedOrNull";
-            TypeFacts[TypeFacts["Truthy"] = 1048576] = "Truthy";
-            TypeFacts[TypeFacts["Falsy"] = 2097152] = "Falsy";
-            TypeFacts[TypeFacts["All"] = 4194303] = "All";
-            // The following members encode facts about particular kinds of types for use in the getTypeFacts function.
-            // The presence of a particular fact means that the given test is true for some (and possibly all) values
-            // of that kind of type.
-            TypeFacts[TypeFacts["StringStrictFacts"] = 4079361] = "StringStrictFacts";
-            TypeFacts[TypeFacts["StringFacts"] = 4194049] = "StringFacts";
-            TypeFacts[TypeFacts["NumberStrictFacts"] = 4079234] = "NumberStrictFacts";
-            TypeFacts[TypeFacts["NumberFacts"] = 4193922] = "NumberFacts";
-            TypeFacts[TypeFacts["BooleanStrictFacts"] = 4078980] = "BooleanStrictFacts";
-            TypeFacts[TypeFacts["BooleanFacts"] = 4193668] = "BooleanFacts";
-            TypeFacts[TypeFacts["SymbolStrictFacts"] = 1981320] = "SymbolStrictFacts";
-            TypeFacts[TypeFacts["SymbolFacts"] = 4193160] = "SymbolFacts";
-            TypeFacts[TypeFacts["ObjectStrictFacts"] = 1972176] = "ObjectStrictFacts";
-            TypeFacts[TypeFacts["ObjectFacts"] = 4184016] = "ObjectFacts";
-            TypeFacts[TypeFacts["FunctionStrictFacts"] = 1970144] = "FunctionStrictFacts";
-            TypeFacts[TypeFacts["FunctionFacts"] = 4181984] = "FunctionFacts";
-            TypeFacts[TypeFacts["UndefinedFacts"] = 2457472] = "UndefinedFacts";
-            TypeFacts[TypeFacts["NullFacts"] = 2340752] = "NullFacts";
-        })(TypeFacts || (TypeFacts = {}));
-        var typeofEQFacts = {
-            "string": 1 /* TypeofEQString */,
-            "number": 2 /* TypeofEQNumber */,
-            "boolean": 4 /* TypeofEQBoolean */,
-            "symbol": 8 /* TypeofEQSymbol */,
-            "undefined": 16384 /* EQUndefined */,
-            "object": 16 /* TypeofEQObject */,
-            "function": 32 /* TypeofEQFunction */
-        };
-        var typeofNEFacts = {
-            "string": 128 /* TypeofNEString */,
-            "number": 256 /* TypeofNENumber */,
-            "boolean": 512 /* TypeofNEBoolean */,
-            "symbol": 1024 /* TypeofNESymbol */,
-            "undefined": 131072 /* NEUndefined */,
-            "object": 2048 /* TypeofNEObject */,
-            "function": 4096 /* TypeofNEFunction */
-        };
-        var typeofTypesByName = {
-            "string": stringType,
-            "number": numberType,
-            "boolean": booleanType,
-            "symbol": esSymbolType,
-            "undefined": undefinedType
-        };
-        var jsxElementType;
-        /** Things we lazy load from the JSX namespace */
-        var jsxTypes = {};
-        var JsxNames = {
-            JSX: "JSX",
-            IntrinsicElements: "IntrinsicElements",
-            ElementClass: "ElementClass",
-            ElementAttributesPropertyNameContainer: "ElementAttributesProperty",
-            Element: "Element",
-            IntrinsicAttributes: "IntrinsicAttributes",
-            IntrinsicClassAttributes: "IntrinsicClassAttributes"
-        };
-        var subtypeRelation = {};
-        var assignableRelation = {};
-        var comparableRelation = {};
-        var identityRelation = {};
-        // This is for caching the result of getSymbolDisplayBuilder. Do not access directly.
-        var _displayBuilder;
-        var TypeSystemPropertyName;
-        (function (TypeSystemPropertyName) {
-            TypeSystemPropertyName[TypeSystemPropertyName["Type"] = 0] = "Type";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedBaseConstructorType"] = 1] = "ResolvedBaseConstructorType";
-            TypeSystemPropertyName[TypeSystemPropertyName["DeclaredType"] = 2] = "DeclaredType";
-            TypeSystemPropertyName[TypeSystemPropertyName["ResolvedReturnType"] = 3] = "ResolvedReturnType";
-        })(TypeSystemPropertyName || (TypeSystemPropertyName = {}));
-        var builtinGlobals = (_a = {},
-            _a[undefinedSymbol.name] = undefinedSymbol,
-            _a
-        );
-        initializeTypeChecker();
-        return checker;
-        function getEmitResolver(sourceFile, cancellationToken) {
-            // Ensure we have all the type information in place for this file so that all the
-            // emitter questions of this resolver will return the right information.
-            getDiagnostics(sourceFile, cancellationToken);
-            return emitResolver;
-        }
-        function error(location, message, arg0, arg1, arg2) {
-            var diagnostic = location
-                ? ts.createDiagnosticForNode(location, message, arg0, arg1, arg2)
-                : ts.createCompilerDiagnostic(message, arg0, arg1, arg2);
-            diagnostics.add(diagnostic);
-        }
-        function createSymbol(flags, name) {
-            symbolCount++;
-            return new Symbol(flags, name);
-        }
-        function getExcludedSymbolFlags(flags) {
-            var result = 0;
-            if (flags & 2 /* BlockScopedVariable */)
-                result |= 107455 /* BlockScopedVariableExcludes */;
-            if (flags & 1 /* FunctionScopedVariable */)
-                result |= 107454 /* FunctionScopedVariableExcludes */;
-            if (flags & 4 /* Property */)
-                result |= 0 /* PropertyExcludes */;
-            if (flags & 8 /* EnumMember */)
-                result |= 107455 /* EnumMemberExcludes */;
-            if (flags & 16 /* Function */)
-                result |= 106927 /* FunctionExcludes */;
-            if (flags & 32 /* Class */)
-                result |= 899519 /* ClassExcludes */;
-            if (flags & 64 /* Interface */)
-                result |= 792960 /* InterfaceExcludes */;
-            if (flags & 256 /* RegularEnum */)
-                result |= 899327 /* RegularEnumExcludes */;
-            if (flags & 128 /* ConstEnum */)
-                result |= 899967 /* ConstEnumExcludes */;
-            if (flags & 512 /* ValueModule */)
-                result |= 106639 /* ValueModuleExcludes */;
-            if (flags & 8192 /* Method */)
-                result |= 99263 /* MethodExcludes */;
-            if (flags & 32768 /* GetAccessor */)
-                result |= 41919 /* GetAccessorExcludes */;
-            if (flags & 65536 /* SetAccessor */)
-                result |= 74687 /* SetAccessorExcludes */;
-            if (flags & 262144 /* TypeParameter */)
-                result |= 530912 /* TypeParameterExcludes */;
-            if (flags & 524288 /* TypeAlias */)
-                result |= 793056 /* TypeAliasExcludes */;
-            if (flags & 8388608 /* Alias */)
-                result |= 8388608 /* AliasExcludes */;
-            return result;
-        }
-        function recordMergedSymbol(target, source) {
-            if (!source.mergeId) {
-                source.mergeId = nextMergeId;
-                nextMergeId++;
-            }
-            mergedSymbols[source.mergeId] = target;
-        }
-        function cloneSymbol(symbol) {
-            var result = createSymbol(symbol.flags | 33554432 /* Merged */, symbol.name);
-            result.declarations = symbol.declarations.slice(0);
-            result.parent = symbol.parent;
-            if (symbol.valueDeclaration)
-                result.valueDeclaration = symbol.valueDeclaration;
-            if (symbol.constEnumOnlyModule)
-                result.constEnumOnlyModule = true;
-            if (symbol.members)
-                result.members = cloneSymbolTable(symbol.members);
-            if (symbol.exports)
-                result.exports = cloneSymbolTable(symbol.exports);
-            recordMergedSymbol(result, symbol);
-            return result;
-        }
-        function mergeSymbol(target, source) {
-            if (!(target.flags & getExcludedSymbolFlags(source.flags))) {
-                if (source.flags & 512 /* ValueModule */ && target.flags & 512 /* ValueModule */ && target.constEnumOnlyModule && !source.constEnumOnlyModule) {
-                    // reset flag when merging instantiated module into value module that has only const enums
-                    target.constEnumOnlyModule = false;
-                }
-                target.flags |= source.flags;
-                if (source.valueDeclaration &&
-                    (!target.valueDeclaration ||
-                        (target.valueDeclaration.kind === 225 /* ModuleDeclaration */ && source.valueDeclaration.kind !== 225 /* ModuleDeclaration */))) {
-                    // other kinds of value declarations take precedence over modules
-                    target.valueDeclaration = source.valueDeclaration;
-                }
-                ts.forEach(source.declarations, function (node) {
-                    target.declarations.push(node);
-                });
-                if (source.members) {
-                    if (!target.members)
-                        target.members = {};
-                    mergeSymbolTable(target.members, source.members);
-                }
-                if (source.exports) {
-                    if (!target.exports)
-                        target.exports = {};
-                    mergeSymbolTable(target.exports, source.exports);
-                }
-                recordMergedSymbol(target, source);
-            }
-            else {
-                var message_2 = target.flags & 2 /* BlockScopedVariable */ || source.flags & 2 /* BlockScopedVariable */
-                    ? ts.Diagnostics.Cannot_redeclare_block_scoped_variable_0 : ts.Diagnostics.Duplicate_identifier_0;
-                ts.forEach(source.declarations, function (node) {
-                    error(node.name ? node.name : node, message_2, symbolToString(source));
-                });
-                ts.forEach(target.declarations, function (node) {
-                    error(node.name ? node.name : node, message_2, symbolToString(source));
-                });
-            }
-        }
-        function cloneSymbolTable(symbolTable) {
-            var result = {};
-            for (var id in symbolTable) {
-                if (ts.hasProperty(symbolTable, id)) {
-                    result[id] = symbolTable[id];
-                }
-            }
-            return result;
-        }
-        function mergeSymbolTable(target, source) {
-            for (var id in source) {
-                if (ts.hasProperty(source, id)) {
-                    if (!ts.hasProperty(target, id)) {
-                        target[id] = source[id];
-                    }
-                    else {
-                        var symbol = target[id];
-                        if (!(symbol.flags & 33554432 /* Merged */)) {
-                            target[id] = symbol = cloneSymbol(symbol);
-                        }
-                        mergeSymbol(symbol, source[id]);
-                    }
-                }
-            }
-        }
-        function mergeModuleAugmentation(moduleName) {
-            var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
-                // this is a combined symbol for multiple augmentations within the same file.
-                // its symbol already has accumulated information for all declarations
-                // so we need to add it just once - do the work only for first declaration
-                ts.Debug.assert(moduleAugmentation.symbol.declarations.length > 1);
-                return;
-            }
-            if (ts.isGlobalScopeAugmentation(moduleAugmentation)) {
-                mergeSymbolTable(globals, moduleAugmentation.symbol.exports);
-            }
-            else {
-                // find a module that about to be augmented
-                // do not validate names of augmentations that are defined in ambient context
-                var moduleNotFoundError = !ts.isInAmbientContext(moduleName.parent.parent)
-                    ? ts.Diagnostics.Invalid_module_name_in_augmentation_module_0_cannot_be_found
-                    : undefined;
-                var mainModule = resolveExternalModuleNameWorker(moduleName, moduleName, moduleNotFoundError);
-                if (!mainModule) {
-                    return;
-                }
-                // obtain item referenced by 'export='
-                mainModule = resolveExternalModuleSymbol(mainModule);
-                if (mainModule.flags & 1536 /* Namespace */) {
-                    // if module symbol has already been merged - it is safe to use it.
-                    // otherwise clone it
-                    mainModule = mainModule.flags & 33554432 /* Merged */ ? mainModule : cloneSymbol(mainModule);
-                    mergeSymbol(mainModule, moduleAugmentation.symbol);
-                }
-                else {
-                    error(moduleName, ts.Diagnostics.Cannot_augment_module_0_because_it_resolves_to_a_non_module_entity, moduleName.text);
-                }
-            }
-        }
-        function addToSymbolTable(target, source, message) {
-            for (var id in source) {
-                if (ts.hasProperty(source, id)) {
-                    if (ts.hasProperty(target, id)) {
-                        // Error on redeclarations
-                        ts.forEach(target[id].declarations, addDeclarationDiagnostic(id, message));
-                    }
-                    else {
-                        target[id] = source[id];
-                    }
-                }
-            }
-            function addDeclarationDiagnostic(id, message) {
-                return function (declaration) { return diagnostics.add(ts.createDiagnosticForNode(declaration, message, id)); };
-            }
-        }
-        function getSymbolLinks(symbol) {
-            if (symbol.flags & 67108864 /* Transient */)
-                return symbol;
-            var id = getSymbolId(symbol);
-            return symbolLinks[id] || (symbolLinks[id] = {});
-        }
-        function getNodeLinks(node) {
-            var nodeId = getNodeId(node);
-            return nodeLinks[nodeId] || (nodeLinks[nodeId] = {});
-        }
-        function isGlobalSourceFile(node) {
-            return node.kind === 256 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
-        }
-        function getSymbol(symbols, name, meaning) {
-            if (meaning && ts.hasProperty(symbols, name)) {
-                var symbol = symbols[name];
-                ts.Debug.assert((symbol.flags & 16777216 /* Instantiated */) === 0, "Should never get an instantiated symbol here.");
-                if (symbol.flags & meaning) {
-                    return symbol;
-                }
-                if (symbol.flags & 8388608 /* Alias */) {
-                    var target = resolveAlias(symbol);
-                    // Unknown symbol means an error occurred in alias resolution, treat it as positive answer to avoid cascading errors
-                    if (target === unknownSymbol || target.flags & meaning) {
-                        return symbol;
-                    }
-                }
-            }
-            // return undefined if we can't find a symbol.
-        }
-        /**
-         * Get symbols that represent parameter-property-declaration as parameter and as property declaration
-         * @param parameter a parameterDeclaration node
-         * @param parameterName a name of the parameter to get the symbols for.
-         * @return a tuple of two symbols
-         */
-        function getSymbolsOfParameterPropertyDeclaration(parameter, parameterName) {
-            var constructorDeclaration = parameter.parent;
-            var classDeclaration = parameter.parent.parent;
-            var parameterSymbol = getSymbol(constructorDeclaration.locals, parameterName, 107455 /* Value */);
-            var propertySymbol = getSymbol(classDeclaration.symbol.members, parameterName, 107455 /* Value */);
-            if (parameterSymbol && propertySymbol) {
-                return [parameterSymbol, propertySymbol];
-            }
-            ts.Debug.fail("There should exist two symbols, one as property declaration and one as parameter declaration");
-        }
-        function isBlockScopedNameDeclaredBeforeUse(declaration, usage) {
-            var declarationFile = ts.getSourceFileOfNode(declaration);
-            var useFile = ts.getSourceFileOfNode(usage);
-            if (declarationFile !== useFile) {
-                if ((modulekind && (declarationFile.externalModuleIndicator || useFile.externalModuleIndicator)) ||
-                    (!compilerOptions.outFile && !compilerOptions.out)) {
-                    // nodes are in different files and order cannot be determines
-                    return true;
-                }
-                var sourceFiles = host.getSourceFiles();
-                return ts.indexOf(sourceFiles, declarationFile) <= ts.indexOf(sourceFiles, useFile);
-            }
-            if (declaration.pos <= usage.pos) {
-                // declaration is before usage
-                // still might be illegal if usage is in the initializer of the variable declaration
-                return declaration.kind !== 218 /* VariableDeclaration */ ||
-                    !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
-            }
-            // declaration is after usage
-            // can be legal if usage is deferred (i.e. inside function or in initializer of instance property)
-            return isUsedInFunctionOrNonStaticProperty(declaration, usage);
-            function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
-                switch (declaration.parent.parent.kind) {
-                    case 200 /* VariableStatement */:
-                    case 206 /* ForStatement */:
-                    case 208 /* ForOfStatement */:
-                        // variable statement/for/for-of statement case,
-                        // use site should not be inside variable declaration (initializer of declaration or binding element)
-                        if (isSameScopeDescendentOf(usage, declaration, container)) {
-                            return true;
-                        }
-                        break;
-                }
-                switch (declaration.parent.parent.kind) {
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                        // ForIn/ForOf case - use site should not be used in expression part
-                        if (isSameScopeDescendentOf(usage, declaration.parent.parent.expression, container)) {
-                            return true;
-                        }
-                }
-                return false;
-            }
-            function isUsedInFunctionOrNonStaticProperty(declaration, usage) {
-                var container = ts.getEnclosingBlockScopeContainer(declaration);
-                var current = usage;
-                while (current) {
-                    if (current === container) {
-                        return false;
-                    }
-                    if (ts.isFunctionLike(current)) {
-                        return true;
-                    }
-                    var initializerOfNonStaticProperty = current.parent &&
-                        current.parent.kind === 145 /* PropertyDeclaration */ &&
-                        (current.parent.flags & 32 /* Static */) === 0 &&
-                        current.parent.initializer === current;
-                    if (initializerOfNonStaticProperty) {
-                        return true;
-                    }
-                    current = current.parent;
-                }
-                return false;
-            }
-        }
-        // Resolve a given name for a given meaning at a given location. An error is reported if the name was not found and
-        // the nameNotFoundMessage argument is not undefined. Returns the resolved symbol, or undefined if no symbol with
-        // the given name can be found.
-        function resolveName(location, name, meaning, nameNotFoundMessage, nameArg) {
-            var result;
-            var lastLocation;
-            var propertyWithInvalidInitializer;
-            var errorLocation = location;
-            var grandparent;
-            var isInExternalModule = false;
-            loop: while (location) {
-                // Locals of a source file are not in scope (because they get merged into the global symbol table)
-                if (location.locals && !isGlobalSourceFile(location)) {
-                    if (result = getSymbol(location.locals, name, meaning)) {
-                        var useResult = true;
-                        if (ts.isFunctionLike(location) && lastLocation && lastLocation !== location.body) {
-                            // symbol lookup restrictions for function-like declarations
-                            // - Type parameters of a function are in scope in the entire function declaration, including the parameter
-                            //   list and return type. However, local types are only in scope in the function body.
-                            // - parameters are only in the scope of function body
-                            // This restriction does not apply to JSDoc comment types because they are parented
-                            // at a higher level than type parameters would normally be
-                            if (meaning & result.flags & 793056 /* Type */ && lastLocation.kind !== 273 /* JSDocComment */) {
-                                useResult = result.flags & 262144 /* TypeParameter */
-                                    ? lastLocation === location.type ||
-                                        lastLocation.kind === 142 /* Parameter */ ||
-                                        lastLocation.kind === 141 /* TypeParameter */
-                                    : false;
-                            }
-                            if (meaning & 107455 /* Value */ && result.flags & 1 /* FunctionScopedVariable */) {
-                                // parameters are visible only inside function body, parameter list and return type
-                                // technically for parameter list case here we might mix parameters and variables declared in function,
-                                // however it is detected separately when checking initializers of parameters
-                                // to make sure that they reference no variables declared after them.
-                                useResult =
-                                    lastLocation.kind === 142 /* Parameter */ ||
-                                        (lastLocation === location.type &&
-                                            result.valueDeclaration.kind === 142 /* Parameter */);
-                            }
-                        }
-                        if (useResult) {
-                            break loop;
-                        }
-                        else {
-                            result = undefined;
-                        }
-                    }
-                }
-                switch (location.kind) {
-                    case 256 /* SourceFile */:
-                        if (!ts.isExternalOrCommonJsModule(location))
-                            break;
-                        isInExternalModule = true;
-                    case 225 /* ModuleDeclaration */:
-                        var moduleExports = getSymbolOfNode(location).exports;
-                        if (location.kind === 256 /* SourceFile */ || ts.isAmbientModule(location)) {
-                            // It's an external module. First see if the module has an export default and if the local
-                            // name of that export default matches.
-                            if (result = moduleExports["default"]) {
-                                var localSymbol = ts.getLocalSymbolForExportDefault(result);
-                                if (localSymbol && (result.flags & meaning) && localSymbol.name === name) {
-                                    break loop;
-                                }
-                                result = undefined;
-                            }
-                            // Because of module/namespace merging, a module's exports are in scope,
-                            // yet we never want to treat an export specifier as putting a member in scope.
-                            // Therefore, if the name we find is purely an export specifier, it is not actually considered in scope.
-                            // Two things to note about this:
-                            //     1. We have to check this without calling getSymbol. The problem with calling getSymbol
-                            //        on an export specifier is that it might find the export specifier itself, and try to
-                            //        resolve it as an alias. This will cause the checker to consider the export specifier
-                            //        a circular alias reference when it might not be.
-                            //     2. We check === SymbolFlags.Alias in order to check that the symbol is *purely*
-                            //        an alias. If we used &, we'd be throwing out symbols that have non alias aspects,
-                            //        which is not the desired behavior.
-                            if (ts.hasProperty(moduleExports, name) &&
-                                moduleExports[name].flags === 8388608 /* Alias */ &&
-                                ts.getDeclarationOfKind(moduleExports[name], 238 /* ExportSpecifier */)) {
-                                break;
-                            }
-                        }
-                        if (result = getSymbol(moduleExports, name, meaning & 8914931 /* ModuleMember */)) {
-                            break loop;
-                        }
-                        break;
-                    case 224 /* EnumDeclaration */:
-                        if (result = getSymbol(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
-                            break loop;
-                        }
-                        break;
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                        // TypeScript 1.0 spec (April 2014): 8.4.1
-                        // Initializer expressions for instance member variables are evaluated in the scope
-                        // of the class constructor body but are not permitted to reference parameters or
-                        // local variables of the constructor. This effectively means that entities from outer scopes
-                        // by the same name as a constructor parameter or local variable are inaccessible
-                        // in initializer expressions for instance member variables.
-                        if (ts.isClassLike(location.parent) && !(location.flags & 32 /* Static */)) {
-                            var ctor = findConstructorDeclaration(location.parent);
-                            if (ctor && ctor.locals) {
-                                if (getSymbol(ctor.locals, name, meaning & 107455 /* Value */)) {
-                                    // Remember the property node, it will be used later to report appropriate error
-                                    propertyWithInvalidInitializer = location;
-                                }
-                            }
-                        }
-                        break;
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                        if (result = getSymbol(getSymbolOfNode(location).members, name, meaning & 793056 /* Type */)) {
-                            if (lastLocation && lastLocation.flags & 32 /* Static */) {
-                                // TypeScript 1.0 spec (April 2014): 3.4.1
-                                // The scope of a type parameter extends over the entire declaration with which the type
-                                // parameter list is associated, with the exception of static member declarations in classes.
-                                error(errorLocation, ts.Diagnostics.Static_members_cannot_reference_class_type_parameters);
-                                return undefined;
-                            }
-                            break loop;
-                        }
-                        if (location.kind === 192 /* ClassExpression */ && meaning & 32 /* Class */) {
-                            var className = location.name;
-                            if (className && name === className.text) {
-                                result = location.symbol;
-                                break loop;
-                            }
-                        }
-                        break;
-                    // It is not legal to reference a class's own type parameters from a computed property name that
-                    // belongs to the class. For example:
-                    //
-                    //   function foo<T>() { return '' }
-                    //   class C<T> { // <-- Class's own type parameter T
-                    //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
-                    //   }
-                    //
-                    case 140 /* ComputedPropertyName */:
-                        grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 222 /* InterfaceDeclaration */) {
-                            // A reference to this grandparent's type parameters would be an error
-                            if (result = getSymbol(getSymbolOfNode(grandparent).members, name, meaning & 793056 /* Type */)) {
-                                error(errorLocation, ts.Diagnostics.A_computed_property_name_cannot_reference_a_type_parameter_from_its_containing_type);
-                                return undefined;
-                            }
-                        }
-                        break;
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 148 /* Constructor */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 220 /* FunctionDeclaration */:
-                    case 180 /* ArrowFunction */:
-                        if (meaning & 3 /* Variable */ && name === "arguments") {
-                            result = argumentsSymbol;
-                            break loop;
-                        }
-                        break;
-                    case 179 /* FunctionExpression */:
-                        if (meaning & 3 /* Variable */ && name === "arguments") {
-                            result = argumentsSymbol;
-                            break loop;
-                        }
-                        if (meaning & 16 /* Function */) {
-                            var functionName = location.name;
-                            if (functionName && name === functionName.text) {
-                                result = location.symbol;
-                                break loop;
-                            }
-                        }
-                        break;
-                    case 143 /* Decorator */:
-                        // Decorators are resolved at the class declaration. Resolving at the parameter
-                        // or member would result in looking up locals in the method.
-                        //
-                        //   function y() {}
-                        //   class C {
-                        //       method(@y x, y) {} // <-- decorator y should be resolved at the class declaration, not the parameter.
-                        //   }
-                        //
-                        if (location.parent && location.parent.kind === 142 /* Parameter */) {
-                            location = location.parent;
-                        }
-                        //
-                        //   function y() {}
-                        //   class C {
-                        //       @y method(x, y) {} // <-- decorator y should be resolved at the class declaration, not the method.
-                        //   }
-                        //
-                        if (location.parent && ts.isClassElement(location.parent)) {
-                            location = location.parent;
-                        }
-                        break;
-                }
-                lastLocation = location;
-                location = location.parent;
-            }
-            if (result && nameNotFoundMessage && noUnusedIdentifiers) {
-                result.isReferenced = true;
-            }
-            if (!result) {
-                result = getSymbol(globals, name, meaning);
-            }
-            if (!result) {
-                if (nameNotFoundMessage) {
-                    if (!checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) &&
-                        !checkAndReportErrorForExtendingInterface(errorLocation)) {
-                        error(errorLocation, nameNotFoundMessage, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
-                    }
-                }
-                return undefined;
-            }
-            // Perform extra checks only if error reporting was requested
-            if (nameNotFoundMessage) {
-                if (propertyWithInvalidInitializer) {
-                    // We have a match, but the reference occurred within a property initializer and the identifier also binds
-                    // to a local variable in the constructor where the code will be emitted.
-                    var propertyName = propertyWithInvalidInitializer.name;
-                    error(errorLocation, ts.Diagnostics.Initializer_of_instance_member_variable_0_cannot_reference_identifier_1_declared_in_the_constructor, ts.declarationNameToString(propertyName), typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
-                    return undefined;
-                }
-                // Only check for block-scoped variable if we are looking for the
-                // name with variable meaning
-                //      For example,
-                //          declare module foo {
-                //              interface bar {}
-                //          }
-                //      const foo/*1*/: foo/*2*/.bar;
-                // The foo at /*1*/ and /*2*/ will share same symbol with two meaning
-                // block - scope variable and namespace module. However, only when we
-                // try to resolve name in /*1*/ which is used in variable position,
-                // we want to check for block- scoped
-                if (meaning & 2 /* BlockScopedVariable */) {
-                    var exportOrLocalSymbol = getExportSymbolOfValueSymbolIfExported(result);
-                    if (exportOrLocalSymbol.flags & 2 /* BlockScopedVariable */) {
-                        checkResolvedBlockScopedVariable(exportOrLocalSymbol, errorLocation);
-                    }
-                }
-                // If we're in an external module, we can't reference symbols created from UMD export declarations
-                if (result && isInExternalModule) {
-                    var decls = result.declarations;
-                    if (decls && decls.length === 1 && decls[0].kind === 228 /* NamespaceExportDeclaration */) {
-                        error(errorLocation, ts.Diagnostics.Identifier_0_must_be_imported_from_a_module, name);
-                    }
-                }
-            }
-            return result;
-        }
-        function checkAndReportErrorForMissingPrefix(errorLocation, name, nameArg) {
-            if (!errorLocation || (errorLocation.kind === 69 /* Identifier */ && (isTypeReferenceIdentifier(errorLocation)) || isInTypeQuery(errorLocation))) {
-                return false;
-            }
-            var container = ts.getThisContainer(errorLocation, /* includeArrowFunctions */ true);
-            var location = container;
-            while (location) {
-                if (ts.isClassLike(location.parent)) {
-                    var classSymbol = getSymbolOfNode(location.parent);
-                    if (!classSymbol) {
-                        break;
-                    }
-                    // Check to see if a static member exists.
-                    var constructorType = getTypeOfSymbol(classSymbol);
-                    if (getPropertyOfType(constructorType, name)) {
-                        error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_static_member_1_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg), symbolToString(classSymbol));
-                        return true;
-                    }
-                    // No static member is present.
-                    // Check if we're in an instance method and look for a relevant instance member.
-                    if (location === container && !(location.flags & 32 /* Static */)) {
-                        var instanceType = getDeclaredTypeOfSymbol(classSymbol).thisType;
-                        if (getPropertyOfType(instanceType, name)) {
-                            error(errorLocation, ts.Diagnostics.Cannot_find_name_0_Did_you_mean_the_instance_member_this_0, typeof nameArg === "string" ? nameArg : ts.declarationNameToString(nameArg));
-                            return true;
-                        }
-                    }
-                }
-                location = location.parent;
-            }
-            return false;
-        }
-        function checkAndReportErrorForExtendingInterface(errorLocation) {
-            var parentClassExpression = errorLocation;
-            while (parentClassExpression) {
-                var kind = parentClassExpression.kind;
-                if (kind === 69 /* Identifier */ || kind === 172 /* PropertyAccessExpression */) {
-                    parentClassExpression = parentClassExpression.parent;
-                    continue;
-                }
-                if (kind === 194 /* ExpressionWithTypeArguments */) {
-                    break;
-                }
-                return false;
-            }
-            if (!parentClassExpression) {
-                return false;
-            }
-            var expression = parentClassExpression.expression;
-            if (resolveEntityName(expression, 64 /* Interface */, /*ignoreErrors*/ true)) {
-                error(errorLocation, ts.Diagnostics.Cannot_extend_an_interface_0_Did_you_mean_implements, ts.getTextOfNode(expression));
-                return true;
-            }
-            return false;
-        }
-        function checkResolvedBlockScopedVariable(result, errorLocation) {
-            ts.Debug.assert((result.flags & 2 /* BlockScopedVariable */) !== 0);
-            // Block-scoped variables cannot be used before their definition
-            var declaration = ts.forEach(result.declarations, function (d) { return ts.isBlockOrCatchScoped(d) ? d : undefined; });
-            ts.Debug.assert(declaration !== undefined, "Block-scoped variable declaration is undefined");
-            if (!isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 218 /* VariableDeclaration */), errorLocation)) {
-                error(errorLocation, ts.Diagnostics.Block_scoped_variable_0_used_before_its_declaration, ts.declarationNameToString(declaration.name));
-            }
-        }
-        /* Starting from 'initial' node walk up the parent chain until 'stopAt' node is reached.
-         * If at any point current node is equal to 'parent' node - return true.
-         * Return false if 'stopAt' node is reached or isFunctionLike(current) === true.
-         */
-        function isSameScopeDescendentOf(initial, parent, stopAt) {
-            if (!parent) {
-                return false;
-            }
-            for (var current = initial; current && current !== stopAt && !ts.isFunctionLike(current); current = current.parent) {
-                if (current === parent) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function getAnyImportSyntax(node) {
-            if (ts.isAliasSymbolDeclaration(node)) {
-                if (node.kind === 229 /* ImportEqualsDeclaration */) {
-                    return node;
-                }
-                while (node && node.kind !== 230 /* ImportDeclaration */) {
-                    node = node.parent;
-                }
-                return node;
-            }
-        }
-        function getDeclarationOfAliasSymbol(symbol) {
-            return ts.forEach(symbol.declarations, function (d) { return ts.isAliasSymbolDeclaration(d) ? d : undefined; });
-        }
-        function getTargetOfImportEqualsDeclaration(node) {
-            if (node.moduleReference.kind === 240 /* ExternalModuleReference */) {
-                return resolveExternalModuleSymbol(resolveExternalModuleName(node, ts.getExternalModuleImportEqualsDeclarationExpression(node)));
-            }
-            return getSymbolOfPartOfRightHandSideOfImportEquals(node.moduleReference, node);
-        }
-        function getTargetOfImportClause(node) {
-            var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
-            if (moduleSymbol) {
-                var exportDefaultSymbol = ts.isShorthandAmbientModule(moduleSymbol.valueDeclaration) ?
-                    moduleSymbol :
-                    moduleSymbol.exports["export="] ?
-                        getPropertyOfType(getTypeOfSymbol(moduleSymbol.exports["export="]), "default") :
-                        resolveSymbol(moduleSymbol.exports["default"]);
-                if (!exportDefaultSymbol && !allowSyntheticDefaultImports) {
-                    error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
-                }
-                else if (!exportDefaultSymbol && allowSyntheticDefaultImports) {
-                    return resolveExternalModuleSymbol(moduleSymbol) || resolveSymbol(moduleSymbol);
-                }
-                return exportDefaultSymbol;
-            }
-        }
-        function getTargetOfNamespaceImport(node) {
-            var moduleSpecifier = node.parent.parent.moduleSpecifier;
-            return resolveESModuleSymbol(resolveExternalModuleName(node, moduleSpecifier), moduleSpecifier);
-        }
-        // This function creates a synthetic symbol that combines the value side of one symbol with the
-        // type/namespace side of another symbol. Consider this example:
-        //
-        //   declare module graphics {
-        //       interface Point {
-        //           x: number;
-        //           y: number;
-        //       }
-        //   }
-        //   declare var graphics: {
-        //       Point: new (x: number, y: number) => graphics.Point;
-        //   }
-        //   declare module "graphics" {
-        //       export = graphics;
-        //   }
-        //
-        // An 'import { Point } from "graphics"' needs to create a symbol that combines the value side 'Point'
-        // property with the type/namespace side interface 'Point'.
-        function combineValueAndTypeSymbols(valueSymbol, typeSymbol) {
-            if (valueSymbol.flags & (793056 /* Type */ | 1536 /* Namespace */)) {
-                return valueSymbol;
-            }
-            var result = createSymbol(valueSymbol.flags | typeSymbol.flags, valueSymbol.name);
-            result.declarations = ts.concatenate(valueSymbol.declarations, typeSymbol.declarations);
-            result.parent = valueSymbol.parent || typeSymbol.parent;
-            if (valueSymbol.valueDeclaration)
-                result.valueDeclaration = valueSymbol.valueDeclaration;
-            if (typeSymbol.members)
-                result.members = typeSymbol.members;
-            if (valueSymbol.exports)
-                result.exports = valueSymbol.exports;
-            return result;
-        }
-        function getExportOfModule(symbol, name) {
-            if (symbol.flags & 1536 /* Module */) {
-                var exports = getExportsOfSymbol(symbol);
-                if (ts.hasProperty(exports, name)) {
-                    return resolveSymbol(exports[name]);
-                }
-            }
-        }
-        function getPropertyOfVariable(symbol, name) {
-            if (symbol.flags & 3 /* Variable */) {
-                var typeAnnotation = symbol.valueDeclaration.type;
-                if (typeAnnotation) {
-                    return resolveSymbol(getPropertyOfType(getTypeFromTypeNode(typeAnnotation), name));
-                }
-            }
-        }
-        function getExternalModuleMember(node, specifier) {
-            var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-            var targetSymbol = resolveESModuleSymbol(moduleSymbol, node.moduleSpecifier);
-            if (targetSymbol) {
-                var name_10 = specifier.propertyName || specifier.name;
-                if (name_10.text) {
-                    if (ts.isShorthandAmbientModule(moduleSymbol.valueDeclaration)) {
-                        return moduleSymbol;
-                    }
-                    var symbolFromVariable = void 0;
-                    // First check if module was specified with "export=". If so, get the member from the resolved type
-                    if (moduleSymbol && moduleSymbol.exports && moduleSymbol.exports["export="]) {
-                        symbolFromVariable = getPropertyOfType(getTypeOfSymbol(targetSymbol), name_10.text);
-                    }
-                    else {
-                        symbolFromVariable = getPropertyOfVariable(targetSymbol, name_10.text);
-                    }
-                    // if symbolFromVariable is export - get its final target
-                    symbolFromVariable = resolveSymbol(symbolFromVariable);
-                    var symbolFromModule = getExportOfModule(targetSymbol, name_10.text);
-                    var symbol = symbolFromModule && symbolFromVariable ?
-                        combineValueAndTypeSymbols(symbolFromVariable, symbolFromModule) :
-                        symbolFromModule || symbolFromVariable;
-                    if (!symbol) {
-                        error(name_10, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(moduleSymbol), ts.declarationNameToString(name_10));
-                    }
-                    return symbol;
-                }
-            }
-        }
-        function getTargetOfImportSpecifier(node) {
-            return getExternalModuleMember(node.parent.parent.parent, node);
-        }
-        function getTargetOfNamespaceExportDeclaration(node) {
-            return resolveExternalModuleSymbol(node.parent.symbol);
-        }
-        function getTargetOfExportSpecifier(node) {
-            return node.parent.parent.moduleSpecifier ?
-                getExternalModuleMember(node.parent.parent, node) :
-                resolveEntityName(node.propertyName || node.name, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */);
-        }
-        function getTargetOfExportAssignment(node) {
-            return resolveEntityName(node.expression, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */);
-        }
-        function getTargetOfAliasDeclaration(node) {
-            switch (node.kind) {
-                case 229 /* ImportEqualsDeclaration */:
-                    return getTargetOfImportEqualsDeclaration(node);
-                case 231 /* ImportClause */:
-                    return getTargetOfImportClause(node);
-                case 232 /* NamespaceImport */:
-                    return getTargetOfNamespaceImport(node);
-                case 234 /* ImportSpecifier */:
-                    return getTargetOfImportSpecifier(node);
-                case 238 /* ExportSpecifier */:
-                    return getTargetOfExportSpecifier(node);
-                case 235 /* ExportAssignment */:
-                    return getTargetOfExportAssignment(node);
-                case 228 /* NamespaceExportDeclaration */:
-                    return getTargetOfNamespaceExportDeclaration(node);
-            }
-        }
-        function resolveSymbol(symbol) {
-            return symbol && symbol.flags & 8388608 /* Alias */ && !(symbol.flags & (107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */)) ? resolveAlias(symbol) : symbol;
-        }
-        function resolveAlias(symbol) {
-            ts.Debug.assert((symbol.flags & 8388608 /* Alias */) !== 0, "Should only get Alias here.");
-            var links = getSymbolLinks(symbol);
-            if (!links.target) {
-                links.target = resolvingSymbol;
-                var node = getDeclarationOfAliasSymbol(symbol);
-                var target = getTargetOfAliasDeclaration(node);
-                if (links.target === resolvingSymbol) {
-                    links.target = target || unknownSymbol;
-                }
-                else {
-                    error(node, ts.Diagnostics.Circular_definition_of_import_alias_0, symbolToString(symbol));
-                }
-            }
-            else if (links.target === resolvingSymbol) {
-                links.target = unknownSymbol;
-            }
-            return links.target;
-        }
-        function markExportAsReferenced(node) {
-            var symbol = getSymbolOfNode(node);
-            var target = resolveAlias(symbol);
-            if (target) {
-                var markAlias = target === unknownSymbol ||
-                    ((target.flags & 107455 /* Value */) && !isConstEnumOrConstEnumOnlyModule(target));
-                if (markAlias) {
-                    markAliasSymbolAsReferenced(symbol);
-                }
-            }
-        }
-        // When an alias symbol is referenced, we need to mark the entity it references as referenced and in turn repeat that until
-        // we reach a non-alias or an exported entity (which is always considered referenced). We do this by checking the target of
-        // the alias as an expression (which recursively takes us back here if the target references another alias).
-        function markAliasSymbolAsReferenced(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.referenced) {
-                links.referenced = true;
-                var node = getDeclarationOfAliasSymbol(symbol);
-                if (node.kind === 235 /* ExportAssignment */) {
-                    // export default <symbol>
-                    checkExpressionCached(node.expression);
-                }
-                else if (node.kind === 238 /* ExportSpecifier */) {
-                    // export { <symbol> } or export { <symbol> as foo }
-                    checkExpressionCached(node.propertyName || node.name);
-                }
-                else if (ts.isInternalModuleImportEqualsDeclaration(node)) {
-                    // import foo = <symbol>
-                    checkExpressionCached(node.moduleReference);
-                }
-            }
-        }
-        // This function is only for imports with entity names
-        function getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importDeclaration, dontResolveAlias) {
-            // There are three things we might try to look for. In the following examples,
-            // the search term is enclosed in |...|:
-            //
-            //     import a = |b|; // Namespace
-            //     import a = |b.c|; // Value, type, namespace
-            //     import a = |b.c|.d; // Namespace
-            if (entityName.kind === 69 /* Identifier */ && ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
-                entityName = entityName.parent;
-            }
-            // Check for case 1 and 3 in the above example
-            if (entityName.kind === 69 /* Identifier */ || entityName.parent.kind === 139 /* QualifiedName */) {
-                return resolveEntityName(entityName, 1536 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
-            }
-            else {
-                // Case 2 in above example
-                // entityName.kind could be a QualifiedName or a Missing identifier
-                ts.Debug.assert(entityName.parent.kind === 229 /* ImportEqualsDeclaration */);
-                return resolveEntityName(entityName, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
-            }
-        }
-        function getFullyQualifiedName(symbol) {
-            return symbol.parent ? getFullyQualifiedName(symbol.parent) + "." + symbolToString(symbol) : symbolToString(symbol);
-        }
-        // Resolves a qualified name and any involved aliases
-        function resolveEntityName(name, meaning, ignoreErrors, dontResolveAlias) {
-            if (ts.nodeIsMissing(name)) {
-                return undefined;
-            }
-            var symbol;
-            if (name.kind === 69 /* Identifier */) {
-                var message = meaning === 1536 /* Namespace */ ? ts.Diagnostics.Cannot_find_namespace_0 : ts.Diagnostics.Cannot_find_name_0;
-                symbol = resolveName(name, name.text, meaning, ignoreErrors ? undefined : message, name);
-                if (!symbol) {
-                    return undefined;
-                }
-            }
-            else if (name.kind === 139 /* QualifiedName */ || name.kind === 172 /* PropertyAccessExpression */) {
-                var left = name.kind === 139 /* QualifiedName */ ? name.left : name.expression;
-                var right = name.kind === 139 /* QualifiedName */ ? name.right : name.name;
-                var namespace = resolveEntityName(left, 1536 /* Namespace */, ignoreErrors);
-                if (!namespace || ts.nodeIsMissing(right)) {
-                    return undefined;
-                }
-                else if (namespace === unknownSymbol) {
-                    return namespace;
-                }
-                symbol = getSymbol(getExportsOfSymbol(namespace), right.text, meaning);
-                if (!symbol) {
-                    if (!ignoreErrors) {
-                        error(right, ts.Diagnostics.Module_0_has_no_exported_member_1, getFullyQualifiedName(namespace), ts.declarationNameToString(right));
-                    }
-                    return undefined;
-                }
-            }
-            else {
-                ts.Debug.fail("Unknown entity name kind.");
-            }
-            ts.Debug.assert((symbol.flags & 16777216 /* Instantiated */) === 0, "Should never get an instantiated symbol here.");
-            return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
-        }
-        function resolveExternalModuleName(location, moduleReferenceExpression) {
-            return resolveExternalModuleNameWorker(location, moduleReferenceExpression, ts.Diagnostics.Cannot_find_module_0);
-        }
-        function resolveExternalModuleNameWorker(location, moduleReferenceExpression, moduleNotFoundError) {
-            if (moduleReferenceExpression.kind !== 9 /* StringLiteral */) {
-                return;
-            }
-            var moduleReferenceLiteral = moduleReferenceExpression;
-            // Module names are escaped in our symbol table.  However, string literal values aren't.
-            // Escape the name in the "require(...)" clause to ensure we find the right symbol.
-            var moduleName = ts.escapeIdentifier(moduleReferenceLiteral.text);
-            if (moduleName === undefined) {
-                return;
-            }
-            var isRelative = ts.isExternalModuleNameRelative(moduleName);
-            if (!isRelative) {
-                var symbol = getSymbol(globals, '"' + moduleName + '"', 512 /* ValueModule */);
-                if (symbol) {
-                    // merged symbol is module declaration symbol combined with all augmentations
-                    return getMergedSymbol(symbol);
-                }
-            }
-            var resolvedModule = ts.getResolvedModule(ts.getSourceFileOfNode(location), moduleReferenceLiteral.text);
-            var sourceFile = resolvedModule && host.getSourceFile(resolvedModule.resolvedFileName);
-            if (sourceFile) {
-                if (sourceFile.symbol) {
-                    // merged symbol is module declaration symbol combined with all augmentations
-                    return getMergedSymbol(sourceFile.symbol);
-                }
-                if (moduleNotFoundError) {
-                    // report errors only if it was requested
-                    error(moduleReferenceLiteral, ts.Diagnostics.File_0_is_not_a_module, sourceFile.fileName);
-                }
-                return undefined;
-            }
-            if (patternAmbientModules) {
-                var pattern = ts.findBestPatternMatch(patternAmbientModules, function (_) { return _.pattern; }, moduleName);
-                if (pattern) {
-                    return getMergedSymbol(pattern.symbol);
-                }
-            }
-            if (moduleNotFoundError) {
-                // report errors only if it was requested
-                error(moduleReferenceLiteral, moduleNotFoundError, moduleName);
-            }
-            return undefined;
-        }
-        // An external module with an 'export =' declaration resolves to the target of the 'export =' declaration,
-        // and an external module with no 'export =' declaration resolves to the module itself.
-        function resolveExternalModuleSymbol(moduleSymbol) {
-            return moduleSymbol && getMergedSymbol(resolveSymbol(moduleSymbol.exports["export="])) || moduleSymbol;
-        }
-        // An external module with an 'export =' declaration may be referenced as an ES6 module provided the 'export ='
-        // references a symbol that is at least declared as a module or a variable. The target of the 'export =' may
-        // combine other declarations with the module or variable (e.g. a class/module, function/module, interface/variable).
-        function resolveESModuleSymbol(moduleSymbol, moduleReferenceExpression) {
-            var symbol = resolveExternalModuleSymbol(moduleSymbol);
-            if (symbol && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */))) {
-                error(moduleReferenceExpression, ts.Diagnostics.Module_0_resolves_to_a_non_module_entity_and_cannot_be_imported_using_this_construct, symbolToString(moduleSymbol));
-                symbol = undefined;
-            }
-            return symbol;
-        }
-        function hasExportAssignmentSymbol(moduleSymbol) {
-            return moduleSymbol.exports["export="] !== undefined;
-        }
-        function getExportsOfModuleAsArray(moduleSymbol) {
-            return symbolsToArray(getExportsOfModule(moduleSymbol));
-        }
-        function getExportsOfSymbol(symbol) {
-            return symbol.flags & 1536 /* Module */ ? getExportsOfModule(symbol) : symbol.exports || emptySymbols;
-        }
-        function getExportsOfModule(moduleSymbol) {
-            var links = getSymbolLinks(moduleSymbol);
-            return links.resolvedExports || (links.resolvedExports = getExportsForModule(moduleSymbol));
-        }
-        /**
-         * Extends one symbol table with another while collecting information on name collisions for error message generation into the `lookupTable` argument
-         * Not passing `lookupTable` and `exportNode` disables this collection, and just extends the tables
-         */
-        function extendExportSymbols(target, source, lookupTable, exportNode) {
-            for (var id in source) {
-                if (id !== "default" && !ts.hasProperty(target, id)) {
-                    target[id] = source[id];
-                    if (lookupTable && exportNode) {
-                        lookupTable[id] = {
-                            specifierText: ts.getTextOfNode(exportNode.moduleSpecifier)
-                        };
-                    }
-                }
-                else if (lookupTable && exportNode && id !== "default" && ts.hasProperty(target, id) && resolveSymbol(target[id]) !== resolveSymbol(source[id])) {
-                    if (!lookupTable[id].exportsWithDuplicate) {
-                        lookupTable[id].exportsWithDuplicate = [exportNode];
-                    }
-                    else {
-                        lookupTable[id].exportsWithDuplicate.push(exportNode);
-                    }
-                }
-            }
-        }
-        function getExportsForModule(moduleSymbol) {
-            var visitedSymbols = [];
-            return visit(moduleSymbol) || moduleSymbol.exports;
-            // The ES6 spec permits export * declarations in a module to circularly reference the module itself. For example,
-            // module 'a' can 'export * from "b"' and 'b' can 'export * from "a"' without error.
-            function visit(symbol) {
-                if (!(symbol && symbol.flags & 1952 /* HasExports */ && !ts.contains(visitedSymbols, symbol))) {
-                    return;
-                }
-                visitedSymbols.push(symbol);
-                var symbols = cloneSymbolTable(symbol.exports);
-                // All export * declarations are collected in an __export symbol by the binder
-                var exportStars = symbol.exports["__export"];
-                if (exportStars) {
-                    var nestedSymbols = {};
-                    var lookupTable = {};
-                    for (var _i = 0, _a = exportStars.declarations; _i < _a.length; _i++) {
-                        var node = _a[_i];
-                        var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-                        var exportedSymbols = visit(resolvedModule);
-                        extendExportSymbols(nestedSymbols, exportedSymbols, lookupTable, node);
-                    }
-                    for (var id in lookupTable) {
-                        var exportsWithDuplicate = lookupTable[id].exportsWithDuplicate;
-                        // It's not an error if the file with multiple `export *`s with duplicate names exports a member with that name itself
-                        if (id === "export=" || !(exportsWithDuplicate && exportsWithDuplicate.length) || ts.hasProperty(symbols, id)) {
-                            continue;
-                        }
-                        for (var _b = 0, exportsWithDuplicate_1 = exportsWithDuplicate; _b < exportsWithDuplicate_1.length; _b++) {
-                            var node = exportsWithDuplicate_1[_b];
-                            diagnostics.add(ts.createDiagnosticForNode(node, ts.Diagnostics.Module_0_has_already_exported_a_member_named_1_Consider_explicitly_re_exporting_to_resolve_the_ambiguity, lookupTable[id].specifierText, id));
-                        }
-                    }
-                    extendExportSymbols(symbols, nestedSymbols);
-                }
-                return symbols;
-            }
-        }
-        function getMergedSymbol(symbol) {
-            var merged;
-            return symbol && symbol.mergeId && (merged = mergedSymbols[symbol.mergeId]) ? merged : symbol;
-        }
-        function getSymbolOfNode(node) {
-            return getMergedSymbol(node.symbol);
-        }
-        function getParentOfSymbol(symbol) {
-            return getMergedSymbol(symbol.parent);
-        }
-        function getExportSymbolOfValueSymbolIfExported(symbol) {
-            return symbol && (symbol.flags & 1048576 /* ExportValue */) !== 0
-                ? getMergedSymbol(symbol.exportSymbol)
-                : symbol;
-        }
-        function symbolIsValue(symbol) {
-            // If it is an instantiated symbol, then it is a value if the symbol it is an
-            // instantiation of is a value.
-            if (symbol.flags & 16777216 /* Instantiated */) {
-                return symbolIsValue(getSymbolLinks(symbol).target);
-            }
-            // If the symbol has the value flag, it is trivially a value.
-            if (symbol.flags & 107455 /* Value */) {
-                return true;
-            }
-            // If it is an alias, then it is a value if the symbol it resolves to is a value.
-            if (symbol.flags & 8388608 /* Alias */) {
-                return (resolveAlias(symbol).flags & 107455 /* Value */) !== 0;
-            }
-            return false;
-        }
-        function findConstructorDeclaration(node) {
-            var members = node.members;
-            for (var _i = 0, members_1 = members; _i < members_1.length; _i++) {
-                var member = members_1[_i];
-                if (member.kind === 148 /* Constructor */ && ts.nodeIsPresent(member.body)) {
-                    return member;
-                }
-            }
-        }
-        function createType(flags) {
-            var result = new Type(checker, flags);
-            result.id = typeCount;
-            typeCount++;
-            return result;
-        }
-        function createIntrinsicType(kind, intrinsicName) {
-            var type = createType(kind);
-            type.intrinsicName = intrinsicName;
-            return type;
-        }
-        function createObjectType(kind, symbol) {
-            var type = createType(kind);
-            type.symbol = symbol;
-            return type;
-        }
-        // A reserved member name starts with two underscores, but the third character cannot be an underscore
-        // or the @ symbol. A third underscore indicates an escaped form of an identifer that started
-        // with at least two underscores. The @ character indicates that the name is denoted by a well known ES
-        // Symbol instance.
-        function isReservedMemberName(name) {
-            return name.charCodeAt(0) === 95 /* _ */ &&
-                name.charCodeAt(1) === 95 /* _ */ &&
-                name.charCodeAt(2) !== 95 /* _ */ &&
-                name.charCodeAt(2) !== 64 /* at */;
-        }
-        function getNamedMembers(members) {
-            var result;
-            for (var id in members) {
-                if (ts.hasProperty(members, id)) {
-                    if (!isReservedMemberName(id)) {
-                        if (!result)
-                            result = [];
-                        var symbol = members[id];
-                        if (symbolIsValue(symbol)) {
-                            result.push(symbol);
-                        }
-                    }
-                }
-            }
-            return result || emptyArray;
-        }
-        function setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            type.members = members;
-            type.properties = getNamedMembers(members);
-            type.callSignatures = callSignatures;
-            type.constructSignatures = constructSignatures;
-            if (stringIndexInfo)
-                type.stringIndexInfo = stringIndexInfo;
-            if (numberIndexInfo)
-                type.numberIndexInfo = numberIndexInfo;
-            return type;
-        }
-        function createAnonymousType(symbol, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
-            return setObjectTypeMembers(createObjectType(65536 /* Anonymous */, symbol), members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-        }
-        function forEachSymbolTableInScope(enclosingDeclaration, callback) {
-            var result;
-            for (var location_1 = enclosingDeclaration; location_1; location_1 = location_1.parent) {
-                // Locals of a source file are not in scope (because they get merged into the global symbol table)
-                if (location_1.locals && !isGlobalSourceFile(location_1)) {
-                    if (result = callback(location_1.locals)) {
-                        return result;
-                    }
-                }
-                switch (location_1.kind) {
-                    case 256 /* SourceFile */:
-                        if (!ts.isExternalOrCommonJsModule(location_1)) {
-                            break;
-                        }
-                    case 225 /* ModuleDeclaration */:
-                        if (result = callback(getSymbolOfNode(location_1).exports)) {
-                            return result;
-                        }
-                        break;
-                }
-            }
-            return callback(globals);
-        }
-        function getQualifiedLeftMeaning(rightMeaning) {
-            // If we are looking in value space, the parent meaning is value, other wise it is namespace
-            return rightMeaning === 107455 /* Value */ ? 107455 /* Value */ : 1536 /* Namespace */;
-        }
-        function getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, useOnlyExternalAliasing) {
-            function getAccessibleSymbolChainFromSymbolTable(symbols) {
-                function canQualifySymbol(symbolFromSymbolTable, meaning) {
-                    // If the symbol is equivalent and doesn't need further qualification, this symbol is accessible
-                    if (!needsQualification(symbolFromSymbolTable, enclosingDeclaration, meaning)) {
-                        return true;
-                    }
-                    // If symbol needs qualification, make sure that parent is accessible, if it is then this symbol is accessible too
-                    var accessibleParent = getAccessibleSymbolChain(symbolFromSymbolTable.parent, enclosingDeclaration, getQualifiedLeftMeaning(meaning), useOnlyExternalAliasing);
-                    return !!accessibleParent;
-                }
-                function isAccessible(symbolFromSymbolTable, resolvedAliasSymbol) {
-                    if (symbol === (resolvedAliasSymbol || symbolFromSymbolTable)) {
-                        // if the symbolFromSymbolTable is not external module (it could be if it was determined as ambient external module and would be in globals table)
-                        // and if symbolFromSymbolTable or alias resolution matches the symbol,
-                        // check the symbol can be qualified, it is only then this symbol is accessible
-                        return !ts.forEach(symbolFromSymbolTable.declarations, hasExternalModuleSymbol) &&
-                            canQualifySymbol(symbolFromSymbolTable, meaning);
-                    }
-                }
-                // If symbol is directly available by its name in the symbol table
-                if (isAccessible(ts.lookUp(symbols, symbol.name))) {
-                    return [symbol];
-                }
-                // Check if symbol is any of the alias
-                return ts.forEachValue(symbols, function (symbolFromSymbolTable) {
-                    if (symbolFromSymbolTable.flags & 8388608 /* Alias */
-                        && symbolFromSymbolTable.name !== "export="
-                        && !ts.getDeclarationOfKind(symbolFromSymbolTable, 238 /* ExportSpecifier */)) {
-                        if (!useOnlyExternalAliasing ||
-                            // Is this external alias, then use it to name
-                            ts.forEach(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration)) {
-                            var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
-                            if (isAccessible(symbolFromSymbolTable, resolveAlias(symbolFromSymbolTable))) {
-                                return [symbolFromSymbolTable];
-                            }
-                            // Look in the exported members, if we can find accessibleSymbolChain, symbol is accessible using this chain
-                            // but only if the symbolFromSymbolTable can be qualified
-                            var accessibleSymbolsFromExports = resolvedImportedSymbol.exports ? getAccessibleSymbolChainFromSymbolTable(resolvedImportedSymbol.exports) : undefined;
-                            if (accessibleSymbolsFromExports && canQualifySymbol(symbolFromSymbolTable, getQualifiedLeftMeaning(meaning))) {
-                                return [symbolFromSymbolTable].concat(accessibleSymbolsFromExports);
-                            }
-                        }
-                    }
-                });
-            }
-            if (symbol) {
-                if (!(isPropertyOrMethodDeclarationSymbol(symbol))) {
-                    return forEachSymbolTableInScope(enclosingDeclaration, getAccessibleSymbolChainFromSymbolTable);
-                }
-            }
-        }
-        function needsQualification(symbol, enclosingDeclaration, meaning) {
-            var qualify = false;
-            forEachSymbolTableInScope(enclosingDeclaration, function (symbolTable) {
-                // If symbol of this name is not available in the symbol table we are ok
-                if (!ts.hasProperty(symbolTable, symbol.name)) {
-                    // Continue to the next symbol table
-                    return false;
-                }
-                // If the symbol with this name is present it should refer to the symbol
-                var symbolFromSymbolTable = symbolTable[symbol.name];
-                if (symbolFromSymbolTable === symbol) {
-                    // No need to qualify
-                    return true;
-                }
-                // Qualify if the symbol from symbol table has same meaning as expected
-                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 8388608 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 238 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
-                if (symbolFromSymbolTable.flags & meaning) {
-                    qualify = true;
-                    return true;
-                }
-                // Continue to the next symbol table
-                return false;
-            });
-            return qualify;
-        }
-        function isPropertyOrMethodDeclarationSymbol(symbol) {
-            if (symbol.declarations && symbol.declarations.length) {
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var declaration = _a[_i];
-                    switch (declaration.kind) {
-                        case 145 /* PropertyDeclaration */:
-                        case 147 /* MethodDeclaration */:
-                        case 149 /* GetAccessor */:
-                        case 150 /* SetAccessor */:
-                            continue;
-                        default:
-                            return false;
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        function isSymbolAccessible(symbol, enclosingDeclaration, meaning) {
-            if (symbol && enclosingDeclaration && !(symbol.flags & 262144 /* TypeParameter */)) {
-                var initialSymbol = symbol;
-                var meaningToLook = meaning;
-                while (symbol) {
-                    // Symbol is accessible if it by itself is accessible
-                    var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaningToLook, /*useOnlyExternalAliasing*/ false);
-                    if (accessibleSymbolChain) {
-                        var hasAccessibleDeclarations = hasVisibleDeclarations(accessibleSymbolChain[0]);
-                        if (!hasAccessibleDeclarations) {
-                            return {
-                                accessibility: 1 /* NotAccessible */,
-                                errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning),
-                                errorModuleName: symbol !== initialSymbol ? symbolToString(symbol, enclosingDeclaration, 1536 /* Namespace */) : undefined
-                            };
-                        }
-                        return hasAccessibleDeclarations;
-                    }
-                    // If we haven't got the accessible symbol, it doesn't mean the symbol is actually inaccessible.
-                    // It could be a qualified symbol and hence verify the path
-                    // e.g.:
-                    // module m {
-                    //     export class c {
-                    //     }
-                    // }
-                    // const x: typeof m.c
-                    // In the above example when we start with checking if typeof m.c symbol is accessible,
-                    // we are going to see if c can be accessed in scope directly.
-                    // But it can't, hence the accessible is going to be undefined, but that doesn't mean m.c is inaccessible
-                    // It is accessible if the parent m is accessible because then m.c can be accessed through qualification
-                    meaningToLook = getQualifiedLeftMeaning(meaning);
-                    symbol = getParentOfSymbol(symbol);
-                }
-                // This could be a symbol that is not exported in the external module
-                // or it could be a symbol from different external module that is not aliased and hence cannot be named
-                var symbolExternalModule = ts.forEach(initialSymbol.declarations, getExternalModuleContainer);
-                if (symbolExternalModule) {
-                    var enclosingExternalModule = getExternalModuleContainer(enclosingDeclaration);
-                    if (symbolExternalModule !== enclosingExternalModule) {
-                        // name from different external module that is not visible
-                        return {
-                            accessibility: 2 /* CannotBeNamed */,
-                            errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning),
-                            errorModuleName: symbolToString(symbolExternalModule)
-                        };
-                    }
-                }
-                // Just a local name that is not accessible
-                return {
-                    accessibility: 1 /* NotAccessible */,
-                    errorSymbolName: symbolToString(initialSymbol, enclosingDeclaration, meaning)
-                };
-            }
-            return { accessibility: 0 /* Accessible */ };
-            function getExternalModuleContainer(declaration) {
-                for (; declaration; declaration = declaration.parent) {
-                    if (hasExternalModuleSymbol(declaration)) {
-                        return getSymbolOfNode(declaration);
-                    }
-                }
-            }
-        }
-        function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
-        }
-        function hasVisibleDeclarations(symbol) {
-            var aliasesToMakeVisible;
-            if (ts.forEach(symbol.declarations, function (declaration) { return !getIsDeclarationVisible(declaration); })) {
-                return undefined;
-            }
-            return { accessibility: 0 /* Accessible */, aliasesToMakeVisible: aliasesToMakeVisible };
-            function getIsDeclarationVisible(declaration) {
-                if (!isDeclarationVisible(declaration)) {
-                    // Mark the unexported alias as visible if its parent is visible
-                    // because these kind of aliases can be used to name types in declaration file
-                    var anyImportSyntax = getAnyImportSyntax(declaration);
-                    if (anyImportSyntax &&
-                        !(anyImportSyntax.flags & 1 /* Export */) &&
-                        isDeclarationVisible(anyImportSyntax.parent)) {
-                        getNodeLinks(declaration).isVisible = true;
-                        if (aliasesToMakeVisible) {
-                            if (!ts.contains(aliasesToMakeVisible, anyImportSyntax)) {
-                                aliasesToMakeVisible.push(anyImportSyntax);
-                            }
-                        }
-                        else {
-                            aliasesToMakeVisible = [anyImportSyntax];
-                        }
-                        return true;
-                    }
-                    // Declaration is not visible
-                    return false;
-                }
-                return true;
-            }
-        }
-        function isEntityNameVisible(entityName, enclosingDeclaration) {
-            // get symbol of the first identifier of the entityName
-            var meaning;
-            if (entityName.parent.kind === 158 /* TypeQuery */ || ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
-                // Typeof value
-                meaning = 107455 /* Value */ | 1048576 /* ExportValue */;
-            }
-            else if (entityName.kind === 139 /* QualifiedName */ || entityName.kind === 172 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 229 /* ImportEqualsDeclaration */) {
-                // Left identifier from type reference or TypeAlias
-                // Entity name of the import declaration
-                meaning = 1536 /* Namespace */;
-            }
-            else {
-                // Type Reference or TypeAlias entity = Identifier
-                meaning = 793056 /* Type */;
-            }
-            var firstIdentifier = getFirstIdentifier(entityName);
-            var symbol = resolveName(enclosingDeclaration, firstIdentifier.text, meaning, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
-            // Verify if the symbol is accessible
-            return (symbol && hasVisibleDeclarations(symbol)) || {
-                accessibility: 1 /* NotAccessible */,
-                errorSymbolName: ts.getTextOfNode(firstIdentifier),
-                errorNode: firstIdentifier
-            };
-        }
-        function writeKeyword(writer, kind) {
-            writer.writeKeyword(ts.tokenToString(kind));
-        }
-        function writePunctuation(writer, kind) {
-            writer.writePunctuation(ts.tokenToString(kind));
-        }
-        function writeSpace(writer) {
-            writer.writeSpace(" ");
-        }
-        function symbolToString(symbol, enclosingDeclaration, meaning) {
-            var writer = ts.getSingleLineStringWriter();
-            getSymbolDisplayBuilder().buildSymbolDisplay(symbol, writer, enclosingDeclaration, meaning);
-            var result = writer.string();
-            ts.releaseStringWriter(writer);
-            return result;
-        }
-        function signatureToString(signature, enclosingDeclaration, flags, kind) {
-            var writer = ts.getSingleLineStringWriter();
-            getSymbolDisplayBuilder().buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind);
-            var result = writer.string();
-            ts.releaseStringWriter(writer);
-            return result;
-        }
-        function typeToString(type, enclosingDeclaration, flags) {
-            var writer = ts.getSingleLineStringWriter();
-            getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
-            var result = writer.string();
-            ts.releaseStringWriter(writer);
-            var maxLength = compilerOptions.noErrorTruncation || flags & 4 /* NoTruncation */ ? undefined : 100;
-            if (maxLength && result.length >= maxLength) {
-                result = result.substr(0, maxLength - "...".length) + "...";
-            }
-            return result;
-        }
-        function typePredicateToString(typePredicate, enclosingDeclaration, flags) {
-            var writer = ts.getSingleLineStringWriter();
-            getSymbolDisplayBuilder().buildTypePredicateDisplay(typePredicate, writer, enclosingDeclaration, flags);
-            var result = writer.string();
-            ts.releaseStringWriter(writer);
-            return result;
-        }
-        function visibilityToString(flags) {
-            if (flags === 8 /* Private */) {
-                return "private";
-            }
-            if (flags === 16 /* Protected */) {
-                return "protected";
-            }
-            return "public";
-        }
-        function getTypeAliasForTypeLiteral(type) {
-            if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
-                var node = type.symbol.declarations[0].parent;
-                while (node.kind === 164 /* ParenthesizedType */) {
-                    node = node.parent;
-                }
-                if (node.kind === 223 /* TypeAliasDeclaration */) {
-                    return getSymbolOfNode(node);
-                }
-            }
-            return undefined;
-        }
-        function isTopLevelInExternalModuleAugmentation(node) {
-            return node && node.parent &&
-                node.parent.kind === 226 /* ModuleBlock */ &&
-                ts.isExternalModuleAugmentation(node.parent.parent);
-        }
-        function getSymbolDisplayBuilder() {
-            function getNameOfSymbol(symbol) {
-                if (symbol.declarations && symbol.declarations.length) {
-                    var declaration = symbol.declarations[0];
-                    if (declaration.name) {
-                        return ts.declarationNameToString(declaration.name);
-                    }
-                    switch (declaration.kind) {
-                        case 192 /* ClassExpression */:
-                            return "(Anonymous class)";
-                        case 179 /* FunctionExpression */:
-                        case 180 /* ArrowFunction */:
-                            return "(Anonymous function)";
-                    }
-                }
-                return symbol.name;
-            }
-            /**
-             * Writes only the name of the symbol out to the writer. Uses the original source text
-             * for the name of the symbol if it is available to match how the user wrote the name.
-             */
-            function appendSymbolNameOnly(symbol, writer) {
-                writer.writeSymbol(getNameOfSymbol(symbol), symbol);
-            }
-            /**
-             * Writes a property access or element access with the name of the symbol out to the writer.
-             * Uses the original source text for the name of the symbol if it is available to match how the user wrote the name,
-             * ensuring that any names written with literals use element accesses.
-             */
-            function appendPropertyOrElementAccessForSymbol(symbol, writer) {
-                var symbolName = getNameOfSymbol(symbol);
-                var firstChar = symbolName.charCodeAt(0);
-                var needsElementAccess = !ts.isIdentifierStart(firstChar, languageVersion);
-                if (needsElementAccess) {
-                    writePunctuation(writer, 19 /* OpenBracketToken */);
-                    if (ts.isSingleOrDoubleQuote(firstChar)) {
-                        writer.writeStringLiteral(symbolName);
-                    }
-                    else {
-                        writer.writeSymbol(symbolName, symbol);
-                    }
-                    writePunctuation(writer, 20 /* CloseBracketToken */);
-                }
-                else {
-                    writePunctuation(writer, 21 /* DotToken */);
-                    writer.writeSymbol(symbolName, symbol);
-                }
-            }
-            /**
-             * Enclosing declaration is optional when we don't want to get qualified name in the enclosing declaration scope
-             * Meaning needs to be specified if the enclosing declaration is given
-             */
-            function buildSymbolDisplay(symbol, writer, enclosingDeclaration, meaning, flags, typeFlags) {
-                var parentSymbol;
-                function appendParentTypeArgumentsAndSymbolName(symbol) {
-                    if (parentSymbol) {
-                        // Write type arguments of instantiated class/interface here
-                        if (flags & 1 /* WriteTypeParametersOrArguments */) {
-                            if (symbol.flags & 16777216 /* Instantiated */) {
-                                buildDisplayForTypeArgumentsAndDelimiters(getTypeParametersOfClassOrInterface(parentSymbol), symbol.mapper, writer, enclosingDeclaration);
-                            }
-                            else {
-                                buildTypeParameterDisplayFromSymbol(parentSymbol, writer, enclosingDeclaration);
-                            }
-                        }
-                        appendPropertyOrElementAccessForSymbol(symbol, writer);
-                    }
-                    else {
-                        appendSymbolNameOnly(symbol, writer);
-                    }
-                    parentSymbol = symbol;
-                }
-                // const the writer know we just wrote out a symbol.  The declaration emitter writer uses
-                // this to determine if an import it has previously seen (and not written out) needs
-                // to be written to the file once the walk of the tree is complete.
-                //
-                // NOTE(cyrusn): This approach feels somewhat unfortunate.  A simple pass over the tree
-                // up front (for example, during checking) could determine if we need to emit the imports
-                // and we could then access that data during declaration emit.
-                writer.trackSymbol(symbol, enclosingDeclaration, meaning);
-                function walkSymbol(symbol, meaning) {
-                    if (symbol) {
-                        var accessibleSymbolChain = getAccessibleSymbolChain(symbol, enclosingDeclaration, meaning, !!(flags & 2 /* UseOnlyExternalAliasing */));
-                        if (!accessibleSymbolChain ||
-                            needsQualification(accessibleSymbolChain[0], enclosingDeclaration, accessibleSymbolChain.length === 1 ? meaning : getQualifiedLeftMeaning(meaning))) {
-                            // Go up and add our parent.
-                            walkSymbol(getParentOfSymbol(accessibleSymbolChain ? accessibleSymbolChain[0] : symbol), getQualifiedLeftMeaning(meaning));
-                        }
-                        if (accessibleSymbolChain) {
-                            for (var _i = 0, accessibleSymbolChain_1 = accessibleSymbolChain; _i < accessibleSymbolChain_1.length; _i++) {
-                                var accessibleSymbol = accessibleSymbolChain_1[_i];
-                                appendParentTypeArgumentsAndSymbolName(accessibleSymbol);
-                            }
-                        }
-                        else {
-                            // If we didn't find accessible symbol chain for this symbol, break if this is external module
-                            if (!parentSymbol && ts.forEach(symbol.declarations, hasExternalModuleSymbol)) {
-                                return;
-                            }
-                            // if this is anonymous type break
-                            if (symbol.flags & 2048 /* TypeLiteral */ || symbol.flags & 4096 /* ObjectLiteral */) {
-                                return;
-                            }
-                            appendParentTypeArgumentsAndSymbolName(symbol);
-                        }
-                    }
-                }
-                // Get qualified name if the symbol is not a type parameter
-                // and there is an enclosing declaration or we specifically
-                // asked for it
-                var isTypeParameter = symbol.flags & 262144 /* TypeParameter */;
-                var typeFormatFlag = 128 /* UseFullyQualifiedType */ & typeFlags;
-                if (!isTypeParameter && (enclosingDeclaration || typeFormatFlag)) {
-                    walkSymbol(symbol, meaning);
-                    return;
-                }
-                return appendParentTypeArgumentsAndSymbolName(symbol);
-            }
-            function buildTypeDisplay(type, writer, enclosingDeclaration, globalFlags, symbolStack) {
-                var globalFlagsToPass = globalFlags & 16 /* WriteOwnNameForAnyLike */;
-                var inObjectTypeLiteral = false;
-                return writeType(type, globalFlags);
-                function writeType(type, flags) {
-                    // Write undefined/null type as any
-                    if (type.flags & 150995071 /* Intrinsic */) {
-                        // Special handling for unknown / resolving types, they should show up as any and not unknown or __resolving
-                        writer.writeKeyword(!(globalFlags & 16 /* WriteOwnNameForAnyLike */) && isTypeAny(type)
-                            ? "any"
-                            : type.intrinsicName);
-                    }
-                    else if (type.flags & 33554432 /* ThisType */) {
-                        if (inObjectTypeLiteral) {
-                            writer.reportInaccessibleThisError();
-                        }
-                        writer.writeKeyword("this");
-                    }
-                    else if (type.flags & 4096 /* Reference */) {
-                        writeTypeReference(type, flags);
-                    }
-                    else if (type.flags & (1024 /* Class */ | 2048 /* Interface */ | 128 /* Enum */ | 512 /* TypeParameter */)) {
-                        // The specified symbol flags need to be reinterpreted as type flags
-                        buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 793056 /* Type */, 0 /* None */, flags);
-                    }
-                    else if (type.flags & 8192 /* Tuple */) {
-                        writeTupleType(type);
-                    }
-                    else if (type.flags & 49152 /* UnionOrIntersection */) {
-                        writeUnionOrIntersectionType(type, flags);
-                    }
-                    else if (type.flags & 65536 /* Anonymous */) {
-                        writeAnonymousType(type, flags);
-                    }
-                    else if (type.flags & 256 /* StringLiteral */) {
-                        writer.writeStringLiteral("\"" + ts.escapeString(type.text) + "\"");
-                    }
-                    else {
-                        // Should never get here
-                        // { ... }
-                        writePunctuation(writer, 15 /* OpenBraceToken */);
-                        writeSpace(writer);
-                        writePunctuation(writer, 22 /* DotDotDotToken */);
-                        writeSpace(writer);
-                        writePunctuation(writer, 16 /* CloseBraceToken */);
-                    }
-                }
-                function writeTypeList(types, delimiter) {
-                    for (var i = 0; i < types.length; i++) {
-                        if (i > 0) {
-                            if (delimiter !== 24 /* CommaToken */) {
-                                writeSpace(writer);
-                            }
-                            writePunctuation(writer, delimiter);
-                            writeSpace(writer);
-                        }
-                        writeType(types[i], delimiter === 24 /* CommaToken */ ? 0 /* None */ : 64 /* InElementType */);
-                    }
-                }
-                function writeSymbolTypeReference(symbol, typeArguments, pos, end, flags) {
-                    // Unnamed function expressions and arrow functions have reserved names that we don't want to display
-                    if (symbol.flags & 32 /* Class */ || !isReservedMemberName(symbol.name)) {
-                        buildSymbolDisplay(symbol, writer, enclosingDeclaration, 793056 /* Type */, 0 /* None */, flags);
-                    }
-                    if (pos < end) {
-                        writePunctuation(writer, 25 /* LessThanToken */);
-                        writeType(typeArguments[pos], 256 /* InFirstTypeArgument */);
-                        pos++;
-                        while (pos < end) {
-                            writePunctuation(writer, 24 /* CommaToken */);
-                            writeSpace(writer);
-                            writeType(typeArguments[pos], 0 /* None */);
-                            pos++;
-                        }
-                        writePunctuation(writer, 27 /* GreaterThanToken */);
-                    }
-                }
-                function writeTypeReference(type, flags) {
-                    var typeArguments = type.typeArguments || emptyArray;
-                    if (type.target === globalArrayType && !(flags & 1 /* WriteArrayAsGenericType */)) {
-                        writeType(typeArguments[0], 64 /* InElementType */);
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                    }
-                    else {
-                        // Write the type reference in the format f<A>.g<B>.C<X, Y> where A and B are type arguments
-                        // for outer type parameters, and f and g are the respective declaring containers of those
-                        // type parameters.
-                        var outerTypeParameters = type.target.outerTypeParameters;
-                        var i = 0;
-                        if (outerTypeParameters) {
-                            var length_1 = outerTypeParameters.length;
-                            while (i < length_1) {
-                                // Find group of type arguments for type parameters with the same declaring container.
-                                var start = i;
-                                var parent_7 = getParentSymbolOfTypeParameter(outerTypeParameters[i]);
-                                do {
-                                    i++;
-                                } while (i < length_1 && getParentSymbolOfTypeParameter(outerTypeParameters[i]) === parent_7);
-                                // When type parameters are their own type arguments for the whole group (i.e. we have
-                                // the default outer type arguments), we don't show the group.
-                                if (!ts.rangeEquals(outerTypeParameters, typeArguments, start, i)) {
-                                    writeSymbolTypeReference(parent_7, typeArguments, start, i, flags);
-                                    writePunctuation(writer, 21 /* DotToken */);
-                                }
-                            }
-                        }
-                        var typeParameterCount = (type.target.typeParameters || emptyArray).length;
-                        writeSymbolTypeReference(type.symbol, typeArguments, i, typeParameterCount, flags);
-                    }
-                }
-                function writeTupleType(type) {
-                    writePunctuation(writer, 19 /* OpenBracketToken */);
-                    writeTypeList(type.elementTypes, 24 /* CommaToken */);
-                    writePunctuation(writer, 20 /* CloseBracketToken */);
-                }
-                function writeUnionOrIntersectionType(type, flags) {
-                    if (flags & 64 /* InElementType */) {
-                        writePunctuation(writer, 17 /* OpenParenToken */);
-                    }
-                    writeTypeList(type.types, type.flags & 16384 /* Union */ ? 47 /* BarToken */ : 46 /* AmpersandToken */);
-                    if (flags & 64 /* InElementType */) {
-                        writePunctuation(writer, 18 /* CloseParenToken */);
-                    }
-                }
-                function writeAnonymousType(type, flags) {
-                    var symbol = type.symbol;
-                    if (symbol) {
-                        // Always use 'typeof T' for type of class, enum, and module objects
-                        if (symbol.flags & (32 /* Class */ | 384 /* Enum */ | 512 /* ValueModule */)) {
-                            writeTypeOfSymbol(type, flags);
-                        }
-                        else if (shouldWriteTypeOfFunctionSymbol()) {
-                            writeTypeOfSymbol(type, flags);
-                        }
-                        else if (ts.contains(symbolStack, symbol)) {
-                            // If type is an anonymous type literal in a type alias declaration, use type alias name
-                            var typeAlias = getTypeAliasForTypeLiteral(type);
-                            if (typeAlias) {
-                                // The specified symbol flags need to be reinterpreted as type flags
-                                buildSymbolDisplay(typeAlias, writer, enclosingDeclaration, 793056 /* Type */, 0 /* None */, flags);
-                            }
-                            else {
-                                // Recursive usage, use any
-                                writeKeyword(writer, 117 /* AnyKeyword */);
-                            }
-                        }
-                        else {
-                            // Since instantiations of the same anonymous type have the same symbol, tracking symbols instead
-                            // of types allows us to catch circular references to instantiations of the same anonymous type
-                            if (!symbolStack) {
-                                symbolStack = [];
-                            }
-                            symbolStack.push(symbol);
-                            writeLiteralType(type, flags);
-                            symbolStack.pop();
-                        }
-                    }
-                    else {
-                        // Anonymous types with no symbol are never circular
-                        writeLiteralType(type, flags);
-                    }
-                    function shouldWriteTypeOfFunctionSymbol() {
-                        var isStaticMethodSymbol = !!(symbol.flags & 8192 /* Method */ &&
-                            ts.forEach(symbol.declarations, function (declaration) { return declaration.flags & 32 /* Static */; }));
-                        var isNonLocalFunctionSymbol = !!(symbol.flags & 16 /* Function */) &&
-                            (symbol.parent ||
-                                ts.forEach(symbol.declarations, function (declaration) {
-                                    return declaration.parent.kind === 256 /* SourceFile */ || declaration.parent.kind === 226 /* ModuleBlock */;
-                                }));
-                        if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
-                            // typeof is allowed only for static/non local functions
-                            return !!(flags & 2 /* UseTypeOfFunction */) ||
-                                (ts.contains(symbolStack, symbol)); // it is type of the symbol uses itself recursively
-                        }
-                    }
-                }
-                function writeTypeOfSymbol(type, typeFormatFlags) {
-                    writeKeyword(writer, 101 /* TypeOfKeyword */);
-                    writeSpace(writer);
-                    buildSymbolDisplay(type.symbol, writer, enclosingDeclaration, 107455 /* Value */, 0 /* None */, typeFormatFlags);
-                }
-                function writeIndexSignature(info, keyword) {
-                    if (info) {
-                        if (info.isReadonly) {
-                            writeKeyword(writer, 128 /* ReadonlyKeyword */);
-                            writeSpace(writer);
-                        }
-                        writePunctuation(writer, 19 /* OpenBracketToken */);
-                        writer.writeParameter(info.declaration ? ts.declarationNameToString(info.declaration.parameters[0].name) : "x");
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeKeyword(writer, keyword);
-                        writePunctuation(writer, 20 /* CloseBracketToken */);
-                        writePunctuation(writer, 54 /* ColonToken */);
-                        writeSpace(writer);
-                        writeType(info.type, 0 /* None */);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
-                }
-                function writePropertyWithModifiers(prop) {
-                    if (isReadonlySymbol(prop)) {
-                        writeKeyword(writer, 128 /* ReadonlyKeyword */);
-                        writeSpace(writer);
-                    }
-                    buildSymbolDisplay(prop, writer);
-                    if (prop.flags & 536870912 /* Optional */) {
-                        writePunctuation(writer, 53 /* QuestionToken */);
-                    }
-                }
-                function shouldAddParenthesisAroundFunctionType(callSignature, flags) {
-                    if (flags & 64 /* InElementType */) {
-                        return true;
-                    }
-                    else if (flags & 256 /* InFirstTypeArgument */) {
-                        // Add parenthesis around function type for the first type argument to avoid ambiguity
-                        var typeParameters = callSignature.target && (flags & 32 /* WriteTypeArgumentsOfSignature */) ?
-                            callSignature.target.typeParameters : callSignature.typeParameters;
-                        return typeParameters && typeParameters.length !== 0;
-                    }
-                    return false;
-                }
-                function writeLiteralType(type, flags) {
-                    var resolved = resolveStructuredTypeMembers(type);
-                    if (!resolved.properties.length && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                        if (!resolved.callSignatures.length && !resolved.constructSignatures.length) {
-                            writePunctuation(writer, 15 /* OpenBraceToken */);
-                            writePunctuation(writer, 16 /* CloseBraceToken */);
-                            return;
-                        }
-                        if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
-                            var parenthesizeSignature = shouldAddParenthesisAroundFunctionType(resolved.callSignatures[0], flags);
-                            if (parenthesizeSignature) {
-                                writePunctuation(writer, 17 /* OpenParenToken */);
-                            }
-                            buildSignatureDisplay(resolved.callSignatures[0], writer, enclosingDeclaration, globalFlagsToPass | 8 /* WriteArrowStyleSignature */, /*kind*/ undefined, symbolStack);
-                            if (parenthesizeSignature) {
-                                writePunctuation(writer, 18 /* CloseParenToken */);
-                            }
-                            return;
-                        }
-                        if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
-                            if (flags & 64 /* InElementType */) {
-                                writePunctuation(writer, 17 /* OpenParenToken */);
-                            }
-                            writeKeyword(writer, 92 /* NewKeyword */);
-                            writeSpace(writer);
-                            buildSignatureDisplay(resolved.constructSignatures[0], writer, enclosingDeclaration, globalFlagsToPass | 8 /* WriteArrowStyleSignature */, /*kind*/ undefined, symbolStack);
-                            if (flags & 64 /* InElementType */) {
-                                writePunctuation(writer, 18 /* CloseParenToken */);
-                            }
-                            return;
-                        }
-                    }
-                    var saveInObjectTypeLiteral = inObjectTypeLiteral;
-                    inObjectTypeLiteral = true;
-                    writePunctuation(writer, 15 /* OpenBraceToken */);
-                    writer.writeLine();
-                    writer.increaseIndent();
-                    for (var _i = 0, _a = resolved.callSignatures; _i < _a.length; _i++) {
-                        var signature = _a[_i];
-                        buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
-                    for (var _b = 0, _c = resolved.constructSignatures; _b < _c.length; _b++) {
-                        var signature = _c[_b];
-                        buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, 1 /* Construct */, symbolStack);
-                        writePunctuation(writer, 23 /* SemicolonToken */);
-                        writer.writeLine();
-                    }
-                    writeIndexSignature(resolved.stringIndexInfo, 132 /* StringKeyword */);
-                    writeIndexSignature(resolved.numberIndexInfo, 130 /* NumberKeyword */);
-                    for (var _d = 0, _e = resolved.properties; _d < _e.length; _d++) {
-                        var p = _e[_d];
-                        var t = getTypeOfSymbol(p);
-                        if (p.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(t).length) {
-                            var signatures = getSignaturesOfType(t, 0 /* Call */);
-                            for (var _f = 0, signatures_1 = signatures; _f < signatures_1.length; _f++) {
-                                var signature = signatures_1[_f];
-                                writePropertyWithModifiers(p);
-                                buildSignatureDisplay(signature, writer, enclosingDeclaration, globalFlagsToPass, /*kind*/ undefined, symbolStack);
-                                writePunctuation(writer, 23 /* SemicolonToken */);
-                                writer.writeLine();
-                            }
-                        }
-                        else {
-                            writePropertyWithModifiers(p);
-                            writePunctuation(writer, 54 /* ColonToken */);
-                            writeSpace(writer);
-                            writeType(t, 0 /* None */);
-                            writePunctuation(writer, 23 /* SemicolonToken */);
-                            writer.writeLine();
-                        }
-                    }
-                    writer.decreaseIndent();
-                    writePunctuation(writer, 16 /* CloseBraceToken */);
-                    inObjectTypeLiteral = saveInObjectTypeLiteral;
-                }
-            }
-            function buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration, flags) {
-                var targetSymbol = getTargetSymbol(symbol);
-                if (targetSymbol.flags & 32 /* Class */ || targetSymbol.flags & 64 /* Interface */ || targetSymbol.flags & 524288 /* TypeAlias */) {
-                    buildDisplayForTypeParametersAndDelimiters(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol), writer, enclosingDeclaration, flags);
-                }
-            }
-            function buildTypeParameterDisplay(tp, writer, enclosingDeclaration, flags, symbolStack) {
-                appendSymbolNameOnly(tp.symbol, writer);
-                var constraint = getConstraintOfTypeParameter(tp);
-                if (constraint) {
-                    writeSpace(writer);
-                    writeKeyword(writer, 83 /* ExtendsKeyword */);
-                    writeSpace(writer);
-                    buildTypeDisplay(constraint, writer, enclosingDeclaration, flags, symbolStack);
-                }
-            }
-            function buildParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack) {
-                var parameterNode = p.valueDeclaration;
-                if (ts.isRestParameter(parameterNode)) {
-                    writePunctuation(writer, 22 /* DotDotDotToken */);
-                }
-                if (ts.isBindingPattern(parameterNode.name)) {
-                    buildBindingPatternDisplay(parameterNode.name, writer, enclosingDeclaration, flags, symbolStack);
-                }
-                else {
-                    appendSymbolNameOnly(p, writer);
-                }
-                if (isOptionalParameter(parameterNode)) {
-                    writePunctuation(writer, 53 /* QuestionToken */);
-                }
-                writePunctuation(writer, 54 /* ColonToken */);
-                writeSpace(writer);
-                buildTypeDisplay(getTypeOfSymbol(p), writer, enclosingDeclaration, flags, symbolStack);
-            }
-            function buildBindingPatternDisplay(bindingPattern, writer, enclosingDeclaration, flags, symbolStack) {
-                // We have to explicitly emit square bracket and bracket because these tokens are not stored inside the node.
-                if (bindingPattern.kind === 167 /* ObjectBindingPattern */) {
-                    writePunctuation(writer, 15 /* OpenBraceToken */);
-                    buildDisplayForCommaSeparatedList(bindingPattern.elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
-                    writePunctuation(writer, 16 /* CloseBraceToken */);
-                }
-                else if (bindingPattern.kind === 168 /* ArrayBindingPattern */) {
-                    writePunctuation(writer, 19 /* OpenBracketToken */);
-                    var elements = bindingPattern.elements;
-                    buildDisplayForCommaSeparatedList(elements, writer, function (e) { return buildBindingElementDisplay(e, writer, enclosingDeclaration, flags, symbolStack); });
-                    if (elements && elements.hasTrailingComma) {
-                        writePunctuation(writer, 24 /* CommaToken */);
-                    }
-                    writePunctuation(writer, 20 /* CloseBracketToken */);
-                }
-            }
-            function buildBindingElementDisplay(bindingElement, writer, enclosingDeclaration, flags, symbolStack) {
-                if (bindingElement.kind === 193 /* OmittedExpression */) {
-                    return;
-                }
-                ts.Debug.assert(bindingElement.kind === 169 /* BindingElement */);
-                if (bindingElement.propertyName) {
-                    writer.writeSymbol(ts.getTextOfNode(bindingElement.propertyName), bindingElement.symbol);
-                    writePunctuation(writer, 54 /* ColonToken */);
-                    writeSpace(writer);
-                }
-                if (ts.isBindingPattern(bindingElement.name)) {
-                    buildBindingPatternDisplay(bindingElement.name, writer, enclosingDeclaration, flags, symbolStack);
-                }
-                else {
-                    if (bindingElement.dotDotDotToken) {
-                        writePunctuation(writer, 22 /* DotDotDotToken */);
-                    }
-                    appendSymbolNameOnly(bindingElement.symbol, writer);
-                }
-            }
-            function buildDisplayForTypeParametersAndDelimiters(typeParameters, writer, enclosingDeclaration, flags, symbolStack) {
-                if (typeParameters && typeParameters.length) {
-                    writePunctuation(writer, 25 /* LessThanToken */);
-                    buildDisplayForCommaSeparatedList(typeParameters, writer, function (p) { return buildTypeParameterDisplay(p, writer, enclosingDeclaration, flags, symbolStack); });
-                    writePunctuation(writer, 27 /* GreaterThanToken */);
-                }
-            }
-            function buildDisplayForCommaSeparatedList(list, writer, action) {
-                for (var i = 0; i < list.length; i++) {
-                    if (i > 0) {
-                        writePunctuation(writer, 24 /* CommaToken */);
-                        writeSpace(writer);
-                    }
-                    action(list[i]);
-                }
-            }
-            function buildDisplayForTypeArgumentsAndDelimiters(typeParameters, mapper, writer, enclosingDeclaration, flags, symbolStack) {
-                if (typeParameters && typeParameters.length) {
-                    writePunctuation(writer, 25 /* LessThanToken */);
-                    var flags_1 = 256 /* InFirstTypeArgument */;
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (i > 0) {
-                            writePunctuation(writer, 24 /* CommaToken */);
-                            writeSpace(writer);
-                            flags_1 = 0 /* None */;
-                        }
-                        buildTypeDisplay(mapper(typeParameters[i]), writer, enclosingDeclaration, flags_1);
-                    }
-                    writePunctuation(writer, 27 /* GreaterThanToken */);
-                }
-            }
-            function buildDisplayForParametersAndDelimiters(thisParameter, parameters, writer, enclosingDeclaration, flags, symbolStack) {
-                writePunctuation(writer, 17 /* OpenParenToken */);
-                if (thisParameter) {
-                    buildParameterDisplay(thisParameter, writer, enclosingDeclaration, flags, symbolStack);
-                }
-                for (var i = 0; i < parameters.length; i++) {
-                    if (i > 0 || thisParameter) {
-                        writePunctuation(writer, 24 /* CommaToken */);
-                        writeSpace(writer);
-                    }
-                    buildParameterDisplay(parameters[i], writer, enclosingDeclaration, flags, symbolStack);
-                }
-                writePunctuation(writer, 18 /* CloseParenToken */);
-            }
-            function buildTypePredicateDisplay(predicate, writer, enclosingDeclaration, flags, symbolStack) {
-                if (ts.isIdentifierTypePredicate(predicate)) {
-                    writer.writeParameter(predicate.parameterName);
-                }
-                else {
-                    writeKeyword(writer, 97 /* ThisKeyword */);
-                }
-                writeSpace(writer);
-                writeKeyword(writer, 124 /* IsKeyword */);
-                writeSpace(writer);
-                buildTypeDisplay(predicate.type, writer, enclosingDeclaration, flags, symbolStack);
-            }
-            function buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack) {
-                if (flags & 8 /* WriteArrowStyleSignature */) {
-                    writeSpace(writer);
-                    writePunctuation(writer, 34 /* EqualsGreaterThanToken */);
-                }
-                else {
-                    writePunctuation(writer, 54 /* ColonToken */);
-                }
-                writeSpace(writer);
-                if (signature.typePredicate) {
-                    buildTypePredicateDisplay(signature.typePredicate, writer, enclosingDeclaration, flags, symbolStack);
-                }
-                else {
-                    var returnType = getReturnTypeOfSignature(signature);
-                    buildTypeDisplay(returnType, writer, enclosingDeclaration, flags, symbolStack);
-                }
-            }
-            function buildSignatureDisplay(signature, writer, enclosingDeclaration, flags, kind, symbolStack) {
-                if (kind === 1 /* Construct */) {
-                    writeKeyword(writer, 92 /* NewKeyword */);
-                    writeSpace(writer);
-                }
-                if (signature.target && (flags & 32 /* WriteTypeArgumentsOfSignature */)) {
-                    // Instantiated signature, write type arguments instead
-                    // This is achieved by passing in the mapper separately
-                    buildDisplayForTypeArgumentsAndDelimiters(signature.target.typeParameters, signature.mapper, writer, enclosingDeclaration);
-                }
-                else {
-                    buildDisplayForTypeParametersAndDelimiters(signature.typeParameters, writer, enclosingDeclaration, flags, symbolStack);
-                }
-                buildDisplayForParametersAndDelimiters(signature.thisParameter, signature.parameters, writer, enclosingDeclaration, flags, symbolStack);
-                buildReturnTypeDisplay(signature, writer, enclosingDeclaration, flags, symbolStack);
-            }
-            return _displayBuilder || (_displayBuilder = {
-                buildSymbolDisplay: buildSymbolDisplay,
-                buildTypeDisplay: buildTypeDisplay,
-                buildTypeParameterDisplay: buildTypeParameterDisplay,
-                buildTypePredicateDisplay: buildTypePredicateDisplay,
-                buildParameterDisplay: buildParameterDisplay,
-                buildDisplayForParametersAndDelimiters: buildDisplayForParametersAndDelimiters,
-                buildDisplayForTypeParametersAndDelimiters: buildDisplayForTypeParametersAndDelimiters,
-                buildTypeParameterDisplayFromSymbol: buildTypeParameterDisplayFromSymbol,
-                buildSignatureDisplay: buildSignatureDisplay,
-                buildReturnTypeDisplay: buildReturnTypeDisplay
-            });
-        }
-        function isDeclarationVisible(node) {
-            if (node) {
-                var links = getNodeLinks(node);
-                if (links.isVisible === undefined) {
-                    links.isVisible = !!determineIfDeclarationIsVisible();
-                }
-                return links.isVisible;
-            }
-            return false;
-            function determineIfDeclarationIsVisible() {
-                switch (node.kind) {
-                    case 169 /* BindingElement */:
-                        return isDeclarationVisible(node.parent.parent);
-                    case 218 /* VariableDeclaration */:
-                        if (ts.isBindingPattern(node.name) &&
-                            !node.name.elements.length) {
-                            // If the binding pattern is empty, this variable declaration is not visible
-                            return false;
-                        }
-                    // Otherwise fall through
-                    case 225 /* ModuleDeclaration */:
-                    case 221 /* ClassDeclaration */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                    case 220 /* FunctionDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 229 /* ImportEqualsDeclaration */:
-                        // external module augmentation is always visible
-                        if (ts.isExternalModuleAugmentation(node)) {
-                            return true;
-                        }
-                        var parent_8 = getDeclarationContainer(node);
-                        // If the node is not exported or it is not ambient module element (except import declaration)
-                        if (!(ts.getCombinedNodeFlags(node) & 1 /* Export */) &&
-                            !(node.kind !== 229 /* ImportEqualsDeclaration */ && parent_8.kind !== 256 /* SourceFile */ && ts.isInAmbientContext(parent_8))) {
-                            return isGlobalSourceFile(parent_8);
-                        }
-                        // Exported members/ambient module elements (exception import declaration) are visible if parent is visible
-                        return isDeclarationVisible(parent_8);
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        if (node.flags & (8 /* Private */ | 16 /* Protected */)) {
-                            // Private/protected properties/methods are not visible
-                            return false;
-                        }
-                    // Public properties/methods are visible if its parents are visible, so const it fall into next case statement
-                    case 148 /* Constructor */:
-                    case 152 /* ConstructSignature */:
-                    case 151 /* CallSignature */:
-                    case 153 /* IndexSignature */:
-                    case 142 /* Parameter */:
-                    case 226 /* ModuleBlock */:
-                    case 156 /* FunctionType */:
-                    case 157 /* ConstructorType */:
-                    case 159 /* TypeLiteral */:
-                    case 155 /* TypeReference */:
-                    case 160 /* ArrayType */:
-                    case 161 /* TupleType */:
-                    case 162 /* UnionType */:
-                    case 163 /* IntersectionType */:
-                    case 164 /* ParenthesizedType */:
-                        return isDeclarationVisible(node.parent);
-                    // Default binding, import specifier and namespace import is visible
-                    // only on demand so by default it is not visible
-                    case 231 /* ImportClause */:
-                    case 232 /* NamespaceImport */:
-                    case 234 /* ImportSpecifier */:
-                        return false;
-                    // Type parameters are always visible
-                    case 141 /* TypeParameter */:
-                    // Source file is always visible
-                    case 256 /* SourceFile */:
-                        return true;
-                    // Export assignments do not create name bindings outside the module
-                    case 235 /* ExportAssignment */:
-                        return false;
-                    default:
-                        return false;
-                }
-            }
-        }
-        function collectLinkedAliases(node) {
-            var exportSymbol;
-            if (node.parent && node.parent.kind === 235 /* ExportAssignment */) {
-                exportSymbol = resolveName(node.parent, node.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, ts.Diagnostics.Cannot_find_name_0, node);
-            }
-            else if (node.parent.kind === 238 /* ExportSpecifier */) {
-                var exportSpecifier = node.parent;
-                exportSymbol = exportSpecifier.parent.parent.moduleSpecifier ?
-                    getExternalModuleMember(exportSpecifier.parent.parent, exportSpecifier) :
-                    resolveEntityName(exportSpecifier.propertyName || exportSpecifier.name, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */);
-            }
-            var result = [];
-            if (exportSymbol) {
-                buildVisibleNodeList(exportSymbol.declarations);
-            }
-            return result;
-            function buildVisibleNodeList(declarations) {
-                ts.forEach(declarations, function (declaration) {
-                    getNodeLinks(declaration).isVisible = true;
-                    var resultNode = getAnyImportSyntax(declaration) || declaration;
-                    if (!ts.contains(result, resultNode)) {
-                        result.push(resultNode);
-                    }
-                    if (ts.isInternalModuleImportEqualsDeclaration(declaration)) {
-                        // Add the referenced top container visible
-                        var internalModuleReference = declaration.moduleReference;
-                        var firstIdentifier = getFirstIdentifier(internalModuleReference);
-                        var importSymbol = resolveName(declaration, firstIdentifier.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */, undefined, undefined);
-                        if (importSymbol) {
-                            buildVisibleNodeList(importSymbol.declarations);
-                        }
-                    }
-                });
-            }
-        }
-        /**
-         * Push an entry on the type resolution stack. If an entry with the given target and the given property name
-         * is already on the stack, and no entries in between already have a type, then a circularity has occurred.
-         * In this case, the result values of the existing entry and all entries pushed after it are changed to false,
-         * and the value false is returned. Otherwise, the new entry is just pushed onto the stack, and true is returned.
-         * In order to see if the same query has already been done before, the target object and the propertyName both
-         * must match the one passed in.
-         *
-         * @param target The symbol, type, or signature whose type is being queried
-         * @param propertyName The property name that should be used to query the target for its type
-         */
-        function pushTypeResolution(target, propertyName) {
-            var resolutionCycleStartIndex = findResolutionCycleStartIndex(target, propertyName);
-            if (resolutionCycleStartIndex >= 0) {
-                // A cycle was found
-                var length_2 = resolutionTargets.length;
-                for (var i = resolutionCycleStartIndex; i < length_2; i++) {
-                    resolutionResults[i] = false;
-                }
-                return false;
-            }
-            resolutionTargets.push(target);
-            resolutionResults.push(/*items*/ true);
-            resolutionPropertyNames.push(propertyName);
-            return true;
-        }
-        function findResolutionCycleStartIndex(target, propertyName) {
-            for (var i = resolutionTargets.length - 1; i >= 0; i--) {
-                if (hasType(resolutionTargets[i], resolutionPropertyNames[i])) {
-                    return -1;
-                }
-                if (resolutionTargets[i] === target && resolutionPropertyNames[i] === propertyName) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-        function hasType(target, propertyName) {
-            if (propertyName === 0 /* Type */) {
-                return getSymbolLinks(target).type;
-            }
-            if (propertyName === 2 /* DeclaredType */) {
-                return getSymbolLinks(target).declaredType;
-            }
-            if (propertyName === 1 /* ResolvedBaseConstructorType */) {
-                ts.Debug.assert(!!(target.flags & 1024 /* Class */));
-                return target.resolvedBaseConstructorType;
-            }
-            if (propertyName === 3 /* ResolvedReturnType */) {
-                return target.resolvedReturnType;
-            }
-            ts.Debug.fail("Unhandled TypeSystemPropertyName " + propertyName);
-        }
-        // Pop an entry from the type resolution stack and return its associated result value. The result value will
-        // be true if no circularities were detected, or false if a circularity was found.
-        function popTypeResolution() {
-            resolutionTargets.pop();
-            resolutionPropertyNames.pop();
-            return resolutionResults.pop();
-        }
-        function getDeclarationContainer(node) {
-            node = ts.getRootDeclaration(node);
-            while (node) {
-                switch (node.kind) {
-                    case 218 /* VariableDeclaration */:
-                    case 219 /* VariableDeclarationList */:
-                    case 234 /* ImportSpecifier */:
-                    case 233 /* NamedImports */:
-                    case 232 /* NamespaceImport */:
-                    case 231 /* ImportClause */:
-                        node = node.parent;
-                        break;
-                    default:
-                        return node.parent;
-                }
-            }
-        }
-        function getTypeOfPrototypeProperty(prototype) {
-            // TypeScript 1.0 spec (April 2014): 8.4
-            // Every class automatically contains a static property member named 'prototype',
-            // the type of which is an instantiation of the class type with type Any supplied as a type argument for each type parameter.
-            // It is an error to explicitly declare a static property member with the name 'prototype'.
-            var classType = getDeclaredTypeOfSymbol(getParentOfSymbol(prototype));
-            return classType.typeParameters ? createTypeReference(classType, ts.map(classType.typeParameters, function (_) { return anyType; })) : classType;
-        }
-        // Return the type of the given property in the given type, or undefined if no such property exists
-        function getTypeOfPropertyOfType(type, name) {
-            var prop = getPropertyOfType(type, name);
-            return prop ? getTypeOfSymbol(prop) : undefined;
-        }
-        function isTypeAny(type) {
-            return type && (type.flags & 1 /* Any */) !== 0;
-        }
-        function isTypeNever(type) {
-            return type && (type.flags & 134217728 /* Never */) !== 0;
-        }
-        // Return the type of a binding element parent. We check SymbolLinks first to see if a type has been
-        // assigned by contextual typing.
-        function getTypeForBindingElementParent(node) {
-            var symbol = getSymbolOfNode(node);
-            return symbol && getSymbolLinks(symbol).type || getTypeForVariableLikeDeclaration(node, /*includeOptionality*/ false);
-        }
-        function getTextOfPropertyName(name) {
-            switch (name.kind) {
-                case 69 /* Identifier */:
-                    return name.text;
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    return name.text;
-                case 140 /* ComputedPropertyName */:
-                    if (ts.isStringOrNumericLiteral(name.expression.kind)) {
-                        return name.expression.text;
-                    }
-            }
-            return undefined;
-        }
-        function isComputedNonLiteralName(name) {
-            return name.kind === 140 /* ComputedPropertyName */ && !ts.isStringOrNumericLiteral(name.expression.kind);
-        }
-        /** Return the inferred type for a binding element */
-        function getTypeForBindingElement(declaration) {
-            var pattern = declaration.parent;
-            var parentType = getTypeForBindingElementParent(pattern.parent);
-            // If parent has the unknown (error) type, then so does this binding element
-            if (parentType === unknownType) {
-                return unknownType;
-            }
-            // If no type was specified or inferred for parent, or if the specified or inferred type is any,
-            // infer from the initializer of the binding element if one is present. Otherwise, go with the
-            // undefined or any type of the parent.
-            if (!parentType || isTypeAny(parentType)) {
-                if (declaration.initializer) {
-                    return checkExpressionCached(declaration.initializer);
-                }
-                return parentType;
-            }
-            var type;
-            if (pattern.kind === 167 /* ObjectBindingPattern */) {
-                // Use explicitly specified property name ({ p: xxx } form), or otherwise the implied name ({ p } form)
-                var name_11 = declaration.propertyName || declaration.name;
-                if (isComputedNonLiteralName(name_11)) {
-                    // computed properties with non-literal names are treated as 'any'
-                    return anyType;
-                }
-                if (declaration.initializer) {
-                    getContextualType(declaration.initializer);
-                }
-                // Use type of the specified property, or otherwise, for a numeric name, the type of the numeric index signature,
-                // or otherwise the type of the string index signature.
-                var text = getTextOfPropertyName(name_11);
-                type = getTypeOfPropertyOfType(parentType, text) ||
-                    isNumericLiteralName(text) && getIndexTypeOfType(parentType, 1 /* Number */) ||
-                    getIndexTypeOfType(parentType, 0 /* String */);
-                if (!type) {
-                    error(name_11, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(parentType), ts.declarationNameToString(name_11));
-                    return unknownType;
-                }
-            }
-            else {
-                // This elementType will be used if the specific property corresponding to this index is not
-                // present (aka the tuple element property). This call also checks that the parentType is in
-                // fact an iterable or array (depending on target language).
-                var elementType = checkIteratedTypeOrElementType(parentType, pattern, /*allowStringInput*/ false);
-                if (!declaration.dotDotDotToken) {
-                    // Use specific property type when parent is a tuple or numeric index type when parent is an array
-                    var propName = "" + ts.indexOf(pattern.elements, declaration);
-                    type = isTupleLikeType(parentType)
-                        ? getTypeOfPropertyOfType(parentType, propName)
-                        : elementType;
-                    if (!type) {
-                        if (isTupleType(parentType)) {
-                            error(declaration, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(parentType), parentType.elementTypes.length, pattern.elements.length);
-                        }
-                        else {
-                            error(declaration, ts.Diagnostics.Type_0_has_no_property_1, typeToString(parentType), propName);
-                        }
-                        return unknownType;
-                    }
-                }
-                else {
-                    // Rest element has an array type with the same element type as the parent type
-                    type = createArrayType(elementType);
-                }
-            }
-            // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-            // undefined from the final type.
-            if (strictNullChecks && declaration.initializer && !(getCombinedTypeFlags(checkExpressionCached(declaration.initializer)) & 32 /* Undefined */)) {
-                type = getTypeWithFacts(type, 131072 /* NEUndefined */);
-            }
-            return type;
-        }
-        function getTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
-            var jsDocType = getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration);
-            if (jsDocType) {
-                return getTypeFromTypeNode(jsDocType);
-            }
-        }
-        function getJSDocTypeForVariableLikeDeclarationFromJSDocComment(declaration) {
-            // First, see if this node has an @type annotation on it directly.
-            var typeTag = ts.getJSDocTypeTag(declaration);
-            if (typeTag && typeTag.typeExpression) {
-                return typeTag.typeExpression.type;
-            }
-            if (declaration.kind === 218 /* VariableDeclaration */ &&
-                declaration.parent.kind === 219 /* VariableDeclarationList */ &&
-                declaration.parent.parent.kind === 200 /* VariableStatement */) {
-                // @type annotation might have been on the variable statement, try that instead.
-                var annotation = ts.getJSDocTypeTag(declaration.parent.parent);
-                if (annotation && annotation.typeExpression) {
-                    return annotation.typeExpression.type;
-                }
-            }
-            else if (declaration.kind === 142 /* Parameter */) {
-                // If it's a parameter, see if the parent has a jsdoc comment with an @param
-                // annotation.
-                var paramTag = ts.getCorrespondingJSDocParameterTag(declaration);
-                if (paramTag && paramTag.typeExpression) {
-                    return paramTag.typeExpression.type;
-                }
-            }
-            return undefined;
-        }
-        function addOptionality(type, optional) {
-            return strictNullChecks && optional ? addTypeKind(type, 32 /* Undefined */) : type;
-        }
-        // Return the inferred type for a variable, parameter, or property declaration
-        function getTypeForVariableLikeDeclaration(declaration, includeOptionality) {
-            if (declaration.flags & 134217728 /* JavaScriptFile */) {
-                // If this is a variable in a JavaScript file, then use the JSDoc type (if it has
-                // one as its type), otherwise fallback to the below standard TS codepaths to
-                // try to figure it out.
-                var type = getTypeForVariableLikeDeclarationFromJSDocComment(declaration);
-                if (type && type !== unknownType) {
-                    return type;
-                }
-            }
-            // A variable declared in a for..in statement is always of type string
-            if (declaration.parent.parent.kind === 207 /* ForInStatement */) {
-                return stringType;
-            }
-            if (declaration.parent.parent.kind === 208 /* ForOfStatement */) {
-                // checkRightHandSideOfForOf will return undefined if the for-of expression type was
-                // missing properties/signatures required to get its iteratedType (like
-                // [Symbol.iterator] or next). This may be because we accessed properties from anyType,
-                // or it may have led to an error inside getElementTypeOfIterable.
-                return checkRightHandSideOfForOf(declaration.parent.parent.expression) || anyType;
-            }
-            if (ts.isBindingPattern(declaration.parent)) {
-                return getTypeForBindingElement(declaration);
-            }
-            // Use type from type annotation if one is present
-            if (declaration.type) {
-                return addOptionality(getTypeFromTypeNode(declaration.type), /*optional*/ declaration.questionToken && includeOptionality);
-            }
-            if (declaration.kind === 142 /* Parameter */) {
-                var func = declaration.parent;
-                // For a parameter of a set accessor, use the type of the get accessor if one is present
-                if (func.kind === 150 /* SetAccessor */ && !ts.hasDynamicName(func)) {
-                    var getter = ts.getDeclarationOfKind(declaration.parent.symbol, 149 /* GetAccessor */);
-                    if (getter) {
-                        var getterSignature = getSignatureFromDeclaration(getter);
-                        var thisParameter = getAccessorThisParameter(func);
-                        if (thisParameter && declaration === thisParameter) {
-                            // Use the type from the *getter*
-                            ts.Debug.assert(!thisParameter.type);
-                            return getTypeOfSymbol(getterSignature.thisParameter);
-                        }
-                        return getReturnTypeOfSignature(getterSignature);
-                    }
-                }
-                // Use contextual parameter type if one is available
-                var type = declaration.symbol.name === "this"
-                    ? getContextuallyTypedThisType(func)
-                    : getContextuallyTypedParameterType(declaration);
-                if (type) {
-                    return addOptionality(type, /*optional*/ declaration.questionToken && includeOptionality);
-                }
-            }
-            // Use the type of the initializer expression if one is present
-            if (declaration.initializer) {
-                return addOptionality(checkExpressionCached(declaration.initializer), /*optional*/ declaration.questionToken && includeOptionality);
-            }
-            // If it is a short-hand property assignment, use the type of the identifier
-            if (declaration.kind === 254 /* ShorthandPropertyAssignment */) {
-                return checkIdentifier(declaration.name);
-            }
-            // If the declaration specifies a binding pattern, use the type implied by the binding pattern
-            if (ts.isBindingPattern(declaration.name)) {
-                return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ false);
-            }
-            // No type specified and nothing can be inferred
-            return undefined;
-        }
-        // Return the type implied by a binding pattern element. This is the type of the initializer of the element if
-        // one is present. Otherwise, if the element is itself a binding pattern, it is the type implied by the binding
-        // pattern. Otherwise, it is the type any.
-        function getTypeFromBindingElement(element, includePatternInType) {
-            if (element.initializer) {
-                var type = checkExpressionCached(element.initializer);
-                reportErrorsFromWidening(element, type);
-                return getWidenedType(type);
-            }
-            if (ts.isBindingPattern(element.name)) {
-                return getTypeFromBindingPattern(element.name, includePatternInType);
-            }
-            if (compilerOptions.noImplicitAny && !declarationBelongsToPrivateAmbientMember(element)) {
-                reportImplicitAnyError(element, anyType);
-            }
-            return anyType;
-        }
-        // Return the type implied by an object binding pattern
-        function getTypeFromObjectBindingPattern(pattern, includePatternInType) {
-            var members = {};
-            var hasComputedProperties = false;
-            ts.forEach(pattern.elements, function (e) {
-                var name = e.propertyName || e.name;
-                if (isComputedNonLiteralName(name)) {
-                    // do not include computed properties in the implied type
-                    hasComputedProperties = true;
-                    return;
-                }
-                var text = getTextOfPropertyName(name);
-                var flags = 4 /* Property */ | 67108864 /* Transient */ | (e.initializer ? 536870912 /* Optional */ : 0);
-                var symbol = createSymbol(flags, text);
-                symbol.type = getTypeFromBindingElement(e, includePatternInType);
-                symbol.bindingElement = e;
-                members[symbol.name] = symbol;
-            });
-            var result = createAnonymousType(undefined, members, emptyArray, emptyArray, undefined, undefined);
-            if (includePatternInType) {
-                result.pattern = pattern;
-            }
-            if (hasComputedProperties) {
-                result.flags |= 67108864 /* ObjectLiteralPatternWithComputedProperties */;
-            }
-            return result;
-        }
-        // Return the type implied by an array binding pattern
-        function getTypeFromArrayBindingPattern(pattern, includePatternInType) {
-            var elements = pattern.elements;
-            if (elements.length === 0 || elements[elements.length - 1].dotDotDotToken) {
-                return languageVersion >= 2 /* ES6 */ ? createIterableType(anyType) : anyArrayType;
-            }
-            // If the pattern has at least one element, and no rest element, then it should imply a tuple type.
-            var elementTypes = ts.map(elements, function (e) { return e.kind === 193 /* OmittedExpression */ ? anyType : getTypeFromBindingElement(e, includePatternInType); });
-            if (includePatternInType) {
-                var result = createNewTupleType(elementTypes);
-                result.pattern = pattern;
-                return result;
-            }
-            return createTupleType(elementTypes);
-        }
-        // Return the type implied by a binding pattern. This is the type implied purely by the binding pattern itself
-        // and without regard to its context (i.e. without regard any type annotation or initializer associated with the
-        // declaration in which the binding pattern is contained). For example, the implied type of [x, y] is [any, any]
-        // and the implied type of { x, y: z = 1 } is { x: any; y: number; }. The type implied by a binding pattern is
-        // used as the contextual type of an initializer associated with the binding pattern. Also, for a destructuring
-        // parameter with no type annotation or initializer, the type implied by the binding pattern becomes the type of
-        // the parameter.
-        function getTypeFromBindingPattern(pattern, includePatternInType) {
-            return pattern.kind === 167 /* ObjectBindingPattern */
-                ? getTypeFromObjectBindingPattern(pattern, includePatternInType)
-                : getTypeFromArrayBindingPattern(pattern, includePatternInType);
-        }
-        // Return the type associated with a variable, parameter, or property declaration. In the simple case this is the type
-        // specified in a type annotation or inferred from an initializer. However, in the case of a destructuring declaration it
-        // is a bit more involved. For example:
-        //
-        //   var [x, s = ""] = [1, "one"];
-        //
-        // Here, the array literal [1, "one"] is contextually typed by the type [any, string], which is the implied type of the
-        // binding pattern [x, s = ""]. Because the contextual type is a tuple type, the resulting type of [1, "one"] is the
-        // tuple type [number, string]. Thus, the type inferred for 'x' is number and the type inferred for 's' is string.
-        function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
-            var type = getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true);
-            if (type) {
-                if (reportErrors) {
-                    reportErrorsFromWidening(declaration, type);
-                }
-                // During a normal type check we'll never get to here with a property assignment (the check of the containing
-                // object literal uses a different path). We exclude widening only so that language services and type verification
-                // tools see the actual type.
-                if (declaration.kind === 253 /* PropertyAssignment */) {
-                    return type;
-                }
-                return getWidenedType(type);
-            }
-            // Rest parameters default to type any[], other parameters default to type any
-            type = declaration.dotDotDotToken ? anyArrayType : anyType;
-            // Report implicit any errors unless this is a private property within an ambient declaration
-            if (reportErrors && compilerOptions.noImplicitAny) {
-                if (!declarationBelongsToPrivateAmbientMember(declaration)) {
-                    reportImplicitAnyError(declaration, type);
-                }
-            }
-            return type;
-        }
-        function declarationBelongsToPrivateAmbientMember(declaration) {
-            var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 142 /* Parameter */ ? root.parent : root;
-            return isPrivateWithinAmbient(memberDeclaration);
-        }
-        function getTypeOfVariableOrParameterOrProperty(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                // Handle prototype property
-                if (symbol.flags & 134217728 /* Prototype */) {
-                    return links.type = getTypeOfPrototypeProperty(symbol);
-                }
-                // Handle catch clause variables
-                var declaration = symbol.valueDeclaration;
-                if (declaration.parent.kind === 252 /* CatchClause */) {
-                    return links.type = anyType;
-                }
-                // Handle export default expressions
-                if (declaration.kind === 235 /* ExportAssignment */) {
-                    return links.type = checkExpression(declaration.expression);
-                }
-                // Handle variable, parameter or property
-                if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                    return unknownType;
-                }
-                var type = undefined;
-                // Handle module.exports = expr or this.p = expr
-                if (declaration.kind === 187 /* BinaryExpression */) {
-                    type = getUnionType(ts.map(symbol.declarations, function (decl) { return checkExpressionCached(decl.right); }));
-                }
-                else if (declaration.kind === 172 /* PropertyAccessExpression */) {
-                    // Declarations only exist for property access expressions for certain
-                    // special assignment kinds
-                    if (declaration.parent.kind === 187 /* BinaryExpression */) {
-                        // Handle exports.p = expr  or className.prototype.method = expr
-                        type = checkExpressionCached(declaration.parent.right);
-                    }
-                }
-                if (type === undefined) {
-                    type = getWidenedTypeForVariableLikeDeclaration(declaration, /*reportErrors*/ true);
-                }
-                if (!popTypeResolution()) {
-                    if (symbol.valueDeclaration.type) {
-                        // Variable has type annotation that circularly references the variable itself
-                        type = unknownType;
-                        error(symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_type_annotation, symbolToString(symbol));
-                    }
-                    else {
-                        // Variable has initializer that circularly references the variable itself
-                        type = anyType;
-                        if (compilerOptions.noImplicitAny) {
-                            error(symbol.valueDeclaration, ts.Diagnostics._0_implicitly_has_type_any_because_it_does_not_have_a_type_annotation_and_is_referenced_directly_or_indirectly_in_its_own_initializer, symbolToString(symbol));
-                        }
-                    }
-                }
-                links.type = type;
-            }
-            return links.type;
-        }
-        function getAnnotatedAccessorType(accessor) {
-            if (accessor) {
-                if (accessor.kind === 149 /* GetAccessor */) {
-                    return accessor.type && getTypeFromTypeNode(accessor.type);
-                }
-                else {
-                    var setterTypeAnnotation = ts.getSetAccessorTypeAnnotationNode(accessor);
-                    return setterTypeAnnotation && getTypeFromTypeNode(setterTypeAnnotation);
-                }
-            }
-            return undefined;
-        }
-        function getAnnotatedAccessorThisParameter(accessor) {
-            var parameter = getAccessorThisParameter(accessor);
-            return parameter && parameter.symbol;
-        }
-        function getThisTypeOfDeclaration(declaration) {
-            return getThisTypeOfSignature(getSignatureFromDeclaration(declaration));
-        }
-        function getTypeOfAccessors(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                var getter = ts.getDeclarationOfKind(symbol, 149 /* GetAccessor */);
-                var setter = ts.getDeclarationOfKind(symbol, 150 /* SetAccessor */);
-                if (getter && getter.flags & 134217728 /* JavaScriptFile */) {
-                    var jsDocType = getTypeForVariableLikeDeclarationFromJSDocComment(getter);
-                    if (jsDocType) {
-                        return links.type = jsDocType;
-                    }
-                }
-                if (!pushTypeResolution(symbol, 0 /* Type */)) {
-                    return unknownType;
-                }
-                var type = void 0;
-                // First try to see if the user specified a return type on the get-accessor.
-                var getterReturnType = getAnnotatedAccessorType(getter);
-                if (getterReturnType) {
-                    type = getterReturnType;
-                }
-                else {
-                    // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-                    var setterParameterType = getAnnotatedAccessorType(setter);
-                    if (setterParameterType) {
-                        type = setterParameterType;
-                    }
-                    else {
-                        // If there are no specified types, try to infer it from the body of the get accessor if it exists.
-                        if (getter && getter.body) {
-                            type = getReturnTypeFromBody(getter);
-                        }
-                        else {
-                            if (compilerOptions.noImplicitAny) {
-                                error(setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_type_annotation, symbolToString(symbol));
-                            }
-                            type = anyType;
-                        }
-                    }
-                }
-                if (!popTypeResolution()) {
-                    type = anyType;
-                    if (compilerOptions.noImplicitAny) {
-                        var getter_1 = ts.getDeclarationOfKind(symbol, 149 /* GetAccessor */);
-                        error(getter_1, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, symbolToString(symbol));
-                    }
-                }
-                links.type = type;
-            }
-            return links.type;
-        }
-        function getTypeOfFuncClassEnumModule(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                if (symbol.valueDeclaration.kind === 225 /* ModuleDeclaration */ && ts.isShorthandAmbientModule(symbol.valueDeclaration)) {
-                    links.type = anyType;
-                }
-                else {
-                    var type = createObjectType(65536 /* Anonymous */, symbol);
-                    links.type = strictNullChecks && symbol.flags & 536870912 /* Optional */ ?
-                        addTypeKind(type, 32 /* Undefined */) : type;
-                }
-            }
-            return links.type;
-        }
-        function getTypeOfEnumMember(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                links.type = getDeclaredTypeOfEnum(getParentOfSymbol(symbol));
-            }
-            return links.type;
-        }
-        function getTypeOfAlias(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                var targetSymbol = resolveAlias(symbol);
-                // It only makes sense to get the type of a value symbol. If the result of resolving
-                // the alias is not a value, then it has no type. To get the type associated with a
-                // type symbol, call getDeclaredTypeOfSymbol.
-                // This check is important because without it, a call to getTypeOfSymbol could end
-                // up recursively calling getTypeOfAlias, causing a stack overflow.
-                links.type = targetSymbol.flags & 107455 /* Value */
-                    ? getTypeOfSymbol(targetSymbol)
-                    : unknownType;
-            }
-            return links.type;
-        }
-        function getTypeOfInstantiatedSymbol(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.type) {
-                links.type = instantiateType(getTypeOfSymbol(links.target), links.mapper);
-            }
-            return links.type;
-        }
-        function getTypeOfSymbol(symbol) {
-            if (symbol.flags & 16777216 /* Instantiated */) {
-                return getTypeOfInstantiatedSymbol(symbol);
-            }
-            if (symbol.flags & (3 /* Variable */ | 4 /* Property */)) {
-                return getTypeOfVariableOrParameterOrProperty(symbol);
-            }
-            if (symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 384 /* Enum */ | 512 /* ValueModule */)) {
-                return getTypeOfFuncClassEnumModule(symbol);
-            }
-            if (symbol.flags & 8 /* EnumMember */) {
-                return getTypeOfEnumMember(symbol);
-            }
-            if (symbol.flags & 98304 /* Accessor */) {
-                return getTypeOfAccessors(symbol);
-            }
-            if (symbol.flags & 8388608 /* Alias */) {
-                return getTypeOfAlias(symbol);
-            }
-            return unknownType;
-        }
-        function getTargetType(type) {
-            return type.flags & 4096 /* Reference */ ? type.target : type;
-        }
-        function hasBaseType(type, checkBase) {
-            return check(type);
-            function check(type) {
-                var target = getTargetType(type);
-                return target === checkBase || ts.forEach(getBaseTypes(target), check);
-            }
-        }
-        // Appends the type parameters given by a list of declarations to a set of type parameters and returns the resulting set.
-        // The function allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set
-        // in-place and returns the same array.
-        function appendTypeParameters(typeParameters, declarations) {
-            for (var _i = 0, declarations_2 = declarations; _i < declarations_2.length; _i++) {
-                var declaration = declarations_2[_i];
-                var tp = getDeclaredTypeOfTypeParameter(getSymbolOfNode(declaration));
-                if (!typeParameters) {
-                    typeParameters = [tp];
-                }
-                else if (!ts.contains(typeParameters, tp)) {
-                    typeParameters.push(tp);
-                }
-            }
-            return typeParameters;
-        }
-        // Appends the outer type parameters of a node to a set of type parameters and returns the resulting set. The function
-        // allocates a new array if the input type parameter set is undefined, but otherwise it modifies the set in-place and
-        // returns the same array.
-        function appendOuterTypeParameters(typeParameters, node) {
-            while (true) {
-                node = node.parent;
-                if (!node) {
-                    return typeParameters;
-                }
-                if (node.kind === 221 /* ClassDeclaration */ || node.kind === 192 /* ClassExpression */ ||
-                    node.kind === 220 /* FunctionDeclaration */ || node.kind === 179 /* FunctionExpression */ ||
-                    node.kind === 147 /* MethodDeclaration */ || node.kind === 180 /* ArrowFunction */) {
-                    var declarations = node.typeParameters;
-                    if (declarations) {
-                        return appendTypeParameters(appendOuterTypeParameters(typeParameters, node), declarations);
-                    }
-                }
-            }
-        }
-        // The outer type parameters are those defined by enclosing generic classes, methods, or functions.
-        function getOuterTypeParametersOfClassOrInterface(symbol) {
-            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 222 /* InterfaceDeclaration */);
-            return appendOuterTypeParameters(undefined, declaration);
-        }
-        // The local type parameters are the combined set of type parameters from all declarations of the class,
-        // interface, or type alias.
-        function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
-            var result;
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var node = _a[_i];
-                if (node.kind === 222 /* InterfaceDeclaration */ || node.kind === 221 /* ClassDeclaration */ ||
-                    node.kind === 192 /* ClassExpression */ || node.kind === 223 /* TypeAliasDeclaration */) {
-                    var declaration = node;
-                    if (declaration.typeParameters) {
-                        result = appendTypeParameters(result, declaration.typeParameters);
-                    }
-                }
-            }
-            return result;
-        }
-        // The full set of type parameters for a generic class or interface type consists of its outer type parameters plus
-        // its locally declared type parameters.
-        function getTypeParametersOfClassOrInterface(symbol) {
-            return ts.concatenate(getOuterTypeParametersOfClassOrInterface(symbol), getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol));
-        }
-        function isConstructorType(type) {
-            return type.flags & 80896 /* ObjectType */ && getSignaturesOfType(type, 1 /* Construct */).length > 0;
-        }
-        function getBaseTypeNodeOfClass(type) {
-            return ts.getClassExtendsHeritageClauseElement(type.symbol.valueDeclaration);
-        }
-        function getConstructorsForTypeArguments(type, typeArgumentNodes) {
-            var typeArgCount = typeArgumentNodes ? typeArgumentNodes.length : 0;
-            return ts.filter(getSignaturesOfType(type, 1 /* Construct */), function (sig) { return (sig.typeParameters ? sig.typeParameters.length : 0) === typeArgCount; });
-        }
-        function getInstantiatedConstructorsForTypeArguments(type, typeArgumentNodes) {
-            var signatures = getConstructorsForTypeArguments(type, typeArgumentNodes);
-            if (typeArgumentNodes) {
-                var typeArguments_1 = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                signatures = ts.map(signatures, function (sig) { return getSignatureInstantiation(sig, typeArguments_1); });
-            }
-            return signatures;
-        }
-        // The base constructor of a class can resolve to
-        // undefinedType if the class has no extends clause,
-        // unknownType if an error occurred during resolution of the extends expression,
-        // nullType if the extends expression is the null value, or
-        // an object type with at least one construct signature.
-        function getBaseConstructorTypeOfClass(type) {
-            if (!type.resolvedBaseConstructorType) {
-                var baseTypeNode = getBaseTypeNodeOfClass(type);
-                if (!baseTypeNode) {
-                    return type.resolvedBaseConstructorType = undefinedType;
-                }
-                if (!pushTypeResolution(type, 1 /* ResolvedBaseConstructorType */)) {
-                    return unknownType;
-                }
-                var baseConstructorType = checkExpression(baseTypeNode.expression);
-                if (baseConstructorType.flags & 80896 /* ObjectType */) {
-                    // Resolving the members of a class requires us to resolve the base class of that class.
-                    // We force resolution here such that we catch circularities now.
-                    resolveStructuredTypeMembers(baseConstructorType);
-                }
-                if (!popTypeResolution()) {
-                    error(type.symbol.valueDeclaration, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_its_own_base_expression, symbolToString(type.symbol));
-                    return type.resolvedBaseConstructorType = unknownType;
-                }
-                if (baseConstructorType !== unknownType && baseConstructorType !== nullWideningType && !isConstructorType(baseConstructorType)) {
-                    error(baseTypeNode.expression, ts.Diagnostics.Type_0_is_not_a_constructor_function_type, typeToString(baseConstructorType));
-                    return type.resolvedBaseConstructorType = unknownType;
-                }
-                type.resolvedBaseConstructorType = baseConstructorType;
-            }
-            return type.resolvedBaseConstructorType;
-        }
-        function getBaseTypes(type) {
-            var isClass = type.symbol.flags & 32 /* Class */;
-            var isInterface = type.symbol.flags & 64 /* Interface */;
-            if (!type.resolvedBaseTypes) {
-                if (!isClass && !isInterface) {
-                    ts.Debug.fail("type must be class or interface");
-                }
-                if (isClass) {
-                    resolveBaseTypesOfClass(type);
-                }
-                if (isInterface) {
-                    resolveBaseTypesOfInterface(type);
-                }
-            }
-            return type.resolvedBaseTypes;
-        }
-        function resolveBaseTypesOfClass(type) {
-            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
-            var baseConstructorType = getBaseConstructorTypeOfClass(type);
-            if (!(baseConstructorType.flags & 80896 /* ObjectType */)) {
-                return;
-            }
-            var baseTypeNode = getBaseTypeNodeOfClass(type);
-            var baseType;
-            var originalBaseType = baseConstructorType && baseConstructorType.symbol ? getDeclaredTypeOfSymbol(baseConstructorType.symbol) : undefined;
-            if (baseConstructorType.symbol && baseConstructorType.symbol.flags & 32 /* Class */ &&
-                areAllOuterTypeParametersApplied(originalBaseType)) {
-                // When base constructor type is a class with no captured type arguments we know that the constructors all have the same type parameters as the
-                // class and all return the instance type of the class. There is no need for further checks and we can apply the
-                // type arguments in the same manner as a type reference to get the same error reporting experience.
-                baseType = getTypeFromClassOrInterfaceReference(baseTypeNode, baseConstructorType.symbol);
-            }
-            else {
-                // The class derives from a "class-like" constructor function, check that we have at least one construct signature
-                // with a matching number of type parameters and use the return type of the first instantiated signature. Elsewhere
-                // we check that all instantiated signatures return the same type.
-                var constructors = getInstantiatedConstructorsForTypeArguments(baseConstructorType, baseTypeNode.typeArguments);
-                if (!constructors.length) {
-                    error(baseTypeNode.expression, ts.Diagnostics.No_base_constructor_has_the_specified_number_of_type_arguments);
-                    return;
-                }
-                baseType = getReturnTypeOfSignature(constructors[0]);
-            }
-            if (baseType === unknownType) {
-                return;
-            }
-            if (!(getTargetType(baseType).flags & (1024 /* Class */ | 2048 /* Interface */))) {
-                error(baseTypeNode.expression, ts.Diagnostics.Base_constructor_return_type_0_is_not_a_class_or_interface_type, typeToString(baseType));
-                return;
-            }
-            if (type === baseType || hasBaseType(baseType, type)) {
-                error(type.symbol.valueDeclaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
-                return;
-            }
-            if (type.resolvedBaseTypes === emptyArray) {
-                type.resolvedBaseTypes = [baseType];
-            }
-            else {
-                type.resolvedBaseTypes.push(baseType);
-            }
-        }
-        function areAllOuterTypeParametersApplied(type) {
-            // An unapplied type parameter has its symbol still the same as the matching argument symbol.
-            // Since parameters are applied outer-to-inner, only the last outer parameter needs to be checked.
-            var outerTypeParameters = type.outerTypeParameters;
-            if (outerTypeParameters) {
-                var last = outerTypeParameters.length - 1;
-                var typeArguments = type.typeArguments;
-                return outerTypeParameters[last].symbol !== typeArguments[last].symbol;
-            }
-            return true;
-        }
-        function resolveBaseTypesOfInterface(type) {
-            type.resolvedBaseTypes = type.resolvedBaseTypes || emptyArray;
-            for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 222 /* InterfaceDeclaration */ && ts.getInterfaceBaseTypeNodes(declaration)) {
-                    for (var _b = 0, _c = ts.getInterfaceBaseTypeNodes(declaration); _b < _c.length; _b++) {
-                        var node = _c[_b];
-                        var baseType = getTypeFromTypeNode(node);
-                        if (baseType !== unknownType) {
-                            if (getTargetType(baseType).flags & (1024 /* Class */ | 2048 /* Interface */)) {
-                                if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    if (type.resolvedBaseTypes === emptyArray) {
-                                        type.resolvedBaseTypes = [baseType];
-                                    }
-                                    else {
-                                        type.resolvedBaseTypes.push(baseType);
-                                    }
-                                }
-                                else {
-                                    error(declaration, ts.Diagnostics.Type_0_recursively_references_itself_as_a_base_type, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */));
-                                }
-                            }
-                            else {
-                                error(node, ts.Diagnostics.An_interface_may_only_extend_a_class_or_another_interface);
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        // Returns true if the interface given by the symbol is free of "this" references. Specifically, the result is
-        // true if the interface itself contains no references to "this" in its body, if all base types are interfaces,
-        // and if none of the base interfaces have a "this" type.
-        function isIndependentInterface(symbol) {
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 222 /* InterfaceDeclaration */) {
-                    if (declaration.flags & 16384 /* ContainsThis */) {
-                        return false;
-                    }
-                    var baseTypeNodes = ts.getInterfaceBaseTypeNodes(declaration);
-                    if (baseTypeNodes) {
-                        for (var _b = 0, baseTypeNodes_1 = baseTypeNodes; _b < baseTypeNodes_1.length; _b++) {
-                            var node = baseTypeNodes_1[_b];
-                            if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                                var baseSymbol = resolveEntityName(node.expression, 793056 /* Type */, /*ignoreErrors*/ true);
-                                if (!baseSymbol || !(baseSymbol.flags & 64 /* Interface */) || getDeclaredTypeOfClassOrInterface(baseSymbol).thisType) {
-                                    return false;
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            return true;
-        }
-        function getDeclaredTypeOfClassOrInterface(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.declaredType) {
-                var kind = symbol.flags & 32 /* Class */ ? 1024 /* Class */ : 2048 /* Interface */;
-                var type = links.declaredType = createObjectType(kind, symbol);
-                var outerTypeParameters = getOuterTypeParametersOfClassOrInterface(symbol);
-                var localTypeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                // A class or interface is generic if it has type parameters or a "this" type. We always give classes a "this" type
-                // because it is not feasible to analyze all members to determine if the "this" type escapes the class (in particular,
-                // property types inferred from initializers and method return types inferred from return statements are very hard
-                // to exhaustively analyze). We give interfaces a "this" type if we can't definitely determine that they are free of
-                // "this" references.
-                if (outerTypeParameters || localTypeParameters || kind === 1024 /* Class */ || !isIndependentInterface(symbol)) {
-                    type.flags |= 4096 /* Reference */;
-                    type.typeParameters = ts.concatenate(outerTypeParameters, localTypeParameters);
-                    type.outerTypeParameters = outerTypeParameters;
-                    type.localTypeParameters = localTypeParameters;
-                    type.instantiations = {};
-                    type.instantiations[getTypeListId(type.typeParameters)] = type;
-                    type.target = type;
-                    type.typeArguments = type.typeParameters;
-                    type.thisType = createType(512 /* TypeParameter */ | 33554432 /* ThisType */);
-                    type.thisType.symbol = symbol;
-                    type.thisType.constraint = type;
-                }
-            }
-            return links.declaredType;
-        }
-        function getDeclaredTypeOfTypeAlias(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.declaredType) {
-                // Note that we use the links object as the target here because the symbol object is used as the unique
-                // identity for resolution of the 'type' property in SymbolLinks.
-                if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
-                    return unknownType;
-                }
-                var type = void 0;
-                var declaration = ts.getDeclarationOfKind(symbol, 279 /* JSDocTypedefTag */);
-                if (declaration) {
-                    if (declaration.jsDocTypeLiteral) {
-                        type = getTypeFromTypeNode(declaration.jsDocTypeLiteral);
-                    }
-                    else {
-                        type = getTypeFromTypeNode(declaration.typeExpression.type);
-                    }
-                }
-                else {
-                    declaration = ts.getDeclarationOfKind(symbol, 223 /* TypeAliasDeclaration */);
-                    type = getTypeFromTypeNode(declaration.type);
-                }
-                if (popTypeResolution()) {
-                    links.typeParameters = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
-                    if (links.typeParameters) {
-                        // Initialize the instantiation cache for generic type aliases. The declared type corresponds to
-                        // an instantiation of the type alias with the type parameters supplied as type arguments.
-                        links.instantiations = {};
-                        links.instantiations[getTypeListId(links.typeParameters)] = type;
-                    }
-                }
-                else {
-                    type = unknownType;
-                    error(declaration.name, ts.Diagnostics.Type_alias_0_circularly_references_itself, symbolToString(symbol));
-                }
-                links.declaredType = type;
-            }
-            return links.declaredType;
-        }
-        function getDeclaredTypeOfEnum(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.declaredType) {
-                var type = createType(128 /* Enum */);
-                type.symbol = symbol;
-                links.declaredType = type;
-            }
-            return links.declaredType;
-        }
-        function getDeclaredTypeOfTypeParameter(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.declaredType) {
-                var type = createType(512 /* TypeParameter */);
-                type.symbol = symbol;
-                if (!ts.getDeclarationOfKind(symbol, 141 /* TypeParameter */).constraint) {
-                    type.constraint = noConstraintType;
-                }
-                links.declaredType = type;
-            }
-            return links.declaredType;
-        }
-        function getDeclaredTypeOfAlias(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.declaredType) {
-                links.declaredType = getDeclaredTypeOfSymbol(resolveAlias(symbol));
-            }
-            return links.declaredType;
-        }
-        function getDeclaredTypeOfSymbol(symbol) {
-            ts.Debug.assert((symbol.flags & 16777216 /* Instantiated */) === 0);
-            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
-                return getDeclaredTypeOfClassOrInterface(symbol);
-            }
-            if (symbol.flags & 524288 /* TypeAlias */) {
-                return getDeclaredTypeOfTypeAlias(symbol);
-            }
-            if (symbol.flags & 384 /* Enum */) {
-                return getDeclaredTypeOfEnum(symbol);
-            }
-            if (symbol.flags & 262144 /* TypeParameter */) {
-                return getDeclaredTypeOfTypeParameter(symbol);
-            }
-            if (symbol.flags & 8388608 /* Alias */) {
-                return getDeclaredTypeOfAlias(symbol);
-            }
-            return unknownType;
-        }
-        // A type reference is considered independent if each type argument is considered independent.
-        function isIndependentTypeReference(node) {
-            if (node.typeArguments) {
-                for (var _i = 0, _a = node.typeArguments; _i < _a.length; _i++) {
-                    var typeNode = _a[_i];
-                    if (!isIndependentType(typeNode)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        // A type is considered independent if it the any, string, number, boolean, symbol, or void keyword, a string
-        // literal type, an array with an element type that is considered independent, or a type reference that is
-        // considered independent.
-        function isIndependentType(node) {
-            switch (node.kind) {
-                case 117 /* AnyKeyword */:
-                case 132 /* StringKeyword */:
-                case 130 /* NumberKeyword */:
-                case 120 /* BooleanKeyword */:
-                case 133 /* SymbolKeyword */:
-                case 103 /* VoidKeyword */:
-                case 135 /* UndefinedKeyword */:
-                case 93 /* NullKeyword */:
-                case 127 /* NeverKeyword */:
-                case 166 /* StringLiteralType */:
-                    return true;
-                case 160 /* ArrayType */:
-                    return isIndependentType(node.elementType);
-                case 155 /* TypeReference */:
-                    return isIndependentTypeReference(node);
-            }
-            return false;
-        }
-        // A variable-like declaration is considered independent (free of this references) if it has a type annotation
-        // that specifies an independent type, or if it has no type annotation and no initializer (and thus of type any).
-        function isIndependentVariableLikeDeclaration(node) {
-            return node.type && isIndependentType(node.type) || !node.type && !node.initializer;
-        }
-        // A function-like declaration is considered independent (free of this references) if it has a return type
-        // annotation that is considered independent and if each parameter is considered independent.
-        function isIndependentFunctionLikeDeclaration(node) {
-            if (node.kind !== 148 /* Constructor */ && (!node.type || !isIndependentType(node.type))) {
-                return false;
-            }
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                if (!isIndependentVariableLikeDeclaration(parameter)) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        // Returns true if the class or interface member given by the symbol is free of "this" references. The
-        // function may return false for symbols that are actually free of "this" references because it is not
-        // feasible to perform a complete analysis in all cases. In particular, property members with types
-        // inferred from their initializers and function members with inferred return types are conservatively
-        // assumed not to be free of "this" references.
-        function isIndependentMember(symbol) {
-            if (symbol.declarations && symbol.declarations.length === 1) {
-                var declaration = symbol.declarations[0];
-                if (declaration) {
-                    switch (declaration.kind) {
-                        case 145 /* PropertyDeclaration */:
-                        case 144 /* PropertySignature */:
-                            return isIndependentVariableLikeDeclaration(declaration);
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                        case 148 /* Constructor */:
-                            return isIndependentFunctionLikeDeclaration(declaration);
-                    }
-                }
-            }
-            return false;
-        }
-        function createSymbolTable(symbols) {
-            var result = {};
-            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
-                var symbol = symbols_1[_i];
-                result[symbol.name] = symbol;
-            }
-            return result;
-        }
-        // The mappingThisOnly flag indicates that the only type parameter being mapped is "this". When the flag is true,
-        // we check symbols to see if we can quickly conclude they are free of "this" references, thus needing no instantiation.
-        function createInstantiatedSymbolTable(symbols, mapper, mappingThisOnly) {
-            var result = {};
-            for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                var symbol = symbols_2[_i];
-                result[symbol.name] = mappingThisOnly && isIndependentMember(symbol) ? symbol : instantiateSymbol(symbol, mapper);
-            }
-            return result;
-        }
-        function addInheritedMembers(symbols, baseSymbols) {
-            for (var _i = 0, baseSymbols_1 = baseSymbols; _i < baseSymbols_1.length; _i++) {
-                var s = baseSymbols_1[_i];
-                if (!ts.hasProperty(symbols, s.name)) {
-                    symbols[s.name] = s;
-                }
-            }
-        }
-        function resolveDeclaredMembers(type) {
-            if (!type.declaredProperties) {
-                var symbol = type.symbol;
-                type.declaredProperties = getNamedMembers(symbol.members);
-                type.declaredCallSignatures = getSignaturesOfSymbol(symbol.members["__call"]);
-                type.declaredConstructSignatures = getSignaturesOfSymbol(symbol.members["__new"]);
-                type.declaredStringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
-                type.declaredNumberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
-            }
-            return type;
-        }
-        function getTypeWithThisArgument(type, thisArgument) {
-            if (type.flags & 4096 /* Reference */) {
-                return createTypeReference(type.target, ts.concatenate(type.typeArguments, [thisArgument || type.target.thisType]));
-            }
-            return type;
-        }
-        function resolveObjectTypeMembers(type, source, typeParameters, typeArguments) {
-            var mapper = identityMapper;
-            var members = source.symbol.members;
-            var callSignatures = source.declaredCallSignatures;
-            var constructSignatures = source.declaredConstructSignatures;
-            var stringIndexInfo = source.declaredStringIndexInfo;
-            var numberIndexInfo = source.declaredNumberIndexInfo;
-            if (!ts.rangeEquals(typeParameters, typeArguments, 0, typeParameters.length)) {
-                mapper = createTypeMapper(typeParameters, typeArguments);
-                members = createInstantiatedSymbolTable(source.declaredProperties, mapper, /*mappingThisOnly*/ typeParameters.length === 1);
-                callSignatures = instantiateList(source.declaredCallSignatures, mapper, instantiateSignature);
-                constructSignatures = instantiateList(source.declaredConstructSignatures, mapper, instantiateSignature);
-                stringIndexInfo = instantiateIndexInfo(source.declaredStringIndexInfo, mapper);
-                numberIndexInfo = instantiateIndexInfo(source.declaredNumberIndexInfo, mapper);
-            }
-            var baseTypes = getBaseTypes(source);
-            if (baseTypes.length) {
-                if (members === source.symbol.members) {
-                    members = createSymbolTable(source.declaredProperties);
-                }
-                var thisArgument = ts.lastOrUndefined(typeArguments);
-                for (var _i = 0, baseTypes_1 = baseTypes; _i < baseTypes_1.length; _i++) {
-                    var baseType = baseTypes_1[_i];
-                    var instantiatedBaseType = thisArgument ? getTypeWithThisArgument(instantiateType(baseType, mapper), thisArgument) : baseType;
-                    addInheritedMembers(members, getPropertiesOfObjectType(instantiatedBaseType));
-                    callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(instantiatedBaseType, 0 /* Call */));
-                    constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(instantiatedBaseType, 1 /* Construct */));
-                    stringIndexInfo = stringIndexInfo || getIndexInfoOfType(instantiatedBaseType, 0 /* String */);
-                    numberIndexInfo = numberIndexInfo || getIndexInfoOfType(instantiatedBaseType, 1 /* Number */);
-                }
-            }
-            setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-        }
-        function resolveClassOrInterfaceMembers(type) {
-            resolveObjectTypeMembers(type, resolveDeclaredMembers(type), emptyArray, emptyArray);
-        }
-        function resolveTypeReferenceMembers(type) {
-            var source = resolveDeclaredMembers(type.target);
-            var typeParameters = ts.concatenate(source.typeParameters, [source.thisType]);
-            var typeArguments = type.typeArguments && type.typeArguments.length === typeParameters.length ?
-                type.typeArguments : ts.concatenate(type.typeArguments, [type]);
-            resolveObjectTypeMembers(type, source, typeParameters, typeArguments);
-        }
-        function createSignature(declaration, typeParameters, thisParameter, parameters, resolvedReturnType, typePredicate, minArgumentCount, hasRestParameter, hasStringLiterals) {
-            var sig = new Signature(checker);
-            sig.declaration = declaration;
-            sig.typeParameters = typeParameters;
-            sig.parameters = parameters;
-            sig.thisParameter = thisParameter;
-            sig.resolvedReturnType = resolvedReturnType;
-            sig.typePredicate = typePredicate;
-            sig.minArgumentCount = minArgumentCount;
-            sig.hasRestParameter = hasRestParameter;
-            sig.hasStringLiterals = hasStringLiterals;
-            return sig;
-        }
-        function cloneSignature(sig) {
-            return createSignature(sig.declaration, sig.typeParameters, sig.thisParameter, sig.parameters, sig.resolvedReturnType, sig.typePredicate, sig.minArgumentCount, sig.hasRestParameter, sig.hasStringLiterals);
-        }
-        function getDefaultConstructSignatures(classType) {
-            var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-            var baseSignatures = getSignaturesOfType(baseConstructorType, 1 /* Construct */);
-            if (baseSignatures.length === 0) {
-                return [createSignature(undefined, classType.localTypeParameters, undefined, emptyArray, classType, /*typePredicate*/ undefined, 0, /*hasRestParameter*/ false, /*hasStringLiterals*/ false)];
-            }
-            var baseTypeNode = getBaseTypeNodeOfClass(classType);
-            var typeArguments = ts.map(baseTypeNode.typeArguments, getTypeFromTypeNode);
-            var typeArgCount = typeArguments ? typeArguments.length : 0;
-            var result = [];
-            for (var _i = 0, baseSignatures_1 = baseSignatures; _i < baseSignatures_1.length; _i++) {
-                var baseSig = baseSignatures_1[_i];
-                var typeParamCount = baseSig.typeParameters ? baseSig.typeParameters.length : 0;
-                if (typeParamCount === typeArgCount) {
-                    var sig = typeParamCount ? getSignatureInstantiation(baseSig, typeArguments) : cloneSignature(baseSig);
-                    sig.typeParameters = classType.localTypeParameters;
-                    sig.resolvedReturnType = classType;
-                    result.push(sig);
-                }
-            }
-            return result;
-        }
-        function createTupleTypeMemberSymbols(memberTypes) {
-            var members = {};
-            for (var i = 0; i < memberTypes.length; i++) {
-                var symbol = createSymbol(4 /* Property */ | 67108864 /* Transient */, "" + i);
-                symbol.type = memberTypes[i];
-                members[i] = symbol;
-            }
-            return members;
-        }
-        function resolveTupleTypeMembers(type) {
-            var arrayElementType = getUnionType(type.elementTypes, /*noSubtypeReduction*/ true);
-            // Make the tuple type itself the 'this' type by including an extra type argument
-            var arrayType = resolveStructuredTypeMembers(createTypeFromGenericGlobalType(globalArrayType, [arrayElementType, type]));
-            var members = createTupleTypeMemberSymbols(type.elementTypes);
-            addInheritedMembers(members, arrayType.properties);
-            setObjectTypeMembers(type, members, arrayType.callSignatures, arrayType.constructSignatures, arrayType.stringIndexInfo, arrayType.numberIndexInfo);
-        }
-        function findMatchingSignature(signatureList, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes) {
-            for (var _i = 0, signatureList_1 = signatureList; _i < signatureList_1.length; _i++) {
-                var s = signatureList_1[_i];
-                if (compareSignaturesIdentical(s, signature, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypesIdentical)) {
-                    return s;
-                }
-            }
-        }
-        function findMatchingSignatures(signatureLists, signature, listIndex) {
-            if (signature.typeParameters) {
-                // We require an exact match for generic signatures, so we only return signatures from the first
-                // signature list and only if they have exact matches in the other signature lists.
-                if (listIndex > 0) {
-                    return undefined;
-                }
-                for (var i = 1; i < signatureLists.length; i++) {
-                    if (!findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false)) {
-                        return undefined;
-                    }
-                }
-                return [signature];
-            }
-            var result = undefined;
-            for (var i = 0; i < signatureLists.length; i++) {
-                // Allow matching non-generic signatures to have excess parameters and different return types
-                var match = i === listIndex ? signature : findMatchingSignature(signatureLists[i], signature, /*partialMatch*/ true, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true);
-                if (!match) {
-                    return undefined;
-                }
-                if (!ts.contains(result, match)) {
-                    (result || (result = [])).push(match);
-                }
-            }
-            return result;
-        }
-        // The signatures of a union type are those signatures that are present in each of the constituent types.
-        // Generic signatures must match exactly, but non-generic signatures are allowed to have extra optional
-        // parameters and may differ in return types. When signatures differ in return types, the resulting return
-        // type is the union of the constituent return types.
-        function getUnionSignatures(types, kind) {
-            var signatureLists = ts.map(types, function (t) { return getSignaturesOfType(t, kind); });
-            var result = undefined;
-            for (var i = 0; i < signatureLists.length; i++) {
-                for (var _i = 0, _a = signatureLists[i]; _i < _a.length; _i++) {
-                    var signature = _a[_i];
-                    // Only process signatures with parameter lists that aren't already in the result list
-                    if (!result || !findMatchingSignature(result, signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true)) {
-                        var unionSignatures = findMatchingSignatures(signatureLists, signature, i);
-                        if (unionSignatures) {
-                            var s = signature;
-                            // Union the result types when more than one signature matches
-                            if (unionSignatures.length > 1) {
-                                s = cloneSignature(signature);
-                                if (ts.forEach(unionSignatures, function (sig) { return sig.thisParameter; })) {
-                                    var thisType = getUnionType(ts.map(unionSignatures, function (sig) { return getTypeOfSymbol(sig.thisParameter) || anyType; }));
-                                    s.thisParameter = createTransientSymbol(signature.thisParameter, thisType);
-                                }
-                                // Clear resolved return type we possibly got from cloneSignature
-                                s.resolvedReturnType = undefined;
-                                s.unionSignatures = unionSignatures;
-                            }
-                            (result || (result = [])).push(s);
-                        }
-                    }
-                }
-            }
-            return result || emptyArray;
-        }
-        function getUnionIndexInfo(types, kind) {
-            var indexTypes = [];
-            var isAnyReadonly = false;
-            for (var _i = 0, types_1 = types; _i < types_1.length; _i++) {
-                var type = types_1[_i];
-                var indexInfo = getIndexInfoOfType(type, kind);
-                if (!indexInfo) {
-                    return undefined;
-                }
-                indexTypes.push(indexInfo.type);
-                isAnyReadonly = isAnyReadonly || indexInfo.isReadonly;
-            }
-            return createIndexInfo(getUnionType(indexTypes), isAnyReadonly);
-        }
-        function resolveUnionTypeMembers(type) {
-            // The members and properties collections are empty for union types. To get all properties of a union
-            // type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = getUnionSignatures(type.types, 0 /* Call */);
-            var constructSignatures = getUnionSignatures(type.types, 1 /* Construct */);
-            var stringIndexInfo = getUnionIndexInfo(type.types, 0 /* String */);
-            var numberIndexInfo = getUnionIndexInfo(type.types, 1 /* Number */);
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-        }
-        function intersectTypes(type1, type2) {
-            return !type1 ? type2 : !type2 ? type1 : getIntersectionType([type1, type2]);
-        }
-        function intersectIndexInfos(info1, info2) {
-            return !info1 ? info2 : !info2 ? info1 : createIndexInfo(getIntersectionType([info1.type, info2.type]), info1.isReadonly && info2.isReadonly);
-        }
-        function resolveIntersectionTypeMembers(type) {
-            // The members and properties collections are empty for intersection types. To get all properties of an
-            // intersection type use getPropertiesOfType (only the language service uses this).
-            var callSignatures = emptyArray;
-            var constructSignatures = emptyArray;
-            var stringIndexInfo = undefined;
-            var numberIndexInfo = undefined;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                callSignatures = ts.concatenate(callSignatures, getSignaturesOfType(t, 0 /* Call */));
-                constructSignatures = ts.concatenate(constructSignatures, getSignaturesOfType(t, 1 /* Construct */));
-                stringIndexInfo = intersectIndexInfos(stringIndexInfo, getIndexInfoOfType(t, 0 /* String */));
-                numberIndexInfo = intersectIndexInfos(numberIndexInfo, getIndexInfoOfType(t, 1 /* Number */));
-            }
-            setObjectTypeMembers(type, emptySymbols, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-        }
-        function resolveAnonymousTypeMembers(type) {
-            var symbol = type.symbol;
-            if (type.target) {
-                var members = createInstantiatedSymbolTable(getPropertiesOfObjectType(type.target), type.mapper, /*mappingThisOnly*/ false);
-                var callSignatures = instantiateList(getSignaturesOfType(type.target, 0 /* Call */), type.mapper, instantiateSignature);
-                var constructSignatures = instantiateList(getSignaturesOfType(type.target, 1 /* Construct */), type.mapper, instantiateSignature);
-                var stringIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 0 /* String */), type.mapper);
-                var numberIndexInfo = instantiateIndexInfo(getIndexInfoOfType(type.target, 1 /* Number */), type.mapper);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-            }
-            else if (symbol.flags & 2048 /* TypeLiteral */) {
-                var members = symbol.members;
-                var callSignatures = getSignaturesOfSymbol(members["__call"]);
-                var constructSignatures = getSignaturesOfSymbol(members["__new"]);
-                var stringIndexInfo = getIndexInfoOfSymbol(symbol, 0 /* String */);
-                var numberIndexInfo = getIndexInfoOfSymbol(symbol, 1 /* Number */);
-                setObjectTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo);
-            }
-            else {
-                // Combinations of function, class, enum and module
-                var members = emptySymbols;
-                var constructSignatures = emptyArray;
-                if (symbol.flags & 1952 /* HasExports */) {
-                    members = getExportsOfSymbol(symbol);
-                }
-                if (symbol.flags & 32 /* Class */) {
-                    var classType = getDeclaredTypeOfClassOrInterface(symbol);
-                    constructSignatures = getSignaturesOfSymbol(symbol.members["__constructor"]);
-                    if (!constructSignatures.length) {
-                        constructSignatures = getDefaultConstructSignatures(classType);
-                    }
-                    var baseConstructorType = getBaseConstructorTypeOfClass(classType);
-                    if (baseConstructorType.flags & 80896 /* ObjectType */) {
-                        members = createSymbolTable(getNamedMembers(members));
-                        addInheritedMembers(members, getPropertiesOfObjectType(baseConstructorType));
-                    }
-                }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ ? enumNumberIndexInfo : undefined;
-                setObjectTypeMembers(type, members, emptyArray, constructSignatures, undefined, numberIndexInfo);
-                // We resolve the members before computing the signatures because a signature may use
-                // typeof with a qualified name expression that circularly references the type we are
-                // in the process of resolving (see issue #6072). The temporarily empty signature list
-                // will never be observed because a qualified name can't reference signatures.
-                if (symbol.flags & (16 /* Function */ | 8192 /* Method */)) {
-                    type.callSignatures = getSignaturesOfSymbol(symbol);
-                }
-            }
-        }
-        function resolveStructuredTypeMembers(type) {
-            if (!type.members) {
-                if (type.flags & 4096 /* Reference */) {
-                    resolveTypeReferenceMembers(type);
-                }
-                else if (type.flags & (1024 /* Class */ | 2048 /* Interface */)) {
-                    resolveClassOrInterfaceMembers(type);
-                }
-                else if (type.flags & 65536 /* Anonymous */) {
-                    resolveAnonymousTypeMembers(type);
-                }
-                else if (type.flags & 8192 /* Tuple */) {
-                    resolveTupleTypeMembers(type);
-                }
-                else if (type.flags & 16384 /* Union */) {
-                    resolveUnionTypeMembers(type);
-                }
-                else if (type.flags & 32768 /* Intersection */) {
-                    resolveIntersectionTypeMembers(type);
-                }
-            }
-            return type;
-        }
-        /** Return properties of an object type or an empty array for other types */
-        function getPropertiesOfObjectType(type) {
-            if (type.flags & 80896 /* ObjectType */) {
-                return resolveStructuredTypeMembers(type).properties;
-            }
-            return emptyArray;
-        }
-        /** If the given type is an object type and that type has a property by the given name,
-         * return the symbol for that property. Otherwise return undefined. */
-        function getPropertyOfObjectType(type, name) {
-            if (type.flags & 80896 /* ObjectType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                if (ts.hasProperty(resolved.members, name)) {
-                    var symbol = resolved.members[name];
-                    if (symbolIsValue(symbol)) {
-                        return symbol;
-                    }
-                }
-            }
-        }
-        function getPropertiesOfUnionOrIntersectionType(type) {
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var current = _a[_i];
-                for (var _b = 0, _c = getPropertiesOfType(current); _b < _c.length; _b++) {
-                    var prop = _c[_b];
-                    getPropertyOfUnionOrIntersectionType(type, prop.name);
-                }
-                // The properties of a union type are those that are present in all constituent types, so
-                // we only need to check the properties of the first type
-                if (type.flags & 16384 /* Union */) {
-                    break;
-                }
-            }
-            return type.resolvedProperties ? symbolsToArray(type.resolvedProperties) : emptyArray;
-        }
-        function getPropertiesOfType(type) {
-            type = getApparentType(type);
-            return type.flags & 49152 /* UnionOrIntersection */ ? getPropertiesOfUnionOrIntersectionType(type) : getPropertiesOfObjectType(type);
-        }
-        /**
-         * The apparent type of a type parameter is the base constraint instantiated with the type parameter
-         * as the type argument for the 'this' type.
-         */
-        function getApparentTypeOfTypeParameter(type) {
-            if (!type.resolvedApparentType) {
-                var constraintType = getConstraintOfTypeParameter(type);
-                while (constraintType && constraintType.flags & 512 /* TypeParameter */) {
-                    constraintType = getConstraintOfTypeParameter(constraintType);
-                }
-                type.resolvedApparentType = getTypeWithThisArgument(constraintType || emptyObjectType, type);
-            }
-            return type.resolvedApparentType;
-        }
-        /**
-         * For a type parameter, return the base constraint of the type parameter. For the string, number,
-         * boolean, and symbol primitive types, return the corresponding object types. Otherwise return the
-         * type itself. Note that the apparent type of a union type is the union type itself.
-         */
-        function getApparentType(type) {
-            if (type.flags & 512 /* TypeParameter */) {
-                type = getApparentTypeOfTypeParameter(type);
-            }
-            if (type.flags & 258 /* StringLike */) {
-                type = globalStringType;
-            }
-            else if (type.flags & 132 /* NumberLike */) {
-                type = globalNumberType;
-            }
-            else if (type.flags & 8 /* Boolean */) {
-                type = globalBooleanType;
-            }
-            else if (type.flags & 16777216 /* ESSymbol */) {
-                type = getGlobalESSymbolType();
-            }
-            return type;
-        }
-        function createUnionOrIntersectionProperty(containingType, name) {
-            var types = containingType.types;
-            var props;
-            // Flags we want to propagate to the result if they exist in all source symbols
-            var commonFlags = (containingType.flags & 32768 /* Intersection */) ? 536870912 /* Optional */ : 0 /* None */;
-            var isReadonly = false;
-            for (var _i = 0, types_2 = types; _i < types_2.length; _i++) {
-                var current = types_2[_i];
-                var type = getApparentType(current);
-                if (type !== unknownType) {
-                    var prop = getPropertyOfType(type, name);
-                    if (prop && !(getDeclarationFlagsFromSymbol(prop) & (8 /* Private */ | 16 /* Protected */))) {
-                        commonFlags &= prop.flags;
-                        if (!props) {
-                            props = [prop];
-                        }
-                        else if (!ts.contains(props, prop)) {
-                            props.push(prop);
-                        }
-                        if (isReadonlySymbol(prop)) {
-                            isReadonly = true;
-                        }
-                    }
-                    else if (containingType.flags & 16384 /* Union */) {
-                        // A union type requires the property to be present in all constituent types
-                        return undefined;
-                    }
-                }
-            }
-            if (!props) {
-                return undefined;
-            }
-            if (props.length === 1) {
-                return props[0];
-            }
-            var propTypes = [];
-            var declarations = [];
-            for (var _a = 0, props_1 = props; _a < props_1.length; _a++) {
-                var prop = props_1[_a];
-                if (prop.declarations) {
-                    ts.addRange(declarations, prop.declarations);
-                }
-                propTypes.push(getTypeOfSymbol(prop));
-            }
-            var result = createSymbol(4 /* Property */ |
-                67108864 /* Transient */ |
-                268435456 /* SyntheticProperty */ |
-                commonFlags, name);
-            result.containingType = containingType;
-            result.declarations = declarations;
-            result.isReadonly = isReadonly;
-            result.type = containingType.flags & 16384 /* Union */ ? getUnionType(propTypes) : getIntersectionType(propTypes);
-            return result;
-        }
-        function getPropertyOfUnionOrIntersectionType(type, name) {
-            var properties = type.resolvedProperties || (type.resolvedProperties = {});
-            if (ts.hasProperty(properties, name)) {
-                return properties[name];
-            }
-            var property = createUnionOrIntersectionProperty(type, name);
-            if (property) {
-                properties[name] = property;
-            }
-            return property;
-        }
-        // Return the symbol for the property with the given name in the given type. Creates synthetic union properties when
-        // necessary, maps primitive types and type parameters are to their apparent types, and augments with properties from
-        // Object and Function as appropriate.
-        function getPropertyOfType(type, name) {
-            type = getApparentType(type);
-            if (type.flags & 80896 /* ObjectType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                if (ts.hasProperty(resolved.members, name)) {
-                    var symbol = resolved.members[name];
-                    if (symbolIsValue(symbol)) {
-                        return symbol;
-                    }
-                }
-                if (resolved === anyFunctionType || resolved.callSignatures.length || resolved.constructSignatures.length) {
-                    var symbol = getPropertyOfObjectType(globalFunctionType, name);
-                    if (symbol) {
-                        return symbol;
-                    }
-                }
-                return getPropertyOfObjectType(globalObjectType, name);
-            }
-            if (type.flags & 49152 /* UnionOrIntersection */) {
-                return getPropertyOfUnionOrIntersectionType(type, name);
-            }
-            return undefined;
-        }
-        function getSignaturesOfStructuredType(type, kind) {
-            if (type.flags & 130048 /* StructuredType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 /* Call */ ? resolved.callSignatures : resolved.constructSignatures;
-            }
-            return emptyArray;
-        }
-        /**
-         * Return the signatures of the given kind in the given type. Creates synthetic union signatures when necessary and
-         * maps primitive types and type parameters are to their apparent types.
-         */
-        function getSignaturesOfType(type, kind) {
-            return getSignaturesOfStructuredType(getApparentType(type), kind);
-        }
-        function getIndexInfoOfStructuredType(type, kind) {
-            if (type.flags & 130048 /* StructuredType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                return kind === 0 /* String */ ? resolved.stringIndexInfo : resolved.numberIndexInfo;
-            }
-        }
-        function getIndexTypeOfStructuredType(type, kind) {
-            var info = getIndexInfoOfStructuredType(type, kind);
-            return info && info.type;
-        }
-        // Return the indexing info of the given kind in the given type. Creates synthetic union index types when necessary and
-        // maps primitive types and type parameters are to their apparent types.
-        function getIndexInfoOfType(type, kind) {
-            return getIndexInfoOfStructuredType(getApparentType(type), kind);
-        }
-        // Return the index type of the given kind in the given type. Creates synthetic union index types when necessary and
-        // maps primitive types and type parameters are to their apparent types.
-        function getIndexTypeOfType(type, kind) {
-            return getIndexTypeOfStructuredType(getApparentType(type), kind);
-        }
-        function getImplicitIndexTypeOfType(type, kind) {
-            if (isObjectLiteralType(type)) {
-                var propTypes = [];
-                for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
-                        propTypes.push(getTypeOfSymbol(prop));
-                    }
-                }
-                if (propTypes.length) {
-                    return getUnionType(propTypes);
-                }
-            }
-            return undefined;
-        }
-        function getTypeParametersFromJSDocTemplate(declaration) {
-            if (declaration.flags & 134217728 /* JavaScriptFile */) {
-                var templateTag = ts.getJSDocTemplateTag(declaration);
-                if (templateTag) {
-                    return getTypeParametersFromDeclaration(templateTag.typeParameters);
-                }
-            }
-            return undefined;
-        }
-        // Return list of type parameters with duplicates removed (duplicate identifier errors are generated in the actual
-        // type checking functions).
-        function getTypeParametersFromDeclaration(typeParameterDeclarations) {
-            var result = [];
-            ts.forEach(typeParameterDeclarations, function (node) {
-                var tp = getDeclaredTypeOfTypeParameter(node.symbol);
-                if (!ts.contains(result, tp)) {
-                    result.push(tp);
-                }
-            });
-            return result;
-        }
-        function symbolsToArray(symbols) {
-            var result = [];
-            for (var id in symbols) {
-                if (!isReservedMemberName(id)) {
-                    result.push(symbols[id]);
-                }
-            }
-            return result;
-        }
-        function isJSDocOptionalParameter(node) {
-            if (node.flags & 134217728 /* JavaScriptFile */) {
-                if (node.type && node.type.kind === 268 /* JSDocOptionalType */) {
-                    return true;
-                }
-                var paramTag = ts.getCorrespondingJSDocParameterTag(node);
-                if (paramTag) {
-                    if (paramTag.isBracketed) {
-                        return true;
-                    }
-                    if (paramTag.typeExpression) {
-                        return paramTag.typeExpression.type.kind === 268 /* JSDocOptionalType */;
-                    }
-                }
-            }
-        }
-        function isOptionalParameter(node) {
-            if (ts.hasQuestionToken(node) || isJSDocOptionalParameter(node)) {
-                return true;
-            }
-            if (node.initializer) {
-                var signatureDeclaration = node.parent;
-                var signature = getSignatureFromDeclaration(signatureDeclaration);
-                var parameterIndex = ts.indexOf(signatureDeclaration.parameters, node);
-                ts.Debug.assert(parameterIndex >= 0);
-                return parameterIndex >= signature.minArgumentCount;
-            }
-            return false;
-        }
-        function createTypePredicateFromTypePredicateNode(node) {
-            if (node.parameterName.kind === 69 /* Identifier */) {
-                var parameterName = node.parameterName;
-                return {
-                    kind: 1 /* Identifier */,
-                    parameterName: parameterName ? parameterName.text : undefined,
-                    parameterIndex: parameterName ? getTypePredicateParameterIndex(node.parent.parameters, parameterName) : undefined,
-                    type: getTypeFromTypeNode(node.type)
-                };
-            }
-            else {
-                return {
-                    kind: 0 /* This */,
-                    type: getTypeFromTypeNode(node.type)
-                };
-            }
-        }
-        function getSignatureFromDeclaration(declaration) {
-            var links = getNodeLinks(declaration);
-            if (!links.resolvedSignature) {
-                var parameters = [];
-                var hasStringLiterals = false;
-                var minArgumentCount = -1;
-                var thisParameter = undefined;
-                var hasThisParameter = void 0;
-                var isJSConstructSignature = ts.isJSDocConstructSignature(declaration);
-                // If this is a JSDoc construct signature, then skip the first parameter in the
-                // parameter list.  The first parameter represents the return type of the construct
-                // signature.
-                for (var i = isJSConstructSignature ? 1 : 0, n = declaration.parameters.length; i < n; i++) {
-                    var param = declaration.parameters[i];
-                    var paramSymbol = param.symbol;
-                    // Include parameter symbol instead of property symbol in the signature
-                    if (paramSymbol && !!(paramSymbol.flags & 4 /* Property */) && !ts.isBindingPattern(param.name)) {
-                        var resolvedSymbol = resolveName(param, paramSymbol.name, 107455 /* Value */, undefined, undefined);
-                        paramSymbol = resolvedSymbol;
-                    }
-                    if (i === 0 && paramSymbol.name === "this") {
-                        hasThisParameter = true;
-                        thisParameter = param.symbol;
-                    }
-                    else {
-                        parameters.push(paramSymbol);
-                    }
-                    if (param.type && param.type.kind === 166 /* StringLiteralType */) {
-                        hasStringLiterals = true;
-                    }
-                    if (param.initializer || param.questionToken || param.dotDotDotToken || isJSDocOptionalParameter(param)) {
-                        if (minArgumentCount < 0) {
-                            minArgumentCount = i - (hasThisParameter ? 1 : 0);
-                        }
-                    }
-                    else {
-                        // If we see any required parameters, it means the prior ones were not in fact optional.
-                        minArgumentCount = -1;
-                    }
-                }
-                // If only one accessor includes a this-type annotation, the other behaves as if it had the same type annotation
-                if ((declaration.kind === 149 /* GetAccessor */ || declaration.kind === 150 /* SetAccessor */) &&
-                    !ts.hasDynamicName(declaration) &&
-                    (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 149 /* GetAccessor */ ? 150 /* SetAccessor */ : 149 /* GetAccessor */;
-                    var other = ts.getDeclarationOfKind(declaration.symbol, otherKind);
-                    if (other) {
-                        thisParameter = getAnnotatedAccessorThisParameter(other);
-                    }
-                }
-                if (minArgumentCount < 0) {
-                    minArgumentCount = declaration.parameters.length - (hasThisParameter ? 1 : 0);
-                }
-                if (isJSConstructSignature) {
-                    minArgumentCount--;
-                }
-                var classType = declaration.kind === 148 /* Constructor */ ?
-                    getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
-                    : undefined;
-                var typeParameters = classType ? classType.localTypeParameters :
-                    declaration.typeParameters ? getTypeParametersFromDeclaration(declaration.typeParameters) :
-                        getTypeParametersFromJSDocTemplate(declaration);
-                var returnType = getSignatureReturnTypeFromDeclaration(declaration, minArgumentCount, isJSConstructSignature, classType);
-                var typePredicate = declaration.type && declaration.type.kind === 154 /* TypePredicate */ ?
-                    createTypePredicateFromTypePredicateNode(declaration.type) :
-                    undefined;
-                links.resolvedSignature = createSignature(declaration, typeParameters, thisParameter, parameters, returnType, typePredicate, minArgumentCount, ts.hasRestParameter(declaration), hasStringLiterals);
-            }
-            return links.resolvedSignature;
-        }
-        function getSignatureReturnTypeFromDeclaration(declaration, minArgumentCount, isJSConstructSignature, classType) {
-            if (isJSConstructSignature) {
-                return getTypeFromTypeNode(declaration.parameters[0].type);
-            }
-            else if (classType) {
-                return classType;
-            }
-            else if (declaration.type) {
-                return getTypeFromTypeNode(declaration.type);
-            }
-            if (declaration.flags & 134217728 /* JavaScriptFile */) {
-                var type = getReturnTypeFromJSDocComment(declaration);
-                if (type && type !== unknownType) {
-                    return type;
-                }
-            }
-            // TypeScript 1.0 spec (April 2014):
-            // If only one accessor includes a type annotation, the other behaves as if it had the same type annotation.
-            if (declaration.kind === 149 /* GetAccessor */ && !ts.hasDynamicName(declaration)) {
-                var setter = ts.getDeclarationOfKind(declaration.symbol, 150 /* SetAccessor */);
-                return getAnnotatedAccessorType(setter);
-            }
-            if (ts.nodeIsMissing(declaration.body)) {
-                return anyType;
-            }
-        }
-        function getSignaturesOfSymbol(symbol) {
-            if (!symbol)
-                return emptyArray;
-            var result = [];
-            for (var i = 0, len = symbol.declarations.length; i < len; i++) {
-                var node = symbol.declarations[i];
-                switch (node.kind) {
-                    case 156 /* FunctionType */:
-                    case 157 /* ConstructorType */:
-                    case 220 /* FunctionDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 148 /* Constructor */:
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 153 /* IndexSignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 269 /* JSDocFunctionType */:
-                        // Don't include signature if node is the implementation of an overloaded function. A node is considered
-                        // an implementation node if it has a body and the previous node is of the same kind and immediately
-                        // precedes the implementation node (i.e. has the same parent and ends where the implementation starts).
-                        if (i > 0 && node.body) {
-                            var previous = symbol.declarations[i - 1];
-                            if (node.parent === previous.parent && node.kind === previous.kind && node.pos === previous.end) {
-                                break;
-                            }
-                        }
-                        result.push(getSignatureFromDeclaration(node));
-                }
-            }
-            return result;
-        }
-        function resolveExternalModuleTypeByLiteral(name) {
-            var moduleSym = resolveExternalModuleName(name, name);
-            if (moduleSym) {
-                var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
-                if (resolvedModuleSymbol) {
-                    return getTypeOfSymbol(resolvedModuleSymbol);
-                }
-            }
-            return anyType;
-        }
-        function getThisTypeOfSignature(signature) {
-            if (signature.thisParameter) {
-                return getTypeOfSymbol(signature.thisParameter);
-            }
-        }
-        function getReturnTypeOfSignature(signature) {
-            if (!signature.resolvedReturnType) {
-                if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
-                    return unknownType;
-                }
-                var type = void 0;
-                if (signature.target) {
-                    type = instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper);
-                }
-                else if (signature.unionSignatures) {
-                    type = getUnionType(ts.map(signature.unionSignatures, getReturnTypeOfSignature));
-                }
-                else {
-                    type = getReturnTypeFromBody(signature.declaration);
-                }
-                if (!popTypeResolution()) {
-                    type = anyType;
-                    if (compilerOptions.noImplicitAny) {
-                        var declaration = signature.declaration;
-                        if (declaration.name) {
-                            error(declaration.name, ts.Diagnostics._0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions, ts.declarationNameToString(declaration.name));
-                        }
-                        else {
-                            error(declaration, ts.Diagnostics.Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions);
-                        }
-                    }
-                }
-                signature.resolvedReturnType = type;
-            }
-            return signature.resolvedReturnType;
-        }
-        function getRestTypeOfSignature(signature) {
-            if (signature.hasRestParameter) {
-                var type = getTypeOfSymbol(ts.lastOrUndefined(signature.parameters));
-                if (type.flags & 4096 /* Reference */ && type.target === globalArrayType) {
-                    return type.typeArguments[0];
-                }
-            }
-            return anyType;
-        }
-        function getSignatureInstantiation(signature, typeArguments) {
-            return instantiateSignature(signature, createTypeMapper(signature.typeParameters, typeArguments), /*eraseTypeParameters*/ true);
-        }
-        function getErasedSignature(signature) {
-            if (!signature.typeParameters)
-                return signature;
-            if (!signature.erasedSignatureCache) {
-                signature.erasedSignatureCache = instantiateSignature(signature, createTypeEraser(signature.typeParameters), /*eraseTypeParameters*/ true);
-            }
-            return signature.erasedSignatureCache;
-        }
-        function getOrCreateTypeFromSignature(signature) {
-            // There are two ways to declare a construct signature, one is by declaring a class constructor
-            // using the constructor keyword, and the other is declaring a bare construct signature in an
-            // object type literal or interface (using the new keyword). Each way of declaring a constructor
-            // will result in a different declaration kind.
-            if (!signature.isolatedSignatureType) {
-                var isConstructor = signature.declaration.kind === 148 /* Constructor */ || signature.declaration.kind === 152 /* ConstructSignature */;
-                var type = createObjectType(65536 /* Anonymous */ | 262144 /* FromSignature */);
-                type.members = emptySymbols;
-                type.properties = emptyArray;
-                type.callSignatures = !isConstructor ? [signature] : emptyArray;
-                type.constructSignatures = isConstructor ? [signature] : emptyArray;
-                signature.isolatedSignatureType = type;
-            }
-            return signature.isolatedSignatureType;
-        }
-        function getIndexSymbol(symbol) {
-            return symbol.members["__index"];
-        }
-        function getIndexDeclarationOfSymbol(symbol, kind) {
-            var syntaxKind = kind === 1 /* Number */ ? 130 /* NumberKeyword */ : 132 /* StringKeyword */;
-            var indexSymbol = getIndexSymbol(symbol);
-            if (indexSymbol) {
-                for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var node = decl;
-                    if (node.parameters.length === 1) {
-                        var parameter = node.parameters[0];
-                        if (parameter && parameter.type && parameter.type.kind === syntaxKind) {
-                            return node;
-                        }
-                    }
-                }
-            }
-            return undefined;
-        }
-        function createIndexInfo(type, isReadonly, declaration) {
-            return { type: type, isReadonly: isReadonly, declaration: declaration };
-        }
-        function getIndexInfoOfSymbol(symbol, kind) {
-            var declaration = getIndexDeclarationOfSymbol(symbol, kind);
-            if (declaration) {
-                return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, (declaration.flags & 64 /* Readonly */) !== 0, declaration);
-            }
-            return undefined;
-        }
-        function getConstraintDeclaration(type) {
-            return ts.getDeclarationOfKind(type.symbol, 141 /* TypeParameter */).constraint;
-        }
-        function hasConstraintReferenceTo(type, target) {
-            var checked;
-            while (type && !(type.flags & 33554432 /* ThisType */) && type.flags & 512 /* TypeParameter */ && !ts.contains(checked, type)) {
-                if (type === target) {
-                    return true;
-                }
-                (checked || (checked = [])).push(type);
-                var constraintDeclaration = getConstraintDeclaration(type);
-                type = constraintDeclaration && getTypeFromTypeNode(constraintDeclaration);
-            }
-            return false;
-        }
-        function getConstraintOfTypeParameter(typeParameter) {
-            if (!typeParameter.constraint) {
-                if (typeParameter.target) {
-                    var targetConstraint = getConstraintOfTypeParameter(typeParameter.target);
-                    typeParameter.constraint = targetConstraint ? instantiateType(targetConstraint, typeParameter.mapper) : noConstraintType;
-                }
-                else {
-                    var constraintDeclaration = getConstraintDeclaration(typeParameter);
-                    var constraint = getTypeFromTypeNode(constraintDeclaration);
-                    if (hasConstraintReferenceTo(constraint, typeParameter)) {
-                        error(constraintDeclaration, ts.Diagnostics.Type_parameter_0_has_a_circular_constraint, typeToString(typeParameter));
-                        constraint = unknownType;
-                    }
-                    typeParameter.constraint = constraint;
-                }
-            }
-            return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
-        }
-        function getParentSymbolOfTypeParameter(typeParameter) {
-            return getSymbolOfNode(ts.getDeclarationOfKind(typeParameter.symbol, 141 /* TypeParameter */).parent);
-        }
-        function getTypeListId(types) {
-            if (types) {
-                switch (types.length) {
-                    case 1:
-                        return "" + types[0].id;
-                    case 2:
-                        return types[0].id + "," + types[1].id;
-                    default:
-                        var result = "";
-                        for (var i = 0; i < types.length; i++) {
-                            if (i > 0) {
-                                result += ",";
-                            }
-                            result += types[i].id;
-                        }
-                        return result;
-                }
-            }
-            return "";
-        }
-        // This function is used to propagate certain flags when creating new object type references and union types.
-        // It is only necessary to do so if a constituent type might be the undefined type, the null type, the type
-        // of an object literal or the anyFunctionType. This is because there are operations in the type checker
-        // that care about the presence of such types at arbitrary depth in a containing type.
-        function getPropagatingFlagsOfTypes(types, excludeKinds) {
-            var result = 0;
-            for (var _i = 0, types_3 = types; _i < types_3.length; _i++) {
-                var type = types_3[_i];
-                if (!(type.flags & excludeKinds)) {
-                    result |= type.flags;
-                }
-            }
-            return result & 14680064 /* PropagatingFlags */;
-        }
-        function createTypeReference(target, typeArguments) {
-            var id = getTypeListId(typeArguments);
-            var type = target.instantiations[id];
-            if (!type) {
-                var propagatedFlags = typeArguments ? getPropagatingFlagsOfTypes(typeArguments, /*excludeKinds*/ 0) : 0;
-                var flags = 4096 /* Reference */ | propagatedFlags;
-                type = target.instantiations[id] = createObjectType(flags, target.symbol);
-                type.target = target;
-                type.typeArguments = typeArguments;
-            }
-            return type;
-        }
-        // Get type from reference to class or interface
-        function getTypeFromClassOrInterfaceReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(getMergedSymbol(symbol));
-            var typeParameters = type.localTypeParameters;
-            if (typeParameters) {
-                if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
-                    error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, typeToString(type, /*enclosingDeclaration*/ undefined, 1 /* WriteArrayAsGenericType */), typeParameters.length);
-                    return unknownType;
-                }
-                // In a type reference, the outer type parameters of the referenced class or interface are automatically
-                // supplied as type arguments and the type reference only specifies arguments for the local type parameters
-                // of the class or interface.
-                return createTypeReference(type, ts.concatenate(type.outerTypeParameters, ts.map(node.typeArguments, getTypeFromTypeNode)));
-            }
-            if (node.typeArguments) {
-                error(node, ts.Diagnostics.Type_0_is_not_generic, typeToString(type));
-                return unknownType;
-            }
-            return type;
-        }
-        // Get type from reference to type alias. When a type alias is generic, the declared type of the type alias may include
-        // references to the type parameters of the alias. We replace those with the actual type arguments by instantiating the
-        // declared type. Instantiations are cached using the type identities of the type arguments as the key.
-        function getTypeFromTypeAliasReference(node, symbol) {
-            var type = getDeclaredTypeOfSymbol(symbol);
-            var links = getSymbolLinks(symbol);
-            var typeParameters = links.typeParameters;
-            if (typeParameters) {
-                if (!node.typeArguments || node.typeArguments.length !== typeParameters.length) {
-                    error(node, ts.Diagnostics.Generic_type_0_requires_1_type_argument_s, symbolToString(symbol), typeParameters.length);
-                    return unknownType;
-                }
-                var typeArguments = ts.map(node.typeArguments, getTypeFromTypeNode);
-                var id = getTypeListId(typeArguments);
-                return links.instantiations[id] || (links.instantiations[id] = instantiateType(type, createTypeMapper(typeParameters, typeArguments)));
-            }
-            if (node.typeArguments) {
-                error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
-                return unknownType;
-            }
-            return type;
-        }
-        // Get type from reference to named type that cannot be generic (enum or type parameter)
-        function getTypeFromNonGenericTypeReference(node, symbol) {
-            if (node.typeArguments) {
-                error(node, ts.Diagnostics.Type_0_is_not_generic, symbolToString(symbol));
-                return unknownType;
-            }
-            return getDeclaredTypeOfSymbol(symbol);
-        }
-        function getTypeReferenceName(node) {
-            switch (node.kind) {
-                case 155 /* TypeReference */:
-                    return node.typeName;
-                case 267 /* JSDocTypeReference */:
-                    return node.name;
-                case 194 /* ExpressionWithTypeArguments */:
-                    // We only support expressions that are simple qualified names. For other
-                    // expressions this produces undefined.
-                    if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                        return node.expression;
-                    }
-            }
-            return undefined;
-        }
-        function resolveTypeReferenceName(node, typeReferenceName) {
-            if (!typeReferenceName) {
-                return unknownSymbol;
-            }
-            return resolveEntityName(typeReferenceName, 793056 /* Type */) || unknownSymbol;
-        }
-        function getTypeReferenceType(node, symbol) {
-            if (symbol === unknownSymbol) {
-                return unknownType;
-            }
-            if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
-                return getTypeFromClassOrInterfaceReference(node, symbol);
-            }
-            if (symbol.flags & 524288 /* TypeAlias */) {
-                return getTypeFromTypeAliasReference(node, symbol);
-            }
-            if (symbol.flags & 107455 /* Value */ && node.kind === 267 /* JSDocTypeReference */) {
-                // A JSDocTypeReference may have resolved to a value (as opposed to a type). In
-                // that case, the type of this reference is just the type of the value we resolved
-                // to.
-                return getTypeOfSymbol(symbol);
-            }
-            return getTypeFromNonGenericTypeReference(node, symbol);
-        }
-        function getTypeFromTypeReference(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                var symbol = void 0;
-                var type = void 0;
-                if (node.kind === 267 /* JSDocTypeReference */) {
-                    var typeReferenceName = getTypeReferenceName(node);
-                    symbol = resolveTypeReferenceName(node, typeReferenceName);
-                    type = getTypeReferenceType(node, symbol);
-                    links.resolvedSymbol = symbol;
-                    links.resolvedType = type;
-                }
-                else {
-                    // We only support expressions that are simple qualified names. For other expressions this produces undefined.
-                    var typeNameOrExpression = node.kind === 155 /* TypeReference */ ? node.typeName :
-                        ts.isSupportedExpressionWithTypeArguments(node) ? node.expression :
-                            undefined;
-                    symbol = typeNameOrExpression && resolveEntityName(typeNameOrExpression, 793056 /* Type */) || unknownSymbol;
-                    type = symbol === unknownSymbol ? unknownType :
-                        symbol.flags & (32 /* Class */ | 64 /* Interface */) ? getTypeFromClassOrInterfaceReference(node, symbol) :
-                            symbol.flags & 524288 /* TypeAlias */ ? getTypeFromTypeAliasReference(node, symbol) :
-                                getTypeFromNonGenericTypeReference(node, symbol);
-                }
-                // Cache both the resolved symbol and the resolved type. The resolved symbol is needed in when we check the
-                // type reference in checkTypeReferenceOrExpressionWithTypeArguments.
-                links.resolvedSymbol = symbol;
-                links.resolvedType = type;
-            }
-            return links.resolvedType;
-        }
-        function getTypeFromTypeQueryNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                // TypeScript 1.0 spec (April 2014): 3.6.3
-                // The expression is processed as an identifier expression (section 4.3)
-                // or property access expression(section 4.10),
-                // the widened type(section 3.9) of which becomes the result.
-                links.resolvedType = getWidenedType(checkExpression(node.exprName));
-            }
-            return links.resolvedType;
-        }
-        function getTypeOfGlobalSymbol(symbol, arity) {
-            function getTypeDeclaration(symbol) {
-                var declarations = symbol.declarations;
-                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
-                    var declaration = declarations_3[_i];
-                    switch (declaration.kind) {
-                        case 221 /* ClassDeclaration */:
-                        case 222 /* InterfaceDeclaration */:
-                        case 224 /* EnumDeclaration */:
-                            return declaration;
-                    }
-                }
-            }
-            if (!symbol) {
-                return arity ? emptyGenericType : emptyObjectType;
-            }
-            var type = getDeclaredTypeOfSymbol(symbol);
-            if (!(type.flags & 80896 /* ObjectType */)) {
-                error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_be_a_class_or_interface_type, symbol.name);
-                return arity ? emptyGenericType : emptyObjectType;
-            }
-            if ((type.typeParameters ? type.typeParameters.length : 0) !== arity) {
-                error(getTypeDeclaration(symbol), ts.Diagnostics.Global_type_0_must_have_1_type_parameter_s, symbol.name, arity);
-                return arity ? emptyGenericType : emptyObjectType;
-            }
-            return type;
-        }
-        function getGlobalValueSymbol(name) {
-            return getGlobalSymbol(name, 107455 /* Value */, ts.Diagnostics.Cannot_find_global_value_0);
-        }
-        function getGlobalTypeSymbol(name) {
-            return getGlobalSymbol(name, 793056 /* Type */, ts.Diagnostics.Cannot_find_global_type_0);
-        }
-        function getGlobalSymbol(name, meaning, diagnostic) {
-            return resolveName(undefined, name, meaning, diagnostic, name);
-        }
-        function getGlobalType(name, arity) {
-            if (arity === void 0) { arity = 0; }
-            return getTypeOfGlobalSymbol(getGlobalTypeSymbol(name), arity);
-        }
-        /**
-         * Returns a type that is inside a namespace at the global scope, e.g.
-         * getExportedTypeFromNamespace('JSX', 'Element') returns the JSX.Element type
-         */
-        function getExportedTypeFromNamespace(namespace, name) {
-            var namespaceSymbol = getGlobalSymbol(namespace, 1536 /* Namespace */, /*diagnosticMessage*/ undefined);
-            var typeSymbol = namespaceSymbol && getSymbol(namespaceSymbol.exports, name, 793056 /* Type */);
-            return typeSymbol && getDeclaredTypeOfSymbol(typeSymbol);
-        }
-        /**
-          * Creates a TypeReference for a generic `TypedPropertyDescriptor<T>`.
-          */
-        function createTypedPropertyDescriptorType(propertyType) {
-            var globalTypedPropertyDescriptorType = getGlobalTypedPropertyDescriptorType();
-            return globalTypedPropertyDescriptorType !== emptyGenericType
-                ? createTypeReference(globalTypedPropertyDescriptorType, [propertyType])
-                : emptyObjectType;
-        }
-        /**
-         * Instantiates a global type that is generic with some element type, and returns that instantiation.
-         */
-        function createTypeFromGenericGlobalType(genericGlobalType, typeArguments) {
-            return genericGlobalType !== emptyGenericType ? createTypeReference(genericGlobalType, typeArguments) : emptyObjectType;
-        }
-        function createIterableType(elementType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableType(), [elementType]);
-        }
-        function createIterableIteratorType(elementType) {
-            return createTypeFromGenericGlobalType(getGlobalIterableIteratorType(), [elementType]);
-        }
-        function createArrayType(elementType) {
-            return createTypeFromGenericGlobalType(globalArrayType, [elementType]);
-        }
-        function getTypeFromArrayTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = createArrayType(getTypeFromTypeNode(node.elementType));
-            }
-            return links.resolvedType;
-        }
-        function createTupleType(elementTypes) {
-            var id = getTypeListId(elementTypes);
-            return tupleTypes[id] || (tupleTypes[id] = createNewTupleType(elementTypes));
-        }
-        function createNewTupleType(elementTypes) {
-            var propagatedFlags = getPropagatingFlagsOfTypes(elementTypes, /*excludeKinds*/ 0);
-            var type = createObjectType(8192 /* Tuple */ | propagatedFlags);
-            type.elementTypes = elementTypes;
-            return type;
-        }
-        function getTypeFromTupleTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = createTupleType(ts.map(node.elementTypes, getTypeFromTypeNode));
-            }
-            return links.resolvedType;
-        }
-        function addTypeToSet(typeSet, type, typeSetKind) {
-            if (type.flags & typeSetKind) {
-                addTypesToSet(typeSet, type.types, typeSetKind);
-            }
-            else if (type.flags & (1 /* Any */ | 32 /* Undefined */ | 64 /* Null */)) {
-                if (type.flags & 1 /* Any */)
-                    typeSet.containsAny = true;
-                if (type.flags & 32 /* Undefined */)
-                    typeSet.containsUndefined = true;
-                if (type.flags & 64 /* Null */)
-                    typeSet.containsNull = true;
-                if (!(type.flags & 2097152 /* ContainsWideningType */))
-                    typeSet.containsNonWideningType = true;
-            }
-            else if (type !== neverType && !ts.contains(typeSet, type)) {
-                typeSet.push(type);
-            }
-        }
-        // Add the given types to the given type set. Order is preserved, duplicates are removed,
-        // and nested types of the given kind are flattened into the set.
-        function addTypesToSet(typeSet, types, typeSetKind) {
-            for (var _i = 0, types_4 = types; _i < types_4.length; _i++) {
-                var type = types_4[_i];
-                addTypeToSet(typeSet, type, typeSetKind);
-            }
-        }
-        function isSubtypeOfAny(candidate, types) {
-            for (var i = 0, len = types.length; i < len; i++) {
-                if (candidate !== types[i] && isTypeSubtypeOf(candidate, types[i])) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function removeSubtypes(types) {
-            var i = types.length;
-            while (i > 0) {
-                i--;
-                if (isSubtypeOfAny(types[i], types)) {
-                    types.splice(i, 1);
-                }
-            }
-        }
-        // We reduce the constituent type set to only include types that aren't subtypes of other types, unless
-        // the noSubtypeReduction flag is specified, in which case we perform a simple deduplication based on
-        // object identity. Subtype reduction is possible only when union types are known not to circularly
-        // reference themselves (as is the case with union types created by expression constructs such as array
-        // literals and the || and ?: operators). Named types can circularly reference themselves and therefore
-        // cannot be deduplicated during their declaration. For example, "type Item = string | (() => Item" is
-        // a named type that circularly references itself.
-        function getUnionType(types, noSubtypeReduction) {
-            if (types.length === 0) {
-                return neverType;
-            }
-            if (types.length === 1) {
-                return types[0];
-            }
-            var typeSet = [];
-            addTypesToSet(typeSet, types, 16384 /* Union */);
-            if (typeSet.containsAny) {
-                return anyType;
-            }
-            if (strictNullChecks) {
-                if (typeSet.containsNull)
-                    typeSet.push(nullType);
-                if (typeSet.containsUndefined)
-                    typeSet.push(undefinedType);
-            }
-            if (!noSubtypeReduction) {
-                removeSubtypes(typeSet);
-            }
-            if (typeSet.length === 0) {
-                return typeSet.containsNull ? typeSet.containsNonWideningType ? nullType : nullWideningType :
-                    typeSet.containsUndefined ? typeSet.containsNonWideningType ? undefinedType : undefinedWideningType :
-                        neverType;
-            }
-            else if (typeSet.length === 1) {
-                return typeSet[0];
-            }
-            var id = getTypeListId(typeSet);
-            var type = unionTypes[id];
-            if (!type) {
-                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
-                type = unionTypes[id] = createObjectType(16384 /* Union */ | propagatedFlags);
-                type.types = typeSet;
-            }
-            return type;
-        }
-        function getTypeFromUnionTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getUnionType(ts.map(node.types, getTypeFromTypeNode), /*noSubtypeReduction*/ true);
-            }
-            return links.resolvedType;
-        }
-        // We do not perform structural deduplication on intersection types. Intersection types are created only by the &
-        // type operator and we can't reduce those because we want to support recursive intersection types. For example,
-        // a type alias of the form "type List<T> = T & { next: List<T> }" cannot be reduced during its declaration.
-        // Also, unlike union types, the order of the constituent types is preserved in order that overload resolution
-        // for intersections of types with signatures can be deterministic.
-        function getIntersectionType(types) {
-            if (types.length === 0) {
-                return emptyObjectType;
-            }
-            var typeSet = [];
-            addTypesToSet(typeSet, types, 32768 /* Intersection */);
-            if (typeSet.containsAny) {
-                return anyType;
-            }
-            if (strictNullChecks) {
-                if (typeSet.containsNull)
-                    typeSet.push(nullType);
-                if (typeSet.containsUndefined)
-                    typeSet.push(undefinedType);
-            }
-            if (typeSet.length === 1) {
-                return typeSet[0];
-            }
-            var id = getTypeListId(typeSet);
-            var type = intersectionTypes[id];
-            if (!type) {
-                var propagatedFlags = getPropagatingFlagsOfTypes(typeSet, /*excludeKinds*/ 96 /* Nullable */);
-                type = intersectionTypes[id] = createObjectType(32768 /* Intersection */ | propagatedFlags);
-                type.types = typeSet;
-            }
-            return type;
-        }
-        function getTypeFromIntersectionTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getIntersectionType(ts.map(node.types, getTypeFromTypeNode));
-            }
-            return links.resolvedType;
-        }
-        function getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                // Deferred resolution of members is handled by resolveObjectTypeMembers
-                links.resolvedType = createObjectType(65536 /* Anonymous */, node.symbol);
-            }
-            return links.resolvedType;
-        }
-        function getStringLiteralTypeForText(text) {
-            if (ts.hasProperty(stringLiteralTypes, text)) {
-                return stringLiteralTypes[text];
-            }
-            var type = stringLiteralTypes[text] = createType(256 /* StringLiteral */);
-            type.text = text;
-            return type;
-        }
-        function getTypeFromStringLiteralTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getStringLiteralTypeForText(ts.unescapeIdentifier(node.text));
-            }
-            return links.resolvedType;
-        }
-        function getTypeFromJSDocVariadicType(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                var type = getTypeFromTypeNode(node.type);
-                links.resolvedType = type ? createArrayType(type) : unknownType;
-            }
-            return links.resolvedType;
-        }
-        function getTypeFromJSDocTupleType(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                var types = ts.map(node.types, getTypeFromTypeNode);
-                links.resolvedType = createTupleType(types);
-            }
-            return links.resolvedType;
-        }
-        function getThisType(node) {
-            var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-            var parent = container && container.parent;
-            if (parent && (ts.isClassLike(parent) || parent.kind === 222 /* InterfaceDeclaration */)) {
-                if (!(container.flags & 32 /* Static */) &&
-                    (container.kind !== 148 /* Constructor */ || ts.isNodeDescendentOf(node, container.body))) {
-                    return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
-                }
-            }
-            error(node, ts.Diagnostics.A_this_type_is_available_only_in_a_non_static_member_of_a_class_or_interface);
-            return unknownType;
-        }
-        function getTypeFromThisTypeNode(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                links.resolvedType = getThisType(node);
-            }
-            return links.resolvedType;
-        }
-        function getTypeFromTypeNode(node) {
-            switch (node.kind) {
-                case 117 /* AnyKeyword */:
-                case 258 /* JSDocAllType */:
-                case 259 /* JSDocUnknownType */:
-                    return anyType;
-                case 132 /* StringKeyword */:
-                    return stringType;
-                case 130 /* NumberKeyword */:
-                    return numberType;
-                case 120 /* BooleanKeyword */:
-                    return booleanType;
-                case 133 /* SymbolKeyword */:
-                    return esSymbolType;
-                case 103 /* VoidKeyword */:
-                    return voidType;
-                case 135 /* UndefinedKeyword */:
-                    return undefinedType;
-                case 93 /* NullKeyword */:
-                    return nullType;
-                case 127 /* NeverKeyword */:
-                    return neverType;
-                case 165 /* ThisType */:
-                case 97 /* ThisKeyword */:
-                    return getTypeFromThisTypeNode(node);
-                case 166 /* StringLiteralType */:
-                    return getTypeFromStringLiteralTypeNode(node);
-                case 155 /* TypeReference */:
-                case 267 /* JSDocTypeReference */:
-                    return getTypeFromTypeReference(node);
-                case 154 /* TypePredicate */:
-                    return booleanType;
-                case 194 /* ExpressionWithTypeArguments */:
-                    return getTypeFromTypeReference(node);
-                case 158 /* TypeQuery */:
-                    return getTypeFromTypeQueryNode(node);
-                case 160 /* ArrayType */:
-                case 260 /* JSDocArrayType */:
-                    return getTypeFromArrayTypeNode(node);
-                case 161 /* TupleType */:
-                    return getTypeFromTupleTypeNode(node);
-                case 162 /* UnionType */:
-                case 261 /* JSDocUnionType */:
-                    return getTypeFromUnionTypeNode(node);
-                case 163 /* IntersectionType */:
-                    return getTypeFromIntersectionTypeNode(node);
-                case 164 /* ParenthesizedType */:
-                case 263 /* JSDocNullableType */:
-                case 264 /* JSDocNonNullableType */:
-                case 271 /* JSDocConstructorType */:
-                case 272 /* JSDocThisType */:
-                case 268 /* JSDocOptionalType */:
-                    return getTypeFromTypeNode(node.type);
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                case 159 /* TypeLiteral */:
-                case 281 /* JSDocTypeLiteral */:
-                case 269 /* JSDocFunctionType */:
-                case 265 /* JSDocRecordType */:
-                    return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                // This function assumes that an identifier or qualified name is a type expression
-                // Callers should first ensure this by calling isTypeNode
-                case 69 /* Identifier */:
-                case 139 /* QualifiedName */:
-                    var symbol = getSymbolAtLocation(node);
-                    return symbol && getDeclaredTypeOfSymbol(symbol);
-                case 262 /* JSDocTupleType */:
-                    return getTypeFromJSDocTupleType(node);
-                case 270 /* JSDocVariadicType */:
-                    return getTypeFromJSDocVariadicType(node);
-                default:
-                    return unknownType;
-            }
-        }
-        function instantiateList(items, mapper, instantiator) {
-            if (items && items.length) {
-                var result = [];
-                for (var _i = 0, items_1 = items; _i < items_1.length; _i++) {
-                    var v = items_1[_i];
-                    result.push(instantiator(v, mapper));
-                }
-                return result;
-            }
-            return items;
-        }
-        function createUnaryTypeMapper(source, target) {
-            return function (t) { return t === source ? target : t; };
-        }
-        function createBinaryTypeMapper(source1, target1, source2, target2) {
-            return function (t) { return t === source1 ? target1 : t === source2 ? target2 : t; };
-        }
-        function createArrayTypeMapper(sources, targets) {
-            return function (t) {
-                for (var i = 0; i < sources.length; i++) {
-                    if (t === sources[i]) {
-                        return targets ? targets[i] : anyType;
-                    }
-                }
-                return t;
-            };
-        }
-        function createTypeMapper(sources, targets) {
-            var count = sources.length;
-            var mapper = count == 1 ? createUnaryTypeMapper(sources[0], targets ? targets[0] : anyType) :
-                count == 2 ? createBinaryTypeMapper(sources[0], targets ? targets[0] : anyType, sources[1], targets ? targets[1] : anyType) :
-                    createArrayTypeMapper(sources, targets);
-            mapper.mappedTypes = sources;
-            return mapper;
-        }
-        function createTypeEraser(sources) {
-            return createTypeMapper(sources, undefined);
-        }
-        function getInferenceMapper(context) {
-            if (!context.mapper) {
-                var mapper = function (t) {
-                    var typeParameters = context.typeParameters;
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (t === typeParameters[i]) {
-                            context.inferences[i].isFixed = true;
-                            return getInferredType(context, i);
-                        }
-                    }
-                    return t;
-                };
-                mapper.mappedTypes = context.typeParameters;
-                mapper.context = context;
-                context.mapper = mapper;
-            }
-            return context.mapper;
-        }
-        function identityMapper(type) {
-            return type;
-        }
-        function combineTypeMappers(mapper1, mapper2) {
-            var mapper = function (t) { return instantiateType(mapper1(t), mapper2); };
-            mapper.mappedTypes = mapper1.mappedTypes;
-            return mapper;
-        }
-        function cloneTypeParameter(typeParameter) {
-            var result = createType(512 /* TypeParameter */);
-            result.symbol = typeParameter.symbol;
-            result.target = typeParameter;
-            return result;
-        }
-        function cloneTypePredicate(predicate, mapper) {
-            if (ts.isIdentifierTypePredicate(predicate)) {
-                return {
-                    kind: 1 /* Identifier */,
-                    parameterName: predicate.parameterName,
-                    parameterIndex: predicate.parameterIndex,
-                    type: instantiateType(predicate.type, mapper)
-                };
-            }
-            else {
-                return {
-                    kind: 0 /* This */,
-                    type: instantiateType(predicate.type, mapper)
-                };
-            }
-        }
-        function instantiateSignature(signature, mapper, eraseTypeParameters) {
-            var freshTypeParameters;
-            var freshTypePredicate;
-            if (signature.typeParameters && !eraseTypeParameters) {
-                // First create a fresh set of type parameters, then include a mapping from the old to the
-                // new type parameters in the mapper function. Finally store this mapper in the new type
-                // parameters such that we can use it when instantiating constraints.
-                freshTypeParameters = ts.map(signature.typeParameters, cloneTypeParameter);
-                mapper = combineTypeMappers(createTypeMapper(signature.typeParameters, freshTypeParameters), mapper);
-                for (var _i = 0, freshTypeParameters_1 = freshTypeParameters; _i < freshTypeParameters_1.length; _i++) {
-                    var tp = freshTypeParameters_1[_i];
-                    tp.mapper = mapper;
-                }
-            }
-            if (signature.typePredicate) {
-                freshTypePredicate = cloneTypePredicate(signature.typePredicate, mapper);
-            }
-            var result = createSignature(signature.declaration, freshTypeParameters, signature.thisParameter && instantiateSymbol(signature.thisParameter, mapper), instantiateList(signature.parameters, mapper, instantiateSymbol), instantiateType(signature.resolvedReturnType, mapper), freshTypePredicate, signature.minArgumentCount, signature.hasRestParameter, signature.hasStringLiterals);
-            result.target = signature;
-            result.mapper = mapper;
-            return result;
-        }
-        function instantiateSymbol(symbol, mapper) {
-            if (symbol.flags & 16777216 /* Instantiated */) {
-                var links = getSymbolLinks(symbol);
-                // If symbol being instantiated is itself a instantiation, fetch the original target and combine the
-                // type mappers. This ensures that original type identities are properly preserved and that aliases
-                // always reference a non-aliases.
-                symbol = links.target;
-                mapper = combineTypeMappers(links.mapper, mapper);
-            }
-            // Keep the flags from the symbol we're instantiating.  Mark that is instantiated, and
-            // also transient so that we can just store data on it directly.
-            var result = createSymbol(16777216 /* Instantiated */ | 67108864 /* Transient */ | symbol.flags, symbol.name);
-            result.declarations = symbol.declarations;
-            result.parent = symbol.parent;
-            result.target = symbol;
-            result.mapper = mapper;
-            if (symbol.valueDeclaration) {
-                result.valueDeclaration = symbol.valueDeclaration;
-            }
-            return result;
-        }
-        function instantiateAnonymousType(type, mapper) {
-            if (mapper.instantiations) {
-                var cachedType = mapper.instantiations[type.id];
-                if (cachedType) {
-                    return cachedType;
-                }
-            }
-            else {
-                mapper.instantiations = [];
-            }
-            // Mark the anonymous type as instantiated such that our infinite instantiation detection logic can recognize it
-            var result = createObjectType(65536 /* Anonymous */ | 131072 /* Instantiated */, type.symbol);
-            result.target = type;
-            result.mapper = mapper;
-            mapper.instantiations[type.id] = result;
-            return result;
-        }
-        function isSymbolInScopeOfMappedTypeParameter(symbol, mapper) {
-            var mappedTypes = mapper.mappedTypes;
-            // Starting with the parent of the symbol's declaration, check if the mapper maps any of
-            // the type parameters introduced by enclosing declarations. We just pick the first
-            // declaration since multiple declarations will all have the same parent anyway.
-            var node = symbol.declarations[0].parent;
-            while (node) {
-                switch (node.kind) {
-                    case 156 /* FunctionType */:
-                    case 157 /* ConstructorType */:
-                    case 220 /* FunctionDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 148 /* Constructor */:
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 153 /* IndexSignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                        var declaration = node;
-                        if (declaration.typeParameters) {
-                            for (var _i = 0, _a = declaration.typeParameters; _i < _a.length; _i++) {
-                                var d = _a[_i];
-                                if (ts.contains(mappedTypes, getDeclaredTypeOfTypeParameter(getSymbolOfNode(d)))) {
-                                    return true;
-                                }
-                            }
-                        }
-                        if (ts.isClassLike(node) || node.kind === 222 /* InterfaceDeclaration */) {
-                            var thisType = getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
-                            if (thisType && ts.contains(mappedTypes, thisType)) {
-                                return true;
-                            }
-                        }
-                        break;
-                    case 225 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
-                        return false;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
-        function instantiateType(type, mapper) {
-            if (type && mapper !== identityMapper) {
-                if (type.flags & 512 /* TypeParameter */) {
-                    return mapper(type);
-                }
-                if (type.flags & 65536 /* Anonymous */) {
-                    // If the anonymous type originates in a declaration of a function, method, class, or
-                    // interface, in an object type literal, or in an object literal expression, we may need
-                    // to instantiate the type because it might reference a type parameter. We skip instantiation
-                    // if none of the type parameters that are in scope in the type's declaration are mapped by
-                    // the given mapper, however we can only do that analysis if the type isn't itself an
-                    // instantiation.
-                    return type.symbol &&
-                        type.symbol.flags & (16 /* Function */ | 8192 /* Method */ | 32 /* Class */ | 2048 /* TypeLiteral */ | 4096 /* ObjectLiteral */) &&
-                        (type.flags & 131072 /* Instantiated */ || isSymbolInScopeOfMappedTypeParameter(type.symbol, mapper)) ?
-                        instantiateAnonymousType(type, mapper) : type;
-                }
-                if (type.flags & 4096 /* Reference */) {
-                    return createTypeReference(type.target, instantiateList(type.typeArguments, mapper, instantiateType));
-                }
-                if (type.flags & 8192 /* Tuple */) {
-                    return createTupleType(instantiateList(type.elementTypes, mapper, instantiateType));
-                }
-                if (type.flags & 16384 /* Union */) {
-                    return getUnionType(instantiateList(type.types, mapper, instantiateType), /*noSubtypeReduction*/ true);
-                }
-                if (type.flags & 32768 /* Intersection */) {
-                    return getIntersectionType(instantiateList(type.types, mapper, instantiateType));
-                }
-            }
-            return type;
-        }
-        function instantiateIndexInfo(info, mapper) {
-            return info && createIndexInfo(instantiateType(info.type, mapper), info.isReadonly, info.declaration);
-        }
-        // Returns true if the given expression contains (at any level of nesting) a function or arrow expression
-        // that is subject to contextual typing.
-        function isContextSensitive(node) {
-            ts.Debug.assert(node.kind !== 147 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
-            switch (node.kind) {
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    return isContextSensitiveFunctionLikeDeclaration(node);
-                case 171 /* ObjectLiteralExpression */:
-                    return ts.forEach(node.properties, isContextSensitive);
-                case 170 /* ArrayLiteralExpression */:
-                    return ts.forEach(node.elements, isContextSensitive);
-                case 188 /* ConditionalExpression */:
-                    return isContextSensitive(node.whenTrue) ||
-                        isContextSensitive(node.whenFalse);
-                case 187 /* BinaryExpression */:
-                    return node.operatorToken.kind === 52 /* BarBarToken */ &&
-                        (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 253 /* PropertyAssignment */:
-                    return isContextSensitive(node.initializer);
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                    return isContextSensitiveFunctionLikeDeclaration(node);
-                case 178 /* ParenthesizedExpression */:
-                    return isContextSensitive(node.expression);
-            }
-            return false;
-        }
-        function isContextSensitiveFunctionLikeDeclaration(node) {
-            var areAllParametersUntyped = !ts.forEach(node.parameters, function (p) { return p.type; });
-            var isNullaryArrow = node.kind === 180 /* ArrowFunction */ && !node.parameters.length;
-            return !node.typeParameters && areAllParametersUntyped && !isNullaryArrow;
-        }
-        function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
-            return (isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) && isContextSensitiveFunctionLikeDeclaration(func);
-        }
-        function getTypeWithoutSignatures(type) {
-            if (type.flags & 80896 /* ObjectType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.constructSignatures.length) {
-                    var result = createObjectType(65536 /* Anonymous */, type.symbol);
-                    result.members = resolved.members;
-                    result.properties = resolved.properties;
-                    result.callSignatures = emptyArray;
-                    result.constructSignatures = emptyArray;
-                    type = result;
-                }
-            }
-            return type;
-        }
-        // TYPE CHECKING
-        function isTypeIdenticalTo(source, target) {
-            return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined);
-        }
-        function compareTypesIdentical(source, target) {
-            return checkTypeRelatedTo(source, target, identityRelation, /*errorNode*/ undefined) ? -1 /* True */ : 0 /* False */;
-        }
-        function compareTypesAssignable(source, target) {
-            return checkTypeRelatedTo(source, target, assignableRelation, /*errorNode*/ undefined) ? -1 /* True */ : 0 /* False */;
-        }
-        function isTypeSubtypeOf(source, target) {
-            return checkTypeSubtypeOf(source, target, /*errorNode*/ undefined);
-        }
-        function isTypeAssignableTo(source, target) {
-            return checkTypeAssignableTo(source, target, /*errorNode*/ undefined);
-        }
-        /**
-         * This is *not* a bi-directional relationship.
-         * If one needs to check both directions for comparability, use a second call to this function or 'checkTypeComparableTo'.
-         */
-        function isTypeComparableTo(source, target) {
-            return checkTypeComparableTo(source, target, /*errorNode*/ undefined);
-        }
-        function areTypesComparable(type1, type2) {
-            return isTypeComparableTo(type1, type2) || isTypeComparableTo(type2, type1);
-        }
-        function checkTypeSubtypeOf(source, target, errorNode, headMessage, containingMessageChain) {
-            return checkTypeRelatedTo(source, target, subtypeRelation, errorNode, headMessage, containingMessageChain);
-        }
-        function checkTypeAssignableTo(source, target, errorNode, headMessage, containingMessageChain) {
-            return checkTypeRelatedTo(source, target, assignableRelation, errorNode, headMessage, containingMessageChain);
-        }
-        /**
-         * This is *not* a bi-directional relationship.
-         * If one needs to check both directions for comparability, use a second call to this function or 'isTypeComparableTo'.
-         */
-        function checkTypeComparableTo(source, target, errorNode, headMessage, containingMessageChain) {
-            return checkTypeRelatedTo(source, target, comparableRelation, errorNode, headMessage, containingMessageChain);
-        }
-        function isSignatureAssignableTo(source, target, ignoreReturnTypes) {
-            return compareSignaturesRelated(source, target, ignoreReturnTypes, /*reportErrors*/ false, /*errorReporter*/ undefined, compareTypesAssignable) !== 0 /* False */;
-        }
-        /**
-         * See signatureRelatedTo, compareSignaturesIdentical
-         */
-        function compareSignaturesRelated(source, target, ignoreReturnTypes, reportErrors, errorReporter, compareTypes) {
-            // TODO (drosen): De-duplicate code between related functions.
-            if (source === target) {
-                return -1 /* True */;
-            }
-            if (!target.hasRestParameter && source.minArgumentCount > target.parameters.length) {
-                return 0 /* False */;
-            }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
-            var result = -1 /* True */;
-            var sourceThisType = getThisTypeOfSignature(source);
-            if (sourceThisType && sourceThisType !== voidType) {
-                var targetThisType = getThisTypeOfSignature(target);
-                if (targetThisType) {
-                    // void sources are assignable to anything.
-                    var related = compareTypes(sourceThisType, targetThisType, /*reportErrors*/ false)
-                        || compareTypes(targetThisType, sourceThisType, reportErrors);
-                    if (!related) {
-                        if (reportErrors) {
-                            errorReporter(ts.Diagnostics.The_this_types_of_each_signature_are_incompatible);
-                        }
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-            }
-            var sourceMax = getNumNonRestParameters(source);
-            var targetMax = getNumNonRestParameters(target);
-            var checkCount = getNumParametersToCheckForSignatureRelatability(source, sourceMax, target, targetMax);
-            var sourceParams = source.parameters;
-            var targetParams = target.parameters;
-            for (var i = 0; i < checkCount; i++) {
-                var s = i < sourceMax ? getTypeOfParameter(sourceParams[i]) : getRestTypeOfSignature(source);
-                var t = i < targetMax ? getTypeOfParameter(targetParams[i]) : getRestTypeOfSignature(target);
-                var related = compareTypes(s, t, /*reportErrors*/ false) || compareTypes(t, s, reportErrors);
-                if (!related) {
-                    if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Types_of_parameters_0_and_1_are_incompatible, sourceParams[i < sourceMax ? i : sourceMax].name, targetParams[i < targetMax ? i : targetMax].name);
-                    }
-                    return 0 /* False */;
-                }
-                result &= related;
-            }
-            if (!ignoreReturnTypes) {
-                var targetReturnType = getReturnTypeOfSignature(target);
-                if (targetReturnType === voidType) {
-                    return result;
-                }
-                var sourceReturnType = getReturnTypeOfSignature(source);
-                // The following block preserves behavior forbidding boolean returning functions from being assignable to type guard returning functions
-                if (target.typePredicate) {
-                    if (source.typePredicate) {
-                        result &= compareTypePredicateRelatedTo(source.typePredicate, target.typePredicate, reportErrors, errorReporter, compareTypes);
-                    }
-                    else if (ts.isIdentifierTypePredicate(target.typePredicate)) {
-                        if (reportErrors) {
-                            errorReporter(ts.Diagnostics.Signature_0_must_have_a_type_predicate, signatureToString(source));
-                        }
-                        return 0 /* False */;
-                    }
-                }
-                else {
-                    result &= compareTypes(sourceReturnType, targetReturnType, reportErrors);
-                }
-            }
-            return result;
-        }
-        function compareTypePredicateRelatedTo(source, target, reportErrors, errorReporter, compareTypes) {
-            if (source.kind !== target.kind) {
-                if (reportErrors) {
-                    errorReporter(ts.Diagnostics.A_this_based_type_guard_is_not_compatible_with_a_parameter_based_type_guard);
-                    errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
-                }
-                return 0 /* False */;
-            }
-            if (source.kind === 1 /* Identifier */) {
-                var sourceIdentifierPredicate = source;
-                var targetIdentifierPredicate = target;
-                if (sourceIdentifierPredicate.parameterIndex !== targetIdentifierPredicate.parameterIndex) {
-                    if (reportErrors) {
-                        errorReporter(ts.Diagnostics.Parameter_0_is_not_in_the_same_position_as_parameter_1, sourceIdentifierPredicate.parameterName, targetIdentifierPredicate.parameterName);
-                        errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
-                    }
-                    return 0 /* False */;
-                }
-            }
-            var related = compareTypes(source.type, target.type, reportErrors);
-            if (related === 0 /* False */ && reportErrors) {
-                errorReporter(ts.Diagnostics.Type_predicate_0_is_not_assignable_to_1, typePredicateToString(source), typePredicateToString(target));
-            }
-            return related;
-        }
-        function isImplementationCompatibleWithOverload(implementation, overload) {
-            var erasedSource = getErasedSignature(implementation);
-            var erasedTarget = getErasedSignature(overload);
-            // First see if the return types are compatible in either direction.
-            var sourceReturnType = getReturnTypeOfSignature(erasedSource);
-            var targetReturnType = getReturnTypeOfSignature(erasedTarget);
-            if (targetReturnType === voidType
-                || checkTypeRelatedTo(targetReturnType, sourceReturnType, assignableRelation, /*errorNode*/ undefined)
-                || checkTypeRelatedTo(sourceReturnType, targetReturnType, assignableRelation, /*errorNode*/ undefined)) {
-                return isSignatureAssignableTo(erasedSource, erasedTarget, /*ignoreReturnTypes*/ true);
-            }
-            return false;
-        }
-        function getNumNonRestParameters(signature) {
-            var numParams = signature.parameters.length;
-            return signature.hasRestParameter ?
-                numParams - 1 :
-                numParams;
-        }
-        function getNumParametersToCheckForSignatureRelatability(source, sourceNonRestParamCount, target, targetNonRestParamCount) {
-            if (source.hasRestParameter === target.hasRestParameter) {
-                if (source.hasRestParameter) {
-                    // If both have rest parameters, get the max and add 1 to
-                    // compensate for the rest parameter.
-                    return Math.max(sourceNonRestParamCount, targetNonRestParamCount) + 1;
-                }
-                else {
-                    return Math.min(sourceNonRestParamCount, targetNonRestParamCount);
-                }
-            }
-            else {
-                // Return the count for whichever signature doesn't have rest parameters.
-                return source.hasRestParameter ?
-                    targetNonRestParamCount :
-                    sourceNonRestParamCount;
-            }
-        }
-        /**
-         * Checks if 'source' is related to 'target' (e.g.: is a assignable to).
-         * @param source The left-hand-side of the relation.
-         * @param target The right-hand-side of the relation.
-         * @param relation The relation considered. One of 'identityRelation', 'subtypeRelation', 'assignableRelation', or 'comparableRelation'.
-         * Used as both to determine which checks are performed and as a cache of previously computed results.
-         * @param errorNode The suggested node upon which all errors will be reported, if defined. This may or may not be the actual node used.
-         * @param headMessage If the error chain should be prepended by a head message, then headMessage will be used.
-         * @param containingMessageChain A chain of errors to prepend any new errors found.
-         */
-        function checkTypeRelatedTo(source, target, relation, errorNode, headMessage, containingMessageChain) {
-            var errorInfo;
-            var sourceStack;
-            var targetStack;
-            var maybeStack;
-            var expandingFlags;
-            var depth = 0;
-            var overflow = false;
-            ts.Debug.assert(relation !== identityRelation || !errorNode, "no error reporting in identity checking");
-            var result = isRelatedTo(source, target, /*reportErrors*/ !!errorNode, headMessage);
-            if (overflow) {
-                error(errorNode, ts.Diagnostics.Excessive_stack_depth_comparing_types_0_and_1, typeToString(source), typeToString(target));
-            }
-            else if (errorInfo) {
-                if (containingMessageChain) {
-                    errorInfo = ts.concatenateDiagnosticMessageChains(containingMessageChain, errorInfo);
-                }
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(errorNode, errorInfo));
-            }
-            return result !== 0 /* False */;
-            function reportError(message, arg0, arg1, arg2) {
-                ts.Debug.assert(!!errorNode);
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2);
-            }
-            function reportRelationError(message, source, target) {
-                var sourceType = typeToString(source);
-                var targetType = typeToString(target);
-                if (sourceType === targetType) {
-                    sourceType = typeToString(source, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
-                    targetType = typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */);
-                }
-                if (!message) {
-                    message = relation === comparableRelation ?
-                        ts.Diagnostics.Type_0_is_not_comparable_to_type_1 :
-                        ts.Diagnostics.Type_0_is_not_assignable_to_type_1;
-                }
-                reportError(message, sourceType, targetType);
-            }
-            // Compare two types and return
-            // Ternary.True if they are related with no assumptions,
-            // Ternary.Maybe if they are related with assumptions of other relationships, or
-            // Ternary.False if they are not related.
-            function isRelatedTo(source, target, reportErrors, headMessage) {
-                var result;
-                // both types are the same - covers 'they are the same primitive type or both are Any' or the same type parameter cases
-                if (source === target)
-                    return -1 /* True */;
-                if (relation === identityRelation) {
-                    return isIdenticalTo(source, target);
-                }
-                if (!(target.flags & 134217728 /* Never */)) {
-                    if (target.flags & 1 /* Any */ || source.flags & 134217728 /* Never */)
-                        return -1 /* True */;
-                    if (source.flags & 32 /* Undefined */) {
-                        if (!strictNullChecks || target.flags & (32 /* Undefined */ | 16 /* Void */))
-                            return -1 /* True */;
-                    }
-                    if (source.flags & 64 /* Null */) {
-                        if (!strictNullChecks || target.flags & 64 /* Null */)
-                            return -1 /* True */;
-                    }
-                    if (source.flags & 128 /* Enum */ && target === numberType)
-                        return -1 /* True */;
-                    if (source.flags & 128 /* Enum */ && target.flags & 128 /* Enum */) {
-                        if (result = enumRelatedTo(source, target, reportErrors)) {
-                            return result;
-                        }
-                    }
-                    if (source.flags & 256 /* StringLiteral */ && target === stringType)
-                        return -1 /* True */;
-                    if (relation === assignableRelation || relation === comparableRelation) {
-                        if (source.flags & 1 /* Any */)
-                            return -1 /* True */;
-                        if (source === numberType && target.flags & 128 /* Enum */)
-                            return -1 /* True */;
-                    }
-                    if (source.flags & 8 /* Boolean */ && target.flags & 8 /* Boolean */) {
-                        return -1 /* True */;
-                    }
-                }
-                if (source.flags & 1048576 /* FreshObjectLiteral */) {
-                    if (hasExcessProperties(source, target, reportErrors)) {
-                        if (reportErrors) {
-                            reportRelationError(headMessage, source, target);
-                        }
-                        return 0 /* False */;
-                    }
-                    // Above we check for excess properties with respect to the entire target type. When union
-                    // and intersection types are further deconstructed on the target side, we don't want to
-                    // make the check again (as it might fail for a partial target type). Therefore we obtain
-                    // the regular source type and proceed with that.
-                    if (target.flags & 49152 /* UnionOrIntersection */) {
-                        source = getRegularTypeOfObjectLiteral(source);
-                    }
-                }
-                var saveErrorInfo = errorInfo;
-                // Note that these checks are specifically ordered to produce correct results.
-                if (source.flags & 16384 /* Union */) {
-                    if (relation === comparableRelation) {
-                        result = someTypeRelatedToType(source, target, reportErrors);
-                    }
-                    else {
-                        result = eachTypeRelatedToType(source, target, reportErrors);
-                    }
-                    if (result) {
-                        return result;
-                    }
-                }
-                else if (target.flags & 32768 /* Intersection */) {
-                    result = typeRelatedToEachType(source, target, reportErrors);
-                    if (result) {
-                        return result;
-                    }
-                }
-                else {
-                    // It is necessary to try these "some" checks on both sides because there may be nested "each" checks
-                    // on either side that need to be prioritized. For example, A | B = (A | B) & (C | D) or
-                    // A & B = (A & B) | (C & D).
-                    if (source.flags & 32768 /* Intersection */) {
-                        // Check to see if any constituents of the intersection are immediately related to the target.
-                        //
-                        // Don't report errors though. Checking whether a constituent is related to the source is not actually
-                        // useful and leads to some confusing error messages. Instead it is better to let the below checks
-                        // take care of this, or to not elaborate at all. For instance,
-                        //
-                        //    - For an object type (such as 'C = A & B'), users are usually more interested in structural errors.
-                        //
-                        //    - For a union type (such as '(A | B) = (C & D)'), it's better to hold onto the whole intersection
-                        //          than to report that 'D' is not assignable to 'A' or 'B'.
-                        //
-                        //    - For a primitive type or type parameter (such as 'number = A & B') there is no point in
-                        //          breaking the intersection apart.
-                        if (result = someTypeRelatedToType(source, target, /*reportErrors*/ false)) {
-                            return result;
-                        }
-                    }
-                    if (target.flags & 16384 /* Union */) {
-                        if (result = typeRelatedToSomeType(source, target, reportErrors && !(source.flags & 16777726 /* Primitive */))) {
-                            return result;
-                        }
-                    }
-                }
-                if (source.flags & 512 /* TypeParameter */) {
-                    var constraint = getConstraintOfTypeParameter(source);
-                    if (!constraint || constraint.flags & 1 /* Any */) {
-                        constraint = emptyObjectType;
-                    }
-                    // The constraint may need to be further instantiated with its 'this' type.
-                    constraint = getTypeWithThisArgument(constraint, source);
-                    // Report constraint errors only if the constraint is not the empty object type
-                    var reportConstraintErrors = reportErrors && constraint !== emptyObjectType;
-                    if (result = isRelatedTo(constraint, target, reportConstraintErrors)) {
-                        errorInfo = saveErrorInfo;
-                        return result;
-                    }
-                }
-                else {
-                    if (source.flags & 4096 /* Reference */ && target.flags & 4096 /* Reference */ && source.target === target.target) {
-                        // We have type references to same target type, see if relationship holds for all type arguments
-                        if (result = typeArgumentsRelatedTo(source, target, reportErrors)) {
-                            return result;
-                        }
-                    }
-                    // Even if relationship doesn't hold for unions, intersections, or generic type references,
-                    // it may hold in a structural comparison.
-                    var apparentSource = getApparentType(source);
-                    // In a check of the form X = A & B, we will have previously checked if A relates to X or B relates
-                    // to X. Failing both of those we want to check if the aggregation of A and B's members structurally
-                    // relates to X. Thus, we include intersection types on the source side here.
-                    if (apparentSource.flags & (80896 /* ObjectType */ | 32768 /* Intersection */) && target.flags & 80896 /* ObjectType */) {
-                        // Report structural errors only if we haven't reported any errors yet
-                        var reportStructuralErrors = reportErrors && errorInfo === saveErrorInfo && !(source.flags & 16777726 /* Primitive */);
-                        if (result = objectTypeRelatedTo(apparentSource, source, target, reportStructuralErrors)) {
-                            errorInfo = saveErrorInfo;
-                            return result;
-                        }
-                    }
-                }
-                if (reportErrors) {
-                    reportRelationError(headMessage, source, target);
-                }
-                return 0 /* False */;
-            }
-            function isIdenticalTo(source, target) {
-                var result;
-                if (source.flags & 80896 /* ObjectType */ && target.flags & 80896 /* ObjectType */) {
-                    if (source.flags & 4096 /* Reference */ && target.flags & 4096 /* Reference */ && source.target === target.target) {
-                        // We have type references to same target type, see if all type arguments are identical
-                        if (result = typeArgumentsRelatedTo(source, target, /*reportErrors*/ false)) {
-                            return result;
-                        }
-                    }
-                    return objectTypeRelatedTo(source, source, target, /*reportErrors*/ false);
-                }
-                if (source.flags & 16384 /* Union */ && target.flags & 16384 /* Union */ ||
-                    source.flags & 32768 /* Intersection */ && target.flags & 32768 /* Intersection */) {
-                    if (result = eachTypeRelatedToSomeType(source, target, /*reportErrors*/ false)) {
-                        if (result &= eachTypeRelatedToSomeType(target, source, /*reportErrors*/ false)) {
-                            return result;
-                        }
-                    }
-                }
-                return 0 /* False */;
-            }
-            // Check if a property with the given name is known anywhere in the given type. In an object type, a property
-            // is considered known if the object type is empty and the check is for assignability, if the object type has
-            // index signatures, or if the property is actually declared in the object type. In a union or intersection
-            // type, a property is considered known if it is known in any constituent type.
-            function isKnownProperty(type, name) {
-                if (type.flags & 80896 /* ObjectType */) {
-                    var resolved = resolveStructuredTypeMembers(type);
-                    if ((relation === assignableRelation || relation === comparableRelation) && (type === globalObjectType || isEmptyObjectType(resolved)) ||
-                        resolved.stringIndexInfo ||
-                        (resolved.numberIndexInfo && isNumericLiteralName(name)) ||
-                        getPropertyOfType(type, name)) {
-                        return true;
-                    }
-                }
-                else if (type.flags & 49152 /* UnionOrIntersection */) {
-                    for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                        var t = _a[_i];
-                        if (isKnownProperty(t, name)) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-            function isEmptyObjectType(t) {
-                return t.properties.length === 0 &&
-                    t.callSignatures.length === 0 &&
-                    t.constructSignatures.length === 0 &&
-                    !t.stringIndexInfo &&
-                    !t.numberIndexInfo;
-            }
-            function hasExcessProperties(source, target, reportErrors) {
-                if (!(target.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */) && maybeTypeOfKind(target, 80896 /* ObjectType */)) {
-                    for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                        var prop = _a[_i];
-                        if (!isKnownProperty(target, prop.name)) {
-                            if (reportErrors) {
-                                // We know *exactly* where things went wrong when comparing the types.
-                                // Use this property as the error node as this will be more helpful in
-                                // reasoning about what went wrong.
-                                ts.Debug.assert(!!errorNode);
-                                errorNode = prop.valueDeclaration;
-                                reportError(ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(prop), typeToString(target));
-                            }
-                            return true;
-                        }
-                    }
-                }
-                return false;
-            }
-            function eachTypeRelatedToSomeType(source, target, reportErrors) {
-                var result = -1 /* True */;
-                var sourceTypes = source.types;
-                for (var _i = 0, sourceTypes_1 = sourceTypes; _i < sourceTypes_1.length; _i++) {
-                    var sourceType = sourceTypes_1[_i];
-                    var related = typeRelatedToSomeType(sourceType, target, /*reportErrors*/ false);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            function typeRelatedToSomeType(source, target, reportErrors) {
-                var targetTypes = target.types;
-                var len = targetTypes.length;
-                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
-                // to produce the best possible errors we first check the nullable types, such that the last type we
-                // check and report errors from is a non-nullable type if one is present.
-                while (len >= 2 && targetTypes[len - 1].flags & 96 /* Nullable */) {
-                    var related = isRelatedTo(source, targetTypes[len - 1], /*reportErrors*/ false);
-                    if (related) {
-                        return related;
-                    }
-                    len--;
-                }
-                // Now check the non-nullable types and report errors on the last one.
-                for (var i = 0; i < len; i++) {
-                    var related = isRelatedTo(source, targetTypes[i], reportErrors && i === len - 1);
-                    if (related) {
-                        return related;
-                    }
-                }
-                return 0 /* False */;
-            }
-            function typeRelatedToEachType(source, target, reportErrors) {
-                var result = -1 /* True */;
-                var targetTypes = target.types;
-                for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
-                    var targetType = targetTypes_1[_i];
-                    var related = isRelatedTo(source, targetType, reportErrors);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            function someTypeRelatedToType(source, target, reportErrors) {
-                var sourceTypes = source.types;
-                var len = sourceTypes.length;
-                // The null and undefined types are guaranteed to be at the end of the constituent type list. In order
-                // to produce the best possible errors we first check the nullable types, such that the last type we
-                // check and report errors from is a non-nullable type if one is present.
-                while (len >= 2 && sourceTypes[len - 1].flags & 96 /* Nullable */) {
-                    var related = isRelatedTo(sourceTypes[len - 1], target, /*reportErrors*/ false);
-                    if (related) {
-                        return related;
-                    }
-                    len--;
-                }
-                // Now check the non-nullable types and report errors on the last one.
-                for (var i = 0; i < len; i++) {
-                    var related = isRelatedTo(sourceTypes[i], target, reportErrors && i === len - 1);
-                    if (related) {
-                        return related;
-                    }
-                }
-                return 0 /* False */;
-            }
-            function eachTypeRelatedToType(source, target, reportErrors) {
-                var result = -1 /* True */;
-                var sourceTypes = source.types;
-                for (var _i = 0, sourceTypes_2 = sourceTypes; _i < sourceTypes_2.length; _i++) {
-                    var sourceType = sourceTypes_2[_i];
-                    var related = isRelatedTo(sourceType, target, reportErrors);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            function typeArgumentsRelatedTo(source, target, reportErrors) {
-                var sources = source.typeArguments || emptyArray;
-                var targets = target.typeArguments || emptyArray;
-                if (sources.length !== targets.length && relation === identityRelation) {
-                    return 0 /* False */;
-                }
-                var length = sources.length <= targets.length ? sources.length : targets.length;
-                var result = -1 /* True */;
-                for (var i = 0; i < length; i++) {
-                    var related = isRelatedTo(sources[i], targets[i], reportErrors);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            // Determine if two object types are related by structure. First, check if the result is already available in the global cache.
-            // Second, check if we have already started a comparison of the given two types in which case we assume the result to be true.
-            // Third, check if both types are part of deeply nested chains of generic type instantiations and if so assume the types are
-            // equal and infinitely expanding. Fourth, if we have reached a depth of 100 nested comparisons, assume we have runaway recursion
-            // and issue an error. Otherwise, actually compare the structure of the two types.
-            function objectTypeRelatedTo(source, originalSource, target, reportErrors) {
-                if (overflow) {
-                    return 0 /* False */;
-                }
-                var id = relation !== identityRelation || source.id < target.id ? source.id + "," + target.id : target.id + "," + source.id;
-                var related = relation[id];
-                if (related !== undefined) {
-                    if (reportErrors && related === 2 /* Failed */) {
-                        // We are elaborating errors and the cached result is an unreported failure. Record the result as a reported
-                        // failure and continue computing the relation such that errors get reported.
-                        relation[id] = 3 /* FailedAndReported */;
-                    }
-                    else {
-                        return related === 1 /* Succeeded */ ? -1 /* True */ : 0 /* False */;
-                    }
-                }
-                if (depth > 0) {
-                    for (var i = 0; i < depth; i++) {
-                        // If source and target are already being compared, consider them related with assumptions
-                        if (maybeStack[i][id]) {
-                            return 1 /* Maybe */;
-                        }
-                    }
-                    if (depth === 100) {
-                        overflow = true;
-                        return 0 /* False */;
-                    }
-                }
-                else {
-                    sourceStack = [];
-                    targetStack = [];
-                    maybeStack = [];
-                    expandingFlags = 0;
-                }
-                sourceStack[depth] = source;
-                targetStack[depth] = target;
-                maybeStack[depth] = {};
-                maybeStack[depth][id] = 1 /* Succeeded */;
-                depth++;
-                var saveExpandingFlags = expandingFlags;
-                if (!(expandingFlags & 1) && isDeeplyNestedGeneric(source, sourceStack, depth))
-                    expandingFlags |= 1;
-                if (!(expandingFlags & 2) && isDeeplyNestedGeneric(target, targetStack, depth))
-                    expandingFlags |= 2;
-                var result;
-                if (expandingFlags === 3) {
-                    result = 1 /* Maybe */;
-                }
-                else {
-                    result = propertiesRelatedTo(source, target, reportErrors);
-                    if (result) {
-                        result &= signaturesRelatedTo(source, target, 0 /* Call */, reportErrors);
-                        if (result) {
-                            result &= signaturesRelatedTo(source, target, 1 /* Construct */, reportErrors);
-                            if (result) {
-                                result &= indexTypesRelatedTo(source, originalSource, target, 0 /* String */, reportErrors);
-                                if (result) {
-                                    result &= indexTypesRelatedTo(source, originalSource, target, 1 /* Number */, reportErrors);
-                                }
-                            }
-                        }
-                    }
-                }
-                expandingFlags = saveExpandingFlags;
-                depth--;
-                if (result) {
-                    var maybeCache = maybeStack[depth];
-                    // If result is definitely true, copy assumptions to global cache, else copy to next level up
-                    var destinationCache = (result === -1 /* True */ || depth === 0) ? relation : maybeStack[depth - 1];
-                    ts.copyMap(maybeCache, destinationCache);
-                }
-                else {
-                    // A false result goes straight into global cache (when something is false under assumptions it
-                    // will also be false without assumptions)
-                    relation[id] = reportErrors ? 3 /* FailedAndReported */ : 2 /* Failed */;
-                }
-                return result;
-            }
-            function propertiesRelatedTo(source, target, reportErrors) {
-                if (relation === identityRelation) {
-                    return propertiesIdenticalTo(source, target);
-                }
-                var result = -1 /* True */;
-                var properties = getPropertiesOfObjectType(target);
-                var requireOptionalProperties = relation === subtypeRelation && !(source.flags & 524288 /* ObjectLiteral */);
-                for (var _i = 0, properties_1 = properties; _i < properties_1.length; _i++) {
-                    var targetProp = properties_1[_i];
-                    var sourceProp = getPropertyOfType(source, targetProp.name);
-                    if (sourceProp !== targetProp) {
-                        if (!sourceProp) {
-                            if (!(targetProp.flags & 536870912 /* Optional */) || requireOptionalProperties) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, symbolToString(targetProp), typeToString(source));
-                                }
-                                return 0 /* False */;
-                            }
-                        }
-                        else if (!(targetProp.flags & 134217728 /* Prototype */)) {
-                            var sourcePropFlags = getDeclarationFlagsFromSymbol(sourceProp);
-                            var targetPropFlags = getDeclarationFlagsFromSymbol(targetProp);
-                            if (sourcePropFlags & 8 /* Private */ || targetPropFlags & 8 /* Private */) {
-                                if (sourceProp.valueDeclaration !== targetProp.valueDeclaration) {
-                                    if (reportErrors) {
-                                        if (sourcePropFlags & 8 /* Private */ && targetPropFlags & 8 /* Private */) {
-                                            reportError(ts.Diagnostics.Types_have_separate_declarations_of_a_private_property_0, symbolToString(targetProp));
-                                        }
-                                        else {
-                                            reportError(ts.Diagnostics.Property_0_is_private_in_type_1_but_not_in_type_2, symbolToString(targetProp), typeToString(sourcePropFlags & 8 /* Private */ ? source : target), typeToString(sourcePropFlags & 8 /* Private */ ? target : source));
-                                        }
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (targetPropFlags & 16 /* Protected */) {
-                                var sourceDeclaredInClass = sourceProp.parent && sourceProp.parent.flags & 32 /* Class */;
-                                var sourceClass = sourceDeclaredInClass ? getDeclaredTypeOfSymbol(getParentOfSymbol(sourceProp)) : undefined;
-                                var targetClass = getDeclaredTypeOfSymbol(getParentOfSymbol(targetProp));
-                                if (!sourceClass || !hasBaseType(sourceClass, targetClass)) {
-                                    if (reportErrors) {
-                                        reportError(ts.Diagnostics.Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2, symbolToString(targetProp), typeToString(sourceClass || source), typeToString(targetClass));
-                                    }
-                                    return 0 /* False */;
-                                }
-                            }
-                            else if (sourcePropFlags & 16 /* Protected */) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_protected_in_type_1_but_public_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                            var related = isRelatedTo(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp), reportErrors);
-                            if (!related) {
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Types_of_property_0_are_incompatible, symbolToString(targetProp));
-                                }
-                                return 0 /* False */;
-                            }
-                            result &= related;
-                            if (sourceProp.flags & 536870912 /* Optional */ && !(targetProp.flags & 536870912 /* Optional */)) {
-                                // TypeScript 1.0 spec (April 2014): 3.8.3
-                                // S is a subtype of a type T, and T is a supertype of S if ...
-                                // S' and T are object types and, for each member M in T..
-                                // M is a property and S' contains a property N where
-                                // if M is a required property, N is also a required property
-                                // (M - property in T)
-                                // (N - property in S)
-                                if (reportErrors) {
-                                    reportError(ts.Diagnostics.Property_0_is_optional_in_type_1_but_required_in_type_2, symbolToString(targetProp), typeToString(source), typeToString(target));
-                                }
-                                return 0 /* False */;
-                            }
-                        }
-                    }
-                }
-                return result;
-            }
-            function propertiesIdenticalTo(source, target) {
-                if (!(source.flags & 80896 /* ObjectType */ && target.flags & 80896 /* ObjectType */)) {
-                    return 0 /* False */;
-                }
-                var sourceProperties = getPropertiesOfObjectType(source);
-                var targetProperties = getPropertiesOfObjectType(target);
-                if (sourceProperties.length !== targetProperties.length) {
-                    return 0 /* False */;
-                }
-                var result = -1 /* True */;
-                for (var _i = 0, sourceProperties_1 = sourceProperties; _i < sourceProperties_1.length; _i++) {
-                    var sourceProp = sourceProperties_1[_i];
-                    var targetProp = getPropertyOfObjectType(target, sourceProp.name);
-                    if (!targetProp) {
-                        return 0 /* False */;
-                    }
-                    var related = compareProperties(sourceProp, targetProp, isRelatedTo);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            function signaturesRelatedTo(source, target, kind, reportErrors) {
-                if (relation === identityRelation) {
-                    return signaturesIdenticalTo(source, target, kind);
-                }
-                if (target === anyFunctionType || source === anyFunctionType) {
-                    return -1 /* True */;
-                }
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
-                if (kind === 1 /* Construct */ && sourceSignatures.length && targetSignatures.length) {
-                    if (isAbstractConstructorType(source) && !isAbstractConstructorType(target)) {
-                        // An abstract constructor type is not assignable to a non-abstract constructor type
-                        // as it would otherwise be possible to new an abstract class. Note that the assignability
-                        // check we perform for an extends clause excludes construct signatures from the target,
-                        // so this check never proceeds.
-                        if (reportErrors) {
-                            reportError(ts.Diagnostics.Cannot_assign_an_abstract_constructor_type_to_a_non_abstract_constructor_type);
-                        }
-                        return 0 /* False */;
-                    }
-                    if (!constructorVisibilitiesAreCompatible(sourceSignatures[0], targetSignatures[0], reportErrors)) {
-                        return 0 /* False */;
-                    }
-                }
-                var result = -1 /* True */;
-                var saveErrorInfo = errorInfo;
-                outer: for (var _i = 0, targetSignatures_1 = targetSignatures; _i < targetSignatures_1.length; _i++) {
-                    var t = targetSignatures_1[_i];
-                    // Only elaborate errors from the first failure
-                    var shouldElaborateErrors = reportErrors;
-                    for (var _a = 0, sourceSignatures_1 = sourceSignatures; _a < sourceSignatures_1.length; _a++) {
-                        var s = sourceSignatures_1[_a];
-                        var related = signatureRelatedTo(s, t, shouldElaborateErrors);
-                        if (related) {
-                            result &= related;
-                            errorInfo = saveErrorInfo;
-                            continue outer;
-                        }
-                        shouldElaborateErrors = false;
-                    }
-                    if (shouldElaborateErrors) {
-                        reportError(ts.Diagnostics.Type_0_provides_no_match_for_the_signature_1, typeToString(source), signatureToString(t, /*enclosingDeclaration*/ undefined, /*flags*/ undefined, kind));
-                    }
-                    return 0 /* False */;
-                }
-                return result;
-            }
-            /**
-             * See signatureAssignableTo, compareSignaturesIdentical
-             */
-            function signatureRelatedTo(source, target, reportErrors) {
-                return compareSignaturesRelated(source, target, /*ignoreReturnTypes*/ false, reportErrors, reportError, isRelatedTo);
-            }
-            function signaturesIdenticalTo(source, target, kind) {
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
-                if (sourceSignatures.length !== targetSignatures.length) {
-                    return 0 /* False */;
-                }
-                var result = -1 /* True */;
-                for (var i = 0, len = sourceSignatures.length; i < len; i++) {
-                    var related = compareSignaturesIdentical(sourceSignatures[i], targetSignatures[i], /*partialMatch*/ false, /*ignoreThisTypes*/ false, /*ignoreReturnTypes*/ false, isRelatedTo);
-                    if (!related) {
-                        return 0 /* False */;
-                    }
-                    result &= related;
-                }
-                return result;
-            }
-            function eachPropertyRelatedTo(source, target, kind, reportErrors) {
-                var result = -1 /* True */;
-                for (var _i = 0, _a = getPropertiesOfObjectType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
-                    if (kind === 0 /* String */ || isNumericLiteralName(prop.name)) {
-                        var related = isRelatedTo(getTypeOfSymbol(prop), target, reportErrors);
-                        if (!related) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.Property_0_is_incompatible_with_index_signature, symbolToString(prop));
-                            }
-                            return 0 /* False */;
-                        }
-                        result &= related;
-                    }
-                }
-                return result;
-            }
-            function indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors) {
-                var related = isRelatedTo(sourceInfo.type, targetInfo.type, reportErrors);
-                if (!related && reportErrors) {
-                    reportError(ts.Diagnostics.Index_signatures_are_incompatible);
-                }
-                return related;
-            }
-            function indexTypesRelatedTo(source, originalSource, target, kind, reportErrors) {
-                if (relation === identityRelation) {
-                    return indexTypesIdenticalTo(source, target, kind);
-                }
-                var targetInfo = getIndexInfoOfType(target, kind);
-                if (!targetInfo || ((targetInfo.type.flags & 1 /* Any */) && !(originalSource.flags & 16777726 /* Primitive */))) {
-                    // Index signature of type any permits assignment from everything but primitives
-                    return -1 /* True */;
-                }
-                var sourceInfo = getIndexInfoOfType(source, kind) ||
-                    kind === 1 /* Number */ && getIndexInfoOfType(source, 0 /* String */);
-                if (sourceInfo) {
-                    return indexInfoRelatedTo(sourceInfo, targetInfo, reportErrors);
-                }
-                if (isObjectLiteralType(source)) {
-                    var related = -1 /* True */;
-                    if (kind === 0 /* String */) {
-                        var sourceNumberInfo = getIndexInfoOfType(source, 1 /* Number */);
-                        if (sourceNumberInfo) {
-                            related = indexInfoRelatedTo(sourceNumberInfo, targetInfo, reportErrors);
-                        }
-                    }
-                    if (related) {
-                        related &= eachPropertyRelatedTo(source, targetInfo.type, kind, reportErrors);
-                    }
-                    return related;
-                }
-                if (reportErrors) {
-                    reportError(ts.Diagnostics.Index_signature_is_missing_in_type_0, typeToString(source));
-                }
-                return 0 /* False */;
-            }
-            function indexTypesIdenticalTo(source, target, indexKind) {
-                var targetInfo = getIndexInfoOfType(target, indexKind);
-                var sourceInfo = getIndexInfoOfType(source, indexKind);
-                if (!sourceInfo && !targetInfo) {
-                    return -1 /* True */;
-                }
-                if (sourceInfo && targetInfo && sourceInfo.isReadonly === targetInfo.isReadonly) {
-                    return isRelatedTo(sourceInfo.type, targetInfo.type);
-                }
-                return 0 /* False */;
-            }
-            function enumRelatedTo(source, target, reportErrors) {
-                if (source.symbol.name !== target.symbol.name ||
-                    source.symbol.flags & 128 /* ConstEnum */ ||
-                    target.symbol.flags & 128 /* ConstEnum */) {
-                    return 0 /* False */;
-                }
-                var targetEnumType = getTypeOfSymbol(target.symbol);
-                for (var _i = 0, _a = getPropertiesOfType(getTypeOfSymbol(source.symbol)); _i < _a.length; _i++) {
-                    var property = _a[_i];
-                    if (property.flags & 8 /* EnumMember */) {
-                        var targetProperty = getPropertyOfType(targetEnumType, property.name);
-                        if (!targetProperty || !(targetProperty.flags & 8 /* EnumMember */)) {
-                            if (reportErrors) {
-                                reportError(ts.Diagnostics.Property_0_is_missing_in_type_1, property.name, typeToString(target, /*enclosingDeclaration*/ undefined, 128 /* UseFullyQualifiedType */));
-                            }
-                            return 0 /* False */;
-                        }
-                    }
-                }
-                return -1 /* True */;
-            }
-            function constructorVisibilitiesAreCompatible(sourceSignature, targetSignature, reportErrors) {
-                if (!sourceSignature.declaration || !targetSignature.declaration) {
-                    return true;
-                }
-                var sourceAccessibility = sourceSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
-                var targetAccessibility = targetSignature.declaration.flags & (8 /* Private */ | 16 /* Protected */);
-                // A public, protected and private signature is assignable to a private signature.
-                if (targetAccessibility === 8 /* Private */) {
-                    return true;
-                }
-                // A public and protected signature is assignable to a protected signature.
-                if (targetAccessibility === 16 /* Protected */ && sourceAccessibility !== 8 /* Private */) {
-                    return true;
-                }
-                // Only a public signature is assignable to public signature.
-                if (targetAccessibility !== 16 /* Protected */ && !sourceAccessibility) {
-                    return true;
-                }
-                if (reportErrors) {
-                    reportError(ts.Diagnostics.Cannot_assign_a_0_constructor_type_to_a_1_constructor_type, visibilityToString(sourceAccessibility), visibilityToString(targetAccessibility));
-                }
-                return false;
-            }
-        }
-        // Return true if the given type is the constructor type for an abstract class
-        function isAbstractConstructorType(type) {
-            if (type.flags & 65536 /* Anonymous */) {
-                var symbol = type.symbol;
-                if (symbol && symbol.flags & 32 /* Class */) {
-                    var declaration = getClassLikeDeclarationOfSymbol(symbol);
-                    if (declaration && declaration.flags & 128 /* Abstract */) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        // Return true if the given type is part of a deeply nested chain of generic instantiations. We consider this to be the case
-        // when structural type comparisons have been started for 10 or more instantiations of the same generic type. It is possible,
-        // though highly unlikely, for this test to be true in a situation where a chain of instantiations is not infinitely expanding.
-        // Effectively, we will generate a false positive when two types are structurally equal to at least 10 levels, but unequal at
-        // some level beyond that.
-        function isDeeplyNestedGeneric(type, stack, depth) {
-            // We track type references (created by createTypeReference) and instantiated types (created by instantiateType)
-            if (type.flags & (4096 /* Reference */ | 131072 /* Instantiated */) && depth >= 5) {
-                var symbol = type.symbol;
-                var count = 0;
-                for (var i = 0; i < depth; i++) {
-                    var t = stack[i];
-                    if (t.flags & (4096 /* Reference */ | 131072 /* Instantiated */) && t.symbol === symbol) {
-                        count++;
-                        if (count >= 5)
-                            return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function isPropertyIdenticalTo(sourceProp, targetProp) {
-            return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
-        }
-        function compareProperties(sourceProp, targetProp, compareTypes) {
-            // Two members are considered identical when
-            // - they are public properties with identical names, optionality, and types,
-            // - they are private or protected properties originating in the same declaration and having identical types
-            if (sourceProp === targetProp) {
-                return -1 /* True */;
-            }
-            var sourcePropAccessibility = getDeclarationFlagsFromSymbol(sourceProp) & (8 /* Private */ | 16 /* Protected */);
-            var targetPropAccessibility = getDeclarationFlagsFromSymbol(targetProp) & (8 /* Private */ | 16 /* Protected */);
-            if (sourcePropAccessibility !== targetPropAccessibility) {
-                return 0 /* False */;
-            }
-            if (sourcePropAccessibility) {
-                if (getTargetSymbol(sourceProp) !== getTargetSymbol(targetProp)) {
-                    return 0 /* False */;
-                }
-            }
-            else {
-                if ((sourceProp.flags & 536870912 /* Optional */) !== (targetProp.flags & 536870912 /* Optional */)) {
-                    return 0 /* False */;
-                }
-            }
-            if (isReadonlySymbol(sourceProp) !== isReadonlySymbol(targetProp)) {
-                return 0 /* False */;
-            }
-            return compareTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
-        }
-        function isMatchingSignature(source, target, partialMatch) {
-            // A source signature matches a target signature if the two signatures have the same number of required,
-            // optional, and rest parameters.
-            if (source.parameters.length === target.parameters.length &&
-                source.minArgumentCount === target.minArgumentCount &&
-                source.hasRestParameter === target.hasRestParameter) {
-                return true;
-            }
-            // A source signature partially matches a target signature if the target signature has no fewer required
-            // parameters and no more overall parameters than the source signature (where a signature with a rest
-            // parameter is always considered to have more overall parameters than one without).
-            if (partialMatch && source.minArgumentCount <= target.minArgumentCount && (source.hasRestParameter && !target.hasRestParameter ||
-                source.hasRestParameter === target.hasRestParameter && source.parameters.length >= target.parameters.length)) {
-                return true;
-            }
-            return false;
-        }
-        /**
-         * See signatureRelatedTo, compareSignaturesIdentical
-         */
-        function compareSignaturesIdentical(source, target, partialMatch, ignoreThisTypes, ignoreReturnTypes, compareTypes) {
-            // TODO (drosen): De-duplicate code between related functions.
-            if (source === target) {
-                return -1 /* True */;
-            }
-            if (!(isMatchingSignature(source, target, partialMatch))) {
-                return 0 /* False */;
-            }
-            // Check that the two signatures have the same number of type parameters. We might consider
-            // also checking that any type parameter constraints match, but that would require instantiating
-            // the constraints with a common set of type arguments to get relatable entities in places where
-            // type parameters occur in the constraints. The complexity of doing that doesn't seem worthwhile,
-            // particularly as we're comparing erased versions of the signatures below.
-            if ((source.typeParameters ? source.typeParameters.length : 0) !== (target.typeParameters ? target.typeParameters.length : 0)) {
-                return 0 /* False */;
-            }
-            // Spec 1.0 Section 3.8.3 & 3.8.4:
-            // M and N (the signatures) are instantiated using type Any as the type argument for all type parameters declared by M and N
-            source = getErasedSignature(source);
-            target = getErasedSignature(target);
-            var result = -1 /* True */;
-            if (!ignoreThisTypes) {
-                var sourceThisType = getThisTypeOfSignature(source);
-                if (sourceThisType) {
-                    var targetThisType = getThisTypeOfSignature(target);
-                    if (targetThisType) {
-                        var related = compareTypes(sourceThisType, targetThisType);
-                        if (!related) {
-                            return 0 /* False */;
-                        }
-                        result &= related;
-                    }
-                }
-            }
-            var targetLen = target.parameters.length;
-            for (var i = 0; i < targetLen; i++) {
-                var s = isRestParameterIndex(source, i) ? getRestTypeOfSignature(source) : getTypeOfParameter(source.parameters[i]);
-                var t = isRestParameterIndex(target, i) ? getRestTypeOfSignature(target) : getTypeOfParameter(target.parameters[i]);
-                var related = compareTypes(s, t);
-                if (!related) {
-                    return 0 /* False */;
-                }
-                result &= related;
-            }
-            if (!ignoreReturnTypes) {
-                result &= compareTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-            }
-            return result;
-        }
-        function isRestParameterIndex(signature, parameterIndex) {
-            return signature.hasRestParameter && parameterIndex >= signature.parameters.length - 1;
-        }
-        function isSupertypeOfEach(candidate, types) {
-            for (var _i = 0, types_5 = types; _i < types_5.length; _i++) {
-                var t = types_5[_i];
-                if (candidate !== t && !isTypeSubtypeOf(t, candidate))
-                    return false;
-            }
-            return true;
-        }
-        function getCombinedFlagsOfTypes(types) {
-            var flags = 0;
-            for (var _i = 0, types_6 = types; _i < types_6.length; _i++) {
-                var t = types_6[_i];
-                flags |= t.flags;
-            }
-            return flags;
-        }
-        function getCommonSupertype(types) {
-            if (!strictNullChecks) {
-                return ts.forEach(types, function (t) { return isSupertypeOfEach(t, types) ? t : undefined; });
-            }
-            var primaryTypes = ts.filter(types, function (t) { return !(t.flags & 96 /* Nullable */); });
-            if (!primaryTypes.length) {
-                return getUnionType(types);
-            }
-            var supertype = ts.forEach(primaryTypes, function (t) { return isSupertypeOfEach(t, primaryTypes) ? t : undefined; });
-            return supertype && addTypeKind(supertype, getCombinedFlagsOfTypes(types) & 96 /* Nullable */);
-        }
-        function reportNoCommonSupertypeError(types, errorLocation, errorMessageChainHead) {
-            // The downfallType/bestSupertypeDownfallType is the first type that caused a particular candidate
-            // to not be the common supertype. So if it weren't for this one downfallType (and possibly others),
-            // the type in question could have been the common supertype.
-            var bestSupertype;
-            var bestSupertypeDownfallType;
-            var bestSupertypeScore = 0;
-            for (var i = 0; i < types.length; i++) {
-                var score = 0;
-                var downfallType = undefined;
-                for (var j = 0; j < types.length; j++) {
-                    if (isTypeSubtypeOf(types[j], types[i])) {
-                        score++;
-                    }
-                    else if (!downfallType) {
-                        downfallType = types[j];
-                    }
-                }
-                ts.Debug.assert(!!downfallType, "If there is no common supertype, each type should have a downfallType");
-                if (score > bestSupertypeScore) {
-                    bestSupertype = types[i];
-                    bestSupertypeDownfallType = downfallType;
-                    bestSupertypeScore = score;
-                }
-                // types.length - 1 is the maximum score, given that getCommonSupertype returned false
-                if (bestSupertypeScore === types.length - 1) {
-                    break;
-                }
-            }
-            // In the following errors, the {1} slot is before the {0} slot because checkTypeSubtypeOf supplies the
-            // subtype as the first argument to the error
-            checkTypeSubtypeOf(bestSupertypeDownfallType, bestSupertype, errorLocation, ts.Diagnostics.Type_argument_candidate_1_is_not_a_valid_type_argument_because_it_is_not_a_supertype_of_candidate_0, errorMessageChainHead);
-        }
-        function isArrayType(type) {
-            return type.flags & 4096 /* Reference */ && type.target === globalArrayType;
-        }
-        function isArrayLikeType(type) {
-            // A type is array-like if it is a reference to the global Array or global ReadonlyArray type,
-            // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
-            return type.flags & 4096 /* Reference */ && (type.target === globalArrayType || type.target === globalReadonlyArrayType) ||
-                !(type.flags & 96 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
-        }
-        function isTupleLikeType(type) {
-            return !!getPropertyOfType(type, "0");
-        }
-        function isStringLiteralUnionType(type) {
-            return type.flags & 256 /* StringLiteral */ ? true :
-                type.flags & 16384 /* Union */ ? ts.forEach(type.types, isStringLiteralUnionType) :
-                    false;
-        }
-        /**
-         * Check if a Type was written as a tuple type literal.
-         * Prefer using isTupleLikeType() unless the use of `elementTypes` is required.
-         */
-        function isTupleType(type) {
-            return !!(type.flags & 8192 /* Tuple */);
-        }
-        function getCombinedTypeFlags(type) {
-            return type.flags & 16384 /* Union */ ? getCombinedFlagsOfTypes(type.types) : type.flags;
-        }
-        function addTypeKind(type, kind) {
-            if ((getCombinedTypeFlags(type) & kind) === kind) {
-                return type;
-            }
-            var types = [type];
-            if (kind & 2 /* String */)
-                types.push(stringType);
-            if (kind & 4 /* Number */)
-                types.push(numberType);
-            if (kind & 8 /* Boolean */)
-                types.push(booleanType);
-            if (kind & 16 /* Void */)
-                types.push(voidType);
-            if (kind & 32 /* Undefined */)
-                types.push(undefinedType);
-            if (kind & 64 /* Null */)
-                types.push(nullType);
-            return getUnionType(types);
-        }
-        function getNonNullableType(type) {
-            return strictNullChecks ? getTypeWithFacts(type, 524288 /* NEUndefinedOrNull */) : type;
-        }
-        /**
-         * Return true if type was inferred from an object literal or written as an object type literal
-         * with no call or construct signatures.
-         */
-        function isObjectLiteralType(type) {
-            return type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */)) !== 0 &&
-                getSignaturesOfType(type, 0 /* Call */).length === 0 &&
-                getSignaturesOfType(type, 1 /* Construct */).length === 0;
-        }
-        function createTransientSymbol(source, type) {
-            var symbol = createSymbol(source.flags | 67108864 /* Transient */, source.name);
-            symbol.declarations = source.declarations;
-            symbol.parent = source.parent;
-            symbol.type = type;
-            symbol.target = source;
-            if (source.valueDeclaration) {
-                symbol.valueDeclaration = source.valueDeclaration;
-            }
-            return symbol;
-        }
-        function transformTypeOfMembers(type, f) {
-            var members = {};
-            for (var _i = 0, _a = getPropertiesOfObjectType(type); _i < _a.length; _i++) {
-                var property = _a[_i];
-                var original = getTypeOfSymbol(property);
-                var updated = f(original);
-                members[property.name] = updated === original ? property : createTransientSymbol(property, updated);
-            }
-            ;
-            return members;
-        }
-        /**
-         * If the the provided object literal is subject to the excess properties check,
-         * create a new that is exempt. Recursively mark object literal members as exempt.
-         * Leave signatures alone since they are not subject to the check.
-         */
-        function getRegularTypeOfObjectLiteral(type) {
-            if (!(type.flags & 1048576 /* FreshObjectLiteral */)) {
-                return type;
-            }
-            var regularType = type.regularType;
-            if (regularType) {
-                return regularType;
-            }
-            var resolved = type;
-            var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
-            var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
-            regularNew.flags = resolved.flags & ~1048576 /* FreshObjectLiteral */;
-            type.regularType = regularNew;
-            return regularNew;
-        }
-        function getWidenedTypeOfObjectLiteral(type) {
-            var members = transformTypeOfMembers(type, function (prop) {
-                var widened = getWidenedType(prop);
-                return prop === widened ? prop : widened;
-            });
-            var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
-            var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
-            return createAnonymousType(type.symbol, members, emptyArray, emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-        }
-        function getWidenedConstituentType(type) {
-            return type.flags & 96 /* Nullable */ ? type : getWidenedType(type);
-        }
-        function getWidenedType(type) {
-            if (type.flags & 6291456 /* RequiresWidening */) {
-                if (type.flags & 96 /* Nullable */) {
-                    return anyType;
-                }
-                if (type.flags & 524288 /* ObjectLiteral */) {
-                    return getWidenedTypeOfObjectLiteral(type);
-                }
-                if (type.flags & 16384 /* Union */) {
-                    return getUnionType(ts.map(type.types, getWidenedConstituentType), /*noSubtypeReduction*/ true);
-                }
-                if (isArrayType(type)) {
-                    return createArrayType(getWidenedType(type.typeArguments[0]));
-                }
-                if (isTupleType(type)) {
-                    return createTupleType(ts.map(type.elementTypes, getWidenedType));
-                }
-            }
-            return type;
-        }
-        /**
-         * Reports implicit any errors that occur as a result of widening 'null' and 'undefined'
-         * to 'any'. A call to reportWideningErrorsInType is normally accompanied by a call to
-         * getWidenedType. But in some cases getWidenedType is called without reporting errors
-         * (type argument inference is an example).
-         *
-         * The return value indicates whether an error was in fact reported. The particular circumstances
-         * are on a best effort basis. Currently, if the null or undefined that causes widening is inside
-         * an object literal property (arbitrarily deeply), this function reports an error. If no error is
-         * reported, reportImplicitAnyError is a suitable fallback to report a general error.
-         */
-        function reportWideningErrorsInType(type) {
-            var errorReported = false;
-            if (type.flags & 16384 /* Union */) {
-                for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                    var t = _a[_i];
-                    if (reportWideningErrorsInType(t)) {
-                        errorReported = true;
-                    }
-                }
-            }
-            if (isArrayType(type)) {
-                return reportWideningErrorsInType(type.typeArguments[0]);
-            }
-            if (isTupleType(type)) {
-                for (var _b = 0, _c = type.elementTypes; _b < _c.length; _b++) {
-                    var t = _c[_b];
-                    if (reportWideningErrorsInType(t)) {
-                        errorReported = true;
-                    }
-                }
-            }
-            if (type.flags & 524288 /* ObjectLiteral */) {
-                for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
-                    var p = _e[_d];
-                    var t = getTypeOfSymbol(p);
-                    if (t.flags & 2097152 /* ContainsWideningType */) {
-                        if (!reportWideningErrorsInType(t)) {
-                            error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, p.name, typeToString(getWidenedType(t)));
-                        }
-                        errorReported = true;
-                    }
-                }
-            }
-            return errorReported;
-        }
-        function reportImplicitAnyError(declaration, type) {
-            var typeAsString = typeToString(getWidenedType(type));
-            var diagnostic;
-            switch (declaration.kind) {
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    diagnostic = ts.Diagnostics.Member_0_implicitly_has_an_1_type;
-                    break;
-                case 142 /* Parameter */:
-                    diagnostic = declaration.dotDotDotToken ?
-                        ts.Diagnostics.Rest_parameter_0_implicitly_has_an_any_type :
-                        ts.Diagnostics.Parameter_0_implicitly_has_an_1_type;
-                    break;
-                case 169 /* BindingElement */:
-                    diagnostic = ts.Diagnostics.Binding_element_0_implicitly_has_an_1_type;
-                    break;
-                case 220 /* FunctionDeclaration */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    if (!declaration.name) {
-                        error(declaration, ts.Diagnostics.Function_expression_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
-                        return;
-                    }
-                    diagnostic = ts.Diagnostics._0_which_lacks_return_type_annotation_implicitly_has_an_1_return_type;
-                    break;
-                default:
-                    diagnostic = ts.Diagnostics.Variable_0_implicitly_has_an_1_type;
-            }
-            error(declaration, diagnostic, ts.declarationNameToString(declaration.name), typeAsString);
-        }
-        function reportErrorsFromWidening(declaration, type) {
-            if (produceDiagnostics && compilerOptions.noImplicitAny && type.flags & 2097152 /* ContainsWideningType */) {
-                // Report implicit any error within type if possible, otherwise report error on declaration
-                if (!reportWideningErrorsInType(type)) {
-                    reportImplicitAnyError(declaration, type);
-                }
-            }
-        }
-        function forEachMatchingParameterType(source, target, callback) {
-            var sourceMax = source.parameters.length;
-            var targetMax = target.parameters.length;
-            var count;
-            if (source.hasRestParameter && target.hasRestParameter) {
-                count = Math.max(sourceMax, targetMax);
-            }
-            else if (source.hasRestParameter) {
-                count = targetMax;
-            }
-            else if (target.hasRestParameter) {
-                count = sourceMax;
-            }
-            else {
-                count = Math.min(sourceMax, targetMax);
-            }
-            for (var i = 0; i < count; i++) {
-                callback(getTypeAtPosition(source, i), getTypeAtPosition(target, i));
-            }
-        }
-        function createInferenceContext(typeParameters, inferUnionTypes) {
-            var inferences = ts.map(typeParameters, createTypeInferencesObject);
-            return {
-                typeParameters: typeParameters,
-                inferUnionTypes: inferUnionTypes,
-                inferences: inferences,
-                inferredTypes: new Array(typeParameters.length)
-            };
-        }
-        function createTypeInferencesObject() {
-            return {
-                primary: undefined,
-                secondary: undefined,
-                isFixed: false
-            };
-        }
-        function inferTypes(context, source, target) {
-            var sourceStack;
-            var targetStack;
-            var depth = 0;
-            var inferiority = 0;
-            var visited = {};
-            inferFromTypes(source, target);
-            function isInProcess(source, target) {
-                for (var i = 0; i < depth; i++) {
-                    if (source === sourceStack[i] && target === targetStack[i]) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            function inferFromTypes(source, target) {
-                if (source.flags & 16384 /* Union */ && target.flags & 16384 /* Union */ ||
-                    source.flags & 32768 /* Intersection */ && target.flags & 32768 /* Intersection */) {
-                    // Source and target are both unions or both intersections. First, find each
-                    // target constituent type that has an identically matching source constituent
-                    // type, and for each such target constituent type infer from the type to itself.
-                    // When inferring from a type to itself we effectively find all type parameter
-                    // occurrences within that type and infer themselves as their type arguments.
-                    var matchingTypes = void 0;
-                    for (var _i = 0, _a = target.types; _i < _a.length; _i++) {
-                        var t = _a[_i];
-                        if (typeIdenticalToSomeType(t, source.types)) {
-                            (matchingTypes || (matchingTypes = [])).push(t);
-                            inferFromTypes(t, t);
-                        }
-                    }
-                    // Next, to improve the quality of inferences, reduce the source and target types by
-                    // removing the identically matched constituents. For example, when inferring from
-                    // 'string | string[]' to 'string | T' we reduce the types to 'string[]' and 'T'.
-                    if (matchingTypes) {
-                        source = removeTypesFromUnionOrIntersection(source, matchingTypes);
-                        target = removeTypesFromUnionOrIntersection(target, matchingTypes);
-                    }
-                }
-                if (target.flags & 512 /* TypeParameter */) {
-                    // If target is a type parameter, make an inference, unless the source type contains
-                    // the anyFunctionType (the wildcard type that's used to avoid contextually typing functions).
-                    // Because the anyFunctionType is internal, it should not be exposed to the user by adding
-                    // it as an inference candidate. Hopefully, a better candidate will come along that does
-                    // not contain anyFunctionType when we come back to this argument for its second round
-                    // of inference.
-                    if (source.flags & 8388608 /* ContainsAnyFunctionType */) {
-                        return;
-                    }
-                    var typeParameters = context.typeParameters;
-                    for (var i = 0; i < typeParameters.length; i++) {
-                        if (target === typeParameters[i]) {
-                            var inferences = context.inferences[i];
-                            if (!inferences.isFixed) {
-                                // Any inferences that are made to a type parameter in a union type are inferior
-                                // to inferences made to a flat (non-union) type. This is because if we infer to
-                                // T | string[], we really don't know if we should be inferring to T or not (because
-                                // the correct constituent on the target side could be string[]). Therefore, we put
-                                // such inferior inferences into a secondary bucket, and only use them if the primary
-                                // bucket is empty.
-                                var candidates = inferiority ?
-                                    inferences.secondary || (inferences.secondary = []) :
-                                    inferences.primary || (inferences.primary = []);
-                                if (!ts.contains(candidates, source)) {
-                                    candidates.push(source);
-                                }
-                            }
-                            return;
-                        }
-                    }
-                }
-                else if (source.flags & 4096 /* Reference */ && target.flags & 4096 /* Reference */ && source.target === target.target) {
-                    // If source and target are references to the same generic type, infer from type arguments
-                    var sourceTypes = source.typeArguments || emptyArray;
-                    var targetTypes = target.typeArguments || emptyArray;
-                    var count = sourceTypes.length < targetTypes.length ? sourceTypes.length : targetTypes.length;
-                    for (var i = 0; i < count; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
-                }
-                else if (source.flags & 8192 /* Tuple */ && target.flags & 8192 /* Tuple */ && source.elementTypes.length === target.elementTypes.length) {
-                    // If source and target are tuples of the same size, infer from element types
-                    var sourceTypes = source.elementTypes;
-                    var targetTypes = target.elementTypes;
-                    for (var i = 0; i < sourceTypes.length; i++) {
-                        inferFromTypes(sourceTypes[i], targetTypes[i]);
-                    }
-                }
-                else if (target.flags & 49152 /* UnionOrIntersection */) {
-                    var targetTypes = target.types;
-                    var typeParameterCount = 0;
-                    var typeParameter = void 0;
-                    // First infer to each type in union or intersection that isn't a type parameter
-                    for (var _b = 0, targetTypes_2 = targetTypes; _b < targetTypes_2.length; _b++) {
-                        var t = targetTypes_2[_b];
-                        if (t.flags & 512 /* TypeParameter */ && ts.contains(context.typeParameters, t)) {
-                            typeParameter = t;
-                            typeParameterCount++;
-                        }
-                        else {
-                            inferFromTypes(source, t);
-                        }
-                    }
-                    // Next, if target containings a single naked type parameter, make a secondary inference to that type
-                    // parameter. This gives meaningful results for union types in co-variant positions and intersection
-                    // types in contra-variant positions (such as callback parameters).
-                    if (typeParameterCount === 1) {
-                        inferiority++;
-                        inferFromTypes(source, typeParameter);
-                        inferiority--;
-                    }
-                }
-                else if (source.flags & 49152 /* UnionOrIntersection */) {
-                    // Source is a union or intersection type, infer from each constituent type
-                    var sourceTypes = source.types;
-                    for (var _c = 0, sourceTypes_3 = sourceTypes; _c < sourceTypes_3.length; _c++) {
-                        var sourceType = sourceTypes_3[_c];
-                        inferFromTypes(sourceType, target);
-                    }
-                }
-                else {
-                    source = getApparentType(source);
-                    if (source.flags & 80896 /* ObjectType */ && (target.flags & 4096 /* Reference */ && target.typeArguments ||
-                        target.flags & 8192 /* Tuple */ ||
-                        target.flags & 65536 /* Anonymous */ && target.symbol && target.symbol.flags & (8192 /* Method */ | 2048 /* TypeLiteral */ | 32 /* Class */))) {
-                        // If source is an object type, and target is a type reference with type arguments, a tuple type,
-                        // the type of a method, or a type literal, infer from members
-                        if (isInProcess(source, target)) {
-                            return;
-                        }
-                        if (isDeeplyNestedGeneric(source, sourceStack, depth) && isDeeplyNestedGeneric(target, targetStack, depth)) {
-                            return;
-                        }
-                        var key = source.id + "," + target.id;
-                        if (ts.hasProperty(visited, key)) {
-                            return;
-                        }
-                        visited[key] = true;
-                        if (depth === 0) {
-                            sourceStack = [];
-                            targetStack = [];
-                        }
-                        sourceStack[depth] = source;
-                        targetStack[depth] = target;
-                        depth++;
-                        inferFromProperties(source, target);
-                        inferFromSignatures(source, target, 0 /* Call */);
-                        inferFromSignatures(source, target, 1 /* Construct */);
-                        inferFromIndexTypes(source, target);
-                        depth--;
-                    }
-                }
-            }
-            function inferFromProperties(source, target) {
-                var properties = getPropertiesOfObjectType(target);
-                for (var _i = 0, properties_2 = properties; _i < properties_2.length; _i++) {
-                    var targetProp = properties_2[_i];
-                    var sourceProp = getPropertyOfObjectType(source, targetProp.name);
-                    if (sourceProp) {
-                        inferFromTypes(getTypeOfSymbol(sourceProp), getTypeOfSymbol(targetProp));
-                    }
-                }
-            }
-            function inferFromSignatures(source, target, kind) {
-                var sourceSignatures = getSignaturesOfType(source, kind);
-                var targetSignatures = getSignaturesOfType(target, kind);
-                var sourceLen = sourceSignatures.length;
-                var targetLen = targetSignatures.length;
-                var len = sourceLen < targetLen ? sourceLen : targetLen;
-                for (var i = 0; i < len; i++) {
-                    inferFromSignature(getErasedSignature(sourceSignatures[sourceLen - len + i]), getErasedSignature(targetSignatures[targetLen - len + i]));
-                }
-            }
-            function inferFromSignature(source, target) {
-                forEachMatchingParameterType(source, target, inferFromTypes);
-                if (source.typePredicate && target.typePredicate && source.typePredicate.kind === target.typePredicate.kind) {
-                    inferFromTypes(source.typePredicate.type, target.typePredicate.type);
-                }
-                else {
-                    inferFromTypes(getReturnTypeOfSignature(source), getReturnTypeOfSignature(target));
-                }
-            }
-            function inferFromIndexTypes(source, target) {
-                var targetStringIndexType = getIndexTypeOfType(target, 0 /* String */);
-                if (targetStringIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, 0 /* String */) ||
-                        getImplicitIndexTypeOfType(source, 0 /* String */);
-                    if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetStringIndexType);
-                    }
-                }
-                var targetNumberIndexType = getIndexTypeOfType(target, 1 /* Number */);
-                if (targetNumberIndexType) {
-                    var sourceIndexType = getIndexTypeOfType(source, 1 /* Number */) ||
-                        getIndexTypeOfType(source, 0 /* String */) ||
-                        getImplicitIndexTypeOfType(source, 1 /* Number */);
-                    if (sourceIndexType) {
-                        inferFromTypes(sourceIndexType, targetNumberIndexType);
-                    }
-                }
-            }
-        }
-        function typeIdenticalToSomeType(type, types) {
-            for (var _i = 0, types_7 = types; _i < types_7.length; _i++) {
-                var t = types_7[_i];
-                if (isTypeIdenticalTo(t, type)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        /**
-         * Return a new union or intersection type computed by removing a given set of types
-         * from a given union or intersection type.
-         */
-        function removeTypesFromUnionOrIntersection(type, typesToRemove) {
-            var reducedTypes = [];
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (!typeIdenticalToSomeType(t, typesToRemove)) {
-                    reducedTypes.push(t);
-                }
-            }
-            return type.flags & 16384 /* Union */ ? getUnionType(reducedTypes, /*noSubtypeReduction*/ true) : getIntersectionType(reducedTypes);
-        }
-        function getInferenceCandidates(context, index) {
-            var inferences = context.inferences[index];
-            return inferences.primary || inferences.secondary || emptyArray;
-        }
-        function getInferredType(context, index) {
-            var inferredType = context.inferredTypes[index];
-            var inferenceSucceeded;
-            if (!inferredType) {
-                var inferences = getInferenceCandidates(context, index);
-                if (inferences.length) {
-                    // Infer widened union or supertype, or the unknown type for no common supertype
-                    var unionOrSuperType = context.inferUnionTypes ? getUnionType(inferences) : getCommonSupertype(inferences);
-                    inferredType = unionOrSuperType ? getWidenedType(unionOrSuperType) : unknownType;
-                    inferenceSucceeded = !!unionOrSuperType;
-                }
-                else {
-                    // Infer the empty object type when no inferences were made. It is important to remember that
-                    // in this case, inference still succeeds, meaning there is no error for not having inference
-                    // candidates. An inference error only occurs when there are *conflicting* candidates, i.e.
-                    // candidates with no common supertype.
-                    inferredType = emptyObjectType;
-                    inferenceSucceeded = true;
-                }
-                context.inferredTypes[index] = inferredType;
-                // Only do the constraint check if inference succeeded (to prevent cascading errors)
-                if (inferenceSucceeded) {
-                    var constraint = getConstraintOfTypeParameter(context.typeParameters[index]);
-                    if (constraint) {
-                        var instantiatedConstraint = instantiateType(constraint, getInferenceMapper(context));
-                        if (!isTypeAssignableTo(inferredType, getTypeWithThisArgument(instantiatedConstraint, inferredType))) {
-                            context.inferredTypes[index] = inferredType = instantiatedConstraint;
-                        }
-                    }
-                }
-                else if (context.failedTypeParameterIndex === undefined || context.failedTypeParameterIndex > index) {
-                    // If inference failed, it is necessary to record the index of the failed type parameter (the one we are on).
-                    // It might be that inference has already failed on a later type parameter on a previous call to inferTypeArguments.
-                    // So if this failure is on preceding type parameter, this type parameter is the new failure index.
-                    context.failedTypeParameterIndex = index;
-                }
-            }
-            return inferredType;
-        }
-        function getInferredTypes(context) {
-            for (var i = 0; i < context.inferredTypes.length; i++) {
-                getInferredType(context, i);
-            }
-            return context.inferredTypes;
-        }
-        // EXPRESSION TYPE CHECKING
-        function getResolvedSymbol(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedSymbol) {
-                links.resolvedSymbol = !ts.nodeIsMissing(node) && resolveName(node, node.text, 107455 /* Value */ | 1048576 /* ExportValue */, ts.Diagnostics.Cannot_find_name_0, node) || unknownSymbol;
-            }
-            return links.resolvedSymbol;
-        }
-        function isInTypeQuery(node) {
-            // TypeScript 1.0 spec (April 2014): 3.6.3
-            // A type query consists of the keyword typeof followed by an expression.
-            // The expression is restricted to a single identifier or a sequence of identifiers separated by periods
-            while (node) {
-                switch (node.kind) {
-                    case 158 /* TypeQuery */:
-                        return true;
-                    case 69 /* Identifier */:
-                    case 139 /* QualifiedName */:
-                        node = node.parent;
-                        continue;
-                    default:
-                        return false;
-                }
-            }
-            ts.Debug.fail("should not get here");
-        }
-        // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
-        // separated by dots). The key consists of the id of the symbol referenced by the
-        // leftmost identifier followed by zero or more property names separated by dots.
-        // The result is undefined if the reference isn't a dotted name.
-        function getFlowCacheKey(node) {
-            if (node.kind === 69 /* Identifier */) {
-                var symbol = getResolvedSymbol(node);
-                return symbol !== unknownSymbol ? "" + getSymbolId(symbol) : undefined;
-            }
-            if (node.kind === 97 /* ThisKeyword */) {
-                return "0";
-            }
-            if (node.kind === 172 /* PropertyAccessExpression */) {
-                var key = getFlowCacheKey(node.expression);
-                return key && key + "." + node.name.text;
-            }
-            return undefined;
-        }
-        function isNullOrUndefinedLiteral(node) {
-            return node.kind === 93 /* NullKeyword */ ||
-                node.kind === 69 /* Identifier */ && getResolvedSymbol(node) === undefinedSymbol;
-        }
-        function getLeftmostIdentifierOrThis(node) {
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                case 97 /* ThisKeyword */:
-                    return node;
-                case 172 /* PropertyAccessExpression */:
-                    return getLeftmostIdentifierOrThis(node.expression);
-            }
-            return undefined;
-        }
-        function isMatchingReference(source, target) {
-            if (source.kind === target.kind) {
-                switch (source.kind) {
-                    case 69 /* Identifier */:
-                        return getResolvedSymbol(source) === getResolvedSymbol(target);
-                    case 97 /* ThisKeyword */:
-                        return true;
-                    case 172 /* PropertyAccessExpression */:
-                        return source.name.text === target.name.text &&
-                            isMatchingReference(source.expression, target.expression);
-                }
-            }
-            return false;
-        }
-        function containsMatchingReference(source, target) {
-            while (source.kind === 172 /* PropertyAccessExpression */) {
-                source = source.expression;
-                if (isMatchingReference(source, target)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function isOrContainsMatchingReference(source, target) {
-            return isMatchingReference(source, target) || containsMatchingReference(source, target);
-        }
-        function hasMatchingArgument(callExpression, reference) {
-            if (callExpression.arguments) {
-                for (var _i = 0, _a = callExpression.arguments; _i < _a.length; _i++) {
-                    var argument = _a[_i];
-                    if (isOrContainsMatchingReference(reference, argument)) {
-                        return true;
-                    }
-                }
-            }
-            if (callExpression.expression.kind === 172 /* PropertyAccessExpression */ &&
-                isOrContainsMatchingReference(reference, callExpression.expression.expression)) {
-                return true;
-            }
-            return false;
-        }
-        function getFlowNodeId(flow) {
-            if (!flow.id) {
-                flow.id = nextFlowId;
-                nextFlowId++;
-            }
-            return flow.id;
-        }
-        function typeMaybeAssignableTo(source, target) {
-            if (!(source.flags & 16384 /* Union */)) {
-                return isTypeAssignableTo(source, target);
-            }
-            for (var _i = 0, _a = source.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (isTypeAssignableTo(t, target)) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        // Remove those constituent types of declaredType to which no constituent type of assignedType is assignable.
-        // For example, when a variable of type number | string | boolean is assigned a value of type number | boolean,
-        // we remove type string.
-        function getAssignmentReducedType(declaredType, assignedType) {
-            if (declaredType !== assignedType && declaredType.flags & 16384 /* Union */) {
-                var reducedTypes = ts.filter(declaredType.types, function (t) { return typeMaybeAssignableTo(assignedType, t); });
-                if (reducedTypes.length) {
-                    return reducedTypes.length === 1 ? reducedTypes[0] : getUnionType(reducedTypes);
-                }
-            }
-            return declaredType;
-        }
-        function getTypeFacts(type) {
-            var flags = type.flags;
-            if (flags & 258 /* StringLike */) {
-                return strictNullChecks ? 4079361 /* StringStrictFacts */ : 4194049 /* StringFacts */;
-            }
-            if (flags & 132 /* NumberLike */) {
-                return strictNullChecks ? 4079234 /* NumberStrictFacts */ : 4193922 /* NumberFacts */;
-            }
-            if (flags & 8 /* Boolean */) {
-                return strictNullChecks ? 4078980 /* BooleanStrictFacts */ : 4193668 /* BooleanFacts */;
-            }
-            if (flags & 80896 /* ObjectType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                return resolved.callSignatures.length || resolved.constructSignatures.length || isTypeSubtypeOf(type, globalFunctionType) ?
-                    strictNullChecks ? 1970144 /* FunctionStrictFacts */ : 4181984 /* FunctionFacts */ :
-                    strictNullChecks ? 1972176 /* ObjectStrictFacts */ : 4184016 /* ObjectFacts */;
-            }
-            if (flags & (16 /* Void */ | 32 /* Undefined */)) {
-                return 2457472 /* UndefinedFacts */;
-            }
-            if (flags & 64 /* Null */) {
-                return 2340752 /* NullFacts */;
-            }
-            if (flags & 16777216 /* ESSymbol */) {
-                return strictNullChecks ? 1981320 /* SymbolStrictFacts */ : 4193160 /* SymbolFacts */;
-            }
-            if (flags & 512 /* TypeParameter */) {
-                var constraint = getConstraintOfTypeParameter(type);
-                return constraint ? getTypeFacts(constraint) : 4194303 /* All */;
-            }
-            if (flags & 32768 /* Intersection */) {
-                return ts.reduceLeft(type.types, function (flags, type) { return flags |= getTypeFacts(type); }, 0 /* None */);
-            }
-            return 4194303 /* All */;
-        }
-        function getTypeWithFacts(type, include) {
-            if (!(type.flags & 16384 /* Union */)) {
-                return getTypeFacts(type) & include ? type : neverType;
-            }
-            var firstType;
-            var types;
-            for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                var t = _a[_i];
-                if (getTypeFacts(t) & include) {
-                    if (!firstType) {
-                        firstType = t;
-                    }
-                    else {
-                        if (!types) {
-                            types = [firstType];
-                        }
-                        types.push(t);
-                    }
-                }
-            }
-            return firstType ? types ? getUnionType(types, /*noSubtypeReduction*/ true) : firstType : neverType;
-        }
-        function getTypeWithDefault(type, defaultExpression) {
-            if (defaultExpression) {
-                var defaultType = checkExpression(defaultExpression);
-                return getUnionType([getTypeWithFacts(type, 131072 /* NEUndefined */), defaultType]);
-            }
-            return type;
-        }
-        function getTypeOfDestructuredProperty(type, name) {
-            var text = getTextOfPropertyName(name);
-            return getTypeOfPropertyOfType(type, text) ||
-                isNumericLiteralName(text) && getIndexTypeOfType(type, 1 /* Number */) ||
-                getIndexTypeOfType(type, 0 /* String */) ||
-                unknownType;
-        }
-        function getTypeOfDestructuredArrayElement(type, index) {
-            return isTupleLikeType(type) && getTypeOfPropertyOfType(type, "" + index) ||
-                checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) ||
-                unknownType;
-        }
-        function getTypeOfDestructuredSpreadElement(type) {
-            return createArrayType(checkIteratedTypeOrElementType(type, /*errorNode*/ undefined, /*allowStringInput*/ false) || unknownType);
-        }
-        function getAssignedTypeOfBinaryExpression(node) {
-            return node.parent.kind === 170 /* ArrayLiteralExpression */ || node.parent.kind === 253 /* PropertyAssignment */ ?
-                getTypeWithDefault(getAssignedType(node), node.right) :
-                checkExpression(node.right);
-        }
-        function getAssignedTypeOfArrayLiteralElement(node, element) {
-            return getTypeOfDestructuredArrayElement(getAssignedType(node), ts.indexOf(node.elements, element));
-        }
-        function getAssignedTypeOfSpreadElement(node) {
-            return getTypeOfDestructuredSpreadElement(getAssignedType(node.parent));
-        }
-        function getAssignedTypeOfPropertyAssignment(node) {
-            return getTypeOfDestructuredProperty(getAssignedType(node.parent), node.name);
-        }
-        function getAssignedTypeOfShorthandPropertyAssignment(node) {
-            return getTypeWithDefault(getAssignedTypeOfPropertyAssignment(node), node.objectAssignmentInitializer);
-        }
-        function getAssignedType(node) {
-            var parent = node.parent;
-            switch (parent.kind) {
-                case 207 /* ForInStatement */:
-                    return stringType;
-                case 208 /* ForOfStatement */:
-                    return checkRightHandSideOfForOf(parent.expression) || unknownType;
-                case 187 /* BinaryExpression */:
-                    return getAssignedTypeOfBinaryExpression(parent);
-                case 181 /* DeleteExpression */:
-                    return undefinedType;
-                case 170 /* ArrayLiteralExpression */:
-                    return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 191 /* SpreadElementExpression */:
-                    return getAssignedTypeOfSpreadElement(parent);
-                case 253 /* PropertyAssignment */:
-                    return getAssignedTypeOfPropertyAssignment(parent);
-                case 254 /* ShorthandPropertyAssignment */:
-                    return getAssignedTypeOfShorthandPropertyAssignment(parent);
-            }
-            return unknownType;
-        }
-        function getInitialTypeOfBindingElement(node) {
-            var pattern = node.parent;
-            var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 167 /* ObjectBindingPattern */ ?
-                getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
-                !node.dotDotDotToken ?
-                    getTypeOfDestructuredArrayElement(parentType, ts.indexOf(pattern.elements, node)) :
-                    getTypeOfDestructuredSpreadElement(parentType);
-            return getTypeWithDefault(type, node.initializer);
-        }
-        function getTypeOfInitializer(node) {
-            // Return the cached type if one is available. If the type of the variable was inferred
-            // from its initializer, we'll already have cached the type. Otherwise we compute it now
-            // without caching such that transient types are reflected.
-            var links = getNodeLinks(node);
-            return links.resolvedType || checkExpression(node);
-        }
-        function getInitialTypeOfVariableDeclaration(node) {
-            if (node.initializer) {
-                return getTypeOfInitializer(node.initializer);
-            }
-            if (node.parent.parent.kind === 207 /* ForInStatement */) {
-                return stringType;
-            }
-            if (node.parent.parent.kind === 208 /* ForOfStatement */) {
-                return checkRightHandSideOfForOf(node.parent.parent.expression) || unknownType;
-            }
-            return unknownType;
-        }
-        function getInitialType(node) {
-            return node.kind === 218 /* VariableDeclaration */ ?
-                getInitialTypeOfVariableDeclaration(node) :
-                getInitialTypeOfBindingElement(node);
-        }
-        function getReferenceFromExpression(node) {
-            switch (node.kind) {
-                case 178 /* ParenthesizedExpression */:
-                    return getReferenceFromExpression(node.expression);
-                case 187 /* BinaryExpression */:
-                    switch (node.operatorToken.kind) {
-                        case 56 /* EqualsToken */:
-                            return getReferenceFromExpression(node.left);
-                        case 24 /* CommaToken */:
-                            return getReferenceFromExpression(node.right);
-                    }
-            }
-            return node;
-        }
-        function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 249 /* CaseClause */) {
-                var expr = clause.expression;
-                return expr.kind === 9 /* StringLiteral */ ? getStringLiteralTypeForText(expr.text) : checkExpression(expr);
-            }
-            return undefined;
-        }
-        function getSwitchClauseTypes(switchStatement) {
-            var links = getNodeLinks(switchStatement);
-            if (!links.switchTypes) {
-                // If all case clauses specify expressions that have unit types, we return an array
-                // of those unit types. Otherwise we return an empty array.
-                var types = ts.map(switchStatement.caseBlock.clauses, getTypeOfSwitchClause);
-                links.switchTypes = ts.forEach(types, function (t) { return !t || t.flags & 256 /* StringLiteral */; }) ? types : emptyArray;
-            }
-            return links.switchTypes;
-        }
-        function eachTypeContainedIn(source, types) {
-            return source.flags & 16384 /* Union */ ? !ts.forEach(source.types, function (t) { return !ts.contains(types, t); }) : ts.contains(types, source);
-        }
-        function filterType(type, f) {
-            return type.flags & 16384 /* Union */ ?
-                getUnionType(ts.filter(type.types, f)) :
-                f(type) ? type : neverType;
-        }
-        function getFlowTypeOfReference(reference, declaredType, assumeInitialized, includeOuterFunctions) {
-            var key;
-            if (!reference.flowNode || assumeInitialized && !(declaredType.flags & 16908175 /* Narrowable */)) {
-                return declaredType;
-            }
-            var initialType = assumeInitialized ? declaredType : addTypeKind(declaredType, 32 /* Undefined */);
-            var visitedFlowStart = visitedFlowCount;
-            var result = getTypeAtFlowNode(reference.flowNode);
-            visitedFlowCount = visitedFlowStart;
-            if (reference.parent.kind === 196 /* NonNullExpression */ && getTypeWithFacts(result, 524288 /* NEUndefinedOrNull */) === neverType) {
-                return declaredType;
-            }
-            return result;
-            function getTypeAtFlowNode(flow) {
-                while (true) {
-                    if (flow.flags & 512 /* Shared */) {
-                        // We cache results of flow type resolution for shared nodes that were previously visited in
-                        // the same getFlowTypeOfReference invocation. A node is considered shared when it is the
-                        // antecedent of more than one node.
-                        for (var i = visitedFlowStart; i < visitedFlowCount; i++) {
-                            if (visitedFlowNodes[i] === flow) {
-                                return visitedFlowTypes[i];
-                            }
-                        }
-                    }
-                    var type = void 0;
-                    if (flow.flags & 16 /* Assignment */) {
-                        type = getTypeAtFlowAssignment(flow);
-                        if (!type) {
-                            flow = flow.antecedent;
-                            continue;
-                        }
-                    }
-                    else if (flow.flags & 96 /* Condition */) {
-                        type = getTypeAtFlowCondition(flow);
-                    }
-                    else if (flow.flags & 128 /* SwitchClause */) {
-                        type = getTypeAtSwitchClause(flow);
-                    }
-                    else if (flow.flags & 12 /* Label */) {
-                        if (flow.antecedents.length === 1) {
-                            flow = flow.antecedents[0];
-                            continue;
-                        }
-                        type = flow.flags & 4 /* BranchLabel */ ?
-                            getTypeAtFlowBranchLabel(flow) :
-                            getTypeAtFlowLoopLabel(flow);
-                    }
-                    else if (flow.flags & 2 /* Start */) {
-                        // Check if we should continue with the control flow of the containing function.
-                        var container = flow.container;
-                        if (container && includeOuterFunctions) {
-                            flow = container.flowNode;
-                            continue;
-                        }
-                        // At the top of the flow we have the initial type.
-                        type = initialType;
-                    }
-                    else {
-                        // Unreachable code errors are reported in the binding phase. Here we
-                        // simply return the declared type to reduce follow-on errors.
-                        type = declaredType;
-                    }
-                    if (flow.flags & 512 /* Shared */) {
-                        // Record visited node and the associated type in the cache.
-                        visitedFlowNodes[visitedFlowCount] = flow;
-                        visitedFlowTypes[visitedFlowCount] = type;
-                        visitedFlowCount++;
-                    }
-                    return type;
-                }
-            }
-            function getTypeAtFlowAssignment(flow) {
-                var node = flow.node;
-                // Assignments only narrow the computed type if the declared type is a union type. Thus, we
-                // only need to evaluate the assigned type if the declared type is a union type.
-                if ((node.kind === 218 /* VariableDeclaration */ || node.kind === 169 /* BindingElement */) &&
-                    reference.kind === 69 /* Identifier */ &&
-                    getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(reference)) === getSymbolOfNode(node)) {
-                    return declaredType.flags & 16384 /* Union */ ?
-                        getAssignmentReducedType(declaredType, getInitialType(node)) :
-                        declaredType;
-                }
-                // If the node is not a variable declaration or binding element, it is an identifier
-                // or a dotted name that is the target of an assignment. If we have a match, reduce
-                // the declared type by the assigned type.
-                if (isMatchingReference(reference, node)) {
-                    return declaredType.flags & 16384 /* Union */ ?
-                        getAssignmentReducedType(declaredType, getAssignedType(node)) :
-                        declaredType;
-                }
-                // We didn't have a direct match. However, if the reference is a dotted name, this
-                // may be an assignment to a left hand part of the reference. For example, for a
-                // reference 'x.y.z', we may be at an assignment to 'x.y' or 'x'. In that case,
-                // return the declared type.
-                if (containsMatchingReference(reference, node)) {
-                    return declaredType;
-                }
-                // Assignment doesn't affect reference
-                return undefined;
-            }
-            function getTypeAtFlowCondition(flow) {
-                var type = getTypeAtFlowNode(flow.antecedent);
-                if (type !== neverType) {
-                    // If we have an antecedent type (meaning we're reachable in some way), we first
-                    // attempt to narrow the antecedent type. If that produces the nothing type, then
-                    // we take the type guard as an indication that control could reach here in a
-                    // manner not understood by the control flow analyzer (e.g. a function argument
-                    // has an invalid type, or a nested function has possibly made an assignment to a
-                    // captured variable). We proceed by reverting to the declared type and then
-                    // narrow that.
-                    var assumeTrue = (flow.flags & 32 /* TrueCondition */) !== 0;
-                    type = narrowType(type, flow.expression, assumeTrue);
-                    if (type === neverType) {
-                        type = narrowType(declaredType, flow.expression, assumeTrue);
-                    }
-                }
-                return type;
-            }
-            function getTypeAtSwitchClause(flow) {
-                var type = getTypeAtFlowNode(flow.antecedent);
-                return narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
-            }
-            function getTypeAtFlowBranchLabel(flow) {
-                var antecedentTypes = [];
-                for (var _i = 0, _a = flow.antecedents; _i < _a.length; _i++) {
-                    var antecedent = _a[_i];
-                    var type = getTypeAtFlowNode(antecedent);
-                    // If the type at a particular antecedent path is the declared type and the
-                    // reference is known to always be assigned (i.e. when declared and initial types
-                    // are the same), there is no reason to process more antecedents since the only
-                    // possible outcome is subtypes that will be removed in the final union type anyway.
-                    if (type === declaredType && declaredType === initialType) {
-                        return type;
-                    }
-                    if (!ts.contains(antecedentTypes, type)) {
-                        antecedentTypes.push(type);
-                    }
-                }
-                return getUnionType(antecedentTypes);
-            }
-            function getTypeAtFlowLoopLabel(flow) {
-                // If we have previously computed the control flow type for the reference at
-                // this flow loop junction, return the cached type.
-                var id = getFlowNodeId(flow);
-                var cache = flowLoopCaches[id] || (flowLoopCaches[id] = {});
-                if (!key) {
-                    key = getFlowCacheKey(reference);
-                }
-                if (cache[key]) {
-                    return cache[key];
-                }
-                // If this flow loop junction and reference are already being processed, return
-                // the union of the types computed for each branch so far. We should never see
-                // an empty array here because the first antecedent of a loop junction is always
-                // the non-looping control flow path that leads to the top.
-                for (var i = flowLoopStart; i < flowLoopCount; i++) {
-                    if (flowLoopNodes[i] === flow && flowLoopKeys[i] === key) {
-                        return getUnionType(flowLoopTypes[i]);
-                    }
-                }
-                // Add the flow loop junction and reference to the in-process stack and analyze
-                // each antecedent code path.
-                var antecedentTypes = [];
-                flowLoopNodes[flowLoopCount] = flow;
-                flowLoopKeys[flowLoopCount] = key;
-                flowLoopTypes[flowLoopCount] = antecedentTypes;
-                for (var _i = 0, _a = flow.antecedents; _i < _a.length; _i++) {
-                    var antecedent = _a[_i];
-                    flowLoopCount++;
-                    var type = getTypeAtFlowNode(antecedent);
-                    flowLoopCount--;
-                    // If we see a value appear in the cache it is a sign that control flow  analysis
-                    // was restarted and completed by checkExpressionCached. We can simply pick up
-                    // the resulting type and bail out.
-                    if (cache[key]) {
-                        return cache[key];
-                    }
-                    if (!ts.contains(antecedentTypes, type)) {
-                        antecedentTypes.push(type);
-                    }
-                    // If the type at a particular antecedent path is the declared type there is no
-                    // reason to process more antecedents since the only possible outcome is subtypes
-                    // that will be removed in the final union type anyway.
-                    if (type === declaredType) {
-                        break;
-                    }
-                }
-                return cache[key] = getUnionType(antecedentTypes);
-            }
-            function narrowTypeByTruthiness(type, expr, assumeTrue) {
-                return isMatchingReference(reference, expr) ? getTypeWithFacts(type, assumeTrue ? 1048576 /* Truthy */ : 2097152 /* Falsy */) : type;
-            }
-            function narrowTypeByBinaryExpression(type, expr, assumeTrue) {
-                switch (expr.operatorToken.kind) {
-                    case 56 /* EqualsToken */:
-                        return narrowTypeByTruthiness(type, expr.left, assumeTrue);
-                    case 30 /* EqualsEqualsToken */:
-                    case 31 /* ExclamationEqualsToken */:
-                    case 32 /* EqualsEqualsEqualsToken */:
-                    case 33 /* ExclamationEqualsEqualsToken */:
-                        var left = expr.left;
-                        var operator = expr.operatorToken.kind;
-                        var right = expr.right;
-                        if (isNullOrUndefinedLiteral(right)) {
-                            return narrowTypeByNullCheck(type, left, operator, right, assumeTrue);
-                        }
-                        if (isNullOrUndefinedLiteral(left)) {
-                            return narrowTypeByNullCheck(type, right, operator, left, assumeTrue);
-                        }
-                        if (left.kind === 182 /* TypeOfExpression */ && right.kind === 9 /* StringLiteral */) {
-                            return narrowTypeByTypeof(type, left, operator, right, assumeTrue);
-                        }
-                        if (right.kind === 182 /* TypeOfExpression */ && left.kind === 9 /* StringLiteral */) {
-                            return narrowTypeByTypeof(type, right, operator, left, assumeTrue);
-                        }
-                        if (left.kind === 172 /* PropertyAccessExpression */) {
-                            return narrowTypeByDiscriminant(type, left, operator, right, assumeTrue);
-                        }
-                        if (right.kind === 172 /* PropertyAccessExpression */) {
-                            return narrowTypeByDiscriminant(type, right, operator, left, assumeTrue);
-                        }
-                        break;
-                    case 91 /* InstanceOfKeyword */:
-                        return narrowTypeByInstanceof(type, expr, assumeTrue);
-                    case 24 /* CommaToken */:
-                        return narrowType(type, expr.right, assumeTrue);
-                }
-                return type;
-            }
-            function narrowTypeByNullCheck(type, target, operator, literal, assumeTrue) {
-                // We have '==', '!=', '===', or '!==' operator with 'null' or 'undefined' as value
-                if (operator === 31 /* ExclamationEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
-                    assumeTrue = !assumeTrue;
-                }
-                if (!strictNullChecks || !isMatchingReference(reference, getReferenceFromExpression(target))) {
-                    return type;
-                }
-                var doubleEquals = operator === 30 /* EqualsEqualsToken */ || operator === 31 /* ExclamationEqualsToken */;
-                var facts = doubleEquals ?
-                    assumeTrue ? 65536 /* EQUndefinedOrNull */ : 524288 /* NEUndefinedOrNull */ :
-                    literal.kind === 93 /* NullKeyword */ ?
-                        assumeTrue ? 32768 /* EQNull */ : 262144 /* NENull */ :
-                        assumeTrue ? 16384 /* EQUndefined */ : 131072 /* NEUndefined */;
-                return getTypeWithFacts(type, facts);
-            }
-            function narrowTypeByTypeof(type, typeOfExpr, operator, literal, assumeTrue) {
-                // We have '==', '!=', '====', or !==' operator with 'typeof xxx' and string literal operands
-                var target = getReferenceFromExpression(typeOfExpr.expression);
-                if (!isMatchingReference(reference, target)) {
-                    // For a reference of the form 'x.y', a 'typeof x === ...' type guard resets the
-                    // narrowed type of 'y' to its declared type.
-                    if (containsMatchingReference(reference, target)) {
-                        return declaredType;
-                    }
-                    return type;
-                }
-                if (operator === 31 /* ExclamationEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
-                    assumeTrue = !assumeTrue;
-                }
-                if (assumeTrue && !(type.flags & 16384 /* Union */)) {
-                    // We narrow a non-union type to an exact primitive type if the non-union type
-                    // is a supertype of that primtive type. For example, type 'any' can be narrowed
-                    // to one of the primitive types.
-                    var targetType = ts.getProperty(typeofTypesByName, literal.text);
-                    if (targetType && isTypeSubtypeOf(targetType, type)) {
-                        return targetType;
-                    }
-                }
-                var facts = assumeTrue ?
-                    ts.getProperty(typeofEQFacts, literal.text) || 64 /* TypeofEQHostObject */ :
-                    ts.getProperty(typeofNEFacts, literal.text) || 8192 /* TypeofNEHostObject */;
-                return getTypeWithFacts(type, facts);
-            }
-            function narrowTypeByDiscriminant(type, propAccess, operator, value, assumeTrue) {
-                // We have '==', '!=', '===', or '!==' operator with property access as target
-                if (!isMatchingReference(reference, propAccess.expression)) {
-                    return type;
-                }
-                var propName = propAccess.name.text;
-                var propType = getTypeOfPropertyOfType(type, propName);
-                if (!propType || !isStringLiteralUnionType(propType)) {
-                    return type;
-                }
-                var discriminantType = value.kind === 9 /* StringLiteral */ ? getStringLiteralTypeForText(value.text) : checkExpression(value);
-                if (!isStringLiteralUnionType(discriminantType)) {
-                    return type;
-                }
-                if (operator === 31 /* ExclamationEqualsToken */ || operator === 33 /* ExclamationEqualsEqualsToken */) {
-                    assumeTrue = !assumeTrue;
-                }
-                if (assumeTrue) {
-                    return filterType(type, function (t) { return areTypesComparable(getTypeOfPropertyOfType(t, propName), discriminantType); });
-                }
-                if (discriminantType.flags & 256 /* StringLiteral */) {
-                    return filterType(type, function (t) { return getTypeOfPropertyOfType(t, propName) !== discriminantType; });
-                }
-                return type;
-            }
-            function narrowTypeBySwitchOnDiscriminant(type, switchStatement, clauseStart, clauseEnd) {
-                // We have switch statement with property access expression
-                if (!isMatchingReference(reference, switchStatement.expression.expression)) {
-                    return type;
-                }
-                var propName = switchStatement.expression.name.text;
-                var propType = getTypeOfPropertyOfType(type, propName);
-                if (!propType || !isStringLiteralUnionType(propType)) {
-                    return type;
-                }
-                var switchTypes = getSwitchClauseTypes(switchStatement);
-                if (!switchTypes.length) {
-                    return type;
-                }
-                var clauseTypes = switchTypes.slice(clauseStart, clauseEnd);
-                var hasDefaultClause = clauseStart === clauseEnd || ts.contains(clauseTypes, undefined);
-                var caseTypes = hasDefaultClause ? ts.filter(clauseTypes, function (t) { return !!t; }) : clauseTypes;
-                var discriminantType = caseTypes.length ? getUnionType(caseTypes) : undefined;
-                var caseType = discriminantType && filterType(type, function (t) { return isTypeComparableTo(discriminantType, getTypeOfPropertyOfType(t, propName)); });
-                if (!hasDefaultClause) {
-                    return caseType;
-                }
-                var defaultType = filterType(type, function (t) { return !eachTypeContainedIn(getTypeOfPropertyOfType(t, propName), switchTypes); });
-                return caseType ? getUnionType([caseType, defaultType]) : defaultType;
-            }
-            function narrowTypeByInstanceof(type, expr, assumeTrue) {
-                var left = getReferenceFromExpression(expr.left);
-                if (!isMatchingReference(reference, left)) {
-                    // For a reference of the form 'x.y', an 'x instanceof T' type guard resets the
-                    // narrowed type of 'y' to its declared type.
-                    if (containsMatchingReference(reference, left)) {
-                        return declaredType;
-                    }
-                    return type;
-                }
-                // We never narrow type any in an instanceof guard
-                if (isTypeAny(type)) {
-                    return type;
-                }
-                // Check that right operand is a function type with a prototype property
-                var rightType = checkExpression(expr.right);
-                if (!isTypeSubtypeOf(rightType, globalFunctionType)) {
-                    return type;
-                }
-                var targetType;
-                var prototypeProperty = getPropertyOfType(rightType, "prototype");
-                if (prototypeProperty) {
-                    // Target type is type of the prototype property
-                    var prototypePropertyType = getTypeOfSymbol(prototypeProperty);
-                    if (!isTypeAny(prototypePropertyType)) {
-                        targetType = prototypePropertyType;
-                    }
-                }
-                if (!targetType) {
-                    // Target type is type of construct signature
-                    var constructSignatures = void 0;
-                    if (rightType.flags & 2048 /* Interface */) {
-                        constructSignatures = resolveDeclaredMembers(rightType).declaredConstructSignatures;
-                    }
-                    else if (rightType.flags & 65536 /* Anonymous */) {
-                        constructSignatures = getSignaturesOfType(rightType, 1 /* Construct */);
-                    }
-                    if (constructSignatures && constructSignatures.length) {
-                        targetType = getUnionType(ts.map(constructSignatures, function (signature) { return getReturnTypeOfSignature(getErasedSignature(signature)); }));
-                    }
-                }
-                if (targetType) {
-                    return getNarrowedType(type, targetType, assumeTrue);
-                }
-                return type;
-            }
-            function getNarrowedType(type, candidate, assumeTrue) {
-                if (!assumeTrue) {
-                    return type.flags & 16384 /* Union */ ?
-                        getUnionType(ts.filter(type.types, function (t) { return !isTypeSubtypeOf(t, candidate); })) :
-                        type;
-                }
-                // If the current type is a union type, remove all constituents that aren't assignable to
-                // the candidate type. If one or more constituents remain, return a union of those.
-                if (type.flags & 16384 /* Union */) {
-                    var assignableConstituents = ts.filter(type.types, function (t) { return isTypeAssignableTo(t, candidate); });
-                    if (assignableConstituents.length) {
-                        return getUnionType(assignableConstituents);
-                    }
-                }
-                // If the candidate type is assignable to the target type, narrow to the candidate type.
-                // Otherwise, if the current type is assignable to the candidate, keep the current type.
-                // Otherwise, the types are completely unrelated, so narrow to the empty type.
-                var targetType = type.flags & 512 /* TypeParameter */ ? getApparentType(type) : type;
-                return isTypeAssignableTo(candidate, targetType) ? candidate :
-                    isTypeAssignableTo(type, candidate) ? type :
-                        getIntersectionType([type, candidate]);
-            }
-            function narrowTypeByTypePredicate(type, callExpression, assumeTrue) {
-                if (type.flags & 1 /* Any */ || !hasMatchingArgument(callExpression, reference)) {
-                    return type;
-                }
-                var signature = getResolvedSignature(callExpression);
-                var predicate = signature.typePredicate;
-                if (!predicate) {
-                    return type;
-                }
-                if (ts.isIdentifierTypePredicate(predicate)) {
-                    var predicateArgument = callExpression.arguments[predicate.parameterIndex];
-                    if (predicateArgument) {
-                        if (isMatchingReference(reference, predicateArgument)) {
-                            return getNarrowedType(type, predicate.type, assumeTrue);
-                        }
-                        if (containsMatchingReference(reference, predicateArgument)) {
-                            return declaredType;
-                        }
-                    }
-                }
-                else {
-                    var invokedExpression = skipParenthesizedNodes(callExpression.expression);
-                    if (invokedExpression.kind === 173 /* ElementAccessExpression */ || invokedExpression.kind === 172 /* PropertyAccessExpression */) {
-                        var accessExpression = invokedExpression;
-                        var possibleReference = skipParenthesizedNodes(accessExpression.expression);
-                        if (isMatchingReference(reference, possibleReference)) {
-                            return getNarrowedType(type, predicate.type, assumeTrue);
-                        }
-                        if (containsMatchingReference(reference, possibleReference)) {
-                            return declaredType;
-                        }
-                    }
-                }
-                return type;
-            }
-            // Narrow the given type based on the given expression having the assumed boolean value. The returned type
-            // will be a subtype or the same type as the argument.
-            function narrowType(type, expr, assumeTrue) {
-                switch (expr.kind) {
-                    case 69 /* Identifier */:
-                    case 97 /* ThisKeyword */:
-                    case 172 /* PropertyAccessExpression */:
-                        return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 174 /* CallExpression */:
-                        return narrowTypeByTypePredicate(type, expr, assumeTrue);
-                    case 178 /* ParenthesizedExpression */:
-                        return narrowType(type, expr.expression, assumeTrue);
-                    case 187 /* BinaryExpression */:
-                        return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 185 /* PrefixUnaryExpression */:
-                        if (expr.operator === 49 /* ExclamationToken */) {
-                            return narrowType(type, expr.operand, !assumeTrue);
-                        }
-                        break;
-                }
-                return type;
-            }
-        }
-        function getTypeOfSymbolAtLocation(symbol, location) {
-            // If we have an identifier or a property access at the given location, if the location is
-            // an dotted name expression, and if the location is not an assignment target, obtain the type
-            // of the expression (which will reflect control flow analysis). If the expression indeed
-            // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 69 /* Identifier */) {
-                if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
-                    location = location.parent;
-                }
-                if (ts.isExpression(location) && !ts.isAssignmentTarget(location)) {
-                    var type = checkExpression(location);
-                    if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
-                        return type;
-                    }
-                }
-            }
-            // The location isn't a reference to the given symbol, meaning we're being asked
-            // a hypothetical question of what type the symbol would have if there was a reference
-            // to it at the given location. Since we have no control flow information for the
-            // hypotherical reference (control flow information is created and attached by the
-            // binder), we simply return the declared type of the symbol.
-            return getTypeOfSymbol(symbol);
-        }
-        function skipParenthesizedNodes(expression) {
-            while (expression.kind === 178 /* ParenthesizedExpression */) {
-                expression = expression.expression;
-            }
-            return expression;
-        }
-        function getControlFlowContainer(node) {
-            while (true) {
-                node = node.parent;
-                if (ts.isFunctionLike(node) || node.kind === 226 /* ModuleBlock */ || node.kind === 256 /* SourceFile */ || node.kind === 145 /* PropertyDeclaration */) {
-                    return node;
-                }
-            }
-        }
-        function isDeclarationIncludedInFlow(reference, declaration, includeOuterFunctions) {
-            var declarationContainer = getControlFlowContainer(declaration);
-            var container = getControlFlowContainer(reference);
-            while (container !== declarationContainer &&
-                (container.kind === 179 /* FunctionExpression */ || container.kind === 180 /* ArrowFunction */) &&
-                (includeOuterFunctions || ts.getImmediatelyInvokedFunctionExpression(container))) {
-                container = getControlFlowContainer(container);
-            }
-            return container === declarationContainer;
-        }
-        function checkIdentifier(node) {
-            var symbol = getResolvedSymbol(node);
-            // As noted in ECMAScript 6 language spec, arrow functions never have an arguments objects.
-            // Although in down-level emit of arrow function, we emit it using function expression which means that
-            // arguments objects will be bound to the inner object; emitting arrow function natively in ES6, arguments objects
-            // will be bound to non-arrow function that contain this arrow function. This results in inconsistent behavior.
-            // To avoid that we will give an error to users if they use arguments objects in arrow function so that they
-            // can explicitly bound arguments objects
-            if (symbol === argumentsSymbol) {
-                var container = ts.getContainingFunction(node);
-                if (container.kind === 180 /* ArrowFunction */) {
-                    if (languageVersion < 2 /* ES6 */) {
-                        error(node, ts.Diagnostics.The_arguments_object_cannot_be_referenced_in_an_arrow_function_in_ES3_and_ES5_Consider_using_a_standard_function_expression);
-                    }
-                }
-                if (node.flags & 33554432 /* AwaitContext */) {
-                    getNodeLinks(container).flags |= 8192 /* CaptureArguments */;
-                }
-            }
-            if (symbol.flags & 8388608 /* Alias */ && !isInTypeQuery(node) && !isConstEnumOrConstEnumOnlyModule(resolveAlias(symbol))) {
-                markAliasSymbolAsReferenced(symbol);
-            }
-            var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
-            // Due to the emit for class decorators, any reference to the class from inside of the class body
-            // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
-            // behavior of class names in ES6.
-            if (languageVersion === 2 /* ES6 */
-                && localOrExportSymbol.flags & 32 /* Class */
-                && localOrExportSymbol.valueDeclaration.kind === 221 /* ClassDeclaration */
-                && ts.nodeIsDecorated(localOrExportSymbol.valueDeclaration)) {
-                var container = ts.getContainingClass(node);
-                while (container !== undefined) {
-                    if (container === localOrExportSymbol.valueDeclaration && container.name !== node) {
-                        getNodeLinks(container).flags |= 524288 /* ClassWithBodyScopedClassBinding */;
-                        getNodeLinks(node).flags |= 1048576 /* BodyScopedClassBinding */;
-                        break;
-                    }
-                    container = ts.getContainingClass(container);
-                }
-            }
-            checkCollisionWithCapturedSuperVariable(node, node);
-            checkCollisionWithCapturedThisVariable(node, node);
-            checkNestedBlockScopedBinding(node, symbol);
-            var type = getTypeOfSymbol(localOrExportSymbol);
-            if (!(localOrExportSymbol.flags & 3 /* Variable */) || ts.isAssignmentTarget(node)) {
-                return type;
-            }
-            var declaration = localOrExportSymbol.valueDeclaration;
-            var includeOuterFunctions = isReadonlySymbol(localOrExportSymbol);
-            var assumeInitialized = !strictNullChecks || (type.flags & 1 /* Any */) !== 0 || !declaration ||
-                ts.getRootDeclaration(declaration).kind === 142 /* Parameter */ || ts.isInAmbientContext(declaration) ||
-                !isDeclarationIncludedInFlow(node, declaration, includeOuterFunctions);
-            var flowType = getFlowTypeOfReference(node, type, assumeInitialized, includeOuterFunctions);
-            if (!assumeInitialized && !(getCombinedTypeFlags(type) & 32 /* Undefined */) && getCombinedTypeFlags(flowType) & 32 /* Undefined */) {
-                error(node, ts.Diagnostics.Variable_0_is_used_before_being_assigned, symbolToString(symbol));
-                // Return the declared type to reduce follow-on errors
-                return type;
-            }
-            return flowType;
-        }
-        function isInsideFunction(node, threshold) {
-            var current = node;
-            while (current && current !== threshold) {
-                if (ts.isFunctionLike(current)) {
-                    return true;
-                }
-                current = current.parent;
-            }
-            return false;
-        }
-        function checkNestedBlockScopedBinding(node, symbol) {
-            if (languageVersion >= 2 /* ES6 */ ||
-                (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
-                symbol.valueDeclaration.parent.kind === 252 /* CatchClause */) {
-                return;
-            }
-            // 1. walk from the use site up to the declaration and check
-            // if there is anything function like between declaration and use-site (is binding/class is captured in function).
-            // 2. walk from the declaration up to the boundary of lexical environment and check
-            // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
-            var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-            var usedInFunction = isInsideFunction(node.parent, container);
-            var current = container;
-            var containedInIterationStatement = false;
-            while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
-                    containedInIterationStatement = true;
-                    break;
-                }
-                current = current.parent;
-            }
-            if (containedInIterationStatement) {
-                if (usedInFunction) {
-                    // mark iteration statement as containing block-scoped binding captured in some function
-                    getNodeLinks(current).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
-                }
-                // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
-                // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
-                if (container.kind === 206 /* ForStatement */ &&
-                    ts.getAncestor(symbol.valueDeclaration, 219 /* VariableDeclarationList */).parent === container &&
-                    isAssignedInBodyOfForStatement(node, container)) {
-                    getNodeLinks(symbol.valueDeclaration).flags |= 2097152 /* NeedsLoopOutParameter */;
-                }
-                // set 'declared inside loop' bit on the block-scoped binding
-                getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* BlockScopedBindingInLoop */;
-            }
-            if (usedInFunction) {
-                getNodeLinks(symbol.valueDeclaration).flags |= 131072 /* CapturedBlockScopedBinding */;
-            }
-        }
-        function isAssignedInBodyOfForStatement(node, container) {
-            var current = node;
-            // skip parenthesized nodes
-            while (current.parent.kind === 178 /* ParenthesizedExpression */) {
-                current = current.parent;
-            }
-            // check if node is used as LHS in some assignment expression
-            var isAssigned = false;
-            if (ts.isAssignmentTarget(current)) {
-                isAssigned = true;
-            }
-            else if ((current.parent.kind === 185 /* PrefixUnaryExpression */ || current.parent.kind === 186 /* PostfixUnaryExpression */)) {
-                var expr = current.parent;
-                isAssigned = expr.operator === 41 /* PlusPlusToken */ || expr.operator === 42 /* MinusMinusToken */;
-            }
-            if (!isAssigned) {
-                return false;
-            }
-            // at this point we know that node is the target of assignment
-            // now check that modification happens inside the statement part of the ForStatement
-            while (current !== container) {
-                if (current === container.statement) {
-                    return true;
-                }
-                else {
-                    current = current.parent;
-                }
-            }
-            return false;
-        }
-        function captureLexicalThis(node, container) {
-            getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 145 /* PropertyDeclaration */ || container.kind === 148 /* Constructor */) {
-                var classNode = container.parent;
-                getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
-            }
-            else {
-                getNodeLinks(container).flags |= 4 /* CaptureThis */;
-            }
-        }
-        function findFirstSuperCall(n) {
-            if (ts.isSuperCallExpression(n)) {
-                return n;
-            }
-            else if (ts.isFunctionLike(n)) {
-                return undefined;
-            }
-            return ts.forEachChild(n, findFirstSuperCall);
-        }
-        /**
-         * Return a cached result if super-statement is already found.
-         * Otherwise, find a super statement in a given constructor function and cache the result in the node-links of the constructor
-         *
-         * @param constructor constructor-function to look for super statement
-         */
-        function getSuperCallInConstructor(constructor) {
-            var links = getNodeLinks(constructor);
-            // Only trying to find super-call if we haven't yet tried to find one.  Once we try, we will record the result
-            if (links.hasSuperCall === undefined) {
-                links.superCall = findFirstSuperCall(constructor.body);
-                links.hasSuperCall = links.superCall ? true : false;
-            }
-            return links.superCall;
-        }
-        /**
-         * Check if the given class-declaration extends null then return true.
-         * Otherwise, return false
-         * @param classDecl a class declaration to check if it extends null
-         */
-        function classDeclarationExtendsNull(classDecl) {
-            var classSymbol = getSymbolOfNode(classDecl);
-            var classInstanceType = getDeclaredTypeOfSymbol(classSymbol);
-            var baseConstructorType = getBaseConstructorTypeOfClass(classInstanceType);
-            return baseConstructorType === nullWideningType;
-        }
-        function checkThisExpression(node) {
-            // Stop at the first arrow function so that we can
-            // tell whether 'this' needs to be captured.
-            var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
-            var needToCaptureLexicalThis = false;
-            if (container.kind === 148 /* Constructor */) {
-                var containingClassDecl = container.parent;
-                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(containingClassDecl);
-                // If a containing class does not have extends clause or the class extends null
-                // skip checking whether super statement is called before "this" accessing.
-                if (baseTypeNode && !classDeclarationExtendsNull(containingClassDecl)) {
-                    var superCall = getSuperCallInConstructor(container);
-                    // We should give an error in the following cases:
-                    //      - No super-call
-                    //      - "this" is accessing before super-call.
-                    //          i.e super(this)
-                    //              this.x; super();
-                    // We want to make sure that super-call is done before accessing "this" so that
-                    // "this" is not accessed as a parameter of the super-call.
-                    if (!superCall || superCall.end > node.pos) {
-                        // In ES6, super inside constructor of class-declaration has to precede "this" accessing
-                        error(node, ts.Diagnostics.super_must_be_called_before_accessing_this_in_the_constructor_of_a_derived_class);
-                    }
-                }
-            }
-            // Now skip arrow functions to get the "real" owner of 'this'.
-            if (container.kind === 180 /* ArrowFunction */) {
-                container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
-                // When targeting es6, arrow function lexically bind "this" so we do not need to do the work of binding "this" in emitted code
-                needToCaptureLexicalThis = (languageVersion < 2 /* ES6 */);
-            }
-            switch (container.kind) {
-                case 225 /* ModuleDeclaration */:
-                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_module_or_namespace_body);
-                    // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
-                    break;
-                case 224 /* EnumDeclaration */:
-                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
-                    // do not return here so in case if lexical this is captured - it will be reflected in flags on NodeLinks
-                    break;
-                case 148 /* Constructor */:
-                    if (isInConstructorArgumentInitializer(node, container)) {
-                        error(node, ts.Diagnostics.this_cannot_be_referenced_in_constructor_arguments);
-                    }
-                    break;
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    if (container.flags & 32 /* Static */) {
-                        error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_static_property_initializer);
-                    }
-                    break;
-                case 140 /* ComputedPropertyName */:
-                    error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
-                    break;
-            }
-            if (needToCaptureLexicalThis) {
-                captureLexicalThis(node, container);
-            }
-            if (ts.isFunctionLike(container) &&
-                (!isInParameterInitializerBeforeContainingFunction(node) || getFunctionLikeThisParameter(container))) {
-                // Note: a parameter initializer should refer to class-this unless function-this is explicitly annotated.
-                // If this is a function in a JS file, it might be a class method. Check if it's the RHS
-                // of a x.prototype.y = function [name]() { .... }
-                if (container.kind === 179 /* FunctionExpression */ &&
-                    ts.isInJavaScriptFile(container.parent) &&
-                    ts.getSpecialPropertyAssignmentKind(container.parent) === 3 /* PrototypeProperty */) {
-                    // Get the 'x' of 'x.prototype.y = f' (here, 'f' is 'container')
-                    var className = container.parent // x.prototype.y = f
-                        .left // x.prototype.y
-                        .expression // x.prototype
-                        .expression; // x
-                    var classSymbol = checkExpression(className).symbol;
-                    if (classSymbol && classSymbol.members && (classSymbol.flags & 16 /* Function */)) {
-                        return getInferredClassType(classSymbol);
-                    }
-                }
-                var type = getContextuallyTypedThisType(container);
-                if (type) {
-                    return type;
-                }
-                var thisType = getThisTypeOfDeclaration(container);
-                if (thisType) {
-                    return thisType;
-                }
-            }
-            if (ts.isClassLike(container.parent)) {
-                var symbol = getSymbolOfNode(container.parent);
-                var type = container.flags & 32 /* Static */ ? getTypeOfSymbol(symbol) : getDeclaredTypeOfSymbol(symbol).thisType;
-                return getFlowTypeOfReference(node, type, /*assumeInitialized*/ true, /*includeOuterFunctions*/ true);
-            }
-            if (ts.isInJavaScriptFile(node)) {
-                var type = getTypeForThisExpressionFromJSDoc(container);
-                if (type && type !== unknownType) {
-                    return type;
-                }
-            }
-            if (compilerOptions.noImplicitThis) {
-                // With noImplicitThis, functions may not reference 'this' if it has type 'any'
-                error(node, ts.Diagnostics.this_implicitly_has_type_any_because_it_does_not_have_a_type_annotation);
-            }
-            return anyType;
-        }
-        function getTypeForThisExpressionFromJSDoc(node) {
-            var typeTag = ts.getJSDocTypeTag(node);
-            if (typeTag && typeTag.typeExpression && typeTag.typeExpression.type && typeTag.typeExpression.type.kind === 269 /* JSDocFunctionType */) {
-                var jsDocFunctionType = typeTag.typeExpression.type;
-                if (jsDocFunctionType.parameters.length > 0 && jsDocFunctionType.parameters[0].type.kind === 272 /* JSDocThisType */) {
-                    return getTypeFromTypeNode(jsDocFunctionType.parameters[0].type);
-                }
-            }
-        }
-        function isInConstructorArgumentInitializer(node, constructorDecl) {
-            for (var n = node; n && n !== constructorDecl; n = n.parent) {
-                if (n.kind === 142 /* Parameter */) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 174 /* CallExpression */ && node.parent.expression === node;
-            var container = ts.getSuperContainer(node, /*stopOnFunctions*/ true);
-            var needToCaptureLexicalThis = false;
-            if (!isCallExpression) {
-                // adjust the container reference in case if super is used inside arrow functions with arbitrary deep nesting
-                while (container && container.kind === 180 /* ArrowFunction */) {
-                    container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
-                    needToCaptureLexicalThis = languageVersion < 2 /* ES6 */;
-                }
-            }
-            var canUseSuperExpression = isLegalUsageOfSuperExpression(container);
-            var nodeCheckFlag = 0;
-            if (!canUseSuperExpression) {
-                // issue more specific error if super is used in computed property name
-                // class A { foo() { return "1" }}
-                // class B {
-                //     [super.foo()]() {}
-                // }
-                var current = node;
-                while (current && current !== container && current.kind !== 140 /* ComputedPropertyName */) {
-                    current = current.parent;
-                }
-                if (current && current.kind === 140 /* ComputedPropertyName */) {
-                    error(node, ts.Diagnostics.super_cannot_be_referenced_in_a_computed_property_name);
-                }
-                else if (isCallExpression) {
-                    error(node, ts.Diagnostics.Super_calls_are_not_permitted_outside_constructors_or_in_nested_functions_inside_constructors);
-                }
-                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 171 /* ObjectLiteralExpression */)) {
-                    error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
-                }
-                else {
-                    error(node, ts.Diagnostics.super_property_access_is_permitted_only_in_a_constructor_member_function_or_member_accessor_of_a_derived_class);
-                }
-                return unknownType;
-            }
-            if ((container.flags & 32 /* Static */) || isCallExpression) {
-                nodeCheckFlag = 512 /* SuperStatic */;
-            }
-            else {
-                nodeCheckFlag = 256 /* SuperInstance */;
-            }
-            getNodeLinks(node).flags |= nodeCheckFlag;
-            // Due to how we emit async functions, we need to specialize the emit for an async method that contains a `super` reference.
-            // This is due to the fact that we emit the body of an async function inside of a generator function. As generator
-            // functions cannot reference `super`, we emit a helper inside of the method body, but outside of the generator. This helper
-            // uses an arrow function, which is permitted to reference `super`.
-            //
-            // There are two primary ways we can access `super` from within an async method. The first is getting the value of a property
-            // or indexed access on super, either as part of a right-hand-side expression or call expression. The second is when setting the value
-            // of a property or indexed access, either as part of an assignment expression or destructuring assignment.
-            //
-            // The simplest case is reading a value, in which case we will emit something like the following:
-            //
-            //  // ts
-            //  ...
-            //  async asyncMethod() {
-            //    let x = await super.asyncMethod();
-            //    return x;
-            //  }
-            //  ...
-            //
-            //  // js
-            //  ...
-            //  asyncMethod() {
-            //      const _super = name => super[name];
-            //      return __awaiter(this, arguments, Promise, function *() {
-            //          let x = yield _super("asyncMethod").call(this);
-            //          return x;
-            //      });
-            //  }
-            //  ...
-            //
-            // The more complex case is when we wish to assign a value, especially as part of a destructuring assignment. As both cases
-            // are legal in ES6, but also likely less frequent, we emit the same more complex helper for both scenarios:
-            //
-            //  // ts
-            //  ...
-            //  async asyncMethod(ar: Promise<any[]>) {
-            //      [super.a, super.b] = await ar;
-            //  }
-            //  ...
-            //
-            //  // js
-            //  ...
-            //  asyncMethod(ar) {
-            //      const _super = (function (geti, seti) {
-            //          const cache = Object.create(null);
-            //          return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });
-            //      })(name => super[name], (name, value) => super[name] = value);
-            //      return __awaiter(this, arguments, Promise, function *() {
-            //          [_super("a").value, _super("b").value] = yield ar;
-            //      });
-            //  }
-            //  ...
-            //
-            // This helper creates an object with a "value" property that wraps the `super` property or indexed access for both get and set.
-            // This is required for destructuring assignments, as a call expression cannot be used as the target of a destructuring assignment
-            // while a property access can.
-            if (container.kind === 147 /* MethodDeclaration */ && container.flags & 256 /* Async */) {
-                if (ts.isSuperPropertyOrElementAccess(node.parent) && ts.isAssignmentTarget(node.parent)) {
-                    getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
-                }
-                else {
-                    getNodeLinks(container).flags |= 2048 /* AsyncMethodWithSuper */;
-                }
-            }
-            if (needToCaptureLexicalThis) {
-                // call expressions are allowed only in constructors so they should always capture correct 'this'
-                // super property access expressions can also appear in arrow functions -
-                // in this case they should also use correct lexical this
-                captureLexicalThis(node.parent, container);
-            }
-            if (container.parent.kind === 171 /* ObjectLiteralExpression */) {
-                if (languageVersion < 2 /* ES6 */) {
-                    error(node, ts.Diagnostics.super_is_only_allowed_in_members_of_object_literal_expressions_when_option_target_is_ES2015_or_higher);
-                    return unknownType;
-                }
-                else {
-                    // for object literal assume that type of 'super' is 'any'
-                    return anyType;
-                }
-            }
-            // at this point the only legal case for parent is ClassLikeDeclaration
-            var classLikeDeclaration = container.parent;
-            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(classLikeDeclaration));
-            var baseClassType = classType && getBaseTypes(classType)[0];
-            if (!baseClassType) {
-                if (!ts.getClassExtendsHeritageClauseElement(classLikeDeclaration)) {
-                    error(node, ts.Diagnostics.super_can_only_be_referenced_in_a_derived_class);
-                }
-                return unknownType;
-            }
-            if (container.kind === 148 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
-                // issue custom error message for super property access in constructor arguments (to be aligned with old compiler)
-                error(node, ts.Diagnostics.super_cannot_be_referenced_in_constructor_arguments);
-                return unknownType;
-            }
-            return nodeCheckFlag === 512 /* SuperStatic */
-                ? getBaseConstructorTypeOfClass(classType)
-                : getTypeWithThisArgument(baseClassType, classType.thisType);
-            function isLegalUsageOfSuperExpression(container) {
-                if (!container) {
-                    return false;
-                }
-                if (isCallExpression) {
-                    // TS 1.0 SPEC (April 2014): 4.8.1
-                    // Super calls are only permitted in constructors of derived classes
-                    return container.kind === 148 /* Constructor */;
-                }
-                else {
-                    // TS 1.0 SPEC (April 2014)
-                    // 'super' property access is allowed
-                    // - In a constructor, instance member function, instance member accessor, or instance member variable initializer where this references a derived class instance
-                    // - In a static member function or static member accessor
-                    // topmost container must be something that is directly nested in the class declaration\object literal expression
-                    if (ts.isClassLike(container.parent) || container.parent.kind === 171 /* ObjectLiteralExpression */) {
-                        if (container.flags & 32 /* Static */) {
-                            return container.kind === 147 /* MethodDeclaration */ ||
-                                container.kind === 146 /* MethodSignature */ ||
-                                container.kind === 149 /* GetAccessor */ ||
-                                container.kind === 150 /* SetAccessor */;
-                        }
-                        else {
-                            return container.kind === 147 /* MethodDeclaration */ ||
-                                container.kind === 146 /* MethodSignature */ ||
-                                container.kind === 149 /* GetAccessor */ ||
-                                container.kind === 150 /* SetAccessor */ ||
-                                container.kind === 145 /* PropertyDeclaration */ ||
-                                container.kind === 144 /* PropertySignature */ ||
-                                container.kind === 148 /* Constructor */;
-                        }
-                    }
-                }
-                return false;
-            }
-        }
-        function getContextuallyTypedThisType(func) {
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func) && func.kind !== 180 /* ArrowFunction */) {
-                var contextualSignature = getContextualSignature(func);
-                if (contextualSignature) {
-                    return getThisTypeOfSignature(contextualSignature);
-                }
-            }
-            return undefined;
-        }
-        // Return contextual type of parameter or undefined if no contextual type is available
-        function getContextuallyTypedParameterType(parameter) {
-            var func = parameter.parent;
-            if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
-                var iife = ts.getImmediatelyInvokedFunctionExpression(func);
-                if (iife) {
-                    var indexOfParameter = ts.indexOf(func.parameters, parameter);
-                    if (iife.arguments && indexOfParameter < iife.arguments.length) {
-                        if (parameter.dotDotDotToken) {
-                            var restTypes = [];
-                            for (var i = indexOfParameter; i < iife.arguments.length; i++) {
-                                restTypes.push(getTypeOfExpression(iife.arguments[i]));
-                            }
-                            return createArrayType(getUnionType(restTypes));
-                        }
-                        var links = getNodeLinks(iife);
-                        var cached = links.resolvedSignature;
-                        links.resolvedSignature = anySignature;
-                        var type = checkExpression(iife.arguments[indexOfParameter]);
-                        links.resolvedSignature = cached;
-                        return type;
-                    }
-                }
-                var contextualSignature = getContextualSignature(func);
-                if (contextualSignature) {
-                    var funcHasRestParameters = ts.hasRestParameter(func);
-                    var len = func.parameters.length - (funcHasRestParameters ? 1 : 0);
-                    var indexOfParameter = ts.indexOf(func.parameters, parameter);
-                    if (indexOfParameter < len) {
-                        return getTypeAtPosition(contextualSignature, indexOfParameter);
-                    }
-                    // If last parameter is contextually rest parameter get its type
-                    if (funcHasRestParameters &&
-                        indexOfParameter === (func.parameters.length - 1) &&
-                        isRestParameterIndex(contextualSignature, func.parameters.length - 1)) {
-                        return getTypeOfSymbol(ts.lastOrUndefined(contextualSignature.parameters));
-                    }
-                }
-            }
-            return undefined;
-        }
-        // In a variable, parameter or property declaration with a type annotation,
-        //   the contextual type of an initializer expression is the type of the variable, parameter or property.
-        // Otherwise, in a parameter declaration of a contextually typed function expression,
-        //   the contextual type of an initializer expression is the contextual type of the parameter.
-        // Otherwise, in a variable or parameter declaration with a binding pattern name,
-        //   the contextual type of an initializer expression is the type implied by the binding pattern.
-        // Otherwise, in a binding pattern inside a variable or parameter declaration,
-        //   the contextual type of an initializer expression is the type annotation of the containing declaration, if present.
-        function getContextualTypeForInitializerExpression(node) {
-            var declaration = node.parent;
-            if (node === declaration.initializer) {
-                if (declaration.type) {
-                    return getTypeFromTypeNode(declaration.type);
-                }
-                if (declaration.kind === 142 /* Parameter */) {
-                    var type = getContextuallyTypedParameterType(declaration);
-                    if (type) {
-                        return type;
-                    }
-                }
-                if (ts.isBindingPattern(declaration.name)) {
-                    return getTypeFromBindingPattern(declaration.name, /*includePatternInType*/ true);
-                }
-                if (ts.isBindingPattern(declaration.parent)) {
-                    var parentDeclaration = declaration.parent.parent;
-                    var name_12 = declaration.propertyName || declaration.name;
-                    if (ts.isVariableLike(parentDeclaration) &&
-                        parentDeclaration.type &&
-                        !ts.isBindingPattern(name_12)) {
-                        var text = getTextOfPropertyName(name_12);
-                        if (text) {
-                            return getTypeOfPropertyOfType(getTypeFromTypeNode(parentDeclaration.type), text);
-                        }
-                    }
-                }
-            }
-            return undefined;
-        }
-        function getContextualTypeForReturnExpression(node) {
-            var func = ts.getContainingFunction(node);
-            if (ts.isAsyncFunctionLike(func)) {
-                var contextualReturnType = getContextualReturnType(func);
-                if (contextualReturnType) {
-                    return getPromisedType(contextualReturnType);
-                }
-                return undefined;
-            }
-            if (func && !func.asteriskToken) {
-                return getContextualReturnType(func);
-            }
-            return undefined;
-        }
-        function getContextualTypeForYieldOperand(node) {
-            var func = ts.getContainingFunction(node);
-            if (func) {
-                var contextualReturnType = getContextualReturnType(func);
-                if (contextualReturnType) {
-                    return node.asteriskToken
-                        ? contextualReturnType
-                        : getElementTypeOfIterableIterator(contextualReturnType);
-                }
-            }
-            return undefined;
-        }
-        function isInParameterInitializerBeforeContainingFunction(node) {
-            while (node.parent && !ts.isFunctionLike(node.parent)) {
-                if (node.parent.kind === 142 /* Parameter */ && node.parent.initializer === node) {
-                    return true;
-                }
-                node = node.parent;
-            }
-            return false;
-        }
-        function getContextualReturnType(functionDecl) {
-            // If the containing function has a return type annotation, is a constructor, or is a get accessor whose
-            // corresponding set accessor has a type annotation, return statements in the function are contextually typed
-            if (functionDecl.type ||
-                functionDecl.kind === 148 /* Constructor */ ||
-                functionDecl.kind === 149 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(functionDecl.symbol, 150 /* SetAccessor */))) {
-                return getReturnTypeOfSignature(getSignatureFromDeclaration(functionDecl));
-            }
-            // Otherwise, if the containing function is contextually typed by a function type with exactly one call signature
-            // and that call signature is non-generic, return statements are contextually typed by the return type of the signature
-            var signature = getContextualSignatureForFunctionLikeDeclaration(functionDecl);
-            if (signature) {
-                return getReturnTypeOfSignature(signature);
-            }
-            return undefined;
-        }
-        // In a typed function call, an argument or substitution expression is contextually typed by the type of the corresponding parameter.
-        function getContextualTypeForArgument(callTarget, arg) {
-            var args = getEffectiveCallArguments(callTarget);
-            var argIndex = ts.indexOf(args, arg);
-            if (argIndex >= 0) {
-                var signature = getResolvedOrAnySignature(callTarget);
-                return getTypeAtPosition(signature, argIndex);
-            }
-            return undefined;
-        }
-        function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 176 /* TaggedTemplateExpression */) {
-                return getContextualTypeForArgument(template.parent, substitutionExpression);
-            }
-            return undefined;
-        }
-        function getContextualTypeForBinaryOperand(node) {
-            var binaryExpression = node.parent;
-            var operator = binaryExpression.operatorToken.kind;
-            if (operator >= 56 /* FirstAssignment */ && operator <= 68 /* LastAssignment */) {
-                // In an assignment expression, the right operand is contextually typed by the type of the left operand.
-                if (node === binaryExpression.right) {
-                    return checkExpression(binaryExpression.left);
-                }
-            }
-            else if (operator === 52 /* BarBarToken */) {
-                // When an || expression has a contextual type, the operands are contextually typed by that type. When an ||
-                // expression has no contextual type, the right operand is contextually typed by the type of the left operand.
-                var type = getContextualType(binaryExpression);
-                if (!type && node === binaryExpression.right) {
-                    type = checkExpression(binaryExpression.left);
-                }
-                return type;
-            }
-            else if (operator === 51 /* AmpersandAmpersandToken */ || operator === 24 /* CommaToken */) {
-                if (node === binaryExpression.right) {
-                    return getContextualType(binaryExpression);
-                }
-            }
-            return undefined;
-        }
-        // Apply a mapping function to a contextual type and return the resulting type. If the contextual type
-        // is a union type, the mapping function is applied to each constituent type and a union of the resulting
-        // types is returned.
-        function applyToContextualType(type, mapper) {
-            if (!(type.flags & 16384 /* Union */)) {
-                return mapper(type);
-            }
-            var types = type.types;
-            var mappedType;
-            var mappedTypes;
-            for (var _i = 0, types_8 = types; _i < types_8.length; _i++) {
-                var current = types_8[_i];
-                var t = mapper(current);
-                if (t) {
-                    if (!mappedType) {
-                        mappedType = t;
-                    }
-                    else if (!mappedTypes) {
-                        mappedTypes = [mappedType, t];
-                    }
-                    else {
-                        mappedTypes.push(t);
-                    }
-                }
-            }
-            return mappedTypes ? getUnionType(mappedTypes) : mappedType;
-        }
-        function getTypeOfPropertyOfContextualType(type, name) {
-            return applyToContextualType(type, function (t) {
-                var prop = t.flags & 130048 /* StructuredType */ ? getPropertyOfType(t, name) : undefined;
-                return prop ? getTypeOfSymbol(prop) : undefined;
-            });
-        }
-        function getIndexTypeOfContextualType(type, kind) {
-            return applyToContextualType(type, function (t) { return getIndexTypeOfStructuredType(t, kind); });
-        }
-        // Return true if the given contextual type is a tuple-like type
-        function contextualTypeIsTupleLikeType(type) {
-            return !!(type.flags & 16384 /* Union */ ? ts.forEach(type.types, isTupleLikeType) : isTupleLikeType(type));
-        }
-        // In an object literal contextually typed by a type T, the contextual type of a property assignment is the type of
-        // the matching property in T, if one exists. Otherwise, it is the type of the numeric index signature in T, if one
-        // exists. Otherwise, it is the type of the string index signature in T, if one exists.
-        function getContextualTypeForObjectLiteralMethod(node) {
-            ts.Debug.assert(ts.isObjectLiteralMethod(node));
-            if (isInsideWithStatementBody(node)) {
-                // We cannot answer semantic questions within a with block, do not proceed any further
-                return undefined;
-            }
-            return getContextualTypeForObjectLiteralElement(node);
-        }
-        function getContextualTypeForObjectLiteralElement(element) {
-            var objectLiteral = element.parent;
-            var type = getApparentTypeOfContextualType(objectLiteral);
-            if (type) {
-                if (!ts.hasDynamicName(element)) {
-                    // For a (non-symbol) computed property, there is no reason to look up the name
-                    // in the type. It will just be "__computed", which does not appear in any
-                    // SymbolTable.
-                    var symbolName = getSymbolOfNode(element).name;
-                    var propertyType = getTypeOfPropertyOfContextualType(type, symbolName);
-                    if (propertyType) {
-                        return propertyType;
-                    }
-                }
-                return isNumericName(element.name) && getIndexTypeOfContextualType(type, 1 /* Number */) ||
-                    getIndexTypeOfContextualType(type, 0 /* String */);
-            }
-            return undefined;
-        }
-        // In an array literal contextually typed by a type T, the contextual type of an element expression at index N is
-        // the type of the property with the numeric name N in T, if one exists. Otherwise, if T has a numeric index signature,
-        // it is the type of the numeric index signature in T. Otherwise, in ES6 and higher, the contextual type is the iterated
-        // type of T.
-        function getContextualTypeForElementExpression(node) {
-            var arrayLiteral = node.parent;
-            var type = getApparentTypeOfContextualType(arrayLiteral);
-            if (type) {
-                var index = ts.indexOf(arrayLiteral.elements, node);
-                return getTypeOfPropertyOfContextualType(type, "" + index)
-                    || getIndexTypeOfContextualType(type, 1 /* Number */)
-                    || (languageVersion >= 2 /* ES6 */ ? getElementTypeOfIterable(type, /*errorNode*/ undefined) : undefined);
-            }
-            return undefined;
-        }
-        // In a contextually typed conditional expression, the true/false expressions are contextually typed by the same type.
-        function getContextualTypeForConditionalOperand(node) {
-            var conditional = node.parent;
-            return node === conditional.whenTrue || node === conditional.whenFalse ? getContextualType(conditional) : undefined;
-        }
-        function getContextualTypeForJsxAttribute(attribute) {
-            var kind = attribute.kind;
-            var jsxElement = attribute.parent;
-            var attrsType = getJsxElementAttributesType(jsxElement);
-            if (attribute.kind === 246 /* JsxAttribute */) {
-                if (!attrsType || isTypeAny(attrsType)) {
-                    return undefined;
-                }
-                return getTypeOfPropertyOfType(attrsType, attribute.name.text);
-            }
-            else if (attribute.kind === 247 /* JsxSpreadAttribute */) {
-                return attrsType;
-            }
-            ts.Debug.fail("Expected JsxAttribute or JsxSpreadAttribute, got ts.SyntaxKind[" + kind + "]");
-        }
-        // Return the contextual type for a given expression node. During overload resolution, a contextual type may temporarily
-        // be "pushed" onto a node using the contextualType property.
-        function getApparentTypeOfContextualType(node) {
-            var type = getContextualType(node);
-            return type && getApparentType(type);
-        }
-        /**
-         * Woah! Do you really want to use this function?
-         *
-         * Unless you're trying to get the *non-apparent* type for a
-         * value-literal type or you're authoring relevant portions of this algorithm,
-         * you probably meant to use 'getApparentTypeOfContextualType'.
-         * Otherwise this may not be very useful.
-         *
-         * In cases where you *are* working on this function, you should understand
-         * when it is appropriate to use 'getContextualType' and 'getApparentTypeOfContextualType'.
-         *
-         *   - Use 'getContextualType' when you are simply going to propagate the result to the expression.
-         *   - Use 'getApparentTypeOfContextualType' when you're going to need the members of the type.
-         *
-         * @param node the expression whose contextual type will be returned.
-         * @returns the contextual type of an expression.
-         */
-        function getContextualType(node) {
-            if (isInsideWithStatementBody(node)) {
-                // We cannot answer semantic questions within a with block, do not proceed any further
-                return undefined;
-            }
-            if (node.contextualType) {
-                return node.contextualType;
-            }
-            var parent = node.parent;
-            switch (parent.kind) {
-                case 218 /* VariableDeclaration */:
-                case 142 /* Parameter */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 169 /* BindingElement */:
-                    return getContextualTypeForInitializerExpression(node);
-                case 180 /* ArrowFunction */:
-                case 211 /* ReturnStatement */:
-                    return getContextualTypeForReturnExpression(node);
-                case 190 /* YieldExpression */:
-                    return getContextualTypeForYieldOperand(parent);
-                case 174 /* CallExpression */:
-                case 175 /* NewExpression */:
-                    return getContextualTypeForArgument(parent, node);
-                case 177 /* TypeAssertionExpression */:
-                case 195 /* AsExpression */:
-                    return getTypeFromTypeNode(parent.type);
-                case 187 /* BinaryExpression */:
-                    return getContextualTypeForBinaryOperand(node);
-                case 253 /* PropertyAssignment */:
-                    return getContextualTypeForObjectLiteralElement(parent);
-                case 170 /* ArrayLiteralExpression */:
-                    return getContextualTypeForElementExpression(node);
-                case 188 /* ConditionalExpression */:
-                    return getContextualTypeForConditionalOperand(node);
-                case 197 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 189 /* TemplateExpression */);
-                    return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 178 /* ParenthesizedExpression */:
-                    return getContextualType(parent);
-                case 248 /* JsxExpression */:
-                    return getContextualType(parent);
-                case 246 /* JsxAttribute */:
-                case 247 /* JsxSpreadAttribute */:
-                    return getContextualTypeForJsxAttribute(parent);
-            }
-            return undefined;
-        }
-        // If the given type is an object or union type, if that type has a single signature, and if
-        // that signature is non-generic, return the signature. Otherwise return undefined.
-        function getNonGenericSignature(type) {
-            var signatures = getSignaturesOfStructuredType(type, 0 /* Call */);
-            if (signatures.length === 1) {
-                var signature = signatures[0];
-                if (!signature.typeParameters) {
-                    return signature;
-                }
-            }
-        }
-        function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 179 /* FunctionExpression */ || node.kind === 180 /* ArrowFunction */;
-        }
-        function getContextualSignatureForFunctionLikeDeclaration(node) {
-            // Only function expressions, arrow functions, and object literal methods are contextually typed.
-            return isFunctionExpressionOrArrowFunction(node) || ts.isObjectLiteralMethod(node)
-                ? getContextualSignature(node)
-                : undefined;
-        }
-        function getContextualTypeForFunctionLikeDeclaration(node) {
-            return ts.isObjectLiteralMethod(node) ?
-                getContextualTypeForObjectLiteralMethod(node) :
-                getApparentTypeOfContextualType(node);
-        }
-        // Return the contextual signature for a given expression node. A contextual type provides a
-        // contextual signature if it has a single call signature and if that call signature is non-generic.
-        // If the contextual type is a union type, get the signature from each type possible and if they are
-        // all identical ignoring their return type, the result is same signature but with return type as
-        // union type of return types from these signatures
-        function getContextualSignature(node) {
-            ts.Debug.assert(node.kind !== 147 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
-            var type = getContextualTypeForFunctionLikeDeclaration(node);
-            if (!type) {
-                return undefined;
-            }
-            if (!(type.flags & 16384 /* Union */)) {
-                return getNonGenericSignature(type);
-            }
-            var signatureList;
-            var types = type.types;
-            for (var _i = 0, types_9 = types; _i < types_9.length; _i++) {
-                var current = types_9[_i];
-                var signature = getNonGenericSignature(current);
-                if (signature) {
-                    if (!signatureList) {
-                        // This signature will contribute to contextual union signature
-                        signatureList = [signature];
-                    }
-                    else if (!compareSignaturesIdentical(signatureList[0], signature, /*partialMatch*/ false, /*ignoreThisTypes*/ true, /*ignoreReturnTypes*/ true, compareTypesIdentical)) {
-                        // Signatures aren't identical, do not use
-                        return undefined;
-                    }
-                    else {
-                        // Use this signature for contextual union signature
-                        signatureList.push(signature);
-                    }
-                }
-            }
-            // Result is union of signatures collected (return type is union of return types of this signature set)
-            var result;
-            if (signatureList) {
-                result = cloneSignature(signatureList[0]);
-                // Clear resolved return type we possibly got from cloneSignature
-                result.resolvedReturnType = undefined;
-                result.unionSignatures = signatureList;
-            }
-            return result;
-        }
-        /**
-         * Detect if the mapper implies an inference context. Specifically, there are 4 possible values
-         * for a mapper. Let's go through each one of them:
-         *
-         *    1. undefined - this means we are not doing inferential typing, but we may do contextual typing,
-         *       which could cause us to assign a parameter a type
-         *    2. identityMapper - means we want to avoid assigning a parameter a type, whether or not we are in
-         *       inferential typing (context is undefined for the identityMapper)
-         *    3. a mapper created by createInferenceMapper - we are doing inferential typing, we want to assign
-         *       types to parameters and fix type parameters (context is defined)
-         *    4. an instantiation mapper created by createTypeMapper or createTypeEraser - this should never be
-         *       passed as the contextual mapper when checking an expression (context is undefined for these)
-         *
-         * isInferentialContext is detecting if we are in case 3
-         */
-        function isInferentialContext(mapper) {
-            return mapper && mapper.context;
-        }
-        function checkSpreadElementExpression(node, contextualMapper) {
-            // It is usually not safe to call checkExpressionCached if we can be contextually typing.
-            // You can tell that we are contextually typing because of the contextualMapper parameter.
-            // While it is true that a spread element can have a contextual type, it does not do anything
-            // with this type. It is neither affected by it, nor does it propagate it to its operand.
-            // So the fact that contextualMapper is passed is not important, because the operand of a spread
-            // element is not contextually typed.
-            var arrayOrIterableType = checkExpressionCached(node.expression, contextualMapper);
-            return checkIteratedTypeOrElementType(arrayOrIterableType, node.expression, /*allowStringInput*/ false);
-        }
-        function hasDefaultValue(node) {
-            return (node.kind === 169 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 187 /* BinaryExpression */ && node.operatorToken.kind === 56 /* EqualsToken */);
-        }
-        function checkArrayLiteral(node, contextualMapper) {
-            var elements = node.elements;
-            var hasSpreadElement = false;
-            var elementTypes = [];
-            var inDestructuringPattern = ts.isAssignmentTarget(node);
-            for (var _i = 0, elements_1 = elements; _i < elements_1.length; _i++) {
-                var e = elements_1[_i];
-                if (inDestructuringPattern && e.kind === 191 /* SpreadElementExpression */) {
-                    // Given the following situation:
-                    //    var c: {};
-                    //    [...c] = ["", 0];
-                    //
-                    // c is represented in the tree as a spread element in an array literal.
-                    // But c really functions as a rest element, and its purpose is to provide
-                    // a contextual type for the right hand side of the assignment. Therefore,
-                    // instead of calling checkExpression on "...c", which will give an error
-                    // if c is not iterable/array-like, we need to act as if we are trying to
-                    // get the contextual element type from it. So we do something similar to
-                    // getContextualTypeForElementExpression, which will crucially not error
-                    // if there is no index type / iterated type.
-                    var restArrayType = checkExpression(e.expression, contextualMapper);
-                    var restElementType = getIndexTypeOfType(restArrayType, 1 /* Number */) ||
-                        (languageVersion >= 2 /* ES6 */ ? getElementTypeOfIterable(restArrayType, /*errorNode*/ undefined) : undefined);
-                    if (restElementType) {
-                        elementTypes.push(restElementType);
-                    }
-                }
-                else {
-                    var type = checkExpression(e, contextualMapper);
-                    elementTypes.push(type);
-                }
-                hasSpreadElement = hasSpreadElement || e.kind === 191 /* SpreadElementExpression */;
-            }
-            if (!hasSpreadElement) {
-                // If array literal is actually a destructuring pattern, mark it as an implied type. We do this such
-                // that we get the same behavior for "var [x, y] = []" and "[x, y] = []".
-                if (inDestructuringPattern && elementTypes.length) {
-                    var type = createNewTupleType(elementTypes);
-                    type.pattern = node;
-                    return type;
-                }
-                var contextualType = getApparentTypeOfContextualType(node);
-                if (contextualType && contextualTypeIsTupleLikeType(contextualType)) {
-                    var pattern = contextualType.pattern;
-                    // If array literal is contextually typed by a binding pattern or an assignment pattern, pad the resulting
-                    // tuple type with the corresponding binding or assignment element types to make the lengths equal.
-                    if (pattern && (pattern.kind === 168 /* ArrayBindingPattern */ || pattern.kind === 170 /* ArrayLiteralExpression */)) {
-                        var patternElements = pattern.elements;
-                        for (var i = elementTypes.length; i < patternElements.length; i++) {
-                            var patternElement = patternElements[i];
-                            if (hasDefaultValue(patternElement)) {
-                                elementTypes.push(contextualType.elementTypes[i]);
-                            }
-                            else {
-                                if (patternElement.kind !== 193 /* OmittedExpression */) {
-                                    error(patternElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                                }
-                                elementTypes.push(unknownType);
-                            }
-                        }
-                    }
-                    if (elementTypes.length) {
-                        return createTupleType(elementTypes);
-                    }
-                }
-            }
-            return createArrayType(elementTypes.length ? getUnionType(elementTypes) : strictNullChecks ? neverType : undefinedWideningType);
-        }
-        function isNumericName(name) {
-            return name.kind === 140 /* ComputedPropertyName */ ? isNumericComputedName(name) : isNumericLiteralName(name.text);
-        }
-        function isNumericComputedName(name) {
-            // It seems odd to consider an expression of type Any to result in a numeric name,
-            // but this behavior is consistent with checkIndexedAccess
-            return isTypeAnyOrAllConstituentTypesHaveKind(checkComputedPropertyName(name), 132 /* NumberLike */);
-        }
-        function isTypeAnyOrAllConstituentTypesHaveKind(type, kind) {
-            return isTypeAny(type) || isTypeOfKind(type, kind);
-        }
-        function isNumericLiteralName(name) {
-            // The intent of numeric names is that
-            //     - they are names with text in a numeric form, and that
-            //     - setting properties/indexing with them is always equivalent to doing so with the numeric literal 'numLit',
-            //         acquired by applying the abstract 'ToNumber' operation on the name's text.
-            //
-            // The subtlety is in the latter portion, as we cannot reliably say that anything that looks like a numeric literal is a numeric name.
-            // In fact, it is the case that the text of the name must be equal to 'ToString(numLit)' for this to hold.
-            //
-            // Consider the property name '"0xF00D"'. When one indexes with '0xF00D', they are actually indexing with the value of 'ToString(0xF00D)'
-            // according to the ECMAScript specification, so it is actually as if the user indexed with the string '"61453"'.
-            // Thus, the text of all numeric literals equivalent to '61543' such as '0xF00D', '0xf00D', '0170015', etc. are not valid numeric names
-            // because their 'ToString' representation is not equal to their original text.
-            // This is motivated by ECMA-262 sections 9.3.1, 9.8.1, 11.1.5, and 11.2.1.
-            //
-            // Here, we test whether 'ToString(ToNumber(name))' is exactly equal to 'name'.
-            // The '+' prefix operator is equivalent here to applying the abstract ToNumber operation.
-            // Applying the 'toString()' method on a number gives us the abstract ToString operation on a number.
-            //
-            // Note that this accepts the values 'Infinity', '-Infinity', and 'NaN', and that this is intentional.
-            // This is desired behavior, because when indexing with them as numeric entities, you are indexing
-            // with the strings '"Infinity"', '"-Infinity"', and '"NaN"' respectively.
-            return (+name).toString() === name;
-        }
-        function checkComputedPropertyName(node) {
-            var links = getNodeLinks(node.expression);
-            if (!links.resolvedType) {
-                links.resolvedType = checkExpression(node.expression);
-                // This will allow types number, string, symbol or any. It will also allow enums, the unknown
-                // type, and any union of these types (like string | number).
-                if (!isTypeAnyOrAllConstituentTypesHaveKind(links.resolvedType, 132 /* NumberLike */ | 258 /* StringLike */ | 16777216 /* ESSymbol */)) {
-                    error(node, ts.Diagnostics.A_computed_property_name_must_be_of_type_string_number_symbol_or_any);
-                }
-                else {
-                    checkThatExpressionIsProperSymbolReference(node.expression, links.resolvedType, /*reportError*/ true);
-                }
-            }
-            return links.resolvedType;
-        }
-        function getObjectLiteralIndexInfo(node, properties, kind) {
-            var propTypes = [];
-            for (var i = 0; i < properties.length; i++) {
-                if (kind === 0 /* String */ || isNumericName(node.properties[i].name)) {
-                    propTypes.push(getTypeOfSymbol(properties[i]));
-                }
-            }
-            var unionType = propTypes.length ? getUnionType(propTypes) : undefinedType;
-            return createIndexInfo(unionType, /*isReadonly*/ false);
-        }
-        function checkObjectLiteral(node, contextualMapper) {
-            var inDestructuringPattern = ts.isAssignmentTarget(node);
-            // Grammar checking
-            checkGrammarObjectLiteralExpression(node, inDestructuringPattern);
-            var propertiesTable = {};
-            var propertiesArray = [];
-            var contextualType = getApparentTypeOfContextualType(node);
-            var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 167 /* ObjectBindingPattern */ || contextualType.pattern.kind === 171 /* ObjectLiteralExpression */);
-            var typeFlags = 0;
-            var patternWithComputedProperties = false;
-            var hasComputedStringProperty = false;
-            var hasComputedNumberProperty = false;
-            for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                var memberDecl = _a[_i];
-                var member = memberDecl.symbol;
-                if (memberDecl.kind === 253 /* PropertyAssignment */ ||
-                    memberDecl.kind === 254 /* ShorthandPropertyAssignment */ ||
-                    ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = void 0;
-                    if (memberDecl.kind === 253 /* PropertyAssignment */) {
-                        type = checkPropertyAssignment(memberDecl, contextualMapper);
-                    }
-                    else if (memberDecl.kind === 147 /* MethodDeclaration */) {
-                        type = checkObjectLiteralMethod(memberDecl, contextualMapper);
-                    }
-                    else {
-                        ts.Debug.assert(memberDecl.kind === 254 /* ShorthandPropertyAssignment */);
-                        type = checkExpression(memberDecl.name, contextualMapper);
-                    }
-                    typeFlags |= type.flags;
-                    var prop = createSymbol(4 /* Property */ | 67108864 /* Transient */ | member.flags, member.name);
-                    if (inDestructuringPattern) {
-                        // If object literal is an assignment pattern and if the assignment pattern specifies a default value
-                        // for the property, make the property optional.
-                        var isOptional = (memberDecl.kind === 253 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 254 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
-                        if (isOptional) {
-                            prop.flags |= 536870912 /* Optional */;
-                        }
-                        if (ts.hasDynamicName(memberDecl)) {
-                            patternWithComputedProperties = true;
-                        }
-                    }
-                    else if (contextualTypeHasPattern && !(contextualType.flags & 67108864 /* ObjectLiteralPatternWithComputedProperties */)) {
-                        // If object literal is contextually typed by the implied type of a binding pattern, and if the
-                        // binding pattern specifies a default value for the property, make the property optional.
-                        var impliedProp = getPropertyOfType(contextualType, member.name);
-                        if (impliedProp) {
-                            prop.flags |= impliedProp.flags & 536870912 /* Optional */;
-                        }
-                        else if (!compilerOptions.suppressExcessPropertyErrors) {
-                            error(memberDecl.name, ts.Diagnostics.Object_literal_may_only_specify_known_properties_and_0_does_not_exist_in_type_1, symbolToString(member), typeToString(contextualType));
-                        }
-                    }
-                    prop.declarations = member.declarations;
-                    prop.parent = member.parent;
-                    if (member.valueDeclaration) {
-                        prop.valueDeclaration = member.valueDeclaration;
-                    }
-                    prop.type = type;
-                    prop.target = member;
-                    member = prop;
-                }
-                else {
-                    // TypeScript 1.0 spec (April 2014)
-                    // A get accessor declaration is processed in the same manner as
-                    // an ordinary function declaration(section 6.1) with no parameters.
-                    // A set accessor declaration is processed in the same manner
-                    // as an ordinary function declaration with a single parameter and a Void return type.
-                    ts.Debug.assert(memberDecl.kind === 149 /* GetAccessor */ || memberDecl.kind === 150 /* SetAccessor */);
-                    checkAccessorDeclaration(memberDecl);
-                }
-                if (ts.hasDynamicName(memberDecl)) {
-                    if (isNumericName(memberDecl.name)) {
-                        hasComputedNumberProperty = true;
-                    }
-                    else {
-                        hasComputedStringProperty = true;
-                    }
-                }
-                else {
-                    propertiesTable[member.name] = member;
-                }
-                propertiesArray.push(member);
-            }
-            // If object literal is contextually typed by the implied type of a binding pattern, augment the result
-            // type with those properties for which the binding pattern specifies a default value.
-            if (contextualTypeHasPattern) {
-                for (var _b = 0, _c = getPropertiesOfType(contextualType); _b < _c.length; _b++) {
-                    var prop = _c[_b];
-                    if (!ts.hasProperty(propertiesTable, prop.name)) {
-                        if (!(prop.flags & 536870912 /* Optional */)) {
-                            error(prop.valueDeclaration || prop.bindingElement, ts.Diagnostics.Initializer_provides_no_value_for_this_binding_element_and_the_binding_element_has_no_default_value);
-                        }
-                        propertiesTable[prop.name] = prop;
-                        propertiesArray.push(prop);
-                    }
-                }
-            }
-            var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 0 /* String */) : undefined;
-            var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, propertiesArray, 1 /* Number */) : undefined;
-            var result = createAnonymousType(node.symbol, propertiesTable, emptyArray, emptyArray, stringIndexInfo, numberIndexInfo);
-            var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 1048576 /* FreshObjectLiteral */;
-            result.flags |= 524288 /* ObjectLiteral */ | 4194304 /* ContainsObjectLiteral */ | freshObjectLiteralFlag | (typeFlags & 14680064 /* PropagatingFlags */) | (patternWithComputedProperties ? 67108864 /* ObjectLiteralPatternWithComputedProperties */ : 0);
-            if (inDestructuringPattern) {
-                result.pattern = node;
-            }
-            return result;
-        }
-        function checkJsxSelfClosingElement(node) {
-            checkJsxOpeningLikeElement(node);
-            return jsxElementType || anyType;
-        }
-        function checkJsxElement(node) {
-            // Check attributes
-            checkJsxOpeningLikeElement(node.openingElement);
-            // Perform resolution on the closing tag so that rename/go to definition/etc work
-            if (isJsxIntrinsicIdentifier(node.closingElement.tagName)) {
-                getIntrinsicTagSymbol(node.closingElement);
-            }
-            else {
-                checkExpression(node.closingElement.tagName);
-            }
-            // Check children
-            for (var _i = 0, _a = node.children; _i < _a.length; _i++) {
-                var child = _a[_i];
-                switch (child.kind) {
-                    case 248 /* JsxExpression */:
-                        checkJsxExpression(child);
-                        break;
-                    case 241 /* JsxElement */:
-                        checkJsxElement(child);
-                        break;
-                    case 242 /* JsxSelfClosingElement */:
-                        checkJsxSelfClosingElement(child);
-                        break;
-                }
-            }
-            return jsxElementType || anyType;
-        }
-        /**
-         * Returns true iff the JSX element name would be a valid JS identifier, ignoring restrictions about keywords not being identifiers
-         */
-        function isUnhyphenatedJsxName(name) {
-            // - is the only character supported in JSX attribute names that isn't valid in JavaScript identifiers
-            return name.indexOf("-") < 0;
-        }
-        /**
-         * Returns true iff React would emit this tag name as a string rather than an identifier or qualified name
-         */
-        function isJsxIntrinsicIdentifier(tagName) {
-            // TODO (yuisu): comment
-            if (tagName.kind === 172 /* PropertyAccessExpression */ || tagName.kind === 97 /* ThisKeyword */) {
-                return false;
-            }
-            else {
-                return ts.isIntrinsicJsxName(tagName.text);
-            }
-        }
-        function checkJsxAttribute(node, elementAttributesType, nameTable) {
-            var correspondingPropType = undefined;
-            // Look up the corresponding property for this attribute
-            if (elementAttributesType === emptyObjectType && isUnhyphenatedJsxName(node.name.text)) {
-                // If there is no 'props' property, you may not have non-"data-" attributes
-                error(node.parent, ts.Diagnostics.JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property, getJsxElementPropertiesName());
-            }
-            else if (elementAttributesType && !isTypeAny(elementAttributesType)) {
-                var correspondingPropSymbol = getPropertyOfType(elementAttributesType, node.name.text);
-                correspondingPropType = correspondingPropSymbol && getTypeOfSymbol(correspondingPropSymbol);
-                if (isUnhyphenatedJsxName(node.name.text)) {
-                    // Maybe there's a string indexer?
-                    var indexerType = getIndexTypeOfType(elementAttributesType, 0 /* String */);
-                    if (indexerType) {
-                        correspondingPropType = indexerType;
-                    }
-                    else {
-                        // If there's no corresponding property with this name, error
-                        if (!correspondingPropType) {
-                            error(node.name, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.name.text, typeToString(elementAttributesType));
-                            return unknownType;
-                        }
-                    }
-                }
-            }
-            var exprType;
-            if (node.initializer) {
-                exprType = checkExpression(node.initializer);
-            }
-            else {
-                // <Elem attr /> is sugar for <Elem attr={true} />
-                exprType = booleanType;
-            }
-            if (correspondingPropType) {
-                checkTypeAssignableTo(exprType, correspondingPropType, node);
-            }
-            nameTable[node.name.text] = true;
-            return exprType;
-        }
-        function checkJsxSpreadAttribute(node, elementAttributesType, nameTable) {
-            var type = checkExpression(node.expression);
-            var props = getPropertiesOfType(type);
-            for (var _i = 0, props_2 = props; _i < props_2.length; _i++) {
-                var prop = props_2[_i];
-                // Is there a corresponding property in the element attributes type? Skip checking of properties
-                // that have already been assigned to, as these are not actually pushed into the resulting type
-                if (!nameTable[prop.name]) {
-                    var targetPropSym = getPropertyOfType(elementAttributesType, prop.name);
-                    if (targetPropSym) {
-                        var msg = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property, prop.name);
-                        checkTypeAssignableTo(getTypeOfSymbol(prop), getTypeOfSymbol(targetPropSym), node, undefined, msg);
-                    }
-                    nameTable[prop.name] = true;
-                }
-            }
-            return type;
-        }
-        function getJsxType(name) {
-            if (jsxTypes[name] === undefined) {
-                return jsxTypes[name] = getExportedTypeFromNamespace(JsxNames.JSX, name) || unknownType;
-            }
-            return jsxTypes[name];
-        }
-        /**
-          * Looks up an intrinsic tag name and returns a symbol that either points to an intrinsic
-          * property (in which case nodeLinks.jsxFlags will be IntrinsicNamedElement) or an intrinsic
-          * string index signature (in which case nodeLinks.jsxFlags will be IntrinsicIndexedElement).
-          * May also return unknownSymbol if both of these lookups fail.
-          */
-        function getIntrinsicTagSymbol(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedSymbol) {
-                var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
-                if (intrinsicElementsType !== unknownType) {
-                    // Property case
-                    var intrinsicProp = getPropertyOfType(intrinsicElementsType, node.tagName.text);
-                    if (intrinsicProp) {
-                        links.jsxFlags |= 1 /* IntrinsicNamedElement */;
-                        return links.resolvedSymbol = intrinsicProp;
-                    }
-                    // Intrinsic string indexer case
-                    var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
-                    if (indexSignatureType) {
-                        links.jsxFlags |= 2 /* IntrinsicIndexedElement */;
-                        return links.resolvedSymbol = intrinsicElementsType.symbol;
-                    }
-                    // Wasn't found
-                    error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, node.tagName.text, "JSX." + JsxNames.IntrinsicElements);
-                    return links.resolvedSymbol = unknownSymbol;
-                }
-                else {
-                    if (compilerOptions.noImplicitAny) {
-                        error(node, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists, JsxNames.IntrinsicElements);
-                    }
-                    return links.resolvedSymbol = unknownSymbol;
-                }
-            }
-            return links.resolvedSymbol;
-        }
-        /**
-         * Given a JSX element that is a class element, finds the Element Instance Type. If the
-         * element is not a class element, or the class element type cannot be determined, returns 'undefined'.
-         * For example, in the element <MyClass>, the element instance type is `MyClass` (not `typeof MyClass`).
-         */
-        function getJsxElementInstanceType(node, valueType) {
-            ts.Debug.assert(!(valueType.flags & 16384 /* Union */));
-            if (isTypeAny(valueType)) {
-                // Short-circuit if the class tag is using an element type 'any'
-                return anyType;
-            }
-            // Resolve the signatures, preferring constructor
-            var signatures = getSignaturesOfType(valueType, 1 /* Construct */);
-            if (signatures.length === 0) {
-                // No construct signatures, try call signatures
-                signatures = getSignaturesOfType(valueType, 0 /* Call */);
-                if (signatures.length === 0) {
-                    // We found no signatures at all, which is an error
-                    error(node.tagName, ts.Diagnostics.JSX_element_type_0_does_not_have_any_construct_or_call_signatures, ts.getTextOfNode(node.tagName));
-                    return unknownType;
-                }
-            }
-            return getUnionType(signatures.map(getReturnTypeOfSignature));
-        }
-        /// e.g. "props" for React.d.ts,
-        /// or 'undefined' if ElementAttributesProperty doesn't exist (which means all
-        ///     non-intrinsic elements' attributes type is 'any'),
-        /// or '' if it has 0 properties (which means every
-        ///     non-intrinsic elements' attributes type is the element instance type)
-        function getJsxElementPropertiesName() {
-            // JSX
-            var jsxNamespace = getGlobalSymbol(JsxNames.JSX, 1536 /* Namespace */, /*diagnosticMessage*/ undefined);
-            // JSX.ElementAttributesProperty [symbol]
-            var attribsPropTypeSym = jsxNamespace && getSymbol(jsxNamespace.exports, JsxNames.ElementAttributesPropertyNameContainer, 793056 /* Type */);
-            // JSX.ElementAttributesProperty [type]
-            var attribPropType = attribsPropTypeSym && getDeclaredTypeOfSymbol(attribsPropTypeSym);
-            // The properties of JSX.ElementAttributesProperty
-            var attribProperties = attribPropType && getPropertiesOfType(attribPropType);
-            if (attribProperties) {
-                // Element Attributes has zero properties, so the element attributes type will be the class instance type
-                if (attribProperties.length === 0) {
-                    return "";
-                }
-                else if (attribProperties.length === 1) {
-                    return attribProperties[0].name;
-                }
-                else {
-                    error(attribsPropTypeSym.declarations[0], ts.Diagnostics.The_global_type_JSX_0_may_not_have_more_than_one_property, JsxNames.ElementAttributesPropertyNameContainer);
-                    return undefined;
-                }
-            }
-            else {
-                // No interface exists, so the element attributes type will be an implicit any
-                return undefined;
-            }
-        }
-        /**
-         * Given React element instance type and the class type, resolve the Jsx type
-         * Pass elemType to handle individual type in the union typed element type.
-         */
-        function getResolvedJsxType(node, elemType, elemClassType) {
-            if (!elemType) {
-                elemType = checkExpression(node.tagName);
-            }
-            if (elemType.flags & 16384 /* Union */) {
-                var types = elemType.types;
-                return getUnionType(types.map(function (type) {
-                    return getResolvedJsxType(node, type, elemClassType);
-                }));
-            }
-            // If the elemType is a string type, we have to return anyType to prevent an error downstream as we will try to find construct or call signature of the type
-            if (elemType.flags & 2 /* String */) {
-                return anyType;
-            }
-            else if (elemType.flags & 256 /* StringLiteral */) {
-                // If the elemType is a stringLiteral type, we can then provide a check to make sure that the string literal type is one of the Jsx intrinsic element type
-                var intrinsicElementsType = getJsxType(JsxNames.IntrinsicElements);
-                if (intrinsicElementsType !== unknownType) {
-                    var stringLiteralTypeName = elemType.text;
-                    var intrinsicProp = getPropertyOfType(intrinsicElementsType, stringLiteralTypeName);
-                    if (intrinsicProp) {
-                        return getTypeOfSymbol(intrinsicProp);
-                    }
-                    var indexSignatureType = getIndexTypeOfType(intrinsicElementsType, 0 /* String */);
-                    if (indexSignatureType) {
-                        return indexSignatureType;
-                    }
-                    error(node, ts.Diagnostics.Property_0_does_not_exist_on_type_1, stringLiteralTypeName, "JSX." + JsxNames.IntrinsicElements);
-                }
-                // If we need to report an error, we already done so here. So just return any to prevent any more error downstream
-                return anyType;
-            }
-            // Get the element instance type (the result of newing or invoking this tag)
-            var elemInstanceType = getJsxElementInstanceType(node, elemType);
-            if (!elemClassType || !isTypeAssignableTo(elemInstanceType, elemClassType)) {
-                // Is this is a stateless function component? See if its single signature's return type is
-                // assignable to the JSX Element Type
-                if (jsxElementType) {
-                    var callSignatures = elemType && getSignaturesOfType(elemType, 0 /* Call */);
-                    var callSignature = callSignatures && callSignatures.length > 0 && callSignatures[0];
-                    var callReturnType = callSignature && getReturnTypeOfSignature(callSignature);
-                    var paramType = callReturnType && (callSignature.parameters.length === 0 ? emptyObjectType : getTypeOfSymbol(callSignature.parameters[0]));
-                    if (callReturnType && isTypeAssignableTo(callReturnType, jsxElementType)) {
-                        // Intersect in JSX.IntrinsicAttributes if it exists
-                        var intrinsicAttributes = getJsxType(JsxNames.IntrinsicAttributes);
-                        if (intrinsicAttributes !== unknownType) {
-                            paramType = intersectTypes(intrinsicAttributes, paramType);
-                        }
-                        return paramType;
-                    }
-                }
-            }
-            // Issue an error if this return type isn't assignable to JSX.ElementClass
-            if (elemClassType) {
-                checkTypeRelatedTo(elemInstanceType, elemClassType, assignableRelation, node, ts.Diagnostics.JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements);
-            }
-            if (isTypeAny(elemInstanceType)) {
-                return elemInstanceType;
-            }
-            var propsName = getJsxElementPropertiesName();
-            if (propsName === undefined) {
-                // There is no type ElementAttributesProperty, return 'any'
-                return anyType;
-            }
-            else if (propsName === "") {
-                // If there is no e.g. 'props' member in ElementAttributesProperty, use the element class type instead
-                return elemInstanceType;
-            }
-            else {
-                var attributesType = getTypeOfPropertyOfType(elemInstanceType, propsName);
-                if (!attributesType) {
-                    // There is no property named 'props' on this instance type
-                    return emptyObjectType;
-                }
-                else if (isTypeAny(attributesType) || (attributesType === unknownType)) {
-                    // Props is of type 'any' or unknown
-                    return attributesType;
-                }
-                else if (attributesType.flags & 16384 /* Union */) {
-                    // Props cannot be a union type
-                    error(node.tagName, ts.Diagnostics.JSX_element_attributes_type_0_may_not_be_a_union_type, typeToString(attributesType));
-                    return anyType;
-                }
-                else {
-                    // Normal case -- add in IntrinsicClassElements<T> and IntrinsicElements
-                    var apparentAttributesType = attributesType;
-                    var intrinsicClassAttribs = getJsxType(JsxNames.IntrinsicClassAttributes);
-                    if (intrinsicClassAttribs !== unknownType) {
-                        var typeParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(intrinsicClassAttribs.symbol);
-                        if (typeParams) {
-                            if (typeParams.length === 1) {
-                                apparentAttributesType = intersectTypes(createTypeReference(intrinsicClassAttribs, [elemInstanceType]), apparentAttributesType);
-                            }
-                        }
-                        else {
-                            apparentAttributesType = intersectTypes(attributesType, intrinsicClassAttribs);
-                        }
-                    }
-                    var intrinsicAttribs = getJsxType(JsxNames.IntrinsicAttributes);
-                    if (intrinsicAttribs !== unknownType) {
-                        apparentAttributesType = intersectTypes(intrinsicAttribs, apparentAttributesType);
-                    }
-                    return apparentAttributesType;
-                }
-            }
-        }
-        /**
-         * Given an opening/self-closing element, get the 'element attributes type', i.e. the type that tells
-         * us which attributes are valid on a given element.
-         */
-        function getJsxElementAttributesType(node) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedJsxType) {
-                if (isJsxIntrinsicIdentifier(node.tagName)) {
-                    var symbol = getIntrinsicTagSymbol(node);
-                    if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
-                        return links.resolvedJsxType = getTypeOfSymbol(symbol);
-                    }
-                    else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
-                        return links.resolvedJsxType = getIndexInfoOfSymbol(symbol, 0 /* String */).type;
-                    }
-                    else {
-                        return links.resolvedJsxType = unknownType;
-                    }
-                }
-                else {
-                    var elemClassType = getJsxGlobalElementClassType();
-                    return links.resolvedJsxType = getResolvedJsxType(node, undefined, elemClassType);
-                }
-            }
-            return links.resolvedJsxType;
-        }
-        /**
-         * Given a JSX attribute, returns the symbol for the corresponds property
-         * of the element attributes type. Will return unknownSymbol for attributes
-         * that have no matching element attributes type property.
-         */
-        function getJsxAttributePropertySymbol(attrib) {
-            var attributesType = getJsxElementAttributesType(attrib.parent);
-            var prop = getPropertyOfType(attributesType, attrib.name.text);
-            return prop || unknownSymbol;
-        }
-        function getJsxGlobalElementClassType() {
-            if (!jsxElementClassType) {
-                jsxElementClassType = getExportedTypeFromNamespace(JsxNames.JSX, JsxNames.ElementClass);
-            }
-            return jsxElementClassType;
-        }
-        /// Returns all the properties of the Jsx.IntrinsicElements interface
-        function getJsxIntrinsicTagNames() {
-            var intrinsics = getJsxType(JsxNames.IntrinsicElements);
-            return intrinsics ? getPropertiesOfType(intrinsics) : emptyArray;
-        }
-        function checkJsxPreconditions(errorNode) {
-            // Preconditions for using JSX
-            if ((compilerOptions.jsx || 0 /* None */) === 0 /* None */) {
-                error(errorNode, ts.Diagnostics.Cannot_use_JSX_unless_the_jsx_flag_is_provided);
-            }
-            if (jsxElementType === undefined) {
-                if (compilerOptions.noImplicitAny) {
-                    error(errorNode, ts.Diagnostics.JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist);
-                }
-            }
-        }
-        function checkJsxOpeningLikeElement(node) {
-            checkGrammarJsxElement(node);
-            checkJsxPreconditions(node);
-            // The reactNamespace symbol should be marked as 'used' so we don't incorrectly elide its import. And if there
-            // is no reactNamespace symbol in scope when targeting React emit, we should issue an error.
-            var reactRefErr = compilerOptions.jsx === 2 /* React */ ? ts.Diagnostics.Cannot_find_name_0 : undefined;
-            var reactNamespace = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
-            var reactSym = resolveName(node.tagName, reactNamespace, 107455 /* Value */, reactRefErr, reactNamespace);
-            if (reactSym) {
-                getSymbolLinks(reactSym).referenced = true;
-            }
-            var targetAttributesType = getJsxElementAttributesType(node);
-            var nameTable = {};
-            // Process this array in right-to-left order so we know which
-            // attributes (mostly from spreads) are being overwritten and
-            // thus should have their types ignored
-            var sawSpreadedAny = false;
-            for (var i = node.attributes.length - 1; i >= 0; i--) {
-                if (node.attributes[i].kind === 246 /* JsxAttribute */) {
-                    checkJsxAttribute((node.attributes[i]), targetAttributesType, nameTable);
-                }
-                else {
-                    ts.Debug.assert(node.attributes[i].kind === 247 /* JsxSpreadAttribute */);
-                    var spreadType = checkJsxSpreadAttribute((node.attributes[i]), targetAttributesType, nameTable);
-                    if (isTypeAny(spreadType)) {
-                        sawSpreadedAny = true;
-                    }
-                }
-            }
-            // Check that all required properties have been provided. If an 'any'
-            // was spreaded in, though, assume that it provided all required properties
-            if (targetAttributesType && !sawSpreadedAny) {
-                var targetProperties = getPropertiesOfType(targetAttributesType);
-                for (var i = 0; i < targetProperties.length; i++) {
-                    if (!(targetProperties[i].flags & 536870912 /* Optional */) &&
-                        nameTable[targetProperties[i].name] === undefined) {
-                        error(node, ts.Diagnostics.Property_0_is_missing_in_type_1, targetProperties[i].name, typeToString(targetAttributesType));
-                    }
-                }
-            }
-        }
-        function checkJsxExpression(node) {
-            if (node.expression) {
-                return checkExpression(node.expression);
-            }
-            else {
-                return unknownType;
-            }
-        }
-        // If a symbol is a synthesized symbol with no value declaration, we assume it is a property. Example of this are the synthesized
-        // '.prototype' property as well as synthesized tuple index properties.
-        function getDeclarationKindFromSymbol(s) {
-            return s.valueDeclaration ? s.valueDeclaration.kind : 145 /* PropertyDeclaration */;
-        }
-        function getDeclarationFlagsFromSymbol(s) {
-            return s.valueDeclaration ? ts.getCombinedNodeFlags(s.valueDeclaration) : s.flags & 134217728 /* Prototype */ ? 4 /* Public */ | 32 /* Static */ : 0;
-        }
-        /**
-         * Check whether the requested property access is valid.
-         * Returns true if node is a valid property access, and false otherwise.
-         * @param node The node to be checked.
-         * @param left The left hand side of the property access (e.g.: the super in `super.foo`).
-         * @param type The type of left.
-         * @param prop The symbol for the right hand side of the property access.
-         */
-        function checkClassPropertyAccess(node, left, type, prop) {
-            var flags = getDeclarationFlagsFromSymbol(prop);
-            var declaringClass = getDeclaredTypeOfSymbol(getParentOfSymbol(prop));
-            var errorNode = node.kind === 172 /* PropertyAccessExpression */ || node.kind === 218 /* VariableDeclaration */ ?
-                node.name :
-                node.right;
-            if (left.kind === 95 /* SuperKeyword */) {
-                // TS 1.0 spec (April 2014): 4.8.2
-                // - In a constructor, instance member function, instance member accessor, or
-                //   instance member variable initializer where this references a derived class instance,
-                //   a super property access is permitted and must specify a public instance member function of the base class.
-                // - In a static member function or static member accessor
-                //   where this references the constructor function object of a derived class,
-                //   a super property access is permitted and must specify a public static member function of the base class.
-                if (languageVersion < 2 /* ES6 */ && getDeclarationKindFromSymbol(prop) !== 147 /* MethodDeclaration */) {
-                    // `prop` refers to a *property* declared in the super class
-                    // rather than a *method*, so it does not satisfy the above criteria.
-                    error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
-                    return false;
-                }
-                if (flags & 128 /* Abstract */) {
-                    // A method cannot be accessed in a super property access if the method is abstract.
-                    // This error could mask a private property access error. But, a member
-                    // cannot simultaneously be private and abstract, so this will trigger an
-                    // additional error elsewhere.
-                    error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(declaringClass));
-                    return false;
-                }
-            }
-            // Public properties are otherwise accessible.
-            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
-                return true;
-            }
-            // Property is known to be private or protected at this point
-            // Private property is accessible if the property is within the declaring class
-            if (flags & 8 /* Private */) {
-                var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
-                if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(declaringClass));
-                    return false;
-                }
-                return true;
-            }
-            // Property is known to be protected at this point
-            // All protected properties of a supertype are accessible in a super access
-            if (left.kind === 95 /* SuperKeyword */) {
-                return true;
-            }
-            // Get the enclosing class that has the declaring class as its base type
-            var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
-                var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
-                return hasBaseType(enclosingClass, declaringClass) ? enclosingClass : undefined;
-            });
-            // A protected property is accessible if the property is within the declaring class or classes derived from it
-            if (!enclosingClass) {
-                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(declaringClass));
-                return false;
-            }
-            // No further restrictions for static properties
-            if (flags & 32 /* Static */) {
-                return true;
-            }
-            // An instance property must be accessed through an instance of the enclosing class
-            if (type.flags & 33554432 /* ThisType */) {
-                // get the original type -- represented as the type constraint of the 'this' type
-                type = getConstraintOfTypeParameter(type);
-            }
-            // TODO: why is the first part of this check here?
-            if (!(getTargetType(type).flags & (1024 /* Class */ | 2048 /* Interface */) && hasBaseType(type, enclosingClass))) {
-                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
-                return false;
-            }
-            return true;
-        }
-        function checkNonNullExpression(node) {
-            var type = checkExpression(node);
-            if (strictNullChecks) {
-                var kind = getCombinedTypeFlags(type) & 96 /* Nullable */;
-                if (kind) {
-                    error(node, kind & 32 /* Undefined */ ? kind & 64 /* Null */ ?
-                        ts.Diagnostics.Object_is_possibly_null_or_undefined :
-                        ts.Diagnostics.Object_is_possibly_undefined :
-                        ts.Diagnostics.Object_is_possibly_null);
-                }
-                return getNonNullableType(type);
-            }
-            return type;
-        }
-        function checkPropertyAccessExpression(node) {
-            return checkPropertyAccessExpressionOrQualifiedName(node, node.expression, node.name);
-        }
-        function checkQualifiedName(node) {
-            return checkPropertyAccessExpressionOrQualifiedName(node, node.left, node.right);
-        }
-        function checkPropertyAccessExpressionOrQualifiedName(node, left, right) {
-            var type = checkNonNullExpression(left);
-            if (isTypeAny(type)) {
-                return type;
-            }
-            var apparentType = getApparentType(getWidenedType(type));
-            if (apparentType === unknownType || (type.flags & 512 /* TypeParameter */ && isTypeAny(apparentType))) {
-                // handle cases when type is Type parameter with invalid or any constraint
-                return apparentType;
-            }
-            var prop = getPropertyOfType(apparentType, right.text);
-            if (!prop) {
-                if (right.text && !checkAndReportErrorForExtendingInterface(node)) {
-                    error(right, ts.Diagnostics.Property_0_does_not_exist_on_type_1, ts.declarationNameToString(right), typeToString(type.flags & 33554432 /* ThisType */ ? apparentType : type));
-                }
-                return unknownType;
-            }
-            if (noUnusedIdentifiers &&
-                (prop.flags & 106500 /* ClassMember */) &&
-                prop.valueDeclaration && (prop.valueDeclaration.flags & 8 /* Private */)) {
-                if (prop.flags & 16777216 /* Instantiated */) {
-                    getSymbolLinks(prop).target.isReferenced = true;
-                }
-                else {
-                    prop.isReferenced = true;
-                }
-            }
-            getNodeLinks(node).resolvedSymbol = prop;
-            if (prop.parent && prop.parent.flags & 32 /* Class */) {
-                checkClassPropertyAccess(node, left, apparentType, prop);
-            }
-            var propType = getTypeOfSymbol(prop);
-            // Only compute control flow type if this is a property access expression that isn't an
-            // assignment target, and the referenced property was declared as a variable, property,
-            // accessor, or optional method.
-            if (node.kind !== 172 /* PropertyAccessExpression */ || ts.isAssignmentTarget(node) ||
-                !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) &&
-                    !(prop.flags & 8192 /* Method */ && propType.flags & 16384 /* Union */)) {
-                return propType;
-            }
-            return getFlowTypeOfReference(node, propType, /*assumeInitialized*/ true, /*includeOuterFunctions*/ false);
-        }
-        function isValidPropertyAccess(node, propertyName) {
-            var left = node.kind === 172 /* PropertyAccessExpression */
-                ? node.expression
-                : node.left;
-            var type = checkExpression(left);
-            if (type !== unknownType && !isTypeAny(type)) {
-                var prop = getPropertyOfType(getWidenedType(type), propertyName);
-                if (prop && prop.parent && prop.parent.flags & 32 /* Class */) {
-                    return checkClassPropertyAccess(node, left, type, prop);
-                }
-            }
-            return true;
-        }
-        /**
-         * Return the symbol of the for-in variable declared or referenced by the given for-in statement.
-         */
-        function getForInVariableSymbol(node) {
-            var initializer = node.initializer;
-            if (initializer.kind === 219 /* VariableDeclarationList */) {
-                var variable = initializer.declarations[0];
-                if (variable && !ts.isBindingPattern(variable.name)) {
-                    return getSymbolOfNode(variable);
-                }
-            }
-            else if (initializer.kind === 69 /* Identifier */) {
-                return getResolvedSymbol(initializer);
-            }
-            return undefined;
-        }
-        /**
-         * Return true if the given type is considered to have numeric property names.
-         */
-        function hasNumericPropertyNames(type) {
-            return getIndexTypeOfType(type, 1 /* Number */) && !getIndexTypeOfType(type, 0 /* String */);
-        }
-        /**
-         * Return true if given node is an expression consisting of an identifier (possibly parenthesized)
-         * that references a for-in variable for an object with numeric property names.
-         */
-        function isForInVariableForNumericPropertyNames(expr) {
-            var e = skipParenthesizedNodes(expr);
-            if (e.kind === 69 /* Identifier */) {
-                var symbol = getResolvedSymbol(e);
-                if (symbol.flags & 3 /* Variable */) {
-                    var child = expr;
-                    var node = expr.parent;
-                    while (node) {
-                        if (node.kind === 207 /* ForInStatement */ &&
-                            child === node.statement &&
-                            getForInVariableSymbol(node) === symbol &&
-                            hasNumericPropertyNames(checkExpression(node.expression))) {
-                            return true;
-                        }
-                        child = node;
-                        node = node.parent;
-                    }
-                }
-            }
-            return false;
-        }
-        function checkIndexedAccess(node) {
-            // Grammar checking
-            if (!node.argumentExpression) {
-                var sourceFile = ts.getSourceFileOfNode(node);
-                if (node.parent.kind === 175 /* NewExpression */ && node.parent.expression === node) {
-                    var start = ts.skipTrivia(sourceFile.text, node.expression.end);
-                    var end = node.end;
-                    grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.new_T_cannot_be_used_to_create_an_array_Use_new_Array_T_instead);
-                }
-                else {
-                    var start = node.end - "]".length;
-                    var end = node.end;
-                    grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Expression_expected);
-                }
-            }
-            // Obtain base constraint such that we can bail out if the constraint is an unknown type
-            var objectType = getApparentType(checkNonNullExpression(node.expression));
-            var indexType = node.argumentExpression ? checkExpression(node.argumentExpression) : unknownType;
-            if (objectType === unknownType) {
-                return unknownType;
-            }
-            var isConstEnum = isConstEnumObjectType(objectType);
-            if (isConstEnum &&
-                (!node.argumentExpression || node.argumentExpression.kind !== 9 /* StringLiteral */)) {
-                error(node.argumentExpression, ts.Diagnostics.A_const_enum_member_can_only_be_accessed_using_a_string_literal);
-                return unknownType;
-            }
-            // TypeScript 1.0 spec (April 2014): 4.10 Property Access
-            // - If IndexExpr is a string literal or a numeric literal and ObjExpr's apparent type has a property with the name
-            //    given by that literal(converted to its string representation in the case of a numeric literal), the property access is of the type of that property.
-            // - Otherwise, if ObjExpr's apparent type has a numeric index signature and IndexExpr is of type Any, the Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if ObjExpr's apparent type has a string index signature and IndexExpr is of type Any, the String or Number primitive type, or an enum type,
-            //    the property access is of the type of that index signature.
-            // - Otherwise, if IndexExpr is of type Any, the String or Number primitive type, or an enum type, the property access is of type Any.
-            // See if we can index as a property.
-            if (node.argumentExpression) {
-                var name_13 = getPropertyNameForIndexedAccess(node.argumentExpression, indexType);
-                if (name_13 !== undefined) {
-                    var prop = getPropertyOfType(objectType, name_13);
-                    if (prop) {
-                        getNodeLinks(node).resolvedSymbol = prop;
-                        return getTypeOfSymbol(prop);
-                    }
-                    else if (isConstEnum) {
-                        error(node.argumentExpression, ts.Diagnostics.Property_0_does_not_exist_on_const_enum_1, name_13, symbolToString(objectType.symbol));
-                        return unknownType;
-                    }
-                }
-            }
-            // Check for compatible indexer types.
-            if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 258 /* StringLike */ | 132 /* NumberLike */ | 16777216 /* ESSymbol */)) {
-                // Try to use a number indexer.
-                if (isTypeAnyOrAllConstituentTypesHaveKind(indexType, 132 /* NumberLike */) || isForInVariableForNumericPropertyNames(node.argumentExpression)) {
-                    var numberIndexInfo = getIndexInfoOfType(objectType, 1 /* Number */);
-                    if (numberIndexInfo) {
-                        getNodeLinks(node).resolvedIndexInfo = numberIndexInfo;
-                        return numberIndexInfo.type;
-                    }
-                }
-                // Try to use string indexing.
-                var stringIndexInfo = getIndexInfoOfType(objectType, 0 /* String */);
-                if (stringIndexInfo) {
-                    getNodeLinks(node).resolvedIndexInfo = stringIndexInfo;
-                    return stringIndexInfo.type;
-                }
-                // Fall back to any.
-                if (compilerOptions.noImplicitAny && !compilerOptions.suppressImplicitAnyIndexErrors && !isTypeAny(objectType)) {
-                    error(node, getIndexTypeOfType(objectType, 1 /* Number */) ?
-                        ts.Diagnostics.Element_implicitly_has_an_any_type_because_index_expression_is_not_of_type_number :
-                        ts.Diagnostics.Index_signature_of_object_type_implicitly_has_an_any_type);
-                }
-                return anyType;
-            }
-            // REVIEW: Users should know the type that was actually used.
-            error(node, ts.Diagnostics.An_index_expression_argument_must_be_of_type_string_number_symbol_or_any);
-            return unknownType;
-        }
-        /**
-         * If indexArgumentExpression is a string literal or number literal, returns its text.
-         * If indexArgumentExpression is a constant value, returns its string value.
-         * If indexArgumentExpression is a well known symbol, returns the property name corresponding
-         *    to this symbol, as long as it is a proper symbol reference.
-         * Otherwise, returns undefined.
-         */
-        function getPropertyNameForIndexedAccess(indexArgumentExpression, indexArgumentType) {
-            if (indexArgumentExpression.kind === 9 /* StringLiteral */ || indexArgumentExpression.kind === 8 /* NumericLiteral */) {
-                return indexArgumentExpression.text;
-            }
-            if (indexArgumentExpression.kind === 173 /* ElementAccessExpression */ || indexArgumentExpression.kind === 172 /* PropertyAccessExpression */) {
-                var value = getConstantValue(indexArgumentExpression);
-                if (value !== undefined) {
-                    return value.toString();
-                }
-            }
-            if (checkThatExpressionIsProperSymbolReference(indexArgumentExpression, indexArgumentType, /*reportError*/ false)) {
-                var rightHandSideName = indexArgumentExpression.name.text;
-                return ts.getPropertyNameForKnownSymbolName(rightHandSideName);
-            }
-            return undefined;
-        }
-        /**
-         * A proper symbol reference requires the following:
-         *   1. The property access denotes a property that exists
-         *   2. The expression is of the form Symbol.<identifier>
-         *   3. The property access is of the primitive type symbol.
-         *   4. Symbol in this context resolves to the global Symbol object
-         */
-        function checkThatExpressionIsProperSymbolReference(expression, expressionType, reportError) {
-            if (expressionType === unknownType) {
-                // There is already an error, so no need to report one.
-                return false;
-            }
-            if (!ts.isWellKnownSymbolSyntactically(expression)) {
-                return false;
-            }
-            // Make sure the property type is the primitive symbol type
-            if ((expressionType.flags & 16777216 /* ESSymbol */) === 0) {
-                if (reportError) {
-                    error(expression, ts.Diagnostics.A_computed_property_name_of_the_form_0_must_be_of_type_symbol, ts.getTextOfNode(expression));
-                }
-                return false;
-            }
-            // The name is Symbol.<someName>, so make sure Symbol actually resolves to the
-            // global Symbol object
-            var leftHandSide = expression.expression;
-            var leftHandSideSymbol = getResolvedSymbol(leftHandSide);
-            if (!leftHandSideSymbol) {
-                return false;
-            }
-            var globalESSymbol = getGlobalESSymbolConstructorSymbol();
-            if (!globalESSymbol) {
-                // Already errored when we tried to look up the symbol
-                return false;
-            }
-            if (leftHandSideSymbol !== globalESSymbol) {
-                if (reportError) {
-                    error(leftHandSide, ts.Diagnostics.Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object);
-                }
-                return false;
-            }
-            return true;
-        }
-        function resolveUntypedCall(node) {
-            if (node.kind === 176 /* TaggedTemplateExpression */) {
-                checkExpression(node.template);
-            }
-            else if (node.kind !== 143 /* Decorator */) {
-                ts.forEach(node.arguments, function (argument) {
-                    checkExpression(argument);
-                });
-            }
-            return anySignature;
-        }
-        function resolveErrorCall(node) {
-            resolveUntypedCall(node);
-            return unknownSignature;
-        }
-        // Re-order candidate signatures into the result array. Assumes the result array to be empty.
-        // The candidate list orders groups in reverse, but within a group signatures are kept in declaration order
-        // A nit here is that we reorder only signatures that belong to the same symbol,
-        // so order how inherited signatures are processed is still preserved.
-        // interface A { (x: string): void }
-        // interface B extends A { (x: 'foo'): string }
-        // const b: B;
-        // b('foo') // <- here overloads should be processed as [(x:'foo'): string, (x: string): void]
-        function reorderCandidates(signatures, result) {
-            var lastParent;
-            var lastSymbol;
-            var cutoffIndex = 0;
-            var index;
-            var specializedIndex = -1;
-            var spliceIndex;
-            ts.Debug.assert(!result.length);
-            for (var _i = 0, signatures_2 = signatures; _i < signatures_2.length; _i++) {
-                var signature = signatures_2[_i];
-                var symbol = signature.declaration && getSymbolOfNode(signature.declaration);
-                var parent_9 = signature.declaration && signature.declaration.parent;
-                if (!lastSymbol || symbol === lastSymbol) {
-                    if (lastParent && parent_9 === lastParent) {
-                        index++;
-                    }
-                    else {
-                        lastParent = parent_9;
-                        index = cutoffIndex;
-                    }
-                }
-                else {
-                    // current declaration belongs to a different symbol
-                    // set cutoffIndex so re-orderings in the future won't change result set from 0 to cutoffIndex
-                    index = cutoffIndex = result.length;
-                    lastParent = parent_9;
-                }
-                lastSymbol = symbol;
-                // specialized signatures always need to be placed before non-specialized signatures regardless
-                // of the cutoff position; see GH#1133
-                if (signature.hasStringLiterals) {
-                    specializedIndex++;
-                    spliceIndex = specializedIndex;
-                    // The cutoff index always needs to be greater than or equal to the specialized signature index
-                    // in order to prevent non-specialized signatures from being added before a specialized
-                    // signature.
-                    cutoffIndex++;
-                }
-                else {
-                    spliceIndex = index;
-                }
-                result.splice(spliceIndex, 0, signature);
-            }
-        }
-        function getSpreadArgumentIndex(args) {
-            for (var i = 0; i < args.length; i++) {
-                var arg = args[i];
-                if (arg && arg.kind === 191 /* SpreadElementExpression */) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-        function hasCorrectArity(node, args, signature, signatureHelpTrailingComma) {
-            if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-            var argCount; // Apparent number of arguments we will have in this call
-            var typeArguments; // Type arguments (undefined if none)
-            var callIsIncomplete; // In incomplete call we want to be lenient when we have too few arguments
-            var isDecorator;
-            var spreadArgIndex = -1;
-            if (node.kind === 176 /* TaggedTemplateExpression */) {
-                var tagExpression = node;
-                // Even if the call is incomplete, we'll have a missing expression as our last argument,
-                // so we can say the count is just the arg list length
-                argCount = args.length;
-                typeArguments = undefined;
-                if (tagExpression.template.kind === 189 /* TemplateExpression */) {
-                    // If a tagged template expression lacks a tail literal, the call is incomplete.
-                    // Specifically, a template only can end in a TemplateTail or a Missing literal.
-                    var templateExpression = tagExpression.template;
-                    var lastSpan = ts.lastOrUndefined(templateExpression.templateSpans);
-                    ts.Debug.assert(lastSpan !== undefined); // we should always have at least one span.
-                    callIsIncomplete = ts.nodeIsMissing(lastSpan.literal) || !!lastSpan.literal.isUnterminated;
-                }
-                else {
-                    // If the template didn't end in a backtick, or its beginning occurred right prior to EOF,
-                    // then this might actually turn out to be a TemplateHead in the future;
-                    // so we consider the call to be incomplete.
-                    var templateLiteral = tagExpression.template;
-                    ts.Debug.assert(templateLiteral.kind === 11 /* NoSubstitutionTemplateLiteral */);
-                    callIsIncomplete = !!templateLiteral.isUnterminated;
-                }
-            }
-            else if (node.kind === 143 /* Decorator */) {
-                isDecorator = true;
-                typeArguments = undefined;
-                argCount = getEffectiveArgumentCount(node, /*args*/ undefined, signature);
-            }
-            else {
-                var callExpression = node;
-                if (!callExpression.arguments) {
-                    // This only happens when we have something of the form: 'new C'
-                    ts.Debug.assert(callExpression.kind === 175 /* NewExpression */);
-                    return signature.minArgumentCount === 0;
-                }
-                argCount = signatureHelpTrailingComma ? args.length + 1 : args.length;
-                // If we are missing the close paren, the call is incomplete.
-                callIsIncomplete = callExpression.arguments.end === callExpression.end;
-                typeArguments = callExpression.typeArguments;
-                spreadArgIndex = getSpreadArgumentIndex(args);
-            }
-            // If the user supplied type arguments, but the number of type arguments does not match
-            // the declared number of type parameters, the call has an incorrect arity.
-            var hasRightNumberOfTypeArgs = !typeArguments ||
-                (signature.typeParameters && typeArguments.length === signature.typeParameters.length);
-            if (!hasRightNumberOfTypeArgs) {
-                return false;
-            }
-            // If spread arguments are present, check that they correspond to a rest parameter. If so, no
-            // further checking is necessary.
-            if (spreadArgIndex >= 0) {
-                return isRestParameterIndex(signature, spreadArgIndex);
-            }
-            // Too many arguments implies incorrect arity.
-            if (!signature.hasRestParameter && argCount > signature.parameters.length) {
-                return false;
-            }
-            // If the call is incomplete, we should skip the lower bound check.
-            var hasEnoughArguments = argCount >= signature.minArgumentCount;
-            return callIsIncomplete || hasEnoughArguments;
-        }
-        // If type has a single call signature and no other members, return that signature. Otherwise, return undefined.
-        function getSingleCallSignature(type) {
-            if (type.flags & 80896 /* ObjectType */) {
-                var resolved = resolveStructuredTypeMembers(type);
-                if (resolved.callSignatures.length === 1 && resolved.constructSignatures.length === 0 &&
-                    resolved.properties.length === 0 && !resolved.stringIndexInfo && !resolved.numberIndexInfo) {
-                    return resolved.callSignatures[0];
-                }
-            }
-            return undefined;
-        }
-        // Instantiate a generic signature in the context of a non-generic signature (section 3.8.5 in TypeScript spec)
-        function instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper) {
-            var context = createInferenceContext(signature.typeParameters, /*inferUnionTypes*/ true);
-            forEachMatchingParameterType(contextualSignature, signature, function (source, target) {
-                // Type parameters from outer context referenced by source type are fixed by instantiation of the source type
-                inferTypes(context, instantiateType(source, contextualMapper), target);
-            });
-            return getSignatureInstantiation(signature, getInferredTypes(context));
-        }
-        function inferTypeArguments(node, signature, args, excludeArgument, context) {
-            var typeParameters = signature.typeParameters;
-            var inferenceMapper = getInferenceMapper(context);
-            // Clear out all the inference results from the last time inferTypeArguments was called on this context
-            for (var i = 0; i < typeParameters.length; i++) {
-                // As an optimization, we don't have to clear (and later recompute) inferred types
-                // for type parameters that have already been fixed on the previous call to inferTypeArguments.
-                // It would be just as correct to reset all of them. But then we'd be repeating the same work
-                // for the type parameters that were fixed, namely the work done by getInferredType.
-                if (!context.inferences[i].isFixed) {
-                    context.inferredTypes[i] = undefined;
-                }
-            }
-            // On this call to inferTypeArguments, we may get more inferences for certain type parameters that were not
-            // fixed last time. This means that a type parameter that failed inference last time may succeed this time,
-            // or vice versa. Therefore, the failedTypeParameterIndex is useless if it points to an unfixed type parameter,
-            // because it may change. So here we reset it. However, getInferredType will not revisit any type parameters
-            // that were previously fixed. So if a fixed type parameter failed previously, it will fail again because
-            // it will contain the exact same set of inferences. So if we reset the index from a fixed type parameter,
-            // we will lose information that we won't recover this time around.
-            if (context.failedTypeParameterIndex !== undefined && !context.inferences[context.failedTypeParameterIndex].isFixed) {
-                context.failedTypeParameterIndex = undefined;
-            }
-            var thisType = getThisTypeOfSignature(signature);
-            if (thisType) {
-                var thisArgumentNode = getThisArgumentOfCall(node);
-                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
-                inferTypes(context, thisArgumentType, thisType);
-            }
-            // We perform two passes over the arguments. In the first pass we infer from all arguments, but use
-            // wildcards for all context sensitive function expressions.
-            var argCount = getEffectiveArgumentCount(node, args, signature);
-            for (var i = 0; i < argCount; i++) {
-                var arg = getEffectiveArgument(node, args, i);
-                // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 193 /* OmittedExpression */) {
-                    var paramType = getTypeAtPosition(signature, i);
-                    var argType = getEffectiveArgumentType(node, i, arg);
-                    // If the effective argument type is 'undefined', there is no synthetic type
-                    // for the argument. In that case, we should check the argument.
-                    if (argType === undefined) {
-                        // For context sensitive arguments we pass the identityMapper, which is a signal to treat all
-                        // context sensitive function expressions as wildcards
-                        var mapper = excludeArgument && excludeArgument[i] !== undefined ? identityMapper : inferenceMapper;
-                        argType = checkExpressionWithContextualType(arg, paramType, mapper);
-                    }
-                    inferTypes(context, argType, paramType);
-                }
-            }
-            // In the second pass we visit only context sensitive arguments, and only those that aren't excluded, this
-            // time treating function expressions normally (which may cause previously inferred type arguments to be fixed
-            // as we construct types for contextually typed parameters)
-            // Decorators will not have `excludeArgument`, as their arguments cannot be contextually typed.
-            // Tagged template expressions will always have `undefined` for `excludeArgument[0]`.
-            if (excludeArgument) {
-                for (var i = 0; i < argCount; i++) {
-                    // No need to check for omitted args and template expressions, their exclusion value is always undefined
-                    if (excludeArgument[i] === false) {
-                        var arg = args[i];
-                        var paramType = getTypeAtPosition(signature, i);
-                        inferTypes(context, checkExpressionWithContextualType(arg, paramType, inferenceMapper), paramType);
-                    }
-                }
-            }
-            getInferredTypes(context);
-        }
-        function checkTypeArguments(signature, typeArgumentNodes, typeArgumentTypes, reportErrors, headMessage) {
-            var typeParameters = signature.typeParameters;
-            var typeArgumentsAreAssignable = true;
-            var mapper;
-            for (var i = 0; i < typeParameters.length; i++) {
-                if (typeArgumentsAreAssignable /* so far */) {
-                    var constraint = getConstraintOfTypeParameter(typeParameters[i]);
-                    if (constraint) {
-                        var errorInfo = void 0;
-                        var typeArgumentHeadMessage = ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1;
-                        if (reportErrors && headMessage) {
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, typeArgumentHeadMessage);
-                            typeArgumentHeadMessage = headMessage;
-                        }
-                        if (!mapper) {
-                            mapper = createTypeMapper(typeParameters, typeArgumentTypes);
-                        }
-                        var typeArgument = typeArgumentTypes[i];
-                        typeArgumentsAreAssignable = checkTypeAssignableTo(typeArgument, getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument), reportErrors ? typeArgumentNodes[i] : undefined, typeArgumentHeadMessage, errorInfo);
-                    }
-                }
-            }
-            return typeArgumentsAreAssignable;
-        }
-        function checkApplicableSignature(node, args, signature, relation, excludeArgument, reportErrors) {
-            var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 175 /* NewExpression */) {
-                // If the called expression is not of the form `x.f` or `x["f"]`, then sourceType = voidType
-                // If the signature's 'this' type is voidType, then the check is skipped -- anything is compatible.
-                // If the expression is a new expression, then the check is skipped.
-                var thisArgumentNode = getThisArgumentOfCall(node);
-                var thisArgumentType = thisArgumentNode ? checkExpression(thisArgumentNode) : voidType;
-                var errorNode = reportErrors ? (thisArgumentNode || node) : undefined;
-                var headMessage_1 = ts.Diagnostics.The_this_context_of_type_0_is_not_assignable_to_method_s_this_of_type_1;
-                if (!checkTypeRelatedTo(thisArgumentType, getThisTypeOfSignature(signature), relation, errorNode, headMessage_1)) {
-                    return false;
-                }
-            }
-            var headMessage = ts.Diagnostics.Argument_of_type_0_is_not_assignable_to_parameter_of_type_1;
-            var argCount = getEffectiveArgumentCount(node, args, signature);
-            for (var i = 0; i < argCount; i++) {
-                var arg = getEffectiveArgument(node, args, i);
-                // If the effective argument is 'undefined', then it is an argument that is present but is synthetic.
-                if (arg === undefined || arg.kind !== 193 /* OmittedExpression */) {
-                    // Check spread elements against rest type (from arity check we know spread argument corresponds to a rest parameter)
-                    var paramType = getTypeAtPosition(signature, i);
-                    var argType = getEffectiveArgumentType(node, i, arg);
-                    // If the effective argument type is 'undefined', there is no synthetic type
-                    // for the argument. In that case, we should check the argument.
-                    if (argType === undefined) {
-                        argType = arg.kind === 9 /* StringLiteral */ && !reportErrors
-                            ? getStringLiteralTypeForText(arg.text)
-                            : checkExpressionWithContextualType(arg, paramType, excludeArgument && excludeArgument[i] ? identityMapper : undefined);
-                    }
-                    // Use argument expression as error location when reporting errors
-                    var errorNode = reportErrors ? getEffectiveArgumentErrorNode(node, i, arg) : undefined;
-                    if (!checkTypeRelatedTo(argType, paramType, relation, errorNode, headMessage)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        /**
-         * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
-         */
-        function getThisArgumentOfCall(node) {
-            if (node.kind === 174 /* CallExpression */) {
-                var callee = node.expression;
-                if (callee.kind === 172 /* PropertyAccessExpression */) {
-                    return callee.expression;
-                }
-                else if (callee.kind === 173 /* ElementAccessExpression */) {
-                    return callee.expression;
-                }
-            }
-        }
-        /**
-         * Returns the effective arguments for an expression that works like a function invocation.
-         *
-         * If 'node' is a CallExpression or a NewExpression, then its argument list is returned.
-         * If 'node' is a TaggedTemplateExpression, a new argument list is constructed from the substitution
-         *    expressions, where the first element of the list is `undefined`.
-         * If 'node' is a Decorator, the argument list will be `undefined`, and its arguments and types
-         *    will be supplied from calls to `getEffectiveArgumentCount` and `getEffectiveArgumentType`.
-         */
-        function getEffectiveCallArguments(node) {
-            var args;
-            if (node.kind === 176 /* TaggedTemplateExpression */) {
-                var template = node.template;
-                args = [undefined];
-                if (template.kind === 189 /* TemplateExpression */) {
-                    ts.forEach(template.templateSpans, function (span) {
-                        args.push(span.expression);
-                    });
-                }
-            }
-            else if (node.kind === 143 /* Decorator */) {
-                // For a decorator, we return undefined as we will determine
-                // the number and types of arguments for a decorator using
-                // `getEffectiveArgumentCount` and `getEffectiveArgumentType` below.
-                return undefined;
-            }
-            else {
-                args = node.arguments || emptyArray;
-            }
-            return args;
-        }
-        /**
-          * Returns the effective argument count for a node that works like a function invocation.
-          * If 'node' is a Decorator, the number of arguments is derived from the decoration
-          *    target and the signature:
-          *    If 'node.target' is a class declaration or class expression, the effective argument
-          *       count is 1.
-          *    If 'node.target' is a parameter declaration, the effective argument count is 3.
-          *    If 'node.target' is a property declaration, the effective argument count is 2.
-          *    If 'node.target' is a method or accessor declaration, the effective argument count
-          *       is 3, although it can be 2 if the signature only accepts two arguments, allowing
-          *       us to match a property decorator.
-          * Otherwise, the argument count is the length of the 'args' array.
-          */
-        function getEffectiveArgumentCount(node, args, signature) {
-            if (node.kind === 143 /* Decorator */) {
-                switch (node.parent.kind) {
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                        // A class decorator will have one argument (see `ClassDecorator` in core.d.ts)
-                        return 1;
-                    case 145 /* PropertyDeclaration */:
-                        // A property declaration decorator will have two arguments (see
-                        // `PropertyDecorator` in core.d.ts)
-                        return 2;
-                    case 147 /* MethodDeclaration */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        // A method or accessor declaration decorator will have two or three arguments (see
-                        // `PropertyDecorator` and `MethodDecorator` in core.d.ts)
-                        // If we are emitting decorators for ES3, we will only pass two arguments.
-                        if (languageVersion === 0 /* ES3 */) {
-                            return 2;
-                        }
-                        // If the method decorator signature only accepts a target and a key, we will only
-                        // type check those arguments.
-                        return signature.parameters.length >= 3 ? 3 : 2;
-                    case 142 /* Parameter */:
-                        // A parameter declaration decorator will have three arguments (see
-                        // `ParameterDecorator` in core.d.ts)
-                        return 3;
-                }
-            }
-            else {
-                return args.length;
-            }
-        }
-        /**
-          * Returns the effective type of the first argument to a decorator.
-          * If 'node' is a class declaration or class expression, the effective argument type
-          *    is the type of the static side of the class.
-          * If 'node' is a parameter declaration, the effective argument type is either the type
-          *    of the static or instance side of the class for the parameter's parent method,
-          *    depending on whether the method is declared static.
-          *    For a constructor, the type is always the type of the static side of the class.
-          * If 'node' is a property, method, or accessor declaration, the effective argument
-          *    type is the type of the static or instance side of the parent class for class
-          *    element, depending on whether the element is declared static.
-          */
-        function getEffectiveDecoratorFirstArgumentType(node) {
-            // The first argument to a decorator is its `target`.
-            if (node.kind === 221 /* ClassDeclaration */) {
-                // For a class decorator, the `target` is the type of the class (e.g. the
-                // "static" or "constructor" side of the class)
-                var classSymbol = getSymbolOfNode(node);
-                return getTypeOfSymbol(classSymbol);
-            }
-            if (node.kind === 142 /* Parameter */) {
-                // For a parameter decorator, the `target` is the parent type of the
-                // parameter's containing method.
-                node = node.parent;
-                if (node.kind === 148 /* Constructor */) {
-                    var classSymbol = getSymbolOfNode(node);
-                    return getTypeOfSymbol(classSymbol);
-                }
-            }
-            if (node.kind === 145 /* PropertyDeclaration */ ||
-                node.kind === 147 /* MethodDeclaration */ ||
-                node.kind === 149 /* GetAccessor */ ||
-                node.kind === 150 /* SetAccessor */) {
-                // For a property or method decorator, the `target` is the
-                // "static"-side type of the parent of the member if the member is
-                // declared "static"; otherwise, it is the "instance"-side type of the
-                // parent of the member.
-                return getParentTypeOfClassElement(node);
-            }
-            ts.Debug.fail("Unsupported decorator target.");
-            return unknownType;
-        }
-        /**
-          * Returns the effective type for the second argument to a decorator.
-          * If 'node' is a parameter, its effective argument type is one of the following:
-          *    If 'node.parent' is a constructor, the effective argument type is 'any', as we
-          *       will emit `undefined`.
-          *    If 'node.parent' is a member with an identifier, numeric, or string literal name,
-          *       the effective argument type will be a string literal type for the member name.
-          *    If 'node.parent' is a computed property name, the effective argument type will
-          *       either be a symbol type or the string type.
-          * If 'node' is a member with an identifier, numeric, or string literal name, the
-          *    effective argument type will be a string literal type for the member name.
-          * If 'node' is a computed property name, the effective argument type will either
-          *    be a symbol type or the string type.
-          * A class decorator does not have a second argument type.
-          */
-        function getEffectiveDecoratorSecondArgumentType(node) {
-            // The second argument to a decorator is its `propertyKey`
-            if (node.kind === 221 /* ClassDeclaration */) {
-                ts.Debug.fail("Class decorators should not have a second synthetic argument.");
-                return unknownType;
-            }
-            if (node.kind === 142 /* Parameter */) {
-                node = node.parent;
-                if (node.kind === 148 /* Constructor */) {
-                    // For a constructor parameter decorator, the `propertyKey` will be `undefined`.
-                    return anyType;
-                }
-            }
-            if (node.kind === 145 /* PropertyDeclaration */ ||
-                node.kind === 147 /* MethodDeclaration */ ||
-                node.kind === 149 /* GetAccessor */ ||
-                node.kind === 150 /* SetAccessor */) {
-                // The `propertyKey` for a property or method decorator will be a
-                // string literal type if the member name is an identifier, number, or string;
-                // otherwise, if the member name is a computed property name it will
-                // be either string or symbol.
-                var element = node;
-                switch (element.name.kind) {
-                    case 69 /* Identifier */:
-                    case 8 /* NumericLiteral */:
-                    case 9 /* StringLiteral */:
-                        return getStringLiteralTypeForText(element.name.text);
-                    case 140 /* ComputedPropertyName */:
-                        var nameType = checkComputedPropertyName(element.name);
-                        if (isTypeOfKind(nameType, 16777216 /* ESSymbol */)) {
-                            return nameType;
-                        }
-                        else {
-                            return stringType;
-                        }
-                    default:
-                        ts.Debug.fail("Unsupported property name.");
-                        return unknownType;
-                }
-            }
-            ts.Debug.fail("Unsupported decorator target.");
-            return unknownType;
-        }
-        /**
-          * Returns the effective argument type for the third argument to a decorator.
-          * If 'node' is a parameter, the effective argument type is the number type.
-          * If 'node' is a method or accessor, the effective argument type is a
-          *    `TypedPropertyDescriptor<T>` instantiated with the type of the member.
-          * Class and property decorators do not have a third effective argument.
-          */
-        function getEffectiveDecoratorThirdArgumentType(node) {
-            // The third argument to a decorator is either its `descriptor` for a method decorator
-            // or its `parameterIndex` for a parameter decorator
-            if (node.kind === 221 /* ClassDeclaration */) {
-                ts.Debug.fail("Class decorators should not have a third synthetic argument.");
-                return unknownType;
-            }
-            if (node.kind === 142 /* Parameter */) {
-                // The `parameterIndex` for a parameter decorator is always a number
-                return numberType;
-            }
-            if (node.kind === 145 /* PropertyDeclaration */) {
-                ts.Debug.fail("Property decorators should not have a third synthetic argument.");
-                return unknownType;
-            }
-            if (node.kind === 147 /* MethodDeclaration */ ||
-                node.kind === 149 /* GetAccessor */ ||
-                node.kind === 150 /* SetAccessor */) {
-                // The `descriptor` for a method decorator will be a `TypedPropertyDescriptor<T>`
-                // for the type of the member.
-                var propertyType = getTypeOfNode(node);
-                return createTypedPropertyDescriptorType(propertyType);
-            }
-            ts.Debug.fail("Unsupported decorator target.");
-            return unknownType;
-        }
-        /**
-          * Returns the effective argument type for the provided argument to a decorator.
-          */
-        function getEffectiveDecoratorArgumentType(node, argIndex) {
-            if (argIndex === 0) {
-                return getEffectiveDecoratorFirstArgumentType(node.parent);
-            }
-            else if (argIndex === 1) {
-                return getEffectiveDecoratorSecondArgumentType(node.parent);
-            }
-            else if (argIndex === 2) {
-                return getEffectiveDecoratorThirdArgumentType(node.parent);
-            }
-            ts.Debug.fail("Decorators should not have a fourth synthetic argument.");
-            return unknownType;
-        }
-        /**
-          * Gets the effective argument type for an argument in a call expression.
-          */
-        function getEffectiveArgumentType(node, argIndex, arg) {
-            // Decorators provide special arguments, a tagged template expression provides
-            // a special first argument, and string literals get string literal types
-            // unless we're reporting errors
-            if (node.kind === 143 /* Decorator */) {
-                return getEffectiveDecoratorArgumentType(node, argIndex);
-            }
-            else if (argIndex === 0 && node.kind === 176 /* TaggedTemplateExpression */) {
-                return getGlobalTemplateStringsArrayType();
-            }
-            // This is not a synthetic argument, so we return 'undefined'
-            // to signal that the caller needs to check the argument.
-            return undefined;
-        }
-        /**
-          * Gets the effective argument expression for an argument in a call expression.
-          */
-        function getEffectiveArgument(node, args, argIndex) {
-            // For a decorator or the first argument of a tagged template expression we return undefined.
-            if (node.kind === 143 /* Decorator */ ||
-                (argIndex === 0 && node.kind === 176 /* TaggedTemplateExpression */)) {
-                return undefined;
-            }
-            return args[argIndex];
-        }
-        /**
-          * Gets the error node to use when reporting errors for an effective argument.
-          */
-        function getEffectiveArgumentErrorNode(node, argIndex, arg) {
-            if (node.kind === 143 /* Decorator */) {
-                // For a decorator, we use the expression of the decorator for error reporting.
-                return node.expression;
-            }
-            else if (argIndex === 0 && node.kind === 176 /* TaggedTemplateExpression */) {
-                // For a the first argument of a tagged template expression, we use the template of the tag for error reporting.
-                return node.template;
-            }
-            else {
-                return arg;
-            }
-        }
-        function resolveCall(node, signatures, candidatesOutArray, headMessage) {
-            var isTaggedTemplate = node.kind === 176 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 143 /* Decorator */;
-            var typeArguments;
-            if (!isTaggedTemplate && !isDecorator) {
-                typeArguments = node.typeArguments;
-                // We already perform checking on the type arguments on the class declaration itself.
-                if (node.expression.kind !== 95 /* SuperKeyword */) {
-                    ts.forEach(typeArguments, checkSourceElement);
-                }
-            }
-            var candidates = candidatesOutArray || [];
-            // reorderCandidates fills up the candidates array directly
-            reorderCandidates(signatures, candidates);
-            if (!candidates.length) {
-                reportError(ts.Diagnostics.Supplied_parameters_do_not_match_any_signature_of_call_target);
-                return resolveErrorCall(node);
-            }
-            var args = getEffectiveCallArguments(node);
-            // The following applies to any value of 'excludeArgument[i]':
-            //    - true:      the argument at 'i' is susceptible to a one-time permanent contextual typing.
-            //    - undefined: the argument at 'i' is *not* susceptible to permanent contextual typing.
-            //    - false:     the argument at 'i' *was* and *has been* permanently contextually typed.
-            //
-            // The idea is that we will perform type argument inference & assignability checking once
-            // without using the susceptible parameters that are functions, and once more for each of those
-            // parameters, contextually typing each as we go along.
-            //
-            // For a tagged template, then the first argument be 'undefined' if necessary
-            // because it represents a TemplateStringsArray.
-            //
-            // For a decorator, no arguments are susceptible to contextual typing due to the fact
-            // decorators are applied to a declaration by the emitter, and not to an expression.
-            var excludeArgument;
-            if (!isDecorator) {
-                // We do not need to call `getEffectiveArgumentCount` here as it only
-                // applies when calculating the number of arguments for a decorator.
-                for (var i = isTaggedTemplate ? 1 : 0; i < args.length; i++) {
-                    if (isContextSensitive(args[i])) {
-                        if (!excludeArgument) {
-                            excludeArgument = new Array(args.length);
-                        }
-                        excludeArgument[i] = true;
-                    }
-                }
-            }
-            // The following variables are captured and modified by calls to chooseOverload.
-            // If overload resolution or type argument inference fails, we want to report the
-            // best error possible. The best error is one which says that an argument was not
-            // assignable to a parameter. This implies that everything else about the overload
-            // was fine. So if there is any overload that is only incorrect because of an
-            // argument, we will report an error on that one.
-            //
-            //     function foo(s: string) {}
-            //     function foo(n: number) {} // Report argument error on this overload
-            //     function foo() {}
-            //     foo(true);
-            //
-            // If none of the overloads even made it that far, there are two possibilities.
-            // There was a problem with type arguments for some overload, in which case
-            // report an error on that. Or none of the overloads even had correct arity,
-            // in which case give an arity error.
-            //
-            //     function foo<T>(x: T, y: T) {} // Report type argument inference error
-            //     function foo() {}
-            //     foo(0, true);
-            //
-            var candidateForArgumentError;
-            var candidateForTypeArgumentError;
-            var resultOfFailedInference;
-            var result;
-            // If we are in signature help, a trailing comma indicates that we intend to provide another argument,
-            // so we will only accept overloads with arity at least 1 higher than the current number of provided arguments.
-            var signatureHelpTrailingComma = candidatesOutArray && node.kind === 174 /* CallExpression */ && node.arguments.hasTrailingComma;
-            // Section 4.12.1:
-            // if the candidate list contains one or more signatures for which the type of each argument
-            // expression is a subtype of each corresponding parameter type, the return type of the first
-            // of those signatures becomes the return type of the function call.
-            // Otherwise, the return type of the first signature in the candidate list becomes the return
-            // type of the function call.
-            //
-            // Whether the call is an error is determined by assignability of the arguments. The subtype pass
-            // is just important for choosing the best signature. So in the case where there is only one
-            // signature, the subtype pass is useless. So skipping it is an optimization.
-            if (candidates.length > 1) {
-                result = chooseOverload(candidates, subtypeRelation, signatureHelpTrailingComma);
-            }
-            if (!result) {
-                // Reinitialize these pointers for round two
-                candidateForArgumentError = undefined;
-                candidateForTypeArgumentError = undefined;
-                resultOfFailedInference = undefined;
-                result = chooseOverload(candidates, assignableRelation, signatureHelpTrailingComma);
-            }
-            if (result) {
-                return result;
-            }
-            // No signatures were applicable. Now report errors based on the last applicable signature with
-            // no arguments excluded from assignability checks.
-            // If candidate is undefined, it means that no candidates had a suitable arity. In that case,
-            // skip the checkApplicableSignature check.
-            if (candidateForArgumentError) {
-                // excludeArgument is undefined, in this case also equivalent to [undefined, undefined, ...]
-                // The importance of excludeArgument is to prevent us from typing function expression parameters
-                // in arguments too early. If possible, we'd like to only type them once we know the correct
-                // overload. However, this matters for the case where the call is correct. When the call is
-                // an error, we don't need to exclude any arguments, although it would cause no harm to do so.
-                checkApplicableSignature(node, args, candidateForArgumentError, assignableRelation, /*excludeArgument*/ undefined, /*reportErrors*/ true);
-            }
-            else if (candidateForTypeArgumentError) {
-                if (!isTaggedTemplate && !isDecorator && typeArguments) {
-                    var typeArguments_2 = node.typeArguments;
-                    checkTypeArguments(candidateForTypeArgumentError, typeArguments_2, ts.map(typeArguments_2, getTypeFromTypeNode), /*reportErrors*/ true, headMessage);
-                }
-                else {
-                    ts.Debug.assert(resultOfFailedInference.failedTypeParameterIndex >= 0);
-                    var failedTypeParameter = candidateForTypeArgumentError.typeParameters[resultOfFailedInference.failedTypeParameterIndex];
-                    var inferenceCandidates = getInferenceCandidates(resultOfFailedInference, resultOfFailedInference.failedTypeParameterIndex);
-                    var diagnosticChainHead = ts.chainDiagnosticMessages(/*details*/ undefined, // details will be provided by call to reportNoCommonSupertypeError
-                    ts.Diagnostics.The_type_argument_for_type_parameter_0_cannot_be_inferred_from_the_usage_Consider_specifying_the_type_arguments_explicitly, typeToString(failedTypeParameter));
-                    if (headMessage) {
-                        diagnosticChainHead = ts.chainDiagnosticMessages(diagnosticChainHead, headMessage);
-                    }
-                    reportNoCommonSupertypeError(inferenceCandidates, node.expression || node.tag, diagnosticChainHead);
-                }
-            }
-            else {
-                reportError(ts.Diagnostics.Supplied_parameters_do_not_match_any_signature_of_call_target);
-            }
-            // No signature was applicable. We have already reported the errors for the invalid signature.
-            // If this is a type resolution session, e.g. Language Service, try to get better information that anySignature.
-            // Pick the first candidate that matches the arity. This way we can get a contextual type for cases like:
-            //  declare function f(a: { xa: number; xb: number; });
-            //  f({ |
-            if (!produceDiagnostics) {
-                for (var _i = 0, candidates_1 = candidates; _i < candidates_1.length; _i++) {
-                    var candidate = candidates_1[_i];
-                    if (hasCorrectArity(node, args, candidate)) {
-                        if (candidate.typeParameters && typeArguments) {
-                            candidate = getSignatureInstantiation(candidate, ts.map(typeArguments, getTypeFromTypeNode));
-                        }
-                        return candidate;
-                    }
-                }
-            }
-            return resolveErrorCall(node);
-            function reportError(message, arg0, arg1, arg2) {
-                var errorInfo;
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, message, arg0, arg1, arg2);
-                if (headMessage) {
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                }
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
-            }
-            function chooseOverload(candidates, relation, signatureHelpTrailingComma) {
-                if (signatureHelpTrailingComma === void 0) { signatureHelpTrailingComma = false; }
-                for (var _i = 0, candidates_2 = candidates; _i < candidates_2.length; _i++) {
-                    var originalCandidate = candidates_2[_i];
-                    if (!hasCorrectArity(node, args, originalCandidate, signatureHelpTrailingComma)) {
-                        continue;
-                    }
-                    var candidate = void 0;
-                    var typeArgumentsAreValid = void 0;
-                    var inferenceContext = originalCandidate.typeParameters
-                        ? createInferenceContext(originalCandidate.typeParameters, /*inferUnionTypes*/ false)
-                        : undefined;
-                    while (true) {
-                        candidate = originalCandidate;
-                        if (candidate.typeParameters) {
-                            var typeArgumentTypes = void 0;
-                            if (typeArguments) {
-                                typeArgumentTypes = ts.map(typeArguments, getTypeFromTypeNode);
-                                typeArgumentsAreValid = checkTypeArguments(candidate, typeArguments, typeArgumentTypes, /*reportErrors*/ false);
-                            }
-                            else {
-                                inferTypeArguments(node, candidate, args, excludeArgument, inferenceContext);
-                                typeArgumentsAreValid = inferenceContext.failedTypeParameterIndex === undefined;
-                                typeArgumentTypes = inferenceContext.inferredTypes;
-                            }
-                            if (!typeArgumentsAreValid) {
-                                break;
-                            }
-                            candidate = getSignatureInstantiation(candidate, typeArgumentTypes);
-                        }
-                        if (!checkApplicableSignature(node, args, candidate, relation, excludeArgument, /*reportErrors*/ false)) {
-                            break;
-                        }
-                        var index = excludeArgument ? ts.indexOf(excludeArgument, true) : -1;
-                        if (index < 0) {
-                            return candidate;
-                        }
-                        excludeArgument[index] = false;
-                    }
-                    // A post-mortem of this iteration of the loop. The signature was not applicable,
-                    // so we want to track it as a candidate for reporting an error. If the candidate
-                    // had no type parameters, or had no issues related to type arguments, we can
-                    // report an error based on the arguments. If there was an issue with type
-                    // arguments, then we can only report an error based on the type arguments.
-                    if (originalCandidate.typeParameters) {
-                        var instantiatedCandidate = candidate;
-                        if (typeArgumentsAreValid) {
-                            candidateForArgumentError = instantiatedCandidate;
-                        }
-                        else {
-                            candidateForTypeArgumentError = originalCandidate;
-                            if (!typeArguments) {
-                                resultOfFailedInference = inferenceContext;
-                            }
-                        }
-                    }
-                    else {
-                        ts.Debug.assert(originalCandidate === candidate);
-                        candidateForArgumentError = originalCandidate;
-                    }
-                }
-                return undefined;
-            }
-        }
-        function resolveCallExpression(node, candidatesOutArray) {
-            if (node.expression.kind === 95 /* SuperKeyword */) {
-                var superType = checkSuperExpression(node.expression);
-                if (superType !== unknownType) {
-                    // In super call, the candidate signatures are the matching arity signatures of the base constructor function instantiated
-                    // with the type arguments specified in the extends clause.
-                    var baseTypeNode = ts.getClassExtendsHeritageClauseElement(ts.getContainingClass(node));
-                    if (baseTypeNode) {
-                        var baseConstructors = getInstantiatedConstructorsForTypeArguments(superType, baseTypeNode.typeArguments);
-                        return resolveCall(node, baseConstructors, candidatesOutArray);
-                    }
-                }
-                return resolveUntypedCall(node);
-            }
-            var funcType = checkNonNullExpression(node.expression);
-            var apparentType = getApparentType(funcType);
-            if (apparentType === unknownType) {
-                // Another error has already been reported
-                return resolveErrorCall(node);
-            }
-            // Technically, this signatures list may be incomplete. We are taking the apparent type,
-            // but we are not including call signatures that may have been added to the Object or
-            // Function interface, since they have none by default. This is a bit of a leap of faith
-            // that the user will not add any.
-            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
-            var constructSignatures = getSignaturesOfType(apparentType, 1 /* Construct */);
-            // TS 1.0 spec: 4.12
-            // If FuncExpr is of type Any, or of an object type that has no call or construct signatures
-            // but is a subtype of the Function interface, the call is an untyped function call. In an
-            // untyped function call no TypeArgs are permitted, Args can be any argument list, no contextual
-            // types are provided for the argument expressions, and the result is always of type Any.
-            // We exclude union types because we may have a union of function types that happen to have
-            // no common signatures.
-            if (isTypeAny(funcType) ||
-                (isTypeAny(apparentType) && funcType.flags & 512 /* TypeParameter */) ||
-                (!callSignatures.length && !constructSignatures.length && !(funcType.flags & 16384 /* Union */) && isTypeAssignableTo(funcType, globalFunctionType))) {
-                // The unknownType indicates that an error already occurred (and was reported).  No
-                // need to report another error in this case.
-                if (funcType !== unknownType && node.typeArguments) {
-                    error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
-                }
-                return resolveUntypedCall(node);
-            }
-            // If FuncExpr's apparent type(section 3.8.1) is a function type, the call is a typed function call.
-            // TypeScript employs overload resolution in typed function calls in order to support functions
-            // with multiple call signatures.
-            if (!callSignatures.length) {
-                if (constructSignatures.length) {
-                    error(node, ts.Diagnostics.Value_of_type_0_is_not_callable_Did_you_mean_to_include_new, typeToString(funcType));
-                }
-                else {
-                    error(node, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
-                }
-                return resolveErrorCall(node);
-            }
-            return resolveCall(node, callSignatures, candidatesOutArray);
-        }
-        function resolveNewExpression(node, candidatesOutArray) {
-            if (node.arguments && languageVersion < 1 /* ES5 */) {
-                var spreadIndex = getSpreadArgumentIndex(node.arguments);
-                if (spreadIndex >= 0) {
-                    error(node.arguments[spreadIndex], ts.Diagnostics.Spread_operator_in_new_expressions_is_only_available_when_targeting_ECMAScript_5_and_higher);
-                }
-            }
-            var expressionType = checkNonNullExpression(node.expression);
-            // If expressionType's apparent type(section 3.8.1) is an object type with one or
-            // more construct signatures, the expression is processed in the same manner as a
-            // function call, but using the construct signatures as the initial set of candidate
-            // signatures for overload resolution. The result type of the function call becomes
-            // the result type of the operation.
-            expressionType = getApparentType(expressionType);
-            if (expressionType === unknownType) {
-                // Another error has already been reported
-                return resolveErrorCall(node);
-            }
-            // If the expression is a class of abstract type, then it cannot be instantiated.
-            // Note, only class declarations can be declared abstract.
-            // In the case of a merged class-module or class-interface declaration,
-            // only the class declaration node will have the Abstract flag set.
-            var valueDecl = expressionType.symbol && getClassLikeDeclarationOfSymbol(expressionType.symbol);
-            if (valueDecl && valueDecl.flags & 128 /* Abstract */) {
-                error(node, ts.Diagnostics.Cannot_create_an_instance_of_the_abstract_class_0, ts.declarationNameToString(valueDecl.name));
-                return resolveErrorCall(node);
-            }
-            // TS 1.0 spec: 4.11
-            // If expressionType is of type Any, Args can be any argument
-            // list and the result of the operation is of type Any.
-            if (isTypeAny(expressionType)) {
-                if (node.typeArguments) {
-                    error(node, ts.Diagnostics.Untyped_function_calls_may_not_accept_type_arguments);
-                }
-                return resolveUntypedCall(node);
-            }
-            // Technically, this signatures list may be incomplete. We are taking the apparent type,
-            // but we are not including construct signatures that may have been added to the Object or
-            // Function interface, since they have none by default. This is a bit of a leap of faith
-            // that the user will not add any.
-            var constructSignatures = getSignaturesOfType(expressionType, 1 /* Construct */);
-            if (constructSignatures.length) {
-                if (!isConstructorAccessible(node, constructSignatures[0])) {
-                    return resolveErrorCall(node);
-                }
-                return resolveCall(node, constructSignatures, candidatesOutArray);
-            }
-            // If expressionType's apparent type is an object type with no construct signatures but
-            // one or more call signatures, the expression is processed as a function call. A compile-time
-            // error occurs if the result of the function call is not Void. The type of the result of the
-            // operation is Any. It is an error to have a Void this type.
-            var callSignatures = getSignaturesOfType(expressionType, 0 /* Call */);
-            if (callSignatures.length) {
-                var signature = resolveCall(node, callSignatures, candidatesOutArray);
-                if (getReturnTypeOfSignature(signature) !== voidType) {
-                    error(node, ts.Diagnostics.Only_a_void_function_can_be_called_with_the_new_keyword);
-                }
-                if (getThisTypeOfSignature(signature) === voidType) {
-                    error(node, ts.Diagnostics.A_function_that_is_called_with_the_new_keyword_cannot_have_a_this_type_that_is_void);
-                }
-                return signature;
-            }
-            error(node, ts.Diagnostics.Cannot_use_new_with_an_expression_whose_type_lacks_a_call_or_construct_signature);
-            return resolveErrorCall(node);
-        }
-        function isConstructorAccessible(node, signature) {
-            if (!signature || !signature.declaration) {
-                return true;
-            }
-            var declaration = signature.declaration;
-            var flags = declaration.flags;
-            // Public constructor is accessible.
-            if (!(flags & (8 /* Private */ | 16 /* Protected */))) {
-                return true;
-            }
-            var declaringClassDeclaration = getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
-            var declaringClass = getDeclaredTypeOfSymbol(declaration.parent.symbol);
-            // A private or protected constructor can only be instantiated within it's own class
-            if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                if (flags & 8 /* Private */) {
-                    error(node, ts.Diagnostics.Constructor_of_class_0_is_private_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
-                }
-                if (flags & 16 /* Protected */) {
-                    error(node, ts.Diagnostics.Constructor_of_class_0_is_protected_and_only_accessible_within_the_class_declaration, typeToString(declaringClass));
-                }
-                return false;
-            }
-            return true;
-        }
-        function resolveTaggedTemplateExpression(node, candidatesOutArray) {
-            var tagType = checkExpression(node.tag);
-            var apparentType = getApparentType(tagType);
-            if (apparentType === unknownType) {
-                // Another error has already been reported
-                return resolveErrorCall(node);
-            }
-            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
-            if (isTypeAny(tagType) || (!callSignatures.length && !(tagType.flags & 16384 /* Union */) && isTypeAssignableTo(tagType, globalFunctionType))) {
-                return resolveUntypedCall(node);
-            }
-            if (!callSignatures.length) {
-                error(node, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
-                return resolveErrorCall(node);
-            }
-            return resolveCall(node, callSignatures, candidatesOutArray);
-        }
-        /**
-          * Gets the localized diagnostic head message to use for errors when resolving a decorator as a call expression.
-          */
-        function getDiagnosticHeadMessageForDecoratorResolution(node) {
-            switch (node.parent.kind) {
-                case 221 /* ClassDeclaration */:
-                case 192 /* ClassExpression */:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 142 /* Parameter */:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 145 /* PropertyDeclaration */:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 147 /* MethodDeclaration */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                    return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
-            }
-        }
-        /**
-          * Resolves a decorator as if it were a call expression.
-          */
-        function resolveDecorator(node, candidatesOutArray) {
-            var funcType = checkExpression(node.expression);
-            var apparentType = getApparentType(funcType);
-            if (apparentType === unknownType) {
-                return resolveErrorCall(node);
-            }
-            var callSignatures = getSignaturesOfType(apparentType, 0 /* Call */);
-            if (funcType === anyType || (!callSignatures.length && !(funcType.flags & 16384 /* Union */) && isTypeAssignableTo(funcType, globalFunctionType))) {
-                return resolveUntypedCall(node);
-            }
-            var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
-            if (!callSignatures.length) {
-                var errorInfo = void 0;
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Cannot_invoke_an_expression_whose_type_lacks_a_call_signature);
-                errorInfo = ts.chainDiagnosticMessages(errorInfo, headMessage);
-                diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(node, errorInfo));
-                return resolveErrorCall(node);
-            }
-            return resolveCall(node, callSignatures, candidatesOutArray, headMessage);
-        }
-        function resolveSignature(node, candidatesOutArray) {
-            switch (node.kind) {
-                case 174 /* CallExpression */:
-                    return resolveCallExpression(node, candidatesOutArray);
-                case 175 /* NewExpression */:
-                    return resolveNewExpression(node, candidatesOutArray);
-                case 176 /* TaggedTemplateExpression */:
-                    return resolveTaggedTemplateExpression(node, candidatesOutArray);
-                case 143 /* Decorator */:
-                    return resolveDecorator(node, candidatesOutArray);
-            }
-            ts.Debug.fail("Branch in 'resolveSignature' should be unreachable.");
-        }
-        // candidatesOutArray is passed by signature help in the language service, and collectCandidates
-        // must fill it up with the appropriate candidate signatures
-        function getResolvedSignature(node, candidatesOutArray) {
-            var links = getNodeLinks(node);
-            // If getResolvedSignature has already been called, we will have cached the resolvedSignature.
-            // However, it is possible that either candidatesOutArray was not passed in the first time,
-            // or that a different candidatesOutArray was passed in. Therefore, we need to redo the work
-            // to correctly fill the candidatesOutArray.
-            var cached = links.resolvedSignature;
-            if (cached && cached !== anySignature && !candidatesOutArray) {
-                return cached;
-            }
-            links.resolvedSignature = anySignature;
-            var result = resolveSignature(node, candidatesOutArray);
-            // If signature resolution originated in control flow type analysis (for example to compute the
-            // assigned type in a flow assignment) we don't cache the result as it may be based on temporary
-            // types from the control flow analysis.
-            links.resolvedSignature = flowLoopStart === flowLoopCount ? result : cached;
-            return result;
-        }
-        function getResolvedOrAnySignature(node) {
-            // If we're already in the process of resolving the given signature, don't resolve again as
-            // that could cause infinite recursion. Instead, return anySignature.
-            return getNodeLinks(node).resolvedSignature === anySignature ? anySignature : getResolvedSignature(node);
-        }
-        function getInferredClassType(symbol) {
-            var links = getSymbolLinks(symbol);
-            if (!links.inferredClassType) {
-                links.inferredClassType = createAnonymousType(undefined, symbol.members, emptyArray, emptyArray, /*stringIndexType*/ undefined, /*numberIndexType*/ undefined);
-            }
-            return links.inferredClassType;
-        }
-        /**
-         * Syntactically and semantically checks a call or new expression.
-         * @param node The call/new expression to be checked.
-         * @returns On success, the expression's signature's return type. On failure, anyType.
-         */
-        function checkCallExpression(node) {
-            // Grammar checking; stop grammar-checking if checkGrammarTypeArguments return true
-            checkGrammarTypeArguments(node, node.typeArguments) || checkGrammarArguments(node, node.arguments);
-            var signature = getResolvedSignature(node);
-            if (node.expression.kind === 95 /* SuperKeyword */) {
-                return voidType;
-            }
-            if (node.kind === 175 /* NewExpression */) {
-                var declaration = signature.declaration;
-                if (declaration &&
-                    declaration.kind !== 148 /* Constructor */ &&
-                    declaration.kind !== 152 /* ConstructSignature */ &&
-                    declaration.kind !== 157 /* ConstructorType */ &&
-                    !ts.isJSDocConstructSignature(declaration)) {
-                    // When resolved signature is a call signature (and not a construct signature) the result type is any, unless
-                    // the declaring function had members created through 'x.prototype.y = expr' or 'this.y = expr' psuedodeclarations
-                    // in a JS file
-                    // Note:JS inferred classes might come from a variable declaration instead of a function declaration.
-                    // In this case, using getResolvedSymbol directly is required to avoid losing the members from the declaration.
-                    var funcSymbol = node.expression.kind === 69 /* Identifier */ ?
-                        getResolvedSymbol(node.expression) :
-                        checkExpression(node.expression).symbol;
-                    if (funcSymbol && funcSymbol.members && (funcSymbol.flags & 16 /* Function */ || ts.isDeclarationOfFunctionExpression(funcSymbol))) {
-                        return getInferredClassType(funcSymbol);
-                    }
-                    else if (compilerOptions.noImplicitAny) {
-                        error(node, ts.Diagnostics.new_expression_whose_target_lacks_a_construct_signature_implicitly_has_an_any_type);
-                    }
-                    return anyType;
-                }
-            }
-            // In JavaScript files, calls to any identifier 'require' are treated as external module imports
-            if (ts.isInJavaScriptFile(node) && ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
-                return resolveExternalModuleTypeByLiteral(node.arguments[0]);
-            }
-            return getReturnTypeOfSignature(signature);
-        }
-        function checkTaggedTemplateExpression(node) {
-            return getReturnTypeOfSignature(getResolvedSignature(node));
-        }
-        function checkAssertion(node) {
-            var exprType = getRegularTypeOfObjectLiteral(checkExpression(node.expression));
-            checkSourceElement(node.type);
-            var targetType = getTypeFromTypeNode(node.type);
-            if (produceDiagnostics && targetType !== unknownType) {
-                var widenedType = getWidenedType(exprType);
-                if (!isTypeComparableTo(targetType, widenedType)) {
-                    checkTypeComparableTo(exprType, targetType, node, ts.Diagnostics.Type_0_cannot_be_converted_to_type_1);
-                }
-            }
-            return targetType;
-        }
-        function checkNonNullAssertion(node) {
-            return getNonNullableType(checkExpression(node.expression));
-        }
-        function getTypeOfParameter(symbol) {
-            var type = getTypeOfSymbol(symbol);
-            if (strictNullChecks) {
-                var declaration = symbol.valueDeclaration;
-                if (declaration && declaration.initializer) {
-                    return addTypeKind(type, 32 /* Undefined */);
-                }
-            }
-            return type;
-        }
-        function getTypeAtPosition(signature, pos) {
-            return signature.hasRestParameter ?
-                pos < signature.parameters.length - 1 ? getTypeOfParameter(signature.parameters[pos]) : getRestTypeOfSignature(signature) :
-                pos < signature.parameters.length ? getTypeOfParameter(signature.parameters[pos]) : anyType;
-        }
-        function assignContextualParameterTypes(signature, context, mapper) {
-            var len = signature.parameters.length - (signature.hasRestParameter ? 1 : 0);
-            for (var i = 0; i < len; i++) {
-                var parameter = signature.parameters[i];
-                var contextualParameterType = getTypeAtPosition(context, i);
-                assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
-            }
-            if (signature.hasRestParameter && isRestParameterIndex(context, signature.parameters.length - 1)) {
-                var parameter = ts.lastOrUndefined(signature.parameters);
-                var contextualParameterType = getTypeOfSymbol(ts.lastOrUndefined(context.parameters));
-                assignTypeToParameterAndFixTypeParameters(parameter, contextualParameterType, mapper);
-            }
-        }
-        // When contextual typing assigns a type to a parameter that contains a binding pattern, we also need to push
-        // the destructured type into the contained binding elements.
-        function assignBindingElementTypes(node) {
-            if (ts.isBindingPattern(node.name)) {
-                for (var _i = 0, _a = node.name.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (element.kind !== 193 /* OmittedExpression */) {
-                        if (element.name.kind === 69 /* Identifier */) {
-                            getSymbolLinks(getSymbolOfNode(element)).type = getTypeForBindingElement(element);
-                        }
-                        assignBindingElementTypes(element);
-                    }
-                }
-            }
-        }
-        function assignTypeToParameterAndFixTypeParameters(parameter, contextualType, mapper) {
-            var links = getSymbolLinks(parameter);
-            if (!links.type) {
-                links.type = instantiateType(contextualType, mapper);
-                // if inference didn't come up with anything but {}, fall back to the binding pattern if present.
-                if (links.type === emptyObjectType &&
-                    (parameter.valueDeclaration.name.kind === 167 /* ObjectBindingPattern */ ||
-                        parameter.valueDeclaration.name.kind === 168 /* ArrayBindingPattern */)) {
-                    links.type = getTypeFromBindingPattern(parameter.valueDeclaration.name);
-                }
-                assignBindingElementTypes(parameter.valueDeclaration);
-            }
-            else if (isInferentialContext(mapper)) {
-                // Even if the parameter already has a type, it might be because it was given a type while
-                // processing the function as an argument to a prior signature during overload resolution.
-                // If this was the case, it may have caused some type parameters to be fixed. So here,
-                // we need to ensure that type parameters at the same positions get fixed again. This is
-                // done by calling instantiateType to attach the mapper to the contextualType, and then
-                // calling inferTypes to force a walk of contextualType so that all the correct fixing
-                // happens. The choice to pass in links.type may seem kind of arbitrary, but it serves
-                // to make sure that all the correct positions in contextualType are reached by the walk.
-                // Here is an example:
-                //
-                //      interface Base {
-                //          baseProp;
-                //      }
-                //      interface Derived extends Base {
-                //          toBase(): Base;
-                //      }
-                //
-                //      var derived: Derived;
-                //
-                //      declare function foo<T>(x: T, func: (p: T) => T): T;
-                //      declare function foo<T>(x: T, func: (p: T) => T): T;
-                //
-                //      var result = foo(derived, d => d.toBase());
-                //
-                // We are typing d while checking the second overload. But we've already given d
-                // a type (Derived) from the first overload. However, we still want to fix the
-                // T in the second overload so that we do not infer Base as a candidate for T
-                // (inferring Base would make type argument inference inconsistent between the two
-                // overloads).
-                inferTypes(mapper.context, links.type, instantiateType(contextualType, mapper));
-            }
-        }
-        function getReturnTypeFromJSDocComment(func) {
-            var returnTag = ts.getJSDocReturnTag(func);
-            if (returnTag && returnTag.typeExpression) {
-                return getTypeFromTypeNode(returnTag.typeExpression.type);
-            }
-            return undefined;
-        }
-        function createPromiseType(promisedType) {
-            // creates a `Promise<T>` type where `T` is the promisedType argument
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType !== emptyGenericType) {
-                // if the promised type is itself a promise, get the underlying type; otherwise, fallback to the promised type
-                promisedType = getAwaitedType(promisedType);
-                return createTypeReference(globalPromiseType, [promisedType]);
-            }
-            return emptyObjectType;
-        }
-        function createPromiseReturnType(func, promisedType) {
-            var promiseType = createPromiseType(promisedType);
-            if (promiseType === emptyObjectType) {
-                error(func, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-                return unknownType;
-            }
-            return promiseType;
-        }
-        function getReturnTypeFromBody(func, contextualMapper) {
-            var contextualSignature = getContextualSignatureForFunctionLikeDeclaration(func);
-            if (!func.body) {
-                return unknownType;
-            }
-            var isAsync = ts.isAsyncFunctionLike(func);
-            var type;
-            if (func.body.kind !== 199 /* Block */) {
-                type = checkExpressionCached(func.body, contextualMapper);
-                if (isAsync) {
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                    // return type of the body should be unwrapped to its awaited type, which we will wrap in
-                    // the native Promise<T> type later in this function.
-                    type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
-                }
-            }
-            else {
-                var types = void 0;
-                var funcIsGenerator = !!func.asteriskToken;
-                if (funcIsGenerator) {
-                    types = checkAndAggregateYieldOperandTypes(func, contextualMapper);
-                    if (types.length === 0) {
-                        var iterableIteratorAny = createIterableIteratorType(anyType);
-                        if (compilerOptions.noImplicitAny) {
-                            error(func.asteriskToken, ts.Diagnostics.Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type, typeToString(iterableIteratorAny));
-                        }
-                        return iterableIteratorAny;
-                    }
-                }
-                else {
-                    types = checkAndAggregateReturnExpressionTypes(func, contextualMapper);
-                    if (!types) {
-                        // For an async function, the return type will not be never, but rather a Promise for never.
-                        return isAsync ? createPromiseReturnType(func, neverType) : neverType;
-                    }
-                    if (types.length === 0) {
-                        // For an async function, the return type will not be void, but rather a Promise for void.
-                        return isAsync ? createPromiseReturnType(func, voidType) : voidType;
-                    }
-                }
-                // When yield/return statements are contextually typed we allow the return type to be a union type.
-                // Otherwise we require the yield/return expressions to have a best common supertype.
-                type = contextualSignature ? getUnionType(types) : getCommonSupertype(types);
-                if (!type) {
-                    if (funcIsGenerator) {
-                        error(func, ts.Diagnostics.No_best_common_type_exists_among_yield_expressions);
-                        return createIterableIteratorType(unknownType);
-                    }
-                    else {
-                        error(func, ts.Diagnostics.No_best_common_type_exists_among_return_expressions);
-                        // Defer to unioning the return types so we get a) downstream errors earlier and b) better Salsa experience
-                        return isAsync ? createPromiseReturnType(func, getUnionType(types)) : getUnionType(types);
-                    }
-                }
-                if (funcIsGenerator) {
-                    type = createIterableIteratorType(type);
-                }
-            }
-            if (!contextualSignature) {
-                reportErrorsFromWidening(func, type);
-            }
-            var widenedType = getWidenedType(type);
-            // From within an async function you can return either a non-promise value or a promise. Any
-            // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-            // return type of the body is awaited type of the body, wrapped in a native Promise<T> type.
-            return isAsync ? createPromiseReturnType(func, widenedType) : widenedType;
-        }
-        function checkAndAggregateYieldOperandTypes(func, contextualMapper) {
-            var aggregatedTypes = [];
-            ts.forEachYieldExpression(func.body, function (yieldExpression) {
-                var expr = yieldExpression.expression;
-                if (expr) {
-                    var type = checkExpressionCached(expr, contextualMapper);
-                    if (yieldExpression.asteriskToken) {
-                        // A yield* expression effectively yields everything that its operand yields
-                        type = checkElementTypeOfIterable(type, yieldExpression.expression);
-                    }
-                    if (!ts.contains(aggregatedTypes, type)) {
-                        aggregatedTypes.push(type);
-                    }
-                }
-            });
-            return aggregatedTypes;
-        }
-        function isExhaustiveSwitchStatement(node) {
-            var expr = node.expression;
-            if (!node.possiblyExhaustive || expr.kind !== 172 /* PropertyAccessExpression */) {
-                return false;
-            }
-            var type = checkExpression(expr.expression);
-            if (!(type.flags & 16384 /* Union */)) {
-                return false;
-            }
-            var propName = expr.name.text;
-            var propType = getTypeOfPropertyOfType(type, propName);
-            if (!propType || !isStringLiteralUnionType(propType)) {
-                return false;
-            }
-            var switchTypes = getSwitchClauseTypes(node);
-            if (!switchTypes.length) {
-                return false;
-            }
-            return eachTypeContainedIn(propType, switchTypes);
-        }
-        function functionHasImplicitReturn(func) {
-            if (!(func.flags & 32768 /* HasImplicitReturn */)) {
-                return false;
-            }
-            var lastStatement = ts.lastOrUndefined(func.body.statements);
-            if (lastStatement && lastStatement.kind === 213 /* SwitchStatement */ && isExhaustiveSwitchStatement(lastStatement)) {
-                return false;
-            }
-            return true;
-        }
-        function checkAndAggregateReturnExpressionTypes(func, contextualMapper) {
-            var isAsync = ts.isAsyncFunctionLike(func);
-            var aggregatedTypes = [];
-            var hasReturnWithNoExpression = functionHasImplicitReturn(func);
-            var hasReturnOfTypeNever = false;
-            ts.forEachReturnStatement(func.body, function (returnStatement) {
-                var expr = returnStatement.expression;
-                if (expr) {
-                    var type = checkExpressionCached(expr, contextualMapper);
-                    if (isAsync) {
-                        // From within an async function you can return either a non-promise value or a promise. Any
-                        // Promise/A+ compatible implementation will always assimilate any foreign promise, so the
-                        // return type of the body should be unwrapped to its awaited type, which should be wrapped in
-                        // the native Promise<T> type by the caller.
-                        type = checkAwaitedType(type, func, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
-                    }
-                    if (type === neverType) {
-                        hasReturnOfTypeNever = true;
-                    }
-                    else if (!ts.contains(aggregatedTypes, type)) {
-                        aggregatedTypes.push(type);
-                    }
-                }
-                else {
-                    hasReturnWithNoExpression = true;
-                }
-            });
-            if (aggregatedTypes.length === 0 && !hasReturnWithNoExpression && (hasReturnOfTypeNever ||
-                func.kind === 179 /* FunctionExpression */ || func.kind === 180 /* ArrowFunction */)) {
-                return undefined;
-            }
-            if (strictNullChecks && aggregatedTypes.length && hasReturnWithNoExpression) {
-                if (!ts.contains(aggregatedTypes, undefinedType)) {
-                    aggregatedTypes.push(undefinedType);
-                }
-            }
-            return aggregatedTypes;
-        }
-        /**
-         * TypeScript Specification 1.0 (6.3) - July 2014
-         *   An explicitly typed function whose return type isn't the Void type,
-         *   the Any type, or a union type containing the Void or Any type as a constituent
-         *   must have at least one return statement somewhere in its body.
-         *   An exception to this rule is if the function implementation consists of a single 'throw' statement.
-         *
-         * @param returnType - return type of the function, can be undefined if return type is not explicitly specified
-         */
-        function checkAllCodePathsInNonVoidFunctionReturnOrThrow(func, returnType) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            // Functions with with an explicitly specified 'void' or 'any' return type don't need any return expressions.
-            if (returnType && maybeTypeOfKind(returnType, 1 /* Any */ | 16 /* Void */)) {
-                return;
-            }
-            // If all we have is a function signature, or an arrow function with an expression body, then there is nothing to check.
-            // also if HasImplicitReturn flag is not set this means that all codepaths in function body end with return or throw
-            if (ts.nodeIsMissing(func.body) || func.body.kind !== 199 /* Block */ || !functionHasImplicitReturn(func)) {
-                return;
-            }
-            var hasExplicitReturn = func.flags & 65536 /* HasExplicitReturn */;
-            if (returnType === neverType) {
-                error(func.type, ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
-            }
-            else if (returnType && !hasExplicitReturn) {
-                // minimal check: function has syntactic return type annotation and no explicit return statements in the body
-                // this function does not conform to the specification.
-                // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
-                error(func.type, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
-            }
-            else if (returnType && strictNullChecks && !isTypeAssignableTo(undefinedType, returnType)) {
-                error(func.type, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
-            }
-            else if (compilerOptions.noImplicitReturns) {
-                if (!returnType) {
-                    // If return type annotation is omitted check if function has any explicit return statements.
-                    // If it does not have any - its inferred return type is void - don't do any checks.
-                    // Otherwise get inferred return type from function body and report error only if it is not void / anytype
-                    if (!hasExplicitReturn) {
-                        return;
-                    }
-                    var inferredReturnType = getReturnTypeOfSignature(getSignatureFromDeclaration(func));
-                    if (isUnwrappedReturnTypeVoidOrAny(func, inferredReturnType)) {
-                        return;
-                    }
-                }
-                error(func.type || func, ts.Diagnostics.Not_all_code_paths_return_a_value);
-            }
-        }
-        function checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper) {
-            ts.Debug.assert(node.kind !== 147 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
-            // Grammar checking
-            var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 179 /* FunctionExpression */) {
-                checkGrammarForGenerator(node);
-            }
-            // The identityMapper object is used to indicate that function expressions are wildcards
-            if (contextualMapper === identityMapper && isContextSensitive(node)) {
-                checkNodeDeferred(node);
-                return anyFunctionType;
-            }
-            var links = getNodeLinks(node);
-            var type = getTypeOfSymbol(node.symbol);
-            var contextSensitive = isContextSensitive(node);
-            var mightFixTypeParameters = contextSensitive && isInferentialContext(contextualMapper);
-            // Check if function expression is contextually typed and assign parameter types if so.
-            // See the comment in assignTypeToParameterAndFixTypeParameters to understand why we need to
-            // check mightFixTypeParameters.
-            if (mightFixTypeParameters || !(links.flags & 1024 /* ContextChecked */)) {
-                var contextualSignature = getContextualSignature(node);
-                // If a type check is started at a function expression that is an argument of a function call, obtaining the
-                // contextual type may recursively get back to here during overload resolution of the call. If so, we will have
-                // already assigned contextual types.
-                var contextChecked = !!(links.flags & 1024 /* ContextChecked */);
-                if (mightFixTypeParameters || !contextChecked) {
-                    links.flags |= 1024 /* ContextChecked */;
-                    if (contextualSignature) {
-                        var signature = getSignaturesOfType(type, 0 /* Call */)[0];
-                        if (contextSensitive) {
-                            assignContextualParameterTypes(signature, contextualSignature, contextualMapper || identityMapper);
-                        }
-                        if (mightFixTypeParameters || !node.type && !signature.resolvedReturnType) {
-                            var returnType = getReturnTypeFromBody(node, contextualMapper);
-                            if (!signature.resolvedReturnType) {
-                                signature.resolvedReturnType = returnType;
-                            }
-                        }
-                    }
-                    if (!contextChecked) {
-                        checkSignatureDeclaration(node);
-                        checkNodeDeferred(node);
-                    }
-                }
-            }
-            if (produceDiagnostics && node.kind !== 147 /* MethodDeclaration */ && node.kind !== 146 /* MethodSignature */) {
-                checkCollisionWithCapturedSuperVariable(node, node.name);
-                checkCollisionWithCapturedThisVariable(node, node.name);
-            }
-            return type;
-        }
-        function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 147 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
-            var isAsync = ts.isAsyncFunctionLike(node);
-            var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
-            if (!node.asteriskToken) {
-                // return is not necessary in the body of generators
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
-            if (node.body) {
-                if (!node.type) {
-                    // There are some checks that are only performed in getReturnTypeFromBody, that may produce errors
-                    // we need. An example is the noImplicitAny errors resulting from widening the return expression
-                    // of a function. Because checking of function expression bodies is deferred, there was never an
-                    // appropriate time to do this during the main walk of the file (see the comment at the top of
-                    // checkFunctionExpressionBodies). So it must be done now.
-                    getReturnTypeOfSignature(getSignatureFromDeclaration(node));
-                }
-                if (node.body.kind === 199 /* Block */) {
-                    checkSourceElement(node.body);
-                }
-                else {
-                    // From within an async function you can return either a non-promise value or a promise. Any
-                    // Promise/A+ compatible implementation will always assimilate any foreign promise, so we
-                    // should not be checking assignability of a promise to the return type. Instead, we need to
-                    // check assignability of the awaited type of the expression body against the promised type of
-                    // its return type annotation.
-                    var exprType = checkExpression(node.body);
-                    if (returnOrPromisedType) {
-                        if (isAsync) {
-                            var awaitedType = checkAwaitedType(exprType, node.body, ts.Diagnostics.Expression_body_for_async_arrow_function_does_not_have_a_valid_callable_then_member);
-                            checkTypeAssignableTo(awaitedType, returnOrPromisedType, node.body);
-                        }
-                        else {
-                            checkTypeAssignableTo(exprType, returnOrPromisedType, node.body);
-                        }
-                    }
-                }
-                registerForUnusedIdentifiersCheck(node);
-            }
-        }
-        function checkArithmeticOperandType(operand, type, diagnostic) {
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(type, 132 /* NumberLike */)) {
-                error(operand, diagnostic);
-                return false;
-            }
-            return true;
-        }
-        function isReadonlySymbol(symbol) {
-            // The following symbols are considered read-only:
-            // Properties with a 'readonly' modifier
-            // Variables declared with 'const'
-            // Get accessors without matching set accessors
-            // Enum members
-            // Unions and intersections of the above (unions and intersections eagerly set isReadonly on creation)
-            return symbol.isReadonly ||
-                symbol.flags & 4 /* Property */ && (getDeclarationFlagsFromSymbol(symbol) & 64 /* Readonly */) !== 0 ||
-                symbol.flags & 3 /* Variable */ && (getDeclarationFlagsFromSymbol(symbol) & 2048 /* Const */) !== 0 ||
-                symbol.flags & 98304 /* Accessor */ && !(symbol.flags & 65536 /* SetAccessor */) ||
-                (symbol.flags & 8 /* EnumMember */) !== 0;
-        }
-        function isReferenceToReadonlyEntity(expr, symbol) {
-            if (isReadonlySymbol(symbol)) {
-                // Allow assignments to readonly properties within constructors of the same class declaration.
-                if (symbol.flags & 4 /* Property */ &&
-                    (expr.kind === 172 /* PropertyAccessExpression */ || expr.kind === 173 /* ElementAccessExpression */) &&
-                    expr.expression.kind === 97 /* ThisKeyword */) {
-                    // Look for if this is the constructor for the class that `symbol` is a property of.
-                    var func = ts.getContainingFunction(expr);
-                    if (!(func && func.kind === 148 /* Constructor */))
-                        return true;
-                    // If func.parent is a class and symbol is a (readonly) property of that class, or
-                    // if func is a constructor and symbol is a (readonly) parameter property declared in it,
-                    // then symbol is writeable here.
-                    return !(func.parent === symbol.valueDeclaration.parent || func === symbol.valueDeclaration.parent);
-                }
-                return true;
-            }
-            return false;
-        }
-        function isReferenceThroughNamespaceImport(expr) {
-            if (expr.kind === 172 /* PropertyAccessExpression */ || expr.kind === 173 /* ElementAccessExpression */) {
-                var node = skipParenthesizedNodes(expr.expression);
-                if (node.kind === 69 /* Identifier */) {
-                    var symbol = getNodeLinks(node).resolvedSymbol;
-                    if (symbol.flags & 8388608 /* Alias */) {
-                        var declaration = getDeclarationOfAliasSymbol(symbol);
-                        return declaration && declaration.kind === 232 /* NamespaceImport */;
-                    }
-                }
-            }
-            return false;
-        }
-        function checkReferenceExpression(expr, invalidReferenceMessage, constantVariableMessage) {
-            // References are combinations of identifiers, parentheses, and property accesses.
-            var node = skipParenthesizedNodes(expr);
-            if (node.kind !== 69 /* Identifier */ && node.kind !== 172 /* PropertyAccessExpression */ && node.kind !== 173 /* ElementAccessExpression */) {
-                error(expr, invalidReferenceMessage);
-                return false;
-            }
-            // Because we get the symbol from the resolvedSymbol property, it might be of kind
-            // SymbolFlags.ExportValue. In this case it is necessary to get the actual export
-            // symbol, which will have the correct flags set on it.
-            var links = getNodeLinks(node);
-            var symbol = getExportSymbolOfValueSymbolIfExported(links.resolvedSymbol);
-            if (symbol) {
-                if (symbol !== unknownSymbol && symbol !== argumentsSymbol) {
-                    // Only variables (and not functions, classes, namespaces, enum objects, or enum members)
-                    // are considered references when referenced using a simple identifier.
-                    if (node.kind === 69 /* Identifier */ && !(symbol.flags & 3 /* Variable */)) {
-                        error(expr, invalidReferenceMessage);
-                        return false;
-                    }
-                    if (isReferenceToReadonlyEntity(node, symbol) || isReferenceThroughNamespaceImport(node)) {
-                        error(expr, constantVariableMessage);
-                        return false;
-                    }
-                }
-            }
-            else if (node.kind === 173 /* ElementAccessExpression */) {
-                if (links.resolvedIndexInfo && links.resolvedIndexInfo.isReadonly) {
-                    error(expr, constantVariableMessage);
-                    return false;
-                }
-            }
-            return true;
-        }
-        function checkDeleteExpression(node) {
-            checkExpression(node.expression);
-            return booleanType;
-        }
-        function checkTypeOfExpression(node) {
-            checkExpression(node.expression);
-            return stringType;
-        }
-        function checkVoidExpression(node) {
-            checkExpression(node.expression);
-            return undefinedWideningType;
-        }
-        function checkAwaitExpression(node) {
-            // Grammar checking
-            if (produceDiagnostics) {
-                if (!(node.flags & 33554432 /* AwaitContext */)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.await_expression_is_only_allowed_within_an_async_function);
-                }
-                if (isInParameterInitializerBeforeContainingFunction(node)) {
-                    error(node, ts.Diagnostics.await_expressions_cannot_be_used_in_a_parameter_initializer);
-                }
-            }
-            var operandType = checkExpression(node.expression);
-            return checkAwaitedType(operandType, node);
-        }
-        function checkPrefixUnaryExpression(node) {
-            var operandType = checkExpression(node.operand);
-            switch (node.operator) {
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 50 /* TildeToken */:
-                    if (maybeTypeOfKind(operandType, 16777216 /* ESSymbol */)) {
-                        error(node.operand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(node.operator));
-                    }
-                    return numberType;
-                case 49 /* ExclamationToken */:
-                    return booleanType;
-                case 41 /* PlusPlusToken */:
-                case 42 /* MinusMinusToken */:
-                    var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
-                    if (ok) {
-                        // run check only if former checks succeeded to avoid reporting cascading errors
-                        checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
-                    }
-                    return numberType;
-            }
-            return unknownType;
-        }
-        function checkPostfixUnaryExpression(node) {
-            var operandType = checkExpression(node.operand);
-            var ok = checkArithmeticOperandType(node.operand, getNonNullableType(operandType), ts.Diagnostics.An_arithmetic_operand_must_be_of_type_any_number_or_an_enum_type);
-            if (ok) {
-                // run check only if former checks succeeded to avoid reporting cascading errors
-                checkReferenceExpression(node.operand, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_must_be_a_variable_property_or_indexer, ts.Diagnostics.The_operand_of_an_increment_or_decrement_operator_cannot_be_a_constant_or_a_read_only_property);
-            }
-            return numberType;
-        }
-        // Return true if type might be of the given kind. A union or intersection type might be of a given
-        // kind if at least one constituent type is of the given kind.
-        function maybeTypeOfKind(type, kind) {
-            if (type.flags & kind) {
-                return true;
-            }
-            if (type.flags & 49152 /* UnionOrIntersection */) {
-                var types = type.types;
-                for (var _i = 0, types_10 = types; _i < types_10.length; _i++) {
-                    var t = types_10[_i];
-                    if (maybeTypeOfKind(t, kind)) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        // Return true if type is of the given kind. A union type is of a given kind if all constituent types
-        // are of the given kind. An intersection type is of a given kind if at least one constituent type is
-        // of the given kind.
-        function isTypeOfKind(type, kind) {
-            if (type.flags & kind) {
-                return true;
-            }
-            if (type.flags & 16384 /* Union */) {
-                var types = type.types;
-                for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
-                    var t = types_11[_i];
-                    if (!isTypeOfKind(t, kind)) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            if (type.flags & 32768 /* Intersection */) {
-                var types = type.types;
-                for (var _a = 0, types_12 = types; _a < types_12.length; _a++) {
-                    var t = types_12[_a];
-                    if (isTypeOfKind(t, kind)) {
-                        return true;
-                    }
-                }
-            }
-            return false;
-        }
-        function isConstEnumObjectType(type) {
-            return type.flags & (80896 /* ObjectType */ | 65536 /* Anonymous */) && type.symbol && isConstEnumSymbol(type.symbol);
-        }
-        function isConstEnumSymbol(symbol) {
-            return (symbol.flags & 128 /* ConstEnum */) !== 0;
-        }
-        function checkInstanceOfExpression(left, right, leftType, rightType) {
-            // TypeScript 1.0 spec (April 2014): 4.15.4
-            // The instanceof operator requires the left operand to be of type Any, an object type, or a type parameter type,
-            // and the right operand to be of type Any or a subtype of the 'Function' interface type.
-            // The result is always of the Boolean primitive type.
-            // NOTE: do not raise error if leftType is unknown as related error was already reported
-            if (isTypeOfKind(leftType, 16777726 /* Primitive */)) {
-                error(left, ts.Diagnostics.The_left_hand_side_of_an_instanceof_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
-            }
-            // NOTE: do not raise error if right is unknown as related error was already reported
-            if (!(isTypeAny(rightType) || isTypeSubtypeOf(rightType, globalFunctionType))) {
-                error(right, ts.Diagnostics.The_right_hand_side_of_an_instanceof_expression_must_be_of_type_any_or_of_a_type_assignable_to_the_Function_interface_type);
-            }
-            return booleanType;
-        }
-        function checkInExpression(left, right, leftType, rightType) {
-            // TypeScript 1.0 spec (April 2014): 4.15.5
-            // The in operator requires the left operand to be of type Any, the String primitive type, or the Number primitive type,
-            // and the right operand to be of type Any, an object type, or a type parameter type.
-            // The result is always of the Boolean primitive type.
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258 /* StringLike */ | 132 /* NumberLike */ | 16777216 /* ESSymbol */)) {
-                error(left, ts.Diagnostics.The_left_hand_side_of_an_in_expression_must_be_of_type_any_string_number_or_symbol);
-            }
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 /* ObjectType */ | 512 /* TypeParameter */)) {
-                error(right, ts.Diagnostics.The_right_hand_side_of_an_in_expression_must_be_of_type_any_an_object_type_or_a_type_parameter);
-            }
-            return booleanType;
-        }
-        function checkObjectLiteralAssignment(node, sourceType, contextualMapper) {
-            var properties = node.properties;
-            for (var _i = 0, properties_3 = properties; _i < properties_3.length; _i++) {
-                var p = properties_3[_i];
-                checkObjectLiteralDestructuringPropertyAssignment(sourceType, p, contextualMapper);
-            }
-            return sourceType;
-        }
-        function checkObjectLiteralDestructuringPropertyAssignment(objectLiteralType, property, contextualMapper) {
-            if (property.kind === 253 /* PropertyAssignment */ || property.kind === 254 /* ShorthandPropertyAssignment */) {
-                var name_14 = property.name;
-                if (name_14.kind === 140 /* ComputedPropertyName */) {
-                    checkComputedPropertyName(name_14);
-                }
-                if (isComputedNonLiteralName(name_14)) {
-                    return undefined;
-                }
-                var text = getTextOfPropertyName(name_14);
-                var type = isTypeAny(objectLiteralType)
-                    ? objectLiteralType
-                    : getTypeOfPropertyOfType(objectLiteralType, text) ||
-                        isNumericLiteralName(text) && getIndexTypeOfType(objectLiteralType, 1 /* Number */) ||
-                        getIndexTypeOfType(objectLiteralType, 0 /* String */);
-                if (type) {
-                    if (property.kind === 254 /* ShorthandPropertyAssignment */) {
-                        return checkDestructuringAssignment(property, type);
-                    }
-                    else {
-                        // non-shorthand property assignments should always have initializers
-                        return checkDestructuringAssignment(property.initializer, type);
-                    }
-                }
-                else {
-                    error(name_14, ts.Diagnostics.Type_0_has_no_property_1_and_no_string_index_signature, typeToString(objectLiteralType), ts.declarationNameToString(name_14));
-                }
-            }
-            else {
-                error(property, ts.Diagnostics.Property_assignment_expected);
-            }
-        }
-        function checkArrayLiteralAssignment(node, sourceType, contextualMapper) {
-            // This elementType will be used if the specific property corresponding to this index is not
-            // present (aka the tuple element property). This call also checks that the parentType is in
-            // fact an iterable or array (depending on target language).
-            var elementType = checkIteratedTypeOrElementType(sourceType, node, /*allowStringInput*/ false) || unknownType;
-            var elements = node.elements;
-            for (var i = 0; i < elements.length; i++) {
-                checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, elementType, contextualMapper);
-            }
-            return sourceType;
-        }
-        function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, contextualMapper) {
-            var elements = node.elements;
-            var element = elements[elementIndex];
-            if (element.kind !== 193 /* OmittedExpression */) {
-                if (element.kind !== 191 /* SpreadElementExpression */) {
-                    var propName = "" + elementIndex;
-                    var type = isTypeAny(sourceType)
-                        ? sourceType
-                        : isTupleLikeType(sourceType)
-                            ? getTypeOfPropertyOfType(sourceType, propName)
-                            : elementType;
-                    if (type) {
-                        return checkDestructuringAssignment(element, type, contextualMapper);
-                    }
-                    else {
-                        if (isTupleType(sourceType)) {
-                            error(element, ts.Diagnostics.Tuple_type_0_with_length_1_cannot_be_assigned_to_tuple_with_length_2, typeToString(sourceType), sourceType.elementTypes.length, elements.length);
-                        }
-                        else {
-                            error(element, ts.Diagnostics.Type_0_has_no_property_1, typeToString(sourceType), propName);
-                        }
-                    }
-                }
-                else {
-                    if (elementIndex < elements.length - 1) {
-                        error(element, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
-                    }
-                    else {
-                        var restExpression = element.expression;
-                        if (restExpression.kind === 187 /* BinaryExpression */ && restExpression.operatorToken.kind === 56 /* EqualsToken */) {
-                            error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
-                        }
-                        else {
-                            return checkDestructuringAssignment(restExpression, createArrayType(elementType), contextualMapper);
-                        }
-                    }
-                }
-            }
-            return undefined;
-        }
-        function checkDestructuringAssignment(exprOrAssignment, sourceType, contextualMapper) {
-            var target;
-            if (exprOrAssignment.kind === 254 /* ShorthandPropertyAssignment */) {
-                var prop = exprOrAssignment;
-                if (prop.objectAssignmentInitializer) {
-                    // In strict null checking mode, if a default value of a non-undefined type is specified, remove
-                    // undefined from the final type.
-                    if (strictNullChecks &&
-                        !(getCombinedTypeFlags(checkExpression(prop.objectAssignmentInitializer)) & 32 /* Undefined */)) {
-                        sourceType = getTypeWithFacts(sourceType, 131072 /* NEUndefined */);
-                    }
-                    checkBinaryLikeExpression(prop.name, prop.equalsToken, prop.objectAssignmentInitializer, contextualMapper);
-                }
-                target = exprOrAssignment.name;
-            }
-            else {
-                target = exprOrAssignment;
-            }
-            if (target.kind === 187 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
-                checkBinaryExpression(target, contextualMapper);
-                target = target.left;
-            }
-            if (target.kind === 171 /* ObjectLiteralExpression */) {
-                return checkObjectLiteralAssignment(target, sourceType, contextualMapper);
-            }
-            if (target.kind === 170 /* ArrayLiteralExpression */) {
-                return checkArrayLiteralAssignment(target, sourceType, contextualMapper);
-            }
-            return checkReferenceAssignment(target, sourceType, contextualMapper);
-        }
-        function checkReferenceAssignment(target, sourceType, contextualMapper) {
-            var targetType = checkExpression(target, contextualMapper);
-            if (checkReferenceExpression(target, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property)) {
-                checkTypeAssignableTo(sourceType, targetType, target, /*headMessage*/ undefined);
-            }
-            return sourceType;
-        }
-        function isTypeEqualityComparableTo(source, target) {
-            return (target.flags & 96 /* Nullable */) !== 0 || isTypeComparableTo(source, target);
-        }
-        function checkBinaryExpression(node, contextualMapper) {
-            return checkBinaryLikeExpression(node.left, node.operatorToken, node.right, contextualMapper, node);
-        }
-        function checkBinaryLikeExpression(left, operatorToken, right, contextualMapper, errorNode) {
-            var operator = operatorToken.kind;
-            if (operator === 56 /* EqualsToken */ && (left.kind === 171 /* ObjectLiteralExpression */ || left.kind === 170 /* ArrayLiteralExpression */)) {
-                return checkDestructuringAssignment(left, checkExpression(right, contextualMapper), contextualMapper);
-            }
-            var leftType = checkExpression(left, contextualMapper);
-            var rightType = checkExpression(right, contextualMapper);
-            switch (operator) {
-                case 37 /* AsteriskToken */:
-                case 38 /* AsteriskAsteriskToken */:
-                case 59 /* AsteriskEqualsToken */:
-                case 60 /* AsteriskAsteriskEqualsToken */:
-                case 39 /* SlashToken */:
-                case 61 /* SlashEqualsToken */:
-                case 40 /* PercentToken */:
-                case 62 /* PercentEqualsToken */:
-                case 36 /* MinusToken */:
-                case 58 /* MinusEqualsToken */:
-                case 43 /* LessThanLessThanToken */:
-                case 63 /* LessThanLessThanEqualsToken */:
-                case 44 /* GreaterThanGreaterThanToken */:
-                case 64 /* GreaterThanGreaterThanEqualsToken */:
-                case 45 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 65 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                case 47 /* BarToken */:
-                case 67 /* BarEqualsToken */:
-                case 48 /* CaretToken */:
-                case 68 /* CaretEqualsToken */:
-                case 46 /* AmpersandToken */:
-                case 66 /* AmpersandEqualsToken */:
-                    // TypeScript 1.0 spec (April 2014): 4.19.1
-                    // These operators require their operands to be of type Any, the Number primitive type,
-                    // or an enum type. Operands of an enum type are treated
-                    // as having the primitive type Number. If one operand is the null or undefined value,
-                    // it is treated as having the type of the other operand.
-                    // The result is always of the Number primitive type.
-                    if (leftType.flags & 96 /* Nullable */)
-                        leftType = rightType;
-                    if (rightType.flags & 96 /* Nullable */)
-                        rightType = leftType;
-                    leftType = getNonNullableType(leftType);
-                    rightType = getNonNullableType(rightType);
-                    var suggestedOperator = void 0;
-                    // if a user tries to apply a bitwise operator to 2 boolean operands
-                    // try and return them a helpful suggestion
-                    if ((leftType.flags & 8 /* Boolean */) &&
-                        (rightType.flags & 8 /* Boolean */) &&
-                        (suggestedOperator = getSuggestedBooleanOperator(operatorToken.kind)) !== undefined) {
-                        error(errorNode || operatorToken, ts.Diagnostics.The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead, ts.tokenToString(operatorToken.kind), ts.tokenToString(suggestedOperator));
-                    }
-                    else {
-                        // otherwise just check each operand separately and report errors as normal
-                        var leftOk = checkArithmeticOperandType(left, leftType, ts.Diagnostics.The_left_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
-                        var rightOk = checkArithmeticOperandType(right, rightType, ts.Diagnostics.The_right_hand_side_of_an_arithmetic_operation_must_be_of_type_any_number_or_an_enum_type);
-                        if (leftOk && rightOk) {
-                            checkAssignmentOperator(numberType);
-                        }
-                    }
-                    return numberType;
-                case 35 /* PlusToken */:
-                case 57 /* PlusEqualsToken */:
-                    // TypeScript 1.0 spec (April 2014): 4.19.2
-                    // The binary + operator requires both operands to be of the Number primitive type or an enum type,
-                    // or at least one of the operands to be of type Any or the String primitive type.
-                    // If one operand is the null or undefined value, it is treated as having the type of the other operand.
-                    if (leftType.flags & 96 /* Nullable */)
-                        leftType = rightType;
-                    if (rightType.flags & 96 /* Nullable */)
-                        rightType = leftType;
-                    leftType = getNonNullableType(leftType);
-                    rightType = getNonNullableType(rightType);
-                    var resultType = void 0;
-                    if (isTypeOfKind(leftType, 132 /* NumberLike */) && isTypeOfKind(rightType, 132 /* NumberLike */)) {
-                        // Operands of an enum type are treated as having the primitive type Number.
-                        // If both operands are of the Number primitive type, the result is of the Number primitive type.
-                        resultType = numberType;
-                    }
-                    else {
-                        if (isTypeOfKind(leftType, 258 /* StringLike */) || isTypeOfKind(rightType, 258 /* StringLike */)) {
-                            // If one or both operands are of the String primitive type, the result is of the String primitive type.
-                            resultType = stringType;
-                        }
-                        else if (isTypeAny(leftType) || isTypeAny(rightType)) {
-                            // Otherwise, the result is of type Any.
-                            // NOTE: unknown type here denotes error type. Old compiler treated this case as any type so do we.
-                            resultType = leftType === unknownType || rightType === unknownType ? unknownType : anyType;
-                        }
-                        // Symbols are not allowed at all in arithmetic expressions
-                        if (resultType && !checkForDisallowedESSymbolOperand(operator)) {
-                            return resultType;
-                        }
-                    }
-                    if (!resultType) {
-                        reportOperatorError();
-                        return anyType;
-                    }
-                    if (operator === 57 /* PlusEqualsToken */) {
-                        checkAssignmentOperator(resultType);
-                    }
-                    return resultType;
-                case 25 /* LessThanToken */:
-                case 27 /* GreaterThanToken */:
-                case 28 /* LessThanEqualsToken */:
-                case 29 /* GreaterThanEqualsToken */:
-                    if (checkForDisallowedESSymbolOperand(operator)) {
-                        if (!isTypeComparableTo(leftType, rightType) && !isTypeComparableTo(rightType, leftType)) {
-                            reportOperatorError();
-                        }
-                    }
-                    return booleanType;
-                case 30 /* EqualsEqualsToken */:
-                case 31 /* ExclamationEqualsToken */:
-                case 32 /* EqualsEqualsEqualsToken */:
-                case 33 /* ExclamationEqualsEqualsToken */:
-                    if (!isTypeEqualityComparableTo(leftType, rightType) && !isTypeEqualityComparableTo(rightType, leftType)) {
-                        reportOperatorError();
-                    }
-                    return booleanType;
-                case 91 /* InstanceOfKeyword */:
-                    return checkInstanceOfExpression(left, right, leftType, rightType);
-                case 90 /* InKeyword */:
-                    return checkInExpression(left, right, leftType, rightType);
-                case 51 /* AmpersandAmpersandToken */:
-                    return strictNullChecks ? addTypeKind(rightType, getCombinedTypeFlags(leftType) & 112 /* Falsy */) : rightType;
-                case 52 /* BarBarToken */:
-                    return getUnionType([getNonNullableType(leftType), rightType]);
-                case 56 /* EqualsToken */:
-                    checkAssignmentOperator(rightType);
-                    return getRegularTypeOfObjectLiteral(rightType);
-                case 24 /* CommaToken */:
-                    return rightType;
-            }
-            // Return true if there was no error, false if there was an error.
-            function checkForDisallowedESSymbolOperand(operator) {
-                var offendingSymbolOperand = maybeTypeOfKind(leftType, 16777216 /* ESSymbol */) ? left :
-                    maybeTypeOfKind(rightType, 16777216 /* ESSymbol */) ? right :
-                        undefined;
-                if (offendingSymbolOperand) {
-                    error(offendingSymbolOperand, ts.Diagnostics.The_0_operator_cannot_be_applied_to_type_symbol, ts.tokenToString(operator));
-                    return false;
-                }
-                return true;
-            }
-            function getSuggestedBooleanOperator(operator) {
-                switch (operator) {
-                    case 47 /* BarToken */:
-                    case 67 /* BarEqualsToken */:
-                        return 52 /* BarBarToken */;
-                    case 48 /* CaretToken */:
-                    case 68 /* CaretEqualsToken */:
-                        return 33 /* ExclamationEqualsEqualsToken */;
-                    case 46 /* AmpersandToken */:
-                    case 66 /* AmpersandEqualsToken */:
-                        return 51 /* AmpersandAmpersandToken */;
-                    default:
-                        return undefined;
-                }
-            }
-            function checkAssignmentOperator(valueType) {
-                if (produceDiagnostics && operator >= 56 /* FirstAssignment */ && operator <= 68 /* LastAssignment */) {
-                    // TypeScript 1.0 spec (April 2014): 4.17
-                    // An assignment of the form
-                    //    VarExpr = ValueExpr
-                    // requires VarExpr to be classified as a reference
-                    // A compound assignment furthermore requires VarExpr to be classified as a reference (section 4.1)
-                    // and the type of the non - compound operation to be assignable to the type of VarExpr.
-                    var ok = checkReferenceExpression(left, ts.Diagnostics.Invalid_left_hand_side_of_assignment_expression, ts.Diagnostics.Left_hand_side_of_assignment_expression_cannot_be_a_constant_or_a_read_only_property);
-                    // Use default messages
-                    if (ok) {
-                        // to avoid cascading errors check assignability only if 'isReference' check succeeded and no errors were reported
-                        checkTypeAssignableTo(valueType, leftType, left, /*headMessage*/ undefined);
-                    }
-                }
-            }
-            function reportOperatorError() {
-                error(errorNode || operatorToken, ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2, ts.tokenToString(operatorToken.kind), typeToString(leftType), typeToString(rightType));
-            }
-        }
-        function isYieldExpressionInClass(node) {
-            var current = node;
-            var parent = node.parent;
-            while (parent) {
-                if (ts.isFunctionLike(parent) && current === parent.body) {
-                    return false;
-                }
-                else if (ts.isClassLike(current)) {
-                    return true;
-                }
-                current = parent;
-                parent = parent.parent;
-            }
-            return false;
-        }
-        function checkYieldExpression(node) {
-            // Grammar checking
-            if (produceDiagnostics) {
-                if (!(node.flags & 8388608 /* YieldContext */) || isYieldExpressionInClass(node)) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.A_yield_expression_is_only_allowed_in_a_generator_body);
-                }
-                if (isInParameterInitializerBeforeContainingFunction(node)) {
-                    error(node, ts.Diagnostics.yield_expressions_cannot_be_used_in_a_parameter_initializer);
-                }
-            }
-            if (node.expression) {
-                var func = ts.getContainingFunction(node);
-                // If the user's code is syntactically correct, the func should always have a star. After all,
-                // we are in a yield context.
-                if (func && func.asteriskToken) {
-                    var expressionType = checkExpressionCached(node.expression, /*contextualMapper*/ undefined);
-                    var expressionElementType = void 0;
-                    var nodeIsYieldStar = !!node.asteriskToken;
-                    if (nodeIsYieldStar) {
-                        expressionElementType = checkElementTypeOfIterable(expressionType, node.expression);
-                    }
-                    // There is no point in doing an assignability check if the function
-                    // has no explicit return type because the return type is directly computed
-                    // from the yield expressions.
-                    if (func.type) {
-                        var signatureElementType = getElementTypeOfIterableIterator(getTypeFromTypeNode(func.type)) || anyType;
-                        if (nodeIsYieldStar) {
-                            checkTypeAssignableTo(expressionElementType, signatureElementType, node.expression, /*headMessage*/ undefined);
-                        }
-                        else {
-                            checkTypeAssignableTo(expressionType, signatureElementType, node.expression, /*headMessage*/ undefined);
-                        }
-                    }
-                }
-            }
-            // Both yield and yield* expressions have type 'any'
-            return anyType;
-        }
-        function checkConditionalExpression(node, contextualMapper) {
-            checkExpression(node.condition);
-            var type1 = checkExpression(node.whenTrue, contextualMapper);
-            var type2 = checkExpression(node.whenFalse, contextualMapper);
-            return getUnionType([type1, type2]);
-        }
-        function checkStringLiteralExpression(node) {
-            var contextualType = getContextualType(node);
-            if (contextualType && isStringLiteralUnionType(contextualType)) {
-                return getStringLiteralTypeForText(node.text);
-            }
-            return stringType;
-        }
-        function checkTemplateExpression(node) {
-            // We just want to check each expressions, but we are unconcerned with
-            // the type of each expression, as any value may be coerced into a string.
-            // It is worth asking whether this is what we really want though.
-            // A place where we actually *are* concerned with the expressions' types are
-            // in tagged templates.
-            ts.forEach(node.templateSpans, function (templateSpan) {
-                checkExpression(templateSpan.expression);
-            });
-            return stringType;
-        }
-        function checkExpressionWithContextualType(node, contextualType, contextualMapper) {
-            var saveContextualType = node.contextualType;
-            node.contextualType = contextualType;
-            var result = checkExpression(node, contextualMapper);
-            node.contextualType = saveContextualType;
-            return result;
-        }
-        function checkExpressionCached(node, contextualMapper) {
-            var links = getNodeLinks(node);
-            if (!links.resolvedType) {
-                // When computing a type that we're going to cache, we need to ignore any ongoing control flow
-                // analysis because variables may have transient types in indeterminable states. Moving flowLoopStart
-                // to the top of the stack ensures all transient types are computed from a known point.
-                var saveFlowLoopStart = flowLoopStart;
-                flowLoopStart = flowLoopCount;
-                links.resolvedType = checkExpression(node, contextualMapper);
-                flowLoopStart = saveFlowLoopStart;
-            }
-            return links.resolvedType;
-        }
-        function checkPropertyAssignment(node, contextualMapper) {
-            // Do not use hasDynamicName here, because that returns false for well known symbols.
-            // We want to perform checkComputedPropertyName for all computed properties, including
-            // well known symbols.
-            if (node.name.kind === 140 /* ComputedPropertyName */) {
-                checkComputedPropertyName(node.name);
-            }
-            return checkExpression(node.initializer, contextualMapper);
-        }
-        function checkObjectLiteralMethod(node, contextualMapper) {
-            // Grammar checking
-            checkGrammarMethod(node);
-            // Do not use hasDynamicName here, because that returns false for well known symbols.
-            // We want to perform checkComputedPropertyName for all computed properties, including
-            // well known symbols.
-            if (node.name.kind === 140 /* ComputedPropertyName */) {
-                checkComputedPropertyName(node.name);
-            }
-            var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-            return instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
-        }
-        function instantiateTypeWithSingleGenericCallSignature(node, type, contextualMapper) {
-            if (isInferentialContext(contextualMapper)) {
-                var signature = getSingleCallSignature(type);
-                if (signature && signature.typeParameters) {
-                    var contextualType = getApparentTypeOfContextualType(node);
-                    if (contextualType) {
-                        var contextualSignature = getSingleCallSignature(contextualType);
-                        if (contextualSignature && !contextualSignature.typeParameters) {
-                            return getOrCreateTypeFromSignature(instantiateSignatureInContextOf(signature, contextualSignature, contextualMapper));
-                        }
-                    }
-                }
-            }
-            return type;
-        }
-        // Checks an expression and returns its type. The contextualMapper parameter serves two purposes: When
-        // contextualMapper is not undefined and not equal to the identityMapper function object it indicates that the
-        // expression is being inferentially typed (section 4.15.2 in spec) and provides the type mapper to use in
-        // conjunction with the generic contextual type. When contextualMapper is equal to the identityMapper function
-        // object, it serves as an indicator that all contained function and arrow expressions should be considered to
-        // have the wildcard function type; this form of type check is used during overload resolution to exclude
-        // contextually typed function and arrow expressions in the initial phase.
-        function checkExpression(node, contextualMapper) {
-            var type;
-            if (node.kind === 139 /* QualifiedName */) {
-                type = checkQualifiedName(node);
-            }
-            else {
-                var uninstantiatedType = checkExpressionWorker(node, contextualMapper);
-                type = instantiateTypeWithSingleGenericCallSignature(node, uninstantiatedType, contextualMapper);
-            }
-            if (isConstEnumObjectType(type)) {
-                // enum object type for const enums are only permitted in:
-                // - 'left' in property access
-                // - 'object' in indexed access
-                // - target in rhs of import statement
-                var ok = (node.parent.kind === 172 /* PropertyAccessExpression */ && node.parent.expression === node) ||
-                    (node.parent.kind === 173 /* ElementAccessExpression */ && node.parent.expression === node) ||
-                    ((node.kind === 69 /* Identifier */ || node.kind === 139 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node));
-                if (!ok) {
-                    error(node, ts.Diagnostics.const_enums_can_only_be_used_in_property_or_index_access_expressions_or_the_right_hand_side_of_an_import_declaration_or_export_assignment);
-                }
-            }
-            return type;
-        }
-        function checkNumericLiteral(node) {
-            // Grammar checking
-            checkGrammarNumericLiteral(node);
-            return numberType;
-        }
-        function checkExpressionWorker(node, contextualMapper) {
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                    return checkIdentifier(node);
-                case 97 /* ThisKeyword */:
-                    return checkThisExpression(node);
-                case 95 /* SuperKeyword */:
-                    return checkSuperExpression(node);
-                case 93 /* NullKeyword */:
-                    return nullWideningType;
-                case 99 /* TrueKeyword */:
-                case 84 /* FalseKeyword */:
-                    return booleanType;
-                case 8 /* NumericLiteral */:
-                    return checkNumericLiteral(node);
-                case 189 /* TemplateExpression */:
-                    return checkTemplateExpression(node);
-                case 9 /* StringLiteral */:
-                    return checkStringLiteralExpression(node);
-                case 11 /* NoSubstitutionTemplateLiteral */:
-                    return stringType;
-                case 10 /* RegularExpressionLiteral */:
-                    return globalRegExpType;
-                case 170 /* ArrayLiteralExpression */:
-                    return checkArrayLiteral(node, contextualMapper);
-                case 171 /* ObjectLiteralExpression */:
-                    return checkObjectLiteral(node, contextualMapper);
-                case 172 /* PropertyAccessExpression */:
-                    return checkPropertyAccessExpression(node);
-                case 173 /* ElementAccessExpression */:
-                    return checkIndexedAccess(node);
-                case 174 /* CallExpression */:
-                case 175 /* NewExpression */:
-                    return checkCallExpression(node);
-                case 176 /* TaggedTemplateExpression */:
-                    return checkTaggedTemplateExpression(node);
-                case 178 /* ParenthesizedExpression */:
-                    return checkExpression(node.expression, contextualMapper);
-                case 192 /* ClassExpression */:
-                    return checkClassExpression(node);
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    return checkFunctionExpressionOrObjectLiteralMethod(node, contextualMapper);
-                case 182 /* TypeOfExpression */:
-                    return checkTypeOfExpression(node);
-                case 177 /* TypeAssertionExpression */:
-                case 195 /* AsExpression */:
-                    return checkAssertion(node);
-                case 196 /* NonNullExpression */:
-                    return checkNonNullAssertion(node);
-                case 181 /* DeleteExpression */:
-                    return checkDeleteExpression(node);
-                case 183 /* VoidExpression */:
-                    return checkVoidExpression(node);
-                case 184 /* AwaitExpression */:
-                    return checkAwaitExpression(node);
-                case 185 /* PrefixUnaryExpression */:
-                    return checkPrefixUnaryExpression(node);
-                case 186 /* PostfixUnaryExpression */:
-                    return checkPostfixUnaryExpression(node);
-                case 187 /* BinaryExpression */:
-                    return checkBinaryExpression(node, contextualMapper);
-                case 188 /* ConditionalExpression */:
-                    return checkConditionalExpression(node, contextualMapper);
-                case 191 /* SpreadElementExpression */:
-                    return checkSpreadElementExpression(node, contextualMapper);
-                case 193 /* OmittedExpression */:
-                    return undefinedWideningType;
-                case 190 /* YieldExpression */:
-                    return checkYieldExpression(node);
-                case 248 /* JsxExpression */:
-                    return checkJsxExpression(node);
-                case 241 /* JsxElement */:
-                    return checkJsxElement(node);
-                case 242 /* JsxSelfClosingElement */:
-                    return checkJsxSelfClosingElement(node);
-                case 243 /* JsxOpeningElement */:
-                    ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
-            }
-            return unknownType;
-        }
-        // DECLARATION AND STATEMENT TYPE CHECKING
-        function checkTypeParameter(node) {
-            // Grammar Checking
-            if (node.expression) {
-                grammarErrorOnFirstToken(node.expression, ts.Diagnostics.Type_expected);
-            }
-            checkSourceElement(node.constraint);
-            getConstraintOfTypeParameter(getDeclaredTypeOfTypeParameter(getSymbolOfNode(node)));
-            if (produceDiagnostics) {
-                checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_parameter_name_cannot_be_0);
-            }
-        }
-        function checkParameter(node) {
-            // Grammar checking
-            // It is a SyntaxError if the Identifier "eval" or the Identifier "arguments" occurs as the
-            // Identifier in a PropertySetParameterList of a PropertyAssignment that is contained in strict code
-            // or if its FunctionBody is strict code(11.1.5).
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node);
-            checkVariableLikeDeclaration(node);
-            var func = ts.getContainingFunction(node);
-            if (node.flags & 92 /* ParameterPropertyModifier */) {
-                func = ts.getContainingFunction(node);
-                if (!(func.kind === 148 /* Constructor */ && ts.nodeIsPresent(func.body))) {
-                    error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
-                }
-            }
-            if (node.questionToken && ts.isBindingPattern(node.name) && func.body) {
-                error(node, ts.Diagnostics.A_binding_pattern_parameter_cannot_be_optional_in_an_implementation_signature);
-            }
-            if (node.name.text === "this") {
-                if (ts.indexOf(func.parameters, node) !== 0) {
-                    error(node, ts.Diagnostics.A_this_parameter_must_be_the_first_parameter);
-                }
-                if (func.kind === 148 /* Constructor */ || func.kind === 152 /* ConstructSignature */ || func.kind === 157 /* ConstructorType */) {
-                    error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
-                }
-            }
-            // Only check rest parameter type if it's not a binding pattern. Since binding patterns are
-            // not allowed in a rest parameter, we already have an error from checkGrammarParameterList.
-            if (node.dotDotDotToken && !ts.isBindingPattern(node.name) && !isArrayType(getTypeOfSymbol(node.symbol))) {
-                error(node, ts.Diagnostics.A_rest_parameter_must_be_of_an_array_type);
-            }
-        }
-        function isSyntacticallyValidGenerator(node) {
-            if (!node.asteriskToken || !node.body) {
-                return false;
-            }
-            return node.kind === 147 /* MethodDeclaration */ ||
-                node.kind === 220 /* FunctionDeclaration */ ||
-                node.kind === 179 /* FunctionExpression */;
-        }
-        function getTypePredicateParameterIndex(parameterList, parameter) {
-            if (parameterList) {
-                for (var i = 0; i < parameterList.length; i++) {
-                    var param = parameterList[i];
-                    if (param.name.kind === 69 /* Identifier */ &&
-                        param.name.text === parameter.text) {
-                        return i;
-                    }
-                }
-            }
-            return -1;
-        }
-        function checkTypePredicate(node) {
-            var parent = getTypePredicateParent(node);
-            if (!parent) {
-                // The parent must not be valid.
-                error(node, ts.Diagnostics.A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods);
-                return;
-            }
-            var typePredicate = getSignatureFromDeclaration(parent).typePredicate;
-            if (!typePredicate) {
-                return;
-            }
-            var parameterName = node.parameterName;
-            if (ts.isThisTypePredicate(typePredicate)) {
-                getTypeFromThisTypeNode(parameterName);
-            }
-            else {
-                if (typePredicate.parameterIndex >= 0) {
-                    if (parent.parameters[typePredicate.parameterIndex].dotDotDotToken) {
-                        error(parameterName, ts.Diagnostics.A_type_predicate_cannot_reference_a_rest_parameter);
-                    }
-                    else {
-                        var leadingError = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.A_type_predicate_s_type_must_be_assignable_to_its_parameter_s_type);
-                        checkTypeAssignableTo(typePredicate.type, getTypeOfNode(parent.parameters[typePredicate.parameterIndex]), node.type, 
-                        /*headMessage*/ undefined, leadingError);
-                    }
-                }
-                else if (parameterName) {
-                    var hasReportedError = false;
-                    for (var _i = 0, _a = parent.parameters; _i < _a.length; _i++) {
-                        var name_15 = _a[_i].name;
-                        if (ts.isBindingPattern(name_15) &&
-                            checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_15, parameterName, typePredicate.parameterName)) {
-                            hasReportedError = true;
-                            break;
-                        }
-                    }
-                    if (!hasReportedError) {
-                        error(node.parameterName, ts.Diagnostics.Cannot_find_parameter_0, typePredicate.parameterName);
-                    }
-                }
-            }
-        }
-        function getTypePredicateParent(node) {
-            switch (node.parent.kind) {
-                case 180 /* ArrowFunction */:
-                case 151 /* CallSignature */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 156 /* FunctionType */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                    var parent_10 = node.parent;
-                    if (node === parent_10.type) {
-                        return parent_10;
-                    }
-            }
-        }
-        function checkIfTypePredicateVariableIsDeclaredInBindingPattern(pattern, predicateVariableNode, predicateVariableName) {
-            for (var _i = 0, _a = pattern.elements; _i < _a.length; _i++) {
-                var name_16 = _a[_i].name;
-                if (name_16.kind === 69 /* Identifier */ &&
-                    name_16.text === predicateVariableName) {
-                    error(predicateVariableNode, ts.Diagnostics.A_type_predicate_cannot_reference_element_0_in_a_binding_pattern, predicateVariableName);
-                    return true;
-                }
-                else if (name_16.kind === 168 /* ArrayBindingPattern */ ||
-                    name_16.kind === 167 /* ObjectBindingPattern */) {
-                    if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name_16, predicateVariableNode, predicateVariableName)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        function checkSignatureDeclaration(node) {
-            // Grammar checking
-            if (node.kind === 153 /* IndexSignature */) {
-                checkGrammarIndexSignature(node);
-            }
-            else if (node.kind === 156 /* FunctionType */ || node.kind === 220 /* FunctionDeclaration */ || node.kind === 157 /* ConstructorType */ ||
-                node.kind === 151 /* CallSignature */ || node.kind === 148 /* Constructor */ ||
-                node.kind === 152 /* ConstructSignature */) {
-                checkGrammarFunctionLikeDeclaration(node);
-            }
-            checkTypeParameters(node.typeParameters);
-            ts.forEach(node.parameters, checkParameter);
-            if (node.type) {
-                checkSourceElement(node.type);
-            }
-            if (produceDiagnostics) {
-                checkCollisionWithArgumentsInGeneratedCode(node);
-                if (compilerOptions.noImplicitAny && !node.type) {
-                    switch (node.kind) {
-                        case 152 /* ConstructSignature */:
-                            error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
-                            break;
-                        case 151 /* CallSignature */:
-                            error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
-                            break;
-                    }
-                }
-                if (node.type) {
-                    if (languageVersion >= 2 /* ES6 */ && isSyntacticallyValidGenerator(node)) {
-                        var returnType = getTypeFromTypeNode(node.type);
-                        if (returnType === voidType) {
-                            error(node.type, ts.Diagnostics.A_generator_cannot_have_a_void_type_annotation);
-                        }
-                        else {
-                            var generatorElementType = getElementTypeOfIterableIterator(returnType) || anyType;
-                            var iterableIteratorInstantiation = createIterableIteratorType(generatorElementType);
-                            // Naively, one could check that IterableIterator<any> is assignable to the return type annotation.
-                            // However, that would not catch the error in the following case.
-                            //
-                            //    interface BadGenerator extends Iterable<number>, Iterator<string> { }
-                            //    function* g(): BadGenerator { } // Iterable and Iterator have different types!
-                            //
-                            checkTypeAssignableTo(iterableIteratorInstantiation, returnType, node.type);
-                        }
-                    }
-                    else if (ts.isAsyncFunctionLike(node)) {
-                        checkAsyncFunctionReturnType(node);
-                    }
-                }
-                if (!node.body) {
-                    checkUnusedTypeParameters(node);
-                }
-            }
-        }
-        function checkClassForDuplicateDeclarations(node) {
-            var getter = 1, setter = 2, property = getter | setter;
-            var instanceNames = {};
-            var staticNames = {};
-            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
-                var member = _a[_i];
-                if (member.kind === 148 /* Constructor */) {
-                    for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
-                        var param = _c[_b];
-                        if (ts.isParameterPropertyDeclaration(param)) {
-                            addName(instanceNames, param.name, param.name.text, property);
-                        }
-                    }
-                }
-                else {
-                    var isStatic = ts.forEach(member.modifiers, function (m) { return m.kind === 113 /* StaticKeyword */; });
-                    var names = isStatic ? staticNames : instanceNames;
-                    var memberName = member.name && ts.getPropertyNameForPropertyNameNode(member.name);
-                    if (memberName) {
-                        switch (member.kind) {
-                            case 149 /* GetAccessor */:
-                                addName(names, member.name, memberName, getter);
-                                break;
-                            case 150 /* SetAccessor */:
-                                addName(names, member.name, memberName, setter);
-                                break;
-                            case 145 /* PropertyDeclaration */:
-                                addName(names, member.name, memberName, property);
-                                break;
-                        }
-                    }
-                }
-            }
-            function addName(names, location, name, meaning) {
-                if (ts.hasProperty(names, name)) {
-                    var prev = names[name];
-                    if (prev & meaning) {
-                        error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
-                    }
-                    else {
-                        names[name] = prev | meaning;
-                    }
-                }
-                else {
-                    names[name] = meaning;
-                }
-            }
-        }
-        function checkObjectTypeForDuplicateDeclarations(node) {
-            var names = {};
-            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
-                var member = _a[_i];
-                if (member.kind == 144 /* PropertySignature */) {
-                    var memberName = void 0;
-                    switch (member.name.kind) {
-                        case 9 /* StringLiteral */:
-                        case 8 /* NumericLiteral */:
-                        case 69 /* Identifier */:
-                            memberName = member.name.text;
-                            break;
-                        default:
-                            continue;
-                    }
-                    if (ts.hasProperty(names, memberName)) {
-                        error(member.symbol.valueDeclaration.name, ts.Diagnostics.Duplicate_identifier_0, memberName);
-                        error(member.name, ts.Diagnostics.Duplicate_identifier_0, memberName);
-                    }
-                    else {
-                        names[memberName] = true;
-                    }
-                }
-            }
-        }
-        function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 222 /* InterfaceDeclaration */) {
-                var nodeSymbol = getSymbolOfNode(node);
-                // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
-                // to prevent this run check only for the first declaration of a given kind
-                if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
-                    return;
-                }
-            }
-            // TypeScript 1.0 spec (April 2014)
-            // 3.7.4: An object type can contain at most one string index signature and one numeric index signature.
-            // 8.5: A class declaration can have at most one string index member declaration and one numeric index member declaration
-            var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
-            if (indexSymbol) {
-                var seenNumericIndexer = false;
-                var seenStringIndexer = false;
-                for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var declaration = decl;
-                    if (declaration.parameters.length === 1 && declaration.parameters[0].type) {
-                        switch (declaration.parameters[0].type.kind) {
-                            case 132 /* StringKeyword */:
-                                if (!seenStringIndexer) {
-                                    seenStringIndexer = true;
-                                }
-                                else {
-                                    error(declaration, ts.Diagnostics.Duplicate_string_index_signature);
-                                }
-                                break;
-                            case 130 /* NumberKeyword */:
-                                if (!seenNumericIndexer) {
-                                    seenNumericIndexer = true;
-                                }
-                                else {
-                                    error(declaration, ts.Diagnostics.Duplicate_number_index_signature);
-                                }
-                                break;
-                        }
-                    }
-                }
-            }
-        }
-        function checkPropertyDeclaration(node) {
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarProperty(node) || checkGrammarComputedPropertyName(node.name);
-            checkVariableLikeDeclaration(node);
-        }
-        function checkMethodDeclaration(node) {
-            // Grammar checking
-            checkGrammarMethod(node) || checkGrammarComputedPropertyName(node.name);
-            // Grammar checking for modifiers is done inside the function checkGrammarFunctionLikeDeclaration
-            checkFunctionOrMethodDeclaration(node);
-            // Abstract methods cannot have an implementation.
-            // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (node.flags & 128 /* Abstract */ && node.body) {
-                error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
-            }
-        }
-        function checkConstructorDeclaration(node) {
-            // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
-            checkSignatureDeclaration(node);
-            // Grammar check for checking only related to constructorDeclaration
-            checkGrammarConstructorTypeParameters(node) || checkGrammarConstructorTypeAnnotation(node);
-            checkSourceElement(node.body);
-            registerForUnusedIdentifiersCheck(node);
-            var symbol = getSymbolOfNode(node);
-            var firstDeclaration = ts.getDeclarationOfKind(symbol, node.kind);
-            // Only type check the symbol once
-            if (node === firstDeclaration) {
-                checkFunctionOrConstructorSymbol(symbol);
-            }
-            // exit early in the case of signature - super checks are not relevant to them
-            if (ts.nodeIsMissing(node.body)) {
-                return;
-            }
-            if (!produceDiagnostics) {
-                return;
-            }
-            function containsSuperCallAsComputedPropertyName(n) {
-                return n.name && containsSuperCall(n.name);
-            }
-            function containsSuperCall(n) {
-                if (ts.isSuperCallExpression(n)) {
-                    return true;
-                }
-                else if (ts.isFunctionLike(n)) {
-                    return false;
-                }
-                else if (ts.isClassLike(n)) {
-                    return ts.forEach(n.members, containsSuperCallAsComputedPropertyName);
-                }
-                return ts.forEachChild(n, containsSuperCall);
-            }
-            function markThisReferencesAsErrors(n) {
-                if (n.kind === 97 /* ThisKeyword */) {
-                    error(n, ts.Diagnostics.this_cannot_be_referenced_in_current_location);
-                }
-                else if (n.kind !== 179 /* FunctionExpression */ && n.kind !== 220 /* FunctionDeclaration */) {
-                    ts.forEachChild(n, markThisReferencesAsErrors);
-                }
-            }
-            function isInstancePropertyWithInitializer(n) {
-                return n.kind === 145 /* PropertyDeclaration */ &&
-                    !(n.flags & 32 /* Static */) &&
-                    !!n.initializer;
-            }
-            // TS 1.0 spec (April 2014): 8.3.2
-            // Constructors of classes with no extends clause may not contain super calls, whereas
-            // constructors of derived classes must contain at least one super call somewhere in their function body.
-            var containingClassDecl = node.parent;
-            if (ts.getClassExtendsHeritageClauseElement(containingClassDecl)) {
-                var classExtendsNull = classDeclarationExtendsNull(containingClassDecl);
-                var superCall = getSuperCallInConstructor(node);
-                if (superCall) {
-                    if (classExtendsNull) {
-                        error(superCall, ts.Diagnostics.A_constructor_cannot_contain_a_super_call_when_its_class_extends_null);
-                    }
-                    // The first statement in the body of a constructor (excluding prologue directives) must be a super call
-                    // if both of the following are true:
-                    // - The containing class is a derived class.
-                    // - The constructor declares parameter properties
-                    //   or the containing class declares instance member variables with initializers.
-                    var superCallShouldBeFirst = ts.forEach(node.parent.members, isInstancePropertyWithInitializer) ||
-                        ts.forEach(node.parameters, function (p) { return p.flags & 92 /* ParameterPropertyModifier */; });
-                    // Skip past any prologue directives to find the first statement
-                    // to ensure that it was a super call.
-                    if (superCallShouldBeFirst) {
-                        var statements = node.body.statements;
-                        var superCallStatement = void 0;
-                        for (var _i = 0, statements_2 = statements; _i < statements_2.length; _i++) {
-                            var statement = statements_2[_i];
-                            if (statement.kind === 202 /* ExpressionStatement */ && ts.isSuperCallExpression(statement.expression)) {
-                                superCallStatement = statement;
-                                break;
-                            }
-                            if (!ts.isPrologueDirective(statement)) {
-                                break;
-                            }
-                        }
-                        if (!superCallStatement) {
-                            error(node, ts.Diagnostics.A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_or_has_parameter_properties);
-                        }
-                    }
-                }
-                else if (!classExtendsNull) {
-                    error(node, ts.Diagnostics.Constructors_for_derived_classes_must_contain_a_super_call);
-                }
-            }
-        }
-        function checkAccessorDeclaration(node) {
-            if (produceDiagnostics) {
-                // Grammar checking accessors
-                checkGrammarFunctionLikeDeclaration(node) || checkGrammarAccessor(node) || checkGrammarComputedPropertyName(node.name);
-                checkDecorators(node);
-                checkSignatureDeclaration(node);
-                if (node.kind === 149 /* GetAccessor */) {
-                    if (!ts.isInAmbientContext(node) && ts.nodeIsPresent(node.body) && (node.flags & 32768 /* HasImplicitReturn */)) {
-                        if (node.flags & 65536 /* HasExplicitReturn */) {
-                            if (compilerOptions.noImplicitReturns) {
-                                error(node.name, ts.Diagnostics.Not_all_code_paths_return_a_value);
-                            }
-                        }
-                        else {
-                            error(node.name, ts.Diagnostics.A_get_accessor_must_return_a_value);
-                        }
-                    }
-                }
-                // Do not use hasDynamicName here, because that returns false for well known symbols.
-                // We want to perform checkComputedPropertyName for all computed properties, including
-                // well known symbols.
-                if (node.name.kind === 140 /* ComputedPropertyName */) {
-                    checkComputedPropertyName(node.name);
-                }
-                if (!ts.hasDynamicName(node)) {
-                    // TypeScript 1.0 spec (April 2014): 8.4.3
-                    // Accessors for the same member name must specify the same accessibility.
-                    var otherKind = node.kind === 149 /* GetAccessor */ ? 150 /* SetAccessor */ : 149 /* GetAccessor */;
-                    var otherAccessor = ts.getDeclarationOfKind(node.symbol, otherKind);
-                    if (otherAccessor) {
-                        if (((node.flags & 28 /* AccessibilityModifier */) !== (otherAccessor.flags & 28 /* AccessibilityModifier */))) {
-                            error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
-                        }
-                        if (((node.flags & 128 /* Abstract */) !== (otherAccessor.flags & 128 /* Abstract */))) {
-                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
-                        }
-                        // TypeScript 1.0 spec (April 2014): 4.5
-                        // If both accessors include type annotations, the specified types must be identical.
-                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorType, ts.Diagnostics.get_and_set_accessor_must_have_the_same_type);
-                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, ts.Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
-                    }
-                }
-                getTypeOfAccessors(getSymbolOfNode(node));
-            }
-            if (node.parent.kind !== 171 /* ObjectLiteralExpression */) {
-                checkSourceElement(node.body);
-                registerForUnusedIdentifiersCheck(node);
-            }
-            else {
-                checkNodeDeferred(node);
-            }
-        }
-        function checkAccessorDeclarationTypesIdentical(first, second, getAnnotatedType, message) {
-            var firstType = getAnnotatedType(first);
-            var secondType = getAnnotatedType(second);
-            if (firstType && secondType && !isTypeIdenticalTo(firstType, secondType)) {
-                error(first, message);
-            }
-        }
-        function checkAccessorDeferred(node) {
-            checkSourceElement(node.body);
-            registerForUnusedIdentifiersCheck(node);
-        }
-        function checkMissingDeclaration(node) {
-            checkDecorators(node);
-        }
-        function checkTypeArgumentConstraints(typeParameters, typeArgumentNodes) {
-            var typeArguments;
-            var mapper;
-            var result = true;
-            for (var i = 0; i < typeParameters.length; i++) {
-                var constraint = getConstraintOfTypeParameter(typeParameters[i]);
-                if (constraint) {
-                    if (!typeArguments) {
-                        typeArguments = ts.map(typeArgumentNodes, getTypeFromTypeNode);
-                        mapper = createTypeMapper(typeParameters, typeArguments);
-                    }
-                    var typeArgument = typeArguments[i];
-                    result = result && checkTypeAssignableTo(typeArgument, getTypeWithThisArgument(instantiateType(constraint, mapper), typeArgument), typeArgumentNodes[i], ts.Diagnostics.Type_0_does_not_satisfy_the_constraint_1);
-                }
-            }
-            return result;
-        }
-        function checkTypeReferenceNode(node) {
-            checkGrammarTypeArguments(node, node.typeArguments);
-            var type = getTypeFromTypeReference(node);
-            if (type !== unknownType) {
-                if (node.typeArguments) {
-                    // Do type argument local checks only if referenced type is successfully resolved
-                    ts.forEach(node.typeArguments, checkSourceElement);
-                    if (produceDiagnostics) {
-                        var symbol = getNodeLinks(node).resolvedSymbol;
-                        var typeParameters = symbol.flags & 524288 /* TypeAlias */ ? getSymbolLinks(symbol).typeParameters : type.target.localTypeParameters;
-                        checkTypeArgumentConstraints(typeParameters, node.typeArguments);
-                    }
-                }
-            }
-        }
-        function checkTypeQuery(node) {
-            getTypeFromTypeQueryNode(node);
-        }
-        function checkTypeLiteral(node) {
-            ts.forEach(node.members, checkSourceElement);
-            if (produceDiagnostics) {
-                var type = getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                checkIndexConstraints(type);
-                checkTypeForDuplicateIndexSignatures(node);
-                checkObjectTypeForDuplicateDeclarations(node);
-            }
-        }
-        function checkArrayType(node) {
-            checkSourceElement(node.elementType);
-        }
-        function checkTupleType(node) {
-            // Grammar checking
-            var hasErrorFromDisallowedTrailingComma = checkGrammarForDisallowedTrailingComma(node.elementTypes);
-            if (!hasErrorFromDisallowedTrailingComma && node.elementTypes.length === 0) {
-                grammarErrorOnNode(node, ts.Diagnostics.A_tuple_type_element_list_cannot_be_empty);
-            }
-            ts.forEach(node.elementTypes, checkSourceElement);
-        }
-        function checkUnionOrIntersectionType(node) {
-            ts.forEach(node.types, checkSourceElement);
-        }
-        function isPrivateWithinAmbient(node) {
-            return (node.flags & 8 /* Private */) && ts.isInAmbientContext(node);
-        }
-        function getEffectiveDeclarationFlags(n, flagsToCheck) {
-            var flags = ts.getCombinedNodeFlags(n);
-            // children of classes (even ambient classes) should not be marked as ambient or export
-            // because those flags have no useful semantics there.
-            if (n.parent.kind !== 222 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 221 /* ClassDeclaration */ &&
-                n.parent.kind !== 192 /* ClassExpression */ &&
-                ts.isInAmbientContext(n)) {
-                if (!(flags & 2 /* Ambient */)) {
-                    // It is nested in an ambient context, which means it is automatically exported
-                    flags |= 1 /* Export */;
-                }
-                flags |= 2 /* Ambient */;
-            }
-            return flags & flagsToCheck;
-        }
-        function checkFunctionOrConstructorSymbol(symbol) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            function getCanonicalOverload(overloads, implementation) {
-                // Consider the canonical set of flags to be the flags of the bodyDeclaration or the first declaration
-                // Error on all deviations from this canonical set of flags
-                // The caveat is that if some overloads are defined in lib.d.ts, we don't want to
-                // report the errors on those. To achieve this, we will say that the implementation is
-                // the canonical signature only if it is in the same container as the first overload
-                var implementationSharesContainerWithFirstOverload = implementation !== undefined && implementation.parent === overloads[0].parent;
-                return implementationSharesContainerWithFirstOverload ? implementation : overloads[0];
-            }
-            function checkFlagAgreementBetweenOverloads(overloads, implementation, flagsToCheck, someOverloadFlags, allOverloadFlags) {
-                // Error if some overloads have a flag that is not shared by all overloads. To find the
-                // deviations, we XOR someOverloadFlags with allOverloadFlags
-                var someButNotAllOverloadFlags = someOverloadFlags ^ allOverloadFlags;
-                if (someButNotAllOverloadFlags !== 0) {
-                    var canonicalFlags_1 = getEffectiveDeclarationFlags(getCanonicalOverload(overloads, implementation), flagsToCheck);
-                    ts.forEach(overloads, function (o) {
-                        var deviation = getEffectiveDeclarationFlags(o, flagsToCheck) ^ canonicalFlags_1;
-                        if (deviation & 1 /* Export */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_exported_or_non_exported);
-                        }
-                        else if (deviation & 2 /* Ambient */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_ambient_or_non_ambient);
-                        }
-                        else if (deviation & (8 /* Private */ | 16 /* Protected */)) {
-                            error(o.name || o, ts.Diagnostics.Overload_signatures_must_all_be_public_private_or_protected);
-                        }
-                        else if (deviation & 128 /* Abstract */) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_abstract_or_non_abstract);
-                        }
-                    });
-                }
-            }
-            function checkQuestionTokenAgreementBetweenOverloads(overloads, implementation, someHaveQuestionToken, allHaveQuestionToken) {
-                if (someHaveQuestionToken !== allHaveQuestionToken) {
-                    var canonicalHasQuestionToken_1 = ts.hasQuestionToken(getCanonicalOverload(overloads, implementation));
-                    ts.forEach(overloads, function (o) {
-                        var deviation = ts.hasQuestionToken(o) !== canonicalHasQuestionToken_1;
-                        if (deviation) {
-                            error(o.name, ts.Diagnostics.Overload_signatures_must_all_be_optional_or_required);
-                        }
-                    });
-                }
-            }
-            var flagsToCheck = 1 /* Export */ | 2 /* Ambient */ | 8 /* Private */ | 16 /* Protected */ | 128 /* Abstract */;
-            var someNodeFlags = 0;
-            var allNodeFlags = flagsToCheck;
-            var someHaveQuestionToken = false;
-            var allHaveQuestionToken = true;
-            var hasOverloads = false;
-            var bodyDeclaration;
-            var lastSeenNonAmbientDeclaration;
-            var previousDeclaration;
-            var declarations = symbol.declarations;
-            var isConstructor = (symbol.flags & 16384 /* Constructor */) !== 0;
-            function reportImplementationExpectedError(node) {
-                if (node.name && ts.nodeIsMissing(node.name)) {
-                    return;
-                }
-                var seen = false;
-                var subsequentNode = ts.forEachChild(node.parent, function (c) {
-                    if (seen) {
-                        return c;
-                    }
-                    else {
-                        seen = c === node;
-                    }
-                });
-                // We may be here because of some extra nodes between overloads that could not be parsed into a valid node.
-                // In this case the subsequent node is not really consecutive (.pos !== node.end), and we must ignore it here.
-                if (subsequentNode && subsequentNode.pos === node.end) {
-                    if (subsequentNode.kind === node.kind) {
-                        var errorNode_1 = subsequentNode.name || subsequentNode;
-                        // TODO(jfreeman): These are methods, so handle computed name case
-                        if (node.name && subsequentNode.name && node.name.text === subsequentNode.name.text) {
-                            var reportError = (node.kind === 147 /* MethodDeclaration */ || node.kind === 146 /* MethodSignature */) &&
-                                (node.flags & 32 /* Static */) !== (subsequentNode.flags & 32 /* Static */);
-                            // we can get here in two cases
-                            // 1. mixed static and instance class members
-                            // 2. something with the same name was defined before the set of overloads that prevents them from merging
-                            // here we'll report error only for the first case since for second we should already report error in binder
-                            if (reportError) {
-                                var diagnostic = node.flags & 32 /* Static */ ? ts.Diagnostics.Function_overload_must_be_static : ts.Diagnostics.Function_overload_must_not_be_static;
-                                error(errorNode_1, diagnostic);
-                            }
-                            return;
-                        }
-                        else if (ts.nodeIsPresent(subsequentNode.body)) {
-                            error(errorNode_1, ts.Diagnostics.Function_implementation_name_must_be_0, ts.declarationNameToString(node.name));
-                            return;
-                        }
-                    }
-                }
-                var errorNode = node.name || node;
-                if (isConstructor) {
-                    error(errorNode, ts.Diagnostics.Constructor_implementation_is_missing);
-                }
-                else {
-                    // Report different errors regarding non-consecutive blocks of declarations depending on whether
-                    // the node in question is abstract.
-                    if (node.flags & 128 /* Abstract */) {
-                        error(errorNode, ts.Diagnostics.All_declarations_of_an_abstract_method_must_be_consecutive);
-                    }
-                    else {
-                        error(errorNode, ts.Diagnostics.Function_implementation_is_missing_or_not_immediately_following_the_declaration);
-                    }
-                }
-            }
-            var duplicateFunctionDeclaration = false;
-            var multipleConstructorImplementation = false;
-            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
-                var current = declarations_4[_i];
-                var node = current;
-                var inAmbientContext = ts.isInAmbientContext(node);
-                var inAmbientContextOrInterface = node.parent.kind === 222 /* InterfaceDeclaration */ || node.parent.kind === 159 /* TypeLiteral */ || inAmbientContext;
-                if (inAmbientContextOrInterface) {
-                    // check if declarations are consecutive only if they are non-ambient
-                    // 1. ambient declarations can be interleaved
-                    // i.e. this is legal
-                    //     declare function foo();
-                    //     declare function bar();
-                    //     declare function foo();
-                    // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
-                    previousDeclaration = undefined;
-                }
-                if (node.kind === 220 /* FunctionDeclaration */ || node.kind === 147 /* MethodDeclaration */ || node.kind === 146 /* MethodSignature */ || node.kind === 148 /* Constructor */) {
-                    var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
-                    someNodeFlags |= currentNodeFlags;
-                    allNodeFlags &= currentNodeFlags;
-                    someHaveQuestionToken = someHaveQuestionToken || ts.hasQuestionToken(node);
-                    allHaveQuestionToken = allHaveQuestionToken && ts.hasQuestionToken(node);
-                    if (ts.nodeIsPresent(node.body) && bodyDeclaration) {
-                        if (isConstructor) {
-                            multipleConstructorImplementation = true;
-                        }
-                        else {
-                            duplicateFunctionDeclaration = true;
-                        }
-                    }
-                    else if (previousDeclaration && previousDeclaration.parent === node.parent && previousDeclaration.end !== node.pos) {
-                        reportImplementationExpectedError(previousDeclaration);
-                    }
-                    if (ts.nodeIsPresent(node.body)) {
-                        if (!bodyDeclaration) {
-                            bodyDeclaration = node;
-                        }
-                    }
-                    else {
-                        hasOverloads = true;
-                    }
-                    previousDeclaration = node;
-                    if (!inAmbientContextOrInterface) {
-                        lastSeenNonAmbientDeclaration = node;
-                    }
-                }
-            }
-            if (multipleConstructorImplementation) {
-                ts.forEach(declarations, function (declaration) {
-                    error(declaration, ts.Diagnostics.Multiple_constructor_implementations_are_not_allowed);
-                });
-            }
-            if (duplicateFunctionDeclaration) {
-                ts.forEach(declarations, function (declaration) {
-                    error(declaration.name, ts.Diagnostics.Duplicate_function_implementation);
-                });
-            }
-            // Abstract methods can't have an implementation -- in particular, they don't need one.
-            if (lastSeenNonAmbientDeclaration && !lastSeenNonAmbientDeclaration.body &&
-                !(lastSeenNonAmbientDeclaration.flags & 128 /* Abstract */) && !lastSeenNonAmbientDeclaration.questionToken) {
-                reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
-            }
-            if (hasOverloads) {
-                checkFlagAgreementBetweenOverloads(declarations, bodyDeclaration, flagsToCheck, someNodeFlags, allNodeFlags);
-                checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
-                if (bodyDeclaration) {
-                    var signatures = getSignaturesOfSymbol(symbol);
-                    var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
-                    for (var _a = 0, signatures_3 = signatures; _a < signatures_3.length; _a++) {
-                        var signature = signatures_3[_a];
-                        if (!isImplementationCompatibleWithOverload(bodySignature, signature)) {
-                            error(signature.declaration, ts.Diagnostics.Overload_signature_is_not_compatible_with_function_implementation);
-                            break;
-                        }
-                    }
-                }
-            }
-        }
-        function checkExportsOnMergedDeclarations(node) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            // if localSymbol is defined on node then node itself is exported - check is required
-            var symbol = node.localSymbol;
-            if (!symbol) {
-                // local symbol is undefined => this declaration is non-exported.
-                // however symbol might contain other declarations that are exported
-                symbol = getSymbolOfNode(node);
-                if (!(symbol.flags & 7340032 /* Export */)) {
-                    // this is a pure local symbol (all declarations are non-exported) - no need to check anything
-                    return;
-                }
-            }
-            // run the check only for the first declaration in the list
-            if (ts.getDeclarationOfKind(symbol, node.kind) !== node) {
-                return;
-            }
-            // we use SymbolFlags.ExportValue, SymbolFlags.ExportType and SymbolFlags.ExportNamespace
-            // to denote disjoint declarationSpaces (without making new enum type).
-            var exportedDeclarationSpaces = 0 /* None */;
-            var nonExportedDeclarationSpaces = 0 /* None */;
-            var defaultExportedDeclarationSpaces = 0 /* None */;
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var d = _a[_i];
-                var declarationSpaces = getDeclarationSpaces(d);
-                var effectiveDeclarationFlags = getEffectiveDeclarationFlags(d, 1 /* Export */ | 512 /* Default */);
-                if (effectiveDeclarationFlags & 1 /* Export */) {
-                    if (effectiveDeclarationFlags & 512 /* Default */) {
-                        defaultExportedDeclarationSpaces |= declarationSpaces;
-                    }
-                    else {
-                        exportedDeclarationSpaces |= declarationSpaces;
-                    }
-                }
-                else {
-                    nonExportedDeclarationSpaces |= declarationSpaces;
-                }
-            }
-            // Spaces for anything not declared a 'default export'.
-            var nonDefaultExportedDeclarationSpaces = exportedDeclarationSpaces | nonExportedDeclarationSpaces;
-            var commonDeclarationSpacesForExportsAndLocals = exportedDeclarationSpaces & nonExportedDeclarationSpaces;
-            var commonDeclarationSpacesForDefaultAndNonDefault = defaultExportedDeclarationSpaces & nonDefaultExportedDeclarationSpaces;
-            if (commonDeclarationSpacesForExportsAndLocals || commonDeclarationSpacesForDefaultAndNonDefault) {
-                // declaration spaces for exported and non-exported declarations intersect
-                for (var _b = 0, _c = symbol.declarations; _b < _c.length; _b++) {
-                    var d = _c[_b];
-                    var declarationSpaces = getDeclarationSpaces(d);
-                    // Only error on the declarations that contributed to the intersecting spaces.
-                    if (declarationSpaces & commonDeclarationSpacesForDefaultAndNonDefault) {
-                        error(d.name, ts.Diagnostics.Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead, ts.declarationNameToString(d.name));
-                    }
-                    else if (declarationSpaces & commonDeclarationSpacesForExportsAndLocals) {
-                        error(d.name, ts.Diagnostics.Individual_declarations_in_merged_declaration_0_must_be_all_exported_or_all_local, ts.declarationNameToString(d.name));
-                    }
-                }
-            }
-            function getDeclarationSpaces(d) {
-                switch (d.kind) {
-                    case 222 /* InterfaceDeclaration */:
-                        return 2097152 /* ExportType */;
-                    case 225 /* ModuleDeclaration */:
-                        return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
-                            ? 4194304 /* ExportNamespace */ | 1048576 /* ExportValue */
-                            : 4194304 /* ExportNamespace */;
-                    case 221 /* ClassDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                        return 2097152 /* ExportType */ | 1048576 /* ExportValue */;
-                    case 229 /* ImportEqualsDeclaration */:
-                        var result_1 = 0;
-                        var target = resolveAlias(getSymbolOfNode(d));
-                        ts.forEach(target.declarations, function (d) { result_1 |= getDeclarationSpaces(d); });
-                        return result_1;
-                    default:
-                        return 1048576 /* ExportValue */;
-                }
-            }
-        }
-        function checkNonThenableType(type, location, message) {
-            type = getWidenedType(type);
-            if (!isTypeAny(type) && !isTypeNever(type) && isTypeAssignableTo(type, getGlobalThenableType())) {
-                if (location) {
-                    if (!message) {
-                        message = ts.Diagnostics.Operand_for_await_does_not_have_a_valid_callable_then_member;
-                    }
-                    error(location, message);
-                }
-                return unknownType;
-            }
-            return type;
-        }
-        /**
-          * Gets the "promised type" of a promise.
-          * @param type The type of the promise.
-          * @remarks The "promised type" of a type is the type of the "value" parameter of the "onfulfilled" callback.
-          */
-        function getPromisedType(promise) {
-            //
-            //  { // promise
-            //      then( // thenFunction
-            //          onfulfilled: ( // onfulfilledParameterType
-            //              value: T // valueParameterType
-            //          ) => any
-            //      ): any;
-            //  }
-            //
-            if (isTypeAny(promise)) {
-                return undefined;
-            }
-            if (promise.flags & 4096 /* Reference */) {
-                if (promise.target === tryGetGlobalPromiseType()
-                    || promise.target === getGlobalPromiseLikeType()) {
-                    return promise.typeArguments[0];
-                }
-            }
-            var globalPromiseLikeType = getInstantiatedGlobalPromiseLikeType();
-            if (globalPromiseLikeType === emptyObjectType || !isTypeAssignableTo(promise, globalPromiseLikeType)) {
-                return undefined;
-            }
-            var thenFunction = getTypeOfPropertyOfType(promise, "then");
-            if (!thenFunction || isTypeAny(thenFunction)) {
-                return undefined;
-            }
-            var thenSignatures = getSignaturesOfType(thenFunction, 0 /* Call */);
-            if (thenSignatures.length === 0) {
-                return undefined;
-            }
-            var onfulfilledParameterType = getTypeWithFacts(getUnionType(ts.map(thenSignatures, getTypeOfFirstParameterOfSignature)), 131072 /* NEUndefined */);
-            if (isTypeAny(onfulfilledParameterType)) {
-                return undefined;
-            }
-            var onfulfilledParameterSignatures = getSignaturesOfType(onfulfilledParameterType, 0 /* Call */);
-            if (onfulfilledParameterSignatures.length === 0) {
-                return undefined;
-            }
-            return getUnionType(ts.map(onfulfilledParameterSignatures, getTypeOfFirstParameterOfSignature));
-        }
-        function getTypeOfFirstParameterOfSignature(signature) {
-            return signature.parameters.length > 0 ? getTypeAtPosition(signature, 0) : neverType;
-        }
-        /**
-          * Gets the "awaited type" of a type.
-          * @param type The type to await.
-          * @remarks The "awaited type" of an expression is its "promised type" if the expression is a
-          * Promise-like type; otherwise, it is the type of the expression. This is used to reflect
-          * The runtime behavior of the `await` keyword.
-          */
-        function getAwaitedType(type) {
-            return checkAwaitedType(type, /*location*/ undefined, /*message*/ undefined);
-        }
-        function checkAwaitedType(type, location, message) {
-            return checkAwaitedTypeWorker(type);
-            function checkAwaitedTypeWorker(type) {
-                if (type.flags & 16384 /* Union */) {
-                    var types = [];
-                    for (var _i = 0, _a = type.types; _i < _a.length; _i++) {
-                        var constituentType = _a[_i];
-                        types.push(checkAwaitedTypeWorker(constituentType));
-                    }
-                    return getUnionType(types);
-                }
-                else {
-                    var promisedType = getPromisedType(type);
-                    if (promisedType === undefined) {
-                        // The type was not a PromiseLike, so it could not be unwrapped any further.
-                        // As long as the type does not have a callable "then" property, it is
-                        // safe to return the type; otherwise, an error will have been reported in
-                        // the call to checkNonThenableType and we will return unknownType.
-                        //
-                        // An example of a non-promise "thenable" might be:
-                        //
-                        //  await { then(): void {} }
-                        //
-                        // The "thenable" does not match the minimal definition for a PromiseLike. When
-                        // a Promise/A+-compatible or ES6 promise tries to adopt this value, the promise
-                        // will never settle. We treat this as an error to help flag an early indicator
-                        // of a runtime problem. If the user wants to return this value from an async
-                        // function, they would need to wrap it in some other value. If they want it to
-                        // be treated as a promise, they can cast to <any>.
-                        return checkNonThenableType(type, location, message);
-                    }
-                    else {
-                        if (type.id === promisedType.id || ts.indexOf(awaitedTypeStack, promisedType.id) >= 0) {
-                            // We have a bad actor in the form of a promise whose promised type is
-                            // the same promise type, or a mutually recursive promise. Return the
-                            // unknown type as we cannot guess the shape. If this were the actual
-                            // case in the JavaScript, this Promise would never resolve.
-                            //
-                            // An example of a bad actor with a singly-recursive promise type might
-                            // be:
-                            //
-                            //  interface BadPromise {
-                            //      then(
-                            //          onfulfilled: (value: BadPromise) => any,
-                            //          onrejected: (error: any) => any): BadPromise;
-                            //  }
-                            //
-                            // The above interface will pass the PromiseLike check, and return a
-                            // promised type of `BadPromise`. Since this is a self reference, we
-                            // don't want to keep recursing ad infinitum.
-                            //
-                            // An example of a bad actor in the form of a mutually-recursive
-                            // promise type might be:
-                            //
-                            //  interface BadPromiseA {
-                            //      then(
-                            //          onfulfilled: (value: BadPromiseB) => any,
-                            //          onrejected: (error: any) => any): BadPromiseB;
-                            //  }
-                            //
-                            //  interface BadPromiseB {
-                            //      then(
-                            //          onfulfilled: (value: BadPromiseA) => any,
-                            //          onrejected: (error: any) => any): BadPromiseA;
-                            //  }
-                            //
-                            if (location) {
-                                error(location, ts.Diagnostics._0_is_referenced_directly_or_indirectly_in_the_fulfillment_callback_of_its_own_then_method, symbolToString(type.symbol));
-                            }
-                            return unknownType;
-                        }
-                        // Keep track of the type we're about to unwrap to avoid bad recursive promise types.
-                        // See the comments above for more information.
-                        awaitedTypeStack.push(type.id);
-                        var awaitedType = checkAwaitedTypeWorker(promisedType);
-                        awaitedTypeStack.pop();
-                        return awaitedType;
-                    }
-                }
-            }
-        }
-        /**
-         * Checks that the return type provided is an instantiation of the global Promise<T> type
-         * and returns the awaited type of the return type.
-         *
-         * @param returnType The return type of a FunctionLikeDeclaration
-         * @param location The node on which to report the error.
-         */
-        function checkCorrectPromiseType(returnType, location) {
-            if (returnType === unknownType) {
-                // The return type already had some other error, so we ignore and return
-                // the unknown type.
-                return unknownType;
-            }
-            var globalPromiseType = getGlobalPromiseType();
-            if (globalPromiseType === emptyGenericType
-                || globalPromiseType === getTargetType(returnType)) {
-                // Either we couldn't resolve the global promise type, which would have already
-                // reported an error, or we could resolve it and the return type is a valid type
-                // reference to the global type. In either case, we return the awaited type for
-                // the return type.
-                return checkAwaitedType(returnType, location, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-            }
-            // The promise type was not a valid type reference to the global promise type, so we
-            // report an error and return the unknown type.
-            error(location, ts.Diagnostics.The_return_type_of_an_async_function_or_method_must_be_the_global_Promise_T_type);
-            return unknownType;
-        }
-        /**
-          * Checks the return type of an async function to ensure it is a compatible
-          * Promise implementation.
-          * @param node The signature to check
-          * @param returnType The return type for the function
-          * @remarks
-          * This checks that an async function has a valid Promise-compatible return type,
-          * and returns the *awaited type* of the promise. An async function has a valid
-          * Promise-compatible return type if the resolved value of the return type has a
-          * construct signature that takes in an `initializer` function that in turn supplies
-          * a `resolve` function as one of its arguments and results in an object with a
-          * callable `then` signature.
-          */
-        function checkAsyncFunctionReturnType(node) {
-            if (languageVersion >= 2 /* ES6 */) {
-                var returnType = getTypeFromTypeNode(node.type);
-                return checkCorrectPromiseType(returnType, node.type);
-            }
-            var globalPromiseConstructorLikeType = getGlobalPromiseConstructorLikeType();
-            if (globalPromiseConstructorLikeType === emptyObjectType) {
-                // If we couldn't resolve the global PromiseConstructorLike type we cannot verify
-                // compatibility with __awaiter.
-                return unknownType;
-            }
-            // As part of our emit for an async function, we will need to emit the entity name of
-            // the return type annotation as an expression. To meet the necessary runtime semantics
-            // for __awaiter, we must also check that the type of the declaration (e.g. the static
-            // side or "constructor" of the promise type) is compatible `PromiseConstructorLike`.
-            //
-            // An example might be (from lib.es6.d.ts):
-            //
-            //  interface Promise<T> { ... }
-            //  interface PromiseConstructor {
-            //      new <T>(...): Promise<T>;
-            //  }
-            //  declare var Promise: PromiseConstructor;
-            //
-            // When an async function declares a return type annotation of `Promise<T>`, we
-            // need to get the type of the `Promise` variable declaration above, which would
-            // be `PromiseConstructor`.
-            //
-            // The same case applies to a class:
-            //
-            //  declare class Promise<T> {
-            //      constructor(...);
-            //      then<U>(...): Promise<U>;
-            //  }
-            //
-            // When we get the type of the `Promise` symbol here, we get the type of the static
-            // side of the `Promise` class, which would be `{ new <T>(...): Promise<T> }`.
-            var promiseType = getTypeFromTypeNode(node.type);
-            if (promiseType === unknownType && compilerOptions.isolatedModules) {
-                // If we are compiling with isolatedModules, we may not be able to resolve the
-                // type as a value. As such, we will just return unknownType;
-                return unknownType;
-            }
-            var promiseConstructor = getNodeLinks(node.type).resolvedSymbol;
-            if (!promiseConstructor || !symbolIsValue(promiseConstructor)) {
-                var typeName = promiseConstructor
-                    ? symbolToString(promiseConstructor)
-                    : typeToString(promiseType);
-                error(node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type, typeName);
-                return unknownType;
-            }
-            // If the Promise constructor, resolved locally, is an alias symbol we should mark it as referenced.
-            checkReturnTypeAnnotationAsExpression(node);
-            // Validate the promise constructor type.
-            var promiseConstructorType = getTypeOfSymbol(promiseConstructor);
-            if (!checkTypeAssignableTo(promiseConstructorType, globalPromiseConstructorLikeType, node, ts.Diagnostics.Type_0_is_not_a_valid_async_function_return_type)) {
-                return unknownType;
-            }
-            // Verify there is no local declaration that could collide with the promise constructor.
-            var promiseName = ts.getEntityNameFromTypeNode(node.type);
-            var promiseNameOrNamespaceRoot = getFirstIdentifier(promiseName);
-            var rootSymbol = getSymbol(node.locals, promiseNameOrNamespaceRoot.text, 107455 /* Value */);
-            if (rootSymbol) {
-                error(rootSymbol.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0_Compiler_uses_declaration_1_to_support_async_functions, promiseNameOrNamespaceRoot.text, getFullyQualifiedName(promiseConstructor));
-                return unknownType;
-            }
-            // Get and return the awaited type of the return type.
-            return checkAwaitedType(promiseType, node, ts.Diagnostics.An_async_function_or_method_must_have_a_valid_awaitable_return_type);
-        }
-        /** Check a decorator */
-        function checkDecorator(node) {
-            var signature = getResolvedSignature(node);
-            var returnType = getReturnTypeOfSignature(signature);
-            if (returnType.flags & 1 /* Any */) {
-                return;
-            }
-            var expectedReturnType;
-            var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
-            var errorInfo;
-            switch (node.parent.kind) {
-                case 221 /* ClassDeclaration */:
-                    var classSymbol = getSymbolOfNode(node.parent);
-                    var classConstructorType = getTypeOfSymbol(classSymbol);
-                    expectedReturnType = getUnionType([classConstructorType, voidType]);
-                    break;
-                case 142 /* Parameter */:
-                    expectedReturnType = voidType;
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_parameter_decorator_function_must_be_either_void_or_any);
-                    break;
-                case 145 /* PropertyDeclaration */:
-                    expectedReturnType = voidType;
-                    errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_return_type_of_a_property_decorator_function_must_be_either_void_or_any);
-                    break;
-                case 147 /* MethodDeclaration */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                    var methodType = getTypeOfNode(node.parent);
-                    var descriptorType = createTypedPropertyDescriptorType(methodType);
-                    expectedReturnType = getUnionType([descriptorType, voidType]);
-                    break;
-            }
-            checkTypeAssignableTo(returnType, expectedReturnType, node, headMessage, errorInfo);
-        }
-        /** Checks a type reference node as an expression. */
-        function checkTypeNodeAsExpression(node) {
-            // When we are emitting type metadata for decorators, we need to try to check the type
-            // as if it were an expression so that we can emit the type in a value position when we
-            // serialize the type metadata.
-            if (node && node.kind === 155 /* TypeReference */) {
-                var root = getFirstIdentifier(node.typeName);
-                var meaning = root.parent.kind === 155 /* TypeReference */ ? 793056 /* Type */ : 1536 /* Namespace */;
-                // Resolve type so we know which symbol is referenced
-                var rootSymbol = resolveName(root, root.text, meaning | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                // Resolved symbol is alias
-                if (rootSymbol && rootSymbol.flags & 8388608 /* Alias */) {
-                    var aliasTarget = resolveAlias(rootSymbol);
-                    // If alias has value symbol - mark alias as referenced
-                    if (aliasTarget.flags & 107455 /* Value */ && !isConstEnumOrConstEnumOnlyModule(resolveAlias(rootSymbol))) {
-                        markAliasSymbolAsReferenced(rootSymbol);
-                    }
-                }
-            }
-        }
-        /**
-          * Checks the type annotation of an accessor declaration or property declaration as
-          * an expression if it is a type reference to a type with a value declaration.
-          */
-        function checkTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        function checkReturnTypeAnnotationAsExpression(node) {
-            checkTypeNodeAsExpression(node.type);
-        }
-        /** Checks the type annotation of the parameters of a function/method or the constructor of a class as expressions */
-        function checkParameterTypeAnnotationsAsExpressions(node) {
-            // ensure all type annotations with a value declaration are checked as an expression
-            for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
-                var parameter = _a[_i];
-                checkTypeAnnotationAsExpression(parameter);
-            }
-        }
-        /** Check the decorators of a node */
-        function checkDecorators(node) {
-            if (!node.decorators) {
-                return;
-            }
-            // skip this check for nodes that cannot have decorators. These should have already had an error reported by
-            // checkGrammarDecorators.
-            if (!ts.nodeCanBeDecorated(node)) {
-                return;
-            }
-            if (!compilerOptions.experimentalDecorators) {
-                error(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning);
-            }
-            if (compilerOptions.emitDecoratorMetadata) {
-                // we only need to perform these checks if we are emitting serialized type metadata for the target of a decorator.
-                switch (node.kind) {
-                    case 221 /* ClassDeclaration */:
-                        var constructor = ts.getFirstConstructorWithBody(node);
-                        if (constructor) {
-                            checkParameterTypeAnnotationsAsExpressions(constructor);
-                        }
-                        break;
-                    case 147 /* MethodDeclaration */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        checkParameterTypeAnnotationsAsExpressions(node);
-                        checkReturnTypeAnnotationAsExpression(node);
-                        break;
-                    case 145 /* PropertyDeclaration */:
-                    case 142 /* Parameter */:
-                        checkTypeAnnotationAsExpression(node);
-                        break;
-                }
-            }
-            ts.forEach(node.decorators, checkDecorator);
-        }
-        function checkFunctionDeclaration(node) {
-            if (produceDiagnostics) {
-                checkFunctionOrMethodDeclaration(node) || checkGrammarForGenerator(node);
-                checkCollisionWithCapturedSuperVariable(node, node.name);
-                checkCollisionWithCapturedThisVariable(node, node.name);
-                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-            }
-        }
-        function checkFunctionOrMethodDeclaration(node) {
-            checkDecorators(node);
-            checkSignatureDeclaration(node);
-            var isAsync = ts.isAsyncFunctionLike(node);
-            // Do not use hasDynamicName here, because that returns false for well known symbols.
-            // We want to perform checkComputedPropertyName for all computed properties, including
-            // well known symbols.
-            if (node.name && node.name.kind === 140 /* ComputedPropertyName */) {
-                // This check will account for methods in class/interface declarations,
-                // as well as accessors in classes/object literals
-                checkComputedPropertyName(node.name);
-            }
-            if (!ts.hasDynamicName(node)) {
-                // first we want to check the local symbol that contain this declaration
-                // - if node.localSymbol !== undefined - this is current declaration is exported and localSymbol points to the local symbol
-                // - if node.localSymbol === undefined - this node is non-exported so we can just pick the result of getSymbolOfNode
-                var symbol = getSymbolOfNode(node);
-                var localSymbol = node.localSymbol || symbol;
-                // Since the javascript won't do semantic analysis like typescript,
-                // if the javascript file comes before the typescript file and both contain same name functions,
-                // checkFunctionOrConstructorSymbol wouldn't be called if we didnt ignore javascript function.
-                var firstDeclaration = ts.forEach(localSymbol.declarations, 
-                // Get first non javascript function declaration
-                function (declaration) { return declaration.kind === node.kind && !ts.isSourceFileJavaScript(ts.getSourceFileOfNode(declaration)) ?
-                    declaration : undefined; });
-                // Only type check the symbol once
-                if (node === firstDeclaration) {
-                    checkFunctionOrConstructorSymbol(localSymbol);
-                }
-                if (symbol.parent) {
-                    // run check once for the first declaration
-                    if (ts.getDeclarationOfKind(symbol, node.kind) === node) {
-                        // run check on export symbol to check that modifiers agree across all exported declarations
-                        checkFunctionOrConstructorSymbol(symbol);
-                    }
-                }
-            }
-            checkSourceElement(node.body);
-            if (!node.asteriskToken) {
-                var returnOrPromisedType = node.type && (isAsync ? checkAsyncFunctionReturnType(node) : getTypeFromTypeNode(node.type));
-                checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnOrPromisedType);
-            }
-            if (produceDiagnostics && !node.type) {
-                // Report an implicit any error if there is no body, no explicit return type, and node is not a private method
-                // in an ambient context
-                if (compilerOptions.noImplicitAny && ts.nodeIsMissing(node.body) && !isPrivateWithinAmbient(node)) {
-                    reportImplicitAnyError(node, anyType);
-                }
-                if (node.asteriskToken && ts.nodeIsPresent(node.body)) {
-                    // A generator with a body and no type annotation can still cause errors. It can error if the
-                    // yielded values have no common supertype, or it can give an implicit any error if it has no
-                    // yielded values. The only way to trigger these errors is to try checking its return type.
-                    getReturnTypeOfSignature(getSignatureFromDeclaration(node));
-                }
-            }
-            registerForUnusedIdentifiersCheck(node);
-        }
-        function registerForUnusedIdentifiersCheck(node) {
-            if (deferredUnusedIdentifierNodes) {
-                deferredUnusedIdentifierNodes.push(node);
-            }
-        }
-        function checkUnusedIdentifiers() {
-            if (deferredUnusedIdentifierNodes) {
-                for (var _i = 0, deferredUnusedIdentifierNodes_1 = deferredUnusedIdentifierNodes; _i < deferredUnusedIdentifierNodes_1.length; _i++) {
-                    var node = deferredUnusedIdentifierNodes_1[_i];
-                    switch (node.kind) {
-                        case 256 /* SourceFile */:
-                        case 225 /* ModuleDeclaration */:
-                            checkUnusedModuleMembers(node);
-                            break;
-                        case 221 /* ClassDeclaration */:
-                        case 192 /* ClassExpression */:
-                            checkUnusedClassMembers(node);
-                            checkUnusedTypeParameters(node);
-                            break;
-                        case 222 /* InterfaceDeclaration */:
-                            checkUnusedTypeParameters(node);
-                            break;
-                        case 199 /* Block */:
-                        case 227 /* CaseBlock */:
-                        case 206 /* ForStatement */:
-                        case 207 /* ForInStatement */:
-                        case 208 /* ForOfStatement */:
-                            checkUnusedLocalsAndParameters(node);
-                            break;
-                        case 148 /* Constructor */:
-                        case 179 /* FunctionExpression */:
-                        case 220 /* FunctionDeclaration */:
-                        case 180 /* ArrowFunction */:
-                        case 147 /* MethodDeclaration */:
-                        case 149 /* GetAccessor */:
-                        case 150 /* SetAccessor */:
-                            if (node.body) {
-                                checkUnusedLocalsAndParameters(node);
-                            }
-                            checkUnusedTypeParameters(node);
-                            break;
-                        case 146 /* MethodSignature */:
-                        case 151 /* CallSignature */:
-                        case 152 /* ConstructSignature */:
-                        case 153 /* IndexSignature */:
-                        case 156 /* FunctionType */:
-                        case 157 /* ConstructorType */:
-                            checkUnusedTypeParameters(node);
-                            break;
-                    }
-                    ;
-                }
-            }
-        }
-        function checkUnusedLocalsAndParameters(node) {
-            if (node.parent.kind !== 222 /* InterfaceDeclaration */ && noUnusedIdentifiers && !ts.isInAmbientContext(node)) {
-                var _loop_1 = function(key) {
-                    if (ts.hasProperty(node.locals, key)) {
-                        var local_1 = node.locals[key];
-                        if (!local_1.isReferenced) {
-                            if (local_1.valueDeclaration && local_1.valueDeclaration.kind === 142 /* Parameter */) {
-                                var parameter = local_1.valueDeclaration;
-                                if (compilerOptions.noUnusedParameters &&
-                                    !ts.isParameterPropertyDeclaration(parameter) &&
-                                    !parameterIsThisKeyword(parameter) &&
-                                    !parameterNameStartsWithUnderscore(parameter)) {
-                                    error(local_1.valueDeclaration.name, ts.Diagnostics._0_is_declared_but_never_used, local_1.name);
-                                }
-                            }
-                            else if (compilerOptions.noUnusedLocals) {
-                                ts.forEach(local_1.declarations, function (d) { return error(d.name || d, ts.Diagnostics._0_is_declared_but_never_used, local_1.name); });
-                            }
-                        }
-                    }
-                };
-                for (var key in node.locals) {
-                    _loop_1(key);
-                }
-            }
-        }
-        function parameterIsThisKeyword(parameter) {
-            return parameter.name && parameter.name.originalKeywordKind === 97 /* ThisKeyword */;
-        }
-        function parameterNameStartsWithUnderscore(parameter) {
-            return parameter.name && parameter.name.kind === 69 /* Identifier */ && parameter.name.text.charCodeAt(0) === 95 /* _ */;
-        }
-        function checkUnusedClassMembers(node) {
-            if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
-                if (node.members) {
-                    for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
-                        if (member.kind === 147 /* MethodDeclaration */ || member.kind === 145 /* PropertyDeclaration */) {
-                            if (!member.symbol.isReferenced && member.flags & 8 /* Private */) {
-                                error(member.name, ts.Diagnostics._0_is_declared_but_never_used, member.symbol.name);
-                            }
-                        }
-                        else if (member.kind === 148 /* Constructor */) {
-                            for (var _b = 0, _c = member.parameters; _b < _c.length; _b++) {
-                                var parameter = _c[_b];
-                                if (!parameter.symbol.isReferenced && parameter.flags & 8 /* Private */) {
-                                    error(parameter.name, ts.Diagnostics._0_is_declared_but_never_used, parameter.symbol.name);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        function checkUnusedTypeParameters(node) {
-            if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
-                if (node.typeParameters) {
-                    for (var _i = 0, _a = node.typeParameters; _i < _a.length; _i++) {
-                        var typeParameter = _a[_i];
-                        if (!typeParameter.symbol.isReferenced) {
-                            error(typeParameter.name, ts.Diagnostics._0_is_declared_but_never_used, typeParameter.symbol.name);
-                        }
-                    }
-                }
-            }
-        }
-        function checkUnusedModuleMembers(node) {
-            if (compilerOptions.noUnusedLocals && !ts.isInAmbientContext(node)) {
-                for (var key in node.locals) {
-                    if (ts.hasProperty(node.locals, key)) {
-                        var local = node.locals[key];
-                        if (!local.isReferenced && !local.exportSymbol) {
-                            for (var _i = 0, _a = local.declarations; _i < _a.length; _i++) {
-                                var declaration = _a[_i];
-                                if (!ts.isAmbientModule(declaration)) {
-                                    error(declaration.name, ts.Diagnostics._0_is_declared_but_never_used, local.name);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        function checkBlock(node) {
-            // Grammar checking for SyntaxKind.Block
-            if (node.kind === 199 /* Block */) {
-                checkGrammarStatementInAmbientContext(node);
-            }
-            ts.forEach(node.statements, checkSourceElement);
-            if (node.locals) {
-                registerForUnusedIdentifiersCheck(node);
-            }
-        }
-        function checkCollisionWithArgumentsInGeneratedCode(node) {
-            // no rest parameters \ declaration context \ overload - no codegen impact
-            if (!ts.hasDeclaredRestParameter(node) || ts.isInAmbientContext(node) || ts.nodeIsMissing(node.body)) {
-                return;
-            }
-            ts.forEach(node.parameters, function (p) {
-                if (p.name && !ts.isBindingPattern(p.name) && p.name.text === argumentsSymbol.name) {
-                    error(p, ts.Diagnostics.Duplicate_identifier_arguments_Compiler_uses_arguments_to_initialize_rest_parameters);
-                }
-            });
-        }
-        function needCollisionCheckForIdentifier(node, identifier, name) {
-            if (!(identifier && identifier.text === name)) {
-                return false;
-            }
-            if (node.kind === 145 /* PropertyDeclaration */ ||
-                node.kind === 144 /* PropertySignature */ ||
-                node.kind === 147 /* MethodDeclaration */ ||
-                node.kind === 146 /* MethodSignature */ ||
-                node.kind === 149 /* GetAccessor */ ||
-                node.kind === 150 /* SetAccessor */) {
-                // it is ok to have member named '_super' or '_this' - member access is always qualified
-                return false;
-            }
-            if (ts.isInAmbientContext(node)) {
-                // ambient context - no codegen impact
-                return false;
-            }
-            var root = ts.getRootDeclaration(node);
-            if (root.kind === 142 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
-                // just an overload - no codegen impact
-                return false;
-            }
-            return true;
-        }
-        function checkCollisionWithCapturedThisVariable(node, name) {
-            if (needCollisionCheckForIdentifier(node, name, "_this")) {
-                potentialThisCollisions.push(node);
-            }
-        }
-        // this function will run after checking the source file so 'CaptureThis' is correct for all nodes
-        function checkIfThisIsCapturedInEnclosingScope(node) {
-            var current = node;
-            while (current) {
-                if (getNodeCheckFlags(current) & 4 /* CaptureThis */) {
-                    var isDeclaration_1 = node.kind !== 69 /* Identifier */;
-                    if (isDeclaration_1) {
-                        error(node.name, ts.Diagnostics.Duplicate_identifier_this_Compiler_uses_variable_declaration_this_to_capture_this_reference);
-                    }
-                    else {
-                        error(node, ts.Diagnostics.Expression_resolves_to_variable_declaration_this_that_compiler_uses_to_capture_this_reference);
-                    }
-                    return;
-                }
-                current = current.parent;
-            }
-        }
-        function checkCollisionWithCapturedSuperVariable(node, name) {
-            if (!needCollisionCheckForIdentifier(node, name, "_super")) {
-                return;
-            }
-            // bubble up and find containing type
-            var enclosingClass = ts.getContainingClass(node);
-            // if containing type was not found or it is ambient - exit (no codegen)
-            if (!enclosingClass || ts.isInAmbientContext(enclosingClass)) {
-                return;
-            }
-            if (ts.getClassExtendsHeritageClauseElement(enclosingClass)) {
-                var isDeclaration_2 = node.kind !== 69 /* Identifier */;
-                if (isDeclaration_2) {
-                    error(node, ts.Diagnostics.Duplicate_identifier_super_Compiler_uses_super_to_capture_base_class_reference);
-                }
-                else {
-                    error(node, ts.Diagnostics.Expression_resolves_to_super_that_compiler_uses_to_capture_base_class_reference);
-                }
-            }
-        }
-        function checkCollisionWithRequireExportsInGeneratedCode(node, name) {
-            if (!needCollisionCheckForIdentifier(node, name, "require") && !needCollisionCheckForIdentifier(node, name, "exports")) {
-                return;
-            }
-            // Uninstantiated modules shouldnt do this check
-            if (node.kind === 225 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
-                return;
-            }
-            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
-            var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
-                // If the declaration happens to be in external module, report error that require and exports are reserved keywords
-                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module, ts.declarationNameToString(name), ts.declarationNameToString(name));
-            }
-        }
-        function checkCollisionWithGlobalPromiseInGeneratedCode(node, name) {
-            if (!needCollisionCheckForIdentifier(node, name, "Promise")) {
-                return;
-            }
-            // Uninstantiated modules shouldnt do this check
-            if (node.kind === 225 /* ModuleDeclaration */ && ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
-                return;
-            }
-            // In case of variable declaration, node.parent is variable statement so look at the variable statement's parent
-            var parent = getDeclarationContainer(node);
-            if (parent.kind === 256 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2097152 /* HasAsyncFunctions */) {
-                // If the declaration happens to be in external module, report error that Promise is a reserved identifier.
-                error(name, ts.Diagnostics.Duplicate_identifier_0_Compiler_reserves_name_1_in_top_level_scope_of_a_module_containing_async_functions, ts.declarationNameToString(name), ts.declarationNameToString(name));
-            }
-        }
-        function checkVarDeclaredNamesNotShadowed(node) {
-            // - ScriptBody : StatementList
-            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
-            // also occurs in the VarDeclaredNames of StatementList.
-            // - Block : { StatementList }
-            // It is a Syntax Error if any element of the LexicallyDeclaredNames of StatementList
-            // also occurs in the VarDeclaredNames of StatementList.
-            // Variable declarations are hoisted to the top of their function scope. They can shadow
-            // block scoped declarations, which bind tighter. this will not be flagged as duplicate definition
-            // by the binder as the declaration scope is different.
-            // A non-initialized declaration is a no-op as the block declaration will resolve before the var
-            // declaration. the problem is if the declaration has an initializer. this will act as a write to the
-            // block declared value. this is fine for let, but not const.
-            // Only consider declarations with initializers, uninitialized const declarations will not
-            // step on a let/const variable.
-            // Do not consider const and const declarations, as duplicate block-scoped declarations
-            // are handled by the binder.
-            // We are only looking for const declarations that step on let\const declarations from a
-            // different scope. e.g.:
-            //      {
-            //          const x = 0; // localDeclarationSymbol obtained after name resolution will correspond to this declaration
-            //          const x = 0; // symbol for this declaration will be 'symbol'
-            //      }
-            // skip block-scoped variables and parameters
-            if ((ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) !== 0 || ts.isParameterDeclaration(node)) {
-                return;
-            }
-            // skip variable declarations that don't have initializers
-            // NOTE: in ES6 spec initializer is required in variable declarations where name is binding pattern
-            // so we'll always treat binding elements as initialized
-            if (node.kind === 218 /* VariableDeclaration */ && !node.initializer) {
-                return;
-            }
-            var symbol = getSymbolOfNode(node);
-            if (symbol.flags & 1 /* FunctionScopedVariable */) {
-                var localDeclarationSymbol = resolveName(node, node.name.text, 3 /* Variable */, /*nodeNotFoundErrorMessage*/ undefined, /*nameArg*/ undefined);
-                if (localDeclarationSymbol &&
-                    localDeclarationSymbol !== symbol &&
-                    localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
-                    if (getDeclarationFlagsFromSymbol(localDeclarationSymbol) & 3072 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 219 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 200 /* VariableStatement */ && varDeclList.parent.parent
-                            ? varDeclList.parent.parent
-                            : undefined;
-                        // names of block-scoped and function scoped variables can collide only
-                        // if block scoped variable is defined in the function\module\source file scope (because of variable hoisting)
-                        var namesShareScope = container &&
-                            (container.kind === 199 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 226 /* ModuleBlock */ ||
-                                container.kind === 225 /* ModuleDeclaration */ ||
-                                container.kind === 256 /* SourceFile */);
-                        // here we know that function scoped variable is shadowed by block scoped one
-                        // if they are defined in the same scope - binder has already reported redeclaration error
-                        // otherwise if variable has an initializer - show error that initialization will fail
-                        // since LHS will be block scoped name instead of function scoped
-                        if (!namesShareScope) {
-                            var name_17 = symbolToString(localDeclarationSymbol);
-                            error(node, ts.Diagnostics.Cannot_initialize_outer_scoped_variable_0_in_the_same_scope_as_block_scoped_declaration_1, name_17, name_17);
-                        }
-                    }
-                }
-            }
-        }
-        // Check that a parameter initializer contains no references to parameters declared to the right of itself
-        function checkParameterInitializer(node) {
-            if (ts.getRootDeclaration(node).kind !== 142 /* Parameter */) {
-                return;
-            }
-            var func = ts.getContainingFunction(node);
-            visit(node.initializer);
-            function visit(n) {
-                if (ts.isTypeNode(n) || ts.isDeclarationName(n)) {
-                    // do not dive in types
-                    // skip declaration names (i.e. in object literal expressions)
-                    return;
-                }
-                if (n.kind === 172 /* PropertyAccessExpression */) {
-                    // skip property names in property access expression
-                    return visit(n.expression);
-                }
-                else if (n.kind === 69 /* Identifier */) {
-                    // check FunctionLikeDeclaration.locals (stores parameters\function local variable)
-                    // if it contains entry with a specified name
-                    var symbol = resolveName(n, n.text, 107455 /* Value */ | 8388608 /* Alias */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                    if (!symbol || symbol === unknownSymbol || !symbol.valueDeclaration) {
-                        return;
-                    }
-                    if (symbol.valueDeclaration === node) {
-                        error(n, ts.Diagnostics.Parameter_0_cannot_be_referenced_in_its_initializer, ts.declarationNameToString(node.name));
-                        return;
-                    }
-                    // locals map for function contain both parameters and function locals
-                    // so we need to do a bit of extra work to check if reference is legal
-                    var enclosingContainer = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (enclosingContainer === func) {
-                        if (symbol.valueDeclaration.kind === 142 /* Parameter */) {
-                            // it is ok to reference parameter in initializer if either
-                            // - parameter is located strictly on the left of current parameter declaration
-                            if (symbol.valueDeclaration.pos < node.pos) {
-                                return;
-                            }
-                            // - parameter is wrapped in function-like entity
-                            var current = n;
-                            while (current !== node.initializer) {
-                                if (ts.isFunctionLike(current.parent)) {
-                                    return;
-                                }
-                                // computed property names/initializers in instance property declaration of class like entities
-                                // are executed in constructor and thus deferred
-                                if (current.parent.kind === 145 /* PropertyDeclaration */ &&
-                                    !(current.parent.flags & 32 /* Static */) &&
-                                    ts.isClassLike(current.parent.parent)) {
-                                    return;
-                                }
-                                current = current.parent;
-                            }
-                        }
-                        error(n, ts.Diagnostics.Initializer_of_parameter_0_cannot_reference_identifier_1_declared_after_it, ts.declarationNameToString(node.name), ts.declarationNameToString(n));
-                    }
-                }
-                else {
-                    return ts.forEachChild(n, visit);
-                }
-            }
-        }
-        // Check variable, parameter, or property declaration
-        function checkVariableLikeDeclaration(node) {
-            checkDecorators(node);
-            checkSourceElement(node.type);
-            // For a computed property, just check the initializer and exit
-            // Do not use hasDynamicName here, because that returns false for well known symbols.
-            // We want to perform checkComputedPropertyName for all computed properties, including
-            // well known symbols.
-            if (node.name.kind === 140 /* ComputedPropertyName */) {
-                checkComputedPropertyName(node.name);
-                if (node.initializer) {
-                    checkExpressionCached(node.initializer);
-                }
-            }
-            if (node.kind === 169 /* BindingElement */) {
-                // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 140 /* ComputedPropertyName */) {
-                    checkComputedPropertyName(node.propertyName);
-                }
-                // check private/protected variable access
-                var parent_11 = node.parent.parent;
-                var parentType = getTypeForBindingElementParent(parent_11);
-                var name_18 = node.propertyName || node.name;
-                var property = getPropertyOfType(parentType, getTextOfPropertyName(name_18));
-                if (parent_11.initializer && property && getParentOfSymbol(property)) {
-                    checkClassPropertyAccess(parent_11, parent_11.initializer, parentType, property);
-                }
-            }
-            // For a binding pattern, check contained binding elements
-            if (ts.isBindingPattern(node.name)) {
-                ts.forEach(node.name.elements, checkSourceElement);
-            }
-            // For a parameter declaration with an initializer, error and exit if the containing function doesn't have a body
-            if (node.initializer && ts.getRootDeclaration(node).kind === 142 /* Parameter */ && ts.nodeIsMissing(ts.getContainingFunction(node).body)) {
-                error(node, ts.Diagnostics.A_parameter_initializer_is_only_allowed_in_a_function_or_constructor_implementation);
-                return;
-            }
-            // For a binding pattern, validate the initializer and exit
-            if (ts.isBindingPattern(node.name)) {
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 207 /* ForInStatement */) {
-                    checkTypeAssignableTo(checkExpressionCached(node.initializer), getWidenedTypeForVariableLikeDeclaration(node), node, /*headMessage*/ undefined);
-                    checkParameterInitializer(node);
-                }
-                return;
-            }
-            var symbol = getSymbolOfNode(node);
-            var type = getTypeOfVariableOrParameterOrProperty(symbol);
-            if (node === symbol.valueDeclaration) {
-                // Node is the primary declaration of the symbol, just validate the initializer
-                // Don't validate for-in initializer as it is already an error
-                if (node.initializer && node.parent.parent.kind !== 207 /* ForInStatement */) {
-                    checkTypeAssignableTo(checkExpressionCached(node.initializer), type, node, /*headMessage*/ undefined);
-                    checkParameterInitializer(node);
-                }
-            }
-            else {
-                // Node is a secondary declaration, check that type is identical to primary declaration and check that
-                // initializer is consistent with type associated with the node
-                var declarationType = getWidenedTypeForVariableLikeDeclaration(node);
-                if (type !== unknownType && declarationType !== unknownType && !isTypeIdenticalTo(type, declarationType)) {
-                    error(node.name, ts.Diagnostics.Subsequent_variable_declarations_must_have_the_same_type_Variable_0_must_be_of_type_1_but_here_has_type_2, ts.declarationNameToString(node.name), typeToString(type), typeToString(declarationType));
-                }
-                if (node.initializer) {
-                    checkTypeAssignableTo(checkExpressionCached(node.initializer), declarationType, node, /*headMessage*/ undefined);
-                }
-                if (!areDeclarationFlagsIdentical(node, symbol.valueDeclaration)) {
-                    error(symbol.valueDeclaration.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
-                    error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
-                }
-            }
-            if (node.kind !== 145 /* PropertyDeclaration */ && node.kind !== 144 /* PropertySignature */) {
-                // We know we don't have a binding pattern or computed name here
-                checkExportsOnMergedDeclarations(node);
-                if (node.kind === 218 /* VariableDeclaration */ || node.kind === 169 /* BindingElement */) {
-                    checkVarDeclaredNamesNotShadowed(node);
-                }
-                checkCollisionWithCapturedSuperVariable(node, node.name);
-                checkCollisionWithCapturedThisVariable(node, node.name);
-                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-            }
-        }
-        function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 142 /* Parameter */ && right.kind === 218 /* VariableDeclaration */) ||
-                (left.kind === 218 /* VariableDeclaration */ && right.kind === 142 /* Parameter */)) {
-                // Differences in optionality between parameters and variables are allowed.
-                return true;
-            }
-            if (ts.hasQuestionToken(left) !== ts.hasQuestionToken(right)) {
-                return false;
-            }
-            var interestingFlags = 8 /* Private */ |
-                16 /* Protected */ |
-                256 /* Async */ |
-                128 /* Abstract */ |
-                64 /* Readonly */ |
-                32 /* Static */;
-            return (left.flags & interestingFlags) === (right.flags & interestingFlags);
-        }
-        function checkVariableDeclaration(node) {
-            checkGrammarVariableDeclaration(node);
-            return checkVariableLikeDeclaration(node);
-        }
-        function checkBindingElement(node) {
-            checkGrammarBindingElement(node);
-            return checkVariableLikeDeclaration(node);
-        }
-        function checkVariableStatement(node) {
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarVariableDeclarationList(node.declarationList) || checkGrammarForDisallowedLetOrConstStatement(node);
-            ts.forEach(node.declarationList.declarations, checkSourceElement);
-        }
-        function checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) {
-            // We only disallow modifier on a method declaration if it is a property of object-literal-expression
-            if (node.modifiers && node.parent.kind === 171 /* ObjectLiteralExpression */) {
-                if (ts.isAsyncFunctionLike(node)) {
-                    if (node.modifiers.length > 1) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                }
-                else {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                }
-            }
-        }
-        function checkExpressionStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            checkExpression(node.expression);
-        }
-        function checkIfStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            checkExpression(node.expression);
-            checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 201 /* EmptyStatement */) {
-                error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
-            }
-            checkSourceElement(node.elseStatement);
-        }
-        function checkDoStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            checkSourceElement(node.statement);
-            checkExpression(node.expression);
-        }
-        function checkWhileStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            checkExpression(node.expression);
-            checkSourceElement(node.statement);
-        }
-        function checkForStatement(node) {
-            // Grammar checking
-            if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 219 /* VariableDeclarationList */) {
-                    checkGrammarVariableDeclarationList(node.initializer);
-                }
-            }
-            if (node.initializer) {
-                if (node.initializer.kind === 219 /* VariableDeclarationList */) {
-                    ts.forEach(node.initializer.declarations, checkVariableDeclaration);
-                }
-                else {
-                    checkExpression(node.initializer);
-                }
-            }
-            if (node.condition)
-                checkExpression(node.condition);
-            if (node.incrementor)
-                checkExpression(node.incrementor);
-            checkSourceElement(node.statement);
-            if (node.locals) {
-                registerForUnusedIdentifiersCheck(node);
-            }
-        }
-        function checkForOfStatement(node) {
-            checkGrammarForInOrForOfStatement(node);
-            // Check the LHS and RHS
-            // If the LHS is a declaration, just check it as a variable declaration, which will in turn check the RHS
-            // via checkRightHandSideOfForOf.
-            // If the LHS is an expression, check the LHS, as a destructuring assignment or as a reference.
-            // Then check that the RHS is assignable to it.
-            if (node.initializer.kind === 219 /* VariableDeclarationList */) {
-                checkForInOrForOfVariableDeclaration(node);
-            }
-            else {
-                var varExpr = node.initializer;
-                var iteratedType = checkRightHandSideOfForOf(node.expression);
-                // There may be a destructuring assignment on the left side
-                if (varExpr.kind === 170 /* ArrayLiteralExpression */ || varExpr.kind === 171 /* ObjectLiteralExpression */) {
-                    // iteratedType may be undefined. In this case, we still want to check the structure of
-                    // varExpr, in particular making sure it's a valid LeftHandSideExpression. But we'd like
-                    // to short circuit the type relation checking as much as possible, so we pass the unknownType.
-                    checkDestructuringAssignment(varExpr, iteratedType || unknownType);
-                }
-                else {
-                    var leftType = checkExpression(varExpr);
-                    checkReferenceExpression(varExpr, /*invalidReferenceMessage*/ ts.Diagnostics.Invalid_left_hand_side_in_for_of_statement, 
-                    /*constantVariableMessage*/ ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_be_a_constant_or_a_read_only_property);
-                    // iteratedType will be undefined if the rightType was missing properties/signatures
-                    // required to get its iteratedType (like [Symbol.iterator] or next). This may be
-                    // because we accessed properties from anyType, or it may have led to an error inside
-                    // getElementTypeOfIterable.
-                    if (iteratedType) {
-                        checkTypeAssignableTo(iteratedType, leftType, varExpr, /*headMessage*/ undefined);
-                    }
-                }
-            }
-            checkSourceElement(node.statement);
-            if (node.locals) {
-                registerForUnusedIdentifiersCheck(node);
-            }
-        }
-        function checkForInStatement(node) {
-            // Grammar checking
-            checkGrammarForInOrForOfStatement(node);
-            // TypeScript 1.0 spec  (April 2014): 5.4
-            // In a 'for-in' statement of the form
-            // for (let VarDecl in Expr) Statement
-            //   VarDecl must be a variable declaration without a type annotation that declares a variable of type Any,
-            //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-            if (node.initializer.kind === 219 /* VariableDeclarationList */) {
-                var variable = node.initializer.declarations[0];
-                if (variable && ts.isBindingPattern(variable.name)) {
-                    error(variable.name, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
-                }
-                checkForInOrForOfVariableDeclaration(node);
-            }
-            else {
-                // In a 'for-in' statement of the form
-                // for (Var in Expr) Statement
-                //   Var must be an expression classified as a reference of type Any or the String primitive type,
-                //   and Expr must be an expression of type Any, an object type, or a type parameter type.
-                var varExpr = node.initializer;
-                var leftType = checkExpression(varExpr);
-                if (varExpr.kind === 170 /* ArrayLiteralExpression */ || varExpr.kind === 171 /* ObjectLiteralExpression */) {
-                    error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_destructuring_pattern);
-                }
-                else if (!isTypeAnyOrAllConstituentTypesHaveKind(leftType, 258 /* StringLike */)) {
-                    error(varExpr, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_must_be_of_type_string_or_any);
-                }
-                else {
-                    // run check only former check succeeded to avoid cascading errors
-                    checkReferenceExpression(varExpr, ts.Diagnostics.Invalid_left_hand_side_in_for_in_statement, ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_be_a_constant_or_a_read_only_property);
-                }
-            }
-            var rightType = checkNonNullExpression(node.expression);
-            // unknownType is returned i.e. if node.expression is identifier whose name cannot be resolved
-            // in this case error about missing name is already reported - do not report extra one
-            if (!isTypeAnyOrAllConstituentTypesHaveKind(rightType, 80896 /* ObjectType */ | 512 /* TypeParameter */)) {
-                error(node.expression, ts.Diagnostics.The_right_hand_side_of_a_for_in_statement_must_be_of_type_any_an_object_type_or_a_type_parameter);
-            }
-            checkSourceElement(node.statement);
-            if (node.locals) {
-                registerForUnusedIdentifiersCheck(node);
-            }
-        }
-        function checkForInOrForOfVariableDeclaration(iterationStatement) {
-            var variableDeclarationList = iterationStatement.initializer;
-            // checkGrammarForInOrForOfStatement will check that there is exactly one declaration.
-            if (variableDeclarationList.declarations.length >= 1) {
-                var decl = variableDeclarationList.declarations[0];
-                checkVariableDeclaration(decl);
-            }
-        }
-        function checkRightHandSideOfForOf(rhsExpression) {
-            var expressionType = checkNonNullExpression(rhsExpression);
-            return checkIteratedTypeOrElementType(expressionType, rhsExpression, /*allowStringInput*/ true);
-        }
-        function checkIteratedTypeOrElementType(inputType, errorNode, allowStringInput) {
-            if (isTypeAny(inputType)) {
-                return inputType;
-            }
-            if (languageVersion >= 2 /* ES6 */) {
-                return checkElementTypeOfIterable(inputType, errorNode);
-            }
-            if (allowStringInput) {
-                return checkElementTypeOfArrayOrString(inputType, errorNode);
-            }
-            if (isArrayLikeType(inputType)) {
-                var indexType = getIndexTypeOfType(inputType, 1 /* Number */);
-                if (indexType) {
-                    return indexType;
-                }
-            }
-            if (errorNode) {
-                error(errorNode, ts.Diagnostics.Type_0_is_not_an_array_type, typeToString(inputType));
-            }
-            return unknownType;
-        }
-        /**
-         * When errorNode is undefined, it means we should not report any errors.
-         */
-        function checkElementTypeOfIterable(iterable, errorNode) {
-            var elementType = getElementTypeOfIterable(iterable, errorNode);
-            // Now even though we have extracted the iteratedType, we will have to validate that the type
-            // passed in is actually an Iterable.
-            if (errorNode && elementType) {
-                checkTypeAssignableTo(iterable, createIterableType(elementType), errorNode);
-            }
-            return elementType || anyType;
-        }
-        /**
-         * We want to treat type as an iterable, and get the type it is an iterable of. The iterable
-         * must have the following structure (annotated with the names of the variables below):
-         *
-         * { // iterable
-         *     [Symbol.iterator]: { // iteratorFunction
-         *         (): Iterator<T>
-         *     }
-         * }
-         *
-         * T is the type we are after. At every level that involves analyzing return types
-         * of signatures, we union the return types of all the signatures.
-         *
-         * Another thing to note is that at any step of this process, we could run into a dead end,
-         * meaning either the property is missing, or we run into the anyType. If either of these things
-         * happens, we return undefined to signal that we could not find the iterated type. If a property
-         * is missing, and the previous step did not result in 'any', then we also give an error if the
-         * caller requested it. Then the caller can decide what to do in the case where there is no iterated
-         * type. This is different from returning anyType, because that would signify that we have matched the
-         * whole pattern and that T (above) is 'any'.
-         */
-        function getElementTypeOfIterable(type, errorNode) {
-            if (isTypeAny(type)) {
-                return undefined;
-            }
-            var typeAsIterable = type;
-            if (!typeAsIterable.iterableElementType) {
-                // As an optimization, if the type is instantiated directly using the globalIterableType (Iterable<number>),
-                // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableType()) {
-                    typeAsIterable.iterableElementType = type.typeArguments[0];
-                }
-                else {
-                    var iteratorFunction = getTypeOfPropertyOfType(type, ts.getPropertyNameForKnownSymbolName("iterator"));
-                    if (isTypeAny(iteratorFunction)) {
-                        return undefined;
-                    }
-                    var iteratorFunctionSignatures = iteratorFunction ? getSignaturesOfType(iteratorFunction, 0 /* Call */) : emptyArray;
-                    if (iteratorFunctionSignatures.length === 0) {
-                        if (errorNode) {
-                            error(errorNode, ts.Diagnostics.Type_must_have_a_Symbol_iterator_method_that_returns_an_iterator);
-                        }
-                        return undefined;
-                    }
-                    typeAsIterable.iterableElementType = getElementTypeOfIterator(getUnionType(ts.map(iteratorFunctionSignatures, getReturnTypeOfSignature)), errorNode);
-                }
-            }
-            return typeAsIterable.iterableElementType;
-        }
-        /**
-         * This function has very similar logic as getElementTypeOfIterable, except that it operates on
-         * Iterators instead of Iterables. Here is the structure:
-         *
-         *  { // iterator
-         *      next: { // iteratorNextFunction
-         *          (): { // iteratorNextResult
-         *              value: T // iteratorNextValue
-         *          }
-         *      }
-         *  }
-         *
-         */
-        function getElementTypeOfIterator(type, errorNode) {
-            if (isTypeAny(type)) {
-                return undefined;
-            }
-            var typeAsIterator = type;
-            if (!typeAsIterator.iteratorElementType) {
-                // As an optimization, if the type is instantiated directly using the globalIteratorType (Iterator<number>),
-                // then just grab its type argument.
-                if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIteratorType()) {
-                    typeAsIterator.iteratorElementType = type.typeArguments[0];
-                }
-                else {
-                    var iteratorNextFunction = getTypeOfPropertyOfType(type, "next");
-                    if (isTypeAny(iteratorNextFunction)) {
-                        return undefined;
-                    }
-                    var iteratorNextFunctionSignatures = iteratorNextFunction ? getSignaturesOfType(iteratorNextFunction, 0 /* Call */) : emptyArray;
-                    if (iteratorNextFunctionSignatures.length === 0) {
-                        if (errorNode) {
-                            error(errorNode, ts.Diagnostics.An_iterator_must_have_a_next_method);
-                        }
-                        return undefined;
-                    }
-                    var iteratorNextResult = getUnionType(ts.map(iteratorNextFunctionSignatures, getReturnTypeOfSignature));
-                    if (isTypeAny(iteratorNextResult)) {
-                        return undefined;
-                    }
-                    var iteratorNextValue = getTypeOfPropertyOfType(iteratorNextResult, "value");
-                    if (!iteratorNextValue) {
-                        if (errorNode) {
-                            error(errorNode, ts.Diagnostics.The_type_returned_by_the_next_method_of_an_iterator_must_have_a_value_property);
-                        }
-                        return undefined;
-                    }
-                    typeAsIterator.iteratorElementType = iteratorNextValue;
-                }
-            }
-            return typeAsIterator.iteratorElementType;
-        }
-        function getElementTypeOfIterableIterator(type) {
-            if (isTypeAny(type)) {
-                return undefined;
-            }
-            // As an optimization, if the type is instantiated directly using the globalIterableIteratorType (IterableIterator<number>),
-            // then just grab its type argument.
-            if ((type.flags & 4096 /* Reference */) && type.target === getGlobalIterableIteratorType()) {
-                return type.typeArguments[0];
-            }
-            return getElementTypeOfIterable(type, /*errorNode*/ undefined) ||
-                getElementTypeOfIterator(type, /*errorNode*/ undefined);
-        }
-        /**
-         * This function does the following steps:
-         *   1. Break up arrayOrStringType (possibly a union) into its string constituents and array constituents.
-         *   2. Take the element types of the array constituents.
-         *   3. Return the union of the element types, and string if there was a string constituent.
-         *
-         * For example:
-         *     string -> string
-         *     number[] -> number
-         *     string[] | number[] -> string | number
-         *     string | number[] -> string | number
-         *     string | string[] | number[] -> string | number
-         *
-         * It also errors if:
-         *   1. Some constituent is neither a string nor an array.
-         *   2. Some constituent is a string and target is less than ES5 (because in ES3 string is not indexable).
-         */
-        function checkElementTypeOfArrayOrString(arrayOrStringType, errorNode) {
-            ts.Debug.assert(languageVersion < 2 /* ES6 */);
-            // After we remove all types that are StringLike, we will know if there was a string constituent
-            // based on whether the remaining type is the same as the initial type.
-            var arrayType = arrayOrStringType;
-            if (arrayOrStringType.flags & 16384 /* Union */) {
-                arrayType = getUnionType(ts.filter(arrayOrStringType.types, function (t) { return !(t.flags & 258 /* StringLike */); }));
-            }
-            else if (arrayOrStringType.flags & 258 /* StringLike */) {
-                arrayType = neverType;
-            }
-            var hasStringConstituent = arrayOrStringType !== arrayType;
-            var reportedError = false;
-            if (hasStringConstituent) {
-                if (languageVersion < 1 /* ES5 */) {
-                    error(errorNode, ts.Diagnostics.Using_a_string_in_a_for_of_statement_is_only_supported_in_ECMAScript_5_and_higher);
-                    reportedError = true;
-                }
-                // Now that we've removed all the StringLike types, if no constituents remain, then the entire
-                // arrayOrStringType was a string.
-                if (arrayType === neverType) {
-                    return stringType;
-                }
-            }
-            if (!isArrayLikeType(arrayType)) {
-                if (!reportedError) {
-                    // Which error we report depends on whether there was a string constituent. For example,
-                    // if the input type is number | string, we want to say that number is not an array type.
-                    // But if the input was just number, we want to say that number is not an array type
-                    // or a string type.
-                    var diagnostic = hasStringConstituent
-                        ? ts.Diagnostics.Type_0_is_not_an_array_type
-                        : ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type;
-                    error(errorNode, diagnostic, typeToString(arrayType));
-                }
-                return hasStringConstituent ? stringType : unknownType;
-            }
-            var arrayElementType = getIndexTypeOfType(arrayType, 1 /* Number */) || unknownType;
-            if (hasStringConstituent) {
-                // This is just an optimization for the case where arrayOrStringType is string | string[]
-                if (arrayElementType.flags & 258 /* StringLike */) {
-                    return stringType;
-                }
-                return getUnionType([arrayElementType, stringType]);
-            }
-            return arrayElementType;
-        }
-        function checkBreakOrContinueStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node) || checkGrammarBreakOrContinueStatement(node);
-            // TODO: Check that target label is valid
-        }
-        function isGetAccessorWithAnnotatedSetAccessor(node) {
-            return !!(node.kind === 149 /* GetAccessor */ && ts.getSetAccessorTypeAnnotationNode(ts.getDeclarationOfKind(node.symbol, 150 /* SetAccessor */)));
-        }
-        function isUnwrappedReturnTypeVoidOrAny(func, returnType) {
-            var unwrappedReturnType = ts.isAsyncFunctionLike(func) ? getPromisedType(returnType) : returnType;
-            return unwrappedReturnType && maybeTypeOfKind(unwrappedReturnType, 16 /* Void */ | 1 /* Any */);
-        }
-        function checkReturnStatement(node) {
-            // Grammar checking
-            if (!checkGrammarStatementInAmbientContext(node)) {
-                var functionBlock = ts.getContainingFunction(node);
-                if (!functionBlock) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.A_return_statement_can_only_be_used_within_a_function_body);
-                }
-            }
-            var func = ts.getContainingFunction(node);
-            if (func) {
-                var signature = getSignatureFromDeclaration(func);
-                var returnType = getReturnTypeOfSignature(signature);
-                if (strictNullChecks || node.expression || returnType === neverType) {
-                    var exprType = node.expression ? checkExpressionCached(node.expression) : undefinedType;
-                    if (func.asteriskToken) {
-                        // A generator does not need its return expressions checked against its return type.
-                        // Instead, the yield expressions are checked against the element type.
-                        // TODO: Check return expressions of generators when return type tracking is added
-                        // for generators.
-                        return;
-                    }
-                    if (func.kind === 150 /* SetAccessor */) {
-                        if (node.expression) {
-                            error(node.expression, ts.Diagnostics.Setters_cannot_return_a_value);
-                        }
-                    }
-                    else if (func.kind === 148 /* Constructor */) {
-                        if (node.expression && !checkTypeAssignableTo(exprType, returnType, node.expression)) {
-                            error(node.expression, ts.Diagnostics.Return_type_of_constructor_signature_must_be_assignable_to_the_instance_type_of_the_class);
-                        }
-                    }
-                    else if (func.type || isGetAccessorWithAnnotatedSetAccessor(func)) {
-                        if (ts.isAsyncFunctionLike(func)) {
-                            var promisedType = getPromisedType(returnType);
-                            var awaitedType = checkAwaitedType(exprType, node.expression || node, ts.Diagnostics.Return_expression_in_async_function_does_not_have_a_valid_callable_then_member);
-                            if (promisedType) {
-                                // If the function has a return type, but promisedType is
-                                // undefined, an error will be reported in checkAsyncFunctionReturnType
-                                // so we don't need to report one here.
-                                checkTypeAssignableTo(awaitedType, promisedType, node.expression || node);
-                            }
-                        }
-                        else {
-                            checkTypeAssignableTo(exprType, returnType, node.expression || node);
-                        }
-                    }
-                }
-                else if (func.kind !== 148 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
-                    // The function has a return type, but the return statement doesn't have an expression.
-                    error(node, ts.Diagnostics.Not_all_code_paths_return_a_value);
-                }
-            }
-        }
-        function checkWithStatement(node) {
-            // Grammar checking for withStatement
-            if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.flags & 33554432 /* AwaitContext */) {
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.with_statements_are_not_allowed_in_an_async_function_block);
-                }
-            }
-            checkExpression(node.expression);
-            error(node.expression, ts.Diagnostics.All_symbols_within_a_with_block_will_be_resolved_to_any);
-        }
-        function checkSwitchStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            var firstDefaultClause;
-            var hasDuplicateDefaultClause = false;
-            var expressionType = checkExpression(node.expression);
-            ts.forEach(node.caseBlock.clauses, function (clause) {
-                // Grammar check for duplicate default clauses, skip if we already report duplicate default clause
-                if (clause.kind === 250 /* DefaultClause */ && !hasDuplicateDefaultClause) {
-                    if (firstDefaultClause === undefined) {
-                        firstDefaultClause = clause;
-                    }
-                    else {
-                        var sourceFile = ts.getSourceFileOfNode(node);
-                        var start = ts.skipTrivia(sourceFile.text, clause.pos);
-                        var end = clause.statements.length > 0 ? clause.statements[0].pos : clause.end;
-                        grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.A_default_clause_cannot_appear_more_than_once_in_a_switch_statement);
-                        hasDuplicateDefaultClause = true;
-                    }
-                }
-                if (produceDiagnostics && clause.kind === 249 /* CaseClause */) {
-                    var caseClause = clause;
-                    // TypeScript 1.0 spec (April 2014): 5.9
-                    // In a 'switch' statement, each 'case' expression must be of a type that is comparable
-                    // to or from the type of the 'switch' expression.
-                    var caseType = checkExpression(caseClause.expression);
-                    if (!isTypeEqualityComparableTo(expressionType, caseType)) {
-                        // expressionType is not comparable to caseType, try the reversed check and report errors if it fails
-                        checkTypeComparableTo(caseType, expressionType, caseClause.expression, /*headMessage*/ undefined);
-                    }
-                }
-                ts.forEach(clause.statements, checkSourceElement);
-            });
-            if (node.caseBlock.locals) {
-                registerForUnusedIdentifiersCheck(node.caseBlock);
-            }
-        }
-        function checkLabeledStatement(node) {
-            // Grammar checking
-            if (!checkGrammarStatementInAmbientContext(node)) {
-                var current = node.parent;
-                while (current) {
-                    if (ts.isFunctionLike(current)) {
-                        break;
-                    }
-                    if (current.kind === 214 /* LabeledStatement */ && current.label.text === node.label.text) {
-                        var sourceFile = ts.getSourceFileOfNode(node);
-                        grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNodeFromSourceText(sourceFile.text, node.label));
-                        break;
-                    }
-                    current = current.parent;
-                }
-            }
-            // ensure that label is unique
-            checkSourceElement(node.statement);
-        }
-        function checkThrowStatement(node) {
-            // Grammar checking
-            if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.expression === undefined) {
-                    grammarErrorAfterFirstToken(node, ts.Diagnostics.Line_break_not_permitted_here);
-                }
-            }
-            if (node.expression) {
-                checkExpression(node.expression);
-            }
-        }
-        function checkTryStatement(node) {
-            // Grammar checking
-            checkGrammarStatementInAmbientContext(node);
-            checkBlock(node.tryBlock);
-            var catchClause = node.catchClause;
-            if (catchClause) {
-                // Grammar checking
-                if (catchClause.variableDeclaration) {
-                    if (catchClause.variableDeclaration.name.kind !== 69 /* Identifier */) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.name, ts.Diagnostics.Catch_clause_variable_name_must_be_an_identifier);
-                    }
-                    else if (catchClause.variableDeclaration.type) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.type, ts.Diagnostics.Catch_clause_variable_cannot_have_a_type_annotation);
-                    }
-                    else if (catchClause.variableDeclaration.initializer) {
-                        grammarErrorOnFirstToken(catchClause.variableDeclaration.initializer, ts.Diagnostics.Catch_clause_variable_cannot_have_an_initializer);
-                    }
-                    else {
-                        var identifierName = catchClause.variableDeclaration.name.text;
-                        var locals = catchClause.block.locals;
-                        if (locals && ts.hasProperty(locals, identifierName)) {
-                            var localSymbol = locals[identifierName];
-                            if (localSymbol && (localSymbol.flags & 2 /* BlockScopedVariable */) !== 0) {
-                                grammarErrorOnNode(localSymbol.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, identifierName);
-                            }
-                        }
-                    }
-                }
-                checkBlock(catchClause.block);
-            }
-            if (node.finallyBlock) {
-                checkBlock(node.finallyBlock);
-            }
-        }
-        function checkIndexConstraints(type) {
-            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1 /* Number */);
-            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, 0 /* String */);
-            var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
-            var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
-            if (stringIndexType || numberIndexType) {
-                ts.forEach(getPropertiesOfObjectType(type), function (prop) {
-                    var propType = getTypeOfSymbol(prop);
-                    checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
-                    checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
-                });
-                if (type.flags & 1024 /* Class */ && ts.isClassLike(type.symbol.valueDeclaration)) {
-                    var classDeclaration = type.symbol.valueDeclaration;
-                    for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
-                        // Only process instance properties with computed names here.
-                        // Static properties cannot be in conflict with indexers,
-                        // and properties with literal names were already checked.
-                        if (!(member.flags & 32 /* Static */) && ts.hasDynamicName(member)) {
-                            var propType = getTypeOfSymbol(member.symbol);
-                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
-                            checkIndexConstraintForProperty(member.symbol, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
-                        }
-                    }
-                }
-            }
-            var errorNode;
-            if (stringIndexType && numberIndexType) {
-                errorNode = declaredNumberIndexer || declaredStringIndexer;
-                // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
-                if (!errorNode && (type.flags & 2048 /* Interface */)) {
-                    var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0 /* String */) && getIndexTypeOfType(base, 1 /* Number */); });
-                    errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
-                }
-            }
-            if (errorNode && !isTypeAssignableTo(numberIndexType, stringIndexType)) {
-                error(errorNode, ts.Diagnostics.Numeric_index_type_0_is_not_assignable_to_string_index_type_1, typeToString(numberIndexType), typeToString(stringIndexType));
-            }
-            function checkIndexConstraintForProperty(prop, propertyType, containingType, indexDeclaration, indexType, indexKind) {
-                if (!indexType) {
-                    return;
-                }
-                // index is numeric and property name is not valid numeric literal
-                if (indexKind === 1 /* Number */ && !isNumericName(prop.valueDeclaration.name)) {
-                    return;
-                }
-                // perform property check if property or indexer is declared in 'type'
-                // this allows to rule out cases when both property and indexer are inherited from the base class
-                var errorNode;
-                if (prop.valueDeclaration.name.kind === 140 /* ComputedPropertyName */ || prop.parent === containingType.symbol) {
-                    errorNode = prop.valueDeclaration;
-                }
-                else if (indexDeclaration) {
-                    errorNode = indexDeclaration;
-                }
-                else if (containingType.flags & 2048 /* Interface */) {
-                    // for interfaces property and indexer might be inherited from different bases
-                    // check if any base class already has both property and indexer.
-                    // check should be performed only if 'type' is the first type that brings property\indexer together
-                    var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.name) && getIndexTypeOfType(base, indexKind); });
-                    errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
-                }
-                if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
-                    var errorMessage = indexKind === 0 /* String */
-                        ? ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_string_index_type_2
-                        : ts.Diagnostics.Property_0_of_type_1_is_not_assignable_to_numeric_index_type_2;
-                    error(errorNode, errorMessage, symbolToString(prop), typeToString(propertyType), typeToString(indexType));
-                }
-            }
-        }
-        function checkTypeNameIsReserved(name, message) {
-            // TS 1.0 spec (April 2014): 3.6.1
-            // The predefined type keywords are reserved and cannot be used as names of user defined types.
-            switch (name.text) {
-                case "any":
-                case "number":
-                case "boolean":
-                case "string":
-                case "symbol":
-                case "void":
-                    error(name, message, name.text);
-            }
-        }
-        /** Check each type parameter and check that type parameters have no duplicate type parameter declarations */
-        function checkTypeParameters(typeParameterDeclarations) {
-            if (typeParameterDeclarations) {
-                for (var i = 0, n = typeParameterDeclarations.length; i < n; i++) {
-                    var node = typeParameterDeclarations[i];
-                    checkTypeParameter(node);
-                    if (produceDiagnostics) {
-                        for (var j = 0; j < i; j++) {
-                            if (typeParameterDeclarations[j].symbol === node.symbol) {
-                                error(node.name, ts.Diagnostics.Duplicate_identifier_0, ts.declarationNameToString(node.name));
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        /** Check that type parameter lists are identical across multiple declarations */
-        function checkTypeParameterListsIdentical(node, symbol) {
-            if (symbol.declarations.length === 1) {
-                return;
-            }
-            var firstDecl;
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 221 /* ClassDeclaration */ || declaration.kind === 222 /* InterfaceDeclaration */) {
-                    if (!firstDecl) {
-                        firstDecl = declaration;
-                    }
-                    else if (!areTypeParametersIdentical(firstDecl.typeParameters, node.typeParameters)) {
-                        error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_type_parameters, node.name.text);
-                    }
-                }
-            }
-        }
-        function checkClassExpression(node) {
-            checkClassLikeDeclaration(node);
-            checkNodeDeferred(node);
-            return getTypeOfSymbol(getSymbolOfNode(node));
-        }
-        function checkClassExpressionDeferred(node) {
-            ts.forEach(node.members, checkSourceElement);
-            registerForUnusedIdentifiersCheck(node);
-        }
-        function checkClassDeclaration(node) {
-            if (!node.name && !(node.flags & 512 /* Default */)) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
-            }
-            checkClassLikeDeclaration(node);
-            ts.forEach(node.members, checkSourceElement);
-            registerForUnusedIdentifiersCheck(node);
-        }
-        function checkClassLikeDeclaration(node) {
-            checkGrammarClassDeclarationHeritageClauses(node);
-            checkDecorators(node);
-            if (node.name) {
-                checkTypeNameIsReserved(node.name, ts.Diagnostics.Class_name_cannot_be_0);
-                checkCollisionWithCapturedThisVariable(node, node.name);
-                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-            }
-            checkTypeParameters(node.typeParameters);
-            checkExportsOnMergedDeclarations(node);
-            var symbol = getSymbolOfNode(node);
-            var type = getDeclaredTypeOfSymbol(symbol);
-            var typeWithThis = getTypeWithThisArgument(type);
-            var staticType = getTypeOfSymbol(symbol);
-            checkTypeParameterListsIdentical(node, symbol);
-            checkClassForDuplicateDeclarations(node);
-            var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
-            if (baseTypeNode) {
-                var baseTypes = getBaseTypes(type);
-                if (baseTypes.length && produceDiagnostics) {
-                    var baseType_1 = baseTypes[0];
-                    var staticBaseType = getBaseConstructorTypeOfClass(type);
-                    checkBaseTypeAccessibility(staticBaseType, baseTypeNode);
-                    checkSourceElement(baseTypeNode.expression);
-                    if (baseTypeNode.typeArguments) {
-                        ts.forEach(baseTypeNode.typeArguments, checkSourceElement);
-                        for (var _i = 0, _a = getConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments); _i < _a.length; _i++) {
-                            var constructor = _a[_i];
-                            if (!checkTypeArgumentConstraints(constructor.typeParameters, baseTypeNode.typeArguments)) {
-                                break;
-                            }
-                        }
-                    }
-                    checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType_1, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_extends_base_class_1);
-                    checkTypeAssignableTo(staticType, getTypeWithoutSignatures(staticBaseType), node.name || node, ts.Diagnostics.Class_static_side_0_incorrectly_extends_base_class_static_side_1);
-                    if (!(staticBaseType.symbol && staticBaseType.symbol.flags & 32 /* Class */)) {
-                        // When the static base type is a "class-like" constructor function (but not actually a class), we verify
-                        // that all instantiated base constructor signatures return the same type. We can simply compare the type
-                        // references (as opposed to checking the structure of the types) because elsewhere we have already checked
-                        // that the base type is a class or interface type (and not, for example, an anonymous object type).
-                        var constructors = getInstantiatedConstructorsForTypeArguments(staticBaseType, baseTypeNode.typeArguments);
-                        if (ts.forEach(constructors, function (sig) { return getReturnTypeOfSignature(sig) !== baseType_1; })) {
-                            error(baseTypeNode.expression, ts.Diagnostics.Base_constructors_must_all_have_the_same_return_type);
-                        }
-                    }
-                    checkKindsOfPropertyMemberOverrides(type, baseType_1);
-                }
-            }
-            var implementedTypeNodes = ts.getClassImplementsHeritageClauseElements(node);
-            if (implementedTypeNodes) {
-                for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
-                    var typeRefNode = implementedTypeNodes_1[_b];
-                    if (!ts.isSupportedExpressionWithTypeArguments(typeRefNode)) {
-                        error(typeRefNode.expression, ts.Diagnostics.A_class_can_only_implement_an_identifier_Slashqualified_name_with_optional_type_arguments);
-                    }
-                    checkTypeReferenceNode(typeRefNode);
-                    if (produceDiagnostics) {
-                        var t = getTypeFromTypeNode(typeRefNode);
-                        if (t !== unknownType) {
-                            var declaredType = (t.flags & 4096 /* Reference */) ? t.target : t;
-                            if (declaredType.flags & (1024 /* Class */ | 2048 /* Interface */)) {
-                                checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(t, type.thisType), node.name || node, ts.Diagnostics.Class_0_incorrectly_implements_interface_1);
-                            }
-                            else {
-                                error(typeRefNode, ts.Diagnostics.A_class_may_only_implement_another_class_or_interface);
-                            }
-                        }
-                    }
-                }
-            }
-            if (produceDiagnostics) {
-                checkIndexConstraints(type);
-                checkTypeForDuplicateIndexSignatures(node);
-            }
-        }
-        function checkBaseTypeAccessibility(type, node) {
-            var signatures = getSignaturesOfType(type, 1 /* Construct */);
-            if (signatures.length) {
-                var declaration = signatures[0].declaration;
-                if (declaration && declaration.flags & 8 /* Private */) {
-                    var typeClassDeclaration = getClassLikeDeclarationOfSymbol(type.symbol);
-                    if (!isNodeWithinClass(node, typeClassDeclaration)) {
-                        error(node, ts.Diagnostics.Cannot_extend_a_class_0_Class_constructor_is_marked_as_private, node.expression.text);
-                    }
-                }
-            }
-        }
-        function getTargetSymbol(s) {
-            // if symbol is instantiated its flags are not copied from the 'target'
-            // so we'll need to get back original 'target' symbol to work with correct set of flags
-            return s.flags & 16777216 /* Instantiated */ ? getSymbolLinks(s).target : s;
-        }
-        function getClassLikeDeclarationOfSymbol(symbol) {
-            return ts.forEach(symbol.declarations, function (d) { return ts.isClassLike(d) ? d : undefined; });
-        }
-        function checkKindsOfPropertyMemberOverrides(type, baseType) {
-            // TypeScript 1.0 spec (April 2014): 8.2.3
-            // A derived class inherits all members from its base class it doesn't override.
-            // Inheritance means that a derived class implicitly contains all non - overridden members of the base class.
-            // Both public and private property members are inherited, but only public property members can be overridden.
-            // A property member in a derived class is said to override a property member in a base class
-            // when the derived class property member has the same name and kind(instance or static)
-            // as the base class property member.
-            // The type of an overriding property member must be assignable(section 3.8.4)
-            // to the type of the overridden property member, or otherwise a compile - time error occurs.
-            // Base class instance member functions can be overridden by derived class instance member functions,
-            // but not by other kinds of members.
-            // Base class instance member variables and accessors can be overridden by
-            // derived class instance member variables and accessors, but not by other kinds of members.
-            // NOTE: assignability is checked in checkClassDeclaration
-            var baseProperties = getPropertiesOfObjectType(baseType);
-            for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
-                var baseProperty = baseProperties_1[_i];
-                var base = getTargetSymbol(baseProperty);
-                if (base.flags & 134217728 /* Prototype */) {
-                    continue;
-                }
-                var derived = getTargetSymbol(getPropertyOfObjectType(type, base.name));
-                var baseDeclarationFlags = getDeclarationFlagsFromSymbol(base);
-                ts.Debug.assert(!!derived, "derived should point to something, even if it is the base class' declaration.");
-                if (derived) {
-                    // In order to resolve whether the inherited method was overridden in the base class or not,
-                    // we compare the Symbols obtained. Since getTargetSymbol returns the symbol on the *uninstantiated*
-                    // type declaration, derived and base resolve to the same symbol even in the case of generic classes.
-                    if (derived === base) {
-                        // derived class inherits base without override/redeclaration
-                        var derivedClassDecl = getClassLikeDeclarationOfSymbol(type.symbol);
-                        // It is an error to inherit an abstract member without implementing it or being declared abstract.
-                        // If there is no declaration for the derived class (as in the case of class expressions),
-                        // then the class cannot be declared abstract.
-                        if (baseDeclarationFlags & 128 /* Abstract */ && (!derivedClassDecl || !(derivedClassDecl.flags & 128 /* Abstract */))) {
-                            if (derivedClassDecl.kind === 192 /* ClassExpression */) {
-                                error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
-                            }
-                            else {
-                                error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_0_does_not_implement_inherited_abstract_member_1_from_class_2, typeToString(type), symbolToString(baseProperty), typeToString(baseType));
-                            }
-                        }
-                    }
-                    else {
-                        // derived overrides base.
-                        var derivedDeclarationFlags = getDeclarationFlagsFromSymbol(derived);
-                        if ((baseDeclarationFlags & 8 /* Private */) || (derivedDeclarationFlags & 8 /* Private */)) {
-                            // either base or derived property is private - not override, skip it
-                            continue;
-                        }
-                        if ((baseDeclarationFlags & 32 /* Static */) !== (derivedDeclarationFlags & 32 /* Static */)) {
-                            // value of 'static' is not the same for properties - not override, skip it
-                            continue;
-                        }
-                        if ((base.flags & derived.flags & 8192 /* Method */) || ((base.flags & 98308 /* PropertyOrAccessor */) && (derived.flags & 98308 /* PropertyOrAccessor */))) {
-                            // method is overridden with method or property/accessor is overridden with property/accessor - correct case
-                            continue;
-                        }
-                        var errorMessage = void 0;
-                        if (base.flags & 8192 /* Method */) {
-                            if (derived.flags & 98304 /* Accessor */) {
-                                errorMessage = ts.Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_accessor;
-                            }
-                            else {
-                                ts.Debug.assert((derived.flags & 4 /* Property */) !== 0);
-                                errorMessage = ts.Diagnostics.Class_0_defines_instance_member_function_1_but_extended_class_2_defines_it_as_instance_member_property;
-                            }
-                        }
-                        else if (base.flags & 4 /* Property */) {
-                            ts.Debug.assert((derived.flags & 8192 /* Method */) !== 0);
-                            errorMessage = ts.Diagnostics.Class_0_defines_instance_member_property_1_but_extended_class_2_defines_it_as_instance_member_function;
-                        }
-                        else {
-                            ts.Debug.assert((base.flags & 98304 /* Accessor */) !== 0);
-                            ts.Debug.assert((derived.flags & 8192 /* Method */) !== 0);
-                            errorMessage = ts.Diagnostics.Class_0_defines_instance_member_accessor_1_but_extended_class_2_defines_it_as_instance_member_function;
-                        }
-                        error(derived.valueDeclaration.name, errorMessage, typeToString(baseType), symbolToString(base), typeToString(type));
-                    }
-                }
-            }
-        }
-        function isAccessor(kind) {
-            return kind === 149 /* GetAccessor */ || kind === 150 /* SetAccessor */;
-        }
-        function areTypeParametersIdentical(list1, list2) {
-            if (!list1 && !list2) {
-                return true;
-            }
-            if (!list1 || !list2 || list1.length !== list2.length) {
-                return false;
-            }
-            // TypeScript 1.0 spec (April 2014):
-            // When a generic interface has multiple declarations,  all declarations must have identical type parameter
-            // lists, i.e. identical type parameter names with identical constraints in identical order.
-            for (var i = 0, len = list1.length; i < len; i++) {
-                var tp1 = list1[i];
-                var tp2 = list2[i];
-                if (tp1.name.text !== tp2.name.text) {
-                    return false;
-                }
-                if (!tp1.constraint && !tp2.constraint) {
-                    continue;
-                }
-                if (!tp1.constraint || !tp2.constraint) {
-                    return false;
-                }
-                if (!isTypeIdenticalTo(getTypeFromTypeNode(tp1.constraint), getTypeFromTypeNode(tp2.constraint))) {
-                    return false;
-                }
-            }
-            return true;
-        }
-        function checkInheritedPropertiesAreIdentical(type, typeNode) {
-            var baseTypes = getBaseTypes(type);
-            if (baseTypes.length < 2) {
-                return true;
-            }
-            var seen = {};
-            ts.forEach(resolveDeclaredMembers(type).declaredProperties, function (p) { seen[p.name] = { prop: p, containingType: type }; });
-            var ok = true;
-            for (var _i = 0, baseTypes_2 = baseTypes; _i < baseTypes_2.length; _i++) {
-                var base = baseTypes_2[_i];
-                var properties = getPropertiesOfObjectType(getTypeWithThisArgument(base, type.thisType));
-                for (var _a = 0, properties_4 = properties; _a < properties_4.length; _a++) {
-                    var prop = properties_4[_a];
-                    if (!ts.hasProperty(seen, prop.name)) {
-                        seen[prop.name] = { prop: prop, containingType: base };
-                    }
-                    else {
-                        var existing = seen[prop.name];
-                        var isInheritedProperty = existing.containingType !== type;
-                        if (isInheritedProperty && !isPropertyIdenticalTo(existing.prop, prop)) {
-                            ok = false;
-                            var typeName1 = typeToString(existing.containingType);
-                            var typeName2 = typeToString(base);
-                            var errorInfo = ts.chainDiagnosticMessages(undefined, ts.Diagnostics.Named_property_0_of_types_1_and_2_are_not_identical, symbolToString(prop), typeName1, typeName2);
-                            errorInfo = ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.Interface_0_cannot_simultaneously_extend_types_1_and_2, typeToString(type), typeName1, typeName2);
-                            diagnostics.add(ts.createDiagnosticForNodeFromMessageChain(typeNode, errorInfo));
-                        }
-                    }
-                }
-            }
-            return ok;
-        }
-        function checkInterfaceDeclaration(node) {
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarInterfaceDeclaration(node);
-            checkTypeParameters(node.typeParameters);
-            if (produceDiagnostics) {
-                checkTypeNameIsReserved(node.name, ts.Diagnostics.Interface_name_cannot_be_0);
-                checkExportsOnMergedDeclarations(node);
-                var symbol = getSymbolOfNode(node);
-                checkTypeParameterListsIdentical(node, symbol);
-                // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 222 /* InterfaceDeclaration */);
-                if (node === firstInterfaceDecl) {
-                    var type = getDeclaredTypeOfSymbol(symbol);
-                    var typeWithThis = getTypeWithThisArgument(type);
-                    // run subsequent checks only if first set succeeded
-                    if (checkInheritedPropertiesAreIdentical(type, node.name)) {
-                        for (var _i = 0, _a = getBaseTypes(type); _i < _a.length; _i++) {
-                            var baseType = _a[_i];
-                            checkTypeAssignableTo(typeWithThis, getTypeWithThisArgument(baseType, type.thisType), node.name, ts.Diagnostics.Interface_0_incorrectly_extends_interface_1);
-                        }
-                        checkIndexConstraints(type);
-                    }
-                }
-                checkObjectTypeForDuplicateDeclarations(node);
-            }
-            ts.forEach(ts.getInterfaceBaseTypeNodes(node), function (heritageElement) {
-                if (!ts.isSupportedExpressionWithTypeArguments(heritageElement)) {
-                    error(heritageElement.expression, ts.Diagnostics.An_interface_can_only_extend_an_identifier_Slashqualified_name_with_optional_type_arguments);
-                }
-                checkTypeReferenceNode(heritageElement);
-            });
-            ts.forEach(node.members, checkSourceElement);
-            if (produceDiagnostics) {
-                checkTypeForDuplicateIndexSignatures(node);
-                checkUnusedTypeParameters(node);
-            }
-        }
-        function checkTypeAliasDeclaration(node) {
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node);
-            checkTypeNameIsReserved(node.name, ts.Diagnostics.Type_alias_name_cannot_be_0);
-            checkSourceElement(node.type);
-        }
-        function computeEnumMemberValues(node) {
-            var nodeLinks = getNodeLinks(node);
-            if (!(nodeLinks.flags & 16384 /* EnumValuesComputed */)) {
-                var enumSymbol = getSymbolOfNode(node);
-                var enumType = getDeclaredTypeOfSymbol(enumSymbol);
-                var autoValue = 0; // set to undefined when enum member is non-constant
-                var ambient = ts.isInAmbientContext(node);
-                var enumIsConst = ts.isConst(node);
-                for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
-                    var member = _a[_i];
-                    if (isComputedNonLiteralName(member.name)) {
-                        error(member.name, ts.Diagnostics.Computed_property_names_are_not_allowed_in_enums);
-                    }
-                    else {
-                        var text = getTextOfPropertyName(member.name);
-                        if (isNumericLiteralName(text)) {
-                            error(member.name, ts.Diagnostics.An_enum_member_cannot_have_a_numeric_name);
-                        }
-                    }
-                    var previousEnumMemberIsNonConstant = autoValue === undefined;
-                    var initializer = member.initializer;
-                    if (initializer) {
-                        autoValue = computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient);
-                    }
-                    else if (ambient && !enumIsConst) {
-                        // In ambient enum declarations that specify no const modifier, enum member declarations
-                        // that omit a value are considered computed members (as opposed to having auto-incremented values assigned).
-                        autoValue = undefined;
-                    }
-                    else if (previousEnumMemberIsNonConstant) {
-                        // If the member declaration specifies no value, the member is considered a constant enum member.
-                        // If the member is the first member in the enum declaration, it is assigned the value zero.
-                        // Otherwise, it is assigned the value of the immediately preceding member plus one,
-                        // and an error occurs if the immediately preceding member is not a constant enum member
-                        error(member.name, ts.Diagnostics.Enum_member_must_have_initializer);
-                    }
-                    if (autoValue !== undefined) {
-                        getNodeLinks(member).enumMemberValue = autoValue;
-                        autoValue++;
-                    }
-                }
-                nodeLinks.flags |= 16384 /* EnumValuesComputed */;
-            }
-            function computeConstantValueForEnumMemberInitializer(initializer, enumType, enumIsConst, ambient) {
-                // Controls if error should be reported after evaluation of constant value is completed
-                // Can be false if another more precise error was already reported during evaluation.
-                var reportError = true;
-                var value = evalConstant(initializer);
-                if (reportError) {
-                    if (value === undefined) {
-                        if (enumIsConst) {
-                            error(initializer, ts.Diagnostics.In_const_enum_declarations_member_initializer_must_be_constant_expression);
-                        }
-                        else if (ambient) {
-                            error(initializer, ts.Diagnostics.In_ambient_enum_declarations_member_initializer_must_be_constant_expression);
-                        }
-                        else {
-                            // Only here do we need to check that the initializer is assignable to the enum type.
-                            checkTypeAssignableTo(checkExpression(initializer), enumType, initializer, /*headMessage*/ undefined);
-                        }
-                    }
-                    else if (enumIsConst) {
-                        if (isNaN(value)) {
-                            error(initializer, ts.Diagnostics.const_enum_member_initializer_was_evaluated_to_disallowed_value_NaN);
-                        }
-                        else if (!isFinite(value)) {
-                            error(initializer, ts.Diagnostics.const_enum_member_initializer_was_evaluated_to_a_non_finite_value);
-                        }
-                    }
-                }
-                return value;
-                function evalConstant(e) {
-                    switch (e.kind) {
-                        case 185 /* PrefixUnaryExpression */:
-                            var value_1 = evalConstant(e.operand);
-                            if (value_1 === undefined) {
-                                return undefined;
-                            }
-                            switch (e.operator) {
-                                case 35 /* PlusToken */: return value_1;
-                                case 36 /* MinusToken */: return -value_1;
-                                case 50 /* TildeToken */: return ~value_1;
-                            }
-                            return undefined;
-                        case 187 /* BinaryExpression */:
-                            var left = evalConstant(e.left);
-                            if (left === undefined) {
-                                return undefined;
-                            }
-                            var right = evalConstant(e.right);
-                            if (right === undefined) {
-                                return undefined;
-                            }
-                            switch (e.operatorToken.kind) {
-                                case 47 /* BarToken */: return left | right;
-                                case 46 /* AmpersandToken */: return left & right;
-                                case 44 /* GreaterThanGreaterThanToken */: return left >> right;
-                                case 45 /* GreaterThanGreaterThanGreaterThanToken */: return left >>> right;
-                                case 43 /* LessThanLessThanToken */: return left << right;
-                                case 48 /* CaretToken */: return left ^ right;
-                                case 37 /* AsteriskToken */: return left * right;
-                                case 39 /* SlashToken */: return left / right;
-                                case 35 /* PlusToken */: return left + right;
-                                case 36 /* MinusToken */: return left - right;
-                                case 40 /* PercentToken */: return left % right;
-                            }
-                            return undefined;
-                        case 8 /* NumericLiteral */:
-                            return +e.text;
-                        case 178 /* ParenthesizedExpression */:
-                            return evalConstant(e.expression);
-                        case 69 /* Identifier */:
-                        case 173 /* ElementAccessExpression */:
-                        case 172 /* PropertyAccessExpression */:
-                            var member = initializer.parent;
-                            var currentType = getTypeOfSymbol(getSymbolOfNode(member.parent));
-                            var enumType_1;
-                            var propertyName = void 0;
-                            if (e.kind === 69 /* Identifier */) {
-                                // unqualified names can refer to member that reside in different declaration of the enum so just doing name resolution won't work.
-                                // instead pick current enum type and later try to fetch member from the type
-                                enumType_1 = currentType;
-                                propertyName = e.text;
-                            }
-                            else {
-                                var expression = void 0;
-                                if (e.kind === 173 /* ElementAccessExpression */) {
-                                    if (e.argumentExpression === undefined ||
-                                        e.argumentExpression.kind !== 9 /* StringLiteral */) {
-                                        return undefined;
-                                    }
-                                    expression = e.expression;
-                                    propertyName = e.argumentExpression.text;
-                                }
-                                else {
-                                    expression = e.expression;
-                                    propertyName = e.name.text;
-                                }
-                                // expression part in ElementAccess\PropertyAccess should be either identifier or dottedName
-                                var current = expression;
-                                while (current) {
-                                    if (current.kind === 69 /* Identifier */) {
-                                        break;
-                                    }
-                                    else if (current.kind === 172 /* PropertyAccessExpression */) {
-                                        current = current.expression;
-                                    }
-                                    else {
-                                        return undefined;
-                                    }
-                                }
-                                enumType_1 = checkExpression(expression);
-                                // allow references to constant members of other enums
-                                if (!(enumType_1.symbol && (enumType_1.symbol.flags & 384 /* Enum */))) {
-                                    return undefined;
-                                }
-                            }
-                            if (propertyName === undefined) {
-                                return undefined;
-                            }
-                            var property = getPropertyOfObjectType(enumType_1, propertyName);
-                            if (!property || !(property.flags & 8 /* EnumMember */)) {
-                                return undefined;
-                            }
-                            var propertyDecl = property.valueDeclaration;
-                            // self references are illegal
-                            if (member === propertyDecl) {
-                                return undefined;
-                            }
-                            // illegal case: forward reference
-                            if (!isBlockScopedNameDeclaredBeforeUse(propertyDecl, member)) {
-                                reportError = false;
-                                error(e, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
-                                return undefined;
-                            }
-                            return getNodeLinks(propertyDecl).enumMemberValue;
-                    }
-                }
-            }
-        }
-        function checkEnumDeclaration(node) {
-            if (!produceDiagnostics) {
-                return;
-            }
-            // Grammar checking
-            checkGrammarDecorators(node) || checkGrammarModifiers(node);
-            checkTypeNameIsReserved(node.name, ts.Diagnostics.Enum_name_cannot_be_0);
-            checkCollisionWithCapturedThisVariable(node, node.name);
-            checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-            checkExportsOnMergedDeclarations(node);
-            computeEnumMemberValues(node);
-            var enumIsConst = ts.isConst(node);
-            if (compilerOptions.isolatedModules && enumIsConst && ts.isInAmbientContext(node)) {
-                error(node.name, ts.Diagnostics.Ambient_const_enums_are_not_allowed_when_the_isolatedModules_flag_is_provided);
-            }
-            // Spec 2014 - Section 9.3:
-            // It isn't possible for one enum declaration to continue the automatic numbering sequence of another,
-            // and when an enum type has multiple declarations, only one declaration is permitted to omit a value
-            // for the first member.
-            //
-            // Only perform this check once per symbol
-            var enumSymbol = getSymbolOfNode(node);
-            var firstDeclaration = ts.getDeclarationOfKind(enumSymbol, node.kind);
-            if (node === firstDeclaration) {
-                if (enumSymbol.declarations.length > 1) {
-                    // check that const is placed\omitted on all enum declarations
-                    ts.forEach(enumSymbol.declarations, function (decl) {
-                        if (ts.isConstEnumDeclaration(decl) !== enumIsConst) {
-                            error(decl.name, ts.Diagnostics.Enum_declarations_must_all_be_const_or_non_const);
-                        }
-                    });
-                }
-                var seenEnumMissingInitialInitializer_1 = false;
-                ts.forEach(enumSymbol.declarations, function (declaration) {
-                    // return true if we hit a violation of the rule, false otherwise
-                    if (declaration.kind !== 224 /* EnumDeclaration */) {
-                        return false;
-                    }
-                    var enumDeclaration = declaration;
-                    if (!enumDeclaration.members.length) {
-                        return false;
-                    }
-                    var firstEnumMember = enumDeclaration.members[0];
-                    if (!firstEnumMember.initializer) {
-                        if (seenEnumMissingInitialInitializer_1) {
-                            error(firstEnumMember.name, ts.Diagnostics.In_an_enum_with_multiple_declarations_only_one_declaration_can_omit_an_initializer_for_its_first_enum_element);
-                        }
-                        else {
-                            seenEnumMissingInitialInitializer_1 = true;
-                        }
-                    }
-                });
-            }
-        }
-        function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
-            var declarations = symbol.declarations;
-            for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
-                var declaration = declarations_5[_i];
-                if ((declaration.kind === 221 /* ClassDeclaration */ ||
-                    (declaration.kind === 220 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
-                    !ts.isInAmbientContext(declaration)) {
-                    return declaration;
-                }
-            }
-            return undefined;
-        }
-        function inSameLexicalScope(node1, node2) {
-            var container1 = ts.getEnclosingBlockScopeContainer(node1);
-            var container2 = ts.getEnclosingBlockScopeContainer(node2);
-            if (isGlobalSourceFile(container1)) {
-                return isGlobalSourceFile(container2);
-            }
-            else if (isGlobalSourceFile(container2)) {
-                return false;
-            }
-            else {
-                return container1 === container2;
-            }
-        }
-        function checkModuleDeclaration(node) {
-            if (produceDiagnostics) {
-                // Grammar checking
-                var isGlobalAugmentation = ts.isGlobalScopeAugmentation(node);
-                var inAmbientContext = ts.isInAmbientContext(node);
-                if (isGlobalAugmentation && !inAmbientContext) {
-                    error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_should_have_declare_modifier_unless_they_appear_in_already_ambient_context);
-                }
-                var isAmbientExternalModule = ts.isAmbientModule(node);
-                var contextErrorMessage = isAmbientExternalModule
-                    ? ts.Diagnostics.An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file
-                    : ts.Diagnostics.A_namespace_declaration_is_only_allowed_in_a_namespace_or_module;
-                if (checkGrammarModuleElementContext(node, contextErrorMessage)) {
-                    // If we hit a module declaration in an illegal context, just bail out to avoid cascading errors.
-                    return;
-                }
-                if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node)) {
-                    if (!inAmbientContext && node.name.kind === 9 /* StringLiteral */) {
-                        grammarErrorOnNode(node.name, ts.Diagnostics.Only_ambient_modules_can_use_quoted_names);
-                    }
-                }
-                checkCollisionWithCapturedThisVariable(node, node.name);
-                checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-                checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-                checkExportsOnMergedDeclarations(node);
-                var symbol = getSymbolOfNode(node);
-                // The following checks only apply on a non-ambient instantiated module declaration.
-                if (symbol.flags & 512 /* ValueModule */
-                    && symbol.declarations.length > 1
-                    && !inAmbientContext
-                    && ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules)) {
-                    var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
-                    if (firstNonAmbientClassOrFunc) {
-                        if (ts.getSourceFileOfNode(node) !== ts.getSourceFileOfNode(firstNonAmbientClassOrFunc)) {
-                            error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_in_a_different_file_from_a_class_or_function_with_which_it_is_merged);
-                        }
-                        else if (node.pos < firstNonAmbientClassOrFunc.pos) {
-                            error(node.name, ts.Diagnostics.A_namespace_declaration_cannot_be_located_prior_to_a_class_or_function_with_which_it_is_merged);
-                        }
-                    }
-                    // if the module merges with a class declaration in the same lexical scope,
-                    // we need to track this to ensure the correct emit.
-                    var mergedClass = ts.getDeclarationOfKind(symbol, 221 /* ClassDeclaration */);
-                    if (mergedClass &&
-                        inSameLexicalScope(node, mergedClass)) {
-                        getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
-                    }
-                }
-                if (isAmbientExternalModule) {
-                    if (ts.isExternalModuleAugmentation(node)) {
-                        // body of the augmentation should be checked for consistency only if augmentation was applied to its target (either global scope or module)
-                        // otherwise we'll be swamped in cascading errors.
-                        // We can detect if augmentation was applied using following rules:
-                        // - augmentation for a global scope is always applied
-                        // - augmentation for some external module is applied if symbol for augmentation is merged (it was combined with target module).
-                        var checkBody = isGlobalAugmentation || (getSymbolOfNode(node).flags & 33554432 /* Merged */);
-                        if (checkBody && node.body) {
-                            // body of ambient external module is always a module block
-                            for (var _i = 0, _a = node.body.statements; _i < _a.length; _i++) {
-                                var statement = _a[_i];
-                                checkModuleAugmentationElement(statement, isGlobalAugmentation);
-                            }
-                        }
-                    }
-                    else if (isGlobalSourceFile(node.parent)) {
-                        if (isGlobalAugmentation) {
-                            error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations);
-                        }
-                        else if (ts.isExternalModuleNameRelative(node.name.text)) {
-                            error(node.name, ts.Diagnostics.Ambient_module_declaration_cannot_specify_relative_module_name);
-                        }
-                    }
-                    else {
-                        if (isGlobalAugmentation) {
-                            error(node.name, ts.Diagnostics.Augmentations_for_the_global_scope_can_only_be_directly_nested_in_external_modules_or_ambient_module_declarations);
-                        }
-                        else {
-                            // Node is not an augmentation and is not located on the script level.
-                            // This means that this is declaration of ambient module that is located in other module or namespace which is prohibited.
-                            error(node.name, ts.Diagnostics.Ambient_modules_cannot_be_nested_in_other_modules_or_namespaces);
-                        }
-                    }
-                }
-            }
-            if (compilerOptions.noImplicitAny && !node.body) {
-                // Ambient shorthand module is an implicit any
-                reportImplicitAnyError(node, anyType);
-            }
-            if (node.body) {
-                checkSourceElement(node.body);
-                if (!ts.isGlobalScopeAugmentation(node)) {
-                    registerForUnusedIdentifiersCheck(node);
-                }
-            }
-        }
-        function checkModuleAugmentationElement(node, isGlobalAugmentation) {
-            switch (node.kind) {
-                case 200 /* VariableStatement */:
-                    // error each individual name in variable statement instead of marking the entire variable statement
-                    for (var _i = 0, _a = node.declarationList.declarations; _i < _a.length; _i++) {
-                        var decl = _a[_i];
-                        checkModuleAugmentationElement(decl, isGlobalAugmentation);
-                    }
-                    break;
-                case 235 /* ExportAssignment */:
-                case 236 /* ExportDeclaration */:
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
-                    break;
-                case 229 /* ImportEqualsDeclaration */:
-                case 230 /* ImportDeclaration */:
-                    grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
-                    break;
-                case 169 /* BindingElement */:
-                case 218 /* VariableDeclaration */:
-                    var name_19 = node.name;
-                    if (ts.isBindingPattern(name_19)) {
-                        for (var _b = 0, _c = name_19.elements; _b < _c.length; _b++) {
-                            var el = _c[_b];
-                            // mark individual names in binding pattern
-                            checkModuleAugmentationElement(el, isGlobalAugmentation);
-                        }
-                        break;
-                    }
-                // fallthrough
-                case 221 /* ClassDeclaration */:
-                case 224 /* EnumDeclaration */:
-                case 220 /* FunctionDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 225 /* ModuleDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                    if (isGlobalAugmentation) {
-                        return;
-                    }
-                    var symbol = getSymbolOfNode(node);
-                    if (symbol) {
-                        // module augmentations cannot introduce new names on the top level scope of the module
-                        // this is done it two steps
-                        // 1. quick check - if symbol for node is not merged - this is local symbol to this augmentation - report error
-                        // 2. main check - report error if value declaration of the parent symbol is module augmentation)
-                        var reportError = !(symbol.flags & 33554432 /* Merged */);
-                        if (!reportError) {
-                            // symbol should not originate in augmentation
-                            reportError = ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
-                        }
-                    }
-                    break;
-            }
-        }
-        function getFirstIdentifier(node) {
-            while (true) {
-                if (node.kind === 139 /* QualifiedName */) {
-                    node = node.left;
-                }
-                else if (node.kind === 172 /* PropertyAccessExpression */) {
-                    node = node.expression;
-                }
-                else {
-                    break;
-                }
-            }
-            ts.Debug.assert(node.kind === 69 /* Identifier */);
-            return node;
-        }
-        function checkExternalImportOrExportDeclaration(node) {
-            var moduleName = ts.getExternalModuleName(node);
-            if (!ts.nodeIsMissing(moduleName) && moduleName.kind !== 9 /* StringLiteral */) {
-                error(moduleName, ts.Diagnostics.String_literal_expected);
-                return false;
-            }
-            var inAmbientExternalModule = node.parent.kind === 226 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-            if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
-                error(moduleName, node.kind === 236 /* ExportDeclaration */ ?
-                    ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
-                    ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
-                return false;
-            }
-            if (inAmbientExternalModule && ts.isExternalModuleNameRelative(moduleName.text)) {
-                // we have already reported errors on top level imports\exports in external module augmentations in checkModuleDeclaration
-                // no need to do this again.
-                if (!isTopLevelInExternalModuleAugmentation(node)) {
-                    // TypeScript 1.0 spec (April 2013): 12.1.6
-                    // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference
-                    // other external modules only through top - level external module names.
-                    // Relative external module names are not permitted.
-                    error(node, ts.Diagnostics.Import_or_export_declaration_in_an_ambient_module_declaration_cannot_reference_module_through_relative_module_name);
-                    return false;
-                }
-            }
-            return true;
-        }
-        function checkAliasSymbol(node) {
-            var symbol = getSymbolOfNode(node);
-            var target = resolveAlias(symbol);
-            if (target !== unknownSymbol) {
-                // For external modules symbol represent local symbol for an alias.
-                // This local symbol will merge any other local declarations (excluding other aliases)
-                // and symbol.flags will contains combined representation for all merged declaration.
-                // Based on symbol.flags we can compute a set of excluded meanings (meaning that resolved alias should not have,
-                // otherwise it will conflict with some local declaration). Note that in addition to normal flags we include matching SymbolFlags.Export*
-                // in order to prevent collisions with declarations that were exported from the current module (they still contribute to local names).
-                var excludedMeanings = (symbol.flags & (107455 /* Value */ | 1048576 /* ExportValue */) ? 107455 /* Value */ : 0) |
-                    (symbol.flags & 793056 /* Type */ ? 793056 /* Type */ : 0) |
-                    (symbol.flags & 1536 /* Namespace */ ? 1536 /* Namespace */ : 0);
-                if (target.flags & excludedMeanings) {
-                    var message = node.kind === 238 /* ExportSpecifier */ ?
-                        ts.Diagnostics.Export_declaration_conflicts_with_exported_declaration_of_0 :
-                        ts.Diagnostics.Import_declaration_conflicts_with_local_declaration_of_0;
-                    error(node, message, symbolToString(symbol));
-                }
-            }
-        }
-        function checkImportBinding(node) {
-            checkCollisionWithCapturedThisVariable(node, node.name);
-            checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
-            checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-            checkAliasSymbol(node);
-        }
-        function checkImportDeclaration(node) {
-            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
-                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
-                return;
-            }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1023 /* Modifier */)) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.An_import_declaration_cannot_have_modifiers);
-            }
-            if (checkExternalImportOrExportDeclaration(node)) {
-                var importClause = node.importClause;
-                if (importClause) {
-                    if (importClause.name) {
-                        checkImportBinding(importClause);
-                    }
-                    if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 232 /* NamespaceImport */) {
-                            checkImportBinding(importClause.namedBindings);
-                        }
-                        else {
-                            ts.forEach(importClause.namedBindings.elements, checkImportBinding);
-                        }
-                    }
-                }
-            }
-        }
-        function checkImportEqualsDeclaration(node) {
-            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_import_declaration_can_only_be_used_in_a_namespace_or_module)) {
-                // If we hit an import declaration in an illegal context, just bail out to avoid cascading errors.
-                return;
-            }
-            checkGrammarDecorators(node) || checkGrammarModifiers(node);
-            if (ts.isInternalModuleImportEqualsDeclaration(node) || checkExternalImportOrExportDeclaration(node)) {
-                checkImportBinding(node);
-                if (node.flags & 1 /* Export */) {
-                    markExportAsReferenced(node);
-                }
-                if (ts.isInternalModuleImportEqualsDeclaration(node)) {
-                    var target = resolveAlias(getSymbolOfNode(node));
-                    if (target !== unknownSymbol) {
-                        if (target.flags & 107455 /* Value */) {
-                            // Target is a value symbol, check that it is not hidden by a local declaration with the same name
-                            var moduleName = getFirstIdentifier(node.moduleReference);
-                            if (!(resolveEntityName(moduleName, 107455 /* Value */ | 1536 /* Namespace */).flags & 1536 /* Namespace */)) {
-                                error(moduleName, ts.Diagnostics.Module_0_is_hidden_by_a_local_declaration_with_the_same_name, ts.declarationNameToString(moduleName));
-                            }
-                        }
-                        if (target.flags & 793056 /* Type */) {
-                            checkTypeNameIsReserved(node.name, ts.Diagnostics.Import_name_cannot_be_0);
-                        }
-                    }
-                }
-                else {
-                    if (modulekind === ts.ModuleKind.ES6 && !ts.isInAmbientContext(node)) {
-                        // Import equals declaration is deprecated in es6 or above
-                        grammarErrorOnNode(node, ts.Diagnostics.Import_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_import_Asterisk_as_ns_from_mod_import_a_from_mod_import_d_from_mod_or_another_module_format_instead);
-                    }
-                }
-            }
-        }
-        function checkExportDeclaration(node) {
-            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_declaration_can_only_be_used_in_a_module)) {
-                // If we hit an export in an illegal context, just bail out to avoid cascading errors.
-                return;
-            }
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1023 /* Modifier */)) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_declaration_cannot_have_modifiers);
-            }
-            if (!node.moduleSpecifier || checkExternalImportOrExportDeclaration(node)) {
-                if (node.exportClause) {
-                    // export { x, y }
-                    // export { x, y } from "foo"
-                    ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 226 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    if (node.parent.kind !== 256 /* SourceFile */ && !inAmbientExternalModule) {
-                        error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
-                    }
-                }
-                else {
-                    // export * from "foo"
-                    var moduleSymbol = resolveExternalModuleName(node, node.moduleSpecifier);
-                    if (moduleSymbol && hasExportAssignmentSymbol(moduleSymbol)) {
-                        error(node.moduleSpecifier, ts.Diagnostics.Module_0_uses_export_and_cannot_be_used_with_export_Asterisk, symbolToString(moduleSymbol));
-                    }
-                }
-            }
-        }
-        function checkGrammarModuleElementContext(node, errorMessage) {
-            if (node.parent.kind !== 256 /* SourceFile */ && node.parent.kind !== 226 /* ModuleBlock */ && node.parent.kind !== 225 /* ModuleDeclaration */) {
-                return grammarErrorOnFirstToken(node, errorMessage);
-            }
-        }
-        function checkExportSpecifier(node) {
-            checkAliasSymbol(node);
-            if (!node.parent.parent.moduleSpecifier) {
-                var exportedName = node.propertyName || node.name;
-                // find immediate value referenced by exported name (SymbolFlags.Alias is set so we don't chase down aliases)
-                var symbol = resolveName(exportedName, exportedName.text, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */, 
-                /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-                if (symbol && (symbol === undefinedSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
-                    error(exportedName, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, exportedName.text);
-                }
-                else {
-                    markExportAsReferenced(node);
-                }
-            }
-        }
-        function checkExportAssignment(node) {
-            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
-                // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
-                return;
-            }
-            var container = node.parent.kind === 256 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 225 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
-                error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
-                return;
-            }
-            // Grammar checking
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && (node.flags & 1023 /* Modifier */)) {
-                grammarErrorOnFirstToken(node, ts.Diagnostics.An_export_assignment_cannot_have_modifiers);
-            }
-            if (node.expression.kind === 69 /* Identifier */) {
-                markExportAsReferenced(node);
-            }
-            else {
-                checkExpressionCached(node.expression);
-            }
-            checkExternalModuleExports(container);
-            if (node.isExportEquals && !ts.isInAmbientContext(node)) {
-                if (modulekind === ts.ModuleKind.ES6) {
-                    // export assignment is not supported in es6 modules
-                    grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_cannot_be_used_when_targeting_ECMAScript_2015_modules_Consider_using_export_default_or_another_module_format_instead);
-                }
-                else if (modulekind === ts.ModuleKind.System) {
-                    // system modules does not support export assignment
-                    grammarErrorOnNode(node, ts.Diagnostics.Export_assignment_is_not_supported_when_module_flag_is_system);
-                }
-            }
-        }
-        function hasExportedMembers(moduleSymbol) {
-            for (var id in moduleSymbol.exports) {
-                if (id !== "export=") {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function checkExternalModuleExports(node) {
-            var moduleSymbol = getSymbolOfNode(node);
-            var links = getSymbolLinks(moduleSymbol);
-            if (!links.exportsChecked) {
-                var exportEqualsSymbol = moduleSymbol.exports["export="];
-                if (exportEqualsSymbol && hasExportedMembers(moduleSymbol)) {
-                    var declaration = getDeclarationOfAliasSymbol(exportEqualsSymbol) || exportEqualsSymbol.valueDeclaration;
-                    if (!isTopLevelInExternalModuleAugmentation(declaration)) {
-                        error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
-                    }
-                }
-                // Checks for export * conflicts
-                var exports = getExportsOfModule(moduleSymbol);
-                for (var id in exports) {
-                    if (id === "__export") {
-                        continue;
-                    }
-                    var _a = exports[id], declarations = _a.declarations, flags = _a.flags;
-                    // ECMA262: 15.2.1.1 It is a Syntax Error if the ExportedNames of ModuleItemList contains any duplicate entries.
-                    // (TS Exceptions: namespaces, function overloads, enums, and interfaces)
-                    if (flags & (1536 /* Namespace */ | 64 /* Interface */ | 384 /* Enum */)) {
-                        continue;
-                    }
-                    var exportedDeclarationsCount = ts.countWhere(declarations, isNotOverload);
-                    if (flags & 524288 /* TypeAlias */ && exportedDeclarationsCount <= 2) {
-                        // it is legal to merge type alias with other values
-                        // so count should be either 1 (just type alias) or 2 (type alias + merged value)
-                        continue;
-                    }
-                    if (exportedDeclarationsCount > 1) {
-                        for (var _i = 0, declarations_6 = declarations; _i < declarations_6.length; _i++) {
-                            var declaration = declarations_6[_i];
-                            if (isNotOverload(declaration)) {
-                                diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, id));
-                            }
-                        }
-                    }
-                }
-                links.exportsChecked = true;
-            }
-            function isNotOverload(declaration) {
-                return declaration.kind !== 220 /* FunctionDeclaration */ || !!declaration.body;
-            }
-        }
-        function checkSourceElement(node) {
-            if (!node) {
-                return;
-            }
-            var kind = node.kind;
-            if (cancellationToken) {
-                // Only bother checking on a few construct kinds.  We don't want to be excessively
-                // hitting the cancellation token on every node we check.
-                switch (kind) {
-                    case 225 /* ModuleDeclaration */:
-                    case 221 /* ClassDeclaration */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 220 /* FunctionDeclaration */:
-                        cancellationToken.throwIfCancellationRequested();
-                }
-            }
-            switch (kind) {
-                case 141 /* TypeParameter */:
-                    return checkTypeParameter(node);
-                case 142 /* Parameter */:
-                    return checkParameter(node);
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    return checkPropertyDeclaration(node);
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                    return checkSignatureDeclaration(node);
-                case 153 /* IndexSignature */:
-                    return checkSignatureDeclaration(node);
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                    return checkMethodDeclaration(node);
-                case 148 /* Constructor */:
-                    return checkConstructorDeclaration(node);
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                    return checkAccessorDeclaration(node);
-                case 155 /* TypeReference */:
-                    return checkTypeReferenceNode(node);
-                case 154 /* TypePredicate */:
-                    return checkTypePredicate(node);
-                case 158 /* TypeQuery */:
-                    return checkTypeQuery(node);
-                case 159 /* TypeLiteral */:
-                    return checkTypeLiteral(node);
-                case 160 /* ArrayType */:
-                    return checkArrayType(node);
-                case 161 /* TupleType */:
-                    return checkTupleType(node);
-                case 162 /* UnionType */:
-                case 163 /* IntersectionType */:
-                    return checkUnionOrIntersectionType(node);
-                case 164 /* ParenthesizedType */:
-                    return checkSourceElement(node.type);
-                case 220 /* FunctionDeclaration */:
-                    return checkFunctionDeclaration(node);
-                case 199 /* Block */:
-                case 226 /* ModuleBlock */:
-                    return checkBlock(node);
-                case 200 /* VariableStatement */:
-                    return checkVariableStatement(node);
-                case 202 /* ExpressionStatement */:
-                    return checkExpressionStatement(node);
-                case 203 /* IfStatement */:
-                    return checkIfStatement(node);
-                case 204 /* DoStatement */:
-                    return checkDoStatement(node);
-                case 205 /* WhileStatement */:
-                    return checkWhileStatement(node);
-                case 206 /* ForStatement */:
-                    return checkForStatement(node);
-                case 207 /* ForInStatement */:
-                    return checkForInStatement(node);
-                case 208 /* ForOfStatement */:
-                    return checkForOfStatement(node);
-                case 209 /* ContinueStatement */:
-                case 210 /* BreakStatement */:
-                    return checkBreakOrContinueStatement(node);
-                case 211 /* ReturnStatement */:
-                    return checkReturnStatement(node);
-                case 212 /* WithStatement */:
-                    return checkWithStatement(node);
-                case 213 /* SwitchStatement */:
-                    return checkSwitchStatement(node);
-                case 214 /* LabeledStatement */:
-                    return checkLabeledStatement(node);
-                case 215 /* ThrowStatement */:
-                    return checkThrowStatement(node);
-                case 216 /* TryStatement */:
-                    return checkTryStatement(node);
-                case 218 /* VariableDeclaration */:
-                    return checkVariableDeclaration(node);
-                case 169 /* BindingElement */:
-                    return checkBindingElement(node);
-                case 221 /* ClassDeclaration */:
-                    return checkClassDeclaration(node);
-                case 222 /* InterfaceDeclaration */:
-                    return checkInterfaceDeclaration(node);
-                case 223 /* TypeAliasDeclaration */:
-                    return checkTypeAliasDeclaration(node);
-                case 224 /* EnumDeclaration */:
-                    return checkEnumDeclaration(node);
-                case 225 /* ModuleDeclaration */:
-                    return checkModuleDeclaration(node);
-                case 230 /* ImportDeclaration */:
-                    return checkImportDeclaration(node);
-                case 229 /* ImportEqualsDeclaration */:
-                    return checkImportEqualsDeclaration(node);
-                case 236 /* ExportDeclaration */:
-                    return checkExportDeclaration(node);
-                case 235 /* ExportAssignment */:
-                    return checkExportAssignment(node);
-                case 201 /* EmptyStatement */:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
-                case 217 /* DebuggerStatement */:
-                    checkGrammarStatementInAmbientContext(node);
-                    return;
-                case 239 /* MissingDeclaration */:
-                    return checkMissingDeclaration(node);
-            }
-        }
-        // Function and class expression bodies are checked after all statements in the enclosing body. This is
-        // to ensure constructs like the following are permitted:
-        //     const foo = function () {
-        //        const s = foo();
-        //        return "hello";
-        //     }
-        // Here, performing a full type check of the body of the function expression whilst in the process of
-        // determining the type of foo would cause foo to be given type any because of the recursive reference.
-        // Delaying the type check of the body ensures foo has been assigned a type.
-        function checkNodeDeferred(node) {
-            if (deferredNodes) {
-                deferredNodes.push(node);
-            }
-        }
-        function checkDeferredNodes() {
-            for (var _i = 0, deferredNodes_1 = deferredNodes; _i < deferredNodes_1.length; _i++) {
-                var node = deferredNodes_1[_i];
-                switch (node.kind) {
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
-                        break;
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        checkAccessorDeferred(node);
-                        break;
-                    case 192 /* ClassExpression */:
-                        checkClassExpressionDeferred(node);
-                        break;
-                }
-            }
-        }
-        function checkSourceFile(node) {
-            var start = new Date().getTime();
-            checkSourceFileWorker(node);
-            ts.checkTime += new Date().getTime() - start;
-        }
-        // Fully type check a source file and collect the relevant diagnostics.
-        function checkSourceFileWorker(node) {
-            var links = getNodeLinks(node);
-            if (!(links.flags & 1 /* TypeChecked */)) {
-                // If skipLibCheck is enabled, skip type checking if file is a declaration file.
-                // If skipDefaultLibCheck is enabled, skip type checking if file contains a
-                // '/// <reference no-default-lib="true"/>' directive.
-                if (compilerOptions.skipLibCheck && node.isDeclarationFile || compilerOptions.skipDefaultLibCheck && node.hasNoDefaultLib) {
-                    return;
-                }
-                // Grammar checking
-                checkGrammarSourceFile(node);
-                potentialThisCollisions.length = 0;
-                deferredNodes = [];
-                deferredUnusedIdentifierNodes = produceDiagnostics && noUnusedIdentifiers ? [] : undefined;
-                ts.forEach(node.statements, checkSourceElement);
-                checkDeferredNodes();
-                if (ts.isExternalModule(node)) {
-                    registerForUnusedIdentifiersCheck(node);
-                }
-                if (!node.isDeclarationFile) {
-                    checkUnusedIdentifiers();
-                }
-                deferredNodes = undefined;
-                deferredUnusedIdentifierNodes = undefined;
-                if (ts.isExternalOrCommonJsModule(node)) {
-                    checkExternalModuleExports(node);
-                }
-                if (potentialThisCollisions.length) {
-                    ts.forEach(potentialThisCollisions, checkIfThisIsCapturedInEnclosingScope);
-                    potentialThisCollisions.length = 0;
-                }
-                links.flags |= 1 /* TypeChecked */;
-            }
-        }
-        function getDiagnostics(sourceFile, ct) {
-            try {
-                // Record the cancellation token so it can be checked later on during checkSourceElement.
-                // Do this in a finally block so we can ensure that it gets reset back to nothing after
-                // this call is done.
-                cancellationToken = ct;
-                return getDiagnosticsWorker(sourceFile);
-            }
-            finally {
-                cancellationToken = undefined;
-            }
-        }
-        function getDiagnosticsWorker(sourceFile) {
-            throwIfNonDiagnosticsProducing();
-            if (sourceFile) {
-                checkSourceFile(sourceFile);
-                return diagnostics.getDiagnostics(sourceFile.fileName);
-            }
-            ts.forEach(host.getSourceFiles(), checkSourceFile);
-            return diagnostics.getDiagnostics();
-        }
-        function getGlobalDiagnostics() {
-            throwIfNonDiagnosticsProducing();
-            return diagnostics.getGlobalDiagnostics();
-        }
-        function throwIfNonDiagnosticsProducing() {
-            if (!produceDiagnostics) {
-                throw new Error("Trying to get diagnostics from a type checker that does not produce them.");
-            }
-        }
-        // Language service support
-        function isInsideWithStatementBody(node) {
-            if (node) {
-                while (node.parent) {
-                    if (node.parent.kind === 212 /* WithStatement */ && node.parent.statement === node) {
-                        return true;
-                    }
-                    node = node.parent;
-                }
-            }
-            return false;
-        }
-        function getSymbolsInScope(location, meaning) {
-            var symbols = {};
-            var memberFlags = 0;
-            if (isInsideWithStatementBody(location)) {
-                // We cannot answer semantic questions within a with block, do not proceed any further
-                return [];
-            }
-            populateSymbols();
-            return symbolsToArray(symbols);
-            function populateSymbols() {
-                while (location) {
-                    if (location.locals && !isGlobalSourceFile(location)) {
-                        copySymbols(location.locals, meaning);
-                    }
-                    switch (location.kind) {
-                        case 256 /* SourceFile */:
-                            if (!ts.isExternalOrCommonJsModule(location)) {
-                                break;
-                            }
-                        case 225 /* ModuleDeclaration */:
-                            copySymbols(getSymbolOfNode(location).exports, meaning & 8914931 /* ModuleMember */);
-                            break;
-                        case 224 /* EnumDeclaration */:
-                            copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
-                            break;
-                        case 192 /* ClassExpression */:
-                            var className = location.name;
-                            if (className) {
-                                copySymbol(location.symbol, meaning);
-                            }
-                        // fall through; this fall-through is necessary because we would like to handle
-                        // type parameter inside class expression similar to how we handle it in classDeclaration and interface Declaration
-                        case 221 /* ClassDeclaration */:
-                        case 222 /* InterfaceDeclaration */:
-                            // If we didn't come from static member of class or interface,
-                            // add the type parameters into the symbol table
-                            // (type parameters of classDeclaration/classExpression and interface are in member property of the symbol.
-                            // Note: that the memberFlags come from previous iteration.
-                            if (!(memberFlags & 32 /* Static */)) {
-                                copySymbols(getSymbolOfNode(location).members, meaning & 793056 /* Type */);
-                            }
-                            break;
-                        case 179 /* FunctionExpression */:
-                            var funcName = location.name;
-                            if (funcName) {
-                                copySymbol(location.symbol, meaning);
-                            }
-                            break;
-                    }
-                    if (ts.introducesArgumentsExoticObject(location)) {
-                        copySymbol(argumentsSymbol, meaning);
-                    }
-                    memberFlags = location.flags;
-                    location = location.parent;
-                }
-                copySymbols(globals, meaning);
-            }
-            /**
-             * Copy the given symbol into symbol tables if the symbol has the given meaning
-             * and it doesn't already existed in the symbol table
-             * @param key a key for storing in symbol table; if undefined, use symbol.name
-             * @param symbol the symbol to be added into symbol table
-             * @param meaning meaning of symbol to filter by before adding to symbol table
-             */
-            function copySymbol(symbol, meaning) {
-                if (symbol.flags & meaning) {
-                    var id = symbol.name;
-                    // We will copy all symbol regardless of its reserved name because
-                    // symbolsToArray will check whether the key is a reserved name and
-                    // it will not copy symbol with reserved name to the array
-                    if (!ts.hasProperty(symbols, id)) {
-                        symbols[id] = symbol;
-                    }
-                }
-            }
-            function copySymbols(source, meaning) {
-                if (meaning) {
-                    for (var id in source) {
-                        var symbol = source[id];
-                        copySymbol(symbol, meaning);
-                    }
-                }
-            }
-        }
-        function isTypeDeclarationName(name) {
-            return name.kind === 69 /* Identifier */ &&
-                isTypeDeclaration(name.parent) &&
-                name.parent.name === name;
-        }
-        function isTypeDeclaration(node) {
-            switch (node.kind) {
-                case 141 /* TypeParameter */:
-                case 221 /* ClassDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                case 224 /* EnumDeclaration */:
-                    return true;
-            }
-        }
-        // True if the given identifier is part of a type reference
-        function isTypeReferenceIdentifier(entityName) {
-            var node = entityName;
-            while (node.parent && node.parent.kind === 139 /* QualifiedName */) {
-                node = node.parent;
-            }
-            return node.parent && (node.parent.kind === 155 /* TypeReference */ || node.parent.kind === 267 /* JSDocTypeReference */);
-        }
-        function isHeritageClauseElementIdentifier(entityName) {
-            var node = entityName;
-            while (node.parent && node.parent.kind === 172 /* PropertyAccessExpression */) {
-                node = node.parent;
-            }
-            return node.parent && node.parent.kind === 194 /* ExpressionWithTypeArguments */;
-        }
-        function forEachEnclosingClass(node, callback) {
-            var result;
-            while (true) {
-                node = ts.getContainingClass(node);
-                if (!node)
-                    break;
-                if (result = callback(node))
-                    break;
-            }
-            return result;
-        }
-        function isNodeWithinClass(node, classDeclaration) {
-            return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
-        }
-        function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 139 /* QualifiedName */) {
-                nodeOnRightSide = nodeOnRightSide.parent;
-            }
-            if (nodeOnRightSide.parent.kind === 229 /* ImportEqualsDeclaration */) {
-                return nodeOnRightSide.parent.moduleReference === nodeOnRightSide && nodeOnRightSide.parent;
-            }
-            if (nodeOnRightSide.parent.kind === 235 /* ExportAssignment */) {
-                return nodeOnRightSide.parent.expression === nodeOnRightSide && nodeOnRightSide.parent;
-            }
-            return undefined;
-        }
-        function isInRightSideOfImportOrExportAssignment(node) {
-            return getLeftSideOfImportEqualsOrExportAssignment(node) !== undefined;
-        }
-        function getSymbolOfEntityNameOrPropertyAccessExpression(entityName) {
-            if (ts.isDeclarationName(entityName)) {
-                return getSymbolOfNode(entityName.parent);
-            }
-            if (ts.isInJavaScriptFile(entityName) && entityName.parent.kind === 172 /* PropertyAccessExpression */) {
-                var specialPropertyAssignmentKind = ts.getSpecialPropertyAssignmentKind(entityName.parent.parent);
-                switch (specialPropertyAssignmentKind) {
-                    case 1 /* ExportsProperty */:
-                    case 3 /* PrototypeProperty */:
-                        return getSymbolOfNode(entityName.parent);
-                    case 4 /* ThisProperty */:
-                    case 2 /* ModuleExports */:
-                        return getSymbolOfNode(entityName.parent.parent);
-                    default:
-                }
-            }
-            if (entityName.parent.kind === 235 /* ExportAssignment */) {
-                return resolveEntityName(entityName, 
-                /*all meanings*/ 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */);
-            }
-            if (entityName.kind !== 172 /* PropertyAccessExpression */) {
-                if (isInRightSideOfImportOrExportAssignment(entityName)) {
-                    // Since we already checked for ExportAssignment, this really could only be an Import
-                    var importEqualsDeclaration = ts.getAncestor(entityName, 229 /* ImportEqualsDeclaration */);
-                    ts.Debug.assert(importEqualsDeclaration !== undefined);
-                    return getSymbolOfPartOfRightHandSideOfImportEquals(entityName, importEqualsDeclaration, /*dontResolveAlias*/ true);
-                }
-            }
-            if (ts.isRightSideOfQualifiedNameOrPropertyAccess(entityName)) {
-                entityName = entityName.parent;
-            }
-            if (isHeritageClauseElementIdentifier(entityName)) {
-                var meaning = 0 /* None */;
-                // In an interface or class, we're definitely interested in a type.
-                if (entityName.parent.kind === 194 /* ExpressionWithTypeArguments */) {
-                    meaning = 793056 /* Type */;
-                    // In a class 'extends' clause we are also looking for a value.
-                    if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent)) {
-                        meaning |= 107455 /* Value */;
-                    }
-                }
-                else {
-                    meaning = 1536 /* Namespace */;
-                }
-                meaning |= 8388608 /* Alias */;
-                return resolveEntityName(entityName, meaning);
-            }
-            else if (ts.isExpression(entityName)) {
-                if (ts.nodeIsMissing(entityName)) {
-                    // Missing entity name.
-                    return undefined;
-                }
-                if (entityName.kind === 69 /* Identifier */) {
-                    if (ts.isJSXTagName(entityName) && isJsxIntrinsicIdentifier(entityName)) {
-                        return getIntrinsicTagSymbol(entityName.parent);
-                    }
-                    return resolveEntityName(entityName, 107455 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
-                }
-                else if (entityName.kind === 172 /* PropertyAccessExpression */) {
-                    var symbol = getNodeLinks(entityName).resolvedSymbol;
-                    if (!symbol) {
-                        checkPropertyAccessExpression(entityName);
-                    }
-                    return getNodeLinks(entityName).resolvedSymbol;
-                }
-                else if (entityName.kind === 139 /* QualifiedName */) {
-                    var symbol = getNodeLinks(entityName).resolvedSymbol;
-                    if (!symbol) {
-                        checkQualifiedName(entityName);
-                    }
-                    return getNodeLinks(entityName).resolvedSymbol;
-                }
-            }
-            else if (isTypeReferenceIdentifier(entityName)) {
-                var meaning = (entityName.parent.kind === 155 /* TypeReference */ || entityName.parent.kind === 267 /* JSDocTypeReference */) ? 793056 /* Type */ : 1536 /* Namespace */;
-                return resolveEntityName(entityName, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
-            }
-            else if (entityName.parent.kind === 246 /* JsxAttribute */) {
-                return getJsxAttributePropertySymbol(entityName.parent);
-            }
-            if (entityName.parent.kind === 154 /* TypePredicate */) {
-                return resolveEntityName(entityName, /*meaning*/ 1 /* FunctionScopedVariable */);
-            }
-            // Do we want to return undefined here?
-            return undefined;
-        }
-        function getSymbolAtLocation(node) {
-            if (node.kind === 256 /* SourceFile */) {
-                return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
-            }
-            if (isInsideWithStatementBody(node)) {
-                // We cannot answer semantic questions within a with block, do not proceed any further
-                return undefined;
-            }
-            if (ts.isDeclarationName(node)) {
-                // This is a declaration, call getSymbolOfNode
-                return getSymbolOfNode(node.parent);
-            }
-            else if (ts.isLiteralComputedPropertyDeclarationName(node)) {
-                return getSymbolOfNode(node.parent.parent);
-            }
-            if (node.kind === 69 /* Identifier */) {
-                if (isInRightSideOfImportOrExportAssignment(node)) {
-                    return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                }
-                else if (node.parent.kind === 169 /* BindingElement */ &&
-                    node.parent.parent.kind === 167 /* ObjectBindingPattern */ &&
-                    node === node.parent.propertyName) {
-                    var typeOfPattern = getTypeOfNode(node.parent.parent);
-                    var propertyDeclaration = typeOfPattern && getPropertyOfType(typeOfPattern, node.text);
-                    if (propertyDeclaration) {
-                        return propertyDeclaration;
-                    }
-                }
-            }
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                case 172 /* PropertyAccessExpression */:
-                case 139 /* QualifiedName */:
-                    return getSymbolOfEntityNameOrPropertyAccessExpression(node);
-                case 97 /* ThisKeyword */:
-                    var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
-                    if (ts.isFunctionLike(container)) {
-                        var sig = getSignatureFromDeclaration(container);
-                        if (sig.thisParameter) {
-                            return sig.thisParameter;
-                        }
-                    }
-                // fallthrough
-                case 95 /* SuperKeyword */:
-                    var type = ts.isExpression(node) ? checkExpression(node) : getTypeFromTypeNode(node);
-                    return type.symbol;
-                case 165 /* ThisType */:
-                    return getTypeFromTypeNode(node).symbol;
-                case 121 /* ConstructorKeyword */:
-                    // constructor keyword for an overload, should take us to the definition if it exist
-                    var constructorDeclaration = node.parent;
-                    if (constructorDeclaration && constructorDeclaration.kind === 148 /* Constructor */) {
-                        return constructorDeclaration.parent.symbol;
-                    }
-                    return undefined;
-                case 9 /* StringLiteral */:
-                    // External module name in an import declaration
-                    if ((ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) &&
-                        ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node) ||
-                        ((node.parent.kind === 230 /* ImportDeclaration */ || node.parent.kind === 236 /* ExportDeclaration */) &&
-                            node.parent.moduleSpecifier === node)) {
-                        return resolveExternalModuleName(node, node);
-                    }
-                // Fall through
-                case 8 /* NumericLiteral */:
-                    // index access
-                    if (node.parent.kind === 173 /* ElementAccessExpression */ && node.parent.argumentExpression === node) {
-                        var objectType = checkExpression(node.parent.expression);
-                        if (objectType === unknownType)
-                            return undefined;
-                        var apparentType = getApparentType(objectType);
-                        if (apparentType === unknownType)
-                            return undefined;
-                        return getPropertyOfType(apparentType, node.text);
-                    }
-                    break;
-            }
-            return undefined;
-        }
-        function getShorthandAssignmentValueSymbol(location) {
-            // The function returns a value symbol of an identifier in the short-hand property assignment.
-            // This is necessary as an identifier in short-hand property assignment can contains two meaning:
-            // property name and property value.
-            if (location && location.kind === 254 /* ShorthandPropertyAssignment */) {
-                return resolveEntityName(location.name, 107455 /* Value */ | 8388608 /* Alias */);
-            }
-            return undefined;
-        }
-        /** Returns the target of an export specifier without following aliases */
-        function getExportSpecifierLocalTargetSymbol(node) {
-            return node.parent.parent.moduleSpecifier ?
-                getExternalModuleMember(node.parent.parent, node) :
-                resolveEntityName(node.propertyName || node.name, 107455 /* Value */ | 793056 /* Type */ | 1536 /* Namespace */ | 8388608 /* Alias */);
-        }
-        function getTypeOfNode(node) {
-            if (isInsideWithStatementBody(node)) {
-                // We cannot answer semantic questions within a with block, do not proceed any further
-                return unknownType;
-            }
-            if (ts.isTypeNode(node)) {
-                return getTypeFromTypeNode(node);
-            }
-            if (ts.isExpression(node)) {
-                return getTypeOfExpression(node);
-            }
-            if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(node)) {
-                // A SyntaxKind.ExpressionWithTypeArguments is considered a type node, except when it occurs in the
-                // extends clause of a class. We handle that case here.
-                return getBaseTypes(getDeclaredTypeOfSymbol(getSymbolOfNode(node.parent.parent)))[0];
-            }
-            if (isTypeDeclaration(node)) {
-                // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
-                var symbol = getSymbolOfNode(node);
-                return getDeclaredTypeOfSymbol(symbol);
-            }
-            if (isTypeDeclarationName(node)) {
-                var symbol = getSymbolAtLocation(node);
-                return symbol && getDeclaredTypeOfSymbol(symbol);
-            }
-            if (ts.isDeclaration(node)) {
-                // In this case, we call getSymbolOfNode instead of getSymbolAtLocation because it is a declaration
-                var symbol = getSymbolOfNode(node);
-                return getTypeOfSymbol(symbol);
-            }
-            if (ts.isDeclarationName(node)) {
-                var symbol = getSymbolAtLocation(node);
-                return symbol && getTypeOfSymbol(symbol);
-            }
-            if (ts.isBindingPattern(node)) {
-                return getTypeForVariableLikeDeclaration(node.parent, /*includeOptionality*/ true);
-            }
-            if (isInRightSideOfImportOrExportAssignment(node)) {
-                var symbol = getSymbolAtLocation(node);
-                var declaredType = symbol && getDeclaredTypeOfSymbol(symbol);
-                return declaredType !== unknownType ? declaredType : getTypeOfSymbol(symbol);
-            }
-            return unknownType;
-        }
-        // Gets the type of object literal or array literal of destructuring assignment.
-        // { a } from
-        //     for ( { a } of elems) {
-        //     }
-        // [ a ] from
-        //     [a] = [ some array ...]
-        function getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr) {
-            ts.Debug.assert(expr.kind === 171 /* ObjectLiteralExpression */ || expr.kind === 170 /* ArrayLiteralExpression */);
-            // If this is from "for of"
-            //     for ( { a } of elems) {
-            //     }
-            if (expr.parent.kind === 208 /* ForOfStatement */) {
-                var iteratedType = checkRightHandSideOfForOf(expr.parent.expression);
-                return checkDestructuringAssignment(expr, iteratedType || unknownType);
-            }
-            // If this is from "for" initializer
-            //     for ({a } = elems[0];.....) { }
-            if (expr.parent.kind === 187 /* BinaryExpression */) {
-                var iteratedType = checkExpression(expr.parent.right);
-                return checkDestructuringAssignment(expr, iteratedType || unknownType);
-            }
-            // If this is from nested object binding pattern
-            //     for ({ skills: { primary, secondary } } = multiRobot, i = 0; i < 1; i++) {
-            if (expr.parent.kind === 253 /* PropertyAssignment */) {
-                var typeOfParentObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent.parent);
-                return checkObjectLiteralDestructuringPropertyAssignment(typeOfParentObjectLiteral || unknownType, expr.parent);
-            }
-            // Array literal assignment - array destructuring pattern
-            ts.Debug.assert(expr.parent.kind === 170 /* ArrayLiteralExpression */);
-            //    [{ property1: p1, property2 }] = elems;
-            var typeOfArrayLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(expr.parent);
-            var elementType = checkIteratedTypeOrElementType(typeOfArrayLiteral || unknownType, expr.parent, /*allowStringInput*/ false) || unknownType;
-            return checkArrayLiteralDestructuringElementAssignment(expr.parent, typeOfArrayLiteral, ts.indexOf(expr.parent.elements, expr), elementType || unknownType);
-        }
-        // Gets the property symbol corresponding to the property in destructuring assignment
-        // 'property1' from
-        //     for ( { property1: a } of elems) {
-        //     }
-        // 'property1' at location 'a' from:
-        //     [a] = [ property1, property2 ]
-        function getPropertySymbolOfDestructuringAssignment(location) {
-            // Get the type of the object or array literal and then look for property of given name in the type
-            var typeOfObjectLiteral = getTypeOfArrayLiteralOrObjectLiteralDestructuringAssignment(location.parent.parent);
-            return typeOfObjectLiteral && getPropertyOfType(typeOfObjectLiteral, location.text);
-        }
-        function getTypeOfExpression(expr) {
-            if (ts.isRightSideOfQualifiedNameOrPropertyAccess(expr)) {
-                expr = expr.parent;
-            }
-            return checkExpression(expr);
-        }
-        /**
-          * Gets either the static or instance type of a class element, based on
-          * whether the element is declared as "static".
-          */
-        function getParentTypeOfClassElement(node) {
-            var classSymbol = getSymbolOfNode(node.parent);
-            return node.flags & 32 /* Static */
-                ? getTypeOfSymbol(classSymbol)
-                : getDeclaredTypeOfSymbol(classSymbol);
-        }
-        // Return the list of properties of the given type, augmented with properties from Function
-        // if the type has call or construct signatures
-        function getAugmentedPropertiesOfType(type) {
-            type = getApparentType(type);
-            var propsByName = createSymbolTable(getPropertiesOfType(type));
-            if (getSignaturesOfType(type, 0 /* Call */).length || getSignaturesOfType(type, 1 /* Construct */).length) {
-                ts.forEach(getPropertiesOfType(globalFunctionType), function (p) {
-                    if (!ts.hasProperty(propsByName, p.name)) {
-                        propsByName[p.name] = p;
-                    }
-                });
-            }
-            return getNamedMembers(propsByName);
-        }
-        function getRootSymbols(symbol) {
-            if (symbol.flags & 268435456 /* SyntheticProperty */) {
-                var symbols_3 = [];
-                var name_20 = symbol.name;
-                ts.forEach(getSymbolLinks(symbol).containingType.types, function (t) {
-                    var symbol = getPropertyOfType(t, name_20);
-                    if (symbol) {
-                        symbols_3.push(symbol);
-                    }
-                });
-                return symbols_3;
-            }
-            else if (symbol.flags & 67108864 /* Transient */) {
-                var target = void 0;
-                var next = symbol;
-                while (next = getSymbolLinks(next).target) {
-                    target = next;
-                }
-                if (target) {
-                    return [target];
-                }
-            }
-            return [symbol];
-        }
-        // Emitter support
-        function isArgumentsLocalBinding(node) {
-            return getReferencedValueSymbol(node) === argumentsSymbol;
-        }
-        function moduleExportsSomeValue(moduleReferenceExpression) {
-            var moduleSymbol = resolveExternalModuleName(moduleReferenceExpression.parent, moduleReferenceExpression);
-            if (!moduleSymbol) {
-                // module not found - be conservative
-                return true;
-            }
-            var hasExportAssignment = hasExportAssignmentSymbol(moduleSymbol);
-            // if module has export assignment then 'resolveExternalModuleSymbol' will return resolved symbol for export assignment
-            // otherwise it will return moduleSymbol itself
-            moduleSymbol = resolveExternalModuleSymbol(moduleSymbol);
-            var symbolLinks = getSymbolLinks(moduleSymbol);
-            if (symbolLinks.exportsSomeValue === undefined) {
-                // for export assignments - check if resolved symbol for RHS is itself a value
-                // otherwise - check if at least one export is value
-                symbolLinks.exportsSomeValue = hasExportAssignment
-                    ? !!(moduleSymbol.flags & 107455 /* Value */)
-                    : ts.forEachValue(getExportsOfModule(moduleSymbol), isValue);
-            }
-            return symbolLinks.exportsSomeValue;
-            function isValue(s) {
-                s = resolveSymbol(s);
-                return s && !!(s.flags & 107455 /* Value */);
-            }
-        }
-        // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
-        // node of the exported entity's container. Otherwise, return undefined.
-        function getReferencedExportContainer(node) {
-            var symbol = getReferencedValueSymbol(node);
-            if (symbol) {
-                if (symbol.flags & 1048576 /* ExportValue */) {
-                    // If we reference an exported entity within the same module declaration, then whether
-                    // we prefix depends on the kind of entity. SymbolFlags.ExportHasLocal encompasses all the
-                    // kinds that we do NOT prefix.
-                    var exportSymbol = getMergedSymbol(symbol.exportSymbol);
-                    if (exportSymbol.flags & 944 /* ExportHasLocal */) {
-                        return undefined;
-                    }
-                    symbol = exportSymbol;
-                }
-                var parentSymbol = getParentOfSymbol(symbol);
-                if (parentSymbol) {
-                    if (parentSymbol.flags & 512 /* ValueModule */ && parentSymbol.valueDeclaration.kind === 256 /* SourceFile */) {
-                        // If `node` accesses an export and that export isn't in the same file, then symbol is a namespace export, so return undefined.
-                        if (parentSymbol.valueDeclaration === ts.getSourceFileOfNode(node)) {
-                            return parentSymbol.valueDeclaration;
-                        }
-                    }
-                    for (var n = node.parent; n; n = n.parent) {
-                        if ((n.kind === 225 /* ModuleDeclaration */ || n.kind === 224 /* EnumDeclaration */) && getSymbolOfNode(n) === parentSymbol) {
-                            return n;
-                        }
-                    }
-                }
-            }
-        }
-        // When resolved as an expression identifier, if the given node references an import, return the declaration of
-        // that import. Otherwise, return undefined.
-        function getReferencedImportDeclaration(node) {
-            var symbol = getReferencedValueSymbol(node);
-            return symbol && symbol.flags & 8388608 /* Alias */ ? getDeclarationOfAliasSymbol(symbol) : undefined;
-        }
-        function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */) {
-                var links = getSymbolLinks(symbol);
-                if (links.isDeclarationWithCollidingName === undefined) {
-                    var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-                    if (ts.isStatementWithLocals(container)) {
-                        var nodeLinks_1 = getNodeLinks(symbol.valueDeclaration);
-                        if (!!resolveName(container.parent, symbol.name, 107455 /* Value */, /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined)) {
-                            // redeclaration - always should be renamed
-                            links.isDeclarationWithCollidingName = true;
-                        }
-                        else if (nodeLinks_1.flags & 131072 /* CapturedBlockScopedBinding */) {
-                            // binding is captured in the function
-                            // should be renamed if:
-                            // - binding is not top level - top level bindings never collide with anything
-                            // AND
-                            //   - binding is not declared in loop, should be renamed to avoid name reuse across siblings
-                            //     let a, b
-                            //     { let x = 1; a = () => x;  }
-                            //     { let x = 100; b = () => x; }
-                            //     console.log(a()); // should print '1'
-                            //     console.log(b()); // should print '100'
-                            //     OR
-                            //   - binding is declared inside loop but not in inside initializer of iteration statement or directly inside loop body
-                            //     * variables from initializer are passed to rewritten loop body as parameters so they are not captured directly
-                            //     * variables that are declared immediately in loop body will become top level variable after loop is rewritten and thus
-                            //       they will not collide with anything
-                            var isDeclaredInLoop = nodeLinks_1.flags & 262144 /* BlockScopedBindingInLoop */;
-                            var inLoopInitializer = ts.isIterationStatement(container, /*lookInLabeledStatements*/ false);
-                            var inLoopBodyBlock = container.kind === 199 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
-                            links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
-                        }
-                        else {
-                            links.isDeclarationWithCollidingName = false;
-                        }
-                    }
-                }
-                return links.isDeclarationWithCollidingName;
-            }
-            return false;
-        }
-        // When resolved as an expression identifier, if the given node references a nested block scoped entity with
-        // a name that either hides an existing name or might hide it when compiled downlevel,
-        // return the declaration of that entity. Otherwise, return undefined.
-        function getReferencedDeclarationWithCollidingName(node) {
-            var symbol = getReferencedValueSymbol(node);
-            return symbol && isSymbolOfDeclarationWithCollidingName(symbol) ? symbol.valueDeclaration : undefined;
-        }
-        // Return true if the given node is a declaration of a nested block scoped entity with a name that either hides an
-        // existing name or might hide a name when compiled downlevel
-        function isDeclarationWithCollidingName(node) {
-            return isSymbolOfDeclarationWithCollidingName(getSymbolOfNode(node));
-        }
-        function isValueAliasDeclaration(node) {
-            switch (node.kind) {
-                case 229 /* ImportEqualsDeclaration */:
-                case 231 /* ImportClause */:
-                case 232 /* NamespaceImport */:
-                case 234 /* ImportSpecifier */:
-                case 238 /* ExportSpecifier */:
-                    return isAliasResolvedToValue(getSymbolOfNode(node));
-                case 236 /* ExportDeclaration */:
-                    var exportClause = node.exportClause;
-                    return exportClause && ts.forEach(exportClause.elements, isValueAliasDeclaration);
-                case 235 /* ExportAssignment */:
-                    return node.expression && node.expression.kind === 69 /* Identifier */ ? isAliasResolvedToValue(getSymbolOfNode(node)) : true;
-            }
-            return false;
-        }
-        function isTopLevelValueImportEqualsWithEntityName(node) {
-            if (node.parent.kind !== 256 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
-                // parent is not source file or it is not reference to internal module
-                return false;
-            }
-            var isValue = isAliasResolvedToValue(getSymbolOfNode(node));
-            return isValue && node.moduleReference && !ts.nodeIsMissing(node.moduleReference);
-        }
-        function isAliasResolvedToValue(symbol) {
-            var target = resolveAlias(symbol);
-            if (target === unknownSymbol) {
-                return true;
-            }
-            // const enums and modules that contain only const enums are not considered values from the emit perspective
-            // unless 'preserveConstEnums' option is set to true
-            return target.flags & 107455 /* Value */ &&
-                (compilerOptions.preserveConstEnums || !isConstEnumOrConstEnumOnlyModule(target));
-        }
-        function isConstEnumOrConstEnumOnlyModule(s) {
-            return isConstEnumSymbol(s) || s.constEnumOnlyModule;
-        }
-        function isReferencedAliasDeclaration(node, checkChildren) {
-            if (ts.isAliasSymbolDeclaration(node)) {
-                var symbol = getSymbolOfNode(node);
-                if (getSymbolLinks(symbol).referenced) {
-                    return true;
-                }
-            }
-            if (checkChildren) {
-                return ts.forEachChild(node, function (node) { return isReferencedAliasDeclaration(node, checkChildren); });
-            }
-            return false;
-        }
-        function isImplementationOfOverload(node) {
-            if (ts.nodeIsPresent(node.body)) {
-                var symbol = getSymbolOfNode(node);
-                var signaturesOfSymbol = getSignaturesOfSymbol(symbol);
-                // If this function body corresponds to function with multiple signature, it is implementation of overload
-                // e.g.: function foo(a: string): string;
-                //       function foo(a: number): number;
-                //       function foo(a: any) { // This is implementation of the overloads
-                //           return a;
-                //       }
-                return signaturesOfSymbol.length > 1 ||
-                    // If there is single signature for the symbol, it is overload if that signature isn't coming from the node
-                    // e.g.: function foo(a: string): string;
-                    //       function foo(a: any) { // This is implementation of the overloads
-                    //           return a;
-                    //       }
-                    (signaturesOfSymbol.length === 1 && signaturesOfSymbol[0].declaration !== node);
-            }
-            return false;
-        }
-        function getNodeCheckFlags(node) {
-            return getNodeLinks(node).flags;
-        }
-        function getEnumMemberValue(node) {
-            computeEnumMemberValues(node.parent);
-            return getNodeLinks(node).enumMemberValue;
-        }
-        function getConstantValue(node) {
-            if (node.kind === 255 /* EnumMember */) {
-                return getEnumMemberValue(node);
-            }
-            var symbol = getNodeLinks(node).resolvedSymbol;
-            if (symbol && (symbol.flags & 8 /* EnumMember */)) {
-                // inline property\index accesses only for const enums
-                if (ts.isConstEnumDeclaration(symbol.valueDeclaration.parent)) {
-                    return getEnumMemberValue(symbol.valueDeclaration);
-                }
-            }
-            return undefined;
-        }
-        function isFunctionType(type) {
-            return type.flags & 80896 /* ObjectType */ && getSignaturesOfType(type, 0 /* Call */).length > 0;
-        }
-        function getTypeReferenceSerializationKind(typeName) {
-            // Resolve the symbol as a value to ensure the type can be reached at runtime during emit.
-            var valueSymbol = resolveEntityName(typeName, 107455 /* Value */, /*ignoreErrors*/ true);
-            var constructorType = valueSymbol ? getTypeOfSymbol(valueSymbol) : undefined;
-            if (constructorType && isConstructorType(constructorType)) {
-                return ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue;
-            }
-            // Resolve the symbol as a type so that we can provide a more useful hint for the type serializer.
-            var typeSymbol = resolveEntityName(typeName, 793056 /* Type */, /*ignoreErrors*/ true);
-            // We might not be able to resolve type symbol so use unknown type in that case (eg error case)
-            if (!typeSymbol) {
-                return ts.TypeReferenceSerializationKind.ObjectType;
-            }
-            var type = getDeclaredTypeOfSymbol(typeSymbol);
-            if (type === unknownType) {
-                return ts.TypeReferenceSerializationKind.Unknown;
-            }
-            else if (type.flags & 1 /* Any */) {
-                return ts.TypeReferenceSerializationKind.ObjectType;
-            }
-            else if (isTypeOfKind(type, 16 /* Void */)) {
-                return ts.TypeReferenceSerializationKind.VoidType;
-            }
-            else if (isTypeOfKind(type, 8 /* Boolean */)) {
-                return ts.TypeReferenceSerializationKind.BooleanType;
-            }
-            else if (isTypeOfKind(type, 132 /* NumberLike */)) {
-                return ts.TypeReferenceSerializationKind.NumberLikeType;
-            }
-            else if (isTypeOfKind(type, 258 /* StringLike */)) {
-                return ts.TypeReferenceSerializationKind.StringLikeType;
-            }
-            else if (isTypeOfKind(type, 8192 /* Tuple */)) {
-                return ts.TypeReferenceSerializationKind.ArrayLikeType;
-            }
-            else if (isTypeOfKind(type, 16777216 /* ESSymbol */)) {
-                return ts.TypeReferenceSerializationKind.ESSymbolType;
-            }
-            else if (isFunctionType(type)) {
-                return ts.TypeReferenceSerializationKind.TypeWithCallSignature;
-            }
-            else if (isArrayType(type)) {
-                return ts.TypeReferenceSerializationKind.ArrayLikeType;
-            }
-            else {
-                return ts.TypeReferenceSerializationKind.ObjectType;
-            }
-        }
-        function writeTypeOfDeclaration(declaration, enclosingDeclaration, flags, writer) {
-            // Get type of the symbol if this is the valid symbol otherwise get type at location
-            var symbol = getSymbolOfNode(declaration);
-            var type = symbol && !(symbol.flags & (2048 /* TypeLiteral */ | 131072 /* Signature */))
-                ? getTypeOfSymbol(symbol)
-                : unknownType;
-            getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
-        }
-        function writeReturnTypeOfSignatureDeclaration(signatureDeclaration, enclosingDeclaration, flags, writer) {
-            var signature = getSignatureFromDeclaration(signatureDeclaration);
-            getSymbolDisplayBuilder().buildTypeDisplay(getReturnTypeOfSignature(signature), writer, enclosingDeclaration, flags);
-        }
-        function writeTypeOfExpression(expr, enclosingDeclaration, flags, writer) {
-            var type = getWidenedType(getTypeOfExpression(expr));
-            getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
-        }
-        function writeBaseConstructorTypeOfClass(node, enclosingDeclaration, flags, writer) {
-            var classType = getDeclaredTypeOfSymbol(getSymbolOfNode(node));
-            resolveBaseTypesOfClass(classType);
-            var baseType = classType.resolvedBaseTypes.length ? classType.resolvedBaseTypes[0] : unknownType;
-            getSymbolDisplayBuilder().buildTypeDisplay(baseType, writer, enclosingDeclaration, flags);
-        }
-        function hasGlobalName(name) {
-            return ts.hasProperty(globals, name);
-        }
-        function getReferencedValueSymbol(reference) {
-            return getNodeLinks(reference).resolvedSymbol ||
-                resolveName(reference, reference.text, 107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */, 
-                /*nodeNotFoundMessage*/ undefined, /*nameArg*/ undefined);
-        }
-        function getReferencedValueDeclaration(reference) {
-            ts.Debug.assert(!ts.nodeIsSynthesized(reference));
-            var symbol = getReferencedValueSymbol(reference);
-            return symbol && getExportSymbolOfValueSymbolIfExported(symbol).valueDeclaration;
-        }
-        function createResolver() {
-            // this variable and functions that use it are deliberately moved here from the outer scope
-            // to avoid scope pollution
-            var resolvedTypeReferenceDirectives = host.getResolvedTypeReferenceDirectives();
-            var fileToDirective;
-            if (resolvedTypeReferenceDirectives) {
-                // populate reverse mapping: file path -> type reference directive that was resolved to this file
-                fileToDirective = ts.createFileMap();
-                for (var key in resolvedTypeReferenceDirectives) {
-                    if (!ts.hasProperty(resolvedTypeReferenceDirectives, key)) {
-                        continue;
-                    }
-                    var resolvedDirective = resolvedTypeReferenceDirectives[key];
-                    if (!resolvedDirective) {
-                        continue;
-                    }
-                    var file = host.getSourceFile(resolvedDirective.resolvedFileName);
-                    fileToDirective.set(file.path, key);
-                }
-            }
-            return {
-                getReferencedExportContainer: getReferencedExportContainer,
-                getReferencedImportDeclaration: getReferencedImportDeclaration,
-                getReferencedDeclarationWithCollidingName: getReferencedDeclarationWithCollidingName,
-                isDeclarationWithCollidingName: isDeclarationWithCollidingName,
-                isValueAliasDeclaration: isValueAliasDeclaration,
-                hasGlobalName: hasGlobalName,
-                isReferencedAliasDeclaration: isReferencedAliasDeclaration,
-                getNodeCheckFlags: getNodeCheckFlags,
-                isTopLevelValueImportEqualsWithEntityName: isTopLevelValueImportEqualsWithEntityName,
-                isDeclarationVisible: isDeclarationVisible,
-                isImplementationOfOverload: isImplementationOfOverload,
-                writeTypeOfDeclaration: writeTypeOfDeclaration,
-                writeReturnTypeOfSignatureDeclaration: writeReturnTypeOfSignatureDeclaration,
-                writeTypeOfExpression: writeTypeOfExpression,
-                writeBaseConstructorTypeOfClass: writeBaseConstructorTypeOfClass,
-                isSymbolAccessible: isSymbolAccessible,
-                isEntityNameVisible: isEntityNameVisible,
-                getConstantValue: getConstantValue,
-                collectLinkedAliases: collectLinkedAliases,
-                getReferencedValueDeclaration: getReferencedValueDeclaration,
-                getTypeReferenceSerializationKind: getTypeReferenceSerializationKind,
-                isOptionalParameter: isOptionalParameter,
-                moduleExportsSomeValue: moduleExportsSomeValue,
-                isArgumentsLocalBinding: isArgumentsLocalBinding,
-                getExternalModuleFileFromDeclaration: getExternalModuleFileFromDeclaration,
-                getTypeReferenceDirectivesForEntityName: getTypeReferenceDirectivesForEntityName,
-                getTypeReferenceDirectivesForSymbol: getTypeReferenceDirectivesForSymbol
-            };
-            // defined here to avoid outer scope pollution
-            function getTypeReferenceDirectivesForEntityName(node) {
-                // program does not have any files with type reference directives - bail out
-                if (!fileToDirective) {
-                    return undefined;
-                }
-                // property access can only be used as values
-                // qualified names can only be used as types\namespaces
-                // identifiers are treated as values only if they appear in type queries
-                var meaning = (node.kind === 172 /* PropertyAccessExpression */) || (node.kind === 69 /* Identifier */ && isInTypeQuery(node))
-                    ? 107455 /* Value */ | 1048576 /* ExportValue */
-                    : 793056 /* Type */ | 1536 /* Namespace */;
-                var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
-                return symbol && symbol !== unknownSymbol ? getTypeReferenceDirectivesForSymbol(symbol, meaning) : undefined;
-            }
-            // defined here to avoid outer scope pollution
-            function getTypeReferenceDirectivesForSymbol(symbol, meaning) {
-                // program does not have any files with type reference directives - bail out
-                if (!fileToDirective) {
-                    return undefined;
-                }
-                if (!isSymbolFromTypeDeclarationFile(symbol)) {
-                    return undefined;
-                }
-                // check what declarations in the symbol can contribute to the target meaning
-                var typeReferenceDirectives;
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    // check meaning of the local symbol to see if declaration needs to be analyzed further
-                    if (decl.symbol && decl.symbol.flags & meaning) {
-                        var file = ts.getSourceFileOfNode(decl);
-                        var typeReferenceDirective = fileToDirective.get(file.path);
-                        if (typeReferenceDirective) {
-                            (typeReferenceDirectives || (typeReferenceDirectives = [])).push(typeReferenceDirective);
-                        }
-                    }
-                }
-                return typeReferenceDirectives;
-            }
-            function isSymbolFromTypeDeclarationFile(symbol) {
-                // bail out if symbol does not have associated declarations (i.e. this is transient symbol created for property in binding pattern)
-                if (!symbol.declarations) {
-                    return false;
-                }
-                // walk the parent chain for symbols to make sure that top level parent symbol is in the global scope
-                // external modules cannot define or contribute to type declaration files
-                var current = symbol;
-                while (true) {
-                    var parent_12 = getParentOfSymbol(current);
-                    if (parent_12) {
-                        current = parent_12;
-                    }
-                    else {
-                        break;
-                    }
-                }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 256 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
-                    return false;
-                }
-                // check that at least one declaration of top level symbol originates from type declaration file
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    var file = ts.getSourceFileOfNode(decl);
-                    if (fileToDirective.contains(file.path)) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-        }
-        function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = ts.getExternalModuleName(declaration);
-            var moduleSymbol = resolveExternalModuleNameWorker(specifier, specifier, /*moduleNotFoundError*/ undefined);
-            if (!moduleSymbol) {
-                return undefined;
-            }
-            return ts.getDeclarationOfKind(moduleSymbol, 256 /* SourceFile */);
-        }
-        function initializeTypeChecker() {
-            // Bind all source files and propagate errors
-            ts.forEach(host.getSourceFiles(), function (file) {
-                ts.bindSourceFile(file, compilerOptions);
-            });
-            var augmentations;
-            // Initialize global symbol table
-            ts.forEach(host.getSourceFiles(), function (file) {
-                if (!ts.isExternalOrCommonJsModule(file)) {
-                    mergeSymbolTable(globals, file.locals);
-                }
-                if (file.patternAmbientModules && file.patternAmbientModules.length) {
-                    patternAmbientModules = ts.concatenate(patternAmbientModules, file.patternAmbientModules);
-                }
-                if (file.moduleAugmentations.length) {
-                    (augmentations || (augmentations = [])).push(file.moduleAugmentations);
-                }
-                if (file.symbol && file.symbol.globalExports) {
-                    mergeSymbolTable(globals, file.symbol.globalExports);
-                }
-            });
-            if (augmentations) {
-                // merge module augmentations.
-                // this needs to be done after global symbol table is initialized to make sure that all ambient modules are indexed
-                for (var _i = 0, augmentations_1 = augmentations; _i < augmentations_1.length; _i++) {
-                    var list = augmentations_1[_i];
-                    for (var _a = 0, list_2 = list; _a < list_2.length; _a++) {
-                        var augmentation = list_2[_a];
-                        mergeModuleAugmentation(augmentation);
-                    }
-                }
-            }
-            // Setup global builtins
-            addToSymbolTable(globals, builtinGlobals, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0);
-            getSymbolLinks(undefinedSymbol).type = undefinedWideningType;
-            getSymbolLinks(argumentsSymbol).type = getGlobalType("IArguments");
-            getSymbolLinks(unknownSymbol).type = unknownType;
-            // Initialize special types
-            globalArrayType = getGlobalType("Array", /*arity*/ 1);
-            globalObjectType = getGlobalType("Object");
-            globalFunctionType = getGlobalType("Function");
-            globalStringType = getGlobalType("String");
-            globalNumberType = getGlobalType("Number");
-            globalBooleanType = getGlobalType("Boolean");
-            globalRegExpType = getGlobalType("RegExp");
-            jsxElementType = getExportedTypeFromNamespace("JSX", JsxNames.Element);
-            getGlobalClassDecoratorType = ts.memoize(function () { return getGlobalType("ClassDecorator"); });
-            getGlobalPropertyDecoratorType = ts.memoize(function () { return getGlobalType("PropertyDecorator"); });
-            getGlobalMethodDecoratorType = ts.memoize(function () { return getGlobalType("MethodDecorator"); });
-            getGlobalParameterDecoratorType = ts.memoize(function () { return getGlobalType("ParameterDecorator"); });
-            getGlobalTypedPropertyDescriptorType = ts.memoize(function () { return getGlobalType("TypedPropertyDescriptor", /*arity*/ 1); });
-            getGlobalESSymbolConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Symbol"); });
-            getGlobalPromiseType = ts.memoize(function () { return getGlobalType("Promise", /*arity*/ 1); });
-            tryGetGlobalPromiseType = ts.memoize(function () { return getGlobalSymbol("Promise", 793056 /* Type */, /*diagnostic*/ undefined) && getGlobalPromiseType(); });
-            getGlobalPromiseLikeType = ts.memoize(function () { return getGlobalType("PromiseLike", /*arity*/ 1); });
-            getInstantiatedGlobalPromiseLikeType = ts.memoize(createInstantiatedPromiseLikeType);
-            getGlobalPromiseConstructorSymbol = ts.memoize(function () { return getGlobalValueSymbol("Promise"); });
-            getGlobalPromiseConstructorLikeType = ts.memoize(function () { return getGlobalType("PromiseConstructorLike"); });
-            getGlobalThenableType = ts.memoize(createThenableType);
-            getGlobalTemplateStringsArrayType = ts.memoize(function () { return getGlobalType("TemplateStringsArray"); });
-            if (languageVersion >= 2 /* ES6 */) {
-                getGlobalESSymbolType = ts.memoize(function () { return getGlobalType("Symbol"); });
-                getGlobalIterableType = ts.memoize(function () { return getGlobalType("Iterable", /*arity*/ 1); });
-                getGlobalIteratorType = ts.memoize(function () { return getGlobalType("Iterator", /*arity*/ 1); });
-                getGlobalIterableIteratorType = ts.memoize(function () { return getGlobalType("IterableIterator", /*arity*/ 1); });
-            }
-            else {
-                getGlobalESSymbolType = ts.memoize(function () { return emptyObjectType; });
-                getGlobalIterableType = ts.memoize(function () { return emptyGenericType; });
-                getGlobalIteratorType = ts.memoize(function () { return emptyGenericType; });
-                getGlobalIterableIteratorType = ts.memoize(function () { return emptyGenericType; });
-            }
-            anyArrayType = createArrayType(anyType);
-            var symbol = getGlobalSymbol("ReadonlyArray", 793056 /* Type */, /*diagnostic*/ undefined);
-            globalReadonlyArrayType = symbol && getTypeOfGlobalSymbol(symbol, /*arity*/ 1);
-            anyReadonlyArrayType = globalReadonlyArrayType ? createTypeFromGenericGlobalType(globalReadonlyArrayType, [anyType]) : anyArrayType;
-        }
-        function createInstantiatedPromiseLikeType() {
-            var promiseLikeType = getGlobalPromiseLikeType();
-            if (promiseLikeType !== emptyGenericType) {
-                return createTypeReference(promiseLikeType, [anyType]);
-            }
-            return emptyObjectType;
-        }
-        function createThenableType() {
-            // build the thenable type that is used to verify against a non-promise "thenable" operand to `await`.
-            var thenPropertySymbol = createSymbol(67108864 /* Transient */ | 4 /* Property */, "then");
-            getSymbolLinks(thenPropertySymbol).type = globalFunctionType;
-            var thenableType = createObjectType(65536 /* Anonymous */);
-            thenableType.properties = [thenPropertySymbol];
-            thenableType.members = createSymbolTable(thenableType.properties);
-            thenableType.callSignatures = [];
-            thenableType.constructSignatures = [];
-            return thenableType;
-        }
-        // GRAMMAR CHECKING
-        function checkGrammarDecorators(node) {
-            if (!node.decorators) {
-                return false;
-            }
-            if (!ts.nodeCanBeDecorated(node)) {
-                if (node.kind === 147 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.A_decorator_can_only_decorate_a_method_implementation_not_an_overload);
-                }
-                else {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_are_not_valid_here);
-                }
-            }
-            else if (node.kind === 149 /* GetAccessor */ || node.kind === 150 /* SetAccessor */) {
-                var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
-                if (accessors.firstAccessor.decorators && node === accessors.secondAccessor) {
-                    return grammarErrorOnFirstToken(node, ts.Diagnostics.Decorators_cannot_be_applied_to_multiple_get_Slashset_accessors_of_the_same_name);
-                }
-            }
-            return false;
-        }
-        function checkGrammarModifiers(node) {
-            switch (node.kind) {
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 148 /* Constructor */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 153 /* IndexSignature */:
-                case 225 /* ModuleDeclaration */:
-                case 230 /* ImportDeclaration */:
-                case 229 /* ImportEqualsDeclaration */:
-                case 236 /* ExportDeclaration */:
-                case 235 /* ExportAssignment */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                case 142 /* Parameter */:
-                    break;
-                case 220 /* FunctionDeclaration */:
-                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 118 /* AsyncKeyword */) &&
-                        node.parent.kind !== 226 /* ModuleBlock */ && node.parent.kind !== 256 /* SourceFile */) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                    break;
-                case 221 /* ClassDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 200 /* VariableStatement */:
-                case 223 /* TypeAliasDeclaration */:
-                    if (node.modifiers && node.parent.kind !== 226 /* ModuleBlock */ && node.parent.kind !== 256 /* SourceFile */) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                    break;
-                case 224 /* EnumDeclaration */:
-                    if (node.modifiers && (node.modifiers.length > 1 || node.modifiers[0].kind !== 74 /* ConstKeyword */) &&
-                        node.parent.kind !== 226 /* ModuleBlock */ && node.parent.kind !== 256 /* SourceFile */) {
-                        return grammarErrorOnFirstToken(node, ts.Diagnostics.Modifiers_cannot_appear_here);
-                    }
-                    break;
-                default:
-                    return false;
-            }
-            if (!node.modifiers) {
-                return;
-            }
-            var lastStatic, lastPrivate, lastProtected, lastDeclare, lastAsync, lastReadonly;
-            var flags = 0;
-            for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
-                var modifier = _a[_i];
-                if (modifier.kind !== 128 /* ReadonlyKeyword */) {
-                    if (node.kind === 144 /* PropertySignature */ || node.kind === 146 /* MethodSignature */) {
-                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
-                    }
-                    if (node.kind === 153 /* IndexSignature */) {
-                        return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_an_index_signature, ts.tokenToString(modifier.kind));
-                    }
-                }
-                switch (modifier.kind) {
-                    case 74 /* ConstKeyword */:
-                        if (node.kind !== 224 /* EnumDeclaration */ && node.parent.kind === 221 /* ClassDeclaration */) {
-                            return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(74 /* ConstKeyword */));
-                        }
-                        break;
-                    case 112 /* PublicKeyword */:
-                    case 111 /* ProtectedKeyword */:
-                    case 110 /* PrivateKeyword */:
-                        var text = visibilityToString(ts.modifierToFlag(modifier.kind));
-                        if (modifier.kind === 111 /* ProtectedKeyword */) {
-                            lastProtected = modifier;
-                        }
-                        else if (modifier.kind === 110 /* PrivateKeyword */) {
-                            lastPrivate = modifier;
-                        }
-                        if (flags & 28 /* AccessibilityModifier */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
-                        }
-                        else if (flags & 32 /* Static */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
-                        }
-                        else if (flags & 64 /* Readonly */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "readonly");
-                        }
-                        else if (flags & 256 /* Async */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "async");
-                        }
-                        else if (node.parent.kind === 226 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
-                        }
-                        else if (flags & 128 /* Abstract */) {
-                            if (modifier.kind === 110 /* PrivateKeyword */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, text, "abstract");
-                            }
-                            else {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "abstract");
-                            }
-                        }
-                        flags |= ts.modifierToFlag(modifier.kind);
-                        break;
-                    case 113 /* StaticKeyword */:
-                        if (flags & 32 /* Static */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "static");
-                        }
-                        else if (flags & 64 /* Readonly */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "readonly");
-                        }
-                        else if (flags & 256 /* Async */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "async");
-                        }
-                        else if (node.parent.kind === 226 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
-                        }
-                        else if (node.kind === 142 /* Parameter */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
-                        }
-                        else if (flags & 128 /* Abstract */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
-                        }
-                        flags |= 32 /* Static */;
-                        lastStatic = modifier;
-                        break;
-                    case 128 /* ReadonlyKeyword */:
-                        if (flags & 64 /* Readonly */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
-                        }
-                        else if (node.kind !== 145 /* PropertyDeclaration */ && node.kind !== 144 /* PropertySignature */ && node.kind !== 153 /* IndexSignature */ && node.kind !== 142 /* Parameter */) {
-                            // If node.kind === SyntaxKind.Parameter, checkParameter report an error if it's not a parameter property.
-                            return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
-                        }
-                        flags |= 64 /* Readonly */;
-                        lastReadonly = modifier;
-                        break;
-                    case 82 /* ExportKeyword */:
-                        if (flags & 1 /* Export */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "export");
-                        }
-                        else if (flags & 2 /* Ambient */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "declare");
-                        }
-                        else if (flags & 128 /* Abstract */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "abstract");
-                        }
-                        else if (flags & 256 /* Async */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "export", "async");
-                        }
-                        else if (node.parent.kind === 221 /* ClassDeclaration */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "export");
-                        }
-                        else if (node.kind === 142 /* Parameter */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "export");
-                        }
-                        flags |= 1 /* Export */;
-                        break;
-                    case 122 /* DeclareKeyword */:
-                        if (flags & 2 /* Ambient */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "declare");
-                        }
-                        else if (flags & 256 /* Async */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
-                        }
-                        else if (node.parent.kind === 221 /* ClassDeclaration */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_class_element, "declare");
-                        }
-                        else if (node.kind === 142 /* Parameter */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
-                        }
-                        else if (ts.isInAmbientContext(node.parent) && node.parent.kind === 226 /* ModuleBlock */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
-                        }
-                        flags |= 2 /* Ambient */;
-                        lastDeclare = modifier;
-                        break;
-                    case 115 /* AbstractKeyword */:
-                        if (flags & 128 /* Abstract */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
-                        }
-                        if (node.kind !== 221 /* ClassDeclaration */) {
-                            if (node.kind !== 147 /* MethodDeclaration */ &&
-                                node.kind !== 145 /* PropertyDeclaration */ &&
-                                node.kind !== 149 /* GetAccessor */ &&
-                                node.kind !== 150 /* SetAccessor */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
-                            }
-                            if (!(node.parent.kind === 221 /* ClassDeclaration */ && node.parent.flags & 128 /* Abstract */)) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics.Abstract_methods_can_only_appear_within_an_abstract_class);
-                            }
-                            if (flags & 32 /* Static */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
-                            }
-                            if (flags & 8 /* Private */) {
-                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "private", "abstract");
-                            }
-                        }
-                        flags |= 128 /* Abstract */;
-                        break;
-                    case 118 /* AsyncKeyword */:
-                        if (flags & 256 /* Async */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "async");
-                        }
-                        else if (flags & 2 /* Ambient */ || ts.isInAmbientContext(node.parent)) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
-                        }
-                        else if (node.kind === 142 /* Parameter */) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
-                        }
-                        flags |= 256 /* Async */;
-                        lastAsync = modifier;
-                        break;
-                }
-            }
-            if (node.kind === 148 /* Constructor */) {
-                if (flags & 32 /* Static */) {
-                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
-                }
-                if (flags & 128 /* Abstract */) {
-                    return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract");
-                }
-                else if (flags & 256 /* Async */) {
-                    return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
-                }
-                else if (flags & 64 /* Readonly */) {
-                    return grammarErrorOnNode(lastReadonly, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "readonly");
-                }
-                return;
-            }
-            else if ((node.kind === 230 /* ImportDeclaration */ || node.kind === 229 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
-                return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
-            }
-            else if (node.kind === 142 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
-                return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_may_not_be_declared_using_a_binding_pattern);
-            }
-            else if (node.kind === 142 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
-                return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
-            }
-            if (flags & 256 /* Async */) {
-                return checkGrammarAsyncModifier(node, lastAsync);
-            }
-        }
-        function checkGrammarAsyncModifier(node, asyncModifier) {
-            if (languageVersion < 2 /* ES6 */) {
-                return grammarErrorOnNode(asyncModifier, ts.Diagnostics.Async_functions_are_only_available_when_targeting_ECMAScript_2015_or_higher);
-            }
-            switch (node.kind) {
-                case 147 /* MethodDeclaration */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    if (!node.asteriskToken) {
-                        return false;
-                    }
-                    break;
-            }
-            return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
-        }
-        function checkGrammarForDisallowedTrailingComma(list) {
-            if (list && list.hasTrailingComma) {
-                var start = list.end - ",".length;
-                var end = list.end;
-                var sourceFile = ts.getSourceFileOfNode(list[0]);
-                return grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Trailing_comma_not_allowed);
-            }
-        }
-        function checkGrammarTypeParameterList(node, typeParameters, file) {
-            if (checkGrammarForDisallowedTrailingComma(typeParameters)) {
-                return true;
-            }
-            if (typeParameters && typeParameters.length === 0) {
-                var start = typeParameters.pos - "<".length;
-                var end = ts.skipTrivia(file.text, typeParameters.end) + ">".length;
-                return grammarErrorAtPos(file, start, end - start, ts.Diagnostics.Type_parameter_list_cannot_be_empty);
-            }
-        }
-        function checkGrammarParameterList(parameters) {
-            var seenOptionalParameter = false;
-            var parameterCount = parameters.length;
-            for (var i = 0; i < parameterCount; i++) {
-                var parameter = parameters[i];
-                if (parameter.dotDotDotToken) {
-                    if (i !== (parameterCount - 1)) {
-                        return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_rest_parameter_must_be_last_in_a_parameter_list);
-                    }
-                    if (ts.isBindingPattern(parameter.name)) {
-                        return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
-                    }
-                    if (parameter.questionToken) {
-                        return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.A_rest_parameter_cannot_be_optional);
-                    }
-                    if (parameter.initializer) {
-                        return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_rest_parameter_cannot_have_an_initializer);
-                    }
-                }
-                else if (parameter.questionToken) {
-                    seenOptionalParameter = true;
-                    if (parameter.initializer) {
-                        return grammarErrorOnNode(parameter.name, ts.Diagnostics.Parameter_cannot_have_question_mark_and_initializer);
-                    }
-                }
-                else if (seenOptionalParameter && !parameter.initializer) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.A_required_parameter_cannot_follow_an_optional_parameter);
-                }
-            }
-        }
-        function checkGrammarFunctionLikeDeclaration(node) {
-            // Prevent cascading error by short-circuit
-            var file = ts.getSourceFileOfNode(node);
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarTypeParameterList(node, node.typeParameters, file) ||
-                checkGrammarParameterList(node.parameters) || checkGrammarArrowFunction(node, file);
-        }
-        function checkGrammarArrowFunction(node, file) {
-            if (node.kind === 180 /* ArrowFunction */) {
-                var arrowFunction = node;
-                var startLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.pos).line;
-                var endLine = ts.getLineAndCharacterOfPosition(file, arrowFunction.equalsGreaterThanToken.end).line;
-                if (startLine !== endLine) {
-                    return grammarErrorOnNode(arrowFunction.equalsGreaterThanToken, ts.Diagnostics.Line_terminator_not_permitted_before_arrow);
-                }
-            }
-            return false;
-        }
-        function checkGrammarIndexSignatureParameters(node) {
-            var parameter = node.parameters[0];
-            if (node.parameters.length !== 1) {
-                if (parameter) {
-                    return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_must_have_exactly_one_parameter);
-                }
-                else {
-                    return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_exactly_one_parameter);
-                }
-            }
-            if (parameter.dotDotDotToken) {
-                return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.An_index_signature_cannot_have_a_rest_parameter);
-            }
-            if (parameter.flags & 1023 /* Modifier */) {
-                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_accessibility_modifier);
-            }
-            if (parameter.questionToken) {
-                return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.An_index_signature_parameter_cannot_have_a_question_mark);
-            }
-            if (parameter.initializer) {
-                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_cannot_have_an_initializer);
-            }
-            if (!parameter.type) {
-                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_must_have_a_type_annotation);
-            }
-            if (parameter.type.kind !== 132 /* StringKeyword */ && parameter.type.kind !== 130 /* NumberKeyword */) {
-                return grammarErrorOnNode(parameter.name, ts.Diagnostics.An_index_signature_parameter_type_must_be_string_or_number);
-            }
-            if (!node.type) {
-                return grammarErrorOnNode(node, ts.Diagnostics.An_index_signature_must_have_a_type_annotation);
-            }
-        }
-        function checkGrammarIndexSignature(node) {
-            // Prevent cascading error by short-circuit
-            return checkGrammarDecorators(node) || checkGrammarModifiers(node) || checkGrammarIndexSignatureParameters(node);
-        }
-        function checkGrammarForAtLeastOneTypeArgument(node, typeArguments) {
-            if (typeArguments && typeArguments.length === 0) {
-                var sourceFile = ts.getSourceFileOfNode(node);
-                var start = typeArguments.pos - "<".length;
-                var end = ts.skipTrivia(sourceFile.text, typeArguments.end) + ">".length;
-                return grammarErrorAtPos(sourceFile, start, end - start, ts.Diagnostics.Type_argument_list_cannot_be_empty);
-            }
-        }
-        function checkGrammarTypeArguments(node, typeArguments) {
-            return checkGrammarForDisallowedTrailingComma(typeArguments) ||
-                checkGrammarForAtLeastOneTypeArgument(node, typeArguments);
-        }
-        function checkGrammarForOmittedArgument(node, args) {
-            if (args) {
-                var sourceFile = ts.getSourceFileOfNode(node);
-                for (var _i = 0, args_1 = args; _i < args_1.length; _i++) {
-                    var arg = args_1[_i];
-                    if (arg.kind === 193 /* OmittedExpression */) {
-                        return grammarErrorAtPos(sourceFile, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
-                    }
-                }
-            }
-        }
-        function checkGrammarArguments(node, args) {
-            return checkGrammarForOmittedArgument(node, args);
-        }
-        function checkGrammarHeritageClause(node) {
-            var types = node.types;
-            if (checkGrammarForDisallowedTrailingComma(types)) {
-                return true;
-            }
-            if (types && types.length === 0) {
-                var listType = ts.tokenToString(node.token);
-                var sourceFile = ts.getSourceFileOfNode(node);
-                return grammarErrorAtPos(sourceFile, types.pos, 0, ts.Diagnostics._0_list_cannot_be_empty, listType);
-            }
-        }
-        function checkGrammarClassDeclarationHeritageClauses(node) {
-            var seenExtendsClause = false;
-            var seenImplementsClause = false;
-            if (!checkGrammarDecorators(node) && !checkGrammarModifiers(node) && node.heritageClauses) {
-                for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
-                    var heritageClause = _a[_i];
-                    if (heritageClause.token === 83 /* ExtendsKeyword */) {
-                        if (seenExtendsClause) {
-                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
-                        }
-                        if (seenImplementsClause) {
-                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_must_precede_implements_clause);
-                        }
-                        if (heritageClause.types.length > 1) {
-                            return grammarErrorOnFirstToken(heritageClause.types[1], ts.Diagnostics.Classes_can_only_extend_a_single_class);
-                        }
-                        seenExtendsClause = true;
-                    }
-                    else {
-                        ts.Debug.assert(heritageClause.token === 106 /* ImplementsKeyword */);
-                        if (seenImplementsClause) {
-                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.implements_clause_already_seen);
-                        }
-                        seenImplementsClause = true;
-                    }
-                    // Grammar checking heritageClause inside class declaration
-                    checkGrammarHeritageClause(heritageClause);
-                }
-            }
-        }
-        function checkGrammarInterfaceDeclaration(node) {
-            var seenExtendsClause = false;
-            if (node.heritageClauses) {
-                for (var _i = 0, _a = node.heritageClauses; _i < _a.length; _i++) {
-                    var heritageClause = _a[_i];
-                    if (heritageClause.token === 83 /* ExtendsKeyword */) {
-                        if (seenExtendsClause) {
-                            return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.extends_clause_already_seen);
-                        }
-                        seenExtendsClause = true;
-                    }
-                    else {
-                        ts.Debug.assert(heritageClause.token === 106 /* ImplementsKeyword */);
-                        return grammarErrorOnFirstToken(heritageClause, ts.Diagnostics.Interface_declaration_cannot_have_implements_clause);
-                    }
-                    // Grammar checking heritageClause inside class declaration
-                    checkGrammarHeritageClause(heritageClause);
-                }
-            }
-            return false;
-        }
-        function checkGrammarComputedPropertyName(node) {
-            // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 140 /* ComputedPropertyName */) {
-                return false;
-            }
-            var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 187 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 24 /* CommaToken */) {
-                return grammarErrorOnNode(computedPropertyName.expression, ts.Diagnostics.A_comma_expression_is_not_allowed_in_a_computed_property_name);
-            }
-        }
-        function checkGrammarForGenerator(node) {
-            if (node.asteriskToken) {
-                ts.Debug.assert(node.kind === 220 /* FunctionDeclaration */ ||
-                    node.kind === 179 /* FunctionExpression */ ||
-                    node.kind === 147 /* MethodDeclaration */);
-                if (ts.isInAmbientContext(node)) {
-                    return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
-                }
-                if (!node.body) {
-                    return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.An_overload_signature_cannot_be_declared_as_a_generator);
-                }
-                if (languageVersion < 2 /* ES6 */) {
-                    return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_only_available_when_targeting_ECMAScript_2015_or_higher);
-                }
-            }
-        }
-        function checkGrammarForInvalidQuestionMark(node, questionToken, message) {
-            if (questionToken) {
-                return grammarErrorOnNode(questionToken, message);
-            }
-        }
-        function checkGrammarObjectLiteralExpression(node, inDestructuring) {
-            var seen = {};
-            var Property = 1;
-            var GetAccessor = 2;
-            var SetAccessor = 4;
-            var GetOrSetAccessor = GetAccessor | SetAccessor;
-            var _loop_2 = function(prop) {
-                var name_21 = prop.name;
-                if (prop.kind === 193 /* OmittedExpression */ ||
-                    name_21.kind === 140 /* ComputedPropertyName */) {
-                    // If the name is not a ComputedPropertyName, the grammar checking will skip it
-                    checkGrammarComputedPropertyName(name_21);
-                }
-                if (prop.kind === 254 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
-                    // having objectAssignmentInitializer is only valid in ObjectAssignmentPattern
-                    // outside of destructuring it is a syntax error
-                    return { value: grammarErrorOnNode(prop.equalsToken, ts.Diagnostics.can_only_be_used_in_an_object_literal_property_inside_a_destructuring_assignment) };
-                }
-                // Modifiers are never allowed on properties except for 'async' on a method declaration
-                ts.forEach(prop.modifiers, function (mod) {
-                    if (mod.kind !== 118 /* AsyncKeyword */ || prop.kind !== 147 /* MethodDeclaration */) {
-                        grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
-                    }
-                });
-                // ECMA-262 11.1.5 Object Initializer
-                // If previous is not undefined then throw a SyntaxError exception if any of the following conditions are true
-                // a.This production is contained in strict code and IsDataDescriptor(previous) is true and
-                // IsDataDescriptor(propId.descriptor) is true.
-                //    b.IsDataDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true.
-                //    c.IsAccessorDescriptor(previous) is true and IsDataDescriptor(propId.descriptor) is true.
-                //    d.IsAccessorDescriptor(previous) is true and IsAccessorDescriptor(propId.descriptor) is true
-                // and either both previous and propId.descriptor have[[Get]] fields or both previous and propId.descriptor have[[Set]] fields
-                var currentKind = void 0;
-                if (prop.kind === 253 /* PropertyAssignment */ || prop.kind === 254 /* ShorthandPropertyAssignment */) {
-                    // Grammar checking for computedPropertyName and shorthandPropertyAssignment
-                    checkGrammarForInvalidQuestionMark(prop, prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
-                    if (name_21.kind === 8 /* NumericLiteral */) {
-                        checkGrammarNumericLiteral(name_21);
-                    }
-                    currentKind = Property;
-                }
-                else if (prop.kind === 147 /* MethodDeclaration */) {
-                    currentKind = Property;
-                }
-                else if (prop.kind === 149 /* GetAccessor */) {
-                    currentKind = GetAccessor;
-                }
-                else if (prop.kind === 150 /* SetAccessor */) {
-                    currentKind = SetAccessor;
-                }
-                else {
-                    ts.Debug.fail("Unexpected syntax kind:" + prop.kind);
-                }
-                var effectiveName = ts.getPropertyNameForPropertyNameNode(name_21);
-                if (effectiveName === undefined) {
-                    return "continue";
-                }
-                if (!ts.hasProperty(seen, effectiveName)) {
-                    seen[effectiveName] = currentKind;
-                }
-                else {
-                    var existingKind = seen[effectiveName];
-                    if (currentKind === Property && existingKind === Property) {
-                        grammarErrorOnNode(name_21, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(name_21));
-                    }
-                    else if ((currentKind & GetOrSetAccessor) && (existingKind & GetOrSetAccessor)) {
-                        if (existingKind !== GetOrSetAccessor && currentKind !== existingKind) {
-                            seen[effectiveName] = currentKind | existingKind;
-                        }
-                        else {
-                            return { value: grammarErrorOnNode(name_21, ts.Diagnostics.An_object_literal_cannot_have_multiple_get_Slashset_accessors_with_the_same_name) };
-                        }
-                    }
-                    else {
-                        return { value: grammarErrorOnNode(name_21, ts.Diagnostics.An_object_literal_cannot_have_property_and_accessor_with_the_same_name) };
-                    }
-                }
-            };
-            for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
-                var prop = _a[_i];
-                var state_3 = _loop_2(prop);
-                if (typeof state_3 === "object") return state_3.value;
-            }
-        }
-        function checkGrammarJsxElement(node) {
-            var seen = {};
-            for (var _i = 0, _a = node.attributes; _i < _a.length; _i++) {
-                var attr = _a[_i];
-                if (attr.kind === 247 /* JsxSpreadAttribute */) {
-                    continue;
-                }
-                var jsxAttr = attr;
-                var name_22 = jsxAttr.name;
-                if (!ts.hasProperty(seen, name_22.text)) {
-                    seen[name_22.text] = true;
-                }
-                else {
-                    return grammarErrorOnNode(name_22, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
-                }
-                var initializer = jsxAttr.initializer;
-                if (initializer && initializer.kind === 248 /* JsxExpression */ && !initializer.expression) {
-                    return grammarErrorOnNode(jsxAttr.initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
-                }
-            }
-        }
-        function checkGrammarForInOrForOfStatement(forInOrOfStatement) {
-            if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
-                return true;
-            }
-            if (forInOrOfStatement.initializer.kind === 219 /* VariableDeclarationList */) {
-                var variableList = forInOrOfStatement.initializer;
-                if (!checkGrammarVariableDeclarationList(variableList)) {
-                    var declarations = variableList.declarations;
-                    // declarations.length can be zero if there is an error in variable declaration in for-of or for-in
-                    // See http://www.ecma-international.org/ecma-262/6.0/#sec-for-in-and-for-of-statements for details
-                    // For example:
-                    //      var let = 10;
-                    //      for (let of [1,2,3]) {} // this is invalid ES6 syntax
-                    //      for (let in [1,2,3]) {} // this is invalid ES6 syntax
-                    // We will then want to skip on grammar checking on variableList declaration
-                    if (!declarations.length) {
-                        return false;
-                    }
-                    if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 207 /* ForInStatement */
-                            ? ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_in_statement
-                            : ts.Diagnostics.Only_a_single_variable_declaration_is_allowed_in_a_for_of_statement;
-                        return grammarErrorOnFirstToken(variableList.declarations[1], diagnostic);
-                    }
-                    var firstDeclaration = declarations[0];
-                    if (firstDeclaration.initializer) {
-                        var diagnostic = forInOrOfStatement.kind === 207 /* ForInStatement */
-                            ? ts.Diagnostics.The_variable_declaration_of_a_for_in_statement_cannot_have_an_initializer
-                            : ts.Diagnostics.The_variable_declaration_of_a_for_of_statement_cannot_have_an_initializer;
-                        return grammarErrorOnNode(firstDeclaration.name, diagnostic);
-                    }
-                    if (firstDeclaration.type) {
-                        var diagnostic = forInOrOfStatement.kind === 207 /* ForInStatement */
-                            ? ts.Diagnostics.The_left_hand_side_of_a_for_in_statement_cannot_use_a_type_annotation
-                            : ts.Diagnostics.The_left_hand_side_of_a_for_of_statement_cannot_use_a_type_annotation;
-                        return grammarErrorOnNode(firstDeclaration, diagnostic);
-                    }
-                }
-            }
-            return false;
-        }
-        function checkGrammarAccessor(accessor) {
-            var kind = accessor.kind;
-            if (languageVersion < 1 /* ES5 */) {
-                return grammarErrorOnNode(accessor.name, ts.Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
-            }
-            else if (ts.isInAmbientContext(accessor)) {
-                return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_be_declared_in_an_ambient_context);
-            }
-            else if (accessor.body === undefined && !(accessor.flags & 128 /* Abstract */)) {
-                return grammarErrorAtPos(ts.getSourceFileOfNode(accessor), accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
-            }
-            else if (accessor.typeParameters) {
-                return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
-            }
-            else if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, kind === 149 /* GetAccessor */ ?
-                    ts.Diagnostics.A_get_accessor_cannot_have_parameters :
-                    ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
-            }
-            else if (kind === 150 /* SetAccessor */) {
-                if (accessor.type) {
-                    return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
-                }
-                else {
-                    var parameter = accessor.parameters[0];
-                    if (parameter.dotDotDotToken) {
-                        return grammarErrorOnNode(parameter.dotDotDotToken, ts.Diagnostics.A_set_accessor_cannot_have_rest_parameter);
-                    }
-                    else if (parameter.questionToken) {
-                        return grammarErrorOnNode(parameter.questionToken, ts.Diagnostics.A_set_accessor_cannot_have_an_optional_parameter);
-                    }
-                    else if (parameter.initializer) {
-                        return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_parameter_cannot_have_an_initializer);
-                    }
-                }
-            }
-        }
-        /** Does the accessor have the right number of parameters?
-
-            A get accessor has no parameters or a single `this` parameter.
-            A set accessor has one parameter or a `this` parameter and one more parameter */
-        function doesAccessorHaveCorrectParameterCount(accessor) {
-            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 149 /* GetAccessor */ ? 0 : 1);
-        }
-        function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 149 /* GetAccessor */ ? 1 : 2) &&
-                accessor.parameters[0].name.kind === 69 /* Identifier */ &&
-                accessor.parameters[0].name.originalKeywordKind === 97 /* ThisKeyword */) {
-                return accessor.parameters[0];
-            }
-        }
-        function getFunctionLikeThisParameter(func) {
-            if (func.parameters.length &&
-                func.parameters[0].name.kind === 69 /* Identifier */ &&
-                func.parameters[0].name.originalKeywordKind === 97 /* ThisKeyword */) {
-                return func.parameters[0];
-            }
-        }
-        function checkGrammarForNonSymbolComputedProperty(node, message) {
-            if (ts.isDynamicName(node)) {
-                return grammarErrorOnNode(node, message);
-            }
-        }
-        function checkGrammarMethod(node) {
-            if (checkGrammarDisallowedModifiersOnObjectLiteralExpressionMethod(node) ||
-                checkGrammarFunctionLikeDeclaration(node) ||
-                checkGrammarForGenerator(node)) {
-                return true;
-            }
-            if (node.parent.kind === 171 /* ObjectLiteralExpression */) {
-                if (checkGrammarForInvalidQuestionMark(node, node.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional)) {
-                    return true;
-                }
-                else if (node.body === undefined) {
-                    return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
-                }
-            }
-            if (ts.isClassLike(node.parent)) {
-                // Technically, computed properties in ambient contexts is disallowed
-                // for property declarations and accessors too, not just methods.
-                // However, property declarations disallow computed names in general,
-                // and accessors are not allowed in ambient contexts in general,
-                // so this error only really matters for methods.
-                if (ts.isInAmbientContext(node)) {
-                    return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_ambient_context_must_directly_refer_to_a_built_in_symbol);
-                }
-                else if (!node.body) {
-                    return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_method_overload_must_directly_refer_to_a_built_in_symbol);
-                }
-            }
-            else if (node.parent.kind === 222 /* InterfaceDeclaration */) {
-                return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol);
-            }
-            else if (node.parent.kind === 159 /* TypeLiteral */) {
-                return checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol);
-            }
-        }
-        function checkGrammarBreakOrContinueStatement(node) {
-            var current = node;
-            while (current) {
-                if (ts.isFunctionLike(current)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
-                }
-                switch (current.kind) {
-                    case 214 /* LabeledStatement */:
-                        if (node.label && current.label.text === node.label.text) {
-                            // found matching label - verify that label usage is correct
-                            // continue can only target labels that are on iteration statements
-                            var isMisplacedContinueLabel = node.kind === 209 /* ContinueStatement */
-                                && !ts.isIterationStatement(current.statement, /*lookInLabeledStatement*/ true);
-                            if (isMisplacedContinueLabel) {
-                                return grammarErrorOnNode(node, ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement);
-                            }
-                            return false;
-                        }
-                        break;
-                    case 213 /* SwitchStatement */:
-                        if (node.kind === 210 /* BreakStatement */ && !node.label) {
-                            // unlabeled break within switch statement - ok
-                            return false;
-                        }
-                        break;
-                    default:
-                        if (ts.isIterationStatement(current, /*lookInLabeledStatement*/ false) && !node.label) {
-                            // unlabeled break or continue within iteration statement - ok
-                            return false;
-                        }
-                        break;
-                }
-                current = current.parent;
-            }
-            if (node.label) {
-                var message = node.kind === 210 /* BreakStatement */
-                    ? ts.Diagnostics.A_break_statement_can_only_jump_to_a_label_of_an_enclosing_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_jump_to_a_label_of_an_enclosing_iteration_statement;
-                return grammarErrorOnNode(node, message);
-            }
-            else {
-                var message = node.kind === 210 /* BreakStatement */
-                    ? ts.Diagnostics.A_break_statement_can_only_be_used_within_an_enclosing_iteration_or_switch_statement
-                    : ts.Diagnostics.A_continue_statement_can_only_be_used_within_an_enclosing_iteration_statement;
-                return grammarErrorOnNode(node, message);
-            }
-        }
-        function checkGrammarBindingElement(node) {
-            if (node.dotDotDotToken) {
-                var elements = node.parent.elements;
-                if (node !== ts.lastOrUndefined(elements)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.A_rest_element_must_be_last_in_an_array_destructuring_pattern);
-                }
-                if (node.name.kind === 168 /* ArrayBindingPattern */ || node.name.kind === 167 /* ObjectBindingPattern */) {
-                    return grammarErrorOnNode(node.name, ts.Diagnostics.A_rest_element_cannot_contain_a_binding_pattern);
-                }
-                if (node.initializer) {
-                    // Error on equals token which immediate precedes the initializer
-                    return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - 1, 1, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
-                }
-            }
-        }
-        function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 207 /* ForInStatement */ && node.parent.parent.kind !== 208 /* ForOfStatement */) {
-                if (ts.isInAmbientContext(node)) {
-                    if (node.initializer) {
-                        // Error on equals token which immediate precedes the initializer
-                        var equalsTokenLength = "=".length;
-                        return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.initializer.pos - equalsTokenLength, equalsTokenLength, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
-                    }
-                }
-                else if (!node.initializer) {
-                    if (ts.isBindingPattern(node.name) && !ts.isBindingPattern(node.parent)) {
-                        return grammarErrorOnNode(node, ts.Diagnostics.A_destructuring_declaration_must_have_an_initializer);
-                    }
-                    if (ts.isConst(node)) {
-                        return grammarErrorOnNode(node, ts.Diagnostics.const_declarations_must_be_initialized);
-                    }
-                }
-            }
-            var checkLetConstNames = (ts.isLet(node) || ts.isConst(node));
-            // 1. LexicalDeclaration : LetOrConst BindingList ;
-            // It is a Syntax Error if the BoundNames of BindingList contains "let".
-            // 2. ForDeclaration: ForDeclaration : LetOrConst ForBinding
-            // It is a Syntax Error if the BoundNames of ForDeclaration contains "let".
-            // It is a SyntaxError if a VariableDeclaration or VariableDeclarationNoIn occurs within strict code
-            // and its Identifier is eval or arguments
-            return checkLetConstNames && checkGrammarNameInLetOrConstDeclarations(node.name);
-        }
-        function checkGrammarNameInLetOrConstDeclarations(name) {
-            if (name.kind === 69 /* Identifier */) {
-                if (name.originalKeywordKind === 108 /* LetKeyword */) {
-                    return grammarErrorOnNode(name, ts.Diagnostics.let_is_not_allowed_to_be_used_as_a_name_in_let_or_const_declarations);
-                }
-            }
-            else {
-                var elements = name.elements;
-                for (var _i = 0, elements_2 = elements; _i < elements_2.length; _i++) {
-                    var element = elements_2[_i];
-                    if (element.kind !== 193 /* OmittedExpression */) {
-                        checkGrammarNameInLetOrConstDeclarations(element.name);
-                    }
-                }
-            }
-        }
-        function checkGrammarVariableDeclarationList(declarationList) {
-            var declarations = declarationList.declarations;
-            if (checkGrammarForDisallowedTrailingComma(declarationList.declarations)) {
-                return true;
-            }
-            if (!declarationList.declarations.length) {
-                return grammarErrorAtPos(ts.getSourceFileOfNode(declarationList), declarations.pos, declarations.end - declarations.pos, ts.Diagnostics.Variable_declaration_list_cannot_be_empty);
-            }
-        }
-        function allowLetAndConstDeclarations(parent) {
-            switch (parent.kind) {
-                case 203 /* IfStatement */:
-                case 204 /* DoStatement */:
-                case 205 /* WhileStatement */:
-                case 212 /* WithStatement */:
-                case 206 /* ForStatement */:
-                case 207 /* ForInStatement */:
-                case 208 /* ForOfStatement */:
-                    return false;
-                case 214 /* LabeledStatement */:
-                    return allowLetAndConstDeclarations(parent.parent);
-            }
-            return true;
-        }
-        function checkGrammarForDisallowedLetOrConstStatement(node) {
-            if (!allowLetAndConstDeclarations(node.parent)) {
-                if (ts.isLet(node.declarationList)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.let_declarations_can_only_be_declared_inside_a_block);
-                }
-                else if (ts.isConst(node.declarationList)) {
-                    return grammarErrorOnNode(node, ts.Diagnostics.const_declarations_can_only_be_declared_inside_a_block);
-                }
-            }
-        }
-        function hasParseDiagnostics(sourceFile) {
-            return sourceFile.parseDiagnostics.length > 0;
-        }
-        function grammarErrorOnFirstToken(node, message, arg0, arg1, arg2) {
-            var sourceFile = ts.getSourceFileOfNode(node);
-            if (!hasParseDiagnostics(sourceFile)) {
-                var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
-                diagnostics.add(ts.createFileDiagnostic(sourceFile, span.start, span.length, message, arg0, arg1, arg2));
-                return true;
-            }
-        }
-        function grammarErrorAtPos(sourceFile, start, length, message, arg0, arg1, arg2) {
-            if (!hasParseDiagnostics(sourceFile)) {
-                diagnostics.add(ts.createFileDiagnostic(sourceFile, start, length, message, arg0, arg1, arg2));
-                return true;
-            }
-        }
-        function grammarErrorOnNode(node, message, arg0, arg1, arg2) {
-            var sourceFile = ts.getSourceFileOfNode(node);
-            if (!hasParseDiagnostics(sourceFile)) {
-                diagnostics.add(ts.createDiagnosticForNode(node, message, arg0, arg1, arg2));
-                return true;
-            }
-        }
-        function checkGrammarConstructorTypeParameters(node) {
-            if (node.typeParameters) {
-                return grammarErrorAtPos(ts.getSourceFileOfNode(node), node.typeParameters.pos, node.typeParameters.end - node.typeParameters.pos, ts.Diagnostics.Type_parameters_cannot_appear_on_a_constructor_declaration);
-            }
-        }
-        function checkGrammarConstructorTypeAnnotation(node) {
-            if (node.type) {
-                return grammarErrorOnNode(node.type, ts.Diagnostics.Type_annotation_cannot_appear_on_a_constructor_declaration);
-            }
-        }
-        function checkGrammarProperty(node) {
-            if (ts.isClassLike(node.parent)) {
-                if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_directly_refer_to_a_built_in_symbol)) {
-                    return true;
-                }
-            }
-            else if (node.parent.kind === 222 /* InterfaceDeclaration */) {
-                if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_an_interface_must_directly_refer_to_a_built_in_symbol)) {
-                    return true;
-                }
-                if (node.initializer) {
-                    return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
-                }
-            }
-            else if (node.parent.kind === 159 /* TypeLiteral */) {
-                if (checkGrammarForNonSymbolComputedProperty(node.name, ts.Diagnostics.A_computed_property_name_in_a_type_literal_must_directly_refer_to_a_built_in_symbol)) {
-                    return true;
-                }
-                if (node.initializer) {
-                    return grammarErrorOnNode(node.initializer, ts.Diagnostics.A_type_literal_property_cannot_have_an_initializer);
-                }
-            }
-            if (ts.isInAmbientContext(node) && node.initializer) {
-                return grammarErrorOnFirstToken(node.initializer, ts.Diagnostics.Initializers_are_not_allowed_in_ambient_contexts);
-            }
-        }
-        function checkGrammarTopLevelElementForRequiredDeclareModifier(node) {
-            // A declare modifier is required for any top level .d.ts declaration except export=, export default,
-            // interfaces and imports categories:
-            //
-            //  DeclarationElement:
-            //     ExportAssignment
-            //     export_opt   InterfaceDeclaration
-            //     export_opt   TypeAliasDeclaration
-            //     export_opt   ImportDeclaration
-            //     export_opt   ExternalImportDeclaration
-            //     export_opt   AmbientDeclaration
-            //
-            // TODO: The spec needs to be amended to reflect this grammar.
-            if (node.kind === 222 /* InterfaceDeclaration */ ||
-                node.kind === 223 /* TypeAliasDeclaration */ ||
-                node.kind === 230 /* ImportDeclaration */ ||
-                node.kind === 229 /* ImportEqualsDeclaration */ ||
-                node.kind === 236 /* ExportDeclaration */ ||
-                node.kind === 235 /* ExportAssignment */ ||
-                (node.flags & 2 /* Ambient */) ||
-                (node.flags & (1 /* Export */ | 512 /* Default */))) {
-                return false;
-            }
-            return grammarErrorOnFirstToken(node, ts.Diagnostics.A_declare_modifier_is_required_for_a_top_level_declaration_in_a_d_ts_file);
-        }
-        function checkGrammarTopLevelElementsForRequiredDeclareModifier(file) {
-            for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                if (ts.isDeclaration(decl) || decl.kind === 200 /* VariableStatement */) {
-                    if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        function checkGrammarSourceFile(node) {
-            return ts.isInAmbientContext(node) && checkGrammarTopLevelElementsForRequiredDeclareModifier(node);
-        }
-        function checkGrammarStatementInAmbientContext(node) {
-            if (ts.isInAmbientContext(node)) {
-                // An accessors is already reported about the ambient context
-                if (isAccessor(node.parent.kind)) {
-                    return getNodeLinks(node).hasReportedStatementInAmbientContext = true;
-                }
-                // Find containing block which is either Block, ModuleBlock, SourceFile
-                var links = getNodeLinks(node);
-                if (!links.hasReportedStatementInAmbientContext && ts.isFunctionLike(node.parent)) {
-                    return getNodeLinks(node).hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
-                }
-                // We are either parented by another statement, or some sort of block.
-                // If we're in a block, we only want to really report an error once
-                // to prevent noisiness.  So use a bit on the block to indicate if
-                // this has already been reported, and don't report if it has.
-                //
-                if (node.parent.kind === 199 /* Block */ || node.parent.kind === 226 /* ModuleBlock */ || node.parent.kind === 256 /* SourceFile */) {
-                    var links_1 = getNodeLinks(node.parent);
-                    // Check if the containing block ever report this error
-                    if (!links_1.hasReportedStatementInAmbientContext) {
-                        return links_1.hasReportedStatementInAmbientContext = grammarErrorOnFirstToken(node, ts.Diagnostics.Statements_are_not_allowed_in_ambient_contexts);
-                    }
-                }
-                else {
-                }
-            }
-        }
-        function checkGrammarNumericLiteral(node) {
-            // Grammar checking
-            if (node.isOctalLiteral && languageVersion >= 1 /* ES5 */) {
-                return grammarErrorOnNode(node, ts.Diagnostics.Octal_literals_are_not_available_when_targeting_ECMAScript_5_and_higher);
-            }
-        }
-        function grammarErrorAfterFirstToken(node, message, arg0, arg1, arg2) {
-            var sourceFile = ts.getSourceFileOfNode(node);
-            if (!hasParseDiagnostics(sourceFile)) {
-                var span = ts.getSpanOfTokenAtPosition(sourceFile, node.pos);
-                diagnostics.add(ts.createFileDiagnostic(sourceFile, ts.textSpanEnd(span), /*length*/ 0, message, arg0, arg1, arg2));
-                return true;
-            }
-        }
-        var _a;
-    }
-    ts.createTypeChecker = createTypeChecker;
-})(ts || (ts = {}));
-/// <reference path="checker.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var nullSourceMapWriter;
-    // Used for initialize lastEncodedSourceMapSpan and reset lastEncodedSourceMapSpan when updateLastEncodedAndRecordedSpans
-    var defaultLastEncodedSourceMapSpan = {
-        emittedLine: 1,
-        emittedColumn: 1,
-        sourceLine: 1,
-        sourceColumn: 1,
-        sourceIndex: 0
-    };
-    function getNullSourceMapWriter() {
-        if (nullSourceMapWriter === undefined) {
-            nullSourceMapWriter = {
-                getSourceMapData: function () { return undefined; },
-                setSourceFile: function (sourceFile) { },
-                emitStart: function (range) { },
-                emitEnd: function (range, stopOverridingSpan) { },
-                emitPos: function (pos) { },
-                changeEmitSourcePos: function () { },
-                getText: function () { return undefined; },
-                getSourceMappingURL: function () { return undefined; },
-                initialize: function (filePath, sourceMapFilePath, sourceFiles, isBundledEmit) { },
-                reset: function () { }
-            };
-        }
-        return nullSourceMapWriter;
-    }
-    ts.getNullSourceMapWriter = getNullSourceMapWriter;
-    function createSourceMapWriter(host, writer) {
-        var compilerOptions = host.getCompilerOptions();
-        var currentSourceFile;
-        var sourceMapDir; // The directory in which sourcemap will be
-        var stopOverridingSpan = false;
-        var modifyLastSourcePos = false;
-        // Current source map file and its index in the sources list
-        var sourceMapSourceIndex;
-        // Last recorded and encoded spans
-        var lastRecordedSourceMapSpan;
-        var lastEncodedSourceMapSpan;
-        var lastEncodedNameIndex;
-        // Source map data
-        var sourceMapData;
-        return {
-            getSourceMapData: function () { return sourceMapData; },
-            setSourceFile: setSourceFile,
-            emitPos: emitPos,
-            emitStart: emitStart,
-            emitEnd: emitEnd,
-            changeEmitSourcePos: changeEmitSourcePos,
-            getText: getText,
-            getSourceMappingURL: getSourceMappingURL,
-            initialize: initialize,
-            reset: reset
-        };
-        function initialize(filePath, sourceMapFilePath, sourceFiles, isBundledEmit) {
-            if (sourceMapData) {
-                reset();
-            }
-            currentSourceFile = undefined;
-            // Current source map file and its index in the sources list
-            sourceMapSourceIndex = -1;
-            // Last recorded and encoded spans
-            lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = defaultLastEncodedSourceMapSpan;
-            lastEncodedNameIndex = 0;
-            // Initialize source map data
-            sourceMapData = {
-                sourceMapFilePath: sourceMapFilePath,
-                jsSourceMappingURL: !compilerOptions.inlineSourceMap ? ts.getBaseFileName(ts.normalizeSlashes(sourceMapFilePath)) : undefined,
-                sourceMapFile: ts.getBaseFileName(ts.normalizeSlashes(filePath)),
-                sourceMapSourceRoot: compilerOptions.sourceRoot || "",
-                sourceMapSources: [],
-                inputSourceFileNames: [],
-                sourceMapNames: [],
-                sourceMapMappings: "",
-                sourceMapSourcesContent: compilerOptions.inlineSources ? [] : undefined,
-                sourceMapDecodedMappings: []
-            };
-            // Normalize source root and make sure it has trailing "/" so that it can be used to combine paths with the
-            // relative paths of the sources list in the sourcemap
-            sourceMapData.sourceMapSourceRoot = ts.normalizeSlashes(sourceMapData.sourceMapSourceRoot);
-            if (sourceMapData.sourceMapSourceRoot.length && sourceMapData.sourceMapSourceRoot.charCodeAt(sourceMapData.sourceMapSourceRoot.length - 1) !== 47 /* slash */) {
-                sourceMapData.sourceMapSourceRoot += ts.directorySeparator;
-            }
-            if (compilerOptions.mapRoot) {
-                sourceMapDir = ts.normalizeSlashes(compilerOptions.mapRoot);
-                if (!isBundledEmit) {
-                    ts.Debug.assert(sourceFiles.length === 1);
-                    // For modules or multiple emit files the mapRoot will have directory structure like the sources
-                    // So if src\a.ts and src\lib\b.ts are compiled together user would be moving the maps into mapRoot\a.js.map and mapRoot\lib\b.js.map
-                    sourceMapDir = ts.getDirectoryPath(ts.getSourceFilePathInNewDir(sourceFiles[0], host, sourceMapDir));
-                }
-                if (!ts.isRootedDiskPath(sourceMapDir) && !ts.isUrl(sourceMapDir)) {
-                    // The relative paths are relative to the common directory
-                    sourceMapDir = ts.combinePaths(host.getCommonSourceDirectory(), sourceMapDir);
-                    sourceMapData.jsSourceMappingURL = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizePath(filePath)), // get the relative sourceMapDir path based on jsFilePath
-                    ts.combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL), // this is where user expects to see sourceMap
-                    host.getCurrentDirectory(), host.getCanonicalFileName, 
-                    /*isAbsolutePathAnUrl*/ true);
-                }
-                else {
-                    sourceMapData.jsSourceMappingURL = ts.combinePaths(sourceMapDir, sourceMapData.jsSourceMappingURL);
-                }
-            }
-            else {
-                sourceMapDir = ts.getDirectoryPath(ts.normalizePath(filePath));
-            }
-        }
-        function reset() {
-            currentSourceFile = undefined;
-            sourceMapDir = undefined;
-            sourceMapSourceIndex = undefined;
-            lastRecordedSourceMapSpan = undefined;
-            lastEncodedSourceMapSpan = undefined;
-            lastEncodedNameIndex = undefined;
-            sourceMapData = undefined;
-        }
-        function updateLastEncodedAndRecordedSpans() {
-            if (modifyLastSourcePos) {
-                // Reset the source pos
-                modifyLastSourcePos = false;
-                // Change Last recorded Map with last encoded emit line and character
-                lastRecordedSourceMapSpan.emittedLine = lastEncodedSourceMapSpan.emittedLine;
-                lastRecordedSourceMapSpan.emittedColumn = lastEncodedSourceMapSpan.emittedColumn;
-                // Pop sourceMapDecodedMappings to remove last entry
-                sourceMapData.sourceMapDecodedMappings.pop();
-                // Point the lastEncodedSourceMapSpace to the previous encoded sourceMapSpan
-                // If the list is empty which indicates that we are at the beginning of the file,
-                // we have to reset it to default value (same value when we first initialize sourceMapWriter)
-                lastEncodedSourceMapSpan = sourceMapData.sourceMapDecodedMappings.length ?
-                    sourceMapData.sourceMapDecodedMappings[sourceMapData.sourceMapDecodedMappings.length - 1] :
-                    defaultLastEncodedSourceMapSpan;
-                // TODO: Update lastEncodedNameIndex
-                // Since we dont support this any more, lets not worry about it right now.
-                // When we start supporting nameIndex, we will get back to this
-                // Change the encoded source map
-                var sourceMapMappings = sourceMapData.sourceMapMappings;
-                var lenthToSet = sourceMapMappings.length - 1;
-                for (; lenthToSet >= 0; lenthToSet--) {
-                    var currentChar = sourceMapMappings.charAt(lenthToSet);
-                    if (currentChar === ",") {
-                        // Separator for the entry found
-                        break;
-                    }
-                    if (currentChar === ";" && lenthToSet !== 0 && sourceMapMappings.charAt(lenthToSet - 1) !== ";") {
-                        // Last line separator found
-                        break;
-                    }
-                }
-                sourceMapData.sourceMapMappings = sourceMapMappings.substr(0, Math.max(0, lenthToSet));
-            }
-        }
-        // Encoding for sourcemap span
-        function encodeLastRecordedSourceMapSpan() {
-            if (!lastRecordedSourceMapSpan || lastRecordedSourceMapSpan === lastEncodedSourceMapSpan) {
-                return;
-            }
-            var prevEncodedEmittedColumn = lastEncodedSourceMapSpan.emittedColumn;
-            // Line/Comma delimiters
-            if (lastEncodedSourceMapSpan.emittedLine === lastRecordedSourceMapSpan.emittedLine) {
-                // Emit comma to separate the entry
-                if (sourceMapData.sourceMapMappings) {
-                    sourceMapData.sourceMapMappings += ",";
-                }
-            }
-            else {
-                // Emit line delimiters
-                for (var encodedLine = lastEncodedSourceMapSpan.emittedLine; encodedLine < lastRecordedSourceMapSpan.emittedLine; encodedLine++) {
-                    sourceMapData.sourceMapMappings += ";";
-                }
-                prevEncodedEmittedColumn = 1;
-            }
-            // 1. Relative Column 0 based
-            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.emittedColumn - prevEncodedEmittedColumn);
-            // 2. Relative sourceIndex
-            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceIndex - lastEncodedSourceMapSpan.sourceIndex);
-            // 3. Relative sourceLine 0 based
-            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceLine - lastEncodedSourceMapSpan.sourceLine);
-            // 4. Relative sourceColumn 0 based
-            sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.sourceColumn - lastEncodedSourceMapSpan.sourceColumn);
-            // 5. Relative namePosition 0 based
-            if (lastRecordedSourceMapSpan.nameIndex >= 0) {
-                ts.Debug.assert(false, "We do not support name index right now, Make sure to update updateLastEncodedAndRecordedSpans when we start using this");
-                sourceMapData.sourceMapMappings += base64VLQFormatEncode(lastRecordedSourceMapSpan.nameIndex - lastEncodedNameIndex);
-                lastEncodedNameIndex = lastRecordedSourceMapSpan.nameIndex;
-            }
-            lastEncodedSourceMapSpan = lastRecordedSourceMapSpan;
-            sourceMapData.sourceMapDecodedMappings.push(lastEncodedSourceMapSpan);
-        }
-        function emitPos(pos) {
-            if (pos === -1) {
-                return;
-            }
-            var sourceLinePos = ts.getLineAndCharacterOfPosition(currentSourceFile, pos);
-            // Convert the location to be one-based.
-            sourceLinePos.line++;
-            sourceLinePos.character++;
-            var emittedLine = writer.getLine();
-            var emittedColumn = writer.getColumn();
-            // If this location wasn't recorded or the location in source is going backwards, record the span
-            if (!lastRecordedSourceMapSpan ||
-                lastRecordedSourceMapSpan.emittedLine !== emittedLine ||
-                lastRecordedSourceMapSpan.emittedColumn !== emittedColumn ||
-                (lastRecordedSourceMapSpan.sourceIndex === sourceMapSourceIndex &&
-                    (lastRecordedSourceMapSpan.sourceLine > sourceLinePos.line ||
-                        (lastRecordedSourceMapSpan.sourceLine === sourceLinePos.line && lastRecordedSourceMapSpan.sourceColumn > sourceLinePos.character)))) {
-                // Encode the last recordedSpan before assigning new
-                encodeLastRecordedSourceMapSpan();
-                // New span
-                lastRecordedSourceMapSpan = {
-                    emittedLine: emittedLine,
-                    emittedColumn: emittedColumn,
-                    sourceLine: sourceLinePos.line,
-                    sourceColumn: sourceLinePos.character,
-                    sourceIndex: sourceMapSourceIndex
-                };
-                stopOverridingSpan = false;
-            }
-            else if (!stopOverridingSpan) {
-                // Take the new pos instead since there is no change in emittedLine and column since last location
-                lastRecordedSourceMapSpan.sourceLine = sourceLinePos.line;
-                lastRecordedSourceMapSpan.sourceColumn = sourceLinePos.character;
-                lastRecordedSourceMapSpan.sourceIndex = sourceMapSourceIndex;
-            }
-            updateLastEncodedAndRecordedSpans();
-        }
-        function getStartPos(range) {
-            var rangeHasDecorators = !!range.decorators;
-            return range.pos !== -1 ? ts.skipTrivia(currentSourceFile.text, rangeHasDecorators ? range.decorators.end : range.pos) : -1;
-        }
-        function emitStart(range) {
-            emitPos(getStartPos(range));
-        }
-        function emitEnd(range, stopOverridingEnd) {
-            emitPos(range.end);
-            stopOverridingSpan = stopOverridingEnd;
-        }
-        function changeEmitSourcePos() {
-            ts.Debug.assert(!modifyLastSourcePos);
-            modifyLastSourcePos = true;
-        }
-        function setSourceFile(sourceFile) {
-            currentSourceFile = sourceFile;
-            // Add the file to tsFilePaths
-            // If sourceroot option: Use the relative path corresponding to the common directory path
-            // otherwise source locations relative to map file location
-            var sourcesDirectoryPath = compilerOptions.sourceRoot ? host.getCommonSourceDirectory() : sourceMapDir;
-            var source = ts.getRelativePathToDirectoryOrUrl(sourcesDirectoryPath, currentSourceFile.fileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
-            /*isAbsolutePathAnUrl*/ true);
-            sourceMapSourceIndex = ts.indexOf(sourceMapData.sourceMapSources, source);
-            if (sourceMapSourceIndex === -1) {
-                sourceMapSourceIndex = sourceMapData.sourceMapSources.length;
-                sourceMapData.sourceMapSources.push(source);
-                // The one that can be used from program to get the actual source file
-                sourceMapData.inputSourceFileNames.push(sourceFile.fileName);
-                if (compilerOptions.inlineSources) {
-                    sourceMapData.sourceMapSourcesContent.push(sourceFile.text);
-                }
-            }
-        }
-        function getText() {
-            encodeLastRecordedSourceMapSpan();
-            return ts.stringify({
-                version: 3,
-                file: sourceMapData.sourceMapFile,
-                sourceRoot: sourceMapData.sourceMapSourceRoot,
-                sources: sourceMapData.sourceMapSources,
-                names: sourceMapData.sourceMapNames,
-                mappings: sourceMapData.sourceMapMappings,
-                sourcesContent: sourceMapData.sourceMapSourcesContent
-            });
-        }
-        function getSourceMappingURL() {
-            if (compilerOptions.inlineSourceMap) {
-                // Encode the sourceMap into the sourceMap url
-                var base64SourceMapText = ts.convertToBase64(getText());
-                return sourceMapData.jsSourceMappingURL = "data:application/json;base64," + base64SourceMapText;
-            }
-            else {
-                return sourceMapData.jsSourceMappingURL;
-            }
-        }
-    }
-    ts.createSourceMapWriter = createSourceMapWriter;
-    var base64Chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-    function base64FormatEncode(inValue) {
-        if (inValue < 64) {
-            return base64Chars.charAt(inValue);
-        }
-        throw TypeError(inValue + ": not a 64 based value");
-    }
-    function base64VLQFormatEncode(inValue) {
-        // Add a new least significant bit that has the sign of the value.
-        // if negative number the least significant bit that gets added to the number has value 1
-        // else least significant bit value that gets added is 0
-        // eg. -1 changes to binary : 01 [1] => 3
-        //     +1 changes to binary : 01 [0] => 2
-        if (inValue < 0) {
-            inValue = ((-inValue) << 1) + 1;
-        }
-        else {
-            inValue = inValue << 1;
-        }
-        // Encode 5 bits at a time starting from least significant bits
-        var encodedStr = "";
-        do {
-            var currentDigit = inValue & 31; // 11111
-            inValue = inValue >> 5;
-            if (inValue > 0) {
-                // There are still more digits to decode, set the msb (6th bit)
-                currentDigit = currentDigit | 32;
-            }
-            encodedStr = encodedStr + base64FormatEncode(currentDigit);
-        } while (inValue > 0);
-        return encodedStr;
-    }
-})(ts || (ts = {}));
-/// <reference path="checker.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    function getDeclarationDiagnostics(host, resolver, targetSourceFile) {
-        var declarationDiagnostics = ts.createDiagnosticCollection();
-        ts.forEachExpectedEmitFile(host, getDeclarationDiagnosticsFromFile, targetSourceFile);
-        return declarationDiagnostics.getDiagnostics(targetSourceFile ? targetSourceFile.fileName : undefined);
-        function getDeclarationDiagnosticsFromFile(_a, sources, isBundledEmit) {
-            var declarationFilePath = _a.declarationFilePath;
-            emitDeclarations(host, resolver, declarationDiagnostics, declarationFilePath, sources, isBundledEmit);
-        }
-    }
-    ts.getDeclarationDiagnostics = getDeclarationDiagnostics;
-    function emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit) {
-        var newLine = host.getNewLine();
-        var compilerOptions = host.getCompilerOptions();
-        var write;
-        var writeLine;
-        var increaseIndent;
-        var decreaseIndent;
-        var writeTextOfNode;
-        var writer;
-        createAndSetNewTextWriterWithSymbolWriter();
-        var enclosingDeclaration;
-        var resultHasExternalModuleIndicator;
-        var currentText;
-        var currentLineMap;
-        var currentIdentifiers;
-        var isCurrentFileExternalModule;
-        var reportedDeclarationError = false;
-        var errorNameNode;
-        var emitJsDocComments = compilerOptions.removeComments ? function (declaration) { } : writeJsDocComments;
-        var emit = compilerOptions.stripInternal ? stripInternal : emitNode;
-        var noDeclare;
-        var moduleElementDeclarationEmitInfo = [];
-        var asynchronousSubModuleDeclarationEmitInfo;
-        // Contains the reference paths that needs to go in the declaration file.
-        // Collecting this separately because reference paths need to be first thing in the declaration file
-        // and we could be collecting these paths from multiple files into single one with --out option
-        var referencesOutput = "";
-        var usedTypeDirectiveReferences;
-        // Emit references corresponding to each file
-        var emittedReferencedFiles = [];
-        var addedGlobalFileReference = false;
-        var allSourcesModuleElementDeclarationEmitInfo = [];
-        ts.forEach(sourceFiles, function (sourceFile) {
-            // Dont emit for javascript file
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                return;
-            }
-            // Check what references need to be added
-            if (!compilerOptions.noResolve) {
-                ts.forEach(sourceFile.referencedFiles, function (fileReference) {
-                    var referencedFile = ts.tryResolveScriptReference(host, sourceFile, fileReference);
-                    // Emit reference in dts, if the file reference was not already emitted
-                    if (referencedFile && !ts.contains(emittedReferencedFiles, referencedFile)) {
-                        // Add a reference to generated dts file,
-                        // global file reference is added only
-                        //  - if it is not bundled emit (because otherwise it would be self reference)
-                        //  - and it is not already added
-                        if (writeReferencePath(referencedFile, !isBundledEmit && !addedGlobalFileReference)) {
-                            addedGlobalFileReference = true;
-                        }
-                        emittedReferencedFiles.push(referencedFile);
-                    }
-                });
-            }
-            resultHasExternalModuleIndicator = false;
-            if (!isBundledEmit || !ts.isExternalModule(sourceFile)) {
-                noDeclare = false;
-                emitSourceFile(sourceFile);
-            }
-            else if (ts.isExternalModule(sourceFile)) {
-                noDeclare = true;
-                write("declare module \"" + ts.getResolvedExternalModuleName(host, sourceFile) + "\" {");
-                writeLine();
-                increaseIndent();
-                emitSourceFile(sourceFile);
-                decreaseIndent();
-                write("}");
-                writeLine();
-            }
-            // create asynchronous output for the importDeclarations
-            if (moduleElementDeclarationEmitInfo.length) {
-                var oldWriter = writer;
-                ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
-                    if (aliasEmitInfo.isVisible && !aliasEmitInfo.asynchronousOutput) {
-                        ts.Debug.assert(aliasEmitInfo.node.kind === 230 /* ImportDeclaration */);
-                        createAndSetNewTextWriterWithSymbolWriter();
-                        ts.Debug.assert(aliasEmitInfo.indent === 0 || (aliasEmitInfo.indent === 1 && isBundledEmit));
-                        for (var i = 0; i < aliasEmitInfo.indent; i++) {
-                            increaseIndent();
-                        }
-                        writeImportDeclaration(aliasEmitInfo.node);
-                        aliasEmitInfo.asynchronousOutput = writer.getText();
-                        for (var i = 0; i < aliasEmitInfo.indent; i++) {
-                            decreaseIndent();
-                        }
-                    }
-                });
-                setWriter(oldWriter);
-                allSourcesModuleElementDeclarationEmitInfo = allSourcesModuleElementDeclarationEmitInfo.concat(moduleElementDeclarationEmitInfo);
-                moduleElementDeclarationEmitInfo = [];
-            }
-            if (!isBundledEmit && ts.isExternalModule(sourceFile) && sourceFile.moduleAugmentations.length && !resultHasExternalModuleIndicator) {
-                // if file was external module with augmentations - this fact should be preserved in .d.ts as well.
-                // in case if we didn't write any external module specifiers in .d.ts we need to emit something
-                // that will force compiler to think that this file is an external module - 'export {}' is a reasonable choice here.
-                write("export {};");
-                writeLine();
-            }
-        });
-        if (usedTypeDirectiveReferences) {
-            for (var directive in usedTypeDirectiveReferences) {
-                if (ts.hasProperty(usedTypeDirectiveReferences, directive)) {
-                    referencesOutput += "/// <reference types=\"" + directive + "\" />" + newLine;
-                }
-            }
-        }
-        return {
-            reportedDeclarationError: reportedDeclarationError,
-            moduleElementDeclarationEmitInfo: allSourcesModuleElementDeclarationEmitInfo,
-            synchronousDeclarationOutput: writer.getText(),
-            referencesOutput: referencesOutput
-        };
-        function hasInternalAnnotation(range) {
-            var comment = currentText.substring(range.pos, range.end);
-            return comment.indexOf("@internal") >= 0;
-        }
-        function stripInternal(node) {
-            if (node) {
-                var leadingCommentRanges = ts.getLeadingCommentRanges(currentText, node.pos);
-                if (ts.forEach(leadingCommentRanges, hasInternalAnnotation)) {
-                    return;
-                }
-                emitNode(node);
-            }
-        }
-        function createAndSetNewTextWriterWithSymbolWriter() {
-            var writer = ts.createTextWriter(newLine);
-            writer.trackSymbol = trackSymbol;
-            writer.reportInaccessibleThisError = reportInaccessibleThisError;
-            writer.writeKeyword = writer.write;
-            writer.writeOperator = writer.write;
-            writer.writePunctuation = writer.write;
-            writer.writeSpace = writer.write;
-            writer.writeStringLiteral = writer.writeLiteral;
-            writer.writeParameter = writer.write;
-            writer.writeSymbol = writer.write;
-            setWriter(writer);
-        }
-        function setWriter(newWriter) {
-            writer = newWriter;
-            write = newWriter.write;
-            writeTextOfNode = newWriter.writeTextOfNode;
-            writeLine = newWriter.writeLine;
-            increaseIndent = newWriter.increaseIndent;
-            decreaseIndent = newWriter.decreaseIndent;
-        }
-        function writeAsynchronousModuleElements(nodes) {
-            var oldWriter = writer;
-            ts.forEach(nodes, function (declaration) {
-                var nodeToCheck;
-                if (declaration.kind === 218 /* VariableDeclaration */) {
-                    nodeToCheck = declaration.parent.parent;
-                }
-                else if (declaration.kind === 233 /* NamedImports */ || declaration.kind === 234 /* ImportSpecifier */ || declaration.kind === 231 /* ImportClause */) {
-                    ts.Debug.fail("We should be getting ImportDeclaration instead to write");
-                }
-                else {
-                    nodeToCheck = declaration;
-                }
-                var moduleElementEmitInfo = ts.forEach(moduleElementDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
-                if (!moduleElementEmitInfo && asynchronousSubModuleDeclarationEmitInfo) {
-                    moduleElementEmitInfo = ts.forEach(asynchronousSubModuleDeclarationEmitInfo, function (declEmitInfo) { return declEmitInfo.node === nodeToCheck ? declEmitInfo : undefined; });
-                }
-                // If the alias was marked as not visible when we saw its declaration, we would have saved the aliasEmitInfo, but if we haven't yet visited the alias declaration
-                // then we don't need to write it at this point. We will write it when we actually see its declaration
-                // Eg.
-                // export function bar(a: foo.Foo) { }
-                // import foo = require("foo");
-                // Writing of function bar would mark alias declaration foo as visible but we haven't yet visited that declaration so do nothing,
-                // we would write alias foo declaration when we visit it since it would now be marked as visible
-                if (moduleElementEmitInfo) {
-                    if (moduleElementEmitInfo.node.kind === 230 /* ImportDeclaration */) {
-                        // we have to create asynchronous output only after we have collected complete information
-                        // because it is possible to enable multiple bindings as asynchronously visible
-                        moduleElementEmitInfo.isVisible = true;
-                    }
-                    else {
-                        createAndSetNewTextWriterWithSymbolWriter();
-                        for (var declarationIndent = moduleElementEmitInfo.indent; declarationIndent; declarationIndent--) {
-                            increaseIndent();
-                        }
-                        if (nodeToCheck.kind === 225 /* ModuleDeclaration */) {
-                            ts.Debug.assert(asynchronousSubModuleDeclarationEmitInfo === undefined);
-                            asynchronousSubModuleDeclarationEmitInfo = [];
-                        }
-                        writeModuleElement(nodeToCheck);
-                        if (nodeToCheck.kind === 225 /* ModuleDeclaration */) {
-                            moduleElementEmitInfo.subModuleElementDeclarationEmitInfo = asynchronousSubModuleDeclarationEmitInfo;
-                            asynchronousSubModuleDeclarationEmitInfo = undefined;
-                        }
-                        moduleElementEmitInfo.asynchronousOutput = writer.getText();
-                    }
-                }
-            });
-            setWriter(oldWriter);
-        }
-        function recordTypeReferenceDirectivesIfNecessary(typeReferenceDirectives) {
-            if (!typeReferenceDirectives) {
-                return;
-            }
-            if (!usedTypeDirectiveReferences) {
-                usedTypeDirectiveReferences = {};
-            }
-            for (var _i = 0, typeReferenceDirectives_1 = typeReferenceDirectives; _i < typeReferenceDirectives_1.length; _i++) {
-                var directive = typeReferenceDirectives_1[_i];
-                if (!ts.hasProperty(usedTypeDirectiveReferences, directive)) {
-                    usedTypeDirectiveReferences[directive] = directive;
-                }
-            }
-        }
-        function handleSymbolAccessibilityError(symbolAccessibilityResult) {
-            if (symbolAccessibilityResult.accessibility === 0 /* Accessible */) {
-                // write the aliases
-                if (symbolAccessibilityResult && symbolAccessibilityResult.aliasesToMakeVisible) {
-                    writeAsynchronousModuleElements(symbolAccessibilityResult.aliasesToMakeVisible);
-                }
-            }
-            else {
-                // Report error
-                reportedDeclarationError = true;
-                var errorInfo = writer.getSymbolAccessibilityDiagnostic(symbolAccessibilityResult);
-                if (errorInfo) {
-                    if (errorInfo.typeName) {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, ts.getTextOfNodeFromSourceText(currentText, errorInfo.typeName), symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
-                    }
-                    else {
-                        emitterDiagnostics.add(ts.createDiagnosticForNode(symbolAccessibilityResult.errorNode || errorInfo.errorNode, errorInfo.diagnosticMessage, symbolAccessibilityResult.errorSymbolName, symbolAccessibilityResult.errorModuleName));
-                    }
-                }
-            }
-        }
-        function trackSymbol(symbol, enclosingDeclaration, meaning) {
-            handleSymbolAccessibilityError(resolver.isSymbolAccessible(symbol, enclosingDeclaration, meaning));
-            recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForSymbol(symbol, meaning));
-        }
-        function reportInaccessibleThisError() {
-            if (errorNameNode) {
-                reportedDeclarationError = true;
-                emitterDiagnostics.add(ts.createDiagnosticForNode(errorNameNode, ts.Diagnostics.The_inferred_type_of_0_references_an_inaccessible_this_type_A_type_annotation_is_necessary, ts.declarationNameToString(errorNameNode)));
-            }
-        }
-        function writeTypeOfDeclaration(declaration, type, getSymbolAccessibilityDiagnostic) {
-            writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic;
-            write(": ");
-            if (type) {
-                // Write the type
-                emitType(type);
-            }
-            else {
-                errorNameNode = declaration.name;
-                resolver.writeTypeOfDeclaration(declaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
-                errorNameNode = undefined;
-            }
-        }
-        function writeReturnTypeAtSignature(signature, getSymbolAccessibilityDiagnostic) {
-            writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic;
-            write(": ");
-            if (signature.type) {
-                // Write the type
-                emitType(signature.type);
-            }
-            else {
-                errorNameNode = signature.name;
-                resolver.writeReturnTypeOfSignatureDeclaration(signature, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
-                errorNameNode = undefined;
-            }
-        }
-        function emitLines(nodes) {
-            for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
-                var node = nodes_2[_i];
-                emit(node);
-            }
-        }
-        function emitSeparatedList(nodes, separator, eachNodeEmitFn, canEmitFn) {
-            var currentWriterPos = writer.getTextPos();
-            for (var _i = 0, nodes_3 = nodes; _i < nodes_3.length; _i++) {
-                var node = nodes_3[_i];
-                if (!canEmitFn || canEmitFn(node)) {
-                    if (currentWriterPos !== writer.getTextPos()) {
-                        write(separator);
-                    }
-                    currentWriterPos = writer.getTextPos();
-                    eachNodeEmitFn(node);
-                }
-            }
-        }
-        function emitCommaList(nodes, eachNodeEmitFn, canEmitFn) {
-            emitSeparatedList(nodes, ", ", eachNodeEmitFn, canEmitFn);
-        }
-        function writeJsDocComments(declaration) {
-            if (declaration) {
-                var jsDocComments = ts.getJsDocCommentsFromText(declaration, currentText);
-                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, declaration, jsDocComments);
-                // jsDoc comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentText, currentLineMap, writer, jsDocComments, /*trailingSeparator*/ true, newLine, ts.writeCommentRange);
-            }
-        }
-        function emitTypeWithNewGetSymbolAccessibilityDiagnostic(type, getSymbolAccessibilityDiagnostic) {
-            writer.getSymbolAccessibilityDiagnostic = getSymbolAccessibilityDiagnostic;
-            emitType(type);
-        }
-        function emitType(type) {
-            switch (type.kind) {
-                case 117 /* AnyKeyword */:
-                case 132 /* StringKeyword */:
-                case 130 /* NumberKeyword */:
-                case 120 /* BooleanKeyword */:
-                case 133 /* SymbolKeyword */:
-                case 103 /* VoidKeyword */:
-                case 135 /* UndefinedKeyword */:
-                case 93 /* NullKeyword */:
-                case 127 /* NeverKeyword */:
-                case 165 /* ThisType */:
-                case 166 /* StringLiteralType */:
-                    return writeTextOfNode(currentText, type);
-                case 194 /* ExpressionWithTypeArguments */:
-                    return emitExpressionWithTypeArguments(type);
-                case 155 /* TypeReference */:
-                    return emitTypeReference(type);
-                case 158 /* TypeQuery */:
-                    return emitTypeQuery(type);
-                case 160 /* ArrayType */:
-                    return emitArrayType(type);
-                case 161 /* TupleType */:
-                    return emitTupleType(type);
-                case 162 /* UnionType */:
-                    return emitUnionType(type);
-                case 163 /* IntersectionType */:
-                    return emitIntersectionType(type);
-                case 164 /* ParenthesizedType */:
-                    return emitParenType(type);
-                case 156 /* FunctionType */:
-                case 157 /* ConstructorType */:
-                    return emitSignatureDeclarationWithJsDocComments(type);
-                case 159 /* TypeLiteral */:
-                    return emitTypeLiteral(type);
-                case 69 /* Identifier */:
-                    return emitEntityName(type);
-                case 139 /* QualifiedName */:
-                    return emitEntityName(type);
-                case 154 /* TypePredicate */:
-                    return emitTypePredicate(type);
-            }
-            function writeEntityName(entityName) {
-                if (entityName.kind === 69 /* Identifier */) {
-                    writeTextOfNode(currentText, entityName);
-                }
-                else {
-                    var left = entityName.kind === 139 /* QualifiedName */ ? entityName.left : entityName.expression;
-                    var right = entityName.kind === 139 /* QualifiedName */ ? entityName.right : entityName.name;
-                    writeEntityName(left);
-                    write(".");
-                    writeTextOfNode(currentText, right);
-                }
-            }
-            function emitEntityName(entityName) {
-                var visibilityResult = resolver.isEntityNameVisible(entityName, 
-                // Aliases can be written asynchronously so use correct enclosing declaration
-                entityName.parent.kind === 229 /* ImportEqualsDeclaration */ ? entityName.parent : enclosingDeclaration);
-                handleSymbolAccessibilityError(visibilityResult);
-                recordTypeReferenceDirectivesIfNecessary(resolver.getTypeReferenceDirectivesForEntityName(entityName));
-                writeEntityName(entityName);
-            }
-            function emitExpressionWithTypeArguments(node) {
-                if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    ts.Debug.assert(node.expression.kind === 69 /* Identifier */ || node.expression.kind === 172 /* PropertyAccessExpression */);
-                    emitEntityName(node.expression);
-                    if (node.typeArguments) {
-                        write("<");
-                        emitCommaList(node.typeArguments, emitType);
-                        write(">");
-                    }
-                }
-            }
-            function emitTypeReference(type) {
-                emitEntityName(type.typeName);
-                if (type.typeArguments) {
-                    write("<");
-                    emitCommaList(type.typeArguments, emitType);
-                    write(">");
-                }
-            }
-            function emitTypePredicate(type) {
-                writeTextOfNode(currentText, type.parameterName);
-                write(" is ");
-                emitType(type.type);
-            }
-            function emitTypeQuery(type) {
-                write("typeof ");
-                emitEntityName(type.exprName);
-            }
-            function emitArrayType(type) {
-                emitType(type.elementType);
-                write("[]");
-            }
-            function emitTupleType(type) {
-                write("[");
-                emitCommaList(type.elementTypes, emitType);
-                write("]");
-            }
-            function emitUnionType(type) {
-                emitSeparatedList(type.types, " | ", emitType);
-            }
-            function emitIntersectionType(type) {
-                emitSeparatedList(type.types, " & ", emitType);
-            }
-            function emitParenType(type) {
-                write("(");
-                emitType(type.type);
-                write(")");
-            }
-            function emitTypeLiteral(type) {
-                write("{");
-                if (type.members.length) {
-                    writeLine();
-                    increaseIndent();
-                    // write members
-                    emitLines(type.members);
-                    decreaseIndent();
-                }
-                write("}");
-            }
-        }
-        function emitSourceFile(node) {
-            currentText = node.text;
-            currentLineMap = ts.getLineStarts(node);
-            currentIdentifiers = node.identifiers;
-            isCurrentFileExternalModule = ts.isExternalModule(node);
-            enclosingDeclaration = node;
-            ts.emitDetachedComments(currentText, currentLineMap, writer, ts.writeCommentRange, node, newLine, true /* remove comments */);
-            emitLines(node.statements);
-        }
-        // Return a temp variable name to be used in `export default` statements.
-        // The temp name will be of the form _default_counter.
-        // Note that export default is only allowed at most once in a module, so we
-        // do not need to keep track of created temp names.
-        function getExportDefaultTempVariableName() {
-            var baseName = "_default";
-            if (!ts.hasProperty(currentIdentifiers, baseName)) {
-                return baseName;
-            }
-            var count = 0;
-            while (true) {
-                count++;
-                var name_23 = baseName + "_" + count;
-                if (!ts.hasProperty(currentIdentifiers, name_23)) {
-                    return name_23;
-                }
-            }
-        }
-        function emitExportAssignment(node) {
-            if (node.expression.kind === 69 /* Identifier */) {
-                write(node.isExportEquals ? "export = " : "export default ");
-                writeTextOfNode(currentText, node.expression);
-            }
-            else {
-                // Expression
-                var tempVarName = getExportDefaultTempVariableName();
-                if (!noDeclare) {
-                    write("declare ");
-                }
-                write("var ");
-                write(tempVarName);
-                write(": ");
-                writer.getSymbolAccessibilityDiagnostic = getDefaultExportAccessibilityDiagnostic;
-                resolver.writeTypeOfExpression(node.expression, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
-                write(";");
-                writeLine();
-                write(node.isExportEquals ? "export = " : "export default ");
-                write(tempVarName);
-            }
-            write(";");
-            writeLine();
-            // Make all the declarations visible for the export name
-            if (node.expression.kind === 69 /* Identifier */) {
-                var nodes = resolver.collectLinkedAliases(node.expression);
-                // write each of these declarations asynchronously
-                writeAsynchronousModuleElements(nodes);
-            }
-            function getDefaultExportAccessibilityDiagnostic(diagnostic) {
-                return {
-                    diagnosticMessage: ts.Diagnostics.Default_export_of_the_module_has_or_is_using_private_name_0,
-                    errorNode: node
-                };
-            }
-        }
-        function isModuleElementVisible(node) {
-            return resolver.isDeclarationVisible(node);
-        }
-        function emitModuleElement(node, isModuleElementVisible) {
-            if (isModuleElementVisible) {
-                writeModuleElement(node);
-            }
-            else if (node.kind === 229 /* ImportEqualsDeclaration */ ||
-                (node.parent.kind === 256 /* SourceFile */ && isCurrentFileExternalModule)) {
-                var isVisible = void 0;
-                if (asynchronousSubModuleDeclarationEmitInfo && node.parent.kind !== 256 /* SourceFile */) {
-                    // Import declaration of another module that is visited async so lets put it in right spot
-                    asynchronousSubModuleDeclarationEmitInfo.push({
-                        node: node,
-                        outputPos: writer.getTextPos(),
-                        indent: writer.getIndent(),
-                        isVisible: isVisible
-                    });
-                }
-                else {
-                    if (node.kind === 230 /* ImportDeclaration */) {
-                        var importDeclaration = node;
-                        if (importDeclaration.importClause) {
-                            isVisible = (importDeclaration.importClause.name && resolver.isDeclarationVisible(importDeclaration.importClause)) ||
-                                isVisibleNamedBinding(importDeclaration.importClause.namedBindings);
-                        }
-                    }
-                    moduleElementDeclarationEmitInfo.push({
-                        node: node,
-                        outputPos: writer.getTextPos(),
-                        indent: writer.getIndent(),
-                        isVisible: isVisible
-                    });
-                }
-            }
-        }
-        function writeModuleElement(node) {
-            switch (node.kind) {
-                case 220 /* FunctionDeclaration */:
-                    return writeFunctionDeclaration(node);
-                case 200 /* VariableStatement */:
-                    return writeVariableStatement(node);
-                case 222 /* InterfaceDeclaration */:
-                    return writeInterfaceDeclaration(node);
-                case 221 /* ClassDeclaration */:
-                    return writeClassDeclaration(node);
-                case 223 /* TypeAliasDeclaration */:
-                    return writeTypeAliasDeclaration(node);
-                case 224 /* EnumDeclaration */:
-                    return writeEnumDeclaration(node);
-                case 225 /* ModuleDeclaration */:
-                    return writeModuleDeclaration(node);
-                case 229 /* ImportEqualsDeclaration */:
-                    return writeImportEqualsDeclaration(node);
-                case 230 /* ImportDeclaration */:
-                    return writeImportDeclaration(node);
-                default:
-                    ts.Debug.fail("Unknown symbol kind");
-            }
-        }
-        function emitModuleElementDeclarationFlags(node) {
-            // If the node is parented in the current source file we need to emit export declare or just export
-            if (node.parent.kind === 256 /* SourceFile */) {
-                // If the node is exported
-                if (node.flags & 1 /* Export */) {
-                    write("export ");
-                }
-                if (node.flags & 512 /* Default */) {
-                    write("default ");
-                }
-                else if (node.kind !== 222 /* InterfaceDeclaration */ && !noDeclare) {
-                    write("declare ");
-                }
-            }
-        }
-        function emitClassMemberDeclarationFlags(flags) {
-            if (flags & 8 /* Private */) {
-                write("private ");
-            }
-            else if (flags & 16 /* Protected */) {
-                write("protected ");
-            }
-            if (flags & 32 /* Static */) {
-                write("static ");
-            }
-            if (flags & 64 /* Readonly */) {
-                write("readonly ");
-            }
-            if (flags & 128 /* Abstract */) {
-                write("abstract ");
-            }
-        }
-        function writeImportEqualsDeclaration(node) {
-            // note usage of writer. methods instead of aliases created, just to make sure we are using
-            // correct writer especially to handle asynchronous alias writing
-            emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
-                write("export ");
-            }
-            write("import ");
-            writeTextOfNode(currentText, node.name);
-            write(" = ");
-            if (ts.isInternalModuleImportEqualsDeclaration(node)) {
-                emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.moduleReference, getImportEntityNameVisibilityError);
-                write(";");
-            }
-            else {
-                write("require(");
-                emitExternalModuleSpecifier(node);
-                write(");");
-            }
-            writer.writeLine();
-            function getImportEntityNameVisibilityError(symbolAccessibilityResult) {
-                return {
-                    diagnosticMessage: ts.Diagnostics.Import_declaration_0_is_using_private_name_1,
-                    errorNode: node,
-                    typeName: node.name
-                };
-            }
-        }
-        function isVisibleNamedBinding(namedBindings) {
-            if (namedBindings) {
-                if (namedBindings.kind === 232 /* NamespaceImport */) {
-                    return resolver.isDeclarationVisible(namedBindings);
-                }
-                else {
-                    return ts.forEach(namedBindings.elements, function (namedImport) { return resolver.isDeclarationVisible(namedImport); });
-                }
-            }
-        }
-        function writeImportDeclaration(node) {
-            emitJsDocComments(node);
-            if (node.flags & 1 /* Export */) {
-                write("export ");
-            }
-            write("import ");
-            if (node.importClause) {
-                var currentWriterPos = writer.getTextPos();
-                if (node.importClause.name && resolver.isDeclarationVisible(node.importClause)) {
-                    writeTextOfNode(currentText, node.importClause.name);
-                }
-                if (node.importClause.namedBindings && isVisibleNamedBinding(node.importClause.namedBindings)) {
-                    if (currentWriterPos !== writer.getTextPos()) {
-                        // If the default binding was emitted, write the separated
-                        write(", ");
-                    }
-                    if (node.importClause.namedBindings.kind === 232 /* NamespaceImport */) {
-                        write("* as ");
-                        writeTextOfNode(currentText, node.importClause.namedBindings.name);
-                    }
-                    else {
-                        write("{ ");
-                        emitCommaList(node.importClause.namedBindings.elements, emitImportOrExportSpecifier, resolver.isDeclarationVisible);
-                        write(" }");
-                    }
-                }
-                write(" from ");
-            }
-            emitExternalModuleSpecifier(node);
-            write(";");
-            writer.writeLine();
-        }
-        function emitExternalModuleSpecifier(parent) {
-            // emitExternalModuleSpecifier is usually called when we emit something in the.d.ts file that will make it an external module (i.e. import/export declarations).
-            // the only case when it is not true is when we call it to emit correct name for module augmentation - d.ts files with just module augmentations are not considered
-            // external modules since they are indistinguishable from script files with ambient modules. To fix this in such d.ts files we'll emit top level 'export {}'
-            // so compiler will treat them as external modules.
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || parent.kind !== 225 /* ModuleDeclaration */;
-            var moduleSpecifier;
-            if (parent.kind === 229 /* ImportEqualsDeclaration */) {
-                var node = parent;
-                moduleSpecifier = ts.getExternalModuleImportEqualsDeclarationExpression(node);
-            }
-            else if (parent.kind === 225 /* ModuleDeclaration */) {
-                moduleSpecifier = parent.name;
-            }
-            else {
-                var node = parent;
-                moduleSpecifier = node.moduleSpecifier;
-            }
-            if (moduleSpecifier.kind === 9 /* StringLiteral */ && isBundledEmit && (compilerOptions.out || compilerOptions.outFile)) {
-                var moduleName = ts.getExternalModuleNameFromDeclaration(host, resolver, parent);
-                if (moduleName) {
-                    write('"');
-                    write(moduleName);
-                    write('"');
-                    return;
-                }
-            }
-            writeTextOfNode(currentText, moduleSpecifier);
-        }
-        function emitImportOrExportSpecifier(node) {
-            if (node.propertyName) {
-                writeTextOfNode(currentText, node.propertyName);
-                write(" as ");
-            }
-            writeTextOfNode(currentText, node.name);
-        }
-        function emitExportSpecifier(node) {
-            emitImportOrExportSpecifier(node);
-            // Make all the declarations visible for the export name
-            var nodes = resolver.collectLinkedAliases(node.propertyName || node.name);
-            // write each of these declarations asynchronously
-            writeAsynchronousModuleElements(nodes);
-        }
-        function emitExportDeclaration(node) {
-            emitJsDocComments(node);
-            write("export ");
-            if (node.exportClause) {
-                write("{ ");
-                emitCommaList(node.exportClause.elements, emitExportSpecifier);
-                write(" }");
-            }
-            else {
-                write("*");
-            }
-            if (node.moduleSpecifier) {
-                write(" from ");
-                emitExternalModuleSpecifier(node);
-            }
-            write(";");
-            writer.writeLine();
-        }
-        function writeModuleDeclaration(node) {
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            if (ts.isGlobalScopeAugmentation(node)) {
-                write("global ");
-            }
-            else {
-                if (node.flags & 4096 /* Namespace */) {
-                    write("namespace ");
-                }
-                else {
-                    write("module ");
-                }
-                if (ts.isExternalModuleAugmentation(node)) {
-                    emitExternalModuleSpecifier(node);
-                }
-                else {
-                    writeTextOfNode(currentText, node.name);
-                }
-            }
-            while (node.body && node.body.kind !== 226 /* ModuleBlock */) {
-                node = node.body;
-                write(".");
-                writeTextOfNode(currentText, node.name);
-            }
-            var prevEnclosingDeclaration = enclosingDeclaration;
-            if (node.body) {
-                enclosingDeclaration = node;
-                write(" {");
-                writeLine();
-                increaseIndent();
-                emitLines(node.body.statements);
-                decreaseIndent();
-                write("}");
-                writeLine();
-                enclosingDeclaration = prevEnclosingDeclaration;
-            }
-            else {
-                write(";");
-            }
-        }
-        function writeTypeAliasDeclaration(node) {
-            var prevEnclosingDeclaration = enclosingDeclaration;
-            enclosingDeclaration = node;
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            write("type ");
-            writeTextOfNode(currentText, node.name);
-            emitTypeParameters(node.typeParameters);
-            write(" = ");
-            emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.type, getTypeAliasDeclarationVisibilityError);
-            write(";");
-            writeLine();
-            enclosingDeclaration = prevEnclosingDeclaration;
-            function getTypeAliasDeclarationVisibilityError(symbolAccessibilityResult) {
-                return {
-                    diagnosticMessage: ts.Diagnostics.Exported_type_alias_0_has_or_is_using_private_name_1,
-                    errorNode: node.type,
-                    typeName: node.name
-                };
-            }
-        }
-        function writeEnumDeclaration(node) {
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            if (ts.isConst(node)) {
-                write("const ");
-            }
-            write("enum ");
-            writeTextOfNode(currentText, node.name);
-            write(" {");
-            writeLine();
-            increaseIndent();
-            emitLines(node.members);
-            decreaseIndent();
-            write("}");
-            writeLine();
-        }
-        function emitEnumMemberDeclaration(node) {
-            emitJsDocComments(node);
-            writeTextOfNode(currentText, node.name);
-            var enumMemberValue = resolver.getConstantValue(node);
-            if (enumMemberValue !== undefined) {
-                write(" = ");
-                write(enumMemberValue.toString());
-            }
-            write(",");
-            writeLine();
-        }
-        function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 147 /* MethodDeclaration */ && (node.parent.flags & 8 /* Private */);
-        }
-        function emitTypeParameters(typeParameters) {
-            function emitTypeParameter(node) {
-                increaseIndent();
-                emitJsDocComments(node);
-                decreaseIndent();
-                writeTextOfNode(currentText, node.name);
-                // If there is constraint present and this is not a type parameter of the private method emit the constraint
-                if (node.constraint && !isPrivateMethodTypeParameter(node)) {
-                    write(" extends ");
-                    if (node.parent.kind === 156 /* FunctionType */ ||
-                        node.parent.kind === 157 /* ConstructorType */ ||
-                        (node.parent.parent && node.parent.parent.kind === 159 /* TypeLiteral */)) {
-                        ts.Debug.assert(node.parent.kind === 147 /* MethodDeclaration */ ||
-                            node.parent.kind === 146 /* MethodSignature */ ||
-                            node.parent.kind === 156 /* FunctionType */ ||
-                            node.parent.kind === 157 /* ConstructorType */ ||
-                            node.parent.kind === 151 /* CallSignature */ ||
-                            node.parent.kind === 152 /* ConstructSignature */);
-                        emitType(node.constraint);
-                    }
-                    else {
-                        emitTypeWithNewGetSymbolAccessibilityDiagnostic(node.constraint, getTypeParameterConstraintVisibilityError);
-                    }
-                }
-                function getTypeParameterConstraintVisibilityError(symbolAccessibilityResult) {
-                    // Type parameter constraints are named by user so we should always be able to name it
-                    var diagnosticMessage;
-                    switch (node.parent.kind) {
-                        case 221 /* ClassDeclaration */:
-                            diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
-                            break;
-                        case 222 /* InterfaceDeclaration */:
-                            diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
-                            break;
-                        case 152 /* ConstructSignature */:
-                            diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                            break;
-                        case 151 /* CallSignature */:
-                            diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                            break;
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                            if (node.parent.flags & 32 /* Static */) {
-                                diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
-                            }
-                            else if (node.parent.parent.kind === 221 /* ClassDeclaration */) {
-                                diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
-                            }
-                            else {
-                                diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
-                            }
-                            break;
-                        case 220 /* FunctionDeclaration */:
-                            diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
-                            break;
-                        default:
-                            ts.Debug.fail("This is unknown parent for type parameter: " + node.parent.kind);
-                    }
-                    return {
-                        diagnosticMessage: diagnosticMessage,
-                        errorNode: node,
-                        typeName: node.name
-                    };
-                }
-            }
-            if (typeParameters) {
-                write("<");
-                emitCommaList(typeParameters, emitTypeParameter);
-                write(">");
-            }
-        }
-        function emitHeritageClause(typeReferences, isImplementsList) {
-            if (typeReferences) {
-                write(isImplementsList ? " implements " : " extends ");
-                emitCommaList(typeReferences, emitTypeOfTypeReference);
-            }
-            function emitTypeOfTypeReference(node) {
-                if (ts.isSupportedExpressionWithTypeArguments(node)) {
-                    emitTypeWithNewGetSymbolAccessibilityDiagnostic(node, getHeritageClauseVisibilityError);
-                }
-                else if (!isImplementsList && node.expression.kind === 93 /* NullKeyword */) {
-                    write("null");
-                }
-                else {
-                    writer.getSymbolAccessibilityDiagnostic = getHeritageClauseVisibilityError;
-                    resolver.writeBaseConstructorTypeOfClass(enclosingDeclaration, enclosingDeclaration, 2 /* UseTypeOfFunction */, writer);
-                }
-                function getHeritageClauseVisibilityError(symbolAccessibilityResult) {
-                    var diagnosticMessage;
-                    // Heritage clause is written by user so it can always be named
-                    if (node.parent.parent.kind === 221 /* ClassDeclaration */) {
-                        // Class or Interface implemented/extended is inaccessible
-                        diagnosticMessage = isImplementsList ?
-                            ts.Diagnostics.Implements_clause_of_exported_class_0_has_or_is_using_private_name_1 :
-                            ts.Diagnostics.Extends_clause_of_exported_class_0_has_or_is_using_private_name_1;
-                    }
-                    else {
-                        // interface is inaccessible
-                        diagnosticMessage = ts.Diagnostics.Extends_clause_of_exported_interface_0_has_or_is_using_private_name_1;
-                    }
-                    return {
-                        diagnosticMessage: diagnosticMessage,
-                        errorNode: node,
-                        typeName: node.parent.parent.name
-                    };
-                }
-            }
-        }
-        function writeClassDeclaration(node) {
-            function emitParameterProperties(constructorDeclaration) {
-                if (constructorDeclaration) {
-                    ts.forEach(constructorDeclaration.parameters, function (param) {
-                        if (param.flags & 92 /* ParameterPropertyModifier */) {
-                            emitPropertyDeclaration(param);
-                        }
-                    });
-                }
-            }
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            if (node.flags & 128 /* Abstract */) {
-                write("abstract ");
-            }
-            write("class ");
-            writeTextOfNode(currentText, node.name);
-            var prevEnclosingDeclaration = enclosingDeclaration;
-            enclosingDeclaration = node;
-            emitTypeParameters(node.typeParameters);
-            var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
-            if (baseTypeNode) {
-                emitHeritageClause([baseTypeNode], /*isImplementsList*/ false);
-            }
-            emitHeritageClause(ts.getClassImplementsHeritageClauseElements(node), /*isImplementsList*/ true);
-            write(" {");
-            writeLine();
-            increaseIndent();
-            emitParameterProperties(ts.getFirstConstructorWithBody(node));
-            emitLines(node.members);
-            decreaseIndent();
-            write("}");
-            writeLine();
-            enclosingDeclaration = prevEnclosingDeclaration;
-        }
-        function writeInterfaceDeclaration(node) {
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            write("interface ");
-            writeTextOfNode(currentText, node.name);
-            var prevEnclosingDeclaration = enclosingDeclaration;
-            enclosingDeclaration = node;
-            emitTypeParameters(node.typeParameters);
-            emitHeritageClause(ts.getInterfaceBaseTypeNodes(node), /*isImplementsList*/ false);
-            write(" {");
-            writeLine();
-            increaseIndent();
-            emitLines(node.members);
-            decreaseIndent();
-            write("}");
-            writeLine();
-            enclosingDeclaration = prevEnclosingDeclaration;
-        }
-        function emitPropertyDeclaration(node) {
-            if (ts.hasDynamicName(node)) {
-                return;
-            }
-            emitJsDocComments(node);
-            emitClassMemberDeclarationFlags(node.flags);
-            emitVariableDeclaration(node);
-            write(";");
-            writeLine();
-        }
-        function emitVariableDeclaration(node) {
-            // If we are emitting property it isn't moduleElement and hence we already know it needs to be emitted
-            // so there is no check needed to see if declaration is visible
-            if (node.kind !== 218 /* VariableDeclaration */ || resolver.isDeclarationVisible(node)) {
-                if (ts.isBindingPattern(node.name)) {
-                    emitBindingPattern(node.name);
-                }
-                else {
-                    // If this node is a computed name, it can only be a symbol, because we've already skipped
-                    // it if it's not a well known symbol. In that case, the text of the name will be exactly
-                    // what we want, namely the name expression enclosed in brackets.
-                    writeTextOfNode(currentText, node.name);
-                    // If optional property emit ?
-                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */ || node.kind === 142 /* Parameter */) && ts.hasQuestionToken(node)) {
-                        write("?");
-                    }
-                    if ((node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */) && node.parent.kind === 159 /* TypeLiteral */) {
-                        emitTypeOfVariableDeclarationFromTypeLiteral(node);
-                    }
-                    else if (!(node.flags & 8 /* Private */)) {
-                        writeTypeOfDeclaration(node, node.type, getVariableDeclarationTypeVisibilityError);
-                    }
-                }
-            }
-            function getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                if (node.kind === 218 /* VariableDeclaration */) {
-                    return symbolAccessibilityResult.errorModuleName ?
-                        symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                            ts.Diagnostics.Exported_variable_0_has_or_is_using_name_1_from_private_module_2 :
-                        ts.Diagnostics.Exported_variable_0_has_or_is_using_private_name_1;
-                }
-                else if (node.kind === 145 /* PropertyDeclaration */ || node.kind === 144 /* PropertySignature */) {
-                    // TODO(jfreeman): Deal with computed properties in error reporting.
-                    if (node.flags & 32 /* Static */) {
-                        return symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_static_property_0_of_exported_class_has_or_is_using_private_name_1;
-                    }
-                    else if (node.parent.kind === 221 /* ClassDeclaration */) {
-                        return symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Public_property_0_of_exported_class_has_or_is_using_private_name_1;
-                    }
-                    else {
-                        // Interfaces cannot have types that cannot be named
-                        return symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Property_0_of_exported_interface_has_or_is_using_private_name_1;
-                    }
-                }
-            }
-            function getVariableDeclarationTypeVisibilityError(symbolAccessibilityResult) {
-                var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
-                return diagnosticMessage !== undefined ? {
-                    diagnosticMessage: diagnosticMessage,
-                    errorNode: node,
-                    typeName: node.name
-                } : undefined;
-            }
-            function emitBindingPattern(bindingPattern) {
-                // Only select non-omitted expression from the bindingPattern's elements.
-                // We have to do this to avoid emitting trailing commas.
-                // For example:
-                //      original: var [, c,,] = [ 2,3,4]
-                //      emitted: declare var c: number; // instead of declare var c:number, ;
-                var elements = [];
-                for (var _i = 0, _a = bindingPattern.elements; _i < _a.length; _i++) {
-                    var element = _a[_i];
-                    if (element.kind !== 193 /* OmittedExpression */) {
-                        elements.push(element);
-                    }
-                }
-                emitCommaList(elements, emitBindingElement);
-            }
-            function emitBindingElement(bindingElement) {
-                function getBindingElementTypeVisibilityError(symbolAccessibilityResult) {
-                    var diagnosticMessage = getVariableDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
-                    return diagnosticMessage !== undefined ? {
-                        diagnosticMessage: diagnosticMessage,
-                        errorNode: bindingElement,
-                        typeName: bindingElement.name
-                    } : undefined;
-                }
-                if (bindingElement.name) {
-                    if (ts.isBindingPattern(bindingElement.name)) {
-                        emitBindingPattern(bindingElement.name);
-                    }
-                    else {
-                        writeTextOfNode(currentText, bindingElement.name);
-                        writeTypeOfDeclaration(bindingElement, /*type*/ undefined, getBindingElementTypeVisibilityError);
-                    }
-                }
-            }
-        }
-        function emitTypeOfVariableDeclarationFromTypeLiteral(node) {
-            // if this is property of type literal,
-            // or is parameter of method/call/construct/index signature of type literal
-            // emit only if type is specified
-            if (node.type) {
-                write(": ");
-                emitType(node.type);
-            }
-        }
-        function isVariableStatementVisible(node) {
-            return ts.forEach(node.declarationList.declarations, function (varDeclaration) { return resolver.isDeclarationVisible(varDeclaration); });
-        }
-        function writeVariableStatement(node) {
-            emitJsDocComments(node);
-            emitModuleElementDeclarationFlags(node);
-            if (ts.isLet(node.declarationList)) {
-                write("let ");
-            }
-            else if (ts.isConst(node.declarationList)) {
-                write("const ");
-            }
-            else {
-                write("var ");
-            }
-            emitCommaList(node.declarationList.declarations, emitVariableDeclaration, resolver.isDeclarationVisible);
-            write(";");
-            writeLine();
-        }
-        function emitAccessorDeclaration(node) {
-            if (ts.hasDynamicName(node)) {
-                return;
-            }
-            var accessors = ts.getAllAccessorDeclarations(node.parent.members, node);
-            var accessorWithTypeAnnotation;
-            if (node === accessors.firstAccessor) {
-                emitJsDocComments(accessors.getAccessor);
-                emitJsDocComments(accessors.setAccessor);
-                emitClassMemberDeclarationFlags(node.flags | (accessors.setAccessor ? 0 : 64 /* Readonly */));
-                writeTextOfNode(currentText, node.name);
-                if (!(node.flags & 8 /* Private */)) {
-                    accessorWithTypeAnnotation = node;
-                    var type = getTypeAnnotationFromAccessor(node);
-                    if (!type) {
-                        // couldn't get type for the first accessor, try the another one
-                        var anotherAccessor = node.kind === 149 /* GetAccessor */ ? accessors.setAccessor : accessors.getAccessor;
-                        type = getTypeAnnotationFromAccessor(anotherAccessor);
-                        if (type) {
-                            accessorWithTypeAnnotation = anotherAccessor;
-                        }
-                    }
-                    writeTypeOfDeclaration(node, type, getAccessorDeclarationTypeVisibilityError);
-                }
-                write(";");
-                writeLine();
-            }
-            function getTypeAnnotationFromAccessor(accessor) {
-                if (accessor) {
-                    return accessor.kind === 149 /* GetAccessor */
-                        ? accessor.type // Getter - return type
-                        : accessor.parameters.length > 0
-                            ? accessor.parameters[0].type // Setter parameter type
-                            : undefined;
-                }
-            }
-            function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
-                var diagnosticMessage;
-                if (accessorWithTypeAnnotation.kind === 150 /* SetAccessor */) {
-                    // Setters have to have type named and cannot infer it so, the type should always be named
-                    if (accessorWithTypeAnnotation.parent.flags & 32 /* Static */) {
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_static_property_setter_from_exported_class_has_or_is_using_private_name_1;
-                    }
-                    else {
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_public_property_setter_from_exported_class_has_or_is_using_private_name_1;
-                    }
-                    return {
-                        diagnosticMessage: diagnosticMessage,
-                        errorNode: accessorWithTypeAnnotation.parameters[0],
-                        // TODO(jfreeman): Investigate why we are passing node.name instead of node.parameters[0].name
-                        typeName: accessorWithTypeAnnotation.name
-                    };
-                }
-                else {
-                    if (accessorWithTypeAnnotation.flags & 32 /* Static */) {
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_static_property_getter_from_exported_class_has_or_is_using_private_name_0;
-                    }
-                    else {
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_public_property_getter_from_exported_class_has_or_is_using_private_name_0;
-                    }
-                    return {
-                        diagnosticMessage: diagnosticMessage,
-                        errorNode: accessorWithTypeAnnotation.name,
-                        typeName: undefined
-                    };
-                }
-            }
-        }
-        function writeFunctionDeclaration(node) {
-            if (ts.hasDynamicName(node)) {
-                return;
-            }
-            // If we are emitting Method/Constructor it isn't moduleElement and hence already determined to be emitting
-            // so no need to verify if the declaration is visible
-            if (!resolver.isImplementationOfOverload(node)) {
-                emitJsDocComments(node);
-                if (node.kind === 220 /* FunctionDeclaration */) {
-                    emitModuleElementDeclarationFlags(node);
-                }
-                else if (node.kind === 147 /* MethodDeclaration */ || node.kind === 148 /* Constructor */) {
-                    emitClassMemberDeclarationFlags(node.flags);
-                }
-                if (node.kind === 220 /* FunctionDeclaration */) {
-                    write("function ");
-                    writeTextOfNode(currentText, node.name);
-                }
-                else if (node.kind === 148 /* Constructor */) {
-                    write("constructor");
-                }
-                else {
-                    writeTextOfNode(currentText, node.name);
-                    if (ts.hasQuestionToken(node)) {
-                        write("?");
-                    }
-                }
-                emitSignatureDeclaration(node);
-            }
-        }
-        function emitSignatureDeclarationWithJsDocComments(node) {
-            emitJsDocComments(node);
-            emitSignatureDeclaration(node);
-        }
-        function emitSignatureDeclaration(node) {
-            var prevEnclosingDeclaration = enclosingDeclaration;
-            enclosingDeclaration = node;
-            var closeParenthesizedFunctionType = false;
-            if (node.kind === 153 /* IndexSignature */) {
-                // Index signature can have readonly modifier
-                emitClassMemberDeclarationFlags(node.flags);
-                write("[");
-            }
-            else {
-                // Construct signature or constructor type write new Signature
-                if (node.kind === 152 /* ConstructSignature */ || node.kind === 157 /* ConstructorType */) {
-                    write("new ");
-                }
-                else if (node.kind === 156 /* FunctionType */) {
-                    var currentOutput = writer.getText();
-                    // Do not generate incorrect type when function type with type parameters is type argument
-                    // This could happen if user used space between two '<' making it error free
-                    // e.g var x: A< <Tany>(a: Tany)=>Tany>;
-                    if (node.typeParameters && currentOutput.charAt(currentOutput.length - 1) === "<") {
-                        closeParenthesizedFunctionType = true;
-                        write("(");
-                    }
-                }
-                emitTypeParameters(node.typeParameters);
-                write("(");
-            }
-            // Parameters
-            emitCommaList(node.parameters, emitParameterDeclaration);
-            if (node.kind === 153 /* IndexSignature */) {
-                write("]");
-            }
-            else {
-                write(")");
-            }
-            // If this is not a constructor and is not private, emit the return type
-            var isFunctionTypeOrConstructorType = node.kind === 156 /* FunctionType */ || node.kind === 157 /* ConstructorType */;
-            if (isFunctionTypeOrConstructorType || node.parent.kind === 159 /* TypeLiteral */) {
-                // Emit type literal signature return type only if specified
-                if (node.type) {
-                    write(isFunctionTypeOrConstructorType ? " => " : ": ");
-                    emitType(node.type);
-                }
-            }
-            else if (node.kind !== 148 /* Constructor */ && !(node.flags & 8 /* Private */)) {
-                writeReturnTypeAtSignature(node, getReturnTypeVisibilityError);
-            }
-            enclosingDeclaration = prevEnclosingDeclaration;
-            if (!isFunctionTypeOrConstructorType) {
-                write(";");
-                writeLine();
-            }
-            else if (closeParenthesizedFunctionType) {
-                write(")");
-            }
-            function getReturnTypeVisibilityError(symbolAccessibilityResult) {
-                var diagnosticMessage;
-                switch (node.kind) {
-                    case 152 /* ConstructSignature */:
-                        // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_0;
-                        break;
-                    case 151 /* CallSignature */:
-                        // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_call_signature_from_exported_interface_has_or_is_using_private_name_0;
-                        break;
-                    case 153 /* IndexSignature */:
-                        // Interfaces cannot have return types that cannot be named
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_index_signature_from_exported_interface_has_or_is_using_private_name_0;
-                        break;
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        if (node.flags & 32 /* Static */) {
-                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_static_method_from_exported_class_has_or_is_using_private_name_0;
-                        }
-                        else if (node.parent.kind === 221 /* ClassDeclaration */) {
-                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                    ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_public_method_from_exported_class_has_or_is_using_private_name_0;
-                        }
-                        else {
-                            // Interfaces cannot have return types that cannot be named
-                            diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_name_0_from_private_module_1 :
-                                ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
-                        }
-                        break;
-                    case 220 /* FunctionDeclaration */:
-                        diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_external_module_1_but_cannot_be_named :
-                                ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_name_0_from_private_module_1 :
-                            ts.Diagnostics.Return_type_of_exported_function_has_or_is_using_private_name_0;
-                        break;
-                    default:
-                        ts.Debug.fail("This is unknown kind for signature: " + node.kind);
-                }
-                return {
-                    diagnosticMessage: diagnosticMessage,
-                    errorNode: node.name || node
-                };
-            }
-        }
-        function emitParameterDeclaration(node) {
-            increaseIndent();
-            emitJsDocComments(node);
-            if (node.dotDotDotToken) {
-                write("...");
-            }
-            if (ts.isBindingPattern(node.name)) {
-                // For bindingPattern, we can't simply writeTextOfNode from the source file
-                // because we want to omit the initializer and using writeTextOfNode will result in initializer get emitted.
-                // Therefore, we will have to recursively emit each element in the bindingPattern.
-                emitBindingPattern(node.name);
-            }
-            else {
-                writeTextOfNode(currentText, node.name);
-            }
-            if (resolver.isOptionalParameter(node)) {
-                write("?");
-            }
-            decreaseIndent();
-            if (node.parent.kind === 156 /* FunctionType */ ||
-                node.parent.kind === 157 /* ConstructorType */ ||
-                node.parent.parent.kind === 159 /* TypeLiteral */) {
-                emitTypeOfVariableDeclarationFromTypeLiteral(node);
-            }
-            else if (!(node.parent.flags & 8 /* Private */)) {
-                writeTypeOfDeclaration(node, node.type, getParameterDeclarationTypeVisibilityError);
-            }
-            function getParameterDeclarationTypeVisibilityError(symbolAccessibilityResult) {
-                var diagnosticMessage = getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult);
-                return diagnosticMessage !== undefined ? {
-                    diagnosticMessage: diagnosticMessage,
-                    errorNode: node,
-                    typeName: node.name
-                } : undefined;
-            }
-            function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
-                switch (node.parent.kind) {
-                    case 148 /* Constructor */:
-                        return symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_from_exported_class_has_or_is_using_private_name_1;
-                    case 152 /* ConstructSignature */:
-                        // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 151 /* CallSignature */:
-                        // Interfaces cannot have parameter types that cannot be named
-                        return symbolAccessibilityResult.errorModuleName ?
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        if (node.parent.flags & 32 /* Static */) {
-                            return symbolAccessibilityResult.errorModuleName ?
-                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_static_method_from_exported_class_has_or_is_using_private_name_1;
-                        }
-                        else if (node.parent.parent.kind === 221 /* ClassDeclaration */) {
-                            return symbolAccessibilityResult.errorModuleName ?
-                                symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                    ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_public_method_from_exported_class_has_or_is_using_private_name_1;
-                        }
-                        else {
-                            // Interfaces cannot have parameter types that cannot be named
-                            return symbolAccessibilityResult.errorModuleName ?
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_name_1_from_private_module_2 :
-                                ts.Diagnostics.Parameter_0_of_method_from_exported_interface_has_or_is_using_private_name_1;
-                        }
-                    case 220 /* FunctionDeclaration */:
-                        return symbolAccessibilityResult.errorModuleName ?
-                            symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_external_module_2_but_cannot_be_named :
-                                ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_name_1_from_private_module_2 :
-                            ts.Diagnostics.Parameter_0_of_exported_function_has_or_is_using_private_name_1;
-                    default:
-                        ts.Debug.fail("This is unknown parent for parameter: " + node.parent.kind);
-                }
-            }
-            function emitBindingPattern(bindingPattern) {
-                // We have to explicitly emit square bracket and bracket because these tokens are not store inside the node.
-                if (bindingPattern.kind === 167 /* ObjectBindingPattern */) {
-                    write("{");
-                    emitCommaList(bindingPattern.elements, emitBindingElement);
-                    write("}");
-                }
-                else if (bindingPattern.kind === 168 /* ArrayBindingPattern */) {
-                    write("[");
-                    var elements = bindingPattern.elements;
-                    emitCommaList(elements, emitBindingElement);
-                    if (elements && elements.hasTrailingComma) {
-                        write(", ");
-                    }
-                    write("]");
-                }
-            }
-            function emitBindingElement(bindingElement) {
-                if (bindingElement.kind === 193 /* OmittedExpression */) {
-                    // If bindingElement is an omittedExpression (i.e. containing elision),
-                    // we will emit blank space (although this may differ from users' original code,
-                    // it allows emitSeparatedList to write separator appropriately)
-                    // Example:
-                    //      original: function foo([, x, ,]) {}
-                    //      emit    : function foo([ , x,  , ]) {}
-                    write(" ");
-                }
-                else if (bindingElement.kind === 169 /* BindingElement */) {
-                    if (bindingElement.propertyName) {
-                        // bindingElement has propertyName property in the following case:
-                        //      { y: [a,b,c] ...} -> bindingPattern will have a property called propertyName for "y"
-                        // We have to explicitly emit the propertyName before descending into its binding elements.
-                        // Example:
-                        //      original: function foo({y: [a,b,c]}) {}
-                        //      emit    : declare function foo({y: [a, b, c]}: { y: [any, any, any] }) void;
-                        writeTextOfNode(currentText, bindingElement.propertyName);
-                        write(": ");
-                    }
-                    if (bindingElement.name) {
-                        if (ts.isBindingPattern(bindingElement.name)) {
-                            // If it is a nested binding pattern, we will recursively descend into each element and emit each one separately.
-                            // In the case of rest element, we will omit rest element.
-                            // Example:
-                            //      original: function foo([a, [[b]], c] = [1,[["string"]], 3]) {}
-                            //      emit    : declare function foo([a, [[b]], c]: [number, [[string]], number]): void;
-                            //      original with rest: function foo([a, ...c]) {}
-                            //      emit              : declare function foo([a, ...c]): void;
-                            emitBindingPattern(bindingElement.name);
-                        }
-                        else {
-                            ts.Debug.assert(bindingElement.name.kind === 69 /* Identifier */);
-                            // If the node is just an identifier, we will simply emit the text associated with the node's name
-                            // Example:
-                            //      original: function foo({y = 10, x}) {}
-                            //      emit    : declare function foo({y, x}: {number, any}): void;
-                            if (bindingElement.dotDotDotToken) {
-                                write("...");
-                            }
-                            writeTextOfNode(currentText, bindingElement.name);
-                        }
-                    }
-                }
-            }
-        }
-        function emitNode(node) {
-            switch (node.kind) {
-                case 220 /* FunctionDeclaration */:
-                case 225 /* ModuleDeclaration */:
-                case 229 /* ImportEqualsDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 221 /* ClassDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                case 224 /* EnumDeclaration */:
-                    return emitModuleElement(node, isModuleElementVisible(node));
-                case 200 /* VariableStatement */:
-                    return emitModuleElement(node, isVariableStatementVisible(node));
-                case 230 /* ImportDeclaration */:
-                    // Import declaration without import clause is visible, otherwise it is not visible
-                    return emitModuleElement(node, /*isModuleElementVisible*/ !node.importClause);
-                case 236 /* ExportDeclaration */:
-                    return emitExportDeclaration(node);
-                case 148 /* Constructor */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                    return writeFunctionDeclaration(node);
-                case 152 /* ConstructSignature */:
-                case 151 /* CallSignature */:
-                case 153 /* IndexSignature */:
-                    return emitSignatureDeclarationWithJsDocComments(node);
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                    return emitAccessorDeclaration(node);
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    return emitPropertyDeclaration(node);
-                case 255 /* EnumMember */:
-                    return emitEnumMemberDeclaration(node);
-                case 235 /* ExportAssignment */:
-                    return emitExportAssignment(node);
-                case 256 /* SourceFile */:
-                    return emitSourceFile(node);
-            }
-        }
-        /**
-         * Adds the reference to referenced file, returns true if global file reference was emitted
-         * @param referencedFile
-         * @param addBundledFileReference Determines if global file reference corresponding to bundled file should be emitted or not
-         */
-        function writeReferencePath(referencedFile, addBundledFileReference) {
-            var declFileName;
-            var addedBundledEmitReference = false;
-            if (ts.isDeclarationFile(referencedFile)) {
-                // Declaration file, use declaration file name
-                declFileName = referencedFile.fileName;
-            }
-            else {
-                // Get the declaration file path
-                ts.forEachExpectedEmitFile(host, getDeclFileName, referencedFile);
-            }
-            if (declFileName) {
-                declFileName = ts.getRelativePathToDirectoryOrUrl(ts.getDirectoryPath(ts.normalizeSlashes(declarationFilePath)), declFileName, host.getCurrentDirectory(), host.getCanonicalFileName, 
-                /*isAbsolutePathAnUrl*/ false);
-                referencesOutput += "/// <reference path=\"" + declFileName + "\" />" + newLine;
-            }
-            return addedBundledEmitReference;
-            function getDeclFileName(emitFileNames, sourceFiles, isBundledEmit) {
-                // Dont add reference path to this file if it is a bundled emit and caller asked not emit bundled file path
-                if (isBundledEmit && !addBundledFileReference) {
-                    return;
-                }
-                ts.Debug.assert(!!emitFileNames.declarationFilePath || ts.isSourceFileJavaScript(referencedFile), "Declaration file is not present only for javascript files");
-                declFileName = emitFileNames.declarationFilePath || emitFileNames.jsFilePath;
-                addedBundledEmitReference = isBundledEmit;
-            }
-        }
-    }
-    /* @internal */
-    function writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) {
-        var emitDeclarationResult = emitDeclarations(host, resolver, emitterDiagnostics, declarationFilePath, sourceFiles, isBundledEmit);
-        var emitSkipped = emitDeclarationResult.reportedDeclarationError || host.isEmitBlocked(declarationFilePath) || host.getCompilerOptions().noEmit;
-        if (!emitSkipped) {
-            var declarationOutput = emitDeclarationResult.referencesOutput
-                + getDeclarationOutput(emitDeclarationResult.synchronousDeclarationOutput, emitDeclarationResult.moduleElementDeclarationEmitInfo);
-            ts.writeFile(host, emitterDiagnostics, declarationFilePath, declarationOutput, host.getCompilerOptions().emitBOM, sourceFiles);
-        }
-        return emitSkipped;
-        function getDeclarationOutput(synchronousDeclarationOutput, moduleElementDeclarationEmitInfo) {
-            var appliedSyncOutputPos = 0;
-            var declarationOutput = "";
-            // apply asynchronous additions to the synchronous output
-            ts.forEach(moduleElementDeclarationEmitInfo, function (aliasEmitInfo) {
-                if (aliasEmitInfo.asynchronousOutput) {
-                    declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos, aliasEmitInfo.outputPos);
-                    declarationOutput += getDeclarationOutput(aliasEmitInfo.asynchronousOutput, aliasEmitInfo.subModuleElementDeclarationEmitInfo);
-                    appliedSyncOutputPos = aliasEmitInfo.outputPos;
-                }
-            });
-            declarationOutput += synchronousDeclarationOutput.substring(appliedSyncOutputPos);
-            return declarationOutput;
-        }
-    }
-    ts.writeDeclarationFile = writeDeclarationFile;
-})(ts || (ts = {}));
-/// <reference path="checker.ts"/>
-/// <reference path="sourcemap.ts" />
-/// <reference path="declarationEmitter.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    function getResolvedExternalModuleName(host, file) {
-        return file.moduleName || ts.getExternalModuleNameFromPath(host, file.fileName);
-    }
-    ts.getResolvedExternalModuleName = getResolvedExternalModuleName;
-    function getExternalModuleNameFromDeclaration(host, resolver, declaration) {
-        var file = resolver.getExternalModuleFileFromDeclaration(declaration);
-        if (!file || ts.isDeclarationFile(file)) {
-            return undefined;
-        }
-        return getResolvedExternalModuleName(host, file);
-    }
-    ts.getExternalModuleNameFromDeclaration = getExternalModuleNameFromDeclaration;
-    var Jump;
-    (function (Jump) {
-        Jump[Jump["Break"] = 2] = "Break";
-        Jump[Jump["Continue"] = 4] = "Continue";
-        Jump[Jump["Return"] = 8] = "Return";
-    })(Jump || (Jump = {}));
-    var entities = {
-        "quot": 0x0022,
-        "amp": 0x0026,
-        "apos": 0x0027,
-        "lt": 0x003C,
-        "gt": 0x003E,
-        "nbsp": 0x00A0,
-        "iexcl": 0x00A1,
-        "cent": 0x00A2,
-        "pound": 0x00A3,
-        "curren": 0x00A4,
-        "yen": 0x00A5,
-        "brvbar": 0x00A6,
-        "sect": 0x00A7,
-        "uml": 0x00A8,
-        "copy": 0x00A9,
-        "ordf": 0x00AA,
-        "laquo": 0x00AB,
-        "not": 0x00AC,
-        "shy": 0x00AD,
-        "reg": 0x00AE,
-        "macr": 0x00AF,
-        "deg": 0x00B0,
-        "plusmn": 0x00B1,
-        "sup2": 0x00B2,
-        "sup3": 0x00B3,
-        "acute": 0x00B4,
-        "micro": 0x00B5,
-        "para": 0x00B6,
-        "middot": 0x00B7,
-        "cedil": 0x00B8,
-        "sup1": 0x00B9,
-        "ordm": 0x00BA,
-        "raquo": 0x00BB,
-        "frac14": 0x00BC,
-        "frac12": 0x00BD,
-        "frac34": 0x00BE,
-        "iquest": 0x00BF,
-        "Agrave": 0x00C0,
-        "Aacute": 0x00C1,
-        "Acirc": 0x00C2,
-        "Atilde": 0x00C3,
-        "Auml": 0x00C4,
-        "Aring": 0x00C5,
-        "AElig": 0x00C6,
-        "Ccedil": 0x00C7,
-        "Egrave": 0x00C8,
-        "Eacute": 0x00C9,
-        "Ecirc": 0x00CA,
-        "Euml": 0x00CB,
-        "Igrave": 0x00CC,
-        "Iacute": 0x00CD,
-        "Icirc": 0x00CE,
-        "Iuml": 0x00CF,
-        "ETH": 0x00D0,
-        "Ntilde": 0x00D1,
-        "Ograve": 0x00D2,
-        "Oacute": 0x00D3,
-        "Ocirc": 0x00D4,
-        "Otilde": 0x00D5,
-        "Ouml": 0x00D6,
-        "times": 0x00D7,
-        "Oslash": 0x00D8,
-        "Ugrave": 0x00D9,
-        "Uacute": 0x00DA,
-        "Ucirc": 0x00DB,
-        "Uuml": 0x00DC,
-        "Yacute": 0x00DD,
-        "THORN": 0x00DE,
-        "szlig": 0x00DF,
-        "agrave": 0x00E0,
-        "aacute": 0x00E1,
-        "acirc": 0x00E2,
-        "atilde": 0x00E3,
-        "auml": 0x00E4,
-        "aring": 0x00E5,
-        "aelig": 0x00E6,
-        "ccedil": 0x00E7,
-        "egrave": 0x00E8,
-        "eacute": 0x00E9,
-        "ecirc": 0x00EA,
-        "euml": 0x00EB,
-        "igrave": 0x00EC,
-        "iacute": 0x00ED,
-        "icirc": 0x00EE,
-        "iuml": 0x00EF,
-        "eth": 0x00F0,
-        "ntilde": 0x00F1,
-        "ograve": 0x00F2,
-        "oacute": 0x00F3,
-        "ocirc": 0x00F4,
-        "otilde": 0x00F5,
-        "ouml": 0x00F6,
-        "divide": 0x00F7,
-        "oslash": 0x00F8,
-        "ugrave": 0x00F9,
-        "uacute": 0x00FA,
-        "ucirc": 0x00FB,
-        "uuml": 0x00FC,
-        "yacute": 0x00FD,
-        "thorn": 0x00FE,
-        "yuml": 0x00FF,
-        "OElig": 0x0152,
-        "oelig": 0x0153,
-        "Scaron": 0x0160,
-        "scaron": 0x0161,
-        "Yuml": 0x0178,
-        "fnof": 0x0192,
-        "circ": 0x02C6,
-        "tilde": 0x02DC,
-        "Alpha": 0x0391,
-        "Beta": 0x0392,
-        "Gamma": 0x0393,
-        "Delta": 0x0394,
-        "Epsilon": 0x0395,
-        "Zeta": 0x0396,
-        "Eta": 0x0397,
-        "Theta": 0x0398,
-        "Iota": 0x0399,
-        "Kappa": 0x039A,
-        "Lambda": 0x039B,
-        "Mu": 0x039C,
-        "Nu": 0x039D,
-        "Xi": 0x039E,
-        "Omicron": 0x039F,
-        "Pi": 0x03A0,
-        "Rho": 0x03A1,
-        "Sigma": 0x03A3,
-        "Tau": 0x03A4,
-        "Upsilon": 0x03A5,
-        "Phi": 0x03A6,
-        "Chi": 0x03A7,
-        "Psi": 0x03A8,
-        "Omega": 0x03A9,
-        "alpha": 0x03B1,
-        "beta": 0x03B2,
-        "gamma": 0x03B3,
-        "delta": 0x03B4,
-        "epsilon": 0x03B5,
-        "zeta": 0x03B6,
-        "eta": 0x03B7,
-        "theta": 0x03B8,
-        "iota": 0x03B9,
-        "kappa": 0x03BA,
-        "lambda": 0x03BB,
-        "mu": 0x03BC,
-        "nu": 0x03BD,
-        "xi": 0x03BE,
-        "omicron": 0x03BF,
-        "pi": 0x03C0,
-        "rho": 0x03C1,
-        "sigmaf": 0x03C2,
-        "sigma": 0x03C3,
-        "tau": 0x03C4,
-        "upsilon": 0x03C5,
-        "phi": 0x03C6,
-        "chi": 0x03C7,
-        "psi": 0x03C8,
-        "omega": 0x03C9,
-        "thetasym": 0x03D1,
-        "upsih": 0x03D2,
-        "piv": 0x03D6,
-        "ensp": 0x2002,
-        "emsp": 0x2003,
-        "thinsp": 0x2009,
-        "zwnj": 0x200C,
-        "zwj": 0x200D,
-        "lrm": 0x200E,
-        "rlm": 0x200F,
-        "ndash": 0x2013,
-        "mdash": 0x2014,
-        "lsquo": 0x2018,
-        "rsquo": 0x2019,
-        "sbquo": 0x201A,
-        "ldquo": 0x201C,
-        "rdquo": 0x201D,
-        "bdquo": 0x201E,
-        "dagger": 0x2020,
-        "Dagger": 0x2021,
-        "bull": 0x2022,
-        "hellip": 0x2026,
-        "permil": 0x2030,
-        "prime": 0x2032,
-        "Prime": 0x2033,
-        "lsaquo": 0x2039,
-        "rsaquo": 0x203A,
-        "oline": 0x203E,
-        "frasl": 0x2044,
-        "euro": 0x20AC,
-        "image": 0x2111,
-        "weierp": 0x2118,
-        "real": 0x211C,
-        "trade": 0x2122,
-        "alefsym": 0x2135,
-        "larr": 0x2190,
-        "uarr": 0x2191,
-        "rarr": 0x2192,
-        "darr": 0x2193,
-        "harr": 0x2194,
-        "crarr": 0x21B5,
-        "lArr": 0x21D0,
-        "uArr": 0x21D1,
-        "rArr": 0x21D2,
-        "dArr": 0x21D3,
-        "hArr": 0x21D4,
-        "forall": 0x2200,
-        "part": 0x2202,
-        "exist": 0x2203,
-        "empty": 0x2205,
-        "nabla": 0x2207,
-        "isin": 0x2208,
-        "notin": 0x2209,
-        "ni": 0x220B,
-        "prod": 0x220F,
-        "sum": 0x2211,
-        "minus": 0x2212,
-        "lowast": 0x2217,
-        "radic": 0x221A,
-        "prop": 0x221D,
-        "infin": 0x221E,
-        "ang": 0x2220,
-        "and": 0x2227,
-        "or": 0x2228,
-        "cap": 0x2229,
-        "cup": 0x222A,
-        "int": 0x222B,
-        "there4": 0x2234,
-        "sim": 0x223C,
-        "cong": 0x2245,
-        "asymp": 0x2248,
-        "ne": 0x2260,
-        "equiv": 0x2261,
-        "le": 0x2264,
-        "ge": 0x2265,
-        "sub": 0x2282,
-        "sup": 0x2283,
-        "nsub": 0x2284,
-        "sube": 0x2286,
-        "supe": 0x2287,
-        "oplus": 0x2295,
-        "otimes": 0x2297,
-        "perp": 0x22A5,
-        "sdot": 0x22C5,
-        "lceil": 0x2308,
-        "rceil": 0x2309,
-        "lfloor": 0x230A,
-        "rfloor": 0x230B,
-        "lang": 0x2329,
-        "rang": 0x232A,
-        "loz": 0x25CA,
-        "spades": 0x2660,
-        "clubs": 0x2663,
-        "hearts": 0x2665,
-        "diams": 0x2666
-    };
-    // Flags enum to track count of temp variables and a few dedicated names
-    var TempFlags;
-    (function (TempFlags) {
-        TempFlags[TempFlags["Auto"] = 0] = "Auto";
-        TempFlags[TempFlags["CountMask"] = 268435455] = "CountMask";
-        TempFlags[TempFlags["_i"] = 268435456] = "_i";
-    })(TempFlags || (TempFlags = {}));
-    var CopyDirection;
-    (function (CopyDirection) {
-        CopyDirection[CopyDirection["ToOriginal"] = 0] = "ToOriginal";
-        CopyDirection[CopyDirection["ToOutParameter"] = 1] = "ToOutParameter";
-    })(CopyDirection || (CopyDirection = {}));
-    // targetSourceFile is when users only want one file in entire project to be emitted. This is used in compileOnSave feature
-    function emitFiles(resolver, host, targetSourceFile) {
-        // emit output for the __extends helper function
-        var extendsHelper = "\nvar __extends = (this && this.__extends) || function (d, b) {\n    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];\n    function __() { this.constructor = d; }\n    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());\n};";
-        var assignHelper = "\nvar __assign = (this && this.__assign) || Object.assign || function(t) {\n    for (var s, i = 1, n = arguments.length; i < n; i++) {\n        s = arguments[i];\n        for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))\n            t[p] = s[p];\n    }\n    return t;\n};";
-        // emit output for the __decorate helper function
-        var decorateHelper = "\nvar __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {\n    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;\n    if (typeof Reflect === \"object\" && typeof Reflect.decorate === \"function\") r = Reflect.decorate(decorators, target, key, desc);\n    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;\n    return c > 3 && r && Object.defineProperty(target, key, r), r;\n};";
-        // emit output for the __metadata helper function
-        var metadataHelper = "\nvar __metadata = (this && this.__metadata) || function (k, v) {\n    if (typeof Reflect === \"object\" && typeof Reflect.metadata === \"function\") return Reflect.metadata(k, v);\n};";
-        // emit output for the __param helper function
-        var paramHelper = "\nvar __param = (this && this.__param) || function (paramIndex, decorator) {\n    return function (target, key) { decorator(target, key, paramIndex); }\n};";
-        var awaiterHelper = "\nvar __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {\n    return new (P || (P = Promise))(function (resolve, reject) {\n        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }\n        function rejected(value) { try { step(generator.throw(value)); } catch (e) { reject(e); } }\n        function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }\n        step((generator = generator.apply(thisArg, _arguments)).next());\n    });\n};";
-        var compilerOptions = host.getCompilerOptions();
-        var languageVersion = ts.getEmitScriptTarget(compilerOptions);
-        var modulekind = ts.getEmitModuleKind(compilerOptions);
-        var sourceMapDataList = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? [] : undefined;
-        var emittedFilesList = compilerOptions.listEmittedFiles ? [] : undefined;
-        var emitterDiagnostics = ts.createDiagnosticCollection();
-        var emitSkipped = false;
-        var newLine = host.getNewLine();
-        var emitJavaScript = createFileEmitter();
-        ts.forEachExpectedEmitFile(host, emitFile, targetSourceFile);
-        return {
-            emitSkipped: emitSkipped,
-            diagnostics: emitterDiagnostics.getDiagnostics(),
-            emittedFiles: emittedFilesList,
-            sourceMaps: sourceMapDataList
-        };
-        function isUniqueLocalName(name, container) {
-            for (var node = container; ts.isNodeDescendentOf(node, container); node = node.nextContainer) {
-                if (node.locals && ts.hasProperty(node.locals, name)) {
-                    // We conservatively include alias symbols to cover cases where they're emitted as locals
-                    if (node.locals[name].flags & (107455 /* Value */ | 1048576 /* ExportValue */ | 8388608 /* Alias */)) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        function setLabeledJump(state, isBreak, labelText, labelMarker) {
-            if (isBreak) {
-                if (!state.labeledNonLocalBreaks) {
-                    state.labeledNonLocalBreaks = {};
-                }
-                state.labeledNonLocalBreaks[labelText] = labelMarker;
-            }
-            else {
-                if (!state.labeledNonLocalContinues) {
-                    state.labeledNonLocalContinues = {};
-                }
-                state.labeledNonLocalContinues[labelText] = labelMarker;
-            }
-        }
-        function hoistVariableDeclarationFromLoop(state, declaration) {
-            if (!state.hoistedLocalVariables) {
-                state.hoistedLocalVariables = [];
-            }
-            visit(declaration.name);
-            function visit(node) {
-                if (node.kind === 69 /* Identifier */) {
-                    state.hoistedLocalVariables.push(node);
-                }
-                else {
-                    for (var _a = 0, _b = node.elements; _a < _b.length; _a++) {
-                        var element = _b[_a];
-                        visit(element.name);
-                    }
-                }
-            }
-        }
-        function createFileEmitter() {
-            var writer = ts.createTextWriter(newLine);
-            var write = writer.write, writeTextOfNode = writer.writeTextOfNode, writeLine = writer.writeLine, increaseIndent = writer.increaseIndent, decreaseIndent = writer.decreaseIndent;
-            var sourceMap = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? ts.createSourceMapWriter(host, writer) : ts.getNullSourceMapWriter();
-            var setSourceFile = sourceMap.setSourceFile, emitStart = sourceMap.emitStart, emitEnd = sourceMap.emitEnd, emitPos = sourceMap.emitPos;
-            var currentSourceFile;
-            var currentText;
-            var currentLineMap;
-            var currentFileIdentifiers;
-            var renamedDependencies;
-            var isEs6Module;
-            var isCurrentFileExternalModule;
-            // name of an exporter function if file is a System external module
-            // System.register([...], function (<exporter>) {...})
-            // exporting in System modules looks like:
-            // export var x; ... x = 1
-            // =>
-            // var x;... exporter("x", x = 1)
-            var exportFunctionForFile;
-            var contextObjectForFile;
-            var generatedNameSet;
-            var nodeToGeneratedName;
-            var computedPropertyNamesToGeneratedNames;
-            var decoratedClassAliases;
-            var convertedLoopState;
-            var extendsEmitted;
-            var assignEmitted;
-            var decorateEmitted;
-            var paramEmitted;
-            var awaiterEmitted;
-            var tempFlags = 0;
-            var tempVariables;
-            var tempParameters;
-            var externalImports;
-            var exportSpecifiers;
-            var exportEquals;
-            var hasExportStarsToExportValues;
-            var detachedCommentsInfo;
-            /** Sourcemap data that will get encoded */
-            var sourceMapData;
-            /** Is the file being emitted into its own file */
-            var isOwnFileEmit;
-            /** If removeComments is true, no leading-comments needed to be emitted **/
-            var emitLeadingCommentsOfPosition = compilerOptions.removeComments ? function (pos) { } : emitLeadingCommentsOfPositionWorker;
-            var setSourceMapWriterEmit = compilerOptions.sourceMap || compilerOptions.inlineSourceMap ? changeSourceMapEmit : function (writer) { };
-            var moduleEmitDelegates = (_a = {},
-                _a[ts.ModuleKind.ES6] = emitES6Module,
-                _a[ts.ModuleKind.AMD] = emitAMDModule,
-                _a[ts.ModuleKind.System] = emitSystemModule,
-                _a[ts.ModuleKind.UMD] = emitUMDModule,
-                _a[ts.ModuleKind.CommonJS] = emitCommonJSModule,
-                _a
-            );
-            var bundleEmitDelegates = (_b = {},
-                _b[ts.ModuleKind.ES6] = function () { },
-                _b[ts.ModuleKind.AMD] = emitAMDModule,
-                _b[ts.ModuleKind.System] = emitSystemModule,
-                _b[ts.ModuleKind.UMD] = function () { },
-                _b[ts.ModuleKind.CommonJS] = function () { },
-                _b
-            );
-            return doEmit;
-            function doEmit(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit) {
-                sourceMap.initialize(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
-                generatedNameSet = {};
-                nodeToGeneratedName = [];
-                decoratedClassAliases = [];
-                isOwnFileEmit = !isBundledEmit;
-                // Emit helpers from all the files
-                if (isBundledEmit && modulekind) {
-                    ts.forEach(sourceFiles, emitEmitHelpers);
-                }
-                // Do not call emit directly. It does not set the currentSourceFile.
-                ts.forEach(sourceFiles, emitSourceFile);
-                writeLine();
-                var sourceMappingURL = sourceMap.getSourceMappingURL();
-                if (sourceMappingURL) {
-                    write("//# sourceMappingURL=" + sourceMappingURL);
-                }
-                writeEmittedFiles(writer.getText(), jsFilePath, sourceMapFilePath, /*writeByteOrderMark*/ compilerOptions.emitBOM, sourceFiles);
-                // reset the state
-                sourceMap.reset();
-                writer.reset();
-                currentSourceFile = undefined;
-                currentText = undefined;
-                currentLineMap = undefined;
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                generatedNameSet = undefined;
-                nodeToGeneratedName = undefined;
-                decoratedClassAliases = undefined;
-                computedPropertyNamesToGeneratedNames = undefined;
-                convertedLoopState = undefined;
-                extendsEmitted = false;
-                decorateEmitted = false;
-                paramEmitted = false;
-                awaiterEmitted = false;
-                assignEmitted = false;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = undefined;
-                detachedCommentsInfo = undefined;
-                sourceMapData = undefined;
-                isEs6Module = false;
-                renamedDependencies = undefined;
-                isCurrentFileExternalModule = false;
-            }
-            function emitSourceFile(sourceFile) {
-                currentSourceFile = sourceFile;
-                currentText = sourceFile.text;
-                currentLineMap = ts.getLineStarts(sourceFile);
-                exportFunctionForFile = undefined;
-                contextObjectForFile = undefined;
-                isEs6Module = sourceFile.symbol && sourceFile.symbol.exports && !!sourceFile.symbol.exports["___esModule"];
-                renamedDependencies = sourceFile.renamedDependencies;
-                currentFileIdentifiers = sourceFile.identifiers;
-                isCurrentFileExternalModule = ts.isExternalModule(sourceFile);
-                setSourceFile(sourceFile);
-                emitNodeWithCommentsAndWithoutSourcemap(sourceFile);
-            }
-            function isUniqueName(name) {
-                return !resolver.hasGlobalName(name) &&
-                    !ts.hasProperty(currentFileIdentifiers, name) &&
-                    !ts.hasProperty(generatedNameSet, name);
-            }
-            // Return the next available name in the pattern _a ... _z, _0, _1, ...
-            // TempFlags._i or TempFlags._n may be used to express a preference for that dedicated name.
-            // Note that names generated by makeTempVariableName and makeUniqueName will never conflict.
-            function makeTempVariableName(flags) {
-                if (flags && !(tempFlags & flags)) {
-                    var name_24 = flags === 268435456 /* _i */ ? "_i" : "_n";
-                    if (isUniqueName(name_24)) {
-                        tempFlags |= flags;
-                        return name_24;
-                    }
-                }
-                while (true) {
-                    var count = tempFlags & 268435455 /* CountMask */;
-                    tempFlags++;
-                    // Skip over 'i' and 'n'
-                    if (count !== 8 && count !== 13) {
-                        var name_25 = count < 26 ? "_" + String.fromCharCode(97 /* a */ + count) : "_" + (count - 26);
-                        if (isUniqueName(name_25)) {
-                            return name_25;
-                        }
-                    }
-                }
-            }
-            // Generate a name that is unique within the current file and doesn't conflict with any names
-            // in global scope. The name is formed by adding an '_n' suffix to the specified base name,
-            // where n is a positive integer. Note that names generated by makeTempVariableName and
-            // makeUniqueName are guaranteed to never conflict.
-            function makeUniqueName(baseName) {
-                // Find the first unique 'name_n', where n is a positive number
-                if (baseName.charCodeAt(baseName.length - 1) !== 95 /* _ */) {
-                    baseName += "_";
-                }
-                var i = 1;
-                while (true) {
-                    var generatedName = baseName + i;
-                    if (isUniqueName(generatedName)) {
-                        return generatedNameSet[generatedName] = generatedName;
-                    }
-                    i++;
-                }
-            }
-            function generateNameForModuleOrEnum(node) {
-                var name = node.name.text;
-                // Use module/enum name itself if it is unique, otherwise make a unique variation
-                return isUniqueLocalName(name, node) ? name : makeUniqueName(name);
-            }
-            function generateNameForImportOrExportDeclaration(node) {
-                var expr = ts.getExternalModuleName(node);
-                var baseName = expr.kind === 9 /* StringLiteral */ ?
-                    ts.escapeIdentifier(ts.makeIdentifierFromModuleName(expr.text)) : "module";
-                return makeUniqueName(baseName);
-            }
-            function generateNameForExportDefault() {
-                return makeUniqueName("default");
-            }
-            function generateNameForClassExpression() {
-                return makeUniqueName("class");
-            }
-            function generateNameForNode(node) {
-                switch (node.kind) {
-                    case 69 /* Identifier */:
-                        return makeUniqueName(node.text);
-                    case 225 /* ModuleDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                        return generateNameForModuleOrEnum(node);
-                    case 230 /* ImportDeclaration */:
-                    case 236 /* ExportDeclaration */:
-                        return generateNameForImportOrExportDeclaration(node);
-                    case 220 /* FunctionDeclaration */:
-                    case 221 /* ClassDeclaration */:
-                    case 235 /* ExportAssignment */:
-                        return generateNameForExportDefault();
-                    case 192 /* ClassExpression */:
-                        return generateNameForClassExpression();
-                    default:
-                        ts.Debug.fail();
-                }
-            }
-            function getGeneratedNameForNode(node) {
-                var id = ts.getNodeId(node);
-                return nodeToGeneratedName[id] || (nodeToGeneratedName[id] = ts.unescapeIdentifier(generateNameForNode(node)));
-            }
-            /** Write emitted output to disk */
-            function writeEmittedFiles(emitOutput, jsFilePath, sourceMapFilePath, writeByteOrderMark, sourceFiles) {
-                if (compilerOptions.sourceMap && !compilerOptions.inlineSourceMap) {
-                    ts.writeFile(host, emitterDiagnostics, sourceMapFilePath, sourceMap.getText(), /*writeByteOrderMark*/ false, sourceFiles);
-                }
-                if (sourceMapDataList) {
-                    sourceMapDataList.push(sourceMap.getSourceMapData());
-                }
-                ts.writeFile(host, emitterDiagnostics, jsFilePath, emitOutput, writeByteOrderMark, sourceFiles);
-            }
-            // Create a temporary variable with a unique unused name.
-            function createTempVariable(flags) {
-                var result = ts.createSynthesizedNode(69 /* Identifier */);
-                result.text = makeTempVariableName(flags);
-                return result;
-            }
-            function recordTempDeclaration(name) {
-                if (!tempVariables) {
-                    tempVariables = [];
-                }
-                tempVariables.push(name);
-            }
-            function createAndRecordTempVariable(flags) {
-                var temp = createTempVariable(flags);
-                recordTempDeclaration(temp);
-                return temp;
-            }
-            function emitTempDeclarations(newLine) {
-                if (tempVariables) {
-                    if (newLine) {
-                        writeLine();
-                    }
-                    else {
-                        write(" ");
-                    }
-                    write("var ");
-                    emitCommaList(tempVariables);
-                    write(";");
-                }
-            }
-            /** Emit the text for the given token that comes after startPos
-              * This by default writes the text provided with the given tokenKind
-              * but if optional emitFn callback is provided the text is emitted using the callback instead of default text
-              * @param tokenKind the kind of the token to search and emit
-              * @param startPos the position in the source to start searching for the token
-              * @param emitFn if given will be invoked to emit the text instead of actual token emit */
-            function emitToken(tokenKind, startPos, emitFn) {
-                var tokenStartPos = ts.skipTrivia(currentText, startPos);
-                emitPos(tokenStartPos);
-                var tokenString = ts.tokenToString(tokenKind);
-                if (emitFn) {
-                    emitFn();
-                }
-                else {
-                    write(tokenString);
-                }
-                var tokenEndPos = tokenStartPos + tokenString.length;
-                emitPos(tokenEndPos);
-                return tokenEndPos;
-            }
-            function emitOptional(prefix, node) {
-                if (node) {
-                    write(prefix);
-                    emit(node);
-                }
-            }
-            function emitParenthesizedIf(node, parenthesized) {
-                if (parenthesized) {
-                    write("(");
-                }
-                emit(node);
-                if (parenthesized) {
-                    write(")");
-                }
-            }
-            function emitLinePreservingList(parent, nodes, allowTrailingComma, spacesBetweenBraces) {
-                ts.Debug.assert(nodes.length > 0);
-                increaseIndent();
-                if (nodeStartPositionsAreOnSameLine(parent, nodes[0])) {
-                    if (spacesBetweenBraces) {
-                        write(" ");
-                    }
-                }
-                else {
-                    writeLine();
-                }
-                for (var i = 0, n = nodes.length; i < n; i++) {
-                    if (i) {
-                        if (nodeEndIsOnSameLineAsNodeStart(nodes[i - 1], nodes[i])) {
-                            write(", ");
-                        }
-                        else {
-                            write(",");
-                            writeLine();
-                        }
-                    }
-                    emit(nodes[i]);
-                }
-                if (nodes.hasTrailingComma && allowTrailingComma) {
-                    write(",");
-                }
-                decreaseIndent();
-                if (nodeEndPositionsAreOnSameLine(parent, ts.lastOrUndefined(nodes))) {
-                    if (spacesBetweenBraces) {
-                        write(" ");
-                    }
-                }
-                else {
-                    writeLine();
-                }
-            }
-            function emitList(nodes, start, count, multiLine, trailingComma, leadingComma, noTrailingNewLine, emitNode) {
-                if (!emitNode) {
-                    emitNode = emit;
-                }
-                for (var i = 0; i < count; i++) {
-                    if (multiLine) {
-                        if (i || leadingComma) {
-                            write(",");
-                        }
-                        writeLine();
-                    }
-                    else {
-                        if (i || leadingComma) {
-                            write(", ");
-                        }
-                    }
-                    var node = nodes[start + i];
-                    // This emitting is to make sure we emit following comment properly
-                    //   ...(x, /*comment1*/ y)...
-                    //         ^ => node.pos
-                    // "comment1" is not considered leading comment for "y" but rather
-                    // considered as trailing comment of the previous node.
-                    emitTrailingCommentsOfPosition(node.pos);
-                    emitNode(node);
-                    leadingComma = true;
-                }
-                if (trailingComma) {
-                    write(",");
-                }
-                if (multiLine && !noTrailingNewLine) {
-                    writeLine();
-                }
-                return count;
-            }
-            function emitCommaList(nodes) {
-                if (nodes) {
-                    emitList(nodes, 0, nodes.length, /*multiLine*/ false, /*trailingComma*/ false);
-                }
-            }
-            function emitLines(nodes) {
-                emitLinesStartingAt(nodes, /*startIndex*/ 0);
-            }
-            function emitLinesStartingAt(nodes, startIndex) {
-                for (var i = startIndex; i < nodes.length; i++) {
-                    writeLine();
-                    emit(nodes[i]);
-                }
-            }
-            function isBinaryOrOctalIntegerLiteral(node, text) {
-                if (node.kind === 8 /* NumericLiteral */ && text.length > 1) {
-                    switch (text.charCodeAt(1)) {
-                        case 98 /* b */:
-                        case 66 /* B */:
-                        case 111 /* o */:
-                        case 79 /* O */:
-                            return true;
-                    }
-                }
-                return false;
-            }
-            function emitLiteral(node) {
-                var text = getLiteralText(node);
-                if ((compilerOptions.sourceMap || compilerOptions.inlineSourceMap) && (node.kind === 9 /* StringLiteral */ || ts.isTemplateLiteralKind(node.kind))) {
-                    writer.writeLiteral(text);
-                }
-                else if (languageVersion < 2 /* ES6 */ && isBinaryOrOctalIntegerLiteral(node, text)) {
-                    write(node.text);
-                }
-                else {
-                    write(text);
-                }
-            }
-            function getLiteralText(node) {
-                // Any template literal or string literal with an extended escape
-                // (e.g. "\u{0067}") will need to be downleveled as a escaped string literal.
-                if (languageVersion < 2 /* ES6 */ && (ts.isTemplateLiteralKind(node.kind) || node.hasExtendedUnicodeEscape)) {
-                    return getQuotedEscapedLiteralText('"', node.text, '"');
-                }
-                // If we don't need to downlevel and we can reach the original source text using
-                // the node's parent reference, then simply get the text as it was originally written.
-                if (node.parent) {
-                    return ts.getTextOfNodeFromSourceText(currentText, node);
-                }
-                // If we can't reach the original source text, use the canonical form if it's a number,
-                // or an escaped quoted form of the original text if it's string-like.
-                switch (node.kind) {
-                    case 9 /* StringLiteral */:
-                        return getQuotedEscapedLiteralText('"', node.text, '"');
-                    case 11 /* NoSubstitutionTemplateLiteral */:
-                        return getQuotedEscapedLiteralText("`", node.text, "`");
-                    case 12 /* TemplateHead */:
-                        return getQuotedEscapedLiteralText("`", node.text, "${");
-                    case 13 /* TemplateMiddle */:
-                        return getQuotedEscapedLiteralText("}", node.text, "${");
-                    case 14 /* TemplateTail */:
-                        return getQuotedEscapedLiteralText("}", node.text, "`");
-                    case 8 /* NumericLiteral */:
-                        return node.text;
-                }
-                ts.Debug.fail("Literal kind '" + node.kind + "' not accounted for.");
-            }
-            function getQuotedEscapedLiteralText(leftQuote, text, rightQuote) {
-                return leftQuote + ts.escapeNonAsciiCharacters(ts.escapeString(text)) + rightQuote;
-            }
-            function emitDownlevelRawTemplateLiteral(node) {
-                // Find original source text, since we need to emit the raw strings of the tagged template.
-                // The raw strings contain the (escaped) strings of what the user wrote.
-                // Examples: `\n` is converted to "\\n", a template string with a newline to "\n".
-                var text = ts.getTextOfNodeFromSourceText(currentText, node);
-                // text contains the original source, it will also contain quotes ("`"), dollar signs and braces ("${" and "}"),
-                // thus we need to remove those characters.
-                // First template piece starts with "`", others with "}"
-                // Last template piece ends with "`", others with "${"
-                var isLast = node.kind === 11 /* NoSubstitutionTemplateLiteral */ || node.kind === 14 /* TemplateTail */;
-                text = text.substring(1, text.length - (isLast ? 1 : 2));
-                // Newline normalization:
-                // ES6 Spec 11.8.6.1 - Static Semantics of TV's and TRV's
-                // <CR><LF> and <CR> LineTerminatorSequences are normalized to <LF> for both TV and TRV.
-                text = text.replace(/\r\n?/g, "\n");
-                text = ts.escapeString(text);
-                write("\"" + text + "\"");
-            }
-            function emitDownlevelTaggedTemplateArray(node, literalEmitter) {
-                write("[");
-                if (node.template.kind === 11 /* NoSubstitutionTemplateLiteral */) {
-                    literalEmitter(node.template);
-                }
-                else {
-                    literalEmitter(node.template.head);
-                    ts.forEach(node.template.templateSpans, function (child) {
-                        write(", ");
-                        literalEmitter(child.literal);
-                    });
-                }
-                write("]");
-            }
-            function emitDownlevelTaggedTemplate(node) {
-                var tempVariable = createAndRecordTempVariable(0 /* Auto */);
-                write("(");
-                emit(tempVariable);
-                write(" = ");
-                emitDownlevelTaggedTemplateArray(node, emit);
-                write(", ");
-                emit(tempVariable);
-                write(".raw = ");
-                emitDownlevelTaggedTemplateArray(node, emitDownlevelRawTemplateLiteral);
-                write(", ");
-                emitParenthesizedIf(node.tag, needsParenthesisForPropertyAccessOrInvocation(node.tag));
-                write("(");
-                emit(tempVariable);
-                // Now we emit the expressions
-                if (node.template.kind === 189 /* TemplateExpression */) {
-                    ts.forEach(node.template.templateSpans, function (templateSpan) {
-                        write(", ");
-                        var needsParens = templateSpan.expression.kind === 187 /* BinaryExpression */
-                            && templateSpan.expression.operatorToken.kind === 24 /* CommaToken */;
-                        emitParenthesizedIf(templateSpan.expression, needsParens);
-                    });
-                }
-                write("))");
-            }
-            function emitTemplateExpression(node) {
-                // In ES6 mode and above, we can simply emit each portion of a template in order, but in
-                // ES3 & ES5 we must convert the template expression into a series of string concatenations.
-                if (languageVersion >= 2 /* ES6 */) {
-                    ts.forEachChild(node, emit);
-                    return;
-                }
-                var emitOuterParens = ts.isExpression(node.parent)
-                    && templateNeedsParens(node, node.parent);
-                if (emitOuterParens) {
-                    write("(");
-                }
-                var headEmitted = false;
-                if (shouldEmitTemplateHead()) {
-                    emitLiteral(node.head);
-                    headEmitted = true;
-                }
-                for (var i = 0, n = node.templateSpans.length; i < n; i++) {
-                    var templateSpan = node.templateSpans[i];
-                    // Check if the expression has operands and binds its operands less closely than binary '+'.
-                    // If it does, we need to wrap the expression in parentheses. Otherwise, something like
-                    //    `abc${ 1 << 2 }`
-                    // becomes
-                    //    "abc" + 1 << 2 + ""
-                    // which is really
-                    //    ("abc" + 1) << (2 + "")
-                    // rather than
-                    //    "abc" + (1 << 2) + ""
-                    var needsParens = templateSpan.expression.kind !== 178 /* ParenthesizedExpression */
-                        && comparePrecedenceToBinaryPlus(templateSpan.expression) !== 1 /* GreaterThan */;
-                    if (i > 0 || headEmitted) {
-                        // If this is the first span and the head was not emitted, then this templateSpan's
-                        // expression will be the first to be emitted. Don't emit the preceding ' + ' in that
-                        // case.
-                        write(" + ");
-                    }
-                    emitParenthesizedIf(templateSpan.expression, needsParens);
-                    // Only emit if the literal is non-empty.
-                    // The binary '+' operator is left-associative, so the first string concatenation
-                    // with the head will force the result up to this point to be a string.
-                    // Emitting a '+ ""' has no semantic effect for middles and tails.
-                    if (templateSpan.literal.text.length !== 0) {
-                        write(" + ");
-                        emitLiteral(templateSpan.literal);
-                    }
-                }
-                if (emitOuterParens) {
-                    write(")");
-                }
-                function shouldEmitTemplateHead() {
-                    // If this expression has an empty head literal and the first template span has a non-empty
-                    // literal, then emitting the empty head literal is not necessary.
-                    //     `${ foo } and ${ bar }`
-                    // can be emitted as
-                    //     foo + " and " + bar
-                    // This is because it is only required that one of the first two operands in the emit
-                    // output must be a string literal, so that the other operand and all following operands
-                    // are forced into strings.
-                    //
-                    // If the first template span has an empty literal, then the head must still be emitted.
-                    //     `${ foo }${ bar }`
-                    // must still be emitted as
-                    //     "" + foo + bar
-                    // There is always atleast one templateSpan in this code path, since
-                    // NoSubstitutionTemplateLiterals are directly emitted via emitLiteral()
-                    ts.Debug.assert(node.templateSpans.length !== 0);
-                    return node.head.text.length !== 0 || node.templateSpans[0].literal.text.length === 0;
-                }
-                function templateNeedsParens(template, parent) {
-                    switch (parent.kind) {
-                        case 174 /* CallExpression */:
-                        case 175 /* NewExpression */:
-                            return parent.expression === template;
-                        case 176 /* TaggedTemplateExpression */:
-                        case 178 /* ParenthesizedExpression */:
-                            return false;
-                        default:
-                            return comparePrecedenceToBinaryPlus(parent) !== -1 /* LessThan */;
-                    }
-                }
-                /**
-                 * Returns whether the expression has lesser, greater,
-                 * or equal precedence to the binary '+' operator
-                 */
-                function comparePrecedenceToBinaryPlus(expression) {
-                    // All binary expressions have lower precedence than '+' apart from '*', '/', and '%'
-                    // which have greater precedence and '-' which has equal precedence.
-                    // All unary operators have a higher precedence apart from yield.
-                    // Arrow functions and conditionals have a lower precedence,
-                    // although we convert the former into regular function expressions in ES5 mode,
-                    // and in ES6 mode this function won't get called anyway.
-                    //
-                    // TODO (drosen): Note that we need to account for the upcoming 'yield' and
-                    //                spread ('...') unary operators that are anticipated for ES6.
-                    switch (expression.kind) {
-                        case 187 /* BinaryExpression */:
-                            switch (expression.operatorToken.kind) {
-                                case 37 /* AsteriskToken */:
-                                case 39 /* SlashToken */:
-                                case 40 /* PercentToken */:
-                                    return 1 /* GreaterThan */;
-                                case 35 /* PlusToken */:
-                                case 36 /* MinusToken */:
-                                    return 0 /* EqualTo */;
-                                default:
-                                    return -1 /* LessThan */;
-                            }
-                        case 190 /* YieldExpression */:
-                        case 188 /* ConditionalExpression */:
-                            return -1 /* LessThan */;
-                        default:
-                            return 1 /* GreaterThan */;
-                    }
-                }
-            }
-            function emitTemplateSpan(span) {
-                emit(span.expression);
-                emit(span.literal);
-            }
-            function jsxEmitReact(node) {
-                /// Emit a tag name, which is either '"div"' for lower-cased names, or
-                /// 'Div' for upper-cased or dotted names
-                function emitTagName(name) {
-                    if (name.kind === 69 /* Identifier */ && ts.isIntrinsicJsxName(name.text)) {
-                        write('"');
-                        emit(name);
-                        write('"');
-                    }
-                    else {
-                        emit(name);
-                    }
-                }
-                /// Emit an attribute name, which is quoted if it needs to be quoted. Because
-                /// these emit into an object literal property name, we don't need to be worried
-                /// about keywords, just non-identifier characters
-                function emitAttributeName(name) {
-                    if (/^[A-Za-z_]\w*$/.test(name.text)) {
-                        emit(name);
-                    }
-                    else {
-                        write('"');
-                        emit(name);
-                        write('"');
-                    }
-                }
-                /// Emit an name/value pair for an attribute (e.g. "x: 3")
-                function emitJsxAttribute(node) {
-                    emitAttributeName(node.name);
-                    write(": ");
-                    if (node.initializer) {
-                        emit(node.initializer);
-                    }
-                    else {
-                        write("true");
-                    }
-                }
-                function emitJsxElement(openingNode, children) {
-                    var syntheticReactRef = ts.createSynthesizedNode(69 /* Identifier */);
-                    syntheticReactRef.text = compilerOptions.reactNamespace ? compilerOptions.reactNamespace : "React";
-                    syntheticReactRef.parent = openingNode;
-                    // Call React.createElement(tag, ...
-                    emitLeadingComments(openingNode);
-                    emitExpressionIdentifier(syntheticReactRef);
-                    write(".createElement(");
-                    emitTagName(openingNode.tagName);
-                    write(", ");
-                    // Attribute list
-                    if (openingNode.attributes.length === 0) {
-                        // When there are no attributes, React wants "null"
-                        write("null");
-                    }
-                    else {
-                        // Either emit one big object literal (no spread attribs), or
-                        // a call to the __assign helper
-                        var attrs = openingNode.attributes;
-                        if (ts.forEach(attrs, function (attr) { return attr.kind === 247 /* JsxSpreadAttribute */; })) {
-                            write("__assign(");
-                            var haveOpenedObjectLiteral = false;
-                            for (var i = 0; i < attrs.length; i++) {
-                                if (attrs[i].kind === 247 /* JsxSpreadAttribute */) {
-                                    // If this is the first argument, we need to emit a {} as the first argument
-                                    if (i === 0) {
-                                        write("{}, ");
-                                    }
-                                    if (haveOpenedObjectLiteral) {
-                                        write("}");
-                                        haveOpenedObjectLiteral = false;
-                                    }
-                                    if (i > 0) {
-                                        write(", ");
-                                    }
-                                    emit(attrs[i].expression);
-                                }
-                                else {
-                                    ts.Debug.assert(attrs[i].kind === 246 /* JsxAttribute */);
-                                    if (haveOpenedObjectLiteral) {
-                                        write(", ");
-                                    }
-                                    else {
-                                        haveOpenedObjectLiteral = true;
-                                        if (i > 0) {
-                                            write(", ");
-                                        }
-                                        write("{");
-                                    }
-                                    emitJsxAttribute(attrs[i]);
-                                }
-                            }
-                            if (haveOpenedObjectLiteral)
-                                write("}");
-                            write(")"); // closing paren to React.__spread(
-                        }
-                        else {
-                            // One object literal with all the attributes in them
-                            write("{");
-                            for (var i = 0, n = attrs.length; i < n; i++) {
-                                if (i > 0) {
-                                    write(", ");
-                                }
-                                emitJsxAttribute(attrs[i]);
-                            }
-                            write("}");
-                        }
-                    }
-                    // Children
-                    if (children) {
-                        var firstChild = void 0;
-                        var multipleEmittableChildren = false;
-                        for (var i = 0, n = children.length; i < n; i++) {
-                            var jsxChild = children[i];
-                            if (isJsxChildEmittable(jsxChild)) {
-                                // we need to decide whether to emit in single line or multiple lines as indented list
-                                // store firstChild reference, if we see another emittable child, then emit accordingly
-                                if (!firstChild) {
-                                    write(", ");
-                                    firstChild = jsxChild;
-                                }
-                                else {
-                                    // more than one emittable child, emit indented list
-                                    if (!multipleEmittableChildren) {
-                                        multipleEmittableChildren = true;
-                                        increaseIndent();
-                                        writeLine();
-                                        emit(firstChild);
-                                    }
-                                    write(", ");
-                                    writeLine();
-                                    emit(jsxChild);
-                                }
-                            }
-                        }
-                        if (multipleEmittableChildren) {
-                            decreaseIndent();
-                        }
-                        else if (firstChild) {
-                            if (firstChild.kind !== 241 /* JsxElement */ && firstChild.kind !== 242 /* JsxSelfClosingElement */) {
-                                emit(firstChild);
-                            }
-                            else {
-                                // If the only child is jsx element, put it on a new indented line
-                                increaseIndent();
-                                writeLine();
-                                emit(firstChild);
-                                writeLine();
-                                decreaseIndent();
-                            }
-                        }
-                    }
-                    // Closing paren
-                    write(")"); // closes "React.createElement("
-                    emitTrailingComments(openingNode);
-                }
-                if (node.kind === 241 /* JsxElement */) {
-                    emitJsxElement(node.openingElement, node.children);
-                }
-                else {
-                    ts.Debug.assert(node.kind === 242 /* JsxSelfClosingElement */);
-                    emitJsxElement(node);
-                }
-            }
-            function jsxEmitPreserve(node) {
-                function emitJsxAttribute(node) {
-                    emit(node.name);
-                    if (node.initializer) {
-                        write("=");
-                        emit(node.initializer);
-                    }
-                }
-                function emitJsxSpreadAttribute(node) {
-                    write("{...");
-                    emit(node.expression);
-                    write("}");
-                }
-                function emitAttributes(attribs) {
-                    for (var i = 0, n = attribs.length; i < n; i++) {
-                        if (i > 0) {
-                            write(" ");
-                        }
-                        if (attribs[i].kind === 247 /* JsxSpreadAttribute */) {
-                            emitJsxSpreadAttribute(attribs[i]);
-                        }
-                        else {
-                            ts.Debug.assert(attribs[i].kind === 246 /* JsxAttribute */);
-                            emitJsxAttribute(attribs[i]);
-                        }
-                    }
-                }
-                function emitJsxOpeningOrSelfClosingElement(node) {
-                    write("<");
-                    emit(node.tagName);
-                    if (node.attributes.length > 0 || (node.kind === 242 /* JsxSelfClosingElement */)) {
-                        write(" ");
-                    }
-                    emitAttributes(node.attributes);
-                    if (node.kind === 242 /* JsxSelfClosingElement */) {
-                        write("/>");
-                    }
-                    else {
-                        write(">");
-                    }
-                }
-                function emitJsxClosingElement(node) {
-                    write("</");
-                    emit(node.tagName);
-                    write(">");
-                }
-                function emitJsxElement(node) {
-                    emitJsxOpeningOrSelfClosingElement(node.openingElement);
-                    for (var i = 0, n = node.children.length; i < n; i++) {
-                        emit(node.children[i]);
-                    }
-                    emitJsxClosingElement(node.closingElement);
-                }
-                if (node.kind === 241 /* JsxElement */) {
-                    emitJsxElement(node);
-                }
-                else {
-                    ts.Debug.assert(node.kind === 242 /* JsxSelfClosingElement */);
-                    emitJsxOpeningOrSelfClosingElement(node);
-                }
-            }
-            // This function specifically handles numeric/string literals for enum and accessor 'identifiers'.
-            // In a sense, it does not actually emit identifiers as much as it declares a name for a specific property.
-            // For example, this is utilized when feeding in a result to Object.defineProperty.
-            function emitExpressionForPropertyName(node) {
-                ts.Debug.assert(node.kind !== 169 /* BindingElement */);
-                if (node.kind === 9 /* StringLiteral */) {
-                    emitLiteral(node);
-                }
-                else if (node.kind === 140 /* ComputedPropertyName */) {
-                    // if this is a decorated computed property, we will need to capture the result
-                    // of the property expression so that we can apply decorators later. This is to ensure
-                    // we don't introduce unintended side effects:
-                    //
-                    //   class C {
-                    //     [_a = x]() { }
-                    //   }
-                    //
-                    // The emit for the decorated computed property decorator is:
-                    //
-                    //   __decorate([dec], C.prototype, _a, Object.getOwnPropertyDescriptor(C.prototype, _a));
-                    //
-                    if (ts.nodeIsDecorated(node.parent)) {
-                        if (!computedPropertyNamesToGeneratedNames) {
-                            computedPropertyNamesToGeneratedNames = [];
-                        }
-                        var generatedName = computedPropertyNamesToGeneratedNames[ts.getNodeId(node)];
-                        if (generatedName) {
-                            // we have already generated a variable for this node, write that value instead.
-                            write(generatedName);
-                            return;
-                        }
-                        generatedName = createAndRecordTempVariable(0 /* Auto */).text;
-                        computedPropertyNamesToGeneratedNames[ts.getNodeId(node)] = generatedName;
-                        write(generatedName);
-                        write(" = ");
-                    }
-                    emit(node.expression);
-                }
-                else {
-                    write('"');
-                    if (node.kind === 8 /* NumericLiteral */) {
-                        write(node.text);
-                    }
-                    else {
-                        writeTextOfNode(currentText, node);
-                    }
-                    write('"');
-                }
-            }
-            function isExpressionIdentifier(node) {
-                var parent = node.parent;
-                switch (parent.kind) {
-                    case 170 /* ArrayLiteralExpression */:
-                    case 195 /* AsExpression */:
-                    case 184 /* AwaitExpression */:
-                    case 187 /* BinaryExpression */:
-                    case 174 /* CallExpression */:
-                    case 249 /* CaseClause */:
-                    case 140 /* ComputedPropertyName */:
-                    case 188 /* ConditionalExpression */:
-                    case 143 /* Decorator */:
-                    case 181 /* DeleteExpression */:
-                    case 204 /* DoStatement */:
-                    case 173 /* ElementAccessExpression */:
-                    case 235 /* ExportAssignment */:
-                    case 202 /* ExpressionStatement */:
-                    case 194 /* ExpressionWithTypeArguments */:
-                    case 206 /* ForStatement */:
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                    case 203 /* IfStatement */:
-                    case 245 /* JsxClosingElement */:
-                    case 242 /* JsxSelfClosingElement */:
-                    case 243 /* JsxOpeningElement */:
-                    case 247 /* JsxSpreadAttribute */:
-                    case 248 /* JsxExpression */:
-                    case 175 /* NewExpression */:
-                    case 196 /* NonNullExpression */:
-                    case 178 /* ParenthesizedExpression */:
-                    case 186 /* PostfixUnaryExpression */:
-                    case 185 /* PrefixUnaryExpression */:
-                    case 211 /* ReturnStatement */:
-                    case 254 /* ShorthandPropertyAssignment */:
-                    case 191 /* SpreadElementExpression */:
-                    case 213 /* SwitchStatement */:
-                    case 176 /* TaggedTemplateExpression */:
-                    case 197 /* TemplateSpan */:
-                    case 215 /* ThrowStatement */:
-                    case 177 /* TypeAssertionExpression */:
-                    case 182 /* TypeOfExpression */:
-                    case 183 /* VoidExpression */:
-                    case 205 /* WhileStatement */:
-                    case 212 /* WithStatement */:
-                    case 190 /* YieldExpression */:
-                        return true;
-                    case 169 /* BindingElement */:
-                    case 255 /* EnumMember */:
-                    case 142 /* Parameter */:
-                    case 253 /* PropertyAssignment */:
-                    case 145 /* PropertyDeclaration */:
-                    case 218 /* VariableDeclaration */:
-                        return parent.initializer === node;
-                    case 172 /* PropertyAccessExpression */:
-                        return parent.expression === node;
-                    case 180 /* ArrowFunction */:
-                    case 179 /* FunctionExpression */:
-                        return parent.body === node;
-                    case 229 /* ImportEqualsDeclaration */:
-                        return parent.moduleReference === node;
-                    case 139 /* QualifiedName */:
-                        return parent.left === node;
-                }
-                return false;
-            }
-            function emitExpressionIdentifier(node) {
-                var container = resolver.getReferencedExportContainer(node);
-                if (container) {
-                    if (container.kind === 256 /* SourceFile */) {
-                        // Identifier references module export
-                        if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
-                            write("exports.");
-                        }
-                    }
-                    else {
-                        // Identifier references namespace export
-                        write(getGeneratedNameForNode(container));
-                        write(".");
-                    }
-                }
-                else {
-                    if (modulekind !== ts.ModuleKind.ES6) {
-                        var declaration = resolver.getReferencedImportDeclaration(node);
-                        if (declaration) {
-                            if (declaration.kind === 231 /* ImportClause */) {
-                                // Identifier references default import
-                                write(getGeneratedNameForNode(declaration.parent));
-                                write(languageVersion === 0 /* ES3 */ ? '["default"]' : ".default");
-                                return;
-                            }
-                            else if (declaration.kind === 234 /* ImportSpecifier */) {
-                                // Identifier references named import
-                                write(getGeneratedNameForNode(declaration.parent.parent.parent));
-                                var name_26 = declaration.propertyName || declaration.name;
-                                var identifier = ts.getTextOfNodeFromSourceText(currentText, name_26);
-                                if (languageVersion === 0 /* ES3 */ && identifier === "default") {
-                                    write('["default"]');
-                                }
-                                else {
-                                    write(".");
-                                    write(identifier);
-                                }
-                                return;
-                            }
-                        }
-                    }
-                    if (languageVersion < 2 /* ES6 */) {
-                        var declaration = resolver.getReferencedDeclarationWithCollidingName(node);
-                        if (declaration) {
-                            write(getGeneratedNameForNode(declaration.name));
-                            return;
-                        }
-                    }
-                    else if (resolver.getNodeCheckFlags(node) & 1048576 /* BodyScopedClassBinding */) {
-                        // Due to the emit for class decorators, any reference to the class from inside of the class body
-                        // must instead be rewritten to point to a temporary variable to avoid issues with the double-bind
-                        // behavior of class names in ES6.
-                        var declaration = resolver.getReferencedValueDeclaration(node);
-                        if (declaration) {
-                            var classAlias = decoratedClassAliases[ts.getNodeId(declaration)];
-                            if (classAlias !== undefined) {
-                                write(classAlias);
-                                return;
-                            }
-                        }
-                    }
-                }
-                if (ts.nodeIsSynthesized(node)) {
-                    write(node.text);
-                }
-                else {
-                    writeTextOfNode(currentText, node);
-                }
-            }
-            function isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node) {
-                if (languageVersion < 2 /* ES6 */) {
-                    var parent_13 = node.parent;
-                    switch (parent_13.kind) {
-                        case 169 /* BindingElement */:
-                        case 221 /* ClassDeclaration */:
-                        case 224 /* EnumDeclaration */:
-                        case 218 /* VariableDeclaration */:
-                            return parent_13.name === node && resolver.isDeclarationWithCollidingName(parent_13);
-                    }
-                }
-                return false;
-            }
-            function getClassExpressionInPropertyAccessInStaticPropertyDeclaration(node) {
-                if (languageVersion >= 2 /* ES6 */) {
-                    var parent_14 = node.parent;
-                    if (parent_14.kind === 172 /* PropertyAccessExpression */ && parent_14.expression === node) {
-                        parent_14 = parent_14.parent;
-                        while (parent_14 && parent_14.kind !== 145 /* PropertyDeclaration */) {
-                            parent_14 = parent_14.parent;
-                        }
-                        return parent_14 && parent_14.kind === 145 /* PropertyDeclaration */ && (parent_14.flags & 32 /* Static */) !== 0 &&
-                            parent_14.parent.kind === 192 /* ClassExpression */ ? parent_14.parent : undefined;
-                    }
-                }
-                return undefined;
-            }
-            function emitIdentifier(node) {
-                if (convertedLoopState) {
-                    if (node.text == "arguments" && resolver.isArgumentsLocalBinding(node)) {
-                        // in converted loop body arguments cannot be used directly.
-                        var name_27 = convertedLoopState.argumentsName || (convertedLoopState.argumentsName = makeUniqueName("arguments"));
-                        write(name_27);
-                        return;
-                    }
-                }
-                if (!node.parent) {
-                    write(node.text);
-                }
-                else if (isExpressionIdentifier(node)) {
-                    var classExpression = getClassExpressionInPropertyAccessInStaticPropertyDeclaration(node);
-                    if (classExpression) {
-                        var declaration = resolver.getReferencedValueDeclaration(node);
-                        if (declaration === classExpression) {
-                            write(getGeneratedNameForNode(declaration.name));
-                            return;
-                        }
-                    }
-                    emitExpressionIdentifier(node);
-                }
-                else if (isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(node)) {
-                    write(getGeneratedNameForNode(node));
-                }
-                else if (ts.nodeIsSynthesized(node)) {
-                    write(node.text);
-                }
-                else {
-                    writeTextOfNode(currentText, node);
-                }
-            }
-            function emitThis(node) {
-                if (resolver.getNodeCheckFlags(node) & 2 /* LexicalThis */) {
-                    write("_this");
-                }
-                else if (convertedLoopState) {
-                    write(convertedLoopState.thisName || (convertedLoopState.thisName = makeUniqueName("this")));
-                }
-                else {
-                    write("this");
-                }
-            }
-            function emitSuper(node) {
-                if (languageVersion >= 2 /* ES6 */) {
-                    write("super");
-                }
-                else {
-                    var flags = resolver.getNodeCheckFlags(node);
-                    if (flags & 256 /* SuperInstance */) {
-                        write("_super.prototype");
-                    }
-                    else {
-                        write("_super");
-                    }
-                }
-            }
-            function emitObjectBindingPattern(node) {
-                write("{ ");
-                var elements = node.elements;
-                emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
-                write(" }");
-            }
-            function emitArrayBindingPattern(node) {
-                write("[");
-                var elements = node.elements;
-                emitList(elements, 0, elements.length, /*multiLine*/ false, /*trailingComma*/ elements.hasTrailingComma);
-                write("]");
-            }
-            function emitBindingElement(node) {
-                if (node.propertyName) {
-                    emit(node.propertyName);
-                    write(": ");
-                }
-                if (node.dotDotDotToken) {
-                    write("...");
-                }
-                if (ts.isBindingPattern(node.name)) {
-                    emit(node.name);
-                }
-                else {
-                    emitModuleMemberName(node);
-                }
-                emitOptional(" = ", node.initializer);
-            }
-            function emitSpreadElementExpression(node) {
-                write("...");
-                emit(node.expression);
-            }
-            function emitYieldExpression(node) {
-                write(ts.tokenToString(114 /* YieldKeyword */));
-                if (node.asteriskToken) {
-                    write("*");
-                }
-                if (node.expression) {
-                    write(" ");
-                    emit(node.expression);
-                }
-            }
-            function emitAwaitExpression(node) {
-                var needsParenthesis = needsParenthesisForAwaitExpressionAsYield(node);
-                if (needsParenthesis) {
-                    write("(");
-                }
-                write(ts.tokenToString(114 /* YieldKeyword */));
-                write(" ");
-                emit(node.expression);
-                if (needsParenthesis) {
-                    write(")");
-                }
-            }
-            function needsParenthesisForAwaitExpressionAsYield(node) {
-                if (node.parent.kind === 187 /* BinaryExpression */ && !ts.isAssignmentOperator(node.parent.operatorToken.kind)) {
-                    return true;
-                }
-                else if (node.parent.kind === 188 /* ConditionalExpression */ && node.parent.condition === node) {
-                    return true;
-                }
-                return false;
-            }
-            function needsParenthesisForPropertyAccessOrInvocation(node) {
-                switch (node.kind) {
-                    case 69 /* Identifier */:
-                    case 170 /* ArrayLiteralExpression */:
-                    case 172 /* PropertyAccessExpression */:
-                    case 173 /* ElementAccessExpression */:
-                    case 174 /* CallExpression */:
-                    case 178 /* ParenthesizedExpression */:
-                        // This list is not exhaustive and only includes those cases that are relevant
-                        // to the check in emitArrayLiteral. More cases can be added as needed.
-                        return false;
-                }
-                return true;
-            }
-            function emitListWithSpread(elements, needsUniqueCopy, multiLine, trailingComma, useConcat) {
-                var pos = 0;
-                var group = 0;
-                var length = elements.length;
-                while (pos < length) {
-                    // Emit using the pattern <group0>.concat(<group1>, <group2>, ...)
-                    if (group === 1 && useConcat) {
-                        write(".concat(");
-                    }
-                    else if (group > 0) {
-                        write(", ");
-                    }
-                    var e = elements[pos];
-                    if (e.kind === 191 /* SpreadElementExpression */) {
-                        e = e.expression;
-                        emitParenthesizedIf(e, /*parenthesized*/ group === 0 && needsParenthesisForPropertyAccessOrInvocation(e));
-                        pos++;
-                        if (pos === length && group === 0 && needsUniqueCopy && e.kind !== 170 /* ArrayLiteralExpression */) {
-                            write(".slice()");
-                        }
-                    }
-                    else {
-                        var i = pos;
-                        while (i < length && elements[i].kind !== 191 /* SpreadElementExpression */) {
-                            i++;
-                        }
-                        write("[");
-                        if (multiLine) {
-                            increaseIndent();
-                        }
-                        emitList(elements, pos, i - pos, multiLine, trailingComma && i === length);
-                        if (multiLine) {
-                            decreaseIndent();
-                        }
-                        write("]");
-                        pos = i;
-                    }
-                    group++;
-                }
-                if (group > 1) {
-                    if (useConcat) {
-                        write(")");
-                    }
-                }
-            }
-            function isSpreadElementExpression(node) {
-                return node.kind === 191 /* SpreadElementExpression */;
-            }
-            function emitArrayLiteral(node) {
-                var elements = node.elements;
-                if (elements.length === 0) {
-                    write("[]");
-                }
-                else if (languageVersion >= 2 /* ES6 */ || !ts.forEach(elements, isSpreadElementExpression)) {
-                    write("[");
-                    emitLinePreservingList(node, node.elements, elements.hasTrailingComma, /*spacesBetweenBraces*/ false);
-                    write("]");
-                }
-                else {
-                    emitListWithSpread(elements, /*needsUniqueCopy*/ true, /*multiLine*/ node.multiLine, 
-                    /*trailingComma*/ elements.hasTrailingComma, /*useConcat*/ true);
-                }
-            }
-            function emitObjectLiteralBody(node, numElements) {
-                if (numElements === 0) {
-                    write("{}");
-                    return;
-                }
-                write("{");
-                if (numElements > 0) {
-                    var properties = node.properties;
-                    // If we are not doing a downlevel transformation for object literals,
-                    // then try to preserve the original shape of the object literal.
-                    // Otherwise just try to preserve the formatting.
-                    if (numElements === properties.length) {
-                        emitLinePreservingList(node, properties, /*allowTrailingComma*/ languageVersion >= 1 /* ES5 */, /*spacesBetweenBraces*/ true);
-                    }
-                    else {
-                        var multiLine = node.multiLine;
-                        if (!multiLine) {
-                            write(" ");
-                        }
-                        else {
-                            increaseIndent();
-                        }
-                        emitList(properties, 0, numElements, /*multiLine*/ multiLine, /*trailingComma*/ false);
-                        if (!multiLine) {
-                            write(" ");
-                        }
-                        else {
-                            decreaseIndent();
-                        }
-                    }
-                }
-                write("}");
-            }
-            function emitDownlevelObjectLiteralWithComputedProperties(node, firstComputedPropertyIndex) {
-                var multiLine = node.multiLine;
-                var properties = node.properties;
-                write("(");
-                if (multiLine) {
-                    increaseIndent();
-                }
-                // For computed properties, we need to create a unique handle to the object
-                // literal so we can modify it without risking internal assignments tainting the object.
-                var tempVar = createAndRecordTempVariable(0 /* Auto */);
-                // Write out the first non-computed properties
-                // (or all properties if none of them are computed),
-                // then emit the rest through indexing on the temp variable.
-                emit(tempVar);
-                write(" = ");
-                emitObjectLiteralBody(node, firstComputedPropertyIndex);
-                for (var i = firstComputedPropertyIndex, n = properties.length; i < n; i++) {
-                    writeComma();
-                    var property = properties[i];
-                    emitStart(property);
-                    if (property.kind === 149 /* GetAccessor */ || property.kind === 150 /* SetAccessor */) {
-                        // TODO (drosen): Reconcile with 'emitMemberFunctions'.
-                        var accessors = ts.getAllAccessorDeclarations(node.properties, property);
-                        if (property !== accessors.firstAccessor) {
-                            continue;
-                        }
-                        write("Object.defineProperty(");
-                        emit(tempVar);
-                        write(", ");
-                        emitStart(property.name);
-                        emitExpressionForPropertyName(property.name);
-                        emitEnd(property.name);
-                        write(", {");
-                        increaseIndent();
-                        if (accessors.getAccessor) {
-                            writeLine();
-                            emitLeadingComments(accessors.getAccessor);
-                            write("get: ");
-                            emitStart(accessors.getAccessor);
-                            write("function ");
-                            emitSignatureAndBody(accessors.getAccessor);
-                            emitEnd(accessors.getAccessor);
-                            emitTrailingComments(accessors.getAccessor);
-                            write(",");
-                        }
-                        if (accessors.setAccessor) {
-                            writeLine();
-                            emitLeadingComments(accessors.setAccessor);
-                            write("set: ");
-                            emitStart(accessors.setAccessor);
-                            write("function ");
-                            emitSignatureAndBody(accessors.setAccessor);
-                            emitEnd(accessors.setAccessor);
-                            emitTrailingComments(accessors.setAccessor);
-                            write(",");
-                        }
-                        writeLine();
-                        write("enumerable: true,");
-                        writeLine();
-                        write("configurable: true");
-                        decreaseIndent();
-                        writeLine();
-                        write("})");
-                        emitEnd(property);
-                    }
-                    else {
-                        emitLeadingComments(property);
-                        emitStart(property.name);
-                        emit(tempVar);
-                        emitMemberAccessForPropertyName(property.name);
-                        emitEnd(property.name);
-                        write(" = ");
-                        if (property.kind === 253 /* PropertyAssignment */) {
-                            emit(property.initializer);
-                        }
-                        else if (property.kind === 254 /* ShorthandPropertyAssignment */) {
-                            emitExpressionIdentifier(property.name);
-                        }
-                        else if (property.kind === 147 /* MethodDeclaration */) {
-                            emitFunctionDeclaration(property);
-                        }
-                        else {
-                            ts.Debug.fail("ObjectLiteralElement type not accounted for: " + property.kind);
-                        }
-                    }
-                    emitEnd(property);
-                }
-                writeComma();
-                emit(tempVar);
-                if (multiLine) {
-                    decreaseIndent();
-                    writeLine();
-                }
-                write(")");
-                function writeComma() {
-                    if (multiLine) {
-                        write(",");
-                        writeLine();
-                    }
-                    else {
-                        write(", ");
-                    }
-                }
-            }
-            function emitObjectLiteral(node) {
-                var properties = node.properties;
-                if (languageVersion < 2 /* ES6 */) {
-                    var numProperties = properties.length;
-                    // Find the first computed property.
-                    // Everything until that point can be emitted as part of the initial object literal.
-                    var numInitialNonComputedProperties = numProperties;
-                    for (var i = 0, n = properties.length; i < n; i++) {
-                        if (properties[i].name.kind === 140 /* ComputedPropertyName */) {
-                            numInitialNonComputedProperties = i;
-                            break;
-                        }
-                    }
-                    var hasComputedProperty = numInitialNonComputedProperties !== properties.length;
-                    if (hasComputedProperty) {
-                        emitDownlevelObjectLiteralWithComputedProperties(node, numInitialNonComputedProperties);
-                        return;
-                    }
-                }
-                // Ordinary case: either the object has no computed properties
-                // or we're compiling with an ES6+ target.
-                emitObjectLiteralBody(node, properties.length);
-            }
-            function createBinaryExpression(left, operator, right, startsOnNewLine) {
-                var result = ts.createSynthesizedNode(187 /* BinaryExpression */, startsOnNewLine);
-                result.operatorToken = ts.createSynthesizedNode(operator);
-                result.left = left;
-                result.right = right;
-                return result;
-            }
-            function createPropertyAccessExpression(expression, name) {
-                var result = ts.createSynthesizedNode(172 /* PropertyAccessExpression */);
-                result.expression = parenthesizeForAccess(expression);
-                result.name = name;
-                return result;
-            }
-            function createElementAccessExpression(expression, argumentExpression) {
-                var result = ts.createSynthesizedNode(173 /* ElementAccessExpression */);
-                result.expression = parenthesizeForAccess(expression);
-                result.argumentExpression = argumentExpression;
-                return result;
-            }
-            function parenthesizeForAccess(expr) {
-                // When diagnosing whether the expression needs parentheses, the decision should be based
-                // on the innermost expression in a chain of nested type assertions.
-                while (expr.kind === 177 /* TypeAssertionExpression */ ||
-                    expr.kind === 195 /* AsExpression */ ||
-                    expr.kind === 196 /* NonNullExpression */) {
-                    expr = expr.expression;
-                }
-                // isLeftHandSideExpression is almost the correct criterion for when it is not necessary
-                // to parenthesize the expression before a dot. The known exceptions are:
-                //
-                //    NewExpression:
-                //       new C.x        -> not the same as (new C).x
-                //    NumberLiteral
-                //       1.x            -> not the same as (1).x
-                //
-                if (ts.isLeftHandSideExpression(expr) &&
-                    expr.kind !== 175 /* NewExpression */ &&
-                    expr.kind !== 8 /* NumericLiteral */) {
-                    return expr;
-                }
-                var node = ts.createSynthesizedNode(178 /* ParenthesizedExpression */);
-                node.expression = expr;
-                return node;
-            }
-            function emitComputedPropertyName(node) {
-                write("[");
-                emitExpressionForPropertyName(node);
-                write("]");
-            }
-            function emitMethod(node) {
-                if (languageVersion >= 2 /* ES6 */ && node.asteriskToken) {
-                    write("*");
-                }
-                emit(node.name);
-                if (languageVersion < 2 /* ES6 */) {
-                    write(": function ");
-                }
-                emitSignatureAndBody(node);
-            }
-            function emitPropertyAssignment(node) {
-                emit(node.name);
-                write(": ");
-                // This is to ensure that we emit comment in the following case:
-                //      For example:
-                //          obj = {
-                //              id: /*comment1*/ ()=>void
-                //          }
-                // "comment1" is not considered to be leading comment for node.initializer
-                // but rather a trailing comment on the previous node.
-                emitTrailingCommentsOfPosition(node.initializer.pos);
-                emit(node.initializer);
-            }
-            // Return true if identifier resolves to an exported member of a namespace
-            function isExportReference(node) {
-                var container = resolver.getReferencedExportContainer(node);
-                return !!container;
-            }
-            // Return true if identifier resolves to an imported identifier
-            function isImportedReference(node) {
-                var declaration = resolver.getReferencedImportDeclaration(node);
-                return declaration && (declaration.kind === 231 /* ImportClause */ || declaration.kind === 234 /* ImportSpecifier */);
-            }
-            function emitShorthandPropertyAssignment(node) {
-                // The name property of a short-hand property assignment is considered an expression position, so here
-                // we manually emit the identifier to avoid rewriting.
-                writeTextOfNode(currentText, node.name);
-                // If emitting pre-ES6 code, or if the name requires rewriting when resolved as an expression identifier,
-                // we emit a normal property assignment. For example:
-                //   module m {
-                //       export let y;
-                //   }
-                //   module m {
-                //       let obj = { y };
-                //   }
-                // Here we need to emit obj = { y : m.y } regardless of the output target.
-                // The same rules apply for imported identifiers when targeting module formats with indirect access to
-                // the imported identifiers. For example, when targeting CommonJS:
-                //
-                //   import {foo} from './foo';
-                //   export const baz = { foo };
-                //
-                // Must be transformed into:
-                //
-                //   const foo_1 = require('./foo');
-                //   exports.baz = { foo: foo_1.foo };
-                //
-                if (languageVersion < 2 /* ES6 */ || (modulekind !== ts.ModuleKind.ES6 && isImportedReference(node.name)) || isExportReference(node.name)) {
-                    // Emit identifier as an identifier
-                    write(": ");
-                    emitExpressionIdentifier(node.name);
-                }
-                if (languageVersion >= 2 /* ES6 */ && node.objectAssignmentInitializer) {
-                    write(" = ");
-                    emit(node.objectAssignmentInitializer);
-                }
-            }
-            function tryEmitConstantValue(node) {
-                var constantValue = tryGetConstEnumValue(node);
-                if (constantValue !== undefined) {
-                    write(constantValue.toString());
-                    if (!compilerOptions.removeComments) {
-                        var propertyName = node.kind === 172 /* PropertyAccessExpression */ ? ts.declarationNameToString(node.name) : ts.getTextOfNode(node.argumentExpression);
-                        write(" /* " + propertyName + " */");
-                    }
-                    return true;
-                }
-                return false;
-            }
-            function tryGetConstEnumValue(node) {
-                if (compilerOptions.isolatedModules) {
-                    return undefined;
-                }
-                return node.kind === 172 /* PropertyAccessExpression */ || node.kind === 173 /* ElementAccessExpression */
-                    ? resolver.getConstantValue(node)
-                    : undefined;
-            }
-            // Returns 'true' if the code was actually indented, false otherwise.
-            // If the code is not indented, an optional valueToWriteWhenNotIndenting will be
-            // emitted instead.
-            function indentIfOnDifferentLines(parent, node1, node2, valueToWriteWhenNotIndenting) {
-                var realNodesAreOnDifferentLines = !ts.nodeIsSynthesized(parent) && !nodeEndIsOnSameLineAsNodeStart(node1, node2);
-                // Always use a newline for synthesized code if the synthesizer desires it.
-                var synthesizedNodeIsOnDifferentLine = synthesizedNodeStartsOnNewLine(node2);
-                if (realNodesAreOnDifferentLines || synthesizedNodeIsOnDifferentLine) {
-                    increaseIndent();
-                    writeLine();
-                    return true;
-                }
-                else {
-                    if (valueToWriteWhenNotIndenting) {
-                        write(valueToWriteWhenNotIndenting);
-                    }
-                    return false;
-                }
-            }
-            function emitPropertyAccess(node) {
-                if (tryEmitConstantValue(node)) {
-                    return;
-                }
-                if (languageVersion === 2 /* ES6 */ &&
-                    node.expression.kind === 95 /* SuperKeyword */ &&
-                    isInAsyncMethodWithSuperInES6(node)) {
-                    var name_28 = ts.createSynthesizedNode(9 /* StringLiteral */);
-                    name_28.text = node.name.text;
-                    emitSuperAccessInAsyncMethod(node.expression, name_28);
-                    return;
-                }
-                emit(node.expression);
-                var dotRangeStart = ts.nodeIsSynthesized(node.expression) ? -1 : node.expression.end;
-                var dotRangeEnd = ts.nodeIsSynthesized(node.expression) ? -1 : ts.skipTrivia(currentText, node.expression.end) + 1;
-                var dotToken = { pos: dotRangeStart, end: dotRangeEnd };
-                var indentedBeforeDot = indentIfOnDifferentLines(node, node.expression, dotToken);
-                // 1 .toString is a valid property access, emit a space after the literal
-                // Also emit a space if expression is a integer const enum value - it will appear in generated code as numeric literal
-                var shouldEmitSpace = false;
-                if (!indentedBeforeDot) {
-                    if (node.expression.kind === 8 /* NumericLiteral */) {
-                        // check if numeric literal was originally written with a dot
-                        var text = ts.getTextOfNodeFromSourceText(currentText, node.expression);
-                        shouldEmitSpace = text.indexOf(ts.tokenToString(21 /* DotToken */)) < 0;
-                    }
-                    else {
-                        // check if constant enum value is integer
-                        var constantValue = tryGetConstEnumValue(node.expression);
-                        // isFinite handles cases when constantValue is undefined
-                        shouldEmitSpace = isFinite(constantValue) && Math.floor(constantValue) === constantValue;
-                    }
-                }
-                if (shouldEmitSpace) {
-                    write(" .");
-                }
-                else {
-                    write(".");
-                }
-                var indentedAfterDot = indentIfOnDifferentLines(node, dotToken, node.name);
-                emit(node.name);
-                decreaseIndentIf(indentedBeforeDot, indentedAfterDot);
-            }
-            function emitQualifiedName(node) {
-                emit(node.left);
-                write(".");
-                emit(node.right);
-            }
-            function emitQualifiedNameAsExpression(node, useFallback) {
-                if (node.left.kind === 69 /* Identifier */) {
-                    emitEntityNameAsExpression(node.left, useFallback);
-                }
-                else if (useFallback) {
-                    var temp = createAndRecordTempVariable(0 /* Auto */);
-                    write("(");
-                    emitNodeWithoutSourceMap(temp);
-                    write(" = ");
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ true);
-                    write(") && ");
-                    emitNodeWithoutSourceMap(temp);
-                }
-                else {
-                    emitEntityNameAsExpression(node.left, /*useFallback*/ false);
-                }
-                write(".");
-                emit(node.right);
-            }
-            function emitEntityNameAsExpression(node, useFallback) {
-                switch (node.kind) {
-                    case 69 /* Identifier */:
-                        if (useFallback) {
-                            write("typeof ");
-                            emitExpressionIdentifier(node);
-                            write(" !== 'undefined' && ");
-                        }
-                        emitExpressionIdentifier(node);
-                        break;
-                    case 139 /* QualifiedName */:
-                        emitQualifiedNameAsExpression(node, useFallback);
-                        break;
-                    default:
-                        emitNodeWithoutSourceMap(node);
-                        break;
-                }
-            }
-            function emitIndexedAccess(node) {
-                if (tryEmitConstantValue(node)) {
-                    return;
-                }
-                if (languageVersion === 2 /* ES6 */ &&
-                    node.expression.kind === 95 /* SuperKeyword */ &&
-                    isInAsyncMethodWithSuperInES6(node)) {
-                    emitSuperAccessInAsyncMethod(node.expression, node.argumentExpression);
-                    return;
-                }
-                emit(node.expression);
-                write("[");
-                emit(node.argumentExpression);
-                write("]");
-            }
-            function hasSpreadElement(elements) {
-                return ts.forEach(elements, function (e) { return e.kind === 191 /* SpreadElementExpression */; });
-            }
-            function skipParentheses(node) {
-                while (node.kind === 178 /* ParenthesizedExpression */ ||
-                    node.kind === 177 /* TypeAssertionExpression */ ||
-                    node.kind === 195 /* AsExpression */ ||
-                    node.kind === 196 /* NonNullExpression */) {
-                    node = node.expression;
-                }
-                return node;
-            }
-            function emitCallTarget(node) {
-                if (node.kind === 69 /* Identifier */ || node.kind === 97 /* ThisKeyword */ || node.kind === 95 /* SuperKeyword */) {
-                    emit(node);
-                    return node;
-                }
-                var temp = createAndRecordTempVariable(0 /* Auto */);
-                write("(");
-                emit(temp);
-                write(" = ");
-                emit(node);
-                write(")");
-                return temp;
-            }
-            function emitCallWithSpread(node) {
-                var target;
-                var expr = skipParentheses(node.expression);
-                if (expr.kind === 172 /* PropertyAccessExpression */) {
-                    // Target will be emitted as "this" argument
-                    target = emitCallTarget(expr.expression);
-                    write(".");
-                    emit(expr.name);
-                }
-                else if (expr.kind === 173 /* ElementAccessExpression */) {
-                    // Target will be emitted as "this" argument
-                    target = emitCallTarget(expr.expression);
-                    write("[");
-                    emit(expr.argumentExpression);
-                    write("]");
-                }
-                else if (expr.kind === 95 /* SuperKeyword */) {
-                    target = expr;
-                    write("_super");
-                }
-                else {
-                    emit(node.expression);
-                }
-                write(".apply(");
-                if (target) {
-                    if (target.kind === 95 /* SuperKeyword */) {
-                        // Calls of form super(...) and super.foo(...)
-                        emitThis(target);
-                    }
-                    else {
-                        // Calls of form obj.foo(...)
-                        emit(target);
-                    }
-                }
-                else {
-                    // Calls of form foo(...)
-                    write("void 0");
-                }
-                write(", ");
-                emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ true);
-                write(")");
-            }
-            function isInAsyncMethodWithSuperInES6(node) {
-                if (languageVersion === 2 /* ES6 */) {
-                    var container = ts.getSuperContainer(node, /*includeFunctions*/ false);
-                    if (container && resolver.getNodeCheckFlags(container) & (2048 /* AsyncMethodWithSuper */ | 4096 /* AsyncMethodWithSuperBinding */)) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            function emitSuperAccessInAsyncMethod(superNode, argumentExpression) {
-                var container = ts.getSuperContainer(superNode, /*includeFunctions*/ false);
-                var isSuperBinding = resolver.getNodeCheckFlags(container) & 4096 /* AsyncMethodWithSuperBinding */;
-                write("_super(");
-                emit(argumentExpression);
-                write(isSuperBinding ? ").value" : ")");
-            }
-            function emitCallExpression(node) {
-                if (languageVersion < 2 /* ES6 */ && hasSpreadElement(node.arguments)) {
-                    emitCallWithSpread(node);
-                    return;
-                }
-                var expression = node.expression;
-                var superCall = false;
-                var isAsyncMethodWithSuper = false;
-                if (expression.kind === 95 /* SuperKeyword */) {
-                    emitSuper(expression);
-                    superCall = true;
-                }
-                else {
-                    superCall = ts.isSuperPropertyOrElementAccess(expression);
-                    isAsyncMethodWithSuper = superCall && isInAsyncMethodWithSuperInES6(node);
-                    emit(expression);
-                }
-                if (superCall && (languageVersion < 2 /* ES6 */ || isAsyncMethodWithSuper)) {
-                    write(".call(");
-                    emitThis(expression);
-                    if (node.arguments.length) {
-                        write(", ");
-                        emitCommaList(node.arguments);
-                    }
-                    write(")");
-                }
-                else {
-                    write("(");
-                    emitCommaList(node.arguments);
-                    write(")");
-                }
-            }
-            function emitNewExpression(node) {
-                write("new ");
-                // Spread operator logic is supported in new expressions in ES5 using a combination
-                // of Function.prototype.bind() and Function.prototype.apply().
-                //
-                //     Example:
-                //
-                //         var args = [1, 2, 3, 4, 5];
-                //         new Array(...args);
-                //
-                //     is compiled into the following ES5:
-                //
-                //         var args = [1, 2, 3, 4, 5];
-                //         new (Array.bind.apply(Array, [void 0].concat(args)));
-                //
-                // The 'thisArg' to 'bind' is ignored when invoking the result of 'bind' with 'new',
-                // Thus, we set it to undefined ('void 0').
-                if (languageVersion === 1 /* ES5 */ &&
-                    node.arguments &&
-                    hasSpreadElement(node.arguments)) {
-                    write("(");
-                    var target = emitCallTarget(node.expression);
-                    write(".bind.apply(");
-                    emit(target);
-                    write(", [void 0].concat(");
-                    emitListWithSpread(node.arguments, /*needsUniqueCopy*/ false, /*multiLine*/ false, /*trailingComma*/ false, /*useConcat*/ false);
-                    write(")))");
-                    write("()");
-                }
-                else {
-                    emit(node.expression);
-                    if (node.arguments) {
-                        write("(");
-                        emitCommaList(node.arguments);
-                        write(")");
-                    }
-                }
-            }
-            function emitTaggedTemplateExpression(node) {
-                if (languageVersion >= 2 /* ES6 */) {
-                    emit(node.tag);
-                    write(" ");
-                    emit(node.template);
-                }
-                else {
-                    emitDownlevelTaggedTemplate(node);
-                }
-            }
-            function emitParenExpression(node) {
-                // If the node is synthesized, it means the emitter put the parentheses there,
-                // not the user. If we didn't want them, the emitter would not have put them
-                // there.
-                if (!ts.nodeIsSynthesized(node) && node.parent.kind !== 180 /* ArrowFunction */) {
-                    if (node.expression.kind === 177 /* TypeAssertionExpression */ ||
-                        node.expression.kind === 195 /* AsExpression */ ||
-                        node.expression.kind === 196 /* NonNullExpression */) {
-                        var operand = node.expression.expression;
-                        // Make sure we consider all nested cast expressions, e.g.:
-                        // (<any><number><any>-A).x;
-                        while (operand.kind === 177 /* TypeAssertionExpression */ ||
-                            operand.kind === 195 /* AsExpression */ ||
-                            operand.kind === 196 /* NonNullExpression */) {
-                            operand = operand.expression;
-                        }
-                        // We have an expression of the form: (<Type>SubExpr)
-                        // Emitting this as (SubExpr) is really not desirable. We would like to emit the subexpr as is.
-                        // Omitting the parentheses, however, could cause change in the semantics of the generated
-                        // code if the casted expression has a lower precedence than the rest of the expression, e.g.:
-                        //      (<any>new A).foo should be emitted as (new A).foo and not new A.foo
-                        //      (<any>typeof A).toString() should be emitted as (typeof A).toString() and not typeof A.toString()
-                        //      new (<any>A()) should be emitted as new (A()) and not new A()
-                        //      (<any>function foo() { })() should be emitted as an IIF (function foo(){})() and not declaration function foo(){} ()
-                        if (operand.kind !== 185 /* PrefixUnaryExpression */ &&
-                            operand.kind !== 183 /* VoidExpression */ &&
-                            operand.kind !== 182 /* TypeOfExpression */ &&
-                            operand.kind !== 181 /* DeleteExpression */ &&
-                            operand.kind !== 186 /* PostfixUnaryExpression */ &&
-                            operand.kind !== 175 /* NewExpression */ &&
-                            !(operand.kind === 174 /* CallExpression */ && node.parent.kind === 175 /* NewExpression */) &&
-                            !(operand.kind === 179 /* FunctionExpression */ && node.parent.kind === 174 /* CallExpression */) &&
-                            !(operand.kind === 8 /* NumericLiteral */ && node.parent.kind === 172 /* PropertyAccessExpression */)) {
-                            emit(operand);
-                            return;
-                        }
-                    }
-                }
-                write("(");
-                emit(node.expression);
-                write(")");
-            }
-            function emitDeleteExpression(node) {
-                write(ts.tokenToString(78 /* DeleteKeyword */));
-                write(" ");
-                emit(node.expression);
-            }
-            function emitVoidExpression(node) {
-                write(ts.tokenToString(103 /* VoidKeyword */));
-                write(" ");
-                emit(node.expression);
-            }
-            function emitTypeOfExpression(node) {
-                write(ts.tokenToString(101 /* TypeOfKeyword */));
-                write(" ");
-                emit(node.expression);
-            }
-            function isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node) {
-                if (!isCurrentFileSystemExternalModule() || node.kind !== 69 /* Identifier */ || ts.nodeIsSynthesized(node)) {
-                    return false;
-                }
-                var isVariableDeclarationOrBindingElement = node.parent && (node.parent.kind === 218 /* VariableDeclaration */ || node.parent.kind === 169 /* BindingElement */);
-                var targetDeclaration = isVariableDeclarationOrBindingElement
-                    ? node.parent
-                    : resolver.getReferencedValueDeclaration(node);
-                return isSourceFileLevelDeclarationInSystemJsModule(targetDeclaration, /*isExported*/ true);
-            }
-            function isNameOfExportedDeclarationInNonES6Module(node) {
-                if (modulekind === ts.ModuleKind.System || node.kind !== 69 /* Identifier */ || ts.nodeIsSynthesized(node)) {
-                    return false;
-                }
-                return !exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, node.text);
-            }
-            function emitPrefixUnaryExpression(node) {
-                var isPlusPlusOrMinusMinus = (node.operator === 41 /* PlusPlusToken */
-                    || node.operator === 42 /* MinusMinusToken */);
-                var externalExportChanged = isPlusPlusOrMinusMinus &&
-                    isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand);
-                if (externalExportChanged) {
-                    // emit
-                    // ++x
-                    // as
-                    // exports('x', ++x)
-                    write(exportFunctionForFile + "(\"");
-                    emitNodeWithoutSourceMap(node.operand);
-                    write("\", ");
-                }
-                var internalExportChanged = isPlusPlusOrMinusMinus &&
-                    isNameOfExportedDeclarationInNonES6Module(node.operand);
-                if (internalExportChanged) {
-                    emitAliasEqual(node.operand);
-                }
-                write(ts.tokenToString(node.operator));
-                // In some cases, we need to emit a space between the operator and the operand. One obvious case
-                // is when the operator is an identifier, like delete or typeof. We also need to do this for plus
-                // and minus expressions in certain cases. Specifically, consider the following two cases (parens
-                // are just for clarity of exposition, and not part of the source code):
-                //
-                //  (+(+1))
-                //  (+(++1))
-                //
-                // We need to emit a space in both cases. In the first case, the absence of a space will make
-                // the resulting expression a prefix increment operation. And in the second, it will make the resulting
-                // expression a prefix increment whose operand is a plus expression - (++(+x))
-                // The same is true of minus of course.
-                if (node.operand.kind === 185 /* PrefixUnaryExpression */) {
-                    var operand = node.operand;
-                    if (node.operator === 35 /* PlusToken */ && (operand.operator === 35 /* PlusToken */ || operand.operator === 41 /* PlusPlusToken */)) {
-                        write(" ");
-                    }
-                    else if (node.operator === 36 /* MinusToken */ && (operand.operator === 36 /* MinusToken */ || operand.operator === 42 /* MinusMinusToken */)) {
-                        write(" ");
-                    }
-                }
-                emit(node.operand);
-                if (externalExportChanged) {
-                    write(")");
-                }
-            }
-            function emitPostfixUnaryExpression(node) {
-                var externalExportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.operand);
-                var internalExportChanged = isNameOfExportedDeclarationInNonES6Module(node.operand);
-                if (externalExportChanged) {
-                    // export function returns the value that was passes as the second argument
-                    // however for postfix unary expressions result value should be the value before modification.
-                    // emit 'x++' as '(export('x', ++x) - 1)' and 'x--' as '(export('x', --x) + 1)'
-                    write("(" + exportFunctionForFile + "(\"");
-                    emitNodeWithoutSourceMap(node.operand);
-                    write("\", ");
-                    write(ts.tokenToString(node.operator));
-                    emit(node.operand);
-                    if (node.operator === 41 /* PlusPlusToken */) {
-                        write(") - 1)");
-                    }
-                    else {
-                        write(") + 1)");
-                    }
-                }
-                else if (internalExportChanged) {
-                    emitAliasEqual(node.operand);
-                    emit(node.operand);
-                    if (node.operator === 41 /* PlusPlusToken */) {
-                        write(" += 1");
-                    }
-                    else {
-                        write(" -= 1");
-                    }
-                }
-                else {
-                    emit(node.operand);
-                    write(ts.tokenToString(node.operator));
-                }
-            }
-            function shouldHoistDeclarationInSystemJsModule(node) {
-                return isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ false);
-            }
-            /*
-             * Checks if given node is a source file level declaration (not nested in module/function).
-             * If 'isExported' is true - then declaration must also be exported.
-             * This function is used in two cases:
-             * - check if node is a exported source file level value to determine
-             *   if we should also export the value after its it changed
-             * - check if node is a source level declaration to emit it differently,
-             *   i.e non-exported variable statement 'var x = 1' is hoisted so
-             *   we we emit variable statement 'var' should be dropped.
-             */
-            function isSourceFileLevelDeclarationInSystemJsModule(node, isExported) {
-                if (!node || !isCurrentFileSystemExternalModule()) {
-                    return false;
-                }
-                var current = ts.getRootDeclaration(node).parent;
-                while (current) {
-                    if (current.kind === 256 /* SourceFile */) {
-                        return !isExported || ((ts.getCombinedNodeFlags(node) & 1 /* Export */) !== 0);
-                    }
-                    else if (ts.isDeclaration(current)) {
-                        return false;
-                    }
-                    else {
-                        current = current.parent;
-                    }
-                }
-            }
-            /**
-             * Emit ES7 exponentiation operator downlevel using Math.pow
-             * @param node a binary expression node containing exponentiationOperator (**, **=)
-             */
-            function emitExponentiationOperator(node) {
-                var leftHandSideExpression = node.left;
-                if (node.operatorToken.kind === 60 /* AsteriskAsteriskEqualsToken */) {
-                    var synthesizedLHS = void 0;
-                    var shouldEmitParentheses = false;
-                    if (ts.isElementAccessExpression(leftHandSideExpression)) {
-                        shouldEmitParentheses = true;
-                        write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(173 /* ElementAccessExpression */, /*startsOnNewLine*/ false);
-                        var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
-                        synthesizedLHS.expression = identifier;
-                        if (leftHandSideExpression.argumentExpression.kind !== 8 /* NumericLiteral */ &&
-                            leftHandSideExpression.argumentExpression.kind !== 9 /* StringLiteral */) {
-                            var tempArgumentExpression = createAndRecordTempVariable(268435456 /* _i */);
-                            synthesizedLHS.argumentExpression = tempArgumentExpression;
-                            emitAssignment(tempArgumentExpression, leftHandSideExpression.argumentExpression, /*shouldEmitCommaBeforeAssignment*/ true, leftHandSideExpression.expression);
-                        }
-                        else {
-                            synthesizedLHS.argumentExpression = leftHandSideExpression.argumentExpression;
-                        }
-                        write(", ");
-                    }
-                    else if (ts.isPropertyAccessExpression(leftHandSideExpression)) {
-                        shouldEmitParentheses = true;
-                        write("(");
-                        synthesizedLHS = ts.createSynthesizedNode(172 /* PropertyAccessExpression */, /*startsOnNewLine*/ false);
-                        var identifier = emitTempVariableAssignment(leftHandSideExpression.expression, /*canDefineTempVariablesInPlace*/ false, /*shouldEmitCommaBeforeAssignment*/ false);
-                        synthesizedLHS.expression = identifier;
-                        synthesizedLHS.name = leftHandSideExpression.name;
-                        write(", ");
-                    }
-                    emit(synthesizedLHS || leftHandSideExpression);
-                    write(" = ");
-                    write("Math.pow(");
-                    emit(synthesizedLHS || leftHandSideExpression);
-                    write(", ");
-                    emit(node.right);
-                    write(")");
-                    if (shouldEmitParentheses) {
-                        write(")");
-                    }
-                }
-                else {
-                    write("Math.pow(");
-                    emit(leftHandSideExpression);
-                    write(", ");
-                    emit(node.right);
-                    write(")");
-                }
-            }
-            function emitAliasEqual(name) {
-                for (var _a = 0, _b = exportSpecifiers[name.text]; _a < _b.length; _a++) {
-                    var specifier = _b[_a];
-                    emitStart(specifier.name);
-                    emitContainingModuleName(specifier);
-                    if (languageVersion === 0 /* ES3 */ && name.text === "default") {
-                        write('["default"]');
-                    }
-                    else {
-                        write(".");
-                        emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                    }
-                    emitEnd(specifier.name);
-                    write(" = ");
-                }
-                return true;
-            }
-            function emitBinaryExpression(node) {
-                if (languageVersion < 2 /* ES6 */ && node.operatorToken.kind === 56 /* EqualsToken */ &&
-                    (node.left.kind === 171 /* ObjectLiteralExpression */ || node.left.kind === 170 /* ArrayLiteralExpression */)) {
-                    emitDestructuring(node, node.parent.kind === 202 /* ExpressionStatement */);
-                }
-                else {
-                    var isAssignment = ts.isAssignmentOperator(node.operatorToken.kind);
-                    var externalExportChanged = isAssignment &&
-                        isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.left);
-                    if (externalExportChanged) {
-                        // emit assignment 'x <op> y' as 'exports("x", x <op> y)'
-                        write(exportFunctionForFile + "(\"");
-                        emitNodeWithoutSourceMap(node.left);
-                        write("\", ");
-                    }
-                    var internalExportChanged = isAssignment &&
-                        isNameOfExportedDeclarationInNonES6Module(node.left);
-                    if (internalExportChanged) {
-                        // export { foo }
-                        // emit foo = 2 as exports.foo = foo = 2
-                        emitAliasEqual(node.left);
-                    }
-                    if (node.operatorToken.kind === 38 /* AsteriskAsteriskToken */ || node.operatorToken.kind === 60 /* AsteriskAsteriskEqualsToken */) {
-                        // Downleveled emit exponentiation operator using Math.pow
-                        emitExponentiationOperator(node);
-                    }
-                    else {
-                        emit(node.left);
-                        // Add indentation before emit the operator if the operator is on different line
-                        // For example:
-                        //      3
-                        //      + 2;
-                        //   emitted as
-                        //      3
-                        //          + 2;
-                        var indentedBeforeOperator = indentIfOnDifferentLines(node, node.left, node.operatorToken, node.operatorToken.kind !== 24 /* CommaToken */ ? " " : undefined);
-                        write(ts.tokenToString(node.operatorToken.kind));
-                        var indentedAfterOperator = indentIfOnDifferentLines(node, node.operatorToken, node.right, " ");
-                        emit(node.right);
-                        decreaseIndentIf(indentedBeforeOperator, indentedAfterOperator);
-                    }
-                    if (externalExportChanged) {
-                        write(")");
-                    }
-                }
-            }
-            function synthesizedNodeStartsOnNewLine(node) {
-                return ts.nodeIsSynthesized(node) && node.startsOnNewLine;
-            }
-            function emitConditionalExpression(node) {
-                emit(node.condition);
-                var indentedBeforeQuestion = indentIfOnDifferentLines(node, node.condition, node.questionToken, " ");
-                write("?");
-                var indentedAfterQuestion = indentIfOnDifferentLines(node, node.questionToken, node.whenTrue, " ");
-                emit(node.whenTrue);
-                decreaseIndentIf(indentedBeforeQuestion, indentedAfterQuestion);
-                var indentedBeforeColon = indentIfOnDifferentLines(node, node.whenTrue, node.colonToken, " ");
-                write(":");
-                var indentedAfterColon = indentIfOnDifferentLines(node, node.colonToken, node.whenFalse, " ");
-                emit(node.whenFalse);
-                decreaseIndentIf(indentedBeforeColon, indentedAfterColon);
-            }
-            // Helper function to decrease the indent if we previously indented.  Allows multiple
-            // previous indent values to be considered at a time.  This also allows caller to just
-            // call this once, passing in all their appropriate indent values, instead of needing
-            // to call this helper function multiple times.
-            function decreaseIndentIf(value1, value2) {
-                if (value1) {
-                    decreaseIndent();
-                }
-                if (value2) {
-                    decreaseIndent();
-                }
-            }
-            function isSingleLineEmptyBlock(node) {
-                if (node && node.kind === 199 /* Block */) {
-                    var block = node;
-                    return block.statements.length === 0 && nodeEndIsOnSameLineAsNodeStart(block, block);
-                }
-            }
-            function emitBlock(node) {
-                if (isSingleLineEmptyBlock(node)) {
-                    emitToken(15 /* OpenBraceToken */, node.pos);
-                    write(" ");
-                    emitToken(16 /* CloseBraceToken */, node.statements.end);
-                    return;
-                }
-                emitToken(15 /* OpenBraceToken */, node.pos);
-                increaseIndent();
-                if (node.kind === 226 /* ModuleBlock */) {
-                    ts.Debug.assert(node.parent.kind === 225 /* ModuleDeclaration */);
-                    emitCaptureThisForNodeIfNecessary(node.parent);
-                }
-                emitLines(node.statements);
-                if (node.kind === 226 /* ModuleBlock */) {
-                    emitTempDeclarations(/*newLine*/ true);
-                }
-                decreaseIndent();
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.statements.end);
-            }
-            function emitEmbeddedStatement(node) {
-                if (node.kind === 199 /* Block */) {
-                    write(" ");
-                    emit(node);
-                }
-                else {
-                    increaseIndent();
-                    writeLine();
-                    emit(node);
-                    decreaseIndent();
-                }
-            }
-            function emitExpressionStatement(node) {
-                emitParenthesizedIf(node.expression, /*parenthesized*/ node.expression.kind === 180 /* ArrowFunction */);
-                write(";");
-            }
-            function emitIfStatement(node) {
-                var endPos = emitToken(88 /* IfKeyword */, node.pos);
-                write(" ");
-                endPos = emitToken(17 /* OpenParenToken */, endPos);
-                emit(node.expression);
-                emitToken(18 /* CloseParenToken */, node.expression.end);
-                emitEmbeddedStatement(node.thenStatement);
-                if (node.elseStatement) {
-                    writeLine();
-                    emitToken(80 /* ElseKeyword */, node.thenStatement.end);
-                    if (node.elseStatement.kind === 203 /* IfStatement */) {
-                        write(" ");
-                        emit(node.elseStatement);
-                    }
-                    else {
-                        emitEmbeddedStatement(node.elseStatement);
-                    }
-                }
-            }
-            function emitDoStatement(node) {
-                emitLoop(node, emitDoStatementWorker);
-            }
-            function emitDoStatementWorker(node, loop) {
-                write("do");
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-                if (node.statement.kind === 199 /* Block */) {
-                    write(" ");
-                }
-                else {
-                    writeLine();
-                }
-                write("while (");
-                emit(node.expression);
-                write(");");
-            }
-            function emitWhileStatement(node) {
-                emitLoop(node, emitWhileStatementWorker);
-            }
-            function emitWhileStatementWorker(node, loop) {
-                write("while (");
-                emit(node.expression);
-                write(")");
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-            /**
-             * Returns true if start of variable declaration list was emitted.
-             * Returns false if nothing was written - this can happen for source file level variable declarations
-             *     in system modules where such variable declarations are hoisted.
-             */
-            function tryEmitStartOfVariableDeclarationList(decl) {
-                if (shouldHoistVariable(decl, /*checkIfSourceFileLevelDecl*/ true)) {
-                    // variables in variable declaration list were already hoisted
-                    return false;
-                }
-                if (convertedLoopState && (ts.getCombinedNodeFlags(decl) & 3072 /* BlockScoped */) === 0) {
-                    // we are inside a converted loop - this can only happen in downlevel scenarios
-                    // record names for all variable declarations
-                    for (var _a = 0, _b = decl.declarations; _a < _b.length; _a++) {
-                        var varDecl = _b[_a];
-                        hoistVariableDeclarationFromLoop(convertedLoopState, varDecl);
-                    }
-                    return false;
-                }
-                emitStart(decl);
-                if (decl && languageVersion >= 2 /* ES6 */) {
-                    if (ts.isLet(decl)) {
-                        write("let ");
-                    }
-                    else if (ts.isConst(decl)) {
-                        write("const ");
-                    }
-                    else {
-                        write("var ");
-                    }
-                }
-                else {
-                    write("var ");
-                }
-                // Note here we specifically dont emit end so that if we are going to emit binding pattern
-                // we can alter the source map correctly
-                return true;
-            }
-            function emitVariableDeclarationListSkippingUninitializedEntries(list) {
-                var started = false;
-                for (var _a = 0, _b = list.declarations; _a < _b.length; _a++) {
-                    var decl = _b[_a];
-                    if (!decl.initializer) {
-                        continue;
-                    }
-                    if (!started) {
-                        started = true;
-                    }
-                    else {
-                        write(", ");
-                    }
-                    emit(decl);
-                }
-                return started;
-            }
-            function shouldConvertLoopBody(node) {
-                return languageVersion < 2 /* ES6 */ &&
-                    (resolver.getNodeCheckFlags(node) & 65536 /* LoopWithCapturedBlockScopedBinding */) !== 0;
-            }
-            function emitLoop(node, loopEmitter) {
-                var shouldConvert = shouldConvertLoopBody(node);
-                if (!shouldConvert) {
-                    loopEmitter(node, /* convertedLoop*/ undefined);
-                }
-                else {
-                    var loop = convertLoopBody(node);
-                    if (node.parent.kind === 214 /* LabeledStatement */) {
-                        // if parent of the loop was labeled statement - attach the label to loop skipping converted loop body
-                        emitLabelAndColon(node.parent);
-                    }
-                    loopEmitter(node, loop);
-                }
-            }
-            function convertLoopBody(node) {
-                var functionName = makeUniqueName("_loop");
-                var loopInitializer;
-                switch (node.kind) {
-                    case 206 /* ForStatement */:
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                        var initializer = node.initializer;
-                        if (initializer && initializer.kind === 219 /* VariableDeclarationList */) {
-                            loopInitializer = node.initializer;
-                        }
-                        break;
-                }
-                var loopParameters;
-                var loopOutParameters;
-                if (loopInitializer && (ts.getCombinedNodeFlags(loopInitializer) & 3072 /* BlockScoped */)) {
-                    // if loop initializer contains block scoped variables - they should be passed to converted loop body as parameters
-                    loopParameters = [];
-                    for (var _a = 0, _b = loopInitializer.declarations; _a < _b.length; _a++) {
-                        var varDeclaration = _b[_a];
-                        processVariableDeclaration(varDeclaration.name);
-                    }
-                }
-                var bodyIsBlock = node.statement.kind === 199 /* Block */;
-                var paramList = loopParameters ? loopParameters.join(", ") : "";
-                writeLine();
-                write("var " + functionName + " = function(" + paramList + ")");
-                var convertedOuterLoopState = convertedLoopState;
-                convertedLoopState = { loopOutParameters: loopOutParameters };
-                if (convertedOuterLoopState) {
-                    // convertedOuterLoopState !== undefined means that this converted loop is nested in another converted loop.
-                    // if outer converted loop has already accumulated some state - pass it through
-                    if (convertedOuterLoopState.argumentsName) {
-                        // outer loop has already used 'arguments' so we've already have some name to alias it
-                        // use the same name in all nested loops
-                        convertedLoopState.argumentsName = convertedOuterLoopState.argumentsName;
-                    }
-                    if (convertedOuterLoopState.thisName) {
-                        // outer loop has already used 'this' so we've already have some name to alias it
-                        // use the same name in all nested loops
-                        convertedLoopState.thisName = convertedOuterLoopState.thisName;
-                    }
-                    if (convertedOuterLoopState.hoistedLocalVariables) {
-                        // we've already collected some non-block scoped variable declarations in enclosing loop
-                        // use the same storage in nested loop
-                        convertedLoopState.hoistedLocalVariables = convertedOuterLoopState.hoistedLocalVariables;
-                    }
-                }
-                write(" {");
-                writeLine();
-                increaseIndent();
-                if (bodyIsBlock) {
-                    emitLines(node.statement.statements);
-                }
-                else {
-                    emit(node.statement);
-                }
-                writeLine();
-                // end of loop body -> copy out parameter
-                copyLoopOutParameters(convertedLoopState, 1 /* ToOutParameter */, /*emitAsStatements*/ true);
-                decreaseIndent();
-                writeLine();
-                write("};");
-                writeLine();
-                if (loopOutParameters) {
-                    // declare variables to hold out params for loop body
-                    write("var ");
-                    for (var i = 0; i < loopOutParameters.length; i++) {
-                        if (i !== 0) {
-                            write(", ");
-                        }
-                        write(loopOutParameters[i].outParamName);
-                    }
-                    write(";");
-                    writeLine();
-                }
-                if (convertedLoopState.argumentsName) {
-                    // if alias for arguments is set
-                    if (convertedOuterLoopState) {
-                        // pass it to outer converted loop
-                        convertedOuterLoopState.argumentsName = convertedLoopState.argumentsName;
-                    }
-                    else {
-                        // this is top level converted loop and we need to create an alias for 'arguments' object
-                        write("var " + convertedLoopState.argumentsName + " = arguments;");
-                        writeLine();
-                    }
-                }
-                if (convertedLoopState.thisName) {
-                    // if alias for this is set
-                    if (convertedOuterLoopState) {
-                        // pass it to outer converted loop
-                        convertedOuterLoopState.thisName = convertedLoopState.thisName;
-                    }
-                    else {
-                        // this is top level converted loop so we need to create an alias for 'this' here
-                        // NOTE:
-                        // if converted loops were all nested in arrow function then we'll always emit '_this' so convertedLoopState.thisName will not be set.
-                        // If it is set this means that all nested loops are not nested in arrow function and it is safe to capture 'this'.
-                        write("var " + convertedLoopState.thisName + " = this;");
-                        writeLine();
-                    }
-                }
-                if (convertedLoopState.hoistedLocalVariables) {
-                    // if hoistedLocalVariables !== undefined this means that we've possibly collected some variable declarations to be hoisted later
-                    if (convertedOuterLoopState) {
-                        // pass them to outer converted loop
-                        convertedOuterLoopState.hoistedLocalVariables = convertedLoopState.hoistedLocalVariables;
-                    }
-                    else {
-                        // deduplicate and hoist collected variable declarations
-                        write("var ");
-                        var seen = void 0;
-                        for (var _c = 0, _d = convertedLoopState.hoistedLocalVariables; _c < _d.length; _c++) {
-                            var id = _d[_c];
-                            // Don't initialize seen unless we have at least one element.
-                            // Emit a comma to separate for all but the first element.
-                            if (!seen) {
-                                seen = {};
-                            }
-                            else {
-                                write(", ");
-                            }
-                            if (!ts.hasProperty(seen, id.text)) {
-                                emit(id);
-                                seen[id.text] = id.text;
-                            }
-                        }
-                        write(";");
-                        writeLine();
-                    }
-                }
-                var currentLoopState = convertedLoopState;
-                convertedLoopState = convertedOuterLoopState;
-                return { functionName: functionName, paramList: paramList, state: currentLoopState };
-                function processVariableDeclaration(name) {
-                    if (name.kind === 69 /* Identifier */) {
-                        var nameText = isNameOfNestedBlockScopedRedeclarationOrCapturedBinding(name)
-                            ? getGeneratedNameForNode(name)
-                            : name.text;
-                        loopParameters.push(nameText);
-                        if (resolver.getNodeCheckFlags(name.parent) & 2097152 /* NeedsLoopOutParameter */) {
-                            var reassignedVariable = { originalName: name, outParamName: makeUniqueName("out_" + nameText) };
-                            (loopOutParameters || (loopOutParameters = [])).push(reassignedVariable);
-                        }
-                    }
-                    else {
-                        for (var _a = 0, _b = name.elements; _a < _b.length; _a++) {
-                            var element = _b[_a];
-                            processVariableDeclaration(element.name);
-                        }
-                    }
-                }
-            }
-            function emitNormalLoopBody(node, emitAsEmbeddedStatement) {
-                var saveAllowedNonLabeledJumps;
-                if (convertedLoopState) {
-                    // we get here if we are trying to emit normal loop loop inside converted loop
-                    // set allowedNonLabeledJumps to Break | Continue to mark that break\continue inside the loop should be emitted as is
-                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
-                    convertedLoopState.allowedNonLabeledJumps = 2 /* Break */ | 4 /* Continue */;
-                }
-                if (emitAsEmbeddedStatement) {
-                    emitEmbeddedStatement(node.statement);
-                }
-                else if (node.statement.kind === 199 /* Block */) {
-                    emitLines(node.statement.statements);
-                }
-                else {
-                    writeLine();
-                    emit(node.statement);
-                }
-                if (convertedLoopState) {
-                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
-                }
-            }
-            function copyLoopOutParameters(state, copyDirection, emitAsStatements) {
-                if (state.loopOutParameters) {
-                    for (var _a = 0, _b = state.loopOutParameters; _a < _b.length; _a++) {
-                        var outParam = _b[_a];
-                        if (copyDirection === 0 /* ToOriginal */) {
-                            emitIdentifier(outParam.originalName);
-                            write(" = " + outParam.outParamName);
-                        }
-                        else {
-                            write(outParam.outParamName + " = ");
-                            emitIdentifier(outParam.originalName);
-                        }
-                        if (emitAsStatements) {
-                            write(";");
-                            writeLine();
-                        }
-                        else {
-                            write(", ");
-                        }
-                    }
-                }
-            }
-            function emitConvertedLoopCall(loop, emitAsBlock) {
-                if (emitAsBlock) {
-                    write(" {");
-                    writeLine();
-                    increaseIndent();
-                }
-                // loop is considered simple if it does not have any return statements or break\continue that transfer control outside of the loop
-                // simple loops are emitted as just 'loop()';
-                // NOTE: if loop uses only 'continue' it still will be emitted as simple loop
-                var isSimpleLoop = !(loop.state.nonLocalJumps & ~4 /* Continue */) &&
-                    !loop.state.labeledNonLocalBreaks &&
-                    !loop.state.labeledNonLocalContinues;
-                var loopResult = makeUniqueName("state");
-                if (!isSimpleLoop) {
-                    write("var " + loopResult + " = ");
-                }
-                write(loop.functionName + "(" + loop.paramList + ");");
-                writeLine();
-                copyLoopOutParameters(loop.state, 0 /* ToOriginal */, /*emitAsStatements*/ true);
-                if (!isSimpleLoop) {
-                    // for non simple loops we need to store result returned from converted loop function and use it to do dispatching
-                    // converted loop function can return:
-                    // - object - used when body of the converted loop contains return statement. Property "value" of this object stores retuned value
-                    // - string - used to dispatch jumps. "break" and "continue" are used to non-labeled jumps, other values are used to transfer control to
-                    //   different labels
-                    writeLine();
-                    if (loop.state.nonLocalJumps & 8 /* Return */) {
-                        write("if (typeof " + loopResult + " === \"object\") ");
-                        if (convertedLoopState) {
-                            // we are currently nested in another converted loop - return unwrapped result
-                            write("return " + loopResult + ";");
-                            // propagate 'hasReturn' flag to outer loop
-                            convertedLoopState.nonLocalJumps |= 8 /* Return */;
-                        }
-                        else {
-                            // top level converted loop - return unwrapped value
-                            write("return " + loopResult + ".value;");
-                        }
-                        writeLine();
-                    }
-                    if (loop.state.nonLocalJumps & 2 /* Break */) {
-                        write("if (" + loopResult + " === \"break\") break;");
-                        writeLine();
-                    }
-                    // in case of labeled breaks emit code that either breaks to some known label inside outer loop or delegates jump decision to outer loop
-                    emitDispatchTableForLabeledJumps(loopResult, loop.state, convertedLoopState);
-                }
-                if (emitAsBlock) {
-                    writeLine();
-                    decreaseIndent();
-                    write("}");
-                }
-                function emitDispatchTableForLabeledJumps(loopResultVariable, currentLoop, outerLoop) {
-                    if (!currentLoop.labeledNonLocalBreaks && !currentLoop.labeledNonLocalContinues) {
-                        return;
-                    }
-                    write("switch(" + loopResultVariable + ") {");
-                    increaseIndent();
-                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalBreaks, /*isBreak*/ true, loopResultVariable, outerLoop);
-                    emitDispatchEntriesForLabeledJumps(currentLoop.labeledNonLocalContinues, /*isBreak*/ false, loopResultVariable, outerLoop);
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-                function emitDispatchEntriesForLabeledJumps(table, isBreak, loopResultVariable, outerLoop) {
-                    if (!table) {
-                        return;
-                    }
-                    for (var labelText in table) {
-                        var labelMarker = table[labelText];
-                        writeLine();
-                        write("case \"" + labelMarker + "\": ");
-                        // if there are no outer converted loop or outer label in question is located inside outer converted loop
-                        // then emit labeled break\continue
-                        // otherwise propagate pair 'label -> marker' to outer converted loop and emit 'return labelMarker' so outer loop can later decide what to do
-                        if (!outerLoop || (outerLoop.labels && outerLoop.labels[labelText])) {
-                            if (isBreak) {
-                                write("break ");
-                            }
-                            else {
-                                write("continue ");
-                            }
-                            write(labelText + ";");
-                        }
-                        else {
-                            setLabeledJump(outerLoop, isBreak, labelText, labelMarker);
-                            write("return " + loopResultVariable + ";");
-                        }
-                    }
-                }
-            }
-            function emitForStatement(node) {
-                emitLoop(node, emitForStatementWorker);
-            }
-            function emitForStatementWorker(node, loop) {
-                var endPos = emitToken(86 /* ForKeyword */, node.pos);
-                write(" ");
-                endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer && node.initializer.kind === 219 /* VariableDeclarationList */) {
-                    var variableDeclarationList = node.initializer;
-                    var startIsEmitted = tryEmitStartOfVariableDeclarationList(variableDeclarationList);
-                    if (startIsEmitted) {
-                        emitCommaList(variableDeclarationList.declarations);
-                    }
-                    else {
-                        emitVariableDeclarationListSkippingUninitializedEntries(variableDeclarationList);
-                    }
-                }
-                else if (node.initializer) {
-                    emit(node.initializer);
-                }
-                write(";");
-                emitOptional(" ", node.condition);
-                write(";");
-                emitOptional(" ", node.incrementor);
-                write(")");
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-            function emitForInOrForOfStatement(node) {
-                if (languageVersion < 2 /* ES6 */ && node.kind === 208 /* ForOfStatement */) {
-                    emitLoop(node, emitDownLevelForOfStatementWorker);
-                }
-                else {
-                    emitLoop(node, emitForInOrForOfStatementWorker);
-                }
-            }
-            function emitForInOrForOfStatementWorker(node, loop) {
-                var endPos = emitToken(86 /* ForKeyword */, node.pos);
-                write(" ");
-                endPos = emitToken(17 /* OpenParenToken */, endPos);
-                if (node.initializer.kind === 219 /* VariableDeclarationList */) {
-                    var variableDeclarationList = node.initializer;
-                    if (variableDeclarationList.declarations.length >= 1) {
-                        tryEmitStartOfVariableDeclarationList(variableDeclarationList);
-                        emit(variableDeclarationList.declarations[0]);
-                    }
-                }
-                else {
-                    emit(node.initializer);
-                }
-                if (node.kind === 207 /* ForInStatement */) {
-                    write(" in ");
-                }
-                else {
-                    write(" of ");
-                }
-                emit(node.expression);
-                emitToken(18 /* CloseParenToken */, node.expression.end);
-                if (loop) {
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ true);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ true);
-                }
-            }
-            function emitDownLevelForOfStatementWorker(node, loop) {
-                // The following ES6 code:
-                //
-                //    for (let v of expr) { }
-                //
-                // should be emitted as
-                //
-                //    for (let _i = 0, _a = expr; _i < _a.length; _i++) {
-                //        let v = _a[_i];
-                //    }
-                //
-                // where _a and _i are temps emitted to capture the RHS and the counter,
-                // respectively.
-                // When the left hand side is an expression instead of a let declaration,
-                // the "let v" is not emitted.
-                // When the left hand side is a let/const, the v is renamed if there is
-                // another v in scope.
-                // Note that all assignments to the LHS are emitted in the body, including
-                // all destructuring.
-                // Note also that because an extra statement is needed to assign to the LHS,
-                // for-of bodies are always emitted as blocks.
-                var endPos = emitToken(86 /* ForKeyword */, node.pos);
-                write(" ");
-                endPos = emitToken(17 /* OpenParenToken */, endPos);
-                // Do not emit the LHS let declaration yet, because it might contain destructuring.
-                // Do not call recordTempDeclaration because we are declaring the temps
-                // right here. Recording means they will be declared later.
-                // In the case where the user wrote an identifier as the RHS, like this:
-                //
-                //     for (let v of arr) { }
-                //
-                // we can't reuse 'arr' because it might be modified within the body of the loop.
-                var counter = createTempVariable(268435456 /* _i */);
-                var rhsReference = ts.createSynthesizedNode(69 /* Identifier */);
-                rhsReference.text = node.expression.kind === 69 /* Identifier */ ?
-                    makeUniqueName(node.expression.text) :
-                    makeTempVariableName(0 /* Auto */);
-                // This is the let keyword for the counter and rhsReference. The let keyword for
-                // the LHS will be emitted inside the body.
-                emitStart(node.expression);
-                write("var ");
-                // _i = 0
-                emitNodeWithoutSourceMap(counter);
-                write(" = 0");
-                emitEnd(node.expression);
-                // , _a = expr
-                write(", ");
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(rhsReference);
-                write(" = ");
-                emitNodeWithoutSourceMap(node.expression);
-                emitEnd(node.expression);
-                write("; ");
-                // _i < _a.length;
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(counter);
-                write(" < ");
-                emitNodeWithCommentsAndWithoutSourcemap(rhsReference);
-                write(".length");
-                emitEnd(node.expression);
-                write("; ");
-                // _i++)
-                emitStart(node.expression);
-                emitNodeWithoutSourceMap(counter);
-                write("++");
-                emitEnd(node.expression);
-                emitToken(18 /* CloseParenToken */, node.expression.end);
-                // Body
-                write(" {");
-                writeLine();
-                increaseIndent();
-                // Initialize LHS
-                // let v = _a[_i];
-                var rhsIterationValue = createElementAccessExpression(rhsReference, counter);
-                emitStart(node.initializer);
-                if (node.initializer.kind === 219 /* VariableDeclarationList */) {
-                    write("var ");
-                    var variableDeclarationList = node.initializer;
-                    if (variableDeclarationList.declarations.length > 0) {
-                        var declaration = variableDeclarationList.declarations[0];
-                        if (ts.isBindingPattern(declaration.name)) {
-                            // This works whether the declaration is a var, let, or const.
-                            // It will use rhsIterationValue _a[_i] as the initializer.
-                            emitDestructuring(declaration, /*isAssignmentExpressionStatement*/ false, rhsIterationValue);
-                        }
-                        else {
-                            // The following call does not include the initializer, so we have
-                            // to emit it separately.
-                            emitNodeWithCommentsAndWithoutSourcemap(declaration);
-                            write(" = ");
-                            emitNodeWithoutSourceMap(rhsIterationValue);
-                        }
-                    }
-                    else {
-                        // It's an empty declaration list. This can only happen in an error case, if the user wrote
-                        //     for (let of []) {}
-                        emitNodeWithoutSourceMap(createTempVariable(0 /* Auto */));
-                        write(" = ");
-                        emitNodeWithoutSourceMap(rhsIterationValue);
-                    }
-                }
-                else {
-                    // Initializer is an expression. Emit the expression in the body, so that it's
-                    // evaluated on every iteration.
-                    var assignmentExpression = createBinaryExpression(node.initializer, 56 /* EqualsToken */, rhsIterationValue, /*startsOnNewLine*/ false);
-                    if (node.initializer.kind === 170 /* ArrayLiteralExpression */ || node.initializer.kind === 171 /* ObjectLiteralExpression */) {
-                        // This is a destructuring pattern, so call emitDestructuring instead of emit. Calling emit will not work, because it will cause
-                        // the BinaryExpression to be passed in instead of the expression statement, which will cause emitDestructuring to crash.
-                        emitDestructuring(assignmentExpression, /*isAssignmentExpressionStatement*/ true, /*value*/ undefined);
-                    }
-                    else {
-                        emitNodeWithCommentsAndWithoutSourcemap(assignmentExpression);
-                    }
-                }
-                emitEnd(node.initializer);
-                write(";");
-                if (loop) {
-                    writeLine();
-                    emitConvertedLoopCall(loop, /*emitAsBlock*/ false);
-                }
-                else {
-                    emitNormalLoopBody(node, /*emitAsEmbeddedStatement*/ false);
-                }
-                writeLine();
-                decreaseIndent();
-                write("}");
-            }
-            function emitBreakOrContinueStatement(node) {
-                if (convertedLoopState) {
-                    // check if we can emit break\continue as is
-                    // it is possible if either
-                    //   - break\continue is statement labeled and label is located inside the converted loop
-                    //   - break\continue is non-labeled and located in non-converted loop\switch statement
-                    var jump = node.kind === 210 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
-                    var canUseBreakOrContinue = (node.label && convertedLoopState.labels && convertedLoopState.labels[node.label.text]) ||
-                        (!node.label && (convertedLoopState.allowedNonLabeledJumps & jump));
-                    if (!canUseBreakOrContinue) {
-                        write("return ");
-                        // explicit exit from loop -> copy out parameters
-                        copyLoopOutParameters(convertedLoopState, 1 /* ToOutParameter */, /*emitAsStatements*/ false);
-                        if (!node.label) {
-                            if (node.kind === 210 /* BreakStatement */) {
-                                convertedLoopState.nonLocalJumps |= 2 /* Break */;
-                                write("\"break\";");
-                            }
-                            else {
-                                convertedLoopState.nonLocalJumps |= 4 /* Continue */;
-                                // note: return value is emitted only to simplify debugging, call to converted loop body does not do any dispatching on it.
-                                write("\"continue\";");
-                            }
-                        }
-                        else {
-                            var labelMarker = void 0;
-                            if (node.kind === 210 /* BreakStatement */) {
-                                labelMarker = "break-" + node.label.text;
-                                setLabeledJump(convertedLoopState, /*isBreak*/ true, node.label.text, labelMarker);
-                            }
-                            else {
-                                labelMarker = "continue-" + node.label.text;
-                                setLabeledJump(convertedLoopState, /*isBreak*/ false, node.label.text, labelMarker);
-                            }
-                            write("\"" + labelMarker + "\";");
-                        }
-                        return;
-                    }
-                }
-                emitToken(node.kind === 210 /* BreakStatement */ ? 70 /* BreakKeyword */ : 75 /* ContinueKeyword */, node.pos);
-                emitOptional(" ", node.label);
-                write(";");
-            }
-            function emitReturnStatement(node) {
-                if (convertedLoopState) {
-                    convertedLoopState.nonLocalJumps |= 8 /* Return */;
-                    write("return { value: ");
-                    if (node.expression) {
-                        emit(node.expression);
-                    }
-                    else {
-                        write("void 0");
-                    }
-                    write(" };");
-                    return;
-                }
-                emitToken(94 /* ReturnKeyword */, node.pos);
-                emitOptional(" ", node.expression);
-                write(";");
-            }
-            function emitWithStatement(node) {
-                write("with (");
-                emit(node.expression);
-                write(")");
-                emitEmbeddedStatement(node.statement);
-            }
-            function emitSwitchStatement(node) {
-                var endPos = emitToken(96 /* SwitchKeyword */, node.pos);
-                write(" ");
-                emitToken(17 /* OpenParenToken */, endPos);
-                emit(node.expression);
-                endPos = emitToken(18 /* CloseParenToken */, node.expression.end);
-                write(" ");
-                var saveAllowedNonLabeledJumps;
-                if (convertedLoopState) {
-                    saveAllowedNonLabeledJumps = convertedLoopState.allowedNonLabeledJumps;
-                    // for switch statement allow only non-labeled break
-                    convertedLoopState.allowedNonLabeledJumps |= 2 /* Break */;
-                }
-                emitCaseBlock(node.caseBlock, endPos);
-                if (convertedLoopState) {
-                    convertedLoopState.allowedNonLabeledJumps = saveAllowedNonLabeledJumps;
-                }
-            }
-            function emitCaseBlock(node, startPos) {
-                emitToken(15 /* OpenBraceToken */, startPos);
-                increaseIndent();
-                emitLines(node.clauses);
-                decreaseIndent();
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.clauses.end);
-            }
-            function nodeStartPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node1.pos)) ===
-                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
-            }
-            function nodeEndPositionsAreOnSameLine(node1, node2) {
-                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
-                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, node2.end);
-            }
-            function nodeEndIsOnSameLineAsNodeStart(node1, node2) {
-                return ts.getLineOfLocalPositionFromLineMap(currentLineMap, node1.end) ===
-                    ts.getLineOfLocalPositionFromLineMap(currentLineMap, ts.skipTrivia(currentText, node2.pos));
-            }
-            function emitCaseOrDefaultClause(node) {
-                if (node.kind === 249 /* CaseClause */) {
-                    write("case ");
-                    emit(node.expression);
-                    write(":");
-                }
-                else {
-                    write("default:");
-                }
-                if (node.statements.length === 1 && nodeStartPositionsAreOnSameLine(node, node.statements[0])) {
-                    write(" ");
-                    emit(node.statements[0]);
-                }
-                else {
-                    increaseIndent();
-                    emitLines(node.statements);
-                    decreaseIndent();
-                }
-            }
-            function emitThrowStatement(node) {
-                write("throw ");
-                emit(node.expression);
-                write(";");
-            }
-            function emitTryStatement(node) {
-                write("try ");
-                emit(node.tryBlock);
-                emit(node.catchClause);
-                if (node.finallyBlock) {
-                    writeLine();
-                    write("finally ");
-                    emit(node.finallyBlock);
-                }
-            }
-            function emitCatchClause(node) {
-                writeLine();
-                var endPos = emitToken(72 /* CatchKeyword */, node.pos);
-                write(" ");
-                emitToken(17 /* OpenParenToken */, endPos);
-                emit(node.variableDeclaration);
-                emitToken(18 /* CloseParenToken */, node.variableDeclaration ? node.variableDeclaration.end : endPos);
-                write(" ");
-                emitBlock(node.block);
-            }
-            function emitDebuggerStatement(node) {
-                emitToken(76 /* DebuggerKeyword */, node.pos);
-                write(";");
-            }
-            function emitLabelAndColon(node) {
-                emit(node.label);
-                write(": ");
-            }
-            function emitLabeledStatement(node) {
-                if (!ts.isIterationStatement(node.statement, /* lookInLabeledStatements */ false) || !shouldConvertLoopBody(node.statement)) {
-                    emitLabelAndColon(node);
-                }
-                if (convertedLoopState) {
-                    if (!convertedLoopState.labels) {
-                        convertedLoopState.labels = {};
-                    }
-                    convertedLoopState.labels[node.label.text] = node.label.text;
-                }
-                emit(node.statement);
-                if (convertedLoopState) {
-                    convertedLoopState.labels[node.label.text] = undefined;
-                }
-            }
-            function getContainingModule(node) {
-                do {
-                    node = node.parent;
-                } while (node && node.kind !== 225 /* ModuleDeclaration */);
-                return node;
-            }
-            function emitContainingModuleName(node) {
-                var container = getContainingModule(node);
-                write(container ? getGeneratedNameForNode(container) : "exports");
-            }
-            function emitModuleMemberName(node) {
-                emitStart(node.name);
-                if (ts.getCombinedNodeFlags(node) & 1 /* Export */) {
-                    var container = getContainingModule(node);
-                    if (container) {
-                        write(getGeneratedNameForNode(container));
-                        write(".");
-                    }
-                    else if (modulekind !== ts.ModuleKind.ES6 && modulekind !== ts.ModuleKind.System) {
-                        write("exports.");
-                    }
-                }
-                emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                emitEnd(node.name);
-            }
-            function createVoidZero() {
-                var zero = ts.createSynthesizedNode(8 /* NumericLiteral */);
-                zero.text = "0";
-                var result = ts.createSynthesizedNode(183 /* VoidExpression */);
-                result.expression = zero;
-                return result;
-            }
-            function emitEs6ExportDefaultCompat(node) {
-                if (node.parent.kind === 256 /* SourceFile */) {
-                    ts.Debug.assert(!!(node.flags & 512 /* Default */) || node.kind === 235 /* ExportAssignment */);
-                    // only allow export default at a source file level
-                    if (modulekind === ts.ModuleKind.CommonJS || modulekind === ts.ModuleKind.AMD || modulekind === ts.ModuleKind.UMD) {
-                        if (!isEs6Module) {
-                            if (languageVersion !== 0 /* ES3 */) {
-                                // default value of configurable, enumerable, writable are `false`.
-                                write('Object.defineProperty(exports, "__esModule", { value: true });');
-                                writeLine();
-                            }
-                            else {
-                                write("exports.__esModule = true;");
-                                writeLine();
-                            }
-                        }
-                    }
-                }
-            }
-            function emitExportMemberAssignment(node) {
-                if (node.flags & 1 /* Export */) {
-                    writeLine();
-                    emitStart(node);
-                    // emit call to exporter only for top level nodes
-                    if (modulekind === ts.ModuleKind.System && node.parent === currentSourceFile) {
-                        // emit export default <smth> as
-                        // export("default", <smth>)
-                        write(exportFunctionForFile + "(\"");
-                        if (node.flags & 512 /* Default */) {
-                            write("default");
-                        }
-                        else {
-                            emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                        }
-                        write("\", ");
-                        emitDeclarationName(node);
-                        write(")");
-                    }
-                    else {
-                        if (node.flags & 512 /* Default */) {
-                            emitEs6ExportDefaultCompat(node);
-                            if (languageVersion === 0 /* ES3 */) {
-                                write('exports["default"]');
-                            }
-                            else {
-                                write("exports.default");
-                            }
-                        }
-                        else {
-                            emitModuleMemberName(node);
-                        }
-                        write(" = ");
-                        emitDeclarationName(node);
-                    }
-                    emitEnd(node);
-                    write(";");
-                }
-            }
-            function emitExportMemberAssignments(name) {
-                if (modulekind === ts.ModuleKind.System) {
-                    return;
-                }
-                if (!exportEquals && exportSpecifiers && ts.hasProperty(exportSpecifiers, name.text)) {
-                    for (var _a = 0, _b = exportSpecifiers[name.text]; _a < _b.length; _a++) {
-                        var specifier = _b[_a];
-                        writeLine();
-                        emitStart(specifier.name);
-                        emitContainingModuleName(specifier);
-                        write(".");
-                        emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                        emitEnd(specifier.name);
-                        write(" = ");
-                        emitExpressionIdentifier(name);
-                        write(";");
-                    }
-                }
-            }
-            function emitExportSpecifierInSystemModule(specifier) {
-                ts.Debug.assert(modulekind === ts.ModuleKind.System);
-                if (!resolver.getReferencedValueDeclaration(specifier.propertyName || specifier.name) && !resolver.isValueAliasDeclaration(specifier)) {
-                    return;
-                }
-                writeLine();
-                emitStart(specifier.name);
-                write(exportFunctionForFile + "(\"");
-                emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                write("\", ");
-                emitExpressionIdentifier(specifier.propertyName || specifier.name);
-                write(")");
-                emitEnd(specifier.name);
-                write(";");
-            }
-            /**
-             * Emit an assignment to a given identifier, 'name', with a given expression, 'value'.
-             * @param name an identifier as a left-hand-side operand of the assignment
-             * @param value an expression as a right-hand-side operand of the assignment
-             * @param shouldEmitCommaBeforeAssignment a boolean indicating whether to prefix an assignment with comma
-             */
-            function emitAssignment(name, value, shouldEmitCommaBeforeAssignment, nodeForSourceMap) {
-                if (shouldEmitCommaBeforeAssignment) {
-                    write(", ");
-                }
-                var exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(name);
-                if (exportChanged) {
-                    write(exportFunctionForFile + "(\"");
-                    emitNodeWithCommentsAndWithoutSourcemap(name);
-                    write("\", ");
-                }
-                var isVariableDeclarationOrBindingElement = name.parent && (name.parent.kind === 218 /* VariableDeclaration */ || name.parent.kind === 169 /* BindingElement */);
-                // If this is first var declaration, we need to start at var/let/const keyword instead
-                // otherwise use nodeForSourceMap as the start position
-                emitStart(isFirstVariableDeclaration(nodeForSourceMap) ? nodeForSourceMap.parent : nodeForSourceMap);
-                withTemporaryNoSourceMap(function () {
-                    if (isVariableDeclarationOrBindingElement) {
-                        emitModuleMemberName(name.parent);
-                    }
-                    else {
-                        emit(name);
-                    }
-                    write(" = ");
-                    emit(value);
-                });
-                emitEnd(nodeForSourceMap, /*stopOverridingSpan*/ true);
-                if (exportChanged) {
-                    write(")");
-                }
-            }
-            /**
-             * Create temporary variable, emit an assignment of the variable the given expression
-             * @param expression an expression to assign to the newly created temporary variable
-             * @param canDefineTempVariablesInPlace a boolean indicating whether you can define the temporary variable at an assignment location
-             * @param shouldEmitCommaBeforeAssignment a boolean indicating whether an assignment should prefix with comma
-             */
-            function emitTempVariableAssignment(expression, canDefineTempVariablesInPlace, shouldEmitCommaBeforeAssignment, sourceMapNode) {
-                var identifier = createTempVariable(0 /* Auto */);
-                if (!canDefineTempVariablesInPlace) {
-                    recordTempDeclaration(identifier);
-                }
-                emitAssignment(identifier, expression, shouldEmitCommaBeforeAssignment, sourceMapNode || expression.parent);
-                return identifier;
-            }
-            function isFirstVariableDeclaration(root) {
-                return root.kind === 218 /* VariableDeclaration */ &&
-                    root.parent.kind === 219 /* VariableDeclarationList */ &&
-                    root.parent.declarations[0] === root;
-            }
-            function emitDestructuring(root, isAssignmentExpressionStatement, value) {
-                var emitCount = 0;
-                // An exported declaration is actually emitted as an assignment (to a property on the module object), so
-                // temporary variables in an exported declaration need to have real declarations elsewhere
-                // Also temporary variables should be explicitly allocated for source level declarations when module target is system
-                // because actual variable declarations are hoisted
-                var canDefineTempVariablesInPlace = false;
-                if (root.kind === 218 /* VariableDeclaration */) {
-                    var isExported = ts.getCombinedNodeFlags(root) & 1 /* Export */;
-                    var isSourceLevelForSystemModuleKind = shouldHoistDeclarationInSystemJsModule(root);
-                    canDefineTempVariablesInPlace = !isExported && !isSourceLevelForSystemModuleKind;
-                }
-                else if (root.kind === 142 /* Parameter */) {
-                    canDefineTempVariablesInPlace = true;
-                }
-                if (root.kind === 187 /* BinaryExpression */) {
-                    emitAssignmentExpression(root);
-                }
-                else {
-                    ts.Debug.assert(!isAssignmentExpressionStatement);
-                    // If first variable declaration of variable statement correct the start location
-                    if (isFirstVariableDeclaration(root)) {
-                        // Use emit location of "var " as next emit start entry
-                        sourceMap.changeEmitSourcePos();
-                    }
-                    emitBindingElement(root, value);
-                }
-                /**
-                 * Ensures that there exists a declared identifier whose value holds the given expression.
-                 * This function is useful to ensure that the expression's value can be read from in subsequent expressions.
-                 * Unless 'reuseIdentifierExpressions' is false, 'expr' will be returned if it is just an identifier.
-                 *
-                 * @param expr the expression whose value needs to be bound.
-                 * @param reuseIdentifierExpressions true if identifier expressions can simply be returned;
-                 *                                   false if it is necessary to always emit an identifier.
-                 */
-                function ensureIdentifier(expr, reuseIdentifierExpressions, sourceMapNode) {
-                    if (expr.kind === 69 /* Identifier */ && reuseIdentifierExpressions) {
-                        return expr;
-                    }
-                    var identifier = emitTempVariableAssignment(expr, canDefineTempVariablesInPlace, emitCount > 0, sourceMapNode);
-                    emitCount++;
-                    return identifier;
-                }
-                function createDefaultValueCheck(value, defaultValue, sourceMapNode) {
-                    // The value expression will be evaluated twice, so for anything but a simple identifier
-                    // we need to generate a temporary variable
-                    // If the temporary variable needs to be emitted use the source Map node for assignment of that statement
-                    value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    // Return the expression 'value === void 0 ? defaultValue : value'
-                    var equals = ts.createSynthesizedNode(187 /* BinaryExpression */);
-                    equals.left = value;
-                    equals.operatorToken = ts.createSynthesizedNode(32 /* EqualsEqualsEqualsToken */);
-                    equals.right = createVoidZero();
-                    return createConditionalExpression(equals, defaultValue, value);
-                }
-                function createConditionalExpression(condition, whenTrue, whenFalse) {
-                    var cond = ts.createSynthesizedNode(188 /* ConditionalExpression */);
-                    cond.condition = condition;
-                    cond.questionToken = ts.createSynthesizedNode(53 /* QuestionToken */);
-                    cond.whenTrue = whenTrue;
-                    cond.colonToken = ts.createSynthesizedNode(54 /* ColonToken */);
-                    cond.whenFalse = whenFalse;
-                    return cond;
-                }
-                function createNumericLiteral(value) {
-                    var node = ts.createSynthesizedNode(8 /* NumericLiteral */);
-                    node.text = "" + value;
-                    return node;
-                }
-                function createPropertyAccessForDestructuringProperty(object, propName) {
-                    var index;
-                    var nameIsComputed = propName.kind === 140 /* ComputedPropertyName */;
-                    if (nameIsComputed) {
-                        // TODO to handle when we look into sourcemaps for computed properties, for now use propName
-                        index = ensureIdentifier(propName.expression, /*reuseIdentifierExpressions*/ false, propName);
-                    }
-                    else {
-                        // We create a synthetic copy of the identifier in order to avoid the rewriting that might
-                        // otherwise occur when the identifier is emitted.
-                        index = ts.createSynthesizedNode(propName.kind);
-                        // We need to unescape identifier here because when parsing an identifier prefixing with "__"
-                        // the parser need to append "_" in order to escape colliding with magic identifiers such as "__proto__"
-                        // Therefore, in order to correctly emit identifiers that are written in original TypeScript file,
-                        // we will unescapeIdentifier to remove additional underscore (if no underscore is added, the function will return original input string)
-                        index.text = ts.unescapeIdentifier(propName.text);
-                    }
-                    return !nameIsComputed && index.kind === 69 /* Identifier */
-                        ? createPropertyAccessExpression(object, index)
-                        : createElementAccessExpression(object, index);
-                }
-                function createSliceCall(value, sliceIndex) {
-                    var call = ts.createSynthesizedNode(174 /* CallExpression */);
-                    var sliceIdentifier = ts.createSynthesizedNode(69 /* Identifier */);
-                    sliceIdentifier.text = "slice";
-                    call.expression = createPropertyAccessExpression(value, sliceIdentifier);
-                    call.arguments = ts.createSynthesizedNodeArray();
-                    call.arguments[0] = createNumericLiteral(sliceIndex);
-                    return call;
-                }
-                function emitObjectLiteralAssignment(target, value, sourceMapNode) {
-                    var properties = target.properties;
-                    if (properties.length !== 1) {
-                        // For anything but a single element destructuring we need to generate a temporary
-                        // to ensure value is evaluated exactly once.
-                        // When doing so we want to highlight the passed in source map node since thats the one needing this temp assignment
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    }
-                    for (var _a = 0, properties_5 = properties; _a < properties_5.length; _a++) {
-                        var p = properties_5[_a];
-                        if (p.kind === 253 /* PropertyAssignment */ || p.kind === 254 /* ShorthandPropertyAssignment */) {
-                            var propName = p.name;
-                            var target_1 = p.kind === 254 /* ShorthandPropertyAssignment */ ? p : p.initializer || propName;
-                            // Assignment for target = value.propName should highlight whole property, hence use p as source map node
-                            emitDestructuringAssignment(target_1, createPropertyAccessForDestructuringProperty(value, propName), p);
-                        }
-                    }
-                }
-                function emitArrayLiteralAssignment(target, value, sourceMapNode) {
-                    var elements = target.elements;
-                    if (elements.length !== 1) {
-                        // For anything but a single element destructuring we need to generate a temporary
-                        // to ensure value is evaluated exactly once.
-                        // When doing so we want to highlight the passed in source map node since thats the one needing this temp assignment
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, sourceMapNode);
-                    }
-                    for (var i = 0; i < elements.length; i++) {
-                        var e = elements[i];
-                        if (e.kind !== 193 /* OmittedExpression */) {
-                            // Assignment for target = value.propName should highlight whole property, hence use e as source map node
-                            if (e.kind !== 191 /* SpreadElementExpression */) {
-                                emitDestructuringAssignment(e, createElementAccessExpression(value, createNumericLiteral(i)), e);
-                            }
-                            else if (i === elements.length - 1) {
-                                emitDestructuringAssignment(e.expression, createSliceCall(value, i), e);
-                            }
-                        }
-                    }
-                }
-                function emitDestructuringAssignment(target, value, sourceMapNode) {
-                    // When emitting target = value use source map node to highlight, including any temporary assignments needed for this
-                    if (target.kind === 254 /* ShorthandPropertyAssignment */) {
-                        if (target.objectAssignmentInitializer) {
-                            value = createDefaultValueCheck(value, target.objectAssignmentInitializer, sourceMapNode);
-                        }
-                        target = target.name;
-                    }
-                    else if (target.kind === 187 /* BinaryExpression */ && target.operatorToken.kind === 56 /* EqualsToken */) {
-                        value = createDefaultValueCheck(value, target.right, sourceMapNode);
-                        target = target.left;
-                    }
-                    if (target.kind === 171 /* ObjectLiteralExpression */) {
-                        emitObjectLiteralAssignment(target, value, sourceMapNode);
-                    }
-                    else if (target.kind === 170 /* ArrayLiteralExpression */) {
-                        emitArrayLiteralAssignment(target, value, sourceMapNode);
-                    }
-                    else {
-                        emitAssignment(target, value, /*shouldEmitCommaBeforeAssignment*/ emitCount > 0, sourceMapNode);
-                        emitCount++;
-                    }
-                }
-                function emitAssignmentExpression(root) {
-                    var target = root.left;
-                    var value = root.right;
-                    if (ts.isEmptyObjectLiteralOrArrayLiteral(target)) {
-                        emit(value);
-                    }
-                    else if (isAssignmentExpressionStatement) {
-                        // Source map node for root.left = root.right is root
-                        // but if root is synthetic, which could be in below case, use the target which is { a }
-                        // for ({a} of {a: string}) {
-                        // }
-                        emitDestructuringAssignment(target, value, ts.nodeIsSynthesized(root) ? target : root);
-                    }
-                    else {
-                        if (root.parent.kind !== 178 /* ParenthesizedExpression */) {
-                            write("(");
-                        }
-                        // Temporary assignment needed to emit root should highlight whole binary expression
-                        value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ true, root);
-                        // Source map node for root.left = root.right is root
-                        emitDestructuringAssignment(target, value, root);
-                        write(", ");
-                        emit(value);
-                        if (root.parent.kind !== 178 /* ParenthesizedExpression */) {
-                            write(")");
-                        }
-                    }
-                }
-                function emitBindingElement(target, value) {
-                    // Any temporary assignments needed to emit target = value should point to target
-                    if (target.initializer) {
-                        // Combine value and initializer
-                        value = value ? createDefaultValueCheck(value, target.initializer, target) : target.initializer;
-                    }
-                    else if (!value) {
-                        // Use 'void 0' in absence of value and initializer
-                        value = createVoidZero();
-                    }
-                    if (ts.isBindingPattern(target.name)) {
-                        var pattern = target.name;
-                        var elements = pattern.elements;
-                        var numElements = elements.length;
-                        if (numElements !== 1) {
-                            // For anything other than a single-element destructuring we need to generate a temporary
-                            // to ensure value is evaluated exactly once. Additionally, if we have zero elements
-                            // we need to emit *something* to ensure that in case a 'var' keyword was already emitted,
-                            // so in that case, we'll intentionally create that temporary.
-                            value = ensureIdentifier(value, /*reuseIdentifierExpressions*/ numElements !== 0, target);
-                        }
-                        for (var i = 0; i < numElements; i++) {
-                            var element = elements[i];
-                            if (pattern.kind === 167 /* ObjectBindingPattern */) {
-                                // Rewrite element to a declaration with an initializer that fetches property
-                                var propName = element.propertyName || element.name;
-                                emitBindingElement(element, createPropertyAccessForDestructuringProperty(value, propName));
-                            }
-                            else if (element.kind !== 193 /* OmittedExpression */) {
-                                if (!element.dotDotDotToken) {
-                                    // Rewrite element to a declaration that accesses array element at index i
-                                    emitBindingElement(element, createElementAccessExpression(value, createNumericLiteral(i)));
-                                }
-                                else if (i === numElements - 1) {
-                                    emitBindingElement(element, createSliceCall(value, i));
-                                }
-                            }
-                        }
-                    }
-                    else {
-                        emitAssignment(target.name, value, /*shouldEmitCommaBeforeAssignment*/ emitCount > 0, target);
-                        emitCount++;
-                    }
-                }
-            }
-            function emitVariableDeclaration(node) {
-                if (ts.isBindingPattern(node.name)) {
-                    var isExported = ts.getCombinedNodeFlags(node) & 1 /* Export */;
-                    if (languageVersion >= 2 /* ES6 */ && (!isExported || modulekind === ts.ModuleKind.ES6)) {
-                        // emit ES6 destructuring only if target module is ES6 or variable is not exported
-                        // exported variables in CJS/AMD are prefixed with 'exports.' so result javascript { exports.toString } = 1; is illegal
-                        var isTopLevelDeclarationInSystemModule = modulekind === ts.ModuleKind.System &&
-                            shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ true);
-                        if (isTopLevelDeclarationInSystemModule) {
-                            // In System modules top level variables are hoisted
-                            // so variable declarations with destructuring are turned into destructuring assignments.
-                            // As a result, they will need parentheses to disambiguate object binding assignments from blocks.
-                            write("(");
-                        }
-                        emit(node.name);
-                        emitOptional(" = ", node.initializer);
-                        if (isTopLevelDeclarationInSystemModule) {
-                            write(")");
-                        }
-                    }
-                    else {
-                        emitDestructuring(node, /*isAssignmentExpressionStatement*/ false);
-                    }
-                }
-                else {
-                    var initializer = node.initializer;
-                    if (!initializer &&
-                        languageVersion < 2 /* ES6 */ &&
-                        // for names - binding patterns that lack initializer there is no point to emit explicit initializer
-                        // since downlevel codegen for destructuring will fail in the absence of initializer so all binding elements will say uninitialized
-                        node.name.kind === 69 /* Identifier */) {
-                        var container = ts.getEnclosingBlockScopeContainer(node);
-                        var flags = resolver.getNodeCheckFlags(node);
-                        // nested let bindings might need to be initialized explicitly to preserve ES6 semantic
-                        // { let x = 1; }
-                        // { let x; } // x here should be undefined. not 1
-                        // NOTES:
-                        // Top level bindings never collide with anything and thus don't require explicit initialization.
-                        // As for nested let bindings there are two cases:
-                        // - nested let bindings that were not renamed definitely should be initialized explicitly
-                        //   { let x = 1; }
-                        //   { let x; if (some-condition) { x = 1}; if (x) { /*1*/ } }
-                        //   Without explicit initialization code in /*1*/ can be executed even if some-condition is evaluated to false
-                        // - renaming introduces fresh name that should not collide with any existing names, however renamed bindings sometimes also should be
-                        //   explicitly initialized. One particular case: non-captured binding declared inside loop body (but not in loop initializer)
-                        //   let x;
-                        //   for (;;) {
-                        //       let x;
-                        //   }
-                        //   in downlevel codegen inner 'x' will be renamed so it won't collide with outer 'x' however it will should be reset on every iteration
-                        //   as if it was declared anew.
-                        //   * Why non-captured binding - because if loop contains block scoped binding captured in some function then loop body will be rewritten
-                        //   to have a fresh scope on every iteration so everything will just work.
-                        //   * Why loop initializer is excluded - since we've introduced a fresh name it already will be undefined.
-                        var isCapturedInFunction = flags & 131072 /* CapturedBlockScopedBinding */;
-                        var isDeclaredInLoop = flags & 262144 /* BlockScopedBindingInLoop */;
-                        var emittedAsTopLevel = ts.isBlockScopedContainerTopLevel(container) ||
-                            (isCapturedInFunction && isDeclaredInLoop && container.kind === 199 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false));
-                        var emittedAsNestedLetDeclaration = ts.getCombinedNodeFlags(node) & 1024 /* Let */ &&
-                            !emittedAsTopLevel;
-                        var emitExplicitInitializer = emittedAsNestedLetDeclaration &&
-                            container.kind !== 207 /* ForInStatement */ &&
-                            container.kind !== 208 /* ForOfStatement */ &&
-                            (!resolver.isDeclarationWithCollidingName(node) ||
-                                (isDeclaredInLoop && !isCapturedInFunction && !ts.isIterationStatement(container, /*lookInLabeledStatements*/ false)));
-                        if (emitExplicitInitializer) {
-                            initializer = createVoidZero();
-                        }
-                    }
-                    var exportChanged = isNameOfExportedSourceLevelDeclarationInSystemExternalModule(node.name);
-                    if (exportChanged) {
-                        write(exportFunctionForFile + "(\"");
-                        emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                        write("\", ");
-                    }
-                    emitModuleMemberName(node);
-                    emitOptional(" = ", initializer);
-                    if (exportChanged) {
-                        write(")");
-                    }
-                }
-            }
-            function emitExportVariableAssignments(node) {
-                if (node.kind === 193 /* OmittedExpression */) {
-                    return;
-                }
-                var name = node.name;
-                if (name.kind === 69 /* Identifier */) {
-                    emitExportMemberAssignments(name);
-                }
-                else if (ts.isBindingPattern(name)) {
-                    ts.forEach(name.elements, emitExportVariableAssignments);
-                }
-            }
-            function isES6ExportedDeclaration(node) {
-                return !!(node.flags & 1 /* Export */) &&
-                    modulekind === ts.ModuleKind.ES6 &&
-                    node.parent.kind === 256 /* SourceFile */;
-            }
-            function emitVariableStatement(node) {
-                var startIsEmitted = false;
-                if (node.flags & 1 /* Export */) {
-                    if (isES6ExportedDeclaration(node)) {
-                        // Exported ES6 module member
-                        write("export ");
-                        startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
-                    }
-                }
-                else {
-                    startIsEmitted = tryEmitStartOfVariableDeclarationList(node.declarationList);
-                }
-                if (startIsEmitted) {
-                    emitCommaList(node.declarationList.declarations);
-                    write(";");
-                }
-                else {
-                    var atLeastOneItem = emitVariableDeclarationListSkippingUninitializedEntries(node.declarationList);
-                    if (atLeastOneItem) {
-                        write(";");
-                    }
-                }
-                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
-                    ts.forEach(node.declarationList.declarations, emitExportVariableAssignments);
-                }
-            }
-            function shouldEmitLeadingAndTrailingCommentsForVariableStatement(node) {
-                // If we're not exporting the variables, there's nothing special here.
-                // Always emit comments for these nodes.
-                if (!(node.flags & 1 /* Export */)) {
-                    return true;
-                }
-                // If we are exporting, but it's a top-level ES6 module exports,
-                // we'll emit the declaration list verbatim, so emit comments too.
-                if (isES6ExportedDeclaration(node)) {
-                    return true;
-                }
-                // Otherwise, only emit if we have at least one initializer present.
-                for (var _a = 0, _b = node.declarationList.declarations; _a < _b.length; _a++) {
-                    var declaration = _b[_a];
-                    if (declaration.initializer) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            function emitParameter(node) {
-                if (languageVersion < 2 /* ES6 */) {
-                    if (ts.isBindingPattern(node.name)) {
-                        var name_29 = createTempVariable(0 /* Auto */);
-                        if (!tempParameters) {
-                            tempParameters = [];
-                        }
-                        tempParameters.push(name_29);
-                        emit(name_29);
-                    }
-                    else {
-                        emit(node.name);
-                    }
-                }
-                else {
-                    if (node.dotDotDotToken) {
-                        write("...");
-                    }
-                    emit(node.name);
-                    emitOptional(" = ", node.initializer);
-                }
-            }
-            function emitDefaultValueAssignments(node) {
-                if (languageVersion < 2 /* ES6 */) {
-                    var tempIndex_1 = 0;
-                    ts.forEach(node.parameters, function (parameter) {
-                        // A rest parameter cannot have a binding pattern or an initializer,
-                        // so let's just ignore it.
-                        if (parameter.dotDotDotToken) {
-                            return;
-                        }
-                        var paramName = parameter.name, initializer = parameter.initializer;
-                        if (ts.isBindingPattern(paramName)) {
-                            // In cases where a binding pattern is simply '[]' or '{}',
-                            // we usually don't want to emit a var declaration; however, in the presence
-                            // of an initializer, we must emit that expression to preserve side effects.
-                            var hasBindingElements = paramName.elements.length > 0;
-                            if (hasBindingElements || initializer) {
-                                writeLine();
-                                write("var ");
-                                if (hasBindingElements) {
-                                    emitDestructuring(parameter, /*isAssignmentExpressionStatement*/ false, tempParameters[tempIndex_1]);
-                                }
-                                else {
-                                    emit(tempParameters[tempIndex_1]);
-                                    write(" = ");
-                                    emit(initializer);
-                                }
-                                write(";");
-                            }
-                            // Regardless of whether we will emit a var declaration for the binding pattern, we generate the temporary
-                            // variable for the parameter (see: emitParameter)
-                            tempIndex_1++;
-                        }
-                        else if (initializer) {
-                            writeLine();
-                            emitStart(parameter);
-                            write("if (");
-                            emitNodeWithoutSourceMap(paramName);
-                            write(" === void 0)");
-                            emitEnd(parameter);
-                            write(" { ");
-                            emitStart(parameter);
-                            emitNodeWithCommentsAndWithoutSourcemap(paramName);
-                            write(" = ");
-                            emitNodeWithCommentsAndWithoutSourcemap(initializer);
-                            emitEnd(parameter);
-                            write("; }");
-                        }
-                    });
-                }
-            }
-            function emitRestParameter(node) {
-                if (languageVersion < 2 /* ES6 */ && ts.hasDeclaredRestParameter(node)) {
-                    var restIndex = node.parameters.length - 1;
-                    var restParam = node.parameters[restIndex];
-                    // A rest parameter cannot have a binding pattern, so let's just ignore it if it does.
-                    if (ts.isBindingPattern(restParam.name)) {
-                        return;
-                    }
-                    var tempName = createTempVariable(268435456 /* _i */).text;
-                    writeLine();
-                    emitLeadingComments(restParam);
-                    emitStart(restParam);
-                    write("var ");
-                    emitNodeWithCommentsAndWithoutSourcemap(restParam.name);
-                    write(" = [];");
-                    emitEnd(restParam);
-                    emitTrailingComments(restParam);
-                    writeLine();
-                    write("for (");
-                    emitStart(restParam);
-                    write("var " + tempName + " = " + restIndex + ";");
-                    emitEnd(restParam);
-                    write(" ");
-                    emitStart(restParam);
-                    write(tempName + " < arguments.length;");
-                    emitEnd(restParam);
-                    write(" ");
-                    emitStart(restParam);
-                    write(tempName + "++");
-                    emitEnd(restParam);
-                    write(") {");
-                    increaseIndent();
-                    writeLine();
-                    emitStart(restParam);
-                    emitNodeWithCommentsAndWithoutSourcemap(restParam.name);
-                    write("[" + tempName + " - " + restIndex + "] = arguments[" + tempName + "];");
-                    emitEnd(restParam);
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-            function emitAccessor(node) {
-                write(node.kind === 149 /* GetAccessor */ ? "get " : "set ");
-                emit(node.name);
-                emitSignatureAndBody(node);
-            }
-            function shouldEmitAsArrowFunction(node) {
-                return node.kind === 180 /* ArrowFunction */ && languageVersion >= 2 /* ES6 */;
-            }
-            function emitDeclarationName(node) {
-                if (node.name) {
-                    emitNodeWithCommentsAndWithoutSourcemap(node.name);
-                }
-                else {
-                    write(getGeneratedNameForNode(node));
-                }
-            }
-            function shouldEmitFunctionName(node) {
-                if (node.kind === 179 /* FunctionExpression */) {
-                    // Emit name if one is present
-                    return !!node.name;
-                }
-                if (node.kind === 220 /* FunctionDeclaration */) {
-                    // Emit name if one is present, or emit generated name in down-level case (for export default case)
-                    return !!node.name || modulekind !== ts.ModuleKind.ES6;
-                }
-            }
-            function emitFunctionDeclaration(node) {
-                if (ts.nodeIsMissing(node.body)) {
-                    return emitCommentsOnNotEmittedNode(node);
-                }
-                // TODO (yuisu) : we should not have special cases to condition emitting comments
-                // but have one place to fix check for these conditions.
-                var kind = node.kind, parent = node.parent;
-                if (kind !== 147 /* MethodDeclaration */ &&
-                    kind !== 146 /* MethodSignature */ &&
-                    parent &&
-                    parent.kind !== 253 /* PropertyAssignment */ &&
-                    parent.kind !== 174 /* CallExpression */ &&
-                    parent.kind !== 170 /* ArrayLiteralExpression */) {
-                    // 1. Methods will emit comments at their assignment declaration sites.
-                    //
-                    // 2. If the function is a property of object literal, emitting leading-comments
-                    //    is done by emitNodeWithoutSourceMap which then call this function.
-                    //    In particular, we would like to avoid emit comments twice in following case:
-                    //
-                    //          var obj = {
-                    //              id:
-                    //                  /*comment*/ () => void
-                    //          }
-                    //
-                    // 3. If the function is an argument in call expression, emitting of comments will be
-                    //    taken care of in emit list of arguments inside of 'emitCallExpression'.
-                    //
-                    // 4. If the function is in an array literal, 'emitLinePreservingList' will take care
-                    //    of leading comments.
-                    emitLeadingComments(node);
-                }
-                emitStart(node);
-                // For targeting below es6, emit functions-like declaration including arrow function using function keyword.
-                // When targeting ES6, emit arrow function natively in ES6 by omitting function keyword and using fat arrow instead
-                if (!shouldEmitAsArrowFunction(node)) {
-                    if (isES6ExportedDeclaration(node)) {
-                        write("export ");
-                        if (node.flags & 512 /* Default */) {
-                            write("default ");
-                        }
-                    }
-                    write("function");
-                    if (languageVersion >= 2 /* ES6 */ && node.asteriskToken) {
-                        write("*");
-                    }
-                    write(" ");
-                }
-                if (shouldEmitFunctionName(node)) {
-                    emitDeclarationName(node);
-                }
-                emitSignatureAndBody(node);
-                if (modulekind !== ts.ModuleKind.ES6 && kind === 220 /* FunctionDeclaration */ && parent === currentSourceFile && node.name) {
-                    emitExportMemberAssignments(node.name);
-                }
-                emitEnd(node);
-                if (kind !== 147 /* MethodDeclaration */ &&
-                    kind !== 146 /* MethodSignature */ &&
-                    kind !== 180 /* ArrowFunction */) {
-                    emitTrailingComments(node);
-                }
-            }
-            function emitCaptureThisForNodeIfNecessary(node) {
-                if (resolver.getNodeCheckFlags(node) & 4 /* CaptureThis */) {
-                    writeLine();
-                    emitStart(node);
-                    write("var _this = this;");
-                    emitEnd(node);
-                }
-            }
-            function emitSignatureParameters(node) {
-                increaseIndent();
-                write("(");
-                if (node) {
-                    var parameters = node.parameters;
-                    var skipCount = node.parameters.length && node.parameters[0].name.text === "this" ? 1 : 0;
-                    var omitCount = languageVersion < 2 /* ES6 */ && ts.hasDeclaredRestParameter(node) ? 1 : 0;
-                    emitList(parameters, skipCount, parameters.length - omitCount - skipCount, /*multiLine*/ false, /*trailingComma*/ false);
-                }
-                write(")");
-                decreaseIndent();
-            }
-            function emitSignatureParametersForArrow(node) {
-                // Check whether the parameter list needs parentheses and preserve no-parenthesis
-                if (node.parameters.length === 1 && node.pos === node.parameters[0].pos) {
-                    emit(node.parameters[0]);
-                    return;
-                }
-                emitSignatureParameters(node);
-            }
-            function emitAsyncFunctionBodyForES6(node) {
-                var promiseConstructor = ts.getEntityNameFromTypeNode(node.type);
-                var isArrowFunction = node.kind === 180 /* ArrowFunction */;
-                var hasLexicalArguments = (resolver.getNodeCheckFlags(node) & 8192 /* CaptureArguments */) !== 0;
-                // An async function is emit as an outer function that calls an inner
-                // generator function. To preserve lexical bindings, we pass the current
-                // `this` and `arguments` objects to `__awaiter`. The generator function
-                // passed to `__awaiter` is executed inside of the callback to the
-                // promise constructor.
-                //
-                // The emit for an async arrow without a lexical `arguments` binding might be:
-                //
-                //  // input
-                //  let a = async (b) => { await b; }
-                //
-                //  // output
-                //  let a = (b) => __awaiter(this, void 0, void 0, function* () {
-                //      yield b;
-                //  });
-                //
-                // The emit for an async arrow with a lexical `arguments` binding might be:
-                //
-                //  // input
-                //  let a = async (b) => { await arguments[0]; }
-                //
-                //  // output
-                //  let a = (b) => __awaiter(this, arguments, void 0, function* (arguments) {
-                //      yield arguments[0];
-                //  });
-                //
-                // The emit for an async function expression without a lexical `arguments` binding
-                // might be:
-                //
-                //  // input
-                //  let a = async function (b) {
-                //      await b;
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, void 0, void 0, function* () {
-                //          yield b;
-                //      });
-                //  }
-                //
-                // The emit for an async function expression with a lexical `arguments` binding
-                // might be:
-                //
-                //  // input
-                //  let a = async function (b) {
-                //      await arguments[0];
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, arguments, void 0, function* (_arguments) {
-                //          yield _arguments[0];
-                //      });
-                //  }
-                //
-                // The emit for an async function expression with a lexical `arguments` binding
-                // and a return type annotation might be:
-                //
-                //  // input
-                //  let a = async function (b): MyPromise<any> {
-                //      await arguments[0];
-                //  }
-                //
-                //  // output
-                //  let a = function (b) {
-                //      return __awaiter(this, arguments, MyPromise, function* (_arguments) {
-                //          yield _arguments[0];
-                //      });
-                //  }
-                //
-                // If this is not an async arrow, emit the opening brace of the function body
-                // and the start of the return statement.
-                if (!isArrowFunction) {
-                    write(" {");
-                    increaseIndent();
-                    writeLine();
-                    if (resolver.getNodeCheckFlags(node) & 4096 /* AsyncMethodWithSuperBinding */) {
-                        writeLines("\nconst _super = (function (geti, seti) {\n    const cache = Object.create(null);\n    return name => cache[name] || (cache[name] = { get value() { return geti(name); }, set value(v) { seti(name, v); } });\n})(name => super[name], (name, value) => super[name] = value);");
-                        writeLine();
-                    }
-                    else if (resolver.getNodeCheckFlags(node) & 2048 /* AsyncMethodWithSuper */) {
-                        write("const _super = name => super[name];");
-                        writeLine();
-                    }
-                    write("return");
-                }
-                write(" __awaiter(this");
-                if (hasLexicalArguments) {
-                    write(", arguments, ");
-                }
-                else {
-                    write(", void 0, ");
-                }
-                if (languageVersion >= 2 /* ES6 */ || !promiseConstructor) {
-                    write("void 0");
-                }
-                else {
-                    emitEntityNameAsExpression(promiseConstructor, /*useFallback*/ false);
-                }
-                // Emit the call to __awaiter.
-                write(", function* ()");
-                // Emit the signature and body for the inner generator function.
-                emitFunctionBody(node);
-                write(")");
-                // If this is not an async arrow, emit the closing brace of the outer function body.
-                if (!isArrowFunction) {
-                    write(";");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-            function emitFunctionBody(node) {
-                if (!node.body) {
-                    // There can be no body when there are parse errors.  Just emit an empty block
-                    // in that case.
-                    write(" { }");
-                }
-                else {
-                    if (node.body.kind === 199 /* Block */) {
-                        emitBlockFunctionBody(node, node.body);
-                    }
-                    else {
-                        emitExpressionFunctionBody(node, node.body);
-                    }
-                }
-            }
-            function emitSignatureAndBody(node) {
-                var saveConvertedLoopState = convertedLoopState;
-                var saveTempFlags = tempFlags;
-                var saveTempVariables = tempVariables;
-                var saveTempParameters = tempParameters;
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                // When targeting ES6, emit arrow function natively in ES6
-                if (shouldEmitAsArrowFunction(node)) {
-                    emitSignatureParametersForArrow(node);
-                    write(" =>");
-                }
-                else {
-                    emitSignatureParameters(node);
-                }
-                var isAsync = ts.isAsyncFunctionLike(node);
-                if (isAsync) {
-                    emitAsyncFunctionBodyForES6(node);
-                }
-                else {
-                    emitFunctionBody(node);
-                }
-                if (!isES6ExportedDeclaration(node)) {
-                    emitExportMemberAssignment(node);
-                }
-                ts.Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-            }
-            // Returns true if any preamble code was emitted.
-            function emitFunctionBodyPreamble(node) {
-                emitCaptureThisForNodeIfNecessary(node);
-                emitDefaultValueAssignments(node);
-                emitRestParameter(node);
-            }
-            function emitExpressionFunctionBody(node, body) {
-                if (languageVersion < 2 /* ES6 */ || node.flags & 256 /* Async */) {
-                    emitDownLevelExpressionFunctionBody(node, body);
-                    return;
-                }
-                // For es6 and higher we can emit the expression as is.  However, in the case
-                // where the expression might end up looking like a block when emitted, we'll
-                // also wrap it in parentheses first.  For example if you have: a => <foo>{}
-                // then we need to generate: a => ({})
-                write(" ");
-                // Unwrap all type assertions.
-                var current = body;
-                while (current.kind === 177 /* TypeAssertionExpression */) {
-                    current = current.expression;
-                }
-                emitParenthesizedIf(body, current.kind === 171 /* ObjectLiteralExpression */);
-            }
-            function emitDownLevelExpressionFunctionBody(node, body) {
-                write(" {");
-                increaseIndent();
-                var outPos = writer.getTextPos();
-                emitDetachedCommentsAndUpdateCommentsInfo(node.body);
-                emitFunctionBodyPreamble(node);
-                var preambleEmitted = writer.getTextPos() !== outPos;
-                decreaseIndent();
-                // If we didn't have to emit any preamble code, then attempt to keep the arrow
-                // function on one line.
-                if (!preambleEmitted && nodeStartPositionsAreOnSameLine(node, body)) {
-                    write(" ");
-                    emitStart(body);
-                    write("return ");
-                    emit(body);
-                    emitEnd(body);
-                    write(";");
-                    emitTempDeclarations(/*newLine*/ false);
-                    write(" ");
-                }
-                else {
-                    increaseIndent();
-                    writeLine();
-                    emitLeadingComments(node.body);
-                    emitStart(body);
-                    write("return ");
-                    emit(body);
-                    emitEnd(body);
-                    write(";");
-                    emitTrailingComments(node.body);
-                    emitTempDeclarations(/*newLine*/ true);
-                    decreaseIndent();
-                    writeLine();
-                }
-                emitStart(node.body);
-                write("}");
-                emitEnd(node.body);
-            }
-            function emitBlockFunctionBody(node, body) {
-                write(" {");
-                var initialTextPos = writer.getTextPos();
-                increaseIndent();
-                emitDetachedCommentsAndUpdateCommentsInfo(body.statements);
-                // Emit all the directive prologues (like "use strict").  These have to come before
-                // any other preamble code we write (like parameter initializers).
-                var startIndex = emitDirectivePrologues(body.statements, /*startWithNewLine*/ true);
-                emitFunctionBodyPreamble(node);
-                decreaseIndent();
-                var preambleEmitted = writer.getTextPos() !== initialTextPos;
-                if (!preambleEmitted && nodeEndIsOnSameLineAsNodeStart(body, body)) {
-                    for (var _a = 0, _b = body.statements; _a < _b.length; _a++) {
-                        var statement = _b[_a];
-                        write(" ");
-                        emit(statement);
-                    }
-                    emitTempDeclarations(/*newLine*/ false);
-                    write(" ");
-                    emitLeadingCommentsOfPosition(body.statements.end);
-                }
-                else {
-                    increaseIndent();
-                    emitLinesStartingAt(body.statements, startIndex);
-                    emitTempDeclarations(/*newLine*/ true);
-                    writeLine();
-                    emitLeadingCommentsOfPosition(body.statements.end);
-                    decreaseIndent();
-                }
-                emitToken(16 /* CloseBraceToken */, body.statements.end);
-            }
-            /**
-             * Return the statement at a given index if it is a super-call statement
-             * @param ctor a constructor declaration
-             * @param index an index to constructor's body to check
-             */
-            function getSuperCallAtGivenIndex(ctor, index) {
-                if (!ctor.body) {
-                    return undefined;
-                }
-                var statements = ctor.body.statements;
-                if (!statements || index >= statements.length) {
-                    return undefined;
-                }
-                var statement = statements[index];
-                if (statement.kind === 202 /* ExpressionStatement */) {
-                    return ts.isSuperCallExpression(statement.expression) ? statement : undefined;
-                }
-            }
-            function emitParameterPropertyAssignments(node) {
-                ts.forEach(node.parameters, function (param) {
-                    if (param.flags & 92 /* ParameterPropertyModifier */) {
-                        writeLine();
-                        emitStart(param);
-                        emitStart(param.name);
-                        write("this.");
-                        emitNodeWithoutSourceMap(param.name);
-                        emitEnd(param.name);
-                        write(" = ");
-                        emit(param.name);
-                        write(";");
-                        emitEnd(param);
-                    }
-                });
-            }
-            function emitMemberAccessForPropertyName(memberName) {
-                // This does not emit source map because it is emitted by caller as caller
-                // is aware how the property name changes to the property access
-                // eg. public x = 10; becomes this.x and static x = 10 becomes className.x
-                if (memberName.kind === 9 /* StringLiteral */ || memberName.kind === 8 /* NumericLiteral */) {
-                    write("[");
-                    emitNodeWithCommentsAndWithoutSourcemap(memberName);
-                    write("]");
-                }
-                else if (memberName.kind === 140 /* ComputedPropertyName */) {
-                    emitComputedPropertyName(memberName);
-                }
-                else {
-                    write(".");
-                    emitNodeWithCommentsAndWithoutSourcemap(memberName);
-                }
-            }
-            function getInitializedProperties(node, isStatic) {
-                var properties = [];
-                for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
-                    var member = _b[_a];
-                    if (member.kind === 145 /* PropertyDeclaration */ && isStatic === ((member.flags & 32 /* Static */) !== 0) && member.initializer) {
-                        properties.push(member);
-                    }
-                }
-                return properties;
-            }
-            function emitPropertyDeclarations(node, properties) {
-                for (var _a = 0, properties_6 = properties; _a < properties_6.length; _a++) {
-                    var property = properties_6[_a];
-                    emitPropertyDeclaration(node, property);
-                }
-            }
-            function emitPropertyDeclaration(node, property, receiver, isExpression) {
-                writeLine();
-                emitLeadingComments(property);
-                emitStart(property);
-                emitStart(property.name);
-                if (receiver) {
-                    write(receiver);
-                }
-                else {
-                    if (property.flags & 32 /* Static */) {
-                        emitDeclarationName(node);
-                    }
-                    else {
-                        write("this");
-                    }
-                }
-                emitMemberAccessForPropertyName(property.name);
-                emitEnd(property.name);
-                write(" = ");
-                emit(property.initializer);
-                if (!isExpression) {
-                    write(";");
-                }
-                emitEnd(property);
-                emitTrailingComments(property);
-            }
-            function emitMemberFunctionsForES5AndLower(node) {
-                ts.forEach(node.members, function (member) {
-                    if (member.kind === 198 /* SemicolonClassElement */) {
-                        writeLine();
-                        write(";");
-                    }
-                    else if (member.kind === 147 /* MethodDeclaration */ || node.kind === 146 /* MethodSignature */) {
-                        if (!member.body) {
-                            return emitCommentsOnNotEmittedNode(member);
-                        }
-                        writeLine();
-                        emitLeadingComments(member);
-                        emitStart(member);
-                        emitStart(member.name);
-                        emitClassMemberPrefix(node, member);
-                        emitMemberAccessForPropertyName(member.name);
-                        emitEnd(member.name);
-                        write(" = ");
-                        emitFunctionDeclaration(member);
-                        emitEnd(member);
-                        write(";");
-                        emitTrailingComments(member);
-                    }
-                    else if (member.kind === 149 /* GetAccessor */ || member.kind === 150 /* SetAccessor */) {
-                        var accessors = ts.getAllAccessorDeclarations(node.members, member);
-                        if (member === accessors.firstAccessor) {
-                            writeLine();
-                            emitStart(member);
-                            write("Object.defineProperty(");
-                            emitStart(member.name);
-                            emitClassMemberPrefix(node, member);
-                            write(", ");
-                            emitExpressionForPropertyName(member.name);
-                            emitEnd(member.name);
-                            write(", {");
-                            increaseIndent();
-                            if (accessors.getAccessor) {
-                                writeLine();
-                                emitLeadingComments(accessors.getAccessor);
-                                write("get: ");
-                                emitStart(accessors.getAccessor);
-                                write("function ");
-                                emitSignatureAndBody(accessors.getAccessor);
-                                emitEnd(accessors.getAccessor);
-                                emitTrailingComments(accessors.getAccessor);
-                                write(",");
-                            }
-                            if (accessors.setAccessor) {
-                                writeLine();
-                                emitLeadingComments(accessors.setAccessor);
-                                write("set: ");
-                                emitStart(accessors.setAccessor);
-                                write("function ");
-                                emitSignatureAndBody(accessors.setAccessor);
-                                emitEnd(accessors.setAccessor);
-                                emitTrailingComments(accessors.setAccessor);
-                                write(",");
-                            }
-                            writeLine();
-                            write("enumerable: true,");
-                            writeLine();
-                            write("configurable: true");
-                            decreaseIndent();
-                            writeLine();
-                            write("});");
-                            emitEnd(member);
-                        }
-                    }
-                });
-            }
-            function emitMemberFunctionsForES6AndHigher(node) {
-                for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
-                    var member = _b[_a];
-                    if ((member.kind === 147 /* MethodDeclaration */ || node.kind === 146 /* MethodSignature */) && !member.body) {
-                        emitCommentsOnNotEmittedNode(member);
-                    }
-                    else if (member.kind === 147 /* MethodDeclaration */ ||
-                        member.kind === 149 /* GetAccessor */ ||
-                        member.kind === 150 /* SetAccessor */) {
-                        writeLine();
-                        emitLeadingComments(member);
-                        emitStart(member);
-                        if (member.flags & 32 /* Static */) {
-                            write("static ");
-                        }
-                        if (member.kind === 149 /* GetAccessor */) {
-                            write("get ");
-                        }
-                        else if (member.kind === 150 /* SetAccessor */) {
-                            write("set ");
-                        }
-                        if (member.asteriskToken) {
-                            write("*");
-                        }
-                        emit(member.name);
-                        emitSignatureAndBody(member);
-                        emitEnd(member);
-                        emitTrailingComments(member);
-                    }
-                    else if (member.kind === 198 /* SemicolonClassElement */) {
-                        writeLine();
-                        write(";");
-                    }
-                }
-            }
-            function emitConstructor(node, baseTypeElement) {
-                var saveConvertedLoopState = convertedLoopState;
-                var saveTempFlags = tempFlags;
-                var saveTempVariables = tempVariables;
-                var saveTempParameters = tempParameters;
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                emitConstructorWorker(node, baseTypeElement);
-                ts.Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-            }
-            function emitConstructorWorker(node, baseTypeElement) {
-                // Check if we have property assignment inside class declaration.
-                // If there is property assignment, we need to emit constructor whether users define it or not
-                // If there is no property assignment, we can omit constructor if users do not define it
-                var hasInstancePropertyWithInitializer = false;
-                // Emit the constructor overload pinned comments
-                ts.forEach(node.members, function (member) {
-                    if (member.kind === 148 /* Constructor */ && !member.body) {
-                        emitCommentsOnNotEmittedNode(member);
-                    }
-                    // Check if there is any non-static property assignment
-                    if (member.kind === 145 /* PropertyDeclaration */ && member.initializer && (member.flags & 32 /* Static */) === 0) {
-                        hasInstancePropertyWithInitializer = true;
-                    }
-                });
-                var ctor = ts.getFirstConstructorWithBody(node);
-                // For target ES6 and above, if there is no user-defined constructor and there is no property assignment
-                // do not emit constructor in class declaration.
-                if (languageVersion >= 2 /* ES6 */ && !ctor && !hasInstancePropertyWithInitializer) {
-                    return;
-                }
-                if (ctor) {
-                    emitLeadingComments(ctor);
-                }
-                emitStart(ctor || node);
-                if (languageVersion < 2 /* ES6 */) {
-                    write("function ");
-                    emitDeclarationName(node);
-                    emitSignatureParameters(ctor);
-                }
-                else {
-                    write("constructor");
-                    if (ctor) {
-                        emitSignatureParameters(ctor);
-                    }
-                    else {
-                        // Based on EcmaScript6 section 14.5.14: Runtime Semantics: ClassDefinitionEvaluation.
-                        // If constructor is empty, then,
-                        //      If ClassHeritageopt is present, then
-                        //          Let constructor be the result of parsing the String "constructor(... args){ super (...args);}" using the syntactic grammar with the goal symbol MethodDefinition.
-                        //      Else,
-                        //          Let constructor be the result of parsing the String "constructor( ){ }" using the syntactic grammar with the goal symbol MethodDefinition
-                        if (baseTypeElement) {
-                            write("(...args)");
-                        }
-                        else {
-                            write("()");
-                        }
-                    }
-                }
-                var startIndex = 0;
-                write(" {");
-                increaseIndent();
-                if (ctor) {
-                    // Emit all the directive prologues (like "use strict").  These have to come before
-                    // any other preamble code we write (like parameter initializers).
-                    startIndex = emitDirectivePrologues(ctor.body.statements, /*startWithNewLine*/ true);
-                    emitDetachedCommentsAndUpdateCommentsInfo(ctor.body.statements);
-                }
-                emitCaptureThisForNodeIfNecessary(node);
-                var superCall;
-                if (ctor) {
-                    emitDefaultValueAssignments(ctor);
-                    emitRestParameter(ctor);
-                    if (baseTypeElement) {
-                        superCall = getSuperCallAtGivenIndex(ctor, startIndex);
-                        if (superCall) {
-                            writeLine();
-                            emit(superCall);
-                        }
-                    }
-                    emitParameterPropertyAssignments(ctor);
-                }
-                else {
-                    if (baseTypeElement) {
-                        writeLine();
-                        emitStart(baseTypeElement);
-                        if (languageVersion < 2 /* ES6 */) {
-                            write("_super.apply(this, arguments);");
-                        }
-                        else {
-                            write("super(...args);");
-                        }
-                        emitEnd(baseTypeElement);
-                    }
-                }
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ false));
-                if (ctor) {
-                    var statements = ctor.body.statements;
-                    if (superCall) {
-                        statements = statements.slice(1);
-                    }
-                    emitLinesStartingAt(statements, startIndex);
-                }
-                emitTempDeclarations(/*newLine*/ true);
-                writeLine();
-                if (ctor) {
-                    emitLeadingCommentsOfPosition(ctor.body.statements.end);
-                }
-                decreaseIndent();
-                emitToken(16 /* CloseBraceToken */, ctor ? ctor.body.statements.end : node.members.end);
-                emitEnd(ctor || node);
-                if (ctor) {
-                    emitTrailingComments(ctor);
-                }
-            }
-            function emitClassExpression(node) {
-                return emitClassLikeDeclaration(node);
-            }
-            function emitClassDeclaration(node) {
-                return emitClassLikeDeclaration(node);
-            }
-            function emitClassLikeDeclaration(node) {
-                if (languageVersion < 2 /* ES6 */) {
-                    emitClassLikeDeclarationBelowES6(node);
-                }
-                else {
-                    emitClassLikeDeclarationForES6AndHigher(node);
-                }
-                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile && node.name) {
-                    emitExportMemberAssignments(node.name);
-                }
-            }
-            function emitClassLikeDeclarationForES6AndHigher(node) {
-                var decoratedClassAlias;
-                var isHoistedDeclarationInSystemModule = shouldHoistDeclarationInSystemJsModule(node);
-                var isDecorated = ts.nodeIsDecorated(node);
-                var rewriteAsClassExpression = isDecorated || isHoistedDeclarationInSystemModule;
-                if (node.kind === 221 /* ClassDeclaration */) {
-                    if (rewriteAsClassExpression) {
-                        // When we emit an ES6 class that has a class decorator, we must tailor the
-                        // emit to certain specific cases.
-                        //
-                        // In the simplest case, we emit the class declaration as a let declaration, and
-                        // evaluate decorators after the close of the class body:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C = class C {
-                        //  class C {                       | }
-                        //  }                               | C = __decorate([dec], C);
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | export let C = class C {
-                        //  export class C {                | }
-                        //  }                               | C = __decorate([dec], C);
-                        //  ---------------------------------------------------------------------
-                        //  [Example 1]
-                        //
-                        // If a class declaration contains a reference to itself *inside* of the class body,
-                        // this introduces two bindings to the class: One outside of the class body, and one
-                        // inside of the class body. If we apply decorators as in [Example 1] above, there
-                        // is the possibility that the decorator `dec` will return a new value for the
-                        // constructor, which would result in the binding inside of the class no longer
-                        // pointing to the same reference as the binding outside of the class.
-                        //
-                        // As a result, we must instead rewrite all references to the class *inside* of the
-                        // class body to instead point to a local temporary alias for the class:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  class C {                       |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | }
-                        //    static y = 1;                 | let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  export class C {                |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | }
-                        //    static y = 1;                 | export let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //  ---------------------------------------------------------------------
-                        //  [Example 2]
-                        //
-                        // If a class declaration is the default export of a module, we instead emit
-                        // the export after the decorated declaration:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let default_1 = class {
-                        //  export default class {          | }
-                        //  }                               | default_1 = __decorate([dec], default_1);
-                        //                                  | export default default_1;
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C = class C {
-                        //  export default class {          | }
-                        //  }                               | C = __decorate([dec], C);
-                        //                                  | export default C;
-                        //  ---------------------------------------------------------------------
-                        //  [Example 3]
-                        //
-                        // If the class declaration is the default export and a reference to itself
-                        // inside of the class body, we must emit both an alias for the class *and*
-                        // move the export after the declaration:
-                        //
-                        //  TypeScript                      | Javascript
-                        //  --------------------------------|------------------------------------
-                        //  @dec                            | let C_1 = class C {
-                        //  export default class C {        |   static x() { return C_1.y; }
-                        //    static x() { return C.y; }    | };
-                        //    static y = 1;                 | let C = C_1;
-                        //  }                               | C.y = 1;
-                        //                                  | C = C_1 = __decorate([dec], C);
-                        //                                  | export default C;
-                        //  ---------------------------------------------------------------------
-                        //  [Example 4]
-                        //
-                        // NOTE: we reuse the same rewriting logic for cases when targeting ES6 and module kind is System.
-                        // Because of hoisting top level class declaration need to be emitted as class expressions.
-                        // Double bind case is only required if node is decorated.
-                        if (isDecorated && resolver.getNodeCheckFlags(node) & 524288 /* ClassWithBodyScopedClassBinding */) {
-                            decoratedClassAlias = ts.unescapeIdentifier(makeUniqueName(node.name ? node.name.text : "default"));
-                            decoratedClassAliases[ts.getNodeId(node)] = decoratedClassAlias;
-                        }
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */) && decoratedClassAlias === undefined) {
-                            write("export ");
-                        }
-                        if (!isHoistedDeclarationInSystemModule) {
-                            write("let ");
-                        }
-                        if (decoratedClassAlias !== undefined) {
-                            write("" + decoratedClassAlias);
-                        }
-                        else {
-                            emitDeclarationName(node);
-                        }
-                        write(" = ");
-                    }
-                    else if (isES6ExportedDeclaration(node)) {
-                        write("export ");
-                        if (node.flags & 512 /* Default */) {
-                            write("default ");
-                        }
-                    }
-                }
-                // If the class has static properties, and it's a class expression, then we'll need
-                // to specialize the emit a bit.  for a class expression of the form:
-                //
-                //      class C { static a = 1; static b = 2; ... }
-                //
-                // We'll emit:
-                //
-                //      (_temp = class C { ... }, _temp.a = 1, _temp.b = 2, _temp)
-                //
-                // This keeps the expression as an expression, while ensuring that the static parts
-                // of it have been initialized by the time it is used.
-                var staticProperties = getInitializedProperties(node, /*isStatic*/ true);
-                var isClassExpressionWithStaticProperties = staticProperties.length > 0 && node.kind === 192 /* ClassExpression */;
-                var generatedName;
-                if (isClassExpressionWithStaticProperties) {
-                    generatedName = getGeneratedNameForNode(node.name);
-                    var synthesizedNode = ts.createSynthesizedNode(69 /* Identifier */);
-                    synthesizedNode.text = generatedName;
-                    recordTempDeclaration(synthesizedNode);
-                    write("(");
-                    increaseIndent();
-                    emit(synthesizedNode);
-                    write(" = ");
-                }
-                write("class");
-                // emit name if
-                // - node has a name
-                // - this is default export with static initializers
-                if (node.name || (node.flags & 512 /* Default */ && (staticProperties.length > 0 || modulekind !== ts.ModuleKind.ES6) && !rewriteAsClassExpression)) {
-                    write(" ");
-                    emitDeclarationName(node);
-                }
-                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
-                if (baseTypeNode) {
-                    write(" extends ");
-                    emit(baseTypeNode.expression);
-                }
-                write(" {");
-                increaseIndent();
-                writeLine();
-                emitConstructor(node, baseTypeNode);
-                emitMemberFunctionsForES6AndHigher(node);
-                decreaseIndent();
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.members.end);
-                if (rewriteAsClassExpression) {
-                    if (decoratedClassAlias !== undefined) {
-                        write(";");
-                        writeLine();
-                        if (isES6ExportedDeclaration(node) && !(node.flags & 512 /* Default */)) {
-                            write("export ");
-                        }
-                        write("let ");
-                        emitDeclarationName(node);
-                        write(" = " + decoratedClassAlias);
-                    }
-                    decoratedClassAliases[ts.getNodeId(node)] = undefined;
-                    write(";");
-                }
-                // Emit static property assignment. Because classDeclaration is lexically evaluated,
-                // it is safe to emit static property assignment after classDeclaration
-                // From ES6 specification:
-                //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
-                //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-                if (isClassExpressionWithStaticProperties) {
-                    for (var _a = 0, staticProperties_1 = staticProperties; _a < staticProperties_1.length; _a++) {
-                        var property = staticProperties_1[_a];
-                        write(",");
-                        writeLine();
-                        emitPropertyDeclaration(node, property, /*receiver*/ generatedName, /*isExpression*/ true);
-                    }
-                    write(",");
-                    writeLine();
-                    write(generatedName);
-                    decreaseIndent();
-                    write(")");
-                }
-                else {
-                    writeLine();
-                    emitPropertyDeclarations(node, staticProperties);
-                    emitDecoratorsOfClass(node, decoratedClassAlias);
-                }
-                if (!(node.flags & 1 /* Export */)) {
-                    return;
-                }
-                if (modulekind !== ts.ModuleKind.ES6) {
-                    emitExportMemberAssignment(node);
-                }
-                else {
-                    // If this is an exported class, but not on the top level (i.e. on an internal
-                    // module), export it
-                    if (node.flags & 512 /* Default */) {
-                        // if this is a top level default export of decorated class, write the export after the declaration.
-                        if (isDecorated) {
-                            writeLine();
-                            write("export default ");
-                            emitDeclarationName(node);
-                            write(";");
-                        }
-                    }
-                    else if (node.parent.kind !== 256 /* SourceFile */) {
-                        writeLine();
-                        emitStart(node);
-                        emitModuleMemberName(node);
-                        write(" = ");
-                        emitDeclarationName(node);
-                        emitEnd(node);
-                        write(";");
-                    }
-                }
-            }
-            function emitClassLikeDeclarationBelowES6(node) {
-                var isES6ExportedClass = isES6ExportedDeclaration(node);
-                if (node.kind === 221 /* ClassDeclaration */) {
-                    if (isES6ExportedClass && !(node.flags & 512 /* Default */)) {
-                        write("export ");
-                    }
-                    // source file level classes in system modules are hoisted so 'var's for them are already defined
-                    if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                        write("var ");
-                    }
-                    emitDeclarationName(node);
-                    write(" = ");
-                }
-                write("(function (");
-                var baseTypeNode = ts.getClassExtendsHeritageClauseElement(node);
-                if (baseTypeNode) {
-                    write("_super");
-                }
-                write(") {");
-                var saveTempFlags = tempFlags;
-                var saveTempVariables = tempVariables;
-                var saveTempParameters = tempParameters;
-                var saveComputedPropertyNamesToGeneratedNames = computedPropertyNamesToGeneratedNames;
-                var saveConvertedLoopState = convertedLoopState;
-                convertedLoopState = undefined;
-                tempFlags = 0;
-                tempVariables = undefined;
-                tempParameters = undefined;
-                computedPropertyNamesToGeneratedNames = undefined;
-                increaseIndent();
-                if (baseTypeNode) {
-                    writeLine();
-                    emitStart(baseTypeNode);
-                    write("__extends(");
-                    emitDeclarationName(node);
-                    write(", _super);");
-                    emitEnd(baseTypeNode);
-                }
-                writeLine();
-                emitConstructor(node, baseTypeNode);
-                emitMemberFunctionsForES5AndLower(node);
-                emitPropertyDeclarations(node, getInitializedProperties(node, /*isStatic*/ true));
-                writeLine();
-                emitDecoratorsOfClass(node, /*decoratedClassAlias*/ undefined);
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.members.end, function () {
-                    write("return ");
-                    emitDeclarationName(node);
-                });
-                write(";");
-                emitTempDeclarations(/*newLine*/ true);
-                ts.Debug.assert(convertedLoopState === undefined);
-                convertedLoopState = saveConvertedLoopState;
-                tempFlags = saveTempFlags;
-                tempVariables = saveTempVariables;
-                tempParameters = saveTempParameters;
-                computedPropertyNamesToGeneratedNames = saveComputedPropertyNamesToGeneratedNames;
-                decreaseIndent();
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.members.end);
-                emitStart(node);
-                write("(");
-                if (baseTypeNode) {
-                    emit(baseTypeNode.expression);
-                }
-                write("))");
-                if (node.kind === 221 /* ClassDeclaration */) {
-                    write(";");
-                }
-                emitEnd(node);
-                if (node.kind === 221 /* ClassDeclaration */ && !isES6ExportedClass) {
-                    emitExportMemberAssignment(node);
-                }
-                else if (isES6ExportedClass && (node.flags & 512 /* Default */)) {
-                    writeLine();
-                    write("export default ");
-                    emitDeclarationName(node);
-                    write(";");
-                }
-            }
-            function emitClassMemberPrefix(node, member) {
-                emitDeclarationName(node);
-                if (!(member.flags & 32 /* Static */)) {
-                    write(".prototype");
-                }
-            }
-            function emitDecoratorsOfClass(node, decoratedClassAlias) {
-                emitDecoratorsOfMembers(node, /*staticFlag*/ 0);
-                emitDecoratorsOfMembers(node, 32 /* Static */);
-                emitDecoratorsOfConstructor(node, decoratedClassAlias);
-            }
-            function emitDecoratorsOfConstructor(node, decoratedClassAlias) {
-                var decorators = node.decorators;
-                var constructor = ts.getFirstConstructorWithBody(node);
-                var firstParameterDecorator = constructor && ts.forEach(constructor.parameters, function (parameter) { return parameter.decorators; });
-                // skip decoration of the constructor if neither it nor its parameters are decorated
-                if (!decorators && !firstParameterDecorator) {
-                    return;
-                }
-                // Emit the call to __decorate. Given the class:
-                //
-                //   @dec
-                //   class C {
-                //   }
-                //
-                // The emit for the class is:
-                //
-                //   C = __decorate([dec], C);
-                //
-                writeLine();
-                emitStart(node.decorators || firstParameterDecorator);
-                emitDeclarationName(node);
-                if (decoratedClassAlias !== undefined) {
-                    write(" = " + decoratedClassAlias);
-                }
-                write(" = __decorate([");
-                increaseIndent();
-                writeLine();
-                var decoratorCount = decorators ? decorators.length : 0;
-                var argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, function (decorator) { return emit(decorator.expression); });
-                if (firstParameterDecorator) {
-                    argumentsWritten += emitDecoratorsOfParameters(constructor, /*leadingComma*/ argumentsWritten > 0);
-                }
-                emitSerializedTypeMetadata(node, /*leadingComma*/ argumentsWritten >= 0);
-                decreaseIndent();
-                writeLine();
-                write("], ");
-                emitDeclarationName(node);
-                write(")");
-                emitEnd(node.decorators || firstParameterDecorator);
-                write(";");
-                writeLine();
-            }
-            function emitDecoratorsOfMembers(node, staticFlag) {
-                for (var _a = 0, _b = node.members; _a < _b.length; _a++) {
-                    var member = _b[_a];
-                    // only emit members in the correct group
-                    if ((member.flags & 32 /* Static */) !== staticFlag) {
-                        continue;
-                    }
-                    // skip members that cannot be decorated (such as the constructor)
-                    if (!ts.nodeCanBeDecorated(member)) {
-                        continue;
-                    }
-                    // skip an accessor declaration if it is not the first accessor
-                    var decorators = void 0;
-                    var functionLikeMember = void 0;
-                    if (ts.isAccessor(member)) {
-                        var accessors = ts.getAllAccessorDeclarations(node.members, member);
-                        if (member !== accessors.firstAccessor) {
-                            continue;
-                        }
-                        // get the decorators from the first accessor with decorators
-                        decorators = accessors.firstAccessor.decorators;
-                        if (!decorators && accessors.secondAccessor) {
-                            decorators = accessors.secondAccessor.decorators;
-                        }
-                        // we only decorate parameters of the set accessor
-                        functionLikeMember = accessors.setAccessor;
-                    }
-                    else {
-                        decorators = member.decorators;
-                        // we only decorate the parameters here if this is a method
-                        if (member.kind === 147 /* MethodDeclaration */) {
-                            functionLikeMember = member;
-                        }
-                    }
-                    var firstParameterDecorator = functionLikeMember && ts.forEach(functionLikeMember.parameters, function (parameter) { return parameter.decorators; });
-                    // skip a member if it or any of its parameters are not decorated
-                    if (!decorators && !firstParameterDecorator) {
-                        continue;
-                    }
-                    // Emit the call to __decorate. Given the following:
-                    //
-                    //   class C {
-                    //     @dec method(@dec2 x) {}
-                    //     @dec get accessor() {}
-                    //     @dec prop;
-                    //   }
-                    //
-                    // The emit for a method is:
-                    //
-                    //   __decorate([
-                    //       dec,
-                    //       __param(0, dec2),
-                    //       __metadata("design:type", Function),
-                    //       __metadata("design:paramtypes", [Object]),
-                    //       __metadata("design:returntype", void 0)
-                    //   ], C.prototype, "method", undefined);
-                    //
-                    // The emit for an accessor is:
-                    //
-                    //   __decorate([
-                    //       dec
-                    //   ], C.prototype, "accessor", undefined);
-                    //
-                    // The emit for a property is:
-                    //
-                    //   __decorate([
-                    //       dec
-                    //   ], C.prototype, "prop");
-                    //
-                    writeLine();
-                    emitStart(decorators || firstParameterDecorator);
-                    write("__decorate([");
-                    increaseIndent();
-                    writeLine();
-                    var decoratorCount = decorators ? decorators.length : 0;
-                    var argumentsWritten = emitList(decorators, 0, decoratorCount, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ false, /*noTrailingNewLine*/ true, function (decorator) { return emit(decorator.expression); });
-                    if (firstParameterDecorator) {
-                        argumentsWritten += emitDecoratorsOfParameters(functionLikeMember, argumentsWritten > 0);
-                    }
-                    emitSerializedTypeMetadata(member, argumentsWritten > 0);
-                    decreaseIndent();
-                    writeLine();
-                    write("], ");
-                    emitClassMemberPrefix(node, member);
-                    write(", ");
-                    emitExpressionForPropertyName(member.name);
-                    if (languageVersion > 0 /* ES3 */) {
-                        if (member.kind !== 145 /* PropertyDeclaration */) {
-                            // We emit `null` here to indicate to `__decorate` that it can invoke `Object.getOwnPropertyDescriptor` directly.
-                            // We have this extra argument here so that we can inject an explicit property descriptor at a later date.
-                            write(", null");
-                        }
-                        else {
-                            // We emit `void 0` here to indicate to `__decorate` that it can invoke `Object.defineProperty` directly, but that it
-                            // should not invoke `Object.getOwnPropertyDescriptor`.
-                            write(", void 0");
-                        }
-                    }
-                    write(")");
-                    emitEnd(decorators || firstParameterDecorator);
-                    write(";");
-                    writeLine();
-                }
-            }
-            function emitDecoratorsOfParameters(node, leadingComma) {
-                var argumentsWritten = 0;
-                if (node) {
-                    var parameterIndex_1 = 0;
-                    for (var _a = 0, _b = node.parameters; _a < _b.length; _a++) {
-                        var parameter = _b[_a];
-                        if (ts.nodeIsDecorated(parameter)) {
-                            var decorators = parameter.decorators;
-                            argumentsWritten += emitList(decorators, 0, decorators.length, /*multiLine*/ true, /*trailingComma*/ false, /*leadingComma*/ leadingComma, /*noTrailingNewLine*/ true, function (decorator) {
-                                write("__param(" + parameterIndex_1 + ", ");
-                                emit(decorator.expression);
-                                write(")");
-                            });
-                            leadingComma = true;
-                        }
-                        parameterIndex_1++;
-                    }
-                }
-                return argumentsWritten;
-            }
-            function shouldEmitTypeMetadata(node) {
-                // This method determines whether to emit the "design:type" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case 147 /* MethodDeclaration */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 145 /* PropertyDeclaration */:
-                        return true;
-                }
-                return false;
-            }
-            function shouldEmitReturnTypeMetadata(node) {
-                // This method determines whether to emit the "design:returntype" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case 147 /* MethodDeclaration */:
-                        return true;
-                }
-                return false;
-            }
-            function shouldEmitParamTypesMetadata(node) {
-                // This method determines whether to emit the "design:paramtypes" metadata based on the node's kind.
-                // The caller should have already tested whether the node has decorators and whether the emitDecoratorMetadata
-                // compiler option is set.
-                switch (node.kind) {
-                    case 221 /* ClassDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 150 /* SetAccessor */:
-                        return true;
-                }
-                return false;
-            }
-            /** Serializes the type of a declaration to an appropriate JS constructor value. Used by the __metadata decorator for a class member. */
-            function emitSerializedTypeOfNode(node) {
-                // serialization of the type of a declaration uses the following rules:
-                //
-                // * The serialized type of a ClassDeclaration is "Function"
-                // * The serialized type of a ParameterDeclaration is the serialized type of its type annotation.
-                // * The serialized type of a PropertyDeclaration is the serialized type of its type annotation.
-                // * The serialized type of an AccessorDeclaration is the serialized type of the return type annotation of its getter or parameter type annotation of its setter.
-                // * The serialized type of any other FunctionLikeDeclaration is "Function".
-                // * The serialized type of any other node is "void 0".
-                //
-                // For rules on serializing type annotations, see `serializeTypeNode`.
-                switch (node.kind) {
-                    case 221 /* ClassDeclaration */:
-                        write("Function");
-                        return;
-                    case 145 /* PropertyDeclaration */:
-                        emitSerializedTypeNode(node.type);
-                        return;
-                    case 142 /* Parameter */:
-                        emitSerializedTypeNode(node.type);
-                        return;
-                    case 149 /* GetAccessor */:
-                        emitSerializedTypeNode(node.type);
-                        return;
-                    case 150 /* SetAccessor */:
-                        emitSerializedTypeNode(ts.getSetAccessorTypeAnnotationNode(node));
-                        return;
-                }
-                if (ts.isFunctionLike(node)) {
-                    write("Function");
-                    return;
-                }
-                write("void 0");
-            }
-            function emitSerializedTypeNode(node) {
-                if (node) {
-                    switch (node.kind) {
-                        case 103 /* VoidKeyword */:
-                            write("void 0");
-                            return;
-                        case 164 /* ParenthesizedType */:
-                            emitSerializedTypeNode(node.type);
-                            return;
-                        case 156 /* FunctionType */:
-                        case 157 /* ConstructorType */:
-                            write("Function");
-                            return;
-                        case 160 /* ArrayType */:
-                        case 161 /* TupleType */:
-                            write("Array");
-                            return;
-                        case 154 /* TypePredicate */:
-                        case 120 /* BooleanKeyword */:
-                            write("Boolean");
-                            return;
-                        case 132 /* StringKeyword */:
-                        case 166 /* StringLiteralType */:
-                            write("String");
-                            return;
-                        case 130 /* NumberKeyword */:
-                            write("Number");
-                            return;
-                        case 133 /* SymbolKeyword */:
-                            write("Symbol");
-                            return;
-                        case 155 /* TypeReference */:
-                            emitSerializedTypeReferenceNode(node);
-                            return;
-                        case 158 /* TypeQuery */:
-                        case 159 /* TypeLiteral */:
-                        case 162 /* UnionType */:
-                        case 163 /* IntersectionType */:
-                        case 117 /* AnyKeyword */:
-                        case 165 /* ThisType */:
-                            break;
-                        default:
-                            ts.Debug.fail("Cannot serialize unexpected type node.");
-                            break;
-                    }
-                }
-                write("Object");
-            }
-            /** Serializes a TypeReferenceNode to an appropriate JS constructor value. Used by the __metadata decorator. */
-            function emitSerializedTypeReferenceNode(node) {
-                var location = node.parent;
-                while (ts.isDeclaration(location) || ts.isTypeNode(location)) {
-                    location = location.parent;
-                }
-                // Clone the type name and parent it to a location outside of the current declaration.
-                var typeName = ts.cloneEntityName(node.typeName, location);
-                var result = resolver.getTypeReferenceSerializationKind(typeName);
-                switch (result) {
-                    case ts.TypeReferenceSerializationKind.Unknown:
-                        var temp = createAndRecordTempVariable(0 /* Auto */);
-                        write("(typeof (");
-                        emitNodeWithoutSourceMap(temp);
-                        write(" = ");
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ true);
-                        write(") === 'function' && ");
-                        emitNodeWithoutSourceMap(temp);
-                        write(") || Object");
-                        break;
-                    case ts.TypeReferenceSerializationKind.TypeWithConstructSignatureAndValue:
-                        emitEntityNameAsExpression(typeName, /*useFallback*/ false);
-                        break;
-                    case ts.TypeReferenceSerializationKind.VoidType:
-                        write("void 0");
-                        break;
-                    case ts.TypeReferenceSerializationKind.BooleanType:
-                        write("Boolean");
-                        break;
-                    case ts.TypeReferenceSerializationKind.NumberLikeType:
-                        write("Number");
-                        break;
-                    case ts.TypeReferenceSerializationKind.StringLikeType:
-                        write("String");
-                        break;
-                    case ts.TypeReferenceSerializationKind.ArrayLikeType:
-                        write("Array");
-                        break;
-                    case ts.TypeReferenceSerializationKind.ESSymbolType:
-                        if (languageVersion < 2 /* ES6 */) {
-                            write("typeof Symbol === 'function' ? Symbol : Object");
-                        }
-                        else {
-                            write("Symbol");
-                        }
-                        break;
-                    case ts.TypeReferenceSerializationKind.TypeWithCallSignature:
-                        write("Function");
-                        break;
-                    case ts.TypeReferenceSerializationKind.ObjectType:
-                        write("Object");
-                        break;
-                }
-            }
-            /** Serializes the parameter types of a function or the constructor of a class. Used by the __metadata decorator for a method or set accessor. */
-            function emitSerializedParameterTypesOfNode(node) {
-                // serialization of parameter types uses the following rules:
-                //
-                // * If the declaration is a class, the parameters of the first constructor with a body are used.
-                // * If the declaration is function-like and has a body, the parameters of the function are used.
-                //
-                // For the rules on serializing the type of each parameter declaration, see `serializeTypeOfDeclaration`.
-                if (node) {
-                    var valueDeclaration = void 0;
-                    if (node.kind === 221 /* ClassDeclaration */) {
-                        valueDeclaration = ts.getFirstConstructorWithBody(node);
-                    }
-                    else if (ts.isFunctionLike(node) && ts.nodeIsPresent(node.body)) {
-                        valueDeclaration = node;
-                    }
-                    if (valueDeclaration) {
-                        var parameters = valueDeclaration.parameters;
-                        var parameterCount = parameters.length;
-                        if (parameterCount > 0) {
-                            for (var i = 0; i < parameterCount; i++) {
-                                if (i > 0) {
-                                    write(", ");
-                                }
-                                if (parameters[i].dotDotDotToken) {
-                                    var parameterType = parameters[i].type;
-                                    if (parameterType && parameterType.kind === 160 /* ArrayType */) {
-                                        parameterType = parameterType.elementType;
-                                    }
-                                    else if (parameterType && parameterType.kind === 155 /* TypeReference */ && parameterType.typeArguments && parameterType.typeArguments.length === 1) {
-                                        parameterType = parameterType.typeArguments[0];
-                                    }
-                                    else {
-                                        parameterType = undefined;
-                                    }
-                                    emitSerializedTypeNode(parameterType);
-                                }
-                                else {
-                                    emitSerializedTypeOfNode(parameters[i]);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-            /** Serializes the return type of function. Used by the __metadata decorator for a method. */
-            function emitSerializedReturnTypeOfNode(node) {
-                if (node && ts.isFunctionLike(node)) {
-                    if (node.type) {
-                        emitSerializedTypeNode(node.type);
-                        return;
-                    }
-                    else if (ts.isAsyncFunctionLike(node)) {
-                        write("Promise");
-                        return;
-                    }
-                }
-                write("void 0");
-            }
-            function emitSerializedTypeMetadata(node, writeComma) {
-                // This method emits the serialized type metadata for a decorator target.
-                // The caller should have already tested whether the node has decorators.
-                var argumentsWritten = 0;
-                if (compilerOptions.emitDecoratorMetadata) {
-                    if (shouldEmitTypeMetadata(node)) {
-                        if (writeComma) {
-                            write(", ");
-                        }
-                        writeLine();
-                        write("__metadata('design:type', ");
-                        emitSerializedTypeOfNode(node);
-                        write(")");
-                        argumentsWritten++;
-                    }
-                    if (shouldEmitParamTypesMetadata(node)) {
-                        if (writeComma || argumentsWritten) {
-                            write(", ");
-                        }
-                        writeLine();
-                        write("__metadata('design:paramtypes', [");
-                        emitSerializedParameterTypesOfNode(node);
-                        write("])");
-                        argumentsWritten++;
-                    }
-                    if (shouldEmitReturnTypeMetadata(node)) {
-                        if (writeComma || argumentsWritten) {
-                            write(", ");
-                        }
-                        writeLine();
-                        write("__metadata('design:returntype', ");
-                        emitSerializedReturnTypeOfNode(node);
-                        write(")");
-                        argumentsWritten++;
-                    }
-                }
-                return argumentsWritten;
-            }
-            function emitInterfaceDeclaration(node) {
-                emitCommentsOnNotEmittedNode(node);
-            }
-            function shouldEmitEnumDeclaration(node) {
-                var isConstEnum = ts.isConst(node);
-                return !isConstEnum || compilerOptions.preserveConstEnums || compilerOptions.isolatedModules;
-            }
-            function emitEnumDeclaration(node) {
-                // const enums are completely erased during compilation.
-                if (!shouldEmitEnumDeclaration(node)) {
-                    return;
-                }
-                if (!shouldHoistDeclarationInSystemJsModule(node)) {
-                    // do not emit var if variable was already hoisted
-                    var isES6ExportedEnum = isES6ExportedDeclaration(node);
-                    if (!(node.flags & 1 /* Export */) || (isES6ExportedEnum && isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 224 /* EnumDeclaration */))) {
-                        emitStart(node);
-                        if (isES6ExportedEnum) {
-                            write("export ");
-                        }
-                        write("var ");
-                        emit(node.name);
-                        emitEnd(node);
-                        write(";");
-                    }
-                }
-                writeLine();
-                emitStart(node);
-                write("(function (");
-                emitStart(node.name);
-                write(getGeneratedNameForNode(node));
-                emitEnd(node.name);
-                write(") {");
-                increaseIndent();
-                emitLines(node.members);
-                decreaseIndent();
-                writeLine();
-                emitToken(16 /* CloseBraceToken */, node.members.end);
-                write(")(");
-                emitModuleMemberName(node);
-                write(" || (");
-                emitModuleMemberName(node);
-                write(" = {}));");
-                emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.flags & 1 /* Export */ && !shouldHoistDeclarationInSystemJsModule(node)) {
-                    // do not emit var if variable was already hoisted
-                    writeLine();
-                    emitStart(node);
-                    write("var ");
-                    emit(node.name);
-                    write(" = ");
-                    emitModuleMemberName(node);
-                    emitEnd(node);
-                    write(";");
-                }
-                if (modulekind !== ts.ModuleKind.ES6 && node.parent === currentSourceFile) {
-                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
-                        // write the call to exporter for enum
-                        writeLine();
-                        write(exportFunctionForFile + "(\"");
-                        emitDeclarationName(node);
-                        write("\", ");
-                        emitDeclarationName(node);
-                        write(");");
-                    }
-                    emitExportMemberAssignments(node.name);
-                }
-            }
-            function emitEnumMember(node) {
-                var enumParent = node.parent;
-                emitStart(node);
-                write(getGeneratedNameForNode(enumParent));
-                write("[");
-                write(getGeneratedNameForNode(enumParent));
-                write("[");
-                emitExpressionForPropertyName(node.name);
-                write("] = ");
-                writeEnumMemberDeclarationValue(node);
-                write("] = ");
-                emitExpressionForPropertyName(node.name);
-                emitEnd(node);
-                write(";");
-            }
-            function writeEnumMemberDeclarationValue(member) {
-                var value = resolver.getConstantValue(member);
-                if (value !== undefined) {
-                    write(value.toString());
-                    return;
-                }
-                else if (member.initializer) {
-                    emit(member.initializer);
-                }
-                else {
-                    write("undefined");
-                }
-            }
-            function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-                if (moduleDeclaration.body && moduleDeclaration.body.kind === 225 /* ModuleDeclaration */) {
-                    var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
-                    return recursiveInnerModule || moduleDeclaration.body;
-                }
-            }
-            function shouldEmitModuleDeclaration(node) {
-                return ts.isInstantiatedModule(node, compilerOptions.preserveConstEnums || compilerOptions.isolatedModules);
-            }
-            function isModuleMergedWithES6Class(node) {
-                return languageVersion === 2 /* ES6 */ && !!(resolver.getNodeCheckFlags(node) & 32768 /* LexicalModuleMergesWithClass */);
-            }
-            function isFirstDeclarationOfKind(node, declarations, kind) {
-                return !ts.forEach(declarations, function (declaration) { return declaration.kind === kind && declaration.pos < node.pos; });
-            }
-            function emitModuleDeclaration(node) {
-                // Emit only if this module is non-ambient.
-                var shouldEmit = shouldEmitModuleDeclaration(node);
-                if (!shouldEmit) {
-                    return emitCommentsOnNotEmittedNode(node);
-                }
-                var hoistedInDeclarationScope = shouldHoistDeclarationInSystemJsModule(node);
-                var emitVarForModule = !hoistedInDeclarationScope && !isModuleMergedWithES6Class(node);
-                if (emitVarForModule) {
-                    var isES6ExportedNamespace = isES6ExportedDeclaration(node);
-                    if (!isES6ExportedNamespace || isFirstDeclarationOfKind(node, node.symbol && node.symbol.declarations, 225 /* ModuleDeclaration */)) {
-                        emitStart(node);
-                        if (isES6ExportedNamespace) {
-                            write("export ");
-                        }
-                        write("var ");
-                        emit(node.name);
-                        write(";");
-                        emitEnd(node);
-                        writeLine();
-                    }
-                }
-                emitStart(node);
-                write("(function (");
-                emitStart(node.name);
-                write(getGeneratedNameForNode(node));
-                emitEnd(node.name);
-                write(") ");
-                ts.Debug.assert(node.body !== undefined); // node.body must exist, as this is a non-ambient module
-                if (node.body.kind === 226 /* ModuleBlock */) {
-                    var saveConvertedLoopState = convertedLoopState;
-                    var saveTempFlags = tempFlags;
-                    var saveTempVariables = tempVariables;
-                    convertedLoopState = undefined;
-                    tempFlags = 0;
-                    tempVariables = undefined;
-                    emit(node.body);
-                    ts.Debug.assert(convertedLoopState === undefined);
-                    convertedLoopState = saveConvertedLoopState;
-                    tempFlags = saveTempFlags;
-                    tempVariables = saveTempVariables;
-                }
-                else {
-                    write("{");
-                    increaseIndent();
-                    emitCaptureThisForNodeIfNecessary(node);
-                    writeLine();
-                    emit(node.body);
-                    decreaseIndent();
-                    writeLine();
-                    var moduleBlock = getInnerMostModuleDeclarationFromDottedModule(node).body;
-                    emitToken(16 /* CloseBraceToken */, moduleBlock.statements.end);
-                }
-                write(")(");
-                // write moduleDecl = containingModule.m only if it is not exported es6 module member
-                if ((node.flags & 1 /* Export */) && !isES6ExportedDeclaration(node)) {
-                    emit(node.name);
-                    write(" = ");
-                }
-                emitModuleMemberName(node);
-                write(" || (");
-                emitModuleMemberName(node);
-                write(" = {}));");
-                emitEnd(node);
-                if (!isES6ExportedDeclaration(node) && node.name.kind === 69 /* Identifier */ && node.parent === currentSourceFile) {
-                    if (modulekind === ts.ModuleKind.System && (node.flags & 1 /* Export */)) {
-                        writeLine();
-                        write(exportFunctionForFile + "(\"");
-                        emitDeclarationName(node);
-                        write("\", ");
-                        emitDeclarationName(node);
-                        write(");");
-                    }
-                    emitExportMemberAssignments(node.name);
-                }
-            }
-            /*
-             * Some bundlers (SystemJS builder) sometimes want to rename dependencies.
-             * Here we check if alternative name was provided for a given moduleName and return it if possible.
-             */
-            function tryRenameExternalModule(moduleName) {
-                if (renamedDependencies && ts.hasProperty(renamedDependencies, moduleName.text)) {
-                    return "\"" + renamedDependencies[moduleName.text] + "\"";
-                }
-                return undefined;
-            }
-            function emitRequire(moduleName) {
-                if (moduleName.kind === 9 /* StringLiteral */) {
-                    write("require(");
-                    var text = tryRenameExternalModule(moduleName);
-                    if (text) {
-                        write(text);
-                    }
-                    else {
-                        emitStart(moduleName);
-                        emitLiteral(moduleName);
-                        emitEnd(moduleName);
-                    }
-                    emitToken(18 /* CloseParenToken */, moduleName.end);
-                }
-                else {
-                    write("require()");
-                }
-            }
-            function getNamespaceDeclarationNode(node) {
-                if (node.kind === 229 /* ImportEqualsDeclaration */) {
-                    return node;
-                }
-                var importClause = node.importClause;
-                if (importClause && importClause.namedBindings && importClause.namedBindings.kind === 232 /* NamespaceImport */) {
-                    return importClause.namedBindings;
-                }
-            }
-            function isDefaultImport(node) {
-                return node.kind === 230 /* ImportDeclaration */ && node.importClause && !!node.importClause.name;
-            }
-            function emitExportImportAssignments(node) {
-                if (ts.isAliasSymbolDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
-                    emitExportMemberAssignments(node.name);
-                }
-                ts.forEachChild(node, emitExportImportAssignments);
-            }
-            function emitImportDeclaration(node) {
-                if (modulekind !== ts.ModuleKind.ES6) {
-                    return emitExternalImportDeclaration(node);
-                }
-                // ES6 import
-                if (node.importClause) {
-                    var shouldEmitDefaultBindings = resolver.isReferencedAliasDeclaration(node.importClause);
-                    var shouldEmitNamedBindings = node.importClause.namedBindings && resolver.isReferencedAliasDeclaration(node.importClause.namedBindings, /* checkChildren */ true);
-                    if (shouldEmitDefaultBindings || shouldEmitNamedBindings) {
-                        write("import ");
-                        emitStart(node.importClause);
-                        if (shouldEmitDefaultBindings) {
-                            emit(node.importClause.name);
-                            if (shouldEmitNamedBindings) {
-                                write(", ");
-                            }
-                        }
-                        if (shouldEmitNamedBindings) {
-                            emitLeadingComments(node.importClause.namedBindings);
-                            emitStart(node.importClause.namedBindings);
-                            if (node.importClause.namedBindings.kind === 232 /* NamespaceImport */) {
-                                write("* as ");
-                                emit(node.importClause.namedBindings.name);
-                            }
-                            else {
-                                write("{ ");
-                                emitExportOrImportSpecifierList(node.importClause.namedBindings.elements, resolver.isReferencedAliasDeclaration);
-                                write(" }");
-                            }
-                            emitEnd(node.importClause.namedBindings);
-                            emitTrailingComments(node.importClause.namedBindings);
-                        }
-                        emitEnd(node.importClause);
-                        write(" from ");
-                        emit(node.moduleSpecifier);
-                        write(";");
-                    }
-                }
-                else {
-                    write("import ");
-                    emit(node.moduleSpecifier);
-                    write(";");
-                }
-            }
-            function emitExternalImportDeclaration(node) {
-                if (ts.contains(externalImports, node)) {
-                    var isExportedImport = node.kind === 229 /* ImportEqualsDeclaration */ && (node.flags & 1 /* Export */) !== 0;
-                    var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                    var varOrConst = (languageVersion <= 1 /* ES5 */) ? "var " : "const ";
-                    if (modulekind !== ts.ModuleKind.AMD) {
-                        emitLeadingComments(node);
-                        emitStart(node);
-                        if (namespaceDeclaration && !isDefaultImport(node)) {
-                            // import x = require("foo")
-                            // import * as x from "foo"
-                            if (!isExportedImport) {
-                                write(varOrConst);
-                            }
-                            ;
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                        }
-                        else {
-                            // import "foo"
-                            // import x from "foo"
-                            // import { x, y } from "foo"
-                            // import d, * as x from "foo"
-                            // import d, { x, y } from "foo"
-                            var isNakedImport = 230 /* ImportDeclaration */ && !node.importClause;
-                            if (!isNakedImport) {
-                                write(varOrConst);
-                                write(getGeneratedNameForNode(node));
-                                write(" = ");
-                            }
-                        }
-                        emitRequire(ts.getExternalModuleName(node));
-                        if (namespaceDeclaration && isDefaultImport(node)) {
-                            // import d, * as x from "foo"
-                            write(", ");
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            write(getGeneratedNameForNode(node));
-                        }
-                        write(";");
-                        emitEnd(node);
-                        emitExportImportAssignments(node);
-                        emitTrailingComments(node);
-                    }
-                    else {
-                        if (isExportedImport) {
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            emit(namespaceDeclaration.name);
-                            write(";");
-                        }
-                        else if (namespaceDeclaration && isDefaultImport(node)) {
-                            // import d, * as x from "foo"
-                            write(varOrConst);
-                            emitModuleMemberName(namespaceDeclaration);
-                            write(" = ");
-                            write(getGeneratedNameForNode(node));
-                            write(";");
-                        }
-                        emitExportImportAssignments(node);
-                    }
-                }
-            }
-            function emitImportEqualsDeclaration(node) {
-                if (ts.isExternalModuleImportEqualsDeclaration(node)) {
-                    emitExternalImportDeclaration(node);
-                    return;
-                }
-                // preserve old compiler's behavior: emit 'var' for import declaration (even if we do not consider them referenced) when
-                // - current file is not external module
-                // - import declaration is top level and target is value imported by entity name
-                if (resolver.isReferencedAliasDeclaration(node) ||
-                    (!isCurrentFileExternalModule && resolver.isTopLevelValueImportEqualsWithEntityName(node))) {
-                    emitLeadingComments(node);
-                    emitStart(node);
-                    // variable declaration for import-equals declaration can be hoisted in system modules
-                    // in this case 'var' should be omitted and emit should contain only initialization
-                    var variableDeclarationIsHoisted = shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ true);
-                    // is it top level export import v = a.b.c in system module?
-                    // if yes - it needs to be rewritten as exporter('v', v = a.b.c)
-                    var isExported = isSourceFileLevelDeclarationInSystemJsModule(node, /*isExported*/ true);
-                    if (!variableDeclarationIsHoisted) {
-                        ts.Debug.assert(!isExported);
-                        if (isES6ExportedDeclaration(node)) {
-                            write("export ");
-                            write("var ");
-                        }
-                        else if (!(node.flags & 1 /* Export */)) {
-                            write("var ");
-                        }
-                    }
-                    if (isExported) {
-                        write(exportFunctionForFile + "(\"");
-                        emitNodeWithoutSourceMap(node.name);
-                        write("\", ");
-                    }
-                    emitModuleMemberName(node);
-                    write(" = ");
-                    emit(node.moduleReference);
-                    if (isExported) {
-                        write(")");
-                    }
-                    write(";");
-                    emitEnd(node);
-                    emitExportImportAssignments(node);
-                    emitTrailingComments(node);
-                }
-            }
-            function emitExportDeclaration(node) {
-                ts.Debug.assert(modulekind !== ts.ModuleKind.System);
-                if (modulekind !== ts.ModuleKind.ES6) {
-                    if (node.moduleSpecifier && (!node.exportClause || resolver.isValueAliasDeclaration(node))) {
-                        emitStart(node);
-                        var generatedName = getGeneratedNameForNode(node);
-                        if (node.exportClause) {
-                            // export { x, y, ... } from "foo"
-                            if (modulekind !== ts.ModuleKind.AMD) {
-                                write("var ");
-                                write(generatedName);
-                                write(" = ");
-                                emitRequire(ts.getExternalModuleName(node));
-                                write(";");
-                            }
-                            for (var _a = 0, _b = node.exportClause.elements; _a < _b.length; _a++) {
-                                var specifier = _b[_a];
-                                if (resolver.isValueAliasDeclaration(specifier)) {
-                                    writeLine();
-                                    emitStart(specifier);
-                                    emitContainingModuleName(specifier);
-                                    write(".");
-                                    emitNodeWithCommentsAndWithoutSourcemap(specifier.name);
-                                    write(" = ");
-                                    write(generatedName);
-                                    write(".");
-                                    emitNodeWithCommentsAndWithoutSourcemap(specifier.propertyName || specifier.name);
-                                    write(";");
-                                    emitEnd(specifier);
-                                }
-                            }
-                        }
-                        else {
-                            // export * from "foo"
-                            if (hasExportStarsToExportValues && resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
-                                writeLine();
-                                write("__export(");
-                                if (modulekind !== ts.ModuleKind.AMD) {
-                                    emitRequire(ts.getExternalModuleName(node));
-                                }
-                                else {
-                                    write(generatedName);
-                                }
-                                write(");");
-                            }
-                        }
-                        emitEnd(node);
-                    }
-                }
-                else {
-                    if (!node.exportClause || resolver.isValueAliasDeclaration(node)) {
-                        write("export ");
-                        if (node.exportClause) {
-                            // export { x, y, ... }
-                            write("{ ");
-                            emitExportOrImportSpecifierList(node.exportClause.elements, resolver.isValueAliasDeclaration);
-                            write(" }");
-                        }
-                        else {
-                            write("*");
-                        }
-                        if (node.moduleSpecifier) {
-                            write(" from ");
-                            emit(node.moduleSpecifier);
-                        }
-                        write(";");
-                    }
-                }
-            }
-            function emitExportOrImportSpecifierList(specifiers, shouldEmit) {
-                ts.Debug.assert(modulekind === ts.ModuleKind.ES6);
-                var needsComma = false;
-                for (var _a = 0, specifiers_1 = specifiers; _a < specifiers_1.length; _a++) {
-                    var specifier = specifiers_1[_a];
-                    if (shouldEmit(specifier)) {
-                        if (needsComma) {
-                            write(", ");
-                        }
-                        if (specifier.propertyName) {
-                            emit(specifier.propertyName);
-                            write(" as ");
-                        }
-                        emit(specifier.name);
-                        needsComma = true;
-                    }
-                }
-            }
-            function emitExportAssignment(node) {
-                if (!node.isExportEquals && resolver.isValueAliasDeclaration(node)) {
-                    if (modulekind === ts.ModuleKind.ES6) {
-                        writeLine();
-                        emitStart(node);
-                        write("export default ");
-                        var expression = node.expression;
-                        emit(expression);
-                        if (expression.kind !== 220 /* FunctionDeclaration */ &&
-                            expression.kind !== 221 /* ClassDeclaration */) {
-                            write(";");
-                        }
-                        emitEnd(node);
-                    }
-                    else {
-                        writeLine();
-                        emitStart(node);
-                        if (modulekind === ts.ModuleKind.System) {
-                            write(exportFunctionForFile + "(\"default\",");
-                            emit(node.expression);
-                            write(")");
-                        }
-                        else {
-                            emitEs6ExportDefaultCompat(node);
-                            emitContainingModuleName(node);
-                            if (languageVersion === 0 /* ES3 */) {
-                                write('["default"] = ');
-                            }
-                            else {
-                                write(".default = ");
-                            }
-                            emit(node.expression);
-                        }
-                        write(";");
-                        emitEnd(node);
-                    }
-                }
-            }
-            function collectExternalModuleInfo(sourceFile) {
-                externalImports = [];
-                exportSpecifiers = {};
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                for (var _a = 0, _b = sourceFile.statements; _a < _b.length; _a++) {
-                    var node = _b[_a];
-                    switch (node.kind) {
-                        case 230 /* ImportDeclaration */:
-                            if (!node.importClause ||
-                                resolver.isReferencedAliasDeclaration(node.importClause, /*checkChildren*/ true)) {
-                                // import "mod"
-                                // import x from "mod" where x is referenced
-                                // import * as x from "mod" where x is referenced
-                                // import { x, y } from "mod" where at least one import is referenced
-                                externalImports.push(node);
-                            }
-                            break;
-                        case 229 /* ImportEqualsDeclaration */:
-                            if (node.moduleReference.kind === 240 /* ExternalModuleReference */ && resolver.isReferencedAliasDeclaration(node)) {
-                                // import x = require("mod") where x is referenced
-                                externalImports.push(node);
-                            }
-                            break;
-                        case 236 /* ExportDeclaration */:
-                            if (node.moduleSpecifier) {
-                                if (!node.exportClause) {
-                                    // export * from "mod"
-                                    if (resolver.moduleExportsSomeValue(node.moduleSpecifier)) {
-                                        externalImports.push(node);
-                                        hasExportStarsToExportValues = true;
-                                    }
-                                }
-                                else if (resolver.isValueAliasDeclaration(node)) {
-                                    // export { x, y } from "mod" where at least one export is a value symbol
-                                    externalImports.push(node);
-                                }
-                            }
-                            else {
-                                // export { x, y }
-                                for (var _c = 0, _d = node.exportClause.elements; _c < _d.length; _c++) {
-                                    var specifier = _d[_c];
-                                    var name_30 = (specifier.propertyName || specifier.name).text;
-                                    (exportSpecifiers[name_30] || (exportSpecifiers[name_30] = [])).push(specifier);
-                                }
-                            }
-                            break;
-                        case 235 /* ExportAssignment */:
-                            if (node.isExportEquals && !exportEquals) {
-                                // export = x
-                                exportEquals = node;
-                            }
-                            break;
-                    }
-                }
-            }
-            function emitExportStarHelper() {
-                if (hasExportStarsToExportValues) {
-                    writeLine();
-                    write("function __export(m) {");
-                    increaseIndent();
-                    writeLine();
-                    write("for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                }
-            }
-            function getLocalNameForExternalImport(node) {
-                var namespaceDeclaration = getNamespaceDeclarationNode(node);
-                if (namespaceDeclaration && !isDefaultImport(node)) {
-                    return ts.getTextOfNodeFromSourceText(currentText, namespaceDeclaration.name);
-                }
-                if (node.kind === 230 /* ImportDeclaration */ && node.importClause) {
-                    return getGeneratedNameForNode(node);
-                }
-                if (node.kind === 236 /* ExportDeclaration */ && node.moduleSpecifier) {
-                    return getGeneratedNameForNode(node);
-                }
-            }
-            function getExternalModuleNameText(importNode, emitRelativePathAsModuleName) {
-                if (emitRelativePathAsModuleName) {
-                    var name_31 = getExternalModuleNameFromDeclaration(host, resolver, importNode);
-                    if (name_31) {
-                        return "\"" + name_31 + "\"";
-                    }
-                }
-                var moduleName = ts.getExternalModuleName(importNode);
-                if (moduleName.kind === 9 /* StringLiteral */) {
-                    return tryRenameExternalModule(moduleName) || getLiteralText(moduleName);
-                }
-                return undefined;
-            }
-            function emitVariableDeclarationsForImports() {
-                if (externalImports.length === 0) {
-                    return;
-                }
-                writeLine();
-                var started = false;
-                for (var _a = 0, externalImports_1 = externalImports; _a < externalImports_1.length; _a++) {
-                    var importNode = externalImports_1[_a];
-                    // do not create variable declaration for exports and imports that lack import clause
-                    var skipNode = importNode.kind === 236 /* ExportDeclaration */ ||
-                        (importNode.kind === 230 /* ImportDeclaration */ && !importNode.importClause);
-                    if (skipNode) {
-                        continue;
-                    }
-                    if (!started) {
-                        write("var ");
-                        started = true;
-                    }
-                    else {
-                        write(", ");
-                    }
-                    write(getLocalNameForExternalImport(importNode));
-                }
-                if (started) {
-                    write(";");
-                }
-            }
-            function emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations) {
-                // when resolving exports local exported entries/indirect exported entries in the module
-                // should always win over entries with similar names that were added via star exports
-                // to support this we store names of local/indirect exported entries in a set.
-                // this set is used to filter names brought by star exports.
-                if (!hasExportStarsToExportValues) {
-                    // local names set is needed only in presence of star exports
-                    return undefined;
-                }
-                // local names set should only be added if we have anything exported
-                if (!exportedDeclarations && ts.isEmpty(exportSpecifiers)) {
-                    // no exported declarations (export var ...) or export specifiers (export {x})
-                    // check if we have any non star export declarations.
-                    var hasExportDeclarationWithExportClause = false;
-                    for (var _a = 0, externalImports_2 = externalImports; _a < externalImports_2.length; _a++) {
-                        var externalImport = externalImports_2[_a];
-                        if (externalImport.kind === 236 /* ExportDeclaration */ && externalImport.exportClause) {
-                            hasExportDeclarationWithExportClause = true;
-                            break;
-                        }
-                    }
-                    if (!hasExportDeclarationWithExportClause) {
-                        // we still need to emit exportStar helper
-                        return emitExportStarFunction(/*localNames*/ undefined);
-                    }
-                }
-                var exportedNamesStorageRef = makeUniqueName("exportedNames");
-                writeLine();
-                write("var " + exportedNamesStorageRef + " = {");
-                increaseIndent();
-                var started = false;
-                if (exportedDeclarations) {
-                    for (var i = 0; i < exportedDeclarations.length; i++) {
-                        // write name of exported declaration, i.e 'export var x...'
-                        writeExportedName(exportedDeclarations[i]);
-                    }
-                }
-                if (exportSpecifiers) {
-                    for (var n in exportSpecifiers) {
-                        for (var _b = 0, _c = exportSpecifiers[n]; _b < _c.length; _b++) {
-                            var specifier = _c[_b];
-                            // write name of export specified, i.e. 'export {x}'
-                            writeExportedName(specifier.name);
-                        }
-                    }
-                }
-                for (var _d = 0, externalImports_3 = externalImports; _d < externalImports_3.length; _d++) {
-                    var externalImport = externalImports_3[_d];
-                    if (externalImport.kind !== 236 /* ExportDeclaration */) {
-                        continue;
-                    }
-                    var exportDecl = externalImport;
-                    if (!exportDecl.exportClause) {
-                        // export * from ...
-                        continue;
-                    }
-                    for (var _e = 0, _f = exportDecl.exportClause.elements; _e < _f.length; _e++) {
-                        var element = _f[_e];
-                        // write name of indirectly exported entry, i.e. 'export {x} from ...'
-                        writeExportedName(element.name || element.propertyName);
-                    }
-                }
-                decreaseIndent();
-                writeLine();
-                write("};");
-                return emitExportStarFunction(exportedNamesStorageRef);
-                function emitExportStarFunction(localNames) {
-                    var exportStarFunction = makeUniqueName("exportStar");
-                    writeLine();
-                    // define an export star helper function
-                    write("function " + exportStarFunction + "(m) {");
-                    increaseIndent();
-                    writeLine();
-                    write("var exports = {};");
-                    writeLine();
-                    write("for(var n in m) {");
-                    increaseIndent();
-                    writeLine();
-                    write("if (n !== \"default\"");
-                    if (localNames) {
-                        write("&& !" + localNames + ".hasOwnProperty(n)");
-                    }
-                    write(") exports[n] = m[n];");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                    writeLine();
-                    write(exportFunctionForFile + "(exports);");
-                    decreaseIndent();
-                    writeLine();
-                    write("}");
-                    return exportStarFunction;
-                }
-                function writeExportedName(node) {
-                    // do not record default exports
-                    // they are local to module and never overwritten (explicitly skipped) by star export
-                    if (node.kind !== 69 /* Identifier */ && node.flags & 512 /* Default */) {
-                        return;
-                    }
-                    if (started) {
-                        write(",");
-                    }
-                    else {
-                        started = true;
-                    }
-                    writeLine();
-                    write("'");
-                    if (node.kind === 69 /* Identifier */) {
-                        emitNodeWithCommentsAndWithoutSourcemap(node);
-                    }
-                    else {
-                        emitDeclarationName(node);
-                    }
-                    write("': true");
-                }
-            }
-            function processTopLevelVariableAndFunctionDeclarations(node) {
-                // per ES6 spec:
-                // 15.2.1.16.4 ModuleDeclarationInstantiation() Concrete Method
-                // - var declarations are initialized to undefined - 14.a.ii
-                // - function/generator declarations are instantiated - 16.a.iv
-                // this means that after module is instantiated but before its evaluation
-                // exported functions are already accessible at import sites
-                // in theory we should hoist only exported functions and its dependencies
-                // in practice to simplify things we'll hoist all source level functions and variable declaration
-                // including variables declarations for module and class declarations
-                var hoistedVars;
-                var hoistedFunctionDeclarations;
-                var exportedDeclarations;
-                visit(node);
-                if (hoistedVars) {
-                    writeLine();
-                    write("var ");
-                    var seen = {};
-                    for (var i = 0; i < hoistedVars.length; i++) {
-                        var local = hoistedVars[i];
-                        var name_32 = local.kind === 69 /* Identifier */
-                            ? local
-                            : local.name;
-                        if (name_32) {
-                            // do not emit duplicate entries (in case of declaration merging) in the list of hoisted variables
-                            var text = ts.unescapeIdentifier(name_32.text);
-                            if (ts.hasProperty(seen, text)) {
-                                continue;
-                            }
-                            else {
-                                seen[text] = text;
-                            }
-                        }
-                        if (i !== 0) {
-                            write(", ");
-                        }
-                        if (local.kind === 221 /* ClassDeclaration */ || local.kind === 225 /* ModuleDeclaration */ || local.kind === 224 /* EnumDeclaration */) {
-                            emitDeclarationName(local);
-                        }
-                        else {
-                            emit(local);
-                        }
-                        var flags = ts.getCombinedNodeFlags(local.kind === 69 /* Identifier */ ? local.parent : local);
-                        if (flags & 1 /* Export */) {
-                            if (!exportedDeclarations) {
-                                exportedDeclarations = [];
-                            }
-                            exportedDeclarations.push(local);
-                        }
-                    }
-                    write(";");
-                }
-                if (hoistedFunctionDeclarations) {
-                    for (var _a = 0, hoistedFunctionDeclarations_1 = hoistedFunctionDeclarations; _a < hoistedFunctionDeclarations_1.length; _a++) {
-                        var f = hoistedFunctionDeclarations_1[_a];
-                        writeLine();
-                        emit(f);
-                        if (f.flags & 1 /* Export */) {
-                            if (!exportedDeclarations) {
-                                exportedDeclarations = [];
-                            }
-                            exportedDeclarations.push(f);
-                        }
-                    }
-                }
-                return exportedDeclarations;
-                function visit(node) {
-                    if (node.flags & 2 /* Ambient */) {
-                        return;
-                    }
-                    if (node.kind === 220 /* FunctionDeclaration */) {
-                        if (!hoistedFunctionDeclarations) {
-                            hoistedFunctionDeclarations = [];
-                        }
-                        hoistedFunctionDeclarations.push(node);
-                        return;
-                    }
-                    if (node.kind === 221 /* ClassDeclaration */) {
-                        if (!hoistedVars) {
-                            hoistedVars = [];
-                        }
-                        hoistedVars.push(node);
-                        return;
-                    }
-                    if (node.kind === 224 /* EnumDeclaration */) {
-                        if (shouldEmitEnumDeclaration(node)) {
-                            if (!hoistedVars) {
-                                hoistedVars = [];
-                            }
-                            hoistedVars.push(node);
-                        }
-                        return;
-                    }
-                    if (node.kind === 225 /* ModuleDeclaration */) {
-                        if (shouldEmitModuleDeclaration(node)) {
-                            if (!hoistedVars) {
-                                hoistedVars = [];
-                            }
-                            hoistedVars.push(node);
-                        }
-                        return;
-                    }
-                    if (node.kind === 218 /* VariableDeclaration */ || node.kind === 169 /* BindingElement */) {
-                        if (shouldHoistVariable(node, /*checkIfSourceFileLevelDecl*/ false)) {
-                            var name_33 = node.name;
-                            if (name_33.kind === 69 /* Identifier */) {
-                                if (!hoistedVars) {
-                                    hoistedVars = [];
-                                }
-                                hoistedVars.push(name_33);
-                            }
-                            else {
-                                ts.forEachChild(name_33, visit);
-                            }
-                        }
-                        return;
-                    }
-                    if (ts.isInternalModuleImportEqualsDeclaration(node) && resolver.isValueAliasDeclaration(node)) {
-                        if (!hoistedVars) {
-                            hoistedVars = [];
-                        }
-                        hoistedVars.push(node.name);
-                        return;
-                    }
-                    if (ts.isBindingPattern(node)) {
-                        ts.forEach(node.elements, visit);
-                        return;
-                    }
-                    if (!ts.isDeclaration(node)) {
-                        ts.forEachChild(node, visit);
-                    }
-                }
-            }
-            function shouldHoistVariable(node, checkIfSourceFileLevelDecl) {
-                if (checkIfSourceFileLevelDecl && !shouldHoistDeclarationInSystemJsModule(node)) {
-                    return false;
-                }
-                // hoist variable if
-                // - it is not block scoped
-                // - it is top level block scoped
-                // if block scoped variables are nested in some another block then
-                // no other functions can use them except ones that are defined at least in the same block
-                return (ts.getCombinedNodeFlags(node) & 3072 /* BlockScoped */) === 0 ||
-                    ts.getEnclosingBlockScopeContainer(node).kind === 256 /* SourceFile */;
-            }
-            function isCurrentFileSystemExternalModule() {
-                return modulekind === ts.ModuleKind.System && isCurrentFileExternalModule;
-            }
-            function emitSystemModuleBody(node, dependencyGroups, startIndex) {
-                // shape of the body in system modules:
-                // function (exports) {
-                //     <list of local aliases for imports>
-                //     <hoisted function declarations>
-                //     <hoisted variable declarations>
-                //     return {
-                //         setters: [
-                //             <list of setter function for imports>
-                //         ],
-                //         execute: function() {
-                //             <module statements>
-                //         }
-                //     }
-                //     <temp declarations>
-                // }
-                // I.e:
-                // import {x} from 'file1'
-                // var y = 1;
-                // export function foo() { return y + x(); }
-                // console.log(y);
-                // will be transformed to
-                // function(exports) {
-                //     var file1; // local alias
-                //     var y;
-                //     function foo() { return y + file1.x(); }
-                //     exports("foo", foo);
-                //     return {
-                //         setters: [
-                //             function(v) { file1 = v }
-                //         ],
-                //         execute(): function() {
-                //             y = 1;
-                //             console.log(y);
-                //         }
-                //     };
-                // }
-                emitVariableDeclarationsForImports();
-                writeLine();
-                var exportedDeclarations = processTopLevelVariableAndFunctionDeclarations(node);
-                var exportStarFunction = emitLocalStorageForExportedNamesIfNecessary(exportedDeclarations);
-                writeLine();
-                write("return {");
-                increaseIndent();
-                writeLine();
-                emitSetters(exportStarFunction, dependencyGroups);
-                writeLine();
-                emitExecute(node, startIndex);
-                decreaseIndent();
-                writeLine();
-                write("}"); // return
-                emitTempDeclarations(/*newLine*/ true);
-            }
-            function emitSetters(exportStarFunction, dependencyGroups) {
-                write("setters:[");
-                for (var i = 0; i < dependencyGroups.length; i++) {
-                    if (i !== 0) {
-                        write(",");
-                    }
-                    writeLine();
-                    increaseIndent();
-                    var group = dependencyGroups[i];
-                    // derive a unique name for parameter from the first named entry in the group
-                    var parameterName = makeUniqueName(ts.forEach(group, getLocalNameForExternalImport) || "");
-                    write("function (" + parameterName + ") {");
-                    increaseIndent();
-                    for (var _a = 0, group_1 = group; _a < group_1.length; _a++) {
-                        var entry = group_1[_a];
-                        var importVariableName = getLocalNameForExternalImport(entry) || "";
-                        switch (entry.kind) {
-                            case 230 /* ImportDeclaration */:
-                                if (!entry.importClause) {
-                                    // 'import "..."' case
-                                    // module is imported only for side-effects, no emit required
-                                    break;
-                                }
-                            // fall-through
-                            case 229 /* ImportEqualsDeclaration */:
-                                ts.Debug.assert(importVariableName !== "");
-                                writeLine();
-                                // save import into the local
-                                write(importVariableName + " = " + parameterName + ";");
-                                writeLine();
-                                break;
-                            case 236 /* ExportDeclaration */:
-                                ts.Debug.assert(importVariableName !== "");
-                                if (entry.exportClause) {
-                                    // export {a, b as c} from 'foo'
-                                    // emit as:
-                                    // exports_({
-                                    //    "a": _["a"],
-                                    //    "c": _["b"]
-                                    // });
-                                    writeLine();
-                                    write(exportFunctionForFile + "({");
-                                    writeLine();
-                                    increaseIndent();
-                                    for (var i_1 = 0, len = entry.exportClause.elements.length; i_1 < len; i_1++) {
-                                        if (i_1 !== 0) {
-                                            write(",");
-                                            writeLine();
-                                        }
-                                        var e = entry.exportClause.elements[i_1];
-                                        write("\"");
-                                        emitNodeWithCommentsAndWithoutSourcemap(e.name);
-                                        write("\": " + parameterName + "[\"");
-                                        emitNodeWithCommentsAndWithoutSourcemap(e.propertyName || e.name);
-                                        write("\"]");
-                                    }
-                                    decreaseIndent();
-                                    writeLine();
-                                    write("});");
-                                }
-                                else {
-                                    // collectExternalModuleInfo prefilters star exports to keep only ones that export values
-                                    // this means that check 'resolver.moduleExportsSomeValue' is redundant and can be omitted here
-                                    writeLine();
-                                    // export * from 'foo'
-                                    // emit as:
-                                    // exportStar(_foo);
-                                    write(exportStarFunction + "(" + parameterName + ");");
-                                }
-                                writeLine();
-                                break;
-                        }
-                    }
-                    decreaseIndent();
-                    write("}");
-                    decreaseIndent();
-                }
-                write("],");
-            }
-            function emitExecute(node, startIndex) {
-                write("execute: function() {");
-                increaseIndent();
-                writeLine();
-                for (var i = startIndex; i < node.statements.length; i++) {
-                    var statement = node.statements[i];
-                    switch (statement.kind) {
-                        // - function declarations are not emitted because they were already hoisted
-                        // - import declarations are not emitted since they are already handled in setters
-                        // - export declarations with module specifiers are not emitted since they were already written in setters
-                        // - export declarations without module specifiers are emitted preserving the order
-                        case 220 /* FunctionDeclaration */:
-                        case 230 /* ImportDeclaration */:
-                            continue;
-                        case 236 /* ExportDeclaration */:
-                            if (!statement.moduleSpecifier) {
-                                for (var _a = 0, _b = statement.exportClause.elements; _a < _b.length; _a++) {
-                                    var element = _b[_a];
-                                    // write call to exporter function for every export specifier in exports list
-                                    emitExportSpecifierInSystemModule(element);
-                                }
-                            }
-                            continue;
-                        case 229 /* ImportEqualsDeclaration */:
-                            if (!ts.isInternalModuleImportEqualsDeclaration(statement)) {
-                                // - import equals declarations that import external modules are not emitted
-                                continue;
-                            }
-                        // fall-though for import declarations that import internal modules
-                        default:
-                            writeLine();
-                            emit(statement);
-                    }
-                }
-                decreaseIndent();
-                writeLine();
-                write("}"); // execute
-            }
-            function writeModuleName(node, emitRelativePathAsModuleName) {
-                var moduleName = node.moduleName;
-                if (moduleName || (emitRelativePathAsModuleName && (moduleName = getResolvedExternalModuleName(host, node)))) {
-                    write("\"" + moduleName + "\", ");
-                }
-            }
-            function emitSystemModule(node, emitRelativePathAsModuleName) {
-                collectExternalModuleInfo(node);
-                // System modules has the following shape
-                // System.register(['dep-1', ... 'dep-n'], function(exports) {/* module body function */})
-                // 'exports' here is a function 'exports<T>(name: string, value: T): T' that is used to publish exported values.
-                // 'exports' returns its 'value' argument so in most cases expressions
-                // that mutate exported values can be rewritten as:
-                // expr -> exports('name', expr).
-                // The only exception in this rule is postfix unary operators,
-                // see comment to 'emitPostfixUnaryExpression' for more details
-                ts.Debug.assert(!exportFunctionForFile);
-                // make sure that  name of 'exports' function does not conflict with existing identifiers
-                exportFunctionForFile = makeUniqueName("exports");
-                contextObjectForFile = makeUniqueName("context");
-                writeLine();
-                write("System.register(");
-                writeModuleName(node, emitRelativePathAsModuleName);
-                write("[");
-                var groupIndices = {};
-                var dependencyGroups = [];
-                for (var i = 0; i < externalImports.length; i++) {
-                    var text = getExternalModuleNameText(externalImports[i], emitRelativePathAsModuleName);
-                    if (text === undefined) {
-                        continue;
-                    }
-                    // text should be quoted string
-                    // for deduplication purposes in key remove leading and trailing quotes so 'a' and "a" will be considered the same
-                    var key = text.substr(1, text.length - 2);
-                    if (ts.hasProperty(groupIndices, key)) {
-                        // deduplicate/group entries in dependency list by the dependency name
-                        var groupIndex = groupIndices[key];
-                        dependencyGroups[groupIndex].push(externalImports[i]);
-                        continue;
-                    }
-                    else {
-                        groupIndices[key] = dependencyGroups.length;
-                        dependencyGroups.push([externalImports[i]]);
-                    }
-                    if (i !== 0) {
-                        write(", ");
-                    }
-                    write(text);
-                }
-                write("], function(" + exportFunctionForFile + ", " + contextObjectForFile + ") {");
-                writeLine();
-                increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                writeLine();
-                write("var __moduleName = " + contextObjectForFile + " && " + contextObjectForFile + ".id;");
-                writeLine();
-                emitEmitHelpers(node);
-                emitCaptureThisForNodeIfNecessary(node);
-                emitSystemModuleBody(node, dependencyGroups, startIndex);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-            function getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
-                // names of modules with corresponding parameter in the factory function
-                var aliasedModuleNames = [];
-                // names of modules with no corresponding parameters in factory function
-                var unaliasedModuleNames = [];
-                var importAliasNames = []; // names of the parameters in the factory function; these
-                // parameters need to match the indexes of the corresponding
-                // module names in aliasedModuleNames.
-                // Fill in amd-dependency tags
-                for (var _a = 0, _b = node.amdDependencies; _a < _b.length; _a++) {
-                    var amdDependency = _b[_a];
-                    if (amdDependency.name) {
-                        aliasedModuleNames.push('"' + amdDependency.path + '"');
-                        importAliasNames.push(amdDependency.name);
-                    }
-                    else {
-                        unaliasedModuleNames.push('"' + amdDependency.path + '"');
-                    }
-                }
-                for (var _c = 0, externalImports_4 = externalImports; _c < externalImports_4.length; _c++) {
-                    var importNode = externalImports_4[_c];
-                    // Find the name of the external module
-                    var externalModuleName = getExternalModuleNameText(importNode, emitRelativePathAsModuleName);
-                    // Find the name of the module alias, if there is one
-                    var importAliasName = getLocalNameForExternalImport(importNode);
-                    if (includeNonAmdDependencies && importAliasName) {
-                        aliasedModuleNames.push(externalModuleName);
-                        importAliasNames.push(importAliasName);
-                    }
-                    else {
-                        unaliasedModuleNames.push(externalModuleName);
-                    }
-                }
-                return { aliasedModuleNames: aliasedModuleNames, unaliasedModuleNames: unaliasedModuleNames, importAliasNames: importAliasNames };
-            }
-            function emitAMDDependencies(node, includeNonAmdDependencies, emitRelativePathAsModuleName) {
-                // An AMD define function has the following shape:
-                //     define(id?, dependencies?, factory);
-                //
-                // This has the shape of
-                //     define(name, ["module1", "module2"], function (module1Alias) {
-                // The location of the alias in the parameter list in the factory function needs to
-                // match the position of the module name in the dependency list.
-                //
-                // To ensure this is true in cases of modules with no aliases, e.g.:
-                // `import "module"` or `<amd-dependency path= "a.css" />`
-                // we need to add modules without alias names to the end of the dependencies list
-                var dependencyNames = getAMDDependencyNames(node, includeNonAmdDependencies, emitRelativePathAsModuleName);
-                emitAMDDependencyList(dependencyNames);
-                write(", ");
-                emitAMDFactoryHeader(dependencyNames);
-            }
-            function emitAMDDependencyList(_a) {
-                var aliasedModuleNames = _a.aliasedModuleNames, unaliasedModuleNames = _a.unaliasedModuleNames;
-                write('["require", "exports"');
-                if (aliasedModuleNames.length) {
-                    write(", ");
-                    write(aliasedModuleNames.join(", "));
-                }
-                if (unaliasedModuleNames.length) {
-                    write(", ");
-                    write(unaliasedModuleNames.join(", "));
-                }
-                write("]");
-            }
-            function emitAMDFactoryHeader(_a) {
-                var importAliasNames = _a.importAliasNames;
-                write("function (require, exports");
-                if (importAliasNames.length) {
-                    write(", ");
-                    write(importAliasNames.join(", "));
-                }
-                write(") {");
-            }
-            function emitAMDModule(node, emitRelativePathAsModuleName) {
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-                writeLine();
-                write("define(");
-                writeModuleName(node, emitRelativePathAsModuleName);
-                emitAMDDependencies(node, /*includeNonAmdDependencies*/ true, emitRelativePathAsModuleName);
-                increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ true);
-                emitTempDeclarations(/*newLine*/ true);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-            function emitCommonJSModule(node) {
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ false);
-                emitTempDeclarations(/*newLine*/ true);
-            }
-            function emitUMDModule(node) {
-                emitEmitHelpers(node);
-                collectExternalModuleInfo(node);
-                var dependencyNames = getAMDDependencyNames(node, /*includeNonAmdDependencies*/ false);
-                // Module is detected first to support Browserify users that load into a browser with an AMD loader
-                writeLines("(function (factory) {\n    if (typeof module === 'object' && typeof module.exports === 'object') {\n        var v = factory(require, exports); if (v !== undefined) module.exports = v;\n    }\n    else if (typeof define === 'function' && define.amd) {\n        define(");
-                emitAMDDependencyList(dependencyNames);
-                write(", factory);");
-                writeLines("    }\n})(");
-                emitAMDFactoryHeader(dependencyNames);
-                increaseIndent();
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ true, /*ensureUseStrict*/ !compilerOptions.noImplicitUseStrict);
-                emitExportStarHelper();
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitExportEquals(/*emitAsReturn*/ true);
-                emitTempDeclarations(/*newLine*/ true);
-                decreaseIndent();
-                writeLine();
-                write("});");
-            }
-            function emitES6Module(node) {
-                externalImports = undefined;
-                exportSpecifiers = undefined;
-                exportEquals = undefined;
-                hasExportStarsToExportValues = false;
-                var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
-                emitEmitHelpers(node);
-                emitCaptureThisForNodeIfNecessary(node);
-                emitLinesStartingAt(node.statements, startIndex);
-                emitTempDeclarations(/*newLine*/ true);
-                // Emit exportDefault if it exists will happen as part
-                // or normal statement emit.
-            }
-            function emitExportEquals(emitAsReturn) {
-                if (exportEquals && resolver.isValueAliasDeclaration(exportEquals)) {
-                    writeLine();
-                    emitStart(exportEquals);
-                    write(emitAsReturn ? "return " : "module.exports = ");
-                    emit(exportEquals.expression);
-                    write(";");
-                    emitEnd(exportEquals);
-                }
-            }
-            function emitJsxElement(node) {
-                switch (compilerOptions.jsx) {
-                    case 2 /* React */:
-                        jsxEmitReact(node);
-                        break;
-                    case 1 /* Preserve */:
-                    // Fall back to preserve if None was specified (we'll error earlier)
-                    default:
-                        jsxEmitPreserve(node);
-                        break;
-                }
-            }
-            function trimReactWhitespaceAndApplyEntities(node) {
-                var result = undefined;
-                var text = ts.getTextOfNode(node, /*includeTrivia*/ true);
-                var firstNonWhitespace = 0;
-                var lastNonWhitespace = -1;
-                // JSX trims whitespace at the end and beginning of lines, except that the
-                // start/end of a tag is considered a start/end of a line only if that line is
-                // on the same line as the closing tag. See examples in tests/cases/conformance/jsx/tsxReactEmitWhitespace.tsx
-                for (var i = 0; i < text.length; i++) {
-                    var c = text.charCodeAt(i);
-                    if (ts.isLineBreak(c)) {
-                        if (firstNonWhitespace !== -1 && (lastNonWhitespace - firstNonWhitespace + 1 > 0)) {
-                            var part = text.substr(firstNonWhitespace, lastNonWhitespace - firstNonWhitespace + 1);
-                            result = (result ? result + "\" + ' ' + \"" : "") + ts.escapeString(part);
-                        }
-                        firstNonWhitespace = -1;
-                    }
-                    else if (!ts.isWhiteSpaceSingleLine(c)) {
-                        lastNonWhitespace = i;
-                        if (firstNonWhitespace === -1) {
-                            firstNonWhitespace = i;
-                        }
-                    }
-                }
-                if (firstNonWhitespace !== -1) {
-                    var part = text.substr(firstNonWhitespace);
-                    result = (result ? result + "\" + ' ' + \"" : "") + ts.escapeString(part);
-                }
-                if (result) {
-                    // Replace entities like &nbsp;
-                    result = result.replace(/&(\w+);/g, function (s, m) {
-                        if (entities[m] !== undefined) {
-                            var ch = String.fromCharCode(entities[m]);
-                            // &quot; needs to be escaped
-                            return ch === '"' ? "\\\"" : ch;
-                        }
-                        else {
-                            return s;
-                        }
-                    });
-                }
-                return result;
-            }
-            function isJsxChildEmittable(child) {
-                if (child.kind === 248 /* JsxExpression */) {
-                    // Don't emit empty expressions
-                    return !!child.expression;
-                }
-                else if (child.kind === 244 /* JsxText */) {
-                    // Don't emit empty strings
-                    return !!getTextToEmit(child);
-                }
-                return true;
-            }
-            ;
-            function getTextToEmit(node) {
-                switch (compilerOptions.jsx) {
-                    case 2 /* React */:
-                        var text = trimReactWhitespaceAndApplyEntities(node);
-                        if (text === undefined || text.length === 0) {
-                            return undefined;
-                        }
-                        else {
-                            return text;
-                        }
-                    case 1 /* Preserve */:
-                    default:
-                        return ts.getTextOfNode(node, /*includeTrivia*/ true);
-                }
-            }
-            function emitJsxText(node) {
-                switch (compilerOptions.jsx) {
-                    case 2 /* React */:
-                        write('"');
-                        write(trimReactWhitespaceAndApplyEntities(node));
-                        write('"');
-                        break;
-                    case 1 /* Preserve */:
-                    default:
-                        writer.writeLiteral(ts.getTextOfNode(node, /*includeTrivia*/ true));
-                        break;
-                }
-            }
-            function emitJsxExpression(node) {
-                if (node.expression) {
-                    switch (compilerOptions.jsx) {
-                        case 1 /* Preserve */:
-                        default:
-                            write("{");
-                            emit(node.expression);
-                            write("}");
-                            break;
-                        case 2 /* React */:
-                            emit(node.expression);
-                            break;
-                    }
-                }
-            }
-            function isUseStrictPrologue(node) {
-                return node.expression.text === "use strict";
-            }
-            function ensureUseStrictPrologue(startWithNewLine, writeUseStrict) {
-                if (writeUseStrict) {
-                    if (startWithNewLine) {
-                        writeLine();
-                    }
-                    write("\"use strict\";");
-                }
-            }
-            function emitDirectivePrologues(statements, startWithNewLine, ensureUseStrict) {
-                var foundUseStrict = false;
-                for (var i = 0; i < statements.length; i++) {
-                    if (ts.isPrologueDirective(statements[i])) {
-                        if (isUseStrictPrologue(statements[i])) {
-                            foundUseStrict = true;
-                        }
-                        if (startWithNewLine || i > 0) {
-                            writeLine();
-                        }
-                        emit(statements[i]);
-                    }
-                    else {
-                        ensureUseStrictPrologue(startWithNewLine || i > 0, !foundUseStrict && ensureUseStrict);
-                        // return index of the first non prologue directive
-                        return i;
-                    }
-                }
-                ensureUseStrictPrologue(startWithNewLine, !foundUseStrict && ensureUseStrict);
-                return statements.length;
-            }
-            function writeLines(text) {
-                var lines = text.split(/\r\n|\r|\n/g);
-                for (var i = 0; i < lines.length; i++) {
-                    var line = lines[i];
-                    if (line.length) {
-                        writeLine();
-                        write(line);
-                    }
-                }
-            }
-            function emitEmitHelpers(node) {
-                // Only emit helpers if the user did not say otherwise.
-                if (!compilerOptions.noEmitHelpers) {
-                    // Only Emit __extends function when target ES5.
-                    // For target ES6 and above, we can emit classDeclaration as is.
-                    if (languageVersion < 2 /* ES6 */ && !extendsEmitted && node.flags & 262144 /* HasClassExtends */) {
-                        writeLines(extendsHelper);
-                        extendsEmitted = true;
-                    }
-                    if (compilerOptions.jsx !== 1 /* Preserve */ && !assignEmitted && (node.flags & 1073741824 /* HasJsxSpreadAttribute */)) {
-                        writeLines(assignHelper);
-                        assignEmitted = true;
-                    }
-                    if (!decorateEmitted && node.flags & 524288 /* HasDecorators */) {
-                        writeLines(decorateHelper);
-                        if (compilerOptions.emitDecoratorMetadata) {
-                            writeLines(metadataHelper);
-                        }
-                        decorateEmitted = true;
-                    }
-                    if (!paramEmitted && node.flags & 1048576 /* HasParamDecorators */) {
-                        writeLines(paramHelper);
-                        paramEmitted = true;
-                    }
-                    if (!awaiterEmitted && node.flags & 2097152 /* HasAsyncFunctions */) {
-                        writeLines(awaiterHelper);
-                        awaiterEmitted = true;
-                    }
-                }
-            }
-            function emitSourceFileNode(node) {
-                // Start new file on new line
-                writeLine();
-                emitShebang();
-                emitDetachedCommentsAndUpdateCommentsInfo(node);
-                if (ts.isExternalModule(node) || compilerOptions.isolatedModules) {
-                    if (isOwnFileEmit || (!ts.isExternalModule(node) && compilerOptions.isolatedModules)) {
-                        var emitModule = moduleEmitDelegates[modulekind] || moduleEmitDelegates[ts.ModuleKind.CommonJS];
-                        emitModule(node);
-                    }
-                    else {
-                        bundleEmitDelegates[modulekind](node, /*emitRelativePathAsModuleName*/ true);
-                    }
-                }
-                else {
-                    // emit prologue directives prior to __extends
-                    var startIndex = emitDirectivePrologues(node.statements, /*startWithNewLine*/ false);
-                    externalImports = undefined;
-                    exportSpecifiers = undefined;
-                    exportEquals = undefined;
-                    hasExportStarsToExportValues = false;
-                    emitEmitHelpers(node);
-                    emitCaptureThisForNodeIfNecessary(node);
-                    emitLinesStartingAt(node.statements, startIndex);
-                    emitTempDeclarations(/*newLine*/ true);
-                }
-                emitLeadingComments(node.endOfFileToken);
-            }
-            function emit(node) {
-                emitNodeConsideringCommentsOption(node, emitNodeWithSourceMap);
-            }
-            function emitNodeWithCommentsAndWithoutSourcemap(node) {
-                emitNodeConsideringCommentsOption(node, emitNodeWithoutSourceMap);
-            }
-            function emitNodeConsideringCommentsOption(node, emitNodeConsideringSourcemap) {
-                if (node) {
-                    if (node.flags & 2 /* Ambient */) {
-                        return emitCommentsOnNotEmittedNode(node);
-                    }
-                    if (isSpecializedCommentHandling(node)) {
-                        // This is the node that will handle its own comments and sourcemap
-                        return emitNodeWithoutSourceMap(node);
-                    }
-                    var emitComments_1 = shouldEmitLeadingAndTrailingComments(node);
-                    if (emitComments_1) {
-                        emitLeadingComments(node);
-                    }
-                    emitNodeConsideringSourcemap(node);
-                    if (emitComments_1) {
-                        emitTrailingComments(node);
-                    }
-                }
-            }
-            function emitNodeWithSourceMap(node) {
-                if (node) {
-                    emitStart(node);
-                    emitNodeWithoutSourceMap(node);
-                    emitEnd(node);
-                }
-            }
-            function emitNodeWithoutSourceMap(node) {
-                if (node) {
-                    emitJavaScriptWorker(node);
-                }
-            }
-            function changeSourceMapEmit(writer) {
-                sourceMap = writer;
-                emitStart = writer.emitStart;
-                emitEnd = writer.emitEnd;
-                emitPos = writer.emitPos;
-                setSourceFile = writer.setSourceFile;
-            }
-            function withTemporaryNoSourceMap(callback) {
-                var prevSourceMap = sourceMap;
-                setSourceMapWriterEmit(ts.getNullSourceMapWriter());
-                callback();
-                setSourceMapWriterEmit(prevSourceMap);
-            }
-            function isSpecializedCommentHandling(node) {
-                switch (node.kind) {
-                    // All of these entities are emitted in a specialized fashion.  As such, we allow
-                    // the specialized methods for each to handle the comments on the nodes.
-                    case 222 /* InterfaceDeclaration */:
-                    case 220 /* FunctionDeclaration */:
-                    case 230 /* ImportDeclaration */:
-                    case 229 /* ImportEqualsDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                    case 235 /* ExportAssignment */:
-                        return true;
-                }
-            }
-            function shouldEmitLeadingAndTrailingComments(node) {
-                switch (node.kind) {
-                    case 200 /* VariableStatement */:
-                        return shouldEmitLeadingAndTrailingCommentsForVariableStatement(node);
-                    case 225 /* ModuleDeclaration */:
-                        // Only emit the leading/trailing comments for a module if we're actually
-                        // emitting the module as well.
-                        return shouldEmitModuleDeclaration(node);
-                    case 224 /* EnumDeclaration */:
-                        // Only emit the leading/trailing comments for an enum if we're actually
-                        // emitting the module as well.
-                        return shouldEmitEnumDeclaration(node);
-                }
-                // If the node is emitted in specialized fashion, dont emit comments as this node will handle
-                // emitting comments when emitting itself
-                ts.Debug.assert(!isSpecializedCommentHandling(node));
-                // If this is the expression body of an arrow function that we're down-leveling,
-                // then we don't want to emit comments when we emit the body.  It will have already
-                // been taken care of when we emitted the 'return' statement for the function
-                // expression body.
-                if (node.kind !== 199 /* Block */ &&
-                    node.parent &&
-                    node.parent.kind === 180 /* ArrowFunction */ &&
-                    node.parent.body === node &&
-                    languageVersion <= 1 /* ES5 */) {
-                    return false;
-                }
-                // Emit comments for everything else.
-                return true;
-            }
-            function emitJavaScriptWorker(node) {
-                // Check if the node can be emitted regardless of the ScriptTarget
-                switch (node.kind) {
-                    case 69 /* Identifier */:
-                        return emitIdentifier(node);
-                    case 142 /* Parameter */:
-                        return emitParameter(node);
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        return emitMethod(node);
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        return emitAccessor(node);
-                    case 97 /* ThisKeyword */:
-                        return emitThis(node);
-                    case 95 /* SuperKeyword */:
-                        return emitSuper(node);
-                    case 93 /* NullKeyword */:
-                        return write("null");
-                    case 99 /* TrueKeyword */:
-                        return write("true");
-                    case 84 /* FalseKeyword */:
-                        return write("false");
-                    case 8 /* NumericLiteral */:
-                    case 9 /* StringLiteral */:
-                    case 10 /* RegularExpressionLiteral */:
-                    case 11 /* NoSubstitutionTemplateLiteral */:
-                    case 12 /* TemplateHead */:
-                    case 13 /* TemplateMiddle */:
-                    case 14 /* TemplateTail */:
-                        return emitLiteral(node);
-                    case 189 /* TemplateExpression */:
-                        return emitTemplateExpression(node);
-                    case 197 /* TemplateSpan */:
-                        return emitTemplateSpan(node);
-                    case 241 /* JsxElement */:
-                    case 242 /* JsxSelfClosingElement */:
-                        return emitJsxElement(node);
-                    case 244 /* JsxText */:
-                        return emitJsxText(node);
-                    case 248 /* JsxExpression */:
-                        return emitJsxExpression(node);
-                    case 139 /* QualifiedName */:
-                        return emitQualifiedName(node);
-                    case 167 /* ObjectBindingPattern */:
-                        return emitObjectBindingPattern(node);
-                    case 168 /* ArrayBindingPattern */:
-                        return emitArrayBindingPattern(node);
-                    case 169 /* BindingElement */:
-                        return emitBindingElement(node);
-                    case 170 /* ArrayLiteralExpression */:
-                        return emitArrayLiteral(node);
-                    case 171 /* ObjectLiteralExpression */:
-                        return emitObjectLiteral(node);
-                    case 253 /* PropertyAssignment */:
-                        return emitPropertyAssignment(node);
-                    case 254 /* ShorthandPropertyAssignment */:
-                        return emitShorthandPropertyAssignment(node);
-                    case 140 /* ComputedPropertyName */:
-                        return emitComputedPropertyName(node);
-                    case 172 /* PropertyAccessExpression */:
-                        return emitPropertyAccess(node);
-                    case 173 /* ElementAccessExpression */:
-                        return emitIndexedAccess(node);
-                    case 174 /* CallExpression */:
-                        return emitCallExpression(node);
-                    case 175 /* NewExpression */:
-                        return emitNewExpression(node);
-                    case 176 /* TaggedTemplateExpression */:
-                        return emitTaggedTemplateExpression(node);
-                    case 177 /* TypeAssertionExpression */:
-                    case 195 /* AsExpression */:
-                    case 196 /* NonNullExpression */:
-                        return emit(node.expression);
-                    case 178 /* ParenthesizedExpression */:
-                        return emitParenExpression(node);
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                        return emitFunctionDeclaration(node);
-                    case 181 /* DeleteExpression */:
-                        return emitDeleteExpression(node);
-                    case 182 /* TypeOfExpression */:
-                        return emitTypeOfExpression(node);
-                    case 183 /* VoidExpression */:
-                        return emitVoidExpression(node);
-                    case 184 /* AwaitExpression */:
-                        return emitAwaitExpression(node);
-                    case 185 /* PrefixUnaryExpression */:
-                        return emitPrefixUnaryExpression(node);
-                    case 186 /* PostfixUnaryExpression */:
-                        return emitPostfixUnaryExpression(node);
-                    case 187 /* BinaryExpression */:
-                        return emitBinaryExpression(node);
-                    case 188 /* ConditionalExpression */:
-                        return emitConditionalExpression(node);
-                    case 191 /* SpreadElementExpression */:
-                        return emitSpreadElementExpression(node);
-                    case 190 /* YieldExpression */:
-                        return emitYieldExpression(node);
-                    case 193 /* OmittedExpression */:
-                        return;
-                    case 199 /* Block */:
-                    case 226 /* ModuleBlock */:
-                        return emitBlock(node);
-                    case 200 /* VariableStatement */:
-                        return emitVariableStatement(node);
-                    case 201 /* EmptyStatement */:
-                        return write(";");
-                    case 202 /* ExpressionStatement */:
-                        return emitExpressionStatement(node);
-                    case 203 /* IfStatement */:
-                        return emitIfStatement(node);
-                    case 204 /* DoStatement */:
-                        return emitDoStatement(node);
-                    case 205 /* WhileStatement */:
-                        return emitWhileStatement(node);
-                    case 206 /* ForStatement */:
-                        return emitForStatement(node);
-                    case 208 /* ForOfStatement */:
-                    case 207 /* ForInStatement */:
-                        return emitForInOrForOfStatement(node);
-                    case 209 /* ContinueStatement */:
-                    case 210 /* BreakStatement */:
-                        return emitBreakOrContinueStatement(node);
-                    case 211 /* ReturnStatement */:
-                        return emitReturnStatement(node);
-                    case 212 /* WithStatement */:
-                        return emitWithStatement(node);
-                    case 213 /* SwitchStatement */:
-                        return emitSwitchStatement(node);
-                    case 249 /* CaseClause */:
-                    case 250 /* DefaultClause */:
-                        return emitCaseOrDefaultClause(node);
-                    case 214 /* LabeledStatement */:
-                        return emitLabeledStatement(node);
-                    case 215 /* ThrowStatement */:
-                        return emitThrowStatement(node);
-                    case 216 /* TryStatement */:
-                        return emitTryStatement(node);
-                    case 252 /* CatchClause */:
-                        return emitCatchClause(node);
-                    case 217 /* DebuggerStatement */:
-                        return emitDebuggerStatement(node);
-                    case 218 /* VariableDeclaration */:
-                        return emitVariableDeclaration(node);
-                    case 192 /* ClassExpression */:
-                        return emitClassExpression(node);
-                    case 221 /* ClassDeclaration */:
-                        return emitClassDeclaration(node);
-                    case 222 /* InterfaceDeclaration */:
-                        return emitInterfaceDeclaration(node);
-                    case 224 /* EnumDeclaration */:
-                        return emitEnumDeclaration(node);
-                    case 255 /* EnumMember */:
-                        return emitEnumMember(node);
-                    case 225 /* ModuleDeclaration */:
-                        return emitModuleDeclaration(node);
-                    case 230 /* ImportDeclaration */:
-                        return emitImportDeclaration(node);
-                    case 229 /* ImportEqualsDeclaration */:
-                        return emitImportEqualsDeclaration(node);
-                    case 236 /* ExportDeclaration */:
-                        return emitExportDeclaration(node);
-                    case 235 /* ExportAssignment */:
-                        return emitExportAssignment(node);
-                    case 256 /* SourceFile */:
-                        return emitSourceFileNode(node);
-                }
-            }
-            function hasDetachedComments(pos) {
-                return detachedCommentsInfo !== undefined && ts.lastOrUndefined(detachedCommentsInfo).nodePos === pos;
-            }
-            function getLeadingCommentsWithoutDetachedComments() {
-                // get the leading comments from detachedPos
-                var leadingComments = ts.getLeadingCommentRanges(currentText, ts.lastOrUndefined(detachedCommentsInfo).detachedCommentEndPos);
-                if (detachedCommentsInfo.length - 1) {
-                    detachedCommentsInfo.pop();
-                }
-                else {
-                    detachedCommentsInfo = undefined;
-                }
-                return leadingComments;
-            }
-            /**
-             * Determine if the given comment is a triple-slash
-             *
-             * @return true if the comment is a triple-slash comment else false
-             **/
-            function isTripleSlashComment(comment) {
-                // Verify this is /// comment, but do the regexp match only when we first can find /// in the comment text
-                // so that we don't end up computing comment string and doing match for all // comments
-                if (currentText.charCodeAt(comment.pos + 1) === 47 /* slash */ &&
-                    comment.pos + 2 < comment.end &&
-                    currentText.charCodeAt(comment.pos + 2) === 47 /* slash */) {
-                    var textSubStr = currentText.substring(comment.pos, comment.end);
-                    return textSubStr.match(ts.fullTripleSlashReferencePathRegEx) ||
-                        textSubStr.match(ts.fullTripleSlashAMDReferencePathRegEx) ?
-                        true : false;
-                }
-                return false;
-            }
-            function getLeadingCommentsToEmit(node) {
-                // Emit the leading comments only if the parent's pos doesn't match because parent should take care of emitting these comments
-                if (node.parent) {
-                    if (node.parent.kind === 256 /* SourceFile */ || node.pos !== node.parent.pos) {
-                        if (hasDetachedComments(node.pos)) {
-                            // get comments without detached comments
-                            return getLeadingCommentsWithoutDetachedComments();
-                        }
-                        else {
-                            // get the leading comments from the node
-                            return ts.getLeadingCommentRangesOfNodeFromText(node, currentText);
-                        }
-                    }
-                }
-            }
-            function getTrailingCommentsToEmit(node) {
-                // Emit the trailing comments only if the parent's pos doesn't match because parent should take care of emitting these comments
-                if (node.parent) {
-                    if (node.parent.kind === 256 /* SourceFile */ || node.end !== node.parent.end) {
-                        return ts.getTrailingCommentRanges(currentText, node.end);
-                    }
-                }
-            }
-            /**
-             * Emit comments associated with node that will not be emitted into JS file
-             */
-            function emitCommentsOnNotEmittedNode(node) {
-                emitLeadingCommentsWorker(node, /*isEmittedNode*/ false);
-            }
-            function emitLeadingComments(node) {
-                return emitLeadingCommentsWorker(node, /*isEmittedNode*/ true);
-            }
-            function emitLeadingCommentsWorker(node, isEmittedNode) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-                var leadingComments;
-                if (isEmittedNode) {
-                    leadingComments = getLeadingCommentsToEmit(node);
-                }
-                else {
-                    // If the node will not be emitted in JS, remove all the comments(normal, pinned and ///) associated with the node,
-                    // unless it is a triple slash comment at the top of the file.
-                    // For Example:
-                    //      /// <reference-path ...>
-                    //      declare var x;
-                    //      /// <reference-path ...>
-                    //      interface F {}
-                    //  The first /// will NOT be removed while the second one will be removed even though both node will not be emitted
-                    if (node.pos === 0) {
-                        leadingComments = ts.filter(getLeadingCommentsToEmit(node), isTripleSlashComment);
-                    }
-                }
-                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, node, leadingComments);
-                // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-            function emitTrailingComments(node) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-                // Emit the trailing comments only if the parent's end doesn't match
-                var trailingComments = getTrailingCommentsToEmit(node);
-                // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ false, newLine, writeComment);
-            }
-            /**
-             * Emit trailing comments at the position. The term trailing comment is used here to describe following comment:
-             *      x, /comment1/ y
-             *        ^ => pos; the function will emit "comment1" in the emitJS
-             */
-            function emitTrailingCommentsOfPosition(pos) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-                var trailingComments = ts.getTrailingCommentRanges(currentText, pos);
-                // trailing comments are emitted at space/*trailing comment1 */space/*trailing comment*/
-                ts.emitComments(currentText, currentLineMap, writer, trailingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-            function emitLeadingCommentsOfPositionWorker(pos) {
-                if (compilerOptions.removeComments) {
-                    return;
-                }
-                var leadingComments;
-                if (hasDetachedComments(pos)) {
-                    // get comments without detached comments
-                    leadingComments = getLeadingCommentsWithoutDetachedComments();
-                }
-                else {
-                    // get the leading comments from the node
-                    leadingComments = ts.getLeadingCommentRanges(currentText, pos);
-                }
-                ts.emitNewLineBeforeLeadingComments(currentLineMap, writer, { pos: pos, end: pos }, leadingComments);
-                // Leading comments are emitted at /*leading comment1 */space/*leading comment*/space
-                ts.emitComments(currentText, currentLineMap, writer, leadingComments, /*trailingSeparator*/ true, newLine, writeComment);
-            }
-            function emitDetachedCommentsAndUpdateCommentsInfo(node) {
-                var currentDetachedCommentInfo = ts.emitDetachedComments(currentText, currentLineMap, writer, writeComment, node, newLine, compilerOptions.removeComments);
-                if (currentDetachedCommentInfo) {
-                    if (detachedCommentsInfo) {
-                        detachedCommentsInfo.push(currentDetachedCommentInfo);
-                    }
-                    else {
-                        detachedCommentsInfo = [currentDetachedCommentInfo];
-                    }
-                }
-            }
-            function writeComment(text, lineMap, writer, comment, newLine) {
-                emitPos(comment.pos);
-                ts.writeCommentRange(text, lineMap, writer, comment, newLine);
-                emitPos(comment.end);
-            }
-            function emitShebang() {
-                var shebang = ts.getShebang(currentText);
-                if (shebang) {
-                    write(shebang);
-                    writeLine();
-                }
-            }
-            var _a, _b;
-        }
-        function emitFile(_a, sourceFiles, isBundledEmit) {
-            var jsFilePath = _a.jsFilePath, sourceMapFilePath = _a.sourceMapFilePath, declarationFilePath = _a.declarationFilePath;
-            // Make sure not to write js File and source map file if any of them cannot be written
-            if (!host.isEmitBlocked(jsFilePath) && !compilerOptions.noEmit) {
-                emitJavaScript(jsFilePath, sourceMapFilePath, sourceFiles, isBundledEmit);
-            }
-            else {
-                emitSkipped = true;
-            }
-            if (declarationFilePath) {
-                emitSkipped = ts.writeDeclarationFile(declarationFilePath, sourceFiles, isBundledEmit, host, resolver, emitterDiagnostics) || emitSkipped;
-            }
-            if (!emitSkipped && emittedFilesList) {
-                emittedFilesList.push(jsFilePath);
-                if (sourceMapFilePath) {
-                    emittedFilesList.push(sourceMapFilePath);
-                }
-                if (declarationFilePath) {
-                    emittedFilesList.push(declarationFilePath);
-                }
-            }
-        }
-    }
-    ts.emitFiles = emitFiles;
-})(ts || (ts = {}));
-/// <reference path="sys.ts" />
-/// <reference path="emitter.ts" />
-/// <reference path="core.ts" />
-var ts;
-(function (ts) {
-    /* @internal */ ts.programTime = 0;
-    /* @internal */ ts.emitTime = 0;
-    /* @internal */ ts.ioReadTime = 0;
-    /* @internal */ ts.ioWriteTime = 0;
-    /** The version of the TypeScript compiler release */
-    ts.version = "2.0.0";
-    var emptyArray = [];
-    var defaultTypeRoots = ["node_modules/@types"];
-    function findConfigFile(searchPath, fileExists) {
-        while (true) {
-            var fileName = ts.combinePaths(searchPath, "tsconfig.json");
-            if (fileExists(fileName)) {
-                return fileName;
-            }
-            var parentPath = ts.getDirectoryPath(searchPath);
-            if (parentPath === searchPath) {
-                break;
-            }
-            searchPath = parentPath;
-        }
-        return undefined;
-    }
-    ts.findConfigFile = findConfigFile;
-    function resolveTripleslashReference(moduleName, containingFile) {
-        var basePath = ts.getDirectoryPath(containingFile);
-        var referencedFileName = ts.isRootedDiskPath(moduleName) ? moduleName : ts.combinePaths(basePath, moduleName);
-        return ts.normalizePath(referencedFileName);
-    }
-    ts.resolveTripleslashReference = resolveTripleslashReference;
-    /* @internal */
-    function computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName) {
-        var commonPathComponents;
-        var failed = ts.forEach(fileNames, function (sourceFile) {
-            // Each file contributes into common source file path
-            var sourcePathComponents = ts.getNormalizedPathComponents(sourceFile, currentDirectory);
-            sourcePathComponents.pop(); // The base file name is not part of the common directory path
-            if (!commonPathComponents) {
-                // first file
-                commonPathComponents = sourcePathComponents;
-                return;
-            }
-            for (var i = 0, n = Math.min(commonPathComponents.length, sourcePathComponents.length); i < n; i++) {
-                if (getCanonicalFileName(commonPathComponents[i]) !== getCanonicalFileName(sourcePathComponents[i])) {
-                    if (i === 0) {
-                        // Failed to find any common path component
-                        return true;
-                    }
-                    // New common path found that is 0 -> i-1
-                    commonPathComponents.length = i;
-                    break;
-                }
-            }
-            // If the sourcePathComponents was shorter than the commonPathComponents, truncate to the sourcePathComponents
-            if (sourcePathComponents.length < commonPathComponents.length) {
-                commonPathComponents.length = sourcePathComponents.length;
-            }
-        });
-        // A common path can not be found when paths span multiple drives on windows, for example
-        if (failed) {
-            return "";
-        }
-        if (!commonPathComponents) {
-            return currentDirectory;
-        }
-        return ts.getNormalizedPathFromPathComponents(commonPathComponents);
-    }
-    ts.computeCommonSourceDirectoryOfFilenames = computeCommonSourceDirectoryOfFilenames;
-    function trace(host, message) {
-        host.trace(ts.formatMessage.apply(undefined, arguments));
-    }
-    function isTraceEnabled(compilerOptions, host) {
-        return compilerOptions.traceResolution && host.trace !== undefined;
-    }
-    /* @internal */
-    function hasZeroOrOneAsteriskCharacter(str) {
-        var seenAsterisk = false;
-        for (var i = 0; i < str.length; i++) {
-            if (str.charCodeAt(i) === 42 /* asterisk */) {
-                if (!seenAsterisk) {
-                    seenAsterisk = true;
-                }
-                else {
-                    // have already seen asterisk
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-    ts.hasZeroOrOneAsteriskCharacter = hasZeroOrOneAsteriskCharacter;
-    function createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations) {
-        return { resolvedModule: resolvedFileName ? { resolvedFileName: resolvedFileName, isExternalLibraryImport: isExternalLibraryImport } : undefined, failedLookupLocations: failedLookupLocations };
-    }
-    function moduleHasNonRelativeName(moduleName) {
-        if (ts.isRootedDiskPath(moduleName)) {
-            return false;
-        }
-        var i = moduleName.lastIndexOf("./", 1);
-        var startsWithDotSlashOrDotDotSlash = i === 0 || (i === 1 && moduleName.charCodeAt(0) === 46 /* dot */);
-        return !startsWithDotSlashOrDotDotSlash;
-    }
-    function tryReadTypesSection(packageJsonPath, baseDirectory, state) {
-        var jsonContent;
-        try {
-            var jsonText = state.host.readFile(packageJsonPath);
-            jsonContent = jsonText ? JSON.parse(jsonText) : {};
-        }
-        catch (e) {
-            // gracefully handle if readFile fails or returns not JSON
-            jsonContent = {};
-        }
-        var typesFile;
-        var fieldName;
-        // first try to read content of 'typings' section (backward compatibility)
-        if (jsonContent.typings) {
-            if (typeof jsonContent.typings === "string") {
-                fieldName = "typings";
-                typesFile = jsonContent.typings;
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "typings", typeof jsonContent.typings);
-                }
-            }
-        }
-        // then read 'types'
-        if (!typesFile && jsonContent.types) {
-            if (typeof jsonContent.types === "string") {
-                fieldName = "types";
-                typesFile = jsonContent.types;
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Expected_type_of_0_field_in_package_json_to_be_string_got_1, "types", typeof jsonContent.types);
-                }
-            }
-        }
-        if (typesFile) {
-            var typesFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, typesFile));
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.package_json_has_0_field_1_that_references_2, fieldName, typesFile, typesFilePath);
-            }
-            return typesFilePath;
-        }
-        // Use the main module for inferring types if no types package specified and the allowJs is set
-        if (state.compilerOptions.allowJs && jsonContent.main && typeof jsonContent.main === "string") {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.No_types_specified_in_package_json_but_allowJs_is_set_so_returning_main_value_of_0, jsonContent.main);
-            }
-            var mainFilePath = ts.normalizePath(ts.combinePaths(baseDirectory, jsonContent.main));
-            return mainFilePath;
-        }
-        return undefined;
-    }
-    var typeReferenceExtensions = [".d.ts"];
-    function getEffectiveTypeRoots(options, host) {
-        if (options.typeRoots) {
-            return options.typeRoots;
-        }
-        var currentDirectory;
-        if (options.configFilePath) {
-            currentDirectory = ts.getDirectoryPath(options.configFilePath);
-        }
-        else if (host.getCurrentDirectory) {
-            currentDirectory = host.getCurrentDirectory();
-        }
-        if (!currentDirectory) {
-            return undefined;
-        }
-        return ts.map(defaultTypeRoots, function (d) { return ts.combinePaths(currentDirectory, d); });
-    }
-    /**
-     * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
-     * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
-     * is assumed to be the same as root directory of the project.
-     */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host) {
-        var traceEnabled = isTraceEnabled(options, host);
-        var moduleResolutionState = {
-            compilerOptions: options,
-            host: host,
-            skipTsx: true,
-            traceEnabled: traceEnabled
-        };
-        var typeRoots = getEffectiveTypeRoots(options, host);
-        if (traceEnabled) {
-            if (containingFile === undefined) {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_not_set, typeReferenceDirectiveName);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_not_set_root_directory_1, typeReferenceDirectiveName, typeRoots);
-                }
-            }
-            else {
-                if (typeRoots === undefined) {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_not_set, typeReferenceDirectiveName, containingFile);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1_root_directory_2, typeReferenceDirectiveName, containingFile, typeRoots);
-                }
-            }
-        }
-        var failedLookupLocations = [];
-        // Check primary library paths
-        if (typeRoots && typeRoots.length) {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_with_primary_search_path_0, typeRoots.join(", "));
-            }
-            var primarySearchPaths = typeRoots;
-            for (var _i = 0, primarySearchPaths_1 = primarySearchPaths; _i < primarySearchPaths_1.length; _i++) {
-                var typeRoot = primarySearchPaths_1[_i];
-                var candidate = ts.combinePaths(typeRoot, typeReferenceDirectiveName);
-                var candidateDirectory = ts.getDirectoryPath(candidate);
-                var resolvedFile_1 = loadNodeModuleFromDirectory(typeReferenceExtensions, candidate, failedLookupLocations, !directoryProbablyExists(candidateDirectory, host), moduleResolutionState);
-                if (resolvedFile_1) {
-                    if (traceEnabled) {
-                        trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile_1, true);
-                    }
-                    return {
-                        resolvedTypeReferenceDirective: { primary: true, resolvedFileName: resolvedFile_1 },
-                        failedLookupLocations: failedLookupLocations
-                    };
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Root_directory_cannot_be_determined_skipping_primary_search_paths);
-            }
-        }
-        var resolvedFile;
-        var initialLocationForSecondaryLookup;
-        if (containingFile) {
-            initialLocationForSecondaryLookup = ts.getDirectoryPath(containingFile);
-        }
-        if (initialLocationForSecondaryLookup !== undefined) {
-            // check secondary locations
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
-            }
-            resolvedFile = loadModuleFromNodeModules(typeReferenceDirectiveName, initialLocationForSecondaryLookup, failedLookupLocations, moduleResolutionState);
-            if (traceEnabled) {
-                if (resolvedFile) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFile, false);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
-                }
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Containing_file_is_not_specified_and_root_directory_cannot_be_determined_skipping_lookup_in_node_modules_folder);
-            }
-        }
-        return {
-            resolvedTypeReferenceDirective: resolvedFile
-                ? { primary: false, resolvedFileName: resolvedFile }
-                : undefined,
-            failedLookupLocations: failedLookupLocations
-        };
-    }
-    ts.resolveTypeReferenceDirective = resolveTypeReferenceDirective;
-    function resolveModuleName(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        if (traceEnabled) {
-            trace(host, ts.Diagnostics.Resolving_module_0_from_1, moduleName, containingFile);
-        }
-        var moduleResolution = compilerOptions.moduleResolution;
-        if (moduleResolution === undefined) {
-            moduleResolution = ts.getEmitModuleKind(compilerOptions) === ts.ModuleKind.CommonJS ? ts.ModuleResolutionKind.NodeJs : ts.ModuleResolutionKind.Classic;
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Module_resolution_kind_is_not_specified_using_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        else {
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Explicitly_specified_module_resolution_kind_Colon_0, ts.ModuleResolutionKind[moduleResolution]);
-            }
-        }
-        var result;
-        switch (moduleResolution) {
-            case ts.ModuleResolutionKind.NodeJs:
-                result = nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-            case ts.ModuleResolutionKind.Classic:
-                result = classicNameResolver(moduleName, containingFile, compilerOptions, host);
-                break;
-        }
-        if (traceEnabled) {
-            if (result.resolvedModule) {
-                trace(host, ts.Diagnostics.Module_name_0_was_successfully_resolved_to_1, moduleName, result.resolvedModule.resolvedFileName);
-            }
-            else {
-                trace(host, ts.Diagnostics.Module_name_0_was_not_resolved, moduleName);
-            }
-        }
-        return result;
-    }
-    ts.resolveModuleName = resolveModuleName;
-    /**
-     * Any module resolution kind can be augmented with optional settings: 'baseUrl', 'paths' and 'rootDirs' - they are used to
-     * mitigate differences between design time structure of the project and its runtime counterpart so the same import name
-     * can be resolved successfully by TypeScript compiler and runtime module loader.
-     * If these settings are set then loading procedure will try to use them to resolve module name and it can of failure it will
-     * fallback to standard resolution routine.
-     *
-     * - baseUrl - this setting controls how non-relative module names are resolved. If this setting is specified then non-relative
-     * names will be resolved relative to baseUrl: i.e. if baseUrl is '/a/b' then candidate location to resolve module name 'c/d' will
-     * be '/a/b/c/d'
-     * - paths - this setting can only be used when baseUrl is specified. allows to tune how non-relative module names
-     * will be resolved based on the content of the module name.
-     * Structure of 'paths' compiler options
-     * 'paths': {
-     *    pattern-1: [...substitutions],
-     *    pattern-2: [...substitutions],
-     *    ...
-     *    pattern-n: [...substitutions]
-     * }
-     * Pattern here is a string that can contain zero or one '*' character. During module resolution module name will be matched against
-     * all patterns in the list. Matching for patterns that don't contain '*' means that module name must be equal to pattern respecting the case.
-     * If pattern contains '*' then to match pattern "<prefix>*<suffix>" module name must start with the <prefix> and end with <suffix>.
-     * <MatchedStar> denotes part of the module name between <prefix> and <suffix>.
-     * If module name can be matches with multiple patterns then pattern with the longest prefix will be picked.
-     * After selecting pattern we'll use list of substitutions to get candidate locations of the module and the try to load module
-     * from the candidate location.
-     * Substitution is a string that can contain zero or one '*'. To get candidate location from substitution we'll pick every
-     * substitution in the list and replace '*' with <MatchedStar> string. If candidate location is not rooted it
-     * will be converted to absolute using baseUrl.
-     * For example:
-     * baseUrl: /a/b/c
-     * "paths": {
-     *     // match all module names
-     *     "*": [
-     *         "*",        // use matched name as is,
-     *                     // <matched name> will be looked as /a/b/c/<matched name>
-     *
-     *         "folder1/*" // substitution will convert matched name to 'folder1/<matched name>',
-     *                     // since it is not rooted then final candidate location will be /a/b/c/folder1/<matched name>
-     *     ],
-     *     // match module names that start with 'components/'
-     *     "components/*": [ "/root/components/*" ] // substitution will convert /components/folder1/<matched name> to '/root/components/folder1/<matched name>',
-     *                                              // it is rooted so it will be final candidate location
-     * }
-     *
-     * 'rootDirs' allows the project to be spreaded across multiple locations and resolve modules with relative names as if
-     * they were in the same location. For example lets say there are two files
-     * '/local/src/content/file1.ts'
-     * '/shared/components/contracts/src/content/protocols/file2.ts'
-     * After bundling content of '/shared/components/contracts/src' will be merged with '/local/src' so
-     * if file1 has the following import 'import {x} from "./protocols/file2"' it will be resolved successfully in runtime.
-     * 'rootDirs' provides the way to tell compiler that in order to get the whole project it should behave as if content of all
-     * root dirs were merged together.
-     * I.e. for the example above 'rootDirs' will have two entries: [ '/local/src', '/shared/components/contracts/src' ].
-     * Compiler will first convert './protocols/file2' into absolute path relative to the location of containing file:
-     * '/local/src/content/protocols/file2' and try to load it - failure.
-     * Then it will search 'rootDirs' looking for a longest matching prefix of this absolute path and if such prefix is found - absolute path will
-     * be converted to a path relative to found rootDir entry './content/protocols/file2' (*). As a last step compiler will check all remaining
-     * entries in 'rootDirs', use them to build absolute path out of (*) and try to resolve module from this location.
-     */
-    function tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (moduleHasNonRelativeName(moduleName)) {
-            return tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state);
-        }
-        else {
-            return tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state);
-        }
-    }
-    function tryLoadModuleUsingRootDirs(moduleName, containingDirectory, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.rootDirs) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.rootDirs_option_is_set_using_it_to_resolve_relative_module_name_0, moduleName);
-        }
-        var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-        var matchedRootDir;
-        var matchedNormalizedPrefix;
-        for (var _i = 0, _a = state.compilerOptions.rootDirs; _i < _a.length; _i++) {
-            var rootDir = _a[_i];
-            // rootDirs are expected to be absolute
-            // in case of tsconfig.json this will happen automatically - compiler will expand relative names
-            // using location of tsconfig.json as base location
-            var normalizedRoot = ts.normalizePath(rootDir);
-            if (!ts.endsWith(normalizedRoot, ts.directorySeparator)) {
-                normalizedRoot += ts.directorySeparator;
-            }
-            var isLongestMatchingPrefix = ts.startsWith(candidate, normalizedRoot) &&
-                (matchedNormalizedPrefix === undefined || matchedNormalizedPrefix.length < normalizedRoot.length);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Checking_if_0_is_the_longest_matching_prefix_for_1_2, normalizedRoot, candidate, isLongestMatchingPrefix);
-            }
-            if (isLongestMatchingPrefix) {
-                matchedNormalizedPrefix = normalizedRoot;
-                matchedRootDir = rootDir;
-            }
-        }
-        if (matchedNormalizedPrefix) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Longest_matching_prefix_for_0_is_1, candidate, matchedNormalizedPrefix);
-            }
-            var suffix = candidate.substr(matchedNormalizedPrefix.length);
-            // first - try to load from a initial location
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, matchedNormalizedPrefix, candidate);
-            }
-            var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(containingDirectory, state.host), state);
-            if (resolvedFileName) {
-                return resolvedFileName;
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Trying_other_entries_in_rootDirs);
-            }
-            // then try to resolve using remaining entries in rootDirs
-            for (var _b = 0, _c = state.compilerOptions.rootDirs; _b < _c.length; _b++) {
-                var rootDir = _c[_b];
-                if (rootDir === matchedRootDir) {
-                    // skip the initially matched entry
-                    continue;
-                }
-                var candidate_1 = ts.combinePaths(ts.normalizePath(rootDir), suffix);
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Loading_0_from_the_root_dir_1_candidate_location_2, suffix, rootDir, candidate_1);
-                }
-                var baseDirectory = ts.getDirectoryPath(candidate_1);
-                var resolvedFileName_1 = loader(candidate_1, supportedExtensions, failedLookupLocations, !directoryProbablyExists(baseDirectory, state.host), state);
-                if (resolvedFileName_1) {
-                    return resolvedFileName_1;
-                }
-            }
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_resolution_using_rootDirs_has_failed);
-            }
-        }
-        return undefined;
-    }
-    function tryLoadModuleUsingBaseUrl(moduleName, loader, failedLookupLocations, supportedExtensions, state) {
-        if (!state.compilerOptions.baseUrl) {
-            return undefined;
-        }
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.baseUrl_option_is_set_to_0_using_this_value_to_resolve_non_relative_module_name_1, state.compilerOptions.baseUrl, moduleName);
-        }
-        // string is for exact match
-        var matchedPattern = undefined;
-        if (state.compilerOptions.paths) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.paths_option_is_specified_looking_for_a_pattern_to_match_module_name_0, moduleName);
-            }
-            matchedPattern = matchPatternOrExact(ts.getKeys(state.compilerOptions.paths), moduleName);
-        }
-        if (matchedPattern) {
-            var matchedStar = typeof matchedPattern === "string" ? undefined : matchedText(matchedPattern, moduleName);
-            var matchedPatternText = typeof matchedPattern === "string" ? matchedPattern : patternText(matchedPattern);
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Module_name_0_matched_pattern_1, moduleName, matchedPatternText);
-            }
-            for (var _i = 0, _a = state.compilerOptions.paths[matchedPatternText]; _i < _a.length; _i++) {
-                var subst = _a[_i];
-                var path = matchedStar ? subst.replace("*", matchedStar) : subst;
-                var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, path));
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.Trying_substitution_0_candidate_module_location_Colon_1, subst, path);
-                }
-                var resolvedFileName = loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-                if (resolvedFileName) {
-                    return resolvedFileName;
-                }
-            }
-            return undefined;
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(state.compilerOptions.baseUrl, moduleName));
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Resolving_module_name_0_relative_to_base_url_1_2, moduleName, state.compilerOptions.baseUrl, candidate);
-            }
-            return loader(candidate, supportedExtensions, failedLookupLocations, !directoryProbablyExists(ts.getDirectoryPath(candidate), state.host), state);
-        }
-    }
-    /**
-     * patternStrings contains both pattern strings (containing "*") and regular strings.
-     * Return an exact match if possible, or a pattern match, or undefined.
-     * (These are verified by verifyCompilerOptions to have 0 or 1 "*" characters.)
-     */
-    function matchPatternOrExact(patternStrings, candidate) {
-        var patterns = [];
-        for (var _i = 0, patternStrings_1 = patternStrings; _i < patternStrings_1.length; _i++) {
-            var patternString = patternStrings_1[_i];
-            var pattern = tryParsePattern(patternString);
-            if (pattern) {
-                patterns.push(pattern);
-            }
-            else if (patternString === candidate) {
-                // pattern was matched as is - no need to search further
-                return patternString;
-            }
-        }
-        return findBestPatternMatch(patterns, function (_) { return _; }, candidate);
-    }
-    function patternText(_a) {
-        var prefix = _a.prefix, suffix = _a.suffix;
-        return prefix + "*" + suffix;
-    }
-    /**
-     * Given that candidate matches pattern, returns the text matching the '*'.
-     * E.g.: matchedText(tryParsePattern("foo*baz"), "foobarbaz") === "bar"
-     */
-    function matchedText(pattern, candidate) {
-        ts.Debug.assert(isPatternMatch(pattern, candidate));
-        return candidate.substr(pattern.prefix.length, candidate.length - pattern.suffix.length);
-    }
-    /** Return the object corresponding to the best pattern to match `candidate`. */
-    /* @internal */
-    function findBestPatternMatch(values, getPattern, candidate) {
-        var matchedValue = undefined;
-        // use length of prefix as betterness criteria
-        var longestMatchPrefixLength = -1;
-        for (var _i = 0, values_1 = values; _i < values_1.length; _i++) {
-            var v = values_1[_i];
-            var pattern = getPattern(v);
-            if (isPatternMatch(pattern, candidate) && pattern.prefix.length > longestMatchPrefixLength) {
-                longestMatchPrefixLength = pattern.prefix.length;
-                matchedValue = v;
-            }
-        }
-        return matchedValue;
-    }
-    ts.findBestPatternMatch = findBestPatternMatch;
-    function isPatternMatch(_a, candidate) {
-        var prefix = _a.prefix, suffix = _a.suffix;
-        return candidate.length >= prefix.length + suffix.length &&
-            ts.startsWith(candidate, prefix) &&
-            ts.endsWith(candidate, suffix);
-    }
-    /* @internal */
-    function tryParsePattern(pattern) {
-        // This should be verified outside of here and a proper error thrown.
-        ts.Debug.assert(hasZeroOrOneAsteriskCharacter(pattern));
-        var indexOfStar = pattern.indexOf("*");
-        return indexOfStar === -1 ? undefined : {
-            prefix: pattern.substr(0, indexOfStar),
-            suffix: pattern.substr(indexOfStar + 1)
-        };
-    }
-    ts.tryParsePattern = tryParsePattern;
-    function nodeModuleNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: false };
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, nodeLoadModuleByRelativeName, failedLookupLocations, supportedExtensions, state);
-        var isExternalLibraryImport = false;
-        if (!resolvedFileName) {
-            if (moduleHasNonRelativeName(moduleName)) {
-                if (traceEnabled) {
-                    trace(host, ts.Diagnostics.Loading_module_0_from_node_modules_folder, moduleName);
-                }
-                resolvedFileName = loadModuleFromNodeModules(moduleName, containingDirectory, failedLookupLocations, state);
-                isExternalLibraryImport = resolvedFileName !== undefined;
-            }
-            else {
-                var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                resolvedFileName = nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-            }
-        }
-        if (resolvedFileName && host.realpath) {
-            var originalFileName = resolvedFileName;
-            resolvedFileName = ts.normalizePath(host.realpath(resolvedFileName));
-            if (traceEnabled) {
-                trace(host, ts.Diagnostics.Resolving_real_path_for_0_result_1, originalFileName, resolvedFileName);
-            }
-        }
-        return createResolvedModule(resolvedFileName, isExternalLibraryImport, failedLookupLocations);
-    }
-    ts.nodeModuleNameResolver = nodeModuleNameResolver;
-    function nodeLoadModuleByRelativeName(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state) {
-        if (state.traceEnabled) {
-            trace(state.host, ts.Diagnostics.Loading_module_as_file_Slash_folder_candidate_module_location_0, candidate);
-        }
-        var resolvedFileName = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, onlyRecordFailures, state);
-        return resolvedFileName || loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, onlyRecordFailures, state);
-    }
-    /* @internal */
-    function directoryProbablyExists(directoryName, host) {
-        // if host does not support 'directoryExists' assume that directory will exist
-        return !host.directoryExists || host.directoryExists(directoryName);
-    }
-    ts.directoryProbablyExists = directoryProbablyExists;
-    /**
-     * @param {boolean} onlyRecordFailures - if true then function won't try to actually load files but instead record all attempts as failures. This flag is necessary
-     * in cases when we know upfront that all load attempts will fail (because containing folder does not exists) however we still need to record all failed lookup locations.
-     */
-    function loadModuleFromFile(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        // First try to keep/add an extension: importing "./foo.ts" can be matched by a file "./foo.ts", and "./foo" by "./foo.d.ts"
-        var resolvedByAddingOrKeepingExtension = loadModuleFromFileWorker(candidate, extensions, failedLookupLocation, onlyRecordFailures, state);
-        if (resolvedByAddingOrKeepingExtension) {
-            return resolvedByAddingOrKeepingExtension;
-        }
-        // Then try stripping a ".js" or ".jsx" extension and replacing it with a TypeScript one, e.g. "./foo.js" can be matched by "./foo.ts" or "./foo.d.ts"
-        if (ts.hasJavaScriptFileExtension(candidate)) {
-            var extensionless = ts.removeFileExtension(candidate);
-            if (state.traceEnabled) {
-                var extension = candidate.substring(extensionless.length);
-                trace(state.host, ts.Diagnostics.File_name_0_has_a_1_extension_stripping_it, candidate, extension);
-            }
-            return loadModuleFromFileWorker(extensionless, extensions, failedLookupLocation, onlyRecordFailures, state);
-        }
-    }
-    function loadModuleFromFileWorker(candidate, extensions, failedLookupLocation, onlyRecordFailures, state) {
-        if (!onlyRecordFailures) {
-            // check if containing folder exists - if it doesn't then just record failures for all supported extensions without disk probing
-            var directory = ts.getDirectoryPath(candidate);
-            if (directory) {
-                onlyRecordFailures = !directoryProbablyExists(directory, state.host);
-            }
-        }
-        return ts.forEach(extensions, tryLoad);
-        function tryLoad(ext) {
-            if (state.skipTsx && ts.isJsxOrTsxExtension(ext)) {
-                return undefined;
-            }
-            var fileName = ts.fileExtensionIs(candidate, ext) ? candidate : candidate + ext;
-            if (!onlyRecordFailures && state.host.fileExists(fileName)) {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.File_0_exist_use_it_as_a_name_resolution_result, fileName);
-                }
-                return fileName;
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.File_0_does_not_exist, fileName);
-                }
-                failedLookupLocation.push(fileName);
-                return undefined;
-            }
-        }
-    }
-    function loadNodeModuleFromDirectory(extensions, candidate, failedLookupLocation, onlyRecordFailures, state) {
-        var packageJsonPath = ts.combinePaths(candidate, "package.json");
-        var directoryExists = !onlyRecordFailures && directoryProbablyExists(candidate, state.host);
-        if (directoryExists && state.host.fileExists(packageJsonPath)) {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
-            }
-            var typesFile = tryReadTypesSection(packageJsonPath, candidate, state);
-            if (typesFile) {
-                var result = loadModuleFromFile(typesFile, extensions, failedLookupLocation, !directoryProbablyExists(ts.getDirectoryPath(typesFile), state.host), state);
-                if (result) {
-                    return result;
-                }
-            }
-            else {
-                if (state.traceEnabled) {
-                    trace(state.host, ts.Diagnostics.package_json_does_not_have_types_field);
-                }
-            }
-        }
-        else {
-            if (state.traceEnabled) {
-                trace(state.host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
-            }
-            // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
-            failedLookupLocation.push(packageJsonPath);
-        }
-        return loadModuleFromFile(ts.combinePaths(candidate, "index"), extensions, failedLookupLocation, !directoryExists, state);
-    }
-    function loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state) {
-        var nodeModulesFolder = ts.combinePaths(directory, "node_modules");
-        var nodeModulesFolderExists = directoryProbablyExists(nodeModulesFolder, state.host);
-        var candidate = ts.normalizePath(ts.combinePaths(nodeModulesFolder, moduleName));
-        var supportedExtensions = ts.getSupportedExtensions(state.compilerOptions);
-        var result = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-        result = loadNodeModuleFromDirectory(supportedExtensions, candidate, failedLookupLocations, !nodeModulesFolderExists, state);
-        if (result) {
-            return result;
-        }
-    }
-    function loadModuleFromNodeModules(moduleName, directory, failedLookupLocations, state) {
-        directory = ts.normalizeSlashes(directory);
-        while (true) {
-            var baseName = ts.getBaseFileName(directory);
-            if (baseName !== "node_modules") {
-                // Try to load source from the package
-                var packageResult = loadModuleFromNodeModulesFolder(moduleName, directory, failedLookupLocations, state);
-                if (packageResult && ts.hasTypeScriptFileExtension(packageResult)) {
-                    // Always prefer a TypeScript (.ts, .tsx, .d.ts) file shipped with the package
-                    return packageResult;
-                }
-                else {
-                    // Else prefer a types package over non-TypeScript results (e.g. JavaScript files)
-                    var typesResult = loadModuleFromNodeModulesFolder(ts.combinePaths("@types", moduleName), directory, failedLookupLocations, state);
-                    if (typesResult || packageResult) {
-                        return typesResult || packageResult;
-                    }
-                }
-            }
-            var parentPath = ts.getDirectoryPath(directory);
-            if (parentPath === directory) {
-                break;
-            }
-            directory = parentPath;
-        }
-        return undefined;
-    }
-    function classicNameResolver(moduleName, containingFile, compilerOptions, host) {
-        var traceEnabled = isTraceEnabled(compilerOptions, host);
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, skipTsx: !compilerOptions.jsx };
-        var failedLookupLocations = [];
-        var supportedExtensions = ts.getSupportedExtensions(compilerOptions);
-        var containingDirectory = ts.getDirectoryPath(containingFile);
-        var resolvedFileName = tryLoadModuleUsingOptionalResolutionSettings(moduleName, containingDirectory, loadModuleFromFile, failedLookupLocations, supportedExtensions, state);
-        if (resolvedFileName) {
-            return createResolvedModule(resolvedFileName, /*isExternalLibraryImport*/ false, failedLookupLocations);
-        }
-        var referencedSourceFile;
-        if (moduleHasNonRelativeName(moduleName)) {
-            while (true) {
-                var searchName = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-                referencedSourceFile = loadModuleFromFile(searchName, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-                if (referencedSourceFile) {
-                    break;
-                }
-                var parentPath = ts.getDirectoryPath(containingDirectory);
-                if (parentPath === containingDirectory) {
-                    break;
-                }
-                containingDirectory = parentPath;
-            }
-        }
-        else {
-            var candidate = ts.normalizePath(ts.combinePaths(containingDirectory, moduleName));
-            referencedSourceFile = loadModuleFromFile(candidate, supportedExtensions, failedLookupLocations, /*onlyRecordFailures*/ false, state);
-        }
-        return referencedSourceFile
-            ? { resolvedModule: { resolvedFileName: referencedSourceFile }, failedLookupLocations: failedLookupLocations }
-            : { resolvedModule: undefined, failedLookupLocations: failedLookupLocations };
-    }
-    ts.classicNameResolver = classicNameResolver;
-    /* @internal */
-    ts.defaultInitCompilerOptions = {
-        module: ts.ModuleKind.CommonJS,
-        target: 1 /* ES5 */,
-        noImplicitAny: false,
-        sourceMap: false
-    };
-    function createCompilerHost(options, setParentNodes) {
-        var existingDirectories = {};
-        function getCanonicalFileName(fileName) {
-            // if underlying system can distinguish between two files whose names differs only in cases then file name already in canonical form.
-            // otherwise use toLowerCase as a canonical form.
-            return ts.sys.useCaseSensitiveFileNames ? fileName : fileName.toLowerCase();
-        }
-        // returned by CScript sys environment
-        var unsupportedFileEncodingErrorCode = -2147024809;
-        function getSourceFile(fileName, languageVersion, onError) {
-            var text;
-            try {
-                var start = new Date().getTime();
-                text = ts.sys.readFile(fileName, options.charset);
-                ts.ioReadTime += new Date().getTime() - start;
-            }
-            catch (e) {
-                if (onError) {
-                    onError(e.number === unsupportedFileEncodingErrorCode
-                        ? ts.createCompilerDiagnostic(ts.Diagnostics.Unsupported_file_encoding).messageText
-                        : e.message);
-                }
-                text = "";
-            }
-            return text !== undefined ? ts.createSourceFile(fileName, text, languageVersion, setParentNodes) : undefined;
-        }
-        function directoryExists(directoryPath) {
-            if (ts.hasProperty(existingDirectories, directoryPath)) {
-                return true;
-            }
-            if (ts.sys.directoryExists(directoryPath)) {
-                existingDirectories[directoryPath] = true;
-                return true;
-            }
-            return false;
-        }
-        function ensureDirectoriesExist(directoryPath) {
-            if (directoryPath.length > ts.getRootLength(directoryPath) && !directoryExists(directoryPath)) {
-                var parentDirectory = ts.getDirectoryPath(directoryPath);
-                ensureDirectoriesExist(parentDirectory);
-                ts.sys.createDirectory(directoryPath);
-            }
-        }
-        var outputFingerprints;
-        function writeFileIfUpdated(fileName, data, writeByteOrderMark) {
-            if (!outputFingerprints) {
-                outputFingerprints = {};
-            }
-            var hash = ts.sys.createHash(data);
-            var mtimeBefore = ts.sys.getModifiedTime(fileName);
-            if (mtimeBefore && ts.hasProperty(outputFingerprints, fileName)) {
-                var fingerprint = outputFingerprints[fileName];
-                // If output has not been changed, and the file has no external modification
-                if (fingerprint.byteOrderMark === writeByteOrderMark &&
-                    fingerprint.hash === hash &&
-                    fingerprint.mtime.getTime() === mtimeBefore.getTime()) {
-                    return;
-                }
-            }
-            ts.sys.writeFile(fileName, data, writeByteOrderMark);
-            var mtimeAfter = ts.sys.getModifiedTime(fileName);
-            outputFingerprints[fileName] = {
-                hash: hash,
-                byteOrderMark: writeByteOrderMark,
-                mtime: mtimeAfter
-            };
-        }
-        function writeFile(fileName, data, writeByteOrderMark, onError) {
-            try {
-                var start = new Date().getTime();
-                ensureDirectoriesExist(ts.getDirectoryPath(ts.normalizePath(fileName)));
-                if (ts.isWatchSet(options) && ts.sys.createHash && ts.sys.getModifiedTime) {
-                    writeFileIfUpdated(fileName, data, writeByteOrderMark);
-                }
-                else {
-                    ts.sys.writeFile(fileName, data, writeByteOrderMark);
-                }
-                ts.ioWriteTime += new Date().getTime() - start;
-            }
-            catch (e) {
-                if (onError) {
-                    onError(e.message);
-                }
-            }
-        }
-        function getDefaultLibLocation() {
-            return ts.getDirectoryPath(ts.normalizePath(ts.sys.getExecutingFilePath()));
-        }
-        var newLine = ts.getNewLineCharacter(options);
-        var realpath = ts.sys.realpath && (function (path) { return ts.sys.realpath(path); });
-        return {
-            getSourceFile: getSourceFile,
-            getDefaultLibLocation: getDefaultLibLocation,
-            getDefaultLibFileName: function (options) { return ts.combinePaths(getDefaultLibLocation(), ts.getDefaultLibFileName(options)); },
-            writeFile: writeFile,
-            getCurrentDirectory: ts.memoize(function () { return ts.sys.getCurrentDirectory(); }),
-            useCaseSensitiveFileNames: function () { return ts.sys.useCaseSensitiveFileNames; },
-            getCanonicalFileName: getCanonicalFileName,
-            getNewLine: function () { return newLine; },
-            fileExists: function (fileName) { return ts.sys.fileExists(fileName); },
-            readFile: function (fileName) { return ts.sys.readFile(fileName); },
-            trace: function (s) { return ts.sys.write(s + newLine); },
-            directoryExists: function (directoryName) { return ts.sys.directoryExists(directoryName); },
-            getDirectories: function (path) { return ts.sys.getDirectories(path); },
-            realpath: realpath
-        };
-    }
-    ts.createCompilerHost = createCompilerHost;
-    function getPreEmitDiagnostics(program, sourceFile, cancellationToken) {
-        var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
-        if (program.getCompilerOptions().declaration) {
-            diagnostics = diagnostics.concat(program.getDeclarationDiagnostics(sourceFile, cancellationToken));
-        }
-        return ts.sortAndDeduplicateDiagnostics(diagnostics);
-    }
-    ts.getPreEmitDiagnostics = getPreEmitDiagnostics;
-    function flattenDiagnosticMessageText(messageText, newLine) {
-        if (typeof messageText === "string") {
-            return messageText;
-        }
-        else {
-            var diagnosticChain = messageText;
-            var result = "";
-            var indent = 0;
-            while (diagnosticChain) {
-                if (indent) {
-                    result += newLine;
-                    for (var i = 0; i < indent; i++) {
-                        result += "  ";
-                    }
-                }
-                result += diagnosticChain.messageText;
-                indent++;
-                diagnosticChain = diagnosticChain.next;
-            }
-            return result;
-        }
-    }
-    ts.flattenDiagnosticMessageText = flattenDiagnosticMessageText;
-    function loadWithLocalCache(names, containingFile, loader) {
-        if (names.length === 0) {
-            return [];
-        }
-        var resolutions = [];
-        var cache = {};
-        for (var _i = 0, names_1 = names; _i < names_1.length; _i++) {
-            var name_34 = names_1[_i];
-            var result = void 0;
-            if (ts.hasProperty(cache, name_34)) {
-                result = cache[name_34];
-            }
-            else {
-                result = loader(name_34, containingFile);
-                cache[name_34] = result;
-            }
-            resolutions.push(result);
-        }
-        return resolutions;
-    }
-    function getInferredTypesRoot(options, rootFiles, host) {
-        return computeCommonSourceDirectoryOfFilenames(rootFiles, host.getCurrentDirectory(), function (f) { return host.getCanonicalFileName(f); });
-    }
-    /**
-      * Given a set of options and a set of root files, returns the set of type directive names
-      *   that should be included for this program automatically.
-      * This list could either come from the config file,
-      *   or from enumerating the types root + initial secondary types lookup location.
-      * More type directives might appear in the program later as a result of loading actual source files;
-      *   this list is only the set of defaults that are implicitly included.
-      */
-    function getAutomaticTypeDirectiveNames(options, rootFiles, host) {
-        // Use explicit type list from tsconfig.json
-        if (options.types) {
-            return options.types;
-        }
-        // Walk the primary type lookup locations
-        var result = [];
-        if (host.directoryExists && host.getDirectories) {
-            var typeRoots = getEffectiveTypeRoots(options, host);
-            if (typeRoots) {
-                for (var _i = 0, typeRoots_1 = typeRoots; _i < typeRoots_1.length; _i++) {
-                    var root = typeRoots_1[_i];
-                    if (host.directoryExists(root)) {
-                        result = result.concat(host.getDirectories(root));
-                    }
-                }
-            }
-        }
-        return result;
-    }
-    ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createProgram(rootNames, options, host, oldProgram) {
-        var program;
-        var files = [];
-        var commonSourceDirectory;
-        var diagnosticsProducingTypeChecker;
-        var noDiagnosticsTypeChecker;
-        var classifiableNames;
-        var resolvedTypeReferenceDirectives = {};
-        var fileProcessingDiagnostics = ts.createDiagnosticCollection();
-        // The below settings are to track if a .js file should be add to the program if loaded via searching under node_modules.
-        // This works as imported modules are discovered recursively in a depth first manner, specifically:
-        // - For each root file, findSourceFile is called.
-        // - This calls processImportedModules for each module imported in the source file.
-        // - This calls resolveModuleNames, and then calls findSourceFile for each resolved module.
-        // As all these operations happen - and are nested - within the createProgram call, they close over the below variables.
-        // The current resolution depth is tracked by incrementing/decrementing as the depth first search progresses.
-        var maxNodeModulesJsDepth = typeof options.maxNodeModuleJsDepth === "number" ? options.maxNodeModuleJsDepth : 2;
-        var currentNodeModulesJsDepth = 0;
-        // If a module has some of its imports skipped due to being at the depth limit under node_modules, then track
-        // this, as it may be imported at a shallower depth later, and then it will need its skipped imports processed.
-        var modulesWithElidedImports = {};
-        // Track source files that are JavaScript files found by searching under node_modules, as these shouldn't be compiled.
-        var sourceFilesFoundSearchingNodeModules = {};
-        var start = new Date().getTime();
-        host = host || createCompilerHost(options);
-        var skipDefaultLib = options.noLib;
-        var programDiagnostics = ts.createDiagnosticCollection();
-        var currentDirectory = host.getCurrentDirectory();
-        var supportedExtensions = ts.getSupportedExtensions(options);
-        // Map storing if there is emit blocking diagnostics for given input
-        var hasEmitBlockingDiagnostics = ts.createFileMap(getCanonicalFileName);
-        var resolveModuleNamesWorker;
-        if (host.resolveModuleNames) {
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
-        }
-        else {
-            var loader_1 = function (moduleName, containingFile) { return resolveModuleName(moduleName, containingFile, options, host).resolvedModule; };
-            resolveModuleNamesWorker = function (moduleNames, containingFile) { return loadWithLocalCache(moduleNames, containingFile, loader_1); };
-        }
-        var resolveTypeReferenceDirectiveNamesWorker;
-        if (host.resolveTypeReferenceDirectives) {
-            resolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile) { return host.resolveTypeReferenceDirectives(typeDirectiveNames, containingFile); };
-        }
-        else {
-            var loader_2 = function (typesRef, containingFile) { return resolveTypeReferenceDirective(typesRef, containingFile, options, host).resolvedTypeReferenceDirective; };
-            resolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile) { return loadWithLocalCache(typeReferenceDirectiveNames, containingFile, loader_2); };
-        }
-        var filesByName = ts.createFileMap();
-        // stores 'filename -> file association' ignoring case
-        // used to track cases when two file names differ only in casing
-        var filesByNameIgnoreCase = host.useCaseSensitiveFileNames() ? ts.createFileMap(function (fileName) { return fileName.toLowerCase(); }) : undefined;
-        if (!tryReuseStructureFromOldProgram()) {
-            ts.forEach(rootNames, function (name) { return processRootFile(name, /*isDefaultLib*/ false); });
-            // load type declarations specified via 'types' argument or implicitly from types/ and node_modules/@types folders
-            var typeReferences = getAutomaticTypeDirectiveNames(options, rootNames, host);
-            if (typeReferences) {
-                var inferredRoot = getInferredTypesRoot(options, rootNames, host);
-                var containingFilename = ts.combinePaths(inferredRoot, "__inferred type names__.ts");
-                var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeReferences, containingFilename);
-                for (var i = 0; i < typeReferences.length; i++) {
-                    processTypeReferenceDirective(typeReferences[i], resolutions[i]);
-                }
-            }
-            // Do not process the default library if:
-            //  - The '--noLib' flag is used.
-            //  - A 'no-default-lib' reference comment is encountered in
-            //      processing the root files.
-            if (!skipDefaultLib) {
-                // If '--lib' is not specified, include default library file according to '--target'
-                // otherwise, using options specified in '--lib' instead of '--target' default library file
-                if (!options.lib) {
-                    processRootFile(host.getDefaultLibFileName(options), /*isDefaultLib*/ true);
-                }
-                else {
-                    var libDirectory_1 = host.getDefaultLibLocation ? host.getDefaultLibLocation() : ts.getDirectoryPath(host.getDefaultLibFileName(options));
-                    ts.forEach(options.lib, function (libFileName) {
-                        processRootFile(ts.combinePaths(libDirectory_1, libFileName), /*isDefaultLib*/ true);
-                    });
-                }
-            }
-        }
-        // unconditionally set oldProgram to undefined to prevent it from being captured in closure
-        oldProgram = undefined;
-        program = {
-            getRootFileNames: function () { return rootNames; },
-            getSourceFile: getSourceFile,
-            getSourceFileByPath: getSourceFileByPath,
-            getSourceFiles: function () { return files; },
-            getCompilerOptions: function () { return options; },
-            getSyntacticDiagnostics: getSyntacticDiagnostics,
-            getOptionsDiagnostics: getOptionsDiagnostics,
-            getGlobalDiagnostics: getGlobalDiagnostics,
-            getSemanticDiagnostics: getSemanticDiagnostics,
-            getDeclarationDiagnostics: getDeclarationDiagnostics,
-            getTypeChecker: getTypeChecker,
-            getClassifiableNames: getClassifiableNames,
-            getDiagnosticsProducingTypeChecker: getDiagnosticsProducingTypeChecker,
-            getCommonSourceDirectory: getCommonSourceDirectory,
-            emit: emit,
-            getCurrentDirectory: function () { return currentDirectory; },
-            getNodeCount: function () { return getDiagnosticsProducingTypeChecker().getNodeCount(); },
-            getIdentifierCount: function () { return getDiagnosticsProducingTypeChecker().getIdentifierCount(); },
-            getSymbolCount: function () { return getDiagnosticsProducingTypeChecker().getSymbolCount(); },
-            getTypeCount: function () { return getDiagnosticsProducingTypeChecker().getTypeCount(); },
-            getFileProcessingDiagnostics: function () { return fileProcessingDiagnostics; },
-            getResolvedTypeReferenceDirectives: function () { return resolvedTypeReferenceDirectives; }
-        };
-        verifyCompilerOptions();
-        ts.programTime += new Date().getTime() - start;
-        return program;
-        function getCommonSourceDirectory() {
-            if (typeof commonSourceDirectory === "undefined") {
-                if (options.rootDir && checkSourceFilesBelongToPath(files, options.rootDir)) {
-                    // If a rootDir is specified and is valid use it as the commonSourceDirectory
-                    commonSourceDirectory = ts.getNormalizedAbsolutePath(options.rootDir, currentDirectory);
-                }
-                else {
-                    commonSourceDirectory = computeCommonSourceDirectory(files);
-                }
-                if (commonSourceDirectory && commonSourceDirectory[commonSourceDirectory.length - 1] !== ts.directorySeparator) {
-                    // Make sure directory path ends with directory separator so this string can directly
-                    // used to replace with "" to get the relative path of the source file and the relative path doesn't
-                    // start with / making it rooted path
-                    commonSourceDirectory += ts.directorySeparator;
-                }
-            }
-            return commonSourceDirectory;
-        }
-        function getClassifiableNames() {
-            if (!classifiableNames) {
-                // Initialize a checker so that all our files are bound.
-                getTypeChecker();
-                classifiableNames = {};
-                for (var _i = 0, files_2 = files; _i < files_2.length; _i++) {
-                    var sourceFile = files_2[_i];
-                    ts.copyMap(sourceFile.classifiableNames, classifiableNames);
-                }
-            }
-            return classifiableNames;
-        }
-        function tryReuseStructureFromOldProgram() {
-            if (!oldProgram) {
-                return false;
-            }
-            // check properties that can affect structure of the program or module resolution strategy
-            // if any of these properties has changed - structure cannot be reused
-            var oldOptions = oldProgram.getCompilerOptions();
-            if ((oldOptions.module !== options.module) ||
-                (oldOptions.moduleResolution !== options.moduleResolution) ||
-                (oldOptions.noResolve !== options.noResolve) ||
-                (oldOptions.target !== options.target) ||
-                (oldOptions.noLib !== options.noLib) ||
-                (oldOptions.jsx !== options.jsx) ||
-                (oldOptions.allowJs !== options.allowJs) ||
-                (oldOptions.rootDir !== options.rootDir) ||
-                (oldOptions.configFilePath !== options.configFilePath) ||
-                (oldOptions.baseUrl !== options.baseUrl) ||
-                (oldOptions.maxNodeModuleJsDepth !== options.maxNodeModuleJsDepth) ||
-                !ts.arrayIsEqualTo(oldOptions.typeRoots, oldOptions.typeRoots) ||
-                !ts.arrayIsEqualTo(oldOptions.rootDirs, options.rootDirs) ||
-                !ts.mapIsEqualTo(oldOptions.paths, options.paths)) {
-                return false;
-            }
-            ts.Debug.assert(!oldProgram.structureIsReused);
-            // there is an old program, check if we can reuse its structure
-            var oldRootNames = oldProgram.getRootFileNames();
-            if (!ts.arrayIsEqualTo(oldRootNames, rootNames)) {
-                return false;
-            }
-            if (!ts.arrayIsEqualTo(options.types, oldOptions.types)) {
-                return false;
-            }
-            // check if program source files has changed in the way that can affect structure of the program
-            var newSourceFiles = [];
-            var filePaths = [];
-            var modifiedSourceFiles = [];
-            for (var _i = 0, _a = oldProgram.getSourceFiles(); _i < _a.length; _i++) {
-                var oldSourceFile = _a[_i];
-                var newSourceFile = host.getSourceFileByPath
-                    ? host.getSourceFileByPath(oldSourceFile.fileName, oldSourceFile.path, options.target)
-                    : host.getSourceFile(oldSourceFile.fileName, options.target);
-                if (!newSourceFile) {
-                    return false;
-                }
-                newSourceFile.path = oldSourceFile.path;
-                filePaths.push(newSourceFile.path);
-                if (oldSourceFile !== newSourceFile) {
-                    if (oldSourceFile.hasNoDefaultLib !== newSourceFile.hasNoDefaultLib) {
-                        // value of no-default-lib has changed
-                        // this will affect if default library is injected into the list of files
-                        return false;
-                    }
-                    // check tripleslash references
-                    if (!ts.arrayIsEqualTo(oldSourceFile.referencedFiles, newSourceFile.referencedFiles, fileReferenceIsEqualTo)) {
-                        // tripleslash references has changed
-                        return false;
-                    }
-                    // check imports and module augmentations
-                    collectExternalModuleReferences(newSourceFile);
-                    if (!ts.arrayIsEqualTo(oldSourceFile.imports, newSourceFile.imports, moduleNameIsEqualTo)) {
-                        // imports has changed
-                        return false;
-                    }
-                    if (!ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations, moduleNameIsEqualTo)) {
-                        // moduleAugmentations has changed
-                        return false;
-                    }
-                    if (!ts.arrayIsEqualTo(oldSourceFile.typeReferenceDirectives, newSourceFile.typeReferenceDirectives, fileReferenceIsEqualTo)) {
-                        // 'types' references has changed
-                        return false;
-                    }
-                    var newSourceFilePath = ts.getNormalizedAbsolutePath(newSourceFile.fileName, currentDirectory);
-                    if (resolveModuleNamesWorker) {
-                        var moduleNames = ts.map(ts.concatenate(newSourceFile.imports, newSourceFile.moduleAugmentations), getTextOfLiteral);
-                        var resolutions = resolveModuleNamesWorker(moduleNames, newSourceFilePath);
-                        // ensure that module resolution results are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(moduleNames, resolutions, oldSourceFile.resolvedModules, ts.moduleResolutionIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    if (resolveTypeReferenceDirectiveNamesWorker) {
-                        var typesReferenceDirectives = ts.map(newSourceFile.typeReferenceDirectives, function (x) { return x.fileName; });
-                        var resolutions = resolveTypeReferenceDirectiveNamesWorker(typesReferenceDirectives, newSourceFilePath);
-                        // ensure that types resolutions are still correct
-                        var resolutionsChanged = ts.hasChangesInResolutions(typesReferenceDirectives, resolutions, oldSourceFile.resolvedTypeReferenceDirectiveNames, ts.typeDirectiveIsEqualTo);
-                        if (resolutionsChanged) {
-                            return false;
-                        }
-                    }
-                    // pass the cache of module/types resolutions from the old source file
-                    newSourceFile.resolvedModules = oldSourceFile.resolvedModules;
-                    newSourceFile.resolvedTypeReferenceDirectiveNames = oldSourceFile.resolvedTypeReferenceDirectiveNames;
-                    modifiedSourceFiles.push(newSourceFile);
-                }
-                else {
-                    // file has no changes - use it as is
-                    newSourceFile = oldSourceFile;
-                }
-                // if file has passed all checks it should be safe to reuse it
-                newSourceFiles.push(newSourceFile);
-            }
-            // update fileName -> file mapping
-            for (var i = 0, len = newSourceFiles.length; i < len; i++) {
-                filesByName.set(filePaths[i], newSourceFiles[i]);
-            }
-            files = newSourceFiles;
-            fileProcessingDiagnostics = oldProgram.getFileProcessingDiagnostics();
-            for (var _b = 0, modifiedSourceFiles_1 = modifiedSourceFiles; _b < modifiedSourceFiles_1.length; _b++) {
-                var modifiedFile = modifiedSourceFiles_1[_b];
-                fileProcessingDiagnostics.reattachFileDiagnostics(modifiedFile);
-            }
-            resolvedTypeReferenceDirectives = oldProgram.getResolvedTypeReferenceDirectives();
-            oldProgram.structureIsReused = true;
-            return true;
-        }
-        function getEmitHost(writeFileCallback) {
-            return {
-                getCanonicalFileName: getCanonicalFileName,
-                getCommonSourceDirectory: program.getCommonSourceDirectory,
-                getCompilerOptions: program.getCompilerOptions,
-                getCurrentDirectory: function () { return currentDirectory; },
-                getNewLine: function () { return host.getNewLine(); },
-                getSourceFile: program.getSourceFile,
-                getSourceFileByPath: program.getSourceFileByPath,
-                getSourceFiles: program.getSourceFiles,
-                isSourceFileFromExternalLibrary: function (file) { return !!ts.lookUp(sourceFilesFoundSearchingNodeModules, file.path); },
-                writeFile: writeFileCallback || (function (fileName, data, writeByteOrderMark, onError, sourceFiles) { return host.writeFile(fileName, data, writeByteOrderMark, onError, sourceFiles); }),
-                isEmitBlocked: isEmitBlocked
-            };
-        }
-        function getDiagnosticsProducingTypeChecker() {
-            return diagnosticsProducingTypeChecker || (diagnosticsProducingTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ true));
-        }
-        function getTypeChecker() {
-            return noDiagnosticsTypeChecker || (noDiagnosticsTypeChecker = ts.createTypeChecker(program, /*produceDiagnostics:*/ false));
-        }
-        function emit(sourceFile, writeFileCallback, cancellationToken) {
-            var _this = this;
-            return runWithCancellationToken(function () { return emitWorker(_this, sourceFile, writeFileCallback, cancellationToken); });
-        }
-        function isEmitBlocked(emitFileName) {
-            return hasEmitBlockingDiagnostics.contains(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName));
-        }
-        function emitWorker(program, sourceFile, writeFileCallback, cancellationToken) {
-            var declarationDiagnostics = [];
-            if (options.noEmit) {
-                return { diagnostics: declarationDiagnostics, sourceMaps: undefined, emittedFiles: undefined, emitSkipped: true };
-            }
-            // If the noEmitOnError flag is set, then check if we have any errors so far.  If so,
-            // immediately bail out.  Note that we pass 'undefined' for 'sourceFile' so that we
-            // get any preEmit diagnostics, not just the ones
-            if (options.noEmitOnError) {
-                var diagnostics = program.getOptionsDiagnostics(cancellationToken).concat(program.getSyntacticDiagnostics(sourceFile, cancellationToken), program.getGlobalDiagnostics(cancellationToken), program.getSemanticDiagnostics(sourceFile, cancellationToken));
-                if (diagnostics.length === 0 && program.getCompilerOptions().declaration) {
-                    declarationDiagnostics = program.getDeclarationDiagnostics(/*sourceFile*/ undefined, cancellationToken);
-                }
-                if (diagnostics.length > 0 || declarationDiagnostics.length > 0) {
-                    return {
-                        diagnostics: ts.concatenate(diagnostics, declarationDiagnostics),
-                        sourceMaps: undefined,
-                        emittedFiles: undefined,
-                        emitSkipped: true
-                    };
-                }
-            }
-            // Create the emit resolver outside of the "emitTime" tracking code below.  That way
-            // any cost associated with it (like type checking) are appropriate associated with
-            // the type-checking counter.
-            //
-            // If the -out option is specified, we should not pass the source file to getEmitResolver.
-            // This is because in the -out scenario all files need to be emitted, and therefore all
-            // files need to be type checked. And the way to specify that all files need to be type
-            // checked is to not pass the file to getEmitResolver.
-            var emitResolver = getDiagnosticsProducingTypeChecker().getEmitResolver((options.outFile || options.out) ? undefined : sourceFile);
-            var start = new Date().getTime();
-            var emitResult = ts.emitFiles(emitResolver, getEmitHost(writeFileCallback), sourceFile);
-            ts.emitTime += new Date().getTime() - start;
-            return emitResult;
-        }
-        function getSourceFile(fileName) {
-            return getSourceFileByPath(ts.toPath(fileName, currentDirectory, getCanonicalFileName));
-        }
-        function getSourceFileByPath(path) {
-            return filesByName.get(path);
-        }
-        function getDiagnosticsHelper(sourceFile, getDiagnostics, cancellationToken) {
-            if (sourceFile) {
-                return getDiagnostics(sourceFile, cancellationToken);
-            }
-            var allDiagnostics = [];
-            ts.forEach(program.getSourceFiles(), function (sourceFile) {
-                if (cancellationToken) {
-                    cancellationToken.throwIfCancellationRequested();
-                }
-                ts.addRange(allDiagnostics, getDiagnostics(sourceFile, cancellationToken));
-            });
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function getSyntacticDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getSyntacticDiagnosticsForFile, cancellationToken);
-        }
-        function getSemanticDiagnostics(sourceFile, cancellationToken) {
-            return getDiagnosticsHelper(sourceFile, getSemanticDiagnosticsForFile, cancellationToken);
-        }
-        function getDeclarationDiagnostics(sourceFile, cancellationToken) {
-            var options = program.getCompilerOptions();
-            // collect diagnostics from the program only once if either no source file was specified or out/outFile is set (bundled emit)
-            if (!sourceFile || options.out || options.outFile) {
-                return getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
-            }
-            else {
-                return getDiagnosticsHelper(sourceFile, getDeclarationDiagnosticsForFile, cancellationToken);
-            }
-        }
-        function getSyntacticDiagnosticsForFile(sourceFile, cancellationToken) {
-            return sourceFile.parseDiagnostics;
-        }
-        function runWithCancellationToken(func) {
-            try {
-                return func();
-            }
-            catch (e) {
-                if (e instanceof ts.OperationCanceledException) {
-                    // We were canceled while performing the operation.  Because our type checker
-                    // might be a bad state, we need to throw it away.
-                    //
-                    // Note: we are overly aggressive here.  We do not actually *have* to throw away
-                    // the "noDiagnosticsTypeChecker".  However, for simplicity, i'd like to keep
-                    // the lifetimes of these two TypeCheckers the same.  Also, we generally only
-                    // cancel when the user has made a change anyways.  And, in that case, we (the
-                    // program instance) will get thrown away anyways.  So trying to keep one of
-                    // these type checkers alive doesn't serve much purpose.
-                    noDiagnosticsTypeChecker = undefined;
-                    diagnosticsProducingTypeChecker = undefined;
-                }
-                throw e;
-            }
-        }
-        function getSemanticDiagnosticsForFile(sourceFile, cancellationToken) {
-            return runWithCancellationToken(function () {
-                var typeChecker = getDiagnosticsProducingTypeChecker();
-                ts.Debug.assert(!!sourceFile.bindDiagnostics);
-                var bindDiagnostics = sourceFile.bindDiagnostics;
-                // For JavaScript files, we don't want to report the normal typescript semantic errors.
-                // Instead, we just report errors for using TypeScript-only constructs from within a
-                // JavaScript file.
-                var checkDiagnostics = ts.isSourceFileJavaScript(sourceFile) ?
-                    getJavaScriptSemanticDiagnosticsForFile(sourceFile, cancellationToken) :
-                    typeChecker.getDiagnostics(sourceFile, cancellationToken);
-                var fileProcessingDiagnosticsInFile = fileProcessingDiagnostics.getDiagnostics(sourceFile.fileName);
-                var programDiagnosticsInFile = programDiagnostics.getDiagnostics(sourceFile.fileName);
-                return bindDiagnostics.concat(checkDiagnostics).concat(fileProcessingDiagnosticsInFile).concat(programDiagnosticsInFile);
-            });
-        }
-        function getJavaScriptSemanticDiagnosticsForFile(sourceFile, cancellationToken) {
-            return runWithCancellationToken(function () {
-                var diagnostics = [];
-                walk(sourceFile);
-                return diagnostics;
-                function walk(node) {
-                    if (!node) {
-                        return false;
-                    }
-                    switch (node.kind) {
-                        case 229 /* ImportEqualsDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 235 /* ExportAssignment */:
-                            if (node.isExportEquals) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 221 /* ClassDeclaration */:
-                            var classDeclaration = node;
-                            if (checkModifiers(classDeclaration.modifiers) ||
-                                checkTypeParameters(classDeclaration.typeParameters)) {
-                                return true;
-                            }
-                            break;
-                        case 251 /* HeritageClause */:
-                            var heritageClause = node;
-                            if (heritageClause.token === 106 /* ImplementsKeyword */) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.implements_clauses_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 222 /* InterfaceDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.interface_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 225 /* ModuleDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.module_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 223 /* TypeAliasDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.type_aliases_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                        case 148 /* Constructor */:
-                        case 149 /* GetAccessor */:
-                        case 150 /* SetAccessor */:
-                        case 179 /* FunctionExpression */:
-                        case 220 /* FunctionDeclaration */:
-                        case 180 /* ArrowFunction */:
-                        case 220 /* FunctionDeclaration */:
-                            var functionDeclaration = node;
-                            if (checkModifiers(functionDeclaration.modifiers) ||
-                                checkTypeParameters(functionDeclaration.typeParameters) ||
-                                checkTypeAnnotation(functionDeclaration.type)) {
-                                return true;
-                            }
-                            break;
-                        case 200 /* VariableStatement */:
-                            var variableStatement = node;
-                            if (checkModifiers(variableStatement.modifiers)) {
-                                return true;
-                            }
-                            break;
-                        case 218 /* VariableDeclaration */:
-                            var variableDeclaration = node;
-                            if (checkTypeAnnotation(variableDeclaration.type)) {
-                                return true;
-                            }
-                            break;
-                        case 174 /* CallExpression */:
-                        case 175 /* NewExpression */:
-                            var expression = node;
-                            if (expression.typeArguments && expression.typeArguments.length > 0) {
-                                var start_2 = expression.typeArguments.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start_2, expression.typeArguments.end - start_2, ts.Diagnostics.type_arguments_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 142 /* Parameter */:
-                            var parameter = node;
-                            if (parameter.modifiers) {
-                                var start_3 = parameter.modifiers.pos;
-                                diagnostics.push(ts.createFileDiagnostic(sourceFile, start_3, parameter.modifiers.end - start_3, ts.Diagnostics.parameter_modifiers_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            if (parameter.questionToken) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.questionToken, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, "?"));
-                                return true;
-                            }
-                            if (parameter.type) {
-                                diagnostics.push(ts.createDiagnosticForNode(parameter.type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                                return true;
-                            }
-                            break;
-                        case 145 /* PropertyDeclaration */:
-                            var propertyDeclaration = node;
-                            if (propertyDeclaration.modifiers) {
-                                for (var _i = 0, _a = propertyDeclaration.modifiers; _i < _a.length; _i++) {
-                                    var modifier = _a[_i];
-                                    if (modifier.kind !== 113 /* StaticKeyword */) {
-                                        diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                        return true;
-                                    }
-                                }
-                            }
-                            if (checkTypeAnnotation(node.type)) {
-                                return true;
-                            }
-                            break;
-                        case 224 /* EnumDeclaration */:
-                            diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.enum_declarations_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 177 /* TypeAssertionExpression */:
-                            var typeAssertionExpression = node;
-                            diagnostics.push(ts.createDiagnosticForNode(typeAssertionExpression.type, ts.Diagnostics.type_assertion_expressions_can_only_be_used_in_a_ts_file));
-                            return true;
-                        case 143 /* Decorator */:
-                            if (!options.experimentalDecorators) {
-                                diagnostics.push(ts.createDiagnosticForNode(node, ts.Diagnostics.Experimental_support_for_decorators_is_a_feature_that_is_subject_to_change_in_a_future_release_Set_the_experimentalDecorators_option_to_remove_this_warning));
-                            }
-                            return true;
-                    }
-                    return ts.forEachChild(node, walk);
-                }
-                function checkTypeParameters(typeParameters) {
-                    if (typeParameters) {
-                        var start_4 = typeParameters.pos;
-                        diagnostics.push(ts.createFileDiagnostic(sourceFile, start_4, typeParameters.end - start_4, ts.Diagnostics.type_parameter_declarations_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkTypeAnnotation(type) {
-                    if (type) {
-                        diagnostics.push(ts.createDiagnosticForNode(type, ts.Diagnostics.types_can_only_be_used_in_a_ts_file));
-                        return true;
-                    }
-                    return false;
-                }
-                function checkModifiers(modifiers) {
-                    if (modifiers) {
-                        for (var _i = 0, modifiers_1 = modifiers; _i < modifiers_1.length; _i++) {
-                            var modifier = modifiers_1[_i];
-                            switch (modifier.kind) {
-                                case 112 /* PublicKeyword */:
-                                case 110 /* PrivateKeyword */:
-                                case 111 /* ProtectedKeyword */:
-                                case 128 /* ReadonlyKeyword */:
-                                case 122 /* DeclareKeyword */:
-                                    diagnostics.push(ts.createDiagnosticForNode(modifier, ts.Diagnostics._0_can_only_be_used_in_a_ts_file, ts.tokenToString(modifier.kind)));
-                                    return true;
-                                // These are all legal modifiers.
-                                case 113 /* StaticKeyword */:
-                                case 82 /* ExportKeyword */:
-                                case 74 /* ConstKeyword */:
-                                case 77 /* DefaultKeyword */:
-                                case 115 /* AbstractKeyword */:
-                            }
-                        }
-                    }
-                    return false;
-                }
-            });
-        }
-        function getDeclarationDiagnosticsWorker(sourceFile, cancellationToken) {
-            return runWithCancellationToken(function () {
-                var resolver = getDiagnosticsProducingTypeChecker().getEmitResolver(sourceFile, cancellationToken);
-                // Don't actually write any files since we're just getting diagnostics.
-                var writeFile = function () { };
-                return ts.getDeclarationDiagnostics(getEmitHost(writeFile), resolver, sourceFile);
-            });
-        }
-        function getDeclarationDiagnosticsForFile(sourceFile, cancellationToken) {
-            return ts.isDeclarationFile(sourceFile) ? [] : getDeclarationDiagnosticsWorker(sourceFile, cancellationToken);
-        }
-        function getOptionsDiagnostics() {
-            var allDiagnostics = [];
-            ts.addRange(allDiagnostics, fileProcessingDiagnostics.getGlobalDiagnostics());
-            ts.addRange(allDiagnostics, programDiagnostics.getGlobalDiagnostics());
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function getGlobalDiagnostics() {
-            var allDiagnostics = [];
-            ts.addRange(allDiagnostics, getDiagnosticsProducingTypeChecker().getGlobalDiagnostics());
-            return ts.sortAndDeduplicateDiagnostics(allDiagnostics);
-        }
-        function hasExtension(fileName) {
-            return ts.getBaseFileName(fileName).indexOf(".") >= 0;
-        }
-        function processRootFile(fileName, isDefaultLib) {
-            processSourceFile(ts.normalizePath(fileName), isDefaultLib, /*isReference*/ true);
-        }
-        function fileReferenceIsEqualTo(a, b) {
-            return a.fileName === b.fileName;
-        }
-        function moduleNameIsEqualTo(a, b) {
-            return a.text === b.text;
-        }
-        function getTextOfLiteral(literal) {
-            return literal.text;
-        }
-        function collectExternalModuleReferences(file) {
-            if (file.imports) {
-                return;
-            }
-            var isJavaScriptFile = ts.isSourceFileJavaScript(file);
-            var isExternalModuleFile = ts.isExternalModule(file);
-            var imports;
-            var moduleAugmentations;
-            for (var _i = 0, _a = file.statements; _i < _a.length; _i++) {
-                var node = _a[_i];
-                collectModuleReferences(node, /*inAmbientModule*/ false);
-                if (isJavaScriptFile) {
-                    collectRequireCalls(node);
-                }
-            }
-            file.imports = imports || emptyArray;
-            file.moduleAugmentations = moduleAugmentations || emptyArray;
-            return;
-            function collectModuleReferences(node, inAmbientModule) {
-                switch (node.kind) {
-                    case 230 /* ImportDeclaration */:
-                    case 229 /* ImportEqualsDeclaration */:
-                    case 236 /* ExportDeclaration */:
-                        var moduleNameExpr = ts.getExternalModuleName(node);
-                        if (!moduleNameExpr || moduleNameExpr.kind !== 9 /* StringLiteral */) {
-                            break;
-                        }
-                        if (!moduleNameExpr.text) {
-                            break;
-                        }
-                        // TypeScript 1.0 spec (April 2014): 12.1.6
-                        // An ExternalImportDeclaration in an AmbientExternalModuleDeclaration may reference other external modules
-                        // only through top - level external module names. Relative external module names are not permitted.
-                        if (!inAmbientModule || !ts.isExternalModuleNameRelative(moduleNameExpr.text)) {
-                            (imports || (imports = [])).push(moduleNameExpr);
-                        }
-                        break;
-                    case 225 /* ModuleDeclaration */:
-                        if (ts.isAmbientModule(node) && (inAmbientModule || node.flags & 2 /* Ambient */ || ts.isDeclarationFile(file))) {
-                            var moduleName = node.name;
-                            // Ambient module declarations can be interpreted as augmentations for some existing external modules.
-                            // This will happen in two cases:
-                            // - if current file is external module then module augmentation is a ambient module declaration defined in the top level scope
-                            // - if current file is not external module then module augmentation is an ambient module declaration with non-relative module name
-                            //   immediately nested in top level ambient module declaration .
-                            if (isExternalModuleFile || (inAmbientModule && !ts.isExternalModuleNameRelative(moduleName.text))) {
-                                (moduleAugmentations || (moduleAugmentations = [])).push(moduleName);
-                            }
-                            else if (!inAmbientModule) {
-                                // An AmbientExternalModuleDeclaration declares an external module.
-                                // This type of declaration is permitted only in the global module.
-                                // The StringLiteral must specify a top - level external module name.
-                                // Relative external module names are not permitted
-                                // NOTE: body of ambient module is always a module block, if it exists
-                                var body = node.body;
-                                if (body) {
-                                    for (var _i = 0, _a = body.statements; _i < _a.length; _i++) {
-                                        var statement = _a[_i];
-                                        collectModuleReferences(statement, /*inAmbientModule*/ true);
-                                    }
-                                }
-                            }
-                        }
-                }
-            }
-            function collectRequireCalls(node) {
-                if (ts.isRequireCall(node, /*checkArgumentIsStringLiteral*/ true)) {
-                    (imports || (imports = [])).push(node.arguments[0]);
-                }
-                else {
-                    ts.forEachChild(node, collectRequireCalls);
-                }
-            }
-        }
-        /**
-          * 'isReference' indicates whether the file was brought in via a reference directive (rather than an import declaration)
-          */
-        function processSourceFile(fileName, isDefaultLib, isReference, refFile, refPos, refEnd) {
-            var diagnosticArgument;
-            var diagnostic;
-            if (hasExtension(fileName)) {
-                if (!options.allowNonTsExtensions && !ts.forEach(supportedExtensions, function (extension) { return ts.fileExtensionIs(host.getCanonicalFileName(fileName), extension); })) {
-                    diagnostic = ts.Diagnostics.File_0_has_unsupported_extension_The_only_supported_extensions_are_1;
-                    diagnosticArgument = [fileName, "'" + supportedExtensions.join("', '") + "'"];
-                }
-                else if (!findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd)) {
-                    diagnostic = ts.Diagnostics.File_0_not_found;
-                    diagnosticArgument = [fileName];
-                }
-                else if (refFile && host.getCanonicalFileName(fileName) === host.getCanonicalFileName(refFile.fileName)) {
-                    diagnostic = ts.Diagnostics.A_file_cannot_have_a_reference_to_itself;
-                    diagnosticArgument = [fileName];
-                }
-            }
-            else {
-                var nonTsFile = options.allowNonTsExtensions && findSourceFile(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd);
-                if (!nonTsFile) {
-                    if (options.allowNonTsExtensions) {
-                        diagnostic = ts.Diagnostics.File_0_not_found;
-                        diagnosticArgument = [fileName];
-                    }
-                    else if (!ts.forEach(supportedExtensions, function (extension) { return findSourceFile(fileName + extension, ts.toPath(fileName + extension, currentDirectory, getCanonicalFileName), isDefaultLib, isReference, refFile, refPos, refEnd); })) {
-                        diagnostic = ts.Diagnostics.File_0_not_found;
-                        fileName += ".ts";
-                        diagnosticArgument = [fileName];
-                    }
-                }
-            }
-            if (diagnostic) {
-                if (refFile !== undefined && refEnd !== undefined && refPos !== undefined) {
-                    fileProcessingDiagnostics.add(ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, diagnostic].concat(diagnosticArgument)));
-                }
-                else {
-                    fileProcessingDiagnostics.add(ts.createCompilerDiagnostic.apply(void 0, [diagnostic].concat(diagnosticArgument)));
-                }
-            }
-        }
-        function reportFileNamesDifferOnlyInCasingError(fileName, existingFileName, refFile, refPos, refEnd) {
-            if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
-            }
-            else {
-                fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_name_0_differs_from_already_included_file_name_1_only_in_casing, fileName, existingFileName));
-            }
-        }
-        // Get source file from normalized fileName
-        function findSourceFile(fileName, path, isDefaultLib, isReference, refFile, refPos, refEnd) {
-            if (filesByName.contains(path)) {
-                var file_1 = filesByName.get(path);
-                // try to check if we've already seen this file but with a different casing in path
-                // NOTE: this only makes sense for case-insensitive file systems
-                if (file_1 && options.forceConsistentCasingInFileNames && ts.getNormalizedAbsolutePath(file_1.fileName, currentDirectory) !== ts.getNormalizedAbsolutePath(fileName, currentDirectory)) {
-                    reportFileNamesDifferOnlyInCasingError(fileName, file_1.fileName, refFile, refPos, refEnd);
-                }
-                // See if we need to reprocess the imports due to prior skipped imports
-                if (file_1 && ts.lookUp(modulesWithElidedImports, file_1.path)) {
-                    if (currentNodeModulesJsDepth < maxNodeModulesJsDepth) {
-                        modulesWithElidedImports[file_1.path] = false;
-                        processImportedModules(file_1, ts.getDirectoryPath(fileName));
-                    }
-                }
-                return file_1;
-            }
-            // We haven't looked for this file, do so now and cache result
-            var file = host.getSourceFile(fileName, options.target, function (hostErrorMessage) {
-                if (refFile !== undefined && refPos !== undefined && refEnd !== undefined) {
-                    fileProcessingDiagnostics.add(ts.createFileDiagnostic(refFile, refPos, refEnd - refPos, ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
-                }
-                else {
-                    fileProcessingDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, hostErrorMessage));
-                }
-            });
-            filesByName.set(path, file);
-            if (file) {
-                file.path = path;
-                if (host.useCaseSensitiveFileNames()) {
-                    // for case-sensitive file systems check if we've already seen some file with similar filename ignoring case
-                    var existingFile = filesByNameIgnoreCase.get(path);
-                    if (existingFile) {
-                        reportFileNamesDifferOnlyInCasingError(fileName, existingFile.fileName, refFile, refPos, refEnd);
-                    }
-                    else {
-                        filesByNameIgnoreCase.set(path, file);
-                    }
-                }
-                skipDefaultLib = skipDefaultLib || file.hasNoDefaultLib;
-                var basePath = ts.getDirectoryPath(fileName);
-                if (!options.noResolve) {
-                    processReferencedFiles(file, basePath, isDefaultLib);
-                    processTypeReferenceDirectives(file);
-                }
-                // always process imported modules to record module name resolutions
-                processImportedModules(file, basePath);
-                if (isDefaultLib) {
-                    files.unshift(file);
-                }
-                else {
-                    files.push(file);
-                }
-            }
-            return file;
-        }
-        function processReferencedFiles(file, basePath, isDefaultLib) {
-            ts.forEach(file.referencedFiles, function (ref) {
-                var referencedFileName = resolveTripleslashReference(ref.fileName, file.fileName);
-                processSourceFile(referencedFileName, isDefaultLib, /*isReference*/ true, file, ref.pos, ref.end);
-            });
-        }
-        function processTypeReferenceDirectives(file) {
-            var typeDirectives = ts.map(file.typeReferenceDirectives, function (l) { return l.fileName; });
-            var resolutions = resolveTypeReferenceDirectiveNamesWorker(typeDirectives, file.fileName);
-            for (var i = 0; i < typeDirectives.length; i++) {
-                var ref = file.typeReferenceDirectives[i];
-                var resolvedTypeReferenceDirective = resolutions[i];
-                // store resolved type directive on the file
-                ts.setResolvedTypeReferenceDirective(file, ref.fileName, resolvedTypeReferenceDirective);
-                processTypeReferenceDirective(ref.fileName, resolvedTypeReferenceDirective, file, ref.pos, ref.end);
-            }
-        }
-        function processTypeReferenceDirective(typeReferenceDirective, resolvedTypeReferenceDirective, refFile, refPos, refEnd) {
-            // If we already found this library as a primary reference - nothing to do
-            var previousResolution = resolvedTypeReferenceDirectives[typeReferenceDirective];
-            if (previousResolution && previousResolution.primary) {
-                return;
-            }
-            var saveResolution = true;
-            if (resolvedTypeReferenceDirective) {
-                if (resolvedTypeReferenceDirective.primary) {
-                    // resolved from the primary path
-                    processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
-                }
-                else {
-                    // If we already resolved to this file, it must have been a secondary reference. Check file contents
-                    // for sameness and possibly issue an error
-                    if (previousResolution) {
-                        var otherFileText = host.readFile(resolvedTypeReferenceDirective.resolvedFileName);
-                        if (otherFileText !== getSourceFile(previousResolution.resolvedFileName).text) {
-                            fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Conflicting_library_definitions_for_0_found_at_1_and_2_Copy_the_correct_file_to_the_typings_folder_to_resolve_this_conflict, typeReferenceDirective, resolvedTypeReferenceDirective.resolvedFileName, previousResolution.resolvedFileName));
-                        }
-                        // don't overwrite previous resolution result
-                        saveResolution = false;
-                    }
-                    else {
-                        // First resolution of this library
-                        processSourceFile(resolvedTypeReferenceDirective.resolvedFileName, /*isDefaultLib*/ false, /*isReference*/ true, refFile, refPos, refEnd);
-                    }
-                }
-            }
-            else {
-                fileProcessingDiagnostics.add(createDiagnostic(refFile, refPos, refEnd, ts.Diagnostics.Cannot_find_type_definition_file_for_0, typeReferenceDirective));
-            }
-            if (saveResolution) {
-                resolvedTypeReferenceDirectives[typeReferenceDirective] = resolvedTypeReferenceDirective;
-            }
-        }
-        function createDiagnostic(refFile, refPos, refEnd, message) {
-            var args = [];
-            for (var _i = 4; _i < arguments.length; _i++) {
-                args[_i - 4] = arguments[_i];
-            }
-            if (refFile === undefined || refPos === undefined || refEnd === undefined) {
-                return ts.createCompilerDiagnostic.apply(void 0, [message].concat(args));
-            }
-            else {
-                return ts.createFileDiagnostic.apply(void 0, [refFile, refPos, refEnd - refPos, message].concat(args));
-            }
-        }
-        function getCanonicalFileName(fileName) {
-            return host.getCanonicalFileName(fileName);
-        }
-        function processImportedModules(file, basePath) {
-            collectExternalModuleReferences(file);
-            if (file.imports.length || file.moduleAugmentations.length) {
-                file.resolvedModules = {};
-                var moduleNames = ts.map(ts.concatenate(file.imports, file.moduleAugmentations), getTextOfLiteral);
-                var resolutions = resolveModuleNamesWorker(moduleNames, ts.getNormalizedAbsolutePath(file.fileName, currentDirectory));
-                for (var i = 0; i < moduleNames.length; i++) {
-                    var resolution = resolutions[i];
-                    ts.setResolvedModule(file, moduleNames[i], resolution);
-                    var resolvedPath = resolution ? ts.toPath(resolution.resolvedFileName, currentDirectory, getCanonicalFileName) : undefined;
-                    // add file to program only if:
-                    // - resolution was successful
-                    // - noResolve is falsy
-                    // - module name comes from the list of imports
-                    // - it's not a top level JavaScript module that exceeded the search max
-                    var isFromNodeModulesSearch = resolution && resolution.isExternalLibraryImport;
-                    var isJsFileFromNodeModules = isFromNodeModulesSearch && ts.hasJavaScriptFileExtension(resolution.resolvedFileName);
-                    if (isFromNodeModulesSearch) {
-                        sourceFilesFoundSearchingNodeModules[resolvedPath] = true;
-                    }
-                    if (isJsFileFromNodeModules) {
-                        currentNodeModulesJsDepth++;
-                    }
-                    var elideImport = isJsFileFromNodeModules && currentNodeModulesJsDepth > maxNodeModulesJsDepth;
-                    var shouldAddFile = resolution && !options.noResolve && i < file.imports.length && !elideImport;
-                    if (elideImport) {
-                        modulesWithElidedImports[file.path] = true;
-                    }
-                    else if (shouldAddFile) {
-                        findSourceFile(resolution.resolvedFileName, resolvedPath, 
-                        /*isDefaultLib*/ false, /*isReference*/ false, file, ts.skipTrivia(file.text, file.imports[i].pos), file.imports[i].end);
-                    }
-                    if (isJsFileFromNodeModules) {
-                        currentNodeModulesJsDepth--;
-                    }
-                }
-            }
-            else {
-                // no imports - drop cached module resolutions
-                file.resolvedModules = undefined;
-            }
-            return;
-        }
-        function computeCommonSourceDirectory(sourceFiles) {
-            var fileNames = [];
-            for (var _i = 0, sourceFiles_2 = sourceFiles; _i < sourceFiles_2.length; _i++) {
-                var file = sourceFiles_2[_i];
-                if (!file.isDeclarationFile) {
-                    fileNames.push(file.fileName);
-                }
-            }
-            return computeCommonSourceDirectoryOfFilenames(fileNames, currentDirectory, getCanonicalFileName);
-        }
-        function checkSourceFilesBelongToPath(sourceFiles, rootDirectory) {
-            var allFilesBelongToPath = true;
-            if (sourceFiles) {
-                var absoluteRootDirectoryPath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(rootDirectory, currentDirectory));
-                for (var _i = 0, sourceFiles_3 = sourceFiles; _i < sourceFiles_3.length; _i++) {
-                    var sourceFile = sourceFiles_3[_i];
-                    if (!ts.isDeclarationFile(sourceFile)) {
-                        var absoluteSourceFilePath = host.getCanonicalFileName(ts.getNormalizedAbsolutePath(sourceFile.fileName, currentDirectory));
-                        if (absoluteSourceFilePath.indexOf(absoluteRootDirectoryPath) !== 0) {
-                            programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_is_not_under_rootDir_1_rootDir_is_expected_to_contain_all_source_files, sourceFile.fileName, options.rootDir));
-                            allFilesBelongToPath = false;
-                        }
-                    }
-                }
-            }
-            return allFilesBelongToPath;
-        }
-        function verifyCompilerOptions() {
-            if (options.isolatedModules) {
-                if (options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declaration", "isolatedModules"));
-                }
-                if (options.noEmitOnError) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "noEmitOnError", "isolatedModules"));
-                }
-                if (options.out) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "isolatedModules"));
-                }
-                if (options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "outFile", "isolatedModules"));
-                }
-            }
-            if (options.inlineSourceMap) {
-                if (options.sourceMap) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "sourceMap", "inlineSourceMap"));
-                }
-                if (options.mapRoot) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "mapRoot", "inlineSourceMap"));
-                }
-            }
-            if (options.paths && options.baseUrl === undefined) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_paths_cannot_be_used_without_specifying_baseUrl_option));
-            }
-            if (options.paths) {
-                for (var key in options.paths) {
-                    if (!ts.hasProperty(options.paths, key)) {
-                        continue;
-                    }
-                    if (!hasZeroOrOneAsteriskCharacter(key)) {
-                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
-                    }
-                    if (ts.isArray(options.paths[key])) {
-                        for (var _i = 0, _a = options.paths[key]; _i < _a.length; _i++) {
-                            var subst = _a[_i];
-                            var typeOfSubst = typeof subst;
-                            if (typeOfSubst === "string") {
-                                if (!hasZeroOrOneAsteriskCharacter(subst)) {
-                                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
-                                }
-                            }
-                            else {
-                                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst));
-                            }
-                        }
-                    }
-                    else {
-                        programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Substitutions_for_pattern_0_should_be_an_array, key));
-                    }
-                }
-            }
-            if (!options.sourceMap && !options.inlineSourceMap) {
-                if (options.inlineSources) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided, "inlineSources"));
-                }
-                if (options.sourceRoot) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_used_when_either_option_inlineSourceMap_or_option_sourceMap_is_provided, "sourceRoot"));
-                }
-            }
-            if (options.out && options.outFile) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "out", "outFile"));
-            }
-            if (options.mapRoot && !options.sourceMap) {
-                // Error to specify --mapRoot without --sourcemap
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "mapRoot", "sourceMap"));
-            }
-            if (options.declarationDir) {
-                if (!options.declaration) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "declarationDir", "declaration"));
-                }
-                if (options.out || options.outFile) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "declarationDir", options.out ? "out" : "outFile"));
-                }
-            }
-            if (options.lib && options.noLib) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "lib", "noLib"));
-            }
-            var languageVersion = options.target || 0 /* ES3 */;
-            var outFile = options.outFile || options.out;
-            var firstExternalModuleSourceFile = ts.forEach(files, function (f) { return ts.isExternalModule(f) ? f : undefined; });
-            if (options.isolatedModules) {
-                if (options.module === ts.ModuleKind.None && languageVersion < 2 /* ES6 */) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_isolatedModules_can_only_be_used_when_either_option_module_is_provided_or_option_target_is_ES2015_or_higher));
-                }
-                var firstNonExternalModuleSourceFile = ts.forEach(files, function (f) { return !ts.isExternalModule(f) && !ts.isDeclarationFile(f) ? f : undefined; });
-                if (firstNonExternalModuleSourceFile) {
-                    var span = ts.getErrorSpanForNode(firstNonExternalModuleSourceFile, firstNonExternalModuleSourceFile);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstNonExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_namespaces_when_the_isolatedModules_flag_is_provided));
-                }
-            }
-            else if (firstExternalModuleSourceFile && languageVersion < 2 /* ES6 */ && options.module === ts.ModuleKind.None) {
-                // We cannot use createDiagnosticFromNode because nodes do not have parents yet
-                var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_use_imports_exports_or_module_augmentations_when_module_is_none));
-            }
-            // Cannot specify module gen that isn't amd or system with --out
-            if (outFile) {
-                if (options.module && !(options.module === ts.ModuleKind.AMD || options.module === ts.ModuleKind.System)) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Only_amd_and_system_modules_are_supported_alongside_0, options.out ? "out" : "outFile"));
-                }
-                else if (options.module === undefined && firstExternalModuleSourceFile) {
-                    var span = ts.getErrorSpanForNode(firstExternalModuleSourceFile, firstExternalModuleSourceFile.externalModuleIndicator);
-                    programDiagnostics.add(ts.createFileDiagnostic(firstExternalModuleSourceFile, span.start, span.length, ts.Diagnostics.Cannot_compile_modules_using_option_0_unless_the_module_flag_is_amd_or_system, options.out ? "out" : "outFile"));
-                }
-            }
-            // there has to be common source directory if user specified --outdir || --sourceRoot
-            // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
-            if (options.outDir ||
-                options.sourceRoot ||
-                options.mapRoot) {
-                // Precalculate and cache the common source directory
-                var dir = getCommonSourceDirectory();
-                // If we failed to find a good common directory, but outDir is specified and at least one of our files is on a windows drive/URL/other resource, add a failure
-                if (options.outDir && dir === "" && ts.forEach(files, function (file) { return ts.getRootLength(file.fileName) > 1; })) {
-                    programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_find_the_common_subdirectory_path_for_the_input_files));
-                }
-            }
-            if (!options.noEmit && options.allowJs && options.declaration) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_with_option_1, "allowJs", "declaration"));
-            }
-            if (options.emitDecoratorMetadata &&
-                !options.experimentalDecorators) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_cannot_be_specified_without_specifying_option_1, "emitDecoratorMetadata", "experimentalDecorators"));
-            }
-            if (options.reactNamespace && !ts.isIdentifier(options.reactNamespace, languageVersion)) {
-                programDiagnostics.add(ts.createCompilerDiagnostic(ts.Diagnostics.Invalid_value_for_reactNamespace_0_is_not_a_valid_identifier, options.reactNamespace));
-            }
-            // If the emit is enabled make sure that every output file is unique and not overwriting any of the input files
-            if (!options.noEmit && !options.suppressOutputPathCheck) {
-                var emitHost = getEmitHost();
-                var emitFilesSeen_1 = ts.createFileMap(!host.useCaseSensitiveFileNames() ? function (key) { return key.toLocaleLowerCase(); } : undefined);
-                ts.forEachExpectedEmitFile(emitHost, function (emitFileNames, sourceFiles, isBundledEmit) {
-                    verifyEmitFilePath(emitFileNames.jsFilePath, emitFilesSeen_1);
-                    verifyEmitFilePath(emitFileNames.declarationFilePath, emitFilesSeen_1);
-                });
-            }
-            // Verify that all the emit files are unique and don't overwrite input files
-            function verifyEmitFilePath(emitFileName, emitFilesSeen) {
-                if (emitFileName) {
-                    var emitFilePath = ts.toPath(emitFileName, currentDirectory, getCanonicalFileName);
-                    // Report error if the output overwrites input file
-                    if (filesByName.contains(emitFilePath)) {
-                        createEmitBlockingDiagnostics(emitFileName, emitFilePath, ts.Diagnostics.Cannot_write_file_0_because_it_would_overwrite_input_file);
-                    }
-                    // Report error if multiple files write into same file
-                    if (emitFilesSeen.contains(emitFilePath)) {
-                        // Already seen the same emit file - report error
-                        createEmitBlockingDiagnostics(emitFileName, emitFilePath, ts.Diagnostics.Cannot_write_file_0_because_it_would_be_overwritten_by_multiple_input_files);
-                    }
-                    else {
-                        emitFilesSeen.set(emitFilePath, true);
-                    }
-                }
-            }
-        }
-        function createEmitBlockingDiagnostics(emitFileName, emitFilePath, message) {
-            hasEmitBlockingDiagnostics.set(ts.toPath(emitFileName, currentDirectory, getCanonicalFileName), true);
-            programDiagnostics.add(ts.createCompilerDiagnostic(message, emitFileName));
-        }
-    }
-    ts.createProgram = createProgram;
-})(ts || (ts = {}));
-/// <reference path="sys.ts"/>
-/// <reference path="types.ts"/>
-/// <reference path="core.ts"/>
-/// <reference path="diagnosticInformationMap.generated.ts"/>
-/// <reference path="scanner.ts"/>
-var ts;
-(function (ts) {
-    /* @internal */
-    ts.optionDeclarations = [
-        {
-            name: "charset",
-            type: "string"
-        },
-        {
-            name: "declaration",
-            shortName: "d",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_d_ts_file
-        },
-        {
-            name: "declarationDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.DIRECTORY
-        },
-        {
-            name: "diagnostics",
-            type: "boolean"
-        },
-        {
-            name: "emitBOM",
-            type: "boolean"
-        },
-        {
-            name: "help",
-            shortName: "h",
-            type: "boolean",
-            description: ts.Diagnostics.Print_this_message
-        },
-        {
-            name: "help",
-            shortName: "?",
-            type: "boolean"
-        },
-        {
-            name: "init",
-            type: "boolean",
-            description: ts.Diagnostics.Initializes_a_TypeScript_project_and_creates_a_tsconfig_json_file
-        },
-        {
-            name: "inlineSourceMap",
-            type: "boolean"
-        },
-        {
-            name: "inlineSources",
-            type: "boolean"
-        },
-        {
-            name: "jsx",
-            type: {
-                "preserve": 1 /* Preserve */,
-                "react": 2 /* React */
-            },
-            paramType: ts.Diagnostics.KIND,
-            description: ts.Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react
-        },
-        {
-            name: "reactNamespace",
-            type: "string",
-            description: ts.Diagnostics.Specify_the_object_invoked_for_createElement_and_spread_when_targeting_react_JSX_emit
-        },
-        {
-            name: "listFiles",
-            type: "boolean"
-        },
-        {
-            name: "locale",
-            type: "string"
-        },
-        {
-            name: "mapRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_map_files_instead_of_generated_locations,
-            paramType: ts.Diagnostics.LOCATION
-        },
-        {
-            name: "module",
-            shortName: "m",
-            type: {
-                "none": ts.ModuleKind.None,
-                "commonjs": ts.ModuleKind.CommonJS,
-                "amd": ts.ModuleKind.AMD,
-                "system": ts.ModuleKind.System,
-                "umd": ts.ModuleKind.UMD,
-                "es6": ts.ModuleKind.ES6,
-                "es2015": ts.ModuleKind.ES2015
-            },
-            description: ts.Diagnostics.Specify_module_code_generation_Colon_commonjs_amd_system_umd_or_es2015,
-            paramType: ts.Diagnostics.KIND
-        },
-        {
-            name: "newLine",
-            type: {
-                "crlf": 0 /* CarriageReturnLineFeed */,
-                "lf": 1 /* LineFeed */
-            },
-            description: ts.Diagnostics.Specify_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix,
-            paramType: ts.Diagnostics.NEWLINE
-        },
-        {
-            name: "noEmit",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs
-        },
-        {
-            name: "noEmitHelpers",
-            type: "boolean"
-        },
-        {
-            name: "noEmitOnError",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_outputs_if_any_errors_were_reported
-        },
-        {
-            name: "noImplicitAny",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_expressions_and_declarations_with_an_implied_any_type
-        },
-        {
-            name: "noImplicitThis",
-            type: "boolean",
-            description: ts.Diagnostics.Raise_error_on_this_expressions_with_an_implied_any_type
-        },
-        {
-            name: "noUnusedLocals",
-            type: "boolean",
-            description: ts.Diagnostics.Report_Errors_on_Unused_Locals
-        },
-        {
-            name: "noUnusedParameters",
-            type: "boolean",
-            description: ts.Diagnostics.Report_Errors_on_Unused_Parameters
-        },
-        {
-            name: "noLib",
-            type: "boolean"
-        },
-        {
-            name: "noResolve",
-            type: "boolean"
-        },
-        {
-            name: "skipDefaultLibCheck",
-            type: "boolean"
-        },
-        {
-            name: "skipLibCheck",
-            type: "boolean",
-            description: ts.Diagnostics.Skip_type_checking_of_declaration_files
-        },
-        {
-            name: "out",
-            type: "string",
-            isFilePath: false,
-            // for correct behaviour, please use outFile
-            paramType: ts.Diagnostics.FILE
-        },
-        {
-            name: "outFile",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Concatenate_and_emit_output_to_single_file,
-            paramType: ts.Diagnostics.FILE
-        },
-        {
-            name: "outDir",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Redirect_output_structure_to_the_directory,
-            paramType: ts.Diagnostics.DIRECTORY
-        },
-        {
-            name: "preserveConstEnums",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_erase_const_enum_declarations_in_generated_code
-        },
-        {
-            name: "pretty",
-            description: ts.Diagnostics.Stylize_errors_and_messages_using_color_and_context_experimental,
-            type: "boolean"
-        },
-        {
-            name: "project",
-            shortName: "p",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Compile_the_project_in_the_given_directory,
-            paramType: ts.Diagnostics.DIRECTORY
-        },
-        {
-            name: "removeComments",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_comments_to_output
-        },
-        {
-            name: "rootDir",
-            type: "string",
-            isFilePath: true,
-            paramType: ts.Diagnostics.LOCATION,
-            description: ts.Diagnostics.Specify_the_root_directory_of_input_files_Use_to_control_the_output_directory_structure_with_outDir
-        },
-        {
-            name: "isolatedModules",
-            type: "boolean"
-        },
-        {
-            name: "sourceMap",
-            type: "boolean",
-            description: ts.Diagnostics.Generates_corresponding_map_file
-        },
-        {
-            name: "sourceRoot",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Specify_the_location_where_debugger_should_locate_TypeScript_files_instead_of_source_locations,
-            paramType: ts.Diagnostics.LOCATION
-        },
-        {
-            name: "suppressExcessPropertyErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_excess_property_checks_for_object_literals,
-            experimental: true
-        },
-        {
-            name: "suppressImplicitAnyIndexErrors",
-            type: "boolean",
-            description: ts.Diagnostics.Suppress_noImplicitAny_errors_for_indexing_objects_lacking_index_signatures
-        },
-        {
-            name: "stripInternal",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_declarations_for_code_that_has_an_internal_annotation,
-            experimental: true
-        },
-        {
-            name: "target",
-            shortName: "t",
-            type: {
-                "es3": 0 /* ES3 */,
-                "es5": 1 /* ES5 */,
-                "es6": 2 /* ES6 */,
-                "es2015": 2 /* ES2015 */
-            },
-            description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_or_ES2015,
-            paramType: ts.Diagnostics.VERSION
-        },
-        {
-            name: "version",
-            shortName: "v",
-            type: "boolean",
-            description: ts.Diagnostics.Print_the_compiler_s_version
-        },
-        {
-            name: "watch",
-            shortName: "w",
-            type: "boolean",
-            description: ts.Diagnostics.Watch_input_files
-        },
-        {
-            name: "experimentalDecorators",
-            type: "boolean",
-            description: ts.Diagnostics.Enables_experimental_support_for_ES7_decorators
-        },
-        {
-            name: "emitDecoratorMetadata",
-            type: "boolean",
-            experimental: true,
-            description: ts.Diagnostics.Enables_experimental_support_for_emitting_type_metadata_for_decorators
-        },
-        {
-            name: "moduleResolution",
-            type: {
-                "node": ts.ModuleResolutionKind.NodeJs,
-                "classic": ts.ModuleResolutionKind.Classic
-            },
-            description: ts.Diagnostics.Specify_module_resolution_strategy_Colon_node_Node_js_or_classic_TypeScript_pre_1_6
-        },
-        {
-            name: "allowUnusedLabels",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unused_labels
-        },
-        {
-            name: "noImplicitReturns",
-            type: "boolean",
-            description: ts.Diagnostics.Report_error_when_not_all_code_paths_in_function_return_a_value
-        },
-        {
-            name: "noFallthroughCasesInSwitch",
-            type: "boolean",
-            description: ts.Diagnostics.Report_errors_for_fallthrough_cases_in_switch_statement
-        },
-        {
-            name: "allowUnreachableCode",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_report_errors_on_unreachable_code
-        },
-        {
-            name: "forceConsistentCasingInFileNames",
-            type: "boolean",
-            description: ts.Diagnostics.Disallow_inconsistently_cased_references_to_the_same_file
-        },
-        {
-            name: "baseUrl",
-            type: "string",
-            isFilePath: true,
-            description: ts.Diagnostics.Base_directory_to_resolve_non_absolute_module_names
-        },
-        {
-            // this option can only be specified in tsconfig.json
-            // use type = object to copy the value as-is
-            name: "paths",
-            type: "object",
-            isTSConfigOnly: true
-        },
-        {
-            // this option can only be specified in tsconfig.json
-            // use type = object to copy the value as-is
-            name: "rootDirs",
-            type: "list",
-            isTSConfigOnly: true,
-            element: {
-                name: "rootDirs",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "typeRoots",
-            type: "list",
-            element: {
-                name: "typeRoots",
-                type: "string",
-                isFilePath: true
-            }
-        },
-        {
-            name: "types",
-            type: "list",
-            element: {
-                name: "types",
-                type: "string"
-            },
-            description: ts.Diagnostics.Type_declaration_files_to_be_included_in_compilation
-        },
-        {
-            name: "traceResolution",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_tracing_of_the_name_resolution_process
-        },
-        {
-            name: "allowJs",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_javascript_files_to_be_compiled
-        },
-        {
-            name: "allowSyntheticDefaultImports",
-            type: "boolean",
-            description: ts.Diagnostics.Allow_default_imports_from_modules_with_no_default_export_This_does_not_affect_code_emit_just_typechecking
-        },
-        {
-            name: "noImplicitUseStrict",
-            type: "boolean",
-            description: ts.Diagnostics.Do_not_emit_use_strict_directives_in_module_output
-        },
-        {
-            name: "maxNodeModuleJsDepth",
-            type: "number",
-            description: ts.Diagnostics.The_maximum_dependency_depth_to_search_under_node_modules_and_load_JavaScript_files
-        },
-        {
-            name: "listEmittedFiles",
-            type: "boolean"
-        },
-        {
-            name: "lib",
-            type: "list",
-            element: {
-                name: "lib",
-                type: {
-                    // JavaScript only
-                    "es5": "lib.es5.d.ts",
-                    "es6": "lib.es2015.d.ts",
-                    "es2015": "lib.es2015.d.ts",
-                    "es7": "lib.es2016.d.ts",
-                    "es2016": "lib.es2016.d.ts",
-                    "es2017": "lib.es2017.d.ts",
-                    // Host only
-                    "dom": "lib.dom.d.ts",
-                    "webworker": "lib.webworker.d.ts",
-                    "scripthost": "lib.scripthost.d.ts",
-                    // ES2015 Or ESNext By-feature options
-                    "es2015.core": "lib.es2015.core.d.ts",
-                    "es2015.collection": "lib.es2015.collection.d.ts",
-                    "es2015.generator": "lib.es2015.generator.d.ts",
-                    "es2015.iterable": "lib.es2015.iterable.d.ts",
-                    "es2015.promise": "lib.es2015.promise.d.ts",
-                    "es2015.proxy": "lib.es2015.proxy.d.ts",
-                    "es2015.reflect": "lib.es2015.reflect.d.ts",
-                    "es2015.symbol": "lib.es2015.symbol.d.ts",
-                    "es2015.symbol.wellknown": "lib.es2015.symbol.wellknown.d.ts",
-                    "es2016.array.include": "lib.es2016.array.include.d.ts",
-                    "es2017.object": "lib.es2017.object.d.ts",
-                    "es2017.sharedmemory": "lib.es2017.sharedmemory.d.ts"
-                }
-            },
-            description: ts.Diagnostics.Specify_library_files_to_be_included_in_the_compilation_Colon
-        },
-        {
-            name: "disableSizeLimit",
-            type: "boolean"
-        },
-        {
-            name: "strictNullChecks",
-            type: "boolean",
-            description: ts.Diagnostics.Enable_strict_null_checks
-        }
-    ];
-    /* @internal */
-    ts.typingOptionDeclarations = [
-        {
-            name: "enableAutoDiscovery",
-            type: "boolean"
-        },
-        {
-            name: "include",
-            type: "list",
-            element: {
-                name: "include",
-                type: "string"
-            }
-        },
-        {
-            name: "exclude",
-            type: "list",
-            element: {
-                name: "exclude",
-                type: "string"
-            }
-        }
-    ];
-    var optionNameMapCache;
-    /* @internal */
-    function getOptionNameMap() {
-        if (optionNameMapCache) {
-            return optionNameMapCache;
-        }
-        var optionNameMap = {};
-        var shortOptionNames = {};
-        ts.forEach(ts.optionDeclarations, function (option) {
-            optionNameMap[option.name.toLowerCase()] = option;
-            if (option.shortName) {
-                shortOptionNames[option.shortName] = option.name;
-            }
-        });
-        optionNameMapCache = { optionNameMap: optionNameMap, shortOptionNames: shortOptionNames };
-        return optionNameMapCache;
-    }
-    ts.getOptionNameMap = getOptionNameMap;
-    /* @internal */
-    function createCompilerDiagnosticForInvalidCustomType(opt) {
-        var namesOfType = [];
-        ts.forEachKey(opt.type, function (key) {
-            namesOfType.push(" '" + key + "'");
-        });
-        return ts.createCompilerDiagnostic(ts.Diagnostics.Argument_for_0_option_must_be_Colon_1, "--" + opt.name, namesOfType);
-    }
-    ts.createCompilerDiagnosticForInvalidCustomType = createCompilerDiagnosticForInvalidCustomType;
-    /* @internal */
-    function parseCustomTypeOption(opt, value, errors) {
-        var key = trimString((value || "")).toLowerCase();
-        var map = opt.type;
-        if (ts.hasProperty(map, key)) {
-            return map[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    ts.parseCustomTypeOption = parseCustomTypeOption;
-    /* @internal */
-    function parseListTypeOption(opt, value, errors) {
-        if (value === void 0) { value = ""; }
-        value = trimString(value);
-        if (ts.startsWith(value, "-")) {
-            return undefined;
-        }
-        if (value === "") {
-            return [];
-        }
-        var values = value.split(",");
-        switch (opt.element.type) {
-            case "number":
-                return ts.map(values, parseInt);
-            case "string":
-                return ts.map(values, function (v) { return v || ""; });
-            default:
-                return ts.filter(ts.map(values, function (v) { return parseCustomTypeOption(opt.element, v, errors); }), function (v) { return !!v; });
-        }
-    }
-    ts.parseListTypeOption = parseListTypeOption;
-    /* @internal */
-    function parseCommandLine(commandLine, readFile) {
-        var options = {};
-        var fileNames = [];
-        var errors = [];
-        var _a = getOptionNameMap(), optionNameMap = _a.optionNameMap, shortOptionNames = _a.shortOptionNames;
-        parseStrings(commandLine);
-        return {
-            options: options,
-            fileNames: fileNames,
-            errors: errors
-        };
-        function parseStrings(args) {
-            var i = 0;
-            while (i < args.length) {
-                var s = args[i];
-                i++;
-                if (s.charCodeAt(0) === 64 /* at */) {
-                    parseResponseFile(s.slice(1));
-                }
-                else if (s.charCodeAt(0) === 45 /* minus */) {
-                    s = s.slice(s.charCodeAt(1) === 45 /* minus */ ? 2 : 1).toLowerCase();
-                    // Try to translate short option names to their full equivalents.
-                    if (ts.hasProperty(shortOptionNames, s)) {
-                        s = shortOptionNames[s];
-                    }
-                    if (ts.hasProperty(optionNameMap, s)) {
-                        var opt = optionNameMap[s];
-                        if (opt.isTSConfigOnly) {
-                            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Option_0_can_only_be_specified_in_tsconfig_json_file, opt.name));
-                        }
-                        else {
-                            // Check to see if no argument was provided (e.g. "--locale" is the last command-line argument).
-                            if (!args[i] && opt.type !== "boolean") {
-                                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_expects_an_argument, opt.name));
-                            }
-                            switch (opt.type) {
-                                case "number":
-                                    options[opt.name] = parseInt(args[i]);
-                                    i++;
-                                    break;
-                                case "boolean":
-                                    options[opt.name] = true;
-                                    break;
-                                case "string":
-                                    options[opt.name] = args[i] || "";
-                                    i++;
-                                    break;
-                                case "list":
-                                    var result = parseListTypeOption(opt, args[i], errors);
-                                    options[opt.name] = result || [];
-                                    if (result) {
-                                        i++;
-                                    }
-                                    break;
-                                // If not a primitive, the possible types are specified in what is effectively a map of options.
-                                default:
-                                    options[opt.name] = parseCustomTypeOption(opt, args[i], errors);
-                                    i++;
-                                    break;
-                            }
-                        }
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_compiler_option_0, s));
-                    }
-                }
-                else {
-                    fileNames.push(s);
-                }
-            }
-        }
-        function parseResponseFile(fileName) {
-            var text = readFile ? readFile(fileName) : ts.sys.readFile(fileName);
-            if (!text) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_0_not_found, fileName));
-                return;
-            }
-            var args = [];
-            var pos = 0;
-            while (true) {
-                while (pos < text.length && text.charCodeAt(pos) <= 32 /* space */)
-                    pos++;
-                if (pos >= text.length)
-                    break;
-                var start = pos;
-                if (text.charCodeAt(start) === 34 /* doubleQuote */) {
-                    pos++;
-                    while (pos < text.length && text.charCodeAt(pos) !== 34 /* doubleQuote */)
-                        pos++;
-                    if (pos < text.length) {
-                        args.push(text.substring(start + 1, pos));
-                        pos++;
-                    }
-                    else {
-                        errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unterminated_quoted_string_in_response_file_0, fileName));
-                    }
-                }
-                else {
-                    while (text.charCodeAt(pos) > 32 /* space */)
-                        pos++;
-                    args.push(text.substring(start, pos));
-                }
-            }
-            parseStrings(args);
-        }
-    }
-    ts.parseCommandLine = parseCommandLine;
-    /**
-      * Read tsconfig.json file
-      * @param fileName The path to the config file
-      */
-    function readConfigFile(fileName, readFile) {
-        var text = "";
-        try {
-            text = readFile(fileName);
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Cannot_read_file_0_Colon_1, fileName, e.message) };
-        }
-        return parseConfigFileTextToJson(fileName, text);
-    }
-    ts.readConfigFile = readConfigFile;
-    /**
-      * Parse the text of the tsconfig.json file
-      * @param fileName The path to the config file
-      * @param jsonText The text of the config file
-      */
-    function parseConfigFileTextToJson(fileName, jsonText) {
-        try {
-            var jsonTextWithoutComments = removeComments(jsonText);
-            return { config: /\S/.test(jsonTextWithoutComments) ? JSON.parse(jsonTextWithoutComments) : {} };
-        }
-        catch (e) {
-            return { error: ts.createCompilerDiagnostic(ts.Diagnostics.Failed_to_parse_file_0_Colon_1, fileName, e.message) };
-        }
-    }
-    ts.parseConfigFileTextToJson = parseConfigFileTextToJson;
-    /**
-     * Remove the comments from a json like text.
-     * Comments can be single line comments (starting with # or //) or multiline comments using / * * /
-     *
-     * This method replace comment content by whitespace rather than completely remove them to keep positions in json parsing error reporting accurate.
-     */
-    function removeComments(jsonText) {
-        var output = "";
-        var scanner = ts.createScanner(1 /* ES5 */, /* skipTrivia */ false, 0 /* Standard */, jsonText);
-        var token;
-        while ((token = scanner.scan()) !== 1 /* EndOfFileToken */) {
-            switch (token) {
-                case 2 /* SingleLineCommentTrivia */:
-                case 3 /* MultiLineCommentTrivia */:
-                    // replace comments with whitespace to preserve original character positions
-                    output += scanner.getTokenText().replace(/\S/g, " ");
-                    break;
-                default:
-                    output += scanner.getTokenText();
-                    break;
-            }
-        }
-        return output;
-    }
-    // Skip over any minified JavaScript files (ending in ".min.js")
-    // Skip over dotted files and folders as well
-    var ignoreFileNamePattern = /(\.min\.js$)|([\\/]\.[\w.])/;
-    /**
-      * Parse the contents of a config file (tsconfig.json).
-      * @param json The contents of the config file to parse
-      * @param host Instance of ParseConfigHost used to enumerate files in folder.
-      * @param basePath A root directory to resolve relative path entries in the config
-      *    file to. e.g. outDir
-      */
-    function parseJsonConfigFileContent(json, host, basePath, existingOptions, configFileName) {
-        if (existingOptions === void 0) { existingOptions = {}; }
-        var errors = [];
-        var compilerOptions = convertCompilerOptionsFromJsonWorker(json["compilerOptions"], basePath, errors, configFileName);
-        var options = ts.extend(existingOptions, compilerOptions);
-        var typingOptions = convertTypingOptionsFromJsonWorker(json["typingOptions"], basePath, errors, configFileName);
-        options.configFilePath = configFileName;
-        var _a = getFileNames(errors), fileNames = _a.fileNames, wildcardDirectories = _a.wildcardDirectories;
-        return {
-            options: options,
-            fileNames: fileNames,
-            typingOptions: typingOptions,
-            raw: json,
-            errors: errors,
-            wildcardDirectories: wildcardDirectories
-        };
-        function getFileNames(errors) {
-            var fileNames;
-            if (ts.hasProperty(json, "files")) {
-                if (ts.isArray(json["files"])) {
-                    fileNames = json["files"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "files", "Array"));
-                }
-            }
-            var includeSpecs;
-            if (ts.hasProperty(json, "include")) {
-                if (ts.isArray(json["include"])) {
-                    includeSpecs = json["include"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "include", "Array"));
-                }
-            }
-            var excludeSpecs;
-            if (ts.hasProperty(json, "exclude")) {
-                if (ts.isArray(json["exclude"])) {
-                    excludeSpecs = json["exclude"];
-                }
-                else {
-                    errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, "exclude", "Array"));
-                }
-            }
-            else if (ts.hasProperty(json, "excludes")) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Unknown_option_excludes_Did_you_mean_exclude));
-            }
-            else {
-                // By default, exclude common package folders
-                excludeSpecs = ["node_modules", "bower_components", "jspm_packages"];
-            }
-            // Always exclude the output directory unless explicitly included
-            var outDir = json["compilerOptions"] && json["compilerOptions"]["outDir"];
-            if (outDir) {
-                excludeSpecs.push(outDir);
-            }
-            if (fileNames === undefined && includeSpecs === undefined) {
-                includeSpecs = ["**/*"];
-            }
-            return matchFileNames(fileNames, includeSpecs, excludeSpecs, basePath, options, host, errors);
-        }
-    }
-    ts.parseJsonConfigFileContent = parseJsonConfigFileContent;
-    function convertCompilerOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertCompilerOptionsFromJson = convertCompilerOptionsFromJson;
-    function convertTypingOptionsFromJson(jsonOptions, basePath, configFileName) {
-        var errors = [];
-        var options = convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName);
-        return { options: options, errors: errors };
-    }
-    ts.convertTypingOptionsFromJson = convertTypingOptionsFromJson;
-    function convertCompilerOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json" ? { allowJs: true } : {};
-        convertOptionsFromJson(ts.optionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_compiler_option_0, errors);
-        return options;
-    }
-    function convertTypingOptionsFromJsonWorker(jsonOptions, basePath, errors, configFileName) {
-        var options = ts.getBaseFileName(configFileName) === "jsconfig.json"
-            ? { enableAutoDiscovery: true, include: [], exclude: [] }
-            : { enableAutoDiscovery: false, include: [], exclude: [] };
-        convertOptionsFromJson(ts.typingOptionDeclarations, jsonOptions, basePath, options, ts.Diagnostics.Unknown_typing_option_0, errors);
-        return options;
-    }
-    function convertOptionsFromJson(optionDeclarations, jsonOptions, basePath, defaultOptions, diagnosticMessage, errors) {
-        if (!jsonOptions) {
-            return;
-        }
-        var optionNameMap = ts.arrayToMap(optionDeclarations, function (opt) { return opt.name; });
-        for (var id in jsonOptions) {
-            if (ts.hasProperty(optionNameMap, id)) {
-                var opt = optionNameMap[id];
-                defaultOptions[opt.name] = convertJsonOption(opt, jsonOptions[id], basePath, errors);
-            }
-            else {
-                errors.push(ts.createCompilerDiagnostic(diagnosticMessage, id));
-            }
-        }
-    }
-    function convertJsonOption(opt, value, basePath, errors) {
-        var optType = opt.type;
-        var expectedType = typeof optType === "string" ? optType : "string";
-        if (optType === "list" && ts.isArray(value)) {
-            return convertJsonOptionOfListType(opt, value, basePath, errors);
-        }
-        else if (typeof value === expectedType) {
-            if (typeof optType !== "string") {
-                return convertJsonOptionOfCustomType(opt, value, errors);
-            }
-            else {
-                if (opt.isFilePath) {
-                    value = ts.normalizePath(ts.combinePaths(basePath, value));
-                    if (value === "") {
-                        value = ".";
-                    }
-                }
-            }
-            return value;
-        }
-        else {
-            errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.Compiler_option_0_requires_a_value_of_type_1, opt.name, expectedType));
-        }
-    }
-    function convertJsonOptionOfCustomType(opt, value, errors) {
-        var key = value.toLowerCase();
-        if (ts.hasProperty(opt.type, key)) {
-            return opt.type[key];
-        }
-        else {
-            errors.push(createCompilerDiagnosticForInvalidCustomType(opt));
-        }
-    }
-    function convertJsonOptionOfListType(option, values, basePath, errors) {
-        return ts.filter(ts.map(values, function (v) { return convertJsonOption(option.element, v, basePath, errors); }), function (v) { return !!v; });
-    }
-    function trimString(s) {
-        return typeof s.trim === "function" ? s.trim() : s.replace(/^[\s]+|[\s]+$/g, "");
-    }
-    /**
-     * Tests for a path that ends in a recursive directory wildcard.
-     * Matches **, \**, **\, and \**\, but not a**b.
-     *
-     * NOTE: used \ in place of / above to avoid issues with multiline comments.
-     *
-     * Breakdown:
-     *  (^|\/)      # matches either the beginning of the string or a directory separator.
-     *  \*\*        # matches the recursive directory wildcard "**".
-     *  \/?$        # matches an optional trailing directory separator at the end of the string.
-     */
-    var invalidTrailingRecursionPattern = /(^|\/)\*\*\/?$/;
-    /**
-     * Tests for a path with multiple recursive directory wildcards.
-     * Matches **\** and **\a\**, but not **\a**b.
-     *
-     * NOTE: used \ in place of / above to avoid issues with multiline comments.
-     *
-     * Breakdown:
-     *  (^|\/)      # matches either the beginning of the string or a directory separator.
-     *  \*\*\/      # matches a recursive directory wildcard "**" followed by a directory separator.
-     *  (.*\/)?     # optionally matches any number of characters followed by a directory separator.
-     *  \*\*        # matches a recursive directory wildcard "**"
-     *  ($|\/)      # matches either the end of the string or a directory separator.
-     */
-    var invalidMultipleRecursionPatterns = /(^|\/)\*\*\/(.*\/)?\*\*($|\/)/;
-    /**
-     * Tests for a path where .. appears after a recursive directory wildcard.
-     * Matches **\..\*, **\a\..\*, and **\.., but not ..\**\*
-     *
-     * NOTE: used \ in place of / above to avoid issues with multiline comments.
-     *
-     * Breakdown:
-     *  (^|\/)      # matches either the beginning of the string or a directory separator.
-     *  \*\*\/      # matches a recursive directory wildcard "**" followed by a directory separator.
-     *  (.*\/)?     # optionally matches any number of characters followed by a directory separator.
-     *  \.\.        # matches a parent directory path component ".."
-     *  ($|\/)      # matches either the end of the string or a directory separator.
-     */
-    var invalidDotDotAfterRecursiveWildcardPattern = /(^|\/)\*\*\/(.*\/)?\.\.($|\/)/;
-    /**
-     * Tests for a path containing a wildcard character in a directory component of the path.
-     * Matches \*\, \?\, and \a*b\, but not \a\ or \a\*.
-     *
-     * NOTE: used \ in place of / above to avoid issues with multiline comments.
-     *
-     * Breakdown:
-     *  \/          # matches a directory separator.
-     *  [^/]*?      # matches any number of characters excluding directory separators (non-greedy).
-     *  [*?]        # matches either a wildcard character (* or ?)
-     *  [^/]*       # matches any number of characters excluding directory separators (greedy).
-     *  \/          # matches a directory separator.
-     */
-    var watchRecursivePattern = /\/[^/]*?[*?][^/]*\//;
-    /**
-     * Matches the portion of a wildcard path that does not contain wildcards.
-     * Matches \a of \a\*, or \a\b\c of \a\b\c\?\d.
-     *
-     * NOTE: used \ in place of / above to avoid issues with multiline comments.
-     *
-     * Breakdown:
-     *  ^                   # matches the beginning of the string
-     *  [^*?]*              # matches any number of non-wildcard characters
-     *  (?=\/[^/]*[*?])     # lookahead that matches a directory separator followed by
-     *                      # a path component that contains at least one wildcard character (* or ?).
-     */
-    var wildcardDirectoryPattern = /^[^*?]*(?=\/[^/]*[*?])/;
-    /**
-     * Expands an array of file specifications.
-     *
-     * @param fileNames The literal file names to include.
-     * @param include The wildcard file specifications to include.
-     * @param exclude The wildcard file specifications to exclude.
-     * @param basePath The base path for any relative file specifications.
-     * @param options Compiler options.
-     * @param host The host used to resolve files and directories.
-     * @param errors An array for diagnostic reporting.
-     */
-    function matchFileNames(fileNames, include, exclude, basePath, options, host, errors) {
-        basePath = ts.normalizePath(basePath);
-        // The exclude spec list is converted into a regular expression, which allows us to quickly
-        // test whether a file or directory should be excluded before recursively traversing the
-        // file system.
-        var keyMapper = host.useCaseSensitiveFileNames ? caseSensitiveKeyMapper : caseInsensitiveKeyMapper;
-        // Literal file names (provided via the "files" array in tsconfig.json) are stored in a
-        // file map with a possibly case insensitive key. We use this map later when when including
-        // wildcard paths.
-        var literalFileMap = {};
-        // Wildcard paths (provided via the "includes" array in tsconfig.json) are stored in a
-        // file map with a possibly case insensitive key. We use this map to store paths matched
-        // via wildcard, and to handle extension priority.
-        var wildcardFileMap = {};
-        if (include) {
-            include = validateSpecs(include, errors, /*allowTrailingRecursion*/ false);
-        }
-        if (exclude) {
-            exclude = validateSpecs(exclude, errors, /*allowTrailingRecursion*/ true);
-        }
-        // Wildcard directories (provided as part of a wildcard path) are stored in a
-        // file map that marks whether it was a regular wildcard match (with a `*` or `?` token),
-        // or a recursive directory. This information is used by filesystem watchers to monitor for
-        // new entries in these paths.
-        var wildcardDirectories = getWildcardDirectories(include, exclude, basePath, host.useCaseSensitiveFileNames);
-        // Rather than requery this for each file and filespec, we query the supported extensions
-        // once and store it on the expansion context.
-        var supportedExtensions = ts.getSupportedExtensions(options);
-        // Literal files are always included verbatim. An "include" or "exclude" specification cannot
-        // remove a literal file.
-        if (fileNames) {
-            for (var _i = 0, fileNames_1 = fileNames; _i < fileNames_1.length; _i++) {
-                var fileName = fileNames_1[_i];
-                var file = ts.combinePaths(basePath, fileName);
-                literalFileMap[keyMapper(file)] = file;
-            }
-        }
-        if (include && include.length > 0) {
-            for (var _a = 0, _b = host.readDirectory(basePath, supportedExtensions, exclude, include); _a < _b.length; _a++) {
-                var file = _b[_a];
-                // If we have already included a literal or wildcard path with a
-                // higher priority extension, we should skip this file.
-                //
-                // This handles cases where we may encounter both <file>.ts and
-                // <file>.d.ts (or <file>.js if "allowJs" is enabled) in the same
-                // directory when they are compilation outputs.
-                if (hasFileWithHigherPriorityExtension(file, literalFileMap, wildcardFileMap, supportedExtensions, keyMapper)) {
-                    continue;
-                }
-                if (ignoreFileNamePattern.test(file)) {
-                    continue;
-                }
-                // We may have included a wildcard path with a lower priority
-                // extension due to the user-defined order of entries in the
-                // "include" array. If there is a lower priority extension in the
-                // same directory, we should remove it.
-                removeWildcardFilesWithLowerPriorityExtension(file, wildcardFileMap, supportedExtensions, keyMapper);
-                var key = keyMapper(file);
-                if (!ts.hasProperty(literalFileMap, key) && !ts.hasProperty(wildcardFileMap, key)) {
-                    wildcardFileMap[key] = file;
-                }
-            }
-        }
-        var literalFiles = ts.reduceProperties(literalFileMap, addFileToOutput, []);
-        var wildcardFiles = ts.reduceProperties(wildcardFileMap, addFileToOutput, []);
-        wildcardFiles.sort(host.useCaseSensitiveFileNames ? ts.compareStrings : ts.compareStringsCaseInsensitive);
-        return {
-            fileNames: literalFiles.concat(wildcardFiles),
-            wildcardDirectories: wildcardDirectories
-        };
-    }
-    function validateSpecs(specs, errors, allowTrailingRecursion) {
-        var validSpecs = [];
-        for (var _i = 0, specs_2 = specs; _i < specs_2.length; _i++) {
-            var spec = specs_2[_i];
-            if (!allowTrailingRecursion && invalidTrailingRecursionPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidMultipleRecursionPatterns.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_multiple_recursive_directory_wildcards_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else if (invalidDotDotAfterRecursiveWildcardPattern.test(spec)) {
-                errors.push(ts.createCompilerDiagnostic(ts.Diagnostics.File_specification_cannot_contain_a_parent_directory_that_appears_after_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0, spec));
-            }
-            else {
-                validSpecs.push(spec);
-            }
-        }
-        return validSpecs;
-    }
-    /**
-     * Gets directories in a set of include patterns that should be watched for changes.
-     */
-    function getWildcardDirectories(include, exclude, path, useCaseSensitiveFileNames) {
-        // We watch a directory recursively if it contains a wildcard anywhere in a directory segment
-        // of the pattern:
-        //
-        //  /a/b/**/d   - Watch /a/b recursively to catch changes to any d in any subfolder recursively
-        //  /a/b/*/d    - Watch /a/b recursively to catch any d in any immediate subfolder, even if a new subfolder is added
-        //
-        // We watch a directory without recursion if it contains a wildcard in the file segment of
-        // the pattern:
-        //
-        //  /a/b/*      - Watch /a/b directly to catch any new file
-        //  /a/b/a?z    - Watch /a/b directly to catch any new file matching a?z
-        var rawExcludeRegex = ts.getRegularExpressionForWildcard(exclude, path, "exclude");
-        var excludeRegex = rawExcludeRegex && new RegExp(rawExcludeRegex, useCaseSensitiveFileNames ? "" : "i");
-        var wildcardDirectories = {};
-        if (include !== undefined) {
-            var recursiveKeys = [];
-            for (var _i = 0, include_1 = include; _i < include_1.length; _i++) {
-                var file = include_1[_i];
-                var name_35 = ts.normalizePath(ts.combinePaths(path, file));
-                if (excludeRegex && excludeRegex.test(name_35)) {
-                    continue;
-                }
-                var match = wildcardDirectoryPattern.exec(name_35);
-                if (match) {
-                    var key = useCaseSensitiveFileNames ? match[0] : match[0].toLowerCase();
-                    var flags = watchRecursivePattern.test(name_35) ? 1 /* Recursive */ : 0 /* None */;
-                    var existingFlags = ts.getProperty(wildcardDirectories, key);
-                    if (existingFlags === undefined || existingFlags < flags) {
-                        wildcardDirectories[key] = flags;
-                        if (flags === 1 /* Recursive */) {
-                            recursiveKeys.push(key);
-                        }
-                    }
-                }
-            }
-            // Remove any subpaths under an existing recursively watched directory.
-            for (var key in wildcardDirectories) {
-                if (ts.hasProperty(wildcardDirectories, key)) {
-                    for (var _a = 0, recursiveKeys_1 = recursiveKeys; _a < recursiveKeys_1.length; _a++) {
-                        var recursiveKey = recursiveKeys_1[_a];
-                        if (key !== recursiveKey && ts.containsPath(recursiveKey, key, path, !useCaseSensitiveFileNames)) {
-                            delete wildcardDirectories[key];
-                        }
-                    }
-                }
-            }
-        }
-        return wildcardDirectories;
-    }
-    /**
-     * Determines whether a literal or wildcard file has already been included that has a higher
-     * extension priority.
-     *
-     * @param file The path to the file.
-     * @param extensionPriority The priority of the extension.
-     * @param context The expansion context.
-     */
-    function hasFileWithHigherPriorityExtension(file, literalFiles, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var adjustedExtensionPriority = ts.adjustExtensionPriority(extensionPriority);
-        for (var i = 0 /* Highest */; i < adjustedExtensionPriority; i++) {
-            var higherPriorityExtension = extensions[i];
-            var higherPriorityPath = keyMapper(ts.changeExtension(file, higherPriorityExtension));
-            if (ts.hasProperty(literalFiles, higherPriorityPath) || ts.hasProperty(wildcardFiles, higherPriorityPath)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    /**
-     * Removes files included via wildcard expansion with a lower extension priority that have
-     * already been included.
-     *
-     * @param file The path to the file.
-     * @param extensionPriority The priority of the extension.
-     * @param context The expansion context.
-     */
-    function removeWildcardFilesWithLowerPriorityExtension(file, wildcardFiles, extensions, keyMapper) {
-        var extensionPriority = ts.getExtensionPriority(file, extensions);
-        var nextExtensionPriority = ts.getNextLowestExtensionPriority(extensionPriority);
-        for (var i = nextExtensionPriority; i < extensions.length; i++) {
-            var lowerPriorityExtension = extensions[i];
-            var lowerPriorityPath = keyMapper(ts.changeExtension(file, lowerPriorityExtension));
-            delete wildcardFiles[lowerPriorityPath];
-        }
-    }
-    /**
-     * Adds a file to an array of files.
-     *
-     * @param output The output array.
-     * @param file The file path.
-     */
-    function addFileToOutput(output, file) {
-        output.push(file);
-        return output;
-    }
-    /**
-     * Gets a case sensitive key.
-     *
-     * @param key The original key.
-     */
-    function caseSensitiveKeyMapper(key) {
-        return key;
-    }
-    /**
-     * Gets a case insensitive key.
-     *
-     * @param key The original key.
-     */
-    function caseInsensitiveKeyMapper(key) {
-        return key.toLowerCase();
-    }
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var OutliningElementsCollector;
-    (function (OutliningElementsCollector) {
-        function collectElements(sourceFile) {
-            var elements = [];
-            var collapseText = "...";
-            function addOutliningSpan(hintSpanNode, startElement, endElement, autoCollapse) {
-                if (hintSpanNode && startElement && endElement) {
-                    var span = {
-                        textSpan: ts.createTextSpanFromBounds(startElement.pos, endElement.end),
-                        hintSpan: ts.createTextSpanFromBounds(hintSpanNode.getStart(), hintSpanNode.end),
-                        bannerText: collapseText,
-                        autoCollapse: autoCollapse
-                    };
-                    elements.push(span);
-                }
-            }
-            function addOutliningSpanComments(commentSpan, autoCollapse) {
-                if (commentSpan) {
-                    var span = {
-                        textSpan: ts.createTextSpanFromBounds(commentSpan.pos, commentSpan.end),
-                        hintSpan: ts.createTextSpanFromBounds(commentSpan.pos, commentSpan.end),
-                        bannerText: collapseText,
-                        autoCollapse: autoCollapse
-                    };
-                    elements.push(span);
-                }
-            }
-            function addOutliningForLeadingCommentsForNode(n) {
-                var comments = ts.getLeadingCommentRangesOfNode(n, sourceFile);
-                if (comments) {
-                    var firstSingleLineCommentStart = -1;
-                    var lastSingleLineCommentEnd = -1;
-                    var isFirstSingleLineComment = true;
-                    var singleLineCommentCount = 0;
-                    for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
-                        var currentComment = comments_2[_i];
-                        // For single line comments, combine consecutive ones (2 or more) into
-                        // a single span from the start of the first till the end of the last
-                        if (currentComment.kind === 2 /* SingleLineCommentTrivia */) {
-                            if (isFirstSingleLineComment) {
-                                firstSingleLineCommentStart = currentComment.pos;
-                            }
-                            isFirstSingleLineComment = false;
-                            lastSingleLineCommentEnd = currentComment.end;
-                            singleLineCommentCount++;
-                        }
-                        else if (currentComment.kind === 3 /* MultiLineCommentTrivia */) {
-                            combineAndAddMultipleSingleLineComments(singleLineCommentCount, firstSingleLineCommentStart, lastSingleLineCommentEnd);
-                            addOutliningSpanComments(currentComment, /*autoCollapse*/ false);
-                            singleLineCommentCount = 0;
-                            lastSingleLineCommentEnd = -1;
-                            isFirstSingleLineComment = true;
-                        }
-                    }
-                    combineAndAddMultipleSingleLineComments(singleLineCommentCount, firstSingleLineCommentStart, lastSingleLineCommentEnd);
-                }
-            }
-            function combineAndAddMultipleSingleLineComments(count, start, end) {
-                // Only outline spans of two or more consecutive single line comments
-                if (count > 1) {
-                    var multipleSingleLineComments = {
-                        pos: start,
-                        end: end,
-                        kind: 2 /* SingleLineCommentTrivia */
-                    };
-                    addOutliningSpanComments(multipleSingleLineComments, /*autoCollapse*/ false);
-                }
-            }
-            function autoCollapse(node) {
-                return ts.isFunctionBlock(node) && node.parent.kind !== 180 /* ArrowFunction */;
-            }
-            var depth = 0;
-            var maxDepth = 20;
-            function walk(n) {
-                if (depth > maxDepth) {
-                    return;
-                }
-                if (ts.isDeclaration(n)) {
-                    addOutliningForLeadingCommentsForNode(n);
-                }
-                switch (n.kind) {
-                    case 199 /* Block */:
-                        if (!ts.isFunctionBlock(n)) {
-                            var parent_15 = n.parent;
-                            var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
-                            var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
-                            // Check if the block is standalone, or 'attached' to some parent statement.
-                            // If the latter, we want to collapse the block, but consider its hint span
-                            // to be the entire span of the parent.
-                            if (parent_15.kind === 204 /* DoStatement */ ||
-                                parent_15.kind === 207 /* ForInStatement */ ||
-                                parent_15.kind === 208 /* ForOfStatement */ ||
-                                parent_15.kind === 206 /* ForStatement */ ||
-                                parent_15.kind === 203 /* IfStatement */ ||
-                                parent_15.kind === 205 /* WhileStatement */ ||
-                                parent_15.kind === 212 /* WithStatement */ ||
-                                parent_15.kind === 252 /* CatchClause */) {
-                                addOutliningSpan(parent_15, openBrace, closeBrace, autoCollapse(n));
-                                break;
-                            }
-                            if (parent_15.kind === 216 /* TryStatement */) {
-                                // Could be the try-block, or the finally-block.
-                                var tryStatement = parent_15;
-                                if (tryStatement.tryBlock === n) {
-                                    addOutliningSpan(parent_15, openBrace, closeBrace, autoCollapse(n));
-                                    break;
-                                }
-                                else if (tryStatement.finallyBlock === n) {
-                                    var finallyKeyword = ts.findChildOfKind(tryStatement, 85 /* FinallyKeyword */, sourceFile);
-                                    if (finallyKeyword) {
-                                        addOutliningSpan(finallyKeyword, openBrace, closeBrace, autoCollapse(n));
-                                        break;
-                                    }
-                                }
-                            }
-                            // Block was a standalone block.  In this case we want to only collapse
-                            // the span of the block, independent of any parent span.
-                            var span = ts.createTextSpanFromBounds(n.getStart(), n.end);
-                            elements.push({
-                                textSpan: span,
-                                hintSpan: span,
-                                bannerText: collapseText,
-                                autoCollapse: autoCollapse(n)
-                            });
-                            break;
-                        }
-                    // Fallthrough.
-                    case 226 /* ModuleBlock */: {
-                        var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
-                        var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
-                        addOutliningSpan(n.parent, openBrace, closeBrace, autoCollapse(n));
-                        break;
-                    }
-                    case 221 /* ClassDeclaration */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 171 /* ObjectLiteralExpression */:
-                    case 227 /* CaseBlock */: {
-                        var openBrace = ts.findChildOfKind(n, 15 /* OpenBraceToken */, sourceFile);
-                        var closeBrace = ts.findChildOfKind(n, 16 /* CloseBraceToken */, sourceFile);
-                        addOutliningSpan(n, openBrace, closeBrace, autoCollapse(n));
-                        break;
-                    }
-                    case 170 /* ArrayLiteralExpression */:
-                        var openBracket = ts.findChildOfKind(n, 19 /* OpenBracketToken */, sourceFile);
-                        var closeBracket = ts.findChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
-                        addOutliningSpan(n, openBracket, closeBracket, autoCollapse(n));
-                        break;
-                }
-                depth++;
-                ts.forEachChild(n, walk);
-                depth--;
-            }
-            walk(sourceFile);
-            return elements;
-        }
-        OutliningElementsCollector.collectElements = collectElements;
-    })(OutliningElementsCollector = ts.OutliningElementsCollector || (ts.OutliningElementsCollector = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    var NavigateTo;
-    (function (NavigateTo) {
-        function getNavigateToItems(program, checker, cancellationToken, searchValue, maxResultCount) {
-            var patternMatcher = ts.createPatternMatcher(searchValue);
-            var rawItems = [];
-            // This means "compare in a case insensitive manner."
-            var baseSensitivity = { sensitivity: "base" };
-            // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
-            ts.forEach(program.getSourceFiles(), function (sourceFile) {
-                cancellationToken.throwIfCancellationRequested();
-                var nameToDeclarations = sourceFile.getNamedDeclarations();
-                for (var name_36 in nameToDeclarations) {
-                    var declarations = ts.getProperty(nameToDeclarations, name_36);
-                    if (declarations) {
-                        // First do a quick check to see if the name of the declaration matches the
-                        // last portion of the (possibly) dotted name they're searching for.
-                        var matches = patternMatcher.getMatchesForLastSegmentOfPattern(name_36);
-                        if (!matches) {
-                            continue;
-                        }
-                        for (var _i = 0, declarations_7 = declarations; _i < declarations_7.length; _i++) {
-                            var declaration = declarations_7[_i];
-                            // It was a match!  If the pattern has dots in it, then also see if the
-                            // declaration container matches as well.
-                            if (patternMatcher.patternContainsDots) {
-                                var containers = getContainers(declaration);
-                                if (!containers) {
-                                    return undefined;
-                                }
-                                matches = patternMatcher.getMatches(containers, name_36);
-                                if (!matches) {
-                                    continue;
-                                }
-                            }
-                            var fileName = sourceFile.fileName;
-                            var matchKind = bestMatchKind(matches);
-                            rawItems.push({ name: name_36, fileName: fileName, matchKind: matchKind, isCaseSensitive: allMatchesAreCaseSensitive(matches), declaration: declaration });
-                        }
-                    }
-                }
-            });
-            // Remove imports when the imported declaration is already in the list and has the same name.
-            rawItems = ts.filter(rawItems, function (item) {
-                var decl = item.declaration;
-                if (decl.kind === 231 /* ImportClause */ || decl.kind === 234 /* ImportSpecifier */ || decl.kind === 229 /* ImportEqualsDeclaration */) {
-                    var importer = checker.getSymbolAtLocation(decl.name);
-                    var imported = checker.getAliasedSymbol(importer);
-                    return importer.name !== imported.name;
-                }
-                else {
-                    return true;
-                }
-            });
-            rawItems.sort(compareNavigateToItems);
-            if (maxResultCount !== undefined) {
-                rawItems = rawItems.slice(0, maxResultCount);
-            }
-            var items = ts.map(rawItems, createNavigateToItem);
-            return items;
-            function allMatchesAreCaseSensitive(matches) {
-                ts.Debug.assert(matches.length > 0);
-                // This is a case sensitive match, only if all the submatches were case sensitive.
-                for (var _i = 0, matches_1 = matches; _i < matches_1.length; _i++) {
-                    var match = matches_1[_i];
-                    if (!match.isCaseSensitive) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            function getTextOfIdentifierOrLiteral(node) {
-                if (node) {
-                    if (node.kind === 69 /* Identifier */ ||
-                        node.kind === 9 /* StringLiteral */ ||
-                        node.kind === 8 /* NumericLiteral */) {
-                        return node.text;
-                    }
-                }
-                return undefined;
-            }
-            function tryAddSingleDeclarationName(declaration, containers) {
-                if (declaration && declaration.name) {
-                    var text = getTextOfIdentifierOrLiteral(declaration.name);
-                    if (text !== undefined) {
-                        containers.unshift(text);
-                    }
-                    else if (declaration.name.kind === 140 /* ComputedPropertyName */) {
-                        return tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ true);
-                    }
-                    else {
-                        // Don't know how to add this.
-                        return false;
-                    }
-                }
-                return true;
-            }
-            // Only added the names of computed properties if they're simple dotted expressions, like:
-            //
-            //      [X.Y.Z]() { }
-            function tryAddComputedPropertyName(expression, containers, includeLastPortion) {
-                var text = getTextOfIdentifierOrLiteral(expression);
-                if (text !== undefined) {
-                    if (includeLastPortion) {
-                        containers.unshift(text);
-                    }
-                    return true;
-                }
-                if (expression.kind === 172 /* PropertyAccessExpression */) {
-                    var propertyAccess = expression;
-                    if (includeLastPortion) {
-                        containers.unshift(propertyAccess.name.text);
-                    }
-                    return tryAddComputedPropertyName(propertyAccess.expression, containers, /*includeLastPortion*/ true);
-                }
-                return false;
-            }
-            function getContainers(declaration) {
-                var containers = [];
-                // First, if we started with a computed property name, then add all but the last
-                // portion into the container array.
-                if (declaration.name.kind === 140 /* ComputedPropertyName */) {
-                    if (!tryAddComputedPropertyName(declaration.name.expression, containers, /*includeLastPortion*/ false)) {
-                        return undefined;
-                    }
-                }
-                // Now, walk up our containers, adding all their names to the container array.
-                declaration = ts.getContainerNode(declaration);
-                while (declaration) {
-                    if (!tryAddSingleDeclarationName(declaration, containers)) {
-                        return undefined;
-                    }
-                    declaration = ts.getContainerNode(declaration);
-                }
-                return containers;
-            }
-            function bestMatchKind(matches) {
-                ts.Debug.assert(matches.length > 0);
-                var bestMatchKind = ts.PatternMatchKind.camelCase;
-                for (var _i = 0, matches_2 = matches; _i < matches_2.length; _i++) {
-                    var match = matches_2[_i];
-                    var kind = match.kind;
-                    if (kind < bestMatchKind) {
-                        bestMatchKind = kind;
-                    }
-                }
-                return bestMatchKind;
-            }
-            function compareNavigateToItems(i1, i2) {
-                // TODO(cyrusn): get the gamut of comparisons that VS already uses here.
-                // Right now we just sort by kind first, and then by name of the item.
-                // We first sort case insensitively.  So "Aaa" will come before "bar".
-                // Then we sort case sensitively, so "aaa" will come before "Aaa".
-                return i1.matchKind - i2.matchKind ||
-                    i1.name.localeCompare(i2.name, undefined, baseSensitivity) ||
-                    i1.name.localeCompare(i2.name);
-            }
-            function createNavigateToItem(rawItem) {
-                var declaration = rawItem.declaration;
-                var container = ts.getContainerNode(declaration);
-                return {
-                    name: rawItem.name,
-                    kind: ts.getNodeKind(declaration),
-                    kindModifiers: ts.getNodeModifiers(declaration),
-                    matchKind: ts.PatternMatchKind[rawItem.matchKind],
-                    isCaseSensitive: rawItem.isCaseSensitive,
-                    fileName: rawItem.fileName,
-                    textSpan: ts.createTextSpanFromBounds(declaration.getStart(), declaration.getEnd()),
-                    // TODO(jfreeman): What should be the containerName when the container has a computed name?
-                    containerName: container && container.name ? container.name.text : "",
-                    containerKind: container && container.name ? ts.getNodeKind(container) : ""
-                };
-            }
-        }
-        NavigateTo.getNavigateToItems = getNavigateToItems;
-    })(NavigateTo = ts.NavigateTo || (ts.NavigateTo = {}));
-})(ts || (ts = {}));
-/// <reference path='services.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var NavigationBar;
-    (function (NavigationBar) {
-        function getNavigationBarItems(sourceFile) {
-            curSourceFile = sourceFile;
-            var result = ts.map(topLevelItems(rootNavigationBarNode(sourceFile)), convertToTopLevelItem);
-            curSourceFile = undefined;
-            return result;
-        }
-        NavigationBar.getNavigationBarItems = getNavigationBarItems;
-        // Keep sourceFile handy so we don't have to search for it every time we need to call `getText`.
-        var curSourceFile;
-        function nodeText(node) {
-            return node.getText(curSourceFile);
-        }
-        function navigationBarNodeKind(n) {
-            return n.node.kind;
-        }
-        function pushChild(parent, child) {
-            if (parent.children) {
-                parent.children.push(child);
-            }
-            else {
-                parent.children = [child];
-            }
-        }
-        /*
-        For performance, we keep navigation bar parents on a stack rather than passing them through each recursion.
-        `parent` is the current parent and is *not* stored in parentsStack.
-        `startNode` sets a new parent and `endNode` returns to the previous parent.
-        */
-        var parentsStack = [];
-        var parent;
-        function rootNavigationBarNode(sourceFile) {
-            ts.Debug.assert(!parentsStack.length);
-            var root = { node: sourceFile, additionalNodes: undefined, parent: undefined, children: undefined, indent: 0 };
-            parent = root;
-            for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
-                var statement = _a[_i];
-                addChildrenRecursively(statement);
-            }
-            endNode();
-            ts.Debug.assert(!parent && !parentsStack.length);
-            return root;
-        }
-        function addLeafNode(node) {
-            pushChild(parent, emptyNavigationBarNode(node));
-        }
-        function emptyNavigationBarNode(node) {
-            return {
-                node: node,
-                additionalNodes: undefined,
-                parent: parent,
-                children: undefined,
-                indent: parent.indent + 1
-            };
-        }
-        /**
-         * Add a new level of NavigationBarNodes.
-         * This pushes to the stack, so you must call `endNode` when you are done adding to this node.
-         */
-        function startNode(node) {
-            var navNode = emptyNavigationBarNode(node);
-            pushChild(parent, navNode);
-            // Save the old parent
-            parentsStack.push(parent);
-            parent = navNode;
-        }
-        /** Call after calling `startNode` and adding children to it. */
-        function endNode() {
-            if (parent.children) {
-                mergeChildren(parent.children);
-                sortChildren(parent.children);
-            }
-            parent = parentsStack.pop();
-        }
-        function addNodeWithRecursiveChild(node, child) {
-            startNode(node);
-            addChildrenRecursively(child);
-            endNode();
-        }
-        /** Look for navigation bar items in node's subtree, adding them to the current `parent`. */
-        function addChildrenRecursively(node) {
-            if (!node || ts.isToken(node)) {
-                return;
-            }
-            switch (node.kind) {
-                case 148 /* Constructor */:
-                    // Get parameter properties, and treat them as being on the *same* level as the constructor, not under it.
-                    var ctr = node;
-                    addNodeWithRecursiveChild(ctr, ctr.body);
-                    // Parameter properties are children of the class, not the constructor.
-                    for (var _i = 0, _a = ctr.parameters; _i < _a.length; _i++) {
-                        var param = _a[_i];
-                        if (ts.isParameterPropertyDeclaration(param)) {
-                            addLeafNode(param);
-                        }
-                    }
-                    break;
-                case 147 /* MethodDeclaration */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 146 /* MethodSignature */:
-                    if (!ts.hasDynamicName(node)) {
-                        addNodeWithRecursiveChild(node, node.body);
-                    }
-                    break;
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                    if (!ts.hasDynamicName(node)) {
-                        addLeafNode(node);
-                    }
-                    break;
-                case 231 /* ImportClause */:
-                    var importClause = node;
-                    // Handle default import case e.g.:
-                    //    import d from "mod";
-                    if (importClause.name) {
-                        addLeafNode(importClause);
-                    }
-                    // Handle named bindings in imports e.g.:
-                    //    import * as NS from "mod";
-                    //    import {a, b as B} from "mod";
-                    var namedBindings = importClause.namedBindings;
-                    if (namedBindings) {
-                        if (namedBindings.kind === 232 /* NamespaceImport */) {
-                            addLeafNode(namedBindings);
-                        }
-                        else {
-                            for (var _b = 0, _c = namedBindings.elements; _b < _c.length; _b++) {
-                                var element = _c[_b];
-                                addLeafNode(element);
-                            }
-                        }
-                    }
-                    break;
-                case 169 /* BindingElement */:
-                case 218 /* VariableDeclaration */:
-                    var decl = node;
-                    var name_37 = decl.name;
-                    if (ts.isBindingPattern(name_37)) {
-                        addChildrenRecursively(name_37);
-                    }
-                    else if (decl.initializer && isFunctionOrClassExpression(decl.initializer)) {
-                        // For `const x = function() {}`, just use the function node, not the const.
-                        addChildrenRecursively(decl.initializer);
-                    }
-                    else {
-                        addNodeWithRecursiveChild(decl, decl.initializer);
-                    }
-                    break;
-                case 180 /* ArrowFunction */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                    addNodeWithRecursiveChild(node, node.body);
-                    break;
-                case 224 /* EnumDeclaration */:
-                    startNode(node);
-                    for (var _d = 0, _e = node.members; _d < _e.length; _d++) {
-                        var member = _e[_d];
-                        if (!isComputedProperty(member)) {
-                            addLeafNode(member);
-                        }
-                    }
-                    endNode();
-                    break;
-                case 221 /* ClassDeclaration */:
-                case 192 /* ClassExpression */:
-                case 222 /* InterfaceDeclaration */:
-                    startNode(node);
-                    for (var _f = 0, _g = node.members; _f < _g.length; _f++) {
-                        var member = _g[_f];
-                        addChildrenRecursively(member);
-                    }
-                    endNode();
-                    break;
-                case 225 /* ModuleDeclaration */:
-                    addNodeWithRecursiveChild(node, getInteriorModule(node).body);
-                    break;
-                case 238 /* ExportSpecifier */:
-                case 229 /* ImportEqualsDeclaration */:
-                case 153 /* IndexSignature */:
-                case 151 /* CallSignature */:
-                case 152 /* ConstructSignature */:
-                case 223 /* TypeAliasDeclaration */:
-                    addLeafNode(node);
-                    break;
-                default:
-                    if (node.jsDocComments) {
-                        for (var _h = 0, _j = node.jsDocComments; _h < _j.length; _h++) {
-                            var jsDocComment = _j[_h];
-                            for (var _k = 0, _l = jsDocComment.tags; _k < _l.length; _k++) {
-                                var tag = _l[_k];
-                                if (tag.kind === 279 /* JSDocTypedefTag */) {
-                                    addLeafNode(tag);
-                                }
-                            }
-                        }
-                    }
-                    ts.forEachChild(node, addChildrenRecursively);
-            }
-        }
-        /** Merge declarations of the same kind. */
-        function mergeChildren(children) {
-            var nameToItems = {};
-            ts.filterMutate(children, function (child) {
-                var decl = child.node;
-                var name = decl.name && nodeText(decl.name);
-                if (!name) {
-                    // Anonymous items are never merged.
-                    return true;
-                }
-                var itemsWithSameName = ts.getProperty(nameToItems, name);
-                if (!itemsWithSameName) {
-                    nameToItems[name] = child;
-                    return true;
-                }
-                if (itemsWithSameName instanceof Array) {
-                    for (var _i = 0, itemsWithSameName_1 = itemsWithSameName; _i < itemsWithSameName_1.length; _i++) {
-                        var itemWithSameName = itemsWithSameName_1[_i];
-                        if (tryMerge(itemWithSameName, child)) {
-                            return false;
-                        }
-                    }
-                    itemsWithSameName.push(child);
-                    return true;
-                }
-                else {
-                    var itemWithSameName = itemsWithSameName;
-                    if (tryMerge(itemWithSameName, child)) {
-                        return false;
-                    }
-                    nameToItems[name] = [itemWithSameName, child];
-                    return true;
-                }
-                function tryMerge(a, b) {
-                    if (shouldReallyMerge(a.node, b.node)) {
-                        merge(a, b);
-                        return true;
-                    }
-                    return false;
-                }
-            });
-            /** a and b have the same name, but they may not be mergeable. */
-            function shouldReallyMerge(a, b) {
-                return a.kind === b.kind && (a.kind !== 225 /* ModuleDeclaration */ || areSameModule(a, b));
-                // We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
-                // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
-                function areSameModule(a, b) {
-                    if (a.body.kind !== b.body.kind) {
-                        return false;
-                    }
-                    if (a.body.kind !== 225 /* ModuleDeclaration */) {
-                        return true;
-                    }
-                    return areSameModule(a.body, b.body);
-                }
-            }
-            /** Merge source into target. Source should be thrown away after this is called. */
-            function merge(target, source) {
-                target.additionalNodes = target.additionalNodes || [];
-                target.additionalNodes.push(source.node);
-                if (source.additionalNodes) {
-                    (_a = target.additionalNodes).push.apply(_a, source.additionalNodes);
-                }
-                target.children = ts.concatenate(target.children, source.children);
-                if (target.children) {
-                    mergeChildren(target.children);
-                    sortChildren(target.children);
-                }
-                var _a;
-            }
-        }
-        /** Recursively ensure that each NavNode's children are in sorted order. */
-        function sortChildren(children) {
-            children.sort(compareChildren);
-        }
-        function compareChildren(child1, child2) {
-            var name1 = tryGetName(child1.node), name2 = tryGetName(child2.node);
-            if (name1 && name2) {
-                var cmp = localeCompareFix(name1, name2);
-                return cmp !== 0 ? cmp : navigationBarNodeKind(child1) - navigationBarNodeKind(child2);
-            }
-            else {
-                return name1 ? 1 : name2 ? -1 : navigationBarNodeKind(child1) - navigationBarNodeKind(child2);
-            }
-        }
-        // More efficient to create a collator once and use its `compare` than to call `a.localeCompare(b)` many times.
-        var collator = typeof Intl === "undefined" ? undefined : new Intl.Collator();
-        // Intl is missing in Safari, and node 0.10 treats "a" as greater than "B".
-        var localeCompareIsCorrect = collator && collator.compare("a", "B") < 0;
-        var localeCompareFix = localeCompareIsCorrect ? collator.compare : function (a, b) {
-            // This isn't perfect, but it passes all of our tests.
-            for (var i = 0; i < Math.min(a.length, b.length); i++) {
-                var chA = a.charAt(i), chB = b.charAt(i);
-                if (chA === "\"" && chB === "'") {
-                    return 1;
-                }
-                if (chA === "'" && chB === "\"") {
-                    return -1;
-                }
-                var cmp = chA.toLocaleLowerCase().localeCompare(chB.toLocaleLowerCase());
-                if (cmp !== 0) {
-                    return cmp;
-                }
-            }
-            return a.length - b.length;
-        };
-        /**
-         * This differs from getItemName because this is just used for sorting.
-         * We only sort nodes by name that have a more-or-less "direct" name, as opposed to `new()` and the like.
-         * So `new()` can still come before an `aardvark` method.
-         */
-        function tryGetName(node) {
-            if (node.kind === 225 /* ModuleDeclaration */) {
-                return getModuleName(node);
-            }
-            var decl = node;
-            if (decl.name) {
-                return ts.getPropertyNameForPropertyNameNode(decl.name);
-            }
-            switch (node.kind) {
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                case 192 /* ClassExpression */:
-                    return getFunctionOrClassName(node);
-                case 279 /* JSDocTypedefTag */:
-                    return getJSDocTypedefTagName(node);
-                default:
-                    return undefined;
-            }
-        }
-        function getItemName(node) {
-            if (node.kind === 225 /* ModuleDeclaration */) {
-                return getModuleName(node);
-            }
-            var name = node.name;
-            if (name) {
-                var text = nodeText(name);
-                if (text.length > 0) {
-                    return text;
-                }
-            }
-            switch (node.kind) {
-                case 256 /* SourceFile */:
-                    var sourceFile = node;
-                    return ts.isExternalModule(sourceFile)
-                        ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
-                        : "<global>";
-                case 180 /* ArrowFunction */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 221 /* ClassDeclaration */:
-                case 192 /* ClassExpression */:
-                    if (node.flags & 512 /* Default */) {
-                        return "default";
-                    }
-                    return getFunctionOrClassName(node);
-                case 148 /* Constructor */:
-                    return "constructor";
-                case 152 /* ConstructSignature */:
-                    return "new()";
-                case 151 /* CallSignature */:
-                    return "()";
-                case 153 /* IndexSignature */:
-                    return "[]";
-                case 279 /* JSDocTypedefTag */:
-                    return getJSDocTypedefTagName(node);
-                default:
-                    return "<unknown>";
-            }
-        }
-        function getJSDocTypedefTagName(node) {
-            if (node.name) {
-                return node.name.text;
-            }
-            else {
-                var parentNode = node.parent && node.parent.parent;
-                if (parentNode && parentNode.kind === 200 /* VariableStatement */) {
-                    if (parentNode.declarationList.declarations.length > 0) {
-                        var nameIdentifier = parentNode.declarationList.declarations[0].name;
-                        if (nameIdentifier.kind === 69 /* Identifier */) {
-                            return nameIdentifier.text;
-                        }
-                    }
-                }
-                return "<typedef>";
-            }
-        }
-        /** Flattens the NavNode tree to a list, keeping only the top-level items. */
-        function topLevelItems(root) {
-            var topLevel = [];
-            function recur(item) {
-                if (isTopLevel(item)) {
-                    topLevel.push(item);
-                    if (item.children) {
-                        for (var _i = 0, _a = item.children; _i < _a.length; _i++) {
-                            var child = _a[_i];
-                            recur(child);
-                        }
-                    }
-                }
-            }
-            recur(root);
-            return topLevel;
-            function isTopLevel(item) {
-                switch (navigationBarNodeKind(item)) {
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 224 /* EnumDeclaration */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 225 /* ModuleDeclaration */:
-                    case 256 /* SourceFile */:
-                    case 223 /* TypeAliasDeclaration */:
-                    case 279 /* JSDocTypedefTag */:
-                        return true;
-                    case 148 /* Constructor */:
-                    case 147 /* MethodDeclaration */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        return hasSomeImportantChild(item);
-                    case 180 /* ArrowFunction */:
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                        return isTopLevelFunctionDeclaration(item);
-                    default:
-                        return false;
-                }
-                function isTopLevelFunctionDeclaration(item) {
-                    if (!item.node.body) {
-                        return false;
-                    }
-                    switch (navigationBarNodeKind(item.parent)) {
-                        case 226 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
-                        case 147 /* MethodDeclaration */:
-                        case 148 /* Constructor */:
-                            return true;
-                        default:
-                            return hasSomeImportantChild(item);
-                    }
-                }
-                function hasSomeImportantChild(item) {
-                    return ts.forEach(item.children, function (child) {
-                        var childKind = navigationBarNodeKind(child);
-                        return childKind !== 218 /* VariableDeclaration */ && childKind !== 169 /* BindingElement */;
-                    });
-                }
-            }
-        }
-        // NavigationBarItem requires an array, but will not mutate it, so just give it this for performance.
-        var emptyChildItemArray = [];
-        function convertToTopLevelItem(n) {
-            return {
-                text: getItemName(n.node),
-                kind: nodeKind(n.node),
-                kindModifiers: ts.getNodeModifiers(n.node),
-                spans: getSpans(n),
-                childItems: ts.map(n.children, convertToChildItem) || emptyChildItemArray,
-                indent: n.indent,
-                bolded: false,
-                grayed: false
-            };
-            function convertToChildItem(n) {
-                return {
-                    text: getItemName(n.node),
-                    kind: nodeKind(n.node),
-                    kindModifiers: ts.getNodeModifiers(n.node),
-                    spans: getSpans(n),
-                    childItems: emptyChildItemArray,
-                    indent: 0,
-                    bolded: false,
-                    grayed: false
-                };
-            }
-            function getSpans(n) {
-                var spans = [getNodeSpan(n.node)];
-                if (n.additionalNodes) {
-                    for (var _i = 0, _a = n.additionalNodes; _i < _a.length; _i++) {
-                        var node = _a[_i];
-                        spans.push(getNodeSpan(node));
-                    }
-                }
-                return spans;
-            }
-        }
-        // TODO: GH#9145: We should just use getNodeKind. No reason why navigationBar and navigateTo should have different behaviors.
-        function nodeKind(node) {
-            switch (node.kind) {
-                case 256 /* SourceFile */:
-                    return ts.ScriptElementKind.moduleElement;
-                case 255 /* EnumMember */:
-                    return ts.ScriptElementKind.memberVariableElement;
-                case 218 /* VariableDeclaration */:
-                case 169 /* BindingElement */:
-                    var variableDeclarationNode = void 0;
-                    var name_38;
-                    if (node.kind === 169 /* BindingElement */) {
-                        name_38 = node.name;
-                        variableDeclarationNode = node;
-                        // binding elements are added only for variable declarations
-                        // bubble up to the containing variable declaration
-                        while (variableDeclarationNode && variableDeclarationNode.kind !== 218 /* VariableDeclaration */) {
-                            variableDeclarationNode = variableDeclarationNode.parent;
-                        }
-                        ts.Debug.assert(!!variableDeclarationNode);
-                    }
-                    else {
-                        ts.Debug.assert(!ts.isBindingPattern(node.name));
-                        variableDeclarationNode = node;
-                        name_38 = node.name;
-                    }
-                    if (ts.isConst(variableDeclarationNode)) {
-                        return ts.ScriptElementKind.constElement;
-                    }
-                    else if (ts.isLet(variableDeclarationNode)) {
-                        return ts.ScriptElementKind.letElement;
-                    }
-                    else {
-                        return ts.ScriptElementKind.variableElement;
-                    }
-                case 180 /* ArrowFunction */:
-                    return ts.ScriptElementKind.functionElement;
-                case 279 /* JSDocTypedefTag */:
-                    return ts.ScriptElementKind.typeElement;
-                default:
-                    return ts.getNodeKind(node);
-            }
-        }
-        function getModuleName(moduleDeclaration) {
-            // We want to maintain quotation marks.
-            if (ts.isAmbientModule(moduleDeclaration)) {
-                return ts.getTextOfNode(moduleDeclaration.name);
-            }
-            // Otherwise, we need to aggregate each identifier to build up the qualified name.
-            var result = [];
-            result.push(moduleDeclaration.name.text);
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 225 /* ModuleDeclaration */) {
-                moduleDeclaration = moduleDeclaration.body;
-                result.push(moduleDeclaration.name.text);
-            }
-            return result.join(".");
-        }
-        /**
-         * For 'module A.B.C', we want to get the node for 'C'.
-         * We store 'A' as associated with a NavNode, and use getModuleName to traverse down again.
-         */
-        function getInteriorModule(decl) {
-            return decl.body.kind === 225 /* ModuleDeclaration */ ? getInteriorModule(decl.body) : decl;
-        }
-        function isComputedProperty(member) {
-            return !member.name || member.name.kind === 140 /* ComputedPropertyName */;
-        }
-        function getNodeSpan(node) {
-            return node.kind === 256 /* SourceFile */
-                ? ts.createTextSpanFromBounds(node.getFullStart(), node.getEnd())
-                : ts.createTextSpanFromBounds(node.getStart(curSourceFile), node.getEnd());
-        }
-        function getFunctionOrClassName(node) {
-            if (node.name && ts.getFullWidth(node.name) > 0) {
-                return ts.declarationNameToString(node.name);
-            }
-            else if (node.parent.kind === 218 /* VariableDeclaration */) {
-                return ts.declarationNameToString(node.parent.name);
-            }
-            else if (node.parent.kind === 187 /* BinaryExpression */ &&
-                node.parent.operatorToken.kind === 56 /* EqualsToken */) {
-                return nodeText(node.parent.left);
-            }
-            else if (node.parent.kind === 253 /* PropertyAssignment */ && node.parent.name) {
-                return nodeText(node.parent.name);
-            }
-            else if (node.flags & 512 /* Default */) {
-                return "default";
-            }
-            else {
-                return ts.isClassLike(node) ? "<class>" : "<function>";
-            }
-        }
-        function isFunctionOrClassExpression(node) {
-            return node.kind === 179 /* FunctionExpression */ || node.kind === 180 /* ArrowFunction */ || node.kind === 192 /* ClassExpression */;
-        }
-    })(NavigationBar = ts.NavigationBar || (ts.NavigationBar = {}));
-})(ts || (ts = {}));
-/* @internal */
-var ts;
-(function (ts) {
-    // Note(cyrusn): this enum is ordered from strongest match type to weakest match type.
-    (function (PatternMatchKind) {
-        PatternMatchKind[PatternMatchKind["exact"] = 0] = "exact";
-        PatternMatchKind[PatternMatchKind["prefix"] = 1] = "prefix";
-        PatternMatchKind[PatternMatchKind["substring"] = 2] = "substring";
-        PatternMatchKind[PatternMatchKind["camelCase"] = 3] = "camelCase";
-    })(ts.PatternMatchKind || (ts.PatternMatchKind = {}));
-    var PatternMatchKind = ts.PatternMatchKind;
-    function createPatternMatch(kind, punctuationStripped, isCaseSensitive, camelCaseWeight) {
-        return {
-            kind: kind,
-            punctuationStripped: punctuationStripped,
-            isCaseSensitive: isCaseSensitive,
-            camelCaseWeight: camelCaseWeight
-        };
-    }
-    function createPatternMatcher(pattern) {
-        // We'll often see the same candidate string many times when searching (For example, when
-        // we see the name of a module that is used everywhere, or the name of an overload).  As
-        // such, we cache the information we compute about the candidate for the life of this
-        // pattern matcher so we don't have to compute it multiple times.
-        var stringToWordSpans = {};
-        pattern = pattern.trim();
-        var dotSeparatedSegments = pattern.split(".").map(function (p) { return createSegment(p.trim()); });
-        var invalidPattern = dotSeparatedSegments.length === 0 || ts.forEach(dotSeparatedSegments, segmentIsInvalid);
-        return {
-            getMatches: getMatches,
-            getMatchesForLastSegmentOfPattern: getMatchesForLastSegmentOfPattern,
-            patternContainsDots: dotSeparatedSegments.length > 1
-        };
-        // Quick checks so we can bail out when asked to match a candidate.
-        function skipMatch(candidate) {
-            return invalidPattern || !candidate;
-        }
-        function getMatchesForLastSegmentOfPattern(candidate) {
-            if (skipMatch(candidate)) {
-                return undefined;
-            }
-            return matchSegment(candidate, ts.lastOrUndefined(dotSeparatedSegments));
-        }
-        function getMatches(candidateContainers, candidate) {
-            if (skipMatch(candidate)) {
-                return undefined;
-            }
-            // First, check that the last part of the dot separated pattern matches the name of the
-            // candidate.  If not, then there's no point in proceeding and doing the more
-            // expensive work.
-            var candidateMatch = matchSegment(candidate, ts.lastOrUndefined(dotSeparatedSegments));
-            if (!candidateMatch) {
-                return undefined;
-            }
-            candidateContainers = candidateContainers || [];
-            // -1 because the last part was checked against the name, and only the rest
-            // of the parts are checked against the container.
-            if (dotSeparatedSegments.length - 1 > candidateContainers.length) {
-                // There weren't enough container parts to match against the pattern parts.
-                // So this definitely doesn't match.
-                return undefined;
-            }
-            // So far so good.  Now break up the container for the candidate and check if all
-            // the dotted parts match up correctly.
-            var totalMatch = candidateMatch;
-            for (var i = dotSeparatedSegments.length - 2, j = candidateContainers.length - 1; i >= 0; i -= 1, j -= 1) {
-                var segment = dotSeparatedSegments[i];
-                var containerName = candidateContainers[j];
-                var containerMatch = matchSegment(containerName, segment);
-                if (!containerMatch) {
-                    // This container didn't match the pattern piece.  So there's no match at all.
-                    return undefined;
-                }
-                ts.addRange(totalMatch, containerMatch);
-            }
-            // Success, this symbol's full name matched against the dotted name the user was asking
-            // about.
-            return totalMatch;
-        }
-        function getWordSpans(word) {
-            if (!ts.hasProperty(stringToWordSpans, word)) {
-                stringToWordSpans[word] = breakIntoWordSpans(word);
-            }
-            return stringToWordSpans[word];
-        }
-        function matchTextChunk(candidate, chunk, punctuationStripped) {
-            var index = indexOfIgnoringCase(candidate, chunk.textLowerCase);
-            if (index === 0) {
-                if (chunk.text.length === candidate.length) {
-                    // a) Check if the part matches the candidate entirely, in an case insensitive or
-                    //    sensitive manner.  If it does, return that there was an exact match.
-                    return createPatternMatch(PatternMatchKind.exact, punctuationStripped, /*isCaseSensitive:*/ candidate === chunk.text);
-                }
-                else {
-                    // b) Check if the part is a prefix of the candidate, in a case insensitive or sensitive
-                    //    manner.  If it does, return that there was a prefix match.
-                    return createPatternMatch(PatternMatchKind.prefix, punctuationStripped, /*isCaseSensitive:*/ startsWith(candidate, chunk.text));
-                }
-            }
-            var isLowercase = chunk.isLowerCase;
-            if (isLowercase) {
-                if (index > 0) {
-                    // c) If the part is entirely lowercase, then check if it is contained anywhere in the
-                    //    candidate in a case insensitive manner.  If so, return that there was a substring
-                    //    match.
-                    //
-                    //    Note: We only have a substring match if the lowercase part is prefix match of some
-                    //    word part. That way we don't match something like 'Class' when the user types 'a'.
-                    //    But we would match 'FooAttribute' (since 'Attribute' starts with 'a').
-                    var wordSpans = getWordSpans(candidate);
-                    for (var _i = 0, wordSpans_1 = wordSpans; _i < wordSpans_1.length; _i++) {
-                        var span = wordSpans_1[_i];
-                        if (partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ true)) {
-                            return createPatternMatch(PatternMatchKind.substring, punctuationStripped, 
-                            /*isCaseSensitive:*/ partStartsWith(candidate, span, chunk.text, /*ignoreCase:*/ false));
-                        }
-                    }
-                }
-            }
-            else {
-                // d) If the part was not entirely lowercase, then check if it is contained in the
-                //    candidate in a case *sensitive* manner. If so, return that there was a substring
-                //    match.
-                if (candidate.indexOf(chunk.text) > 0) {
-                    return createPatternMatch(PatternMatchKind.substring, punctuationStripped, /*isCaseSensitive:*/ true);
-                }
-            }
-            if (!isLowercase) {
-                // e) If the part was not entirely lowercase, then attempt a camel cased match as well.
-                if (chunk.characterSpans.length > 0) {
-                    var candidateParts = getWordSpans(candidate);
-                    var camelCaseWeight = tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ false);
-                    if (camelCaseWeight !== undefined) {
-                        return createPatternMatch(PatternMatchKind.camelCase, punctuationStripped, /*isCaseSensitive:*/ true, /*camelCaseWeight:*/ camelCaseWeight);
-                    }
-                    camelCaseWeight = tryCamelCaseMatch(candidate, candidateParts, chunk, /*ignoreCase:*/ true);
-                    if (camelCaseWeight !== undefined) {
-                        return createPatternMatch(PatternMatchKind.camelCase, punctuationStripped, /*isCaseSensitive:*/ false, /*camelCaseWeight:*/ camelCaseWeight);
-                    }
-                }
-            }
-            if (isLowercase) {
-                // f) Is the pattern a substring of the candidate starting on one of the candidate's word boundaries?
-                // We could check every character boundary start of the candidate for the pattern. However, that's
-                // an m * n operation in the wost case. Instead, find the first instance of the pattern
-                // substring, and see if it starts on a capital letter. It seems unlikely that the user will try to
-                // filter the list based on a substring that starts on a capital letter and also with a lowercase one.
-                // (Pattern: fogbar, Candidate: quuxfogbarFogBar).
-                if (chunk.text.length < candidate.length) {
-                    if (index > 0 && isUpperCaseLetter(candidate.charCodeAt(index))) {
-                        return createPatternMatch(PatternMatchKind.substring, punctuationStripped, /*isCaseSensitive:*/ false);
-                    }
-                }
-            }
-            return undefined;
-        }
-        function containsSpaceOrAsterisk(text) {
-            for (var i = 0; i < text.length; i++) {
-                var ch = text.charCodeAt(i);
-                if (ch === 32 /* space */ || ch === 42 /* asterisk */) {
-                    return true;
-                }
-            }
-            return false;
-        }
-        function matchSegment(candidate, segment) {
-            // First check if the segment matches as is.  This is also useful if the segment contains
-            // characters we would normally strip when splitting into parts that we also may want to
-            // match in the candidate.  For example if the segment is "@int" and the candidate is
-            // "@int", then that will show up as an exact match here.
-            //
-            // Note: if the segment contains a space or an asterisk then we must assume that it's a
-            // multi-word segment.
-            if (!containsSpaceOrAsterisk(segment.totalTextChunk.text)) {
-                var match = matchTextChunk(candidate, segment.totalTextChunk, /*punctuationStripped:*/ false);
-                if (match) {
-                    return [match];
-                }
-            }
-            // The logic for pattern matching is now as follows:
-            //
-            // 1) Break the segment passed in into words.  Breaking is rather simple and a
-            //    good way to think about it that if gives you all the individual alphanumeric words
-            //    of the pattern.
-            //
-            // 2) For each word try to match the word against the candidate value.
-            //
-            // 3) Matching is as follows:
-            //
-            //   a) Check if the word matches the candidate entirely, in an case insensitive or
-            //    sensitive manner.  If it does, return that there was an exact match.
-            //
-            //   b) Check if the word is a prefix of the candidate, in a case insensitive or
-            //      sensitive manner.  If it does, return that there was a prefix match.
-            //
-            //   c) If the word is entirely lowercase, then check if it is contained anywhere in the
-            //      candidate in a case insensitive manner.  If so, return that there was a substring
-            //      match.
-            //
-            //      Note: We only have a substring match if the lowercase part is prefix match of
-            //      some word part. That way we don't match something like 'Class' when the user
-            //      types 'a'. But we would match 'FooAttribute' (since 'Attribute' starts with
-            //      'a').
-            //
-            //   d) If the word was not entirely lowercase, then check if it is contained in the
-            //      candidate in a case *sensitive* manner. If so, return that there was a substring
-            //      match.
-            //
-            //   e) If the word was not entirely lowercase, then attempt a camel cased match as
-            //      well.
-            //
-            //   f) The word is all lower case. Is it a case insensitive substring of the candidate starting
-            //      on a part boundary of the candidate?
-            //
-            // Only if all words have some sort of match is the pattern considered matched.
-            var subWordTextChunks = segment.subWordTextChunks;
-            var matches = undefined;
-            for (var _i = 0, subWordTextChunks_1 = subWordTextChunks; _i < subWordTextChunks_1.length; _i++) {
-                var subWordTextChunk = subWordTextChunks_1[_i];
-                // Try to match the candidate with this word
-                var result = matchTextChunk(candidate, subWordTextChunk, /*punctuationStripped:*/ true);
-                if (!result) {
-                    return undefined;
-                }
-                matches = matches || [];
-                matches.push(result);
-            }
-            return matches;
-        }
-        function partStartsWith(candidate, candidateSpan, pattern, ignoreCase, patternSpan) {
-            var patternPartStart = patternSpan ? patternSpan.start : 0;
-            var patternPartLength = patternSpan ? patternSpan.length : pattern.length;
-            if (patternPartLength > candidateSpan.length) {
-                // Pattern part is longer than the candidate part. There can never be a match.
-                return false;
-            }
-            if (ignoreCase) {
-                for (var i = 0; i < patternPartLength; i++) {
-                    var ch1 = pattern.charCodeAt(patternPartStart + i);
-                    var ch2 = candidate.charCodeAt(candidateSpan.start + i);
-                    if (toLowerCase(ch1) !== toLowerCase(ch2)) {
-                        return false;
-                    }
-                }
-            }
-            else {
-                for (var i = 0; i < patternPartLength; i++) {
-                    var ch1 = pattern.charCodeAt(patternPartStart + i);
-                    var ch2 = candidate.charCodeAt(candidateSpan.start + i);
-                    if (ch1 !== ch2) {
-                        return false;
-                    }
-                }
-            }
-            return true;
-        }
-        function tryCamelCaseMatch(candidate, candidateParts, chunk, ignoreCase) {
-            var chunkCharacterSpans = chunk.characterSpans;
-            // Note: we may have more pattern parts than candidate parts.  This is because multiple
-            // pattern parts may match a candidate part.  For example "SiUI" against "SimpleUI".
-            // We'll have 3 pattern parts Si/U/I against two candidate parts Simple/UI.  However, U
-            // and I will both match in UI.
-            var currentCandidate = 0;
-            var currentChunkSpan = 0;
-            var firstMatch = undefined;
-            var contiguous = undefined;
-            while (true) {
-                // Let's consider our termination cases
-                if (currentChunkSpan === chunkCharacterSpans.length) {
-                    // We did match! We shall assign a weight to this
-                    var weight = 0;
-                    // Was this contiguous?
-                    if (contiguous) {
-                        weight += 1;
-                    }
-                    // Did we start at the beginning of the candidate?
-                    if (firstMatch === 0) {
-                        weight += 2;
-                    }
-                    return weight;
-                }
-                else if (currentCandidate === candidateParts.length) {
-                    // No match, since we still have more of the pattern to hit
-                    return undefined;
-                }
-                var candidatePart = candidateParts[currentCandidate];
-                var gotOneMatchThisCandidate = false;
-                // Consider the case of matching SiUI against SimpleUIElement. The candidate parts
-                // will be Simple/UI/Element, and the pattern parts will be Si/U/I.  We'll match 'Si'
-                // against 'Simple' first.  Then we'll match 'U' against 'UI'. However, we want to
-                // still keep matching pattern parts against that candidate part.
-                for (; currentChunkSpan < chunkCharacterSpans.length; currentChunkSpan++) {
-                    var chunkCharacterSpan = chunkCharacterSpans[currentChunkSpan];
-                    if (gotOneMatchThisCandidate) {
-                        // We've already gotten one pattern part match in this candidate.  We will
-                        // only continue trying to consumer pattern parts if the last part and this
-                        // part are both upper case.
-                        if (!isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan - 1].start)) ||
-                            !isUpperCaseLetter(chunk.text.charCodeAt(chunkCharacterSpans[currentChunkSpan].start))) {
-                            break;
-                        }
-                    }
-                    if (!partStartsWith(candidate, candidatePart, chunk.text, ignoreCase, chunkCharacterSpan)) {
-                        break;
-                    }
-                    gotOneMatchThisCandidate = true;
-                    firstMatch = firstMatch === undefined ? currentCandidate : firstMatch;
-                    // If we were contiguous, then keep that value.  If we weren't, then keep that
-                    // value.  If we don't know, then set the value to 'true' as an initial match is
-                    // obviously contiguous.
-                    contiguous = contiguous === undefined ? true : contiguous;
-                    candidatePart = ts.createTextSpan(candidatePart.start + chunkCharacterSpan.length, candidatePart.length - chunkCharacterSpan.length);
-                }
-                // Check if we matched anything at all.  If we didn't, then we need to unset the
-                // contiguous bit if we currently had it set.
-                // If we haven't set the bit yet, then that means we haven't matched anything so
-                // far, and we don't want to change that.
-                if (!gotOneMatchThisCandidate && contiguous !== undefined) {
-                    contiguous = false;
-                }
-                // Move onto the next candidate.
-                currentCandidate++;
-            }
-        }
-    }
-    ts.createPatternMatcher = createPatternMatcher;
-    function createSegment(text) {
-        return {
-            totalTextChunk: createTextChunk(text),
-            subWordTextChunks: breakPatternIntoTextChunks(text)
-        };
-    }
-    // A segment is considered invalid if we couldn't find any words in it.
-    function segmentIsInvalid(segment) {
-        return segment.subWordTextChunks.length === 0;
-    }
-    function isUpperCaseLetter(ch) {
-        // Fast check for the ascii range.
-        if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
-            return true;
-        }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 2 /* Latest */)) {
-            return false;
-        }
-        // TODO: find a way to determine this for any unicode characters in a
-        // non-allocating manner.
-        var str = String.fromCharCode(ch);
-        return str === str.toUpperCase();
-    }
-    function isLowerCaseLetter(ch) {
-        // Fast check for the ascii range.
-        if (ch >= 97 /* a */ && ch <= 122 /* z */) {
-            return true;
-        }
-        if (ch < 127 /* maxAsciiCharacter */ || !ts.isUnicodeIdentifierStart(ch, 2 /* Latest */)) {
-            return false;
-        }
-        // TODO: find a way to determine this for any unicode characters in a
-        // non-allocating manner.
-        var str = String.fromCharCode(ch);
-        return str === str.toLowerCase();
-    }
-    function startsWith(string, search) {
-        for (var i = 0, n = search.length; i < n; i++) {
-            if (string.charCodeAt(i) !== search.charCodeAt(i)) {
-                return false;
-            }
-        }
-        return true;
-    }
-    // Assumes 'value' is already lowercase.
-    function indexOfIgnoringCase(string, value) {
-        for (var i = 0, n = string.length - value.length; i <= n; i++) {
-            if (startsWithIgnoringCase(string, value, i)) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    // Assumes 'value' is already lowercase.
-    function startsWithIgnoringCase(string, value, start) {
-        for (var i = 0, n = value.length; i < n; i++) {
-            var ch1 = toLowerCase(string.charCodeAt(i + start));
-            var ch2 = value.charCodeAt(i);
-            if (ch1 !== ch2) {
-                return false;
-            }
-        }
-        return true;
-    }
-    function toLowerCase(ch) {
-        // Fast convert for the ascii range.
-        if (ch >= 65 /* A */ && ch <= 90 /* Z */) {
-            return 97 /* a */ + (ch - 65 /* A */);
-        }
-        if (ch < 127 /* maxAsciiCharacter */) {
-            return ch;
-        }
-        // TODO: find a way to compute this for any unicode characters in a
-        // non-allocating manner.
-        return String.fromCharCode(ch).toLowerCase().charCodeAt(0);
-    }
-    function isDigit(ch) {
-        // TODO(cyrusn): Find a way to support this for unicode digits.
-        return ch >= 48 /* _0 */ && ch <= 57 /* _9 */;
-    }
-    function isWordChar(ch) {
-        return isUpperCaseLetter(ch) || isLowerCaseLetter(ch) || isDigit(ch) || ch === 95 /* _ */ || ch === 36 /* $ */;
-    }
-    function breakPatternIntoTextChunks(pattern) {
-        var result = [];
-        var wordStart = 0;
-        var wordLength = 0;
-        for (var i = 0; i < pattern.length; i++) {
-            var ch = pattern.charCodeAt(i);
-            if (isWordChar(ch)) {
-                if (wordLength === 0) {
-                    wordStart = i;
-                }
-                wordLength++;
-            }
-            else {
-                if (wordLength > 0) {
-                    result.push(createTextChunk(pattern.substr(wordStart, wordLength)));
-                    wordLength = 0;
-                }
-            }
-        }
-        if (wordLength > 0) {
-            result.push(createTextChunk(pattern.substr(wordStart, wordLength)));
-        }
-        return result;
-    }
-    function createTextChunk(text) {
-        var textLowerCase = text.toLowerCase();
-        return {
-            text: text,
-            textLowerCase: textLowerCase,
-            isLowerCase: text === textLowerCase,
-            characterSpans: breakIntoCharacterSpans(text)
-        };
-    }
-    /* @internal */ function breakIntoCharacterSpans(identifier) {
-        return breakIntoSpans(identifier, /*word:*/ false);
-    }
-    ts.breakIntoCharacterSpans = breakIntoCharacterSpans;
-    /* @internal */ function breakIntoWordSpans(identifier) {
-        return breakIntoSpans(identifier, /*word:*/ true);
-    }
-    ts.breakIntoWordSpans = breakIntoWordSpans;
-    function breakIntoSpans(identifier, word) {
-        var result = [];
-        var wordStart = 0;
-        for (var i = 1, n = identifier.length; i < n; i++) {
-            var lastIsDigit = isDigit(identifier.charCodeAt(i - 1));
-            var currentIsDigit = isDigit(identifier.charCodeAt(i));
-            var hasTransitionFromLowerToUpper = transitionFromLowerToUpper(identifier, word, i);
-            var hasTransitionFromUpperToLower = transitionFromUpperToLower(identifier, word, i, wordStart);
-            if (charIsPunctuation(identifier.charCodeAt(i - 1)) ||
-                charIsPunctuation(identifier.charCodeAt(i)) ||
-                lastIsDigit !== currentIsDigit ||
-                hasTransitionFromLowerToUpper ||
-                hasTransitionFromUpperToLower) {
-                if (!isAllPunctuation(identifier, wordStart, i)) {
-                    result.push(ts.createTextSpan(wordStart, i - wordStart));
-                }
-                wordStart = i;
-            }
-        }
-        if (!isAllPunctuation(identifier, wordStart, identifier.length)) {
-            result.push(ts.createTextSpan(wordStart, identifier.length - wordStart));
-        }
-        return result;
-    }
-    function charIsPunctuation(ch) {
-        switch (ch) {
-            case 33 /* exclamation */:
-            case 34 /* doubleQuote */:
-            case 35 /* hash */:
-            case 37 /* percent */:
-            case 38 /* ampersand */:
-            case 39 /* singleQuote */:
-            case 40 /* openParen */:
-            case 41 /* closeParen */:
-            case 42 /* asterisk */:
-            case 44 /* comma */:
-            case 45 /* minus */:
-            case 46 /* dot */:
-            case 47 /* slash */:
-            case 58 /* colon */:
-            case 59 /* semicolon */:
-            case 63 /* question */:
-            case 64 /* at */:
-            case 91 /* openBracket */:
-            case 92 /* backslash */:
-            case 93 /* closeBracket */:
-            case 95 /* _ */:
-            case 123 /* openBrace */:
-            case 125 /* closeBrace */:
-                return true;
-        }
-        return false;
-    }
-    function isAllPunctuation(identifier, start, end) {
-        for (var i = start; i < end; i++) {
-            var ch = identifier.charCodeAt(i);
-            // We don't consider _ or $ as punctuation as there may be things with that name.
-            if (!charIsPunctuation(ch) || ch === 95 /* _ */ || ch === 36 /* $ */) {
-                return false;
-            }
-        }
-        return true;
-    }
-    function transitionFromUpperToLower(identifier, word, index, wordStart) {
-        if (word) {
-            // Cases this supports:
-            // 1) IDisposable -> I, Disposable
-            // 2) UIElement -> UI, Element
-            // 3) HTMLDocument -> HTML, Document
-            //
-            // etc.
-            if (index !== wordStart &&
-                index + 1 < identifier.length) {
-                var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-                var nextIsLower = isLowerCaseLetter(identifier.charCodeAt(index + 1));
-                if (currentIsUpper && nextIsLower) {
-                    // We have a transition from an upper to a lower letter here.  But we only
-                    // want to break if all the letters that preceded are uppercase.  i.e. if we
-                    // have "Foo" we don't want to break that into "F, oo".  But if we have
-                    // "IFoo" or "UIFoo", then we want to break that into "I, Foo" and "UI,
-                    // Foo".  i.e. the last uppercase letter belongs to the lowercase letters
-                    // that follows.  Note: this will make the following not split properly:
-                    // "HELLOthere".  However, these sorts of names do not show up in .Net
-                    // programs.
-                    for (var i = wordStart; i < index; i++) {
-                        if (!isUpperCaseLetter(identifier.charCodeAt(i))) {
-                            return false;
-                        }
-                    }
-                    return true;
-                }
-            }
-        }
-        return false;
-    }
-    function transitionFromLowerToUpper(identifier, word, index) {
-        var lastIsUpper = isUpperCaseLetter(identifier.charCodeAt(index - 1));
-        var currentIsUpper = isUpperCaseLetter(identifier.charCodeAt(index));
-        // See if the casing indicates we're starting a new word. Note: if we're breaking on
-        // words, then just seeing an upper case character isn't enough.  Instead, it has to
-        // be uppercase and the previous character can't be uppercase.
-        //
-        // For example, breaking "AddMetadata" on words would make: Add Metadata
-        //
-        // on characters would be: A dd M etadata
-        //
-        // Break "AM" on words would be: AM
-        //
-        // on characters would be: A M
-        //
-        // We break the search string on characters.  But we break the symbol name on words.
-        var transition = word
-            ? (currentIsUpper && !lastIsUpper)
-            : currentIsUpper;
-        return transition;
-    }
-})(ts || (ts = {}));
-///<reference path='services.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var SignatureHelp;
-    (function (SignatureHelp) {
-        // A partially written generic type expression is not guaranteed to have the correct syntax tree. the expression could be parsed as less than/greater than expression or a comma expression
-        // or some other combination depending on what the user has typed so far. For the purposes of signature help we need to consider any location after "<" as a possible generic type reference.
-        // To do this, the method will back parse the expression starting at the position required. it will try to parse the current expression as a generic type expression, if it did succeed it
-        // will return the generic identifier that started the expression (e.g. "foo" in "foo<any, |"). It is then up to the caller to ensure that this is a valid generic expression through
-        // looking up the type. The method will also keep track of the parameter index inside the expression.
-        // public static isInPartiallyWrittenTypeArgumentList(syntaxTree: TypeScript.SyntaxTree, position: number): any {
-        //    let token = Syntax.findTokenOnLeft(syntaxTree.sourceUnit(), position, /*includeSkippedTokens*/ true);
-        //    if (token && TypeScript.Syntax.hasAncestorOfKind(token, TypeScript.SyntaxKind.TypeParameterList)) {
-        //        // We are in the wrong generic list. bail out
-        //        return null;
-        //    }
-        //    let stack = 0;
-        //    let argumentIndex = 0;
-        //    whileLoop:
-        //    while (token) {
-        //        switch (token.kind()) {
-        //            case TypeScript.SyntaxKind.LessThanToken:
-        //                if (stack === 0) {
-        //                    // Found the beginning of the generic argument expression
-        //                    let lessThanToken = token;
-        //                    token = previousToken(token, /*includeSkippedTokens*/ true);
-        //                    if (!token || token.kind() !== TypeScript.SyntaxKind.IdentifierName) {
-        //                        break whileLoop;
-        //                    }
-        //                    // Found the name, return the data
-        //                    return {
-        //                        genericIdentifer: token,
-        //                        lessThanToken: lessThanToken,
-        //                        argumentIndex: argumentIndex
-        //                    };
-        //                }
-        //                else if (stack < 0) {
-        //                    // Seen one too many less than tokens, bail out
-        //                    break whileLoop;
-        //                }
-        //                else {
-        //                    stack--;
-        //                }
-        //                break;
-        //            case TypeScript.SyntaxKind.GreaterThanGreaterThanGreaterThanToken:
-        //                stack++;
-        //            // Intentional fall through
-        //            case TypeScript.SyntaxKind.GreaterThanToken:
-        //                stack++;
-        //                break;
-        //            case TypeScript.SyntaxKind.CommaToken:
-        //                if (stack == 0) {
-        //                    argumentIndex++;
-        //                }
-        //                break;
-        //            case TypeScript.SyntaxKind.CloseBraceToken:
-        //                // This can be object type, skip untill we find the matching open brace token
-        //                let unmatchedOpenBraceTokens = 0;
-        //                // Skip untill the matching open brace token
-        //                token = SignatureInfoHelpers.moveBackUpTillMatchingTokenKind(token, TypeScript.SyntaxKind.CloseBraceToken, TypeScript.SyntaxKind.OpenBraceToken);
-        //                if (!token) {
-        //                    // No matching token was found. bail out
-        //                    break whileLoop;
-        //                }
-        //                break;
-        //            case TypeScript.SyntaxKind.EqualsGreaterThanToken:
-        //                // This can be a function type or a constructor type. In either case, we want to skip the function definition
-        //                token = previousToken(token, /*includeSkippedTokens*/ true);
-        //                if (token && token.kind() === TypeScript.SyntaxKind.CloseParenToken) {
-        //                    // Skip untill the matching open paren token
-        //                    token = SignatureInfoHelpers.moveBackUpTillMatchingTokenKind(token, TypeScript.SyntaxKind.CloseParenToken, TypeScript.SyntaxKind.OpenParenToken);
-        //                    if (token && token.kind() === TypeScript.SyntaxKind.GreaterThanToken) {
-        //                        // Another generic type argument list, skip it\
-        //                        token = SignatureInfoHelpers.moveBackUpTillMatchingTokenKind(token, TypeScript.SyntaxKind.GreaterThanToken, TypeScript.SyntaxKind.LessThanToken);
-        //                    }
-        //                    if (token && token.kind() === TypeScript.SyntaxKind.NewKeyword) {
-        //                        // In case this was a constructor type, skip the new keyword
-        //                        token = previousToken(token, /*includeSkippedTokens*/ true);
-        //                    }
-        //                    if (!token) {
-        //                        // No matching token was found. bail out
-        //                        break whileLoop;
-        //                    }
-        //                }
-        //                else {
-        //                    // This is not a function type. exit the main loop
-        //                    break whileLoop;
-        //                }
-        //                break;
-        //            case TypeScript.SyntaxKind.IdentifierName:
-        //            case TypeScript.SyntaxKind.AnyKeyword:
-        //            case TypeScript.SyntaxKind.NumberKeyword:
-        //            case TypeScript.SyntaxKind.StringKeyword:
-        //            case TypeScript.SyntaxKind.VoidKeyword:
-        //            case TypeScript.SyntaxKind.BooleanKeyword:
-        //            case TypeScript.SyntaxKind.DotToken:
-        //            case TypeScript.SyntaxKind.OpenBracketToken:
-        //            case TypeScript.SyntaxKind.CloseBracketToken:
-        //                // Valid tokens in a type name. Skip.
-        //                break;
-        //            default:
-        //                break whileLoop;
-        //        }
-        //        token = previousToken(token, /*includeSkippedTokens*/ true);
-        //    }
-        //    return null;
-        // }
-        // private static moveBackUpTillMatchingTokenKind(token: TypeScript.ISyntaxToken, tokenKind: TypeScript.SyntaxKind, matchingTokenKind: TypeScript.SyntaxKind): TypeScript.ISyntaxToken {
-        //    if (!token || token.kind() !== tokenKind) {
-        //        throw TypeScript.Errors.invalidOperation();
-        //    }
-        //    // Skip the current token
-        //    token = previousToken(token, /*includeSkippedTokens*/ true);
-        //    let stack = 0;
-        //    while (token) {
-        //        if (token.kind() === matchingTokenKind) {
-        //            if (stack === 0) {
-        //                // Found the matching token, return
-        //                return token;
-        //            }
-        //            else if (stack < 0) {
-        //                // tokens overlapped.. bail out.
-        //                break;
-        //            }
-        //            else {
-        //                stack--;
-        //            }
-        //        }
-        //        else if (token.kind() === tokenKind) {
-        //            stack++;
-        //        }
-        //        // Move back
-        //        token = previousToken(token, /*includeSkippedTokens*/ true);
-        //    }
-        //    // Did not find matching token
-        //    return null;
-        // }
-        var emptyArray = [];
-        (function (ArgumentListKind) {
-            ArgumentListKind[ArgumentListKind["TypeArguments"] = 0] = "TypeArguments";
-            ArgumentListKind[ArgumentListKind["CallArguments"] = 1] = "CallArguments";
-            ArgumentListKind[ArgumentListKind["TaggedTemplateArguments"] = 2] = "TaggedTemplateArguments";
-        })(SignatureHelp.ArgumentListKind || (SignatureHelp.ArgumentListKind = {}));
-        var ArgumentListKind = SignatureHelp.ArgumentListKind;
-        function getSignatureHelpItems(program, sourceFile, position, cancellationToken) {
-            var typeChecker = program.getTypeChecker();
-            // Decide whether to show signature help
-            var startingToken = ts.findTokenOnLeftOfPosition(sourceFile, position);
-            if (!startingToken) {
-                // We are at the beginning of the file
-                return undefined;
-            }
-            var argumentInfo = getContainingArgumentInfo(startingToken, position, sourceFile);
-            cancellationToken.throwIfCancellationRequested();
-            // Semantic filtering of signature help
-            if (!argumentInfo) {
-                return undefined;
-            }
-            var call = argumentInfo.invocation;
-            var candidates = [];
-            var resolvedSignature = typeChecker.getResolvedSignature(call, candidates);
-            cancellationToken.throwIfCancellationRequested();
-            if (!candidates.length) {
-                // We didn't have any sig help items produced by the TS compiler.  If this is a JS
-                // file, then see if we can figure out anything better.
-                if (ts.isSourceFileJavaScript(sourceFile)) {
-                    return createJavaScriptSignatureHelpItems(argumentInfo, program);
-                }
-                return undefined;
-            }
-            return createSignatureHelpItems(candidates, resolvedSignature, argumentInfo, typeChecker);
-        }
-        SignatureHelp.getSignatureHelpItems = getSignatureHelpItems;
-        function createJavaScriptSignatureHelpItems(argumentInfo, program) {
-            if (argumentInfo.invocation.kind !== 174 /* CallExpression */) {
-                return undefined;
-            }
-            // See if we can find some symbol with the call expression name that has call signatures.
-            var callExpression = argumentInfo.invocation;
-            var expression = callExpression.expression;
-            var name = expression.kind === 69 /* Identifier */
-                ? expression
-                : expression.kind === 172 /* PropertyAccessExpression */
-                    ? expression.name
-                    : undefined;
-            if (!name || !name.text) {
-                return undefined;
-            }
-            var typeChecker = program.getTypeChecker();
-            for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
-                var sourceFile = _a[_i];
-                var nameToDeclarations = sourceFile.getNamedDeclarations();
-                var declarations = ts.getProperty(nameToDeclarations, name.text);
-                if (declarations) {
-                    for (var _b = 0, declarations_8 = declarations; _b < declarations_8.length; _b++) {
-                        var declaration = declarations_8[_b];
-                        var symbol = declaration.symbol;
-                        if (symbol) {
-                            var type = typeChecker.getTypeOfSymbolAtLocation(symbol, declaration);
-                            if (type) {
-                                var callSignatures = type.getCallSignatures();
-                                if (callSignatures && callSignatures.length) {
-                                    return createSignatureHelpItems(callSignatures, callSignatures[0], argumentInfo, typeChecker);
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-        /**
-         * Returns relevant information for the argument list and the current argument if we are
-         * in the argument of an invocation; returns undefined otherwise.
-         */
-        function getImmediatelyContainingArgumentInfo(node, position, sourceFile) {
-            if (node.parent.kind === 174 /* CallExpression */ || node.parent.kind === 175 /* NewExpression */) {
-                var callExpression = node.parent;
-                // There are 3 cases to handle:
-                //   1. The token introduces a list, and should begin a sig help session
-                //   2. The token is either not associated with a list, or ends a list, so the session should end
-                //   3. The token is buried inside a list, and should give sig help
-                //
-                // The following are examples of each:
-                //
-                //    Case 1:
-                //          foo<#T, U>(#a, b)    -> The token introduces a list, and should begin a sig help session
-                //    Case 2:
-                //          fo#o<T, U>#(a, b)#   -> The token is either not associated with a list, or ends a list, so the session should end
-                //    Case 3:
-                //          foo<T#, U#>(a#, #b#) -> The token is buried inside a list, and should give sig help
-                // Find out if 'node' is an argument, a type argument, or neither
-                if (node.kind === 25 /* LessThanToken */ ||
-                    node.kind === 17 /* OpenParenToken */) {
-                    // Find the list that starts right *after* the < or ( token.
-                    // If the user has just opened a list, consider this item 0.
-                    var list = getChildListThatStartsWithOpenerToken(callExpression, node, sourceFile);
-                    var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
-                    ts.Debug.assert(list !== undefined);
-                    return {
-                        kind: isTypeArgList ? 0 /* TypeArguments */ : 1 /* CallArguments */,
-                        invocation: callExpression,
-                        argumentsSpan: getApplicableSpanForArguments(list, sourceFile),
-                        argumentIndex: 0,
-                        argumentCount: getArgumentCount(list)
-                    };
-                }
-                // findListItemInfo can return undefined if we are not in parent's argument list
-                // or type argument list. This includes cases where the cursor is:
-                //   - To the right of the closing paren, non-substitution template, or template tail.
-                //   - Between the type arguments and the arguments (greater than token)
-                //   - On the target of the call (parent.func)
-                //   - On the 'new' keyword in a 'new' expression
-                var listItemInfo = ts.findListItemInfo(node);
-                if (listItemInfo) {
-                    var list = listItemInfo.list;
-                    var isTypeArgList = callExpression.typeArguments && callExpression.typeArguments.pos === list.pos;
-                    var argumentIndex = getArgumentIndex(list, node);
-                    var argumentCount = getArgumentCount(list);
-                    ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
-                    return {
-                        kind: isTypeArgList ? 0 /* TypeArguments */ : 1 /* CallArguments */,
-                        invocation: callExpression,
-                        argumentsSpan: getApplicableSpanForArguments(list, sourceFile),
-                        argumentIndex: argumentIndex,
-                        argumentCount: argumentCount
-                    };
-                }
-                return undefined;
-            }
-            else if (node.kind === 11 /* NoSubstitutionTemplateLiteral */ && node.parent.kind === 176 /* TaggedTemplateExpression */) {
-                // Check if we're actually inside the template;
-                // otherwise we'll fall out and return undefined.
-                if (ts.isInsideTemplateLiteral(node, position)) {
-                    return getArgumentListInfoForTemplate(node.parent, /*argumentIndex*/ 0, sourceFile);
-                }
-            }
-            else if (node.kind === 12 /* TemplateHead */ && node.parent.parent.kind === 176 /* TaggedTemplateExpression */) {
-                var templateExpression = node.parent;
-                var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 189 /* TemplateExpression */);
-                var argumentIndex = ts.isInsideTemplateLiteral(node, position) ? 0 : 1;
-                return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
-            }
-            else if (node.parent.kind === 197 /* TemplateSpan */ && node.parent.parent.parent.kind === 176 /* TaggedTemplateExpression */) {
-                var templateSpan = node.parent;
-                var templateExpression = templateSpan.parent;
-                var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 189 /* TemplateExpression */);
-                // If we're just after a template tail, don't show signature help.
-                if (node.kind === 14 /* TemplateTail */ && !ts.isInsideTemplateLiteral(node, position)) {
-                    return undefined;
-                }
-                var spanIndex = templateExpression.templateSpans.indexOf(templateSpan);
-                var argumentIndex = getArgumentIndexForTemplatePiece(spanIndex, node, position);
-                return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
-            }
-            return undefined;
-        }
-        function getArgumentIndex(argumentsList, node) {
-            // The list we got back can include commas.  In the presence of errors it may
-            // also just have nodes without commas.  For example "Foo(a b c)" will have 3
-            // args without commas.   We want to find what index we're at.  So we count
-            // forward until we hit ourselves, only incrementing the index if it isn't a
-            // comma.
-            //
-            // Note: the subtlety around trailing commas (in getArgumentCount) does not apply
-            // here.  That's because we're only walking forward until we hit the node we're
-            // on.  In that case, even if we're after the trailing comma, we'll still see
-            // that trailing comma in the list, and we'll have generated the appropriate
-            // arg index.
-            var argumentIndex = 0;
-            var listChildren = argumentsList.getChildren();
-            for (var _i = 0, listChildren_1 = listChildren; _i < listChildren_1.length; _i++) {
-                var child = listChildren_1[_i];
-                if (child === node) {
-                    break;
-                }
-                if (child.kind !== 24 /* CommaToken */) {
-                    argumentIndex++;
-                }
-            }
-            return argumentIndex;
-        }
-        function getArgumentCount(argumentsList) {
-            // The argument count for a list is normally the number of non-comma children it has.
-            // For example, if you have "Foo(a,b)" then there will be three children of the arg
-            // list 'a' '<comma>' 'b'.  So, in this case the arg count will be 2.  However, there
-            // is a small subtlety.  If you have  "Foo(a,)", then the child list will just have
-            // 'a' '<comma>'.  So, in the case where the last child is a comma, we increase the
-            // arg count by one to compensate.
-            //
-            // Note: this subtlety only applies to the last comma.  If you had "Foo(a,,"  then
-            // we'll have:  'a' '<comma>' '<missing>'
-            // That will give us 2 non-commas.  We then add one for the last comma, givin us an
-            // arg count of 3.
-            var listChildren = argumentsList.getChildren();
-            var argumentCount = ts.countWhere(listChildren, function (arg) { return arg.kind !== 24 /* CommaToken */; });
-            if (listChildren.length > 0 && ts.lastOrUndefined(listChildren).kind === 24 /* CommaToken */) {
-                argumentCount++;
-            }
-            return argumentCount;
-        }
-        // spanIndex is either the index for a given template span.
-        // This does not give appropriate results for a NoSubstitutionTemplateLiteral
-        function getArgumentIndexForTemplatePiece(spanIndex, node, position) {
-            // Because the TemplateStringsArray is the first argument, we have to offset each substitution expression by 1.
-            // There are three cases we can encounter:
-            //      1. We are precisely in the template literal (argIndex = 0).
-            //      2. We are in or to the right of the substitution expression (argIndex = spanIndex + 1).
-            //      3. We are directly to the right of the template literal, but because we look for the token on the left,
-            //          not enough to put us in the substitution expression; we should consider ourselves part of
-            //          the *next* span's expression by offsetting the index (argIndex = (spanIndex + 1) + 1).
-            //
-            // Example: f  `# abcd $#{#  1 + 1#  }# efghi ${ #"#hello"#  }  #  `
-            //              ^       ^ ^       ^   ^          ^ ^      ^     ^
-            // Case:        1       1 3       2   1          3 2      2     1
-            ts.Debug.assert(position >= node.getStart(), "Assumed 'position' could not occur before node.");
-            if (ts.isTemplateLiteralKind(node.kind)) {
-                if (ts.isInsideTemplateLiteral(node, position)) {
-                    return 0;
-                }
-                return spanIndex + 2;
-            }
-            return spanIndex + 1;
-        }
-        function getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile) {
-            // argumentCount is either 1 or (numSpans + 1) to account for the template strings array argument.
-            var argumentCount = tagExpression.template.kind === 11 /* NoSubstitutionTemplateLiteral */
-                ? 1
-                : tagExpression.template.templateSpans.length + 1;
-            ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
-            return {
-                kind: 2 /* TaggedTemplateArguments */,
-                invocation: tagExpression,
-                argumentsSpan: getApplicableSpanForTaggedTemplate(tagExpression, sourceFile),
-                argumentIndex: argumentIndex,
-                argumentCount: argumentCount
-            };
-        }
-        function getApplicableSpanForArguments(argumentsList, sourceFile) {
-            // We use full start and skip trivia on the end because we want to include trivia on
-            // both sides. For example,
-            //
-            //    foo(   /*comment */     a, b, c      /*comment*/     )
-            //        |                                               |
-            //
-            // The applicable span is from the first bar to the second bar (inclusive,
-            // but not including parentheses)
-            var applicableSpanStart = argumentsList.getFullStart();
-            var applicableSpanEnd = ts.skipTrivia(sourceFile.text, argumentsList.getEnd(), /*stopAfterLineBreak*/ false);
-            return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
-        }
-        function getApplicableSpanForTaggedTemplate(taggedTemplate, sourceFile) {
-            var template = taggedTemplate.template;
-            var applicableSpanStart = template.getStart();
-            var applicableSpanEnd = template.getEnd();
-            // We need to adjust the end position for the case where the template does not have a tail.
-            // Otherwise, we will not show signature help past the expression.
-            // For example,
-            //
-            //      `  ${ 1 + 1        foo(10)
-            //       |        |
-            //
-            // This is because a Missing node has no width. However, what we actually want is to include trivia
-            // leading up to the next token in case the user is about to type in a TemplateMiddle or TemplateTail.
-            if (template.kind === 189 /* TemplateExpression */) {
-                var lastSpan = ts.lastOrUndefined(template.templateSpans);
-                if (lastSpan.literal.getFullWidth() === 0) {
-                    applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
-                }
-            }
-            return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
-        }
-        function getContainingArgumentInfo(node, position, sourceFile) {
-            for (var n = node; n.kind !== 256 /* SourceFile */; n = n.parent) {
-                if (ts.isFunctionBlock(n)) {
-                    return undefined;
-                }
-                // If the node is not a subspan of its parent, this is a big problem.
-                // There have been crashes that might be caused by this violation.
-                if (n.pos < n.parent.pos || n.end > n.parent.end) {
-                    ts.Debug.fail("Node of kind " + n.kind + " is not a subspan of its parent of kind " + n.parent.kind);
-                }
-                var argumentInfo = getImmediatelyContainingArgumentInfo(n, position, sourceFile);
-                if (argumentInfo) {
-                    return argumentInfo;
-                }
-            }
-            return undefined;
-        }
-        SignatureHelp.getContainingArgumentInfo = getContainingArgumentInfo;
-        function getChildListThatStartsWithOpenerToken(parent, openerToken, sourceFile) {
-            var children = parent.getChildren(sourceFile);
-            var indexOfOpenerToken = children.indexOf(openerToken);
-            ts.Debug.assert(indexOfOpenerToken >= 0 && children.length > indexOfOpenerToken + 1);
-            return children[indexOfOpenerToken + 1];
-        }
-        /**
-         * The selectedItemIndex could be negative for several reasons.
-         *     1. There are too many arguments for all of the overloads
-         *     2. None of the overloads were type compatible
-         * The solution here is to try to pick the best overload by picking
-         * either the first one that has an appropriate number of parameters,
-         * or the one with the most parameters.
-         */
-        function selectBestInvalidOverloadIndex(candidates, argumentCount) {
-            var maxParamsSignatureIndex = -1;
-            var maxParams = -1;
-            for (var i = 0; i < candidates.length; i++) {
-                var candidate = candidates[i];
-                if (candidate.hasRestParameter || candidate.parameters.length >= argumentCount) {
-                    return i;
-                }
-                if (candidate.parameters.length > maxParams) {
-                    maxParams = candidate.parameters.length;
-                    maxParamsSignatureIndex = i;
-                }
-            }
-            return maxParamsSignatureIndex;
-        }
-        function createSignatureHelpItems(candidates, bestSignature, argumentListInfo, typeChecker) {
-            var applicableSpan = argumentListInfo.argumentsSpan;
-            var isTypeParameterList = argumentListInfo.kind === 0 /* TypeArguments */;
-            var invocation = argumentListInfo.invocation;
-            var callTarget = ts.getInvokedExpression(invocation);
-            var callTargetSymbol = typeChecker.getSymbolAtLocation(callTarget);
-            var callTargetDisplayParts = callTargetSymbol && ts.symbolToDisplayParts(typeChecker, callTargetSymbol, /*enclosingDeclaration*/ undefined, /*meaning*/ undefined);
-            var items = ts.map(candidates, function (candidateSignature) {
-                var signatureHelpParameters;
-                var prefixDisplayParts = [];
-                var suffixDisplayParts = [];
-                if (callTargetDisplayParts) {
-                    ts.addRange(prefixDisplayParts, callTargetDisplayParts);
-                }
-                if (isTypeParameterList) {
-                    prefixDisplayParts.push(ts.punctuationPart(25 /* LessThanToken */));
-                    var typeParameters = candidateSignature.typeParameters;
-                    signatureHelpParameters = typeParameters && typeParameters.length > 0 ? ts.map(typeParameters, createSignatureHelpParameterForTypeParameter) : emptyArray;
-                    suffixDisplayParts.push(ts.punctuationPart(27 /* GreaterThanToken */));
-                    var parameterParts = ts.mapToDisplayParts(function (writer) {
-                        return typeChecker.getSymbolDisplayBuilder().buildDisplayForParametersAndDelimiters(candidateSignature.thisParameter, candidateSignature.parameters, writer, invocation);
-                    });
-                    ts.addRange(suffixDisplayParts, parameterParts);
-                }
-                else {
-                    var typeParameterParts = ts.mapToDisplayParts(function (writer) {
-                        return typeChecker.getSymbolDisplayBuilder().buildDisplayForTypeParametersAndDelimiters(candidateSignature.typeParameters, writer, invocation);
-                    });
-                    ts.addRange(prefixDisplayParts, typeParameterParts);
-                    prefixDisplayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
-                    var parameters = candidateSignature.parameters;
-                    signatureHelpParameters = parameters.length > 0 ? ts.map(parameters, createSignatureHelpParameterForParameter) : emptyArray;
-                    suffixDisplayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
-                }
-                var returnTypeParts = ts.mapToDisplayParts(function (writer) {
-                    return typeChecker.getSymbolDisplayBuilder().buildReturnTypeDisplay(candidateSignature, writer, invocation);
-                });
-                ts.addRange(suffixDisplayParts, returnTypeParts);
-                return {
-                    isVariadic: candidateSignature.hasRestParameter,
-                    prefixDisplayParts: prefixDisplayParts,
-                    suffixDisplayParts: suffixDisplayParts,
-                    separatorDisplayParts: [ts.punctuationPart(24 /* CommaToken */), ts.spacePart()],
-                    parameters: signatureHelpParameters,
-                    documentation: candidateSignature.getDocumentationComment()
-                };
-            });
-            var argumentIndex = argumentListInfo.argumentIndex;
-            // argumentCount is the *apparent* number of arguments.
-            var argumentCount = argumentListInfo.argumentCount;
-            var selectedItemIndex = candidates.indexOf(bestSignature);
-            if (selectedItemIndex < 0) {
-                selectedItemIndex = selectBestInvalidOverloadIndex(candidates, argumentCount);
-            }
-            ts.Debug.assert(argumentIndex === 0 || argumentIndex < argumentCount, "argumentCount < argumentIndex, " + argumentCount + " < " + argumentIndex);
-            return {
-                items: items,
-                applicableSpan: applicableSpan,
-                selectedItemIndex: selectedItemIndex,
-                argumentIndex: argumentIndex,
-                argumentCount: argumentCount
-            };
-            function createSignatureHelpParameterForParameter(parameter) {
-                var displayParts = ts.mapToDisplayParts(function (writer) {
-                    return typeChecker.getSymbolDisplayBuilder().buildParameterDisplay(parameter, writer, invocation);
-                });
-                return {
-                    name: parameter.name,
-                    documentation: parameter.getDocumentationComment(),
-                    displayParts: displayParts,
-                    isOptional: typeChecker.isOptionalParameter(parameter.valueDeclaration)
-                };
-            }
-            function createSignatureHelpParameterForTypeParameter(typeParameter) {
-                var displayParts = ts.mapToDisplayParts(function (writer) {
-                    return typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(typeParameter, writer, invocation);
-                });
-                return {
-                    name: typeParameter.symbol.name,
-                    documentation: emptyArray,
-                    displayParts: displayParts,
-                    isOptional: false
-                };
-            }
-        }
-    })(SignatureHelp = ts.SignatureHelp || (ts.SignatureHelp = {}));
-})(ts || (ts = {}));
-// These utilities are common to multiple language service features.
-/* @internal */
-var ts;
-(function (ts) {
-    function getLineStartPositionForPosition(position, sourceFile) {
-        var lineStarts = sourceFile.getLineStarts();
-        var line = sourceFile.getLineAndCharacterOfPosition(position).line;
-        return lineStarts[line];
-    }
-    ts.getLineStartPositionForPosition = getLineStartPositionForPosition;
-    function rangeContainsRange(r1, r2) {
-        return startEndContainsRange(r1.pos, r1.end, r2);
-    }
-    ts.rangeContainsRange = rangeContainsRange;
-    function startEndContainsRange(start, end, range) {
-        return start <= range.pos && end >= range.end;
-    }
-    ts.startEndContainsRange = startEndContainsRange;
-    function rangeContainsStartEnd(range, start, end) {
-        return range.pos <= start && range.end >= end;
-    }
-    ts.rangeContainsStartEnd = rangeContainsStartEnd;
-    function rangeOverlapsWithStartEnd(r1, start, end) {
-        return startEndOverlapsWithStartEnd(r1.pos, r1.end, start, end);
-    }
-    ts.rangeOverlapsWithStartEnd = rangeOverlapsWithStartEnd;
-    function startEndOverlapsWithStartEnd(start1, end1, start2, end2) {
-        var start = Math.max(start1, start2);
-        var end = Math.min(end1, end2);
-        return start < end;
-    }
-    ts.startEndOverlapsWithStartEnd = startEndOverlapsWithStartEnd;
-    function positionBelongsToNode(candidate, position, sourceFile) {
-        return candidate.end > position || !isCompletedNode(candidate, sourceFile);
-    }
-    ts.positionBelongsToNode = positionBelongsToNode;
-    function isCompletedNode(n, sourceFile) {
-        if (ts.nodeIsMissing(n)) {
-            return false;
-        }
-        switch (n.kind) {
-            case 221 /* ClassDeclaration */:
-            case 222 /* InterfaceDeclaration */:
-            case 224 /* EnumDeclaration */:
-            case 171 /* ObjectLiteralExpression */:
-            case 167 /* ObjectBindingPattern */:
-            case 159 /* TypeLiteral */:
-            case 199 /* Block */:
-            case 226 /* ModuleBlock */:
-            case 227 /* CaseBlock */:
-            case 233 /* NamedImports */:
-            case 237 /* NamedExports */:
-                return nodeEndsWith(n, 16 /* CloseBraceToken */, sourceFile);
-            case 252 /* CatchClause */:
-                return isCompletedNode(n.block, sourceFile);
-            case 175 /* NewExpression */:
-                if (!n.arguments) {
-                    return true;
-                }
-            // fall through
-            case 174 /* CallExpression */:
-            case 178 /* ParenthesizedExpression */:
-            case 164 /* ParenthesizedType */:
-                return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
-            case 156 /* FunctionType */:
-            case 157 /* ConstructorType */:
-                return isCompletedNode(n.type, sourceFile);
-            case 148 /* Constructor */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-            case 220 /* FunctionDeclaration */:
-            case 179 /* FunctionExpression */:
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-            case 152 /* ConstructSignature */:
-            case 151 /* CallSignature */:
-            case 180 /* ArrowFunction */:
-                if (n.body) {
-                    return isCompletedNode(n.body, sourceFile);
-                }
-                if (n.type) {
-                    return isCompletedNode(n.type, sourceFile);
-                }
-                // Even though type parameters can be unclosed, we can get away with
-                // having at least a closing paren.
-                return hasChildOfKind(n, 18 /* CloseParenToken */, sourceFile);
-            case 225 /* ModuleDeclaration */:
-                return n.body && isCompletedNode(n.body, sourceFile);
-            case 203 /* IfStatement */:
-                if (n.elseStatement) {
-                    return isCompletedNode(n.elseStatement, sourceFile);
-                }
-                return isCompletedNode(n.thenStatement, sourceFile);
-            case 202 /* ExpressionStatement */:
-                return isCompletedNode(n.expression, sourceFile) ||
-                    hasChildOfKind(n, 23 /* SemicolonToken */);
-            case 170 /* ArrayLiteralExpression */:
-            case 168 /* ArrayBindingPattern */:
-            case 173 /* ElementAccessExpression */:
-            case 140 /* ComputedPropertyName */:
-            case 161 /* TupleType */:
-                return nodeEndsWith(n, 20 /* CloseBracketToken */, sourceFile);
-            case 153 /* IndexSignature */:
-                if (n.type) {
-                    return isCompletedNode(n.type, sourceFile);
-                }
-                return hasChildOfKind(n, 20 /* CloseBracketToken */, sourceFile);
-            case 249 /* CaseClause */:
-            case 250 /* DefaultClause */:
-                // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
-                return false;
-            case 206 /* ForStatement */:
-            case 207 /* ForInStatement */:
-            case 208 /* ForOfStatement */:
-            case 205 /* WhileStatement */:
-                return isCompletedNode(n.statement, sourceFile);
-            case 204 /* DoStatement */:
-                // rough approximation: if DoStatement has While keyword - then if node is completed is checking the presence of ')';
-                var hasWhileKeyword = findChildOfKind(n, 104 /* WhileKeyword */, sourceFile);
-                if (hasWhileKeyword) {
-                    return nodeEndsWith(n, 18 /* CloseParenToken */, sourceFile);
-                }
-                return isCompletedNode(n.statement, sourceFile);
-            case 158 /* TypeQuery */:
-                return isCompletedNode(n.exprName, sourceFile);
-            case 182 /* TypeOfExpression */:
-            case 181 /* DeleteExpression */:
-            case 183 /* VoidExpression */:
-            case 190 /* YieldExpression */:
-            case 191 /* SpreadElementExpression */:
-                var unaryWordExpression = n;
-                return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 176 /* TaggedTemplateExpression */:
-                return isCompletedNode(n.template, sourceFile);
-            case 189 /* TemplateExpression */:
-                var lastSpan = ts.lastOrUndefined(n.templateSpans);
-                return isCompletedNode(lastSpan, sourceFile);
-            case 197 /* TemplateSpan */:
-                return ts.nodeIsPresent(n.literal);
-            case 236 /* ExportDeclaration */:
-            case 230 /* ImportDeclaration */:
-                return ts.nodeIsPresent(n.moduleSpecifier);
-            case 185 /* PrefixUnaryExpression */:
-                return isCompletedNode(n.operand, sourceFile);
-            case 187 /* BinaryExpression */:
-                return isCompletedNode(n.right, sourceFile);
-            case 188 /* ConditionalExpression */:
-                return isCompletedNode(n.whenFalse, sourceFile);
-            default:
-                return true;
-        }
-    }
-    ts.isCompletedNode = isCompletedNode;
-    /*
-     * Checks if node ends with 'expectedLastToken'.
-     * If child at position 'length - 1' is 'SemicolonToken' it is skipped and 'expectedLastToken' is compared with child at position 'length - 2'.
-     */
-    function nodeEndsWith(n, expectedLastToken, sourceFile) {
-        var children = n.getChildren(sourceFile);
-        if (children.length) {
-            var last = ts.lastOrUndefined(children);
-            if (last.kind === expectedLastToken) {
-                return true;
-            }
-            else if (last.kind === 23 /* SemicolonToken */ && children.length !== 1) {
-                return children[children.length - 2].kind === expectedLastToken;
-            }
-        }
-        return false;
-    }
-    function findListItemInfo(node) {
-        var list = findContainingList(node);
-        // It is possible at this point for syntaxList to be undefined, either if
-        // node.parent had no list child, or if none of its list children contained
-        // the span of node. If this happens, return undefined. The caller should
-        // handle this case.
-        if (!list) {
-            return undefined;
-        }
-        var children = list.getChildren();
-        var listItemIndex = ts.indexOf(children, node);
-        return {
-            listItemIndex: listItemIndex,
-            list: list
-        };
-    }
-    ts.findListItemInfo = findListItemInfo;
-    function hasChildOfKind(n, kind, sourceFile) {
-        return !!findChildOfKind(n, kind, sourceFile);
-    }
-    ts.hasChildOfKind = hasChildOfKind;
-    function findChildOfKind(n, kind, sourceFile) {
-        return ts.forEach(n.getChildren(sourceFile), function (c) { return c.kind === kind && c; });
-    }
-    ts.findChildOfKind = findChildOfKind;
-    function findContainingList(node) {
-        // The node might be a list element (nonsynthetic) or a comma (synthetic). Either way, it will
-        // be parented by the container of the SyntaxList, not the SyntaxList itself.
-        // In order to find the list item index, we first need to locate SyntaxList itself and then search
-        // for the position of the relevant node (or comma).
-        var syntaxList = ts.forEach(node.parent.getChildren(), function (c) {
-            // find syntax list that covers the span of the node
-            if (c.kind === 282 /* SyntaxList */ && c.pos <= node.pos && c.end >= node.end) {
-                return c;
-            }
-        });
-        // Either we didn't find an appropriate list, or the list must contain us.
-        ts.Debug.assert(!syntaxList || ts.contains(syntaxList.getChildren(), node));
-        return syntaxList;
-    }
-    ts.findContainingList = findContainingList;
-    /* Gets the token whose text has range [start, end) and
-     * position >= start and (position < end or (position === end && token is keyword or identifier))
-     */
-    function getTouchingWord(sourceFile, position, includeJsDocComment) {
-        if (includeJsDocComment === void 0) { includeJsDocComment = false; }
-        return getTouchingToken(sourceFile, position, function (n) { return isWord(n.kind); }, includeJsDocComment);
-    }
-    ts.getTouchingWord = getTouchingWord;
-    /* Gets the token whose text has range [start, end) and position >= start
-     * and (position < end or (position === end && token is keyword or identifier or numeric/string literal))
-     */
-    function getTouchingPropertyName(sourceFile, position, includeJsDocComment) {
-        if (includeJsDocComment === void 0) { includeJsDocComment = false; }
-        return getTouchingToken(sourceFile, position, function (n) { return isPropertyName(n.kind); }, includeJsDocComment);
-    }
-    ts.getTouchingPropertyName = getTouchingPropertyName;
-    /** Returns the token if position is in [start, end) or if position === end and includeItemAtEndPosition(token) === true */
-    function getTouchingToken(sourceFile, position, includeItemAtEndPosition, includeJsDocComment) {
-        if (includeJsDocComment === void 0) { includeJsDocComment = false; }
-        return getTokenAtPositionWorker(sourceFile, position, /*allowPositionInLeadingTrivia*/ false, includeItemAtEndPosition, includeJsDocComment);
-    }
-    ts.getTouchingToken = getTouchingToken;
-    /** Returns a token if position is in [start-of-leading-trivia, end) */
-    function getTokenAtPosition(sourceFile, position, includeJsDocComment) {
-        if (includeJsDocComment === void 0) { includeJsDocComment = false; }
-        return getTokenAtPositionWorker(sourceFile, position, /*allowPositionInLeadingTrivia*/ true, /*includeItemAtEndPosition*/ undefined, includeJsDocComment);
-    }
-    ts.getTokenAtPosition = getTokenAtPosition;
-    /** Get the token whose text contains the position */
-    function getTokenAtPositionWorker(sourceFile, position, allowPositionInLeadingTrivia, includeItemAtEndPosition, includeJsDocComment) {
-        if (includeJsDocComment === void 0) { includeJsDocComment = false; }
-        var current = sourceFile;
-        outer: while (true) {
-            if (isToken(current)) {
-                // exit early
-                return current;
-            }
-            if (includeJsDocComment) {
-                var jsDocChildren = ts.filter(current.getChildren(), ts.isJSDocNode);
-                for (var _i = 0, jsDocChildren_1 = jsDocChildren; _i < jsDocChildren_1.length; _i++) {
-                    var jsDocChild = jsDocChildren_1[_i];
-                    var start = allowPositionInLeadingTrivia ? jsDocChild.getFullStart() : jsDocChild.getStart(sourceFile, includeJsDocComment);
-                    if (start <= position) {
-                        var end = jsDocChild.getEnd();
-                        if (position < end || (position === end && jsDocChild.kind === 1 /* EndOfFileToken */)) {
-                            current = jsDocChild;
-                            continue outer;
-                        }
-                        else if (includeItemAtEndPosition && end === position) {
-                            var previousToken = findPrecedingToken(position, sourceFile, jsDocChild);
-                            if (previousToken && includeItemAtEndPosition(previousToken)) {
-                                return previousToken;
-                            }
-                        }
-                    }
-                }
-            }
-            // find the child that contains 'position'
-            for (var i = 0, n = current.getChildCount(sourceFile); i < n; i++) {
-                var child = current.getChildAt(i);
-                // all jsDocComment nodes were already visited
-                if (ts.isJSDocNode(child)) {
-                    continue;
-                }
-                var start = allowPositionInLeadingTrivia ? child.getFullStart() : child.getStart(sourceFile, includeJsDocComment);
-                if (start <= position) {
-                    var end = child.getEnd();
-                    if (position < end || (position === end && child.kind === 1 /* EndOfFileToken */)) {
-                        current = child;
-                        continue outer;
-                    }
-                    else if (includeItemAtEndPosition && end === position) {
-                        var previousToken = findPrecedingToken(position, sourceFile, child);
-                        if (previousToken && includeItemAtEndPosition(previousToken)) {
-                            return previousToken;
-                        }
-                    }
-                }
-            }
-            return current;
-        }
-    }
-    /**
-      * The token on the left of the position is the token that strictly includes the position
-      * or sits to the left of the cursor if it is on a boundary. For example
-      *
-      *   fo|o               -> will return foo
-      *   foo <comment> |bar -> will return foo
-      *
-      */
-    function findTokenOnLeftOfPosition(file, position) {
-        // Ideally, getTokenAtPosition should return a token. However, it is currently
-        // broken, so we do a check to make sure the result was indeed a token.
-        var tokenAtPosition = getTokenAtPosition(file, position);
-        if (isToken(tokenAtPosition) && position > tokenAtPosition.getStart(file) && position < tokenAtPosition.getEnd()) {
-            return tokenAtPosition;
-        }
-        return findPrecedingToken(position, file);
-    }
-    ts.findTokenOnLeftOfPosition = findTokenOnLeftOfPosition;
-    function findNextToken(previousToken, parent) {
-        return find(parent);
-        function find(n) {
-            if (isToken(n) && n.pos === previousToken.end) {
-                // this is token that starts at the end of previous token - return it
-                return n;
-            }
-            var children = n.getChildren();
-            for (var _i = 0, children_1 = children; _i < children_1.length; _i++) {
-                var child = children_1[_i];
-                var shouldDiveInChildNode = 
-                // previous token is enclosed somewhere in the child
-                (child.pos <= previousToken.pos && child.end > previousToken.end) ||
-                    // previous token ends exactly at the beginning of child
-                    (child.pos === previousToken.end);
-                if (shouldDiveInChildNode && nodeHasTokens(child)) {
-                    return find(child);
-                }
-            }
-            return undefined;
-        }
-    }
-    ts.findNextToken = findNextToken;
-    function findPrecedingToken(position, sourceFile, startNode) {
-        return find(startNode || sourceFile);
-        function findRightmostToken(n) {
-            if (isToken(n) || n.kind === 244 /* JsxText */) {
-                return n;
-            }
-            var children = n.getChildren();
-            var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
-            return candidate && findRightmostToken(candidate);
-        }
-        function find(n) {
-            if (isToken(n) || n.kind === 244 /* JsxText */) {
-                return n;
-            }
-            var children = n.getChildren();
-            for (var i = 0, len = children.length; i < len; i++) {
-                var child = children[i];
-                // condition 'position < child.end' checks if child node end after the position
-                // in the example below this condition will be false for 'aaaa' and 'bbbb' and true for 'ccc'
-                // aaaa___bbbb___$__ccc
-                // after we found child node with end after the position we check if start of the node is after the position.
-                // if yes - then position is in the trivia and we need to look into the previous child to find the token in question.
-                // if no - position is in the node itself so we should recurse in it.
-                // NOTE: JsxText is a weird kind of node that can contain only whitespaces (since they are not counted as trivia).
-                // if this is the case - then we should assume that token in question is located in previous child.
-                if (position < child.end && (nodeHasTokens(child) || child.kind === 244 /* JsxText */)) {
-                    var start = child.getStart(sourceFile);
-                    var lookInPreviousChild = (start >= position) ||
-                        (child.kind === 244 /* JsxText */ && start === child.end); // whitespace only JsxText
-                    if (lookInPreviousChild) {
-                        // actual start of the node is past the position - previous token should be at the end of previous child
-                        var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ i);
-                        return candidate && findRightmostToken(candidate);
-                    }
-                    else {
-                        // candidate should be in this node
-                        return find(child);
-                    }
-                }
-            }
-            ts.Debug.assert(startNode !== undefined || n.kind === 256 /* SourceFile */);
-            // Here we know that none of child token nodes embrace the position,
-            // the only known case is when position is at the end of the file.
-            // Try to find the rightmost token in the file without filtering.
-            // Namely we are skipping the check: 'position < node.end'
-            if (children.length) {
-                var candidate = findRightmostChildNodeWithTokens(children, /*exclusiveStartPosition*/ children.length);
-                return candidate && findRightmostToken(candidate);
-            }
-        }
-        /// finds last node that is considered as candidate for search (isCandidate(node) === true) starting from 'exclusiveStartPosition'
-        function findRightmostChildNodeWithTokens(children, exclusiveStartPosition) {
-            for (var i = exclusiveStartPosition - 1; i >= 0; i--) {
-                if (nodeHasTokens(children[i])) {
-                    return children[i];
-                }
-            }
-        }
-    }
-    ts.findPrecedingToken = findPrecedingToken;
-    function isInString(sourceFile, position) {
-        var previousToken = findPrecedingToken(position, sourceFile);
-        if (previousToken &&
-            (previousToken.kind === 9 /* StringLiteral */ || previousToken.kind === 166 /* StringLiteralType */)) {
-            var start = previousToken.getStart();
-            var end = previousToken.getEnd();
-            // To be "in" one of these literals, the position has to be:
-            //   1. entirely within the token text.
-            //   2. at the end position of an unterminated token.
-            //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
-            if (start < position && position < end) {
-                return true;
-            }
-            if (position === end) {
-                return !!previousToken.isUnterminated;
-            }
-        }
-        return false;
-    }
-    ts.isInString = isInString;
-    function isInComment(sourceFile, position) {
-        return isInCommentHelper(sourceFile, position, /*predicate*/ undefined);
-    }
-    ts.isInComment = isInComment;
-    /**
-     * returns true if the position is in between the open and close elements of an JSX expression.
-     */
-    function isInsideJsxElementOrAttribute(sourceFile, position) {
-        var token = getTokenAtPosition(sourceFile, position);
-        if (!token) {
-            return false;
-        }
-        if (token.kind === 244 /* JsxText */) {
-            return true;
-        }
-        // <div>Hello |</div>
-        if (token.kind === 25 /* LessThanToken */ && token.parent.kind === 244 /* JsxText */) {
-            return true;
-        }
-        // <div> { | </div> or <div a={| </div>
-        if (token.kind === 25 /* LessThanToken */ && token.parent.kind === 248 /* JsxExpression */) {
-            return true;
-        }
-        // <div> {
-        // |
-        // } < /div>
-        if (token && token.kind === 16 /* CloseBraceToken */ && token.parent.kind === 248 /* JsxExpression */) {
-            return true;
-        }
-        // <div>|</div>
-        if (token.kind === 25 /* LessThanToken */ && token.parent.kind === 245 /* JsxClosingElement */) {
-            return true;
-        }
-        return false;
-    }
-    ts.isInsideJsxElementOrAttribute = isInsideJsxElementOrAttribute;
-    function isInTemplateString(sourceFile, position) {
-        var token = getTokenAtPosition(sourceFile, position);
-        return ts.isTemplateLiteralKind(token.kind) && position > token.getStart(sourceFile);
-    }
-    ts.isInTemplateString = isInTemplateString;
-    /**
-     * Returns true if the cursor at position in sourceFile is within a comment that additionally
-     * satisfies predicate, and false otherwise.
-     */
-    function isInCommentHelper(sourceFile, position, predicate) {
-        var token = getTokenAtPosition(sourceFile, position);
-        if (token && position <= token.getStart(sourceFile)) {
-            var commentRanges = ts.getLeadingCommentRanges(sourceFile.text, token.pos);
-            // The end marker of a single-line comment does not include the newline character.
-            // In the following case, we are inside a comment (^ denotes the cursor position):
-            //
-            //    // asdf   ^\n
-            //
-            // But for multi-line comments, we don't want to be inside the comment in the following case:
-            //
-            //    /* asdf */^
-            //
-            // Internally, we represent the end of the comment at the newline and closing '/', respectively.
-            return predicate ?
-                ts.forEach(commentRanges, function (c) { return c.pos < position &&
-                    (c.kind == 2 /* SingleLineCommentTrivia */ ? position <= c.end : position < c.end) &&
-                    predicate(c); }) :
-                ts.forEach(commentRanges, function (c) { return c.pos < position &&
-                    (c.kind == 2 /* SingleLineCommentTrivia */ ? position <= c.end : position < c.end); });
-        }
-        return false;
-    }
-    ts.isInCommentHelper = isInCommentHelper;
-    function hasDocComment(sourceFile, position) {
-        var token = getTokenAtPosition(sourceFile, position);
-        // First, we have to see if this position actually landed in a comment.
-        var commentRanges = ts.getLeadingCommentRanges(sourceFile.text, token.pos);
-        return ts.forEach(commentRanges, jsDocPrefix);
-        function jsDocPrefix(c) {
-            var text = sourceFile.text;
-            return text.length >= c.pos + 3 && text[c.pos] === "/" && text[c.pos + 1] === "*" && text[c.pos + 2] === "*";
-        }
-    }
-    ts.hasDocComment = hasDocComment;
-    /**
-     * Get the corresponding JSDocTag node if the position is in a jsDoc comment
-     */
-    function getJsDocTagAtPosition(sourceFile, position) {
-        var node = ts.getTokenAtPosition(sourceFile, position);
-        if (isToken(node)) {
-            switch (node.kind) {
-                case 102 /* VarKeyword */:
-                case 108 /* LetKeyword */:
-                case 74 /* ConstKeyword */:
-                    // if the current token is var, let or const, skip the VariableDeclarationList
-                    node = node.parent === undefined ? undefined : node.parent.parent;
-                    break;
-                default:
-                    node = node.parent;
-                    break;
-            }
-        }
-        if (node) {
-            if (node.jsDocComments) {
-                for (var _i = 0, _a = node.jsDocComments; _i < _a.length; _i++) {
-                    var jsDocComment = _a[_i];
-                    for (var _b = 0, _c = jsDocComment.tags; _b < _c.length; _b++) {
-                        var tag = _c[_b];
-                        if (tag.pos <= position && position <= tag.end) {
-                            return tag;
-                        }
-                    }
-                }
-            }
-        }
-        return undefined;
-    }
-    ts.getJsDocTagAtPosition = getJsDocTagAtPosition;
-    function nodeHasTokens(n) {
-        // If we have a token or node that has a non-zero width, it must have tokens.
-        // Note, that getWidth() does not take trivia into account.
-        return n.getWidth() !== 0;
-    }
-    function getNodeModifiers(node) {
-        var flags = ts.getCombinedNodeFlags(node);
-        var result = [];
-        if (flags & 8 /* Private */)
-            result.push(ts.ScriptElementKindModifier.privateMemberModifier);
-        if (flags & 16 /* Protected */)
-            result.push(ts.ScriptElementKindModifier.protectedMemberModifier);
-        if (flags & 4 /* Public */)
-            result.push(ts.ScriptElementKindModifier.publicMemberModifier);
-        if (flags & 32 /* Static */)
-            result.push(ts.ScriptElementKindModifier.staticModifier);
-        if (flags & 128 /* Abstract */)
-            result.push(ts.ScriptElementKindModifier.abstractModifier);
-        if (flags & 1 /* Export */)
-            result.push(ts.ScriptElementKindModifier.exportedModifier);
-        if (ts.isInAmbientContext(node))
-            result.push(ts.ScriptElementKindModifier.ambientModifier);
-        return result.length > 0 ? result.join(",") : ts.ScriptElementKindModifier.none;
-    }
-    ts.getNodeModifiers = getNodeModifiers;
-    function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 155 /* TypeReference */ || node.kind === 174 /* CallExpression */) {
-            return node.typeArguments;
-        }
-        if (ts.isFunctionLike(node) || node.kind === 221 /* ClassDeclaration */ || node.kind === 222 /* InterfaceDeclaration */) {
-            return node.typeParameters;
-        }
-        return undefined;
-    }
-    ts.getTypeArgumentOrTypeParameterList = getTypeArgumentOrTypeParameterList;
-    function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 138 /* LastToken */;
-    }
-    ts.isToken = isToken;
-    function isWord(kind) {
-        return kind === 69 /* Identifier */ || ts.isKeyword(kind);
-    }
-    ts.isWord = isWord;
-    function isPropertyName(kind) {
-        return kind === 9 /* StringLiteral */ || kind === 8 /* NumericLiteral */ || isWord(kind);
-    }
-    function isComment(kind) {
-        return kind === 2 /* SingleLineCommentTrivia */ || kind === 3 /* MultiLineCommentTrivia */;
-    }
-    ts.isComment = isComment;
-    function isStringOrRegularExpressionOrTemplateLiteral(kind) {
-        if (kind === 9 /* StringLiteral */
-            || kind === 166 /* StringLiteralType */
-            || kind === 10 /* RegularExpressionLiteral */
-            || ts.isTemplateLiteralKind(kind)) {
-            return true;
-        }
-        return false;
-    }
-    ts.isStringOrRegularExpressionOrTemplateLiteral = isStringOrRegularExpressionOrTemplateLiteral;
-    function isPunctuation(kind) {
-        return 15 /* FirstPunctuation */ <= kind && kind <= 68 /* LastPunctuation */;
-    }
-    ts.isPunctuation = isPunctuation;
-    function isInsideTemplateLiteral(node, position) {
-        return ts.isTemplateLiteralKind(node.kind)
-            && (node.getStart() < position && position < node.getEnd()) || (!!node.isUnterminated && position === node.getEnd());
-    }
-    ts.isInsideTemplateLiteral = isInsideTemplateLiteral;
-    function isAccessibilityModifier(kind) {
-        switch (kind) {
-            case 112 /* PublicKeyword */:
-            case 110 /* PrivateKeyword */:
-            case 111 /* ProtectedKeyword */:
-                return true;
-        }
-        return false;
-    }
-    ts.isAccessibilityModifier = isAccessibilityModifier;
-    function compareDataObjects(dst, src) {
-        for (var e in dst) {
-            if (typeof dst[e] === "object") {
-                if (!compareDataObjects(dst[e], src[e])) {
-                    return false;
-                }
-            }
-            else if (typeof dst[e] !== "function") {
-                if (dst[e] !== src[e]) {
-                    return false;
-                }
-            }
-        }
-        return true;
-    }
-    ts.compareDataObjects = compareDataObjects;
-    function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 170 /* ArrayLiteralExpression */ ||
-            node.kind === 171 /* ObjectLiteralExpression */) {
-            // [a,b,c] from:
-            // [a, b, c] = someExpression;
-            if (node.parent.kind === 187 /* BinaryExpression */ &&
-                node.parent.left === node &&
-                node.parent.operatorToken.kind === 56 /* EqualsToken */) {
-                return true;
-            }
-            // [a, b, c] from:
-            // for([a, b, c] of expression)
-            if (node.parent.kind === 208 /* ForOfStatement */ &&
-                node.parent.initializer === node) {
-                return true;
-            }
-            // [a, b, c] of
-            // [x, [a, b, c] ] = someExpression
-            // or
-            // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 253 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
-                return true;
-            }
-        }
-        return false;
-    }
-    ts.isArrayLiteralOrObjectLiteralDestructuringPattern = isArrayLiteralOrObjectLiteralDestructuringPattern;
-})(ts || (ts = {}));
-// Display-part writer helpers
-/* @internal */
-var ts;
-(function (ts) {
-    function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 142 /* Parameter */;
-    }
-    ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
-    var displayPartWriter = getDisplayPartWriter();
-    function getDisplayPartWriter() {
-        var displayParts;
-        var lineStart;
-        var indent;
-        resetWriter();
-        return {
-            displayParts: function () { return displayParts; },
-            writeKeyword: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.keyword); },
-            writeOperator: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.operator); },
-            writePunctuation: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.punctuation); },
-            writeSpace: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.space); },
-            writeStringLiteral: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.stringLiteral); },
-            writeParameter: function (text) { return writeKind(text, ts.SymbolDisplayPartKind.parameterName); },
-            writeSymbol: writeSymbol,
-            writeLine: writeLine,
-            increaseIndent: function () { indent++; },
-            decreaseIndent: function () { indent--; },
-            clear: resetWriter,
-            trackSymbol: function () { },
-            reportInaccessibleThisError: function () { }
-        };
-        function writeIndent() {
-            if (lineStart) {
-                var indentString = ts.getIndentString(indent);
-                if (indentString) {
-                    displayParts.push(displayPart(indentString, ts.SymbolDisplayPartKind.space));
-                }
-                lineStart = false;
-            }
-        }
-        function writeKind(text, kind) {
-            writeIndent();
-            displayParts.push(displayPart(text, kind));
-        }
-        function writeSymbol(text, symbol) {
-            writeIndent();
-            displayParts.push(symbolPart(text, symbol));
-        }
-        function writeLine() {
-            displayParts.push(lineBreakPart());
-            lineStart = true;
-        }
-        function resetWriter() {
-            displayParts = [];
-            lineStart = true;
-            indent = 0;
-        }
-    }
-    function symbolPart(text, symbol) {
-        return displayPart(text, displayPartKind(symbol), symbol);
-        function displayPartKind(symbol) {
-            var flags = symbol.flags;
-            if (flags & 3 /* Variable */) {
-                return isFirstDeclarationOfSymbolParameter(symbol) ? ts.SymbolDisplayPartKind.parameterName : ts.SymbolDisplayPartKind.localName;
-            }
-            else if (flags & 4 /* Property */) {
-                return ts.SymbolDisplayPartKind.propertyName;
-            }
-            else if (flags & 32768 /* GetAccessor */) {
-                return ts.SymbolDisplayPartKind.propertyName;
-            }
-            else if (flags & 65536 /* SetAccessor */) {
-                return ts.SymbolDisplayPartKind.propertyName;
-            }
-            else if (flags & 8 /* EnumMember */) {
-                return ts.SymbolDisplayPartKind.enumMemberName;
-            }
-            else if (flags & 16 /* Function */) {
-                return ts.SymbolDisplayPartKind.functionName;
-            }
-            else if (flags & 32 /* Class */) {
-                return ts.SymbolDisplayPartKind.className;
-            }
-            else if (flags & 64 /* Interface */) {
-                return ts.SymbolDisplayPartKind.interfaceName;
-            }
-            else if (flags & 384 /* Enum */) {
-                return ts.SymbolDisplayPartKind.enumName;
-            }
-            else if (flags & 1536 /* Module */) {
-                return ts.SymbolDisplayPartKind.moduleName;
-            }
-            else if (flags & 8192 /* Method */) {
-                return ts.SymbolDisplayPartKind.methodName;
-            }
-            else if (flags & 262144 /* TypeParameter */) {
-                return ts.SymbolDisplayPartKind.typeParameterName;
-            }
-            else if (flags & 524288 /* TypeAlias */) {
-                return ts.SymbolDisplayPartKind.aliasName;
-            }
-            else if (flags & 8388608 /* Alias */) {
-                return ts.SymbolDisplayPartKind.aliasName;
-            }
-            return ts.SymbolDisplayPartKind.text;
-        }
-    }
-    ts.symbolPart = symbolPart;
-    function displayPart(text, kind, symbol) {
-        return {
-            text: text,
-            kind: ts.SymbolDisplayPartKind[kind]
-        };
-    }
-    ts.displayPart = displayPart;
-    function spacePart() {
-        return displayPart(" ", ts.SymbolDisplayPartKind.space);
-    }
-    ts.spacePart = spacePart;
-    function keywordPart(kind) {
-        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.keyword);
-    }
-    ts.keywordPart = keywordPart;
-    function punctuationPart(kind) {
-        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.punctuation);
-    }
-    ts.punctuationPart = punctuationPart;
-    function operatorPart(kind) {
-        return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.operator);
-    }
-    ts.operatorPart = operatorPart;
-    function textOrKeywordPart(text) {
-        var kind = ts.stringToToken(text);
-        return kind === undefined
-            ? textPart(text)
-            : keywordPart(kind);
-    }
-    ts.textOrKeywordPart = textOrKeywordPart;
-    function textPart(text) {
-        return displayPart(text, ts.SymbolDisplayPartKind.text);
-    }
-    ts.textPart = textPart;
-    var carriageReturnLineFeed = "\r\n";
-    /**
-     * The default is CRLF.
-     */
-    function getNewLineOrDefaultFromHost(host) {
-        return host.getNewLine ? host.getNewLine() : carriageReturnLineFeed;
-    }
-    ts.getNewLineOrDefaultFromHost = getNewLineOrDefaultFromHost;
-    function lineBreakPart() {
-        return displayPart("\n", ts.SymbolDisplayPartKind.lineBreak);
-    }
-    ts.lineBreakPart = lineBreakPart;
-    function mapToDisplayParts(writeDisplayParts) {
-        writeDisplayParts(displayPartWriter);
-        var result = displayPartWriter.displayParts();
-        displayPartWriter.clear();
-        return result;
-    }
-    ts.mapToDisplayParts = mapToDisplayParts;
-    function typeToDisplayParts(typechecker, type, enclosingDeclaration, flags) {
-        return mapToDisplayParts(function (writer) {
-            typechecker.getSymbolDisplayBuilder().buildTypeDisplay(type, writer, enclosingDeclaration, flags);
-        });
-    }
-    ts.typeToDisplayParts = typeToDisplayParts;
-    function symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration, meaning, flags) {
-        return mapToDisplayParts(function (writer) {
-            typeChecker.getSymbolDisplayBuilder().buildSymbolDisplay(symbol, writer, enclosingDeclaration, meaning, flags);
-        });
-    }
-    ts.symbolToDisplayParts = symbolToDisplayParts;
-    function signatureToDisplayParts(typechecker, signature, enclosingDeclaration, flags) {
-        return mapToDisplayParts(function (writer) {
-            typechecker.getSymbolDisplayBuilder().buildSignatureDisplay(signature, writer, enclosingDeclaration, flags);
-        });
-    }
-    ts.signatureToDisplayParts = signatureToDisplayParts;
-    function getDeclaredName(typeChecker, symbol, location) {
-        // If this is an export or import specifier it could have been renamed using the 'as' syntax.
-        // If so we want to search for whatever is under the cursor.
-        if (isImportOrExportSpecifierName(location)) {
-            return location.getText();
-        }
-        else if (ts.isStringOrNumericLiteral(location.kind) &&
-            location.parent.kind === 140 /* ComputedPropertyName */) {
-            return location.text;
-        }
-        // Try to get the local symbol if we're dealing with an 'export default'
-        // since that symbol has the "true" name.
-        var localExportDefaultSymbol = ts.getLocalSymbolForExportDefault(symbol);
-        var name = typeChecker.symbolToString(localExportDefaultSymbol || symbol);
-        return name;
-    }
-    ts.getDeclaredName = getDeclaredName;
-    function isImportOrExportSpecifierName(location) {
-        return location.parent &&
-            (location.parent.kind === 234 /* ImportSpecifier */ || location.parent.kind === 238 /* ExportSpecifier */) &&
-            location.parent.propertyName === location;
-    }
-    ts.isImportOrExportSpecifierName = isImportOrExportSpecifierName;
-    /**
-     * Strip off existed single quotes or double quotes from a given string
-     *
-     * @return non-quoted string
-     */
-    function stripQuotes(name) {
-        var length = name.length;
-        if (length >= 2 &&
-            name.charCodeAt(0) === name.charCodeAt(length - 1) &&
-            (name.charCodeAt(0) === 34 /* doubleQuote */ || name.charCodeAt(0) === 39 /* singleQuote */)) {
-            return name.substring(1, length - 1);
-        }
-        ;
-        return name;
-    }
-    ts.stripQuotes = stripQuotes;
-    function scriptKindIs(fileName, host) {
-        var scriptKinds = [];
-        for (var _i = 2; _i < arguments.length; _i++) {
-            scriptKinds[_i - 2] = arguments[_i];
-        }
-        var scriptKind = getScriptKind(fileName, host);
-        return ts.forEach(scriptKinds, function (k) { return k === scriptKind; });
-    }
-    ts.scriptKindIs = scriptKindIs;
-    function getScriptKind(fileName, host) {
-        // First check to see if the script kind was specified by the host. Chances are the host
-        // may override the default script kind for the file extension.
-        var scriptKind;
-        if (host && host.getScriptKind) {
-            scriptKind = host.getScriptKind(fileName);
-        }
-        if (!scriptKind || scriptKind === 0 /* Unknown */) {
-            scriptKind = ts.getScriptKindFromFileName(fileName);
-        }
-        return ts.ensureScriptKind(fileName, scriptKind);
-    }
-    ts.getScriptKind = getScriptKind;
-})(ts || (ts = {}));
-// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
-// See LICENSE.txt in the project root for complete license information.
-/// <reference path='services.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var JsTyping;
-    (function (JsTyping) {
-        ;
-        ;
-        // A map of loose file names to library names
-        // that we are confident require typings
-        var safeList;
-        /**
-         * @param host is the object providing I/O related operations.
-         * @param fileNames are the file names that belong to the same project
-         * @param projectRootPath is the path to the project root directory
-         * @param safeListPath is the path used to retrieve the safe list
-         * @param packageNameToTypingLocation is the map of package names to their cached typing locations
-         * @param typingOptions are used to customize the typing inference process
-         * @param compilerOptions are used as a source for typing inference
-         */
-        function discoverTypings(host, fileNames, projectRootPath, safeListPath, packageNameToTypingLocation, typingOptions, compilerOptions) {
-            // A typing name to typing file path mapping
-            var inferredTypings = {};
-            if (!typingOptions || !typingOptions.enableAutoDiscovery) {
-                return { cachedTypingPaths: [], newTypingNames: [], filesToWatch: [] };
-            }
-            // Only infer typings for .js and .jsx files
-            fileNames = ts.filter(ts.map(fileNames, ts.normalizePath), function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 1 /* JS */, 2 /* JSX */); });
-            if (!safeList) {
-                var result = ts.readConfigFile(safeListPath, function (path) { return host.readFile(path); });
-                if (result.config) {
-                    safeList = result.config;
-                }
-                else {
-                    safeList = {};
-                }
-                ;
-            }
-            var filesToWatch = [];
-            // Directories to search for package.json, bower.json and other typing information
-            var searchDirs = [];
-            var exclude = [];
-            mergeTypings(typingOptions.include);
-            exclude = typingOptions.exclude || [];
-            var possibleSearchDirs = ts.map(fileNames, ts.getDirectoryPath);
-            if (projectRootPath !== undefined) {
-                possibleSearchDirs.push(projectRootPath);
-            }
-            searchDirs = ts.deduplicate(possibleSearchDirs);
-            for (var _i = 0, searchDirs_1 = searchDirs; _i < searchDirs_1.length; _i++) {
-                var searchDir = searchDirs_1[_i];
-                var packageJsonPath = ts.combinePaths(searchDir, "package.json");
-                getTypingNamesFromJson(packageJsonPath, filesToWatch);
-                var bowerJsonPath = ts.combinePaths(searchDir, "bower.json");
-                getTypingNamesFromJson(bowerJsonPath, filesToWatch);
-                var nodeModulesPath = ts.combinePaths(searchDir, "node_modules");
-                getTypingNamesFromNodeModuleFolder(nodeModulesPath);
-            }
-            getTypingNamesFromSourceFileNames(fileNames);
-            // Add the cached typing locations for inferred typings that are already installed
-            for (var name_39 in packageNameToTypingLocation) {
-                if (ts.hasProperty(inferredTypings, name_39) && !inferredTypings[name_39]) {
-                    inferredTypings[name_39] = packageNameToTypingLocation[name_39];
-                }
-            }
-            // Remove typings that the user has added to the exclude list
-            for (var _a = 0, exclude_1 = exclude; _a < exclude_1.length; _a++) {
-                var excludeTypingName = exclude_1[_a];
-                delete inferredTypings[excludeTypingName];
-            }
-            var newTypingNames = [];
-            var cachedTypingPaths = [];
-            for (var typing in inferredTypings) {
-                if (inferredTypings[typing] !== undefined) {
-                    cachedTypingPaths.push(inferredTypings[typing]);
-                }
-                else {
-                    newTypingNames.push(typing);
-                }
-            }
-            return { cachedTypingPaths: cachedTypingPaths, newTypingNames: newTypingNames, filesToWatch: filesToWatch };
-            /**
-             * Merge a given list of typingNames to the inferredTypings map
-             */
-            function mergeTypings(typingNames) {
-                if (!typingNames) {
-                    return;
-                }
-                for (var _i = 0, typingNames_1 = typingNames; _i < typingNames_1.length; _i++) {
-                    var typing = typingNames_1[_i];
-                    if (!ts.hasProperty(inferredTypings, typing)) {
-                        inferredTypings[typing] = undefined;
-                    }
-                }
-            }
-            /**
-             * Get the typing info from common package manager json files like package.json or bower.json
-             */
-            function getTypingNamesFromJson(jsonPath, filesToWatch) {
-                var result = ts.readConfigFile(jsonPath, function (path) { return host.readFile(path); });
-                if (result.config) {
-                    var jsonConfig = result.config;
-                    filesToWatch.push(jsonPath);
-                    if (jsonConfig.dependencies) {
-                        mergeTypings(ts.getKeys(jsonConfig.dependencies));
-                    }
-                    if (jsonConfig.devDependencies) {
-                        mergeTypings(ts.getKeys(jsonConfig.devDependencies));
-                    }
-                    if (jsonConfig.optionalDependencies) {
-                        mergeTypings(ts.getKeys(jsonConfig.optionalDependencies));
-                    }
-                    if (jsonConfig.peerDependencies) {
-                        mergeTypings(ts.getKeys(jsonConfig.peerDependencies));
-                    }
-                }
-            }
-            /**
-             * Infer typing names from given file names. For example, the file name "jquery-min.2.3.4.js"
-             * should be inferred to the 'jquery' typing name; and "angular-route.1.2.3.js" should be inferred
-             * to the 'angular-route' typing name.
-             * @param fileNames are the names for source files in the project
-             */
-            function getTypingNamesFromSourceFileNames(fileNames) {
-                var jsFileNames = ts.filter(fileNames, ts.hasJavaScriptFileExtension);
-                var inferredTypingNames = ts.map(jsFileNames, function (f) { return ts.removeFileExtension(ts.getBaseFileName(f.toLowerCase())); });
-                var cleanedTypingNames = ts.map(inferredTypingNames, function (f) { return f.replace(/((?:\.|-)min(?=\.|$))|((?:-|\.)\d+)/g, ""); });
-                if (safeList === undefined) {
-                    mergeTypings(cleanedTypingNames);
-                }
-                else {
-                    mergeTypings(ts.filter(cleanedTypingNames, function (f) { return ts.hasProperty(safeList, f); }));
-                }
-                var hasJsxFile = ts.forEach(fileNames, function (f) { return ts.scriptKindIs(f, /*LanguageServiceHost*/ undefined, 2 /* JSX */); });
-                if (hasJsxFile) {
-                    mergeTypings(["react"]);
-                }
-            }
-            /**
-             * Infer typing names from node_module folder
-             * @param nodeModulesPath is the path to the "node_modules" folder
-             */
-            function getTypingNamesFromNodeModuleFolder(nodeModulesPath) {
-                // Todo: add support for ModuleResolutionHost too
-                if (!host.directoryExists(nodeModulesPath)) {
-                    return;
-                }
-                var typingNames = [];
-                var fileNames = host.readDirectory(nodeModulesPath, ["*.json"], /*excludes*/ undefined, /*includes*/ undefined, /*depth*/ 2);
-                for (var _i = 0, fileNames_2 = fileNames; _i < fileNames_2.length; _i++) {
-                    var fileName = fileNames_2[_i];
-                    var normalizedFileName = ts.normalizePath(fileName);
-                    if (ts.getBaseFileName(normalizedFileName) !== "package.json") {
-                        continue;
-                    }
-                    var result = ts.readConfigFile(normalizedFileName, function (path) { return host.readFile(path); });
-                    if (!result.config) {
-                        continue;
-                    }
-                    var packageJson = result.config;
-                    // npm 3's package.json contains a "_requiredBy" field
-                    // we should include all the top level module names for npm 2, and only module names whose
-                    // "_requiredBy" field starts with "#" or equals "/" for npm 3.
-                    if (packageJson._requiredBy &&
-                        ts.filter(packageJson._requiredBy, function (r) { return r[0] === "#" || r === "/"; }).length === 0) {
-                        continue;
-                    }
-                    // If the package has its own d.ts typings, those will take precedence. Otherwise the package name will be used
-                    // to download d.ts files from DefinitelyTyped
-                    if (!packageJson.name) {
-                        continue;
-                    }
-                    if (packageJson.typings) {
-                        var absolutePath = ts.getNormalizedAbsolutePath(packageJson.typings, ts.getDirectoryPath(normalizedFileName));
-                        inferredTypings[packageJson.name] = absolutePath;
-                    }
-                    else {
-                        typingNames.push(packageJson.name);
-                    }
-                }
-                mergeTypings(typingNames);
-            }
-        }
-        JsTyping.discoverTypings = discoverTypings;
-    })(JsTyping = ts.JsTyping || (ts.JsTyping = {}));
-})(ts || (ts = {}));
-/// <reference path="formatting.ts"/>
-/// <reference path="..\..\compiler\scanner.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var standardScanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ false, 0 /* Standard */);
-        var jsxScanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ false, 1 /* JSX */);
-        /**
-         * Scanner that is currently used for formatting
-         */
-        var scanner;
-        var ScanAction;
-        (function (ScanAction) {
-            ScanAction[ScanAction["Scan"] = 0] = "Scan";
-            ScanAction[ScanAction["RescanGreaterThanToken"] = 1] = "RescanGreaterThanToken";
-            ScanAction[ScanAction["RescanSlashToken"] = 2] = "RescanSlashToken";
-            ScanAction[ScanAction["RescanTemplateToken"] = 3] = "RescanTemplateToken";
-            ScanAction[ScanAction["RescanJsxIdentifier"] = 4] = "RescanJsxIdentifier";
-        })(ScanAction || (ScanAction = {}));
-        function getFormattingScanner(sourceFile, startPos, endPos) {
-            ts.Debug.assert(scanner === undefined);
-            scanner = sourceFile.languageVariant === 1 /* JSX */ ? jsxScanner : standardScanner;
-            scanner.setText(sourceFile.text);
-            scanner.setTextPos(startPos);
-            var wasNewLine = true;
-            var leadingTrivia;
-            var trailingTrivia;
-            var savedPos;
-            var lastScanAction;
-            var lastTokenInfo;
-            return {
-                advance: advance,
-                readTokenInfo: readTokenInfo,
-                isOnToken: isOnToken,
-                getCurrentLeadingTrivia: function () { return leadingTrivia; },
-                lastTrailingTriviaWasNewLine: function () { return wasNewLine; },
-                skipToEndOf: skipToEndOf,
-                close: function () {
-                    ts.Debug.assert(scanner !== undefined);
-                    lastTokenInfo = undefined;
-                    scanner.setText(undefined);
-                    scanner = undefined;
-                }
-            };
-            function advance() {
-                ts.Debug.assert(scanner !== undefined);
-                lastTokenInfo = undefined;
-                var isStarted = scanner.getStartPos() !== startPos;
-                if (isStarted) {
-                    if (trailingTrivia) {
-                        ts.Debug.assert(trailingTrivia.length !== 0);
-                        wasNewLine = ts.lastOrUndefined(trailingTrivia).kind === 4 /* NewLineTrivia */;
-                    }
-                    else {
-                        wasNewLine = false;
-                    }
-                }
-                leadingTrivia = undefined;
-                trailingTrivia = undefined;
-                if (!isStarted) {
-                    scanner.scan();
-                }
-                var pos = scanner.getStartPos();
-                // Read leading trivia and token
-                while (pos < endPos) {
-                    var t = scanner.getToken();
-                    if (!ts.isTrivia(t)) {
-                        break;
-                    }
-                    // consume leading trivia
-                    scanner.scan();
-                    var item = {
-                        pos: pos,
-                        end: scanner.getStartPos(),
-                        kind: t
-                    };
-                    pos = scanner.getStartPos();
-                    if (!leadingTrivia) {
-                        leadingTrivia = [];
-                    }
-                    leadingTrivia.push(item);
-                }
-                savedPos = scanner.getStartPos();
-            }
-            function shouldRescanGreaterThanToken(node) {
-                if (node) {
-                    switch (node.kind) {
-                        case 29 /* GreaterThanEqualsToken */:
-                        case 64 /* GreaterThanGreaterThanEqualsToken */:
-                        case 65 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                        case 45 /* GreaterThanGreaterThanGreaterThanToken */:
-                        case 44 /* GreaterThanGreaterThanToken */:
-                            return true;
-                    }
-                }
-                return false;
-            }
-            function shouldRescanJsxIdentifier(node) {
-                if (node.parent) {
-                    switch (node.parent.kind) {
-                        case 246 /* JsxAttribute */:
-                        case 243 /* JsxOpeningElement */:
-                        case 245 /* JsxClosingElement */:
-                        case 242 /* JsxSelfClosingElement */:
-                            return node.kind === 69 /* Identifier */;
-                    }
-                }
-                return false;
-            }
-            function shouldRescanSlashToken(container) {
-                return container.kind === 10 /* RegularExpressionLiteral */;
-            }
-            function shouldRescanTemplateToken(container) {
-                return container.kind === 13 /* TemplateMiddle */ ||
-                    container.kind === 14 /* TemplateTail */;
-            }
-            function startsWithSlashToken(t) {
-                return t === 39 /* SlashToken */ || t === 61 /* SlashEqualsToken */;
-            }
-            function readTokenInfo(n) {
-                ts.Debug.assert(scanner !== undefined);
-                if (!isOnToken()) {
-                    // scanner is not on the token (either advance was not called yet or scanner is already past the end position)
-                    return {
-                        leadingTrivia: leadingTrivia,
-                        trailingTrivia: undefined,
-                        token: undefined
-                    };
-                }
-                // normally scanner returns the smallest available token
-                // check the kind of context node to determine if scanner should have more greedy behavior and consume more text.
-                var expectedScanAction = shouldRescanGreaterThanToken(n)
-                    ? 1 /* RescanGreaterThanToken */
-                    : shouldRescanSlashToken(n)
-                        ? 2 /* RescanSlashToken */
-                        : shouldRescanTemplateToken(n)
-                            ? 3 /* RescanTemplateToken */
-                            : shouldRescanJsxIdentifier(n)
-                                ? 4 /* RescanJsxIdentifier */
-                                : 0 /* Scan */;
-                if (lastTokenInfo && expectedScanAction === lastScanAction) {
-                    // readTokenInfo was called before with the same expected scan action.
-                    // No need to re-scan text, return existing 'lastTokenInfo'
-                    // it is ok to call fixTokenKind here since it does not affect
-                    // what portion of text is consumed. In contrast rescanning can change it,
-                    // i.e. for '>=' when originally scanner eats just one character
-                    // and rescanning forces it to consume more.
-                    return fixTokenKind(lastTokenInfo, n);
-                }
-                if (scanner.getStartPos() !== savedPos) {
-                    ts.Debug.assert(lastTokenInfo !== undefined);
-                    // readTokenInfo was called before but scan action differs - rescan text
-                    scanner.setTextPos(savedPos);
-                    scanner.scan();
-                }
-                var currentToken = scanner.getToken();
-                if (expectedScanAction === 1 /* RescanGreaterThanToken */ && currentToken === 27 /* GreaterThanToken */) {
-                    currentToken = scanner.reScanGreaterToken();
-                    ts.Debug.assert(n.kind === currentToken);
-                    lastScanAction = 1 /* RescanGreaterThanToken */;
-                }
-                else if (expectedScanAction === 2 /* RescanSlashToken */ && startsWithSlashToken(currentToken)) {
-                    currentToken = scanner.reScanSlashToken();
-                    ts.Debug.assert(n.kind === currentToken);
-                    lastScanAction = 2 /* RescanSlashToken */;
-                }
-                else if (expectedScanAction === 3 /* RescanTemplateToken */ && currentToken === 16 /* CloseBraceToken */) {
-                    currentToken = scanner.reScanTemplateToken();
-                    lastScanAction = 3 /* RescanTemplateToken */;
-                }
-                else if (expectedScanAction === 4 /* RescanJsxIdentifier */ && currentToken === 69 /* Identifier */) {
-                    currentToken = scanner.scanJsxIdentifier();
-                    lastScanAction = 4 /* RescanJsxIdentifier */;
-                }
-                else {
-                    lastScanAction = 0 /* Scan */;
-                }
-                var token = {
-                    pos: scanner.getStartPos(),
-                    end: scanner.getTextPos(),
-                    kind: currentToken
-                };
-                // consume trailing trivia
-                if (trailingTrivia) {
-                    trailingTrivia = undefined;
-                }
-                while (scanner.getStartPos() < endPos) {
-                    currentToken = scanner.scan();
-                    if (!ts.isTrivia(currentToken)) {
-                        break;
-                    }
-                    var trivia = {
-                        pos: scanner.getStartPos(),
-                        end: scanner.getTextPos(),
-                        kind: currentToken
-                    };
-                    if (!trailingTrivia) {
-                        trailingTrivia = [];
-                    }
-                    trailingTrivia.push(trivia);
-                    if (currentToken === 4 /* NewLineTrivia */) {
-                        // move past new line
-                        scanner.scan();
-                        break;
-                    }
-                }
-                lastTokenInfo = {
-                    leadingTrivia: leadingTrivia,
-                    trailingTrivia: trailingTrivia,
-                    token: token
-                };
-                return fixTokenKind(lastTokenInfo, n);
-            }
-            function isOnToken() {
-                ts.Debug.assert(scanner !== undefined);
-                var current = (lastTokenInfo && lastTokenInfo.token.kind) || scanner.getToken();
-                var startPos = (lastTokenInfo && lastTokenInfo.token.pos) || scanner.getStartPos();
-                return startPos < endPos && current !== 1 /* EndOfFileToken */ && !ts.isTrivia(current);
-            }
-            // when containing node in the tree is token
-            // but its kind differs from the kind that was returned by the scanner,
-            // then kind needs to be fixed. This might happen in cases
-            // when parser interprets token differently, i.e keyword treated as identifier
-            function fixTokenKind(tokenInfo, container) {
-                if (ts.isToken(container) && tokenInfo.token.kind !== container.kind) {
-                    tokenInfo.token.kind = container.kind;
-                }
-                return tokenInfo;
-            }
-            function skipToEndOf(node) {
-                scanner.setTextPos(node.end);
-                savedPos = scanner.getStartPos();
-                lastScanAction = undefined;
-                lastTokenInfo = undefined;
-                wasNewLine = false;
-                leadingTrivia = undefined;
-                trailingTrivia = undefined;
-            }
-        }
-        formatting.getFormattingScanner = getFormattingScanner;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-/// <reference path="references.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var FormattingContext = (function () {
-            function FormattingContext(sourceFile, formattingRequestKind) {
-                this.sourceFile = sourceFile;
-                this.formattingRequestKind = formattingRequestKind;
-            }
-            FormattingContext.prototype.updateContext = function (currentRange, currentTokenParent, nextRange, nextTokenParent, commonParent) {
-                ts.Debug.assert(currentRange !== undefined, "currentTokenSpan is null");
-                ts.Debug.assert(currentTokenParent !== undefined, "currentTokenParent is null");
-                ts.Debug.assert(nextRange !== undefined, "nextTokenSpan is null");
-                ts.Debug.assert(nextTokenParent !== undefined, "nextTokenParent is null");
-                ts.Debug.assert(commonParent !== undefined, "commonParent is null");
-                this.currentTokenSpan = currentRange;
-                this.currentTokenParent = currentTokenParent;
-                this.nextTokenSpan = nextRange;
-                this.nextTokenParent = nextTokenParent;
-                this.contextNode = commonParent;
-                // drop cached results
-                this.contextNodeAllOnSameLine = undefined;
-                this.nextNodeAllOnSameLine = undefined;
-                this.tokensAreOnSameLine = undefined;
-                this.contextNodeBlockIsOnOneLine = undefined;
-                this.nextNodeBlockIsOnOneLine = undefined;
-            };
-            FormattingContext.prototype.ContextNodeAllOnSameLine = function () {
-                if (this.contextNodeAllOnSameLine === undefined) {
-                    this.contextNodeAllOnSameLine = this.NodeIsOnOneLine(this.contextNode);
-                }
-                return this.contextNodeAllOnSameLine;
-            };
-            FormattingContext.prototype.NextNodeAllOnSameLine = function () {
-                if (this.nextNodeAllOnSameLine === undefined) {
-                    this.nextNodeAllOnSameLine = this.NodeIsOnOneLine(this.nextTokenParent);
-                }
-                return this.nextNodeAllOnSameLine;
-            };
-            FormattingContext.prototype.TokensAreOnSameLine = function () {
-                if (this.tokensAreOnSameLine === undefined) {
-                    var startLine = this.sourceFile.getLineAndCharacterOfPosition(this.currentTokenSpan.pos).line;
-                    var endLine = this.sourceFile.getLineAndCharacterOfPosition(this.nextTokenSpan.pos).line;
-                    this.tokensAreOnSameLine = (startLine === endLine);
-                }
-                return this.tokensAreOnSameLine;
-            };
-            FormattingContext.prototype.ContextNodeBlockIsOnOneLine = function () {
-                if (this.contextNodeBlockIsOnOneLine === undefined) {
-                    this.contextNodeBlockIsOnOneLine = this.BlockIsOnOneLine(this.contextNode);
-                }
-                return this.contextNodeBlockIsOnOneLine;
-            };
-            FormattingContext.prototype.NextNodeBlockIsOnOneLine = function () {
-                if (this.nextNodeBlockIsOnOneLine === undefined) {
-                    this.nextNodeBlockIsOnOneLine = this.BlockIsOnOneLine(this.nextTokenParent);
-                }
-                return this.nextNodeBlockIsOnOneLine;
-            };
-            FormattingContext.prototype.NodeIsOnOneLine = function (node) {
-                var startLine = this.sourceFile.getLineAndCharacterOfPosition(node.getStart(this.sourceFile)).line;
-                var endLine = this.sourceFile.getLineAndCharacterOfPosition(node.getEnd()).line;
-                return startLine === endLine;
-            };
-            FormattingContext.prototype.BlockIsOnOneLine = function (node) {
-                var openBrace = ts.findChildOfKind(node, 15 /* OpenBraceToken */, this.sourceFile);
-                var closeBrace = ts.findChildOfKind(node, 16 /* CloseBraceToken */, this.sourceFile);
-                if (openBrace && closeBrace) {
-                    var startLine = this.sourceFile.getLineAndCharacterOfPosition(openBrace.getEnd()).line;
-                    var endLine = this.sourceFile.getLineAndCharacterOfPosition(closeBrace.getStart(this.sourceFile)).line;
-                    return startLine === endLine;
-                }
-                return false;
-            };
-            return FormattingContext;
-        }());
-        formatting.FormattingContext = FormattingContext;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-/// <reference path="references.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (FormattingRequestKind) {
-            FormattingRequestKind[FormattingRequestKind["FormatDocument"] = 0] = "FormatDocument";
-            FormattingRequestKind[FormattingRequestKind["FormatSelection"] = 1] = "FormatSelection";
-            FormattingRequestKind[FormattingRequestKind["FormatOnEnter"] = 2] = "FormatOnEnter";
-            FormattingRequestKind[FormattingRequestKind["FormatOnSemicolon"] = 3] = "FormatOnSemicolon";
-            FormattingRequestKind[FormattingRequestKind["FormatOnClosingCurlyBrace"] = 4] = "FormatOnClosingCurlyBrace";
-        })(formatting.FormattingRequestKind || (formatting.FormattingRequestKind = {}));
-        var FormattingRequestKind = formatting.FormattingRequestKind;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var Rule = (function () {
-            function Rule(Descriptor, Operation, Flag) {
-                if (Flag === void 0) { Flag = 0 /* None */; }
-                this.Descriptor = Descriptor;
-                this.Operation = Operation;
-                this.Flag = Flag;
-            }
-            Rule.prototype.toString = function () {
-                return "[desc=" + this.Descriptor + "," +
-                    "operation=" + this.Operation + "," +
-                    "flag=" + this.Flag + "]";
-            };
-            return Rule;
-        }());
-        formatting.Rule = Rule;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleAction) {
-            RuleAction[RuleAction["Ignore"] = 1] = "Ignore";
-            RuleAction[RuleAction["Space"] = 2] = "Space";
-            RuleAction[RuleAction["NewLine"] = 4] = "NewLine";
-            RuleAction[RuleAction["Delete"] = 8] = "Delete";
-        })(formatting.RuleAction || (formatting.RuleAction = {}));
-        var RuleAction = formatting.RuleAction;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var RuleDescriptor = (function () {
-            function RuleDescriptor(LeftTokenRange, RightTokenRange) {
-                this.LeftTokenRange = LeftTokenRange;
-                this.RightTokenRange = RightTokenRange;
-            }
-            RuleDescriptor.prototype.toString = function () {
-                return "[leftRange=" + this.LeftTokenRange + "," +
-                    "rightRange=" + this.RightTokenRange + "]";
-            };
-            RuleDescriptor.create1 = function (left, right) {
-                return RuleDescriptor.create4(formatting.Shared.TokenRange.FromToken(left), formatting.Shared.TokenRange.FromToken(right));
-            };
-            RuleDescriptor.create2 = function (left, right) {
-                return RuleDescriptor.create4(left, formatting.Shared.TokenRange.FromToken(right));
-            };
-            RuleDescriptor.create3 = function (left, right) {
-                return RuleDescriptor.create4(formatting.Shared.TokenRange.FromToken(left), right);
-            };
-            RuleDescriptor.create4 = function (left, right) {
-                return new RuleDescriptor(left, right);
-            };
-            return RuleDescriptor;
-        }());
-        formatting.RuleDescriptor = RuleDescriptor;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        (function (RuleFlags) {
-            RuleFlags[RuleFlags["None"] = 0] = "None";
-            RuleFlags[RuleFlags["CanDeleteNewLines"] = 1] = "CanDeleteNewLines";
-        })(formatting.RuleFlags || (formatting.RuleFlags = {}));
-        var RuleFlags = formatting.RuleFlags;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var RuleOperation = (function () {
-            function RuleOperation(Context, Action) {
-                this.Context = Context;
-                this.Action = Action;
-            }
-            RuleOperation.prototype.toString = function () {
-                return "[context=" + this.Context + "," +
-                    "action=" + this.Action + "]";
-            };
-            RuleOperation.create1 = function (action) {
-                return RuleOperation.create2(formatting.RuleOperationContext.Any, action);
-            };
-            RuleOperation.create2 = function (context, action) {
-                return new RuleOperation(context, action);
-            };
-            return RuleOperation;
-        }());
-        formatting.RuleOperation = RuleOperation;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var RuleOperationContext = (function () {
-            function RuleOperationContext() {
-                var funcs = [];
-                for (var _i = 0; _i < arguments.length; _i++) {
-                    funcs[_i - 0] = arguments[_i];
-                }
-                this.customContextChecks = funcs;
-            }
-            RuleOperationContext.prototype.IsAny = function () {
-                return this === RuleOperationContext.Any;
-            };
-            RuleOperationContext.prototype.InContext = function (context) {
-                if (this.IsAny()) {
-                    return true;
-                }
-                for (var _i = 0, _a = this.customContextChecks; _i < _a.length; _i++) {
-                    var check = _a[_i];
-                    if (!check(context)) {
-                        return false;
-                    }
-                }
-                return true;
-            };
-            RuleOperationContext.Any = new RuleOperationContext();
-            return RuleOperationContext;
-        }());
-        formatting.RuleOperationContext = RuleOperationContext;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var Rules = (function () {
-            function Rules() {
-                ///
-                /// Common Rules
-                ///
-                // Leave comments alone
-                this.IgnoreBeforeComment = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.Comments), formatting.RuleOperation.create1(1 /* Ignore */));
-                this.IgnoreAfterLineComment = new formatting.Rule(formatting.RuleDescriptor.create3(2 /* SingleLineCommentTrivia */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create1(1 /* Ignore */));
-                // Space after keyword but not before ; or : or ?
-                this.NoSpaceBeforeSemicolon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeColon = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 54 /* ColonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceBeforeQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 53 /* QuestionToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.SpaceAfterColon = new formatting.Rule(formatting.RuleDescriptor.create3(54 /* ColonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterQuestionMarkInConditionalOperator = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsConditionalOperatorContext), 2 /* Space */));
-                this.NoSpaceAfterQuestionMark = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterSemicolon = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                // Space after }.
-                this.SpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsAfterCodeBlockContext), 2 /* Space */));
-                // Special case for (}, else) and (}, while) since else & while tokens are not part of the tree which makes SpaceAfterCloseBrace rule not applied
-                this.SpaceBetweenCloseBraceAndElse = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 80 /* ElseKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenCloseBraceAndWhile = new formatting.Rule(formatting.RuleDescriptor.create1(16 /* CloseBraceToken */, 104 /* WhileKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create3(16 /* CloseBraceToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 20 /* CloseBracketToken */, 24 /* CommaToken */, 23 /* SemicolonToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // No space for dot
-                this.NoSpaceBeforeDot = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 21 /* DotToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterDot = new formatting.Rule(formatting.RuleDescriptor.create3(21 /* DotToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // No space before and after indexer
-                this.NoSpaceBeforeOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 19 /* OpenBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create3(20 /* CloseBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBeforeBlockInFunctionDeclarationContext), 8 /* Delete */));
-                // Place a space before open brace in a function declaration
-                this.FunctionOpenBraceLeftTokenRange = formatting.Shared.TokenRange.AnyIncludingMultilineComments;
-                this.SpaceBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2 /* Space */), 1 /* CanDeleteNewLines */);
-                // Place a space before open brace in a TypeScript declaration that has braces as children (class, module, enum, etc)
-                this.TypeScriptOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([69 /* Identifier */, 3 /* MultiLineCommentTrivia */, 73 /* ClassKeyword */, 82 /* ExportKeyword */, 89 /* ImportKeyword */]);
-                this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2 /* Space */), 1 /* CanDeleteNewLines */);
-                // Place a space before open brace in a control flow construct
-                this.ControlOpenBraceLeftTokenRange = formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 3 /* MultiLineCommentTrivia */, 79 /* DoKeyword */, 100 /* TryKeyword */, 85 /* FinallyKeyword */, 80 /* ElseKeyword */]);
-                this.SpaceBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsNotFormatOnEnter, Rules.IsSameLineTokenOrBeforeMultilineBlockContext), 2 /* Space */), 1 /* CanDeleteNewLines */);
-                // Insert a space after { and before } in single-line contexts, but remove space from empty object literals {}.
-                this.SpaceAfterOpenBrace = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
-                this.SpaceBeforeCloseBrace = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsSingleLineBlockContext), 2 /* Space */));
-                this.NoSpaceBetweenEmptyBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectContext), 8 /* Delete */));
-                // Insert new line after { and before } in multi-line contexts.
-                this.NewLineAfterOpenBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4 /* NewLine */));
-                // For functions and control block place } on a new line    [multi-line rule]
-                this.NewLineBeforeCloseBraceInBlockContext = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.AnyIncludingMultilineComments, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsMultilineBlockContext), 4 /* NewLine */));
-                // Special handling of unary operators.
-                // Prefix operators generally shouldn't have a space between
-                // them and their target unary expression.
-                this.NoSpaceAfterUnaryPrefixOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.UnaryPrefixOperators, formatting.Shared.TokenRange.UnaryPrefixExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPreincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(41 /* PlusPlusToken */, formatting.Shared.TokenRange.UnaryPreincrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterUnaryPredecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create3(42 /* MinusMinusToken */, formatting.Shared.TokenRange.UnaryPredecrementExpressions), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostincrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostincrementExpressions, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeUnaryPostdecrementOperator = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.UnaryPostdecrementExpressions, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // More unary operator special-casing.
-                // DevDiv 181814:  Be careful when removing leading whitespace
-                // around unary operators.  Examples:
-                //      1 - -2  --X-->  1--2
-                //      a + ++b --X-->  a+++b
-                this.SpaceAfterPostincrementWhenFollowedByAdd = new formatting.Rule(formatting.RuleDescriptor.create1(41 /* PlusPlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByUnaryPlus = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 35 /* PlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterAddWhenFollowedByPreincrement = new formatting.Rule(formatting.RuleDescriptor.create1(35 /* PlusToken */, 41 /* PlusPlusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterPostdecrementWhenFollowedBySubtract = new formatting.Rule(formatting.RuleDescriptor.create1(42 /* MinusMinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByUnaryMinus = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 36 /* MinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterSubtractWhenFollowedByPredecrement = new formatting.Rule(formatting.RuleDescriptor.create1(36 /* MinusToken */, 42 /* MinusMinusToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeComma = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 24 /* CommaToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterCertainKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([102 /* VarKeyword */, 98 /* ThrowKeyword */, 92 /* NewKeyword */, 78 /* DeleteKeyword */, 94 /* ReturnKeyword */, 101 /* TypeOfKeyword */, 119 /* AwaitKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterLetConstInVariableDeclaration = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([108 /* LetKeyword */, 74 /* ConstKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsStartOfVariableDeclarationList), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncCall = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionCallOrNewContext, Rules.IsPreviousTokenNotComma), 8 /* Delete */));
-                this.SpaceAfterFunctionInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create3(87 /* FunctionKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
-                this.NoSpaceBeforeOpenParenInFuncDecl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsFunctionDeclContext), 8 /* Delete */));
-                this.SpaceAfterVoidOperator = new formatting.Rule(formatting.RuleDescriptor.create3(103 /* VoidKeyword */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsVoidOpContext), 2 /* Space */));
-                this.NoSpaceBetweenReturnAndSemicolon = new formatting.Rule(formatting.RuleDescriptor.create1(94 /* ReturnKeyword */, 23 /* SemicolonToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // Add a space between statements. All keywords except (do,else,case) has open/close parens after them.
-                // So, we have a rule to add a space for [),Any], [do,Any], [else,Any], and [case,Any]
-                this.SpaceBetweenStatements = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 79 /* DoKeyword */, 80 /* ElseKeyword */, 71 /* CaseKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isNonJsxElementContext, Rules.IsNotForContext), 2 /* Space */));
-                // This low-pri rule takes care of "try {" and "finally {" in case the rule SpaceBeforeOpenBraceInControl didn't execute on FormatOnEnter.
-                this.SpaceAfterTryFinally = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([100 /* TryKeyword */, 85 /* FinallyKeyword */]), 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                //      get x() {}
-                //      set x(val) {}
-                this.SpaceAfterGetSetInMember = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([123 /* GetKeyword */, 131 /* SetKeyword */]), 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
-                // Special case for binary operators (that are keywords). For these we have to add a space and shouldn't follow any user options.
-                this.SpaceBeforeBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryKeywordOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryKeywordOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryKeywordOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                // TypeScript-specific higher priority rules
-                // Treat constructor as an identifier in a function declaration, and remove spaces between constructor and following left parentheses
-                this.NoSpaceAfterConstructor = new formatting.Rule(formatting.RuleDescriptor.create1(121 /* ConstructorKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // Use of module as a function call. e.g.: import m2 = module("m2");
-                this.NoSpaceAfterModuleImport = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.FromTokens([125 /* ModuleKeyword */, 129 /* RequireKeyword */]), 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // Add a space around certain TypeScript keywords
-                this.SpaceAfterCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 73 /* ClassKeyword */, 122 /* DeclareKeyword */, 77 /* DefaultKeyword */, 81 /* EnumKeyword */, 82 /* ExportKeyword */, 83 /* ExtendsKeyword */, 123 /* GetKeyword */, 106 /* ImplementsKeyword */, 89 /* ImportKeyword */, 107 /* InterfaceKeyword */, 125 /* ModuleKeyword */, 126 /* NamespaceKeyword */, 110 /* PrivateKeyword */, 112 /* PublicKeyword */, 111 /* ProtectedKeyword */, 131 /* SetKeyword */, 113 /* StaticKeyword */, 134 /* TypeKeyword */, 136 /* FromKeyword */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCertainTypeScriptKeywords = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([83 /* ExtendsKeyword */, 106 /* ImplementsKeyword */, 136 /* FromKeyword */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                // Treat string literals in module names as identifiers, and add a space between the literal and the opening Brace braces, e.g.: module "m2" {
-                this.SpaceAfterModuleName = new formatting.Rule(formatting.RuleDescriptor.create1(9 /* StringLiteral */, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsModuleDeclContext), 2 /* Space */));
-                // Lambda expressions
-                this.SpaceBeforeArrow = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 34 /* EqualsGreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceAfterArrow = new formatting.Rule(formatting.RuleDescriptor.create3(34 /* EqualsGreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                // Optional parameters and let args
-                this.NoSpaceAfterEllipsis = new formatting.Rule(formatting.RuleDescriptor.create1(22 /* DotDotDotToken */, 69 /* Identifier */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOptionalParameters = new formatting.Rule(formatting.RuleDescriptor.create3(53 /* QuestionToken */, formatting.Shared.TokenRange.FromTokens([18 /* CloseParenToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsNotBinaryOpContext), 8 /* Delete */));
-                // generics and type assertions
-                this.NoSpaceBeforeOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.TypeNames, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBetweenCloseParenAndAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create1(18 /* CloseParenToken */, 25 /* LessThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(25 /* LessThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 27 /* GreaterThanToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterCloseAngularBracket = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.FromTokens([17 /* OpenParenToken */, 19 /* OpenBracketToken */, 27 /* GreaterThanToken */, 24 /* CommaToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeArgumentOrParameterOrAssertionContext), 8 /* Delete */));
-                this.NoSpaceAfterTypeAssertion = new formatting.Rule(formatting.RuleDescriptor.create3(27 /* GreaterThanToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsTypeAssertionContext), 8 /* Delete */));
-                // Remove spaces in empty interface literals. e.g.: x: {}
-                this.NoSpaceBetweenEmptyInterfaceBraceBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(15 /* OpenBraceToken */, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsObjectTypeContext), 8 /* Delete */));
-                // decorators
-                this.SpaceBeforeAt = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 55 /* AtToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceAfterAt = new formatting.Rule(formatting.RuleDescriptor.create3(55 /* AtToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterDecorator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([115 /* AbstractKeyword */, 69 /* Identifier */, 82 /* ExportKeyword */, 77 /* DefaultKeyword */, 73 /* ClassKeyword */, 113 /* StaticKeyword */, 112 /* PublicKeyword */, 110 /* PrivateKeyword */, 111 /* ProtectedKeyword */, 123 /* GetKeyword */, 131 /* SetKeyword */, 19 /* OpenBracketToken */, 37 /* AsteriskToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsEndOfDecoratorContextOnSameLine), 2 /* Space */));
-                this.NoSpaceBetweenFunctionKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 8 /* Delete */));
-                this.SpaceAfterStarInGeneratorDeclaration = new formatting.Rule(formatting.RuleDescriptor.create3(37 /* AsteriskToken */, formatting.Shared.TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclarationOrFunctionExpressionContext), 2 /* Space */));
-                this.NoSpaceBetweenYieldKeywordAndStar = new formatting.Rule(formatting.RuleDescriptor.create1(114 /* YieldKeyword */, 37 /* AsteriskToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 8 /* Delete */));
-                this.SpaceBetweenYieldOrYieldStarAndOperand = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([114 /* YieldKeyword */, 37 /* AsteriskToken */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsYieldOrYieldStarWithOperand), 2 /* Space */));
-                // Async-await
-                this.SpaceBetweenAsyncAndOpenParen = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsArrowFunctionContext, Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBetweenAsyncAndFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(118 /* AsyncKeyword */, 87 /* FunctionKeyword */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                // template string
-                this.NoSpaceBetweenTagAndTemplateString = new formatting.Rule(formatting.RuleDescriptor.create3(69 /* Identifier */, formatting.Shared.TokenRange.FromTokens([11 /* NoSubstitutionTemplateLiteral */, 12 /* TemplateHead */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // These rules are higher in priority than user-configurable rules.
-                this.HighPriorityCommonRules = [
-                    this.IgnoreBeforeComment, this.IgnoreAfterLineComment,
-                    this.NoSpaceBeforeColon, this.SpaceAfterColon, this.NoSpaceBeforeQuestionMark, this.SpaceAfterQuestionMarkInConditionalOperator,
-                    this.NoSpaceAfterQuestionMark,
-                    this.NoSpaceBeforeDot, this.NoSpaceAfterDot,
-                    this.NoSpaceAfterUnaryPrefixOperator,
-                    this.NoSpaceAfterUnaryPreincrementOperator, this.NoSpaceAfterUnaryPredecrementOperator,
-                    this.NoSpaceBeforeUnaryPostincrementOperator, this.NoSpaceBeforeUnaryPostdecrementOperator,
-                    this.SpaceAfterPostincrementWhenFollowedByAdd,
-                    this.SpaceAfterAddWhenFollowedByUnaryPlus, this.SpaceAfterAddWhenFollowedByPreincrement,
-                    this.SpaceAfterPostdecrementWhenFollowedBySubtract,
-                    this.SpaceAfterSubtractWhenFollowedByUnaryMinus, this.SpaceAfterSubtractWhenFollowedByPredecrement,
-                    this.NoSpaceAfterCloseBrace,
-                    this.SpaceAfterOpenBrace, this.SpaceBeforeCloseBrace, this.NewLineBeforeCloseBraceInBlockContext,
-                    this.SpaceAfterCloseBrace, this.SpaceBetweenCloseBraceAndElse, this.SpaceBetweenCloseBraceAndWhile, this.NoSpaceBetweenEmptyBraceBrackets,
-                    this.NoSpaceBetweenFunctionKeywordAndStar, this.SpaceAfterStarInGeneratorDeclaration,
-                    this.SpaceAfterFunctionInFuncDecl, this.NewLineAfterOpenBraceInBlockContext, this.SpaceAfterGetSetInMember,
-                    this.NoSpaceBetweenYieldKeywordAndStar, this.SpaceBetweenYieldOrYieldStarAndOperand,
-                    this.NoSpaceBetweenReturnAndSemicolon,
-                    this.SpaceAfterCertainKeywords,
-                    this.SpaceAfterLetConstInVariableDeclaration,
-                    this.NoSpaceBeforeOpenParenInFuncCall,
-                    this.SpaceBeforeBinaryKeywordOperator, this.SpaceAfterBinaryKeywordOperator,
-                    this.SpaceAfterVoidOperator,
-                    this.SpaceBetweenAsyncAndOpenParen, this.SpaceBetweenAsyncAndFunctionKeyword,
-                    this.NoSpaceBetweenTagAndTemplateString,
-                    // TypeScript-specific rules
-                    this.NoSpaceAfterConstructor, this.NoSpaceAfterModuleImport,
-                    this.SpaceAfterCertainTypeScriptKeywords, this.SpaceBeforeCertainTypeScriptKeywords,
-                    this.SpaceAfterModuleName,
-                    this.SpaceBeforeArrow, this.SpaceAfterArrow,
-                    this.NoSpaceAfterEllipsis,
-                    this.NoSpaceAfterOptionalParameters,
-                    this.NoSpaceBetweenEmptyInterfaceBraceBrackets,
-                    this.NoSpaceBeforeOpenAngularBracket,
-                    this.NoSpaceBetweenCloseParenAndAngularBracket,
-                    this.NoSpaceAfterOpenAngularBracket,
-                    this.NoSpaceBeforeCloseAngularBracket,
-                    this.NoSpaceAfterCloseAngularBracket,
-                    this.NoSpaceAfterTypeAssertion,
-                    this.SpaceBeforeAt,
-                    this.NoSpaceAfterAt,
-                    this.SpaceAfterDecorator,
-                ];
-                // These rules are lower in priority than user-configurable rules.
-                this.LowPriorityCommonRules = [
-                    this.NoSpaceBeforeSemicolon,
-                    this.SpaceBeforeOpenBraceInControl, this.SpaceBeforeOpenBraceInFunction, this.SpaceBeforeOpenBraceInTypeScriptDeclWithBlock,
-                    this.NoSpaceBeforeComma,
-                    this.NoSpaceBeforeOpenBracket,
-                    this.NoSpaceAfterCloseBracket,
-                    this.SpaceAfterSemicolon,
-                    this.NoSpaceBeforeOpenParenInFuncDecl,
-                    this.SpaceBetweenStatements, this.SpaceAfterTryFinally
-                ];
-                ///
-                /// Rules controlled by user options
-                ///
-                // Insert space after comma delimiter
-                this.SpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isNonJsxElementContext, Rules.IsNextTokenNotCloseBracket), 2 /* Space */));
-                this.NoSpaceAfterComma = new formatting.Rule(formatting.RuleDescriptor.create3(24 /* CommaToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isNonJsxElementContext), 8 /* Delete */));
-                // Insert space before and after binary operators
-                this.SpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.SpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 2 /* Space */));
-                this.NoSpaceBeforeBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.BinaryOperators), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
-                this.NoSpaceAfterBinaryOperator = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.BinaryOperators, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsBinaryOpContext), 8 /* Delete */));
-                // Insert space after keywords in control flow statements
-                this.SpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 2 /* Space */));
-                this.NoSpaceAfterKeywordInControl = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Keywords, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext), 8 /* Delete */));
-                // Open Brace braces after function
-                // TypeScript: Function can have return types, which can be made of tons of different token kinds
-                this.NewLineBeforeOpenBraceInFunction = new formatting.Rule(formatting.RuleDescriptor.create2(this.FunctionOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext, Rules.IsBeforeMultilineBlockContext), 4 /* NewLine */), 1 /* CanDeleteNewLines */);
-                // Open Brace braces after TypeScript module/class/interface
-                this.NewLineBeforeOpenBraceInTypeScriptDeclWithBlock = new formatting.Rule(formatting.RuleDescriptor.create2(this.TypeScriptOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsTypeScriptDeclWithBlockContext, Rules.IsBeforeMultilineBlockContext), 4 /* NewLine */), 1 /* CanDeleteNewLines */);
-                // Open Brace braces after control block
-                this.NewLineBeforeOpenBraceInControl = new formatting.Rule(formatting.RuleDescriptor.create2(this.ControlOpenBraceLeftTokenRange, 15 /* OpenBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsControlDeclContext, Rules.IsBeforeMultilineBlockContext), 4 /* NewLine */), 1 /* CanDeleteNewLines */);
-                // Insert space after semicolon in for statement
-                this.SpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 2 /* Space */));
-                this.NoSpaceAfterSemicolonInFor = new formatting.Rule(formatting.RuleDescriptor.create3(23 /* SemicolonToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.IsForContext), 8 /* Delete */));
-                // Insert space after opening and before closing nonempty parenthesis
-                this.SpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenParens = new formatting.Rule(formatting.RuleDescriptor.create1(17 /* OpenParenToken */, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenParen = new formatting.Rule(formatting.RuleDescriptor.create3(17 /* OpenParenToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseParen = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 18 /* CloseParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // Insert space after opening and before closing nonempty brackets
-                this.SpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.SpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBetweenBrackets = new formatting.Rule(formatting.RuleDescriptor.create1(19 /* OpenBracketToken */, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceAfterOpenBracket = new formatting.Rule(formatting.RuleDescriptor.create3(19 /* OpenBracketToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.NoSpaceBeforeCloseBracket = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 20 /* CloseBracketToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                // Insert space after opening and before closing template string braces
-                this.NoSpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceAfterTemplateHeadAndMiddle = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.FromTokens([12 /* TemplateHead */, 13 /* TemplateMiddle */]), formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                this.NoSpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 8 /* Delete */));
-                this.SpaceBeforeTemplateMiddleAndTail = new formatting.Rule(formatting.RuleDescriptor.create4(formatting.Shared.TokenRange.Any, formatting.Shared.TokenRange.FromTokens([13 /* TemplateMiddle */, 14 /* TemplateTail */])), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext), 2 /* Space */));
-                // No space after { and before } in JSX expression
-                this.NoSpaceAfterOpenBraceInJsxExpression = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isJsxExpressionContext), 8 /* Delete */));
-                this.SpaceAfterOpenBraceInJsxExpression = new formatting.Rule(formatting.RuleDescriptor.create3(15 /* OpenBraceToken */, formatting.Shared.TokenRange.Any), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isJsxExpressionContext), 2 /* Space */));
-                this.NoSpaceBeforeCloseBraceInJsxExpression = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isJsxExpressionContext), 8 /* Delete */));
-                this.SpaceBeforeCloseBraceInJsxExpression = new formatting.Rule(formatting.RuleDescriptor.create2(formatting.Shared.TokenRange.Any, 16 /* CloseBraceToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsNonJsxSameLineTokenContext, Rules.isJsxExpressionContext), 2 /* Space */));
-                // Insert space after function keyword for anonymous functions
-                this.SpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 2 /* Space */));
-                this.NoSpaceAfterAnonymousFunctionKeyword = new formatting.Rule(formatting.RuleDescriptor.create1(87 /* FunctionKeyword */, 17 /* OpenParenToken */), formatting.RuleOperation.create2(new formatting.RuleOperationContext(Rules.IsFunctionDeclContext), 8 /* Delete */));
-            }
-            Rules.prototype.getRuleName = function (rule) {
-                var o = this;
-                for (var name_40 in o) {
-                    if (o[name_40] === rule) {
-                        return name_40;
-                    }
-                }
-                throw new Error("Unknown rule");
-            };
-            ///
-            /// Contexts
-            ///
-            Rules.IsForContext = function (context) {
-                return context.contextNode.kind === 206 /* ForStatement */;
-            };
-            Rules.IsNotForContext = function (context) {
-                return !Rules.IsForContext(context);
-            };
-            Rules.IsBinaryOpContext = function (context) {
-                switch (context.contextNode.kind) {
-                    case 187 /* BinaryExpression */:
-                    case 188 /* ConditionalExpression */:
-                    case 195 /* AsExpression */:
-                    case 238 /* ExportSpecifier */:
-                    case 234 /* ImportSpecifier */:
-                    case 154 /* TypePredicate */:
-                    case 162 /* UnionType */:
-                    case 163 /* IntersectionType */:
-                        return true;
-                    // equals in binding elements: function foo([[x, y] = [1, 2]])
-                    case 169 /* BindingElement */:
-                    // equals in type X = ...
-                    case 223 /* TypeAliasDeclaration */:
-                    // equal in import a = module('a');
-                    case 229 /* ImportEqualsDeclaration */:
-                    // equal in let a = 0;
-                    case 218 /* VariableDeclaration */:
-                    // equal in p = 0;
-                    case 142 /* Parameter */:
-                    case 255 /* EnumMember */:
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                        return context.currentTokenSpan.kind === 56 /* EqualsToken */ || context.nextTokenSpan.kind === 56 /* EqualsToken */;
-                    // "in" keyword in for (let x in []) { }
-                    case 207 /* ForInStatement */:
-                        return context.currentTokenSpan.kind === 90 /* InKeyword */ || context.nextTokenSpan.kind === 90 /* InKeyword */;
-                    // Technically, "of" is not a binary operator, but format it the same way as "in"
-                    case 208 /* ForOfStatement */:
-                        return context.currentTokenSpan.kind === 138 /* OfKeyword */ || context.nextTokenSpan.kind === 138 /* OfKeyword */;
-                }
-                return false;
-            };
-            Rules.IsNotBinaryOpContext = function (context) {
-                return !Rules.IsBinaryOpContext(context);
-            };
-            Rules.IsConditionalOperatorContext = function (context) {
-                return context.contextNode.kind === 188 /* ConditionalExpression */;
-            };
-            Rules.IsSameLineTokenOrBeforeMultilineBlockContext = function (context) {
-                //// This check is mainly used inside SpaceBeforeOpenBraceInControl and SpaceBeforeOpenBraceInFunction.
-                ////
-                //// Ex:
-                //// if (1)     { ....
-                ////      * ) and { are on the same line so apply the rule. Here we don't care whether it's same or multi block context
-                ////
-                //// Ex:
-                //// if (1)
-                //// { ... }
-                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we don't format.
-                ////
-                //// Ex:
-                //// if (1)
-                //// { ...
-                //// }
-                ////      * ) and { are on different lines. We only need to format if the block is multiline context. So in this case we format.
-                return context.TokensAreOnSameLine() || Rules.IsBeforeMultilineBlockContext(context);
-            };
-            // This check is done before an open brace in a control construct, a function, or a typescript block declaration
-            Rules.IsBeforeMultilineBlockContext = function (context) {
-                return Rules.IsBeforeBlockContext(context) && !(context.NextNodeAllOnSameLine() || context.NextNodeBlockIsOnOneLine());
-            };
-            Rules.IsMultilineBlockContext = function (context) {
-                return Rules.IsBlockContext(context) && !(context.ContextNodeAllOnSameLine() || context.ContextNodeBlockIsOnOneLine());
-            };
-            Rules.IsSingleLineBlockContext = function (context) {
-                return Rules.IsBlockContext(context) && (context.ContextNodeAllOnSameLine() || context.ContextNodeBlockIsOnOneLine());
-            };
-            Rules.IsBlockContext = function (context) {
-                return Rules.NodeIsBlockContext(context.contextNode);
-            };
-            Rules.IsBeforeBlockContext = function (context) {
-                return Rules.NodeIsBlockContext(context.nextTokenParent);
-            };
-            // IMPORTANT!!! This method must return true ONLY for nodes with open and close braces as immediate children
-            Rules.NodeIsBlockContext = function (node) {
-                if (Rules.NodeIsTypeScriptDeclWithBlockContext(node)) {
-                    // This means we are in a context that looks like a block to the user, but in the grammar is actually not a node (it's a class, module, enum, object type literal, etc).
-                    return true;
-                }
-                switch (node.kind) {
-                    case 199 /* Block */:
-                    case 227 /* CaseBlock */:
-                    case 171 /* ObjectLiteralExpression */:
-                    case 226 /* ModuleBlock */:
-                        return true;
-                }
-                return false;
-            };
-            Rules.IsFunctionDeclContext = function (context) {
-                switch (context.contextNode.kind) {
-                    case 220 /* FunctionDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    // case SyntaxKind.MemberFunctionDeclaration:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    // case SyntaxKind.MethodSignature:
-                    case 151 /* CallSignature */:
-                    case 179 /* FunctionExpression */:
-                    case 148 /* Constructor */:
-                    case 180 /* ArrowFunction */:
-                    // case SyntaxKind.ConstructorDeclaration:
-                    // case SyntaxKind.SimpleArrowFunctionExpression:
-                    // case SyntaxKind.ParenthesizedArrowFunctionExpression:
-                    case 222 /* InterfaceDeclaration */:
-                        return true;
-                }
-                return false;
-            };
-            Rules.IsFunctionDeclarationOrFunctionExpressionContext = function (context) {
-                return context.contextNode.kind === 220 /* FunctionDeclaration */ || context.contextNode.kind === 179 /* FunctionExpression */;
-            };
-            Rules.IsTypeScriptDeclWithBlockContext = function (context) {
-                return Rules.NodeIsTypeScriptDeclWithBlockContext(context.contextNode);
-            };
-            Rules.NodeIsTypeScriptDeclWithBlockContext = function (node) {
-                switch (node.kind) {
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 159 /* TypeLiteral */:
-                    case 225 /* ModuleDeclaration */:
-                    case 236 /* ExportDeclaration */:
-                    case 237 /* NamedExports */:
-                    case 230 /* ImportDeclaration */:
-                    case 233 /* NamedImports */:
-                        return true;
-                }
-                return false;
-            };
-            Rules.IsAfterCodeBlockContext = function (context) {
-                switch (context.currentTokenParent.kind) {
-                    case 221 /* ClassDeclaration */:
-                    case 225 /* ModuleDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 199 /* Block */:
-                    case 252 /* CatchClause */:
-                    case 226 /* ModuleBlock */:
-                    case 213 /* SwitchStatement */:
-                        return true;
-                }
-                return false;
-            };
-            Rules.IsControlDeclContext = function (context) {
-                switch (context.contextNode.kind) {
-                    case 203 /* IfStatement */:
-                    case 213 /* SwitchStatement */:
-                    case 206 /* ForStatement */:
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                    case 205 /* WhileStatement */:
-                    case 216 /* TryStatement */:
-                    case 204 /* DoStatement */:
-                    case 212 /* WithStatement */:
-                    // TODO
-                    // case SyntaxKind.ElseClause:
-                    case 252 /* CatchClause */:
-                        return true;
-                    default:
-                        return false;
-                }
-            };
-            Rules.IsObjectContext = function (context) {
-                return context.contextNode.kind === 171 /* ObjectLiteralExpression */;
-            };
-            Rules.IsFunctionCallContext = function (context) {
-                return context.contextNode.kind === 174 /* CallExpression */;
-            };
-            Rules.IsNewContext = function (context) {
-                return context.contextNode.kind === 175 /* NewExpression */;
-            };
-            Rules.IsFunctionCallOrNewContext = function (context) {
-                return Rules.IsFunctionCallContext(context) || Rules.IsNewContext(context);
-            };
-            Rules.IsPreviousTokenNotComma = function (context) {
-                return context.currentTokenSpan.kind !== 24 /* CommaToken */;
-            };
-            Rules.IsNextTokenNotCloseBracket = function (context) {
-                return context.nextTokenSpan.kind !== 20 /* CloseBracketToken */;
-            };
-            Rules.IsArrowFunctionContext = function (context) {
-                return context.contextNode.kind === 180 /* ArrowFunction */;
-            };
-            Rules.IsNonJsxSameLineTokenContext = function (context) {
-                return context.TokensAreOnSameLine() && context.contextNode.kind !== 244 /* JsxText */;
-            };
-            Rules.isNonJsxElementContext = function (context) {
-                return context.contextNode.kind !== 241 /* JsxElement */;
-            };
-            Rules.isJsxExpressionContext = function (context) {
-                return context.contextNode.kind === 248 /* JsxExpression */;
-            };
-            Rules.IsNotBeforeBlockInFunctionDeclarationContext = function (context) {
-                return !Rules.IsFunctionDeclContext(context) && !Rules.IsBeforeBlockContext(context);
-            };
-            Rules.IsEndOfDecoratorContextOnSameLine = function (context) {
-                return context.TokensAreOnSameLine() &&
-                    context.contextNode.decorators &&
-                    Rules.NodeIsInDecoratorContext(context.currentTokenParent) &&
-                    !Rules.NodeIsInDecoratorContext(context.nextTokenParent);
-            };
-            Rules.NodeIsInDecoratorContext = function (node) {
-                while (ts.isExpression(node)) {
-                    node = node.parent;
-                }
-                return node.kind === 143 /* Decorator */;
-            };
-            Rules.IsStartOfVariableDeclarationList = function (context) {
-                return context.currentTokenParent.kind === 219 /* VariableDeclarationList */ &&
-                    context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
-            };
-            Rules.IsNotFormatOnEnter = function (context) {
-                return context.formattingRequestKind !== 2 /* FormatOnEnter */;
-            };
-            Rules.IsModuleDeclContext = function (context) {
-                return context.contextNode.kind === 225 /* ModuleDeclaration */;
-            };
-            Rules.IsObjectTypeContext = function (context) {
-                return context.contextNode.kind === 159 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
-            };
-            Rules.IsTypeArgumentOrParameterOrAssertion = function (token, parent) {
-                if (token.kind !== 25 /* LessThanToken */ && token.kind !== 27 /* GreaterThanToken */) {
-                    return false;
-                }
-                switch (parent.kind) {
-                    case 155 /* TypeReference */:
-                    case 177 /* TypeAssertionExpression */:
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 174 /* CallExpression */:
-                    case 175 /* NewExpression */:
-                    case 194 /* ExpressionWithTypeArguments */:
-                        return true;
-                    default:
-                        return false;
-                }
-            };
-            Rules.IsTypeArgumentOrParameterOrAssertionContext = function (context) {
-                return Rules.IsTypeArgumentOrParameterOrAssertion(context.currentTokenSpan, context.currentTokenParent) ||
-                    Rules.IsTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
-            };
-            Rules.IsTypeAssertionContext = function (context) {
-                return context.contextNode.kind === 177 /* TypeAssertionExpression */;
-            };
-            Rules.IsVoidOpContext = function (context) {
-                return context.currentTokenSpan.kind === 103 /* VoidKeyword */ && context.currentTokenParent.kind === 183 /* VoidExpression */;
-            };
-            Rules.IsYieldOrYieldStarWithOperand = function (context) {
-                return context.contextNode.kind === 190 /* YieldExpression */ && context.contextNode.expression !== undefined;
-            };
-            return Rules;
-        }());
-        formatting.Rules = Rules;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var RulesMap = (function () {
-            function RulesMap() {
-                this.map = [];
-                this.mapRowLength = 0;
-            }
-            RulesMap.create = function (rules) {
-                var result = new RulesMap();
-                result.Initialize(rules);
-                return result;
-            };
-            RulesMap.prototype.Initialize = function (rules) {
-                this.mapRowLength = 138 /* LastToken */ + 1;
-                this.map = new Array(this.mapRowLength * this.mapRowLength); // new Array<RulesBucket>(this.mapRowLength * this.mapRowLength);
-                // This array is used only during construction of the rulesbucket in the map
-                var rulesBucketConstructionStateList = new Array(this.map.length); // new Array<RulesBucketConstructionState>(this.map.length);
-                this.FillRules(rules, rulesBucketConstructionStateList);
-                return this.map;
-            };
-            RulesMap.prototype.FillRules = function (rules, rulesBucketConstructionStateList) {
-                var _this = this;
-                rules.forEach(function (rule) {
-                    _this.FillRule(rule, rulesBucketConstructionStateList);
-                });
-            };
-            RulesMap.prototype.GetRuleBucketIndex = function (row, column) {
-                var rulesBucketIndex = (row * this.mapRowLength) + column;
-                // Debug.Assert(rulesBucketIndex < this.map.Length, "Trying to access an index outside the array.");
-                return rulesBucketIndex;
-            };
-            RulesMap.prototype.FillRule = function (rule, rulesBucketConstructionStateList) {
-                var _this = this;
-                var specificRule = rule.Descriptor.LeftTokenRange !== formatting.Shared.TokenRange.Any &&
-                    rule.Descriptor.RightTokenRange !== formatting.Shared.TokenRange.Any;
-                rule.Descriptor.LeftTokenRange.GetTokens().forEach(function (left) {
-                    rule.Descriptor.RightTokenRange.GetTokens().forEach(function (right) {
-                        var rulesBucketIndex = _this.GetRuleBucketIndex(left, right);
-                        var rulesBucket = _this.map[rulesBucketIndex];
-                        if (rulesBucket === undefined) {
-                            rulesBucket = _this.map[rulesBucketIndex] = new RulesBucket();
-                        }
-                        rulesBucket.AddRule(rule, specificRule, rulesBucketConstructionStateList, rulesBucketIndex);
-                    });
-                });
-            };
-            RulesMap.prototype.GetRule = function (context) {
-                var bucketIndex = this.GetRuleBucketIndex(context.currentTokenSpan.kind, context.nextTokenSpan.kind);
-                var bucket = this.map[bucketIndex];
-                if (bucket) {
-                    for (var _i = 0, _a = bucket.Rules(); _i < _a.length; _i++) {
-                        var rule = _a[_i];
-                        if (rule.Operation.Context.InContext(context)) {
-                            return rule;
-                        }
-                    }
-                }
-                return undefined;
-            };
-            return RulesMap;
-        }());
-        formatting.RulesMap = RulesMap;
-        var MaskBitSize = 5;
-        var Mask = 0x1f;
-        (function (RulesPosition) {
-            RulesPosition[RulesPosition["IgnoreRulesSpecific"] = 0] = "IgnoreRulesSpecific";
-            RulesPosition[RulesPosition["IgnoreRulesAny"] = MaskBitSize * 1] = "IgnoreRulesAny";
-            RulesPosition[RulesPosition["ContextRulesSpecific"] = MaskBitSize * 2] = "ContextRulesSpecific";
-            RulesPosition[RulesPosition["ContextRulesAny"] = MaskBitSize * 3] = "ContextRulesAny";
-            RulesPosition[RulesPosition["NoContextRulesSpecific"] = MaskBitSize * 4] = "NoContextRulesSpecific";
-            RulesPosition[RulesPosition["NoContextRulesAny"] = MaskBitSize * 5] = "NoContextRulesAny";
-        })(formatting.RulesPosition || (formatting.RulesPosition = {}));
-        var RulesPosition = formatting.RulesPosition;
-        var RulesBucketConstructionState = (function () {
-            function RulesBucketConstructionState() {
-                //// The Rules list contains all the inserted rules into a rulebucket in the following order:
-                ////    1- Ignore rules with specific token combination
-                ////    2- Ignore rules with any token combination
-                ////    3- Context rules with specific token combination
-                ////    4- Context rules with any token combination
-                ////    5- Non-context rules with specific token combination
-                ////    6- Non-context rules with any token combination
-                ////
-                //// The member rulesInsertionIndexBitmap is used to describe the number of rules
-                //// in each sub-bucket (above) hence can be used to know the index of where to insert
-                //// the next rule. It's a bitmap which contains 6 different sections each is given 5 bits.
-                ////
-                //// Example:
-                //// In order to insert a rule to the end of sub-bucket (3), we get the index by adding
-                //// the values in the bitmap segments 3rd, 2nd, and 1st.
-                this.rulesInsertionIndexBitmap = 0;
-            }
-            RulesBucketConstructionState.prototype.GetInsertionIndex = function (maskPosition) {
-                var index = 0;
-                var pos = 0;
-                var indexBitmap = this.rulesInsertionIndexBitmap;
-                while (pos <= maskPosition) {
-                    index += (indexBitmap & Mask);
-                    indexBitmap >>= MaskBitSize;
-                    pos += MaskBitSize;
-                }
-                return index;
-            };
-            RulesBucketConstructionState.prototype.IncreaseInsertionIndex = function (maskPosition) {
-                var value = (this.rulesInsertionIndexBitmap >> maskPosition) & Mask;
-                value++;
-                ts.Debug.assert((value & Mask) === value, "Adding more rules into the sub-bucket than allowed. Maximum allowed is 32 rules.");
-                var temp = this.rulesInsertionIndexBitmap & ~(Mask << maskPosition);
-                temp |= value << maskPosition;
-                this.rulesInsertionIndexBitmap = temp;
-            };
-            return RulesBucketConstructionState;
-        }());
-        formatting.RulesBucketConstructionState = RulesBucketConstructionState;
-        var RulesBucket = (function () {
-            function RulesBucket() {
-                this.rules = [];
-            }
-            RulesBucket.prototype.Rules = function () {
-                return this.rules;
-            };
-            RulesBucket.prototype.AddRule = function (rule, specificTokens, constructionState, rulesBucketIndex) {
-                var position;
-                if (rule.Operation.Action === 1 /* Ignore */) {
-                    position = specificTokens ?
-                        RulesPosition.IgnoreRulesSpecific :
-                        RulesPosition.IgnoreRulesAny;
-                }
-                else if (!rule.Operation.Context.IsAny()) {
-                    position = specificTokens ?
-                        RulesPosition.ContextRulesSpecific :
-                        RulesPosition.ContextRulesAny;
-                }
-                else {
-                    position = specificTokens ?
-                        RulesPosition.NoContextRulesSpecific :
-                        RulesPosition.NoContextRulesAny;
-                }
-                var state = constructionState[rulesBucketIndex];
-                if (state === undefined) {
-                    state = constructionState[rulesBucketIndex] = new RulesBucketConstructionState();
-                }
-                var index = state.GetInsertionIndex(position);
-                this.rules.splice(index, 0, rule);
-                state.IncreaseInsertionIndex(position);
-            };
-            return RulesBucket;
-        }());
-        formatting.RulesBucket = RulesBucket;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var Shared;
-        (function (Shared) {
-            var TokenRangeAccess = (function () {
-                function TokenRangeAccess(from, to, except) {
-                    this.tokens = [];
-                    for (var token = from; token <= to; token++) {
-                        if (ts.indexOf(except, token) < 0) {
-                            this.tokens.push(token);
-                        }
-                    }
-                }
-                TokenRangeAccess.prototype.GetTokens = function () {
-                    return this.tokens;
-                };
-                TokenRangeAccess.prototype.Contains = function (token) {
-                    return this.tokens.indexOf(token) >= 0;
-                };
-                return TokenRangeAccess;
-            }());
-            Shared.TokenRangeAccess = TokenRangeAccess;
-            var TokenValuesAccess = (function () {
-                function TokenValuesAccess(tks) {
-                    this.tokens = tks && tks.length ? tks : [];
-                }
-                TokenValuesAccess.prototype.GetTokens = function () {
-                    return this.tokens;
-                };
-                TokenValuesAccess.prototype.Contains = function (token) {
-                    return this.tokens.indexOf(token) >= 0;
-                };
-                return TokenValuesAccess;
-            }());
-            Shared.TokenValuesAccess = TokenValuesAccess;
-            var TokenSingleValueAccess = (function () {
-                function TokenSingleValueAccess(token) {
-                    this.token = token;
-                }
-                TokenSingleValueAccess.prototype.GetTokens = function () {
-                    return [this.token];
-                };
-                TokenSingleValueAccess.prototype.Contains = function (tokenValue) {
-                    return tokenValue === this.token;
-                };
-                return TokenSingleValueAccess;
-            }());
-            Shared.TokenSingleValueAccess = TokenSingleValueAccess;
-            var TokenAllAccess = (function () {
-                function TokenAllAccess() {
-                }
-                TokenAllAccess.prototype.GetTokens = function () {
-                    var result = [];
-                    for (var token = 0 /* FirstToken */; token <= 138 /* LastToken */; token++) {
-                        result.push(token);
-                    }
-                    return result;
-                };
-                TokenAllAccess.prototype.Contains = function (tokenValue) {
-                    return true;
-                };
-                TokenAllAccess.prototype.toString = function () {
-                    return "[allTokens]";
-                };
-                return TokenAllAccess;
-            }());
-            Shared.TokenAllAccess = TokenAllAccess;
-            var TokenRange = (function () {
-                function TokenRange(tokenAccess) {
-                    this.tokenAccess = tokenAccess;
-                }
-                TokenRange.FromToken = function (token) {
-                    return new TokenRange(new TokenSingleValueAccess(token));
-                };
-                TokenRange.FromTokens = function (tokens) {
-                    return new TokenRange(new TokenValuesAccess(tokens));
-                };
-                TokenRange.FromRange = function (f, to, except) {
-                    if (except === void 0) { except = []; }
-                    return new TokenRange(new TokenRangeAccess(f, to, except));
-                };
-                TokenRange.AllTokens = function () {
-                    return new TokenRange(new TokenAllAccess());
-                };
-                TokenRange.prototype.GetTokens = function () {
-                    return this.tokenAccess.GetTokens();
-                };
-                TokenRange.prototype.Contains = function (token) {
-                    return this.tokenAccess.Contains(token);
-                };
-                TokenRange.prototype.toString = function () {
-                    return this.tokenAccess.toString();
-                };
-                TokenRange.Any = TokenRange.AllTokens();
-                TokenRange.AnyIncludingMultilineComments = TokenRange.FromTokens(TokenRange.Any.GetTokens().concat([3 /* MultiLineCommentTrivia */]));
-                TokenRange.Keywords = TokenRange.FromRange(70 /* FirstKeyword */, 138 /* LastKeyword */);
-                TokenRange.BinaryOperators = TokenRange.FromRange(25 /* FirstBinaryOperator */, 68 /* LastBinaryOperator */);
-                TokenRange.BinaryKeywordOperators = TokenRange.FromTokens([90 /* InKeyword */, 91 /* InstanceOfKeyword */, 138 /* OfKeyword */, 116 /* AsKeyword */, 124 /* IsKeyword */]);
-                TokenRange.UnaryPrefixOperators = TokenRange.FromTokens([41 /* PlusPlusToken */, 42 /* MinusMinusToken */, 50 /* TildeToken */, 49 /* ExclamationToken */]);
-                TokenRange.UnaryPrefixExpressions = TokenRange.FromTokens([8 /* NumericLiteral */, 69 /* Identifier */, 17 /* OpenParenToken */, 19 /* OpenBracketToken */, 15 /* OpenBraceToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
-                TokenRange.UnaryPreincrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
-                TokenRange.UnaryPostincrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 18 /* CloseParenToken */, 20 /* CloseBracketToken */, 92 /* NewKeyword */]);
-                TokenRange.UnaryPredecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 17 /* OpenParenToken */, 97 /* ThisKeyword */, 92 /* NewKeyword */]);
-                TokenRange.UnaryPostdecrementExpressions = TokenRange.FromTokens([69 /* Identifier */, 18 /* CloseParenToken */, 20 /* CloseBracketToken */, 92 /* NewKeyword */]);
-                TokenRange.Comments = TokenRange.FromTokens([2 /* SingleLineCommentTrivia */, 3 /* MultiLineCommentTrivia */]);
-                TokenRange.TypeNames = TokenRange.FromTokens([69 /* Identifier */, 130 /* NumberKeyword */, 132 /* StringKeyword */, 120 /* BooleanKeyword */, 133 /* SymbolKeyword */, 103 /* VoidKeyword */, 117 /* AnyKeyword */]);
-                return TokenRange;
-            }());
-            Shared.TokenRange = TokenRange;
-        })(Shared = formatting.Shared || (formatting.Shared = {}));
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='..\services.ts' />
-///<reference path='formattingContext.ts' />
-///<reference path='formattingRequestKind.ts' />
-///<reference path='rule.ts' />
-///<reference path='ruleAction.ts' />
-///<reference path='ruleDescriptor.ts' />
-///<reference path='ruleFlag.ts' />
-///<reference path='ruleOperation.ts' />
-///<reference path='ruleOperationContext.ts' />
-///<reference path='rules.ts' />
-///<reference path='rulesMap.ts' />
-///<reference path='tokenRange.ts' /> 
-/// <reference path="references.ts"/>
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var RulesProvider = (function () {
-            function RulesProvider() {
-                this.globalRules = new formatting.Rules();
-            }
-            RulesProvider.prototype.getRuleName = function (rule) {
-                return this.globalRules.getRuleName(rule);
-            };
-            RulesProvider.prototype.getRuleByName = function (name) {
-                return this.globalRules[name];
-            };
-            RulesProvider.prototype.getRulesMap = function () {
-                return this.rulesMap;
-            };
-            RulesProvider.prototype.ensureUpToDate = function (options) {
-                if (!this.options || !ts.compareDataObjects(this.options, options)) {
-                    var activeRules = this.createActiveRules(options);
-                    var rulesMap = formatting.RulesMap.create(activeRules);
-                    this.activeRules = activeRules;
-                    this.rulesMap = rulesMap;
-                    this.options = ts.clone(options);
-                }
-            };
-            RulesProvider.prototype.createActiveRules = function (options) {
-                var rules = this.globalRules.HighPriorityCommonRules.slice(0);
-                if (options.InsertSpaceAfterCommaDelimiter) {
-                    rules.push(this.globalRules.SpaceAfterComma);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterComma);
-                }
-                if (options.InsertSpaceAfterFunctionKeywordForAnonymousFunctions) {
-                    rules.push(this.globalRules.SpaceAfterAnonymousFunctionKeyword);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterAnonymousFunctionKeyword);
-                }
-                if (options.InsertSpaceAfterKeywordsInControlFlowStatements) {
-                    rules.push(this.globalRules.SpaceAfterKeywordInControl);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterKeywordInControl);
-                }
-                if (options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyParenthesis) {
-                    rules.push(this.globalRules.SpaceAfterOpenParen);
-                    rules.push(this.globalRules.SpaceBeforeCloseParen);
-                    rules.push(this.globalRules.NoSpaceBetweenParens);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterOpenParen);
-                    rules.push(this.globalRules.NoSpaceBeforeCloseParen);
-                    rules.push(this.globalRules.NoSpaceBetweenParens);
-                }
-                if (options.InsertSpaceAfterOpeningAndBeforeClosingNonemptyBrackets) {
-                    rules.push(this.globalRules.SpaceAfterOpenBracket);
-                    rules.push(this.globalRules.SpaceBeforeCloseBracket);
-                    rules.push(this.globalRules.NoSpaceBetweenBrackets);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterOpenBracket);
-                    rules.push(this.globalRules.NoSpaceBeforeCloseBracket);
-                    rules.push(this.globalRules.NoSpaceBetweenBrackets);
-                }
-                if (options.InsertSpaceAfterOpeningAndBeforeClosingTemplateStringBraces) {
-                    rules.push(this.globalRules.SpaceAfterTemplateHeadAndMiddle);
-                    rules.push(this.globalRules.SpaceBeforeTemplateMiddleAndTail);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterTemplateHeadAndMiddle);
-                    rules.push(this.globalRules.NoSpaceBeforeTemplateMiddleAndTail);
-                }
-                if (options.InsertSpaceAfterOpeningAndBeforeClosingJsxExpressionBraces) {
-                    rules.push(this.globalRules.SpaceAfterOpenBraceInJsxExpression);
-                    rules.push(this.globalRules.SpaceBeforeCloseBraceInJsxExpression);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterOpenBraceInJsxExpression);
-                    rules.push(this.globalRules.NoSpaceBeforeCloseBraceInJsxExpression);
-                }
-                if (options.InsertSpaceAfterSemicolonInForStatements) {
-                    rules.push(this.globalRules.SpaceAfterSemicolonInFor);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceAfterSemicolonInFor);
-                }
-                if (options.InsertSpaceBeforeAndAfterBinaryOperators) {
-                    rules.push(this.globalRules.SpaceBeforeBinaryOperator);
-                    rules.push(this.globalRules.SpaceAfterBinaryOperator);
-                }
-                else {
-                    rules.push(this.globalRules.NoSpaceBeforeBinaryOperator);
-                    rules.push(this.globalRules.NoSpaceAfterBinaryOperator);
-                }
-                if (options.PlaceOpenBraceOnNewLineForControlBlocks) {
-                    rules.push(this.globalRules.NewLineBeforeOpenBraceInControl);
-                }
-                if (options.PlaceOpenBraceOnNewLineForFunctions) {
-                    rules.push(this.globalRules.NewLineBeforeOpenBraceInFunction);
-                    rules.push(this.globalRules.NewLineBeforeOpenBraceInTypeScriptDeclWithBlock);
-                }
-                rules = rules.concat(this.globalRules.LowPriorityCommonRules);
-                return rules;
-            };
-            return RulesProvider;
-        }());
-        formatting.RulesProvider = RulesProvider;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='..\services.ts' />
-///<reference path='formattingScanner.ts' />
-///<reference path='rulesProvider.ts' />
-///<reference path='references.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var Constants;
-        (function (Constants) {
-            Constants[Constants["Unknown"] = -1] = "Unknown";
-        })(Constants || (Constants = {}));
-        function formatOnEnter(position, sourceFile, rulesProvider, options) {
-            var line = sourceFile.getLineAndCharacterOfPosition(position).line;
-            if (line === 0) {
-                return [];
-            }
-            // After the enter key, the cursor is now at a new line. The new line may or may not contain non-whitespace characters.
-            // If the new line has only whitespaces, we won't want to format this line, because that would remove the indentation as
-            // trailing whitespaces. So the end of the formatting span should be the later one between:
-            //  1. the end of the previous line
-            //  2. the last non-whitespace character in the current line
-            var endOfFormatSpan = ts.getEndLinePosition(line, sourceFile);
-            while (ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(endOfFormatSpan))) {
-                endOfFormatSpan--;
-            }
-            // if the character at the end of the span is a line break, we shouldn't include it, because it indicates we don't want to
-            // touch the current line at all. Also, on some OSes the line break consists of two characters (\r\n), we should test if the
-            // previous character before the end of format span is line break character as well.
-            if (ts.isLineBreak(sourceFile.text.charCodeAt(endOfFormatSpan))) {
-                endOfFormatSpan--;
-            }
-            var span = {
-                // get start position for the previous line
-                pos: ts.getStartPositionOfLine(line - 1, sourceFile),
-                // end value is exclusive so add 1 to the result
-                end: endOfFormatSpan + 1
-            };
-            return formatSpan(span, sourceFile, options, rulesProvider, 2 /* FormatOnEnter */);
-        }
-        formatting.formatOnEnter = formatOnEnter;
-        function formatOnSemicolon(position, sourceFile, rulesProvider, options) {
-            return formatOutermostParent(position, 23 /* SemicolonToken */, sourceFile, options, rulesProvider, 3 /* FormatOnSemicolon */);
-        }
-        formatting.formatOnSemicolon = formatOnSemicolon;
-        function formatOnClosingCurly(position, sourceFile, rulesProvider, options) {
-            return formatOutermostParent(position, 16 /* CloseBraceToken */, sourceFile, options, rulesProvider, 4 /* FormatOnClosingCurlyBrace */);
-        }
-        formatting.formatOnClosingCurly = formatOnClosingCurly;
-        function formatDocument(sourceFile, rulesProvider, options) {
-            var span = {
-                pos: 0,
-                end: sourceFile.text.length
-            };
-            return formatSpan(span, sourceFile, options, rulesProvider, 0 /* FormatDocument */);
-        }
-        formatting.formatDocument = formatDocument;
-        function formatSelection(start, end, sourceFile, rulesProvider, options) {
-            // format from the beginning of the line
-            var span = {
-                pos: ts.getLineStartPositionForPosition(start, sourceFile),
-                end: end
-            };
-            return formatSpan(span, sourceFile, options, rulesProvider, 1 /* FormatSelection */);
-        }
-        formatting.formatSelection = formatSelection;
-        function formatOutermostParent(position, expectedLastToken, sourceFile, options, rulesProvider, requestKind) {
-            var parent = findOutermostParent(position, expectedLastToken, sourceFile);
-            if (!parent) {
-                return [];
-            }
-            var span = {
-                pos: ts.getLineStartPositionForPosition(parent.getStart(sourceFile), sourceFile),
-                end: parent.end
-            };
-            return formatSpan(span, sourceFile, options, rulesProvider, requestKind);
-        }
-        function findOutermostParent(position, expectedTokenKind, sourceFile) {
-            var precedingToken = ts.findPrecedingToken(position, sourceFile);
-            // when it is claimed that trigger character was typed at given position
-            // we verify that there is a token with a matching kind whose end is equal to position (because the character was just typed).
-            // If this condition is not hold - then trigger character was typed in some other context,
-            // i.e.in comment and thus should not trigger autoformatting
-            if (!precedingToken ||
-                precedingToken.kind !== expectedTokenKind ||
-                position !== precedingToken.getEnd()) {
-                return undefined;
-            }
-            // walk up and search for the parent node that ends at the same position with precedingToken.
-            // for cases like this
-            //
-            // let x = 1;
-            // while (true) {
-            // }
-            // after typing close curly in while statement we want to reformat just the while statement.
-            // However if we just walk upwards searching for the parent that has the same end value -
-            // we'll end up with the whole source file. isListElement allows to stop on the list element level
-            var current = precedingToken;
-            while (current &&
-                current.parent &&
-                current.parent.end === precedingToken.end &&
-                !isListElement(current.parent, current)) {
-                current = current.parent;
-            }
-            return current;
-        }
-        // Returns true if node is a element in some list in parent
-        // i.e. parent is class declaration with the list of members and node is one of members.
-        function isListElement(parent, node) {
-            switch (parent.kind) {
-                case 221 /* ClassDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                    return ts.rangeContainsRange(parent.members, node);
-                case 225 /* ModuleDeclaration */:
-                    var body = parent.body;
-                    return body && body.kind === 199 /* Block */ && ts.rangeContainsRange(body.statements, node);
-                case 256 /* SourceFile */:
-                case 199 /* Block */:
-                case 226 /* ModuleBlock */:
-                    return ts.rangeContainsRange(parent.statements, node);
-                case 252 /* CatchClause */:
-                    return ts.rangeContainsRange(parent.block.statements, node);
-            }
-            return false;
-        }
-        /** find node that fully contains given text range */
-        function findEnclosingNode(range, sourceFile) {
-            return find(sourceFile);
-            function find(n) {
-                var candidate = ts.forEachChild(n, function (c) { return ts.startEndContainsRange(c.getStart(sourceFile), c.end, range) && c; });
-                if (candidate) {
-                    var result = find(candidate);
-                    if (result) {
-                        return result;
-                    }
-                }
-                return n;
-            }
-        }
-        /** formatting is not applied to ranges that contain parse errors.
-          * This function will return a predicate that for a given text range will tell
-          * if there are any parse errors that overlap with the range.
-          */
-        function prepareRangeContainsErrorFunction(errors, originalRange) {
-            if (!errors.length) {
-                return rangeHasNoErrors;
-            }
-            // pick only errors that fall in range
-            var sorted = errors
-                .filter(function (d) { return ts.rangeOverlapsWithStartEnd(originalRange, d.start, d.start + d.length); })
-                .sort(function (e1, e2) { return e1.start - e2.start; });
-            if (!sorted.length) {
-                return rangeHasNoErrors;
-            }
-            var index = 0;
-            return function (r) {
-                // in current implementation sequence of arguments [r1, r2...] is monotonically increasing.
-                // 'index' tracks the index of the most recent error that was checked.
-                while (true) {
-                    if (index >= sorted.length) {
-                        // all errors in the range were already checked -> no error in specified range
-                        return false;
-                    }
-                    var error = sorted[index];
-                    if (r.end <= error.start) {
-                        // specified range ends before the error refered by 'index' - no error in range
-                        return false;
-                    }
-                    if (ts.startEndOverlapsWithStartEnd(r.pos, r.end, error.start, error.start + error.length)) {
-                        // specified range overlaps with error range
-                        return true;
-                    }
-                    index++;
-                }
-            };
-            function rangeHasNoErrors(r) {
-                return false;
-            }
-        }
-        /**
-          * Start of the original range might fall inside the comment - scanner will not yield appropriate results
-          * This function will look for token that is located before the start of target range
-          * and return its end as start position for the scanner.
-          */
-        function getScanStartPosition(enclosingNode, originalRange, sourceFile) {
-            var start = enclosingNode.getStart(sourceFile);
-            if (start === originalRange.pos && enclosingNode.end === originalRange.end) {
-                return start;
-            }
-            var precedingToken = ts.findPrecedingToken(originalRange.pos, sourceFile);
-            if (!precedingToken) {
-                // no preceding token found - start from the beginning of enclosing node
-                return enclosingNode.pos;
-            }
-            // preceding token ends after the start of original range (i.e when originalRange.pos falls in the middle of literal)
-            // start from the beginning of enclosingNode to handle the entire 'originalRange'
-            if (precedingToken.end >= originalRange.pos) {
-                return enclosingNode.pos;
-            }
-            return precedingToken.end;
-        }
-        /*
-         * For cases like
-         * if (a ||
-         *     b ||$
-         *     c) {...}
-         * If we hit Enter at $ we want line '    b ||' to be indented.
-         * Formatting will be applied to the last two lines.
-         * Node that fully encloses these lines is binary expression 'a ||...'.
-         * Initial indentation for this node will be 0.
-         * Binary expressions don't introduce new indentation scopes, however it is possible
-         * that some parent node on the same line does - like if statement in this case.
-         * Note that we are considering parents only from the same line with initial node -
-         * if parent is on the different line - its delta was already contributed
-         * to the initial indentation.
-         */
-        function getOwnOrInheritedDelta(n, options, sourceFile) {
-            var previousLine = -1 /* Unknown */;
-            var child;
-            while (n) {
-                var line = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile)).line;
-                if (previousLine !== -1 /* Unknown */ && line !== previousLine) {
-                    break;
-                }
-                if (formatting.SmartIndenter.shouldIndentChildNode(n, child)) {
-                    return options.IndentSize;
-                }
-                previousLine = line;
-                child = n;
-                n = n.parent;
-            }
-            return 0;
-        }
-        function formatSpan(originalRange, sourceFile, options, rulesProvider, requestKind) {
-            var rangeContainsError = prepareRangeContainsErrorFunction(sourceFile.parseDiagnostics, originalRange);
-            // formatting context is used by rules provider
-            var formattingContext = new formatting.FormattingContext(sourceFile, requestKind);
-            // find the smallest node that fully wraps the range and compute the initial indentation for the node
-            var enclosingNode = findEnclosingNode(originalRange, sourceFile);
-            var formattingScanner = formatting.getFormattingScanner(sourceFile, getScanStartPosition(enclosingNode, originalRange, sourceFile), originalRange.end);
-            var initialIndentation = formatting.SmartIndenter.getIndentationForNode(enclosingNode, originalRange, sourceFile, options);
-            var previousRangeHasError;
-            var previousRange;
-            var previousParent;
-            var previousRangeStartLine;
-            var lastIndentedLine;
-            var indentationOnLastIndentedLine;
-            var edits = [];
-            formattingScanner.advance();
-            if (formattingScanner.isOnToken()) {
-                var startLine = sourceFile.getLineAndCharacterOfPosition(enclosingNode.getStart(sourceFile)).line;
-                var undecoratedStartLine = startLine;
-                if (enclosingNode.decorators) {
-                    undecoratedStartLine = sourceFile.getLineAndCharacterOfPosition(ts.getNonDecoratorTokenPosOfNode(enclosingNode, sourceFile)).line;
-                }
-                var delta = getOwnOrInheritedDelta(enclosingNode, options, sourceFile);
-                processNode(enclosingNode, enclosingNode, startLine, undecoratedStartLine, initialIndentation, delta);
-            }
-            if (!formattingScanner.isOnToken()) {
-                var leadingTrivia = formattingScanner.getCurrentLeadingTrivia();
-                if (leadingTrivia) {
-                    processTrivia(leadingTrivia, enclosingNode, enclosingNode, undefined);
-                    trimTrailingWhitespacesForRemainingRange();
-                }
-            }
-            formattingScanner.close();
-            return edits;
-            // local functions
-            /** Tries to compute the indentation for a list element.
-              * If list element is not in range then
-              * function will pick its actual indentation
-              * so it can be pushed downstream as inherited indentation.
-              * If list element is in the range - its indentation will be equal
-              * to inherited indentation from its predecessors.
-              */
-            function tryComputeIndentationForListItem(startPos, endPos, parentStartLine, range, inheritedIndentation) {
-                if (ts.rangeOverlapsWithStartEnd(range, startPos, endPos) ||
-                    ts.rangeContainsStartEnd(range, startPos, endPos) /* Not to miss zero-range nodes e.g. JsxText */) {
-                    if (inheritedIndentation !== -1 /* Unknown */) {
-                        return inheritedIndentation;
-                    }
-                }
-                else {
-                    var startLine = sourceFile.getLineAndCharacterOfPosition(startPos).line;
-                    var startLinePosition = ts.getLineStartPositionForPosition(startPos, sourceFile);
-                    var column = formatting.SmartIndenter.findFirstNonWhitespaceColumn(startLinePosition, startPos, sourceFile, options);
-                    if (startLine !== parentStartLine || startPos === column) {
-                        // Use the base indent size if it is greater than
-                        // the indentation of the inherited predecessor.
-                        var baseIndentSize = formatting.SmartIndenter.getBaseIndentation(options);
-                        return baseIndentSize > column ? baseIndentSize : column;
-                    }
-                }
-                return -1 /* Unknown */;
-            }
-            function computeIndentation(node, startLine, inheritedIndentation, parent, parentDynamicIndentation, effectiveParentStartLine) {
-                var indentation = inheritedIndentation;
-                var delta = formatting.SmartIndenter.shouldIndentChildNode(node) ? options.IndentSize : 0;
-                if (effectiveParentStartLine === startLine) {
-                    // if node is located on the same line with the parent
-                    // - inherit indentation from the parent
-                    // - push children if either parent of node itself has non-zero delta
-                    indentation = startLine === lastIndentedLine
-                        ? indentationOnLastIndentedLine
-                        : parentDynamicIndentation.getIndentation();
-                    delta = Math.min(options.IndentSize, parentDynamicIndentation.getDelta(node) + delta);
-                }
-                else if (indentation === -1 /* Unknown */) {
-                    if (formatting.SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement(parent, node, startLine, sourceFile)) {
-                        indentation = parentDynamicIndentation.getIndentation();
-                    }
-                    else {
-                        indentation = parentDynamicIndentation.getIndentation() + parentDynamicIndentation.getDelta(node);
-                    }
-                }
-                return {
-                    indentation: indentation,
-                    delta: delta
-                };
-            }
-            function getFirstNonDecoratorTokenOfNode(node) {
-                if (node.modifiers && node.modifiers.length) {
-                    return node.modifiers[0].kind;
-                }
-                switch (node.kind) {
-                    case 221 /* ClassDeclaration */: return 73 /* ClassKeyword */;
-                    case 222 /* InterfaceDeclaration */: return 107 /* InterfaceKeyword */;
-                    case 220 /* FunctionDeclaration */: return 87 /* FunctionKeyword */;
-                    case 224 /* EnumDeclaration */: return 224 /* EnumDeclaration */;
-                    case 149 /* GetAccessor */: return 123 /* GetKeyword */;
-                    case 150 /* SetAccessor */: return 131 /* SetKeyword */;
-                    case 147 /* MethodDeclaration */:
-                        if (node.asteriskToken) {
-                            return 37 /* AsteriskToken */;
-                        }
-                    // fall-through
-                    case 145 /* PropertyDeclaration */:
-                    case 142 /* Parameter */:
-                        return node.name.kind;
-                }
-            }
-            function getDynamicIndentation(node, nodeStartLine, indentation, delta) {
-                return {
-                    getIndentationForComment: function (kind, tokenIndentation, container) {
-                        switch (kind) {
-                            // preceding comment to the token that closes the indentation scope inherits the indentation from the scope
-                            // ..  {
-                            //     // comment
-                            // }
-                            case 16 /* CloseBraceToken */:
-                            case 20 /* CloseBracketToken */:
-                            case 18 /* CloseParenToken */:
-                                return indentation + getEffectiveDelta(delta, container);
-                        }
-                        return tokenIndentation !== -1 /* Unknown */ ? tokenIndentation : indentation;
-                    },
-                    getIndentationForToken: function (line, kind, container) {
-                        if (nodeStartLine !== line && node.decorators) {
-                            if (kind === getFirstNonDecoratorTokenOfNode(node)) {
-                                // if this token is the first token following the list of decorators, we do not need to indent
-                                return indentation;
-                            }
-                        }
-                        switch (kind) {
-                            // open and close brace, 'else' and 'while' (in do statement) tokens has indentation of the parent
-                            case 15 /* OpenBraceToken */:
-                            case 16 /* CloseBraceToken */:
-                            case 19 /* OpenBracketToken */:
-                            case 20 /* CloseBracketToken */:
-                            case 17 /* OpenParenToken */:
-                            case 18 /* CloseParenToken */:
-                            case 80 /* ElseKeyword */:
-                            case 104 /* WhileKeyword */:
-                            case 55 /* AtToken */:
-                                return indentation;
-                            default:
-                                // if token line equals to the line of containing node (this is a first token in the node) - use node indentation
-                                return nodeStartLine !== line ? indentation + getEffectiveDelta(delta, container) : indentation;
-                        }
-                    },
-                    getIndentation: function () { return indentation; },
-                    getDelta: function (child) { return getEffectiveDelta(delta, child); },
-                    recomputeIndentation: function (lineAdded) {
-                        if (node.parent && formatting.SmartIndenter.shouldIndentChildNode(node.parent, node)) {
-                            if (lineAdded) {
-                                indentation += options.IndentSize;
-                            }
-                            else {
-                                indentation -= options.IndentSize;
-                            }
-                            if (formatting.SmartIndenter.shouldIndentChildNode(node)) {
-                                delta = options.IndentSize;
-                            }
-                            else {
-                                delta = 0;
-                            }
-                        }
-                    }
-                };
-                function getEffectiveDelta(delta, child) {
-                    // Delta value should be zero when the node explicitly prevents indentation of the child node
-                    return formatting.SmartIndenter.nodeWillIndentChild(node, child, true) ? delta : 0;
-                }
-            }
-            function processNode(node, contextNode, nodeStartLine, undecoratedNodeStartLine, indentation, delta) {
-                if (!ts.rangeOverlapsWithStartEnd(originalRange, node.getStart(sourceFile), node.getEnd())) {
-                    return;
-                }
-                var nodeDynamicIndentation = getDynamicIndentation(node, nodeStartLine, indentation, delta);
-                // a useful observations when tracking context node
-                //        /
-                //      [a]
-                //   /   |   \
-                //  [b] [c] [d]
-                // node 'a' is a context node for nodes 'b', 'c', 'd'
-                // except for the leftmost leaf token in [b] - in this case context node ('e') is located somewhere above 'a'
-                // this rule can be applied recursively to child nodes of 'a'.
-                //
-                // context node is set to parent node value after processing every child node
-                // context node is set to parent of the token after processing every token
-                var childContextNode = contextNode;
-                // if there are any tokens that logically belong to node and interleave child nodes
-                // such tokens will be consumed in processChildNode for for the child that follows them
-                ts.forEachChild(node, function (child) {
-                    processChildNode(child, /*inheritedIndentation*/ -1 /* Unknown */, node, nodeDynamicIndentation, nodeStartLine, undecoratedNodeStartLine, /*isListItem*/ false);
-                }, function (nodes) {
-                    processChildNodes(nodes, node, nodeStartLine, nodeDynamicIndentation);
-                });
-                // proceed any tokens in the node that are located after child nodes
-                while (formattingScanner.isOnToken()) {
-                    var tokenInfo = formattingScanner.readTokenInfo(node);
-                    if (tokenInfo.token.end > node.end) {
-                        break;
-                    }
-                    consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation);
-                }
-                function processChildNode(child, inheritedIndentation, parent, parentDynamicIndentation, parentStartLine, undecoratedParentStartLine, isListItem, isFirstListItem) {
-                    var childStartPos = child.getStart(sourceFile);
-                    var childStartLine = sourceFile.getLineAndCharacterOfPosition(childStartPos).line;
-                    var undecoratedChildStartLine = childStartLine;
-                    if (child.decorators) {
-                        undecoratedChildStartLine = sourceFile.getLineAndCharacterOfPosition(ts.getNonDecoratorTokenPosOfNode(child, sourceFile)).line;
-                    }
-                    // if child is a list item - try to get its indentation
-                    var childIndentationAmount = -1 /* Unknown */;
-                    if (isListItem) {
-                        childIndentationAmount = tryComputeIndentationForListItem(childStartPos, child.end, parentStartLine, originalRange, inheritedIndentation);
-                        if (childIndentationAmount !== -1 /* Unknown */) {
-                            inheritedIndentation = childIndentationAmount;
-                        }
-                    }
-                    // child node is outside the target range - do not dive inside
-                    if (!ts.rangeOverlapsWithStartEnd(originalRange, child.pos, child.end)) {
-                        if (child.end < originalRange.pos) {
-                            formattingScanner.skipToEndOf(child);
-                        }
-                        return inheritedIndentation;
-                    }
-                    if (child.getFullWidth() === 0) {
-                        return inheritedIndentation;
-                    }
-                    while (formattingScanner.isOnToken()) {
-                        // proceed any parent tokens that are located prior to child.getStart()
-                        var tokenInfo = formattingScanner.readTokenInfo(node);
-                        if (tokenInfo.token.end > childStartPos) {
-                            // stop when formatting scanner advances past the beginning of the child
-                            break;
-                        }
-                        consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation);
-                    }
-                    if (!formattingScanner.isOnToken()) {
-                        return inheritedIndentation;
-                    }
-                    if (ts.isToken(child)) {
-                        // if child node is a token, it does not impact indentation, proceed it using parent indentation scope rules
-                        var tokenInfo = formattingScanner.readTokenInfo(child);
-                        ts.Debug.assert(tokenInfo.token.end === child.end);
-                        consumeTokenAndAdvanceScanner(tokenInfo, node, parentDynamicIndentation, child);
-                        return inheritedIndentation;
-                    }
-                    var effectiveParentStartLine = child.kind === 143 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
-                    var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
-                    processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
-                    childContextNode = node;
-                    if (isFirstListItem && parent.kind === 170 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
-                        inheritedIndentation = childIndentation.indentation;
-                    }
-                    return inheritedIndentation;
-                }
-                function processChildNodes(nodes, parent, parentStartLine, parentDynamicIndentation) {
-                    var listStartToken = getOpenTokenForList(parent, nodes);
-                    var listEndToken = getCloseTokenForOpenToken(listStartToken);
-                    var listDynamicIndentation = parentDynamicIndentation;
-                    var startLine = parentStartLine;
-                    if (listStartToken !== 0 /* Unknown */) {
-                        // introduce a new indentation scope for lists (including list start and end tokens)
-                        while (formattingScanner.isOnToken()) {
-                            var tokenInfo = formattingScanner.readTokenInfo(parent);
-                            if (tokenInfo.token.end > nodes.pos) {
-                                // stop when formatting scanner moves past the beginning of node list
-                                break;
-                            }
-                            else if (tokenInfo.token.kind === listStartToken) {
-                                // consume list start token
-                                startLine = sourceFile.getLineAndCharacterOfPosition(tokenInfo.token.pos).line;
-                                var indentation_1 = computeIndentation(tokenInfo.token, startLine, -1 /* Unknown */, parent, parentDynamicIndentation, parentStartLine);
-                                listDynamicIndentation = getDynamicIndentation(parent, parentStartLine, indentation_1.indentation, indentation_1.delta);
-                                consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);
-                            }
-                            else {
-                                // consume any tokens that precede the list as child elements of 'node' using its indentation scope
-                                consumeTokenAndAdvanceScanner(tokenInfo, parent, parentDynamicIndentation);
-                            }
-                        }
-                    }
-                    var inheritedIndentation = -1 /* Unknown */;
-                    for (var i = 0; i < nodes.length; i++) {
-                        var child = nodes[i];
-                        inheritedIndentation = processChildNode(child, inheritedIndentation, node, listDynamicIndentation, startLine, startLine, /*isListItem*/ true, /*isFirstListItem*/ i === 0);
-                    }
-                    if (listEndToken !== 0 /* Unknown */) {
-                        if (formattingScanner.isOnToken()) {
-                            var tokenInfo = formattingScanner.readTokenInfo(parent);
-                            // consume the list end token only if it is still belong to the parent
-                            // there might be the case when current token matches end token but does not considered as one
-                            // function (x: function) <--
-                            // without this check close paren will be interpreted as list end token for function expression which is wrong
-                            if (tokenInfo.token.kind === listEndToken && ts.rangeContainsRange(parent, tokenInfo.token)) {
-                                // consume list end token
-                                consumeTokenAndAdvanceScanner(tokenInfo, parent, listDynamicIndentation);
-                            }
-                        }
-                    }
-                }
-                function consumeTokenAndAdvanceScanner(currentTokenInfo, parent, dynamicIndentation, container) {
-                    ts.Debug.assert(ts.rangeContainsRange(parent, currentTokenInfo.token));
-                    var lastTriviaWasNewLine = formattingScanner.lastTrailingTriviaWasNewLine();
-                    var indentToken = false;
-                    if (currentTokenInfo.leadingTrivia) {
-                        processTrivia(currentTokenInfo.leadingTrivia, parent, childContextNode, dynamicIndentation);
-                    }
-                    var lineAdded;
-                    var isTokenInRange = ts.rangeContainsRange(originalRange, currentTokenInfo.token);
-                    var tokenStart = sourceFile.getLineAndCharacterOfPosition(currentTokenInfo.token.pos);
-                    if (isTokenInRange) {
-                        var rangeHasError = rangeContainsError(currentTokenInfo.token);
-                        // save previousRange since processRange will overwrite this value with current one
-                        var savePreviousRange = previousRange;
-                        lineAdded = processRange(currentTokenInfo.token, tokenStart, parent, childContextNode, dynamicIndentation);
-                        if (rangeHasError) {
-                            // do not indent comments\token if token range overlaps with some error
-                            indentToken = false;
-                        }
-                        else {
-                            if (lineAdded !== undefined) {
-                                indentToken = lineAdded;
-                            }
-                            else {
-                                // indent token only if end line of previous range does not match start line of the token
-                                var prevEndLine = savePreviousRange && sourceFile.getLineAndCharacterOfPosition(savePreviousRange.end).line;
-                                indentToken = lastTriviaWasNewLine && tokenStart.line !== prevEndLine;
-                            }
-                        }
-                    }
-                    if (currentTokenInfo.trailingTrivia) {
-                        processTrivia(currentTokenInfo.trailingTrivia, parent, childContextNode, dynamicIndentation);
-                    }
-                    if (indentToken) {
-                        var tokenIndentation = (isTokenInRange && !rangeContainsError(currentTokenInfo.token)) ?
-                            dynamicIndentation.getIndentationForToken(tokenStart.line, currentTokenInfo.token.kind, container) :
-                            -1 /* Unknown */;
-                        var indentNextTokenOrTrivia = true;
-                        if (currentTokenInfo.leadingTrivia) {
-                            var commentIndentation = dynamicIndentation.getIndentationForComment(currentTokenInfo.token.kind, tokenIndentation, container);
-                            for (var _i = 0, _a = currentTokenInfo.leadingTrivia; _i < _a.length; _i++) {
-                                var triviaItem = _a[_i];
-                                var triviaInRange = ts.rangeContainsRange(originalRange, triviaItem);
-                                switch (triviaItem.kind) {
-                                    case 3 /* MultiLineCommentTrivia */:
-                                        if (triviaInRange) {
-                                            indentMultilineComment(triviaItem, commentIndentation, /*firstLineIsIndented*/ !indentNextTokenOrTrivia);
-                                        }
-                                        indentNextTokenOrTrivia = false;
-                                        break;
-                                    case 2 /* SingleLineCommentTrivia */:
-                                        if (indentNextTokenOrTrivia && triviaInRange) {
-                                            insertIndentation(triviaItem.pos, commentIndentation, /*lineAdded*/ false);
-                                        }
-                                        indentNextTokenOrTrivia = false;
-                                        break;
-                                    case 4 /* NewLineTrivia */:
-                                        indentNextTokenOrTrivia = true;
-                                        break;
-                                }
-                            }
-                        }
-                        // indent token only if is it is in target range and does not overlap with any error ranges
-                        if (tokenIndentation !== -1 /* Unknown */ && indentNextTokenOrTrivia) {
-                            insertIndentation(currentTokenInfo.token.pos, tokenIndentation, lineAdded);
-                            lastIndentedLine = tokenStart.line;
-                            indentationOnLastIndentedLine = tokenIndentation;
-                        }
-                    }
-                    formattingScanner.advance();
-                    childContextNode = parent;
-                }
-            }
-            function processTrivia(trivia, parent, contextNode, dynamicIndentation) {
-                for (var _i = 0, trivia_1 = trivia; _i < trivia_1.length; _i++) {
-                    var triviaItem = trivia_1[_i];
-                    if (ts.isComment(triviaItem.kind) && ts.rangeContainsRange(originalRange, triviaItem)) {
-                        var triviaItemStart = sourceFile.getLineAndCharacterOfPosition(triviaItem.pos);
-                        processRange(triviaItem, triviaItemStart, parent, contextNode, dynamicIndentation);
-                    }
-                }
-            }
-            function processRange(range, rangeStart, parent, contextNode, dynamicIndentation) {
-                var rangeHasError = rangeContainsError(range);
-                var lineAdded;
-                if (!rangeHasError && !previousRangeHasError) {
-                    if (!previousRange) {
-                        // trim whitespaces starting from the beginning of the span up to the current line
-                        var originalStart = sourceFile.getLineAndCharacterOfPosition(originalRange.pos);
-                        trimTrailingWhitespacesForLines(originalStart.line, rangeStart.line);
-                    }
-                    else {
-                        lineAdded =
-                            processPair(range, rangeStart.line, parent, previousRange, previousRangeStartLine, previousParent, contextNode, dynamicIndentation);
-                    }
-                }
-                previousRange = range;
-                previousParent = parent;
-                previousRangeStartLine = rangeStart.line;
-                previousRangeHasError = rangeHasError;
-                return lineAdded;
-            }
-            function processPair(currentItem, currentStartLine, currentParent, previousItem, previousStartLine, previousParent, contextNode, dynamicIndentation) {
-                formattingContext.updateContext(previousItem, previousParent, currentItem, currentParent, contextNode);
-                var rule = rulesProvider.getRulesMap().GetRule(formattingContext);
-                var trimTrailingWhitespaces;
-                var lineAdded;
-                if (rule) {
-                    applyRuleEdits(rule, previousItem, previousStartLine, currentItem, currentStartLine);
-                    if (rule.Operation.Action & (2 /* Space */ | 8 /* Delete */) && currentStartLine !== previousStartLine) {
-                        lineAdded = false;
-                        // Handle the case where the next line is moved to be the end of this line.
-                        // In this case we don't indent the next line in the next pass.
-                        if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                            dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ false);
-                        }
-                    }
-                    else if (rule.Operation.Action & 4 /* NewLine */ && currentStartLine === previousStartLine) {
-                        lineAdded = true;
-                        // Handle the case where token2 is moved to the new line.
-                        // In this case we indent token2 in the next pass but we set
-                        // sameLineIndent flag to notify the indenter that the indentation is within the line.
-                        if (currentParent.getStart(sourceFile) === currentItem.pos) {
-                            dynamicIndentation.recomputeIndentation(/*lineAddedByFormatting*/ true);
-                        }
-                    }
-                    // We need to trim trailing whitespace between the tokens if they were on different lines, and no rule was applied to put them on the same line
-                    trimTrailingWhitespaces = !(rule.Operation.Action & 8 /* Delete */) && rule.Flag !== 1 /* CanDeleteNewLines */;
-                }
-                else {
-                    trimTrailingWhitespaces = true;
-                }
-                if (currentStartLine !== previousStartLine && trimTrailingWhitespaces) {
-                    // We need to trim trailing whitespace between the tokens if they were on different lines, and no rule was applied to put them on the same line
-                    trimTrailingWhitespacesForLines(previousStartLine, currentStartLine, previousItem);
-                }
-                return lineAdded;
-            }
-            function insertIndentation(pos, indentation, lineAdded) {
-                var indentationString = getIndentationString(indentation, options);
-                if (lineAdded) {
-                    // new line is added before the token by the formatting rules
-                    // insert indentation string at the very beginning of the token
-                    recordReplace(pos, 0, indentationString);
-                }
-                else {
-                    var tokenStart = sourceFile.getLineAndCharacterOfPosition(pos);
-                    var startLinePosition = ts.getStartPositionOfLine(tokenStart.line, sourceFile);
-                    if (indentation !== tokenStart.character || indentationIsDifferent(indentationString, startLinePosition)) {
-                        recordReplace(startLinePosition, tokenStart.character, indentationString);
-                    }
-                }
-            }
-            function indentationIsDifferent(indentationString, startLinePosition) {
-                return indentationString !== sourceFile.text.substr(startLinePosition, indentationString.length);
-            }
-            function indentMultilineComment(commentRange, indentation, firstLineIsIndented) {
-                // split comment in lines
-                var startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;
-                var endLine = sourceFile.getLineAndCharacterOfPosition(commentRange.end).line;
-                var parts;
-                if (startLine === endLine) {
-                    if (!firstLineIsIndented) {
-                        // treat as single line comment
-                        insertIndentation(commentRange.pos, indentation, /*lineAdded*/ false);
-                    }
-                    return;
-                }
-                else {
-                    parts = [];
-                    var startPos = commentRange.pos;
-                    for (var line = startLine; line < endLine; line++) {
-                        var endOfLine = ts.getEndLinePosition(line, sourceFile);
-                        parts.push({ pos: startPos, end: endOfLine });
-                        startPos = ts.getStartPositionOfLine(line + 1, sourceFile);
-                    }
-                    parts.push({ pos: startPos, end: commentRange.end });
-                }
-                var startLinePos = ts.getStartPositionOfLine(startLine, sourceFile);
-                var nonWhitespaceColumnInFirstPart = formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(startLinePos, parts[0].pos, sourceFile, options);
-                if (indentation === nonWhitespaceColumnInFirstPart.column) {
-                    return;
-                }
-                var startIndex = 0;
-                if (firstLineIsIndented) {
-                    startIndex = 1;
-                    startLine++;
-                }
-                // shift all parts on the delta size
-                var delta = indentation - nonWhitespaceColumnInFirstPart.column;
-                for (var i = startIndex, len = parts.length; i < len; i++, startLine++) {
-                    var startLinePos_1 = ts.getStartPositionOfLine(startLine, sourceFile);
-                    var nonWhitespaceCharacterAndColumn = i === 0
-                        ? nonWhitespaceColumnInFirstPart
-                        : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
-                    var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
-                    if (newIndentation > 0) {
-                        var indentationString = getIndentationString(newIndentation, options);
-                        recordReplace(startLinePos_1, nonWhitespaceCharacterAndColumn.character, indentationString);
-                    }
-                    else {
-                        recordDelete(startLinePos_1, nonWhitespaceCharacterAndColumn.character);
-                    }
-                }
-            }
-            function trimTrailingWhitespacesForLines(line1, line2, range) {
-                for (var line = line1; line < line2; line++) {
-                    var lineStartPosition = ts.getStartPositionOfLine(line, sourceFile);
-                    var lineEndPosition = ts.getEndLinePosition(line, sourceFile);
-                    // do not trim whitespaces in comments or template expression
-                    if (range && (ts.isComment(range.kind) || ts.isStringOrRegularExpressionOrTemplateLiteral(range.kind)) && range.pos <= lineEndPosition && range.end > lineEndPosition) {
-                        continue;
-                    }
-                    var whitespaceStart = getTrailingWhitespaceStartPosition(lineStartPosition, lineEndPosition);
-                    if (whitespaceStart !== -1) {
-                        ts.Debug.assert(whitespaceStart === lineStartPosition || !ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(whitespaceStart - 1)));
-                        recordDelete(whitespaceStart, lineEndPosition + 1 - whitespaceStart);
-                    }
-                }
-            }
-            /**
-             * @param start The position of the first character in range
-             * @param end The position of the last character in range
-             */
-            function getTrailingWhitespaceStartPosition(start, end) {
-                var pos = end;
-                while (pos >= start && ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(pos))) {
-                    pos--;
-                }
-                if (pos !== end) {
-                    return pos + 1;
-                }
-                return -1;
-            }
-            /**
-             * Trimming will be done for lines after the previous range
-             */
-            function trimTrailingWhitespacesForRemainingRange() {
-                var startPosition = previousRange ? previousRange.end : originalRange.pos;
-                var startLine = sourceFile.getLineAndCharacterOfPosition(startPosition).line;
-                var endLine = sourceFile.getLineAndCharacterOfPosition(originalRange.end).line;
-                trimTrailingWhitespacesForLines(startLine, endLine + 1, previousRange);
-            }
-            function newTextChange(start, len, newText) {
-                return { span: ts.createTextSpan(start, len), newText: newText };
-            }
-            function recordDelete(start, len) {
-                if (len) {
-                    edits.push(newTextChange(start, len, ""));
-                }
-            }
-            function recordReplace(start, len, newText) {
-                if (len || newText) {
-                    edits.push(newTextChange(start, len, newText));
-                }
-            }
-            function applyRuleEdits(rule, previousRange, previousStartLine, currentRange, currentStartLine) {
-                switch (rule.Operation.Action) {
-                    case 1 /* Ignore */:
-                        // no action required
-                        return;
-                    case 8 /* Delete */:
-                        if (previousRange.end !== currentRange.pos) {
-                            // delete characters starting from t1.end up to t2.pos exclusive
-                            recordDelete(previousRange.end, currentRange.pos - previousRange.end);
-                        }
-                        break;
-                    case 4 /* NewLine */:
-                        // exit early if we on different lines and rule cannot change number of newlines
-                        // if line1 and line2 are on subsequent lines then no edits are required - ok to exit
-                        // if line1 and line2 are separated with more than one newline - ok to exit since we cannot delete extra new lines
-                        if (rule.Flag !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
-                            return;
-                        }
-                        // edit should not be applied only if we have one line feed between elements
-                        var lineDelta = currentStartLine - previousStartLine;
-                        if (lineDelta !== 1) {
-                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, options.NewLineCharacter);
-                        }
-                        break;
-                    case 2 /* Space */:
-                        // exit early if we on different lines and rule cannot change number of newlines
-                        if (rule.Flag !== 1 /* CanDeleteNewLines */ && previousStartLine !== currentStartLine) {
-                            return;
-                        }
-                        var posDelta = currentRange.pos - previousRange.end;
-                        if (posDelta !== 1 || sourceFile.text.charCodeAt(previousRange.end) !== 32 /* space */) {
-                            recordReplace(previousRange.end, currentRange.pos - previousRange.end, " ");
-                        }
-                        break;
-                }
-            }
-        }
-        function getOpenTokenForList(node, list) {
-            switch (node.kind) {
-                case 148 /* Constructor */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 180 /* ArrowFunction */:
-                    if (node.typeParameters === list) {
-                        return 25 /* LessThanToken */;
-                    }
-                    else if (node.parameters === list) {
-                        return 17 /* OpenParenToken */;
-                    }
-                    break;
-                case 174 /* CallExpression */:
-                case 175 /* NewExpression */:
-                    if (node.typeArguments === list) {
-                        return 25 /* LessThanToken */;
-                    }
-                    else if (node.arguments === list) {
-                        return 17 /* OpenParenToken */;
-                    }
-                    break;
-                case 155 /* TypeReference */:
-                    if (node.typeArguments === list) {
-                        return 25 /* LessThanToken */;
-                    }
-            }
-            return 0 /* Unknown */;
-        }
-        function getCloseTokenForOpenToken(kind) {
-            switch (kind) {
-                case 17 /* OpenParenToken */:
-                    return 18 /* CloseParenToken */;
-                case 25 /* LessThanToken */:
-                    return 27 /* GreaterThanToken */;
-            }
-            return 0 /* Unknown */;
-        }
-        var internedSizes;
-        var internedTabsIndentation;
-        var internedSpacesIndentation;
-        function getIndentationString(indentation, options) {
-            // reset interned strings if FormatCodeOptions were changed
-            var resetInternedStrings = !internedSizes || (internedSizes.tabSize !== options.TabSize || internedSizes.indentSize !== options.IndentSize);
-            if (resetInternedStrings) {
-                internedSizes = { tabSize: options.TabSize, indentSize: options.IndentSize };
-                internedTabsIndentation = internedSpacesIndentation = undefined;
-            }
-            if (!options.ConvertTabsToSpaces) {
-                var tabs = Math.floor(indentation / options.TabSize);
-                var spaces = indentation - tabs * options.TabSize;
-                var tabString = void 0;
-                if (!internedTabsIndentation) {
-                    internedTabsIndentation = [];
-                }
-                if (internedTabsIndentation[tabs] === undefined) {
-                    internedTabsIndentation[tabs] = tabString = repeat("\t", tabs);
-                }
-                else {
-                    tabString = internedTabsIndentation[tabs];
-                }
-                return spaces ? tabString + repeat(" ", spaces) : tabString;
-            }
-            else {
-                var spacesString = void 0;
-                var quotient = Math.floor(indentation / options.IndentSize);
-                var remainder = indentation % options.IndentSize;
-                if (!internedSpacesIndentation) {
-                    internedSpacesIndentation = [];
-                }
-                if (internedSpacesIndentation[quotient] === undefined) {
-                    spacesString = repeat(" ", options.IndentSize * quotient);
-                    internedSpacesIndentation[quotient] = spacesString;
-                }
-                else {
-                    spacesString = internedSpacesIndentation[quotient];
-                }
-                return remainder ? spacesString + repeat(" ", remainder) : spacesString;
-            }
-            function repeat(value, count) {
-                var s = "";
-                for (var i = 0; i < count; i++) {
-                    s += value;
-                }
-                return s;
-            }
-        }
-        formatting.getIndentationString = getIndentationString;
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-///<reference path='..\services.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var formatting;
-    (function (formatting) {
-        var SmartIndenter;
-        (function (SmartIndenter) {
-            var Value;
-            (function (Value) {
-                Value[Value["Unknown"] = -1] = "Unknown";
-            })(Value || (Value = {}));
-            function getIndentation(position, sourceFile, options) {
-                if (position > sourceFile.text.length) {
-                    return getBaseIndentation(options); // past EOF
-                }
-                // no indentation when the indent style is set to none,
-                // so we can return fast
-                if (options.IndentStyle === ts.IndentStyle.None) {
-                    return 0;
-                }
-                var precedingToken = ts.findPrecedingToken(position, sourceFile);
-                if (!precedingToken) {
-                    return getBaseIndentation(options);
-                }
-                // no indentation in string \regex\template literals
-                var precedingTokenIsLiteral = ts.isStringOrRegularExpressionOrTemplateLiteral(precedingToken.kind);
-                if (precedingTokenIsLiteral && precedingToken.getStart(sourceFile) <= position && precedingToken.end > position) {
-                    return 0;
-                }
-                var lineAtPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
-                // indentation is first non-whitespace character in a previous line
-                // for block indentation, we should look for a line which contains something that's not
-                // whitespace.
-                if (options.IndentStyle === ts.IndentStyle.Block) {
-                    // move backwards until we find a line with a non-whitespace character,
-                    // then find the first non-whitespace character for that line.
-                    var current_1 = position;
-                    while (current_1 > 0) {
-                        var char = sourceFile.text.charCodeAt(current_1);
-                        if (!ts.isWhiteSpace(char)) {
-                            break;
-                        }
-                        current_1--;
-                    }
-                    var lineStart = ts.getLineStartPositionForPosition(current_1, sourceFile);
-                    return SmartIndenter.findFirstNonWhitespaceColumn(lineStart, current_1, sourceFile, options);
-                }
-                if (precedingToken.kind === 24 /* CommaToken */ && precedingToken.parent.kind !== 187 /* BinaryExpression */) {
-                    // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
-                    var actualIndentation = getActualIndentationForListItemBeforeComma(precedingToken, sourceFile, options);
-                    if (actualIndentation !== -1 /* Unknown */) {
-                        return actualIndentation;
-                    }
-                }
-                // try to find node that can contribute to indentation and includes 'position' starting from 'precedingToken'
-                // if such node is found - compute initial indentation for 'position' inside this node
-                var previous;
-                var current = precedingToken;
-                var currentStart;
-                var indentationDelta;
-                while (current) {
-                    if (ts.positionBelongsToNode(current, position, sourceFile) && shouldIndentChildNode(current, previous)) {
-                        currentStart = getStartLineAndCharacterForNode(current, sourceFile);
-                        if (nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile)) {
-                            indentationDelta = 0;
-                        }
-                        else {
-                            indentationDelta = lineAtPosition !== currentStart.line ? options.IndentSize : 0;
-                        }
-                        break;
-                    }
-                    // check if current node is a list item - if yes, take indentation from it
-                    var actualIndentation = getActualIndentationForListItem(current, sourceFile, options);
-                    if (actualIndentation !== -1 /* Unknown */) {
-                        return actualIndentation;
-                    }
-                    actualIndentation = getLineIndentationWhenExpressionIsInMultiLine(current, sourceFile, options);
-                    if (actualIndentation !== -1 /* Unknown */) {
-                        return actualIndentation + options.IndentSize;
-                    }
-                    previous = current;
-                    current = current.parent;
-                }
-                if (!current) {
-                    // no parent was found - return the base indentation of the SourceFile
-                    return getBaseIndentation(options);
-                }
-                return getIndentationForNodeWorker(current, currentStart, /*ignoreActualIndentationRange*/ undefined, indentationDelta, sourceFile, options);
-            }
-            SmartIndenter.getIndentation = getIndentation;
-            function getBaseIndentation(options) {
-                return options.BaseIndentSize || 0;
-            }
-            SmartIndenter.getBaseIndentation = getBaseIndentation;
-            function getIndentationForNode(n, ignoreActualIndentationRange, sourceFile, options) {
-                var start = sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
-                return getIndentationForNodeWorker(n, start, ignoreActualIndentationRange, /*indentationDelta*/ 0, sourceFile, options);
-            }
-            SmartIndenter.getIndentationForNode = getIndentationForNode;
-            function getIndentationForNodeWorker(current, currentStart, ignoreActualIndentationRange, indentationDelta, sourceFile, options) {
-                var parent = current.parent;
-                var parentStart;
-                // walk upwards and collect indentations for pairs of parent-child nodes
-                // indentation is not added if parent and child nodes start on the same line or if parent is IfStatement and child starts on the same line with 'else clause'
-                while (parent) {
-                    var useActualIndentation = true;
-                    if (ignoreActualIndentationRange) {
-                        var start = current.getStart(sourceFile);
-                        useActualIndentation = start < ignoreActualIndentationRange.pos || start > ignoreActualIndentationRange.end;
-                    }
-                    if (useActualIndentation) {
-                        // check if current node is a list item - if yes, take indentation from it
-                        var actualIndentation = getActualIndentationForListItem(current, sourceFile, options);
-                        if (actualIndentation !== -1 /* Unknown */) {
-                            return actualIndentation + indentationDelta;
-                        }
-                    }
-                    parentStart = getParentStart(parent, current, sourceFile);
-                    var parentAndChildShareLine = parentStart.line === currentStart.line ||
-                        childStartsOnTheSameLineWithElseInIfStatement(parent, current, currentStart.line, sourceFile);
-                    if (useActualIndentation) {
-                        // try to fetch actual indentation for current node from source text
-                        var actualIndentation = getActualIndentationForNode(current, parent, currentStart, parentAndChildShareLine, sourceFile, options);
-                        if (actualIndentation !== -1 /* Unknown */) {
-                            return actualIndentation + indentationDelta;
-                        }
-                        actualIndentation = getLineIndentationWhenExpressionIsInMultiLine(current, sourceFile, options);
-                        if (actualIndentation !== -1 /* Unknown */) {
-                            return actualIndentation + indentationDelta;
-                        }
-                    }
-                    // increase indentation if parent node wants its content to be indented and parent and child nodes don't start on the same line
-                    if (shouldIndentChildNode(parent, current) && !parentAndChildShareLine) {
-                        indentationDelta += options.IndentSize;
-                    }
-                    current = parent;
-                    currentStart = parentStart;
-                    parent = current.parent;
-                }
-                return indentationDelta + getBaseIndentation(options);
-            }
-            function getParentStart(parent, child, sourceFile) {
-                var containingList = getContainingList(child, sourceFile);
-                if (containingList) {
-                    return sourceFile.getLineAndCharacterOfPosition(containingList.pos);
-                }
-                return sourceFile.getLineAndCharacterOfPosition(parent.getStart(sourceFile));
-            }
-            /*
-             * Function returns Value.Unknown if indentation cannot be determined
-             */
-            function getActualIndentationForListItemBeforeComma(commaToken, sourceFile, options) {
-                // previous token is comma that separates items in list - find the previous item and try to derive indentation from it
-                var commaItemInfo = ts.findListItemInfo(commaToken);
-                if (commaItemInfo && commaItemInfo.listItemIndex > 0) {
-                    return deriveActualIndentationFromList(commaItemInfo.list.getChildren(), commaItemInfo.listItemIndex - 1, sourceFile, options);
-                }
-                else {
-                    // handle broken code gracefully
-                    return -1 /* Unknown */;
-                }
-            }
-            /*
-             * Function returns Value.Unknown if actual indentation for node should not be used (i.e because node is nested expression)
-             */
-            function getActualIndentationForNode(current, parent, currentLineAndChar, parentAndChildShareLine, sourceFile, options) {
-                // actual indentation is used for statements\declarations if one of cases below is true:
-                // - parent is SourceFile - by default immediate children of SourceFile are not indented except when user indents them manually
-                // - parent and child are not on the same line
-                var useActualIndentation = (ts.isDeclaration(current) || ts.isStatement(current)) &&
-                    (parent.kind === 256 /* SourceFile */ || !parentAndChildShareLine);
-                if (!useActualIndentation) {
-                    return -1 /* Unknown */;
-                }
-                return findColumnForFirstNonWhitespaceCharacterInLine(currentLineAndChar, sourceFile, options);
-            }
-            function nextTokenIsCurlyBraceOnSameLineAsCursor(precedingToken, current, lineAtPosition, sourceFile) {
-                var nextToken = ts.findNextToken(precedingToken, current);
-                if (!nextToken) {
-                    return false;
-                }
-                if (nextToken.kind === 15 /* OpenBraceToken */) {
-                    // open braces are always indented at the parent level
-                    return true;
-                }
-                else if (nextToken.kind === 16 /* CloseBraceToken */) {
-                    // close braces are indented at the parent level if they are located on the same line with cursor
-                    // this means that if new line will be added at $ position, this case will be indented
-                    // class A {
-                    //    $
-                    // }
-                    /// and this one - not
-                    // class A {
-                    // $}
-                    var nextTokenStartLine = getStartLineAndCharacterForNode(nextToken, sourceFile).line;
-                    return lineAtPosition === nextTokenStartLine;
-                }
-                return false;
-            }
-            function getStartLineAndCharacterForNode(n, sourceFile) {
-                return sourceFile.getLineAndCharacterOfPosition(n.getStart(sourceFile));
-            }
-            function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 203 /* IfStatement */ && parent.elseStatement === child) {
-                    var elseKeyword = ts.findChildOfKind(parent, 80 /* ElseKeyword */, sourceFile);
-                    ts.Debug.assert(elseKeyword !== undefined);
-                    var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
-                    return elseKeywordStartLine === childStartLine;
-                }
-                return false;
-            }
-            SmartIndenter.childStartsOnTheSameLineWithElseInIfStatement = childStartsOnTheSameLineWithElseInIfStatement;
-            function getContainingList(node, sourceFile) {
-                if (node.parent) {
-                    switch (node.parent.kind) {
-                        case 155 /* TypeReference */:
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, node.getStart(sourceFile), node.getEnd())) {
-                                return node.parent.typeArguments;
-                            }
-                            break;
-                        case 171 /* ObjectLiteralExpression */:
-                            return node.parent.properties;
-                        case 170 /* ArrayLiteralExpression */:
-                            return node.parent.elements;
-                        case 220 /* FunctionDeclaration */:
-                        case 179 /* FunctionExpression */:
-                        case 180 /* ArrowFunction */:
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                        case 151 /* CallSignature */:
-                        case 152 /* ConstructSignature */: {
-                            var start = node.getStart(sourceFile);
-                            if (node.parent.typeParameters &&
-                                ts.rangeContainsStartEnd(node.parent.typeParameters, start, node.getEnd())) {
-                                return node.parent.typeParameters;
-                            }
-                            if (ts.rangeContainsStartEnd(node.parent.parameters, start, node.getEnd())) {
-                                return node.parent.parameters;
-                            }
-                            break;
-                        }
-                        case 175 /* NewExpression */:
-                        case 174 /* CallExpression */: {
-                            var start = node.getStart(sourceFile);
-                            if (node.parent.typeArguments &&
-                                ts.rangeContainsStartEnd(node.parent.typeArguments, start, node.getEnd())) {
-                                return node.parent.typeArguments;
-                            }
-                            if (node.parent.arguments &&
-                                ts.rangeContainsStartEnd(node.parent.arguments, start, node.getEnd())) {
-                                return node.parent.arguments;
-                            }
-                            break;
-                        }
-                    }
-                }
-                return undefined;
-            }
-            function getActualIndentationForListItem(node, sourceFile, options) {
-                var containingList = getContainingList(node, sourceFile);
-                return containingList ? getActualIndentationFromList(containingList) : -1 /* Unknown */;
-                function getActualIndentationFromList(list) {
-                    var index = ts.indexOf(list, node);
-                    return index !== -1 ? deriveActualIndentationFromList(list, index, sourceFile, options) : -1 /* Unknown */;
-                }
-            }
-            function getLineIndentationWhenExpressionIsInMultiLine(node, sourceFile, options) {
-                // actual indentation should not be used when:
-                // - node is close parenthesis - this is the end of the expression
-                if (node.kind === 18 /* CloseParenToken */) {
-                    return -1 /* Unknown */;
-                }
-                if (node.parent && (node.parent.kind === 174 /* CallExpression */ ||
-                    node.parent.kind === 175 /* NewExpression */) &&
-                    node.parent.expression !== node) {
-                    var fullCallOrNewExpression = node.parent.expression;
-                    var startingExpression = getStartingExpression(fullCallOrNewExpression);
-                    if (fullCallOrNewExpression === startingExpression) {
-                        return -1 /* Unknown */;
-                    }
-                    var fullCallOrNewExpressionEnd = sourceFile.getLineAndCharacterOfPosition(fullCallOrNewExpression.end);
-                    var startingExpressionEnd = sourceFile.getLineAndCharacterOfPosition(startingExpression.end);
-                    if (fullCallOrNewExpressionEnd.line === startingExpressionEnd.line) {
-                        return -1 /* Unknown */;
-                    }
-                    return findColumnForFirstNonWhitespaceCharacterInLine(fullCallOrNewExpressionEnd, sourceFile, options);
-                }
-                return -1 /* Unknown */;
-                function getStartingExpression(node) {
-                    while (true) {
-                        switch (node.kind) {
-                            case 174 /* CallExpression */:
-                            case 175 /* NewExpression */:
-                            case 172 /* PropertyAccessExpression */:
-                            case 173 /* ElementAccessExpression */:
-                                node = node.expression;
-                                break;
-                            default:
-                                return node;
-                        }
-                    }
-                }
-            }
-            function deriveActualIndentationFromList(list, index, sourceFile, options) {
-                ts.Debug.assert(index >= 0 && index < list.length);
-                var node = list[index];
-                // walk toward the start of the list starting from current node and check if the line is the same for all items.
-                // if end line for item [i - 1] differs from the start line for item [i] - find column of the first non-whitespace character on the line of item [i]
-                var lineAndCharacter = getStartLineAndCharacterForNode(node, sourceFile);
-                for (var i = index - 1; i >= 0; i--) {
-                    if (list[i].kind === 24 /* CommaToken */) {
-                        continue;
-                    }
-                    // skip list items that ends on the same line with the current list element
-                    var prevEndLine = sourceFile.getLineAndCharacterOfPosition(list[i].end).line;
-                    if (prevEndLine !== lineAndCharacter.line) {
-                        return findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter, sourceFile, options);
-                    }
-                    lineAndCharacter = getStartLineAndCharacterForNode(list[i], sourceFile);
-                }
-                return -1 /* Unknown */;
-            }
-            function findColumnForFirstNonWhitespaceCharacterInLine(lineAndCharacter, sourceFile, options) {
-                var lineStart = sourceFile.getPositionOfLineAndCharacter(lineAndCharacter.line, 0);
-                return findFirstNonWhitespaceColumn(lineStart, lineStart + lineAndCharacter.character, sourceFile, options);
-            }
-            /*
-                Character is the actual index of the character since the beginning of the line.
-                Column - position of the character after expanding tabs to spaces
-                "0\t2$"
-                value of 'character' for '$' is 3
-                value of 'column' for '$' is 6 (assuming that tab size is 4)
-            */
-            function findFirstNonWhitespaceCharacterAndColumn(startPos, endPos, sourceFile, options) {
-                var character = 0;
-                var column = 0;
-                for (var pos = startPos; pos < endPos; pos++) {
-                    var ch = sourceFile.text.charCodeAt(pos);
-                    if (!ts.isWhiteSpaceSingleLine(ch)) {
-                        break;
-                    }
-                    if (ch === 9 /* tab */) {
-                        column += options.TabSize + (column % options.TabSize);
-                    }
-                    else {
-                        column++;
-                    }
-                    character++;
-                }
-                return { column: column, character: character };
-            }
-            SmartIndenter.findFirstNonWhitespaceCharacterAndColumn = findFirstNonWhitespaceCharacterAndColumn;
-            function findFirstNonWhitespaceColumn(startPos, endPos, sourceFile, options) {
-                return findFirstNonWhitespaceCharacterAndColumn(startPos, endPos, sourceFile, options).column;
-            }
-            SmartIndenter.findFirstNonWhitespaceColumn = findFirstNonWhitespaceColumn;
-            function nodeContentIsAlwaysIndented(kind) {
-                switch (kind) {
-                    case 202 /* ExpressionStatement */:
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                    case 170 /* ArrayLiteralExpression */:
-                    case 199 /* Block */:
-                    case 226 /* ModuleBlock */:
-                    case 171 /* ObjectLiteralExpression */:
-                    case 159 /* TypeLiteral */:
-                    case 161 /* TupleType */:
-                    case 227 /* CaseBlock */:
-                    case 250 /* DefaultClause */:
-                    case 249 /* CaseClause */:
-                    case 178 /* ParenthesizedExpression */:
-                    case 172 /* PropertyAccessExpression */:
-                    case 174 /* CallExpression */:
-                    case 175 /* NewExpression */:
-                    case 200 /* VariableStatement */:
-                    case 218 /* VariableDeclaration */:
-                    case 235 /* ExportAssignment */:
-                    case 211 /* ReturnStatement */:
-                    case 188 /* ConditionalExpression */:
-                    case 168 /* ArrayBindingPattern */:
-                    case 167 /* ObjectBindingPattern */:
-                    case 243 /* JsxOpeningElement */:
-                    case 242 /* JsxSelfClosingElement */:
-                    case 248 /* JsxExpression */:
-                    case 146 /* MethodSignature */:
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 142 /* Parameter */:
-                    case 156 /* FunctionType */:
-                    case 157 /* ConstructorType */:
-                    case 164 /* ParenthesizedType */:
-                    case 176 /* TaggedTemplateExpression */:
-                    case 184 /* AwaitExpression */:
-                    case 237 /* NamedExports */:
-                    case 233 /* NamedImports */:
-                    case 238 /* ExportSpecifier */:
-                    case 234 /* ImportSpecifier */:
-                        return true;
-                }
-                return false;
-            }
-            /* @internal */
-            function nodeWillIndentChild(parent, child, indentByDefault) {
-                var childKind = child ? child.kind : 0 /* Unknown */;
-                switch (parent.kind) {
-                    case 204 /* DoStatement */:
-                    case 205 /* WhileStatement */:
-                    case 207 /* ForInStatement */:
-                    case 208 /* ForOfStatement */:
-                    case 206 /* ForStatement */:
-                    case 203 /* IfStatement */:
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                    case 147 /* MethodDeclaration */:
-                    case 180 /* ArrowFunction */:
-                    case 148 /* Constructor */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        return childKind !== 199 /* Block */;
-                    case 236 /* ExportDeclaration */:
-                        return childKind !== 237 /* NamedExports */;
-                    case 230 /* ImportDeclaration */:
-                        return childKind !== 231 /* ImportClause */ ||
-                            (child.namedBindings && child.namedBindings.kind !== 233 /* NamedImports */);
-                    case 241 /* JsxElement */:
-                        return childKind !== 245 /* JsxClosingElement */;
-                }
-                // No explicit rule for given nodes so the result will follow the default value argument
-                return indentByDefault;
-            }
-            SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
-            /*
-            Function returns true when the parent node should indent the given child by an explicit rule
-            */
-            function shouldIndentChildNode(parent, child) {
-                return nodeContentIsAlwaysIndented(parent.kind) || nodeWillIndentChild(parent, child, /*indentByDefault*/ false);
-            }
-            SmartIndenter.shouldIndentChildNode = shouldIndentChildNode;
-        })(SmartIndenter = formatting.SmartIndenter || (formatting.SmartIndenter = {}));
-    })(formatting = ts.formatting || (ts.formatting = {}));
-})(ts || (ts = {}));
-/// <reference path="..\compiler\program.ts"/>
-/// <reference path="..\compiler\commandLineParser.ts"/>
-/// <reference path='breakpoints.ts' />
-/// <reference path='outliningElementsCollector.ts' />
-/// <reference path='navigateTo.ts' />
-/// <reference path='navigationBar.ts' />
-/// <reference path='patternMatcher.ts' />
-/// <reference path='signatureHelp.ts' />
-/// <reference path='utilities.ts' />
-/// <reference path='jsTyping.ts' />
-/// <reference path='formatting\formatting.ts' />
-/// <reference path='formatting\smartIndenter.ts' />
-var ts;
-(function (ts) {
-    /** The version of the language service API */
-    ts.servicesVersion = "0.5";
-    var ScriptSnapshot;
-    (function (ScriptSnapshot) {
-        var StringScriptSnapshot = (function () {
-            function StringScriptSnapshot(text) {
-                this.text = text;
-            }
-            StringScriptSnapshot.prototype.getText = function (start, end) {
-                return this.text.substring(start, end);
-            };
-            StringScriptSnapshot.prototype.getLength = function () {
-                return this.text.length;
-            };
-            StringScriptSnapshot.prototype.getChangeRange = function (oldSnapshot) {
-                // Text-based snapshots do not support incremental parsing. Return undefined
-                // to signal that to the caller.
-                return undefined;
-            };
-            return StringScriptSnapshot;
-        }());
-        function fromString(text) {
-            return new StringScriptSnapshot(text);
-        }
-        ScriptSnapshot.fromString = fromString;
-    })(ScriptSnapshot = ts.ScriptSnapshot || (ts.ScriptSnapshot = {}));
-    var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ true);
-    var emptyArray = [];
-    var jsDocTagNames = [
-        "augments",
-        "author",
-        "argument",
-        "borrows",
-        "class",
-        "constant",
-        "constructor",
-        "constructs",
-        "default",
-        "deprecated",
-        "description",
-        "event",
-        "example",
-        "extends",
-        "field",
-        "fileOverview",
-        "function",
-        "ignore",
-        "inner",
-        "lends",
-        "link",
-        "memberOf",
-        "name",
-        "namespace",
-        "param",
-        "private",
-        "property",
-        "public",
-        "requires",
-        "returns",
-        "see",
-        "since",
-        "static",
-        "throws",
-        "type",
-        "typedef",
-        "property",
-        "prop",
-        "version"
-    ];
-    var jsDocCompletionEntries;
-    function createNode(kind, pos, end, flags, parent) {
-        var node = new NodeObject(kind, pos, end);
-        node.flags = flags;
-        node.parent = parent;
-        return node;
-    }
-    var NodeObject = (function () {
-        function NodeObject(kind, pos, end) {
-            this.kind = kind;
-            this.pos = pos;
-            this.end = end;
-            this.flags = 0 /* None */;
-            this.parent = undefined;
-        }
-        NodeObject.prototype.getSourceFile = function () {
-            return ts.getSourceFileOfNode(this);
-        };
-        NodeObject.prototype.getStart = function (sourceFile, includeJsDocComment) {
-            return ts.getTokenPosOfNode(this, sourceFile, includeJsDocComment);
-        };
-        NodeObject.prototype.getFullStart = function () {
-            return this.pos;
-        };
-        NodeObject.prototype.getEnd = function () {
-            return this.end;
-        };
-        NodeObject.prototype.getWidth = function (sourceFile) {
-            return this.getEnd() - this.getStart(sourceFile);
-        };
-        NodeObject.prototype.getFullWidth = function () {
-            return this.end - this.pos;
-        };
-        NodeObject.prototype.getLeadingTriviaWidth = function (sourceFile) {
-            return this.getStart(sourceFile) - this.pos;
-        };
-        NodeObject.prototype.getFullText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.pos, this.end);
-        };
-        NodeObject.prototype.getText = function (sourceFile) {
-            return (sourceFile || this.getSourceFile()).text.substring(this.getStart(), this.getEnd());
-        };
-        NodeObject.prototype.addSyntheticNodes = function (nodes, pos, end, useJSDocScanner) {
-            scanner.setTextPos(pos);
-            while (pos < end) {
-                var token = useJSDocScanner ? scanner.scanJSDocToken() : scanner.scan();
-                var textPos = scanner.getTextPos();
-                if (textPos <= end) {
-                    nodes.push(createNode(token, pos, textPos, 0, this));
-                }
-                pos = textPos;
-            }
-            return pos;
-        };
-        NodeObject.prototype.createSyntaxList = function (nodes) {
-            var list = createNode(282 /* SyntaxList */, nodes.pos, nodes.end, 0, this);
-            list._children = [];
-            var pos = nodes.pos;
-            for (var _i = 0, nodes_4 = nodes; _i < nodes_4.length; _i++) {
-                var node = nodes_4[_i];
-                if (pos < node.pos) {
-                    pos = this.addSyntheticNodes(list._children, pos, node.pos);
-                }
-                list._children.push(node);
-                pos = node.end;
-            }
-            if (pos < nodes.end) {
-                this.addSyntheticNodes(list._children, pos, nodes.end);
-            }
-            return list;
-        };
-        NodeObject.prototype.createChildren = function (sourceFile) {
-            var _this = this;
-            var children;
-            if (this.kind >= 139 /* FirstNode */) {
-                scanner.setText((sourceFile || this.getSourceFile()).text);
-                children = [];
-                var pos_3 = this.pos;
-                var useJSDocScanner_1 = this.kind >= 273 /* FirstJSDocTagNode */ && this.kind <= 281 /* LastJSDocTagNode */;
-                var processNode = function (node) {
-                    if (pos_3 < node.pos) {
-                        pos_3 = _this.addSyntheticNodes(children, pos_3, node.pos, useJSDocScanner_1);
-                    }
-                    children.push(node);
-                    pos_3 = node.end;
-                };
-                var processNodes = function (nodes) {
-                    if (pos_3 < nodes.pos) {
-                        pos_3 = _this.addSyntheticNodes(children, pos_3, nodes.pos, useJSDocScanner_1);
-                    }
-                    children.push(_this.createSyntaxList(nodes));
-                    pos_3 = nodes.end;
-                };
-                // jsDocComments need to be the first children
-                if (this.jsDocComments) {
-                    for (var _i = 0, _a = this.jsDocComments; _i < _a.length; _i++) {
-                        var jsDocComment = _a[_i];
-                        processNode(jsDocComment);
-                    }
-                }
-                ts.forEachChild(this, processNode, processNodes);
-                if (pos_3 < this.end) {
-                    this.addSyntheticNodes(children, pos_3, this.end);
-                }
-                scanner.setText(undefined);
-            }
-            this._children = children || emptyArray;
-        };
-        NodeObject.prototype.getChildCount = function (sourceFile) {
-            if (!this._children)
-                this.createChildren(sourceFile);
-            return this._children.length;
-        };
-        NodeObject.prototype.getChildAt = function (index, sourceFile) {
-            if (!this._children)
-                this.createChildren(sourceFile);
-            return this._children[index];
-        };
-        NodeObject.prototype.getChildren = function (sourceFile) {
-            if (!this._children)
-                this.createChildren(sourceFile);
-            return this._children;
-        };
-        NodeObject.prototype.getFirstToken = function (sourceFile) {
-            var children = this.getChildren(sourceFile);
-            if (!children.length) {
-                return undefined;
-            }
-            var child = children[0];
-            return child.kind < 139 /* FirstNode */ ? child : child.getFirstToken(sourceFile);
-        };
-        NodeObject.prototype.getLastToken = function (sourceFile) {
-            var children = this.getChildren(sourceFile);
-            var child = ts.lastOrUndefined(children);
-            if (!child) {
-                return undefined;
-            }
-            return child.kind < 139 /* FirstNode */ ? child : child.getLastToken(sourceFile);
-        };
-        return NodeObject;
-    }());
-    var SymbolObject = (function () {
-        function SymbolObject(flags, name) {
-            this.flags = flags;
-            this.name = name;
-        }
-        SymbolObject.prototype.getFlags = function () {
-            return this.flags;
-        };
-        SymbolObject.prototype.getName = function () {
-            return this.name;
-        };
-        SymbolObject.prototype.getDeclarations = function () {
-            return this.declarations;
-        };
-        SymbolObject.prototype.getDocumentationComment = function () {
-            if (this.documentationComment === undefined) {
-                this.documentationComment = getJsDocCommentsFromDeclarations(this.declarations, this.name, !(this.flags & 4 /* Property */));
-            }
-            return this.documentationComment;
-        };
-        return SymbolObject;
-    }());
-    function getJsDocCommentsFromDeclarations(declarations, name, canUseParsedParamTagComments) {
-        var documentationComment = [];
-        var docComments = getJsDocCommentsSeparatedByNewLines();
-        ts.forEach(docComments, function (docComment) {
-            if (documentationComment.length) {
-                documentationComment.push(ts.lineBreakPart());
-            }
-            documentationComment.push(docComment);
-        });
-        return documentationComment;
-        function getJsDocCommentsSeparatedByNewLines() {
-            var paramTag = "@param";
-            var jsDocCommentParts = [];
-            ts.forEach(declarations, function (declaration, indexOfDeclaration) {
-                // Make sure we are collecting doc comment from declaration once,
-                // In case of union property there might be same declaration multiple times
-                // which only varies in type parameter
-                // Eg. const a: Array<string> | Array<number>; a.length
-                // The property length will have two declarations of property length coming
-                // from Array<T> - Array<string> and Array<number>
-                if (ts.indexOf(declarations, declaration) === indexOfDeclaration) {
-                    var sourceFileOfDeclaration = ts.getSourceFileOfNode(declaration);
-                    // If it is parameter - try and get the jsDoc comment with @param tag from function declaration's jsDoc comments
-                    if (canUseParsedParamTagComments && declaration.kind === 142 /* Parameter */) {
-                        if ((declaration.parent.kind === 179 /* FunctionExpression */ || declaration.parent.kind === 180 /* ArrowFunction */) &&
-                            declaration.parent.parent.kind === 218 /* VariableDeclaration */) {
-                            addCommentParts(declaration.parent.parent.parent, sourceFileOfDeclaration, getCleanedParamJsDocComment);
-                        }
-                        addCommentParts(declaration.parent, sourceFileOfDeclaration, getCleanedParamJsDocComment);
-                    }
-                    // If this is left side of dotted module declaration, there is no doc comments associated with this node
-                    if (declaration.kind === 225 /* ModuleDeclaration */ && declaration.body && declaration.body.kind === 225 /* ModuleDeclaration */) {
-                        return;
-                    }
-                    if ((declaration.kind === 179 /* FunctionExpression */ || declaration.kind === 180 /* ArrowFunction */) &&
-                        declaration.parent.kind === 218 /* VariableDeclaration */) {
-                        addCommentParts(declaration.parent.parent, sourceFileOfDeclaration, getCleanedJsDocComment);
-                    }
-                    // If this is dotted module name, get the doc comments from the parent
-                    while (declaration.kind === 225 /* ModuleDeclaration */ && declaration.parent.kind === 225 /* ModuleDeclaration */) {
-                        declaration = declaration.parent;
-                    }
-                    addCommentParts(declaration.kind === 218 /* VariableDeclaration */ ? declaration.parent.parent : declaration, sourceFileOfDeclaration, getCleanedJsDocComment);
-                    if (declaration.kind === 218 /* VariableDeclaration */) {
-                        var init = declaration.initializer;
-                        if (init && (init.kind === 179 /* FunctionExpression */ || init.kind === 180 /* ArrowFunction */)) {
-                            // Get the cleaned js doc comment text from the initializer
-                            addCommentParts(init, sourceFileOfDeclaration, getCleanedJsDocComment);
-                        }
-                    }
-                }
-            });
-            return jsDocCommentParts;
-            function addCommentParts(commented, sourceFileOfDeclaration, getCommentPart) {
-                var ranges = getJsDocCommentTextRange(commented, sourceFileOfDeclaration);
-                // Get the cleaned js doc comment text from the declaration
-                ts.forEach(ranges, function (jsDocCommentTextRange) {
-                    var cleanedComment = getCommentPart(jsDocCommentTextRange.pos, jsDocCommentTextRange.end, sourceFileOfDeclaration);
-                    if (cleanedComment) {
-                        ts.addRange(jsDocCommentParts, cleanedComment);
-                    }
-                });
-            }
-            function getJsDocCommentTextRange(node, sourceFile) {
-                return ts.map(ts.getJsDocComments(node, sourceFile), function (jsDocComment) {
-                    return {
-                        pos: jsDocComment.pos + "/*".length,
-                        end: jsDocComment.end - "*/".length // Trim off comment end indicator
-                    };
-                });
-            }
-            function consumeWhiteSpacesOnTheLine(pos, end, sourceFile, maxSpacesToRemove) {
-                if (maxSpacesToRemove !== undefined) {
-                    end = Math.min(end, pos + maxSpacesToRemove);
-                }
-                for (; pos < end; pos++) {
-                    var ch = sourceFile.text.charCodeAt(pos);
-                    if (!ts.isWhiteSpaceSingleLine(ch)) {
-                        return pos;
-                    }
-                }
-                return end;
-            }
-            function consumeLineBreaks(pos, end, sourceFile) {
-                while (pos < end && ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                    pos++;
-                }
-                return pos;
-            }
-            function isName(pos, end, sourceFile, name) {
-                return pos + name.length < end &&
-                    sourceFile.text.substr(pos, name.length) === name &&
-                    ts.isWhiteSpace(sourceFile.text.charCodeAt(pos + name.length));
-            }
-            function isParamTag(pos, end, sourceFile) {
-                // If it is @param tag
-                return isName(pos, end, sourceFile, paramTag);
-            }
-            function pushDocCommentLineText(docComments, text, blankLineCount) {
-                // Add the empty lines in between texts
-                while (blankLineCount) {
-                    blankLineCount--;
-                    docComments.push(ts.textPart(""));
-                }
-                docComments.push(ts.textPart(text));
-            }
-            function getCleanedJsDocComment(pos, end, sourceFile) {
-                var spacesToRemoveAfterAsterisk;
-                var docComments = [];
-                var blankLineCount = 0;
-                var isInParamTag = false;
-                while (pos < end) {
-                    var docCommentTextOfLine = "";
-                    // First consume leading white space
-                    pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile);
-                    // If the comment starts with '*' consume the spaces on this line
-                    if (pos < end && sourceFile.text.charCodeAt(pos) === 42 /* asterisk */) {
-                        var lineStartPos = pos + 1;
-                        pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, spacesToRemoveAfterAsterisk);
-                        // Set the spaces to remove after asterisk as margin if not already set
-                        if (spacesToRemoveAfterAsterisk === undefined && pos < end && !ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                            spacesToRemoveAfterAsterisk = pos - lineStartPos;
-                        }
-                    }
-                    else if (spacesToRemoveAfterAsterisk === undefined) {
-                        spacesToRemoveAfterAsterisk = 0;
-                    }
-                    // Analyze text on this line
-                    while (pos < end && !ts.isLineBreak(sourceFile.text.charCodeAt(pos))) {
-                        var ch = sourceFile.text.charAt(pos);
-                        if (ch === "@") {
-                            // If it is @param tag
-                            if (isParamTag(pos, end, sourceFile)) {
-                                isInParamTag = true;
-                                pos += paramTag.length;
-                                continue;
-                            }
-                            else {
-                                isInParamTag = false;
-                            }
-                        }
-                        // Add the ch to doc text if we arent in param tag
-                        if (!isInParamTag) {
-                            docCommentTextOfLine += ch;
-                        }
-                        // Scan next character
-                        pos++;
-                    }
-                    // Continue with next line
-                    pos = consumeLineBreaks(pos, end, sourceFile);
-                    if (docCommentTextOfLine) {
-                        pushDocCommentLineText(docComments, docCommentTextOfLine, blankLineCount);
-                        blankLineCount = 0;
-                    }
-                    else if (!isInParamTag && docComments.length) {
-                        // This is blank line when there is text already parsed
-                        blankLineCount++;
-                    }
-                }
-                return docComments;
-            }
-            function getCleanedParamJsDocComment(pos, end, sourceFile) {
-                var paramHelpStringMargin;
-                var paramDocComments = [];
-                while (pos < end) {
-                    if (isParamTag(pos, end, sourceFile)) {
-                        var blankLineCount = 0;
-                        var recordedParamTag = false;
-                        // Consume leading spaces
-                        pos = consumeWhiteSpaces(pos + paramTag.length);
-                        if (pos >= end) {
-                            break;
-                        }
-                        // Ignore type expression
-                        if (sourceFile.text.charCodeAt(pos) === 123 /* openBrace */) {
-                            pos++;
-                            for (var curlies = 1; pos < end; pos++) {
-                                var charCode = sourceFile.text.charCodeAt(pos);
-                                // { character means we need to find another } to match the found one
-                                if (charCode === 123 /* openBrace */) {
-                                    curlies++;
-                                    continue;
-                                }
-                                // } char
-                                if (charCode === 125 /* closeBrace */) {
-                                    curlies--;
-                                    if (curlies === 0) {
-                                        // We do not have any more } to match the type expression is ignored completely
-                                        pos++;
-                                        break;
-                                    }
-                                    else {
-                                        // there are more { to be matched with }
-                                        continue;
-                                    }
-                                }
-                                // Found start of another tag
-                                if (charCode === 64 /* at */) {
-                                    break;
-                                }
-                            }
-                            // Consume white spaces
-                            pos = consumeWhiteSpaces(pos);
-                            if (pos >= end) {
-                                break;
-                            }
-                        }
-                        // Parameter name
-                        if (isName(pos, end, sourceFile, name)) {
-                            // Found the parameter we are looking for consume white spaces
-                            pos = consumeWhiteSpaces(pos + name.length);
-                            if (pos >= end) {
-                                break;
-                            }
-                            var paramHelpString = "";
-                            var firstLineParamHelpStringPos = pos;
-                            while (pos < end) {
-                                var ch = sourceFile.text.charCodeAt(pos);
-                                // at line break, set this comment line text and go to next line
-                                if (ts.isLineBreak(ch)) {
-                                    if (paramHelpString) {
-                                        pushDocCommentLineText(paramDocComments, paramHelpString, blankLineCount);
-                                        paramHelpString = "";
-                                        blankLineCount = 0;
-                                        recordedParamTag = true;
-                                    }
-                                    else if (recordedParamTag) {
-                                        blankLineCount++;
-                                    }
-                                    // Get the pos after cleaning start of the line
-                                    setPosForParamHelpStringOnNextLine(firstLineParamHelpStringPos);
-                                    continue;
-                                }
-                                // Done scanning param help string - next tag found
-                                if (ch === 64 /* at */) {
-                                    break;
-                                }
-                                paramHelpString += sourceFile.text.charAt(pos);
-                                // Go to next character
-                                pos++;
-                            }
-                            // If there is param help text, add it top the doc comments
-                            if (paramHelpString) {
-                                pushDocCommentLineText(paramDocComments, paramHelpString, blankLineCount);
-                            }
-                            paramHelpStringMargin = undefined;
-                        }
-                        // If this is the start of another tag, continue with the loop in search of param tag with symbol name
-                        if (sourceFile.text.charCodeAt(pos) === 64 /* at */) {
-                            continue;
-                        }
-                    }
-                    // Next character
-                    pos++;
-                }
-                return paramDocComments;
-                function consumeWhiteSpaces(pos) {
-                    while (pos < end && ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(pos))) {
-                        pos++;
-                    }
-                    return pos;
-                }
-                function setPosForParamHelpStringOnNextLine(firstLineParamHelpStringPos) {
-                    // Get the pos after consuming line breaks
-                    pos = consumeLineBreaks(pos, end, sourceFile);
-                    if (pos >= end) {
-                        return;
-                    }
-                    if (paramHelpStringMargin === undefined) {
-                        paramHelpStringMargin = sourceFile.getLineAndCharacterOfPosition(firstLineParamHelpStringPos).character;
-                    }
-                    // Now consume white spaces max
-                    var startOfLinePos = pos;
-                    pos = consumeWhiteSpacesOnTheLine(pos, end, sourceFile, paramHelpStringMargin);
-                    if (pos >= end) {
-                        return;
-                    }
-                    var consumedSpaces = pos - startOfLinePos;
-                    if (consumedSpaces < paramHelpStringMargin) {
-                        var ch = sourceFile.text.charCodeAt(pos);
-                        if (ch === 42 /* asterisk */) {
-                            // Consume more spaces after asterisk
-                            pos = consumeWhiteSpacesOnTheLine(pos + 1, end, sourceFile, paramHelpStringMargin - consumedSpaces - 1);
-                        }
-                    }
-                }
-            }
-        }
-    }
-    var TypeObject = (function () {
-        function TypeObject(checker, flags) {
-            this.checker = checker;
-            this.flags = flags;
-        }
-        TypeObject.prototype.getFlags = function () {
-            return this.flags;
-        };
-        TypeObject.prototype.getSymbol = function () {
-            return this.symbol;
-        };
-        TypeObject.prototype.getProperties = function () {
-            return this.checker.getPropertiesOfType(this);
-        };
-        TypeObject.prototype.getProperty = function (propertyName) {
-            return this.checker.getPropertyOfType(this, propertyName);
-        };
-        TypeObject.prototype.getApparentProperties = function () {
-            return this.checker.getAugmentedPropertiesOfType(this);
-        };
-        TypeObject.prototype.getCallSignatures = function () {
-            return this.checker.getSignaturesOfType(this, 0 /* Call */);
-        };
-        TypeObject.prototype.getConstructSignatures = function () {
-            return this.checker.getSignaturesOfType(this, 1 /* Construct */);
-        };
-        TypeObject.prototype.getStringIndexType = function () {
-            return this.checker.getIndexTypeOfType(this, 0 /* String */);
-        };
-        TypeObject.prototype.getNumberIndexType = function () {
-            return this.checker.getIndexTypeOfType(this, 1 /* Number */);
-        };
-        TypeObject.prototype.getBaseTypes = function () {
-            return this.flags & (1024 /* Class */ | 2048 /* Interface */)
-                ? this.checker.getBaseTypes(this)
-                : undefined;
-        };
-        TypeObject.prototype.getNonNullableType = function () {
-            return this.checker.getNonNullableType(this);
-        };
-        return TypeObject;
-    }());
-    var SignatureObject = (function () {
-        function SignatureObject(checker) {
-            this.checker = checker;
-        }
-        SignatureObject.prototype.getDeclaration = function () {
-            return this.declaration;
-        };
-        SignatureObject.prototype.getTypeParameters = function () {
-            return this.typeParameters;
-        };
-        SignatureObject.prototype.getParameters = function () {
-            return this.parameters;
-        };
-        SignatureObject.prototype.getReturnType = function () {
-            return this.checker.getReturnTypeOfSignature(this);
-        };
-        SignatureObject.prototype.getDocumentationComment = function () {
-            if (this.documentationComment === undefined) {
-                this.documentationComment = this.declaration ? getJsDocCommentsFromDeclarations([this.declaration], 
-                /*name*/ undefined, 
-                /*canUseParsedParamTagComments*/ false) : [];
-            }
-            return this.documentationComment;
-        };
-        return SignatureObject;
-    }());
-    var SourceFileObject = (function (_super) {
-        __extends(SourceFileObject, _super);
-        function SourceFileObject(kind, pos, end) {
-            _super.call(this, kind, pos, end);
-        }
-        SourceFileObject.prototype.update = function (newText, textChangeRange) {
-            return ts.updateSourceFile(this, newText, textChangeRange);
-        };
-        SourceFileObject.prototype.getLineAndCharacterOfPosition = function (position) {
-            return ts.getLineAndCharacterOfPosition(this, position);
-        };
-        SourceFileObject.prototype.getLineStarts = function () {
-            return ts.getLineStarts(this);
-        };
-        SourceFileObject.prototype.getPositionOfLineAndCharacter = function (line, character) {
-            return ts.getPositionOfLineAndCharacter(this, line, character);
-        };
-        SourceFileObject.prototype.getNamedDeclarations = function () {
-            if (!this.namedDeclarations) {
-                this.namedDeclarations = this.computeNamedDeclarations();
-            }
-            return this.namedDeclarations;
-        };
-        SourceFileObject.prototype.computeNamedDeclarations = function () {
-            var result = {};
-            ts.forEachChild(this, visit);
-            return result;
-            function addDeclaration(declaration) {
-                var name = getDeclarationName(declaration);
-                if (name) {
-                    var declarations = getDeclarations(name);
-                    declarations.push(declaration);
-                }
-            }
-            function getDeclarations(name) {
-                return ts.getProperty(result, name) || (result[name] = []);
-            }
-            function getDeclarationName(declaration) {
-                if (declaration.name) {
-                    var result_2 = getTextOfIdentifierOrLiteral(declaration.name);
-                    if (result_2 !== undefined) {
-                        return result_2;
-                    }
-                    if (declaration.name.kind === 140 /* ComputedPropertyName */) {
-                        var expr = declaration.name.expression;
-                        if (expr.kind === 172 /* PropertyAccessExpression */) {
-                            return expr.name.text;
-                        }
-                        return getTextOfIdentifierOrLiteral(expr);
-                    }
-                }
-                return undefined;
-            }
-            function getTextOfIdentifierOrLiteral(node) {
-                if (node) {
-                    if (node.kind === 69 /* Identifier */ ||
-                        node.kind === 9 /* StringLiteral */ ||
-                        node.kind === 8 /* NumericLiteral */) {
-                        return node.text;
-                    }
-                }
-                return undefined;
-            }
-            function visit(node) {
-                switch (node.kind) {
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        var functionDeclaration = node;
-                        var declarationName = getDeclarationName(functionDeclaration);
-                        if (declarationName) {
-                            var declarations = getDeclarations(declarationName);
-                            var lastDeclaration = ts.lastOrUndefined(declarations);
-                            // Check whether this declaration belongs to an "overload group".
-                            if (lastDeclaration && functionDeclaration.parent === lastDeclaration.parent && functionDeclaration.symbol === lastDeclaration.symbol) {
-                                // Overwrite the last declaration if it was an overload
-                                // and this one is an implementation.
-                                if (functionDeclaration.body && !lastDeclaration.body) {
-                                    declarations[declarations.length - 1] = functionDeclaration;
-                                }
-                            }
-                            else {
-                                declarations.push(functionDeclaration);
-                            }
-                            ts.forEachChild(node, visit);
-                        }
-                        break;
-                    case 221 /* ClassDeclaration */:
-                    case 192 /* ClassExpression */:
-                    case 222 /* InterfaceDeclaration */:
-                    case 223 /* TypeAliasDeclaration */:
-                    case 224 /* EnumDeclaration */:
-                    case 225 /* ModuleDeclaration */:
-                    case 229 /* ImportEqualsDeclaration */:
-                    case 238 /* ExportSpecifier */:
-                    case 234 /* ImportSpecifier */:
-                    case 229 /* ImportEqualsDeclaration */:
-                    case 231 /* ImportClause */:
-                    case 232 /* NamespaceImport */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 159 /* TypeLiteral */:
-                        addDeclaration(node);
-                        ts.forEachChild(node, visit);
-                        break;
-                    case 142 /* Parameter */:
-                        // Only consider parameter properties
-                        if (!(node.flags & 92 /* ParameterPropertyModifier */)) {
-                            break;
-                        }
-                    // fall through
-                    case 218 /* VariableDeclaration */:
-                    case 169 /* BindingElement */: {
-                        var decl = node;
-                        if (ts.isBindingPattern(decl.name)) {
-                            ts.forEachChild(decl.name, visit);
-                            break;
-                        }
-                        if (decl.initializer)
-                            visit(decl.initializer);
-                    }
-                    case 255 /* EnumMember */:
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                        addDeclaration(node);
-                        break;
-                    case 236 /* ExportDeclaration */:
-                        // Handle named exports case e.g.:
-                        //    export {a, b as B} from "mod";
-                        if (node.exportClause) {
-                            ts.forEach(node.exportClause.elements, visit);
-                        }
-                        break;
-                    case 230 /* ImportDeclaration */:
-                        var importClause = node.importClause;
-                        if (importClause) {
-                            // Handle default import case e.g.:
-                            //    import d from "mod";
-                            if (importClause.name) {
-                                addDeclaration(importClause);
-                            }
-                            // Handle named bindings in imports e.g.:
-                            //    import * as NS from "mod";
-                            //    import {a, b as B} from "mod";
-                            if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 232 /* NamespaceImport */) {
-                                    addDeclaration(importClause.namedBindings);
-                                }
-                                else {
-                                    ts.forEach(importClause.namedBindings.elements, visit);
-                                }
-                            }
-                        }
-                        break;
-                    default:
-                        ts.forEachChild(node, visit);
-                }
-            }
-        };
-        return SourceFileObject;
-    }(NodeObject));
-    var TextChange = (function () {
-        function TextChange() {
-        }
-        return TextChange;
-    }());
-    ts.TextChange = TextChange;
-    var HighlightSpanKind;
-    (function (HighlightSpanKind) {
-        HighlightSpanKind.none = "none";
-        HighlightSpanKind.definition = "definition";
-        HighlightSpanKind.reference = "reference";
-        HighlightSpanKind.writtenReference = "writtenReference";
-    })(HighlightSpanKind = ts.HighlightSpanKind || (ts.HighlightSpanKind = {}));
-    (function (IndentStyle) {
-        IndentStyle[IndentStyle["None"] = 0] = "None";
-        IndentStyle[IndentStyle["Block"] = 1] = "Block";
-        IndentStyle[IndentStyle["Smart"] = 2] = "Smart";
-    })(ts.IndentStyle || (ts.IndentStyle = {}));
-    var IndentStyle = ts.IndentStyle;
-    (function (SymbolDisplayPartKind) {
-        SymbolDisplayPartKind[SymbolDisplayPartKind["aliasName"] = 0] = "aliasName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["className"] = 1] = "className";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["enumName"] = 2] = "enumName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["fieldName"] = 3] = "fieldName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["interfaceName"] = 4] = "interfaceName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["keyword"] = 5] = "keyword";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["lineBreak"] = 6] = "lineBreak";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["numericLiteral"] = 7] = "numericLiteral";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["stringLiteral"] = 8] = "stringLiteral";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["localName"] = 9] = "localName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["methodName"] = 10] = "methodName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["moduleName"] = 11] = "moduleName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["operator"] = 12] = "operator";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["parameterName"] = 13] = "parameterName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["propertyName"] = 14] = "propertyName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["punctuation"] = 15] = "punctuation";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["space"] = 16] = "space";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["text"] = 17] = "text";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["typeParameterName"] = 18] = "typeParameterName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
-        SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
-    })(ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
-    var SymbolDisplayPartKind = ts.SymbolDisplayPartKind;
-    (function (OutputFileType) {
-        OutputFileType[OutputFileType["JavaScript"] = 0] = "JavaScript";
-        OutputFileType[OutputFileType["SourceMap"] = 1] = "SourceMap";
-        OutputFileType[OutputFileType["Declaration"] = 2] = "Declaration";
-    })(ts.OutputFileType || (ts.OutputFileType = {}));
-    var OutputFileType = ts.OutputFileType;
-    (function (EndOfLineState) {
-        EndOfLineState[EndOfLineState["None"] = 0] = "None";
-        EndOfLineState[EndOfLineState["InMultiLineCommentTrivia"] = 1] = "InMultiLineCommentTrivia";
-        EndOfLineState[EndOfLineState["InSingleQuoteStringLiteral"] = 2] = "InSingleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InDoubleQuoteStringLiteral"] = 3] = "InDoubleQuoteStringLiteral";
-        EndOfLineState[EndOfLineState["InTemplateHeadOrNoSubstitutionTemplate"] = 4] = "InTemplateHeadOrNoSubstitutionTemplate";
-        EndOfLineState[EndOfLineState["InTemplateMiddleOrTail"] = 5] = "InTemplateMiddleOrTail";
-        EndOfLineState[EndOfLineState["InTemplateSubstitutionPosition"] = 6] = "InTemplateSubstitutionPosition";
-    })(ts.EndOfLineState || (ts.EndOfLineState = {}));
-    var EndOfLineState = ts.EndOfLineState;
-    (function (TokenClass) {
-        TokenClass[TokenClass["Punctuation"] = 0] = "Punctuation";
-        TokenClass[TokenClass["Keyword"] = 1] = "Keyword";
-        TokenClass[TokenClass["Operator"] = 2] = "Operator";
-        TokenClass[TokenClass["Comment"] = 3] = "Comment";
-        TokenClass[TokenClass["Whitespace"] = 4] = "Whitespace";
-        TokenClass[TokenClass["Identifier"] = 5] = "Identifier";
-        TokenClass[TokenClass["NumberLiteral"] = 6] = "NumberLiteral";
-        TokenClass[TokenClass["StringLiteral"] = 7] = "StringLiteral";
-        TokenClass[TokenClass["RegExpLiteral"] = 8] = "RegExpLiteral";
-    })(ts.TokenClass || (ts.TokenClass = {}));
-    var TokenClass = ts.TokenClass;
-    // TODO: move these to enums
-    var ScriptElementKind;
-    (function (ScriptElementKind) {
-        ScriptElementKind.unknown = "";
-        ScriptElementKind.warning = "warning";
-        /** predefined type (void) or keyword (class) */
-        ScriptElementKind.keyword = "keyword";
-        /** top level script node */
-        ScriptElementKind.scriptElement = "script";
-        /** module foo {} */
-        ScriptElementKind.moduleElement = "module";
-        /** class X {} */
-        ScriptElementKind.classElement = "class";
-        /** var x = class X {} */
-        ScriptElementKind.localClassElement = "local class";
-        /** interface Y {} */
-        ScriptElementKind.interfaceElement = "interface";
-        /** type T = ... */
-        ScriptElementKind.typeElement = "type";
-        /** enum E */
-        ScriptElementKind.enumElement = "enum";
-        /**
-         * Inside module and script only
-         * const v = ..
-         */
-        ScriptElementKind.variableElement = "var";
-        /** Inside function */
-        ScriptElementKind.localVariableElement = "local var";
-        /**
-         * Inside module and script only
-         * function f() { }
-         */
-        ScriptElementKind.functionElement = "function";
-        /** Inside function */
-        ScriptElementKind.localFunctionElement = "local function";
-        /** class X { [public|private]* foo() {} } */
-        ScriptElementKind.memberFunctionElement = "method";
-        /** class X { [public|private]* [get|set] foo:number; } */
-        ScriptElementKind.memberGetAccessorElement = "getter";
-        ScriptElementKind.memberSetAccessorElement = "setter";
-        /**
-         * class X { [public|private]* foo:number; }
-         * interface Y { foo:number; }
-         */
-        ScriptElementKind.memberVariableElement = "property";
-        /** class X { constructor() { } } */
-        ScriptElementKind.constructorImplementationElement = "constructor";
-        /** interface Y { ():number; } */
-        ScriptElementKind.callSignatureElement = "call";
-        /** interface Y { []:number; } */
-        ScriptElementKind.indexSignatureElement = "index";
-        /** interface Y { new():Y; } */
-        ScriptElementKind.constructSignatureElement = "construct";
-        /** function foo(*Y*: string) */
-        ScriptElementKind.parameterElement = "parameter";
-        ScriptElementKind.typeParameterElement = "type parameter";
-        ScriptElementKind.primitiveType = "primitive type";
-        ScriptElementKind.label = "label";
-        ScriptElementKind.alias = "alias";
-        ScriptElementKind.constElement = "const";
-        ScriptElementKind.letElement = "let";
-    })(ScriptElementKind = ts.ScriptElementKind || (ts.ScriptElementKind = {}));
-    var ScriptElementKindModifier;
-    (function (ScriptElementKindModifier) {
-        ScriptElementKindModifier.none = "";
-        ScriptElementKindModifier.publicMemberModifier = "public";
-        ScriptElementKindModifier.privateMemberModifier = "private";
-        ScriptElementKindModifier.protectedMemberModifier = "protected";
-        ScriptElementKindModifier.exportedModifier = "export";
-        ScriptElementKindModifier.ambientModifier = "declare";
-        ScriptElementKindModifier.staticModifier = "static";
-        ScriptElementKindModifier.abstractModifier = "abstract";
-    })(ScriptElementKindModifier = ts.ScriptElementKindModifier || (ts.ScriptElementKindModifier = {}));
-    var ClassificationTypeNames = (function () {
-        function ClassificationTypeNames() {
-        }
-        ClassificationTypeNames.comment = "comment";
-        ClassificationTypeNames.identifier = "identifier";
-        ClassificationTypeNames.keyword = "keyword";
-        ClassificationTypeNames.numericLiteral = "number";
-        ClassificationTypeNames.operator = "operator";
-        ClassificationTypeNames.stringLiteral = "string";
-        ClassificationTypeNames.whiteSpace = "whitespace";
-        ClassificationTypeNames.text = "text";
-        ClassificationTypeNames.punctuation = "punctuation";
-        ClassificationTypeNames.className = "class name";
-        ClassificationTypeNames.enumName = "enum name";
-        ClassificationTypeNames.interfaceName = "interface name";
-        ClassificationTypeNames.moduleName = "module name";
-        ClassificationTypeNames.typeParameterName = "type parameter name";
-        ClassificationTypeNames.typeAliasName = "type alias name";
-        ClassificationTypeNames.parameterName = "parameter name";
-        ClassificationTypeNames.docCommentTagName = "doc comment tag name";
-        ClassificationTypeNames.jsxOpenTagName = "jsx open tag name";
-        ClassificationTypeNames.jsxCloseTagName = "jsx close tag name";
-        ClassificationTypeNames.jsxSelfClosingTagName = "jsx self closing tag name";
-        ClassificationTypeNames.jsxAttribute = "jsx attribute";
-        ClassificationTypeNames.jsxText = "jsx text";
-        ClassificationTypeNames.jsxAttributeStringLiteralValue = "jsx attribute string literal value";
-        return ClassificationTypeNames;
-    }());
-    ts.ClassificationTypeNames = ClassificationTypeNames;
-    (function (ClassificationType) {
-        ClassificationType[ClassificationType["comment"] = 1] = "comment";
-        ClassificationType[ClassificationType["identifier"] = 2] = "identifier";
-        ClassificationType[ClassificationType["keyword"] = 3] = "keyword";
-        ClassificationType[ClassificationType["numericLiteral"] = 4] = "numericLiteral";
-        ClassificationType[ClassificationType["operator"] = 5] = "operator";
-        ClassificationType[ClassificationType["stringLiteral"] = 6] = "stringLiteral";
-        ClassificationType[ClassificationType["regularExpressionLiteral"] = 7] = "regularExpressionLiteral";
-        ClassificationType[ClassificationType["whiteSpace"] = 8] = "whiteSpace";
-        ClassificationType[ClassificationType["text"] = 9] = "text";
-        ClassificationType[ClassificationType["punctuation"] = 10] = "punctuation";
-        ClassificationType[ClassificationType["className"] = 11] = "className";
-        ClassificationType[ClassificationType["enumName"] = 12] = "enumName";
-        ClassificationType[ClassificationType["interfaceName"] = 13] = "interfaceName";
-        ClassificationType[ClassificationType["moduleName"] = 14] = "moduleName";
-        ClassificationType[ClassificationType["typeParameterName"] = 15] = "typeParameterName";
-        ClassificationType[ClassificationType["typeAliasName"] = 16] = "typeAliasName";
-        ClassificationType[ClassificationType["parameterName"] = 17] = "parameterName";
-        ClassificationType[ClassificationType["docCommentTagName"] = 18] = "docCommentTagName";
-        ClassificationType[ClassificationType["jsxOpenTagName"] = 19] = "jsxOpenTagName";
-        ClassificationType[ClassificationType["jsxCloseTagName"] = 20] = "jsxCloseTagName";
-        ClassificationType[ClassificationType["jsxSelfClosingTagName"] = 21] = "jsxSelfClosingTagName";
-        ClassificationType[ClassificationType["jsxAttribute"] = 22] = "jsxAttribute";
-        ClassificationType[ClassificationType["jsxText"] = 23] = "jsxText";
-        ClassificationType[ClassificationType["jsxAttributeStringLiteralValue"] = 24] = "jsxAttributeStringLiteralValue";
-    })(ts.ClassificationType || (ts.ClassificationType = {}));
-    var ClassificationType = ts.ClassificationType;
-    function displayPartsToString(displayParts) {
-        if (displayParts) {
-            return ts.map(displayParts, function (displayPart) { return displayPart.text; }).join("");
-        }
-        return "";
-    }
-    ts.displayPartsToString = displayPartsToString;
-    function isLocalVariableOrFunction(symbol) {
-        if (symbol.parent) {
-            return false; // This is exported symbol
-        }
-        return ts.forEach(symbol.declarations, function (declaration) {
-            // Function expressions are local
-            if (declaration.kind === 179 /* FunctionExpression */) {
-                return true;
-            }
-            if (declaration.kind !== 218 /* VariableDeclaration */ && declaration.kind !== 220 /* FunctionDeclaration */) {
-                return false;
-            }
-            // If the parent is not sourceFile or module block it is local variable
-            for (var parent_16 = declaration.parent; !ts.isFunctionBlock(parent_16); parent_16 = parent_16.parent) {
-                // Reached source file or module block
-                if (parent_16.kind === 256 /* SourceFile */ || parent_16.kind === 226 /* ModuleBlock */) {
-                    return false;
-                }
-            }
-            // parent is in function block
-            return true;
-        });
-    }
-    function getDefaultCompilerOptions() {
-        // Always default to "ScriptTarget.ES5" for the language service
-        return {
-            target: 1 /* ES5 */,
-            jsx: 1 /* Preserve */
-        };
-    }
-    ts.getDefaultCompilerOptions = getDefaultCompilerOptions;
-    // Cache host information about scrip Should be refreshed
-    // at each language service public entry point, since we don't know when
-    // set of scripts handled by the host changes.
-    var HostCache = (function () {
-        function HostCache(host, getCanonicalFileName) {
-            this.host = host;
-            this.getCanonicalFileName = getCanonicalFileName;
-            // script id => script index
-            this.currentDirectory = host.getCurrentDirectory();
-            this.fileNameToEntry = ts.createFileMap();
-            // Initialize the list with the root file names
-            var rootFileNames = host.getScriptFileNames();
-            for (var _i = 0, rootFileNames_1 = rootFileNames; _i < rootFileNames_1.length; _i++) {
-                var fileName = rootFileNames_1[_i];
-                this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
-            }
-            // store the compilation settings
-            this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
-        }
-        HostCache.prototype.compilationSettings = function () {
-            return this._compilationSettings;
-        };
-        HostCache.prototype.createEntry = function (fileName, path) {
-            var entry;
-            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
-            if (scriptSnapshot) {
-                entry = {
-                    hostFileName: fileName,
-                    version: this.host.getScriptVersion(fileName),
-                    scriptSnapshot: scriptSnapshot,
-                    scriptKind: ts.getScriptKind(fileName, this.host)
-                };
-            }
-            this.fileNameToEntry.set(path, entry);
-            return entry;
-        };
-        HostCache.prototype.getEntry = function (path) {
-            return this.fileNameToEntry.get(path);
-        };
-        HostCache.prototype.contains = function (path) {
-            return this.fileNameToEntry.contains(path);
-        };
-        HostCache.prototype.getOrCreateEntry = function (fileName) {
-            var path = ts.toPath(fileName, this.currentDirectory, this.getCanonicalFileName);
-            return this.getOrCreateEntryByPath(fileName, path);
-        };
-        HostCache.prototype.getOrCreateEntryByPath = function (fileName, path) {
-            return this.contains(path)
-                ? this.getEntry(path)
-                : this.createEntry(fileName, path);
-        };
-        HostCache.prototype.getRootFileNames = function () {
-            var fileNames = [];
-            this.fileNameToEntry.forEachValue(function (path, value) {
-                if (value) {
-                    fileNames.push(value.hostFileName);
-                }
-            });
-            return fileNames;
-        };
-        HostCache.prototype.getVersion = function (path) {
-            var file = this.getEntry(path);
-            return file && file.version;
-        };
-        HostCache.prototype.getScriptSnapshot = function (path) {
-            var file = this.getEntry(path);
-            return file && file.scriptSnapshot;
-        };
-        return HostCache;
-    }());
-    var SyntaxTreeCache = (function () {
-        function SyntaxTreeCache(host) {
-            this.host = host;
-        }
-        SyntaxTreeCache.prototype.getCurrentSourceFile = function (fileName) {
-            var scriptSnapshot = this.host.getScriptSnapshot(fileName);
-            if (!scriptSnapshot) {
-                // The host does not know about this file.
-                throw new Error("Could not find file: '" + fileName + "'.");
-            }
-            var scriptKind = ts.getScriptKind(fileName, this.host);
-            var version = this.host.getScriptVersion(fileName);
-            var sourceFile;
-            if (this.currentFileName !== fileName) {
-                // This is a new file, just parse it
-                sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, 2 /* Latest */, version, /*setNodeParents*/ true, scriptKind);
-            }
-            else if (this.currentFileVersion !== version) {
-                // This is the same file, just a newer version. Incrementally parse the file.
-                var editRange = scriptSnapshot.getChangeRange(this.currentFileScriptSnapshot);
-                sourceFile = updateLanguageServiceSourceFile(this.currentSourceFile, scriptSnapshot, version, editRange);
-            }
-            if (sourceFile) {
-                // All done, ensure state is up to date
-                this.currentFileVersion = version;
-                this.currentFileName = fileName;
-                this.currentFileScriptSnapshot = scriptSnapshot;
-                this.currentSourceFile = sourceFile;
-            }
-            return this.currentSourceFile;
-        };
-        return SyntaxTreeCache;
-    }());
-    function setSourceFileFields(sourceFile, scriptSnapshot, version) {
-        sourceFile.version = version;
-        sourceFile.scriptSnapshot = scriptSnapshot;
-    }
-    var commandLineOptionsStringToEnum;
-    /** JS users may pass in string values for enum compiler options (such as ModuleKind), so convert. */
-    function fixupCompilerOptions(options, diagnostics) {
-        // Lazily create this value to fix module loading errors.
-        commandLineOptionsStringToEnum = commandLineOptionsStringToEnum || ts.filter(ts.optionDeclarations, function (o) {
-            return typeof o.type === "object" && !ts.forEachValue(o.type, function (v) { return typeof v !== "number"; });
-        });
-        options = ts.clone(options);
-        var _loop_3 = function(opt) {
-            if (!ts.hasProperty(options, opt.name)) {
-                return "continue";
-            }
-            var value = options[opt.name];
-            // Value should be a key of opt.type
-            if (typeof value === "string") {
-                // If value is not a string, this will fail
-                options[opt.name] = ts.parseCustomTypeOption(opt, value, diagnostics);
-            }
-            else {
-                if (!ts.forEachValue(opt.type, function (v) { return v === value; })) {
-                    // Supplied value isn't a valid enum value.
-                    diagnostics.push(ts.createCompilerDiagnosticForInvalidCustomType(opt));
-                }
-            }
-        };
-        for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
-            var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_3(opt);
-        }
-        return options;
-    }
-    /*
-     * This function will compile source text from 'input' argument using specified compiler options.
-     * If not options are provided - it will use a set of default compiler options.
-     * Extra compiler options that will unconditionally be used by this function are:
-     * - isolatedModules = true
-     * - allowNonTsExtensions = true
-     * - noLib = true
-     * - noResolve = true
-     */
-    function transpileModule(input, transpileOptions) {
-        var diagnostics = [];
-        var options = transpileOptions.compilerOptions ? fixupCompilerOptions(transpileOptions.compilerOptions, diagnostics) : getDefaultCompilerOptions();
-        options.isolatedModules = true;
-        // transpileModule does not write anything to disk so there is no need to verify that there are no conflicts between input and output paths.
-        options.suppressOutputPathCheck = true;
-        // Filename can be non-ts file.
-        options.allowNonTsExtensions = true;
-        // We are not returning a sourceFile for lib file when asked by the program,
-        // so pass --noLib to avoid reporting a file not found error.
-        options.noLib = true;
-        // Clear out other settings that would not be used in transpiling this module
-        options.lib = undefined;
-        options.types = undefined;
-        options.noEmit = undefined;
-        options.noEmitOnError = undefined;
-        options.paths = undefined;
-        options.rootDirs = undefined;
-        options.declaration = undefined;
-        options.declarationDir = undefined;
-        options.out = undefined;
-        options.outFile = undefined;
-        // We are not doing a full typecheck, we are not resolving the whole context,
-        // so pass --noResolve to avoid reporting missing file errors.
-        options.noResolve = true;
-        // if jsx is specified then treat file as .tsx
-        var inputFileName = transpileOptions.fileName || (options.jsx ? "module.tsx" : "module.ts");
-        var sourceFile = ts.createSourceFile(inputFileName, input, options.target);
-        if (transpileOptions.moduleName) {
-            sourceFile.moduleName = transpileOptions.moduleName;
-        }
-        sourceFile.renamedDependencies = transpileOptions.renamedDependencies;
-        var newLine = ts.getNewLineCharacter(options);
-        // Output
-        var outputText;
-        var sourceMapText;
-        // Create a compilerHost object to allow the compiler to read and write files
-        var compilerHost = {
-            getSourceFile: function (fileName, target) { return fileName === ts.normalizePath(inputFileName) ? sourceFile : undefined; },
-            writeFile: function (name, text, writeByteOrderMark) {
-                if (ts.fileExtensionIs(name, ".map")) {
-                    ts.Debug.assert(sourceMapText === undefined, "Unexpected multiple source map outputs for the file '" + name + "'");
-                    sourceMapText = text;
-                }
-                else {
-                    ts.Debug.assert(outputText === undefined, "Unexpected multiple outputs for the file: '" + name + "'");
-                    outputText = text;
-                }
-            },
-            getDefaultLibFileName: function () { return "lib.d.ts"; },
-            useCaseSensitiveFileNames: function () { return false; },
-            getCanonicalFileName: function (fileName) { return fileName; },
-            getCurrentDirectory: function () { return ""; },
-            getNewLine: function () { return newLine; },
-            fileExists: function (fileName) { return fileName === inputFileName; },
-            readFile: function (fileName) { return ""; },
-            directoryExists: function (directoryExists) { return true; },
-            getDirectories: function (path) { return []; }
-        };
-        var program = ts.createProgram([inputFileName], options, compilerHost);
-        if (transpileOptions.reportDiagnostics) {
-            ts.addRange(/*to*/ diagnostics, /*from*/ program.getSyntacticDiagnostics(sourceFile));
-            ts.addRange(/*to*/ diagnostics, /*from*/ program.getOptionsDiagnostics());
-        }
-        // Emit
-        program.emit();
-        ts.Debug.assert(outputText !== undefined, "Output generation failed");
-        return { outputText: outputText, diagnostics: diagnostics, sourceMapText: sourceMapText };
-    }
-    ts.transpileModule = transpileModule;
-    /*
-     * This is a shortcut function for transpileModule - it accepts transpileOptions as parameters and returns only outputText part of the result.
-     */
-    function transpile(input, compilerOptions, fileName, diagnostics, moduleName) {
-        var output = transpileModule(input, { compilerOptions: compilerOptions, fileName: fileName, reportDiagnostics: !!diagnostics, moduleName: moduleName });
-        // addRange correctly handles cases when wither 'from' or 'to' argument is missing
-        ts.addRange(diagnostics, output.diagnostics);
-        return output.outputText;
-    }
-    ts.transpile = transpile;
-    function createLanguageServiceSourceFile(fileName, scriptSnapshot, scriptTarget, version, setNodeParents, scriptKind) {
-        var text = scriptSnapshot.getText(0, scriptSnapshot.getLength());
-        var sourceFile = ts.createSourceFile(fileName, text, scriptTarget, setNodeParents, scriptKind);
-        setSourceFileFields(sourceFile, scriptSnapshot, version);
-        return sourceFile;
-    }
-    ts.createLanguageServiceSourceFile = createLanguageServiceSourceFile;
-    ts.disableIncrementalParsing = false;
-    function updateLanguageServiceSourceFile(sourceFile, scriptSnapshot, version, textChangeRange, aggressiveChecks) {
-        // If we were given a text change range, and our version or open-ness changed, then
-        // incrementally parse this file.
-        if (textChangeRange) {
-            if (version !== sourceFile.version) {
-                // Once incremental parsing is ready, then just call into this function.
-                if (!ts.disableIncrementalParsing) {
-                    var newText = void 0;
-                    // grab the fragment from the beginning of the original text to the beginning of the span
-                    var prefix = textChangeRange.span.start !== 0
-                        ? sourceFile.text.substr(0, textChangeRange.span.start)
-                        : "";
-                    // grab the fragment from the end of the span till the end of the original text
-                    var suffix = ts.textSpanEnd(textChangeRange.span) !== sourceFile.text.length
-                        ? sourceFile.text.substr(ts.textSpanEnd(textChangeRange.span))
-                        : "";
-                    if (textChangeRange.newLength === 0) {
-                        // edit was a deletion - just combine prefix and suffix
-                        newText = prefix && suffix ? prefix + suffix : prefix || suffix;
-                    }
-                    else {
-                        // it was actual edit, fetch the fragment of new text that correspond to new span
-                        var changedText = scriptSnapshot.getText(textChangeRange.span.start, textChangeRange.span.start + textChangeRange.newLength);
-                        // combine prefix, changed text and suffix
-                        newText = prefix && suffix
-                            ? prefix + changedText + suffix
-                            : prefix
-                                ? (prefix + changedText)
-                                : (changedText + suffix);
-                    }
-                    var newSourceFile = ts.updateSourceFile(sourceFile, newText, textChangeRange, aggressiveChecks);
-                    setSourceFileFields(newSourceFile, scriptSnapshot, version);
-                    // after incremental parsing nameTable might not be up-to-date
-                    // drop it so it can be lazily recreated later
-                    newSourceFile.nameTable = undefined;
-                    // dispose all resources held by old script snapshot
-                    if (sourceFile !== newSourceFile && sourceFile.scriptSnapshot) {
-                        if (sourceFile.scriptSnapshot.dispose) {
-                            sourceFile.scriptSnapshot.dispose();
-                        }
-                        sourceFile.scriptSnapshot = undefined;
-                    }
-                    return newSourceFile;
-                }
-            }
-        }
-        // Otherwise, just create a new source file.
-        return createLanguageServiceSourceFile(sourceFile.fileName, scriptSnapshot, sourceFile.languageVersion, version, /*setNodeParents*/ true, sourceFile.scriptKind);
-    }
-    ts.updateLanguageServiceSourceFile = updateLanguageServiceSourceFile;
-    function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
-        if (currentDirectory === void 0) { currentDirectory = ""; }
-        // Maps from compiler setting target (ES3, ES5, etc.) to all the cached documents we have
-        // for those settings.
-        var buckets = {};
-        var getCanonicalFileName = ts.createGetCanonicalFileName(!!useCaseSensitiveFileNames);
-        function getKeyForCompilationSettings(settings) {
-            return ("_" + settings.target + "|" + settings.module + "|" + settings.noResolve + "|" + settings.jsx + "|" + settings.allowJs + "|" + settings.baseUrl + "|" + JSON.stringify(settings.typeRoots) + "|" + JSON.stringify(settings.rootDirs) + "|" + JSON.stringify(settings.paths));
-        }
-        function getBucketForCompilationSettings(key, createIfMissing) {
-            var bucket = ts.lookUp(buckets, key);
-            if (!bucket && createIfMissing) {
-                buckets[key] = bucket = ts.createFileMap();
-            }
-            return bucket;
-        }
-        function reportStats() {
-            var bucketInfoArray = Object.keys(buckets).filter(function (name) { return name && name.charAt(0) === "_"; }).map(function (name) {
-                var entries = ts.lookUp(buckets, name);
-                var sourceFiles = [];
-                entries.forEachValue(function (key, entry) {
-                    sourceFiles.push({
-                        name: key,
-                        refCount: entry.languageServiceRefCount,
-                        references: entry.owners.slice(0)
-                    });
-                });
-                sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
-                return {
-                    bucket: name,
-                    sourceFiles: sourceFiles
-                };
-            });
-            return JSON.stringify(bucketInfoArray, undefined, 2);
-        }
-        function acquireDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
-            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
-            var key = getKeyForCompilationSettings(compilationSettings);
-            return acquireDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind);
-        }
-        function acquireDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind) {
-            return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ true, scriptKind);
-        }
-        function updateDocument(fileName, compilationSettings, scriptSnapshot, version, scriptKind) {
-            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
-            var key = getKeyForCompilationSettings(compilationSettings);
-            return updateDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind);
-        }
-        function updateDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind) {
-            return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
-        }
-        function acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, acquiring, scriptKind) {
-            var bucket = getBucketForCompilationSettings(key, /*createIfMissing*/ true);
-            var entry = bucket.get(path);
-            if (!entry) {
-                ts.Debug.assert(acquiring, "How could we be trying to update a document that the registry doesn't have?");
-                // Have never seen this file with these settings.  Create a new source file for it.
-                var sourceFile = createLanguageServiceSourceFile(fileName, scriptSnapshot, compilationSettings.target, version, /*setNodeParents*/ false, scriptKind);
-                entry = {
-                    sourceFile: sourceFile,
-                    languageServiceRefCount: 0,
-                    owners: []
-                };
-                bucket.set(path, entry);
-            }
-            else {
-                // We have an entry for this file.  However, it may be for a different version of
-                // the script snapshot.  If so, update it appropriately.  Otherwise, we can just
-                // return it as is.
-                if (entry.sourceFile.version !== version) {
-                    entry.sourceFile = updateLanguageServiceSourceFile(entry.sourceFile, scriptSnapshot, version, scriptSnapshot.getChangeRange(entry.sourceFile.scriptSnapshot));
-                }
-            }
-            // If we're acquiring, then this is the first time this LS is asking for this document.
-            // Increase our ref count so we know there's another LS using the document.  If we're
-            // not acquiring, then that means the LS is 'updating' the file instead, and that means
-            // it has already acquired the document previously.  As such, we do not need to increase
-            // the ref count.
-            if (acquiring) {
-                entry.languageServiceRefCount++;
-            }
-            return entry.sourceFile;
-        }
-        function releaseDocument(fileName, compilationSettings) {
-            var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
-            var key = getKeyForCompilationSettings(compilationSettings);
-            return releaseDocumentWithKey(path, key);
-        }
-        function releaseDocumentWithKey(path, key) {
-            var bucket = getBucketForCompilationSettings(key, /*createIfMissing*/ false);
-            ts.Debug.assert(bucket !== undefined);
-            var entry = bucket.get(path);
-            entry.languageServiceRefCount--;
-            ts.Debug.assert(entry.languageServiceRefCount >= 0);
-            if (entry.languageServiceRefCount === 0) {
-                bucket.remove(path);
-            }
-        }
-        return {
-            acquireDocument: acquireDocument,
-            acquireDocumentWithKey: acquireDocumentWithKey,
-            updateDocument: updateDocument,
-            updateDocumentWithKey: updateDocumentWithKey,
-            releaseDocument: releaseDocument,
-            releaseDocumentWithKey: releaseDocumentWithKey,
-            reportStats: reportStats,
-            getKeyForCompilationSettings: getKeyForCompilationSettings
-        };
-    }
-    ts.createDocumentRegistry = createDocumentRegistry;
-    function preProcessFile(sourceText, readImportFiles, detectJavaScriptImports) {
-        if (readImportFiles === void 0) { readImportFiles = true; }
-        if (detectJavaScriptImports === void 0) { detectJavaScriptImports = false; }
-        var referencedFiles = [];
-        var typeReferenceDirectives = [];
-        var importedFiles = [];
-        var ambientExternalModules;
-        var isNoDefaultLib = false;
-        var braceNesting = 0;
-        // assume that text represent an external module if it contains at least one top level import/export
-        // ambient modules that are found inside external modules are interpreted as module augmentations
-        var externalModule = false;
-        function nextToken() {
-            var token = scanner.scan();
-            if (token === 15 /* OpenBraceToken */) {
-                braceNesting++;
-            }
-            else if (token === 16 /* CloseBraceToken */) {
-                braceNesting--;
-            }
-            return token;
-        }
-        function processTripleSlashDirectives() {
-            var commentRanges = ts.getLeadingCommentRanges(sourceText, 0);
-            ts.forEach(commentRanges, function (commentRange) {
-                var comment = sourceText.substring(commentRange.pos, commentRange.end);
-                var referencePathMatchResult = ts.getFileReferenceFromReferencePath(comment, commentRange);
-                if (referencePathMatchResult) {
-                    isNoDefaultLib = referencePathMatchResult.isNoDefaultLib;
-                    var fileReference = referencePathMatchResult.fileReference;
-                    if (fileReference) {
-                        var collection = referencePathMatchResult.isTypeReferenceDirective
-                            ? typeReferenceDirectives
-                            : referencedFiles;
-                        collection.push(fileReference);
-                    }
-                }
-            });
-        }
-        function getFileReference() {
-            var file = scanner.getTokenValue();
-            var pos = scanner.getTokenPos();
-            return {
-                fileName: file,
-                pos: pos,
-                end: pos + file.length
-            };
-        }
-        function recordAmbientExternalModule() {
-            if (!ambientExternalModules) {
-                ambientExternalModules = [];
-            }
-            ambientExternalModules.push({ ref: getFileReference(), depth: braceNesting });
-        }
-        function recordModuleName() {
-            importedFiles.push(getFileReference());
-            markAsExternalModuleIfTopLevel();
-        }
-        function markAsExternalModuleIfTopLevel() {
-            if (braceNesting === 0) {
-                externalModule = true;
-            }
-        }
-        /**
-         * Returns true if at least one token was consumed from the stream
-         */
-        function tryConsumeDeclare() {
-            var token = scanner.getToken();
-            if (token === 122 /* DeclareKeyword */) {
-                // declare module "mod"
-                token = nextToken();
-                if (token === 125 /* ModuleKeyword */) {
-                    token = nextToken();
-                    if (token === 9 /* StringLiteral */) {
-                        recordAmbientExternalModule();
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        /**
-         * Returns true if at least one token was consumed from the stream
-         */
-        function tryConsumeImport() {
-            var token = scanner.getToken();
-            if (token === 89 /* ImportKeyword */) {
-                token = nextToken();
-                if (token === 9 /* StringLiteral */) {
-                    // import "mod";
-                    recordModuleName();
-                    return true;
-                }
-                else {
-                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = nextToken();
-                        if (token === 136 /* FromKeyword */) {
-                            token = nextToken();
-                            if (token === 9 /* StringLiteral */) {
-                                // import d from "mod";
-                                recordModuleName();
-                                return true;
-                            }
-                        }
-                        else if (token === 56 /* EqualsToken */) {
-                            if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
-                                return true;
-                            }
-                        }
-                        else if (token === 24 /* CommaToken */) {
-                            // consume comma and keep going
-                            token = nextToken();
-                        }
-                        else {
-                            // unknown syntax
-                            return true;
-                        }
-                    }
-                    if (token === 15 /* OpenBraceToken */) {
-                        token = nextToken();
-                        // consume "{ a as B, c, d as D}" clauses
-                        // make sure that it stops on EOF
-                        while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                            token = nextToken();
-                        }
-                        if (token === 16 /* CloseBraceToken */) {
-                            token = nextToken();
-                            if (token === 136 /* FromKeyword */) {
-                                token = nextToken();
-                                if (token === 9 /* StringLiteral */) {
-                                    // import {a as A} from "mod";
-                                    // import d, {a, b as B} from "mod"
-                                    recordModuleName();
-                                }
-                            }
-                        }
-                    }
-                    else if (token === 37 /* AsteriskToken */) {
-                        token = nextToken();
-                        if (token === 116 /* AsKeyword */) {
-                            token = nextToken();
-                            if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                                token = nextToken();
-                                if (token === 136 /* FromKeyword */) {
-                                    token = nextToken();
-                                    if (token === 9 /* StringLiteral */) {
-                                        // import * as NS from "mod"
-                                        // import d, * as NS from "mod"
-                                        recordModuleName();
-                                    }
-                                }
-                            }
-                        }
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        function tryConsumeExport() {
-            var token = scanner.getToken();
-            if (token === 82 /* ExportKeyword */) {
-                markAsExternalModuleIfTopLevel();
-                token = nextToken();
-                if (token === 15 /* OpenBraceToken */) {
-                    token = nextToken();
-                    // consume "{ a as B, c, d as D}" clauses
-                    // make sure it stops on EOF
-                    while (token !== 16 /* CloseBraceToken */ && token !== 1 /* EndOfFileToken */) {
-                        token = nextToken();
-                    }
-                    if (token === 16 /* CloseBraceToken */) {
-                        token = nextToken();
-                        if (token === 136 /* FromKeyword */) {
-                            token = nextToken();
-                            if (token === 9 /* StringLiteral */) {
-                                // export {a as A} from "mod";
-                                // export {a, b as B} from "mod"
-                                recordModuleName();
-                            }
-                        }
-                    }
-                }
-                else if (token === 37 /* AsteriskToken */) {
-                    token = nextToken();
-                    if (token === 136 /* FromKeyword */) {
-                        token = nextToken();
-                        if (token === 9 /* StringLiteral */) {
-                            // export * from "mod"
-                            recordModuleName();
-                        }
-                    }
-                }
-                else if (token === 89 /* ImportKeyword */) {
-                    token = nextToken();
-                    if (token === 69 /* Identifier */ || ts.isKeyword(token)) {
-                        token = nextToken();
-                        if (token === 56 /* EqualsToken */) {
-                            if (tryConsumeRequireCall(/*skipCurrentToken*/ true)) {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        function tryConsumeRequireCall(skipCurrentToken) {
-            var token = skipCurrentToken ? nextToken() : scanner.getToken();
-            if (token === 129 /* RequireKeyword */) {
-                token = nextToken();
-                if (token === 17 /* OpenParenToken */) {
-                    token = nextToken();
-                    if (token === 9 /* StringLiteral */) {
-                        //  require("mod");
-                        recordModuleName();
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        function tryConsumeDefine() {
-            var token = scanner.getToken();
-            if (token === 69 /* Identifier */ && scanner.getTokenValue() === "define") {
-                token = nextToken();
-                if (token !== 17 /* OpenParenToken */) {
-                    return true;
-                }
-                token = nextToken();
-                if (token === 9 /* StringLiteral */) {
-                    // looks like define ("modname", ... - skip string literal and comma
-                    token = nextToken();
-                    if (token === 24 /* CommaToken */) {
-                        token = nextToken();
-                    }
-                    else {
-                        // unexpected token
-                        return true;
-                    }
-                }
-                // should be start of dependency list
-                if (token !== 19 /* OpenBracketToken */) {
-                    return true;
-                }
-                // skip open bracket
-                token = nextToken();
-                var i = 0;
-                // scan until ']' or EOF
-                while (token !== 20 /* CloseBracketToken */ && token !== 1 /* EndOfFileToken */) {
-                    // record string literals as module names
-                    if (token === 9 /* StringLiteral */) {
-                        recordModuleName();
-                        i++;
-                    }
-                    token = nextToken();
-                }
-                return true;
-            }
-            return false;
-        }
-        function processImports() {
-            scanner.setText(sourceText);
-            nextToken();
-            // Look for:
-            //    import "mod";
-            //    import d from "mod"
-            //    import {a as A } from "mod";
-            //    import * as NS  from "mod"
-            //    import d, {a, b as B} from "mod"
-            //    import i = require("mod");
-            //
-            //    export * from "mod"
-            //    export {a as b} from "mod"
-            //    export import i = require("mod")
-            //    (for JavaScript files) require("mod")
-            while (true) {
-                if (scanner.getToken() === 1 /* EndOfFileToken */) {
-                    break;
-                }
-                // check if at least one of alternative have moved scanner forward
-                if (tryConsumeDeclare() ||
-                    tryConsumeImport() ||
-                    tryConsumeExport() ||
-                    (detectJavaScriptImports && (tryConsumeRequireCall(/*skipCurrentToken*/ false) || tryConsumeDefine()))) {
-                    continue;
-                }
-                else {
-                    nextToken();
-                }
-            }
-            scanner.setText(undefined);
-        }
-        if (readImportFiles) {
-            processImports();
-        }
-        processTripleSlashDirectives();
-        if (externalModule) {
-            // for external modules module all nested ambient modules are augmentations
-            if (ambientExternalModules) {
-                // move all detected ambient modules to imported files since they need to be resolved
-                for (var _i = 0, ambientExternalModules_1 = ambientExternalModules; _i < ambientExternalModules_1.length; _i++) {
-                    var decl = ambientExternalModules_1[_i];
-                    importedFiles.push(decl.ref);
-                }
-            }
-            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: undefined };
-        }
-        else {
-            // for global scripts ambient modules still can have augmentations - look for ambient modules with depth > 0
-            var ambientModuleNames = void 0;
-            if (ambientExternalModules) {
-                for (var _a = 0, ambientExternalModules_2 = ambientExternalModules; _a < ambientExternalModules_2.length; _a++) {
-                    var decl = ambientExternalModules_2[_a];
-                    if (decl.depth === 0) {
-                        if (!ambientModuleNames) {
-                            ambientModuleNames = [];
-                        }
-                        ambientModuleNames.push(decl.ref.fileName);
-                    }
-                    else {
-                        importedFiles.push(decl.ref);
-                    }
-                }
-            }
-            return { referencedFiles: referencedFiles, typeReferenceDirectives: typeReferenceDirectives, importedFiles: importedFiles, isLibFile: isNoDefaultLib, ambientExternalModules: ambientModuleNames };
-        }
-    }
-    ts.preProcessFile = preProcessFile;
-    /// Helpers
-    function getTargetLabel(referenceNode, labelName) {
-        while (referenceNode) {
-            if (referenceNode.kind === 214 /* LabeledStatement */ && referenceNode.label.text === labelName) {
-                return referenceNode.label;
-            }
-            referenceNode = referenceNode.parent;
-        }
-        return undefined;
-    }
-    function isJumpStatementTarget(node) {
-        return node.kind === 69 /* Identifier */ &&
-            (node.parent.kind === 210 /* BreakStatement */ || node.parent.kind === 209 /* ContinueStatement */) &&
-            node.parent.label === node;
-    }
-    function isLabelOfLabeledStatement(node) {
-        return node.kind === 69 /* Identifier */ &&
-            node.parent.kind === 214 /* LabeledStatement */ &&
-            node.parent.label === node;
-    }
-    /**
-     * Whether or not a 'node' is preceded by a label of the given string.
-     * Note: 'node' cannot be a SourceFile.
-     */
-    function isLabeledBy(node, labelName) {
-        for (var owner = node.parent; owner.kind === 214 /* LabeledStatement */; owner = owner.parent) {
-            if (owner.label.text === labelName) {
-                return true;
-            }
-        }
-        return false;
-    }
-    function isLabelName(node) {
-        return isLabelOfLabeledStatement(node) || isJumpStatementTarget(node);
-    }
-    function isRightSideOfQualifiedName(node) {
-        return node.parent.kind === 139 /* QualifiedName */ && node.parent.right === node;
-    }
-    function isRightSideOfPropertyAccess(node) {
-        return node && node.parent && node.parent.kind === 172 /* PropertyAccessExpression */ && node.parent.name === node;
-    }
-    function isCallExpressionTarget(node) {
-        if (isRightSideOfPropertyAccess(node)) {
-            node = node.parent;
-        }
-        return node && node.parent && node.parent.kind === 174 /* CallExpression */ && node.parent.expression === node;
-    }
-    function isNewExpressionTarget(node) {
-        if (isRightSideOfPropertyAccess(node)) {
-            node = node.parent;
-        }
-        return node && node.parent && node.parent.kind === 175 /* NewExpression */ && node.parent.expression === node;
-    }
-    function isNameOfModuleDeclaration(node) {
-        return node.parent.kind === 225 /* ModuleDeclaration */ && node.parent.name === node;
-    }
-    function isNameOfFunctionDeclaration(node) {
-        return node.kind === 69 /* Identifier */ &&
-            ts.isFunctionLike(node.parent) && node.parent.name === node;
-    }
-    function isObjectLiteralPropertyDeclaration(node) {
-        switch (node.kind) {
-            case 253 /* PropertyAssignment */:
-            case 254 /* ShorthandPropertyAssignment */:
-            case 147 /* MethodDeclaration */:
-            case 149 /* GetAccessor */:
-            case 150 /* SetAccessor */:
-                return true;
-        }
-        return false;
-    }
-    /**
-     * Returns the containing object literal property declaration given a possible name node, e.g. "a" in x = { "a": 1 }
-     */
-    function getContainingObjectLiteralElement(node) {
-        switch (node.kind) {
-            case 9 /* StringLiteral */:
-            case 8 /* NumericLiteral */:
-                if (node.parent.kind === 140 /* ComputedPropertyName */) {
-                    return isObjectLiteralPropertyDeclaration(node.parent.parent) ? node.parent.parent : undefined;
-                }
-            // intential fall through
-            case 69 /* Identifier */:
-                return isObjectLiteralPropertyDeclaration(node.parent) && node.parent.name === node ? node.parent : undefined;
-        }
-        return undefined;
-    }
-    function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
-        if (node.kind === 9 /* StringLiteral */ || node.kind === 8 /* NumericLiteral */) {
-            switch (node.parent.kind) {
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 253 /* PropertyAssignment */:
-                case 255 /* EnumMember */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 225 /* ModuleDeclaration */:
-                    return node.parent.name === node;
-                case 173 /* ElementAccessExpression */:
-                    return node.parent.argumentExpression === node;
-                case 140 /* ComputedPropertyName */:
-                    return true;
-            }
-        }
-        return false;
-    }
-    function isNameOfExternalModuleImportOrDeclaration(node) {
-        if (node.kind === 9 /* StringLiteral */) {
-            return isNameOfModuleDeclaration(node) ||
-                (ts.isExternalModuleImportEqualsDeclaration(node.parent.parent) && ts.getExternalModuleImportEqualsDeclarationExpression(node.parent.parent) === node);
-        }
-        return false;
-    }
-    /** Returns true if the position is within a comment */
-    function isInsideComment(sourceFile, token, position) {
-        // The position has to be: 1. in the leading trivia (before token.getStart()), and 2. within a comment
-        return position <= token.getStart(sourceFile) &&
-            (isInsideCommentRange(ts.getTrailingCommentRanges(sourceFile.text, token.getFullStart())) ||
-                isInsideCommentRange(ts.getLeadingCommentRanges(sourceFile.text, token.getFullStart())));
-        function isInsideCommentRange(comments) {
-            return ts.forEach(comments, function (comment) {
-                // either we are 1. completely inside the comment, or 2. at the end of the comment
-                if (comment.pos < position && position < comment.end) {
-                    return true;
-                }
-                else if (position === comment.end) {
-                    var text = sourceFile.text;
-                    var width = comment.end - comment.pos;
-                    // is single line comment or just /*
-                    if (width <= 2 || text.charCodeAt(comment.pos + 1) === 47 /* slash */) {
-                        return true;
-                    }
-                    else {
-                        // is unterminated multi-line comment
-                        return !(text.charCodeAt(comment.end - 1) === 47 /* slash */ &&
-                            text.charCodeAt(comment.end - 2) === 42 /* asterisk */);
-                    }
-                }
-                return false;
-            });
-        }
-    }
-    var SemanticMeaning;
-    (function (SemanticMeaning) {
-        SemanticMeaning[SemanticMeaning["None"] = 0] = "None";
-        SemanticMeaning[SemanticMeaning["Value"] = 1] = "Value";
-        SemanticMeaning[SemanticMeaning["Type"] = 2] = "Type";
-        SemanticMeaning[SemanticMeaning["Namespace"] = 4] = "Namespace";
-        SemanticMeaning[SemanticMeaning["All"] = 7] = "All";
-    })(SemanticMeaning || (SemanticMeaning = {}));
-    var BreakContinueSearchType;
-    (function (BreakContinueSearchType) {
-        BreakContinueSearchType[BreakContinueSearchType["None"] = 0] = "None";
-        BreakContinueSearchType[BreakContinueSearchType["Unlabeled"] = 1] = "Unlabeled";
-        BreakContinueSearchType[BreakContinueSearchType["Labeled"] = 2] = "Labeled";
-        BreakContinueSearchType[BreakContinueSearchType["All"] = 3] = "All";
-    })(BreakContinueSearchType || (BreakContinueSearchType = {}));
-    // A cache of completion entries for keywords, these do not change between sessions
-    var keywordCompletions = [];
-    for (var i = 70 /* FirstKeyword */; i <= 138 /* LastKeyword */; i++) {
-        keywordCompletions.push({
-            name: ts.tokenToString(i),
-            kind: ScriptElementKind.keyword,
-            kindModifiers: ScriptElementKindModifier.none,
-            sortText: "0"
-        });
-    }
-    /* @internal */ function getContainerNode(node) {
-        while (true) {
-            node = node.parent;
-            if (!node) {
-                return undefined;
-            }
-            switch (node.kind) {
-                case 256 /* SourceFile */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 221 /* ClassDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 224 /* EnumDeclaration */:
-                case 225 /* ModuleDeclaration */:
-                    return node;
-            }
-        }
-    }
-    ts.getContainerNode = getContainerNode;
-    /* @internal */ function getNodeKind(node) {
-        switch (node.kind) {
-            case 225 /* ModuleDeclaration */: return ScriptElementKind.moduleElement;
-            case 221 /* ClassDeclaration */:
-            case 192 /* ClassExpression */:
-                return ScriptElementKind.classElement;
-            case 222 /* InterfaceDeclaration */: return ScriptElementKind.interfaceElement;
-            case 223 /* TypeAliasDeclaration */: return ScriptElementKind.typeElement;
-            case 224 /* EnumDeclaration */: return ScriptElementKind.enumElement;
-            case 218 /* VariableDeclaration */:
-                return ts.isConst(node)
-                    ? ScriptElementKind.constElement
-                    : ts.isLet(node)
-                        ? ScriptElementKind.letElement
-                        : ScriptElementKind.variableElement;
-            case 220 /* FunctionDeclaration */:
-            case 179 /* FunctionExpression */:
-                return ScriptElementKind.functionElement;
-            case 149 /* GetAccessor */: return ScriptElementKind.memberGetAccessorElement;
-            case 150 /* SetAccessor */: return ScriptElementKind.memberSetAccessorElement;
-            case 147 /* MethodDeclaration */:
-            case 146 /* MethodSignature */:
-                return ScriptElementKind.memberFunctionElement;
-            case 145 /* PropertyDeclaration */:
-            case 144 /* PropertySignature */:
-                return ScriptElementKind.memberVariableElement;
-            case 153 /* IndexSignature */: return ScriptElementKind.indexSignatureElement;
-            case 152 /* ConstructSignature */: return ScriptElementKind.constructSignatureElement;
-            case 151 /* CallSignature */: return ScriptElementKind.callSignatureElement;
-            case 148 /* Constructor */: return ScriptElementKind.constructorImplementationElement;
-            case 141 /* TypeParameter */: return ScriptElementKind.typeParameterElement;
-            case 255 /* EnumMember */: return ScriptElementKind.variableElement;
-            case 142 /* Parameter */: return (node.flags & 92 /* ParameterPropertyModifier */) ? ScriptElementKind.memberVariableElement : ScriptElementKind.parameterElement;
-            case 229 /* ImportEqualsDeclaration */:
-            case 234 /* ImportSpecifier */:
-            case 231 /* ImportClause */:
-            case 238 /* ExportSpecifier */:
-            case 232 /* NamespaceImport */:
-                return ScriptElementKind.alias;
-        }
-        return ScriptElementKind.unknown;
-    }
-    ts.getNodeKind = getNodeKind;
-    var CancellationTokenObject = (function () {
-        function CancellationTokenObject(cancellationToken) {
-            this.cancellationToken = cancellationToken;
-        }
-        CancellationTokenObject.prototype.isCancellationRequested = function () {
-            return this.cancellationToken && this.cancellationToken.isCancellationRequested();
-        };
-        CancellationTokenObject.prototype.throwIfCancellationRequested = function () {
-            if (this.isCancellationRequested()) {
-                throw new ts.OperationCanceledException();
-            }
-        };
-        return CancellationTokenObject;
-    }());
-    function createLanguageService(host, documentRegistry) {
-        if (documentRegistry === void 0) { documentRegistry = createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory()); }
-        var syntaxTreeCache = new SyntaxTreeCache(host);
-        var ruleProvider;
-        var program;
-        var lastProjectVersion;
-        var useCaseSensitivefileNames = false;
-        var cancellationToken = new CancellationTokenObject(host.getCancellationToken && host.getCancellationToken());
-        var currentDirectory = host.getCurrentDirectory();
-        // Check if the localized messages json is set, otherwise query the host for it
-        if (!ts.localizedDiagnosticMessages && host.getLocalizedDiagnosticMessages) {
-            ts.localizedDiagnosticMessages = host.getLocalizedDiagnosticMessages();
-        }
-        function log(message) {
-            if (host.log) {
-                host.log(message);
-            }
-        }
-        var getCanonicalFileName = ts.createGetCanonicalFileName(useCaseSensitivefileNames);
-        function getValidSourceFile(fileName) {
-            var sourceFile = program.getSourceFile(fileName);
-            if (!sourceFile) {
-                throw new Error("Could not find file: '" + fileName + "'.");
-            }
-            return sourceFile;
-        }
-        function getRuleProvider(options) {
-            // Ensure rules are initialized and up to date wrt to formatting options
-            if (!ruleProvider) {
-                ruleProvider = new ts.formatting.RulesProvider();
-            }
-            ruleProvider.ensureUpToDate(options);
-            return ruleProvider;
-        }
-        function synchronizeHostData() {
-            // perform fast check if host supports it
-            if (host.getProjectVersion) {
-                var hostProjectVersion = host.getProjectVersion();
-                if (hostProjectVersion) {
-                    if (lastProjectVersion === hostProjectVersion) {
-                        return;
-                    }
-                    lastProjectVersion = hostProjectVersion;
-                }
-            }
-            // Get a fresh cache of the host information
-            var hostCache = new HostCache(host, getCanonicalFileName);
-            // If the program is already up-to-date, we can reuse it
-            if (programUpToDate()) {
-                return;
-            }
-            // IMPORTANT - It is critical from this moment onward that we do not check
-            // cancellation tokens.  We are about to mutate source files from a previous program
-            // instance.  If we cancel midway through, we may end up in an inconsistent state where
-            // the program points to old source files that have been invalidated because of
-            // incremental parsing.
-            var oldSettings = program && program.getCompilerOptions();
-            var newSettings = hostCache.compilationSettings();
-            var changesInCompilationSettingsAffectSyntax = oldSettings &&
-                (oldSettings.target !== newSettings.target ||
-                    oldSettings.module !== newSettings.module ||
-                    oldSettings.moduleResolution !== newSettings.moduleResolution ||
-                    oldSettings.noResolve !== newSettings.noResolve ||
-                    oldSettings.jsx !== newSettings.jsx ||
-                    oldSettings.allowJs !== newSettings.allowJs ||
-                    oldSettings.disableSizeLimit !== oldSettings.disableSizeLimit);
-            // Now create a new compiler
-            var compilerHost = {
-                getSourceFile: getOrCreateSourceFile,
-                getSourceFileByPath: getOrCreateSourceFileByPath,
-                getCancellationToken: function () { return cancellationToken; },
-                getCanonicalFileName: getCanonicalFileName,
-                useCaseSensitiveFileNames: function () { return useCaseSensitivefileNames; },
-                getNewLine: function () { return ts.getNewLineOrDefaultFromHost(host); },
-                getDefaultLibFileName: function (options) { return host.getDefaultLibFileName(options); },
-                writeFile: function (fileName, data, writeByteOrderMark) { },
-                getCurrentDirectory: function () { return currentDirectory; },
-                fileExists: function (fileName) {
-                    // stub missing host functionality
-                    ts.Debug.assert(!host.resolveModuleNames || !host.resolveTypeReferenceDirectives);
-                    return hostCache.getOrCreateEntry(fileName) !== undefined;
-                },
-                readFile: function (fileName) {
-                    // stub missing host functionality
-                    var entry = hostCache.getOrCreateEntry(fileName);
-                    return entry && entry.scriptSnapshot.getText(0, entry.scriptSnapshot.getLength());
-                },
-                directoryExists: function (directoryName) {
-                    return ts.directoryProbablyExists(directoryName, host);
-                },
-                getDirectories: function (path) {
-                    return host.getDirectories ? host.getDirectories(path) : [];
-                }
-            };
-            if (host.trace) {
-                compilerHost.trace = function (message) { return host.trace(message); };
-            }
-            if (host.resolveModuleNames) {
-                compilerHost.resolveModuleNames = function (moduleNames, containingFile) { return host.resolveModuleNames(moduleNames, containingFile); };
-            }
-            if (host.resolveTypeReferenceDirectives) {
-                compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile) {
-                    return host.resolveTypeReferenceDirectives(typeReferenceDirectiveNames, containingFile);
-                };
-            }
-            var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
-            var newProgram = ts.createProgram(hostCache.getRootFileNames(), newSettings, compilerHost, program);
-            // Release any files we have acquired in the old program but are
-            // not part of the new program.
-            if (program) {
-                var oldSourceFiles = program.getSourceFiles();
-                var oldSettingsKey = documentRegistry.getKeyForCompilationSettings(oldSettings);
-                for (var _i = 0, oldSourceFiles_1 = oldSourceFiles; _i < oldSourceFiles_1.length; _i++) {
-                    var oldSourceFile = oldSourceFiles_1[_i];
-                    if (!newProgram.getSourceFile(oldSourceFile.fileName) || changesInCompilationSettingsAffectSyntax) {
-                        documentRegistry.releaseDocumentWithKey(oldSourceFile.path, oldSettingsKey);
-                    }
-                }
-            }
-            // hostCache is captured in the closure for 'getOrCreateSourceFile' but it should not be used past this point.
-            // It needs to be cleared to allow all collected snapshots to be released
-            hostCache = undefined;
-            program = newProgram;
-            // Make sure all the nodes in the program are both bound, and have their parent
-            // pointers set property.
-            program.getTypeChecker();
-            return;
-            function getOrCreateSourceFile(fileName) {
-                return getOrCreateSourceFileByPath(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName));
-            }
-            function getOrCreateSourceFileByPath(fileName, path) {
-                ts.Debug.assert(hostCache !== undefined);
-                // The program is asking for this file, check first if the host can locate it.
-                // If the host can not locate the file, then it does not exist. return undefined
-                // to the program to allow reporting of errors for missing files.
-                var hostFileInformation = hostCache.getOrCreateEntryByPath(fileName, path);
-                if (!hostFileInformation) {
-                    return undefined;
-                }
-                // Check if the language version has changed since we last created a program; if they are the same,
-                // it is safe to reuse the sourceFiles; if not, then the shape of the AST can change, and the oldSourceFile
-                // can not be reused. we have to dump all syntax trees and create new ones.
-                if (!changesInCompilationSettingsAffectSyntax) {
-                    // Check if the old program had this file already
-                    var oldSourceFile = program && program.getSourceFileByPath(path);
-                    if (oldSourceFile) {
-                        // We already had a source file for this file name.  Go to the registry to
-                        // ensure that we get the right up to date version of it.  We need this to
-                        // address the following race-condition.  Specifically, say we have the following:
-                        //
-                        //      LS1
-                        //          \
-                        //           DocumentRegistry
-                        //          /
-                        //      LS2
-                        //
-                        // Each LS has a reference to file 'foo.ts' at version 1.  LS2 then updates
-                        // it's version of 'foo.ts' to version 2.  This will cause LS2 and the
-                        // DocumentRegistry to have version 2 of the document.  HOwever, LS1 will
-                        // have version 1.  And *importantly* this source file will be *corrupt*.
-                        // The act of creating version 2 of the file irrevocably damages the version
-                        // 1 file.
-                        //
-                        // So, later when we call into LS1, we need to make sure that it doesn't use
-                        // it's source file any more, and instead defers to DocumentRegistry to get
-                        // either version 1, version 2 (or some other version) depending on what the
-                        // host says should be used.
-                        // We do not support the scenario where a host can modify a registered
-                        // file's script kind, i.e. in one project some file is treated as ".ts"
-                        // and in another as ".js"
-                        ts.Debug.assert(hostFileInformation.scriptKind === oldSourceFile.scriptKind, "Registered script kind (" + oldSourceFile.scriptKind + ") should match new script kind (" + hostFileInformation.scriptKind + ") for file: " + path);
-                        return documentRegistry.updateDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
-                    }
-                }
-                // Could not find this file in the old program, create a new SourceFile for it.
-                return documentRegistry.acquireDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
-            }
-            function sourceFileUpToDate(sourceFile) {
-                if (!sourceFile) {
-                    return false;
-                }
-                var path = sourceFile.path || ts.toPath(sourceFile.fileName, currentDirectory, getCanonicalFileName);
-                return sourceFile.version === hostCache.getVersion(path);
-            }
-            function programUpToDate() {
-                // If we haven't create a program yet, then it is not up-to-date
-                if (!program) {
-                    return false;
-                }
-                // If number of files in the program do not match, it is not up-to-date
-                var rootFileNames = hostCache.getRootFileNames();
-                if (program.getSourceFiles().length !== rootFileNames.length) {
-                    return false;
-                }
-                // If any file is not up-to-date, then the whole program is not up-to-date
-                for (var _i = 0, rootFileNames_2 = rootFileNames; _i < rootFileNames_2.length; _i++) {
-                    var fileName = rootFileNames_2[_i];
-                    if (!sourceFileUpToDate(program.getSourceFile(fileName))) {
-                        return false;
-                    }
-                }
-                // If the compilation settings do no match, then the program is not up-to-date
-                return ts.compareDataObjects(program.getCompilerOptions(), hostCache.compilationSettings());
-            }
-        }
-        function getProgram() {
-            synchronizeHostData();
-            return program;
-        }
-        function cleanupSemanticCache() {
-            // TODO: Should we jettison the program (or it's type checker) here?
-        }
-        function dispose() {
-            if (program) {
-                ts.forEach(program.getSourceFiles(), function (f) {
-                    return documentRegistry.releaseDocument(f.fileName, program.getCompilerOptions());
-                });
-            }
-        }
-        /// Diagnostics
-        function getSyntacticDiagnostics(fileName) {
-            synchronizeHostData();
-            return program.getSyntacticDiagnostics(getValidSourceFile(fileName), cancellationToken);
-        }
-        /**
-         * getSemanticDiagnostics return array of Diagnostics. If '-d' is not enabled, only report semantic errors
-         * If '-d' enabled, report both semantic and emitter errors
-         */
-        function getSemanticDiagnostics(fileName) {
-            synchronizeHostData();
-            var targetSourceFile = getValidSourceFile(fileName);
-            // Only perform the action per file regardless of '-out' flag as LanguageServiceHost is expected to call this function per file.
-            // Therefore only get diagnostics for given file.
-            var semanticDiagnostics = program.getSemanticDiagnostics(targetSourceFile, cancellationToken);
-            if (!program.getCompilerOptions().declaration) {
-                return semanticDiagnostics;
-            }
-            // If '-d' is enabled, check for emitter error. One example of emitter error is export class implements non-export interface
-            var declarationDiagnostics = program.getDeclarationDiagnostics(targetSourceFile, cancellationToken);
-            return ts.concatenate(semanticDiagnostics, declarationDiagnostics);
-        }
-        function getCompilerOptionsDiagnostics() {
-            synchronizeHostData();
-            return program.getOptionsDiagnostics(cancellationToken).concat(program.getGlobalDiagnostics(cancellationToken));
-        }
-        /**
-         * Get the name to be display in completion from a given symbol.
-         *
-         * @return undefined if the name is of external module otherwise a name with striped of any quote
-         */
-        function getCompletionEntryDisplayNameForSymbol(symbol, target, performCharacterChecks, location) {
-            var displayName = ts.getDeclaredName(program.getTypeChecker(), symbol, location);
-            if (displayName) {
-                var firstCharCode = displayName.charCodeAt(0);
-                // First check of the displayName is not external module; if it is an external module, it is not valid entry
-                if ((symbol.flags & 1536 /* Namespace */) && (firstCharCode === 39 /* singleQuote */ || firstCharCode === 34 /* doubleQuote */)) {
-                    // If the symbol is external module, don't show it in the completion list
-                    // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there)
-                    return undefined;
-                }
-            }
-            return getCompletionEntryDisplayName(displayName, target, performCharacterChecks);
-        }
-        /**
-         * Get a displayName from a given for completion list, performing any necessary quotes stripping
-         * and checking whether the name is valid identifier name.
-         */
-        function getCompletionEntryDisplayName(name, target, performCharacterChecks) {
-            if (!name) {
-                return undefined;
-            }
-            name = ts.stripQuotes(name);
-            if (!name) {
-                return undefined;
-            }
-            // If the user entered name for the symbol was quoted, removing the quotes is not enough, as the name could be an
-            // invalid identifier name. We need to check if whatever was inside the quotes is actually a valid identifier name.
-            // e.g "b a" is valid quoted name but when we strip off the quotes, it is invalid.
-            // We, thus, need to check if whatever was inside the quotes is actually a valid identifier name.
-            if (performCharacterChecks) {
-                if (!ts.isIdentifier(name, target)) {
-                    return undefined;
-                }
-            }
-            return name;
-        }
-        function getCompletionData(fileName, position) {
-            var typeChecker = program.getTypeChecker();
-            var sourceFile = getValidSourceFile(fileName);
-            var isJavaScriptFile = ts.isSourceFileJavaScript(sourceFile);
-            var isJsDocTagName = false;
-            var start = new Date().getTime();
-            var currentToken = ts.getTokenAtPosition(sourceFile, position);
-            log("getCompletionData: Get current token: " + (new Date().getTime() - start));
-            start = new Date().getTime();
-            // Completion not allowed inside comments, bail out if this is the case
-            var insideComment = isInsideComment(sourceFile, currentToken, position);
-            log("getCompletionData: Is inside comment: " + (new Date().getTime() - start));
-            if (insideComment) {
-                // The current position is next to the '@' sign, when no tag name being provided yet.
-                // Provide a full list of tag names
-                if (ts.hasDocComment(sourceFile, position) && sourceFile.text.charCodeAt(position - 1) === 64 /* at */) {
-                    isJsDocTagName = true;
-                }
-                // Completion should work inside certain JsDoc tags. For example:
-                //     /** @type {number | string} */
-                // Completion should work in the brackets
-                var insideJsDocTagExpression = false;
-                var tag = ts.getJsDocTagAtPosition(sourceFile, position);
-                if (tag) {
-                    if (tag.tagName.pos <= position && position <= tag.tagName.end) {
-                        isJsDocTagName = true;
-                    }
-                    switch (tag.kind) {
-                        case 277 /* JSDocTypeTag */:
-                        case 275 /* JSDocParameterTag */:
-                        case 276 /* JSDocReturnTag */:
-                            var tagWithExpression = tag;
-                            if (tagWithExpression.typeExpression) {
-                                insideJsDocTagExpression = tagWithExpression.typeExpression.pos < position && position < tagWithExpression.typeExpression.end;
-                            }
-                            break;
-                    }
-                }
-                if (isJsDocTagName) {
-                    return { symbols: undefined, isMemberCompletion: false, isNewIdentifierLocation: false, location: undefined, isRightOfDot: false, isJsDocTagName: isJsDocTagName };
-                }
-                if (!insideJsDocTagExpression) {
-                    // Proceed if the current position is in jsDoc tag expression; otherwise it is a normal
-                    // comment or the plain text part of a jsDoc comment, so no completion should be available
-                    log("Returning an empty list because completion was inside a regular comment or plain text part of a JsDoc comment.");
-                    return undefined;
-                }
-            }
-            start = new Date().getTime();
-            var previousToken = ts.findPrecedingToken(position, sourceFile);
-            log("getCompletionData: Get previous token 1: " + (new Date().getTime() - start));
-            // The decision to provide completion depends on the contextToken, which is determined through the previousToken.
-            // Note: 'previousToken' (and thus 'contextToken') can be undefined if we are the beginning of the file
-            var contextToken = previousToken;
-            // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
-            // Skip this partial identifier and adjust the contextToken to the token that precedes it.
-            if (contextToken && position <= contextToken.end && ts.isWord(contextToken.kind)) {
-                var start_5 = new Date().getTime();
-                contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile);
-                log("getCompletionData: Get previous token 2: " + (new Date().getTime() - start_5));
-            }
-            // Find the node where completion is requested on.
-            // Also determine whether we are trying to complete with members of that node
-            // or attributes of a JSX tag.
-            var node = currentToken;
-            var isRightOfDot = false;
-            var isRightOfOpenTag = false;
-            var isStartingCloseTag = false;
-            var location = ts.getTouchingPropertyName(sourceFile, position);
-            if (contextToken) {
-                // Bail out if this is a known invalid completion location
-                if (isCompletionListBlocker(contextToken)) {
-                    log("Returning an empty list because completion was requested in an invalid position.");
-                    return undefined;
-                }
-                var parent_17 = contextToken.parent, kind = contextToken.kind;
-                if (kind === 21 /* DotToken */) {
-                    if (parent_17.kind === 172 /* PropertyAccessExpression */) {
-                        node = contextToken.parent.expression;
-                        isRightOfDot = true;
-                    }
-                    else if (parent_17.kind === 139 /* QualifiedName */) {
-                        node = contextToken.parent.left;
-                        isRightOfDot = true;
-                    }
-                    else {
-                        // There is nothing that precedes the dot, so this likely just a stray character
-                        // or leading into a '...' token. Just bail out instead.
-                        return undefined;
-                    }
-                }
-                else if (sourceFile.languageVariant === 1 /* JSX */) {
-                    if (kind === 25 /* LessThanToken */) {
-                        isRightOfOpenTag = true;
-                        location = contextToken;
-                    }
-                    else if (kind === 39 /* SlashToken */ && contextToken.parent.kind === 245 /* JsxClosingElement */) {
-                        isStartingCloseTag = true;
-                        location = contextToken;
-                    }
-                }
-            }
-            var semanticStart = new Date().getTime();
-            var isMemberCompletion;
-            var isNewIdentifierLocation;
-            var symbols = [];
-            if (isRightOfDot) {
-                getTypeScriptMemberSymbols();
-            }
-            else if (isRightOfOpenTag) {
-                var tagSymbols = typeChecker.getJsxIntrinsicTagNames();
-                if (tryGetGlobalSymbols()) {
-                    symbols = tagSymbols.concat(symbols.filter(function (s) { return !!(s.flags & (107455 /* Value */ | 8388608 /* Alias */)); }));
-                }
-                else {
-                    symbols = tagSymbols;
-                }
-                isMemberCompletion = true;
-                isNewIdentifierLocation = false;
-            }
-            else if (isStartingCloseTag) {
-                var tagName = contextToken.parent.parent.openingElement.tagName;
-                var tagSymbol = typeChecker.getSymbolAtLocation(tagName);
-                if (!typeChecker.isUnknownSymbol(tagSymbol)) {
-                    symbols = [tagSymbol];
-                }
-                isMemberCompletion = true;
-                isNewIdentifierLocation = false;
-            }
-            else {
-                // For JavaScript or TypeScript, if we're not after a dot, then just try to get the
-                // global symbols in scope.  These results should be valid for either language as
-                // the set of symbols that can be referenced from this location.
-                if (!tryGetGlobalSymbols()) {
-                    return undefined;
-                }
-            }
-            log("getCompletionData: Semantic work: " + (new Date().getTime() - semanticStart));
-            return { symbols: symbols, isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, location: location, isRightOfDot: (isRightOfDot || isRightOfOpenTag), isJsDocTagName: isJsDocTagName };
-            function getTypeScriptMemberSymbols() {
-                // Right of dot member completion list
-                isMemberCompletion = true;
-                isNewIdentifierLocation = false;
-                if (node.kind === 69 /* Identifier */ || node.kind === 139 /* QualifiedName */ || node.kind === 172 /* PropertyAccessExpression */) {
-                    var symbol = typeChecker.getSymbolAtLocation(node);
-                    // This is an alias, follow what it aliases
-                    if (symbol && symbol.flags & 8388608 /* Alias */) {
-                        symbol = typeChecker.getAliasedSymbol(symbol);
-                    }
-                    if (symbol && symbol.flags & 1952 /* HasExports */) {
-                        // Extract module or enum members
-                        var exportedSymbols = typeChecker.getExportsOfModule(symbol);
-                        ts.forEach(exportedSymbols, function (symbol) {
-                            if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) {
-                                symbols.push(symbol);
-                            }
-                        });
-                    }
-                }
-                var type = typeChecker.getTypeAtLocation(node);
-                addTypeProperties(type);
-            }
-            function addTypeProperties(type) {
-                if (type) {
-                    // Filter private properties
-                    for (var _i = 0, _a = type.getApparentProperties(); _i < _a.length; _i++) {
-                        var symbol = _a[_i];
-                        if (typeChecker.isValidPropertyAccess((node.parent), symbol.name)) {
-                            symbols.push(symbol);
-                        }
-                    }
-                    if (isJavaScriptFile && type.flags & 16384 /* Union */) {
-                        // In javascript files, for union types, we don't just get the members that
-                        // the individual types have in common, we also include all the members that
-                        // each individual type has.  This is because we're going to add all identifiers
-                        // anyways.  So we might as well elevate the members that were at least part
-                        // of the individual types to a higher status since we know what they are.
-                        var unionType = type;
-                        for (var _b = 0, _c = unionType.types; _b < _c.length; _b++) {
-                            var elementType = _c[_b];
-                            addTypeProperties(elementType);
-                        }
-                    }
-                }
-            }
-            function tryGetGlobalSymbols() {
-                var objectLikeContainer;
-                var namedImportsOrExports;
-                var jsxContainer;
-                if (objectLikeContainer = tryGetObjectLikeCompletionContainer(contextToken)) {
-                    return tryGetObjectLikeCompletionSymbols(objectLikeContainer);
-                }
-                if (namedImportsOrExports = tryGetNamedImportsOrExportsForCompletion(contextToken)) {
-                    // cursor is in an import clause
-                    // try to show exported member for imported module
-                    return tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports);
-                }
-                if (jsxContainer = tryGetContainingJsxElement(contextToken)) {
-                    var attrsType = void 0;
-                    if ((jsxContainer.kind === 242 /* JsxSelfClosingElement */) || (jsxContainer.kind === 243 /* JsxOpeningElement */)) {
-                        // Cursor is inside a JSX self-closing element or opening element
-                        attrsType = typeChecker.getJsxElementAttributesType(jsxContainer);
-                        if (attrsType) {
-                            symbols = filterJsxAttributes(typeChecker.getPropertiesOfType(attrsType), jsxContainer.attributes);
-                            isMemberCompletion = true;
-                            isNewIdentifierLocation = false;
-                            return true;
-                        }
-                    }
-                }
-                // Get all entities in the current scope.
-                isMemberCompletion = false;
-                isNewIdentifierLocation = isNewIdentifierDefinitionLocation(contextToken);
-                if (previousToken !== contextToken) {
-                    ts.Debug.assert(!!previousToken, "Expected 'contextToken' to be defined when different from 'previousToken'.");
-                }
-                // We need to find the node that will give us an appropriate scope to begin
-                // aggregating completion candidates. This is achieved in 'getScopeNode'
-                // by finding the first node that encompasses a position, accounting for whether a node
-                // is "complete" to decide whether a position belongs to the node.
-                //
-                // However, at the end of an identifier, we are interested in the scope of the identifier
-                // itself, but fall outside of the identifier. For instance:
-                //
-                //      xyz => x$
-                //
-                // the cursor is outside of both the 'x' and the arrow function 'xyz => x',
-                // so 'xyz' is not returned in our results.
-                //
-                // We define 'adjustedPosition' so that we may appropriately account for
-                // being at the end of an identifier. The intention is that if requesting completion
-                // at the end of an identifier, it should be effectively equivalent to requesting completion
-                // anywhere inside/at the beginning of the identifier. So in the previous case, the
-                // 'adjustedPosition' will work as if requesting completion in the following:
-                //
-                //      xyz => $x
-                //
-                // If previousToken !== contextToken, then
-                //   - 'contextToken' was adjusted to the token prior to 'previousToken'
-                //      because we were at the end of an identifier.
-                //   - 'previousToken' is defined.
-                var adjustedPosition = previousToken !== contextToken ?
-                    previousToken.getStart() :
-                    position;
-                var scopeNode = getScopeNode(contextToken, adjustedPosition, sourceFile) || sourceFile;
-                /// TODO filter meaning based on the current context
-                var symbolMeanings = 793056 /* Type */ | 107455 /* Value */ | 1536 /* Namespace */ | 8388608 /* Alias */;
-                symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings);
-                return true;
-            }
-            /**
-             * Finds the first node that "embraces" the position, so that one may
-             * accurately aggregate locals from the closest containing scope.
-             */
-            function getScopeNode(initialToken, position, sourceFile) {
-                var scope = initialToken;
-                while (scope && !ts.positionBelongsToNode(scope, position, sourceFile)) {
-                    scope = scope.parent;
-                }
-                return scope;
-            }
-            function isCompletionListBlocker(contextToken) {
-                var start = new Date().getTime();
-                var result = isInStringOrRegularExpressionOrTemplateLiteral(contextToken) ||
-                    isSolelyIdentifierDefinitionLocation(contextToken) ||
-                    isDotOfNumericLiteral(contextToken) ||
-                    isInJsxText(contextToken);
-                log("getCompletionsAtPosition: isCompletionListBlocker: " + (new Date().getTime() - start));
-                return result;
-            }
-            function isInJsxText(contextToken) {
-                if (contextToken.kind === 244 /* JsxText */) {
-                    return true;
-                }
-                if (contextToken.kind === 27 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 243 /* JsxOpeningElement */) {
-                        return true;
-                    }
-                    if (contextToken.parent.kind === 245 /* JsxClosingElement */ || contextToken.parent.kind === 242 /* JsxSelfClosingElement */) {
-                        return contextToken.parent.parent && contextToken.parent.parent.kind === 241 /* JsxElement */;
-                    }
-                }
-                return false;
-            }
-            function isNewIdentifierDefinitionLocation(previousToken) {
-                if (previousToken) {
-                    var containingNodeKind = previousToken.parent.kind;
-                    switch (previousToken.kind) {
-                        case 24 /* CommaToken */:
-                            return containingNodeKind === 174 /* CallExpression */ // func( a, |
-                                || containingNodeKind === 148 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
-                                || containingNodeKind === 175 /* NewExpression */ // new C(a, |
-                                || containingNodeKind === 170 /* ArrayLiteralExpression */ // [a, |
-                                || containingNodeKind === 187 /* BinaryExpression */ // const x = (a, |
-                                || containingNodeKind === 156 /* FunctionType */; // var x: (s: string, list|
-                        case 17 /* OpenParenToken */:
-                            return containingNodeKind === 174 /* CallExpression */ // func( |
-                                || containingNodeKind === 148 /* Constructor */ // constructor( |
-                                || containingNodeKind === 175 /* NewExpression */ // new C(a|
-                                || containingNodeKind === 178 /* ParenthesizedExpression */ // const x = (a|
-                                || containingNodeKind === 164 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
-                        case 19 /* OpenBracketToken */:
-                            return containingNodeKind === 170 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 153 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 140 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
-                        case 125 /* ModuleKeyword */: // module |
-                        case 126 /* NamespaceKeyword */:
-                            return true;
-                        case 21 /* DotToken */:
-                            return containingNodeKind === 225 /* ModuleDeclaration */; // module A.|
-                        case 15 /* OpenBraceToken */:
-                            return containingNodeKind === 221 /* ClassDeclaration */; // class A{ |
-                        case 56 /* EqualsToken */:
-                            return containingNodeKind === 218 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 187 /* BinaryExpression */; // x = a|
-                        case 12 /* TemplateHead */:
-                            return containingNodeKind === 189 /* TemplateExpression */; // `aa ${|
-                        case 13 /* TemplateMiddle */:
-                            return containingNodeKind === 197 /* TemplateSpan */; // `aa ${10} dd ${|
-                        case 112 /* PublicKeyword */:
-                        case 110 /* PrivateKeyword */:
-                        case 111 /* ProtectedKeyword */:
-                            return containingNodeKind === 145 /* PropertyDeclaration */; // class A{ public |
-                    }
-                    // Previous token may have been a keyword that was converted to an identifier.
-                    switch (previousToken.getText()) {
-                        case "public":
-                        case "protected":
-                        case "private":
-                            return true;
-                    }
-                }
-                return false;
-            }
-            function isInStringOrRegularExpressionOrTemplateLiteral(contextToken) {
-                if (contextToken.kind === 9 /* StringLiteral */
-                    || contextToken.kind === 166 /* StringLiteralType */
-                    || contextToken.kind === 10 /* RegularExpressionLiteral */
-                    || ts.isTemplateLiteralKind(contextToken.kind)) {
-                    var start_6 = contextToken.getStart();
-                    var end = contextToken.getEnd();
-                    // To be "in" one of these literals, the position has to be:
-                    //   1. entirely within the token text.
-                    //   2. at the end position of an unterminated token.
-                    //   3. at the end of a regular expression (due to trailing flags like '/foo/g').
-                    if (start_6 < position && position < end) {
-                        return true;
-                    }
-                    if (position === end) {
-                        return !!contextToken.isUnterminated
-                            || contextToken.kind === 10 /* RegularExpressionLiteral */;
-                    }
-                }
-                return false;
-            }
-            /**
-             * Aggregates relevant symbols for completion in object literals and object binding patterns.
-             * Relevant symbols are stored in the captured 'symbols' variable.
-             *
-             * @returns true if 'symbols' was successfully populated; false otherwise.
-             */
-            function tryGetObjectLikeCompletionSymbols(objectLikeContainer) {
-                // We're looking up possible property names from contextual/inferred/declared type.
-                isMemberCompletion = true;
-                var typeForObject;
-                var existingMembers;
-                if (objectLikeContainer.kind === 171 /* ObjectLiteralExpression */) {
-                    // We are completing on contextual types, but may also include properties
-                    // other than those within the declared type.
-                    isNewIdentifierLocation = true;
-                    typeForObject = typeChecker.getContextualType(objectLikeContainer);
-                    existingMembers = objectLikeContainer.properties;
-                }
-                else if (objectLikeContainer.kind === 167 /* ObjectBindingPattern */) {
-                    // We are *only* completing on properties from the type being destructured.
-                    isNewIdentifierLocation = false;
-                    var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
-                    if (ts.isVariableLike(rootDeclaration)) {
-                        // We don't want to complete using the type acquired by the shape
-                        // of the binding pattern; we are only interested in types acquired
-                        // through type declaration or inference.
-                        // Also proceed if rootDeclaration is parameter and if its containing function expression\arrow function is contextually typed -
-                        // type of parameter will flow in from the contextual type of the function
-                        var canGetType = !!(rootDeclaration.initializer || rootDeclaration.type);
-                        if (!canGetType && rootDeclaration.kind === 142 /* Parameter */) {
-                            if (ts.isExpression(rootDeclaration.parent)) {
-                                canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
-                            }
-                            else if (rootDeclaration.parent.kind === 147 /* MethodDeclaration */ || rootDeclaration.parent.kind === 150 /* SetAccessor */) {
-                                canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
-                            }
-                        }
-                        if (canGetType) {
-                            typeForObject = typeChecker.getTypeAtLocation(objectLikeContainer);
-                            existingMembers = objectLikeContainer.elements;
-                        }
-                    }
-                    else {
-                        ts.Debug.fail("Root declaration is not variable-like.");
-                    }
-                }
-                else {
-                    ts.Debug.fail("Expected object literal or binding pattern, got " + objectLikeContainer.kind);
-                }
-                if (!typeForObject) {
-                    return false;
-                }
-                var typeMembers = typeChecker.getPropertiesOfType(typeForObject);
-                if (typeMembers && typeMembers.length > 0) {
-                    // Add filtered items to the completion list
-                    symbols = filterObjectMembersList(typeMembers, existingMembers);
-                }
-                return true;
-            }
-            /**
-             * Aggregates relevant symbols for completion in import clauses and export clauses
-             * whose declarations have a module specifier; for instance, symbols will be aggregated for
-             *
-             *      import { | } from "moduleName";
-             *      export { a as foo, | } from "moduleName";
-             *
-             * but not for
-             *
-             *      export { | };
-             *
-             * Relevant symbols are stored in the captured 'symbols' variable.
-             *
-             * @returns true if 'symbols' was successfully populated; false otherwise.
-             */
-            function tryGetImportOrExportClauseCompletionSymbols(namedImportsOrExports) {
-                var declarationKind = namedImportsOrExports.kind === 233 /* NamedImports */ ?
-                    230 /* ImportDeclaration */ :
-                    236 /* ExportDeclaration */;
-                var importOrExportDeclaration = ts.getAncestor(namedImportsOrExports, declarationKind);
-                var moduleSpecifier = importOrExportDeclaration.moduleSpecifier;
-                if (!moduleSpecifier) {
-                    return false;
-                }
-                isMemberCompletion = true;
-                isNewIdentifierLocation = false;
-                var exports;
-                var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(importOrExportDeclaration.moduleSpecifier);
-                if (moduleSpecifierSymbol) {
-                    exports = typeChecker.getExportsOfModule(moduleSpecifierSymbol);
-                }
-                symbols = exports ? filterNamedImportOrExportCompletionItems(exports, namedImportsOrExports.elements) : emptyArray;
-                return true;
-            }
-            /**
-             * Returns the immediate owning object literal or binding pattern of a context token,
-             * on the condition that one exists and that the context implies completion should be given.
-             */
-            function tryGetObjectLikeCompletionContainer(contextToken) {
-                if (contextToken) {
-                    switch (contextToken.kind) {
-                        case 15 /* OpenBraceToken */: // const x = { |
-                        case 24 /* CommaToken */:
-                            var parent_18 = contextToken.parent;
-                            if (parent_18 && (parent_18.kind === 171 /* ObjectLiteralExpression */ || parent_18.kind === 167 /* ObjectBindingPattern */)) {
-                                return parent_18;
-                            }
-                            break;
-                    }
-                }
-                return undefined;
-            }
-            /**
-             * Returns the containing list of named imports or exports of a context token,
-             * on the condition that one exists and that the context implies completion should be given.
-             */
-            function tryGetNamedImportsOrExportsForCompletion(contextToken) {
-                if (contextToken) {
-                    switch (contextToken.kind) {
-                        case 15 /* OpenBraceToken */: // import { |
-                        case 24 /* CommaToken */:
-                            switch (contextToken.parent.kind) {
-                                case 233 /* NamedImports */:
-                                case 237 /* NamedExports */:
-                                    return contextToken.parent;
-                            }
-                    }
-                }
-                return undefined;
-            }
-            function tryGetContainingJsxElement(contextToken) {
-                if (contextToken) {
-                    var parent_19 = contextToken.parent;
-                    switch (contextToken.kind) {
-                        case 26 /* LessThanSlashToken */:
-                        case 39 /* SlashToken */:
-                        case 69 /* Identifier */:
-                        case 246 /* JsxAttribute */:
-                        case 247 /* JsxSpreadAttribute */:
-                            if (parent_19 && (parent_19.kind === 242 /* JsxSelfClosingElement */ || parent_19.kind === 243 /* JsxOpeningElement */)) {
-                                return parent_19;
-                            }
-                            else if (parent_19.kind === 246 /* JsxAttribute */) {
-                                return parent_19.parent;
-                            }
-                            break;
-                        // The context token is the closing } or " of an attribute, which means
-                        // its parent is a JsxExpression, whose parent is a JsxAttribute,
-                        // whose parent is a JsxOpeningLikeElement
-                        case 9 /* StringLiteral */:
-                            if (parent_19 && ((parent_19.kind === 246 /* JsxAttribute */) || (parent_19.kind === 247 /* JsxSpreadAttribute */))) {
-                                return parent_19.parent;
-                            }
-                            break;
-                        case 16 /* CloseBraceToken */:
-                            if (parent_19 &&
-                                parent_19.kind === 248 /* JsxExpression */ &&
-                                parent_19.parent &&
-                                (parent_19.parent.kind === 246 /* JsxAttribute */)) {
-                                return parent_19.parent.parent;
-                            }
-                            if (parent_19 && parent_19.kind === 247 /* JsxSpreadAttribute */) {
-                                return parent_19.parent;
-                            }
-                            break;
-                    }
-                }
-                return undefined;
-            }
-            function isFunction(kind) {
-                switch (kind) {
-                    case 179 /* FunctionExpression */:
-                    case 180 /* ArrowFunction */:
-                    case 220 /* FunctionDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                    case 151 /* CallSignature */:
-                    case 152 /* ConstructSignature */:
-                    case 153 /* IndexSignature */:
-                        return true;
-                }
-                return false;
-            }
-            /**
-             * @returns true if we are certain that the currently edited location must define a new location; false otherwise.
-             */
-            function isSolelyIdentifierDefinitionLocation(contextToken) {
-                var containingNodeKind = contextToken.parent.kind;
-                switch (contextToken.kind) {
-                    case 24 /* CommaToken */:
-                        return containingNodeKind === 218 /* VariableDeclaration */ ||
-                            containingNodeKind === 219 /* VariableDeclarationList */ ||
-                            containingNodeKind === 200 /* VariableStatement */ ||
-                            containingNodeKind === 224 /* EnumDeclaration */ ||
-                            isFunction(containingNodeKind) ||
-                            containingNodeKind === 221 /* ClassDeclaration */ ||
-                            containingNodeKind === 192 /* ClassExpression */ ||
-                            containingNodeKind === 222 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 168 /* ArrayBindingPattern */ ||
-                            containingNodeKind === 223 /* TypeAliasDeclaration */; // type Map, K, |
-                    case 21 /* DotToken */:
-                        return containingNodeKind === 168 /* ArrayBindingPattern */; // var [.|
-                    case 54 /* ColonToken */:
-                        return containingNodeKind === 169 /* BindingElement */; // var {x :html|
-                    case 19 /* OpenBracketToken */:
-                        return containingNodeKind === 168 /* ArrayBindingPattern */; // var [x|
-                    case 17 /* OpenParenToken */:
-                        return containingNodeKind === 252 /* CatchClause */ ||
-                            isFunction(containingNodeKind);
-                    case 15 /* OpenBraceToken */:
-                        return containingNodeKind === 224 /* EnumDeclaration */ ||
-                            containingNodeKind === 222 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 159 /* TypeLiteral */; // const x : { |
-                    case 23 /* SemicolonToken */:
-                        return containingNodeKind === 144 /* PropertySignature */ &&
-                            contextToken.parent && contextToken.parent.parent &&
-                            (contextToken.parent.parent.kind === 222 /* InterfaceDeclaration */ ||
-                                contextToken.parent.parent.kind === 159 /* TypeLiteral */); // const x : { a; |
-                    case 25 /* LessThanToken */:
-                        return containingNodeKind === 221 /* ClassDeclaration */ ||
-                            containingNodeKind === 192 /* ClassExpression */ ||
-                            containingNodeKind === 222 /* InterfaceDeclaration */ ||
-                            containingNodeKind === 223 /* TypeAliasDeclaration */ ||
-                            isFunction(containingNodeKind);
-                    case 113 /* StaticKeyword */:
-                        return containingNodeKind === 145 /* PropertyDeclaration */;
-                    case 22 /* DotDotDotToken */:
-                        return containingNodeKind === 142 /* Parameter */ ||
-                            (contextToken.parent && contextToken.parent.parent &&
-                                contextToken.parent.parent.kind === 168 /* ArrayBindingPattern */); // var [...z|
-                    case 112 /* PublicKeyword */:
-                    case 110 /* PrivateKeyword */:
-                    case 111 /* ProtectedKeyword */:
-                        return containingNodeKind === 142 /* Parameter */;
-                    case 116 /* AsKeyword */:
-                        return containingNodeKind === 234 /* ImportSpecifier */ ||
-                            containingNodeKind === 238 /* ExportSpecifier */ ||
-                            containingNodeKind === 232 /* NamespaceImport */;
-                    case 73 /* ClassKeyword */:
-                    case 81 /* EnumKeyword */:
-                    case 107 /* InterfaceKeyword */:
-                    case 87 /* FunctionKeyword */:
-                    case 102 /* VarKeyword */:
-                    case 123 /* GetKeyword */:
-                    case 131 /* SetKeyword */:
-                    case 89 /* ImportKeyword */:
-                    case 108 /* LetKeyword */:
-                    case 74 /* ConstKeyword */:
-                    case 114 /* YieldKeyword */:
-                    case 134 /* TypeKeyword */:
-                        return true;
-                }
-                // Previous token may have been a keyword that was converted to an identifier.
-                switch (contextToken.getText()) {
-                    case "abstract":
-                    case "async":
-                    case "class":
-                    case "const":
-                    case "declare":
-                    case "enum":
-                    case "function":
-                    case "interface":
-                    case "let":
-                    case "private":
-                    case "protected":
-                    case "public":
-                    case "static":
-                    case "var":
-                    case "yield":
-                        return true;
-                }
-                return false;
-            }
-            function isDotOfNumericLiteral(contextToken) {
-                if (contextToken.kind === 8 /* NumericLiteral */) {
-                    var text = contextToken.getFullText();
-                    return text.charAt(text.length - 1) === ".";
-                }
-                return false;
-            }
-            /**
-             * Filters out completion suggestions for named imports or exports.
-             *
-             * @param exportsOfModule          The list of symbols which a module exposes.
-             * @param namedImportsOrExports    The list of existing import/export specifiers in the import/export clause.
-             *
-             * @returns Symbols to be suggested at an import/export clause, barring those whose named imports/exports
-             *          do not occur at the current position and have not otherwise been typed.
-             */
-            function filterNamedImportOrExportCompletionItems(exportsOfModule, namedImportsOrExports) {
-                var existingImportsOrExports = {};
-                for (var _i = 0, namedImportsOrExports_1 = namedImportsOrExports; _i < namedImportsOrExports_1.length; _i++) {
-                    var element = namedImportsOrExports_1[_i];
-                    // If this is the current item we are editing right now, do not filter it out
-                    if (element.getStart() <= position && position <= element.getEnd()) {
-                        continue;
-                    }
-                    var name_41 = element.propertyName || element.name;
-                    existingImportsOrExports[name_41.text] = true;
-                }
-                if (ts.isEmpty(existingImportsOrExports)) {
-                    return ts.filter(exportsOfModule, function (e) { return e.name !== "default"; });
-                }
-                return ts.filter(exportsOfModule, function (e) { return e.name !== "default" && !ts.lookUp(existingImportsOrExports, e.name); });
-            }
-            /**
-             * Filters out completion suggestions for named imports or exports.
-             *
-             * @returns Symbols to be suggested in an object binding pattern or object literal expression, barring those whose declarations
-             *          do not occur at the current position and have not otherwise been typed.
-             */
-            function filterObjectMembersList(contextualMemberSymbols, existingMembers) {
-                if (!existingMembers || existingMembers.length === 0) {
-                    return contextualMemberSymbols;
-                }
-                var existingMemberNames = {};
-                for (var _i = 0, existingMembers_1 = existingMembers; _i < existingMembers_1.length; _i++) {
-                    var m = existingMembers_1[_i];
-                    // Ignore omitted expressions for missing members
-                    if (m.kind !== 253 /* PropertyAssignment */ &&
-                        m.kind !== 254 /* ShorthandPropertyAssignment */ &&
-                        m.kind !== 169 /* BindingElement */ &&
-                        m.kind !== 147 /* MethodDeclaration */) {
-                        continue;
-                    }
-                    // If this is the current item we are editing right now, do not filter it out
-                    if (m.getStart() <= position && position <= m.getEnd()) {
-                        continue;
-                    }
-                    var existingName = void 0;
-                    if (m.kind === 169 /* BindingElement */ && m.propertyName) {
-                        // include only identifiers in completion list
-                        if (m.propertyName.kind === 69 /* Identifier */) {
-                            existingName = m.propertyName.text;
-                        }
-                    }
-                    else {
-                        // TODO(jfreeman): Account for computed property name
-                        // NOTE: if one only performs this step when m.name is an identifier,
-                        // things like '__proto__' are not filtered out.
-                        existingName = m.name.text;
-                    }
-                    existingMemberNames[existingName] = true;
-                }
-                return ts.filter(contextualMemberSymbols, function (m) { return !ts.lookUp(existingMemberNames, m.name); });
-            }
-            /**
-             * Filters out completion suggestions from 'symbols' according to existing JSX attributes.
-             *
-             * @returns Symbols to be suggested in a JSX element, barring those whose attributes
-             *          do not occur at the current position and have not otherwise been typed.
-             */
-            function filterJsxAttributes(symbols, attributes) {
-                var seenNames = {};
-                for (var _i = 0, attributes_1 = attributes; _i < attributes_1.length; _i++) {
-                    var attr = attributes_1[_i];
-                    // If this is the current item we are editing right now, do not filter it out
-                    if (attr.getStart() <= position && position <= attr.getEnd()) {
-                        continue;
-                    }
-                    if (attr.kind === 246 /* JsxAttribute */) {
-                        seenNames[attr.name.text] = true;
-                    }
-                }
-                return ts.filter(symbols, function (a) { return !ts.lookUp(seenNames, a.name); });
-            }
-        }
-        function getCompletionsAtPosition(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            if (ts.isInString(sourceFile, position)) {
-                return getStringLiteralCompletionEntries(sourceFile, position);
-            }
-            var completionData = getCompletionData(fileName, position);
-            if (!completionData) {
-                return undefined;
-            }
-            var symbols = completionData.symbols, isMemberCompletion = completionData.isMemberCompletion, isNewIdentifierLocation = completionData.isNewIdentifierLocation, location = completionData.location, isJsDocTagName = completionData.isJsDocTagName;
-            if (isJsDocTagName) {
-                // If the current position is a jsDoc tag name, only tag names should be provided for completion
-                return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: getAllJsDocCompletionEntries() };
-            }
-            var entries = [];
-            if (ts.isSourceFileJavaScript(sourceFile)) {
-                var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, location, /*performCharacterChecks*/ false);
-                ts.addRange(entries, getJavaScriptCompletionEntries(sourceFile, location.pos, uniqueNames));
-            }
-            else {
-                if (!symbols || symbols.length === 0) {
-                    if (sourceFile.languageVariant === 1 /* JSX */ &&
-                        location.parent && location.parent.kind === 245 /* JsxClosingElement */) {
-                        // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
-                        // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
-                        // For example:
-                        //     var x = <div> </ /*1*/>  completion list at "1" will contain "div" with type any
-                        var tagName = location.parent.parent.openingElement.tagName;
-                        entries.push({
-                            name: tagName.text,
-                            kind: undefined,
-                            kindModifiers: undefined,
-                            sortText: "0"
-                        });
-                    }
-                    else {
-                        return undefined;
-                    }
-                }
-                getCompletionEntriesFromSymbols(symbols, entries, location, /*performCharacterChecks*/ true);
-            }
-            // Add keywords if this is not a member completion list
-            if (!isMemberCompletion && !isJsDocTagName) {
-                ts.addRange(entries, keywordCompletions);
-            }
-            return { isMemberCompletion: isMemberCompletion, isNewIdentifierLocation: isNewIdentifierLocation, entries: entries };
-            function getJavaScriptCompletionEntries(sourceFile, position, uniqueNames) {
-                var entries = [];
-                var target = program.getCompilerOptions().target;
-                var nameTable = getNameTable(sourceFile);
-                for (var name_42 in nameTable) {
-                    // Skip identifiers produced only from the current location
-                    if (nameTable[name_42] === position) {
-                        continue;
-                    }
-                    if (!uniqueNames[name_42]) {
-                        uniqueNames[name_42] = name_42;
-                        var displayName = getCompletionEntryDisplayName(ts.unescapeIdentifier(name_42), target, /*performCharacterChecks*/ true);
-                        if (displayName) {
-                            var entry = {
-                                name: displayName,
-                                kind: ScriptElementKind.warning,
-                                kindModifiers: "",
-                                sortText: "1"
-                            };
-                            entries.push(entry);
-                        }
-                    }
-                }
-                return entries;
-            }
-            function getAllJsDocCompletionEntries() {
-                return jsDocCompletionEntries || (jsDocCompletionEntries = ts.map(jsDocTagNames, function (tagName) {
-                    return {
-                        name: tagName,
-                        kind: ScriptElementKind.keyword,
-                        kindModifiers: "",
-                        sortText: "0"
-                    };
-                }));
-            }
-            function createCompletionEntry(symbol, location, performCharacterChecks) {
-                // Try to get a valid display name for this symbol, if we could not find one, then ignore it.
-                // We would like to only show things that can be added after a dot, so for instance numeric properties can
-                // not be accessed with a dot (a.1 <- invalid)
-                var displayName = getCompletionEntryDisplayNameForSymbol(symbol, program.getCompilerOptions().target, performCharacterChecks, location);
-                if (!displayName) {
-                    return undefined;
-                }
-                // TODO(drosen): Right now we just permit *all* semantic meanings when calling
-                // 'getSymbolKind' which is permissible given that it is backwards compatible; but
-                // really we should consider passing the meaning for the node so that we don't report
-                // that a suggestion for a value is an interface.  We COULD also just do what
-                // 'getSymbolModifiers' does, which is to use the first declaration.
-                // Use a 'sortText' of 0' so that all symbol completion entries come before any other
-                // entries (like JavaScript identifier entries).
-                return {
-                    name: displayName,
-                    kind: getSymbolKind(symbol, location),
-                    kindModifiers: getSymbolModifiers(symbol),
-                    sortText: "0"
-                };
-            }
-            function getCompletionEntriesFromSymbols(symbols, entries, location, performCharacterChecks) {
-                var start = new Date().getTime();
-                var uniqueNames = {};
-                if (symbols) {
-                    for (var _i = 0, symbols_4 = symbols; _i < symbols_4.length; _i++) {
-                        var symbol = symbols_4[_i];
-                        var entry = createCompletionEntry(symbol, location, performCharacterChecks);
-                        if (entry) {
-                            var id = ts.escapeIdentifier(entry.name);
-                            if (!ts.lookUp(uniqueNames, id)) {
-                                entries.push(entry);
-                                uniqueNames[id] = id;
-                            }
-                        }
-                    }
-                }
-                log("getCompletionsAtPosition: getCompletionEntriesFromSymbols: " + (new Date().getTime() - start));
-                return uniqueNames;
-            }
-            function getStringLiteralCompletionEntries(sourceFile, position) {
-                var node = ts.findPrecedingToken(position, sourceFile);
-                if (!node || node.kind !== 9 /* StringLiteral */) {
-                    return undefined;
-                }
-                var argumentInfo = ts.SignatureHelp.getContainingArgumentInfo(node, position, sourceFile);
-                if (argumentInfo) {
-                    // Get string literal completions from specialized signatures of the target
-                    return getStringLiteralCompletionEntriesFromCallExpression(argumentInfo);
-                }
-                else if (ts.isElementAccessExpression(node.parent) && node.parent.argumentExpression === node) {
-                    // Get all names of properties on the expression
-                    return getStringLiteralCompletionEntriesFromElementAccess(node.parent);
-                }
-                else {
-                    // Otherwise, get the completions from the contextual type if one exists
-                    return getStringLiteralCompletionEntriesFromContextualType(node);
-                }
-            }
-            function getStringLiteralCompletionEntriesFromCallExpression(argumentInfo) {
-                var typeChecker = program.getTypeChecker();
-                var candidates = [];
-                var entries = [];
-                typeChecker.getResolvedSignature(argumentInfo.invocation, candidates);
-                for (var _i = 0, candidates_3 = candidates; _i < candidates_3.length; _i++) {
-                    var candidate = candidates_3[_i];
-                    if (candidate.parameters.length > argumentInfo.argumentIndex) {
-                        var parameter = candidate.parameters[argumentInfo.argumentIndex];
-                        addStringLiteralCompletionsFromType(typeChecker.getTypeAtLocation(parameter.valueDeclaration), entries);
-                    }
-                }
-                if (entries.length) {
-                    return { isMemberCompletion: false, isNewIdentifierLocation: true, entries: entries };
-                }
-                return undefined;
-            }
-            function getStringLiteralCompletionEntriesFromElementAccess(node) {
-                var typeChecker = program.getTypeChecker();
-                var type = typeChecker.getTypeAtLocation(node.expression);
-                var entries = [];
-                if (type) {
-                    getCompletionEntriesFromSymbols(type.getApparentProperties(), entries, node, /*performCharacterChecks*/ false);
-                    if (entries.length) {
-                        return { isMemberCompletion: true, isNewIdentifierLocation: true, entries: entries };
-                    }
-                }
-                return undefined;
-            }
-            function getStringLiteralCompletionEntriesFromContextualType(node) {
-                var typeChecker = program.getTypeChecker();
-                var type = typeChecker.getContextualType(node);
-                if (type) {
-                    var entries_2 = [];
-                    addStringLiteralCompletionsFromType(type, entries_2);
-                    if (entries_2.length) {
-                        return { isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries_2 };
-                    }
-                }
-                return undefined;
-            }
-            function addStringLiteralCompletionsFromType(type, result) {
-                if (!type) {
-                    return;
-                }
-                if (type.flags & 16384 /* Union */) {
-                    ts.forEach(type.types, function (t) { return addStringLiteralCompletionsFromType(t, result); });
-                }
-                else {
-                    if (type.flags & 256 /* StringLiteral */) {
-                        result.push({
-                            name: type.text,
-                            kindModifiers: ScriptElementKindModifier.none,
-                            kind: ScriptElementKind.variableElement,
-                            sortText: "0"
-                        });
-                    }
-                }
-            }
-        }
-        function getCompletionEntryDetails(fileName, position, entryName) {
-            synchronizeHostData();
-            // Compute all the completion symbols again.
-            var completionData = getCompletionData(fileName, position);
-            if (completionData) {
-                var symbols = completionData.symbols, location_2 = completionData.location;
-                // Find the symbol with the matching entry name.
-                var target_2 = program.getCompilerOptions().target;
-                // We don't need to perform character checks here because we're only comparing the
-                // name against 'entryName' (which is known to be good), not building a new
-                // completion entry.
-                var symbol = ts.forEach(symbols, function (s) { return getCompletionEntryDisplayNameForSymbol(s, target_2, /*performCharacterChecks*/ false, location_2) === entryName ? s : undefined; });
-                if (symbol) {
-                    var _a = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, getValidSourceFile(fileName), location_2, location_2, 7 /* All */), displayParts = _a.displayParts, documentation = _a.documentation, symbolKind = _a.symbolKind;
-                    return {
-                        name: entryName,
-                        kindModifiers: getSymbolModifiers(symbol),
-                        kind: symbolKind,
-                        displayParts: displayParts,
-                        documentation: documentation
-                    };
-                }
-            }
-            // Didn't find a symbol with this name.  See if we can find a keyword instead.
-            var keywordCompletion = ts.forEach(keywordCompletions, function (c) { return c.name === entryName; });
-            if (keywordCompletion) {
-                return {
-                    name: entryName,
-                    kind: ScriptElementKind.keyword,
-                    kindModifiers: ScriptElementKindModifier.none,
-                    displayParts: [ts.displayPart(entryName, SymbolDisplayPartKind.keyword)],
-                    documentation: undefined
-                };
-            }
-            return undefined;
-        }
-        // TODO(drosen): use contextual SemanticMeaning.
-        function getSymbolKind(symbol, location) {
-            var flags = symbol.getFlags();
-            if (flags & 32 /* Class */)
-                return ts.getDeclarationOfKind(symbol, 192 /* ClassExpression */) ?
-                    ScriptElementKind.localClassElement : ScriptElementKind.classElement;
-            if (flags & 384 /* Enum */)
-                return ScriptElementKind.enumElement;
-            if (flags & 524288 /* TypeAlias */)
-                return ScriptElementKind.typeElement;
-            if (flags & 64 /* Interface */)
-                return ScriptElementKind.interfaceElement;
-            if (flags & 262144 /* TypeParameter */)
-                return ScriptElementKind.typeParameterElement;
-            var result = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location);
-            if (result === ScriptElementKind.unknown) {
-                if (flags & 262144 /* TypeParameter */)
-                    return ScriptElementKind.typeParameterElement;
-                if (flags & 8 /* EnumMember */)
-                    return ScriptElementKind.variableElement;
-                if (flags & 8388608 /* Alias */)
-                    return ScriptElementKind.alias;
-                if (flags & 1536 /* Module */)
-                    return ScriptElementKind.moduleElement;
-            }
-            return result;
-        }
-        function getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, flags, location) {
-            var typeChecker = program.getTypeChecker();
-            if (typeChecker.isUndefinedSymbol(symbol)) {
-                return ScriptElementKind.variableElement;
-            }
-            if (typeChecker.isArgumentsSymbol(symbol)) {
-                return ScriptElementKind.localVariableElement;
-            }
-            if (location.kind === 97 /* ThisKeyword */ && ts.isExpression(location)) {
-                return ScriptElementKind.parameterElement;
-            }
-            if (flags & 3 /* Variable */) {
-                if (ts.isFirstDeclarationOfSymbolParameter(symbol)) {
-                    return ScriptElementKind.parameterElement;
-                }
-                else if (symbol.valueDeclaration && ts.isConst(symbol.valueDeclaration)) {
-                    return ScriptElementKind.constElement;
-                }
-                else if (ts.forEach(symbol.declarations, ts.isLet)) {
-                    return ScriptElementKind.letElement;
-                }
-                return isLocalVariableOrFunction(symbol) ? ScriptElementKind.localVariableElement : ScriptElementKind.variableElement;
-            }
-            if (flags & 16 /* Function */)
-                return isLocalVariableOrFunction(symbol) ? ScriptElementKind.localFunctionElement : ScriptElementKind.functionElement;
-            if (flags & 32768 /* GetAccessor */)
-                return ScriptElementKind.memberGetAccessorElement;
-            if (flags & 65536 /* SetAccessor */)
-                return ScriptElementKind.memberSetAccessorElement;
-            if (flags & 8192 /* Method */)
-                return ScriptElementKind.memberFunctionElement;
-            if (flags & 16384 /* Constructor */)
-                return ScriptElementKind.constructorImplementationElement;
-            if (flags & 4 /* Property */) {
-                if (flags & 268435456 /* SyntheticProperty */) {
-                    // If union property is result of union of non method (property/accessors/variables), it is labeled as property
-                    var unionPropertyKind = ts.forEach(typeChecker.getRootSymbols(symbol), function (rootSymbol) {
-                        var rootSymbolFlags = rootSymbol.getFlags();
-                        if (rootSymbolFlags & (98308 /* PropertyOrAccessor */ | 3 /* Variable */)) {
-                            return ScriptElementKind.memberVariableElement;
-                        }
-                        ts.Debug.assert(!!(rootSymbolFlags & 8192 /* Method */));
-                    });
-                    if (!unionPropertyKind) {
-                        // If this was union of all methods,
-                        // make sure it has call signatures before we can label it as method
-                        var typeOfUnionProperty = typeChecker.getTypeOfSymbolAtLocation(symbol, location);
-                        if (typeOfUnionProperty.getCallSignatures().length) {
-                            return ScriptElementKind.memberFunctionElement;
-                        }
-                        return ScriptElementKind.memberVariableElement;
-                    }
-                    return unionPropertyKind;
-                }
-                return ScriptElementKind.memberVariableElement;
-            }
-            return ScriptElementKind.unknown;
-        }
-        function getSymbolModifiers(symbol) {
-            return symbol && symbol.declarations && symbol.declarations.length > 0
-                ? ts.getNodeModifiers(symbol.declarations[0])
-                : ScriptElementKindModifier.none;
-        }
-        // TODO(drosen): Currently completion entry details passes the SemanticMeaning.All instead of using semanticMeaning of location
-        function getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, enclosingDeclaration, location, semanticMeaning) {
-            if (semanticMeaning === void 0) { semanticMeaning = getMeaningFromLocation(location); }
-            var typeChecker = program.getTypeChecker();
-            var displayParts = [];
-            var documentation;
-            var symbolFlags = symbol.flags;
-            var symbolKind = getSymbolKindOfConstructorPropertyMethodAccessorFunctionOrVar(symbol, symbolFlags, location);
-            var hasAddedSymbolInfo;
-            var isThisExpression = location.kind === 97 /* ThisKeyword */ && ts.isExpression(location);
-            var type;
-            // Class at constructor site need to be shown as constructor apart from property,method, vars
-            if (symbolKind !== ScriptElementKind.unknown || symbolFlags & 32 /* Class */ || symbolFlags & 8388608 /* Alias */) {
-                // If it is accessor they are allowed only if location is at name of the accessor
-                if (symbolKind === ScriptElementKind.memberGetAccessorElement || symbolKind === ScriptElementKind.memberSetAccessorElement) {
-                    symbolKind = ScriptElementKind.memberVariableElement;
-                }
-                var signature = void 0;
-                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
-                if (type) {
-                    if (location.parent && location.parent.kind === 172 /* PropertyAccessExpression */) {
-                        var right = location.parent.name;
-                        // Either the location is on the right of a property access, or on the left and the right is missing
-                        if (right === location || (right && right.getFullWidth() === 0)) {
-                            location = location.parent;
-                        }
-                    }
-                    // try get the call/construct signature from the type if it matches
-                    var callExpression = void 0;
-                    if (location.kind === 174 /* CallExpression */ || location.kind === 175 /* NewExpression */) {
-                        callExpression = location;
-                    }
-                    else if (isCallExpressionTarget(location) || isNewExpressionTarget(location)) {
-                        callExpression = location.parent;
-                    }
-                    if (callExpression) {
-                        var candidateSignatures = [];
-                        signature = typeChecker.getResolvedSignature(callExpression, candidateSignatures);
-                        if (!signature && candidateSignatures.length) {
-                            // Use the first candidate:
-                            signature = candidateSignatures[0];
-                        }
-                        var useConstructSignatures = callExpression.kind === 175 /* NewExpression */ || callExpression.expression.kind === 95 /* SuperKeyword */;
-                        var allSignatures = useConstructSignatures ? type.getConstructSignatures() : type.getCallSignatures();
-                        if (!ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
-                            // Get the first signature if there is one -- allSignatures may contain
-                            // either the original signature or its target, so check for either
-                            signature = allSignatures.length ? allSignatures[0] : undefined;
-                        }
-                        if (signature) {
-                            if (useConstructSignatures && (symbolFlags & 32 /* Class */)) {
-                                // Constructor
-                                symbolKind = ScriptElementKind.constructorImplementationElement;
-                                addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
-                            }
-                            else if (symbolFlags & 8388608 /* Alias */) {
-                                symbolKind = ScriptElementKind.alias;
-                                pushTypePart(symbolKind);
-                                displayParts.push(ts.spacePart());
-                                if (useConstructSignatures) {
-                                    displayParts.push(ts.keywordPart(92 /* NewKeyword */));
-                                    displayParts.push(ts.spacePart());
-                                }
-                                addFullSymbolName(symbol);
-                            }
-                            else {
-                                addPrefixForAnyFunctionOrVar(symbol, symbolKind);
-                            }
-                            switch (symbolKind) {
-                                case ScriptElementKind.memberVariableElement:
-                                case ScriptElementKind.variableElement:
-                                case ScriptElementKind.constElement:
-                                case ScriptElementKind.letElement:
-                                case ScriptElementKind.parameterElement:
-                                case ScriptElementKind.localVariableElement:
-                                    // If it is call or construct signature of lambda's write type name
-                                    displayParts.push(ts.punctuationPart(54 /* ColonToken */));
-                                    displayParts.push(ts.spacePart());
-                                    if (useConstructSignatures) {
-                                        displayParts.push(ts.keywordPart(92 /* NewKeyword */));
-                                        displayParts.push(ts.spacePart());
-                                    }
-                                    if (!(type.flags & 65536 /* Anonymous */) && type.symbol) {
-                                        ts.addRange(displayParts, ts.symbolToDisplayParts(typeChecker, type.symbol, enclosingDeclaration, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */));
-                                    }
-                                    addSignatureDisplayParts(signature, allSignatures, 8 /* WriteArrowStyleSignature */);
-                                    break;
-                                default:
-                                    // Just signature
-                                    addSignatureDisplayParts(signature, allSignatures);
-                            }
-                            hasAddedSymbolInfo = true;
-                        }
-                    }
-                    else if ((isNameOfFunctionDeclaration(location) && !(symbol.flags & 98304 /* Accessor */)) ||
-                        (location.kind === 121 /* ConstructorKeyword */ && location.parent.kind === 148 /* Constructor */)) {
-                        // get the signature from the declaration and write it
-                        var functionDeclaration = location.parent;
-                        var allSignatures = functionDeclaration.kind === 148 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
-                        if (!typeChecker.isImplementationOfOverload(functionDeclaration)) {
-                            signature = typeChecker.getSignatureFromDeclaration(functionDeclaration);
-                        }
-                        else {
-                            signature = allSignatures[0];
-                        }
-                        if (functionDeclaration.kind === 148 /* Constructor */) {
-                            // show (constructor) Type(...) signature
-                            symbolKind = ScriptElementKind.constructorImplementationElement;
-                            addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
-                        }
-                        else {
-                            // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration.kind === 151 /* CallSignature */ &&
-                                !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
-                        }
-                        addSignatureDisplayParts(signature, allSignatures);
-                        hasAddedSymbolInfo = true;
-                    }
-                }
-            }
-            if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
-                if (ts.getDeclarationOfKind(symbol, 192 /* ClassExpression */)) {
-                    // Special case for class expressions because we would like to indicate that
-                    // the class name is local to the class body (similar to function expression)
-                    //      (local class) class <className>
-                    pushTypePart(ScriptElementKind.localClassElement);
-                }
-                else {
-                    // Class declaration has name which is not local.
-                    displayParts.push(ts.keywordPart(73 /* ClassKeyword */));
-                }
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-                writeTypeParametersOfSymbol(symbol, sourceFile);
-            }
-            if ((symbolFlags & 64 /* Interface */) && (semanticMeaning & 2 /* Type */)) {
-                addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(107 /* InterfaceKeyword */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-                writeTypeParametersOfSymbol(symbol, sourceFile);
-            }
-            if (symbolFlags & 524288 /* TypeAlias */) {
-                addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(134 /* TypeKeyword */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-                writeTypeParametersOfSymbol(symbol, sourceFile);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.operatorPart(56 /* EqualsToken */));
-                displayParts.push(ts.spacePart());
-                ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, typeChecker.getDeclaredTypeOfSymbol(symbol), enclosingDeclaration));
-            }
-            if (symbolFlags & 384 /* Enum */) {
-                addNewLineIfDisplayPartsExist();
-                if (ts.forEach(symbol.declarations, ts.isConstEnumDeclaration)) {
-                    displayParts.push(ts.keywordPart(74 /* ConstKeyword */));
-                    displayParts.push(ts.spacePart());
-                }
-                displayParts.push(ts.keywordPart(81 /* EnumKeyword */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-            }
-            if (symbolFlags & 1536 /* Module */) {
-                addNewLineIfDisplayPartsExist();
-                var declaration = ts.getDeclarationOfKind(symbol, 225 /* ModuleDeclaration */);
-                var isNamespace = declaration && declaration.name && declaration.name.kind === 69 /* Identifier */;
-                displayParts.push(ts.keywordPart(isNamespace ? 126 /* NamespaceKeyword */ : 125 /* ModuleKeyword */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-            }
-            if ((symbolFlags & 262144 /* TypeParameter */) && (semanticMeaning & 2 /* Type */)) {
-                addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
-                displayParts.push(ts.textPart("type parameter"));
-                displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-                displayParts.push(ts.spacePart());
-                displayParts.push(ts.keywordPart(90 /* InKeyword */));
-                displayParts.push(ts.spacePart());
-                if (symbol.parent) {
-                    // Class/Interface type parameter
-                    addFullSymbolName(symbol.parent, enclosingDeclaration);
-                    writeTypeParametersOfSymbol(symbol.parent, enclosingDeclaration);
-                }
-                else {
-                    // Method/function type parameter
-                    var declaration = ts.getDeclarationOfKind(symbol, 141 /* TypeParameter */);
-                    ts.Debug.assert(declaration !== undefined);
-                    declaration = declaration.parent;
-                    if (declaration) {
-                        if (ts.isFunctionLikeKind(declaration.kind)) {
-                            var signature = typeChecker.getSignatureFromDeclaration(declaration);
-                            if (declaration.kind === 152 /* ConstructSignature */) {
-                                displayParts.push(ts.keywordPart(92 /* NewKeyword */));
-                                displayParts.push(ts.spacePart());
-                            }
-                            else if (declaration.kind !== 151 /* CallSignature */ && declaration.name) {
-                                addFullSymbolName(declaration.symbol);
-                            }
-                            ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
-                        }
-                        else {
-                            // Type alias type parameter
-                            // For example
-                            //      type list<T> = T[];  // Both T will go through same code path
-                            displayParts.push(ts.keywordPart(134 /* TypeKeyword */));
-                            displayParts.push(ts.spacePart());
-                            addFullSymbolName(declaration.symbol);
-                            writeTypeParametersOfSymbol(declaration.symbol, sourceFile);
-                        }
-                    }
-                }
-            }
-            if (symbolFlags & 8 /* EnumMember */) {
-                addPrefixForAnyFunctionOrVar(symbol, "enum member");
-                var declaration = symbol.declarations[0];
-                if (declaration.kind === 255 /* EnumMember */) {
-                    var constantValue = typeChecker.getConstantValue(declaration);
-                    if (constantValue !== undefined) {
-                        displayParts.push(ts.spacePart());
-                        displayParts.push(ts.operatorPart(56 /* EqualsToken */));
-                        displayParts.push(ts.spacePart());
-                        displayParts.push(ts.displayPart(constantValue.toString(), SymbolDisplayPartKind.numericLiteral));
-                    }
-                }
-            }
-            if (symbolFlags & 8388608 /* Alias */) {
-                addNewLineIfDisplayPartsExist();
-                displayParts.push(ts.keywordPart(89 /* ImportKeyword */));
-                displayParts.push(ts.spacePart());
-                addFullSymbolName(symbol);
-                ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 229 /* ImportEqualsDeclaration */) {
-                        var importEqualsDeclaration = declaration;
-                        if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
-                            displayParts.push(ts.spacePart());
-                            displayParts.push(ts.operatorPart(56 /* EqualsToken */));
-                            displayParts.push(ts.spacePart());
-                            displayParts.push(ts.keywordPart(129 /* RequireKeyword */));
-                            displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
-                            displayParts.push(ts.displayPart(ts.getTextOfNode(ts.getExternalModuleImportEqualsDeclarationExpression(importEqualsDeclaration)), SymbolDisplayPartKind.stringLiteral));
-                            displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
-                        }
-                        else {
-                            var internalAliasSymbol = typeChecker.getSymbolAtLocation(importEqualsDeclaration.moduleReference);
-                            if (internalAliasSymbol) {
-                                displayParts.push(ts.spacePart());
-                                displayParts.push(ts.operatorPart(56 /* EqualsToken */));
-                                displayParts.push(ts.spacePart());
-                                addFullSymbolName(internalAliasSymbol, enclosingDeclaration);
-                            }
-                        }
-                        return true;
-                    }
-                });
-            }
-            if (!hasAddedSymbolInfo) {
-                if (symbolKind !== ScriptElementKind.unknown) {
-                    if (type) {
-                        if (isThisExpression) {
-                            addNewLineIfDisplayPartsExist();
-                            displayParts.push(ts.keywordPart(97 /* ThisKeyword */));
-                        }
-                        else {
-                            addPrefixForAnyFunctionOrVar(symbol, symbolKind);
-                        }
-                        // For properties, variables and local vars: show the type
-                        if (symbolKind === ScriptElementKind.memberVariableElement ||
-                            symbolFlags & 3 /* Variable */ ||
-                            symbolKind === ScriptElementKind.localVariableElement ||
-                            isThisExpression) {
-                            displayParts.push(ts.punctuationPart(54 /* ColonToken */));
-                            displayParts.push(ts.spacePart());
-                            // If the type is type parameter, format it specially
-                            if (type.symbol && type.symbol.flags & 262144 /* TypeParameter */) {
-                                var typeParameterParts = ts.mapToDisplayParts(function (writer) {
-                                    typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplay(type, writer, enclosingDeclaration);
-                                });
-                                ts.addRange(displayParts, typeParameterParts);
-                            }
-                            else {
-                                ts.addRange(displayParts, ts.typeToDisplayParts(typeChecker, type, enclosingDeclaration));
-                            }
-                        }
-                        else if (symbolFlags & 16 /* Function */ ||
-                            symbolFlags & 8192 /* Method */ ||
-                            symbolFlags & 16384 /* Constructor */ ||
-                            symbolFlags & 131072 /* Signature */ ||
-                            symbolFlags & 98304 /* Accessor */ ||
-                            symbolKind === ScriptElementKind.memberFunctionElement) {
-                            var allSignatures = type.getNonNullableType().getCallSignatures();
-                            addSignatureDisplayParts(allSignatures[0], allSignatures);
-                        }
-                    }
-                }
-                else {
-                    symbolKind = getSymbolKind(symbol, location);
-                }
-            }
-            if (!documentation) {
-                documentation = symbol.getDocumentationComment();
-            }
-            return { displayParts: displayParts, documentation: documentation, symbolKind: symbolKind };
-            function addNewLineIfDisplayPartsExist() {
-                if (displayParts.length) {
-                    displayParts.push(ts.lineBreakPart());
-                }
-            }
-            function addFullSymbolName(symbol, enclosingDeclaration) {
-                var fullSymbolDisplayParts = ts.symbolToDisplayParts(typeChecker, symbol, enclosingDeclaration || sourceFile, /*meaning*/ undefined, 1 /* WriteTypeParametersOrArguments */ | 2 /* UseOnlyExternalAliasing */);
-                ts.addRange(displayParts, fullSymbolDisplayParts);
-            }
-            function addPrefixForAnyFunctionOrVar(symbol, symbolKind) {
-                addNewLineIfDisplayPartsExist();
-                if (symbolKind) {
-                    pushTypePart(symbolKind);
-                    displayParts.push(ts.spacePart());
-                    addFullSymbolName(symbol);
-                }
-            }
-            function pushTypePart(symbolKind) {
-                switch (symbolKind) {
-                    case ScriptElementKind.variableElement:
-                    case ScriptElementKind.functionElement:
-                    case ScriptElementKind.letElement:
-                    case ScriptElementKind.constElement:
-                    case ScriptElementKind.constructorImplementationElement:
-                        displayParts.push(ts.textOrKeywordPart(symbolKind));
-                        return;
-                    default:
-                        displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
-                        displayParts.push(ts.textOrKeywordPart(symbolKind));
-                        displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
-                        return;
-                }
-            }
-            function addSignatureDisplayParts(signature, allSignatures, flags) {
-                ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, enclosingDeclaration, flags | 32 /* WriteTypeArgumentsOfSignature */));
-                if (allSignatures.length > 1) {
-                    displayParts.push(ts.spacePart());
-                    displayParts.push(ts.punctuationPart(17 /* OpenParenToken */));
-                    displayParts.push(ts.operatorPart(35 /* PlusToken */));
-                    displayParts.push(ts.displayPart((allSignatures.length - 1).toString(), SymbolDisplayPartKind.numericLiteral));
-                    displayParts.push(ts.spacePart());
-                    displayParts.push(ts.textPart(allSignatures.length === 2 ? "overload" : "overloads"));
-                    displayParts.push(ts.punctuationPart(18 /* CloseParenToken */));
-                }
-                documentation = signature.getDocumentationComment();
-            }
-            function writeTypeParametersOfSymbol(symbol, enclosingDeclaration) {
-                var typeParameterParts = ts.mapToDisplayParts(function (writer) {
-                    typeChecker.getSymbolDisplayBuilder().buildTypeParameterDisplayFromSymbol(symbol, writer, enclosingDeclaration);
-                });
-                ts.addRange(displayParts, typeParameterParts);
-            }
-        }
-        function getQuickInfoAtPosition(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var node = ts.getTouchingPropertyName(sourceFile, position);
-            if (node === sourceFile) {
-                return undefined;
-            }
-            if (isLabelName(node)) {
-                return undefined;
-            }
-            var typeChecker = program.getTypeChecker();
-            var symbol = typeChecker.getSymbolAtLocation(node);
-            if (!symbol || typeChecker.isUnknownSymbol(symbol)) {
-                // Try getting just type at this position and show
-                switch (node.kind) {
-                    case 69 /* Identifier */:
-                    case 172 /* PropertyAccessExpression */:
-                    case 139 /* QualifiedName */:
-                    case 97 /* ThisKeyword */:
-                    case 165 /* ThisType */:
-                    case 95 /* SuperKeyword */:
-                        // For the identifiers/this/super etc get the type at position
-                        var type = typeChecker.getTypeAtLocation(node);
-                        if (type) {
-                            return {
-                                kind: ScriptElementKind.unknown,
-                                kindModifiers: ScriptElementKindModifier.none,
-                                textSpan: ts.createTextSpan(node.getStart(), node.getWidth()),
-                                displayParts: ts.typeToDisplayParts(typeChecker, type, getContainerNode(node)),
-                                documentation: type.symbol ? type.symbol.getDocumentationComment() : undefined
-                            };
-                        }
-                }
-                return undefined;
-            }
-            var displayPartsDocumentationsAndKind = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, sourceFile, getContainerNode(node), node);
-            return {
-                kind: displayPartsDocumentationsAndKind.symbolKind,
-                kindModifiers: getSymbolModifiers(symbol),
-                textSpan: ts.createTextSpan(node.getStart(), node.getWidth()),
-                displayParts: displayPartsDocumentationsAndKind.displayParts,
-                documentation: displayPartsDocumentationsAndKind.documentation
-            };
-        }
-        function createDefinitionInfo(node, symbolKind, symbolName, containerName) {
-            return {
-                fileName: node.getSourceFile().fileName,
-                textSpan: ts.createTextSpanFromBounds(node.getStart(), node.getEnd()),
-                kind: symbolKind,
-                name: symbolName,
-                containerKind: undefined,
-                containerName: containerName
-            };
-        }
-        function getDefinitionFromSymbol(symbol, node) {
-            var typeChecker = program.getTypeChecker();
-            var result = [];
-            var declarations = symbol.getDeclarations();
-            var symbolName = typeChecker.symbolToString(symbol); // Do not get scoped name, just the name of the symbol
-            var symbolKind = getSymbolKind(symbol, node);
-            var containerSymbol = symbol.parent;
-            var containerName = containerSymbol ? typeChecker.symbolToString(containerSymbol, node) : "";
-            if (!tryAddConstructSignature(symbol, node, symbolKind, symbolName, containerName, result) &&
-                !tryAddCallSignature(symbol, node, symbolKind, symbolName, containerName, result)) {
-                // Just add all the declarations.
-                ts.forEach(declarations, function (declaration) {
-                    result.push(createDefinitionInfo(declaration, symbolKind, symbolName, containerName));
-                });
-            }
-            return result;
-            function tryAddConstructSignature(symbol, location, symbolKind, symbolName, containerName, result) {
-                // Applicable only if we are in a new expression, or we are on a constructor declaration
-                // and in either case the symbol has a construct signature definition, i.e. class
-                if (isNewExpressionTarget(location) || location.kind === 121 /* ConstructorKeyword */) {
-                    if (symbol.flags & 32 /* Class */) {
-                        // Find the first class-like declaration and try to get the construct signature.
-                        for (var _i = 0, _a = symbol.getDeclarations(); _i < _a.length; _i++) {
-                            var declaration = _a[_i];
-                            if (ts.isClassLike(declaration)) {
-                                return tryAddSignature(declaration.members, 
-                                /*selectConstructors*/ true, symbolKind, symbolName, containerName, result);
-                            }
-                        }
-                        ts.Debug.fail("Expected declaration to have at least one class-like declaration");
-                    }
-                }
-                return false;
-            }
-            function tryAddCallSignature(symbol, location, symbolKind, symbolName, containerName, result) {
-                if (isCallExpressionTarget(location) || isNewExpressionTarget(location) || isNameOfFunctionDeclaration(location)) {
-                    return tryAddSignature(symbol.declarations, /*selectConstructors*/ false, symbolKind, symbolName, containerName, result);
-                }
-                return false;
-            }
-            function tryAddSignature(signatureDeclarations, selectConstructors, symbolKind, symbolName, containerName, result) {
-                var declarations = [];
-                var definition;
-                ts.forEach(signatureDeclarations, function (d) {
-                    if ((selectConstructors && d.kind === 148 /* Constructor */) ||
-                        (!selectConstructors && (d.kind === 220 /* FunctionDeclaration */ || d.kind === 147 /* MethodDeclaration */ || d.kind === 146 /* MethodSignature */))) {
-                        declarations.push(d);
-                        if (d.body)
-                            definition = d;
-                    }
-                });
-                if (definition) {
-                    result.push(createDefinitionInfo(definition, symbolKind, symbolName, containerName));
-                    return true;
-                }
-                else if (declarations.length) {
-                    result.push(createDefinitionInfo(ts.lastOrUndefined(declarations), symbolKind, symbolName, containerName));
-                    return true;
-                }
-                return false;
-            }
-        }
-        function findReferenceInPosition(refs, pos) {
-            for (var _i = 0, refs_1 = refs; _i < refs_1.length; _i++) {
-                var ref = refs_1[_i];
-                if (ref.pos <= pos && pos < ref.end) {
-                    return ref;
-                }
-            }
-            return undefined;
-        }
-        function getDefinitionInfoForFileReference(name, targetFileName) {
-            return {
-                fileName: targetFileName,
-                textSpan: ts.createTextSpanFromBounds(0, 0),
-                kind: ScriptElementKind.scriptElement,
-                name: name,
-                containerName: undefined,
-                containerKind: undefined
-            };
-        }
-        /// Goto definition
-        function getDefinitionAtPosition(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            /// Triple slash reference comments
-            var comment = findReferenceInPosition(sourceFile.referencedFiles, position);
-            if (comment) {
-                var referenceFile = ts.tryResolveScriptReference(program, sourceFile, comment);
-                if (referenceFile) {
-                    return [getDefinitionInfoForFileReference(comment.fileName, referenceFile.fileName)];
-                }
-                return undefined;
-            }
-            // Type reference directives
-            var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
-            if (typeReferenceDirective) {
-                var referenceFile = ts.lookUp(program.getResolvedTypeReferenceDirectives(), typeReferenceDirective.fileName);
-                if (referenceFile && referenceFile.resolvedFileName) {
-                    return [getDefinitionInfoForFileReference(typeReferenceDirective.fileName, referenceFile.resolvedFileName)];
-                }
-                return undefined;
-            }
-            var node = ts.getTouchingPropertyName(sourceFile, position);
-            if (node === sourceFile) {
-                return undefined;
-            }
-            // Labels
-            if (isJumpStatementTarget(node)) {
-                var labelName = node.text;
-                var label = getTargetLabel(node.parent, node.text);
-                return label ? [createDefinitionInfo(label, ScriptElementKind.label, labelName, /*containerName*/ undefined)] : undefined;
-            }
-            var typeChecker = program.getTypeChecker();
-            var symbol = typeChecker.getSymbolAtLocation(node);
-            // Could not find a symbol e.g. node is string or number keyword,
-            // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
-            if (!symbol) {
-                return undefined;
-            }
-            // If this is an alias, and the request came at the declaration location
-            // get the aliased symbol instead. This allows for goto def on an import e.g.
-            //   import {A, B} from "mod";
-            // to jump to the implementation directly.
-            if (symbol.flags & 8388608 /* Alias */) {
-                var declaration = symbol.declarations[0];
-                // Go to the original declaration for cases:
-                //
-                //   (1) when the aliased symbol was declared in the location(parent).
-                //   (2) when the aliased symbol is originating from a named import.
-                //
-                if (node.kind === 69 /* Identifier */ &&
-                    (node.parent === declaration ||
-                        (declaration.kind === 234 /* ImportSpecifier */ && declaration.parent && declaration.parent.kind === 233 /* NamedImports */))) {
-                    symbol = typeChecker.getAliasedSymbol(symbol);
-                }
-            }
-            // Because name in short-hand property assignment has two different meanings: property name and property value,
-            // using go-to-definition at such position should go to the variable declaration of the property value rather than
-            // go to the declaration of the property name (in this case stay at the same position). However, if go-to-definition
-            // is performed at the location of property access, we would like to go to definition of the property in the short-hand
-            // assignment. This case and others are handled by the following code.
-            if (node.parent.kind === 254 /* ShorthandPropertyAssignment */) {
-                var shorthandSymbol = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-                if (!shorthandSymbol) {
-                    return [];
-                }
-                var shorthandDeclarations = shorthandSymbol.getDeclarations();
-                var shorthandSymbolKind_1 = getSymbolKind(shorthandSymbol, node);
-                var shorthandSymbolName_1 = typeChecker.symbolToString(shorthandSymbol);
-                var shorthandContainerName_1 = typeChecker.symbolToString(symbol.parent, node);
-                return ts.map(shorthandDeclarations, function (declaration) { return createDefinitionInfo(declaration, shorthandSymbolKind_1, shorthandSymbolName_1, shorthandContainerName_1); });
-            }
-            return getDefinitionFromSymbol(symbol, node);
-        }
-        /// Goto type
-        function getTypeDefinitionAtPosition(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var node = ts.getTouchingPropertyName(sourceFile, position);
-            if (node === sourceFile) {
-                return undefined;
-            }
-            var typeChecker = program.getTypeChecker();
-            var symbol = typeChecker.getSymbolAtLocation(node);
-            if (!symbol) {
-                return undefined;
-            }
-            var type = typeChecker.getTypeOfSymbolAtLocation(symbol, node);
-            if (!type) {
-                return undefined;
-            }
-            if (type.flags & 16384 /* Union */) {
-                var result_3 = [];
-                ts.forEach(type.types, function (t) {
-                    if (t.symbol) {
-                        ts.addRange(/*to*/ result_3, /*from*/ getDefinitionFromSymbol(t.symbol, node));
-                    }
-                });
-                return result_3;
-            }
-            if (!type.symbol) {
-                return undefined;
-            }
-            return getDefinitionFromSymbol(type.symbol, node);
-        }
-        function getOccurrencesAtPosition(fileName, position) {
-            var results = getOccurrencesAtPositionCore(fileName, position);
-            if (results) {
-                var sourceFile_1 = getCanonicalFileName(ts.normalizeSlashes(fileName));
-                // Get occurrences only supports reporting occurrences for the file queried.  So
-                // filter down to that list.
-                results = ts.filter(results, function (r) { return getCanonicalFileName(ts.normalizeSlashes(r.fileName)) === sourceFile_1; });
-            }
-            return results;
-        }
-        function getDocumentHighlights(fileName, position, filesToSearch) {
-            synchronizeHostData();
-            var sourceFilesToSearch = ts.map(filesToSearch, function (f) { return program.getSourceFile(f); });
-            var sourceFile = getValidSourceFile(fileName);
-            var node = ts.getTouchingWord(sourceFile, position);
-            if (!node) {
-                return undefined;
-            }
-            return getSemanticDocumentHighlights(node) || getSyntacticDocumentHighlights(node);
-            function getHighlightSpanForNode(node) {
-                var start = node.getStart();
-                var end = node.getEnd();
-                return {
-                    fileName: sourceFile.fileName,
-                    textSpan: ts.createTextSpanFromBounds(start, end),
-                    kind: HighlightSpanKind.none
-                };
-            }
-            function getSemanticDocumentHighlights(node) {
-                if (node.kind === 69 /* Identifier */ ||
-                    node.kind === 97 /* ThisKeyword */ ||
-                    node.kind === 165 /* ThisType */ ||
-                    node.kind === 95 /* SuperKeyword */ ||
-                    node.kind === 9 /* StringLiteral */ ||
-                    isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
-                    var referencedSymbols = getReferencedSymbolsForNode(node, sourceFilesToSearch, /*findInStrings*/ false, /*findInComments*/ false);
-                    return convertReferencedSymbols(referencedSymbols);
-                }
-                return undefined;
-                function convertReferencedSymbols(referencedSymbols) {
-                    if (!referencedSymbols) {
-                        return undefined;
-                    }
-                    var fileNameToDocumentHighlights = {};
-                    var result = [];
-                    for (var _i = 0, referencedSymbols_1 = referencedSymbols; _i < referencedSymbols_1.length; _i++) {
-                        var referencedSymbol = referencedSymbols_1[_i];
-                        for (var _a = 0, _b = referencedSymbol.references; _a < _b.length; _a++) {
-                            var referenceEntry = _b[_a];
-                            var fileName_1 = referenceEntry.fileName;
-                            var documentHighlights = ts.getProperty(fileNameToDocumentHighlights, fileName_1);
-                            if (!documentHighlights) {
-                                documentHighlights = { fileName: fileName_1, highlightSpans: [] };
-                                fileNameToDocumentHighlights[fileName_1] = documentHighlights;
-                                result.push(documentHighlights);
-                            }
-                            documentHighlights.highlightSpans.push({
-                                textSpan: referenceEntry.textSpan,
-                                kind: referenceEntry.isWriteAccess ? HighlightSpanKind.writtenReference : HighlightSpanKind.reference
-                            });
-                        }
-                    }
-                    return result;
-                }
-            }
-            function getSyntacticDocumentHighlights(node) {
-                var fileName = sourceFile.fileName;
-                var highlightSpans = getHighlightSpans(node);
-                if (!highlightSpans || highlightSpans.length === 0) {
-                    return undefined;
-                }
-                return [{ fileName: fileName, highlightSpans: highlightSpans }];
-                // returns true if 'node' is defined and has a matching 'kind'.
-                function hasKind(node, kind) {
-                    return node !== undefined && node.kind === kind;
-                }
-                // Null-propagating 'parent' function.
-                function parent(node) {
-                    return node && node.parent;
-                }
-                function getHighlightSpans(node) {
-                    if (node) {
-                        switch (node.kind) {
-                            case 88 /* IfKeyword */:
-                            case 80 /* ElseKeyword */:
-                                if (hasKind(node.parent, 203 /* IfStatement */)) {
-                                    return getIfElseOccurrences(node.parent);
-                                }
-                                break;
-                            case 94 /* ReturnKeyword */:
-                                if (hasKind(node.parent, 211 /* ReturnStatement */)) {
-                                    return getReturnOccurrences(node.parent);
-                                }
-                                break;
-                            case 98 /* ThrowKeyword */:
-                                if (hasKind(node.parent, 215 /* ThrowStatement */)) {
-                                    return getThrowOccurrences(node.parent);
-                                }
-                                break;
-                            case 72 /* CatchKeyword */:
-                                if (hasKind(parent(parent(node)), 216 /* TryStatement */)) {
-                                    return getTryCatchFinallyOccurrences(node.parent.parent);
-                                }
-                                break;
-                            case 100 /* TryKeyword */:
-                            case 85 /* FinallyKeyword */:
-                                if (hasKind(parent(node), 216 /* TryStatement */)) {
-                                    return getTryCatchFinallyOccurrences(node.parent);
-                                }
-                                break;
-                            case 96 /* SwitchKeyword */:
-                                if (hasKind(node.parent, 213 /* SwitchStatement */)) {
-                                    return getSwitchCaseDefaultOccurrences(node.parent);
-                                }
-                                break;
-                            case 71 /* CaseKeyword */:
-                            case 77 /* DefaultKeyword */:
-                                if (hasKind(parent(parent(parent(node))), 213 /* SwitchStatement */)) {
-                                    return getSwitchCaseDefaultOccurrences(node.parent.parent.parent);
-                                }
-                                break;
-                            case 70 /* BreakKeyword */:
-                            case 75 /* ContinueKeyword */:
-                                if (hasKind(node.parent, 210 /* BreakStatement */) || hasKind(node.parent, 209 /* ContinueStatement */)) {
-                                    return getBreakOrContinueStatementOccurrences(node.parent);
-                                }
-                                break;
-                            case 86 /* ForKeyword */:
-                                if (hasKind(node.parent, 206 /* ForStatement */) ||
-                                    hasKind(node.parent, 207 /* ForInStatement */) ||
-                                    hasKind(node.parent, 208 /* ForOfStatement */)) {
-                                    return getLoopBreakContinueOccurrences(node.parent);
-                                }
-                                break;
-                            case 104 /* WhileKeyword */:
-                            case 79 /* DoKeyword */:
-                                if (hasKind(node.parent, 205 /* WhileStatement */) || hasKind(node.parent, 204 /* DoStatement */)) {
-                                    return getLoopBreakContinueOccurrences(node.parent);
-                                }
-                                break;
-                            case 121 /* ConstructorKeyword */:
-                                if (hasKind(node.parent, 148 /* Constructor */)) {
-                                    return getConstructorOccurrences(node.parent);
-                                }
-                                break;
-                            case 123 /* GetKeyword */:
-                            case 131 /* SetKeyword */:
-                                if (hasKind(node.parent, 149 /* GetAccessor */) || hasKind(node.parent, 150 /* SetAccessor */)) {
-                                    return getGetAndSetOccurrences(node.parent);
-                                }
-                                break;
-                            default:
-                                if (ts.isModifierKind(node.kind) && node.parent &&
-                                    (ts.isDeclaration(node.parent) || node.parent.kind === 200 /* VariableStatement */)) {
-                                    return getModifierOccurrences(node.kind, node.parent);
-                                }
-                        }
-                    }
-                    return undefined;
-                }
-                /**
-                 * Aggregates all throw-statements within this node *without* crossing
-                 * into function boundaries and try-blocks with catch-clauses.
-                 */
-                function aggregateOwnedThrowStatements(node) {
-                    var statementAccumulator = [];
-                    aggregate(node);
-                    return statementAccumulator;
-                    function aggregate(node) {
-                        if (node.kind === 215 /* ThrowStatement */) {
-                            statementAccumulator.push(node);
-                        }
-                        else if (node.kind === 216 /* TryStatement */) {
-                            var tryStatement = node;
-                            if (tryStatement.catchClause) {
-                                aggregate(tryStatement.catchClause);
-                            }
-                            else {
-                                // Exceptions thrown within a try block lacking a catch clause
-                                // are "owned" in the current context.
-                                aggregate(tryStatement.tryBlock);
-                            }
-                            if (tryStatement.finallyBlock) {
-                                aggregate(tryStatement.finallyBlock);
-                            }
-                        }
-                        else if (!ts.isFunctionLike(node)) {
-                            ts.forEachChild(node, aggregate);
-                        }
-                    }
-                }
-                /**
-                 * For lack of a better name, this function takes a throw statement and returns the
-                 * nearest ancestor that is a try-block (whose try statement has a catch clause),
-                 * function-block, or source file.
-                 */
-                function getThrowStatementOwner(throwStatement) {
-                    var child = throwStatement;
-                    while (child.parent) {
-                        var parent_20 = child.parent;
-                        if (ts.isFunctionBlock(parent_20) || parent_20.kind === 256 /* SourceFile */) {
-                            return parent_20;
-                        }
-                        // A throw-statement is only owned by a try-statement if the try-statement has
-                        // a catch clause, and if the throw-statement occurs within the try block.
-                        if (parent_20.kind === 216 /* TryStatement */) {
-                            var tryStatement = parent_20;
-                            if (tryStatement.tryBlock === child && tryStatement.catchClause) {
-                                return child;
-                            }
-                        }
-                        child = parent_20;
-                    }
-                    return undefined;
-                }
-                function aggregateAllBreakAndContinueStatements(node) {
-                    var statementAccumulator = [];
-                    aggregate(node);
-                    return statementAccumulator;
-                    function aggregate(node) {
-                        if (node.kind === 210 /* BreakStatement */ || node.kind === 209 /* ContinueStatement */) {
-                            statementAccumulator.push(node);
-                        }
-                        else if (!ts.isFunctionLike(node)) {
-                            ts.forEachChild(node, aggregate);
-                        }
-                    }
-                }
-                function ownsBreakOrContinueStatement(owner, statement) {
-                    var actualOwner = getBreakOrContinueOwner(statement);
-                    return actualOwner && actualOwner === owner;
-                }
-                function getBreakOrContinueOwner(statement) {
-                    for (var node_1 = statement.parent; node_1; node_1 = node_1.parent) {
-                        switch (node_1.kind) {
-                            case 213 /* SwitchStatement */:
-                                if (statement.kind === 209 /* ContinueStatement */) {
-                                    continue;
-                                }
-                            // Fall through.
-                            case 206 /* ForStatement */:
-                            case 207 /* ForInStatement */:
-                            case 208 /* ForOfStatement */:
-                            case 205 /* WhileStatement */:
-                            case 204 /* DoStatement */:
-                                if (!statement.label || isLabeledBy(node_1, statement.label.text)) {
-                                    return node_1;
-                                }
-                                break;
-                            default:
-                                // Don't cross function boundaries.
-                                if (ts.isFunctionLike(node_1)) {
-                                    return undefined;
-                                }
-                                break;
-                        }
-                    }
-                    return undefined;
-                }
-                function getModifierOccurrences(modifier, declaration) {
-                    var container = declaration.parent;
-                    // Make sure we only highlight the keyword when it makes sense to do so.
-                    if (ts.isAccessibilityModifier(modifier)) {
-                        if (!(container.kind === 221 /* ClassDeclaration */ ||
-                            container.kind === 192 /* ClassExpression */ ||
-                            (declaration.kind === 142 /* Parameter */ && hasKind(container, 148 /* Constructor */)))) {
-                            return undefined;
-                        }
-                    }
-                    else if (modifier === 113 /* StaticKeyword */) {
-                        if (!(container.kind === 221 /* ClassDeclaration */ || container.kind === 192 /* ClassExpression */)) {
-                            return undefined;
-                        }
-                    }
-                    else if (modifier === 82 /* ExportKeyword */ || modifier === 122 /* DeclareKeyword */) {
-                        if (!(container.kind === 226 /* ModuleBlock */ || container.kind === 256 /* SourceFile */)) {
-                            return undefined;
-                        }
-                    }
-                    else if (modifier === 115 /* AbstractKeyword */) {
-                        if (!(container.kind === 221 /* ClassDeclaration */ || declaration.kind === 221 /* ClassDeclaration */)) {
-                            return undefined;
-                        }
-                    }
-                    else {
-                        // unsupported modifier
-                        return undefined;
-                    }
-                    var keywords = [];
-                    var modifierFlag = getFlagFromModifier(modifier);
-                    var nodes;
-                    switch (container.kind) {
-                        case 226 /* ModuleBlock */:
-                        case 256 /* SourceFile */:
-                            // Container is either a class declaration or the declaration is a classDeclaration
-                            if (modifierFlag & 128 /* Abstract */) {
-                                nodes = declaration.members.concat(declaration);
-                            }
-                            else {
-                                nodes = container.statements;
-                            }
-                            break;
-                        case 148 /* Constructor */:
-                            nodes = container.parameters.concat(container.parent.members);
-                            break;
-                        case 221 /* ClassDeclaration */:
-                        case 192 /* ClassExpression */:
-                            nodes = container.members;
-                            // If we're an accessibility modifier, we're in an instance member and should search
-                            // the constructor's parameter list for instance members as well.
-                            if (modifierFlag & 28 /* AccessibilityModifier */) {
-                                var constructor = ts.forEach(container.members, function (member) {
-                                    return member.kind === 148 /* Constructor */ && member;
-                                });
-                                if (constructor) {
-                                    nodes = nodes.concat(constructor.parameters);
-                                }
-                            }
-                            else if (modifierFlag & 128 /* Abstract */) {
-                                nodes = nodes.concat(container);
-                            }
-                            break;
-                        default:
-                            ts.Debug.fail("Invalid container kind.");
-                    }
-                    ts.forEach(nodes, function (node) {
-                        if (node.modifiers && node.flags & modifierFlag) {
-                            ts.forEach(node.modifiers, function (child) { return pushKeywordIf(keywords, child, modifier); });
-                        }
-                    });
-                    return ts.map(keywords, getHighlightSpanForNode);
-                    function getFlagFromModifier(modifier) {
-                        switch (modifier) {
-                            case 112 /* PublicKeyword */:
-                                return 4 /* Public */;
-                            case 110 /* PrivateKeyword */:
-                                return 8 /* Private */;
-                            case 111 /* ProtectedKeyword */:
-                                return 16 /* Protected */;
-                            case 113 /* StaticKeyword */:
-                                return 32 /* Static */;
-                            case 82 /* ExportKeyword */:
-                                return 1 /* Export */;
-                            case 122 /* DeclareKeyword */:
-                                return 2 /* Ambient */;
-                            case 115 /* AbstractKeyword */:
-                                return 128 /* Abstract */;
-                            default:
-                                ts.Debug.fail();
-                        }
-                    }
-                }
-                function pushKeywordIf(keywordList, token) {
-                    var expected = [];
-                    for (var _i = 2; _i < arguments.length; _i++) {
-                        expected[_i - 2] = arguments[_i];
-                    }
-                    if (token && ts.contains(expected, token.kind)) {
-                        keywordList.push(token);
-                        return true;
-                    }
-                    return false;
-                }
-                function getGetAndSetOccurrences(accessorDeclaration) {
-                    var keywords = [];
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 149 /* GetAccessor */);
-                    tryPushAccessorKeyword(accessorDeclaration.symbol, 150 /* SetAccessor */);
-                    return ts.map(keywords, getHighlightSpanForNode);
-                    function tryPushAccessorKeyword(accessorSymbol, accessorKind) {
-                        var accessor = ts.getDeclarationOfKind(accessorSymbol, accessorKind);
-                        if (accessor) {
-                            ts.forEach(accessor.getChildren(), function (child) { return pushKeywordIf(keywords, child, 123 /* GetKeyword */, 131 /* SetKeyword */); });
-                        }
-                    }
-                }
-                function getConstructorOccurrences(constructorDeclaration) {
-                    var declarations = constructorDeclaration.symbol.getDeclarations();
-                    var keywords = [];
-                    ts.forEach(declarations, function (declaration) {
-                        ts.forEach(declaration.getChildren(), function (token) {
-                            return pushKeywordIf(keywords, token, 121 /* ConstructorKeyword */);
-                        });
-                    });
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getLoopBreakContinueOccurrences(loopNode) {
-                    var keywords = [];
-                    if (pushKeywordIf(keywords, loopNode.getFirstToken(), 86 /* ForKeyword */, 104 /* WhileKeyword */, 79 /* DoKeyword */)) {
-                        // If we succeeded and got a do-while loop, then start looking for a 'while' keyword.
-                        if (loopNode.kind === 204 /* DoStatement */) {
-                            var loopTokens = loopNode.getChildren();
-                            for (var i = loopTokens.length - 1; i >= 0; i--) {
-                                if (pushKeywordIf(keywords, loopTokens[i], 104 /* WhileKeyword */)) {
-                                    break;
-                                }
-                            }
-                        }
-                    }
-                    var breaksAndContinues = aggregateAllBreakAndContinueStatements(loopNode.statement);
-                    ts.forEach(breaksAndContinues, function (statement) {
-                        if (ownsBreakOrContinueStatement(loopNode, statement)) {
-                            pushKeywordIf(keywords, statement.getFirstToken(), 70 /* BreakKeyword */, 75 /* ContinueKeyword */);
-                        }
-                    });
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getBreakOrContinueStatementOccurrences(breakOrContinueStatement) {
-                    var owner = getBreakOrContinueOwner(breakOrContinueStatement);
-                    if (owner) {
-                        switch (owner.kind) {
-                            case 206 /* ForStatement */:
-                            case 207 /* ForInStatement */:
-                            case 208 /* ForOfStatement */:
-                            case 204 /* DoStatement */:
-                            case 205 /* WhileStatement */:
-                                return getLoopBreakContinueOccurrences(owner);
-                            case 213 /* SwitchStatement */:
-                                return getSwitchCaseDefaultOccurrences(owner);
-                        }
-                    }
-                    return undefined;
-                }
-                function getSwitchCaseDefaultOccurrences(switchStatement) {
-                    var keywords = [];
-                    pushKeywordIf(keywords, switchStatement.getFirstToken(), 96 /* SwitchKeyword */);
-                    // Go through each clause in the switch statement, collecting the 'case'/'default' keywords.
-                    ts.forEach(switchStatement.caseBlock.clauses, function (clause) {
-                        pushKeywordIf(keywords, clause.getFirstToken(), 71 /* CaseKeyword */, 77 /* DefaultKeyword */);
-                        var breaksAndContinues = aggregateAllBreakAndContinueStatements(clause);
-                        ts.forEach(breaksAndContinues, function (statement) {
-                            if (ownsBreakOrContinueStatement(switchStatement, statement)) {
-                                pushKeywordIf(keywords, statement.getFirstToken(), 70 /* BreakKeyword */);
-                            }
-                        });
-                    });
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getTryCatchFinallyOccurrences(tryStatement) {
-                    var keywords = [];
-                    pushKeywordIf(keywords, tryStatement.getFirstToken(), 100 /* TryKeyword */);
-                    if (tryStatement.catchClause) {
-                        pushKeywordIf(keywords, tryStatement.catchClause.getFirstToken(), 72 /* CatchKeyword */);
-                    }
-                    if (tryStatement.finallyBlock) {
-                        var finallyKeyword = ts.findChildOfKind(tryStatement, 85 /* FinallyKeyword */, sourceFile);
-                        pushKeywordIf(keywords, finallyKeyword, 85 /* FinallyKeyword */);
-                    }
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getThrowOccurrences(throwStatement) {
-                    var owner = getThrowStatementOwner(throwStatement);
-                    if (!owner) {
-                        return undefined;
-                    }
-                    var keywords = [];
-                    ts.forEach(aggregateOwnedThrowStatements(owner), function (throwStatement) {
-                        pushKeywordIf(keywords, throwStatement.getFirstToken(), 98 /* ThrowKeyword */);
-                    });
-                    // If the "owner" is a function, then we equate 'return' and 'throw' statements in their
-                    // ability to "jump out" of the function, and include occurrences for both.
-                    if (ts.isFunctionBlock(owner)) {
-                        ts.forEachReturnStatement(owner, function (returnStatement) {
-                            pushKeywordIf(keywords, returnStatement.getFirstToken(), 94 /* ReturnKeyword */);
-                        });
-                    }
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getReturnOccurrences(returnStatement) {
-                    var func = ts.getContainingFunction(returnStatement);
-                    // If we didn't find a containing function with a block body, bail out.
-                    if (!(func && hasKind(func.body, 199 /* Block */))) {
-                        return undefined;
-                    }
-                    var keywords = [];
-                    ts.forEachReturnStatement(func.body, function (returnStatement) {
-                        pushKeywordIf(keywords, returnStatement.getFirstToken(), 94 /* ReturnKeyword */);
-                    });
-                    // Include 'throw' statements that do not occur within a try block.
-                    ts.forEach(aggregateOwnedThrowStatements(func.body), function (throwStatement) {
-                        pushKeywordIf(keywords, throwStatement.getFirstToken(), 98 /* ThrowKeyword */);
-                    });
-                    return ts.map(keywords, getHighlightSpanForNode);
-                }
-                function getIfElseOccurrences(ifStatement) {
-                    var keywords = [];
-                    // Traverse upwards through all parent if-statements linked by their else-branches.
-                    while (hasKind(ifStatement.parent, 203 /* IfStatement */) && ifStatement.parent.elseStatement === ifStatement) {
-                        ifStatement = ifStatement.parent;
-                    }
-                    // Now traverse back down through the else branches, aggregating if/else keywords of if-statements.
-                    while (ifStatement) {
-                        var children = ifStatement.getChildren();
-                        pushKeywordIf(keywords, children[0], 88 /* IfKeyword */);
-                        // Generally the 'else' keyword is second-to-last, so we traverse backwards.
-                        for (var i = children.length - 1; i >= 0; i--) {
-                            if (pushKeywordIf(keywords, children[i], 80 /* ElseKeyword */)) {
-                                break;
-                            }
-                        }
-                        if (!hasKind(ifStatement.elseStatement, 203 /* IfStatement */)) {
-                            break;
-                        }
-                        ifStatement = ifStatement.elseStatement;
-                    }
-                    var result = [];
-                    // We'd like to highlight else/ifs together if they are only separated by whitespace
-                    // (i.e. the keywords are separated by no comments, no newlines).
-                    for (var i = 0; i < keywords.length; i++) {
-                        if (keywords[i].kind === 80 /* ElseKeyword */ && i < keywords.length - 1) {
-                            var elseKeyword = keywords[i];
-                            var ifKeyword = keywords[i + 1]; // this *should* always be an 'if' keyword.
-                            var shouldCombindElseAndIf = true;
-                            // Avoid recalculating getStart() by iterating backwards.
-                            for (var j = ifKeyword.getStart() - 1; j >= elseKeyword.end; j--) {
-                                if (!ts.isWhiteSpaceSingleLine(sourceFile.text.charCodeAt(j))) {
-                                    shouldCombindElseAndIf = false;
-                                    break;
-                                }
-                            }
-                            if (shouldCombindElseAndIf) {
-                                result.push({
-                                    fileName: fileName,
-                                    textSpan: ts.createTextSpanFromBounds(elseKeyword.getStart(), ifKeyword.end),
-                                    kind: HighlightSpanKind.reference
-                                });
-                                i++; // skip the next keyword
-                                continue;
-                            }
-                        }
-                        // Ordinary case: just highlight the keyword.
-                        result.push(getHighlightSpanForNode(keywords[i]));
-                    }
-                    return result;
-                }
-            }
-        }
-        /// References and Occurrences
-        function getOccurrencesAtPositionCore(fileName, position) {
-            synchronizeHostData();
-            return convertDocumentHighlights(getDocumentHighlights(fileName, position, [fileName]));
-            function convertDocumentHighlights(documentHighlights) {
-                if (!documentHighlights) {
-                    return undefined;
-                }
-                var result = [];
-                for (var _i = 0, documentHighlights_1 = documentHighlights; _i < documentHighlights_1.length; _i++) {
-                    var entry = documentHighlights_1[_i];
-                    for (var _a = 0, _b = entry.highlightSpans; _a < _b.length; _a++) {
-                        var highlightSpan = _b[_a];
-                        result.push({
-                            fileName: entry.fileName,
-                            textSpan: highlightSpan.textSpan,
-                            isWriteAccess: highlightSpan.kind === HighlightSpanKind.writtenReference,
-                            isDefinition: false
-                        });
-                    }
-                }
-                return result;
-            }
-        }
-        function convertReferences(referenceSymbols) {
-            if (!referenceSymbols) {
-                return undefined;
-            }
-            var referenceEntries = [];
-            for (var _i = 0, referenceSymbols_1 = referenceSymbols; _i < referenceSymbols_1.length; _i++) {
-                var referenceSymbol = referenceSymbols_1[_i];
-                ts.addRange(referenceEntries, referenceSymbol.references);
-            }
-            return referenceEntries;
-        }
-        function findRenameLocations(fileName, position, findInStrings, findInComments) {
-            var referencedSymbols = findReferencedSymbols(fileName, position, findInStrings, findInComments);
-            return convertReferences(referencedSymbols);
-        }
-        function getReferencesAtPosition(fileName, position) {
-            var referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false);
-            return convertReferences(referencedSymbols);
-        }
-        function findReferences(fileName, position) {
-            var referencedSymbols = findReferencedSymbols(fileName, position, /*findInStrings*/ false, /*findInComments*/ false);
-            // Only include referenced symbols that have a valid definition.
-            return ts.filter(referencedSymbols, function (rs) { return !!rs.definition; });
-        }
-        function findReferencedSymbols(fileName, position, findInStrings, findInComments) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var node = ts.getTouchingPropertyName(sourceFile, position, /*includeJsDocComment*/ true);
-            if (node === sourceFile) {
-                return undefined;
-            }
-            switch (node.kind) {
-                case 8 /* NumericLiteral */:
-                    if (!isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
-                        break;
-                    }
-                // Fallthrough
-                case 69 /* Identifier */:
-                case 97 /* ThisKeyword */:
-                // case SyntaxKind.SuperKeyword: TODO:GH#9268
-                case 9 /* StringLiteral */:
-                    return getReferencedSymbolsForNode(node, program.getSourceFiles(), findInStrings, findInComments);
-            }
-            return undefined;
-        }
-        function isThis(node) {
-            switch (node.kind) {
-                case 97 /* ThisKeyword */:
-                    // case SyntaxKind.ThisType: TODO: GH#9267
-                    return true;
-                case 69 /* Identifier */:
-                    // 'this' as a parameter
-                    return node.originalKeywordKind === 97 /* ThisKeyword */ && node.parent.kind === 142 /* Parameter */;
-                default:
-                    return false;
-            }
-        }
-        function getReferencedSymbolsForNode(node, sourceFiles, findInStrings, findInComments) {
-            var typeChecker = program.getTypeChecker();
-            // Labels
-            if (isLabelName(node)) {
-                if (isJumpStatementTarget(node)) {
-                    var labelDefinition = getTargetLabel(node.parent, node.text);
-                    // if we have a label definition, look within its statement for references, if not, then
-                    // the label is undefined and we have no results..
-                    return labelDefinition ? getLabelReferencesInNode(labelDefinition.parent, labelDefinition) : undefined;
-                }
-                else {
-                    // it is a label definition and not a target, search within the parent labeledStatement
-                    return getLabelReferencesInNode(node.parent, node);
-                }
-            }
-            if (isThis(node)) {
-                return getReferencesForThisKeyword(node, sourceFiles);
-            }
-            if (node.kind === 95 /* SuperKeyword */) {
-                return getReferencesForSuperKeyword(node);
-            }
-            var symbol = typeChecker.getSymbolAtLocation(node);
-            if (!symbol && node.kind === 9 /* StringLiteral */) {
-                return getReferencesForStringLiteral(node, sourceFiles);
-            }
-            // Could not find a symbol e.g. unknown identifier
-            if (!symbol) {
-                // Can't have references to something that we have no symbol for.
-                return undefined;
-            }
-            var declarations = symbol.declarations;
-            // The symbol was an internal symbol and does not have a declaration e.g. undefined symbol
-            if (!declarations || !declarations.length) {
-                return undefined;
-            }
-            var result;
-            // Compute the meaning from the location and the symbol it references
-            var searchMeaning = getIntersectingMeaningFromDeclarations(getMeaningFromLocation(node), declarations);
-            // Get the text to search for.
-            // Note: if this is an external module symbol, the name doesn't include quotes.
-            var declaredName = ts.stripQuotes(ts.getDeclaredName(typeChecker, symbol, node));
-            // Try to get the smallest valid scope that we can limit our search to;
-            // otherwise we'll need to search globally (i.e. include each file).
-            var scope = getSymbolScope(symbol);
-            // Maps from a symbol ID to the ReferencedSymbol entry in 'result'.
-            var symbolToIndex = [];
-            if (scope) {
-                result = [];
-                getReferencesInNode(scope, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex);
-            }
-            else {
-                var internedName = getInternedName(symbol, node, declarations);
-                for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
-                    var sourceFile = sourceFiles_4[_i];
-                    cancellationToken.throwIfCancellationRequested();
-                    var nameTable = getNameTable(sourceFile);
-                    if (ts.lookUp(nameTable, internedName) !== undefined) {
-                        result = result || [];
-                        getReferencesInNode(sourceFile, symbol, declaredName, node, searchMeaning, findInStrings, findInComments, result, symbolToIndex);
-                    }
-                }
-            }
-            return result;
-            function getDefinition(symbol) {
-                var info = getSymbolDisplayPartsDocumentationAndSymbolKind(symbol, node.getSourceFile(), getContainerNode(node), node);
-                var name = ts.map(info.displayParts, function (p) { return p.text; }).join("");
-                var declarations = symbol.declarations;
-                if (!declarations || declarations.length === 0) {
-                    return undefined;
-                }
-                return {
-                    containerKind: "",
-                    containerName: "",
-                    name: name,
-                    kind: info.symbolKind,
-                    fileName: declarations[0].getSourceFile().fileName,
-                    textSpan: ts.createTextSpan(declarations[0].getStart(), 0)
-                };
-            }
-            function getAliasSymbolForPropertyNameSymbol(symbol, location) {
-                if (symbol.flags & 8388608 /* Alias */) {
-                    // Default import get alias
-                    var defaultImport = ts.getDeclarationOfKind(symbol, 231 /* ImportClause */);
-                    if (defaultImport) {
-                        return typeChecker.getAliasedSymbol(symbol);
-                    }
-                    var importOrExportSpecifier = ts.forEach(symbol.declarations, function (declaration) { return (declaration.kind === 234 /* ImportSpecifier */ ||
-                        declaration.kind === 238 /* ExportSpecifier */) ? declaration : undefined; });
-                    if (importOrExportSpecifier &&
-                        // export { a }
-                        (!importOrExportSpecifier.propertyName ||
-                            // export {a as class } where a is location
-                            importOrExportSpecifier.propertyName === location)) {
-                        // If Import specifier -> get alias
-                        // else Export specifier -> get local target
-                        return importOrExportSpecifier.kind === 234 /* ImportSpecifier */ ?
-                            typeChecker.getAliasedSymbol(symbol) :
-                            typeChecker.getExportSpecifierLocalTargetSymbol(importOrExportSpecifier);
-                    }
-                }
-                return undefined;
-            }
-            function getPropertySymbolOfDestructuringAssignment(location) {
-                return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(location.parent.parent) &&
-                    typeChecker.getPropertySymbolOfDestructuringAssignment(location);
-            }
-            function isObjectBindingPatternElementWithoutPropertyName(symbol) {
-                var bindingElement = ts.getDeclarationOfKind(symbol, 169 /* BindingElement */);
-                return bindingElement &&
-                    bindingElement.parent.kind === 167 /* ObjectBindingPattern */ &&
-                    !bindingElement.propertyName;
-            }
-            function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol) {
-                if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 169 /* BindingElement */);
-                    var typeOfPattern = typeChecker.getTypeAtLocation(bindingElement.parent);
-                    return typeOfPattern && typeChecker.getPropertyOfType(typeOfPattern, bindingElement.name.text);
-                }
-                return undefined;
-            }
-            function getInternedName(symbol, location, declarations) {
-                // If this is an export or import specifier it could have been renamed using the 'as' syntax.
-                // If so we want to search for whatever under the cursor.
-                if (ts.isImportOrExportSpecifierName(location)) {
-                    return location.getText();
-                }
-                // Try to get the local symbol if we're dealing with an 'export default'
-                // since that symbol has the "true" name.
-                var localExportDefaultSymbol = ts.getLocalSymbolForExportDefault(symbol);
-                symbol = localExportDefaultSymbol || symbol;
-                return ts.stripQuotes(symbol.name);
-            }
-            /**
-             * Determines the smallest scope in which a symbol may have named references.
-             * Note that not every construct has been accounted for. This function can
-             * probably be improved.
-             *
-             * @returns undefined if the scope cannot be determined, implying that
-             * a reference to a symbol can occur anywhere.
-             */
-            function getSymbolScope(symbol) {
-                // If this is the symbol of a named function expression or named class expression,
-                // then named references are limited to its own scope.
-                var valueDeclaration = symbol.valueDeclaration;
-                if (valueDeclaration && (valueDeclaration.kind === 179 /* FunctionExpression */ || valueDeclaration.kind === 192 /* ClassExpression */)) {
-                    return valueDeclaration;
-                }
-                // If this is private property or method, the scope is the containing class
-                if (symbol.flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.forEach(symbol.getDeclarations(), function (d) { return (d.flags & 8 /* Private */) ? d : undefined; });
-                    if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 221 /* ClassDeclaration */);
-                    }
-                }
-                // If the symbol is an import we would like to find it if we are looking for what it imports.
-                // So consider it visible outside its declaration scope.
-                if (symbol.flags & 8388608 /* Alias */) {
-                    return undefined;
-                }
-                // If symbol is of object binding pattern element without property name we would want to
-                // look for property too and that could be anywhere
-                if (isObjectBindingPatternElementWithoutPropertyName(symbol)) {
-                    return undefined;
-                }
-                // if this symbol is visible from its parent container, e.g. exported, then bail out
-                // if symbol correspond to the union property - bail out
-                if (symbol.parent || (symbol.flags & 268435456 /* SyntheticProperty */)) {
-                    return undefined;
-                }
-                var scope;
-                var declarations = symbol.getDeclarations();
-                if (declarations) {
-                    for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
-                        var declaration = declarations_9[_i];
-                        var container = getContainerNode(declaration);
-                        if (!container) {
-                            return undefined;
-                        }
-                        if (scope && scope !== container) {
-                            // Different declarations have different containers, bail out
-                            return undefined;
-                        }
-                        if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
-                            // This is a global variable and not an external module, any declaration defined
-                            // within this scope is visible outside the file
-                            return undefined;
-                        }
-                        // The search scope is the container node
-                        scope = container;
-                    }
-                }
-                return scope;
-            }
-            function getPossibleSymbolReferencePositions(sourceFile, symbolName, start, end) {
-                var positions = [];
-                /// TODO: Cache symbol existence for files to save text search
-                // Also, need to make this work for unicode escapes.
-                // Be resilient in the face of a symbol with no name or zero length name
-                if (!symbolName || !symbolName.length) {
-                    return positions;
-                }
-                var text = sourceFile.text;
-                var sourceLength = text.length;
-                var symbolNameLength = symbolName.length;
-                var position = text.indexOf(symbolName, start);
-                while (position >= 0) {
-                    cancellationToken.throwIfCancellationRequested();
-                    // If we are past the end, stop looking
-                    if (position > end)
-                        break;
-                    // We found a match.  Make sure it's not part of a larger word (i.e. the char
-                    // before and after it have to be a non-identifier char).
-                    var endPosition = position + symbolNameLength;
-                    if ((position === 0 || !ts.isIdentifierPart(text.charCodeAt(position - 1), 2 /* Latest */)) &&
-                        (endPosition === sourceLength || !ts.isIdentifierPart(text.charCodeAt(endPosition), 2 /* Latest */))) {
-                        // Found a real match.  Keep searching.
-                        positions.push(position);
-                    }
-                    position = text.indexOf(symbolName, position + symbolNameLength + 1);
-                }
-                return positions;
-            }
-            function getLabelReferencesInNode(container, targetLabel) {
-                var references = [];
-                var sourceFile = container.getSourceFile();
-                var labelName = targetLabel.text;
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, labelName, container.getStart(), container.getEnd());
-                ts.forEach(possiblePositions, function (position) {
-                    cancellationToken.throwIfCancellationRequested();
-                    var node = ts.getTouchingWord(sourceFile, position);
-                    if (!node || node.getWidth() !== labelName.length) {
-                        return;
-                    }
-                    // Only pick labels that are either the target label, or have a target that is the target label
-                    if (node === targetLabel ||
-                        (isJumpStatementTarget(node) && getTargetLabel(node, labelName) === targetLabel)) {
-                        references.push(getReferenceEntryFromNode(node));
-                    }
-                });
-                var definition = {
-                    containerKind: "",
-                    containerName: "",
-                    fileName: targetLabel.getSourceFile().fileName,
-                    kind: ScriptElementKind.label,
-                    name: labelName,
-                    textSpan: ts.createTextSpanFromBounds(targetLabel.getStart(), targetLabel.getEnd())
-                };
-                return [{ definition: definition, references: references }];
-            }
-            function isValidReferencePosition(node, searchSymbolName) {
-                if (node) {
-                    // Compare the length so we filter out strict superstrings of the symbol we are looking for
-                    switch (node.kind) {
-                        case 69 /* Identifier */:
-                            return node.getWidth() === searchSymbolName.length;
-                        case 9 /* StringLiteral */:
-                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
-                                isNameOfExternalModuleImportOrDeclaration(node)) {
-                                // For string literals we have two additional chars for the quotes
-                                return node.getWidth() === searchSymbolName.length + 2;
-                            }
-                            break;
-                        case 8 /* NumericLiteral */:
-                            if (isLiteralNameOfPropertyDeclarationOrIndexAccess(node)) {
-                                return node.getWidth() === searchSymbolName.length;
-                            }
-                            break;
-                    }
-                }
-                return false;
-            }
-            /** Search within node "container" for references for a search value, where the search value is defined as a
-              * tuple of(searchSymbol, searchText, searchLocation, and searchMeaning).
-              * searchLocation: a node where the search value
-              */
-            function getReferencesInNode(container, searchSymbol, searchText, searchLocation, searchMeaning, findInStrings, findInComments, result, symbolToIndex) {
-                var sourceFile = container.getSourceFile();
-                var tripleSlashDirectivePrefixRegex = /^\/\/\/\s*</;
-                var start = findInComments ? container.getFullStart() : container.getStart();
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, searchText, start, container.getEnd());
-                if (possiblePositions.length) {
-                    // Build the set of symbols to search for, initially it has only the current symbol
-                    var searchSymbols_1 = populateSearchSymbolSet(searchSymbol, searchLocation);
-                    ts.forEach(possiblePositions, function (position) {
-                        cancellationToken.throwIfCancellationRequested();
-                        var referenceLocation = ts.getTouchingPropertyName(sourceFile, position);
-                        if (!isValidReferencePosition(referenceLocation, searchText)) {
-                            // This wasn't the start of a token.  Check to see if it might be a
-                            // match in a comment or string if that's what the caller is asking
-                            // for.
-                            if ((findInStrings && ts.isInString(sourceFile, position)) ||
-                                (findInComments && isInNonReferenceComment(sourceFile, position))) {
-                                // In the case where we're looking inside comments/strings, we don't have
-                                // an actual definition.  So just use 'undefined' here.  Features like
-                                // 'Rename' won't care (as they ignore the definitions), and features like
-                                // 'FindReferences' will just filter out these results.
-                                result.push({
-                                    definition: undefined,
-                                    references: [{
-                                            fileName: sourceFile.fileName,
-                                            textSpan: ts.createTextSpan(position, searchText.length),
-                                            isWriteAccess: false,
-                                            isDefinition: false
-                                        }]
-                                });
-                            }
-                            return;
-                        }
-                        if (!(getMeaningFromLocation(referenceLocation) & searchMeaning)) {
-                            return;
-                        }
-                        var referenceSymbol = typeChecker.getSymbolAtLocation(referenceLocation);
-                        if (referenceSymbol) {
-                            var referenceSymbolDeclaration = referenceSymbol.valueDeclaration;
-                            var shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(referenceSymbolDeclaration);
-                            var relatedSymbol = getRelatedSymbol(searchSymbols_1, referenceSymbol, referenceLocation);
-                            if (relatedSymbol) {
-                                var referencedSymbol = getReferencedSymbol(relatedSymbol);
-                                referencedSymbol.references.push(getReferenceEntryFromNode(referenceLocation));
-                            }
-                            else if (!(referenceSymbol.flags & 67108864 /* Transient */) && searchSymbols_1.indexOf(shorthandValueSymbol) >= 0) {
-                                var referencedSymbol = getReferencedSymbol(shorthandValueSymbol);
-                                referencedSymbol.references.push(getReferenceEntryFromNode(referenceSymbolDeclaration.name));
-                            }
-                        }
-                    });
-                }
-                return;
-                function getReferencedSymbol(symbol) {
-                    var symbolId = ts.getSymbolId(symbol);
-                    var index = symbolToIndex[symbolId];
-                    if (index === undefined) {
-                        index = result.length;
-                        symbolToIndex[symbolId] = index;
-                        result.push({
-                            definition: getDefinition(symbol),
-                            references: []
-                        });
-                    }
-                    return result[index];
-                }
-                function isInNonReferenceComment(sourceFile, position) {
-                    return ts.isInCommentHelper(sourceFile, position, isNonReferenceComment);
-                    function isNonReferenceComment(c) {
-                        var commentText = sourceFile.text.substring(c.pos, c.end);
-                        return !tripleSlashDirectivePrefixRegex.test(commentText);
-                    }
-                }
-            }
-            function getReferencesForSuperKeyword(superKeyword) {
-                var searchSpaceNode = ts.getSuperContainer(superKeyword, /*stopOnFunctions*/ false);
-                if (!searchSpaceNode) {
-                    return undefined;
-                }
-                // Whether 'super' occurs in a static context within a class.
-                var staticFlag = 32 /* Static */;
-                switch (searchSpaceNode.kind) {
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                    case 148 /* Constructor */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        staticFlag &= searchSpaceNode.flags;
-                        searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
-                        break;
-                    default:
-                        return undefined;
-                }
-                var references = [];
-                var sourceFile = searchSpaceNode.getSourceFile();
-                var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "super", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
-                ts.forEach(possiblePositions, function (position) {
-                    cancellationToken.throwIfCancellationRequested();
-                    var node = ts.getTouchingWord(sourceFile, position);
-                    if (!node || node.kind !== 95 /* SuperKeyword */) {
-                        return;
-                    }
-                    var container = ts.getSuperContainer(node, /*stopOnFunctions*/ false);
-                    // If we have a 'super' container, we must have an enclosing class.
-                    // Now make sure the owning class is the same as the search-space
-                    // and has the same static qualifier as the original 'super's owner.
-                    if (container && (32 /* Static */ & container.flags) === staticFlag && container.parent.symbol === searchSpaceNode.symbol) {
-                        references.push(getReferenceEntryFromNode(node));
-                    }
-                });
-                var definition = getDefinition(searchSpaceNode.symbol);
-                return [{ definition: definition, references: references }];
-            }
-            function getReferencesForThisKeyword(thisOrSuperKeyword, sourceFiles) {
-                var searchSpaceNode = ts.getThisContainer(thisOrSuperKeyword, /* includeArrowFunctions */ false);
-                // Whether 'this' occurs in a static context within a class.
-                var staticFlag = 32 /* Static */;
-                switch (searchSpaceNode.kind) {
-                    case 147 /* MethodDeclaration */:
-                    case 146 /* MethodSignature */:
-                        if (ts.isObjectLiteralMethod(searchSpaceNode)) {
-                            break;
-                        }
-                    // fall through
-                    case 145 /* PropertyDeclaration */:
-                    case 144 /* PropertySignature */:
-                    case 148 /* Constructor */:
-                    case 149 /* GetAccessor */:
-                    case 150 /* SetAccessor */:
-                        staticFlag &= searchSpaceNode.flags;
-                        searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
-                        break;
-                    case 256 /* SourceFile */:
-                        if (ts.isExternalModule(searchSpaceNode)) {
-                            return undefined;
-                        }
-                    // Fall through
-                    case 220 /* FunctionDeclaration */:
-                    case 179 /* FunctionExpression */:
-                        break;
-                    // Computed properties in classes are not handled here because references to this are illegal,
-                    // so there is no point finding references to them.
-                    default:
-                        return undefined;
-                }
-                var references = [];
-                var possiblePositions;
-                if (searchSpaceNode.kind === 256 /* SourceFile */) {
-                    ts.forEach(sourceFiles, function (sourceFile) {
-                        possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", sourceFile.getStart(), sourceFile.getEnd());
-                        getThisReferencesInFile(sourceFile, sourceFile, possiblePositions, references);
-                    });
-                }
-                else {
-                    var sourceFile = searchSpaceNode.getSourceFile();
-                    possiblePositions = getPossibleSymbolReferencePositions(sourceFile, "this", searchSpaceNode.getStart(), searchSpaceNode.getEnd());
-                    getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, references);
-                }
-                return [{
-                        definition: {
-                            containerKind: "",
-                            containerName: "",
-                            fileName: node.getSourceFile().fileName,
-                            kind: ScriptElementKind.variableElement,
-                            name: "this",
-                            textSpan: ts.createTextSpanFromBounds(node.getStart(), node.getEnd())
-                        },
-                        references: references
-                    }];
-                function getThisReferencesInFile(sourceFile, searchSpaceNode, possiblePositions, result) {
-                    ts.forEach(possiblePositions, function (position) {
-                        cancellationToken.throwIfCancellationRequested();
-                        var node = ts.getTouchingWord(sourceFile, position);
-                        if (!node || !isThis(node)) {
-                            return;
-                        }
-                        var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
-                        switch (searchSpaceNode.kind) {
-                            case 179 /* FunctionExpression */:
-                            case 220 /* FunctionDeclaration */:
-                                if (searchSpaceNode.symbol === container.symbol) {
-                                    result.push(getReferenceEntryFromNode(node));
-                                }
-                                break;
-                            case 147 /* MethodDeclaration */:
-                            case 146 /* MethodSignature */:
-                                if (ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol) {
-                                    result.push(getReferenceEntryFromNode(node));
-                                }
-                                break;
-                            case 192 /* ClassExpression */:
-                            case 221 /* ClassDeclaration */:
-                                // Make sure the container belongs to the same class
-                                // and has the appropriate static modifier from the original container.
-                                if (container.parent && searchSpaceNode.symbol === container.parent.symbol && (container.flags & 32 /* Static */) === staticFlag) {
-                                    result.push(getReferenceEntryFromNode(node));
-                                }
-                                break;
-                            case 256 /* SourceFile */:
-                                if (container.kind === 256 /* SourceFile */ && !ts.isExternalModule(container)) {
-                                    result.push(getReferenceEntryFromNode(node));
-                                }
-                                break;
-                        }
-                    });
-                }
-            }
-            function getReferencesForStringLiteral(node, sourceFiles) {
-                var typeChecker = program.getTypeChecker();
-                var type = getStringLiteralTypeForNode(node, typeChecker);
-                if (!type) {
-                    // nothing to do here. moving on
-                    return undefined;
-                }
-                var references = [];
-                for (var _i = 0, sourceFiles_5 = sourceFiles; _i < sourceFiles_5.length; _i++) {
-                    var sourceFile = sourceFiles_5[_i];
-                    var possiblePositions = getPossibleSymbolReferencePositions(sourceFile, type.text, sourceFile.getStart(), sourceFile.getEnd());
-                    getReferencesForStringLiteralInFile(sourceFile, type, possiblePositions, references);
-                }
-                return [{
-                        definition: {
-                            containerKind: "",
-                            containerName: "",
-                            fileName: node.getSourceFile().fileName,
-                            kind: ScriptElementKind.variableElement,
-                            name: type.text,
-                            textSpan: ts.createTextSpanFromBounds(node.getStart(), node.getEnd())
-                        },
-                        references: references
-                    }];
-                function getReferencesForStringLiteralInFile(sourceFile, searchType, possiblePositions, references) {
-                    for (var _i = 0, possiblePositions_1 = possiblePositions; _i < possiblePositions_1.length; _i++) {
-                        var position = possiblePositions_1[_i];
-                        cancellationToken.throwIfCancellationRequested();
-                        var node_2 = ts.getTouchingWord(sourceFile, position);
-                        if (!node_2 || node_2.kind !== 9 /* StringLiteral */) {
-                            return;
-                        }
-                        var type_1 = getStringLiteralTypeForNode(node_2, typeChecker);
-                        if (type_1 === searchType) {
-                            references.push(getReferenceEntryFromNode(node_2));
-                        }
-                    }
-                }
-            }
-            function populateSearchSymbolSet(symbol, location) {
-                // The search set contains at least the current symbol
-                var result = [symbol];
-                // If the location is name of property symbol from object literal destructuring pattern
-                // Search the property symbol
-                //      for ( { property: p2 } of elems) { }
-                var containingObjectLiteralElement = getContainingObjectLiteralElement(location);
-                if (containingObjectLiteralElement && containingObjectLiteralElement.kind !== 254 /* ShorthandPropertyAssignment */) {
-                    var propertySymbol = getPropertySymbolOfDestructuringAssignment(location);
-                    if (propertySymbol) {
-                        result.push(propertySymbol);
-                    }
-                }
-                // If the symbol is an alias, add what it aliases to the list
-                //     import {a} from "mod";
-                //     export {a}
-                // If the symbol is an alias to default declaration, add what it aliases to the list
-                //     declare "mod" { export default class B { } }
-                //     import B from "mod";
-                //// For export specifiers, the exported name can be referring to a local symbol, e.g.:
-                ////     import {a} from "mod";
-                ////     export {a as somethingElse}
-                //// We want the *local* declaration of 'a' as declared in the import,
-                //// *not* as declared within "mod" (or farther)
-                var aliasSymbol = getAliasSymbolForPropertyNameSymbol(symbol, location);
-                if (aliasSymbol) {
-                    result = result.concat(populateSearchSymbolSet(aliasSymbol, location));
-                }
-                // If the location is in a context sensitive location (i.e. in an object literal) try
-                // to get a contextual type for it, and add the property symbol from the contextual
-                // type to the search set
-                if (containingObjectLiteralElement) {
-                    ts.forEach(getPropertySymbolsFromContextualType(containingObjectLiteralElement), function (contextualSymbol) {
-                        ts.addRange(result, typeChecker.getRootSymbols(contextualSymbol));
-                    });
-                    /* Because in short-hand property assignment, location has two meaning : property name and as value of the property
-                     * When we do findAllReference at the position of the short-hand property assignment, we would want to have references to position of
-                     * property name and variable declaration of the identifier.
-                     * Like in below example, when querying for all references for an identifier 'name', of the property assignment, the language service
-                     * should show both 'name' in 'obj' and 'name' in variable declaration
-                     *      const name = "Foo";
-                     *      const obj = { name };
-                     * In order to do that, we will populate the search set with the value symbol of the identifier as a value of the property assignment
-                     * so that when matching with potential reference symbol, both symbols from property declaration and variable declaration
-                     * will be included correctly.
-                     */
-                    var shorthandValueSymbol = typeChecker.getShorthandAssignmentValueSymbol(location.parent);
-                    if (shorthandValueSymbol) {
-                        result.push(shorthandValueSymbol);
-                    }
-                }
-                // If the symbol.valueDeclaration is a property parameter declaration,
-                // we should include both parameter declaration symbol and property declaration symbol
-                // Parameter Declaration symbol is only visible within function scope, so the symbol is stored in constructor.locals.
-                // Property Declaration symbol is a member of the class, so the symbol is stored in its class Declaration.symbol.members
-                if (symbol.valueDeclaration && symbol.valueDeclaration.kind === 142 /* Parameter */ &&
-                    ts.isParameterPropertyDeclaration(symbol.valueDeclaration)) {
-                    result = result.concat(typeChecker.getSymbolsOfParameterPropertyDeclaration(symbol.valueDeclaration, symbol.name));
-                }
-                // If this is symbol of binding element without propertyName declaration in Object binding pattern
-                // Include the property in the search
-                var bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol);
-                if (bindingElementPropertySymbol) {
-                    result.push(bindingElementPropertySymbol);
-                }
-                // If this is a union property, add all the symbols from all its source symbols in all unioned types.
-                // If the symbol is an instantiation from a another symbol (e.g. widened symbol) , add the root the list
-                ts.forEach(typeChecker.getRootSymbols(symbol), function (rootSymbol) {
-                    if (rootSymbol !== symbol) {
-                        result.push(rootSymbol);
-                    }
-                    // Add symbol of properties/methods of the same name in base classes and implemented interfaces definitions
-                    if (rootSymbol.parent && rootSymbol.parent.flags & (32 /* Class */ | 64 /* Interface */)) {
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result, /*previousIterationSymbolsCache*/ {});
-                    }
-                });
-                return result;
-            }
-            /**
-             * Find symbol of the given property-name and add the symbol to the given result array
-             * @param symbol a symbol to start searching for the given propertyName
-             * @param propertyName a name of property to search for
-             * @param result an array of symbol of found property symbols
-             * @param previousIterationSymbolsCache a cache of symbol from previous iterations of calling this function to prevent infinite revisiting of the same symbol.
-             *                                The value of previousIterationSymbol is undefined when the function is first called.
-             */
-            function getPropertySymbolsFromBaseTypes(symbol, propertyName, result, previousIterationSymbolsCache) {
-                if (!symbol) {
-                    return;
-                }
-                // If the current symbol is the same as the previous-iteration symbol, we can just return the symbol that has already been visited
-                // This is particularly important for the following cases, so that we do not infinitely visit the same symbol.
-                // For example:
-                //      interface C extends C {
-                //          /*findRef*/propName: string;
-                //      }
-                // The first time getPropertySymbolsFromBaseTypes is called when finding-all-references at propName,
-                // the symbol argument will be the symbol of an interface "C" and previousIterationSymbol is undefined,
-                // the function will add any found symbol of the property-name, then its sub-routine will call
-                // getPropertySymbolsFromBaseTypes again to walk up any base types to prevent revisiting already
-                // visited symbol, interface "C", the sub-routine will pass the current symbol as previousIterationSymbol.
-                if (ts.hasProperty(previousIterationSymbolsCache, symbol.name)) {
-                    return;
-                }
-                if (symbol.flags & (32 /* Class */ | 64 /* Interface */)) {
-                    ts.forEach(symbol.getDeclarations(), function (declaration) {
-                        if (ts.isClassLike(declaration)) {
-                            getPropertySymbolFromTypeReference(ts.getClassExtendsHeritageClauseElement(declaration));
-                            ts.forEach(ts.getClassImplementsHeritageClauseElements(declaration), getPropertySymbolFromTypeReference);
-                        }
-                        else if (declaration.kind === 222 /* InterfaceDeclaration */) {
-                            ts.forEach(ts.getInterfaceBaseTypeNodes(declaration), getPropertySymbolFromTypeReference);
-                        }
-                    });
-                }
-                return;
-                function getPropertySymbolFromTypeReference(typeReference) {
-                    if (typeReference) {
-                        var type = typeChecker.getTypeAtLocation(typeReference);
-                        if (type) {
-                            var propertySymbol = typeChecker.getPropertyOfType(type, propertyName);
-                            if (propertySymbol) {
-                                result.push.apply(result, typeChecker.getRootSymbols(propertySymbol));
-                            }
-                            // Visit the typeReference as well to see if it directly or indirectly use that property
-                            previousIterationSymbolsCache[symbol.name] = symbol;
-                            getPropertySymbolsFromBaseTypes(type.symbol, propertyName, result, previousIterationSymbolsCache);
-                        }
-                    }
-                }
-            }
-            function getRelatedSymbol(searchSymbols, referenceSymbol, referenceLocation) {
-                if (searchSymbols.indexOf(referenceSymbol) >= 0) {
-                    return referenceSymbol;
-                }
-                // If the reference symbol is an alias, check if what it is aliasing is one of the search
-                // symbols but by looking up for related symbol of this alias so it can handle multiple level of indirectness.
-                var aliasSymbol = getAliasSymbolForPropertyNameSymbol(referenceSymbol, referenceLocation);
-                if (aliasSymbol) {
-                    return getRelatedSymbol(searchSymbols, aliasSymbol, referenceLocation);
-                }
-                // If the reference location is in an object literal, try to get the contextual type for the
-                // object literal, lookup the property symbol in the contextual type, and use this symbol to
-                // compare to our searchSymbol
-                var containingObjectLiteralElement = getContainingObjectLiteralElement(referenceLocation);
-                if (containingObjectLiteralElement) {
-                    var contextualSymbol = ts.forEach(getPropertySymbolsFromContextualType(containingObjectLiteralElement), function (contextualSymbol) {
-                        return ts.forEach(typeChecker.getRootSymbols(contextualSymbol), function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
-                    });
-                    if (contextualSymbol) {
-                        return contextualSymbol;
-                    }
-                    // If the reference location is the name of property from object literal destructuring pattern
-                    // Get the property symbol from the object literal's type and look if thats the search symbol
-                    // In below eg. get 'property' from type of elems iterating type
-                    //      for ( { property: p2 } of elems) { }
-                    var propertySymbol = getPropertySymbolOfDestructuringAssignment(referenceLocation);
-                    if (propertySymbol && searchSymbols.indexOf(propertySymbol) >= 0) {
-                        return propertySymbol;
-                    }
-                }
-                // If the reference location is the binding element and doesn't have property name
-                // then include the binding element in the related symbols
-                //      let { a } : { a };
-                var bindingElementPropertySymbol = getPropertySymbolOfObjectBindingPatternWithoutPropertyName(referenceSymbol);
-                if (bindingElementPropertySymbol && searchSymbols.indexOf(bindingElementPropertySymbol) >= 0) {
-                    return bindingElementPropertySymbol;
-                }
-                // Unwrap symbols to get to the root (e.g. transient symbols as a result of widening)
-                // Or a union property, use its underlying unioned symbols
-                return ts.forEach(typeChecker.getRootSymbols(referenceSymbol), function (rootSymbol) {
-                    // if it is in the list, then we are done
-                    if (searchSymbols.indexOf(rootSymbol) >= 0) {
-                        return rootSymbol;
-                    }
-                    // Finally, try all properties with the same name in any type the containing type extended or implemented, and
-                    // see if any is in the list
-                    if (rootSymbol.parent && rootSymbol.parent.flags & (32 /* Class */ | 64 /* Interface */)) {
-                        var result_4 = [];
-                        getPropertySymbolsFromBaseTypes(rootSymbol.parent, rootSymbol.getName(), result_4, /*previousIterationSymbolsCache*/ {});
-                        return ts.forEach(result_4, function (s) { return searchSymbols.indexOf(s) >= 0 ? s : undefined; });
-                    }
-                    return undefined;
-                });
-            }
-            function getNameFromObjectLiteralElement(node) {
-                if (node.name.kind === 140 /* ComputedPropertyName */) {
-                    var nameExpression = node.name.expression;
-                    // treat computed property names where expression is string/numeric literal as just string/numeric literal
-                    if (ts.isStringOrNumericLiteral(nameExpression.kind)) {
-                        return nameExpression.text;
-                    }
-                    return undefined;
-                }
-                return node.name.text;
-            }
-            function getPropertySymbolsFromContextualType(node) {
-                var objectLiteral = node.parent;
-                var contextualType = typeChecker.getContextualType(objectLiteral);
-                var name = getNameFromObjectLiteralElement(node);
-                if (name && contextualType) {
-                    var result_5 = [];
-                    var symbol_1 = contextualType.getProperty(name);
-                    if (symbol_1) {
-                        result_5.push(symbol_1);
-                    }
-                    if (contextualType.flags & 16384 /* Union */) {
-                        ts.forEach(contextualType.types, function (t) {
-                            var symbol = t.getProperty(name);
-                            if (symbol) {
-                                result_5.push(symbol);
-                            }
-                        });
-                    }
-                    return result_5;
-                }
-                return undefined;
-            }
-            /** Given an initial searchMeaning, extracted from a location, widen the search scope based on the declarations
-              * of the corresponding symbol. e.g. if we are searching for "Foo" in value position, but "Foo" references a class
-              * then we need to widen the search to include type positions as well.
-              * On the contrary, if we are searching for "Bar" in type position and we trace bar to an interface, and an uninstantiated
-              * module, we want to keep the search limited to only types, as the two declarations (interface and uninstantiated module)
-              * do not intersect in any of the three spaces.
-              */
-            function getIntersectingMeaningFromDeclarations(meaning, declarations) {
-                if (declarations) {
-                    var lastIterationMeaning = void 0;
-                    do {
-                        // The result is order-sensitive, for instance if initialMeaning === Namespace, and declarations = [class, instantiated module]
-                        // we need to consider both as they initialMeaning intersects with the module in the namespace space, and the module
-                        // intersects with the class in the value space.
-                        // To achieve that we will keep iterating until the result stabilizes.
-                        // Remember the last meaning
-                        lastIterationMeaning = meaning;
-                        for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
-                            var declaration = declarations_10[_i];
-                            var declarationMeaning = getMeaningFromDeclaration(declaration);
-                            if (declarationMeaning & meaning) {
-                                meaning |= declarationMeaning;
-                            }
-                        }
-                    } while (meaning !== lastIterationMeaning);
-                }
-                return meaning;
-            }
-        }
-        function getReferenceEntryFromNode(node) {
-            var start = node.getStart();
-            var end = node.getEnd();
-            if (node.kind === 9 /* StringLiteral */) {
-                start += 1;
-                end -= 1;
-            }
-            return {
-                fileName: node.getSourceFile().fileName,
-                textSpan: ts.createTextSpanFromBounds(start, end),
-                isWriteAccess: isWriteAccess(node),
-                isDefinition: ts.isDeclarationName(node) || ts.isLiteralComputedPropertyDeclarationName(node)
-            };
-        }
-        /** A node is considered a writeAccess iff it is a name of a declaration or a target of an assignment */
-        function isWriteAccess(node) {
-            if (node.kind === 69 /* Identifier */ && ts.isDeclarationName(node)) {
-                return true;
-            }
-            var parent = node.parent;
-            if (parent) {
-                if (parent.kind === 186 /* PostfixUnaryExpression */ || parent.kind === 185 /* PrefixUnaryExpression */) {
-                    return true;
-                }
-                else if (parent.kind === 187 /* BinaryExpression */ && parent.left === node) {
-                    var operator = parent.operatorToken.kind;
-                    return 56 /* FirstAssignment */ <= operator && operator <= 68 /* LastAssignment */;
-                }
-            }
-            return false;
-        }
-        /// NavigateTo
-        function getNavigateToItems(searchValue, maxResultCount) {
-            synchronizeHostData();
-            var checker = getProgram().getTypeChecker();
-            return ts.NavigateTo.getNavigateToItems(program, checker, cancellationToken, searchValue, maxResultCount);
-        }
-        function getEmitOutput(fileName) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var outputFiles = [];
-            function writeFile(fileName, data, writeByteOrderMark) {
-                outputFiles.push({
-                    name: fileName,
-                    writeByteOrderMark: writeByteOrderMark,
-                    text: data
-                });
-            }
-            var emitOutput = program.emit(sourceFile, writeFile, cancellationToken);
-            return {
-                outputFiles: outputFiles,
-                emitSkipped: emitOutput.emitSkipped
-            };
-        }
-        function getMeaningFromDeclaration(node) {
-            switch (node.kind) {
-                case 142 /* Parameter */:
-                case 218 /* VariableDeclaration */:
-                case 169 /* BindingElement */:
-                case 145 /* PropertyDeclaration */:
-                case 144 /* PropertySignature */:
-                case 253 /* PropertyAssignment */:
-                case 254 /* ShorthandPropertyAssignment */:
-                case 255 /* EnumMember */:
-                case 147 /* MethodDeclaration */:
-                case 146 /* MethodSignature */:
-                case 148 /* Constructor */:
-                case 149 /* GetAccessor */:
-                case 150 /* SetAccessor */:
-                case 220 /* FunctionDeclaration */:
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                case 252 /* CatchClause */:
-                    return 1 /* Value */;
-                case 141 /* TypeParameter */:
-                case 222 /* InterfaceDeclaration */:
-                case 223 /* TypeAliasDeclaration */:
-                case 159 /* TypeLiteral */:
-                    return 2 /* Type */;
-                case 221 /* ClassDeclaration */:
-                case 224 /* EnumDeclaration */:
-                    return 1 /* Value */ | 2 /* Type */;
-                case 225 /* ModuleDeclaration */:
-                    if (ts.isAmbientModule(node)) {
-                        return 4 /* Namespace */ | 1 /* Value */;
-                    }
-                    else if (ts.getModuleInstanceState(node) === 1 /* Instantiated */) {
-                        return 4 /* Namespace */ | 1 /* Value */;
-                    }
-                    else {
-                        return 4 /* Namespace */;
-                    }
-                case 233 /* NamedImports */:
-                case 234 /* ImportSpecifier */:
-                case 229 /* ImportEqualsDeclaration */:
-                case 230 /* ImportDeclaration */:
-                case 235 /* ExportAssignment */:
-                case 236 /* ExportDeclaration */:
-                    return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-                // An external module can be a Value
-                case 256 /* SourceFile */:
-                    return 4 /* Namespace */ | 1 /* Value */;
-            }
-            return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-        }
-        function isTypeReference(node) {
-            if (ts.isRightSideOfQualifiedNameOrPropertyAccess(node)) {
-                node = node.parent;
-            }
-            return node.parent.kind === 155 /* TypeReference */ ||
-                (node.parent.kind === 194 /* ExpressionWithTypeArguments */ && !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent)) ||
-                (node.kind === 97 /* ThisKeyword */ && !ts.isExpression(node)) ||
-                node.kind === 165 /* ThisType */;
-        }
-        function isNamespaceReference(node) {
-            return isQualifiedNameNamespaceReference(node) || isPropertyAccessNamespaceReference(node);
-        }
-        function isPropertyAccessNamespaceReference(node) {
-            var root = node;
-            var isLastClause = true;
-            if (root.parent.kind === 172 /* PropertyAccessExpression */) {
-                while (root.parent && root.parent.kind === 172 /* PropertyAccessExpression */) {
-                    root = root.parent;
-                }
-                isLastClause = root.name === node;
-            }
-            if (!isLastClause && root.parent.kind === 194 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 251 /* HeritageClause */) {
-                var decl = root.parent.parent.parent;
-                return (decl.kind === 221 /* ClassDeclaration */ && root.parent.parent.token === 106 /* ImplementsKeyword */) ||
-                    (decl.kind === 222 /* InterfaceDeclaration */ && root.parent.parent.token === 83 /* ExtendsKeyword */);
-            }
-            return false;
-        }
-        function isQualifiedNameNamespaceReference(node) {
-            var root = node;
-            var isLastClause = true;
-            if (root.parent.kind === 139 /* QualifiedName */) {
-                while (root.parent && root.parent.kind === 139 /* QualifiedName */) {
-                    root = root.parent;
-                }
-                isLastClause = root.right === node;
-            }
-            return root.parent.kind === 155 /* TypeReference */ && !isLastClause;
-        }
-        function isInRightSideOfImport(node) {
-            while (node.parent.kind === 139 /* QualifiedName */) {
-                node = node.parent;
-            }
-            return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
-        }
-        function getMeaningFromRightHandSideOfImportEquals(node) {
-            ts.Debug.assert(node.kind === 69 /* Identifier */);
-            //     import a = |b|; // Namespace
-            //     import a = |b.c|; // Value, type, namespace
-            //     import a = |b.c|.d; // Namespace
-            if (node.parent.kind === 139 /* QualifiedName */ &&
-                node.parent.right === node &&
-                node.parent.parent.kind === 229 /* ImportEqualsDeclaration */) {
-                return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-            }
-            return 4 /* Namespace */;
-        }
-        function getMeaningFromLocation(node) {
-            if (node.parent.kind === 235 /* ExportAssignment */) {
-                return 1 /* Value */ | 2 /* Type */ | 4 /* Namespace */;
-            }
-            else if (isInRightSideOfImport(node)) {
-                return getMeaningFromRightHandSideOfImportEquals(node);
-            }
-            else if (ts.isDeclarationName(node)) {
-                return getMeaningFromDeclaration(node.parent);
-            }
-            else if (isTypeReference(node)) {
-                return 2 /* Type */;
-            }
-            else if (isNamespaceReference(node)) {
-                return 4 /* Namespace */;
-            }
-            else {
-                return 1 /* Value */;
-            }
-        }
-        // Signature help
-        /**
-         * This is a semantic operation.
-         */
-        function getSignatureHelpItems(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            return ts.SignatureHelp.getSignatureHelpItems(program, sourceFile, position, cancellationToken);
-        }
-        /// Syntactic features
-        function getNonBoundSourceFile(fileName) {
-            return syntaxTreeCache.getCurrentSourceFile(fileName);
-        }
-        function getNameOrDottedNameSpan(fileName, startPos, endPos) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            // Get node at the location
-            var node = ts.getTouchingPropertyName(sourceFile, startPos);
-            if (node === sourceFile) {
-                return;
-            }
-            switch (node.kind) {
-                case 172 /* PropertyAccessExpression */:
-                case 139 /* QualifiedName */:
-                case 9 /* StringLiteral */:
-                case 166 /* StringLiteralType */:
-                case 84 /* FalseKeyword */:
-                case 99 /* TrueKeyword */:
-                case 93 /* NullKeyword */:
-                case 95 /* SuperKeyword */:
-                case 97 /* ThisKeyword */:
-                case 165 /* ThisType */:
-                case 69 /* Identifier */:
-                    break;
-                // Cant create the text span
-                default:
-                    return;
-            }
-            var nodeForStartPos = node;
-            while (true) {
-                if (isRightSideOfPropertyAccess(nodeForStartPos) || isRightSideOfQualifiedName(nodeForStartPos)) {
-                    // If on the span is in right side of the the property or qualified name, return the span from the qualified name pos to end of this node
-                    nodeForStartPos = nodeForStartPos.parent;
-                }
-                else if (isNameOfModuleDeclaration(nodeForStartPos)) {
-                    // If this is name of a module declarations, check if this is right side of dotted module name
-                    // If parent of the module declaration which is parent of this node is module declaration and its body is the module declaration that this node is name of
-                    // Then this name is name from dotted module
-                    if (nodeForStartPos.parent.parent.kind === 225 /* ModuleDeclaration */ &&
-                        nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
-                        // Use parent module declarations name for start pos
-                        nodeForStartPos = nodeForStartPos.parent.parent.name;
-                    }
-                    else {
-                        // We have to use this name for start pos
-                        break;
-                    }
-                }
-                else {
-                    // Is not a member expression so we have found the node for start pos
-                    break;
-                }
-            }
-            return ts.createTextSpanFromBounds(nodeForStartPos.getStart(), node.getEnd());
-        }
-        function getBreakpointStatementAtPosition(fileName, position) {
-            // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.BreakpointResolver.spanInSourceFileAtLocation(sourceFile, position);
-        }
-        function getNavigationBarItems(fileName) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.NavigationBar.getNavigationBarItems(sourceFile);
-        }
-        function getSemanticClassifications(fileName, span) {
-            return convertClassifications(getEncodedSemanticClassifications(fileName, span));
-        }
-        function checkForClassificationCancellation(kind) {
-            // We don't want to actually call back into our host on every node to find out if we've
-            // been canceled.  That would be an enormous amount of chattyness, along with the all
-            // the overhead of marshalling the data to/from the host.  So instead we pick a few
-            // reasonable node kinds to bother checking on.  These node kinds represent high level
-            // constructs that we would expect to see commonly, but just at a far less frequent
-            // interval.
-            //
-            // For example, in checker.ts (around 750k) we only have around 600 of these constructs.
-            // That means we're calling back into the host around every 1.2k of the file we process.
-            // Lib.d.ts has similar numbers.
-            switch (kind) {
-                case 225 /* ModuleDeclaration */:
-                case 221 /* ClassDeclaration */:
-                case 222 /* InterfaceDeclaration */:
-                case 220 /* FunctionDeclaration */:
-                    cancellationToken.throwIfCancellationRequested();
-            }
-        }
-        function getEncodedSemanticClassifications(fileName, span) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var typeChecker = program.getTypeChecker();
-            var result = [];
-            var classifiableNames = program.getClassifiableNames();
-            processNode(sourceFile);
-            return { spans: result, endOfLineState: 0 /* None */ };
-            function pushClassification(start, length, type) {
-                result.push(start);
-                result.push(length);
-                result.push(type);
-            }
-            function classifySymbol(symbol, meaningAtPosition) {
-                var flags = symbol.getFlags();
-                if ((flags & 788448 /* Classifiable */) === 0 /* None */) {
-                    return;
-                }
-                if (flags & 32 /* Class */) {
-                    return 11 /* className */;
-                }
-                else if (flags & 384 /* Enum */) {
-                    return 12 /* enumName */;
-                }
-                else if (flags & 524288 /* TypeAlias */) {
-                    return 16 /* typeAliasName */;
-                }
-                else if (meaningAtPosition & 2 /* Type */) {
-                    if (flags & 64 /* Interface */) {
-                        return 13 /* interfaceName */;
-                    }
-                    else if (flags & 262144 /* TypeParameter */) {
-                        return 15 /* typeParameterName */;
-                    }
-                }
-                else if (flags & 1536 /* Module */) {
-                    // Only classify a module as such if
-                    //  - It appears in a namespace context.
-                    //  - There exists a module declaration which actually impacts the value side.
-                    if (meaningAtPosition & 4 /* Namespace */ ||
-                        (meaningAtPosition & 1 /* Value */ && hasValueSideModule(symbol))) {
-                        return 14 /* moduleName */;
-                    }
-                }
-                return undefined;
-                /**
-                 * Returns true if there exists a module that introduces entities on the value side.
-                 */
-                function hasValueSideModule(symbol) {
-                    return ts.forEach(symbol.declarations, function (declaration) {
-                        return declaration.kind === 225 /* ModuleDeclaration */ &&
-                            ts.getModuleInstanceState(declaration) === 1 /* Instantiated */;
-                    });
-                }
-            }
-            function processNode(node) {
-                // Only walk into nodes that intersect the requested span.
-                if (node && ts.textSpanIntersectsWith(span, node.getFullStart(), node.getFullWidth())) {
-                    var kind = node.kind;
-                    checkForClassificationCancellation(kind);
-                    if (kind === 69 /* Identifier */ && !ts.nodeIsMissing(node)) {
-                        var identifier = node;
-                        // Only bother calling into the typechecker if this is an identifier that
-                        // could possibly resolve to a type name.  This makes classification run
-                        // in a third of the time it would normally take.
-                        if (classifiableNames[identifier.text]) {
-                            var symbol = typeChecker.getSymbolAtLocation(node);
-                            if (symbol) {
-                                var type = classifySymbol(symbol, getMeaningFromLocation(node));
-                                if (type) {
-                                    pushClassification(node.getStart(), node.getWidth(), type);
-                                }
-                            }
-                        }
-                    }
-                    ts.forEachChild(node, processNode);
-                }
-            }
-        }
-        function getClassificationTypeName(type) {
-            switch (type) {
-                case 1 /* comment */: return ClassificationTypeNames.comment;
-                case 2 /* identifier */: return ClassificationTypeNames.identifier;
-                case 3 /* keyword */: return ClassificationTypeNames.keyword;
-                case 4 /* numericLiteral */: return ClassificationTypeNames.numericLiteral;
-                case 5 /* operator */: return ClassificationTypeNames.operator;
-                case 6 /* stringLiteral */: return ClassificationTypeNames.stringLiteral;
-                case 8 /* whiteSpace */: return ClassificationTypeNames.whiteSpace;
-                case 9 /* text */: return ClassificationTypeNames.text;
-                case 10 /* punctuation */: return ClassificationTypeNames.punctuation;
-                case 11 /* className */: return ClassificationTypeNames.className;
-                case 12 /* enumName */: return ClassificationTypeNames.enumName;
-                case 13 /* interfaceName */: return ClassificationTypeNames.interfaceName;
-                case 14 /* moduleName */: return ClassificationTypeNames.moduleName;
-                case 15 /* typeParameterName */: return ClassificationTypeNames.typeParameterName;
-                case 16 /* typeAliasName */: return ClassificationTypeNames.typeAliasName;
-                case 17 /* parameterName */: return ClassificationTypeNames.parameterName;
-                case 18 /* docCommentTagName */: return ClassificationTypeNames.docCommentTagName;
-                case 19 /* jsxOpenTagName */: return ClassificationTypeNames.jsxOpenTagName;
-                case 20 /* jsxCloseTagName */: return ClassificationTypeNames.jsxCloseTagName;
-                case 21 /* jsxSelfClosingTagName */: return ClassificationTypeNames.jsxSelfClosingTagName;
-                case 22 /* jsxAttribute */: return ClassificationTypeNames.jsxAttribute;
-                case 23 /* jsxText */: return ClassificationTypeNames.jsxText;
-                case 24 /* jsxAttributeStringLiteralValue */: return ClassificationTypeNames.jsxAttributeStringLiteralValue;
-            }
-        }
-        function convertClassifications(classifications) {
-            ts.Debug.assert(classifications.spans.length % 3 === 0);
-            var dense = classifications.spans;
-            var result = [];
-            for (var i = 0, n = dense.length; i < n; i += 3) {
-                result.push({
-                    textSpan: ts.createTextSpan(dense[i], dense[i + 1]),
-                    classificationType: getClassificationTypeName(dense[i + 2])
-                });
-            }
-            return result;
-        }
-        function getSyntacticClassifications(fileName, span) {
-            return convertClassifications(getEncodedSyntacticClassifications(fileName, span));
-        }
-        function getEncodedSyntacticClassifications(fileName, span) {
-            // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            var spanStart = span.start;
-            var spanLength = span.length;
-            // Make a scanner we can get trivia from.
-            var triviaScanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-            var mergeConflictScanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ false, sourceFile.languageVariant, sourceFile.text);
-            var result = [];
-            processElement(sourceFile);
-            return { spans: result, endOfLineState: 0 /* None */ };
-            function pushClassification(start, length, type) {
-                result.push(start);
-                result.push(length);
-                result.push(type);
-            }
-            function classifyLeadingTriviaAndGetTokenStart(token) {
-                triviaScanner.setTextPos(token.pos);
-                while (true) {
-                    var start = triviaScanner.getTextPos();
-                    // only bother scanning if we have something that could be trivia.
-                    if (!ts.couldStartTrivia(sourceFile.text, start)) {
-                        return start;
-                    }
-                    var kind = triviaScanner.scan();
-                    var end = triviaScanner.getTextPos();
-                    var width = end - start;
-                    // The moment we get something that isn't trivia, then stop processing.
-                    if (!ts.isTrivia(kind)) {
-                        return start;
-                    }
-                    // Don't bother with newlines/whitespace.
-                    if (kind === 4 /* NewLineTrivia */ || kind === 5 /* WhitespaceTrivia */) {
-                        continue;
-                    }
-                    // Only bother with the trivia if it at least intersects the span of interest.
-                    if (ts.isComment(kind)) {
-                        classifyComment(token, kind, start, width);
-                        // Classifying a comment might cause us to reuse the trivia scanner
-                        // (because of jsdoc comments).  So after we classify the comment make
-                        // sure we set the scanner position back to where it needs to be.
-                        triviaScanner.setTextPos(end);
-                        continue;
-                    }
-                    if (kind === 7 /* ConflictMarkerTrivia */) {
-                        var text = sourceFile.text;
-                        var ch = text.charCodeAt(start);
-                        // for the <<<<<<< and >>>>>>> markers, we just add them in as comments
-                        // in the classification stream.
-                        if (ch === 60 /* lessThan */ || ch === 62 /* greaterThan */) {
-                            pushClassification(start, width, 1 /* comment */);
-                            continue;
-                        }
-                        // for the ======== add a comment for the first line, and then lex all
-                        // subsequent lines up until the end of the conflict marker.
-                        ts.Debug.assert(ch === 61 /* equals */);
-                        classifyDisabledMergeCode(text, start, end);
-                    }
-                }
-            }
-            function classifyComment(token, kind, start, width) {
-                if (kind === 3 /* MultiLineCommentTrivia */) {
-                    // See if this is a doc comment.  If so, we'll classify certain portions of it
-                    // specially.
-                    var docCommentAndDiagnostics = ts.parseIsolatedJSDocComment(sourceFile.text, start, width);
-                    if (docCommentAndDiagnostics && docCommentAndDiagnostics.jsDocComment) {
-                        docCommentAndDiagnostics.jsDocComment.parent = token;
-                        classifyJSDocComment(docCommentAndDiagnostics.jsDocComment);
-                        return;
-                    }
-                }
-                // Simple comment.  Just add as is.
-                pushCommentRange(start, width);
-            }
-            function pushCommentRange(start, width) {
-                pushClassification(start, width, 1 /* comment */);
-            }
-            function classifyJSDocComment(docComment) {
-                var pos = docComment.pos;
-                for (var _i = 0, _a = docComment.tags; _i < _a.length; _i++) {
-                    var tag = _a[_i];
-                    // As we walk through each tag, classify the portion of text from the end of
-                    // the last tag (or the start of the entire doc comment) as 'comment'.
-                    if (tag.pos !== pos) {
-                        pushCommentRange(pos, tag.pos - pos);
-                    }
-                    pushClassification(tag.atToken.pos, tag.atToken.end - tag.atToken.pos, 10 /* punctuation */);
-                    pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */);
-                    pos = tag.tagName.end;
-                    switch (tag.kind) {
-                        case 275 /* JSDocParameterTag */:
-                            processJSDocParameterTag(tag);
-                            break;
-                        case 278 /* JSDocTemplateTag */:
-                            processJSDocTemplateTag(tag);
-                            break;
-                        case 277 /* JSDocTypeTag */:
-                            processElement(tag.typeExpression);
-                            break;
-                        case 276 /* JSDocReturnTag */:
-                            processElement(tag.typeExpression);
-                            break;
-                    }
-                    pos = tag.end;
-                }
-                if (pos !== docComment.end) {
-                    pushCommentRange(pos, docComment.end - pos);
-                }
-                return;
-                function processJSDocParameterTag(tag) {
-                    if (tag.preParameterName) {
-                        pushCommentRange(pos, tag.preParameterName.pos - pos);
-                        pushClassification(tag.preParameterName.pos, tag.preParameterName.end - tag.preParameterName.pos, 17 /* parameterName */);
-                        pos = tag.preParameterName.end;
-                    }
-                    if (tag.typeExpression) {
-                        pushCommentRange(pos, tag.typeExpression.pos - pos);
-                        processElement(tag.typeExpression);
-                        pos = tag.typeExpression.end;
-                    }
-                    if (tag.postParameterName) {
-                        pushCommentRange(pos, tag.postParameterName.pos - pos);
-                        pushClassification(tag.postParameterName.pos, tag.postParameterName.end - tag.postParameterName.pos, 17 /* parameterName */);
-                        pos = tag.postParameterName.end;
-                    }
-                }
-            }
-            function processJSDocTemplateTag(tag) {
-                for (var _i = 0, _a = tag.getChildren(); _i < _a.length; _i++) {
-                    var child = _a[_i];
-                    processElement(child);
-                }
-            }
-            function classifyDisabledMergeCode(text, start, end) {
-                // Classify the line that the ======= marker is on as a comment.  Then just lex
-                // all further tokens and add them to the result.
-                var i;
-                for (i = start; i < end; i++) {
-                    if (ts.isLineBreak(text.charCodeAt(i))) {
-                        break;
-                    }
-                }
-                pushClassification(start, i - start, 1 /* comment */);
-                mergeConflictScanner.setTextPos(i);
-                while (mergeConflictScanner.getTextPos() < end) {
-                    classifyDisabledCodeToken();
-                }
-            }
-            function classifyDisabledCodeToken() {
-                var start = mergeConflictScanner.getTextPos();
-                var tokenKind = mergeConflictScanner.scan();
-                var end = mergeConflictScanner.getTextPos();
-                var type = classifyTokenType(tokenKind);
-                if (type) {
-                    pushClassification(start, end - start, type);
-                }
-            }
-            /**
-             * Returns true if node should be treated as classified and no further processing is required.
-             * False will mean that node is not classified and traverse routine should recurse into node contents.
-             */
-            function tryClassifyNode(node) {
-                if (ts.nodeIsMissing(node)) {
-                    return true;
-                }
-                var classifiedElementName = tryClassifyJsxElementName(node);
-                if (!ts.isToken(node) && node.kind !== 244 /* JsxText */ && classifiedElementName === undefined) {
-                    return false;
-                }
-                var tokenStart = node.kind === 244 /* JsxText */ ? node.pos : classifyLeadingTriviaAndGetTokenStart(node);
-                var tokenWidth = node.end - tokenStart;
-                ts.Debug.assert(tokenWidth >= 0);
-                if (tokenWidth > 0) {
-                    var type = classifiedElementName || classifyTokenType(node.kind, node);
-                    if (type) {
-                        pushClassification(tokenStart, tokenWidth, type);
-                    }
-                }
-                return true;
-            }
-            function tryClassifyJsxElementName(token) {
-                switch (token.parent && token.parent.kind) {
-                    case 243 /* JsxOpeningElement */:
-                        if (token.parent.tagName === token) {
-                            return 19 /* jsxOpenTagName */;
-                        }
-                        break;
-                    case 245 /* JsxClosingElement */:
-                        if (token.parent.tagName === token) {
-                            return 20 /* jsxCloseTagName */;
-                        }
-                        break;
-                    case 242 /* JsxSelfClosingElement */:
-                        if (token.parent.tagName === token) {
-                            return 21 /* jsxSelfClosingTagName */;
-                        }
-                        break;
-                    case 246 /* JsxAttribute */:
-                        if (token.parent.name === token) {
-                            return 22 /* jsxAttribute */;
-                        }
-                        break;
-                }
-                return undefined;
-            }
-            // for accurate classification, the actual token should be passed in.  however, for
-            // cases like 'disabled merge code' classification, we just get the token kind and
-            // classify based on that instead.
-            function classifyTokenType(tokenKind, token) {
-                if (ts.isKeyword(tokenKind)) {
-                    return 3 /* keyword */;
-                }
-                // Special case < and >  If they appear in a generic context they are punctuation,
-                // not operators.
-                if (tokenKind === 25 /* LessThanToken */ || tokenKind === 27 /* GreaterThanToken */) {
-                    // If the node owning the token has a type argument list or type parameter list, then
-                    // we can effectively assume that a '<' and '>' belong to those lists.
-                    if (token && ts.getTypeArgumentOrTypeParameterList(token.parent)) {
-                        return 10 /* punctuation */;
-                    }
-                }
-                if (ts.isPunctuation(tokenKind)) {
-                    if (token) {
-                        if (tokenKind === 56 /* EqualsToken */) {
-                            // the '=' in a variable declaration is special cased here.
-                            if (token.parent.kind === 218 /* VariableDeclaration */ ||
-                                token.parent.kind === 145 /* PropertyDeclaration */ ||
-                                token.parent.kind === 142 /* Parameter */ ||
-                                token.parent.kind === 246 /* JsxAttribute */) {
-                                return 5 /* operator */;
-                            }
-                        }
-                        if (token.parent.kind === 187 /* BinaryExpression */ ||
-                            token.parent.kind === 185 /* PrefixUnaryExpression */ ||
-                            token.parent.kind === 186 /* PostfixUnaryExpression */ ||
-                            token.parent.kind === 188 /* ConditionalExpression */) {
-                            return 5 /* operator */;
-                        }
-                    }
-                    return 10 /* punctuation */;
-                }
-                else if (tokenKind === 8 /* NumericLiteral */) {
-                    return 4 /* numericLiteral */;
-                }
-                else if (tokenKind === 9 /* StringLiteral */ || tokenKind === 166 /* StringLiteralType */) {
-                    return token.parent.kind === 246 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
-                }
-                else if (tokenKind === 10 /* RegularExpressionLiteral */) {
-                    // TODO: we should get another classification type for these literals.
-                    return 6 /* stringLiteral */;
-                }
-                else if (ts.isTemplateLiteralKind(tokenKind)) {
-                    // TODO (drosen): we should *also* get another classification type for these literals.
-                    return 6 /* stringLiteral */;
-                }
-                else if (tokenKind === 244 /* JsxText */) {
-                    return 23 /* jsxText */;
-                }
-                else if (tokenKind === 69 /* Identifier */) {
-                    if (token) {
-                        switch (token.parent.kind) {
-                            case 221 /* ClassDeclaration */:
-                                if (token.parent.name === token) {
-                                    return 11 /* className */;
-                                }
-                                return;
-                            case 141 /* TypeParameter */:
-                                if (token.parent.name === token) {
-                                    return 15 /* typeParameterName */;
-                                }
-                                return;
-                            case 222 /* InterfaceDeclaration */:
-                                if (token.parent.name === token) {
-                                    return 13 /* interfaceName */;
-                                }
-                                return;
-                            case 224 /* EnumDeclaration */:
-                                if (token.parent.name === token) {
-                                    return 12 /* enumName */;
-                                }
-                                return;
-                            case 225 /* ModuleDeclaration */:
-                                if (token.parent.name === token) {
-                                    return 14 /* moduleName */;
-                                }
-                                return;
-                            case 142 /* Parameter */:
-                                if (token.parent.name === token) {
-                                    var isThis_1 = token.kind === 69 /* Identifier */ && token.originalKeywordKind === 97 /* ThisKeyword */;
-                                    return isThis_1 ? 3 /* keyword */ : 17 /* parameterName */;
-                                }
-                                return;
-                        }
-                    }
-                    return 2 /* identifier */;
-                }
-            }
-            function processElement(element) {
-                if (!element) {
-                    return;
-                }
-                // Ignore nodes that don't intersect the original span to classify.
-                if (ts.decodedTextSpanIntersectsWith(spanStart, spanLength, element.pos, element.getFullWidth())) {
-                    checkForClassificationCancellation(element.kind);
-                    var children = element.getChildren(sourceFile);
-                    for (var i = 0, n = children.length; i < n; i++) {
-                        var child = children[i];
-                        if (!tryClassifyNode(child)) {
-                            // Recurse into our child nodes.
-                            processElement(child);
-                        }
-                    }
-                }
-            }
-        }
-        function getOutliningSpans(fileName) {
-            // doesn't use compiler - no need to synchronize with host
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.OutliningElementsCollector.collectElements(sourceFile);
-        }
-        function getBraceMatchingAtPosition(fileName, position) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            var result = [];
-            var token = ts.getTouchingToken(sourceFile, position);
-            if (token.getStart(sourceFile) === position) {
-                var matchKind = getMatchingTokenKind(token);
-                // Ensure that there is a corresponding token to match ours.
-                if (matchKind) {
-                    var parentElement = token.parent;
-                    var childNodes = parentElement.getChildren(sourceFile);
-                    for (var _i = 0, childNodes_1 = childNodes; _i < childNodes_1.length; _i++) {
-                        var current = childNodes_1[_i];
-                        if (current.kind === matchKind) {
-                            var range1 = ts.createTextSpan(token.getStart(sourceFile), token.getWidth(sourceFile));
-                            var range2 = ts.createTextSpan(current.getStart(sourceFile), current.getWidth(sourceFile));
-                            // We want to order the braces when we return the result.
-                            if (range1.start < range2.start) {
-                                result.push(range1, range2);
-                            }
-                            else {
-                                result.push(range2, range1);
-                            }
-                            break;
-                        }
-                    }
-                }
-            }
-            return result;
-            function getMatchingTokenKind(token) {
-                switch (token.kind) {
-                    case 15 /* OpenBraceToken */: return 16 /* CloseBraceToken */;
-                    case 17 /* OpenParenToken */: return 18 /* CloseParenToken */;
-                    case 19 /* OpenBracketToken */: return 20 /* CloseBracketToken */;
-                    case 25 /* LessThanToken */: return 27 /* GreaterThanToken */;
-                    case 16 /* CloseBraceToken */: return 15 /* OpenBraceToken */;
-                    case 18 /* CloseParenToken */: return 17 /* OpenParenToken */;
-                    case 20 /* CloseBracketToken */: return 19 /* OpenBracketToken */;
-                    case 27 /* GreaterThanToken */: return 25 /* LessThanToken */;
-                }
-                return undefined;
-            }
-        }
-        function getIndentationAtPosition(fileName, position, editorOptions) {
-            var start = new Date().getTime();
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            log("getIndentationAtPosition: getCurrentSourceFile: " + (new Date().getTime() - start));
-            start = new Date().getTime();
-            var result = ts.formatting.SmartIndenter.getIndentation(position, sourceFile, editorOptions);
-            log("getIndentationAtPosition: computeIndentation  : " + (new Date().getTime() - start));
-            return result;
-        }
-        function getFormattingEditsForRange(fileName, start, end, options) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.formatting.formatSelection(start, end, sourceFile, getRuleProvider(options), options);
-        }
-        function getFormattingEditsForDocument(fileName, options) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            return ts.formatting.formatDocument(sourceFile, getRuleProvider(options), options);
-        }
-        function getFormattingEditsAfterKeystroke(fileName, position, key, options) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            if (key === "}") {
-                return ts.formatting.formatOnClosingCurly(position, sourceFile, getRuleProvider(options), options);
-            }
-            else if (key === ";") {
-                return ts.formatting.formatOnSemicolon(position, sourceFile, getRuleProvider(options), options);
-            }
-            else if (key === "\n") {
-                return ts.formatting.formatOnEnter(position, sourceFile, getRuleProvider(options), options);
-            }
-            return [];
-        }
-        /**
-         * Checks if position points to a valid position to add JSDoc comments, and if so,
-         * returns the appropriate template. Otherwise returns an empty string.
-         * Valid positions are
-         *      - outside of comments, statements, and expressions, and
-         *      - preceding a:
-         *          - function/constructor/method declaration
-         *          - class declarations
-         *          - variable statements
-         *          - namespace declarations
-         *
-         * Hosts should ideally check that:
-         * - The line is all whitespace up to 'position' before performing the insertion.
-         * - If the keystroke sequence "/\*\*" induced the call, we also check that the next
-         * non-whitespace character is '*', which (approximately) indicates whether we added
-         * the second '*' to complete an existing (JSDoc) comment.
-         * @param fileName The file in which to perform the check.
-         * @param position The (character-indexed) position in the file where the check should
-         * be performed.
-         */
-        function getDocCommentTemplateAtPosition(fileName, position) {
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            // Check if in a context where we don't want to perform any insertion
-            if (ts.isInString(sourceFile, position) || ts.isInComment(sourceFile, position) || ts.hasDocComment(sourceFile, position)) {
-                return undefined;
-            }
-            var tokenAtPos = ts.getTokenAtPosition(sourceFile, position);
-            var tokenStart = tokenAtPos.getStart();
-            if (!tokenAtPos || tokenStart < position) {
-                return undefined;
-            }
-            // TODO: add support for:
-            // - enums/enum members
-            // - interfaces
-            // - property declarations
-            // - potentially property assignments
-            var commentOwner;
-            findOwner: for (commentOwner = tokenAtPos; commentOwner; commentOwner = commentOwner.parent) {
-                switch (commentOwner.kind) {
-                    case 220 /* FunctionDeclaration */:
-                    case 147 /* MethodDeclaration */:
-                    case 148 /* Constructor */:
-                    case 221 /* ClassDeclaration */:
-                    case 200 /* VariableStatement */:
-                        break findOwner;
-                    case 256 /* SourceFile */:
-                        return undefined;
-                    case 225 /* ModuleDeclaration */:
-                        // If in walking up the tree, we hit a a nested namespace declaration,
-                        // then we must be somewhere within a dotted namespace name; however we don't
-                        // want to give back a JSDoc template for the 'b' or 'c' in 'namespace a.b.c { }'.
-                        if (commentOwner.parent.kind === 225 /* ModuleDeclaration */) {
-                            return undefined;
-                        }
-                        break findOwner;
-                }
-            }
-            if (!commentOwner || commentOwner.getStart() < position) {
-                return undefined;
-            }
-            var parameters = getParametersForJsDocOwningNode(commentOwner);
-            var posLineAndChar = sourceFile.getLineAndCharacterOfPosition(position);
-            var lineStart = sourceFile.getLineStarts()[posLineAndChar.line];
-            var indentationStr = sourceFile.text.substr(lineStart, posLineAndChar.character);
-            var newLine = ts.getNewLineOrDefaultFromHost(host);
-            var docParams = "";
-            for (var i = 0, numParams = parameters.length; i < numParams; i++) {
-                var currentName = parameters[i].name;
-                var paramName = currentName.kind === 69 /* Identifier */ ?
-                    currentName.text :
-                    "param" + i;
-                docParams += indentationStr + " * @param " + paramName + newLine;
-            }
-            // A doc comment consists of the following
-            // * The opening comment line
-            // * the first line (without a param) for the object's untagged info (this is also where the caret ends up)
-            // * the '@param'-tagged lines
-            // * TODO: other tags.
-            // * the closing comment line
-            // * if the caret was directly in front of the object, then we add an extra line and indentation.
-            var preamble = "/**" + newLine +
-                indentationStr + " * ";
-            var result = preamble + newLine +
-                docParams +
-                indentationStr + " */" +
-                (tokenStart === position ? newLine + indentationStr : "");
-            return { newText: result, caretOffset: preamble.length };
-        }
-        function isValidBraceCompletionAtPosition(fileName, position, openingBrace) {
-            // '<' is currently not supported, figuring out if we're in a Generic Type vs. a comparison is too
-            // expensive to do during typing scenarios
-            // i.e. whether we're dealing with:
-            //      var x = new foo<| ( with class foo<T>{} )
-            // or
-            //      var y = 3 <|
-            if (openingBrace === 60 /* lessThan */) {
-                return false;
-            }
-            var sourceFile = syntaxTreeCache.getCurrentSourceFile(fileName);
-            // Check if in a context where we don't want to perform any insertion
-            if (ts.isInString(sourceFile, position) || ts.isInComment(sourceFile, position)) {
-                return false;
-            }
-            if (ts.isInsideJsxElementOrAttribute(sourceFile, position)) {
-                return openingBrace === 123 /* openBrace */;
-            }
-            if (ts.isInTemplateString(sourceFile, position)) {
-                return false;
-            }
-            return true;
-        }
-        function getParametersForJsDocOwningNode(commentOwner) {
-            if (ts.isFunctionLike(commentOwner)) {
-                return commentOwner.parameters;
-            }
-            if (commentOwner.kind === 200 /* VariableStatement */) {
-                var varStatement = commentOwner;
-                var varDeclarations = varStatement.declarationList.declarations;
-                if (varDeclarations.length === 1 && varDeclarations[0].initializer) {
-                    return getParametersFromRightHandSideOfAssignment(varDeclarations[0].initializer);
-                }
-            }
-            return emptyArray;
-        }
-        /**
-         * Digs into an an initializer or RHS operand of an assignment operation
-         * to get the parameters of an apt signature corresponding to a
-         * function expression or a class expression.
-         *
-         * @param rightHandSide the expression which may contain an appropriate set of parameters
-         * @returns the parameters of a signature found on the RHS if one exists; otherwise 'emptyArray'.
-         */
-        function getParametersFromRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 178 /* ParenthesizedExpression */) {
-                rightHandSide = rightHandSide.expression;
-            }
-            switch (rightHandSide.kind) {
-                case 179 /* FunctionExpression */:
-                case 180 /* ArrowFunction */:
-                    return rightHandSide.parameters;
-                case 192 /* ClassExpression */:
-                    for (var _i = 0, _a = rightHandSide.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
-                        if (member.kind === 148 /* Constructor */) {
-                            return member.parameters;
-                        }
-                    }
-                    break;
-            }
-            return emptyArray;
-        }
-        function getTodoComments(fileName, descriptors) {
-            // Note: while getting todo comments seems like a syntactic operation, we actually
-            // treat it as a semantic operation here.  This is because we expect our host to call
-            // this on every single file.  If we treat this syntactically, then that will cause
-            // us to populate and throw away the tree in our syntax tree cache for each file.  By
-            // treating this as a semantic operation, we can access any tree without throwing
-            // anything away.
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            cancellationToken.throwIfCancellationRequested();
-            var fileContents = sourceFile.text;
-            var result = [];
-            if (descriptors.length > 0) {
-                var regExp = getTodoCommentsRegExp();
-                var matchArray = void 0;
-                while (matchArray = regExp.exec(fileContents)) {
-                    cancellationToken.throwIfCancellationRequested();
-                    // If we got a match, here is what the match array will look like.  Say the source text is:
-                    //
-                    //      "    // hack   1"
-                    //
-                    // The result array with the regexp:    will be:
-                    //
-                    //      ["// hack   1", "// ", "hack   1", undefined, "hack"]
-                    //
-                    // Here are the relevant capture groups:
-                    //  0) The full match for the entire regexp.
-                    //  1) The preamble to the message portion.
-                    //  2) The message portion.
-                    //  3...N) The descriptor that was matched - by index.  'undefined' for each
-                    //         descriptor that didn't match.  an actual value if it did match.
-                    //
-                    //  i.e. 'undefined' in position 3 above means TODO(jason) didn't match.
-                    //       "hack"      in position 4 means HACK did match.
-                    var firstDescriptorCaptureIndex = 3;
-                    ts.Debug.assert(matchArray.length === descriptors.length + firstDescriptorCaptureIndex);
-                    var preamble = matchArray[1];
-                    var matchPosition = matchArray.index + preamble.length;
-                    // OK, we have found a match in the file.  This is only an acceptable match if
-                    // it is contained within a comment.
-                    var token = ts.getTokenAtPosition(sourceFile, matchPosition);
-                    if (!isInsideComment(sourceFile, token, matchPosition)) {
-                        continue;
-                    }
-                    var descriptor = undefined;
-                    for (var i = 0, n = descriptors.length; i < n; i++) {
-                        if (matchArray[i + firstDescriptorCaptureIndex]) {
-                            descriptor = descriptors[i];
-                        }
-                    }
-                    ts.Debug.assert(descriptor !== undefined);
-                    // We don't want to match something like 'TODOBY', so we make sure a non
-                    // letter/digit follows the match.
-                    if (isLetterOrDigit(fileContents.charCodeAt(matchPosition + descriptor.text.length))) {
-                        continue;
-                    }
-                    var message = matchArray[2];
-                    result.push({
-                        descriptor: descriptor,
-                        message: message,
-                        position: matchPosition
-                    });
-                }
-            }
-            return result;
-            function escapeRegExp(str) {
-                return str.replace(/[\-\[\]\/\{\}\(\)\*\+\?\.\\\^\$\|]/g, "\\$&");
-            }
-            function getTodoCommentsRegExp() {
-                // NOTE: ?:  means 'non-capture group'.  It allows us to have groups without having to
-                // filter them out later in the final result array.
-                // TODO comments can appear in one of the following forms:
-                //
-                //  1)      // TODO     or  /////////// TODO
-                //
-                //  2)      /* TODO     or  /********** TODO
-                //
-                //  3)      /*
-                //           *   TODO
-                //           */
-                //
-                // The following three regexps are used to match the start of the text up to the TODO
-                // comment portion.
-                var singleLineCommentStart = /(?:\/\/+\s*)/.source;
-                var multiLineCommentStart = /(?:\/\*+\s*)/.source;
-                var anyNumberOfSpacesAndAsterisksAtStartOfLine = /(?:^(?:\s|\*)*)/.source;
-                // Match any of the above three TODO comment start regexps.
-                // Note that the outermost group *is* a capture group.  We want to capture the preamble
-                // so that we can determine the starting position of the TODO comment match.
-                var preamble = "(" + anyNumberOfSpacesAndAsterisksAtStartOfLine + "|" + singleLineCommentStart + "|" + multiLineCommentStart + ")";
-                // Takes the descriptors and forms a regexp that matches them as if they were literals.
-                // For example, if the descriptors are "TODO(jason)" and "HACK", then this will be:
-                //
-                //      (?:(TODO\(jason\))|(HACK))
-                //
-                // Note that the outermost group is *not* a capture group, but the innermost groups
-                // *are* capture groups.  By capturing the inner literals we can determine after
-                // matching which descriptor we are dealing with.
-                var literals = "(?:" + ts.map(descriptors, function (d) { return "(" + escapeRegExp(d.text) + ")"; }).join("|") + ")";
-                // After matching a descriptor literal, the following regexp matches the rest of the
-                // text up to the end of the line (or */).
-                var endOfLineOrEndOfComment = /(?:$|\*\/)/.source;
-                var messageRemainder = /(?:.*?)/.source;
-                // This is the portion of the match we'll return as part of the TODO comment result. We
-                // match the literal portion up to the end of the line or end of comment.
-                var messagePortion = "(" + literals + messageRemainder + ")";
-                var regExpString = preamble + messagePortion + endOfLineOrEndOfComment;
-                // The final regexp will look like this:
-                // /((?:\/\/+\s*)|(?:\/\*+\s*)|(?:^(?:\s|\*)*))((?:(TODO\(jason\))|(HACK))(?:.*?))(?:$|\*\/)/gim
-                // The flags of the regexp are important here.
-                //  'g' is so that we are doing a global search and can find matches several times
-                //  in the input.
-                //
-                //  'i' is for case insensitivity (We do this to match C# TODO comment code).
-                //
-                //  'm' is so we can find matches in a multi-line input.
-                return new RegExp(regExpString, "gim");
-            }
-            function isLetterOrDigit(char) {
-                return (char >= 97 /* a */ && char <= 122 /* z */) ||
-                    (char >= 65 /* A */ && char <= 90 /* Z */) ||
-                    (char >= 48 /* _0 */ && char <= 57 /* _9 */);
-            }
-        }
-        function getStringLiteralTypeForNode(node, typeChecker) {
-            var searchNode = node.parent.kind === 166 /* StringLiteralType */ ? node.parent : node;
-            var type = typeChecker.getTypeAtLocation(searchNode);
-            if (type && type.flags & 256 /* StringLiteral */) {
-                return type;
-            }
-            return undefined;
-        }
-        function getRenameInfo(fileName, position) {
-            synchronizeHostData();
-            var sourceFile = getValidSourceFile(fileName);
-            var typeChecker = program.getTypeChecker();
-            var defaultLibFileName = host.getDefaultLibFileName(host.getCompilationSettings());
-            var canonicalDefaultLibName = getCanonicalFileName(ts.normalizePath(defaultLibFileName));
-            var node = ts.getTouchingWord(sourceFile, position, /*includeJsDocComment*/ true);
-            if (node) {
-                if (node.kind === 69 /* Identifier */ ||
-                    node.kind === 9 /* StringLiteral */ ||
-                    isLiteralNameOfPropertyDeclarationOrIndexAccess(node) ||
-                    isThis(node)) {
-                    var symbol = typeChecker.getSymbolAtLocation(node);
-                    // Only allow a symbol to be renamed if it actually has at least one declaration.
-                    if (symbol) {
-                        var declarations = symbol.getDeclarations();
-                        if (declarations && declarations.length > 0) {
-                            // Disallow rename for elements that are defined in the standard TypeScript library.
-                            if (ts.forEach(declarations, isDefinedInLibraryFile)) {
-                                return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
-                            }
-                            var displayName = ts.stripQuotes(ts.getDeclaredName(typeChecker, symbol, node));
-                            var kind = getSymbolKind(symbol, node);
-                            if (kind) {
-                                return {
-                                    canRename: true,
-                                    kind: kind,
-                                    displayName: displayName,
-                                    localizedErrorMessage: undefined,
-                                    fullDisplayName: typeChecker.getFullyQualifiedName(symbol),
-                                    kindModifiers: getSymbolModifiers(symbol),
-                                    triggerSpan: createTriggerSpanForNode(node, sourceFile)
-                                };
-                            }
-                        }
-                    }
-                    else if (node.kind === 9 /* StringLiteral */) {
-                        var type = getStringLiteralTypeForNode(node, typeChecker);
-                        if (type) {
-                            if (isDefinedInLibraryFile(node)) {
-                                return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library));
-                            }
-                            else {
-                                var displayName = ts.stripQuotes(type.text);
-                                return {
-                                    canRename: true,
-                                    kind: ScriptElementKind.variableElement,
-                                    displayName: displayName,
-                                    localizedErrorMessage: undefined,
-                                    fullDisplayName: displayName,
-                                    kindModifiers: ScriptElementKindModifier.none,
-                                    triggerSpan: createTriggerSpanForNode(node, sourceFile)
-                                };
-                            }
-                        }
-                    }
-                }
-            }
-            return getRenameInfoError(ts.getLocaleSpecificMessage(ts.Diagnostics.You_cannot_rename_this_element));
-            function getRenameInfoError(localizedErrorMessage) {
-                return {
-                    canRename: false,
-                    localizedErrorMessage: localizedErrorMessage,
-                    displayName: undefined,
-                    fullDisplayName: undefined,
-                    kind: undefined,
-                    kindModifiers: undefined,
-                    triggerSpan: undefined
-                };
-            }
-            function isDefinedInLibraryFile(declaration) {
-                if (defaultLibFileName) {
-                    var sourceFile_2 = declaration.getSourceFile();
-                    var canonicalName = getCanonicalFileName(ts.normalizePath(sourceFile_2.fileName));
-                    if (canonicalName === canonicalDefaultLibName) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            function createTriggerSpanForNode(node, sourceFile) {
-                var start = node.getStart(sourceFile);
-                var width = node.getWidth(sourceFile);
-                if (node.kind === 9 /* StringLiteral */) {
-                    // Exclude the quotes
-                    start += 1;
-                    width -= 2;
-                }
-                return ts.createTextSpan(start, width);
-            }
-        }
-        return {
-            dispose: dispose,
-            cleanupSemanticCache: cleanupSemanticCache,
-            getSyntacticDiagnostics: getSyntacticDiagnostics,
-            getSemanticDiagnostics: getSemanticDiagnostics,
-            getCompilerOptionsDiagnostics: getCompilerOptionsDiagnostics,
-            getSyntacticClassifications: getSyntacticClassifications,
-            getSemanticClassifications: getSemanticClassifications,
-            getEncodedSyntacticClassifications: getEncodedSyntacticClassifications,
-            getEncodedSemanticClassifications: getEncodedSemanticClassifications,
-            getCompletionsAtPosition: getCompletionsAtPosition,
-            getCompletionEntryDetails: getCompletionEntryDetails,
-            getSignatureHelpItems: getSignatureHelpItems,
-            getQuickInfoAtPosition: getQuickInfoAtPosition,
-            getDefinitionAtPosition: getDefinitionAtPosition,
-            getTypeDefinitionAtPosition: getTypeDefinitionAtPosition,
-            getReferencesAtPosition: getReferencesAtPosition,
-            findReferences: findReferences,
-            getOccurrencesAtPosition: getOccurrencesAtPosition,
-            getDocumentHighlights: getDocumentHighlights,
-            getNameOrDottedNameSpan: getNameOrDottedNameSpan,
-            getBreakpointStatementAtPosition: getBreakpointStatementAtPosition,
-            getNavigateToItems: getNavigateToItems,
-            getRenameInfo: getRenameInfo,
-            findRenameLocations: findRenameLocations,
-            getNavigationBarItems: getNavigationBarItems,
-            getOutliningSpans: getOutliningSpans,
-            getTodoComments: getTodoComments,
-            getBraceMatchingAtPosition: getBraceMatchingAtPosition,
-            getIndentationAtPosition: getIndentationAtPosition,
-            getFormattingEditsForRange: getFormattingEditsForRange,
-            getFormattingEditsForDocument: getFormattingEditsForDocument,
-            getFormattingEditsAfterKeystroke: getFormattingEditsAfterKeystroke,
-            getDocCommentTemplateAtPosition: getDocCommentTemplateAtPosition,
-            isValidBraceCompletionAtPosition: isValidBraceCompletionAtPosition,
-            getEmitOutput: getEmitOutput,
-            getNonBoundSourceFile: getNonBoundSourceFile,
-            getProgram: getProgram
-        };
-    }
-    ts.createLanguageService = createLanguageService;
-    /* @internal */
-    function getNameTable(sourceFile) {
-        if (!sourceFile.nameTable) {
-            initializeNameTable(sourceFile);
-        }
-        return sourceFile.nameTable;
-    }
-    ts.getNameTable = getNameTable;
-    function initializeNameTable(sourceFile) {
-        var nameTable = {};
-        walk(sourceFile);
-        sourceFile.nameTable = nameTable;
-        function walk(node) {
-            switch (node.kind) {
-                case 69 /* Identifier */:
-                    nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
-                    break;
-                case 9 /* StringLiteral */:
-                case 8 /* NumericLiteral */:
-                    // We want to store any numbers/strings if they were a name that could be
-                    // related to a declaration.  So, if we have 'import x = require("something")'
-                    // then we want 'something' to be in the name table.  Similarly, if we have
-                    // "a['propname']" then we want to store "propname" in the name table.
-                    if (ts.isDeclarationName(node) ||
-                        node.parent.kind === 240 /* ExternalModuleReference */ ||
-                        isArgumentOfElementAccessExpression(node) ||
-                        ts.isLiteralComputedPropertyDeclarationName(node)) {
-                        nameTable[node.text] = nameTable[node.text] === undefined ? node.pos : -1;
-                    }
-                    break;
-                default:
-                    ts.forEachChild(node, walk);
-                    if (node.jsDocComments) {
-                        for (var _i = 0, _a = node.jsDocComments; _i < _a.length; _i++) {
-                            var jsDocComment = _a[_i];
-                            ts.forEachChild(jsDocComment, walk);
-                        }
-                    }
-            }
-        }
-    }
-    function isArgumentOfElementAccessExpression(node) {
-        return node &&
-            node.parent &&
-            node.parent.kind === 173 /* ElementAccessExpression */ &&
-            node.parent.argumentExpression === node;
-    }
-    /// Classifier
-    function createClassifier() {
-        var scanner = ts.createScanner(2 /* Latest */, /*skipTrivia*/ false);
-        /// We do not have a full parser support to know when we should parse a regex or not
-        /// If we consider every slash token to be a regex, we could be missing cases like "1/2/3", where
-        /// we have a series of divide operator. this list allows us to be more accurate by ruling out
-        /// locations where a regexp cannot exist.
-        var noRegexTable = [];
-        noRegexTable[69 /* Identifier */] = true;
-        noRegexTable[9 /* StringLiteral */] = true;
-        noRegexTable[8 /* NumericLiteral */] = true;
-        noRegexTable[10 /* RegularExpressionLiteral */] = true;
-        noRegexTable[97 /* ThisKeyword */] = true;
-        noRegexTable[41 /* PlusPlusToken */] = true;
-        noRegexTable[42 /* MinusMinusToken */] = true;
-        noRegexTable[18 /* CloseParenToken */] = true;
-        noRegexTable[20 /* CloseBracketToken */] = true;
-        noRegexTable[16 /* CloseBraceToken */] = true;
-        noRegexTable[99 /* TrueKeyword */] = true;
-        noRegexTable[84 /* FalseKeyword */] = true;
-        // Just a stack of TemplateHeads and OpenCurlyBraces, used to perform rudimentary (inexact)
-        // classification on template strings. Because of the context free nature of templates,
-        // the only precise way to classify a template portion would be by propagating the stack across
-        // lines, just as we do with the end-of-line state. However, this is a burden for implementers,
-        // and the behavior is entirely subsumed by the syntactic classifier anyway, so we instead
-        // flatten any nesting when the template stack is non-empty and encode it in the end-of-line state.
-        // Situations in which this fails are
-        //  1) When template strings are nested across different lines:
-        //          `hello ${ `world
-        //          ` }`
-        //
-        //     Where on the second line, you will get the closing of a template,
-        //     a closing curly, and a new template.
-        //
-        //  2) When substitution expressions have curly braces and the curly brace falls on the next line:
-        //          `hello ${ () => {
-        //          return "world" } } `
-        //
-        //     Where on the second line, you will get the 'return' keyword,
-        //     a string literal, and a template end consisting of '} } `'.
-        var templateStack = [];
-        /** Returns true if 'keyword2' can legally follow 'keyword1' in any language construct. */
-        function canFollow(keyword1, keyword2) {
-            if (ts.isAccessibilityModifier(keyword1)) {
-                if (keyword2 === 123 /* GetKeyword */ ||
-                    keyword2 === 131 /* SetKeyword */ ||
-                    keyword2 === 121 /* ConstructorKeyword */ ||
-                    keyword2 === 113 /* StaticKeyword */) {
-                    // Allow things like "public get", "public constructor" and "public static".
-                    // These are all legal.
-                    return true;
-                }
-                // Any other keyword following "public" is actually an identifier an not a real
-                // keyword.
-                return false;
-            }
-            // Assume any other keyword combination is legal.  This can be refined in the future
-            // if there are more cases we want the classifier to be better at.
-            return true;
-        }
-        function convertClassifications(classifications, text) {
-            var entries = [];
-            var dense = classifications.spans;
-            var lastEnd = 0;
-            for (var i = 0, n = dense.length; i < n; i += 3) {
-                var start = dense[i];
-                var length_3 = dense[i + 1];
-                var type = dense[i + 2];
-                // Make a whitespace entry between the last item and this one.
-                if (lastEnd >= 0) {
-                    var whitespaceLength_1 = start - lastEnd;
-                    if (whitespaceLength_1 > 0) {
-                        entries.push({ length: whitespaceLength_1, classification: TokenClass.Whitespace });
-                    }
-                }
-                entries.push({ length: length_3, classification: convertClassification(type) });
-                lastEnd = start + length_3;
-            }
-            var whitespaceLength = text.length - lastEnd;
-            if (whitespaceLength > 0) {
-                entries.push({ length: whitespaceLength, classification: TokenClass.Whitespace });
-            }
-            return { entries: entries, finalLexState: classifications.endOfLineState };
-        }
-        function convertClassification(type) {
-            switch (type) {
-                case 1 /* comment */: return TokenClass.Comment;
-                case 3 /* keyword */: return TokenClass.Keyword;
-                case 4 /* numericLiteral */: return TokenClass.NumberLiteral;
-                case 5 /* operator */: return TokenClass.Operator;
-                case 6 /* stringLiteral */: return TokenClass.StringLiteral;
-                case 8 /* whiteSpace */: return TokenClass.Whitespace;
-                case 10 /* punctuation */: return TokenClass.Punctuation;
-                case 2 /* identifier */:
-                case 11 /* className */:
-                case 12 /* enumName */:
-                case 13 /* interfaceName */:
-                case 14 /* moduleName */:
-                case 15 /* typeParameterName */:
-                case 16 /* typeAliasName */:
-                case 9 /* text */:
-                case 17 /* parameterName */:
-                default:
-                    return TokenClass.Identifier;
-            }
-        }
-        function getClassificationsForLine(text, lexState, syntacticClassifierAbsent) {
-            return convertClassifications(getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent), text);
-        }
-        // If there is a syntactic classifier ('syntacticClassifierAbsent' is false),
-        // we will be more conservative in order to avoid conflicting with the syntactic classifier.
-        function getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent) {
-            var offset = 0;
-            var token = 0 /* Unknown */;
-            var lastNonTriviaToken = 0 /* Unknown */;
-            // Empty out the template stack for reuse.
-            while (templateStack.length > 0) {
-                templateStack.pop();
-            }
-            // If we're in a string literal, then prepend: "\
-            // (and a newline).  That way when we lex we'll think we're still in a string literal.
-            //
-            // If we're in a multiline comment, then prepend: /*
-            // (and a newline).  That way when we lex we'll think we're still in a multiline comment.
-            switch (lexState) {
-                case 3 /* InDoubleQuoteStringLiteral */:
-                    text = "\"\\\n" + text;
-                    offset = 3;
-                    break;
-                case 2 /* InSingleQuoteStringLiteral */:
-                    text = "'\\\n" + text;
-                    offset = 3;
-                    break;
-                case 1 /* InMultiLineCommentTrivia */:
-                    text = "/*\n" + text;
-                    offset = 3;
-                    break;
-                case 4 /* InTemplateHeadOrNoSubstitutionTemplate */:
-                    text = "`\n" + text;
-                    offset = 2;
-                    break;
-                case 5 /* InTemplateMiddleOrTail */:
-                    text = "}\n" + text;
-                    offset = 2;
-                // fallthrough
-                case 6 /* InTemplateSubstitutionPosition */:
-                    templateStack.push(12 /* TemplateHead */);
-                    break;
-            }
-            scanner.setText(text);
-            var result = {
-                endOfLineState: 0 /* None */,
-                spans: []
-            };
-            // We can run into an unfortunate interaction between the lexical and syntactic classifier
-            // when the user is typing something generic.  Consider the case where the user types:
-            //
-            //      Foo<number
-            //
-            // From the lexical classifier's perspective, 'number' is a keyword, and so the word will
-            // be classified as such.  However, from the syntactic classifier's tree-based perspective
-            // this is simply an expression with the identifier 'number' on the RHS of the less than
-            // token.  So the classification will go back to being an identifier.  The moment the user
-            // types again, number will become a keyword, then an identifier, etc. etc.
-            //
-            // To try to avoid this problem, we avoid classifying contextual keywords as keywords
-            // when the user is potentially typing something generic.  We just can't do a good enough
-            // job at the lexical level, and so well leave it up to the syntactic classifier to make
-            // the determination.
-            //
-            // In order to determine if the user is potentially typing something generic, we use a
-            // weak heuristic where we track < and > tokens.  It's a weak heuristic, but should
-            // work well enough in practice.
-            var angleBracketStack = 0;
-            do {
-                token = scanner.scan();
-                if (!ts.isTrivia(token)) {
-                    if ((token === 39 /* SlashToken */ || token === 61 /* SlashEqualsToken */) && !noRegexTable[lastNonTriviaToken]) {
-                        if (scanner.reScanSlashToken() === 10 /* RegularExpressionLiteral */) {
-                            token = 10 /* RegularExpressionLiteral */;
-                        }
-                    }
-                    else if (lastNonTriviaToken === 21 /* DotToken */ && isKeyword(token)) {
-                        token = 69 /* Identifier */;
-                    }
-                    else if (isKeyword(lastNonTriviaToken) && isKeyword(token) && !canFollow(lastNonTriviaToken, token)) {
-                        // We have two keywords in a row.  Only treat the second as a keyword if
-                        // it's a sequence that could legally occur in the language.  Otherwise
-                        // treat it as an identifier.  This way, if someone writes "private var"
-                        // we recognize that 'var' is actually an identifier here.
-                        token = 69 /* Identifier */;
-                    }
-                    else if (lastNonTriviaToken === 69 /* Identifier */ &&
-                        token === 25 /* LessThanToken */) {
-                        // Could be the start of something generic.  Keep track of that by bumping
-                        // up the current count of generic contexts we may be in.
-                        angleBracketStack++;
-                    }
-                    else if (token === 27 /* GreaterThanToken */ && angleBracketStack > 0) {
-                        // If we think we're currently in something generic, then mark that that
-                        // generic entity is complete.
-                        angleBracketStack--;
-                    }
-                    else if (token === 117 /* AnyKeyword */ ||
-                        token === 132 /* StringKeyword */ ||
-                        token === 130 /* NumberKeyword */ ||
-                        token === 120 /* BooleanKeyword */ ||
-                        token === 133 /* SymbolKeyword */) {
-                        if (angleBracketStack > 0 && !syntacticClassifierAbsent) {
-                            // If it looks like we're could be in something generic, don't classify this
-                            // as a keyword.  We may just get overwritten by the syntactic classifier,
-                            // causing a noisy experience for the user.
-                            token = 69 /* Identifier */;
-                        }
-                    }
-                    else if (token === 12 /* TemplateHead */) {
-                        templateStack.push(token);
-                    }
-                    else if (token === 15 /* OpenBraceToken */) {
-                        // If we don't have anything on the template stack,
-                        // then we aren't trying to keep track of a previously scanned template head.
-                        if (templateStack.length > 0) {
-                            templateStack.push(token);
-                        }
-                    }
-                    else if (token === 16 /* CloseBraceToken */) {
-                        // If we don't have anything on the template stack,
-                        // then we aren't trying to keep track of a previously scanned template head.
-                        if (templateStack.length > 0) {
-                            var lastTemplateStackToken = ts.lastOrUndefined(templateStack);
-                            if (lastTemplateStackToken === 12 /* TemplateHead */) {
-                                token = scanner.reScanTemplateToken();
-                                // Only pop on a TemplateTail; a TemplateMiddle indicates there is more for us.
-                                if (token === 14 /* TemplateTail */) {
-                                    templateStack.pop();
-                                }
-                                else {
-                                    ts.Debug.assert(token === 13 /* TemplateMiddle */, "Should have been a template middle. Was " + token);
-                                }
-                            }
-                            else {
-                                ts.Debug.assert(lastTemplateStackToken === 15 /* OpenBraceToken */, "Should have been an open brace. Was: " + token);
-                                templateStack.pop();
-                            }
-                        }
-                    }
-                    lastNonTriviaToken = token;
-                }
-                processToken();
-            } while (token !== 1 /* EndOfFileToken */);
-            return result;
-            function processToken() {
-                var start = scanner.getTokenPos();
-                var end = scanner.getTextPos();
-                addResult(start, end, classFromKind(token));
-                if (end >= text.length) {
-                    if (token === 9 /* StringLiteral */ || token === 166 /* StringLiteralType */) {
-                        // Check to see if we finished up on a multiline string literal.
-                        var tokenText = scanner.getTokenText();
-                        if (scanner.isUnterminated()) {
-                            var lastCharIndex = tokenText.length - 1;
-                            var numBackslashes = 0;
-                            while (tokenText.charCodeAt(lastCharIndex - numBackslashes) === 92 /* backslash */) {
-                                numBackslashes++;
-                            }
-                            // If we have an odd number of backslashes, then the multiline string is unclosed
-                            if (numBackslashes & 1) {
-                                var quoteChar = tokenText.charCodeAt(0);
-                                result.endOfLineState = quoteChar === 34 /* doubleQuote */
-                                    ? 3 /* InDoubleQuoteStringLiteral */
-                                    : 2 /* InSingleQuoteStringLiteral */;
-                            }
-                        }
-                    }
-                    else if (token === 3 /* MultiLineCommentTrivia */) {
-                        // Check to see if the multiline comment was unclosed.
-                        if (scanner.isUnterminated()) {
-                            result.endOfLineState = 1 /* InMultiLineCommentTrivia */;
-                        }
-                    }
-                    else if (ts.isTemplateLiteralKind(token)) {
-                        if (scanner.isUnterminated()) {
-                            if (token === 14 /* TemplateTail */) {
-                                result.endOfLineState = 5 /* InTemplateMiddleOrTail */;
-                            }
-                            else if (token === 11 /* NoSubstitutionTemplateLiteral */) {
-                                result.endOfLineState = 4 /* InTemplateHeadOrNoSubstitutionTemplate */;
-                            }
-                            else {
-                                ts.Debug.fail("Only 'NoSubstitutionTemplateLiteral's and 'TemplateTail's can be unterminated; got SyntaxKind #" + token);
-                            }
-                        }
-                    }
-                    else if (templateStack.length > 0 && ts.lastOrUndefined(templateStack) === 12 /* TemplateHead */) {
-                        result.endOfLineState = 6 /* InTemplateSubstitutionPosition */;
-                    }
-                }
-            }
-            function addResult(start, end, classification) {
-                if (classification === 8 /* whiteSpace */) {
-                    // Don't bother with whitespace classifications.  They're not needed.
-                    return;
-                }
-                if (start === 0 && offset > 0) {
-                    // We're classifying the first token, and this was a case where we prepended
-                    // text.  We should consider the start of this token to be at the start of
-                    // the original text.
-                    start += offset;
-                }
-                // All our tokens are in relation to the augmented text.  Move them back to be
-                // relative to the original text.
-                start -= offset;
-                end -= offset;
-                var length = end - start;
-                if (length > 0) {
-                    result.spans.push(start);
-                    result.spans.push(length);
-                    result.spans.push(classification);
-                }
-            }
-        }
-        function isBinaryExpressionOperatorToken(token) {
-            switch (token) {
-                case 37 /* AsteriskToken */:
-                case 39 /* SlashToken */:
-                case 40 /* PercentToken */:
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 43 /* LessThanLessThanToken */:
-                case 44 /* GreaterThanGreaterThanToken */:
-                case 45 /* GreaterThanGreaterThanGreaterThanToken */:
-                case 25 /* LessThanToken */:
-                case 27 /* GreaterThanToken */:
-                case 28 /* LessThanEqualsToken */:
-                case 29 /* GreaterThanEqualsToken */:
-                case 91 /* InstanceOfKeyword */:
-                case 90 /* InKeyword */:
-                case 116 /* AsKeyword */:
-                case 30 /* EqualsEqualsToken */:
-                case 31 /* ExclamationEqualsToken */:
-                case 32 /* EqualsEqualsEqualsToken */:
-                case 33 /* ExclamationEqualsEqualsToken */:
-                case 46 /* AmpersandToken */:
-                case 48 /* CaretToken */:
-                case 47 /* BarToken */:
-                case 51 /* AmpersandAmpersandToken */:
-                case 52 /* BarBarToken */:
-                case 67 /* BarEqualsToken */:
-                case 66 /* AmpersandEqualsToken */:
-                case 68 /* CaretEqualsToken */:
-                case 63 /* LessThanLessThanEqualsToken */:
-                case 64 /* GreaterThanGreaterThanEqualsToken */:
-                case 65 /* GreaterThanGreaterThanGreaterThanEqualsToken */:
-                case 57 /* PlusEqualsToken */:
-                case 58 /* MinusEqualsToken */:
-                case 59 /* AsteriskEqualsToken */:
-                case 61 /* SlashEqualsToken */:
-                case 62 /* PercentEqualsToken */:
-                case 56 /* EqualsToken */:
-                case 24 /* CommaToken */:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-        function isPrefixUnaryExpressionOperatorToken(token) {
-            switch (token) {
-                case 35 /* PlusToken */:
-                case 36 /* MinusToken */:
-                case 50 /* TildeToken */:
-                case 49 /* ExclamationToken */:
-                case 41 /* PlusPlusToken */:
-                case 42 /* MinusMinusToken */:
-                    return true;
-                default:
-                    return false;
-            }
-        }
-        function isKeyword(token) {
-            return token >= 70 /* FirstKeyword */ && token <= 138 /* LastKeyword */;
-        }
-        function classFromKind(token) {
-            if (isKeyword(token)) {
-                return 3 /* keyword */;
-            }
-            else if (isBinaryExpressionOperatorToken(token) || isPrefixUnaryExpressionOperatorToken(token)) {
-                return 5 /* operator */;
-            }
-            else if (token >= 15 /* FirstPunctuation */ && token <= 68 /* LastPunctuation */) {
-                return 10 /* punctuation */;
-            }
-            switch (token) {
-                case 8 /* NumericLiteral */:
-                    return 4 /* numericLiteral */;
-                case 9 /* StringLiteral */:
-                case 166 /* StringLiteralType */:
-                    return 6 /* stringLiteral */;
-                case 10 /* RegularExpressionLiteral */:
-                    return 7 /* regularExpressionLiteral */;
-                case 7 /* ConflictMarkerTrivia */:
-                case 3 /* MultiLineCommentTrivia */:
-                case 2 /* SingleLineCommentTrivia */:
-                    return 1 /* comment */;
-                case 5 /* WhitespaceTrivia */:
-                case 4 /* NewLineTrivia */:
-                    return 8 /* whiteSpace */;
-                case 69 /* Identifier */:
-                default:
-                    if (ts.isTemplateLiteralKind(token)) {
-                        return 6 /* stringLiteral */;
-                    }
-                    return 2 /* identifier */;
-            }
-        }
-        return {
-            getClassificationsForLine: getClassificationsForLine,
-            getEncodedLexicalClassifications: getEncodedLexicalClassifications
-        };
-    }
-    ts.createClassifier = createClassifier;
-    /**
-      * Get the path of the default library files (lib.d.ts) as distributed with the typescript
-      * node package.
-      * The functionality is not supported if the ts module is consumed outside of a node module.
-      */
-    function getDefaultLibFilePath(options) {
-        // Check __dirname is defined and that we are on a node.js system.
-        if (typeof __dirname !== "undefined") {
-            return __dirname + ts.directorySeparator + ts.getDefaultLibFileName(options);
-        }
-        throw new Error("getDefaultLibFilePath is only supported when consumed as a node module. ");
-    }
-    ts.getDefaultLibFilePath = getDefaultLibFilePath;
-    function initializeServices() {
-        ts.objectAllocator = {
-            getNodeConstructor: function () { return NodeObject; },
-            getSourceFileConstructor: function () { return SourceFileObject; },
-            getSymbolConstructor: function () { return SymbolObject; },
-            getTypeConstructor: function () { return TypeObject; },
-            getSignatureConstructor: function () { return SignatureObject; }
-        };
-    }
-    initializeServices();
-})(ts || (ts = {}));
-// Copyright (c) Microsoft. All rights reserved. Licensed under the Apache License, Version 2.0.
-// See LICENSE.txt in the project root for complete license information.
-/// <reference path='services.ts' />
-/* @internal */
-var ts;
-(function (ts) {
-    var BreakpointResolver;
-    (function (BreakpointResolver) {
-        /**
-         * Get the breakpoint span in given sourceFile
-         */
-        function spanInSourceFileAtLocation(sourceFile, position) {
-            // Cannot set breakpoint in dts file
-            if (sourceFile.isDeclarationFile) {
-                return undefined;
-            }
-            var tokenAtLocation = ts.getTokenAtPosition(sourceFile, position);
-            var lineOfPosition = sourceFile.getLineAndCharacterOfPosition(position).line;
-            if (sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getStart(sourceFile)).line > lineOfPosition) {
-                // Get previous token if the token is returned starts on new line
-                // eg: let x =10; |--- cursor is here
-                //     let y = 10;
-                // token at position will return let keyword on second line as the token but we would like to use
-                // token on same line if trailing trivia (comments or white spaces on same line) part of the last token on that line
-                tokenAtLocation = ts.findPrecedingToken(tokenAtLocation.pos, sourceFile);
-                // It's a blank line
-                if (!tokenAtLocation || sourceFile.getLineAndCharacterOfPosition(tokenAtLocation.getEnd()).line !== lineOfPosition) {
-                    return undefined;
-                }
-            }
-            // Cannot set breakpoint in ambient declarations
-            if (ts.isInAmbientContext(tokenAtLocation)) {
-                return undefined;
-            }
-            // Get the span in the node based on its syntax
-            return spanInNode(tokenAtLocation);
-            function textSpan(startNode, endNode) {
-                var start = startNode.decorators ?
-                    ts.skipTrivia(sourceFile.text, startNode.decorators.end) :
-                    startNode.getStart(sourceFile);
-                return ts.createTextSpanFromBounds(start, (endNode || startNode).getEnd());
-            }
-            function textSpanEndingAtNextToken(startNode, previousTokenToFindNextEndToken) {
-                return textSpan(startNode, ts.findNextToken(previousTokenToFindNextEndToken, previousTokenToFindNextEndToken.parent));
-            }
-            function spanInNodeIfStartsOnSameLine(node, otherwiseOnNode) {
-                if (node && lineOfPosition === sourceFile.getLineAndCharacterOfPosition(node.getStart(sourceFile)).line) {
-                    return spanInNode(node);
-                }
-                return spanInNode(otherwiseOnNode);
-            }
-            function spanInNodeArray(nodeArray) {
-                return ts.createTextSpanFromBounds(ts.skipTrivia(sourceFile.text, nodeArray.pos), nodeArray.end);
-            }
-            function spanInPreviousNode(node) {
-                return spanInNode(ts.findPrecedingToken(node.pos, sourceFile));
-            }
-            function spanInNextNode(node) {
-                return spanInNode(ts.findNextToken(node, node.parent));
-            }
-            function spanInNode(node) {
-                if (node) {
-                    switch (node.kind) {
-                        case 200 /* VariableStatement */:
-                            // Span on first variable declaration
-                            return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 218 /* VariableDeclaration */:
-                        case 145 /* PropertyDeclaration */:
-                        case 144 /* PropertySignature */:
-                            return spanInVariableDeclaration(node);
-                        case 142 /* Parameter */:
-                            return spanInParameterDeclaration(node);
-                        case 220 /* FunctionDeclaration */:
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                        case 149 /* GetAccessor */:
-                        case 150 /* SetAccessor */:
-                        case 148 /* Constructor */:
-                        case 179 /* FunctionExpression */:
-                        case 180 /* ArrowFunction */:
-                            return spanInFunctionDeclaration(node);
-                        case 199 /* Block */:
-                            if (ts.isFunctionBlock(node)) {
-                                return spanInFunctionBlock(node);
-                            }
-                        // Fall through
-                        case 226 /* ModuleBlock */:
-                            return spanInBlock(node);
-                        case 252 /* CatchClause */:
-                            return spanInBlock(node.block);
-                        case 202 /* ExpressionStatement */:
-                            // span on the expression
-                            return textSpan(node.expression);
-                        case 211 /* ReturnStatement */:
-                            // span on return keyword and expression if present
-                            return textSpan(node.getChildAt(0), node.expression);
-                        case 205 /* WhileStatement */:
-                            // Span on while(...)
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 204 /* DoStatement */:
-                            // span in statement of the do statement
-                            return spanInNode(node.statement);
-                        case 217 /* DebuggerStatement */:
-                            // span on debugger keyword
-                            return textSpan(node.getChildAt(0));
-                        case 203 /* IfStatement */:
-                            // set on if(..) span
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 214 /* LabeledStatement */:
-                            // span in statement
-                            return spanInNode(node.statement);
-                        case 210 /* BreakStatement */:
-                        case 209 /* ContinueStatement */:
-                            // On break or continue keyword and label if present
-                            return textSpan(node.getChildAt(0), node.label);
-                        case 206 /* ForStatement */:
-                            return spanInForStatement(node);
-                        case 207 /* ForInStatement */:
-                            // span of for (a in ...)
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 208 /* ForOfStatement */:
-                            // span in initializer
-                            return spanInInitializerOfForLike(node);
-                        case 213 /* SwitchStatement */:
-                            // span on switch(...)
-                            return textSpanEndingAtNextToken(node, node.expression);
-                        case 249 /* CaseClause */:
-                        case 250 /* DefaultClause */:
-                            // span in first statement of the clause
-                            return spanInNode(node.statements[0]);
-                        case 216 /* TryStatement */:
-                            // span in try block
-                            return spanInBlock(node.tryBlock);
-                        case 215 /* ThrowStatement */:
-                            // span in throw ...
-                            return textSpan(node, node.expression);
-                        case 235 /* ExportAssignment */:
-                            // span on export = id
-                            return textSpan(node, node.expression);
-                        case 229 /* ImportEqualsDeclaration */:
-                            // import statement without including semicolon
-                            return textSpan(node, node.moduleReference);
-                        case 230 /* ImportDeclaration */:
-                            // import statement without including semicolon
-                            return textSpan(node, node.moduleSpecifier);
-                        case 236 /* ExportDeclaration */:
-                            // import statement without including semicolon
-                            return textSpan(node, node.moduleSpecifier);
-                        case 225 /* ModuleDeclaration */:
-                            // span on complete module if it is instantiated
-                            if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
-                                return undefined;
-                            }
-                        case 221 /* ClassDeclaration */:
-                        case 224 /* EnumDeclaration */:
-                        case 255 /* EnumMember */:
-                        case 169 /* BindingElement */:
-                            // span on complete node
-                            return textSpan(node);
-                        case 212 /* WithStatement */:
-                            // span in statement
-                            return spanInNode(node.statement);
-                        case 143 /* Decorator */:
-                            return spanInNodeArray(node.parent.decorators);
-                        case 167 /* ObjectBindingPattern */:
-                        case 168 /* ArrayBindingPattern */:
-                            return spanInBindingPattern(node);
-                        // No breakpoint in interface, type alias
-                        case 222 /* InterfaceDeclaration */:
-                        case 223 /* TypeAliasDeclaration */:
-                            return undefined;
-                        // Tokens:
-                        case 23 /* SemicolonToken */:
-                        case 1 /* EndOfFileToken */:
-                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile));
-                        case 24 /* CommaToken */:
-                            return spanInPreviousNode(node);
-                        case 15 /* OpenBraceToken */:
-                            return spanInOpenBraceToken(node);
-                        case 16 /* CloseBraceToken */:
-                            return spanInCloseBraceToken(node);
-                        case 20 /* CloseBracketToken */:
-                            return spanInCloseBracketToken(node);
-                        case 17 /* OpenParenToken */:
-                            return spanInOpenParenToken(node);
-                        case 18 /* CloseParenToken */:
-                            return spanInCloseParenToken(node);
-                        case 54 /* ColonToken */:
-                            return spanInColonToken(node);
-                        case 27 /* GreaterThanToken */:
-                        case 25 /* LessThanToken */:
-                            return spanInGreaterThanOrLessThanToken(node);
-                        // Keywords:
-                        case 104 /* WhileKeyword */:
-                            return spanInWhileKeyword(node);
-                        case 80 /* ElseKeyword */:
-                        case 72 /* CatchKeyword */:
-                        case 85 /* FinallyKeyword */:
-                            return spanInNextNode(node);
-                        case 138 /* OfKeyword */:
-                            return spanInOfKeyword(node);
-                        default:
-                            // Destructuring pattern in destructuring assignment
-                            // [a, b, c] of
-                            // [a, b, c] = expression
-                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node)) {
-                                return spanInArrayLiteralOrObjectLiteralDestructuringPattern(node);
-                            }
-                            // Set breakpoint on identifier element of destructuring pattern
-                            // a or ...c  or d: x from
-                            // [a, b, ...c] or { a, b } or { d: x } from destructuring pattern
-                            if ((node.kind === 69 /* Identifier */ ||
-                                node.kind == 191 /* SpreadElementExpression */ ||
-                                node.kind === 253 /* PropertyAssignment */ ||
-                                node.kind === 254 /* ShorthandPropertyAssignment */) &&
-                                ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
-                                return textSpan(node);
-                            }
-                            if (node.kind === 187 /* BinaryExpression */) {
-                                var binaryExpression = node;
-                                // Set breakpoint in destructuring pattern if its destructuring assignment
-                                // [a, b, c] or {a, b, c} of
-                                // [a, b, c] = expression or
-                                // {a, b, c} = expression
-                                if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left)) {
-                                    return spanInArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left);
-                                }
-                                if (binaryExpression.operatorToken.kind === 56 /* EqualsToken */ &&
-                                    ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.parent)) {
-                                    // Set breakpoint on assignment expression element of destructuring pattern
-                                    // a = expression of
-                                    // [a = expression, b, c] = someExpression or
-                                    // { a = expression, b, c } = someExpression
-                                    return textSpan(node);
-                                }
-                                if (binaryExpression.operatorToken.kind === 24 /* CommaToken */) {
-                                    return spanInNode(binaryExpression.left);
-                                }
-                            }
-                            if (ts.isExpression(node)) {
-                                switch (node.parent.kind) {
-                                    case 204 /* DoStatement */:
-                                        // Set span as if on while keyword
-                                        return spanInPreviousNode(node);
-                                    case 143 /* Decorator */:
-                                        // Set breakpoint on the decorator emit
-                                        return spanInNode(node.parent);
-                                    case 206 /* ForStatement */:
-                                    case 208 /* ForOfStatement */:
-                                        return textSpan(node);
-                                    case 187 /* BinaryExpression */:
-                                        if (node.parent.operatorToken.kind === 24 /* CommaToken */) {
-                                            // If this is a comma expression, the breakpoint is possible in this expression
-                                            return textSpan(node);
-                                        }
-                                        break;
-                                    case 180 /* ArrowFunction */:
-                                        if (node.parent.body === node) {
-                                            // If this is body of arrow function, it is allowed to have the breakpoint
-                                            return textSpan(node);
-                                        }
-                                        break;
-                                }
-                            }
-                            // If this is name of property assignment, set breakpoint in the initializer
-                            if (node.parent.kind === 253 /* PropertyAssignment */ &&
-                                node.parent.name === node &&
-                                !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.parent)) {
-                                return spanInNode(node.parent.initializer);
-                            }
-                            // Breakpoint in type assertion goes to its operand
-                            if (node.parent.kind === 177 /* TypeAssertionExpression */ && node.parent.type === node) {
-                                return spanInNextNode(node.parent.type);
-                            }
-                            // return type of function go to previous token
-                            if (ts.isFunctionLike(node.parent) && node.parent.type === node) {
-                                return spanInPreviousNode(node);
-                            }
-                            // initializer of variable/parameter declaration go to previous node
-                            if ((node.parent.kind === 218 /* VariableDeclaration */ ||
-                                node.parent.kind === 142 /* Parameter */)) {
-                                var paramOrVarDecl = node.parent;
-                                if (paramOrVarDecl.initializer === node ||
-                                    paramOrVarDecl.type === node ||
-                                    ts.isAssignmentOperator(node.kind)) {
-                                    return spanInPreviousNode(node);
-                                }
-                            }
-                            if (node.parent.kind === 187 /* BinaryExpression */) {
-                                var binaryExpression = node.parent;
-                                if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(binaryExpression.left) &&
-                                    (binaryExpression.right === node ||
-                                        binaryExpression.operatorToken === node)) {
-                                    // If initializer of destructuring assignment move to previous token
-                                    return spanInPreviousNode(node);
-                                }
-                            }
-                            // Default go to parent to set the breakpoint
-                            return spanInNode(node.parent);
-                    }
-                }
-                function textSpanFromVariableDeclaration(variableDeclaration) {
-                    var declarations = variableDeclaration.parent.declarations;
-                    if (declarations && declarations[0] === variableDeclaration) {
-                        // First declaration - include let keyword
-                        return textSpan(ts.findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent), variableDeclaration);
-                    }
-                    else {
-                        // Span only on this declaration
-                        return textSpan(variableDeclaration);
-                    }
-                }
-                function spanInVariableDeclaration(variableDeclaration) {
-                    // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 207 /* ForInStatement */) {
-                        return spanInNode(variableDeclaration.parent.parent);
-                    }
-                    // If this is a destructuring pattern, set breakpoint in binding pattern
-                    if (ts.isBindingPattern(variableDeclaration.name)) {
-                        return spanInBindingPattern(variableDeclaration.name);
-                    }
-                    // Breakpoint is possible in variableDeclaration only if there is initialization
-                    // or its declaration from 'for of'
-                    if (variableDeclaration.initializer ||
-                        (variableDeclaration.flags & 1 /* Export */) ||
-                        variableDeclaration.parent.parent.kind === 208 /* ForOfStatement */) {
-                        return textSpanFromVariableDeclaration(variableDeclaration);
-                    }
-                    var declarations = variableDeclaration.parent.declarations;
-                    if (declarations && declarations[0] !== variableDeclaration) {
-                        // If we cannot set breakpoint on this declaration, set it on previous one
-                        // Because the variable declaration may be binding pattern and
-                        // we would like to set breakpoint in last binding element if that's the case,
-                        // use preceding token instead
-                        return spanInNode(ts.findPrecedingToken(variableDeclaration.pos, sourceFile, variableDeclaration.parent));
-                    }
-                }
-                function canHaveSpanInParameterDeclaration(parameter) {
-                    // Breakpoint is possible on parameter only if it has initializer, is a rest parameter, or has public or private modifier
-                    return !!parameter.initializer || parameter.dotDotDotToken !== undefined ||
-                        !!(parameter.flags & 4 /* Public */) || !!(parameter.flags & 8 /* Private */);
-                }
-                function spanInParameterDeclaration(parameter) {
-                    if (ts.isBindingPattern(parameter.name)) {
-                        // Set breakpoint in binding pattern
-                        return spanInBindingPattern(parameter.name);
-                    }
-                    else if (canHaveSpanInParameterDeclaration(parameter)) {
-                        return textSpan(parameter);
-                    }
-                    else {
-                        var functionDeclaration = parameter.parent;
-                        var indexOfParameter = ts.indexOf(functionDeclaration.parameters, parameter);
-                        if (indexOfParameter) {
-                            // Not a first parameter, go to previous parameter
-                            return spanInParameterDeclaration(functionDeclaration.parameters[indexOfParameter - 1]);
-                        }
-                        else {
-                            // Set breakpoint in the function declaration body
-                            return spanInNode(functionDeclaration.body);
-                        }
-                    }
-                }
-                function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
-                    return !!(functionDeclaration.flags & 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 221 /* ClassDeclaration */ && functionDeclaration.kind !== 148 /* Constructor */);
-                }
-                function spanInFunctionDeclaration(functionDeclaration) {
-                    // No breakpoints in the function signature
-                    if (!functionDeclaration.body) {
-                        return undefined;
-                    }
-                    if (canFunctionHaveSpanInWholeDeclaration(functionDeclaration)) {
-                        // Set the span on whole function declaration
-                        return textSpan(functionDeclaration);
-                    }
-                    // Set span in function body
-                    return spanInNode(functionDeclaration.body);
-                }
-                function spanInFunctionBlock(block) {
-                    var nodeForSpanInBlock = block.statements.length ? block.statements[0] : block.getLastToken();
-                    if (canFunctionHaveSpanInWholeDeclaration(block.parent)) {
-                        return spanInNodeIfStartsOnSameLine(block.parent, nodeForSpanInBlock);
-                    }
-                    return spanInNode(nodeForSpanInBlock);
-                }
-                function spanInBlock(block) {
-                    switch (block.parent.kind) {
-                        case 225 /* ModuleDeclaration */:
-                            if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
-                                return undefined;
-                            }
-                        // Set on parent if on same line otherwise on first statement
-                        case 205 /* WhileStatement */:
-                        case 203 /* IfStatement */:
-                        case 207 /* ForInStatement */:
-                            return spanInNodeIfStartsOnSameLine(block.parent, block.statements[0]);
-                        // Set span on previous token if it starts on same line otherwise on the first statement of the block
-                        case 206 /* ForStatement */:
-                        case 208 /* ForOfStatement */:
-                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(block.pos, sourceFile, block.parent), block.statements[0]);
-                    }
-                    // Default action is to set on first statement
-                    return spanInNode(block.statements[0]);
-                }
-                function spanInInitializerOfForLike(forLikeStatement) {
-                    if (forLikeStatement.initializer.kind === 219 /* VariableDeclarationList */) {
-                        // Declaration list - set breakpoint in first declaration
-                        var variableDeclarationList = forLikeStatement.initializer;
-                        if (variableDeclarationList.declarations.length > 0) {
-                            return spanInNode(variableDeclarationList.declarations[0]);
-                        }
-                    }
-                    else {
-                        // Expression - set breakpoint in it
-                        return spanInNode(forLikeStatement.initializer);
-                    }
-                }
-                function spanInForStatement(forStatement) {
-                    if (forStatement.initializer) {
-                        return spanInInitializerOfForLike(forStatement);
-                    }
-                    if (forStatement.condition) {
-                        return textSpan(forStatement.condition);
-                    }
-                    if (forStatement.incrementor) {
-                        return textSpan(forStatement.incrementor);
-                    }
-                }
-                function spanInBindingPattern(bindingPattern) {
-                    // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 193 /* OmittedExpression */ ? element : undefined; });
-                    if (firstBindingElement) {
-                        return spanInNode(firstBindingElement);
-                    }
-                    // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 169 /* BindingElement */) {
-                        return textSpan(bindingPattern.parent);
-                    }
-                    // Variable declaration is used as the span
-                    return textSpanFromVariableDeclaration(bindingPattern.parent);
-                }
-                function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    ts.Debug.assert(node.kind !== 168 /* ArrayBindingPattern */ && node.kind !== 167 /* ObjectBindingPattern */);
-                    var elements = node.kind === 170 /* ArrayLiteralExpression */ ?
-                        node.elements :
-                        node.properties;
-                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 193 /* OmittedExpression */ ? element : undefined; });
-                    if (firstBindingElement) {
-                        return spanInNode(firstBindingElement);
-                    }
-                    // Could be ArrayLiteral from destructuring assignment or
-                    // just nested element in another destructuring assignment
-                    // set breakpoint on assignment when parent is destructuring assignment
-                    // Otherwise set breakpoint for this element
-                    return textSpan(node.parent.kind === 187 /* BinaryExpression */ ? node.parent : node);
-                }
-                // Tokens:
-                function spanInOpenBraceToken(node) {
-                    switch (node.parent.kind) {
-                        case 224 /* EnumDeclaration */:
-                            var enumDeclaration = node.parent;
-                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 221 /* ClassDeclaration */:
-                            var classDeclaration = node.parent;
-                            return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 227 /* CaseBlock */:
-                            return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
-                    }
-                    // Default to parent node
-                    return spanInNode(node.parent);
-                }
-                function spanInCloseBraceToken(node) {
-                    switch (node.parent.kind) {
-                        case 226 /* ModuleBlock */:
-                            // If this is not an instantiated module block, no bp span
-                            if (ts.getModuleInstanceState(node.parent.parent) !== 1 /* Instantiated */) {
-                                return undefined;
-                            }
-                        case 224 /* EnumDeclaration */:
-                        case 221 /* ClassDeclaration */:
-                            // Span on close brace token
-                            return textSpan(node);
-                        case 199 /* Block */:
-                            if (ts.isFunctionBlock(node.parent)) {
-                                // Span on close brace token
-                                return textSpan(node);
-                            }
-                        // fall through
-                        case 252 /* CatchClause */:
-                            return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 227 /* CaseBlock */:
-                            // breakpoint in last statement of the last clause
-                            var caseBlock = node.parent;
-                            var lastClause = ts.lastOrUndefined(caseBlock.clauses);
-                            if (lastClause) {
-                                return spanInNode(ts.lastOrUndefined(lastClause.statements));
-                            }
-                            return undefined;
-                        case 167 /* ObjectBindingPattern */:
-                            // Breakpoint in last binding element or binding pattern if it contains no elements
-                            var bindingPattern = node.parent;
-                            return spanInNode(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
-                        // Default to parent node
-                        default:
-                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
-                                // Breakpoint in last binding element or binding pattern if it contains no elements
-                                var objectLiteral = node.parent;
-                                return textSpan(ts.lastOrUndefined(objectLiteral.properties) || objectLiteral);
-                            }
-                            return spanInNode(node.parent);
-                    }
-                }
-                function spanInCloseBracketToken(node) {
-                    switch (node.parent.kind) {
-                        case 168 /* ArrayBindingPattern */:
-                            // Breakpoint in last binding element or binding pattern if it contains no elements
-                            var bindingPattern = node.parent;
-                            return textSpan(ts.lastOrUndefined(bindingPattern.elements) || bindingPattern);
-                        default:
-                            if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent)) {
-                                // Breakpoint in last binding element or binding pattern if it contains no elements
-                                var arrayLiteral = node.parent;
-                                return textSpan(ts.lastOrUndefined(arrayLiteral.elements) || arrayLiteral);
-                            }
-                            // Default to parent node
-                            return spanInNode(node.parent);
-                    }
-                }
-                function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 204 /* DoStatement */ ||
-                        node.parent.kind === 174 /* CallExpression */ ||
-                        node.parent.kind === 175 /* NewExpression */) {
-                        return spanInPreviousNode(node);
-                    }
-                    if (node.parent.kind === 178 /* ParenthesizedExpression */) {
-                        return spanInNextNode(node);
-                    }
-                    // Default to parent node
-                    return spanInNode(node.parent);
-                }
-                function spanInCloseParenToken(node) {
-                    // Is this close paren token of parameter list, set span in previous token
-                    switch (node.parent.kind) {
-                        case 179 /* FunctionExpression */:
-                        case 220 /* FunctionDeclaration */:
-                        case 180 /* ArrowFunction */:
-                        case 147 /* MethodDeclaration */:
-                        case 146 /* MethodSignature */:
-                        case 149 /* GetAccessor */:
-                        case 150 /* SetAccessor */:
-                        case 148 /* Constructor */:
-                        case 205 /* WhileStatement */:
-                        case 204 /* DoStatement */:
-                        case 206 /* ForStatement */:
-                        case 208 /* ForOfStatement */:
-                        case 174 /* CallExpression */:
-                        case 175 /* NewExpression */:
-                        case 178 /* ParenthesizedExpression */:
-                            return spanInPreviousNode(node);
-                        // Default to parent node
-                        default:
-                            return spanInNode(node.parent);
-                    }
-                }
-                function spanInColonToken(node) {
-                    // Is this : specifying return annotation of the function declaration
-                    if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 253 /* PropertyAssignment */ ||
-                        node.parent.kind === 142 /* Parameter */) {
-                        return spanInPreviousNode(node);
-                    }
-                    return spanInNode(node.parent);
-                }
-                function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 177 /* TypeAssertionExpression */) {
-                        return spanInNextNode(node);
-                    }
-                    return spanInNode(node.parent);
-                }
-                function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 204 /* DoStatement */) {
-                        // Set span on while expression
-                        return textSpanEndingAtNextToken(node, node.parent.expression);
-                    }
-                    // Default to parent node
-                    return spanInNode(node.parent);
-                }
-                function spanInOfKeyword(node) {
-                    if (node.parent.kind === 208 /* ForOfStatement */) {
-                        // Set using next token
-                        return spanInNextNode(node);
-                    }
-                    // Default to parent node
-                    return spanInNode(node.parent);
-                }
-            }
-        }
-        BreakpointResolver.spanInSourceFileAtLocation = spanInSourceFileAtLocation;
-    })(BreakpointResolver = ts.BreakpointResolver || (ts.BreakpointResolver = {}));
-})(ts || (ts = {}));
-//
-// Copyright (c) Microsoft Corporation.  All rights reserved.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//   http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
-/// <reference path='services.ts' />
-/* @internal */
-var debugObjectHost = this;
-// We need to use 'null' to interface with the managed side.
-/* tslint:disable:no-null-keyword */
-/* tslint:disable:no-in-operator */
-/* @internal */
-var ts;
-(function (ts) {
-    function logInternalError(logger, err) {
-        if (logger) {
-            logger.log("*INTERNAL ERROR* - Exception in typescript services: " + err.message);
-        }
-    }
-    var ScriptSnapshotShimAdapter = (function () {
-        function ScriptSnapshotShimAdapter(scriptSnapshotShim) {
-            this.scriptSnapshotShim = scriptSnapshotShim;
-        }
-        ScriptSnapshotShimAdapter.prototype.getText = function (start, end) {
-            return this.scriptSnapshotShim.getText(start, end);
-        };
-        ScriptSnapshotShimAdapter.prototype.getLength = function () {
-            return this.scriptSnapshotShim.getLength();
-        };
-        ScriptSnapshotShimAdapter.prototype.getChangeRange = function (oldSnapshot) {
-            var oldSnapshotShim = oldSnapshot;
-            var encoded = this.scriptSnapshotShim.getChangeRange(oldSnapshotShim.scriptSnapshotShim);
-            // TODO: should this be '==='?
-            if (encoded == null) {
-                return null;
-            }
-            var decoded = JSON.parse(encoded);
-            return ts.createTextChangeRange(ts.createTextSpan(decoded.span.start, decoded.span.length), decoded.newLength);
-        };
-        ScriptSnapshotShimAdapter.prototype.dispose = function () {
-            // if scriptSnapshotShim is a COM object then property check becomes method call with no arguments
-            // 'in' does not have this effect
-            if ("dispose" in this.scriptSnapshotShim) {
-                this.scriptSnapshotShim.dispose();
-            }
-        };
-        return ScriptSnapshotShimAdapter;
-    }());
-    var LanguageServiceShimHostAdapter = (function () {
-        function LanguageServiceShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.loggingEnabled = false;
-            this.tracingEnabled = false;
-            // if shimHost is a COM object then property check will become method call with no arguments.
-            // 'in' does not have this effect.
-            if ("getModuleResolutionsForFile" in this.shimHost) {
-                this.resolveModuleNames = function (moduleNames, containingFile) {
-                    var resolutionsInFile = JSON.parse(_this.shimHost.getModuleResolutionsForFile(containingFile));
-                    return ts.map(moduleNames, function (name) {
-                        var result = ts.lookUp(resolutionsInFile, name);
-                        return result ? { resolvedFileName: result } : undefined;
-                    });
-                };
-            }
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("getTypeReferenceDirectiveResolutionsForFile" in this.shimHost) {
-                this.resolveTypeReferenceDirectives = function (typeDirectiveNames, containingFile) {
-                    var typeDirectivesForFile = JSON.parse(_this.shimHost.getTypeReferenceDirectiveResolutionsForFile(containingFile));
-                    return ts.map(typeDirectiveNames, function (name) { return ts.lookUp(typeDirectivesForFile, name); });
-                };
-            }
-        }
-        LanguageServiceShimHostAdapter.prototype.log = function (s) {
-            if (this.loggingEnabled) {
-                this.shimHost.log(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.trace = function (s) {
-            if (this.tracingEnabled) {
-                this.shimHost.trace(s);
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.error = function (s) {
-            this.shimHost.error(s);
-        };
-        LanguageServiceShimHostAdapter.prototype.getProjectVersion = function () {
-            if (!this.shimHost.getProjectVersion) {
-                // shimmed host does not support getProjectVersion
-                return undefined;
-            }
-            return this.shimHost.getProjectVersion();
-        };
-        LanguageServiceShimHostAdapter.prototype.useCaseSensitiveFileNames = function () {
-            return this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-        };
-        LanguageServiceShimHostAdapter.prototype.getCompilationSettings = function () {
-            var settingsJson = this.shimHost.getCompilationSettings();
-            // TODO: should this be '==='?
-            if (settingsJson == null || settingsJson == "") {
-                throw Error("LanguageServiceShimHostAdapter.getCompilationSettings: empty compilationSettings");
-            }
-            return JSON.parse(settingsJson);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptFileNames = function () {
-            var encoded = this.shimHost.getScriptFileNames();
-            return this.files = JSON.parse(encoded);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptSnapshot = function (fileName) {
-            var scriptSnapshot = this.shimHost.getScriptSnapshot(fileName);
-            return scriptSnapshot && new ScriptSnapshotShimAdapter(scriptSnapshot);
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptKind = function (fileName) {
-            if ("getScriptKind" in this.shimHost) {
-                return this.shimHost.getScriptKind(fileName);
-            }
-            else {
-                return 0 /* Unknown */;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getScriptVersion = function (fileName) {
-            return this.shimHost.getScriptVersion(fileName);
-        };
-        LanguageServiceShimHostAdapter.prototype.getLocalizedDiagnosticMessages = function () {
-            var diagnosticMessagesJson = this.shimHost.getLocalizedDiagnosticMessages();
-            if (diagnosticMessagesJson == null || diagnosticMessagesJson == "") {
-                return null;
-            }
-            try {
-                return JSON.parse(diagnosticMessagesJson);
-            }
-            catch (e) {
-                this.log(e.description || "diagnosticMessages.generated.json has invalid JSON format");
-                return null;
-            }
-        };
-        LanguageServiceShimHostAdapter.prototype.getCancellationToken = function () {
-            var hostCancellationToken = this.shimHost.getCancellationToken();
-            return new ThrottledCancellationToken(hostCancellationToken);
-        };
-        LanguageServiceShimHostAdapter.prototype.getCurrentDirectory = function () {
-            return this.shimHost.getCurrentDirectory();
-        };
-        LanguageServiceShimHostAdapter.prototype.getDirectories = function (path) {
-            return JSON.parse(this.shimHost.getDirectories(path));
-        };
-        LanguageServiceShimHostAdapter.prototype.getDefaultLibFileName = function (options) {
-            return this.shimHost.getDefaultLibFileName(JSON.stringify(options));
-        };
-        return LanguageServiceShimHostAdapter;
-    }());
-    ts.LanguageServiceShimHostAdapter = LanguageServiceShimHostAdapter;
-    /** A cancellation that throttles calls to the host */
-    var ThrottledCancellationToken = (function () {
-        function ThrottledCancellationToken(hostCancellationToken) {
-            this.hostCancellationToken = hostCancellationToken;
-            // Store when we last tried to cancel.  Checking cancellation can be expensive (as we have
-            // to marshall over to the host layer).  So we only bother actually checking once enough
-            // time has passed.
-            this.lastCancellationCheckTime = 0;
-        }
-        ThrottledCancellationToken.prototype.isCancellationRequested = function () {
-            var time = Date.now();
-            var duration = Math.abs(time - this.lastCancellationCheckTime);
-            if (duration > 10) {
-                // Check no more than once every 10 ms.
-                this.lastCancellationCheckTime = time;
-                return this.hostCancellationToken.isCancellationRequested();
-            }
-            return false;
-        };
-        return ThrottledCancellationToken;
-    }());
-    var CoreServicesShimHostAdapter = (function () {
-        function CoreServicesShimHostAdapter(shimHost) {
-            var _this = this;
-            this.shimHost = shimHost;
-            this.useCaseSensitiveFileNames = this.shimHost.useCaseSensitiveFileNames ? this.shimHost.useCaseSensitiveFileNames() : false;
-            if ("directoryExists" in this.shimHost) {
-                this.directoryExists = function (directoryName) { return _this.shimHost.directoryExists(directoryName); };
-            }
-            if ("realpath" in this.shimHost) {
-                this.realpath = function (path) { return _this.shimHost.realpath(path); };
-            }
-        }
-        CoreServicesShimHostAdapter.prototype.readDirectory = function (rootDir, extensions, exclude, include, depth) {
-            // Wrap the API changes for 2.0 release. This try/catch
-            // should be removed once TypeScript 2.0 has shipped.
-            try {
-                var pattern = ts.getFileMatcherPatterns(rootDir, extensions, exclude, include, this.shimHost.useCaseSensitiveFileNames(), this.shimHost.getCurrentDirectory());
-                return JSON.parse(this.shimHost.readDirectory(rootDir, JSON.stringify(extensions), JSON.stringify(pattern.basePaths), pattern.excludePattern, pattern.includeFilePattern, pattern.includeDirectoryPattern, depth));
-            }
-            catch (e) {
-                var results = [];
-                for (var _i = 0, extensions_2 = extensions; _i < extensions_2.length; _i++) {
-                    var extension = extensions_2[_i];
-                    for (var _a = 0, _b = this.readDirectoryFallback(rootDir, extension, exclude); _a < _b.length; _a++) {
-                        var file = _b[_a];
-                        if (!ts.contains(results, file)) {
-                            results.push(file);
-                        }
-                    }
-                }
-                return results;
-            }
-        };
-        CoreServicesShimHostAdapter.prototype.fileExists = function (fileName) {
-            return this.shimHost.fileExists(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readFile = function (fileName) {
-            return this.shimHost.readFile(fileName);
-        };
-        CoreServicesShimHostAdapter.prototype.readDirectoryFallback = function (rootDir, extension, exclude) {
-            return JSON.parse(this.shimHost.readDirectory(rootDir, extension, JSON.stringify(exclude)));
-        };
-        return CoreServicesShimHostAdapter;
-    }());
-    ts.CoreServicesShimHostAdapter = CoreServicesShimHostAdapter;
-    function simpleForwardCall(logger, actionDescription, action, logPerformance) {
-        var start;
-        if (logPerformance) {
-            logger.log(actionDescription);
-            start = Date.now();
-        }
-        var result = action();
-        if (logPerformance) {
-            var end = Date.now();
-            logger.log(actionDescription + " completed in " + (end - start) + " msec");
-            if (typeof result === "string") {
-                var str = result;
-                if (str.length > 128) {
-                    str = str.substring(0, 128) + "...";
-                }
-                logger.log("  result.length=" + str.length + ", result='" + JSON.stringify(str) + "'");
-            }
-        }
-        return result;
-    }
-    function forwardJSONCall(logger, actionDescription, action, logPerformance) {
-        return forwardCall(logger, actionDescription, /*returnJson*/ true, action, logPerformance);
-    }
-    function forwardCall(logger, actionDescription, returnJson, action, logPerformance) {
-        try {
-            var result = simpleForwardCall(logger, actionDescription, action, logPerformance);
-            return returnJson ? JSON.stringify({ result: result }) : result;
-        }
-        catch (err) {
-            if (err instanceof ts.OperationCanceledException) {
-                return JSON.stringify({ canceled: true });
-            }
-            logInternalError(logger, err);
-            err.description = actionDescription;
-            return JSON.stringify({ error: err });
-        }
-    }
-    var ShimBase = (function () {
-        function ShimBase(factory) {
-            this.factory = factory;
-            factory.registerShim(this);
-        }
-        ShimBase.prototype.dispose = function (dummy) {
-            this.factory.unregisterShim(this);
-        };
-        return ShimBase;
-    }());
-    function realizeDiagnostics(diagnostics, newLine) {
-        return diagnostics.map(function (d) { return realizeDiagnostic(d, newLine); });
-    }
-    ts.realizeDiagnostics = realizeDiagnostics;
-    function realizeDiagnostic(diagnostic, newLine) {
-        return {
-            message: ts.flattenDiagnosticMessageText(diagnostic.messageText, newLine),
-            start: diagnostic.start,
-            length: diagnostic.length,
-            /// TODO: no need for the tolowerCase call
-            category: ts.DiagnosticCategory[diagnostic.category].toLowerCase(),
-            code: diagnostic.code
-        };
-    }
-    var LanguageServiceShimObject = (function (_super) {
-        __extends(LanguageServiceShimObject, _super);
-        function LanguageServiceShimObject(factory, host, languageService) {
-            _super.call(this, factory);
-            this.host = host;
-            this.languageService = languageService;
-            this.logPerformance = false;
-            this.logger = this.host;
-        }
-        LanguageServiceShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        /// DISPOSE
-        /**
-         * Ensure (almost) deterministic release of internal Javascript resources when
-         * some external native objects holds onto us (e.g. Com/Interop).
-         */
-        LanguageServiceShimObject.prototype.dispose = function (dummy) {
-            this.logger.log("dispose()");
-            this.languageService.dispose();
-            this.languageService = null;
-            // force a GC
-            if (debugObjectHost && debugObjectHost.CollectGarbage) {
-                debugObjectHost.CollectGarbage();
-                this.logger.log("CollectGarbage()");
-            }
-            this.logger = null;
-            _super.prototype.dispose.call(this, dummy);
-        };
-        /// REFRESH
-        /**
-         * Update the list of scripts known to the compiler
-         */
-        LanguageServiceShimObject.prototype.refresh = function (throwOnError) {
-            this.forwardJSONCall("refresh(" + throwOnError + ")", function () { return null; });
-        };
-        LanguageServiceShimObject.prototype.cleanupSemanticCache = function () {
-            var _this = this;
-            this.forwardJSONCall("cleanupSemanticCache()", function () {
-                _this.languageService.cleanupSemanticCache();
-                return null;
-            });
-        };
-        LanguageServiceShimObject.prototype.realizeDiagnostics = function (diagnostics) {
-            var newLine = ts.getNewLineOrDefaultFromHost(this.host);
-            return ts.realizeDiagnostics(diagnostics, newLine);
-        };
-        LanguageServiceShimObject.prototype.getSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSyntacticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", function () { return _this.languageService.getSemanticClassifications(fileName, ts.createTextSpan(start, length)); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSyntacticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSyntacticClassifications('" + fileName + "', " + start + ", " + length + ")", 
-            // directly serialize the spans out to a string.  This is much faster to decode
-            // on the managed side versus a full JSON array.
-            function () { return convertClassifications(_this.languageService.getEncodedSyntacticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getEncodedSemanticClassifications = function (fileName, start, length) {
-            var _this = this;
-            return this.forwardJSONCall("getEncodedSemanticClassifications('" + fileName + "', " + start + ", " + length + ")", 
-            // directly serialize the spans out to a string.  This is much faster to decode
-            // on the managed side versus a full JSON array.
-            function () { return convertClassifications(_this.languageService.getEncodedSemanticClassifications(fileName, ts.createTextSpan(start, length))); });
-        };
-        LanguageServiceShimObject.prototype.getSyntacticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSyntacticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSyntacticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getSemanticDiagnostics = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getSemanticDiagnostics('" + fileName + "')", function () {
-                var diagnostics = _this.languageService.getSemanticDiagnostics(fileName);
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        LanguageServiceShimObject.prototype.getCompilerOptionsDiagnostics = function () {
-            var _this = this;
-            return this.forwardJSONCall("getCompilerOptionsDiagnostics()", function () {
-                var diagnostics = _this.languageService.getCompilerOptionsDiagnostics();
-                return _this.realizeDiagnostics(diagnostics);
-            });
-        };
-        /// QUICKINFO
-        /**
-         * Computes a string representation of the type at the requested position
-         * in the active file.
-         */
-        LanguageServiceShimObject.prototype.getQuickInfoAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getQuickInfoAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getQuickInfoAtPosition(fileName, position); });
-        };
-        /// NAMEORDOTTEDNAMESPAN
-        /**
-         * Computes span information of the name or dotted name at the requested position
-         * in the active file.
-         */
-        LanguageServiceShimObject.prototype.getNameOrDottedNameSpan = function (fileName, startPos, endPos) {
-            var _this = this;
-            return this.forwardJSONCall("getNameOrDottedNameSpan('" + fileName + "', " + startPos + ", " + endPos + ")", function () { return _this.languageService.getNameOrDottedNameSpan(fileName, startPos, endPos); });
-        };
-        /**
-         * STATEMENTSPAN
-         * Computes span information of statement at the requested position in the active file.
-         */
-        LanguageServiceShimObject.prototype.getBreakpointStatementAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBreakpointStatementAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBreakpointStatementAtPosition(fileName, position); });
-        };
-        /// SIGNATUREHELP
-        LanguageServiceShimObject.prototype.getSignatureHelpItems = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getSignatureHelpItems('" + fileName + "', " + position + ")", function () { return _this.languageService.getSignatureHelpItems(fileName, position); });
-        };
-        /// GOTO DEFINITION
-        /**
-         * Computes the definition location and file for the symbol
-         * at the requested position.
-         */
-        LanguageServiceShimObject.prototype.getDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDefinitionAtPosition(fileName, position); });
-        };
-        /// GOTO Type
-        /**
-         * Computes the definition location of the type of the symbol
-         * at the requested position.
-         */
-        LanguageServiceShimObject.prototype.getTypeDefinitionAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getTypeDefinitionAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getTypeDefinitionAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getRenameInfo = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getRenameInfo('" + fileName + "', " + position + ")", function () { return _this.languageService.getRenameInfo(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findRenameLocations = function (fileName, position, findInStrings, findInComments) {
-            var _this = this;
-            return this.forwardJSONCall("findRenameLocations('" + fileName + "', " + position + ", " + findInStrings + ", " + findInComments + ")", function () { return _this.languageService.findRenameLocations(fileName, position, findInStrings, findInComments); });
-        };
-        /// GET BRACE MATCHING
-        LanguageServiceShimObject.prototype.getBraceMatchingAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getBraceMatchingAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getBraceMatchingAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.isValidBraceCompletionAtPosition = function (fileName, position, openingBrace) {
-            var _this = this;
-            return this.forwardJSONCall("isValidBraceCompletionAtPosition('" + fileName + "', " + position + ", " + openingBrace + ")", function () { return _this.languageService.isValidBraceCompletionAtPosition(fileName, position, openingBrace); });
-        };
-        /// GET SMART INDENT
-        LanguageServiceShimObject.prototype.getIndentationAtPosition = function (fileName, position, options /*Services.EditorOptions*/) {
-            var _this = this;
-            return this.forwardJSONCall("getIndentationAtPosition('" + fileName + "', " + position + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getIndentationAtPosition(fileName, position, localOptions);
-            });
-        };
-        /// GET REFERENCES
-        LanguageServiceShimObject.prototype.getReferencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getReferencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getReferencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.findReferences = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("findReferences('" + fileName + "', " + position + ")", function () { return _this.languageService.findReferences(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getOccurrencesAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getOccurrencesAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getOccurrencesAtPosition(fileName, position); });
-        };
-        LanguageServiceShimObject.prototype.getDocumentHighlights = function (fileName, position, filesToSearch) {
-            var _this = this;
-            return this.forwardJSONCall("getDocumentHighlights('" + fileName + "', " + position + ")", function () {
-                var results = _this.languageService.getDocumentHighlights(fileName, position, JSON.parse(filesToSearch));
-                // workaround for VS document highlighting issue - keep only items from the initial file
-                var normalizedName = ts.normalizeSlashes(fileName).toLowerCase();
-                return ts.filter(results, function (r) { return ts.normalizeSlashes(r.fileName).toLowerCase() === normalizedName; });
-            });
-        };
-        /// COMPLETION LISTS
-        /**
-         * Get a string based representation of the completions
-         * to provide at the given source position and providing a member completion
-         * list if requested.
-         */
-        LanguageServiceShimObject.prototype.getCompletionsAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position); });
-        };
-        /** Get a string based representation of a completion list entry details */
-        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName) {
-            var _this = this;
-            return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () { return _this.languageService.getCompletionEntryDetails(fileName, position, entryName); });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options /*Services.FormatCodeOptions*/) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForRange('" + fileName + "', " + start + ", " + end + ")", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForRange(fileName, start, end, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsForDocument = function (fileName, options /*Services.FormatCodeOptions*/) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsForDocument('" + fileName + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsForDocument(fileName, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getFormattingEditsAfterKeystroke = function (fileName, position, key, options /*Services.FormatCodeOptions*/) {
-            var _this = this;
-            return this.forwardJSONCall("getFormattingEditsAfterKeystroke('" + fileName + "', " + position + ", '" + key + "')", function () {
-                var localOptions = JSON.parse(options);
-                return _this.languageService.getFormattingEditsAfterKeystroke(fileName, position, key, localOptions);
-            });
-        };
-        LanguageServiceShimObject.prototype.getDocCommentTemplateAtPosition = function (fileName, position) {
-            var _this = this;
-            return this.forwardJSONCall("getDocCommentTemplateAtPosition('" + fileName + "', " + position + ")", function () { return _this.languageService.getDocCommentTemplateAtPosition(fileName, position); });
-        };
-        /// NAVIGATE TO
-        /** Return a list of symbols that are interesting to navigate to */
-        LanguageServiceShimObject.prototype.getNavigateToItems = function (searchValue, maxResultCount) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigateToItems('" + searchValue + "', " + maxResultCount + ")", function () { return _this.languageService.getNavigateToItems(searchValue, maxResultCount); });
-        };
-        LanguageServiceShimObject.prototype.getNavigationBarItems = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getNavigationBarItems('" + fileName + "')", function () { return _this.languageService.getNavigationBarItems(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getOutliningSpans = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getOutliningSpans('" + fileName + "')", function () { return _this.languageService.getOutliningSpans(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getTodoComments = function (fileName, descriptors) {
-            var _this = this;
-            return this.forwardJSONCall("getTodoComments('" + fileName + "')", function () { return _this.languageService.getTodoComments(fileName, JSON.parse(descriptors)); });
-        };
-        /// Emit
-        LanguageServiceShimObject.prototype.getEmitOutput = function (fileName) {
-            var _this = this;
-            return this.forwardJSONCall("getEmitOutput('" + fileName + "')", function () { return _this.languageService.getEmitOutput(fileName); });
-        };
-        LanguageServiceShimObject.prototype.getEmitOutputObject = function (fileName) {
-            var _this = this;
-            return forwardCall(this.logger, "getEmitOutput('" + fileName + "')", 
-            /*returnJson*/ false, function () { return _this.languageService.getEmitOutput(fileName); }, this.logPerformance);
-        };
-        return LanguageServiceShimObject;
-    }(ShimBase));
-    function convertClassifications(classifications) {
-        return { spans: classifications.spans.join(","), endOfLineState: classifications.endOfLineState };
-    }
-    var ClassifierShimObject = (function (_super) {
-        __extends(ClassifierShimObject, _super);
-        function ClassifierShimObject(factory, logger) {
-            _super.call(this, factory);
-            this.logger = logger;
-            this.logPerformance = false;
-            this.classifier = ts.createClassifier();
-        }
-        ClassifierShimObject.prototype.getEncodedLexicalClassifications = function (text, lexState, syntacticClassifierAbsent) {
-            var _this = this;
-            return forwardJSONCall(this.logger, "getEncodedLexicalClassifications", function () { return convertClassifications(_this.classifier.getEncodedLexicalClassifications(text, lexState, syntacticClassifierAbsent)); }, this.logPerformance);
-        };
-        /// COLORIZATION
-        ClassifierShimObject.prototype.getClassificationsForLine = function (text, lexState, classifyKeywordsInGenerics) {
-            var classification = this.classifier.getClassificationsForLine(text, lexState, classifyKeywordsInGenerics);
-            var result = "";
-            for (var _i = 0, _a = classification.entries; _i < _a.length; _i++) {
-                var item = _a[_i];
-                result += item.length + "\n";
-                result += item.classification + "\n";
-            }
-            result += classification.finalLexState;
-            return result;
-        };
-        return ClassifierShimObject;
-    }(ShimBase));
-    var CoreServicesShimObject = (function (_super) {
-        __extends(CoreServicesShimObject, _super);
-        function CoreServicesShimObject(factory, logger, host) {
-            _super.call(this, factory);
-            this.logger = logger;
-            this.host = host;
-            this.logPerformance = false;
-        }
-        CoreServicesShimObject.prototype.forwardJSONCall = function (actionDescription, action) {
-            return forwardJSONCall(this.logger, actionDescription, action, this.logPerformance);
-        };
-        CoreServicesShimObject.prototype.resolveModuleName = function (fileName, moduleName, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveModuleName('" + fileName + "')", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveModuleName(moduleName, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedModule ? result.resolvedModule.resolvedFileName : undefined,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.resolveTypeReferenceDirective = function (fileName, typeReferenceDirective, compilerOptionsJson) {
-            var _this = this;
-            return this.forwardJSONCall("resolveTypeReferenceDirective(" + fileName + ")", function () {
-                var compilerOptions = JSON.parse(compilerOptionsJson);
-                var result = ts.resolveTypeReferenceDirective(typeReferenceDirective, ts.normalizeSlashes(fileName), compilerOptions, _this.host);
-                return {
-                    resolvedFileName: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.resolvedFileName : undefined,
-                    primary: result.resolvedTypeReferenceDirective ? result.resolvedTypeReferenceDirective.primary : true,
-                    failedLookupLocations: result.failedLookupLocations
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getPreProcessedFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getPreProcessedFileInfo('" + fileName + "')", function () {
-                // for now treat files as JavaScript
-                var result = ts.preProcessFile(sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength()), /* readImportFiles */ true, /* detectJavaScriptImports */ true);
-                return {
-                    referencedFiles: _this.convertFileReferences(result.referencedFiles),
-                    importedFiles: _this.convertFileReferences(result.importedFiles),
-                    ambientExternalModules: result.ambientExternalModules,
-                    isLibFile: result.isLibFile,
-                    typeReferenceDirectives: _this.convertFileReferences(result.typeReferenceDirectives)
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.convertFileReferences = function (refs) {
-            if (!refs) {
-                return undefined;
-            }
-            var result = [];
-            for (var _i = 0, refs_2 = refs; _i < refs_2.length; _i++) {
-                var ref = refs_2[_i];
-                result.push({
-                    path: ts.normalizeSlashes(ref.fileName),
-                    position: ref.pos,
-                    length: ref.end - ref.pos
-                });
-            }
-            return result;
-        };
-        CoreServicesShimObject.prototype.getTSConfigFileInfo = function (fileName, sourceTextSnapshot) {
-            var _this = this;
-            return this.forwardJSONCall("getTSConfigFileInfo('" + fileName + "')", function () {
-                var text = sourceTextSnapshot.getText(0, sourceTextSnapshot.getLength());
-                var result = ts.parseConfigFileTextToJson(fileName, text);
-                if (result.error) {
-                    return {
-                        options: {},
-                        typingOptions: {},
-                        files: [],
-                        raw: {},
-                        errors: [realizeDiagnostic(result.error, "\r\n")]
-                    };
-                }
-                var normalizedFileName = ts.normalizeSlashes(fileName);
-                var configFile = ts.parseJsonConfigFileContent(result.config, _this.host, ts.getDirectoryPath(normalizedFileName), /*existingOptions*/ {}, normalizedFileName);
-                return {
-                    options: configFile.options,
-                    typingOptions: configFile.typingOptions,
-                    files: configFile.fileNames,
-                    raw: configFile.raw,
-                    errors: realizeDiagnostics(configFile.errors, "\r\n")
-                };
-            });
-        };
-        CoreServicesShimObject.prototype.getDefaultCompilationSettings = function () {
-            return this.forwardJSONCall("getDefaultCompilationSettings()", function () { return ts.getDefaultCompilerOptions(); });
-        };
-        CoreServicesShimObject.prototype.discoverTypings = function (discoverTypingsJson) {
-            var _this = this;
-            var getCanonicalFileName = ts.createGetCanonicalFileName(/*useCaseSensitivefileNames:*/ false);
-            return this.forwardJSONCall("discoverTypings()", function () {
-                var info = JSON.parse(discoverTypingsJson);
-                return ts.JsTyping.discoverTypings(_this.host, info.fileNames, ts.toPath(info.projectRootPath, info.projectRootPath, getCanonicalFileName), ts.toPath(info.safeListPath, info.safeListPath, getCanonicalFileName), info.packageNameToTypingLocation, info.typingOptions, info.compilerOptions);
-            });
-        };
-        return CoreServicesShimObject;
-    }(ShimBase));
-    var TypeScriptServicesFactory = (function () {
-        function TypeScriptServicesFactory() {
-            this._shims = [];
-        }
-        /*
-         * Returns script API version.
-         */
-        TypeScriptServicesFactory.prototype.getServicesVersion = function () {
-            return ts.servicesVersion;
-        };
-        TypeScriptServicesFactory.prototype.createLanguageServiceShim = function (host) {
-            try {
-                if (this.documentRegistry === undefined) {
-                    this.documentRegistry = ts.createDocumentRegistry(host.useCaseSensitiveFileNames && host.useCaseSensitiveFileNames(), host.getCurrentDirectory());
-                }
-                var hostAdapter = new LanguageServiceShimHostAdapter(host);
-                var languageService = ts.createLanguageService(hostAdapter, this.documentRegistry);
-                return new LanguageServiceShimObject(this, host, languageService);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createClassifierShim = function (logger) {
-            try {
-                return new ClassifierShimObject(this, logger);
-            }
-            catch (err) {
-                logInternalError(logger, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.createCoreServicesShim = function (host) {
-            try {
-                var adapter = new CoreServicesShimHostAdapter(host);
-                return new CoreServicesShimObject(this, host, adapter);
-            }
-            catch (err) {
-                logInternalError(host, err);
-                throw err;
-            }
-        };
-        TypeScriptServicesFactory.prototype.close = function () {
-            // Forget all the registered shims
-            this._shims = [];
-            this.documentRegistry = undefined;
-        };
-        TypeScriptServicesFactory.prototype.registerShim = function (shim) {
-            this._shims.push(shim);
-        };
-        TypeScriptServicesFactory.prototype.unregisterShim = function (shim) {
-            for (var i = 0, n = this._shims.length; i < n; i++) {
-                if (this._shims[i] === shim) {
-                    delete this._shims[i];
-                    return;
-                }
-            }
-            throw new Error("Invalid operation");
-        };
-        return TypeScriptServicesFactory;
-    }());
-    ts.TypeScriptServicesFactory = TypeScriptServicesFactory;
-    if (typeof module !== "undefined" && module.exports) {
-        module.exports = ts;
-    }
-})(ts || (ts = {}));
-/* tslint:enable:no-in-operator */
-/* tslint:enable:no-null */
-/// TODO: this is used by VS, clean this up on both sides of the interface
-/* @internal */
-var TypeScript;
-(function (TypeScript) {
-    var Services;
-    (function (Services) {
-        Services.TypeScriptServicesFactory = ts.TypeScriptServicesFactory;
-    })(Services = TypeScript.Services || (TypeScript.Services = {}));
-})(TypeScript || (TypeScript = {}));
-/* tslint:disable:no-unused-variable */
-// 'toolsVersion' gets consumed by the managed side, so it's not unused.
-// TODO: it should be moved into a namespace though.
-/* @internal */
-var toolsVersion = "1.9";
-/* tslint:enable:no-unused-variable */
diff --git a/installer/vendor/golang.org/x/tools/third_party/webcomponents/customelements.js b/installer/vendor/golang.org/x/tools/third_party/webcomponents/customelements.js
deleted file mode 100644
index 931f6c22e1..0000000000
--- a/installer/vendor/golang.org/x/tools/third_party/webcomponents/customelements.js
+++ /dev/null
@@ -1,1029 +0,0 @@
-/**
- * @license
- * Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
- * This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
- * The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
- * The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
- * Code distributed by Google as part of the polymer project is also
- * subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
- */
-// @version 0.7.22
-if (typeof WeakMap === "undefined") {
-  (function() {
-    var defineProperty = Object.defineProperty;
-    var counter = Date.now() % 1e9;
-    var WeakMap = function() {
-      this.name = "__st" + (Math.random() * 1e9 >>> 0) + (counter++ + "__");
-    };
-    WeakMap.prototype = {
-      set: function(key, value) {
-        var entry = key[this.name];
-        if (entry && entry[0] === key) entry[1] = value; else defineProperty(key, this.name, {
-          value: [ key, value ],
-          writable: true
-        });
-        return this;
-      },
-      get: function(key) {
-        var entry;
-        return (entry = key[this.name]) && entry[0] === key ? entry[1] : undefined;
-      },
-      "delete": function(key) {
-        var entry = key[this.name];
-        if (!entry || entry[0] !== key) return false;
-        entry[0] = entry[1] = undefined;
-        return true;
-      },
-      has: function(key) {
-        var entry = key[this.name];
-        if (!entry) return false;
-        return entry[0] === key;
-      }
-    };
-    window.WeakMap = WeakMap;
-  })();
-}
-
-(function(global) {
-  if (global.JsMutationObserver) {
-    return;
-  }
-  var registrationsTable = new WeakMap();
-  var setImmediate;
-  if (/Trident|Edge/.test(navigator.userAgent)) {
-    setImmediate = setTimeout;
-  } else if (window.setImmediate) {
-    setImmediate = window.setImmediate;
-  } else {
-    var setImmediateQueue = [];
-    var sentinel = String(Math.random());
-    window.addEventListener("message", function(e) {
-      if (e.data === sentinel) {
-        var queue = setImmediateQueue;
-        setImmediateQueue = [];
-        queue.forEach(function(func) {
-          func();
-        });
-      }
-    });
-    setImmediate = function(func) {
-      setImmediateQueue.push(func);
-      window.postMessage(sentinel, "*");
-    };
-  }
-  var isScheduled = false;
-  var scheduledObservers = [];
-  function scheduleCallback(observer) {
-    scheduledObservers.push(observer);
-    if (!isScheduled) {
-      isScheduled = true;
-      setImmediate(dispatchCallbacks);
-    }
-  }
-  function wrapIfNeeded(node) {
-    return window.ShadowDOMPolyfill && window.ShadowDOMPolyfill.wrapIfNeeded(node) || node;
-  }
-  function dispatchCallbacks() {
-    isScheduled = false;
-    var observers = scheduledObservers;
-    scheduledObservers = [];
-    observers.sort(function(o1, o2) {
-      return o1.uid_ - o2.uid_;
-    });
-    var anyNonEmpty = false;
-    observers.forEach(function(observer) {
-      var queue = observer.takeRecords();
-      removeTransientObserversFor(observer);
-      if (queue.length) {
-        observer.callback_(queue, observer);
-        anyNonEmpty = true;
-      }
-    });
-    if (anyNonEmpty) dispatchCallbacks();
-  }
-  function removeTransientObserversFor(observer) {
-    observer.nodes_.forEach(function(node) {
-      var registrations = registrationsTable.get(node);
-      if (!registrations) return;
-      registrations.forEach(function(registration) {
-        if (registration.observer === observer) registration.removeTransientObservers();
-      });
-    });
-  }
-  function forEachAncestorAndObserverEnqueueRecord(target, callback) {
-    for (var node = target; node; node = node.parentNode) {
-      var registrations = registrationsTable.get(node);
-      if (registrations) {
-        for (var j = 0; j < registrations.length; j++) {
-          var registration = registrations[j];
-          var options = registration.options;
-          if (node !== target && !options.subtree) continue;
-          var record = callback(options);
-          if (record) registration.enqueue(record);
-        }
-      }
-    }
-  }
-  var uidCounter = 0;
-  function JsMutationObserver(callback) {
-    this.callback_ = callback;
-    this.nodes_ = [];
-    this.records_ = [];
-    this.uid_ = ++uidCounter;
-  }
-  JsMutationObserver.prototype = {
-    observe: function(target, options) {
-      target = wrapIfNeeded(target);
-      if (!options.childList && !options.attributes && !options.characterData || options.attributeOldValue && !options.attributes || options.attributeFilter && options.attributeFilter.length && !options.attributes || options.characterDataOldValue && !options.characterData) {
-        throw new SyntaxError();
-      }
-      var registrations = registrationsTable.get(target);
-      if (!registrations) registrationsTable.set(target, registrations = []);
-      var registration;
-      for (var i = 0; i < registrations.length; i++) {
-        if (registrations[i].observer === this) {
-          registration = registrations[i];
-          registration.removeListeners();
-          registration.options = options;
-          break;
-        }
-      }
-      if (!registration) {
-        registration = new Registration(this, target, options);
-        registrations.push(registration);
-        this.nodes_.push(target);
-      }
-      registration.addListeners();
-    },
-    disconnect: function() {
-      this.nodes_.forEach(function(node) {
-        var registrations = registrationsTable.get(node);
-        for (var i = 0; i < registrations.length; i++) {
-          var registration = registrations[i];
-          if (registration.observer === this) {
-            registration.removeListeners();
-            registrations.splice(i, 1);
-            break;
-          }
-        }
-      }, this);
-      this.records_ = [];
-    },
-    takeRecords: function() {
-      var copyOfRecords = this.records_;
-      this.records_ = [];
-      return copyOfRecords;
-    }
-  };
-  function MutationRecord(type, target) {
-    this.type = type;
-    this.target = target;
-    this.addedNodes = [];
-    this.removedNodes = [];
-    this.previousSibling = null;
-    this.nextSibling = null;
-    this.attributeName = null;
-    this.attributeNamespace = null;
-    this.oldValue = null;
-  }
-  function copyMutationRecord(original) {
-    var record = new MutationRecord(original.type, original.target);
-    record.addedNodes = original.addedNodes.slice();
-    record.removedNodes = original.removedNodes.slice();
-    record.previousSibling = original.previousSibling;
-    record.nextSibling = original.nextSibling;
-    record.attributeName = original.attributeName;
-    record.attributeNamespace = original.attributeNamespace;
-    record.oldValue = original.oldValue;
-    return record;
-  }
-  var currentRecord, recordWithOldValue;
-  function getRecord(type, target) {
-    return currentRecord = new MutationRecord(type, target);
-  }
-  function getRecordWithOldValue(oldValue) {
-    if (recordWithOldValue) return recordWithOldValue;
-    recordWithOldValue = copyMutationRecord(currentRecord);
-    recordWithOldValue.oldValue = oldValue;
-    return recordWithOldValue;
-  }
-  function clearRecords() {
-    currentRecord = recordWithOldValue = undefined;
-  }
-  function recordRepresentsCurrentMutation(record) {
-    return record === recordWithOldValue || record === currentRecord;
-  }
-  function selectRecord(lastRecord, newRecord) {
-    if (lastRecord === newRecord) return lastRecord;
-    if (recordWithOldValue && recordRepresentsCurrentMutation(lastRecord)) return recordWithOldValue;
-    return null;
-  }
-  function Registration(observer, target, options) {
-    this.observer = observer;
-    this.target = target;
-    this.options = options;
-    this.transientObservedNodes = [];
-  }
-  Registration.prototype = {
-    enqueue: function(record) {
-      var records = this.observer.records_;
-      var length = records.length;
-      if (records.length > 0) {
-        var lastRecord = records[length - 1];
-        var recordToReplaceLast = selectRecord(lastRecord, record);
-        if (recordToReplaceLast) {
-          records[length - 1] = recordToReplaceLast;
-          return;
-        }
-      } else {
-        scheduleCallback(this.observer);
-      }
-      records[length] = record;
-    },
-    addListeners: function() {
-      this.addListeners_(this.target);
-    },
-    addListeners_: function(node) {
-      var options = this.options;
-      if (options.attributes) node.addEventListener("DOMAttrModified", this, true);
-      if (options.characterData) node.addEventListener("DOMCharacterDataModified", this, true);
-      if (options.childList) node.addEventListener("DOMNodeInserted", this, true);
-      if (options.childList || options.subtree) node.addEventListener("DOMNodeRemoved", this, true);
-    },
-    removeListeners: function() {
-      this.removeListeners_(this.target);
-    },
-    removeListeners_: function(node) {
-      var options = this.options;
-      if (options.attributes) node.removeEventListener("DOMAttrModified", this, true);
-      if (options.characterData) node.removeEventListener("DOMCharacterDataModified", this, true);
-      if (options.childList) node.removeEventListener("DOMNodeInserted", this, true);
-      if (options.childList || options.subtree) node.removeEventListener("DOMNodeRemoved", this, true);
-    },
-    addTransientObserver: function(node) {
-      if (node === this.target) return;
-      this.addListeners_(node);
-      this.transientObservedNodes.push(node);
-      var registrations = registrationsTable.get(node);
-      if (!registrations) registrationsTable.set(node, registrations = []);
-      registrations.push(this);
-    },
-    removeTransientObservers: function() {
-      var transientObservedNodes = this.transientObservedNodes;
-      this.transientObservedNodes = [];
-      transientObservedNodes.forEach(function(node) {
-        this.removeListeners_(node);
-        var registrations = registrationsTable.get(node);
-        for (var i = 0; i < registrations.length; i++) {
-          if (registrations[i] === this) {
-            registrations.splice(i, 1);
-            break;
-          }
-        }
-      }, this);
-    },
-    handleEvent: function(e) {
-      e.stopImmediatePropagation();
-      switch (e.type) {
-       case "DOMAttrModified":
-        var name = e.attrName;
-        var namespace = e.relatedNode.namespaceURI;
-        var target = e.target;
-        var record = new getRecord("attributes", target);
-        record.attributeName = name;
-        record.attributeNamespace = namespace;
-        var oldValue = e.attrChange === MutationEvent.ADDITION ? null : e.prevValue;
-        forEachAncestorAndObserverEnqueueRecord(target, function(options) {
-          if (!options.attributes) return;
-          if (options.attributeFilter && options.attributeFilter.length && options.attributeFilter.indexOf(name) === -1 && options.attributeFilter.indexOf(namespace) === -1) {
-            return;
-          }
-          if (options.attributeOldValue) return getRecordWithOldValue(oldValue);
-          return record;
-        });
-        break;
-
-       case "DOMCharacterDataModified":
-        var target = e.target;
-        var record = getRecord("characterData", target);
-        var oldValue = e.prevValue;
-        forEachAncestorAndObserverEnqueueRecord(target, function(options) {
-          if (!options.characterData) return;
-          if (options.characterDataOldValue) return getRecordWithOldValue(oldValue);
-          return record;
-        });
-        break;
-
-       case "DOMNodeRemoved":
-        this.addTransientObserver(e.target);
-
-       case "DOMNodeInserted":
-        var changedNode = e.target;
-        var addedNodes, removedNodes;
-        if (e.type === "DOMNodeInserted") {
-          addedNodes = [ changedNode ];
-          removedNodes = [];
-        } else {
-          addedNodes = [];
-          removedNodes = [ changedNode ];
-        }
-        var previousSibling = changedNode.previousSibling;
-        var nextSibling = changedNode.nextSibling;
-        var record = getRecord("childList", e.target.parentNode);
-        record.addedNodes = addedNodes;
-        record.removedNodes = removedNodes;
-        record.previousSibling = previousSibling;
-        record.nextSibling = nextSibling;
-        forEachAncestorAndObserverEnqueueRecord(e.relatedNode, function(options) {
-          if (!options.childList) return;
-          return record;
-        });
-      }
-      clearRecords();
-    }
-  };
-  global.JsMutationObserver = JsMutationObserver;
-  if (!global.MutationObserver) {
-    global.MutationObserver = JsMutationObserver;
-    JsMutationObserver._isPolyfilled = true;
-  }
-})(self);
-
-(function(scope) {
-  "use strict";
-  if (!window.performance) {
-    var start = Date.now();
-    window.performance = {
-      now: function() {
-        return Date.now() - start;
-      }
-    };
-  }
-  if (!window.requestAnimationFrame) {
-    window.requestAnimationFrame = function() {
-      var nativeRaf = window.webkitRequestAnimationFrame || window.mozRequestAnimationFrame;
-      return nativeRaf ? function(callback) {
-        return nativeRaf(function() {
-          callback(performance.now());
-        });
-      } : function(callback) {
-        return window.setTimeout(callback, 1e3 / 60);
-      };
-    }();
-  }
-  if (!window.cancelAnimationFrame) {
-    window.cancelAnimationFrame = function() {
-      return window.webkitCancelAnimationFrame || window.mozCancelAnimationFrame || function(id) {
-        clearTimeout(id);
-      };
-    }();
-  }
-  var workingDefaultPrevented = function() {
-    var e = document.createEvent("Event");
-    e.initEvent("foo", true, true);
-    e.preventDefault();
-    return e.defaultPrevented;
-  }();
-  if (!workingDefaultPrevented) {
-    var origPreventDefault = Event.prototype.preventDefault;
-    Event.prototype.preventDefault = function() {
-      if (!this.cancelable) {
-        return;
-      }
-      origPreventDefault.call(this);
-      Object.defineProperty(this, "defaultPrevented", {
-        get: function() {
-          return true;
-        },
-        configurable: true
-      });
-    };
-  }
-  var isIE = /Trident/.test(navigator.userAgent);
-  if (!window.CustomEvent || isIE && typeof window.CustomEvent !== "function") {
-    window.CustomEvent = function(inType, params) {
-      params = params || {};
-      var e = document.createEvent("CustomEvent");
-      e.initCustomEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable), params.detail);
-      return e;
-    };
-    window.CustomEvent.prototype = window.Event.prototype;
-  }
-  if (!window.Event || isIE && typeof window.Event !== "function") {
-    var origEvent = window.Event;
-    window.Event = function(inType, params) {
-      params = params || {};
-      var e = document.createEvent("Event");
-      e.initEvent(inType, Boolean(params.bubbles), Boolean(params.cancelable));
-      return e;
-    };
-    window.Event.prototype = origEvent.prototype;
-  }
-})(window.WebComponents);
-
-window.CustomElements = window.CustomElements || {
-  flags: {}
-};
-
-(function(scope) {
-  var flags = scope.flags;
-  var modules = [];
-  var addModule = function(module) {
-    modules.push(module);
-  };
-  var initializeModules = function() {
-    modules.forEach(function(module) {
-      module(scope);
-    });
-  };
-  scope.addModule = addModule;
-  scope.initializeModules = initializeModules;
-  scope.hasNative = Boolean(document.registerElement);
-  scope.isIE = /Trident/.test(navigator.userAgent);
-  scope.useNative = !flags.register && scope.hasNative && !window.ShadowDOMPolyfill && (!window.HTMLImports || window.HTMLImports.useNative);
-})(window.CustomElements);
-
-window.CustomElements.addModule(function(scope) {
-  var IMPORT_LINK_TYPE = window.HTMLImports ? window.HTMLImports.IMPORT_LINK_TYPE : "none";
-  function forSubtree(node, cb) {
-    findAllElements(node, function(e) {
-      if (cb(e)) {
-        return true;
-      }
-      forRoots(e, cb);
-    });
-    forRoots(node, cb);
-  }
-  function findAllElements(node, find, data) {
-    var e = node.firstElementChild;
-    if (!e) {
-      e = node.firstChild;
-      while (e && e.nodeType !== Node.ELEMENT_NODE) {
-        e = e.nextSibling;
-      }
-    }
-    while (e) {
-      if (find(e, data) !== true) {
-        findAllElements(e, find, data);
-      }
-      e = e.nextElementSibling;
-    }
-    return null;
-  }
-  function forRoots(node, cb) {
-    var root = node.shadowRoot;
-    while (root) {
-      forSubtree(root, cb);
-      root = root.olderShadowRoot;
-    }
-  }
-  function forDocumentTree(doc, cb) {
-    _forDocumentTree(doc, cb, []);
-  }
-  function _forDocumentTree(doc, cb, processingDocuments) {
-    doc = window.wrap(doc);
-    if (processingDocuments.indexOf(doc) >= 0) {
-      return;
-    }
-    processingDocuments.push(doc);
-    var imports = doc.querySelectorAll("link[rel=" + IMPORT_LINK_TYPE + "]");
-    for (var i = 0, l = imports.length, n; i < l && (n = imports[i]); i++) {
-      if (n.import) {
-        _forDocumentTree(n.import, cb, processingDocuments);
-      }
-    }
-    cb(doc);
-  }
-  scope.forDocumentTree = forDocumentTree;
-  scope.forSubtree = forSubtree;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var flags = scope.flags;
-  var forSubtree = scope.forSubtree;
-  var forDocumentTree = scope.forDocumentTree;
-  function addedNode(node, isAttached) {
-    return added(node, isAttached) || addedSubtree(node, isAttached);
-  }
-  function added(node, isAttached) {
-    if (scope.upgrade(node, isAttached)) {
-      return true;
-    }
-    if (isAttached) {
-      attached(node);
-    }
-  }
-  function addedSubtree(node, isAttached) {
-    forSubtree(node, function(e) {
-      if (added(e, isAttached)) {
-        return true;
-      }
-    });
-  }
-  var hasThrottledAttached = window.MutationObserver._isPolyfilled && flags["throttle-attached"];
-  scope.hasPolyfillMutations = hasThrottledAttached;
-  scope.hasThrottledAttached = hasThrottledAttached;
-  var isPendingMutations = false;
-  var pendingMutations = [];
-  function deferMutation(fn) {
-    pendingMutations.push(fn);
-    if (!isPendingMutations) {
-      isPendingMutations = true;
-      setTimeout(takeMutations);
-    }
-  }
-  function takeMutations() {
-    isPendingMutations = false;
-    var $p = pendingMutations;
-    for (var i = 0, l = $p.length, p; i < l && (p = $p[i]); i++) {
-      p();
-    }
-    pendingMutations = [];
-  }
-  function attached(element) {
-    if (hasThrottledAttached) {
-      deferMutation(function() {
-        _attached(element);
-      });
-    } else {
-      _attached(element);
-    }
-  }
-  function _attached(element) {
-    if (element.__upgraded__ && !element.__attached) {
-      element.__attached = true;
-      if (element.attachedCallback) {
-        element.attachedCallback();
-      }
-    }
-  }
-  function detachedNode(node) {
-    detached(node);
-    forSubtree(node, function(e) {
-      detached(e);
-    });
-  }
-  function detached(element) {
-    if (hasThrottledAttached) {
-      deferMutation(function() {
-        _detached(element);
-      });
-    } else {
-      _detached(element);
-    }
-  }
-  function _detached(element) {
-    if (element.__upgraded__ && element.__attached) {
-      element.__attached = false;
-      if (element.detachedCallback) {
-        element.detachedCallback();
-      }
-    }
-  }
-  function inDocument(element) {
-    var p = element;
-    var doc = window.wrap(document);
-    while (p) {
-      if (p == doc) {
-        return true;
-      }
-      p = p.parentNode || p.nodeType === Node.DOCUMENT_FRAGMENT_NODE && p.host;
-    }
-  }
-  function watchShadow(node) {
-    if (node.shadowRoot && !node.shadowRoot.__watched) {
-      flags.dom && console.log("watching shadow-root for: ", node.localName);
-      var root = node.shadowRoot;
-      while (root) {
-        observe(root);
-        root = root.olderShadowRoot;
-      }
-    }
-  }
-  function handler(root, mutations) {
-    if (flags.dom) {
-      var mx = mutations[0];
-      if (mx && mx.type === "childList" && mx.addedNodes) {
-        if (mx.addedNodes) {
-          var d = mx.addedNodes[0];
-          while (d && d !== document && !d.host) {
-            d = d.parentNode;
-          }
-          var u = d && (d.URL || d._URL || d.host && d.host.localName) || "";
-          u = u.split("/?").shift().split("/").pop();
-        }
-      }
-      console.group("mutations (%d) [%s]", mutations.length, u || "");
-    }
-    var isAttached = inDocument(root);
-    mutations.forEach(function(mx) {
-      if (mx.type === "childList") {
-        forEach(mx.addedNodes, function(n) {
-          if (!n.localName) {
-            return;
-          }
-          addedNode(n, isAttached);
-        });
-        forEach(mx.removedNodes, function(n) {
-          if (!n.localName) {
-            return;
-          }
-          detachedNode(n);
-        });
-      }
-    });
-    flags.dom && console.groupEnd();
-  }
-  function takeRecords(node) {
-    node = window.wrap(node);
-    if (!node) {
-      node = window.wrap(document);
-    }
-    while (node.parentNode) {
-      node = node.parentNode;
-    }
-    var observer = node.__observer;
-    if (observer) {
-      handler(node, observer.takeRecords());
-      takeMutations();
-    }
-  }
-  var forEach = Array.prototype.forEach.call.bind(Array.prototype.forEach);
-  function observe(inRoot) {
-    if (inRoot.__observer) {
-      return;
-    }
-    var observer = new MutationObserver(handler.bind(this, inRoot));
-    observer.observe(inRoot, {
-      childList: true,
-      subtree: true
-    });
-    inRoot.__observer = observer;
-  }
-  function upgradeDocument(doc) {
-    doc = window.wrap(doc);
-    flags.dom && console.group("upgradeDocument: ", doc.baseURI.split("/").pop());
-    var isMainDocument = doc === window.wrap(document);
-    addedNode(doc, isMainDocument);
-    observe(doc);
-    flags.dom && console.groupEnd();
-  }
-  function upgradeDocumentTree(doc) {
-    forDocumentTree(doc, upgradeDocument);
-  }
-  var originalCreateShadowRoot = Element.prototype.createShadowRoot;
-  if (originalCreateShadowRoot) {
-    Element.prototype.createShadowRoot = function() {
-      var root = originalCreateShadowRoot.call(this);
-      window.CustomElements.watchShadow(this);
-      return root;
-    };
-  }
-  scope.watchShadow = watchShadow;
-  scope.upgradeDocumentTree = upgradeDocumentTree;
-  scope.upgradeDocument = upgradeDocument;
-  scope.upgradeSubtree = addedSubtree;
-  scope.upgradeAll = addedNode;
-  scope.attached = attached;
-  scope.takeRecords = takeRecords;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var flags = scope.flags;
-  function upgrade(node, isAttached) {
-    if (node.localName === "template") {
-      if (window.HTMLTemplateElement && HTMLTemplateElement.decorate) {
-        HTMLTemplateElement.decorate(node);
-      }
-    }
-    if (!node.__upgraded__ && node.nodeType === Node.ELEMENT_NODE) {
-      var is = node.getAttribute("is");
-      var definition = scope.getRegisteredDefinition(node.localName) || scope.getRegisteredDefinition(is);
-      if (definition) {
-        if (is && definition.tag == node.localName || !is && !definition.extends) {
-          return upgradeWithDefinition(node, definition, isAttached);
-        }
-      }
-    }
-  }
-  function upgradeWithDefinition(element, definition, isAttached) {
-    flags.upgrade && console.group("upgrade:", element.localName);
-    if (definition.is) {
-      element.setAttribute("is", definition.is);
-    }
-    implementPrototype(element, definition);
-    element.__upgraded__ = true;
-    created(element);
-    if (isAttached) {
-      scope.attached(element);
-    }
-    scope.upgradeSubtree(element, isAttached);
-    flags.upgrade && console.groupEnd();
-    return element;
-  }
-  function implementPrototype(element, definition) {
-    if (Object.__proto__) {
-      element.__proto__ = definition.prototype;
-    } else {
-      customMixin(element, definition.prototype, definition.native);
-      element.__proto__ = definition.prototype;
-    }
-  }
-  function customMixin(inTarget, inSrc, inNative) {
-    var used = {};
-    var p = inSrc;
-    while (p !== inNative && p !== HTMLElement.prototype) {
-      var keys = Object.getOwnPropertyNames(p);
-      for (var i = 0, k; k = keys[i]; i++) {
-        if (!used[k]) {
-          Object.defineProperty(inTarget, k, Object.getOwnPropertyDescriptor(p, k));
-          used[k] = 1;
-        }
-      }
-      p = Object.getPrototypeOf(p);
-    }
-  }
-  function created(element) {
-    if (element.createdCallback) {
-      element.createdCallback();
-    }
-  }
-  scope.upgrade = upgrade;
-  scope.upgradeWithDefinition = upgradeWithDefinition;
-  scope.implementPrototype = implementPrototype;
-});
-
-window.CustomElements.addModule(function(scope) {
-  var isIE = scope.isIE;
-  var upgradeDocumentTree = scope.upgradeDocumentTree;
-  var upgradeAll = scope.upgradeAll;
-  var upgradeWithDefinition = scope.upgradeWithDefinition;
-  var implementPrototype = scope.implementPrototype;
-  var useNative = scope.useNative;
-  function register(name, options) {
-    var definition = options || {};
-    if (!name) {
-      throw new Error("document.registerElement: first argument `name` must not be empty");
-    }
-    if (name.indexOf("-") < 0) {
-      throw new Error("document.registerElement: first argument ('name') must contain a dash ('-'). Argument provided was '" + String(name) + "'.");
-    }
-    if (isReservedTag(name)) {
-      throw new Error("Failed to execute 'registerElement' on 'Document': Registration failed for type '" + String(name) + "'. The type name is invalid.");
-    }
-    if (getRegisteredDefinition(name)) {
-      throw new Error("DuplicateDefinitionError: a type with name '" + String(name) + "' is already registered");
-    }
-    if (!definition.prototype) {
-      definition.prototype = Object.create(HTMLElement.prototype);
-    }
-    definition.__name = name.toLowerCase();
-    if (definition.extends) {
-      definition.extends = definition.extends.toLowerCase();
-    }
-    definition.lifecycle = definition.lifecycle || {};
-    definition.ancestry = ancestry(definition.extends);
-    resolveTagName(definition);
-    resolvePrototypeChain(definition);
-    overrideAttributeApi(definition.prototype);
-    registerDefinition(definition.__name, definition);
-    definition.ctor = generateConstructor(definition);
-    definition.ctor.prototype = definition.prototype;
-    definition.prototype.constructor = definition.ctor;
-    if (scope.ready) {
-      upgradeDocumentTree(document);
-    }
-    return definition.ctor;
-  }
-  function overrideAttributeApi(prototype) {
-    if (prototype.setAttribute._polyfilled) {
-      return;
-    }
-    var setAttribute = prototype.setAttribute;
-    prototype.setAttribute = function(name, value) {
-      changeAttribute.call(this, name, value, setAttribute);
-    };
-    var removeAttribute = prototype.removeAttribute;
-    prototype.removeAttribute = function(name) {
-      changeAttribute.call(this, name, null, removeAttribute);
-    };
-    prototype.setAttribute._polyfilled = true;
-  }
-  function changeAttribute(name, value, operation) {
-    name = name.toLowerCase();
-    var oldValue = this.getAttribute(name);
-    operation.apply(this, arguments);
-    var newValue = this.getAttribute(name);
-    if (this.attributeChangedCallback && newValue !== oldValue) {
-      this.attributeChangedCallback(name, oldValue, newValue);
-    }
-  }
-  function isReservedTag(name) {
-    for (var i = 0; i < reservedTagList.length; i++) {
-      if (name === reservedTagList[i]) {
-        return true;
-      }
-    }
-  }
-  var reservedTagList = [ "annotation-xml", "color-profile", "font-face", "font-face-src", "font-face-uri", "font-face-format", "font-face-name", "missing-glyph" ];
-  function ancestry(extnds) {
-    var extendee = getRegisteredDefinition(extnds);
-    if (extendee) {
-      return ancestry(extendee.extends).concat([ extendee ]);
-    }
-    return [];
-  }
-  function resolveTagName(definition) {
-    var baseTag = definition.extends;
-    for (var i = 0, a; a = definition.ancestry[i]; i++) {
-      baseTag = a.is && a.tag;
-    }
-    definition.tag = baseTag || definition.__name;
-    if (baseTag) {
-      definition.is = definition.__name;
-    }
-  }
-  function resolvePrototypeChain(definition) {
-    if (!Object.__proto__) {
-      var nativePrototype = HTMLElement.prototype;
-      if (definition.is) {
-        var inst = document.createElement(definition.tag);
-        nativePrototype = Object.getPrototypeOf(inst);
-      }
-      var proto = definition.prototype, ancestor;
-      var foundPrototype = false;
-      while (proto) {
-        if (proto == nativePrototype) {
-          foundPrototype = true;
-        }
-        ancestor = Object.getPrototypeOf(proto);
-        if (ancestor) {
-          proto.__proto__ = ancestor;
-        }
-        proto = ancestor;
-      }
-      if (!foundPrototype) {
-        console.warn(definition.tag + " prototype not found in prototype chain for " + definition.is);
-      }
-      definition.native = nativePrototype;
-    }
-  }
-  function instantiate(definition) {
-    return upgradeWithDefinition(domCreateElement(definition.tag), definition);
-  }
-  var registry = {};
-  function getRegisteredDefinition(name) {
-    if (name) {
-      return registry[name.toLowerCase()];
-    }
-  }
-  function registerDefinition(name, definition) {
-    registry[name] = definition;
-  }
-  function generateConstructor(definition) {
-    return function() {
-      return instantiate(definition);
-    };
-  }
-  var HTML_NAMESPACE = "http://www.w3.org/1999/xhtml";
-  function createElementNS(namespace, tag, typeExtension) {
-    if (namespace === HTML_NAMESPACE) {
-      return createElement(tag, typeExtension);
-    } else {
-      return domCreateElementNS(namespace, tag);
-    }
-  }
-  function createElement(tag, typeExtension) {
-    if (tag) {
-      tag = tag.toLowerCase();
-    }
-    if (typeExtension) {
-      typeExtension = typeExtension.toLowerCase();
-    }
-    var definition = getRegisteredDefinition(typeExtension || tag);
-    if (definition) {
-      if (tag == definition.tag && typeExtension == definition.is) {
-        return new definition.ctor();
-      }
-      if (!typeExtension && !definition.is) {
-        return new definition.ctor();
-      }
-    }
-    var element;
-    if (typeExtension) {
-      element = createElement(tag);
-      element.setAttribute("is", typeExtension);
-      return element;
-    }
-    element = domCreateElement(tag);
-    if (tag.indexOf("-") >= 0) {
-      implementPrototype(element, HTMLElement);
-    }
-    return element;
-  }
-  var domCreateElement = document.createElement.bind(document);
-  var domCreateElementNS = document.createElementNS.bind(document);
-  var isInstance;
-  if (!Object.__proto__ && !useNative) {
-    isInstance = function(obj, ctor) {
-      if (obj instanceof ctor) {
-        return true;
-      }
-      var p = obj;
-      while (p) {
-        if (p === ctor.prototype) {
-          return true;
-        }
-        p = p.__proto__;
-      }
-      return false;
-    };
-  } else {
-    isInstance = function(obj, base) {
-      return obj instanceof base;
-    };
-  }
-  function wrapDomMethodToForceUpgrade(obj, methodName) {
-    var orig = obj[methodName];
-    obj[methodName] = function() {
-      var n = orig.apply(this, arguments);
-      upgradeAll(n);
-      return n;
-    };
-  }
-  wrapDomMethodToForceUpgrade(Node.prototype, "cloneNode");
-  wrapDomMethodToForceUpgrade(document, "importNode");
-  document.registerElement = register;
-  document.createElement = createElement;
-  document.createElementNS = createElementNS;
-  scope.registry = registry;
-  scope.instanceof = isInstance;
-  scope.reservedTagList = reservedTagList;
-  scope.getRegisteredDefinition = getRegisteredDefinition;
-  document.register = document.registerElement;
-});
-
-(function(scope) {
-  var useNative = scope.useNative;
-  var initializeModules = scope.initializeModules;
-  var isIE = scope.isIE;
-  if (useNative) {
-    var nop = function() {};
-    scope.watchShadow = nop;
-    scope.upgrade = nop;
-    scope.upgradeAll = nop;
-    scope.upgradeDocumentTree = nop;
-    scope.upgradeSubtree = nop;
-    scope.takeRecords = nop;
-    scope.instanceof = function(obj, base) {
-      return obj instanceof base;
-    };
-  } else {
-    initializeModules();
-  }
-  var upgradeDocumentTree = scope.upgradeDocumentTree;
-  var upgradeDocument = scope.upgradeDocument;
-  if (!window.wrap) {
-    if (window.ShadowDOMPolyfill) {
-      window.wrap = window.ShadowDOMPolyfill.wrapIfNeeded;
-      window.unwrap = window.ShadowDOMPolyfill.unwrapIfNeeded;
-    } else {
-      window.wrap = window.unwrap = function(node) {
-        return node;
-      };
-    }
-  }
-  if (window.HTMLImports) {
-    window.HTMLImports.__importsParsingHook = function(elt) {
-      if (elt.import) {
-        upgradeDocument(wrap(elt.import));
-      }
-    };
-  }
-  function bootstrap() {
-    upgradeDocumentTree(window.wrap(document));
-    window.CustomElements.ready = true;
-    var requestAnimationFrame = window.requestAnimationFrame || function(f) {
-      setTimeout(f, 16);
-    };
-    requestAnimationFrame(function() {
-      setTimeout(function() {
-        window.CustomElements.readyTime = Date.now();
-        if (window.HTMLImports) {
-          window.CustomElements.elapsed = window.CustomElements.readyTime - window.HTMLImports.readyTime;
-        }
-        document.dispatchEvent(new CustomEvent("WebComponentsReady", {
-          bubbles: true
-        }));
-      });
-    });
-  }
-  if (document.readyState === "complete" || scope.flags.eager) {
-    bootstrap();
-  } else if (document.readyState === "interactive" && !window.attachEvent && (!window.HTMLImports || window.HTMLImports.ready)) {
-    bootstrap();
-  } else {
-    var loadEvent = window.HTMLImports && !window.HTMLImports.ready ? "HTMLImportsLoaded" : "DOMContentLoaded";
-    window.addEventListener(loadEvent, bootstrap);
-  }
-})(window.CustomElements);
\ No newline at end of file
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/.gitignore b/installer/vendor/gopkg.in/urfave/cli.v1/.gitignore
deleted file mode 100644
index faf70c4c24..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*.coverprofile
-node_modules/
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/.travis.yml b/installer/vendor/gopkg.in/urfave/cli.v1/.travis.yml
deleted file mode 100644
index 94836d750e..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/.travis.yml
+++ /dev/null
@@ -1,39 +0,0 @@
-language: go
-
-sudo: false
-
-cache:
-  directories:
-  - node_modules
-
-go:
-- 1.2.x
-- 1.3.x
-- 1.4.2
-- 1.5.x
-- 1.6.x
-- 1.7.x
-- master
-
-matrix:
-  allow_failures:
-  - go: master
-  include:
-  - go: 1.6.x
-    os: osx
-  - go: 1.7.x
-    os: osx
-
-before_script:
-- go get github.com/urfave/gfmrun/... || true
-- go get golang.org/x/tools/... || true
-- if [ ! -f node_modules/.bin/markdown-toc ] ; then
-    npm install markdown-toc ;
-  fi
-
-script:
-- ./runtests gen
-- ./runtests vet
-- ./runtests test
-- ./runtests gfmrun
-- ./runtests toc
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/CHANGELOG.md b/installer/vendor/gopkg.in/urfave/cli.v1/CHANGELOG.md
deleted file mode 100644
index 07f75464b4..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/CHANGELOG.md
+++ /dev/null
@@ -1,392 +0,0 @@
-# Change Log
-
-**ATTN**: This project uses [semantic versioning](http://semver.org/).
-
-## [Unreleased]
-
-## [1.19.1] - 2016-11-21
-
-### Fixed
-
-- Fixes regression introduced in 1.19.0 where using an `ActionFunc` as
-  the `Action` for a command would cause it to error rather than calling the
-  function. Should not have a affected declarative cases using `func(c
-  *cli.Context) err)`.
-- Shell completion now handles the case where the user specifies
-  `--generate-bash-completion` immediately after a flag that takes an argument.
-  Previously it call the application with `--generate-bash-completion` as the
-  flag value.
-
-## [1.19.0] - 2016-11-19
-### Added
-- `FlagsByName` was added to make it easy to sort flags (e.g. `sort.Sort(cli.FlagsByName(app.Flags))`)
-- A `Description` field was added to `App` for a more detailed description of
-  the application (similar to the existing `Description` field on `Command`)
-- Flag type code generation via `go generate`
-- Write to stderr and exit 1 if action returns non-nil error
-- Added support for TOML to the `altsrc` loader
-- `SkipArgReorder` was added to allow users to skip the argument reordering.
-  This is useful if you want to consider all "flags" after an argument as
-  arguments rather than flags (the default behavior of the stdlib `flag`
-  library). This is backported functionality from the [removal of the flag
-  reordering](https://github.com/urfave/cli/pull/398) in the unreleased version
-  2
-- For formatted errors (those implementing `ErrorFormatter`), the errors will
-  be formatted during output. Compatible with `pkg/errors`.
-
-### Changed
-- Raise minimum tested/supported Go version to 1.2+
-
-### Fixed
-- Consider empty environment variables as set (previously environment variables
-  with the equivalent of `""` would be skipped rather than their value used).
-- Return an error if the value in a given environment variable cannot be parsed
-  as the flag type. Previously these errors were silently swallowed.
-- Print full error when an invalid flag is specified (which includes the invalid flag)
-- `App.Writer` defaults to `stdout` when `nil`
-- If no action is specified on a command or app, the help is now printed instead of `panic`ing
-- `App.Metadata` is initialized automatically now (previously was `nil` unless initialized)
-- Correctly show help message if `-h` is provided to a subcommand
-- `context.(Global)IsSet` now respects environment variables. Previously it
-  would return `false` if a flag was specified in the environment rather than
-  as an argument
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-- `altsrc`s import paths were updated to use `gopkg.in/urfave/cli.v1`. This
-  fixes issues that occurred when `gopkg.in/urfave/cli.v1` was imported as well
-  as `altsrc` where Go would complain that the types didn't match
-
-## [1.18.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user (backported)
-
-## [1.18.0] - 2016-06-27
-### Added
-- `./runtests` test runner with coverage tracking by default
-- testing on OS X
-- testing on Windows
-- `UintFlag`, `Uint64Flag`, and `Int64Flag` types and supporting code
-
-### Changed
-- Use spaces for alignment in help/usage output instead of tabs, making the
-  output alignment consistent regardless of tab width
-
-### Fixed
-- Printing of command aliases in help text
-- Printing of visible flags for both struct and struct pointer flags
-- Display the `help` subcommand when using `CommandCategories`
-- No longer swallows `panic`s that occur within the `Action`s themselves when
-  detecting the signature of the `Action` field
-
-## [1.17.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-
-## [1.17.0] - 2016-05-09
-### Added
-- Pluggable flag-level help text rendering via `cli.DefaultFlagStringFunc`
-- `context.GlobalBoolT` was added as an analogue to `context.GlobalBool`
-- Support for hiding commands by setting `Hidden: true` -- this will hide the
-  commands in help output
-
-### Changed
-- `Float64Flag`, `IntFlag`, and `DurationFlag` default values are no longer
-  quoted in help text output.
-- All flag types now include `(default: {value})` strings following usage when a
-  default value can be (reasonably) detected.
-- `IntSliceFlag` and `StringSliceFlag` usage strings are now more consistent
-  with non-slice flag types
-- Apps now exit with a code of 3 if an unknown subcommand is specified
-  (previously they printed "No help topic for...", but still exited 0. This
-  makes it easier to script around apps built using `cli` since they can trust
-  that a 0 exit code indicated a successful execution.
-- cleanups based on [Go Report Card
-  feedback](https://goreportcard.com/report/github.com/urfave/cli)
-
-## [1.16.1] - 2016-08-28
-### Fixed
-- Removed deprecation warnings to STDERR to avoid them leaking to the end-user
-
-## [1.16.0] - 2016-05-02
-### Added
-- `Hidden` field on all flag struct types to omit from generated help text
-
-### Changed
-- `BashCompletionFlag` (`--enable-bash-completion`) is now omitted from
-generated help text via the `Hidden` field
-
-### Fixed
-- handling of error values in `HandleAction` and `HandleExitCoder`
-
-## [1.15.0] - 2016-04-30
-### Added
-- This file!
-- Support for placeholders in flag usage strings
-- `App.Metadata` map for arbitrary data/state management
-- `Set` and `GlobalSet` methods on `*cli.Context` for altering values after
-parsing.
-- Support for nested lookup of dot-delimited keys in structures loaded from
-YAML.
-
-### Changed
-- The `App.Action` and `Command.Action` now prefer a return signature of
-`func(*cli.Context) error`, as defined by `cli.ActionFunc`.  If a non-nil
-`error` is returned, there may be two outcomes:
-    - If the error fulfills `cli.ExitCoder`, then `os.Exit` will be called
-    automatically
-    - Else the error is bubbled up and returned from `App.Run`
-- Specifying an `Action` with the legacy return signature of
-`func(*cli.Context)` will produce a deprecation message to stderr
-- Specifying an `Action` that is not a `func` type will produce a non-zero exit
-from `App.Run`
-- Specifying an `Action` func that has an invalid (input) signature will
-produce a non-zero exit from `App.Run`
-
-### Deprecated
-- <a name="deprecated-cli-app-runandexitonerror"></a>
-`cli.App.RunAndExitOnError`, which should now be done by returning an error
-that fulfills `cli.ExitCoder` to `cli.App.Run`.
-- <a name="deprecated-cli-app-action-signature"></a> the legacy signature for
-`cli.App.Action` of `func(*cli.Context)`, which should now have a return
-signature of `func(*cli.Context) error`, as defined by `cli.ActionFunc`.
-
-### Fixed
-- Added missing `*cli.Context.GlobalFloat64` method
-
-## [1.14.0] - 2016-04-03 (backfilled 2016-04-25)
-### Added
-- Codebeat badge
-- Support for categorization via `CategorizedHelp` and `Categories` on app.
-
-### Changed
-- Use `filepath.Base` instead of `path.Base` in `Name` and `HelpName`.
-
-### Fixed
-- Ensure version is not shown in help text when `HideVersion` set.
-
-## [1.13.0] - 2016-03-06 (backfilled 2016-04-25)
-### Added
-- YAML file input support.
-- `NArg` method on context.
-
-## [1.12.0] - 2016-02-17 (backfilled 2016-04-25)
-### Added
-- Custom usage error handling.
-- Custom text support in `USAGE` section of help output.
-- Improved help messages for empty strings.
-- AppVeyor CI configuration.
-
-### Changed
-- Removed `panic` from default help printer func.
-- De-duping and optimizations.
-
-### Fixed
-- Correctly handle `Before`/`After` at command level when no subcommands.
-- Case of literal `-` argument causing flag reordering.
-- Environment variable hints on Windows.
-- Docs updates.
-
-## [1.11.1] - 2015-12-21 (backfilled 2016-04-25)
-### Changed
-- Use `path.Base` in `Name` and `HelpName`
-- Export `GetName` on flag types.
-
-### Fixed
-- Flag parsing when skipping is enabled.
-- Test output cleanup.
-- Move completion check to account for empty input case.
-
-## [1.11.0] - 2015-11-15 (backfilled 2016-04-25)
-### Added
-- Destination scan support for flags.
-- Testing against `tip` in Travis CI config.
-
-### Changed
-- Go version in Travis CI config.
-
-### Fixed
-- Removed redundant tests.
-- Use correct example naming in tests.
-
-## [1.10.2] - 2015-10-29 (backfilled 2016-04-25)
-### Fixed
-- Remove unused var in bash completion.
-
-## [1.10.1] - 2015-10-21 (backfilled 2016-04-25)
-### Added
-- Coverage and reference logos in README.
-
-### Fixed
-- Use specified values in help and version parsing.
-- Only display app version and help message once.
-
-## [1.10.0] - 2015-10-06 (backfilled 2016-04-25)
-### Added
-- More tests for existing functionality.
-- `ArgsUsage` at app and command level for help text flexibility.
-
-### Fixed
-- Honor `HideHelp` and `HideVersion` in `App.Run`.
-- Remove juvenile word from README.
-
-## [1.9.0] - 2015-09-08 (backfilled 2016-04-25)
-### Added
-- `FullName` on command with accompanying help output update.
-- Set default `$PROG` in bash completion.
-
-### Changed
-- Docs formatting.
-
-### Fixed
-- Removed self-referential imports in tests.
-
-## [1.8.0] - 2015-06-30 (backfilled 2016-04-25)
-### Added
-- Support for `Copyright` at app level.
-- `Parent` func at context level to walk up context lineage.
-
-### Fixed
-- Global flag processing at top level.
-
-## [1.7.1] - 2015-06-11 (backfilled 2016-04-25)
-### Added
-- Aggregate errors from `Before`/`After` funcs.
-- Doc comments on flag structs.
-- Include non-global flags when checking version and help.
-- Travis CI config updates.
-
-### Fixed
-- Ensure slice type flags have non-nil values.
-- Collect global flags from the full command hierarchy.
-- Docs prose.
-
-## [1.7.0] - 2015-05-03 (backfilled 2016-04-25)
-### Changed
-- `HelpPrinter` signature includes output writer.
-
-### Fixed
-- Specify go 1.1+ in docs.
-- Set `Writer` when running command as app.
-
-## [1.6.0] - 2015-03-23 (backfilled 2016-04-25)
-### Added
-- Multiple author support.
-- `NumFlags` at context level.
-- `Aliases` at command level.
-
-### Deprecated
-- `ShortName` at command level.
-
-### Fixed
-- Subcommand help output.
-- Backward compatible support for deprecated `Author` and `Email` fields.
-- Docs regarding `Names`/`Aliases`.
-
-## [1.5.0] - 2015-02-20 (backfilled 2016-04-25)
-### Added
-- `After` hook func support at app and command level.
-
-### Fixed
-- Use parsed context when running command as subcommand.
-- Docs prose.
-
-## [1.4.1] - 2015-01-09 (backfilled 2016-04-25)
-### Added
-- Support for hiding `-h / --help` flags, but not `help` subcommand.
-- Stop flag parsing after `--`.
-
-### Fixed
-- Help text for generic flags to specify single value.
-- Use double quotes in output for defaults.
-- Use `ParseInt` instead of `ParseUint` for int environment var values.
-- Use `0` as base when parsing int environment var values.
-
-## [1.4.0] - 2014-12-12 (backfilled 2016-04-25)
-### Added
-- Support for environment variable lookup "cascade".
-- Support for `Stdout` on app for output redirection.
-
-### Fixed
-- Print command help instead of app help in `ShowCommandHelp`.
-
-## [1.3.1] - 2014-11-13 (backfilled 2016-04-25)
-### Added
-- Docs and example code updates.
-
-### Changed
-- Default `-v / --version` flag made optional.
-
-## [1.3.0] - 2014-08-10 (backfilled 2016-04-25)
-### Added
-- `FlagNames` at context level.
-- Exposed `VersionPrinter` var for more control over version output.
-- Zsh completion hook.
-- `AUTHOR` section in default app help template.
-- Contribution guidelines.
-- `DurationFlag` type.
-
-## [1.2.0] - 2014-08-02
-### Added
-- Support for environment variable defaults on flags plus tests.
-
-## [1.1.0] - 2014-07-15
-### Added
-- Bash completion.
-- Optional hiding of built-in help command.
-- Optional skipping of flag parsing at command level.
-- `Author`, `Email`, and `Compiled` metadata on app.
-- `Before` hook func support at app and command level.
-- `CommandNotFound` func support at app level.
-- Command reference available on context.
-- `GenericFlag` type.
-- `Float64Flag` type.
-- `BoolTFlag` type.
-- `IsSet` flag helper on context.
-- More flag lookup funcs at context level.
-- More tests &amp; docs.
-
-### Changed
-- Help template updates to account for presence/absence of flags.
-- Separated subcommand help template.
-- Exposed `HelpPrinter` var for more control over help output.
-
-## [1.0.0] - 2013-11-01
-### Added
-- `help` flag in default app flag set and each command flag set.
-- Custom handling of argument parsing errors.
-- Command lookup by name at app level.
-- `StringSliceFlag` type and supporting `StringSlice` type.
-- `IntSliceFlag` type and supporting `IntSlice` type.
-- Slice type flag lookups by name at context level.
-- Export of app and command help functions.
-- More tests &amp; docs.
-
-## 0.1.0 - 2013-07-22
-### Added
-- Initial implementation.
-
-[Unreleased]: https://github.com/urfave/cli/compare/v1.18.0...HEAD
-[1.18.0]: https://github.com/urfave/cli/compare/v1.17.0...v1.18.0
-[1.17.0]: https://github.com/urfave/cli/compare/v1.16.0...v1.17.0
-[1.16.0]: https://github.com/urfave/cli/compare/v1.15.0...v1.16.0
-[1.15.0]: https://github.com/urfave/cli/compare/v1.14.0...v1.15.0
-[1.14.0]: https://github.com/urfave/cli/compare/v1.13.0...v1.14.0
-[1.13.0]: https://github.com/urfave/cli/compare/v1.12.0...v1.13.0
-[1.12.0]: https://github.com/urfave/cli/compare/v1.11.1...v1.12.0
-[1.11.1]: https://github.com/urfave/cli/compare/v1.11.0...v1.11.1
-[1.11.0]: https://github.com/urfave/cli/compare/v1.10.2...v1.11.0
-[1.10.2]: https://github.com/urfave/cli/compare/v1.10.1...v1.10.2
-[1.10.1]: https://github.com/urfave/cli/compare/v1.10.0...v1.10.1
-[1.10.0]: https://github.com/urfave/cli/compare/v1.9.0...v1.10.0
-[1.9.0]: https://github.com/urfave/cli/compare/v1.8.0...v1.9.0
-[1.8.0]: https://github.com/urfave/cli/compare/v1.7.1...v1.8.0
-[1.7.1]: https://github.com/urfave/cli/compare/v1.7.0...v1.7.1
-[1.7.0]: https://github.com/urfave/cli/compare/v1.6.0...v1.7.0
-[1.6.0]: https://github.com/urfave/cli/compare/v1.5.0...v1.6.0
-[1.5.0]: https://github.com/urfave/cli/compare/v1.4.1...v1.5.0
-[1.4.1]: https://github.com/urfave/cli/compare/v1.4.0...v1.4.1
-[1.4.0]: https://github.com/urfave/cli/compare/v1.3.1...v1.4.0
-[1.3.1]: https://github.com/urfave/cli/compare/v1.3.0...v1.3.1
-[1.3.0]: https://github.com/urfave/cli/compare/v1.2.0...v1.3.0
-[1.2.0]: https://github.com/urfave/cli/compare/v1.1.0...v1.2.0
-[1.1.0]: https://github.com/urfave/cli/compare/v1.0.0...v1.1.0
-[1.0.0]: https://github.com/urfave/cli/compare/v0.1.0...v1.0.0
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/README.md b/installer/vendor/gopkg.in/urfave/cli.v1/README.md
deleted file mode 100644
index bb5f61eafd..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/README.md
+++ /dev/null
@@ -1,1364 +0,0 @@
-cli
-===
-
-[![Build Status](https://travis-ci.org/urfave/cli.svg?branch=master)](https://travis-ci.org/urfave/cli)
-[![Windows Build Status](https://ci.appveyor.com/api/projects/status/rtgk5xufi932pb2v?svg=true)](https://ci.appveyor.com/project/urfave/cli)
-[![GoDoc](https://godoc.org/github.com/urfave/cli?status.svg)](https://godoc.org/github.com/urfave/cli)
-[![codebeat](https://codebeat.co/badges/0a8f30aa-f975-404b-b878-5fab3ae1cc5f)](https://codebeat.co/projects/jackfan.us.kg-urfave-cli)
-[![Go Report Card](https://goreportcard.com/badge/urfave/cli)](https://goreportcard.com/report/urfave/cli)
-[![top level coverage](https://gocover.io/_badge/github.com/urfave/cli?0 "top level coverage")](http://gocover.io/github.com/urfave/cli) /
-[![altsrc coverage](https://gocover.io/_badge/github.com/urfave/cli/altsrc?0 "altsrc coverage")](http://gocover.io/github.com/urfave/cli/altsrc)
-
-**Notice:** This is the library formerly known as
-`github.com/codegangsta/cli` -- Github will automatically redirect requests
-to this repository, but we recommend updating your references for clarity.
-
-cli is a simple, fast, and fun package for building command line apps in Go. The
-goal is to enable developers to write fast and distributable command line
-applications in an expressive way.
-
-<!-- toc -->
-
-- [Overview](#overview)
-- [Installation](#installation)
-  * [Supported platforms](#supported-platforms)
-  * [Using the `v2` branch](#using-the-v2-branch)
-  * [Pinning to the `v1` releases](#pinning-to-the-v1-releases)
-- [Getting Started](#getting-started)
-- [Examples](#examples)
-  * [Arguments](#arguments)
-  * [Flags](#flags)
-    + [Placeholder Values](#placeholder-values)
-    + [Alternate Names](#alternate-names)
-    + [Ordering](#ordering)
-    + [Values from the Environment](#values-from-the-environment)
-    + [Values from alternate input sources (YAML, TOML, and others)](#values-from-alternate-input-sources-yaml-toml-and-others)
-  * [Subcommands](#subcommands)
-  * [Subcommands categories](#subcommands-categories)
-  * [Exit code](#exit-code)
-  * [Bash Completion](#bash-completion)
-    + [Enabling](#enabling)
-    + [Distribution](#distribution)
-    + [Customization](#customization)
-  * [Generated Help Text](#generated-help-text)
-    + [Customization](#customization-1)
-  * [Version Flag](#version-flag)
-    + [Customization](#customization-2)
-    + [Full API Example](#full-api-example)
-- [Contribution Guidelines](#contribution-guidelines)
-
-<!-- tocstop -->
-
-## Overview
-
-Command line apps are usually so tiny that there is absolutely no reason why
-your code should *not* be self-documenting. Things like generating help text and
-parsing command flags/options should not hinder productivity when writing a
-command line app.
-
-**This is where cli comes into play.** cli makes command line programming fun,
-organized, and expressive!
-
-## Installation
-
-Make sure you have a working Go environment.  Go version 1.2+ is supported.  [See
-the install instructions for Go](http://golang.org/doc/install.html).
-
-To install cli, simply run:
-```
-$ go get github.com/urfave/cli
-```
-
-Make sure your `PATH` includes the `$GOPATH/bin` directory so your commands can
-be easily used:
-```
-export PATH=$PATH:$GOPATH/bin
-```
-
-### Supported platforms
-
-cli is tested against multiple versions of Go on Linux, and against the latest
-released version of Go on OS X and Windows.  For full details, see
-[`./.travis.yml`](./.travis.yml) and [`./appveyor.yml`](./appveyor.yml).
-
-### Using the `v2` branch
-
-**Warning**: The `v2` branch is currently unreleased and considered unstable.
-
-There is currently a long-lived branch named `v2` that is intended to land as
-the new `master` branch once development there has settled down.  The current
-`master` branch (mirrored as `v1`) is being manually merged into `v2` on
-an irregular human-based schedule, but generally if one wants to "upgrade" to
-`v2` *now* and accept the volatility (read: "awesomeness") that comes along with
-that, please use whatever version pinning of your preference, such as via
-`gopkg.in`:
-
-```
-$ go get gopkg.in/urfave/cli.v2
-```
-
-``` go
-...
-import (
-  "gopkg.in/urfave/cli.v2" // imports as package "cli"
-)
-...
-```
-
-### Pinning to the `v1` releases
-
-Similarly to the section above describing use of the `v2` branch, if one wants
-to avoid any unexpected compatibility pains once `v2` becomes `master`, then
-pinning to `v1` is an acceptable option, e.g.:
-
-```
-$ go get gopkg.in/urfave/cli.v1
-```
-
-``` go
-...
-import (
-  "gopkg.in/urfave/cli.v1" // imports as package "cli"
-)
-...
-```
-
-This will pull the latest tagged `v1` release (e.g. `v1.18.1` at the time of writing).
-
-## Getting Started
-
-One of the philosophies behind cli is that an API should be playful and full of
-discovery. So a cli app can be as little as one line of code in `main()`.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "A new cli application"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.NewApp().Run(os.Args)
-}
-```
-
-This app will run and show help text, but is not very useful. Let's give an
-action to execute and some help documentation:
-
-<!-- {
-  "output": "boom! I say!"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "boom"
-  app.Usage = "make an explosive entrance"
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("boom! I say!")
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Running this already gives you a ton of functionality, plus support for things
-like subcommands and flags, which are covered below.
-
-## Examples
-
-Being a programmer can be a lonely job. Thankfully by the power of automation
-that is not the case! Let's create a greeter app to fend off our demons of
-loneliness!
-
-Start by creating a directory named `greet`, and within it, add a file,
-`greet.go` with the following code in it:
-
-<!-- {
-  "output": "Hello friend!"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "greet"
-  app.Usage = "fight the loneliness!"
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("Hello friend!")
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Install our command to the `$GOPATH/bin` directory:
-
-```
-$ go install
-```
-
-Finally run our new command:
-
-```
-$ greet
-Hello friend!
-```
-
-cli also generates neat help text:
-
-```
-$ greet help
-NAME:
-    greet - fight the loneliness!
-
-USAGE:
-    greet [global options] command [command options] [arguments...]
-
-VERSION:
-    0.0.0
-
-COMMANDS:
-    help, h  Shows a list of commands or help for one command
-
-GLOBAL OPTIONS
-    --version Shows version information
-```
-
-### Arguments
-
-You can lookup arguments by calling the `Args` function on `cli.Context`, e.g.:
-
-<!-- {
-  "output": "Hello \""
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Action = func(c *cli.Context) error {
-    fmt.Printf("Hello %q", c.Args().Get(0))
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Flags
-
-Setting and querying flags is simple.
-
-<!-- {
-  "output": "Hello Nefertiti"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang",
-      Value: "english",
-      Usage: "language for the greeting",
-    },
-  }
-
-  app.Action = func(c *cli.Context) error {
-    name := "Nefertiti"
-    if c.NArg() > 0 {
-      name = c.Args().Get(0)
-    }
-    if c.String("lang") == "spanish" {
-      fmt.Println("Hola", name)
-    } else {
-      fmt.Println("Hello", name)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-You can also set a destination variable for a flag, to which the content will be
-scanned.
-
-<!-- {
-  "output": "Hello someone"
-} -->
-``` go
-package main
-
-import (
-  "os"
-  "fmt"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  var language string
-
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name:        "lang",
-      Value:       "english",
-      Usage:       "language for the greeting",
-      Destination: &language,
-    },
-  }
-
-  app.Action = func(c *cli.Context) error {
-    name := "someone"
-    if c.NArg() > 0 {
-      name = c.Args()[0]
-    }
-    if language == "spanish" {
-      fmt.Println("Hola", name)
-    } else {
-      fmt.Println("Hello", name)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-See full list of flags at http://godoc.org/github.com/urfave/cli
-
-#### Placeholder Values
-
-Sometimes it's useful to specify a flag's value within the usage string itself.
-Such placeholders are indicated with back quotes.
-
-For example this:
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "&#45;&#45;config FILE, &#45;c FILE"
-} -->
-```go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag{
-    cli.StringFlag{
-      Name:  "config, c",
-      Usage: "Load configuration from `FILE`",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Will result in help output like:
-
-```
---config FILE, -c FILE   Load configuration from FILE
-```
-
-Note that only the first placeholder is used. Subsequent back-quoted words will
-be left as-is.
-
-#### Alternate Names
-
-You can set alternate (or short) names for flags by providing a comma-delimited
-list for the `Name`. e.g.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "&#45;&#45;lang value, &#45;l value.*language for the greeting.*default: \"english\""
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-That flag can then be set with `--lang spanish` or `-l spanish`. Note that
-giving two different forms of the same flag in the same command invocation is an
-error.
-
-#### Ordering
-
-Flags for the application and commands are shown in the order they are defined.
-However, it's possible to sort them from outside this library by using `FlagsByName`
-with `sort`.
-
-For example this:
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "Load configuration from FILE\n.*Language for the greeting.*"
-} -->
-``` go
-package main
-
-import (
-  "os"
-  "sort"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "Language for the greeting",
-    },
-    cli.StringFlag{
-      Name: "config, c",
-      Usage: "Load configuration from `FILE`",
-    },
-  }
-
-  sort.Sort(cli.FlagsByName(app.Flags))
-
-  app.Run(os.Args)
-}
-```
-
-Will result in help output like:
-
-```
---config FILE, -c FILE  Load configuration from FILE
---lang value, -l value  Language for the greeting (default: "english")
-```
-
-#### Values from the Environment
-
-You can also have the default value set from the environment via `EnvVar`.  e.g.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "language for the greeting.*APP_LANG"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-      EnvVar: "APP_LANG",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-The `EnvVar` may also be given as a comma-delimited "cascade", where the first
-environment variable that resolves is used as the default.
-
-<!-- {
-  "args": ["&#45;&#45;help"],
-  "output": "language for the greeting.*LEGACY_COMPAT_LANG.*APP_LANG.*LANG"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Flags = []cli.Flag {
-    cli.StringFlag{
-      Name: "lang, l",
-      Value: "english",
-      Usage: "language for the greeting",
-      EnvVar: "LEGACY_COMPAT_LANG,APP_LANG,LANG",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-#### Values from alternate input sources (YAML, TOML, and others)
-
-There is a separate package altsrc that adds support for getting flag values
-from other file input sources.
-
-Currently supported input source formats:
-* YAML
-* TOML
-
-In order to get values for a flag from an alternate input source the following
-code would be added to wrap an existing cli.Flag like below:
-
-``` go
-  altsrc.NewIntFlag(cli.IntFlag{Name: "test"})
-```
-
-Initialization must also occur for these flags. Below is an example initializing
-getting data from a yaml file below.
-
-``` go
-  command.Before = altsrc.InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-```
-
-The code above will use the "load" string as a flag name to get the file name of
-a yaml file from the cli.Context.  It will then use that file name to initialize
-the yaml input source for any flags that are defined on that command.  As a note
-the "load" flag used would also have to be defined on the command flags in order
-for this code snipped to work.
-
-Currently only the aboved specified formats are supported but developers can
-add support for other input sources by implementing the
-altsrc.InputSourceContext for their given sources.
-
-Here is a more complete sample of a command using YAML support:
-
-<!-- {
-  "args": ["test-cmd", "&#45;&#45;help"],
-  "output": "&#45&#45;test value.*default: 0"
-} -->
-``` go
-package notmain
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-  "github.com/urfave/cli/altsrc"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  flags := []cli.Flag{
-    altsrc.NewIntFlag(cli.IntFlag{Name: "test"}),
-    cli.StringFlag{Name: "load"},
-  }
-
-  app.Action = func(c *cli.Context) error {
-    fmt.Println("yaml ist rad")
-    return nil
-  }
-
-  app.Before = altsrc.InitInputSourceWithContext(flags, altsrc.NewYamlSourceFromFlagFunc("load"))
-  app.Flags = flags
-
-  app.Run(os.Args)
-}
-```
-
-### Subcommands
-
-Subcommands can be defined for a more git-like command line app.
-
-<!-- {
-  "args": ["template", "add"],
-  "output": "new task template: .+"
-} -->
-```go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Commands = []cli.Command{
-    {
-      Name:    "add",
-      Aliases: []string{"a"},
-      Usage:   "add a task to the list",
-      Action:  func(c *cli.Context) error {
-        fmt.Println("added task: ", c.Args().First())
-        return nil
-      },
-    },
-    {
-      Name:    "complete",
-      Aliases: []string{"c"},
-      Usage:   "complete a task on the list",
-      Action:  func(c *cli.Context) error {
-        fmt.Println("completed task: ", c.Args().First())
-        return nil
-      },
-    },
-    {
-      Name:        "template",
-      Aliases:     []string{"t"},
-      Usage:       "options for task templates",
-      Subcommands: []cli.Command{
-        {
-          Name:  "add",
-          Usage: "add a new template",
-          Action: func(c *cli.Context) error {
-            fmt.Println("new task template: ", c.Args().First())
-            return nil
-          },
-        },
-        {
-          Name:  "remove",
-          Usage: "remove an existing template",
-          Action: func(c *cli.Context) error {
-            fmt.Println("removed task template: ", c.Args().First())
-            return nil
-          },
-        },
-      },
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Subcommands categories
-
-For additional organization in apps that have many subcommands, you can
-associate a category for each command to group them together in the help
-output.
-
-E.g.
-
-```go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-
-  app.Commands = []cli.Command{
-    {
-      Name: "noop",
-    },
-    {
-      Name:     "add",
-      Category: "template",
-    },
-    {
-      Name:     "remove",
-      Category: "template",
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-Will include:
-
-```
-COMMANDS:
-    noop
-
-  Template actions:
-    add
-    remove
-```
-
-### Exit code
-
-Calling `App.Run` will not automatically call `os.Exit`, which means that by
-default the exit code will "fall through" to being `0`.  An explicit exit code
-may be set by returning a non-nil error that fulfills `cli.ExitCoder`, *or* a
-`cli.MultiError` that includes an error that fulfills `cli.ExitCoder`, e.g.:
-
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  app := cli.NewApp()
-  app.Flags = []cli.Flag{
-    cli.BoolTFlag{
-      Name:  "ginger-crouton",
-      Usage: "is it in the soup?",
-    },
-  }
-  app.Action = func(ctx *cli.Context) error {
-    if !ctx.Bool("ginger-crouton") {
-      return cli.NewExitError("it is not in the soup", 86)
-    }
-    return nil
-  }
-
-  app.Run(os.Args)
-}
-```
-
-### Bash Completion
-
-You can enable completion commands by setting the `EnableBashCompletion`
-flag on the `App` object.  By default, this setting will only auto-complete to
-show an app's subcommands, but you can write your own completion methods for
-the App or its subcommands.
-
-<!-- {
-  "args": ["complete", "&#45;&#45;generate&#45;bash&#45;completion"],
-  "output": "laundry"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  tasks := []string{"cook", "clean", "laundry", "eat", "sleep", "code"}
-
-  app := cli.NewApp()
-  app.EnableBashCompletion = true
-  app.Commands = []cli.Command{
-    {
-      Name:  "complete",
-      Aliases: []string{"c"},
-      Usage: "complete a task on the list",
-      Action: func(c *cli.Context) error {
-         fmt.Println("completed task: ", c.Args().First())
-         return nil
-      },
-      BashComplete: func(c *cli.Context) {
-        // This will complete if no args are passed
-        if c.NArg() > 0 {
-          return
-        }
-        for _, t := range tasks {
-          fmt.Println(t)
-        }
-      },
-    },
-  }
-
-  app.Run(os.Args)
-}
-```
-
-#### Enabling
-
-Source the `autocomplete/bash_autocomplete` file in your `.bashrc` file while
-setting the `PROG` variable to the name of your program:
-
-`PROG=myprogram source /.../cli/autocomplete/bash_autocomplete`
-
-#### Distribution
-
-Copy `autocomplete/bash_autocomplete` into `/etc/bash_completion.d/` and rename
-it to the name of the program you wish to add autocomplete support for (or
-automatically install it there if you are distributing a package). Don't forget
-to source the file to make it active in the current shell.
-
-```
-sudo cp src/bash_autocomplete /etc/bash_completion.d/<myprogram>
-source /etc/bash_completion.d/<myprogram>
-```
-
-Alternatively, you can just document that users should source the generic
-`autocomplete/bash_autocomplete` in their bash configuration with `$PROG` set
-to the name of their program (as above).
-
-#### Customization
-
-The default bash completion flag (`--generate-bash-completion`) is defined as
-`cli.BashCompletionFlag`, and may be redefined if desired, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45;compgen"],
-  "output": "wat\nhelp\nh"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.BashCompletionFlag = cli.BoolFlag{
-    Name:   "compgen",
-    Hidden: true,
-  }
-
-  app := cli.NewApp()
-  app.EnableBashCompletion = true
-  app.Commands = []cli.Command{
-    {
-      Name: "wat",
-    },
-  }
-  app.Run(os.Args)
-}
-```
-
-### Generated Help Text
-
-The default help flag (`-h/--help`) is defined as `cli.HelpFlag` and is checked
-by the cli internals in order to print generated help text for the app, command,
-or subcommand, and break execution.
-
-#### Customization
-
-All of the help text generation may be customized, and at multiple levels.  The
-templates are exposed as variables `AppHelpTemplate`, `CommandHelpTemplate`, and
-`SubcommandHelpTemplate` which may be reassigned or augmented, and full override
-is possible by assigning a compatible func to the `cli.HelpPrinter` variable,
-e.g.:
-
-<!-- {
-  "output": "Ha HA.  I pwnd the help!!1"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "io"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  // EXAMPLE: Append to an existing template
-  cli.AppHelpTemplate = fmt.Sprintf(`%s
-
-WEBSITE: http://awesometown.example.com
-
-SUPPORT: support@awesometown.example.com
-
-`, cli.AppHelpTemplate)
-
-  // EXAMPLE: Override a template
-  cli.AppHelpTemplate = `NAME:
-   {{.Name}} - {{.Usage}}
-USAGE:
-   {{.HelpName}} {{if .VisibleFlags}}[global options]{{end}}{{if .Commands}} command
-[command options]{{end}} {{if
-.ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
-   {{if len .Authors}}
-AUTHOR(S):
-   {{range .Authors}}{{ . }}{{end}}
-   {{end}}{{if .Commands}}
-COMMANDS:
-{{range .Commands}}{{if not .HideHelp}}   {{join .Names ", "}}{{ "\t"
-}}{{.Usage}}{{ "\n" }}{{end}}{{end}}{{end}}{{if .VisibleFlags}}
-GLOBAL OPTIONS:
-   {{range .VisibleFlags}}{{.}}
-   {{end}}{{end}}{{if .Copyright }}
-COPYRIGHT:
-   {{.Copyright}}
-   {{end}}{{if .Version}}
-VERSION:
-   {{.Version}}
-   {{end}}
-`
-
-  // EXAMPLE: Replace the `HelpPrinter` func
-  cli.HelpPrinter = func(w io.Writer, templ string, data interface{}) {
-    fmt.Println("Ha HA.  I pwnd the help!!1")
-  }
-
-  cli.NewApp().Run(os.Args)
-}
-```
-
-The default flag may be customized to something other than `-h/--help` by
-setting `cli.HelpFlag`, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45halp"],
-  "output": "haaaaalp.*HALP"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.HelpFlag = cli.BoolFlag{
-    Name: "halp, haaaaalp",
-    Usage: "HALP",
-    EnvVar: "SHOW_HALP,HALPPLZ",
-  }
-
-  cli.NewApp().Run(os.Args)
-}
-```
-
-### Version Flag
-
-The default version flag (`-v/--version`) is defined as `cli.VersionFlag`, which
-is checked by the cli internals in order to print the `App.Version` via
-`cli.VersionPrinter` and break execution.
-
-#### Customization
-
-The default flag may be customized to something other than `-v/--version` by
-setting `cli.VersionFlag`, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45print-version"],
-  "output": "partay version 19\\.99\\.0"
-} -->
-``` go
-package main
-
-import (
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-func main() {
-  cli.VersionFlag = cli.BoolFlag{
-    Name: "print-version, V",
-    Usage: "print only the version",
-  }
-
-  app := cli.NewApp()
-  app.Name = "partay"
-  app.Version = "19.99.0"
-  app.Run(os.Args)
-}
-```
-
-Alternatively, the version printer at `cli.VersionPrinter` may be overridden, e.g.:
-
-<!-- {
-  "args": ["&#45;&#45version"],
-  "output": "version=19\\.99\\.0 revision=fafafaf"
-} -->
-``` go
-package main
-
-import (
-  "fmt"
-  "os"
-
-  "github.com/urfave/cli"
-)
-
-var (
-  Revision = "fafafaf"
-)
-
-func main() {
-  cli.VersionPrinter = func(c *cli.Context) {
-    fmt.Printf("version=%s revision=%s\n", c.App.Version, Revision)
-  }
-
-  app := cli.NewApp()
-  app.Name = "partay"
-  app.Version = "19.99.0"
-  app.Run(os.Args)
-}
-```
-
-#### Full API Example
-
-**Notice**: This is a contrived (functioning) example meant strictly for API
-demonstration purposes.  Use of one's imagination is encouraged.
-
-<!-- {
-  "output": "made it!\nPhew!"
-} -->
-``` go
-package main
-
-import (
-  "errors"
-  "flag"
-  "fmt"
-  "io"
-  "io/ioutil"
-  "os"
-  "time"
-
-  "github.com/urfave/cli"
-)
-
-func init() {
-  cli.AppHelpTemplate += "\nCUSTOMIZED: you bet ur muffins\n"
-  cli.CommandHelpTemplate += "\nYMMV\n"
-  cli.SubcommandHelpTemplate += "\nor something\n"
-
-  cli.HelpFlag = cli.BoolFlag{Name: "halp"}
-  cli.BashCompletionFlag = cli.BoolFlag{Name: "compgen", Hidden: true}
-  cli.VersionFlag = cli.BoolFlag{Name: "print-version, V"}
-
-  cli.HelpPrinter = func(w io.Writer, templ string, data interface{}) {
-    fmt.Fprintf(w, "best of luck to you\n")
-  }
-  cli.VersionPrinter = func(c *cli.Context) {
-    fmt.Fprintf(c.App.Writer, "version=%s\n", c.App.Version)
-  }
-  cli.OsExiter = func(c int) {
-    fmt.Fprintf(cli.ErrWriter, "refusing to exit %d\n", c)
-  }
-  cli.ErrWriter = ioutil.Discard
-  cli.FlagStringer = func(fl cli.Flag) string {
-    return fmt.Sprintf("\t\t%s", fl.GetName())
-  }
-}
-
-type hexWriter struct{}
-
-func (w *hexWriter) Write(p []byte) (int, error) {
-  for _, b := range p {
-    fmt.Printf("%x", b)
-  }
-  fmt.Printf("\n")
-
-  return len(p), nil
-}
-
-type genericType struct{
-  s string
-}
-
-func (g *genericType) Set(value string) error {
-  g.s = value
-  return nil
-}
-
-func (g *genericType) String() string {
-  return g.s
-}
-
-func main() {
-  app := cli.NewApp()
-  app.Name = "kənˈtrīv"
-  app.Version = "19.99.0"
-  app.Compiled = time.Now()
-  app.Authors = []cli.Author{
-    cli.Author{
-      Name:  "Example Human",
-      Email: "human@example.com",
-    },
-  }
-  app.Copyright = "(c) 1999 Serious Enterprise"
-  app.HelpName = "contrive"
-  app.Usage = "demonstrate available API"
-  app.UsageText = "contrive - demonstrating the available API"
-  app.ArgsUsage = "[args and such]"
-  app.Commands = []cli.Command{
-    cli.Command{
-      Name:        "doo",
-      Aliases:     []string{"do"},
-      Category:    "motion",
-      Usage:       "do the doo",
-      UsageText:   "doo - does the dooing",
-      Description: "no really, there is a lot of dooing to be done",
-      ArgsUsage:   "[arrgh]",
-      Flags: []cli.Flag{
-        cli.BoolFlag{Name: "forever, forevvarr"},
-      },
-      Subcommands: cli.Commands{
-        cli.Command{
-          Name:   "wop",
-          Action: wopAction,
-        },
-      },
-      SkipFlagParsing: false,
-      HideHelp:        false,
-      Hidden:          false,
-      HelpName:        "doo!",
-      BashComplete: func(c *cli.Context) {
-        fmt.Fprintf(c.App.Writer, "--better\n")
-      },
-      Before: func(c *cli.Context) error {
-        fmt.Fprintf(c.App.Writer, "brace for impact\n")
-        return nil
-      },
-      After: func(c *cli.Context) error {
-        fmt.Fprintf(c.App.Writer, "did we lose anyone?\n")
-        return nil
-      },
-      Action: func(c *cli.Context) error {
-        c.Command.FullName()
-        c.Command.HasName("wop")
-        c.Command.Names()
-        c.Command.VisibleFlags()
-        fmt.Fprintf(c.App.Writer, "dodododododoodododddooooododododooo\n")
-        if c.Bool("forever") {
-          c.Command.Run(c)
-        }
-        return nil
-      },
-      OnUsageError: func(c *cli.Context, err error, isSubcommand bool) error {
-        fmt.Fprintf(c.App.Writer, "for shame\n")
-        return err
-      },
-    },
-  }
-  app.Flags = []cli.Flag{
-    cli.BoolFlag{Name: "fancy"},
-    cli.BoolTFlag{Name: "fancier"},
-    cli.DurationFlag{Name: "howlong, H", Value: time.Second * 3},
-    cli.Float64Flag{Name: "howmuch"},
-    cli.GenericFlag{Name: "wat", Value: &genericType{}},
-    cli.Int64Flag{Name: "longdistance"},
-    cli.Int64SliceFlag{Name: "intervals"},
-    cli.IntFlag{Name: "distance"},
-    cli.IntSliceFlag{Name: "times"},
-    cli.StringFlag{Name: "dance-move, d"},
-    cli.StringSliceFlag{Name: "names, N"},
-    cli.UintFlag{Name: "age"},
-    cli.Uint64Flag{Name: "bigage"},
-  }
-  app.EnableBashCompletion = true
-  app.HideHelp = false
-  app.HideVersion = false
-  app.BashComplete = func(c *cli.Context) {
-    fmt.Fprintf(c.App.Writer, "lipstick\nkiss\nme\nlipstick\nringo\n")
-  }
-  app.Before = func(c *cli.Context) error {
-    fmt.Fprintf(c.App.Writer, "HEEEERE GOES\n")
-    return nil
-  }
-  app.After = func(c *cli.Context) error {
-    fmt.Fprintf(c.App.Writer, "Phew!\n")
-    return nil
-  }
-  app.CommandNotFound = func(c *cli.Context, command string) {
-    fmt.Fprintf(c.App.Writer, "Thar be no %q here.\n", command)
-  }
-  app.OnUsageError = func(c *cli.Context, err error, isSubcommand bool) error {
-    if isSubcommand {
-      return err
-    }
-
-    fmt.Fprintf(c.App.Writer, "WRONG: %#v\n", err)
-    return nil
-  }
-  app.Action = func(c *cli.Context) error {
-    cli.DefaultAppComplete(c)
-    cli.HandleExitCoder(errors.New("not an exit coder, though"))
-    cli.ShowAppHelp(c)
-    cli.ShowCommandCompletions(c, "nope")
-    cli.ShowCommandHelp(c, "also-nope")
-    cli.ShowCompletions(c)
-    cli.ShowSubcommandHelp(c)
-    cli.ShowVersion(c)
-
-    categories := c.App.Categories()
-    categories.AddCommand("sounds", cli.Command{
-      Name: "bloop",
-    })
-
-    for _, category := range c.App.Categories() {
-      fmt.Fprintf(c.App.Writer, "%s\n", category.Name)
-      fmt.Fprintf(c.App.Writer, "%#v\n", category.Commands)
-      fmt.Fprintf(c.App.Writer, "%#v\n", category.VisibleCommands())
-    }
-
-    fmt.Printf("%#v\n", c.App.Command("doo"))
-    if c.Bool("infinite") {
-      c.App.Run([]string{"app", "doo", "wop"})
-    }
-
-    if c.Bool("forevar") {
-      c.App.RunAsSubcommand(c)
-    }
-    c.App.Setup()
-    fmt.Printf("%#v\n", c.App.VisibleCategories())
-    fmt.Printf("%#v\n", c.App.VisibleCommands())
-    fmt.Printf("%#v\n", c.App.VisibleFlags())
-
-    fmt.Printf("%#v\n", c.Args().First())
-    if len(c.Args()) > 0 {
-      fmt.Printf("%#v\n", c.Args()[1])
-    }
-    fmt.Printf("%#v\n", c.Args().Present())
-    fmt.Printf("%#v\n", c.Args().Tail())
-
-    set := flag.NewFlagSet("contrive", 0)
-    nc := cli.NewContext(c.App, set, c)
-
-    fmt.Printf("%#v\n", nc.Args())
-    fmt.Printf("%#v\n", nc.Bool("nope"))
-    fmt.Printf("%#v\n", nc.BoolT("nerp"))
-    fmt.Printf("%#v\n", nc.Duration("howlong"))
-    fmt.Printf("%#v\n", nc.Float64("hay"))
-    fmt.Printf("%#v\n", nc.Generic("bloop"))
-    fmt.Printf("%#v\n", nc.Int64("bonk"))
-    fmt.Printf("%#v\n", nc.Int64Slice("burnks"))
-    fmt.Printf("%#v\n", nc.Int("bips"))
-    fmt.Printf("%#v\n", nc.IntSlice("blups"))
-    fmt.Printf("%#v\n", nc.String("snurt"))
-    fmt.Printf("%#v\n", nc.StringSlice("snurkles"))
-    fmt.Printf("%#v\n", nc.Uint("flub"))
-    fmt.Printf("%#v\n", nc.Uint64("florb"))
-    fmt.Printf("%#v\n", nc.GlobalBool("global-nope"))
-    fmt.Printf("%#v\n", nc.GlobalBoolT("global-nerp"))
-    fmt.Printf("%#v\n", nc.GlobalDuration("global-howlong"))
-    fmt.Printf("%#v\n", nc.GlobalFloat64("global-hay"))
-    fmt.Printf("%#v\n", nc.GlobalGeneric("global-bloop"))
-    fmt.Printf("%#v\n", nc.GlobalInt("global-bips"))
-    fmt.Printf("%#v\n", nc.GlobalIntSlice("global-blups"))
-    fmt.Printf("%#v\n", nc.GlobalString("global-snurt"))
-    fmt.Printf("%#v\n", nc.GlobalStringSlice("global-snurkles"))
-
-    fmt.Printf("%#v\n", nc.FlagNames())
-    fmt.Printf("%#v\n", nc.GlobalFlagNames())
-    fmt.Printf("%#v\n", nc.GlobalIsSet("wat"))
-    fmt.Printf("%#v\n", nc.GlobalSet("wat", "nope"))
-    fmt.Printf("%#v\n", nc.NArg())
-    fmt.Printf("%#v\n", nc.NumFlags())
-    fmt.Printf("%#v\n", nc.Parent())
-
-    nc.Set("wat", "also-nope")
-
-    ec := cli.NewExitError("ohwell", 86)
-    fmt.Fprintf(c.App.Writer, "%d", ec.ExitCode())
-    fmt.Printf("made it!\n")
-    return ec
-  }
-
-  if os.Getenv("HEXY") != "" {
-    app.Writer = &hexWriter{}
-    app.ErrWriter = &hexWriter{}
-  }
-
-  app.Metadata = map[string]interface{}{
-    "layers":     "many",
-    "explicable": false,
-    "whatever-values": 19.99,
-  }
-
-  app.Run(os.Args)
-}
-
-func wopAction(c *cli.Context) error {
-  fmt.Fprintf(c.App.Writer, ":wave: over here, eh\n")
-  return nil
-}
-```
-
-## Contribution Guidelines
-
-Feel free to put up a pull request to fix a bug or maybe add a feature. I will
-give it a code review and make sure that it does not break backwards
-compatibility. If I or any other collaborators agree that it is in line with
-the vision of the project, we will work with you to get the code into
-a mergeable state and merge it into the master branch.
-
-If you have contributed something significant to the project, we will most
-likely add you as a collaborator. As a collaborator you are given the ability
-to merge others pull requests. It is very important that new code does not
-break existing code, so be careful about what code you do choose to merge.
-
-If you feel like you have contributed to the project but have not yet been
-added as a collaborator, we probably forgot to add you, please open an issue.
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/altsrc.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/altsrc.go
deleted file mode 100644
index ac34bf633b..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/altsrc.go
+++ /dev/null
@@ -1,3 +0,0 @@
-package altsrc
-
-//go:generate python ../generate-flag-types altsrc -i ../flag-types.json -o flag_generated.go
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag.go
deleted file mode 100644
index 84ef009a5b..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag.go
+++ /dev/null
@@ -1,261 +0,0 @@
-package altsrc
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"syscall"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-// FlagInputSourceExtension is an extension interface of cli.Flag that
-// allows a value to be set on the existing parsed flags.
-type FlagInputSourceExtension interface {
-	cli.Flag
-	ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error
-}
-
-// ApplyInputSourceValues iterates over all provided flags and
-// executes ApplyInputSourceValue on flags implementing the
-// FlagInputSourceExtension interface to initialize these flags
-// to an alternate input source.
-func ApplyInputSourceValues(context *cli.Context, inputSourceContext InputSourceContext, flags []cli.Flag) error {
-	for _, f := range flags {
-		inputSourceExtendedFlag, isType := f.(FlagInputSourceExtension)
-		if isType {
-			err := inputSourceExtendedFlag.ApplyInputSourceValue(context, inputSourceContext)
-			if err != nil {
-				return err
-			}
-		}
-	}
-
-	return nil
-}
-
-// InitInputSource is used to to setup an InputSourceContext on a cli.Command Before method. It will create a new
-// input source based on the func provided. If there is no error it will then apply the new input source to any flags
-// that are supported by the input source
-func InitInputSource(flags []cli.Flag, createInputSource func() (InputSourceContext, error)) cli.BeforeFunc {
-	return func(context *cli.Context) error {
-		inputSource, err := createInputSource()
-		if err != nil {
-			return fmt.Errorf("Unable to create input source: inner error: \n'%v'", err.Error())
-		}
-
-		return ApplyInputSourceValues(context, inputSource, flags)
-	}
-}
-
-// InitInputSourceWithContext is used to to setup an InputSourceContext on a cli.Command Before method. It will create a new
-// input source based on the func provided with potentially using existing cli.Context values to initialize itself. If there is
-// no error it will then apply the new input source to any flags that are supported by the input source
-func InitInputSourceWithContext(flags []cli.Flag, createInputSource func(context *cli.Context) (InputSourceContext, error)) cli.BeforeFunc {
-	return func(context *cli.Context) error {
-		inputSource, err := createInputSource(context)
-		if err != nil {
-			return fmt.Errorf("Unable to create input source with context: inner error: \n'%v'", err.Error())
-		}
-
-		return ApplyInputSourceValues(context, inputSource, flags)
-	}
-}
-
-// ApplyInputSourceValue applies a generic value to the flagSet if required
-func (f *GenericFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !context.IsSet(f.Name) && !isEnvVarSet(f.EnvVar) {
-			value, err := isc.Generic(f.GenericFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value != nil {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, value.String())
-				})
-			}
-		}
-	}
-
-	return nil
-}
-
-// ApplyInputSourceValue applies a StringSlice value to the flagSet if required
-func (f *StringSliceFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !context.IsSet(f.Name) && !isEnvVarSet(f.EnvVar) {
-			value, err := isc.StringSlice(f.StringSliceFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value != nil {
-				var sliceValue cli.StringSlice = value
-				eachName(f.Name, func(name string) {
-					underlyingFlag := f.set.Lookup(f.Name)
-					if underlyingFlag != nil {
-						underlyingFlag.Value = &sliceValue
-					}
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a IntSlice value if required
-func (f *IntSliceFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !context.IsSet(f.Name) && !isEnvVarSet(f.EnvVar) {
-			value, err := isc.IntSlice(f.IntSliceFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value != nil {
-				var sliceValue cli.IntSlice = value
-				eachName(f.Name, func(name string) {
-					underlyingFlag := f.set.Lookup(f.Name)
-					if underlyingFlag != nil {
-						underlyingFlag.Value = &sliceValue
-					}
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a Bool value to the flagSet if required
-func (f *BoolFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !context.IsSet(f.Name) && !isEnvVarSet(f.EnvVar) {
-			value, err := isc.Bool(f.BoolFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, strconv.FormatBool(value))
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a BoolT value to the flagSet if required
-func (f *BoolTFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !context.IsSet(f.Name) && !isEnvVarSet(f.EnvVar) {
-			value, err := isc.BoolT(f.BoolTFlag.Name)
-			if err != nil {
-				return err
-			}
-			if !value {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, strconv.FormatBool(value))
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a String value to the flagSet if required
-func (f *StringFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !(context.IsSet(f.Name) || isEnvVarSet(f.EnvVar)) {
-			value, err := isc.String(f.StringFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value != "" {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, value)
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a int value to the flagSet if required
-func (f *IntFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !(context.IsSet(f.Name) || isEnvVarSet(f.EnvVar)) {
-			value, err := isc.Int(f.IntFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value > 0 {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, strconv.FormatInt(int64(value), 10))
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a Duration value to the flagSet if required
-func (f *DurationFlag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !(context.IsSet(f.Name) || isEnvVarSet(f.EnvVar)) {
-			value, err := isc.Duration(f.DurationFlag.Name)
-			if err != nil {
-				return err
-			}
-			if value > 0 {
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, value.String())
-				})
-			}
-		}
-	}
-	return nil
-}
-
-// ApplyInputSourceValue applies a Float64 value to the flagSet if required
-func (f *Float64Flag) ApplyInputSourceValue(context *cli.Context, isc InputSourceContext) error {
-	if f.set != nil {
-		if !(context.IsSet(f.Name) || isEnvVarSet(f.EnvVar)) {
-			value, err := isc.Float64(f.Float64Flag.Name)
-			if err != nil {
-				return err
-			}
-			if value > 0 {
-				floatStr := float64ToString(value)
-				eachName(f.Name, func(name string) {
-					f.set.Set(f.Name, floatStr)
-				})
-			}
-		}
-	}
-	return nil
-}
-
-func isEnvVarSet(envVars string) bool {
-	for _, envVar := range strings.Split(envVars, ",") {
-		envVar = strings.TrimSpace(envVar)
-		if _, ok := syscall.Getenv(envVar); ok {
-			// TODO: Can't use this for bools as
-			// set means that it was true or false based on
-			// Bool flag type, should work for other types
-			return true
-		}
-	}
-
-	return false
-}
-
-func float64ToString(f float64) string {
-	return fmt.Sprintf("%v", f)
-}
-
-func eachName(longName string, fn func(string)) {
-	parts := strings.Split(longName, ",")
-	for _, name := range parts {
-		name = strings.Trim(name, " ")
-		fn(name)
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_generated.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_generated.go
deleted file mode 100644
index 0aeb0b0414..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_generated.go
+++ /dev/null
@@ -1,347 +0,0 @@
-package altsrc
-
-import (
-	"flag"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-// WARNING: This file is generated!
-
-// BoolFlag is the flag type that wraps cli.BoolFlag to allow
-// for other values to be specified
-type BoolFlag struct {
-	cli.BoolFlag
-	set *flag.FlagSet
-}
-
-// NewBoolFlag creates a new BoolFlag
-func NewBoolFlag(fl cli.BoolFlag) *BoolFlag {
-	return &BoolFlag{BoolFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped BoolFlag.Apply
-func (f *BoolFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.BoolFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped BoolFlag.ApplyWithError
-func (f *BoolFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.BoolFlag.ApplyWithError(set)
-}
-
-// BoolTFlag is the flag type that wraps cli.BoolTFlag to allow
-// for other values to be specified
-type BoolTFlag struct {
-	cli.BoolTFlag
-	set *flag.FlagSet
-}
-
-// NewBoolTFlag creates a new BoolTFlag
-func NewBoolTFlag(fl cli.BoolTFlag) *BoolTFlag {
-	return &BoolTFlag{BoolTFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped BoolTFlag.Apply
-func (f *BoolTFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.BoolTFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped BoolTFlag.ApplyWithError
-func (f *BoolTFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.BoolTFlag.ApplyWithError(set)
-}
-
-// DurationFlag is the flag type that wraps cli.DurationFlag to allow
-// for other values to be specified
-type DurationFlag struct {
-	cli.DurationFlag
-	set *flag.FlagSet
-}
-
-// NewDurationFlag creates a new DurationFlag
-func NewDurationFlag(fl cli.DurationFlag) *DurationFlag {
-	return &DurationFlag{DurationFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped DurationFlag.Apply
-func (f *DurationFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.DurationFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped DurationFlag.ApplyWithError
-func (f *DurationFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.DurationFlag.ApplyWithError(set)
-}
-
-// Float64Flag is the flag type that wraps cli.Float64Flag to allow
-// for other values to be specified
-type Float64Flag struct {
-	cli.Float64Flag
-	set *flag.FlagSet
-}
-
-// NewFloat64Flag creates a new Float64Flag
-func NewFloat64Flag(fl cli.Float64Flag) *Float64Flag {
-	return &Float64Flag{Float64Flag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped Float64Flag.Apply
-func (f *Float64Flag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.Float64Flag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped Float64Flag.ApplyWithError
-func (f *Float64Flag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.Float64Flag.ApplyWithError(set)
-}
-
-// GenericFlag is the flag type that wraps cli.GenericFlag to allow
-// for other values to be specified
-type GenericFlag struct {
-	cli.GenericFlag
-	set *flag.FlagSet
-}
-
-// NewGenericFlag creates a new GenericFlag
-func NewGenericFlag(fl cli.GenericFlag) *GenericFlag {
-	return &GenericFlag{GenericFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped GenericFlag.Apply
-func (f *GenericFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.GenericFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped GenericFlag.ApplyWithError
-func (f *GenericFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.GenericFlag.ApplyWithError(set)
-}
-
-// Int64Flag is the flag type that wraps cli.Int64Flag to allow
-// for other values to be specified
-type Int64Flag struct {
-	cli.Int64Flag
-	set *flag.FlagSet
-}
-
-// NewInt64Flag creates a new Int64Flag
-func NewInt64Flag(fl cli.Int64Flag) *Int64Flag {
-	return &Int64Flag{Int64Flag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped Int64Flag.Apply
-func (f *Int64Flag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.Int64Flag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped Int64Flag.ApplyWithError
-func (f *Int64Flag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.Int64Flag.ApplyWithError(set)
-}
-
-// IntFlag is the flag type that wraps cli.IntFlag to allow
-// for other values to be specified
-type IntFlag struct {
-	cli.IntFlag
-	set *flag.FlagSet
-}
-
-// NewIntFlag creates a new IntFlag
-func NewIntFlag(fl cli.IntFlag) *IntFlag {
-	return &IntFlag{IntFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped IntFlag.Apply
-func (f *IntFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.IntFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped IntFlag.ApplyWithError
-func (f *IntFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.IntFlag.ApplyWithError(set)
-}
-
-// IntSliceFlag is the flag type that wraps cli.IntSliceFlag to allow
-// for other values to be specified
-type IntSliceFlag struct {
-	cli.IntSliceFlag
-	set *flag.FlagSet
-}
-
-// NewIntSliceFlag creates a new IntSliceFlag
-func NewIntSliceFlag(fl cli.IntSliceFlag) *IntSliceFlag {
-	return &IntSliceFlag{IntSliceFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped IntSliceFlag.Apply
-func (f *IntSliceFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.IntSliceFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped IntSliceFlag.ApplyWithError
-func (f *IntSliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.IntSliceFlag.ApplyWithError(set)
-}
-
-// Int64SliceFlag is the flag type that wraps cli.Int64SliceFlag to allow
-// for other values to be specified
-type Int64SliceFlag struct {
-	cli.Int64SliceFlag
-	set *flag.FlagSet
-}
-
-// NewInt64SliceFlag creates a new Int64SliceFlag
-func NewInt64SliceFlag(fl cli.Int64SliceFlag) *Int64SliceFlag {
-	return &Int64SliceFlag{Int64SliceFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped Int64SliceFlag.Apply
-func (f *Int64SliceFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.Int64SliceFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped Int64SliceFlag.ApplyWithError
-func (f *Int64SliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.Int64SliceFlag.ApplyWithError(set)
-}
-
-// StringFlag is the flag type that wraps cli.StringFlag to allow
-// for other values to be specified
-type StringFlag struct {
-	cli.StringFlag
-	set *flag.FlagSet
-}
-
-// NewStringFlag creates a new StringFlag
-func NewStringFlag(fl cli.StringFlag) *StringFlag {
-	return &StringFlag{StringFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped StringFlag.Apply
-func (f *StringFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.StringFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped StringFlag.ApplyWithError
-func (f *StringFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.StringFlag.ApplyWithError(set)
-}
-
-// StringSliceFlag is the flag type that wraps cli.StringSliceFlag to allow
-// for other values to be specified
-type StringSliceFlag struct {
-	cli.StringSliceFlag
-	set *flag.FlagSet
-}
-
-// NewStringSliceFlag creates a new StringSliceFlag
-func NewStringSliceFlag(fl cli.StringSliceFlag) *StringSliceFlag {
-	return &StringSliceFlag{StringSliceFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped StringSliceFlag.Apply
-func (f *StringSliceFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.StringSliceFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped StringSliceFlag.ApplyWithError
-func (f *StringSliceFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.StringSliceFlag.ApplyWithError(set)
-}
-
-// Uint64Flag is the flag type that wraps cli.Uint64Flag to allow
-// for other values to be specified
-type Uint64Flag struct {
-	cli.Uint64Flag
-	set *flag.FlagSet
-}
-
-// NewUint64Flag creates a new Uint64Flag
-func NewUint64Flag(fl cli.Uint64Flag) *Uint64Flag {
-	return &Uint64Flag{Uint64Flag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped Uint64Flag.Apply
-func (f *Uint64Flag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.Uint64Flag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped Uint64Flag.ApplyWithError
-func (f *Uint64Flag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.Uint64Flag.ApplyWithError(set)
-}
-
-// UintFlag is the flag type that wraps cli.UintFlag to allow
-// for other values to be specified
-type UintFlag struct {
-	cli.UintFlag
-	set *flag.FlagSet
-}
-
-// NewUintFlag creates a new UintFlag
-func NewUintFlag(fl cli.UintFlag) *UintFlag {
-	return &UintFlag{UintFlag: fl, set: nil}
-}
-
-// Apply saves the flagSet for later usage calls, then calls the
-// wrapped UintFlag.Apply
-func (f *UintFlag) Apply(set *flag.FlagSet) {
-	f.set = set
-	f.UintFlag.Apply(set)
-}
-
-// ApplyWithError saves the flagSet for later usage calls, then calls the
-// wrapped UintFlag.ApplyWithError
-func (f *UintFlag) ApplyWithError(set *flag.FlagSet) error {
-	f.set = set
-	return f.UintFlag.ApplyWithError(set)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_test.go
deleted file mode 100644
index 9e9c96da17..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/flag_test.go
+++ /dev/null
@@ -1,336 +0,0 @@
-package altsrc
-
-import (
-	"flag"
-	"fmt"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-type testApplyInputSource struct {
-	Flag               FlagInputSourceExtension
-	FlagName           string
-	FlagSetName        string
-	Expected           string
-	ContextValueString string
-	ContextValue       flag.Value
-	EnvVarValue        string
-	EnvVarName         string
-	MapValue           interface{}
-}
-
-func TestGenericApplyInputSourceValue(t *testing.T) {
-	v := &Parser{"abc", "def"}
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewGenericFlag(cli.GenericFlag{Name: "test", Value: &Parser{}}),
-		FlagName: "test",
-		MapValue: v,
-	})
-	expect(t, v, c.Generic("test"))
-}
-
-func TestGenericApplyInputSourceMethodContextSet(t *testing.T) {
-	p := &Parser{"abc", "def"}
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewGenericFlag(cli.GenericFlag{Name: "test", Value: &Parser{}}),
-		FlagName:           "test",
-		MapValue:           &Parser{"efg", "hig"},
-		ContextValueString: p.String(),
-	})
-	expect(t, p, c.Generic("test"))
-}
-
-func TestGenericApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewGenericFlag(cli.GenericFlag{Name: "test", Value: &Parser{}, EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    &Parser{"efg", "hij"},
-		EnvVarName:  "TEST",
-		EnvVarValue: "abc,def",
-	})
-	expect(t, &Parser{"abc", "def"}, c.Generic("test"))
-}
-
-func TestStringSliceApplyInputSourceValue(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewStringSliceFlag(cli.StringSliceFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: []string{"hello", "world"},
-	})
-	expect(t, c.StringSlice("test"), []string{"hello", "world"})
-}
-
-func TestStringSliceApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewStringSliceFlag(cli.StringSliceFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           []string{"hello", "world"},
-		ContextValueString: "ohno",
-	})
-	expect(t, c.StringSlice("test"), []string{"ohno"})
-}
-
-func TestStringSliceApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewStringSliceFlag(cli.StringSliceFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    []string{"hello", "world"},
-		EnvVarName:  "TEST",
-		EnvVarValue: "oh,no",
-	})
-	expect(t, c.StringSlice("test"), []string{"oh", "no"})
-}
-
-func TestIntSliceApplyInputSourceValue(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewIntSliceFlag(cli.IntSliceFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: []int{1, 2},
-	})
-	expect(t, c.IntSlice("test"), []int{1, 2})
-}
-
-func TestIntSliceApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewIntSliceFlag(cli.IntSliceFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           []int{1, 2},
-		ContextValueString: "3",
-	})
-	expect(t, c.IntSlice("test"), []int{3})
-}
-
-func TestIntSliceApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewIntSliceFlag(cli.IntSliceFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    []int{1, 2},
-		EnvVarName:  "TEST",
-		EnvVarValue: "3,4",
-	})
-	expect(t, c.IntSlice("test"), []int{3, 4})
-}
-
-func TestBoolApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewBoolFlag(cli.BoolFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: true,
-	})
-	expect(t, true, c.Bool("test"))
-}
-
-func TestBoolApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewBoolFlag(cli.BoolFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           false,
-		ContextValueString: "true",
-	})
-	expect(t, true, c.Bool("test"))
-}
-
-func TestBoolApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewBoolFlag(cli.BoolFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    false,
-		EnvVarName:  "TEST",
-		EnvVarValue: "true",
-	})
-	expect(t, true, c.Bool("test"))
-}
-
-func TestBoolTApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewBoolTFlag(cli.BoolTFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: false,
-	})
-	expect(t, false, c.BoolT("test"))
-}
-
-func TestBoolTApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewBoolTFlag(cli.BoolTFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           true,
-		ContextValueString: "false",
-	})
-	expect(t, false, c.BoolT("test"))
-}
-
-func TestBoolTApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewBoolTFlag(cli.BoolTFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    true,
-		EnvVarName:  "TEST",
-		EnvVarValue: "false",
-	})
-	expect(t, false, c.BoolT("test"))
-}
-
-func TestStringApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewStringFlag(cli.StringFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: "hello",
-	})
-	expect(t, "hello", c.String("test"))
-}
-
-func TestStringApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewStringFlag(cli.StringFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           "hello",
-		ContextValueString: "goodbye",
-	})
-	expect(t, "goodbye", c.String("test"))
-}
-
-func TestStringApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewStringFlag(cli.StringFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    "hello",
-		EnvVarName:  "TEST",
-		EnvVarValue: "goodbye",
-	})
-	expect(t, "goodbye", c.String("test"))
-}
-
-func TestIntApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewIntFlag(cli.IntFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: 15,
-	})
-	expect(t, 15, c.Int("test"))
-}
-
-func TestIntApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewIntFlag(cli.IntFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           15,
-		ContextValueString: "7",
-	})
-	expect(t, 7, c.Int("test"))
-}
-
-func TestIntApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewIntFlag(cli.IntFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    15,
-		EnvVarName:  "TEST",
-		EnvVarValue: "12",
-	})
-	expect(t, 12, c.Int("test"))
-}
-
-func TestDurationApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewDurationFlag(cli.DurationFlag{Name: "test"}),
-		FlagName: "test",
-		MapValue: time.Duration(30 * time.Second),
-	})
-	expect(t, time.Duration(30*time.Second), c.Duration("test"))
-}
-
-func TestDurationApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewDurationFlag(cli.DurationFlag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           time.Duration(30 * time.Second),
-		ContextValueString: time.Duration(15 * time.Second).String(),
-	})
-	expect(t, time.Duration(15*time.Second), c.Duration("test"))
-}
-
-func TestDurationApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewDurationFlag(cli.DurationFlag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    time.Duration(30 * time.Second),
-		EnvVarName:  "TEST",
-		EnvVarValue: time.Duration(15 * time.Second).String(),
-	})
-	expect(t, time.Duration(15*time.Second), c.Duration("test"))
-}
-
-func TestFloat64ApplyInputSourceMethodSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:     NewFloat64Flag(cli.Float64Flag{Name: "test"}),
-		FlagName: "test",
-		MapValue: 1.3,
-	})
-	expect(t, 1.3, c.Float64("test"))
-}
-
-func TestFloat64ApplyInputSourceMethodContextSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:               NewFloat64Flag(cli.Float64Flag{Name: "test"}),
-		FlagName:           "test",
-		MapValue:           1.3,
-		ContextValueString: fmt.Sprintf("%v", 1.4),
-	})
-	expect(t, 1.4, c.Float64("test"))
-}
-
-func TestFloat64ApplyInputSourceMethodEnvVarSet(t *testing.T) {
-	c := runTest(t, testApplyInputSource{
-		Flag:        NewFloat64Flag(cli.Float64Flag{Name: "test", EnvVar: "TEST"}),
-		FlagName:    "test",
-		MapValue:    1.3,
-		EnvVarName:  "TEST",
-		EnvVarValue: fmt.Sprintf("%v", 1.4),
-	})
-	expect(t, 1.4, c.Float64("test"))
-}
-
-func runTest(t *testing.T, test testApplyInputSource) *cli.Context {
-	inputSource := &MapInputSource{valueMap: map[interface{}]interface{}{test.FlagName: test.MapValue}}
-	set := flag.NewFlagSet(test.FlagSetName, flag.ContinueOnError)
-	c := cli.NewContext(nil, set, nil)
-	if test.EnvVarName != "" && test.EnvVarValue != "" {
-		os.Setenv(test.EnvVarName, test.EnvVarValue)
-		defer os.Setenv(test.EnvVarName, "")
-	}
-
-	test.Flag.Apply(set)
-	if test.ContextValue != nil {
-		flag := set.Lookup(test.FlagName)
-		flag.Value = test.ContextValue
-	}
-	if test.ContextValueString != "" {
-		set.Set(test.FlagName, test.ContextValueString)
-	}
-	test.Flag.ApplyInputSourceValue(c, inputSource)
-
-	return c
-}
-
-type Parser [2]string
-
-func (p *Parser) Set(value string) error {
-	parts := strings.Split(value, ",")
-	if len(parts) != 2 {
-		return fmt.Errorf("invalid format")
-	}
-
-	(*p)[0] = parts[0]
-	(*p)[1] = parts[1]
-
-	return nil
-}
-
-func (p *Parser) String() string {
-	return fmt.Sprintf("%s,%s", p[0], p[1])
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/helpers_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/helpers_test.go
deleted file mode 100644
index 3b7f7e94e0..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/helpers_test.go
+++ /dev/null
@@ -1,18 +0,0 @@
-package altsrc
-
-import (
-	"reflect"
-	"testing"
-)
-
-func expect(t *testing.T, a interface{}, b interface{}) {
-	if !reflect.DeepEqual(b, a) {
-		t.Errorf("Expected %#v (type %v) - Got %#v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
-
-func refute(t *testing.T, a interface{}, b interface{}) {
-	if a == b {
-		t.Errorf("Did not expect %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/input_source_context.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/input_source_context.go
deleted file mode 100644
index 276dcda089..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/input_source_context.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package altsrc
-
-import (
-	"time"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-// InputSourceContext is an interface used to allow
-// other input sources to be implemented as needed.
-type InputSourceContext interface {
-	Int(name string) (int, error)
-	Duration(name string) (time.Duration, error)
-	Float64(name string) (float64, error)
-	String(name string) (string, error)
-	StringSlice(name string) ([]string, error)
-	IntSlice(name string) ([]int, error)
-	Generic(name string) (cli.Generic, error)
-	Bool(name string) (bool, error)
-	BoolT(name string) (bool, error)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/map_input_source.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/map_input_source.go
deleted file mode 100644
index b720995cf7..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/map_input_source.go
+++ /dev/null
@@ -1,248 +0,0 @@
-package altsrc
-
-import (
-	"fmt"
-	"reflect"
-	"strings"
-	"time"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-// MapInputSource implements InputSourceContext to return
-// data from the map that is loaded.
-type MapInputSource struct {
-	valueMap map[interface{}]interface{}
-}
-
-// nestedVal checks if the name has '.' delimiters.
-// If so, it tries to traverse the tree by the '.' delimited sections to find
-// a nested value for the key.
-func nestedVal(name string, tree map[interface{}]interface{}) (interface{}, bool) {
-	if sections := strings.Split(name, "."); len(sections) > 1 {
-		node := tree
-		for _, section := range sections[:len(sections)-1] {
-			if child, ok := node[section]; !ok {
-				return nil, false
-			} else {
-				if ctype, ok := child.(map[interface{}]interface{}); !ok {
-					return nil, false
-				} else {
-					node = ctype
-				}
-			}
-		}
-		if val, ok := node[sections[len(sections)-1]]; ok {
-			return val, true
-		}
-	}
-	return nil, false
-}
-
-// Int returns an int from the map if it exists otherwise returns 0
-func (fsm *MapInputSource) Int(name string) (int, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(int)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "int", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(int)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "int", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return 0, nil
-}
-
-// Duration returns a duration from the map if it exists otherwise returns 0
-func (fsm *MapInputSource) Duration(name string) (time.Duration, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(time.Duration)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "duration", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(time.Duration)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "duration", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return 0, nil
-}
-
-// Float64 returns an float64 from the map if it exists otherwise returns 0
-func (fsm *MapInputSource) Float64(name string) (float64, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(float64)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "float64", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(float64)
-		if !isType {
-			return 0, incorrectTypeForFlagError(name, "float64", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return 0, nil
-}
-
-// String returns a string from the map if it exists otherwise returns an empty string
-func (fsm *MapInputSource) String(name string) (string, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(string)
-		if !isType {
-			return "", incorrectTypeForFlagError(name, "string", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(string)
-		if !isType {
-			return "", incorrectTypeForFlagError(name, "string", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return "", nil
-}
-
-// StringSlice returns an []string from the map if it exists otherwise returns nil
-func (fsm *MapInputSource) StringSlice(name string) ([]string, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.([]string)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "[]string", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.([]string)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "[]string", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return nil, nil
-}
-
-// IntSlice returns an []int from the map if it exists otherwise returns nil
-func (fsm *MapInputSource) IntSlice(name string) ([]int, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.([]int)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "[]int", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.([]int)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "[]int", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return nil, nil
-}
-
-// Generic returns an cli.Generic from the map if it exists otherwise returns nil
-func (fsm *MapInputSource) Generic(name string) (cli.Generic, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(cli.Generic)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "cli.Generic", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(cli.Generic)
-		if !isType {
-			return nil, incorrectTypeForFlagError(name, "cli.Generic", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return nil, nil
-}
-
-// Bool returns an bool from the map otherwise returns false
-func (fsm *MapInputSource) Bool(name string) (bool, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(bool)
-		if !isType {
-			return false, incorrectTypeForFlagError(name, "bool", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(bool)
-		if !isType {
-			return false, incorrectTypeForFlagError(name, "bool", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return false, nil
-}
-
-// BoolT returns an bool from the map otherwise returns true
-func (fsm *MapInputSource) BoolT(name string) (bool, error) {
-	otherGenericValue, exists := fsm.valueMap[name]
-	if exists {
-		otherValue, isType := otherGenericValue.(bool)
-		if !isType {
-			return true, incorrectTypeForFlagError(name, "bool", otherGenericValue)
-		}
-		return otherValue, nil
-	}
-	nestedGenericValue, exists := nestedVal(name, fsm.valueMap)
-	if exists {
-		otherValue, isType := nestedGenericValue.(bool)
-		if !isType {
-			return true, incorrectTypeForFlagError(name, "bool", nestedGenericValue)
-		}
-		return otherValue, nil
-	}
-
-	return true, nil
-}
-
-func incorrectTypeForFlagError(name, expectedTypeName string, value interface{}) error {
-	valueType := reflect.TypeOf(value)
-	valueTypeName := ""
-	if valueType != nil {
-		valueTypeName = valueType.Name()
-	}
-
-	return fmt.Errorf("Mismatched type for flag '%s'. Expected '%s' but actual is '%s'", name, expectedTypeName, valueTypeName)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_command_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_command_test.go
deleted file mode 100644
index a5053d4f73..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_command_test.go
+++ /dev/null
@@ -1,310 +0,0 @@
-// Disabling building of toml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
-package altsrc
-
-import (
-	"flag"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-func TestCommandTomFileTest(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("test = 15"), 0666)
-	defer os.Remove("current.toml")
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestGlobalEnvVarWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("test = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	os.Setenv("THE_TEST", "10")
-	defer os.Setenv("THE_TEST", "")
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 10)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestGlobalEnvVarWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("[top]\ntest = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	os.Setenv("THE_TEST", "10")
-	defer os.Setenv("THE_TEST", "")
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 10)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestSpecifiedFlagWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("test = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	test := []string{"test-cmd", "--load", "current.toml", "--test", "7"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 7)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestSpecifiedFlagWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte(`[top]
-  test = 15`), 0666)
-	defer os.Remove("current.toml")
-
-	test := []string{"test-cmd", "--load", "current.toml", "--top.test", "7"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 7)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestDefaultValueFileWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("test = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", Value: 7}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileTestDefaultValueFileWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("[top]\ntest = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", Value: 7}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileFlagHasDefaultGlobalEnvTomlSetGlobalEnvWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("test = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	os.Setenv("THE_TEST", "11")
-	defer os.Setenv("THE_TEST", "")
-
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 11)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", Value: 7, EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandTomlFileFlagHasDefaultGlobalEnvTomlSetGlobalEnvWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.toml", []byte("[top]\ntest = 15"), 0666)
-	defer os.Remove("current.toml")
-
-	os.Setenv("THE_TEST", "11")
-	defer os.Setenv("THE_TEST", "")
-
-	test := []string{"test-cmd", "--load", "current.toml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 11)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", Value: 7, EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewTomlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_file_loader.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_file_loader.go
deleted file mode 100644
index 39c124f067..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/toml_file_loader.go
+++ /dev/null
@@ -1,113 +0,0 @@
-// Disabling building of toml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
-package altsrc
-
-import (
-	"fmt"
-	"reflect"
-
-	"github.com/BurntSushi/toml"
-	"gopkg.in/urfave/cli.v1"
-)
-
-type tomlMap struct {
-	Map map[interface{}]interface{}
-}
-
-func unmarshalMap(i interface{}) (ret map[interface{}]interface{}, err error) {
-	ret = make(map[interface{}]interface{})
-	m := i.(map[string]interface{})
-	for key, val := range m {
-		v := reflect.ValueOf(val)
-		switch v.Kind() {
-		case reflect.Bool:
-			ret[key] = val.(bool)
-		case reflect.String:
-			ret[key] = val.(string)
-		case reflect.Int:
-			ret[key] = int(val.(int))
-		case reflect.Int8:
-			ret[key] = int(val.(int8))
-		case reflect.Int16:
-			ret[key] = int(val.(int16))
-		case reflect.Int32:
-			ret[key] = int(val.(int32))
-		case reflect.Int64:
-			ret[key] = int(val.(int64))
-		case reflect.Uint:
-			ret[key] = int(val.(uint))
-		case reflect.Uint8:
-			ret[key] = int(val.(uint8))
-		case reflect.Uint16:
-			ret[key] = int(val.(uint16))
-		case reflect.Uint32:
-			ret[key] = int(val.(uint32))
-		case reflect.Uint64:
-			ret[key] = int(val.(uint64))
-		case reflect.Float32:
-			ret[key] = float64(val.(float32))
-		case reflect.Float64:
-			ret[key] = float64(val.(float64))
-		case reflect.Map:
-			if tmp, err := unmarshalMap(val); err == nil {
-				ret[key] = tmp
-			} else {
-				return nil, err
-			}
-		case reflect.Array:
-			fallthrough // [todo] - Support array type
-		default:
-			return nil, fmt.Errorf("Unsupported: type = %#v", v.Kind())
-		}
-	}
-	return ret, nil
-}
-
-func (self *tomlMap) UnmarshalTOML(i interface{}) error {
-	if tmp, err := unmarshalMap(i); err == nil {
-		self.Map = tmp
-	} else {
-		return err
-	}
-	return nil
-}
-
-type tomlSourceContext struct {
-	FilePath string
-}
-
-// NewTomlSourceFromFile creates a new TOML InputSourceContext from a filepath.
-func NewTomlSourceFromFile(file string) (InputSourceContext, error) {
-	tsc := &tomlSourceContext{FilePath: file}
-	var results tomlMap = tomlMap{}
-	if err := readCommandToml(tsc.FilePath, &results); err != nil {
-		return nil, fmt.Errorf("Unable to load TOML file '%s': inner error: \n'%v'", tsc.FilePath, err.Error())
-	}
-	return &MapInputSource{valueMap: results.Map}, nil
-}
-
-// NewTomlSourceFromFlagFunc creates a new TOML InputSourceContext from a provided flag name and source context.
-func NewTomlSourceFromFlagFunc(flagFileName string) func(context *cli.Context) (InputSourceContext, error) {
-	return func(context *cli.Context) (InputSourceContext, error) {
-		filePath := context.String(flagFileName)
-		return NewTomlSourceFromFile(filePath)
-	}
-}
-
-func readCommandToml(filePath string, container interface{}) (err error) {
-	b, err := loadDataFrom(filePath)
-	if err != nil {
-		return err
-	}
-
-	err = toml.Unmarshal(b, container)
-	if err != nil {
-		return err
-	}
-
-	err = nil
-	return
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_command_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_command_test.go
deleted file mode 100644
index 9d3f431103..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_command_test.go
+++ /dev/null
@@ -1,313 +0,0 @@
-// Disabling building of yaml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
-package altsrc
-
-import (
-	"flag"
-	"io/ioutil"
-	"os"
-	"testing"
-
-	"gopkg.in/urfave/cli.v1"
-)
-
-func TestCommandYamlFileTest(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte("test: 15"), 0666)
-	defer os.Remove("current.yaml")
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestGlobalEnvVarWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte("test: 15"), 0666)
-	defer os.Remove("current.yaml")
-
-	os.Setenv("THE_TEST", "10")
-	defer os.Setenv("THE_TEST", "")
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 10)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestGlobalEnvVarWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte(`top:
-  test: 15`), 0666)
-	defer os.Remove("current.yaml")
-
-	os.Setenv("THE_TEST", "10")
-	defer os.Setenv("THE_TEST", "")
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 10)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestSpecifiedFlagWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte("test: 15"), 0666)
-	defer os.Remove("current.yaml")
-
-	test := []string{"test-cmd", "--load", "current.yaml", "--test", "7"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 7)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestSpecifiedFlagWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte(`top:
-  test: 15`), 0666)
-	defer os.Remove("current.yaml")
-
-	test := []string{"test-cmd", "--load", "current.yaml", "--top.test", "7"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 7)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestDefaultValueFileWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte("test: 15"), 0666)
-	defer os.Remove("current.yaml")
-
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", Value: 7}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileTestDefaultValueFileWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte(`top:
-  test: 15`), 0666)
-	defer os.Remove("current.yaml")
-
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 15)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", Value: 7}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileFlagHasDefaultGlobalEnvYamlSetGlobalEnvWins(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte("test: 15"), 0666)
-	defer os.Remove("current.yaml")
-
-	os.Setenv("THE_TEST", "11")
-	defer os.Setenv("THE_TEST", "")
-
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("test")
-			expect(t, val, 11)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "test", Value: 7, EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
-
-func TestCommandYamlFileFlagHasDefaultGlobalEnvYamlSetGlobalEnvWinsNested(t *testing.T) {
-	app := cli.NewApp()
-	set := flag.NewFlagSet("test", 0)
-	ioutil.WriteFile("current.yaml", []byte(`top:
-  test: 15`), 0666)
-	defer os.Remove("current.yaml")
-
-	os.Setenv("THE_TEST", "11")
-	defer os.Setenv("THE_TEST", "")
-
-	test := []string{"test-cmd", "--load", "current.yaml"}
-	set.Parse(test)
-
-	c := cli.NewContext(app, set, nil)
-
-	command := &cli.Command{
-		Name:        "test-cmd",
-		Aliases:     []string{"tc"},
-		Usage:       "this is for testing",
-		Description: "testing",
-		Action: func(c *cli.Context) error {
-			val := c.Int("top.test")
-			expect(t, val, 11)
-			return nil
-		},
-		Flags: []cli.Flag{
-			NewIntFlag(cli.IntFlag{Name: "top.test", Value: 7, EnvVar: "THE_TEST"}),
-			cli.StringFlag{Name: "load"}},
-	}
-	command.Before = InitInputSourceWithContext(command.Flags, NewYamlSourceFromFlagFunc("load"))
-	err := command.Run(c)
-
-	expect(t, err, nil)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_file_loader.go b/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_file_loader.go
deleted file mode 100644
index 335356f385..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/altsrc/yaml_file_loader.go
+++ /dev/null
@@ -1,84 +0,0 @@
-// Disabling building of yaml support in cases where golang is 1.0 or 1.1
-// as the encoding library is not implemented or supported.
-
-// +build go1.2
-
-package altsrc
-
-import (
-	"fmt"
-	"io/ioutil"
-	"net/http"
-	"net/url"
-	"os"
-
-	"gopkg.in/urfave/cli.v1"
-
-	"gopkg.in/yaml.v2"
-)
-
-type yamlSourceContext struct {
-	FilePath string
-}
-
-// NewYamlSourceFromFile creates a new Yaml InputSourceContext from a filepath.
-func NewYamlSourceFromFile(file string) (InputSourceContext, error) {
-	ysc := &yamlSourceContext{FilePath: file}
-	var results map[interface{}]interface{}
-	err := readCommandYaml(ysc.FilePath, &results)
-	if err != nil {
-		return nil, fmt.Errorf("Unable to load Yaml file '%s': inner error: \n'%v'", ysc.FilePath, err.Error())
-	}
-
-	return &MapInputSource{valueMap: results}, nil
-}
-
-// NewYamlSourceFromFlagFunc creates a new Yaml InputSourceContext from a provided flag name and source context.
-func NewYamlSourceFromFlagFunc(flagFileName string) func(context *cli.Context) (InputSourceContext, error) {
-	return func(context *cli.Context) (InputSourceContext, error) {
-		filePath := context.String(flagFileName)
-		return NewYamlSourceFromFile(filePath)
-	}
-}
-
-func readCommandYaml(filePath string, container interface{}) (err error) {
-	b, err := loadDataFrom(filePath)
-	if err != nil {
-		return err
-	}
-
-	err = yaml.Unmarshal(b, container)
-	if err != nil {
-		return err
-	}
-
-	err = nil
-	return
-}
-
-func loadDataFrom(filePath string) ([]byte, error) {
-	u, err := url.Parse(filePath)
-	if err != nil {
-		return nil, err
-	}
-
-	if u.Host != "" { // i have a host, now do i support the scheme?
-		switch u.Scheme {
-		case "http", "https":
-			res, err := http.Get(filePath)
-			if err != nil {
-				return nil, err
-			}
-			return ioutil.ReadAll(res.Body)
-		default:
-			return nil, fmt.Errorf("scheme of %s is unsupported", filePath)
-		}
-	} else if u.Path != "" { // i dont have a host, but I have a path. I am a local file.
-		if _, notFoundFileErr := os.Stat(filePath); notFoundFileErr != nil {
-			return nil, fmt.Errorf("Cannot read from file: '%s' because it does not exist.", filePath)
-		}
-		return ioutil.ReadFile(filePath)
-	} else {
-		return nil, fmt.Errorf("unable to determine how to load from path %s", filePath)
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/app.go b/installer/vendor/gopkg.in/urfave/cli.v1/app.go
index 95ffc0b976..51fc45d878 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/app.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/app.go
@@ -85,6 +85,12 @@ type App struct {
 	ErrWriter io.Writer
 	// Other custom info
 	Metadata map[string]interface{}
+	// Carries a function which returns app specific info.
+	ExtraInfo func() map[string]string
+	// CustomAppHelpTemplate the text template for app help topic.
+	// cli.go uses text/template to render templates. You can
+	// render custom help text by setting this variable.
+	CustomAppHelpTemplate string
 
 	didSetup bool
 }
@@ -234,7 +240,6 @@ func (a *App) Run(arguments []string) (err error) {
 	if a.Before != nil {
 		beforeErr := a.Before(context)
 		if beforeErr != nil {
-			fmt.Fprintf(a.Writer, "%v\n\n", beforeErr)
 			ShowAppHelp(context)
 			HandleExitCoder(beforeErr)
 			err = beforeErr
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/app_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/app_test.go
deleted file mode 100644
index 10f15621a2..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/app_test.go
+++ /dev/null
@@ -1,1685 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"errors"
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-	"reflect"
-	"strings"
-	"testing"
-)
-
-var (
-	lastExitCode = 0
-	fakeOsExiter = func(rc int) {
-		lastExitCode = rc
-	}
-	fakeErrWriter = &bytes.Buffer{}
-)
-
-func init() {
-	OsExiter = fakeOsExiter
-	ErrWriter = fakeErrWriter
-}
-
-type opCounts struct {
-	Total, BashComplete, OnUsageError, Before, CommandNotFound, Action, After, SubCommand int
-}
-
-func ExampleApp_Run() {
-	// set args for examples sake
-	os.Args = []string{"greet", "--name", "Jeremy"}
-
-	app := NewApp()
-	app.Name = "greet"
-	app.Flags = []Flag{
-		StringFlag{Name: "name", Value: "bob", Usage: "a name to say"},
-	}
-	app.Action = func(c *Context) error {
-		fmt.Printf("Hello %v\n", c.String("name"))
-		return nil
-	}
-	app.UsageText = "app [first_arg] [second_arg]"
-	app.Author = "Harrison"
-	app.Email = "harrison@lolwut.com"
-	app.Authors = []Author{{Name: "Oliver Allen", Email: "oliver@toyshop.com"}}
-	app.Run(os.Args)
-	// Output:
-	// Hello Jeremy
-}
-
-func ExampleApp_Run_subcommand() {
-	// set args for examples sake
-	os.Args = []string{"say", "hi", "english", "--name", "Jeremy"}
-	app := NewApp()
-	app.Name = "say"
-	app.Commands = []Command{
-		{
-			Name:        "hello",
-			Aliases:     []string{"hi"},
-			Usage:       "use it to see a description",
-			Description: "This is how we describe hello the function",
-			Subcommands: []Command{
-				{
-					Name:        "english",
-					Aliases:     []string{"en"},
-					Usage:       "sends a greeting in english",
-					Description: "greets someone in english",
-					Flags: []Flag{
-						StringFlag{
-							Name:  "name",
-							Value: "Bob",
-							Usage: "Name of the person to greet",
-						},
-					},
-					Action: func(c *Context) error {
-						fmt.Println("Hello,", c.String("name"))
-						return nil
-					},
-				},
-			},
-		},
-	}
-
-	app.Run(os.Args)
-	// Output:
-	// Hello, Jeremy
-}
-
-func ExampleApp_Run_appHelp() {
-	// set args for examples sake
-	os.Args = []string{"greet", "help"}
-
-	app := NewApp()
-	app.Name = "greet"
-	app.Version = "0.1.0"
-	app.Description = "This is how we describe greet the app"
-	app.Authors = []Author{
-		{Name: "Harrison", Email: "harrison@lolwut.com"},
-		{Name: "Oliver Allen", Email: "oliver@toyshop.com"},
-	}
-	app.Flags = []Flag{
-		StringFlag{Name: "name", Value: "bob", Usage: "a name to say"},
-	}
-	app.Commands = []Command{
-		{
-			Name:        "describeit",
-			Aliases:     []string{"d"},
-			Usage:       "use it to see a description",
-			Description: "This is how we describe describeit the function",
-			Action: func(c *Context) error {
-				fmt.Printf("i like to describe things")
-				return nil
-			},
-		},
-	}
-	app.Run(os.Args)
-	// Output:
-	// NAME:
-	//    greet - A new cli application
-	//
-	// USAGE:
-	//    greet [global options] command [command options] [arguments...]
-	//
-	// VERSION:
-	//    0.1.0
-	//
-	// DESCRIPTION:
-	//    This is how we describe greet the app
-	//
-	// AUTHORS:
-	//    Harrison <harrison@lolwut.com>
-	//    Oliver Allen <oliver@toyshop.com>
-	//
-	// COMMANDS:
-	//      describeit, d  use it to see a description
-	//      help, h        Shows a list of commands or help for one command
-	//
-	// GLOBAL OPTIONS:
-	//    --name value   a name to say (default: "bob")
-	//    --help, -h     show help
-	//    --version, -v  print the version
-}
-
-func ExampleApp_Run_commandHelp() {
-	// set args for examples sake
-	os.Args = []string{"greet", "h", "describeit"}
-
-	app := NewApp()
-	app.Name = "greet"
-	app.Flags = []Flag{
-		StringFlag{Name: "name", Value: "bob", Usage: "a name to say"},
-	}
-	app.Commands = []Command{
-		{
-			Name:        "describeit",
-			Aliases:     []string{"d"},
-			Usage:       "use it to see a description",
-			Description: "This is how we describe describeit the function",
-			Action: func(c *Context) error {
-				fmt.Printf("i like to describe things")
-				return nil
-			},
-		},
-	}
-	app.Run(os.Args)
-	// Output:
-	// NAME:
-	//    greet describeit - use it to see a description
-	//
-	// USAGE:
-	//    greet describeit [arguments...]
-	//
-	// DESCRIPTION:
-	//    This is how we describe describeit the function
-}
-
-func ExampleApp_Run_noAction() {
-	app := App{}
-	app.Name = "greet"
-	app.Run([]string{"greet"})
-	// Output:
-	// NAME:
-	//    greet
-	//
-	// USAGE:
-	//     [global options] command [command options] [arguments...]
-	//
-	// COMMANDS:
-	//      help, h  Shows a list of commands or help for one command
-	//
-	// GLOBAL OPTIONS:
-	//    --help, -h     show help
-	//    --version, -v  print the version
-}
-
-func ExampleApp_Run_subcommandNoAction() {
-	app := App{}
-	app.Name = "greet"
-	app.Commands = []Command{
-		{
-			Name:        "describeit",
-			Aliases:     []string{"d"},
-			Usage:       "use it to see a description",
-			Description: "This is how we describe describeit the function",
-		},
-	}
-	app.Run([]string{"greet", "describeit"})
-	// Output:
-	// NAME:
-	//     describeit - use it to see a description
-	//
-	// USAGE:
-	//     describeit [arguments...]
-	//
-	// DESCRIPTION:
-	//    This is how we describe describeit the function
-
-}
-
-func ExampleApp_Run_bashComplete() {
-	// set args for examples sake
-	os.Args = []string{"greet", "--generate-bash-completion"}
-
-	app := NewApp()
-	app.Name = "greet"
-	app.EnableBashCompletion = true
-	app.Commands = []Command{
-		{
-			Name:        "describeit",
-			Aliases:     []string{"d"},
-			Usage:       "use it to see a description",
-			Description: "This is how we describe describeit the function",
-			Action: func(c *Context) error {
-				fmt.Printf("i like to describe things")
-				return nil
-			},
-		}, {
-			Name:        "next",
-			Usage:       "next example",
-			Description: "more stuff to see when generating bash completion",
-			Action: func(c *Context) error {
-				fmt.Printf("the next example")
-				return nil
-			},
-		},
-	}
-
-	app.Run(os.Args)
-	// Output:
-	// describeit
-	// d
-	// next
-	// help
-	// h
-}
-
-func TestApp_Run(t *testing.T) {
-	s := ""
-
-	app := NewApp()
-	app.Action = func(c *Context) error {
-		s = s + c.Args().First()
-		return nil
-	}
-
-	err := app.Run([]string{"command", "foo"})
-	expect(t, err, nil)
-	err = app.Run([]string{"command", "bar"})
-	expect(t, err, nil)
-	expect(t, s, "foobar")
-}
-
-var commandAppTests = []struct {
-	name     string
-	expected bool
-}{
-	{"foobar", true},
-	{"batbaz", true},
-	{"b", true},
-	{"f", true},
-	{"bat", false},
-	{"nothing", false},
-}
-
-func TestApp_Command(t *testing.T) {
-	app := NewApp()
-	fooCommand := Command{Name: "foobar", Aliases: []string{"f"}}
-	batCommand := Command{Name: "batbaz", Aliases: []string{"b"}}
-	app.Commands = []Command{
-		fooCommand,
-		batCommand,
-	}
-
-	for _, test := range commandAppTests {
-		expect(t, app.Command(test.name) != nil, test.expected)
-	}
-}
-
-func TestApp_Setup_defaultsWriter(t *testing.T) {
-	app := &App{}
-	app.Setup()
-	expect(t, app.Writer, os.Stdout)
-}
-
-func TestApp_CommandWithArgBeforeFlags(t *testing.T) {
-	var parsedOption, firstArg string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Flags: []Flag{
-			StringFlag{Name: "option", Value: "", Usage: "some option"},
-		},
-		Action: func(c *Context) error {
-			parsedOption = c.String("option")
-			firstArg = c.Args().First()
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "--option", "my-option"})
-
-	expect(t, parsedOption, "my-option")
-	expect(t, firstArg, "my-arg")
-}
-
-func TestApp_RunAsSubcommandParseFlags(t *testing.T) {
-	var context *Context
-
-	a := NewApp()
-	a.Commands = []Command{
-		{
-			Name: "foo",
-			Action: func(c *Context) error {
-				context = c
-				return nil
-			},
-			Flags: []Flag{
-				StringFlag{
-					Name:  "lang",
-					Value: "english",
-					Usage: "language for the greeting",
-				},
-			},
-			Before: func(_ *Context) error { return nil },
-		},
-	}
-	a.Run([]string{"", "foo", "--lang", "spanish", "abcd"})
-
-	expect(t, context.Args().Get(0), "abcd")
-	expect(t, context.String("lang"), "spanish")
-}
-
-func TestApp_RunAsSubCommandIncorrectUsage(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			StringFlag{Name: "--foo"},
-		},
-		Writer: bytes.NewBufferString(""),
-	}
-
-	set := flag.NewFlagSet("", flag.ContinueOnError)
-	set.Parse([]string{"", "---foo"})
-	c := &Context{flagSet: set}
-
-	err := a.RunAsSubcommand(c)
-
-	expect(t, err, errors.New("bad flag syntax: ---foo"))
-}
-
-func TestApp_CommandWithFlagBeforeTerminator(t *testing.T) {
-	var parsedOption string
-	var args []string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Flags: []Flag{
-			StringFlag{Name: "option", Value: "", Usage: "some option"},
-		},
-		Action: func(c *Context) error {
-			parsedOption = c.String("option")
-			args = c.Args()
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "--option", "my-option", "--", "--notARealFlag"})
-
-	expect(t, parsedOption, "my-option")
-	expect(t, args[0], "my-arg")
-	expect(t, args[1], "--")
-	expect(t, args[2], "--notARealFlag")
-}
-
-func TestApp_CommandWithDash(t *testing.T) {
-	var args []string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Action: func(c *Context) error {
-			args = c.Args()
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "-"})
-
-	expect(t, args[0], "my-arg")
-	expect(t, args[1], "-")
-}
-
-func TestApp_CommandWithNoFlagBeforeTerminator(t *testing.T) {
-	var args []string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Action: func(c *Context) error {
-			args = c.Args()
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "--", "notAFlagAtAll"})
-
-	expect(t, args[0], "my-arg")
-	expect(t, args[1], "--")
-	expect(t, args[2], "notAFlagAtAll")
-}
-
-func TestApp_VisibleCommands(t *testing.T) {
-	app := NewApp()
-	app.Commands = []Command{
-		{
-			Name:     "frob",
-			HelpName: "foo frob",
-			Action:   func(_ *Context) error { return nil },
-		},
-		{
-			Name:     "frib",
-			HelpName: "foo frib",
-			Hidden:   true,
-			Action:   func(_ *Context) error { return nil },
-		},
-	}
-
-	app.Setup()
-	expected := []Command{
-		app.Commands[0],
-		app.Commands[2], // help
-	}
-	actual := app.VisibleCommands()
-	expect(t, len(expected), len(actual))
-	for i, actualCommand := range actual {
-		expectedCommand := expected[i]
-
-		if expectedCommand.Action != nil {
-			// comparing func addresses is OK!
-			expect(t, fmt.Sprintf("%p", expectedCommand.Action), fmt.Sprintf("%p", actualCommand.Action))
-		}
-
-		// nil out funcs, as they cannot be compared
-		// (https://github.com/golang/go/issues/8554)
-		expectedCommand.Action = nil
-		actualCommand.Action = nil
-
-		if !reflect.DeepEqual(expectedCommand, actualCommand) {
-			t.Errorf("expected\n%#v\n!=\n%#v", expectedCommand, actualCommand)
-		}
-	}
-}
-
-func TestApp_Float64Flag(t *testing.T) {
-	var meters float64
-
-	app := NewApp()
-	app.Flags = []Flag{
-		Float64Flag{Name: "height", Value: 1.5, Usage: "Set the height, in meters"},
-	}
-	app.Action = func(c *Context) error {
-		meters = c.Float64("height")
-		return nil
-	}
-
-	app.Run([]string{"", "--height", "1.93"})
-	expect(t, meters, 1.93)
-}
-
-func TestApp_ParseSliceFlags(t *testing.T) {
-	var parsedOption, firstArg string
-	var parsedIntSlice []int
-	var parsedStringSlice []string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Flags: []Flag{
-			IntSliceFlag{Name: "p", Value: &IntSlice{}, Usage: "set one or more ip addr"},
-			StringSliceFlag{Name: "ip", Value: &StringSlice{}, Usage: "set one or more ports to open"},
-		},
-		Action: func(c *Context) error {
-			parsedIntSlice = c.IntSlice("p")
-			parsedStringSlice = c.StringSlice("ip")
-			parsedOption = c.String("option")
-			firstArg = c.Args().First()
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "-p", "22", "-p", "80", "-ip", "8.8.8.8", "-ip", "8.8.4.4"})
-
-	IntsEquals := func(a, b []int) bool {
-		if len(a) != len(b) {
-			return false
-		}
-		for i, v := range a {
-			if v != b[i] {
-				return false
-			}
-		}
-		return true
-	}
-
-	StrsEquals := func(a, b []string) bool {
-		if len(a) != len(b) {
-			return false
-		}
-		for i, v := range a {
-			if v != b[i] {
-				return false
-			}
-		}
-		return true
-	}
-	var expectedIntSlice = []int{22, 80}
-	var expectedStringSlice = []string{"8.8.8.8", "8.8.4.4"}
-
-	if !IntsEquals(parsedIntSlice, expectedIntSlice) {
-		t.Errorf("%v does not match %v", parsedIntSlice, expectedIntSlice)
-	}
-
-	if !StrsEquals(parsedStringSlice, expectedStringSlice) {
-		t.Errorf("%v does not match %v", parsedStringSlice, expectedStringSlice)
-	}
-}
-
-func TestApp_ParseSliceFlagsWithMissingValue(t *testing.T) {
-	var parsedIntSlice []int
-	var parsedStringSlice []string
-
-	app := NewApp()
-	command := Command{
-		Name: "cmd",
-		Flags: []Flag{
-			IntSliceFlag{Name: "a", Usage: "set numbers"},
-			StringSliceFlag{Name: "str", Usage: "set strings"},
-		},
-		Action: func(c *Context) error {
-			parsedIntSlice = c.IntSlice("a")
-			parsedStringSlice = c.StringSlice("str")
-			return nil
-		},
-	}
-	app.Commands = []Command{command}
-
-	app.Run([]string{"", "cmd", "my-arg", "-a", "2", "-str", "A"})
-
-	var expectedIntSlice = []int{2}
-	var expectedStringSlice = []string{"A"}
-
-	if parsedIntSlice[0] != expectedIntSlice[0] {
-		t.Errorf("%v does not match %v", parsedIntSlice[0], expectedIntSlice[0])
-	}
-
-	if parsedStringSlice[0] != expectedStringSlice[0] {
-		t.Errorf("%v does not match %v", parsedIntSlice[0], expectedIntSlice[0])
-	}
-}
-
-func TestApp_DefaultStdout(t *testing.T) {
-	app := NewApp()
-
-	if app.Writer != os.Stdout {
-		t.Error("Default output writer not set.")
-	}
-}
-
-type mockWriter struct {
-	written []byte
-}
-
-func (fw *mockWriter) Write(p []byte) (n int, err error) {
-	if fw.written == nil {
-		fw.written = p
-	} else {
-		fw.written = append(fw.written, p...)
-	}
-
-	return len(p), nil
-}
-
-func (fw *mockWriter) GetWritten() (b []byte) {
-	return fw.written
-}
-
-func TestApp_SetStdout(t *testing.T) {
-	w := &mockWriter{}
-
-	app := NewApp()
-	app.Name = "test"
-	app.Writer = w
-
-	err := app.Run([]string{"help"})
-
-	if err != nil {
-		t.Fatalf("Run error: %s", err)
-	}
-
-	if len(w.written) == 0 {
-		t.Error("App did not write output to desired writer.")
-	}
-}
-
-func TestApp_BeforeFunc(t *testing.T) {
-	counts := &opCounts{}
-	beforeError := fmt.Errorf("fail")
-	var err error
-
-	app := NewApp()
-
-	app.Before = func(c *Context) error {
-		counts.Total++
-		counts.Before = counts.Total
-		s := c.String("opt")
-		if s == "fail" {
-			return beforeError
-		}
-
-		return nil
-	}
-
-	app.Commands = []Command{
-		{
-			Name: "sub",
-			Action: func(c *Context) error {
-				counts.Total++
-				counts.SubCommand = counts.Total
-				return nil
-			},
-		},
-	}
-
-	app.Flags = []Flag{
-		StringFlag{Name: "opt"},
-	}
-
-	// run with the Before() func succeeding
-	err = app.Run([]string{"command", "--opt", "succeed", "sub"})
-
-	if err != nil {
-		t.Fatalf("Run error: %s", err)
-	}
-
-	if counts.Before != 1 {
-		t.Errorf("Before() not executed when expected")
-	}
-
-	if counts.SubCommand != 2 {
-		t.Errorf("Subcommand not executed when expected")
-	}
-
-	// reset
-	counts = &opCounts{}
-
-	// run with the Before() func failing
-	err = app.Run([]string{"command", "--opt", "fail", "sub"})
-
-	// should be the same error produced by the Before func
-	if err != beforeError {
-		t.Errorf("Run error expected, but not received")
-	}
-
-	if counts.Before != 1 {
-		t.Errorf("Before() not executed when expected")
-	}
-
-	if counts.SubCommand != 0 {
-		t.Errorf("Subcommand executed when NOT expected")
-	}
-
-	// reset
-	counts = &opCounts{}
-
-	afterError := errors.New("fail again")
-	app.After = func(_ *Context) error {
-		return afterError
-	}
-
-	// run with the Before() func failing, wrapped by After()
-	err = app.Run([]string{"command", "--opt", "fail", "sub"})
-
-	// should be the same error produced by the Before func
-	if _, ok := err.(MultiError); !ok {
-		t.Errorf("MultiError expected, but not received")
-	}
-
-	if counts.Before != 1 {
-		t.Errorf("Before() not executed when expected")
-	}
-
-	if counts.SubCommand != 0 {
-		t.Errorf("Subcommand executed when NOT expected")
-	}
-}
-
-func TestApp_AfterFunc(t *testing.T) {
-	counts := &opCounts{}
-	afterError := fmt.Errorf("fail")
-	var err error
-
-	app := NewApp()
-
-	app.After = func(c *Context) error {
-		counts.Total++
-		counts.After = counts.Total
-		s := c.String("opt")
-		if s == "fail" {
-			return afterError
-		}
-
-		return nil
-	}
-
-	app.Commands = []Command{
-		{
-			Name: "sub",
-			Action: func(c *Context) error {
-				counts.Total++
-				counts.SubCommand = counts.Total
-				return nil
-			},
-		},
-	}
-
-	app.Flags = []Flag{
-		StringFlag{Name: "opt"},
-	}
-
-	// run with the After() func succeeding
-	err = app.Run([]string{"command", "--opt", "succeed", "sub"})
-
-	if err != nil {
-		t.Fatalf("Run error: %s", err)
-	}
-
-	if counts.After != 2 {
-		t.Errorf("After() not executed when expected")
-	}
-
-	if counts.SubCommand != 1 {
-		t.Errorf("Subcommand not executed when expected")
-	}
-
-	// reset
-	counts = &opCounts{}
-
-	// run with the Before() func failing
-	err = app.Run([]string{"command", "--opt", "fail", "sub"})
-
-	// should be the same error produced by the Before func
-	if err != afterError {
-		t.Errorf("Run error expected, but not received")
-	}
-
-	if counts.After != 2 {
-		t.Errorf("After() not executed when expected")
-	}
-
-	if counts.SubCommand != 1 {
-		t.Errorf("Subcommand not executed when expected")
-	}
-}
-
-func TestAppNoHelpFlag(t *testing.T) {
-	oldFlag := HelpFlag
-	defer func() {
-		HelpFlag = oldFlag
-	}()
-
-	HelpFlag = BoolFlag{}
-
-	app := NewApp()
-	app.Writer = ioutil.Discard
-	err := app.Run([]string{"test", "-h"})
-
-	if err != flag.ErrHelp {
-		t.Errorf("expected error about missing help flag, but got: %s (%T)", err, err)
-	}
-}
-
-func TestAppHelpPrinter(t *testing.T) {
-	oldPrinter := HelpPrinter
-	defer func() {
-		HelpPrinter = oldPrinter
-	}()
-
-	var wasCalled = false
-	HelpPrinter = func(w io.Writer, template string, data interface{}) {
-		wasCalled = true
-	}
-
-	app := NewApp()
-	app.Run([]string{"-h"})
-
-	if wasCalled == false {
-		t.Errorf("Help printer expected to be called, but was not")
-	}
-}
-
-func TestApp_VersionPrinter(t *testing.T) {
-	oldPrinter := VersionPrinter
-	defer func() {
-		VersionPrinter = oldPrinter
-	}()
-
-	var wasCalled = false
-	VersionPrinter = func(c *Context) {
-		wasCalled = true
-	}
-
-	app := NewApp()
-	ctx := NewContext(app, nil, nil)
-	ShowVersion(ctx)
-
-	if wasCalled == false {
-		t.Errorf("Version printer expected to be called, but was not")
-	}
-}
-
-func TestApp_CommandNotFound(t *testing.T) {
-	counts := &opCounts{}
-	app := NewApp()
-
-	app.CommandNotFound = func(c *Context, command string) {
-		counts.Total++
-		counts.CommandNotFound = counts.Total
-	}
-
-	app.Commands = []Command{
-		{
-			Name: "bar",
-			Action: func(c *Context) error {
-				counts.Total++
-				counts.SubCommand = counts.Total
-				return nil
-			},
-		},
-	}
-
-	app.Run([]string{"command", "foo"})
-
-	expect(t, counts.CommandNotFound, 1)
-	expect(t, counts.SubCommand, 0)
-	expect(t, counts.Total, 1)
-}
-
-func TestApp_OrderOfOperations(t *testing.T) {
-	counts := &opCounts{}
-
-	resetCounts := func() { counts = &opCounts{} }
-
-	app := NewApp()
-	app.EnableBashCompletion = true
-	app.BashComplete = func(c *Context) {
-		counts.Total++
-		counts.BashComplete = counts.Total
-	}
-
-	app.OnUsageError = func(c *Context, err error, isSubcommand bool) error {
-		counts.Total++
-		counts.OnUsageError = counts.Total
-		return errors.New("hay OnUsageError")
-	}
-
-	beforeNoError := func(c *Context) error {
-		counts.Total++
-		counts.Before = counts.Total
-		return nil
-	}
-
-	beforeError := func(c *Context) error {
-		counts.Total++
-		counts.Before = counts.Total
-		return errors.New("hay Before")
-	}
-
-	app.Before = beforeNoError
-	app.CommandNotFound = func(c *Context, command string) {
-		counts.Total++
-		counts.CommandNotFound = counts.Total
-	}
-
-	afterNoError := func(c *Context) error {
-		counts.Total++
-		counts.After = counts.Total
-		return nil
-	}
-
-	afterError := func(c *Context) error {
-		counts.Total++
-		counts.After = counts.Total
-		return errors.New("hay After")
-	}
-
-	app.After = afterNoError
-	app.Commands = []Command{
-		{
-			Name: "bar",
-			Action: func(c *Context) error {
-				counts.Total++
-				counts.SubCommand = counts.Total
-				return nil
-			},
-		},
-	}
-
-	app.Action = func(c *Context) error {
-		counts.Total++
-		counts.Action = counts.Total
-		return nil
-	}
-
-	_ = app.Run([]string{"command", "--nope"})
-	expect(t, counts.OnUsageError, 1)
-	expect(t, counts.Total, 1)
-
-	resetCounts()
-
-	_ = app.Run([]string{"command", "--generate-bash-completion"})
-	expect(t, counts.BashComplete, 1)
-	expect(t, counts.Total, 1)
-
-	resetCounts()
-
-	oldOnUsageError := app.OnUsageError
-	app.OnUsageError = nil
-	_ = app.Run([]string{"command", "--nope"})
-	expect(t, counts.Total, 0)
-	app.OnUsageError = oldOnUsageError
-
-	resetCounts()
-
-	_ = app.Run([]string{"command", "foo"})
-	expect(t, counts.OnUsageError, 0)
-	expect(t, counts.Before, 1)
-	expect(t, counts.CommandNotFound, 0)
-	expect(t, counts.Action, 2)
-	expect(t, counts.After, 3)
-	expect(t, counts.Total, 3)
-
-	resetCounts()
-
-	app.Before = beforeError
-	_ = app.Run([]string{"command", "bar"})
-	expect(t, counts.OnUsageError, 0)
-	expect(t, counts.Before, 1)
-	expect(t, counts.After, 2)
-	expect(t, counts.Total, 2)
-	app.Before = beforeNoError
-
-	resetCounts()
-
-	app.After = nil
-	_ = app.Run([]string{"command", "bar"})
-	expect(t, counts.OnUsageError, 0)
-	expect(t, counts.Before, 1)
-	expect(t, counts.SubCommand, 2)
-	expect(t, counts.Total, 2)
-	app.After = afterNoError
-
-	resetCounts()
-
-	app.After = afterError
-	err := app.Run([]string{"command", "bar"})
-	if err == nil {
-		t.Fatalf("expected a non-nil error")
-	}
-	expect(t, counts.OnUsageError, 0)
-	expect(t, counts.Before, 1)
-	expect(t, counts.SubCommand, 2)
-	expect(t, counts.After, 3)
-	expect(t, counts.Total, 3)
-	app.After = afterNoError
-
-	resetCounts()
-
-	oldCommands := app.Commands
-	app.Commands = nil
-	_ = app.Run([]string{"command"})
-	expect(t, counts.OnUsageError, 0)
-	expect(t, counts.Before, 1)
-	expect(t, counts.Action, 2)
-	expect(t, counts.After, 3)
-	expect(t, counts.Total, 3)
-	app.Commands = oldCommands
-}
-
-func TestApp_Run_CommandWithSubcommandHasHelpTopic(t *testing.T) {
-	var subcommandHelpTopics = [][]string{
-		{"command", "foo", "--help"},
-		{"command", "foo", "-h"},
-		{"command", "foo", "help"},
-	}
-
-	for _, flagSet := range subcommandHelpTopics {
-		t.Logf("==> checking with flags %v", flagSet)
-
-		app := NewApp()
-		buf := new(bytes.Buffer)
-		app.Writer = buf
-
-		subCmdBar := Command{
-			Name:  "bar",
-			Usage: "does bar things",
-		}
-		subCmdBaz := Command{
-			Name:  "baz",
-			Usage: "does baz things",
-		}
-		cmd := Command{
-			Name:        "foo",
-			Description: "descriptive wall of text about how it does foo things",
-			Subcommands: []Command{subCmdBar, subCmdBaz},
-			Action:      func(c *Context) error { return nil },
-		}
-
-		app.Commands = []Command{cmd}
-		err := app.Run(flagSet)
-
-		if err != nil {
-			t.Error(err)
-		}
-
-		output := buf.String()
-		t.Logf("output: %q\n", buf.Bytes())
-
-		if strings.Contains(output, "No help topic for") {
-			t.Errorf("expect a help topic, got none: \n%q", output)
-		}
-
-		for _, shouldContain := range []string{
-			cmd.Name, cmd.Description,
-			subCmdBar.Name, subCmdBar.Usage,
-			subCmdBaz.Name, subCmdBaz.Usage,
-		} {
-			if !strings.Contains(output, shouldContain) {
-				t.Errorf("want help to contain %q, did not: \n%q", shouldContain, output)
-			}
-		}
-	}
-}
-
-func TestApp_Run_SubcommandFullPath(t *testing.T) {
-	app := NewApp()
-	buf := new(bytes.Buffer)
-	app.Writer = buf
-	app.Name = "command"
-	subCmd := Command{
-		Name:  "bar",
-		Usage: "does bar things",
-	}
-	cmd := Command{
-		Name:        "foo",
-		Description: "foo commands",
-		Subcommands: []Command{subCmd},
-	}
-	app.Commands = []Command{cmd}
-
-	err := app.Run([]string{"command", "foo", "bar", "--help"})
-	if err != nil {
-		t.Error(err)
-	}
-
-	output := buf.String()
-	if !strings.Contains(output, "command foo bar - does bar things") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-	if !strings.Contains(output, "command foo bar [arguments...]") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-}
-
-func TestApp_Run_SubcommandHelpName(t *testing.T) {
-	app := NewApp()
-	buf := new(bytes.Buffer)
-	app.Writer = buf
-	app.Name = "command"
-	subCmd := Command{
-		Name:     "bar",
-		HelpName: "custom",
-		Usage:    "does bar things",
-	}
-	cmd := Command{
-		Name:        "foo",
-		Description: "foo commands",
-		Subcommands: []Command{subCmd},
-	}
-	app.Commands = []Command{cmd}
-
-	err := app.Run([]string{"command", "foo", "bar", "--help"})
-	if err != nil {
-		t.Error(err)
-	}
-
-	output := buf.String()
-	if !strings.Contains(output, "custom - does bar things") {
-		t.Errorf("expected HelpName for subcommand: %s", output)
-	}
-	if !strings.Contains(output, "custom [arguments...]") {
-		t.Errorf("expected HelpName to subcommand: %s", output)
-	}
-}
-
-func TestApp_Run_CommandHelpName(t *testing.T) {
-	app := NewApp()
-	buf := new(bytes.Buffer)
-	app.Writer = buf
-	app.Name = "command"
-	subCmd := Command{
-		Name:  "bar",
-		Usage: "does bar things",
-	}
-	cmd := Command{
-		Name:        "foo",
-		HelpName:    "custom",
-		Description: "foo commands",
-		Subcommands: []Command{subCmd},
-	}
-	app.Commands = []Command{cmd}
-
-	err := app.Run([]string{"command", "foo", "bar", "--help"})
-	if err != nil {
-		t.Error(err)
-	}
-
-	output := buf.String()
-	if !strings.Contains(output, "command foo bar - does bar things") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-	if !strings.Contains(output, "command foo bar [arguments...]") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-}
-
-func TestApp_Run_CommandSubcommandHelpName(t *testing.T) {
-	app := NewApp()
-	buf := new(bytes.Buffer)
-	app.Writer = buf
-	app.Name = "base"
-	subCmd := Command{
-		Name:     "bar",
-		HelpName: "custom",
-		Usage:    "does bar things",
-	}
-	cmd := Command{
-		Name:        "foo",
-		Description: "foo commands",
-		Subcommands: []Command{subCmd},
-	}
-	app.Commands = []Command{cmd}
-
-	err := app.Run([]string{"command", "foo", "--help"})
-	if err != nil {
-		t.Error(err)
-	}
-
-	output := buf.String()
-	if !strings.Contains(output, "base foo - foo commands") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-	if !strings.Contains(output, "base foo command [command options] [arguments...]") {
-		t.Errorf("expected full path to subcommand: %s", output)
-	}
-}
-
-func TestApp_Run_Help(t *testing.T) {
-	var helpArguments = [][]string{{"boom", "--help"}, {"boom", "-h"}, {"boom", "help"}}
-
-	for _, args := range helpArguments {
-		buf := new(bytes.Buffer)
-
-		t.Logf("==> checking with arguments %v", args)
-
-		app := NewApp()
-		app.Name = "boom"
-		app.Usage = "make an explosive entrance"
-		app.Writer = buf
-		app.Action = func(c *Context) error {
-			buf.WriteString("boom I say!")
-			return nil
-		}
-
-		err := app.Run(args)
-		if err != nil {
-			t.Error(err)
-		}
-
-		output := buf.String()
-		t.Logf("output: %q\n", buf.Bytes())
-
-		if !strings.Contains(output, "boom - make an explosive entrance") {
-			t.Errorf("want help to contain %q, did not: \n%q", "boom - make an explosive entrance", output)
-		}
-	}
-}
-
-func TestApp_Run_Version(t *testing.T) {
-	var versionArguments = [][]string{{"boom", "--version"}, {"boom", "-v"}}
-
-	for _, args := range versionArguments {
-		buf := new(bytes.Buffer)
-
-		t.Logf("==> checking with arguments %v", args)
-
-		app := NewApp()
-		app.Name = "boom"
-		app.Usage = "make an explosive entrance"
-		app.Version = "0.1.0"
-		app.Writer = buf
-		app.Action = func(c *Context) error {
-			buf.WriteString("boom I say!")
-			return nil
-		}
-
-		err := app.Run(args)
-		if err != nil {
-			t.Error(err)
-		}
-
-		output := buf.String()
-		t.Logf("output: %q\n", buf.Bytes())
-
-		if !strings.Contains(output, "0.1.0") {
-			t.Errorf("want version to contain %q, did not: \n%q", "0.1.0", output)
-		}
-	}
-}
-
-func TestApp_Run_Categories(t *testing.T) {
-	app := NewApp()
-	app.Name = "categories"
-	app.HideHelp = true
-	app.Commands = []Command{
-		{
-			Name:     "command1",
-			Category: "1",
-		},
-		{
-			Name:     "command2",
-			Category: "1",
-		},
-		{
-			Name:     "command3",
-			Category: "2",
-		},
-	}
-	buf := new(bytes.Buffer)
-	app.Writer = buf
-
-	app.Run([]string{"categories"})
-
-	expect := CommandCategories{
-		&CommandCategory{
-			Name: "1",
-			Commands: []Command{
-				app.Commands[0],
-				app.Commands[1],
-			},
-		},
-		&CommandCategory{
-			Name: "2",
-			Commands: []Command{
-				app.Commands[2],
-			},
-		},
-	}
-	if !reflect.DeepEqual(app.Categories(), expect) {
-		t.Fatalf("expected categories %#v, to equal %#v", app.Categories(), expect)
-	}
-
-	output := buf.String()
-	t.Logf("output: %q\n", buf.Bytes())
-
-	if !strings.Contains(output, "1:\n     command1") {
-		t.Errorf("want buffer to include category %q, did not: \n%q", "1:\n     command1", output)
-	}
-}
-
-func TestApp_VisibleCategories(t *testing.T) {
-	app := NewApp()
-	app.Name = "visible-categories"
-	app.HideHelp = true
-	app.Commands = []Command{
-		{
-			Name:     "command1",
-			Category: "1",
-			HelpName: "foo command1",
-			Hidden:   true,
-		},
-		{
-			Name:     "command2",
-			Category: "2",
-			HelpName: "foo command2",
-		},
-		{
-			Name:     "command3",
-			Category: "3",
-			HelpName: "foo command3",
-		},
-	}
-
-	expected := []*CommandCategory{
-		{
-			Name: "2",
-			Commands: []Command{
-				app.Commands[1],
-			},
-		},
-		{
-			Name: "3",
-			Commands: []Command{
-				app.Commands[2],
-			},
-		},
-	}
-
-	app.Setup()
-	expect(t, expected, app.VisibleCategories())
-
-	app = NewApp()
-	app.Name = "visible-categories"
-	app.HideHelp = true
-	app.Commands = []Command{
-		{
-			Name:     "command1",
-			Category: "1",
-			HelpName: "foo command1",
-			Hidden:   true,
-		},
-		{
-			Name:     "command2",
-			Category: "2",
-			HelpName: "foo command2",
-			Hidden:   true,
-		},
-		{
-			Name:     "command3",
-			Category: "3",
-			HelpName: "foo command3",
-		},
-	}
-
-	expected = []*CommandCategory{
-		{
-			Name: "3",
-			Commands: []Command{
-				app.Commands[2],
-			},
-		},
-	}
-
-	app.Setup()
-	expect(t, expected, app.VisibleCategories())
-
-	app = NewApp()
-	app.Name = "visible-categories"
-	app.HideHelp = true
-	app.Commands = []Command{
-		{
-			Name:     "command1",
-			Category: "1",
-			HelpName: "foo command1",
-			Hidden:   true,
-		},
-		{
-			Name:     "command2",
-			Category: "2",
-			HelpName: "foo command2",
-			Hidden:   true,
-		},
-		{
-			Name:     "command3",
-			Category: "3",
-			HelpName: "foo command3",
-			Hidden:   true,
-		},
-	}
-
-	expected = []*CommandCategory{}
-
-	app.Setup()
-	expect(t, expected, app.VisibleCategories())
-}
-
-func TestApp_Run_DoesNotOverwriteErrorFromBefore(t *testing.T) {
-	app := NewApp()
-	app.Action = func(c *Context) error { return nil }
-	app.Before = func(c *Context) error { return fmt.Errorf("before error") }
-	app.After = func(c *Context) error { return fmt.Errorf("after error") }
-
-	err := app.Run([]string{"foo"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.Contains(err.Error(), "before error") {
-		t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
-	}
-	if !strings.Contains(err.Error(), "after error") {
-		t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
-	}
-}
-
-func TestApp_Run_SubcommandDoesNotOverwriteErrorFromBefore(t *testing.T) {
-	app := NewApp()
-	app.Commands = []Command{
-		{
-			Subcommands: []Command{
-				{
-					Name: "sub",
-				},
-			},
-			Name:   "bar",
-			Before: func(c *Context) error { return fmt.Errorf("before error") },
-			After:  func(c *Context) error { return fmt.Errorf("after error") },
-		},
-	}
-
-	err := app.Run([]string{"foo", "bar"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.Contains(err.Error(), "before error") {
-		t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
-	}
-	if !strings.Contains(err.Error(), "after error") {
-		t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
-	}
-}
-
-func TestApp_OnUsageError_WithWrongFlagValue(t *testing.T) {
-	app := NewApp()
-	app.Flags = []Flag{
-		IntFlag{Name: "flag"},
-	}
-	app.OnUsageError = func(c *Context, err error, isSubcommand bool) error {
-		if isSubcommand {
-			t.Errorf("Expect no subcommand")
-		}
-		if !strings.HasPrefix(err.Error(), "invalid value \"wrong\"") {
-			t.Errorf("Expect an invalid value error, but got \"%v\"", err)
-		}
-		return errors.New("intercepted: " + err.Error())
-	}
-	app.Commands = []Command{
-		{
-			Name: "bar",
-		},
-	}
-
-	err := app.Run([]string{"foo", "--flag=wrong"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.HasPrefix(err.Error(), "intercepted: invalid value") {
-		t.Errorf("Expect an intercepted error, but got \"%v\"", err)
-	}
-}
-
-func TestApp_OnUsageError_WithWrongFlagValue_ForSubcommand(t *testing.T) {
-	app := NewApp()
-	app.Flags = []Flag{
-		IntFlag{Name: "flag"},
-	}
-	app.OnUsageError = func(c *Context, err error, isSubcommand bool) error {
-		if isSubcommand {
-			t.Errorf("Expect subcommand")
-		}
-		if !strings.HasPrefix(err.Error(), "invalid value \"wrong\"") {
-			t.Errorf("Expect an invalid value error, but got \"%v\"", err)
-		}
-		return errors.New("intercepted: " + err.Error())
-	}
-	app.Commands = []Command{
-		{
-			Name: "bar",
-		},
-	}
-
-	err := app.Run([]string{"foo", "--flag=wrong", "bar"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.HasPrefix(err.Error(), "intercepted: invalid value") {
-		t.Errorf("Expect an intercepted error, but got \"%v\"", err)
-	}
-}
-
-func TestHandleAction_WithNonFuncAction(t *testing.T) {
-	app := NewApp()
-	app.Action = 42
-	fs, err := flagSet(app.Name, app.Flags)
-	if err != nil {
-		t.Errorf("error creating FlagSet: %s", err)
-	}
-	err = HandleAction(app.Action, NewContext(app, fs, nil))
-
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	exitErr, ok := err.(*ExitError)
-
-	if !ok {
-		t.Fatalf("expected to receive a *ExitError")
-	}
-
-	if !strings.HasPrefix(exitErr.Error(), "ERROR invalid Action type.") {
-		t.Fatalf("expected an unknown Action error, but got: %v", exitErr.Error())
-	}
-
-	if exitErr.ExitCode() != 2 {
-		t.Fatalf("expected error exit code to be 2, but got: %v", exitErr.ExitCode())
-	}
-}
-
-func TestHandleAction_WithInvalidFuncSignature(t *testing.T) {
-	app := NewApp()
-	app.Action = func() string { return "" }
-	fs, err := flagSet(app.Name, app.Flags)
-	if err != nil {
-		t.Errorf("error creating FlagSet: %s", err)
-	}
-	err = HandleAction(app.Action, NewContext(app, fs, nil))
-
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	exitErr, ok := err.(*ExitError)
-
-	if !ok {
-		t.Fatalf("expected to receive a *ExitError")
-	}
-
-	if !strings.HasPrefix(exitErr.Error(), "ERROR invalid Action type") {
-		t.Fatalf("expected an unknown Action error, but got: %v", exitErr.Error())
-	}
-
-	if exitErr.ExitCode() != 2 {
-		t.Fatalf("expected error exit code to be 2, but got: %v", exitErr.ExitCode())
-	}
-}
-
-func TestHandleAction_WithInvalidFuncReturnSignature(t *testing.T) {
-	app := NewApp()
-	app.Action = func(_ *Context) (int, error) { return 0, nil }
-	fs, err := flagSet(app.Name, app.Flags)
-	if err != nil {
-		t.Errorf("error creating FlagSet: %s", err)
-	}
-	err = HandleAction(app.Action, NewContext(app, fs, nil))
-
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	exitErr, ok := err.(*ExitError)
-
-	if !ok {
-		t.Fatalf("expected to receive a *ExitError")
-	}
-
-	if !strings.HasPrefix(exitErr.Error(), "ERROR invalid Action type") {
-		t.Fatalf("expected an invalid Action signature error, but got: %v", exitErr.Error())
-	}
-
-	if exitErr.ExitCode() != 2 {
-		t.Fatalf("expected error exit code to be 2, but got: %v", exitErr.ExitCode())
-	}
-}
-
-func TestHandleAction_WithUnknownPanic(t *testing.T) {
-	defer func() { refute(t, recover(), nil) }()
-
-	var fn ActionFunc
-
-	app := NewApp()
-	app.Action = func(ctx *Context) error {
-		fn(ctx)
-		return nil
-	}
-	fs, err := flagSet(app.Name, app.Flags)
-	if err != nil {
-		t.Errorf("error creating FlagSet: %s", err)
-	}
-	HandleAction(app.Action, NewContext(app, fs, nil))
-}
-
-func TestShellCompletionForIncompleteFlags(t *testing.T) {
-	app := NewApp()
-	app.Flags = []Flag{
-		IntFlag{
-			Name: "test-completion",
-		},
-	}
-	app.EnableBashCompletion = true
-	app.BashComplete = func(ctx *Context) {
-		for _, command := range ctx.App.Commands {
-			if command.Hidden {
-				continue
-			}
-
-			for _, name := range command.Names() {
-				fmt.Fprintln(ctx.App.Writer, name)
-			}
-		}
-
-		for _, flag := range ctx.App.Flags {
-			for _, name := range strings.Split(flag.GetName(), ",") {
-				if name == BashCompletionFlag.Name {
-					continue
-				}
-
-				switch name = strings.TrimSpace(name); len(name) {
-				case 0:
-				case 1:
-					fmt.Fprintln(ctx.App.Writer, "-"+name)
-				default:
-					fmt.Fprintln(ctx.App.Writer, "--"+name)
-				}
-			}
-		}
-	}
-	app.Action = func(ctx *Context) error {
-		return fmt.Errorf("should not get here")
-	}
-	err := app.Run([]string{"", "--test-completion", "--" + BashCompletionFlag.Name})
-	if err != nil {
-		t.Errorf("app should not return an error: %s", err)
-	}
-}
-
-func TestHandleActionActuallyWorksWithActions(t *testing.T) {
-	var f ActionFunc
-	called := false
-	f = func(c *Context) error {
-		called = true
-		return nil
-	}
-
-	err := HandleAction(f, nil)
-
-	if err != nil {
-		t.Errorf("Should not have errored: %v", err)
-	}
-
-	if !called {
-		t.Errorf("Function was not called")
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/appveyor.yml b/installer/vendor/gopkg.in/urfave/cli.v1/appveyor.yml
deleted file mode 100644
index 698b188e12..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/appveyor.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-version: "{build}"
-
-os: Windows Server 2012 R2
-
-clone_folder: c:\gopath\src\github.com\urfave\cli
-
-environment:
-  GOPATH: C:\gopath
-  GOVERSION: 1.6
-  PYTHON: C:\Python27-x64
-  PYTHON_VERSION: 2.7.x
-  PYTHON_ARCH: 64
-
-install:
-- set PATH=%GOPATH%\bin;C:\go\bin;%PATH%
-- go version
-- go env
-- go get github.com/urfave/gfmrun/...
-- go get -v -t ./...
-
-build_script:
-- python runtests vet
-- python runtests test
-- python runtests gfmrun
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/bash_autocomplete b/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/bash_autocomplete
deleted file mode 100644
index 21a232f1f5..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/bash_autocomplete
+++ /dev/null
@@ -1,14 +0,0 @@
-#! /bin/bash
-
-: ${PROG:=$(basename ${BASH_SOURCE})}
-
-_cli_bash_autocomplete() {
-     local cur opts base
-     COMPREPLY=()
-     cur="${COMP_WORDS[COMP_CWORD]}"
-     opts=$( ${COMP_WORDS[@]:0:$COMP_CWORD} --generate-bash-completion )
-     COMPREPLY=( $(compgen -W "${opts}" -- ${cur}) )
-     return 0
- }
-  
- complete -F _cli_bash_autocomplete $PROG
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/zsh_autocomplete b/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/zsh_autocomplete
deleted file mode 100644
index 5430a18f95..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/autocomplete/zsh_autocomplete
+++ /dev/null
@@ -1,5 +0,0 @@
-autoload -U compinit && compinit
-autoload -U bashcompinit && bashcompinit
-
-script_dir=$(dirname $0)
-source ${script_dir}/bash_autocomplete
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/cli.go b/installer/vendor/gopkg.in/urfave/cli.v1/cli.go
index 74fd101f45..90c07eb8ef 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/cli.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/cli.go
@@ -12,6 +12,7 @@
 //     app.Usage = "say a greeting"
 //     app.Action = func(c *cli.Context) error {
 //       println("Greetings")
+//       return nil
 //     }
 //
 //     app.Run(os.Args)
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/command.go b/installer/vendor/gopkg.in/urfave/cli.v1/command.go
index 2628fbf48a..23de2944be 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/command.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/command.go
@@ -59,6 +59,25 @@ type Command struct {
 	// Full name of command for help, defaults to full command name, including parent commands.
 	HelpName        string
 	commandNamePath []string
+
+	// CustomHelpTemplate the text template for the command help topic.
+	// cli.go uses text/template to render templates. You can
+	// render custom help text by setting this variable.
+	CustomHelpTemplate string
+}
+
+type CommandsByName []Command
+
+func (c CommandsByName) Len() int {
+	return len(c)
+}
+
+func (c CommandsByName) Less(i, j int) bool {
+	return c[i].Name < c[j].Name
+}
+
+func (c CommandsByName) Swap(i, j int) {
+	c[i], c[j] = c[j], c[i]
 }
 
 // FullName returns the full name of the command.
@@ -140,19 +159,20 @@ func (c Command) Run(ctx *Context) (err error) {
 	}
 
 	context := NewContext(ctx.App, set, ctx)
+	context.Command = c
 	if checkCommandCompletions(context, c.Name) {
 		return nil
 	}
 
 	if err != nil {
 		if c.OnUsageError != nil {
-			err := c.OnUsageError(ctx, err, false)
+			err := c.OnUsageError(context, err, false)
 			HandleExitCoder(err)
 			return err
 		}
-		fmt.Fprintln(ctx.App.Writer, "Incorrect Usage:", err.Error())
-		fmt.Fprintln(ctx.App.Writer)
-		ShowCommandHelp(ctx, c.Name)
+		fmt.Fprintln(context.App.Writer, "Incorrect Usage:", err.Error())
+		fmt.Fprintln(context.App.Writer)
+		ShowCommandHelp(context, c.Name)
 		return err
 	}
 
@@ -177,9 +197,7 @@ func (c Command) Run(ctx *Context) (err error) {
 	if c.Before != nil {
 		err = c.Before(context)
 		if err != nil {
-			fmt.Fprintln(ctx.App.Writer, err)
-			fmt.Fprintln(ctx.App.Writer)
-			ShowCommandHelp(ctx, c.Name)
+			ShowCommandHelp(context, c.Name)
 			HandleExitCoder(err)
 			return err
 		}
@@ -189,7 +207,6 @@ func (c Command) Run(ctx *Context) (err error) {
 		c.Action = helpSubcommand.Action
 	}
 
-	context.Command = c
 	err = HandleAction(c.Action, context)
 
 	if err != nil {
@@ -230,14 +247,13 @@ func (c Command) startApp(ctx *Context) error {
 		app.HelpName = app.Name
 	}
 
-	if c.Description != "" {
-		app.Usage = c.Description
-	} else {
-		app.Usage = c.Usage
-	}
+	app.Usage = c.Usage
+	app.Description = c.Description
+	app.ArgsUsage = c.ArgsUsage
 
 	// set CommandNotFound
 	app.CommandNotFound = ctx.App.CommandNotFound
+	app.CustomAppHelpTemplate = c.CustomHelpTemplate
 
 	// set the flags and commands
 	app.Commands = c.Subcommands
@@ -250,6 +266,7 @@ func (c Command) startApp(ctx *Context) error {
 	app.Author = ctx.App.Author
 	app.Email = ctx.App.Email
 	app.Writer = ctx.App.Writer
+	app.ErrWriter = ctx.App.ErrWriter
 
 	app.categories = CommandCategories{}
 	for _, command := range c.Subcommands {
@@ -272,6 +289,7 @@ func (c Command) startApp(ctx *Context) error {
 	} else {
 		app.Action = helpSubcommand.Action
 	}
+	app.OnUsageError = c.OnUsageError
 
 	for index, cc := range app.Commands {
 		app.Commands[index].commandNamePath = []string{c.Name, cc.Name}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/command_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/command_test.go
deleted file mode 100644
index 5e0e8def05..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/command_test.go
+++ /dev/null
@@ -1,155 +0,0 @@
-package cli
-
-import (
-	"errors"
-	"flag"
-	"fmt"
-	"io/ioutil"
-	"strings"
-	"testing"
-)
-
-func TestCommandFlagParsing(t *testing.T) {
-	cases := []struct {
-		testArgs        []string
-		skipFlagParsing bool
-		skipArgReorder  bool
-		expectedErr     error
-	}{
-		// Test normal "not ignoring flags" flow
-		{[]string{"test-cmd", "blah", "blah", "-break"}, false, false, errors.New("flag provided but not defined: -break")},
-
-		// Test no arg reorder
-		{[]string{"test-cmd", "blah", "blah", "-break"}, false, true, nil},
-
-		{[]string{"test-cmd", "blah", "blah"}, true, false, nil},   // Test SkipFlagParsing without any args that look like flags
-		{[]string{"test-cmd", "blah", "-break"}, true, false, nil}, // Test SkipFlagParsing with random flag arg
-		{[]string{"test-cmd", "blah", "-help"}, true, false, nil},  // Test SkipFlagParsing with "special" help flag arg
-	}
-
-	for _, c := range cases {
-		app := NewApp()
-		app.Writer = ioutil.Discard
-		set := flag.NewFlagSet("test", 0)
-		set.Parse(c.testArgs)
-
-		context := NewContext(app, set, nil)
-
-		command := Command{
-			Name:            "test-cmd",
-			Aliases:         []string{"tc"},
-			Usage:           "this is for testing",
-			Description:     "testing",
-			Action:          func(_ *Context) error { return nil },
-			SkipFlagParsing: c.skipFlagParsing,
-			SkipArgReorder:  c.skipArgReorder,
-		}
-
-		err := command.Run(context)
-
-		expect(t, err, c.expectedErr)
-		expect(t, []string(context.Args()), c.testArgs)
-	}
-}
-
-func TestCommand_Run_DoesNotOverwriteErrorFromBefore(t *testing.T) {
-	app := NewApp()
-	app.Commands = []Command{
-		{
-			Name: "bar",
-			Before: func(c *Context) error {
-				return fmt.Errorf("before error")
-			},
-			After: func(c *Context) error {
-				return fmt.Errorf("after error")
-			},
-		},
-	}
-
-	err := app.Run([]string{"foo", "bar"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.Contains(err.Error(), "before error") {
-		t.Errorf("expected text of error from Before method, but got none in \"%v\"", err)
-	}
-	if !strings.Contains(err.Error(), "after error") {
-		t.Errorf("expected text of error from After method, but got none in \"%v\"", err)
-	}
-}
-
-func TestCommand_Run_BeforeSavesMetadata(t *testing.T) {
-	var receivedMsgFromAction string
-	var receivedMsgFromAfter string
-
-	app := NewApp()
-	app.Commands = []Command{
-		{
-			Name: "bar",
-			Before: func(c *Context) error {
-				c.App.Metadata["msg"] = "hello world"
-				return nil
-			},
-			Action: func(c *Context) error {
-				msg, ok := c.App.Metadata["msg"]
-				if !ok {
-					return errors.New("msg not found")
-				}
-				receivedMsgFromAction = msg.(string)
-				return nil
-			},
-			After: func(c *Context) error {
-				msg, ok := c.App.Metadata["msg"]
-				if !ok {
-					return errors.New("msg not found")
-				}
-				receivedMsgFromAfter = msg.(string)
-				return nil
-			},
-		},
-	}
-
-	err := app.Run([]string{"foo", "bar"})
-	if err != nil {
-		t.Fatalf("expected no error from Run, got %s", err)
-	}
-
-	expectedMsg := "hello world"
-
-	if receivedMsgFromAction != expectedMsg {
-		t.Fatalf("expected msg from Action to match. Given: %q\nExpected: %q",
-			receivedMsgFromAction, expectedMsg)
-	}
-	if receivedMsgFromAfter != expectedMsg {
-		t.Fatalf("expected msg from After to match. Given: %q\nExpected: %q",
-			receivedMsgFromAction, expectedMsg)
-	}
-}
-
-func TestCommand_OnUsageError_WithWrongFlagValue(t *testing.T) {
-	app := NewApp()
-	app.Commands = []Command{
-		{
-			Name: "bar",
-			Flags: []Flag{
-				IntFlag{Name: "flag"},
-			},
-			OnUsageError: func(c *Context, err error, _ bool) error {
-				if !strings.HasPrefix(err.Error(), "invalid value \"wrong\"") {
-					t.Errorf("Expect an invalid value error, but got \"%v\"", err)
-				}
-				return errors.New("intercepted: " + err.Error())
-			},
-		},
-	}
-
-	err := app.Run([]string{"foo", "bar", "--flag=wrong"})
-	if err == nil {
-		t.Fatalf("expected to receive error from Run, got none")
-	}
-
-	if !strings.HasPrefix(err.Error(), "intercepted: invalid value") {
-		t.Errorf("Expect an intercepted error, but got \"%v\"", err)
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/context.go b/installer/vendor/gopkg.in/urfave/cli.v1/context.go
index cb89e92a08..db94191e2a 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/context.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/context.go
@@ -39,11 +39,13 @@ func (c *Context) NumFlags() int {
 
 // Set sets a context flag to a value.
 func (c *Context) Set(name, value string) error {
+	c.setFlags = nil
 	return c.flagSet.Set(name, value)
 }
 
 // GlobalSet sets a context flag to a value on the global flagset
 func (c *Context) GlobalSet(name, value string) error {
+	globalContext(c).setFlags = nil
 	return globalContext(c).flagSet.Set(name, value)
 }
 
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/context_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/context_test.go
deleted file mode 100644
index a1ab05b915..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/context_test.go
+++ /dev/null
@@ -1,399 +0,0 @@
-package cli
-
-import (
-	"flag"
-	"os"
-	"testing"
-	"time"
-)
-
-func TestNewContext(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int("myflag", 12, "doc")
-	set.Int64("myflagInt64", int64(12), "doc")
-	set.Uint("myflagUint", uint(93), "doc")
-	set.Uint64("myflagUint64", uint64(93), "doc")
-	set.Float64("myflag64", float64(17), "doc")
-	globalSet := flag.NewFlagSet("test", 0)
-	globalSet.Int("myflag", 42, "doc")
-	globalSet.Int64("myflagInt64", int64(42), "doc")
-	globalSet.Uint("myflagUint", uint(33), "doc")
-	globalSet.Uint64("myflagUint64", uint64(33), "doc")
-	globalSet.Float64("myflag64", float64(47), "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-	command := Command{Name: "mycommand"}
-	c := NewContext(nil, set, globalCtx)
-	c.Command = command
-	expect(t, c.Int("myflag"), 12)
-	expect(t, c.Int64("myflagInt64"), int64(12))
-	expect(t, c.Uint("myflagUint"), uint(93))
-	expect(t, c.Uint64("myflagUint64"), uint64(93))
-	expect(t, c.Float64("myflag64"), float64(17))
-	expect(t, c.GlobalInt("myflag"), 42)
-	expect(t, c.GlobalInt64("myflagInt64"), int64(42))
-	expect(t, c.GlobalUint("myflagUint"), uint(33))
-	expect(t, c.GlobalUint64("myflagUint64"), uint64(33))
-	expect(t, c.GlobalFloat64("myflag64"), float64(47))
-	expect(t, c.Command.Name, "mycommand")
-}
-
-func TestContext_Int(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int("myflag", 12, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Int("myflag"), 12)
-}
-
-func TestContext_Int64(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int64("myflagInt64", 12, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Int64("myflagInt64"), int64(12))
-}
-
-func TestContext_Uint(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Uint("myflagUint", uint(13), "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Uint("myflagUint"), uint(13))
-}
-
-func TestContext_Uint64(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Uint64("myflagUint64", uint64(9), "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Uint64("myflagUint64"), uint64(9))
-}
-
-func TestContext_GlobalInt(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int("myflag", 12, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.GlobalInt("myflag"), 12)
-	expect(t, c.GlobalInt("nope"), 0)
-}
-
-func TestContext_GlobalInt64(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int64("myflagInt64", 12, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.GlobalInt64("myflagInt64"), int64(12))
-	expect(t, c.GlobalInt64("nope"), int64(0))
-}
-
-func TestContext_Float64(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Float64("myflag", float64(17), "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Float64("myflag"), float64(17))
-}
-
-func TestContext_GlobalFloat64(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Float64("myflag", float64(17), "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.GlobalFloat64("myflag"), float64(17))
-	expect(t, c.GlobalFloat64("nope"), float64(0))
-}
-
-func TestContext_Duration(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Duration("myflag", time.Duration(12*time.Second), "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Duration("myflag"), time.Duration(12*time.Second))
-}
-
-func TestContext_String(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.String("myflag", "hello world", "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.String("myflag"), "hello world")
-}
-
-func TestContext_Bool(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.Bool("myflag"), false)
-}
-
-func TestContext_BoolT(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", true, "doc")
-	c := NewContext(nil, set, nil)
-	expect(t, c.BoolT("myflag"), true)
-}
-
-func TestContext_GlobalBool(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-
-	globalSet := flag.NewFlagSet("test-global", 0)
-	globalSet.Bool("myflag", false, "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-
-	c := NewContext(nil, set, globalCtx)
-	expect(t, c.GlobalBool("myflag"), false)
-	expect(t, c.GlobalBool("nope"), false)
-}
-
-func TestContext_GlobalBoolT(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-
-	globalSet := flag.NewFlagSet("test-global", 0)
-	globalSet.Bool("myflag", true, "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-
-	c := NewContext(nil, set, globalCtx)
-	expect(t, c.GlobalBoolT("myflag"), true)
-	expect(t, c.GlobalBoolT("nope"), false)
-}
-
-func TestContext_Args(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	c := NewContext(nil, set, nil)
-	set.Parse([]string{"--myflag", "bat", "baz"})
-	expect(t, len(c.Args()), 2)
-	expect(t, c.Bool("myflag"), true)
-}
-
-func TestContext_NArg(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	c := NewContext(nil, set, nil)
-	set.Parse([]string{"--myflag", "bat", "baz"})
-	expect(t, c.NArg(), 2)
-}
-
-func TestContext_IsSet(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	set.String("otherflag", "hello world", "doc")
-	globalSet := flag.NewFlagSet("test", 0)
-	globalSet.Bool("myflagGlobal", true, "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-	c := NewContext(nil, set, globalCtx)
-	set.Parse([]string{"--myflag", "bat", "baz"})
-	globalSet.Parse([]string{"--myflagGlobal", "bat", "baz"})
-	expect(t, c.IsSet("myflag"), true)
-	expect(t, c.IsSet("otherflag"), false)
-	expect(t, c.IsSet("bogusflag"), false)
-	expect(t, c.IsSet("myflagGlobal"), false)
-}
-
-// XXX Corresponds to hack in context.IsSet for flags with EnvVar field
-// Should be moved to `flag_test` in v2
-func TestContext_IsSet_fromEnv(t *testing.T) {
-	var (
-		timeoutIsSet, tIsSet    bool
-		noEnvVarIsSet, nIsSet   bool
-		passwordIsSet, pIsSet   bool
-		unparsableIsSet, uIsSet bool
-	)
-
-	clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
-	os.Setenv("APP_PASSWORD", "")
-	a := App{
-		Flags: []Flag{
-			Float64Flag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
-			StringFlag{Name: "password, p", EnvVar: "APP_PASSWORD"},
-			Float64Flag{Name: "unparsable, u", EnvVar: "APP_UNPARSABLE"},
-			Float64Flag{Name: "no-env-var, n"},
-		},
-		Action: func(ctx *Context) error {
-			timeoutIsSet = ctx.IsSet("timeout")
-			tIsSet = ctx.IsSet("t")
-			passwordIsSet = ctx.IsSet("password")
-			pIsSet = ctx.IsSet("p")
-			unparsableIsSet = ctx.IsSet("unparsable")
-			uIsSet = ctx.IsSet("u")
-			noEnvVarIsSet = ctx.IsSet("no-env-var")
-			nIsSet = ctx.IsSet("n")
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-	expect(t, timeoutIsSet, true)
-	expect(t, tIsSet, true)
-	expect(t, passwordIsSet, true)
-	expect(t, pIsSet, true)
-	expect(t, noEnvVarIsSet, false)
-	expect(t, nIsSet, false)
-
-	os.Setenv("APP_UNPARSABLE", "foobar")
-	a.Run([]string{"run"})
-	expect(t, unparsableIsSet, false)
-	expect(t, uIsSet, false)
-}
-
-func TestContext_GlobalIsSet(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	set.String("otherflag", "hello world", "doc")
-	globalSet := flag.NewFlagSet("test", 0)
-	globalSet.Bool("myflagGlobal", true, "doc")
-	globalSet.Bool("myflagGlobalUnset", true, "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-	c := NewContext(nil, set, globalCtx)
-	set.Parse([]string{"--myflag", "bat", "baz"})
-	globalSet.Parse([]string{"--myflagGlobal", "bat", "baz"})
-	expect(t, c.GlobalIsSet("myflag"), false)
-	expect(t, c.GlobalIsSet("otherflag"), false)
-	expect(t, c.GlobalIsSet("bogusflag"), false)
-	expect(t, c.GlobalIsSet("myflagGlobal"), true)
-	expect(t, c.GlobalIsSet("myflagGlobalUnset"), false)
-	expect(t, c.GlobalIsSet("bogusGlobal"), false)
-}
-
-// XXX Corresponds to hack in context.IsSet for flags with EnvVar field
-// Should be moved to `flag_test` in v2
-func TestContext_GlobalIsSet_fromEnv(t *testing.T) {
-	var (
-		timeoutIsSet, tIsSet    bool
-		noEnvVarIsSet, nIsSet   bool
-		passwordIsSet, pIsSet   bool
-		unparsableIsSet, uIsSet bool
-	)
-
-	clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
-	os.Setenv("APP_PASSWORD", "")
-	a := App{
-		Flags: []Flag{
-			Float64Flag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
-			StringFlag{Name: "password, p", EnvVar: "APP_PASSWORD"},
-			Float64Flag{Name: "no-env-var, n"},
-			Float64Flag{Name: "unparsable, u", EnvVar: "APP_UNPARSABLE"},
-		},
-		Commands: []Command{
-			{
-				Name: "hello",
-				Action: func(ctx *Context) error {
-					timeoutIsSet = ctx.GlobalIsSet("timeout")
-					tIsSet = ctx.GlobalIsSet("t")
-					passwordIsSet = ctx.GlobalIsSet("password")
-					pIsSet = ctx.GlobalIsSet("p")
-					unparsableIsSet = ctx.GlobalIsSet("unparsable")
-					uIsSet = ctx.GlobalIsSet("u")
-					noEnvVarIsSet = ctx.GlobalIsSet("no-env-var")
-					nIsSet = ctx.GlobalIsSet("n")
-					return nil
-				},
-			},
-		},
-	}
-	if err := a.Run([]string{"run", "hello"}); err != nil {
-		t.Logf("error running Run(): %+v", err)
-	}
-	expect(t, timeoutIsSet, true)
-	expect(t, tIsSet, true)
-	expect(t, passwordIsSet, true)
-	expect(t, pIsSet, true)
-	expect(t, noEnvVarIsSet, false)
-	expect(t, nIsSet, false)
-
-	os.Setenv("APP_UNPARSABLE", "foobar")
-	if err := a.Run([]string{"run"}); err != nil {
-		t.Logf("error running Run(): %+v", err)
-	}
-	expect(t, unparsableIsSet, false)
-	expect(t, uIsSet, false)
-}
-
-func TestContext_NumFlags(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Bool("myflag", false, "doc")
-	set.String("otherflag", "hello world", "doc")
-	globalSet := flag.NewFlagSet("test", 0)
-	globalSet.Bool("myflagGlobal", true, "doc")
-	globalCtx := NewContext(nil, globalSet, nil)
-	c := NewContext(nil, set, globalCtx)
-	set.Parse([]string{"--myflag", "--otherflag=foo"})
-	globalSet.Parse([]string{"--myflagGlobal"})
-	expect(t, c.NumFlags(), 2)
-}
-
-func TestContext_GlobalFlag(t *testing.T) {
-	var globalFlag string
-	var globalFlagSet bool
-	app := NewApp()
-	app.Flags = []Flag{
-		StringFlag{Name: "global, g", Usage: "global"},
-	}
-	app.Action = func(c *Context) error {
-		globalFlag = c.GlobalString("global")
-		globalFlagSet = c.GlobalIsSet("global")
-		return nil
-	}
-	app.Run([]string{"command", "-g", "foo"})
-	expect(t, globalFlag, "foo")
-	expect(t, globalFlagSet, true)
-
-}
-
-func TestContext_GlobalFlagsInSubcommands(t *testing.T) {
-	subcommandRun := false
-	parentFlag := false
-	app := NewApp()
-
-	app.Flags = []Flag{
-		BoolFlag{Name: "debug, d", Usage: "Enable debugging"},
-	}
-
-	app.Commands = []Command{
-		{
-			Name: "foo",
-			Flags: []Flag{
-				BoolFlag{Name: "parent, p", Usage: "Parent flag"},
-			},
-			Subcommands: []Command{
-				{
-					Name: "bar",
-					Action: func(c *Context) error {
-						if c.GlobalBool("debug") {
-							subcommandRun = true
-						}
-						if c.GlobalBool("parent") {
-							parentFlag = true
-						}
-						return nil
-					},
-				},
-			},
-		},
-	}
-
-	app.Run([]string{"command", "-d", "foo", "-p", "bar"})
-
-	expect(t, subcommandRun, true)
-	expect(t, parentFlag, true)
-}
-
-func TestContext_Set(t *testing.T) {
-	set := flag.NewFlagSet("test", 0)
-	set.Int("int", 5, "an int")
-	c := NewContext(nil, set, nil)
-
-	c.Set("int", "1")
-	expect(t, c.Int("int"), 1)
-}
-
-func TestContext_GlobalSet(t *testing.T) {
-	gSet := flag.NewFlagSet("test", 0)
-	gSet.Int("int", 5, "an int")
-
-	set := flag.NewFlagSet("sub", 0)
-	set.Int("int", 3, "an int")
-
-	pc := NewContext(nil, gSet, nil)
-	c := NewContext(nil, set, pc)
-
-	c.Set("int", "1")
-	expect(t, c.Int("int"), 1)
-	expect(t, c.GlobalInt("int"), 5)
-
-	c.GlobalSet("int", "1")
-	expect(t, c.Int("int"), 1)
-	expect(t, c.GlobalInt("int"), 1)
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/errors.go b/installer/vendor/gopkg.in/urfave/cli.v1/errors.go
index 0206ff4911..562b2953cf 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/errors.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/errors.go
@@ -74,7 +74,7 @@ func (ee *ExitError) ExitCode() int {
 // HandleExitCoder checks if the error fulfills the ExitCoder interface, and if
 // so prints the error to stderr (if it is non-empty) and calls OsExiter with the
 // given exit code.  If the given error is a MultiError, then this func is
-// called on all members of the Errors slice.
+// called on all members of the Errors slice and calls OsExiter with the last exit code.
 func HandleExitCoder(err error) {
 	if err == nil {
 		return
@@ -93,18 +93,23 @@ func HandleExitCoder(err error) {
 	}
 
 	if multiErr, ok := err.(MultiError); ok {
-		for _, merr := range multiErr.Errors {
-			HandleExitCoder(merr)
-		}
+		code := handleMultiError(multiErr)
+		OsExiter(code)
 		return
 	}
+}
 
-	if err.Error() != "" {
-		if _, ok := err.(ErrorFormatter); ok {
-			fmt.Fprintf(ErrWriter, "%+v\n", err)
+func handleMultiError(multiErr MultiError) int {
+	code := 1
+	for _, merr := range multiErr.Errors {
+		if multiErr2, ok := merr.(MultiError); ok {
+			code = handleMultiError(multiErr2)
 		} else {
-			fmt.Fprintln(ErrWriter, err)
+			fmt.Fprintln(ErrWriter, merr)
+			if exitErr, ok := merr.(ExitCoder); ok {
+				code = exitErr.ExitCode()
+			}
 		}
 	}
-	OsExiter(1)
+	return code
 }
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/errors_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/errors_test.go
deleted file mode 100644
index 131bd38d71..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/errors_test.go
+++ /dev/null
@@ -1,157 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"errors"
-	"fmt"
-	"testing"
-)
-
-func TestHandleExitCoder_nil(t *testing.T) {
-	exitCode := 0
-	called := false
-
-	OsExiter = func(rc int) {
-		exitCode = rc
-		called = true
-	}
-
-	defer func() { OsExiter = fakeOsExiter }()
-
-	HandleExitCoder(nil)
-
-	expect(t, exitCode, 0)
-	expect(t, called, false)
-}
-
-func TestHandleExitCoder_ExitCoder(t *testing.T) {
-	exitCode := 0
-	called := false
-
-	OsExiter = func(rc int) {
-		exitCode = rc
-		called = true
-	}
-
-	defer func() { OsExiter = fakeOsExiter }()
-
-	HandleExitCoder(NewExitError("galactic perimeter breach", 9))
-
-	expect(t, exitCode, 9)
-	expect(t, called, true)
-}
-
-func TestHandleExitCoder_MultiErrorWithExitCoder(t *testing.T) {
-	exitCode := 0
-	called := false
-
-	OsExiter = func(rc int) {
-		exitCode = rc
-		called = true
-	}
-
-	defer func() { OsExiter = fakeOsExiter }()
-
-	exitErr := NewExitError("galactic perimeter breach", 9)
-	err := NewMultiError(errors.New("wowsa"), errors.New("egad"), exitErr)
-	HandleExitCoder(err)
-
-	expect(t, exitCode, 9)
-	expect(t, called, true)
-}
-
-func TestHandleExitCoder_ErrorWithMessage(t *testing.T) {
-	exitCode := 0
-	called := false
-
-	OsExiter = func(rc int) {
-		exitCode = rc
-		called = true
-	}
-	ErrWriter = &bytes.Buffer{}
-
-	defer func() {
-		OsExiter = fakeOsExiter
-		ErrWriter = fakeErrWriter
-	}()
-
-	err := errors.New("gourd havens")
-	HandleExitCoder(err)
-
-	expect(t, exitCode, 1)
-	expect(t, called, true)
-	expect(t, ErrWriter.(*bytes.Buffer).String(), "gourd havens\n")
-}
-
-func TestHandleExitCoder_ErrorWithoutMessage(t *testing.T) {
-	exitCode := 0
-	called := false
-
-	OsExiter = func(rc int) {
-		exitCode = rc
-		called = true
-	}
-	ErrWriter = &bytes.Buffer{}
-
-	defer func() {
-		OsExiter = fakeOsExiter
-		ErrWriter = fakeErrWriter
-	}()
-
-	err := errors.New("")
-	HandleExitCoder(err)
-
-	expect(t, exitCode, 1)
-	expect(t, called, true)
-	expect(t, ErrWriter.(*bytes.Buffer).String(), "")
-}
-
-// make a stub to not import pkg/errors
-type ErrorWithFormat struct {
-	error
-}
-
-func NewErrorWithFormat(m string) *ErrorWithFormat {
-	return &ErrorWithFormat{error: errors.New(m)}
-}
-
-func (f *ErrorWithFormat) Format(s fmt.State, verb rune) {
-	fmt.Fprintf(s, "This the format: %v", f.error)
-}
-
-func TestHandleExitCoder_ErrorWithFormat(t *testing.T) {
-	called := false
-
-	OsExiter = func(rc int) {
-		called = true
-	}
-	ErrWriter = &bytes.Buffer{}
-
-	defer func() {
-		OsExiter = fakeOsExiter
-		ErrWriter = fakeErrWriter
-	}()
-
-	err := NewErrorWithFormat("I am formatted")
-	HandleExitCoder(err)
-
-	expect(t, called, true)
-	expect(t, ErrWriter.(*bytes.Buffer).String(), "This the format: I am formatted\n")
-}
-
-func TestHandleExitCoder_MultiErrorWithFormat(t *testing.T) {
-	called := false
-
-	OsExiter = func(rc int) {
-		called = true
-	}
-	ErrWriter = &bytes.Buffer{}
-
-	defer func() { OsExiter = fakeOsExiter }()
-
-	err := NewMultiError(NewErrorWithFormat("err1"), NewErrorWithFormat("err2"))
-	HandleExitCoder(err)
-
-	expect(t, called, true)
-	expect(t, ErrWriter.(*bytes.Buffer).String(), "This the format: err1\nThis the format: err2\n")
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/flag-types.json b/installer/vendor/gopkg.in/urfave/cli.v1/flag-types.json
deleted file mode 100644
index 1223107859..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/flag-types.json
+++ /dev/null
@@ -1,93 +0,0 @@
-[
-  {
-    "name": "Bool",
-    "type": "bool",
-    "value": false,
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "BoolT",
-    "type": "bool",
-    "value": false,
-    "doctail": " that is true by default",
-    "context_default": "false",
-    "parser": "strconv.ParseBool(f.Value.String())"
-  },
-  {
-    "name": "Duration",
-    "type": "time.Duration",
-    "doctail": " (see https://golang.org/pkg/time/#ParseDuration)",
-    "context_default": "0",
-    "parser": "time.ParseDuration(f.Value.String())"
-  },
-  {
-    "name": "Float64",
-    "type": "float64",
-    "context_default": "0",
-    "parser": "strconv.ParseFloat(f.Value.String(), 64)"
-  },
-  {
-    "name": "Generic",
-    "type": "Generic",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "interface{}"
-  },
-  {
-    "name": "Int64",
-    "type": "int64",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Int",
-    "type": "int",
-    "context_default": "0",
-    "parser": "strconv.ParseInt(f.Value.String(), 0, 64)",
-    "parser_cast": "int(parsed)"
-  },
-  {
-    "name": "IntSlice",
-    "type": "*IntSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int",
-    "parser": "(f.Value.(*IntSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Int64Slice",
-    "type": "*Int64Slice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]int64",
-    "parser": "(f.Value.(*Int64Slice)).Value(), error(nil)"
-  },
-  {
-    "name": "String",
-    "type": "string",
-    "context_default": "\"\"",
-    "parser": "f.Value.String(), error(nil)"
-  },
-  {
-    "name": "StringSlice",
-    "type": "*StringSlice",
-    "dest": false,
-    "context_default": "nil",
-    "context_type": "[]string",
-    "parser": "(f.Value.(*StringSlice)).Value(), error(nil)"
-  },
-  {
-    "name": "Uint64",
-    "type": "uint64",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)"
-  },
-  {
-    "name": "Uint",
-    "type": "uint",
-    "context_default": "0",
-    "parser": "strconv.ParseUint(f.Value.String(), 0, 64)",
-    "parser_cast": "uint(parsed)"
-  }
-]
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/flag.go b/installer/vendor/gopkg.in/urfave/cli.v1/flag.go
index 7dd8a2c4ab..877ff3523d 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/flag.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/flag.go
@@ -14,13 +14,13 @@ import (
 const defaultPlaceholder = "value"
 
 // BashCompletionFlag enables bash-completion for all commands and subcommands
-var BashCompletionFlag = BoolFlag{
+var BashCompletionFlag Flag = BoolFlag{
 	Name:   "generate-bash-completion",
 	Hidden: true,
 }
 
 // VersionFlag prints the version for the application
-var VersionFlag = BoolFlag{
+var VersionFlag Flag = BoolFlag{
 	Name:  "version, v",
 	Usage: "print the version",
 }
@@ -28,7 +28,7 @@ var VersionFlag = BoolFlag{
 // HelpFlag prints the help for all commands and subcommands
 // Set to the zero value (BoolFlag{}) to disable flag -- keeps subcommand
 // unless HideHelp is set to true)
-var HelpFlag = BoolFlag{
+var HelpFlag Flag = BoolFlag{
 	Name:  "help, h",
 	Usage: "show help",
 }
@@ -630,7 +630,8 @@ func (f Float64Flag) ApplyWithError(set *flag.FlagSet) error {
 func visibleFlags(fl []Flag) []Flag {
 	visible := []Flag{}
 	for _, flag := range fl {
-		if !flagValue(flag).FieldByName("Hidden").Bool() {
+		field := flagValue(flag).FieldByName("Hidden")
+		if !field.IsValid() || !field.Bool() {
 			visible = append(visible, flag)
 		}
 	}
@@ -723,9 +724,8 @@ func stringifyFlag(f Flag) string {
 
 	needsPlaceholder := false
 	defaultValueString := ""
-	val := fv.FieldByName("Value")
 
-	if val.IsValid() {
+	if val := fv.FieldByName("Value"); val.IsValid() {
 		needsPlaceholder = true
 		defaultValueString = fmt.Sprintf(" (default: %v)", val.Interface())
 
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/flag_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/flag_test.go
deleted file mode 100644
index 0dd86549dd..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/flag_test.go
+++ /dev/null
@@ -1,1203 +0,0 @@
-package cli
-
-import (
-	"fmt"
-	"os"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-	"time"
-)
-
-var boolFlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"help", "--help\t"},
-	{"h", "-h\t"},
-}
-
-func TestBoolFlagHelpOutput(t *testing.T) {
-	for _, test := range boolFlagTests {
-		flag := BoolFlag{Name: test.name}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestFlagsFromEnv(t *testing.T) {
-	var flagTests = []struct {
-		input  string
-		output interface{}
-		flag   Flag
-		err    error
-	}{
-		{"", false, BoolFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"1", true, BoolFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"false", false, BoolFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"foobar", true, BoolFlag{Name: "debug", EnvVar: "DEBUG"}, fmt.Errorf(`could not parse foobar as bool value for flag debug: strconv.ParseBool: parsing "foobar": invalid syntax`)},
-
-		{"", false, BoolTFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"1", true, BoolTFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"false", false, BoolTFlag{Name: "debug", EnvVar: "DEBUG"}, nil},
-		{"foobar", true, BoolTFlag{Name: "debug", EnvVar: "DEBUG"}, fmt.Errorf(`could not parse foobar as bool value for flag debug: strconv.ParseBool: parsing "foobar": invalid syntax`)},
-
-		{"1s", 1 * time.Second, DurationFlag{Name: "time", EnvVar: "TIME"}, nil},
-		{"foobar", false, DurationFlag{Name: "time", EnvVar: "TIME"}, fmt.Errorf(`could not parse foobar as duration for flag time: time: invalid duration foobar`)},
-
-		{"1.2", 1.2, Float64Flag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1", 1.0, Float64Flag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"foobar", 0, Float64Flag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as float64 value for flag seconds: strconv.ParseFloat: parsing "foobar": invalid syntax`)},
-
-		{"1", int64(1), Int64Flag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2", 0, Int64Flag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2 as int value for flag seconds: strconv.ParseInt: parsing "1.2": invalid syntax`)},
-		{"foobar", 0, Int64Flag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as int value for flag seconds: strconv.ParseInt: parsing "foobar": invalid syntax`)},
-
-		{"1", 1, IntFlag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2", 0, IntFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2 as int value for flag seconds: strconv.ParseInt: parsing "1.2": invalid syntax`)},
-		{"foobar", 0, IntFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as int value for flag seconds: strconv.ParseInt: parsing "foobar": invalid syntax`)},
-
-		{"1,2", IntSlice{1, 2}, IntSliceFlag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2,2", IntSlice{}, IntSliceFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2,2 as int slice value for flag seconds: strconv.ParseInt: parsing "1.2": invalid syntax`)},
-		{"foobar", IntSlice{}, IntSliceFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as int slice value for flag seconds: strconv.ParseInt: parsing "foobar": invalid syntax`)},
-
-		{"1,2", Int64Slice{1, 2}, Int64SliceFlag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2,2", Int64Slice{}, Int64SliceFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2,2 as int64 slice value for flag seconds: strconv.ParseInt: parsing "1.2": invalid syntax`)},
-		{"foobar", Int64Slice{}, Int64SliceFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as int64 slice value for flag seconds: strconv.ParseInt: parsing "foobar": invalid syntax`)},
-
-		{"foo", "foo", StringFlag{Name: "name", EnvVar: "NAME"}, nil},
-
-		{"foo,bar", StringSlice{"foo", "bar"}, StringSliceFlag{Name: "names", EnvVar: "NAMES"}, nil},
-
-		{"1", uint(1), UintFlag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2", 0, UintFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2 as uint value for flag seconds: strconv.ParseUint: parsing "1.2": invalid syntax`)},
-		{"foobar", 0, UintFlag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as uint value for flag seconds: strconv.ParseUint: parsing "foobar": invalid syntax`)},
-
-		{"1", uint64(1), Uint64Flag{Name: "seconds", EnvVar: "SECONDS"}, nil},
-		{"1.2", 0, Uint64Flag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse 1.2 as uint64 value for flag seconds: strconv.ParseUint: parsing "1.2": invalid syntax`)},
-		{"foobar", 0, Uint64Flag{Name: "seconds", EnvVar: "SECONDS"}, fmt.Errorf(`could not parse foobar as uint64 value for flag seconds: strconv.ParseUint: parsing "foobar": invalid syntax`)},
-
-		{"foo,bar", &Parser{"foo", "bar"}, GenericFlag{Name: "names", Value: &Parser{}, EnvVar: "NAMES"}, nil},
-	}
-
-	for _, test := range flagTests {
-		os.Clearenv()
-		os.Setenv(reflect.ValueOf(test.flag).FieldByName("EnvVar").String(), test.input)
-		a := App{
-			Flags: []Flag{test.flag},
-			Action: func(ctx *Context) error {
-				if !reflect.DeepEqual(ctx.value(test.flag.GetName()), test.output) {
-					t.Errorf("expected %+v to be parsed as %+v, instead was %+v", test.input, test.output, ctx.value(test.flag.GetName()))
-				}
-				return nil
-			},
-		}
-
-		err := a.Run([]string{"run"})
-		if !reflect.DeepEqual(test.err, err) {
-			t.Errorf("expected error %s, got error %s", test.err, err)
-		}
-	}
-}
-
-var stringFlagTests = []struct {
-	name     string
-	usage    string
-	value    string
-	expected string
-}{
-	{"foo", "", "", "--foo value\t"},
-	{"f", "", "", "-f value\t"},
-	{"f", "The total `foo` desired", "all", "-f foo\tThe total foo desired (default: \"all\")"},
-	{"test", "", "Something", "--test value\t(default: \"Something\")"},
-	{"config,c", "Load configuration from `FILE`", "", "--config FILE, -c FILE\tLoad configuration from FILE"},
-	{"config,c", "Load configuration from `CONFIG`", "config.json", "--config CONFIG, -c CONFIG\tLoad configuration from CONFIG (default: \"config.json\")"},
-}
-
-func TestStringFlagHelpOutput(t *testing.T) {
-	for _, test := range stringFlagTests {
-		flag := StringFlag{Name: test.name, Usage: test.usage, Value: test.value}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestStringFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_FOO", "derp")
-	for _, test := range stringFlagTests {
-		flag := StringFlag{Name: test.name, Value: test.value, EnvVar: "APP_FOO"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_FOO]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_FOO%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var stringSliceFlagTests = []struct {
-	name     string
-	value    *StringSlice
-	expected string
-}{
-	{"foo", func() *StringSlice {
-		s := &StringSlice{}
-		s.Set("")
-		return s
-	}(), "--foo value\t"},
-	{"f", func() *StringSlice {
-		s := &StringSlice{}
-		s.Set("")
-		return s
-	}(), "-f value\t"},
-	{"f", func() *StringSlice {
-		s := &StringSlice{}
-		s.Set("Lipstick")
-		return s
-	}(), "-f value\t(default: \"Lipstick\")"},
-	{"test", func() *StringSlice {
-		s := &StringSlice{}
-		s.Set("Something")
-		return s
-	}(), "--test value\t(default: \"Something\")"},
-}
-
-func TestStringSliceFlagHelpOutput(t *testing.T) {
-	for _, test := range stringSliceFlagTests {
-		flag := StringSliceFlag{Name: test.name, Value: test.value}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestStringSliceFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_QWWX", "11,4")
-	for _, test := range stringSliceFlagTests {
-		flag := StringSliceFlag{Name: test.name, Value: test.value, EnvVar: "APP_QWWX"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_QWWX]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_QWWX%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%q does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var intFlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"hats", "--hats value\t(default: 9)"},
-	{"H", "-H value\t(default: 9)"},
-}
-
-func TestIntFlagHelpOutput(t *testing.T) {
-	for _, test := range intFlagTests {
-		flag := IntFlag{Name: test.name, Value: 9}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%s does not match %s", output, test.expected)
-		}
-	}
-}
-
-func TestIntFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAR", "2")
-	for _, test := range intFlagTests {
-		flag := IntFlag{Name: test.name, EnvVar: "APP_BAR"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAR]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAR%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var int64FlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"hats", "--hats value\t(default: 8589934592)"},
-	{"H", "-H value\t(default: 8589934592)"},
-}
-
-func TestInt64FlagHelpOutput(t *testing.T) {
-	for _, test := range int64FlagTests {
-		flag := Int64Flag{Name: test.name, Value: 8589934592}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%s does not match %s", output, test.expected)
-		}
-	}
-}
-
-func TestInt64FlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAR", "2")
-	for _, test := range int64FlagTests {
-		flag := IntFlag{Name: test.name, EnvVar: "APP_BAR"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAR]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAR%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var uintFlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"nerfs", "--nerfs value\t(default: 41)"},
-	{"N", "-N value\t(default: 41)"},
-}
-
-func TestUintFlagHelpOutput(t *testing.T) {
-	for _, test := range uintFlagTests {
-		flag := UintFlag{Name: test.name, Value: 41}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%s does not match %s", output, test.expected)
-		}
-	}
-}
-
-func TestUintFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAR", "2")
-	for _, test := range uintFlagTests {
-		flag := UintFlag{Name: test.name, EnvVar: "APP_BAR"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAR]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAR%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var uint64FlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"gerfs", "--gerfs value\t(default: 8589934582)"},
-	{"G", "-G value\t(default: 8589934582)"},
-}
-
-func TestUint64FlagHelpOutput(t *testing.T) {
-	for _, test := range uint64FlagTests {
-		flag := Uint64Flag{Name: test.name, Value: 8589934582}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%s does not match %s", output, test.expected)
-		}
-	}
-}
-
-func TestUint64FlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAR", "2")
-	for _, test := range uint64FlagTests {
-		flag := UintFlag{Name: test.name, EnvVar: "APP_BAR"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAR]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAR%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var durationFlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"hooting", "--hooting value\t(default: 1s)"},
-	{"H", "-H value\t(default: 1s)"},
-}
-
-func TestDurationFlagHelpOutput(t *testing.T) {
-	for _, test := range durationFlagTests {
-		flag := DurationFlag{Name: test.name, Value: 1 * time.Second}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestDurationFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAR", "2h3m6s")
-	for _, test := range durationFlagTests {
-		flag := DurationFlag{Name: test.name, EnvVar: "APP_BAR"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAR]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAR%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var intSliceFlagTests = []struct {
-	name     string
-	value    *IntSlice
-	expected string
-}{
-	{"heads", &IntSlice{}, "--heads value\t"},
-	{"H", &IntSlice{}, "-H value\t"},
-	{"H, heads", func() *IntSlice {
-		i := &IntSlice{}
-		i.Set("9")
-		i.Set("3")
-		return i
-	}(), "-H value, --heads value\t(default: 9, 3)"},
-}
-
-func TestIntSliceFlagHelpOutput(t *testing.T) {
-	for _, test := range intSliceFlagTests {
-		flag := IntSliceFlag{Name: test.name, Value: test.value}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestIntSliceFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_SMURF", "42,3")
-	for _, test := range intSliceFlagTests {
-		flag := IntSliceFlag{Name: test.name, Value: test.value, EnvVar: "APP_SMURF"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_SMURF]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_SMURF%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%q does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var int64SliceFlagTests = []struct {
-	name     string
-	value    *Int64Slice
-	expected string
-}{
-	{"heads", &Int64Slice{}, "--heads value\t"},
-	{"H", &Int64Slice{}, "-H value\t"},
-	{"H, heads", func() *Int64Slice {
-		i := &Int64Slice{}
-		i.Set("2")
-		i.Set("17179869184")
-		return i
-	}(), "-H value, --heads value\t(default: 2, 17179869184)"},
-}
-
-func TestInt64SliceFlagHelpOutput(t *testing.T) {
-	for _, test := range int64SliceFlagTests {
-		flag := Int64SliceFlag{Name: test.name, Value: test.value}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestInt64SliceFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_SMURF", "42,17179869184")
-	for _, test := range int64SliceFlagTests {
-		flag := Int64SliceFlag{Name: test.name, Value: test.value, EnvVar: "APP_SMURF"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_SMURF]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_SMURF%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%q does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var float64FlagTests = []struct {
-	name     string
-	expected string
-}{
-	{"hooting", "--hooting value\t(default: 0.1)"},
-	{"H", "-H value\t(default: 0.1)"},
-}
-
-func TestFloat64FlagHelpOutput(t *testing.T) {
-	for _, test := range float64FlagTests {
-		flag := Float64Flag{Name: test.name, Value: float64(0.1)}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestFloat64FlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_BAZ", "99.4")
-	for _, test := range float64FlagTests {
-		flag := Float64Flag{Name: test.name, EnvVar: "APP_BAZ"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_BAZ]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_BAZ%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-var genericFlagTests = []struct {
-	name     string
-	value    Generic
-	expected string
-}{
-	{"toads", &Parser{"abc", "def"}, "--toads value\ttest flag (default: abc,def)"},
-	{"t", &Parser{"abc", "def"}, "-t value\ttest flag (default: abc,def)"},
-}
-
-func TestGenericFlagHelpOutput(t *testing.T) {
-	for _, test := range genericFlagTests {
-		flag := GenericFlag{Name: test.name, Value: test.value, Usage: "test flag"}
-		output := flag.String()
-
-		if output != test.expected {
-			t.Errorf("%q does not match %q", output, test.expected)
-		}
-	}
-}
-
-func TestGenericFlagWithEnvVarHelpOutput(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_ZAP", "3")
-	for _, test := range genericFlagTests {
-		flag := GenericFlag{Name: test.name, EnvVar: "APP_ZAP"}
-		output := flag.String()
-
-		expectedSuffix := " [$APP_ZAP]"
-		if runtime.GOOS == "windows" {
-			expectedSuffix = " [%APP_ZAP%]"
-		}
-		if !strings.HasSuffix(output, expectedSuffix) {
-			t.Errorf("%s does not end with"+expectedSuffix, output)
-		}
-	}
-}
-
-func TestParseMultiString(t *testing.T) {
-	(&App{
-		Flags: []Flag{
-			StringFlag{Name: "serve, s"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.String("serve") != "10" {
-				t.Errorf("main name not set")
-			}
-			if ctx.String("s") != "10" {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run", "-s", "10"})
-}
-
-func TestParseDestinationString(t *testing.T) {
-	var dest string
-	a := App{
-		Flags: []Flag{
-			StringFlag{
-				Name:        "dest",
-				Destination: &dest,
-			},
-		},
-		Action: func(ctx *Context) error {
-			if dest != "10" {
-				t.Errorf("expected destination String 10")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--dest", "10"})
-}
-
-func TestParseMultiStringFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_COUNT", "20")
-	(&App{
-		Flags: []Flag{
-			StringFlag{Name: "count, c", EnvVar: "APP_COUNT"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.String("count") != "20" {
-				t.Errorf("main name not set")
-			}
-			if ctx.String("c") != "20" {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiStringFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_COUNT", "20")
-	(&App{
-		Flags: []Flag{
-			StringFlag{Name: "count, c", EnvVar: "COMPAT_COUNT,APP_COUNT"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.String("count") != "20" {
-				t.Errorf("main name not set")
-			}
-			if ctx.String("c") != "20" {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiStringSlice(t *testing.T) {
-	(&App{
-		Flags: []Flag{
-			StringSliceFlag{Name: "serve, s", Value: &StringSlice{}},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.StringSlice("serve"), []string{"10", "20"}) {
-				t.Errorf("main name not set")
-			}
-			if !reflect.DeepEqual(ctx.StringSlice("s"), []string{"10", "20"}) {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run", "-s", "10", "-s", "20"})
-}
-
-func TestParseMultiStringSliceFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,40")
-
-	(&App{
-		Flags: []Flag{
-			StringSliceFlag{Name: "intervals, i", Value: &StringSlice{}, EnvVar: "APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.StringSlice("intervals"), []string{"20", "30", "40"}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.StringSlice("i"), []string{"20", "30", "40"}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiStringSliceFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,40")
-
-	(&App{
-		Flags: []Flag{
-			StringSliceFlag{Name: "intervals, i", Value: &StringSlice{}, EnvVar: "COMPAT_INTERVALS,APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.StringSlice("intervals"), []string{"20", "30", "40"}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.StringSlice("i"), []string{"20", "30", "40"}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiInt(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			IntFlag{Name: "serve, s"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Int("serve") != 10 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Int("s") != 10 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "-s", "10"})
-}
-
-func TestParseDestinationInt(t *testing.T) {
-	var dest int
-	a := App{
-		Flags: []Flag{
-			IntFlag{
-				Name:        "dest",
-				Destination: &dest,
-			},
-		},
-		Action: func(ctx *Context) error {
-			if dest != 10 {
-				t.Errorf("expected destination Int 10")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--dest", "10"})
-}
-
-func TestParseMultiIntFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "10")
-	a := App{
-		Flags: []Flag{
-			IntFlag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Int("timeout") != 10 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Int("t") != 10 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiIntFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "10")
-	a := App{
-		Flags: []Flag{
-			IntFlag{Name: "timeout, t", EnvVar: "COMPAT_TIMEOUT_SECONDS,APP_TIMEOUT_SECONDS"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Int("timeout") != 10 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Int("t") != 10 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiIntSlice(t *testing.T) {
-	(&App{
-		Flags: []Flag{
-			IntSliceFlag{Name: "serve, s", Value: &IntSlice{}},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.IntSlice("serve"), []int{10, 20}) {
-				t.Errorf("main name not set")
-			}
-			if !reflect.DeepEqual(ctx.IntSlice("s"), []int{10, 20}) {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run", "-s", "10", "-s", "20"})
-}
-
-func TestParseMultiIntSliceFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,40")
-
-	(&App{
-		Flags: []Flag{
-			IntSliceFlag{Name: "intervals, i", Value: &IntSlice{}, EnvVar: "APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.IntSlice("intervals"), []int{20, 30, 40}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.IntSlice("i"), []int{20, 30, 40}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiIntSliceFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,40")
-
-	(&App{
-		Flags: []Flag{
-			IntSliceFlag{Name: "intervals, i", Value: &IntSlice{}, EnvVar: "COMPAT_INTERVALS,APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.IntSlice("intervals"), []int{20, 30, 40}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.IntSlice("i"), []int{20, 30, 40}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiInt64Slice(t *testing.T) {
-	(&App{
-		Flags: []Flag{
-			Int64SliceFlag{Name: "serve, s", Value: &Int64Slice{}},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Int64Slice("serve"), []int64{10, 17179869184}) {
-				t.Errorf("main name not set")
-			}
-			if !reflect.DeepEqual(ctx.Int64Slice("s"), []int64{10, 17179869184}) {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}).Run([]string{"run", "-s", "10", "-s", "17179869184"})
-}
-
-func TestParseMultiInt64SliceFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,17179869184")
-
-	(&App{
-		Flags: []Flag{
-			Int64SliceFlag{Name: "intervals, i", Value: &Int64Slice{}, EnvVar: "APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Int64Slice("intervals"), []int64{20, 30, 17179869184}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.Int64Slice("i"), []int64{20, 30, 17179869184}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiInt64SliceFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_INTERVALS", "20,30,17179869184")
-
-	(&App{
-		Flags: []Flag{
-			Int64SliceFlag{Name: "intervals, i", Value: &Int64Slice{}, EnvVar: "COMPAT_INTERVALS,APP_INTERVALS"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Int64Slice("intervals"), []int64{20, 30, 17179869184}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.Int64Slice("i"), []int64{20, 30, 17179869184}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}).Run([]string{"run"})
-}
-
-func TestParseMultiFloat64(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			Float64Flag{Name: "serve, s"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Float64("serve") != 10.2 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Float64("s") != 10.2 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "-s", "10.2"})
-}
-
-func TestParseDestinationFloat64(t *testing.T) {
-	var dest float64
-	a := App{
-		Flags: []Flag{
-			Float64Flag{
-				Name:        "dest",
-				Destination: &dest,
-			},
-		},
-		Action: func(ctx *Context) error {
-			if dest != 10.2 {
-				t.Errorf("expected destination Float64 10.2")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--dest", "10.2"})
-}
-
-func TestParseMultiFloat64FromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
-	a := App{
-		Flags: []Flag{
-			Float64Flag{Name: "timeout, t", EnvVar: "APP_TIMEOUT_SECONDS"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Float64("timeout") != 15.5 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Float64("t") != 15.5 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiFloat64FromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_TIMEOUT_SECONDS", "15.5")
-	a := App{
-		Flags: []Flag{
-			Float64Flag{Name: "timeout, t", EnvVar: "COMPAT_TIMEOUT_SECONDS,APP_TIMEOUT_SECONDS"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Float64("timeout") != 15.5 {
-				t.Errorf("main name not set")
-			}
-			if ctx.Float64("t") != 15.5 {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiBool(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			BoolFlag{Name: "serve, s"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Bool("serve") != true {
-				t.Errorf("main name not set")
-			}
-			if ctx.Bool("s") != true {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--serve"})
-}
-
-func TestParseDestinationBool(t *testing.T) {
-	var dest bool
-	a := App{
-		Flags: []Flag{
-			BoolFlag{
-				Name:        "dest",
-				Destination: &dest,
-			},
-		},
-		Action: func(ctx *Context) error {
-			if dest != true {
-				t.Errorf("expected destination Bool true")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--dest"})
-}
-
-func TestParseMultiBoolFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_DEBUG", "1")
-	a := App{
-		Flags: []Flag{
-			BoolFlag{Name: "debug, d", EnvVar: "APP_DEBUG"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Bool("debug") != true {
-				t.Errorf("main name not set from env")
-			}
-			if ctx.Bool("d") != true {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiBoolFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_DEBUG", "1")
-	a := App{
-		Flags: []Flag{
-			BoolFlag{Name: "debug, d", EnvVar: "COMPAT_DEBUG,APP_DEBUG"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Bool("debug") != true {
-				t.Errorf("main name not set from env")
-			}
-			if ctx.Bool("d") != true {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseBoolTFromEnv(t *testing.T) {
-	var boolTFlagTests = []struct {
-		input  string
-		output bool
-	}{
-		{"", false},
-		{"1", true},
-		{"false", false},
-		{"true", true},
-	}
-
-	for _, test := range boolTFlagTests {
-		os.Clearenv()
-		os.Setenv("DEBUG", test.input)
-		a := App{
-			Flags: []Flag{
-				BoolTFlag{Name: "debug, d", EnvVar: "DEBUG"},
-			},
-			Action: func(ctx *Context) error {
-				if ctx.Bool("debug") != test.output {
-					t.Errorf("expected %+v to be parsed as %+v, instead was %+v", test.input, test.output, ctx.Bool("debug"))
-				}
-				if ctx.Bool("d") != test.output {
-					t.Errorf("expected %+v to be parsed as %+v, instead was %+v", test.input, test.output, ctx.Bool("d"))
-				}
-				return nil
-			},
-		}
-		a.Run([]string{"run"})
-	}
-}
-
-func TestParseMultiBoolT(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			BoolTFlag{Name: "serve, s"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.BoolT("serve") != true {
-				t.Errorf("main name not set")
-			}
-			if ctx.BoolT("s") != true {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--serve"})
-}
-
-func TestParseDestinationBoolT(t *testing.T) {
-	var dest bool
-	a := App{
-		Flags: []Flag{
-			BoolTFlag{
-				Name:        "dest",
-				Destination: &dest,
-			},
-		},
-		Action: func(ctx *Context) error {
-			if dest != true {
-				t.Errorf("expected destination BoolT true")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "--dest"})
-}
-
-func TestParseMultiBoolTFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_DEBUG", "0")
-	a := App{
-		Flags: []Flag{
-			BoolTFlag{Name: "debug, d", EnvVar: "APP_DEBUG"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.BoolT("debug") != false {
-				t.Errorf("main name not set from env")
-			}
-			if ctx.BoolT("d") != false {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseMultiBoolTFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_DEBUG", "0")
-	a := App{
-		Flags: []Flag{
-			BoolTFlag{Name: "debug, d", EnvVar: "COMPAT_DEBUG,APP_DEBUG"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.BoolT("debug") != false {
-				t.Errorf("main name not set from env")
-			}
-			if ctx.BoolT("d") != false {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-type Parser [2]string
-
-func (p *Parser) Set(value string) error {
-	parts := strings.Split(value, ",")
-	if len(parts) != 2 {
-		return fmt.Errorf("invalid format")
-	}
-
-	(*p)[0] = parts[0]
-	(*p)[1] = parts[1]
-
-	return nil
-}
-
-func (p *Parser) String() string {
-	return fmt.Sprintf("%s,%s", p[0], p[1])
-}
-
-func (p *Parser) Get() interface{} {
-	return p
-}
-
-func TestParseGeneric(t *testing.T) {
-	a := App{
-		Flags: []Flag{
-			GenericFlag{Name: "serve, s", Value: &Parser{}},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Generic("serve"), &Parser{"10", "20"}) {
-				t.Errorf("main name not set")
-			}
-			if !reflect.DeepEqual(ctx.Generic("s"), &Parser{"10", "20"}) {
-				t.Errorf("short name not set")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run", "-s", "10,20"})
-}
-
-func TestParseGenericFromEnv(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_SERVE", "20,30")
-	a := App{
-		Flags: []Flag{
-			GenericFlag{Name: "serve, s", Value: &Parser{}, EnvVar: "APP_SERVE"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Generic("serve"), &Parser{"20", "30"}) {
-				t.Errorf("main name not set from env")
-			}
-			if !reflect.DeepEqual(ctx.Generic("s"), &Parser{"20", "30"}) {
-				t.Errorf("short name not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
-
-func TestParseGenericFromEnvCascade(t *testing.T) {
-	os.Clearenv()
-	os.Setenv("APP_FOO", "99,2000")
-	a := App{
-		Flags: []Flag{
-			GenericFlag{Name: "foos", Value: &Parser{}, EnvVar: "COMPAT_FOO,APP_FOO"},
-		},
-		Action: func(ctx *Context) error {
-			if !reflect.DeepEqual(ctx.Generic("foos"), &Parser{"99", "2000"}) {
-				t.Errorf("value not set from env")
-			}
-			return nil
-		},
-	}
-	a.Run([]string{"run"})
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/generate-flag-types b/installer/vendor/gopkg.in/urfave/cli.v1/generate-flag-types
deleted file mode 100755
index 7147381ce3..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/generate-flag-types
+++ /dev/null
@@ -1,255 +0,0 @@
-#!/usr/bin/env python
-"""
-The flag types that ship with the cli library have many things in common, and
-so we can take advantage of the `go generate` command to create much of the
-source code from a list of definitions.  These definitions attempt to cover
-the parts that vary between flag types, and should evolve as needed.
-
-An example of the minimum definition needed is:
-
-    {
-      "name": "SomeType",
-      "type": "sometype",
-      "context_default": "nil"
-    }
-
-In this example, the code generated for the `cli` package will include a type
-named `SomeTypeFlag` that is expected to wrap a value of type `sometype`.
-Fetching values by name via `*cli.Context` will default to a value of `nil`.
-
-A more complete, albeit somewhat redundant, example showing all available
-definition keys is:
-
-    {
-      "name": "VeryMuchType",
-      "type": "*VeryMuchType",
-      "value": true,
-      "dest": false,
-      "doctail": " which really only wraps a []float64, oh well!",
-      "context_type": "[]float64",
-      "context_default": "nil",
-      "parser": "parseVeryMuchType(f.Value.String())",
-      "parser_cast": "[]float64(parsed)"
-    }
-
-The meaning of each field is as follows:
-
-               name (string) - The type "name", which will be suffixed with
-                               `Flag` when generating the type definition
-                               for `cli` and the wrapper type for `altsrc`
-               type (string) - The type that the generated `Flag` type for `cli`
-                               is expected to "contain" as its `.Value` member
-                value (bool) - Should the generated `cli` type have a `Value`
-                               member?
-                 dest (bool) - Should the generated `cli` type support a
-                               destination pointer?
-            doctail (string) - Additional docs for the `cli` flag type comment
-       context_type (string) - The literal type used in the `*cli.Context`
-                               reader func signature
-    context_default (string) - The literal value used as the default by the
-                               `*cli.Context` reader funcs when no value is
-                               present
-             parser (string) - Literal code used to parse the flag `f`,
-                               expected to have a return signature of
-                               (value, error)
-        parser_cast (string) - Literal code used to cast the `parsed` value
-                               returned from the `parser` code
-"""
-
-from __future__ import print_function, unicode_literals
-
-import argparse
-import json
-import os
-import subprocess
-import sys
-import tempfile
-import textwrap
-
-
-class _FancyFormatter(argparse.ArgumentDefaultsHelpFormatter,
-                      argparse.RawDescriptionHelpFormatter):
-    pass
-
-
-def main(sysargs=sys.argv[:]):
-    parser = argparse.ArgumentParser(
-        description='Generate flag type code!',
-        formatter_class=_FancyFormatter)
-    parser.add_argument(
-        'package',
-        type=str, default='cli', choices=_WRITEFUNCS.keys(),
-        help='Package for which flag types will be generated'
-    )
-    parser.add_argument(
-        '-i', '--in-json',
-        type=argparse.FileType('r'),
-        default=sys.stdin,
-        help='Input JSON file which defines each type to be generated'
-    )
-    parser.add_argument(
-        '-o', '--out-go',
-        type=argparse.FileType('w'),
-        default=sys.stdout,
-        help='Output file/stream to which generated source will be written'
-    )
-    parser.epilog = __doc__
-
-    args = parser.parse_args(sysargs[1:])
-    _generate_flag_types(_WRITEFUNCS[args.package], args.out_go, args.in_json)
-    return 0
-
-
-def _generate_flag_types(writefunc, output_go, input_json):
-    types = json.load(input_json)
-
-    tmp = tempfile.NamedTemporaryFile(suffix='.go', delete=False)
-    writefunc(tmp, types)
-    tmp.close()
-
-    new_content = subprocess.check_output(
-        ['goimports', tmp.name]
-    ).decode('utf-8')
-
-    print(new_content, file=output_go, end='')
-    output_go.flush()
-    os.remove(tmp.name)
-
-
-def _set_typedef_defaults(typedef):
-    typedef.setdefault('doctail', '')
-    typedef.setdefault('context_type', typedef['type'])
-    typedef.setdefault('dest', True)
-    typedef.setdefault('value', True)
-    typedef.setdefault('parser', 'f.Value, error(nil)')
-    typedef.setdefault('parser_cast', 'parsed')
-
-
-def _write_cli_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package cli
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is a flag with type {type}{doctail}
-        type {name}Flag struct {{
-            Name string
-            Usage string
-            EnvVar string
-            Hidden bool
-        """.format(**typedef))
-
-        if typedef['value']:
-            _fwrite(outfile, """\
-            Value {type}
-            """.format(**typedef))
-
-        if typedef['dest']:
-            _fwrite(outfile, """\
-            Destination *{type}
-            """.format(**typedef))
-
-        _fwrite(outfile, "\n}\n\n")
-
-        _fwrite(outfile, """\
-            // String returns a readable representation of this value
-            // (for usage defaults)
-            func (f {name}Flag) String() string {{
-                return FlagStringer(f)
-            }}
-
-            // GetName returns the name of the flag
-            func (f {name}Flag) GetName() string {{
-                return f.Name
-            }}
-
-            // {name} looks up the value of a local {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) {name}(name string) {context_type} {{
-                return lookup{name}(name, c.flagSet)
-            }}
-
-            // Global{name} looks up the value of a global {name}Flag, returns
-            // {context_default} if not found
-            func (c *Context) Global{name}(name string) {context_type} {{
-                if fs := lookupGlobalFlagSet(name, c); fs != nil {{
-                    return lookup{name}(name, fs)
-                }}
-                return {context_default}
-            }}
-
-            func lookup{name}(name string, set *flag.FlagSet) {context_type} {{
-                f := set.Lookup(name)
-                if f != nil {{
-                    parsed, err := {parser}
-                    if err != nil {{
-                        return {context_default}
-                    }}
-                    return {parser_cast}
-                }}
-                return {context_default}
-            }}
-            """.format(**typedef))
-
-
-def _write_altsrc_flag_types(outfile, types):
-    _fwrite(outfile, """\
-        package altsrc
-
-        import (
-            "gopkg.in/urfave/cli.v1"
-        )
-
-        // WARNING: This file is generated!
-
-        """)
-
-    for typedef in types:
-        _set_typedef_defaults(typedef)
-
-        _fwrite(outfile, """\
-        // {name}Flag is the flag type that wraps cli.{name}Flag to allow
-        // for other values to be specified
-        type {name}Flag struct {{
-            cli.{name}Flag
-            set *flag.FlagSet
-        }}
-
-        // New{name}Flag creates a new {name}Flag
-        func New{name}Flag(fl cli.{name}Flag) *{name}Flag {{
-            return &{name}Flag{{{name}Flag: fl, set: nil}}
-        }}
-
-        // Apply saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.Apply
-        func (f *{name}Flag) Apply(set *flag.FlagSet) {{
-            f.set = set
-            f.{name}Flag.Apply(set)
-        }}
-
-        // ApplyWithError saves the flagSet for later usage calls, then calls the
-        // wrapped {name}Flag.ApplyWithError
-        func (f *{name}Flag) ApplyWithError(set *flag.FlagSet) error {{
-            f.set = set
-            return f.{name}Flag.ApplyWithError(set)
-        }}
-        """.format(**typedef))
-
-
-def _fwrite(outfile, text):
-    print(textwrap.dedent(text), end='', file=outfile)
-
-
-_WRITEFUNCS = {
-    'cli': _write_cli_flag_types,
-    'altsrc': _write_altsrc_flag_types
-}
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/help.go b/installer/vendor/gopkg.in/urfave/cli.v1/help.go
index c8c1aee057..57ec98d58a 100644
--- a/installer/vendor/gopkg.in/urfave/cli.v1/help.go
+++ b/installer/vendor/gopkg.in/urfave/cli.v1/help.go
@@ -47,7 +47,7 @@ var CommandHelpTemplate = `NAME:
    {{.HelpName}} - {{.Usage}}
 
 USAGE:
-   {{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{if .Category}}
+   {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}}{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}{{if .Category}}
 
 CATEGORY:
    {{.Category}}{{end}}{{if .Description}}
@@ -64,10 +64,10 @@ OPTIONS:
 // cli.go uses text/template to render templates. You can
 // render custom help text by setting this variable.
 var SubcommandHelpTemplate = `NAME:
-   {{.HelpName}} - {{.Usage}}
+   {{.HelpName}} - {{if .Description}}{{.Description}}{{else}}{{.Usage}}{{end}}
 
 USAGE:
-   {{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}
+   {{if .UsageText}}{{.UsageText}}{{else}}{{.HelpName}} command{{if .VisibleFlags}} [command options]{{end}} {{if .ArgsUsage}}{{.ArgsUsage}}{{else}}[arguments...]{{end}}{{end}}
 
 COMMANDS:{{range .VisibleCategories}}{{if .Name}}
    {{.Name}}:{{end}}{{range .VisibleCommands}}
@@ -112,17 +112,42 @@ var helpSubcommand = Command{
 // Prints help for the App or Command
 type helpPrinter func(w io.Writer, templ string, data interface{})
 
+// Prints help for the App or Command with custom template function.
+type helpPrinterCustom func(w io.Writer, templ string, data interface{}, customFunc map[string]interface{})
+
 // HelpPrinter is a function that writes the help output. If not set a default
 // is used. The function signature is:
 // func(w io.Writer, templ string, data interface{})
 var HelpPrinter helpPrinter = printHelp
 
+// HelpPrinterCustom is same as HelpPrinter but
+// takes a custom function for template function map.
+var HelpPrinterCustom helpPrinterCustom = printHelpCustom
+
 // VersionPrinter prints the version for the App
 var VersionPrinter = printVersion
 
+// ShowAppHelpAndExit - Prints the list of subcommands for the app and exits with exit code.
+func ShowAppHelpAndExit(c *Context, exitCode int) {
+	ShowAppHelp(c)
+	os.Exit(exitCode)
+}
+
 // ShowAppHelp is an action that displays the help.
-func ShowAppHelp(c *Context) error {
-	HelpPrinter(c.App.Writer, AppHelpTemplate, c.App)
+func ShowAppHelp(c *Context) (err error) {
+	if c.App.CustomAppHelpTemplate == "" {
+		HelpPrinter(c.App.Writer, AppHelpTemplate, c.App)
+		return
+	}
+	customAppData := func() map[string]interface{} {
+		if c.App.ExtraInfo == nil {
+			return nil
+		}
+		return map[string]interface{}{
+			"ExtraInfo": c.App.ExtraInfo,
+		}
+	}
+	HelpPrinterCustom(c.App.Writer, c.App.CustomAppHelpTemplate, c.App, customAppData())
 	return nil
 }
 
@@ -138,6 +163,12 @@ func DefaultAppComplete(c *Context) {
 	}
 }
 
+// ShowCommandHelpAndExit - exits with code after showing help
+func ShowCommandHelpAndExit(c *Context, command string, code int) {
+	ShowCommandHelp(c, command)
+	os.Exit(code)
+}
+
 // ShowCommandHelp prints help for the given command
 func ShowCommandHelp(ctx *Context, command string) error {
 	// show the subcommand help for a command with subcommands
@@ -148,7 +179,11 @@ func ShowCommandHelp(ctx *Context, command string) error {
 
 	for _, c := range ctx.App.Commands {
 		if c.HasName(command) {
-			HelpPrinter(ctx.App.Writer, CommandHelpTemplate, c)
+			if c.CustomHelpTemplate != "" {
+				HelpPrinterCustom(ctx.App.Writer, c.CustomHelpTemplate, c, nil)
+			} else {
+				HelpPrinter(ctx.App.Writer, CommandHelpTemplate, c)
+			}
 			return nil
 		}
 	}
@@ -191,10 +226,15 @@ func ShowCommandCompletions(ctx *Context, command string) {
 	}
 }
 
-func printHelp(out io.Writer, templ string, data interface{}) {
+func printHelpCustom(out io.Writer, templ string, data interface{}, customFunc map[string]interface{}) {
 	funcMap := template.FuncMap{
 		"join": strings.Join,
 	}
+	if customFunc != nil {
+		for key, value := range customFunc {
+			funcMap[key] = value
+		}
+	}
 
 	w := tabwriter.NewWriter(out, 1, 8, 2, ' ', 0)
 	t := template.Must(template.New("help").Funcs(funcMap).Parse(templ))
@@ -210,10 +250,14 @@ func printHelp(out io.Writer, templ string, data interface{}) {
 	w.Flush()
 }
 
+func printHelp(out io.Writer, templ string, data interface{}) {
+	printHelpCustom(out, templ, data, nil)
+}
+
 func checkVersion(c *Context) bool {
 	found := false
-	if VersionFlag.Name != "" {
-		eachName(VersionFlag.Name, func(name string) {
+	if VersionFlag.GetName() != "" {
+		eachName(VersionFlag.GetName(), func(name string) {
 			if c.GlobalBool(name) || c.Bool(name) {
 				found = true
 			}
@@ -224,8 +268,8 @@ func checkVersion(c *Context) bool {
 
 func checkHelp(c *Context) bool {
 	found := false
-	if HelpFlag.Name != "" {
-		eachName(HelpFlag.Name, func(name string) {
+	if HelpFlag.GetName() != "" {
+		eachName(HelpFlag.GetName(), func(name string) {
 			if c.GlobalBool(name) || c.Bool(name) {
 				found = true
 			}
@@ -260,7 +304,7 @@ func checkShellCompleteFlag(a *App, arguments []string) (bool, []string) {
 	pos := len(arguments) - 1
 	lastArg := arguments[pos]
 
-	if lastArg != "--"+BashCompletionFlag.Name {
+	if lastArg != "--"+BashCompletionFlag.GetName() {
 		return false, arguments
 	}
 
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/help_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/help_test.go
deleted file mode 100644
index 7c15400003..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/help_test.go
+++ /dev/null
@@ -1,289 +0,0 @@
-package cli
-
-import (
-	"bytes"
-	"flag"
-	"strings"
-	"testing"
-)
-
-func Test_ShowAppHelp_NoAuthor(t *testing.T) {
-	output := new(bytes.Buffer)
-	app := NewApp()
-	app.Writer = output
-
-	c := NewContext(app, nil, nil)
-
-	ShowAppHelp(c)
-
-	if bytes.Index(output.Bytes(), []byte("AUTHOR(S):")) != -1 {
-		t.Errorf("expected\n%snot to include %s", output.String(), "AUTHOR(S):")
-	}
-}
-
-func Test_ShowAppHelp_NoVersion(t *testing.T) {
-	output := new(bytes.Buffer)
-	app := NewApp()
-	app.Writer = output
-
-	app.Version = ""
-
-	c := NewContext(app, nil, nil)
-
-	ShowAppHelp(c)
-
-	if bytes.Index(output.Bytes(), []byte("VERSION:")) != -1 {
-		t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:")
-	}
-}
-
-func Test_ShowAppHelp_HideVersion(t *testing.T) {
-	output := new(bytes.Buffer)
-	app := NewApp()
-	app.Writer = output
-
-	app.HideVersion = true
-
-	c := NewContext(app, nil, nil)
-
-	ShowAppHelp(c)
-
-	if bytes.Index(output.Bytes(), []byte("VERSION:")) != -1 {
-		t.Errorf("expected\n%snot to include %s", output.String(), "VERSION:")
-	}
-}
-
-func Test_Help_Custom_Flags(t *testing.T) {
-	oldFlag := HelpFlag
-	defer func() {
-		HelpFlag = oldFlag
-	}()
-
-	HelpFlag = BoolFlag{
-		Name:  "help, x",
-		Usage: "show help",
-	}
-
-	app := App{
-		Flags: []Flag{
-			BoolFlag{Name: "foo, h"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Bool("h") != true {
-				t.Errorf("custom help flag not set")
-			}
-			return nil
-		},
-	}
-	output := new(bytes.Buffer)
-	app.Writer = output
-	app.Run([]string{"test", "-h"})
-	if output.Len() > 0 {
-		t.Errorf("unexpected output: %s", output.String())
-	}
-}
-
-func Test_Version_Custom_Flags(t *testing.T) {
-	oldFlag := VersionFlag
-	defer func() {
-		VersionFlag = oldFlag
-	}()
-
-	VersionFlag = BoolFlag{
-		Name:  "version, V",
-		Usage: "show version",
-	}
-
-	app := App{
-		Flags: []Flag{
-			BoolFlag{Name: "foo, v"},
-		},
-		Action: func(ctx *Context) error {
-			if ctx.Bool("v") != true {
-				t.Errorf("custom version flag not set")
-			}
-			return nil
-		},
-	}
-	output := new(bytes.Buffer)
-	app.Writer = output
-	app.Run([]string{"test", "-v"})
-	if output.Len() > 0 {
-		t.Errorf("unexpected output: %s", output.String())
-	}
-}
-
-func Test_helpCommand_Action_ErrorIfNoTopic(t *testing.T) {
-	app := NewApp()
-
-	set := flag.NewFlagSet("test", 0)
-	set.Parse([]string{"foo"})
-
-	c := NewContext(app, set, nil)
-
-	err := helpCommand.Action.(func(*Context) error)(c)
-
-	if err == nil {
-		t.Fatalf("expected error from helpCommand.Action(), but got nil")
-	}
-
-	exitErr, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected ExitError from helpCommand.Action(), but instead got: %v", err.Error())
-	}
-
-	if !strings.HasPrefix(exitErr.Error(), "No help topic for") {
-		t.Fatalf("expected an unknown help topic error, but got: %v", exitErr.Error())
-	}
-
-	if exitErr.exitCode != 3 {
-		t.Fatalf("expected exit value = 3, got %d instead", exitErr.exitCode)
-	}
-}
-
-func Test_helpCommand_InHelpOutput(t *testing.T) {
-	app := NewApp()
-	output := &bytes.Buffer{}
-	app.Writer = output
-	app.Run([]string{"test", "--help"})
-
-	s := output.String()
-
-	if strings.Contains(s, "\nCOMMANDS:\nGLOBAL OPTIONS:\n") {
-		t.Fatalf("empty COMMANDS section detected: %q", s)
-	}
-
-	if !strings.Contains(s, "help, h") {
-		t.Fatalf("missing \"help, h\": %q", s)
-	}
-}
-
-func Test_helpSubcommand_Action_ErrorIfNoTopic(t *testing.T) {
-	app := NewApp()
-
-	set := flag.NewFlagSet("test", 0)
-	set.Parse([]string{"foo"})
-
-	c := NewContext(app, set, nil)
-
-	err := helpSubcommand.Action.(func(*Context) error)(c)
-
-	if err == nil {
-		t.Fatalf("expected error from helpCommand.Action(), but got nil")
-	}
-
-	exitErr, ok := err.(*ExitError)
-	if !ok {
-		t.Fatalf("expected ExitError from helpCommand.Action(), but instead got: %v", err.Error())
-	}
-
-	if !strings.HasPrefix(exitErr.Error(), "No help topic for") {
-		t.Fatalf("expected an unknown help topic error, but got: %v", exitErr.Error())
-	}
-
-	if exitErr.exitCode != 3 {
-		t.Fatalf("expected exit value = 3, got %d instead", exitErr.exitCode)
-	}
-}
-
-func TestShowAppHelp_CommandAliases(t *testing.T) {
-	app := &App{
-		Commands: []Command{
-			{
-				Name:    "frobbly",
-				Aliases: []string{"fr", "frob"},
-				Action: func(ctx *Context) error {
-					return nil
-				},
-			},
-		},
-	}
-
-	output := &bytes.Buffer{}
-	app.Writer = output
-	app.Run([]string{"foo", "--help"})
-
-	if !strings.Contains(output.String(), "frobbly, fr, frob") {
-		t.Errorf("expected output to include all command aliases; got: %q", output.String())
-	}
-}
-
-func TestShowCommandHelp_CommandAliases(t *testing.T) {
-	app := &App{
-		Commands: []Command{
-			{
-				Name:    "frobbly",
-				Aliases: []string{"fr", "frob", "bork"},
-				Action: func(ctx *Context) error {
-					return nil
-				},
-			},
-		},
-	}
-
-	output := &bytes.Buffer{}
-	app.Writer = output
-	app.Run([]string{"foo", "help", "fr"})
-
-	if !strings.Contains(output.String(), "frobbly") {
-		t.Errorf("expected output to include command name; got: %q", output.String())
-	}
-
-	if strings.Contains(output.String(), "bork") {
-		t.Errorf("expected output to exclude command aliases; got: %q", output.String())
-	}
-}
-
-func TestShowSubcommandHelp_CommandAliases(t *testing.T) {
-	app := &App{
-		Commands: []Command{
-			{
-				Name:    "frobbly",
-				Aliases: []string{"fr", "frob", "bork"},
-				Action: func(ctx *Context) error {
-					return nil
-				},
-			},
-		},
-	}
-
-	output := &bytes.Buffer{}
-	app.Writer = output
-	app.Run([]string{"foo", "help"})
-
-	if !strings.Contains(output.String(), "frobbly, fr, frob, bork") {
-		t.Errorf("expected output to include all command aliases; got: %q", output.String())
-	}
-}
-
-func TestShowAppHelp_HiddenCommand(t *testing.T) {
-	app := &App{
-		Commands: []Command{
-			{
-				Name: "frobbly",
-				Action: func(ctx *Context) error {
-					return nil
-				},
-			},
-			{
-				Name:   "secretfrob",
-				Hidden: true,
-				Action: func(ctx *Context) error {
-					return nil
-				},
-			},
-		},
-	}
-
-	output := &bytes.Buffer{}
-	app.Writer = output
-	app.Run([]string{"app", "--help"})
-
-	if strings.Contains(output.String(), "secretfrob") {
-		t.Errorf("expected output to exclude \"secretfrob\"; got: %q", output.String())
-	}
-
-	if !strings.Contains(output.String(), "frobbly") {
-		t.Errorf("expected output to include \"frobbly\"; got: %q", output.String())
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/helpers_test.go
deleted file mode 100644
index 109ea7ad91..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_test.go
+++ /dev/null
@@ -1,28 +0,0 @@
-package cli
-
-import (
-	"os"
-	"reflect"
-	"runtime"
-	"strings"
-	"testing"
-)
-
-var (
-	wd, _ = os.Getwd()
-)
-
-func expect(t *testing.T, a interface{}, b interface{}) {
-	_, fn, line, _ := runtime.Caller(1)
-	fn = strings.Replace(fn, wd+"/", "", -1)
-
-	if !reflect.DeepEqual(a, b) {
-		t.Errorf("(%s:%d) Expected %v (type %v) - Got %v (type %v)", fn, line, b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
-
-func refute(t *testing.T, a interface{}, b interface{}) {
-	if reflect.DeepEqual(a, b) {
-		t.Errorf("Did not expect %v (type %v) - Got %v (type %v)", b, reflect.TypeOf(b), a, reflect.TypeOf(a))
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_unix_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/helpers_unix_test.go
deleted file mode 100644
index ae27fc5c8a..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_unix_test.go
+++ /dev/null
@@ -1,9 +0,0 @@
-// +build darwin dragonfly freebsd linux netbsd openbsd solaris
-
-package cli
-
-import "os"
-
-func clearenv() {
-	os.Clearenv()
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_windows_test.go b/installer/vendor/gopkg.in/urfave/cli.v1/helpers_windows_test.go
deleted file mode 100644
index 4eb84f9b9d..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/helpers_windows_test.go
+++ /dev/null
@@ -1,20 +0,0 @@
-package cli
-
-import (
-	"os"
-	"syscall"
-)
-
-// os.Clearenv() doesn't actually unset variables on Windows
-// See: https://github.com/golang/go/issues/17902
-func clearenv() {
-	for _, s := range os.Environ() {
-		for j := 1; j < len(s); j++ {
-			if s[j] == '=' {
-				keyp, _ := syscall.UTF16PtrFromString(s[0:j])
-				syscall.SetEnvironmentVariable(keyp, nil)
-				break
-			}
-		}
-	}
-}
diff --git a/installer/vendor/gopkg.in/urfave/cli.v1/runtests b/installer/vendor/gopkg.in/urfave/cli.v1/runtests
deleted file mode 100755
index ee22bdeed5..0000000000
--- a/installer/vendor/gopkg.in/urfave/cli.v1/runtests
+++ /dev/null
@@ -1,122 +0,0 @@
-#!/usr/bin/env python
-from __future__ import print_function
-
-import argparse
-import os
-import sys
-import tempfile
-
-from subprocess import check_call, check_output
-
-
-PACKAGE_NAME = os.environ.get(
-    'CLI_PACKAGE_NAME', 'github.com/urfave/cli'
-)
-
-
-def main(sysargs=sys.argv[:]):
-    targets = {
-        'vet': _vet,
-        'test': _test,
-        'gfmrun': _gfmrun,
-        'toc': _toc,
-        'gen': _gen,
-    }
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        'target', nargs='?', choices=tuple(targets.keys()), default='test'
-    )
-    args = parser.parse_args(sysargs[1:])
-
-    targets[args.target]()
-    return 0
-
-
-def _test():
-    if check_output('go version'.split()).split()[2] < 'go1.2':
-        _run('go test -v .')
-        return
-
-    coverprofiles = []
-    for subpackage in ['', 'altsrc']:
-        coverprofile = 'cli.coverprofile'
-        if subpackage != '':
-            coverprofile = '{}.coverprofile'.format(subpackage)
-
-        coverprofiles.append(coverprofile)
-
-        _run('go test -v'.split() + [
-            '-coverprofile={}'.format(coverprofile),
-            ('{}/{}'.format(PACKAGE_NAME, subpackage)).rstrip('/')
-        ])
-
-    combined_name = _combine_coverprofiles(coverprofiles)
-    _run('go tool cover -func={}'.format(combined_name))
-    os.remove(combined_name)
-
-
-def _gfmrun():
-    go_version = check_output('go version'.split()).split()[2]
-    if go_version < 'go1.3':
-        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
-        return
-    _run(['gfmrun', '-c', str(_gfmrun_count()), '-s', 'README.md'])
-
-
-def _vet():
-    _run('go vet ./...')
-
-
-def _toc():
-    _run('node_modules/.bin/markdown-toc -i README.md')
-    _run('git diff --exit-code')
-
-
-def _gen():
-    go_version = check_output('go version'.split()).split()[2]
-    if go_version < 'go1.5':
-        print('runtests: skip on {}'.format(go_version), file=sys.stderr)
-        return
-
-    _run('go generate ./...')
-    _run('git diff --exit-code')
-
-
-def _run(command):
-    if hasattr(command, 'split'):
-        command = command.split()
-    print('runtests: {}'.format(' '.join(command)), file=sys.stderr)
-    check_call(command)
-
-
-def _gfmrun_count():
-    with open('README.md') as infile:
-        lines = infile.read().splitlines()
-        return len(filter(_is_go_runnable, lines))
-
-
-def _is_go_runnable(line):
-    return line.startswith('package main')
-
-
-def _combine_coverprofiles(coverprofiles):
-    combined = tempfile.NamedTemporaryFile(
-        suffix='.coverprofile', delete=False
-    )
-    combined.write('mode: set\n')
-
-    for coverprofile in coverprofiles:
-        with open(coverprofile, 'r') as infile:
-            for line in infile.readlines():
-                if not line.startswith('mode: '):
-                    combined.write(line)
-
-    combined.flush()
-    name = combined.name
-    combined.close()
-    return name
-
-
-if __name__ == '__main__':
-    sys.exit(main())
diff --git a/tests/manual-test-cases/Group6-OVA-TLS/6-01-OVA-TLS.robot b/tests/manual-test-cases/Group6-OVA-TLS/6-01-OVA-TLS.robot
index 7d1d3a6a31..9b5635f942 100644
--- a/tests/manual-test-cases/Group6-OVA-TLS/6-01-OVA-TLS.robot
+++ b/tests/manual-test-cases/Group6-OVA-TLS/6-01-OVA-TLS.robot
@@ -28,6 +28,7 @@ Test Environment Setup
     [Timeout]    110 minutes
     Setup Simple VC And Test Environment
     Set Environment Variable  DOMAIN              eng.vmware.com
+    Set Test VC Variables
 
 *** Test Cases ***
 User Provided Certificate
@@ -50,7 +51,7 @@ User Provided Certificate
     Log  ${tls_cert_key}
     Log  ${ca_cert}
 
-    ${ova-ip}=  Install VIC Product OVA And Initialize Using UI  vic-*.ova  %{OVA_NAME}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}
+    ${ova-ip}=  Install And Initialize VIC Product OVA  vic-*.ova  %{OVA_NAME}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}
 
     Wait Until Keyword Succeeds  10x  15s  Verify VIC Appliance TLS Certificates  ${ova-ip}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
     Cleanup Generated Certificate
@@ -76,7 +77,7 @@ User Provided Certificate PKCS8
     Log  ${tls_cert_key}
     Log  ${ca_cert}
 
-    ${ova-ip}=  Install VIC Product OVA And Initialize Using UI  vic-*.ova  %{OVA_NAME}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}
+    ${ova-ip}=  Install And Initialize VIC Product OVA  vic-*.ova  %{OVA_NAME}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}
 
     Wait Until Keyword Succeeds  10x  15s  Verify VIC Appliance TLS Certificates  ${ova-ip}  issuer=/C=US/ST=California/L=Los Angeles/O=Stark Enterprises/OU=Stark Enterprises Certificate Authority/CN=Stark Enterprises Global CA
     Cleanup Generated Certificate
diff --git a/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.md b/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.md
new file mode 100644
index 0000000000..2df6b36017
--- /dev/null
+++ b/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.md
@@ -0,0 +1,23 @@
+Test 9-1 - VIC UI Installation
+======
+
+# Purpose:
+To test all possible installation failures and success scenarios on VCSA
+
+# References:
+
+# Environment:
+* Testing VIC UI requires a working VCSA setup
+
+# Test Steps:
+1. Ensure UI plugin is not registered with VC before testing
+2. Try installing UI with invalid vCenter IP
+3. Try installing UI with wrong vCenter credentials
+4. Try installing UI with unmatching VCSA fingerprint
+5. Install UI successfully
+6. Try upgrading UI when it is already installed
+
+# Expected Outcome:
+* Each step should return success
+
+# Possible Problems:
diff --git a/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.robot b/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.robot
new file mode 100644
index 0000000000..44901e997e
--- /dev/null
+++ b/tests/manual-test-cases/Group9-VIC-UI/9-1-VIC-UI-Installer.robot
@@ -0,0 +1,50 @@
+# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+*** Settings ***
+Documentation  Test 9-1 - VIC UI Installation
+Resource  ../../resources/Util.robot
+Suite Setup  VIC UI OVA Setup
+Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
+
+*** Test Cases ***
+Attempt To Install To A Non vCenter Server
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${html5}  not-a-vcenter-server
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${flex}  not-a-vcenter-server
+    Should Contain  ${status}  ${fail}
+
+Attempt To Install With Wrong Vcenter Credentials
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${html5}  %{TEST_URL}  %{TEST_USERNAME}_nope  %{TEST_PASSWORD}_nope
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${flex}  %{TEST_URL}  %{TEST_USERNAME}_nope  %{TEST_PASSWORD}_nope
+    Should Contain  ${status}  ${fail}
+    
+Attempt to Install With Unmatching Fingerprint
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${html5}  %{TEST_URL}  %{TEST_USERNAME}  %{TEST_PASSWORD}  ff:ff
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Install UI Plugin  %{OVA_IP}  ${flex}  %{TEST_URL}  %{TEST_USERNAME}  %{TEST_PASSWORD}  ff:ff
+    Should Contain  ${status}  ${fail}
+
+Install Plugin Successfully
+    ${status}=  Install UI Plugin  %{OVA_IP}  ${html5}
+    Should Be Equal As Integers  ${status}  ${ok}
+    ${status}=  Install UI Plugin  %{OVA_IP}  ${flex}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+Upgrade Plugin Successfully
+    ${status}=  Upgrade UI Plugin  %{OVA_IP}  ${html5}
+    Should Be Equal As Integers  ${status}  ${ok}
+    ${status}=  Upgrade UI Plugin  %{OVA_IP}  ${flex}
+    Should Be Equal As Integers  ${status}  ${ok}
diff --git a/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.md b/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.md
new file mode 100644
index 0000000000..1aa0ce7c13
--- /dev/null
+++ b/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.md
@@ -0,0 +1,22 @@
+Test 9-2 - VIC UI Uninstallation
+======
+
+# Purpose:
+To test all possible uninstallation failures and success scenarios on VCSA
+
+# References:
+
+# Environment:
+* Testing VIC UI requires a working VCSA setup
+
+# Test Steps:
+1. Ensure UI plugin is not registered with VC before testing
+2. Try uninstalling UI with wrong vCenter IP
+3. Try uninstalling UI with wrong vCenter credentials
+4. Uninstall UI successfully
+5. Try uninstalling UI when it's already uninstalled
+
+# Expected Outcome:
+* Each step should return success
+
+# Possible Problems:
diff --git a/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.robot b/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.robot
new file mode 100644
index 0000000000..33fad7a6f8
--- /dev/null
+++ b/tests/manual-test-cases/Group9-VIC-UI/9-2-VIC-UI-Uninstaller.robot
@@ -0,0 +1,50 @@
+# Copyright 2016-2017 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#	http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+*** Settings ***
+Documentation  Test 9-2 - VIC UI Uninstallation
+Resource  ../../resources/Util.robot
+Suite Setup  Uninstall OVA Setup
+Suite Teardown  Run Keyword And Ignore Error  Nimbus Cleanup  ${list}
+
+*** Keywords *** 
+Uninstall OVA Setup
+    Run Keyword  VIC UI OVA Setup
+    ${status}=  Install UI Plugin  %{OVA_IP}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+*** Test Cases ***
+Attempt To Uninstall From A Non vCenter Server
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${html5}  not-a-vcenter-server
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${flex}  not-a-vcenter-server
+    Should Contain  ${status}  ${fail}
+
+Attempt To Uninstall With Wrong Vcenter Credentials
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${html5}  %{TEST_URL}  %{TEST_USERNAME}_nope  %{TEST_PASSWORD}_nope
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${flex}  %{TEST_URL}  %{TEST_USERNAME}_nope  %{TEST_PASSWORD}_nope
+    Should Contain  ${status}  ${fail}
+
+Uninstall Successfully
+    ${status}=  Remove UI Plugin  %{OVA_IP}  ${html5}
+    Should Be Equal As Integers  ${status}  ${ok}
+    ${status}=  Remove UI Plugin  %{OVA_IP}  ${flex}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+Attempt To Uninstall Plugin That Is Already Gone
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${html5}
+    Should Contain  ${status}  ${fail}
+    ${status}=  Run Keyword And Ignore Error  Remove UI Plugin  %{OVA_IP}  ${flex}
+    Should Contain  ${status}  ${fail}
diff --git a/tests/manual-test-cases/Group9-VIC-UI/TestCases.md b/tests/manual-test-cases/Group9-VIC-UI/TestCases.md
new file mode 100644
index 0000000000..fede83a417
--- /dev/null
+++ b/tests/manual-test-cases/Group9-VIC-UI/TestCases.md
@@ -0,0 +1,7 @@
+Group 9 - VIC UI
+=======
+
+[Test 9-1 - VIC UI Installation](9-1-VIC-UI-Installer.md)
+-
+[Test 9-2 - VIC UI Uninstallation](9-2-VIC-UI-Uninstaller.md)
+-
diff --git a/tests/manual-test-cases/TestGroups.md b/tests/manual-test-cases/TestGroups.md
index 2eb37a4f2c..c688f49de8 100644
--- a/tests/manual-test-cases/TestGroups.md
+++ b/tests/manual-test-cases/TestGroups.md
@@ -12,3 +12,4 @@ VIC Integration Test Suite
 -
 [Group 8 - Manual Upgrade](Group8-Manual-Upgrade/TestCases.md)
 -
+[Group 9 - VIC UI](Group18-VIC-UI/TestCases.md)
\ No newline at end of file
diff --git a/tests/resources/Nimbus-Util.robot b/tests/resources/Nimbus-Util.robot
index 16bc91e31f..e1dc161084 100644
--- a/tests/resources/Nimbus-Util.robot
+++ b/tests/resources/Nimbus-Util.robot
@@ -307,6 +307,7 @@ Create a VSAN Cluster
     Set Environment Variable  TEST_DATASTORE  vsanDatastore
     Set Environment Variable  TEST_RESOURCE  cls
     Set Environment Variable  TEST_TIMEOUT  15m
+    Set Test VC Variables
 
     Gather Host IPs
 
@@ -361,6 +362,8 @@ Create a Simple VC Cluster
     Set Environment Variable  TEST_DATACENTER  /${datacenter}
     Set Environment Variable  TEST_RESOURCE  ${cluster}
     Set Environment Variable  TEST_TIMEOUT  30m
+    Set Test VC Variables
+
     [Return]  @{esx_names}  ${vc}  @{esx_ips}  ${vc_ip}
 
 Setup Network For Simple VC Cluster
@@ -534,6 +537,7 @@ Create Simple VC Cluster With Static IP
     Set Environment Variable  TEST_DATASTORE  nfs0-1
     Set Environment Variable  TEST_RESOURCE  cls
     Set Environment Variable  TEST_TIMEOUT  15m
+    Set Test VC Variables
 
 Create Static IP Worker
     Open Connection  %{NIMBUS_GW}
@@ -597,3 +601,4 @@ Nimbus Suite Setup
     ${useDelay}=     Get Environment Variable  NIMBUS_RETRY_DELAY     1m
 
     Wait Until Keyword Succeeds  ${useAttempts}x  ${useDelay}  ${keyword}  @{varargs}
+
diff --git a/tests/resources/OVA-Util.robot b/tests/resources/OVA-Util.robot
index 201e2079dd..3ce8532f5f 100644
--- a/tests/resources/OVA-Util.robot
+++ b/tests/resources/OVA-Util.robot
@@ -96,29 +96,16 @@ Install And Initialize VIC Product OVA
     Deploy VIC Appliance  ${ova-file}  ${ova-name}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}  ${static-ip}  ${netmask}  ${gateway}  ${dns}  ${searchpath}  ${fqdn}  ${power}
     Initialize OVA From API  %{OVA_IP}
 
-Install VIC Product OVA And Initialize Using UI
-    # Deploy OVA and initialize it using browser UI
-    [Arguments]  ${ova-file}  ${ova-name}  ${tls_cert}=${EMPTY}  ${tls_cert_key}=${EMPTY}  ${ca_cert}=${EMPTY}  ${static-ip}=${EMPTY}  ${netmask}=${EMPTY}  ${gateway}=${EMPTY}  ${dns}=${EMPTY}  ${searchpath}=${EMPTY}  ${fqdn}=${EMPTY}  ${power}=True
-    Log To Console  \nInstalling VIC appliance
-    Install VIC Product OVA And Wait For Home Page  ${ova-file}  ${ova-name}  ${tls_cert}  ${tls_cert_key}  ${ca_cert}  ${static-ip}  ${netmask}  ${gateway}  ${dns}  ${searchpath}  ${fqdn}  ${power}
-
-    # Initialize appliance using UI
-    Log To Console  Initializing the OVA using the getting started ui...
-    Set Browser Variables
-    Open Firefox Browser
-    Log In And Complete OVA Installation
-    Close All Browsers
-
-    # Wait for components to start
+    # wait for component services to get started
     Wait For Online Components  %{OVA_IP}
     Wait For SSO Redirect  %{OVA_IP}
-
+    Wait For OVA Home Page  %{OVA_IP}
     [Return]  %{OVA_IP}
 
 Install And Initialize Common OVA If Not Already
     [Arguments]  ${ova-file}
     ${rc}=  Set Test OVA IP If Available
-    ${ova-ip}=  Run Keyword Unless  ${rc} == 0  Install VIC Product OVA And Initialize Using UI  ${ova-file}  %{OVA_NAME}
+    ${ova-ip}=  Run Keyword Unless  ${rc} == 0  Install And Initialize VIC Product OVA  ${ova-file}  %{OVA_NAME}
 
 Setup And Install Specific OVA Version
     [Arguments]  ${ova-file}  ${ova-name}
@@ -128,7 +115,7 @@ Setup And Install Specific OVA Version
     Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
     # install OVA appliance
     Log To Console  \nInstall specific version of OVA...
-    Install VIC Product OVA And Initialize Using UI  ${ova-file}  ${ova-name}
+    Install And Initialize VIC Product OVA  ${ova-file}  ${ova-name}
 
 Download VIC Engine
     [Arguments]  ${ova-ip}  ${target_dir}=bin
@@ -160,7 +147,7 @@ Initialize OVA From API
 
     Log To Console  \nInitializing VIC appliance by API when API is available
     :FOR  ${i}  IN RANGE  30
-    \   ${rc}  ${out}=  Run And Return Rc And Output  curl -k -s -o /dev/null -w "\%{http_code}\\n" --header "Content-Type: application/json" -X POST --data '{"target":"%{TEST_URL}:443","user":"%{TEST_USERNAME}","password":"%{TEST_PASSWORD}","externalpsc":"%{EXTERNAL_PSC}","pscdomain":"%{PSC_DOMAIN}"}' https://${ova-ip}:9443/register
+    \   ${rc}  ${out}=  Run And Return Rc And Output  curl -k -s -o /dev/null -w "\%{http_code}\\n" --header "Content-Type: application/json" -X POST --data '{"target":"%{TEST_URL}:443","user":"%{TEST_USERNAME}","password":"%{TEST_PASSWORD}","thumbprint":"${TEST_THUMBPRINT}","externalpsc":"%{EXTERNAL_PSC}","pscdomain":"%{PSC_DOMAIN}"}' https://${ova-ip}:9443/register
     \   Exit For Loop If  '200' in '''${out}'''
     \   Sleep  60s
     Log To Console  ${rc}
@@ -360,7 +347,7 @@ Auto Upgrade OVA With Verification
     Set Environment Variable  OVA_NAME  ${test-name}-LATEST
     Set Global Variable  ${OVA_USERNAME_ROOT}  root
     Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
-    Install VIC Product OVA And Wait For Home Page  vic-*.ova  %{OVA_NAME}
+    Install VIC Product OVA And Wait For Home Page  ${local_ova_file}  %{OVA_NAME}
 
     Execute Upgrade Script  %{OVA_IP}  %{OVA_IP_OLD}  ${old-ova-datacenter}  ${old-ova-version}
     Verify Running Busybox Container And Its Pushed Harbor Image  %{OVA_IP}  ${sample-image-tag}  ${new-ova-cert-path}  docker-endpoint=${VCH-PARAMS}
@@ -481,7 +468,7 @@ Manual Upgrade Environment Setup
 
     # Deploy new appliance but do not power on
     Set Environment Variable  OVA_NAME  ${new-appliance-name}
-    ${output}=  Deploy VIC Appliance  vic-*.ova  %{OVA_NAME}  power=False
+    ${output}=  Deploy VIC Appliance  ${local_ova_file}  %{OVA_NAME}  power=False
 
 Power On Appliance
     [Arguments]  ${new-appliance-name}
diff --git a/tests/resources/Util.robot b/tests/resources/Util.robot
index 418bf4f3e9..32ae77e67a 100644
--- a/tests/resources/Util.robot
+++ b/tests/resources/Util.robot
@@ -28,6 +28,7 @@ Resource  UI-Util.robot
 Resource  Docker-Util.robot
 Resource  Nimbus-Util.robot
 Resource  VM-Util.robot
+Resource  VIC-UI-Util.robot
 Library  Selenium2Library  timeout=30  implicit_wait=15  run_on_failure=Capture Page Screenshot  screenshot_root_directory=test-screenshots
 # UI page object utils
 Resource  page-objects/Getting-Started-Page-Util.robot
@@ -47,6 +48,9 @@ Resource  page-objects/Project-Repositories-Page-Util.robot
 Resource  page-objects/Vsphere-VCH-Plugin-Util.robot
 Resource  page-objects/Vsphere-UI-Util.robot
 
+*** Variables ***
+${local_ova_file}=  vic-*.ova
+
 *** Keywords ***
 Global Environment Setup
     [Tags]  secret
diff --git a/tests/resources/VIC-UI-Util.robot b/tests/resources/VIC-UI-Util.robot
new file mode 100644
index 0000000000..bf151e412a
--- /dev/null
+++ b/tests/resources/VIC-UI-Util.robot
@@ -0,0 +1,110 @@
+# Copyright 2018 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License
+
+*** Settings ***
+Documentation  This resource provides any keywords related to VIC Product UI Installer
+Resource  ../resources/Util.robot
+
+*** Variables ***
+${ok}=  204
+${html5}=  H5
+${flex}=  FLEX
+${fail}=  FAIL
+
+*** Keywords ***
+Install UI Plugin
+    [Arguments]  ${ova-ip}  ${plugin_preset}  ${vc}=%{TEST_URL}  ${vc_user}=%{TEST_USERNAME}  ${vc_pass}=%{TEST_PASSWORD}  ${vc_thumbprint}=${TEST_THUMBPRINT}
+    Log To Console  \nInstalling the vic ui plugin...
+    ${status}=  Call UI API With Preset  ${ova-ip}  install  ${plugin_preset}  ${vc}  ${vc_user}  ${vc_pass}  ${vc_thumbprint}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+    [Return]  ${status}
+
+Remove UI Plugin
+    [Arguments]  ${ova-ip}  ${plugin_preset}  ${vc}=%{TEST_URL}  ${vc_user}=%{TEST_USERNAME}  ${vc_pass}=%{TEST_PASSWORD}  ${vc_thumbprint}=${TEST_THUMBPRINT}
+    Log To Console  \nUninstalling the vic ui plugin...
+    ${status}=  Call UI API With Preset  ${ova-ip}  remove  ${plugin_preset}  ${vc}  ${vc_user}  ${vc_pass}  ${vc_thumbprint}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+    [Return]  ${status}
+
+Upgrade UI Plugin
+    [Arguments]  ${ova-ip}  ${plugin_preset}  ${vc}=%{TEST_URL}  ${vc_user}=%{TEST_USERNAME}  ${vc_pass}=%{TEST_PASSWORD}  ${vc_thumbprint}=${TEST_THUMBPRINT}
+    Log To Console  \nUpgrading the vic ui plugin...
+    ${status}=  Call UI API With Preset  ${ova-ip}  upgrade  ${plugin_preset}  ${vc}  ${vc_user}  ${vc_pass}  ${vc_thumbprint}
+    Should Be Equal As Integers  ${status}  ${ok}
+
+    [Return]  ${status}
+
+Call UI API With Preset
+    [Arguments]  ${ova_ip}  ${action}  ${plugin_preset}  ${vc}=%{TEST_URL}  ${vc_user}=%{TEST_USERNAME}  ${vc_pass}=%{TEST_PASSWORD}  ${vc_thumbprint}=${TEST_THUMBPRINT}
+
+    :FOR  ${i}  IN RANGE  10
+    \   ${rc}  ${out}=  Run And Return Rc And Output  curl -k -w "\%{http_code}\\n" --header "Content-Type: application/json" -X POST --data '{"vc":{"target":"${vc}:443","user":"${vc_user}","password":"${vc_pass}","thumbprint":"${vc_thumbprint}"},"plugin":{"preset":"${plugin_preset}"}}' https://${ova_ip}:9443/plugin/${action}
+    \   ${out}  ${status}=  Split String From Right  ${out}  \n  1
+    \   Exit For Loop If  '${ok}' == '${status}'
+    \   Sleep  10s
+    Log To Console  ${rc}
+    Log To Console  ${out}
+
+    [Return]  ${status}
+
+Deploy OVA And Install UI Plugin And Run Regression Tests
+    # Deploy OVA and then install UI plugin
+    # run regression tests on UI wizard and docker commands on VCH created using UI
+    [Arguments]  ${test-name}  ${ova-file}  ${datastore}  ${bridge-network}  ${public-network}  ${ops-user}  ${ops-pwd}  ${have-nested}=${TRUE}
+    Log To Console  \nStarting test ${test-name}...
+    Set Environment Variable  OVA_NAME  OVA-${test-name}
+    Set Global Variable  ${OVA_USERNAME_ROOT}  root
+    Set Global Variable  ${OVA_PASSWORD_ROOT}  e2eFunctionalTest
+    # install ova
+    Install And Initialize VIC Product OVA  ${ova-file}  %{OVA_NAME}
+    # set browser variables
+    Set Browser Variables
+    # Install VIC Plugin
+    Download VIC And Install UI Plugin  %{OVA_IP}
+    # create vch using UI
+    # retry UI steps if failed
+    Wait Until Keyword Succeeds  3x  1m  Create VCH using UI And Set Docker Parameters  ${test-name}  ${datastore}  ${bridge-network}  ${public-network}  ${ops-user}  ${ops-pwd}  ${have-nested}
+    # run vch regression tests
+    Run Docker Regression Tests For VCH
+
+Download VIC And Install UI Plugin
+    [Arguments]  ${ova-ip}
+    Open Connection  %{TEST_URL}
+    Wait Until Keyword Succeeds  10x  5s  Login  root  vmware
+
+    # extract vic bundle name
+    ${download_url}=  Run command and Return output  curl -k https://${ova-ip}:9443 | grep -Po -m 1 '(?<=href=")[^"]*tar.gz'
+    Log  ${download_url}
+    ${first}  ${rest}=  Split String From Right  ${download_url}  /  1
+
+    Set Global Variable  ${VIC_BUNDLE}  ${rest}
+    Execute Command And Return Output  curl -kL https://${ova-ip}:9443/files/${VIC_BUNDLE} -o ${VIC_BUNDLE}
+    Execute Command And Return Output  tar -zxf ${VIC_BUNDLE}
+    Install UI Plugin  ${ova-ip}
+    Close Connection
+
+VIC UI OVA Setup
+    [Timeout]    110 minutes
+    ${ova-name}=  Get Test OVA Name
+    Set Environment Variable  OVA_NAME  ${ova-name}
+    Set Environment Variable  DOMAIN              eng.vmware.com
+    
+    Setup Simple VC And Test Environment
+    Global Environment Setup
+    Set Test VC Variables
+    
+    ${ova-ip}=  Install And Initialize VIC Product OVA  ${local_ova_file}  %{OVA_NAME}
+    Set Environment Variable  OVA_IP  ${ova-ip}
diff --git a/tests/resources/page-objects/Complete-Installation-Modal-Util.robot b/tests/resources/page-objects/Complete-Installation-Modal-Util.robot
index 77fc3838f8..0f2c51123e 100644
--- a/tests/resources/page-objects/Complete-Installation-Modal-Util.robot
+++ b/tests/resources/page-objects/Complete-Installation-Modal-Util.robot
@@ -23,6 +23,7 @@ ${cim-input-target}  id=target
 ${cim-input-user}  id=user
 ${cim-input-password}  css=input[type=password]
 ${cim-button-continue}  id=login-submit
+${cim-plugin-button-continue}  id=plugin-submit
 
 # expected text values
 ${cim-title-text}  Complete VIC appliance installation
@@ -42,4 +43,5 @@ Log In And Complete OVA Installation
     Input Text  ${cim-input-user}   %{TEST_USERNAME}
     Input Text  ${cim-input-password}   %{TEST_PASSWORD}
     Click Button  ${cim-button-continue}
-    Verify Complete Installation Message
\ No newline at end of file
+    Click Button ${cim-plugin-button-continue}
+    Verify Complete Installation Message
diff --git a/tests/resources/page-objects/Getting-Started-Page-Util.robot b/tests/resources/page-objects/Getting-Started-Page-Util.robot
index 23cde4e767..e4cf7515b3 100644
--- a/tests/resources/page-objects/Getting-Started-Page-Util.robot
+++ b/tests/resources/page-objects/Getting-Started-Page-Util.robot
@@ -32,5 +32,5 @@ Verify Getting Started Page Title
     Should Contain  ${result}  ${gsp-page-title}
 
 Verify Complete Installation Message
-    Wait Until Element Is Visible  ${gsp-alert-message}  timeout=${EXPLICIT_WAIT}
+    Wait Until Element Is Visible  ${gsp-alert-message}  timeout=${EXTRA_EXPLICIT_WAIT}
     Element Text Should Be  ${gsp-alert-message}  ${gsp-install-complete-message}
diff --git a/tests/test-cases/Group1-OVA-Install/1-01-Install.robot b/tests/test-cases/Group1-OVA-Install/1-01-Install.robot
index c5ea4259d3..068f494325 100644
--- a/tests/test-cases/Group1-OVA-Install/1-01-Install.robot
+++ b/tests/test-cases/Group1-OVA-Install/1-01-Install.robot
@@ -15,7 +15,7 @@
 *** Settings ***
 Documentation  Test 1-01 - Install Test
 Resource  ../../resources/Util.robot
-Test Timeout  2 minutes
+Test Timeout  5 minutes
 
 *** Test Cases ***
 Verify VIC engine download and create VCH
diff --git a/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot b/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
index 3b41298023..a988b81176 100644
--- a/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
+++ b/tests/test-cases/Group2-Getting-Started/2-01-Getting-Started.robot
@@ -15,11 +15,13 @@
 *** Settings ***
 Documentation  Test 2-01 Getting Started
 Resource  ../../resources/Util.robot
-Test Timeout  1 minutes
+Test Timeout  5 minutes
 Test Setup  Open Firefox Browser
 Test Teardown  Close All Browsers
 
 *** Test Cases ***
 Verify Getting Started page
+    Log To Console  Initializing the OVA using the getting started ui...
     Navigate To Getting Started Page
-    Verify Getting Started Page Title
\ No newline at end of file
+    Verify Getting Started Page Title
+    #Log In And Complete OVA Installation